diff --git a/.circleci/config.yml b/.circleci/config.yml
index a0f220dfd7d..c044ed85083 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,34 +1,53 @@
 ---
 version: 2.1
 orbs:
-  win: circleci/windows@2.2.0
+  win: circleci/windows@5.0
 
 executors:
+  besu_executor_small:
+    docker:
+      - image: cimg/openjdk:17.0
+    resource_class: small
+    working_directory: ~/project
+    environment:
+      GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=2
+
   besu_executor_med: # 2cpu, 4G ram
     docker:
-      - image: circleci/openjdk:11.0.8-jdk-buster
-        auth:
-          username: $DOCKER_USER_RO
-          password: $DOCKER_PASSWORD_RO
+      - image: cimg/openjdk:17.0
     resource_class: medium
     working_directory: ~/project
     environment:
+      architecture: "amd64"
+      GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=2
+
+  besu_arm64_executor_med: # 2cpu, 8G ram
+    machine: #https://circleci.com/developer/machine/image/ubuntu-2204
+      image: ubuntu-2204:2022.10.2
+    resource_class: arm.medium
+    working_directory: ~/project
+    environment:
+      architecture: "arm64"
       GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=2
 
   besu_executor_xl: # 8cpu, 16G ram
     docker:
-      - image: circleci/openjdk:11.0.8-jdk-buster
-        auth:
-          username: $DOCKER_USER_RO
-          password: $DOCKER_PASSWORD_RO
+      - image: cimg/openjdk:17.0
     resource_class: xlarge
     working_directory: ~/project
     environment:
       GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=4
 
-notify:
-  webhooks:
-    - url: $HUBOT_URL
+  xl_machine_executor:
+    machine: #https://circleci.com/developer/machine/image/ubuntu-2204
+      image: ubuntu-2204:2022.10.2
+    resource_class: xlarge
+
+  trivy_executor:
+    docker:
+      - image: docker:stable-git
+    resource_class: small
+    working_directory: ~/project
 
 commands:
   prepare:
@@ -36,10 +55,16 @@ commands:
     steps:
       - checkout
       - run:
-          name: Install Packages - LibSodium
+          name: Install Packages - LibSodium, nssdb
           command: |
             sudo apt-get update
-            sudo apt-get install -y libsodium23 libsodium-dev apt-transport-https
+            sudo apt-get install -y libsodium23 libsodium-dev libjemalloc-dev apt-transport-https haveged libnss3-tools
+            sudo service haveged restart
+            java --version
+      - restore_gradle_cache
+  restore_gradle_cache:
+    description: "Restore Gradle cache"
+    steps:
       - restore_cache:
           name: Restore cached gradle dependencies
           keys:
@@ -50,6 +75,10 @@ commands:
   capture_test_results:
     description: "Capture test results"
     steps:
+      - run:
+          name: Jacoco
+          command: |
+            ./gradlew --no-daemon jacocoTestReport
       - run:
           name: Gather test results
           when: always
@@ -64,6 +93,8 @@ commands:
             done
       - store_test_results:
           path: build/test-results
+      - store_artifacts:
+          path: besu/build/reports/jacoco
 
   capture_test_logs:
     description: "Capture test logs"
@@ -79,14 +110,10 @@ jobs:
     executor: besu_executor_xl
     steps:
       - prepare
-      - run:
-          name: DCO check
-          command: |
-            ./scripts/dco_check.sh
       - run:
           name: Assemble
           command: |
-            ./gradlew --no-daemon clean spotlessCheck compileJava compileTestJava assemble
+            ./gradlew --no-daemon clean compileJava compileTestJava assemble
       - save_cache:
           name: Caching gradle dependencies
           key: deps-{{ checksum "gradle/versions.gradle" }}-{{ .Branch }}-{{ .Revision }}
@@ -99,9 +126,10 @@ jobs:
             - ./
       - store_artifacts:
           name: Distribution artifacts
-          path:  build/distributions
+          path: build/distributions
           destination: distributions
           when: always
+
   testWindows:
     executor: win/default
     steps:
@@ -122,6 +150,31 @@ jobs:
             build\distributions\besu\bin\besu.bat --help
             build\distributions\besu\bin\besu.bat --version
 
+  dockerScan:
+    executor: trivy_executor
+    steps:
+      - checkout
+      - restore_gradle_cache
+      - setup_remote_docker:
+          docker_layer_caching: true
+      - run:
+          name: Install trivy
+          command: |
+            apk add --update-cache --upgrade curl bash
+            curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin
+      - run:
+          name: Scan with trivy
+          shell: /bin/sh
+          command: |
+            for FILE in $(ls docker)
+            do
+              if [[ $FILE == "test.sh" || $FILE == "tests" ]]; then
+                continue
+              fi
+              docker pull -q "hyperledger/besu:develop-$FILE"
+              trivy -q image --exit-code 1 --no-progress --severity HIGH,CRITICAL "hyperledger/besu:develop-$FILE"
+            done
+
   unitTests:
     executor: besu_executor_xl
     steps:
@@ -136,7 +189,7 @@ jobs:
       - capture_test_results
 
   integrationTests:
-    executor: besu_executor_xl
+    executor: xl_machine_executor
     steps:
       - prepare
       - attach_workspace:
@@ -145,10 +198,6 @@ jobs:
           name: IntegrationTests
           command: |
             ./gradlew --no-daemon integrationTest
-      - run:
-          name: Javadoc
-          command: |
-            ./gradlew --no-daemon javadoc
       - run:
           name: CompileJmh
           command: |
@@ -163,22 +212,88 @@ jobs:
           at: ~/project
       - run:
           name: ReferenceTests
-          no_output_timeout: 20m
+          no_output_timeout: 30m
           command: |
             git submodule update --init --recursive
             ./gradlew --no-daemon referenceTest
       - capture_test_results
 
   acceptanceTests:
-    parallelism: 8
-    executor: besu_executor_xl
+    parallelism: 4
+    executor: xl_machine_executor
+    steps:
+      - prepare
+      - attach_workspace:
+          at: ~/project
+      - run:
+          name: AcceptanceTests (Mainnet)
+          no_output_timeout: 20m
+          command: |
+            CLASSNAMES=$(circleci tests glob "acceptance-tests/tests/src/test/java/**/*.java" \
+              | sed 's@.*/src/test/java/@@' \
+              | sed 's@/@.@g' \
+              | sed 's/.\{5\}$//' \
+              | circleci tests split --split-by=timings --timings-type=classname)
+            # Format the arguments to "./gradlew test"
+            GRADLE_ARGS=$(echo $CLASSNAMES | awk '{for (i=1; i<=NF; i++) print "--tests",$i}')
+            ./gradlew --no-daemon acceptanceTestMainnet $GRADLE_ARGS
+      - capture_test_results
+      - capture_test_logs
+
+  acceptanceTestsCliqueBft:
+    parallelism: 6
+    executor: xl_machine_executor
+    steps:
+      - prepare
+      - attach_workspace:
+          at: ~/project
+      - run:
+          name: AcceptanceTests (Non-Mainnet)
+          no_output_timeout: 20m
+          command: |
+            CLASSNAMES=$(circleci tests glob "acceptance-tests/tests/src/test/java/**/*.java" \
+              | sed 's@.*/src/test/java/@@' \
+              | sed 's@/@.@g' \
+              | sed 's/.\{5\}$//' \
+              | circleci tests split --split-by=timings --timings-type=classname)
+            # Format the arguments to "./gradlew test"
+            GRADLE_ARGS=$(echo $CLASSNAMES | awk '{for (i=1; i<=NF; i++) print "--tests",$i}')
+            ./gradlew --no-daemon acceptanceTestCliqueBft $GRADLE_ARGS
+      - capture_test_results
+      - capture_test_logs
+
+  acceptanceTestsPrivacy:
+    parallelism: 6
+    executor: xl_machine_executor
+    steps:
+      - prepare
+      - attach_workspace:
+          at: ~/project
+      - run:
+          name: AcceptanceTests (Non-Mainnet)
+          no_output_timeout: 20m
+          command: |
+            CLASSNAMES=$(circleci tests glob "acceptance-tests/tests/src/test/java/**/*.java" \
+              | sed 's@.*/src/test/java/@@' \
+              | sed 's@/@.@g' \
+              | sed 's/.\{5\}$//' \
+              | circleci tests split --split-by=timings --timings-type=classname)
+            # Format the arguments to "./gradlew test"
+            GRADLE_ARGS=$(echo $CLASSNAMES | awk '{for (i=1; i<=NF; i++) print "--tests",$i}')
+            ./gradlew --no-daemon acceptanceTestPrivacy $GRADLE_ARGS
+      - capture_test_results
+      - capture_test_logs
+
+  acceptanceTestsPermissioning:
+    parallelism: 6
+    executor: xl_machine_executor
     steps:
       - prepare
       - attach_workspace:
           at: ~/project
       - run:
-          name: AcceptanceTests
-          no_output_timeout: 40m
+          name: AcceptanceTests (Non-Mainnet)
+          no_output_timeout: 20m
           command: |
             CLASSNAMES=$(circleci tests glob "acceptance-tests/tests/src/test/java/**/*.java" \
               | sed 's@.*/src/test/java/@@' \
@@ -187,7 +302,7 @@ jobs:
               | circleci tests split --split-by=timings --timings-type=classname)
             # Format the arguments to "./gradlew test"
             GRADLE_ARGS=$(echo $CLASSNAMES | awk '{for (i=1; i<=NF; i++) print "--tests",$i}')
-            ./gradlew --no-daemon acceptanceTest $GRADLE_ARGS
+            ./gradlew --no-daemon acceptanceTestPermissioning $GRADLE_ARGS
       - capture_test_results
       - capture_test_logs
 
@@ -199,9 +314,13 @@ jobs:
           at: ~/project
       - setup_remote_docker
       - run:
-          name: hadoLint_openjdk_11
+          name: hadoLint_openjdk_17
+          command: |
+            docker run --rm -i hadolint/hadolint < docker/openjdk-17/Dockerfile
+      - run:
+          name: hadoLint_openjdk_17_debug
           command: |
-            docker run --rm -i hadolint/hadolint < docker/openjdk-11/Dockerfile
+            docker run --rm -i hadolint/hadolint < docker/openjdk-17-debug/Dockerfile
       - run:
           name: hadoLint_openjdk_latest
           command: |
@@ -221,6 +340,40 @@ jobs:
             curl -L https://github.com/aelsabbahy/goss/releases/download/v0.3.9/goss-linux-amd64 -o ./docker/tests/goss-linux-amd64
             ./gradlew --no-daemon testDocker
 
+  buildArm64Docker:
+    executor: besu_arm64_executor_med
+    steps:
+      - prepare
+      - attach_workspace:
+          at: ~/project
+      - run:
+          name: hadoLint_openjdk_17
+          command: |
+            docker run --rm -i hadolint/hadolint < docker/openjdk-17/Dockerfile
+      - run:
+          name: hadoLint_openjdk_latest
+          command: |
+            docker run --rm -i hadolint/hadolint < docker/openjdk-latest/Dockerfile
+      - run:
+          name: hadoLint_graalvm
+          command: |
+            docker run --rm -i hadolint/hadolint < docker/graalvm/Dockerfile
+      - run:
+          name: Java_17
+          command: |
+            sudo apt install -q --assume-yes openjdk-17-jre-headless openjdk-17-jdk-headless
+            sudo update-java-alternatives -a
+      - run:
+          name: build image
+          command: |
+            ./gradlew --no-daemon distDocker
+      - run:
+          name: test image
+          command: |
+            mkdir -p docker/reports
+            curl -L https://github.com/aelsabbahy/goss/releases/download/v0.3.9/goss-linux-arm -o ./docker/tests/goss-linux-arm64
+            ./gradlew --no-daemon testDocker
+
   publish:
     executor: besu_executor_med
     steps:
@@ -230,7 +383,7 @@ jobs:
       - run:
           name: Publish
           command: |
-            ./gradlew --no-daemon bintrayUpload
+            ./gradlew --no-daemon artifactoryPublish
 
   publishDocker:
     executor: besu_executor_med
@@ -243,72 +396,132 @@ jobs:
           name: Publish Docker
           command: |
             docker login --username "${DOCKER_USER_RW}" --password "${DOCKER_PASSWORD_RW}"
-            # temporarily commented out because AWS credentials are broken
-            # docker login "${ACR_REPO}" --username "${ACR_USER_RW}" --password "${ACR_PASSWORD_RW}"
             ./gradlew --no-daemon "-Pbranch=${CIRCLE_BRANCH}" dockerUpload
 
+  publishArm64Docker:
+    executor: besu_arm64_executor_med
+    steps:
+      - prepare
+      - attach_workspace:
+          at: ~/project
+      - run:
+          name: Java_17
+          command: |
+            sudo apt install -q --assume-yes openjdk-17-jre-headless openjdk-17-jdk-headless
+            sudo update-java-alternatives -a
+      - run:
+          name: Publish Docker
+          command: |
+            docker login --username "${DOCKER_USER_RW}" --password "${DOCKER_PASSWORD_RW}"
+            ./gradlew --no-daemon "-Pbranch=${CIRCLE_BRANCH}" dockerUpload
+  manifestDocker:
+    executor: besu_executor_med
+    steps:
+      - prepare
+      - setup_remote_docker
+      - run:
+          name: Create and publish docker manifest
+          command: |
+            docker login --username "${DOCKER_USER_RW}" --password "${DOCKER_PASSWORD_RW}"
+            ./gradlew --no-daemon "-Pbranch=${CIRCLE_BRANCH}" --parallel manifestDocker
+
 workflows:
   version: 2
   default:
     jobs:
       - assemble
       - unitTests:
-          requires:
+           requires:
             - assemble
-          context:
-            - besu-dockerhub-ro
       - testWindows:
           requires:
             - assemble
       - referenceTests:
           requires:
             - assemble
-          context:
-            - besu-dockerhub-ro            
       - integrationTests:
           requires:
             - assemble
-          context:
-            - besu-dockerhub-ro            
       - acceptanceTests:
           requires:
             - assemble
-          context:
-            - besu-dockerhub-ro            
+      - acceptanceTestsCliqueBft:
+          requires:
+            - assemble
+      - acceptanceTestsPrivacy:
+          requires:
+            - assemble
+      - acceptanceTestsPermissioning:
+          requires:
+            - assemble
       - buildDocker:
           requires:
-            - unitTests
-          context:
-            - besu-dockerhub-ro            
+            - assemble
+      - buildArm64Docker:
+          requires:
+            - assemble
       - publish:
           filters:
             branches:
               only:
-                - master
+                - main
                 - /^release-.*/
           requires:
+            - assemble
             - integrationTests
             - unitTests
             - acceptanceTests
             - referenceTests
             - buildDocker
-            - buildDocker
-          context:
-            - besu-dockerhub-ro
       - publishDocker:
           filters:
             branches:
               only:
-                - master
+                - main
                 - /^release-.*/
           requires:
+            - assemble
             - integrationTests
             - unitTests
             - acceptanceTests
             - referenceTests
             - buildDocker
           context:
-            - besu-dockerhub-ro
             - besu-dockerhub-rw
-            - besu-acr-rw
+      - publishArm64Docker:
+          filters:
+            branches:
+              only:
+                - main
+                - /^release-.*/
+          requires:
+            - integrationTests
+            - unitTests
+            - acceptanceTests
+            - referenceTests
+            - buildArm64Docker
+          context:
+            - besu-dockerhub-rw
+      - manifestDocker:
+          filters:
+            branches:
+              only:
+                - main
+                - /^release-.*/
+          requires:
+            - publishDocker
+            - publishArm64Docker
+          context:
+            - besu-dockerhub-rw
 
+  nightly:
+    triggers:
+      - schedule:
+          cron: "0 19 * * *"
+          filters:
+            branches:
+              only:
+                - main
+    jobs:
+      - assemble
+      - dockerScan
diff --git a/.gitattributes b/.gitattributes
index 09c9fcd2387..79522fa32e7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -14,5 +14,7 @@
 *.ico binary
 *.ttf binary
 *.woff binary
+*.p12 binary
+*.db binary
 *.woff2 binary
 goss-linux-amd64 binary
diff --git a/.github/issue_template.md b/.github/issue_template.md
index c1bb6a45fc7..cfae3400266 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -1,9 +1,9 @@
 <!-- Have you done the following? -->
 <!--   * read the Code of Conduct? By filing an Issue, you are expected to -->  
 <!--     comply with it, including treating everyone with respect: -->
-<!--     https://github.com/hyperledger/besu/blob/master/CODE-OF-CONDUCT.md -->
+<!--     https://github.com/hyperledger/besu/blob/main/CODE_OF_CONDUCT.md -->
 <!--   * Reproduced the issue in the latest version of the software -->
-<!--   * Read the debugging wiki: https://github.com/hyperledger/besu/wiki/debugging -->
+<!--   * Read the debugging docs: https://besu.hyperledger.org/en/stable/HowTo/Monitor/Logging/ -->
 <!--   * Duplicate Issue check:  https://github.com/search?q=+is%3Aissue+repo%3Ahyperledger/Besu -->
 <!-- Note:  Not all sections will apply to all issue types. -->
 
@@ -24,6 +24,9 @@ As an [Actor], I want [feature] so that [why].
 
 **Frequency:** [What percentage of the time does it occur?]
 
+### Logs (if a bug)
+Please post relevant logs from Besu (and the consensus client, if running proof of stake) from before and after the issue. 
+
 ### Versions (Add all that apply)
 * Software version: [`besu --version`]
 * Java version: [`java -version`]
@@ -32,6 +35,14 @@ As an [Actor], I want [feature] so that [why].
 * Virtual Machine software & version: [`vmware -v`]
 * Docker Version: [`docker version`]
 * Cloud VM, type, size: [Amazon Web Services I3-large]
+* Consensus Client & Version if using Proof of Stake: [e.g. Teku, Lighthouse, Prysm, Nimbus, Lodestar]
 
-### Additional Information
+### Smart contract information (If you're reporting an issue arising from deploying or calling a smart contract, please supply related information)
+* Solidity version [`solc --version`]
+* Repo with minimal set of deployable/reproducible contract code - please provide a link
+* Please include specifics on how you are deploying/calling the contract 
+* Have you reproduced the issue on other eth clients
 
+### Additional Information (Add any of the following or anything else that may be relevant)
+* Besu setup info - genesis file, config options
+* System info - memory, CPU
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 6e5e1fa16b9..11bac0fb923 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,12 +1,8 @@
 <!-- Thanks for sending a pull request! Please check out our contribution guidelines: -->
-<!-- https://github.com/hyperledger/besu/blob/master/CONTRIBUTING.md -->
+<!-- https://github.com/hyperledger/besu/blob/main/CONTRIBUTING.md -->
 
 ## PR description
 
 ## Fixed Issue(s)
 <!-- Please link to fixed issue(s) here using format: fixes #<issue number> -->
-<!-- Example: "fixes #2" -->
-
-## Changelog
-
-- [ ] I thought about the changelog and included a [changelog update if required](https://wiki.hyperledger.org/display/BESU/Changelog).
\ No newline at end of file
+<!-- Example: "fixes #2" -->
\ No newline at end of file
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
new file mode 100644
index 00000000000..c72331b84e8
--- /dev/null
+++ b/.github/workflows/checks.yml
@@ -0,0 +1,36 @@
+name: checks
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  spotless:
+    runs-on: [besu,Linux,self-hosted,X64,nodocker]
+    if: ${{ github.actor != 'dependabot[bot]' }}
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+      - name: Set up Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: adopt
+          java-version: 17
+          cache: gradle
+      - name: spotless
+        run: ./gradlew --no-daemon --parallel clean spotlessCheck
+  javadoc_17:
+    runs-on: [besu,Linux,self-hosted,X64,nodocker]
+    if: ${{ github.actor != 'dependabot[bot]' }}
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+      - name: Set up Java 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: adopt
+          java-version: 17
+          cache: gradle
+      - name: javadoc (JDK 17)
+        run: ./gradlew --no-daemon clean javadoc
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 00000000000..0e170cfb288
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,66 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+    paths-ignore:
+      - '**/*.json'
+      - '**/*.md'
+      - '**/*.properties'
+      - '**/*.txt'
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: [besu,Linux,self-hosted,X64,nodocker]
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Set up Java
+      uses: actions/setup-java@v3
+      with:
+        distribution: adopt
+        java-version: 17
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        queries: security-and-quality,security-extended
+
+    # Autobuild failed (OOM)
+    # Hence, supply memory args for gradle build
+    - run: |
+        JAVA_OPTS="-Xmx1000M" ./gradlew --no-scan compileJava
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/dco-merge-group.yml b/.github/workflows/dco-merge-group.yml
new file mode 100644
index 00000000000..f93170b1c24
--- /dev/null
+++ b/.github/workflows/dco-merge-group.yml
@@ -0,0 +1,10 @@
+name: dco
+on:
+  merge_group:
+
+jobs:
+  dco:
+    runs-on: [besu,Linux,self-hosted,nodocker]
+    if: ${{ github.actor != 'dependabot[bot]' }}
+    steps:
+      - run: echo "This DCO job runs on merge_queue event and doesn't check PR contents"
\ No newline at end of file
diff --git a/.github/workflows/dco.yml b/.github/workflows/dco.yml
new file mode 100644
index 00000000000..341e1d38776
--- /dev/null
+++ b/.github/workflows/dco.yml
@@ -0,0 +1,20 @@
+name: dco
+on:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  dco:
+    runs-on: [besu,Linux,self-hosted,nodocker]
+    if: ${{ github.actor != 'dependabot[bot]' }}
+    steps:
+      - run: echo "This DCO job runs on pull_request event and workflow_dispatch"
+      - name: Get PR Commits
+        id: 'get-pr-commits'
+        uses: tim-actions/get-pr-commits@v1.2.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: DCO Check
+        uses: tim-actions/dco@v1.1.0
+        with:
+          commits: ${{ steps.get-pr-commits.outputs.commits }}
\ No newline at end of file
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
new file mode 100644
index 00000000000..bb0feddd1e8
--- /dev/null
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: Apache-2.0
+name: "Validate Gradle Wrapper"
+on: [push, pull_request]
+
+jobs:
+  validation:
+    name: "Gradle Wrapper Validation"
+    runs-on: [besu,Linux,self-hosted,nodocker]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: gradle/wrapper-validation-action@v1
diff --git a/.github/workflows/pr-checklist-on-open.yml b/.github/workflows/pr-checklist-on-open.yml
new file mode 100644
index 00000000000..d89748a9437
--- /dev/null
+++ b/.github/workflows/pr-checklist-on-open.yml
@@ -0,0 +1,20 @@
+name: "comment on pr with checklist"
+on:
+  pull_request_target:
+    types: [ opened ]
+    branches: [ main ]
+jobs:
+  checklist:
+    name: "add checklist as a comment on newly opened PRs"
+    runs-on: [besu,Linux,self-hosted,nodocker]
+    steps:
+      - uses: actions/github-script@v5
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            github.rest.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: '- [ ] I thought about documentation and added the `doc-change-required` label to this PR if [updates are required](https://wiki.hyperledger.org/display/BESU/Documentation).\n- [ ] I thought about the changelog and included a [changelog update if required](https://wiki.hyperledger.org/display/BESU/Changelog).\n- [ ] If my PR includes database changes (e.g. KeyValueSegmentIdentifier) I have thought about compatibility and performed forwards and backwards compatibility tests'
+            })
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000000..36ea3ab50fe
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,21 @@
+name: release besu
+on:
+  release:
+    types: released
+jobs:
+  dockerPromoteX64:
+    runs-on: [besu,Linux,self-hosted,nodocker]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '17'
+      - name: Login to DockerHub
+        run: echo '${{ secrets.DOCKER_PASSWORD_RW }}' | docker login -u '${{ secrets.DOCKER_USER_RW }}' --password-stdin
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+      - name: Docker upload
+        run: ./gradlew "-Prelease.releaseVersion=${{ github.ref_name }}" "-PdockerOrgName=${{ secrets.DOCKER_ORG }}" dockerUploadRelease
+      - name: Docker manifest
+        run: ./gradlew "-Prelease.releaseVersion=${{ github.ref_name }}" "-PdockerOrgName=${{ secrets.DOCKER_ORG }}" manifestDockerRelease
diff --git a/.github/workflows/repolinter.yml b/.github/workflows/repolinter.yml
new file mode 100644
index 00000000000..39b0d6cab39
--- /dev/null
+++ b/.github/workflows/repolinter.yml
@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: Apache-2.0
+# Hyperledger Repolinter Action
+name: Repolinter
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+      - main
+  pull_request:
+    branches:
+      - master
+      - main
+
+jobs:
+  build:
+    runs-on: [besu,Linux,self-hosted,X64,docker]
+    container: ghcr.io/todogroup/repolinter:v0.10.1
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+      - name: Lint Repo
+        run: bundle exec /app/bin/repolinter.js --rulesetUrl https://raw.githubusercontent.com/hyperledger-labs/hyperledger-community-management-tools/main/repo_structure/repolint.json --format markdown
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
new file mode 100644
index 00000000000..e3a6e088e06
--- /dev/null
+++ b/.github/workflows/sonarcloud.yml
@@ -0,0 +1,42 @@
+
+name: SonarCloud analysis
+
+on:
+  workflow_dispatch:
+  schedule:
+    # * is a special character in YAML so you have to quote this string
+    # expression evaluates to midnight on Tuesdays UTC
+    - cron:  '0 0 * * 2'
+
+permissions:
+  pull-requests: read # allows SonarCloud to decorate PRs with analysis results
+
+jobs:
+  Analysis:
+    runs-on: ubuntu-latest
+    if: github.repository == 'hyperledger/besu'
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+      - name: Cache Gradle packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: ${{ runner.os }}-gradle
+      - name: Build and analyze
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: ./gradlew build sonarqube --continue --info
diff --git a/.gitignore b/.gitignore
index 76ab7d30876..0465ea5e30f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
 *~.nib
 *.iml
 *.launch
-*.swp
 *.log
 .classpath
 .DS_Store
@@ -29,3 +28,5 @@ site/
 /kubernetes/reports/
 /kubernetes/besu-*.tar.gz
 **/src/*/generated
+jitpack.yml
+/ethereum/eth/src/test/resources/tx.csv.gz
diff --git a/.gitmodules b/.gitmodules
index 0efd88e0991..97132b17c6d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "eth-ref-tests"]
-	path = ethereum/referencetests/src/test/resources
+	path = ethereum/referencetests/src/reference-test/external-resources
 	url = https://github.com/ethereum/tests.git
 	ignore = all
diff --git a/.lgtm.yml b/.lgtm.yml
new file mode 100644
index 00000000000..6edcbd6b2a9
--- /dev/null
+++ b/.lgtm.yml
@@ -0,0 +1,5 @@
+extraction:
+  java:
+    index:
+      java_version: "17"
+      build_command: JAVA_OPTS="-Xmx1000M" ./gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-11-openjdk-amd64 --no-scan compileJava
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2b0979bf19..54a4ae5c926 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,1480 @@
 # Changelog
 
+## 23.4.5
+
+### Breaking Changes
+
+### Additions and Improvements
+- EvmTool now executes the `execution-spec-tests` via the `t8n` and `b11r`. See the [README](ethereum/evmtool/README.md) in EvmTool for more instructions.
+- Improve lifecycle management of the transaction pool [#5634](https://github.com/hyperledger/besu/pull/5634)
+
+### Bug Fixes
+- Use the node's configuration to determine if DNS enode URLs are allowed in calls to `admin_addPeer` and `admin_removePeer` [#5584](https://github.com/hyperledger/besu/pull/5584)
+- Align the implementation of Eth/68 `NewPooledTransactionHashes` to other clients, using unsigned int for encoding size. [#5640](https://github.com/hyperledger/besu/pull/5640)
+- Failure at startup when enabling layered txpool before initial sync done [#5636](https://github.com/hyperledger/besu/issues/5636)
+
+### Download Links
+
+---
+
+## 23.4.4
+
+### Breaking Changes
+- Move blockchain related variables in a dedicated storage, to pave the way to future optimizations [#5471](https://github.com/hyperledger/besu/pull/5471). The migration is performed automatically at startup,
+and in case a rollback is needed, before installing a previous version, the migration can be reverted, using the subcommand `storage revert-variables` with the same configuration use to run Besu.
+- Remove deprecated Rinkeby named network. [#5540](https://github.com/hyperledger/besu/pull/5540)
+- Use BlobDB for blockchain storage to reduce initial sync time and write amplification (PR #5475). This PR reduces sync time by 14 hours on m6a.xlarge VM (1 day 8 hours 27 minutes instead of 1 day 22 hours 4 minutes).
+### Additions and Improvements
+- Allow Ethstats connection url to specify ws:// or wss:// scheme. [#5494](https://github.com/hyperledger/besu/issues/5494)
+- Add support for Shanghai changes to the GraphQL service [#5496](https://github.com/hyperledger/besu/pull/5496)
+- Unite the tx-pool CLI options under the same Tx Pool Options group in UX. [#5466](https://github.com/hyperledger/besu/issues/5466)
+- Tidy DEBUG logs by moving engine API full logging to TRACE [#5529](https://github.com/hyperledger/besu/pull/5529)
+- Remove PoW validation if merge is enabled as it is not needed any more [#5538](https://github.com/hyperledger/besu/pull/5538)
+- Use BlobDB for blockchain storage to reduce initial sync time and write amplification [#5475](https://github.com/hyperledger/besu/pull/5475)
+- Add healing flat db mechanism with early access CLI options `--Xsnapsync-synchronizer-flat-db-healing-enabled=true` [#5319](https://github.com/hyperledger/besu/pull/5319)
+- Add debug_getRawTransaction method to the DEBUG suite [#5635](https://github.com/hyperledger/besu/pull/5635)
+
+### Bug Fixes
+- Fix backwards sync bug where chain is rolled back too far, especially when restarting Nimbus [#5497](https://github.com/hyperledger/besu/pull/5497)
+- Check to ensure storage and transactions are not closed prior to reading/writing [#5527](https://github.com/hyperledger/besu/pull/5527) 
+- Fix the unavailability of account code and storage on GraphQL/Bonsai [#5548](https://github.com/hyperledger/besu/pull/5548)
+
+### Download Links
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/23.4.4/besu-23.4.4.tar.gz / sha256: bd476d235b6fe1f236a62bc709f41c87deb68b72c47bb5b58e56b9d9283af2c4
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/23.4.4/besu-23.4.4.zip / sha256: 4575000f4fd21d318e7b77340c9281d496bc800bee5b45a13684319e6f28bf27
+
+## 23.4.3
+
+- Was not released (failed burn-in test)
+
+- ## 23.4.2
+
+- Was not released (failed burn-in test)
+
+## 23.4.1
+
+### Breaking Changes
+- Add request content length limit for the JSON-RPC API (5MB) [#5467](https://github.com/hyperledger/besu/pull/5467)
+- `min-block-occupancy-ratio` options is now ignored on PoS networks [#5491](https://github.com/hyperledger/besu/pull/5491)
+
+### Additions and Improvements
+- Set the retention policy for RocksDB log files to maintain only the logs from the last week [#5428](https://github.com/hyperledger/besu/pull/5428)
+- "Big-EOF" (the EOF version initially slotted for Shanghai) has been moved from Cancun to FutureEIPs [#5429](https://github.com/hyperledger/besu/pull/5429)
+- EIP-4844: Zero blob transactions are invalid [#5425](https://github.com/hyperledger/besu/pull/5425)
+- Transaction pool flag to disable specific behaviors for locally submitted transactions [#5418](https://github.com/hyperledger/besu/pull/5418)
+- Added In-Protocol Deposit prototype (EIP-6110) in the experimental eip. [#5005](https://github.com/hyperledger/besu/pull/5055) [#5295](https://github.com/hyperledger/besu/pull/5295)
+- New optional feature to save the txpool content to file on shutdown and reloading it on startup [#5434](https://github.com/hyperledger/besu/pull/5434)
+- New option to send SNI header in TLS ClientHello message [#5439](https://github.com/hyperledger/besu/pull/5439)
+- Early access - layered transaction pool implementation [#5290](https://github.com/hyperledger/besu/pull/5290)
+- New RPC method `debug_getRawReceipts` [#5476](https://github.com/hyperledger/besu/pull/5476)
+- Add TrieLogFactory plugin support [#5440](https://github.com/hyperledger/besu/pull/5440)
+- Ignore `min-block-occupancy-ratio` option when on PoS networks, since in some cases, it prevents to have full blocks even if enough transactions are present [#5491](https://github.com/hyperledger/besu/pull/5491) 
+
+### Bug Fixes
+- Fix eth_feeHistory response for the case in which blockCount is higher than highestBlock requested. [#5397](https://github.com/hyperledger/besu/pull/5397)
+- Fix Besu Docker image failing to start due to NoClassDefFoundError with org.xerial.snappy.Snappy library. [#5462](https://github.com/hyperledger/besu/pull/5462)
+
+### Download Links
+
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/23.4.1/besu-23.4.1.tar.gz / sha256: 49d3a7a069cae307497093d834f873ce7804a46dd59207d5e8321459532d318e
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/23.4.1/besu-23.4.1.zip / sha256: 1d82ed83a816968aa9366d9310b275ca6438100f5d3eb1ec03d3474b2a5f5e76
+
+## 23.4.0
+
+### Breaking Changes
+- In `evmtool` (an offline EVM executor tool principally used for reference tests), the `--prestate` and `--genesis` options no longer parse genesis files containing IBFT, QBFT, and Clique network definitions. The same genesis files will work with those json entries removed. [#5192](https://github.com/hyperledger/besu/pull/5192)
+- In `--ethstats`, if the port is not specified in the URI, it will default to 443 and 80 for ssl and non-ssl connections respectively instead of 3000. [#5301](https://github.com/hyperledger/besu/pull/5301)
+- Remove IBFT 1.0 feature [#5302](https://github.com/hyperledger/besu/pull/5302)
+- Remove GoQuorum-compatible privacy feature [#5303](https://github.com/hyperledger/besu/pull/5303)
+- Remove launcher command line utility [#5355](https://github.com/hyperledger/besu/pull/5355)
+- Remove deprecated `tx-pool-future-max-by-account` option, see instead: `tx-pool-limit-by-account-percentage` [#5361](https://github.com/hyperledger/besu/pull/5361)
+- Default configuration for the deprecated ECIP-1049 network has been removed from the CLI network list [#5371](https://github.com/hyperledger/besu/pull/5371)
+- Besu now requires glibc 2.32 or later to run. Ubuntu 20.04 users will need to update to a newer version of Ubuntu, 22.04 or later to run Besu
+
+### Additions and Improvements
+- An alternate build target for the EVM using GraalVM AOT compilation was added.  [#5192](https://github.com/hyperledger/besu/pull/5192)
+- To generate the binary install and use GraalVM 23.3.r17 or higher and run `./gradlew nativeCompile`.  The binary will be located in `ethereum/evmtool/build/native/nativeCompile`
+- Upgrade RocksDB version from 7.7.3 to 8.0.0. Besu Team [contributed](https://github.com/facebook/rocksdb/pull/11099) to this release to make disabling checksum verification work. 
+- Log an error with stacktrace when RPC responds with internal error [#5288](https://github.com/hyperledger/besu/pull/5288)
+- `--ethstats-cacert` to specify root CA of ethstats server (useful for non-production environments). [#5301](https://github.com/hyperledger/besu/pull/5301)
+- Update most dependencies to latest version [#5269](https://github.com/hyperledger/besu/pull/5269)
+- If jemalloc is used, print its version in the configuration overview [#4738](https://github.com/hyperledger/besu/pull/4738)
+- Add metrics for accounts and storage reads (Flat database vs Merkle Patricia Trie) [#5315](https://github.com/hyperledger/besu/pull/5315)
+- Offload LogBloom cache generation to computation executor, to avoid interfere with other scheduled tasks [#4530](https://github.com/hyperledger/besu/pull/4530)
+- Reference tests are upgraded to use v12.1 of the ethereum tests [#5343](https://github.com/hyperledger/besu/pull/5343)
+- Add new sepolia bootnodes, which should improve peering in the testnet. [#5352](https://github.com/hyperledger/besu/pull/5352)
+- Renamed --bonsai-maximum-back-layers-to-load option to --bonsai-historical-block-limit for clarity. Removed --Xbonsai-use-snapshots option as it is no longer functional [#5337](https://github.com/hyperledger/besu/pull/5337)
+- Change Forest to use TransactionDB instead of OptimisticTransactionDB [#5328](https://github.com/hyperledger/besu/pull/5328)
+- Performance: Reduced usage of UInt256 in EVM operations [#5331](https://github.com/hyperledger/besu/pull/5331)
+- Changed wrong error message "Invalid params" when private tx is reverted to "Execution reverted" with correct revert reason in data. [#5369](https://github.com/hyperledger/besu/pull/5369)
+- Changes to the way gas is estimated to provide an exact gas estimate [#5142](https://github.com/hyperledger/besu/pull/5142)
+- Add zero reads to Bonsai TrieLogs [#5317](https://github.com/hyperledger/besu/pull/5317) 
+- Bonsai TrieLog serialization interface and default implementation [#5372](https://github.com/hyperledger/besu/pull/5372) 
+
+### Bug Fixes
+- Fix eth_getBlockByNumber cache error for latest block when called during syncing [#5292](https://github.com/hyperledger/besu/pull/5292)
+- Fix QBFT and IBFT unable to propose blocks on London when zeroBaseFee is used [#5276](https://github.com/hyperledger/besu/pull/5276) 
+- Make QBFT validator smart contract mode work with london fork [#5249](https://github.com/hyperledger/besu/issues/5249)
+- Try to connect to EthStats server by default with ssl followed by non-ssl. [#5301](https://github.com/hyperledger/besu/pull/5301)
+- Allow --miner-extra-data to be used in Proof-of-Stake block production [#5291](https://github.com/hyperledger/besu/pull/5291)
+- Add withdrawals to payloadId calculation to avoid collisions [#5321](https://github.com/hyperledger/besu/pull/5321) 
+- Re-implement trace_block, trace_filter and trace_replayBlockTransactions RPC endpoints to fix memory issues and improve performance [#5131](https://github.com/hyperledger/besu/pull/5131)
+
+### Download Links
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/23.4.0/besu-23.4.0.zip / sha256: 023a267ee07ed6e069cb15020c1c0262efc5ea0a3e32adc6596068cff7fd0be5
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/23.4.0/besu-23.4.0.tar.gz / sha256: 821695b3255c9f646f4d527e374219c96416f498231520f2eec2bebedc53f5a0
+
+## 23.1.3 - Nimbus Hotfix
+This update is strongly recommended for anyone running Nimbus with Besu. Due to the way Nimbus send request data, this can lead to a missed block proposal in certain circumstances.
+
+### Bug Fixes
+Add withdrawals to payloadId calculation to avoid collisions #5321
+Download Links
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/23.1.3/besu-23.1.3.tar.gz / sha256: 36898932a7535c4d126c1980443b33c9a4971f9354112992a18ee134c1777aa3
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/23.1.3/besu-23.1.3.zip / sha256: adb3b17e45217f86a56f07f09faba2e5d8a0eb8a585ad5307696d6cc58ee2f73
+
+## 23.1.2
+This update is a mainnet-compatible Shanghai/Capella upgrade and is recommended for all Mainnet users.
+
+### Breaking Changes
+
+### Additions and Improvements
+- Schedule Shanghai (Shapella) fork for Mainnet [#5230](https://github.com/hyperledger/besu/pull/5230)
+- Increase default from 1000 to 5000 for `--rpc-max-logs-range` [#5209](https://github.com/hyperledger/besu/pull/5209)
+- Bonsai-safe refactor [#5123](https://github.com/hyperledger/besu/pull/5123)
+- Safe tracing [#5197](https://github.com/hyperledger/besu/pull/5197)
+
+### Bug Fixes
+- Persist backward sync status to support resuming across restarts [#5182](https://github.com/hyperledger/besu/pull/5182)
+
+### Download Links
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/23.1.2/besu-23.1.2.tar.gz / sha256: 3d3a709a3aab993a0801b412a4719d74e319f942ddc13fb0f30b3c4a54d12538
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/23.1.2/besu-23.1.2.zip / sha256: 2a9ff091cb4349fc23625a52089400bb6529a831eb22d15d0221cb27039ab203
+
+## 23.1.1
+This update is required for the Goerli Shanghai/Capella upgrade and recommended for all Mainnet users. If you use Besu on Goerli, update to 23.1.1. If you previously used 23.1.1-RC1, update to test 23.1.1 on Goerli. 
+
+### Breaking Changes
+
+### Additions and Improvements
+- Add support for Shanghai in Sepolia https://github.com/hyperledger/besu/pull/5088
+- Add implementation for engine_getPayloadBodiesByRangeV1 and engine_getPayloadBodiesByHashV1 https://github.com/hyperledger/besu/pull/4980
+- If a PoS block creation repetition takes less than a configurable duration, then waits before next repetition https://github.com/hyperledger/besu/pull/5048
+- Allow other users to read the /opt/besu dir when using docker https://github.com/hyperledger/besu/pull/5092
+- Invalid params - add some error detail #5066
+- Added the option --kzg-trusted-setup to pass a custom setup file for custom networks or to override the default one for named networks [#5084](https://github.com/hyperledger/besu/pull/5084)
+- Gas accounting for EIP-4844 [#4992](https://github.com/hyperledger/besu/pull/4992)
+- Goerli configs for shapella [#5151](https://github.com/hyperledger/besu/pull/5151)
+
+### Bug Fixes
+- Fix engine_getPayloadV2 block value calculation [#5040](https://github.com/hyperledger/besu/issues/5040)
+- Moves check for init code length before balance check [#5077](https://github.com/hyperledger/besu/pull/5077)
+- Address concurrency problems with eth_call [#5179](https://github.com/hyperledger/besu/pull/5179)
+
+### Download Links
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/23.1.1/besu-23.1.1.tar.gz / sha256: 11c3e5cdbc06df16a690e7ee9f98eefa46848f9fa280824b6e4c896d88f6b975
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/23.1.1/besu-23.1.1.zip / sha256: afcf852f193adb8e82d187aa4f02e4669f12cc680270624d37101b94cf37adec
+
+## 23.1.1-RC1
+### Sepolia Shanghai Release aka Sepolia Shapella aka Shapolia
+
+This update is **not recommended for mainnet users**.
+
+Besu 23.1.1-RC1 is a **required update for Sepolia users**
+
+Sepolia Shanghai hardfork scheduled for: **Tue Feb 28 2023 04:04:48 UTC**
+
+---
+
+This release has everything from [23.1.0](https://github.com/hyperledger/besu/releases/tag/23.1.0) and in addition the following:
+
+### Additions and Improvements
+- Add support for Shanghai in Sepolia https://github.com/hyperledger/besu/pull/5088
+- Add implementation for engine_getPayloadBodiesByRangeV1 and engine_getPayloadBodiesByHashV1 https://github.com/hyperledger/besu/pull/4980
+- If a PoS block creation repetition takes less than a configurable duration, then waits before next repetition https://github.com/hyperledger/besu/pull/5048
+- Allow other users to read the /opt/besu dir when using docker https://github.com/hyperledger/besu/pull/5092
+- Invalid params - add some error detail [#5066](https://github.com/hyperledger/besu/pull/5066)
+
+### Bug fixes
+- Fix engine_getPayloadV2 block value calculation https://github.com/hyperledger/besu/issues/5040
+- Moves check for init code length before balance check https://github.com/hyperledger/besu/pull/5077
+
+### Download Links
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/23.1.1-RC1/besu-23.1.1-RC1.tar.gz / sha256: 82cff41f3eace02006b0e670605848e0e77e045892f8fa9aad66cbd84a88221e
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/23.1.1-RC1/besu-23.1.1-RC1.zip / sha256: 469c8d6a8ca9d78ee111ff1128d00bf3bcddacbf5b800ef6047717a2da0cc21d
+
+## 23.1.0
+Besu 23.1.0 is a recommended update for Mainnet users. Thank you all for your patience as we crafted this quarterly release.
+
+This is a rather large release with some breaking changes, so please be sure to read these notes carefully before you upgrade any Besu instances. We are including a move to Java 17 LTS. To build and run Besu, please make sure you have Java 17 on the host machine. Additionally, there are a host of spec compliance changes that change existing formats, so please check the specific RPC updates. Lastly, this release formalizes a deprecation notice for GoQuorum privacy modes and IBFT1.0 in Besu. These will be removed in the 23.4 series, unless otherwise stated.
+
+From the improvements and fixes side, we have a host of execution performance improvements and fixes for defects with bonsai storage. We have also included an error detection and auto-heal capability for nodes that encounter state issues. This should keep nodes online and validating that may have previously required a resync.
+
+One final note. 23.1.0 is not a Shanghai ready release. If you intend to test Besu on the long-lived testnets like Zhejiang, please [follow the instructions here](https://notes.ethereum.org/@launchpad/zhejiang). We will have more to share on our official Shanghai releases soon.
+
+### Breaking Changes
+- Change JsonRpc http service to return the error -32602 (Invalid params) with a 200 http status code
+- Besu requires minimum Java 17 and up to build and run [#3320](https://github.com/hyperledger/besu/issues/3320)
+- PKCS11 with nss module (PKCS11 based HSM can be used in DevP2P TLS and QBFT PKI) does not work with RSA keys
+  in Java 17. SoftHSM is tested manually and working. (Other PKCS11 HSM are not tested). The relevant unit and acceptance
+  tests are updated to use EC private keys instead of RSA keys.
+- Change eth_feeHistory parameter `blockCount` to accept hexadecimal string (was accepting plain integer) [#5047](https://github.com/hyperledger/besu/pull/5047)
+- Default configurations for the deprecated Ropsten, Kiln, Shandong, and Astor networks have been removed from the CLI network list. These networks can currently be accessed but will require a user-provided genesis configuration. [#4869](https://github.com/hyperledger/besu/pull/4869)
+- GoQuorum-compatible privacy is deprecated and will be removed in 23.4
+- IBFT 1.0 is deprecated and will be removed in 23.4
+- Optimize SSTORE Operation execution time (memoize current and original value) [#4836](https://github.com/hyperledger/besu/pull/4836)
+
+### Additions and Improvements
+- Default rpc batch request to 1024 [#5104](https://github.com/hyperledger/besu/pull/5104) [#5108](https://github.com/hyperledger/besu/pull/5108)
+- Add a new CLI option to limit the number of requests in a single RPC batch request. [#4965](https://github.com/hyperledger/besu/pull/4965)
+- Support for new DATAHASH opcode as part of EIP-4844 [#4823](https://github.com/hyperledger/besu/issues/4823)
+- Send only hash announcement for blob transaction type [#4940](https://github.com/hyperledger/besu/pull/4940)
+- Add `excess_data_gas` field to block header [#4958](https://github.com/hyperledger/besu/pull/4958)
+- Add `max_fee_per_data_gas` field to transaction [#4970](https://github.com/hyperledger/besu/pull/4970)
+- Added option to evm CLI tool to allow code execution at specific forks [#4913](https://github.com/hyperledger/besu/pull/4913)
+- Improve get account performance by using the world state updater cache [#4897](https://github.com/hyperledger/besu/pull/4897)
+- Add new KZG precompile and option to override the trusted setup being used [#4822](https://github.com/hyperledger/besu/issues/4822)
+- Add implementation for eth_createAccessList RPC method [#4942](https://github.com/hyperledger/besu/pull/4942)
+- Updated reference tests to v11.3 [#4996](https://github.com/hyperledger/besu/pull/4996)
+- Add DebugGetRawBlock and DebugGetRawHeader RPC methods [#5011](https://github.com/hyperledger/besu/pull/5011)
+- Besu requires minimum Java 17 and up to build and run [#3320](https://github.com/hyperledger/besu/issues/3320)
+- Add worldstate auto-heal mechanism [#5059](https://github.com/hyperledger/besu/pull/5059)
+- Support for EIP-4895 - Withdrawals for Shanghai fork
+- Improve SLOAD and SSTORE performance by caching empty slots [#4874](https://github.com/hyperledger/besu/pull/4874)
+- RPC methods that lookup block by hash will now return an error response if no block found [#4582](https://github.com/hyperledger/besu/pull/4582)
+- Added support for `safe` and `finalized` strings for the RPC methods using defaultBlock parameter [#4902](https://github.com/hyperledger/besu/pull/4902)
+- Added post-execution state logging option to EVM Tool [#4709](https://github.com/hyperledger/besu/pull/4709)
+- Add access list to Transaction Call Object [#4802](https://github.com/hyperledger/besu/issues/4801)
+- Add timestamp fork support, including shanghaiTime and cancunTime forks [#4743](https://github.com/hyperledger/besu/pull/4743)
+- Optimization:  Memoize transaction size and hash at the same time [#4812](https://github.com/hyperledger/besu/pull/4812)
+- Add chain data pruning feature with three experimental CLI options: `--Xchain-pruning-enabled`, `--Xchain-pruning-blocks-retained` and `--Xchain-pruning-frequency` [#4686](https://github.com/hyperledger/besu/pull/4686)
+  - Note that chain pruning is hidden and disabled by default. Once you choose to enable chain pruning, a new column family will be added to the db and you cannot roll back to a previous versi
+    on of Besu.
+
+### Bug Fixes
+- Mitigation fix for stale bonsai code storage leading to log rolling issues on contract recreates [#4906](https://github.com/hyperledger/besu/pull/4906)
+- Ensure latest cached layered worldstate is subscribed to storage, fix problem with RPC calls using 'latest' [#5076](https://github.com/hyperledger/besu/pull/5076)
+- Fix for segmentation faults on worldstate truncation, snap-sync starts [#4786](https://github.com/hyperledger/besu/pull/4786)
+- Fix for worldstate mismatch on failed forkchoiceUpdate [#4862](https://github.com/hyperledger/besu/pull/4862)
+
+Download Links
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/23.1.0/besu-23.1.0.tar.gz / sha256: 9081da04d47c3ff0a6ecc2256d353c7a02212f9b46f2c867a9365e18026c3a6e
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/23.1.0/besu-23.1.0.zip / sha256: e037f5c8f976150af40403311d1c81018f4c3dfbef0ad33324d8c3e708d1fdca
+
+## 23.1.0-RC1
+
+### Breaking Changes
+- Default configurations for the deprecated Ropsten, Kiln, Shandong, and Astor networks have been removed from the CLI network list. These networks can currently be accessed but will require a user-provided genesis configuration. [#4869](https://github.com/hyperledger/besu/pull/4869)
+
+### Additions and Improvements
+
+- Improve SLOAD and SSTORE performance by caching empty slots [#4874](https://github.com/hyperledger/besu/pull/4874)
+- RPC methods that lookup block by hash will now return an error response if no block found [#4582](https://github.com/hyperledger/besu/pull/4582)
+- Added support for `safe` and `finalized` strings for the RPC methods using defaultBlock parameter [#4902](https://github.com/hyperledger/besu/pull/4902)
+
+### Bug Fixes
+
+### Download Links
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/23.1.0-RC1/besu-23.1.0-RC1.tar.gz / sha256: 30906891e528b3b4e3ce8e2313550a1da066b31ea10b05456dd0ad026792b46d
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/23.1.0-RC1/besu-23.1.0-RC1.zip / sha256: 9067d1929079ae4a7c165e6f1e2bae08834939ed191f976d26544dc93352c306
+
+## 23.1.0-beta
+
+### Breaking Changes
+- GoQuorum-compatible privacy is deprecated and will be removed in 23.4
+- IBFT 1.0 is deprecated and will be removed in 23.4
+- Optimize SSTORE Operation execution time (memoize current and original value) [#4836](https://github.com/hyperledger/besu/pull/4836)
+
+### Additions and Improvements
+- Added post-execution state logging option to EVM Tool [#4709](https://github.com/hyperledger/besu/pull/4709)
+- Add access list to Transaction Call Object [#4802](https://github.com/hyperledger/besu/issues/4801)
+- Add timestamp fork support, including shanghaiTime and cancunTime forks [#4743](https://github.com/hyperledger/besu/pull/4743)
+- Optimization:  Memoize transaction size and hash at the same time [#4812](https://github.com/hyperledger/besu/pull/4812)
+- Add chain data pruning feature with three experimental CLI options: `--Xchain-pruning-enabled`, `--Xchain-pruning-blocks-retained` and `--Xchain-pruning-frequency` [#4686](https://github.com/hyperledger/besu/pull/4686)
+  - Note that chain pruning is hidden and disabled by default. Once you choose to enable chain pruning, a new column family will be added to the db and you cannot roll back to a previous version of Besu.
+
+### Bug Fixes
+- Fix for segmentation faults on worldstate truncation, snap-sync starts [#4786](https://github.com/hyperledger/besu/pull/4786)
+- Fix for worldstate mismatch on failed forkchoiceUpdate [#4862](https://github.com/hyperledger/besu/pull/4862)
+
+### Download Links
+
+## 22.10.3
+
+### Breaking Changes
+- Added `--rpc-max-logs-range` CLI option to allow limiting the number of blocks queried by `eth_getLogs` RPC API. Default value: 1000 [#4597](https://github.com/hyperledger/besu/pull/4597)
+- The `graalvm` docker variant no longer meets the performance requirements for Ethereum Mainnet.  The `openjdk-11` and `openjdk-latest` variants are recommended in its place.
+
+### Additions and Improvements
+- Implement Eth/68 sub-protocol [#4715](https://github.com/hyperledger/besu/issues/4715)
+- Increase the speed of modexp gas execution and execution. [#4780](https://github.com/hyperledger/besu/pull/4780)
+- Added experimental CLI options `--Xeth-capability-max` and `--Xeth-capability-min` to specify a range of capabilities to be supported by the Eth protocol. [#4752](https://github.com/hyperledger/besu/pull/4752)
+- Set the default curve in the EVMTool, like is done in production operations [#4790](https://github.com/hyperledger/besu/pull/4790)
+
+### Bug Fixes
+- Fix storage key format for eth_getProof so that it follows the EIP-1474 spec [#4564](https://github.com/hyperledger/besu/pull/4564)
+
+### Download Links
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/22.10.3/besu-22.10.3.tar.gz / sha256: 7213f9445a84a196e94ae1877c6fdb1e51d37bfb19615da02ef5121d4f40e38c
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/22.10.3/besu-22.10.3.zip / sha256: 0bf6bc98e01b0c1045f1b7d841a390c575bc5203c2a4e543d922fbc1ea0d3d5d
+
+## 22.10.2
+This is a hotfix release to resolve a race condition that results in segfaults, introduced in 22.10.1 release.
+
+### Bug Fixes
+- bugfix for async operations on Snapshot worldstates [#4767](https://github.com/hyperledger/besu/pull/4767)
+
+### Download Links
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/22.10.2/besu-22.10.2.tar.gz  / sha256: cdb36141e3cba6379d35016e0a2de2edba579d4786124b5f7257b1e4a68867a2
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/22.10.2/besu-22.10.2.zip / sha256: 4c9208f684762670cb4f2c6ebfb6930e05e339a7c3c586fe8caa9f26462830aa
+
+
+## 22.10.1
+
+### Breaking Changes
+- Fields `publicKey` and `raw` removed from RPC API `Transaction` result object [#4575](https://github.com/hyperledger/besu/pull/4575)
+
+### Additions and Improvements
+- Explain and improve price validation for London and local transactions during block proposal selection [#4602](https://github.com/hyperledger/besu/pull/4602)
+- Support for ephemeral testnet Shandong, for EOF testing. [#4599](https://github.com/hyperledger/besu/pull/4599)
+- Improve performance of block processing by parallelizing some parts during the "commit" step [#4635](https://github.com/hyperledger/besu/pull/4635)
+- Upgrade RocksDB version from 7.6.0 to 7.7.3
+- Added new RPC endpoints `debug_setHead` & `debug_replayBlock  [#4580](https://github.com/hyperledger/besu/pull/4580)
+- Upgrade OpenTelemetry to version 1.19.0 [#3675](https://github.com/hyperledger/besu/pull/3675)
+- Implement Eth/67 sub-protocol [#4596](https://github.com/hyperledger/besu/issues/4596)
+- Backward sync log UX improvements [#4655](https://github.com/hyperledger/besu/pull/4655)
+- Enable RocksDB Bloom filters to improve read performance [#4682](https://github.com/hyperledger/besu/pull/4682)
+- Backward sync: use retry switching peer when fetching data from peers [#4656](https://github.com/hyperledger/besu/pull/4656)
+- Shanghai implementation of EIP-3651 Warm coinbase [#4620](https://github.com/hyperledger/besu/pull/4620) 
+- Shanghai implementation of EIP-3855 Push0 [#4660](https://github.com/hyperledger/besu/pull/4660)
+- Shanghai implementation of EIP-3540 and EIP-3670 Ethereum Object Format and Code Validation [#4644](https://github.com/hyperledger/besu/pull/4644)
+- Remove some log statements that are keeping some objects live in heap for a long time, to reduce the amount of memory required during initial sync [#4705](https://github.com/hyperledger/besu/pull/4705)
+- Add field `type` to Transaction receipt object (eth_getTransactionReceipt) [#4505](https://github.com/hyperledger/besu/issues/4505)
+- Print an overview of configuration and system information at startup [#4451](https://github.com/hyperledger/besu/pull/4451)
+- Do not send new payloads to backward sync if initial sync is in progress [#4720](https://github.com/hyperledger/besu/issues/4720)
+- Improve the way transaction fee cap validation is done on London fee market to not depend on transient network conditions [#4598](https://github.com/hyperledger/besu/pull/4598) 
+- Preload and cache account and storage data from RocksDB to improve performance  [#4737](https://github.com/hyperledger/besu/issues/4737)
+
+### Bug Fixes
+- Restore updating chain head and finalized block during backward sync [#4718](https://github.com/hyperledger/besu/pull/4718)
+
+### Download Links
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/22.10.1/besu-22.10.1.tar.gz  / sha256: b6757b9fc69b782cdabb95b1e784d31b1effcc2e25c6b198b2f9d6b3786c7a8a
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/22.10.1/besu-22.10.1.zip / sha256: 0dbee534620c7cc0fac0596e6df0c7f8a74be9df9cecd9d4f1407016f30fb9a1
+
+## 22.10.0
+
+### Breaking Changes
+- Internal and interface APIs relating to storage have migrated from `UInt256` to `Bytes32` [#4562](https://github.com/hyperledger/besu/pull/4562)
+- Flexible Privacy Groups (early access) support to Tessera's EC encryptor (contracts modified) [#4282](https://github.com/hyperledger/besu/pull/4282)
+  * Before this change, the `bytes32` type was used for the enclave public keys, just supporting encryptors with public keys of that length (like the default NaCl)
+  * For the EC encryptor, the encoded public key length is 91
+- `--tx-pool-hashes-max-size` option removed (deprecated in 22.1.3)
+- `--Xmerge-support` option removed (deprecated in 22.4.2) [#4518](https://github.com/hyperledger/besu/pull/4518)
+- Breaking API changes in the `OperationTracer` interface to enable performance work.
+  * The `traceExecution` method has been replaced with `tracePreExecution` and `tracePostExecution` methods, called just before and just after operation execution.
+  * See `DebugOperationTracer` and `StandardJsonTracer` for migration examples.
+
+### Additions and Improvements
+- Updated jackson-databind library to version 2.13.4.2 addressing [CVE-2022-42003](https://nvd.nist.gov/vuln/detail/CVE-2022-42003)
+- Update snapsync feature to avoid restarting the download of the world state from scratch when restarting Besu [#4381](https://github.com/hyperledger/besu/pull/4381)
+- Added worldstate snapshot isolation to improve the stability of bonsai (`--Xbonsai-use-snapshots=true`) [#4351](https://github.com/hyperledger/besu/pull/4531)
+- Reduce the number of runtime exceptions (SecurityModuleException) and unnecessary executions during ECIES handshake, by trying to decrypt EIP-8 formatted messages first [#4508](https://github.com/hyperledger/besu/pull/4508).
+- Improved RLP processing of zero-length string as 0x80 [#4283](https://github.com/hyperledger/besu/pull/4283) [#4388](https://github.com/hyperledger/besu/issues/4388)
+- Increased level of detail in JSON-RPC parameter error log messages [#4510](https://github.com/hyperledger/besu/pull/4510)
+- New unstable configuration options to set the maximum time, in milliseconds, a PoS block creation jobs is allowed to run [#4519](https://github.com/hyperledger/besu/pull/4519)
+- Tune EthScheduler thread pools to avoid recreating too many threads [#4529](https://github.com/hyperledger/besu/pull/4529)
+- RocksDB snapshot based worldstate and plugin-api addition of Snapshot interfaces [#4409](https://github.com/hyperledger/besu/pull/4409)
+- Continuously try to build better block proposals until timeout or GetPayload is called [#4516](https://github.com/hyperledger/besu/pull/4516)
+- Upgrade RocksDB database version from 6.29.5 to 7.6.0 [#4517](https://github.com/hyperledger/besu/pull/4517)
+- Avoid connecting to self when using static-nodes [#4521](https://github.com/hyperledger/besu/pull/4521)
+- EVM performance has increased 20%-100% depending on the particulars of the contract. [#4540](https://github.com/hyperledger/besu/pull/4540)
+- Improve calculateRootHash method performance during Block processing [#4568](https://github.com/hyperledger/besu/pull/4568)
+- Bring GraphQL into compliance with execution-api specs [#4112](https://github.com/hyperledger/besu/pull/4112)
+- Refactor unverified forkchoice event [#4487](https://github.com/hyperledger/besu/pull/4487)
+- Improve UX of initial sync logs, pushing not relevant logs to debug level [#4486](https://github.com/hyperledger/besu/pull/4486)
+- Optimize pivot block selector on PoS networks [#4488](https://github.com/hyperledger/besu/pull/4488)
+- Optimize Snap sync on PoS networks [#4462](https://github.com/hyperledger/besu/pull/4462)
+
+### Bug Fixes
+- Fixed default fromBlock value and improved parameter interpretation in eth_getLogs RPC handler [#4513](https://github.com/hyperledger/besu/pull/4513)
+- Fix for NoSuchElementException for missing invalid reason when rejecting a local sent transaction [#4569](https://github.com/hyperledger/besu/pull/4569)
+- Corrects treating a block as bad on internal error during either validation or processing [#4512](https://github.com/hyperledger/besu/issues/4512)
+- Corrects emission of blockadded events when rewinding during a re-org. Fix for [#4495](https://github.com/hyperledger/besu/issues/4495)
+- Always return a transaction type for pending transactions [#4364](https://github.com/hyperledger/besu/pull/4364)
+- Avoid a cyclic reference while printing EngineExchangeTransitionConfigurationParameter [#4357](https://github.com/hyperledger/besu/pull/4357)
+- Corrects treating a block as bad on internal error [#4512](https://github.com/hyperledger/besu/issues/4512)
+- In GraphQL update scalar parsing to be variable friendly [#4522](https://github.com/hyperledger/besu/pull/4522)
+- Initiate connection to maintained peers soon after startup. [#4469](https://github.com/hyperledger/besu/pull/4469)
+- Update apache-commons-text to 1.10.0 to address CVE-2022-42889 [#4542](https://github.com/hyperledger/besu/pull/4542)
+
+### Download Links
+
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/22.10.0/besu-22.10.0.tar.gz  / sha256: 88fb5df567e4ec3547d7d2970cfef00debbd020c0da66b19166d43779b3b2b85
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/22.10.0/besu-22.10.0.zip / sha256: c8e39f7c879409cb9b47f4d3de5e9c521249083830a8c9a45e8a14a319fe195d
+
+## 22.10.0-RC2
+
+### Breaking Changes
+- Flexible Privacy Groups (early access) support to Tessera's EC encryptor (contracts modified) [#4282](https://github.com/hyperledger/besu/pull/4282)
+  * Before this change, the `bytes32` type was used for the enclave public keys, just supporting encryptors with public keys of that length (like the default NaCl)
+  * For the EC encryptor, the encoded public key length is 91
+- `--tx-pool-hashes-max-size` option removed (deprecated in 22.1.3)
+- `--Xmerge-support` option remove (deprecated in 22.4.2) [#4518](https://github.com/hyperledger/besu/pull/4518)
+- Breaking API changes in the `OperationTracer` interface to enable performance work.
+  * The `traceExecution` method has been replaced with `tracePreExecution` and `tracePostExecution` methods, called just before and just after operation execution. 
+  * See `DebugOperationTracer` and `StandardJsonTracer` for migration examples.
+
+### Additions and Improvements
+- Reduce the number of runtime exceptions (SecurityModuleException) and unnecessary executions during ECIES handshake, by trying to decrypt EIP-8 formatted messages first [#4508](https://github.com/hyperledger/besu/pull/4508).
+- Improved RLP processing of zero-length string as 0x80 [#4283](https://github.com/hyperledger/besu/pull/4283) [#4388](https://github.com/hyperledger/besu/issues/4388)
+- Increased level of detail in JSON-RPC parameter error log messages [#4510](https://github.com/hyperledger/besu/pull/4510)
+- New experimental configuration options to set the maximum time, in milliseconds, a PoS block creation jobs is allowed to run [#4519](https://github.com/hyperledger/besu/pull/4519)
+- Tune EthScheduler thread pools to avoid recreating too many threads [#4529](https://github.com/hyperledger/besu/pull/4529)
+- RocksDB snapshot based worldstate and plugin-api addition of Snapshot interfaces [#4409](https://github.com/hyperledger/besu/pull/4409)
+- Continuously try to build better block proposals until timeout or GetPayload is called [#4516](https://github.com/hyperledger/besu/pull/4516)
+- Upgrade RocksDB database version from 6.29.5 to 7.6.0 [#4517](https://github.com/hyperledger/besu/pull/4517)
+- Avoid connecting to self when using static-nodes [#4521](https://github.com/hyperledger/besu/pull/4521)
+- EVM performance has increased 20%-100% depending on the particulars of the contract. [#4540](https://github.com/hyperledger/besu/pull/4540)
+- Improve calculateRootHash method performance during Block processing [#4568](https://github.com/hyperledger/besu/pull/4568)
+
+### Bug Fixes
+- Corrects emission of blockadded events when rewinding during a re-org. Fix for [#4495](https://github.com/hyperledger/besu/issues/4495)
+- Always return a transaction type for pending transactions [#4364](https://github.com/hyperledger/besu/pull/4364)
+- Avoid a cyclic reference while printing EngineExchangeTransitionConfigurationParameter [#4357](https://github.com/hyperledger/besu/pull/4357)
+- Corrects treating a block as bad on internal error [#4512](https://github.com/hyperledger/besu/issues/4512)
+- In GraphQL update scalar parsing to be variable friendly [#4522](https://github.com/hyperledger/besu/pull/4522)
+- Initiate connection to maintained peers soon after startup. [#4469](https://github.com/hyperledger/besu/pull/4469)
+- Update apache-commons-text to 1.10.0 to address CVE-2022-42889 [#4542](https://github.com/hyperledger/besu/pull/4542)
+
+### Download Links
+
+
+## 22.10.0-RC1
+
+### Additions and Improvements
+- Bring GraphQL into compliance with execution-api specs [#4112](https://github.com/hyperledger/besu/pull/4112)
+- Refactor unverified forkchoice event [#4487](https://github.com/hyperledger/besu/pull/4487)
+- Improve UX of initial sync logs, pushing not relevant logs to debug level [#4486](https://github.com/hyperledger/besu/pull/4486)
+- Optimize pivot block selector on PoS networks [#4488](https://github.com/hyperledger/besu/pull/4488)
+- Optimize Snap sync on PoS networks [#4462](https://github.com/hyperledger/besu/pull/4462)
+
+### Bug Fixes
+
+### Download Links
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.10.0-RC1/besu-22.10.0-RC1.zip / sha256: 16fd47533aa2986491143e5f4a052c0aa4866ebfa415abbf3ca868e4fbeac6ce
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.10.0-RC1/besu-22.10.0-RC1.tar.gz / sha256: 48fd3480e4380580ed9187302be987e9eca2b445935ec6a509e7269898d8a4a8
+
+## 22.7.7
+
+### Additions and Improvements
+- Tune EthScheduler thread pools to avoid recreating too many threads [#4529](https://github.com/hyperledger/besu/issues/4529)
+- Reduce the number of runtime exceptions (SecurityModuleException) and unnecessary executions during ECIES handshake, by trying to decrypt EIP-8 formatted messages first [#4508](https://github.com/hyperledger/besu/pull/4508).
+- The block variable was keeping too much memory while waiting for future to finish [#4489](https://github.com/hyperledger/besu/issues/4489)
+
+### Bug Fixes
+- Corrects treating a block as bad on internal error [#4512](https://github.com/hyperledger/besu/issues/4512)
+- update appache-commons-text to 1.10.0 to address CVE-2022-42889 [#4542](https://github.com/hyperledger/besu/pull/4542)
+- In GraphQL update scalar parsing to be variable friendly [#4522](https://github.com/hyperledger/besu/pull/4522)
+
+### Download Links
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/22.7.7/besu-22.7.7.zip / sha256: 79b2b1518605603d8268f873f2576617ca8340d89c045e0eda6896f40defea0d
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/22.7.7/besu-22.7.7.tar.gz / sha256: 161c52ba9be8508767e80dbce796b4ad2cc5b649f7ed15387c6359d1e15753f6
+
+## 22.7.6
+Hotfix release of the 22.7.x series to address [#4495](https://github.com/hyperledger/besu/issues/4495) which could result in failed block proposals on merge networks.
+
+### Additions and Improvements
+- Bring GraphQL into compliance with execution-api specs [#4112](https://github.com/hyperledger/besu/pull/4112)
+
+### Bug Fixes
+- Corrects emission of blockadded events when rewinding during a re-org. [#4497](https://github.com/hyperledger/besu/issues/4497)
+
+### Download Links
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/22.7.6/besu-22.7.6.zip / sha256: ae05040027b96ba458a08cfee8577dafe1d85a3afce793f00f798cedb3ab547d
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/22.7.6/besu-22.7.6.tar.gz / sha256: 9e538852f16fd39b884c4c342beaad813e33ab24890634c01eee3d37dc1da893
+
+## 22.7.5
+
+### Additions and Improvements
+- Avoid sending added block events to transaction pool, and processing incoming transactions during initial sync [#4457](https://github.com/hyperledger/besu/pull/4457)
+- When building a new proposal, keep the best block built until now instead of the last one [#4455](https://github.com/hyperledger/besu/pull/4455)
+- Add Mainnet to merged networks [#4463](https://github.com/hyperledger/besu/pull/4463)
+
+### Bug Fixes
+- Fixed logIndex value returned by eth_getLogs RPC call [#4355](https://github.com/hyperledger/besu/pull/4355)
+
+### Download Links
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/22.7.5/besu-22.7.5.zip / sha256: b5d7b255b249beea0f46ec397122823c75f2373083a71a9f7b4c98b2b0f94997
+https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/22.7.5/besu-22.7.5.tar.gz / sha256: 91e3cbc16c46c53f7bf55bdd968553d0fb4087bff1e244cb03ac175ac54cf718
+
+
+## 22.7.4
+
+### Bug Fixes
+- Remove records that track transactions by sender when they are empty to same memory in the transaction pool [#4415](https://github.com/hyperledger/besu/pull/4415)
+- Add Toml configuration file support for _--Xplugin-rocksdb-high-spec-enabled_ flag [#4438](https://github.com/hyperledger/besu/pull/4438)
+
+### Download Links
+- https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/22.7.4/besu-22.7.4.zip / sha256: 4f2a0c20bee7f266ec1dcb45fa90ae1ca42f4b22e9b21a601b7705357259aea9
+- https://hyperledger.jfrog.io/hyperledger/besu-binaries/besu/22.7.4/besu-22.7.4.tar.gz / sha256: a60efc4d515ac94710bbc6d61a24f409b03fcfc02323bee2a2d75c883fc99dce
+
+## 22.7.3
+
+### Additions and Improvements
+- Allow free gas networks in the London fee market [#4061](https://github.com/hyperledger/besu/issues/4061)
+- Upgrade besu-native to 0.6.0 and use Blake2bf native implementation if available by default [#4264](https://github.com/hyperledger/besu/pull/4264)
+- Resets engine QoS timer with every call to the engine API instead of only when ExchangeTransitionConfiguration is called [#4411](https://github.com/hyperledger/besu/issues/4411)
+- ExchangeTransitionConfiguration mismatch will only submit a debug log not a warning anymore [#4411](https://github.com/hyperledger/besu/issues/4411)
+- Upgrade besu-native to 0.6.1 and include linux arm64 build of bls12-381 [#4416](https://github.com/hyperledger/besu/pull/4416)
+- Create a new flag on RocksDB (_--Xplugin-rocksdb-high-spec-enabled_) for high spec hardware to boost performance
+- Transaction pool improvements to avoid filling the pool with not executable transactions, that could result in empty or semi-empty block proposals [#4425](https://github.com/hyperledger/besu/pull/4425)
+- Limit Transaction pool consumption by sender to a configurable percentage of the pool size [#4417](https://github.com/hyperledger/besu/pull/4417)
+
+### Bug Fixes
+- Retry block creation if there is a transient error and we still have time, to mitigate empty block issue [#4407](https://github.com/hyperledger/besu/pull/4407)
+- Fix StacklessClosedChannelException in Besu and resulted timeout errors in CL clients ([#4398](https://github.com/hyperledger/besu/issues/4398), [#4400](https://github.com/hyperledger/besu/issues/4400))
+- Return JSON-RPC error code instead of INVALID in engine api when certain storage exceptions are encountered ([#4349](https://github.com/hyperledger/besu/issues/4349))
+
+### Download links
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.7.3/besu-22.7.3.tar.gz / sha256: `b0863fe2406cab57caf8a02f2bf02632cc5198622ac48b69bc63c128703bbd79`
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.7.3/besu-22.7.3.zip / sha256: `368c6cb86119f8fe30bb12ab8c63b4d95a0fd8baf9c9414307a0a4033756b709`
+
+## 22.7.2
+### Besu 22.7.2 is a recommended release for the Merge and Mainnet users. 22.7.1 remains Merge-ready. This release provides additional robustness before the Merge with some fixes and improvements in sync, peering, and logging.
+
+### Additions and Improvements
+- Better management of jemalloc presence/absence in startup script [#4237](https://github.com/hyperledger/besu/pull/4237)
+- Retry mechanism when getting a broadcasted block fail on all peers [#4271](https://github.com/hyperledger/besu/pull/4271)
+- Filter out disconnected peers when fetching available peers [#4269](https://github.com/hyperledger/besu/pull/4269)
+- Updated the default value of fast-sync-min-peers post merge [#4298](https://github.com/hyperledger/besu/pull/4298)
+- Log imported block info post merge [#4310](https://github.com/hyperledger/besu/pull/4310)
+- Transaction pool eviction by sender from tail of transaction list [#4327](https://github.com/hyperledger/besu/pull/4327)
+- Transaction pool sender future nonce limits [#4336](https://github.com/hyperledger/besu/pull/4336)
+- Pandas! Pandas now appear in 3 phases: The black bear and polar bear that are preparing? Those will appear when
+your client has TTD configured (which is setup by default for mainnet), is in sync, and processing Proof of Work blocks. In the second phase you will see them powering up when the Terminal Total Difficulty block is added to the blockchain.
+The final form of the Ethereum Panda will appear when the first finalized block is received from the Consensus Layer.
+
+### Bug Fixes
+- Accept wit/80 from Nethermind [#4279](https://github.com/hyperledger/besu/pull/4279)
+- Properly shutdown the miner executor, to avoid waiting 30 seconds when stopping [#4353](https://github.com/hyperledger/besu/pull/4353)
+
+### Download links
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.7.2/besu-22.7.2.tar.gz / sha256: `8030a48f824c7bbc138b38a9e84e5531950bc16f6d21cda8b215232cce334214`
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.7.2/besu-22.7.2.zip / sha256: `72653171b1ddd910e705fc6f616d7f1f4c120ef0d91718f0376f3ee5f2982c11`
+
+
+## 22.7.1
+### Merge Ready Release. Required update for The Merge on ethereum mainnet!
+### Additions and Improvements
+- Introduce a cap to reputation score increase [#4230](https://github.com/hyperledger/besu/pull/4230)
+- Add experimental CLI option for `--Xp2p-peer-lower-bound` [#4200](https://github.com/hyperledger/besu/pull/4200)
+- Improve pending blocks retrieval mechanism [#4227](https://github.com/hyperledger/besu/pull/4227)
+- Set mainnet terminal total difficulty [#4260](https://github.com/hyperledger/besu/pull/4260)
+
+### Bug Fixes
+- Fixes off-by-one error for mainnet TTD fallback [#4223](https://github.com/hyperledger/besu/pull/4223)
+- Fix off-by-one error in AbstractRetryingPeerTask [#4254](https://github.com/hyperledger/besu/pull/4254)
+- Refactor and fix retrying get block switching peer [#4256](https://github.com/hyperledger/besu/pull/4256)
+- Fix encoding of key (short hex) in eth_getProof [#4261](https://github.com/hyperledger/besu/pull/4261)
+- Fix for post-merge networks fast-sync [#4224](https://github.com/hyperledger/besu/pull/4224), [#4276](https://github.com/hyperledger/besu/pull/4276)
+
+### Download links
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.7.1/besu-22.7.1.tar.gz / sha256: `7cca4c11e1d7525c172f2af9fbf456d134ada60e970d8b6abcfcd6c623b5dd36`
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.7.1/besu-22.7.1.zip / sha256: `ba6e0b9b65ac36d041a5072392f119ff76e8e9f53a3d7b1e1a658ef1e4705d7a`
+
+
+
+## 22.7.0
+
+### Additions and Improvements
+- Deprecation warning for Ropsten, Rinkeby, Kiln [#4173](https://github.com/hyperledger/besu/pull/4173)
+
+### Bug Fixes
+
+- Fixes previous known issue [#3890](https://github.com/hyperledger/besu/issues/3890)from RC3 requiring a restart post-merge to continue correct transaction handling.
+- Stop producing stack traces when a get headers response only contains the range start header [#4189](https://github.com/hyperledger/besu/pull/4189)
+- Upgrade Spotless to 6.8.0 [#4195](https://github.com/hyperledger/besu/pull/4195)
+- Upgrade Gradle to 7.5 [#4196](https://github.com/hyperledger/besu/pull/4196)
+
+### Download links
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.7.0/besu-22.7.0.tar.gz / sha256: `af21104a880c37706b660aa816e1c38b2b3f603a97420ddcbc889324b71aa50e`
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.7.0/besu-22.7.0.zip / sha256: `5b1586362e6e739c206c25224bb753a372bad70c0b22dbe091f9253024ebdc45`
+
+## 22.7.0-RC3
+
+### Known/Outstanding issues:
+- Besu requires a restart post-merge to re-enable remote transaction processing [#3890](https://github.com/hyperledger/besu/issues/3890)
+
+### Additions and Improvements
+- Engine API: Change expiration time for JWT tokens to 60s [#4168](https://github.com/hyperledger/besu/pull/4168)
+- Sepolia mergeNetSplit block [#4158](https://github.com/hyperledger/besu/pull/4158)
+- Goerli TTD [#4160](https://github.com/hyperledger/besu/pull/4160)
+- Several logging improvements
+
+### Bug Fixes
+- Allow to set any value for baseFeePerGas in the genesis file [#4177](https://github.com/hyperledger/besu/pull/4177)
+- Fix for stack overflow when searching for TTD block [#4169](https://github.com/hyperledger/besu/pull/4169)
+- Fix for chain stuck issue [#4175](https://github.com/hyperledger/besu/pull/4175)
+
+### Download links
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.7.0-RC3/besu-22.7.0-RC3.tar.gz / sha256: `6a1ee89c82db9fa782d34733d8a8c726670378bcb71befe013da48d7928490a6`
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.7.0-RC3/besu-22.7.0-RC3.zip / sha256: `5de22445ab2a270cf33e1850cd28f1946442b7104738f0d1ac253a009c53414e`
+
+## 22.7.0-RC2
+
+### Additions and Improvements
+- Add a block to the bad blocks if it did not descend from the terminal block [#4080](https://github.com/hyperledger/besu/pull/4080)
+- Backward sync exception improvements [#4092](https://github.com/hyperledger/besu/pull/4092)
+- Remove block header checks during backward sync, since they will be always performed during block import phase [#4098](https://github.com/hyperledger/besu/pull/4098)
+- Optimize the backward sync retry strategy [#4095](https://github.com/hyperledger/besu/pull/4095)
+- Add support for jemalloc library to better handle rocksdb memory consumption [#4126](https://github.com/hyperledger/besu/pull/4126)
+- RocksDB configuration changes to improve performance. [#4132](https://github.com/hyperledger/besu/pull/4132)
+
+### Bug Fixes
+- Changed max message size in the p2p layer to 16.7MB from 10MB to improve peering performance [#4120](https://github.com/hyperledger/besu/pull/4120)
+- Fixes for parent stateroot mismatch when using Bonsai storage mode (please report if you encounter this bug on this version) [#4094](https://github.com/hyperledger/besu/pull/4094)
+- Above Bonsai related fixes have addressed situations where the event log was not indexed properly [#3921](https://github.com/hyperledger/besu/pull/3921)
+- Fixes related to backward sync and reorgs [#4097](https://github.com/hyperledger/besu/pull/4097)
+- Checkpoint sync with more merge friendly checkpoint blocks [#4085](https://github.com/hyperledger/besu/pull/4085)
+- Fixes around RocksDB performance and memory usage [#4128](https://github.com/hyperledger/besu/pull/4128)
+- Fix for RPC performance parallelization to improve RPC performance under heavy load [#3959](https://github.com/hyperledger/besu/pull/3959)
+- Fix for post-Merge peering after PoW is removed in our logic for weighting peers [#4116](https://github.com/hyperledger/besu/pull/4116)
+- Various logging changes to improve UX- Return the correct latest valid hash in case of bad block when calling engine methods [#4056](https://github.com/hyperledger/besu/pull/4056)
+- Add a PoS block header rule to check that the current block is more recent than its parent [#4066](https://github.com/hyperledger/besu/pull/4066)
+- Fixed a trie log layer issue on bonsai during reorg [#4069](https://github.com/hyperledger/besu/pull/4069)
+- Fix transition protocol schedule to return the pre Merge schedule when reorg pre TTD [#4078](https://github.com/hyperledger/besu/pull/4078)
+- Remove hash to sync from the queue only if the sync step succeeds [#4105](https://github.com/hyperledger/besu/pull/4105)
+- The build process runs successfully even though the system language is not English [#4102](https://github.com/hyperledger/besu/pull/4102)
+- Avoid starting or stopping the BlockPropagationManager more than once [#4122](https://github.com/hyperledger/besu/pull/4122)
+
+### Download links
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.7.0-RC2/besu-22.7.0-RC2.tar.gz / sha256: `befe15b893820c9c6451a74fd87b41f555ff28561494b3bebadd5da5c7ce25d3`
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.7.0-RC2/besu-22.7.0-RC2.zip / sha256: `d56c340f5982b882fbecca2697ca72a5bbefe0e978d2d4504211f012e2242a81`
+
+## 22.7.0-RC1
+
+### Additions and Improvements
+- Do not require a minimum block height when downloading headers or blocks [#3911](https://github.com/hyperledger/besu/pull/3911)
+- When on PoS the head can be only be updated by ForkchoiceUpdate [#3994](https://github.com/hyperledger/besu/pull/3994)
+- Version information available in metrics [#3997](https://github.com/hyperledger/besu/pull/3997)
+- Add TTD and DNS to Sepolia config [#4024](https://github.com/hyperledger/besu/pull/4024)
+- Return `type` with value `0x0` when serializing legacy transactions [#4027](https://github.com/hyperledger/besu/pull/4027)
+- Ignore `ForkchoiceUpdate` if `newHead` is an ancestor of the chain head [#4055](https://github.com/hyperledger/besu/pull/4055)
+
+### Bug Fixes
+- Fixed a snapsync issue that can sometimes block the healing step [#3920](https://github.com/hyperledger/besu/pull/3920)
+- Support free gas networks in the London fee market [#4003](https://github.com/hyperledger/besu/pull/4003)
+- Limit the size of outgoing eth subprotocol messages.  [#4034](https://github.com/hyperledger/besu/pull/4034)
+- Fixed a state root mismatch issue on bonsai that may appear occasionally [#4041](https://github.com/hyperledger/besu/pull/4041)
+
+### Download links
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.7.0-RC1/besu-22.7.0-RC1.tar.gz / sha256: `60ad8b53402beb62c24ad791799d9cfe444623a58f6f6cf1d0728459cb641e63`
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.7.0-RC1/besu-22.7.0-RC1.zip / sha256: `7acfb3a73382bf70f6337e83cb7e9e472b4e5a9da88c5ed2fbd9e82fcf2046dc`
+
+## 22.4.3
+
+### Additions and Improvements
+- \[EXPERIMENTAL\] Add checkpoint sync `--sync-mode="X_CHECKPOINT"` [#3849](https://github.com/hyperledger/besu/pull/3849)
+- Support `finalized` and `safe` as tags for the block parameter in RPC APIs [#3950](https://github.com/hyperledger/besu/pull/3950)
+- Added verification of payload attributes in ForkchoiceUpdated [#3837](https://github.com/hyperledger/besu/pull/3837)
+- Add support for Gray Glacier hardfork [#3961](https://github.com/hyperledger/besu/issues/3961)
+
+### Bug Fixes
+- alias engine-rpc-port parameter with the former rpc param name [#3958](https://github.com/hyperledger/besu/pull/3958)
+
+## 22.4.2
+
+### Additions and Improvements
+- Engine API Update: Replace deprecated INVALID_TERMINAL_BLOCK with INVALID last valid hash 0x0 [#3882](https://github.com/hyperledger/besu/pull/3882)
+- Deprecate experimental merge flag and engine-rpc-enabled flag [#3875](https://github.com/hyperledger/besu/pull/3875)
+- Update besu-native dependencies to 0.5.0 for linux arm64 support
+- Update ropsten TTD to 100000000000000000000000
+
+### Bug Fixes
+- Stop backward sync if genesis block has been reached [#3869](https://github.com/hyperledger/besu/pull/3869)
+- Allow to backward sync to request headers back to last finalized block if present or genesis [#3888](https://github.com/hyperledger/besu/pull/3888)
+
+### Download link
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.4.2/besu-22.4.2.zip / sha256: `e8e9eb7e3f544ecefeec863712fb8d3f6a569c9d70825a4ed2581c596db8fd45`
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.4.2/besu-22.4.2.tar.gz / sha256: `9db0c37440cb56bcf671b8de13e0ecb6235171a497bdad91020b8c4a9dac2a27`
+
+## 22.4.1
+
+### Additions and Improvements
+- GraphQL - allow null log topics in queries which match any topic [#3662](https://github.com/hyperledger/besu/pull/3662)
+- multi-arch docker builds for amd64 and arm64 [#2954](https://github.com/hyperledger/besu/pull/2954)
+- Filter Netty native lib errors likewise the pure Java implementation [#3807](https://github.com/hyperledger/besu/pull/3807)
+- Add ropsten terminal total difficulty config [#3871](https://github.com/hyperledger/besu/pull/3871)
+
+### Bug Fixes
+- Stop the BlockPropagationManager when it receives the TTD reached event [#3809](https://github.com/hyperledger/besu/pull/3809)
+- Correct getMixHashOrPrevRandao to return the value present in the block header [#3839](https://github.com/hyperledger/besu/pull/3839)
+
+## 22.4.0
+
+### Breaking Changes
+- Version 22.4.x will be the last series to support Java 11. Version 22.7.0 will require Java 17 to build and run.
+- In the Besu EVM Library all references to SHA3 have been renamed to the more accurate name Keccak256, including class names and comment. [#3749](https://github.com/hyperledger/besu/pull/3749)
+- Removed the Gas object and replaced it with a primitive long [#3674](https://github.com/hyperledger/besu/pull/3674)
+- Column family added for backward sync [#3638](https://github.com/hyperledger/besu/pull/3638)
+  - Note that this added column family makes this a one-way upgrade. That is, once you upgrade your db to this version, you cannot roll back to a previous version of Besu.
+
+### Bug Fixes
+- Fix nullpointer on snapsync [#3773](https://github.com/hyperledger/besu/pull/3773)
+- Introduce RocksDbSegmentIdentifier to avoid changing the storage plugin [#3755](https://github.com/hyperledger/besu/pull/3755)
+
+## Download Links
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.4.0/besu-22.4.0.zip / SHA256 d89e102a1941e70be31c176a6dd65cd5f3d69c4c
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.4.0/besu-22.4.0.tar.gz / SHA256 868e38749dd40debe028624f8267f1fce7587010
+
+## 22.4.0-RC2
+
+### Breaking Changes
+- In the Besu EVM Library all references to SHA3 have been renamed to the more accurate name Kecack256, including class names and comment. [#3749](https://github.com/hyperledger/besu/pull/3749)
+
+### Additions and Improvements
+- Onchain node permissioning
+  - Log the enodeURL that was previously only throwing an IllegalStateException during the isPermitted check [#3697](https://github.com/hyperledger/besu/pull/3697),
+  - Fail startup if node permissioning smart contract version does not match [#3765](https://github.com/hyperledger/besu/pull/3765)
+- \[EXPERIMENTAL\] Add snapsync `--sync-mode="X_SNAP"` (only as client) [#3710](https://github.com/hyperledger/besu/pull/3710)
+- Adapt Fast sync, and Snap sync, to use finalized block, from consensus layer, as pivot after the Merge [#3506](https://github.com/hyperledger/besu/issues/3506)
+- Add IPC JSON-RPC interface (BSD/MacOS and Linux only) [#3695](https://github.com/hyperledger/besu/pull/3695)
+- Column family added for backward sync [#3638](https://github.com/hyperledger/besu/pull/3638)
+  - Note that this added column family makes this a one-way upgrade. That is, once you upgrade your db to this version, you cannot roll back to a previous version of Besu.
+
+## Download Links
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.4.0-RC2/besu-22.4.0-RC2.zip /  SHA256 5fa7f927c6717ebf503291c058815cd0c5fcfab13245d3b6beb66eb20cf7ac24
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.4.0-RC2/besu-22.4.0-RC2.tar.gz / SHA256 1c4ecd17552cf5ebf120fc35dad753f45cb951ea0f817381feb2477ec0fff9c9
+
+## 22.4.0-RC1
+
+### Additions and Improvements
+- Unit tests are now executed with JUnit5 [#3620](https://github.com/hyperledger/besu/pull/3620)
+- Removed the Gas object and replaced it with a primitive long [#3674]
+
+### Bug Fixes
+- Flexible Privacy Precompile handles null payload ID [#3664](https://github.com/hyperledger/besu/pull/3664)
+- Subcommand blocks import throws exception [#3646](https://github.com/hyperledger/besu/pull/3646)
+
+## Download Links
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.4.0-RC1/besu-22.4.0-RC1.zip / SHA256 0779082acc20a98eb810eb08778e0c0e1431046c07bc89019a2761fd1baa4c25
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.4.0-RC1/besu-22.4.0-RC1.tar.gz / SHA256 15d8b0e335f962f95da46864109db9f28ed4f7bc351995b2b8db477c12b94860
+
+## 22.1.3
+
+### Breaking Changes
+- Remove the experimental flag for bonsai tries CLI options `--data-storage-format` and `--bonsai-maximum-back-layers-to-load` [#3578](https://github.com/hyperledger/besu/pull/3578)
+- Column family added for backward sync [#3532](https://github.com/hyperledger/besu/pull/3532)
+  - Note that this added column family makes this a one-way upgrade. That is, once you upgrade your db to this version, you cannot roll back to a previous version of Besu.
+
+### Deprecations
+- `--tx-pool-hashes-max-size` is now deprecated and has no more effect, and it will be removed in a future release.
+
+### Additions and Improvements
+- Tune transaction synchronization parameter to adapt to mainnet traffic [#3610](https://github.com/hyperledger/besu/pull/3610)
+- Improve eth/66 support [#3616](https://github.com/hyperledger/besu/pull/3616)
+- Avoid reprocessing remote transactions already seen [#3626](https://github.com/hyperledger/besu/pull/3626)
+- Upgraded jackson-databind dependency version [#3647](https://github.com/hyperledger/besu/pull/3647)
+
+## Download Links
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.1.3/besu-22.1.3.zip /  SHA256 9dafb80f2ec9ce8d732fd9e9894ca2455dd02418971c89cd6ccee94c53354d5d
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.1.3/besu-22.1.3.tar.gz / SHA256 f9f8d37353aa4b5d12e87c08dd86328c1cffc591c6fc9e076c0f85a1d4663dfe
+
+## 22.1.2
+
+### Additions and Improvements
+- Execution layer (The Merge):
+  - Execution specific RPC endpoint [#3378](https://github.com/hyperledger/besu/issues/3378)
+  - Adds JWT authentication to Engine APIs
+  - Supports kiln V2.1 spec
+- Tracing APIs
+  - new API methods: trace_rawTransaction, trace_get, trace_callMany
+  - added revertReason to trace APIs including: trace_transaction, trace_get, trace_call, trace_callMany, and trace_rawTransaction
+- Allow mining beneficiary to transition at specific blocks for ibft2 and qbft consensus mechanisms.  [#3115](https://github.com/hyperledger/besu/issues/3115)
+- Return richer information from the PrecompiledContract interface. [\#3546](https://github.com/hyperledger/besu/pull/3546)
+
+### Bug Fixes
+- Reject locally-sourced transactions below the minimum gas price when not mining. [#3397](https://github.com/hyperledger/besu/pull/3397)
+- Fixed bug with contract address supplied to `debug_accountAt` [#3518](https://github.com/hyperledger/besu/pull/3518)
+
+## Download Links
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.1.2/besu-22.1.2.zip /  SHA256 1b26e3f8982c3a9dbabc72171f83f1cfe89eef84ead45b184ee9101f411c1251
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.1.2/besu-22.1.2.tar.gz / SHA256 1eca9abddf351eaaf4e6eaa1b9536b8b4fd7d30a81d39f9d44ffeb198627ee7a
+
+## 22.1.1
+
+### Additions and Improvements
+- Allow optional RPC methods that bypass authentication [#3382](https://github.com/hyperledger/besu/pull/3382)
+- Execution layer (The Merge):
+  - Extend block creation and mining to support The Merge [#3412](https://github.com/hyperledger/besu/pull/3412)
+  - Backward sync [#3410](https://github.com/hyperledger/besu/pull/3410)
+  - Extend validateAndProcessBlock to return an error message in case of failure, so it can be returned to the caller of ExecutePayload API [#3411](https://github.com/hyperledger/besu/pull/3411)
+  - Persist latest finalized block [#2913](https://github.com/hyperledger/besu/issues/2913)
+  - Add PostMergeContext, and stop syncing after the switch to PoS [#3453](https://github.com/hyperledger/besu/pull/3453)
+  - Add header validation rules needed to validate The Merge blocks [#3454](https://github.com/hyperledger/besu/pull/3454)
+  - Add core components: controller builder, protocol scheduler, coordinator, block creator and processor. [#3461](https://github.com/hyperledger/besu/pull/3461)
+  - Execution specific RPC endpoint [#2914](https://github.com/hyperledger/besu/issues/2914), [#3350](https://github.com/hyperledger/besu/pull/3350)
+- QBFT consensus algorithm is production ready
+
+## Download Links
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.1.1/besu-22.1.1.zip /  SHA256 cfff79e19e5f9a184d0b62886990698b77d019a0745ea63b5f9373870518173e
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.1.1/besu-22.1.1.tar.gz / SHA256 51cc9d35215f977ac7338e5c611c60f225fd6a8c1c26f188e661624a039e83f3
+
+## 22.1.0
+
+### Breaking Changes
+- Plugin API: BlockHeader.getBaseFee() method now returns an optional Wei instead of an optional Long [#3065](https://github.com/hyperledger/besu/issues/3065)
+- Removed deprecated hash variable `protected volatile Hash hash;` which was used for private transactions [#3110](https://github.com/hyperledger/besu/pull/3110)
+
+### Additions and Improvements
+- Add support for additional JWT authentication algorithms [#3017](https://github.com/hyperledger/besu/pull/3017)
+- Represent baseFee as Wei instead of long accordingly to the spec [#2785](https://github.com/hyperledger/besu/issues/2785)
+- Implements [EIP-4399](https://eips.ethereum.org/EIPS/eip-4399) to repurpose DIFFICULTY opcode after the merge as a source of entropy from the Beacon chain. [#3081](https://github.com/hyperledger/besu/issues/3081)
+- Re-order external services (e.g JsonRpcHttpService) to start before blocks start processing [#3118](https://github.com/hyperledger/besu/pull/3118)
+- Stream JSON RPC responses to avoid creating big JSON strings in memory [#3076](https://github.com/hyperledger/besu/pull/3076)
+- Ethereum Classic Mystique Hard Fork [#3256](https://github.com/hyperledger/besu/pull/3256)
+- Genesis file parameter `blockperiodseconds` is validated as a positive integer on startup to prevent unexpected runtime behaviour [#3186](https://github.com/hyperledger/besu/pull/3186)
+- Add option to require replay protection for locally submitted transactions [\#1975](https://github.com/hyperledger/besu/issues/1975)
+- Update to block header validation for IBFT and QBFT to support London fork EIP-1559 [#3251](https://github.com/hyperledger/besu/pull/3251)
+- Move into SLF4J as logging facade [#3285](https://github.com/hyperledger/besu/pull/3285)
+- Changing the order in which we traverse the word state tree during fast sync. This should improve fast sync during subsequent pivot changes.[#3202](https://github.com/hyperledger/besu/pull/3202)
+- Updated besu-native to version 0.4.3 [#3331](https://github.com/hyperledger/besu/pull/3331)
+- Refactor synchronizer to asynchronously retrieve blocks from peers, and to change peer when retrying to get a block. [#3326](https://github.com/hyperledger/besu/pull/3326)
+- Disable RocksDB TTL compactions [#3356](https://github.com/hyperledger/besu/pull/3356)
+- add a websocket frame size configuration CLI parameter [#3386](https://github.com/hyperledger/besu/pull/3386)
+- Add `--ec-curve` parameter to export/export-address public-key subcommands [#3333](https://github.com/hyperledger/besu/pull/3333)
+
+### Bug Fixes
+- Change the base docker image from Debian Buster to Ubuntu 20.04 [#3171](https://github.com/hyperledger/besu/issues/3171) fixes [#3045](https://github.com/hyperledger/besu/issues/3045)
+- Make 'to' field optional in eth_call method according to the spec [#3177](https://github.com/hyperledger/besu/pull/3177)
+- Update to log4j 2.17.1. Resolves potential vulnerability only exploitable when using custom log4j configurations that are writable by untrusted users.
+- Fix regression on cors-origin star value
+- Fix for ethFeeHistory accepting hex values for blockCount
+- Fix a sync issue, when the chain downloader incorrectly shutdown when a task in the pipeline is cancelled. [#3319](https://github.com/hyperledger/besu/pull/3319)
+- add a websocket frame size configuration CLI parameter [3368][https://github.com/hyperledger/besu/pull/3379]
+- Prevent node from peering to itself [#3342](https://github.com/hyperledger/besu/pull/3342)
+- Fix an `IndexOutOfBoundsException` exception when getting block from peers. [#3304](https://github.com/hyperledger/besu/issues/3304)
+- Handle legacy eth64 without throwing null pointer exceptions [#3343](https://github.com/hyperledger/besu/pull/3343)
+
+### Download Links
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.1.0/besu-22.1.0.tar.gz \ SHA256 232bd7f274691ca14c26289fdc289d3fcdf69426dd96e2fa1601f4d079645c2f
+- https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/22.1.0/besu-22.1.0.zip \ SHA256 1b701ff5b647b64aff3d73d6f1fe3fdf73f14adbe31504011eff1660ab56ad2b
+
+## 21.10.9
+
+### Bug Fixes
+- Fix regression on cors-origin star value
+- Fix for ethFeeHistory accepting hex values for blockCount
+
+ **Full Changelog**: https://github.com/hyperledger/besu/compare/21.10.8...21.10.9
+
+[besu-21.10.9.tar.gz](https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/21.10.9/besu-21.10.9.tar.gz) a4b85ba72ee73017303e4b2f0fdde84a87d376c2c17fdcebfa4e34680f52fc71
+[besu-21.10.9.zip](https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/21.10.9/besu-21.10.9.zip) c3ba3f07340fa80064ba7c06f2c0ec081184e000f9a925d132084352d0665ef9
+
+## 21.10.8
+
+### Additions and Improvements
+- Ethereum Classic Mystique Hard Fork [#3256](https://github.com/hyperledger/besu/pull/3256)
+
+### Download Links
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/21.10.8/besu-21.10.8.tar.gz \ SHA256 d325e2e36bc38a707a9eebf92068f5021606a8c6b6464bb4b4d59008ef8014fc
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/21.10.8/besu-21.10.8.zip \ SHA256 a91da1e82fb378e16437327bba56dd299aafdb0614ba528167a1dae85440c5af
+
+## 21.10.7
+
+### Bug Fixes
+- Update dependencies (including vert.x, kubernetes client-java, okhttp, commons-codec)
+
+### Additions and Improvements
+- Add support for additional JWT authentication algorithms [#3017](https://github.com/hyperledger/besu/pull/3017)
+- Remove Orion ATs
+
+### Download Links
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/21.10.7/besu-21.10.7.tar.gz \ SHA256 94cee804fcaea366c9575380ef0e30ed04bf2fc7451190a94887f14c07f301ff
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/21.10.7/besu-21.10.7.zip \ SHA256 faf1ebfb20aa6171aa6ea98d7653339272567c318711d11e350471b5bba62c00
+
+## 21.10.6
+
+### Bug Fixes
+- Update log4j to 2.17.1
+
+### Download Links
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/21.10.6/besu-21.10.6.tar.gz \ SHA256 ef579490031dd4eb3704b4041e352cfb2e7e787fcff7506b69ef88843d4e1220
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/21.10.6/besu-21.10.6.zip \ SHA256 0fdda65bc993905daa14824840724d0b74e3f16f771f5726f5307f6d9575a719
+
+## 21.10.5
+
+### Bug Fixes
+- Update log4j to 2.17.0
+
+### Download Links
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/21.10.5/besu-21.10.5.tar.gz \ SHA256 0d1b6ed8f3e1325ad0d4acabad63c192385e6dcbefe40dc6b647e8ad106445a8
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/21.10.5/besu-21.10.5.zip \ SHA256 a1689a8a65c4c6f633b686983a6a1653e7ac86e742ad2ec6351176482d6e0c57
+
+## 21.10.4
+
+### Bug Fixes
+- Update log4j to 2.16.0.
+- Change the base docker image from Debian Buster to Ubuntu 20.04 [#3171](https://github.com/hyperledger/besu/issues/3171) fixes [#3045](https://github.com/hyperledger/besu/issues/3045)
+
+### Download links
+This release is not recommended for production use.
+
+## 21.10.3
+
+### Additions and Improvements
+- Updated log4j to 2.15.0 and disabled JNDI message format lookups to improve security.
+- Represent baseFee as Wei instead of long accordingly to the spec [#2785](https://github.com/hyperledger/besu/issues/2785)
+- Adding support of the NO_COLOR environment variable as described in the [NO_COLOR](https://no-color.org/) standard [#3085](https://github.com/hyperledger/besu/pull/3085)
+- Add `privx_findFlexiblePrivacyGroup` RPC Method, `privx_findOnchainPrivacyGroup` will be removed in a future release [#3075](https://github.com/hyperledger/besu/pull/3075)
+- The invalid value is now shown when `--bootnodes` cannot parse an item to make it easier to identify which option is invalid.
+- Adding two new options to be able to specify desired TLS protocol version and Java cipher suites [#3105](https://github.com/hyperledger/besu/pull/3105)
+- Implements [EIP-4399](https://eips.ethereum.org/EIPS/eip-4399) to repurpose DIFFICULTY opcode after the merge as a source of entropy from the Beacon chain. [#3081](https://github.com/hyperledger/besu/issues/3081)
+
+### Bug Fixes
+- Change the base docker image from Debian Buster to Ubuntu 20.04 [#3171](https://github.com/hyperledger/besu/issues/3171) fixes [#3045](https://github.com/hyperledger/besu/issues/3045)
+
+### Download Link
+This release is not recommended for production use.
+
+## 21.10.2
+
+### Additions and Improvements
+- Add discovery options to genesis file [#2944](https://github.com/hyperledger/besu/pull/2944)
+- Add validate-config subcommand to perform basic syntax validation of TOML config [#2994](https://github.com/hyperledger/besu/pull/2994)
+- Updated Sepolia Nodes [#3034](https://github.com/hyperledger/besu/pull/3034) [#3035](https://github.com/hyperledger/besu/pull/3035)
+
+### Bug Fixes
+- Reduce shift calculations to shifts that may have an actual result. [#3039](https://github.com/hyperledger/besu/pull/3039)
+- DNS Discovery daemon wasn't started [#3033](https://github.com/hyperledger/besu/pull/3033)
+
+### Download Link
+This release is not recommended for production use.
+
+## 21.10.1
+
+### Additions and Improvements
+- Add CLI autocomplete scripts. [#2854](https://github.com/hyperledger/besu/pull/2854)
+- Add support for PKCS11 keystore on PKI Block Creation. [#2865](https://github.com/hyperledger/besu/pull/2865)
+- Optimize EVM Memory for MLOAD Operations [#2917](https://github.com/hyperledger/besu/pull/2917)
+- Upgrade CircleCI OpenJDK docker image to version 11.0.12. [#2928](https://github.com/hyperledger/besu/pull/2928)
+- Update JDK 11 to latest version in Besu Docker images. [#2925](https://github.com/hyperledger/besu/pull/2925)
+- Add Sepolia proof-of-work testnet configurations [#2920](https://github.com/hyperledger/besu/pull/2920)
+- Allow block period to be configured for IBFT2 and QBFT using transitions [#2902](https://github.com/hyperledger/besu/pull/2902)
+- Add support for binary messages (0x02) for websocket. [#2980](https://github.com/hyperledger/besu/pull/2980)
+
+### Bug Fixes
+- Do not change the sender balance, but set gas fee to zero, when simulating a transaction without enforcing balance checks. [#2454](https://github.com/hyperledger/besu/pull/2454)
+- Ensure genesis block has the default base fee if london is at block 0 [#2920](https://github.com/hyperledger/besu/pull/2920)
+- Fixes the exit condition for loading a BonsaiPersistedWorldState for a sibling block of the last one persisted [#2967](https://github.com/hyperledger/besu/pull/2967)
+
+### Early Access Features
+- Enable plugins to expose custom JSON-RPC / WebSocket methods [#1317](https://github.com/hyperledger/besu/issues/1317)
+
+### Download Link
+This release is not recommended for production use.
+
+## 21.10.0
+
+### Additions and Improvements
+- The EVM has been factored out into a standalone module, suitable for inclusion as a library. [#2790](https://github.com/hyperledger/besu/pull/2790)
+- Low level performance improvements changes to cut worst-case EVM performance in half. [#2796](https://github.com/hyperledger/besu/pull/2796)
+- Migrate `ExceptionalHaltReason` from an enum to an interface to allow downstream users of the EVM to add new exceptional halt reasons. [#2810](https://github.com/hyperledger/besu/pull/2810)
+- reduces need for JUMPDEST analysis via caching [#2607](https://github.com/hyperledger/besu/pull/2821)
+- Add support for custom private key file for public-key export and public-key export-address commands [#2801](https://github.com/hyperledger/besu/pull/2801)
+- Add CLI autocomplete scripts. [#2854](https://github.com/hyperledger/besu/pull/2854)
+- Added support for PKCS11 keystore on PKI Block Creation. [#2865](https://github.com/hyperledger/besu/pull/2865)
+- add support for ArrowGlacier hardfork [#2943](https://github.com/hyperledger/besu/issues/2943)
+
+### Bug Fixes
+- Allow BESU_CONFIG_FILE environment to specify TOML file [#2455](https://github.com/hyperledger/besu/issues/2455)
+- Fix bug with private contracts not able to call public contracts that call public contracts [#2816](https://github.com/hyperledger/besu/pull/2816)
+- Fixes the exit condition for loading a BonsaiPersistedWorldState for a sibling block of the last one persisted [#2967](https://github.com/hyperledger/besu/pull/2967)
+- Fixes bonsai getMutable regression affecting fast-sync [#2934](https://github.com/hyperledger/besu/pull/2934)
+- Regression in RC1 involving LogOperation and frame memory overwrites [#2908](https://github.com/hyperledger/besu/pull/2908)
+- Allow `eth_call` and `eth_estimateGas` to accept contract address as sender. [#2891](https://github.com/hyperledger/besu/pull/2891)
+
+### Early Access Features
+- Enable plugins to expose custom JSON-RPC / WebSocket methods [#1317](https://github.com/hyperledger/besu/issues/1317)
+
+### Download Link
+This release is not recommended for production use. \
+SHA256: 71374454753c2ee595f4f34dc6913f731818d50150accbc98088aace313c6935
+
+## 21.10.0-RC4
+
+### Additions and Improvements
+
+### Bug Fixes
+- Fixes the exit condition for loading a BonsaiPersistedWorldState for a sibling block of the last one persisted [#2967](https://github.com/hyperledger/besu/pull/2967)
+- Fixes bonsai getMutable regression affecting fast-sync [#2934](https://github.com/hyperledger/besu/pull/2934)
+
+### Early Access Features
+### Download Link
+This release is not recommended for production use. \
+SHA256: b16e15764b8bc06c5c3f9f19bc8b99fa48e7894aa5a6ccdad65da49bbf564793
+
+## 21.10.0-RC3
+
+### Bug Fixes
+- Regression in RC1 involving LogOperation and frame memory overwrites [#2908](https://github.com/hyperledger/besu/pull/2908)
+- Allow `eth_call` and `eth_estimateGas` to accept contract address as sender. [#2891](https://github.com/hyperledger/besu/pull/2891)
+- Fix Concurrency issues in Ethpeers. [#2896](https://github.com/hyperledger/besu/pull/2896)
+
+### Download
+This release is not recommended for production use. \
+SHA256: 3d4857589336717bf5e4e5ef711b9a7f3bc46b49e1cf5b3b6574a00ccc6eda94
+
+## 21.10.0-RC1/RC2
+### Additions and Improvements
+- The EVM has been factored out into a standalone module, suitable for inclusion as a library. [#2790](https://github.com/hyperledger/besu/pull/2790)
+- Low level performance improvements changes to cut worst-case EVM performance in half. [#2796](https://github.com/hyperledger/besu/pull/2796)
+- Migrate `ExceptionalHaltReason` from an enum to an interface to allow downstream users of the EVM to add new exceptional halt reasons. [#2810](https://github.com/hyperledger/besu/pull/2810)
+- reduces need for JUMPDEST analysis via caching [#2607](https://github.com/hyperledger/besu/pull/2821)
+- Add support for custom private key file for public-key export and public-key export-address commands [#2801](https://github.com/hyperledger/besu/pull/2801)
+
+### Bug Fixes
+- Allow BESU_CONFIG_FILE environment to specify TOML file [#2455](https://github.com/hyperledger/besu/issues/2455)
+- Fix bug with private contracts not able to call public contracts that call public contracts [#2816](https://github.com/hyperledger/besu/pull/2816)
+
+### Early Access Features
+
+### Download
+This release is not recommended for production use. \
+SHA256: 536612e5e4d7a5e7a582f729f01ba591ba68cc389e8379fea3571ed85322ff51
+
+
+## 21.7.4
+### Additions and Improvements
+- Upgrade Gradle to 7.2, which supports building with Java 17 [#2761](https://github.com/hyperledger/besu/pull/2376)
+
+### Bug Fixes
+- Set an idle timeout for metrics connections, to clean up ports when no longer used [\#2748](https://github.com/hyperledger/besu/pull/2748)
+- Onchain privacy groups can be unlocked after being locked without having to add a participant [\#2693](https://github.com/hyperledger/besu/pull/2693)
+- Update Gas Schedule for Ethereum Classic [#2746](https://github.com/hyperledger/besu/pull/2746)
+
+### Early Access Features
+- \[EXPERIMENTAL\] Added support for QBFT with PKI-backed Block Creation. [#2647](https://github.com/hyperledger/besu/issues/2647)
+- \[EXPERIMENTAL\] Added support for QBFT to use retrieve validators from a smart contract [#2574](https://github.com/hyperledger/besu/pull/2574)
+
+### Download Link
+https://hyperledger.jfrog.io/native/besu-binaries/besu/21.7.4/besu-21.7.4.zip \
+SHA256: 778d3c42851db11fec9171f77b22662f2baeb9b2ce913d7cfaaf1042ec19b7f9
+
+## 21.7.3
+### Additions and Improvements
+- Migration to Apache Tuweni 2.0 [\#2376](https://github.com/hyperledger/besu/pull/2376)
+- \[EXPERIMENTAL\] Added support for DevP2P-over-TLS [#2536](https://github.com/hyperledger/besu/pull/2536)
+- `eth_getWork`, `eth_submitWork` support over the Stratum port [#2581](https://github.com/hyperledger/besu/pull/2581)
+- Stratum metrics [#2583](https://github.com/hyperledger/besu/pull/2583)
+- Support for mining ommers [#2576](https://github.com/hyperledger/besu/pull/2576)
+- Updated onchain permissioning to validate permissions on transaction submission [\#2595](https://github.com/hyperledger/besu/pull/2595)
+- Removed deprecated CLI option `--privacy-precompiled-address` [#2605](https://github.com/hyperledger/besu/pull/2605)
+- Removed code supporting EIP-1702. [#2657](https://github.com/hyperledger/besu/pull/2657)
+- A native library was added for the alternative signature algorithm secp256r1, which will be used by default [#2630](https://github.com/hyperledger/besu/pull/2630)
+- The command line option --Xsecp-native-enabled was added as an alias for --Xsecp256k1-native-enabled [#2630](https://github.com/hyperledger/besu/pull/2630)
+- Added Labelled gauges for metrics [#2646](https://github.com/hyperledger/besu/pull/2646)
+- support for `eth/66` networking protocol [#2365](https://github.com/hyperledger/besu/pull/2365)
+- update RPC methods for post london 1559 transaction [#2535](https://github.com/hyperledger/besu/pull/2535)
+- \[EXPERIMENTAL\] Added support for using DNS host name in place of IP address in onchain node permissioning rules [#2667](https://github.com/hyperledger/besu/pull/2667)
+- Implement EIP-3607 Reject transactions from senders with deployed code. [#2676](https://github.com/hyperledger/besu/pull/2676)
+- Ignore all unknown fields when supplied to eth_estimateGas or eth_call. [\#2690](https://github.com/hyperledger/besu/pull/2690)
+
+### Bug Fixes
+- Consider effective price and effective priority fee in transaction replacement rules [\#2529](https://github.com/hyperledger/besu/issues/2529)
+- GetTransactionCount should return the latest transaction count if it is greater than the transaction pool [\#2633](https://github.com/hyperledger/besu/pull/2633)
+
+### Early Access Features
+
+## 21.7.2
+
+### Additions and Improvements
+This release contains improvements and bugfixes for optimum compatibility with other London client versions.
+
+## Bug Fixes
+- hotfix for private transaction identification for mainnet transactions [#2609](https://github.com/hyperledger/besu/pull/2609)
+
+## Download Link
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/21.7.2/besu-21.7.2.zip \
+db47fd9ba33b36436ed6798d2474f7621c733353fd04f49d6defffd12e3b6e14
+
+
+## 21.7.1
+
+### Additions and Improvements
+- `priv_call` now uses NO_TRACING OperationTracer implementation which improves memory usage [\#2482](https://github.com/hyperledger/besu/pull/2482)
+- Ping and Pong messages now support ENR encoding as scalars or bytes [\#2512](https://github.com/hyperledger/besu/pull/2512)
+
+### Download Link
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/21.7.1/besu-21.7.1.zip \
+sha256sum 83fc44e39a710a95d8b6cbbbf04010dea76122bafcc633a993cd15304905a402
+
+## 21.7.0
+
+### Additions and Improvements
+This release contains the activation blocks for London across all supported testnets. They are:
+  * Ropsten 10_499_401 (24 Jun 2021)
+  * Goerli 5_062_605 (30 Jun 2021)
+  * Rinkeby 8_897_988 (7 Jul 2021)
+  * Mainnet 12_965_000 (4 Aug 2021)
+- eip-1559 changes: accept transactions which have maxFeePerGas below current baseFee [\#2374](https://github.com/hyperledger/besu/pull/2374)
+- Introduced transitions for IBFT2 block rewards [\#1977](https://github.com/hyperledger/besu/pull/1977)
+- Change Ethstats's status from experimental feature to stable. [\#2405](https://github.com/hyperledger/besu/pull/2405)
+- Fixed disabling of native libraries for secp256k1 and altBn128. [\#2163](https://github.com/hyperledger/besu/pull/2163)
+- eth_feeHistory API for wallet providers [\#2466](https://github.com/hyperledger/besu/pull/2466)
+
+### Bug Fixes
+- Ibft2 could create invalid RoundChange messages in some circumstances containing duplicate prepares [\#2449](https://github.com/hyperledger/besu/pull/2449)
+- Updated `eth_sendRawTransaction` to return an error when maxPriorityFeePerGas exceeds maxFeePerGas [\#2424](https://github.com/hyperledger/besu/pull/2424)
+- Fixed NoSuchElementException with EIP1559 transaction receipts when using eth_getTransactionReceipt [\#2477](https://github.com/hyperledger/besu/pull/2477)
+
+### Early Access Features
+- QBFT is a Byzantine Fault Tolerant consensus algorithm, building on the capabilities of IBFT and IBFT 2.0. It aims to provide performance improvements in cases of excess round change, and provides interoperability with other EEA compliant clients, such as GoQuorum.
+  - Note: QBFT currently only supports new networks. Existing networks using IBFT2.0 cannot migrate to QBFT. This will become available in a future release.
+  - Note: QBFT is an early access feature pending community feedback. Please make use of QBFT in new development networks and reach out in case of issues or concerns
+- GoQuorum-compatible privacy. This mode uses Tessera and is interoperable with GoQuorum.
+  - Note: GoQuorum-compatible privacy is an early access feature pending community feedback.
+
+### Download Link
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/21.7.0/besu-21.7.0.zip
+sha256sum 389465fdcc2cc5e5007a02dc2b8a2c43d577198867316bc5cc4392803ed71034
+
+## 21.7.0-RC2
+
+### Additions and Improvements
+- eth_feeHistory API for wallet providers [\#2466](https://github.com/hyperledger/besu/pull/2466)
+### Bug Fixes
+- Ibft2 could create invalid RoundChange messages in some circumstances containing duplicate prepares [\#2449](https://github.com/hyperledger/besu/pull/2449)
+
+## Download Link
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/21.7.0-RC2/besu-21.7.0-RC2.zip
+sha256sum 7bc97c359386cad84d449f786dc0a8ed8728616b6704ce473c63f1d94af3a9ef
+
+
+## 21.7.0-RC1
+
+### Additions and Improvements
+- eip-1559 changes: accept transactions which have maxFeePerGas below current baseFee [\#2374](https://github.com/hyperledger/besu/pull/2374)
+- Introduced transitions for IBFT2 block rewards [\#1977](https://github.com/hyperledger/besu/pull/1977)
+- Change Ethstats's status from experimental feature to stable. [\#2405](https://github.com/hyperledger/besu/pull/2405)
+- Fixed disabling of native libraries for secp256k1 and altBn128. [\#2163](https://github.com/hyperledger/besu/pull/2163)
+
+
+### Bug Fixes
+
+- Updated `eth_sendRawTransaction` to return an error when maxPriorityFeePerGas exceeds maxFeePerGas [\#2424](https://github.com/hyperledger/besu/pull/2424)
+
+### Early Access Features
+This release contains the activation blocks for London across all supported testnets. They are:
+  * Ropsten 10_499_401 (24 Jun 2021)
+  * Goerli 5_062_605 (30 Jun 2021)
+  * Rinkeby 8_897_988 (7 Jul 2021)
+
+## Download Link
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/21.7.0-RC1/besu-21.7.0-RC1.zip
+sha256sum fc959646af65a0e267fc4d695e0af7e87331d774e6e8e890f5cc391549ed175a
+
+## 21.1.7
+
+## Privacy users - Orion Project Deprecation
+Tessera is now the recommended Private Transaction Manager for Hyperledger Besu.
+
+Now that all primary Orion functionality has been merged into Tessera, Orion is being deprecated.
+We encourage all users with active projects to use the provided migration instructions,
+documented [here](https://docs.orion.consensys.net/en/latest/Tutorials/Migrating-from-Orion-to-Tessera/).
+
+We will continue to support Orion users until 30th November 2021. If you have any questions or
+concerns, please reach out to the ConsenSys protocol engineering team in the
+[#orion channel on Discord](https://discord.gg/hYpHRjK) or by [email](mailto:quorum@consensys.net).
+
+
+### Additions and Improvements
+* Upgrade OpenTelemetry to 1.2.0. [\#2313](https://github.com/hyperledger/besu/pull/2313)
+
+* Ethereum Classic Magneto Hard Fork [\#2315](https://github.com/hyperledger/besu/pull/2315)
+
+* Added support for the upcoming CALAVERAS ephemeral testnet and removed the configuration for the deprecated BAIKAL ephemeral testnet. [\#2343](https://github.com/hyperledger/besu/pull/2343)
+
+### Bug Fixes
+* Fix invalid transfer values with the tracing API specifically for CALL operation [\#2319](https://github.com/hyperledger/besu/pull/2319)
+
+### Early Access Features
+
+#### Previously identified known issues
+
+- Fixed issue in discv5 where nonce was incorrectly reused. [\#2075](https://github.com/hyperledger/besu/pull/2075)
+- Fixed issues in debug_standardTraceBadBlockToFile and debug_standardTraceBlockToFile. [\#2120](https://github.com/hyperledger/besu/pull/2120)
+- Fixed invalid error code in several JSON RPC methods when the requested block is not in the range. [\#2138](https://github.com/hyperledger/besu/pull/2138)
+
+## Download Link
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/21.1.7/besu-21.1.7.zip
+
+sha256: f415c9b67d26819caeb9940324b2b1b9ce6e872c9181052739438545e84e2531
+
+
+## 21.1.6
+
+### Additions and Improvements
+
+* Added support for the upcoming BAIKAL ephemeral testnet and removed the configuration for the deprecated YOLOv3 ephemeral testnet. [\#2237](https://github.com/hyperledger/besu/pull/2237)
+* Implemented [EIP-3541](https://eips.ethereum.org/EIPS/eip-3541): Reject new contracts starting with the 0xEF byte [\#2243](https://github.com/hyperledger/besu/pull/2243)
+* Implemented [EIP-3529](https://eips.ethereum.org/EIPS/eip-3529): Reduction in refunds [\#2238](https://github.com/hyperledger/besu/pull/2238)
+* Implemented [EIP-3554](https://eips.ethereum.org/EIPS/eip-3554): Difficulty Bomb Delay [\#2289](https://github.com/hyperledger/besu/pull/2289)
+* \[EXPERIMENTAL\] Added support for secp256r1 keys. [#2008](https://github.com/hyperledger/besu/pull/2008)
+
+### Bug Fixes
+
+- Added ACCESS_LIST transactions to the list of transactions using legacy gas pricing for 1559 [\#2239](https://github.com/hyperledger/besu/pull/2239)
+- Reduced logging level of public key decoding failure of malformed packets. [\#2143](https://github.com/hyperledger/besu/pull/2143)
+- Add 1559 parameters to json-rpc responses.  [\#2222](https://github.com/hyperledger/besu/pull/2222)
+
+### Early Access Features
+
+#### Previously identified known issues
+
+- Fixed issue in discv5 where nonce was incorrectly reused. [\#2075](https://github.com/hyperledger/besu/pull/2075)
+- Fixed issues in debug_standardTraceBadBlockToFile and debug_standardTraceBlockToFile. [\#2120](https://github.com/hyperledger/besu/pull/2120)
+- Fixed invalid error code in several JSON RPC methods when the requested block is not in the range. [\#2138](https://github.com/hyperledger/besu/pull/2138)
+
+## Download Link
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/21.1.6/besu-21.1.6.zip
+
+sha256: 3952c69a32bb390ec84ccf4c2c3eb600ea3696af9a05914985d10e1632ef8488
+
+## 21.1.5
+
+### Additions and Improvements
+
+- Ignore `nonce` when supplied to eth_estimateGas or eth_call. [\#2133](https://github.com/hyperledger/besu/pull/2133)
+- Ignore `privateFor` for tx estimation. [\#2160](https://github.com/hyperledger/besu/pull/2160)
+
+### Bug Fixes
+
+- Fixed `NullPointerException` when crossing network upgrade blocks when peer discovery is disabled. [\#2140](https://github.com/hyperledger/besu/pull/2140)
+
+### Early Access Features
+
+#### Previously identified known issues
+
+- Fixed issue in discv5 where nonce was incorrectly reused. [\#2075](https://github.com/hyperledger/besu/pull/2075)
+- Fixed issues in debug_standardTraceBadBlockToFile and debug_standardTraceBlockToFile. [\#2120](https://github.com/hyperledger/besu/pull/2120)
+
+## Download Link
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/21.1.5/besu-21.1.5.zip
+
+sha256: edd78fcc772cfa97d11d8ee7b5766e6fac4b31b582f940838a292f2aeb204777
+
+## 21.1.4
+
+### Additions and Improvements
+
+- Adds `--discovery-dns-url` CLI command [\#2088](https://github.com/hyperledger/besu/pull/2088)
+
+### Bug Fixes
+
+- Fixed issue in discv5 where nonce was incorrectly reused. [\#2075](https://github.com/hyperledger/besu/pull/2075)
+- Fixed issues in debug_standardTraceBadBlockToFile and debug_standardTraceBlockToFile. [\#2120](https://github.com/hyperledger/besu/pull/2120)
+
+### Early Access Features
+
+#### Previously identified known issues
+
+- [Fast sync when running Besu on cloud providers](KNOWN_ISSUES.md#fast-sync-when-running-besu-on-cloud-providers)
+- [Privacy users with private transactions created using v1.3.4 or earlier](KNOWN_ISSUES.md#privacy-users-with-private-transactions-created-using-v134-or-earlier)
+
+## Download Link
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/21.1.4/besu-21.1.4.zip
+58ae55b492680d92aeccfbed477e8b9c25ccc1a97cca71895e27448d754a7d8b
+
+## 21.1.3
+
+### Additions and Improvements
+* Increase node diversity when downloading blocks [\#2033](https://github.com/hyperledger/besu/pull/2033)
+
+### Bug Fixes
+* Ethereum Node Records are now dynamically recalculated when we pass network upgrade blocks. This allows for better peering through transitions without needing to restart the node. [\#1998](https://github.com/hyperledger/besu/pull/1998)
+
+
+### Early Access Features
+
+#### Previously identified known issues
+
+- [Fast sync when running Besu on cloud providers](KNOWN_ISSUES.md#fast-sync-when-running-besu-on-cloud-providers)
+- [Privacy users with private transactions created using v1.3.4 or earlier](KNOWN_ISSUES.md#privacy-users-with-private-transactions-created-using-v134-or-earlier)
+
+### Download link
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/21.1.3/besu-21.1.3.zip
+38893cae225e5c53036d06adbeccc30aeb86ef08c543fb742941a8c618485c8a
+
+## 21.1.2
+
+### Berlin Network Upgrade
+
+### Important note: the 21.1.1 release contains an outdated version of the Berlin network upgrade. If you are using Besu on public Ethereum networks, you must upgrade to 21.1.2.
+
+This release contains the activation blocks for Berlin across all supported testnets and the Ethereum mainnet. They are:
+  * Ropsten 9_812_189 (10 Mar 2021)
+  * Goerli 4_460_644 (17 Mar 2021)
+  * Rinkeby 8_290_928 (24 Mar 2021)
+  * Ethereum 12_244_000 (14 Apr 2021)
+
+
+### Additions and Improvements
+- Added option to set a limit for JSON-RPC connections
+  * HTTP connections `--rpc-http-max-active-connections` [\#1996](https://github.com/hyperledger/besu/pull/1996)
+  * WS connections `--rpc-ws-max-active-connections` [\#2006](https://github.com/hyperledger/besu/pull/2006)
+- Added ASTOR testnet ETC support [\#2017](https://github.com/hyperledger/besu/pull/2017)
+### Bug Fixes
+* Don't Register BLS12 precompiles for Berlin [\#2015](https://github.com/hyperledger/besu/pull/2015)
+
+#### Previously identified known issues
+
+- [Fast sync when running Besu on cloud providers](KNOWN_ISSUES.md#fast-sync-when-running-besu-on-cloud-providers)
+- [Privacy users with private transactions created using v1.3.4 or earlier](KNOWN_ISSUES.md#privacy-users-with-private-transactions-created-using-v134-or-earlier)
+
+### Download link
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/21.1.2/besu-21.1.2.zip
+02f4b6622756b77fed814d8c1bbf986c6178d8f5adb9d61076e061124c3d12aa
+
+## 21.1.1
+
+### Berlin Network Upgrade
+
+### Important note: this release contains an outdated version of the Berlin network upgrade. If you are using Besu on public Ethereum networks, you must upgrade to 21.1.2.
+
+This release contains the activation blocks for Berlin across all supported testnets and the Ethereum mainnet. They are:
+  * Ropsten 9_812_189 (10 Mar 2021)
+  * Goerli 4_460_644 (17 Mar 2021)
+  * Rinkeby 8_290_928 (24 Mar 2021)
+  * Ethereum 12_244_000 (14 Apr 2021)
+
+### Additions and Improvements
+* Removed EIP-2315 from the Berlin network upgrade [\#1983](https://github.com/hyperledger/besu/pull/1983)
+* Added `besu_transaction_pool_transactions` to the reported metrics, counting the mempool size [\#1869](https://github.com/hyperledger/besu/pull/1869)
+* Distributions and maven artifacts have been moved off of bintray [\#1886](https://github.com/hyperledger/besu/pull/1886)
+* admin_peers json RPC response now includes the remote nodes enode URL
+* add support for keccak mining and a ecip1049_dev network [\#1882](https://github.com/hyperledger/besu/pull/1882)
+### Bug Fixes
+* Fixed incorrect `groupId` in published maven pom files.
+* Fixed GraphQL response for missing account, return empty account instead [\#1946](https://github.com/hyperledger/besu/issues/1946)
+
+### Early Access Features
+
+#### Previously identified known issues
+
+- [Fast sync when running Besu on cloud providers](KNOWN_ISSUES.md#fast-sync-when-running-besu-on-cloud-providers)
+- [Privacy users with private transactions created using v1.3.4 or earlier](KNOWN_ISSUES.md#privacy-users-with-private-transactions-created-using-v134-or-earlier)
+
+### Download link
+sha256: `c22a80a54e9fed864734b9fbd69a0a46840fd27ca5211648a3eaf8a955417218 `
+
+
+## 21.1.0
+
+### Important note: this release contains an outdated version of the Berlin network upgrade, which was changed on March 5, 2021 ([link](https://github.com/ethereum/pm/issues/263#issuecomment-791473406)). If you are using Besu on public Ethereum networks, you must upgrade to 21.1.2.
+
+## 21.1.0 Features
+
+Features added between 20.10.0 to 21.1.0 include:
+* Berlin Network Upgrade: this release contains the activation blocks for Berlin across all supported testnets and the Ethereum mainnet. They are:
+  * Ropsten 9_812_189 (10 Mar 2021)
+  * Goerli 4_460_644 (17 Mar 2021)
+  * Rinkeby 8_290_928 (24 Mar 2021)
+  * Ethereum 12_244_000 (14 Apr 2021)
+* Besu Launcher: Besu now has support for the [Quorum Mainnet Launcher](https://github.com/ConsenSys/quorum-mainnet-launcher) which makes it easy for users to configure and launch Besu on the Ethereum mainnet.
+* Bonsai Tries: A new database format which reduces storage requirements and improves performance for access to recent state. _Note: only full sync is currently supported._
+* Miner Data JSON-RPC: The `eth_getMinerDataByBlockHash` and `eth_getMinerDataByBlockNumber` endpoints return miner rewards and coinbase address for a given block.
+* EIP-1898 support: [The EIP](https://eips.ethereum.org/EIPS/eip-1898) adds `blockHash` to JSON-RPC methods which accept a default block parameter.
+
+### Early Access Features
+* Bonsai Tries: A new database format which reduces storage requirements and improves performance for access to recent state. _Note: only full sync is currently supported._
+* QBFT: A new consensus algorithm to support interoperability with other Enterprise Ethereum Alliance compatible clients.
+
+### 21.1.0 Breaking Changes
+* `--skip-pow-validation-enabled` is now an error with `block import --format JSON`. This is because the JSON format doesn't include the nonce so the proof of work must be calculated.
+* `eth_call` will not return a JSON-RPC result if the call fails, but will return an error instead. If it was for a revert the revert reason will be included.
+* `eth_call` will not fail for account balance issues by default. An parameter `"strict": true` can be added to the call parameters (with `to` and `from`) to enforce balance checks.
+
+### Additions and Improvements
+* Added `besu_transaction_pool_transactions` to the reported metrics, counting the mempool size [\#1869](https://github.com/hyperledger/besu/pull/1869)
+* Added activation blocks for Berlin Network Upgrade [\#1929](https://github.com/hyperledger/besu/pull/1929)
+
+### Bug Fixes
+* Fixed representation of access list for access list transactions in JSON-RPC results.
+
+#### Previously identified known issues
+
+- [Fast sync when running Besu on cloud providers](KNOWN_ISSUES.md#fast-sync-when-running-besu-on-cloud-providers)
+- [Privacy users with private transactions created using v1.3.4 or earlier](KNOWN_ISSUES.md#privacy-users-with-private-transactions-created-using-v134-or-earlier)
+
+### Download link
+sha256: `e4c8fe4007e3e5f7f2528cbf1eeb5457caf06536c974a6ff4305035ff5724476`
+
+## 21.1.0-RC2
+### Additions and Improvements
+* Support for the Berlin Network Upgrade, although the block number must be set manually with `--override-genesis-config=berlinBlock=<blocknumber>`. This is because the block numbers haven't been determined yet. The next release will include the number in the genesis file so it will support Berlin with no intervention. [\#1898](https://github.com/hyperledger/besu/pull/1898)
+
+## 21.1.0-RC1
+
+### 21.1.0 Breaking Changes
+* `--skip-pow-validation-enabled` is now an error with `block import --format JSON`. This is because the JSON format doesn't include the nonce so the proof of work must be calculated.
+* `eth_call` will not return a JSON-RPC result if the call fails, but will return an error instead. If it was for a revert the revert reason will be included.
+* `eth_call` will not fail for account balance issues by default. An parameter `"strict": true` can be added to the call parameters (with `to` and `from`) to enforce balance checks.
+
+### Additions and Improvements
+* Removed unused flags in default genesis configs [\#1812](https://github.com/hyperledger/besu/pull/1812)
+* `--skip-pow-validation-enabled` is now an error with `block import --format JSON`. This is because the JSON format doesn't include the nonce so the proof of work must be calculated. [\#1815](https://github.com/hyperledger/besu/pull/1815)
+* Added a new CLI option `--Xlauncher` to start a mainnet launcher. It will help to configure Besu easily.
+* Return the revert reason from `eth_call` JSON-RPC api calls when the contract causes a revert. [\#1829](https://github.com/hyperledger/besu/pull/1829)
+* Added `chainId`, `publicKey`, and `raw` to JSON-RPC api calls returning detailed transaction results. [\#1835](https://github.com/hyperledger/besu/pull/1835)
+
+### Bug Fixes
+* Ethereum classic heights will no longer be reported in mainnet metrics. Issue [\#1751](https://github.com/hyperledger/besu/pull/1751) Fix [\#1820](https://github.com/hyperledger/besu/pull/1820)
+* Don't enforce balance checks in `eth_call` unless explicitly requested. Issue [\#502](https://github.com/hyperledger/besu/pull/502) Fix [\#1834](https://github.com/hyperledger/besu/pull/1834)
+
+### Early Access Features
+
+#### Previously identified known issues
+
+- [Fast sync when running Besu on cloud providers](KNOWN_ISSUES.md#fast-sync-when-running-besu-on-cloud-providers)
+- [Privacy users with private transactions created using v1.3.4 or earlier](KNOWN_ISSUES.md#privacy-users-with-private-transactions-created-using-v134-or-earlier)
+
+
+### Download link
+
+Link removed because this release contains an outdated version of the Berlin network upgrade, which was changed on March 5, 2021 ([link](https://github.com/ethereum/pm/issues/263#issuecomment-791473406)). If you are using Besu on public Ethereum networks, you must upgrade to 21.1.1. sha256 hash left for reference.
+
+sha256: `b0fe3942052b8fd43fc3025a298a6c701f9edae2e100f0c563a1c5a4ceef71f1`
+
+## 20.10.4
+
+### Additions and Improvements
+* Implemented [EIP-778](https://eips.ethereum.org/EIPS/eip-778): Ethereum Node Records (ENR) [\#1680](https://github.com/hyperledger/besu/pull/1680)
+* Implemented [EIP-868](https://eips.ethereum.org/EIPS/eip-868): Node Discovery v4 ENR Extension [\#1721](https://github.com/hyperledger/besu/pull/1721)
+* Added revert reason to eth_estimateGas RPC call. [\#1730](https://github.com/hyperledger/besu/pull/1730)
+* Added command line option --static-nodes-file. [#1644](https://github.com/hyperledger/besu/pull/1644)
+* Implemented [EIP-1898](https://eips.ethereum.org/EIPS/eip-1898): Add `blockHash` to JSON-RPC methods which accept a default block parameter [\#1757](https://github.com/hyperledger/besu/pull/1757)
+
+### Bug Fixes
+* Accept locally-sourced transactions below the minimum gas price. [#1480](https://github.com/hyperledger/besu/issues/1480) [#1743](https://github.com/hyperledger/besu/pull/1743)
+
+#### Previously identified known issues
+
+- [Fast sync when running Besu on cloud providers](KNOWN_ISSUES.md#fast-sync-when-running-besu-on-cloud-providers)
+- [Privacy users with private transactions created using v1.3.4 or earlier](KNOWN_ISSUES.md#privacy-users-with-private-transactions-created-using-v134-or-earlier)
+
+### Download link
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/20.10.4/besu-20.10.4.zip
+sha256: f15cd5243b809659bba1706c1745aecafc012d3fc44a91419522da925493537c
+
 ## 20.10.3
 
 ### Additions and Improvements
 * Added `memory` as an option to `--key-value-storage`.  This ephemeral storage is intended for sync testing and debugging.  [\#1617](https://github.com/hyperledger/besu/pull/1617)
 * Fixed gasPrice parameter not always respected when passed to `eth_estimateGas` endpoint [\#1636](https://github.com/hyperledger/besu/pull/1636)
 * Enabled eth65 by default [\#1682](https://github.com/hyperledger/besu/pull/1682)
+* Warn that bootnodes will be ignored if specified with discovery disabled [\#1717](https://github.com/hyperledger/besu/pull/1717)
 
 ### Bug Fixes
 * Accept to use default port values if not in use. [#1673](https://github.com/hyperledger/besu/pull/1673)
@@ -17,6 +1486,10 @@
 - [Fast sync when running Besu on cloud providers](KNOWN_ISSUES.md#fast-sync-when-running-besu-on-cloud-providers)
 - [Privacy users with private transactions created using v1.3.4 or earlier](KNOWN_ISSUES.md#privacy-users-with-private-transactions-created-using-v134-or-earlier)
 
+### Download link
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/20.10.3/besu-20.10.3.zip
+sha256: `b5f46d945754dedcbbb1e5dd96bf2bfd13272ff09c6a66c0150b979a578f4389`
+
 ## 20.10.2
 
 ### Additions and Improvements
@@ -38,7 +1511,7 @@
 
 ### Download Link
 
-https://dl.bintray.com/hyperledger-org/besu-repo/besu-20.10.2.zip
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/20.10.2/besu-20.10.2.zip
 sha256: `710aed228dcbe9b8103aef39e4431b0c63e73c3a708ce88bcd1ecfa1722ad307`
 
 ## 20.10.1
@@ -65,7 +1538,7 @@ sha256: `710aed228dcbe9b8103aef39e4431b0c63e73c3a708ce88bcd1ecfa1722ad307`
 * Removed duplicate files from zip and tar.gz distributions. [\#1566](https://github.com/hyperledger/besu/pull/1566)
 * Add a more rational value to eth_gasPrice, based on a configurable percentile of prior block's transactions (default: median of last 100 blocks).  [\#1563](https://github.com/hyperledger/besu/pull/1563)
 
-## Deprecated 
+## Deprecated
 
 ### --privacy-precompiled-address (Scheduled for removal in _Next_ Release)
 Deprecated in 1.5.1
@@ -73,7 +1546,7 @@ Deprecated in 1.5.1
 
 ### Besu Sample Network repository
 
-The [Besu Sample Networks repository](https://github.com/ConsenSys/besu-sample-networks) has been replaced by the [Quorum Developer Quickstart](https://besu.hyperledger.org/en/latest/Tutorials/Developer-Quickstart). 
+The [Besu Sample Networks repository](https://github.com/ConsenSys/besu-sample-networks) has been replaced by the [Quorum Developer Quickstart](https://besu.hyperledger.org/en/latest/Tutorials/Developer-Quickstart).
 
 #### Previously identified known issues
 
@@ -83,14 +1556,14 @@ The [Besu Sample Networks repository](https://github.com/ConsenSys/besu-sample-n
 
 ### Download Link
 
-https://dl.bintray.com/hyperledger-org/besu-repo/besu-20.10.1.zip 
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/20.10.1/besu-20.10.1.zip
 sha256: `ac4fae310957c176564396f73c0f03c60c41129d43d078560d0dab533a69fd2a`
 
 ## 20.10.0
 
 ## Release format
 
-Hyperledger Besu is moving its versioning scheme to [CalVer](https://calver.org/) starting with the 20.10.0 (formerly 1.6.0) release. More information about the specific version of CalVer Besu is using can be found on the [wiki](https://wiki.hyperledger.org/display/BESU/Using+CalVer+for+Besu+Releases). 
+Hyperledger Besu is moving its versioning scheme to [CalVer](https://calver.org/) starting with the 20.10.0 (formerly 1.6.0) release. More information about the specific version of CalVer Besu is using can be found on the [wiki](https://wiki.hyperledger.org/display/BESU/Using+CalVer+for+Besu+Releases).
 
 ## 20.10 Breaking Changes
 
@@ -102,9 +1575,9 @@ Prior versions of Besu would set the HTTP Status 400 Bad Request for JSON-RPC re
 
 In Besu version 20.10, properly formatted requests that have valid parameters (count and content) will return a HTTP Status 200 OK, with an error field if an error occurred. For example, requesting an account that does not exist in the chain, or a block by hash that Besu does not have, will now return HTTP 200 OK responses. Unparsable requests, improperly formatted requests, or requests with invalid parameters will continue to return HTTP 400 Bad Request.
 
-Users of Web3J should note that many calls will now return a result with the error field containing the message whereas before a call would throw an exception with the error message as the exception message.   
+Users of Web3J should note that many calls will now return a result with the error field containing the message whereas before a call would throw an exception with the error message as the exception message.
 
-## 20.10.0 Additions and Improvements 
+## 20.10.0 Additions and Improvements
 
 * Added support for ECIP-1099 / Classic Thanos Fork: Calibrate Epoch Duration. [\#1421](https://github.com/hyperledger/besu/pull/1421) [\#1441](https://github.com/hyperledger/besu/pull/1441) [\#1462](https://github.com/hyperledger/besu/pull/1462)
 * Added the Open Telemetry Java agent to report traces to a remote backend. Added an example to showcase the trace reporting capabilities.
@@ -112,9 +1585,9 @@ Users of Web3J should note that many calls will now return a result with the err
 * Added support for the upcoming YOLOv2 ephemeral testnet and removed the flag for the deprecated YOLOv1 ephemeral testnet. [#1386](https://github.com/hyperledger/besu/pull/1386)
 * Added `debug_standardTraceBlockToFile` JSON-RPC API. This API accepts a block hash and will replay the block. It returns a list of files containing the result of the trace (one file per transaction). [\#1392](https://github.com/hyperledger/besu/pull/1392)
 * Added `debug_standardTraceBadBlockToFile` JSON-RPC API. This API is similar to `debug_standardTraceBlockToFile`, but can be used to obtain info about a block which has been rejected as invalid. [\#1403](https://github.com/hyperledger/besu/pull/1403)
-* Added support for EIP-2929 to YOLOv2. [#1387](https://github.com/hyperledger/besu/pull/1387)     
+* Added support for EIP-2929 to YOLOv2. [#1387](https://github.com/hyperledger/besu/pull/1387)
 * Added `--start-block` and `--end-block` to the `blocks import` subcommand [\#1399](https://github.com/hyperledger/besu/pull/1399)
-* Added support for multi-tenancy when using the early access feature of [onchain privacy group management](https://besu.hyperledger.org/en/stable/Concepts/Privacy/Onchain-PrivacyGroups/) 
+* Added support for multi-tenancy when using the early access feature of [onchain privacy group management](https://besu.hyperledger.org/en/stable/Concepts/Privacy/Onchain-PrivacyGroups/)
 * \[Reverted\] Fixed memory leak in eth/65 subprotocol behavior. It is now enabled by default. [\#1420](https://github.com/hyperledger/besu/pull/1420), [#1348](https://github.com/hyperledger/besu/pull/1348), [#1321](https://github.com/hyperledger/besu/pull/1321)
 
 ### Bug Fixes
@@ -136,7 +1609,7 @@ Deprecated in 1.5.1
 on `--privacy-onchain-groups-enabled`. [\#1222](https://github.com/hyperledger/besu/pull/1222)
 
 ### Download link
-https://dl.bintray.com/hyperledger-org/besu-repo/besu-20.10.0.zip
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/20.10.0/besu-20.10.0.zip
 
 sha256sum: `2b50a375aae64b838a2cd9d43747006492cae573f1be11745b7f643646fd5a01`
 
@@ -147,7 +1620,7 @@ sha256sum: `2b50a375aae64b838a2cd9d43747006492cae573f1be11745b7f643646fd5a01`
 
 ### Bug Fixes
 * Added `debug_getBadBlocks` JSON-RPC API to analyze and detect consensus flaws. Even if a block is rejected it will be returned by this method [\#1378](https://github.com/hyperledger/besu/pull/1378)
-* Fix logs queries missing results against chain head [\#1351](https://github.com/hyperledger/besu/pull/1351) and [\#1381](https://github.com/hyperledger/besu/pull/1381) 
+* Fix logs queries missing results against chain head [\#1351](https://github.com/hyperledger/besu/pull/1351) and [\#1381](https://github.com/hyperledger/besu/pull/1381)
 
 #### Previously identified known issues
 
@@ -158,7 +1631,7 @@ sha256sum: `2b50a375aae64b838a2cd9d43747006492cae573f1be11745b7f643646fd5a01`
 
 ### Download link
 
-https://dl.bintray.com/hyperledger-org/besu-repo/besu-1.5.5.zip
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/1.5.5/besu-1.5.5.zip
 
 sha256sum: `e67b0a899dc4421054eaa9a8112cb89e1e5f6a56f0d8aa1b0c5111c53dfad2ad`
 
@@ -185,7 +1658,7 @@ sha256sum: `e67b0a899dc4421054eaa9a8112cb89e1e5f6a56f0d8aa1b0c5111c53dfad2ad`
 - [Changes not saved to database correctly causing inconsistent private states](KNOWN_ISSUES.md#Changes-not-saved-to-database-correctly-causing-inconsistent-private-states)
 
 ### Download link
-https://dl.bintray.com/hyperledger-org/besu-repo/besu-1.5.4.zip
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/1.5.4/besu-1.5.4.zip
 
 sha256sum: `1f4df8e1c5e3b5b3abf6289ccfe70f302aa7c29a652b2eb713ffbdc507670420`
 
@@ -220,10 +1693,10 @@ To enhance control over permissions on the privacy group management contract:
   the privacy group. In the default onchain privacy group management contract implementation, only the
   owner can add and remove participants, and upgrade the management contract.
 
-The onchain privacy support in the current version of the web3js-eea library (v0.9) will not be compatible with Besu v1.5.3.  We are actively working on an upgrade to webj3-eea that will support these changes.   
+The onchain privacy support in the current version of the web3js-eea library (v0.9) will not be compatible with Besu v1.5.3.  We are actively working on an upgrade to webj3-eea that will support these changes.
 
 ### Download link
-https://dl.bintray.com/hyperledger-org/besu-repo/besu-1.5.3.zip
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/1.5.3/besu-1.5.3.zip
 
 sha256sum: `735cd511e1dae1590f2829d9535cb383aa8c526f059b3451859e5fcfccc48985`
 
@@ -241,7 +1714,7 @@ sha256sum: `735cd511e1dae1590f2829d9535cb383aa8c526f059b3451859e5fcfccc48985`
 
 * New docker images are being generated to use the latest version of OpenJDK (currently 14.0.1) with the tag suffix of `-openjdk-latest`, for example `1.5.2-openjdk-latest`.
 * New docker images are being generated to use [GraalVM](https://www.graalvm.org/) with the tag suffix of `-graalvm`, for example `1.5.2-graalvm`.
-* The existing images based on Java 11 are also being tagged with the suffix `-openjdk-11`, for example `1.5.2-openjdk-11`, as well as `1.5.2`.  
+* The existing images based on Java 11 are also being tagged with the suffix `-openjdk-11`, for example `1.5.2-openjdk-11`, as well as `1.5.2`.
 
 The intent is that the major Java VM version or Java VM type shipped with the default docker images (`latest`, `1.5.x`, etc.) may be changed during future quarterly releases but will remain consistent within quarterly releases.
 
@@ -265,7 +1738,7 @@ The intent is that the major Java VM version or Java VM type shipped with the de
 - [Edward Evans](https://github.com/hyperledger/besu/commits?author=EdJoJob) voluntarily moved to [emeritus status](https://github.com/hyperledger/besu/pull/1270).
 
 ### Download link
-https://dl.bintray.com/hyperledger-org/besu-repo/besu-1.5.2.zip
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/1.5.2/besu-1.5.2.zip
 
 sha256sum: `629f44e230a635b09f8d82f2196d70d31193233718118a46412f11c50772dc85`
 
@@ -306,7 +1779,7 @@ Known issues are open issues categorized as [Very High or High impact](https://w
 - [Restarts caused by insufficient memory can cause inconsistent private state](KNOWN_ISSUES.md#Restart-caused-by-insufficient-memory-can-cause-inconsistent-private-state)
 
 ### Download link
-https://dl.bintray.com/hyperledger-org/besu-repo/besu-1.5.1.zip
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/1.5.1/besu-1.5.1.zip
 
 sha256sum: `c17f49b6b8686822417184952487fc135772f0be03514085926a6984fd955b88`
 
@@ -396,18 +1869,18 @@ Workaround - Do not use permissioning on K8S.
 Workaround - Ensure you allocate enough memory for the Java Runtime Environment that the node does not run out of memory.
 
 #### Previously identified known issues
- 
+
 - [Scope of logs query causing Besu to hang](KNOWN_ISSUES.md#scope-of-logs-query-causing-besu-to-hang)
 - [Eth/65 loses peers](KNOWN_ISSUES.md#eth65-loses-peers)
 - [Fast sync when running Besu on cloud providers](KNOWN_ISSUES.md#fast-sync-when-running-besu-on-cloud-providers)
 - [Privacy users with private transactions created using v1.3.4 or earlier](KNOWN_ISSUES.md#privacy-users-with-private-transactions-created-using-v134-or-earlier)
 
 ### Download link
-https://dl.bintray.com/hyperledger-org/besu-repo/besu-1.5.0.zip
+https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/1.5.0/besu-1.5.0.zip
 
 sha256sum: `56929d6a71cc681688351041c919e9630ab6df7de37dd0c4ae9e19a4f44460b2`
 
-**For download links of releases prior to 1.5.0, please visit https://dl.bintray.com/hyperledger-org/besu-repo/**
+**For download links of releases prior to 1.5.0, please visit https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/**
 
 ## 1.4.6
 
@@ -489,7 +1962,7 @@ Workaround - Limit the number of blocks queried by each `eth_getLogs` call.
 a fix is completed for the [eth/65 known issue](KNOWN_ISSUES.md). [\#741](https://github.com/hyperledger/besu/pull/741)
 - Resolve crashing NAT detectors on GKE. [\#731](https://github.com/hyperledger/besu/pull/731) fixes [\#507](https://github.com/hyperledger/besu/issues/507).
 [Besu-Kubernetes Readme](https://github.com/PegaSysEng/besu-kubernetes/blob/master/README.md#network-topology-and-high-availability-requirements)
-updated to reflect changes.  
+updated to reflect changes.
 - Deal with quick service start failures [\#714](https://github.com/hyperledger/besu/pull/714) fixes [\#662](https://github.com/hyperledger/besu/issues/662)
 
 ### Known Issues
@@ -518,7 +1991,7 @@ The `eth/65` change is not [backwards compatible](https://github.com/hyperledger
 This has the following impact:
 * In a private network, nodes using the 1.4.3 client cannot interact with nodes using 1.4.2 or earlier
 clients.
-* On mainnet, synchronizing eventually stalls.   
+* On mainnet, synchronizing eventually stalls.
 
 Workaround -> revert to v1.4.2.
 
@@ -543,7 +2016,7 @@ in 1.5.0 release. [\#639](https://github.com/hyperledger/besu/pull/639)
 
 ### Known Issues
 
-#### Fast sync when running Besu on cloud providers  
+#### Fast sync when running Besu on cloud providers
 
 A known [RocksDB issue](https://github.com/facebook/rocksdb/issues/6435) causes fast sync to fail
 when running Besu on certain cloud providers. The following error is displayed repeatedly:
@@ -722,7 +2195,7 @@ If you have existing private transactions, see [migration details](docs/Private-
 * Added [`priv_call`](https://besu.hyperledger.org/en/latest/Reference/API-Methods/#priv_call) which invokes
 a private contract function locally and does not change the private state.
 
-* Besu has moved from an internal Bytes library to the [Apache Tuweni](https://tuweni.apache.org/) Bytes library.  
+* Besu has moved from an internal Bytes library to the [Apache Tuweni](https://tuweni.apache.org/) Bytes library.
 This includes using the library in the Plugins API interfaces. [#295](https://github.com/hyperledger/besu/pull/295) and [#215](https://github.com/hyperledger/besu/pull/215)
 
 ### Early Access Features
@@ -1054,7 +2527,7 @@ For compatibility with ETC Agharta upgrade, use 1.3.7 or later.
 - Add `--target-gas-limit` command line option. [\#24](https://github.com/hyperledger/besu/pull/24)(thanks to new contributor [cfelde](https://github.com/cfelde))
 - Allow private contracts to access public state. [\#9](https://github.com/hyperledger/besu/pull/9)
 - Documentation updates include:
-  - Added [sample load balancer configurations](https://besu.hyperledger.org/en/latest/HowTo/Configure/Configure-HA/Sample-Configuration/)  
+  - Added [sample load balancer configurations](https://besu.hyperledger.org/en/latest/HowTo/Configure/Configure-HA/Sample-Configuration/)
   - Added [`retesteth`](https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Subcommands/#retesteth) subcommand
   - Added [`debug_accountRange`](https://besu.hyperledger.org/en/latest/Reference/API-Methods/#debug_accountrange) JSON-RPC API method
   - Clarified purpose of [static nodes](https://besu.hyperledger.org/en/latest/HowTo/Find-and-Connect/Managing-Peers/#static-nodes)
@@ -1138,7 +2611,7 @@ For compatibility with ETC Agharta upgrade, use 1.3.7 or later.
   - [Added Responsible Disclosure policy](https://docs.pantheon.pegasys.tech/en/latest/Reference/Responsible-Disclosure/)
   - [Added `blocks export` subcommand](https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Subcommands/#export)
 
-### Technical Improvements  
+### Technical Improvements
 - Update the `pantheon blocks export` command usage [\#1887](https://github.com/PegaSysEng/pantheon/pull/1887) (thanks to [matkt](https://github.com/matkt))
 - Stop Returning null for 'pending' RPC calls [\#1883](https://github.com/PegaSysEng/pantheon/pull/1883)
 - Blake validation errors are hard errors [\#1882](https://github.com/PegaSysEng/pantheon/pull/1882)
@@ -1328,7 +2801,7 @@ For compatibility with ETC Agharta upgrade, use 1.3.7 or later.
   - Added content on [creating and managing privacy groups](https://besu.hyperledger.org/en/latest/Reference/web3js-eea-Methods/#createprivacygroup)
   - Added content on [accessing private and privacy marker transactions](https://besu.hyperledger.org/en/latest/HowTo/Use-Privacy/Access-Private-Transactions/)
   - Added content on [system requirements](https://besu.hyperledger.org/en/latest/HowTo/Get-Started/System-Requirements/)
-  - Added reference to [Besu role on Galaxy to deploy using Ansible](https://besu.hyperledger.org/en/latest/HowTo/Deploy/Ansible/).  
+  - Added reference to [Besu role on Galaxy to deploy using Ansible](https://besu.hyperledger.org/en/latest/HowTo/Deploy/Ansible/).
 
 ### Technical Improvements
 
@@ -1553,11 +3026,11 @@ Documentation updates include:
 - Added Genesis file support for specifying the maximum stack size. [\#1431](https://github.com/PegaSysEng/pantheon/pull/1431)
 - Included transaction details when subscribed to Pending transactions [\#1410](https://github.com/PegaSysEng/pantheon/pull/1410)
 - Documentation updates include:
-  - [Added configuration items specified in the genesis file](https://besu.hyperledger.org/en/latest/Reference/Config-Items/#configuration-items)  
+  - [Added configuration items specified in the genesis file](https://besu.hyperledger.org/en/latest/Reference/Config-Items/#configuration-items)
   - [Added pending transaction details subscription](https://besu.hyperledger.org/en/latest/HowTo/Interact/APIs/RPC-PubSub/#pending-transactionss)
   - [Added Troubleshooting content](https://besu.hyperledger.org/en/latest/HowTo/Troubleshoot/Troubleshooting/)
-  - [Added Privacy Quickstart](https://besu.hyperledger.org/en/latest/Tutorials/Quickstarts/Privacy-Quickstart/)  
-  - [Added privacy roadmap](https://github.com/hyperledger/besu/blob/master/ROADMAP.md)  
+  - [Added Privacy Quickstart](https://besu.hyperledger.org/en/latest/Tutorials/Quickstarts/Privacy-Quickstart/)
+  - [Added privacy roadmap](https://github.com/hyperledger/besu/blob/master/ROADMAP.md)
 
 
 ### Technical Improvements
@@ -1726,15 +3199,15 @@ Documentation updates include:
 - Notify of dropped messages [\#1156](https://github.com/PegaSysEng/pantheon/pull/1156)
 - Documentation updates include:
     - Added [Permissioning Overview](https://besu.hyperledger.org/en/latest/Concepts/Permissioning/Permissioning-Overview/)
-    - Added content on [Network vs Node Configuration](https://besu.hyperledger.org/en/latest/HowTo/Configure/Using-Configuration-File/)   
-    - Updated [RAM requirements](https://besu.hyperledger.org/en/latest/HowTo/Get-Started/System-Requirements/#ram)  
+    - Added content on [Network vs Node Configuration](https://besu.hyperledger.org/en/latest/HowTo/Configure/Using-Configuration-File/)
+    - Updated [RAM requirements](https://besu.hyperledger.org/en/latest/HowTo/Get-Started/System-Requirements/#ram)
     - Added [Privacy Overview](https://besu.hyperledger.org/en/latest/Concepts/Privacy/Privacy-Overview/) and [Processing Private Transactions](https://besu.hyperledger.org/en/latest/Concepts/Privacy/Private-Transaction-Processing/)
     - Renaming of Ethstats Lite Explorer to [Ethereum Lite Explorer](https://besu.hyperledger.org/en/latest/HowTo/Deploy/Lite-Block-Explorer/#lite-block-explorer-documentation) (thanks to [tzapu](https://github.com/tzapu))
     - Added content on using [Truffle with Besu](https://besu.hyperledger.org/en/latest/HowTo/Develop-Dapps/Truffle/)
     - Added [`droppedPendingTransactions` RPC Pub/Sub subscription](https://besu.hyperledger.org/en/latest/HowTo/Interact/APIs/RPC-PubSub/#dropped-transactions)
-    - Added [`eea_*` JSON-RPC API methods](https://besu.hyperledger.org/en/latest/Reference/API-Methods/#eea-methods)  
+    - Added [`eea_*` JSON-RPC API methods](https://besu.hyperledger.org/en/latest/Reference/API-Methods/#eea-methods)
     - Added [architecture diagram](https://besu.hyperledger.org/en/latest/Concepts/ArchitectureOverview/)
-    - Updated [permissioning CLI options](https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Syntax/#permissions-accounts-config-file-enabled) and [permissioned network tutorial](https://besu.hyperledger.org/en/stable/)  
+    - Updated [permissioning CLI options](https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Syntax/#permissions-accounts-config-file-enabled) and [permissioned network tutorial](https://besu.hyperledger.org/en/stable/)
 
 ### Technical Improvements
 
@@ -1801,18 +3274,18 @@ Documentation updates include:
    - Added [Azure quickstart tutorial](https://besu.hyperledger.org/en/latest/Tutorials/Quickstarts/Azure-Private-Network-Quickstart/)
    - Enabled copy button in code blocks
    - Added [IBFT 1.0](https://besu.hyperledger.org/en/latest/HowTo/Configure/Consensus-Protocols/QuorumIBFT/)
-   - Added section on using [Geth attach with Besu](https://besu.hyperledger.org/en/latest/HowTo/Interact/APIs/Using-JSON-RPC-API/#geth-console)    
+   - Added section on using [Geth attach with Besu](https://besu.hyperledger.org/en/latest/HowTo/Interact/APIs/Using-JSON-RPC-API/#geth-console)
    - Enabled the edit link doc site to ease external doc contributions
    - Added [EthStats docs](https://besu.hyperledger.org/HowTo/Deploy/Lite-Network-Monitor/) (thanks to [baxy](https://github.com/baxy))
-   - Updated [Postman collection](https://besu.hyperledger.org/en/latest/HowTo/Interact/APIs/Authentication/#postman)  
+   - Updated [Postman collection](https://besu.hyperledger.org/en/latest/HowTo/Interact/APIs/Authentication/#postman)
    - Added [`metrics-category` CLI option](https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Syntax/#metrics-category)
    - Added information on [block time and timeout settings](https://besu.hyperledger.org/en/latest/HowTo/Configure/Consensus-Protocols/IBFT/#block-time) for IBFT 2.0
    - Added [`admin_nodeInfo`](https://besu.hyperledger.org/en/latest/Reference/API-Methods/#admin_nodeinfo)
    - Added [permissions images](https://besu.hyperledger.org/en/latest/Concepts/Permissioning/Permissioning-Overview/)
    - Added permissioning blog to [Resources](https://besu.hyperledger.org/en/latest/Reference/Resources/)
    - Updated [Create Permissioned Network](https://besu.hyperledger.org/en/latest/Tutorials/Permissioning/Create-Permissioned-Network/) tutorial to use `export-address`
-   - Updated [Clique](https://besu.hyperledger.org/en/latest/HowTo/Configure/Consensus-Protocols/Clique/) and [IBFT 2.0](https://besu.hyperledger.org/en/latest/HowTo/Configure/Consensus-Protocols/IBFT/) docs to include complete genesis file  
-   - Updated [Clique tutorial](https://besu.hyperledger.org/en/latest/Tutorials/Private-Network/Create-Private-Clique-Network/) to use `export-address` subcommand  
+   - Updated [Clique](https://besu.hyperledger.org/en/latest/HowTo/Configure/Consensus-Protocols/Clique/) and [IBFT 2.0](https://besu.hyperledger.org/en/latest/HowTo/Configure/Consensus-Protocols/IBFT/) docs to include complete genesis file
+   - Updated [Clique tutorial](https://besu.hyperledger.org/en/latest/Tutorials/Private-Network/Create-Private-Clique-Network/) to use `export-address` subcommand
    - Added IBFT 2.0 [future message configuration options](https://besu.hyperledger.org/en/latest/HowTo/Configure/Consensus-Protocols/IBFT/#optional-configuration-options)
 
 ### Technical Improvements
@@ -1972,9 +3445,9 @@ Public key address export subcommand was missing in 1.0 release.
 - Added rebind mitigation for Websockets. [\#905](https://github.com/PegaSysEng/pantheon/pull/905)
 - Support genesis contract code [\#749](https://github.com/PegaSysEng/pantheon/pull/749) (thanks to [kziemianek](https://github.com/kziemianek)).
 - Documentation updates include:
-  - Added details on [port configuration](https://besu.hyperledger.org/en/latest/HowTo/Find-and-Connect/Configuring-Ports/)    
+  - Added details on [port configuration](https://besu.hyperledger.org/en/latest/HowTo/Find-and-Connect/Configuring-Ports/)
   - Added [Resources page](https://besu.hyperledger.org/en/latest/Reference/Resources/) linking to Besu blog posts and webinars
-  - Added [JSON-RPC Authentication](https://besu.hyperledger.org/en/latest/HowTo/Interact/APIs/Authentication/)  
+  - Added [JSON-RPC Authentication](https://besu.hyperledger.org/en/latest/HowTo/Interact/APIs/Authentication/)
   - Added [tutorial to create permissioned network](https://besu.hyperledger.org/en/latest/Tutorials/Permissioning/Create-Permissioned-Network/)
   - Added [Permissioning](https://besu.hyperledger.org/en/latest/Concepts/Permissioning/Permissioning-Overview/) content
   - Added [Permissioning API methods](https://besu.hyperledger.org/en/latest/Reference/API-Methods/#permissioning-methods)
@@ -2153,7 +3626,7 @@ The [documentation](https://docs.pantheon.pegasys.tech/en/latest/) has been upda
 | `--datadir`                         | [`--data-path`](https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Syntax/#data-path)                                                                                                                                      | Renamed                          |
 | `--dev-mode`                        | [`--network=dev`](https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Syntax/#network)                                                                                                                                     | Replaced by `--network` option   |
 | `--genesis`                         | [`--genesis-file`](https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Syntax/#genesis-file)                                                                                                                                | Renamed                          |
-| `--goerli`                          | [`--network=goerli`]((https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Syntax/#network)                                                                                                                                  | Replaced by `--network` option   |
+| `--goerli`                          | [`--network=goerli`](https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Syntax/#network)                                                                                                                                  | Replaced by `--network` option   |
 | `--metrics-listen=<HOST:PORT>`      | [`--metrics-host=<HOST>`](https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Syntax/#metrics-host) and [`--metrics-port=<PORT>`](https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Syntax/#metrics-port) | Split into host and port options |
 | `--miner-extraData`                 | [`--miner-extra-data`](https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Syntax/#miner-extra-data)                                                                                                                       | Renamed                          |
 | `--miner-minTransactionGasPriceWei` | [`--min-gas-price`](https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Syntax/#min-gas-price)                                                                                                                              | Renamed                          |
@@ -2161,8 +3634,8 @@ The [documentation](https://docs.pantheon.pegasys.tech/en/latest/) has been upda
 | `--node-private-key`                | [`--node-private-key-file`](https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Syntax/#node-private-key-file)                                                                                                              | Renamed                          |
 | `--ottoman`                         | N/A                                                                                                                                                                                                                                         | Removed                          |
 | `--p2p-listen=<HOST:PORT>`          | [`--p2p-host=<HOST>`](https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Syntax/#p2p-hostt) and [`--p2p-port=<PORT>`](https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Syntax/#p2p-port) | Split into host and port options |
-| `--rinkeby`                         | [`--network=rinkeby`]((https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Syntax/#network)                                                                                                                                     | Replaced by `--network` option   |
-| `--ropsten`                         | [`--network=ropsten`]((https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Syntax/#network)                                                                                                                                     | Replaced by `--network` option   |
+| `--rinkeby`                         | [`--network=rinkeby`](https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Syntax/#network)                                                                                                                                     | Replaced by `--network` option   |
+| `--ropsten`                         | [`--network=ropsten`](https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Syntax/#network)                                                                                                                                     | Replaced by `--network` option   |
 | `--rpc-enabled`                     | [` --rpc-http-enabled`](https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Syntax/#rpc-http-enabled)| Renamed|
 | `--rpc-listen=<HOST:PORT>`          | [`--rpc-http-host=<HOST>`](https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Syntax/#rpc-http-host) and [`--rpc-http-port=<PORT>`](https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Syntax/#rpc-http-port) | Split into host and port options |
 | `--rpc-api`                         | [`--rpc-http-api`](https://besu.hyperledger.org/en/latest/Reference/CLI/CLI-Syntax/#rpc-http-api)| Renamed |
@@ -2303,12 +3776,12 @@ To recover the node key and data directory from the Docker container:
 Where `container` is the name or ID of the Docker container containing the Besu node.
 
 The container can be running or stopped when you copy the key and data directory. If your node was
-fully synchronized to MainNet, the data directory will be ~2TB.  
+fully synchronized to MainNet, the data directory will be ~2TB.
 
 When restarting your node with the v0.8.4 Docker image:
 
 * Save the node key in the [`key` file](https://besu.hyperledger.org/en/latest/Concepts/Node-Keys/#node-private-key) in the data
-    directory or specify the location using the [`--node-private-key` option](https://besu.hyperledger.org/en/stable/).  
+    directory or specify the location using the [`--node-private-key` option](https://besu.hyperledger.org/en/stable/).
 * Specify the `<destination_directory` as a [volume for the data directory](https://besu.hyperledger.org/en/stable/).
 
 ### Bug Fixes
@@ -2329,7 +3802,7 @@ When restarting your node with the v0.8.4 Docker image:
 - Added configurable refresh delay for SyncingSubscriptionService on start up [\#383](https://github.com/PegaSysEng/pantheon/pull/383)
 - Added the Command Line Style Guide  [\#530](https://github.com/PegaSysEng/pantheon/pull/530)
 - Documentation updates include:
-  * Migrated to new [documentation site](https://docs.pantheon.pegasys.tech/en/latest/)  
+  * Migrated to new [documentation site](https://docs.pantheon.pegasys.tech/en/latest/)
   * Added [configuration file content](https://besu.hyperledger.org/en/stable/)
   * Added [tutorial to create private network](https://besu.hyperledger.org/en/latest/Tutorials/Private-Network/Create-Private-Network/)
   * Added content on [enabling non-default APIs](https://besu.hyperledger.org/en/latest/Reference/API-Methods/)
@@ -2385,7 +3858,7 @@ From v0.8.3, incoming HTTP requests are only accepted from hostnames specified u
 
 If using the URL `http://127.0.0.1` to make JSON-RPC calls, use `--host-whitelist` to specify the hostname `127.0.0.1` or update the hostname to `localhost`.
 
-If your application publishes RPC ports, specify the hostnames when starting Besu. For example:  
+If your application publishes RPC ports, specify the hostnames when starting Besu. For example:
 
 ```bash
 pantheon --host-whitelist=example.com
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 7422fd062bc..5d3a57ef944 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,4 +1,4 @@
-# Hyperledger Code of Conduct
+# [Hyperledger Code of Conduct](https://wiki.hyperledger.org/community/hyperledger-project-code-of-conduct)
 
 Hyperledger is a collaborative project at The Linux Foundation. It is an open-source and open
 community project where participants choose to work together, and in that process experience
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c667cf378f0..eb4a656b0e4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,12 +3,13 @@
 
 Welcome to the Besu repository! The following links are a set of guidelines for contributing to this repo and its packages. These are mostly guidelines, not rules. Use your best judgement, and feel free to propose changes to this document in a pull request. Contributions come in the form of code submissions, writing documentation, raising issues, helping others in chat, and any other actions that help develop Besu.
 
-### LF/Github Accounts
+### Github/Discord/LF Accounts
 
 Having the following accounts is necessary for contributing code/issues to Besu.  
 * If you want to contribute code, you can make a [github account here](https://github.com).  
-* If you want to raise an issue, do so [in the issues tab](https://github.com/hyperledger/besu/issues).  
-* Our Rocket Chat and wiki require a [Linux Foundation (LF) account].
+* If you want to raise an issue, do so [in the issues tab](https://github.com/hyperledger/besu/issues).
+* To ask questions or chat with us, join our [Discord](https://discord.gg/hyperledger)
+* To edit pages in our wiki, you'll need a [Linux Foundation (LF) account].
 
 ### Useful contributing links
 
diff --git a/DCO.md b/DCO.md
index 771aaef1414..4bf56cb80ae 100644
--- a/DCO.md
+++ b/DCO.md
@@ -5,4 +5,4 @@ As per section 13.a of the [Hyperledger Charter](https://www.hyperledger.org/abo
 
 The sign off needs to be using your legal name, not a pseudonym.  Git has a built-in mechanism to allow this with the `-s` or `--signoff` argument to `git commit` command, providing your `user.name` and `user.email` have been setup correctly.
 
-If you have any questions, you can reach us on [Besu chat](https://chat.hyperledger.org/channel/besu).
+If you have any questions, you can reach us on Besu chat; first, [join the Discord server](https://discord.gg/hyperledger/) then [join the Besu channel](https://discord.com/channels/905194001349627914/938504958909747250).
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index afe21be6ce7..94f3ff3da0d 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -1,91 +1,145 @@
 # Maintainers
 
+<!-- Please keep all lists sorted alphabetically by github -->
+
 ## Active Maintainers
 
-<!-- Please keep this sorted alphabetically by github -->
+<!-- besu-maintainers group has maintainer access to besu repo -->
 
 | Name             | Github           | LFID             |
 | ---------------- | ---------------- | ---------------- |
-| Abdel Bakhta     | abdelhamidbakhta | abdelhamidbakhta |
+| Ameziane Hamlat   | ahamlat         | ahamlat          |
 | Adrian Sutton    | ajsutton         | ajsutton         |
+| Antony Denyer    | antonydenyer     | antonydenyer     |
 | Antoine Toulme   | atoulme          | atoulme          |
-| Byron Gravenorst | bgravenorst      | bgravenorst      |
-| Chris Hare       | CjHare           | cjhare           |
-| David Mechler    | davemec          | davemec          |
-| Edward Mack      | edwardmack       | mackcom          | 
-| Ivaylo Kirilov   | iikirilov        | iikirilov        |
+| Daniel Lehrner   | daniellehrner    | daniellehrner    |
+| Diego López León | diega            | diega            |
+| Fabio Di Fabio   | fab-10           | fab-10           |
+| Gary Schulte     | garyschulte      | GarySchulte      | 
+| Gabriel Trintinalia | gabriel-trintinalia | gabrieltrintinalia |
+| Jiri Peinlich    | gezero           | JiriPeinlich     |
+| Gabriel Fukushima| gfukushima       | gfukushima       |
+| Justin Florentine| jflo             | RoboCopsGoneMad  |
 | Jason Frame      | jframe           | jframe           |
 | Joshua Fernandes | joshuafernandes  | joshuafernandes  |
 | Lucas Saldanha   | lucassaldanha    | lucassaldanha    |
 | Sally MacFarlane | macfarla         | macfarla         |
-| Madeline Murray  | MadelineMurray   | madelinemurray   |
 | Mark Terry       | mark-terry       | m.terry          |
 | Karim Taam       | matkt            | matkt            |
 | Meredith Baxter  | mbaxter          | mbaxter          |
-| Nicolas Massart  | NicolasMassart   | NicolasMassart   |
 | Stefan Pingel    | pinges           | pinges           |
-| Trent Mohay      | rain-on          | trent.mohay      |
-| Rai Sur          | RatanRSur        | ratanraisur      |
-| Rob Dawson       | rojotek          | RobDawson        |
 | Danno Ferrin     | shemnon          | shemnon          |
-| Tim Beiko        | timbeiko         | timbeiko         |
+| Simon Dudley     | siladu           | siladu           |
 | Usman Saleem     | usmansaleem      | usmansaleem      |
+| Zhenyang Shi     | wcgcyx           | wcgcyx           |
+
 
 ## Emeritus Maintainers
 
-| Name         | Github  | LFID    |
-|--------------|---------|---------|
-| Edward Evans | EdJoJob | EdJoJob |
+| Name             | Github           | LFID             |
+|------------------|------------------|------------------|
+| Abdel Bakhta     | abdelhamidbakhta | abdelhamidbakhta |
+| Byron Gravenorst | bgravenorst      | bgravenorst      |
+| Chris Hare       | CjHare           | cjhare           |
+| David Mechler    | davemec          | davemec          |
+| Edward Evans     | EdJoJob          | EdJoJob          |
+| Edward Mack      | edwardmack       | mackcom          | 
+| Frank Li         | frankisawesome   | frankliawesome   |
+| Ivaylo Kirilov   | iikirilov        | iikirilov        |
+| Madeline Murray  | MadelineMurray   | madelinemurray   |
+| Nicolas Massart  | NicolasMassart   | NicolasMassart   |
+| Trent Mohay      | rain-on          | trent.mohay      |
+| Rai Sur          | RatanRSur        | ratanraisur      |
+| Rob Dawson       | rojotek          | RobDawson        |
+| Sajida Zouarhi   | sajz             | SajidaZ          |
+| Taccat Isid      | taccatisid       | taccatisid       |
+| Tim Beiko        | timbeiko         | timbeiko         |
+| Vijay Michalik   | vmichalik        | VijayMichalik    |
 
 ## Becoming a Maintainer
 
-Besu welcomes community contribution. Community members may progress to become a
-maintainer. To become a maintainer the following steps occur, roughly in order.
+Besu welcomes community contribution.
+Each community member may progress to become a maintainer.
+
+How to become a maintainer:
+
+- Contribute significantly to the code in this repository.
+  
+### Maintainers contribution requirement
+
+The requirement to be able to be proposed as a maintainer is:
+
+- 5 significant changes on code have been authored in this repos by the proposed maintainer and accepted (merged PRs).
+  
+### Maintainers approval process
+
+The following steps must occur for a contributor to be "upgraded" as a maintainer:
 
-- 5 significant changes have been authored by the proposed maintainer and
-  accepted.
 - The proposed maintainer has the sponsorship of at least one other maintainer.
-  - This sponsoring maintainer will create a PR modifying the list of
-    maintainers.
+  - This sponsoring maintainer will create a proposal PR modifying the list of
+    maintainers. (see [proposal PR template](#proposal-pr-template).)
   - The proposed maintainer accepts the nomination and expresses a willingness
-    to be a long-term (more than 6 month) committer.
-  - This would be a comment in the above PR.
-  - This PR will be communicated in all appropriate communication channels. It
-    should be mentioned in any maintainer/community call. It should also be
-    posted to the appropriate mailing list or chat channels if they exist.
+    to be a long-term (more than 6 month) committer by adding a comment in the proposal PR.
+  - The PR will be communicated in all appropriate communication channels
+    including at least [besu-contributors channel on Hyperledger Discord](https://discord.gg/hyperledger),
+    the [mailing list](https://lists.hyperledger.org/g/besu)
+    and any maintainer/community call.
 - Approval by at least 3 current maintainers within two weeks of the proposal or
-  an absolute majority of current maintainers.
-  - These votes will be recorded in the PR modifying the list of maintainers.
-- No veto by another maintainer within two weeks of proposal are recorded.
+  an absolute majority (half the total + 1) of current maintainers.
+  - Maintainers will vote by approving the proposal PR.
+- No veto raised by another maintainer within the voting timeframe.
   - All vetoes must be accompanied by a public explanation as a comment in the
-    PR for adding this maintainer
-  - The explanation of the veto must be reasonable.
-  - A veto can be retracted, in that case the approval/veto timeframe is reset.
+    proposal PR.
+  - The explanation of the veto must be reasonable and follow the [Besu code of conduct](https://wiki.hyperledger.org/display/BESU/Code+of+Conduct).
+  - A veto can be retracted, in that case the voting timeframe is reset and all approvals are removed.
   - It is bad form to veto, retract, and veto again.
-- The proposed maintainer becomes a maintainer
-  - Either two weeks have passed since the third approval,
-  - Or an absolute majority of maintainers approve.
-  - In either case, no maintainer presents a veto.
+  
+The proposed maintainer becomes a maintainer either:
+
+  - when two weeks have passed without veto since the third approval of the proposal PR,
+  - or an absolute majority of maintainers approved the proposal PR.
+
+In either case, no maintainer raised and stood by a veto.
 
 ## Removing Maintainers
 
-Being a maintainer is not a status symbol or a title to be maintained
-indefinitely. It will occasionally be necessary and appropriate to move a
-maintainer to emeritus status. This can occur in the following situations:
+Being a maintainer is not a status symbol or a title to be maintained indefinitely.
+
+It will occasionally be necessary and appropriate to move a maintainer to emeritus status.
+
+This can occur in the following situations:
 
 - Resignation of a maintainer.
 - Violation of the Code of Conduct warranting removal.
 - Inactivity.
   - A general measure of inactivity will be no commits or code review comments
-    for one reporting quarter, although this will not be strictly enforced if
+    for two reporting quarters, although this will not be strictly enforced if
     the maintainer expresses a reasonable intent to continue contributing.
   - Reasonable exceptions to inactivity will be granted for known long term
     leave such as parental leave and medical leave.
 - Other unspecified circumstances.
 
-Like adding a maintainer the record and governance process for moving a
-maintainer to emeritus status is recorded in the github PR making that change.
+As for adding a maintainer, the record and governance process for moving a
+maintainer to emeritus status is recorded using review approval in the PR making that change.
 
 Returning to active status from emeritus status uses the same steps as adding a
-new maintainer. Note that the emeritus maintainer already has the 5 required
-significant changes as there is no contribution time horizon for those.
+new maintainer.
+
+Note that the emeritus maintainer always already has the required significant contributions.
+There is no contribution prescription delay.
+
+## Proposal PR template
+
+```markdown
+I propose to add [maintainer github handle] as a Besu project maintainer.
+
+[maintainer github handle] contributed with many high quality commits:
+
+- [list significant achievements]
+
+Here are [their past contributions on Besu project](https://github.com/hyperledger/besu/commits?author=[user github handle]).
+
+Voting ends two weeks from today.
+
+For more information on this process see the Becoming a Maintainer section in the MAINTAINERS.md file.
+```
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index edfac2bb41a..00000000000
--- a/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,39 +0,0 @@
-## Status
-**READY/IN DEVELOPMENT/HOLD**
-
-## Description
-A few sentences describing the overall goals of the pull request's commits.
-
-## Related PRs
-List related PRs against other branches:
-
-branch | PR
------- | ------
-other_pr_production | [link]()
-other_pr_master | [link]()
-
-
-## Todos
-- [ ] Tests
-- [ ] Documentation
-
-
-## Deploy Notes
-Notes regarding deployment the contained body of work.  These should note any
-db migrations, etc.
-
-## Steps to Test or Reproduce
-Outline the steps to test or reproduce the PR here.
-
-```sh
-git pull --prune
-git checkout <feature_branch>
-bundle; script/server
-```
-
-1. 
-
-## Impacted Areas in Application
-List general components of the application that this PR will affect:
-
-* 
\ No newline at end of file
diff --git a/README.md b/README.md
index 28d18498be7..98560c66ed6 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,11 @@
 # Besu Ethereum Client
- [![CircleCI](https://circleci.com/gh/hyperledger/besu/tree/master.svg?style=svg)](https://circleci.com/gh/hyperledger/besu/tree/master)
- [![Total alerts](https://img.shields.io/lgtm/alerts/g/hyperledger/besu.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/hyperledger/besu/alerts/)
- [![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/hyperledger/besu.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/hyperledger/besu/context:java)
+ [![CircleCI](https://circleci.com/gh/hyperledger/besu/tree/main.svg?style=svg)](https://circleci.com/gh/hyperledger/besu/tree/main)
  [![Documentation Status](https://readthedocs.org/projects/hyperledger-besu/badge/?version=latest)](https://besu.hyperledger.org/en/latest/?badge=latest)
  [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/3174/badge)](https://bestpractices.coreinfrastructure.org/projects/3174)
- [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/PegasysEng/besu/blob/master/LICENSE)
- [ ![Download](https://api.bintray.com/packages/hyperledger-org/besu-repo/besu/images/download.svg) ](https://bintray.com/hyperledger-org/besu-repo/besu/_latestVersion)
- [![RocketChat chat](https://open.rocket.chat/images/join-chat.svg)](https://chat.hyperledger.org/channel/besu)
+ [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/hyperledger/besu/blob/main/LICENSE)
+ [![Discord](https://img.shields.io/discord/905194001349627914?logo=Hyperledger&style=plastic)](https://discord.gg/hyperledger)
 
+[Download](https://hyperledger.jfrog.io/artifactory/besu-binaries/besu/)
 
 Besu is an Apache 2.0 licensed, MainNet compatible, Ethereum client written in Java.
 
@@ -25,7 +23,7 @@ Besu is an Apache 2.0 licensed, MainNet compatible, Ethereum client written in J
 Besu issues are tracked [in the github issues tab][Besu Issues].
 See our [guidelines](https://wiki.hyperledger.org/display/BESU/Issues) for more details on searching and creating issues.
 
-If you have any questions, queries or comments, [RocketChat] is the place to find us.
+If you have any questions, queries or comments, [Besu channel on Hyperledger Discord] is the place to find us.
 
 
 ## Besu Users
@@ -69,5 +67,5 @@ and <a href="https://www.yourkit.com/youmonitor/">YourKit YouMonitor</a>.
 
 [Besu Issues]: https://github.com/hyperledger/besu/issues
 [Besu User Documentation]: https://besu.hyperledger.org
-[RocketChat]: https://chat.hyperledger.org/
-[Contributing Guidelines]: CONTRIBUTING.md
\ No newline at end of file
+[Besu channel on Hyperledger Discord]: https://discord.gg/hyperledger
+[Contributing Guidelines]: CONTRIBUTING.md
diff --git a/SECURITY.md b/SECURITY.md
index 4727d240345..9a328164b95 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -7,13 +7,15 @@ hear from you. We will take all security bugs seriously and if confirmed upon in
 patch it within a reasonable amount of time and release a public security bulletin discussing the
 impact and credit the discoverer.
 
-There are two ways to report a security bug. The easiest is to email a description of the flaw and
-any related information (e.g. reproduction steps, version) to
-[security at hyperledger dot org](mailto:security@hyperledger.org).
-
-The other way is to file a confidential security bug in our
-[JIRA bug tracking system](https://jira.hyperledger.org). Be sure to set the “Security Level” to
-“Security issue”.
+There are two email addresses where Hyperledger Besu accepts security bugs. The
+first, [security "dash" besu at lists dot hyperledger dot org](mailto:security-besu@lists.hyperledger.org)
+is limited to a subset of Hyperledger Besu maintainers and Hyperledger staff. For highly sensitive
+bugs this is a preferred address. The second email
+address [security at hyperledger dot org](mailto:security@hyperledger.org) is limited to a subset of
+maintainers and staff of all Hyperledger projects, and may be viewed by maintainers outside of
+Hyperledger Besu. When sending information to either of these emails please be sure to include a
+description of the flaw and any related information (e.g. reproduction steps, version, known active
+use).
 
 The process by which the Hyperledger Security Team handles security bugs is documented further in
 our [Defect Response page](https://wiki.hyperledger.org/display/SEC/Defect+Response) on our
diff --git a/SUPPORT.md b/SUPPORT.md
index bf5b9459362..16a9bccd6ae 100644
--- a/SUPPORT.md
+++ b/SUPPORT.md
@@ -2,17 +2,17 @@
 
 Welcome to the Besu repository! The following links are a set of guidelines for contributing to this repo and its packages. These are mostly guidelines, not rules. Use your best judgement, and feel free to propose changes to this document in a pull request. Contributions come in the form of code submissions, writing documentation, raising issues, helping others in chat, and any other actions that help develop Besu.
 
-### LF/Github Accounts
+### Github/Discord/LF Accounts
 
-Having Linux Foundation and Github accounts is necessary for obtaining support for Besu through the rocket chat, wiki and issue management.  
+Having Github, Discord, and Linux Foundation accounts is necessary for obtaining support for Besu through the community channels, wiki and issue management.  
 * If you want to raise an issue, you can do so [on the github issue tab](https://github.com/hyperledger/besu/issues).   
-* Our Rocket Chat requires a [Linux Foundation (LF) account].
+* Hyperledger Discord requires a [Discord account].
 * The Hyperlegder wiki also requires a [Linux Foundation (LF) account] in order to edit pages.
 
 ### Useful support links
 
 * [Besu User Documentation]
-* [RocketChat]
+* [Besu channel on Hyperledger Discord]
 * [I just have a quick question](https://wiki.hyperledger.org/display/BESU/I+just+have+a+quick+question)
 * [Did you find a bug?](https://wiki.hyperledger.org/display/BESU/Reporting+Bugs)
 * [Issues](https://wiki.hyperledger.org/display/BESU/Issues)
@@ -20,5 +20,5 @@ Having Linux Foundation and Github accounts is necessary for obtaining support f
 
 
 [Besu User Documentation]: https://besu.hyperledger.org
-[RocketChat]: https://chat.hyperledger.org/
-[Contributing Guidelines]: CONTRIBUTING.md
\ No newline at end of file
+[Besu channel on Hyperledger Discord]: https://discord.gg/hyperledger
+[Contributing Guidelines]: CONTRIBUTING.md
diff --git a/acceptance-tests/dsl/build.gradle b/acceptance-tests/dsl/build.gradle
index b71b32cbc63..d65de08b954 100644
--- a/acceptance-tests/dsl/build.gradle
+++ b/acceptance-tests/dsl/build.gradle
@@ -2,8 +2,10 @@ dependencies {
   implementation project(':besu')
   implementation project(':config')
   implementation project(':consensus:clique')
+  implementation project(':consensus:common')
   implementation project(':consensus:ibft')
-  implementation project(':crypto')
+  implementation project(':consensus:qbft')
+  implementation project(':crypto:services')
   implementation project(':enclave')
   implementation project(':ethereum:api')
   implementation project(':ethereum:blockcreation')
@@ -11,9 +13,13 @@ dependencies {
   implementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
   implementation project(':ethereum:eth')
   implementation project(':ethereum:p2p')
+  implementation project(':evm')
+  implementation project(':datatypes')
   implementation project(':ethereum:permissioning')
   implementation project(':ethereum:rlp')
   implementation project(':metrics:core')
+  implementation project(':pki')
+  implementation project(path: ':pki', configuration: 'testArtifacts')
   implementation project(':plugin-api')
   implementation project(':plugins:rocksdb')
   implementation project(':services:kvstore')
@@ -22,25 +28,23 @@ dependencies {
 
   implementation 'com.github.tomakehurst:wiremock-jre8'
   implementation 'com.google.guava:guava'
+  implementation 'com.google.dagger:dagger'
+  annotationProcessor 'com.google.dagger:dagger-compiler'
   implementation 'com.squareup.okhttp3:okhttp'
   implementation 'info.picocli:picocli'
   implementation 'io.reactivex.rxjava2:rxjava'
   implementation 'io.vertx:vertx-core'
   implementation 'junit:junit'
-  implementation 'net.consensys:orion'
-  implementation 'org.apache.logging.log4j:log4j-api'
-  implementation 'org.apache.logging.log4j:log4j-core'
-  implementation 'org.apache.logging.log4j:log4j-slf4j-impl'
-  implementation 'org.apache.tuweni:bytes'
-  implementation 'org.apache.tuweni:io'
-  implementation 'org.apache.tuweni:units'
+  implementation 'io.opentelemetry:opentelemetry-api'
+  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-io'
+  implementation 'org.apache.tuweni:tuweni-units'
   implementation 'org.assertj:assertj-core'
   implementation 'org.awaitility:awaitility'
   implementation 'org.java-websocket:Java-WebSocket'
   implementation 'org.web3j:abi'
   implementation 'org.web3j:besu'
   implementation 'org.web3j:crypto'
-  implementation 'tech.pegasys.ethsigner.internal:core'
-  implementation 'tech.pegasys.ethsigner.internal:file-based'
-  implementation 'tech.pegasys.ethsigner.internal:signing-api'
+
+  implementation 'org.testcontainers:testcontainers'
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/AcceptanceTestBase.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/AcceptanceTestBase.java
index 83ea3eecce7..617e0e534cb 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/AcceptanceTestBase.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/AcceptanceTestBase.java
@@ -20,9 +20,9 @@
 import org.hyperledger.besu.tests.acceptance.dsl.account.Accounts;
 import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Blockchain;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.admin.AdminConditions;
+import org.hyperledger.besu.tests.acceptance.dsl.condition.bft.BftConditions;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.clique.CliqueConditions;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.eth.EthConditions;
-import org.hyperledger.besu.tests.acceptance.dsl.condition.ibft2.Ibft2Conditions;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.login.LoginConditions;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.net.NetConditions;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.perm.PermissioningConditions;
@@ -37,10 +37,10 @@
 import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.permissioning.PermissionedNodeBuilder;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.account.AccountTransactions;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.admin.AdminTransactions;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.bft.BftTransactions;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.contract.ContractTransactions;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthTransactions;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2.Ibft2Transactions;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.miner.MinerTransactions;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.NetTransactions;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.PermissioningTransactions;
@@ -57,18 +57,18 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.ThreadContext;
 import org.junit.After;
 import org.junit.Rule;
 import org.junit.rules.TestName;
 import org.junit.rules.TestWatcher;
 import org.junit.runner.Description;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
 
 public class AcceptanceTestBase {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(AcceptanceTestBase.class);
 
   protected final Accounts accounts;
   protected final AccountTransactions accountTransactions;
@@ -82,8 +82,8 @@ public class AcceptanceTestBase {
   protected final ContractTransactions contractTransactions;
   protected final EthConditions eth;
   protected final EthTransactions ethTransactions;
-  protected final Ibft2Transactions ibftTwoTransactions;
-  protected final Ibft2Conditions ibftTwo;
+  protected final BftTransactions bftTransactions;
+  protected final BftConditions bft;
   protected final LoginConditions login;
   protected final NetConditions net;
   protected final BesuNodeFactory besu;
@@ -105,7 +105,7 @@ protected AcceptanceTestBase() {
     accounts = new Accounts(ethTransactions);
     adminTransactions = new AdminTransactions();
     cliqueTransactions = new CliqueTransactions();
-    ibftTwoTransactions = new Ibft2Transactions();
+    bftTransactions = new BftTransactions();
     accountTransactions = new AccountTransactions(accounts);
     permissioningTransactions = new PermissioningTransactions();
     privacyTransactions = new PrivacyTransactions();
@@ -115,7 +115,7 @@ protected AcceptanceTestBase() {
     blockchain = new Blockchain(ethTransactions);
     clique = new CliqueConditions(ethTransactions, cliqueTransactions);
     eth = new EthConditions(ethTransactions);
-    ibftTwo = new Ibft2Conditions(ibftTwoTransactions);
+    bft = new BftConditions(bftTransactions);
     login = new LoginConditions();
     net = new NetConditions(new NetTransactions());
     cluster = new Cluster(net);
@@ -179,13 +179,13 @@ private void printOutput(final Process process) {
   }
 
   @Rule
-  public TestWatcher log_eraser =
+  public TestWatcher logEraser =
       new TestWatcher() {
 
         @Override
         protected void starting(final Description description) {
-          ThreadContext.put("test", description.getMethodName());
-          ThreadContext.put("class", description.getClassName());
+          MDC.put("test", description.getMethodName());
+          MDC.put("class", description.getClassName());
 
           final String errorMessage = "Uncaught exception in thread \"{}\"";
           Thread.currentThread()
@@ -201,6 +201,7 @@ protected void failed(final Throwable e, final Description description) {
           LOG.error(
               "==========================================================================================");
           LOG.error("Test failed. Reported Throwable at the point of failure:", e);
+          LOG.error(e.getMessage());
         }
 
         @Override
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/BlockUtils.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/BlockUtils.java
index 076b61d90c7..6f88c3a6ead 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/BlockUtils.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/BlockUtils.java
@@ -14,14 +14,16 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl;
 
-import static org.hyperledger.besu.ethereum.core.Hash.fromHexString;
+import static org.hyperledger.besu.datatypes.Hash.fromHexString;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.LogsBloomFilter;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
+
+import java.math.BigInteger;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.web3j.protocol.core.methods.response.EthBlock.Block;
@@ -50,7 +52,10 @@ public static BlockHeader createBlockHeader(
         Bytes.fromHexString(block.getExtraData()),
         null,
         mixHash,
-        block.getNonce().longValue(),
+        new BigInteger(block.getNonceRaw().substring(2), 16).longValue(),
+        null,
+        null,
+        null,
         blockHeaderFunctions);
   }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/account/Account.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/account/Account.java
index 3237e0e512d..6cdd53fbed6 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/account/Account.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/account/Account.java
@@ -14,11 +14,13 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl.account;
 
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.crypto.SECP256K1.PrivateKey;
-import org.hyperledger.besu.crypto.SECP256K1.PublicKey;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SECPPrivateKey;
+import org.hyperledger.besu.crypto.SECPPublicKey;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Amount;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.account.ExpectAccountBalance;
@@ -30,6 +32,8 @@
 import java.math.BigInteger;
 import java.util.Optional;
 
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import org.apache.tuweni.bytes.Bytes32;
 import org.web3j.crypto.Credentials;
 import org.web3j.utils.Convert.Unit;
@@ -38,11 +42,14 @@ public class Account {
 
   private final EthTransactions eth;
   private final String name;
-  private final Optional<PrivateKey> privateKey;
-  private final Optional<PublicKey> publicKey;
+  private final Optional<SECPPrivateKey> privateKey;
+  private final Optional<SECPPublicKey> publicKey;
   private final Address address;
   private long nonce = 0;
 
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+
   private Account(
       final EthTransactions eth,
       final String name,
@@ -68,13 +75,18 @@ public static Account create(final EthTransactions eth, final Address address) {
   }
 
   public static Account create(final EthTransactions eth, final String name) {
-    return new Account(eth, name, KeyPair.generate());
+    return new Account(eth, name, SIGNATURE_ALGORITHM.get().generateKeyPair());
   }
 
   static Account fromPrivateKey(
       final EthTransactions eth, final String name, final String privateKey) {
     return new Account(
-        eth, name, KeyPair.create(PrivateKey.create(Bytes32.fromHexString(privateKey))));
+        eth,
+        name,
+        SIGNATURE_ALGORITHM
+            .get()
+            .createKeyPair(
+                SIGNATURE_ALGORITHM.get().createPrivateKey(Bytes32.fromHexString(privateKey))));
   }
 
   public Optional<Credentials> web3jCredentials() {
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/account/Accounts.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/account/Accounts.java
index ad3df909c6b..a219dbd27ac 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/account/Accounts.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/account/Accounts.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl.account;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthTransactions;
 
 public class Accounts {
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/blockchain/Amount.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/blockchain/Amount.java
index fe1d6ae55ed..169b6f3c60d 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/blockchain/Amount.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/blockchain/Amount.java
@@ -28,6 +28,8 @@ public class Amount {
   private final BigDecimal value;
   private final Unit unit;
 
+  public static Amount ZERO = new Amount(BigDecimal.ZERO, WEI);
+
   private Amount(final BigDecimal value, final Unit unit) {
     this.value = value;
     this.unit = unit;
@@ -49,20 +51,27 @@ public Unit getUnit() {
     return unit;
   }
 
+  public Amount add(final Amount other) {
+    final BigDecimal weiResult =
+        Convert.toWei(value, unit).add(Convert.toWei(other.value, other.unit));
+
+    final Unit denomination = getMostPreciseUnit(unit, other.unit);
+    final BigDecimal result = Convert.fromWei(weiResult, denomination);
+
+    return new Amount(result, denomination);
+  }
+
   public Amount subtract(final Amount subtracting) {
+    final BigDecimal weiResult =
+        Convert.toWei(value, unit).subtract(Convert.toWei(subtracting.value, subtracting.unit));
 
-    final Unit denominator;
-    if (unit.getWeiFactor().compareTo(subtracting.unit.getWeiFactor()) < 0) {
-      denominator = unit;
-    } else {
-      denominator = subtracting.unit;
-    }
+    final Unit denomination = getMostPreciseUnit(unit, subtracting.unit);
+    final BigDecimal result = Convert.fromWei(weiResult, denomination);
 
-    final BigDecimal result =
-        Convert.fromWei(
-            Convert.toWei(value, unit).subtract(Convert.toWei(subtracting.value, subtracting.unit)),
-            denominator);
+    return new Amount(result, denomination);
+  }
 
-    return new Amount(result, denominator);
+  private Unit getMostPreciseUnit(final Unit a, final Unit b) {
+    return a.getWeiFactor().compareTo(b.getWeiFactor()) < 0 ? a : b;
   }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/account/ExpectAccountBalanceAtBlock.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/account/ExpectAccountBalanceAtBlock.java
index 7c977aee3fa..72eba5bc2ed 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/account/ExpectAccountBalanceAtBlock.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/account/ExpectAccountBalanceAtBlock.java
@@ -52,6 +52,11 @@ public void verify(final Node node) {
     WaitUtils.waitFor(
         () ->
             assertThat(node.execute(eth.getBalanceAtBlock(account, block)))
+                .withFailMessage(
+                    () ->
+                        String.format(
+                            "Expected address %s at block %s to have balance %s",
+                            account.getAddress(), block.toString(10), expectedBalance.toString(10)))
                 .isEqualTo(expectedBalance));
   }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/AdminConditions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/AdminConditions.java
index b2d9b2db047..9b270748f50 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/AdminConditions.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/AdminConditions.java
@@ -32,10 +32,17 @@ public AdminConditions(final AdminTransactions admin) {
   }
 
   public Condition addPeer(final Node addingPeer) {
-
     return new ExpectPeerAdded(admin.addPeer(enodeUrl(addingPeer)));
   }
 
+  public Condition hasPeer(final Node peer) {
+    return new ExpectHasPeer(nodeId(peer), admin.listPeers());
+  }
+
+  public Condition doesNotHavePeer(final Node peer) {
+    return new ExpectNotHavePeer(nodeId(peer), admin.listPeers());
+  }
+
   private URI enodeUrl(final Node node) {
     if (!(node instanceof RunnableNode)) {
       fail("A RunnableNode instance is required");
@@ -43,4 +50,12 @@ private URI enodeUrl(final Node node) {
 
     return ((RunnableNode) node).enodeUrl();
   }
+
+  private String nodeId(final Node node) {
+    if (!(node instanceof RunnableNode)) {
+      fail("A RunnableNode instance is required");
+    }
+
+    return "0x" + ((RunnableNode) node).getNodeId();
+  }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/ExpectHasPeer.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/ExpectHasPeer.java
new file mode 100644
index 00000000000..58f91c8e0a3
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/ExpectHasPeer.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.tests.acceptance.dsl.condition.admin;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
+import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.admin.AdminPeersTransaction;
+
+import java.util.List;
+
+public class ExpectHasPeer implements Condition {
+
+  private final String peer;
+  private final AdminPeersTransaction transaction;
+
+  public ExpectHasPeer(final String peer, final AdminPeersTransaction transaction) {
+    this.peer = peer;
+    this.transaction = transaction;
+  }
+
+  @Override
+  public void verify(final Node node) {
+    final List<String> result = node.execute(transaction);
+    assertThat(result).contains(peer);
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/ExpectNotHavePeer.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/ExpectNotHavePeer.java
new file mode 100644
index 00000000000..64f06bec4c1
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/admin/ExpectNotHavePeer.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.tests.acceptance.dsl.condition.admin;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
+import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.admin.AdminPeersTransaction;
+
+import java.util.List;
+
+public class ExpectNotHavePeer implements Condition {
+
+  private final String peer;
+  private final AdminPeersTransaction transaction;
+
+  public ExpectNotHavePeer(final String peer, final AdminPeersTransaction transaction) {
+    this.peer = peer;
+    this.transaction = transaction;
+  }
+
+  @Override
+  public void verify(final Node node) {
+    final List<String> result = node.execute(transaction);
+    assertThat(result).doesNotContain(peer);
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/AwaitValidatorSetChange.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/bft/AwaitValidatorSetChange.java
similarity index 75%
rename from acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/AwaitValidatorSetChange.java
rename to acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/bft/AwaitValidatorSetChange.java
index 816c3f98515..85c448eff92 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/AwaitValidatorSetChange.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/bft/AwaitValidatorSetChange.java
@@ -12,27 +12,27 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.tests.acceptance.dsl.condition.ibft2;
+package org.hyperledger.besu.tests.acceptance.dsl.condition.bft;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2.Ibft2Transactions;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.bft.BftTransactions;
 
 import java.util.List;
 
 public class AwaitValidatorSetChange implements Condition {
 
-  private final Ibft2Transactions ibft;
+  private final BftTransactions bft;
   private final List<Address> initialSigners;
 
-  public AwaitValidatorSetChange(final List<Address> initialSigners, final Ibft2Transactions ibft) {
+  public AwaitValidatorSetChange(final List<Address> initialSigners, final BftTransactions bft) {
     this.initialSigners = initialSigners;
-    this.ibft = ibft;
+    this.bft = bft;
   }
 
   @Override
@@ -40,7 +40,6 @@ public void verify(final Node node) {
     WaitUtils.waitFor(
         60,
         () ->
-            assertThat(node.execute(ibft.createGetValidators(LATEST)))
-                .isNotEqualTo(initialSigners));
+            assertThat(node.execute(bft.createGetValidators(LATEST))).isNotEqualTo(initialSigners));
   }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/bft/BftConditions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/bft/BftConditions.java
new file mode 100644
index 00000000000..9df47918c0e
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/bft/BftConditions.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.condition.bft;
+
+import static org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.bft.BftTransactions;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import com.google.common.collect.ImmutableMap;
+
+public class BftConditions {
+
+  private final BftTransactions bft;
+
+  public BftConditions(final BftTransactions bft) {
+    this.bft = bft;
+  }
+
+  public List<BesuNode> validators(final BesuNode[] nodes) {
+    final Comparator<BesuNode> compareByAddress = Comparator.comparing(BesuNode::getAddress);
+    List<BesuNode> besuNodes = Arrays.asList(nodes);
+    besuNodes.sort(compareByAddress);
+    return besuNodes;
+  }
+
+  public ExpectValidators validatorsEqual(final BesuNode... validators) {
+    return new ExpectValidators(bft, validatorAddresses(validators));
+  }
+
+  private Address[] validatorAddresses(final BesuNode[] validators) {
+    return Arrays.stream(validators).map(BesuNode::getAddress).sorted().toArray(Address[]::new);
+  }
+
+  public Condition awaitValidatorSetChange(final Node node) {
+    return new AwaitValidatorSetChange(node.execute(bft.createGetValidators(LATEST)), bft);
+  }
+
+  public Condition noProposals() {
+    return new ExpectProposals(bft, ImmutableMap.of());
+  }
+
+  public PendingVotesConfig pendingVotesEqual() {
+    return new PendingVotesConfig(bft);
+  }
+
+  public static class PendingVotesConfig {
+    private final Map<BesuNode, Boolean> proposals = new HashMap<>();
+    private final BftTransactions bft;
+
+    private PendingVotesConfig(final BftTransactions bft) {
+      this.bft = bft;
+    }
+
+    public PendingVotesConfig addProposal(final BesuNode node) {
+      proposals.put(node, true);
+      return this;
+    }
+
+    public PendingVotesConfig removeProposal(final BesuNode node) {
+      proposals.put(node, false);
+      return this;
+    }
+
+    public Condition build() {
+      final Map<Address, Boolean> proposalsAsAddress =
+          this.proposals.entrySet().stream()
+              .collect(Collectors.toMap(p -> p.getKey().getAddress(), Map.Entry::getValue));
+      return new ExpectProposals(bft, proposalsAsAddress);
+    }
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/bft/ExpectProposals.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/bft/ExpectProposals.java
new file mode 100644
index 00000000000..2864e0a5393
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/bft/ExpectProposals.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.condition.bft;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils;
+import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
+import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.bft.BftTransactions;
+
+import java.util.Map;
+
+public class ExpectProposals implements Condition {
+  private final BftTransactions bft;
+  private final Map<Address, Boolean> proposers;
+
+  public ExpectProposals(final BftTransactions bft, final Map<Address, Boolean> proposers) {
+    this.bft = bft;
+    this.proposers = proposers;
+  }
+
+  @Override
+  public void verify(final Node node) {
+    WaitUtils.waitFor(() -> assertThat(node.execute(bft.createProposals())).isEqualTo(proposers));
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/bft/ExpectValidators.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/bft/ExpectValidators.java
new file mode 100644
index 00000000000..1e8ef463cdc
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/bft/ExpectValidators.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.condition.bft;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.tests.acceptance.dsl.transaction.bft.BftTransactions.LATEST;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils;
+import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
+import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.bft.BftTransactions;
+
+public class ExpectValidators implements Condition {
+  private final BftTransactions bft;
+  private final Address[] validators;
+
+  public ExpectValidators(final BftTransactions bft, final Address... validators) {
+    this.bft = bft;
+    this.validators = validators;
+  }
+
+  @Override
+  public void verify(final Node node) {
+    WaitUtils.waitFor(
+        () ->
+            assertThat(node.execute(bft.createGetValidators(LATEST))).containsExactly(validators));
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/AwaitSignerSetChange.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/AwaitSignerSetChange.java
index 6f173f371e1..f332b387c0d 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/AwaitSignerSetChange.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/AwaitSignerSetChange.java
@@ -17,7 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/CliqueConditions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/CliqueConditions.java
index a7a3ef7ed88..750e587f6e3 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/CliqueConditions.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/CliqueConditions.java
@@ -15,12 +15,12 @@
 package org.hyperledger.besu.tests.acceptance.dsl.condition.clique;
 
 import static java.util.Collections.emptyList;
-import static org.hyperledger.besu.ethereum.core.Hash.fromHexString;
+import static org.hyperledger.besu.datatypes.Hash.fromHexString;
 import static org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST;
 
 import org.hyperledger.besu.config.CliqueConfigOptions;
 import org.hyperledger.besu.config.GenesisConfigFile;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.blockchain.ExpectBlockNotCreated;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.clique.ExpectNonceVote.CLIQUE_NONCE_VOTE;
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectProposals.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectProposals.java
index cfe2752c522..715c3501672 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectProposals.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectProposals.java
@@ -16,7 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidators.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidators.java
index 1ffe836d505..4d25745333b 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidators.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidators.java
@@ -17,7 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlock.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlock.java
index 657296179fc..6482dd13e6c 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlock.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlock.java
@@ -16,7 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlockHash.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlockHash.java
index 20152c5260c..f9d3e26289d 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlockHash.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlockHash.java
@@ -16,8 +16,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectedBlockHasProposer.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectedBlockHasProposer.java
index 16b3a6786cf..53b166c7149 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectedBlockHasProposer.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/clique/ExpectedBlockHasProposer.java
@@ -18,7 +18,7 @@
 
 import org.hyperledger.besu.consensus.clique.CliqueBlockHeaderFunctions;
 import org.hyperledger.besu.consensus.clique.CliqueExtraData;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.tests.acceptance.dsl.BlockUtils;
 import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils;
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/EthConditions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/EthConditions.java
index 0171f9dacfc..c4ee1347278 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/EthConditions.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/EthConditions.java
@@ -51,12 +51,17 @@ public Condition expectNoTransactionReceipt(final String transactionHash) {
         transactions.getTransactionReceipt(transactionHash));
   }
 
-  public Condition sendRawTransactionExceptional(
+  public Condition expectEthSendRawTransactionException(
       final String transactionData, final String expectedMessage) {
     return new ExpectEthSendRawTransactionException(
         transactions.sendRawTransaction(transactionData), expectedMessage);
   }
 
+  public Condition expectSuccessfulEthRawTransaction(final String transactionData) {
+    return new ExpectSuccessfulEthSendRawTransaction(
+        transactions.sendRawTransaction(transactionData));
+  }
+
   public Condition expectSuccessfulTransactionReceiptWithReason(
       final String transactionHash, final String revertReason) {
     return new ExpectSuccessfulEthGetTransactionReceiptWithReason(
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthSendRawTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthSendRawTransaction.java
new file mode 100644
index 00000000000..592d8e7db25
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthSendRawTransaction.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.condition.eth;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils;
+import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
+import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthSendRawTransactionTransaction;
+
+import org.apache.tuweni.bytes.Bytes32;
+
+public class ExpectSuccessfulEthSendRawTransaction implements Condition {
+
+  private final EthSendRawTransactionTransaction transaction;
+
+  public ExpectSuccessfulEthSendRawTransaction(final EthSendRawTransactionTransaction transaction) {
+    this.transaction = transaction;
+  }
+
+  @Override
+  public void verify(final Node node) {
+    WaitUtils.waitFor(
+        5,
+        () -> {
+          final Bytes32 txHash = Bytes32.fromHexString(node.execute(transaction));
+          assertThat(txHash).isNotNull();
+        });
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/ExpectProposals.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/ExpectProposals.java
deleted file mode 100644
index f39ec6f9eb3..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/ExpectProposals.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.condition.ibft2;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils;
-import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
-import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2.Ibft2Transactions;
-
-import java.util.Map;
-
-public class ExpectProposals implements Condition {
-  private final Ibft2Transactions ibftTwo;
-  private final Map<Address, Boolean> proposers;
-
-  public ExpectProposals(final Ibft2Transactions ibftTwo, final Map<Address, Boolean> proposers) {
-    this.ibftTwo = ibftTwo;
-    this.proposers = proposers;
-  }
-
-  @Override
-  public void verify(final Node node) {
-    WaitUtils.waitFor(
-        () -> assertThat(node.execute(ibftTwo.createProposals())).isEqualTo(proposers));
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/ExpectValidators.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/ExpectValidators.java
deleted file mode 100644
index e4a0e7c8722..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/ExpectValidators.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.condition.ibft2;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2.Ibft2Transactions.LATEST;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils;
-import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
-import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2.Ibft2Transactions;
-
-public class ExpectValidators implements Condition {
-  private final Ibft2Transactions ibft;
-  private final Address[] validators;
-
-  public ExpectValidators(final Ibft2Transactions ibft, final Address... validators) {
-    this.ibft = ibft;
-    this.validators = validators;
-  }
-
-  @Override
-  public void verify(final Node node) {
-    WaitUtils.waitFor(
-        () ->
-            assertThat(node.execute(ibft.createGetValidators(LATEST))).containsExactly(validators));
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/Ibft2Conditions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/Ibft2Conditions.java
deleted file mode 100644
index 583d90b74ac..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/ibft2/Ibft2Conditions.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.condition.ibft2;
-
-import static org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueTransactions.LATEST;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
-import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
-import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2.Ibft2Transactions;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import com.google.common.collect.ImmutableMap;
-
-public class Ibft2Conditions {
-
-  private final Ibft2Transactions ibftTwo;
-
-  public Ibft2Conditions(final Ibft2Transactions ibftTwo) {
-    this.ibftTwo = ibftTwo;
-  }
-
-  public List<BesuNode> validators(final BesuNode[] nodes) {
-    final Comparator<BesuNode> compareByAddress = Comparator.comparing(BesuNode::getAddress);
-    List<BesuNode> besuNodes = Arrays.asList(nodes);
-    besuNodes.sort(compareByAddress);
-    return besuNodes;
-  }
-
-  public ExpectValidators validatorsEqual(final BesuNode... validators) {
-    return new ExpectValidators(ibftTwo, validatorAddresses(validators));
-  }
-
-  private Address[] validatorAddresses(final BesuNode[] validators) {
-    return Arrays.stream(validators).map(BesuNode::getAddress).sorted().toArray(Address[]::new);
-  }
-
-  public Condition awaitValidatorSetChange(final Node node) {
-    return new AwaitValidatorSetChange(node.execute(ibftTwo.createGetValidators(LATEST)), ibftTwo);
-  }
-
-  public Condition noProposals() {
-    return new ExpectProposals(ibftTwo, ImmutableMap.of());
-  }
-
-  public PendingVotesConfig pendingVotesEqual() {
-    return new PendingVotesConfig(ibftTwo);
-  }
-
-  public static class PendingVotesConfig {
-    private final Map<BesuNode, Boolean> proposals = new HashMap<>();
-    private final Ibft2Transactions ibft;
-
-    private PendingVotesConfig(final Ibft2Transactions ibft) {
-      this.ibft = ibft;
-    }
-
-    public PendingVotesConfig addProposal(final BesuNode node) {
-      proposals.put(node, true);
-      return this;
-    }
-
-    public PendingVotesConfig removeProposal(final BesuNode node) {
-      proposals.put(node, false);
-      return this;
-    }
-
-    public Condition build() {
-      final Map<Address, Boolean> proposalsAsAddress =
-          this.proposals.entrySet().stream()
-              .collect(Collectors.toMap(p -> p.getKey().getAddress(), Map.Entry::getValue));
-      return new ExpectProposals(ibft, proposalsAsAddress);
-    }
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java
index 5c70702cd2c..79c058fc773 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java
@@ -29,6 +29,7 @@
 public class ExpectNetServicesReturnsAllServicesAsActive implements Condition {
 
   private final NetServicesTransaction transaction;
+  private static final String JSON_RPC_CONSTANT = "jsonrpc";
 
   public ExpectNetServicesReturnsAllServicesAsActive(final NetServicesTransaction transaction) {
     this.transaction = transaction;
@@ -38,18 +39,18 @@ public ExpectNetServicesReturnsAllServicesAsActive(final NetServicesTransaction
   public void verify(final Node node) {
     final Map<String, Map<String, String>> result = node.execute(transaction);
     assertThat(result.keySet())
-        .containsExactlyInAnyOrderElementsOf(Arrays.asList("p2p", "jsonrpc", "ws"));
+        .containsExactlyInAnyOrderElementsOf(Arrays.asList("p2p", JSON_RPC_CONSTANT, "ws"));
 
     assertThat(InetAddresses.isUriInetAddress(result.get("p2p").get("host"))).isTrue();
-    final int p2pPort = Integer.valueOf(result.get("p2p").get("port"));
+    final int p2pPort = Integer.parseInt(result.get("p2p").get("port"));
     assertThat(NetworkUtility.isValidPort(p2pPort)).isTrue();
 
     assertThat(InetAddresses.isUriInetAddress(result.get("ws").get("host"))).isTrue();
-    final int wsPort = Integer.valueOf(result.get("ws").get("port"));
+    final int wsPort = Integer.parseInt(result.get("ws").get("port"));
     assertThat(NetworkUtility.isValidPort(wsPort)).isTrue();
 
-    assertThat(InetAddresses.isUriInetAddress(result.get("jsonrpc").get("host"))).isTrue();
-    final int jsonRpcPort = Integer.valueOf(result.get("jsonrpc").get("port"));
+    assertThat(InetAddresses.isUriInetAddress(result.get(JSON_RPC_CONSTANT).get("host"))).isTrue();
+    final int jsonRpcPort = Integer.parseInt(result.get(JSON_RPC_CONSTANT).get("port"));
     assertThat(NetworkUtility.isValidPort(jsonRpcPort)).isTrue();
   }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsOnlyJsonRpcActive.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsOnlyJsonRpcActive.java
index 255bf8ea1b7..cccde7b9417 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsOnlyJsonRpcActive.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsOnlyJsonRpcActive.java
@@ -29,6 +29,7 @@
 public class ExpectNetServicesReturnsOnlyJsonRpcActive implements Condition {
 
   private final NetServicesTransaction transaction;
+  private static final String JSON_RPC_CONSTANT = "jsonrpc";
 
   public ExpectNetServicesReturnsOnlyJsonRpcActive(final NetServicesTransaction transaction) {
     this.transaction = transaction;
@@ -38,10 +39,10 @@ public ExpectNetServicesReturnsOnlyJsonRpcActive(final NetServicesTransaction tr
   public void verify(final Node node) {
     final Map<String, Map<String, String>> result = node.execute(transaction);
     assertThat(result.keySet())
-        .containsExactlyInAnyOrderElementsOf(Collections.singletonList("jsonrpc"));
+        .containsExactlyInAnyOrderElementsOf(Collections.singletonList(JSON_RPC_CONSTANT));
 
-    assertThat(InetAddresses.isUriInetAddress(result.get("jsonrpc").get("host"))).isTrue();
-    final int jsonrpcPort = Integer.valueOf(result.get("jsonrpc").get("port"));
+    assertThat(InetAddresses.isUriInetAddress(result.get(JSON_RPC_CONSTANT).get("host"))).isTrue();
+    final int jsonrpcPort = Integer.parseInt(result.get(JSON_RPC_CONSTANT).get("port"));
     assertThat(NetworkUtility.isValidPort(jsonrpcPort)).isTrue();
   }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/NodeSmartContractPermissioningV2Conditions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/NodeSmartContractPermissioningV2Conditions.java
index 350ff72b861..1ef293ec337 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/NodeSmartContractPermissioningV2Conditions.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/perm/NodeSmartContractPermissioningV2Conditions.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl.condition.perm;
 
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.NodeSmartContractPermissioningV2Transactions;
@@ -31,7 +32,15 @@ public Condition connectionIsAllowed(final String address, final Node node) {
     return new WaitForTrueResponse(transactions.isConnectionAllowed(address, node));
   }
 
+  public Condition connectionIsAllowed(final String address, final EnodeURL enodeURL) {
+    return new WaitForTrueResponse(transactions.isConnectionAllowed(address, enodeURL));
+  }
+
   public Condition connectionIsForbidden(final String address, final Node node) {
     return new WaitForFalseResponse(transactions.isConnectionAllowed(address, node));
   }
+
+  public Condition connectionIsForbidden(final String address, final EnodeURL enodeURL) {
+    return new WaitForFalseResponse(transactions.isConnectionAllowed(address, enodeURL));
+  }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/priv/EeaSendRawTransactionSuccess.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/priv/EeaSendRawTransactionSuccess.java
index a80cbb0007b..9aef5825ea4 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/priv/EeaSendRawTransactionSuccess.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/priv/EeaSendRawTransactionSuccess.java
@@ -16,7 +16,7 @@
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.EeaSendRawTransactionTransaction;
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/priv/PrivConditions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/priv/PrivConditions.java
index 43bac2df0ad..72d365cfb60 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/priv/PrivConditions.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/priv/PrivConditions.java
@@ -14,9 +14,9 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl.condition.priv;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/priv/PrivGetPrivacyPrecompileAddressSuccess.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/priv/PrivGetPrivacyPrecompileAddressSuccess.java
index 8b904965810..a3992da4327 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/priv/PrivGetPrivacyPrecompileAddressSuccess.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/priv/PrivGetPrivacyPrecompileAddressSuccess.java
@@ -16,7 +16,7 @@
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.PrivGetPrivacyPrecompileAddressTransaction;
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/priv/PrivGetPrivateTransactionSuccess.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/priv/PrivGetPrivateTransactionSuccess.java
index 33383a054cf..b09b1b29bca 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/priv/PrivGetPrivateTransactionSuccess.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/priv/PrivGetPrivateTransactionSuccess.java
@@ -38,6 +38,6 @@ public PrivGetPrivateTransactionSuccess(
   @Override
   public void verify(final Node node) {
     final PrivateTransactionGroupResponse result = node.execute(transaction);
-    assertThat(result).isEqualToComparingFieldByField(privateTransaction);
+    assertThat(result).usingRecursiveComparison().isEqualTo(privateTransaction);
   }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/process/ExitedWithCode.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/process/ExitedWithCode.java
index abceb8ed5ba..0e28f0609ec 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/process/ExitedWithCode.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/process/ExitedWithCode.java
@@ -22,12 +22,12 @@
 
 import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ExitedWithCode implements Condition {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(ExitedWithCode.class);
 
   private final int code;
 
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/txpool/TxPoolConditions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/txpool/TxPoolConditions.java
index da7dea8e2eb..4da3135920e 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/txpool/TxPoolConditions.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/condition/txpool/TxPoolConditions.java
@@ -16,13 +16,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
+import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.txpool.TxPoolTransactions;
 
 import java.util.List;
-import java.util.Map;
+import java.util.stream.Collectors;
 
 public class TxPoolConditions {
 
@@ -34,18 +35,16 @@ public TxPoolConditions(final TxPoolTransactions txPoolTransactions) {
 
   public Condition inTransactionPool(final Hash txHash) {
     return node ->
-        WaitUtils.waitFor(
-            () -> {
-              List<Map<String, String>> poolContents =
-                  node.execute(txPoolTransactions.getTxPoolContents());
-              boolean found = false;
-              for (Map<String, String> txInfo : poolContents) {
-                if (Hash.fromHexString(txInfo.get("hash")).equals(txHash)) {
-                  found = true;
-                  break;
-                }
-              }
-              assertThat(found).isTrue();
-            });
+        WaitUtils.waitFor(() -> assertThat(nodeTransactionHashes(node)).contains(txHash));
+  }
+
+  public Condition notInTransactionPool(final Hash txHash) {
+    return node -> assertThat(nodeTransactionHashes(node)).doesNotContain(txHash);
+  }
+
+  private List<Hash> nodeTransactionHashes(final Node node) {
+    return node.execute(txPoolTransactions.getTxPoolContents()).stream()
+        .map((txInfo) -> Hash.fromHexString(txInfo.get("hash")))
+        .collect(Collectors.toList());
   }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/EthSignerClient.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/EthSignerClient.java
deleted file mode 100644
index f202a874b1a..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/EthSignerClient.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.ethsigner;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.web3j.protocol.Web3jService;
-import org.web3j.protocol.core.Request;
-import org.web3j.protocol.core.methods.request.Transaction;
-import org.web3j.protocol.core.methods.response.EthSendTransaction;
-import org.web3j.protocol.eea.Eea;
-import org.web3j.protocol.http.HttpService;
-
-public class EthSignerClient {
-  private static final Logger LOG = LogManager.getLogger();
-  private final Web3jService web3jService;
-  private final Eea web3j;
-  private final String from;
-
-  public EthSignerClient(final URI ethSignerUri) throws IOException {
-    this.web3jService = new HttpService(ethSignerUri.toString());
-    this.web3j = Eea.build(web3jService);
-    this.from = resolveFrom(ethSignerUri);
-  }
-
-  private String resolveFrom(final URI ethSignerUri) throws IOException {
-    final List<String> accounts;
-    try {
-      accounts = ethAccounts();
-      return accounts.get(0);
-    } catch (IOException e) {
-      LOG.info("Failed to connect to EthSigner at {}", ethSignerUri);
-      throw e;
-    } catch (Exception e) {
-      LOG.info("Falling back to signing with node key");
-    }
-    return null;
-  }
-
-  public List<String> ethAccounts() throws IOException {
-    return web3j.ethAccounts().send().getAccounts();
-  }
-
-  public String ethSendTransaction(
-      final String to,
-      final BigInteger gas,
-      final BigInteger gasPrice,
-      final BigInteger value,
-      final String data,
-      final BigInteger nonce)
-      throws IOException {
-    return web3j
-        .ethSendTransaction(new Transaction(from, nonce, gasPrice, gas, to, value, data))
-        .send()
-        .getTransactionHash();
-  }
-
-  public String eeaSendTransaction(
-      final String to,
-      final BigInteger gas,
-      final BigInteger gasPrice,
-      final String data,
-      final String privateFrom,
-      final String privacyGroupId,
-      final String restriction)
-      throws IOException {
-    return eeaSendTransaction(
-        to, gas, gasPrice, data, null, privateFrom, privacyGroupId, restriction);
-  }
-
-  public String eeaSendTransaction(
-      final String to,
-      final BigInteger gas,
-      final BigInteger gasPrice,
-      final String data,
-      final BigInteger nonce,
-      final String privateFrom,
-      final String privacyGroupId,
-      final String restriction)
-      throws IOException {
-    final PrivateTransactionRequest transaction =
-        new PrivateTransactionRequest(
-            from,
-            nonce,
-            gasPrice,
-            gas,
-            to,
-            BigInteger.ZERO,
-            data,
-            privateFrom,
-            privacyGroupId,
-            restriction);
-
-    return eeaSendTransaction(transaction);
-  }
-
-  public String eeaSendTransaction(
-      final String to,
-      final BigInteger gas,
-      final BigInteger gasPrice,
-      final String data,
-      final String privateFrom,
-      final List<String> privateFor,
-      final String restriction)
-      throws IOException {
-    return eeaSendTransaction(to, gas, gasPrice, data, null, privateFrom, privateFor, restriction);
-  }
-
-  public String eeaSendTransaction(
-      final String to,
-      final BigInteger gas,
-      final BigInteger gasPrice,
-      final String data,
-      final BigInteger nonce,
-      final String privateFrom,
-      final List<String> privateFor,
-      final String restriction)
-      throws IOException {
-
-    final PrivateTransactionRequest transaction =
-        new PrivateTransactionRequest(
-            from,
-            nonce,
-            gasPrice,
-            gas,
-            to,
-            BigInteger.ZERO,
-            data,
-            privateFrom,
-            privateFor,
-            restriction);
-
-    return eeaSendTransaction(transaction);
-  }
-
-  private String eeaSendTransaction(final PrivateTransactionRequest transaction)
-      throws IOException {
-    // temporary until implemented in web3j
-    return new Request<>(
-            "eea_sendTransaction",
-            Collections.singletonList(transaction),
-            web3jService,
-            EthSendTransaction.class)
-        .send()
-        .getTransactionHash();
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/EthSignerClientTest.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/EthSignerClientTest.java
deleted file mode 100644
index 06b33f2b6b1..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/EthSignerClientTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.ethsigner;
-
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.post;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.tests.acceptance.dsl.ethsigner.testutil.EthSignerTestHarness;
-import org.hyperledger.besu.tests.acceptance.dsl.ethsigner.testutil.EthSignerTestHarnessFactory;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.Collections;
-import java.util.List;
-
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
-public class EthSignerClientTest {
-  @ClassRule public static final TemporaryFolder folder = new TemporaryFolder();
-
-  @ClassRule
-  public static final WireMockRule wireMockRule = new WireMockRule(wireMockConfig().dynamicPort());
-
-  private static final String MOCK_RESPONSE = "mock_transaction_hash";
-  private static final String MOCK_SEND_TRANSACTION_RESPONSE =
-      "{\n"
-          + "  \"id\":67,\n"
-          + "  \"jsonrpc\":\"2.0\",\n"
-          + "  \"result\": \""
-          + MOCK_RESPONSE
-          + "\"\n"
-          + "}";
-  private static final String ENCLAVE_PUBLIC_KEY = "A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
-
-  private static EthSignerClient ethSignerClient;
-
-  private static EthSignerTestHarness testHarness;
-
-  @BeforeClass
-  public static void setUpOnce() throws Exception {
-    stubFor(post("/").willReturn(aResponse().withBody(MOCK_SEND_TRANSACTION_RESPONSE)));
-
-    folder.create();
-
-    testHarness =
-        EthSignerTestHarnessFactory.create(
-            folder.newFolder().toPath(),
-            "ethSignerKey--fe3b557e8fb62b89f4916b721be55ceb828dbd73.json",
-            wireMockRule.port(),
-            2018);
-
-    ethSignerClient = new EthSignerClient(testHarness.getHttpListeningUrl());
-  }
-
-  @Test
-  public void testEthAccounts() throws IOException {
-    final List<String> accounts = ethSignerClient.ethAccounts();
-    assertThat(accounts).hasSize(1);
-    assertThat(accounts.get(0)).isEqualTo("0xfe3b557e8fb62b89f4916b721be55ceb828dbd73");
-  }
-
-  @Test
-  public void testEthSendTransaction() throws IOException {
-    final String response =
-        ethSignerClient.ethSendTransaction(
-            "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
-            BigInteger.ZERO,
-            BigInteger.ZERO,
-            BigInteger.ZERO,
-            "",
-            BigInteger.ZERO);
-
-    assertThat(response).isEqualTo(MOCK_RESPONSE);
-  }
-
-  @Test
-  public void testEeaSendTransaction() throws IOException {
-    final String response =
-        ethSignerClient.eeaSendTransaction(
-            "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
-            BigInteger.ZERO,
-            BigInteger.ZERO,
-            "",
-            BigInteger.ZERO,
-            ENCLAVE_PUBLIC_KEY,
-            Collections.emptyList(),
-            "restricted");
-
-    assertThat(response).isEqualTo(MOCK_RESPONSE);
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/PrivateTransactionRequest.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/PrivateTransactionRequest.java
deleted file mode 100644
index b9b21a49f27..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/PrivateTransactionRequest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.ethsigner;
-
-import java.math.BigInteger;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import org.web3j.utils.Numeric;
-
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class PrivateTransactionRequest {
-
-  private final String from;
-  private final BigInteger nonce;
-  private final BigInteger gasPrice;
-  private final BigInteger gas;
-  private final String to;
-  private final BigInteger value;
-  private final String data;
-  private final String privateFrom;
-  private List<String> privateFor;
-  private String privacyGroupId;
-  private final String restriction;
-
-  public PrivateTransactionRequest(
-      final String from,
-      final BigInteger nonce,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit,
-      final String to,
-      final BigInteger value,
-      final String data,
-      final String privateFrom,
-      final List<String> privateFor,
-      final String restriction) {
-    this.from = from;
-    this.to = to;
-    this.gas = gasLimit;
-    this.gasPrice = gasPrice;
-    this.value = value;
-    this.data = data == null ? null : Numeric.prependHexPrefix(data);
-    this.nonce = nonce;
-    this.privateFrom = privateFrom;
-    this.privateFor = privateFor;
-    this.restriction = restriction;
-  }
-
-  public PrivateTransactionRequest(
-      final String from,
-      final BigInteger nonce,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit,
-      final String to,
-      final BigInteger value,
-      final String data,
-      final String privateFrom,
-      final String privacyGroupId,
-      final String restriction) {
-    this.from = from;
-    this.to = to;
-    this.gas = gasLimit;
-    this.gasPrice = gasPrice;
-    this.value = value;
-    this.data = data == null ? null : Numeric.prependHexPrefix(data);
-    this.nonce = nonce;
-    this.privateFrom = privateFrom;
-    this.privacyGroupId = privacyGroupId;
-    this.restriction = restriction;
-  }
-
-  public String getFrom() {
-    return from;
-  }
-
-  public String getTo() {
-    return to;
-  }
-
-  public String getGas() {
-    return convert(gas);
-  }
-
-  public String getGasPrice() {
-    return convert(gasPrice);
-  }
-
-  public String getValue() {
-    return convert(value);
-  }
-
-  public String getData() {
-    return data;
-  }
-
-  public String getNonce() {
-    return convert(nonce);
-  }
-
-  private String convert(final BigInteger value) {
-    return value == null ? null : Numeric.encodeQuantity(value);
-  }
-
-  public String getPrivateFrom() {
-    return privateFrom;
-  }
-
-  public List<String> getPrivateFor() {
-    return privateFor;
-  }
-
-  public String getPrivacyGroupId() {
-    return privacyGroupId;
-  }
-
-  public String getRestriction() {
-    return restriction;
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerConfig.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerConfig.java
deleted file mode 100644
index a08631e8627..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerConfig.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.ethsigner.testutil;
-
-import java.nio.file.Path;
-import java.time.Duration;
-
-import org.apache.logging.log4j.Level;
-import tech.pegasys.ethsigner.core.Config;
-import tech.pegasys.ethsigner.core.signing.ChainIdProvider;
-
-public class EthSignerConfig implements Config {
-  private final Level logLevel;
-  private final String downstreamHttpHost;
-  private final Integer downStreamHttpPort;
-  private final Duration downstreamHttpRequestTimeout;
-  private final String httpListenHost;
-  private final Integer httpListenPort;
-  private final ChainIdProvider chainId;
-  private final Path dataDirectory;
-
-  public EthSignerConfig(
-      final Level logLevel,
-      final String downstreamHttpHost,
-      final Integer downStreamHttpPort,
-      final Duration downstreamHttpRequestTimeout,
-      final String httpListenHost,
-      final Integer httpListenPort,
-      final ChainIdProvider chainId,
-      final Path dataDirectory) {
-
-    this.logLevel = logLevel;
-    this.downstreamHttpHost = downstreamHttpHost;
-    this.downStreamHttpPort = downStreamHttpPort;
-    this.downstreamHttpRequestTimeout = downstreamHttpRequestTimeout;
-    this.httpListenHost = httpListenHost;
-    this.httpListenPort = httpListenPort;
-    this.chainId = chainId;
-    this.dataDirectory = dataDirectory;
-  }
-
-  @Override
-  public Level getLogLevel() {
-    return logLevel;
-  }
-
-  @Override
-  public String getDownstreamHttpHost() {
-    return downstreamHttpHost;
-  }
-
-  @Override
-  public Integer getDownstreamHttpPort() {
-    return downStreamHttpPort;
-  }
-
-  @Override
-  public Duration getDownstreamHttpRequestTimeout() {
-    return downstreamHttpRequestTimeout;
-  }
-
-  @Override
-  public String getHttpListenHost() {
-    return httpListenHost;
-  }
-
-  @Override
-  public Integer getHttpListenPort() {
-    return httpListenPort;
-  }
-
-  @Override
-  public ChainIdProvider getChainId() {
-    return chainId;
-  }
-
-  @Override
-  public Path getDataPath() {
-    return dataDirectory;
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarness.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarness.java
deleted file mode 100644
index e4c13b7f7bc..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarness.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.ethsigner.testutil;
-
-import java.net.URI;
-import java.util.Properties;
-
-public class EthSignerTestHarness {
-  private final EthSignerConfig config;
-  private final Properties portsProperties;
-
-  public EthSignerTestHarness(final EthSignerConfig config, final Properties properties) {
-    this.config = config;
-    this.portsProperties = properties;
-  }
-
-  public URI getHttpListeningUrl() {
-    return URI.create(
-        "http://" + config.getHttpListenHost() + ":" + portsProperties.getProperty("http-jsonrpc"));
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarnessFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarnessFactory.java
deleted file mode 100644
index 57b88d69825..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarnessFactory.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.ethsigner.testutil;
-
-import static org.apache.tuweni.io.file.Files.copyResource;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.time.Duration;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Stream;
-
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.awaitility.Awaitility;
-import org.web3j.crypto.CipherException;
-import org.web3j.crypto.WalletUtils;
-import tech.pegasys.ethsigner.core.EthSigner;
-import tech.pegasys.ethsigner.core.signing.ConfigurationChainId;
-import tech.pegasys.ethsigner.core.signing.SingleTransactionSignerProvider;
-import tech.pegasys.ethsigner.signer.filebased.CredentialTransactionSigner;
-
-public class EthSignerTestHarnessFactory {
-
-  private static final Logger LOG = LogManager.getLogger();
-  private static final String HOST = "127.0.0.1";
-
-  public static EthSignerTestHarness create(
-      final Path tempDir, final String keyPath, final Integer besuPort, final long chainId)
-      throws IOException, CipherException {
-
-    final Path keyFilePath = copyResource(keyPath, tempDir.resolve(keyPath));
-
-    final EthSignerConfig config =
-        new EthSignerConfig(
-            Level.DEBUG,
-            HOST,
-            besuPort,
-            Duration.ofSeconds(10),
-            HOST,
-            0,
-            new ConfigurationChainId(chainId),
-            tempDir);
-
-    final EthSigner ethSigner =
-        new EthSigner(
-            config,
-            new SingleTransactionSignerProvider(
-                new CredentialTransactionSigner(
-                    WalletUtils.loadCredentials("", keyFilePath.toAbsolutePath().toFile()))));
-    ethSigner.run();
-
-    waitForPortFile(tempDir);
-
-    LOG.info("EthSigner port: {}", config.getHttpListenPort());
-
-    return new EthSignerTestHarness(config, loadPortsFile(tempDir));
-  }
-
-  private static Properties loadPortsFile(final Path tempDir) {
-    final Properties portsProperties = new Properties();
-    try (final FileInputStream fis =
-        new FileInputStream(new File(tempDir.toFile(), "ethsigner.ports"))) {
-      portsProperties.load(fis);
-      LOG.info("Ports for ethsigner {}", portsProperties);
-    } catch (final IOException e) {
-      throw new RuntimeException("Error reading EthSigner ports file", e);
-    }
-    return portsProperties;
-  }
-
-  private static void waitForPortFile(final Path tempDir) {
-    final File file = new File(tempDir.toFile(), "ethsigner.ports");
-    Awaitility.waitAtMost(30, TimeUnit.SECONDS)
-        .until(
-            () -> {
-              if (file.exists()) {
-                try (final Stream<String> s = Files.lines(file.toPath())) {
-                  return s.count() > 0;
-                }
-              } else {
-                return false;
-              }
-            });
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNode.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNode.java
index 5ea854b3fa5..d822a21fb18 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNode.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNode.java
@@ -15,28 +15,33 @@
 package org.hyperledger.besu.tests.acceptance.dsl.node;
 
 import static java.util.Collections.unmodifiableList;
-import static org.apache.logging.log4j.LogManager.getLogger;
 import static org.apache.tuweni.io.file.Files.copyResource;
 
+import org.hyperledger.besu.cli.config.NetworkName;
+import org.hyperledger.besu.config.MergeConfigOptions;
+import org.hyperledger.besu.crypto.KeyPair;
 import org.hyperledger.besu.crypto.KeyPairUtil;
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
+import org.hyperledger.besu.ethereum.api.jsonrpc.ipc.JsonRpcIpcConfiguration;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.Util;
 import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
+import org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty.TLSConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
+import org.hyperledger.besu.pki.config.PkiKeyStoreConfiguration;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
 import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.NodeConfiguration;
 import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationProvider;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.admin.AdminRequestFactory;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.bft.BftRequestFactory;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.bft.ConsensusType;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueRequestFactory;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2.Ibft2RequestFactory;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.login.LoginRequestFactory;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.miner.MinerRequestFactory;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.CustomRequestFactory;
@@ -62,10 +67,11 @@
 import com.google.common.base.MoreObjects;
 import com.google.common.io.MoreFiles;
 import com.google.common.io.RecursiveDeleteOption;
-import org.apache.logging.log4j.Logger;
 import org.awaitility.Awaitility;
 import org.awaitility.core.ConditionTimeoutException;
 import org.java_websocket.exceptions.WebsocketNotConnectedException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.web3j.protocol.Web3jService;
 import org.web3j.protocol.core.JsonRpc2_0Web3j;
 import org.web3j.protocol.http.HttpService;
@@ -77,25 +83,33 @@
 public class BesuNode implements NodeConfiguration, RunnableNode, AutoCloseable {
 
   private static final String LOCALHOST = "127.0.0.1";
-  private static final Logger LOG = getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(BesuNode.class);
+  public static final String HTTP = "http://";
+  public static final String WS_RPC = "ws-rpc";
+  public static final String JSON_RPC = "json-rpc";
 
   private final Path homeDirectory;
-  private final KeyPair keyPair;
+  private KeyPair keyPair;
   private final Properties portsProperties = new Properties();
   private final Boolean p2pEnabled;
+  private final int p2pPort;
+  private final Optional<TLSConfiguration> tlsConfiguration;
   private final NetworkingConfiguration networkingConfiguration;
   private final boolean revertReasonEnabled;
 
   private final String name;
-  private final MiningParameters miningParameters;
+  private MiningParameters miningParameters;
   private final List<String> runCommand;
   private PrivacyParameters privacyParameters = PrivacyParameters.DEFAULT;
   private final JsonRpcConfiguration jsonRpcConfiguration;
+  private final Optional<JsonRpcConfiguration> engineRpcConfiguration;
   private final WebSocketConfiguration webSocketConfiguration;
+  private final JsonRpcIpcConfiguration jsonRpcIpcConfiguration;
   private final MetricsConfiguration metricsConfiguration;
   private Optional<PermissioningConfiguration> permissioningConfiguration;
   private final GenesisConfigurationProvider genesisConfigProvider;
   private final boolean devMode;
+  private final NetworkName network;
   private final boolean discoveryEnabled;
   private final List<URI> bootnodes = new ArrayList<>();
   private final boolean bootnodeEligible;
@@ -111,19 +125,27 @@ public class BesuNode implements NodeConfiguration, RunnableNode, AutoCloseable
   private final List<String> staticNodes;
   private boolean isDnsEnabled = false;
   private Optional<Integer> exitCode = Optional.empty();
+  private Optional<PkiKeyStoreConfiguration> pkiKeyStoreConfiguration = Optional.empty();
+  private final boolean isStrictTxReplayProtectionEnabled;
+  private final Map<String, String> environment;
 
   public BesuNode(
       final String name,
       final Optional<Path> dataPath,
       final MiningParameters miningParameters,
       final JsonRpcConfiguration jsonRpcConfiguration,
+      final Optional<JsonRpcConfiguration> engineRpcConfiguration,
       final WebSocketConfiguration webSocketConfiguration,
+      final JsonRpcIpcConfiguration jsonRpcIpcConfiguration,
       final MetricsConfiguration metricsConfiguration,
       final Optional<PermissioningConfiguration> permissioningConfiguration,
       final Optional<String> keyfilePath,
       final boolean devMode,
+      final NetworkName network,
       final GenesisConfigurationProvider genesisConfigProvider,
       final boolean p2pEnabled,
+      final int p2pPort,
+      final Optional<TLSConfiguration> tlsConfiguration,
       final NetworkingConfiguration networkingConfiguration,
       final boolean discoveryEnabled,
       final boolean bootnodeEligible,
@@ -135,9 +157,14 @@ public BesuNode(
       final List<String> staticNodes,
       final boolean isDnsEnabled,
       final Optional<PrivacyParameters> privacyParameters,
-      final List<String> runCommand)
+      final List<String> runCommand,
+      final Optional<KeyPair> keyPair,
+      final Optional<PkiKeyStoreConfiguration> pkiKeyStoreConfiguration,
+      final boolean isStrictTxReplayProtectionEnabled,
+      final Map<String, String> environment)
       throws IOException {
     this.homeDirectory = dataPath.orElseGet(BesuNode::createTmpDataDirectory);
+    this.isStrictTxReplayProtectionEnabled = isStrictTxReplayProtectionEnabled;
     keyfilePath.ifPresent(
         path -> {
           try {
@@ -146,16 +173,26 @@ public BesuNode(
             LOG.error("Could not find key file \"{}\" in resources", path);
           }
         });
-    this.keyPair = KeyPairUtil.loadKeyPair(homeDirectory);
+    keyPair.ifPresentOrElse(
+        existingKeyPair -> {
+          this.keyPair = existingKeyPair;
+          KeyPairUtil.storeKeyFile(existingKeyPair, homeDirectory);
+        },
+        () -> this.keyPair = KeyPairUtil.loadKeyPair(homeDirectory));
     this.name = name;
     this.miningParameters = miningParameters;
     this.jsonRpcConfiguration = jsonRpcConfiguration;
+    this.engineRpcConfiguration = engineRpcConfiguration;
     this.webSocketConfiguration = webSocketConfiguration;
+    this.jsonRpcIpcConfiguration = jsonRpcIpcConfiguration;
     this.metricsConfiguration = metricsConfiguration;
     this.permissioningConfiguration = permissioningConfiguration;
     this.genesisConfigProvider = genesisConfigProvider;
     this.devMode = devMode;
+    this.network = network;
     this.p2pEnabled = p2pEnabled;
+    this.p2pPort = p2pPort;
+    this.tlsConfiguration = tlsConfiguration;
     this.networkingConfiguration = networkingConfiguration;
     this.discoveryEnabled = discoveryEnabled;
     this.bootnodeEligible = bootnodeEligible;
@@ -174,11 +211,15 @@ public BesuNode(
             LOG.error("Could not find plugin \"{}\" in resources", pluginName);
           }
         });
+    engineRpcConfiguration.ifPresent(
+        config -> MergeConfigOptions.setMergeEnabled(config.isEnabled()));
     this.extraCLIOptions = extraCLIOptions;
     this.staticNodes = staticNodes;
     this.isDnsEnabled = isDnsEnabled;
     privacyParameters.ifPresent(this::setPrivacyParameters);
-    LOG.info("Created BesuNode {}", this.toString());
+    this.pkiKeyStoreConfiguration = pkiKeyStoreConfiguration;
+    this.environment = environment;
+    LOG.info("Created BesuNode {}", this);
   }
 
   private static Path createTmpDataDirectory() {
@@ -194,10 +235,25 @@ public boolean isJsonRpcEnabled() {
     return jsonRpcConfiguration().isEnabled();
   }
 
+  @Override
+  public boolean isEngineRpcEnabled() {
+    return engineRpcConfiguration.isPresent() && engineRpcConfiguration.get().isEnabled();
+  }
+
+  public boolean isEngineAuthDisabled() {
+    return engineRpcConfiguration
+        .map(engineConf -> !engineConf.isAuthenticationEnabled())
+        .orElse(false);
+  }
+
   private boolean isWebSocketsRpcEnabled() {
     return webSocketConfiguration().isEnabled();
   }
 
+  public boolean isJsonRpcIpcEnabled() {
+    return jsonRpcIpcConfiguration().isEnabled();
+  }
+
   boolean isMetricsEnabled() {
     return metricsConfiguration.isEnabled();
   }
@@ -220,10 +276,15 @@ public Optional<Integer> exitCode() {
   @Override
   public URI enodeUrl() {
     final String discport = isDiscoveryEnabled() ? "?discport=" + getDiscoveryPort() : "";
-    return URI.create("enode://" + getNodeId() + "@" + LOCALHOST + ":" + getP2pPort() + discport);
+    return URI.create(
+        "enode://" + getNodeId() + "@" + LOCALHOST + ":" + getRuntimeP2pPort() + discport);
   }
 
-  private String getP2pPort() {
+  public String getP2pPort() {
+    return String.valueOf(p2pPort);
+  }
+
+  private String getRuntimeP2pPort() {
     final String port = portsProperties.getProperty("p2p");
     if (port == null) {
       throw new IllegalStateException("Requested p2p port before ports properties was written");
@@ -240,13 +301,23 @@ private String getDiscoveryPort() {
     return port;
   }
 
-  private Optional<String> jsonRpcBaseUrl() {
+  public Optional<String> jsonRpcBaseUrl() {
     if (isJsonRpcEnabled()) {
       return Optional.of(
-          "http://"
-              + jsonRpcConfiguration.getHost()
-              + ":"
-              + portsProperties.getProperty("json-rpc"));
+          HTTP + jsonRpcConfiguration.getHost() + ":" + portsProperties.getProperty(JSON_RPC));
+    } else {
+      return Optional.empty();
+    }
+  }
+
+  public Optional<String> engineRpcUrl() {
+    if (isEngineRpcEnabled()) {
+      final Optional<Integer> maybeEngineRpcPort = getEngineJsonRpcPort();
+      if (maybeEngineRpcPort.isEmpty()) {
+        return Optional.empty();
+      }
+      return Optional.of(
+          HTTP + engineRpcConfiguration.get().getHost() + ":" + maybeEngineRpcPort.get());
     } else {
       return Optional.empty();
     }
@@ -255,7 +326,7 @@ private Optional<String> jsonRpcBaseUrl() {
   private Optional<String> wsRpcBaseUrl() {
     if (isWebSocketsRpcEnabled()) {
       return Optional.of(
-          "ws://" + webSocketConfiguration.getHost() + ":" + portsProperties.getProperty("ws-rpc"));
+          "ws://" + webSocketConfiguration.getHost() + ":" + portsProperties.getProperty(WS_RPC));
     } else {
       return Optional.empty();
     }
@@ -264,10 +335,7 @@ private Optional<String> wsRpcBaseUrl() {
   private Optional<String> wsRpcBaseHttpUrl() {
     if (isWebSocketsRpcEnabled()) {
       return Optional.of(
-          "http://"
-              + webSocketConfiguration.getHost()
-              + ":"
-              + portsProperties.getProperty("ws-rpc"));
+          HTTP + webSocketConfiguration.getHost() + ":" + portsProperties.getProperty(WS_RPC));
     } else {
       return Optional.empty();
     }
@@ -276,7 +344,7 @@ private Optional<String> wsRpcBaseHttpUrl() {
   public Optional<String> metricsHttpUrl() {
     if (isMetricsEnabled()) {
       return Optional.of(
-          "http://"
+          HTTP
               + metricsConfiguration.getHost()
               + ":"
               + portsProperties.getProperty("metrics")
@@ -289,15 +357,25 @@ public Optional<String> metricsHttpUrl() {
   @Override
   public Optional<Integer> getJsonRpcWebSocketPort() {
     if (isWebSocketsRpcEnabled()) {
-      return Optional.of(Integer.valueOf(portsProperties.getProperty("ws-rpc")));
+      return Optional.of(Integer.valueOf(portsProperties.getProperty(WS_RPC)));
     } else {
       return Optional.empty();
     }
   }
 
-  public Optional<Integer> getJsonRpcSocketPort() {
-    if (isWebSocketsRpcEnabled()) {
-      return Optional.of(Integer.valueOf(portsProperties.getProperty("json-rpc")));
+  @Override
+  public Optional<Integer> getJsonRpcPort() {
+    if (isJsonRpcEnabled()) {
+      return Optional.of(Integer.valueOf(portsProperties.getProperty(JSON_RPC)));
+    } else {
+      return Optional.empty();
+    }
+  }
+
+  @Override
+  public Optional<Integer> getEngineJsonRpcPort() {
+    if (isEngineRpcEnabled()) {
+      return Optional.of(Integer.valueOf(portsProperties.getProperty("engine-json-rpc")));
     } else {
       return Optional.empty();
     }
@@ -308,7 +386,7 @@ public String getHostName() {
     return LOCALHOST;
   }
 
-  private NodeRequests nodeRequests() {
+  public NodeRequests nodeRequests() {
     Optional<WebSocketService> websocketService = Optional.empty();
     if (nodeRequests == null) {
       final Web3jService web3jService;
@@ -330,20 +408,25 @@ private NodeRequests nodeRequests() {
 
         websocketService = Optional.of((WebSocketService) web3jService);
       } else {
-        web3jService =
-            jsonRpcBaseUrl()
-                .map(HttpService::new)
-                .orElse(new HttpService("http://" + LOCALHOST + ":" + 8545));
+        final String url = jsonRpcBaseUrl().orElse(HTTP + LOCALHOST + ":" + 8545);
+        web3jService = new HttpService(url);
         if (token != null) {
           ((HttpService) web3jService).addHeader("Authorization", "Bearer " + token);
         }
       }
 
+      final ConsensusType bftType =
+          getGenesisConfig()
+              .map(
+                  gc ->
+                      gc.toLowerCase().contains("ibft") ? ConsensusType.IBFT2 : ConsensusType.QBFT)
+              .orElse(ConsensusType.IBFT2);
+
       nodeRequests =
           new NodeRequests(
               new JsonRpc2_0Web3j(web3jService, 2000, Async.defaultExecutorService()),
               new CliqueRequestFactory(web3jService),
-              new Ibft2RequestFactory(web3jService),
+              new BftRequestFactory(web3jService, bftType),
               new PermissioningJsonRpcRequestFactory(web3jService),
               new AdminRequestFactory(web3jService),
               new PrivacyRequestFactory(web3jService),
@@ -368,8 +451,7 @@ private LoginRequestFactory loginRequestFactory() {
         baseUrl = jsonRpcBaseUrl();
         port = "8545";
       }
-      loginRequestFactory =
-          new LoginRequestFactory(baseUrl.orElse("http://" + LOCALHOST + ":" + port));
+      loginRequestFactory = new LoginRequestFactory(baseUrl.orElse(HTTP + LOCALHOST + ":" + port));
     }
     return loginRequestFactory;
   }
@@ -490,6 +572,10 @@ JsonRpcConfiguration jsonRpcConfiguration() {
     return jsonRpcConfiguration;
   }
 
+  Optional<JsonRpcConfiguration> engineRpcConfiguration() {
+    return engineRpcConfiguration;
+  }
+
   Optional<String> jsonRpcListenHost() {
     if (isJsonRpcEnabled()) {
       return Optional.of(jsonRpcConfiguration().getHost());
@@ -506,6 +592,14 @@ Optional<Integer> jsonRpcListenPort() {
     }
   }
 
+  Optional<Integer> jsonEngineListenPort() {
+    if (isEngineRpcEnabled()) {
+      return Optional.of(engineRpcConfiguration.get().getPort());
+    } else {
+      return Optional.empty();
+    }
+  }
+
   boolean wsRpcEnabled() {
     return isWebSocketsRpcEnabled();
   }
@@ -514,6 +608,10 @@ WebSocketConfiguration webSocketConfiguration() {
     return webSocketConfiguration;
   }
 
+  JsonRpcIpcConfiguration jsonRpcIpcConfiguration() {
+    return jsonRpcIpcConfiguration;
+  }
+
   Optional<String> wsRpcListenHost() {
     return Optional.of(webSocketConfiguration().getHost());
   }
@@ -540,6 +638,10 @@ public boolean isP2pEnabled() {
     return p2pEnabled;
   }
 
+  public Optional<TLSConfiguration> getTLSConfiguration() {
+    return tlsConfiguration;
+  }
+
   public NetworkingConfiguration getNetworkingConfiguration() {
     return networkingConfiguration;
   }
@@ -559,6 +661,10 @@ MiningParameters getMiningParameters() {
     return miningParameters;
   }
 
+  public void setMiningParameters(final MiningParameters miningParameters) {
+    this.miningParameters = miningParameters;
+  }
+
   public PrivacyParameters getPrivacyParameters() {
     return privacyParameters;
   }
@@ -571,6 +677,10 @@ public boolean isDevMode() {
     return devMode;
   }
 
+  public NetworkName getNetwork() {
+    return network;
+  }
+
   public boolean isSecp256k1Native() {
     return secp256k1Native;
   }
@@ -624,6 +734,14 @@ public List<String> getRunCommand() {
     return runCommand;
   }
 
+  public Optional<PkiKeyStoreConfiguration> getPkiKeyStoreConfiguration() {
+    return pkiKeyStoreConfiguration;
+  }
+
+  public boolean isStrictTxReplayProtectionEnabled() {
+    return isStrictTxReplayProtectionEnabled;
+  }
+
   @Override
   public String toString() {
     return MoreObjects.toStringHelper(this)
@@ -683,4 +801,9 @@ public void verify(final Condition expected) {
   public void setExitCode(final int exitValue) {
     this.exitCode = Optional.of(exitValue);
   }
+
+  @Override
+  public Map<String, String> getEnvironment() {
+    return environment;
+  }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNodeRunner.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNodeRunner.java
index 89512ddbdb9..fa74644ccbc 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNodeRunner.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNodeRunner.java
@@ -26,13 +26,17 @@
 public interface BesuNodeRunner {
 
   static BesuNodeRunner instance() {
-    if (Boolean.getBoolean("acctests.runBesuAsProcess")) {
+    if (isProcessBesuNodeRunner()) {
       return new ProcessBesuNodeRunner();
     } else {
       return new ThreadBesuNodeRunner();
     }
   }
 
+  static boolean isProcessBesuNodeRunner() {
+    return Boolean.getBoolean("acctests.runBesuAsProcess");
+  }
+
   void startNode(BesuNode node);
 
   void stopNode(BesuNode node);
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java
index 917a44ab4f9..048e40553ba 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java
@@ -18,8 +18,8 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import org.hyperledger.besu.cli.options.unstable.NetworkingOptions;
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
+import org.hyperledger.besu.ethereum.api.jsonrpc.ipc.JsonRpcIpcConfiguration;
+import org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty.TLSConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
 import org.hyperledger.besu.plugin.services.metrics.MetricCategory;
@@ -47,15 +47,15 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.ThreadContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
 
 public class ProcessBesuNodeRunner implements BesuNodeRunner {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(ProcessBesuNodeRunner.class);
   private static final Logger PROCESS_LOG =
-      LogManager.getLogger("org.hyperledger.besu.SubProcessLog");
+      LoggerFactory.getLogger("org.hyperledger.besu.SubProcessLog");
 
   private final Map<String, Process> besuProcesses = new HashMap<>();
   private final ExecutorService outputProcessorExecutor = Executors.newCachedThreadPool();
@@ -81,6 +81,9 @@ public void startNode(final BesuNode node) {
     if (node.isDevMode()) {
       params.add("--network");
       params.add("DEV");
+    } else if (node.getNetwork() != null) {
+      params.add("--network");
+      params.add(node.getNetwork().name());
     }
 
     params.add("--sync-mode");
@@ -93,7 +96,7 @@ public void startNode(final BesuNode node) {
     params.add(node.p2pListenHost());
 
     params.add("--p2p-port");
-    params.add("0");
+    params.add(node.getP2pPort());
 
     if (node.getMiningParameters().isMiningEnabled()) {
       params.add("--miner-enabled");
@@ -117,25 +120,33 @@ public void startNode(final BesuNode node) {
 
     if (node.getPrivacyParameters().isEnabled()) {
       params.add("--privacy-enabled");
+
       params.add("--privacy-url");
       params.add(node.getPrivacyParameters().getEnclaveUri().toString());
+
       if (node.getPrivacyParameters().isMultiTenancyEnabled()) {
         params.add("--privacy-multi-tenancy-enabled");
       } else {
         params.add("--privacy-public-key-file");
         params.add(node.getPrivacyParameters().getEnclavePublicKeyFile().getAbsolutePath());
       }
-      params.add("--privacy-marker-transaction-signing-key-file");
-      params.add(node.homeDirectory().resolve("key").toString());
 
-      if (node.getPrivacyParameters().isOnchainPrivacyGroupsEnabled()) {
-        params.add("--privacy-onchain-groups-enabled");
+      if (!node.getExtraCLIOptions().contains("--plugin-privacy-service-signing-enabled=true")) {
+        params.add("--privacy-marker-transaction-signing-key-file");
+        params.add(node.homeDirectory().resolve("key").toString());
+      }
+
+      if (node.getPrivacyParameters().isFlexiblePrivacyGroupsEnabled()) {
+        params.add("--privacy-flexible-groups-enabled");
       }
-    }
 
-    params.add("--bootnodes");
+      if (node.getPrivacyParameters().isPrivacyPluginEnabled()) {
+        params.add("--Xprivacy-plugin-enabled");
+      }
+    }
 
     if (!node.getBootnodes().isEmpty()) {
+      params.add("--bootnodes");
       params.add(node.getBootnodes().stream().map(URI::toString).collect(Collectors.joining(",")));
     }
 
@@ -158,6 +169,10 @@ public void startNode(final BesuNode node) {
       params.add(node.jsonRpcListenPort().map(Object::toString).get());
       params.add("--rpc-http-api");
       params.add(apiList(node.jsonRpcConfiguration().getRpcApis()));
+      if (!node.jsonRpcConfiguration().getNoAuthRpcApis().isEmpty()) {
+        params.add("--rpc-http-api-methods-no-auth");
+        params.add(apiList(node.jsonRpcConfiguration().getNoAuthRpcApis()));
+      }
       if (node.jsonRpcConfiguration().isAuthenticationEnabled()) {
         params.add("--rpc-http-authentication-enabled");
       }
@@ -169,6 +184,19 @@ public void startNode(final BesuNode node) {
         params.add("--rpc-http-authentication-jwt-public-key-file");
         params.add(node.jsonRpcConfiguration().getAuthenticationPublicKeyFile().getAbsolutePath());
       }
+      if (node.jsonRpcConfiguration().getAuthenticationAlgorithm() != null) {
+        params.add("--rpc-http-authentication-jwt-algorithm");
+        params.add(node.jsonRpcConfiguration().getAuthenticationAlgorithm().toString());
+      }
+    }
+
+    if (node.isEngineRpcEnabled()) {
+      params.add("--engine-rpc-port");
+      params.add(node.jsonEngineListenPort().get().toString());
+
+      if (node.isEngineAuthDisabled()) {
+        params.add("--engine-jwt-disabled");
+      }
     }
 
     if (node.wsRpcEnabled()) {
@@ -179,6 +207,10 @@ public void startNode(final BesuNode node) {
       params.add(node.wsRpcListenPort().map(Object::toString).get());
       params.add("--rpc-ws-api");
       params.add(apiList(node.webSocketConfiguration().getRpcApis()));
+      if (!node.webSocketConfiguration().getRpcApisNoAuth().isEmpty()) {
+        params.add("--rpc-ws-api-methods-no-auth");
+        params.add(apiList(node.webSocketConfiguration().getRpcApisNoAuth()));
+      }
       if (node.webSocketConfiguration().isAuthenticationEnabled()) {
         params.add("--rpc-ws-authentication-enabled");
       }
@@ -191,6 +223,19 @@ public void startNode(final BesuNode node) {
         params.add(
             node.webSocketConfiguration().getAuthenticationPublicKeyFile().getAbsolutePath());
       }
+      if (node.webSocketConfiguration().getAuthenticationAlgorithm() != null) {
+        params.add("--rpc-ws-authentication-jwt-algorithm");
+        params.add(node.webSocketConfiguration().getAuthenticationAlgorithm().toString());
+      }
+    }
+
+    if (node.isJsonRpcIpcEnabled()) {
+      final JsonRpcIpcConfiguration ipcConfiguration = node.jsonRpcIpcConfiguration();
+      params.add("--Xrpc-ipc-enabled");
+      params.add("--Xrpc-ipc-path");
+      params.add(ipcConfiguration.getPath().toString());
+      params.add("--Xrpc-ipc-apis");
+      params.add(String.join(",", ipcConfiguration.getEnabledApis()));
     }
 
     if (node.isMetricsEnabled()) {
@@ -204,6 +249,10 @@ public void startNode(final BesuNode node) {
         params.add("--metrics-category");
         params.add(((Enum<?>) category).name());
       }
+      if (node.isMetricsEnabled() || metricsConfiguration.isPushEnabled()) {
+        params.add("--metrics-protocol");
+        params.add(metricsConfiguration.getProtocol().name());
+      }
       if (metricsConfiguration.isPushEnabled()) {
         params.add("--metrics-push-enabled");
         params.add("--metrics-push-host");
@@ -232,6 +281,26 @@ public void startNode(final BesuNode node) {
       final List<String> networkConfigParams =
           NetworkingOptions.fromConfig(node.getNetworkingConfiguration()).getCLIOptions();
       params.addAll(networkConfigParams);
+      if (node.getTLSConfiguration().isPresent()) {
+        final TLSConfiguration config = node.getTLSConfiguration().get();
+        params.add("--Xp2p-tls-enabled");
+        params.add("--Xp2p-tls-keystore-type");
+        params.add(config.getKeyStoreType());
+        params.add("--Xp2p-tls-keystore-file");
+        params.add(config.getKeyStorePath().toAbsolutePath().toString());
+        params.add("--Xp2p-tls-keystore-password-file");
+        params.add(config.getKeyStorePasswordPath().toAbsolutePath().toString());
+        params.add("--Xp2p-tls-crl-file");
+        params.add(config.getCrlPath().toAbsolutePath().toString());
+        if (null != config.getTrustStoreType()) {
+          params.add("--Xp2p-tls-truststore-type");
+          params.add(config.getTrustStoreType());
+          params.add("--Xp2p-tls-truststore-file");
+          params.add(config.getTrustStorePath().toAbsolutePath().toString());
+          params.add("--Xp2p-tls-truststore-password-file");
+          params.add(config.getTrustStorePasswordPath().toAbsolutePath().toString());
+        }
+      }
     }
 
     if (node.isRevertReasonEnabled()) {
@@ -284,6 +353,34 @@ public void startNode(final BesuNode node) {
                   String.valueOf(
                       permissioningConfiguration.getNodeSmartContractInterfaceVersion()));
             });
+
+    node.getPkiKeyStoreConfiguration()
+        .ifPresent(
+            pkiConfig -> {
+              params.add("--Xpki-block-creation-enabled");
+
+              params.add("--Xpki-block-creation-keystore-certificate-alias");
+              params.add(pkiConfig.getCertificateAlias());
+
+              params.add("--Xpki-block-creation-keystore-type");
+              params.add(pkiConfig.getKeyStoreType());
+
+              params.add("--Xpki-block-creation-keystore-file");
+              params.add(pkiConfig.getKeyStorePath().toAbsolutePath().toString());
+
+              params.add("--Xpki-block-creation-keystore-password-file");
+              params.add(pkiConfig.getKeyStorePasswordPath().toAbsolutePath().toString());
+
+              params.add("--Xpki-block-creation-truststore-type");
+              params.add(pkiConfig.getTrustStoreType());
+
+              params.add("--Xpki-block-creation-truststore-file");
+              params.add(pkiConfig.getTrustStorePath().toAbsolutePath().toString());
+
+              params.add("--Xpki-block-creation-truststore-password-file");
+              params.add(pkiConfig.getTrustStorePasswordPath().toAbsolutePath().toString());
+            });
+
     params.addAll(node.getExtraCLIOptions());
 
     params.add("--key-value-storage");
@@ -292,6 +389,9 @@ public void startNode(final BesuNode node) {
     params.add("--auto-log-bloom-caching-enabled");
     params.add("false");
 
+    params.add("--strict-tx-replay-protection-enabled");
+    params.add(Boolean.toString(node.isStrictTxReplayProtectionEnabled()));
+
     final String level = System.getProperty("root.log.level");
     if (level != null) {
       params.add("--logging=" + level);
@@ -319,6 +419,26 @@ public void startNode(final BesuNode node) {
             "JAVA_OPTS",
             "-Djava.security.properties="
                 + "acceptance-tests/tests/build/resources/test/acceptanceTesting.security");
+    // add additional environment variables
+    processBuilder.environment().putAll(node.getEnvironment());
+
+    try {
+      int debugPort = Integer.parseInt(System.getenv("BESU_DEBUG_CHILD_PROCESS_PORT"));
+      LOG.warn("Waiting for debugger to attach to SUSPENDED child process");
+      String debugOpts =
+          " -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:" + debugPort;
+      String prevJavaOpts = processBuilder.environment().get("JAVA_OPTS");
+      if (prevJavaOpts == null) {
+        processBuilder.environment().put("JAVA_OPTS", debugOpts);
+      } else {
+        processBuilder.environment().put("JAVA_OPTS", prevJavaOpts + debugOpts);
+      }
+
+    } catch (NumberFormatException e) {
+      LOG.debug(
+          "Child process may be attached to by exporting BESU_DEBUG_CHILD_PROCESS_PORT=<port> to env");
+    }
+
     try {
       checkState(
           isNotAliveOrphan(node.getName()),
@@ -337,7 +457,7 @@ public void startNode(final BesuNode node) {
       waitForFile(dataDir, "besu.ports");
       waitForFile(dataDir, "besu.networks");
     }
-    ThreadContext.remove("node");
+    MDC.remove("node");
   }
 
   private boolean isNotAliveOrphan(final String name) {
@@ -349,7 +469,7 @@ private void printOutput(final BesuNode node, final Process process) {
     try (final BufferedReader in =
         new BufferedReader(new InputStreamReader(process.getInputStream(), UTF_8))) {
 
-      ThreadContext.put("node", node.getName());
+      MDC.put("node", node.getName());
 
       String line = in.readLine();
       while (line != null) {
@@ -384,8 +504,8 @@ private void createStaticNodes(final BesuNode node) {
     StaticNodesUtils.createStaticNodesFile(node.homeDirectory(), node.getStaticNodes());
   }
 
-  private String apiList(final Collection<RpcApi> rpcApis) {
-    return rpcApis.stream().map(RpcApis::getValue).collect(Collectors.joining(","));
+  private String apiList(final Collection<String> rpcApis) {
+    return String.join(",", rpcApis);
   }
 
   @Override
@@ -422,7 +542,7 @@ public boolean isActive(final String nodeName) {
   private void killBesuProcess(final String name) {
     final Process process = besuProcesses.remove(name);
     if (process == null) {
-      LOG.error("Process {} wasn't in our list, pid {}", name, process.pid());
+      LOG.error("Process {} wasn't in our list", name);
       return;
     }
     if (!process.isAlive()) {
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/RunnableNode.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/RunnableNode.java
index 3586dd8eea6..f729cf8b1f3 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/RunnableNode.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/RunnableNode.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl.node;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
 import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.NodeConfiguration;
 
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java
index 7c68e12e5a0..29ce00b175f 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ThreadBesuNodeRunner.java
@@ -14,73 +14,76 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl.node;
 
-import static org.hyperledger.besu.cli.config.NetworkName.DEV;
 import static org.hyperledger.besu.controller.BesuController.DATABASE_PATH;
 
 import org.hyperledger.besu.Runner;
 import org.hyperledger.besu.RunnerBuilder;
 import org.hyperledger.besu.cli.config.EthNetworkConfig;
+import org.hyperledger.besu.cli.config.NetworkName;
+import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.consensus.qbft.pki.PkiBlockCreationConfigurationProvider;
 import org.hyperledger.besu.controller.BesuController;
 import org.hyperledger.besu.controller.BesuControllerBuilder;
-import org.hyperledger.besu.crypto.KeyPairSecurityModule;
 import org.hyperledger.besu.crypto.KeyPairUtil;
-import org.hyperledger.besu.crypto.NodeKey;
+import org.hyperledger.besu.cryptoservices.KeyPairSecurityModule;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.api.graphql.GraphQLConfiguration;
-import org.hyperledger.besu.ethereum.blockcreation.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
-import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProvider;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProviderBuilder;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 import org.hyperledger.besu.metrics.MetricsSystemFactory;
 import org.hyperledger.besu.metrics.ObservableMetricsSystem;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.plugin.services.BesuConfiguration;
 import org.hyperledger.besu.plugin.services.BesuEvents;
 import org.hyperledger.besu.plugin.services.PicoCLIOptions;
 import org.hyperledger.besu.plugin.services.SecurityModuleService;
 import org.hyperledger.besu.plugin.services.StorageService;
+import org.hyperledger.besu.plugin.services.TransactionSelectionService;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBPlugin;
+import org.hyperledger.besu.plugin.services.txselection.TransactionSelectorFactory;
 import org.hyperledger.besu.services.BesuConfigurationImpl;
 import org.hyperledger.besu.services.BesuEventsImpl;
 import org.hyperledger.besu.services.BesuPluginContextImpl;
+import org.hyperledger.besu.services.PermissioningServiceImpl;
 import org.hyperledger.besu.services.PicoCLIOptionsImpl;
+import org.hyperledger.besu.services.RpcEndpointServiceImpl;
 import org.hyperledger.besu.services.SecurityModuleServiceImpl;
 import org.hyperledger.besu.services.StorageServiceImpl;
+import org.hyperledger.besu.services.TransactionSelectionServiceImpl;
 
-import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.time.Clock;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
 
+import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.vertx.core.Vertx;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.ThreadContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
 import picocli.CommandLine;
 import picocli.CommandLine.Model.CommandSpec;
 
 public class ThreadBesuNodeRunner implements BesuNodeRunner {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(ThreadBesuNodeRunner.class);
   private final Map<String, Runner> besuRunners = new HashMap<>();
 
   private final Map<Node, BesuPluginContextImpl> besuPluginContextMap = new ConcurrentHashMap<>();
-  private final PrintStream originalOut = System.out;
-  private final PrintStream originalErr = System.err;
-  private final ByteArrayOutputStream consoleContents = new ByteArrayOutputStream();
 
   private BesuPluginContextImpl buildPluginContext(
       final BesuNode node,
@@ -92,14 +95,22 @@ private BesuPluginContextImpl buildPluginContext(
     besuPluginContext.addService(StorageService.class, storageService);
     besuPluginContext.addService(SecurityModuleService.class, securityModuleService);
     besuPluginContext.addService(PicoCLIOptions.class, new PicoCLIOptionsImpl(commandLine));
-
-    final Path pluginsPath = node.homeDirectory().resolve("plugins");
-    final File pluginsDirFile = pluginsPath.toFile();
-    if (!pluginsDirFile.isDirectory()) {
-      pluginsDirFile.mkdirs();
-      pluginsDirFile.deleteOnExit();
+    besuPluginContext.addService(
+        TransactionSelectionService.class, new TransactionSelectionServiceImpl());
+
+    final Path pluginsPath;
+    final String pluginDir = System.getProperty("besu.plugins.dir");
+    if (pluginDir == null || pluginDir.isEmpty()) {
+      pluginsPath = node.homeDirectory().resolve("plugins");
+      final File pluginsDirFile = pluginsPath.toFile();
+      if (!pluginsDirFile.isDirectory()) {
+        pluginsDirFile.mkdirs();
+        pluginsDirFile.deleteOnExit();
+      }
+      System.setProperty("besu.plugins.dir", pluginsPath.toString());
+    } else {
+      pluginsPath = Path.of(pluginDir);
     }
-    System.setProperty("besu.plugins.dir", pluginsPath.toString());
     besuPluginContext.registerPlugins(pluginsPath);
 
     commandLine.parseArgs(node.getConfiguration().getExtraCLIOptions().toArray(new String[0]));
@@ -115,10 +126,10 @@ private BesuPluginContextImpl buildPluginContext(
   @Override
   public void startNode(final BesuNode node) {
 
-    if (ThreadContext.containsKey("node")) {
-      LOG.error("ThreadContext node is already set to {}", ThreadContext.get("node"));
+    if (MDC.get("node") != null) {
+      LOG.error("ThreadContext node is already set to {}", MDC.get("node"));
     }
-    ThreadContext.put("node", node.getName());
+    MDC.put("node", node.getName());
 
     if (!node.getRunCommand().isEmpty()) {
       throw new UnsupportedOperationException("commands are not supported with thread runner");
@@ -136,19 +147,25 @@ public void startNode(final BesuNode node) {
                 buildPluginContext(
                     node, storageService, securityModuleService, commonPluginConfiguration));
 
+    GlobalOpenTelemetry.resetForTest();
     final ObservableMetricsSystem metricsSystem =
         MetricsSystemFactory.create(node.getMetricsConfiguration());
     final List<EnodeURL> bootnodes =
         node.getConfiguration().getBootnodes().stream()
-            .map(EnodeURL::fromURI)
+            .map(EnodeURLImpl::fromURI)
             .collect(Collectors.toList());
+    final NetworkName network = node.getNetwork() == null ? NetworkName.DEV : node.getNetwork();
     final EthNetworkConfig.Builder networkConfigBuilder =
-        new EthNetworkConfig.Builder(EthNetworkConfig.getNetworkConfig(DEV))
+        new EthNetworkConfig.Builder(EthNetworkConfig.getNetworkConfig(network))
             .setBootNodes(bootnodes);
     node.getConfiguration().getGenesisConfig().ifPresent(networkConfigBuilder::setGenesisConfig);
     final EthNetworkConfig ethNetworkConfig = networkConfigBuilder.build();
+    final SynchronizerConfiguration synchronizerConfiguration =
+        new SynchronizerConfiguration.Builder().build();
     final BesuControllerBuilder builder =
-        new BesuController.Builder().fromEthNetworkConfig(ethNetworkConfig);
+        new BesuController.Builder()
+            .fromEthNetworkConfig(
+                ethNetworkConfig, Collections.emptyMap(), synchronizerConfiguration.getSyncMode());
 
     final KeyValueStorageProvider storageProvider =
         new KeyValueStorageProviderBuilder()
@@ -157,29 +174,82 @@ public void startNode(final BesuNode node) {
             .withMetricsSystem(metricsSystem)
             .build();
 
-    final BesuController besuController =
-        builder
-            .synchronizerConfiguration(new SynchronizerConfiguration.Builder().build())
-            .dataDirectory(node.homeDirectory())
-            .miningParameters(node.getMiningParameters())
-            .privacyParameters(node.getPrivacyParameters())
-            .nodeKey(new NodeKey(new KeyPairSecurityModule(KeyPairUtil.loadKeyPair(dataDir))))
-            .metricsSystem(metricsSystem)
-            .transactionPoolConfiguration(TransactionPoolConfiguration.DEFAULT)
-            .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
-            .clock(Clock.systemUTC())
-            .isRevertReasonEnabled(node.isRevertReasonEnabled())
-            .storageProvider(storageProvider)
-            .gasLimitCalculator(GasLimitCalculator.constant())
+    final TransactionPoolConfiguration txPoolConfig =
+        ImmutableTransactionPoolConfiguration.builder()
+            .strictTransactionReplayProtectionEnabled(node.isStrictTxReplayProtectionEnabled())
             .build();
 
-    final RunnerBuilder runnerBuilder = new RunnerBuilder();
-    if (node.getPermissioningConfiguration().isPresent()) {
-      final PermissioningConfiguration permissioningConfiguration =
-          node.getPermissioningConfiguration().get();
+    final int maxPeers = 25;
+
+    final Optional<TransactionSelectorFactory> transactionSelectorFactory =
+        getTransactionSelectorFactory(besuPluginContext);
+
+    builder
+        .synchronizerConfiguration(new SynchronizerConfiguration.Builder().build())
+        .dataDirectory(node.homeDirectory())
+        .miningParameters(node.getMiningParameters())
+        .privacyParameters(node.getPrivacyParameters())
+        .nodeKey(new NodeKey(new KeyPairSecurityModule(KeyPairUtil.loadKeyPair(dataDir))))
+        .metricsSystem(metricsSystem)
+        .transactionPoolConfiguration(txPoolConfig)
+        .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
+        .clock(Clock.systemUTC())
+        .isRevertReasonEnabled(node.isRevertReasonEnabled())
+        .storageProvider(storageProvider)
+        .gasLimitCalculator(GasLimitCalculator.constant())
+        .pkiBlockCreationConfiguration(
+            node.getPkiKeyStoreConfiguration()
+                .map(pkiConfig -> new PkiBlockCreationConfigurationProvider().load(pkiConfig)))
+        .evmConfiguration(EvmConfiguration.DEFAULT)
+        .maxPeers(maxPeers)
+        .lowerBoundPeers(maxPeers)
+        .maxRemotelyInitiatedPeers(15)
+        .networkConfiguration(node.getNetworkingConfiguration())
+        .randomPeerPriority(false)
+        .transactionSelectorFactory(transactionSelectorFactory);
+
+    node.getGenesisConfig()
+        .map(GenesisConfigFile::fromConfig)
+        .ifPresent(builder::genesisConfigFile);
+
+    final BesuController besuController = builder.build();
 
-      runnerBuilder.permissioningConfiguration(permissioningConfiguration);
-    }
+    final RunnerBuilder runnerBuilder = new RunnerBuilder();
+    runnerBuilder.permissioningConfiguration(node.getPermissioningConfiguration());
+
+    runnerBuilder
+        .vertx(Vertx.vertx())
+        .besuController(besuController)
+        .ethNetworkConfig(ethNetworkConfig)
+        .discovery(node.isDiscoveryEnabled())
+        .p2pAdvertisedHost(node.getHostName())
+        .p2pListenPort(0)
+        .networkingConfiguration(node.getNetworkingConfiguration())
+        .jsonRpcConfiguration(node.jsonRpcConfiguration())
+        .webSocketConfiguration(node.webSocketConfiguration())
+        .jsonRpcIpcConfiguration(node.jsonRpcIpcConfiguration())
+        .dataDir(node.homeDirectory())
+        .metricsSystem(metricsSystem)
+        .permissioningService(new PermissioningServiceImpl())
+        .metricsConfiguration(node.getMetricsConfiguration())
+        .p2pEnabled(node.isP2pEnabled())
+        .p2pTLSConfiguration(node.getTLSConfiguration())
+        .graphQLConfiguration(GraphQLConfiguration.createDefault())
+        .staticNodes(
+            node.getStaticNodes().stream()
+                .map(EnodeURLImpl::fromString)
+                .collect(Collectors.toList()))
+        .besuPluginContext(new BesuPluginContextImpl())
+        .autoLogBloomCaching(false)
+        .storageProvider(storageProvider)
+        .rpcEndpointService(new RpcEndpointServiceImpl());
+    node.engineRpcConfiguration().ifPresent(runnerBuilder::engineJsonRpcConfiguration);
+
+    final Runner runner = runnerBuilder.build();
+
+    besuPluginContext.beforeExternalServices();
+
+    runner.startExternalServices();
 
     besuPluginContext.addService(
         BesuEvents.class,
@@ -190,37 +260,10 @@ public void startNode(final BesuNode node) {
             besuController.getSyncState()));
     besuPluginContext.startPlugins();
 
-    final Runner runner =
-        runnerBuilder
-            .vertx(Vertx.vertx())
-            .besuController(besuController)
-            .ethNetworkConfig(ethNetworkConfig)
-            .discovery(node.isDiscoveryEnabled())
-            .p2pAdvertisedHost(node.getHostName())
-            .p2pListenPort(0)
-            .maxPeers(25)
-            .networkingConfiguration(node.getNetworkingConfiguration())
-            .jsonRpcConfiguration(node.jsonRpcConfiguration())
-            .webSocketConfiguration(node.webSocketConfiguration())
-            .dataDir(node.homeDirectory())
-            .metricsSystem(metricsSystem)
-            .metricsConfiguration(node.getMetricsConfiguration())
-            .p2pEnabled(node.isP2pEnabled())
-            .graphQLConfiguration(GraphQLConfiguration.createDefault())
-            .staticNodes(
-                node.getStaticNodes().stream()
-                    .map(EnodeURL::fromString)
-                    .collect(Collectors.toList()))
-            .besuPluginContext(new BesuPluginContextImpl())
-            .autoLogBloomCaching(false)
-            .storageProvider(storageProvider)
-            .build();
-
-    System.setOut(null);
-    runner.start();
+    runner.startEthereumMainLoop();
 
     besuRunners.put(node.getName(), runner);
-    ThreadContext.remove("node");
+    MDC.remove("node");
   }
 
   @Override
@@ -263,44 +306,20 @@ private void killRunner(final String name) {
     }
   }
 
-  static class SplittingStream extends OutputStream {
-    final OutputStream one;
-    final OutputStream two;
-
-    SplittingStream(final OutputStream one, final OutputStream two) {
-      this.one = one;
-      this.two = two;
-    }
-
-    @Override
-    public void write(final int b) throws IOException {
-      one.write(b);
-      two.write(b);
-    }
-
-    @Override
-    public void write(@Nonnull final byte[] b) throws IOException {
-      one.write(b);
-      two.write(b);
-    }
-
-    @Override
-    public void write(@Nonnull final byte[] b, final int off, final int len) throws IOException {
-      one.write(b, off, len);
-      two.write(b, off, len);
-    }
-  }
-
   @Override
   public void startConsoleCapture() {
-    System.setOut(new PrintStream(new SplittingStream(consoleContents, originalOut)));
-    System.setErr(new PrintStream(new SplittingStream(consoleContents, originalErr)));
+    throw new RuntimeException("Console contents can only be captured in process execution");
   }
 
   @Override
   public String getConsoleContents() {
-    System.setOut(originalOut);
-    System.setErr(originalErr);
-    return consoleContents.toString(StandardCharsets.UTF_8);
+    throw new RuntimeException("Console contents can only be captured in process execution");
+  }
+
+  private Optional<TransactionSelectorFactory> getTransactionSelectorFactory(
+      final BesuPluginContextImpl besuPluginContext) {
+    final Optional<TransactionSelectionService> txSelectionService =
+        besuPluginContext.getService(TransactionSelectionService.class);
+    return txSelectionService.isPresent() ? txSelectionService.get().get() : Optional.empty();
   }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/Cluster.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/Cluster.java
index ced470aaff4..16a02874262 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/Cluster.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/cluster/Cluster.java
@@ -33,11 +33,11 @@
 import java.util.Map;
 import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Cluster implements AutoCloseable {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(Cluster.class);
 
   private final Map<String, RunnableNode> nodes = new HashMap<>();
   private final BesuNodeRunner besuNodeRunner;
@@ -85,8 +85,7 @@ public void start(final List<? extends RunnableNode> nodes) {
 
     final Optional<? extends RunnableNode> bootnode = selectAndStartBootnode(nodes);
 
-    nodes
-        .parallelStream()
+    nodes.parallelStream()
         .filter(
             node -> {
               LOG.info("starting non-bootnode {}", node.getName());
@@ -153,21 +152,27 @@ public void runNodeStart(final RunnableNode node) {
   private void startNode(final RunnableNode node, final boolean isBootNode) {
     node.getConfiguration().setBootnodes(isBootNode ? emptyList() : bootnodes);
 
-    node.getConfiguration()
-        .getGenesisConfigProvider()
-        .create(originalNodes)
-        .ifPresent(node.getConfiguration()::setGenesisConfig);
+    if (node.getConfiguration().getGenesisConfig().isEmpty()) {
+      node.getConfiguration()
+          .getGenesisConfigProvider()
+          .create(originalNodes)
+          .ifPresent(node.getConfiguration()::setGenesisConfig);
+    }
     runNodeStart(node);
   }
 
   public void stop() {
     // stops nodes but do not shutdown besuNodeRunner
     for (final RunnableNode node : nodes.values()) {
-      if (node instanceof BesuNode) {
-        besuNodeRunner.stopNode((BesuNode) node); // besuNodeRunner.stopNode also calls node.stop
-      } else {
-        node.stop();
-      }
+      stopNode(node);
+    }
+  }
+
+  public void stopNode(final RunnableNode node) {
+    if (node instanceof BesuNode) {
+      besuNodeRunner.stopNode((BesuNode) node); // besuNodeRunner.stopNode also calls node.stop
+    } else {
+      node.stop();
     }
   }
 
@@ -185,6 +190,9 @@ public void close() {
   }
 
   public void verify(final Condition expected) {
+    if (nodes.size() == 0) {
+      throw new IllegalStateException("Attempt to verify an empty cluster");
+    }
     for (final Node node : nodes.values()) {
       expected.verify(node);
     }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfiguration.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfiguration.java
index 10646daddce..91d9e24e488 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfiguration.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfiguration.java
@@ -14,17 +14,23 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl.node.configuration;
 
+import org.hyperledger.besu.cli.config.NetworkName;
+import org.hyperledger.besu.crypto.KeyPair;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
+import org.hyperledger.besu.ethereum.api.jsonrpc.ipc.JsonRpcIpcConfiguration;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
+import org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty.TLSConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
+import org.hyperledger.besu.pki.config.PkiKeyStoreConfiguration;
 import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationProvider;
 
 import java.nio.file.Path;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 public class BesuNodeConfiguration {
@@ -33,13 +39,17 @@ public class BesuNodeConfiguration {
   private final Optional<Path> dataPath;
   private final MiningParameters miningParameters;
   private final JsonRpcConfiguration jsonRpcConfiguration;
+  private final Optional<JsonRpcConfiguration> engineRpcConfiguration;
   private final WebSocketConfiguration webSocketConfiguration;
+  private final JsonRpcIpcConfiguration jsonRpcIpcConfiguration;
   private final MetricsConfiguration metricsConfiguration;
   private final Optional<PermissioningConfiguration> permissioningConfiguration;
   private final Optional<String> keyFilePath;
   private final boolean devMode;
   private final GenesisConfigurationProvider genesisConfigProvider;
   private final boolean p2pEnabled;
+  private final int p2pPort;
+  private final Optional<TLSConfiguration> tlsConfiguration;
   private final NetworkingConfiguration networkingConfiguration;
   private final boolean discoveryEnabled;
   private final boolean bootnodeEligible;
@@ -52,19 +62,29 @@ public class BesuNodeConfiguration {
   private final boolean isDnsEnabled;
   private final Optional<PrivacyParameters> privacyParameters;
   private final List<String> runCommand;
+  private final NetworkName network;
+  private final Optional<KeyPair> keyPair;
+  private final Optional<PkiKeyStoreConfiguration> pkiKeyStoreConfiguration;
+  private final boolean strictTxReplayProtectionEnabled;
+  private final Map<String, String> environment;
 
   BesuNodeConfiguration(
       final String name,
       final Optional<Path> dataPath,
       final MiningParameters miningParameters,
       final JsonRpcConfiguration jsonRpcConfiguration,
+      final Optional<JsonRpcConfiguration> engineRpcConfiguration,
       final WebSocketConfiguration webSocketConfiguration,
+      final JsonRpcIpcConfiguration jsonRpcIpcConfiguration,
       final MetricsConfiguration metricsConfiguration,
       final Optional<PermissioningConfiguration> permissioningConfiguration,
       final Optional<String> keyFilePath,
       final boolean devMode,
+      final NetworkName network,
       final GenesisConfigurationProvider genesisConfigProvider,
       final boolean p2pEnabled,
+      final int p2pPort,
+      final Optional<TLSConfiguration> tlsConfiguration,
       final NetworkingConfiguration networkingConfiguration,
       final boolean discoveryEnabled,
       final boolean bootnodeEligible,
@@ -76,18 +96,27 @@ public class BesuNodeConfiguration {
       final List<String> staticNodes,
       final boolean isDnsEnabled,
       final Optional<PrivacyParameters> privacyParameters,
-      final List<String> runCommand) {
+      final List<String> runCommand,
+      final Optional<KeyPair> keyPair,
+      final Optional<PkiKeyStoreConfiguration> pkiKeyStoreConfiguration,
+      final boolean strictTxReplayProtectionEnabled,
+      final Map<String, String> environment) {
     this.name = name;
     this.miningParameters = miningParameters;
     this.jsonRpcConfiguration = jsonRpcConfiguration;
+    this.engineRpcConfiguration = engineRpcConfiguration;
     this.webSocketConfiguration = webSocketConfiguration;
+    this.jsonRpcIpcConfiguration = jsonRpcIpcConfiguration;
     this.metricsConfiguration = metricsConfiguration;
     this.permissioningConfiguration = permissioningConfiguration;
     this.keyFilePath = keyFilePath;
     this.dataPath = dataPath;
     this.devMode = devMode;
+    this.network = network;
     this.genesisConfigProvider = genesisConfigProvider;
     this.p2pEnabled = p2pEnabled;
+    this.p2pPort = p2pPort;
+    this.tlsConfiguration = tlsConfiguration;
     this.networkingConfiguration = networkingConfiguration;
     this.discoveryEnabled = discoveryEnabled;
     this.bootnodeEligible = bootnodeEligible;
@@ -100,6 +129,10 @@ public class BesuNodeConfiguration {
     this.isDnsEnabled = isDnsEnabled;
     this.privacyParameters = privacyParameters;
     this.runCommand = runCommand;
+    this.keyPair = keyPair;
+    this.pkiKeyStoreConfiguration = pkiKeyStoreConfiguration;
+    this.strictTxReplayProtectionEnabled = strictTxReplayProtectionEnabled;
+    this.environment = environment;
   }
 
   public String getName() {
@@ -114,10 +147,18 @@ public JsonRpcConfiguration getJsonRpcConfiguration() {
     return jsonRpcConfiguration;
   }
 
+  public Optional<JsonRpcConfiguration> getEngineRpcConfiguration() {
+    return engineRpcConfiguration;
+  }
+
   public WebSocketConfiguration getWebSocketConfiguration() {
     return webSocketConfiguration;
   }
 
+  public JsonRpcIpcConfiguration getJsonRpcIpcConfiguration() {
+    return jsonRpcIpcConfiguration;
+  }
+
   public MetricsConfiguration getMetricsConfiguration() {
     return metricsConfiguration;
   }
@@ -150,6 +191,14 @@ public boolean isP2pEnabled() {
     return p2pEnabled;
   }
 
+  public int getP2pPort() {
+    return p2pPort;
+  }
+
+  public Optional<TLSConfiguration> getTLSConfiguration() {
+    return tlsConfiguration;
+  }
+
   public NetworkingConfiguration getNetworkingConfiguration() {
     return networkingConfiguration;
   }
@@ -193,4 +242,24 @@ public Optional<PrivacyParameters> getPrivacyParameters() {
   public List<String> getRunCommand() {
     return runCommand;
   }
+
+  public NetworkName getNetwork() {
+    return network;
+  }
+
+  public Optional<KeyPair> getKeyPair() {
+    return keyPair;
+  }
+
+  public Optional<PkiKeyStoreConfiguration> getPkiKeyStoreConfiguration() {
+    return pkiKeyStoreConfiguration;
+  }
+
+  public boolean isStrictTxReplayProtectionEnabled() {
+    return strictTxReplayProtectionEnabled;
+  }
+
+  public Map<String, String> getEnvironment() {
+    return environment;
+  }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java
index 7dd0840e3b2..4943aaf60eb 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java
@@ -16,17 +16,29 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static java.util.Collections.singletonList;
+import static org.hyperledger.besu.pki.keystore.KeyStoreWrapper.KEYSTORE_TYPE_JKS;
+import static org.hyperledger.besu.pki.keystore.KeyStoreWrapper.KEYSTORE_TYPE_PKCS11;
+import static org.hyperledger.besu.pki.keystore.KeyStoreWrapper.KEYSTORE_TYPE_PKCS12;
 
+import org.hyperledger.besu.cli.config.NetworkName;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
+import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.JwtAlgorithm;
+import org.hyperledger.besu.ethereum.api.jsonrpc.ipc.JsonRpcIpcConfiguration;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
+import org.hyperledger.besu.ethereum.api.tls.FileBasedPasswordProvider;
+import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
-import org.hyperledger.besu.ethereum.core.MiningParametersTestBuilder;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
+import org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty.TLSConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
+import org.hyperledger.besu.pki.config.PkiKeyStoreConfiguration;
 import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationProvider;
+import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.pki.PKCS11Utils;
 
 import java.io.File;
 import java.net.URISyntaxException;
@@ -34,7 +46,9 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 public class BesuNodeConfigurationBuilder {
@@ -42,27 +56,40 @@ public class BesuNodeConfigurationBuilder {
   private String name;
   private Optional<Path> dataPath = Optional.empty();
   private MiningParameters miningParameters =
-      new MiningParametersTestBuilder().enabled(false).build();
+      new MiningParameters.Builder()
+          .miningEnabled(false)
+          .coinbase(AddressHelpers.ofValue(1))
+          .minTransactionGasPrice(Wei.of(1000))
+          .build();
   private JsonRpcConfiguration jsonRpcConfiguration = JsonRpcConfiguration.createDefault();
+  private JsonRpcConfiguration engineRpcConfiguration = JsonRpcConfiguration.createEngineDefault();
   private WebSocketConfiguration webSocketConfiguration = WebSocketConfiguration.createDefault();
+  private JsonRpcIpcConfiguration jsonRpcIpcConfiguration = new JsonRpcIpcConfiguration();
   private MetricsConfiguration metricsConfiguration = MetricsConfiguration.builder().build();
   private Optional<PermissioningConfiguration> permissioningConfiguration = Optional.empty();
   private String keyFilePath = null;
   private boolean devMode = true;
   private GenesisConfigurationProvider genesisConfigProvider = ignore -> Optional.empty();
   private Boolean p2pEnabled = true;
+  private int p2pPort = 0;
+  private Optional<TLSConfiguration> tlsConfiguration = Optional.empty();
   private final NetworkingConfiguration networkingConfiguration = NetworkingConfiguration.create();
   private boolean discoveryEnabled = true;
   private boolean bootnodeEligible = true;
   private boolean revertReasonEnabled = false;
-  private boolean secp256K1Native = false;
-  private boolean altbn128Native = false;
+  private NetworkName network = null;
+  private boolean secp256K1Native = true;
+  private boolean altbn128Native = true;
   private final List<String> plugins = new ArrayList<>();
   private final List<String> extraCLIOptions = new ArrayList<>();
   private List<String> staticNodes = new ArrayList<>();
   private boolean isDnsEnabled = false;
   private Optional<PrivacyParameters> privacyParameters = Optional.empty();
   private List<String> runCommand = new ArrayList<>();
+  private Optional<KeyPair> keyPair = Optional.empty();
+  private Optional<PkiKeyStoreConfiguration> pkiKeyStoreConfiguration = Optional.empty();
+  private Boolean strictTxReplayProtectionEnabled = false;
+  private Map<String, String> environment = new HashMap<>();
 
   public BesuNodeConfigurationBuilder() {
     // Check connections more frequently during acceptance tests to cut down on
@@ -82,14 +109,23 @@ public BesuNodeConfigurationBuilder dataPath(final Path dataPath) {
   }
 
   public BesuNodeConfigurationBuilder miningEnabled() {
-    this.miningParameters = new MiningParametersTestBuilder().enabled(true).build();
-    this.jsonRpcConfiguration.addRpcApi(RpcApis.MINER);
+    return miningEnabled(true);
+  }
+
+  public BesuNodeConfigurationBuilder miningEnabled(final boolean enabled) {
+    this.miningParameters =
+        new MiningParameters.Builder()
+            .miningEnabled(enabled)
+            .minTransactionGasPrice(Wei.of(1000))
+            .coinbase(AddressHelpers.ofValue(1))
+            .build();
+    this.jsonRpcConfiguration.addRpcApi(RpcApis.MINER.name());
     return this;
   }
 
   public BesuNodeConfigurationBuilder miningConfiguration(final MiningParameters miningParameters) {
     this.miningParameters = miningParameters;
-    this.jsonRpcConfiguration.addRpcApi(RpcApis.MINER);
+    this.jsonRpcConfiguration.addRpcApi(RpcApis.MINER.name());
     return this;
   }
 
@@ -99,6 +135,12 @@ public BesuNodeConfigurationBuilder jsonRpcConfiguration(
     return this;
   }
 
+  public BesuNodeConfigurationBuilder engineJsonRpcConfiguration(
+      final JsonRpcConfiguration engineConfig) {
+    this.engineRpcConfiguration = engineConfig;
+    return this;
+  }
+
   public BesuNodeConfigurationBuilder jsonRpcEnabled() {
     this.jsonRpcConfiguration.setEnabled(true);
     this.jsonRpcConfiguration.setPort(0);
@@ -107,6 +149,15 @@ public BesuNodeConfigurationBuilder jsonRpcEnabled() {
     return this;
   }
 
+  public BesuNodeConfigurationBuilder engineRpcEnabled(final boolean enabled) {
+    this.engineRpcConfiguration.setEnabled(enabled);
+    this.engineRpcConfiguration.setPort(0);
+    this.engineRpcConfiguration.setHostsAllowlist(singletonList("*"));
+    this.engineRpcConfiguration.setAuthenticationEnabled(false);
+
+    return this;
+  }
+
   public BesuNodeConfigurationBuilder metricsEnabled() {
     this.metricsConfiguration =
         MetricsConfiguration.builder()
@@ -119,13 +170,23 @@ public BesuNodeConfigurationBuilder metricsEnabled() {
   }
 
   public BesuNodeConfigurationBuilder enablePrivateTransactions() {
-    this.jsonRpcConfiguration.addRpcApi(RpcApis.EEA);
-    this.jsonRpcConfiguration.addRpcApi(RpcApis.PRIV);
+    this.jsonRpcConfiguration.addRpcApi(RpcApis.EEA.name());
+    this.jsonRpcConfiguration.addRpcApi(RpcApis.PRIV.name());
     return this;
   }
 
   public BesuNodeConfigurationBuilder jsonRpcTxPool() {
-    this.jsonRpcConfiguration.addRpcApi(RpcApis.TX_POOL);
+    this.jsonRpcConfiguration.addRpcApi(RpcApis.TXPOOL.name());
+    return this;
+  }
+
+  public BesuNodeConfigurationBuilder jsonRpcAdmin() {
+    this.jsonRpcConfiguration.addRpcApi(RpcApis.ADMIN.name());
+    return this;
+  }
+
+  public BesuNodeConfigurationBuilder jsonRpcDebug() {
+    this.jsonRpcConfiguration.addRpcApi(RpcApis.DEBUG.name());
     return this;
   }
 
@@ -140,10 +201,21 @@ public BesuNodeConfigurationBuilder jsonRpcAuthenticationConfiguration(final Str
     return this;
   }
 
-  public BesuNodeConfigurationBuilder jsonRpcAuthenticationUsingPublicKeyEnabled()
-      throws URISyntaxException {
+  public BesuNodeConfigurationBuilder jsonRpcAuthenticationConfiguration(
+      final String authFile, final List<String> noAuthApiMethods) throws URISyntaxException {
+    final String authTomlPath =
+        Paths.get(ClassLoader.getSystemResource(authFile).toURI()).toAbsolutePath().toString();
+
+    this.jsonRpcConfiguration.setAuthenticationEnabled(true);
+    this.jsonRpcConfiguration.setAuthenticationCredentialsFile(authTomlPath);
+    this.jsonRpcConfiguration.setNoAuthRpcApis(noAuthApiMethods);
+
+    return this;
+  }
+
+  public BesuNodeConfigurationBuilder jsonRpcAuthenticationUsingRSA() throws URISyntaxException {
     final File jwtPublicKey =
-        Paths.get(ClassLoader.getSystemResource("authentication/jwt_public_key").toURI())
+        Paths.get(ClassLoader.getSystemResource("authentication/jwt_public_key_rsa").toURI())
             .toAbsolutePath()
             .toFile();
 
@@ -153,18 +225,42 @@ public BesuNodeConfigurationBuilder jsonRpcAuthenticationUsingPublicKeyEnabled()
     return this;
   }
 
+  public BesuNodeConfigurationBuilder jsonRpcAuthenticationUsingECDSA() throws URISyntaxException {
+    final File jwtPublicKey =
+        Paths.get(ClassLoader.getSystemResource("authentication/jwt_public_key_ecdsa").toURI())
+            .toAbsolutePath()
+            .toFile();
+
+    this.jsonRpcConfiguration.setAuthenticationEnabled(true);
+    this.jsonRpcConfiguration.setAuthenticationPublicKeyFile(jwtPublicKey);
+    this.jsonRpcConfiguration.setAuthenticationAlgorithm(JwtAlgorithm.ES256);
+
+    return this;
+  }
+
   public BesuNodeConfigurationBuilder webSocketConfiguration(
       final WebSocketConfiguration webSocketConfiguration) {
     this.webSocketConfiguration = webSocketConfiguration;
     return this;
   }
 
+  public BesuNodeConfigurationBuilder jsonRpcIpcConfiguration(
+      final JsonRpcIpcConfiguration jsonRpcIpcConfiguration) {
+    this.jsonRpcIpcConfiguration = jsonRpcIpcConfiguration;
+    return this;
+  }
+
   public BesuNodeConfigurationBuilder metricsConfiguration(
       final MetricsConfiguration metricsConfiguration) {
     this.metricsConfiguration = metricsConfiguration;
     return this;
   }
 
+  public BesuNodeConfigurationBuilder network(final NetworkName network) {
+    this.network = network;
+    return this;
+  }
+
   public BesuNodeConfigurationBuilder webSocketEnabled() {
     final WebSocketConfiguration config = WebSocketConfiguration.createDefault();
     config.setEnabled(true);
@@ -192,15 +288,43 @@ public BesuNodeConfigurationBuilder webSocketAuthenticationEnabled() throws URIS
     return this;
   }
 
-  public BesuNodeConfigurationBuilder webSocketAuthenticationUsingPublicKeyEnabled()
+  public BesuNodeConfigurationBuilder webSocketAuthenticationEnabledWithNoAuthMethods(
+      final List<String> noAuthApiMethods) throws URISyntaxException {
+    final String authTomlPath =
+        Paths.get(ClassLoader.getSystemResource("authentication/auth.toml").toURI())
+            .toAbsolutePath()
+            .toString();
+
+    this.webSocketConfiguration.setAuthenticationEnabled(true);
+    this.webSocketConfiguration.setAuthenticationCredentialsFile(authTomlPath);
+    this.webSocketConfiguration.setRpcApisNoAuth(noAuthApiMethods);
+
+    return this;
+  }
+
+  public BesuNodeConfigurationBuilder webSocketAuthenticationUsingRsaPublicKeyEnabled()
+      throws URISyntaxException {
+    final File jwtPublicKey =
+        Paths.get(ClassLoader.getSystemResource("authentication/jwt_public_key_rsa").toURI())
+            .toAbsolutePath()
+            .toFile();
+
+    this.webSocketConfiguration.setAuthenticationEnabled(true);
+    this.webSocketConfiguration.setAuthenticationPublicKeyFile(jwtPublicKey);
+
+    return this;
+  }
+
+  public BesuNodeConfigurationBuilder webSocketAuthenticationUsingEcdsaPublicKeyEnabled()
       throws URISyntaxException {
     final File jwtPublicKey =
-        Paths.get(ClassLoader.getSystemResource("authentication/jwt_public_key").toURI())
+        Paths.get(ClassLoader.getSystemResource("authentication/jwt_public_key_ecdsa").toURI())
             .toAbsolutePath()
             .toFile();
 
     this.webSocketConfiguration.setAuthenticationEnabled(true);
     this.webSocketConfiguration.setAuthenticationPublicKeyFile(jwtPublicKey);
+    this.webSocketConfiguration.setAuthenticationAlgorithm(JwtAlgorithm.ES256);
 
     return this;
   }
@@ -232,6 +356,76 @@ public BesuNodeConfigurationBuilder p2pEnabled(final Boolean p2pEnabled) {
     return this;
   }
 
+  public BesuNodeConfigurationBuilder p2pPort(final int p2pPort) {
+    this.p2pPort = p2pPort;
+    return this;
+  }
+
+  private static Path toPath(final String path) throws Exception {
+    return Path.of(BesuNodeConfigurationBuilder.class.getResource(path).toURI());
+  }
+
+  public BesuNodeConfigurationBuilder p2pTLSEnabled(final String name, final String type) {
+    final TLSConfiguration.Builder builder = TLSConfiguration.Builder.tlsConfiguration();
+    try {
+      final String nsspin = "/pki-certs/%s/nsspin.txt";
+      final String truststore = "/pki-certs/%s/truststore.p12";
+      final String crl = "/pki-certs/crl/crl.pem";
+      switch (type) {
+        case KEYSTORE_TYPE_JKS:
+          builder
+              .withKeyStoreType(type)
+              .withKeyStorePath(toPath(String.format("/pki-certs/%s/%<s.jks", name)))
+              .withKeyStorePasswordSupplier(
+                  new FileBasedPasswordProvider(toPath(String.format(nsspin, name))))
+              .withKeyStorePasswordPath(toPath(String.format(nsspin, name)))
+              .withTrustStoreType(KEYSTORE_TYPE_PKCS12)
+              .withTrustStorePath(toPath(String.format(truststore, name)))
+              .withTrustStorePasswordSupplier(
+                  new FileBasedPasswordProvider(toPath(String.format(nsspin, name))))
+              .withTrustStorePasswordPath(toPath(String.format(nsspin, name)))
+              .withCrlPath(toPath(crl));
+          break;
+        case KEYSTORE_TYPE_PKCS12:
+          builder
+              .withKeyStoreType(type)
+              .withKeyStorePath(toPath(String.format("/pki-certs/%s/%<s.p12", name)))
+              .withKeyStorePasswordSupplier(
+                  new FileBasedPasswordProvider(toPath(String.format(nsspin, name))))
+              .withKeyStorePasswordPath(toPath(String.format(nsspin, name)))
+              .withTrustStoreType(KEYSTORE_TYPE_PKCS12)
+              .withTrustStorePath(toPath(String.format(truststore, name)))
+              .withTrustStorePasswordSupplier(
+                  new FileBasedPasswordProvider(toPath(String.format(nsspin, name))))
+              .withTrustStorePasswordPath(toPath(String.format(nsspin, name)))
+              .withCrlPath(toPath(crl));
+          break;
+        case KEYSTORE_TYPE_PKCS11:
+          builder
+              .withKeyStoreType(type)
+              .withKeyStorePath(
+                  PKCS11Utils.initNSSConfigFile(
+                      toPath(String.format("/pki-certs/%s/nss.cfg", name))))
+              .withKeyStorePasswordSupplier(
+                  new FileBasedPasswordProvider(toPath(String.format(nsspin, name))))
+              .withKeyStorePasswordPath(toPath(String.format(nsspin, name)))
+              .withCrlPath(toPath(crl));
+          break;
+      }
+    } catch (final Exception e) {
+      throw new RuntimeException(e);
+    }
+    this.tlsConfiguration = Optional.of(builder.build());
+    return this;
+  }
+
+  public BesuNodeConfigurationBuilder pkiBlockCreationEnabled(
+      final PkiKeyStoreConfiguration pkiKeyStoreConfiguration) {
+    this.pkiKeyStoreConfiguration = Optional.of(pkiKeyStoreConfiguration);
+
+    return this;
+  }
+
   public BesuNodeConfigurationBuilder discoveryEnabled(final boolean discoveryEnabled) {
     this.discoveryEnabled = discoveryEnabled;
     return this;
@@ -254,12 +448,12 @@ public BesuNodeConfigurationBuilder revertReasonEnabled() {
     return this;
   }
 
-  public BesuNodeConfigurationBuilder secp256k1Native() {
+  public BesuNodeConfigurationBuilder secp256k1Java() {
     this.secp256K1Native = true;
     return this;
   }
 
-  public BesuNodeConfigurationBuilder altbn128() {
+  public BesuNodeConfigurationBuilder altbn128Java() {
     this.altbn128Native = true;
     return this;
   }
@@ -279,24 +473,45 @@ public BesuNodeConfigurationBuilder privacyParameters(final PrivacyParameters pr
     return this;
   }
 
+  public BesuNodeConfigurationBuilder keyPair(final KeyPair keyPair) {
+    this.keyPair = Optional.of(keyPair);
+    return this;
+  }
+
   public BesuNodeConfigurationBuilder run(final String... commands) {
     this.runCommand = List.of(commands);
     return this;
   }
 
+  public BesuNodeConfigurationBuilder strictTxReplayProtectionEnabled(
+      final Boolean strictTxReplayProtectionEnabled) {
+    this.strictTxReplayProtectionEnabled = strictTxReplayProtectionEnabled;
+    return this;
+  }
+
+  public BesuNodeConfigurationBuilder environment(final Map<String, String> environment) {
+    this.environment = environment;
+    return this;
+  }
+
   public BesuNodeConfiguration build() {
     return new BesuNodeConfiguration(
         name,
         dataPath,
         miningParameters,
         jsonRpcConfiguration,
+        Optional.of(engineRpcConfiguration),
         webSocketConfiguration,
+        jsonRpcIpcConfiguration,
         metricsConfiguration,
         permissioningConfiguration,
         Optional.ofNullable(keyFilePath),
         devMode,
+        network,
         genesisConfigProvider,
         p2pEnabled,
+        p2pPort,
+        tlsConfiguration,
         networkingConfiguration,
         discoveryEnabled,
         bootnodeEligible,
@@ -308,6 +523,10 @@ public BesuNodeConfiguration build() {
         staticNodes,
         isDnsEnabled,
         privacyParameters,
-        runCommand);
+        runCommand,
+        keyPair,
+        pkiKeyStoreConfiguration,
+        strictTxReplayProtectionEnabled,
+        environment);
   }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java
index 710bad5ce7c..fb6ac5f1014 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java
@@ -1,13 +1,16 @@
 /*
  * Copyright ConsenSys AG.
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with
  * the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ *  the License for the
  * specific language governing permissions and limitations under the License.
  *
  * SPDX-License-Identifier: Apache-2.0
@@ -17,37 +20,41 @@
 import static java.util.Arrays.asList;
 import static java.util.stream.Collectors.toList;
 
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.enclave.EnclaveFactory;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
+import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.core.InMemoryPrivacyStorageProvider;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
-import org.hyperledger.besu.ethereum.core.MiningParametersTestBuilder;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.permissioning.LocalPermissioningConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
+import org.hyperledger.besu.pki.keystore.KeyStoreWrapper;
 import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
 import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode;
 import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationFactory;
+import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.pki.PkiKeystoreConfigurationFactory;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import java.util.function.Function;
+import java.util.function.UnaryOperator;
 
 import io.vertx.core.Vertx;
 
 public class BesuNodeFactory {
 
-  private final GenesisConfigurationFactory genesis = new GenesisConfigurationFactory();
   private final NodeConfigurationFactory node = new NodeConfigurationFactory();
+  private final PkiKeystoreConfigurationFactory pkiKeystoreConfigurationFactory =
+      new PkiKeystoreConfigurationFactory();
 
   public BesuNode create(final BesuNodeConfiguration config) throws IOException {
     return new BesuNode(
@@ -55,13 +62,18 @@ public BesuNode create(final BesuNodeConfiguration config) throws IOException {
         config.getDataPath(),
         config.getMiningParameters(),
         config.getJsonRpcConfiguration(),
+        config.getEngineRpcConfiguration(),
         config.getWebSocketConfiguration(),
+        config.getJsonRpcIpcConfiguration(),
         config.getMetricsConfiguration(),
         config.getPermissioningConfiguration(),
         config.getKeyFilePath(),
         config.isDevMode(),
+        config.getNetwork(),
         config.getGenesisConfigProvider(),
         config.isP2pEnabled(),
+        config.getP2pPort(),
+        config.getTLSConfiguration(),
         config.getNetworkingConfiguration(),
         config.isDiscoveryEnabled(),
         config.isBootnodeEligible(),
@@ -73,43 +85,80 @@ public BesuNode create(final BesuNodeConfiguration config) throws IOException {
         config.getStaticNodes(),
         config.isDnsEnabled(),
         config.getPrivacyParameters(),
-        config.getRunCommand());
+        config.getRunCommand(),
+        config.getKeyPair(),
+        config.getPkiKeyStoreConfiguration(),
+        config.isStrictTxReplayProtectionEnabled(),
+        config.getEnvironment());
   }
 
-  public BesuNode createMinerNode(final String name) throws IOException {
-    return create(
+  public BesuNode createMinerNode(
+      final String name, final UnaryOperator<BesuNodeConfigurationBuilder> configModifier)
+      throws IOException {
+    BesuNodeConfigurationBuilder builder =
         new BesuNodeConfigurationBuilder()
             .name(name)
             .miningEnabled()
             .jsonRpcEnabled()
-            .webSocketEnabled()
-            .build());
+            .webSocketEnabled();
+    builder = configModifier.apply(builder);
+    final BesuNodeConfiguration config = builder.build();
+
+    return create(config);
   }
 
-  public BesuNode createMinerNodeWithRevertReasonEnabled(final String name) throws IOException {
-    return create(
+  public BesuNode createMinerNodeWithExtraCliOptions(
+      final String name,
+      final UnaryOperator<BesuNodeConfigurationBuilder> configModifier,
+      final List<String> extraCliOptions)
+      throws IOException {
+    BesuNodeConfigurationBuilder builder =
         new BesuNodeConfigurationBuilder()
             .name(name)
             .miningEnabled()
             .jsonRpcEnabled()
             .webSocketEnabled()
-            .revertReasonEnabled()
-            .build());
+            .extraCLIOptions(extraCliOptions);
+    builder = configModifier.apply(builder);
+    final BesuNodeConfiguration config = builder.build();
+
+    return create(config);
+  }
+
+  public BesuNode createMinerNode(final String name) throws IOException {
+    return createMinerNode(name, UnaryOperator.identity());
+  }
+
+  public BesuNode createMinerNodeWithExtraCliOptions(
+      final String name, final List<String> extraCliOptions) throws IOException {
+    return createMinerNodeWithExtraCliOptions(name, UnaryOperator.identity(), extraCliOptions);
+  }
+
+  public BesuNode createMinerNodeWithRevertReasonEnabled(final String name) throws IOException {
+    return createMinerNode(name, BesuNodeConfigurationBuilder::revertReasonEnabled);
   }
 
   public BesuNode createArchiveNode(final String name) throws IOException {
-    return create(
+    return createArchiveNode(name, UnaryOperator.identity());
+  }
+
+  public BesuNode createArchiveNode(
+      final String name, final UnaryOperator<BesuNodeConfigurationBuilder> configModifier)
+      throws IOException {
+    BesuNodeConfigurationBuilder builder =
         new BesuNodeConfigurationBuilder()
             .name(name)
             .jsonRpcEnabled()
             .jsonRpcTxPool()
-            .webSocketEnabled()
-            .build());
+            .webSocketEnabled();
+
+    builder = configModifier.apply(builder);
+
+    return create(builder.build());
   }
 
   public BesuNode createNode(
-      final String name,
-      final Function<BesuNodeConfigurationBuilder, BesuNodeConfigurationBuilder> configModifier)
+      final String name, final UnaryOperator<BesuNodeConfigurationBuilder> configModifier)
       throws IOException {
     final BesuNodeConfigurationBuilder configBuilder =
         configModifier.apply(new BesuNodeConfigurationBuilder().name(name));
@@ -173,15 +222,53 @@ public BesuNode createNodeWithAuthentication(final String name, final String aut
             .build());
   }
 
-  public BesuNode createNodeWithAuthenticationUsingJwtPublicKey(final String name)
+  public BesuNode createNodeWithAuthFileAndNoAuthApi(
+      final String name, final String authFile, final List<String> noAuthApiMethods)
+      throws URISyntaxException, IOException {
+    return create(
+        new BesuNodeConfigurationBuilder()
+            .name(name)
+            .jsonRpcEnabled()
+            .jsonRpcAuthenticationConfiguration(authFile, noAuthApiMethods)
+            .webSocketEnabled()
+            .webSocketAuthenticationEnabled()
+            .build());
+  }
+
+  public BesuNode createWsNodeWithAuthFileAndNoAuthApi(
+      final String name, final String authFile, final List<String> noAuthApiMethods)
+      throws URISyntaxException, IOException {
+    return create(
+        new BesuNodeConfigurationBuilder()
+            .name(name)
+            .jsonRpcEnabled()
+            .jsonRpcAuthenticationConfiguration(authFile)
+            .webSocketEnabled()
+            .webSocketAuthenticationEnabledWithNoAuthMethods(noAuthApiMethods)
+            .build());
+  }
+
+  public BesuNode createNodeWithAuthenticationUsingRsaJwtPublicKey(final String name)
+      throws IOException, URISyntaxException {
+    return create(
+        new BesuNodeConfigurationBuilder()
+            .name(name)
+            .jsonRpcEnabled()
+            .jsonRpcAuthenticationUsingRSA()
+            .webSocketEnabled()
+            .webSocketAuthenticationUsingRsaPublicKeyEnabled()
+            .build());
+  }
+
+  public BesuNode createNodeWithAuthenticationUsingEcdsaJwtPublicKey(final String name)
       throws IOException, URISyntaxException {
     return create(
         new BesuNodeConfigurationBuilder()
             .name(name)
             .jsonRpcEnabled()
-            .jsonRpcAuthenticationUsingPublicKeyEnabled()
+            .jsonRpcAuthenticationUsingECDSA()
             .webSocketEnabled()
-            .webSocketAuthenticationUsingPublicKeyEnabled()
+            .webSocketAuthenticationUsingEcdsaPublicKeyEnabled()
             .build());
   }
 
@@ -199,14 +286,14 @@ public BesuNode createNodeWithMultiTenantedPrivacy(
       final String enclaveUrl,
       final String authFile,
       final String privTransactionSigningKey,
-      final boolean enableOnChainPrivacy)
+      final boolean enableFlexiblePrivacy)
       throws IOException, URISyntaxException {
     final PrivacyParameters.Builder privacyParametersBuilder = new PrivacyParameters.Builder();
     final PrivacyParameters privacyParameters =
         privacyParametersBuilder
             .setMultiTenancyEnabled(true)
             .setEnabled(true)
-            .setOnchainPrivacyGroupsEnabled(enableOnChainPrivacy)
+            .setFlexiblePrivacyGroupsEnabled(enableFlexiblePrivacy)
             .setStorageProvider(new InMemoryPrivacyStorageProvider())
             .setEnclaveFactory(new EnclaveFactory(Vertx.vertx()))
             .setEnclaveUrl(URI.create(enclaveUrl))
@@ -215,7 +302,11 @@ public BesuNode createNodeWithMultiTenantedPrivacy(
             .build();
 
     final MiningParameters miningParameters =
-        new MiningParametersTestBuilder().minTransactionGasPrice(Wei.ZERO).enabled(true).build();
+        new MiningParameters.Builder()
+            .minTransactionGasPrice(Wei.ZERO)
+            .coinbase(AddressHelpers.ofValue(1))
+            .miningEnabled(true)
+            .build();
 
     return create(
         new BesuNodeConfigurationBuilder()
@@ -238,12 +329,14 @@ public BesuNode createPluginsNode(
     return create(
         new BesuNodeConfigurationBuilder()
             .name(name)
+            .jsonRpcConfiguration(node.createJsonRpcWithIbft2AdminEnabledConfig())
+            .webSocketConfiguration(node.createWebSocketEnabledConfig())
             .plugins(plugins)
             .extraCLIOptions(extraCLIOptions)
             .build());
   }
 
-  public BesuNode createArchiveNodeWithRpcApis(final String name, final RpcApi... enabledRpcApis)
+  public BesuNode createArchiveNodeWithRpcApis(final String name, final String... enabledRpcApis)
       throws IOException {
     final JsonRpcConfiguration jsonRpcConfig = node.createJsonRpcEnabledConfig();
     jsonRpcConfig.setRpcApis(asList(enabledRpcApis));
@@ -259,7 +352,12 @@ public BesuNode createArchiveNodeWithRpcApis(final String name, final RpcApi...
   }
 
   public BesuNode createNodeWithNoDiscovery(final String name) throws IOException {
-    return create(new BesuNodeConfigurationBuilder().name(name).discoveryEnabled(false).build());
+    return create(
+        new BesuNodeConfigurationBuilder()
+            .name(name)
+            .discoveryEnabled(false)
+            .engineRpcEnabled(false)
+            .build());
   }
 
   public BesuNode createCliqueNode(final String name) throws IOException {
@@ -270,7 +368,7 @@ public BesuNode createCliqueNode(final String name) throws IOException {
             .jsonRpcConfiguration(node.createJsonRpcWithCliqueEnabledConfig())
             .webSocketConfiguration(node.createWebSocketEnabledConfig())
             .devMode(false)
-            .genesisConfigProvider(genesis::createCliqueGenesisConfig)
+            .genesisConfigProvider(GenesisConfigurationFactory::createCliqueGenesisConfig)
             .build());
   }
 
@@ -284,7 +382,8 @@ public BesuNode createIbft2NonValidatorBootnode(final String name, final String
             .devMode(false)
             .genesisConfigProvider(
                 validators ->
-                    genesis.createIbft2GenesisConfigFilterBootnode(validators, genesisFile))
+                    GenesisConfigurationFactory.createIbft2GenesisConfigFilterBootnode(
+                        validators, genesisFile))
             .bootnodeEligible(true)
             .build());
   }
@@ -310,7 +409,8 @@ public BesuNode createIbft2NodeWithLocalAccountPermissioning(
             .devMode(false)
             .genesisConfigProvider(
                 validators ->
-                    genesis.createIbft2GenesisConfigFilterBootnode(validators, genesisFile))
+                    GenesisConfigurationFactory.createIbft2GenesisConfigFilterBootnode(
+                        validators, genesisFile))
             .bootnodeEligible(false)
             .build());
   }
@@ -325,7 +425,8 @@ public BesuNode createIbft2Node(final String name, final String genesisFile) thr
             .devMode(false)
             .genesisConfigProvider(
                 validators ->
-                    genesis.createIbft2GenesisConfigFilterBootnode(validators, genesisFile))
+                    GenesisConfigurationFactory.createIbft2GenesisConfigFilterBootnode(
+                        validators, genesisFile))
             .bootnodeEligible(false)
             .build());
   }
@@ -338,7 +439,69 @@ public BesuNode createIbft2Node(final String name) throws IOException {
             .jsonRpcConfiguration(node.createJsonRpcWithIbft2EnabledConfig(false))
             .webSocketConfiguration(node.createWebSocketEnabledConfig())
             .devMode(false)
-            .genesisConfigProvider(genesis::createIbft2GenesisConfig)
+            .genesisConfigProvider(GenesisConfigurationFactory::createIbft2GenesisConfig)
+            .build());
+  }
+
+  public BesuNode createQbftNodeWithTLS(final String name, final String type) throws IOException {
+    return create(
+        new BesuNodeConfigurationBuilder()
+            .name(name)
+            .miningEnabled()
+            .p2pTLSEnabled(name, type)
+            .jsonRpcConfiguration(node.createJsonRpcWithQbftEnabledConfig(false))
+            .webSocketConfiguration(node.createWebSocketEnabledConfig())
+            .devMode(false)
+            .genesisConfigProvider(GenesisConfigurationFactory::createQbftGenesisConfig)
+            .build());
+  }
+
+  public BesuNode createQbftNodeWithTLSJKS(final String name) throws IOException {
+    return createQbftNodeWithTLS(name, KeyStoreWrapper.KEYSTORE_TYPE_JKS);
+  }
+
+  public BesuNode createQbftNodeWithTLSPKCS12(final String name) throws IOException {
+    return createQbftNodeWithTLS(name, KeyStoreWrapper.KEYSTORE_TYPE_PKCS12);
+  }
+
+  public BesuNode createQbftNodeWithTLSPKCS11(final String name) throws IOException {
+    return createQbftNodeWithTLS(name, KeyStoreWrapper.KEYSTORE_TYPE_PKCS11);
+  }
+
+  public BesuNode createQbftNode(final String name) throws IOException {
+    return create(
+        new BesuNodeConfigurationBuilder()
+            .name(name)
+            .miningEnabled()
+            .jsonRpcConfiguration(node.createJsonRpcWithQbftEnabledConfig(false))
+            .webSocketConfiguration(node.createWebSocketEnabledConfig())
+            .devMode(false)
+            .genesisConfigProvider(GenesisConfigurationFactory::createQbftGenesisConfig)
+            .build());
+  }
+
+  public BesuNode createPkiQbftJKSNode(final String name) throws IOException {
+    return createPkiQbftNode(KeyStoreWrapper.KEYSTORE_TYPE_JKS, name);
+  }
+
+  public BesuNode createPkiQbftPKCS11Node(final String name) throws IOException {
+    return createPkiQbftNode(KeyStoreWrapper.KEYSTORE_TYPE_PKCS11, name);
+  }
+
+  public BesuNode createPkiQbftPKCS12Node(final String name) throws IOException {
+    return createPkiQbftNode(KeyStoreWrapper.KEYSTORE_TYPE_PKCS12, name);
+  }
+
+  public BesuNode createPkiQbftNode(final String type, final String name) throws IOException {
+    return create(
+        new BesuNodeConfigurationBuilder()
+            .name(name)
+            .miningEnabled()
+            .jsonRpcConfiguration(node.createJsonRpcWithQbftEnabledConfig(false))
+            .webSocketConfiguration(node.createWebSocketEnabledConfig())
+            .devMode(false)
+            .genesisConfigProvider(GenesisConfigurationFactory::createQbftGenesisConfig)
+            .pkiBlockCreationEnabled(pkiKeystoreConfigurationFactory.createPkiConfig(type, name))
             .build());
   }
 
@@ -353,7 +516,7 @@ public BesuNode createCustomGenesisNode(
       final boolean canBeBootnode,
       final boolean mining)
       throws IOException {
-    final String genesisFile = genesis.readGenesisFile(genesisPath);
+    final String genesisFile = GenesisConfigurationFactory.readGenesisFile(genesisPath);
     final BesuNodeConfigurationBuilder builder =
         new BesuNodeConfigurationBuilder()
             .name(name)
@@ -370,6 +533,23 @@ public BesuNode createCustomGenesisNode(
     return create(builder.build());
   }
 
+  public BesuNode createExecutionEngineGenesisNode(final String name, final String genesisPath)
+      throws IOException {
+    final String genesisFile = GenesisConfigurationFactory.readGenesisFile(genesisPath);
+
+    return create(
+        new BesuNodeConfigurationBuilder()
+            .name(name)
+            .genesisConfigProvider((a) -> Optional.of(genesisFile))
+            .devMode(false)
+            .bootnodeEligible(false)
+            .miningEnabled()
+            .jsonRpcEnabled()
+            .engineRpcEnabled(true)
+            .jsonRpcDebug()
+            .build());
+  }
+
   public BesuNode createCliqueNodeWithValidators(final String name, final String... validators)
       throws IOException {
 
@@ -383,7 +563,9 @@ public BesuNode createCliqueNodeWithValidators(final String name, final String..
             .genesisConfigProvider(
                 nodes ->
                     node.createGenesisConfigForValidators(
-                        asList(validators), nodes, genesis::createCliqueGenesisConfig))
+                        asList(validators),
+                        nodes,
+                        GenesisConfigurationFactory::createCliqueGenesisConfig))
             .build());
   }
 
@@ -400,13 +582,129 @@ public BesuNode createIbft2NodeWithValidators(final String name, final String...
             .genesisConfigProvider(
                 nodes ->
                     node.createGenesisConfigForValidators(
-                        asList(validators), nodes, genesis::createIbft2GenesisConfig))
+                        asList(validators),
+                        nodes,
+                        GenesisConfigurationFactory::createIbft2GenesisConfig))
+            .build());
+  }
+
+  public BesuNode createQbftTLSNodeWithValidators(
+      final String name, final String type, final String... validators) throws IOException {
+
+    return create(
+        new BesuNodeConfigurationBuilder()
+            .name(name)
+            .miningEnabled()
+            .p2pTLSEnabled(name, type)
+            .jsonRpcConfiguration(node.createJsonRpcWithIbft2EnabledConfig(false))
+            .webSocketConfiguration(node.createWebSocketEnabledConfig())
+            .devMode(false)
+            .genesisConfigProvider(
+                nodes ->
+                    node.createGenesisConfigForValidators(
+                        asList(validators),
+                        nodes,
+                        GenesisConfigurationFactory::createIbft2GenesisConfig))
+            .build());
+  }
+
+  public BesuNode createQbftTLSJKSNodeWithValidators(final String name, final String... validators)
+      throws IOException {
+    return createQbftTLSNodeWithValidators(name, KeyStoreWrapper.KEYSTORE_TYPE_JKS, validators);
+  }
+
+  public BesuNode createQbftTLSPKCS12NodeWithValidators(
+      final String name, final String... validators) throws IOException {
+    return createQbftTLSNodeWithValidators(name, KeyStoreWrapper.KEYSTORE_TYPE_PKCS12, validators);
+  }
+
+  public BesuNode createQbftTLSPKCS11NodeWithValidators(
+      final String name, final String... validators) throws IOException {
+    return createQbftTLSNodeWithValidators(name, KeyStoreWrapper.KEYSTORE_TYPE_PKCS11, validators);
+  }
+
+  public BesuNode createQbftNodeWithValidators(final String name, final String... validators)
+      throws IOException {
+
+    return create(
+        new BesuNodeConfigurationBuilder()
+            .name(name)
+            .miningEnabled()
+            .jsonRpcConfiguration(node.createJsonRpcWithQbftEnabledConfig(false))
+            .webSocketConfiguration(node.createWebSocketEnabledConfig())
+            .devMode(false)
+            .genesisConfigProvider(
+                nodes ->
+                    node.createGenesisConfigForValidators(
+                        asList(validators),
+                        nodes,
+                        GenesisConfigurationFactory::createQbftGenesisConfig))
+            .build());
+  }
+
+  public BesuNode createQbftNodeWithContractBasedValidators(
+      final String name, final String... validators) throws IOException {
+    return create(
+        new BesuNodeConfigurationBuilder()
+            .name(name)
+            .miningEnabled()
+            .jsonRpcConfiguration(node.createJsonRpcWithQbftEnabledConfig(false))
+            .webSocketConfiguration(node.createWebSocketEnabledConfig())
+            .devMode(false)
+            .genesisConfigProvider(
+                nodes ->
+                    node.createGenesisConfigForValidators(
+                        asList(validators),
+                        nodes,
+                        GenesisConfigurationFactory::createQbftValidatorContractGenesisConfig))
+            .build());
+  }
+
+  public BesuNode createPkiQbftJKSNodeWithValidators(final String name, final String... validators)
+      throws IOException {
+    return createPkiQbftNodeWithValidators(KeyStoreWrapper.KEYSTORE_TYPE_JKS, name, validators);
+  }
+
+  public BesuNode createPkiQbftPKCS11NodeWithValidators(
+      final String name, final String... validators) throws IOException {
+    return createPkiQbftNodeWithValidators(KeyStoreWrapper.KEYSTORE_TYPE_PKCS11, name, validators);
+  }
+
+  public BesuNode createPkiQbftPKCS12NodeWithValidators(
+      final String name, final String... validators) throws IOException {
+    return createPkiQbftNodeWithValidators(KeyStoreWrapper.KEYSTORE_TYPE_PKCS12, name, validators);
+  }
+
+  public BesuNode createPkiQbftNodeWithValidators(
+      final String type, final String name, final String... validators) throws IOException {
+
+    return create(
+        new BesuNodeConfigurationBuilder()
+            .name(name)
+            .miningEnabled()
+            .jsonRpcConfiguration(node.createJsonRpcWithQbftEnabledConfig(false))
+            .webSocketConfiguration(node.createWebSocketEnabledConfig())
+            .devMode(false)
+            .pkiBlockCreationEnabled(pkiKeystoreConfigurationFactory.createPkiConfig(type, name))
+            .genesisConfigProvider(
+                nodes ->
+                    node.createGenesisConfigForValidators(
+                        asList(validators),
+                        nodes,
+                        GenesisConfigurationFactory::createQbftGenesisConfig))
             .build());
   }
 
   public BesuNode createNodeWithStaticNodes(final String name, final List<Node> staticNodes)
       throws IOException {
 
+    BesuNodeConfigurationBuilder builder =
+        createConfigurationBuilderWithStaticNodes(name, staticNodes);
+    return create(builder.build());
+  }
+
+  private BesuNodeConfigurationBuilder createConfigurationBuilderWithStaticNodes(
+      final String name, final List<Node> staticNodes) {
     final List<String> staticNodesUrls =
         staticNodes.stream()
             .map(node -> (RunnableNode) node)
@@ -414,15 +712,51 @@ public BesuNode createNodeWithStaticNodes(final String name, final List<Node> st
             .map(URI::toASCIIString)
             .collect(toList());
 
-    return create(
-        new BesuNodeConfigurationBuilder()
-            .name(name)
-            .jsonRpcEnabled()
-            .webSocketEnabled()
-            .discoveryEnabled(false)
-            .staticNodes(staticNodesUrls)
-            .bootnodeEligible(false)
-            .build());
+    return new BesuNodeConfigurationBuilder()
+        .name(name)
+        .jsonRpcEnabled()
+        .webSocketEnabled()
+        .discoveryEnabled(false)
+        .staticNodes(staticNodesUrls)
+        .bootnodeEligible(false);
+  }
+
+  public BesuNode createNodeWithNonDefaultSignatureAlgorithm(
+      final String name, final String genesisPath, final KeyPair keyPair) throws IOException {
+    BesuNodeConfigurationBuilder builder =
+        createNodeConfigurationWithNonDefaultSignatureAlgorithm(
+            name, genesisPath, keyPair, new ArrayList<>());
+    builder.miningEnabled();
+
+    return create(builder.build());
+  }
+
+  public BesuNode createNodeWithNonDefaultSignatureAlgorithm(
+      final String name,
+      final String genesisPath,
+      final KeyPair keyPair,
+      final List<Node> staticNodes)
+      throws IOException {
+    BesuNodeConfigurationBuilder builder =
+        createNodeConfigurationWithNonDefaultSignatureAlgorithm(
+            name, genesisPath, keyPair, staticNodes);
+    return create(builder.build());
+  }
+
+  public BesuNodeConfigurationBuilder createNodeConfigurationWithNonDefaultSignatureAlgorithm(
+      final String name,
+      final String genesisPath,
+      final KeyPair keyPair,
+      final List<Node> staticNodes) {
+    BesuNodeConfigurationBuilder builder =
+        createConfigurationBuilderWithStaticNodes(name, staticNodes);
+
+    final String genesisData = GenesisConfigurationFactory.readGenesisFile(genesisPath);
+
+    return builder
+        .devMode(false)
+        .genesisConfigProvider((nodes) -> Optional.of(genesisData))
+        .keyPair(keyPair);
   }
 
   public BesuNode runCommand(final String command) throws IOException {
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfiguration.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfiguration.java
index aecf96c064f..ce2d53cdf33 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfiguration.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfiguration.java
@@ -18,6 +18,7 @@
 
 import java.net.URI;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 public interface NodeConfiguration {
@@ -32,10 +33,16 @@ public interface NodeConfiguration {
 
   Optional<Integer> getJsonRpcWebSocketPort();
 
+  Optional<Integer> getJsonRpcPort();
+
+  Optional<Integer> getEngineJsonRpcPort();
+
   String getHostName();
 
   boolean isJsonRpcEnabled();
 
+  boolean isEngineRpcEnabled();
+
   GenesisConfigurationProvider getGenesisConfigProvider();
 
   Optional<String> getGenesisConfig();
@@ -53,4 +60,6 @@ public interface NodeConfiguration {
   boolean isRevertReasonEnabled();
 
   List<String> getStaticNodes();
+
+  Map<String, String> getEnvironment();
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfigurationFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfigurationFactory.java
index e910b789c8e..f2682993f8a 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfigurationFactory.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfigurationFactory.java
@@ -16,13 +16,13 @@
 
 import static java.util.Collections.singletonList;
 import static java.util.stream.Collectors.toList;
-import static org.hyperledger.besu.consensus.clique.jsonrpc.CliqueRpcApis.CLIQUE;
-import static org.hyperledger.besu.consensus.ibft.jsonrpc.IbftRpcApis.IBFT;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.ADMIN;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.CLIQUE;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.IBFT;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.MINER;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.QBFT;
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
 import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode;
 import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationProvider;
@@ -45,17 +45,23 @@ public Optional<String> createGenesisConfigForValidators(
   }
 
   public JsonRpcConfiguration createJsonRpcWithCliqueEnabledConfig() {
-    return createJsonRpcWithRpcApiEnabledConfig(CLIQUE);
+    return createJsonRpcWithRpcApiEnabledConfig(CLIQUE.name());
   }
 
   public JsonRpcConfiguration createJsonRpcWithIbft2EnabledConfig(final boolean minerEnabled) {
     return minerEnabled
-        ? createJsonRpcWithRpcApiEnabledConfig(IBFT, MINER)
-        : createJsonRpcWithRpcApiEnabledConfig(IBFT);
+        ? createJsonRpcWithRpcApiEnabledConfig(IBFT.name(), MINER.name())
+        : createJsonRpcWithRpcApiEnabledConfig(IBFT.name());
   }
 
   public JsonRpcConfiguration createJsonRpcWithIbft2AdminEnabledConfig() {
-    return createJsonRpcWithRpcApiEnabledConfig(IBFT, ADMIN);
+    return createJsonRpcWithRpcApiEnabledConfig(IBFT.name(), ADMIN.name());
+  }
+
+  public JsonRpcConfiguration createJsonRpcWithQbftEnabledConfig(final boolean minerEnabled) {
+    return minerEnabled
+        ? createJsonRpcWithRpcApiEnabledConfig(QBFT.name(), MINER.name())
+        : createJsonRpcWithRpcApiEnabledConfig(QBFT.name());
   }
 
   public JsonRpcConfiguration createJsonRpcEnabledConfig() {
@@ -74,12 +80,12 @@ public WebSocketConfiguration createWebSocketEnabledConfig() {
   }
 
   public JsonRpcConfiguration jsonRpcConfigWithAdmin() {
-    return createJsonRpcWithRpcApiEnabledConfig(ADMIN);
+    return createJsonRpcWithRpcApiEnabledConfig(ADMIN.name());
   }
 
-  public JsonRpcConfiguration createJsonRpcWithRpcApiEnabledConfig(final RpcApi... rpcApi) {
+  public JsonRpcConfiguration createJsonRpcWithRpcApiEnabledConfig(final String... rpcApi) {
     final JsonRpcConfiguration jsonRpcConfig = createJsonRpcEnabledConfig();
-    final List<RpcApi> rpcApis = new ArrayList<>(jsonRpcConfig.getRpcApis());
+    final List<String> rpcApis = new ArrayList<>(jsonRpcConfig.getRpcApis());
     rpcApis.addAll(Arrays.asList(rpcApi));
     jsonRpcConfig.setRpcApis(rpcApis);
     return jsonRpcConfig;
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java
index ceab0160ad0..c52fbbba0c5 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java
@@ -17,43 +17,53 @@
 import static java.util.stream.Collectors.toList;
 
 import org.hyperledger.besu.consensus.clique.CliqueExtraData;
-import org.hyperledger.besu.consensus.ibft.IbftExtraData;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.consensus.ibft.IbftExtraDataCodec;
+import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.io.Resources;
 
 public class GenesisConfigurationFactory {
 
-  public Optional<String> createCliqueGenesisConfig(
+  private GenesisConfigurationFactory() {
+    throw new IllegalStateException("Utility class");
+  }
+
+  public static Optional<String> createCliqueGenesisConfig(
       final Collection<? extends RunnableNode> validators) {
     final String template = readGenesisFile("/clique/clique.json");
     return updateGenesisExtraData(
         validators, template, CliqueExtraData::createGenesisExtraDataString);
   }
 
-  public Optional<String> createIbft2GenesisConfig(
+  public static Optional<String> createIbft2GenesisConfig(
       final Collection<? extends RunnableNode> validators) {
     return createIbft2GenesisConfig(validators, "/ibft/ibft.json");
   }
 
-  public Optional<String> createIbft2GenesisConfig(
+  public static Optional<String> createIbft2GenesisConfig(
       final Collection<? extends RunnableNode> validators, final String genesisFile) {
     final String template = readGenesisFile(genesisFile);
     return updateGenesisExtraData(
-        validators, template, IbftExtraData::createGenesisExtraDataString);
+        validators, template, IbftExtraDataCodec::createGenesisExtraDataString);
   }
 
-  public Optional<String> createIbft2GenesisConfigFilterBootnode(
+  public static Optional<String> createIbft2GenesisConfigFilterBootnode(
       final Collection<? extends RunnableNode> validators, final String genesisFile) {
     final String template = readGenesisFile(genesisFile);
     final List<? extends RunnableNode> filteredList =
@@ -61,17 +71,63 @@ public Optional<String> createIbft2GenesisConfigFilterBootnode(
             .filter(node -> !node.getConfiguration().isBootnodeEligible())
             .collect(toList());
     return updateGenesisExtraData(
-        filteredList, template, IbftExtraData::createGenesisExtraDataString);
+        filteredList, template, IbftExtraDataCodec::createGenesisExtraDataString);
   }
 
-  public Optional<String> createPrivacyIbft2GenesisConfig(
+  public static Optional<String> createPrivacyIbft2GenesisConfig(
       final Collection<? extends RunnableNode> validators) {
     final String template = readGenesisFile("/ibft/privacy-ibft.json");
     return updateGenesisExtraData(
-        validators, template, IbftExtraData::createGenesisExtraDataString);
+        validators, template, IbftExtraDataCodec::createGenesisExtraDataString);
+  }
+
+  public static Optional<String> createQbftGenesisConfig(
+      final Collection<? extends RunnableNode> validators) {
+    final String template = readGenesisFile("/qbft/qbft.json");
+    return updateGenesisExtraData(
+        validators, template, QbftExtraDataCodec::createGenesisExtraDataString);
+  }
+
+  @SuppressWarnings("unchecked")
+  public static Optional<String> createQbftValidatorContractGenesisConfig(
+      final Collection<? extends RunnableNode> validators) throws UncheckedIOException {
+    final String template = readGenesisFile("/qbft/qbft-emptyextradata.json");
+    final String contractAddress = "0x0000000000000000000000000000000000008888";
+
+    try {
+      // convert genesis json to Map for modification
+      final ObjectMapper objectMapper = new ObjectMapper();
+      final Map<String, Object> genesisMap =
+          objectMapper.readValue(template, new TypeReference<>() {});
+
+      // update config/qbft to add contract address
+      final Map<String, Object> configMap = (Map<String, Object>) genesisMap.get("config");
+      final Map<String, Object> qbftMap = (Map<String, Object>) configMap.get("qbft");
+      qbftMap.put("validatorcontractaddress", contractAddress);
+
+      // update alloc to add contract code and storage
+      final Map<String, Object> allocMap = (Map<String, Object>) genesisMap.get("alloc");
+      final Map<String, Object> contractConfig =
+          new QbftValidatorContractConfigFactory().buildContractConfig(validators);
+      allocMap.put(contractAddress, contractConfig);
+
+      // regenerate genesis json again
+      final String genesisJson =
+          objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(genesisMap);
+      return Optional.of(genesisJson);
+    } catch (final JsonProcessingException e) {
+      throw new UncheckedIOException(e);
+    }
+  }
+
+  public static Optional<String> createDevLondonGenesisConfig(
+      final Collection<? extends RunnableNode> validators) {
+    final String template = readGenesisFile("/dev/dev_london.json");
+    return updateGenesisExtraData(
+        validators, template, CliqueExtraData::createGenesisExtraDataString);
   }
 
-  private Optional<String> updateGenesisExtraData(
+  private static Optional<String> updateGenesisExtraData(
       final Collection<? extends RunnableNode> validators,
       final String genesisTemplate,
       final Function<List<Address>, String> extraDataCreator) {
@@ -83,9 +139,9 @@ private Optional<String> updateGenesisExtraData(
   }
 
   @SuppressWarnings("UnstableApiUsage")
-  public String readGenesisFile(final String filepath) {
+  public static String readGenesisFile(final String filepath) {
     try {
-      final URI uri = this.getClass().getResource(filepath).toURI();
+      final URI uri = GenesisConfigurationFactory.class.getResource(filepath).toURI();
       return Resources.toString(uri.toURL(), Charset.defaultCharset());
     } catch (final URISyntaxException | IOException e) {
       throw new IllegalStateException("Unable to get test genesis config " + filepath);
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/QbftValidatorContractConfigFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/QbftValidatorContractConfigFactory.java
new file mode 100644
index 00000000000..1afdae90ffc
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/genesis/QbftValidatorContractConfigFactory.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis;
+
+import static java.util.stream.Collectors.toList;
+
+import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode;
+
+import java.math.BigInteger;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class QbftValidatorContractConfigFactory {
+  private static final String BALANCE = "0";
+  // This is compiled from
+  // https://github.com/hyperledger/besu/blob/9deb5ea5d21c810300d5b7005bf6c3777be3f6e5/consensus/qbft/src/integration-test/resources/validator_contract.sol
+  // using solc --evm-version byzantium --bin-runtime validator_contract.sol",
+  private static final String CODE =
+      "608060405234801561001057600080fd5b5060043610610048576000357c010000000000000000000000000000000000000000000000000000000090048063b7ab4db51461004d575b600080fd5b61005561006b565b604051610062919061017e565b60405180910390f35b606060008054806020026020016040519081016040528092919081815260200182805480156100ef57602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190600101908083116100a5575b5050505050905090565b60006101058383610111565b60208301905092915050565b61011a816101d9565b82525050565b600061012b826101b0565b61013581856101c8565b9350610140836101a0565b8060005b8381101561017157815161015888826100f9565b9750610163836101bb565b925050600181019050610144565b5085935050505092915050565b600060208201905081810360008301526101988184610120565b905092915050565b6000819050602082019050919050565b600081519050919050565b6000602082019050919050565b600082825260208201905092915050565b60006101e4826101eb565b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff8216905091905056fea26469706673582212206d880cf012c1677c691bf6f2f0a0e4eadf57866ffe5cd2d9833d3cfdf27b15f664736f6c63430008060033";
+  // The following address location is specific to above contract. It is used to pre-initialize the
+  // array in the contract with validators
+  private static final BigInteger ARRAY_ADDR =
+      new BigInteger("290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", 16);
+
+  public final Map<String, Object> buildContractConfig(
+      final Collection<? extends RunnableNode> validators) {
+    Map<String, Object> contractAllocation = new LinkedHashMap<>();
+    contractAllocation.put("balance", BALANCE);
+    contractAllocation.put("code", CODE);
+    contractAllocation.put("storage", buildContractStorageConfig(validators));
+
+    return contractAllocation;
+  }
+
+  private Map<String, String> buildContractStorageConfig(
+      final Collection<? extends RunnableNode> validators) {
+    final List<String> addresses =
+        validators.stream()
+            .map(RunnableNode::getAddress)
+            .map(Bytes::toUnprefixedHexString)
+            .map(hex -> (padZero(0) + hex).substring(hex.length()))
+            .collect(toList());
+
+    final Map<String, String> storageValues = new LinkedHashMap<>();
+    // zero location is size of array
+    storageValues.put(padZero(0), padZero(addresses.size()));
+
+    // further locations are allocation of addresses to array
+    for (int i = 0; i < addresses.size(); i++) {
+      final BigInteger varStorage = ARRAY_ADDR.add(BigInteger.valueOf(i));
+      storageValues.put(varStorage.toString(16), addresses.get(i));
+    }
+    return storageValues;
+  }
+
+  private String padZero(final int value) {
+    return String.format("%064x", value);
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java
index 2e81875660c..8dafc14d77f 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java
@@ -17,16 +17,16 @@
 import static java.util.Collections.singletonList;
 import static java.util.stream.Collectors.toList;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.permissioning.AllowlistPersistor;
 import org.hyperledger.besu.ethereum.permissioning.AllowlistPersistor.ALLOWLIST_TYPE;
 import org.hyperledger.besu.ethereum.permissioning.LocalPermissioningConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.SmartContractPermissioningConfiguration;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
 import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode;
@@ -227,7 +227,9 @@ private LocalPermissioningConfiguration localConfigPermissioningConfiguration()
       }
 
       final List<EnodeURL> nodeAllowList =
-          localConfigPermittedNodes.stream().map(EnodeURL::fromURI).collect(Collectors.toList());
+          localConfigPermittedNodes.stream()
+              .map(EnodeURLImpl::fromURI)
+              .collect(Collectors.toList());
 
       initPermissioningConfigurationFile(
           ALLOWLIST_TYPE.NODES,
@@ -294,9 +296,9 @@ private JsonRpcConfiguration jsonRpcConfigWithPermApiEnabled() {
     jsonRpcConfig.setPort(0);
     jsonRpcConfig.setHostsAllowlist(singletonList("*"));
     jsonRpcConfig.setCorsAllowedDomains(singletonList("*"));
-    final List<RpcApi> rpcApis = new ArrayList<>(jsonRpcConfig.getRpcApis());
-    rpcApis.add(RpcApis.PERM);
-    rpcApis.add(RpcApis.ADMIN);
+    final List<String> rpcApis = new ArrayList<>(jsonRpcConfig.getRpcApis());
+    rpcApis.add(RpcApis.PERM.name());
+    rpcApis.add(RpcApis.ADMIN.name());
     jsonRpcConfig.setRpcApis(rpcApis);
     return jsonRpcConfig;
   }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/pki/PKCS11Utils.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/pki/PKCS11Utils.java
new file mode 100644
index 00000000000..7c77722c8b2
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/pki/PKCS11Utils.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.tests.acceptance.dsl.node.configuration.pki;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UncheckedIOException;
+import java.nio.file.Path;
+import java.util.Properties;
+
+public class PKCS11Utils {
+
+  public static Path initNSSConfigFile(final Path srcFilePath) {
+    // load nss file as Properties
+    final Properties nssProp = new Properties();
+    try (InputStream input = new FileInputStream(srcFilePath.toFile())) {
+      nssProp.load(input);
+      String nssDbPath = srcFilePath.getParent().resolve("nssdb").toAbsolutePath().toString();
+      nssProp.setProperty("nssSecmodDirectory", nssDbPath);
+    } catch (final IOException e) {
+      throw new UncheckedIOException(e);
+    }
+
+    // store modified config into temporary file
+    final Path targetFilePath = createTemporaryFile("nsscfg");
+    try (FileOutputStream outputStream = new FileOutputStream(targetFilePath.toFile())) {
+      nssProp.store(outputStream, null);
+    } catch (final IOException e) {
+      throw new UncheckedIOException(e);
+    }
+
+    return targetFilePath;
+  }
+
+  private static Path createTemporaryFile(final String suffix) {
+    final File tempFile;
+    try {
+      tempFile = File.createTempFile("temp", suffix);
+      tempFile.deleteOnExit();
+    } catch (IOException e) {
+      throw new RuntimeException("Error creating temporary file", e);
+    }
+    return tempFile.toPath();
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/pki/PkiKeystoreConfigurationFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/pki/PkiKeystoreConfigurationFactory.java
new file mode 100644
index 00000000000..ac7f814d433
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/pki/PkiKeystoreConfigurationFactory.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ *  the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.tests.acceptance.dsl.node.configuration.pki;
+
+import static org.hyperledger.besu.pki.util.TestCertificateUtils.createKeyPair;
+import static org.hyperledger.besu.pki.util.TestCertificateUtils.createSelfSignedCertificate;
+import static org.hyperledger.besu.pki.util.TestCertificateUtils.issueCertificate;
+
+import org.hyperledger.besu.pki.config.PkiKeyStoreConfiguration;
+import org.hyperledger.besu.pki.keystore.KeyStoreWrapper;
+import org.hyperledger.besu.pki.util.TestCertificateUtils;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.KeyPair;
+import java.security.KeyStore;
+import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.Objects;
+import java.util.UUID;
+
+public class PkiKeystoreConfigurationFactory {
+
+  /*
+   PKCS11 config files
+  */
+  final String NSSCONFIG_PATH_STRING = "/pki-certs/%s/nss.cfg";
+  final String NSSPIN_PATH_STRING = "/pki-certs/%s/nsspin.txt";
+  final String TRUSTSTORE_PATH_STRING = "/pki-certs/%s/truststore.p12";
+  final String CRL_PATH_STRING = "/pki-certs/crl/crl.pem";
+
+  /*
+   Software keystore config
+  */
+  public static final String KEYSTORE_DEFAULT_PASSWORD = "password";
+
+  private KeyPair caKeyPair;
+  private X509Certificate caCertificate;
+  private Path trustStoreFile;
+  private Path passwordFile;
+
+  public PkiKeyStoreConfiguration createPkiConfig(final String type, final String name) {
+    if (KeyStoreWrapper.KEYSTORE_TYPE_PKCS11.equals(type)) {
+      return createPKCS11PkiConfig(name);
+    } else {
+      return createSoftwareKeyStorePkiConfig(type, name);
+    }
+  }
+
+  private PkiKeyStoreConfiguration createPKCS11PkiConfig(final String name) {
+    final PkiKeyStoreConfiguration.Builder pkiKeyStoreConfigBuilder =
+        new PkiKeyStoreConfiguration.Builder();
+
+    try {
+      pkiKeyStoreConfigBuilder
+          .withKeyStoreType(KeyStoreWrapper.KEYSTORE_TYPE_PKCS11)
+          .withKeyStorePath(
+              PKCS11Utils.initNSSConfigFile(
+                  readResourceAsPath(String.format(NSSCONFIG_PATH_STRING, name))))
+          .withKeyStorePasswordPath(readResourceAsPath(String.format(NSSPIN_PATH_STRING, name)))
+          .withTrustStoreType(KeyStoreWrapper.KEYSTORE_TYPE_PKCS12)
+          .withTrustStorePath(readResourceAsPath(String.format(TRUSTSTORE_PATH_STRING, name)))
+          .withTrustStorePasswordPath(readResourceAsPath(String.format(NSSPIN_PATH_STRING, name)))
+          .withCrlFilePath(readResourceAsPath(CRL_PATH_STRING))
+          .withCertificateAlias(name);
+
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+
+    return pkiKeyStoreConfigBuilder.build();
+  }
+
+  private PkiKeyStoreConfiguration createSoftwareKeyStorePkiConfig(
+      final String type, final String name) {
+    PkiKeyStoreConfiguration.Builder pkiKeyStoreConfigBuilder =
+        new PkiKeyStoreConfiguration.Builder();
+
+    pkiKeyStoreConfigBuilder.withTrustStoreType(type);
+    pkiKeyStoreConfigBuilder.withTrustStorePath(createTrustStore(type));
+    pkiKeyStoreConfigBuilder.withTrustStorePasswordPath(passwordFile);
+
+    pkiKeyStoreConfigBuilder.withKeyStoreType(type);
+    pkiKeyStoreConfigBuilder.withKeyStorePath(createKeyStore(type, name));
+    pkiKeyStoreConfigBuilder.withKeyStorePasswordPath(passwordFile);
+
+    pkiKeyStoreConfigBuilder.withCertificateAlias(name);
+
+    return pkiKeyStoreConfigBuilder.build();
+  }
+
+  private Path createTrustStore(final String type) {
+    // Only create the truststore if this is the first time this method is being called
+    if (caKeyPair == null) {
+      try {
+        caKeyPair = createKeyPair(TestCertificateUtils.Algorithm.RSA);
+        caCertificate = createSelfSignedCertificate("ca", notBefore(), notAfter(), caKeyPair);
+
+        final KeyStore truststore = KeyStore.getInstance(type);
+        truststore.load(null, null);
+        truststore.setCertificateEntry("ca", caCertificate);
+
+        final String uniqueId = UUID.randomUUID().toString();
+        trustStoreFile = writeKeyStoreFile(truststore, "truststore", uniqueId);
+        passwordFile = writePasswordFile(KEYSTORE_DEFAULT_PASSWORD, "password", uniqueId);
+      } catch (final Exception e) {
+        throw new RuntimeException("Error creating truststore for Acceptance Test", e);
+      }
+    }
+
+    return trustStoreFile;
+  }
+
+  private Path createKeyStore(final String type, final String alias) {
+    if (caKeyPair == null) {
+      createTrustStore(type);
+    }
+
+    final KeyPair kp = createKeyPair(TestCertificateUtils.Algorithm.RSA);
+    final X509Certificate certificate =
+        issueCertificate(caCertificate, caKeyPair, "validator", notBefore(), notAfter(), kp, false);
+
+    try {
+      final KeyStore keyStore = KeyStore.getInstance(type);
+      keyStore.load(null, null);
+      keyStore.setKeyEntry(
+          alias,
+          kp.getPrivate(),
+          KEYSTORE_DEFAULT_PASSWORD.toCharArray(),
+          new Certificate[] {certificate, caCertificate});
+
+      final String id = UUID.randomUUID().toString();
+      return writeKeyStoreFile(keyStore, "keystore", id);
+    } catch (final Exception e) {
+      throw new RuntimeException("Error creating keystore for Acceptance Test", e);
+    }
+  }
+
+  private Path writeKeyStoreFile(
+      final KeyStore keyStore, final String prefix, final String suffix) {
+    try {
+      final Path file = Files.createTempFile(prefix, suffix != null ? suffix : "");
+      file.toFile().deleteOnExit();
+      final FileOutputStream keyStoreFOS = new FileOutputStream(file.toFile());
+      keyStore.store(keyStoreFOS, KEYSTORE_DEFAULT_PASSWORD.toCharArray());
+
+      return file;
+    } catch (final Exception e) {
+      throw new RuntimeException("Error creating keystore file", e);
+    }
+  }
+
+  private Path writePasswordFile(final String password, final String prefix, final String suffix) {
+    try {
+      final Path file = Files.createTempFile(prefix, suffix);
+      file.toFile().deleteOnExit();
+      Files.write(file, password.getBytes(StandardCharsets.UTF_8));
+      return file;
+    } catch (final IOException e) {
+      throw new RuntimeException("Error creating password file", e);
+    }
+  }
+
+  private Instant notBefore() {
+    return Instant.now().minus(1, ChronoUnit.DAYS);
+  }
+
+  private Instant notAfter() {
+    return Instant.now().plus(10, ChronoUnit.DAYS);
+  }
+
+  private Path readResourceAsPath(final String path) throws Exception {
+    return Path.of(Objects.requireNonNull(this.getClass().getResource(path)).toURI());
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeConfiguration.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeConfiguration.java
index 8acb6c7da21..05c989e54aa 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeConfiguration.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeConfiguration.java
@@ -15,53 +15,51 @@
 package org.hyperledger.besu.tests.acceptance.dsl.node.configuration.privacy;
 
 import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.BesuNodeConfiguration;
-import org.hyperledger.orion.testutil.OrionKeyConfiguration;
+import org.hyperledger.enclave.testutil.EnclaveKeyConfiguration;
 
 public class PrivacyNodeConfiguration {
 
-  private final int privacyAddress;
-  private final boolean isOnchainPrivacyGroupEnabled;
-  private final BesuNodeConfiguration besuConfig;
-  private final OrionKeyConfiguration orionConfig;
+  private final boolean isFlexiblePrivacyGroupEnabled;
   private final boolean isMultitenancyEnabled;
+  private final boolean isPrivacyPluginEnabled;
+  private final BesuNodeConfiguration besuConfig;
+  private final EnclaveKeyConfiguration keyConfig;
 
   PrivacyNodeConfiguration(
-      final int privacyAddress,
-      final BesuNodeConfiguration besuConfig,
-      final OrionKeyConfiguration orionConfig) {
-    this(privacyAddress, false, false, besuConfig, orionConfig);
+      final BesuNodeConfiguration besuConfig, final EnclaveKeyConfiguration keyConfig) {
+    this(false, false, false, besuConfig, keyConfig);
   }
 
-  PrivacyNodeConfiguration(
-      final int privacyAddress,
-      final boolean isOnchainPrivacyGroupEnabled,
+  public PrivacyNodeConfiguration(
+      final boolean isFlexiblePrivacyGroupEnabled,
       final boolean isMultitenancyEnabled,
+      final boolean isPrivacyPluginEnabled,
       final BesuNodeConfiguration besuConfig,
-      final OrionKeyConfiguration orionConfig) {
-    this.privacyAddress = privacyAddress;
-    this.isOnchainPrivacyGroupEnabled = isOnchainPrivacyGroupEnabled;
+      final EnclaveKeyConfiguration keyConfig) {
+    this.isFlexiblePrivacyGroupEnabled = isFlexiblePrivacyGroupEnabled;
     this.besuConfig = besuConfig;
-    this.orionConfig = orionConfig;
+    this.keyConfig = keyConfig;
     this.isMultitenancyEnabled = isMultitenancyEnabled;
+    this.isPrivacyPluginEnabled = isPrivacyPluginEnabled;
   }
 
-  public int getPrivacyAddress() {
-    return privacyAddress;
-  }
-
-  public boolean isOnchainPrivacyGroupEnabled() {
-    return isOnchainPrivacyGroupEnabled;
+  public boolean isFlexiblePrivacyGroupEnabled() {
+    return isFlexiblePrivacyGroupEnabled;
   }
 
   public boolean isMultitenancyEnabled() {
     return isMultitenancyEnabled;
   }
 
+  public boolean isPrivacyPluginEnabled() {
+    return isPrivacyPluginEnabled;
+  }
+
   public BesuNodeConfiguration getBesuConfig() {
     return besuConfig;
   }
 
-  public OrionKeyConfiguration getOrionKeyConfig() {
-    return orionConfig;
+  public EnclaveKeyConfiguration getKeyConfig() {
+    return keyConfig;
   }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeFactory.java
index ca390caff40..03188db8a27 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeFactory.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeFactory.java
@@ -14,22 +14,26 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl.node.configuration.privacy;
 
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.BesuNodeConfigurationBuilder;
 import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.NodeConfigurationFactory;
 import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationFactory;
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccount;
-import org.hyperledger.orion.testutil.OrionKeyConfiguration;
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+import org.hyperledger.enclave.testutil.EnclaveKeyConfiguration;
+import org.hyperledger.enclave.testutil.EnclaveType;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
 
 import io.vertx.core.Vertx;
+import org.testcontainers.containers.Network;
 
 public class PrivacyNodeFactory {
 
-  private final GenesisConfigurationFactory genesis = new GenesisConfigurationFactory();
   private final NodeConfigurationFactory node = new NodeConfigurationFactory();
   private final Vertx vertx;
 
@@ -37,21 +41,28 @@ public PrivacyNodeFactory(final Vertx vertx) {
     this.vertx = vertx;
   }
 
-  private PrivacyNode create(final PrivacyNodeConfiguration privacyNodeConfig) throws IOException {
-    return new PrivacyNode(privacyNodeConfig, vertx);
-  }
-
-  public PrivacyNode createPrivateTransactionEnabledMinerNode(
-      final String name, final PrivacyAccount privacyAccount) throws IOException {
-    return createPrivateTransactionEnabledMinerNode(name, privacyAccount, Address.PRIVACY);
+  public PrivacyNode create(
+      final PrivacyNodeConfiguration privacyNodeConfig,
+      final EnclaveType enclaveType,
+      final Optional<Network> containerNetwork)
+      throws IOException {
+    return new PrivacyNode(privacyNodeConfig, vertx, enclaveType, containerNetwork);
   }
 
   public PrivacyNode createPrivateTransactionEnabledMinerNode(
-      final String name, final PrivacyAccount privacyAccount, final int privacyAddress)
+      final String name,
+      final PrivacyAccount privacyAccount,
+      final EnclaveType enclaveType,
+      final Optional<Network> containerNetwork,
+      final boolean isFlexiblePrivacyGroupEnabled,
+      final boolean isMultitenancyEnabled,
+      final boolean isPrivacyPluginEnabled)
       throws IOException {
     return create(
         new PrivacyNodeConfiguration(
-            privacyAddress,
+            isFlexiblePrivacyGroupEnabled,
+            isMultitenancyEnabled,
+            isPrivacyPluginEnabled,
             new BesuNodeConfigurationBuilder()
                 .name(name)
                 .miningEnabled()
@@ -59,114 +70,225 @@ public PrivacyNode createPrivateTransactionEnabledMinerNode(
                 .webSocketEnabled()
                 .enablePrivateTransactions()
                 .keyFilePath(privacyAccount.getPrivateKeyPath())
+                .plugins(Collections.singletonList("testPlugins"))
+                .extraCLIOptions(List.of("--plugin-privacy-service-encryption-prefix=0xAA"))
                 .build(),
-            new OrionKeyConfiguration(
-                privacyAccount.getEnclaveKeyPaths(), privacyAccount.getEnclavePrivateKeyPaths())));
+            new EnclaveKeyConfiguration(
+                privacyAccount.getEnclaveKeyPaths(),
+                privacyAccount.getEnclavePrivateKeyPaths(),
+                privacyAccount.getEnclaveEncryptorType())),
+        enclaveType,
+        containerNetwork);
   }
 
   public PrivacyNode createPrivateTransactionEnabledNode(
-      final String name, final PrivacyAccount privacyAccount) throws IOException {
-    return createPrivateTransactionEnabledNode(name, privacyAccount, Address.PRIVACY);
-  }
-
-  public PrivacyNode createPrivateTransactionEnabledNode(
-      final String name, final PrivacyAccount privacyAccount, final int privacyAddress)
+      final String name,
+      final PrivacyAccount privacyAccount,
+      final EnclaveType enclaveType,
+      final Optional<Network> containerNetwork,
+      final boolean isFlexiblePrivacyGroupEnabled,
+      final boolean isMultitenancyEnabled,
+      final boolean isPrivacyPluginEnabled)
       throws IOException {
     return create(
         new PrivacyNodeConfiguration(
-            privacyAddress,
+            isFlexiblePrivacyGroupEnabled,
+            isMultitenancyEnabled,
+            isPrivacyPluginEnabled,
             new BesuNodeConfigurationBuilder()
                 .name(name)
                 .jsonRpcEnabled()
                 .keyFilePath(privacyAccount.getPrivateKeyPath())
                 .enablePrivateTransactions()
                 .webSocketEnabled()
+                .plugins(Collections.singletonList("testPlugins"))
+                .extraCLIOptions(List.of("--plugin-privacy-service-encryption-prefix=0xBB"))
                 .build(),
-            new OrionKeyConfiguration(
-                privacyAccount.getEnclaveKeyPaths(), privacyAccount.getEnclavePrivateKeyPaths())));
-  }
-
-  public PrivacyNode createIbft2NodePrivacyMiningEnabled(
-      final String name, final PrivacyAccount privacyAccount) throws IOException {
-    return createIbft2NodePrivacyEnabled(name, privacyAccount, Address.PRIVACY, true);
+            new EnclaveKeyConfiguration(
+                privacyAccount.getEnclaveKeyPaths(),
+                privacyAccount.getEnclavePrivateKeyPaths(),
+                privacyAccount.getEnclaveEncryptorType())),
+        enclaveType,
+        containerNetwork);
   }
 
   public PrivacyNode createIbft2NodePrivacyEnabled(
-      final String name, final PrivacyAccount privacyAccount) throws IOException {
-    return createIbft2NodePrivacyEnabled(name, privacyAccount, Address.PRIVACY, false);
+      final String name,
+      final PrivacyAccount privacyAccount,
+      final boolean minerEnabled,
+      final EnclaveType enclaveType,
+      final Optional<Network> containerNetwork,
+      final boolean isFlexiblePrivacyGroupEnabled,
+      final boolean isMultitenancyEnabled,
+      final boolean isPrivacyPluginEnabled,
+      final String unrestrictedPrefix)
+      throws IOException {
+    return create(
+        new PrivacyNodeConfiguration(
+            isFlexiblePrivacyGroupEnabled,
+            isMultitenancyEnabled,
+            isPrivacyPluginEnabled,
+            new BesuNodeConfigurationBuilder()
+                .name(name)
+                .miningEnabled()
+                .jsonRpcConfiguration(node.createJsonRpcWithIbft2EnabledConfig(minerEnabled))
+                .webSocketConfiguration(node.createWebSocketEnabledConfig())
+                .devMode(false)
+                .genesisConfigProvider(GenesisConfigurationFactory::createPrivacyIbft2GenesisConfig)
+                .keyFilePath(privacyAccount.getPrivateKeyPath())
+                .enablePrivateTransactions()
+                .plugins(Collections.singletonList("testPlugins"))
+                .extraCLIOptions(
+                    List.of("--plugin-privacy-service-encryption-prefix=" + unrestrictedPrefix))
+                .build(),
+            new EnclaveKeyConfiguration(
+                privacyAccount.getEnclaveKeyPaths(),
+                privacyAccount.getEnclavePrivateKeyPaths(),
+                privacyAccount.getEnclaveEncryptorType())),
+        enclaveType,
+        containerNetwork);
   }
 
-  public PrivacyNode createIbft2NodePrivacyEnabled(
+  public PrivacyNode createIbft2NodePrivacyEnabledWithGenesis(
       final String name,
       final PrivacyAccount privacyAccount,
-      final int privacyAddress,
-      final boolean minerEnabled)
+      final boolean minerEnabled,
+      final EnclaveType enclaveType,
+      final Optional<Network> containerNetwork,
+      final boolean isFlexiblePrivacyGroupEnabled,
+      final boolean isMultitenancyEnabled,
+      final boolean isPrivacyPluginEnabled,
+      final String unrestrictedPrefix)
       throws IOException {
     return create(
         new PrivacyNodeConfiguration(
-            privacyAddress,
+            isFlexiblePrivacyGroupEnabled,
+            isMultitenancyEnabled,
+            isPrivacyPluginEnabled,
             new BesuNodeConfigurationBuilder()
                 .name(name)
                 .miningEnabled()
                 .jsonRpcConfiguration(node.createJsonRpcWithIbft2EnabledConfig(minerEnabled))
                 .webSocketConfiguration(node.createWebSocketEnabledConfig())
                 .devMode(false)
-                .genesisConfigProvider(genesis::createPrivacyIbft2GenesisConfig)
+                .genesisConfigProvider(GenesisConfigurationFactory::createPrivacyIbft2GenesisConfig)
+                .keyFilePath(privacyAccount.getPrivateKeyPath())
+                .enablePrivateTransactions()
+                .plugins(Collections.singletonList("testPlugins"))
+                .extraCLIOptions(
+                    List.of(
+                        "--plugin-privacy-service-encryption-prefix=" + unrestrictedPrefix,
+                        "--plugin-privacy-service-genesis-enabled=true"))
+                .build(),
+            new EnclaveKeyConfiguration(
+                privacyAccount.getEnclaveKeyPaths(),
+                privacyAccount.getEnclavePrivateKeyPaths(),
+                privacyAccount.getEnclaveEncryptorType())),
+        enclaveType,
+        containerNetwork);
+  }
+
+  public PrivacyNode createQbftNodePrivacyEnabled(
+      final String name,
+      final PrivacyAccount privacyAccount,
+      final EnclaveType enclaveType,
+      final Optional<Network> containerNetwork,
+      final boolean isFlexiblePrivacyGroupEnabled,
+      final boolean isMultitenancyEnabled,
+      final boolean isPrivacyPluginEnabled,
+      final String unrestrictedPrefix)
+      throws IOException {
+    return create(
+        new PrivacyNodeConfiguration(
+            isFlexiblePrivacyGroupEnabled,
+            isMultitenancyEnabled,
+            isPrivacyPluginEnabled,
+            new BesuNodeConfigurationBuilder()
+                .name(name)
+                .miningEnabled()
+                .jsonRpcConfiguration(node.createJsonRpcWithQbftEnabledConfig(false))
+                .webSocketConfiguration(node.createWebSocketEnabledConfig())
+                .devMode(false)
+                .genesisConfigProvider(GenesisConfigurationFactory::createQbftGenesisConfig)
                 .keyFilePath(privacyAccount.getPrivateKeyPath())
                 .enablePrivateTransactions()
+                .plugins(Collections.singletonList("testPlugins"))
+                .extraCLIOptions(
+                    List.of("--plugin-privacy-service-encryption-prefix=" + unrestrictedPrefix))
                 .build(),
-            new OrionKeyConfiguration(
-                privacyAccount.getEnclaveKeyPaths(), privacyAccount.getEnclavePrivateKeyPaths())));
+            new EnclaveKeyConfiguration(
+                privacyAccount.getEnclaveKeyPaths(),
+                privacyAccount.getEnclavePrivateKeyPaths(),
+                privacyAccount.getEnclaveEncryptorType())),
+        enclaveType,
+        containerNetwork);
   }
 
-  public PrivacyNode createOnChainPrivacyGroupEnabledMinerNode(
+  public PrivacyNode createFlexiblePrivacyGroupEnabledMinerNode(
       final String name,
       final PrivacyAccount privacyAccount,
-      final int privacyAddress,
-      final boolean multiTenancyEnabled)
+      final boolean multiTenancyEnabled,
+      final EnclaveType enclaveType,
+      final Optional<Network> containerNetwork)
       throws IOException, URISyntaxException {
     final BesuNodeConfigurationBuilder besuNodeConfigurationBuilder =
         new BesuNodeConfigurationBuilder();
     if (multiTenancyEnabled) {
-      besuNodeConfigurationBuilder.jsonRpcAuthenticationConfiguration(
-          "authentication/auth_priv.toml");
+      final String authPrivTomlPath =
+          EnclaveEncryptorType.EC.equals(privacyAccount.getEnclaveEncryptorType())
+              ? "authentication/auth_priv_ec_pubkey.toml"
+              : "authentication/auth_priv.toml";
+      besuNodeConfigurationBuilder.jsonRpcAuthenticationConfiguration(authPrivTomlPath);
     }
     return create(
         new PrivacyNodeConfiguration(
-            privacyAddress,
             true,
             multiTenancyEnabled,
+            false,
             besuNodeConfigurationBuilder
                 .name(name)
                 .miningEnabled()
                 .jsonRpcEnabled()
                 .webSocketEnabled()
                 .enablePrivateTransactions()
+                .plugins(Collections.singletonList("testPlugins"))
+                .extraCLIOptions(List.of("--plugin-privacy-service-genesis-enabled=true"))
                 .keyFilePath(privacyAccount.getPrivateKeyPath())
                 .build(),
-            new OrionKeyConfiguration(
-                privacyAccount.getEnclaveKeyPaths(), privacyAccount.getEnclavePrivateKeyPaths())));
+            new EnclaveKeyConfiguration(
+                privacyAccount.getEnclaveKeyPaths(),
+                privacyAccount.getEnclavePrivateKeyPaths(),
+                privacyAccount.getEnclaveEncryptorType())),
+        enclaveType,
+        containerNetwork);
   }
 
-  public PrivacyNode createOnChainPrivacyGroupEnabledNode(
+  public PrivacyNode createFlexiblePrivacyGroupEnabledNode(
       final String name,
       final PrivacyAccount privacyAccount,
-      final int privacyAddress,
-      final boolean multiTenancyEnabled)
+      final boolean multiTenancyEnabled,
+      final EnclaveType enclaveType,
+      final Optional<Network> containerNetwork)
       throws IOException {
     return create(
         new PrivacyNodeConfiguration(
-            privacyAddress,
             true,
             multiTenancyEnabled,
+            false,
             new BesuNodeConfigurationBuilder()
                 .name(name)
                 .jsonRpcEnabled()
                 .keyFilePath(privacyAccount.getPrivateKeyPath())
                 .enablePrivateTransactions()
+                .plugins(Collections.singletonList("testPlugins"))
+                .extraCLIOptions(List.of("--plugin-privacy-service-genesis-enabled=true"))
                 .webSocketEnabled()
                 .build(),
-            new OrionKeyConfiguration(
-                privacyAccount.getEnclaveKeyPaths(), privacyAccount.getEnclavePrivateKeyPaths())));
+            new EnclaveKeyConfiguration(
+                privacyAccount.getEnclaveKeyPaths(),
+                privacyAccount.getEnclavePrivateKeyPaths(),
+                privacyAccount.getEnclaveEncryptorType())),
+        enclaveType,
+        containerNetwork);
   }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/ParameterizedEnclaveTestBase.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/ParameterizedEnclaveTestBase.java
new file mode 100644
index 00000000000..581fd71722d
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/ParameterizedEnclaveTestBase.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.privacy;
+
+import static org.hyperledger.enclave.testutil.EnclaveEncryptorType.EC;
+import static org.hyperledger.enclave.testutil.EnclaveEncryptorType.NACL;
+import static org.hyperledger.enclave.testutil.EnclaveType.NOOP;
+import static org.hyperledger.enclave.testutil.EnclaveType.TESSERA;
+import static org.web3j.utils.Restriction.RESTRICTED;
+import static org.web3j.utils.Restriction.UNRESTRICTED;
+
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction.PluginCreateRandomPrivacyGroupIdTransaction;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction.RestrictedCreatePrivacyGroupTransaction;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+import org.hyperledger.enclave.testutil.EnclaveType;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+import org.web3j.utils.Restriction;
+
+@RunWith(Parameterized.class)
+public abstract class ParameterizedEnclaveTestBase extends PrivacyAcceptanceTestBase {
+  protected final Restriction restriction;
+  protected final EnclaveType enclaveType;
+  protected final EnclaveEncryptorType enclaveEncryptorType;
+
+  protected ParameterizedEnclaveTestBase(
+      final Restriction restriction,
+      final EnclaveType enclaveType,
+      final EnclaveEncryptorType enclaveEncryptorType) {
+    this.restriction = restriction;
+    this.enclaveType = enclaveType;
+    this.enclaveEncryptorType = enclaveEncryptorType;
+  }
+
+  @Parameters(name = "{0} tx with {1} enclave and {2} encryptor type")
+  public static Collection<Object[]> params() {
+    return Arrays.asList(
+        new Object[][] {
+          {RESTRICTED, TESSERA, NACL},
+          {RESTRICTED, TESSERA, EC},
+          {UNRESTRICTED, NOOP, EnclaveEncryptorType.NOOP}
+        });
+  }
+
+  public Transaction<String> createPrivacyGroup(
+      final String name, final String description, final PrivacyNode... nodes) {
+
+    if (restriction == RESTRICTED) {
+      return new RestrictedCreatePrivacyGroupTransaction(name, description, nodes);
+    } else if (restriction == UNRESTRICTED) {
+      return new PluginCreateRandomPrivacyGroupIdTransaction();
+    } else {
+      throw new RuntimeException("Do not know how to handle " + restriction);
+    }
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java
index 84669b95b68..8e12cbc7a80 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java
@@ -21,7 +21,6 @@
 import org.hyperledger.besu.tests.acceptance.dsl.condition.net.NetConditions;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.priv.PrivConditions;
 import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.privacy.PrivacyNodeFactory;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccountResolver;
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.condition.PrivateContractVerifier;
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.condition.PrivateTransactionVerifier;
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.contract.PrivateContractTransactions;
@@ -40,8 +39,6 @@
 public class PrivacyAcceptanceTestBase {
   @ClassRule public static final TemporaryFolder privacy = new TemporaryFolder();
 
-  protected static final long POW_CHAIN_ID = 2018;
-
   protected final PrivacyTransactions privacyTransactions;
   protected final PrivateContractVerifier privateContractVerifier;
   protected final PrivateTransactionVerifier privateTransactionVerifier;
@@ -49,7 +46,6 @@ public class PrivacyAcceptanceTestBase {
   protected final PrivateContractTransactions privateContractTransactions;
   protected final PrivConditions priv;
   protected final PrivacyCluster privacyCluster;
-  protected final PrivacyAccountResolver privacyAccountResolver;
   protected final ContractTransactions contractTransactions;
   protected final NetConditions net;
   protected final EthTransactions ethTransactions;
@@ -65,7 +61,6 @@ public PrivacyAcceptanceTestBase() {
     privacyBesu = new PrivacyNodeFactory(vertx);
     privateContractTransactions = new PrivateContractTransactions();
     privacyCluster = new PrivacyCluster(net);
-    privacyAccountResolver = new PrivacyAccountResolver();
     priv =
         new PrivConditions(
             new org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyCluster.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyCluster.java
index f6c9bb526d0..3d1fc148059 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyCluster.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyCluster.java
@@ -15,22 +15,26 @@
 package org.hyperledger.besu.tests.acceptance.dsl.privacy;
 
 import static java.util.Collections.emptyList;
+import static java.util.function.Predicate.not;
 
 import org.hyperledger.besu.tests.acceptance.dsl.condition.net.NetConditions;
 import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNodeRunner;
 import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode;
+import org.hyperledger.enclave.testutil.EnclaveType;
+import org.hyperledger.enclave.testutil.TesseraTestHarness;
 
+import java.net.URI;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PrivacyCluster {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PrivacyCluster.class);
   private final NetConditions net;
   private final BesuNodeRunner besuNodeRunner;
 
@@ -61,11 +65,11 @@ public void startNodes(final List<PrivacyNode> nodes) {
       throw new IllegalArgumentException("Can't start a cluster with no nodes");
     }
     this.nodes = nodes;
-    this.runnableNodes = nodes.stream().map(n -> n.getBesu()).collect(Collectors.toList());
+    this.runnableNodes = nodes.stream().map(PrivacyNode::getBesu).collect(Collectors.toList());
 
     final Optional<PrivacyNode> bootNode = selectAndStartBootnode(nodes);
 
-    nodes.stream()
+    nodes.parallelStream()
         .filter(node -> bootNode.map(boot -> boot != node).orElse(true))
         .forEach(this::startNode);
   }
@@ -80,18 +84,23 @@ public void awaitPeerCount(final List<PrivacyNode> nodes) {
       node.awaitPeerDiscovery(net.awaitPeerCount(nodes.size() - 1));
     }
 
-    verifyAllOrionNetworkConnections();
+    verifyAllEnclaveNetworkConnections();
   }
 
   public List<PrivacyNode> getNodes() {
     return nodes;
   }
 
-  /** Verify that each Orion node has connected to every other Orion */
-  public void verifyAllOrionNetworkConnections() {
-    for (int i = 0; i < nodes.size() - 1; i++) {
-      nodes.get(i).testOrionConnection(nodes.subList(i + 1, nodes.size()));
-    }
+  /** Verify that each Enclave has connected to every other Enclave */
+  public void verifyAllEnclaveNetworkConnections() {
+    nodes.forEach(
+        privacyNode -> {
+          final List<PrivacyNode> otherNodes =
+              nodes.stream()
+                  .filter(not(privacyNode::equals))
+                  .collect(Collectors.toUnmodifiableList());
+          privacyNode.testEnclaveConnection(otherNodes);
+        });
   }
 
   public void stop() {
@@ -101,7 +110,7 @@ public void stop() {
   }
 
   public void stopNode(final PrivacyNode node) {
-    node.getOrion().stop();
+    node.getEnclave().stop();
     besuNodeRunner.stopNode(node.getBesu());
   }
 
@@ -145,7 +154,24 @@ private void startNode(final PrivacyNode node, final boolean isBootNode) {
         .ifPresent(node.getConfiguration()::setGenesisConfig);
 
     if (!isBootNode) {
-      node.addOtherEnclaveNode(bootNode.getOrion().nodeUrl());
+      if (bootNode.getEnclave().getEnclaveType() == EnclaveType.TESSERA) {
+        final URI otherNode = bootNode.getEnclave().nodeUrl();
+        try {
+          // Substitute IP with hostname for test container network
+          final URI otherNodeHostname =
+              new URI(
+                  otherNode.getScheme()
+                      + "://"
+                      + bootNode.getName()
+                      + ":"
+                      + TesseraTestHarness.p2pPort);
+          node.addOtherEnclaveNode(otherNodeHostname);
+        } catch (Exception ex) {
+          throw new RuntimeException("Invalid node URI");
+        }
+      } else {
+        node.addOtherEnclaveNode(bootNode.getEnclave().nodeUrl());
+      }
     }
 
     LOG.info(
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyNode.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyNode.java
index 308440f94d5..b59ac11c6cf 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyNode.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyNode.java
@@ -15,14 +15,18 @@
 package org.hyperledger.besu.tests.acceptance.dsl.privacy;
 
 import static org.hyperledger.besu.controller.BesuController.DATABASE_PATH;
+import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_BACKGROUND_THREAD_COUNT;
+import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_CACHE_CAPACITY;
+import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_IS_HIGH_SPEC;
+import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_OPEN_FILES;
 
 import org.hyperledger.besu.crypto.KeyPairUtil;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.enclave.Enclave;
 import org.hyperledger.besu.enclave.EnclaveClientException;
 import org.hyperledger.besu.enclave.EnclaveFactory;
 import org.hyperledger.besu.enclave.EnclaveIOException;
 import org.hyperledger.besu.enclave.EnclaveServerException;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivacyStorageProvider;
 import org.hyperledger.besu.ethereum.privacy.storage.keyvalue.PrivacyKeyValueStorageProviderBuilder;
@@ -41,8 +45,10 @@
 import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.privacy.PrivacyNodeConfiguration;
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.condition.PrivateCondition;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
-import org.hyperledger.orion.testutil.OrionTestHarness;
-import org.hyperledger.orion.testutil.OrionTestHarnessFactory;
+import org.hyperledger.enclave.testutil.EnclaveTestHarness;
+import org.hyperledger.enclave.testutil.EnclaveType;
+import org.hyperledger.enclave.testutil.NoopEnclaveTestHarness;
+import org.hyperledger.enclave.testutil.TesseraTestHarnessFactory;
 
 import java.io.IOException;
 import java.net.URI;
@@ -51,37 +57,43 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import io.vertx.core.Vertx;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.awaitility.Awaitility;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.Network;
 
 public class PrivacyNode implements AutoCloseable {
 
-  private static final Logger LOG = LogManager.getLogger();
-  private static final int MAX_OPEN_FILES = 1024;
-  private static final long CACHE_CAPACITY = 8388608;
-  private static final int MAX_BACKGROUND_COMPACTIONS = 4;
-  private static final int BACKGROUND_THREAD_COUNT = 4;
+  private static final Logger LOG = LoggerFactory.getLogger(PrivacyNode.class);
 
-  private final OrionTestHarness orion;
+  private final EnclaveTestHarness enclave;
   private final BesuNode besu;
   private final Vertx vertx;
-  private final boolean isOnchainPrivacyEnabled;
+  private final boolean isFlexiblePrivacyEnabled;
   private final boolean isMultitenancyEnabled;
+  private final boolean isPrivacyPluginEnabled;
 
-  public PrivacyNode(final PrivacyNodeConfiguration privacyConfiguration, final Vertx vertx)
+  public PrivacyNode(
+      final PrivacyNodeConfiguration privacyConfiguration,
+      final Vertx vertx,
+      final EnclaveType enclaveType,
+      final Optional<Network> containerNetwork)
       throws IOException {
-    final Path orionDir = Files.createTempDirectory("acctest-orion");
-    this.orion = OrionTestHarnessFactory.create(orionDir, privacyConfiguration.getOrionKeyConfig());
+    final Path enclaveDir = Files.createTempDirectory("acctest-orion");
+    final BesuNodeConfiguration config = privacyConfiguration.getBesuConfig();
+    this.enclave =
+        selectEnclave(enclaveType, enclaveDir, config, privacyConfiguration, containerNetwork);
     this.vertx = vertx;
 
-    final BesuNodeConfiguration besuConfig = privacyConfiguration.getBesuConfig();
+    final BesuNodeConfiguration besuConfig = config;
 
-    isOnchainPrivacyEnabled = privacyConfiguration.isOnchainPrivacyGroupEnabled();
+    isFlexiblePrivacyEnabled = privacyConfiguration.isFlexiblePrivacyGroupEnabled();
     isMultitenancyEnabled = privacyConfiguration.isMultitenancyEnabled();
+    isPrivacyPluginEnabled = privacyConfiguration.isPrivacyPluginEnabled();
 
     this.besu =
         new BesuNode(
@@ -89,13 +101,18 @@ public PrivacyNode(final PrivacyNodeConfiguration privacyConfiguration, final Ve
             besuConfig.getDataPath(),
             besuConfig.getMiningParameters(),
             besuConfig.getJsonRpcConfiguration(),
+            besuConfig.getEngineRpcConfiguration(),
             besuConfig.getWebSocketConfiguration(),
+            besuConfig.getJsonRpcIpcConfiguration(),
             besuConfig.getMetricsConfiguration(),
             besuConfig.getPermissioningConfiguration(),
             besuConfig.getKeyFilePath(),
             besuConfig.isDevMode(),
+            besuConfig.getNetwork(),
             besuConfig.getGenesisConfigProvider(),
             besuConfig.isP2pEnabled(),
+            besuConfig.getP2pPort(),
+            besuConfig.getTLSConfiguration(),
             besuConfig.getNetworkingConfiguration(),
             besuConfig.isDiscoveryEnabled(),
             besuConfig.isBootnodeEligible(),
@@ -107,42 +124,56 @@ public PrivacyNode(final PrivacyNodeConfiguration privacyConfiguration, final Ve
             Collections.emptyList(),
             besuConfig.isDnsEnabled(),
             besuConfig.getPrivacyParameters(),
-            List.of());
-  }
-
-  public void testOrionConnection(final List<PrivacyNode> otherNodes) {
-    LOG.info(
-        String.format(
-            "Testing Enclave connectivity between %s (%s) and %s (%s)",
-            besu.getName(),
-            orion.nodeUrl(),
-            Arrays.toString(otherNodes.stream().map(node -> node.besu.getName()).toArray()),
-            Arrays.toString(otherNodes.stream().map(node -> node.orion.nodeUrl()).toArray())));
-    final EnclaveFactory factory = new EnclaveFactory(vertx);
-    final Enclave enclaveClient = factory.createVertxEnclave(orion.clientUrl());
-    final String payload = "SGVsbG8sIFdvcmxkIQ==";
-    final List<String> to =
-        otherNodes.stream()
-            .map(node -> node.orion.getDefaultPublicKey())
-            .collect(Collectors.toList());
-
-    Awaitility.await()
-        .until(
-            () -> {
-              try {
-                enclaveClient.send(payload, orion.getDefaultPublicKey(), to);
-                return true;
-              } catch (final EnclaveClientException
-                  | EnclaveIOException
-                  | EnclaveServerException e) {
-                LOG.warn("Waiting for enclave connectivity");
-                return false;
-              }
-            });
-  }
-
-  public OrionTestHarness getOrion() {
-    return orion;
+            List.of(),
+            Optional.empty(),
+            Optional.empty(),
+            besuConfig.isStrictTxReplayProtectionEnabled(),
+            besuConfig.getEnvironment());
+  }
+
+  public void testEnclaveConnection(final List<PrivacyNode> otherNodes) {
+    if (this.isPrivacyPluginEnabled) {
+      LOG.info("Skipping test as node has no enclave (isPrivacyPluginEnabled=true)");
+      return;
+    }
+
+    if (!otherNodes.isEmpty()) {
+      LOG.debug(
+          String.format(
+              "Testing Enclave connectivity between %s (%s) and %s (%s)",
+              besu.getName(),
+              enclave.nodeUrl(),
+              Arrays.toString(otherNodes.stream().map(node -> node.besu.getName()).toArray()),
+              Arrays.toString(otherNodes.stream().map(node -> node.enclave.nodeUrl()).toArray())));
+      final EnclaveFactory factory = new EnclaveFactory(vertx);
+      final Enclave enclaveClient = factory.createVertxEnclave(enclave.clientUrl());
+      final String payload = "SGVsbG8sIFdvcmxkIQ==";
+      final List<String> to =
+          otherNodes.stream()
+              .map(node -> node.enclave.getDefaultPublicKey())
+              .collect(Collectors.toList());
+
+      Awaitility.await()
+          .until(
+              () -> {
+                try {
+                  enclaveClient.send(payload, enclave.getDefaultPublicKey(), to);
+                  return true;
+                } catch (final EnclaveClientException
+                    | EnclaveIOException
+                    | EnclaveServerException e) {
+                  LOG.warn(
+                      "Waiting for enclave connectivity between {} and {}: " + e.getMessage(),
+                      enclave.getDefaultPublicKey(),
+                      to.get(0));
+                  return false;
+                }
+              });
+    }
+  }
+
+  public EnclaveTestHarness getEnclave() {
+    return enclave;
   }
 
   public BesuNode getBesu() {
@@ -151,17 +182,17 @@ public BesuNode getBesu() {
 
   public void stop() {
     besu.stop();
-    orion.stop();
+    enclave.stop();
   }
 
   @Override
   public void close() {
     besu.close();
-    orion.close();
+    enclave.close();
   }
 
   public void start(final BesuNodeRunner runner) {
-    orion.start();
+    enclave.start();
 
     final PrivacyParameters privacyParameters;
 
@@ -169,19 +200,25 @@ public void start(final BesuNodeRunner runner) {
       final Path dataDir = Files.createTempDirectory("acctest-privacy");
       final Path dbDir = dataDir.resolve(DATABASE_PATH);
 
-      privacyParameters =
+      var builder =
           new PrivacyParameters.Builder()
               .setEnabled(true)
-              .setEnclaveUrl(orion.clientUrl())
-              .setEnclavePublicKeyUsingFile(orion.getConfig().publicKeys().get(0).toFile())
+              .setEnclaveUrl(enclave.clientUrl())
               .setStorageProvider(createKeyValueStorageProvider(dataDir, dbDir))
               .setPrivateKeyPath(KeyPairUtil.getDefaultKeyFile(besu.homeDirectory()).toPath())
               .setEnclaveFactory(new EnclaveFactory(vertx))
-              .setOnchainPrivacyGroupsEnabled(isOnchainPrivacyEnabled)
+              .setFlexiblePrivacyGroupsEnabled(isFlexiblePrivacyEnabled)
               .setMultiTenancyEnabled(isMultitenancyEnabled)
-              .build();
+              .setPrivacyPluginEnabled(isPrivacyPluginEnabled);
+
+      if (enclave.getPublicKeyPaths().size() > 0) {
+        builder.setPrivacyUserIdUsingFile(enclave.getPublicKeyPaths().get(0).toFile());
+      }
+
+      privacyParameters = builder.build();
+
     } catch (final IOException e) {
-      throw new RuntimeException();
+      throw new RuntimeException(e);
     }
     besu.setPrivacyParameters(privacyParameters);
     besu.start(runner);
@@ -216,7 +253,7 @@ public void verify(final PrivateCondition expected) {
   }
 
   public String getEnclaveKey() {
-    return orion.getDefaultPublicKey();
+    return enclave.getDefaultPublicKey();
   }
 
   public String getTransactionSigningKey() {
@@ -224,7 +261,7 @@ public String getTransactionSigningKey() {
   }
 
   public void addOtherEnclaveNode(final URI otherNode) {
-    orion.addOtherNode(otherNode);
+    enclave.addOtherNode(otherNode);
   }
 
   public NodeConfiguration getConfiguration() {
@@ -239,14 +276,32 @@ private PrivacyStorageProvider createKeyValueStorageProvider(
                 new RocksDBKeyValueStorageFactory(
                     () ->
                         new RocksDBFactoryConfiguration(
-                            MAX_OPEN_FILES,
-                            MAX_BACKGROUND_COMPACTIONS,
-                            BACKGROUND_THREAD_COUNT,
-                            CACHE_CAPACITY),
+                            DEFAULT_MAX_OPEN_FILES,
+                            DEFAULT_BACKGROUND_THREAD_COUNT,
+                            DEFAULT_CACHE_CAPACITY,
+                            DEFAULT_IS_HIGH_SPEC),
                     Arrays.asList(KeyValueSegmentIdentifier.values()),
                     RocksDBMetricsFactory.PRIVATE_ROCKS_DB_METRICS)))
         .withCommonConfiguration(new BesuConfigurationImpl(dataLocation, dbLocation))
         .withMetricsSystem(new NoOpMetricsSystem())
         .build();
   }
+
+  private EnclaveTestHarness selectEnclave(
+      final EnclaveType enclaveType,
+      final Path tempDir,
+      final BesuNodeConfiguration config,
+      final PrivacyNodeConfiguration privacyConfiguration,
+      final Optional<Network> containerNetwork) {
+
+    switch (enclaveType) {
+      case ORION:
+        throw new UnsupportedOperationException("The Orion tests are getting deprecated");
+      case TESSERA:
+        return TesseraTestHarnessFactory.create(
+            config.getName(), tempDir, privacyConfiguration.getKeyConfig(), containerNetwork);
+      default:
+        return new NoopEnclaveTestHarness(tempDir, privacyConfiguration.getKeyConfig());
+    }
+  }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivateTransactionGroupResponse.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivateTransactionGroupResponse.java
index f3a139b0ec4..3cd7ca49a49 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivateTransactionGroupResponse.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivateTransactionGroupResponse.java
@@ -21,7 +21,6 @@ public class PrivateTransactionGroupResponse {
   private final String from;
   private final String gas;
   private final String gasPrice;
-  private final String hash;
   private final String input;
   private final String nonce;
   private final String to;
@@ -52,7 +51,6 @@ public PrivateTransactionGroupResponse(
     this.from = from;
     this.gas = gas;
     this.gasPrice = gasPrice;
-    this.hash = hash;
     this.input = input;
     this.nonce = nonce;
     this.to = to;
@@ -77,10 +75,6 @@ public String getGasPrice() {
     return gasPrice;
   }
 
-  public String getHash() {
-    return hash;
-  }
-
   public String getInput() {
     return input;
   }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccount.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccount.java
index 07267342d52..c246dd585a5 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccount.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccount.java
@@ -14,6 +14,8 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl.privacy.account;
 
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+
 import java.io.File;
 import java.net.URL;
 import java.util.Arrays;
@@ -23,27 +25,38 @@ public class PrivacyAccount {
   private final URL privateKeyPath;
   private final URL[] enclaveKeyPaths;
   private final URL[] enclavePrivateKeyPaths;
+  private final EnclaveEncryptorType enclaveEncryptorType;
 
   private PrivacyAccount(
       final URL privateKeyPath,
       final URL[] enclavePublicKeyPaths,
-      final URL[] enclavePrivateKeyPaths) {
+      final URL[] enclavePrivateKeyPaths,
+      final EnclaveEncryptorType enclaveEncryptorType) {
     this.privateKeyPath = privateKeyPath;
     this.enclaveKeyPaths = enclavePublicKeyPaths;
     this.enclavePrivateKeyPaths = enclavePrivateKeyPaths;
+    this.enclaveEncryptorType = enclaveEncryptorType;
   }
 
   public static PrivacyAccount create(
-      final URL privateKeyPath, final URL enclavePublicKeyPath, final URL enclavePrivateKeyPath) {
+      final URL privateKeyPath,
+      final URL enclavePublicKeyPath,
+      final URL enclavePrivateKeyPath,
+      final EnclaveEncryptorType enclaveEncryptorType) {
     return new PrivacyAccount(
-        privateKeyPath, new URL[] {enclavePublicKeyPath}, new URL[] {enclavePrivateKeyPath});
+        privateKeyPath,
+        new URL[] {enclavePublicKeyPath},
+        new URL[] {enclavePrivateKeyPath},
+        enclaveEncryptorType);
   }
 
   public static PrivacyAccount create(
       final URL privateKeyPath,
       final URL[] enclavePublicKeyPath,
-      final URL[] enclavePrivateKeyPath) {
-    return new PrivacyAccount(privateKeyPath, enclavePublicKeyPath, enclavePrivateKeyPath);
+      final URL[] enclavePrivateKeyPath,
+      final EnclaveEncryptorType enclaveEncryptorType) {
+    return new PrivacyAccount(
+        privateKeyPath, enclavePublicKeyPath, enclavePrivateKeyPath, enclaveEncryptorType);
   }
 
   public String getPrivateKeyPath() {
@@ -62,6 +75,10 @@ public String[] getEnclavePrivateKeyPaths() {
         .toArray(String[]::new);
   }
 
+  public EnclaveEncryptorType getEnclaveEncryptorType() {
+    return enclaveEncryptorType;
+  }
+
   private String toStringResource(final URL path) {
     return path.getPath().substring(path.getPath().lastIndexOf(File.separator) + 1);
   }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccountResolver.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccountResolver.java
index c8003d6a481..7a6e26f7bce 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccountResolver.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/account/PrivacyAccountResolver.java
@@ -14,59 +14,88 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl.privacy.account;
 
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+
 import java.net.URL;
 
 /** Supplier of known funded accounts defined in dev.json */
-public class PrivacyAccountResolver {
-
-  public static final PrivacyAccount ALICE =
-      PrivacyAccount.create(
+public enum PrivacyAccountResolver {
+  ALICE {
+    @Override
+    public PrivacyAccount resolve(final EnclaveEncryptorType enclaveEncryptorType) {
+      return PrivacyAccount.create(
           resolveResource("key"),
-          resolveResource("orion_key_0.pub"),
-          resolveResource("orion_key_0.key"));
-
-  public static final PrivacyAccount BOB =
-      PrivacyAccount.create(
+          enclaveEncryptorType.equals(EnclaveEncryptorType.EC)
+              ? resolveResource("enclave_ec_key_0.pub")
+              : resolveResource("enclave_key_0.pub"),
+          enclaveEncryptorType.equals(EnclaveEncryptorType.EC)
+              ? resolveResource("enclave_ec_key_0.key")
+              : resolveResource("enclave_key_0.key"),
+          enclaveEncryptorType);
+    }
+  },
+  BOB {
+    @Override
+    public PrivacyAccount resolve(final EnclaveEncryptorType enclaveEncryptorType) {
+      return PrivacyAccount.create(
           resolveResource("key1"),
-          resolveResource("orion_key_1.pub"),
-          resolveResource("orion_key_1.key"));
-
-  public static final PrivacyAccount CHARLIE =
-      PrivacyAccount.create(
+          enclaveEncryptorType.equals(EnclaveEncryptorType.EC)
+              ? resolveResource("enclave_ec_key_1.pub")
+              : resolveResource("enclave_key_1.pub"),
+          enclaveEncryptorType.equals(EnclaveEncryptorType.EC)
+              ? resolveResource("enclave_ec_key_1.key")
+              : resolveResource("enclave_key_1.key"),
+          enclaveEncryptorType);
+    }
+  },
+  CHARLIE {
+    @Override
+    public PrivacyAccount resolve(final EnclaveEncryptorType enclaveEncryptorType) {
+      return PrivacyAccount.create(
           resolveResource("key2"),
-          resolveResource("orion_key_2.pub"),
-          resolveResource("orion_key_2.key"));
-
-  public static final PrivacyAccount MULTI_TENANCY =
-      PrivacyAccount.create(
+          enclaveEncryptorType.equals(EnclaveEncryptorType.EC)
+              ? resolveResource("enclave_ec_key_2.pub")
+              : resolveResource("enclave_key_2.pub"),
+          enclaveEncryptorType.equals(EnclaveEncryptorType.EC)
+              ? resolveResource("enclave_ec_key_2.key")
+              : resolveResource("enclave_key_2.key"),
+          enclaveEncryptorType);
+    }
+  },
+  MULTI_TENANCY {
+    @Override
+    public PrivacyAccount resolve(final EnclaveEncryptorType enclaveEncryptorType) {
+      return PrivacyAccount.create(
           resolveResource("key"),
           new URL[] {
-            resolveResource("orion_key_0.pub"),
-            resolveResource("orion_key_1.pub"),
-            resolveResource("orion_key_2.pub")
+            enclaveEncryptorType.equals(EnclaveEncryptorType.EC)
+                ? resolveResource("enclave_ec_key_0.pub")
+                : resolveResource("enclave_key_0.pub"),
+            enclaveEncryptorType.equals(EnclaveEncryptorType.EC)
+                ? resolveResource("enclave_ec_key_1.pub")
+                : resolveResource("enclave_key_1.pub"),
+            enclaveEncryptorType.equals(EnclaveEncryptorType.EC)
+                ? resolveResource("enclave_ec_key_2.pub")
+                : resolveResource("enclave_key_2.pub")
           },
           new URL[] {
-            resolveResource("orion_key_0.key"),
-            resolveResource("orion_key_1.key"),
-            resolveResource("orion_key_2.key")
-          });
-
-  private static URL resolveResource(final String resource) {
-    return PrivacyAccountResolver.class.getClassLoader().getResource(resource);
-  }
+            enclaveEncryptorType.equals(EnclaveEncryptorType.EC)
+                ? resolveResource("enclave_ec_key_0.key")
+                : resolveResource("enclave_key_0.key"),
+            enclaveEncryptorType.equals(EnclaveEncryptorType.EC)
+                ? resolveResource("enclave_ec_key_1.key")
+                : resolveResource("enclave_key_1.key"),
+            enclaveEncryptorType.equals(EnclaveEncryptorType.EC)
+                ? resolveResource("enclave_ec_key_2.key")
+                : resolveResource("enclave_key_2.key")
+          },
+          enclaveEncryptorType);
+    }
+  };
 
-  public PrivacyAccountResolver() {}
+  public abstract PrivacyAccount resolve(final EnclaveEncryptorType enclaveEncryptorType);
 
-  public PrivacyAccount resolve(final Integer account) {
-    switch (account) {
-      case 0:
-        return ALICE;
-      case 1:
-        return BOB;
-      case 2:
-        return CHARLIE;
-      default:
-        throw new RuntimeException("Unknown privacy account");
-    }
+  URL resolveResource(final String resource) {
+    return PrivacyAccountResolver.class.getClassLoader().getResource(resource);
   }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidFlexiblePrivacyGroupCreated.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidFlexiblePrivacyGroupCreated.java
new file mode 100644
index 00000000000..ce9c93d23d6
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidFlexiblePrivacyGroupCreated.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.privacy.condition;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction.PrivacyTransactions;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.PrivacyRequestFactory;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import org.awaitility.Awaitility;
+import org.web3j.utils.Base64String;
+
+public class ExpectValidFlexiblePrivacyGroupCreated implements PrivateCondition {
+
+  private final PrivacyTransactions transactions;
+  private final PrivacyRequestFactory.FlexiblePrivacyGroup expected;
+
+  public ExpectValidFlexiblePrivacyGroupCreated(
+      final PrivacyTransactions transactions,
+      final PrivacyRequestFactory.FlexiblePrivacyGroup expected) {
+    this.transactions = transactions;
+    this.expected = expected;
+  }
+
+  @Override
+  public void verify(final PrivacyNode node) {
+    Awaitility.waitAtMost(20, TimeUnit.SECONDS)
+        .untilAsserted(
+            () -> {
+              final List<PrivacyRequestFactory.FlexiblePrivacyGroup> groups =
+                  node.execute(
+                      transactions.findFlexiblePrivacyGroup(
+                          Base64String.unwrapList(expected.getMembers())));
+              assertThat(groups).contains(expected);
+            });
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidOnChainPrivacyGroupCreated.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidOnChainPrivacyGroupCreated.java
deleted file mode 100644
index 7340c49243f..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidOnChainPrivacyGroupCreated.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.privacy.condition;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction.PrivacyTransactions;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.PrivacyRequestFactory;
-
-import java.util.List;
-
-import org.awaitility.Awaitility;
-import org.web3j.utils.Base64String;
-
-public class ExpectValidOnChainPrivacyGroupCreated implements PrivateCondition {
-
-  private final PrivacyTransactions transactions;
-  private final PrivacyRequestFactory.OnChainPrivacyGroup expected;
-
-  public ExpectValidOnChainPrivacyGroupCreated(
-      final PrivacyTransactions transactions,
-      final PrivacyRequestFactory.OnChainPrivacyGroup expected) {
-    this.transactions = transactions;
-    this.expected = expected;
-  }
-
-  @Override
-  public void verify(final PrivacyNode node) {
-    Awaitility.await()
-        .untilAsserted(
-            () -> {
-              final List<PrivacyRequestFactory.OnChainPrivacyGroup> groups =
-                  node.execute(
-                      transactions.findOnChainPrivacyGroup(
-                          Base64String.unwrapList(expected.getMembers())));
-              assertThat(groups).contains(expected);
-            });
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateTransactionReceipt.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateTransactionReceipt.java
index 0c0cf98de49..ff8e0c2c5f4 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateTransactionReceipt.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateTransactionReceipt.java
@@ -25,31 +25,60 @@ public class ExpectValidPrivateTransactionReceipt implements PrivateCondition {
   private final PrivacyTransactions transactions;
   private final String transactionHash;
   private final PrivateTransactionReceipt expectedReceipt;
+  private final boolean ignoreOutput;
 
   public ExpectValidPrivateTransactionReceipt(
       final PrivacyTransactions transactions,
       final String transactionHash,
       final PrivateTransactionReceipt expectedReceipt) {
+    this(transactions, transactionHash, expectedReceipt, false);
+  }
+
+  public ExpectValidPrivateTransactionReceipt(
+      final PrivacyTransactions transactions,
+      final String transactionHash,
+      final PrivateTransactionReceipt expectedReceipt,
+      final boolean ignoreOutput) {
 
     this.transactions = transactions;
     this.transactionHash = transactionHash;
     this.expectedReceipt = expectedReceipt;
+    this.ignoreOutput = ignoreOutput;
   }
 
   @Override
   public void verify(final PrivacyNode node) {
     final PrivateTransactionReceipt actualReceipt =
         node.execute(transactions.getPrivateTransactionReceipt(transactionHash));
-    assertThat(actualReceipt)
-        .usingRecursiveComparison()
-        .ignoringFields(
-            "commitmentHash", "logs", "blockHash", "blockNumber", "logsBloom", "transactionIndex")
-        // TODO: The fields blockHash, blockNumber, logsBloom and
-        // transactionIndex have to be ignored as the class
-        // org.web3j.protocol.besu.response.privacy.PrivateTransactionReceipt does not contain these
-        // fields. Once web3j has been updated these ignores can be removed.
-        .isEqualTo(expectedReceipt);
-
+    if (ignoreOutput) {
+      // output can be ignored if it is checked separately
+      assertThat(actualReceipt)
+          .usingRecursiveComparison()
+          .ignoringFields(
+              "commitmentHash",
+              "logs",
+              "blockHash",
+              "blockNumber",
+              "logsBloom",
+              "transactionIndex",
+              "output")
+          // TODO: The fields blockHash, blockNumber, logsBloom, transactionIndex and output have to
+          // be ignored as
+          // the class org.web3j.protocol.besu.response.privacy.PrivateTransactionReceipt does not
+          // contain
+          // these fields. Once web3j has been updated these ignores can be removed.
+          .isEqualTo(expectedReceipt);
+    } else {
+      assertThat(actualReceipt)
+          .usingRecursiveComparison()
+          .ignoringFields(
+              "commitmentHash", "logs", "blockHash", "blockNumber", "logsBloom", "transactionIndex")
+          // TODO: The fields blockHash, blockNumber, logsBloom and transactionIndex have to be
+          // ignored as the class
+          // org.web3j.protocol.besu.response.privacy.PrivateTransactionReceipt does not contain
+          // these fields. Once web3j has been updated these ignores can be removed.
+          .isEqualTo(expectedReceipt);
+    }
     assertThat(actualReceipt.getLogs().size()).isEqualTo(expectedReceipt.getLogs().size());
 
     for (int i = 0; i < expectedReceipt.getLogs().size(); i++) {
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateTransactionVerifier.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateTransactionVerifier.java
index 23b67e9704d..cfd83b65821 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateTransactionVerifier.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/condition/PrivateTransactionVerifier.java
@@ -16,7 +16,7 @@
 
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction.PrivacyTransactions;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.PrivacyRequestFactory.OnChainPrivacyGroup;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.PrivacyRequestFactory.FlexiblePrivacyGroup;
 
 import java.util.Arrays;
 import java.util.List;
@@ -39,6 +39,14 @@ public ExpectValidPrivateTransactionReceipt validPrivateTransactionReceipt(
     return new ExpectValidPrivateTransactionReceipt(transactions, transactionHash, receipt);
   }
 
+  public ExpectValidPrivateTransactionReceipt validPrivateTransactionReceipt(
+      final String transactionHash,
+      final PrivateTransactionReceipt receipt,
+      final boolean ignoreOutput) {
+    return new ExpectValidPrivateTransactionReceipt(
+        transactions, transactionHash, receipt, ignoreOutput);
+  }
+
   public ExpectExistingPrivateTransactionReceipt existingPrivateTransactionReceipt(
       final String transactionHash) {
     return new ExpectExistingPrivateTransactionReceipt(transactions, transactionHash);
@@ -53,7 +61,7 @@ public ExpectValidPrivacyGroupCreated validPrivacyGroupCreated(final PrivacyGrou
     return new ExpectValidPrivacyGroupCreated(transactions, expected);
   }
 
-  public ExpectValidOnChainPrivacyGroupCreated onChainPrivacyGroupExists(
+  public ExpectValidFlexiblePrivacyGroupCreated flexiblePrivacyGroupExists(
       final String privacyGroupId, final PrivacyNode... members) {
 
     final List<Base64String> membersEnclaveKeys =
@@ -61,16 +69,16 @@ public ExpectValidOnChainPrivacyGroupCreated onChainPrivacyGroupExists(
             .map(PrivacyNode::getEnclaveKey)
             .map(Base64String::wrap)
             .collect(Collectors.toList());
-    return onChainPrivacyGroupExists(privacyGroupId, membersEnclaveKeys);
+    return flexiblePrivacyGroupExists(privacyGroupId, membersEnclaveKeys);
   }
 
-  public ExpectValidOnChainPrivacyGroupCreated onChainPrivacyGroupExists(
+  public ExpectValidFlexiblePrivacyGroupCreated flexiblePrivacyGroupExists(
       final String privacyGroupId, final List<Base64String> membersEnclaveKeys) {
 
-    final OnChainPrivacyGroup expectedGroup =
-        new OnChainPrivacyGroup(privacyGroupId, membersEnclaveKeys);
+    final FlexiblePrivacyGroup expectedGroup =
+        new FlexiblePrivacyGroup(privacyGroupId, membersEnclaveKeys);
 
-    return new ExpectValidOnChainPrivacyGroupCreated(transactions, expectedGroup);
+    return new ExpectValidFlexiblePrivacyGroupCreated(transactions, expectedGroup);
   }
 
   public ExpectInternalErrorPrivateTransactionReceipt internalErrorPrivateTransactionReceipt(
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/CallOnChainPermissioningPrivateSmartContractFunction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/CallOnChainPermissioningPrivateSmartContractFunction.java
deleted file mode 100644
index 9fe697fc66f..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/CallOnChainPermissioningPrivateSmartContractFunction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.privacy.contract;
-
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
-
-import java.io.IOException;
-import java.math.BigInteger;
-
-import org.web3j.crypto.Credentials;
-import org.web3j.protocol.besu.Besu;
-import org.web3j.tx.BesuPrivateTransactionManager;
-import org.web3j.tx.PrivateTransactionManager;
-import org.web3j.tx.gas.BesuPrivacyGasProvider;
-import org.web3j.utils.Base64String;
-
-public class CallOnChainPermissioningPrivateSmartContractFunction implements Transaction<String> {
-
-  private static final BesuPrivacyGasProvider GAS_PROVIDER =
-      new BesuPrivacyGasProvider(BigInteger.valueOf(1000));
-  private final String contractAddress;
-  private final String encodedFunction;
-  private final Credentials senderCredentials;
-  private final long chainId;
-  private final Base64String privateFrom;
-  private final Base64String privacyGroupId;
-
-  public CallOnChainPermissioningPrivateSmartContractFunction(
-      final String contractAddress,
-      final String encodedFunction,
-      final String transactionSigningKey,
-      final long chainId,
-      final String privateFrom,
-      final String privacyGroupId) {
-
-    this.contractAddress = contractAddress;
-    this.encodedFunction = encodedFunction;
-    this.senderCredentials = Credentials.create(transactionSigningKey);
-    this.chainId = chainId;
-    this.privateFrom = Base64String.wrap(privateFrom);
-    this.privacyGroupId = Base64String.wrap(privacyGroupId);
-  }
-
-  @Override
-  public String execute(final NodeRequests node) {
-    final Besu besu = node.privacy().getBesuClient();
-
-    final PrivateTransactionManager privateTransactionManager =
-        new BesuPrivateTransactionManager(
-            besu, GAS_PROVIDER, senderCredentials, chainId, privateFrom, privacyGroupId);
-
-    try {
-      return privateTransactionManager
-          .sendTransaction(
-              GAS_PROVIDER.getGasPrice(),
-              GAS_PROVIDER.getGasLimit(),
-              contractAddress,
-              encodedFunction,
-              null)
-          .getTransactionHash();
-    } catch (final IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/CallOnchainPermissioningPrivateSmartContractFunction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/CallOnchainPermissioningPrivateSmartContractFunction.java
new file mode 100644
index 00000000000..0820d65d1d5
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/CallOnchainPermissioningPrivateSmartContractFunction.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.privacy.contract;
+
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+
+import java.io.IOException;
+import java.math.BigInteger;
+
+import org.web3j.crypto.Credentials;
+import org.web3j.tx.PrivateTransactionManager;
+import org.web3j.tx.gas.BesuPrivacyGasProvider;
+import org.web3j.utils.Base64String;
+import org.web3j.utils.Restriction;
+
+public class CallOnchainPermissioningPrivateSmartContractFunction implements Transaction<String> {
+
+  private static final BesuPrivacyGasProvider GAS_PROVIDER =
+      new BesuPrivacyGasProvider(BigInteger.valueOf(1000));
+  private final String contractAddress;
+  private final String encodedFunction;
+  private final Credentials senderCredentials;
+  private final Base64String privateFrom;
+  private final Base64String privacyGroupId;
+
+  public CallOnchainPermissioningPrivateSmartContractFunction(
+      final String contractAddress,
+      final String encodedFunction,
+      final String transactionSigningKey,
+      final String privateFrom,
+      final String privacyGroupId) {
+
+    this.contractAddress = contractAddress;
+    this.encodedFunction = encodedFunction;
+    this.senderCredentials = Credentials.create(transactionSigningKey);
+    this.privateFrom = Base64String.wrap(privateFrom);
+    this.privacyGroupId = Base64String.wrap(privacyGroupId);
+  }
+
+  @Override
+  public String execute(final NodeRequests node) {
+    final PrivateTransactionManager privateTransactionManager =
+        node.privacy()
+            .getTransactionManager(
+                senderCredentials, privateFrom, privacyGroupId, Restriction.RESTRICTED);
+
+    try {
+      return privateTransactionManager
+          .sendTransaction(
+              GAS_PROVIDER.getGasPrice(),
+              GAS_PROVIDER.getGasLimit(),
+              contractAddress,
+              encodedFunction,
+              null)
+          .getTransactionHash();
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/CallPrivateSmartContractFunction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/CallPrivateSmartContractFunction.java
index cf483ccf08d..d3ec7989e5e 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/CallPrivateSmartContractFunction.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/CallPrivateSmartContractFunction.java
@@ -22,12 +22,10 @@
 import java.util.List;
 
 import org.web3j.crypto.Credentials;
-import org.web3j.protocol.besu.Besu;
-import org.web3j.tx.BesuPrivateTransactionManager;
-import org.web3j.tx.LegacyPrivateTransactionManager;
 import org.web3j.tx.PrivateTransactionManager;
 import org.web3j.tx.gas.BesuPrivacyGasProvider;
 import org.web3j.utils.Base64String;
+import org.web3j.utils.Restriction;
 
 public class CallPrivateSmartContractFunction implements Transaction<String> {
 
@@ -36,7 +34,7 @@ public class CallPrivateSmartContractFunction implements Transaction<String> {
   private final String contractAddress;
   private final String encodedFunction;
   private final Credentials senderCredentials;
-  private final long chainId;
+  private final Restriction restriction;
   private final Base64String privateFrom;
   private final List<Base64String> privateFor;
   private final Base64String privacyGroupId;
@@ -45,14 +43,14 @@ public CallPrivateSmartContractFunction(
       final String contractAddress,
       final String encodedFunction,
       final String transactionSigningKey,
-      final long chainId,
+      final Restriction restriction,
       final String privateFrom,
       final List<String> privateFor) {
     this(
         contractAddress,
         encodedFunction,
         transactionSigningKey,
-        chainId,
+        restriction,
         privateFrom,
         privateFor,
         null);
@@ -62,14 +60,14 @@ public CallPrivateSmartContractFunction(
       final String contractAddress,
       final String encodedFunction,
       final String transactionSigningKey,
-      final long chainId,
+      final Restriction restriction,
       final String privateFrom,
       final String privacyGroupId) {
     this(
         contractAddress,
         encodedFunction,
         transactionSigningKey,
-        chainId,
+        restriction,
         privateFrom,
         null,
         privacyGroupId);
@@ -79,7 +77,7 @@ private CallPrivateSmartContractFunction(
       final String contractAddress,
       final String encodedFunction,
       final String transactionSigningKey,
-      final long chainId,
+      final Restriction restriction,
       final String privateFrom,
       final List<String> privateFor,
       final String privacyGroupId) {
@@ -87,7 +85,7 @@ private CallPrivateSmartContractFunction(
     this.contractAddress = contractAddress;
     this.encodedFunction = encodedFunction;
     this.senderCredentials = Credentials.create(transactionSigningKey);
-    this.chainId = chainId;
+    this.restriction = restriction;
     this.privateFrom = Base64String.wrap(privateFrom);
     this.privateFor = privateFor != null ? Base64String.wrapList(privateFor) : null;
     this.privacyGroupId = privacyGroupId != null ? Base64String.wrap(privacyGroupId) : null;
@@ -95,17 +93,16 @@ private CallPrivateSmartContractFunction(
 
   @Override
   public String execute(final NodeRequests node) {
-    final Besu besu = node.privacy().getBesuClient();
-
     final PrivateTransactionManager privateTransactionManager;
-    if (privacyGroupId != null) {
+
+    if (privateFor != null) {
       privateTransactionManager =
-          new BesuPrivateTransactionManager(
-              besu, GAS_PROVIDER, senderCredentials, chainId, privateFrom, privacyGroupId);
+          node.privacy()
+              .getTransactionManager(senderCredentials, privateFrom, privateFor, restriction);
     } else {
       privateTransactionManager =
-          new LegacyPrivateTransactionManager(
-              besu, GAS_PROVIDER, senderCredentials, chainId, privateFrom, privateFor);
+          node.privacy()
+              .getTransactionManager(senderCredentials, privateFrom, privacyGroupId, restriction);
     }
 
     try {
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractTransaction.java
index a39c6866d7e..ed7ca9cd9af 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractTransaction.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractTransaction.java
@@ -25,12 +25,12 @@
 import org.web3j.protocol.Web3j;
 import org.web3j.protocol.core.RemoteCall;
 import org.web3j.tx.Contract;
-import org.web3j.tx.LegacyPrivateTransactionManager;
 import org.web3j.tx.PrivateTransactionManager;
 import org.web3j.tx.TransactionManager;
 import org.web3j.tx.gas.BesuPrivacyGasProvider;
 import org.web3j.tx.gas.ContractGasProvider;
 import org.web3j.utils.Base64String;
+import org.web3j.utils.Restriction;
 
 public class DeployPrivateSmartContractTransaction<T extends Contract> implements Transaction<T> {
 
@@ -40,33 +40,28 @@ public class DeployPrivateSmartContractTransaction<T extends Contract> implement
 
   private final Class<T> clazz;
   private final Credentials senderCredentials;
-  private final long chainId;
   private final Base64String privateFrom;
   private final List<Base64String> privateFor;
 
   public DeployPrivateSmartContractTransaction(
       final Class<T> clazz,
       final String transactionSigningKey,
-      final long chainId,
       final String privateFrom,
       final List<String> privateFor) {
     this.clazz = clazz;
     this.senderCredentials = Credentials.create(transactionSigningKey);
-    this.chainId = chainId;
     this.privateFrom = Base64String.wrap(privateFrom);
     this.privateFor = Base64String.wrapList(privateFor);
   }
 
   @Override
   public T execute(final NodeRequests node) {
+
     final PrivateTransactionManager privateTransactionManager =
-        new LegacyPrivateTransactionManager(
-            node.privacy().getBesuClient(),
-            GAS_PROVIDER,
-            senderCredentials,
-            chainId,
-            privateFrom,
-            privateFor);
+        node.privacy()
+            .getTransactionManager(
+                senderCredentials, privateFrom, privateFor, Restriction.RESTRICTED);
+
     try {
       final Method method =
           clazz.getMethod(
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractWithPrivacyGroupIdTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractWithPrivacyGroupIdTransaction.java
index 28771295a36..c5d0116431a 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractWithPrivacyGroupIdTransaction.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractWithPrivacyGroupIdTransaction.java
@@ -23,13 +23,13 @@
 import org.web3j.crypto.Credentials;
 import org.web3j.protocol.Web3j;
 import org.web3j.protocol.core.RemoteCall;
-import org.web3j.tx.BesuPrivateTransactionManager;
 import org.web3j.tx.Contract;
 import org.web3j.tx.PrivateTransactionManager;
 import org.web3j.tx.TransactionManager;
 import org.web3j.tx.gas.BesuPrivacyGasProvider;
 import org.web3j.tx.gas.ContractGasProvider;
 import org.web3j.utils.Base64String;
+import org.web3j.utils.Restriction;
 
 public class DeployPrivateSmartContractWithPrivacyGroupIdTransaction<T extends Contract>
     implements Transaction<T> {
@@ -40,33 +40,30 @@ public class DeployPrivateSmartContractWithPrivacyGroupIdTransaction<T extends C
 
   private final Class<T> clazz;
   private final Credentials senderCredentials;
-  private final long chainId;
+  private final Restriction restriction;
   private final Base64String privateFrom;
   private final Base64String privacyGroupId;
 
   public DeployPrivateSmartContractWithPrivacyGroupIdTransaction(
       final Class<T> clazz,
       final String transactionSigningKey,
-      final long chainId,
+      final Restriction restriction,
       final String privateFrom,
       final String privacyGroupId) {
     this.clazz = clazz;
     this.senderCredentials = Credentials.create(transactionSigningKey);
-    this.chainId = chainId;
+    this.restriction = restriction;
     this.privateFrom = Base64String.wrap(privateFrom);
     this.privacyGroupId = Base64String.wrap(privacyGroupId);
   }
 
   @Override
   public T execute(final NodeRequests node) {
+
     final PrivateTransactionManager privateTransactionManager =
-        new BesuPrivateTransactionManager(
-            node.privacy().getBesuClient(),
-            GAS_PROVIDER,
-            senderCredentials,
-            chainId,
-            privateFrom,
-            privacyGroupId);
+        node.privacy()
+            .getTransactionManager(senderCredentials, privateFrom, privacyGroupId, restriction);
+
     try {
       final Method method =
           clazz.getMethod(
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/LoadPrivateSmartContractTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/LoadPrivateSmartContractTransaction.java
index a42cb80bcdc..aac5f293f9b 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/LoadPrivateSmartContractTransaction.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/LoadPrivateSmartContractTransaction.java
@@ -24,12 +24,12 @@
 import org.web3j.crypto.Credentials;
 import org.web3j.protocol.Web3j;
 import org.web3j.tx.Contract;
-import org.web3j.tx.LegacyPrivateTransactionManager;
 import org.web3j.tx.PrivateTransactionManager;
 import org.web3j.tx.TransactionManager;
 import org.web3j.tx.gas.BesuPrivacyGasProvider;
 import org.web3j.tx.gas.ContractGasProvider;
 import org.web3j.utils.Base64String;
+import org.web3j.utils.Restriction;
 
 public class LoadPrivateSmartContractTransaction<T extends Contract> implements Transaction<T> {
   private static final BesuPrivacyGasProvider GAS_PROVIDER =
@@ -38,7 +38,6 @@ public class LoadPrivateSmartContractTransaction<T extends Contract> implements
 
   private final Class<T> clazz;
   private final Credentials senderCredentials;
-  private final long chainId;
   private final Base64String privateFrom;
   private final List<Base64String> privateFor;
   private final String contractAddress;
@@ -47,14 +46,12 @@ public LoadPrivateSmartContractTransaction(
       final String contractAddress,
       final Class<T> clazz,
       final String transactionSigningKey,
-      final long chainId,
       final String privateFrom,
       final List<String> privateFor) {
 
     this.contractAddress = contractAddress;
     this.clazz = clazz;
     this.senderCredentials = Credentials.create(transactionSigningKey);
-    this.chainId = chainId;
     this.privateFrom = Base64String.wrap(privateFrom);
     this.privateFor = Base64String.wrapList(privateFor);
   }
@@ -63,13 +60,10 @@ public LoadPrivateSmartContractTransaction(
   @Override
   public T execute(final NodeRequests node) {
     final PrivateTransactionManager privateTransactionManager =
-        new LegacyPrivateTransactionManager(
-            node.privacy().getBesuClient(),
-            GAS_PROVIDER,
-            senderCredentials,
-            chainId,
-            privateFrom,
-            privateFor);
+        node.privacy()
+            .getTransactionManager(
+                senderCredentials, privateFrom, privateFor, Restriction.RESTRICTED);
+
     try {
       final Method method =
           clazz.getMethod(
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/LoadPrivateSmartContractTransactionWithPrivacyGroupId.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/LoadPrivateSmartContractTransactionWithPrivacyGroupId.java
new file mode 100644
index 00000000000..11a5045752c
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/LoadPrivateSmartContractTransactionWithPrivacyGroupId.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.privacy.contract;
+
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+
+import java.lang.reflect.Method;
+import java.math.BigInteger;
+
+import org.web3j.crypto.Credentials;
+import org.web3j.protocol.Web3j;
+import org.web3j.tx.Contract;
+import org.web3j.tx.PrivateTransactionManager;
+import org.web3j.tx.TransactionManager;
+import org.web3j.tx.gas.BesuPrivacyGasProvider;
+import org.web3j.tx.gas.ContractGasProvider;
+import org.web3j.utils.Base64String;
+import org.web3j.utils.Restriction;
+
+public class LoadPrivateSmartContractTransactionWithPrivacyGroupId<T extends Contract>
+    implements Transaction<T> {
+
+  private static final BesuPrivacyGasProvider GAS_PROVIDER =
+      new BesuPrivacyGasProvider(BigInteger.valueOf(1000));
+  private static final Object METHOD_IS_STATIC = null;
+
+  private final Class<T> clazz;
+  private final Credentials senderCredentials;
+  private final Base64String privateFrom;
+  private final Base64String privacyGroupId;
+  private final String contractAddress;
+
+  public LoadPrivateSmartContractTransactionWithPrivacyGroupId(
+      final String contractAddress,
+      final Class<T> clazz,
+      final String transactionSigningKey,
+      final String privateFrom,
+      final String privacyGroupId) {
+
+    this.contractAddress = contractAddress;
+    this.clazz = clazz;
+    this.senderCredentials = Credentials.create(transactionSigningKey);
+    this.privateFrom = Base64String.wrap(privateFrom);
+    this.privacyGroupId = Base64String.wrap(privacyGroupId);
+  }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public T execute(final NodeRequests node) {
+    final PrivateTransactionManager privateTransactionManager =
+        node.privacy()
+            .getTransactionManager(
+                senderCredentials, privateFrom, privacyGroupId, Restriction.RESTRICTED);
+
+    try {
+      final Method method =
+          clazz.getMethod(
+              "load",
+              String.class,
+              Web3j.class,
+              TransactionManager.class,
+              ContractGasProvider.class);
+
+      return (T)
+          method.invoke(
+              METHOD_IS_STATIC,
+              contractAddress,
+              node.privacy().getBesuClient(),
+              privateTransactionManager,
+              GAS_PROVIDER);
+    } catch (final Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/PrivateContractTransactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/PrivateContractTransactions.java
index e33e048c9e1..97e7e654018 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/PrivateContractTransactions.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/contract/PrivateContractTransactions.java
@@ -18,6 +18,7 @@
 import java.util.List;
 
 import org.web3j.tx.Contract;
+import org.web3j.utils.Restriction;
 
 public class PrivateContractTransactions {
 
@@ -26,45 +27,54 @@ public class PrivateContractTransactions {
           createSmartContractWithPrivacyGroupId(
               final Class<T> clazz,
               final String transactionSigningKey,
-              final long chainId,
+              final Restriction restriction,
               final String privateFrom,
               final String privacyGroupId) {
     return new DeployPrivateSmartContractWithPrivacyGroupIdTransaction<>(
-        clazz, transactionSigningKey, chainId, privateFrom, privacyGroupId);
+        clazz, transactionSigningKey, restriction, privateFrom, privacyGroupId);
+  }
+
+  public <T extends Contract>
+      DeployPrivateSmartContractWithPrivacyGroupIdTransaction<T>
+          createSmartContractWithPrivacyGroupId(
+              final Class<T> clazz,
+              final String transactionSigningKey,
+              final String privateFrom,
+              final String privacyGroupId) {
+    return new DeployPrivateSmartContractWithPrivacyGroupIdTransaction<>(
+        clazz, transactionSigningKey, Restriction.RESTRICTED, privateFrom, privacyGroupId);
   }
 
   public <T extends Contract> DeployPrivateSmartContractTransaction<T> createSmartContract(
       final Class<T> clazz,
       final String transactionSigningKey,
-      final long chainId,
       final String privateFrom,
       final String... privateFor) {
     return createSmartContract(
-        clazz, transactionSigningKey, chainId, privateFrom, Arrays.asList(privateFor));
+        clazz, transactionSigningKey, privateFrom, Arrays.asList(privateFor));
   }
 
   public <T extends Contract> DeployPrivateSmartContractTransaction<T> createSmartContract(
       final Class<T> clazz,
       final String transactionSigningKey,
-      final long chainId,
       final String privateFrom,
       final List<String> privateFor) {
     return new DeployPrivateSmartContractTransaction<>(
-        clazz, transactionSigningKey, chainId, privateFrom, privateFor);
+        clazz, transactionSigningKey, privateFrom, privateFor);
   }
 
   public CallPrivateSmartContractFunction callSmartContract(
       final String contractAddress,
       final String encodedFunction,
       final String transactionSigningKey,
-      final long chainId,
+      final Restriction restriction,
       final String privateFrom,
       final String... privateFor) {
     return callSmartContract(
         contractAddress,
         encodedFunction,
         transactionSigningKey,
-        chainId,
+        restriction,
         privateFrom,
         Arrays.asList(privateFor));
   }
@@ -73,25 +83,30 @@ public CallPrivateSmartContractFunction callSmartContract(
       final String contractAddress,
       final String encodedFunction,
       final String transactionSigningKey,
-      final long chainId,
+      final Restriction restriction,
       final String privateFrom,
       final List<String> privateFor) {
     return new CallPrivateSmartContractFunction(
-        contractAddress, encodedFunction, transactionSigningKey, chainId, privateFrom, privateFor);
+        contractAddress,
+        encodedFunction,
+        transactionSigningKey,
+        restriction,
+        privateFrom,
+        privateFor);
   }
 
   public CallPrivateSmartContractFunction callSmartContractWithPrivacyGroupId(
       final String contractAddress,
       final String encodedFunction,
       final String transactionSigningKey,
-      final long chainId,
+      final Restriction restriction,
       final String privateFrom,
       final String privacyGroupId) {
     return new CallPrivateSmartContractFunction(
         contractAddress,
         encodedFunction,
         transactionSigningKey,
-        chainId,
+        restriction,
         privateFrom,
         privacyGroupId);
   }
@@ -100,42 +115,40 @@ public <T extends Contract> LoadPrivateSmartContractTransaction<T> loadSmartCont
       final String contractAddress,
       final Class<T> clazz,
       final String transactionSigningKey,
-      final long chainId,
       final String privateFrom,
       final String... privateFor) {
     return loadSmartContract(
-        contractAddress,
-        clazz,
-        transactionSigningKey,
-        chainId,
-        privateFrom,
-        Arrays.asList(privateFor));
+        contractAddress, clazz, transactionSigningKey, privateFrom, Arrays.asList(privateFor));
   }
 
-  private <T extends Contract> LoadPrivateSmartContractTransaction<T> loadSmartContract(
+  public <T extends Contract> LoadPrivateSmartContractTransaction<T> loadSmartContract(
       final String contractAddress,
       final Class<T> clazz,
       final String transactionSigningKey,
-      final long chainId,
       final String privateFrom,
       final List<String> privateFor) {
     return new LoadPrivateSmartContractTransaction<>(
-        contractAddress, clazz, transactionSigningKey, chainId, privateFrom, privateFor);
+        contractAddress, clazz, transactionSigningKey, privateFrom, privateFor);
   }
 
-  public CallOnChainPermissioningPrivateSmartContractFunction callOnChainPermissioningSmartContract(
+  public <T extends Contract>
+      LoadPrivateSmartContractTransactionWithPrivacyGroupId<T> loadSmartContractWithPrivacyGroupId(
+          final String contractAddress,
+          final Class<T> clazz,
+          final String transactionSigningKey,
+          final String privateFrom,
+          final String privacyGroupId) {
+    return new LoadPrivateSmartContractTransactionWithPrivacyGroupId<>(
+        contractAddress, clazz, transactionSigningKey, privateFrom, privacyGroupId);
+  }
+
+  public CallOnchainPermissioningPrivateSmartContractFunction callOnchainPermissioningSmartContract(
       final String contractAddress,
       final String encodedFunction,
       final String transactionSigningKey,
-      final long chainId,
       final String privateFrom,
       final String privacyGroupId) {
-    return new CallOnChainPermissioningPrivateSmartContractFunction(
-        contractAddress,
-        encodedFunction,
-        transactionSigningKey,
-        chainId,
-        privateFrom,
-        privacyGroupId);
+    return new CallOnchainPermissioningPrivateSmartContractFunction(
+        contractAddress, encodedFunction, transactionSigningKey, privateFrom, privacyGroupId);
   }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/AddToFlexiblePrivacyGroupTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/AddToFlexiblePrivacyGroupTransaction.java
new file mode 100644
index 00000000000..9c879bc421c
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/AddToFlexiblePrivacyGroupTransaction.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction;
+
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.web3j.crypto.Credentials;
+import org.web3j.utils.Base64String;
+
+public class AddToFlexiblePrivacyGroupTransaction implements Transaction<String> {
+  private final Base64String privacyGroupId;
+  private final PrivacyNode adder;
+  private final List<String> addresses;
+  private final Credentials signer;
+
+  public AddToFlexiblePrivacyGroupTransaction(
+      final String privacyGroupId,
+      final PrivacyNode adder,
+      final Credentials signer,
+      final PrivacyNode... nodes) {
+    this.privacyGroupId = Base64String.wrap(privacyGroupId);
+    this.adder = adder;
+    this.signer = signer;
+    this.addresses =
+        Arrays.stream(nodes)
+            .map(n -> n.getEnclave().getDefaultPublicKey())
+            .collect(Collectors.toList());
+  }
+
+  @Override
+  public String execute(final NodeRequests node) {
+    try {
+      return node.privacy().privxAddToPrivacyGroup(privacyGroupId, adder, signer, addresses);
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/AddToOnChainPrivacyGroupTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/AddToOnChainPrivacyGroupTransaction.java
deleted file mode 100644
index b802d231937..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/AddToOnChainPrivacyGroupTransaction.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction;
-
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.web3j.crypto.Credentials;
-import org.web3j.utils.Base64String;
-
-public class AddToOnChainPrivacyGroupTransaction implements Transaction<String> {
-  private final Base64String privacyGroupId;
-  private final PrivacyNode adder;
-  private final List<String> addresses;
-  private final Credentials signer;
-
-  public AddToOnChainPrivacyGroupTransaction(
-      final String privacyGroupId,
-      final PrivacyNode adder,
-      final Credentials signer,
-      final PrivacyNode... nodes) {
-    this.privacyGroupId = Base64String.wrap(privacyGroupId);
-    this.adder = adder;
-    this.signer = signer;
-    this.addresses =
-        Arrays.stream(nodes)
-            .map(n -> n.getOrion().getDefaultPublicKey())
-            .collect(Collectors.toList());
-  }
-
-  @Override
-  public String execute(final NodeRequests node) {
-    try {
-      return node.privacy().privxAddToPrivacyGroup(privacyGroupId, adder, signer, addresses);
-    } catch (final IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/CreateFlexiblePrivacyGroupTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/CreateFlexiblePrivacyGroupTransaction.java
new file mode 100644
index 00000000000..bf2814a4b15
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/CreateFlexiblePrivacyGroupTransaction.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction;
+
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.PrivacyRequestFactory.PrivxCreatePrivacyGroupResponse;
+
+import java.io.IOException;
+import java.util.List;
+
+public class CreateFlexiblePrivacyGroupTransaction
+    implements Transaction<PrivxCreatePrivacyGroupResponse> {
+  private final PrivacyNode creator;
+  private final List<String> addresses;
+  private final String privateFrom;
+
+  CreateFlexiblePrivacyGroupTransaction(
+      final PrivacyNode creator, final String privateFrom, final List<String> addresses) {
+    this.creator = creator;
+    this.addresses = addresses;
+    this.privateFrom = privateFrom;
+  }
+
+  @Override
+  public PrivxCreatePrivacyGroupResponse execute(final NodeRequests node) {
+    try {
+      return node.privacy().privxCreatePrivacyGroup(creator, privateFrom, addresses);
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/CreateOnChainPrivacyGroupTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/CreateOnChainPrivacyGroupTransaction.java
deleted file mode 100644
index 3b09d8cfe42..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/CreateOnChainPrivacyGroupTransaction.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction;
-
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.PrivacyRequestFactory.PrivxCreatePrivacyGroupResponse;
-
-import java.io.IOException;
-import java.util.List;
-
-public class CreateOnChainPrivacyGroupTransaction
-    implements Transaction<PrivxCreatePrivacyGroupResponse> {
-  private final PrivacyNode creator;
-  private final List<String> addresses;
-  private final String privateFrom;
-
-  CreateOnChainPrivacyGroupTransaction(
-      final PrivacyNode creator, final String privateFrom, final List<String> addresses) {
-    this.creator = creator;
-    this.addresses = addresses;
-    this.privateFrom = privateFrom;
-  }
-
-  @Override
-  public PrivxCreatePrivacyGroupResponse execute(final NodeRequests node) {
-    try {
-      return node.privacy().privxCreatePrivacyGroup(creator, privateFrom, addresses);
-    } catch (final IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/CreatePrivacyGroupTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/CreatePrivacyGroupTransaction.java
deleted file mode 100644
index 34118d426d8..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/CreatePrivacyGroupTransaction.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction;
-
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.web3j.protocol.besu.Besu;
-import org.web3j.protocol.besu.response.privacy.PrivCreatePrivacyGroup;
-import org.web3j.utils.Base64String;
-
-public class CreatePrivacyGroupTransaction implements Transaction<String> {
-  private final String name;
-  private final String description;
-  private final List<Base64String> addresses;
-
-  public CreatePrivacyGroupTransaction(
-      final String name, final String description, final PrivacyNode... nodes) {
-    this.name = name;
-    this.description = description;
-    this.addresses =
-        Arrays.stream(nodes)
-            .map(n -> Base64String.wrap(n.getOrion().getDefaultPublicKey()))
-            .collect(Collectors.toList());
-  }
-
-  @Override
-  public String execute(final NodeRequests node) {
-    final Besu besu = node.privacy().getBesuClient();
-    try {
-      final PrivCreatePrivacyGroup result =
-          besu.privCreatePrivacyGroup(addresses, name, description).send();
-      if (result.hasError()) {
-        throw new RuntimeException(result.getError().getMessage());
-      } else {
-        return result.getPrivacyGroupId().toString();
-      }
-    } catch (final IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/FindFlexiblePrivacyGroupTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/FindFlexiblePrivacyGroupTransaction.java
new file mode 100644
index 00000000000..0e8ac95b4f6
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/FindFlexiblePrivacyGroupTransaction.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.PrivacyRequestFactory;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.PrivacyRequestFactory.PrivxFindPrivacyGroupResponse;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.web3j.utils.Base64String;
+
+public class FindFlexiblePrivacyGroupTransaction
+    implements Transaction<List<PrivacyRequestFactory.FlexiblePrivacyGroup>> {
+  private final List<Base64String> nodes;
+
+  public FindFlexiblePrivacyGroupTransaction(final List<String> nodeEnclaveKeys) {
+    this.nodes = nodeEnclaveKeys.stream().map(Base64String::wrap).collect(Collectors.toList());
+  }
+
+  @Override
+  public List<PrivacyRequestFactory.FlexiblePrivacyGroup> execute(final NodeRequests node) {
+    try {
+      PrivxFindPrivacyGroupResponse result =
+          node.privacy().privxFindFlexiblePrivacyGroup(nodes).send();
+      assertThat(result).isNotNull();
+      if (result.hasError()) {
+        throw new RuntimeException(result.getError().getMessage());
+      }
+      return result.getGroups();
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/FindOnChainPrivacyGroupTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/FindOnChainPrivacyGroupTransaction.java
deleted file mode 100644
index 87069b111e8..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/FindOnChainPrivacyGroupTransaction.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.PrivacyRequestFactory;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.PrivacyRequestFactory.PrivxFindPrivacyGroupResponse;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.web3j.utils.Base64String;
-
-public class FindOnChainPrivacyGroupTransaction
-    implements Transaction<List<PrivacyRequestFactory.OnChainPrivacyGroup>> {
-  private final List<Base64String> nodes;
-
-  public FindOnChainPrivacyGroupTransaction(final List<String> nodeEnclaveKeys) {
-    this.nodes = nodeEnclaveKeys.stream().map(Base64String::wrap).collect(Collectors.toList());
-  }
-
-  @Override
-  public List<PrivacyRequestFactory.OnChainPrivacyGroup> execute(final NodeRequests node) {
-    try {
-      PrivxFindPrivacyGroupResponse result =
-          node.privacy().privxFindOnChainPrivacyGroup(nodes).send();
-      assertThat(result).isNotNull();
-      if (result.hasError()) {
-        throw new RuntimeException(result.getError().getMessage());
-      }
-      return result.getGroups();
-    } catch (final IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/GetAllPrivacyMarkerTransactionHashes.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/GetAllPrivacyMarkerTransactionHashes.java
deleted file mode 100644
index ef7e8d95443..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/GetAllPrivacyMarkerTransactionHashes.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.web3j.protocol.besu.Besu;
-import org.web3j.protocol.core.DefaultBlockParameter;
-import org.web3j.protocol.core.methods.response.EthBlock;
-
-public class GetAllPrivacyMarkerTransactionHashes implements Transaction<List<String>> {
-  @Override
-  public List<String> execute(final NodeRequests node) {
-    final Besu besu = node.privacy().getBesuClient();
-    final List<String> toReturn = new ArrayList<>();
-    try {
-      final long blockchainHeight = besu.ethBlockNumber().send().getBlockNumber().longValueExact();
-      for (int i = 0; i <= blockchainHeight; i++) {
-        besu.ethGetBlockByNumber(DefaultBlockParameter.valueOf(BigInteger.valueOf(i)), true)
-            .send()
-            .getBlock()
-            .getTransactions()
-            .forEach(
-                t -> {
-                  if (((EthBlock.TransactionObject) t)
-                      .getTo()
-                      .equals(Address.DEFAULT_PRIVACY.toString())) {
-                    toReturn.add(((EthBlock.TransactionObject) t).getHash());
-                  }
-                });
-      }
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-
-    return toReturn;
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/GetAllPrivateMarkerTransactionHashes.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/GetAllPrivateMarkerTransactionHashes.java
new file mode 100644
index 00000000000..d0056f50b43
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/GetAllPrivateMarkerTransactionHashes.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction;
+
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.DEFAULT_PRIVACY;
+
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.web3j.protocol.besu.Besu;
+import org.web3j.protocol.core.DefaultBlockParameter;
+import org.web3j.protocol.core.methods.response.EthBlock;
+
+public class GetAllPrivateMarkerTransactionHashes implements Transaction<List<String>> {
+  @Override
+  public List<String> execute(final NodeRequests node) {
+    final Besu besu = node.privacy().getBesuClient();
+    final List<String> toReturn = new ArrayList<>();
+    try {
+      final long blockchainHeight = besu.ethBlockNumber().send().getBlockNumber().longValueExact();
+      for (long i = 0; i <= blockchainHeight; i++) {
+        besu.ethGetBlockByNumber(DefaultBlockParameter.valueOf(BigInteger.valueOf(i)), true)
+            .send()
+            .getBlock()
+            .getTransactions()
+            .forEach(
+                t -> {
+                  if (((EthBlock.TransactionObject) t).getTo().equals(DEFAULT_PRIVACY.toString())) {
+                    toReturn.add(((EthBlock.TransactionObject) t).getHash());
+                  }
+                });
+      }
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+
+    return toReturn;
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/LockFlexiblePrivacyGroupTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/LockFlexiblePrivacyGroupTransaction.java
new file mode 100644
index 00000000000..92ed003ad43
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/LockFlexiblePrivacyGroupTransaction.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction;
+
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+
+import java.io.IOException;
+
+import org.web3j.crypto.Credentials;
+import org.web3j.protocol.exceptions.TransactionException;
+import org.web3j.utils.Base64String;
+
+public class LockFlexiblePrivacyGroupTransaction implements Transaction<String> {
+  private final Base64String privacyGroupId;
+  private final PrivacyNode locker;
+  private final Credentials signer;
+
+  public LockFlexiblePrivacyGroupTransaction(
+      final String privacyGroupId, final PrivacyNode locker, final Credentials signer) {
+    this.privacyGroupId = Base64String.wrap(privacyGroupId);
+    this.locker = locker;
+    this.signer = signer;
+  }
+
+  @Override
+  public String execute(final NodeRequests node) {
+    try {
+      return node.privacy().privxLockPrivacyGroup(locker, privacyGroupId, signer);
+    } catch (final IOException | TransactionException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/LockOnChainPrivacyGroupTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/LockOnChainPrivacyGroupTransaction.java
deleted file mode 100644
index f6e4e3b4761..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/LockOnChainPrivacyGroupTransaction.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction;
-
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
-
-import java.io.IOException;
-
-import org.web3j.crypto.Credentials;
-import org.web3j.protocol.exceptions.TransactionException;
-import org.web3j.utils.Base64String;
-
-public class LockOnChainPrivacyGroupTransaction implements Transaction<String> {
-  private final Base64String privacyGroupId;
-  private final PrivacyNode locker;
-  private final Credentials signer;
-
-  public LockOnChainPrivacyGroupTransaction(
-      final String privacyGroupId, final PrivacyNode locker, final Credentials signer) {
-    this.privacyGroupId = Base64String.wrap(privacyGroupId);
-    this.locker = locker;
-    this.signer = signer;
-  }
-
-  @Override
-  public String execute(final NodeRequests node) {
-    try {
-      return node.privacy().privxLockPrivacyGroup(locker, privacyGroupId, signer);
-    } catch (final IOException | TransactionException e) {
-      throw new RuntimeException(e);
-    }
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/PluginCreateRandomPrivacyGroupIdTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/PluginCreateRandomPrivacyGroupIdTransaction.java
new file mode 100644
index 00000000000..180764449f7
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/PluginCreateRandomPrivacyGroupIdTransaction.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction;
+
+import org.hyperledger.besu.crypto.SecureRandomProvider;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class PluginCreateRandomPrivacyGroupIdTransaction implements Transaction<String> {
+
+  @Override
+  public String execute(final NodeRequests node) {
+    final byte[] bytes = new byte[32];
+    SecureRandomProvider.createSecureRandom().nextBytes(bytes);
+    return Bytes.wrap(bytes).toBase64String();
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java
index 3015bae3ea5..3763e40bb7c 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java
@@ -14,7 +14,8 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.privacy.PrivacyGroupUtil;
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.condition.PrivGetTransactionReceiptTransaction;
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.util.LogFilterJsonParameter;
@@ -29,8 +30,12 @@
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.filter.PrivNewFilterTransaction;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.filter.PrivUninstallFilterTransaction;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
 import org.web3j.crypto.Credentials;
 import org.web3j.tx.Contract;
 
@@ -41,44 +46,49 @@ public PrivGetTransactionReceiptTransaction getPrivateTransactionReceipt(
     return new PrivGetTransactionReceiptTransaction(transactionHash);
   }
 
-  public CreatePrivacyGroupTransaction createPrivacyGroup(
+  public RestrictedCreatePrivacyGroupTransaction createPrivacyGroup(
       final String name, final String description, final PrivacyNode... nodes) {
-    return new CreatePrivacyGroupTransaction(name, description, nodes);
+    return new RestrictedCreatePrivacyGroupTransaction(name, description, nodes);
   }
 
-  public CreateOnChainPrivacyGroupTransaction createOnChainPrivacyGroup(
+  public CreateFlexiblePrivacyGroupTransaction createFlexiblePrivacyGroup(
       final PrivacyNode creator,
       final String privateFrom,
       final List<String> addresses,
       final String token) {
     creator.getBesu().useAuthenticationTokenInHeaderForJsonRpc(token);
-    return new CreateOnChainPrivacyGroupTransaction(creator, privateFrom, addresses);
+    return new CreateFlexiblePrivacyGroupTransaction(creator, privateFrom, addresses);
   }
 
-  public CreateOnChainPrivacyGroupTransaction createOnChainPrivacyGroup(
+  public CreateFlexiblePrivacyGroupTransaction createFlexiblePrivacyGroup(
       final PrivacyNode creator, final String privateFrom, final List<String> addresses) {
-    return new CreateOnChainPrivacyGroupTransaction(creator, privateFrom, addresses);
+    return new CreateFlexiblePrivacyGroupTransaction(creator, privateFrom, addresses);
   }
 
-  public AddToOnChainPrivacyGroupTransaction addToPrivacyGroup(
+  public AddToFlexiblePrivacyGroupTransaction addToPrivacyGroup(
       final String privacyGroupId,
       final PrivacyNode adder,
       final Credentials signer,
       final PrivacyNode... nodes) {
-    return new AddToOnChainPrivacyGroupTransaction(privacyGroupId, adder, signer, nodes);
+    return new AddToFlexiblePrivacyGroupTransaction(privacyGroupId, adder, signer, nodes);
   }
 
-  public LockOnChainPrivacyGroupTransaction privxLockPrivacyGroupAndCheck(
+  public LockFlexiblePrivacyGroupTransaction privxLockPrivacyGroupAndCheck(
       final String privacyGroupId, final PrivacyNode locker, final Credentials signer) {
-    return new LockOnChainPrivacyGroupTransaction(privacyGroupId, locker, signer);
+    return new LockFlexiblePrivacyGroupTransaction(privacyGroupId, locker, signer);
+  }
+
+  public UnlockFlexiblePrivacyGroupTransaction privxUnlockPrivacyGroupAndCheck(
+      final String privacyGroupId, final PrivacyNode locker, final Credentials signer) {
+    return new UnlockFlexiblePrivacyGroupTransaction(privacyGroupId, locker, signer);
   }
 
   public FindPrivacyGroupTransaction findPrivacyGroup(final List<String> nodes) {
     return new FindPrivacyGroupTransaction(nodes);
   }
 
-  public FindOnChainPrivacyGroupTransaction findOnChainPrivacyGroup(final List<String> nodes) {
-    return new FindOnChainPrivacyGroupTransaction(nodes);
+  public FindFlexiblePrivacyGroupTransaction findFlexiblePrivacyGroup(final List<String> nodes) {
+    return new FindFlexiblePrivacyGroupTransaction(nodes);
   }
 
   public PrivDistributeTransactionTransaction privDistributeTransaction(
@@ -105,12 +115,12 @@ public PrivGetLogsTransaction privGetLogs(
     return new PrivGetLogsTransaction(privacyGroupId, filterParameter);
   }
 
-  public RemoveFromOnChainPrivacyGroupTransaction removeFromPrivacyGroup(
+  public RemoveFromFlexiblePrivacyGroupTransaction removeFromPrivacyGroup(
       final String privacyGroupId,
       final String remover,
       final Credentials signer,
       final String memberToRemove) {
-    return new RemoveFromOnChainPrivacyGroupTransaction(
+    return new RemoveFromFlexiblePrivacyGroupTransaction(
         privacyGroupId, remover, signer, memberToRemove);
   }
 
@@ -142,4 +152,14 @@ public PrivDebugGetStateRoot debugGetStateRoot(
       final String privacyGroupId, final String blockParam) {
     return new PrivDebugGetStateRoot(privacyGroupId, blockParam);
   }
+
+  public String getLegacyPrivacyGroupId(final String privateFrom, final String... privateFor) {
+
+    final Bytes32 privacyGroupId =
+        PrivacyGroupUtil.calculateEeaPrivacyGroupId(
+            Bytes.fromBase64String(privateFrom),
+            Arrays.stream(privateFor).map(Bytes::fromBase64String).collect(Collectors.toList()));
+
+    return privacyGroupId.toBase64String();
+  }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/RemoveFromFlexiblePrivacyGroupTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/RemoveFromFlexiblePrivacyGroupTransaction.java
new file mode 100644
index 00000000000..7f2712c81dc
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/RemoveFromFlexiblePrivacyGroupTransaction.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction;
+
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+
+import java.io.IOException;
+
+import org.web3j.crypto.Credentials;
+import org.web3j.utils.Base64String;
+
+public class RemoveFromFlexiblePrivacyGroupTransaction implements Transaction<String> {
+  private final Base64String privacyGroupId;
+  private final String remover;
+  private final String toRemove;
+  private final Credentials signer;
+
+  public RemoveFromFlexiblePrivacyGroupTransaction(
+      final String privacyGroupId,
+      final String remover,
+      final Credentials signer,
+      final String toRemove) {
+    this.privacyGroupId = Base64String.wrap(privacyGroupId);
+    this.remover = remover;
+    this.signer = signer;
+    this.toRemove = toRemove;
+  }
+
+  @Override
+  public String execute(final NodeRequests node) {
+    try {
+      return node.privacy().privxRemoveFromPrivacyGroup(privacyGroupId, remover, signer, toRemove);
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/RemoveFromOnChainPrivacyGroupTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/RemoveFromOnChainPrivacyGroupTransaction.java
deleted file mode 100644
index 4ecb18cf2ef..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/RemoveFromOnChainPrivacyGroupTransaction.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction;
-
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
-
-import java.io.IOException;
-
-import org.web3j.crypto.Credentials;
-import org.web3j.utils.Base64String;
-
-public class RemoveFromOnChainPrivacyGroupTransaction implements Transaction<String> {
-  private final Base64String privacyGroupId;
-  private final String remover;
-  private final String toRemove;
-  private final Credentials signer;
-
-  public RemoveFromOnChainPrivacyGroupTransaction(
-      final String privacyGroupId,
-      final String remover,
-      final Credentials signer,
-      final String toRemove) {
-    this.privacyGroupId = Base64String.wrap(privacyGroupId);
-    this.remover = remover;
-    this.signer = signer;
-    this.toRemove = toRemove;
-  }
-
-  @Override
-  public String execute(final NodeRequests node) {
-    try {
-      return node.privacy().privxRemoveFromPrivacyGroup(privacyGroupId, remover, signer, toRemove);
-    } catch (final IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/RestrictedCreatePrivacyGroupTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/RestrictedCreatePrivacyGroupTransaction.java
new file mode 100644
index 00000000000..a455076f9fb
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/RestrictedCreatePrivacyGroupTransaction.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction;
+
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.web3j.protocol.besu.Besu;
+import org.web3j.protocol.besu.response.privacy.PrivCreatePrivacyGroup;
+import org.web3j.utils.Base64String;
+
+public class RestrictedCreatePrivacyGroupTransaction implements Transaction<String> {
+  private final String name;
+  private final String description;
+  private final List<Base64String> addresses;
+
+  public RestrictedCreatePrivacyGroupTransaction(
+      final String name, final String description, final PrivacyNode... nodes) {
+    this.name = name;
+    this.description = description;
+    this.addresses =
+        Arrays.stream(nodes)
+            .map(n -> Base64String.wrap(n.getEnclave().getDefaultPublicKey()))
+            .collect(Collectors.toList());
+  }
+
+  @Override
+  public String execute(final NodeRequests node) {
+    final Besu besu = node.privacy().getBesuClient();
+    try {
+      final PrivCreatePrivacyGroup result =
+          besu.privCreatePrivacyGroup(addresses, name, description).send();
+      if (result.hasError()) {
+        throw new RuntimeException(result.getError().getMessage());
+      } else {
+        return result.getPrivacyGroupId().toString();
+      }
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/UnlockFlexiblePrivacyGroupTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/UnlockFlexiblePrivacyGroupTransaction.java
new file mode 100644
index 00000000000..98b0236c32d
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/transaction/UnlockFlexiblePrivacyGroupTransaction.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction;
+
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+
+import java.io.IOException;
+
+import org.web3j.crypto.Credentials;
+import org.web3j.protocol.exceptions.TransactionException;
+import org.web3j.utils.Base64String;
+
+public class UnlockFlexiblePrivacyGroupTransaction implements Transaction<String> {
+  private final Base64String privacyGroupId;
+  private final PrivacyNode locker;
+  private final Credentials signer;
+
+  public UnlockFlexiblePrivacyGroupTransaction(
+      final String privacyGroupId, final PrivacyNode locker, final Credentials signer) {
+    this.privacyGroupId = Base64String.wrap(privacyGroupId);
+    this.locker = locker;
+    this.signer = signer;
+  }
+
+  @Override
+  public String execute(final NodeRequests node) {
+    try {
+      return node.privacy().privxUnlockPrivacyGroup(locker, privacyGroupId, signer);
+    } catch (final IOException | TransactionException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/Subscription.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/Subscription.java
index 62fa168860c..6a0a734399f 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/Subscription.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/Subscription.java
@@ -16,7 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils;
 
 import java.util.List;
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocketConnection.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocketConnection.java
index f83755cad87..9946139afbb 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocketConnection.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/pubsub/WebSocketConnection.java
@@ -25,15 +25,15 @@
 
 import io.vertx.core.Vertx;
 import io.vertx.core.http.HttpClientOptions;
-import io.vertx.core.http.RequestOptions;
 import io.vertx.core.http.WebSocket;
+import io.vertx.core.http.WebSocketConnectOptions;
 import io.vertx.core.json.DecodeException;
 import io.vertx.core.json.Json;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 
 public class WebSocketConnection {
 
-  private final RequestOptions options;
+  private final WebSocketConnectOptions options;
   private final ConcurrentLinkedDeque<SubscriptionEvent> subscriptionEvents;
 
   private volatile String error;
@@ -47,7 +47,7 @@ public WebSocketConnection(final Vertx vertx, final NodeConfiguration node) {
           "Can't start websocket connection for node with RPC disabled");
     }
     subscriptionEvents = new ConcurrentLinkedDeque<>();
-    options = new RequestOptions();
+    options = new WebSocketConnectOptions();
     options.setPort(node.getJsonRpcWebSocketPort().get());
     options.setHost(node.getHostName());
 
@@ -85,30 +85,33 @@ private JsonRpcSuccessEvent send(final String json) {
   private void connect(final Vertx vertx) {
     vertx
         .createHttpClient(new HttpClientOptions())
-        .websocket(
+        .webSocket(
             options,
             websocket -> {
-              webSocketConnection(websocket);
-
-              websocket.handler(
-                  data -> {
-                    try {
-                      final WebSocketEvent eventType = Json.decodeValue(data, WebSocketEvent.class);
-
-                      if (eventType.isSubscription()) {
-                        success(Json.decodeValue(data, SubscriptionEvent.class));
-                      } else {
-                        success(Json.decodeValue(data, JsonRpcSuccessEvent.class));
-                      }
-
-                    } catch (final DecodeException e) {
-                      error(
-                          "Data: "
-                              + data.toString()
-                              + "\nException: "
-                              + ExceptionUtils.getStackTrace(e));
-                    }
-                  });
+              webSocketConnection(websocket.result());
+
+              websocket
+                  .result()
+                  .handler(
+                      data -> {
+                        try {
+                          final WebSocketEvent eventType =
+                              Json.decodeValue(data, WebSocketEvent.class);
+
+                          if (eventType.isSubscription()) {
+                            success(Json.decodeValue(data, SubscriptionEvent.class));
+                          } else {
+                            success(Json.decodeValue(data, JsonRpcSuccessEvent.class));
+                          }
+
+                        } catch (final DecodeException e) {
+                          error(
+                              "Data: "
+                                  + data.toString()
+                                  + "\nException: "
+                                  + ExceptionUtils.getStackTrace(e));
+                        }
+                      });
             });
 
     WaitUtils.waitFor(() -> assertThat(connection).isNotNull());
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/rpc/JsonRpcTestCase.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/rpc/JsonRpcTestCase.java
new file mode 100644
index 00000000000..50dbff13f94
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/rpc/JsonRpcTestCase.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.rpc;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.JsonNode;
+
+public class JsonRpcTestCase {
+  private final JsonNode request;
+  private final JsonNode response;
+  private final int statusCode;
+
+  @JsonCreator
+  public JsonRpcTestCase(
+      @JsonProperty("request") final JsonNode request,
+      @JsonProperty("response") final JsonNode response,
+      @JsonProperty("statusCode") final int statusCode) {
+    this.request = request;
+    this.response = response;
+    this.statusCode = statusCode;
+  }
+
+  public JsonNode getRequest() {
+    return request;
+  }
+
+  public JsonNode getResponse() {
+    return response;
+  }
+
+  public int getStatusCode() {
+    return statusCode;
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/CallSmartContractFunction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/CallSmartContractFunction.java
index ec98ac22f05..77dfa99089b 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/CallSmartContractFunction.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/CallSmartContractFunction.java
@@ -29,27 +29,36 @@
 public class CallSmartContractFunction implements Transaction<EthSendTransaction> {
 
   private static final BigInteger GAS_PRICE = BigInteger.valueOf(1000);
-  private static final BigInteger GAS_LIMIT = BigInteger.valueOf(3000000);
+
   private static final Credentials BENEFACTOR_ONE =
       Credentials.create(Accounts.GENESIS_ACCOUNT_ONE_PRIVATE_KEY);
 
-  private final String functionName;
+  private BigInteger gasLimit = BigInteger.valueOf(3000000);
+  private final String functionCall;
   private final String contractAddress;
 
-  public CallSmartContractFunction(final String functionName, final String contractAddress) {
-    this.functionName = functionName;
+  public CallSmartContractFunction(final String contractAddress, final String functionName) {
+    final Function function =
+        new Function(functionName, Collections.emptyList(), Collections.emptyList());
+
     this.contractAddress = contractAddress;
+    this.functionCall = FunctionEncoder.encode(function);
+  }
+
+  public CallSmartContractFunction(
+      final String contractAddress, final String functionCall, final BigInteger gasLimit) {
+    this.contractAddress = contractAddress;
+    this.functionCall = functionCall;
+    this.gasLimit = gasLimit;
   }
 
   @Override
   public EthSendTransaction execute(final NodeRequests node) {
-    final Function function =
-        new Function(functionName, Collections.emptyList(), Collections.emptyList());
     final RawTransactionManager transactionManager =
         new RawTransactionManager(node.eth(), BENEFACTOR_ONE);
     try {
       return transactionManager.sendTransaction(
-          GAS_PRICE, GAS_LIMIT, contractAddress, FunctionEncoder.encode(function), BigInteger.ZERO);
+          GAS_PRICE, gasLimit, contractAddress, functionCall, BigInteger.ZERO);
     } catch (IOException e) {
       throw new IllegalStateException(e);
     }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/NodeRequests.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/NodeRequests.java
index 46cdf61bd01..4741e397ddc 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/NodeRequests.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/NodeRequests.java
@@ -15,8 +15,8 @@
 package org.hyperledger.besu.tests.acceptance.dsl.transaction;
 
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.admin.AdminRequestFactory;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.bft.BftRequestFactory;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.clique.CliqueRequestFactory;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2.Ibft2RequestFactory;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.login.LoginRequestFactory;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.miner.MinerRequestFactory;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.CustomRequestFactory;
@@ -33,7 +33,7 @@ public class NodeRequests {
 
   private final Web3j netEth;
   private final CliqueRequestFactory clique;
-  private final Ibft2RequestFactory ibft;
+  private final BftRequestFactory bft;
   private final PermissioningJsonRpcRequestFactory perm;
   private final AdminRequestFactory admin;
   private final PrivacyRequestFactory privacy;
@@ -46,7 +46,7 @@ public class NodeRequests {
   public NodeRequests(
       final Web3j netEth,
       final CliqueRequestFactory clique,
-      final Ibft2RequestFactory ibft,
+      final BftRequestFactory bft,
       final PermissioningJsonRpcRequestFactory perm,
       final AdminRequestFactory admin,
       final PrivacyRequestFactory privacy,
@@ -57,7 +57,7 @@ public NodeRequests(
       final LoginRequestFactory login) {
     this.netEth = netEth;
     this.clique = clique;
-    this.ibft = ibft;
+    this.bft = bft;
     this.perm = perm;
     this.admin = admin;
     this.privacy = privacy;
@@ -80,8 +80,8 @@ public CliqueRequestFactory clique() {
     return clique;
   }
 
-  public Ibft2RequestFactory ibft() {
-    return ibft;
+  public BftRequestFactory bft() {
+    return bft;
   }
 
   public PermissioningJsonRpcRequestFactory perm() {
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/SignUtil.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/SignUtil.java
new file mode 100644
index 00000000000..30a3d78fc04
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/SignUtil.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.transaction;
+
+import org.hyperledger.besu.crypto.SECPPrivateKey;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
+
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.web3j.crypto.Credentials;
+import org.web3j.crypto.RawTransaction;
+import org.web3j.crypto.Sign;
+import org.web3j.crypto.TransactionEncoder;
+import org.web3j.crypto.transaction.type.TransactionType;
+import org.web3j.rlp.RlpEncoder;
+import org.web3j.rlp.RlpList;
+import org.web3j.rlp.RlpString;
+import org.web3j.rlp.RlpType;
+import org.web3j.utils.Bytes;
+import org.web3j.utils.Numeric;
+
+public class SignUtil {
+  private static final int CHAIN_ID_INC = 35;
+  // In Ethereum transaction 27 is added to recId (v)
+  // See https://ethereum.github.io/yellowpaper/paper.pdf
+  //     Appendix F. Signing Transactions (281)
+  private static final int LOWER_REAL_V = 27;
+
+  private SignUtil() {}
+
+  public static byte[] signTransaction(
+      final RawTransaction transaction,
+      final Account sender,
+      final SignatureAlgorithm signatureAlgorithm,
+      final Optional<BigInteger> chainId) {
+    byte[] encodedTransaction = TransactionEncoder.encode(transaction);
+
+    Credentials credentials = sender.web3jCredentialsOrThrow();
+    SECPPrivateKey privateKey =
+        signatureAlgorithm.createPrivateKey(credentials.getEcKeyPair().getPrivateKey());
+
+    byte[] transactionHash = org.web3j.crypto.Hash.sha3(encodedTransaction);
+
+    SECPSignature secpSignature =
+        signatureAlgorithm.sign(
+            Bytes32.wrap(transactionHash), signatureAlgorithm.createKeyPair(privateKey));
+
+    Sign.SignatureData signature =
+        new Sign.SignatureData(
+            calculateV(secpSignature, chainId),
+            secpSignature.getR().toByteArray(),
+            secpSignature.getS().toByteArray());
+    List<RlpType> values = getTxRlpValues(transaction, signature, secpSignature);
+    RlpList rlpList = new RlpList(values);
+    byte[] encoded = RlpEncoder.encode(rlpList);
+
+    if (transaction.getType().equals(TransactionType.LEGACY)) {
+      return encoded;
+    }
+    return ByteBuffer.allocate(encoded.length + 1)
+        .put(transaction.getType().getRlpType())
+        .put(encoded)
+        .array();
+  }
+
+  private static List<RlpType> getTxRlpValues(
+      final RawTransaction transaction,
+      final Sign.SignatureData signature,
+      final SECPSignature secpSignature) {
+    final List<RlpType> values = TransactionEncoder.asRlpValues(transaction, signature);
+    if (!transaction.getType().equals(TransactionType.EIP1559)) {
+      return values;
+    }
+
+    // Fix yParityField for eip1559 txs
+    // See outstanding fix: https://github.com/web3j/web3j/pull/1587
+    final int yParityFieldIndex = values.size() - 3;
+    byte recId = secpSignature.getRecId();
+    final byte[] yParityFieldValue =
+        recId == 0 ? new byte[] {} : new byte[] {secpSignature.getRecId()};
+    final RlpType yParityRlpString = RlpString.create(Bytes.trimLeadingZeroes(yParityFieldValue));
+    values.set(yParityFieldIndex, yParityRlpString);
+    return values;
+  }
+
+  private static byte[] calculateV(
+      final SECPSignature secpSignature, final Optional<BigInteger> maybeChainId) {
+    byte recId = secpSignature.getRecId();
+    return maybeChainId
+        .map(
+            chainId -> {
+              BigInteger v = Numeric.toBigInt(new byte[] {recId});
+              v = v.add(chainId.multiply(BigInteger.valueOf(2)));
+              v = v.add(BigInteger.valueOf(CHAIN_ID_INC));
+              return v.toByteArray();
+            })
+        .orElseGet(() -> new byte[] {(byte) (recId + LOWER_REAL_V)});
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/AccountTransactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/AccountTransactions.java
index a7c689ddbda..070b74d637b 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/AccountTransactions.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/AccountTransactions.java
@@ -14,6 +14,8 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl.transaction.account;
 
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.plugin.data.TransactionType;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Accounts;
 import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Amount;
@@ -24,6 +26,7 @@
 
 public class AccountTransactions {
 
+  private static final Amount DEFAULT_GAS_PRICE = Amount.wei(BigInteger.valueOf(10000000000L));
   private final Accounts accounts;
 
   public AccountTransactions(final Accounts accounts) {
@@ -34,46 +37,87 @@ public TransferTransaction createTransfer(final Account recipient, final int amo
     return createTransfer(accounts.getPrimaryBenefactor(), recipient, amount);
   }
 
+  public TransferTransaction createTransfer(
+      final Account recipient, final int amount, final Amount gasPrice) {
+    return createFrontierBuilder(accounts.getPrimaryBenefactor(), recipient, Amount.ether(amount))
+        .gasPrice(gasPrice)
+        .build();
+  }
+
+  public TransferTransaction createTransfer(
+      final Account recipient, final int amount, final SignatureAlgorithm signatureAlgorithm) {
+    return createFrontierBuilder(accounts.getPrimaryBenefactor(), recipient, Amount.ether(amount))
+        .setSignatureAlgorithm(signatureAlgorithm)
+        .build();
+  }
+
   public TransferTransaction createTransfer(final Account recipient, final Amount amount) {
     return createTransfer(accounts.getPrimaryBenefactor(), recipient, amount);
   }
 
   public TransferTransaction createTransfer(
       final Account sender, final Account recipient, final int amount) {
-    return new TransferTransactionBuilder()
-        .sender(sender)
-        .recipient(recipient)
-        .amount(Amount.ether(amount))
-        .build();
+    return createFrontierBuilder(sender, recipient, Amount.ether(amount)).build();
   }
 
   public TransferTransaction createTransfer(
       final Account sender, final Account recipient, final Amount amount) {
-    return new TransferTransactionBuilder()
-        .sender(sender)
-        .recipient(recipient)
-        .amount(amount)
-        .build();
+    return createFrontierBuilder(sender, recipient, amount).build();
   }
 
   public TransferTransaction createTransfer(
       final Account sender, final Account recipient, final int amount, final BigInteger nonce) {
-    return new TransferTransactionBuilder()
-        .sender(sender)
-        .recipient(recipient)
-        .amount(Amount.ether(amount))
-        .nonce(nonce)
+    return createFrontierBuilder(sender, recipient, Amount.ether(amount)).nonce(nonce).build();
+  }
+
+  public TransferTransaction create1559Transfer(
+      final Account recipient, final int amount, final long chainId) {
+    return create1559Builder(
+            accounts.getPrimaryBenefactor(), recipient, Amount.ether(amount), chainId)
+        .build();
+  }
+
+  public TransferTransaction create1559Transfer(
+      final Account recipient, final int amount, final long chainId, final Amount gasPrice) {
+    return create1559Builder(
+            accounts.getPrimaryBenefactor(), recipient, Amount.ether(amount), chainId)
+        .gasPrice(gasPrice)
         .build();
   }
 
   public TransferTransactionSet createIncrementalTransfers(
       final Account sender, final Account recipient, final int etherAmount) {
+    return createIncrementalTransfers(sender, recipient, etherAmount, DEFAULT_GAS_PRICE);
+  }
+
+  public TransferTransactionSet createIncrementalTransfers(
+      final Account sender, final Account recipient, final int etherAmount, final Amount gasPrice) {
+    final List<TransferTransaction> transfers = new ArrayList<>();
+    final TransferTransactionBuilder transferOneEther =
+        createFrontierBuilder(sender, recipient, Amount.ether(1)).gasPrice(gasPrice);
+
+    for (int i = 1; i <= etherAmount; i++) {
+      transfers.add(transferOneEther.build());
+    }
+
+    return new TransferTransactionSet(transfers);
+  }
+
+  public TransferTransactionSet create1559IncrementalTransfers(
+      final Account sender, final Account recipient, final int etherAmount, final long chainId) {
+    return create1559IncrementalTransfers(
+        sender, recipient, etherAmount, chainId, DEFAULT_GAS_PRICE);
+  }
+
+  public TransferTransactionSet create1559IncrementalTransfers(
+      final Account sender,
+      final Account recipient,
+      final int etherAmount,
+      final long chainId,
+      final Amount gasPrice) {
     final List<TransferTransaction> transfers = new ArrayList<>();
     final TransferTransactionBuilder transferOneEther =
-        new TransferTransactionBuilder()
-            .sender(sender)
-            .recipient(recipient)
-            .amount(Amount.ether(1));
+        create1559Builder(sender, recipient, Amount.ether(1), chainId).gasPrice(gasPrice);
 
     for (int i = 1; i <= etherAmount; i++) {
       transfers.add(transferOneEther.build());
@@ -81,4 +125,25 @@ public TransferTransactionSet createIncrementalTransfers(
 
     return new TransferTransactionSet(transfers);
   }
+
+  private TransferTransactionBuilder createFrontierBuilder(
+      final Account sender, final Account recipient, final Amount amount) {
+    return new TransferTransactionBuilder()
+        .sender(sender)
+        .recipient(recipient)
+        .amount(amount)
+        .gasPrice(DEFAULT_GAS_PRICE)
+        .transactionType(TransactionType.FRONTIER);
+  }
+
+  private TransferTransactionBuilder create1559Builder(
+      final Account sender, final Account recipient, final Amount amount, final long chainId) {
+    return new TransferTransactionBuilder()
+        .sender(sender)
+        .recipient(recipient)
+        .amount(amount)
+        .gasPrice(DEFAULT_GAS_PRICE)
+        .chainId(chainId)
+        .transactionType(TransactionType.EIP1559);
+  }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransaction.java
index 61d3a00ae67..5a330bf27f6 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransaction.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransaction.java
@@ -14,12 +14,13 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl.transaction.account;
 
-import static org.web3j.utils.Numeric.toHexString;
-
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.plugin.data.TransactionType;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
 import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Amount;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.SignUtil;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
 
 import java.io.IOException;
@@ -28,13 +29,14 @@
 import java.util.Optional;
 
 import org.web3j.crypto.RawTransaction;
-import org.web3j.crypto.TransactionEncoder;
+import org.web3j.protocol.core.methods.response.EthSendTransaction;
 import org.web3j.utils.Convert;
 import org.web3j.utils.Convert.Unit;
+import org.web3j.utils.Numeric;
 
 public class TransferTransaction implements Transaction<Hash> {
 
-  /** Price for each for each GAS units in this transaction (wei). */
+  /** Price for each GAS units in this transaction (wei). */
   private static final BigInteger MINIMUM_GAS_PRICE = BigInteger.valueOf(1000);
 
   /** Number of GAS units that the transaction will cost. */
@@ -46,30 +48,35 @@ public class TransferTransaction implements Transaction<Hash> {
   private final Unit transferUnit;
   private final BigInteger gasPrice;
   private final BigInteger nonce;
+  private final Optional<BigInteger> chainId;
+  private final SignatureAlgorithm signatureAlgorithm;
+  private final TransactionType transactionType;
+  private byte[] signedTxData = null;
 
   public TransferTransaction(
       final Account sender,
       final Account recipient,
       final Amount transferAmount,
       final Amount gasPrice,
-      final BigInteger nonce) {
+      final BigInteger nonce,
+      final Optional<BigInteger> chainId,
+      final SignatureAlgorithm signatureAlgorithm,
+      final TransactionType transactionType) {
     this.sender = sender;
     this.recipient = recipient;
     this.transferAmount = transferAmount.getValue();
     this.transferUnit = transferAmount.getUnit();
     this.gasPrice = gasPrice == null ? MINIMUM_GAS_PRICE : convertGasPriceToWei(gasPrice);
     this.nonce = nonce;
+    this.chainId = chainId;
+    this.signatureAlgorithm = signatureAlgorithm;
+    this.transactionType = transactionType;
   }
 
   @Override
   public Hash execute(final NodeRequests node) {
     final String signedTransactionData = signedTransactionData();
-    try {
-      return Hash.fromHexString(
-          node.eth().ethSendRawTransaction(signedTransactionData).send().getTransactionHash());
-    } catch (final IOException e) {
-      throw new RuntimeException(e);
-    }
+    return sendRawTransaction(node, signedTransactionData);
   }
 
   public Amount executionCost() {
@@ -77,35 +84,68 @@ public Amount executionCost() {
   }
 
   public String signedTransactionData() {
-    final Optional<BigInteger> nonce = getNonce();
-
-    final RawTransaction transaction =
-        RawTransaction.createEtherTransaction(
-            nonce.orElse(nonce.orElseGet(sender::getNextNonce)),
-            gasPrice,
-            INTRINSIC_GAS,
-            recipient.getAddress(),
-            Convert.toWei(transferAmount, transferUnit).toBigIntegerExact());
-
-    return toHexString(
-        TransactionEncoder.signMessage(transaction, sender.web3jCredentialsOrThrow()));
+    return Numeric.toHexString(createSignedTransactionData());
   }
 
-  private Optional<BigInteger> getNonce() {
-    return nonce == null ? Optional.empty() : Optional.of(nonce);
+  public String transactionHash() {
+    final byte[] signedTx = createSignedTransactionData();
+    final byte[] txHash = org.web3j.crypto.Hash.sha3(signedTx);
+    return Numeric.toHexString(txHash);
   }
 
-  private BigInteger convertGasPriceToWei(final Amount unconverted) {
-    final BigInteger price =
-        Convert.toWei(unconverted.getValue(), unconverted.getUnit()).toBigInteger();
-
-    if (MINIMUM_GAS_PRICE.compareTo(price) > 0) {
-      throw new IllegalArgumentException(
-          String.format(
-              "Gas price: %s WEI, is below the accepted minimum: %s WEI",
-              price, MINIMUM_GAS_PRICE));
+  private byte[] createSignedTransactionData() {
+    if (signedTxData == null) {
+      signedTxData =
+          SignUtil.signTransaction(createRawTransaction(), sender, signatureAlgorithm, chainId);
+    }
+    return signedTxData;
+  }
+
+  private Hash sendRawTransaction(final NodeRequests node, final String signedTransactionData) {
+    try {
+      final EthSendTransaction transaction =
+          node.eth().ethSendRawTransaction(signedTransactionData).send();
+      if (transaction.getResult() == null && transaction.getError() != null) {
+        throw new RuntimeException(
+            "Error sending transaction: " + transaction.getError().getMessage());
+      }
+      return Hash.fromHexString(transaction.getTransactionHash());
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
     }
+  }
+
+  private BigInteger getNonce() {
+    return Optional.ofNullable(nonce).orElseGet(sender::getNextNonce);
+  }
+
+  private BigInteger convertGasPriceToWei(final Amount unconverted) {
+    return Convert.toWei(unconverted.getValue(), unconverted.getUnit()).toBigInteger();
+  }
+
+  private RawTransaction createRawTransaction() {
+    return transactionType == TransactionType.FRONTIER
+        ? createFrontierTransaction()
+        : create1559Transaction(chainId.orElseThrow());
+  }
+
+  private RawTransaction createFrontierTransaction() {
+    return RawTransaction.createEtherTransaction(
+        getNonce(),
+        gasPrice,
+        INTRINSIC_GAS,
+        recipient.getAddress(),
+        Convert.toWei(transferAmount, transferUnit).toBigIntegerExact());
+  }
 
-    return price;
+  private RawTransaction create1559Transaction(final BigInteger chainId) {
+    return RawTransaction.createEtherTransaction(
+        chainId.longValueExact(),
+        getNonce(),
+        INTRINSIC_GAS,
+        recipient.getAddress(),
+        Convert.toWei(transferAmount, transferUnit).toBigIntegerExact(),
+        BigInteger.ZERO,
+        gasPrice);
   }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionBuilder.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionBuilder.java
index bf33bb916fa..b1bb3a0ad12 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionBuilder.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionBuilder.java
@@ -14,10 +14,16 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl.transaction.account;
 
+import static org.testcontainers.shaded.com.google.common.base.Preconditions.checkNotNull;
+
+import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.plugin.data.TransactionType;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
 import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Amount;
 
 import java.math.BigInteger;
+import java.util.Optional;
 
 public class TransferTransactionBuilder {
 
@@ -26,6 +32,10 @@ public class TransferTransactionBuilder {
   private Amount transferAmount;
   private Amount gasPrice;
   private BigInteger nonce;
+  private Optional<BigInteger> chainId = Optional.empty();
+  private SignatureAlgorithm signatureAlgorithm = new SECP256K1();
+
+  private TransactionType transactionType;
 
   public TransferTransactionBuilder sender(final Account sender) {
     this.sender = sender;
@@ -54,10 +64,41 @@ public TransferTransactionBuilder gasPrice(final Amount gasPrice) {
     return this;
   }
 
+  public TransferTransactionBuilder setSignatureAlgorithm(
+      final SignatureAlgorithm signatureAlgorithm) {
+    checkNotNull(signatureAlgorithm);
+    this.signatureAlgorithm = signatureAlgorithm;
+    return this;
+  }
+
+  public TransferTransactionBuilder chainId(final BigInteger chainId) {
+    this.chainId = Optional.ofNullable(chainId);
+    return this;
+  }
+
+  public TransferTransactionBuilder chainId(final Long chainId) {
+    checkNotNull(chainId);
+    return chainId(BigInteger.valueOf(chainId));
+  }
+
+  public TransferTransactionBuilder transactionType(final TransactionType transactionType) {
+    this.transactionType = transactionType;
+    return this;
+  }
+
   public TransferTransaction build() {
     validateSender();
     validateTransferAmount();
-    return new TransferTransaction(sender, recipient, transferAmount, gasPrice, nonce);
+    validateTransactionType();
+    return new TransferTransaction(
+        sender,
+        recipient,
+        transferAmount,
+        gasPrice,
+        nonce,
+        chainId,
+        signatureAlgorithm,
+        transactionType);
   }
 
   private void validateSender() {
@@ -71,4 +112,13 @@ private void validateTransferAmount() {
       throw new IllegalArgumentException("NULL transferAmount is not allowed.");
     }
   }
+
+  private void validateTransactionType() {
+    if (transactionType == null) {
+      throw new IllegalArgumentException("NULL transactionType is not allowed.");
+    }
+    if (transactionType == TransactionType.EIP1559 && chainId.isEmpty()) {
+      throw new IllegalStateException("Chain ID must be specified for EIP-1559 transactions");
+    }
+  }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionSet.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionSet.java
index 64ab99d8829..988dcef1989 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionSet.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/account/TransferTransactionSet.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl.transaction.account;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
 
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AdminPeersTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AdminPeersTransaction.java
new file mode 100644
index 00000000000..dffd700b93b
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AdminPeersTransaction.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.tests.acceptance.dsl.transaction.admin;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.web3j.protocol.core.methods.response.admin.AdminPeers;
+
+public class AdminPeersTransaction implements Transaction<List<String>> {
+
+  public AdminPeersTransaction() {}
+
+  @Override
+  public List<String> execute(final NodeRequests node) {
+    try {
+      final AdminPeers resp = node.eth().adminPeers().send();
+      assertThat(resp).isNotNull();
+      assertThat(resp.hasError()).isFalse();
+      return resp.getResult().stream().map(AdminPeers.Peer::getId).collect(Collectors.toList());
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AdminTransactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AdminTransactions.java
index c8d73c8ea7b..c2873aca8d1 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AdminTransactions.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/admin/AdminTransactions.java
@@ -21,4 +21,8 @@ public class AdminTransactions {
   public AddPeerTransaction addPeer(final URI peer) {
     return new AddPeerTransaction(peer);
   }
+
+  public AdminPeersTransaction listPeers() {
+    return new AdminPeersTransaction();
+  }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/BftDiscard.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/BftDiscard.java
new file mode 100644
index 00000000000..bbf8a754fe9
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/BftDiscard.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.transaction.bft;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+
+import java.io.IOException;
+
+public class BftDiscard implements Transaction<Boolean> {
+  private final String address;
+
+  public BftDiscard(final String address) {
+    this.address = address;
+  }
+
+  @Override
+  public Boolean execute(final NodeRequests node) {
+    try {
+      final BftRequestFactory.DiscardResponse result = node.bft().discard(address).send();
+      assertThat(result).isNotNull();
+      assertThat(result.hasError()).isFalse();
+      return result.getResult();
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/BftGetValidators.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/BftGetValidators.java
new file mode 100644
index 00000000000..7f6cc3e1e55
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/BftGetValidators.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.transaction.bft;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+
+import java.io.IOException;
+import java.util.List;
+
+public class BftGetValidators implements Transaction<List<Address>> {
+  private final String blockNumber;
+
+  public BftGetValidators(final String blockNumber) {
+    this.blockNumber = blockNumber;
+  }
+
+  @Override
+  public List<Address> execute(final NodeRequests node) {
+    try {
+      final BftRequestFactory.SignersBlockResponse result =
+          node.bft().validatorsAtBlock(blockNumber).send();
+      assertThat(result).isNotNull();
+      assertThat(result.hasError()).isFalse();
+      return result.getResult();
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/BftGetValidatorsAtHash.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/BftGetValidatorsAtHash.java
new file mode 100644
index 00000000000..664a223b9a2
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/BftGetValidatorsAtHash.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.transaction.bft;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+
+import java.io.IOException;
+import java.util.List;
+
+public class BftGetValidatorsAtHash implements Transaction<List<Address>> {
+
+  private final Hash hash;
+
+  public BftGetValidatorsAtHash(final Hash hash) {
+    this.hash = hash;
+  }
+
+  @Override
+  public List<Address> execute(final NodeRequests node) {
+    try {
+      final BftRequestFactory.SignersBlockResponse result = node.bft().signersAtHash(hash).send();
+      assertThat(result).isNotNull();
+      assertThat(result.hasError()).isFalse();
+      return result.getResult();
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/BftProposals.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/BftProposals.java
new file mode 100644
index 00000000000..d91283c6421
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/BftProposals.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.transaction.bft;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.bft.BftRequestFactory.ProposalsResponse;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class BftProposals implements Transaction<Map<Address, Boolean>> {
+
+  @Override
+  public Map<Address, Boolean> execute(final NodeRequests node) {
+    try {
+      final ProposalsResponse result = node.bft().proposals().send();
+      assertThat(result).isNotNull();
+      assertThat(result.hasError()).isFalse();
+      return result.getResult();
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/BftPropose.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/BftPropose.java
new file mode 100644
index 00000000000..361d200e56b
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/BftPropose.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.transaction.bft;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+
+import java.io.IOException;
+
+public class BftPropose implements Transaction<Boolean> {
+  private final String address;
+  private final boolean auth;
+
+  public BftPropose(final String address, final boolean auth) {
+    this.address = address;
+    this.auth = auth;
+  }
+
+  @Override
+  public Boolean execute(final NodeRequests node) {
+    try {
+      final BftRequestFactory.ProposeResponse result = node.bft().propose(address, auth).send();
+      assertThat(result).isNotNull();
+      assertThat(result.hasError()).isFalse();
+      return result.getResult();
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/BftRequestFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/BftRequestFactory.java
new file mode 100644
index 00000000000..33e90508cb6
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/BftRequestFactory.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.transaction.bft;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import org.web3j.protocol.Web3jService;
+import org.web3j.protocol.core.Request;
+import org.web3j.protocol.core.Response;
+
+public class BftRequestFactory {
+
+  public static class ProposeResponse extends Response<Boolean> {}
+
+  public static class DiscardResponse extends Response<Boolean> {}
+
+  public static class SignersBlockResponse extends Response<List<Address>> {}
+
+  public static class ProposalsResponse extends Response<Map<Address, Boolean>> {}
+
+  private final Web3jService web3jService;
+
+  private final ConsensusType bftType;
+
+  public BftRequestFactory(final Web3jService web3jService) {
+    this(web3jService, ConsensusType.IBFT2);
+  }
+
+  public BftRequestFactory(final Web3jService web3jService, final ConsensusType bftType) {
+    this.web3jService = web3jService;
+    this.bftType = bftType;
+  }
+
+  Request<?, ProposeResponse> propose(final String address, final Boolean auth) {
+    return new Request<>(
+        bftType.getName() + "_proposeValidatorVote",
+        Arrays.asList(address, auth.toString()),
+        web3jService,
+        ProposeResponse.class);
+  }
+
+  Request<?, DiscardResponse> discard(final String address) {
+    return new Request<>(
+        bftType.getName() + "_discardValidatorVote",
+        singletonList(address),
+        web3jService,
+        DiscardResponse.class);
+  }
+
+  Request<?, ProposalsResponse> proposals() {
+    return new Request<>(
+        bftType.getName() + "_getPendingVotes", emptyList(), web3jService, ProposalsResponse.class);
+  }
+
+  Request<?, SignersBlockResponse> validatorsAtBlock(final String blockNumber) {
+    return new Request<>(
+        bftType.getName() + "_getValidatorsByBlockNumber",
+        singletonList(blockNumber),
+        web3jService,
+        SignersBlockResponse.class);
+  }
+
+  Request<?, SignersBlockResponse> signersAtHash(final Hash hash) {
+    return new Request<>(
+        bftType.getName() + "_getValidatorsByBlockHash",
+        singletonList(hash.toString()),
+        web3jService,
+        SignersBlockResponse.class);
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/BftTransactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/BftTransactions.java
new file mode 100644
index 00000000000..94c76521ac7
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/BftTransactions.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.transaction.bft;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+
+public class BftTransactions {
+  public static final String LATEST = "latest";
+
+  public BftPropose createRemoveProposal(final BesuNode node) {
+    return propose(node.getAddress().toString(), false);
+  }
+
+  public BftPropose createAddProposal(final BesuNode node) {
+    return propose(node.getAddress().toString(), true);
+  }
+
+  public BftProposals createProposals() {
+    return new BftProposals();
+  }
+
+  public BftGetValidators createGetValidators(final String blockNumber) {
+    return new BftGetValidators(blockNumber);
+  }
+
+  public BftGetValidatorsAtHash createGetValidatorsAtHash(final Hash blockHash) {
+    return new BftGetValidatorsAtHash(blockHash);
+  }
+
+  public BftDiscard createDiscardProposal(final BesuNode node) {
+    return new BftDiscard(node.getAddress().toString());
+  }
+
+  private BftPropose propose(final String address, final boolean auth) {
+    return new BftPropose(address, auth);
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/ConsensusType.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/ConsensusType.java
new file mode 100644
index 00000000000..6716947e21d
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/bft/ConsensusType.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.transaction.bft;
+
+public enum ConsensusType {
+  QBFT("qbft"),
+  IBFT2("ibft");
+
+  private final String name;
+
+  ConsensusType(final String name) {
+    this.name = name;
+  }
+
+  public String getName() {
+    return name;
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSigners.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSigners.java
index 0405ddf8bb2..481d6bd3460 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSigners.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSigners.java
@@ -16,7 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
 
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSignersAtHash.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSignersAtHash.java
index 0b719f7620c..31a1e8872cc 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSignersAtHash.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueGetSignersAtHash.java
@@ -16,8 +16,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
 
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueProposals.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueProposals.java
index 0778d166e28..634af775be9 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueProposals.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueProposals.java
@@ -16,7 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
 
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueRequestFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueRequestFactory.java
index 6a16d8ca526..a25b568eae0 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueRequestFactory.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueRequestFactory.java
@@ -17,8 +17,8 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueTransactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueTransactions.java
index e5a792c86cc..9df60f969a9 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueTransactions.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/clique/CliqueTransactions.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl.transaction.clique;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
 
 public class CliqueTransactions {
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/contract/ContractTransactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/contract/ContractTransactions.java
index 360db783e68..1597c7f269c 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/contract/ContractTransactions.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/contract/ContractTransactions.java
@@ -17,6 +17,8 @@
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.CallSmartContractFunction;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.DeploySmartContractTransaction;
 
+import java.math.BigInteger;
+
 import org.web3j.tx.Contract;
 
 public class ContractTransactions {
@@ -32,7 +34,12 @@ public <T extends Contract> DeploySmartContractTransaction<T> createSmartContrac
   }
 
   public CallSmartContractFunction callSmartContract(
-      final String functionName, final String contractAddress) {
-    return new CallSmartContractFunction(functionName, contractAddress);
+      final String contractAddress, final String functionName) {
+    return new CallSmartContractFunction(contractAddress, functionName);
+  }
+
+  public CallSmartContractFunction callSmartContract(
+      final String contractAddress, final String functionCall, final BigInteger gasLimit) {
+    return new CallSmartContractFunction(contractAddress, functionCall, gasLimit);
   }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthCallTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthCallTransaction.java
new file mode 100644
index 00000000000..28ea6a0206a
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthCallTransaction.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.transaction.eth;
+
+import static org.web3j.protocol.core.DefaultBlockParameterName.LATEST;
+import static org.web3j.tx.gas.DefaultGasProvider.GAS_LIMIT;
+
+import org.hyperledger.besu.tests.acceptance.dsl.account.Accounts;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+
+import java.io.IOException;
+import java.math.BigInteger;
+
+import org.web3j.crypto.Credentials;
+import org.web3j.protocol.core.methods.response.EthCall;
+
+public class EthCallTransaction implements Transaction<EthCall> {
+  private final String contractAddress;
+  private final String functionCall;
+  private BigInteger gasLimit = GAS_LIMIT;
+  private final String benefactorOneAddress =
+      Credentials.create(Accounts.GENESIS_ACCOUNT_ONE_PRIVATE_KEY).getAddress();
+
+  public EthCallTransaction(final String contractAddress, final String functionCall) {
+    this.contractAddress = contractAddress;
+    this.functionCall = functionCall;
+  }
+
+  public EthCallTransaction(
+      final String contractAddress, final String functionCall, final BigInteger gasLimit) {
+    this.contractAddress = contractAddress;
+    this.functionCall = functionCall;
+    this.gasLimit = gasLimit;
+  }
+
+  @Override
+  public EthCall execute(final NodeRequests node) {
+    try {
+
+      var transactionCount =
+          node.eth()
+              .ethGetTransactionCount(benefactorOneAddress, LATEST)
+              .send()
+              .getTransactionCount();
+
+      var transaction =
+          new org.web3j.protocol.core.methods.request.Transaction(
+              benefactorOneAddress,
+              transactionCount,
+              BigInteger.ZERO,
+              gasLimit,
+              contractAddress,
+              BigInteger.ZERO,
+              functionCall);
+
+      return node.eth().ethCall(transaction, LATEST).send();
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthEstimateGasTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthEstimateGasTransaction.java
new file mode 100644
index 00000000000..f89bf75c7d7
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthEstimateGasTransaction.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.transaction.eth;
+
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+
+import java.io.IOException;
+import java.math.BigInteger;
+
+import org.web3j.protocol.core.methods.response.EthEstimateGas;
+
+public class EthEstimateGasTransaction implements Transaction<EthEstimateGas> {
+  private final String contractAddress;
+  private final String functionCall;
+  private final String from = "";
+
+  public EthEstimateGasTransaction(final String contractAddress, final String functionCall) {
+    this.contractAddress = contractAddress;
+    this.functionCall = functionCall;
+  }
+
+  @Override
+  public EthEstimateGas execute(final NodeRequests node) {
+    try {
+
+      return node.eth()
+          .ethEstimateGas(
+              new org.web3j.protocol.core.methods.request.Transaction(
+                  from,
+                  BigInteger.ONE,
+                  BigInteger.ZERO,
+                  BigInteger.ZERO,
+                  contractAddress,
+                  BigInteger.ZERO,
+                  functionCall))
+          .send();
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Discard.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Discard.java
deleted file mode 100644
index f6d1bcf2994..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Discard.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
-
-import java.io.IOException;
-
-public class Ibft2Discard implements Transaction<Boolean> {
-  private final String address;
-
-  public Ibft2Discard(final String address) {
-    this.address = address;
-  }
-
-  @Override
-  public Boolean execute(final NodeRequests node) {
-    try {
-      final Ibft2RequestFactory.DiscardResponse result = node.ibft().discard(address).send();
-      assertThat(result).isNotNull();
-      assertThat(result.hasError()).isFalse();
-      return result.getResult();
-    } catch (final IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidators.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidators.java
deleted file mode 100644
index c760866c496..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidators.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
-
-import java.io.IOException;
-import java.util.List;
-
-public class Ibft2GetValidators implements Transaction<List<Address>> {
-  private final String blockNumber;
-
-  public Ibft2GetValidators(final String blockNumber) {
-    this.blockNumber = blockNumber;
-  }
-
-  @Override
-  public List<Address> execute(final NodeRequests node) {
-    try {
-      final Ibft2RequestFactory.SignersBlockResponse result =
-          node.ibft().validatorsAtBlock(blockNumber).send();
-      assertThat(result).isNotNull();
-      assertThat(result.hasError()).isFalse();
-      return result.getResult();
-    } catch (final IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidatorsAtHash.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidatorsAtHash.java
deleted file mode 100644
index 72e18dbdf14..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidatorsAtHash.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
-
-import java.io.IOException;
-import java.util.List;
-
-public class Ibft2GetValidatorsAtHash implements Transaction<List<Address>> {
-
-  private final Hash hash;
-
-  public Ibft2GetValidatorsAtHash(final Hash hash) {
-    this.hash = hash;
-  }
-
-  @Override
-  public List<Address> execute(final NodeRequests node) {
-    try {
-      final Ibft2RequestFactory.SignersBlockResponse result =
-          node.ibft().signersAtHash(hash).send();
-      assertThat(result).isNotNull();
-      assertThat(result.hasError()).isFalse();
-      return result.getResult();
-    } catch (final IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Proposals.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Proposals.java
deleted file mode 100644
index 86d596c73c3..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Proposals.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
-
-import java.io.IOException;
-import java.util.Map;
-
-public class Ibft2Proposals implements Transaction<Map<Address, Boolean>> {
-
-  @Override
-  public Map<Address, Boolean> execute(final NodeRequests node) {
-    try {
-      final Ibft2RequestFactory.ProposalsResponse result = node.ibft().proposals().send();
-      assertThat(result).isNotNull();
-      assertThat(result.hasError()).isFalse();
-      return result.getResult();
-    } catch (final IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Propose.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Propose.java
deleted file mode 100644
index fad32a47c12..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Propose.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
-
-import java.io.IOException;
-
-public class Ibft2Propose implements Transaction<Boolean> {
-  private final String address;
-  private final boolean auth;
-
-  public Ibft2Propose(final String address, final boolean auth) {
-    this.address = address;
-    this.auth = auth;
-  }
-
-  @Override
-  public Boolean execute(final NodeRequests node) {
-    try {
-      final Ibft2RequestFactory.ProposeResponse result = node.ibft().propose(address, auth).send();
-      assertThat(result).isNotNull();
-      assertThat(result.hasError()).isFalse();
-      return result.getResult();
-    } catch (final IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2RequestFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2RequestFactory.java
deleted file mode 100644
index ac1de61844a..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2RequestFactory.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2;
-
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import org.web3j.protocol.Web3jService;
-import org.web3j.protocol.core.Request;
-import org.web3j.protocol.core.Response;
-
-public class Ibft2RequestFactory {
-
-  public static class ProposeResponse extends Response<Boolean> {}
-
-  public static class DiscardResponse extends Response<Boolean> {}
-
-  public static class SignersBlockResponse extends Response<List<Address>> {}
-
-  public static class ProposalsResponse extends Response<Map<Address, Boolean>> {}
-
-  private final Web3jService web3jService;
-
-  public Ibft2RequestFactory(final Web3jService web3jService) {
-    this.web3jService = web3jService;
-  }
-
-  Request<?, ProposeResponse> propose(final String address, final Boolean auth) {
-    return new Request<>(
-        "ibft_proposeValidatorVote",
-        Arrays.asList(address, auth.toString()),
-        web3jService,
-        ProposeResponse.class);
-  }
-
-  Request<?, DiscardResponse> discard(final String address) {
-    return new Request<>(
-        "ibft_discardValidatorVote", singletonList(address), web3jService, DiscardResponse.class);
-  }
-
-  Request<?, ProposalsResponse> proposals() {
-    return new Request<>(
-        "ibft_getPendingVotes", emptyList(), web3jService, ProposalsResponse.class);
-  }
-
-  Request<?, SignersBlockResponse> validatorsAtBlock(final String blockNumber) {
-    return new Request<>(
-        "ibft_getValidatorsByBlockNumber",
-        singletonList(blockNumber),
-        web3jService,
-        SignersBlockResponse.class);
-  }
-
-  Request<?, SignersBlockResponse> signersAtHash(final Hash hash) {
-    return new Request<>(
-        "ibft_getValidatorsByBlockHash",
-        singletonList(hash.toString()),
-        web3jService,
-        SignersBlockResponse.class);
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Transactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Transactions.java
deleted file mode 100644
index 7913c7e8d43..00000000000
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/ibft2/Ibft2Transactions.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.dsl.transaction.ibft2;
-
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
-
-public class Ibft2Transactions {
-  public static final String LATEST = "latest";
-
-  public Ibft2Propose createRemoveProposal(final BesuNode node) {
-    return propose(node.getAddress().toString(), false);
-  }
-
-  public Ibft2Propose createAddProposal(final BesuNode node) {
-    return propose(node.getAddress().toString(), true);
-  }
-
-  public Ibft2Proposals createProposals() {
-    return new Ibft2Proposals();
-  }
-
-  public Ibft2GetValidators createGetValidators(final String blockNumber) {
-    return new Ibft2GetValidators(blockNumber);
-  }
-
-  public Ibft2GetValidatorsAtHash createGetValidatorsAtHash(final Hash blockHash) {
-    return new Ibft2GetValidatorsAtHash(blockHash);
-  }
-
-  public Ibft2Discard createDiscardProposal(final BesuNode node) {
-    return new Ibft2Discard(node.getAddress().toString());
-  }
-
-  private Ibft2Propose propose(final String address, final boolean auth) {
-    return new Ibft2Propose(address, auth);
-  }
-}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginRequestFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginRequestFactory.java
index 45904009c5f..b0a0f921964 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginRequestFactory.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/login/LoginRequestFactory.java
@@ -74,7 +74,7 @@ String send(final String username, final String password) throws IOException {
   private Request loginRequest(final String username, final String password) {
     final RequestBody requestBody =
         RequestBody.create(
-            JSON, String.format("{\"username\":\"%s\",\"password\":\"%s\"}", username, password));
+            String.format("{\"username\":\"%s\",\"password\":\"%s\"}", username, password), JSON);
     return new Request.Builder().post(requestBody).url(loginUri()).build();
   }
 
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningAllowAccountTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningAllowAccountTransaction.java
index 26e48c18139..7b0f83b486e 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningAllowAccountTransaction.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningAllowAccountTransaction.java
@@ -17,8 +17,8 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.web3j.utils.Numeric.toHexString;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningForbidAccountTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningForbidAccountTransaction.java
index 964ae88e1c4..2856ec396dc 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningForbidAccountTransaction.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningForbidAccountTransaction.java
@@ -17,8 +17,8 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.web3j.utils.Numeric.toHexString;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningIsAllowedTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningIsAllowedTransaction.java
index 7ffb8c63952..6faa72cb0e6 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningIsAllowedTransaction.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningIsAllowedTransaction.java
@@ -17,7 +17,7 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import org.hyperledger.besu.crypto.Hash;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
 
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningTransactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningTransactions.java
index ffdd1276f17..86dbd900b3d 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningTransactions.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningTransactions.java
@@ -14,8 +14,8 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Accounts;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeByURLV2Transaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeByURLV2Transaction.java
new file mode 100644
index 00000000000..6cfd2af9501
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeByURLV2Transaction.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm;
+
+import static org.web3j.utils.Numeric.toHexString;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.plugin.data.EnodeURL;
+import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.web3j.abi.FunctionEncoder;
+import org.web3j.abi.datatypes.Function;
+import org.web3j.crypto.RawTransaction;
+import org.web3j.crypto.TransactionEncoder;
+
+public class NodeSmartContractPermissioningAllowNodeByURLV2Transaction
+    implements Transaction<Hash> {
+
+  private final Account sender;
+  private final Address contractAddress;
+  private final EnodeURL enodeUrl;
+
+  public NodeSmartContractPermissioningAllowNodeByURLV2Transaction(
+      final Account sender, final Address contractAddress, final EnodeURL enodeUrl) {
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.enodeUrl = enodeUrl;
+  }
+
+  @Override
+  public Hash execute(final NodeRequests node) {
+    final String signedTransactionData = signedTransactionData();
+    try {
+      String hash =
+          node.eth().ethSendRawTransaction(signedTransactionData).send().getTransactionHash();
+      return Hash.fromHexString(hash);
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private String signedTransactionData() {
+    final Bytes payload = createPayload(enodeUrl);
+
+    RawTransaction transaction =
+        RawTransaction.createTransaction(
+            sender.getNextNonce(),
+            BigInteger.valueOf(1_000L),
+            BigInteger.valueOf(3_000_000L),
+            contractAddress.toString(),
+            payload.toString());
+
+    return toHexString(
+        TransactionEncoder.signMessage(transaction, sender.web3jCredentialsOrThrow()));
+  }
+
+  private Bytes createPayload(final EnodeURL enodeUrl) {
+    try {
+      final String hexNodeIdString = enodeUrl.getNodeId().toUnprefixedHexString();
+      final String address = enodeUrl.toURI().getHost();
+      final int port = enodeUrl.getListeningPortOrZero();
+
+      final Function addNodeFunction =
+          FunctionEncoder.makeFunction(
+              "addEnode",
+              List.of("string", "string", "uint16"),
+              List.of(hexNodeIdString, address, port),
+              Collections.emptyList());
+      return Bytes.fromHexString(FunctionEncoder.encode(addNodeFunction));
+    } catch (Exception e) {
+      throw new RuntimeException("Error adding node to allowlist", e);
+    }
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeTransaction.java
index d1b672abcd6..2579dc11462 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeTransaction.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeTransaction.java
@@ -17,9 +17,9 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.web3j.utils.Numeric.toHexString;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.permissioning.NodeSmartContractPermissioningController;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
@@ -68,7 +68,7 @@ private String signedTransactionData() {
     final String enodeURL = ((RunnableNode) node).enodeUrl().toASCIIString();
     final Bytes payload =
         NodeSmartContractPermissioningController.createPayload(
-            ADD_ENODE_SIGNATURE, EnodeURL.fromString(enodeURL));
+            ADD_ENODE_SIGNATURE, EnodeURLImpl.fromString(enodeURL));
 
     RawTransaction transaction =
         RawTransaction.createTransaction(
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeV2Transaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeV2Transaction.java
index da4892a1558..6cfee3f10d4 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeV2Transaction.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeV2Transaction.java
@@ -16,9 +16,10 @@
 
 import static org.web3j.utils.Numeric.toHexString;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
 import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode;
@@ -62,7 +63,7 @@ public Hash execute(final NodeRequests node) {
   }
 
   private String signedTransactionData() {
-    final EnodeURL enodeURL = EnodeURL.fromURI(((RunnableNode) node).enodeUrl());
+    final EnodeURL enodeURL = EnodeURLImpl.fromURI(((RunnableNode) node).enodeUrl());
     final Bytes payload = createPayload(enodeURL);
 
     RawTransaction transaction =
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedByURLV2Transaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedByURLV2Transaction.java
new file mode 100644
index 00000000000..af6d753d0aa
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedByURLV2Transaction.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.permissioning.NodeSmartContractV2PermissioningController;
+import org.hyperledger.besu.plugin.data.EnodeURL;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.web3j.abi.FunctionEncoder;
+import org.web3j.abi.datatypes.Function;
+import org.web3j.protocol.core.DefaultBlockParameterName;
+
+public class NodeSmartContractPermissioningConnectionIsAllowedByURLV2Transaction
+    implements Transaction<Boolean> {
+
+  private final Address contractAddress;
+  private final EnodeURL enodeUrl;
+
+  public NodeSmartContractPermissioningConnectionIsAllowedByURLV2Transaction(
+      final Address contractAddress, final EnodeURL enodeUrl) {
+    this.contractAddress = contractAddress;
+    this.enodeUrl = enodeUrl;
+  }
+
+  @Override
+  public Boolean execute(final NodeRequests node) {
+    try {
+      final String value =
+          node.eth().ethCall(payload(), DefaultBlockParameterName.LATEST).send().getValue();
+      return Bytes.fromHexString(value)
+          .equals(NodeSmartContractV2PermissioningController.TRUE_RESPONSE);
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private org.web3j.protocol.core.methods.request.Transaction payload() {
+    final Bytes payload = createPayload(this.enodeUrl);
+
+    return org.web3j.protocol.core.methods.request.Transaction.createFunctionCallTransaction(
+        null, null, null, null, contractAddress.toString(), payload.toString());
+  }
+
+  private Bytes createPayload(final EnodeURL enodeUrl) {
+    try {
+      final String hexNodeIdString = enodeUrl.getNodeId().toUnprefixedHexString();
+      final String address = enodeUrl.toURI().getHost();
+      final int port = enodeUrl.getListeningPortOrZero();
+
+      final Function connectionAllowedFunction =
+          FunctionEncoder.makeFunction(
+              "connectionAllowed",
+              List.of("string", "string", "uint16"),
+              List.of(hexNodeIdString, address, port),
+              Collections.emptyList());
+      return Bytes.fromHexString(FunctionEncoder.encode(connectionAllowedFunction));
+    } catch (Exception e) {
+      throw new RuntimeException("Error calling connectionAllowed", e);
+    }
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedTransaction.java
index 13b32be019b..80b08e95483 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedTransaction.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedTransaction.java
@@ -18,8 +18,8 @@
 import static org.hyperledger.besu.ethereum.permissioning.NodeSmartContractPermissioningController.checkTransactionResult;
 
 import org.hyperledger.besu.crypto.Hash;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.permissioning.NodeSmartContractPermissioningController;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
 import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode;
@@ -69,8 +69,8 @@ private org.web3j.protocol.core.methods.request.Transaction payload() {
     final Bytes payload =
         NodeSmartContractPermissioningController.createPayload(
             IS_CONNECTION_ALLOWED_SIGNATURE,
-            EnodeURL.fromString(sourceEnodeURL),
-            EnodeURL.fromString(targetEnodeURL));
+            EnodeURLImpl.fromString(sourceEnodeURL),
+            EnodeURLImpl.fromString(targetEnodeURL));
 
     return org.web3j.protocol.core.methods.request.Transaction.createFunctionCallTransaction(
         null, null, null, null, contractAddress.toString(), payload.toString());
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedV2Transaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedV2Transaction.java
index 3127a0373d3..1eeadb52a46 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedV2Transaction.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedV2Transaction.java
@@ -14,9 +14,10 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.permissioning.NodeSmartContractV2PermissioningController;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
 import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
@@ -56,7 +57,7 @@ public Boolean execute(final NodeRequests node) {
   }
 
   private org.web3j.protocol.core.methods.request.Transaction payload() {
-    final EnodeURL enodeURL = EnodeURL.fromURI(((RunnableNode) node).enodeUrl());
+    final EnodeURL enodeURL = EnodeURLImpl.fromURI(((RunnableNode) node).enodeUrl());
     final Bytes payload = createPayload(enodeURL);
 
     return org.web3j.protocol.core.methods.request.Transaction.createFunctionCallTransaction(
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeByURLV2Transaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeByURLV2Transaction.java
new file mode 100644
index 00000000000..d36f6b69975
--- /dev/null
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeByURLV2Transaction.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm;
+
+import static org.web3j.utils.Numeric.toHexString;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.plugin.data.EnodeURL;
+import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.web3j.abi.FunctionEncoder;
+import org.web3j.abi.datatypes.Function;
+import org.web3j.crypto.RawTransaction;
+import org.web3j.crypto.TransactionEncoder;
+
+public class NodeSmartContractPermissioningForbidNodeByURLV2Transaction
+    implements Transaction<Hash> {
+
+  private final Account sender;
+  private final Address contractAddress;
+  private final EnodeURL enodeUrl;
+
+  public NodeSmartContractPermissioningForbidNodeByURLV2Transaction(
+      final Account sender, final Address contractAddress, final EnodeURL enodeUrl) {
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.enodeUrl = enodeUrl;
+  }
+
+  @Override
+  public Hash execute(final NodeRequests node) {
+    final String signedTransactionData = signedTransactionData();
+    try {
+      String hash =
+          node.eth().ethSendRawTransaction(signedTransactionData).send().getTransactionHash();
+      return Hash.fromHexString(hash);
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private String signedTransactionData() {
+    final Bytes payload = createPayload(this.enodeUrl);
+
+    RawTransaction transaction =
+        RawTransaction.createTransaction(
+            sender.getNextNonce(),
+            BigInteger.valueOf(1000),
+            BigInteger.valueOf(3_000_000L),
+            contractAddress.toString(),
+            payload.toString());
+
+    return toHexString(
+        TransactionEncoder.signMessage(transaction, sender.web3jCredentialsOrThrow()));
+  }
+
+  private Bytes createPayload(final EnodeURL enodeUrl) {
+    try {
+      final String hexNodeIdString = enodeUrl.getNodeId().toUnprefixedHexString();
+      final String address = enodeUrl.toURI().getHost();
+      final int port = enodeUrl.getListeningPortOrZero();
+
+      final Function removeNodeFunction =
+          FunctionEncoder.makeFunction(
+              "removeEnode",
+              List.of("string", "string", "uint16"),
+              List.of(hexNodeIdString, address, port),
+              Collections.emptyList());
+      return Bytes.fromHexString(FunctionEncoder.encode(removeNodeFunction));
+    } catch (Exception e) {
+      throw new RuntimeException("Error removing node from allowlist", e);
+    }
+  }
+}
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeTransaction.java
index 1e8961fceeb..787cb9752ea 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeTransaction.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeTransaction.java
@@ -17,9 +17,9 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.web3j.utils.Numeric.toHexString;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.permissioning.NodeSmartContractPermissioningController;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
@@ -68,7 +68,7 @@ private String signedTransactionData() {
     final String enodeURL = ((RunnableNode) node).enodeUrl().toASCIIString();
     final Bytes payload =
         NodeSmartContractPermissioningController.createPayload(
-            REMOVE_ENODE_SIGNATURE, EnodeURL.fromString(enodeURL));
+            REMOVE_ENODE_SIGNATURE, EnodeURLImpl.fromString(enodeURL));
 
     RawTransaction transaction =
         RawTransaction.createTransaction(
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeV2Transaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeV2Transaction.java
index 47b316ded32..e5c39d69af4 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeV2Transaction.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeV2Transaction.java
@@ -16,9 +16,10 @@
 
 import static org.web3j.utils.Numeric.toHexString;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
 import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode;
@@ -62,7 +63,7 @@ public Hash execute(final NodeRequests node) {
   }
 
   private String signedTransactionData() {
-    final EnodeURL enodeURL = EnodeURL.fromURI(((RunnableNode) node).enodeUrl());
+    final EnodeURL enodeURL = EnodeURLImpl.fromURI(((RunnableNode) node).enodeUrl());
     final Bytes payload = createPayload(enodeURL);
 
     RawTransaction transaction =
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningIsAllowedTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningIsAllowedTransaction.java
index 8ca83e58c92..d72d6ffab8e 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningIsAllowedTransaction.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningIsAllowedTransaction.java
@@ -17,8 +17,8 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import org.hyperledger.besu.crypto.Hash;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.permissioning.NodeSmartContractPermissioningController;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
 import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode;
@@ -84,7 +84,7 @@ private org.web3j.protocol.core.methods.request.Transaction payload() {
     final String sourceEnodeURL = ((RunnableNode) node).enodeUrl().toASCIIString();
     final Bytes payload =
         NodeSmartContractPermissioningController.createPayload(
-            IS_NODE_ALLOWED_SIGNATURE, EnodeURL.fromString(sourceEnodeURL));
+            IS_NODE_ALLOWED_SIGNATURE, EnodeURLImpl.fromString(sourceEnodeURL));
 
     return org.web3j.protocol.core.methods.request.Transaction.createFunctionCallTransaction(
         null, null, null, null, contractAddress.toString(), payload.toString());
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningTransactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningTransactions.java
index ba635cb073e..8de39e93064 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningTransactions.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningTransactions.java
@@ -14,8 +14,8 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Accounts;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningV2Transactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningV2Transactions.java
index 6a0734513c7..51d4d446643 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningV2Transactions.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningV2Transactions.java
@@ -14,8 +14,9 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl.transaction.perm;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Accounts;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
@@ -33,13 +34,29 @@ public Transaction<Hash> allowNode(final String contractAddress, final Node node
         accounts.getPrimaryBenefactor(), Address.fromHexString(contractAddress), node);
   }
 
+  public Transaction<Hash> allowNode(final String contractAddress, final EnodeURL enodeURL) {
+    return new NodeSmartContractPermissioningAllowNodeByURLV2Transaction(
+        accounts.getPrimaryBenefactor(), Address.fromHexString(contractAddress), enodeURL);
+  }
+
   public Transaction<Hash> forbidNode(final String contractAddress, final Node node) {
     return new NodeSmartContractPermissioningForbidNodeV2Transaction(
         accounts.getPrimaryBenefactor(), Address.fromHexString(contractAddress), node);
   }
 
+  public Transaction<Hash> forbidNode(final String contractAddress, final EnodeURL enodeURL) {
+    return new NodeSmartContractPermissioningForbidNodeByURLV2Transaction(
+        accounts.getPrimaryBenefactor(), Address.fromHexString(contractAddress), enodeURL);
+  }
+
   public Transaction<Boolean> isConnectionAllowed(final String contractAddress, final Node node) {
     return new NodeSmartContractPermissioningConnectionIsAllowedV2Transaction(
         Address.fromHexString(contractAddress), node);
   }
+
+  public Transaction<Boolean> isConnectionAllowed(
+      final String contractAddress, final EnodeURL enodeURL) {
+    return new NodeSmartContractPermissioningConnectionIsAllowedByURLV2Transaction(
+        Address.fromHexString(contractAddress), enodeURL);
+  }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermissioningJsonRpcRequestFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermissioningJsonRpcRequestFactory.java
index b99b2dba61f..d99915abe33 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermissioningJsonRpcRequestFactory.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/perm/PermissioningJsonRpcRequestFactory.java
@@ -18,7 +18,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.assertj.core.util.Lists;
 import org.web3j.protocol.Web3jService;
 import org.web3j.protocol.core.Request;
 import org.web3j.protocol.core.Response;
@@ -61,7 +60,10 @@ Request<?, RemoveNodeResponse> removeNodesFromWhitelist(final List<URI> enodeLis
 
   Request<?, GetNodesWhitelistResponse> getNodesWhitelist() {
     return new Request<>(
-        "perm_getNodesAllowlist", Lists.emptyList(), web3jService, GetNodesWhitelistResponse.class);
+        "perm_getNodesAllowlist",
+        Collections.emptyList(),
+        web3jService,
+        GetNodesWhitelistResponse.class);
   }
 
   Request<?, GetAccountsWhitelistResponse> getAccountsWhitelist() {
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/EeaSendRawTransactionTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/EeaSendRawTransactionTransaction.java
index ded0bfb1be6..5d2786ae8a6 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/EeaSendRawTransactionTransaction.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/EeaSendRawTransactionTransaction.java
@@ -16,7 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
 
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivGetCodeTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivGetCodeTransaction.java
index 850f62379b3..dbe708f53b5 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivGetCodeTransaction.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivGetCodeTransaction.java
@@ -16,7 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
 
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivGetPrivacyPrecompileAddressTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivGetPrivacyPrecompileAddressTransaction.java
index abbba72a7c6..cf8cd3f0656 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivGetPrivacyPrecompileAddressTransaction.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivGetPrivacyPrecompileAddressTransaction.java
@@ -16,7 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
 
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivGetPrivateTransactionTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivGetPrivateTransactionTransaction.java
index 5c12b6c13eb..e91a83f314b 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivGetPrivateTransactionTransaction.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivGetPrivateTransactionTransaction.java
@@ -16,7 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivateTransactionGroupResponse;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivGetTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivGetTransaction.java
index 7ad33c9aa7a..0d6e599a1e2 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivGetTransaction.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivGetTransaction.java
@@ -16,7 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
 
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivGetTransactionReceiptTransaction.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivGetTransactionReceiptTransaction.java
index 2ea67b7982f..da2f6b310c6 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivGetTransactionReceiptTransaction.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivGetTransactionReceiptTransaction.java
@@ -16,7 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.NodeRequests;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
 
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivacyRequestFactory.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivacyRequestFactory.java
index f4e7c0f624e..056598a9d56 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivacyRequestFactory.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivacyRequestFactory.java
@@ -14,16 +14,16 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY_PROXY;
 
 import org.hyperledger.besu.crypto.SecureRandomProvider;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.enclave.types.PrivacyGroup;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.parameters.CreatePrivacyGroupParameter;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.privacy.group.OnChainGroupManagement;
+import org.hyperledger.besu.ethereum.privacy.group.FlexibleGroupManagement;
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivateTransactionGroupResponse;
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.util.LogFilterJsonParameter;
@@ -40,6 +40,14 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.tuweni.bytes.Bytes;
+import org.web3j.abi.FunctionEncoder;
+import org.web3j.abi.TypeReference;
+import org.web3j.abi.Utils;
+import org.web3j.abi.datatypes.Bool;
+import org.web3j.abi.datatypes.DynamicArray;
+import org.web3j.abi.datatypes.DynamicBytes;
+import org.web3j.abi.datatypes.Function;
+import org.web3j.abi.datatypes.Type;
 import org.web3j.crypto.Credentials;
 import org.web3j.protocol.Web3jService;
 import org.web3j.protocol.besu.Besu;
@@ -54,22 +62,53 @@
 import org.web3j.protocol.eea.crypto.PrivateTransactionEncoder;
 import org.web3j.protocol.eea.crypto.RawPrivateTransaction;
 import org.web3j.protocol.exceptions.TransactionException;
+import org.web3j.tx.ChainIdLong;
 import org.web3j.tx.Contract;
+import org.web3j.tx.PrivateTransactionManager;
 import org.web3j.tx.response.PollingPrivateTransactionReceiptProcessor;
 import org.web3j.utils.Base64String;
 import org.web3j.utils.Numeric;
+import org.web3j.utils.Restriction;
 
 public class PrivacyRequestFactory {
 
   private final SecureRandom secureRandom;
 
+  public PrivateTransactionManager getTransactionManager(
+      final Credentials credentials,
+      final Base64String privateFrom,
+      final List<Base64String> privateFor,
+      final Restriction restriction) {
+    return new PrivateTransactionManager(
+        getBesuClient(),
+        credentials,
+        new PollingPrivateTransactionReceiptProcessor(getBesuClient(), 1000, 60),
+        ChainIdLong.NONE,
+        privateFrom,
+        privateFor,
+        restriction);
+  }
+
+  public PrivateTransactionManager getTransactionManager(
+      final Credentials credentials,
+      final Base64String privateFrom,
+      final Base64String privacyGroupId,
+      final Restriction restriction) {
+    return new PrivateTransactionManager(
+        getBesuClient(),
+        credentials,
+        new PollingPrivateTransactionReceiptProcessor(getBesuClient(), 1000, 60),
+        ChainIdLong.NONE,
+        privateFrom,
+        privacyGroupId,
+        restriction);
+  }
+
   public static class GetPrivacyPrecompileAddressResponse extends Response<Address> {}
 
   public static class GetPrivateTransactionResponse
       extends Response<PrivateTransactionGroupResponse> {}
 
-  public static class JsonRpcSuccessResponseResponse extends Response<String> {}
-
   public static class CreatePrivacyGroupResponse extends Response<String> {}
 
   public static class DeletePrivacyGroupResponse extends Response<String> {}
@@ -151,7 +190,7 @@ public String privxAddToPrivacyGroup(
             nonce,
             BigInteger.valueOf(1000),
             BigInteger.valueOf(3000000),
-            Address.ONCHAIN_PRIVACY_PROXY.toHexString(),
+            FLEXIBLE_PRIVACY_PROXY.toHexString(),
             payload.toHexString(),
             Base64String.wrap(adder.getEnclaveKey()),
             privacyGroupId,
@@ -184,7 +223,7 @@ public String privxRemoveFromPrivacyGroup(
             nonce,
             BigInteger.valueOf(1000),
             BigInteger.valueOf(3000000),
-            Address.ONCHAIN_PRIVACY_PROXY.toHexString(),
+            FLEXIBLE_PRIVACY_PROXY.toHexString(),
             payload.toHexString(),
             Base64String.wrap(removerTenant),
             privacyGroupId,
@@ -198,12 +237,41 @@ public String privxRemoveFromPrivacyGroup(
   }
 
   private Bytes encodeRemoveFromGroupFunctionCall(final Bytes toRemove) {
-    return Bytes.concatenate(OnChainGroupManagement.REMOVE_PARTICIPANT_METHOD_SIGNATURE, toRemove);
+    final Function function =
+        new Function(
+            "removeParticipant",
+            Arrays.asList(new DynamicBytes(toRemove.toArrayUnsafe())),
+            Arrays.asList(new TypeReference<Bool>() {}));
+
+    return Bytes.fromHexString(FunctionEncoder.encode(function));
   }
 
   public String privxLockPrivacyGroup(
       final PrivacyNode locker, final Base64String privacyGroupId, final Credentials signer)
       throws IOException, TransactionException {
+    return privxLockOrUnlockPrivacyGroup(
+        locker,
+        privacyGroupId,
+        signer,
+        FlexibleGroupManagement.LOCK_GROUP_METHOD_SIGNATURE.toHexString());
+  }
+
+  public String privxUnlockPrivacyGroup(
+      final PrivacyNode locker, final Base64String privacyGroupId, final Credentials signer)
+      throws IOException, TransactionException {
+    return privxLockOrUnlockPrivacyGroup(
+        locker,
+        privacyGroupId,
+        signer,
+        FlexibleGroupManagement.UNLOCK_GROUP_METHOD_SIGNATURE.toHexString());
+  }
+
+  private String privxLockOrUnlockPrivacyGroup(
+      final PrivacyNode locker,
+      final Base64String privacyGroupId,
+      final Credentials signer,
+      final String callData)
+      throws IOException, TransactionException {
     final BigInteger nonce =
         besuClient
             .privGetTransactionCount(signer.getAddress(), privacyGroupId)
@@ -215,8 +283,8 @@ public String privxLockPrivacyGroup(
             nonce,
             BigInteger.valueOf(1000),
             BigInteger.valueOf(3000000),
-            Address.ONCHAIN_PRIVACY_PROXY.toHexString(),
-            OnChainGroupManagement.LOCK_GROUP_METHOD_SIGNATURE.toHexString(),
+            FLEXIBLE_PRIVACY_PROXY.toHexString(),
+            callData,
             Base64String.wrap(locker.getEnclaveKey()),
             privacyGroupId,
             org.web3j.utils.Restriction.RESTRICTED);
@@ -255,7 +323,7 @@ public PrivxCreatePrivacyGroupResponse privxCreatePrivacyGroup(
             BigInteger.ZERO,
             BigInteger.valueOf(1000),
             BigInteger.valueOf(3000000),
-            Address.ONCHAIN_PRIVACY_PROXY.toHexString(),
+            FLEXIBLE_PRIVACY_PROXY.toHexString(),
             payload.toHexString(),
             Base64String.wrap(privateFrom),
             Base64String.wrap(privacyGroupId.toArrayUnsafe()),
@@ -270,10 +338,10 @@ public PrivxCreatePrivacyGroupResponse privxCreatePrivacyGroup(
     return new PrivxCreatePrivacyGroupResponse(privacyGroupId.toBase64String(), transactionHash);
   }
 
-  public Request<?, PrivxFindPrivacyGroupResponse> privxFindOnChainPrivacyGroup(
+  public Request<?, PrivxFindPrivacyGroupResponse> privxFindFlexiblePrivacyGroup(
       final List<Base64String> nodes) {
     return new Request<>(
-        "privx_findOnChainPrivacyGroup",
+        "privx_findFlexiblePrivacyGroup",
         singletonList(nodes),
         web3jService,
         PrivxFindPrivacyGroupResponse.class);
@@ -430,14 +498,14 @@ public Request<?, DebugGetStateRoot> privDebugGetStateRoot(
         DebugGetStateRoot.class);
   }
 
-  public static class PrivxFindPrivacyGroupResponse extends Response<List<OnChainPrivacyGroup>> {
+  public static class PrivxFindPrivacyGroupResponse extends Response<List<FlexiblePrivacyGroup>> {
 
-    public List<OnChainPrivacyGroup> getGroups() {
+    public List<FlexiblePrivacyGroup> getGroups() {
       return getResult();
     }
   }
 
-  public static class OnChainPrivacyGroup {
+  public static class FlexiblePrivacyGroup {
 
     private final Base64String privacyGroupId;
     private final List<Base64String> members;
@@ -445,11 +513,11 @@ public static class OnChainPrivacyGroup {
     private final String description;
 
     public enum Type {
-      ONCHAIN
+      FLEXIBLE
     }
 
     @JsonCreator
-    public OnChainPrivacyGroup(
+    public FlexiblePrivacyGroup(
         @JsonProperty(value = "privacyGroupId") final String privacyGroupId,
         @JsonProperty(value = "type") final Type type,
         @JsonProperty(value = "name") final String name,
@@ -458,7 +526,7 @@ public OnChainPrivacyGroup(
       this(privacyGroupId, members);
     }
 
-    public OnChainPrivacyGroup(final String privacyGroupId, final List<Base64String> members) {
+    public FlexiblePrivacyGroup(final String privacyGroupId, final List<Base64String> members) {
       this.privacyGroupId = Base64String.wrap(privacyGroupId);
       this.name = "";
       this.description = "";
@@ -478,7 +546,7 @@ public String getDescription() {
     }
 
     public Type getType() {
-      return Type.ONCHAIN;
+      return Type.FLEXIBLE;
     }
 
     public List<Base64String> getMembers() {
@@ -493,7 +561,7 @@ public boolean equals(final Object o) {
       if (o == null || getClass() != o.getClass()) {
         return false;
       }
-      final OnChainPrivacyGroup that = (OnChainPrivacyGroup) o;
+      final FlexiblePrivacyGroup that = (FlexiblePrivacyGroup) o;
       return getPrivacyGroupId().equals(that.getPrivacyGroupId())
           && getName().equals(that.getName())
           && getDescription().equals(that.getDescription())
@@ -531,29 +599,19 @@ public String getTransactionHash() {
   }
 
   private Bytes encodeAddToGroupFunctionCall(final List<Bytes> participants) {
-    return Bytes.concatenate(
-        OnChainGroupManagement.ADD_PARTICIPANTS_METHOD_SIGNATURE, encodeList(participants));
-  }
-
-  private Bytes encodeList(final List<Bytes> participants) {
-    final Bytes dynamicParameterOffset = encodeLong(32);
-    final Bytes length = encodeLong(participants.size());
-    return Bytes.concatenate(
-        dynamicParameterOffset,
-        length,
-        Bytes.fromHexString(
-            participants.stream()
-                .map(Bytes::toUnprefixedHexString)
-                .collect(Collectors.joining(""))));
-  }
-
-  // long to uint256, 8 bytes big endian, so left padded by 24 bytes
-  private static Bytes encodeLong(final long l) {
-    checkArgument(l >= 0, "Unsigned value must be positive");
-    final byte[] longBytes = new byte[8];
-    for (int i = 0; i < 8; i++) {
-      longBytes[i] = (byte) ((l >> ((7 - i) * 8)) & 0xFF);
-    }
-    return Bytes.concatenate(Bytes.wrap(new byte[24]), Bytes.wrap(longBytes));
+    final Function function =
+        new Function(
+            "addParticipants",
+            Arrays.asList(
+                new DynamicArray<>(
+                    DynamicBytes.class,
+                    Utils.typeMap(
+                        participants.stream()
+                            .map(Bytes::toArrayUnsafe)
+                            .collect(Collectors.toList()),
+                        DynamicBytes.class))),
+            Collections.emptyList());
+
+    return Bytes.fromHexString(FunctionEncoder.encode(function));
   }
 }
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivacyTransactions.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivacyTransactions.java
index 218368a3b7a..89a06e8b73b 100644
--- a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivacyTransactions.java
+++ b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/privacy/PrivacyTransactions.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 
 import java.util.List;
 
diff --git a/acceptance-tests/test-plugins/build.gradle b/acceptance-tests/test-plugins/build.gradle
new file mode 100644
index 00000000000..f9e960b4944
--- /dev/null
+++ b/acceptance-tests/test-plugins/build.gradle
@@ -0,0 +1,37 @@
+
+dependencies {
+  api 'org.slf4j:slf4j-api'
+
+  implementation project(':besu')
+  implementation project(':crypto:algorithms')
+  implementation project(':datatypes')
+  implementation project(':ethereum:core')
+  implementation project(':ethereum:rlp')
+  implementation project(':plugin-api')
+  implementation 'com.google.auto.service:auto-service'
+  implementation 'info.picocli:picocli'
+
+  testImplementation 'junit:junit'
+  testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
+
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
+}
+
+task testPluginsJar(type: Jar) {
+  archiveFileName = 'testPlugins.jar'
+  manifest {
+    attributes(
+      'Specification-Title': archiveBaseName,
+      'Specification-Version': project.version,
+      'Implementation-Title': archiveBaseName,
+      'Implementation-Version': calculateVersion()
+      )
+  }
+  from sourceSets.main.output
+}
+
+artifacts { testPluginsJar }
+
+
+javadoc { enabled = false }
diff --git a/besu/src/test/java/org/hyperledger/besu/plugins/BadCLIOptionsPlugin.java b/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/BadCLIOptionsPlugin.java
similarity index 82%
rename from besu/src/test/java/org/hyperledger/besu/plugins/BadCLIOptionsPlugin.java
rename to acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/BadCLIOptionsPlugin.java
index ae40a95b834..a3fe06c572c 100644
--- a/besu/src/test/java/org/hyperledger/besu/plugins/BadCLIOptionsPlugin.java
+++ b/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/BadCLIOptionsPlugin.java
@@ -13,7 +13,7 @@
  * SPDX-License-Identifier: Apache-2.0
  *
  */
-package org.hyperledger.besu.plugins;
+package org.hyperledger.besu.tests.acceptance.plugins;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -26,13 +26,13 @@
 import java.nio.file.Files;
 
 import com.google.auto.service.AutoService;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import picocli.CommandLine.Option;
 
 @AutoService(BesuPlugin.class)
 public class BadCLIOptionsPlugin implements BesuPlugin {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(BadCLIOptionsPlugin.class);
 
   @Option(names = "--poorly-named-option")
   String poorlyNamedOption = "nothing";
@@ -45,11 +45,13 @@ public void register(final BesuContext context) {
     callbackDir = new File(System.getProperty("besu.plugins.dir", "plugins"));
     writeStatus("init");
 
-    context
-        .getService(PicoCLIOptions.class)
-        .ifPresent(
-            picoCLIOptions ->
-                picoCLIOptions.addPicoCLIOptions("bad-cli", BadCLIOptionsPlugin.this));
+    if (System.getProperty("TEST_BAD_CLI", "false").equals("true")) {
+      context
+          .getService(PicoCLIOptions.class)
+          .ifPresent(
+              picoCLIOptions ->
+                  picoCLIOptions.addPicoCLIOptions("bad-cli", BadCLIOptionsPlugin.this));
+    }
 
     writeStatus("register");
   }
diff --git a/besu/src/test/java/org/hyperledger/besu/plugins/TestBesuEventsPlugin.java b/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/TestBesuEventsPlugin.java
similarity index 93%
rename from besu/src/test/java/org/hyperledger/besu/plugins/TestBesuEventsPlugin.java
rename to acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/TestBesuEventsPlugin.java
index 79cdd096016..44e728010cb 100644
--- a/besu/src/test/java/org/hyperledger/besu/plugins/TestBesuEventsPlugin.java
+++ b/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/TestBesuEventsPlugin.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.plugins;
+package org.hyperledger.besu.tests.acceptance.plugins;
 
 import org.hyperledger.besu.plugin.BesuContext;
 import org.hyperledger.besu.plugin.BesuPlugin;
@@ -28,12 +28,12 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import com.google.auto.service.AutoService;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @AutoService(BesuPlugin.class)
 public class TestBesuEventsPlugin implements BesuPlugin {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(TestBesuEventsPlugin.class);
 
   private BesuContext context;
 
diff --git a/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/TestPermissioningPlugin.java b/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/TestPermissioningPlugin.java
new file mode 100644
index 00000000000..2964e76229f
--- /dev/null
+++ b/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/TestPermissioningPlugin.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.tests.acceptance.plugins;
+
+import org.hyperledger.besu.plugin.BesuContext;
+import org.hyperledger.besu.plugin.BesuPlugin;
+import org.hyperledger.besu.plugin.services.PermissioningService;
+import org.hyperledger.besu.plugin.services.PicoCLIOptions;
+
+import com.google.auto.service.AutoService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import picocli.CommandLine.Option;
+
+@AutoService(BesuPlugin.class)
+public class TestPermissioningPlugin implements BesuPlugin {
+  private static final Logger LOG = LoggerFactory.getLogger(TestPermissioningPlugin.class);
+
+  private static final String aliceNode =
+      "09b02f8a5fddd222ade4ea4528faefc399623af3f736be3c44f03e2df22fb792f3931a4d9573d333ca74343305762a753388c3422a86d98b713fc91c1ea04842";
+
+  private static final String bobNode =
+      "af80b90d25145da28c583359beb47b21796b2fe1a23c1511e443e7a64dfdb27d7434c380f0aa4c500e220aa1a9d068514b1ff4d5019e624e7ba1efe82b340a59";
+
+  private static final String charlieNode =
+      "ce7edc292d7b747fab2f23584bbafaffde5c8ff17cf689969614441e0527b90015ea9fee96aed6d9c0fc2fbe0bd1883dee223b3200246ff1e21976bdbc9a0fc8";
+
+  PermissioningService service;
+
+  @Override
+  public void register(final BesuContext context) {
+    context.getService(PicoCLIOptions.class).orElseThrow().addPicoCLIOptions("permissioning", this);
+    service = context.getService(PermissioningService.class).orElseThrow();
+  }
+
+  @Override
+  public void beforeExternalServices() {
+    if (enabled) {
+      service.registerNodePermissioningProvider(
+          (sourceEnode, destinationEnode) -> {
+            if (sourceEnode.toString().contains(bobNode)
+                || destinationEnode.toString().contains(bobNode)) {
+
+              final boolean isBobTalkingToAlice =
+                  sourceEnode.toString().contains(aliceNode)
+                      || destinationEnode.toString().contains(aliceNode);
+              if (isBobTalkingToAlice) {
+                LOG.info("BLOCK CONNECTION from {}, to {}", sourceEnode, destinationEnode);
+              } else {
+                LOG.info("ALLOW CONNECTION from {}, to {}", sourceEnode, destinationEnode);
+              }
+
+              return !isBobTalkingToAlice;
+            }
+            return true;
+          });
+
+      service.registerNodeMessagePermissioningProvider(
+          (destinationEnode, code) -> {
+            if (destinationEnode.toString().contains(charlieNode) && transactionMessage(code)) {
+              LOG.info("BLOCK MESSAGE to {} code {}", destinationEnode, code);
+              return false;
+            }
+            return true;
+          });
+    }
+  }
+
+  @Override
+  public void start() {}
+
+  private boolean transactionMessage(final int code) {
+    return code == 0x02 || code == 0x08 || code == 0x09 || code == 0x0a;
+  }
+
+  @Override
+  public void stop() {}
+
+  @Option(names = "--plugin-permissioning-test-enabled")
+  boolean enabled = false;
+}
diff --git a/besu/src/test/java/org/hyperledger/besu/plugins/TestPicoCLIPlugin.java b/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/TestPicoCLIPlugin.java
similarity index 92%
rename from besu/src/test/java/org/hyperledger/besu/plugins/TestPicoCLIPlugin.java
rename to acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/TestPicoCLIPlugin.java
index 37192404dab..0db5281537c 100644
--- a/besu/src/test/java/org/hyperledger/besu/plugins/TestPicoCLIPlugin.java
+++ b/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/TestPicoCLIPlugin.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.plugins;
+package org.hyperledger.besu.tests.acceptance.plugins;
 
 import org.hyperledger.besu.plugin.BesuContext;
 import org.hyperledger.besu.plugin.BesuPlugin;
@@ -24,13 +24,13 @@
 import java.util.Collections;
 
 import com.google.auto.service.AutoService;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import picocli.CommandLine.Option;
 
 @AutoService(BesuPlugin.class)
 public class TestPicoCLIPlugin implements BesuPlugin {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(TestPicoCLIPlugin.class);
 
   @Option(
       names = {"--Xplugin-test-option"},
@@ -59,8 +59,7 @@ public void register(final BesuContext context) {
 
     context
         .getService(PicoCLIOptions.class)
-        .ifPresent(
-            picoCLIOptions -> picoCLIOptions.addPicoCLIOptions("test", TestPicoCLIPlugin.this));
+        .ifPresent(picoCLIOptions -> picoCLIOptions.addPicoCLIOptions("test", this));
 
     callbackDir = new File(System.getProperty("besu.plugins.dir", "plugins"));
     writeSignal("registered");
diff --git a/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/TestPrivacyServicePlugin.java b/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/TestPrivacyServicePlugin.java
new file mode 100644
index 00000000000..4cdd35e8dc4
--- /dev/null
+++ b/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/TestPrivacyServicePlugin.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.plugins;
+
+import org.hyperledger.besu.plugin.BesuContext;
+import org.hyperledger.besu.plugin.BesuPlugin;
+import org.hyperledger.besu.plugin.services.PicoCLIOptions;
+import org.hyperledger.besu.plugin.services.PrivacyPluginService;
+import org.hyperledger.besu.tests.acceptance.plugins.privacy.TestPrivacyGroupGenesisProvider;
+import org.hyperledger.besu.tests.acceptance.plugins.privacy.TestPrivacyPluginPayloadProvider;
+import org.hyperledger.besu.tests.acceptance.plugins.privacy.TestSigningPrivateMarkerTransactionFactory;
+
+import com.google.auto.service.AutoService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import picocli.CommandLine.Option;
+
+@AutoService(BesuPlugin.class)
+public class TestPrivacyServicePlugin implements BesuPlugin {
+  private static final Logger LOG = LoggerFactory.getLogger(TestPrivacyServicePlugin.class);
+
+  PrivacyPluginService pluginService;
+  BesuContext context;
+
+  TestPrivacyGroupGenesisProvider privacyGroupGenesisProvider =
+      new TestPrivacyGroupGenesisProvider();
+  TestSigningPrivateMarkerTransactionFactory privateMarkerTransactionFactory =
+      new TestSigningPrivateMarkerTransactionFactory();
+
+  @Override
+  public void register(final BesuContext context) {
+    this.context = context;
+
+    context
+        .getService(PicoCLIOptions.class)
+        .orElseThrow()
+        .addPicoCLIOptions("privacy-service", this);
+    pluginService = context.getService(PrivacyPluginService.class).orElseThrow();
+    pluginService.setPrivacyGroupGenesisProvider(privacyGroupGenesisProvider);
+
+    LOG.info("Registering Plugins with options " + this);
+  }
+
+  @Override
+  public void beforeExternalServices() {
+    LOG.info("Start Plugins with options {}", this);
+
+    TestPrivacyPluginPayloadProvider payloadProvider = new TestPrivacyPluginPayloadProvider();
+
+    pluginService.setPayloadProvider(payloadProvider);
+    payloadProvider.setPluginPayloadPrefix(prefix);
+
+    if (genesisEnabled) {
+      privacyGroupGenesisProvider.setGenesisEnabled();
+    }
+
+    if (signingEnabled) {
+      pluginService.setPrivateMarkerTransactionFactory(privateMarkerTransactionFactory);
+      privateMarkerTransactionFactory.setSigningKeyEnabled(signingKey);
+    }
+  }
+
+  @Override
+  public void start() {}
+
+  @Override
+  public void stop() {}
+
+  @Option(names = "--plugin-privacy-service-encryption-prefix")
+  String prefix;
+
+  @Option(names = "--plugin-privacy-service-genesis-enabled")
+  boolean genesisEnabled = false;
+
+  @Option(names = "--plugin-privacy-service-signing-enabled")
+  boolean signingEnabled = false;
+
+  @Option(names = "--plugin-privacy-service-signing-key")
+  String signingKey;
+
+  @Override
+  public String toString() {
+    return "TestPrivacyServicePlugin{"
+        + "prefix='"
+        + prefix
+        + '\''
+        + ", signingEnabled="
+        + signingEnabled
+        + ", genesisEnabled="
+        + genesisEnabled
+        + ", signingKey='"
+        + signingKey
+        + '\''
+        + '}';
+  }
+}
diff --git a/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/TestRpcEndpointServicePlugin.java b/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/TestRpcEndpointServicePlugin.java
new file mode 100644
index 00000000000..fee061f5449
--- /dev/null
+++ b/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/TestRpcEndpointServicePlugin.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.plugins;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import org.hyperledger.besu.plugin.BesuContext;
+import org.hyperledger.besu.plugin.BesuPlugin;
+import org.hyperledger.besu.plugin.services.RpcEndpointService;
+import org.hyperledger.besu.plugin.services.rpc.PluginRpcRequest;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import com.google.auto.service.AutoService;
+
+@AutoService(BesuPlugin.class)
+public class TestRpcEndpointServicePlugin implements BesuPlugin {
+
+  private static final String NAMESPACE_ENABLED = "tests";
+  private static final String NAMESPACE_NOT_ENABLED = "notEnabled";
+  private final AtomicReference<String> stringStorage = new AtomicReference<>("InitialValue");
+  private final AtomicReference<Object[]> arrayStorage = new AtomicReference<>();
+
+  private String setValue(final PluginRpcRequest request) {
+    checkArgument(request.getParams().length == 1, "Only one parameter accepted");
+    return stringStorage.updateAndGet(x -> request.getParams()[0].toString());
+  }
+
+  private String getValue(final PluginRpcRequest request) {
+    return stringStorage.get();
+  }
+
+  private Object[] replaceValueList(final PluginRpcRequest request) {
+    return arrayStorage.updateAndGet(x -> request.getParams());
+  }
+
+  private String throwException(final PluginRpcRequest request) {
+    throw new RuntimeException("Kaboom");
+  }
+
+  @Override
+  public void register(final BesuContext context) {
+    context
+        .getService(RpcEndpointService.class)
+        .ifPresent(
+            rpcEndpointService -> {
+              rpcEndpointService.registerRPCEndpoint(NAMESPACE_ENABLED, "getValue", this::getValue);
+              rpcEndpointService.registerRPCEndpoint(NAMESPACE_ENABLED, "setValue", this::setValue);
+              rpcEndpointService.registerRPCEndpoint(
+                  NAMESPACE_ENABLED, "replaceValueList", this::replaceValueList);
+              rpcEndpointService.registerRPCEndpoint(
+                  NAMESPACE_ENABLED, "throwException", this::throwException);
+              rpcEndpointService.registerRPCEndpoint(
+                  NAMESPACE_NOT_ENABLED, "getValue", this::getValue);
+            });
+  }
+
+  @Override
+  public void start() {}
+
+  @Override
+  public void stop() {}
+}
diff --git a/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/privacy/TestPrivacyGroupGenesisProvider.java b/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/privacy/TestPrivacyGroupGenesisProvider.java
new file mode 100644
index 00000000000..d763683ba7f
--- /dev/null
+++ b/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/privacy/TestPrivacyGroupGenesisProvider.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.tests.acceptance.plugins.privacy;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Quantity;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.plugin.data.PrivacyGenesis;
+import org.hyperledger.besu.plugin.data.PrivacyGenesisAccount;
+import org.hyperledger.besu.plugin.services.privacy.PrivacyGroupGenesisProvider;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+
+public class TestPrivacyGroupGenesisProvider implements PrivacyGroupGenesisProvider {
+  private boolean genesisEnabled = false;
+
+  public void setGenesisEnabled() {
+    this.genesisEnabled = true;
+  }
+
+  @Override
+  public PrivacyGenesis getPrivacyGenesis(final Bytes privacyGroupId, final long blockNumber) {
+    if (!genesisEnabled) return Collections::emptyList;
+
+    return () ->
+        List.of(
+            new PrivacyGenesisAccount() {
+              @Override
+              public Address getAddress() {
+                return org.hyperledger.besu.datatypes.Address.fromHexString(
+                    "0x1000000000000000000000000000000000000001");
+              }
+
+              @Override
+              public Map<UInt256, UInt256> getStorage() {
+                return Collections.emptyMap();
+              }
+
+              @Override
+              public Long getNonce() {
+                return 0L;
+              }
+
+              @Override
+              public Quantity getBalance() {
+                return Wei.of(1000);
+              }
+
+              // The code in the genesis file needs to be the deployed contract code, not the code
+              // to deploy
+              // the contract
+              // you can generate it using the solc --bin-runtime flag
+              // cd ./acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/
+              // docker run -v $PWD:/sources ethereum/solc:0.5.0 -o /sources/output --bin-runtime
+              // /sources/EventEmitter.sol --overwrite
+
+              @Override
+              public Bytes getCode() {
+                return Bytes.fromHexString(
+                    "0x608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633fa4f2451461005c5780636057361d1461008757806367e404ce146100c2575b600080fd5b34801561006857600080fd5b50610071610119565b6040518082815260200191505060405180910390f35b34801561009357600080fd5b506100c0600480360360208110156100aa57600080fd5b8101908080359060200190929190505050610123565b005b3480156100ce57600080fd5b506100d76101d9565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6000600254905090565b7fc9db20adedc6cf2b5d25252b101ab03e124902a73fcb12b753f3d1aaa2d8f9f53382604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019250505060405180910390a18060028190555033600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b6000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690509056fea165627a7a72305820e74360c3d08936cb1747ad641729261ff5e83b6fc0d303d136e171f15f07d7740029");
+              }
+            });
+  }
+}
diff --git a/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/privacy/TestPrivacyPluginPayloadProvider.java b/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/privacy/TestPrivacyPluginPayloadProvider.java
new file mode 100644
index 00000000000..f40d71b9c57
--- /dev/null
+++ b/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/privacy/TestPrivacyPluginPayloadProvider.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.tests.acceptance.plugins.privacy;
+
+import static org.hyperledger.besu.ethereum.privacy.PrivateTransaction.readFrom;
+import static org.hyperledger.besu.ethereum.privacy.PrivateTransaction.serialize;
+
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.plugin.data.PrivateTransaction;
+import org.hyperledger.besu.plugin.data.Transaction;
+import org.hyperledger.besu.plugin.services.privacy.PrivacyPluginPayloadProvider;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TestPrivacyPluginPayloadProvider implements PrivacyPluginPayloadProvider {
+  private static final Logger LOG = LoggerFactory.getLogger(TestPrivacyPluginPayloadProvider.class);
+  private String prefix;
+
+  public void setPluginPayloadPrefix(final String prefix) {
+    this.prefix = prefix;
+  }
+
+  @Override
+  public Bytes generateMarkerPayload(
+      final PrivateTransaction privateTransaction, final String privacyUserId) {
+
+    return Bytes.wrap(Bytes.fromHexString(prefix), serialize(privateTransaction).encoded());
+  }
+
+  @Override
+  public Optional<PrivateTransaction> getPrivateTransactionFromPayload(
+      final Transaction transaction) {
+
+    final Bytes prefixBytes = Bytes.fromHexString(prefix);
+    if (transaction.getPayload().slice(0, prefixBytes.size()).equals(prefixBytes)) {
+      LOG.info("processing payload for " + prefix);
+      final BytesValueRLPInput bytesValueRLPInput =
+          new BytesValueRLPInput(transaction.getPayload().slice(prefixBytes.size()).copy(), false);
+      return Optional.of(readFrom(bytesValueRLPInput));
+    } else {
+      LOG.info("Can not process payload for " + prefix);
+      return Optional.empty();
+    }
+  }
+}
diff --git a/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/privacy/TestSigningPrivateMarkerTransactionFactory.java b/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/privacy/TestSigningPrivateMarkerTransactionFactory.java
new file mode 100644
index 00000000000..3ab57a28e2c
--- /dev/null
+++ b/acceptance-tests/test-plugins/src/main/java/org/hyperledger/besu/tests/acceptance/plugins/privacy/TestSigningPrivateMarkerTransactionFactory.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.plugins.privacy;
+
+import static org.hyperledger.besu.datatypes.Address.extract;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SECPPrivateKey;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.plugin.data.PrivateTransaction;
+import org.hyperledger.besu.plugin.data.TransactionType;
+import org.hyperledger.besu.plugin.data.UnsignedPrivateMarkerTransaction;
+import org.hyperledger.besu.plugin.services.privacy.PrivateMarkerTransactionFactory;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TestSigningPrivateMarkerTransactionFactory implements PrivateMarkerTransactionFactory {
+
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestSigningPrivateMarkerTransactionFactory.class);
+
+  KeyPair aliceFixedSigningKey;
+  Address sender;
+
+  public void setSigningKeyEnabled(final String privateMarkerTransactionSigningKey) {
+    final SignatureAlgorithm algorithm = SignatureAlgorithmFactory.getInstance();
+    final SECPPrivateKey privateKey =
+        algorithm.createPrivateKey(Bytes32.fromHexString(privateMarkerTransactionSigningKey));
+
+    aliceFixedSigningKey = algorithm.createKeyPair(privateKey);
+    sender = extract(Hash.hash(aliceFixedSigningKey.getPublicKey().getEncodedBytes()));
+  }
+
+  @Override
+  public Bytes create(
+      final UnsignedPrivateMarkerTransaction unsignedPrivateMarkerTransaction,
+      final PrivateTransaction privateTransaction,
+      final String privacyUserId) {
+
+    final Transaction transaction =
+        Transaction.builder()
+            .type(TransactionType.FRONTIER)
+            .nonce(unsignedPrivateMarkerTransaction.getNonce())
+            .gasPrice(
+                unsignedPrivateMarkerTransaction.getGasPrice().map(Wei::fromQuantity).orElse(null))
+            .gasLimit(unsignedPrivateMarkerTransaction.getGasLimit())
+            .to(unsignedPrivateMarkerTransaction.getTo().orElseThrow())
+            .value(Wei.fromQuantity(unsignedPrivateMarkerTransaction.getValue()))
+            .payload(unsignedPrivateMarkerTransaction.getPayload())
+            .signAndBuild(aliceFixedSigningKey);
+
+    LOG.info("Signing PMT from {}", sender);
+
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    transaction.writeTo(out);
+    return out.encoded();
+  }
+
+  @Override
+  public Address getSender(
+      final PrivateTransaction privateTransaction, final String privacyUserId) {
+    return sender;
+  }
+}
diff --git a/besu/src/test/java/org/hyperledger/besu/services/BesuPluginContextImplTest.java b/acceptance-tests/test-plugins/src/test/java/org/hyperledger/besu/services/BesuPluginContextImplTest.java
similarity index 93%
rename from besu/src/test/java/org/hyperledger/besu/services/BesuPluginContextImplTest.java
rename to acceptance-tests/test-plugins/src/test/java/org/hyperledger/besu/services/BesuPluginContextImplTest.java
index 234abb26ef7..5fd73b66b8f 100644
--- a/besu/src/test/java/org/hyperledger/besu/services/BesuPluginContextImplTest.java
+++ b/acceptance-tests/test-plugins/src/test/java/org/hyperledger/besu/services/BesuPluginContextImplTest.java
@@ -18,7 +18,7 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 import org.hyperledger.besu.plugin.BesuPlugin;
-import org.hyperledger.besu.plugins.TestPicoCLIPlugin;
+import org.hyperledger.besu.tests.acceptance.plugins.TestPicoCLIPlugin;
 
 import java.io.File;
 import java.io.IOException;
@@ -27,6 +27,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import org.assertj.core.api.Assertions;
 import org.assertj.core.api.ThrowableAssert;
 import org.junit.After;
 import org.junit.BeforeClass;
@@ -57,10 +58,11 @@ public void verifyEverythingGoesSmoothly() {
     assertThat(contextImpl.getPlugins()).isNotEmpty();
 
     final Optional<TestPicoCLIPlugin> testPluginOptional = findTestPlugin(contextImpl.getPlugins());
-    assertThat(testPluginOptional).isPresent();
+    Assertions.assertThat(testPluginOptional).isPresent();
     final TestPicoCLIPlugin testPicoCLIPlugin = testPluginOptional.get();
     assertThat(testPicoCLIPlugin.getState()).isEqualTo("registered");
 
+    contextImpl.beforeExternalServices();
     contextImpl.startPlugins();
     assertThat(testPicoCLIPlugin.getState()).isEqualTo("started");
 
@@ -77,6 +79,9 @@ public void registrationErrorsHandledSmoothly() {
     contextImpl.registerPlugins(new File(".").toPath());
     assertThat(contextImpl.getPlugins()).isNotInstanceOfAny(TestPicoCLIPlugin.class);
 
+    contextImpl.beforeExternalServices();
+    assertThat(contextImpl.getPlugins()).isNotInstanceOfAny(TestPicoCLIPlugin.class);
+
     contextImpl.startPlugins();
     assertThat(contextImpl.getPlugins()).isNotInstanceOfAny(TestPicoCLIPlugin.class);
 
@@ -98,6 +103,7 @@ public void startErrorsHandledSmoothly() {
     final TestPicoCLIPlugin testPicoCLIPlugin = testPluginOptional.get();
     assertThat(testPicoCLIPlugin.getState()).isEqualTo("registered");
 
+    contextImpl.beforeExternalServices();
     contextImpl.startPlugins();
     assertThat(testPicoCLIPlugin.getState()).isEqualTo("failstart");
     assertThat(contextImpl.getPlugins()).isNotInstanceOfAny(TestPicoCLIPlugin.class);
@@ -120,6 +126,7 @@ public void stopErrorsHandledSmoothly() {
     final TestPicoCLIPlugin testPicoCLIPlugin = testPluginOptional.get();
     assertThat(testPicoCLIPlugin.getState()).isEqualTo("registered");
 
+    contextImpl.beforeExternalServices();
     contextImpl.startPlugins();
     assertThat(testPicoCLIPlugin.getState()).isEqualTo("started");
 
@@ -140,6 +147,7 @@ public void lifecycleExceptions() throws Throwable {
     assertThatExceptionOfType(IllegalStateException.class).isThrownBy(registerPlugins);
     assertThatExceptionOfType(IllegalStateException.class).isThrownBy(contextImpl::stopPlugins);
 
+    contextImpl.beforeExternalServices();
     contextImpl.startPlugins();
     assertThatExceptionOfType(IllegalStateException.class).isThrownBy(registerPlugins);
     assertThatExceptionOfType(IllegalStateException.class).isThrownBy(contextImpl::startPlugins);
diff --git a/acceptance-tests/tests/build.gradle b/acceptance-tests/tests/build.gradle
index a2502913359..8b23195361d 100644
--- a/acceptance-tests/tests/build.gradle
+++ b/acceptance-tests/tests/build.gradle
@@ -11,19 +11,45 @@
  * specific language governing permissions and limitations under the License.
  */
 
+plugins {
+  id 'org.web3j' version '4.9.2'
+  id 'org.web3j.solidity' version '0.3.5'
+}
+
+configurations.all {
+  resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+    if (details.requested.group == 'org.web3j' && details.requested.version == '4.9.2') {
+      details.useVersion '4.9.4'
+      details.because 'Plugin version is 4.9.2 (latest), but we want it to use web3j libs version 4.9.4'
+    }
+  }
+}
+
+web3j { generatedPackageName = 'org.hyperledger.besu.tests.web3j.generated' }
+
+sourceSets.main.solidity.srcDirs = ["$projectDir/contracts"]
+
+solidity { resolvePackages = false }
+
 dependencies {
-  implementation project(':crypto')
+  api 'org.slf4j:slf4j-api'
+
+  implementation project(':crypto:algorithms')
 
   testImplementation project(':acceptance-tests:dsl')
+  testImplementation project(':acceptance-tests:test-plugins')
   testImplementation project(':besu')
   testImplementation project(':config')
   testImplementation project(':consensus:clique')
+  testImplementation project(':datatypes')
   testImplementation project(':enclave')
   testImplementation project(':ethereum:api')
   testImplementation project(':ethereum:core')
   testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
+  testImplementation project(':ethereum:p2p')
   testImplementation project(':ethereum:permissioning')
   testImplementation project(':ethereum:rlp')
+  testImplementation project(':metrics:core')
   testImplementation project(':plugin-api')
   testImplementation project(':privacy-contracts')
   testImplementation project(':testutil')
@@ -31,16 +57,35 @@ dependencies {
 
   testImplementation 'com.github.tomakehurst:wiremock-jre8-standalone'
   testImplementation 'commons-io:commons-io'
+  testImplementation 'io.grpc:grpc-all'
+  testImplementation 'io.grpc:grpc-core'
+  testImplementation 'io.grpc:grpc-netty'
+  testImplementation 'io.grpc:grpc-stub'
+  testImplementation 'io.opentelemetry:opentelemetry-extension-trace-propagators'
+  testImplementation 'io.opentelemetry.instrumentation:opentelemetry-okhttp-3.0'
+  testImplementation 'io.netty:netty-all'
+  testImplementation 'io.opentelemetry:opentelemetry-api'
+  testImplementation 'io.opentelemetry:opentelemetry-exporter-otlp'
+  testImplementation 'io.opentelemetry.proto:opentelemetry-proto'
+  testImplementation 'io.opentelemetry:opentelemetry-sdk'
+  testImplementation 'io.opentelemetry:opentelemetry-sdk-trace'
+  testImplementation 'io.opentracing.contrib:opentracing-okhttp3'
+  testImplementation 'io.opentracing:opentracing-api'
+  testImplementation 'io.opentracing:opentracing-util'
+  testImplementation 'io.vertx:vertx-core'
   testImplementation 'junit:junit'
-  testImplementation 'net.consensys:orion'
   testImplementation 'org.apache.commons:commons-compress'
-  testImplementation 'org.apache.tuweni:crypto'
+  testImplementation 'org.apache.logging.log4j:log4j-core'
+  testImplementation 'org.apache.tuweni:tuweni-crypto'
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.awaitility:awaitility'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
+  testImplementation 'org.testcontainers:testcontainers'
   testImplementation 'org.web3j:abi'
   testImplementation 'org.web3j:besu'
-  testImplementation 'tech.pegasys.ethsigner.internal:core'
-  testImplementation 'tech.pegasys.ethsigner.internal:file-based'
+  testImplementation 'org.web3j:core'
+
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 }
 
 test.enabled = false
@@ -48,22 +93,81 @@ test.enabled = false
 sourceSets {
   test {
     resources {
-      srcDirs "${rootDir}/besu/build/libs"
+      srcDirs "${rootDir}/acceptance-tests/test-plugins/build/libs"
     }
   }
 }
 
-processTestResources.dependsOn(':besu:testJar')
+processTestResources.dependsOn(':acceptance-tests:test-plugins:testPluginsJar')
 
 task acceptanceTest(type: Test) {
   inputs.property "integration.date", LocalTime.now() // so it runs at every invocation
 
+  useJUnitPlatform {}
+
+  dependsOn(rootProject.installDist)
+  setSystemProperties(test.getSystemProperties())
+  systemProperty 'acctests.runBesuAsProcess', 'true'
+  systemProperty 'java.security.properties', "${buildDir}/resources/test/acceptanceTesting.security"
+  mustRunAfter rootProject.subprojects*.test
+  description = 'Runs ALL Besu acceptance tests (mainnet and non-mainnet).'
+  group = 'verification'
+
+  jvmArgs "-XX:ErrorFile=${buildDir}/jvmErrorLogs/java_err_pid%p.log"
+
+  testLogging {
+    exceptionFormat = 'full'
+    showStackTraces = true
+    showStandardStreams = Boolean.getBoolean('acctests.showStandardStreams')
+    showExceptions = true
+    showCauses = true
+  }
+
+  doFirst { mkdir "${buildDir}/jvmErrorLogs" }
+}
+task acceptanceTestMainnet(type: Test) {
+  inputs.property "integration.date", LocalTime.now() // so it runs at every invocation
+  exclude '**/bft/**'
+  exclude '**/clique/**'
+  exclude '**/permissioning/**'
+  exclude '**/privacy/**'
+
+  useJUnitPlatform {}
+
+  dependsOn(rootProject.installDist)
+  setSystemProperties(test.getSystemProperties())
+  systemProperty 'acctests.runBesuAsProcess', 'true'
+  systemProperty 'java.security.properties', "${buildDir}/resources/test/acceptanceTesting.security"
+  mustRunAfter rootProject.subprojects*.test
+  description = 'Runs MAINNET Besu acceptance tests (excluding permissioning, privacy and some other stable features).'
+  group = 'verification'
+
+  jvmArgs "-XX:ErrorFile=${buildDir}/jvmErrorLogs/java_err_pid%p.log"
+
+  testLogging {
+    exceptionFormat = 'full'
+    showStackTraces = true
+    showStandardStreams = Boolean.getBoolean('acctests.showStandardStreams')
+    showExceptions = true
+    showCauses = true
+  }
+
+  doFirst { mkdir "${buildDir}/jvmErrorLogs" }
+}
+
+task acceptanceTestCliqueBft(type: Test) {
+  inputs.property "integration.date", LocalTime.now() // so it runs at every invocation
+  include '**/bft/**'
+  include '**/clique/**'
+
+  useJUnitPlatform {}
+
   dependsOn(rootProject.installDist)
   setSystemProperties(test.getSystemProperties())
   systemProperty 'acctests.runBesuAsProcess', 'true'
   systemProperty 'java.security.properties', "${buildDir}/resources/test/acceptanceTesting.security"
   mustRunAfter rootProject.subprojects*.test
-  description = 'Runs Besu acceptance tests.'
+  description = 'Runs Clique and BFT Besu acceptance tests.'
   group = 'verification'
 
   jvmArgs "-XX:ErrorFile=${buildDir}/jvmErrorLogs/java_err_pid%p.log"
@@ -76,7 +180,59 @@ task acceptanceTest(type: Test) {
     showCauses = true
   }
 
-  doFirst {
-    mkdir "${buildDir}/jvmErrorLogs"
+  doFirst { mkdir "${buildDir}/jvmErrorLogs" }
+}
+
+task acceptanceTestPrivacy(type: Test) {
+  inputs.property "integration.date", LocalTime.now() // so it runs at every invocation
+  include '**/privacy/**'
+
+  useJUnitPlatform {}
+
+  dependsOn(rootProject.installDist)
+  setSystemProperties(test.getSystemProperties())
+  systemProperty 'acctests.runBesuAsProcess', 'true'
+  systemProperty 'java.security.properties', "${buildDir}/resources/test/acceptanceTesting.security"
+  mustRunAfter rootProject.subprojects*.test
+  description = 'Runs Privacy Besu acceptance tests.'
+  group = 'verification'
+
+  jvmArgs "-XX:ErrorFile=${buildDir}/jvmErrorLogs/java_err_pid%p.log"
+
+  testLogging {
+    exceptionFormat = 'full'
+    showStackTraces = true
+    showStandardStreams = Boolean.getBoolean('acctests.showStandardStreams')
+    showExceptions = true
+    showCauses = true
+  }
+
+  doFirst { mkdir "${buildDir}/jvmErrorLogs" }
+}
+
+task acceptanceTestPermissioning(type: Test) {
+  inputs.property "integration.date", LocalTime.now() // so it runs at every invocation
+  include '**/permissioning/**'
+
+  useJUnitPlatform {}
+
+  dependsOn(rootProject.installDist)
+  setSystemProperties(test.getSystemProperties())
+  systemProperty 'acctests.runBesuAsProcess', 'true'
+  systemProperty 'java.security.properties', "${buildDir}/resources/test/acceptanceTesting.security"
+  mustRunAfter rootProject.subprojects*.test
+  description = 'Runs Permissioning Besu acceptance tests.'
+  group = 'verification'
+
+  jvmArgs "-XX:ErrorFile=${buildDir}/jvmErrorLogs/java_err_pid%p.log"
+
+  testLogging {
+    exceptionFormat = 'full'
+    showStackTraces = true
+    showStandardStreams = Boolean.getBoolean('acctests.showStandardStreams')
+    showExceptions = true
+    showCauses = true
   }
+
+  doFirst { mkdir "${buildDir}/jvmErrorLogs" }
 }
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/CrossContractReader.sol b/acceptance-tests/tests/contracts/CrossContractReader.sol
similarity index 94%
rename from acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/CrossContractReader.sol
rename to acceptance-tests/tests/contracts/CrossContractReader.sol
index 32c6836433e..e54e4c712eb 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/CrossContractReader.sol
+++ b/acceptance-tests/tests/contracts/CrossContractReader.sol
@@ -9,8 +9,10 @@
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
-pragma solidity >=0.4.0 <0.6.0;
+pragma solidity >=0.7.0 <0.9.0;
 
 import "./EventEmitter.sol";
 
@@ -50,7 +52,7 @@ contract CrossContractReader {
     }
 
     function destroy() public {
-        selfdestruct(msg.sender);
+        selfdestruct(payable(msg.sender));
     }
 
     function remoteDestroy(address crossAddress) public {
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/EventEmitter.sol b/acceptance-tests/tests/contracts/EventEmitter.sol
similarity index 95%
rename from acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/EventEmitter.sol
rename to acceptance-tests/tests/contracts/EventEmitter.sol
index 6053bb63c5c..22afa7a0868 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/EventEmitter.sol
+++ b/acceptance-tests/tests/contracts/EventEmitter.sol
@@ -12,8 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-
-pragma solidity >=0.4.0 <0.6.0;
+pragma solidity >=0.7.0 <0.9.0;
 
 // compile with:
 // solc EventEmitter.sol --bin --abi --optimize --overwrite -o .
@@ -25,7 +24,7 @@ contract EventEmitter {
     address _sender;
     uint _value;
 
-    constructor() public {
+    constructor() {
         owner = msg.sender;
     }
 
diff --git a/acceptance-tests/tests/contracts/RemoteSimpleStorage.sol b/acceptance-tests/tests/contracts/RemoteSimpleStorage.sol
new file mode 100644
index 00000000000..072948e035b
--- /dev/null
+++ b/acceptance-tests/tests/contracts/RemoteSimpleStorage.sol
@@ -0,0 +1,37 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+pragma solidity >=0.7.0 <0.9.0;
+
+import "./SimpleStorage.sol";
+
+// compile with:
+// solc RemoteSimpleStorage.sol --bin --abi --optimize --overwrite -o .
+// then create web3j wrappers with:
+// web3j solidity generate -b ./generated/RemoteSimpleStorage.bin -a ./generated/RemoteSimpleStorage.abi -o ../../../../../ -p org.hyperledger.besu.tests.web3j.generated
+contract RemoteSimpleStorage {
+    SimpleStorage public simpleStorage;
+
+    function setRemote(SimpleStorage _simpleStorage) public {
+        simpleStorage = _simpleStorage;
+    }
+
+    function set(uint value) public {
+        simpleStorage.set(value);
+    }
+
+    function get() public view returns (uint) {
+        return simpleStorage.get();
+    }
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/RevertReason.sol b/acceptance-tests/tests/contracts/RevertReason.sol
similarity index 93%
rename from acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/RevertReason.sol
rename to acceptance-tests/tests/contracts/RevertReason.sol
index b2c2d1188c2..d632910662c 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/RevertReason.sol
+++ b/acceptance-tests/tests/contracts/RevertReason.sol
@@ -9,8 +9,10 @@
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
  */
-pragma solidity >=0.4.0 <0.6.0;
+pragma solidity >=0.7.0 <0.9.0;
 
 // compile with:
 // solc RevertReason.sol --bin --abi --optimize --overwrite -o .
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/SimpleStorage.sol b/acceptance-tests/tests/contracts/SimpleStorage.sol
similarity index 97%
rename from acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/SimpleStorage.sol
rename to acceptance-tests/tests/contracts/SimpleStorage.sol
index eabb8d26f10..35dc7c3932f 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/SimpleStorage.sol
+++ b/acceptance-tests/tests/contracts/SimpleStorage.sol
@@ -12,8 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-
-pragma solidity >=0.4.0 <0.6.0;
+pragma solidity >=0.7.0 <0.9.0;
 
 // compile with:
 // solc SimpleStorage.sol --bin --abi --optimize --overwrite -o .
diff --git a/acceptance-tests/tests/contracts/TestDepth.sol b/acceptance-tests/tests/contracts/TestDepth.sol
new file mode 100644
index 00000000000..ec49a1ad8bf
--- /dev/null
+++ b/acceptance-tests/tests/contracts/TestDepth.sol
@@ -0,0 +1,32 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+pragma solidity >=0.7.0 <0.9.0;
+
+contract TestDepth {
+    uint256 public x;
+
+    function depth(uint256 y) public {
+        // bool result;
+        if (y > 0) {
+            bytes memory call = abi.encodeWithSignature("depth(uint256)", --y);
+            (bool result,) = address(this).delegatecall(call);
+            require(result);
+        }
+        else {
+            // Save the remaining gas in storage so that we can access it later
+            x = gasleft();
+        }
+    }
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/simple-permissioning-smart-contract/migrations/1_initial_migration.js b/acceptance-tests/tests/simple-permissioning-smart-contract/migrations/1_initial_migration.js
index 4d5f3f9b02e..90538d95eb3 100644
--- a/acceptance-tests/tests/simple-permissioning-smart-contract/migrations/1_initial_migration.js
+++ b/acceptance-tests/tests/simple-permissioning-smart-contract/migrations/1_initial_migration.js
@@ -1,3 +1,5 @@
+// Copyright ConsenSys AG.
+// SPDX-License-Identifier: Apache-2.0
 var Migrations = artifacts.require("./Migrations.sol");
 
 module.exports = function(deployer) {
diff --git a/acceptance-tests/tests/simple-permissioning-smart-contract/migrations/2_deploy_contracts.js b/acceptance-tests/tests/simple-permissioning-smart-contract/migrations/2_deploy_contracts.js
index b23928c0a26..b3c2fbb0e03 100644
--- a/acceptance-tests/tests/simple-permissioning-smart-contract/migrations/2_deploy_contracts.js
+++ b/acceptance-tests/tests/simple-permissioning-smart-contract/migrations/2_deploy_contracts.js
@@ -1,3 +1,5 @@
+// Copyright ConsenSys AG.
+// SPDX-License-Identifier: Apache-2.0
 var SimpleNodePermissioning = artifacts.require("SimpleNodePermissioning");
 var SimpleAccountPermissioning = artifacts.require("SimpleAccountPermissioning");
 
diff --git a/acceptance-tests/tests/simple-permissioning-smart-contract/test/test-account-permissioning.js b/acceptance-tests/tests/simple-permissioning-smart-contract/test/test-account-permissioning.js
index e987b4a1482..2a23dc5dd57 100644
--- a/acceptance-tests/tests/simple-permissioning-smart-contract/test/test-account-permissioning.js
+++ b/acceptance-tests/tests/simple-permissioning-smart-contract/test/test-account-permissioning.js
@@ -1,3 +1,5 @@
+// Copyright ConsenSys AG.
+// SPDX-License-Identifier: Apache-2.0
 const TestPermissioning = artifacts.require('SimpleAccountPermissioning.sol');
 var proxy;
 
diff --git a/acceptance-tests/tests/simple-permissioning-smart-contract/test/test-node-permissioning.js b/acceptance-tests/tests/simple-permissioning-smart-contract/test/test-node-permissioning.js
index 7b0b135939b..ea748ee4886 100644
--- a/acceptance-tests/tests/simple-permissioning-smart-contract/test/test-node-permissioning.js
+++ b/acceptance-tests/tests/simple-permissioning-smart-contract/test/test-node-permissioning.js
@@ -1,3 +1,5 @@
+// Copyright ConsenSys AG.
+// SPDX-License-Identifier: Apache-2.0
 const TestPermissioning = artifacts.require('SimpleNodePermissioning.sol');
 var proxy;
 
diff --git a/acceptance-tests/tests/simple-permissioning-smart-contract/truffle.js b/acceptance-tests/tests/simple-permissioning-smart-contract/truffle.js
index db2718a5f88..08862e0127f 100644
--- a/acceptance-tests/tests/simple-permissioning-smart-contract/truffle.js
+++ b/acceptance-tests/tests/simple-permissioning-smart-contract/truffle.js
@@ -1,3 +1,5 @@
+// Copyright ConsenSys AG.
+// SPDX-License-Identifier: Apache-2.0
 const PrivateKeyProvider = require('truffle-hdwallet-provider');
 
 // address 627306090abaB3A6e1400e9345bC60c78a8BEf57
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/AbstractPreexistingNodeTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/AbstractPreexistingNodeTest.java
index c05a4ab4818..5c4b58ec019 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/AbstractPreexistingNodeTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/AbstractPreexistingNodeTest.java
@@ -18,7 +18,7 @@
 
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.BesuNodeConfigurationBuilder;
 
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/CreateAccountAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/CreateAccountAcceptanceTest.java
index caa96837956..c0af67c4942 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/CreateAccountAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/CreateAccountAcceptanceTest.java
@@ -19,14 +19,14 @@
 import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Amount;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class CreateAccountAcceptanceTest extends AcceptanceTestBase {
 
   private Node minerNode;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     minerNode = besu.createMinerNode("minerNode");
     cluster.start(minerNode, besu.createArchiveNode("archiveNode"));
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/GossipTransactionAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/GossipTransactionAcceptanceTest.java
index 32eac30de8c..1e6ca018918 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/GossipTransactionAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/GossipTransactionAcceptanceTest.java
@@ -14,21 +14,21 @@
  */
 package org.hyperledger.besu.tests.acceptance;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
 import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Amount;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.account.TransferTransaction;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class GossipTransactionAcceptanceTest extends AcceptanceTestBase {
 
   private Node archiveNode1;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     archiveNode1 = besu.createArchiveNode("archiveNode1");
     cluster.start(archiveNode1, besu.createArchiveNode("archiveNode2"));
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/LoggingTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/LoggingTest.java
new file mode 100644
index 00000000000..e0276842f06
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/LoggingTest.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+public class LoggingTest extends AcceptanceTestBase {
+
+  @Test
+  public void testDefaultLoggingIsAtLeastInfo() throws IOException {
+    final BesuNode node = besu.createArchiveNode("logger");
+    cluster.startConsoleCapture();
+    cluster.runNodeStart(node);
+
+    node.verify(net.awaitPeerCount(0));
+
+    assertThat(cluster.getConsoleContents()).contains("| INFO  |");
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/MetricsAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/MetricsAcceptanceTest.java
index 4fe6ffa3b79..2f7aee17b60 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/MetricsAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/MetricsAcceptanceTest.java
@@ -26,15 +26,15 @@
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class MetricsAcceptanceTest extends AcceptanceTestBase {
 
   private BesuNode metricsNode;
   private OkHttpClient client;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     metricsNode =
         besu.create(
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/OpenTelemetryAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/OpenTelemetryAcceptanceTest.java
new file mode 100644
index 00000000000..79a4fdbb8cf
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/OpenTelemetryAcceptanceTest.java
@@ -0,0 +1,253 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance;
+
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.metrics.MetricsProtocol;
+import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
+import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils;
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.BesuNodeConfigurationBuilder;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.google.common.io.Closer;
+import com.google.protobuf.ByteString;
+import io.grpc.Server;
+import io.grpc.Status;
+import io.grpc.netty.NettyServerBuilder;
+import io.grpc.stub.StreamObserver;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.context.propagation.ContextPropagators;
+import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.extension.trace.propagation.B3Propagator;
+import io.opentelemetry.instrumentation.okhttp.v3_0.OkHttpTelemetry;
+import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest;
+import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceResponse;
+import io.opentelemetry.proto.collector.metrics.v1.MetricsServiceGrpc;
+import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest;
+import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceResponse;
+import io.opentelemetry.proto.collector.trace.v1.TraceServiceGrpc;
+import io.opentelemetry.proto.metrics.v1.ResourceMetrics;
+import io.opentelemetry.proto.trace.v1.ResourceSpans;
+import io.opentelemetry.proto.trace.v1.Span;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.trace.SdkTracerProvider;
+import io.opentelemetry.sdk.trace.samplers.Sampler;
+import okhttp3.Call;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class OpenTelemetryAcceptanceTest extends AcceptanceTestBase {
+
+  private static final class FakeCollector extends TraceServiceGrpc.TraceServiceImplBase {
+    private final List<ResourceSpans> receivedSpans = new ArrayList<>();
+    private final Status returnedStatus = Status.OK;
+
+    @Override
+    public void export(
+        final ExportTraceServiceRequest request,
+        final StreamObserver<ExportTraceServiceResponse> responseObserver) {
+      receivedSpans.addAll(request.getResourceSpansList());
+      responseObserver.onNext(ExportTraceServiceResponse.newBuilder().build());
+      if (!returnedStatus.isOk()) {
+        if (returnedStatus.getCode() == Status.Code.DEADLINE_EXCEEDED) {
+          // Do not call onCompleted to simulate a deadline exceeded.
+          return;
+        }
+        responseObserver.onError(returnedStatus.asRuntimeException());
+        return;
+      }
+      responseObserver.onCompleted();
+    }
+
+    List<ResourceSpans> getReceivedSpans() {
+      return receivedSpans;
+    }
+  }
+
+  private static final class FakeMetricsCollector
+      extends MetricsServiceGrpc.MetricsServiceImplBase {
+    private final List<ResourceMetrics> receivedMetrics = new ArrayList<>();
+    private final Status returnedStatus = Status.OK;
+
+    @Override
+    public void export(
+        final ExportMetricsServiceRequest request,
+        final StreamObserver<ExportMetricsServiceResponse> responseObserver) {
+
+      receivedMetrics.addAll(request.getResourceMetricsList());
+      responseObserver.onNext(ExportMetricsServiceResponse.newBuilder().build());
+      if (!returnedStatus.isOk()) {
+        if (returnedStatus.getCode() == Status.Code.DEADLINE_EXCEEDED) {
+          // Do not call onCompleted to simulate a deadline exceeded.
+          return;
+        }
+        responseObserver.onError(returnedStatus.asRuntimeException());
+        return;
+      }
+      responseObserver.onCompleted();
+    }
+
+    List<ResourceMetrics> getReceivedMetrics() {
+      return receivedMetrics;
+    }
+  }
+
+  private final FakeMetricsCollector fakeMetricsCollector = new FakeMetricsCollector();
+  private final FakeCollector fakeTracesCollector = new FakeCollector();
+  private final Closer closer = Closer.create();
+
+  private BesuNode metricsNode;
+
+  @BeforeEach
+  public void setUp() throws Exception {
+    System.setProperty("root.log.level", "DEBUG");
+    final Server server =
+        NettyServerBuilder.forPort(4317)
+            .addService(fakeTracesCollector)
+            .addService(fakeMetricsCollector)
+            .build()
+            .start();
+    closer.register(server::shutdownNow);
+
+    final MetricsConfiguration configuration =
+        MetricsConfiguration.builder()
+            .protocol(MetricsProtocol.OPENTELEMETRY)
+            .enabled(true)
+            .port(0)
+            .hostsAllowlist(singletonList("*"))
+            .build();
+    final Map<String, String> env = new HashMap<>();
+    env.put("OTEL_METRIC_EXPORT_INTERVAL", "1000");
+    env.put("OTEL_TRACES_SAMPLER", "always_on");
+    env.put("OTEL_EXPORTER_OTLP_ENDPOINT", "http://localhost:4317");
+    env.put("OTEL_EXPORTER_OTLP_INSECURE", "true");
+    env.put("OTEL_EXPORTER_OTLP_PROTOCOL", "grpc");
+    env.put("OTEL_BSP_SCHEDULE_DELAY", "1000");
+    env.put("OTEL_BSP_EXPORT_TIMEOUT", "3000");
+
+    metricsNode =
+        besu.create(
+            new BesuNodeConfigurationBuilder()
+                .name("metrics-node")
+                .jsonRpcEnabled()
+                .metricsConfiguration(configuration)
+                .environment(env)
+                .build());
+    cluster.start(metricsNode);
+  }
+
+  @AfterEach
+  public void tearDown() throws Exception {
+    closer.close();
+  }
+
+  @Test
+  public void metricsReporting() {
+    WaitUtils.waitFor(
+        30,
+        () -> {
+          final List<ResourceMetrics> resourceMetrics = fakeMetricsCollector.getReceivedMetrics();
+          assertThat(resourceMetrics.isEmpty()).isFalse();
+        });
+  }
+
+  @Test
+  public void traceReporting() {
+    // longer timeout since at 30s this test is flaky
+    WaitUtils.waitFor(
+        60,
+        () -> {
+          // call the json RPC endpoint to generate a trace.
+          net.netVersion().verify(metricsNode);
+          final List<ResourceSpans> spans = fakeTracesCollector.getReceivedSpans();
+          assertThat(spans.isEmpty()).isFalse();
+          final Span internalSpan = spans.get(0).getScopeSpans(0).getSpans(0);
+          assertThat(internalSpan.getKind()).isEqualTo(Span.SpanKind.SPAN_KIND_INTERNAL);
+          final ByteString parent = internalSpan.getParentSpanId();
+          assertThat(parent.isEmpty()).isFalse();
+          final Span serverSpan = spans.get(0).getScopeSpans(0).getSpans(1);
+          assertThat(serverSpan.getKind()).isEqualTo(Span.SpanKind.SPAN_KIND_SERVER);
+          final ByteString rootSpanId = serverSpan.getParentSpanId();
+          assertThat(rootSpanId.isEmpty()).isTrue();
+        });
+  }
+
+  @Test
+  public void traceReportingWithTraceId() {
+    final Duration timeout = Duration.ofSeconds(1);
+    WaitUtils.waitFor(
+        60,
+        () -> {
+          final OpenTelemetry openTelemetry =
+              OpenTelemetrySdk.builder()
+                  .setPropagators(
+                      ContextPropagators.create(
+                          TextMapPropagator.composite(B3Propagator.injectingSingleHeader())))
+                  .setTracerProvider(
+                      SdkTracerProvider.builder().setSampler(Sampler.alwaysOn()).build())
+                  .build();
+          final Call.Factory client =
+              OkHttpTelemetry.builder(openTelemetry)
+                  .build()
+                  .newCallFactory(
+                      new OkHttpClient.Builder()
+                          .connectTimeout(timeout)
+                          .readTimeout(timeout)
+                          .writeTimeout(timeout)
+                          .build());
+          final Request request =
+              new Request.Builder()
+                  .url("http://localhost:" + metricsNode.getJsonRpcPort().get())
+                  .post(
+                      RequestBody.create(
+                          "{\"jsonrpc\":\"2.0\",\"method\":\"net_version\",\"params\":[],\"id\":255}",
+                          MediaType.get("application/json")))
+                  .build();
+          final Response response = client.newCall(request).execute();
+          try {
+            assertThat(response.code()).isEqualTo(200);
+            final List<ResourceSpans> spans =
+                new ArrayList<>(fakeTracesCollector.getReceivedSpans());
+            assertThat(spans.isEmpty()).isFalse();
+            final Span internalSpan = spans.get(0).getScopeSpans(0).getSpans(0);
+            assertThat(internalSpan.getKind()).isEqualTo(Span.SpanKind.SPAN_KIND_INTERNAL);
+            final ByteString parent = internalSpan.getParentSpanId();
+            assertThat(parent.isEmpty()).isFalse();
+            final Span serverSpan = spans.get(0).getScopeSpans(0).getSpans(1);
+            assertThat(serverSpan.getKind()).isEqualTo(Span.SpanKind.SPAN_KIND_SERVER);
+            final ByteString rootSpanId = serverSpan.getParentSpanId();
+            assertThat(rootSpanId.isEmpty()).isFalse();
+          } finally {
+            response.close();
+            fakeTracesCollector.getReceivedSpans().clear();
+          }
+        });
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/RpcApisTogglesAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/RpcApisTogglesAcceptanceTest.java
index 6ffed6e8b9c..821d440b71c 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/RpcApisTogglesAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/RpcApisTogglesAcceptanceTest.java
@@ -22,8 +22,8 @@
 import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
 
 import org.java_websocket.exceptions.WebsocketNotConnectedException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class RpcApisTogglesAcceptanceTest extends AcceptanceTestBase {
 
@@ -31,11 +31,11 @@ public class RpcApisTogglesAcceptanceTest extends AcceptanceTestBase {
   private BesuNode rpcDisabledNode;
   private BesuNode ethApiDisabledNode;
 
-  @Before
+  @BeforeEach
   public void before() throws Exception {
     rpcEnabledNode = besu.createArchiveNode("rpc-enabled");
     rpcDisabledNode = besu.createArchiveNodeWithRpcDisabled("rpc-disabled");
-    ethApiDisabledNode = besu.createArchiveNodeWithRpcApis("eth-api-disabled", RpcApis.NET);
+    ethApiDisabledNode = besu.createArchiveNodeWithRpcApis("eth-api-disabled", RpcApis.NET.name());
     cluster.start(rpcEnabledNode, rpcDisabledNode, ethApiDisabledNode);
   }
 
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/RunHelpTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/RunHelpTest.java
index eeec787cf8b..dabb277b048 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/RunHelpTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/RunHelpTest.java
@@ -22,7 +22,7 @@
 
 import java.io.IOException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class RunHelpTest extends AcceptanceTestBase {
 
@@ -38,6 +38,5 @@ public void testShowsHelpAndExits() throws IOException {
     final String consoleContents = cluster.getConsoleContents();
     assertThat(consoleContents)
         .startsWith("Usage:\n\nbesu [OPTIONS] [COMMAND]\n\nDescription:\n\n");
-    assertThat(consoleContents).endsWith("\nBesu is licensed under the Apache License 2.0\n");
   }
 }
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/backup/BackupRoundTripAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/backup/BackupRoundTripAcceptanceTest.java
index f38fd093099..d2afc2e6d39 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/backup/BackupRoundTripAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/backup/BackupRoundTripAcceptanceTest.java
@@ -20,8 +20,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.hyperledger.besu.config.JsonUtil;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.tests.acceptance.AbstractPreexistingNodeTest;
 import org.hyperledger.besu.tests.acceptance.database.DatabaseMigrationAcceptanceTest;
 import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils;
@@ -36,10 +36,10 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
-import java.util.function.Function;
+import java.util.function.UnaryOperator;
+import javax.annotation.Nonnull;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -139,10 +139,7 @@ public void backupRoundtripAndBack() throws IOException {
         besu.createNode(
             "restore " + testName,
             configureNodeCommands(
-                restorePath,
-                "operator",
-                "x-restore-state",
-                "--backup-path=" + backupPath.toString()));
+                restorePath, "operator", "x-restore-state", "--backup-path=" + backupPath));
     cluster.startNode(restoreNode);
     WaitUtils.waitFor(60, () -> restoreNode.verify(exitedSuccessfully));
 
@@ -185,9 +182,9 @@ public void backupRoundtripAndBack() throws IOException {
     assertThat(rebackupManifest).isEqualTo(backupManifest);
   }
 
-  @NotNull
-  private Function<BesuNodeConfigurationBuilder, BesuNodeConfigurationBuilder>
-      configureNodeCommands(final Path dataPath, final String... commands) {
+  @Nonnull
+  private UnaryOperator<BesuNodeConfigurationBuilder> configureNodeCommands(
+      final Path dataPath, final String... commands) {
     return nodeBuilder -> super.configureNode(nodeBuilder).dataPath(dataPath).run(commands);
   }
 }
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftAcceptanceTestParameterization.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftAcceptanceTestParameterization.java
new file mode 100644
index 00000000000..b7464190abe
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftAcceptanceTestParameterization.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.bft;
+
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.BesuNodeFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class BftAcceptanceTestParameterization {
+
+  public static List<Object[]> getFactories() {
+    final List<Object[]> ret = new ArrayList<>();
+    ret.addAll(
+        List.of(
+            new Object[] {
+              "ibft2",
+              new BftAcceptanceTestParameterization(
+                  BesuNodeFactory::createIbft2Node, BesuNodeFactory::createIbft2NodeWithValidators)
+            },
+            new Object[] {
+              "qbft",
+              new BftAcceptanceTestParameterization(
+                  BesuNodeFactory::createQbftNode, BesuNodeFactory::createQbftNodeWithValidators)
+            }));
+    return ret;
+  }
+
+  @FunctionalInterface
+  public interface NodeCreator {
+
+    BesuNode create(BesuNodeFactory factory, String name) throws Exception;
+  }
+
+  @FunctionalInterface
+  public interface NodeWithValidatorsCreator {
+
+    BesuNode create(BesuNodeFactory factory, String name, String[] validators) throws Exception;
+  }
+
+  private final NodeCreator creatorFn;
+  private final NodeWithValidatorsCreator createorWithValidatorFn;
+
+  public BftAcceptanceTestParameterization(
+      final NodeCreator creatorFn, final NodeWithValidatorsCreator createorWithValidatorFn) {
+    this.creatorFn = creatorFn;
+    this.createorWithValidatorFn = createorWithValidatorFn;
+  }
+
+  public BesuNode createNode(BesuNodeFactory factory, String name) throws Exception {
+    return creatorFn.create(factory, name);
+  }
+
+  public BesuNode createNodeWithValidators(
+      BesuNodeFactory factory, String name, String[] validators) throws Exception {
+    return createorWithValidatorFn.create(factory, name, validators);
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftBlockRewardPaymentAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftBlockRewardPaymentAcceptanceTest.java
new file mode 100644
index 00000000000..4225035b7ff
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftBlockRewardPaymentAcceptanceTest.java
@@ -0,0 +1,251 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.bft;
+
+import static java.util.Collections.singletonList;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
+import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Amount;
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NavigableMap;
+import java.util.Optional;
+import java.util.TreeMap;
+
+import org.junit.Test;
+
+public class BftBlockRewardPaymentAcceptanceTest extends ParameterizedBftTestBase {
+
+  private static final Amount BLOCK_REWARD = Amount.wei(new BigInteger("5000000000000000000", 10));
+
+  public BftBlockRewardPaymentAcceptanceTest(
+      final String testName, final BftAcceptanceTestParameterization nodeFactory) {
+    super(testName, nodeFactory);
+  }
+
+  @Test
+  public void validatorsArePaidBlockReward() throws Exception {
+    final String[] validators = {"validator"};
+    final BesuNode validator = nodeFactory.createNodeWithValidators(besu, "validator", validators);
+    final BesuNode nonValidator =
+        nodeFactory.createNodeWithValidators(besu, "nonValidator", validators);
+    cluster.start(validator, nonValidator);
+    final Account validator1Account = Account.create(ethTransactions, validator.getAddress());
+
+    final int blockRewardEth = 5;
+    final int blockToCheck = 2;
+
+    cluster.verify(validator1Account.balanceAtBlockEquals(Amount.ether(0), BigInteger.ZERO));
+    cluster.verify(
+        validator1Account.balanceAtBlockEquals(
+            Amount.ether(blockRewardEth * blockToCheck), BigInteger.valueOf(blockToCheck)));
+  }
+
+  @Test
+  public void payBlockRewardToConfiguredNode() throws Exception {
+    final String[] validators = {"validator1"};
+    final BesuNode validator1 =
+        nodeFactory.createNodeWithValidators(besu, "validator1", validators);
+    final Optional<String> initialConfig =
+        validator1.getGenesisConfigProvider().create(singletonList(validator1));
+    if (initialConfig.isEmpty()) {
+      throw new RuntimeException("Unable to generate genesis config.");
+    }
+
+    final String miningBeneficiaryAddress = "0x1234567890123456789012345678901234567890";
+    final Account miningBeneficiaryAccount =
+        Account.create(ethTransactions, Address.fromHexString(miningBeneficiaryAddress));
+
+    final String bftOptions = formatKeyValues("miningbeneficiary", miningBeneficiaryAddress);
+    final String configWithMiningBeneficiary = configureBftOptions(initialConfig.get(), bftOptions);
+    validator1.setGenesisConfig(configWithMiningBeneficiary);
+
+    cluster.start(validator1);
+    final int blockRewardEth = 5;
+    final int blockToCheck = 2;
+
+    cluster.verify(miningBeneficiaryAccount.balanceAtBlockEquals(Amount.ether(0), BigInteger.ZERO));
+    cluster.verify(
+        miningBeneficiaryAccount.balanceAtBlockEquals(
+            Amount.ether(blockRewardEth * blockToCheck), BigInteger.valueOf(blockToCheck)));
+  }
+
+  @Test
+  public void payBlockRewardAccordingToTransitions_defaultInitialMiningBeneficiary()
+      throws Exception {
+    final List<Address> addresses = generateAddresses(2);
+    final Map<Long, Optional<Address>> transitions =
+        Map.of(
+            2L, Optional.of(addresses.get(0)),
+            3L, Optional.of(addresses.get(1)),
+            6L, Optional.empty(),
+            8L, Optional.of(addresses.get(0)));
+    testMiningBeneficiaryTransitions(Optional.empty(), transitions);
+  }
+
+  @Test
+  public void payBlockRewardAccordingToTransitions_customInitialMiningBeneficiary()
+      throws Exception {
+    final List<Address> addresses = generateAddresses(4);
+    final Map<Long, Optional<Address>> transitions =
+        Map.of(
+            1L, Optional.of(addresses.get(1)),
+            2L, Optional.of(addresses.get(2)),
+            3L, Optional.of(addresses.get(3)),
+            4L, Optional.empty());
+
+    testMiningBeneficiaryTransitions(Optional.of(addresses.get(0)), transitions);
+  }
+
+  private List<Address> generateAddresses(final int count) {
+    final List<Address> addresses = new ArrayList<>();
+    for (int i = 0; i < count; i++) {
+      addresses.add(Address.fromHexString(Integer.toString(i + 1, 16)));
+    }
+
+    return addresses;
+  }
+
+  private void testMiningBeneficiaryTransitions(
+      final Optional<Address> initialMiningBeneficiary,
+      final Map<Long, Optional<Address>> miningBeneficiaryTransitions)
+      throws Exception {
+    final String[] validators = {"validator1"};
+    final BesuNode validator1 =
+        nodeFactory.createNodeWithValidators(besu, "validator1", validators);
+    final Optional<String> initialConfig =
+        validator1.getGenesisConfigProvider().create(singletonList(validator1));
+    if (initialConfig.isEmpty()) {
+      throw new RuntimeException("Unable to generate genesis config.");
+    }
+
+    final String miningBeneficiary = initialMiningBeneficiary.map(Address::toHexString).orElse("");
+    final String bftOptions = formatKeyValues("miningbeneficiary", miningBeneficiary);
+    final String configWithMiningBeneficiary =
+        configureBftOptions(initialConfig.get(), bftOptions, miningBeneficiaryTransitions);
+    validator1.setGenesisConfig(configWithMiningBeneficiary);
+
+    cluster.start(validator1);
+
+    // Check that expected address receive block reward at each block
+    final NavigableMap<Long, Optional<Address>> orderedTransitions =
+        new TreeMap<>(miningBeneficiaryTransitions);
+    final long lastConfiguredBlock = orderedTransitions.lastKey();
+    final Map<Address, Amount> accountBalances = new HashMap<>();
+    for (long i = 1; i < lastConfiguredBlock + 2; i++) {
+      final Address beneficiaryAddress =
+          Optional.ofNullable(orderedTransitions.floorEntry(i))
+              .flatMap(Entry::getValue)
+              .orElse(validator1.getAddress());
+      final Account beneficiary = Account.create(ethTransactions, beneficiaryAddress);
+
+      final Amount currentBalance =
+          accountBalances.computeIfAbsent(beneficiaryAddress, __ -> Amount.wei(BigInteger.ZERO));
+      cluster.verify(beneficiary.balanceAtBlockEquals(currentBalance, BigInteger.valueOf(i - 1)));
+      final Amount newBalance = currentBalance.add(BLOCK_REWARD);
+      cluster.verify(beneficiary.balanceAtBlockEquals(newBalance, BigInteger.valueOf(i)));
+      accountBalances.put(beneficiaryAddress, newBalance);
+    }
+  }
+
+  private String formatKeyValues(final Object... keyOrValue) {
+    if (keyOrValue.length % 2 == 1) {
+      // An odd number of strings cannot form a set of key-value pairs
+      throw new IllegalArgumentException("Must supply key-value pairs");
+    }
+    final StringBuilder stringBuilder = new StringBuilder();
+    for (int i = 0; i < keyOrValue.length; i += 2) {
+      if (i > 0) {
+        stringBuilder.append(", ");
+      }
+      final String key = keyOrValue[i].toString();
+      final Object value = keyOrValue[i + 1];
+      final String valueStr = value instanceof String ? quote(value) : value.toString();
+      stringBuilder.append(String.format("\n%s: %s", quote(key), valueStr));
+    }
+    return stringBuilder.toString();
+  }
+
+  private String quote(final Object value) {
+    return '"' + value.toString() + '"';
+  }
+
+  private String configureBftOptions(final String originalOptions, final String bftOptions) {
+    return configureBftOptions(originalOptions, bftOptions, Collections.emptyMap());
+  }
+
+  private String configureBftOptions(
+      final String originalOptions,
+      final String bftOptions,
+      final Map<Long, Optional<Address>> transitions) {
+    final StringBuilder stringBuilder =
+        new StringBuilder()
+            .append(formatBftTransitionsOptions(transitions))
+            .append(",\n")
+            .append(quote(bftType))
+            .append(": {")
+            .append(bftOptions)
+            .append(",");
+    return originalOptions.replace(quote(bftType) + ": {", stringBuilder.toString());
+  }
+
+  private String formatBftTransitionsOptions(final Map<Long, Optional<Address>> transitions) {
+    final StringBuilder stringBuilder = new StringBuilder();
+
+    stringBuilder.append(quote("transitions"));
+    stringBuilder.append(": {\n");
+    stringBuilder.append(quote(bftType));
+    stringBuilder.append(": [");
+
+    boolean isFirst = true;
+    for (Long blockNumber : transitions.keySet()) {
+      if (!isFirst) {
+        stringBuilder.append(",");
+      }
+      isFirst = false;
+
+      final Optional<Address> miningBeneficiary = transitions.get(blockNumber);
+      stringBuilder.append("\n");
+      stringBuilder.append(formatTransition(blockNumber, miningBeneficiary));
+    }
+
+    stringBuilder.append("\n]");
+    stringBuilder.append("}\n");
+
+    return stringBuilder.toString();
+  }
+
+  private String formatTransition(
+      final long blockNumber, final Optional<Address> miningBeneficiary) {
+    final StringBuilder stringBuilder = new StringBuilder();
+    stringBuilder.append("{");
+    stringBuilder.append(
+        formatKeyValues(
+            "block",
+            blockNumber,
+            "miningbeneficiary",
+            miningBeneficiary.map(Address::toHexString).orElse("")));
+    stringBuilder.append("}");
+    return stringBuilder.toString();
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftDiscardRpcAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftDiscardRpcAcceptanceTest.java
new file mode 100644
index 00000000000..40d0e881459
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftDiscardRpcAcceptanceTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.bft;
+
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+
+import org.junit.Test;
+
+public class BftDiscardRpcAcceptanceTest extends ParameterizedBftTestBase {
+
+  public BftDiscardRpcAcceptanceTest(
+      final String testName, final BftAcceptanceTestParameterization nodeFactory) {
+    super(testName, nodeFactory);
+  }
+
+  @Test
+  public void shouldDiscardVotes() throws Exception {
+    final String[] validators = {"validator1", "validator3"};
+    final BesuNode validator1 =
+        nodeFactory.createNodeWithValidators(besu, "validator1", validators);
+    final BesuNode validator2 =
+        nodeFactory.createNodeWithValidators(besu, "validator2", validators);
+    final BesuNode validator3 =
+        nodeFactory.createNodeWithValidators(besu, "validator3", validators);
+    cluster.start(validator1, validator2, validator3);
+
+    validator1.execute(bftTransactions.createAddProposal(validator2));
+    validator1.execute(bftTransactions.createRemoveProposal(validator3));
+    validator1.verify(
+        bft.pendingVotesEqual().addProposal(validator2).removeProposal(validator3).build());
+
+    validator1.execute(bftTransactions.createDiscardProposal(validator2));
+    validator1.verify(bft.pendingVotesEqual().removeProposal(validator3).build());
+
+    validator1.execute(bftTransactions.createDiscardProposal(validator3));
+    cluster.verify(bft.noProposals());
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftMiningAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftMiningAcceptanceTest.java
new file mode 100644
index 00000000000..e529268cb59
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftMiningAcceptanceTest.java
@@ -0,0 +1,227 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.bft;
+
+import org.hyperledger.besu.config.JsonUtil;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.AddressHelpers;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
+import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Amount;
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+
+import java.util.List;
+import java.util.Optional;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.junit.Test;
+
+public class BftMiningAcceptanceTest extends ParameterizedBftTestBase {
+
+  public BftMiningAcceptanceTest(
+      final String testName, final BftAcceptanceTestParameterization nodeFactory) {
+    super(testName, nodeFactory);
+  }
+
+  @Test
+  public void shouldMineOnSingleNodeWithPaidGas_Berlin() throws Exception {
+    final BesuNode minerNode = nodeFactory.createNode(besu, "miner1");
+    cluster.start(minerNode);
+
+    cluster.verify(blockchain.reachesHeight(minerNode, 1));
+
+    final Account sender = accounts.createAccount("account1");
+    final Account receiver = accounts.createAccount("account2");
+
+    minerNode.execute(accountTransactions.createTransfer(sender, 50));
+    cluster.verify(sender.balanceEquals(50));
+
+    minerNode.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 1));
+    cluster.verify(receiver.balanceEquals(1));
+
+    minerNode.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 2));
+    cluster.verify(receiver.balanceEquals(3));
+  }
+
+  @Test
+  public void shouldMineOnSingleNodeWithFreeGas_Berlin() throws Exception {
+    final BesuNode minerNode = nodeFactory.createNode(besu, "miner1");
+    final MiningParameters zeroGasMiningParams =
+        new MiningParameters.Builder()
+            .miningEnabled(true)
+            .minTransactionGasPrice(Wei.ZERO)
+            .coinbase(AddressHelpers.ofValue(1))
+            .build();
+    minerNode.setMiningParameters(zeroGasMiningParams);
+
+    cluster.start(minerNode);
+
+    cluster.verify(blockchain.reachesHeight(minerNode, 1));
+
+    final Account sender = accounts.createAccount("account1");
+    final Account receiver = accounts.createAccount("account2");
+
+    minerNode.execute(accountTransactions.createTransfer(sender, 50, Amount.ZERO));
+    cluster.verify(sender.balanceEquals(50));
+
+    minerNode.execute(
+        accountTransactions.createIncrementalTransfers(sender, receiver, 1, Amount.ZERO));
+    cluster.verify(receiver.balanceEquals(1));
+
+    minerNode.execute(
+        accountTransactions.createIncrementalTransfers(sender, receiver, 2, Amount.ZERO));
+    cluster.verify(receiver.balanceEquals(3));
+  }
+
+  @Test
+  public void shouldMineOnSingleNodeWithPaidGas_London() throws Exception {
+    final BesuNode minerNode = nodeFactory.createNode(besu, "miner1");
+    updateGenesisConfigToLondon(minerNode, false);
+
+    cluster.start(minerNode);
+
+    cluster.verify(blockchain.reachesHeight(minerNode, 1));
+
+    final Account sender = accounts.createAccount("account1");
+    final Account receiver = accounts.createAccount("account2");
+
+    minerNode.execute(accountTransactions.createTransfer(sender, 50));
+    cluster.verify(sender.balanceEquals(50));
+
+    minerNode.execute(accountTransactions.create1559Transfer(sender, 50, 4));
+    cluster.verify(sender.balanceEquals(100));
+
+    minerNode.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 1));
+    cluster.verify(receiver.balanceEquals(1));
+
+    minerNode.execute(accountTransactions.create1559IncrementalTransfers(sender, receiver, 2, 4));
+    cluster.verify(receiver.balanceEquals(3));
+  }
+
+  @Test
+  public void shouldMineOnSingleNodeWithFreeGas_London() throws Exception {
+    final BesuNode minerNode = nodeFactory.createNode(besu, "miner1");
+    updateGenesisConfigToLondon(minerNode, true);
+
+    cluster.start(minerNode);
+
+    cluster.verify(blockchain.reachesHeight(minerNode, 1));
+
+    final Account sender = accounts.createAccount("account1");
+    final Account receiver = accounts.createAccount("account2");
+
+    minerNode.execute(accountTransactions.createTransfer(sender, 50, Amount.ZERO));
+    cluster.verify(sender.balanceEquals(50));
+
+    minerNode.execute(accountTransactions.create1559Transfer(sender, 50, 4, Amount.ZERO));
+    cluster.verify(sender.balanceEquals(100));
+
+    minerNode.execute(
+        accountTransactions.createIncrementalTransfers(sender, receiver, 1, Amount.ZERO));
+    cluster.verify(receiver.balanceEquals(1));
+
+    minerNode.execute(
+        accountTransactions.create1559IncrementalTransfers(sender, receiver, 2, 4, Amount.ZERO));
+    cluster.verify(receiver.balanceEquals(3));
+  }
+
+  @Test
+  public void shouldMineOnMultipleNodes() throws Exception {
+    final BesuNode minerNode1 = nodeFactory.createNode(besu, "miner1");
+    final BesuNode minerNode2 = nodeFactory.createNode(besu, "miner2");
+    final BesuNode minerNode3 = nodeFactory.createNode(besu, "miner3");
+    final BesuNode minerNode4 = nodeFactory.createNode(besu, "miner4");
+    cluster.start(minerNode1, minerNode2, minerNode3, minerNode4);
+
+    cluster.verify(blockchain.reachesHeight(minerNode1, 1, 85));
+
+    final Account sender = accounts.createAccount("account1");
+    final Account receiver = accounts.createAccount("account2");
+
+    minerNode1.execute(accountTransactions.createTransfer(sender, 50));
+    cluster.verify(sender.balanceEquals(50));
+
+    minerNode2.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 1));
+    cluster.verify(receiver.balanceEquals(1));
+
+    minerNode3.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 2));
+    cluster.verify(receiver.balanceEquals(3));
+
+    minerNode4.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 3));
+    cluster.verify(receiver.balanceEquals(6));
+  }
+
+  @Test
+  public void shouldMineOnMultipleNodesEvenWhenClusterContainsNonValidator() throws Exception {
+    final String[] validators = {"validator1", "validator2", "validator3"};
+    final BesuNode validator1 =
+        nodeFactory.createNodeWithValidators(besu, "validator1", validators);
+    final BesuNode validator2 =
+        nodeFactory.createNodeWithValidators(besu, "validator2", validators);
+    final BesuNode validator3 =
+        nodeFactory.createNodeWithValidators(besu, "validator3", validators);
+    final BesuNode nonValidatorNode =
+        nodeFactory.createNodeWithValidators(besu, "non-validator", validators);
+    cluster.start(validator1, validator2, validator3, nonValidatorNode);
+
+    cluster.verify(blockchain.reachesHeight(validator1, 1, 85));
+
+    final Account sender = accounts.createAccount("account1");
+    final Account receiver = accounts.createAccount("account2");
+
+    validator1.execute(accountTransactions.createTransfer(sender, 50));
+    cluster.verify(sender.balanceEquals(50));
+
+    validator2.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 1));
+    cluster.verify(receiver.balanceEquals(1));
+
+    nonValidatorNode.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 2));
+    cluster.verify(receiver.balanceEquals(3));
+  }
+
+  @Test
+  public void shouldStillMineWhenANonProposerNodeFailsAndHasSufficientValidators()
+      throws Exception {
+    final BesuNode minerNode1 = nodeFactory.createNode(besu, "miner1");
+    final BesuNode minerNode2 = nodeFactory.createNode(besu, "miner2");
+    final BesuNode minerNode3 = nodeFactory.createNode(besu, "miner3");
+    final BesuNode minerNode4 = nodeFactory.createNode(besu, "miner4");
+    final List<BesuNode> validators =
+        bft.validators(new BesuNode[] {minerNode1, minerNode2, minerNode3, minerNode4});
+    final BesuNode nonProposerNode = validators.get(validators.size() - 1);
+    cluster.start(validators);
+
+    cluster.verify(blockchain.reachesHeight(minerNode1, 1, 85));
+
+    final Account receiver = accounts.createAccount("account2");
+
+    cluster.stopNode(nonProposerNode);
+    validators.get(0).execute(accountTransactions.createTransfer(receiver, 80));
+
+    cluster.verifyOnActiveNodes(receiver.balanceEquals(80));
+  }
+
+  private static void updateGenesisConfigToLondon(
+      final BesuNode minerNode, final boolean zeroBaseFeeEnabled) {
+    final Optional<String> genesisConfig =
+        minerNode.getGenesisConfigProvider().create(List.of(minerNode));
+    final ObjectNode genesisConfigNode = JsonUtil.objectNodeFromString(genesisConfig.orElseThrow());
+    final ObjectNode config = (ObjectNode) genesisConfigNode.get("config");
+    config.remove("berlinBlock");
+    config.put("londonBlock", 0);
+    config.put("zeroBaseFee", zeroBaseFeeEnabled);
+    minerNode.setGenesisConfig(genesisConfigNode.toString());
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftProposalRpcAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftProposalRpcAcceptanceTest.java
new file mode 100644
index 00000000000..7fccf33fa27
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftProposalRpcAcceptanceTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.bft;
+
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+
+import org.junit.Test;
+
+public class BftProposalRpcAcceptanceTest extends ParameterizedBftTestBase {
+
+  public BftProposalRpcAcceptanceTest(
+      final String testName, final BftAcceptanceTestParameterization nodeFactory) {
+    super(testName, nodeFactory);
+  }
+
+  @Test
+  public void shouldReturnProposals() throws Exception {
+    final String[] validators = {"validator1", "validator2", "validator3"};
+    final BesuNode validator1 =
+        nodeFactory.createNodeWithValidators(besu, "validator1", validators);
+    final BesuNode validator2 =
+        nodeFactory.createNodeWithValidators(besu, "validator2", validators);
+    final BesuNode validator3 =
+        nodeFactory.createNodeWithValidators(besu, "validator3", validators);
+    cluster.start(validator1, validator2, validator3);
+
+    cluster.verify(bft.noProposals());
+    validator1.execute(bftTransactions.createAddProposal(validator3));
+    validator1.execute(bftTransactions.createRemoveProposal(validator2));
+    validator2.execute(bftTransactions.createRemoveProposal(validator3));
+
+    validator1.verify(
+        bft.pendingVotesEqual().addProposal(validator3).removeProposal(validator2).build());
+    validator2.verify(bft.pendingVotesEqual().removeProposal(validator3).build());
+    validator3.verify(bft.noProposals());
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftProposeRpcAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftProposeRpcAcceptanceTest.java
new file mode 100644
index 00000000000..7db3d6a5b9f
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftProposeRpcAcceptanceTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.bft;
+
+import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+
+import org.junit.Test;
+
+// These tests prove the ibft_proposeValidatorVote and ibft_getValidatorsByBlockNumber (implicitly)
+// JSON RPC calls.
+public class BftProposeRpcAcceptanceTest extends ParameterizedBftTestBase {
+
+  public BftProposeRpcAcceptanceTest(
+      final String testName, final BftAcceptanceTestParameterization nodeFactory) {
+    super(testName, nodeFactory);
+  }
+
+  @Test
+  public void validatorsCanBeAddedAndThenRemoved() throws Exception {
+    final String[] validators = {"validator1", "validator2", "validator3"};
+    final BesuNode validator1 =
+        nodeFactory.createNodeWithValidators(besu, "validator1", validators);
+    final BesuNode validator2 =
+        nodeFactory.createNodeWithValidators(besu, "validator2", validators);
+    final BesuNode validator3 =
+        nodeFactory.createNodeWithValidators(besu, "validator3", validators);
+    final BesuNode nonValidatorNode =
+        nodeFactory.createNodeWithValidators(besu, "non-validator", validators);
+    cluster.start(validator1, validator2, validator3, nonValidatorNode);
+
+    cluster.verify(bft.validatorsEqual(validator1, validator2, validator3));
+    final Condition addedCondition = bft.awaitValidatorSetChange(validator1);
+    validator1.execute(bftTransactions.createAddProposal(nonValidatorNode));
+    validator2.execute(bftTransactions.createAddProposal(nonValidatorNode));
+
+    cluster.verify(addedCondition);
+    cluster.verify(bft.validatorsEqual(validator1, validator2, validator3, nonValidatorNode));
+
+    final Condition removedCondition = bft.awaitValidatorSetChange(validator1);
+    validator2.execute(bftTransactions.createRemoveProposal(nonValidatorNode));
+    validator3.execute(bftTransactions.createRemoveProposal(nonValidatorNode));
+    nonValidatorNode.execute(bftTransactions.createRemoveProposal(nonValidatorNode));
+    cluster.verify(removedCondition);
+    cluster.verify(bft.validatorsEqual(validator1, validator2, validator3));
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftZeroValidators.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftZeroValidators.java
new file mode 100644
index 00000000000..898ad47b3f8
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/BftZeroValidators.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.bft;
+
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+
+import org.junit.Test;
+
+public class BftZeroValidators extends ParameterizedBftTestBase {
+
+  public BftZeroValidators(
+      final String testName, final BftAcceptanceTestParameterization nodeFactory) {
+    super(testName, nodeFactory);
+  }
+
+  @Test
+  public void zeroValidatorsFormValidCluster() throws Exception {
+    final String[] validators = {};
+    final BesuNode node1 = nodeFactory.createNodeWithValidators(besu, "node1", validators);
+    final BesuNode node2 = nodeFactory.createNodeWithValidators(besu, "node2", validators);
+
+    cluster.start(node1, node2);
+
+    cluster.verify(net.awaitPeerCount(1));
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/ParameterizedBftTestBase.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/ParameterizedBftTestBase.java
new file mode 100644
index 00000000000..e08d4a5c206
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/ParameterizedBftTestBase.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.bft;
+
+import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
+
+import java.util.Collection;
+
+import org.junit.Ignore;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+@Ignore("This is not a test class, it offers BFT parameterization only.")
+public abstract class ParameterizedBftTestBase extends AcceptanceTestBase {
+
+  protected final String bftType;
+  protected final BftAcceptanceTestParameterization nodeFactory;
+
+  @Parameters(name = "{0}")
+  public static Collection<Object[]> factoryFunctions() {
+    return BftAcceptanceTestParameterization.getFactories();
+  }
+
+  protected ParameterizedBftTestBase(
+      final String bftType, final BftAcceptanceTestParameterization input) {
+    this.bftType = bftType;
+    this.nodeFactory = input;
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/pki/ParameterizedPkiQbftTestBase.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/pki/ParameterizedPkiQbftTestBase.java
new file mode 100644
index 00000000000..29c00b65d96
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/pki/ParameterizedPkiQbftTestBase.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.bft.pki;
+
+import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
+
+import java.util.Collection;
+
+import org.junit.Ignore;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+@Ignore("This is not a test class, it offers PKI QBFT parameterization only.")
+public abstract class ParameterizedPkiQbftTestBase extends AcceptanceTestBase {
+
+  protected final PkiQbftAcceptanceTestParameterization nodeFactory;
+
+  @Parameters(name = "{0}")
+  public static Collection<Object[]> factoryFunctions() {
+    return PkiQbftAcceptanceTestParameterization.getFactories();
+  }
+
+  protected ParameterizedPkiQbftTestBase(
+      final String testName, final PkiQbftAcceptanceTestParameterization input) {
+    this.nodeFactory = input;
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/pki/PkiQbftAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/pki/PkiQbftAcceptanceTest.java
new file mode 100644
index 00000000000..8fecb5f6779
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/pki/PkiQbftAcceptanceTest.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ *  the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.bft.pki;
+
+import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+
+import org.junit.Test;
+
+public class PkiQbftAcceptanceTest extends ParameterizedPkiQbftTestBase {
+
+  public PkiQbftAcceptanceTest(
+      final String testName, final PkiQbftAcceptanceTestParameterization input) {
+    super(testName, input);
+  }
+
+  @Test
+  public void shouldMineOnSingleNode() throws Exception {
+    final BesuNode minerNode = nodeFactory.createNode(besu, "miner1");
+    cluster.start(minerNode);
+
+    cluster.verify(blockchain.reachesHeight(minerNode, 1));
+
+    final Account sender = accounts.createAccount("account1");
+    final Account receiver = accounts.createAccount("account2");
+
+    minerNode.execute(accountTransactions.createTransfer(sender, 50));
+    cluster.verify(sender.balanceEquals(50));
+
+    minerNode.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 1));
+    cluster.verify(receiver.balanceEquals(1));
+
+    minerNode.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 2));
+    cluster.verify(receiver.balanceEquals(3));
+  }
+
+  @Test
+  public void shouldMineOnMultipleNodes() throws Exception {
+    final BesuNode minerNode1 = nodeFactory.createNode(besu, "miner1");
+    final BesuNode minerNode2 = nodeFactory.createNode(besu, "miner2");
+    final BesuNode minerNode3 = nodeFactory.createNode(besu, "miner3");
+    final BesuNode minerNode4 = nodeFactory.createNode(besu, "miner4");
+    cluster.start(minerNode1, minerNode2, minerNode3, minerNode4);
+
+    cluster.verify(blockchain.reachesHeight(minerNode1, 1, 85));
+
+    final Account sender = accounts.createAccount("account1");
+    final Account receiver = accounts.createAccount("account2");
+
+    minerNode1.execute(accountTransactions.createTransfer(sender, 50));
+    cluster.verify(sender.balanceEquals(50));
+
+    minerNode2.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 1));
+    cluster.verify(receiver.balanceEquals(1));
+
+    minerNode3.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 2));
+    cluster.verify(receiver.balanceEquals(3));
+
+    minerNode4.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 3));
+    cluster.verify(receiver.balanceEquals(6));
+  }
+
+  @Test
+  public void shouldMineWithIgnoringANodeInCRL() throws Exception {
+    final BesuNode minerNode1 = nodeFactory.createNode(besu, "miner1");
+    final BesuNode minerNode2 = nodeFactory.createNode(besu, "miner2");
+    final BesuNode minerNode3 = nodeFactory.createNode(besu, "miner3");
+    final BesuNode minerNode4 = nodeFactory.createNode(besu, "miner4");
+    final BesuNode minerNode5 = nodeFactory.createNode(besu, "miner5");
+    final BesuNode minerNode6 = nodeFactory.createNode(besu, "miner6");
+    try {
+      cluster.start(minerNode1, minerNode2, minerNode3, minerNode4);
+
+      cluster.startNode(minerNode5);
+      cluster.startNode(minerNode6);
+
+      cluster.verify(blockchain.reachesHeight(minerNode1, 1, 85));
+
+      final Account sender = accounts.createAccount("account1");
+      final Account receiver = accounts.createAccount("account2");
+
+      minerNode1.execute(accountTransactions.createTransfer(sender, 50));
+      cluster.verify(sender.balanceEquals(50));
+
+      minerNode2.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 1));
+      cluster.verify(receiver.balanceEquals(1));
+
+      minerNode3.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 2));
+      cluster.verify(receiver.balanceEquals(3));
+
+      minerNode4.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 3));
+      cluster.verify(receiver.balanceEquals(6));
+
+      if (minerNode1.getTLSConfiguration().isEmpty()) {
+        minerNode1.verify(net.awaitPeerCount(5));
+        minerNode5.verify(net.awaitPeerCount(5));
+        minerNode6.verify(net.awaitPeerCount(5));
+      } else {
+        minerNode1.verify(net.awaitPeerCount(3));
+        minerNode5.verify(net.awaitPeerCount(0));
+        minerNode6.verify(net.awaitPeerCount(0));
+      }
+    } finally {
+      cluster.stopNode(minerNode5);
+      cluster.stopNode(minerNode6);
+      minerNode5.close();
+      minerNode6.close();
+    }
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/pki/PkiQbftAcceptanceTestParameterization.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/pki/PkiQbftAcceptanceTestParameterization.java
new file mode 100644
index 00000000000..10d4866fef7
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/pki/PkiQbftAcceptanceTestParameterization.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ *  the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.bft.pki;
+
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.BesuNodeFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PkiQbftAcceptanceTestParameterization {
+
+  public static List<Object[]> getFactories() {
+    final List<Object[]> ret = new ArrayList<>();
+
+    /*
+     BLOCK CREATION
+    */
+
+    ret.add(
+        new Object[] {
+          "qbft-pki-jks",
+          new PkiQbftAcceptanceTestParameterization(
+              BesuNodeFactory::createPkiQbftJKSNode,
+              BesuNodeFactory::createPkiQbftJKSNodeWithValidators)
+        });
+
+    ret.add(
+        new Object[] {
+          "qbft-pki-pkcs12",
+          new PkiQbftAcceptanceTestParameterization(
+              BesuNodeFactory::createPkiQbftPKCS12Node,
+              BesuNodeFactory::createPkiQbftPKCS12NodeWithValidators)
+        });
+
+    if (Boolean.getBoolean("acctests.runBesuAsProcess")) {
+      ret.add(
+          new Object[] {
+            "qbft-pki-pkcs11",
+            new PkiQbftAcceptanceTestParameterization(
+                BesuNodeFactory::createPkiQbftPKCS11Node,
+                BesuNodeFactory::createPkiQbftPKCS11NodeWithValidators)
+          });
+    }
+
+    /*
+     TLS
+    */
+
+    ret.add(
+        new Object[] {
+          "qbft-tls-jks",
+          new PkiQbftAcceptanceTestParameterization(
+              BesuNodeFactory::createQbftNodeWithTLSJKS,
+              BesuNodeFactory::createQbftTLSJKSNodeWithValidators)
+        });
+
+    ret.add(
+        new Object[] {
+          "qbft-tls-pkcs12",
+          new PkiQbftAcceptanceTestParameterization(
+              BesuNodeFactory::createQbftNodeWithTLSPKCS12,
+              BesuNodeFactory::createQbftTLSPKCS12NodeWithValidators)
+        });
+
+    if (Boolean.getBoolean("acctests.runBesuAsProcess")) {
+      ret.add(
+          new Object[] {
+            "qbft-tls-pkcs11",
+            new PkiQbftAcceptanceTestParameterization(
+                BesuNodeFactory::createQbftNodeWithTLSPKCS11,
+                BesuNodeFactory::createQbftTLSPKCS11NodeWithValidators)
+          });
+    }
+
+    return ret;
+  }
+
+  @FunctionalInterface
+  public interface NodeCreator {
+
+    BesuNode create(BesuNodeFactory factory, String name) throws Exception;
+  }
+
+  @FunctionalInterface
+  public interface NodeWithValidatorsCreator {
+
+    BesuNode create(BesuNodeFactory factory, String name, String[] validators) throws Exception;
+  }
+
+  private final NodeCreator creatorFn;
+  private final NodeWithValidatorsCreator createorWithValidatorFn;
+
+  public PkiQbftAcceptanceTestParameterization(
+      final NodeCreator creatorFn, final NodeWithValidatorsCreator createorWithValidatorFn) {
+    this.creatorFn = creatorFn;
+    this.createorWithValidatorFn = createorWithValidatorFn;
+  }
+
+  public BesuNode createNode(BesuNodeFactory factory, String name) throws Exception {
+    return creatorFn.create(factory, name);
+  }
+
+  public BesuNode createNodeWithValidators(
+      BesuNodeFactory factory, String name, String[] validators) throws Exception {
+    return createorWithValidatorFn.create(factory, name, validators);
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/qbft/QbftContractAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/qbft/QbftContractAcceptanceTest.java
new file mode 100644
index 00000000000..e3b2878b052
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bft/qbft/QbftContractAcceptanceTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.bft.qbft;
+
+import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+
+import org.junit.Test;
+
+public class QbftContractAcceptanceTest extends AcceptanceTestBase {
+
+  @Test
+  public void shouldMineOnMultipleNodesEvenWhenClusterContainsNonValidator() throws Exception {
+    final String[] validators = {"validator1", "validator2", "validator3"};
+    final BesuNode validator1 =
+        besu.createQbftNodeWithContractBasedValidators("validator1", validators);
+    final BesuNode validator2 =
+        besu.createQbftNodeWithContractBasedValidators("validator2", validators);
+    final BesuNode validator3 =
+        besu.createQbftNodeWithContractBasedValidators("validator3", validators);
+    final BesuNode nonValidatorNode =
+        besu.createQbftNodeWithContractBasedValidators("non-validator", validators);
+    cluster.start(validator1, validator2, validator3, nonValidatorNode);
+
+    cluster.verify(blockchain.reachesHeight(validator1, 1, 85));
+
+    cluster.verify(bft.validatorsEqual(validator1, validator2, validator3));
+
+    final Account sender = accounts.createAccount("account1");
+    final Account receiver = accounts.createAccount("account2");
+
+    validator1.execute(accountTransactions.createTransfer(sender, 50));
+    cluster.verify(sender.balanceEquals(50));
+
+    validator2.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 1));
+    cluster.verify(receiver.balanceEquals(1));
+
+    nonValidatorNode.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 2));
+    cluster.verify(receiver.balanceEquals(3));
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bootstrap/ClusterAcceptanceTest.java
similarity index 96%
rename from acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterAcceptanceTest.java
rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bootstrap/ClusterAcceptanceTest.java
index 3a29e7082e0..c4c9e42671c 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bootstrap/ClusterAcceptanceTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.tests.acceptance;
+package org.hyperledger.besu.tests.acceptance.bootstrap;
 
 import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterNoDiscoveryAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bootstrap/ClusterNoDiscoveryAcceptanceTest.java
similarity index 97%
rename from acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterNoDiscoveryAcceptanceTest.java
rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bootstrap/ClusterNoDiscoveryAcceptanceTest.java
index 9328cdaae05..6c7c8127997 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterNoDiscoveryAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bootstrap/ClusterNoDiscoveryAcceptanceTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.tests.acceptance;
+package org.hyperledger.besu.tests.acceptance.bootstrap;
 
 import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterThreadNodeRunnerAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bootstrap/ClusterThreadNodeRunnerAcceptanceTest.java
similarity index 97%
rename from acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterThreadNodeRunnerAcceptanceTest.java
rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bootstrap/ClusterThreadNodeRunnerAcceptanceTest.java
index d4da3988cac..805749a0bf8 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ClusterThreadNodeRunnerAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bootstrap/ClusterThreadNodeRunnerAcceptanceTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.tests.acceptance;
+package org.hyperledger.besu.tests.acceptance.bootstrap;
 
 import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/P2pDisabledAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bootstrap/P2pDisabledAcceptanceTest.java
similarity index 97%
rename from acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/P2pDisabledAcceptanceTest.java
rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bootstrap/P2pDisabledAcceptanceTest.java
index d863e1ad164..aa71839b181 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/P2pDisabledAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bootstrap/P2pDisabledAcceptanceTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.tests.acceptance;
+package org.hyperledger.besu.tests.acceptance.bootstrap;
 
 import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/StaticNodesAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bootstrap/StaticNodesAcceptanceTest.java
similarity index 96%
rename from acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/StaticNodesAcceptanceTest.java
rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bootstrap/StaticNodesAcceptanceTest.java
index 69719d6df46..1f28a4a9f3c 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/StaticNodesAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/bootstrap/StaticNodesAcceptanceTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.tests.acceptance;
+package org.hyperledger.besu.tests.acceptance.bootstrap;
 
 import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.WaitUtils;
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueMiningAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueMiningAcceptanceTest.java
index d105b27e638..f7065b623a2 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueMiningAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/clique/CliqueMiningAcceptanceTest.java
@@ -72,6 +72,8 @@ public void shouldStallMiningWhenInsufficientValidators() throws IOException {
     cluster.stopNode(minerNode2);
     cluster.stopNode(minerNode3);
     minerNode1.verify(net.awaitPeerCount(0));
+    minerNode1.verify(clique.blockIsCreatedByProposer(minerNode1));
+
     minerNode1.verify(clique.noNewBlockCreated(minerNode1));
   }
 
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/config/BootNodesGenesisSetupTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/config/BootNodesGenesisSetupTest.java
new file mode 100644
index 00000000000..1ad2587ded3
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/config/BootNodesGenesisSetupTest.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.config;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SECPPrivateKey;
+import org.hyperledger.besu.crypto.SECPPublicKey;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
+import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.BesuNodeConfigurationBuilder;
+
+import java.net.ServerSocket;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.bouncycastle.asn1.sec.SECNamedCurves;
+import org.bouncycastle.asn1.x9.X9ECParameters;
+import org.bouncycastle.crypto.params.ECDomainParameters;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class BootNodesGenesisSetupTest extends AcceptanceTestBase {
+  private static final String CURVE_NAME = "secp256k1";
+  private static final String ALGORITHM = SignatureAlgorithm.ALGORITHM;
+
+  private static ECDomainParameters curve;
+
+  private Node nodeA;
+  private Node nodeB;
+
+  @BeforeClass
+  public static void environment() {
+    final X9ECParameters params = SECNamedCurves.getByName(CURVE_NAME);
+    curve = new ECDomainParameters(params.getCurve(), params.getG(), params.getN(), params.getH());
+  }
+
+  @Before
+  public void setUp() throws Exception {
+    int nodeAP2pBindingPort;
+    int nodeBP2pBindingPort;
+    try (ServerSocket nodeASocket = new ServerSocket(0);
+        ServerSocket nodeBSocket = new ServerSocket(0)) {
+      nodeAP2pBindingPort = nodeASocket.getLocalPort();
+      nodeBP2pBindingPort = nodeBSocket.getLocalPort();
+    }
+    final KeyPair nodeAKeyPair =
+        createKeyPair(
+            Bytes32.fromHexString(
+                "0x8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63"));
+    final KeyPair nodeBKeyPair =
+        createKeyPair(
+            Bytes32.fromHexString(
+                "0xc87509a1c067bbde78beb793e6fa76530b6382a4c0241e5e4a9ec0a0f44dc0d3"));
+
+    nodeA =
+        besu.createNode(
+            "nodeA",
+            nodeBuilder ->
+                configureNode(
+                    nodeBuilder,
+                    nodeAP2pBindingPort,
+                    nodeAKeyPair,
+                    nodeBKeyPair.getPublicKey(),
+                    nodeBP2pBindingPort));
+    nodeB =
+        besu.createNode(
+            "nodeB",
+            nodeBuilder ->
+                configureNode(
+                    nodeBuilder,
+                    nodeBP2pBindingPort,
+                    nodeBKeyPair,
+                    nodeAKeyPair.getPublicKey(),
+                    nodeAP2pBindingPort));
+    cluster.start(nodeA, nodeB);
+  }
+
+  private KeyPair createKeyPair(final Bytes32 privateKey) {
+    return KeyPair.create(SECPPrivateKey.create(privateKey, ALGORITHM), curve, ALGORITHM);
+  }
+
+  @Test
+  public void shouldConnectBothNodesConfiguredInGenesisFile() {
+    nodeA.verify(net.awaitPeerCount(1));
+    nodeB.verify(net.awaitPeerCount(1));
+  }
+
+  private BesuNodeConfigurationBuilder configureNode(
+      final BesuNodeConfigurationBuilder nodeBuilder,
+      final int p2pBindingPort,
+      final KeyPair keyPair,
+      final SECPPublicKey peerPublicKey,
+      final int peerP2pBindingPort) {
+    return nodeBuilder
+        .devMode(false)
+        .keyPair(keyPair)
+        .p2pPort(p2pBindingPort)
+        .genesisConfigProvider(
+            (nodes) ->
+                Optional.of(
+                    String.format(
+                        "{\"config\": {\"ethash\": {}, \"discovery\": { \"bootnodes\": [\"enode://%s@127.0.0.1:%d\"]}}, \"gasLimit\": \"0x1\", \"difficulty\": \"0x1\"}",
+                        peerPublicKey.toString().substring(2), peerP2pBindingPort)))
+        .bootnodeEligible(false)
+        .jsonRpcEnabled()
+        .jsonRpcAdmin();
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/crypto/SECP256R1AcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/crypto/SECP256R1AcceptanceTest.java
new file mode 100644
index 00000000000..8b4ef9f864b
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/crypto/SECP256R1AcceptanceTest.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.tests.acceptance.crypto;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assumptions.assumeThat;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SECP256R1;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNodeRunner;
+import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
+import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.Cluster;
+import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfiguration;
+import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder;
+
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.Before;
+import org.junit.Test;
+
+public class SECP256R1AcceptanceTest extends AcceptanceTestBase {
+  private Node minerNode;
+  private Node otherNode;
+  private Cluster noDiscoveryCluster;
+
+  private static final String GENESIS_FILE = "/crypto/secp256r1.json";
+
+  private static final String MINER_NODE_PRIVATE_KEY =
+      "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63";
+  private static final String OTHER_NODE_PRIVATE_KEY =
+      "c87509a1c067bbde78beb793e6fa76530b6382a4c0241e5e4a9ec0a0f44dc0d3";
+
+  private static final SECP256R1 SECP256R1_SIGNATURE_ALGORITHM = new SECP256R1();
+
+  @Before
+  public void setUp() throws Exception {
+    KeyPair minerNodeKeyPair = createKeyPair(MINER_NODE_PRIVATE_KEY);
+    KeyPair otherNodeKeyPair = createKeyPair(OTHER_NODE_PRIVATE_KEY);
+
+    final ClusterConfiguration clusterConfiguration =
+        new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build();
+    noDiscoveryCluster = new Cluster(clusterConfiguration, net);
+
+    minerNode =
+        besu.createNodeWithNonDefaultSignatureAlgorithm(
+            "minerNode", GENESIS_FILE, minerNodeKeyPair);
+    noDiscoveryCluster.start(minerNode);
+
+    otherNode =
+        besu.createNodeWithNonDefaultSignatureAlgorithm(
+            "otherNode", GENESIS_FILE, otherNodeKeyPair, List.of(minerNode));
+    noDiscoveryCluster.addNode(otherNode);
+  }
+
+  @Test
+  public void transactionShouldBeSuccessful() {
+    // SignatureAlgorithmFactory.instance is static. When ThreadBesuRunner is used, we cannot change
+    // the signature algorithm instance to SECP256R1 as it could influence other tests running at
+    // the same time. So we only execute the test when ProcessBesuNodeRunner is used, as there is
+    // not conflict because we use separate processes.
+    assumeThat(BesuNodeRunner.isProcessBesuNodeRunner()).isTrue();
+
+    minerNode.verify(net.awaitPeerCount(1));
+    otherNode.verify(net.awaitPeerCount(1));
+
+    final Account recipient = accounts.createAccount("recipient");
+
+    final Hash transactionHash =
+        minerNode.execute(accountTransactions.createTransfer(recipient, 5, new SECP256R1()));
+    assertThat(transactionHash).isNotNull();
+    noDiscoveryCluster.verify(recipient.balanceEquals(5));
+  }
+
+  @Override
+  public void tearDownAcceptanceTestBase() {
+    super.tearDownAcceptanceTestBase();
+
+    noDiscoveryCluster.stop();
+  }
+
+  private KeyPair createKeyPair(final String privateKey) {
+    return SECP256R1_SIGNATURE_ALGORITHM.createKeyPair(
+        SECP256R1_SIGNATURE_ALGORITHM.createPrivateKey(Bytes32.fromHexString(privateKey)));
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/database/DatabaseMigrationAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/database/DatabaseMigrationAcceptanceTest.java
index 82ec8f5813b..d116a5cafcf 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/database/DatabaseMigrationAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/database/DatabaseMigrationAcceptanceTest.java
@@ -17,8 +17,8 @@
 
 import static java.util.Collections.singletonList;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.tests.acceptance.AbstractPreexistingNodeTest;
 import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Amount;
 import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2BlockRewardPaymentAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2BlockRewardPaymentAcceptanceTest.java
deleted file mode 100644
index 165728767ee..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2BlockRewardPaymentAcceptanceTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.ibft2;
-
-import static java.util.Collections.singletonList;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
-import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
-import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Amount;
-import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.Optional;
-
-import org.junit.Test;
-
-public class Ibft2BlockRewardPaymentAcceptanceTest extends AcceptanceTestBase {
-
-  @Test
-  public void validatorsArePaidBlockReward() throws IOException {
-    final String[] validators = {"validator"};
-    final BesuNode validator = besu.createIbft2NodeWithValidators("validator", validators);
-    final BesuNode nonValidator = besu.createIbft2NodeWithValidators("nonValidator", validators);
-    cluster.start(validator, nonValidator);
-    final Account validator1Account = Account.create(ethTransactions, validator.getAddress());
-
-    final int blockRewardEth = 5;
-    final int blockToCheck = 2;
-
-    cluster.verify(validator1Account.balanceAtBlockEquals(Amount.ether(0), BigInteger.ZERO));
-    cluster.verify(
-        validator1Account.balanceAtBlockEquals(
-            Amount.ether(blockRewardEth * blockToCheck), BigInteger.valueOf(blockToCheck)));
-  }
-
-  @Test
-  public void payBlockRewardToConfiguredNode() throws IOException {
-    final String[] validators = {"validator1"};
-    final BesuNode validator1 = besu.createIbft2NodeWithValidators("validator1", validators);
-    final Optional<String> initialConfig =
-        validator1.getGenesisConfigProvider().create(singletonList(validator1));
-    if (initialConfig.isEmpty()) {
-      throw new RuntimeException("Unable to generate genesis config.");
-    }
-    final String miningBeneficiaryAddress = "0x1234567890123456789012345678901234567890";
-
-    final String configWithMiningBeneficiary =
-        initialConfig
-            .get()
-            .replace(
-                "\"ibft2\": {",
-                "\"ibft2\": { \"miningbeneficiary\": \"" + miningBeneficiaryAddress + "\",");
-
-    validator1.setGenesisConfig(configWithMiningBeneficiary);
-
-    final Account miningBeneficiaryAccount =
-        Account.create(ethTransactions, Address.fromHexString(miningBeneficiaryAddress));
-
-    // This starts a node, without executing its configGenerator
-    cluster.runNodeStart(validator1);
-    final int blockRewardEth = 5;
-    final int blockToCheck = 2;
-
-    cluster.verify(miningBeneficiaryAccount.balanceAtBlockEquals(Amount.ether(0), BigInteger.ZERO));
-    cluster.verify(
-        miningBeneficiaryAccount.balanceAtBlockEquals(
-            Amount.ether(blockRewardEth * blockToCheck), BigInteger.valueOf(blockToCheck)));
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2DiscardRpcAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2DiscardRpcAcceptanceTest.java
deleted file mode 100644
index 8de0f984678..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2DiscardRpcAcceptanceTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.ibft2;
-
-import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
-import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
-
-import java.io.IOException;
-
-import org.junit.Test;
-
-public class Ibft2DiscardRpcAcceptanceTest extends AcceptanceTestBase {
-
-  @Test
-  public void shouldDiscardVotes() throws IOException {
-    final String[] validators = {"validator1", "validator3"};
-    final BesuNode validator1 = besu.createIbft2NodeWithValidators("validator1", validators);
-    final BesuNode validator2 = besu.createIbft2NodeWithValidators("validator2", validators);
-    final BesuNode validator3 = besu.createIbft2NodeWithValidators("validator3", validators);
-    cluster.start(validator1, validator2, validator3);
-
-    validator1.execute(ibftTwoTransactions.createAddProposal(validator2));
-    validator1.execute(ibftTwoTransactions.createRemoveProposal(validator3));
-    validator1.verify(
-        ibftTwo.pendingVotesEqual().addProposal(validator2).removeProposal(validator3).build());
-
-    validator1.execute(ibftTwoTransactions.createDiscardProposal(validator2));
-    validator1.verify(ibftTwo.pendingVotesEqual().removeProposal(validator3).build());
-
-    validator1.execute(ibftTwoTransactions.createDiscardProposal(validator3));
-    cluster.verify(ibftTwo.noProposals());
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2MiningAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2MiningAcceptanceTest.java
deleted file mode 100644
index f1f8e441c63..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2MiningAcceptanceTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.ibft2;
-
-import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
-import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
-import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.junit.Test;
-
-public class Ibft2MiningAcceptanceTest extends AcceptanceTestBase {
-
-  @Test
-  public void shouldMineOnSingleNode() throws IOException {
-    final BesuNode minerNode = besu.createIbft2Node("miner1");
-    cluster.start(minerNode);
-
-    cluster.verify(blockchain.reachesHeight(minerNode, 1));
-
-    final Account sender = accounts.createAccount("account1");
-    final Account receiver = accounts.createAccount("account2");
-
-    minerNode.execute(accountTransactions.createTransfer(sender, 50));
-    cluster.verify(sender.balanceEquals(50));
-
-    minerNode.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 1));
-    cluster.verify(receiver.balanceEquals(1));
-
-    minerNode.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 2));
-    cluster.verify(receiver.balanceEquals(3));
-  }
-
-  @Test
-  public void shouldMineOnMultipleNodes() throws IOException {
-    final BesuNode minerNode1 = besu.createIbft2Node("miner1");
-    final BesuNode minerNode2 = besu.createIbft2Node("miner2");
-    final BesuNode minerNode3 = besu.createIbft2Node("miner3");
-    final BesuNode minerNode4 = besu.createIbft2Node("miner4");
-    cluster.start(minerNode1, minerNode2, minerNode3, minerNode4);
-
-    cluster.verify(blockchain.reachesHeight(minerNode1, 1, 85));
-
-    final Account sender = accounts.createAccount("account1");
-    final Account receiver = accounts.createAccount("account2");
-
-    minerNode1.execute(accountTransactions.createTransfer(sender, 50));
-    cluster.verify(sender.balanceEquals(50));
-
-    minerNode2.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 1));
-    cluster.verify(receiver.balanceEquals(1));
-
-    minerNode3.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 2));
-    cluster.verify(receiver.balanceEquals(3));
-
-    minerNode4.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 3));
-    cluster.verify(receiver.balanceEquals(6));
-  }
-
-  @Test
-  public void shouldMineOnMultipleNodesEvenWhenClusterContainsNonValidator() throws IOException {
-    final String[] validators = {"validator1", "validator2", "validator3"};
-    final BesuNode validator1 = besu.createIbft2NodeWithValidators("validator1", validators);
-    final BesuNode validator2 = besu.createIbft2NodeWithValidators("validator2", validators);
-    final BesuNode validator3 = besu.createIbft2NodeWithValidators("validator3", validators);
-    final BesuNode nonValidatorNode =
-        besu.createIbft2NodeWithValidators("non-validator", validators);
-    cluster.start(validator1, validator2, validator3, nonValidatorNode);
-
-    cluster.verify(blockchain.reachesHeight(validator1, 1, 85));
-
-    final Account sender = accounts.createAccount("account1");
-    final Account receiver = accounts.createAccount("account2");
-
-    validator1.execute(accountTransactions.createTransfer(sender, 50));
-    cluster.verify(sender.balanceEquals(50));
-
-    validator2.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 1));
-    cluster.verify(receiver.balanceEquals(1));
-
-    nonValidatorNode.execute(accountTransactions.createIncrementalTransfers(sender, receiver, 2));
-    cluster.verify(receiver.balanceEquals(3));
-  }
-
-  @Test
-  public void shouldStillMineWhenANonProposerNodeFailsAndHasSufficientValidators()
-      throws IOException {
-    final BesuNode minerNode1 = besu.createIbft2Node("miner1");
-    final BesuNode minerNode2 = besu.createIbft2Node("miner2");
-    final BesuNode minerNode3 = besu.createIbft2Node("miner3");
-    final BesuNode minerNode4 = besu.createIbft2Node("miner4");
-    final List<BesuNode> validators =
-        ibftTwo.validators(new BesuNode[] {minerNode1, minerNode2, minerNode3, minerNode4});
-    final BesuNode nonProposerNode = validators.get(validators.size() - 1);
-    cluster.start(validators);
-
-    cluster.verify(blockchain.reachesHeight(minerNode1, 1, 85));
-
-    final Account receiver = accounts.createAccount("account2");
-
-    cluster.stopNode(nonProposerNode);
-    validators.get(0).execute(accountTransactions.createTransfer(receiver, 80));
-
-    cluster.verifyOnActiveNodes(receiver.balanceEquals(80));
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ProposalRpcAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ProposalRpcAcceptanceTest.java
deleted file mode 100644
index ff0ce12629e..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ProposalRpcAcceptanceTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.ibft2;
-
-import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
-import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
-
-import java.io.IOException;
-
-import org.junit.Test;
-
-public class Ibft2ProposalRpcAcceptanceTest extends AcceptanceTestBase {
-
-  @Test
-  public void shouldReturnProposals() throws IOException {
-    final String[] validators = {"validator1", "validator2", "validator3"};
-    final BesuNode validator1 = besu.createIbft2NodeWithValidators("validator1", validators);
-    final BesuNode validator2 = besu.createIbft2NodeWithValidators("validator2", validators);
-    final BesuNode validator3 = besu.createIbft2NodeWithValidators("validator3", validators);
-    cluster.start(validator1, validator2, validator3);
-
-    cluster.verify(ibftTwo.noProposals());
-    validator1.execute(ibftTwoTransactions.createAddProposal(validator3));
-    validator1.execute(ibftTwoTransactions.createRemoveProposal(validator2));
-    validator2.execute(ibftTwoTransactions.createRemoveProposal(validator3));
-
-    validator1.verify(
-        ibftTwo.pendingVotesEqual().addProposal(validator3).removeProposal(validator2).build());
-    validator2.verify(ibftTwo.pendingVotesEqual().removeProposal(validator3).build());
-    validator3.verify(ibftTwo.noProposals());
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ProposeRpcAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ProposeRpcAcceptanceTest.java
deleted file mode 100644
index 77df0c19172..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ProposeRpcAcceptanceTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.ibft2;
-
-import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
-import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
-import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
-
-import java.io.IOException;
-
-import org.junit.Test;
-
-// These tests prove the ibft_proposeValidatorVote and ibft_getValidatorsByBlockNumber (implicitly)
-// JSON RPC calls.
-public class Ibft2ProposeRpcAcceptanceTest extends AcceptanceTestBase {
-
-  @Test
-  public void validatorsCanBeAddedAndThenRemoved() throws IOException {
-    final String[] validators = {"validator1", "validator2", "validator3"};
-    final BesuNode validator1 = besu.createIbft2NodeWithValidators("validator1", validators);
-    final BesuNode validator2 = besu.createIbft2NodeWithValidators("validator2", validators);
-    final BesuNode validator3 = besu.createIbft2NodeWithValidators("validator3", validators);
-    final BesuNode nonValidatorNode =
-        besu.createIbft2NodeWithValidators("non-validator", validators);
-    cluster.start(validator1, validator2, validator3, nonValidatorNode);
-
-    cluster.verify(ibftTwo.validatorsEqual(validator1, validator2, validator3));
-    final Condition addedCondition = ibftTwo.awaitValidatorSetChange(validator1);
-    validator1.execute(ibftTwoTransactions.createAddProposal(nonValidatorNode));
-    validator2.execute(ibftTwoTransactions.createAddProposal(nonValidatorNode));
-
-    cluster.verify(addedCondition);
-    cluster.verify(ibftTwo.validatorsEqual(validator1, validator2, validator3, nonValidatorNode));
-
-    final Condition removedCondition = ibftTwo.awaitValidatorSetChange(validator1);
-    validator2.execute(ibftTwoTransactions.createRemoveProposal(nonValidatorNode));
-    validator3.execute(ibftTwoTransactions.createRemoveProposal(nonValidatorNode));
-    nonValidatorNode.execute(ibftTwoTransactions.createRemoveProposal(nonValidatorNode));
-    cluster.verify(removedCondition);
-    cluster.verify(ibftTwo.validatorsEqual(validator1, validator2, validator3));
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ZeroValidators.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ZeroValidators.java
deleted file mode 100644
index 14aa20f1fb3..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ibft2/Ibft2ZeroValidators.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.ibft2;
-
-import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
-import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
-
-import java.io.IOException;
-
-import org.junit.Test;
-
-public class Ibft2ZeroValidators extends AcceptanceTestBase {
-
-  @Test
-  public void zeroValidatorsFormValidCluster() throws IOException {
-    final String[] validators = {};
-    final BesuNode node1 = besu.createIbft2NodeWithValidators("node1", validators);
-    final BesuNode node2 = besu.createIbft2NodeWithValidators("node2", validators);
-
-    cluster.start(node1, node2);
-
-    cluster.verify(net.awaitPeerCount(1));
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/AbstractJsonRpcTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/AbstractJsonRpcTest.java
new file mode 100644
index 00000000000..56c43da355b
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/AbstractJsonRpcTest.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.jsonrpc;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.config.JsonUtil;
+import org.hyperledger.besu.tests.acceptance.dsl.condition.net.NetConditions;
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.Cluster;
+import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.BesuNodeFactory;
+import org.hyperledger.besu.tests.acceptance.dsl.rpc.JsonRpcTestCase;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.net.NetTransactions;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import okhttp3.Call;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import org.junit.Test;
+
+abstract class AbstractJsonRpcTest {
+  private static final MediaType MEDIA_TYPE_JSON =
+      MediaType.parse("application/json; charset=utf-8");
+
+  static class JsonRpcTestsContext {
+    final Cluster cluster;
+    final BesuNode besuNode;
+    final OkHttpClient httpClient;
+    final ObjectMapper mapper;
+
+    public JsonRpcTestsContext(final String genesisFile) throws IOException {
+      cluster = new Cluster(new NetConditions(new NetTransactions()));
+
+      besuNode =
+          new BesuNodeFactory().createExecutionEngineGenesisNode("executionEngine", genesisFile);
+      cluster.start(besuNode);
+      httpClient = new OkHttpClient();
+
+      mapper = new ObjectMapper();
+    }
+
+    public void tearDown() {
+      cluster.close();
+    }
+  }
+
+  private final JsonRpcTestsContext testsContext;
+  private final URI testCaseFileURI;
+
+  public AbstractJsonRpcTest(
+      final String ignored, final JsonRpcTestsContext testsContext, final URI testCaseFileURI) {
+    this.testCaseFileURI = testCaseFileURI;
+    this.testsContext = testsContext;
+  }
+
+  @Test
+  public void test() throws IOException {
+    final JsonRpcTestCase testCase =
+        testsContext.mapper.readValue(testCaseFileURI.toURL(), JsonRpcTestCase.class);
+
+    final String rpcMethod = String.valueOf(testCase.getRequest().get("method"));
+
+    final Call testRequest =
+        testsContext.httpClient.newCall(
+            new Request.Builder()
+                .url(getRpcUrl(rpcMethod))
+                .post(RequestBody.create(testCase.getRequest().toString(), MEDIA_TYPE_JSON))
+                .build());
+    final Response response = testRequest.execute();
+
+    assertThat(response.code()).isEqualTo(testCase.getStatusCode());
+    final ObjectNode actualBody = JsonUtil.objectNodeFromString(response.body().string());
+    final ObjectNode expectedBody =
+        JsonUtil.objectNodeFromString(testCase.getResponse().toString());
+    assertThat(actualBody)
+        .withFailMessage(
+            "%s\ndid not equal\n %s", actualBody.toPrettyString(), expectedBody.toPrettyString())
+        .isEqualTo(expectedBody);
+  }
+
+  private String getRpcUrl(final String rpcMethod) {
+    if (rpcMethod.contains("eth_") || rpcMethod.contains("engine_")) {
+      return testsContext.besuNode.engineRpcUrl().get();
+    }
+
+    return testsContext.besuNode.jsonRpcBaseUrl().get();
+  }
+
+  public static Iterable<Object[]> testCases(final String testCasesPath) throws URISyntaxException {
+
+    final File[] testCasesList =
+        new File(AbstractJsonRpcTest.class.getResource(testCasesPath).toURI()).listFiles();
+
+    return Arrays.stream(testCasesList)
+        .sorted()
+        .map(file -> new Object[] {file.getName(), file.toURI()})
+        .collect(Collectors.toList());
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/DebugReplayBlockAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/DebugReplayBlockAcceptanceTest.java
new file mode 100644
index 00000000000..0b6f76f4de2
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/DebugReplayBlockAcceptanceTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.jsonrpc;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class DebugReplayBlockAcceptanceTest extends AbstractJsonRpcTest {
+  private static final String GENESIS_FILE = "/jsonrpc/debug/replayBlock/genesis.json";
+  private static final String TEST_CASE_PATH = "/jsonrpc/debug/replayBlock/test-cases/";
+
+  private static AbstractJsonRpcTest.JsonRpcTestsContext testsContext;
+
+  public DebugReplayBlockAcceptanceTest(final String ignored, final URI testCaseFileURI) {
+    super(ignored, testsContext, testCaseFileURI);
+  }
+
+  @BeforeClass
+  public static void init() throws IOException {
+    testsContext = new JsonRpcTestsContext(GENESIS_FILE);
+  }
+
+  @Parameterized.Parameters(name = "{0}")
+  public static Iterable<Object[]> testCases() throws URISyntaxException {
+    return testCases(TEST_CASE_PATH);
+  }
+
+  @AfterClass
+  public static void tearDown() {
+    testsContext.cluster.close();
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/DebugSetHeadAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/DebugSetHeadAcceptanceTest.java
new file mode 100644
index 00000000000..b4db91a39aa
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/DebugSetHeadAcceptanceTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.jsonrpc;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class DebugSetHeadAcceptanceTest extends AbstractJsonRpcTest {
+  private static final String GENESIS_FILE = "/jsonrpc/debug/setHead/genesis.json";
+  private static final String TEST_CASE_PATH = "/jsonrpc/debug/setHead/test-cases/";
+
+  private static JsonRpcTestsContext testsContext;
+
+  public DebugSetHeadAcceptanceTest(final String ignored, final URI testCaseFileURI) {
+    super(ignored, testsContext, testCaseFileURI);
+  }
+
+  @BeforeClass
+  public static void init() throws IOException {
+    testsContext = new JsonRpcTestsContext(GENESIS_FILE);
+  }
+
+  @Parameterized.Parameters(name = "{0}")
+  public static Iterable<Object[]> testCases() throws URISyntaxException {
+    return testCases(TEST_CASE_PATH);
+  }
+
+  @AfterClass
+  public static void tearDown() {
+    testsContext.cluster.close();
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/DeploySmartContractAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/DeploySmartContractAcceptanceTest.java
similarity index 91%
rename from acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/DeploySmartContractAcceptanceTest.java
rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/DeploySmartContractAcceptanceTest.java
index 712881f7f37..06bd5cbfda5 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/DeploySmartContractAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/DeploySmartContractAcceptanceTest.java
@@ -12,20 +12,20 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.tests.web3j;
+package org.hyperledger.besu.tests.acceptance.jsonrpc;
 
 import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
 import org.hyperledger.besu.tests.web3j.generated.SimpleStorage;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class DeploySmartContractAcceptanceTest extends AcceptanceTestBase {
 
   private BesuNode minerNode;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     minerNode = besu.createMinerNode("miner-node");
     cluster.start(minerNode);
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/DeployTransactionAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/DeployTransactionAcceptanceTest.java
similarity index 89%
rename from acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/DeployTransactionAcceptanceTest.java
rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/DeployTransactionAcceptanceTest.java
index a81aedd67fa..909d40beb3a 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/DeployTransactionAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/DeployTransactionAcceptanceTest.java
@@ -12,22 +12,22 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.tests.web3j;
+package org.hyperledger.besu.tests.acceptance.jsonrpc;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
 import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class DeployTransactionAcceptanceTest extends AcceptanceTestBase {
 
   private BesuNode minerNode;
   private Account recipient;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     recipient = accounts.createAccount("recipient");
     minerNode = besu.createMinerNode("node");
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EthEstimateGasAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EthEstimateGasAcceptanceTest.java
new file mode 100644
index 00000000000..b8b4e2e45f4
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EthEstimateGasAcceptanceTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.jsonrpc;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationFactory;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthCallTransaction;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthEstimateGasTransaction;
+import org.hyperledger.besu.tests.web3j.generated.TestDepth;
+
+import java.math.BigInteger;
+import java.util.AbstractMap.SimpleEntry;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class EthEstimateGasAcceptanceTest extends AcceptanceTestBase {
+
+  private BesuNode node;
+  private TestDepth testDepth;
+
+  List<SimpleEntry<Integer, Long>> testCase = new ArrayList<>();
+
+  @Before
+  public void setUp() throws Exception {
+    node =
+        besu.createMinerNode(
+            "node1",
+            b ->
+                b.genesisConfigProvider(GenesisConfigurationFactory::createDevLondonGenesisConfig)
+                    .devMode(false));
+
+    cluster.start(node);
+    testDepth = node.execute(contractTransactions.createSmartContract(TestDepth.class));
+
+    // taken from geth
+    testCase.add(new SimpleEntry<>(1, 45554L));
+    testCase.add(new SimpleEntry<>(2, 47387L));
+    testCase.add(new SimpleEntry<>(3, 49249L));
+    testCase.add(new SimpleEntry<>(4, 51141L));
+    testCase.add(new SimpleEntry<>(5, 53063L));
+    testCase.add(new SimpleEntry<>(10, 63139L));
+    testCase.add(new SimpleEntry<>(65, 246462L));
+  }
+
+  @Test
+  public void estimateGasWithDelegateCall() {
+
+    for (var test : testCase) {
+      var functionCall = testDepth.depth(BigInteger.valueOf(test.getKey())).encodeFunctionCall();
+
+      var estimateGas =
+          node.execute(new EthEstimateGasTransaction(testDepth.getContractAddress(), functionCall));
+
+      // Sanity check our estimate is good with eth_call
+      var ethCall =
+          node.execute(
+              new EthCallTransaction(
+                  testDepth.getContractAddress(), functionCall, estimateGas.getAmountUsed()));
+
+      assertThat(ethCall.isReverted()).isEqualTo(false);
+
+      // Sanity check our estimate is right on the edge with eth_call
+      var ethCallTooLow =
+          node.execute(
+              new EthCallTransaction(
+                  testDepth.getContractAddress(),
+                  functionCall,
+                  estimateGas.getAmountUsed().subtract(BigInteger.ONE)));
+
+      assertThat(ethCallTooLow.isReverted()).isEqualTo(true);
+
+      // Sanity check our estimate is right on the edge with eth_sendRawTransaction
+      var transactionTooLow =
+          node.execute(
+              contractTransactions.callSmartContract(
+                  testDepth.getContractAddress(),
+                  functionCall,
+                  estimateGas.getAmountUsed().subtract(BigInteger.ONE)));
+
+      node.verify(eth.expectSuccessfulTransactionReceipt(transactionTooLow.getTransactionHash()));
+
+      var receiptTooLow =
+          node.execute(
+              ethTransactions.getTransactionReceiptWithRevertReason(
+                  transactionTooLow.getTransactionHash()));
+
+      assertThat(receiptTooLow).isPresent();
+      assertThat(receiptTooLow.get().isStatusOK()).isFalse();
+
+      // check our estimate will actually get mined successfully!
+      var transaction =
+          node.execute(
+              contractTransactions.callSmartContract(
+                  testDepth.getContractAddress(), functionCall, estimateGas.getAmountUsed()));
+
+      node.verify(eth.expectSuccessfulTransactionReceipt(transaction.getTransactionHash()));
+
+      var receipt =
+          node.execute(ethTransactions.getTransactionReceipt(transaction.getTransactionHash()));
+
+      assertThat(receipt).isPresent();
+      assertThat(receipt.get().getGasUsed()).isLessThan(BigInteger.valueOf(test.getValue()));
+      assertThat(receipt.get().isStatusOK()).isTrue();
+    }
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EthGetBlockByNumberAndHashShanghaiAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EthGetBlockByNumberAndHashShanghaiAcceptanceTest.java
new file mode 100644
index 00000000000..f50e6c4a3bf
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EthGetBlockByNumberAndHashShanghaiAcceptanceTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.jsonrpc;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class EthGetBlockByNumberAndHashShanghaiAcceptanceTest extends AbstractJsonRpcTest {
+  private static final String TEST_RESOURCES_DIR = "/jsonrpc/eth/getBlockBy/";
+  private static final String GENESIS_FILE = TEST_RESOURCES_DIR + "genesis.json";
+  private static final String TEST_CASE_PATH = TEST_RESOURCES_DIR + "test-cases/";
+
+  private static AbstractJsonRpcTest.JsonRpcTestsContext testsContext;
+
+  public EthGetBlockByNumberAndHashShanghaiAcceptanceTest(
+      final String ignored, final URI testCaseFileURI) {
+    super(ignored, testsContext, testCaseFileURI);
+  }
+
+  @BeforeClass
+  public static void init() throws IOException {
+    testsContext = new JsonRpcTestsContext(GENESIS_FILE);
+  }
+
+  @Parameterized.Parameters(name = "{0}")
+  public static Iterable<Object[]> testCases() throws URISyntaxException {
+    return testCases(TEST_CASE_PATH);
+  }
+
+  @AfterClass
+  public static void tearDown() {
+    testsContext.cluster.close();
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EthGetWorkAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EthGetWorkAcceptanceTest.java
index 2e9dd206192..c4842348aa9 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EthGetWorkAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EthGetWorkAcceptanceTest.java
@@ -17,16 +17,16 @@
 import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
 
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class EthGetWorkAcceptanceTest extends AcceptanceTestBase {
 
   private Node minerNode;
   private Node fullNode;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     minerNode = besu.createMinerNode("node1");
     fullNode = besu.createArchiveNode("node2");
@@ -34,7 +34,7 @@ public void setUp() throws Exception {
   }
 
   @Test
-  @Ignore("Genuinely Flakey")
+  @Disabled("Genuinely Flakey")
   public void shouldReturnSuccessResponseWhenMining() {
     minerNode.verify(eth.getWork());
   }
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EthSendRawTransactionAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EthSendRawTransactionAcceptanceTest.java
new file mode 100644
index 00000000000..4e4330da03b
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EthSendRawTransactionAcceptanceTest.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.jsonrpc;
+
+import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
+import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
+import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.BesuNodeConfigurationBuilder;
+import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.genesis.GenesisConfigurationFactory;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.account.TransferTransaction;
+
+import java.math.BigInteger;
+import java.util.function.UnaryOperator;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class EthSendRawTransactionAcceptanceTest extends AcceptanceTestBase {
+  private static final long CHAIN_ID = 20211;
+
+  private Account sender;
+
+  private Node lenientNode;
+  private Node strictNode;
+  private Node miningNode;
+
+  @BeforeEach
+  public void setUp() throws Exception {
+    sender = accounts.getPrimaryBenefactor();
+
+    lenientNode = besu.createArchiveNode("lenientNode", configureNode((false)));
+    strictNode = besu.createArchiveNode("strictNode", configureNode((true)));
+    miningNode = besu.createMinerNode("strictMiningNode", configureNode((true)));
+    cluster.start(lenientNode, strictNode, miningNode);
+  }
+
+  @Test
+  public void shouldSendSuccessfullyToLenientNodeWithoutChainId() {
+    final TransferTransaction tx = createTransactionWithoutChainId();
+    final String rawTx = tx.signedTransactionData();
+    final String txHash = tx.transactionHash();
+
+    lenientNode.verify(eth.expectSuccessfulEthRawTransaction(rawTx));
+    // Tx should be included on-chain
+    miningNode.verify(eth.expectSuccessfulTransactionReceipt(txHash));
+  }
+
+  @Test
+  public void shouldFailToSendToToStrictNodeWithoutChainId() {
+    final TransferTransaction tx = createTransactionWithoutChainId();
+    final String rawTx = tx.signedTransactionData();
+
+    strictNode.verify(eth.expectEthSendRawTransactionException(rawTx, "ChainId is required"));
+  }
+
+  @Test
+  public void shouldFailToSendWithInvalidRlp() {
+    final String invalidRawTx = "0x5555";
+    strictNode.verify(eth.expectEthSendRawTransactionException(invalidRawTx, "Invalid params"));
+  }
+
+  @Test
+  public void shouldSendSuccessfullyWithChainId_lenientNode() {
+    final TransferTransaction tx = createTransactionWithChainId();
+    final String rawTx = tx.signedTransactionData();
+    final String txHash = tx.transactionHash();
+
+    lenientNode.verify(eth.expectSuccessfulEthRawTransaction(rawTx));
+    // Tx should be included on-chain
+    miningNode.verify(eth.expectSuccessfulTransactionReceipt(txHash));
+  }
+
+  @Test
+  public void shouldSendSuccessfullyWithChainId_strictNode() {
+    final TransferTransaction tx = createTransactionWithChainId();
+    final String rawTx = tx.signedTransactionData();
+    final String txHash = tx.transactionHash();
+
+    strictNode.verify(eth.expectSuccessfulEthRawTransaction(rawTx));
+    // Tx should be included on-chain
+    miningNode.verify(eth.expectSuccessfulTransactionReceipt(txHash));
+  }
+
+  private TransferTransaction createTransactionWithChainId() {
+    return createTransaction(true);
+  }
+
+  private TransferTransaction createTransactionWithoutChainId() {
+    return createTransaction(false);
+  }
+
+  private TransferTransaction createTransaction(final boolean withChainId) {
+    if (withChainId) {
+      return accountTransactions.create1559Transfer(createAccount(), 2, CHAIN_ID);
+    } else {
+      final BigInteger nonce =
+          miningNode.execute(ethTransactions.getTransactionCount(sender.getAddress()));
+      return accountTransactions.createTransfer(
+          accounts.getPrimaryBenefactor(), createAccount(), 1, nonce);
+    }
+  }
+
+  private UnaryOperator<BesuNodeConfigurationBuilder> configureNode(
+      final boolean enableStrictReplayProtection) {
+    return b ->
+        b.genesisConfigProvider(GenesisConfigurationFactory::createDevLondonGenesisConfig)
+            .strictTxReplayProtectionEnabled(enableStrictReplayProtection)
+            .devMode(false);
+  }
+
+  private Account createAccount() {
+    return accounts.createAccount("Test account");
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/EventEmitterAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EventEmitterAcceptanceTest.java
similarity index 94%
rename from acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/EventEmitterAcceptanceTest.java
rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EventEmitterAcceptanceTest.java
index 91e1673c3e8..de4bfdb6464 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/EventEmitterAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/EventEmitterAcceptanceTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.tests.web3j;
+package org.hyperledger.besu.tests.acceptance.jsonrpc;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -26,8 +26,8 @@
 
 import io.reactivex.Flowable;
 import io.reactivex.disposables.Disposable;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.web3j.protocol.core.methods.request.EthFilter;
 import org.web3j.protocol.core.methods.response.TransactionReceipt;
 
@@ -38,7 +38,7 @@ public class EventEmitterAcceptanceTest extends AcceptanceTestBase {
 
   private BesuNode node;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     node = besu.createMinerNode("node1");
     cluster.start(node);
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/ExecutionEngineEip6110AcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/ExecutionEngineEip6110AcceptanceTest.java
new file mode 100644
index 00000000000..d1771ac5990
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/ExecutionEngineEip6110AcceptanceTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.jsonrpc;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class ExecutionEngineEip6110AcceptanceTest extends AbstractJsonRpcTest {
+  private static final String GENESIS_FILE = "/jsonrpc/engine/eip6110/genesis.json";
+  private static final String TEST_CASE_PATH = "/jsonrpc/engine/eip6110/test-cases/";
+
+  private static JsonRpcTestsContext testsContext;
+
+  public ExecutionEngineEip6110AcceptanceTest(final String ignored, final URI testCaseFileURI) {
+    super(ignored, testsContext, testCaseFileURI);
+  }
+
+  @BeforeClass
+  public static void init() throws IOException {
+    testsContext = new JsonRpcTestsContext(GENESIS_FILE);
+  }
+
+  @Parameterized.Parameters(name = "{0}")
+  public static Iterable<Object[]> testCases() throws URISyntaxException {
+    return testCases(TEST_CASE_PATH);
+  }
+
+  @AfterClass
+  public static void tearDown() {
+    testsContext.cluster.close();
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/ExecutionEngineParisAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/ExecutionEngineParisAcceptanceTest.java
new file mode 100644
index 00000000000..c6cb8a62ea4
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/ExecutionEngineParisAcceptanceTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.jsonrpc;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class ExecutionEngineParisAcceptanceTest extends AbstractJsonRpcTest {
+  private static final String GENESIS_FILE = "/jsonrpc/engine/paris/genesis.json";
+  private static final String TEST_CASE_PATH = "/jsonrpc/engine/paris/test-cases/";
+
+  private static JsonRpcTestsContext testsContext;
+
+  public ExecutionEngineParisAcceptanceTest(final String ignored, final URI testCaseFileURI) {
+    super(ignored, testsContext, testCaseFileURI);
+  }
+
+  @BeforeClass
+  public static void init() throws IOException {
+    testsContext = new JsonRpcTestsContext(GENESIS_FILE);
+  }
+
+  @Parameterized.Parameters(name = "{0}")
+  public static Iterable<Object[]> testCases() throws URISyntaxException {
+    return testCases(TEST_CASE_PATH);
+  }
+
+  @AfterClass
+  public static void tearDown() {
+    testsContext.cluster.close();
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/ExecutionEngineShanghaiAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/ExecutionEngineShanghaiAcceptanceTest.java
new file mode 100644
index 00000000000..c676af5922b
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/ExecutionEngineShanghaiAcceptanceTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.jsonrpc;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class ExecutionEngineShanghaiAcceptanceTest extends AbstractJsonRpcTest {
+  private static final String GENESIS_FILE = "/jsonrpc/engine/shanghai/genesis.json";
+  private static final String TEST_CASE_PATH = "/jsonrpc/engine/shanghai/test-cases/";
+
+  private static JsonRpcTestsContext testsContext;
+
+  public ExecutionEngineShanghaiAcceptanceTest(final String ignored, final URI testCaseFileURI) {
+    super(ignored, testsContext, testCaseFileURI);
+  }
+
+  @BeforeClass
+  public static void init() throws IOException {
+    testsContext = new JsonRpcTestsContext(GENESIS_FILE);
+  }
+
+  @Parameterized.Parameters(name = "{0}")
+  public static Iterable<Object[]> testCases() throws URISyntaxException {
+    return testCases(TEST_CASE_PATH);
+  }
+
+  @AfterClass
+  public static void tearDown() {
+    testsContext.cluster.close();
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/HttpServiceLoginAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/HttpServiceLoginAcceptanceTest.java
deleted file mode 100644
index 605d4d2cf12..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/HttpServiceLoginAcceptanceTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.jsonrpc;
-
-import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
-import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
-import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.Cluster;
-import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfiguration;
-import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class HttpServiceLoginAcceptanceTest extends AcceptanceTestBase {
-  private Cluster authenticatedCluster;
-  private BesuNode nodeUsingAuthFile;
-  private BesuNode nodeUsingJwtPublicKey;
-  private static final String AUTH_FILE = "authentication/auth.toml";
-
-  // token with payload{"iat": 1516239022,"exp": 4729363200,"permissions": ["net:peerCount"]}
-  private static final String TOKEN_ALLOWING_NET_PEER_COUNT =
-      "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXQiOjE1MTYyMzkwMjIsImV4cCI6NDcyOTM2MzIwMCwicGVybWl"
-          + "zc2lvbnMiOlsibmV0OnBlZXJDb3VudCJdfQ.Y6mNV0nvjzOdqAgMgxknFAOUTKoeRAo4aifNgNrWtuXbJJgz6-"
-          + "H_0GvLgjlToohPiDZbBJXJJlgb4zzLLB-sRtFnGoPaMgz_d_6z958GjFD7x_Fl0HW-WrTjRNenZNfTyD86OEAf"
-          + "XHy-7N3OYY2a5yeDbppTJy6nnHTq9hY-ad22-oWL1RbK3T_hnUJII_uXCZ9bJggSfu5m-NNUrm3TeqdnQzIaIz"
-          + "DqHlL0wNZwVPB4cFGN7zKghReBpkRJ8OFlxexQ491Q5eSpuYquhef-yGCIaMfy7GVtpDSD3Y-hjOErr7gUNCUh"
-          + "1wlc3Rb7ru_0qNgCWTBPJeRK32GppYotwQ";
-
-  @Before
-  public void setUp() throws IOException, URISyntaxException {
-
-    final ClusterConfiguration clusterConfiguration =
-        new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build();
-    authenticatedCluster = new Cluster(clusterConfiguration, net);
-
-    nodeUsingAuthFile = besu.createNodeWithAuthentication("node1", AUTH_FILE);
-    nodeUsingJwtPublicKey = besu.createNodeWithAuthenticationUsingJwtPublicKey("node2");
-    authenticatedCluster.start(nodeUsingAuthFile, nodeUsingJwtPublicKey);
-
-    nodeUsingAuthFile.verify(login.awaitResponse("user", "badpassword"));
-    nodeUsingJwtPublicKey.verify(login.awaitResponse("user", "badpassword"));
-  }
-
-  @Test
-  public void shouldFailLoginWithWrongCredentials() {
-    nodeUsingAuthFile.verify(login.failure("user", "badpassword"));
-  }
-
-  @Test
-  public void shouldSucceedLoginWithCorrectCredentials() {
-    nodeUsingAuthFile.verify(login.success("user", "pegasys"));
-  }
-
-  @Test
-  public void jsonRpcMethodShouldSucceedWithAuthenticatedUserAndPermission() {
-    final String token =
-        nodeUsingAuthFile.execute(
-            permissioningTransactions.createSuccessfulLogin("user", "pegasys"));
-    nodeUsingAuthFile.useAuthenticationTokenInHeaderForJsonRpc(token);
-    nodeUsingAuthFile.verify(net.awaitPeerCount(1));
-  }
-
-  @Test
-  public void jsonRpcMethodShouldFailOnNonPermittedMethod() {
-    final String token =
-        nodeUsingAuthFile.execute(
-            permissioningTransactions.createSuccessfulLogin("user", "pegasys"));
-    nodeUsingAuthFile.useAuthenticationTokenInHeaderForJsonRpc(token);
-    nodeUsingAuthFile.verify(net.netVersionUnauthorized());
-    nodeUsingAuthFile.verify(net.netServicesUnauthorized());
-  }
-
-  @Test
-  public void externalJwtPublicKeyUsedOnJsonRpcMethodShouldSucceed() {
-    nodeUsingJwtPublicKey.useAuthenticationTokenInHeaderForJsonRpc(TOKEN_ALLOWING_NET_PEER_COUNT);
-    nodeUsingJwtPublicKey.verify(net.awaitPeerCount(1));
-  }
-
-  @Test
-  public void externalJwtPublicKeyUsedOnJsonRpcMethodShouldFailOnNonPermittedMethod() {
-    nodeUsingJwtPublicKey.useAuthenticationTokenInHeaderForJsonRpc(TOKEN_ALLOWING_NET_PEER_COUNT);
-    nodeUsingJwtPublicKey.verify(net.netVersionUnauthorized());
-    nodeUsingJwtPublicKey.verify(net.netServicesUnauthorized());
-  }
-
-  @Test
-  public void jsonRpcMethodShouldFailWhenThereIsNoToken() {
-    nodeUsingJwtPublicKey.verify(net.netVersionUnauthorized());
-    nodeUsingJwtPublicKey.verify(net.netServicesUnauthorized());
-  }
-
-  @Test
-  public void loginShouldBeDisabledWhenUsingExternalJwtPublicKey() {
-    nodeUsingJwtPublicKey.verify(login.disabled());
-  }
-
-  @Override
-  public void tearDownAcceptanceTestBase() {
-    authenticatedCluster.stop();
-    super.tearDownAcceptanceTestBase();
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/JsonRpcHttpAuthenticationAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/JsonRpcHttpAuthenticationAcceptanceTest.java
new file mode 100644
index 00000000000..3ef383a5265
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/JsonRpcHttpAuthenticationAcceptanceTest.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.jsonrpc;
+
+import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.Cluster;
+import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfiguration;
+import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class JsonRpcHttpAuthenticationAcceptanceTest extends AcceptanceTestBase {
+  private Cluster authenticatedCluster;
+  private BesuNode nodeUsingAuthFile;
+  private BesuNode nodeUsingRsaJwtPublicKey;
+  private BesuNode nodeUsingEcdsaJwtPublicKey;
+  private BesuNode nodeUsingAuthFileWithNoAuthApi;
+  private static final String AUTH_FILE = "authentication/auth.toml";
+
+  // token with payload{"iat": 1516239022,"exp": 4729363200,"permissions": ["net:peerCount"]}
+  private static final String RSA_TOKEN_ALLOWING_NET_PEER_COUNT =
+      "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXQiOjE1MTYyMzkwMjIsImV4cCI6NDcyOTM2MzIwMCwicGVybWl"
+          + "zc2lvbnMiOlsibmV0OnBlZXJDb3VudCJdfQ.Y6mNV0nvjzOdqAgMgxknFAOUTKoeRAo4aifNgNrWtuXbJJgz6-"
+          + "H_0GvLgjlToohPiDZbBJXJJlgb4zzLLB-sRtFnGoPaMgz_d_6z958GjFD7x_Fl0HW-WrTjRNenZNfTyD86OEAf"
+          + "XHy-7N3OYY2a5yeDbppTJy6nnHTq9hY-ad22-oWL1RbK3T_hnUJII_uXCZ9bJggSfu5m-NNUrm3TeqdnQzIaIz"
+          + "DqHlL0wNZwVPB4cFGN7zKghReBpkRJ8OFlxexQ491Q5eSpuYquhef-yGCIaMfy7GVtpDSD3Y-hjOErr7gUNCUh"
+          + "1wlc3Rb7ru_0qNgCWTBPJeRK32GppYotwQ";
+
+  private static final String ECDSA_TOKEN_ALLOWING_NET_PEER_COUNT =
+      "eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXQiOjE1MTYyMzkwMjIsImV4cCI6NDcyOTM2MzIwMCwicGVybWlz"
+          + "c2lvbnMiOlsibmV0OnBlZXJDb3VudCJdfQ.pWXniN6XQ7G8b1nawy8sviPCMxrfbcI6c7UFzeXm26CMGMUEZxiC"
+          + "JjRntB8ueuZcsxnGlEhCHt-KngpFEmx5TA";
+
+  private static final List<String> NO_AUTH_API_METHODS = Arrays.asList("net_services");
+
+  @BeforeEach
+  public void setUp() throws IOException, URISyntaxException {
+
+    final ClusterConfiguration clusterConfiguration =
+        new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build();
+    authenticatedCluster = new Cluster(clusterConfiguration, net);
+
+    nodeUsingAuthFile = besu.createNodeWithAuthentication("node1", AUTH_FILE);
+    nodeUsingRsaJwtPublicKey = besu.createNodeWithAuthenticationUsingRsaJwtPublicKey("node2");
+    nodeUsingEcdsaJwtPublicKey = besu.createNodeWithAuthenticationUsingEcdsaJwtPublicKey("node3");
+    nodeUsingAuthFileWithNoAuthApi =
+        besu.createNodeWithAuthFileAndNoAuthApi("node4", AUTH_FILE, NO_AUTH_API_METHODS);
+    authenticatedCluster.start(
+        nodeUsingAuthFile,
+        nodeUsingRsaJwtPublicKey,
+        nodeUsingEcdsaJwtPublicKey,
+        nodeUsingAuthFileWithNoAuthApi);
+
+    nodeUsingAuthFile.verify(login.awaitResponse("user", "badpassword"));
+    nodeUsingRsaJwtPublicKey.verify(login.awaitResponse("user", "badpassword"));
+    nodeUsingEcdsaJwtPublicKey.verify(login.awaitResponse("user", "badpassword"));
+    nodeUsingAuthFileWithNoAuthApi.verify(login.awaitResponse("user", "badpassword"));
+  }
+
+  @Test
+  public void shouldFailLoginWithWrongCredentials() {
+    nodeUsingAuthFile.verify(login.failure("user", "badpassword"));
+    nodeUsingAuthFileWithNoAuthApi.verify(login.failure("user", "badpassword"));
+  }
+
+  @Test
+  public void shouldSucceedLoginWithCorrectCredentials() {
+    nodeUsingAuthFile.verify(login.success("user", "pegasys"));
+    nodeUsingAuthFileWithNoAuthApi.verify(login.success("user", "pegasys"));
+  }
+
+  @Test
+  public void jsonRpcMethodShouldSucceedWithAuthenticatedUserAndPermission() {
+    String token =
+        nodeUsingAuthFile.execute(
+            permissioningTransactions.createSuccessfulLogin("user", "pegasys"));
+    nodeUsingAuthFile.useAuthenticationTokenInHeaderForJsonRpc(token);
+    nodeUsingAuthFile.verify(net.awaitPeerCount(3));
+
+    token =
+        nodeUsingAuthFileWithNoAuthApi.execute(
+            permissioningTransactions.createSuccessfulLogin("user", "pegasys"));
+    nodeUsingAuthFileWithNoAuthApi.useAuthenticationTokenInHeaderForJsonRpc(token);
+    nodeUsingAuthFileWithNoAuthApi.verify(net.awaitPeerCount(3));
+  }
+
+  @Test
+  public void jsonRpcMethodShouldFailOnNonPermittedMethod() {
+    String token =
+        nodeUsingAuthFile.execute(
+            permissioningTransactions.createSuccessfulLogin("user", "pegasys"));
+    nodeUsingAuthFile.useAuthenticationTokenInHeaderForJsonRpc(token);
+    nodeUsingAuthFile.verify(net.netVersionUnauthorized());
+    nodeUsingAuthFile.verify(net.netServicesUnauthorized());
+
+    token =
+        nodeUsingAuthFileWithNoAuthApi.execute(
+            permissioningTransactions.createSuccessfulLogin("user", "pegasys"));
+    nodeUsingAuthFileWithNoAuthApi.useAuthenticationTokenInHeaderForJsonRpc(token);
+    nodeUsingAuthFileWithNoAuthApi.verify(net.netVersionUnauthorized());
+  }
+
+  @Test
+  public void jsonRpcMethodsNotIncludedInNoAuthListShouldFailWithoutToken() {
+    nodeUsingAuthFile.verify(net.netVersionUnauthorized());
+    nodeUsingAuthFileWithNoAuthApi.verify(net.netVersionUnauthorized());
+  }
+
+  @Test
+  public void noAuthJsonRpcMethodShouldSucceedWithoutToken() {
+    nodeUsingAuthFileWithNoAuthApi.verify(net.netServicesAllActive());
+  }
+
+  @Test
+  public void noAuthJsonRpcConfiguredNodeShouldWorkAsIntended() {
+    // No token -> all methods other than specified no auth methods should fail
+    nodeUsingAuthFileWithNoAuthApi.verify(net.netVersionUnauthorized());
+    nodeUsingAuthFileWithNoAuthApi.verify(net.netServicesAllActive());
+
+    // Should behave the same with valid token
+    String token =
+        nodeUsingAuthFileWithNoAuthApi.execute(
+            permissioningTransactions.createSuccessfulLogin("user", "pegasys"));
+    nodeUsingAuthFileWithNoAuthApi.useAuthenticationTokenInHeaderForJsonRpc(token);
+    nodeUsingAuthFileWithNoAuthApi.verify(net.netVersionUnauthorized());
+    nodeUsingAuthFileWithNoAuthApi.verify(net.netServicesAllActive());
+    nodeUsingAuthFileWithNoAuthApi.verify(net.awaitPeerCount(3));
+  }
+
+  @Test
+  public void externalRsaJwtPublicKeyUsedOnJsonRpcMethodShouldSucceed() {
+    nodeUsingRsaJwtPublicKey.useAuthenticationTokenInHeaderForJsonRpc(
+        RSA_TOKEN_ALLOWING_NET_PEER_COUNT);
+    nodeUsingRsaJwtPublicKey.verify(net.awaitPeerCount(3));
+  }
+
+  @Test
+  public void externalRsaJwtPublicKeyUsedOnJsonRpcMethodShouldFailOnNonPermittedMethod() {
+    nodeUsingRsaJwtPublicKey.useAuthenticationTokenInHeaderForJsonRpc(
+        RSA_TOKEN_ALLOWING_NET_PEER_COUNT);
+    nodeUsingRsaJwtPublicKey.verify(net.netVersionUnauthorized());
+    nodeUsingRsaJwtPublicKey.verify(net.netServicesUnauthorized());
+  }
+
+  @Test
+  public void externalEcdsaJwtPublicKeyUsedOnJsonRpcMethodShouldSucceed() {
+    nodeUsingEcdsaJwtPublicKey.useAuthenticationTokenInHeaderForJsonRpc(
+        ECDSA_TOKEN_ALLOWING_NET_PEER_COUNT);
+    nodeUsingEcdsaJwtPublicKey.verify(net.awaitPeerCount(3));
+  }
+
+  @Test
+  public void externalEcdsaJwtPublicKeyUsedOnJsonRpcMethodShouldFailOnNonPermittedMethod() {
+    nodeUsingEcdsaJwtPublicKey.useAuthenticationTokenInHeaderForJsonRpc(
+        ECDSA_TOKEN_ALLOWING_NET_PEER_COUNT);
+    nodeUsingEcdsaJwtPublicKey.verify(net.netVersionUnauthorized());
+    nodeUsingEcdsaJwtPublicKey.verify(net.netServicesUnauthorized());
+  }
+
+  @Test
+  public void jsonRpcMethodShouldFailWhenThereIsNoToken() {
+    nodeUsingRsaJwtPublicKey.verify(net.netVersionUnauthorized());
+    nodeUsingRsaJwtPublicKey.verify(net.netServicesUnauthorized());
+  }
+
+  @Test
+  public void loginShouldBeDisabledWhenUsingExternalJwtPublicKey() {
+    nodeUsingRsaJwtPublicKey.verify(login.disabled());
+  }
+
+  @Override
+  public void tearDownAcceptanceTestBase() {
+    authenticatedCluster.stop();
+    super.tearDownAcceptanceTestBase();
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/JsonRpcWebsocketAuthenticationAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/JsonRpcWebsocketAuthenticationAcceptanceTest.java
new file mode 100644
index 00000000000..47d236e5b39
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/JsonRpcWebsocketAuthenticationAcceptanceTest.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.jsonrpc;
+
+import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.Cluster;
+import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfiguration;
+import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class JsonRpcWebsocketAuthenticationAcceptanceTest extends AcceptanceTestBase {
+  private BesuNode nodeUsingAuthFile;
+  private BesuNode nodeUsingRsaJwtPublicKey;
+  private BesuNode nodeUsingEcdsaJwtPublicKey;
+  private BesuNode nodeUsingAuthFileWithNoAuthApi;
+  private Cluster authenticatedCluster;
+  private static final String AUTH_FILE = "authentication/auth.toml";
+
+  private static final List<String> NO_AUTH_API_METHODS = Arrays.asList("net_services");
+
+  // token with payload{"iat": 1516239022,"exp": 4729363200,"permissions": ["net:peerCount"]}
+  private static final String RSA_TOKEN_ALLOWING_NET_PEER_COUNT =
+      "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXQiOjE1MTYyMzkwMjIsImV4cCI6NDcyOTM2MzIwMCwicGVybWl"
+          + "zc2lvbnMiOlsibmV0OnBlZXJDb3VudCJdfQ.Y6mNV0nvjzOdqAgMgxknFAOUTKoeRAo4aifNgNrWtuXbJJgz6-"
+          + "H_0GvLgjlToohPiDZbBJXJJlgb4zzLLB-sRtFnGoPaMgz_d_6z958GjFD7x_Fl0HW-WrTjRNenZNfTyD86OEAf"
+          + "XHy-7N3OYY2a5yeDbppTJy6nnHTq9hY-ad22-oWL1RbK3T_hnUJII_uXCZ9bJggSfu5m-NNUrm3TeqdnQzIaIz"
+          + "DqHlL0wNZwVPB4cFGN7zKghReBpkRJ8OFlxexQ491Q5eSpuYquhef-yGCIaMfy7GVtpDSD3Y-hjOErr7gUNCUh"
+          + "1wlc3Rb7ru_0qNgCWTBPJeRK32GppYotwQ";
+
+  private static final String ECDSA_TOKEN_ALLOWING_NET_PEER_COUNT =
+      "eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXQiOjE1MTYyMzkwMjIsImV4cCI6NDcyOTM2MzIwMCwicGVybWlz"
+          + "c2lvbnMiOlsibmV0OnBlZXJDb3VudCJdfQ.pWXniN6XQ7G8b1nawy8sviPCMxrfbcI6c7UFzeXm26CMGMUEZxiC"
+          + "JjRntB8ueuZcsxnGlEhCHt-KngpFEmx5TA";
+
+  @BeforeEach
+  public void setUp() throws IOException, URISyntaxException {
+    final ClusterConfiguration clusterConfiguration =
+        new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build();
+    authenticatedCluster = new Cluster(clusterConfiguration, net);
+
+    nodeUsingAuthFile = besu.createNodeWithAuthentication("node1", AUTH_FILE);
+    nodeUsingRsaJwtPublicKey = besu.createNodeWithAuthenticationUsingRsaJwtPublicKey("node2");
+    nodeUsingEcdsaJwtPublicKey = besu.createNodeWithAuthenticationUsingEcdsaJwtPublicKey("node3");
+    nodeUsingAuthFileWithNoAuthApi =
+        besu.createWsNodeWithAuthFileAndNoAuthApi("node4", AUTH_FILE, NO_AUTH_API_METHODS);
+    authenticatedCluster.start(
+        nodeUsingAuthFile,
+        nodeUsingRsaJwtPublicKey,
+        nodeUsingEcdsaJwtPublicKey,
+        nodeUsingAuthFileWithNoAuthApi);
+
+    nodeUsingAuthFile.useWebSocketsForJsonRpc();
+    nodeUsingRsaJwtPublicKey.useWebSocketsForJsonRpc();
+    nodeUsingEcdsaJwtPublicKey.useWebSocketsForJsonRpc();
+    nodeUsingAuthFileWithNoAuthApi.useWebSocketsForJsonRpc();
+    nodeUsingAuthFile.verify(login.awaitResponse("user", "badpassword"));
+    nodeUsingRsaJwtPublicKey.verify(login.awaitResponse("user", "badpassword"));
+    nodeUsingEcdsaJwtPublicKey.verify(login.awaitResponse("user", "badpassword"));
+    nodeUsingAuthFileWithNoAuthApi.verify(login.awaitResponse("user", "badpassword"));
+  }
+
+  @Test
+  public void shouldFailLoginWithWrongCredentials() {
+    nodeUsingAuthFile.verify(login.failure("user", "badpassword"));
+    nodeUsingAuthFileWithNoAuthApi.verify(login.failure("user", "badpassword"));
+  }
+
+  @Test
+  public void shouldSucceedLoginWithCorrectCredentials() {
+    nodeUsingAuthFile.verify(login.success("user", "pegasys"));
+    nodeUsingAuthFileWithNoAuthApi.verify(login.success("user", "pegasys"));
+  }
+
+  @Test
+  public void jsonRpcMethodShouldSucceedWithAuthenticatedUserAndPermission() {
+    String token =
+        nodeUsingAuthFile.execute(
+            permissioningTransactions.createSuccessfulLogin("user", "pegasys"));
+    nodeUsingAuthFile.useAuthenticationTokenInHeaderForJsonRpc(token);
+    nodeUsingAuthFile.verify(net.awaitPeerCount(3));
+
+    token =
+        nodeUsingAuthFileWithNoAuthApi.execute(
+            permissioningTransactions.createSuccessfulLogin("user", "pegasys"));
+    nodeUsingAuthFileWithNoAuthApi.useAuthenticationTokenInHeaderForJsonRpc(token);
+    nodeUsingAuthFileWithNoAuthApi.verify(net.awaitPeerCount(3));
+  }
+
+  @Test
+  public void jsonRpcMethodShouldFailOnNonPermittedMethod() {
+    String token =
+        nodeUsingAuthFile.execute(
+            permissioningTransactions.createSuccessfulLogin("user", "pegasys"));
+    nodeUsingAuthFile.useAuthenticationTokenInHeaderForJsonRpc(token);
+    nodeUsingAuthFile.verify(net.netVersionUnauthorized());
+    nodeUsingAuthFile.verify(net.netServicesUnauthorized());
+
+    token =
+        nodeUsingAuthFileWithNoAuthApi.execute(
+            permissioningTransactions.createSuccessfulLogin("user", "pegasys"));
+    nodeUsingAuthFileWithNoAuthApi.useAuthenticationTokenInHeaderForJsonRpc(token);
+    nodeUsingAuthFileWithNoAuthApi.verify(net.netVersionUnauthorized());
+  }
+
+  @Test
+  public void jsonRpcMethodsNotIncludedInNoAuthListShouldFailWithoutToken() {
+    nodeUsingAuthFile.verify(net.netVersionUnauthorized());
+    nodeUsingAuthFileWithNoAuthApi.verify(net.netVersionUnauthorized());
+  }
+
+  @Test
+  public void noAuthJsonRpcMethodShouldSucceedWithoutToken() {
+    nodeUsingAuthFileWithNoAuthApi.verify(net.netServicesAllActive());
+  }
+
+  @Test
+  public void noAuthJsonRpcConfiguredNodeShouldWorkAsIntended() {
+    // No token -> all methods other than specified no auth methods should fail
+    nodeUsingAuthFileWithNoAuthApi.verify(net.netVersionUnauthorized());
+    nodeUsingAuthFileWithNoAuthApi.verify(net.netServicesAllActive());
+
+    // Should behave the same with valid token
+    String token =
+        nodeUsingAuthFileWithNoAuthApi.execute(
+            permissioningTransactions.createSuccessfulLogin("user", "pegasys"));
+    nodeUsingAuthFileWithNoAuthApi.useAuthenticationTokenInHeaderForJsonRpc(token);
+    nodeUsingAuthFileWithNoAuthApi.verify(net.netVersionUnauthorized());
+    nodeUsingAuthFileWithNoAuthApi.verify(net.netServicesAllActive());
+    nodeUsingAuthFileWithNoAuthApi.verify(net.awaitPeerCount(3));
+  }
+
+  @Test
+  public void externalRsaJwtPublicKeyUsedOnJsonRpcMethodShouldSucceed() {
+    nodeUsingRsaJwtPublicKey.useAuthenticationTokenInHeaderForJsonRpc(
+        RSA_TOKEN_ALLOWING_NET_PEER_COUNT);
+    nodeUsingRsaJwtPublicKey.verify(net.awaitPeerCount(3));
+  }
+
+  @Test
+  public void externalRsaJwtPublicKeyUsedOnJsonRpcMethodShouldFailOnNonPermittedMethod() {
+    nodeUsingRsaJwtPublicKey.useAuthenticationTokenInHeaderForJsonRpc(
+        RSA_TOKEN_ALLOWING_NET_PEER_COUNT);
+    nodeUsingRsaJwtPublicKey.verify(net.netVersionUnauthorized());
+    nodeUsingAuthFile.verify(net.netServicesUnauthorized());
+  }
+
+  @Test
+  public void externalEcdsaJwtPublicKeyUsedOnJsonRpcMethodShouldSucceed() {
+    nodeUsingEcdsaJwtPublicKey.useAuthenticationTokenInHeaderForJsonRpc(
+        ECDSA_TOKEN_ALLOWING_NET_PEER_COUNT);
+    nodeUsingEcdsaJwtPublicKey.verify(net.awaitPeerCount(3));
+  }
+
+  @Test
+  public void externalEcdsaJwtPublicKeyUsedOnJsonRpcMethodShouldFailOnNonPermittedMethod() {
+    nodeUsingEcdsaJwtPublicKey.useAuthenticationTokenInHeaderForJsonRpc(
+        ECDSA_TOKEN_ALLOWING_NET_PEER_COUNT);
+    nodeUsingEcdsaJwtPublicKey.verify(net.netVersionUnauthorized());
+    nodeUsingEcdsaJwtPublicKey.verify(net.netServicesUnauthorized());
+  }
+
+  @Test
+  public void jsonRpcMethodShouldFailWhenThereIsNoToken() {
+    nodeUsingRsaJwtPublicKey.verify(net.netVersionUnauthorized());
+    nodeUsingRsaJwtPublicKey.verify(net.netServicesUnauthorized());
+  }
+
+  @Test
+  public void loginShouldBeDisabledWhenUsingExternalJwtPublicKey() {
+    nodeUsingRsaJwtPublicKey.verify(login.disabled());
+  }
+
+  @Override
+  public void tearDownAcceptanceTestBase() {
+    authenticatedCluster.stop();
+    super.tearDownAcceptanceTestBase();
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/NetServicesAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/NetServicesAcceptanceTest.java
index e8a337a0bd1..dbff6f151a3 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/NetServicesAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/NetServicesAcceptanceTest.java
@@ -20,8 +20,9 @@
 import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfiguration;
 import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder;
 
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class NetServicesAcceptanceTest extends AcceptanceTestBase {
 
@@ -30,11 +31,15 @@ public class NetServicesAcceptanceTest extends AcceptanceTestBase {
   private Node nodeA;
   private Node nodeB;
 
-  @Test
-  public void shouldIndicateNetServicesEnabled() throws Exception {
+  @BeforeEach
+  public void setup() {
     final ClusterConfiguration clusterConfiguration =
         new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build();
     noDiscoveryCluster = new Cluster(clusterConfiguration, net);
+  }
+
+  @Test
+  public void shouldIndicateNetServicesEnabled() throws Exception {
     nodeA = besu.createArchiveNodeNetServicesEnabled("nodeA");
     nodeB = besu.createArchiveNodeNetServicesEnabled("nodeB");
     noDiscoveryCluster.start(nodeA, nodeB);
@@ -45,9 +50,6 @@ public void shouldIndicateNetServicesEnabled() throws Exception {
 
   @Test
   public void shouldNotDisplayDisabledServices() throws Exception {
-    final ClusterConfiguration clusterConfiguration =
-        new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build();
-    noDiscoveryCluster = new Cluster(clusterConfiguration, net);
     nodeA = besu.createArchiveNodeNetServicesDisabled("nodeA");
     nodeB = besu.createArchiveNodeNetServicesDisabled("nodeB");
     noDiscoveryCluster.start(nodeA, nodeB);
@@ -56,7 +58,7 @@ public void shouldNotDisplayDisabledServices() throws Exception {
     nodeB.verify(net.netServicesOnlyJsonRpcEnabled());
   }
 
-  @After
+  @AfterEach
   public void closeDown() throws Exception {
     noDiscoveryCluster.close();
   }
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/RevertReasonAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/RevertReasonAcceptanceTest.java
similarity index 87%
rename from acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/RevertReasonAcceptanceTest.java
rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/RevertReasonAcceptanceTest.java
index 8e59382e71d..9c8d610dc28 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/RevertReasonAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/RevertReasonAcceptanceTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.tests.web3j;
+package org.hyperledger.besu.tests.acceptance.jsonrpc;
 
 import static org.hyperledger.besu.tests.web3j.generated.RevertReason.FUNC_REVERTWITHOUTREVERTREASON;
 import static org.hyperledger.besu.tests.web3j.generated.RevertReason.FUNC_REVERTWITHREVERTREASON;
@@ -21,15 +21,15 @@
 import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
 import org.hyperledger.besu.tests.web3j.generated.RevertReason;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.web3j.protocol.core.methods.response.EthSendTransaction;
 
 public class RevertReasonAcceptanceTest extends AcceptanceTestBase {
 
   private BesuNode minerNode;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     minerNode = besu.createMinerNodeWithRevertReasonEnabled("miner-node-withRevertReason");
     cluster.start(minerNode);
@@ -42,7 +42,7 @@ public void mustRevertWithRevertReason() {
     final EthSendTransaction transaction =
         minerNode.execute(
             contractTransactions.callSmartContract(
-                FUNC_REVERTWITHREVERTREASON, revertReasonContract.getContractAddress()));
+                revertReasonContract.getContractAddress(), FUNC_REVERTWITHREVERTREASON));
     minerNode.verify(
         eth.expectSuccessfulTransactionReceiptWithReason(
             transaction.getTransactionHash(), "RevertReason"));
@@ -55,7 +55,7 @@ public void mustRevertWithoutRevertReason() {
     final EthSendTransaction transaction =
         minerNode.execute(
             contractTransactions.callSmartContract(
-                FUNC_REVERTWITHOUTREVERTREASON, revertReasonContract.getContractAddress()));
+                revertReasonContract.getContractAddress(), FUNC_REVERTWITHOUTREVERTREASON));
     minerNode.verify(
         eth.expectSuccessfulTransactionReceiptWithoutReason(transaction.getTransactionHash()));
   }
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/Web3Sha3AcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/Web3Sha3AcceptanceTest.java
index 9de4c0bf2b7..a925a276611 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/Web3Sha3AcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/Web3Sha3AcceptanceTest.java
@@ -17,14 +17,14 @@
 import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class Web3Sha3AcceptanceTest extends AcceptanceTestBase {
 
   private Node node;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     node = besu.createArchiveNode("node1");
     cluster.start(node);
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/WebsocketServiceLoginAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/WebsocketServiceLoginAcceptanceTest.java
deleted file mode 100644
index 588a27390bc..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/WebsocketServiceLoginAcceptanceTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.jsonrpc;
-
-import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
-import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
-import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.Cluster;
-import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfiguration;
-import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class WebsocketServiceLoginAcceptanceTest extends AcceptanceTestBase {
-  private BesuNode nodeUsingAuthFile;
-  private BesuNode nodeUsingJwtPublicKey;
-  private Cluster authenticatedCluster;
-  private static final String AUTH_FILE = "authentication/auth.toml";
-
-  // token with payload{"iat": 1516239022,"exp": 4729363200,"permissions": ["net:peerCount"]}
-  private static final String TOKEN_ALLOWING_NET_PEER_COUNT =
-      "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXQiOjE1MTYyMzkwMjIsImV4cCI6NDcyOTM2MzIwMCwicGVybWl"
-          + "zc2lvbnMiOlsibmV0OnBlZXJDb3VudCJdfQ.Y6mNV0nvjzOdqAgMgxknFAOUTKoeRAo4aifNgNrWtuXbJJgz6-"
-          + "H_0GvLgjlToohPiDZbBJXJJlgb4zzLLB-sRtFnGoPaMgz_d_6z958GjFD7x_Fl0HW-WrTjRNenZNfTyD86OEAf"
-          + "XHy-7N3OYY2a5yeDbppTJy6nnHTq9hY-ad22-oWL1RbK3T_hnUJII_uXCZ9bJggSfu5m-NNUrm3TeqdnQzIaIz"
-          + "DqHlL0wNZwVPB4cFGN7zKghReBpkRJ8OFlxexQ491Q5eSpuYquhef-yGCIaMfy7GVtpDSD3Y-hjOErr7gUNCUh"
-          + "1wlc3Rb7ru_0qNgCWTBPJeRK32GppYotwQ";
-
-  @Before
-  public void setUp() throws IOException, URISyntaxException {
-    final ClusterConfiguration clusterConfiguration =
-        new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build();
-    authenticatedCluster = new Cluster(clusterConfiguration, net);
-
-    nodeUsingAuthFile = besu.createNodeWithAuthentication("node1", AUTH_FILE);
-    nodeUsingJwtPublicKey = besu.createNodeWithAuthenticationUsingJwtPublicKey("node2");
-    authenticatedCluster.start(nodeUsingAuthFile, nodeUsingJwtPublicKey);
-
-    nodeUsingAuthFile.useWebSocketsForJsonRpc();
-    nodeUsingJwtPublicKey.useWebSocketsForJsonRpc();
-    nodeUsingAuthFile.verify(login.awaitResponse("user", "badpassword"));
-    nodeUsingJwtPublicKey.verify(login.awaitResponse("user", "badpassword"));
-  }
-
-  @Test
-  public void shouldFailLoginWithWrongCredentials() {
-    nodeUsingAuthFile.verify(login.failure("user", "badpassword"));
-  }
-
-  @Test
-  public void shouldSucceedLoginWithCorrectCredentials() {
-    nodeUsingAuthFile.verify(login.success("user", "pegasys"));
-  }
-
-  @Test
-  public void jsonRpcMethodShouldSucceedWithAuthenticatedUserAndPermission() {
-    final String token =
-        nodeUsingAuthFile.execute(
-            permissioningTransactions.createSuccessfulLogin("user", "pegasys"));
-    nodeUsingAuthFile.useAuthenticationTokenInHeaderForJsonRpc(token);
-    nodeUsingAuthFile.verify(net.awaitPeerCount(1));
-  }
-
-  @Test
-  public void jsonRpcMethodShouldFailOnNonPermittedMethod() {
-    final String token =
-        nodeUsingAuthFile.execute(
-            permissioningTransactions.createSuccessfulLogin("user", "pegasys"));
-    nodeUsingAuthFile.useAuthenticationTokenInHeaderForJsonRpc(token);
-    nodeUsingAuthFile.verify(net.netVersionUnauthorized());
-    nodeUsingAuthFile.verify(net.netServicesUnauthorized());
-  }
-
-  @Test
-  public void externalJwtPublicKeyUsedOnJsonRpcMethodShouldSucceed() {
-    nodeUsingJwtPublicKey.useAuthenticationTokenInHeaderForJsonRpc(TOKEN_ALLOWING_NET_PEER_COUNT);
-    nodeUsingJwtPublicKey.verify(net.awaitPeerCount(1));
-  }
-
-  @Test
-  public void externalJwtPublicKeyUsedOnJsonRpcMethodShouldFailOnNonPermittedMethod() {
-    nodeUsingJwtPublicKey.useAuthenticationTokenInHeaderForJsonRpc(TOKEN_ALLOWING_NET_PEER_COUNT);
-    nodeUsingJwtPublicKey.verify(net.netVersionUnauthorized());
-    nodeUsingAuthFile.verify(net.netServicesUnauthorized());
-  }
-
-  @Test
-  public void jsonRpcMethodShouldFailWhenThereIsNoToken() {
-    nodeUsingJwtPublicKey.verify(net.netVersionUnauthorized());
-    nodeUsingJwtPublicKey.verify(net.netServicesUnauthorized());
-  }
-
-  @Test
-  public void loginShouldBeDisabledWhenUsingExternalJwtPublicKey() {
-    nodeUsingJwtPublicKey.verify(login.disabled());
-  }
-
-  @Override
-  public void tearDownAcceptanceTestBase() {
-    authenticatedCluster.stop();
-    super.tearDownAcceptanceTestBase();
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/admin/AdminAddPeerAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/admin/AdminAddPeerAcceptanceTest.java
index cce98463846..6c1bd5813bd 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/admin/AdminAddPeerAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/admin/AdminAddPeerAcceptanceTest.java
@@ -20,9 +20,9 @@
 import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfiguration;
 import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class AdminAddPeerAcceptanceTest extends AcceptanceTestBase {
   private Cluster noDiscoveryCluster;
@@ -30,7 +30,7 @@ public class AdminAddPeerAcceptanceTest extends AcceptanceTestBase {
   private Node nodeA;
   private Node nodeB;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     final ClusterConfiguration clusterConfiguration =
         new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build();
@@ -40,7 +40,7 @@ public void setUp() throws Exception {
     noDiscoveryCluster.start(nodeA, nodeB);
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     noDiscoveryCluster.stop();
   }
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/ipc/Web3JSupportAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/ipc/Web3JSupportAcceptanceTest.java
new file mode 100644
index 00000000000..c13c195cb33
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/jsonrpc/ipc/Web3JSupportAcceptanceTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.jsonrpc.ipc;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+import static org.junit.Assume.assumeTrue;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
+import org.hyperledger.besu.ethereum.api.jsonrpc.ipc.JsonRpcIpcConfiguration;
+import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.Locale;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.web3j.protocol.Web3j;
+import org.web3j.protocol.core.Request;
+import org.web3j.protocol.core.methods.response.NetVersion;
+import org.web3j.protocol.ipc.UnixIpcService;
+
+public class Web3JSupportAcceptanceTest extends AcceptanceTestBase {
+
+  private Node node;
+  private Path socketPath;
+
+  @Before
+  public void setUp() throws Exception {
+    socketPath = Files.createTempFile("besu-test-", ".ipc");
+    node =
+        besu.createNode(
+            "node1",
+            (configurationBuilder) ->
+                configurationBuilder.jsonRpcIpcConfiguration(
+                    new JsonRpcIpcConfiguration(
+                        true, socketPath, Collections.singletonList(RpcApis.NET.name()))));
+    cluster.start(node);
+  }
+
+  @Test
+  public void netVersionCall() {
+    final String osName = System.getProperty("os.name").toLowerCase(Locale.ENGLISH);
+    assumeTrue(osName.contains("mac") || osName.contains("linux"));
+
+    final Web3j web3 = Web3j.build(new UnixIpcService(socketPath.toString()));
+    final Request<?, NetVersion> ethBlockNumberRequest = web3.netVersion();
+    node.verify(
+        node -> {
+          try {
+            assertThat(ethBlockNumberRequest.send().getNetVersion())
+                .isEqualTo(String.valueOf(2018));
+          } catch (IOException e) {
+            fail("Web3J net_version call failed", e);
+          }
+        });
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalAndOnChainPermissioningAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalAndOnChainPermissioningAcceptanceTest.java
deleted file mode 100644
index 418bfa9741b..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalAndOnChainPermissioningAcceptanceTest.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.permissioning;
-
-import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
-import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.account.TransferTransaction;
-
-import java.math.BigInteger;
-import java.util.Arrays;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class AccountLocalAndOnChainPermissioningAcceptanceTest
-    extends AccountSmartContractPermissioningAcceptanceTestBase {
-
-  private Account senderC;
-
-  @Before
-  public void setUp() {
-    senderC = accounts.createAccount("Account-C");
-  }
-
-  @Test
-  public void testAccountCannotSendTxWhenNotOnLocalAllowList() {
-    // OnChain allowlist: Primary, Secondary, C
-    // Local allowlist: Primary, Secondary
-
-    final Node node =
-        permissionedNode(
-            "node1",
-            Arrays.asList(
-                accounts.getPrimaryBenefactor().getAddress(),
-                accounts.getSecondaryBenefactor().getAddress()));
-    permissionedCluster.start(node);
-
-    // ensure SenderC has got some ether available
-    node.execute(accountTransactions.createTransfer(senderC, 10));
-    node.verify(senderC.balanceEquals(10));
-
-    // add accounts to onChain allowlist
-    node.execute(allowAccount(accounts.getPrimaryBenefactor()));
-    node.verify(accountIsAllowed(accounts.getPrimaryBenefactor()));
-
-    node.execute(allowAccount(accounts.getSecondaryBenefactor()));
-    node.verify(accountIsAllowed(accounts.getSecondaryBenefactor()));
-
-    node.execute(allowAccount(senderC));
-    node.verify(accountIsAllowed(senderC));
-
-    // sender C should not be able to send Tx
-    verifyTransferForbidden(node, senderC, accounts.getSecondaryBenefactor());
-  }
-
-  @Test
-  public void testAccountCannotSendTxWhenNotOnOnChainAllowList() {
-    // OnChain allowlist: Primary, Secondary, Receiver
-    // Local allowlist: Primary, Secondary, C, Receiver
-
-    final Account receiverAccount = accounts.createAccount("Rec-A");
-
-    final Node node =
-        permissionedNode(
-            "node1",
-            Arrays.asList(
-                accounts.getPrimaryBenefactor().getAddress(),
-                accounts.getSecondaryBenefactor().getAddress(),
-                senderC.getAddress(),
-                receiverAccount.getAddress()));
-    permissionedCluster.start(node);
-
-    // ensure SenderC has got some ether available
-    node.execute(accountTransactions.createTransfer(senderC, 10));
-    node.verify(senderC.balanceEquals(10));
-
-    // add accounts to onChain allowlist
-    node.execute(allowAccount(accounts.getPrimaryBenefactor()));
-    node.verify(accountIsAllowed(accounts.getPrimaryBenefactor()));
-
-    node.execute(allowAccount(accounts.getSecondaryBenefactor()));
-    node.verify(accountIsAllowed(accounts.getSecondaryBenefactor()));
-
-    node.execute(allowAccount(receiverAccount));
-    node.verify(accountIsAllowed(receiverAccount));
-
-    // verify senderC is forbidden because it is not on OnChain allowlist
-    node.verify(accountIsForbidden(senderC));
-
-    // sender C should not be able to send Tx as well
-    node.execute(accountTransactions.createTransfer(senderC, receiverAccount, 1));
-    node.verify(receiverAccount.balanceDoesNotChange(0));
-
-    // final check, other account should be able to send tx
-    node.execute(
-        accountTransactions.createTransfer(accounts.getPrimaryBenefactor(), receiverAccount, 5));
-    node.verify(receiverAccount.balanceEquals(5));
-  }
-
-  private void verifyTransferForbidden(
-      final Node node, final Account sender, final Account beneficiary) {
-    BigInteger nonce = node.execute(ethTransactions.getTransactionCount(sender.getAddress()));
-    TransferTransaction transfer =
-        accountTransactions.createTransfer(sender, beneficiary, 1, nonce);
-    node.verify(
-        eth.sendRawTransactionExceptional(
-            transfer.signedTransactionData(),
-            "Sender account not authorized to send transactions"));
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalAndOnchainPermissioningAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalAndOnchainPermissioningAcceptanceTest.java
new file mode 100644
index 00000000000..4b6401303be
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalAndOnchainPermissioningAcceptanceTest.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.permissioning;
+
+import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
+import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.account.TransferTransaction;
+
+import java.math.BigInteger;
+import java.util.Arrays;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class AccountLocalAndOnchainPermissioningAcceptanceTest
+    extends AccountSmartContractPermissioningAcceptanceTestBase {
+
+  private Account senderC;
+
+  @Before
+  public void setUp() {
+    senderC = accounts.createAccount("Account-C");
+  }
+
+  @Test
+  public void testAccountCannotSendTxWhenNotOnLocalAllowList() {
+    // Onchain allowlist: Primary, Secondary, C
+    // Local allowlist: Primary, Secondary
+
+    final Node node =
+        permissionedNode(
+            "node1",
+            Arrays.asList(
+                accounts.getPrimaryBenefactor().getAddress(),
+                accounts.getSecondaryBenefactor().getAddress()));
+    permissionedCluster.start(node);
+
+    // ensure SenderC has got some ether available
+    node.execute(accountTransactions.createTransfer(senderC, 10));
+    node.verify(senderC.balanceEquals(10));
+
+    // add accounts to onchain allowlist
+    node.execute(allowAccount(accounts.getPrimaryBenefactor()));
+    node.verify(accountIsAllowed(accounts.getPrimaryBenefactor()));
+
+    node.execute(allowAccount(accounts.getSecondaryBenefactor()));
+    node.verify(accountIsAllowed(accounts.getSecondaryBenefactor()));
+
+    node.execute(allowAccount(senderC));
+    node.verify(accountIsAllowed(senderC));
+
+    // sender C should not be able to send Tx
+    verifyTransferForbidden(node, senderC, accounts.getSecondaryBenefactor());
+  }
+
+  @Test
+  public void testAccountCannotSendTxWhenNotOnOnchainAllowList() {
+    // Onchain allowlist: Primary, Secondary, Receiver
+    // Local allowlist: Primary, Secondary, C, Receiver
+
+    final Account receiverAccount = accounts.createAccount("Rec-A");
+
+    final Node node =
+        permissionedNode(
+            "node1",
+            Arrays.asList(
+                accounts.getPrimaryBenefactor().getAddress(),
+                accounts.getSecondaryBenefactor().getAddress(),
+                senderC.getAddress(),
+                receiverAccount.getAddress()));
+    permissionedCluster.start(node);
+
+    // ensure SenderC has got some ether available
+    node.execute(accountTransactions.createTransfer(senderC, 10));
+    node.verify(senderC.balanceEquals(10));
+
+    // add accounts to onchain allowlist
+    node.execute(allowAccount(accounts.getPrimaryBenefactor()));
+    node.verify(accountIsAllowed(accounts.getPrimaryBenefactor()));
+
+    node.execute(allowAccount(accounts.getSecondaryBenefactor()));
+    node.verify(accountIsAllowed(accounts.getSecondaryBenefactor()));
+
+    node.execute(allowAccount(receiverAccount));
+    node.verify(accountIsAllowed(receiverAccount));
+
+    // verify senderC is forbidden because it is not on Onchain allowlist
+    node.verify(accountIsForbidden(senderC));
+
+    // sender C should not be able to send Tx
+    verifyTransferForbidden(node, senderC, accounts.getSecondaryBenefactor());
+
+    // final check, other account should be able to send tx
+    node.execute(
+        accountTransactions.createTransfer(accounts.getPrimaryBenefactor(), receiverAccount, 5));
+    node.verify(receiverAccount.balanceEquals(5));
+  }
+
+  private void verifyTransferForbidden(
+      final Node node, final Account sender, final Account beneficiary) {
+    final BigInteger nonce = node.execute(ethTransactions.getTransactionCount(sender.getAddress()));
+    final TransferTransaction transfer =
+        accountTransactions.createTransfer(sender, beneficiary, 1, nonce);
+    node.verify(
+        eth.expectEthSendRawTransactionException(
+            transfer.signedTransactionData(),
+            "Sender account not authorized to send transactions"));
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalConfigPermissioningAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalConfigPermissioningAcceptanceTest.java
index a90bd0133ac..78a9fee0413 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalConfigPermissioningAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalConfigPermissioningAcceptanceTest.java
@@ -78,7 +78,7 @@ private void verifyTransferForbidden(final Account sender, final Account benefic
     TransferTransaction transfer =
         accountTransactions.createTransfer(sender, beneficiary, 1, nonce);
     node.verify(
-        eth.sendRawTransactionExceptional(
+        eth.expectEthSendRawTransactionException(
             transfer.signedTransactionData(),
             "Sender account not authorized to send transactions"));
   }
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalConfigPermissioningImportAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalConfigPermissioningImportAcceptanceTest.java
index eacbb2abfd0..4415a03f807 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalConfigPermissioningImportAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountLocalConfigPermissioningImportAcceptanceTest.java
@@ -74,7 +74,7 @@ public void transactionFromDeniedAccountShouldNotBreakBlockImport() throws IOExc
         besu.createIbft2NodeWithLocalAccountPermissioning(
             "nodeC", GENESIS_FILE, allowList, newPermissionsFile);
 
-    waitForBlockHeight(bootnode, 5);
+    waitForBlockHeight(bootnode, 2);
 
     nodeA.verify(beneficiary.balanceEquals(0));
     nodeA.execute(accountTransactions.createTransfer(sender, beneficiary, 1));
@@ -82,8 +82,8 @@ public void transactionFromDeniedAccountShouldNotBreakBlockImport() throws IOExc
 
     permissionedCluster.startNode(nodeC);
 
-    waitForBlockHeight(bootnode, 10);
-    waitForBlockHeight(nodeC, 10);
+    waitForBlockHeight(bootnode, 4);
+    waitForBlockHeight(nodeC, 4);
   }
 
   private void persistAllowList(final List<String> allowList, final Path path) throws IOException {
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTest.java
index 183b91f38ad..6d9e74e04a6 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTest.java
@@ -16,7 +16,9 @@
 
 import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.account.TransferTransaction;
 
+import java.math.BigInteger;
 import java.util.Collections;
 
 import org.junit.Before;
@@ -60,7 +62,16 @@ public void forbiddenAccountCannotTransferValue() {
     node.execute(forbidAccount(allowedSender));
     node.verify(accountIsForbidden(allowedSender));
 
-    node.execute(accountTransactions.createTransfer(allowedSender, otherAccount, 5));
-    node.verify(otherAccount.balanceDoesNotChange(0));
+    verifyTransferForbidden(allowedSender, otherAccount);
+  }
+
+  private void verifyTransferForbidden(final Account sender, final Account beneficiary) {
+    final BigInteger nonce = node.execute(ethTransactions.getTransactionCount(sender.getAddress()));
+    final TransferTransaction transfer =
+        accountTransactions.createTransfer(sender, beneficiary, 1, nonce);
+    node.verify(
+        eth.expectEthSendRawTransactionException(
+            transfer.signedTransactionData(),
+            "Sender account not authorized to send transactions"));
   }
 }
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTestBase.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTestBase.java
index 6918e6fa02b..7cad210dd74 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTestBase.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AccountSmartContractPermissioningAcceptanceTestBase.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.tests.acceptance.permissioning;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AllowlistPersistorAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AllowlistPersistorAcceptanceTest.java
index 93c2e235de9..5a563cc5264 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AllowlistPersistorAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AllowlistPersistorAcceptanceTest.java
@@ -64,7 +64,7 @@ public void setUp() throws Exception {
   }
 
   @Test
-  public void manipulatedAccountsWhitelistIsPersisted() {
+  public void manipulatedAccountsAllowlistIsPersisted() {
     node.verify(
         perm.expectPermissioningAllowlistFileKeyValue(
             ALLOWLIST_TYPE.ACCOUNTS, tempFile, senderA.getAddress()));
@@ -87,7 +87,7 @@ public void manipulatedAccountsWhitelistIsPersisted() {
   }
 
   @Test
-  public void manipulatedNodesWhitelistIsPersisted() {
+  public void manipulatedNodesAllowlistIsPersisted() {
     node.verify(perm.addNodesToAllowlist(ENODE_ONE, ENODE_TWO));
     node.verify(
         perm.expectPermissioningAllowlistFileKeyValue(
@@ -104,7 +104,7 @@ public void manipulatedNodesWhitelistIsPersisted() {
   }
 
   @Test
-  public void manipulatedNodesWhitelistWithHostnameShouldNotWorkWhenDnsDisabled() {
+  public void manipulatedNodesAllowlistWithHostnameShouldNotWorkWhenDnsDisabled() {
     Assertions.assertThatThrownBy(() -> node.verify(perm.addNodesToAllowlist(ENODE_FOURTH)))
         .isInstanceOf(RuntimeException.class)
         .hasMessageContaining("Request contains an invalid node");
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AllowlistWithDnsPersistorAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AllowlistWithDnsPersistorAcceptanceTest.java
index dc51fc5d0f4..88c7e783777 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AllowlistWithDnsPersistorAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/AllowlistWithDnsPersistorAcceptanceTest.java
@@ -14,12 +14,18 @@
  */
 package org.hyperledger.besu.tests.acceptance.permissioning;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.hyperledger.besu.ethereum.permissioning.AllowlistPersistor.ALLOWLIST_TYPE;
 
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
+import org.hyperledger.besu.ethereum.p2p.peers.ImmutableEnodeDnsConfiguration;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
+import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
 import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
 
+import java.net.InetAddress;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -30,12 +36,13 @@
 
 public class AllowlistWithDnsPersistorAcceptanceTest extends AcceptanceTestBase {
 
-  private static final String ENODE_ONE =
-      "enode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@localhost:4567";
-  private static final String ENODE_TWO =
-      "enode://5f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@192.168.0.10:4567";
-  private static final String ENODE_THREE =
-      "enode://4f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@192.168.0.11:4567";
+  public static final String ENODE_PREFIX =
+      "enode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@";
+  public static final String PORT_SUFFIX = ":4567";
+
+  private String ENODE_LOCALHOST_DNS;
+  private String ENODE_LOCALHOST_IP;
+  private String ENODE_TWO_IP;
 
   private Node node;
   private Account senderA;
@@ -43,8 +50,13 @@ public class AllowlistWithDnsPersistorAcceptanceTest extends AcceptanceTestBase
 
   @Before
   public void setUp() throws Exception {
+    ENODE_LOCALHOST_DNS = ENODE_PREFIX + InetAddress.getLocalHost().getHostName() + PORT_SUFFIX;
+    ENODE_LOCALHOST_IP = ENODE_PREFIX + "127.0.0.1" + PORT_SUFFIX;
+    ENODE_TWO_IP =
+        "enode://5f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@192.168.0.10:1234";
+
     senderA = accounts.getPrimaryBenefactor();
-    tempFile = Files.createTempFile("test", "test");
+    tempFile = Files.createTempFile("test", "perm-dns-test");
 
     this.node =
         permissionedNodeBuilder
@@ -60,20 +72,60 @@ public void setUp() throws Exception {
   }
 
   @Test
-  public void manipulatedNodesWhitelistWithHostnameShouldWorkWhenDnsEnabled() {
+  public void addingEnodeWithIp_andThenAddingSameEnodeWithHostname_shouldThrow() {
 
-    node.verify(perm.addNodesToAllowlist(ENODE_ONE, ENODE_TWO));
+    node.verify(perm.addNodesToAllowlist(ENODE_LOCALHOST_IP));
     node.verify(
         perm.expectPermissioningAllowlistFileKeyValue(
-            ALLOWLIST_TYPE.NODES, tempFile, ENODE_ONE, ENODE_TWO));
+            ALLOWLIST_TYPE.NODES, tempFile, ENODE_LOCALHOST_DNS));
+
+    // expect an exception when adding using hostname, since this node is already added with IP
+    final Condition condition = perm.addNodesToAllowlist(ENODE_LOCALHOST_DNS);
+    assertThatThrownBy(() -> node.verify(condition)).isInstanceOf(RuntimeException.class);
+  }
+
+  @Test
+  public void addingEnodeWithHostname_andThenAddingSameEnodeWithIp_shouldThrow() {
 
-    node.verify(perm.removeNodesFromAllowlist(ENODE_ONE));
+    node.verify(perm.addNodesToAllowlist(ENODE_LOCALHOST_DNS));
     node.verify(
-        perm.expectPermissioningAllowlistFileKeyValue(ALLOWLIST_TYPE.NODES, tempFile, ENODE_TWO));
+        perm.expectPermissioningAllowlistFileKeyValue(
+            ALLOWLIST_TYPE.NODES, tempFile, ENODE_LOCALHOST_DNS));
+
+    // expect an exception when adding using IP, since this node is already added with hostname
+    final Condition condition = perm.addNodesToAllowlist(ENODE_LOCALHOST_IP);
+    assertThatThrownBy(() -> node.verify(condition)).isInstanceOf(RuntimeException.class);
+  }
+
+  @Test
+  public void addingEnodeWithHostNameShouldWorkWhenDnsEnabled() {
+
+    node.verify(perm.addNodesToAllowlist(ENODE_LOCALHOST_DNS));
+
+    // This should just work since there is no IP address to resolve to a host name.
+    // With DNS enabled, the ENODE with the DNS hostname in it should remain as is.
+    node.verify(
+        perm.expectPermissioningAllowlistFileKeyValue(
+            ALLOWLIST_TYPE.NODES, tempFile, ENODE_LOCALHOST_DNS));
+  }
+
+  @Test
+  public void manipulatedNodesAllowlistWithHostnameShouldWorkWhenDnsEnabled() {
+
+    node.verify(perm.addNodesToAllowlist(ENODE_LOCALHOST_DNS, ENODE_TWO_IP));
+    // use DNS config to resolve the Enode with IP. It either resolves to a hostname or remain as is
+    final EnodeURL enodeURL0 =
+        EnodeURLImpl.fromString(
+            ENODE_TWO_IP,
+            ImmutableEnodeDnsConfiguration.builder().dnsEnabled(true).updateEnabled(true).build());
+    final String enode2ResolvedToDns = enodeURL0.toString();
+    node.verify(
+        perm.expectPermissioningAllowlistFileKeyValue(
+            ALLOWLIST_TYPE.NODES, tempFile, ENODE_LOCALHOST_DNS, enode2ResolvedToDns));
 
-    node.verify(perm.addNodesToAllowlist(ENODE_ONE, ENODE_THREE));
+    node.verify(perm.removeNodesFromAllowlist(ENODE_LOCALHOST_DNS));
     node.verify(
         perm.expectPermissioningAllowlistFileKeyValue(
-            ALLOWLIST_TYPE.NODES, tempFile, ENODE_TWO, ENODE_ONE, ENODE_THREE));
+            ALLOWLIST_TYPE.NODES, tempFile, enode2ResolvedToDns));
   }
 }
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeLocalAndOnChainPermissioningAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeLocalAndOnChainPermissioningAcceptanceTest.java
deleted file mode 100644
index 1247c5b5149..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeLocalAndOnChainPermissioningAcceptanceTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.permissioning;
-
-import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class NodeLocalAndOnChainPermissioningAcceptanceTest
-    extends NodeSmartContractPermissioningAcceptanceTestBase {
-
-  private Node bootnode;
-  private Node permissionedNode;
-  private Node allowedNode;
-  private Node forbiddenNode;
-
-  @Before
-  public void setUp() {
-    bootnode = bootnode("bootnode");
-    forbiddenNode = node("forbidden-node");
-    allowedNode = node("allowed-node");
-
-    permissionedCluster.start(bootnode, allowedNode, forbiddenNode);
-  }
-
-  @Test
-  public void testNodeCannotConnectWhenAllowedOnChainButNotLocally() {
-
-    // add permissioned node after cluster start because we need enode URI for local config
-    permissionedNode = permissionedNode("permissioned-node", bootnode, allowedNode);
-    permissionedCluster.addNode(permissionedNode);
-
-    // update OnChain smart contract with allowed nodes
-    permissionedNode.execute(allowNode(bootnode));
-    permissionedNode.verify(nodeIsAllowed(bootnode));
-
-    permissionedNode.execute(allowNode(allowedNode));
-    permissionedNode.verify(nodeIsAllowed(allowedNode));
-
-    permissionedNode.execute(allowNode(permissionedNode));
-    permissionedNode.verify(nodeIsAllowed(permissionedNode));
-
-    permissionedNode.execute(allowNode(forbiddenNode));
-    permissionedNode.verify(nodeIsAllowed(forbiddenNode));
-
-    permissionedNodeShouldDiscoverOnlyAllowedNodes();
-  }
-
-  @Test
-  public void testNodeCannotConnectWhenAllowedLocallyButNotOnChain() {
-    // onchain allowlist: A, B
-    // local allowlist: A, B, C
-
-    // add permissioned node after cluster start because we need enode URI for local config
-    permissionedNode = permissionedNode("permissioned-node", bootnode, allowedNode, forbiddenNode);
-    permissionedCluster.addNode(permissionedNode);
-
-    // update OnChain smart contract with allowed nodes
-    permissionedNode.execute(allowNode(bootnode));
-    permissionedNode.verify(nodeIsAllowed(bootnode));
-
-    permissionedNode.execute(allowNode(allowedNode));
-    permissionedNode.verify(nodeIsAllowed(allowedNode));
-
-    permissionedNode.execute(allowNode(permissionedNode));
-    permissionedNode.verify(nodeIsAllowed(permissionedNode));
-
-    permissionedNodeShouldDiscoverOnlyAllowedNodes();
-  }
-
-  @Test
-  public void testNodesCanConnectWhenAllowedBothOnChainAndLocally() {
-    // add permissioned node after cluster start because we need enode URI for local config
-    permissionedNode = permissionedNode("permissioned-node", bootnode, allowedNode, forbiddenNode);
-    permissionedCluster.addNode(permissionedNode);
-
-    // update OnChain smart contract with allowed nodes
-    permissionedNode.execute(allowNode(bootnode));
-    permissionedNode.verify(nodeIsAllowed(bootnode));
-
-    permissionedNode.execute(allowNode(allowedNode));
-    permissionedNode.verify(nodeIsAllowed(allowedNode));
-
-    permissionedNode.execute(allowNode(permissionedNode));
-    permissionedNode.verify(nodeIsAllowed(permissionedNode));
-
-    permissionedNode.execute(allowNode(forbiddenNode));
-    permissionedNode.verify(nodeIsAllowed(forbiddenNode));
-
-    bootnode.verify(net.awaitPeerCount(3));
-    allowedNode.verify(net.awaitPeerCount(3));
-    forbiddenNode.verify(net.awaitPeerCount(3));
-    permissionedNode.verify(net.awaitPeerCount(3));
-  }
-
-  private void permissionedNodeShouldDiscoverOnlyAllowedNodes() {
-    bootnode.verify(net.awaitPeerCount(3));
-    allowedNode.verify(net.awaitPeerCount(3));
-    forbiddenNode.verify(net.awaitPeerCount(2));
-    permissionedNode.verify(net.awaitPeerCount(2));
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeLocalAndOnchainPermissioningAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeLocalAndOnchainPermissioningAcceptanceTest.java
new file mode 100644
index 00000000000..6a7b8e9b35f
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeLocalAndOnchainPermissioningAcceptanceTest.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.permissioning;
+
+import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class NodeLocalAndOnchainPermissioningAcceptanceTest
+    extends NodeSmartContractPermissioningAcceptanceTestBase {
+
+  private Node bootnode;
+  private Node permissionedNode;
+  private Node allowedNode;
+  private Node forbiddenNode;
+
+  @Before
+  public void setUp() {
+    bootnode = bootnode("bootnode");
+    forbiddenNode = node("forbidden-node");
+    allowedNode = node("allowed-node");
+
+    permissionedCluster.start(bootnode, allowedNode, forbiddenNode);
+  }
+
+  @Test
+  public void testNodeCannotConnectWhenAllowedOnchainButNotLocally() {
+
+    // add permissioned node after cluster start because we need enode URI for local config
+    permissionedNode = permissionedNode("permissioned-node", bootnode, allowedNode);
+    permissionedCluster.addNode(permissionedNode);
+
+    // update Onchain smart contract with allowed nodes
+    permissionedNode.execute(allowNode(bootnode));
+    permissionedNode.verify(nodeIsAllowed(bootnode));
+
+    permissionedNode.execute(allowNode(allowedNode));
+    permissionedNode.verify(nodeIsAllowed(allowedNode));
+
+    permissionedNode.execute(allowNode(permissionedNode));
+    permissionedNode.verify(nodeIsAllowed(permissionedNode));
+
+    permissionedNode.execute(allowNode(forbiddenNode));
+    permissionedNode.verify(nodeIsAllowed(forbiddenNode));
+
+    permissionedNodeShouldDiscoverOnlyAllowedNodes();
+  }
+
+  @Test
+  public void testNodeCannotConnectWhenAllowedLocallyButNotOnchain() {
+    // onchain allowlist: A, B
+    // local allowlist: A, B, C
+
+    // add permissioned node after cluster start because we need enode URI for local config
+    permissionedNode = permissionedNode("permissioned-node", bootnode, allowedNode, forbiddenNode);
+    permissionedCluster.addNode(permissionedNode);
+
+    // update Onchain smart contract with allowed nodes
+    permissionedNode.execute(allowNode(bootnode));
+    permissionedNode.verify(nodeIsAllowed(bootnode));
+
+    permissionedNode.execute(allowNode(allowedNode));
+    permissionedNode.verify(nodeIsAllowed(allowedNode));
+
+    permissionedNode.execute(allowNode(permissionedNode));
+    permissionedNode.verify(nodeIsAllowed(permissionedNode));
+
+    permissionedNodeShouldDiscoverOnlyAllowedNodes();
+  }
+
+  @Test
+  public void testNodesCanConnectWhenAllowedBothOnchainAndLocally() {
+    // add permissioned node after cluster start because we need enode URI for local config
+    permissionedNode = permissionedNode("permissioned-node", bootnode, allowedNode, forbiddenNode);
+    permissionedCluster.addNode(permissionedNode);
+
+    // update Onchain smart contract with allowed nodes
+    permissionedNode.execute(allowNode(bootnode));
+    permissionedNode.verify(nodeIsAllowed(bootnode));
+
+    permissionedNode.execute(allowNode(allowedNode));
+    permissionedNode.verify(nodeIsAllowed(allowedNode));
+
+    permissionedNode.execute(allowNode(permissionedNode));
+    permissionedNode.verify(nodeIsAllowed(permissionedNode));
+
+    permissionedNode.execute(allowNode(forbiddenNode));
+    permissionedNode.verify(nodeIsAllowed(forbiddenNode));
+
+    bootnode.verify(net.awaitPeerCount(3));
+    allowedNode.verify(net.awaitPeerCount(3));
+    forbiddenNode.verify(net.awaitPeerCount(3));
+    permissionedNode.verify(net.awaitPeerCount(3));
+  }
+
+  private void permissionedNodeShouldDiscoverOnlyAllowedNodes() {
+    bootnode.verify(net.awaitPeerCount(3));
+    allowedNode.verify(net.awaitPeerCount(3));
+    forbiddenNode.verify(net.awaitPeerCount(2));
+    permissionedNode.verify(net.awaitPeerCount(2));
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTest.java
index 3eb746b7ae6..c5fbb693043 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTest.java
@@ -46,6 +46,9 @@ public void setUp() {
 
     permissionedNode.execute(allowNode(permissionedNode));
     permissionedNode.verify(nodeIsAllowed(permissionedNode));
+
+    permissionedNode.verify(admin.addPeer(bootnode));
+    permissionedNode.verify(admin.addPeer(allowedNode));
   }
 
   @Test
@@ -58,38 +61,18 @@ public void permissionedNodeShouldPeerOnlyWithAllowedNodes() {
 
   @Test
   public void permissionedNodeShouldDisconnectFromNodeNotPermittedAnymore() {
-    permissionedNode.verify(admin.addPeer(bootnode));
-    permissionedNode.verify(admin.addPeer(allowedNode));
-    permissionedNode.verify(net.awaitPeerCount(2));
-
     permissionedNode.execute(forbidNode(allowedNode));
     permissionedNode.verify(connectionIsForbidden(permissionedNode, allowedNode));
 
     permissionedNode.verify(net.awaitPeerCount(1));
   }
 
-  @Test
-  public void permissionedNodeShouldConnectToNewlyPermittedNode() {
-    permissionedNode.verify(admin.addPeer(bootnode));
-    permissionedNode.verify(admin.addPeer(allowedNode));
-    permissionedNode.verify(net.awaitPeerCount(2));
-
-    permissionedNode.execute(allowNode(forbiddenNode));
-    permissionedNode.verify(connectionIsAllowed(permissionedNode, forbiddenNode));
-    permissionedNode.verify(admin.addPeer(forbiddenNode));
-
-    permissionedNode.verify(net.awaitPeerCount(3));
-  }
-
   @Test
   public void permissioningUpdatesPropagateThroughNetwork() {
-    permissionedNode.verify(admin.addPeer(bootnode));
-    permissionedNode.verify(admin.addPeer(allowedNode));
-    permissionedNode.verify(net.awaitPeerCount(2));
-
-    // permissioning changes in peer should propagate to permissioned node
+    // connection to newly permitted node is allowed
     allowedNode.execute(allowNode(forbiddenNode));
     allowedNode.verify(connectionIsAllowed(permissionedNode, forbiddenNode));
+    // permissioning changes in peer should propagate to permissioned node
     permissionedNode.verify(connectionIsAllowed(permissionedNode, forbiddenNode));
 
     permissionedNode.verify(admin.addPeer(forbiddenNode));
@@ -97,7 +80,7 @@ public void permissioningUpdatesPropagateThroughNetwork() {
   }
 
   @Test
-  public void onChainPermissioningAllowlistShouldPersistAcrossRestarts() {
+  public void onchainPermissioningAllowlistShouldPersistAcrossRestarts() {
     permissionedCluster.stop();
     permissionedCluster.start(bootnode, forbiddenNode, allowedNode, permissionedNode);
 
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTestBase.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTestBase.java
index c13fd0c9096..094dc08862b 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTestBase.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningAcceptanceTestBase.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.tests.acceptance.permissioning;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.perm.NodeSmartContractPermissioningConditions;
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningIbft2StallAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningIbft2StallAcceptanceTest.java
new file mode 100644
index 00000000000..fc64ee13862
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningIbft2StallAcceptanceTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.permissioning;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
+import org.hyperledger.besu.ethereum.permissioning.SmartContractPermissioningConfiguration;
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+
+import java.io.IOException;
+import java.util.Optional;
+
+import org.junit.Test;
+
+public class NodeSmartContractPermissioningIbft2StallAcceptanceTest
+    extends NodeSmartContractPermissioningAcceptanceTestBase {
+
+  private static final String GENESIS_FILE =
+      "/permissioning/simple_permissioning_ibft_genesis.json";
+
+  @Test
+  public void restartedIbftClusterShouldNotStall() throws IOException {
+    final BesuNode bootnode = besu.createIbft2NonValidatorBootnode("bootnode", GENESIS_FILE);
+    final BesuNode nodeA = besu.createIbft2Node("nodeA", GENESIS_FILE);
+    final BesuNode nodeB = besu.createIbft2Node("nodeB", GENESIS_FILE);
+
+    permissionedCluster.start(bootnode, nodeA, nodeB);
+
+    // make sure we are producing blocks before sending any transactions
+    waitForBlockHeight(bootnode, 1);
+
+    // allow nodes in onchain smart contract
+    nodeA.execute(allowNode(bootnode));
+    nodeA.execute(allowNode(nodeA));
+    nodeA.execute(allowNode(nodeB));
+
+    // verify the nodes are allowed
+    nodeA.verify(nodeIsAllowed(bootnode));
+    nodeA.verify(nodeIsAllowed(nodeA));
+    nodeA.verify(nodeIsAllowed(nodeB));
+
+    permissionedCluster.stop();
+
+    // Create permissioning config
+    final SmartContractPermissioningConfiguration smartContractPermissioningConfiguration =
+        new SmartContractPermissioningConfiguration();
+    smartContractPermissioningConfiguration.setSmartContractNodeAllowlistEnabled(true);
+    smartContractPermissioningConfiguration.setNodeSmartContractAddress(
+        Address.fromHexString(CONTRACT_ADDRESS));
+    final PermissioningConfiguration permissioningConfiguration =
+        new PermissioningConfiguration(
+            Optional.empty(),
+            Optional.of(smartContractPermissioningConfiguration),
+            Optional.empty());
+
+    // Set permissioning configurations on nodes
+    bootnode.setPermissioningConfiguration(permissioningConfiguration);
+    nodeA.setPermissioningConfiguration(permissioningConfiguration);
+    nodeB.setPermissioningConfiguration(permissioningConfiguration);
+
+    permissionedCluster.start(bootnode, nodeA, nodeB);
+
+    // Verify blockchain is progressing
+    permissionedCluster.verify(blockchain.reachesHeight(bootnode, 1, 120));
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningIbftStallAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningIbftStallAcceptanceTest.java
deleted file mode 100644
index 851ab406676..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningIbftStallAcceptanceTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.permissioning;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
-import org.hyperledger.besu.ethereum.permissioning.SmartContractPermissioningConfiguration;
-import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
-
-import java.io.IOException;
-import java.util.Optional;
-
-import org.junit.Test;
-
-public class NodeSmartContractPermissioningIbftStallAcceptanceTest
-    extends NodeSmartContractPermissioningAcceptanceTestBase {
-
-  private static final String GENESIS_FILE =
-      "/permissioning/simple_permissioning_ibft_genesis.json";
-
-  @Test
-  public void restartedIbftClusterShouldNotStall() throws IOException {
-    final BesuNode bootnode = besu.createIbft2NonValidatorBootnode("bootnode", GENESIS_FILE);
-    final BesuNode nodeA = besu.createIbft2Node("nodeA", GENESIS_FILE);
-    final BesuNode nodeB = besu.createIbft2Node("nodeB", GENESIS_FILE);
-
-    permissionedCluster.start(bootnode, nodeA, nodeB);
-
-    // make sure we are producing blocks before sending any transactions
-    waitForBlockHeight(bootnode, 1);
-
-    // allow nodes in onchain smart contract
-    nodeA.execute(allowNode(bootnode));
-    nodeA.execute(allowNode(nodeA));
-    nodeA.execute(allowNode(nodeB));
-
-    // verify the nodes are allowed
-    nodeA.verify(nodeIsAllowed(bootnode));
-    nodeA.verify(nodeIsAllowed(nodeA));
-    nodeA.verify(nodeIsAllowed(nodeB));
-
-    permissionedCluster.stop();
-
-    // Create permissioning config
-    final SmartContractPermissioningConfiguration smartContractPermissioningConfiguration =
-        new SmartContractPermissioningConfiguration();
-    smartContractPermissioningConfiguration.setSmartContractNodeAllowlistEnabled(true);
-    smartContractPermissioningConfiguration.setNodeSmartContractAddress(
-        Address.fromHexString(CONTRACT_ADDRESS));
-    final PermissioningConfiguration permissioningConfiguration =
-        new PermissioningConfiguration(
-            Optional.empty(),
-            Optional.of(smartContractPermissioningConfiguration),
-            Optional.empty());
-
-    // Set permissioning configurations on nodes
-    bootnode.setPermissioningConfiguration(permissioningConfiguration);
-    nodeA.setPermissioningConfiguration(permissioningConfiguration);
-    nodeB.setPermissioningConfiguration(permissioningConfiguration);
-
-    permissionedCluster.start(bootnode, nodeA, nodeB);
-
-    // Verify blockchain is progressing
-    permissionedCluster.verify(blockchain.reachesHeight(bootnode, 1, 120));
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningOutOfSyncAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningOutOfSyncAcceptanceTest.java
index dab55d9f32c..2f8adf43867 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningOutOfSyncAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningOutOfSyncAcceptanceTest.java
@@ -33,7 +33,7 @@ public void setUp() throws InterruptedException {
 
     permissionedCluster.start(bootnode, permissionedNodeA);
 
-    // update onchain smart contract to whitelist nodes
+    // update onchain smart contract to allowlist nodes
     permissionedNodeA.execute(allowNode(bootnode));
     permissionedNodeA.verify(nodeIsAllowed(bootnode));
     permissionedNodeA.execute(allowNode(permissionedNodeA));
@@ -43,7 +43,7 @@ public void setUp() throws InterruptedException {
 
   @Test
   public void addNodeToClusterAndVerifyNonBootNodePeerConnectionWorksAfterSync() {
-    final long blockchainHeight = 50L;
+    final long blockchainHeight = 25L;
     waitForBlockHeight(permissionedNodeA, blockchainHeight);
 
     // Add Node B
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2AcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2AcceptanceTest.java
index ffb4e48aec2..72aab9cb7e4 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2AcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2AcceptanceTest.java
@@ -97,7 +97,7 @@ public void permissioningUpdatesPropagateThroughNetwork() {
   }
 
   @Test
-  public void onChainPermissioningAllowlistShouldPersistAcrossRestarts() {
+  public void onchainPermissioningAllowlistShouldPersistAcrossRestarts() {
     permissionedCluster.stop();
     permissionedCluster.start(bootnode, forbiddenNode, allowedNode, permissionedNode);
 
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2AcceptanceTestBase.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2AcceptanceTestBase.java
index 61dd2215557..2cfbbf93deb 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2AcceptanceTestBase.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2AcceptanceTestBase.java
@@ -14,7 +14,8 @@
  */
 package org.hyperledger.besu.tests.acceptance.permissioning;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.Condition;
 import org.hyperledger.besu.tests.acceptance.dsl.condition.perm.NodeSmartContractPermissioningV2Conditions;
@@ -110,15 +111,33 @@ protected Transaction<Hash> allowNode(final Node node) {
     return smartContractNodePermissioningV2.allowNode(CONTRACT_ADDRESS, node);
   }
 
+  protected Transaction<Hash> allowNode(final EnodeURL enodeURL) {
+    return smartContractNodePermissioningV2.allowNode(CONTRACT_ADDRESS, enodeURL);
+  }
+
   protected Transaction<Hash> forbidNode(final Node node) {
     return smartContractNodePermissioningV2.forbidNode(CONTRACT_ADDRESS, node);
   }
 
+  protected Transaction<Hash> forbidNode(final EnodeURL enodeURL) {
+    return smartContractNodePermissioningV2.forbidNode(CONTRACT_ADDRESS, enodeURL);
+  }
+
   protected Condition connectionIsForbidden(final Node node) {
     return nodeSmartContractPermissioningConditionsV2.connectionIsForbidden(CONTRACT_ADDRESS, node);
   }
 
+  protected Condition connectionIsForbidden(final EnodeURL enodeURL) {
+    return nodeSmartContractPermissioningConditionsV2.connectionIsForbidden(
+        CONTRACT_ADDRESS, enodeURL);
+  }
+
   protected Condition connectionIsAllowed(final Node node) {
     return nodeSmartContractPermissioningConditionsV2.connectionIsAllowed(CONTRACT_ADDRESS, node);
   }
+
+  protected Condition connectionIsAllowed(final EnodeURL enodeURL) {
+    return nodeSmartContractPermissioningConditionsV2.connectionIsAllowed(
+        CONTRACT_ADDRESS, enodeURL);
+  }
 }
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2DNSAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2DNSAcceptanceTest.java
new file mode 100644
index 00000000000..b2ed27d7c5d
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodeSmartContractPermissioningV2DNSAcceptanceTest.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.permissioning;
+
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
+import org.hyperledger.besu.ethereum.p2p.peers.ImmutableEnodeDnsConfiguration;
+import org.hyperledger.besu.plugin.data.EnodeURL;
+import org.hyperledger.besu.tests.acceptance.dsl.node.Node;
+import org.hyperledger.besu.tests.acceptance.dsl.node.RunnableNode;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Before;
+import org.junit.Test;
+
+public class NodeSmartContractPermissioningV2DNSAcceptanceTest
+    extends NodeSmartContractPermissioningV2AcceptanceTestBase {
+
+  private Node bootnode;
+  private Node permissionedNode;
+  private Node allowedNode;
+  private Node forbiddenNode;
+
+  final ImmutableEnodeDnsConfiguration enodeDnsConfiguration =
+      ImmutableEnodeDnsConfiguration.builder().dnsEnabled(true).updateEnabled(true).build();
+
+  @Before
+  public void setUp() {
+    bootnode = bootnode("bootnode");
+    forbiddenNode = node("forbidden-node");
+    allowedNode = node("allowed-node");
+    permissionedNode = permissionedNode("permissioned-node");
+
+    permissionedCluster.start(bootnode, forbiddenNode, allowedNode, permissionedNode);
+
+    // updating permissioning smart contract with allowed nodes
+
+    permissionedNode.execute(allowNode(bootnode));
+    permissionedNode.verify(connectionIsAllowed(bootnode));
+
+    permissionedNode.execute(allowNode(allowedNode));
+    permissionedNode.verify(connectionIsAllowed(allowedNode));
+
+    permissionedNode.execute(allowNode(permissionedNode));
+    permissionedNode.verify(connectionIsAllowed(permissionedNode));
+
+    // Verify initial configuration
+    bootnode.verify(net.awaitPeerCount(3));
+    allowedNode.verify(net.awaitPeerCount(3));
+    forbiddenNode.verify(net.awaitPeerCount(2));
+    permissionedNode.verify(net.awaitPeerCount(2));
+  }
+
+  @Test
+  public void permissionedNodeShouldAddDnsRuleAndAllowNode() throws UnknownHostException {
+    final EnodeURL forbiddenEnodeURL = getForbiddenEnodeURL();
+    Assertions.assertThat(forbiddenEnodeURL.toURI().getHost()).isEqualTo("127.0.0.1");
+    final EnodeURL forbiddenDnsEnodeURL = buildDnsEnodeUrl(forbiddenEnodeURL);
+    Assertions.assertThat(forbiddenDnsEnodeURL.toURI().getHost())
+        .isEqualTo(InetAddress.getLocalHost().getHostName());
+
+    permissionedNode.verify(connectionIsForbidden(forbiddenNode));
+    permissionedNode.verify(connectionIsForbidden(forbiddenDnsEnodeURL));
+    permissionedNode.execute(allowNode(forbiddenDnsEnodeURL));
+    permissionedNode.verify(connectionIsAllowed(forbiddenDnsEnodeURL));
+    permissionedNode.execute(forbidNode(forbiddenEnodeURL));
+  }
+
+  @Test
+  public void permissionedNodeShouldAddDNSRuleAndConnectToNewPeer() throws UnknownHostException {
+    final EnodeURL forbiddenEnodeURL = getForbiddenEnodeURL();
+    Assertions.assertThat(forbiddenEnodeURL.toURI().getHost()).isEqualTo("127.0.0.1");
+    final EnodeURL forbiddenDnsEnodeURL = buildDnsEnodeUrl(forbiddenEnodeURL);
+    Assertions.assertThat(forbiddenDnsEnodeURL.toURI().getHost())
+        .isEqualTo(InetAddress.getLocalHost().getHostName());
+
+    permissionedNode.verify(net.awaitPeerCount(2));
+    permissionedNode.verify(connectionIsForbidden(forbiddenNode));
+    permissionedNode.verify(connectionIsForbidden(forbiddenDnsEnodeURL));
+    permissionedNode.execute(allowNode(forbiddenDnsEnodeURL));
+    permissionedNode.verify(connectionIsAllowed(forbiddenDnsEnodeURL));
+    permissionedNode.verify(admin.addPeer(forbiddenNode));
+    permissionedNode.verify(net.awaitPeerCount(3));
+    permissionedNode.execute(forbidNode(forbiddenEnodeURL));
+  }
+
+  private EnodeURL getForbiddenEnodeURL() {
+    return EnodeURLImpl.fromURI(((RunnableNode) forbiddenNode).enodeUrl());
+  }
+
+  private EnodeURL buildDnsEnodeUrl(final EnodeURL forbiddenEnodeURL) {
+    return EnodeURLImpl.builder()
+        .configureFromEnode(forbiddenEnodeURL)
+        .ipAddress("localhost", enodeDnsConfiguration)
+        .build();
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodesSmartContractPermissioningStaticNodesAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodesSmartContractPermissioningStaticNodesAcceptanceTest.java
index a6da4a02310..57253d474c2 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodesSmartContractPermissioningStaticNodesAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/permissioning/NodesSmartContractPermissioningStaticNodesAcceptanceTest.java
@@ -22,8 +22,8 @@
 import java.net.URI;
 import java.util.Arrays;
 import java.util.List;
+import javax.annotation.Nonnull;
 
-import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -42,7 +42,7 @@ public void setUp() {
   @Test
   public void onlyTrustStaticNodesWhileOutOfSync() {
     // wait for some blocks so the permissioned node has some syncing to do
-    waitForBlockHeight(miner, 50);
+    waitForBlockHeight(miner, 25);
     stopMining(miner);
 
     // start permissioned node with miner node in the static nodes list
@@ -51,7 +51,7 @@ public void onlyTrustStaticNodesWhileOutOfSync() {
 
     // as soon as we start the node should connect to static nodes
     permissionedNode.verify(net.awaitPeerCount(1));
-    waitForBlockHeight(permissionedNode, 50);
+    waitForBlockHeight(permissionedNode, 25);
 
     // after syncing up with the network the node won't trust static nodes anymore
     permissionedNode.verify(net.awaitPeerCount(0));
@@ -72,7 +72,7 @@ private Node permissionedNodeWithStaticNodes(final List<Node> staticNodes) {
         .build();
   }
 
-  @NotNull
+  @Nonnull
   private List<String> mapNodesToEnodeURLs(final List<Node> staticNodes) {
     return staticNodes.stream()
         .map(node -> (RunnableNode) node)
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/BadCLIOptionsPluginTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/BadCLIOptionsPluginTest.java
index 2d29d05e0ef..02299f4fdb8 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/BadCLIOptionsPluginTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/BadCLIOptionsPluginTest.java
@@ -28,21 +28,29 @@
 import java.util.stream.Stream;
 
 import org.awaitility.Awaitility;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class BadCLIOptionsPluginTest extends AcceptanceTestBase {
   private BesuNode node;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
+    System.setProperty("TEST_BAD_CLI", "true");
+
     node =
         besu.createPluginsNode(
             "node1", Collections.singletonList("testPlugins"), Collections.emptyList());
     cluster.start(node);
   }
 
+  @AfterEach
+  public void tearDown() {
+    System.setProperty("TEST_BAD_CLI", "false");
+  }
+
   @Test
   public void shouldNotRegister() {
     final Path registrationFile = node.homeDirectory().resolve("plugins/badCLIOptions.init");
@@ -60,7 +68,7 @@ public void shouldNotStart() {
   }
 
   @Test
-  @Ignore("No way to do a graceful shutdown of Besu at the moment.")
+  @Disabled("No way to do a graceful shutdown of Besu at the moment.")
   public void shouldNotStop() {
     cluster.stopNode(node);
     waitForFile(node.homeDirectory().resolve("plugins/pluginLifecycle.stopped"));
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/BesuEventsPluginTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/BesuEventsPluginTest.java
index 09deffb551b..4906193362c 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/BesuEventsPluginTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/BesuEventsPluginTest.java
@@ -25,14 +25,14 @@
 import java.util.stream.Stream;
 
 import org.awaitility.Awaitility;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class BesuEventsPluginTest extends AcceptanceTestBase {
   private BesuNode pluginNode;
   private BesuNode minerNode;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     minerNode = besu.createMinerNode("minerNode");
     pluginNode =
@@ -42,7 +42,7 @@ public void setUp() throws Exception {
   }
 
   @Test
-  public void blockIsAnnounded() {
+  public void blockIsAnnounced() {
     waitForFile(pluginNode.homeDirectory().resolve("plugins/newBlock.2"));
   }
 
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/PermissioningPluginTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/PermissioningPluginTest.java
new file mode 100644
index 00000000000..af6a3f7a16f
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/PermissioningPluginTest.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.tests.acceptance.plugins;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
+import org.hyperledger.besu.tests.acceptance.dsl.blockchain.Amount;
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.BesuNodeConfigurationBuilder;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.account.TransferTransaction;
+
+import java.util.List;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class PermissioningPluginTest extends AcceptanceTestBase {
+  private BesuNode minerNode;
+
+  private BesuNode aliceNode;
+  private BesuNode bobNode;
+  private BesuNode charlieNode;
+
+  @BeforeEach
+  public void setUp() throws Exception {
+    final BesuNodeConfigurationBuilder builder =
+        new BesuNodeConfigurationBuilder()
+            .miningEnabled(false)
+            .plugins(List.of("testPlugins"))
+            .extraCLIOptions(List.of("--plugin-permissioning-test-enabled=true"))
+            .jsonRpcEnabled()
+            .jsonRpcTxPool()
+            .jsonRpcAdmin();
+
+    minerNode = besu.create(builder.name("miner").build());
+
+    aliceNode = besu.create(builder.name("alice").keyFilePath("key").build());
+
+    bobNode = besu.create(builder.name("bob").keyFilePath("key1").build());
+
+    charlieNode = besu.create(builder.name("charlie").keyFilePath("key2").build());
+
+    cluster.start(minerNode, charlieNode);
+
+    cluster.startNode(aliceNode);
+    aliceNode.awaitPeerDiscovery(net.awaitPeerCount(2));
+
+    cluster.startNode(bobNode);
+    bobNode.awaitPeerDiscovery(net.awaitPeerCount(2));
+  }
+
+  @Test
+  public void blockedConnectionNodeCanOnlyConnectToTransactionNode() {
+    minerNode.verify(admin.hasPeer(aliceNode));
+    minerNode.verify(admin.hasPeer(bobNode));
+    minerNode.verify(admin.hasPeer(charlieNode));
+
+    aliceNode.verify(admin.doesNotHavePeer(bobNode));
+    aliceNode.verify(admin.hasPeer(minerNode));
+    aliceNode.verify(admin.hasPeer(charlieNode));
+
+    bobNode.verify(admin.hasPeer(minerNode));
+    bobNode.verify(admin.doesNotHavePeer(aliceNode));
+    bobNode.verify(admin.hasPeer(charlieNode));
+
+    charlieNode.verify(admin.hasPeer(minerNode));
+    charlieNode.verify(admin.hasPeer(aliceNode));
+    charlieNode.verify(admin.hasPeer(bobNode));
+  }
+
+  @Test
+  public void transactionsAreNotSendToBlockPendingTransactionsNode() {
+    final Account account = accounts.createAccount("account-one");
+    final Amount balance = Amount.ether(20);
+
+    final TransferTransaction tx = accountTransactions.createTransfer(account, balance);
+
+    final Hash txHash = aliceNode.execute(tx);
+
+    aliceNode.verify(txPoolConditions.inTransactionPool(txHash));
+    bobNode.verify(txPoolConditions.inTransactionPool(txHash));
+    charlieNode.verify(txPoolConditions.notInTransactionPool(txHash));
+    minerNode.verify(txPoolConditions.inTransactionPool(txHash));
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/PicoCLIOptionsPluginTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/PicoCLIOptionsPluginTest.java
index d1a1154de69..b3a7a1ed556 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/PicoCLIOptionsPluginTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/PicoCLIOptionsPluginTest.java
@@ -28,9 +28,9 @@
 import java.util.stream.Stream;
 
 import org.awaitility.Awaitility;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class PicoCLIOptionsPluginTest extends AcceptanceTestBase {
   private BesuNode node;
@@ -38,7 +38,7 @@ public class PicoCLIOptionsPluginTest extends AcceptanceTestBase {
   // context: https://en.wikipedia.org/wiki/The_Magic_Words_are_Squeamish_Ossifrage
   private static final String MAGIC_WORDS = "Squemish Ossifrage";
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     node =
         besu.createPluginsNode(
@@ -70,7 +70,7 @@ public void shouldStart() throws IOException {
   }
 
   @Test
-  @Ignore("No way to do a graceful shutdown of Besu at the moment.")
+  @Disabled("No way to do a graceful shutdown of Besu at the moment.")
   public void shouldStop() {
     cluster.stopNode(node);
     waitForFile(node.homeDirectory().resolve("plugins/pluginLifecycle.stopped"));
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/RpcEndpointServicePluginTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/RpcEndpointServicePluginTest.java
new file mode 100644
index 00000000000..09da91663af
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/plugins/RpcEndpointServicePluginTest.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.plugins;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.config.JsonUtil;
+import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class RpcEndpointServicePluginTest extends AcceptanceTestBase {
+
+  private BesuNode node;
+
+  private OkHttpClient client;
+  protected static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+
+  @BeforeEach
+  public void setUp() throws Exception {
+    node = besu.createPluginsNode("node1", List.of("testPlugins"), List.of("--rpc-http-api=TESTS"));
+    cluster.start(node);
+    client = new OkHttpClient();
+  }
+
+  @Test
+  public void canUseRpcToSetValue() throws IOException {
+    String setValue = "secondCall";
+
+    ObjectNode resultJson = callTestMethod("tests_getValue", List.of());
+    assertThat(resultJson.get("result").asText()).isEqualTo("InitialValue");
+
+    resultJson = callTestMethod("tests_setValue", List.of(setValue));
+    assertThat(resultJson.get("result").asText()).isEqualTo(setValue);
+
+    resultJson = callTestMethod("tests_getValue", List.of("ignored"));
+    assertThat(resultJson.get("result").asText()).isEqualTo(setValue);
+  }
+
+  @Test
+  public void canCheckArgumentInsideSetValue() throws IOException {
+    ObjectNode resultJson = callTestMethod("tests_setValue", List.of("one", "two"));
+    assertThat(resultJson.get("error").get("message").asText()).isEqualTo("Internal error");
+  }
+
+  @Test
+  public void exceptionsInPluginMethodReturnError() throws IOException {
+    ObjectNode resultJson = callTestMethod("tests_throwException", List.of());
+    assertThat(resultJson.get("error").get("message").asText()).isEqualTo("Internal error");
+  }
+
+  @Test
+  public void onlyEnabledMethodsReturn() throws IOException {
+    ObjectNode resultJson = callTestMethod("notEnabled_getValue", List.of());
+    assertThat(resultJson.get("error").get("message").asText()).isEqualTo("Method not found");
+  }
+
+  @Test
+  public void mixedTypeArraysAreStringified() throws IOException {
+    ObjectNode resultJson = callTestMethod("tests_replaceValueList", List.of());
+    assertThat(resultJson.get("result")).isEmpty();
+
+    resultJson = callTestMethod("tests_replaceValueList", List.of("One", 2, true));
+    JsonNode result = resultJson.get("result");
+
+    assertThat(result.get(0).asText()).isEqualTo("One");
+    assertThat(result.get(1).asText()).isEqualTo("2");
+    assertThat(result.get(2).asText()).isEqualTo("true");
+  }
+
+  private ObjectNode callTestMethod(final String method, final List<Object> params)
+      throws IOException {
+    String format =
+        String.format(
+            "{\"jsonrpc\":\"2.0\",\"method\":\"%s\",\"params\":[%s],\"id\":42}",
+            method,
+            params.stream().map(value -> "\"" + value + "\"").collect(Collectors.joining(",")));
+
+    RequestBody body = RequestBody.create(format, JSON);
+
+    final String resultString =
+        client
+            .newCall(
+                new Request.Builder()
+                    .post(body)
+                    .url("http://" + node.getHostName() + ":" + node.getJsonRpcPort().get() + "/")
+                    .build())
+            .execute()
+            .body()
+            .string();
+    return JsonUtil.objectNodeFromString(resultString);
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/BftPrivacyClusterAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/BftPrivacyClusterAcceptanceTest.java
new file mode 100644
index 00000000000..2baf1d1f5ce
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/BftPrivacyClusterAcceptanceTest.java
@@ -0,0 +1,315 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.privacy;
+
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccountResolver;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.bft.ConsensusType;
+import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+import org.hyperledger.enclave.testutil.EnclaveType;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.containers.Network;
+import org.web3j.protocol.besu.response.privacy.PrivateTransactionReceipt;
+import org.web3j.utils.Restriction;
+
+@RunWith(Parameterized.class)
+public class BftPrivacyClusterAcceptanceTest extends PrivacyAcceptanceTestBase {
+  private final BftPrivacyType bftPrivacyType;
+
+  public static class BftPrivacyType {
+    private final EnclaveType enclaveType;
+    private final EnclaveEncryptorType enclaveEncryptorType;
+    private final ConsensusType consensusType;
+    private final Restriction restriction;
+
+    public BftPrivacyType(
+        final EnclaveType enclaveType,
+        final EnclaveEncryptorType enclaveEncryptorType,
+        final ConsensusType consensusType,
+        final Restriction restriction) {
+      this.enclaveType = enclaveType;
+      this.enclaveEncryptorType = enclaveEncryptorType;
+      this.consensusType = consensusType;
+      this.restriction = restriction;
+    }
+
+    @Override
+    public String toString() {
+      return String.join(
+          ",",
+          enclaveType.toString(),
+          enclaveEncryptorType.toString(),
+          consensusType.toString(),
+          restriction.toString());
+    }
+  }
+
+  public BftPrivacyClusterAcceptanceTest(final BftPrivacyType bftPrivacyType) {
+    this.bftPrivacyType = bftPrivacyType;
+  }
+
+  @Parameterized.Parameters(name = "{0}")
+  public static Collection<BftPrivacyType> bftPrivacyTypes() {
+    final List<BftPrivacyType> bftPrivacyTypes = new ArrayList<>();
+    for (EnclaveType x : EnclaveType.valuesForTests()) {
+      for (ConsensusType consensusType : ConsensusType.values()) {
+        bftPrivacyTypes.add(
+            new BftPrivacyType(
+                x, EnclaveEncryptorType.NACL, consensusType, Restriction.RESTRICTED));
+        bftPrivacyTypes.add(
+            new BftPrivacyType(x, EnclaveEncryptorType.EC, consensusType, Restriction.RESTRICTED));
+      }
+    }
+
+    for (ConsensusType consensusType : ConsensusType.values()) {
+      bftPrivacyTypes.add(
+          new BftPrivacyType(
+              EnclaveType.NOOP,
+              EnclaveEncryptorType.NOOP,
+              consensusType,
+              Restriction.UNRESTRICTED));
+    }
+
+    return bftPrivacyTypes;
+  }
+
+  private PrivacyNode alice;
+  private PrivacyNode bob;
+  private PrivacyNode charlie;
+
+  @Before
+  public void setUp() throws Exception {
+    final Network containerNetwork = Network.newNetwork();
+
+    alice = createNode(containerNetwork, "node1", 0);
+    bob = createNode(containerNetwork, "node2", 1);
+    charlie = createNode(containerNetwork, "node3", 2);
+
+    privacyCluster.start(alice, bob, charlie);
+  }
+
+  private PrivacyNode createNode(
+      final Network containerNetwork, final String nodeName, final int privacyAccount)
+      throws IOException {
+    if (bftPrivacyType.consensusType == ConsensusType.IBFT2) {
+      return privacyBesu.createIbft2NodePrivacyEnabled(
+          nodeName,
+          PrivacyAccountResolver.values()[privacyAccount].resolve(
+              bftPrivacyType.enclaveEncryptorType),
+          true,
+          bftPrivacyType.enclaveType,
+          Optional.of(containerNetwork),
+          false,
+          false,
+          bftPrivacyType.restriction == Restriction.UNRESTRICTED,
+          "0xAA");
+    } else if (bftPrivacyType.consensusType == ConsensusType.QBFT) {
+      return privacyBesu.createQbftNodePrivacyEnabled(
+          nodeName,
+          PrivacyAccountResolver.values()[privacyAccount].resolve(
+              bftPrivacyType.enclaveEncryptorType),
+          bftPrivacyType.enclaveType,
+          Optional.of(containerNetwork),
+          false,
+          false,
+          bftPrivacyType.restriction == Restriction.UNRESTRICTED,
+          "0xAA");
+    } else {
+      throw new IllegalStateException("Unknown consensus type " + bftPrivacyType.consensusType);
+    }
+  }
+
+  @Test
+  public void onlyAliceAndBobCanExecuteContract() {
+    // Contract address is generated from sender address and transaction nonce
+    final String contractAddress =
+        EnclaveEncryptorType.EC.equals(bftPrivacyType.enclaveEncryptorType)
+            ? "0x3e5d325a03ad3ce5640502219833d30b89ce3ce1"
+            : "0xebf56429e6500e84442467292183d4d621359838";
+
+    final EventEmitter eventEmitter =
+        alice.execute(
+            privateContractTransactions.createSmartContract(
+                EventEmitter.class,
+                alice.getTransactionSigningKey(),
+                alice.getEnclaveKey(),
+                bob.getEnclaveKey()));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(contractAddress, alice.getAddress().toString())
+        .verify(eventEmitter);
+
+    final String transactionHash =
+        alice.execute(
+            privateContractTransactions.callSmartContract(
+                eventEmitter.getContractAddress(),
+                eventEmitter.store(BigInteger.ONE).encodeFunctionCall(),
+                alice.getTransactionSigningKey(),
+                bftPrivacyType.restriction,
+                alice.getEnclaveKey(),
+                bob.getEnclaveKey()));
+
+    final PrivateTransactionReceipt expectedReceipt =
+        alice.execute(privacyTransactions.getPrivateTransactionReceipt(transactionHash));
+
+    bob.verify(
+        privateTransactionVerifier.validPrivateTransactionReceipt(
+            transactionHash, expectedReceipt));
+
+    if (bftPrivacyType.restriction != Restriction.UNRESTRICTED) {
+      charlie.verify(privateTransactionVerifier.noPrivateTransactionReceipt(transactionHash));
+    }
+  }
+
+  @Test
+  public void aliceCanDeployMultipleTimesInSingleGroup() {
+    final String firstDeployedAddress =
+        EnclaveEncryptorType.EC.equals(bftPrivacyType.enclaveEncryptorType)
+            ? "0x3e5d325a03ad3ce5640502219833d30b89ce3ce1"
+            : "0xebf56429e6500e84442467292183d4d621359838";
+
+    privacyCluster.stopNode(charlie);
+
+    final EventEmitter firstEventEmitter =
+        alice.execute(
+            privateContractTransactions.createSmartContract(
+                EventEmitter.class,
+                alice.getTransactionSigningKey(),
+                alice.getEnclaveKey(),
+                bob.getEnclaveKey()));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(firstDeployedAddress, alice.getAddress().toString())
+        .verify(firstEventEmitter);
+
+    final String secondDeployedAddress =
+        EnclaveEncryptorType.EC.equals(bftPrivacyType.enclaveEncryptorType)
+            ? "0x5194e214fae257530710d18c868df7a295d9d53b"
+            : "0x10f807f8a905da5bd319196da7523c6bd768690f";
+
+    final EventEmitter secondEventEmitter =
+        alice.execute(
+            privateContractTransactions.createSmartContract(
+                EventEmitter.class,
+                alice.getTransactionSigningKey(),
+                alice.getEnclaveKey(),
+                bob.getEnclaveKey()));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(secondDeployedAddress, alice.getAddress().toString())
+        .verify(secondEventEmitter);
+  }
+
+  @Test
+  public void canInteractWithMultiplePrivacyGroups() {
+    // alice deploys contract
+    final String firstDeployedAddress =
+        EnclaveEncryptorType.EC.equals(bftPrivacyType.enclaveEncryptorType)
+            ? "0x760359bc605b3848f5199829bde6b382d90fb8eb"
+            : "0xff206d21150a8da5b83629d8a722f3135ed532b1";
+
+    final EventEmitter firstEventEmitter =
+        alice.execute(
+            privateContractTransactions.createSmartContract(
+                EventEmitter.class,
+                alice.getTransactionSigningKey(),
+                alice.getEnclaveKey(),
+                bob.getEnclaveKey(),
+                charlie.getEnclaveKey()));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(firstDeployedAddress, alice.getAddress().toString())
+        .verify(firstEventEmitter);
+
+    // charlie interacts with contract
+    final String firstTransactionHash =
+        charlie.execute(
+            privateContractTransactions.callSmartContract(
+                firstEventEmitter.getContractAddress(),
+                firstEventEmitter.store(BigInteger.ONE).encodeFunctionCall(),
+                charlie.getTransactionSigningKey(),
+                bftPrivacyType.restriction,
+                charlie.getEnclaveKey(),
+                alice.getEnclaveKey(),
+                bob.getEnclaveKey()));
+
+    // alice gets receipt from charlie's interaction
+    final PrivateTransactionReceipt aliceReceipt =
+        alice.execute(privacyTransactions.getPrivateTransactionReceipt(firstTransactionHash));
+
+    // verify bob and charlie have access to the same receipt
+    bob.verify(
+        privateTransactionVerifier.validPrivateTransactionReceipt(
+            firstTransactionHash, aliceReceipt));
+    charlie.verify(
+        privateTransactionVerifier.validPrivateTransactionReceipt(
+            firstTransactionHash, aliceReceipt));
+
+    // alice deploys second contract
+    final String secondDeployedAddress =
+        EnclaveEncryptorType.EC.equals(bftPrivacyType.enclaveEncryptorType)
+            ? "0x3e5d325a03ad3ce5640502219833d30b89ce3ce1"
+            : "0xebf56429e6500e84442467292183d4d621359838";
+
+    final EventEmitter secondEventEmitter =
+        alice.execute(
+            privateContractTransactions.createSmartContract(
+                EventEmitter.class,
+                alice.getTransactionSigningKey(),
+                alice.getEnclaveKey(),
+                bob.getEnclaveKey()));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(secondDeployedAddress, alice.getAddress().toString())
+        .verify(secondEventEmitter);
+
+    // bob interacts with contract
+    final String secondTransactionHash =
+        bob.execute(
+            privateContractTransactions.callSmartContract(
+                secondEventEmitter.getContractAddress(),
+                secondEventEmitter.store(BigInteger.ONE).encodeFunctionCall(),
+                bob.getTransactionSigningKey(),
+                bftPrivacyType.restriction,
+                bob.getEnclaveKey(),
+                alice.getEnclaveKey()));
+
+    // alice gets receipt from bob's interaction
+    final PrivateTransactionReceipt secondExpectedReceipt =
+        alice.execute(privacyTransactions.getPrivateTransactionReceipt(secondTransactionHash));
+
+    bob.verify(
+        privateTransactionVerifier.validPrivateTransactionReceipt(
+            secondTransactionHash, secondExpectedReceipt));
+
+    // charlie cannot see the receipt
+    if (bftPrivacyType.restriction != Restriction.UNRESTRICTED) {
+      charlie.verify(privateTransactionVerifier.noPrivateTransactionReceipt(secondTransactionHash));
+    }
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/DeployPrivateSmartContractAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/DeployPrivateSmartContractAcceptanceTest.java
new file mode 100644
index 00000000000..71aa618cdd8
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/DeployPrivateSmartContractAcceptanceTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.privacy;
+
+import static org.web3j.utils.Restriction.UNRESTRICTED;
+
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.ParameterizedEnclaveTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccountResolver;
+import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+import org.hyperledger.enclave.testutil.EnclaveType;
+
+import java.io.IOException;
+import java.util.Optional;
+
+import org.junit.Test;
+import org.web3j.utils.Restriction;
+
+public class DeployPrivateSmartContractAcceptanceTest extends ParameterizedEnclaveTestBase {
+
+  private final PrivacyNode minerNode;
+
+  public DeployPrivateSmartContractAcceptanceTest(
+      final Restriction restriction,
+      final EnclaveType enclaveType,
+      final EnclaveEncryptorType enclaveEncryptorType)
+      throws IOException {
+    super(restriction, enclaveType, enclaveEncryptorType);
+
+    minerNode =
+        privacyBesu.createPrivateTransactionEnabledMinerNode(
+            restriction + "-node",
+            PrivacyAccountResolver.ALICE.resolve(enclaveEncryptorType),
+            enclaveType,
+            Optional.empty(),
+            false,
+            false,
+            restriction == UNRESTRICTED);
+
+    privacyCluster.start(minerNode);
+  }
+
+  @Test
+  public void deployingMustGiveValidReceiptAndCode() throws Exception {
+    final String contractAddress =
+        EnclaveEncryptorType.EC.equals(enclaveEncryptorType)
+            ? "0xfeeb2367e77e28f75fc3bcc55b70a535752db058"
+            : "0x89ce396d0f9f937ddfa71113e29b2081c4869555";
+
+    final EventEmitter eventEmitter =
+        minerNode.execute(
+            privateContractTransactions.createSmartContract(
+                EventEmitter.class,
+                minerNode.getTransactionSigningKey(),
+                minerNode.getEnclaveKey()));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(contractAddress, minerNode.getAddress().toString())
+        .verify(eventEmitter);
+
+    privateContractVerifier.validContractCodeProvided().verify(eventEmitter);
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/EnclaveErrorAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/EnclaveErrorAcceptanceTest.java
new file mode 100644
index 00000000000..7822768f140
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/EnclaveErrorAcceptanceTest.java
@@ -0,0 +1,237 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.privacy;
+
+import static org.assertj.core.api.Assertions.catchThrowable;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.hyperledger.enclave.testutil.EnclaveEncryptorType.EC;
+import static org.hyperledger.enclave.testutil.EnclaveEncryptorType.NACL;
+import static org.hyperledger.enclave.testutil.EnclaveType.TESSERA;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccountResolver;
+import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+import org.hyperledger.enclave.testutil.EnclaveType;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.security.KeyPairGenerator;
+import java.security.spec.ECGenParameterSpec;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Collection;
+import java.util.Optional;
+
+import org.apache.tuweni.crypto.sodium.Box;
+import org.assertj.core.api.Condition;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+import org.testcontainers.containers.Network;
+import org.web3j.protocol.besu.response.privacy.PrivateTransactionReceipt;
+import org.web3j.utils.Restriction;
+
+@RunWith(Parameterized.class)
+public class EnclaveErrorAcceptanceTest extends PrivacyAcceptanceTestBase {
+
+  private final PrivacyNode alice;
+  private final PrivacyNode bob;
+  private final String wrongPublicKey;
+
+  @Parameters(name = "{0} enclave type with {1} encryptor")
+  public static Collection<Object[]> enclaveParameters() {
+    return Arrays.asList(
+        new Object[][] {
+          {TESSERA, NACL},
+          {TESSERA, EC}
+        });
+  }
+
+  public EnclaveErrorAcceptanceTest(
+      final EnclaveType enclaveType, final EnclaveEncryptorType enclaveEncryptorType)
+      throws IOException {
+
+    final Network containerNetwork = Network.newNetwork();
+
+    alice =
+        privacyBesu.createIbft2NodePrivacyEnabled(
+            "node1",
+            PrivacyAccountResolver.ALICE.resolve(enclaveEncryptorType),
+            false,
+            enclaveType,
+            Optional.of(containerNetwork),
+            false,
+            false,
+            false,
+            "0xAA");
+    bob =
+        privacyBesu.createIbft2NodePrivacyEnabled(
+            "node2",
+            PrivacyAccountResolver.BOB.resolve(enclaveEncryptorType),
+            false,
+            enclaveType,
+            Optional.of(containerNetwork),
+            false,
+            false,
+            false,
+            "0xBB");
+    privacyCluster.start(alice, bob);
+
+    final byte[] wrongPublicKeyBytes =
+        EnclaveEncryptorType.EC.equals(enclaveEncryptorType)
+            ? getSECP256r1PublicKeyByteArray()
+            : Box.KeyPair.random().publicKey().bytesArray();
+
+    wrongPublicKey = Base64.getEncoder().encodeToString(wrongPublicKeyBytes);
+  }
+
+  @Test
+  public void aliceCannotSendTransactionFromBobNode() {
+    final Throwable throwable =
+        catchThrowable(
+            () ->
+                alice.execute(
+                    privateContractTransactions.createSmartContract(
+                        EventEmitter.class,
+                        alice.getTransactionSigningKey(),
+                        wrongPublicKey,
+                        bob.getEnclaveKey())));
+
+    assertThat(throwable)
+        .hasMessageContaining(
+            JsonRpcError.PRIVATE_FROM_DOES_NOT_MATCH_ENCLAVE_PUBLIC_KEY.getMessage());
+  }
+
+  @Test
+  public void enclaveNoPeerUrlError() {
+    final Throwable throwable =
+        catchThrowable(
+            () ->
+                alice.execute(
+                    privateContractTransactions.createSmartContract(
+                        EventEmitter.class,
+                        alice.getTransactionSigningKey(),
+                        alice.getEnclaveKey(),
+                        wrongPublicKey)));
+
+    final String tesseraMessage = JsonRpcError.TESSERA_NODE_MISSING_PEER_URL.getMessage();
+
+    assertThat(throwable.getMessage()).has(matchTesseraEnclaveMessage(tesseraMessage));
+  }
+
+  @Test
+  public void whenEnclaveIsDisconnectedGetReceiptReturnsInternalError() {
+    final EventEmitter eventEmitter =
+        alice.execute(
+            privateContractTransactions.createSmartContract(
+                EventEmitter.class,
+                alice.getTransactionSigningKey(),
+                alice.getEnclaveKey(),
+                bob.getEnclaveKey()));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(
+            eventEmitter.getContractAddress(), alice.getAddress().toString())
+        .verify(eventEmitter);
+
+    final String transactionHash =
+        alice.execute(
+            privateContractTransactions.callSmartContract(
+                eventEmitter.getContractAddress(),
+                eventEmitter.store(BigInteger.ONE).encodeFunctionCall(),
+                alice.getTransactionSigningKey(),
+                Restriction.RESTRICTED,
+                alice.getEnclaveKey(),
+                bob.getEnclaveKey()));
+
+    final PrivateTransactionReceipt receiptBeforeEnclaveLosesConnection =
+        alice.execute(privacyTransactions.getPrivateTransactionReceipt(transactionHash));
+
+    alice.verify(
+        privateTransactionVerifier.validPrivateTransactionReceipt(
+            transactionHash, receiptBeforeEnclaveLosesConnection));
+
+    alice.getEnclave().stop();
+
+    alice.verify(
+        privateTransactionVerifier.internalErrorPrivateTransactionReceipt(transactionHash));
+  }
+
+  @Test
+  @Ignore("Web3J is broken by PR #1426")
+  public void transactionFailsIfPartyIsOffline() {
+    // Contract address is generated from sender address and transaction nonce
+    final String contractAddress = "0xebf56429e6500e84442467292183d4d621359838";
+
+    final EventEmitter eventEmitter =
+        alice.execute(
+            privateContractTransactions.createSmartContract(
+                EventEmitter.class,
+                alice.getTransactionSigningKey(),
+                alice.getEnclaveKey(),
+                bob.getEnclaveKey()));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(contractAddress, alice.getAddress().toString())
+        .verify(eventEmitter);
+
+    bob.getEnclave().stop();
+
+    final Throwable throwable =
+        catchThrowable(
+            () ->
+                alice.execute(
+                    privateContractTransactions.callSmartContract(
+                        eventEmitter.getContractAddress(),
+                        eventEmitter.store(BigInteger.ONE).encodeFunctionCall(),
+                        alice.getTransactionSigningKey(),
+                        Restriction.RESTRICTED,
+                        alice.getEnclaveKey(),
+                        bob.getEnclaveKey())));
+
+    assertThat(throwable).hasMessageContaining("NodePropagatingToAllPeers");
+  }
+
+  @Test
+  public void createPrivacyGroupReturnsCorrectError() {
+    final Throwable throwable =
+        catchThrowable(() -> alice.execute(privacyTransactions.createPrivacyGroup(null, null)));
+    final String tesseraMessage = JsonRpcError.TESSERA_CREATE_GROUP_INCLUDE_SELF.getMessage();
+
+    assertThat(throwable.getMessage()).has(matchTesseraEnclaveMessage(tesseraMessage));
+  }
+
+  private Condition<String> matchTesseraEnclaveMessage(final String enclaveMessage) {
+    return new Condition<>(
+        message -> message.contains(enclaveMessage),
+        "Message did not match Tessera expected output");
+  }
+
+  private byte[] getSECP256r1PublicKeyByteArray() {
+    try {
+      final KeyPairGenerator keyGen = KeyPairGenerator.getInstance("EC");
+      final ECGenParameterSpec spec = new ECGenParameterSpec("secp256r1");
+      keyGen.initialize(spec);
+      return keyGen.generateKeyPair().getPublic().getEncoded();
+    } catch (Exception exception) {
+      return new byte[0];
+    }
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/FlexiblePrivacyAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/FlexiblePrivacyAcceptanceTest.java
new file mode 100644
index 00000000000..3f32904ba76
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/FlexiblePrivacyAcceptanceTest.java
@@ -0,0 +1,638 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.privacy;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY_PROXY;
+import static org.hyperledger.enclave.testutil.EnclaveEncryptorType.EC;
+import static org.hyperledger.enclave.testutil.EnclaveEncryptorType.NACL;
+import static org.hyperledger.enclave.testutil.EnclaveType.TESSERA;
+import static org.junit.runners.Parameterized.Parameters;
+
+import org.hyperledger.besu.tests.acceptance.dsl.condition.eth.EthConditions;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccountResolver;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.miner.MinerTransactions;
+import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+import org.hyperledger.enclave.testutil.EnclaveType;
+
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+import java.util.function.Supplier;
+
+import com.google.common.collect.Lists;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.testcontainers.containers.Network;
+import org.web3j.crypto.Credentials;
+import org.web3j.protocol.besu.response.privacy.PrivateTransactionReceipt;
+import org.web3j.protocol.core.methods.response.EthCall;
+import org.web3j.protocol.core.methods.response.Log;
+import org.web3j.protocol.core.methods.response.TransactionReceipt;
+import org.web3j.tx.Contract;
+
+@RunWith(Parameterized.class)
+public class FlexiblePrivacyAcceptanceTest extends FlexiblePrivacyAcceptanceTestBase {
+
+  private final EnclaveType enclaveType;
+  private final EnclaveEncryptorType enclaveEncryptorType;
+
+  public FlexiblePrivacyAcceptanceTest(
+      final EnclaveType enclaveType, final EnclaveEncryptorType enclaveEncryptorType) {
+    this.enclaveType = enclaveType;
+    this.enclaveEncryptorType = enclaveEncryptorType;
+  }
+
+  @Parameters(name = "{0} enclave type with {1} encryptor")
+  public static Collection<Object[]> enclaveParameters() {
+    return Arrays.asList(
+        new Object[][] {
+          {TESSERA, NACL},
+          {TESSERA, EC}
+        });
+  }
+
+  private PrivacyNode alice;
+  private PrivacyNode bob;
+  private PrivacyNode charlie;
+
+  private final MinerTransactions minerTransactions = new MinerTransactions();
+  private final EthConditions ethConditions = new EthConditions(ethTransactions);
+
+  private static final String EXPECTED_STORE_OUTPUT_DATA =
+      "0x000000000000000000000000f17f52151ebef6c7334fad080c5704d77216b7320000000000000000000000000000000000000000000000000000000000000539";
+  private static final String EXPECTED_STORE_EVENT_TOPIC =
+      "0xc9db20adedc6cf2b5d25252b101ab03e124902a73fcb12b753f3d1aaa2d8f9f5";
+
+  @Before
+  public void setUp() throws Exception {
+    final Network containerNetwork = Network.newNetwork();
+
+    alice =
+        privacyBesu.createFlexiblePrivacyGroupEnabledMinerNode(
+            "node1",
+            PrivacyAccountResolver.ALICE.resolve(enclaveEncryptorType),
+            false,
+            enclaveType,
+            Optional.of(containerNetwork));
+    bob =
+        privacyBesu.createFlexiblePrivacyGroupEnabledNode(
+            "node2",
+            PrivacyAccountResolver.BOB.resolve(enclaveEncryptorType),
+            false,
+            enclaveType,
+            Optional.of(containerNetwork));
+    charlie =
+        privacyBesu.createFlexiblePrivacyGroupEnabledNode(
+            "node3",
+            PrivacyAccountResolver.CHARLIE.resolve(enclaveEncryptorType),
+            false,
+            enclaveType,
+            Optional.of(containerNetwork));
+    privacyCluster.start(alice, bob, charlie);
+  }
+
+  @Test
+  public void nodeCanCreatePrivacyGroup() {
+    final String privacyGroupId = createFlexiblePrivacyGroup(alice);
+    checkFlexiblePrivacyGroupExists(privacyGroupId, alice);
+  }
+
+  @Test
+  public void deployingMustGiveValidReceipt() {
+    final String privacyGroupId = createFlexiblePrivacyGroup(alice, bob);
+    final Contract eventEmitter = deployPrivateContract(EventEmitter.class, privacyGroupId, alice);
+    final String commitmentHash = getContractDeploymentCommitmentHash(eventEmitter);
+
+    alice.verify(privateTransactionVerifier.existingPrivateTransactionReceipt(commitmentHash));
+    bob.verify(privateTransactionVerifier.existingPrivateTransactionReceipt(commitmentHash));
+  }
+
+  @Test
+  public void canAddParticipantToGroup() {
+    final String privacyGroupId = createFlexiblePrivacyGroup(alice, bob);
+    final Contract eventEmitter = deployPrivateContract(EventEmitter.class, privacyGroupId, alice);
+    final String commitmentHash = getContractDeploymentCommitmentHash(eventEmitter);
+
+    charlie.verify(privateTransactionVerifier.noPrivateTransactionReceipt(commitmentHash));
+
+    final Credentials aliceCredentials = Credentials.create(alice.getTransactionSigningKey());
+    lockPrivacyGroup(privacyGroupId, alice, aliceCredentials);
+    addMembersToPrivacyGroup(privacyGroupId, alice, aliceCredentials, charlie);
+    checkFlexiblePrivacyGroupExists(privacyGroupId, alice, bob, charlie);
+
+    charlie.verify(privateTransactionVerifier.existingPrivateTransactionReceipt(commitmentHash));
+  }
+
+  @Test
+  public void removedMemberCannotSendTransactionToGroup() {
+    final String privacyGroupId = createFlexiblePrivacyGroup(alice, bob);
+
+    final String removeHash =
+        removeFromPrivacyGroup(
+            privacyGroupId, alice, Credentials.create(alice.getTransactionSigningKey()), bob);
+
+    bob.verify(privateTransactionVerifier.existingPrivateTransactionReceipt(removeHash));
+
+    assertThatThrownBy(() -> deployPrivateContract(EventEmitter.class, privacyGroupId, bob))
+        .isInstanceOf(RuntimeException.class)
+        .hasMessageContaining("Flexible Privacy group does not exist.");
+  }
+
+  @Test
+  public void canInteractWithPrivateGenesisPreCompile() throws Exception {
+    final String privacyGroupId = createFlexiblePrivacyGroup(alice, bob);
+
+    final EventEmitter eventEmitter =
+        alice.execute(
+            privateContractTransactions.loadSmartContractWithPrivacyGroupId(
+                "0x1000000000000000000000000000000000000001",
+                EventEmitter.class,
+                alice.getTransactionSigningKey(),
+                alice.getEnclaveKey(),
+                privacyGroupId));
+
+    privateTransactionVerifier.existingPrivateTransactionReceipt(
+        eventEmitter.store(BigInteger.valueOf(42)).send().getTransactionHash());
+
+    final String aliceResponse =
+        alice
+            .execute(
+                privacyTransactions.privCall(
+                    privacyGroupId, eventEmitter, eventEmitter.value().encodeFunctionCall()))
+            .getValue();
+
+    assertThat(new BigInteger(aliceResponse.substring(2), 16))
+        .isEqualByComparingTo(BigInteger.valueOf(42));
+
+    final String bobResponse =
+        bob.execute(
+                privacyTransactions.privCall(
+                    privacyGroupId, eventEmitter, eventEmitter.value().encodeFunctionCall()))
+            .getValue();
+
+    assertThat(new BigInteger(bobResponse.substring(2), 16))
+        .isEqualByComparingTo(BigInteger.valueOf(42));
+
+    final String charlieResponse =
+        charlie
+            .execute(
+                privacyTransactions.privCall(
+                    privacyGroupId, eventEmitter, eventEmitter.value().encodeFunctionCall()))
+            .getValue();
+
+    assertThat(charlieResponse).isEqualTo("0x");
+  }
+
+  @Test
+  public void memberCanBeAddedAfterBeingRemoved() {
+    final String privacyGroupId = createFlexiblePrivacyGroup(alice);
+
+    checkFlexiblePrivacyGroupExists(privacyGroupId, alice);
+
+    lockPrivacyGroup(privacyGroupId, alice, Credentials.create(alice.getTransactionSigningKey()));
+    addMembersToPrivacyGroup(
+        privacyGroupId, alice, Credentials.create(alice.getTransactionSigningKey()), bob);
+
+    checkFlexiblePrivacyGroupExists(privacyGroupId, alice, bob);
+
+    final EventEmitter eventEmitter =
+        deployPrivateContract(EventEmitter.class, privacyGroupId, alice);
+
+    final int valueSetWhileBobWasMember = 17;
+    final PrivateTransactionReceipt receiptWhileBobMember =
+        setEventEmitterValueAndCheck(
+            Lists.newArrayList(alice, bob),
+            privacyGroupId,
+            eventEmitter,
+            valueSetWhileBobWasMember);
+
+    removeFromPrivacyGroup(
+        privacyGroupId, alice, Credentials.create(alice.getTransactionSigningKey()), bob);
+
+    checkFlexiblePrivacyGroupExists(privacyGroupId, alice);
+
+    final int valueSetWhileBobWas_NOT_aMember = 1337;
+    final PrivateTransactionReceipt receiptWhileBobRemoved =
+        setEventEmitterValueAndCheck(
+            Lists.newArrayList(alice),
+            privacyGroupId,
+            eventEmitter,
+            valueSetWhileBobWas_NOT_aMember);
+    checkEmitterValue(
+        Lists.newArrayList(bob),
+        privacyGroupId,
+        eventEmitter,
+        valueSetWhileBobWasMember); // bob did not get the last transaction
+
+    lockPrivacyGroup(privacyGroupId, alice, Credentials.create(alice.getTransactionSigningKey()));
+    addMembersToPrivacyGroup(
+        privacyGroupId, alice, Credentials.create(alice.getTransactionSigningKey()), bob);
+
+    checkFlexiblePrivacyGroupExists(privacyGroupId, alice, bob);
+
+    checkEmitterValue(
+        Lists.newArrayList(alice, bob),
+        privacyGroupId,
+        eventEmitter,
+        valueSetWhileBobWas_NOT_aMember);
+
+    PrivateTransactionReceipt receipt =
+        bob.execute(
+            privacyTransactions.getPrivateTransactionReceipt(
+                receiptWhileBobRemoved.getcommitmentHash()));
+    assertThat(receipt.getStatus()).isEqualTo("0x1");
+
+    receipt =
+        bob.execute(
+            privacyTransactions.getPrivateTransactionReceipt(
+                receiptWhileBobMember.getcommitmentHash()));
+    assertThat(receipt.getStatus()).isEqualTo("0x1");
+  }
+
+  PrivateTransactionReceipt setEventEmitterValueAndCheck(
+      final List<PrivacyNode> nodes,
+      final String privacyGroupId,
+      final EventEmitter eventEmitter,
+      final int value) {
+    final PrivateTransactionReceipt receiptWhileBobMember =
+        setEventEmitterValue(nodes, privacyGroupId, eventEmitter, value);
+
+    checkEmitterValue(nodes, privacyGroupId, eventEmitter, value);
+    return receiptWhileBobMember;
+  }
+
+  private PrivateTransactionReceipt setEventEmitterValue(
+      final List<PrivacyNode> nodes,
+      final String privacyGroupId,
+      final EventEmitter eventEmitter,
+      final int value) {
+    final PrivacyNode firstNode = nodes.get(0);
+    final String txHash =
+        firstNode.execute(
+            privateContractTransactions.callOnchainPermissioningSmartContract(
+                eventEmitter.getContractAddress(),
+                eventEmitter.store(BigInteger.valueOf(value)).encodeFunctionCall(),
+                firstNode.getTransactionSigningKey(),
+                firstNode.getEnclaveKey(),
+                privacyGroupId));
+    PrivateTransactionReceipt receipt = null;
+    for (final PrivacyNode node : nodes) {
+      receipt = node.execute(privacyTransactions.getPrivateTransactionReceipt(txHash));
+      assertThat(receipt.getStatus()).isEqualTo("0x1");
+    }
+    return receipt;
+  }
+
+  private void checkEmitterValue(
+      final List<PrivacyNode> nodes,
+      final String privacyGroupId,
+      final EventEmitter eventEmitter,
+      final int expectedValue) {
+    for (final PrivacyNode node : nodes) {
+      final EthCall response =
+          node.execute(
+              privacyTransactions.privCall(
+                  privacyGroupId, eventEmitter, eventEmitter.value().encodeFunctionCall()));
+
+      assertThat(new BigInteger(response.getValue().substring(2), 16))
+          .isEqualByComparingTo(BigInteger.valueOf(expectedValue));
+    }
+  }
+
+  @Test
+  public void bobCanAddCharlieAfterBeingAddedByAlice() {
+    final String privacyGroupId = createFlexiblePrivacyGroup(alice);
+    checkFlexiblePrivacyGroupExists(privacyGroupId, alice);
+    final EventEmitter eventEmitter =
+        alice.execute(
+            privateContractTransactions.createSmartContractWithPrivacyGroupId(
+                EventEmitter.class,
+                alice.getTransactionSigningKey(),
+                alice.getEnclaveKey(),
+                privacyGroupId));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(
+            eventEmitter.getContractAddress(), alice.getAddress().toString())
+        .verify(eventEmitter);
+
+    final Credentials aliceCredentials = Credentials.create(alice.getTransactionSigningKey());
+    final String aliceLockHash =
+        alice.execute(
+            privacyTransactions.privxLockPrivacyGroupAndCheck(
+                privacyGroupId, alice, aliceCredentials));
+
+    alice.execute(
+        privacyTransactions.addToPrivacyGroup(privacyGroupId, alice, aliceCredentials, bob));
+
+    checkFlexiblePrivacyGroupExists(privacyGroupId, alice, bob);
+
+    bob.execute(
+        privacyTransactions.privxLockPrivacyGroupAndCheck(privacyGroupId, bob, aliceCredentials));
+
+    alice.execute(minerTransactions.minerStop());
+
+    alice.getBesu().verify(ethConditions.miningStatus(false));
+
+    final BigInteger pendingTransactionFilterId =
+        alice.execute(ethTransactions.newPendingTransactionsFilter());
+
+    final String callHash =
+        alice.execute(
+            privateContractTransactions.callOnchainPermissioningSmartContract(
+                eventEmitter.getContractAddress(),
+                eventEmitter.value().encodeFunctionCall(),
+                alice.getTransactionSigningKey(),
+                alice.getEnclaveKey(),
+                privacyGroupId));
+
+    final String bobAddHash =
+        addMembersToPrivacyGroup(privacyGroupId, bob, aliceCredentials, charlie);
+
+    alice
+        .getBesu()
+        .verify(
+            ethConditions.expectNewPendingTransactions(
+                pendingTransactionFilterId, Arrays.asList(callHash, bobAddHash)));
+
+    alice.execute(minerTransactions.minerStart());
+
+    alice.getBesu().verify(ethConditions.miningStatus(true));
+
+    checkFlexiblePrivacyGroupExists(privacyGroupId, alice, bob, charlie);
+
+    final Optional<TransactionReceipt> aliceAddReceipt =
+        alice.execute(ethTransactions.getTransactionReceipt(bobAddHash));
+    assertThat(aliceAddReceipt.get().getStatus())
+        .isEqualTo("0x1"); // this means the PMT for the "add" succeeded which is what we expect
+
+    final Optional<TransactionReceipt> alicePublicReceipt =
+        alice.execute(ethTransactions.getTransactionReceipt(callHash));
+    if (alicePublicReceipt.isPresent()) {
+      assertThat(alicePublicReceipt.get().getBlockHash())
+          .isEqualTo(
+              aliceAddReceipt
+                  .get()
+                  .getBlockHash()); // ensure that "add" and "call" are in the same block
+      assertThat(alicePublicReceipt.get().getStatus())
+          .isEqualTo(
+              "0x1"); // this means the PMT for the "call" succeeded which is what we expect because
+      // it is in the same block as the "add" and there is no way to tell that this
+      // will happen before the block is mined
+    }
+
+    final PrivateTransactionReceipt aliceReceipt =
+        alice.execute(privacyTransactions.getPrivateTransactionReceipt(callHash));
+    assertThat(aliceReceipt.getStatus())
+        .isEqualTo(
+            "0x0"); // this means the "call" failed which is what we expect because the group was
+    // locked!
+    final PrivateTransactionReceipt bobReceipt =
+        alice.execute(privacyTransactions.getPrivateTransactionReceipt(callHash));
+    assertThat(bobReceipt.getStatus())
+        .isEqualTo(
+            "0x0"); // this means the "call" failed which is what we expect because the group was
+    // locked!
+
+    // assert charlie can access private transaction information from before he was added
+    final PrivateTransactionReceipt expectedAliceLockReceipt =
+        new PrivateTransactionReceipt(
+            null,
+            alice.getAddress().toHexString(),
+            FLEXIBLE_PRIVACY_PROXY.toHexString(),
+            "0x",
+            Collections.emptyList(),
+            null,
+            null,
+            alice.getEnclaveKey(),
+            null,
+            privacyGroupId,
+            "0x1",
+            null);
+    charlie.verify(
+        privateTransactionVerifier.validPrivateTransactionReceipt(
+            aliceLockHash, expectedAliceLockReceipt));
+
+    final String aliceStoreHash =
+        charlie.execute(
+            privateContractTransactions.callOnchainPermissioningSmartContract(
+                eventEmitter.getContractAddress(),
+                eventEmitter.store(BigInteger.valueOf(1337)).encodeFunctionCall(),
+                charlie.getTransactionSigningKey(),
+                charlie.getEnclaveKey(),
+                privacyGroupId));
+
+    final PrivateTransactionReceipt expectedStoreReceipt =
+        new PrivateTransactionReceipt(
+            null,
+            charlie.getAddress().toHexString(),
+            eventEmitter.getContractAddress(),
+            "0x",
+            Collections.singletonList(
+                new Log(
+                    false,
+                    "0x0",
+                    "0x0",
+                    aliceStoreHash,
+                    null,
+                    null,
+                    eventEmitter.getContractAddress(),
+                    EXPECTED_STORE_OUTPUT_DATA,
+                    null,
+                    Collections.singletonList(EXPECTED_STORE_EVENT_TOPIC))),
+            null,
+            null,
+            charlie.getEnclaveKey(),
+            null,
+            privacyGroupId,
+            "0x1",
+            null);
+
+    alice.verify(
+        privateTransactionVerifier.validPrivateTransactionReceipt(
+            aliceStoreHash, expectedStoreReceipt));
+
+    bob.verify(
+        privateTransactionVerifier.validPrivateTransactionReceipt(
+            aliceStoreHash, expectedStoreReceipt));
+
+    charlie.verify(
+        privateTransactionVerifier.validPrivateTransactionReceipt(
+            aliceStoreHash, expectedStoreReceipt));
+
+    removeFromPrivacyGroup(privacyGroupId, bob, aliceCredentials, charlie);
+
+    checkFlexiblePrivacyGroupExists(privacyGroupId, alice, bob);
+  }
+
+  @Test
+  public void canOnlyCallProxyContractWhenGroupLocked() {
+    final String privacyGroupId = createFlexiblePrivacyGroup(alice);
+    checkFlexiblePrivacyGroupExists(privacyGroupId, alice);
+
+    final EventEmitter eventEmitter =
+        alice.execute(
+            privateContractTransactions.createSmartContractWithPrivacyGroupId(
+                EventEmitter.class,
+                alice.getTransactionSigningKey(),
+                alice.getEnclaveKey(),
+                privacyGroupId));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(
+            eventEmitter.getContractAddress(), alice.getAddress().toString())
+        .verify(eventEmitter);
+
+    final Credentials aliceCredentials = Credentials.create(alice.getTransactionSigningKey());
+
+    final Supplier<String> callContract =
+        () -> {
+          return alice.execute(
+              privateContractTransactions.callOnchainPermissioningSmartContract(
+                  eventEmitter.getContractAddress(),
+                  eventEmitter.value().encodeFunctionCall(),
+                  alice.getTransactionSigningKey(),
+                  alice.getEnclaveKey(),
+                  privacyGroupId));
+        };
+
+    final String lockHash =
+        alice.execute(
+            privacyTransactions.privxLockPrivacyGroupAndCheck(
+                privacyGroupId, alice, aliceCredentials));
+
+    final String callWhileLockedHash = callContract.get();
+
+    final String unlockHash =
+        alice.execute(
+            privacyTransactions.privxUnlockPrivacyGroupAndCheck(
+                privacyGroupId, alice, aliceCredentials));
+
+    final String callAfterUnlockedHash = callContract.get();
+
+    alice.execute(minerTransactions.minerStart());
+    alice.getBesu().verify(ethConditions.miningStatus(true));
+
+    final BiConsumer<String, String> assertThatTransactionReceiptIs =
+        (String hash, String expectedResult) -> {
+          final PrivateTransactionReceipt receipt =
+              alice.execute(privacyTransactions.getPrivateTransactionReceipt(hash));
+          assertThat(receipt.getStatus()).isEqualTo(expectedResult);
+        };
+
+    // when locking a group succeeds ...
+    assertThatTransactionReceiptIs.accept(lockHash, "0x1");
+    // ... calls to contracts fail ...
+    assertThatTransactionReceiptIs.accept(callWhileLockedHash, "0x0");
+    // ... but unlock the group works ...
+    assertThatTransactionReceiptIs.accept(unlockHash, "0x1");
+    // ... and afterwards we can call contracts again
+    assertThatTransactionReceiptIs.accept(callAfterUnlockedHash, "0x1");
+  }
+
+  @Test
+  public void addMembersToTwoGroupsInTheSameBlock() {
+    final String privacyGroupId1 = createFlexiblePrivacyGroup(alice);
+    final String privacyGroupId2 = createFlexiblePrivacyGroup(bob);
+    checkFlexiblePrivacyGroupExists(privacyGroupId1, alice);
+    checkFlexiblePrivacyGroupExists(privacyGroupId2, bob);
+
+    lockPrivacyGroup(privacyGroupId1, alice, Credentials.create(alice.getTransactionSigningKey()));
+    lockPrivacyGroup(privacyGroupId2, bob, Credentials.create(bob.getTransactionSigningKey()));
+
+    final BigInteger pendingTransactionFilterId =
+        alice.execute(ethTransactions.newPendingTransactionsFilter());
+
+    alice.execute(minerTransactions.minerStop());
+    alice.getBesu().verify(ethConditions.miningStatus(false));
+
+    final String aliceAddHash =
+        addMembersToPrivacyGroup(
+            privacyGroupId1, alice, Credentials.create(alice.getTransactionSigningKey()), charlie);
+    final String bobAddHash =
+        addMembersToPrivacyGroup(
+            privacyGroupId2, bob, Credentials.create(bob.getTransactionSigningKey()), alice);
+
+    alice
+        .getBesu()
+        .verify(
+            ethConditions.expectNewPendingTransactions(
+                pendingTransactionFilterId, Arrays.asList(aliceAddHash, bobAddHash)));
+
+    alice.execute(minerTransactions.minerStart());
+
+    checkFlexiblePrivacyGroupExists(privacyGroupId1, alice, charlie);
+    checkFlexiblePrivacyGroupExists(privacyGroupId2, bob, alice);
+  }
+
+  private <T extends Contract> T deployPrivateContract(
+      final Class<T> clazz, final String privacyGroupId, final PrivacyNode sender) {
+    final T contract =
+        sender.execute(
+            privateContractTransactions.createSmartContractWithPrivacyGroupId(
+                clazz, sender.getTransactionSigningKey(), sender.getEnclaveKey(), privacyGroupId));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(contract.getContractAddress(), sender.getAddress().toString())
+        .verify(contract);
+
+    return contract;
+  }
+
+  private String addMembersToPrivacyGroup(
+      final String privacyGroupId,
+      final PrivacyNode nodeAddingMember,
+      final Credentials signer,
+      final PrivacyNode... newMembers) {
+    return nodeAddingMember.execute(
+        privacyTransactions.addToPrivacyGroup(
+            privacyGroupId, nodeAddingMember, signer, newMembers));
+  }
+
+  private String removeFromPrivacyGroup(
+      final String privacyGroupId,
+      final PrivacyNode nodeRemovingMember,
+      final Credentials signer,
+      final PrivacyNode memberBeingRemoved) {
+    return nodeRemovingMember.execute(
+        privacyTransactions.removeFromPrivacyGroup(
+            privacyGroupId,
+            nodeRemovingMember.getEnclaveKey(),
+            signer,
+            memberBeingRemoved.getEnclaveKey()));
+  }
+
+  /**
+   * This method will send a transaction to lock the privacy group identified by the specified id.
+   * This also checks if the lock transaction was successful.
+   *
+   * @return the hash of the lock privacy group transaction
+   */
+  private String lockPrivacyGroup(
+      final String privacyGroupId, final PrivacyNode member, final Credentials signer) {
+    return member.execute(
+        privacyTransactions.privxLockPrivacyGroupAndCheck(privacyGroupId, member, signer));
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/FlexiblePrivacyAcceptanceTestBase.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/FlexiblePrivacyAcceptanceTestBase.java
new file mode 100644
index 00000000000..9e4f1638dad
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/FlexiblePrivacyAcceptanceTestBase.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.privacy;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY_PROXY;
+import static org.hyperledger.besu.ethereum.privacy.group.FlexibleGroupManagement.GET_PARTICIPANTS_METHOD_SIGNATURE;
+
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.condition.ExpectValidFlexiblePrivacyGroupCreated;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction.CreateFlexiblePrivacyGroupTransaction;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.PrivacyRequestFactory;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.web3j.abi.FunctionEncoder;
+import org.web3j.abi.Utils;
+import org.web3j.abi.datatypes.DynamicArray;
+import org.web3j.abi.datatypes.DynamicBytes;
+import org.web3j.protocol.besu.response.privacy.PrivateTransactionReceipt;
+import org.web3j.protocol.core.methods.response.TransactionReceipt;
+import org.web3j.tx.Contract;
+import org.web3j.utils.Base64String;
+
+public class FlexiblePrivacyAcceptanceTestBase extends PrivacyAcceptanceTestBase {
+
+  protected String createFlexiblePrivacyGroup(final PrivacyNode... members) {
+    final List<String> addresses =
+        Arrays.stream(members).map(PrivacyNode::getEnclaveKey).collect(Collectors.toList());
+    return createFlexiblePrivacyGroup(members[0].getEnclaveKey(), addresses, members);
+  }
+
+  /**
+   * Create an flexible privacy group. The privacy group id will be randomly generated.
+   *
+   * <p>This method also checks that each node member has successfully processed the transaction and
+   * has the expected list of member for the group.
+   *
+   * @param members the list of members of the privacy group. The first member of the list will be
+   *     the creator of the group.
+   * @return the id of the privacy group
+   */
+  protected String createFlexiblePrivacyGroup(
+      final String privateFrom, final List<String> addresses, final PrivacyNode... members) {
+
+    final PrivacyNode groupCreator = members[0];
+
+    final CreateFlexiblePrivacyGroupTransaction createTx =
+        privacyTransactions.createFlexiblePrivacyGroup(groupCreator, privateFrom, addresses);
+
+    final PrivacyRequestFactory.PrivxCreatePrivacyGroupResponse createResponse =
+        groupCreator.execute(createTx);
+    final String privacyGroupId = createResponse.getPrivacyGroupId();
+
+    final List<Base64String> membersEnclaveKeys =
+        Arrays.stream(members)
+            .map(m -> Base64String.wrap(m.getEnclaveKey()))
+            .collect(Collectors.toList());
+
+    for (final PrivacyNode member : members) {
+      member.verify(flexiblePrivacyGroupExists(privacyGroupId, membersEnclaveKeys));
+    }
+
+    final String commitmentHash =
+        callGetParticipantsMethodAndReturnCommitmentHash(privacyGroupId, groupCreator, privateFrom);
+    final PrivateTransactionReceipt expectedReceipt =
+        buildExpectedAddMemberTransactionReceipt(privacyGroupId, groupCreator, addresses);
+
+    for (final PrivacyNode member : members) {
+      member.verify(
+          privateTransactionVerifier.validPrivateTransactionReceipt(
+              commitmentHash, expectedReceipt));
+    }
+
+    return privacyGroupId;
+  }
+
+  protected String callGetParticipantsMethodAndReturnCommitmentHash(
+      final String privacyGroupId, final PrivacyNode groupCreator, final String privateFrom) {
+    return groupCreator.execute(
+        privateContractTransactions.callOnchainPermissioningSmartContract(
+            FLEXIBLE_PRIVACY_PROXY.toHexString(),
+            GET_PARTICIPANTS_METHOD_SIGNATURE.toString(),
+            groupCreator.getTransactionSigningKey(),
+            privateFrom,
+            privacyGroupId));
+  }
+
+  protected PrivateTransactionReceipt buildExpectedAddMemberTransactionReceipt(
+      final String privacyGroupId, final PrivacyNode groupCreator, final List<String> members) {
+    return buildExpectedAddMemberTransactionReceipt(
+        privacyGroupId, groupCreator, groupCreator.getEnclaveKey(), members);
+  }
+
+  protected PrivateTransactionReceipt buildExpectedAddMemberTransactionReceipt(
+      final String privacyGroupId,
+      final PrivacyNode groupCreator,
+      final String privateFrom,
+      final List<String> members) {
+
+    final StringBuilder output = new StringBuilder();
+    // hex prefix
+    output.append("0x");
+
+    final String encodedParameters =
+        FunctionEncoder.encode(
+            "",
+            Arrays.asList(
+                new DynamicArray<>(
+                    DynamicBytes.class,
+                    Utils.typeMap(
+                        members.stream()
+                            .map(Bytes::fromBase64String)
+                            .map(Bytes::toArrayUnsafe)
+                            .collect(Collectors.toList()),
+                        DynamicBytes.class))));
+
+    output.append(encodedParameters);
+
+    return new PrivateTransactionReceipt(
+        null,
+        groupCreator.getAddress().toHexString(),
+        FLEXIBLE_PRIVACY_PROXY.toHexString(),
+        output.toString(),
+        Collections.emptyList(),
+        null,
+        null,
+        privateFrom,
+        null,
+        privacyGroupId,
+        "0x1",
+        null);
+  }
+
+  protected ExpectValidFlexiblePrivacyGroupCreated flexiblePrivacyGroupExists(
+      final String privacyGroupId, final List<Base64String> members) {
+    return privateTransactionVerifier.flexiblePrivacyGroupExists(privacyGroupId, members);
+  }
+
+  protected String getContractDeploymentCommitmentHash(final Contract contract) {
+    final Optional<TransactionReceipt> transactionReceipt = contract.getTransactionReceipt();
+    assertThat(transactionReceipt).isPresent();
+    final PrivateTransactionReceipt privateTransactionReceipt =
+        (PrivateTransactionReceipt) transactionReceipt.get();
+    return privateTransactionReceipt.getcommitmentHash();
+  }
+
+  /**
+   * This method will check if a privacy group with the specified id and list of members exists.
+   * Each one of the members node will be queried to ensure that they all have the same privacy
+   * group in their private state.
+   *
+   * @param privacyGroupId the id of the privacy group
+   * @param members the list of member in the privacy group
+   */
+  protected void checkFlexiblePrivacyGroupExists(
+      final String privacyGroupId, final PrivacyNode... members) {
+    final List<Base64String> membersEnclaveKeys =
+        Arrays.stream(members)
+            .map(PrivacyNode::getEnclaveKey)
+            .map(Base64String::wrap)
+            .collect(Collectors.toList());
+
+    for (final PrivacyNode member : members) {
+      member.verify(flexiblePrivacyGroupExists(privacyGroupId, membersEnclaveKeys));
+    }
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PluginPrivacySigningAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PluginPrivacySigningAcceptanceTest.java
new file mode 100644
index 00000000000..68d5117fd6b
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PluginPrivacySigningAcceptanceTest.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.privacy;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.BesuNodeConfigurationBuilder;
+import org.hyperledger.besu.tests.acceptance.dsl.node.configuration.privacy.PrivacyNodeConfiguration;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccount;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccountResolver;
+import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+import org.hyperledger.enclave.testutil.EnclaveKeyConfiguration;
+import org.hyperledger.enclave.testutil.EnclaveType;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.web3j.protocol.core.DefaultBlockParameter;
+import org.web3j.protocol.core.methods.response.EthBlock.Block;
+import org.web3j.protocol.core.methods.response.TransactionReceipt;
+
+@RunWith(Parameterized.class)
+public class PluginPrivacySigningAcceptanceTest extends PrivacyAcceptanceTestBase {
+  private PrivacyNode minerNode;
+
+  private final EnclaveEncryptorType enclaveEncryptorType;
+
+  public PluginPrivacySigningAcceptanceTest(final EnclaveEncryptorType enclaveEncryptorType) {
+    this.enclaveEncryptorType = enclaveEncryptorType;
+  }
+
+  @Parameterized.Parameters(name = "{0}")
+  public static Collection<EnclaveEncryptorType> enclaveEncryptorTypes() {
+    return Arrays.stream(EnclaveEncryptorType.values())
+        .filter(encryptorType -> !EnclaveEncryptorType.NOOP.equals(encryptorType))
+        .collect(Collectors.toList());
+  }
+
+  @Before
+  public void setup() throws IOException {
+    final PrivacyAccount BOB = PrivacyAccountResolver.BOB.resolve(enclaveEncryptorType);
+
+    minerNode =
+        privacyBesu.create(
+            new PrivacyNodeConfiguration(
+                false,
+                false,
+                true,
+                new BesuNodeConfigurationBuilder()
+                    .name("miner")
+                    .miningEnabled()
+                    .jsonRpcEnabled()
+                    .webSocketEnabled()
+                    .enablePrivateTransactions()
+                    .keyFilePath(BOB.getPrivateKeyPath())
+                    .plugins(Collections.singletonList("testPlugins"))
+                    .extraCLIOptions(
+                        List.of(
+                            "--plugin-privacy-service-encryption-prefix=0xAA",
+                            "--plugin-privacy-service-signing-enabled=true",
+                            "--plugin-privacy-service-signing-key=8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63"))
+                    .build(),
+                new EnclaveKeyConfiguration(
+                    BOB.getEnclaveKeyPaths(),
+                    BOB.getEnclavePrivateKeyPaths(),
+                    BOB.getEnclaveEncryptorType())),
+            EnclaveType.NOOP,
+            Optional.empty());
+
+    privacyCluster.start(minerNode);
+  }
+
+  @Test
+  public void canDeployContractSignedByPlugin() throws Exception {
+    final String contractAddress =
+        EnclaveEncryptorType.EC.equals(enclaveEncryptorType)
+            ? "0xf01ec73d91fdeb8bb9388ec74e6a3981da86e021"
+            : "0xd0152772c54cecfa7684f09f7616dcc825545dff";
+
+    final EventEmitter eventEmitter =
+        minerNode.execute(
+            privateContractTransactions.createSmartContract(
+                EventEmitter.class,
+                minerNode.getTransactionSigningKey(),
+                minerNode.getEnclaveKey()));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(contractAddress, minerNode.getAddress().toString())
+        .verify(eventEmitter);
+    privateContractVerifier.validContractCodeProvided().verify(eventEmitter);
+
+    final BigInteger blockNumberContractDeployed =
+        eventEmitter.getTransactionReceipt().get().getBlockNumber();
+    final Block blockContractDeployed =
+        minerNode.execute(
+            ethTransactions.block(DefaultBlockParameter.valueOf(blockNumberContractDeployed)));
+
+    assertThat(blockContractDeployed.getTransactions().size()).isEqualTo(1);
+
+    final String transactionHashContractDeployed =
+        (String) blockContractDeployed.getTransactions().get(0).get();
+    final TransactionReceipt pmtReceipt =
+        minerNode
+            .execute(ethTransactions.getTransactionReceipt(transactionHashContractDeployed))
+            .get();
+
+    assertThat(pmtReceipt.getStatus()).isEqualTo("0x1");
+    assertThat(pmtReceipt.getFrom()).isEqualTo("0xfe3b557e8fb62b89f4916b721be55ceb828dbd73");
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivCallAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivCallAcceptanceTest.java
new file mode 100644
index 00000000000..c42075d48d2
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivCallAcceptanceTest.java
@@ -0,0 +1,294 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.privacy;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.tests.web3j.generated.RevertReason.FUNC_REVERTWITHREVERTREASON;
+import static org.web3j.utils.Restriction.UNRESTRICTED;
+
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.ParameterizedEnclaveTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccountResolver;
+import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
+import org.hyperledger.besu.tests.web3j.generated.RevertReason;
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+import org.hyperledger.enclave.testutil.EnclaveType;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.nio.charset.Charset;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import javax.annotation.Nonnull;
+
+import org.bouncycastle.util.encoders.Hex;
+import org.junit.Test;
+import org.web3j.abi.FunctionEncoder;
+import org.web3j.abi.TypeReference;
+import org.web3j.abi.datatypes.Bool;
+import org.web3j.abi.datatypes.Function;
+import org.web3j.abi.datatypes.Type;
+import org.web3j.abi.datatypes.generated.Uint256;
+import org.web3j.protocol.core.Request;
+import org.web3j.protocol.core.methods.request.Transaction;
+import org.web3j.protocol.core.methods.response.EthCall;
+import org.web3j.protocol.core.methods.response.TransactionReceipt;
+import org.web3j.protocol.http.HttpService;
+import org.web3j.tx.Contract;
+import org.web3j.utils.Restriction;
+
+public class PrivCallAcceptanceTest extends ParameterizedEnclaveTestBase {
+
+  private static final int VALUE = 1024;
+
+  private final PrivacyNode minerNode;
+
+  public PrivCallAcceptanceTest(
+      final Restriction restriction,
+      final EnclaveType enclaveType,
+      final EnclaveEncryptorType enclaveEncryptorType)
+      throws IOException {
+
+    super(restriction, enclaveType, enclaveEncryptorType);
+
+    minerNode =
+        privacyBesu.createPrivateTransactionEnabledMinerNode(
+            restriction + "-node",
+            PrivacyAccountResolver.ALICE.resolve(enclaveEncryptorType),
+            enclaveType,
+            Optional.empty(),
+            false,
+            false,
+            restriction == UNRESTRICTED);
+
+    privacyCluster.start(minerNode);
+  }
+
+  @Test
+  public void mustReturnCorrectValue() throws Exception {
+
+    final String privacyGroupId =
+        minerNode.execute(createPrivacyGroup("myGroupName", "my group description", minerNode));
+
+    final EventEmitter eventEmitter =
+        minerNode.execute(
+            privateContractTransactions.createSmartContractWithPrivacyGroupId(
+                EventEmitter.class,
+                minerNode.getTransactionSigningKey(),
+                restriction,
+                minerNode.getEnclaveKey(),
+                privacyGroupId));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(
+            eventEmitter.getContractAddress(), minerNode.getAddress().toString())
+        .verify(eventEmitter);
+
+    final Request<Object, EthCall> priv_call =
+        privCall(privacyGroupId, eventEmitter, false, false, false);
+
+    EthCall resp = priv_call.send();
+
+    String value = resp.getValue();
+    assertThat(new BigInteger(value.substring(2), 16)).isEqualByComparingTo(BigInteger.ZERO);
+
+    final TransactionReceipt receipt = eventEmitter.store(BigInteger.valueOf(VALUE)).send();
+    assertThat(receipt).isNotNull();
+
+    resp = priv_call.send();
+    value = resp.getValue();
+    assertThat(new BigInteger(value.substring(2), 16))
+        .isEqualByComparingTo(BigInteger.valueOf(VALUE));
+  }
+
+  @Test
+  public void mustRevertWithRevertReason() throws Exception {
+
+    final String privacyGroupId =
+        minerNode.execute(createPrivacyGroup("myGroupName", "my group description", minerNode));
+
+    final RevertReason revertReasonContract =
+        minerNode.execute(
+            privateContractTransactions.createSmartContractWithPrivacyGroupId(
+                RevertReason.class,
+                minerNode.getTransactionSigningKey(),
+                restriction,
+                minerNode.getEnclaveKey(),
+                privacyGroupId));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(
+            revertReasonContract.getContractAddress(), minerNode.getAddress().toString())
+        .verify(revertReasonContract);
+
+    final Request<Object, EthCall> priv_call =
+        privCall(privacyGroupId, revertReasonContract, false, false, true);
+
+    EthCall resp = priv_call.send();
+    assertThat(resp.getRevertReason()).isEqualTo("Execution reverted");
+
+    byte[] bytes = Hex.decode(resp.getError().getData().substring(3, 203));
+    String revertMessage =
+        new String(Arrays.copyOfRange(bytes, 4, bytes.length), Charset.defaultCharset()).trim();
+    assertThat(revertMessage).isEqualTo("RevertReason");
+  }
+
+  @Test
+  public void shouldReturnEmptyResultWithNonExistingPrivacyGroup() throws IOException {
+
+    final String privacyGroupId =
+        minerNode.execute(createPrivacyGroup("myGroupName", "my group description", minerNode));
+
+    final EventEmitter eventEmitter =
+        minerNode.execute(
+            privateContractTransactions.createSmartContractWithPrivacyGroupId(
+                EventEmitter.class,
+                minerNode.getTransactionSigningKey(),
+                restriction,
+                minerNode.getEnclaveKey(),
+                privacyGroupId));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(
+            eventEmitter.getContractAddress(), minerNode.getAddress().toString())
+        .verify(eventEmitter);
+
+    final String invalidPrivacyGroup = constructInvalidString(privacyGroupId);
+    final Request<Object, EthCall> privCall =
+        privCall(invalidPrivacyGroup, eventEmitter, false, false, false);
+
+    final EthCall result = privCall.send();
+
+    assertThat(result.getResult()).isEqualTo("0x");
+  }
+
+  @Test
+  public void mustNotSucceedWithWronglyEncodedFunction() throws IOException {
+
+    final String privacyGroupId =
+        minerNode.execute(createPrivacyGroup("myGroupName", "my group description", minerNode));
+
+    final EventEmitter eventEmitter =
+        minerNode.execute(
+            privateContractTransactions.createSmartContractWithPrivacyGroupId(
+                EventEmitter.class,
+                minerNode.getTransactionSigningKey(),
+                restriction,
+                minerNode.getEnclaveKey(),
+                privacyGroupId));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(
+            eventEmitter.getContractAddress(), minerNode.getAddress().toString())
+        .verify(eventEmitter);
+
+    final Request<Object, EthCall> priv_call =
+        privCall(privacyGroupId, eventEmitter, true, false, false);
+
+    final String errorMessage = priv_call.send().getError().getMessage();
+    assertThat(errorMessage).isEqualTo("Private transaction failed");
+  }
+
+  @Test
+  public void mustReturn0xUsingInvalidContractAddress() throws IOException {
+
+    final String privacyGroupId =
+        minerNode.execute(createPrivacyGroup("myGroupName", "my group description", minerNode));
+
+    final EventEmitter eventEmitter =
+        minerNode.execute(
+            privateContractTransactions.createSmartContractWithPrivacyGroupId(
+                EventEmitter.class,
+                minerNode.getTransactionSigningKey(),
+                restriction,
+                minerNode.getEnclaveKey(),
+                privacyGroupId));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(
+            eventEmitter.getContractAddress(), minerNode.getAddress().toString())
+        .verify(eventEmitter);
+
+    final Request<Object, EthCall> priv_call =
+        privCall(privacyGroupId, eventEmitter, false, true, false);
+
+    final EthCall result = priv_call.send();
+
+    assertThat(result).isNotNull();
+    assertThat(result.getResult()).isEqualTo("0x");
+  }
+
+  @Nonnull
+  private String constructInvalidString(final String privacyGroupId) {
+    final char[] chars = privacyGroupId.toCharArray();
+    if (chars[3] == '0') {
+      chars[3] = '1';
+    } else {
+      chars[3] = '0';
+    }
+    return String.valueOf(chars);
+  }
+
+  @Nonnull
+  private Request<Object, EthCall> privCall(
+      final String privacyGroupId,
+      final Contract contract,
+      final boolean useInvalidParameters,
+      final boolean useInvalidContractAddress,
+      final boolean useRevertFunction) {
+
+    final Uint256 invalid = new Uint256(BigInteger.TEN);
+
+    @SuppressWarnings("rawtypes")
+    final List<Type> inputParameters =
+        useInvalidParameters ? Arrays.asList(invalid) : Collections.emptyList();
+
+    final Function function =
+        useRevertFunction
+            ? new Function(
+                FUNC_REVERTWITHREVERTREASON,
+                inputParameters,
+                Arrays.<TypeReference<?>>asList(new TypeReference<Bool>() {}))
+            : new Function(
+                "value",
+                inputParameters,
+                Arrays.<TypeReference<?>>asList(new TypeReference<Uint256>() {}));
+
+    final String encoded = FunctionEncoder.encode(function);
+
+    final HttpService httpService =
+        new HttpService(
+            "http://"
+                + minerNode.getBesu().getHostName()
+                + ":"
+                + minerNode.getBesu().getJsonRpcPort().get());
+
+    final String validContractAddress = contract.getContractAddress();
+    final String invalidContractAddress = constructInvalidString(validContractAddress);
+    final String contractAddress =
+        useInvalidContractAddress ? invalidContractAddress : validContractAddress;
+
+    final Transaction transaction =
+        Transaction.createEthCallTransaction(null, contractAddress, encoded);
+
+    return new Request<>(
+        "priv_call",
+        Arrays.asList(privacyGroupId, transaction, "latest"),
+        httpService,
+        EthCall.class);
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivDebugGetStateRootFlexibleGroupAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivDebugGetStateRootFlexibleGroupAcceptanceTest.java
new file mode 100644
index 00000000000..59973fd00be
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivDebugGetStateRootFlexibleGroupAcceptanceTest.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.privacy;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccountResolver;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.PrivacyRequestFactory;
+import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+import org.hyperledger.enclave.testutil.EnclaveType;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.net.URISyntaxException;
+import java.util.Collection;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+import org.testcontainers.containers.Network;
+
+@RunWith(Parameterized.class)
+public class PrivDebugGetStateRootFlexibleGroupAcceptanceTest
+    extends FlexiblePrivacyAcceptanceTestBase {
+
+  private final EnclaveType enclaveType;
+
+  public PrivDebugGetStateRootFlexibleGroupAcceptanceTest(final EnclaveType enclaveType) {
+    this.enclaveType = enclaveType;
+  }
+
+  @Parameters(name = "{0}")
+  public static Collection<EnclaveType> enclaveTypes() {
+    return EnclaveType.valuesForTests();
+  }
+
+  private PrivacyNode aliceNode;
+  private PrivacyNode bobNode;
+
+  @Before
+  public void setUp() throws IOException, URISyntaxException {
+    final Network containerNetwork = Network.newNetwork();
+
+    aliceNode =
+        privacyBesu.createFlexiblePrivacyGroupEnabledMinerNode(
+            "alice-node",
+            PrivacyAccountResolver.ALICE.resolve(EnclaveEncryptorType.NACL),
+            false,
+            enclaveType,
+            Optional.of(containerNetwork));
+    bobNode =
+        privacyBesu.createFlexiblePrivacyGroupEnabledNode(
+            "bob-node",
+            PrivacyAccountResolver.BOB.resolve(EnclaveEncryptorType.NACL),
+            false,
+            enclaveType,
+            Optional.of(containerNetwork));
+
+    privacyCluster.start(aliceNode, bobNode);
+  }
+
+  @Test
+  public void nodesInGroupShouldHaveSameStateRoot() {
+    final String privacyGroupId = createFlexiblePrivacyGroup(aliceNode, bobNode);
+
+    final Hash aliceStateRootId =
+        aliceNode
+            .execute(privacyTransactions.debugGetStateRoot(privacyGroupId, "latest"))
+            .getResult();
+
+    final Hash bobStateRootId =
+        bobNode
+            .execute(privacyTransactions.debugGetStateRoot(privacyGroupId, "latest"))
+            .getResult();
+
+    assertThat(aliceStateRootId).isEqualTo(bobStateRootId);
+  }
+
+  @Test
+  public void unknownGroupShouldReturnError() {
+    final PrivacyRequestFactory.DebugGetStateRoot aliceResult =
+        aliceNode.execute(
+            privacyTransactions.debugGetStateRoot(
+                Hash.wrap(Bytes32.random()).toBase64String(), "latest"));
+
+    assertThat(aliceResult.getResult()).isNull();
+    assertThat(aliceResult.hasError()).isTrue();
+    assertThat(aliceResult.getError()).isNotNull();
+    assertThat(aliceResult.getError().getMessage()).contains("Error finding privacy group");
+  }
+
+  @Test
+  public void blockParamShouldBeApplied() {
+    waitForBlockHeight(aliceNode, 2);
+    waitForBlockHeight(bobNode, 2);
+
+    final String privacyGroupId = createFlexiblePrivacyGroup(aliceNode, bobNode);
+
+    waitForBlockHeight(aliceNode, 10);
+    waitForBlockHeight(bobNode, 10);
+
+    final Hash aliceResult1 =
+        aliceNode.execute(privacyTransactions.debugGetStateRoot(privacyGroupId, "1")).getResult();
+    final Hash bobResultInt1 =
+        bobNode.execute(privacyTransactions.debugGetStateRoot(privacyGroupId, "1")).getResult();
+
+    assertThat(aliceResult1).isEqualTo(bobResultInt1);
+
+    final Hash aliceResultLatest =
+        aliceNode
+            .execute(privacyTransactions.debugGetStateRoot(privacyGroupId, "latest"))
+            .getResult();
+
+    final Hash bobResultLatest =
+        bobNode
+            .execute(privacyTransactions.debugGetStateRoot(privacyGroupId, "latest"))
+            .getResult();
+
+    assertThat(aliceResultLatest).isEqualTo(bobResultLatest);
+    assertThat(aliceResult1).isNotEqualTo(aliceResultLatest);
+  }
+
+  @Test
+  public void canInteractWithPrivateGenesisPreCompile() throws Exception {
+    final String privacyGroupId = createFlexiblePrivacyGroup(aliceNode, bobNode);
+
+    final EventEmitter eventEmitter =
+        aliceNode.execute(
+            privateContractTransactions.loadSmartContractWithPrivacyGroupId(
+                "0x1000000000000000000000000000000000000001",
+                EventEmitter.class,
+                aliceNode.getTransactionSigningKey(),
+                aliceNode.getEnclaveKey(),
+                privacyGroupId));
+
+    privateTransactionVerifier.existingPrivateTransactionReceipt(
+        eventEmitter.store(BigInteger.valueOf(42)).send().getTransactionHash());
+
+    final String aliceResponse =
+        aliceNode
+            .execute(
+                privacyTransactions.privCall(
+                    privacyGroupId, eventEmitter, eventEmitter.value().encodeFunctionCall()))
+            .getValue();
+
+    assertThat(new BigInteger(aliceResponse.substring(2), 16))
+        .isEqualByComparingTo(BigInteger.valueOf(42));
+
+    final String bobResponse =
+        bobNode
+            .execute(
+                privacyTransactions.privCall(
+                    privacyGroupId, eventEmitter, eventEmitter.value().encodeFunctionCall()))
+            .getValue();
+
+    assertThat(new BigInteger(bobResponse.substring(2), 16))
+        .isEqualByComparingTo(BigInteger.valueOf(42));
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivDebugGetStateRootOffchainGroupAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivDebugGetStateRootOffchainGroupAcceptanceTest.java
index 7570bdf120d..92643446ddb 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivDebugGetStateRootOffchainGroupAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivDebugGetStateRootOffchainGroupAcceptanceTest.java
@@ -15,33 +15,62 @@
 package org.hyperledger.besu.tests.acceptance.privacy;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.web3j.utils.Restriction.UNRESTRICTED;
 
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.ParameterizedEnclaveTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccountResolver;
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.PrivacyRequestFactory;
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+import org.hyperledger.enclave.testutil.EnclaveType;
 
 import java.io.IOException;
-import java.net.URISyntaxException;
+import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes32;
-import org.junit.Before;
 import org.junit.Test;
+import org.testcontainers.containers.Network;
+import org.web3j.utils.Restriction;
 
-public class PrivDebugGetStateRootOffchainGroupAcceptanceTest extends PrivacyAcceptanceTestBase {
+public class PrivDebugGetStateRootOffchainGroupAcceptanceTest extends ParameterizedEnclaveTestBase {
 
-  private PrivacyNode aliceNode;
-  private PrivacyNode bobNode;
+  private final PrivacyNode aliceNode;
+  private final PrivacyNode bobNode;
+
+  public PrivDebugGetStateRootOffchainGroupAcceptanceTest(
+      final Restriction restriction,
+      final EnclaveType enclaveType,
+      final EnclaveEncryptorType enclaveEncryptorType)
+      throws IOException {
+
+    super(restriction, enclaveType, enclaveEncryptorType);
+
+    final Network containerNetwork = Network.newNetwork();
 
-  @Before
-  public void setUp() throws IOException, URISyntaxException {
     aliceNode =
-        privacyBesu.createPrivateTransactionEnabledMinerNode(
-            "alice-node", PrivacyAccountResolver.ALICE);
+        privacyBesu.createIbft2NodePrivacyEnabled(
+            "alice-node",
+            PrivacyAccountResolver.ALICE.resolve(enclaveEncryptorType),
+            false,
+            enclaveType,
+            Optional.of(containerNetwork),
+            false,
+            false,
+            restriction == UNRESTRICTED,
+            "0xAA");
     bobNode =
-        privacyBesu.createPrivateTransactionEnabledMinerNode(
-            "bob-node", PrivacyAccountResolver.BOB);
+        privacyBesu.createIbft2NodePrivacyEnabled(
+            "bob-node",
+            PrivacyAccountResolver.BOB.resolve(enclaveEncryptorType),
+            false,
+            enclaveType,
+            Optional.of(containerNetwork),
+            false,
+            false,
+            restriction == UNRESTRICTED,
+            "0xBB");
+
     privacyCluster.start(aliceNode, bobNode);
   }
 
@@ -49,8 +78,7 @@ public void setUp() throws IOException, URISyntaxException {
   public void nodesInGroupShouldHaveSameStateRoot() {
     final String privacyGroupId =
         aliceNode.execute(
-            privacyTransactions.createPrivacyGroup(
-                "testGroup", "A group for everyone", aliceNode, bobNode));
+            createPrivacyGroup("testGroup", "A group for everyone", aliceNode, bobNode));
 
     final Hash aliceStateRootId =
         aliceNode
@@ -67,14 +95,16 @@ public void nodesInGroupShouldHaveSameStateRoot() {
 
   @Test
   public void unknownGroupShouldReturnError() {
-    final PrivacyRequestFactory.DebugGetStateRoot aliceResult =
-        aliceNode.execute(
-            privacyTransactions.debugGetStateRoot(
-                Hash.wrap(Bytes32.random()).toBase64String(), "latest"));
+    if (restriction != UNRESTRICTED) {
+      final PrivacyRequestFactory.DebugGetStateRoot aliceResult =
+          aliceNode.execute(
+              privacyTransactions.debugGetStateRoot(
+                  Hash.wrap(Bytes32.random()).toBase64String(), "latest"));
 
-    assertThat(aliceResult.getResult()).isNull();
-    assertThat(aliceResult.hasError()).isTrue();
-    assertThat(aliceResult.getError()).isNotNull();
-    assertThat(aliceResult.getError().getMessage()).contains("Error finding privacy group");
+      assertThat(aliceResult.getResult()).isNull();
+      assertThat(aliceResult.hasError()).isTrue();
+      assertThat(aliceResult.getError()).isNotNull();
+      assertThat(aliceResult.getError().getMessage()).contains("Error finding privacy group");
+    }
   }
 }
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivDebugGetStateRootOnchainGroupAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivDebugGetStateRootOnchainGroupAcceptanceTest.java
deleted file mode 100644
index d5dfc9f2585..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivDebugGetStateRootOnchainGroupAcceptanceTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.privacy;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccountResolver;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.PrivacyRequestFactory;
-import org.hyperledger.besu.tests.web3j.privacy.OnChainPrivacyAcceptanceTestBase;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.junit.Before;
-import org.junit.Test;
-
-public class PrivDebugGetStateRootOnchainGroupAcceptanceTest
-    extends OnChainPrivacyAcceptanceTestBase {
-
-  private PrivacyNode aliceNode;
-  private PrivacyNode bobNode;
-
-  @Before
-  public void setUp() throws IOException, URISyntaxException {
-    aliceNode =
-        privacyBesu.createOnChainPrivacyGroupEnabledMinerNode(
-            "alice-node", PrivacyAccountResolver.ALICE, Address.PRIVACY, false);
-    bobNode =
-        privacyBesu.createOnChainPrivacyGroupEnabledMinerNode(
-            "bob-node", PrivacyAccountResolver.BOB, Address.PRIVACY, false);
-    privacyCluster.start(aliceNode, bobNode);
-  }
-
-  @Test
-  public void nodesInGroupShouldHaveSameStateRoot() {
-    final String privacyGroupId = createOnChainPrivacyGroup(aliceNode, bobNode);
-
-    final Hash aliceStateRootId =
-        aliceNode
-            .execute(privacyTransactions.debugGetStateRoot(privacyGroupId, "latest"))
-            .getResult();
-
-    final Hash bobStateRootId =
-        bobNode
-            .execute(privacyTransactions.debugGetStateRoot(privacyGroupId, "latest"))
-            .getResult();
-
-    assertThat(aliceStateRootId).isEqualTo(bobStateRootId);
-  }
-
-  @Test
-  public void unknownGroupShouldReturnError() {
-    final PrivacyRequestFactory.DebugGetStateRoot aliceResult =
-        aliceNode.execute(
-            privacyTransactions.debugGetStateRoot(
-                Hash.wrap(Bytes32.random()).toBase64String(), "latest"));
-
-    assertThat(aliceResult.getResult()).isNull();
-    assertThat(aliceResult.hasError()).isTrue();
-    assertThat(aliceResult.getError()).isNotNull();
-    assertThat(aliceResult.getError().getMessage()).contains("Error finding privacy group");
-  }
-
-  @Test
-  public void blockParamShouldBeApplied() {
-    waitForBlockHeight(aliceNode, 2);
-    waitForBlockHeight(bobNode, 2);
-
-    final String privacyGroupId = createOnChainPrivacyGroup(aliceNode, bobNode);
-
-    waitForBlockHeight(aliceNode, 10);
-    waitForBlockHeight(bobNode, 10);
-
-    final Hash aliceResult1 =
-        aliceNode.execute(privacyTransactions.debugGetStateRoot(privacyGroupId, "1")).getResult();
-    final Hash bobResultInt1 =
-        bobNode.execute(privacyTransactions.debugGetStateRoot(privacyGroupId, "1")).getResult();
-
-    assertThat(aliceResult1).isEqualTo(bobResultInt1);
-
-    final Hash aliceResultLatest =
-        aliceNode
-            .execute(privacyTransactions.debugGetStateRoot(privacyGroupId, "latest"))
-            .getResult();
-
-    final Hash bobResultLatest =
-        bobNode
-            .execute(privacyTransactions.debugGetStateRoot(privacyGroupId, "latest"))
-            .getResult();
-
-    assertThat(aliceResultLatest).isEqualTo(bobResultLatest);
-    assertThat(aliceResult1).isNotEqualTo(aliceResultLatest);
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivGetCodeAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivGetCodeAcceptanceTest.java
new file mode 100644
index 00000000000..c08006f694b
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivGetCodeAcceptanceTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.privacy;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.web3j.utils.Restriction.UNRESTRICTED;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.ParameterizedEnclaveTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccountResolver;
+import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+import org.hyperledger.enclave.testutil.EnclaveType;
+
+import java.io.IOException;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Test;
+import org.web3j.utils.Restriction;
+
+public class PrivGetCodeAcceptanceTest extends ParameterizedEnclaveTestBase {
+
+  private final PrivacyNode alice;
+
+  public PrivGetCodeAcceptanceTest(
+      final Restriction restriction,
+      final EnclaveType enclaveType,
+      final EnclaveEncryptorType enclaveEncryptorType)
+      throws IOException {
+
+    super(restriction, enclaveType, enclaveEncryptorType);
+
+    alice =
+        privacyBesu.createPrivateTransactionEnabledMinerNode(
+            restriction + "-node",
+            PrivacyAccountResolver.ALICE.resolve(enclaveEncryptorType),
+            enclaveType,
+            Optional.empty(),
+            false,
+            false,
+            restriction == UNRESTRICTED);
+
+    privacyCluster.start(alice);
+  }
+
+  @Test
+  public void privGetCodeReturnsDeployedContractBytecode() {
+    final String privacyGroupId = createPrivacyGroup();
+    final EventEmitter eventEmitterContract = deployPrivateContract(privacyGroupId);
+
+    final Bytes deployedContractCode =
+        alice.execute(
+            privacyTransactions.privGetCode(
+                privacyGroupId,
+                Address.fromHexString(eventEmitterContract.getContractAddress()),
+                "latest"));
+
+    assertThat(eventEmitterContract.getContractBinary())
+        .contains(deployedContractCode.toUnprefixedHexString());
+  }
+
+  private EventEmitter deployPrivateContract(final String privacyGroupId) {
+    final EventEmitter eventEmitter =
+        alice.execute(
+            privateContractTransactions.createSmartContractWithPrivacyGroupId(
+                EventEmitter.class,
+                alice.getTransactionSigningKey(),
+                restriction,
+                alice.getEnclaveKey(),
+                privacyGroupId));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(
+            eventEmitter.getContractAddress(), alice.getAddress().toString())
+        .verify(eventEmitter);
+    return eventEmitter;
+  }
+
+  private String createPrivacyGroup() {
+    final String privacyGroupId =
+        alice.execute(createPrivacyGroup("myGroupName", "my group description", alice));
+
+    assertThat(privacyGroupId).isNotNull();
+
+    return privacyGroupId;
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivGetLogsAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivGetLogsAcceptanceTest.java
similarity index 79%
rename from acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivGetLogsAcceptanceTest.java
rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivGetLogsAcceptanceTest.java
index fdda78067a8..62519385a2e 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivGetLogsAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivGetLogsAcceptanceTest.java
@@ -12,25 +12,31 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.tests.web3j.privacy;
+package org.hyperledger.besu.tests.acceptance.privacy;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.web3j.utils.Restriction.UNRESTRICTED;
 
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.ParameterizedEnclaveTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccountResolver;
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.util.LogFilterJsonParameter;
 import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+import org.hyperledger.enclave.testutil.EnclaveType;
 
+import java.io.IOException;
 import java.math.BigInteger;
 import java.util.List;
+import java.util.Optional;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.web3j.protocol.besu.response.privacy.PrivateTransactionReceipt;
 import org.web3j.protocol.core.methods.response.EthLog.LogResult;
+import org.web3j.utils.Restriction;
 
 @SuppressWarnings("rawtypes")
-public class PrivGetLogsAcceptanceTest extends PrivacyAcceptanceTestBase {
+public class PrivGetLogsAcceptanceTest extends ParameterizedEnclaveTestBase {
 
   /*
    This value is derived from the contract event signature
@@ -38,13 +44,26 @@ public class PrivGetLogsAcceptanceTest extends PrivacyAcceptanceTestBase {
   private static final String EVENT_EMITTER_EVENT_TOPIC =
       "0xc9db20adedc6cf2b5d25252b101ab03e124902a73fcb12b753f3d1aaa2d8f9f5";
 
-  private PrivacyNode node;
+  private final PrivacyNode node;
+
+  public PrivGetLogsAcceptanceTest(
+      final Restriction restriction,
+      final EnclaveType enclaveType,
+      final EnclaveEncryptorType enclaveEncryptorType)
+      throws IOException {
+
+    super(restriction, enclaveType, enclaveEncryptorType);
 
-  @Before
-  public void setUp() throws Exception {
     node =
         privacyBesu.createPrivateTransactionEnabledMinerNode(
-            "miner-node", privacyAccountResolver.resolve(0));
+            restriction + "-node",
+            PrivacyAccountResolver.ALICE.resolve(enclaveEncryptorType),
+            enclaveType,
+            Optional.empty(),
+            false,
+            false,
+            restriction == UNRESTRICTED);
+
     privacyCluster.start(node);
   }
 
@@ -113,8 +132,7 @@ private LogFilterJsonParameter blockHashLogFilter(
   }
 
   private String createPrivacyGroup() {
-    return node.execute(
-        privacyTransactions.createPrivacyGroup("myGroupName", "my group description", node));
+    return node.execute(createPrivacyGroup("myGroupName", "my group description", node));
   }
 
   private EventEmitter deployEventEmitterContract(final String privacyGroupId) {
@@ -123,7 +141,7 @@ private EventEmitter deployEventEmitterContract(final String privacyGroupId) {
             privateContractTransactions.createSmartContractWithPrivacyGroupId(
                 EventEmitter.class,
                 node.getTransactionSigningKey(),
-                POW_CHAIN_ID,
+                restriction,
                 node.getEnclaveKey(),
                 privacyGroupId));
 
@@ -143,7 +161,7 @@ private PrivateTransactionReceipt updateContractValue(
                 eventEmitterContract.getContractAddress(),
                 eventEmitterContract.store(BigInteger.valueOf(value)).encodeFunctionCall(),
                 node.getTransactionSigningKey(),
-                POW_CHAIN_ID,
+                restriction,
                 node.getEnclaveKey(),
                 privacyGroupId));
 
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivGetPrivateTransactionAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivGetPrivateTransactionAcceptanceTest.java
new file mode 100644
index 00000000000..91896761d09
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivGetPrivateTransactionAcceptanceTest.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.privacy;
+
+import static org.web3j.utils.Restriction.RESTRICTED;
+import static org.web3j.utils.Restriction.UNRESTRICTED;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.ParameterizedEnclaveTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccountResolver;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+import org.hyperledger.enclave.testutil.EnclaveType;
+
+import java.io.IOException;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Test;
+import org.testcontainers.containers.Network;
+import org.web3j.utils.Restriction;
+
+public class PrivGetPrivateTransactionAcceptanceTest extends ParameterizedEnclaveTestBase {
+
+  private final PrivacyNode alice;
+  private final PrivacyNode bob;
+
+  public PrivGetPrivateTransactionAcceptanceTest(
+      final Restriction restriction,
+      final EnclaveType enclaveType,
+      final EnclaveEncryptorType enclaveEncryptorType)
+      throws IOException {
+
+    super(restriction, enclaveType, enclaveEncryptorType);
+
+    final Network containerNetwork = Network.newNetwork();
+
+    alice =
+        privacyBesu.createIbft2NodePrivacyEnabled(
+            "node1",
+            PrivacyAccountResolver.ALICE.resolve(enclaveEncryptorType),
+            false,
+            enclaveType,
+            Optional.of(containerNetwork),
+            false,
+            false,
+            restriction == UNRESTRICTED,
+            "0xAA");
+    bob =
+        privacyBesu.createIbft2NodePrivacyEnabled(
+            "node2",
+            PrivacyAccountResolver.BOB.resolve(enclaveEncryptorType),
+            false,
+            enclaveType,
+            Optional.of(containerNetwork),
+            false,
+            false,
+            restriction == UNRESTRICTED,
+            "0xBB");
+
+    privacyCluster.start(alice, bob);
+  }
+
+  @Test
+  public void returnsTransaction() {
+    final Transaction<String> onlyAlice = createPrivacyGroup("Only Alice", "", alice);
+
+    final String privacyGroupId = alice.execute(onlyAlice);
+
+    final PrivateTransaction validSignedPrivateTransaction =
+        getValidSignedPrivateTransaction(alice, privacyGroupId);
+    final BytesValueRLPOutput rlpOutput = getRLPOutput(validSignedPrivateTransaction);
+
+    final Hash transactionHash =
+        alice.execute(privacyTransactions.sendRawTransaction(rlpOutput.encoded().toHexString()));
+
+    alice.getBesu().verify(eth.expectSuccessfulTransactionReceipt(transactionHash.toString()));
+
+    alice
+        .getBesu()
+        .verify(priv.getPrivateTransaction(transactionHash, validSignedPrivateTransaction));
+  }
+
+  @Test
+  public void nonExistentHashReturnsNull() {
+    alice.getBesu().verify(priv.getPrivateTransactionReturnsNull(Hash.ZERO));
+  }
+
+  @Test
+  public void returnsNullTransactionNotInNodesPrivacyGroup() {
+    final Transaction<String> onlyAlice = createPrivacyGroup("Only Alice", "", alice);
+
+    final String privacyGroupId = alice.execute(onlyAlice);
+
+    final PrivateTransaction validSignedPrivateTransaction =
+        getValidSignedPrivateTransaction(alice, privacyGroupId);
+    final BytesValueRLPOutput rlpOutput = getRLPOutput(validSignedPrivateTransaction);
+
+    final Hash transactionHash =
+        alice.execute(privacyTransactions.sendRawTransaction(rlpOutput.encoded().toHexString()));
+
+    alice.getBesu().verify(eth.expectSuccessfulTransactionReceipt(transactionHash.toString()));
+
+    bob.getBesu().verify(priv.getPrivateTransactionReturnsNull(transactionHash));
+  }
+
+  private BytesValueRLPOutput getRLPOutput(final PrivateTransaction privateTransaction) {
+    final BytesValueRLPOutput bvrlpo = new BytesValueRLPOutput();
+    privateTransaction.writeTo(bvrlpo);
+    return bvrlpo;
+  }
+
+  private PrivateTransaction getValidSignedPrivateTransaction(
+      final PrivacyNode node, final String privacyGoupId) {
+
+    org.hyperledger.besu.plugin.data.Restriction besuRestriction =
+        restriction == RESTRICTED
+            ? org.hyperledger.besu.plugin.data.Restriction.RESTRICTED
+            : org.hyperledger.besu.plugin.data.Restriction.UNRESTRICTED;
+
+    return PrivateTransaction.builder()
+        .nonce(0)
+        .gasPrice(Wei.of(999999))
+        .gasLimit(3000000)
+        .to(null)
+        .value(Wei.ZERO)
+        .payload(Bytes.wrap(new byte[] {}))
+        .sender(node.getAddress())
+        .privateFrom(Bytes.fromBase64String(node.getEnclaveKey()))
+        .restriction(besuRestriction)
+        .privacyGroupId(Bytes.fromBase64String(privacyGoupId))
+        .signAndBuild(node.getBesu().getPrivacyParameters().getSigningKeyPair().get());
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyClusterAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyClusterAcceptanceTest.java
new file mode 100644
index 00000000000..1284daf917e
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyClusterAcceptanceTest.java
@@ -0,0 +1,402 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.privacy;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.DEFAULT_PRIVACY;
+import static org.hyperledger.enclave.testutil.EnclaveEncryptorType.EC;
+import static org.hyperledger.enclave.testutil.EnclaveEncryptorType.NACL;
+import static org.hyperledger.enclave.testutil.EnclaveType.TESSERA;
+import static org.web3j.utils.Restriction.RESTRICTED;
+
+import org.hyperledger.besu.enclave.Enclave;
+import org.hyperledger.besu.enclave.EnclaveFactory;
+import org.hyperledger.besu.enclave.types.ReceiveResponse;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccountResolver;
+import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+import org.hyperledger.enclave.testutil.EnclaveType;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Optional;
+
+import io.vertx.core.Vertx;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+import org.testcontainers.containers.Network;
+import org.web3j.crypto.Credentials;
+import org.web3j.crypto.RawTransaction;
+import org.web3j.crypto.TransactionEncoder;
+import org.web3j.protocol.besu.response.privacy.PrivateTransactionReceipt;
+import org.web3j.protocol.eea.crypto.PrivateTransactionEncoder;
+import org.web3j.protocol.eea.crypto.RawPrivateTransaction;
+import org.web3j.utils.Base64String;
+import org.web3j.utils.Numeric;
+
+@RunWith(Parameterized.class)
+public class PrivacyClusterAcceptanceTest extends PrivacyAcceptanceTestBase {
+
+  private final PrivacyNode alice;
+  private final PrivacyNode bob;
+  private final PrivacyNode charlie;
+  private final EnclaveEncryptorType enclaveEncryptorType;
+  private final Vertx vertx = Vertx.vertx();
+  private final EnclaveFactory enclaveFactory = new EnclaveFactory(vertx);
+
+  @Parameters(name = "{0} enclave type with {1} encryptor")
+  public static Collection<Object[]> enclaveParameters() {
+    return Arrays.asList(
+        new Object[][] {
+          {TESSERA, NACL},
+          {TESSERA, EC}
+        });
+  }
+
+  public PrivacyClusterAcceptanceTest(
+      final EnclaveType enclaveType, final EnclaveEncryptorType enclaveEncryptorType)
+      throws IOException {
+    this.enclaveEncryptorType = enclaveEncryptorType;
+    final Network containerNetwork = Network.newNetwork();
+    alice =
+        privacyBesu.createPrivateTransactionEnabledMinerNode(
+            "node1",
+            PrivacyAccountResolver.ALICE.resolve(enclaveEncryptorType),
+            enclaveType,
+            Optional.of(containerNetwork),
+            false,
+            false,
+            false);
+    bob =
+        privacyBesu.createPrivateTransactionEnabledNode(
+            "node2",
+            PrivacyAccountResolver.BOB.resolve(enclaveEncryptorType),
+            enclaveType,
+            Optional.of(containerNetwork),
+            false,
+            false,
+            false);
+    charlie =
+        privacyBesu.createPrivateTransactionEnabledNode(
+            "node3",
+            PrivacyAccountResolver.CHARLIE.resolve(enclaveEncryptorType),
+            enclaveType,
+            Optional.of(containerNetwork),
+            false,
+            false,
+            false);
+    privacyCluster.start(alice, bob, charlie);
+  }
+
+  @After
+  public void cleanUp() {
+    vertx.close();
+  }
+
+  @Test
+  public void onlyAliceAndBobCanExecuteContract() {
+    // Contract address is generated from sender address and transaction nonce
+    final String contractAddress =
+        EnclaveEncryptorType.EC.equals(enclaveEncryptorType)
+            ? "0x3e5d325a03ad3ce5640502219833d30b89ce3ce1"
+            : "0xebf56429e6500e84442467292183d4d621359838";
+
+    final EventEmitter eventEmitter =
+        alice.execute(
+            privateContractTransactions.createSmartContract(
+                EventEmitter.class,
+                alice.getTransactionSigningKey(),
+                alice.getEnclaveKey(),
+                bob.getEnclaveKey()));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(contractAddress, alice.getAddress().toString())
+        .verify(eventEmitter);
+
+    final String transactionHash =
+        alice.execute(
+            privateContractTransactions.callSmartContract(
+                eventEmitter.getContractAddress(),
+                eventEmitter.store(BigInteger.ONE).encodeFunctionCall(),
+                alice.getTransactionSigningKey(),
+                RESTRICTED,
+                alice.getEnclaveKey(),
+                bob.getEnclaveKey()));
+
+    final PrivateTransactionReceipt expectedReceipt =
+        alice.execute(privacyTransactions.getPrivateTransactionReceipt(transactionHash));
+
+    bob.verify(
+        privateTransactionVerifier.validPrivateTransactionReceipt(
+            transactionHash, expectedReceipt));
+
+    charlie.verify(privateTransactionVerifier.noPrivateTransactionReceipt(transactionHash));
+
+    // When Alice executes a contract call in the wrong privacy group the transaction should pass
+    // but it should NOT return any output
+    final String transactionHash2 =
+        alice.execute(
+            privateContractTransactions.callSmartContract(
+                eventEmitter.getContractAddress(),
+                eventEmitter.value().encodeFunctionCall(),
+                alice.getTransactionSigningKey(),
+                RESTRICTED,
+                alice.getEnclaveKey(),
+                charlie.getEnclaveKey()));
+
+    final PrivateTransactionReceipt expectedReceipt2 =
+        alice.execute(privacyTransactions.getPrivateTransactionReceipt(transactionHash2));
+
+    assertThat(expectedReceipt2.getOutput()).isEqualTo("0x");
+
+    charlie.verify(
+        privateTransactionVerifier.validPrivateTransactionReceipt(
+            transactionHash2, expectedReceipt2));
+  }
+
+  @Test
+  public void aliceCanUsePrivDistributeTransaction() {
+    // Contract address is generated from sender address and transaction nonce
+    final String contractAddress =
+        EnclaveEncryptorType.EC.equals(enclaveEncryptorType)
+            ? "0x3e5d325a03ad3ce5640502219833d30b89ce3ce1"
+            : "0xebf56429e6500e84442467292183d4d621359838";
+
+    final RawPrivateTransaction rawPrivateTransaction =
+        RawPrivateTransaction.createContractTransaction(
+            BigInteger.ZERO,
+            BigInteger.ZERO,
+            BigInteger.ZERO,
+            Numeric.prependHexPrefix(EventEmitter.BINARY),
+            Base64String.wrap(alice.getEnclaveKey()),
+            Collections.singletonList(Base64String.wrap(bob.getEnclaveKey())),
+            RESTRICTED);
+
+    final String signedPrivateTransaction =
+        Numeric.toHexString(
+            PrivateTransactionEncoder.signMessage(
+                rawPrivateTransaction, Credentials.create(alice.getTransactionSigningKey())));
+    final String transactionKey =
+        alice.execute(privacyTransactions.privDistributeTransaction(signedPrivateTransaction));
+
+    final Enclave aliceEnclave = enclaveFactory.createVertxEnclave(alice.getEnclave().clientUrl());
+    final ReceiveResponse aliceRR =
+        aliceEnclave.receive(
+            Bytes.fromHexString(transactionKey).toBase64String(), alice.getEnclaveKey());
+
+    final Enclave bobEnclave = enclaveFactory.createVertxEnclave(bob.getEnclave().clientUrl());
+    final ReceiveResponse bobRR =
+        bobEnclave.receive(
+            Bytes.fromHexString(transactionKey).toBase64String(), bob.getEnclaveKey());
+
+    assertThat(bobRR).usingRecursiveComparison().isEqualTo(aliceRR);
+
+    final RawTransaction pmt =
+        RawTransaction.createTransaction(
+            BigInteger.ZERO,
+            BigInteger.valueOf(1000),
+            BigInteger.valueOf(65000),
+            DEFAULT_PRIVACY.toString(),
+            transactionKey);
+
+    final String signedPmt =
+        Numeric.toHexString(
+            TransactionEncoder.signMessage(
+                pmt, Credentials.create(alice.getTransactionSigningKey())));
+
+    final String transactionHash = alice.execute(ethTransactions.sendRawTransaction(signedPmt));
+
+    final String receiptPrivateFrom =
+        EnclaveEncryptorType.EC.equals(enclaveEncryptorType)
+            ? "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAES8nC4qT/KdoAoTSF3qs/47DUsDihyVbWiRjZAiyvqp9eSDkqV1RzlM+58oOwnpFRwvWNZM+AxMVxT+MvxdsqMA=="
+            : "A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
+    final ArrayList<String> receiptPrivateFor =
+        EnclaveEncryptorType.EC.equals(enclaveEncryptorType)
+            ? new ArrayList<>(
+                Collections.singletonList(
+                    "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEXIgZqRA25V+3nN+Do6b5r0jiUunub6ubjPhqwHpPxP44uUYh9RKCQNRnsqCJ9PjeTnC8R3ieJk7HWAlycU1bug=="))
+            : new ArrayList<>(
+                Collections.singletonList("Ko2bVqD+nNlNYL5EE7y3IdOnviftjiizpjRt+HTuFBs="));
+    final String receiptPrivacyGroupId =
+        EnclaveEncryptorType.EC.equals(enclaveEncryptorType)
+            ? "MjuFB4b9Hz+f8zvkWWasxZWRjHWXU4t7B2nOHo4mekA="
+            : "DyAOiF/ynpc+JXa2YAGB0bCitSlOMNm+ShmB/7M6C4w=";
+
+    final PrivateTransactionReceipt expectedReceipt =
+        new PrivateTransactionReceipt(
+            contractAddress,
+            "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+            null,
+            null, // ignored in the following call, checked separately below
+            Collections.emptyList(),
+            "0x023955c49d6265c579561940287449242704d5fd239ff07ea36a3fc7aface61c",
+            "0x82e521ee16ff13104c5f81e8354ecaaafd5450b710b07f620204032bfe76041a",
+            receiptPrivateFrom,
+            receiptPrivateFor,
+            receiptPrivacyGroupId,
+            "0x1",
+            null);
+
+    alice.verify(
+        privateTransactionVerifier.validPrivateTransactionReceipt(
+            transactionHash, expectedReceipt, true));
+
+    final PrivateTransactionReceipt alicePrivateTransactionReceipt =
+        alice.execute(privacyTransactions.getPrivateTransactionReceipt(transactionHash));
+    assertThat(EventEmitter.BINARY)
+        .contains(alicePrivateTransactionReceipt.getOutput().substring(2));
+
+    bob.verify(
+        privateTransactionVerifier.validPrivateTransactionReceipt(
+            transactionHash, expectedReceipt, true));
+
+    final PrivateTransactionReceipt bobPrivateTransactionReceipt =
+        bob.execute(privacyTransactions.getPrivateTransactionReceipt(transactionHash));
+    assertThat(EventEmitter.BINARY).contains(bobPrivateTransactionReceipt.getOutput().substring(2));
+  }
+
+  @Test
+  public void aliceCanDeployMultipleTimesInSingleGroup() {
+    final String firstDeployedAddress =
+        EnclaveEncryptorType.EC.equals(enclaveEncryptorType)
+            ? "0x3e5d325a03ad3ce5640502219833d30b89ce3ce1"
+            : "0xebf56429e6500e84442467292183d4d621359838";
+
+    final EventEmitter firstEventEmitter =
+        alice.execute(
+            privateContractTransactions.createSmartContract(
+                EventEmitter.class,
+                alice.getTransactionSigningKey(),
+                alice.getEnclaveKey(),
+                bob.getEnclaveKey()));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(firstDeployedAddress, alice.getAddress().toString())
+        .verify(firstEventEmitter);
+
+    final String secondDeployedAddress =
+        EnclaveEncryptorType.EC.equals(enclaveEncryptorType)
+            ? "0x5194e214fae257530710d18c868df7a295d9d53b"
+            : "0x10f807f8a905da5bd319196da7523c6bd768690f";
+
+    final EventEmitter secondEventEmitter =
+        alice.execute(
+            privateContractTransactions.createSmartContract(
+                EventEmitter.class,
+                alice.getTransactionSigningKey(),
+                alice.getEnclaveKey(),
+                bob.getEnclaveKey()));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(secondDeployedAddress, alice.getAddress().toString())
+        .verify(secondEventEmitter);
+  }
+
+  @Test
+  public void canInteractWithMultiplePrivacyGroups() {
+    // alice deploys contract
+    final String firstDeployedAddress =
+        EnclaveEncryptorType.EC.equals(enclaveEncryptorType)
+            ? "0x760359bc605b3848f5199829bde6b382d90fb8eb"
+            : "0xff206d21150a8da5b83629d8a722f3135ed532b1";
+
+    final EventEmitter firstEventEmitter =
+        alice.execute(
+            privateContractTransactions.createSmartContract(
+                EventEmitter.class,
+                alice.getTransactionSigningKey(),
+                alice.getEnclaveKey(),
+                bob.getEnclaveKey(),
+                charlie.getEnclaveKey()));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(firstDeployedAddress, alice.getAddress().toString())
+        .verify(firstEventEmitter);
+
+    // charlie interacts with contract
+    final String firstTransactionHash =
+        charlie.execute(
+            privateContractTransactions.callSmartContract(
+                firstEventEmitter.getContractAddress(),
+                firstEventEmitter.store(BigInteger.ONE).encodeFunctionCall(),
+                charlie.getTransactionSigningKey(),
+                RESTRICTED,
+                charlie.getEnclaveKey(),
+                alice.getEnclaveKey(),
+                bob.getEnclaveKey()));
+
+    // alice gets receipt from charlie's interaction
+    final PrivateTransactionReceipt firstExpectedReceipt =
+        alice.execute(privacyTransactions.getPrivateTransactionReceipt(firstTransactionHash));
+
+    // verify bob and charlie have access to the same receipt
+    bob.verify(
+        privateTransactionVerifier.validPrivateTransactionReceipt(
+            firstTransactionHash, firstExpectedReceipt));
+    charlie.verify(
+        privateTransactionVerifier.validPrivateTransactionReceipt(
+            firstTransactionHash, firstExpectedReceipt));
+
+    // alice deploys second contract
+    final String secondDeployedAddress =
+        EnclaveEncryptorType.EC.equals(enclaveEncryptorType)
+            ? "0x3e5d325a03ad3ce5640502219833d30b89ce3ce1"
+            : "0xebf56429e6500e84442467292183d4d621359838";
+
+    final EventEmitter secondEventEmitter =
+        alice.execute(
+            privateContractTransactions.createSmartContract(
+                EventEmitter.class,
+                alice.getTransactionSigningKey(),
+                alice.getEnclaveKey(),
+                bob.getEnclaveKey()));
+
+    privateContractVerifier
+        .validPrivateContractDeployed(secondDeployedAddress, alice.getAddress().toString())
+        .verify(secondEventEmitter);
+
+    // bob interacts with contract
+    final String secondTransactionHash =
+        bob.execute(
+            privateContractTransactions.callSmartContract(
+                secondEventEmitter.getContractAddress(),
+                secondEventEmitter.store(BigInteger.ONE).encodeFunctionCall(),
+                bob.getTransactionSigningKey(),
+                RESTRICTED,
+                bob.getEnclaveKey(),
+                alice.getEnclaveKey()));
+
+    // alice gets receipt from bob's interaction
+    final PrivateTransactionReceipt secondExpectedReceipt =
+        alice.execute(privacyTransactions.getPrivateTransactionReceipt(secondTransactionHash));
+
+    bob.verify(
+        privateTransactionVerifier.validPrivateTransactionReceipt(
+            secondTransactionHash, secondExpectedReceipt));
+
+    // charlie cannot see the receipt
+    charlie.verify(privateTransactionVerifier.noPrivateTransactionReceipt(secondTransactionHash));
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyGroupAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyGroupAcceptanceTest.java
new file mode 100644
index 00000000000..a1739b1fc8d
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyGroupAcceptanceTest.java
@@ -0,0 +1,251 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.privacy;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.enclave.testutil.EnclaveEncryptorType.EC;
+import static org.hyperledger.enclave.testutil.EnclaveEncryptorType.NACL;
+import static org.hyperledger.enclave.testutil.EnclaveType.TESSERA;
+import static org.web3j.utils.Restriction.RESTRICTED;
+
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccountResolver;
+import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
+import org.hyperledger.besu.util.LogConfigurator;
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+import org.hyperledger.enclave.testutil.EnclaveType;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Optional;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+import org.testcontainers.containers.Network;
+import org.web3j.protocol.besu.response.privacy.PrivacyGroup;
+import org.web3j.protocol.besu.response.privacy.PrivateTransactionReceipt;
+import org.web3j.utils.Base64String;
+
+@RunWith(Parameterized.class)
+public class PrivacyGroupAcceptanceTest extends PrivacyAcceptanceTestBase {
+
+  private final PrivacyNode alice;
+  private final PrivacyNode bob;
+  private final PrivacyNode charlie;
+
+  @Parameters(name = "{0} enclave type with {1} encryptor")
+  public static Collection<Object[]> enclaveParameters() {
+    return Arrays.asList(
+        new Object[][] {
+          {TESSERA, NACL},
+          {TESSERA, EC}
+        });
+  }
+
+  public PrivacyGroupAcceptanceTest(
+      final EnclaveType enclaveType, final EnclaveEncryptorType enclaveEncryptorType)
+      throws IOException {
+
+    final Network containerNetwork = Network.newNetwork();
+
+    alice =
+        privacyBesu.createPrivateTransactionEnabledMinerNode(
+            "node1",
+            PrivacyAccountResolver.ALICE.resolve(enclaveEncryptorType),
+            enclaveType,
+            Optional.of(containerNetwork),
+            false,
+            false,
+            false);
+    bob =
+        privacyBesu.createPrivateTransactionEnabledNode(
+            "node2",
+            PrivacyAccountResolver.BOB.resolve(enclaveEncryptorType),
+            enclaveType,
+            Optional.of(containerNetwork),
+            false,
+            false,
+            false);
+
+    charlie =
+        privacyBesu.createPrivateTransactionEnabledNode(
+            "node3",
+            PrivacyAccountResolver.CHARLIE.resolve(enclaveEncryptorType),
+            enclaveType,
+            Optional.of(containerNetwork),
+            false,
+            false,
+            false);
+    privacyCluster.start(alice, bob, charlie);
+  }
+
+  @Test
+  public void nodeCanCreatePrivacyGroup() {
+    LogConfigurator.setLevel("", "DEBUG");
+    final String privacyGroupId =
+        alice.execute(
+            privacyTransactions.createPrivacyGroup(
+                "myGroupName", "my group description", alice, bob));
+
+    assertThat(privacyGroupId).isNotNull();
+
+    final PrivacyGroup expected =
+        new PrivacyGroup(
+            privacyGroupId,
+            PrivacyGroup.Type.PANTHEON,
+            "myGroupName",
+            "my group description",
+            Base64String.wrapList(alice.getEnclaveKey(), bob.getEnclaveKey()));
+
+    alice.verify(privateTransactionVerifier.validPrivacyGroupCreated(expected));
+
+    bob.verify(privateTransactionVerifier.validPrivacyGroupCreated(expected));
+  }
+
+  @Test
+  public void nodeCanCreatePrivacyGroupWithoutName() {
+    final String privacyGroupId =
+        alice.execute(
+            privacyTransactions.createPrivacyGroup(null, "my group description", alice, bob));
+
+    assertThat(privacyGroupId).isNotNull();
+
+    final PrivacyGroup expected =
+        new PrivacyGroup(
+            privacyGroupId,
+            PrivacyGroup.Type.PANTHEON,
+            "",
+            "my group description",
+            Base64String.wrapList(alice.getEnclaveKey(), bob.getEnclaveKey()));
+
+    alice.verify(privateTransactionVerifier.validPrivacyGroupCreated(expected));
+
+    bob.verify(privateTransactionVerifier.validPrivacyGroupCreated(expected));
+  }
+
+  @Test
+  public void nodeCanCreatePrivacyGroupWithoutDescription() {
+    final String privacyGroupId =
+        alice.execute(privacyTransactions.createPrivacyGroup("myGroupName", null, alice, bob));
+
+    assertThat(privacyGroupId).isNotNull();
+
+    final PrivacyGroup expected =
+        new PrivacyGroup(
+            privacyGroupId,
+            PrivacyGroup.Type.PANTHEON,
+            "myGroupName",
+            "",
+            Base64String.wrapList(alice.getEnclaveKey(), bob.getEnclaveKey()));
+
+    alice.verify(privateTransactionVerifier.validPrivacyGroupCreated(expected));
+
+    bob.verify(privateTransactionVerifier.validPrivacyGroupCreated(expected));
+  }
+
+  @Test
+  public void nodeCanCreatePrivacyGroupWithoutOptionalParams() {
+    final String privacyGroupId =
+        alice.execute(privacyTransactions.createPrivacyGroup(null, null, alice));
+
+    assertThat(privacyGroupId).isNotNull();
+
+    final PrivacyGroup expected =
+        new PrivacyGroup(
+            privacyGroupId,
+            PrivacyGroup.Type.PANTHEON,
+            "",
+            "",
+            Base64String.wrapList(alice.getEnclaveKey()));
+
+    alice.verify(privateTransactionVerifier.validPrivacyGroupCreated(expected));
+  }
+
+  @Test
+  public void canInteractWithMultiplePrivacyGroups() {
+    final String privacyGroupIdABC =
+        alice.execute(privacyTransactions.createPrivacyGroup(null, null, alice, bob, charlie));
+
+    final EventEmitter firstEventEmitter =
+        alice.execute(
+            privateContractTransactions.createSmartContractWithPrivacyGroupId(
+                EventEmitter.class,
+                alice.getTransactionSigningKey(),
+                alice.getEnclaveKey(),
+                privacyGroupIdABC));
+
+    // charlie interacts with contract
+    final String firstTransactionHash =
+        charlie.execute(
+            privateContractTransactions.callSmartContractWithPrivacyGroupId(
+                firstEventEmitter.getContractAddress(),
+                firstEventEmitter.store(BigInteger.ONE).encodeFunctionCall(),
+                charlie.getTransactionSigningKey(),
+                RESTRICTED,
+                charlie.getEnclaveKey(),
+                privacyGroupIdABC));
+
+    // alice gets receipt from charlie's interaction
+    final PrivateTransactionReceipt firstExpectedReceipt =
+        alice.execute(privacyTransactions.getPrivateTransactionReceipt(firstTransactionHash));
+
+    // verify bob and charlie have access to the same receipt
+    bob.verify(
+        privateTransactionVerifier.validPrivateTransactionReceipt(
+            firstTransactionHash, firstExpectedReceipt));
+    charlie.verify(
+        privateTransactionVerifier.validPrivateTransactionReceipt(
+            firstTransactionHash, firstExpectedReceipt));
+
+    // alice deploys second contract
+    final String privacyGroupIdAB =
+        alice.execute(privacyTransactions.createPrivacyGroup(null, null, alice, bob));
+
+    final EventEmitter secondEventEmitter =
+        alice.execute(
+            privateContractTransactions.createSmartContractWithPrivacyGroupId(
+                EventEmitter.class,
+                alice.getTransactionSigningKey(),
+                alice.getEnclaveKey(),
+                privacyGroupIdAB));
+
+    // bob interacts with contract
+    final String secondTransactionHash =
+        bob.execute(
+            privateContractTransactions.callSmartContractWithPrivacyGroupId(
+                secondEventEmitter.getContractAddress(),
+                secondEventEmitter.store(BigInteger.ONE).encodeFunctionCall(),
+                bob.getTransactionSigningKey(),
+                RESTRICTED,
+                bob.getEnclaveKey(),
+                privacyGroupIdAB));
+
+    // alice gets receipt from bob's interaction
+    final PrivateTransactionReceipt secondExpectedReceipt =
+        alice.execute(privacyTransactions.getPrivateTransactionReceipt(secondTransactionHash));
+
+    bob.verify(
+        privateTransactionVerifier.validPrivateTransactionReceipt(
+            secondTransactionHash, secondExpectedReceipt));
+
+    // charlie cannot see the receipt
+    charlie.verify(privateTransactionVerifier.noPrivateTransactionReceipt(secondTransactionHash));
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyReceiptAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyReceiptAcceptanceTest.java
new file mode 100644
index 00000000000..0b45d29732a
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivacyReceiptAcceptanceTest.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.privacy;
+
+import static java.util.Optional.empty;
+import static org.web3j.utils.Restriction.RESTRICTED;
+import static org.web3j.utils.Restriction.UNRESTRICTED;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.ParameterizedEnclaveTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccountResolver;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.Transaction;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.miner.MinerTransactions;
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+import org.hyperledger.enclave.testutil.EnclaveType;
+
+import java.io.IOException;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Test;
+import org.web3j.utils.Restriction;
+
+public class PrivacyReceiptAcceptanceTest extends ParameterizedEnclaveTestBase {
+  final MinerTransactions minerTransactions = new MinerTransactions();
+
+  private final PrivacyNode alice;
+
+  public PrivacyReceiptAcceptanceTest(
+      final Restriction restriction,
+      final EnclaveType enclaveType,
+      final EnclaveEncryptorType enclaveEncryptorType)
+      throws IOException {
+    super(restriction, enclaveType, enclaveEncryptorType);
+
+    alice =
+        privacyBesu.createIbft2NodePrivacyEnabled(
+            "node1",
+            PrivacyAccountResolver.ALICE.resolve(enclaveEncryptorType),
+            false,
+            enclaveType,
+            Optional.empty(),
+            false,
+            false,
+            restriction == UNRESTRICTED,
+            "0xAA");
+    privacyCluster.start(alice);
+  }
+
+  @Test
+  public void createPrivateTransactionReceiptSuccessfulTransaction() {
+    final Transaction<String> onlyAlice = createPrivacyGroup("Only Alice", "", alice);
+
+    final String privacyGroupId = alice.execute(onlyAlice);
+
+    final PrivateTransaction validTransaction =
+        createSignedTransaction(alice, privacyGroupId, empty());
+    final BytesValueRLPOutput rlpOutput = getRLPOutput(validTransaction);
+
+    final Hash transactionHash =
+        alice.execute(privacyTransactions.sendRawTransaction(rlpOutput.encoded().toHexString()));
+
+    // Successful PMT
+    alice.getBesu().verify(eth.expectSuccessfulTransactionReceipt(transactionHash.toString()));
+    // Successful private transaction
+    alice.getBesu().verify(priv.getSuccessfulTransactionReceipt(transactionHash));
+  }
+
+  @Test
+  public void createPrivateTransactionReceiptFailedTransaction() {
+    final Transaction<String> onlyAlice = createPrivacyGroup("Only Alice", "", alice);
+
+    final String privacyGroupId = alice.execute(onlyAlice);
+
+    final PrivateTransaction invalidPayloadTransaction =
+        createSignedTransaction(
+            alice, privacyGroupId, Optional.of(Bytes.fromBase64String("invalidPayload")));
+    final BytesValueRLPOutput rlpOutput = getRLPOutput(invalidPayloadTransaction);
+
+    final Hash transactionHash =
+        alice.execute(privacyTransactions.sendRawTransaction(rlpOutput.encoded().toHexString()));
+
+    // Successful PMT
+    alice.getBesu().verify(eth.expectSuccessfulTransactionReceipt(transactionHash.toString()));
+    // Failed private transaction
+    alice.getBesu().verify(priv.getFailedTransactionReceipt(transactionHash));
+  }
+
+  @Test
+  public void createPrivateTransactionReceiptInvalidTransaction() {
+    final Transaction<String> onlyAlice = createPrivacyGroup("Only Alice", "", alice);
+
+    final String privacyGroupId = alice.execute(onlyAlice);
+
+    final PrivateTransaction validTransaction =
+        createSignedTransaction(alice, privacyGroupId, empty());
+    final BytesValueRLPOutput rlpOutput = getRLPOutput(validTransaction);
+
+    // Stop mining, to allow adding duplicate nonce block
+    alice.getBesu().execute(minerTransactions.minerStop());
+
+    final Hash transactionHash1 =
+        alice.execute(privacyTransactions.sendRawTransaction(rlpOutput.encoded().toHexString()));
+    final Hash transactionHash2 =
+        alice.execute(privacyTransactions.sendRawTransaction(rlpOutput.encoded().toHexString()));
+
+    // Start mining again
+    alice.getBesu().execute(minerTransactions.minerStart());
+
+    // Successful PMTs
+    alice.getBesu().verify(eth.expectSuccessfulTransactionReceipt(transactionHash1.toString()));
+    alice.getBesu().verify(eth.expectSuccessfulTransactionReceipt(transactionHash2.toString()));
+    // Successful first private transaction
+    alice.getBesu().verify(priv.getSuccessfulTransactionReceipt(transactionHash1));
+    // Invalid second private transaction
+    alice.getBesu().verify(priv.getInvalidTransactionReceipt(transactionHash2));
+  }
+
+  private BytesValueRLPOutput getRLPOutput(final PrivateTransaction privateTransaction) {
+    final BytesValueRLPOutput bvrlpo = new BytesValueRLPOutput();
+    privateTransaction.writeTo(bvrlpo);
+    return bvrlpo;
+  }
+
+  private PrivateTransaction createSignedTransaction(
+      final PrivacyNode node, final String privacyGoupId, final Optional<Bytes> payload) {
+
+    org.hyperledger.besu.plugin.data.Restriction besuRestriction =
+        restriction == RESTRICTED
+            ? org.hyperledger.besu.plugin.data.Restriction.RESTRICTED
+            : org.hyperledger.besu.plugin.data.Restriction.UNRESTRICTED;
+
+    final Bytes defaultPayload = Bytes.wrap(new byte[] {});
+    return PrivateTransaction.builder()
+        .nonce(0)
+        .gasPrice(Wei.of(999999))
+        .gasLimit(3000000)
+        .to(null)
+        .value(Wei.ZERO)
+        .payload(payload.orElse(defaultPayload))
+        .sender(node.getAddress())
+        .privateFrom(Bytes.fromBase64String(node.getEnclaveKey()))
+        .restriction(besuRestriction)
+        .privacyGroupId(Bytes.fromBase64String(privacyGoupId))
+        .signAndBuild(node.getBesu().getPrivacyParameters().getSigningKeyPair().get());
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivateContractPublicStateAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivateContractPublicStateAcceptanceTest.java
new file mode 100644
index 00000000000..83a7ce66d8b
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivateContractPublicStateAcceptanceTest.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.privacy;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.web3j.utils.Restriction.UNRESTRICTED;
+
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.ParameterizedEnclaveTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccountResolver;
+import org.hyperledger.besu.tests.web3j.generated.CrossContractReader;
+import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
+import org.hyperledger.besu.tests.web3j.generated.RemoteSimpleStorage;
+import org.hyperledger.besu.tests.web3j.generated.SimpleStorage;
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+import org.hyperledger.enclave.testutil.EnclaveType;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Optional;
+
+import org.junit.Test;
+import org.testcontainers.containers.Network;
+import org.web3j.protocol.besu.response.privacy.PrivateTransactionReceipt;
+import org.web3j.protocol.core.RemoteFunctionCall;
+import org.web3j.protocol.core.methods.response.TransactionReceipt;
+import org.web3j.protocol.exceptions.TransactionException;
+import org.web3j.tx.exceptions.ContractCallException;
+import org.web3j.utils.Restriction;
+
+public class PrivateContractPublicStateAcceptanceTest extends ParameterizedEnclaveTestBase {
+
+  private final PrivacyNode transactionNode;
+
+  public PrivateContractPublicStateAcceptanceTest(
+      final Restriction restriction,
+      final EnclaveType enclaveType,
+      final EnclaveEncryptorType enclaveEncryptorType)
+      throws IOException {
+    super(restriction, enclaveType, enclaveEncryptorType);
+    final Network containerNetwork = Network.newNetwork();
+
+    final PrivacyNode minerNode =
+        privacyBesu.createPrivateTransactionEnabledMinerNode(
+            restriction + "-miner-node",
+            PrivacyAccountResolver.ALICE.resolve(enclaveEncryptorType),
+            enclaveType,
+            Optional.of(containerNetwork),
+            false,
+            false,
+            restriction == UNRESTRICTED);
+
+    transactionNode =
+        privacyBesu.createPrivateTransactionEnabledNode(
+            restriction + "-transaction-node",
+            PrivacyAccountResolver.BOB.resolve(enclaveEncryptorType),
+            enclaveType,
+            Optional.of(containerNetwork),
+            false,
+            false,
+            restriction == UNRESTRICTED);
+
+    privacyCluster.start(minerNode, transactionNode);
+  }
+
+  @Test
+  public void mustAllowAccessToPublicStateFromPrivateTx() throws Exception {
+    final EventEmitter publicEventEmitter =
+        transactionNode.execute(contractTransactions.createSmartContract(EventEmitter.class));
+
+    final TransactionReceipt receipt = publicEventEmitter.store(BigInteger.valueOf(12)).send();
+    assertThat(receipt).isNotNull();
+
+    final CrossContractReader reader =
+        transactionNode.execute(
+            privateContractTransactions.createSmartContract(
+                CrossContractReader.class,
+                transactionNode.getTransactionSigningKey(),
+                transactionNode.getEnclaveKey()));
+
+    final RemoteFunctionCall<BigInteger> remoteFunctionCall =
+        reader.read(publicEventEmitter.getContractAddress());
+    final BigInteger result = remoteFunctionCall.send();
+
+    assertThat(result).isEqualTo(BigInteger.valueOf(12));
+  }
+
+  @Test
+  public void mustNotAllowAccessToPrivateStateFromPublicTx() throws Exception {
+    final EventEmitter privateEventEmitter =
+        transactionNode.execute(
+            (privateContractTransactions.createSmartContract(
+                EventEmitter.class,
+                transactionNode.getTransactionSigningKey(),
+                transactionNode.getEnclaveKey())));
+
+    final TransactionReceipt receipt = privateEventEmitter.store(BigInteger.valueOf(12)).send();
+    assertThat(receipt).isNotNull();
+
+    final CrossContractReader publicReader =
+        transactionNode.execute(
+            contractTransactions.createSmartContract(CrossContractReader.class));
+    final RemoteFunctionCall<BigInteger> functionCall =
+        publicReader.read(privateEventEmitter.getContractAddress());
+    assertThatThrownBy(functionCall::send).isInstanceOf(ContractCallException.class);
+  }
+
+  @Test
+  public void privateContractMustNotBeAbleToCallPublicContractWhichChangesState() throws Exception {
+    final CrossContractReader privateReader =
+        transactionNode.execute(
+            privateContractTransactions.createSmartContract(
+                CrossContractReader.class,
+                transactionNode.getTransactionSigningKey(),
+                transactionNode.getEnclaveKey()));
+
+    final CrossContractReader publicReader =
+        transactionNode.execute(
+            contractTransactions.createSmartContract(CrossContractReader.class));
+
+    assertThatExceptionOfType(TransactionException.class)
+        .isThrownBy(() -> privateReader.incrementRemote(publicReader.getContractAddress()).send())
+        .returns(
+            "0x", e -> ((PrivateTransactionReceipt) e.getTransactionReceipt().get()).getOutput());
+  }
+
+  @Test
+  public void privateContractMustNotBeAbleToCallPublicContractWhichInstantiatesContract()
+      throws Exception {
+    final CrossContractReader privateReader =
+        transactionNode.execute(
+            privateContractTransactions.createSmartContract(
+                CrossContractReader.class,
+                transactionNode.getTransactionSigningKey(),
+                transactionNode.getEnclaveKey()));
+
+    final CrossContractReader publicReader =
+        transactionNode.execute(
+            contractTransactions.createSmartContract(CrossContractReader.class));
+
+    assertThatExceptionOfType(TransactionException.class)
+        .isThrownBy(() -> privateReader.deployRemote(publicReader.getContractAddress()).send())
+        .returns(0, e -> e.getTransactionReceipt().get().getLogs().size());
+  }
+
+  @Test
+  public void privateContractMustNotBeAbleToCallSelfDestructOnPublicContract() throws Exception {
+    final CrossContractReader privateReader =
+        transactionNode.execute(
+            privateContractTransactions.createSmartContract(
+                CrossContractReader.class,
+                transactionNode.getTransactionSigningKey(),
+                transactionNode.getEnclaveKey()));
+
+    final CrossContractReader publicReader =
+        transactionNode
+            .getBesu()
+            .execute(contractTransactions.createSmartContract(CrossContractReader.class));
+
+    assertThatExceptionOfType(TransactionException.class)
+        .isThrownBy(() -> privateReader.remoteDestroy(publicReader.getContractAddress()).send())
+        .withMessage(
+            "Transaction null has failed with status: 0x0. Gas used: unknown. Revert reason: '0x'.")
+        .returns(
+            "0x", e -> ((PrivateTransactionReceipt) e.getTransactionReceipt().get()).getOutput());
+  }
+
+  @Test
+  public void privateContractCanCallPublicContractThatCallsPublicContract() throws Exception {
+    final SimpleStorage simpleStorage =
+        transactionNode
+            .getBesu()
+            .execute(contractTransactions.createSmartContract(SimpleStorage.class));
+
+    final RemoteSimpleStorage remoteSimpleStorage =
+        transactionNode
+            .getBesu()
+            .execute(contractTransactions.createSmartContract(RemoteSimpleStorage.class));
+
+    remoteSimpleStorage.setRemote(simpleStorage.getContractAddress()).send();
+
+    final RemoteSimpleStorage reallyRemoteSimpleStorage =
+        transactionNode
+            .getBesu()
+            .execute(contractTransactions.createSmartContract(RemoteSimpleStorage.class));
+
+    reallyRemoteSimpleStorage.setRemote(remoteSimpleStorage.getContractAddress()).send();
+
+    simpleStorage.set(BigInteger.valueOf(42)).send();
+
+    assertThat(simpleStorage.get().send()).isEqualTo(BigInteger.valueOf(42));
+    assertThat(remoteSimpleStorage.get().send()).isEqualTo(BigInteger.valueOf(42));
+    assertThat(reallyRemoteSimpleStorage.get().send()).isEqualTo(BigInteger.valueOf(42));
+
+    final RemoteSimpleStorage privateRemoteSimpleStorage =
+        transactionNode.execute(
+            privateContractTransactions.createSmartContract(
+                RemoteSimpleStorage.class,
+                transactionNode.getTransactionSigningKey(),
+                transactionNode.getEnclaveKey()));
+
+    privateRemoteSimpleStorage.setRemote(simpleStorage.getContractAddress()).send();
+    assertThat(privateRemoteSimpleStorage.get().send()).isEqualTo(BigInteger.valueOf(42));
+
+    privateRemoteSimpleStorage.setRemote(reallyRemoteSimpleStorage.getContractAddress()).send();
+    assertThat(privateRemoteSimpleStorage.get().send()).isEqualTo(BigInteger.valueOf(42));
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivateGenesisAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivateGenesisAcceptanceTest.java
new file mode 100644
index 00000000000..29d5b655e3c
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivateGenesisAcceptanceTest.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.privacy;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.web3j.utils.Restriction.RESTRICTED;
+import static org.web3j.utils.Restriction.UNRESTRICTED;
+
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.ParameterizedEnclaveTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccountResolver;
+import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+import org.hyperledger.enclave.testutil.EnclaveType;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Optional;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.web3j.protocol.core.methods.response.EthCall;
+import org.web3j.utils.Restriction;
+
+@RunWith(Parameterized.class)
+public class PrivateGenesisAcceptanceTest extends ParameterizedEnclaveTestBase {
+  private final PrivacyNode alice;
+
+  public PrivateGenesisAcceptanceTest(
+      final Restriction restriction,
+      final EnclaveType enclaveType,
+      final EnclaveEncryptorType enclaveEncryptorType)
+      throws IOException {
+
+    super(restriction, enclaveType, enclaveEncryptorType);
+
+    alice =
+        privacyBesu.createIbft2NodePrivacyEnabledWithGenesis(
+            "node1",
+            PrivacyAccountResolver.ALICE.resolve(enclaveEncryptorType),
+            true,
+            enclaveType,
+            Optional.empty(),
+            false,
+            false,
+            restriction == UNRESTRICTED,
+            "AA");
+
+    privacyCluster.start(alice);
+  }
+
+  @Test
+  public void canInteractWithPrivateGenesisPreCompile() throws Exception {
+    final String privacyGroupId = createPrivacyGroup();
+
+    final EventEmitter eventEmitter =
+        alice.execute(
+            privateContractTransactions.loadSmartContractWithPrivacyGroupId(
+                "0x1000000000000000000000000000000000000001",
+                EventEmitter.class,
+                alice.getTransactionSigningKey(),
+                alice.getEnclaveKey(),
+                privacyGroupId));
+
+    eventEmitter.store(BigInteger.valueOf(42)).send();
+
+    final EthCall response =
+        alice.execute(
+            privacyTransactions.privCall(
+                privacyGroupId, eventEmitter, eventEmitter.value().encodeFunctionCall()));
+
+    final String value = response.getValue();
+
+    assertThat(new BigInteger(value.substring(2), 16)).isEqualByComparingTo(BigInteger.valueOf(42));
+  }
+
+  private String createPrivacyGroup() {
+    if (restriction == RESTRICTED) {
+      return alice.execute(privacyTransactions.createPrivacyGroup("name", "description", alice));
+    } else if (restriction == UNRESTRICTED) {
+      return "gsvwYfGPurL7wgXKmgFtCamXarAl9fA5jaSXi8TLpJw=";
+    } else {
+      throw new RuntimeException("Do not know how to handle " + restriction);
+    }
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivateLogFilterAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivateLogFilterAcceptanceTest.java
similarity index 79%
rename from acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivateLogFilterAcceptanceTest.java
rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivateLogFilterAcceptanceTest.java
index 92ea8930496..a6837f95465 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivateLogFilterAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/PrivateLogFilterAcceptanceTest.java
@@ -12,34 +12,53 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.tests.web3j.privacy;
+package org.hyperledger.besu.tests.acceptance.privacy;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.web3j.utils.Restriction.UNRESTRICTED;
 
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.ParameterizedEnclaveTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccountResolver;
 import org.hyperledger.besu.tests.acceptance.dsl.privacy.util.LogFilterJsonParameter;
 import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+import org.hyperledger.enclave.testutil.EnclaveType;
 
+import java.io.IOException;
 import java.math.BigInteger;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.web3j.protocol.besu.response.privacy.PrivateTransactionReceipt;
 import org.web3j.protocol.core.methods.response.EthLog.LogResult;
+import org.web3j.utils.Restriction;
 
 @SuppressWarnings("rawtypes")
-public class PrivateLogFilterAcceptanceTest extends PrivacyAcceptanceTestBase {
+public class PrivateLogFilterAcceptanceTest extends ParameterizedEnclaveTestBase {
 
-  private PrivacyNode node;
+  private final PrivacyNode node;
+
+  public PrivateLogFilterAcceptanceTest(
+      final Restriction restriction,
+      final EnclaveType enclaveType,
+      final EnclaveEncryptorType enclaveEncryptorType)
+      throws IOException {
+
+    super(restriction, enclaveType, enclaveEncryptorType);
 
-  @Before
-  public void setUp() throws Exception {
     node =
         privacyBesu.createPrivateTransactionEnabledMinerNode(
-            "miner-node", privacyAccountResolver.resolve(0));
+            restriction + "-node",
+            PrivacyAccountResolver.ALICE.resolve(enclaveEncryptorType),
+            enclaveType,
+            Optional.empty(),
+            false,
+            false,
+            restriction == UNRESTRICTED);
+
     privacyCluster.start(node);
   }
 
@@ -104,8 +123,7 @@ private LogFilterJsonParameter blockRangeLogFilter(
   }
 
   private String createPrivacyGroup() {
-    return node.execute(
-        privacyTransactions.createPrivacyGroup("myGroupName", "my group description", node));
+    return node.execute(createPrivacyGroup("myGroupName", "my group description", node));
   }
 
   private EventEmitter deployEventEmitterContract(final String privacyGroupId) {
@@ -114,7 +132,7 @@ private EventEmitter deployEventEmitterContract(final String privacyGroupId) {
             privateContractTransactions.createSmartContractWithPrivacyGroupId(
                 EventEmitter.class,
                 node.getTransactionSigningKey(),
-                POW_CHAIN_ID,
+                restriction,
                 node.getEnclaveKey(),
                 privacyGroupId));
 
@@ -134,7 +152,7 @@ private PrivateTransactionReceipt updateContractValue(
                 eventEmitterContract.getContractAddress(),
                 eventEmitterContract.store(BigInteger.valueOf(value)).encodeFunctionCall(),
                 node.getTransactionSigningKey(),
-                POW_CHAIN_ID,
+                restriction,
                 node.getEnclaveKey(),
                 privacyGroupId));
 
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/contracts/PrivacyGroupTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/contracts/PrivacyGroupTest.java
similarity index 76%
rename from acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/contracts/PrivacyGroupTest.java
rename to acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/contracts/PrivacyGroupTest.java
index 53076db2ca6..b805fa43c4e 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/contracts/PrivacyGroupTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/contracts/PrivacyGroupTest.java
@@ -12,11 +12,12 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.tests.web3j.privacy.contracts;
+package org.hyperledger.besu.tests.acceptance.privacy.contracts;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.hyperledger.besu.privacy.contracts.generated.DefaultOnChainPrivacyGroupManagementContract;
+import org.hyperledger.besu.privacy.contracts.generated.DefaultFlexiblePrivacyGroupManagementContract;
 import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
 
@@ -24,8 +25,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.web3j.protocol.core.RemoteFunctionCall;
 import org.web3j.protocol.core.methods.response.TransactionReceipt;
 import org.web3j.protocol.exceptions.TransactionException;
@@ -40,13 +41,13 @@ public class PrivacyGroupTest extends AcceptanceTestBase {
       Base64String.wrap("Ko2bVqD+nNlNYL5EE7y3IdOnviftjiizpjRt+HTuFBs=");
   private final Base64String thirdParticipant =
       Base64String.wrap("Jo2bVqD+nNlNYL5EE7y3IdOnviftjiizpjRt+HTuFBs=");
-  private DefaultOnChainPrivacyGroupManagementContract defaultPrivacyGroupManagementContract;
+  private DefaultFlexiblePrivacyGroupManagementContract defaultPrivacyGroupManagementContract;
 
   private static final String RAW_FIRST_PARTICIPANT = "0x5aa68ac0";
   private static final String RAW_ADD_PARTICIPANT =
-      "0xb4926e25000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000012a8d9b56a0fe9cd94d60be4413bcb721d3a7be27ed8e28b3a6346df874ee141b";
+      "0x965a25ef00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202a8d9b56a0fe9cd94d60be4413bcb721d3a7be27ed8e28b3a6346df874ee141b";
   private static final String RAW_REMOVE_PARTICIPANT =
-      "0xfd0177972a8d9b56a0fe9cd94d60be4413bcb721d3a7be27ed8e28b3a6346df874ee141b";
+      "0x1f52a8ee000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000202a8d9b56a0fe9cd94d60be4413bcb721d3a7be27ed8e28b3a6346df874ee141b";
   private static final String RAW_LOCK = "0xf83d08ba";
   private static final String RAW_UNLOCK = "0xa69df4b5";
   private static final String RAW_CAN_EXECUTE = "0x78b90337";
@@ -54,14 +55,14 @@ public class PrivacyGroupTest extends AcceptanceTestBase {
 
   private BesuNode minerNode;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     minerNode = besu.createMinerNode("node");
     cluster.start(minerNode);
     defaultPrivacyGroupManagementContract =
         minerNode.execute(
             contractTransactions.createSmartContract(
-                DefaultOnChainPrivacyGroupManagementContract.class));
+                DefaultFlexiblePrivacyGroupManagementContract.class));
   }
 
   @Test
@@ -72,28 +73,28 @@ public void rlp() throws Exception {
         .validTransactionReceipt(contractAddress)
         .verify(defaultPrivacyGroupManagementContract);
     // 0x0b0235be
-    assertThat(RAW_FIRST_PARTICIPANT)
-        .isEqualTo(defaultPrivacyGroupManagementContract.getParticipants().encodeFunctionCall());
+    assertThat(defaultPrivacyGroupManagementContract.getParticipants().encodeFunctionCall())
+        .isEqualTo(RAW_FIRST_PARTICIPANT);
     // 0xf744b089
-    assertThat(RAW_ADD_PARTICIPANT)
-        .isEqualTo(
+    assertThat(
             defaultPrivacyGroupManagementContract
                 .addParticipants(Collections.singletonList(secondParticipant.raw()))
-                .encodeFunctionCall());
+                .encodeFunctionCall())
+        .isEqualTo(RAW_ADD_PARTICIPANT);
     // 0xf744b089
-    assertThat(RAW_REMOVE_PARTICIPANT)
-        .isEqualTo(
+    assertThat(
             defaultPrivacyGroupManagementContract
                 .removeParticipant(secondParticipant.raw())
-                .encodeFunctionCall());
-    assertThat(RAW_LOCK)
-        .isEqualTo(defaultPrivacyGroupManagementContract.lock().encodeFunctionCall());
-    assertThat(RAW_UNLOCK)
-        .isEqualTo(defaultPrivacyGroupManagementContract.unlock().encodeFunctionCall());
-    assertThat(RAW_CAN_EXECUTE)
-        .isEqualTo(defaultPrivacyGroupManagementContract.canExecute().encodeFunctionCall());
-    assertThat(RAW_GET_VERSION)
-        .isEqualTo(defaultPrivacyGroupManagementContract.getVersion().encodeFunctionCall());
+                .encodeFunctionCall())
+        .isEqualTo(RAW_REMOVE_PARTICIPANT);
+    assertThat(defaultPrivacyGroupManagementContract.lock().encodeFunctionCall())
+        .isEqualTo(RAW_LOCK);
+    assertThat(defaultPrivacyGroupManagementContract.unlock().encodeFunctionCall())
+        .isEqualTo(RAW_UNLOCK);
+    assertThat(defaultPrivacyGroupManagementContract.canExecute().encodeFunctionCall())
+        .isEqualTo(RAW_CAN_EXECUTE);
+    assertThat(defaultPrivacyGroupManagementContract.getVersion().encodeFunctionCall())
+        .isEqualTo(RAW_GET_VERSION);
   }
 
   @Test
@@ -126,15 +127,18 @@ public void canRemoveParticipant() throws Exception {
     assertThat(firstParticipant.raw()).isEqualTo(participantsAfterRemove.get(0));
   }
 
-  @Test(expected = TransactionException.class)
+  @Test
   public void cannotAddToContractWhenNotLocked() throws Exception {
     defaultPrivacyGroupManagementContract
         .addParticipants(Collections.singletonList(thirdParticipant.raw()))
         .send();
 
-    defaultPrivacyGroupManagementContract
-        .addParticipants(Collections.singletonList(secondParticipant.raw()))
-        .send();
+    assertThatThrownBy(
+            () ->
+                defaultPrivacyGroupManagementContract
+                    .addParticipants(Collections.singletonList(secondParticipant.raw()))
+                    .send())
+        .isInstanceOf(TransactionException.class);
   }
 
   @Test
@@ -179,12 +183,13 @@ public void canAddTwiceToContractWhenCallLock() throws Exception {
     assertThat(secondParticipant.raw()).isEqualTo(participants.get(2));
   }
 
-  @Test(expected = TransactionException.class)
+  @Test
   public void cannotLockTwice() throws Exception {
     defaultPrivacyGroupManagementContract
         .addParticipants(Collections.singletonList(thirdParticipant.raw()))
         .send();
     defaultPrivacyGroupManagementContract.lock().send();
-    defaultPrivacyGroupManagementContract.lock().send();
+    assertThatThrownBy(() -> defaultPrivacyGroupManagementContract.lock().send())
+        .isInstanceOf(TransactionException.class);
   }
 }
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/contracts/PrivacyProxyTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/contracts/PrivacyProxyTest.java
new file mode 100644
index 00000000000..931770ee321
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/contracts/PrivacyProxyTest.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.privacy.contracts;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.hyperledger.besu.privacy.contracts.generated.DefaultFlexiblePrivacyGroupManagementContract;
+import org.hyperledger.besu.privacy.contracts.generated.FlexiblePrivacyGroupManagementProxy;
+import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
+import org.hyperledger.besu.tests.acceptance.dsl.account.Accounts;
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.web3j.crypto.Credentials;
+import org.web3j.protocol.Web3j;
+import org.web3j.protocol.exceptions.TransactionException;
+import org.web3j.protocol.http.HttpService;
+import org.web3j.tx.gas.DefaultGasProvider;
+import org.web3j.utils.Base64String;
+
+@SuppressWarnings("unchecked")
+public class PrivacyProxyTest extends AcceptanceTestBase {
+
+  private final Base64String firstParticipant =
+      Base64String.wrap("93Ky7lXwFkMc7+ckoFgUMku5bpr9tz4zhmWmk9RlNng=");
+  private final Base64String secondParticipant =
+      Base64String.wrap("9iaJ6OObl6TUWYjXAOyZsL0VaDPwF+tRFkMwwYSeqqw=");
+  private final Base64String thirdParticipant =
+      Base64String.wrap("Jo2bVqD+nNlNYL5EE7y3IdOnviftjiizpjRt+HTuFBs=");
+  private FlexiblePrivacyGroupManagementProxy flexiblePrivacyGroupManagementProxy;
+
+  private static final String RAW_GET_PARTICIPANTS = "0x5aa68ac0";
+  private static final String RAW_ADD_PARTICIPANT =
+      "0x965a25ef0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020f772b2ee55f016431cefe724a05814324bb96e9afdb73e338665a693d4653678";
+
+  private BesuNode minerNode;
+  private DefaultFlexiblePrivacyGroupManagementContract
+      defaultFlexiblePrivacyGroupManagementContract;
+
+  @BeforeEach
+  public void setUp() throws Exception {
+    minerNode = besu.createMinerNode("node");
+    cluster.start(minerNode);
+    defaultFlexiblePrivacyGroupManagementContract =
+        minerNode.execute(
+            contractTransactions.createSmartContract(
+                DefaultFlexiblePrivacyGroupManagementContract.class));
+    flexiblePrivacyGroupManagementProxy =
+        minerNode.execute(
+            contractTransactions.createSmartContract(
+                FlexiblePrivacyGroupManagementProxy.class,
+                defaultFlexiblePrivacyGroupManagementContract.getContractAddress()));
+  }
+
+  @Test
+  public void rlp() throws Exception {
+    assertThat(flexiblePrivacyGroupManagementProxy.isValid()).isEqualTo(true);
+    contractVerifier
+        .validTransactionReceipt(flexiblePrivacyGroupManagementProxy.getContractAddress())
+        .verify(flexiblePrivacyGroupManagementProxy);
+    assertThat(flexiblePrivacyGroupManagementProxy.getParticipants().encodeFunctionCall())
+        .isEqualTo(RAW_GET_PARTICIPANTS);
+
+    assertThat(
+            flexiblePrivacyGroupManagementProxy
+                .addParticipants(List.of(firstParticipant.raw()))
+                .encodeFunctionCall())
+        .isEqualTo(RAW_ADD_PARTICIPANT);
+  }
+
+  @Test
+  public void deploysWithNoParticipant() throws Exception {
+    final List<byte[]> participants = flexiblePrivacyGroupManagementProxy.getParticipants().send();
+    assertThat(participants.size()).isEqualTo(0);
+  }
+
+  @Test
+  public void canAddParticipants() throws Exception {
+    flexiblePrivacyGroupManagementProxy
+        .addParticipants(Arrays.asList(firstParticipant.raw(), secondParticipant.raw()))
+        .send();
+    final List<byte[]> participants = flexiblePrivacyGroupManagementProxy.getParticipants().send();
+    assertThat(participants.size()).isEqualTo(2);
+    assertThat(firstParticipant.raw()).isEqualTo(participants.get(0));
+    assertThat(secondParticipant.raw()).isEqualTo(participants.get(1));
+  }
+
+  @Test
+  public void nonOwnerCannotUpgrade() throws Exception {
+    flexiblePrivacyGroupManagementProxy
+        .addParticipants(Arrays.asList(firstParticipant.raw(), secondParticipant.raw()))
+        .send();
+    final List<byte[]> participants = flexiblePrivacyGroupManagementProxy.getParticipants().send();
+    assertThat(participants.size()).isEqualTo(2);
+    assertThat(firstParticipant.raw()).isEqualTo(participants.get(0));
+    assertThat(secondParticipant.raw()).isEqualTo(participants.get(1));
+
+    final DefaultFlexiblePrivacyGroupManagementContract upgradedContract =
+        minerNode.execute(
+            contractTransactions.createSmartContract(
+                DefaultFlexiblePrivacyGroupManagementContract.class));
+
+    final HttpService httpService =
+        new HttpService(
+            "http://" + minerNode.getHostName() + ":" + minerNode.getJsonRpcPort().get());
+    final Web3j web3j = Web3j.build(httpService);
+
+    // load the proxy contract, use it with another signer
+    final FlexiblePrivacyGroupManagementProxy proxyContractAccount2 =
+        FlexiblePrivacyGroupManagementProxy.load(
+            flexiblePrivacyGroupManagementProxy.getContractAddress(),
+            web3j,
+            Credentials.create(Accounts.GENESIS_ACCOUNT_TWO_PRIVATE_KEY),
+            new DefaultGasProvider());
+    // contract is the proxy contract and uses genesis account 2. It should not be able to upgrade
+    // the contract, because it is not the owner of "upgradedContract"
+    assertThatThrownBy(
+            () -> proxyContractAccount2.upgradeTo(upgradedContract.getContractAddress()).send())
+        .isInstanceOf(TransactionException.class);
+  }
+
+  @Test
+  public void ownerCanUpgrade() throws Exception {
+    flexiblePrivacyGroupManagementProxy
+        .addParticipants(Arrays.asList(firstParticipant.raw(), secondParticipant.raw()))
+        .send();
+    final List<byte[]> participants = flexiblePrivacyGroupManagementProxy.getParticipants().send();
+    assertThat(participants.size()).isEqualTo(2);
+    assertThat(firstParticipant.raw()).isEqualTo(participants.get(0));
+    assertThat(secondParticipant.raw()).isEqualTo(participants.get(1));
+
+    final DefaultFlexiblePrivacyGroupManagementContract upgradedContract =
+        minerNode.execute(
+            contractTransactions.createSmartContract(
+                DefaultFlexiblePrivacyGroupManagementContract.class));
+
+    flexiblePrivacyGroupManagementProxy.upgradeTo(upgradedContract.getContractAddress()).send();
+    final List<byte[]> participantsAfterUpgrade =
+        flexiblePrivacyGroupManagementProxy.getParticipants().send();
+    assertThat(participantsAfterUpgrade.size()).isEqualTo(2);
+    assertThat(firstParticipant.raw()).isEqualTo(participantsAfterUpgrade.get(0));
+    assertThat(secondParticipant.raw()).isEqualTo(participantsAfterUpgrade.get(1));
+  }
+
+  @Test
+  public void canAddTwiceToContractWhenCallLock() throws Exception {
+    flexiblePrivacyGroupManagementProxy
+        .addParticipants(Arrays.asList(firstParticipant.raw(), thirdParticipant.raw()))
+        .send();
+    flexiblePrivacyGroupManagementProxy.lock().send();
+    flexiblePrivacyGroupManagementProxy
+        .addParticipants(Collections.singletonList(secondParticipant.raw()))
+        .send();
+    final List<byte[]> participants = flexiblePrivacyGroupManagementProxy.getParticipants().send();
+    assertThat(participants.size()).isEqualTo(3);
+    assertThat(firstParticipant.raw()).isEqualTo(participants.get(0));
+    assertThat(thirdParticipant.raw()).isEqualTo(participants.get(1));
+    assertThat(secondParticipant.raw()).isEqualTo(participants.get(2));
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/multitenancy/FlexibleMultiTenancyAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/multitenancy/FlexibleMultiTenancyAcceptanceTest.java
new file mode 100644
index 00000000000..da692f21ba1
--- /dev/null
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/multitenancy/FlexibleMultiTenancyAcceptanceTest.java
@@ -0,0 +1,491 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.tests.acceptance.privacy.multitenancy;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hyperledger.enclave.testutil.EnclaveEncryptorType.EC;
+import static org.hyperledger.enclave.testutil.EnclaveEncryptorType.NACL;
+import static org.hyperledger.enclave.testutil.EnclaveType.TESSERA;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccountResolver;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.contract.CallPrivateSmartContractFunction;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction.CreateFlexiblePrivacyGroupTransaction;
+import org.hyperledger.besu.tests.acceptance.dsl.privacy.util.LogFilterJsonParameter;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.PermissioningTransactions;
+import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.PrivacyRequestFactory;
+import org.hyperledger.besu.tests.acceptance.privacy.FlexiblePrivacyAcceptanceTestBase;
+import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+import org.hyperledger.enclave.testutil.EnclaveType;
+
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.web3j.crypto.Credentials;
+import org.web3j.protocol.besu.response.privacy.PrivateTransactionReceipt;
+import org.web3j.protocol.core.methods.response.EthCall;
+import org.web3j.utils.Base64String;
+import org.web3j.utils.Restriction;
+
+@RunWith(Parameterized.class)
+public class FlexibleMultiTenancyAcceptanceTest extends FlexiblePrivacyAcceptanceTestBase {
+
+  private final EnclaveType enclaveType;
+  private final EnclaveEncryptorType enclaveEncryptorType;
+
+  public FlexibleMultiTenancyAcceptanceTest(
+      final EnclaveType enclaveType, final EnclaveEncryptorType enclaveEncryptorType) {
+    this.enclaveType = enclaveType;
+    this.enclaveEncryptorType = enclaveEncryptorType;
+  }
+
+  @Parameterized.Parameters(name = "{0} enclave type with {1} encryptor")
+  public static Collection<Object[]> enclaveParameters() {
+    return Arrays.asList(
+        new Object[][] {
+          {TESSERA, NACL},
+          {TESSERA, EC}
+        });
+  }
+
+  private static final PermissioningTransactions permissioningTransactions =
+      new PermissioningTransactions();
+  private static final long VALUE_SET = 10L;
+
+  private PrivacyNode alice;
+  private MultiTenancyPrivacyNode aliceMultiTenancyPrivacyNode;
+
+  @Before
+  public void setUp() throws Exception {
+    alice =
+        privacyBesu.createFlexiblePrivacyGroupEnabledMinerNode(
+            "node1",
+            PrivacyAccountResolver.MULTI_TENANCY.resolve(enclaveEncryptorType),
+            true,
+            enclaveType,
+            Optional.empty());
+    final BesuNode aliceBesu = alice.getBesu();
+    privacyCluster.startNodes(alice);
+    final String alice1Token =
+        aliceBesu.execute(permissioningTransactions.createSuccessfulLogin("user", "pegasys"));
+    aliceBesu.useAuthenticationTokenInHeaderForJsonRpc(alice1Token);
+    final String alice2Token =
+        aliceBesu.execute(permissioningTransactions.createSuccessfulLogin("user2", "Password2"));
+    final String alice3Token =
+        aliceBesu.execute(permissioningTransactions.createSuccessfulLogin("user3", "Password3"));
+    privacyCluster.awaitPeerCount(alice);
+
+    final String alice1EnclaveKey = alice.getEnclave().getPublicKeys().get(0);
+    final String alice2EnclaveKey = alice.getEnclave().getPublicKeys().get(1);
+    final String alice3EnclaveKey = alice.getEnclave().getPublicKeys().get(2);
+
+    aliceMultiTenancyPrivacyNode = new MultiTenancyPrivacyNode(alice);
+    aliceMultiTenancyPrivacyNode
+        .addTenantWithToken(alice1EnclaveKey, alice1Token)
+        .addTenantWithToken(alice2EnclaveKey, alice2Token)
+        .addTenantWithToken(alice3EnclaveKey, alice3Token);
+  }
+
+  @After
+  public void tearDown() {
+    privacyCluster.close();
+  }
+
+  @Test
+  public void createPrivacyGroup() {
+    createFlexiblePrivacyGroup(alice);
+  }
+
+  @Test
+  public void createPrivacyGroupWithAllTenants() {
+    final MultiTenancyPrivacyGroup privacyGroup = new MultiTenancyPrivacyGroup();
+    privacyGroup.addNodeWithTenants(
+        aliceMultiTenancyPrivacyNode, aliceMultiTenancyPrivacyNode.getTenants());
+    createFlexiblePrivacyGroup(privacyGroup);
+  }
+
+  @Test
+  public void noAccessWhenNotAMember() {
+    final MultiTenancyPrivacyGroup twoTenantsFromAlice = new MultiTenancyPrivacyGroup();
+    final List<String> tenants = aliceMultiTenancyPrivacyNode.getTenants();
+    final String removedTenant = tenants.remove(tenants.size() - 1);
+    twoTenantsFromAlice.addNodeWithTenants(aliceMultiTenancyPrivacyNode, tenants);
+    final String privacyGroupId = createFlexiblePrivacyGroup(twoTenantsFromAlice);
+
+    final MultiTenancyPrivacyNode multiTenancyPrivacyNode =
+        twoTenantsFromAlice.getPrivacyNodes().get(0);
+    final String tenant = tenants.get(0);
+    final PrivacyNode privacyNode = multiTenancyPrivacyNode.getPrivacyNode();
+    final BesuNode privacyNodeBesu = privacyNode.getBesu();
+    privacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
+        multiTenancyPrivacyNode.getTokenForTenant(tenant));
+    final EventEmitter eventEmitter =
+        privacyNode.execute(
+            privateContractTransactions.createSmartContractWithPrivacyGroupId(
+                EventEmitter.class,
+                privacyNode.getTransactionSigningKey(),
+                tenant,
+                privacyGroupId));
+
+    final String transactionHash = getContractDeploymentCommitmentHash(eventEmitter);
+
+    // check that a member can get the transaction receipt
+    privacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
+        multiTenancyPrivacyNode.getTokenForTenant(tenant));
+    privacyNode.verify(
+        privateTransactionVerifier.validPrivateTransactionReceipt(
+            transactionHash,
+            (PrivateTransactionReceipt) eventEmitter.getTransactionReceipt().get()));
+    final String actual =
+        privacyNode
+            .execute(
+                privacyTransactions.privGetCode(
+                    privacyGroupId,
+                    Address.fromHexString(eventEmitter.getContractAddress()),
+                    "latest"))
+            .toHexString();
+    assertThat(EventEmitter.BINARY).contains(actual.substring(2));
+
+    // check that getting the transaction receipt does not work if you are not a member
+    privacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
+        multiTenancyPrivacyNode.getTokenForTenant(removedTenant));
+    privacyNode.verify(
+        privateTransactionVerifier.noPrivateTransactionReceipt(
+            transactionHash)); // returning null because the RPC is using the enclave key
+
+    // check that getting the code of the event emitter does not work when you are not a member
+    assertThatThrownBy(
+            () ->
+                privacyNode.execute(
+                    privacyTransactions.privGetCode(
+                        privacyGroupId,
+                        Address.fromHexString(eventEmitter.getContractAddress()),
+                        "latest")))
+        .hasMessageContaining("Unauthorized");
+
+    final LogFilterJsonParameter filterParameter =
+        new LogFilterJsonParameter(
+            "earliest",
+            "latest",
+            List.of(eventEmitter.getContractAddress()),
+            Collections.emptyList(),
+            null);
+
+    // create a valid filter
+    privacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
+        multiTenancyPrivacyNode.getTokenForTenant(tenant));
+    final String filterId =
+        privacyNode.execute(privacyTransactions.newFilter(privacyGroupId, filterParameter));
+
+    privacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
+        multiTenancyPrivacyNode.getTokenForTenant(tenant));
+    final CallPrivateSmartContractFunction storeTransaction =
+        privateContractTransactions.callSmartContractWithPrivacyGroupId(
+            eventEmitter.getContractAddress(),
+            eventEmitter.store(BigInteger.valueOf(VALUE_SET)).encodeFunctionCall(),
+            privacyNode.getTransactionSigningKey(),
+            Restriction.RESTRICTED,
+            tenant,
+            privacyGroupId);
+    final String storeTransactionHash = privacyNode.execute(storeTransaction);
+
+    privacyNode.execute(privacyTransactions.getPrivateTransactionReceipt(storeTransactionHash));
+
+    // check that getting the filter changes works for a member
+    assertThat(privacyNode.execute(privacyTransactions.getFilterChanges(privacyGroupId, filterId)))
+        .hasSize(1);
+
+    // check that getting the filter changes does not work if you are not a member
+    privacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
+        multiTenancyPrivacyNode.getTokenForTenant(removedTenant));
+    assertThatThrownBy(
+            () ->
+                privacyNode.execute(privacyTransactions.getFilterChanges(privacyGroupId, filterId)))
+        .hasMessageContaining("Unauthorized");
+
+    // check that getting the filter logs works for a member
+    privacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
+        multiTenancyPrivacyNode.getTokenForTenant(tenant));
+    assertThat(privacyNode.execute(privacyTransactions.getFilterLogs(privacyGroupId, filterId)))
+        .hasSize(3); // create privacy group, deploy event emitter, store on event emitter
+
+    // check that getting the filter logs does not work if you are not a member
+    privacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
+        multiTenancyPrivacyNode.getTokenForTenant(removedTenant));
+    assertThatThrownBy(
+            () -> privacyNode.execute(privacyTransactions.getFilterLogs(privacyGroupId, filterId)))
+        .hasMessageContaining("Unauthorized");
+
+    // check that getting the logs works for a member
+    privacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
+        multiTenancyPrivacyNode.getTokenForTenant(tenant));
+    assertThat(
+            privacyNode.execute(privacyTransactions.privGetLogs(privacyGroupId, filterParameter)))
+        .hasSize(3); // create privacy group, deploy event emitter, store on event emitter
+
+    // check that getting the logs does not work if you are not a member
+    privacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
+        multiTenancyPrivacyNode.getTokenForTenant(removedTenant));
+    assertThatThrownBy(
+            () ->
+                privacyNode.execute(
+                    privacyTransactions.privGetLogs(privacyGroupId, filterParameter)))
+        .hasMessageContaining("Unauthorized");
+
+    final List<Base64String> base64StringList =
+        tenants.stream().map(Base64String::wrap).collect(Collectors.toList());
+
+    // check that a member can find the on-chain privacy group
+    privacyNode
+        .getBesu()
+        .useAuthenticationTokenInHeaderForJsonRpc(
+            multiTenancyPrivacyNode.getTokenForTenant(tenant));
+    final List<PrivacyRequestFactory.FlexiblePrivacyGroup> group =
+        privacyNode.execute(
+            privacyTransactions.findFlexiblePrivacyGroup(
+                Base64String.unwrapList(base64StringList)));
+    assertThat(group.size()).isEqualTo(1);
+    assertThat(group.get(0).getMembers()).containsAll(base64StringList).hasSize(2);
+
+    // check that when you are not a member you cannot find the privacy group
+    privacyNode
+        .getBesu()
+        .useAuthenticationTokenInHeaderForJsonRpc(
+            multiTenancyPrivacyNode.getTokenForTenant(removedTenant));
+    assertThatThrownBy(
+            () ->
+                privacyNode.execute(
+                    privacyTransactions.findFlexiblePrivacyGroup(
+                        Base64String.unwrapList(base64StringList))))
+        .hasMessageContaining("Error finding flexible privacy group");
+
+    // check that a member can do a priv_call
+    privacyNode
+        .getBesu()
+        .useAuthenticationTokenInHeaderForJsonRpc(
+            multiTenancyPrivacyNode.getTokenForTenant(tenant));
+    final EthCall readValue =
+        privacyNode.execute(
+            privacyTransactions.privCall(
+                privacyGroupId, eventEmitter, eventEmitter.value().encodeFunctionCall()));
+    assertThat(new BigInteger(readValue.getValue().substring(2), 16))
+        .isEqualByComparingTo(BigInteger.valueOf(VALUE_SET));
+
+    // check that when you are not a member you cannot do a priv_call
+    privacyNode
+        .getBesu()
+        .useAuthenticationTokenInHeaderForJsonRpc(
+            multiTenancyPrivacyNode.getTokenForTenant(removedTenant));
+    assertThatThrownBy(
+            () ->
+                privacyNode.execute(
+                    privacyTransactions.privCall(
+                        privacyGroupId, eventEmitter, eventEmitter.value().encodeFunctionCall())))
+        .hasMessageContaining("Unauthorized");
+
+    // check that a member can do a priv_getTransaction
+    privacyNode
+        .getBesu()
+        .useAuthenticationTokenInHeaderForJsonRpc(
+            multiTenancyPrivacyNode.getTokenForTenant(tenant));
+    final PrivacyRequestFactory.GetPrivateTransactionResponse privTransaction =
+        privacyNode.execute(privacyTransactions.privGetTransaction(storeTransactionHash));
+    assertThat(privTransaction.getResult().getPrivacyGroupId()).isEqualTo(privacyGroupId);
+
+    // check that when you are not a member you cannot do a priv_getTransaction
+    privacyNode
+        .getBesu()
+        .useAuthenticationTokenInHeaderForJsonRpc(
+            multiTenancyPrivacyNode.getTokenForTenant(removedTenant));
+    assertThatThrownBy(
+            () -> privacyNode.execute(privacyTransactions.privGetTransaction(storeTransactionHash)))
+        .hasMessageContaining(
+            "Expecting actual not to be null"); // TODO: returning null because the RPC is using the
+    // enclave key
+  }
+
+  @Test
+  public void removedMemberCannotGetFilterChanges() {
+    final MultiTenancyPrivacyGroup allTenantsFromAlice = new MultiTenancyPrivacyGroup();
+    final List<String> tenants = aliceMultiTenancyPrivacyNode.getTenants();
+    allTenantsFromAlice.addNodeWithTenants(aliceMultiTenancyPrivacyNode, tenants);
+    final String privacyGroupId = createFlexiblePrivacyGroup(allTenantsFromAlice);
+    final MultiTenancyPrivacyNode multiTenancyPrivacyNode =
+        allTenantsFromAlice.getPrivacyNodes().get(0);
+    final String groupCreatingTenant = allTenantsFromAlice.getGroupCreatingTenant();
+    final String tenantToBeRemoved =
+        tenants.stream().filter(t -> !t.equals(groupCreatingTenant)).findFirst().orElseThrow();
+    final PrivacyNode groupCreatingPrivacyNode = allTenantsFromAlice.getGroupCreatingPrivacyNode();
+    final BesuNode groupCreatingPrivacyNodeBesu = groupCreatingPrivacyNode.getBesu();
+    groupCreatingPrivacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
+        multiTenancyPrivacyNode.getTokenForTenant(groupCreatingTenant));
+
+    final EventEmitter eventEmitter =
+        groupCreatingPrivacyNode.execute(
+            privateContractTransactions.createSmartContractWithPrivacyGroupId(
+                EventEmitter.class,
+                groupCreatingPrivacyNode.getTransactionSigningKey(),
+                groupCreatingTenant,
+                privacyGroupId));
+
+    final LogFilterJsonParameter filterParameter =
+        new LogFilterJsonParameter(
+            "earliest",
+            "latest",
+            List.of(eventEmitter.getContractAddress()),
+            Collections.emptyList(),
+            null);
+
+    final String filterId =
+        groupCreatingPrivacyNode.execute(
+            privacyTransactions.newFilter(privacyGroupId, filterParameter));
+
+    final CallPrivateSmartContractFunction storeTransaction =
+        privateContractTransactions.callSmartContractWithPrivacyGroupId(
+            eventEmitter.getContractAddress(),
+            eventEmitter.store(BigInteger.valueOf(VALUE_SET)).encodeFunctionCall(),
+            groupCreatingPrivacyNode.getTransactionSigningKey(),
+            Restriction.RESTRICTED,
+            groupCreatingTenant,
+            privacyGroupId);
+    final String storeTransactionHash = groupCreatingPrivacyNode.execute(storeTransaction);
+
+    groupCreatingPrivacyNode.execute(
+        privacyTransactions.getPrivateTransactionReceipt(storeTransactionHash));
+
+    // check that getting the filter changes works for a member
+    groupCreatingPrivacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
+        multiTenancyPrivacyNode.getTokenForTenant(tenantToBeRemoved));
+
+    assertThat(
+            groupCreatingPrivacyNode.execute(
+                privacyTransactions.getFilterChanges(privacyGroupId, filterId)))
+        .hasSize(1);
+
+    groupCreatingPrivacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
+        multiTenancyPrivacyNode.getTokenForTenant(groupCreatingTenant));
+    final CallPrivateSmartContractFunction store2Transaction =
+        privateContractTransactions.callSmartContractWithPrivacyGroupId(
+            eventEmitter.getContractAddress(),
+            eventEmitter.store(BigInteger.valueOf(VALUE_SET)).encodeFunctionCall(),
+            groupCreatingPrivacyNode.getTransactionSigningKey(),
+            Restriction.RESTRICTED,
+            groupCreatingTenant,
+            privacyGroupId);
+    final String store2TransactionHash = groupCreatingPrivacyNode.execute(store2Transaction);
+
+    groupCreatingPrivacyNode.execute(
+        privacyTransactions.getPrivateTransactionReceipt(store2TransactionHash));
+
+    // now remove from privacy group
+    final String removeTransactionHash =
+        removeFromPrivacyGroup(
+            privacyGroupId,
+            groupCreatingPrivacyNode,
+            groupCreatingTenant,
+            Credentials.create(groupCreatingPrivacyNode.getTransactionSigningKey()),
+            tenantToBeRemoved);
+    groupCreatingPrivacyNode.execute(
+        privacyTransactions.getPrivateTransactionReceipt(removeTransactionHash));
+
+    // check that it does not work anymore when member has been removed
+    groupCreatingPrivacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
+        multiTenancyPrivacyNode.getTokenForTenant(tenantToBeRemoved));
+    assertThatThrownBy(
+            () ->
+                groupCreatingPrivacyNode.execute(
+                    privacyTransactions.getFilterChanges(privacyGroupId, filterId)))
+        .hasMessageContaining("Unauthorized");
+  }
+
+  private String createFlexiblePrivacyGroup(final MultiTenancyPrivacyGroup group) {
+    final List<MultiTenancyPrivacyNode> multiTenancyPrivacyNodes = group.getPrivacyNodes();
+    final MultiTenancyPrivacyNode groupCreatorMultiTenancyPrivacyNode =
+        multiTenancyPrivacyNodes.get(0);
+    final PrivacyNode groupCreatorNode = group.getGroupCreatingPrivacyNode();
+    final String groupCreatorTenant = group.getGroupCreatingTenant();
+    final List<String> members = group.getTenants();
+    final String token = groupCreatorMultiTenancyPrivacyNode.getTokenForTenant(groupCreatorTenant);
+    final CreateFlexiblePrivacyGroupTransaction createTx =
+        privacyTransactions.createFlexiblePrivacyGroup(
+            groupCreatorNode, groupCreatorTenant, members, token);
+
+    final PrivacyRequestFactory.PrivxCreatePrivacyGroupResponse createResponse =
+        groupCreatorNode.execute(createTx);
+    final String privacyGroupId = createResponse.getPrivacyGroupId();
+
+    final List<Base64String> base64StringList =
+        members.stream().map(Base64String::wrap).collect(Collectors.toList());
+    for (final MultiTenancyPrivacyNode mtpn : multiTenancyPrivacyNodes) {
+      final PrivacyNode privacyNode = mtpn.getPrivacyNode();
+      for (final String tenant : mtpn.getTenants()) {
+        if (members.contains(tenant)) {
+          privacyNode
+              .getBesu()
+              .useAuthenticationTokenInHeaderForJsonRpc(mtpn.getTokenForTenant(tenant));
+          privacyNode.verify(flexiblePrivacyGroupExists(privacyGroupId, base64StringList));
+        }
+      }
+    }
+    groupCreatorNode.getBesu().useAuthenticationTokenInHeaderForJsonRpc(token);
+    final String commitmentHash =
+        callGetParticipantsMethodAndReturnCommitmentHash(
+            privacyGroupId, groupCreatorNode, groupCreatorTenant);
+    final PrivateTransactionReceipt expectedReceipt =
+        buildExpectedAddMemberTransactionReceipt(
+            privacyGroupId, groupCreatorNode, groupCreatorTenant, members);
+
+    for (final MultiTenancyPrivacyNode mtpn : multiTenancyPrivacyNodes) {
+      final PrivacyNode privacyNode = mtpn.getPrivacyNode();
+      for (final String tenant : mtpn.getTenants()) {
+        if (members.contains(tenant)) {
+          privacyNode
+              .getBesu()
+              .useAuthenticationTokenInHeaderForJsonRpc(mtpn.getTokenForTenant(tenant));
+          privacyNode.verify(
+              privateTransactionVerifier.validPrivateTransactionReceipt(
+                  commitmentHash, expectedReceipt));
+        }
+      }
+    }
+
+    return privacyGroupId;
+  }
+
+  private String removeFromPrivacyGroup(
+      final String privacyGroupId,
+      final PrivacyNode node,
+      final String nodeRemovingMember,
+      final Credentials signer,
+      final String memberBeingRemoved) {
+    return node.execute(
+        privacyTransactions.removeFromPrivacyGroup(
+            privacyGroupId, nodeRemovingMember, signer, memberBeingRemoved));
+  }
+}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/multitenancy/MultiTenancyAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/multitenancy/MultiTenancyAcceptanceTest.java
index cbae10dd998..e2fdd2188b1 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/multitenancy/MultiTenancyAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/multitenancy/MultiTenancyAcceptanceTest.java
@@ -21,18 +21,21 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
-import static org.hyperledger.besu.ethereum.core.Address.DEFAULT_PRIVACY;
-
-import org.hyperledger.besu.crypto.SECP256K1;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.DEFAULT_PRIVACY;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.enclave.types.PrivacyGroup;
 import org.hyperledger.besu.enclave.types.ReceiveResponse;
 import org.hyperledger.besu.enclave.types.SendResponse;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.ethereum.privacy.PrivacyGroupUtil;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
-import org.hyperledger.besu.ethereum.privacy.Restriction;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.plugin.data.Restriction;
 import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
 import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.Cluster;
@@ -40,13 +43,18 @@
 import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.ClusterConfigurationBuilder;
 
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.io.Base64;
+import org.apache.tuweni.bytes.Bytes32;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -57,20 +65,29 @@ public class MultiTenancyAcceptanceTest extends AcceptanceTestBase {
   private final ObjectMapper mapper = new ObjectMapper();
   private Cluster multiTenancyCluster;
 
-  private static final SECP256K1.KeyPair TEST_KEY =
-      SECP256K1.KeyPair.create(
-          SECP256K1.PrivateKey.create(
-              new BigInteger(
-                  "853d7f0010fd86d0d7811c1f9d968ea89a24484a8127b4a483ddf5d2cfec766d", 16)));
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+  private static final KeyPair TEST_KEY =
+      SIGNATURE_ALGORITHM
+          .get()
+          .createKeyPair(
+              SIGNATURE_ALGORITHM
+                  .get()
+                  .createPrivateKey(
+                      new BigInteger(
+                          "853d7f0010fd86d0d7811c1f9d968ea89a24484a8127b4a483ddf5d2cfec766d", 16)));
   private static final String PRIVACY_GROUP_ID = "B1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
   private static final String PARTICIPANT_ENCLAVE_KEY0 =
       "A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
+  private static final Bytes LEAGCY_PRIVATE_FROM = Bytes.fromBase64String(PARTICIPANT_ENCLAVE_KEY0);
   private static final String PARTICIPANT_ENCLAVE_KEY1 =
       "sgFkVOyFndZe/5SAZJO5UYbrl7pezHetveriBBWWnE8=";
+  private static final List<Bytes> LEGACY_PRIVATE_FOR =
+      List.of(Bytes.fromBase64String(PARTICIPANT_ENCLAVE_KEY1));
   private static final String PARTICIPANT_ENCLAVE_KEY2 =
       "R1kW75NQC9XX3kwNpyPjCBFflM29+XvnKKS9VLrUkzo=";
   private static final String PARTICIPANT_ENCLAVE_KEY3 =
-      "QzHuACXpfhoGAgrQriWJcDJ6MrUwcCvutKMoAn9KplQ=";
+      "A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
   private final Address senderAddress =
       Address.wrap(Bytes.fromHexString(accounts.getPrimaryBenefactor().getAddress()));
 
@@ -227,29 +244,37 @@ public void privGetTransactionReceiptSuccessShouldReturnTransactionReceiptAfterM
   public void privGetEeaTransactionCountSuccessShouldReturnExpectedTransactionCount()
       throws JsonProcessingException {
     final PrivateTransaction validSignedPrivateTransaction =
-        getValidSignedPrivateTransaction(senderAddress);
+        getValidLegacySignedPrivateTransaction(senderAddress);
     final String accountAddress = validSignedPrivateTransaction.getSender().toHexString();
-    final String senderAddressBase64 = Base64.encode(Bytes.wrap(accountAddress.getBytes(UTF_8)));
-    final BytesValueRLPOutput rlpOutput = getRLPOutput(validSignedPrivateTransaction);
-    final List<PrivacyGroup> groupMembership =
-        List.of(testPrivacyGroup(emptyList(), PrivacyGroup.Type.LEGACY));
+    final String privateTxRlp = getRLPOutput(validSignedPrivateTransaction).encoded().toHexString();
 
-    retrievePrivacyGroupEnclaveStub();
-    sendEnclaveStub(PARTICIPANT_ENCLAVE_KEY1);
-    receiveEnclaveStub(validSignedPrivateTransaction);
-    findPrivacyGroupEnclaveStub(groupMembership);
+    retrieveEeaPrivacyGroupEnclaveStub(validSignedPrivateTransaction);
+    sendEnclaveStub(
+        Bytes32.ZERO.toBase64String()); // can be any value, as we are stubbing the enclave
+    receiveEnclaveStubEea(validSignedPrivateTransaction);
 
-    node.verify(priv.getTransactionCount(accountAddress, PRIVACY_GROUP_ID, 0));
-    final Hash transactionHash =
-        node.execute(privacyTransactions.sendRawTransaction(rlpOutput.encoded().toHexString()));
+    final String privateFrom = validSignedPrivateTransaction.getPrivateFrom().toBase64String();
+    final String[] privateFor =
+        validSignedPrivateTransaction.getPrivateFor().orElseThrow().stream()
+            .map(Bytes::toBase64String)
+            .toArray(String[]::new);
+    node.verify(priv.getEeaTransactionCount(accountAddress, privateFrom, privateFor, 0));
+
+    final Hash transactionHash = node.execute(privacyTransactions.sendRawTransaction(privateTxRlp));
 
     node.verify(priv.getSuccessfulTransactionReceipt(transactionHash));
 
-    final String privateFrom = PARTICIPANT_ENCLAVE_KEY0;
-    final String[] privateFor = {senderAddressBase64};
     node.verify(priv.getEeaTransactionCount(accountAddress, privateFrom, privateFor, 1));
   }
 
+  @Nonnull
+  private Bytes32 getPrivacyGroupIdFromEeaTransaction(
+      final PrivateTransaction validSignedPrivateTransaction) {
+    return PrivacyGroupUtil.calculateEeaPrivacyGroupId(
+        validSignedPrivateTransaction.getPrivateFrom(),
+        validSignedPrivateTransaction.getPrivateFor().get());
+  }
+
   private void findPrivacyGroupEnclaveStub(final List<PrivacyGroup> groupMembership)
       throws JsonProcessingException {
     final String findGroupResponse = mapper.writeValueAsString(groupMembership);
@@ -270,7 +295,22 @@ private void deletePrivacyGroupEnclaveStub() throws JsonProcessingException {
   private void retrievePrivacyGroupEnclaveStub() throws JsonProcessingException {
     final String retrieveGroupResponse =
         mapper.writeValueAsString(
-            testPrivacyGroup(List.of(PARTICIPANT_ENCLAVE_KEY0), PrivacyGroup.Type.PANTHEON));
+            testPrivacyGroup(
+                List.of(PARTICIPANT_ENCLAVE_KEY0, PARTICIPANT_ENCLAVE_KEY1),
+                PrivacyGroup.Type.PANTHEON));
+    stubFor(post("/retrievePrivacyGroup").willReturn(ok(retrieveGroupResponse)));
+  }
+
+  private void retrieveEeaPrivacyGroupEnclaveStub(final PrivateTransaction tx)
+      throws JsonProcessingException {
+    final ArrayList<String> members = new ArrayList<>();
+    members.add(tx.getPrivateFrom().toBase64String());
+    members.addAll(
+        tx.getPrivateFor().orElseThrow().stream()
+            .map(Bytes::toBase64String)
+            .collect(Collectors.toList()));
+    final String retrieveGroupResponse =
+        mapper.writeValueAsString(testPrivacyGroupEea(members, PrivacyGroup.Type.LEGACY));
     stubFor(post("/retrievePrivacyGroup").willReturn(ok(retrieveGroupResponse)));
   }
 
@@ -289,6 +329,19 @@ private void receiveEnclaveStub(final PrivateTransaction privTx) throws JsonProc
     stubFor(post("/receive").willReturn(ok(receiveResponse)));
   }
 
+  private void receiveEnclaveStubEea(final PrivateTransaction privTx)
+      throws JsonProcessingException {
+    final BytesValueRLPOutput rlpOutput = getRLPOutputForReceiveResponse(privTx);
+    final String senderKey = privTx.getPrivateFrom().toBase64String();
+    final String receiveResponse =
+        mapper.writeValueAsString(
+            new ReceiveResponse(
+                rlpOutput.encoded().toBase64String().getBytes(UTF_8),
+                getPrivacyGroupIdFromEeaTransaction(privTx).toBase64String(),
+                senderKey));
+    stubFor(post("/receive").willReturn(ok(receiveResponse)));
+  }
+
   private BytesValueRLPOutput getRLPOutputForReceiveResponse(
       final PrivateTransaction privateTransaction) {
     final BytesValueRLPOutput bvrlpo = new BytesValueRLPOutput();
@@ -307,6 +360,18 @@ private PrivacyGroup testPrivacyGroup(
     return new PrivacyGroup(PRIVACY_GROUP_ID, groupType, "test", "testGroup", groupMembers);
   }
 
+  private PrivacyGroup testPrivacyGroupEea(
+      final List<String> groupMembers, final PrivacyGroup.Type groupType) {
+    final Bytes32 privacyGroupId =
+        PrivacyGroupUtil.calculateEeaPrivacyGroupId(
+            Bytes.fromBase64String(groupMembers.get(0)),
+            groupMembers.stream()
+                .map(gm -> Bytes.fromBase64String(gm))
+                .collect(Collectors.toList()));
+    return new PrivacyGroup(
+        privacyGroupId.toBase64String(), groupType, "test", "testGroup", groupMembers);
+  }
+
   private static PrivateTransaction getValidSignedPrivateTransaction(final Address senderAddress) {
     return PrivateTransaction.builder()
         .nonce(0)
@@ -316,10 +381,27 @@ private static PrivateTransaction getValidSignedPrivateTransaction(final Address
         .value(Wei.ZERO)
         .payload(Bytes.wrap(new byte[] {}))
         .sender(senderAddress)
-        .chainId(BigInteger.valueOf(2018))
+        .chainId(BigInteger.valueOf(1337))
         .privateFrom(Bytes.fromBase64String(PARTICIPANT_ENCLAVE_KEY0))
         .restriction(Restriction.RESTRICTED)
         .privacyGroupId(Bytes.fromBase64String(PRIVACY_GROUP_ID))
         .signAndBuild(TEST_KEY);
   }
+
+  private static PrivateTransaction getValidLegacySignedPrivateTransaction(
+      final Address senderAddress) {
+    return PrivateTransaction.builder()
+        .nonce(0)
+        .gasPrice(Wei.ZERO)
+        .gasLimit(3000000)
+        .to(null)
+        .value(Wei.ZERO)
+        .payload(Bytes.wrap(new byte[] {}))
+        .sender(senderAddress)
+        .chainId(BigInteger.valueOf(1337))
+        .privateFrom(LEAGCY_PRIVATE_FROM)
+        .privateFor(LEGACY_PRIVATE_FOR)
+        .restriction(Restriction.RESTRICTED)
+        .signAndBuild(TEST_KEY);
+  }
 }
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/multitenancy/MultiTenancyValidationFailAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/multitenancy/MultiTenancyValidationFailAcceptanceTest.java
index 51d431643a1..515248347b8 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/multitenancy/MultiTenancyValidationFailAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/multitenancy/MultiTenancyValidationFailAcceptanceTest.java
@@ -24,15 +24,16 @@
 import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.GET_PRIVATE_TRANSACTION_NONCE_ERROR;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.PRIVATE_FROM_DOES_NOT_MATCH_ENCLAVE_PUBLIC_KEY;
 
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.enclave.types.PrivacyGroup;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
-import org.hyperledger.besu.ethereum.privacy.Restriction;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.plugin.data.Restriction;
 import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
 import org.hyperledger.besu.tests.acceptance.dsl.node.cluster.Cluster;
@@ -171,7 +172,9 @@ public void determineEeaNonceShouldFailWhenPrivateFromNotMatchEnclaveKey() {
     final Transaction<Integer> transaction =
         privacyTransactions.getEeaTransactionCount(
             accountAddress, OTHER_ENCLAVE_PUBLIC_KEY, privateFor);
-    node.verify(priv.multiTenancyValidationFail(transaction, GET_PRIVATE_TRANSACTION_NONCE_ERROR));
+    node.verify(
+        priv.multiTenancyValidationFail(
+            transaction, PRIVATE_FROM_DOES_NOT_MATCH_ENCLAVE_PUBLIC_KEY));
   }
 
   @Test
@@ -204,6 +207,9 @@ private BytesValueRLPOutput getRLPOutput(final PrivateTransaction validSignedPri
 
   private static PrivateTransaction getValidSignedPrivateTransaction(
       final Address senderAddress, final String privateFrom) {
+
+    final SignatureAlgorithm signatureAlgorithm = SignatureAlgorithmFactory.getInstance();
+
     return PrivateTransaction.builder()
         .nonce(0)
         .gasPrice(Wei.ZERO)
@@ -217,8 +223,8 @@ private static PrivateTransaction getValidSignedPrivateTransaction(
         .restriction(Restriction.RESTRICTED)
         .privacyGroupId(Bytes.fromBase64String(PRIVACY_GROUP_ID))
         .signAndBuild(
-            SECP256K1.KeyPair.create(
-                SECP256K1.PrivateKey.create(
+            signatureAlgorithm.createKeyPair(
+                signatureAlgorithm.createPrivateKey(
                     new BigInteger(
                         "853d7f0010fd86d0d7811c1f9d968ea89a24484a8127b4a483ddf5d2cfec766d", 16))));
   }
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/multitenancy/OnChainMultiTenancyAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/multitenancy/OnChainMultiTenancyAcceptanceTest.java
deleted file mode 100644
index 643b30a663c..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/privacy/multitenancy/OnChainMultiTenancyAcceptanceTest.java
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.acceptance.privacy.multitenancy;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.account.PrivacyAccountResolver;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.contract.CallPrivateSmartContractFunction;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction.CreateOnChainPrivacyGroupTransaction;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.util.LogFilterJsonParameter;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.perm.PermissioningTransactions;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.PrivacyRequestFactory;
-import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
-import org.hyperledger.besu.tests.web3j.privacy.OnChainPrivacyAcceptanceTestBase;
-
-import java.math.BigInteger;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.web3j.crypto.Credentials;
-import org.web3j.protocol.besu.response.privacy.PrivateTransactionReceipt;
-import org.web3j.protocol.core.methods.response.EthCall;
-import org.web3j.utils.Base64String;
-
-public class OnChainMultiTenancyAcceptanceTest extends OnChainPrivacyAcceptanceTestBase {
-
-  private static final String eventEmitterDeployed =
-      "0x6080604052600436106100565763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811461005b5780636057361d1461008257806367e404ce146100ae575b600080fd5b34801561006757600080fd5b506100706100ec565b60408051918252519081900360200190f35b34801561008e57600080fd5b506100ac600480360360208110156100a557600080fd5b50356100f2565b005b3480156100ba57600080fd5b506100c3610151565b6040805173ffffffffffffffffffffffffffffffffffffffff9092168252519081900360200190f35b60025490565b604080513381526020810183905281517fc9db20adedc6cf2b5d25252b101ab03e124902a73fcb12b753f3d1aaa2d8f9f5929181900390910190a16002556001805473ffffffffffffffffffffffffffffffffffffffff191633179055565b60015473ffffffffffffffffffffffffffffffffffffffff169056fea165627a7a72305820c7f729cb24e05c221f5aa913700793994656f233fe2ce3b9fd9a505ea17e8d8a0029";
-
-  private static final PermissioningTransactions permissioningTransactions =
-      new PermissioningTransactions();
-  private static final long VALUE_SET = 10L;
-
-  private PrivacyNode alice;
-  private MultiTenancyPrivacyNode aliceMultiTenancyPrivacyNode;
-
-  @Before
-  public void setUp() throws Exception {
-    alice =
-        privacyBesu.createOnChainPrivacyGroupEnabledMinerNode(
-            "node1", PrivacyAccountResolver.MULTI_TENANCY, Address.PRIVACY, true);
-    final BesuNode aliceBesu = alice.getBesu();
-    privacyCluster.startNodes(alice);
-    final String alice1Token =
-        aliceBesu.execute(permissioningTransactions.createSuccessfulLogin("user", "pegasys"));
-    aliceBesu.useAuthenticationTokenInHeaderForJsonRpc(alice1Token);
-    final String alice2Token =
-        aliceBesu.execute(permissioningTransactions.createSuccessfulLogin("user2", "Password2"));
-    final String alice3Token =
-        aliceBesu.execute(permissioningTransactions.createSuccessfulLogin("user3", "Password3"));
-    privacyCluster.awaitPeerCount(alice);
-
-    final String alice1EnclaveKey = alice.getOrion().getPublicKeys().get(0);
-    final String alice2EnclaveKey = alice.getOrion().getPublicKeys().get(1);
-    final String alice3EnclaveKey = alice.getOrion().getPublicKeys().get(2);
-
-    aliceMultiTenancyPrivacyNode = new MultiTenancyPrivacyNode(alice);
-    aliceMultiTenancyPrivacyNode
-        .addTenantWithToken(alice1EnclaveKey, alice1Token)
-        .addTenantWithToken(alice2EnclaveKey, alice2Token)
-        .addTenantWithToken(alice3EnclaveKey, alice3Token);
-  }
-
-  @After
-  public void tearDown() {
-    privacyCluster.close();
-  }
-
-  @Test
-  public void createPrivacyGroup() {
-    createOnChainPrivacyGroup(alice);
-  }
-
-  @Test
-  public void createPrivacyGroupWithAllTenants() {
-    final MultiTenancyPrivacyGroup privacyGroup = new MultiTenancyPrivacyGroup();
-    privacyGroup.addNodeWithTenants(
-        aliceMultiTenancyPrivacyNode, aliceMultiTenancyPrivacyNode.getTenants());
-    createOnChainPrivacyGroup(privacyGroup);
-  }
-
-  @Test
-  public void noAccessWhenNotAMember() {
-    final MultiTenancyPrivacyGroup twoTenantsFromAlice = new MultiTenancyPrivacyGroup();
-    final List<String> tenants = aliceMultiTenancyPrivacyNode.getTenants();
-    final String removedTenant = tenants.remove(tenants.size() - 1);
-    twoTenantsFromAlice.addNodeWithTenants(aliceMultiTenancyPrivacyNode, tenants);
-    final String privacyGroupId = createOnChainPrivacyGroup(twoTenantsFromAlice);
-
-    final MultiTenancyPrivacyNode multiTenancyPrivacyNode =
-        twoTenantsFromAlice.getPrivacyNodes().get(0);
-    final String tenant = tenants.get(0);
-    final PrivacyNode privacyNode = multiTenancyPrivacyNode.getPrivacyNode();
-    final BesuNode privacyNodeBesu = privacyNode.getBesu();
-    privacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
-        multiTenancyPrivacyNode.getTokenForTenant(tenant));
-    final EventEmitter eventEmitter =
-        privacyNode.execute(
-            privateContractTransactions.createSmartContractWithPrivacyGroupId(
-                EventEmitter.class,
-                privacyNode.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                tenant,
-                privacyGroupId));
-
-    final String transactionHash = getContractDeploymentCommitmentHash(eventEmitter);
-
-    // check that a member can get the transaction receipt
-    privacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
-        multiTenancyPrivacyNode.getTokenForTenant(tenant));
-    privacyNode.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(
-            transactionHash,
-            (PrivateTransactionReceipt) eventEmitter.getTransactionReceipt().get()));
-    assertThat(
-            privacyNode
-                .execute(
-                    privacyTransactions.privGetCode(
-                        privacyGroupId,
-                        Address.fromHexString(eventEmitter.getContractAddress()),
-                        "latest"))
-                .toHexString())
-        .isEqualTo(eventEmitterDeployed);
-
-    // check that getting the transaction receipt does not work if you are not a member
-    privacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
-        multiTenancyPrivacyNode.getTokenForTenant(removedTenant));
-    privacyNode.verify(
-        privateTransactionVerifier.noPrivateTransactionReceipt(
-            transactionHash)); // returning null because the RPC is using the enclave key
-
-    // check that getting the code of the event emitter does not work when you are not a member
-    assertThatThrownBy(
-            () ->
-                privacyNode.execute(
-                    privacyTransactions.privGetCode(
-                        privacyGroupId,
-                        Address.fromHexString(eventEmitter.getContractAddress()),
-                        "latest")))
-        .hasMessageContaining("Unauthorized");
-
-    final LogFilterJsonParameter filterParameter =
-        new LogFilterJsonParameter(
-            "earliest",
-            "latest",
-            List.of(eventEmitter.getContractAddress()),
-            Collections.emptyList(),
-            null);
-
-    // create a valid filter
-    privacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
-        multiTenancyPrivacyNode.getTokenForTenant(tenant));
-    final String filterId =
-        privacyNode.execute(privacyTransactions.newFilter(privacyGroupId, filterParameter));
-
-    privacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
-        multiTenancyPrivacyNode.getTokenForTenant(tenant));
-    final CallPrivateSmartContractFunction storeTransaction =
-        privateContractTransactions.callSmartContractWithPrivacyGroupId(
-            eventEmitter.getContractAddress(),
-            eventEmitter.store(BigInteger.valueOf(VALUE_SET)).encodeFunctionCall(),
-            privacyNode.getTransactionSigningKey(),
-            POW_CHAIN_ID,
-            tenant,
-            privacyGroupId);
-    final String storeTransactionHash = privacyNode.execute(storeTransaction);
-
-    privacyNode.execute(privacyTransactions.getPrivateTransactionReceipt(storeTransactionHash));
-
-    // check that getting the filter changes works for a member
-    assertThat(privacyNode.execute(privacyTransactions.getFilterChanges(privacyGroupId, filterId)))
-        .hasSize(1);
-
-    // check that getting the filter changes does not work if you are not a member
-    privacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
-        multiTenancyPrivacyNode.getTokenForTenant(removedTenant));
-    assertThatThrownBy(
-            () ->
-                privacyNode.execute(privacyTransactions.getFilterChanges(privacyGroupId, filterId)))
-        .hasMessageContaining("Unauthorized");
-
-    // check that getting the filter logs works for a member
-    privacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
-        multiTenancyPrivacyNode.getTokenForTenant(tenant));
-    assertThat(privacyNode.execute(privacyTransactions.getFilterLogs(privacyGroupId, filterId)))
-        .hasSize(3); // create privacy group, deploy event emitter, store on event emitter
-
-    // check that getting the filter logs does not work if you are not a member
-    privacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
-        multiTenancyPrivacyNode.getTokenForTenant(removedTenant));
-    assertThatThrownBy(
-            () -> privacyNode.execute(privacyTransactions.getFilterLogs(privacyGroupId, filterId)))
-        .hasMessageContaining("Unauthorized");
-
-    // check that getting the logs works for a member
-    privacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
-        multiTenancyPrivacyNode.getTokenForTenant(tenant));
-    assertThat(
-            privacyNode.execute(privacyTransactions.privGetLogs(privacyGroupId, filterParameter)))
-        .hasSize(3); // create privacy group, deploy event emitter, store on event emitter
-
-    // check that getting the logs does not work if you are not a member
-    privacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
-        multiTenancyPrivacyNode.getTokenForTenant(removedTenant));
-    assertThatThrownBy(
-            () ->
-                privacyNode.execute(
-                    privacyTransactions.privGetLogs(privacyGroupId, filterParameter)))
-        .hasMessageContaining("Unauthorized");
-
-    final List<Base64String> base64StringList =
-        tenants.stream().map(Base64String::wrap).collect(Collectors.toList());
-
-    // check that a member can find the on-chain privacy group
-    privacyNode
-        .getBesu()
-        .useAuthenticationTokenInHeaderForJsonRpc(
-            multiTenancyPrivacyNode.getTokenForTenant(tenant));
-    final List<PrivacyRequestFactory.OnChainPrivacyGroup> group =
-        privacyNode.execute(
-            privacyTransactions.findOnChainPrivacyGroup(Base64String.unwrapList(base64StringList)));
-    assertThat(group.size()).isEqualTo(1);
-    assertThat(group.get(0).getMembers()).containsAll(base64StringList).hasSize(2);
-
-    // check that when you are not a member you cannot find the privacy group
-    privacyNode
-        .getBesu()
-        .useAuthenticationTokenInHeaderForJsonRpc(
-            multiTenancyPrivacyNode.getTokenForTenant(removedTenant));
-    assertThatThrownBy(
-            () ->
-                privacyNode.execute(
-                    privacyTransactions.findOnChainPrivacyGroup(
-                        Base64String.unwrapList(base64StringList))))
-        .hasMessageContaining("Error finding onchain privacy group");
-
-    // check that a member can do a priv_call
-    privacyNode
-        .getBesu()
-        .useAuthenticationTokenInHeaderForJsonRpc(
-            multiTenancyPrivacyNode.getTokenForTenant(tenant));
-    final EthCall readValue =
-        privacyNode.execute(
-            privacyTransactions.privCall(
-                privacyGroupId, eventEmitter, eventEmitter.value().encodeFunctionCall()));
-    assertThat(new BigInteger(readValue.getValue().substring(2), 16))
-        .isEqualByComparingTo(BigInteger.valueOf(VALUE_SET));
-
-    // check that when you are not a member you cannot do a priv_call
-    privacyNode
-        .getBesu()
-        .useAuthenticationTokenInHeaderForJsonRpc(
-            multiTenancyPrivacyNode.getTokenForTenant(removedTenant));
-    assertThatThrownBy(
-            () ->
-                privacyNode.execute(
-                    privacyTransactions.privCall(
-                        privacyGroupId, eventEmitter, eventEmitter.value().encodeFunctionCall())))
-        .hasMessageContaining("Unauthorized");
-
-    // check that a member can do a priv_getTransaction
-    privacyNode
-        .getBesu()
-        .useAuthenticationTokenInHeaderForJsonRpc(
-            multiTenancyPrivacyNode.getTokenForTenant(tenant));
-    final PrivacyRequestFactory.GetPrivateTransactionResponse privTransaction =
-        privacyNode.execute(privacyTransactions.privGetTransaction(storeTransactionHash));
-    assertThat(privTransaction.getResult().getPrivacyGroupId()).isEqualTo(privacyGroupId);
-
-    // check that when you are not a member you cannot do a priv_getTransaction
-    privacyNode
-        .getBesu()
-        .useAuthenticationTokenInHeaderForJsonRpc(
-            multiTenancyPrivacyNode.getTokenForTenant(removedTenant));
-    assertThatThrownBy(
-            () -> privacyNode.execute(privacyTransactions.privGetTransaction(storeTransactionHash)))
-        .hasMessageContaining(
-            "Expecting actual not to be null"); // TODO: returning null because the RPC is using the
-    // enclave key
-  }
-
-  @Test
-  public void removedMemberCannotGetFilterChanges() {
-    final MultiTenancyPrivacyGroup allTenantsFromAlice = new MultiTenancyPrivacyGroup();
-    final List<String> tenants = aliceMultiTenancyPrivacyNode.getTenants();
-    allTenantsFromAlice.addNodeWithTenants(aliceMultiTenancyPrivacyNode, tenants);
-    final String privacyGroupId = createOnChainPrivacyGroup(allTenantsFromAlice);
-    final MultiTenancyPrivacyNode multiTenancyPrivacyNode =
-        allTenantsFromAlice.getPrivacyNodes().get(0);
-    final String groupCreatingTenant = allTenantsFromAlice.getGroupCreatingTenant();
-    final String tenantToBeRemoved =
-        tenants.stream().filter(t -> !t.equals(groupCreatingTenant)).findFirst().orElseThrow();
-    final PrivacyNode groupCreatingPrivacyNode = allTenantsFromAlice.getGroupCreatingPrivacyNode();
-    final BesuNode groupCreatingPrivacyNodeBesu = groupCreatingPrivacyNode.getBesu();
-    groupCreatingPrivacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
-        multiTenancyPrivacyNode.getTokenForTenant(groupCreatingTenant));
-
-    final EventEmitter eventEmitter =
-        groupCreatingPrivacyNode.execute(
-            privateContractTransactions.createSmartContractWithPrivacyGroupId(
-                EventEmitter.class,
-                groupCreatingPrivacyNode.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                groupCreatingTenant,
-                privacyGroupId));
-
-    final LogFilterJsonParameter filterParameter =
-        new LogFilterJsonParameter(
-            "earliest",
-            "latest",
-            List.of(eventEmitter.getContractAddress()),
-            Collections.emptyList(),
-            null);
-
-    final String filterId =
-        groupCreatingPrivacyNode.execute(
-            privacyTransactions.newFilter(privacyGroupId, filterParameter));
-
-    final CallPrivateSmartContractFunction storeTransaction =
-        privateContractTransactions.callSmartContractWithPrivacyGroupId(
-            eventEmitter.getContractAddress(),
-            eventEmitter.store(BigInteger.valueOf(VALUE_SET)).encodeFunctionCall(),
-            groupCreatingPrivacyNode.getTransactionSigningKey(),
-            POW_CHAIN_ID,
-            groupCreatingTenant,
-            privacyGroupId);
-    final String storeTransactionHash = groupCreatingPrivacyNode.execute(storeTransaction);
-
-    groupCreatingPrivacyNode.execute(
-        privacyTransactions.getPrivateTransactionReceipt(storeTransactionHash));
-
-    // check that getting the filter changes works for a member
-    groupCreatingPrivacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
-        multiTenancyPrivacyNode.getTokenForTenant(tenantToBeRemoved));
-
-    assertThat(
-            groupCreatingPrivacyNode.execute(
-                privacyTransactions.getFilterChanges(privacyGroupId, filterId)))
-        .hasSize(1);
-
-    groupCreatingPrivacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
-        multiTenancyPrivacyNode.getTokenForTenant(groupCreatingTenant));
-    final CallPrivateSmartContractFunction store2Transaction =
-        privateContractTransactions.callSmartContractWithPrivacyGroupId(
-            eventEmitter.getContractAddress(),
-            eventEmitter.store(BigInteger.valueOf(VALUE_SET)).encodeFunctionCall(),
-            groupCreatingPrivacyNode.getTransactionSigningKey(),
-            POW_CHAIN_ID,
-            groupCreatingTenant,
-            privacyGroupId);
-    final String store2TransactionHash = groupCreatingPrivacyNode.execute(store2Transaction);
-
-    groupCreatingPrivacyNode.execute(
-        privacyTransactions.getPrivateTransactionReceipt(store2TransactionHash));
-
-    // now remove from privacy group
-    final String removeTransactionHash =
-        removeFromPrivacyGroup(
-            privacyGroupId,
-            groupCreatingPrivacyNode,
-            groupCreatingTenant,
-            Credentials.create(groupCreatingPrivacyNode.getTransactionSigningKey()),
-            tenantToBeRemoved);
-    groupCreatingPrivacyNode.execute(
-        privacyTransactions.getPrivateTransactionReceipt(removeTransactionHash));
-
-    // check that it does not work anymore when member has been removed
-    groupCreatingPrivacyNodeBesu.useAuthenticationTokenInHeaderForJsonRpc(
-        multiTenancyPrivacyNode.getTokenForTenant(tenantToBeRemoved));
-    assertThatThrownBy(
-            () ->
-                groupCreatingPrivacyNode.execute(
-                    privacyTransactions.getFilterChanges(privacyGroupId, filterId)))
-        .hasMessageContaining("Unauthorized");
-  }
-
-  private String createOnChainPrivacyGroup(final MultiTenancyPrivacyGroup group) {
-    final List<MultiTenancyPrivacyNode> multiTenancyPrivacyNodes = group.getPrivacyNodes();
-    final MultiTenancyPrivacyNode groupCreatorMultiTenancyPrivacyNode =
-        multiTenancyPrivacyNodes.get(0);
-    final PrivacyNode groupCreatorNode = group.getGroupCreatingPrivacyNode();
-    final String groupCreatorTenant = group.getGroupCreatingTenant();
-    final List<String> members = group.getTenants();
-    final String token = groupCreatorMultiTenancyPrivacyNode.getTokenForTenant(groupCreatorTenant);
-    final CreateOnChainPrivacyGroupTransaction createTx =
-        privacyTransactions.createOnChainPrivacyGroup(
-            groupCreatorNode, groupCreatorTenant, members, token);
-
-    final PrivacyRequestFactory.PrivxCreatePrivacyGroupResponse createResponse =
-        groupCreatorNode.execute(createTx);
-    final String privacyGroupId = createResponse.getPrivacyGroupId();
-
-    final List<Base64String> base64StringList =
-        members.stream().map(Base64String::wrap).collect(Collectors.toList());
-    for (final MultiTenancyPrivacyNode mtpn : multiTenancyPrivacyNodes) {
-      final PrivacyNode privacyNode = mtpn.getPrivacyNode();
-      for (final String tenant : mtpn.getTenants()) {
-        if (members.contains(tenant)) {
-          privacyNode
-              .getBesu()
-              .useAuthenticationTokenInHeaderForJsonRpc(mtpn.getTokenForTenant(tenant));
-          privacyNode.verify(onChainPrivacyGroupExists(privacyGroupId, base64StringList));
-        }
-      }
-    }
-    groupCreatorNode.getBesu().useAuthenticationTokenInHeaderForJsonRpc(token);
-    final String commitmentHash =
-        callGetParticipantsMethodAndReturnCommitmentHash(
-            privacyGroupId, groupCreatorNode, groupCreatorTenant);
-    final PrivateTransactionReceipt expectedReceipt =
-        buildExpectedAddMemberTransactionReceipt(
-            privacyGroupId, groupCreatorNode, groupCreatorTenant, members.toArray(new String[] {}));
-
-    for (final MultiTenancyPrivacyNode mtpn : multiTenancyPrivacyNodes) {
-      final PrivacyNode privacyNode = mtpn.getPrivacyNode();
-      for (final String tenant : mtpn.getTenants()) {
-        if (members.contains(tenant)) {
-          privacyNode
-              .getBesu()
-              .useAuthenticationTokenInHeaderForJsonRpc(mtpn.getTokenForTenant(tenant));
-          privacyNode.verify(
-              privateTransactionVerifier.validPrivateTransactionReceipt(
-                  commitmentHash, expectedReceipt));
-        }
-      }
-    }
-
-    return privacyGroupId;
-  }
-
-  private String removeFromPrivacyGroup(
-      final String privacyGroupId,
-      final PrivacyNode node,
-      final String nodeRemovingMember,
-      final Credentials signer,
-      final String memberBeingRemoved) {
-    return node.execute(
-        privacyTransactions.removeFromPrivacyGroup(
-            privacyGroupId, nodeRemovingMember, signer, memberBeingRemoved));
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/pubsub/NewPendingTransactionAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/pubsub/NewPendingTransactionAcceptanceTest.java
index fb791edf608..4ae94924b25 100644
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/pubsub/NewPendingTransactionAcceptanceTest.java
+++ b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/pubsub/NewPendingTransactionAcceptanceTest.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.tests.acceptance.pubsub;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
 import org.hyperledger.besu.tests.acceptance.dsl.account.Account;
 import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
@@ -22,9 +22,9 @@
 import org.hyperledger.besu.tests.acceptance.dsl.pubsub.WebSocket;
 
 import io.vertx.core.Vertx;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class NewPendingTransactionAcceptanceTest extends AcceptanceTestBase {
 
@@ -35,7 +35,7 @@ public class NewPendingTransactionAcceptanceTest extends AcceptanceTestBase {
   private BesuNode minerNode;
   private BesuNode archiveNode;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     vertx = Vertx.vertx();
     minerNode = besu.createMinerNode("miner-node1");
@@ -46,7 +46,7 @@ public void setUp() throws Exception {
     archiveWebSocket = new WebSocket(vertx, archiveNode.getConfiguration());
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     vertx.close();
   }
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/CrossContractReader.abi b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/CrossContractReader.abi
deleted file mode 100644
index 36edfd6c590..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/CrossContractReader.abi
+++ /dev/null
@@ -1 +0,0 @@
-[{"constant":false,"inputs":[{"name":"crossAddress","type":"address"}],"name":"remoteDestroy","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"crossAddress","type":"address"}],"name":"deployRemote","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"deploy","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"destroy","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"emitter_address","type":"address"}],"name":"read","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"increment","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"crossAddress","type":"address"}],"name":"incrementRemote","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"contractAddress","type":"address"}],"name":"NewEventEmitter","type":"event"}]
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/CrossContractReader.bin b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/CrossContractReader.bin
deleted file mode 100644
index a18bc7505c9..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/CrossContractReader.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b506104b7806100206000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c806383197ef01161005b57806383197ef0146100d8578063a087a87e146100e0578063d09de08a14610118578063e689ef8a146101205761007d565b8063305155f9146100825780635374ded2146100aa578063775c300c146100d0575b600080fd5b6100a86004803603602081101561009857600080fd5b50356001600160a01b0316610146565b005b6100a8600480360360208110156100c057600080fd5b50356001600160a01b03166101a2565b6100a86101e2565b6100a8610250565b610106600480360360208110156100f657600080fd5b50356001600160a01b0316610253565b60408051918252519081900360200190f35b6100a86102c5565b6100a86004803603602081101561013657600080fd5b50356001600160a01b03166102d0565b6000819050806001600160a01b03166383197ef06040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561018657600080fd5b505af115801561019a573d6000803e3d6000fd5b505050505050565b6000819050806001600160a01b031663775c300c6040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561018657600080fd5b60006040516101f090610310565b604051809103906000f08015801561020c573d6000803e3d6000fd5b50604080516001600160a01b038316815290519192507f9ac6876e0aa40667ffeaa9b359b5ed924f4cdd0e029eb6e9c369e78c68f711fb919081900360200190a150565b33ff5b600080829050806001600160a01b0316633fa4f2456040518163ffffffff1660e01b815260040160206040518083038186803b15801561029257600080fd5b505afa1580156102a6573d6000803e3d6000fd5b505050506040513d60208110156102bc57600080fd5b50519392505050565b600080546001019055565b6000819050806001600160a01b031663d09de08a6040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561018657600080fd5b6101658061031e8339019056fe608060405234801561001057600080fd5b50600080546001600160a01b03191633179055610133806100326000396000f3fe6080604052348015600f57600080fd5b5060043610603c5760003560e01c80633fa4f2451460415780636057361d14605957806367e404ce146075575b600080fd5b60476097565b60408051918252519081900360200190f35b607360048036036020811015606d57600080fd5b5035609d565b005b607b60ef565b604080516001600160a01b039092168252519081900360200190f35b60025490565b604080513381526020810183905281517fc9db20adedc6cf2b5d25252b101ab03e124902a73fcb12b753f3d1aaa2d8f9f5929181900390910190a1600255600180546001600160a01b03191633179055565b6001546001600160a01b03169056fea265627a7a72305820dc1ce4d08260105d146ec5efa5274950ee9e66f81ff18994d44a40fbd33e45c064736f6c634300050a0032a265627a7a72305820d71e5a225a48fdeb043aaba4264138353b3443a28658bacec7570e108659ad2864736f6c634300050a0032
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/CrossContractReader.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/CrossContractReader.java
deleted file mode 100644
index ef87c493c50..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/CrossContractReader.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.web3j.generated;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import io.reactivex.Flowable;
-import org.web3j.abi.EventEncoder;
-import org.web3j.abi.TypeReference;
-import org.web3j.abi.datatypes.Address;
-import org.web3j.abi.datatypes.Event;
-import org.web3j.abi.datatypes.Function;
-import org.web3j.abi.datatypes.Type;
-import org.web3j.abi.datatypes.generated.Uint256;
-import org.web3j.crypto.Credentials;
-import org.web3j.protocol.Web3j;
-import org.web3j.protocol.core.DefaultBlockParameter;
-import org.web3j.protocol.core.RemoteCall;
-import org.web3j.protocol.core.RemoteFunctionCall;
-import org.web3j.protocol.core.methods.request.EthFilter;
-import org.web3j.protocol.core.methods.response.BaseEventResponse;
-import org.web3j.protocol.core.methods.response.Log;
-import org.web3j.protocol.core.methods.response.TransactionReceipt;
-import org.web3j.tx.Contract;
-import org.web3j.tx.TransactionManager;
-import org.web3j.tx.gas.ContractGasProvider;
-
-/**
- * Auto generated code.
- *
- * <p><strong>Do not modify!</strong>
- *
- * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
- * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the <a
- * href="https://github.com/web3j/web3j/tree/master/codegen">codegen module</a> to update.
- *
- * <p>Generated with web3j version 4.5.0.
- */
-@SuppressWarnings("rawtypes")
-public class CrossContractReader extends Contract {
-  private static final String BINARY =
-      "608060405234801561001057600080fd5b506104b7806100206000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c806383197ef01161005b57806383197ef0146100d8578063a087a87e146100e0578063d09de08a14610118578063e689ef8a146101205761007d565b8063305155f9146100825780635374ded2146100aa578063775c300c146100d0575b600080fd5b6100a86004803603602081101561009857600080fd5b50356001600160a01b0316610146565b005b6100a8600480360360208110156100c057600080fd5b50356001600160a01b03166101a2565b6100a86101e2565b6100a8610250565b610106600480360360208110156100f657600080fd5b50356001600160a01b0316610253565b60408051918252519081900360200190f35b6100a86102c5565b6100a86004803603602081101561013657600080fd5b50356001600160a01b03166102d0565b6000819050806001600160a01b03166383197ef06040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561018657600080fd5b505af115801561019a573d6000803e3d6000fd5b505050505050565b6000819050806001600160a01b031663775c300c6040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561018657600080fd5b60006040516101f090610310565b604051809103906000f08015801561020c573d6000803e3d6000fd5b50604080516001600160a01b038316815290519192507f9ac6876e0aa40667ffeaa9b359b5ed924f4cdd0e029eb6e9c369e78c68f711fb919081900360200190a150565b33ff5b600080829050806001600160a01b0316633fa4f2456040518163ffffffff1660e01b815260040160206040518083038186803b15801561029257600080fd5b505afa1580156102a6573d6000803e3d6000fd5b505050506040513d60208110156102bc57600080fd5b50519392505050565b600080546001019055565b6000819050806001600160a01b031663d09de08a6040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561018657600080fd5b6101658061031e8339019056fe608060405234801561001057600080fd5b50600080546001600160a01b03191633179055610133806100326000396000f3fe6080604052348015600f57600080fd5b5060043610603c5760003560e01c80633fa4f2451460415780636057361d14605957806367e404ce146075575b600080fd5b60476097565b60408051918252519081900360200190f35b607360048036036020811015606d57600080fd5b5035609d565b005b607b60ef565b604080516001600160a01b039092168252519081900360200190f35b60025490565b604080513381526020810183905281517fc9db20adedc6cf2b5d25252b101ab03e124902a73fcb12b753f3d1aaa2d8f9f5929181900390910190a1600255600180546001600160a01b03191633179055565b6001546001600160a01b03169056fea265627a7a72305820dc1ce4d08260105d146ec5efa5274950ee9e66f81ff18994d44a40fbd33e45c064736f6c634300050a0032a265627a7a72305820d71e5a225a48fdeb043aaba4264138353b3443a28658bacec7570e108659ad2864736f6c634300050a0032";
-
-  public static final String FUNC_REMOTEDESTROY = "remoteDestroy";
-
-  public static final String FUNC_DEPLOYREMOTE = "deployRemote";
-
-  public static final String FUNC_DESTROY = "destroy";
-
-  public static final String FUNC_READ = "read";
-
-  public static final String FUNC_INCREMENT = "increment";
-
-  public static final String FUNC_INCREMENTREMOTE = "incrementRemote";
-
-  public static final Event NEWEVENTEMITTER_EVENT =
-      new Event(
-          "NewEventEmitter", Arrays.<TypeReference<?>>asList(new TypeReference<Address>() {}));;
-
-  @Deprecated
-  protected CrossContractReader(
-      final String contractAddress,
-      final Web3j web3j,
-      final Credentials credentials,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    super(BINARY, contractAddress, web3j, credentials, gasPrice, gasLimit);
-  }
-
-  protected CrossContractReader(
-      final String contractAddress,
-      final Web3j web3j,
-      final Credentials credentials,
-      final ContractGasProvider contractGasProvider) {
-    super(BINARY, contractAddress, web3j, credentials, contractGasProvider);
-  }
-
-  @Deprecated
-  protected CrossContractReader(
-      final String contractAddress,
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    super(BINARY, contractAddress, web3j, transactionManager, gasPrice, gasLimit);
-  }
-
-  protected CrossContractReader(
-      final String contractAddress,
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final ContractGasProvider contractGasProvider) {
-    super(BINARY, contractAddress, web3j, transactionManager, contractGasProvider);
-  }
-
-  public RemoteFunctionCall<TransactionReceipt> remoteDestroy(final String crossAddress) {
-    final Function function =
-        new Function(
-            FUNC_REMOTEDESTROY,
-            Arrays.<Type>asList(new org.web3j.abi.datatypes.Address(160, crossAddress)),
-            Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  public RemoteFunctionCall<TransactionReceipt> deployRemote(final String crossAddress) {
-    final Function function =
-        new Function(
-            FUNC_DEPLOYREMOTE,
-            Arrays.<Type>asList(new org.web3j.abi.datatypes.Address(160, crossAddress)),
-            Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  public RemoteFunctionCall<TransactionReceipt> deploy() {
-    final Function function =
-        new Function(FUNC_DEPLOY, Arrays.<Type>asList(), Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  public RemoteFunctionCall<TransactionReceipt> destroy() {
-    final Function function =
-        new Function(
-            FUNC_DESTROY, Arrays.<Type>asList(), Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  public RemoteFunctionCall<BigInteger> read(final String emitter_address) {
-    final Function function =
-        new Function(
-            FUNC_READ,
-            Arrays.<Type>asList(new org.web3j.abi.datatypes.Address(160, emitter_address)),
-            Arrays.<TypeReference<?>>asList(new TypeReference<Uint256>() {}));
-    return executeRemoteCallSingleValueReturn(function, BigInteger.class);
-  }
-
-  public RemoteFunctionCall<TransactionReceipt> increment() {
-    final Function function =
-        new Function(
-            FUNC_INCREMENT, Arrays.<Type>asList(), Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  public RemoteFunctionCall<TransactionReceipt> incrementRemote(final String crossAddress) {
-    final Function function =
-        new Function(
-            FUNC_INCREMENTREMOTE,
-            Arrays.<Type>asList(new org.web3j.abi.datatypes.Address(160, crossAddress)),
-            Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  public List<NewEventEmitterEventResponse> getNewEventEmitterEvents(
-      final TransactionReceipt transactionReceipt) {
-    List<Contract.EventValuesWithLog> valueList =
-        extractEventParametersWithLog(NEWEVENTEMITTER_EVENT, transactionReceipt);
-    ArrayList<NewEventEmitterEventResponse> responses =
-        new ArrayList<NewEventEmitterEventResponse>(valueList.size());
-    for (Contract.EventValuesWithLog eventValues : valueList) {
-      NewEventEmitterEventResponse typedResponse = new NewEventEmitterEventResponse();
-      typedResponse.log = eventValues.getLog();
-      typedResponse.contractAddress = (String) eventValues.getNonIndexedValues().get(0).getValue();
-      responses.add(typedResponse);
-    }
-    return responses;
-  }
-
-  public Flowable<NewEventEmitterEventResponse> newEventEmitterEventFlowable(
-      final EthFilter filter) {
-    return web3j
-        .ethLogFlowable(filter)
-        .map(
-            new io.reactivex.functions.Function<Log, NewEventEmitterEventResponse>() {
-              @Override
-              public NewEventEmitterEventResponse apply(final Log log) {
-                Contract.EventValuesWithLog eventValues =
-                    extractEventParametersWithLog(NEWEVENTEMITTER_EVENT, log);
-                NewEventEmitterEventResponse typedResponse = new NewEventEmitterEventResponse();
-                typedResponse.log = log;
-                typedResponse.contractAddress =
-                    (String) eventValues.getNonIndexedValues().get(0).getValue();
-                return typedResponse;
-              }
-            });
-  }
-
-  public Flowable<NewEventEmitterEventResponse> newEventEmitterEventFlowable(
-      final DefaultBlockParameter startBlock, final DefaultBlockParameter endBlock) {
-    EthFilter filter = new EthFilter(startBlock, endBlock, getContractAddress());
-    filter.addSingleTopic(EventEncoder.encode(NEWEVENTEMITTER_EVENT));
-    return newEventEmitterEventFlowable(filter);
-  }
-
-  @Deprecated
-  public static CrossContractReader load(
-      final String contractAddress,
-      final Web3j web3j,
-      final Credentials credentials,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    return new CrossContractReader(contractAddress, web3j, credentials, gasPrice, gasLimit);
-  }
-
-  @Deprecated
-  public static CrossContractReader load(
-      final String contractAddress,
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    return new CrossContractReader(contractAddress, web3j, transactionManager, gasPrice, gasLimit);
-  }
-
-  public static CrossContractReader load(
-      final String contractAddress,
-      final Web3j web3j,
-      final Credentials credentials,
-      final ContractGasProvider contractGasProvider) {
-    return new CrossContractReader(contractAddress, web3j, credentials, contractGasProvider);
-  }
-
-  public static CrossContractReader load(
-      final String contractAddress,
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final ContractGasProvider contractGasProvider) {
-    return new CrossContractReader(contractAddress, web3j, transactionManager, contractGasProvider);
-  }
-
-  public static RemoteCall<CrossContractReader> deploy(
-      final Web3j web3j,
-      final Credentials credentials,
-      final ContractGasProvider contractGasProvider) {
-    return deployRemoteCall(
-        CrossContractReader.class, web3j, credentials, contractGasProvider, BINARY, "");
-  }
-
-  @Deprecated
-  public static RemoteCall<CrossContractReader> deploy(
-      final Web3j web3j,
-      final Credentials credentials,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    return deployRemoteCall(
-        CrossContractReader.class, web3j, credentials, gasPrice, gasLimit, BINARY, "");
-  }
-
-  public static RemoteCall<CrossContractReader> deploy(
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final ContractGasProvider contractGasProvider) {
-    return deployRemoteCall(
-        CrossContractReader.class, web3j, transactionManager, contractGasProvider, BINARY, "");
-  }
-
-  @Deprecated
-  public static RemoteCall<CrossContractReader> deploy(
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    return deployRemoteCall(
-        CrossContractReader.class, web3j, transactionManager, gasPrice, gasLimit, BINARY, "");
-  }
-
-  public static class NewEventEmitterEventResponse extends BaseEventResponse {
-    public String contractAddress;
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.abi b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.abi
deleted file mode 100644
index 4f6111952ae..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.abi
+++ /dev/null
@@ -1 +0,0 @@
-[{"constant":true,"inputs":[],"name":"value","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_amount","type":"uint256"}],"name":"store","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"sender","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_to","type":"address"},{"indexed":false,"name":"_amount","type":"uint256"}],"name":"stored","type":"event"}]
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.bin b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.bin
deleted file mode 100644
index 4707225e47f..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5060008054600160a060020a03191633179055610199806100326000396000f3fe6080604052600436106100565763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811461005b5780636057361d1461008257806367e404ce146100ae575b600080fd5b34801561006757600080fd5b506100706100ec565b60408051918252519081900360200190f35b34801561008e57600080fd5b506100ac600480360360208110156100a557600080fd5b50356100f2565b005b3480156100ba57600080fd5b506100c3610151565b6040805173ffffffffffffffffffffffffffffffffffffffff9092168252519081900360200190f35b60025490565b604080513381526020810183905281517fc9db20adedc6cf2b5d25252b101ab03e124902a73fcb12b753f3d1aaa2d8f9f5929181900390910190a16002556001805473ffffffffffffffffffffffffffffffffffffffff191633179055565b60015473ffffffffffffffffffffffffffffffffffffffff169056fea165627a7a72305820c7f729cb24e05c221f5aa913700793994656f233fe2ce3b9fd9a505ea17e8d8a0029
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.java
deleted file mode 100644
index 6153433b0b7..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/EventEmitter.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.web3j.generated;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import io.reactivex.Flowable;
-import org.web3j.abi.EventEncoder;
-import org.web3j.abi.TypeReference;
-import org.web3j.abi.datatypes.Address;
-import org.web3j.abi.datatypes.Event;
-import org.web3j.abi.datatypes.Function;
-import org.web3j.abi.datatypes.Type;
-import org.web3j.abi.datatypes.generated.Uint256;
-import org.web3j.crypto.Credentials;
-import org.web3j.protocol.Web3j;
-import org.web3j.protocol.core.DefaultBlockParameter;
-import org.web3j.protocol.core.RemoteCall;
-import org.web3j.protocol.core.RemoteFunctionCall;
-import org.web3j.protocol.core.methods.request.EthFilter;
-import org.web3j.protocol.core.methods.response.BaseEventResponse;
-import org.web3j.protocol.core.methods.response.Log;
-import org.web3j.protocol.core.methods.response.TransactionReceipt;
-import org.web3j.tx.Contract;
-import org.web3j.tx.TransactionManager;
-import org.web3j.tx.gas.ContractGasProvider;
-
-/**
- * Auto generated code.
- *
- * <p><strong>Do not modify!</strong>
- *
- * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
- * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the <a
- * href="https://github.com/web3j/web3j/tree/master/codegen">codegen module</a> to update.
- *
- * <p>Generated with web3j version 4.4.1.
- */
-@SuppressWarnings("rawtypes")
-public class EventEmitter extends Contract {
-  public static final String BINARY =
-      "608060405234801561001057600080fd5b5060008054600160a060020a03191633179055610199806100326000396000f3fe6080604052600436106100565763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811461005b5780636057361d1461008257806367e404ce146100ae575b600080fd5b34801561006757600080fd5b506100706100ec565b60408051918252519081900360200190f35b34801561008e57600080fd5b506100ac600480360360208110156100a557600080fd5b50356100f2565b005b3480156100ba57600080fd5b506100c3610151565b6040805173ffffffffffffffffffffffffffffffffffffffff9092168252519081900360200190f35b60025490565b604080513381526020810183905281517fc9db20adedc6cf2b5d25252b101ab03e124902a73fcb12b753f3d1aaa2d8f9f5929181900390910190a16002556001805473ffffffffffffffffffffffffffffffffffffffff191633179055565b60015473ffffffffffffffffffffffffffffffffffffffff169056fea165627a7a72305820c7f729cb24e05c221f5aa913700793994656f233fe2ce3b9fd9a505ea17e8d8a0029";
-
-  public static final String FUNC_VALUE = "value";
-
-  public static final String FUNC_STORE = "store";
-
-  public static final String FUNC_SENDER = "sender";
-
-  public static final Event STORED_EVENT =
-      new Event(
-          "stored",
-          Arrays.<TypeReference<?>>asList(
-              new TypeReference<Address>() {}, new TypeReference<Uint256>() {}));;
-
-  @Deprecated
-  protected EventEmitter(
-      final String contractAddress,
-      final Web3j web3j,
-      final Credentials credentials,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    super(BINARY, contractAddress, web3j, credentials, gasPrice, gasLimit);
-  }
-
-  protected EventEmitter(
-      final String contractAddress,
-      final Web3j web3j,
-      final Credentials credentials,
-      final ContractGasProvider contractGasProvider) {
-    super(BINARY, contractAddress, web3j, credentials, contractGasProvider);
-  }
-
-  @Deprecated
-  protected EventEmitter(
-      final String contractAddress,
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    super(BINARY, contractAddress, web3j, transactionManager, gasPrice, gasLimit);
-  }
-
-  protected EventEmitter(
-      final String contractAddress,
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final ContractGasProvider contractGasProvider) {
-    super(BINARY, contractAddress, web3j, transactionManager, contractGasProvider);
-  }
-
-  public RemoteFunctionCall<BigInteger> value() {
-    final Function function =
-        new Function(
-            FUNC_VALUE,
-            Arrays.<Type>asList(),
-            Arrays.<TypeReference<?>>asList(new TypeReference<Uint256>() {}));
-    return executeRemoteCallSingleValueReturn(function, BigInteger.class);
-  }
-
-  public RemoteFunctionCall<TransactionReceipt> store(final BigInteger _amount) {
-    final Function function =
-        new Function(
-            FUNC_STORE,
-            Arrays.<Type>asList(new org.web3j.abi.datatypes.generated.Uint256(_amount)),
-            Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  public RemoteFunctionCall<String> sender() {
-    final Function function =
-        new Function(
-            FUNC_SENDER,
-            Arrays.<Type>asList(),
-            Arrays.<TypeReference<?>>asList(new TypeReference<Address>() {}));
-    return executeRemoteCallSingleValueReturn(function, String.class);
-  }
-
-  public List<StoredEventResponse> getStoredEvents(final TransactionReceipt transactionReceipt) {
-    List<Contract.EventValuesWithLog> valueList =
-        extractEventParametersWithLog(STORED_EVENT, transactionReceipt);
-    ArrayList<StoredEventResponse> responses = new ArrayList<StoredEventResponse>(valueList.size());
-    for (Contract.EventValuesWithLog eventValues : valueList) {
-      StoredEventResponse typedResponse = new StoredEventResponse();
-      typedResponse.log = eventValues.getLog();
-      typedResponse._to = (String) eventValues.getNonIndexedValues().get(0).getValue();
-      typedResponse._amount = (BigInteger) eventValues.getNonIndexedValues().get(1).getValue();
-      responses.add(typedResponse);
-    }
-    return responses;
-  }
-
-  public Flowable<StoredEventResponse> storedEventFlowable(final EthFilter filter) {
-    return web3j
-        .ethLogFlowable(filter)
-        .map(
-            new io.reactivex.functions.Function<Log, StoredEventResponse>() {
-              @Override
-              public StoredEventResponse apply(final Log log) {
-                Contract.EventValuesWithLog eventValues =
-                    extractEventParametersWithLog(STORED_EVENT, log);
-                StoredEventResponse typedResponse = new StoredEventResponse();
-                typedResponse.log = log;
-                typedResponse._to = (String) eventValues.getNonIndexedValues().get(0).getValue();
-                typedResponse._amount =
-                    (BigInteger) eventValues.getNonIndexedValues().get(1).getValue();
-                return typedResponse;
-              }
-            });
-  }
-
-  public Flowable<StoredEventResponse> storedEventFlowable(
-      final DefaultBlockParameter startBlock, final DefaultBlockParameter endBlock) {
-    EthFilter filter = new EthFilter(startBlock, endBlock, getContractAddress());
-    filter.addSingleTopic(EventEncoder.encode(STORED_EVENT));
-    return storedEventFlowable(filter);
-  }
-
-  @Deprecated
-  public static EventEmitter load(
-      final String contractAddress,
-      final Web3j web3j,
-      final Credentials credentials,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    return new EventEmitter(contractAddress, web3j, credentials, gasPrice, gasLimit);
-  }
-
-  @Deprecated
-  public static EventEmitter load(
-      final String contractAddress,
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    return new EventEmitter(contractAddress, web3j, transactionManager, gasPrice, gasLimit);
-  }
-
-  public static EventEmitter load(
-      final String contractAddress,
-      final Web3j web3j,
-      final Credentials credentials,
-      final ContractGasProvider contractGasProvider) {
-    return new EventEmitter(contractAddress, web3j, credentials, contractGasProvider);
-  }
-
-  public static EventEmitter load(
-      final String contractAddress,
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final ContractGasProvider contractGasProvider) {
-    return new EventEmitter(contractAddress, web3j, transactionManager, contractGasProvider);
-  }
-
-  public static RemoteCall<EventEmitter> deploy(
-      final Web3j web3j,
-      final Credentials credentials,
-      final ContractGasProvider contractGasProvider) {
-    return deployRemoteCall(
-        EventEmitter.class, web3j, credentials, contractGasProvider, BINARY, "");
-  }
-
-  public static RemoteCall<EventEmitter> deploy(
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final ContractGasProvider contractGasProvider) {
-    return deployRemoteCall(
-        EventEmitter.class, web3j, transactionManager, contractGasProvider, BINARY, "");
-  }
-
-  @Deprecated
-  public static RemoteCall<EventEmitter> deploy(
-      final Web3j web3j,
-      final Credentials credentials,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    return deployRemoteCall(EventEmitter.class, web3j, credentials, gasPrice, gasLimit, BINARY, "");
-  }
-
-  @Deprecated
-  public static RemoteCall<EventEmitter> deploy(
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    return deployRemoteCall(
-        EventEmitter.class, web3j, transactionManager, gasPrice, gasLimit, BINARY, "");
-  }
-
-  public static class StoredEventResponse extends BaseEventResponse {
-    public String _to;
-
-    public BigInteger _amount;
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.abi b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.abi
deleted file mode 100644
index e1bf8b04639..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.abi
+++ /dev/null
@@ -1 +0,0 @@
-[{"constant":true,"inputs":[],"name":"revertWithRevertReason","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"pure","type":"function"},{"constant":true,"inputs":[],"name":"revertWithoutRevertReason","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"pure","type":"function"}]
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.bin b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.bin
deleted file mode 100644
index 1848ca10c17..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5060d18061001f6000396000f3fe6080604052348015600f57600080fd5b506004361060325760003560e01c806311f95f6f146037578063ff489d31146051575b600080fd5b603d6057565b604080519115158252519081900360200190f35b603d6095565b6040805162461bcd60e51b815260206004820152600c60248201526b2932bb32b93a2932b0b9b7b760a11b6044820152905160009181900360640190fd5b6000806000fdfea265627a7a723058202dd24b599e57aa54899e1beceec3fb4a5001fccb4be994e8d18aa03cc123708764736f6c634300050a0032
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.java
deleted file mode 100644
index 5fdea67f4bc..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/RevertReason.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.web3j.generated;
-
-import java.math.BigInteger;
-import java.util.Arrays;
-
-import org.web3j.abi.TypeReference;
-import org.web3j.abi.datatypes.Bool;
-import org.web3j.abi.datatypes.Function;
-import org.web3j.abi.datatypes.Type;
-import org.web3j.crypto.Credentials;
-import org.web3j.protocol.Web3j;
-import org.web3j.protocol.core.RemoteCall;
-import org.web3j.tx.Contract;
-import org.web3j.tx.TransactionManager;
-import org.web3j.tx.gas.ContractGasProvider;
-
-/**
- * Auto generated code.
- *
- * <p><strong>Do not modify!</strong>
- *
- * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
- * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the <a
- * href="https://github.com/web3j/web3j/tree/master/codegen">codegen module</a> to update.
- *
- * <p>Generated with web3j version 4.3.0.
- */
-@SuppressWarnings("rawtypes")
-public class RevertReason extends Contract {
-  private static final String BINARY =
-      "608060405234801561001057600080fd5b5060d18061001f6000396000f3fe6080604052348015600f57600080fd5b506004361060325760003560e01c806311f95f6f146037578063ff489d31146051575b600080fd5b603d6057565b604080519115158252519081900360200190f35b603d6095565b6040805162461bcd60e51b815260206004820152600c60248201526b2932bb32b93a2932b0b9b7b760a11b6044820152905160009181900360640190fd5b6000806000fdfea265627a7a723058202dd24b599e57aa54899e1beceec3fb4a5001fccb4be994e8d18aa03cc123708764736f6c634300050a0032";
-
-  public static final String FUNC_REVERTWITHREVERTREASON = "revertWithRevertReason";
-
-  public static final String FUNC_REVERTWITHOUTREVERTREASON = "revertWithoutRevertReason";
-
-  @Deprecated
-  protected RevertReason(
-      final String contractAddress,
-      final Web3j web3j,
-      final Credentials credentials,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    super(BINARY, contractAddress, web3j, credentials, gasPrice, gasLimit);
-  }
-
-  protected RevertReason(
-      final String contractAddress,
-      final Web3j web3j,
-      final Credentials credentials,
-      final ContractGasProvider contractGasProvider) {
-    super(BINARY, contractAddress, web3j, credentials, contractGasProvider);
-  }
-
-  @Deprecated
-  protected RevertReason(
-      final String contractAddress,
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    super(BINARY, contractAddress, web3j, transactionManager, gasPrice, gasLimit);
-  }
-
-  protected RevertReason(
-      final String contractAddress,
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final ContractGasProvider contractGasProvider) {
-    super(BINARY, contractAddress, web3j, transactionManager, contractGasProvider);
-  }
-
-  public RemoteCall<Boolean> revertWithRevertReason() {
-    final Function function =
-        new Function(
-            FUNC_REVERTWITHREVERTREASON,
-            Arrays.<Type>asList(),
-            Arrays.<TypeReference<?>>asList(new TypeReference<Bool>() {}));
-    return executeRemoteCallSingleValueReturn(function, Boolean.class);
-  }
-
-  public RemoteCall<Boolean> revertWithoutRevertReason() {
-    final Function function =
-        new Function(
-            FUNC_REVERTWITHOUTREVERTREASON,
-            Arrays.<Type>asList(),
-            Arrays.<TypeReference<?>>asList(new TypeReference<Bool>() {}));
-    return executeRemoteCallSingleValueReturn(function, Boolean.class);
-  }
-
-  @Deprecated
-  public static RevertReason load(
-      final String contractAddress,
-      final Web3j web3j,
-      final Credentials credentials,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    return new RevertReason(contractAddress, web3j, credentials, gasPrice, gasLimit);
-  }
-
-  @Deprecated
-  public static RevertReason load(
-      final String contractAddress,
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    return new RevertReason(contractAddress, web3j, transactionManager, gasPrice, gasLimit);
-  }
-
-  public static RevertReason load(
-      final String contractAddress,
-      final Web3j web3j,
-      final Credentials credentials,
-      final ContractGasProvider contractGasProvider) {
-    return new RevertReason(contractAddress, web3j, credentials, contractGasProvider);
-  }
-
-  public static RevertReason load(
-      final String contractAddress,
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final ContractGasProvider contractGasProvider) {
-    return new RevertReason(contractAddress, web3j, transactionManager, contractGasProvider);
-  }
-
-  public static RemoteCall<RevertReason> deploy(
-      final Web3j web3j,
-      final Credentials credentials,
-      final ContractGasProvider contractGasProvider) {
-    return deployRemoteCall(
-        RevertReason.class, web3j, credentials, contractGasProvider, BINARY, "");
-  }
-
-  @Deprecated
-  public static RemoteCall<RevertReason> deploy(
-      final Web3j web3j,
-      final Credentials credentials,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    return deployRemoteCall(RevertReason.class, web3j, credentials, gasPrice, gasLimit, BINARY, "");
-  }
-
-  public static RemoteCall<RevertReason> deploy(
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final ContractGasProvider contractGasProvider) {
-    return deployRemoteCall(
-        RevertReason.class, web3j, transactionManager, contractGasProvider, BINARY, "");
-  }
-
-  @Deprecated
-  public static RemoteCall<RevertReason> deploy(
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    return deployRemoteCall(
-        RevertReason.class, web3j, transactionManager, gasPrice, gasLimit, BINARY, "");
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.abi b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.abi
deleted file mode 100644
index 4880337f3df..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.abi
+++ /dev/null
@@ -1 +0,0 @@
-[{"constant":false,"inputs":[{"name":"value","type":"uint256"}],"name":"set","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"get","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"}]
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.bin b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.bin
deleted file mode 100644
index 60203ddfac7..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.bin
+++ /dev/null
@@ -1 +0,0 @@
-608060405234801561001057600080fd5b5060d08061001f6000396000f3fe60806040526004361060485763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166360fe47b18114604d5780636d4ce63c146075575b600080fd5b348015605857600080fd5b50607360048036036020811015606d57600080fd5b50356099565b005b348015608057600080fd5b506087609e565b60408051918252519081900360200190f35b600055565b6000549056fea165627a7a72305820cb1d0935d14b589300b12fcd0ab849a7e9019c81da24d6daa4f6b2f003d1b0180029
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.java
deleted file mode 100644
index 323bfc216b9..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/generated/SimpleStorage.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.web3j.generated;
-
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.Collections;
-
-import org.web3j.abi.TypeReference;
-import org.web3j.abi.datatypes.Function;
-import org.web3j.abi.datatypes.Type;
-import org.web3j.abi.datatypes.generated.Uint256;
-import org.web3j.crypto.Credentials;
-import org.web3j.protocol.Web3j;
-import org.web3j.protocol.core.RemoteCall;
-import org.web3j.protocol.core.methods.response.TransactionReceipt;
-import org.web3j.tx.Contract;
-import org.web3j.tx.TransactionManager;
-import org.web3j.tx.gas.ContractGasProvider;
-
-/**
- * Auto generated code.
- *
- * <p><strong>Do not modify!</strong>
- *
- * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
- * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the <a
- * href="https://github.com/web3j/web3j/tree/master/codegen">codegen module</a> to update.
- *
- * <p>Generated with web3j version 4.0.1.
- */
-@SuppressWarnings("rawtypes")
-public class SimpleStorage extends Contract {
-  private static final String BINARY =
-      "608060405234801561001057600080fd5b5060d08061001f6000396000f3fe60806040526004361060485763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166360fe47b18114604d5780636d4ce63c146075575b600080fd5b348015605857600080fd5b50607360048036036020811015606d57600080fd5b50356099565b005b348015608057600080fd5b506087609e565b60408051918252519081900360200190f35b600055565b6000549056fea165627a7a72305820cb1d0935d14b589300b12fcd0ab849a7e9019c81da24d6daa4f6b2f003d1b0180029";
-
-  public static final String FUNC_SET = "set";
-
-  public static final String FUNC_GET = "get";
-
-  @Deprecated
-  protected SimpleStorage(
-      final String contractAddress,
-      final Web3j web3j,
-      final Credentials credentials,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    super(BINARY, contractAddress, web3j, credentials, gasPrice, gasLimit);
-  }
-
-  protected SimpleStorage(
-      final String contractAddress,
-      final Web3j web3j,
-      final Credentials credentials,
-      final ContractGasProvider contractGasProvider) {
-    super(BINARY, contractAddress, web3j, credentials, contractGasProvider);
-  }
-
-  @Deprecated
-  protected SimpleStorage(
-      final String contractAddress,
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    super(BINARY, contractAddress, web3j, transactionManager, gasPrice, gasLimit);
-  }
-
-  protected SimpleStorage(
-      final String contractAddress,
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final ContractGasProvider contractGasProvider) {
-    super(BINARY, contractAddress, web3j, transactionManager, contractGasProvider);
-  }
-
-  public RemoteCall<TransactionReceipt> set(final BigInteger value) {
-    final Function function =
-        new Function(
-            FUNC_SET,
-            Arrays.<Type>asList(new org.web3j.abi.datatypes.generated.Uint256(value)),
-            Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  public RemoteCall<BigInteger> get() {
-    final Function function =
-        new Function(
-            FUNC_GET,
-            Arrays.<Type>asList(),
-            Arrays.<TypeReference<?>>asList(new TypeReference<Uint256>() {}));
-    return executeRemoteCallSingleValueReturn(function, BigInteger.class);
-  }
-
-  @Deprecated
-  public static SimpleStorage load(
-      final String contractAddress,
-      final Web3j web3j,
-      final Credentials credentials,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    return new SimpleStorage(contractAddress, web3j, credentials, gasPrice, gasLimit);
-  }
-
-  @Deprecated
-  public static SimpleStorage load(
-      final String contractAddress,
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    return new SimpleStorage(contractAddress, web3j, transactionManager, gasPrice, gasLimit);
-  }
-
-  public static SimpleStorage load(
-      final String contractAddress,
-      final Web3j web3j,
-      final Credentials credentials,
-      final ContractGasProvider contractGasProvider) {
-    return new SimpleStorage(contractAddress, web3j, credentials, contractGasProvider);
-  }
-
-  public static SimpleStorage load(
-      final String contractAddress,
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final ContractGasProvider contractGasProvider) {
-    return new SimpleStorage(contractAddress, web3j, transactionManager, contractGasProvider);
-  }
-
-  public static RemoteCall<SimpleStorage> deploy(
-      final Web3j web3j,
-      final Credentials credentials,
-      final ContractGasProvider contractGasProvider) {
-    return deployRemoteCall(
-        SimpleStorage.class, web3j, credentials, contractGasProvider, BINARY, "");
-  }
-
-  @Deprecated
-  public static RemoteCall<SimpleStorage> deploy(
-      final Web3j web3j,
-      final Credentials credentials,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    return deployRemoteCall(
-        SimpleStorage.class, web3j, credentials, gasPrice, gasLimit, BINARY, "");
-  }
-
-  public static RemoteCall<SimpleStorage> deploy(
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final ContractGasProvider contractGasProvider) {
-    return deployRemoteCall(
-        SimpleStorage.class, web3j, transactionManager, contractGasProvider, BINARY, "");
-  }
-
-  @Deprecated
-  public static RemoteCall<SimpleStorage> deploy(
-      final Web3j web3j,
-      final TransactionManager transactionManager,
-      final BigInteger gasPrice,
-      final BigInteger gasLimit) {
-    return deployRemoteCall(
-        SimpleStorage.class, web3j, transactionManager, gasPrice, gasLimit, BINARY, "");
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/DeployPrivateSmartContractAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/DeployPrivateSmartContractAcceptanceTest.java
deleted file mode 100644
index 57858c423d9..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/DeployPrivateSmartContractAcceptanceTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.web3j.privacy;
-
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
-import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class DeployPrivateSmartContractAcceptanceTest extends PrivacyAcceptanceTestBase {
-
-  private static final long POW_CHAIN_ID = 2018;
-
-  private PrivacyNode minerNode;
-
-  @Before
-  public void setUp() throws Exception {
-    minerNode =
-        privacyBesu.createPrivateTransactionEnabledMinerNode(
-            "miner-node", privacyAccountResolver.resolve(0));
-    privacyCluster.start(minerNode);
-  }
-
-  @Test
-  public void deployingMustGiveValidReceiptAndCode() throws Exception {
-    final String contractAddress = "0x89ce396d0f9f937ddfa71113e29b2081c4869555";
-
-    final EventEmitter eventEmitter =
-        minerNode.execute(
-            privateContractTransactions.createSmartContract(
-                EventEmitter.class,
-                minerNode.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                minerNode.getEnclaveKey()));
-
-    privateContractVerifier
-        .validPrivateContractDeployed(contractAddress, minerNode.getAddress().toString())
-        .verify(eventEmitter);
-
-    privateContractVerifier.validContractCodeProvided().verify(eventEmitter);
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java
deleted file mode 100644
index 481a1e38581..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EnclaveErrorAcceptanceTest.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.web3j.privacy;
-
-import static org.assertj.core.api.Assertions.catchThrowable;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
-import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
-
-import java.math.BigInteger;
-import java.util.Base64;
-
-import org.apache.tuweni.crypto.sodium.Box;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.web3j.protocol.besu.response.privacy.PrivateTransactionReceipt;
-
-public class EnclaveErrorAcceptanceTest extends PrivacyAcceptanceTestBase {
-
-  private static final long IBFT2_CHAIN_ID = 4;
-
-  private PrivacyNode alice;
-  private PrivacyNode bob;
-  private String wrongPublicKey;
-
-  @Before
-  public void setUp() throws Exception {
-    alice = privacyBesu.createIbft2NodePrivacyEnabled("node1", privacyAccountResolver.resolve(0));
-    bob = privacyBesu.createIbft2NodePrivacyEnabled("node2", privacyAccountResolver.resolve(1));
-    privacyCluster.start(alice, bob);
-
-    wrongPublicKey =
-        Base64.getEncoder().encodeToString(Box.KeyPair.random().publicKey().bytesArray());
-  }
-
-  @Test
-  public void aliceCannotSendTransactionFromBobNode() {
-    final Throwable throwable =
-        catchThrowable(
-            () ->
-                alice.execute(
-                    privateContractTransactions.createSmartContract(
-                        EventEmitter.class,
-                        alice.getTransactionSigningKey(),
-                        IBFT2_CHAIN_ID,
-                        wrongPublicKey,
-                        bob.getEnclaveKey())));
-
-    assertThat(throwable)
-        .hasMessageContaining(
-            JsonRpcError.PRIVATE_FROM_DOES_NOT_MATCH_ENCLAVE_PUBLIC_KEY.getMessage());
-  }
-
-  @Test
-  public void enclaveNoPeerUrlError() {
-    final Throwable throwable =
-        catchThrowable(
-            () ->
-                alice.execute(
-                    privateContractTransactions.createSmartContract(
-                        EventEmitter.class,
-                        alice.getTransactionSigningKey(),
-                        IBFT2_CHAIN_ID,
-                        alice.getEnclaveKey(),
-                        wrongPublicKey)));
-
-    assertThat(throwable).hasMessageContaining(JsonRpcError.NODE_MISSING_PEER_URL.getMessage());
-  }
-
-  @Test
-  public void whenEnclaveIsDisconnectedGetReceiptReturnsInternalError() {
-    final EventEmitter eventEmitter =
-        alice.execute(
-            privateContractTransactions.createSmartContract(
-                EventEmitter.class,
-                alice.getTransactionSigningKey(),
-                IBFT2_CHAIN_ID,
-                alice.getEnclaveKey(),
-                bob.getEnclaveKey()));
-
-    privateContractVerifier
-        .validPrivateContractDeployed(
-            eventEmitter.getContractAddress(), alice.getAddress().toString())
-        .verify(eventEmitter);
-
-    final String transactionHash =
-        alice.execute(
-            privateContractTransactions.callSmartContract(
-                eventEmitter.getContractAddress(),
-                eventEmitter.store(BigInteger.ONE).encodeFunctionCall(),
-                alice.getTransactionSigningKey(),
-                IBFT2_CHAIN_ID,
-                alice.getEnclaveKey(),
-                bob.getEnclaveKey()));
-
-    final PrivateTransactionReceipt receiptBeforeEnclaveLosesConnection =
-        alice.execute(privacyTransactions.getPrivateTransactionReceipt(transactionHash));
-
-    alice.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(
-            transactionHash, receiptBeforeEnclaveLosesConnection));
-
-    alice.getOrion().stop();
-
-    alice.verify(
-        privateTransactionVerifier.internalErrorPrivateTransactionReceipt(transactionHash));
-  }
-
-  @Test
-  @Ignore("Web3J is broken by PR #1426")
-  public void transactionFailsIfPartyIsOffline() {
-    // Contract address is generated from sender address and transaction nonce
-    final String contractAddress = "0xebf56429e6500e84442467292183d4d621359838";
-
-    final EventEmitter eventEmitter =
-        alice.execute(
-            privateContractTransactions.createSmartContract(
-                EventEmitter.class,
-                alice.getTransactionSigningKey(),
-                IBFT2_CHAIN_ID,
-                alice.getEnclaveKey(),
-                bob.getEnclaveKey()));
-
-    privateContractVerifier
-        .validPrivateContractDeployed(contractAddress, alice.getAddress().toString())
-        .verify(eventEmitter);
-
-    bob.getOrion().stop();
-
-    final Throwable throwable =
-        catchThrowable(
-            () ->
-                alice.execute(
-                    privateContractTransactions.callSmartContract(
-                        eventEmitter.getContractAddress(),
-                        eventEmitter.store(BigInteger.ONE).encodeFunctionCall(),
-                        alice.getTransactionSigningKey(),
-                        IBFT2_CHAIN_ID,
-                        alice.getEnclaveKey(),
-                        bob.getEnclaveKey())));
-
-    assertThat(throwable).hasMessageContaining("NodePropagatingToAllPeers");
-  }
-
-  @Test
-  public void createPrivacyGroupReturnsCorrectError() {
-    final Throwable throwable =
-        catchThrowable(() -> alice.execute(privacyTransactions.createPrivacyGroup(null, null)));
-
-    assertThat(throwable).hasMessageContaining(JsonRpcError.CREATE_GROUP_INCLUDE_SELF.getMessage());
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EthSignerAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EthSignerAcceptanceTest.java
deleted file mode 100644
index 0cbd711e3db..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/EthSignerAcceptanceTest.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.web3j.privacy;
-
-import org.hyperledger.besu.tests.acceptance.dsl.ethsigner.EthSignerClient;
-import org.hyperledger.besu.tests.acceptance.dsl.ethsigner.testutil.EthSignerTestHarness;
-import org.hyperledger.besu.tests.acceptance.dsl.ethsigner.testutil.EthSignerTestHarnessFactory;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
-import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.Collections;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.web3j.protocol.besu.response.privacy.PrivacyGroup;
-import org.web3j.protocol.besu.response.privacy.PrivateTransactionReceipt;
-import org.web3j.utils.Base64String;
-
-public class EthSignerAcceptanceTest extends PrivacyAcceptanceTestBase {
-
-  private PrivacyNode minerNode;
-  private EthSignerTestHarness ethSigner;
-
-  private EthSignerClient ethSignerClient;
-
-  @Before
-  public void setUp() throws Exception {
-    minerNode =
-        privacyBesu.createPrivateTransactionEnabledMinerNode(
-            "miner-node", privacyAccountResolver.resolve(0));
-    privacyCluster.start(minerNode);
-
-    ethSigner =
-        EthSignerTestHarnessFactory.create(
-            privacy.newFolder().toPath(),
-            "ethSignerKey--fe3b557e8fb62b89f4916b721be55ceb828dbd73.json",
-            minerNode.getBesu().getJsonRpcSocketPort().orElseThrow(),
-            2018);
-
-    ethSignerClient = new EthSignerClient(ethSigner.getHttpListeningUrl());
-  }
-
-  @Test
-  public void privateSmartContractMustDeploy() throws IOException {
-    final String transactionHash =
-        ethSignerClient.eeaSendTransaction(
-            null,
-            BigInteger.valueOf(23176),
-            BigInteger.valueOf(1000),
-            EventEmitter.BINARY,
-            BigInteger.valueOf(0),
-            minerNode.getEnclaveKey(),
-            Collections.emptyList(),
-            "restricted");
-
-    final PrivateTransactionReceipt receipt =
-        minerNode.execute(privacyTransactions.getPrivateTransactionReceipt(transactionHash));
-
-    minerNode.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(transactionHash, receipt));
-  }
-
-  // requires ethsigner jar > 0.3.0
-  // https://bintray.com/consensys/pegasys-repo/ethsigner
-  @Test
-  @Ignore
-  public void privateSmartContractMustDeployNoNonce() throws IOException {
-    final String transactionHash =
-        ethSignerClient.eeaSendTransaction(
-            null,
-            BigInteger.valueOf(23176),
-            BigInteger.valueOf(1000),
-            EventEmitter.BINARY,
-            minerNode.getEnclaveKey(),
-            Collections.emptyList(),
-            "restricted");
-
-    final PrivateTransactionReceipt receipt =
-        minerNode.execute(privacyTransactions.getPrivateTransactionReceipt(transactionHash));
-
-    minerNode.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(transactionHash, receipt));
-  }
-
-  @Test
-  public void privateSmartContractMustDeployWithPrivacyGroup() throws IOException {
-    final String privacyGroupId =
-        minerNode.execute(privacyTransactions.createPrivacyGroup(null, null, minerNode));
-
-    minerNode.verify(
-        privateTransactionVerifier.validPrivacyGroupCreated(
-            new PrivacyGroup(
-                privacyGroupId,
-                PrivacyGroup.Type.PANTHEON,
-                "",
-                "",
-                Base64String.wrapList(minerNode.getEnclaveKey()))));
-
-    final String transactionHash =
-        ethSignerClient.eeaSendTransaction(
-            null,
-            BigInteger.valueOf(23176),
-            BigInteger.valueOf(1000),
-            EventEmitter.BINARY,
-            BigInteger.valueOf(0),
-            minerNode.getEnclaveKey(),
-            privacyGroupId,
-            "restricted");
-
-    final PrivateTransactionReceipt receipt =
-        minerNode.execute(privacyTransactions.getPrivateTransactionReceipt(transactionHash));
-
-    minerNode.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(transactionHash, receipt));
-  }
-
-  @Test
-  public void privateSmartContractMustDeployWithPrivacyGroupNoNonce() throws IOException {
-    final String privacyGroupId =
-        minerNode.execute(privacyTransactions.createPrivacyGroup(null, null, minerNode));
-
-    minerNode.verify(
-        privateTransactionVerifier.validPrivacyGroupCreated(
-            new PrivacyGroup(
-                privacyGroupId,
-                PrivacyGroup.Type.PANTHEON,
-                "",
-                "",
-                Base64String.wrapList(minerNode.getEnclaveKey()))));
-
-    final String transactionHash =
-        ethSignerClient.eeaSendTransaction(
-            null,
-            BigInteger.valueOf(23176),
-            BigInteger.valueOf(1000),
-            EventEmitter.BINARY,
-            minerNode.getEnclaveKey(),
-            privacyGroupId,
-            "restricted");
-
-    final PrivateTransactionReceipt receipt =
-        minerNode.execute(privacyTransactions.getPrivateTransactionReceipt(transactionHash));
-
-    minerNode.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(transactionHash, receipt));
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/Ibft2PrivacyClusterAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/Ibft2PrivacyClusterAcceptanceTest.java
deleted file mode 100644
index f2d22fc6c21..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/Ibft2PrivacyClusterAcceptanceTest.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.web3j.privacy;
-
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
-import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
-
-import java.math.BigInteger;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.web3j.protocol.besu.response.privacy.PrivateTransactionReceipt;
-
-public class Ibft2PrivacyClusterAcceptanceTest extends PrivacyAcceptanceTestBase {
-
-  private static final long IBFT2_CHAIN_ID = 4;
-
-  private PrivacyNode alice;
-  private PrivacyNode bob;
-  private PrivacyNode charlie;
-
-  @Before
-  public void setUp() throws Exception {
-    alice = privacyBesu.createIbft2NodePrivacyEnabled("node1", privacyAccountResolver.resolve(0));
-    bob = privacyBesu.createIbft2NodePrivacyEnabled("node2", privacyAccountResolver.resolve(1));
-    charlie = privacyBesu.createIbft2NodePrivacyEnabled("node3", privacyAccountResolver.resolve(2));
-    privacyCluster.start(alice, bob, charlie);
-  }
-
-  @Test
-  public void onlyAliceAndBobCanExecuteContract() {
-    // Contract address is generated from sender address and transaction nonce
-    final String contractAddress = "0xebf56429e6500e84442467292183d4d621359838";
-
-    final EventEmitter eventEmitter =
-        alice.execute(
-            privateContractTransactions.createSmartContract(
-                EventEmitter.class,
-                alice.getTransactionSigningKey(),
-                IBFT2_CHAIN_ID,
-                alice.getEnclaveKey(),
-                bob.getEnclaveKey()));
-
-    privateContractVerifier
-        .validPrivateContractDeployed(contractAddress, alice.getAddress().toString())
-        .verify(eventEmitter);
-
-    final String transactionHash =
-        alice.execute(
-            privateContractTransactions.callSmartContract(
-                eventEmitter.getContractAddress(),
-                eventEmitter.store(BigInteger.ONE).encodeFunctionCall(),
-                alice.getTransactionSigningKey(),
-                IBFT2_CHAIN_ID,
-                alice.getEnclaveKey(),
-                bob.getEnclaveKey()));
-
-    final PrivateTransactionReceipt expectedReceipt =
-        alice.execute(privacyTransactions.getPrivateTransactionReceipt(transactionHash));
-
-    bob.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(
-            transactionHash, expectedReceipt));
-    charlie.verify(privateTransactionVerifier.noPrivateTransactionReceipt(transactionHash));
-  }
-
-  @Test
-  public void aliceCanDeployMultipleTimesInSingleGroup() {
-    final String firstDeployedAddress = "0xebf56429e6500e84442467292183d4d621359838";
-
-    privacyCluster.stopNode(charlie);
-
-    final EventEmitter firstEventEmitter =
-        alice.execute(
-            privateContractTransactions.createSmartContract(
-                EventEmitter.class,
-                alice.getTransactionSigningKey(),
-                IBFT2_CHAIN_ID,
-                alice.getEnclaveKey(),
-                bob.getEnclaveKey()));
-
-    privateContractVerifier
-        .validPrivateContractDeployed(firstDeployedAddress, alice.getAddress().toString())
-        .verify(firstEventEmitter);
-
-    final String secondDeployedAddress = "0x10f807f8a905da5bd319196da7523c6bd768690f";
-
-    final EventEmitter secondEventEmitter =
-        alice.execute(
-            privateContractTransactions.createSmartContract(
-                EventEmitter.class,
-                alice.getTransactionSigningKey(),
-                IBFT2_CHAIN_ID,
-                alice.getEnclaveKey(),
-                bob.getEnclaveKey()));
-
-    privateContractVerifier
-        .validPrivateContractDeployed(secondDeployedAddress, alice.getAddress().toString())
-        .verify(secondEventEmitter);
-  }
-
-  @Test
-  public void canInteractWithMultiplePrivacyGroups() {
-    // alice deploys contract
-    final String firstDeployedAddress = "0xff206d21150a8da5b83629d8a722f3135ed532b1";
-
-    final EventEmitter firstEventEmitter =
-        alice.execute(
-            privateContractTransactions.createSmartContract(
-                EventEmitter.class,
-                alice.getTransactionSigningKey(),
-                IBFT2_CHAIN_ID,
-                alice.getEnclaveKey(),
-                bob.getEnclaveKey(),
-                charlie.getEnclaveKey()));
-
-    privateContractVerifier
-        .validPrivateContractDeployed(firstDeployedAddress, alice.getAddress().toString())
-        .verify(firstEventEmitter);
-
-    // charlie interacts with contract
-    final String firstTransactionHash =
-        charlie.execute(
-            privateContractTransactions.callSmartContract(
-                firstEventEmitter.getContractAddress(),
-                firstEventEmitter.store(BigInteger.ONE).encodeFunctionCall(),
-                charlie.getTransactionSigningKey(),
-                IBFT2_CHAIN_ID,
-                charlie.getEnclaveKey(),
-                alice.getEnclaveKey(),
-                bob.getEnclaveKey()));
-
-    // alice gets receipt from charlie's interaction
-    final PrivateTransactionReceipt aliceReceipt =
-        alice.execute(privacyTransactions.getPrivateTransactionReceipt(firstTransactionHash));
-
-    // verify bob and charlie have access to the same receipt
-    bob.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(
-            firstTransactionHash, aliceReceipt));
-    charlie.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(
-            firstTransactionHash, aliceReceipt));
-
-    // alice deploys second contract
-    final String secondDeployedAddress = "0xebf56429e6500e84442467292183d4d621359838";
-
-    final EventEmitter secondEventEmitter =
-        alice.execute(
-            privateContractTransactions.createSmartContract(
-                EventEmitter.class,
-                alice.getTransactionSigningKey(),
-                IBFT2_CHAIN_ID,
-                alice.getEnclaveKey(),
-                bob.getEnclaveKey()));
-
-    privateContractVerifier
-        .validPrivateContractDeployed(secondDeployedAddress, alice.getAddress().toString())
-        .verify(secondEventEmitter);
-
-    // bob interacts with contract
-    final String secondTransactionHash =
-        bob.execute(
-            privateContractTransactions.callSmartContract(
-                secondEventEmitter.getContractAddress(),
-                secondEventEmitter.store(BigInteger.ONE).encodeFunctionCall(),
-                bob.getTransactionSigningKey(),
-                IBFT2_CHAIN_ID,
-                bob.getEnclaveKey(),
-                alice.getEnclaveKey()));
-
-    // alice gets receipt from bob's interaction
-    final PrivateTransactionReceipt secondExpectedReceipt =
-        alice.execute(privacyTransactions.getPrivateTransactionReceipt(secondTransactionHash));
-
-    bob.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(
-            secondTransactionHash, secondExpectedReceipt));
-
-    // charlie cannot see the receipt
-    charlie.verify(privateTransactionVerifier.noPrivateTransactionReceipt(secondTransactionHash));
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/OnChainPrivacyAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/OnChainPrivacyAcceptanceTest.java
deleted file mode 100644
index 25d366b0f2a..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/OnChainPrivacyAcceptanceTest.java
+++ /dev/null
@@ -1,492 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.web3j.privacy;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.tests.acceptance.dsl.condition.eth.EthConditions;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.miner.MinerTransactions;
-import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
-
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
-import com.google.common.collect.Lists;
-import org.junit.Before;
-import org.junit.Test;
-import org.web3j.crypto.Credentials;
-import org.web3j.protocol.besu.response.privacy.PrivateTransactionReceipt;
-import org.web3j.protocol.core.methods.response.EthCall;
-import org.web3j.protocol.core.methods.response.Log;
-import org.web3j.protocol.core.methods.response.TransactionReceipt;
-import org.web3j.tx.Contract;
-
-public class OnChainPrivacyAcceptanceTest extends OnChainPrivacyAcceptanceTestBase {
-
-  protected static final long POW_CHAIN_ID = 2018;
-
-  private PrivacyNode alice;
-  private PrivacyNode bob;
-  private PrivacyNode charlie;
-
-  private final MinerTransactions minerTransactions = new MinerTransactions();
-  private final EthConditions ethConditions = new EthConditions(ethTransactions);
-
-  private static final String EXPECTED_STORE_OUTPUT_DATA =
-      "0x000000000000000000000000f17f52151ebef6c7334fad080c5704d77216b7320000000000000000000000000000000000000000000000000000000000000539";
-  private static final String EXPECTED_STORE_EVENT_TOPIC =
-      "0xc9db20adedc6cf2b5d25252b101ab03e124902a73fcb12b753f3d1aaa2d8f9f5";
-
-  @Before
-  public void setUp() throws Exception {
-    alice =
-        privacyBesu.createOnChainPrivacyGroupEnabledMinerNode(
-            "node1", privacyAccountResolver.resolve(0), Address.PRIVACY, false);
-    bob =
-        privacyBesu.createOnChainPrivacyGroupEnabledNode(
-            "node2", privacyAccountResolver.resolve(1), Address.PRIVACY, false);
-    charlie =
-        privacyBesu.createOnChainPrivacyGroupEnabledNode(
-            "node3", privacyAccountResolver.resolve(2), Address.PRIVACY, false);
-    privacyCluster.start(alice, bob, charlie);
-  }
-
-  @Test
-  public void nodeCanCreatePrivacyGroup() {
-    final String privacyGroupId = createOnChainPrivacyGroup(alice);
-    checkOnChainPrivacyGroupExists(privacyGroupId, alice);
-  }
-
-  @Test
-  public void deployingMustGiveValidReceipt() {
-    final String privacyGroupId = createOnChainPrivacyGroup(alice, bob);
-    final Contract eventEmitter = deployPrivateContract(EventEmitter.class, privacyGroupId, alice);
-    final String commitmentHash = getContractDeploymentCommitmentHash(eventEmitter);
-
-    alice.verify(privateTransactionVerifier.existingPrivateTransactionReceipt(commitmentHash));
-    bob.verify(privateTransactionVerifier.existingPrivateTransactionReceipt(commitmentHash));
-  }
-
-  @Test
-  public void canAddParticipantToGroup() {
-    final String privacyGroupId = createOnChainPrivacyGroup(alice, bob);
-    final Contract eventEmitter = deployPrivateContract(EventEmitter.class, privacyGroupId, alice);
-    final String commitmentHash = getContractDeploymentCommitmentHash(eventEmitter);
-
-    charlie.verify(privateTransactionVerifier.noPrivateTransactionReceipt(commitmentHash));
-
-    final Credentials aliceCredentials = Credentials.create(alice.getTransactionSigningKey());
-    lockPrivacyGroup(privacyGroupId, alice, aliceCredentials);
-    addMembersToPrivacyGroup(privacyGroupId, alice, aliceCredentials, charlie);
-    checkOnChainPrivacyGroupExists(privacyGroupId, alice, bob, charlie);
-
-    charlie.verify(privateTransactionVerifier.existingPrivateTransactionReceipt(commitmentHash));
-  }
-
-  @Test
-  public void removedMemberCannotSendTransactionToGroup() {
-    final String privacyGroupId = createOnChainPrivacyGroup(alice, bob);
-
-    final String removeHash =
-        removeFromPrivacyGroup(
-            privacyGroupId, alice, Credentials.create(alice.getTransactionSigningKey()), bob);
-
-    bob.verify(privateTransactionVerifier.existingPrivateTransactionReceipt(removeHash));
-
-    assertThatThrownBy(() -> deployPrivateContract(EventEmitter.class, privacyGroupId, bob))
-        .isInstanceOf(RuntimeException.class)
-        .hasMessageContaining("Onchain Privacy group does not exist.");
-  }
-
-  @Test
-  public void memberCanBeAddedAfterBeingRemoved() {
-    final String privacyGroupId = createOnChainPrivacyGroup(alice);
-
-    checkOnChainPrivacyGroupExists(privacyGroupId, alice);
-
-    lockPrivacyGroup(privacyGroupId, alice, Credentials.create(alice.getTransactionSigningKey()));
-    addMembersToPrivacyGroup(
-        privacyGroupId, alice, Credentials.create(alice.getTransactionSigningKey()), bob);
-
-    checkOnChainPrivacyGroupExists(privacyGroupId, alice, bob);
-
-    final EventEmitter eventEmitter =
-        deployPrivateContract(EventEmitter.class, privacyGroupId, alice);
-
-    final int valueSetWhileBobWasMember = 17;
-    final PrivateTransactionReceipt receiptWhileBobMember =
-        setEventEmitterValueAndCheck(
-            Lists.newArrayList(alice, bob),
-            privacyGroupId,
-            eventEmitter,
-            valueSetWhileBobWasMember);
-
-    removeFromPrivacyGroup(
-        privacyGroupId, alice, Credentials.create(alice.getTransactionSigningKey()), bob);
-
-    checkOnChainPrivacyGroupExists(privacyGroupId, alice);
-
-    final int valueSetWhileBobWas_NOT_aMember = 1337;
-    final PrivateTransactionReceipt receiptWhileBobRemoved =
-        setEventEmitterValueAndCheck(
-            Lists.newArrayList(alice),
-            privacyGroupId,
-            eventEmitter,
-            valueSetWhileBobWas_NOT_aMember);
-    checkEmitterValue(
-        Lists.newArrayList(bob),
-        privacyGroupId,
-        eventEmitter,
-        valueSetWhileBobWasMember); // bob did not get the last transaction
-
-    lockPrivacyGroup(privacyGroupId, alice, Credentials.create(alice.getTransactionSigningKey()));
-    addMembersToPrivacyGroup(
-        privacyGroupId, alice, Credentials.create(alice.getTransactionSigningKey()), bob);
-
-    checkOnChainPrivacyGroupExists(privacyGroupId, alice, bob);
-
-    checkEmitterValue(
-        Lists.newArrayList(alice, bob),
-        privacyGroupId,
-        eventEmitter,
-        valueSetWhileBobWas_NOT_aMember);
-
-    PrivateTransactionReceipt receipt =
-        bob.execute(
-            privacyTransactions.getPrivateTransactionReceipt(
-                receiptWhileBobRemoved.getcommitmentHash()));
-    assertThat(receipt.getStatus()).isEqualTo("0x1");
-
-    receipt =
-        bob.execute(
-            privacyTransactions.getPrivateTransactionReceipt(
-                receiptWhileBobMember.getcommitmentHash()));
-    assertThat(receipt.getStatus()).isEqualTo("0x1");
-  }
-
-  PrivateTransactionReceipt setEventEmitterValueAndCheck(
-      final List<PrivacyNode> nodes,
-      final String privacyGroupId,
-      final EventEmitter eventEmitter,
-      final int value) {
-    final PrivateTransactionReceipt receiptWhileBobMember =
-        setEventEmitterValue(nodes, privacyGroupId, eventEmitter, value);
-
-    checkEmitterValue(nodes, privacyGroupId, eventEmitter, value);
-    return receiptWhileBobMember;
-  }
-
-  private PrivateTransactionReceipt setEventEmitterValue(
-      final List<PrivacyNode> nodes,
-      final String privacyGroupId,
-      final EventEmitter eventEmitter,
-      final int value) {
-    final PrivacyNode firstNode = nodes.get(0);
-    final String txHash =
-        firstNode.execute(
-            privateContractTransactions.callOnChainPermissioningSmartContract(
-                eventEmitter.getContractAddress(),
-                eventEmitter.store(BigInteger.valueOf(value)).encodeFunctionCall(),
-                firstNode.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                firstNode.getEnclaveKey(),
-                privacyGroupId));
-    PrivateTransactionReceipt receipt = null;
-    for (final PrivacyNode node : nodes) {
-      receipt = node.execute(privacyTransactions.getPrivateTransactionReceipt(txHash));
-      assertThat(receipt.getStatus()).isEqualTo("0x1");
-    }
-    return receipt;
-  }
-
-  private void checkEmitterValue(
-      final List<PrivacyNode> nodes,
-      final String privacyGroupId,
-      final EventEmitter eventEmitter,
-      final int expectedValue) {
-    for (final PrivacyNode node : nodes) {
-      final EthCall response =
-          node.execute(
-              privacyTransactions.privCall(
-                  privacyGroupId, eventEmitter, eventEmitter.value().encodeFunctionCall()));
-
-      assertThat(new BigInteger(response.getValue().substring(2), 16))
-          .isEqualByComparingTo(BigInteger.valueOf(expectedValue));
-    }
-  }
-
-  @Test
-  public void bobCanAddCharlieAfterBeingAddedByAlice() {
-    final String privacyGroupId = createOnChainPrivacyGroup(alice);
-    checkOnChainPrivacyGroupExists(privacyGroupId, alice);
-    final EventEmitter eventEmitter =
-        alice.execute(
-            privateContractTransactions.createSmartContractWithPrivacyGroupId(
-                EventEmitter.class,
-                alice.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                alice.getEnclaveKey(),
-                privacyGroupId));
-
-    privateContractVerifier
-        .validPrivateContractDeployed(
-            eventEmitter.getContractAddress(), alice.getAddress().toString())
-        .verify(eventEmitter);
-
-    final Credentials aliceCredentials = Credentials.create(alice.getTransactionSigningKey());
-    final String aliceLockHash =
-        alice.execute(
-            privacyTransactions.privxLockPrivacyGroupAndCheck(
-                privacyGroupId, alice, aliceCredentials));
-
-    alice.execute(
-        privacyTransactions.addToPrivacyGroup(privacyGroupId, alice, aliceCredentials, bob));
-
-    checkOnChainPrivacyGroupExists(privacyGroupId, alice, bob);
-
-    bob.execute(
-        privacyTransactions.privxLockPrivacyGroupAndCheck(privacyGroupId, bob, aliceCredentials));
-
-    alice.execute(minerTransactions.minerStop());
-
-    alice.getBesu().verify(ethConditions.miningStatus(false));
-
-    final BigInteger pendingTransactionFilterId =
-        alice.execute(ethTransactions.newPendingTransactionsFilter());
-
-    final String callHash =
-        alice.execute(
-            privateContractTransactions.callOnChainPermissioningSmartContract(
-                eventEmitter.getContractAddress(),
-                eventEmitter.value().encodeFunctionCall(),
-                alice.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                alice.getEnclaveKey(),
-                privacyGroupId));
-
-    final String bobAddHash =
-        addMembersToPrivacyGroup(privacyGroupId, bob, aliceCredentials, charlie);
-
-    alice
-        .getBesu()
-        .verify(
-            ethConditions.expectNewPendingTransactions(
-                pendingTransactionFilterId, Arrays.asList(callHash, bobAddHash)));
-
-    alice.execute(minerTransactions.minerStart());
-
-    alice.getBesu().verify(ethConditions.miningStatus(true));
-
-    checkOnChainPrivacyGroupExists(privacyGroupId, alice, bob, charlie);
-
-    final Optional<TransactionReceipt> aliceAddReceipt =
-        alice.execute(ethTransactions.getTransactionReceipt(bobAddHash));
-    assertThat(aliceAddReceipt.get().getStatus())
-        .isEqualTo("0x1"); // this means the PMT for the "add" succeeded which is what we expect
-
-    final Optional<TransactionReceipt> alicePublicReceipt =
-        alice.execute(ethTransactions.getTransactionReceipt(callHash));
-    if (alicePublicReceipt.isPresent()) {
-      assertThat(alicePublicReceipt.get().getBlockHash())
-          .isEqualTo(
-              aliceAddReceipt
-                  .get()
-                  .getBlockHash()); // ensure that "add" and "call" are in the same block
-      assertThat(alicePublicReceipt.get().getStatus())
-          .isEqualTo(
-              "0x1"); // this means the PMT for the "call" succeeded which is what we expect because
-      // it is in the same block as the "add" and there is no way to tell that this
-      // will happen before the block is mined
-    }
-
-    final PrivateTransactionReceipt aliceReceipt =
-        alice.execute(privacyTransactions.getPrivateTransactionReceipt(callHash));
-    assertThat(aliceReceipt.getStatus())
-        .isEqualTo(
-            "0x0"); // this means the "call" failed which is what we expect because the group was
-    // locked!
-    final PrivateTransactionReceipt bobReceipt =
-        alice.execute(privacyTransactions.getPrivateTransactionReceipt(callHash));
-    assertThat(bobReceipt.getStatus())
-        .isEqualTo(
-            "0x0"); // this means the "call" failed which is what we expect because the group was
-    // locked!
-
-    // assert charlie can access private transaction information from before he was added
-    final PrivateTransactionReceipt expectedAliceLockReceipt =
-        new PrivateTransactionReceipt(
-            null,
-            alice.getAddress().toHexString(),
-            Address.ONCHAIN_PRIVACY_PROXY.toHexString(),
-            "0x",
-            Collections.emptyList(),
-            null,
-            null,
-            alice.getEnclaveKey(),
-            null,
-            privacyGroupId,
-            "0x1",
-            null);
-    charlie.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(
-            aliceLockHash, expectedAliceLockReceipt));
-
-    final String aliceStoreHash =
-        charlie.execute(
-            privateContractTransactions.callOnChainPermissioningSmartContract(
-                eventEmitter.getContractAddress(),
-                eventEmitter.store(BigInteger.valueOf(1337)).encodeFunctionCall(),
-                charlie.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                charlie.getEnclaveKey(),
-                privacyGroupId));
-
-    final PrivateTransactionReceipt expectedStoreReceipt =
-        new PrivateTransactionReceipt(
-            null,
-            charlie.getAddress().toHexString(),
-            eventEmitter.getContractAddress(),
-            "0x",
-            Collections.singletonList(
-                new Log(
-                    false,
-                    "0x0",
-                    "0x0",
-                    aliceStoreHash,
-                    null,
-                    null,
-                    eventEmitter.getContractAddress(),
-                    EXPECTED_STORE_OUTPUT_DATA,
-                    null,
-                    Collections.singletonList(EXPECTED_STORE_EVENT_TOPIC))),
-            null,
-            null,
-            charlie.getEnclaveKey(),
-            null,
-            privacyGroupId,
-            "0x1",
-            null);
-
-    alice.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(
-            aliceStoreHash, expectedStoreReceipt));
-
-    bob.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(
-            aliceStoreHash, expectedStoreReceipt));
-
-    charlie.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(
-            aliceStoreHash, expectedStoreReceipt));
-
-    removeFromPrivacyGroup(privacyGroupId, bob, aliceCredentials, charlie);
-
-    checkOnChainPrivacyGroupExists(privacyGroupId, alice, bob);
-  }
-
-  @Test
-  public void addMembersToTwoGroupsInTheSameBlock() {
-    final String privacyGroupId1 = createOnChainPrivacyGroup(alice);
-    final String privacyGroupId2 = createOnChainPrivacyGroup(bob);
-    checkOnChainPrivacyGroupExists(privacyGroupId1, alice);
-    checkOnChainPrivacyGroupExists(privacyGroupId2, bob);
-
-    lockPrivacyGroup(privacyGroupId1, alice, Credentials.create(alice.getTransactionSigningKey()));
-    lockPrivacyGroup(privacyGroupId2, bob, Credentials.create(bob.getTransactionSigningKey()));
-
-    final BigInteger pendingTransactionFilterId =
-        alice.execute(ethTransactions.newPendingTransactionsFilter());
-
-    alice.execute(minerTransactions.minerStop());
-    alice.getBesu().verify(ethConditions.miningStatus(false));
-
-    final String aliceAddHash =
-        addMembersToPrivacyGroup(
-            privacyGroupId1, alice, Credentials.create(alice.getTransactionSigningKey()), charlie);
-    final String bobAddHash =
-        addMembersToPrivacyGroup(
-            privacyGroupId2, bob, Credentials.create(bob.getTransactionSigningKey()), alice);
-
-    alice
-        .getBesu()
-        .verify(
-            ethConditions.expectNewPendingTransactions(
-                pendingTransactionFilterId, Arrays.asList(aliceAddHash, bobAddHash)));
-
-    alice.execute(minerTransactions.minerStart());
-
-    checkOnChainPrivacyGroupExists(privacyGroupId1, alice, charlie);
-    checkOnChainPrivacyGroupExists(privacyGroupId2, bob, alice);
-  }
-
-  private <T extends Contract> T deployPrivateContract(
-      final Class<T> clazz, final String privacyGroupId, final PrivacyNode sender) {
-    final T contract =
-        sender.execute(
-            privateContractTransactions.createSmartContractWithPrivacyGroupId(
-                clazz,
-                sender.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                sender.getEnclaveKey(),
-                privacyGroupId));
-
-    privateContractVerifier
-        .validPrivateContractDeployed(contract.getContractAddress(), sender.getAddress().toString())
-        .verify(contract);
-
-    return contract;
-  }
-
-  private String addMembersToPrivacyGroup(
-      final String privacyGroupId,
-      final PrivacyNode nodeAddingMember,
-      final Credentials signer,
-      final PrivacyNode... newMembers) {
-    return nodeAddingMember.execute(
-        privacyTransactions.addToPrivacyGroup(
-            privacyGroupId, nodeAddingMember, signer, newMembers));
-  }
-
-  private String removeFromPrivacyGroup(
-      final String privacyGroupId,
-      final PrivacyNode nodeRemovingMember,
-      final Credentials signer,
-      final PrivacyNode memberBeingRemoved) {
-    return nodeRemovingMember.execute(
-        privacyTransactions.removeFromPrivacyGroup(
-            privacyGroupId,
-            nodeRemovingMember.getEnclaveKey(),
-            signer,
-            memberBeingRemoved.getEnclaveKey()));
-  }
-
-  /**
-   * This method will send a transaction to lock the privacy group identified by the specified id.
-   * This also checks if the lock transaction was successful.
-   *
-   * @return the hash of the lock privacy group transaction
-   */
-  private String lockPrivacyGroup(
-      final String privacyGroupId, final PrivacyNode member, final Credentials signer) {
-    return member.execute(
-        privacyTransactions.privxLockPrivacyGroupAndCheck(privacyGroupId, member, signer));
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/OnChainPrivacyAcceptanceTestBase.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/OnChainPrivacyAcceptanceTestBase.java
deleted file mode 100644
index 28c922513b6..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/OnChainPrivacyAcceptanceTestBase.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.web3j.privacy;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.privacy.group.OnChainGroupManagement.GET_PARTICIPANTS_METHOD_SIGNATURE;
-
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.condition.ExpectValidOnChainPrivacyGroupCreated;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction.CreateOnChainPrivacyGroupTransaction;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.privacy.PrivacyRequestFactory;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.web3j.protocol.besu.response.privacy.PrivateTransactionReceipt;
-import org.web3j.protocol.core.methods.response.TransactionReceipt;
-import org.web3j.tx.Contract;
-import org.web3j.utils.Base64String;
-
-public class OnChainPrivacyAcceptanceTestBase extends PrivacyAcceptanceTestBase {
-
-  protected String createOnChainPrivacyGroup(final PrivacyNode... members) {
-    final List<String> addresses =
-        Arrays.asList(members).stream().map(m -> m.getEnclaveKey()).collect(Collectors.toList());
-    return createOnChainPrivacyGroup(members[0].getEnclaveKey(), addresses, members);
-  }
-
-  /**
-   * Crete an onchain privacy group. The privacy group id will be randomly generated.
-   *
-   * <p>This method also checks that each node member has successfully processed the transaction and
-   * has the expected list of member for the group.
-   *
-   * @param members the list of members of the privacy group. The first member of the list will be
-   *     the creator of the group.
-   * @return the id of the privacy group
-   */
-  protected String createOnChainPrivacyGroup(
-      final String privateFrom, final List<String> addresses, final PrivacyNode... members) {
-
-    final PrivacyNode groupCreator = members[0];
-
-    final CreateOnChainPrivacyGroupTransaction createTx =
-        privacyTransactions.createOnChainPrivacyGroup(groupCreator, privateFrom, addresses);
-
-    final PrivacyRequestFactory.PrivxCreatePrivacyGroupResponse createResponse =
-        groupCreator.execute(createTx);
-    final String privacyGroupId = createResponse.getPrivacyGroupId();
-
-    final List<Base64String> membersEnclaveKeys =
-        Arrays.stream(members)
-            .map(m -> Base64String.wrap(m.getEnclaveKey()))
-            .collect(Collectors.toList());
-
-    for (final PrivacyNode member : members) {
-      member.verify(onChainPrivacyGroupExists(privacyGroupId, membersEnclaveKeys));
-    }
-
-    final String commitmentHash =
-        callGetParticipantsMethodAndReturnCommitmentHash(privacyGroupId, groupCreator, privateFrom);
-    final PrivateTransactionReceipt expectedReceipt =
-        buildExpectedAddMemberTransactionReceipt(
-            privacyGroupId, groupCreator, addresses.toArray(new String[] {}));
-
-    for (final PrivacyNode member : members) {
-      member.verify(
-          privateTransactionVerifier.validPrivateTransactionReceipt(
-              commitmentHash, expectedReceipt));
-    }
-
-    return privacyGroupId;
-  }
-
-  protected String callGetParticipantsMethodAndReturnCommitmentHash(
-      final String privacyGroupId, final PrivacyNode groupCreator, final String privateFrom) {
-    return groupCreator.execute(
-        privateContractTransactions.callOnChainPermissioningSmartContract(
-            Address.ONCHAIN_PRIVACY_PROXY.toHexString(),
-            GET_PARTICIPANTS_METHOD_SIGNATURE.toString(),
-            groupCreator.getTransactionSigningKey(),
-            POW_CHAIN_ID,
-            privateFrom,
-            privacyGroupId));
-  }
-
-  protected PrivateTransactionReceipt buildExpectedAddMemberTransactionReceipt(
-      final String privacyGroupId, final PrivacyNode groupCreator, final String[] members) {
-    return buildExpectedAddMemberTransactionReceipt(
-        privacyGroupId, groupCreator, groupCreator.getEnclaveKey(), members);
-  }
-
-  protected PrivateTransactionReceipt buildExpectedAddMemberTransactionReceipt(
-      final String privacyGroupId,
-      final PrivacyNode groupCreator,
-      final String privateFrom,
-      final String[] members) {
-    final StringBuilder output = new StringBuilder();
-    // hex prefix
-    output.append("0x");
-    // Dynamic array offset
-    output.append("0000000000000000000000000000000000000000000000000000000000000020");
-    // Length of the array (with padded zeros to the left)
-    output.append(Quantity.longToPaddedHex(members.length, 32).substring(2));
-    // Each member enclave key converted from Base64 to bytes
-    for (final String member : members) {
-      output.append(Bytes.fromBase64String(member).toUnprefixedHexString());
-    }
-
-    return new PrivateTransactionReceipt(
-        null,
-        groupCreator.getAddress().toHexString(),
-        Address.ONCHAIN_PRIVACY_PROXY.toHexString(),
-        output.toString(),
-        Collections.emptyList(),
-        null,
-        null,
-        privateFrom,
-        null,
-        privacyGroupId,
-        "0x1",
-        null);
-  }
-
-  protected ExpectValidOnChainPrivacyGroupCreated onChainPrivacyGroupExists(
-      final String privacyGroupId, final List<Base64String> members) {
-    return privateTransactionVerifier.onChainPrivacyGroupExists(privacyGroupId, members);
-  }
-
-  protected String getContractDeploymentCommitmentHash(final Contract contract) {
-    final Optional<TransactionReceipt> transactionReceipt = contract.getTransactionReceipt();
-    assertThat(transactionReceipt).isPresent();
-    final PrivateTransactionReceipt privateTransactionReceipt =
-        (PrivateTransactionReceipt) transactionReceipt.get();
-    return privateTransactionReceipt.getcommitmentHash();
-  }
-
-  /**
-   * This method will check if a privacy group with the specified id and list of members exists.
-   * Each one of the members node will be queried to ensure that they all have the same privacy
-   * group in their private state.
-   *
-   * @param privacyGroupId the id of the privacy group
-   * @param members the list of member in the privacy group
-   */
-  protected void checkOnChainPrivacyGroupExists(
-      final String privacyGroupId, final PrivacyNode... members) {
-    final List<Base64String> membersEnclaveKeys =
-        Arrays.stream(members)
-            .map(PrivacyNode::getEnclaveKey)
-            .map(Base64String::wrap)
-            .collect(Collectors.toList());
-
-    for (final PrivacyNode member : members) {
-      member.verify(onChainPrivacyGroupExists(privacyGroupId, membersEnclaveKeys));
-    }
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivCallAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivCallAcceptanceTest.java
deleted file mode 100644
index f381e27648e..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivCallAcceptanceTest.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.web3j.privacy;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
-import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.jetbrains.annotations.NotNull;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.web3j.abi.FunctionEncoder;
-import org.web3j.abi.TypeReference;
-import org.web3j.abi.datatypes.Function;
-import org.web3j.abi.datatypes.Type;
-import org.web3j.abi.datatypes.generated.Uint256;
-import org.web3j.protocol.core.Request;
-import org.web3j.protocol.core.methods.request.Transaction;
-import org.web3j.protocol.core.methods.response.EthCall;
-import org.web3j.protocol.core.methods.response.TransactionReceipt;
-import org.web3j.protocol.exceptions.ClientConnectionException;
-import org.web3j.protocol.http.HttpService;
-import org.web3j.tx.Contract;
-
-public class PrivCallAcceptanceTest extends PrivacyAcceptanceTestBase {
-
-  private static final long POW_CHAIN_ID = 2018;
-  private static final int VALUE = 1024;
-
-  private PrivacyNode minerNode;
-
-  @Before
-  public void setUp() throws Exception {
-    minerNode =
-        privacyBesu.createPrivateTransactionEnabledMinerNode(
-            "miner-node", privacyAccountResolver.resolve(0));
-    privacyCluster.start(minerNode);
-  }
-
-  @Ignore
-  @Test
-  public void mustReturnCorrectValue() throws Exception {
-
-    final String privacyGroupId =
-        minerNode.execute(
-            privacyTransactions.createPrivacyGroup(
-                "myGroupName", "my group description", minerNode));
-
-    final EventEmitter eventEmitter =
-        minerNode.execute(
-            privateContractTransactions.createSmartContractWithPrivacyGroupId(
-                EventEmitter.class,
-                minerNode.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                minerNode.getEnclaveKey(),
-                privacyGroupId));
-
-    privateContractVerifier
-        .validPrivateContractDeployed(
-            eventEmitter.getContractAddress(), minerNode.getAddress().toString())
-        .verify(eventEmitter);
-
-    final Request<Object, EthCall> priv_call = privCall(privacyGroupId, eventEmitter, false, false);
-
-    EthCall resp = priv_call.send();
-
-    String value = resp.getValue();
-    assertThat(new BigInteger(value.substring(2), 16)).isEqualByComparingTo(BigInteger.ZERO);
-
-    final TransactionReceipt receipt = eventEmitter.store(BigInteger.valueOf(VALUE)).send();
-    assertThat(receipt).isNotNull();
-
-    resp = priv_call.send();
-    value = resp.getValue();
-    assertThat(new BigInteger(value.substring(2), 16))
-        .isEqualByComparingTo(BigInteger.valueOf(VALUE));
-  }
-
-  @Ignore
-  @Test
-  public void shouldReturnEmptyResultWithNonExistingPrivacyGroup() throws IOException {
-
-    final String privacyGroupId =
-        minerNode.execute(
-            privacyTransactions.createPrivacyGroup(
-                "myGroupName", "my group description", minerNode));
-
-    final EventEmitter eventEmitter =
-        minerNode.execute(
-            privateContractTransactions.createSmartContractWithPrivacyGroupId(
-                EventEmitter.class,
-                minerNode.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                minerNode.getEnclaveKey(),
-                privacyGroupId));
-
-    privateContractVerifier
-        .validPrivateContractDeployed(
-            eventEmitter.getContractAddress(), minerNode.getAddress().toString())
-        .verify(eventEmitter);
-
-    final String invalidPrivacyGroup = constructInvalidString(privacyGroupId);
-    final Request<Object, EthCall> privCall =
-        privCall(invalidPrivacyGroup, eventEmitter, false, false);
-
-    final EthCall result = privCall.send();
-
-    assertThat(result.getResult()).isEqualTo("0x");
-  }
-
-  @Ignore
-  @Test
-  public void mustNotSucceedWithWronglyEncodedFunction() {
-
-    final String privacyGroupId =
-        minerNode.execute(
-            privacyTransactions.createPrivacyGroup(
-                "myGroupName", "my group description", minerNode));
-
-    final EventEmitter eventEmitter =
-        minerNode.execute(
-            privateContractTransactions.createSmartContractWithPrivacyGroupId(
-                EventEmitter.class,
-                minerNode.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                minerNode.getEnclaveKey(),
-                privacyGroupId));
-
-    privateContractVerifier
-        .validPrivateContractDeployed(
-            eventEmitter.getContractAddress(), minerNode.getAddress().toString())
-        .verify(eventEmitter);
-
-    final Request<Object, EthCall> priv_call = privCall(privacyGroupId, eventEmitter, true, false);
-
-    assertThatExceptionOfType(ClientConnectionException.class)
-        .isThrownBy(() -> priv_call.send())
-        .withMessageContaining("Invalid params");
-  }
-
-  @Ignore
-  @Test
-  public void mustReturn0xUsingInvalidContractAddress() throws IOException {
-
-    final String privacyGroupId =
-        minerNode.execute(
-            privacyTransactions.createPrivacyGroup(
-                "myGroupName", "my group description", minerNode));
-
-    final EventEmitter eventEmitter =
-        minerNode.execute(
-            privateContractTransactions.createSmartContractWithPrivacyGroupId(
-                EventEmitter.class,
-                minerNode.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                minerNode.getEnclaveKey(),
-                privacyGroupId));
-
-    privateContractVerifier
-        .validPrivateContractDeployed(
-            eventEmitter.getContractAddress(), minerNode.getAddress().toString())
-        .verify(eventEmitter);
-
-    final Request<Object, EthCall> priv_call = privCall(privacyGroupId, eventEmitter, false, true);
-
-    final EthCall result = priv_call.send();
-
-    assertThat(result).isNotNull();
-    assertThat(result.getResult()).isEqualTo("0x");
-  }
-
-  @NotNull
-  private String constructInvalidString(final String privacyGroupId) {
-    final char[] chars = privacyGroupId.toCharArray();
-    if (chars[3] == '0') {
-      chars[3] = '1';
-    } else {
-      chars[3] = '0';
-    }
-    return String.valueOf(chars);
-  }
-
-  @NotNull
-  private Request<Object, EthCall> privCall(
-      final String privacyGroupId,
-      final Contract eventEmitter,
-      final boolean useInvalidParameters,
-      final boolean useInvalidContractAddress) {
-
-    final Uint256 invalid = new Uint256(BigInteger.TEN);
-
-    @SuppressWarnings("rawtypes")
-    final List<Type> inputParameters =
-        useInvalidParameters ? Arrays.asList(invalid) : Collections.emptyList();
-
-    final Function function =
-        new Function(
-            "value",
-            inputParameters,
-            Arrays.<TypeReference<?>>asList(new TypeReference<Uint256>() {}));
-
-    final String encoded = FunctionEncoder.encode(function);
-
-    final HttpService httpService =
-        new HttpService(
-            "http://"
-                + minerNode.getBesu().getHostName()
-                + ":"
-                + minerNode.getBesu().getJsonRpcSocketPort().get());
-
-    final String validContractAddress = eventEmitter.getContractAddress();
-    final String invalidContractAddress = constructInvalidString(validContractAddress);
-    final String contractAddress =
-        useInvalidContractAddress ? invalidContractAddress : validContractAddress;
-
-    final Transaction transaction =
-        Transaction.createEthCallTransaction(null, contractAddress, encoded);
-
-    return new Request<>(
-        "priv_call",
-        Arrays.asList(privacyGroupId, transaction, "latest"),
-        httpService,
-        EthCall.class);
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivGetCodeAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivGetCodeAcceptanceTest.java
deleted file mode 100644
index e07ed2066f9..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivGetCodeAcceptanceTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.web3j.privacy;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
-import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
-import org.junit.Test;
-import org.web3j.protocol.besu.response.privacy.PrivacyGroup;
-import org.web3j.utils.Base64String;
-
-public class PrivGetCodeAcceptanceTest extends PrivacyAcceptanceTestBase {
-
-  private PrivacyNode alice;
-
-  @Before
-  public void setUp() throws Exception {
-    alice =
-        privacyBesu.createPrivateTransactionEnabledMinerNode(
-            "alice", privacyAccountResolver.resolve(0));
-    privacyCluster.start(alice);
-  }
-
-  @Test
-  public void privGetCodeReturnsDeployedContractBytecode() {
-    final String privacyGroupId = createPrivacyGroup();
-    final EventEmitter eventEmitterContract = deployPrivateContract(privacyGroupId);
-
-    final Bytes deployedContractCode =
-        alice.execute(
-            privacyTransactions.privGetCode(
-                privacyGroupId,
-                Address.fromHexString(eventEmitterContract.getContractAddress()),
-                "latest"));
-
-    assertThat(eventEmitterContract.getContractBinary())
-        .contains(deployedContractCode.toUnprefixedHexString());
-  }
-
-  private EventEmitter deployPrivateContract(final String privacyGroupId) {
-    final EventEmitter eventEmitter =
-        alice.execute(
-            privateContractTransactions.createSmartContractWithPrivacyGroupId(
-                EventEmitter.class,
-                alice.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                alice.getEnclaveKey(),
-                privacyGroupId));
-
-    privateContractVerifier
-        .validPrivateContractDeployed(
-            eventEmitter.getContractAddress(), alice.getAddress().toString())
-        .verify(eventEmitter);
-    return eventEmitter;
-  }
-
-  private String createPrivacyGroup() {
-    final String privacyGroupId =
-        alice.execute(
-            privacyTransactions.createPrivacyGroup("myGroupName", "my group description", alice));
-
-    assertThat(privacyGroupId).isNotNull();
-
-    final PrivacyGroup expected =
-        new PrivacyGroup(
-            privacyGroupId,
-            PrivacyGroup.Type.PANTHEON,
-            "myGroupName",
-            "my group description",
-            Base64String.wrapList(alice.getEnclaveKey()));
-
-    alice.verify(privateTransactionVerifier.validPrivacyGroupCreated(expected));
-
-    return privacyGroupId;
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivGetPrivateTransactionAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivGetPrivateTransactionAcceptanceTest.java
deleted file mode 100644
index b318a04b6ed..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivGetPrivateTransactionAcceptanceTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.web3j.privacy;
-
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
-import org.hyperledger.besu.ethereum.privacy.Restriction;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction.CreatePrivacyGroupTransaction;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
-import org.junit.Test;
-
-public class PrivGetPrivateTransactionAcceptanceTest extends PrivacyAcceptanceTestBase {
-
-  private PrivacyNode alice;
-  private PrivacyNode bob;
-
-  @Before
-  public void setUp() throws Exception {
-    alice = privacyBesu.createIbft2NodePrivacyEnabled("node1", privacyAccountResolver.resolve(0));
-    bob = privacyBesu.createIbft2NodePrivacyEnabled("node2", privacyAccountResolver.resolve(1));
-    privacyCluster.start(alice, bob);
-  }
-
-  @Test
-  public void returnsTransaction() {
-    final CreatePrivacyGroupTransaction onlyAlice =
-        privacyTransactions.createPrivacyGroup("Only Alice", "", alice);
-
-    final String privacyGroupId = alice.execute(onlyAlice);
-
-    final PrivateTransaction validSignedPrivateTransaction =
-        getValidSignedPrivateTransaction(alice, privacyGroupId);
-    final BytesValueRLPOutput rlpOutput = getRLPOutput(validSignedPrivateTransaction);
-
-    final Hash transactionHash =
-        alice.execute(privacyTransactions.sendRawTransaction(rlpOutput.encoded().toHexString()));
-
-    alice.getBesu().verify(eth.expectSuccessfulTransactionReceipt(transactionHash.toString()));
-
-    alice
-        .getBesu()
-        .verify(priv.getPrivateTransaction(transactionHash, validSignedPrivateTransaction));
-  }
-
-  @Test
-  public void nonExistentHashReturnsNull() {
-    alice.getBesu().verify(priv.getPrivateTransactionReturnsNull(Hash.ZERO));
-  }
-
-  @Test
-  public void returnsNullTransactionNotInNodesPrivacyGroup() {
-    final CreatePrivacyGroupTransaction onlyAlice =
-        privacyTransactions.createPrivacyGroup("Only Alice", "", alice);
-
-    final String privacyGroupId = alice.execute(onlyAlice);
-
-    final PrivateTransaction validSignedPrivateTransaction =
-        getValidSignedPrivateTransaction(alice, privacyGroupId);
-    final BytesValueRLPOutput rlpOutput = getRLPOutput(validSignedPrivateTransaction);
-
-    final Hash transactionHash =
-        alice.execute(privacyTransactions.sendRawTransaction(rlpOutput.encoded().toHexString()));
-
-    alice.getBesu().verify(eth.expectSuccessfulTransactionReceipt(transactionHash.toString()));
-
-    bob.getBesu().verify(priv.getPrivateTransactionReturnsNull(transactionHash));
-  }
-
-  private BytesValueRLPOutput getRLPOutput(final PrivateTransaction privateTransaction) {
-    final BytesValueRLPOutput bvrlpo = new BytesValueRLPOutput();
-    privateTransaction.writeTo(bvrlpo);
-    return bvrlpo;
-  }
-
-  private static PrivateTransaction getValidSignedPrivateTransaction(
-      final PrivacyNode node, final String privacyGoupId) {
-    return PrivateTransaction.builder()
-        .nonce(0)
-        .gasPrice(Wei.of(999999))
-        .gasLimit(3000000)
-        .to(null)
-        .value(Wei.ZERO)
-        .payload(Bytes.wrap(new byte[] {}))
-        .sender(node.getAddress())
-        .privateFrom(Bytes.fromBase64String(node.getEnclaveKey()))
-        .restriction(Restriction.RESTRICTED)
-        .privacyGroupId(Bytes.fromBase64String(privacyGoupId))
-        .signAndBuild(node.getBesu().getPrivacyParameters().getSigningKeyPair().get());
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java
deleted file mode 100644
index 3bd1f74b512..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyClusterAcceptanceTest.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.web3j.privacy;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.enclave.Enclave;
-import org.hyperledger.besu.enclave.EnclaveFactory;
-import org.hyperledger.besu.enclave.types.ReceiveResponse;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
-import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Collections;
-
-import io.vertx.core.Vertx;
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.web3j.crypto.Credentials;
-import org.web3j.crypto.RawTransaction;
-import org.web3j.crypto.TransactionEncoder;
-import org.web3j.protocol.besu.response.privacy.PrivateTransactionReceipt;
-import org.web3j.protocol.eea.crypto.PrivateTransactionEncoder;
-import org.web3j.protocol.eea.crypto.RawPrivateTransaction;
-import org.web3j.utils.Base64String;
-import org.web3j.utils.Numeric;
-import org.web3j.utils.Restriction;
-
-public class PrivacyClusterAcceptanceTest extends PrivacyAcceptanceTestBase {
-
-  private static final long POW_CHAIN_ID = 2018;
-
-  private static final String eventEmitterDeployed =
-      "0x6080604052600436106100565763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811461005b5780636057361d1461008257806367e404ce146100ae575b600080fd5b34801561006757600080fd5b506100706100ec565b60408051918252519081900360200190f35b34801561008e57600080fd5b506100ac600480360360208110156100a557600080fd5b50356100f2565b005b3480156100ba57600080fd5b506100c3610151565b6040805173ffffffffffffffffffffffffffffffffffffffff9092168252519081900360200190f35b60025490565b604080513381526020810183905281517fc9db20adedc6cf2b5d25252b101ab03e124902a73fcb12b753f3d1aaa2d8f9f5929181900390910190a16002556001805473ffffffffffffffffffffffffffffffffffffffff191633179055565b60015473ffffffffffffffffffffffffffffffffffffffff169056fea165627a7a72305820c7f729cb24e05c221f5aa913700793994656f233fe2ce3b9fd9a505ea17e8d8a0029";
-
-  private PrivacyNode alice;
-  private PrivacyNode bob;
-  private PrivacyNode charlie;
-  private final Vertx vertx = Vertx.vertx();
-  private final EnclaveFactory enclaveFactory = new EnclaveFactory(vertx);
-
-  @Before
-  public void setUp() throws Exception {
-    alice =
-        privacyBesu.createPrivateTransactionEnabledMinerNode(
-            "node1", privacyAccountResolver.resolve(0));
-    bob =
-        privacyBesu.createPrivateTransactionEnabledNode("node2", privacyAccountResolver.resolve(1));
-    charlie =
-        privacyBesu.createPrivateTransactionEnabledNode("node3", privacyAccountResolver.resolve(2));
-    privacyCluster.start(alice, bob, charlie);
-  }
-
-  @After
-  public void cleanUp() {
-    vertx.close();
-  }
-
-  @Test
-  public void onlyAliceAndBobCanExecuteContract() {
-    // Contract address is generated from sender address and transaction nonce
-    final String contractAddress = "0xebf56429e6500e84442467292183d4d621359838";
-
-    final EventEmitter eventEmitter =
-        alice.execute(
-            privateContractTransactions.createSmartContract(
-                EventEmitter.class,
-                alice.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                alice.getEnclaveKey(),
-                bob.getEnclaveKey()));
-
-    privateContractVerifier
-        .validPrivateContractDeployed(contractAddress, alice.getAddress().toString())
-        .verify(eventEmitter);
-
-    final String transactionHash =
-        alice.execute(
-            privateContractTransactions.callSmartContract(
-                eventEmitter.getContractAddress(),
-                eventEmitter.store(BigInteger.ONE).encodeFunctionCall(),
-                alice.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                alice.getEnclaveKey(),
-                bob.getEnclaveKey()));
-
-    final PrivateTransactionReceipt expectedReceipt =
-        alice.execute(privacyTransactions.getPrivateTransactionReceipt(transactionHash));
-
-    bob.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(
-            transactionHash, expectedReceipt));
-
-    charlie.verify(privateTransactionVerifier.noPrivateTransactionReceipt(transactionHash));
-
-    // When Alice executes a contract call in the wrong privacy group the transaction should pass
-    // but it should NOT return any output
-    final String transactionHash2 =
-        alice.execute(
-            privateContractTransactions.callSmartContract(
-                eventEmitter.getContractAddress(),
-                eventEmitter.value().encodeFunctionCall(),
-                alice.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                alice.getEnclaveKey(),
-                charlie.getEnclaveKey()));
-
-    final PrivateTransactionReceipt expectedReceipt2 =
-        alice.execute(privacyTransactions.getPrivateTransactionReceipt(transactionHash2));
-
-    assertThat(expectedReceipt2.getOutput()).isEqualTo("0x");
-
-    charlie.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(
-            transactionHash2, expectedReceipt2));
-  }
-
-  @Test
-  public void aliceCanUsePrivDistributeTransaction() {
-    // Contract address is generated from sender address and transaction nonce
-    final String contractAddress = "0xebf56429e6500e84442467292183d4d621359838";
-
-    final RawPrivateTransaction rawPrivateTransaction =
-        RawPrivateTransaction.createContractTransaction(
-            BigInteger.ZERO,
-            BigInteger.ZERO,
-            BigInteger.ZERO,
-            Numeric.prependHexPrefix(EventEmitter.BINARY),
-            Base64String.wrap(alice.getEnclaveKey()),
-            Collections.singletonList(Base64String.wrap(bob.getEnclaveKey())),
-            Restriction.RESTRICTED);
-
-    final String signedPrivateTransaction =
-        Numeric.toHexString(
-            PrivateTransactionEncoder.signMessage(
-                rawPrivateTransaction,
-                POW_CHAIN_ID,
-                Credentials.create(alice.getTransactionSigningKey())));
-    final String transactionKey =
-        alice.execute(privacyTransactions.privDistributeTransaction(signedPrivateTransaction));
-
-    final Enclave aliceEnclave = enclaveFactory.createVertxEnclave(alice.getOrion().clientUrl());
-    final ReceiveResponse aliceRR =
-        aliceEnclave.receive(
-            Bytes.fromHexString(transactionKey).toBase64String(), alice.getEnclaveKey());
-
-    final Enclave bobEnclave = enclaveFactory.createVertxEnclave(bob.getOrion().clientUrl());
-    final ReceiveResponse bobRR =
-        bobEnclave.receive(
-            Bytes.fromHexString(transactionKey).toBase64String(), bob.getEnclaveKey());
-
-    assertThat(bobRR).isEqualToComparingFieldByField(aliceRR);
-
-    final RawTransaction pmt =
-        RawTransaction.createTransaction(
-            BigInteger.ZERO,
-            BigInteger.valueOf(1000),
-            BigInteger.valueOf(65000),
-            Address.DEFAULT_PRIVACY.toString(),
-            transactionKey);
-
-    final String signedPmt =
-        Numeric.toHexString(
-            TransactionEncoder.signMessage(
-                pmt, POW_CHAIN_ID, Credentials.create(alice.getTransactionSigningKey())));
-
-    final String transactionHash = alice.execute(ethTransactions.sendRawTransaction(signedPmt));
-
-    final PrivateTransactionReceipt expectedReceipt =
-        new PrivateTransactionReceipt(
-            contractAddress,
-            "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
-            null,
-            eventEmitterDeployed,
-            Collections.emptyList(),
-            "0x023955c49d6265c579561940287449242704d5fd239ff07ea36a3fc7aface61c",
-            "0x82e521ee16ff13104c5f81e8354ecaaafd5450b710b07f620204032bfe76041a",
-            "A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=",
-            new ArrayList<>(
-                Collections.singletonList("Ko2bVqD+nNlNYL5EE7y3IdOnviftjiizpjRt+HTuFBs=")),
-            null,
-            "0x1",
-            null);
-
-    alice.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(
-            transactionHash, expectedReceipt));
-
-    bob.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(
-            transactionHash, expectedReceipt));
-  }
-
-  @Test
-  public void aliceCanDeployMultipleTimesInSingleGroup() {
-    final String firstDeployedAddress = "0xebf56429e6500e84442467292183d4d621359838";
-
-    final EventEmitter firstEventEmitter =
-        alice.execute(
-            privateContractTransactions.createSmartContract(
-                EventEmitter.class,
-                alice.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                alice.getEnclaveKey(),
-                bob.getEnclaveKey()));
-
-    privateContractVerifier
-        .validPrivateContractDeployed(firstDeployedAddress, alice.getAddress().toString())
-        .verify(firstEventEmitter);
-
-    final String secondDeployedAddress = "0x10f807f8a905da5bd319196da7523c6bd768690f";
-
-    final EventEmitter secondEventEmitter =
-        alice.execute(
-            privateContractTransactions.createSmartContract(
-                EventEmitter.class,
-                alice.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                alice.getEnclaveKey(),
-                bob.getEnclaveKey()));
-
-    privateContractVerifier
-        .validPrivateContractDeployed(secondDeployedAddress, alice.getAddress().toString())
-        .verify(secondEventEmitter);
-  }
-
-  @Test
-  public void canInteractWithMultiplePrivacyGroups() {
-    // alice deploys contract
-    final String firstDeployedAddress = "0xff206d21150a8da5b83629d8a722f3135ed532b1";
-
-    final EventEmitter firstEventEmitter =
-        alice.execute(
-            privateContractTransactions.createSmartContract(
-                EventEmitter.class,
-                alice.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                alice.getEnclaveKey(),
-                bob.getEnclaveKey(),
-                charlie.getEnclaveKey()));
-
-    privateContractVerifier
-        .validPrivateContractDeployed(firstDeployedAddress, alice.getAddress().toString())
-        .verify(firstEventEmitter);
-
-    // charlie interacts with contract
-    final String firstTransactionHash =
-        charlie.execute(
-            privateContractTransactions.callSmartContract(
-                firstEventEmitter.getContractAddress(),
-                firstEventEmitter.store(BigInteger.ONE).encodeFunctionCall(),
-                charlie.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                charlie.getEnclaveKey(),
-                alice.getEnclaveKey(),
-                bob.getEnclaveKey()));
-
-    // alice gets receipt from charlie's interaction
-    final PrivateTransactionReceipt firstExpectedReceipt =
-        alice.execute(privacyTransactions.getPrivateTransactionReceipt(firstTransactionHash));
-
-    // verify bob and charlie have access to the same receipt
-    bob.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(
-            firstTransactionHash, firstExpectedReceipt));
-    charlie.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(
-            firstTransactionHash, firstExpectedReceipt));
-
-    // alice deploys second contract
-    final String secondDeployedAddress = "0xebf56429e6500e84442467292183d4d621359838";
-
-    final EventEmitter secondEventEmitter =
-        alice.execute(
-            privateContractTransactions.createSmartContract(
-                EventEmitter.class,
-                alice.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                alice.getEnclaveKey(),
-                bob.getEnclaveKey()));
-
-    privateContractVerifier
-        .validPrivateContractDeployed(secondDeployedAddress, alice.getAddress().toString())
-        .verify(secondEventEmitter);
-
-    // bob interacts with contract
-    final String secondTransactionHash =
-        bob.execute(
-            privateContractTransactions.callSmartContract(
-                secondEventEmitter.getContractAddress(),
-                secondEventEmitter.store(BigInteger.ONE).encodeFunctionCall(),
-                bob.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                bob.getEnclaveKey(),
-                alice.getEnclaveKey()));
-
-    // alice gets receipt from bob's interaction
-    final PrivateTransactionReceipt secondExpectedReceipt =
-        alice.execute(privacyTransactions.getPrivateTransactionReceipt(secondTransactionHash));
-
-    bob.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(
-            secondTransactionHash, secondExpectedReceipt));
-
-    // charlie cannot see the receipt
-    charlie.verify(privateTransactionVerifier.noPrivateTransactionReceipt(secondTransactionHash));
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyGroupAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyGroupAcceptanceTest.java
deleted file mode 100644
index 4afee1e3051..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyGroupAcceptanceTest.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.web3j.privacy;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
-import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
-
-import java.math.BigInteger;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.web3j.protocol.besu.response.privacy.PrivacyGroup;
-import org.web3j.protocol.besu.response.privacy.PrivateTransactionReceipt;
-import org.web3j.utils.Base64String;
-
-public class PrivacyGroupAcceptanceTest extends PrivacyAcceptanceTestBase {
-
-  private PrivacyNode alice;
-  private PrivacyNode bob;
-  private PrivacyNode charlie;
-
-  @Before
-  public void setUp() throws Exception {
-    alice =
-        privacyBesu.createPrivateTransactionEnabledMinerNode(
-            "node1", privacyAccountResolver.resolve(0));
-    bob =
-        privacyBesu.createPrivateTransactionEnabledNode("node2", privacyAccountResolver.resolve(1));
-    charlie =
-        privacyBesu.createPrivateTransactionEnabledNode("node3", privacyAccountResolver.resolve(2));
-    privacyCluster.start(alice, bob, charlie);
-  }
-
-  @Test
-  public void nodeCanCreatePrivacyGroup() {
-    final String privacyGroupId =
-        alice.execute(
-            privacyTransactions.createPrivacyGroup(
-                "myGroupName", "my group description", alice, bob));
-
-    assertThat(privacyGroupId).isNotNull();
-
-    final PrivacyGroup expected =
-        new PrivacyGroup(
-            privacyGroupId,
-            PrivacyGroup.Type.PANTHEON,
-            "myGroupName",
-            "my group description",
-            Base64String.wrapList(alice.getEnclaveKey(), bob.getEnclaveKey()));
-
-    alice.verify(privateTransactionVerifier.validPrivacyGroupCreated(expected));
-
-    bob.verify(privateTransactionVerifier.validPrivacyGroupCreated(expected));
-  }
-
-  @Test
-  public void nodeCanCreatePrivacyGroupWithoutName() {
-    final String privacyGroupId =
-        alice.execute(
-            privacyTransactions.createPrivacyGroup(null, "my group description", alice, bob));
-
-    assertThat(privacyGroupId).isNotNull();
-
-    final PrivacyGroup expected =
-        new PrivacyGroup(
-            privacyGroupId,
-            PrivacyGroup.Type.PANTHEON,
-            "",
-            "my group description",
-            Base64String.wrapList(alice.getEnclaveKey(), bob.getEnclaveKey()));
-
-    alice.verify(privateTransactionVerifier.validPrivacyGroupCreated(expected));
-
-    bob.verify(privateTransactionVerifier.validPrivacyGroupCreated(expected));
-  }
-
-  @Test
-  public void nodeCanCreatePrivacyGroupWithoutDescription() {
-    final String privacyGroupId =
-        alice.execute(privacyTransactions.createPrivacyGroup("myGroupName", null, alice, bob));
-
-    assertThat(privacyGroupId).isNotNull();
-
-    final PrivacyGroup expected =
-        new PrivacyGroup(
-            privacyGroupId,
-            PrivacyGroup.Type.PANTHEON,
-            "myGroupName",
-            "",
-            Base64String.wrapList(alice.getEnclaveKey(), bob.getEnclaveKey()));
-
-    alice.verify(privateTransactionVerifier.validPrivacyGroupCreated(expected));
-
-    bob.verify(privateTransactionVerifier.validPrivacyGroupCreated(expected));
-  }
-
-  @Test
-  public void nodeCanCreatePrivacyGroupWithoutOptionalParams() {
-    final String privacyGroupId =
-        alice.execute(privacyTransactions.createPrivacyGroup(null, null, alice, bob));
-
-    assertThat(privacyGroupId).isNotNull();
-
-    final PrivacyGroup expected =
-        new PrivacyGroup(
-            privacyGroupId,
-            PrivacyGroup.Type.PANTHEON,
-            "",
-            "",
-            Base64String.wrapList(alice.getEnclaveKey(), bob.getEnclaveKey()));
-
-    alice.verify(privateTransactionVerifier.validPrivacyGroupCreated(expected));
-
-    bob.verify(privateTransactionVerifier.validPrivacyGroupCreated(expected));
-  }
-
-  @Test
-  public void canInteractWithMultiplePrivacyGroups() {
-    final String privacyGroupIdABC =
-        alice.execute(privacyTransactions.createPrivacyGroup(null, null, alice, bob, charlie));
-
-    final EventEmitter firstEventEmitter =
-        alice.execute(
-            privateContractTransactions.createSmartContractWithPrivacyGroupId(
-                EventEmitter.class,
-                alice.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                alice.getEnclaveKey(),
-                privacyGroupIdABC));
-
-    // charlie interacts with contract
-    final String firstTransactionHash =
-        charlie.execute(
-            privateContractTransactions.callSmartContractWithPrivacyGroupId(
-                firstEventEmitter.getContractAddress(),
-                firstEventEmitter.store(BigInteger.ONE).encodeFunctionCall(),
-                charlie.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                charlie.getEnclaveKey(),
-                privacyGroupIdABC));
-
-    // alice gets receipt from charlie's interaction
-    final PrivateTransactionReceipt firstExpectedReceipt =
-        alice.execute(privacyTransactions.getPrivateTransactionReceipt(firstTransactionHash));
-
-    // verify bob and charlie have access to the same receipt
-    bob.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(
-            firstTransactionHash, firstExpectedReceipt));
-    charlie.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(
-            firstTransactionHash, firstExpectedReceipt));
-
-    // alice deploys second contract
-    final String privacyGroupIdAB =
-        alice.execute(privacyTransactions.createPrivacyGroup(null, null, alice, bob));
-
-    final EventEmitter secondEventEmitter =
-        alice.execute(
-            privateContractTransactions.createSmartContractWithPrivacyGroupId(
-                EventEmitter.class,
-                alice.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                alice.getEnclaveKey(),
-                privacyGroupIdAB));
-
-    // bob interacts with contract
-    final String secondTransactionHash =
-        bob.execute(
-            privateContractTransactions.callSmartContractWithPrivacyGroupId(
-                secondEventEmitter.getContractAddress(),
-                secondEventEmitter.store(BigInteger.ONE).encodeFunctionCall(),
-                bob.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                bob.getEnclaveKey(),
-                privacyGroupIdAB));
-
-    // alice gets receipt from bob's interaction
-    final PrivateTransactionReceipt secondExpectedReceipt =
-        alice.execute(privacyTransactions.getPrivateTransactionReceipt(secondTransactionHash));
-
-    bob.verify(
-        privateTransactionVerifier.validPrivateTransactionReceipt(
-            secondTransactionHash, secondExpectedReceipt));
-
-    // charlie cannot see the receipt
-    charlie.verify(privateTransactionVerifier.noPrivateTransactionReceipt(secondTransactionHash));
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyReceiptAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyReceiptAcceptanceTest.java
deleted file mode 100644
index a824afbaf77..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivacyReceiptAcceptanceTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.web3j.privacy;
-
-import static java.util.Optional.empty;
-
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
-import org.hyperledger.besu.ethereum.privacy.Restriction;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.transaction.CreatePrivacyGroupTransaction;
-import org.hyperledger.besu.tests.acceptance.dsl.transaction.miner.MinerTransactions;
-
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
-import org.junit.Test;
-
-public class PrivacyReceiptAcceptanceTest extends PrivacyAcceptanceTestBase {
-  private PrivacyNode alice;
-  final MinerTransactions minerTransactions = new MinerTransactions();
-
-  @Before
-  public void setUp() throws Exception {
-    alice =
-        privacyBesu.createIbft2NodePrivacyMiningEnabled("node1", privacyAccountResolver.resolve(0));
-    privacyCluster.start(alice);
-  }
-
-  @Test
-  public void createPrivateTransactionReceiptSuccessfulTransaction() {
-    final CreatePrivacyGroupTransaction onlyAlice =
-        privacyTransactions.createPrivacyGroup("Only Alice", "", alice);
-
-    final String privacyGroupId = alice.execute(onlyAlice);
-
-    final PrivateTransaction validTransaction =
-        createSignedTransaction(alice, privacyGroupId, empty());
-    final BytesValueRLPOutput rlpOutput = getRLPOutput(validTransaction);
-
-    final Hash transactionHash =
-        alice.execute(privacyTransactions.sendRawTransaction(rlpOutput.encoded().toHexString()));
-
-    // Successful PMT
-    alice.getBesu().verify(eth.expectSuccessfulTransactionReceipt(transactionHash.toString()));
-    // Successful private transaction
-    alice.getBesu().verify(priv.getSuccessfulTransactionReceipt(transactionHash));
-  }
-
-  @Test
-  public void createPrivateTransactionReceiptFailedTransaction() {
-    final CreatePrivacyGroupTransaction onlyAlice =
-        privacyTransactions.createPrivacyGroup("Only Alice", "", alice);
-
-    final String privacyGroupId = alice.execute(onlyAlice);
-
-    final PrivateTransaction invalidPayloadTransaction =
-        createSignedTransaction(
-            alice, privacyGroupId, Optional.of(Bytes.fromBase64String("invalidPayload")));
-    final BytesValueRLPOutput rlpOutput = getRLPOutput(invalidPayloadTransaction);
-
-    final Hash transactionHash =
-        alice.execute(privacyTransactions.sendRawTransaction(rlpOutput.encoded().toHexString()));
-
-    // Successful PMT
-    alice.getBesu().verify(eth.expectSuccessfulTransactionReceipt(transactionHash.toString()));
-    // Failed private transaction
-    alice.getBesu().verify(priv.getFailedTransactionReceipt(transactionHash));
-  }
-
-  @Test
-  public void createPrivateTransactionReceiptInvalidTransaction() {
-    final CreatePrivacyGroupTransaction onlyAlice =
-        privacyTransactions.createPrivacyGroup("Only Alice", "", alice);
-
-    final String privacyGroupId = alice.execute(onlyAlice);
-
-    final PrivateTransaction validTransaction =
-        createSignedTransaction(alice, privacyGroupId, empty());
-    final BytesValueRLPOutput rlpOutput = getRLPOutput(validTransaction);
-
-    // Stop mining, to allow adding duplicate nonce block
-    alice.getBesu().execute(minerTransactions.minerStop());
-
-    final Hash transactionHash1 =
-        alice.execute(privacyTransactions.sendRawTransaction(rlpOutput.encoded().toHexString()));
-    final Hash transactionHash2 =
-        alice.execute(privacyTransactions.sendRawTransaction(rlpOutput.encoded().toHexString()));
-
-    // Start mining again
-    alice.getBesu().execute(minerTransactions.minerStart());
-
-    // Successful PMTs
-    alice.getBesu().verify(eth.expectSuccessfulTransactionReceipt(transactionHash1.toString()));
-    alice.getBesu().verify(eth.expectSuccessfulTransactionReceipt(transactionHash2.toString()));
-    // Successful first private transaction
-    alice.getBesu().verify(priv.getSuccessfulTransactionReceipt(transactionHash1));
-    // Invalid second private transaction
-    alice.getBesu().verify(priv.getInvalidTransactionReceipt(transactionHash2));
-  }
-
-  private BytesValueRLPOutput getRLPOutput(final PrivateTransaction privateTransaction) {
-    final BytesValueRLPOutput bvrlpo = new BytesValueRLPOutput();
-    privateTransaction.writeTo(bvrlpo);
-    return bvrlpo;
-  }
-
-  private static PrivateTransaction createSignedTransaction(
-      final PrivacyNode node, final String privacyGoupId, final Optional<Bytes> payload) {
-    final Bytes defaultPayload = Bytes.wrap(new byte[] {});
-    return PrivateTransaction.builder()
-        .nonce(0)
-        .gasPrice(Wei.of(999999))
-        .gasLimit(3000000)
-        .to(null)
-        .value(Wei.ZERO)
-        .payload(payload.orElse(defaultPayload))
-        .sender(node.getAddress())
-        .privateFrom(Bytes.fromBase64String(node.getEnclaveKey()))
-        .restriction(Restriction.RESTRICTED)
-        .privacyGroupId(Bytes.fromBase64String(privacyGoupId))
-        .signAndBuild(node.getBesu().getPrivacyParameters().getSigningKeyPair().get());
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivateContractPublicStateAcceptanceTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivateContractPublicStateAcceptanceTest.java
deleted file mode 100644
index bce3ae32016..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/PrivateContractPublicStateAcceptanceTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.web3j.privacy;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyAcceptanceTestBase;
-import org.hyperledger.besu.tests.acceptance.dsl.privacy.PrivacyNode;
-import org.hyperledger.besu.tests.web3j.generated.CrossContractReader;
-import org.hyperledger.besu.tests.web3j.generated.EventEmitter;
-
-import java.math.BigInteger;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.web3j.protocol.besu.response.privacy.PrivateTransactionReceipt;
-import org.web3j.protocol.core.methods.response.TransactionReceipt;
-import org.web3j.tx.exceptions.ContractCallException;
-
-public class PrivateContractPublicStateAcceptanceTest extends PrivacyAcceptanceTestBase {
-  private static final long POW_CHAIN_ID = 2018;
-
-  private PrivacyNode minerNode;
-  private PrivacyNode transactionNode;
-
-  @Before
-  public void setUp() throws Exception {
-    minerNode =
-        privacyBesu.createPrivateTransactionEnabledMinerNode(
-            "miner-node", privacyAccountResolver.resolve(0));
-    transactionNode =
-        privacyBesu.createPrivateTransactionEnabledNode(
-            "transaction-node", privacyAccountResolver.resolve(1));
-    privacyCluster.start(minerNode, transactionNode);
-  }
-
-  @Test
-  public void mustAllowAccessToPublicStateFromPrivateTx() throws Exception {
-    final EventEmitter publicEventEmitter =
-        transactionNode.execute((contractTransactions.createSmartContract(EventEmitter.class)));
-
-    final TransactionReceipt receipt = publicEventEmitter.store(BigInteger.valueOf(12)).send();
-    assertThat(receipt).isNotNull();
-
-    final CrossContractReader reader =
-        transactionNode.execute(
-            privateContractTransactions.createSmartContract(
-                CrossContractReader.class,
-                transactionNode.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                transactionNode.getEnclaveKey()));
-
-    assertThat(reader.read(publicEventEmitter.getContractAddress()).send())
-        .isEqualTo(BigInteger.valueOf(12));
-  }
-
-  @Test(expected = ContractCallException.class)
-  public void mustNotAllowAccessToPrivateStateFromPublicTx() throws Exception {
-    final EventEmitter privateEventEmitter =
-        transactionNode.execute(
-            (privateContractTransactions.createSmartContract(
-                EventEmitter.class,
-                transactionNode.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                transactionNode.getEnclaveKey())));
-
-    final TransactionReceipt receipt = privateEventEmitter.store(BigInteger.valueOf(12)).send();
-    assertThat(receipt).isNotNull();
-
-    final CrossContractReader publicReader =
-        transactionNode.execute(
-            contractTransactions.createSmartContract(CrossContractReader.class));
-
-    publicReader.read(privateEventEmitter.getContractAddress()).send();
-  }
-
-  @Test
-  public void privateContractMustNotBeAbleToCallPublicContractWhichChangesState() throws Exception {
-    final CrossContractReader privateReader =
-        transactionNode.execute(
-            privateContractTransactions.createSmartContract(
-                CrossContractReader.class,
-                transactionNode.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                transactionNode.getEnclaveKey()));
-
-    final CrossContractReader publicReader =
-        transactionNode.execute(
-            contractTransactions.createSmartContract(CrossContractReader.class));
-
-    final PrivateTransactionReceipt transactionReceipt =
-        (PrivateTransactionReceipt)
-            privateReader.incrementRemote(publicReader.getContractAddress()).send();
-
-    assertThat(transactionReceipt.getOutput()).isEqualTo("0x");
-  }
-
-  @Test
-  public void privateContractMustNotBeAbleToCallPublicContractWhichInstantiatesContract()
-      throws Exception {
-    final CrossContractReader privateReader =
-        transactionNode.execute(
-            privateContractTransactions.createSmartContract(
-                CrossContractReader.class,
-                transactionNode.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                transactionNode.getEnclaveKey()));
-
-    final CrossContractReader publicReader =
-        transactionNode.execute(
-            contractTransactions.createSmartContract(CrossContractReader.class));
-
-    final PrivateTransactionReceipt transactionReceipt =
-        (PrivateTransactionReceipt)
-            privateReader.deployRemote(publicReader.getContractAddress()).send();
-
-    assertThat(transactionReceipt.getLogs().size()).isEqualTo(0);
-  }
-
-  @Test
-  public void privateContractMustNotBeAbleToCallSelfDestructOnPublicContract() throws Exception {
-    final CrossContractReader privateReader =
-        transactionNode.execute(
-            privateContractTransactions.createSmartContract(
-                CrossContractReader.class,
-                transactionNode.getTransactionSigningKey(),
-                POW_CHAIN_ID,
-                transactionNode.getEnclaveKey()));
-
-    final CrossContractReader publicReader =
-        transactionNode
-            .getBesu()
-            .execute(contractTransactions.createSmartContract(CrossContractReader.class));
-
-    final PrivateTransactionReceipt transactionReceipt =
-        (PrivateTransactionReceipt)
-            privateReader.remoteDestroy(publicReader.getContractAddress()).send();
-
-    assertThat(transactionReceipt.getOutput()).isEqualTo("0x");
-  }
-}
diff --git a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/contracts/PrivacyProxyTest.java b/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/contracts/PrivacyProxyTest.java
deleted file mode 100644
index 402d3ca80ad..00000000000
--- a/acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/web3j/privacy/contracts/PrivacyProxyTest.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.tests.web3j.privacy.contracts;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-import org.hyperledger.besu.privacy.contracts.generated.DefaultOnChainPrivacyGroupManagementContract;
-import org.hyperledger.besu.privacy.contracts.generated.OnChainPrivacyGroupManagementProxy;
-import org.hyperledger.besu.tests.acceptance.dsl.AcceptanceTestBase;
-import org.hyperledger.besu.tests.acceptance.dsl.account.Accounts;
-import org.hyperledger.besu.tests.acceptance.dsl.node.BesuNode;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.web3j.crypto.Credentials;
-import org.web3j.protocol.Web3j;
-import org.web3j.protocol.exceptions.TransactionException;
-import org.web3j.protocol.http.HttpService;
-import org.web3j.tx.gas.DefaultGasProvider;
-import org.web3j.utils.Base64String;
-
-@SuppressWarnings("unchecked")
-public class PrivacyProxyTest extends AcceptanceTestBase {
-
-  private final Base64String firstParticipant =
-      Base64String.wrap("93Ky7lXwFkMc7+ckoFgUMku5bpr9tz4zhmWmk9RlNng=");
-  private final Base64String secondParticipant =
-      Base64String.wrap("9iaJ6OObl6TUWYjXAOyZsL0VaDPwF+tRFkMwwYSeqqw=");
-  private final Base64String thirdParticipant =
-      Base64String.wrap("Jo2bVqD+nNlNYL5EE7y3IdOnviftjiizpjRt+HTuFBs=");
-  private OnChainPrivacyGroupManagementProxy onChainPrivacyGroupManagementProxy;
-
-  private static final String RAW_GET_PARTICIPANTS = "0x5aa68ac0";
-  private static final String RAW_ADD_PARTICIPANT =
-      "0xb4926e2500000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000";
-
-  private BesuNode minerNode;
-  private DefaultOnChainPrivacyGroupManagementContract defaultOnChainPrivacyGroupManagementContract;
-
-  @Before
-  public void setUp() throws Exception {
-    minerNode = besu.createMinerNode("node");
-    cluster.start(minerNode);
-    defaultOnChainPrivacyGroupManagementContract =
-        minerNode.execute(
-            contractTransactions.createSmartContract(
-                DefaultOnChainPrivacyGroupManagementContract.class));
-    onChainPrivacyGroupManagementProxy =
-        minerNode.execute(
-            contractTransactions.createSmartContract(
-                OnChainPrivacyGroupManagementProxy.class,
-                defaultOnChainPrivacyGroupManagementContract.getContractAddress()));
-  }
-
-  @Test
-  public void rlp() throws Exception {
-    assertThat(onChainPrivacyGroupManagementProxy.isValid()).isEqualTo(true);
-    contractVerifier
-        .validTransactionReceipt(onChainPrivacyGroupManagementProxy.getContractAddress())
-        .verify(onChainPrivacyGroupManagementProxy);
-    assertThat(RAW_GET_PARTICIPANTS)
-        .isEqualTo(onChainPrivacyGroupManagementProxy.getParticipants().encodeFunctionCall());
-    assertThat(RAW_ADD_PARTICIPANT)
-        .isEqualTo(
-            onChainPrivacyGroupManagementProxy
-                .addParticipants(Collections.emptyList())
-                .encodeFunctionCall());
-  }
-
-  @Ignore("return 0x which causes web3j to throw exception instead of return empty list")
-  @Test
-  public void deploysWithNoParticipant() throws Exception {
-    final List<byte[]> participants = onChainPrivacyGroupManagementProxy.getParticipants().send();
-    assertThat(participants.size()).isEqualTo(0);
-  }
-
-  @Test
-  public void canAddParticipants() throws Exception {
-    onChainPrivacyGroupManagementProxy
-        .addParticipants(Arrays.asList(firstParticipant.raw(), secondParticipant.raw()))
-        .send();
-    final List<byte[]> participants = onChainPrivacyGroupManagementProxy.getParticipants().send();
-    assertThat(participants.size()).isEqualTo(2);
-    assertThat(firstParticipant.raw()).isEqualTo(participants.get(0));
-    assertThat(secondParticipant.raw()).isEqualTo(participants.get(1));
-  }
-
-  @Test
-  public void nonOwnerCannotUpgrade() throws Exception {
-    onChainPrivacyGroupManagementProxy
-        .addParticipants(Arrays.asList(firstParticipant.raw(), secondParticipant.raw()))
-        .send();
-    final List<byte[]> participants = onChainPrivacyGroupManagementProxy.getParticipants().send();
-    assertThat(participants.size()).isEqualTo(2);
-    assertThat(firstParticipant.raw()).isEqualTo(participants.get(0));
-    assertThat(secondParticipant.raw()).isEqualTo(participants.get(1));
-
-    final DefaultOnChainPrivacyGroupManagementContract upgradedContract =
-        minerNode.execute(
-            contractTransactions.createSmartContract(
-                DefaultOnChainPrivacyGroupManagementContract.class));
-
-    final HttpService httpService =
-        new HttpService(
-            "http://" + minerNode.getHostName() + ":" + minerNode.getJsonRpcSocketPort().get());
-    final Web3j web3j = Web3j.build(httpService);
-
-    // load the proxy contract, use it with another signer
-    final OnChainPrivacyGroupManagementProxy proxyContractAccount2 =
-        OnChainPrivacyGroupManagementProxy.load(
-            onChainPrivacyGroupManagementProxy.getContractAddress(),
-            web3j,
-            Credentials.create(Accounts.GENESIS_ACCOUNT_TWO_PRIVATE_KEY),
-            new DefaultGasProvider());
-    // contract is the proxy contract and uses genesis account 2. It should not be able to upgrade
-    // the contract, because it is not the owner of "upgradedContract"
-    assertThatThrownBy(
-            () -> proxyContractAccount2.upgradeTo(upgradedContract.getContractAddress()).send())
-        .isInstanceOf(TransactionException.class);
-  }
-
-  @Test
-  public void ownerCanUpgrade() throws Exception {
-    onChainPrivacyGroupManagementProxy
-        .addParticipants(Arrays.asList(firstParticipant.raw(), secondParticipant.raw()))
-        .send();
-    final List<byte[]> participants = onChainPrivacyGroupManagementProxy.getParticipants().send();
-    assertThat(participants.size()).isEqualTo(2);
-    assertThat(firstParticipant.raw()).isEqualTo(participants.get(0));
-    assertThat(secondParticipant.raw()).isEqualTo(participants.get(1));
-
-    final DefaultOnChainPrivacyGroupManagementContract upgradedContract =
-        minerNode.execute(
-            contractTransactions.createSmartContract(
-                DefaultOnChainPrivacyGroupManagementContract.class));
-
-    onChainPrivacyGroupManagementProxy.upgradeTo(upgradedContract.getContractAddress()).send();
-    final List<byte[]> participantsAfterUpgrade =
-        onChainPrivacyGroupManagementProxy.getParticipants().send();
-    assertThat(participantsAfterUpgrade.size()).isEqualTo(2);
-    assertThat(firstParticipant.raw()).isEqualTo(participantsAfterUpgrade.get(0));
-    assertThat(secondParticipant.raw()).isEqualTo(participantsAfterUpgrade.get(1));
-  }
-
-  @Test
-  public void canAddTwiceToContractWhenCallLock() throws Exception {
-    onChainPrivacyGroupManagementProxy
-        .addParticipants(Arrays.asList(firstParticipant.raw(), thirdParticipant.raw()))
-        .send();
-    onChainPrivacyGroupManagementProxy.lock().send();
-    onChainPrivacyGroupManagementProxy
-        .addParticipants(Collections.singletonList(secondParticipant.raw()))
-        .send();
-    final List<byte[]> participants = onChainPrivacyGroupManagementProxy.getParticipants().send();
-    assertThat(participants.size()).isEqualTo(3);
-    assertThat(firstParticipant.raw()).isEqualTo(participants.get(0));
-    assertThat(thirdParticipant.raw()).isEqualTo(participants.get(1));
-    assertThat(secondParticipant.raw()).isEqualTo(participants.get(2));
-  }
-}
diff --git a/acceptance-tests/tests/src/test/resources/acceptanceTesting.security b/acceptance-tests/tests/src/test/resources/acceptanceTesting.security
index 9eb914534a4..7c3e8a26127 100644
--- a/acceptance-tests/tests/src/test/resources/acceptanceTesting.security
+++ b/acceptance-tests/tests/src/test/resources/acceptanceTesting.security
@@ -1,6 +1,6 @@
 ##### NOT FOR PRODUCTION USE ######
 ### FOR ACCEPTANCE TESTING ONLY ###
 # Disable OS provided entropy
-securerandom.source=
+securerandom.source=file:/dev/urandom
 ### FOR ACCEPTANCE TESTING ONLY ###
 ##### NOT FOR PRODUCTION USE ######
diff --git a/acceptance-tests/tests/src/test/resources/authentication/auth_priv_ec_pubkey.toml b/acceptance-tests/tests/src/test/resources/authentication/auth_priv_ec_pubkey.toml
new file mode 100644
index 00000000000..291973d7ce7
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/authentication/auth_priv_ec_pubkey.toml
@@ -0,0 +1,19 @@
+[Users.user]
+password = "$2a$10$l3GA7K8g6rJ/Yv.YFSygCuI9byngpEzxgWS9qEg5emYDZomQW7fGC"
+permissions = ["fakePermission", "*:*"]
+privacyPublicKey = "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAES8nC4qT/KdoAoTSF3qs/47DUsDihyVbWiRjZAiyvqp9eSDkqV1RzlM+58oOwnpFRwvWNZM+AxMVxT+MvxdsqMA=="
+
+[Users.user2]
+password = "$2a$10$0ikMUcSYugKmnXilimhc1eGNnfMRvKt2PxQJPo1oCemN16QL2NNo."
+permissions = ["fakePermission", "*:*"]
+privacyPublicKey = "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEXIgZqRA25V+3nN+Do6b5r0jiUunub6ubjPhqwHpPxP44uUYh9RKCQNRnsqCJ9PjeTnC8R3ieJk7HWAlycU1bug=="
+
+[Users.user3]
+password = "$2a$10$Mydyzpul6CtgPRbUd6It2OpZDOfqOocpi6.UYhlyU5aphQHi1iQZq"
+permissions = ["fakePermission", "*:*"]
+privacyPublicKey = "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEFl85WnNPyzSEX+evc774xoqUQdjSnQMTE1uIyMOve+iVwjs6dUEUwz5teiKuUUf63a/qYe4n6SGnQ7HnmtDViQ=="
+
+[Users.failUser]
+password = "$2a$10$l3GA7K8g6rJ/Yv.YFSygCuI9byngpEzxgWS9qEg5emYDZomQW7fGC"
+permissions = ["fakePermission", "*:*"]
+privacyPublicKey = "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE30vyCv2v4EHwqnr0LEGaCX6GWfmYIIxLRw1PISeFsOk1tmY2hAYjEHkaZzu31SlFx0ickh10MEublBnrxCiJIA=="
diff --git a/acceptance-tests/tests/src/test/resources/authentication/jwt_public_key_ecdsa b/acceptance-tests/tests/src/test/resources/authentication/jwt_public_key_ecdsa
new file mode 100644
index 00000000000..65a23fa3ed7
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/authentication/jwt_public_key_ecdsa
@@ -0,0 +1,4 @@
+-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEy8+qE0ZFo4woPUCXfszptuDgaDpW
+Sv6D5F/pbolJ2wZTVkYXoGhA3wqy1RM1RYmROp9NEPLm3mZP+kzI4TMiGg==
+-----END PUBLIC KEY-----
diff --git a/acceptance-tests/tests/src/test/resources/authentication/jwt_public_key b/acceptance-tests/tests/src/test/resources/authentication/jwt_public_key_rsa
similarity index 100%
rename from acceptance-tests/tests/src/test/resources/authentication/jwt_public_key
rename to acceptance-tests/tests/src/test/resources/authentication/jwt_public_key_rsa
diff --git a/acceptance-tests/tests/src/test/resources/clique/clique.json b/acceptance-tests/tests/src/test/resources/clique/clique.json
index 971ccb40414..8fb3c6dc331 100644
--- a/acceptance-tests/tests/src/test/resources/clique/clique.json
+++ b/acceptance-tests/tests/src/test/resources/clique/clique.json
@@ -3,12 +3,10 @@
     "chainId": 4,
     "homesteadBlock": 1,
     "eip150Block": 2,
-    "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-    "eip155Block": 3,
     "eip158Block": 4,
     "byzantiumBlock": 5,
     "constantinopleBlock": 6,
-    "constantinopleFixBlock": 7,
+    "petersburgBlock": 7,
     "clique": {
       "blockperiodseconds": 10,
       "epochlength": 30000
diff --git a/acceptance-tests/tests/src/test/resources/crypto/secp256r1.json b/acceptance-tests/tests/src/test/resources/crypto/secp256r1.json
new file mode 100644
index 00000000000..630e394c357
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/crypto/secp256r1.json
@@ -0,0 +1,23 @@
+{
+  "config": {
+    "chainId": 1981,
+    "ecCurve": "secp256r1",
+    "constantinoplefixblock": 0,
+    "ethash": {
+      "fixeddifficulty": 1000
+    }
+  },
+  "nonce": "0x0",
+  "timestamp": "0x58ee40ba",
+  "gasLimit": "0x1fffffffffffff",
+  "difficulty": "0x1",
+  "mixHash": "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365",
+  "alloc": {
+    "91240f5b6994c7ed80f9f94b1aa847880ad3b150": {
+      "privateKey": "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63",
+      "info": "This genesis file uses SECP256R1 as elliptic curve. The address is only valid for this curve and invalid with the default SECP256K1 curve.",
+      "comment": "private key and this comment are ignored. In a real chain, the private key should NOT be stored",
+      "balance": "0xad78ebc5ac6200000"
+    }
+  }
+}
diff --git a/acceptance-tests/tests/src/test/resources/dev/dev_london.json b/acceptance-tests/tests/src/test/resources/dev/dev_london.json
new file mode 100644
index 00000000000..709f74a3026
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/dev/dev_london.json
@@ -0,0 +1,43 @@
+{
+  "config":{
+    "chainId":20211,
+    "homesteadBlock":0,
+    "eip150Block":0,
+    "eip155Block":0,
+    "eip158Block":0,
+    "byzantiumBlock":0,
+    "constantinopleBlock":0,
+    "petersburgBlock":0,
+    "istanbulBlock":0,
+    "berlinBlock":0,
+    "londonBlock":0,
+    "ethash":{
+      "fixeddifficulty": 1
+    }
+  },
+  "alloc":{
+    "fe3b557e8fb62b89f4916b721be55ceb828dbd73": {
+      "privateKey": "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "0xad78ebc5ac6200000"
+    },
+    "627306090abaB3A6e1400e9345bC60c78a8BEf57": {
+      "privateKey": "c87509a1c067bbde78beb793e6fa76530b6382a4c0241e5e4a9ec0a0f44dc0d3",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "90000000000000000000000"
+    },
+    "f17f52151EbEF6C7334FAD080c5704D77216b732": {
+      "privateKey": "ae6ae8e5ccbfb04590405997ee2d52d2b330726137b875053c36d94e974d162f",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "90000000000000000000000"
+    }
+  },
+  "coinbase":"0x0000000000000000000000000000000000000000",
+  "difficulty":"0x00001",
+  "extraData":"0x5365706f6c69612c20417468656e732c204174746963612c2047726565636521",
+  "gasLimit":"0x1c9c380",
+  "nonce":"0x000000000000000",
+  "mixhash":"0x0000000000000000000000000000000000000000000000000000000000000000",
+  "parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
+  "timestamp":"0x6159af19"
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/ibft/ibft.json b/acceptance-tests/tests/src/test/resources/ibft/ibft.json
index 01765901fd1..dddbf01b8bf 100644
--- a/acceptance-tests/tests/src/test/resources/ibft/ibft.json
+++ b/acceptance-tests/tests/src/test/resources/ibft/ibft.json
@@ -1,12 +1,7 @@
 {
   "config": {
     "chainId": 4,
-    "homesteadBlock": 1,
-    "eip150Block": 2,
-    "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-    "eip155Block": 3,
-    "eip158Block": 3,
-    "byzantiumBlock": 1035301,
+    "berlinBlock": 0,
     "ibft2": {
       "blockperiodseconds": 1,
       "epochlength": 30000,
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/genesis.json b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/genesis.json
new file mode 100644
index 00000000000..7f41d1260a9
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/genesis.json
@@ -0,0 +1,35 @@
+{
+  "config": {
+    "chainId":1,
+    "homesteadBlock":0,
+    "eip150Block":0,
+    "eip155Block":0,
+    "eip158Block":0,
+    "byzantiumBlock":0,
+    "constantinopleBlock":0,
+    "petersburgBlock":0,
+    "istanbulBlock":0,
+    "muirGlacierBlock":0,
+    "berlinBlock":0,
+    "londonBlock":0,
+    "clique": {
+      "period": 5,
+      "epoch": 30000
+    },
+    "terminalTotalDifficulty":0
+  },
+  "nonce":"0x42",
+  "timestamp":"0x0",
+  "extraData":"0x0000000000000000000000000000000000000000000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "gasLimit":"0x1C9C380",
+  "difficulty":"0x400000000",
+  "mixHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
+  "coinbase":"0x0000000000000000000000000000000000000000",
+  "alloc":{
+    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b":{"balance":"0x6d6172697573766477000000"}
+  },
+  "number":"0x0",
+  "gasUsed":"0x0",
+  "parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
+  "baseFeePerGas":"0x7"
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/01_prepare_payload.json b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/01_prepare_payload.json
new file mode 100644
index 00000000000..3ab6f968fbc
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/01_prepare_payload.json
@@ -0,0 +1,32 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_forkchoiceUpdatedV1",
+    "params": [
+      {
+        "headBlockHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
+        "safeBlockHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
+        "finalizedBlockHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+      },
+      {
+        "timestamp": "0x5",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "suggestedFeeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "payloadStatus": {
+        "status": "VALID",
+        "latestValidHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
+        "validationError": null
+      },
+      "payloadId": "0x0065bd195a9b3bfb"
+    }
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/02_execute_payload_1.json b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/02_execute_payload_1.json
new file mode 100644
index 00000000000..e4c82c26d3c
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/02_execute_payload_1.json
@@ -0,0 +1,35 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_newPayloadV1",
+    "params": [
+      {
+        "parentHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
+        "feeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "stateRoot": "0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45",
+        "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+        "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "blockNumber": "0x1",
+        "gasLimit": "0x1c9c380",
+        "gasUsed": "0x0",
+        "timestamp": "0x5",
+        "extraData": "0x",
+        "baseFeePerGas": "0x7",
+        "blockHash": "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+        "transactions": []
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "status": "VALID",
+      "latestValidHash": "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+      "validationError": null
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/03_execute_payload_2.json b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/03_execute_payload_2.json
new file mode 100644
index 00000000000..b7be6df8007
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/03_execute_payload_2.json
@@ -0,0 +1,35 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_newPayloadV1",
+    "params": [
+      {
+        "parentHash": "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+        "feeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "stateRoot": "0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45",
+        "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+        "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "blockNumber": "0x2",
+        "gasLimit": "0x1c9c380",
+        "gasUsed": "0x0",
+        "timestamp": "0x6",
+        "extraData": "0x",
+        "baseFeePerGas": "0x7",
+        "blockHash": "0x80732341439dd124df94271386141735f13ef8a85e12e9fba15c06bc1ad9fd73",
+        "transactions": []
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "status": "VALID",
+      "latestValidHash": "0x80732341439dd124df94271386141735f13ef8a85e12e9fba15c06bc1ad9fd73",
+      "validationError": null
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/04_update_forkchoice.json b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/04_update_forkchoice.json
new file mode 100644
index 00000000000..d39fcc8db33
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/04_update_forkchoice.json
@@ -0,0 +1,28 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_forkchoiceUpdatedV1",
+    "params": [
+      {
+        "headBlockHash": "0x80732341439dd124df94271386141735f13ef8a85e12e9fba15c06bc1ad9fd73",
+        "safeBlockHash": "0x80732341439dd124df94271386141735f13ef8a85e12e9fba15c06bc1ad9fd73",
+        "finalizedBlockHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a"
+      },
+      null
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "payloadStatus": {
+        "status": "VALID",
+        "latestValidHash": "0x80732341439dd124df94271386141735f13ef8a85e12e9fba15c06bc1ad9fd73",
+        "validationError": null
+      },
+      "payloadId": null
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/05_get_latest_block.json b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/05_get_latest_block.json
new file mode 100644
index 00000000000..bbb0826a465
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/05_get_latest_block.json
@@ -0,0 +1,33 @@
+{
+  "request": {
+    "jsonrpc":"2.0","method":"eth_getBlockByNumber","params":["latest", false],"id":1
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 1,
+    "result": {
+      "number": "0x2",
+      "hash": "0x80732341439dd124df94271386141735f13ef8a85e12e9fba15c06bc1ad9fd73",
+      "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "parentHash": "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+      "nonce": "0x0000000000000000",
+      "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "transactionsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "stateRoot": "0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45",
+      "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "miner": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      "difficulty": "0x0",
+      "totalDifficulty": "0x400000000",
+      "extraData": "0x",
+      "baseFeePerGas": "0x7",
+      "size": "0x1fa",
+      "gasLimit": "0x1c9c380",
+      "gasUsed": "0x0",
+      "timestamp": "0x6",
+      "uncles": [],
+      "transactions": []
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/06_debug_replay_block.json b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/06_debug_replay_block.json
new file mode 100644
index 00000000000..6f96b1dd57f
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/06_debug_replay_block.json
@@ -0,0 +1,11 @@
+{
+  "request": {
+    "jsonrpc":"2.0","method":"debug_replayBlock","params":["0x1"],"id":1
+  },
+  "response": {
+    "jsonrpc" : "2.0",
+    "id" : 1,
+    "result" : "Success"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/07_get_latest_block_after_replay_block.json b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/07_get_latest_block_after_replay_block.json
new file mode 100644
index 00000000000..5b2d2ca5db7
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/replayBlock/test-cases/07_get_latest_block_after_replay_block.json
@@ -0,0 +1,33 @@
+{
+  "request": {
+    "jsonrpc":"2.0","method":"eth_getBlockByNumber","params":["latest", false],"id":1
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 1,
+    "result" : {
+      "number" : "0x1",
+      "hash" : "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+      "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "parentHash" : "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
+      "nonce" : "0x0000000000000000",
+      "sha3Uncles" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "transactionsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "stateRoot" : "0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45",
+      "receiptsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "miner" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      "difficulty" : "0x0",
+      "totalDifficulty" : "0x400000000",
+      "extraData" : "0x",
+      "baseFeePerGas" : "0x7",
+      "size" : "0x1fa",
+      "gasLimit" : "0x1c9c380",
+      "gasUsed" : "0x0",
+      "timestamp" : "0x5",
+      "uncles" : [ ],
+      "transactions" : [ ]
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/genesis.json b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/genesis.json
new file mode 100644
index 00000000000..7f41d1260a9
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/genesis.json
@@ -0,0 +1,35 @@
+{
+  "config": {
+    "chainId":1,
+    "homesteadBlock":0,
+    "eip150Block":0,
+    "eip155Block":0,
+    "eip158Block":0,
+    "byzantiumBlock":0,
+    "constantinopleBlock":0,
+    "petersburgBlock":0,
+    "istanbulBlock":0,
+    "muirGlacierBlock":0,
+    "berlinBlock":0,
+    "londonBlock":0,
+    "clique": {
+      "period": 5,
+      "epoch": 30000
+    },
+    "terminalTotalDifficulty":0
+  },
+  "nonce":"0x42",
+  "timestamp":"0x0",
+  "extraData":"0x0000000000000000000000000000000000000000000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "gasLimit":"0x1C9C380",
+  "difficulty":"0x400000000",
+  "mixHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
+  "coinbase":"0x0000000000000000000000000000000000000000",
+  "alloc":{
+    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b":{"balance":"0x6d6172697573766477000000"}
+  },
+  "number":"0x0",
+  "gasUsed":"0x0",
+  "parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
+  "baseFeePerGas":"0x7"
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/01_prepare_payload.json b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/01_prepare_payload.json
new file mode 100644
index 00000000000..3ab6f968fbc
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/01_prepare_payload.json
@@ -0,0 +1,32 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_forkchoiceUpdatedV1",
+    "params": [
+      {
+        "headBlockHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
+        "safeBlockHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
+        "finalizedBlockHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+      },
+      {
+        "timestamp": "0x5",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "suggestedFeeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "payloadStatus": {
+        "status": "VALID",
+        "latestValidHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
+        "validationError": null
+      },
+      "payloadId": "0x0065bd195a9b3bfb"
+    }
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/02_execute_payload_1.json b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/02_execute_payload_1.json
new file mode 100644
index 00000000000..e4c82c26d3c
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/02_execute_payload_1.json
@@ -0,0 +1,35 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_newPayloadV1",
+    "params": [
+      {
+        "parentHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
+        "feeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "stateRoot": "0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45",
+        "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+        "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "blockNumber": "0x1",
+        "gasLimit": "0x1c9c380",
+        "gasUsed": "0x0",
+        "timestamp": "0x5",
+        "extraData": "0x",
+        "baseFeePerGas": "0x7",
+        "blockHash": "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+        "transactions": []
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "status": "VALID",
+      "latestValidHash": "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+      "validationError": null
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/03_execute_payload_2.json b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/03_execute_payload_2.json
new file mode 100644
index 00000000000..b7be6df8007
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/03_execute_payload_2.json
@@ -0,0 +1,35 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_newPayloadV1",
+    "params": [
+      {
+        "parentHash": "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+        "feeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "stateRoot": "0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45",
+        "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+        "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "blockNumber": "0x2",
+        "gasLimit": "0x1c9c380",
+        "gasUsed": "0x0",
+        "timestamp": "0x6",
+        "extraData": "0x",
+        "baseFeePerGas": "0x7",
+        "blockHash": "0x80732341439dd124df94271386141735f13ef8a85e12e9fba15c06bc1ad9fd73",
+        "transactions": []
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "status": "VALID",
+      "latestValidHash": "0x80732341439dd124df94271386141735f13ef8a85e12e9fba15c06bc1ad9fd73",
+      "validationError": null
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/04_update_forkchoice.json b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/04_update_forkchoice.json
new file mode 100644
index 00000000000..d39fcc8db33
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/04_update_forkchoice.json
@@ -0,0 +1,28 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_forkchoiceUpdatedV1",
+    "params": [
+      {
+        "headBlockHash": "0x80732341439dd124df94271386141735f13ef8a85e12e9fba15c06bc1ad9fd73",
+        "safeBlockHash": "0x80732341439dd124df94271386141735f13ef8a85e12e9fba15c06bc1ad9fd73",
+        "finalizedBlockHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a"
+      },
+      null
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "payloadStatus": {
+        "status": "VALID",
+        "latestValidHash": "0x80732341439dd124df94271386141735f13ef8a85e12e9fba15c06bc1ad9fd73",
+        "validationError": null
+      },
+      "payloadId": null
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/05_get_latest_block.json b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/05_get_latest_block.json
new file mode 100644
index 00000000000..bbb0826a465
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/05_get_latest_block.json
@@ -0,0 +1,33 @@
+{
+  "request": {
+    "jsonrpc":"2.0","method":"eth_getBlockByNumber","params":["latest", false],"id":1
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 1,
+    "result": {
+      "number": "0x2",
+      "hash": "0x80732341439dd124df94271386141735f13ef8a85e12e9fba15c06bc1ad9fd73",
+      "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "parentHash": "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+      "nonce": "0x0000000000000000",
+      "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "transactionsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "stateRoot": "0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45",
+      "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "miner": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      "difficulty": "0x0",
+      "totalDifficulty": "0x400000000",
+      "extraData": "0x",
+      "baseFeePerGas": "0x7",
+      "size": "0x1fa",
+      "gasLimit": "0x1c9c380",
+      "gasUsed": "0x0",
+      "timestamp": "0x6",
+      "uncles": [],
+      "transactions": []
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/06_debug_set_head.json b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/06_debug_set_head.json
new file mode 100644
index 00000000000..18f5862b531
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/06_debug_set_head.json
@@ -0,0 +1,11 @@
+{
+  "request": {
+    "jsonrpc":"2.0","method":"debug_setHead","params":["0x1"],"id":1
+  },
+  "response": {
+    "jsonrpc" : "2.0",
+    "id" : 1,
+    "result" : "Success"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/07_get_latest_block_after_set_head.json b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/07_get_latest_block_after_set_head.json
new file mode 100644
index 00000000000..5b2d2ca5db7
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/debug/setHead/test-cases/07_get_latest_block_after_set_head.json
@@ -0,0 +1,33 @@
+{
+  "request": {
+    "jsonrpc":"2.0","method":"eth_getBlockByNumber","params":["latest", false],"id":1
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 1,
+    "result" : {
+      "number" : "0x1",
+      "hash" : "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+      "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "parentHash" : "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
+      "nonce" : "0x0000000000000000",
+      "sha3Uncles" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "transactionsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "stateRoot" : "0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45",
+      "receiptsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "miner" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      "difficulty" : "0x0",
+      "totalDifficulty" : "0x400000000",
+      "extraData" : "0x",
+      "baseFeePerGas" : "0x7",
+      "size" : "0x1fa",
+      "gasLimit" : "0x1c9c380",
+      "gasUsed" : "0x0",
+      "timestamp" : "0x5",
+      "uncles" : [ ],
+      "transactions" : [ ]
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/genesis.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/genesis.json
new file mode 100644
index 00000000000..b6a16b71a40
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/genesis.json
@@ -0,0 +1,38 @@
+{
+  "config": {
+    "chainId":1,
+    "homesteadBlock":0,
+    "eip150Block":0,
+    "eip155Block":0,
+    "eip158Block":0,
+    "byzantiumBlock":0,
+    "constantinopleBlock":0,
+    "petersburgBlock":0,
+    "istanbulBlock":0,
+    "muirGlacierBlock":0,
+    "berlinBlock":0,
+    "londonBlock":0,
+    "terminalTotalDifficulty":0,
+    "shanghaiTime":0,
+    "experimentalEipsTime":20,
+    "clique": {
+      "period": 5,
+      "epoch": 30000
+    },
+    "depositContractAddress": "0x00000000219ab540356cbb839cbe05303d7705fa"
+  },
+  "nonce":"0x42",
+  "timestamp":"0x0",
+  "extraData":"0x0000000000000000000000000000000000000000000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "gasLimit":"0x1C9C380",
+  "difficulty":"0x400000000",
+  "mixHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
+  "coinbase":"0x0000000000000000000000000000000000000000",
+  "alloc":{
+    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b":{"balance":"0x6d6172697573766477000000"}
+  },
+  "number":"0x0",
+  "gasUsed":"0x0",
+  "parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
+  "baseFeePerGas":"0x7"
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/01_shanghai_prepare_payload.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/01_shanghai_prepare_payload.json
new file mode 100644
index 00000000000..960194fcae0
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/01_shanghai_prepare_payload.json
@@ -0,0 +1,46 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_forkchoiceUpdatedV2",
+    "params": [
+      {
+        "headBlockHash": "0xfe950635b1bd2a416ff6283b0bbd30176e1b1125ad06fa729da9f3f4c1c61710",
+        "safeBlockHash": "0xfe950635b1bd2a416ff6283b0bbd30176e1b1125ad06fa729da9f3f4c1c61710",
+        "finalizedBlockHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+      },
+      {
+        "timestamp": "0x10",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "suggestedFeeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "withdrawals": [
+          {
+            "index": "0x0",
+            "validatorIndex": "0x0",
+            "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "amount": "0x3"
+          },
+          {
+            "index": "0x1",
+            "validatorIndex": "0x1",
+            "address": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+            "amount": "0x4"
+          }
+        ]
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "payloadStatus": {
+        "status": "VALID",
+        "latestValidHash": "0xfe950635b1bd2a416ff6283b0bbd30176e1b1125ad06fa729da9f3f4c1c61710",
+        "validationError": null
+      },
+      "payloadId": "0x0065bd1bbeaff359"
+    }
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/02_shanghai_getPayloadV2.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/02_shanghai_getPayloadV2.json
new file mode 100644
index 00000000000..9d25e3f5e84
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/02_shanghai_getPayloadV2.json
@@ -0,0 +1,49 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_getPayloadV2",
+    "params": [
+      "0x0065bd1bbeaff359"
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "executionPayload": {
+        "parentHash": "0xfe950635b1bd2a416ff6283b0bbd30176e1b1125ad06fa729da9f3f4c1c61710",
+        "feeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "stateRoot": "0xc8c8e840369eac89a610bfe2ec21fcdee4c9c43bec4876f0129fcd4b5311f6dd",
+        "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "gasLimit": "0x1c9c380",
+        "gasUsed": "0x0",
+        "timestamp": "0x10",
+        "extraData": "0x",
+        "baseFeePerGas": "0x7",
+        "transactions": [],
+        "withdrawals": [
+          {
+            "index": "0x0",
+            "validatorIndex": "0x0",
+            "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "amount": "0x3"
+          },
+          {
+            "index": "0x1",
+            "validatorIndex": "0x1",
+            "address": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+            "amount": "0x4"
+          }
+        ],
+        "deposits": null,
+        "blockNumber": "0x1",
+        "blockHash": "0xfdd94e3620a88f08927bffb318981a36b663a26e6fd62ab273eb800b90723c13",
+        "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
+      },
+      "blockValue": "0x0"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/03_shanghai_newPayloadV2.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/03_shanghai_newPayloadV2.json
new file mode 100644
index 00000000000..938362327ba
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/03_shanghai_newPayloadV2.json
@@ -0,0 +1,49 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_newPayloadV2",
+    "params": [
+      {
+        "parentHash": "0xfe950635b1bd2a416ff6283b0bbd30176e1b1125ad06fa729da9f3f4c1c61710",
+        "feeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "stateRoot": "0xc8c8e840369eac89a610bfe2ec21fcdee4c9c43bec4876f0129fcd4b5311f6dd",
+        "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "gasLimit": "0x1c9c380",
+        "gasUsed": "0x0",
+        "timestamp": "0x10",
+        "extraData": "0x",
+        "baseFeePerGas": "0x7",
+        "transactions": [],
+        "withdrawals": [
+          {
+            "index": "0x0",
+            "validatorIndex": "0x0",
+            "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "amount": "0x3"
+          },
+          {
+            "index": "0x1",
+            "validatorIndex": "0x1",
+            "address": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+            "amount": "0x4"
+          }
+        ],
+        "blockNumber": "0x1",
+        "blockHash": "0xfdd94e3620a88f08927bffb318981a36b663a26e6fd62ab273eb800b90723c13",
+        "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "status": "VALID",
+      "latestValidHash": "0xfdd94e3620a88f08927bffb318981a36b663a26e6fd62ab273eb800b90723c13",
+      "validationError": null
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/04_shanghai_forkchoiceUpdatedV2.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/04_shanghai_forkchoiceUpdatedV2.json
new file mode 100644
index 00000000000..871832b9c99
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/04_shanghai_forkchoiceUpdatedV2.json
@@ -0,0 +1,28 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_forkchoiceUpdatedV2",
+    "params": [
+      {
+        "headBlockHash": "0xfdd94e3620a88f08927bffb318981a36b663a26e6fd62ab273eb800b90723c13",
+        "safeBlockHash": "0xfdd94e3620a88f08927bffb318981a36b663a26e6fd62ab273eb800b90723c13",
+        "finalizedBlockHash": "0xfdd94e3620a88f08927bffb318981a36b663a26e6fd62ab273eb800b90723c13"
+      },
+      null
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "payloadStatus": {
+        "status": "VALID",
+        "latestValidHash": "0xfdd94e3620a88f08927bffb318981a36b663a26e6fd62ab273eb800b90723c13",
+        "validationError": null
+      },
+      "payloadId": null
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/05_eip6110_prepare_payload.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/05_eip6110_prepare_payload.json
new file mode 100644
index 00000000000..d3d7ee37e30
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/05_eip6110_prepare_payload.json
@@ -0,0 +1,46 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_forkchoiceUpdatedV2",
+    "params": [
+      {
+        "headBlockHash": "0xfdd94e3620a88f08927bffb318981a36b663a26e6fd62ab273eb800b90723c13",
+        "safeBlockHash": "0xfdd94e3620a88f08927bffb318981a36b663a26e6fd62ab273eb800b90723c13",
+        "finalizedBlockHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+      },
+      {
+        "timestamp": "0x20",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "suggestedFeeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "withdrawals": [
+          {
+            "index": "0x0",
+            "validatorIndex": "0x0",
+            "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "amount": "0x1"
+          },
+          {
+            "index": "0x1",
+            "validatorIndex": "0x0",
+            "address": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+            "amount": "0x2"
+          }
+        ]
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "payloadStatus": {
+        "status": "VALID",
+        "latestValidHash": "0xfdd94e3620a88f08927bffb318981a36b663a26e6fd62ab273eb800b90723c13",
+        "validationError": null
+      },
+      "payloadId": "0x0065bd63871ad606"
+    }
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/06_eip6110_get_payload.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/06_eip6110_get_payload.json
new file mode 100644
index 00000000000..89b7cf65b2e
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/06_eip6110_get_payload.json
@@ -0,0 +1,49 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_getPayloadV2",
+    "params": [
+      "0x0065bd63871ad606"
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "executionPayload": {
+        "parentHash": "0xfdd94e3620a88f08927bffb318981a36b663a26e6fd62ab273eb800b90723c13",
+        "feeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "stateRoot": "0x21395692fae33414143728c9ffc0aed8dcc76eb6731dd0f5a3239977478ca969",
+        "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "gasLimit": "0x1c9c380",
+        "gasUsed": "0x0",
+        "timestamp": "0x20",
+        "extraData": "0x",
+        "baseFeePerGas": "0x7",
+        "transactions": [],
+        "withdrawals": [
+          {
+            "index": "0x0",
+            "validatorIndex": "0x0",
+            "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "amount": "0x1"
+          },
+          {
+            "index": "0x1",
+            "validatorIndex": "0x0",
+            "address": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+            "amount": "0x2"
+          }
+        ],
+        "deposits" : [],
+        "blockNumber": "0x2",
+        "blockHash": "0x58ea3e01b03ac17c68ed3e3d724a021408273fac8a86f42cb30a26be8e93fbe9",
+        "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
+      },
+      "blockValue": "0x0"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/07_eip6110_invalid_null_deposits_execute_payload.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/07_eip6110_invalid_null_deposits_execute_payload.json
new file mode 100644
index 00000000000..ebdd0ad81c2
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/07_eip6110_invalid_null_deposits_execute_payload.json
@@ -0,0 +1,49 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_newPayloadV2",
+    "params": [
+      {
+        "parentHash": "0x4f88d512a0045bc6d447ba74a18eac0ed2ebb8d9faca325f5f55b2ca84be0705",
+        "feeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "stateRoot": "0x1a10dba514dc4faff7ec13edd9b5ef653c1cd14eb26608bfc2b37717730a55a4",
+        "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "gasLimit": "0x1c9c380",
+        "gasUsed": "0x0",
+        "timestamp": "0x20",
+        "extraData": "0x",
+        "baseFeePerGas": "0x7",
+        "transactions": [],
+        "withdrawals": [
+          {
+            "index": "0x0",
+            "validatorIndex": "0x0",
+            "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "amount": "0x1"
+          },
+          {
+            "index": "0x1",
+            "validatorIndex": "0x0",
+            "address": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+            "amount": "0x2"
+          }
+        ],
+        "deposits": null,
+        "blockNumber": "0x3",
+        "blockHash": "0x1475ca311179652e44b10b7e2d7b72f3708f3201f8d729880a83f3eb397910e8",
+        "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "error": {
+      "code": -32602,
+      "message": "Invalid params"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/08_eip6110_execute_payload.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/08_eip6110_execute_payload.json
new file mode 100644
index 00000000000..6fe5f5a5640
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/eip6110/test-cases/08_eip6110_execute_payload.json
@@ -0,0 +1,50 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_newPayloadV2",
+    "params": [
+      {
+        "parentHash": "0xfdd94e3620a88f08927bffb318981a36b663a26e6fd62ab273eb800b90723c13",
+        "feeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "stateRoot": "0x21395692fae33414143728c9ffc0aed8dcc76eb6731dd0f5a3239977478ca969",
+        "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "gasLimit": "0x1c9c380",
+        "gasUsed": "0x0",
+        "timestamp": "0x20",
+        "extraData": "0x",
+        "baseFeePerGas": "0x7",
+        "transactions": [],
+        "withdrawals": [
+          {
+            "index": "0x0",
+            "validatorIndex": "0x0",
+            "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "amount": "0x1"
+          },
+          {
+            "index": "0x1",
+            "validatorIndex": "0x0",
+            "address": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+            "amount": "0x2"
+          }
+        ],
+        "deposits": [],
+        "blockNumber": "0x2",
+        "blockHash": "0xdfdf57a09e352c38bb2873c5fd7d0d199481c6e13661c4a004d116417377b2e5",
+        "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "status": "VALID",
+      "latestValidHash": "0xdfdf57a09e352c38bb2873c5fd7d0d199481c6e13661c4a004d116417377b2e5",
+      "validationError": null
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/genesis.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/genesis.json
new file mode 100644
index 00000000000..085b69a1dd5
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/genesis.json
@@ -0,0 +1,35 @@
+{
+  "config": {
+    "chainId":1,
+    "homesteadBlock":0,
+    "eip150Block":0,
+    "eip155Block":0,
+    "eip158Block":0,
+    "byzantiumBlock":0,
+    "constantinopleBlock":0,
+    "petersburgBlock":0,
+    "istanbulBlock":0,
+    "muirGlacierBlock":0,
+    "berlinBlock":0,
+    "londonBlock":0,
+    "terminalTotalDifficulty":0,
+    "clique": {
+      "period": 5,
+      "epoch": 30000
+    }
+  },
+  "nonce":"0x42",
+  "timestamp":"0x0",
+  "extraData":"0x0000000000000000000000000000000000000000000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "gasLimit":"0x1C9C380",
+  "difficulty":"0x400000000",
+  "mixHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
+  "coinbase":"0x0000000000000000000000000000000000000000",
+  "alloc":{
+    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b":{"balance":"0x6d6172697573766477000000"}
+  },
+  "number":"0x0",
+  "gasUsed":"0x0",
+  "parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
+  "baseFeePerGas":"0x7"
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/01_prepare_payload.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/01_prepare_payload.json
new file mode 100644
index 00000000000..3ab6f968fbc
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/01_prepare_payload.json
@@ -0,0 +1,32 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_forkchoiceUpdatedV1",
+    "params": [
+      {
+        "headBlockHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
+        "safeBlockHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
+        "finalizedBlockHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+      },
+      {
+        "timestamp": "0x5",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "suggestedFeeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "payloadStatus": {
+        "status": "VALID",
+        "latestValidHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
+        "validationError": null
+      },
+      "payloadId": "0x0065bd195a9b3bfb"
+    }
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/02_get_payload.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/02_get_payload.json
new file mode 100644
index 00000000000..e5257090527
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/02_get_payload.json
@@ -0,0 +1,31 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_getPayloadV1",
+    "params": [
+      "0x0065bd195a9b3bfb"
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "parentHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
+      "feeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      "stateRoot": "0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45",
+      "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "blockNumber": "0x1",
+      "gasLimit": "0x1c9c380",
+      "gasUsed": "0x0",
+      "timestamp": "0x5",
+      "extraData": "0x",
+      "baseFeePerGas": "0x7",
+      "blockHash": "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+      "transactions": []
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/03_execute_payload.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/03_execute_payload.json
new file mode 100644
index 00000000000..e4c82c26d3c
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/03_execute_payload.json
@@ -0,0 +1,35 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_newPayloadV1",
+    "params": [
+      {
+        "parentHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
+        "feeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "stateRoot": "0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45",
+        "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+        "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "blockNumber": "0x1",
+        "gasLimit": "0x1c9c380",
+        "gasUsed": "0x0",
+        "timestamp": "0x5",
+        "extraData": "0x",
+        "baseFeePerGas": "0x7",
+        "blockHash": "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+        "transactions": []
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "status": "VALID",
+      "latestValidHash": "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+      "validationError": null
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/04_invalid_safeblock_hash.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/04_invalid_safeblock_hash.json
new file mode 100644
index 00000000000..7381e94ece9
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/04_invalid_safeblock_hash.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_forkchoiceUpdatedV1",
+    "params": [
+      {
+        "headBlockHash": "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+        "safeBlockHash": "0x00000051470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04abcdef",
+        "finalizedBlockHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a"
+      },
+      null
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "error": {
+      "code": -38002,
+      "message": "Invalid forkchoice state"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/05_invalid_finalized_block_hash.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/05_invalid_finalized_block_hash.json
new file mode 100644
index 00000000000..919553383aa
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/05_invalid_finalized_block_hash.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_forkchoiceUpdatedV1",
+    "params": [
+      {
+        "headBlockHash": "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+        "safeBlockHash": "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+        "finalizedBlockHash": "0x00000040d288781d4aac94d3fd16809ee413bc99294a085798a589dae5abcdef"
+      },
+      null
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "error": {
+      "code": -38002,
+      "message": "Invalid forkchoice state"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/06_update_forkchoice_invalid_payload_attributes.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/06_update_forkchoice_invalid_payload_attributes.json
new file mode 100644
index 00000000000..4014e14a6ff
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/06_update_forkchoice_invalid_payload_attributes.json
@@ -0,0 +1,28 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_forkchoiceUpdatedV1",
+    "params": [
+      {
+        "headBlockHash": "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+        "safeBlockHash": "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+        "finalizedBlockHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a"
+      },
+      {
+        "timestamp": "0x0",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "suggestedFeeRecipient": "0x0000000000000000000000000000000000000000"
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "error": {
+      "code": -38003,
+      "message": "Invalid payload attributes"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/07_update_forkchoice.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/07_update_forkchoice.json
new file mode 100644
index 00000000000..8635adddb2b
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/07_update_forkchoice.json
@@ -0,0 +1,28 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_forkchoiceUpdatedV1",
+    "params": [
+      {
+        "headBlockHash": "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+        "safeBlockHash": "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+        "finalizedBlockHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a"
+      },
+      null
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "payloadStatus": {
+        "status": "VALID",
+        "latestValidHash": "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+        "validationError": null
+      },
+      "payloadId": null
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/08_unknown_payload.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/08_unknown_payload.json
new file mode 100644
index 00000000000..21ccd28c154
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/08_unknown_payload.json
@@ -0,0 +1,19 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_getPayloadV1",
+    "params": [
+      "0x0000000000000000"
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "error": {
+      "code": -32001,
+      "message": "Payload does not exist / is not available"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/09_invalid_head.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/09_invalid_head.json
new file mode 100644
index 00000000000..a7b699d9e96
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/test-cases/09_invalid_head.json
@@ -0,0 +1,32 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_forkchoiceUpdatedV1",
+    "params": [
+      {
+        "headBlockHash": "0x0000000000000000000000000000000000000000000000000000000000000001",
+        "safeBlockHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
+        "finalizedBlockHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+      },
+      {
+        "timestamp": "0x5",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "suggestedFeeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "payloadStatus": {
+        "status": "SYNCING",
+        "latestValidHash": null,
+        "validationError": null
+      },
+      "payloadId": null
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/genesis.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/genesis.json
new file mode 100644
index 00000000000..6b596fee607
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/genesis.json
@@ -0,0 +1,51 @@
+{
+  "config": {
+    "chainId":1,
+    "homesteadBlock":0,
+    "eip150Block":0,
+    "eip155Block":0,
+    "eip158Block":0,
+    "byzantiumBlock":0,
+    "constantinopleBlock":0,
+    "petersburgBlock":0,
+    "istanbulBlock":0,
+    "muirGlacierBlock":0,
+    "berlinBlock":0,
+    "londonBlock":0,
+    "terminalTotalDifficulty":0,
+    "shanghaiTime":10,
+    "clique": {
+      "period": 5,
+      "epoch": 30000
+    }
+  },
+  "nonce":"0x42",
+  "timestamp":"0x0",
+  "extraData":"0x0000000000000000000000000000000000000000000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "gasLimit":"0x1C9C380",
+  "difficulty":"0x400000000",
+  "mixHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
+  "coinbase":"0x0000000000000000000000000000000000000000",
+  "alloc":{
+    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b":{"balance":"0x6d6172697573766477000000"},
+    "0x0000000000000000000000000000000000000100" : {
+      "balance" : "0x00",
+      "code" : "0x60015f55",
+      "nonce" : "0x00",
+      "storage" : {
+      }
+    },
+    "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+      "balance" : "0x00",
+      "code" : "0x6000806000806000803560601c620186a0f160005560018055",
+      "nonce" : "0x00",
+      "storage" : {
+        "0x01" : "0x01"
+      }
+    }
+  },
+  "number":"0x0",
+  "gasUsed":"0x0",
+  "parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
+  "baseFeePerGas":"0x7"
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/01_paris_prepare_payload.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/01_paris_prepare_payload.json
new file mode 100644
index 00000000000..314dbd2e4e4
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/01_paris_prepare_payload.json
@@ -0,0 +1,32 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_forkchoiceUpdatedV1",
+    "params": [
+      {
+        "headBlockHash": "0x274b386b1b268ebb5ca1f717c1279a536faf1f74dda959143dd8a779f8d8a908",
+        "safeBlockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "finalizedBlockHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+      },
+      {
+        "timestamp": "0x5",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "suggestedFeeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "payloadStatus": {
+        "status": "VALID",
+        "latestValidHash": "0x274b386b1b268ebb5ca1f717c1279a536faf1f74dda959143dd8a779f8d8a908",
+        "validationError": null
+      },
+      "payloadId": "0x0065bd3490dd4505"
+    }
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/02_paris_getPayloadV1.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/02_paris_getPayloadV1.json
new file mode 100644
index 00000000000..9a6d96f884a
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/02_paris_getPayloadV1.json
@@ -0,0 +1,31 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_getPayloadV1",
+    "params": [
+      "0x0065bd3490dd4505"
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "parentHash": "0x274b386b1b268ebb5ca1f717c1279a536faf1f74dda959143dd8a779f8d8a908",
+      "feeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      "stateRoot": "0xbe4b5fae64ef4f22db6639c62b4ce120f3d4adda1bc536d317d1ada680b574ef",
+      "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "blockNumber": "0x1",
+      "gasLimit": "0x1c9c380",
+      "gasUsed": "0x0",
+      "timestamp": "0x5",
+      "extraData": "0x",
+      "baseFeePerGas": "0x7",
+      "blockHash": "0xf4a1d287dd3bb7e877c57476912e6a6052bc4eed8ea70d032b55d77f26ee985f",
+      "transactions": []
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/03_paris_newPayloadV1.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/03_paris_newPayloadV1.json
new file mode 100644
index 00000000000..6f7bc724f22
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/03_paris_newPayloadV1.json
@@ -0,0 +1,35 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_newPayloadV1",
+    "params": [
+      {
+        "parentHash": "0x274b386b1b268ebb5ca1f717c1279a536faf1f74dda959143dd8a779f8d8a908",
+        "feeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "stateRoot": "0xbe4b5fae64ef4f22db6639c62b4ce120f3d4adda1bc536d317d1ada680b574ef",
+        "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+        "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "blockNumber": "0x1",
+        "gasLimit": "0x1c9c380",
+        "gasUsed": "0x0",
+        "timestamp": "0x5",
+        "extraData": "0x",
+        "baseFeePerGas": "0x7",
+        "blockHash": "0xf4a1d287dd3bb7e877c57476912e6a6052bc4eed8ea70d032b55d77f26ee985f",
+        "transactions": []
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "status": "VALID",
+      "latestValidHash": "0xf4a1d287dd3bb7e877c57476912e6a6052bc4eed8ea70d032b55d77f26ee985f",
+      "validationError": null
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/04_paris_forkchoiceUpdatedV1.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/04_paris_forkchoiceUpdatedV1.json
new file mode 100644
index 00000000000..1bba4a092a3
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/04_paris_forkchoiceUpdatedV1.json
@@ -0,0 +1,28 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_forkchoiceUpdatedV1",
+    "params": [
+      {
+        "headBlockHash": "0xf4a1d287dd3bb7e877c57476912e6a6052bc4eed8ea70d032b55d77f26ee985f",
+        "safeBlockHash": "0xf4a1d287dd3bb7e877c57476912e6a6052bc4eed8ea70d032b55d77f26ee985f",
+        "finalizedBlockHash": "0x274b386b1b268ebb5ca1f717c1279a536faf1f74dda959143dd8a779f8d8a908"
+      },
+      null
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "payloadStatus": {
+        "status": "VALID",
+        "latestValidHash": "0xf4a1d287dd3bb7e877c57476912e6a6052bc4eed8ea70d032b55d77f26ee985f",
+        "validationError": null
+      },
+      "payloadId": null
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/05_shanghai_prepare_payload_invalid_null_withdrawals.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/05_shanghai_prepare_payload_invalid_null_withdrawals.json
new file mode 100644
index 00000000000..ac5947c79be
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/05_shanghai_prepare_payload_invalid_null_withdrawals.json
@@ -0,0 +1,28 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_forkchoiceUpdatedV2",
+    "params": [
+      {
+        "headBlockHash": "0xf4a1d287dd3bb7e877c57476912e6a6052bc4eed8ea70d032b55d77f26ee985f",
+        "safeBlockHash": "0xf4a1d287dd3bb7e877c57476912e6a6052bc4eed8ea70d032b55d77f26ee985f",
+        "finalizedBlockHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+      },
+      {
+        "timestamp": "0x10",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "suggestedFeeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc" : "2.0",
+    "id" : 67,
+    "error" : {
+      "code" : -32602,
+      "message" : "Invalid params"
+    }
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/06_shanghai_prepare_payload.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/06_shanghai_prepare_payload.json
new file mode 100644
index 00000000000..456a9a74264
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/06_shanghai_prepare_payload.json
@@ -0,0 +1,46 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_forkchoiceUpdatedV2",
+    "params": [
+      {
+        "headBlockHash": "0xf4a1d287dd3bb7e877c57476912e6a6052bc4eed8ea70d032b55d77f26ee985f",
+        "safeBlockHash": "0xf4a1d287dd3bb7e877c57476912e6a6052bc4eed8ea70d032b55d77f26ee985f",
+        "finalizedBlockHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+      },
+      {
+        "timestamp": "0x10",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "suggestedFeeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "withdrawals": [
+          {
+            "index": "0x0",
+            "validatorIndex": "0x0",
+            "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "amount": "0x3"
+          },
+          {
+            "index": "0x1",
+            "validatorIndex": "0x1",
+            "address": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+            "amount": "0x4"
+          }
+        ]
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "payloadStatus": {
+        "status": "VALID",
+        "latestValidHash": "0xf4a1d287dd3bb7e877c57476912e6a6052bc4eed8ea70d032b55d77f26ee985f",
+        "validationError": null
+      },
+      "payloadId": "0x0065bd2db6663f59"
+    }
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/07_shanghai_prepare_payload_replay_different_withdrawals.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/07_shanghai_prepare_payload_replay_different_withdrawals.json
new file mode 100644
index 00000000000..dcb022e1a62
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/07_shanghai_prepare_payload_replay_different_withdrawals.json
@@ -0,0 +1,46 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_forkchoiceUpdatedV2",
+    "params": [
+      {
+        "headBlockHash": "0xf4a1d287dd3bb7e877c57476912e6a6052bc4eed8ea70d032b55d77f26ee985f",
+        "safeBlockHash": "0xf4a1d287dd3bb7e877c57476912e6a6052bc4eed8ea70d032b55d77f26ee985f",
+        "finalizedBlockHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+      },
+      {
+        "timestamp": "0x10",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "suggestedFeeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "withdrawals": [
+          {
+            "index": "0x0",
+            "validatorIndex": "0x0",
+            "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "amount": "0x1"
+          },
+          {
+            "index": "0x1",
+            "validatorIndex": "0x1",
+            "address": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+            "amount": "0x2"
+          }
+        ]
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "payloadStatus": {
+        "status": "VALID",
+        "latestValidHash": "0xf4a1d287dd3bb7e877c57476912e6a6052bc4eed8ea70d032b55d77f26ee985f",
+        "validationError": null
+      },
+      "payloadId": "0x0065bd2db6663ed9"
+    }
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/08_shanghai_getPayloadV2.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/08_shanghai_getPayloadV2.json
new file mode 100644
index 00000000000..2da9be48f4e
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/08_shanghai_getPayloadV2.json
@@ -0,0 +1,49 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_getPayloadV2",
+    "params": [
+      "0x0065bd2db6663ed9"
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "executionPayload": {
+        "parentHash": "0xf4a1d287dd3bb7e877c57476912e6a6052bc4eed8ea70d032b55d77f26ee985f",
+        "feeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "stateRoot": "0xa61c2a422a4f7d7d7f456c1a83d5484eaf0d49e2b6b6d5716f875e782c66a9f0",
+        "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "gasLimit": "0x1c9c380",
+        "gasUsed": "0x0",
+        "timestamp": "0x10",
+        "extraData": "0x",
+        "baseFeePerGas": "0x7",
+        "transactions": [],
+        "withdrawals": [
+          {
+            "index": "0x0",
+            "validatorIndex": "0x0",
+            "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "amount": "0x1"
+          },
+          {
+            "index": "0x1",
+            "validatorIndex": "0x1",
+            "address": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+            "amount": "0x2"
+          }
+        ],
+        "deposits": null,
+        "blockNumber": "0x2",
+        "blockHash": "0x612abd8615f544759d4aeb3dbab32f5f198a8b818e9c5436e9f7a674ef3b0f20",
+        "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
+      },
+      "blockValue": "0x0"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/09_shanghai_newPayloadV2_invalid_null_withdrawals.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/09_shanghai_newPayloadV2_invalid_null_withdrawals.json
new file mode 100644
index 00000000000..b682b05c369
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/09_shanghai_newPayloadV2_invalid_null_withdrawals.json
@@ -0,0 +1,35 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_newPayloadV2",
+    "params": [
+      {
+        "parentHash": "0xf4a1d287dd3bb7e877c57476912e6a6052bc4eed8ea70d032b55d77f26ee985f",
+        "feeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "stateRoot": "0xa61c2a422a4f7d7d7f456c1a83d5484eaf0d49e2b6b6d5716f875e782c66a9f0",
+        "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "gasLimit": "0x1c9c380",
+        "gasUsed": "0x0",
+        "timestamp": "0x10",
+        "extraData": "0x",
+        "baseFeePerGas": "0x7",
+        "transactions": [],
+        "withdrawals": null,
+        "blockNumber": "0x2",
+        "blockHash": "0x612abd8615f544759d4aeb3dbab32f5f198a8b818e9c5436e9f7a674ef3b0f20",
+        "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "error": {
+      "code": -32602,
+      "message": "Invalid params"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/10_shanghai_newPayloadV2.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/10_shanghai_newPayloadV2.json
new file mode 100644
index 00000000000..f17a98a5631
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/10_shanghai_newPayloadV2.json
@@ -0,0 +1,49 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_newPayloadV2",
+    "params": [
+      {
+        "parentHash": "0xf4a1d287dd3bb7e877c57476912e6a6052bc4eed8ea70d032b55d77f26ee985f",
+        "feeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "stateRoot": "0xa61c2a422a4f7d7d7f456c1a83d5484eaf0d49e2b6b6d5716f875e782c66a9f0",
+        "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "gasLimit": "0x1c9c380",
+        "gasUsed": "0x0",
+        "timestamp": "0x10",
+        "extraData": "0x",
+        "baseFeePerGas": "0x7",
+        "transactions": [],
+        "withdrawals": [
+          {
+            "index": "0x0",
+            "validatorIndex": "0x0",
+            "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "amount": "0x1"
+          },
+          {
+            "index": "0x1",
+            "validatorIndex": "0x1",
+            "address": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+            "amount": "0x2"
+          }
+        ],
+        "blockNumber": "0x2",
+        "blockHash": "0x612abd8615f544759d4aeb3dbab32f5f198a8b818e9c5436e9f7a674ef3b0f20",
+        "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "status": "VALID",
+      "latestValidHash": "0x612abd8615f544759d4aeb3dbab32f5f198a8b818e9c5436e9f7a674ef3b0f20",
+      "validationError": null
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/11_shanghai_forkchoiceUpdatedV2.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/11_shanghai_forkchoiceUpdatedV2.json
new file mode 100644
index 00000000000..938372b0ce6
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/11_shanghai_forkchoiceUpdatedV2.json
@@ -0,0 +1,28 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_forkchoiceUpdatedV2",
+    "params": [
+      {
+        "headBlockHash": "0x612abd8615f544759d4aeb3dbab32f5f198a8b818e9c5436e9f7a674ef3b0f20",
+        "safeBlockHash": "0x612abd8615f544759d4aeb3dbab32f5f198a8b818e9c5436e9f7a674ef3b0f20",
+        "finalizedBlockHash": "0x612abd8615f544759d4aeb3dbab32f5f198a8b818e9c5436e9f7a674ef3b0f20"
+      },
+      null
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "payloadStatus": {
+        "status": "VALID",
+        "latestValidHash": "0x612abd8615f544759d4aeb3dbab32f5f198a8b818e9c5436e9f7a674ef3b0f20",
+        "validationError": null
+      },
+      "payloadId": null
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/12_shanghai_withdrawals_address1_latest_balance.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/12_shanghai_withdrawals_address1_latest_balance.json
new file mode 100644
index 00000000000..dba627bd101
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/12_shanghai_withdrawals_address1_latest_balance.json
@@ -0,0 +1,11 @@
+{
+  "request": {
+    "jsonrpc":"2.0","method":"eth_getBalance","params":["0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b","latest"],"id":1
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 1,
+    "result": "0x6d61726975737664b29aca00"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/13_shanghai_withdrawals_address2_latest_balance.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/13_shanghai_withdrawals_address2_latest_balance.json
new file mode 100644
index 00000000000..7eb698ee0e3
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/13_shanghai_withdrawals_address2_latest_balance.json
@@ -0,0 +1,11 @@
+{
+  "request": {
+    "jsonrpc":"2.0","method":"eth_getBalance","params":["0xfe3b557e8fb62b89f4916b721be55ceb828dbd73","latest"],"id":1
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 1,
+    "result": "0x77359400"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/14_shanghai_newPayloadV2_push0_tx.json b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/14_shanghai_newPayloadV2_push0_tx.json
new file mode 100644
index 00000000000..788aad210b8
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/test-cases/14_shanghai_newPayloadV2_push0_tx.json
@@ -0,0 +1,38 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_newPayloadV2",
+    "params": [
+      {
+        "parentHash": "0x612abd8615f544759d4aeb3dbab32f5f198a8b818e9c5436e9f7a674ef3b0f20",
+        "feeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "stateRoot": "0xf8e89cc49d51d0bbbfd75fe214712e04f3b70e7c447261a2290262a8e1c4d0e1",
+        "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "gasLimit": "0x1c9c380",
+        "gasUsed": "0x111f8",
+        "timestamp": "0x11",
+        "extraData": "0x",
+        "baseFeePerGas": "0x7",
+        "transactions": [
+          "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b809400000000000000000000000000000000000001001ba040c30479d1f1f7ac729145a6e98ff0bc4882cc21930cc283db84f42f1852d9fba0567ecfa0b8daeedfd9ab8d520bcf44f06d682be47dac7d64a6865cec4ec33cef"
+        ],
+        "withdrawals": [],
+        "blockNumber": "0x3",
+        "blockHash": "0x85a4410f70b315e85382c7def115df2742348734f14c91bfbad0f2c67e9de4a2",
+        "receiptsRoot": "0x1668c1a230c3e0aaa4c52af3bada02571dabb4e1743ebd6eaf4bbe8008e8cc3e"
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "status": "VALID",
+      "latestValidHash": "0x85a4410f70b315e85382c7def115df2742348734f14c91bfbad0f2c67e9de4a2",
+      "validationError": null
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/genesis.json b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/genesis.json
new file mode 100644
index 00000000000..98a1201c9aa
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/genesis.json
@@ -0,0 +1,36 @@
+{
+  "config": {
+    "chainId":1,
+    "homesteadBlock":0,
+    "eip150Block":0,
+    "eip155Block":0,
+    "eip158Block":0,
+    "byzantiumBlock":0,
+    "constantinopleBlock":0,
+    "petersburgBlock":0,
+    "istanbulBlock":0,
+    "muirGlacierBlock":0,
+    "berlinBlock":0,
+    "londonBlock":0,
+    "shanghaiTime":10,
+    "clique": {
+      "period": 5,
+      "epoch": 30000
+    },
+    "terminalTotalDifficulty":0
+  },
+  "nonce":"0x42",
+  "timestamp":"0x0",
+  "extraData":"0x0000000000000000000000000000000000000000000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "gasLimit":"0x1C9C380",
+  "difficulty":"0x400000000",
+  "mixHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
+  "coinbase":"0x0000000000000000000000000000000000000000",
+  "alloc":{
+    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b":{"balance":"0x6d6172697573766477000000"}
+  },
+  "number":"0x0",
+  "gasUsed":"0x0",
+  "parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
+  "baseFeePerGas":"0x7"
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/01_execute_payload_1.json b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/01_execute_payload_1.json
new file mode 100644
index 00000000000..f4322b22a6b
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/01_execute_payload_1.json
@@ -0,0 +1,35 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_newPayloadV2",
+    "params": [
+      {
+        "parentHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
+        "feeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "stateRoot": "0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45",
+        "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+        "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "blockNumber": "0x1",
+        "gasLimit": "0x1c9c380",
+        "gasUsed": "0x0",
+        "timestamp": "0x5",
+        "extraData": "0x",
+        "baseFeePerGas": "0x7",
+        "blockHash": "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+        "transactions": []
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "status": "VALID",
+      "latestValidHash": "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+      "validationError": null
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/02_execute_payload_2.json b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/02_execute_payload_2.json
new file mode 100644
index 00000000000..0f160f3c39d
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/02_execute_payload_2.json
@@ -0,0 +1,36 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_newPayloadV2",
+    "params": [
+      {
+        "parentHash": "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+        "feeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "stateRoot": "0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45",
+        "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+        "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "blockNumber": "0x2",
+        "gasLimit": "0x1c9c380",
+        "gasUsed": "0x0",
+        "timestamp": "0x10",
+        "extraData": "0x",
+        "baseFeePerGas": "0x7",
+        "blockHash": "0x7c2a09bedc85268606805e6df579e758af8d832ef9826927ce4b4b14452a32cf",
+        "transactions": [],
+        "withdrawals": []
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "status": "VALID",
+      "latestValidHash": "0x7c2a09bedc85268606805e6df579e758af8d832ef9826927ce4b4b14452a32cf",
+      "validationError": null
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/03_execute_payload_3.json b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/03_execute_payload_3.json
new file mode 100644
index 00000000000..9b27bc59a26
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/03_execute_payload_3.json
@@ -0,0 +1,49 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_newPayloadV2",
+    "params": [
+      {
+        "parentHash": "0x7c2a09bedc85268606805e6df579e758af8d832ef9826927ce4b4b14452a32cf",
+        "feeRecipient": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "stateRoot": "0x7a6f2e03f2348dc75731e6e767c97a88da50430748a030874e27f7c3fac3d49d",
+        "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+        "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "prevRandao": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "blockNumber": "0x3",
+        "gasLimit": "0x1c9c380",
+        "gasUsed": "0x0",
+        "timestamp": "0x11",
+        "extraData": "0x",
+        "baseFeePerGas": "0x7",
+        "blockHash": "0x77edeba4adb3cb3e365fccb48393c8445a5c4c6648ec660806c2ce1e9de13fd3",
+        "transactions": [],
+        "withdrawals": [
+          {
+            "index": "0x0",
+            "validatorIndex": "0x0",
+            "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "amount": "0x1"
+          },
+          {
+            "index": "0x1",
+            "validatorIndex": "0x0",
+            "address": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+            "amount": "0x2"
+          }
+        ]
+      }
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "status": "VALID",
+      "latestValidHash": "0x77edeba4adb3cb3e365fccb48393c8445a5c4c6648ec660806c2ce1e9de13fd3",
+      "validationError": null
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/04_update_forkchoice.json b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/04_update_forkchoice.json
new file mode 100644
index 00000000000..c3c234f04df
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/04_update_forkchoice.json
@@ -0,0 +1,28 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "engine_forkchoiceUpdatedV2",
+    "params": [
+      {
+        "headBlockHash": "0x77edeba4adb3cb3e365fccb48393c8445a5c4c6648ec660806c2ce1e9de13fd3",
+        "safeBlockHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
+        "finalizedBlockHash": "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a"
+      },
+      null
+    ],
+    "id": 67
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 67,
+    "result": {
+      "payloadStatus": {
+        "status": "VALID",
+        "latestValidHash": "0x77edeba4adb3cb3e365fccb48393c8445a5c4c6648ec660806c2ce1e9de13fd3",
+        "validationError": null
+      },
+      "payloadId": null
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/05_get_genesis_block.json b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/05_get_genesis_block.json
new file mode 100644
index 00000000000..4a4e8abee58
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/05_get_genesis_block.json
@@ -0,0 +1,33 @@
+{
+  "request": {
+    "jsonrpc":"2.0","method":"eth_getBlockByNumber","params":["0x0", false],"id":1
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 1,
+    "result" : {
+      "number" : "0x0",
+      "hash" : "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
+      "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0000000000000042",
+      "sha3Uncles" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "transactionsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "stateRoot" : "0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45",
+      "receiptsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "miner" : "0x0000000000000000000000000000000000000000",
+      "difficulty" : "0x400000000",
+      "totalDifficulty" : "0x400000000",
+      "extraData":"0x0000000000000000000000000000000000000000000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "baseFeePerGas" : "0x7",
+      "size" : "0x275",
+      "gasLimit" : "0x1c9c380",
+      "gasUsed" : "0x0",
+      "timestamp" : "0x0",
+      "uncles" : [ ],
+      "transactions" : [ ]
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/06_get_last_paris_block.json b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/06_get_last_paris_block.json
new file mode 100644
index 00000000000..f81c9b64964
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/06_get_last_paris_block.json
@@ -0,0 +1,33 @@
+{
+  "request": {
+    "jsonrpc":"2.0","method":"eth_getBlockByNumber","params":["0x1", false],"id":1
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 1,
+    "result" : {
+      "number" : "0x1",
+      "hash" : "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+      "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "parentHash" : "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
+      "nonce" : "0x0000000000000000",
+      "sha3Uncles" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "transactionsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "stateRoot" : "0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45",
+      "receiptsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "miner" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      "difficulty" : "0x0",
+      "totalDifficulty" : "0x400000000",
+      "extraData" : "0x",
+      "baseFeePerGas" : "0x7",
+      "size" : "0x1fa",
+      "gasLimit" : "0x1c9c380",
+      "gasUsed" : "0x0",
+      "timestamp" : "0x5",
+      "uncles" : [ ],
+      "transactions" : [ ]
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/07_get_first_shanghai_block.json b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/07_get_first_shanghai_block.json
new file mode 100644
index 00000000000..de9d681fd13
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/07_get_first_shanghai_block.json
@@ -0,0 +1,35 @@
+{
+  "request": {
+    "jsonrpc":"2.0","method":"eth_getBlockByNumber","params":["0x2", false],"id":1
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 1,
+    "result" : {
+      "number" : "0x2",
+      "hash" : "0x7c2a09bedc85268606805e6df579e758af8d832ef9826927ce4b4b14452a32cf",
+      "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "parentHash" : "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+      "nonce" : "0x0000000000000000",
+      "sha3Uncles" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "transactionsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "stateRoot" : "0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45",
+      "receiptsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "miner" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      "difficulty" : "0x0",
+      "totalDifficulty" : "0x400000000",
+      "extraData" : "0x",
+      "baseFeePerGas" : "0x7",
+      "size" : "0x21c",
+      "gasLimit" : "0x1c9c380",
+      "gasUsed" : "0x0",
+      "timestamp" : "0x10",
+      "uncles" : [ ],
+      "transactions" : [ ],
+      "withdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "withdrawals": [ ]
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/08_get_latest_block.json b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/08_get_latest_block.json
new file mode 100644
index 00000000000..dc3eaf96370
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/08_get_latest_block.json
@@ -0,0 +1,48 @@
+{
+  "request": {
+    "jsonrpc":"2.0","method":"eth_getBlockByNumber","params":["latest", false],"id":1
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 1,
+    "result" : {
+      "number" : "0x3",
+      "hash" : "0x77edeba4adb3cb3e365fccb48393c8445a5c4c6648ec660806c2ce1e9de13fd3",
+      "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "parentHash" : "0x7c2a09bedc85268606805e6df579e758af8d832ef9826927ce4b4b14452a32cf",
+      "nonce" : "0x0000000000000000",
+      "sha3Uncles" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "transactionsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "stateRoot" : "0x7a6f2e03f2348dc75731e6e767c97a88da50430748a030874e27f7c3fac3d49d",
+      "receiptsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "miner" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      "difficulty" : "0x0",
+      "totalDifficulty" : "0x400000000",
+      "extraData" : "0x",
+      "baseFeePerGas" : "0x7",
+      "size" : "0x24e",
+      "gasLimit" : "0x1c9c380",
+      "gasUsed" : "0x0",
+      "timestamp" : "0x11",
+      "uncles" : [ ],
+      "transactions" : [ ],
+      "withdrawalsRoot" : "0x18f3a249d9eb5115c5a632731a8ae4014b874bad61d4e1658a75aa190256c3b0",
+      "withdrawals": [
+        {
+          "index": "0x0",
+          "validatorIndex": "0x0",
+          "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+          "amount": "0x1"
+        },
+        {
+          "index": "0x1",
+          "validatorIndex": "0x0",
+          "address": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "amount": "0x2"
+        }
+      ]
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/09_get_last_paris_block_by_hash.json b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/09_get_last_paris_block_by_hash.json
new file mode 100644
index 00000000000..a7392e9414d
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/09_get_last_paris_block_by_hash.json
@@ -0,0 +1,33 @@
+{
+  "request": {
+    "jsonrpc":"2.0","method":"eth_getBlockByHash","params":["0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858", false],"id":1
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 1,
+    "result" : {
+      "number" : "0x1",
+      "hash" : "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+      "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "parentHash" : "0x3b8fb240d288781d4aac94d3fd16809ee413bc99294a085798a589dae51ddd4a",
+      "nonce" : "0x0000000000000000",
+      "sha3Uncles" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "transactionsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "stateRoot" : "0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45",
+      "receiptsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "miner" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      "difficulty" : "0x0",
+      "totalDifficulty" : "0x400000000",
+      "extraData" : "0x",
+      "baseFeePerGas" : "0x7",
+      "size" : "0x1fa",
+      "gasLimit" : "0x1c9c380",
+      "gasUsed" : "0x0",
+      "timestamp" : "0x5",
+      "uncles" : [ ],
+      "transactions" : [ ]
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/10_get_first_shanghai_block_by_hash.json b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/10_get_first_shanghai_block_by_hash.json
new file mode 100644
index 00000000000..8ef5aa2095b
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/10_get_first_shanghai_block_by_hash.json
@@ -0,0 +1,35 @@
+{
+  "request": {
+    "jsonrpc":"2.0","method":"eth_getBlockByHash","params":["0x7c2a09bedc85268606805e6df579e758af8d832ef9826927ce4b4b14452a32cf", false],"id":1
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 1,
+    "result" : {
+      "number" : "0x2",
+      "hash" : "0x7c2a09bedc85268606805e6df579e758af8d832ef9826927ce4b4b14452a32cf",
+      "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "parentHash" : "0x3559e851470f6e7bbed1db474980683e8c315bfce99b2a6ef47c057c04de7858",
+      "nonce" : "0x0000000000000000",
+      "sha3Uncles" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "transactionsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "stateRoot" : "0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45",
+      "receiptsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "miner" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      "difficulty" : "0x0",
+      "totalDifficulty" : "0x400000000",
+      "extraData" : "0x",
+      "baseFeePerGas" : "0x7",
+      "size" : "0x21c",
+      "gasLimit" : "0x1c9c380",
+      "gasUsed" : "0x0",
+      "timestamp" : "0x10",
+      "uncles" : [ ],
+      "transactions" : [ ],
+      "withdrawalsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "withdrawals": [ ]
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/11_get_latest_block_by_hash.json b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/11_get_latest_block_by_hash.json
new file mode 100644
index 00000000000..8b886204742
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/test-cases/11_get_latest_block_by_hash.json
@@ -0,0 +1,48 @@
+{
+  "request": {
+    "jsonrpc":"2.0","method":"eth_getBlockByHash","params":["0x77edeba4adb3cb3e365fccb48393c8445a5c4c6648ec660806c2ce1e9de13fd3", false],"id":1
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 1,
+    "result" : {
+      "number" : "0x3",
+      "hash" : "0x77edeba4adb3cb3e365fccb48393c8445a5c4c6648ec660806c2ce1e9de13fd3",
+      "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "parentHash" : "0x7c2a09bedc85268606805e6df579e758af8d832ef9826927ce4b4b14452a32cf",
+      "nonce" : "0x0000000000000000",
+      "sha3Uncles" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "transactionsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "stateRoot" : "0x7a6f2e03f2348dc75731e6e767c97a88da50430748a030874e27f7c3fac3d49d",
+      "receiptsRoot" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "miner" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      "difficulty" : "0x0",
+      "totalDifficulty" : "0x400000000",
+      "extraData" : "0x",
+      "baseFeePerGas" : "0x7",
+      "size" : "0x24e",
+      "gasLimit" : "0x1c9c380",
+      "gasUsed" : "0x0",
+      "timestamp" : "0x11",
+      "uncles" : [ ],
+      "transactions" : [ ],
+      "withdrawalsRoot" : "0x18f3a249d9eb5115c5a632731a8ae4014b874bad61d4e1658a75aa190256c3b0",
+      "withdrawals": [
+        {
+          "index": "0x0",
+          "validatorIndex": "0x0",
+          "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+          "amount": "0x1"
+        },
+        {
+          "index": "0x1",
+          "validatorIndex": "0x0",
+          "address": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "amount": "0x2"
+        }
+      ]
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/acceptance-tests/tests/src/test/resources/log4j2.xml b/acceptance-tests/tests/src/test/resources/log4j2.xml
index af826438c13..ec7a9d96ece 100644
--- a/acceptance-tests/tests/src/test/resources/log4j2.xml
+++ b/acceptance-tests/tests/src/test/resources/log4j2.xml
@@ -81,8 +81,6 @@
       <AppenderRef ref="SubProcessConsole" />
       <AppenderRef ref="PerTestSubprocessFile" />
     </Logger>
-    <Logger name="net.consensys.orion" level="OFF" additivity="false">
-    </Logger>
     <Root level="${sys:root.log.level}">
       <AppenderRef ref="Console" />
       <AppenderRef ref="PerTestFile" />
diff --git a/acceptance-tests/tests/src/test/resources/permissioning/simple_permissioning_genesis.json b/acceptance-tests/tests/src/test/resources/permissioning/simple_permissioning_genesis.json
index 0d8508e7b97..5aee1cc13b3 100644
--- a/acceptance-tests/tests/src/test/resources/permissioning/simple_permissioning_genesis.json
+++ b/acceptance-tests/tests/src/test/resources/permissioning/simple_permissioning_genesis.json
@@ -1,14 +1,7 @@
 {
   "config": {
     "chainId": 999,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
-    "byzantiumBlock": 0,
-    "constantinopleBlock": 0,
-    "constantinopleFixBlock": 0,
+    "petersburgBlock": 0,
     "ethash": {
       "fixeddifficulty": 100
     }
diff --git a/acceptance-tests/tests/src/test/resources/permissioning/simple_permissioning_ibft_genesis.json b/acceptance-tests/tests/src/test/resources/permissioning/simple_permissioning_ibft_genesis.json
index 725161f82e7..907547b0ca9 100644
--- a/acceptance-tests/tests/src/test/resources/permissioning/simple_permissioning_ibft_genesis.json
+++ b/acceptance-tests/tests/src/test/resources/permissioning/simple_permissioning_ibft_genesis.json
@@ -1,14 +1,7 @@
 {
   "config": {
     "chainId": 999,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
-    "byzantiumBlock": 0,
-    "constantinopleBlock": 0,
-    "constantinopleFixBlock": 0,
+    "petersburgBlock": 0,
     "ibft2": {
       "blockperiodseconds": 5,
       "epochlength": 30000,
diff --git a/acceptance-tests/tests/src/test/resources/permissioning/simple_permissioning_v2_genesis.json b/acceptance-tests/tests/src/test/resources/permissioning/simple_permissioning_v2_genesis.json
index ce6c9d00b64..1802856c793 100644
--- a/acceptance-tests/tests/src/test/resources/permissioning/simple_permissioning_v2_genesis.json
+++ b/acceptance-tests/tests/src/test/resources/permissioning/simple_permissioning_v2_genesis.json
@@ -1,14 +1,7 @@
 {
   "config": {
     "chainId": 999,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
-    "byzantiumBlock": 0,
-    "constantinopleBlock": 0,
-    "constantinopleFixBlock": 0,
+    "petersburgBlock": 0,
     "ethash": {
       "fixeddifficulty": 100
     }
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/README.md b/acceptance-tests/tests/src/test/resources/pki-certs/README.md
new file mode 100644
index 00000000000..25b23db2031
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/README.md
@@ -0,0 +1,127 @@
+See `ethereum/p2p/src/test/resources/keys/README.md` which describes the details on how the 
+certificates are created. The same CA are used to create miner1-miner6. 
+
+For `PkiQbftAcceptanceTest`: 
+`miner1`-`miner5` are signed with `partner1_ca` and `miner6` is signed with `partner2_ca`.
+`miner5` and `miner6` are revoked and added in the crl list.
+
+Sample shell script that can be executed to recreate the certificates
+~~~
+#! /bin/sh
+
+names=("partner1:miner1" "partner1:miner2" "partner1:miner3" "partner1:miner4" "partner1:miner5" "partner2:miner6")
+crls=("partner1:miner5" "partner2:miner6")
+KEY_ALG="EC -groupname secp256r1"
+#KEY_ALG="RSA -keysize 2048"
+
+##########
+CA_CERTS_PATH=./ca_certs
+ROOT_CA_KS=$CA_CERTS_PATH/root_ca.p12
+INTER_CA_KS=$CA_CERTS_PATH/inter_ca.p12
+CRL_DIR=./crl
+
+keytool -exportcert -keystore $ROOT_CA_KS -storepass test123 -alias root_ca -rfc -file $CA_CERTS_PATH/root_ca.pem
+
+echo "Generating miner keystores..."
+### Generate client keystores
+for name in "${names[@]}"
+do
+  IFS=':' read -r -a array <<< "$name"
+  partner=${array[0]}
+  client=${array[1]}
+
+  PARTNER_CA_KEYSTORE="$CA_CERTS_PATH/${partner}_ca.p12"
+  CLIENT_PATH="./${client}"
+  KEYSTORE_PATH="./$CLIENT_PATH/${client}.p12"
+  NSSDB_PATH="${CLIENT_PATH}/nssdb"
+
+  echo "$PARTNER_CA_KEYSTORE"
+
+  mkdir -p $NSSDB_PATH
+
+  echo "Generating keystore for Partner $partner Client $client"
+  keytool -genkeypair -keystore $KEYSTORE_PATH -storepass test123 -alias ${client} \
+  -keyalg $KEY_ALG -validity 36500 \
+  -dname "CN=localhost, OU=${partner}" \
+  -ext san=dns:localhost,ip:127.0.0.1
+
+  echo "Creating CSR for $client and signing it with ${partner}_ca"
+  keytool -storepass test123 -keystore $KEYSTORE_PATH -certreq -alias ${client} \
+  | keytool -storepass test123 -keystore $PARTNER_CA_KEYSTORE -gencert -alias "${partner}_ca" -ext ku:c=digitalSignature,nonRepudiation,keyEncipherment -ext eku=sA,cA \
+  -rfc > "${CLIENT_PATH}/${client}.pem"
+
+  echo "Concat root_ca.pem to ${client}.pem"
+  cat "${CA_CERTS_PATH}/root_ca.pem" >> "${CLIENT_PATH}/${client}.pem"
+
+  echo "Importing signed $client.pem CSR into $KEYSTORE_PATH"
+  keytool -keystore $KEYSTORE_PATH -importcert -alias $client \
+  -storepass test123 -noprompt -file "${CLIENT_PATH}/${client}.pem"
+
+  echo "Converting p12 to jks"
+  keytool -importkeystore -srckeystore $KEYSTORE_PATH -srcstoretype PKCS12 -destkeystore "$CLIENT_PATH/${client}.jks"  -deststoretype JKS -srcstorepass test123 -deststorepass test123 -srcalias $client -destalias $client -srckeypass test123 -destkeypass test123 -noprompt
+
+  echo "Initialize nss"
+  echo "test123" > ${CLIENT_PATH}/nsspin.txt
+  certutil -N -d sql:${NSSDB_PATH} -f "${CLIENT_PATH}/nsspin.txt"
+  # hack to make Java SunPKCS11 work with new sql version of nssdb
+  touch ${NSSDB_PATH}/secmod.db
+
+  pk12util -i $KEYSTORE_PATH -d sql:${NSSDB_PATH} -k ${CLIENT_PATH}/nsspin.txt -W test123
+  echo "Fixing truststores in sql:${NSSDB_PATH}"
+  certutil -M -n "CN=root.ca.besu.com"       -t CT,C,C -d sql:"$NSSDB_PATH" -f ${CLIENT_PATH}/nsspin.txt
+  certutil -M -n "CN=inter.ca.besu.com"      -t CT,C,C -d sql:"$NSSDB_PATH" -f ${CLIENT_PATH}/nsspin.txt
+  certutil -M -n "CN=${partner}.ca.besu.com" -t CT,C,C -d sql:"$NSSDB_PATH" -f ${CLIENT_PATH}/nsspin.txt
+
+  certutil -d sql:"$NSSDB_PATH" -f nsspin.txt -L
+
+  echo "Creating pkcs11 nss config file"
+  cat <<EOF >${CLIENT_PATH}/nss.cfg
+name = NSScrypto-${partner}-${client}
+nssSecmodDirectory = ./src/test/resources/pki-certs/${client}/nssdb
+nssDbMode = readOnly
+nssModule = keystore
+showInfo = true
+EOF
+
+  # remove pem files
+  rm "${CLIENT_PATH}/${client}.pem"
+
+  # create truststore
+  echo "Creating truststore ..."
+  keytool -exportcert -keystore $ROOT_CA_KS  -storepass test123 -alias root_ca -rfc   | keytool -import -trustcacerts -alias root_ca -keystore "${CLIENT_PATH}/truststore.p12" -storepass test123 -noprompt
+  keytool -exportcert -keystore $INTER_CA_KS -storepass test123 -alias inter_ca -rfc | keytool -import -trustcacerts -alias inter_ca -keystore "${CLIENT_PATH}/truststore.p12" -storepass test123 -noprompt
+  keytool -exportcert -keystore $PARTNER_CA_KEYSTORE  -storepass test123 -alias "${partner}_ca" -rfc   | keytool -import -trustcacerts -alias "${partner}_ca" -keystore "${CLIENT_PATH}/truststore.p12" -storepass test123 -noprompt
+
+done
+rm $CA_CERTS_PATH/root_ca.pem
+echo "Keystores and nss database created"
+
+## create crl list
+mkdir -p $CRL_DIR
+rm $CRL_DIR/crl.pem
+
+for crl in "${crls[@]}"
+do
+  IFS=':' read -r -a array <<< "$crl"
+  partner=${array[0]}
+  client=${array[1]}
+
+  echo "Exporting CA certificate and private key"
+  openssl pkcs12 -nodes -in "$CA_CERTS_PATH/${partner}_ca.p12" -out "$CRL_DIR/${partner}_ca_key.pem" -passin pass:test123 -nocerts
+  openssl pkcs12 -nodes -in "$CA_CERTS_PATH/${partner}_ca.p12" -out "$CRL_DIR/${partner}_ca.pem" -passin pass:test123 -nokeys
+
+  echo "Export $client certificate"
+  openssl pkcs12 -nodes -in "./${client}/${client}.p12" -out "$CRL_DIR/${client}.pem" -passin pass:test123 -nokeys
+
+  ## On Mac, use gnutls-certtool, on Linux use certtool
+  echo "Creating crl"
+  printf '365\n\n' | gnutls-certtool --generate-crl --load-ca-privkey "$CRL_DIR/${partner}_ca_key.pem" --load-ca-certificate "$CRL_DIR/${partner}_ca.pem" \
+  --load-certificate "$CRL_DIR/${client}.pem" >> $CRL_DIR/crl.pem
+
+  rm "$CRL_DIR/${partner}_ca_key.pem"
+  rm "$CRL_DIR/${partner}_ca.pem"
+  rm "$CRL_DIR/${client}.pem"
+
+done
+
+~~~
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/inter_ca.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/inter_ca.p12
new file mode 100644
index 00000000000..a6e945c2f06
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/inter_ca.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/partner1_ca.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/partner1_ca.p12
new file mode 100644
index 00000000000..fc89f3e90f4
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/partner1_ca.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/partner2_ca.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/partner2_ca.p12
new file mode 100644
index 00000000000..c9fe7186792
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/partner2_ca.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/root_ca.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/root_ca.p12
new file mode 100644
index 00000000000..8fc62a23ace
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/ca_certs/root_ca.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/create.sh b/acceptance-tests/tests/src/test/resources/pki-certs/create.sh
new file mode 100644
index 00000000000..c780e5e113e
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/create.sh
@@ -0,0 +1,176 @@
+#! /bin/sh
+
+set -e
+
+names=("partner1:miner1" "partner1:miner2" "partner1:miner3" "partner1:miner4" "partner1:miner5" "partner2:miner6")
+crls=("partner1:miner5" "partner2:miner6")
+KEY_ALG="EC -groupname secp256r1"
+#KEY_ALG="RSA -keysize 2048"
+
+##########
+CA_CERTS_PATH=./ca_certs
+ROOT_CA_KS=$CA_CERTS_PATH/root_ca.p12
+INTER_CA_KS=$CA_CERTS_PATH/inter_ca.p12
+PARTNER1_CA_KS=$CA_CERTS_PATH/partner1_ca.p12
+PARTNER2_CA_KS=$CA_CERTS_PATH/partner2_ca.p12
+CRL_DIR=./crl
+
+mkdir $CA_CERTS_PATH
+
+keytool -genkeypair -alias root_ca -dname "CN=root.ca.besu.com" -ext bc:c -keyalg RSA -keysize 2048 \
+-sigalg SHA256WithRSA -validity 36500 \
+-storepass test123 \
+-keystore $ROOT_CA_KS
+
+keytool -exportcert -keystore $ROOT_CA_KS -storepass test123 -alias root_ca -rfc -file $CA_CERTS_PATH/root_ca.pem
+
+keytool -genkeypair -alias inter_ca -dname "CN=inter.ca.besu.com" \
+-ext bc:c=ca:true,pathlen:1 -ext ku:c=dS,kCS,cRLs \
+-keyalg RSA -sigalg SHA256WithRSA -validity 36500 \
+-storepass test123 \
+-keystore $INTER_CA_KS
+
+keytool -exportcert -keystore $INTER_CA_KS -storepass test123 -alias inter_ca -rfc -file $CA_CERTS_PATH/inter_ca.pem
+
+keytool -genkeypair -alias partner1_ca -dname "CN=partner1.ca.besu.com" \
+-ext bc:c=ca:true,pathlen:0 -ext ku:c=dS,kCS,cRLs \
+-keyalg RSA -sigalg SHA256WithRSA -validity 36500 \
+-storepass test123 \
+-keystore $PARTNER1_CA_KS
+
+keytool -exportcert -keystore $PARTNER1_CA_KS -storepass test123 -alias partner1_ca -rfc -file $CA_CERTS_PATH/partner1_ca.pem
+
+keytool -genkeypair -alias partner2_ca -dname "CN=partner2.ca.besu.com" \
+-ext bc:c=ca:true,pathlen:0 -ext ku:c=dS,kCS,cRLs \
+-keyalg RSA -sigalg SHA256WithRSA -validity 36500 \
+-storepass test123 \
+-keystore $PARTNER2_CA_KS
+
+keytool -exportcert -keystore $PARTNER2_CA_KS -storepass test123 -alias partner2_ca -rfc -file $CA_CERTS_PATH/partner2_ca.pem
+
+keytool -storepass test123 -keystore $INTER_CA_KS -certreq -alias inter_ca \
+| keytool -storepass test123 -keystore $ROOT_CA_KS -gencert -validity 36500 -alias root_ca \
+-ext bc:c=ca:true,pathlen:1 -ext ku:c=dS,kCS,cRLs -rfc > $CA_CERTS_PATH/inter_ca.pem
+
+cat $CA_CERTS_PATH/root_ca.pem >> $CA_CERTS_PATH/inter_ca.pem
+
+keytool -keystore $INTER_CA_KS -importcert -alias inter_ca \
+-storepass test123 -noprompt -file $CA_CERTS_PATH/inter_ca.pem
+
+keytool -storepass test123 -keystore $PARTNER1_CA_KS -certreq -alias partner1_ca \
+| keytool -storepass test123 -keystore $INTER_CA_KS -gencert -validity 36500 -alias inter_ca \
+-ext bc:c=ca:true,pathlen:0 -ext ku:c=dS,kCS,cRLs -rfc > $CA_CERTS_PATH/partner1_ca.pem
+
+keytool -storepass test123 -keystore $PARTNER2_CA_KS -certreq -alias partner2_ca \
+| keytool -storepass test123 -keystore $INTER_CA_KS -gencert -validity 36500 -alias inter_ca \
+-ext bc:c=ca:true,pathlen:0 -ext ku:c=dS,kCS,cRLs -rfc > $CA_CERTS_PATH/partner2_ca.pem
+
+cat $CA_CERTS_PATH/inter_ca.pem >> $CA_CERTS_PATH/partner1_ca.pem
+cat $CA_CERTS_PATH/inter_ca.pem >> $CA_CERTS_PATH/partner2_ca.pem
+
+keytool -keystore $PARTNER1_CA_KS -importcert -alias partner1_ca \
+-storepass test123 -noprompt -file $CA_CERTS_PATH/partner1_ca.pem
+
+keytool -keystore $PARTNER2_CA_KS -importcert -alias partner2_ca \
+-storepass test123 -noprompt -file $CA_CERTS_PATH/partner2_ca.pem
+
+echo "Generating miner keystores..."
+### Generate client keystores
+for name in "${names[@]}"
+do
+  IFS=':' read -r -a array <<< "$name"
+  partner=${array[0]}
+  client=${array[1]}
+
+  PARTNER_CA_KEYSTORE="$CA_CERTS_PATH/${partner}_ca.p12"
+  CLIENT_PATH="./${client}"
+  KEYSTORE_PATH="./$CLIENT_PATH/${client}.p12"
+  NSSDB_PATH="${CLIENT_PATH}/nssdb"
+
+  echo "$PARTNER_CA_KEYSTORE"
+
+  mkdir -p $NSSDB_PATH
+
+  echo "Generating keystore for Partner $partner Client $client"
+  keytool -genkeypair -keystore $KEYSTORE_PATH -storepass test123 -alias ${client} \
+  -keyalg $KEY_ALG -validity 36500 \
+  -dname "CN=localhost, OU=${partner}" \
+  -ext san=dns:localhost,ip:127.0.0.1
+
+  echo "Creating CSR for $client and signing it with ${partner}_ca"
+  keytool -storepass test123 -keystore $KEYSTORE_PATH -certreq -alias ${client} \
+  | keytool -storepass test123 -keystore $PARTNER_CA_KEYSTORE -gencert -validity 36500 -alias "${partner}_ca" -ext ku:c=digitalSignature,nonRepudiation,keyEncipherment -ext eku=sA,cA \
+  -rfc > "${CLIENT_PATH}/${client}.pem"
+
+  echo "Concat root_ca.pem to ${client}.pem"
+  cat "${CA_CERTS_PATH}/root_ca.pem" >> "${CLIENT_PATH}/${client}.pem"
+
+  echo "Importing signed $client.pem CSR into $KEYSTORE_PATH"
+  keytool -keystore $KEYSTORE_PATH -importcert -alias $client \
+  -storepass test123 -noprompt -file "${CLIENT_PATH}/${client}.pem"
+
+  echo "Converting p12 to jks"
+  keytool -importkeystore -srckeystore $KEYSTORE_PATH -srcstoretype PKCS12 -destkeystore "$CLIENT_PATH/${client}.jks"  -deststoretype JKS -srcstorepass test123 -deststorepass test123 -srcalias $client -destalias $client -srckeypass test123 -destkeypass test123 -noprompt
+
+  echo "Initialize nss"
+  echo "test123" > ${CLIENT_PATH}/nsspin.txt
+  certutil -N -d sql:${NSSDB_PATH} -f "${CLIENT_PATH}/nsspin.txt"
+  # hack to make Java SunPKCS11 work with new sql version of nssdb
+  touch ${NSSDB_PATH}/secmod.db
+
+  pk12util -i $KEYSTORE_PATH -d sql:${NSSDB_PATH} -k ${CLIENT_PATH}/nsspin.txt -W test123
+  echo "Fixing truststores in sql:${NSSDB_PATH}"
+  certutil -M -n "CN=root.ca.besu.com"       -t CT,C,C -d sql:"$NSSDB_PATH" -f ${CLIENT_PATH}/nsspin.txt
+  certutil -M -n "CN=inter.ca.besu.com"      -t u,u,u -d sql:"$NSSDB_PATH" -f ${CLIENT_PATH}/nsspin.txt
+  certutil -M -n "CN=${partner}.ca.besu.com" -t u,u,u -d sql:"$NSSDB_PATH" -f ${CLIENT_PATH}/nsspin.txt
+
+  certutil -d sql:"$NSSDB_PATH" -f nsspin.txt -L
+
+  echo "Creating pkcs11 nss config file"
+  cat <<EOF >${CLIENT_PATH}/nss.cfg
+name = NSScrypto-${partner}-${client}
+nssSecmodDirectory = ./src/test/resources/pki-certs/${client}/nssdb
+nssDbMode = readOnly
+nssModule = keystore
+showInfo = true
+EOF
+
+  # remove pem files
+  rm "${CLIENT_PATH}/${client}.pem"
+
+  # create truststore
+  echo "Creating truststore ..."
+  keytool -exportcert -keystore $ROOT_CA_KS  -storepass test123 -alias root_ca -rfc   | keytool -import -trustcacerts -alias root_ca -keystore "${CLIENT_PATH}/truststore.p12" -storepass test123 -noprompt
+##   keytool -exportcert -keystore $INTER_CA_KS -storepass test123 -alias inter_ca -rfc | keytool -import -trustcacerts -alias inter_ca -keystore "${CLIENT_PATH}/truststore.p12" -storepass test123 -noprompt
+##  keytool -exportcert -keystore $PARTNER_CA_KEYSTORE  -storepass test123 -alias "${partner}_ca" -rfc   | keytool -import -trustcacerts -alias "${partner}_ca" -keystore "${CLIENT_PATH}/truststore.p12" -storepass test123 -noprompt
+
+done
+rm $CA_CERTS_PATH/root_ca.pem
+echo "Keystores and nss database created"
+
+## create crl list
+mkdir -p $CRL_DIR
+## rm $CRL_DIR/crl.pem
+
+for crl in "${crls[@]}"
+do
+  IFS=':' read -r -a array <<< "$crl"
+  partner=${array[0]}
+  client=${array[1]}
+
+  echo "Exporting CA certificate and private key"
+  openssl pkcs12 -nodes -in "$CA_CERTS_PATH/${partner}_ca.p12" -out "$CRL_DIR/${partner}_ca_key.pem" -passin pass:test123 -nocerts
+  openssl pkcs12 -nodes -in "$CA_CERTS_PATH/${partner}_ca.p12" -out "$CRL_DIR/${partner}_ca.pem" -passin pass:test123 -nokeys
+
+  echo "Export $client certificate"
+  openssl pkcs12 -nodes -in "./${client}/${client}.p12" -out "$CRL_DIR/${client}.pem" -passin pass:test123 -nokeys
+
+  ## On Mac, use gnutls-certtool, on Linux use certtool
+  echo "Creating crl"
+  printf '365\n\n' | gnutls-certtool --generate-crl --load-ca-privkey "$CRL_DIR/${partner}_ca_key.pem" --load-ca-certificate "$CRL_DIR/${partner}_ca.pem" \
+  --load-certificate "$CRL_DIR/${client}.pem" >> $CRL_DIR/crl.pem
+
+  rm "$CRL_DIR/${partner}_ca_key.pem"
+  rm "$CRL_DIR/${partner}_ca.pem"
+  rm "$CRL_DIR/${client}.pem"
+done
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/crl/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/crl/crl.pem
new file mode 100644
index 00000000000..763d01c19d4
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/crl/crl.pem
@@ -0,0 +1,28 @@
+-----BEGIN X509 CRL-----
+MIICGzCCAQMCAQEwDQYJKoZIhvcNAQELBQAwHzEdMBsGA1UEAxMUcGFydG5lcjEu
+Y2EuYmVzdS5jb20XDTIzMDUwNDEwMTUzNVoXDTI0MDUwMzEwMTUzNVowbTAZAghF
+KUAnwQI0rxcNMjMwNTA0MTAxNTM1WjAZAggBqEW2S0yD7hcNMjMwNTA0MTAxNTM1
+WjAZAghxoeavxdMy8xcNMjMwNTA0MTAxNTM1WjAaAgkAgWKzx/tKZWkXDTIzMDUw
+NDEwMTUzNVqgQTA/MB8GA1UdIwQYMBaAFJcP76nbNK50KG5jmh6CvsxlAhJjMBwG
+A1UdFAQVAhNkU4XHFwNbgBqsTIFexJjuzEvyMA0GCSqGSIb3DQEBCwUAA4IBAQB2
+fhAhVwRBtHdwqhGjRlgbz4i6E0CtoL/02Vazib1OiRAXCkyFJL04U3FGcrPa89Dt
+ClZE0G38+Jw0Be0tEpn9A8doSbLr73w1GqW3BqNTw/qjbc6R2x28A1VIVPwV6bZH
+5P59YtDV+SjSPNxqkwRMyXqGZ2WIMwUS3u47Es9vMsjChXUJWU6W+jf3LYO/dt+V
+7xSchRpljhBtMB8MIoXILBq9uOSFalLmy94YzK2Rw1ZG2SVy2QZ6ZXHvZ/omLbPL
+kd4oAiN7L0OLOkFVHyb9bVP6DUWfXxSxBdszbQzHCy74NEsFUC0xqq0xpxwQRRfD
+codJtbEVJraSsSBkB78n
+-----END X509 CRL-----
+-----BEGIN X509 CRL-----
+MIICGzCCAQMCAQEwDQYJKoZIhvcNAQELBQAwHzEdMBsGA1UEAxMUcGFydG5lcjIu
+Y2EuYmVzdS5jb20XDTIzMDUwNDEwMTUzNVoXDTI0MDUwMzEwMTUzNVowbTAZAggF
+p9b0zZl1RxcNMjMwNTA0MTAxNTM1WjAZAgh7MQ7e4x/GbRcNMjMwNTA0MTAxNTM1
+WjAZAghxoeavxdMy8xcNMjMwNTA0MTAxNTM1WjAaAgkAgWKzx/tKZWkXDTIzMDUw
+NDEwMTUzNVqgQTA/MB8GA1UdIwQYMBaAFJuQMv8IsgbJS8FfPZZx+hSgj7PBMBwG
+A1UdFAQVAhNkU4XHGmnm4OkmS4KBFW1nS4csMA0GCSqGSIb3DQEBCwUAA4IBAQB2
+43mCjuMmB+MXpl+Axn3b/4V2f0HmbUFhF/andWKUwzC47HoQ+WzXoTV0xisHGCgH
+SYlrLdWd+pFh24H7TrKgqvmwtVmUFwm6DphXW3AHvaePWIrAy7L5ZrdOQB9TZPC1
+Ly+6x0oKoueiHodWivLQx+CJVbPAzxFEVh0JjecoFw8Tf9FGTqy8jJRdno9HgKDg
+BB7w7kPGF7xoaAbukwTXFz7f1nep44oqge+leEc398tdFDxmwralXAUB0A2v/vDG
+cSZTr+fyTri+zHjQzeq6//y2GF7S56KSyBXDXTJrvqtuijiVHTzQku+pbVNNrid5
+LgCJI7Phj2Q8k26z0+JJ
+-----END X509 CRL-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/miner1.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/miner1.jks
new file mode 100644
index 00000000000..df9dfad4b5d
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/miner1.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/miner1.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/miner1.p12
new file mode 100644
index 00000000000..baba59128aa
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/miner1.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nss.cfg
new file mode 100644
index 00000000000..d76bd9c163c
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nss.cfg
@@ -0,0 +1,5 @@
+name = NSScrypto-partner1-miner1
+nssSecmodDirectory = ./src/test/resources/pki-certs/miner1/nssdb
+nssDbMode = readOnly
+nssModule = keystore
+showInfo = true
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/cert9.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/cert9.db
new file mode 100644
index 00000000000..33e83d02b71
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/cert9.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/key4.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/key4.db
new file mode 100644
index 00000000000..03a4a5e5b86
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/key4.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/pkcs11.txt b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/pkcs11.txt
new file mode 100644
index 00000000000..fe947a8221a
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='sql:./miner1/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
+NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
+
diff --git a/ISSUE_TEMPLATE.md b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/secmod.db
similarity index 100%
rename from ISSUE_TEMPLATE.md
rename to acceptance-tests/tests/src/test/resources/pki-certs/miner1/nssdb/secmod.db
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nsspin.txt
new file mode 100644
index 00000000000..5271a526801
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/nsspin.txt
@@ -0,0 +1 @@
+test123
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner1/truststore.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/truststore.p12
new file mode 100644
index 00000000000..ddbd8ee57be
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner1/truststore.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/miner2.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/miner2.jks
new file mode 100644
index 00000000000..2abd88e9d80
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/miner2.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/miner2.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/miner2.p12
new file mode 100644
index 00000000000..aeec006f0e9
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/miner2.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nss.cfg
new file mode 100644
index 00000000000..995d452fc4c
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nss.cfg
@@ -0,0 +1,5 @@
+name = NSScrypto-partner1-miner2
+nssSecmodDirectory = ./src/test/resources/pki-certs/miner2/nssdb
+nssDbMode = readOnly
+nssModule = keystore
+showInfo = true
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/cert9.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/cert9.db
new file mode 100644
index 00000000000..21d6ea18410
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/cert9.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/key4.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/key4.db
new file mode 100644
index 00000000000..3d77b19abb4
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/key4.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/pkcs11.txt b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/pkcs11.txt
new file mode 100644
index 00000000000..90b09f83b25
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='sql:./miner2/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
+NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
+
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/blockchain/.keep b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/secmod.db
similarity index 100%
rename from ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/blockchain/.keep
rename to acceptance-tests/tests/src/test/resources/pki-certs/miner2/nssdb/secmod.db
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nsspin.txt
new file mode 100644
index 00000000000..5271a526801
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/nsspin.txt
@@ -0,0 +1 @@
+test123
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner2/truststore.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/truststore.p12
new file mode 100644
index 00000000000..8d9754074b7
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner2/truststore.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/miner3.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/miner3.jks
new file mode 100644
index 00000000000..79ee2cb0ecc
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/miner3.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/miner3.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/miner3.p12
new file mode 100644
index 00000000000..c7e42d1af69
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/miner3.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nss.cfg
new file mode 100644
index 00000000000..65e04bccbfd
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nss.cfg
@@ -0,0 +1,5 @@
+name = NSScrypto-partner1-miner3
+nssSecmodDirectory = ./src/test/resources/pki-certs/miner3/nssdb
+nssDbMode = readOnly
+nssModule = keystore
+showInfo = true
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/cert9.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/cert9.db
new file mode 100644
index 00000000000..5b295bcda9a
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/cert9.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/key4.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/key4.db
new file mode 100644
index 00000000000..d05913b651a
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/key4.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/pkcs11.txt b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/pkcs11.txt
new file mode 100644
index 00000000000..c4368a178ff
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='sql:./miner3/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
+NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
+
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/generalstate/.keep b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/secmod.db
similarity index 100%
rename from ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/generalstate/.keep
rename to acceptance-tests/tests/src/test/resources/pki-certs/miner3/nssdb/secmod.db
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nsspin.txt
new file mode 100644
index 00000000000..5271a526801
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/nsspin.txt
@@ -0,0 +1 @@
+test123
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner3/truststore.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/truststore.p12
new file mode 100644
index 00000000000..028424cebdf
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner3/truststore.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/miner4.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/miner4.jks
new file mode 100644
index 00000000000..6cde7b1a0ba
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/miner4.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/miner4.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/miner4.p12
new file mode 100644
index 00000000000..386fe0d4b0b
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/miner4.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nss.cfg
new file mode 100644
index 00000000000..29082f64b54
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nss.cfg
@@ -0,0 +1,5 @@
+name = NSScrypto-partner1-miner4
+nssSecmodDirectory = ./src/test/resources/pki-certs/miner4/nssdb
+nssDbMode = readOnly
+nssModule = keystore
+showInfo = true
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/cert9.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/cert9.db
new file mode 100644
index 00000000000..fd5b048d8c9
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/cert9.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/key4.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/key4.db
new file mode 100644
index 00000000000..127bbd567e9
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/key4.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/pkcs11.txt b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/pkcs11.txt
new file mode 100644
index 00000000000..730c97feb8e
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='sql:./miner4/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
+NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
+
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nssdb/secmod.db
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nsspin.txt
new file mode 100644
index 00000000000..5271a526801
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/nsspin.txt
@@ -0,0 +1 @@
+test123
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner4/truststore.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/truststore.p12
new file mode 100644
index 00000000000..c6c7b5decff
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner4/truststore.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/miner5.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/miner5.jks
new file mode 100644
index 00000000000..a9dc3190a97
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/miner5.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/miner5.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/miner5.p12
new file mode 100644
index 00000000000..7049be61bd0
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/miner5.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nss.cfg
new file mode 100644
index 00000000000..063e31a2a35
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nss.cfg
@@ -0,0 +1,5 @@
+name = NSScrypto-partner1-miner5
+nssSecmodDirectory = ./src/test/resources/pki-certs/miner5/nssdb
+nssDbMode = readOnly
+nssModule = keystore
+showInfo = true
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/cert9.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/cert9.db
new file mode 100644
index 00000000000..f731ba7404c
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/cert9.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/key4.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/key4.db
new file mode 100644
index 00000000000..e366aa9e272
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/key4.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/pkcs11.txt b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/pkcs11.txt
new file mode 100644
index 00000000000..bd574fbdc7f
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='sql:./miner5/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
+NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
+
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nssdb/secmod.db
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nsspin.txt
new file mode 100644
index 00000000000..5271a526801
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/nsspin.txt
@@ -0,0 +1 @@
+test123
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner5/truststore.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/truststore.p12
new file mode 100644
index 00000000000..7d54dfe7f6d
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner5/truststore.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/miner6.jks b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/miner6.jks
new file mode 100644
index 00000000000..b73d203e889
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/miner6.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/miner6.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/miner6.p12
new file mode 100644
index 00000000000..8df1575b0e3
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/miner6.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nss.cfg
new file mode 100644
index 00000000000..60a2e65bc46
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nss.cfg
@@ -0,0 +1,5 @@
+name = NSScrypto-partner2-miner6
+nssSecmodDirectory = ./src/test/resources/pki-certs/miner6/nssdb
+nssDbMode = readOnly
+nssModule = keystore
+showInfo = true
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/cert9.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/cert9.db
new file mode 100644
index 00000000000..8bc1ba42f15
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/cert9.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/key4.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/key4.db
new file mode 100644
index 00000000000..aa078f69b7d
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/key4.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/pkcs11.txt b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/pkcs11.txt
new file mode 100644
index 00000000000..a47ca829b24
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='sql:./miner6/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
+NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
+
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nssdb/secmod.db
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nsspin.txt
new file mode 100644
index 00000000000..5271a526801
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/nsspin.txt
@@ -0,0 +1 @@
+test123
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/miner6/truststore.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/truststore.p12
new file mode 100644
index 00000000000..bb56eecd08a
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/miner6/truststore.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/node1/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/node1/crl.pem
new file mode 100644
index 00000000000..8ced006c911
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/node1/crl.pem
@@ -0,0 +1,27 @@
+-----BEGIN X509 CRL-----
+MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNV
+BAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJBgNVBAoMAk1DMQ0wCwYDVQQLDARyb290
+MRMwEQYDVQQDDApwYXJ0bmVyYWNhMSYwJAYJKoZIhvcNAQkBFhdwYXJ0bmVyYWNh
+QHBhcnRuZXJhLmNvbRcNMjEwNzA5MTkxMjM1WhcNMjIwNzA5MTkxMjM1WjAnMCUC
+FF9rJlU9U6JdFIeK/xRojaoxHdc5Fw0yMTA3MDkxOTEyMzVaoA4wDDAKBgNVHRQE
+AwIBADANBgkqhkiG9w0BAQsFAAOCAQEAfByR//FGHSsVQbaS51d59o82XocOGnnT
+p1hjceqtLGv3bhiebVrsRCOB5TsvE/r2IbB/yHYTe3+LJisIUqBxblQ6xK6IM+qA
+3fY646YnPT5pvdZAPZ2BCN/xP3xqGffFKapQ9cz0/36YE3vaEoUDlC2VHK0OXI0t
+4CLwAmiptUT2GW4Bk1RtokAsFiUNwNIOlRX5bywUNwkG7EuitR90QSGH3l/vyii2
+0c1Fm9He9MskwipjXpJKKb+t+m1pdpOVkSjRfjmVqi4BZwWlnQjELSLywhJ+WZG2
+Z1NgRjzPXotFKK+YD97Kx1L260A1eUZ46zSq73oUZr0EDZRnNJTr6A==
+-----END X509 CRL-----
+-----BEGIN X509 CRL-----
+MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD
+VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v
+dDETMBEGA1UEAwwKcGFydG5lcmJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmJj
+YUBwYXJ0bmVyYi5jb20XDTIxMDcwOTE5MTIzNVoXDTIyMDcwOTE5MTIzNVowTjAl
+AhQTZhDgbKuvX7iLRUBBTiWXBPKM1xcNMjEwNzA5MTkxMjM1WjAlAhRfayZVPVOi
+XRSHiv8UaI2qMR3XORcNMjEwNzA5MTkxMjM1WqAOMAwwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAMIltmJ036f1BmK/baISJTZTu7PKZgSZMNORnpFT8KvC
+s2GNRor5bGp5qvD6LHvsx92YVppCC6xd/beCFBtdyYifqw5xtOvqLQKuqCfxruLz
+EqYjKXE/3v8VdyU71J7kFqi0U0Gy4/h/YCL92e5KNbATlmcn5ToyI2EBIEfBfV08
+mm7FBXvbHRzqhfrnCNEjBWBWz3zkJMc9Rib26eCCofYIDkY2HvYSN78YgrnMmD6O
+hWOXrPoxArxvmDr5rG4vCadqbQYRkkCAOP0hBeMiB0SAcO2W2LNNAmHWXX7FvU3n
+ZRZUX31WoVjhNeEQtNBb2mPYBXHQzLC66qYm1p97afc=
+-----END X509 CRL-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/node1/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/node1/keys.p12
new file mode 100644
index 00000000000..1aeb2fec791
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/node1/keys.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/node1/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/node1/keystore.jks
new file mode 100644
index 00000000000..3b1db9eb88b
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/node1/keystore.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/node1/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/node1/nss.cfg
new file mode 100644
index 00000000000..320163767f8
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/node1/nss.cfg
@@ -0,0 +1,6 @@
+
+name = NSScrypto-node1
+nssSecmodDirectory = ./src/test/resources/pki-certs/node1/nssdb
+nssDbMode = readOnly
+nssModule = keystore
+    
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/node1/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/node1/nssdb/cert8.db
new file mode 100644
index 00000000000..a6e5cc1c572
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/node1/nssdb/cert8.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/node1/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/node1/nssdb/key3.db
new file mode 100644
index 00000000000..0b103995be1
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/node1/nssdb/key3.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/node1/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/node1/nssdb/secmod.db
new file mode 100644
index 00000000000..08102e23979
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/node1/nssdb/secmod.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/node1/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/node1/nsspin.txt
new file mode 100644
index 00000000000..5271a526801
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/node1/nsspin.txt
@@ -0,0 +1 @@
+test123
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/node1/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/node1/ssl-ca.pem
new file mode 100644
index 00000000000..61a8f5230ed
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/node1/ssl-ca.pem
@@ -0,0 +1,70 @@
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBEwDQYJKoZIhvcNAQEL
+BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
+KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTExNTRaGA8y
+MTIxMDYxNTE5MTE1NFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
+A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
+cGFydG5lcmFjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmFjYUBwYXJ0bmVyYS5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDccGhUDD8T8m6e2x13
+B0LgCDR8F2vlfAw9FN/tXOKKU3DpagJk0CAutL6YFFYs9MXg8D6bZx+w0iXUnaN/
+6rjIC1LFs79AizpEaoFWDzcVI66ItSW1Swu3ts0I1kK7EGgAMba0TDTnssfrtuPw
+rOA2TOdVX03owOE+gaaPonIQlnew5+NNGhbW+P/5ix1IQXhyuNjV/uu3VEJBGNTh
+cAuMGdjvglFuz4zyFon4kNRcQvghs5ztjs2h5ZNHjEo6YtNIdJuRS/XOXII9MfPN
+plcwJArWTM3yEATNBtdc5FypOSI6cO/Pl+SVEf4kKmnzJQZWOSGiDXbpm938hGVw
+ByZPAgMBAAGjZjBkMB0GA1UdDgQWBBQhpkZg+Ktqh6sFCjtm9HE+9bLJ3TAfBgNV
+HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAIggdc0DCxEiNaKak
+/xbc7uGiGBb+UzBTjk4BmX9kEFrZf4XEaHzsptltqcQDCVtzcbFFFxMYhv/w/1g/
+WMNuUhL0mmGIGMxfoqkg50tNyuHW6aSrBXErel9WthGXAhUSzdHgkWxl3pe2wgda
+qIcSwTCFgOeVWTZRdKWqKNPHirBglJHUpMgLo0qa0Ug1hxiyOQRt2yXLpe/mH3pG
+cozhrEDYQMOcDhYTpPwM2Bl+TsRPpxFaV4QDfiOyvUDFLMM0dyhl2pukjay/Xpp2
++6Tsnaa+Ui0sDcM3A36Q07+E4Vugxjzfb9a36Eg4XE+Jg3jDA8UOqjeFg9gkK3aY
+NaI0qQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
+AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
+4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
+7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
+jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
+m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
+Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
+AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
+gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
+TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
+8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
+c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
+xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
+Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
+AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
+Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
+fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
+kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
+PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
+XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
+uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
+BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
+OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
+oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
+JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
+9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
+h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
+-----END CERTIFICATE-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/node1/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/node1/ssl.pem
new file mode 100644
index 00000000000..291b730311c
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/node1/ssl.pem
@@ -0,0 +1,126 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCw8JqVhfSxCPC+
+8UKvPAGHyZOzqrXd3SyrdYQnUKP2NkAhbXpJMNnIyk41+dVJxzjNJ9RiSr3D8hJH
+3NOMLtj93UROtp7Az1PdnpPRjeHsT7kt9+79J3I4r6eEU7uhfig2UNPJBaKxqoht
+MyBoGJgIYl3O8SD6grFV40cFfCFOWFgKi+Q+U7I0uMl/y+eXw1/g8DBwGPxhhw9Z
+est7Ov3Qnk4x2np8Ejh6hl+dAqubojjLFdWrs2goQXrkE+qLEM2jze49L6gL5FwJ
+brMkyewsaF6xVKfptMw9EK92NFzQuCUF8SXq548FzYHkiVVNweheBD7+4iCOpi0b
+eiC4N6RXAgMBAAECggEABx01aeuf4fpVC6hRoRANk7MUIDYt58S7xg0MijQg04Zs
+36syLn0rVHpl2J+55qR+8Si3zlfo91blS0RisRE1IkfiNjP7gA8V9SQqF1PYEJNI
+A8QjNMSAQC031Ac11RFodn6bdUqntvL/VzymAelzO2sREH/7bncQwD5KHbtW73pm
+un5CvnP6dHQTHX+AVDuH6yOdukuyNM+2Xn8J+PAIRsPn9yENgmvzWIW8UOvKj2Ox
+4ckkT7zkihwyf8BnztNizdxSlR+ebsvP76C2gAULXoYjJlI7XxvQ1/qhma0yXhGx
+I/fBBmK5rz84DabblgS0mOc2ul/nlhJI5kQSHr/PQQKBgQDVLnoJUOCa/R+s9zOn
+WcUu38C8JYsj1J1PqHEOkoTim8gD3JxxCEuHLLFMSxMp4umGa3oYxut6HmgdQaym
+mYPCKr0oWYDhZ8M0zwKFGTGjhGv/gkRQKdYk7IV5ASKEijRHwxfMBL9Qbc0+G0xO
+/CQgJ4GsQ8neGfrDavzfsnt79wKBgQDUeqApjX0bQXTRYMyJU926N7vasyW+2kFd
+KE2aUxgdEm1LG1ZDaCuPi7YZYH+J9krKISLehUJRCa4rmu6L0JjWHJAZNDQdKi2E
+jNfQUWU9hoQHs3J/c8e63MmgUy7K16gt7oelRtlyL2A5NXnqvTv8U0kw7+KJkxda
+et0Cke9CoQKBgBo6SJtizu9imwYNt9YsDj1xG+ZJ/C9hViVZxOcVEbJLljUbbEff
+zGMKFZocVnQ9zZtTF8d6mbgBi6+lx9cLZhF6bqFLObcBrBuQKHA1pEzI2vypizwN
+maIbU2SKxjNmSX5Wu1PHdb4wdCLi+uVw0gT+t055XJmtupNWU1w2OkkLAoGATdFD
+SzSYdxz37Z7oCft/Hy4+TJCD6GwCuF2EXlrEYBFZmcI/S5yhJ4dhf9XJn/tl1LVi
+EeD4Mrm64hlx+B7DetcnJzPpSi0iUoNKnu7Qh0H2pONhsa/znEo0RdVxM7Tb0Uak
+wzE5fgo/0XP2XLRFfdn62kNg0kXerbKFsuVDnUECgYARX+jedlHmj1aY6ldhoRGf
+5/RAfYAH2f0NbS4oAiRvchjydN9EjCVp8KoF7m9ToaLqPFgHP8zIjYsk7B49jXZr
+DjtyMERpjMsBoRbjSKyD1glm1UQeoavgiorPz0w9QDYBstlhH/d0ejfEBCpGk5/2
+YxMs98KdYA62DUkmuaiySQ==
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIEszCCA5ugAwIBAgIUX2smVT1Tol0Uh4r/FGiNqjEd1zgwDQYJKoZIhvcNAQEL
+BQAwgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw
+CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwKcGFydG5lcmFjYTEm
+MCQGCSqGSIb3DQEJARYXcGFydG5lcmFjYUBwYXJ0bmVyYS5jb20wIBcNMjEwNzA5
+MTkxMjA4WhgPMjEyMTA2MTUxOTEyMDhaMHcxCzAJBgNVBAYTAlVTMQswCQYDVQQI
+DAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEO
+MAwGA1UEAwwFbm9kZTExITAfBgkqhkiG9w0BCQEWEm5vZGUxQHBhcnRuZXJhLmNv
+bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALDwmpWF9LEI8L7xQq88
+AYfJk7Oqtd3dLKt1hCdQo/Y2QCFtekkw2cjKTjX51UnHOM0n1GJKvcPyEkfc04wu
+2P3dRE62nsDPU92ek9GN4exPuS337v0ncjivp4RTu6F+KDZQ08kForGqiG0zIGgY
+mAhiXc7xIPqCsVXjRwV8IU5YWAqL5D5TsjS4yX/L55fDX+DwMHAY/GGHD1l6y3s6
+/dCeTjHaenwSOHqGX50Cq5uiOMsV1auzaChBeuQT6osQzaPN7j0vqAvkXAlusyTJ
+7CxoXrFUp+m0zD0Qr3Y0XNC4JQXxJernjwXNgeSJVU3B6F4EPv7iII6mLRt6ILg3
+pFcCAwEAAaOCASgwggEkMBEGCWCGSAGG+EIBAQQEAwIGwDAdBgNVHQ4EFgQUAWkS
+lH1KF5emjGJvHhaERb3a7DIwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBeAwHQYD
+VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMIG1BgNVHSMEga0wgaqAFCGmRmD4
+q2qHqwUKO2b0cT71ssndoXykejB4MQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0Ex
+DDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTALBgNVBAsMBHJvb3QxEDAOBgNV
+BAMMB2ludGVyY2ExIDAeBgkqhkiG9w0BCQEWEWludGVyY2FAYWRtaW4uY29tghRw
+BMj83j0mxnIC7JLyB9boGml0ETANBgkqhkiG9w0BAQsFAAOCAQEAWq/10HjhRI3A
+OOs2JTrG5Xpzz7E8rpH45XQE0ecB1I9Zcm5bnHx+WdIo5GtxvFzGF3EtlAaxDlcM
+iE1u1bfrwEF6qr0nQc8q+wHfnNdb1lqqFlXrhoerLBVrChwqkGbxILUQ+mPFhSQd
+a2791g8SS/jLM3lnf9bFp7AdzJCqg7Ly0BEkIpfVsuZn0HgfYf7JG68B05RdU7/v
+Hw5wGTbEmukODWZtAYRFBnKT4pq5G30heNjATjkmaWeoImJNSPgyoPzYJsYJMUNC
+GYj3Ap0ueY6LbsNXst61jUGeBtCcWDa3uRg8Hl7j1dz4USPTJwBEEuSSN3CzjJuI
+VGvgw1MPpQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBEwDQYJKoZIhvcNAQEL
+BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
+KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTExNTRaGA8y
+MTIxMDYxNTE5MTE1NFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
+A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
+cGFydG5lcmFjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmFjYUBwYXJ0bmVyYS5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDccGhUDD8T8m6e2x13
+B0LgCDR8F2vlfAw9FN/tXOKKU3DpagJk0CAutL6YFFYs9MXg8D6bZx+w0iXUnaN/
+6rjIC1LFs79AizpEaoFWDzcVI66ItSW1Swu3ts0I1kK7EGgAMba0TDTnssfrtuPw
+rOA2TOdVX03owOE+gaaPonIQlnew5+NNGhbW+P/5ix1IQXhyuNjV/uu3VEJBGNTh
+cAuMGdjvglFuz4zyFon4kNRcQvghs5ztjs2h5ZNHjEo6YtNIdJuRS/XOXII9MfPN
+plcwJArWTM3yEATNBtdc5FypOSI6cO/Pl+SVEf4kKmnzJQZWOSGiDXbpm938hGVw
+ByZPAgMBAAGjZjBkMB0GA1UdDgQWBBQhpkZg+Ktqh6sFCjtm9HE+9bLJ3TAfBgNV
+HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAIggdc0DCxEiNaKak
+/xbc7uGiGBb+UzBTjk4BmX9kEFrZf4XEaHzsptltqcQDCVtzcbFFFxMYhv/w/1g/
+WMNuUhL0mmGIGMxfoqkg50tNyuHW6aSrBXErel9WthGXAhUSzdHgkWxl3pe2wgda
+qIcSwTCFgOeVWTZRdKWqKNPHirBglJHUpMgLo0qa0Ug1hxiyOQRt2yXLpe/mH3pG
+cozhrEDYQMOcDhYTpPwM2Bl+TsRPpxFaV4QDfiOyvUDFLMM0dyhl2pukjay/Xpp2
++6Tsnaa+Ui0sDcM3A36Q07+E4Vugxjzfb9a36Eg4XE+Jg3jDA8UOqjeFg9gkK3aY
+NaI0qQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
+AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
+4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
+7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
+jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
+m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
+Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
+AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
+gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
+TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
+8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
+c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
+xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
+Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
+AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
+Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
+fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
+kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
+PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
+XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
+uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
+BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
+OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
+oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
+JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
+9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
+h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
+-----END CERTIFICATE-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/node1/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/node1/truststore.jks
new file mode 100644
index 00000000000..d707235c76a
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/node1/truststore.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/node2/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/node2/crl.pem
new file mode 100644
index 00000000000..8ced006c911
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/node2/crl.pem
@@ -0,0 +1,27 @@
+-----BEGIN X509 CRL-----
+MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNV
+BAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJBgNVBAoMAk1DMQ0wCwYDVQQLDARyb290
+MRMwEQYDVQQDDApwYXJ0bmVyYWNhMSYwJAYJKoZIhvcNAQkBFhdwYXJ0bmVyYWNh
+QHBhcnRuZXJhLmNvbRcNMjEwNzA5MTkxMjM1WhcNMjIwNzA5MTkxMjM1WjAnMCUC
+FF9rJlU9U6JdFIeK/xRojaoxHdc5Fw0yMTA3MDkxOTEyMzVaoA4wDDAKBgNVHRQE
+AwIBADANBgkqhkiG9w0BAQsFAAOCAQEAfByR//FGHSsVQbaS51d59o82XocOGnnT
+p1hjceqtLGv3bhiebVrsRCOB5TsvE/r2IbB/yHYTe3+LJisIUqBxblQ6xK6IM+qA
+3fY646YnPT5pvdZAPZ2BCN/xP3xqGffFKapQ9cz0/36YE3vaEoUDlC2VHK0OXI0t
+4CLwAmiptUT2GW4Bk1RtokAsFiUNwNIOlRX5bywUNwkG7EuitR90QSGH3l/vyii2
+0c1Fm9He9MskwipjXpJKKb+t+m1pdpOVkSjRfjmVqi4BZwWlnQjELSLywhJ+WZG2
+Z1NgRjzPXotFKK+YD97Kx1L260A1eUZ46zSq73oUZr0EDZRnNJTr6A==
+-----END X509 CRL-----
+-----BEGIN X509 CRL-----
+MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD
+VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v
+dDETMBEGA1UEAwwKcGFydG5lcmJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmJj
+YUBwYXJ0bmVyYi5jb20XDTIxMDcwOTE5MTIzNVoXDTIyMDcwOTE5MTIzNVowTjAl
+AhQTZhDgbKuvX7iLRUBBTiWXBPKM1xcNMjEwNzA5MTkxMjM1WjAlAhRfayZVPVOi
+XRSHiv8UaI2qMR3XORcNMjEwNzA5MTkxMjM1WqAOMAwwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAMIltmJ036f1BmK/baISJTZTu7PKZgSZMNORnpFT8KvC
+s2GNRor5bGp5qvD6LHvsx92YVppCC6xd/beCFBtdyYifqw5xtOvqLQKuqCfxruLz
+EqYjKXE/3v8VdyU71J7kFqi0U0Gy4/h/YCL92e5KNbATlmcn5ToyI2EBIEfBfV08
+mm7FBXvbHRzqhfrnCNEjBWBWz3zkJMc9Rib26eCCofYIDkY2HvYSN78YgrnMmD6O
+hWOXrPoxArxvmDr5rG4vCadqbQYRkkCAOP0hBeMiB0SAcO2W2LNNAmHWXX7FvU3n
+ZRZUX31WoVjhNeEQtNBb2mPYBXHQzLC66qYm1p97afc=
+-----END X509 CRL-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/node2/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/node2/keys.p12
new file mode 100644
index 00000000000..5b3aa85caa4
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/node2/keys.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/node2/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/node2/keystore.jks
new file mode 100644
index 00000000000..90b5e93ec75
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/node2/keystore.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/node2/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/node2/nss.cfg
new file mode 100644
index 00000000000..a0db3bdc995
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/node2/nss.cfg
@@ -0,0 +1,6 @@
+
+name = NSScrypto-node2
+nssSecmodDirectory = ./src/test/resources/pki-certs/node2/nssdb
+nssDbMode = readOnly
+nssModule = keystore
+    
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/node2/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/node2/nssdb/cert8.db
new file mode 100644
index 00000000000..10555edf0d7
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/node2/nssdb/cert8.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/node2/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/node2/nssdb/key3.db
new file mode 100644
index 00000000000..137e24bdb49
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/node2/nssdb/key3.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/node2/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/node2/nssdb/secmod.db
new file mode 100644
index 00000000000..ebbf2f03064
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/node2/nssdb/secmod.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/node2/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/node2/nsspin.txt
new file mode 100644
index 00000000000..5271a526801
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/node2/nsspin.txt
@@ -0,0 +1 @@
+test123
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/node2/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/node2/ssl-ca.pem
new file mode 100644
index 00000000000..c0c4bf478f6
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/node2/ssl-ca.pem
@@ -0,0 +1,70 @@
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBIwDQYJKoZIhvcNAQEL
+BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
+KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTEyMTFaGA8y
+MTIxMDYxNTE5MTIxMVowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
+A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
+cGFydG5lcmJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmJjYUBwYXJ0bmVyYi5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNTP8IviC0X2ozlU2+
+9+mPLL9NqJKRCsEiH7XypcXkqkzCYZv/+6nNWXGLr6HsF5qXaM/YVMJYtwiaJquw
+qW1CpOKxhHA1gubNt0Fzmt69/5yP6D1zxTPzAcybNMuCy8VcLJpovYHO40+2HD6I
+D91/zh3jtrgKPoEXgaW3eX4+hykQWaru3P/G4PrIvPyZXnccoCdBSRCqyZSBJUko
+e5ZLnCQMlkwgDONGT3MqQyUC5lqFFMzZ75pOm2reiBe6HzP3H4wK7Ldpxds9ubGk
+Acb08+QzcUT7uHvENyvLm5mbf68QurFTwIDEVg2K03dgqQWbJudSzRJAmJYSszFQ
+vLZdAgMBAAGjZjBkMB0GA1UdDgQWBBR5aiJ1nA1HHi0XzbRsp4V7T8eKBjAfBgNV
+HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAsmFsG3SV1fQg6kO+
+dYvFrDKNOJzTBdVYmFhg4y4H7Qt+dwQcs/ZcOCIaAFUfMUH6CWe1AAdCymfwUHxn
+l/FMeJHh/+d1cybC+Wj9wtBbz7nPsWh/PXbbg3Zi8N4+a6Y0NhZAGlNn1UgMHx+E
+SkSIXk63FkGT01xM2aYtfr9ABuDdoLK/YPecduiawZoRb02WwIpZFNeEE/MS7XG6
+fX9TdUrNOal8pnWUM79K+rzdlzstpCx7uFFbACUEiiIuYiqG6X+DuypfGmQnjRXB
+zbc6NsQONUxg7fnJObdpV7kKTlbpREFoECkTBdqKd7AuJwYRvGaQDWK9P1IYFr1W
+Cnm4Cg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
+AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
+4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
+7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
+jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
+m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
+Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
+AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
+gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
+TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
+8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
+c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
+xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
+Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
+AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
+Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
+fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
+kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
+PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
+XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
+uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
+BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
+OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
+oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
+JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
+9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
+h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
+-----END CERTIFICATE-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/node2/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/node2/ssl.pem
new file mode 100644
index 00000000000..42244eb2420
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/node2/ssl.pem
@@ -0,0 +1,126 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDOGeuw5pq4E18A
+cZOYdLSEbyuSQMmWKtp15Blpb1buD4VEt+6xxBwQvq6BC8A24AWRFGPDM6GFkThr
+9vnU64wg6xAjCQZEQYqAncO7FXKLJWagaKYE03rRTKGnNQZsH1uLEywIdEirV8j3
+31zOMgQkk8JS+Kv2tsodOZzbYTIaxvRpeTqLzzv+/eg8RQoNNr9XsqIfYrVDhvBc
+tfSpnsxVuR/GAxKiqN001DFa+Yjn0sTrEjlyTbniTW8I5V5dnUOfU8awWdjXFFBL
+YaDWHnOOQARlZLyg2AFdSNX6NuYhcUuNBECHFdQtBKkXNZEB6Bqx+ZHNG6AZjwYk
+6JY+0kxdAgMBAAECggEAR5qn0Qj9PfC08+GBxtjdEpnRCHnrz3lJ9uVtkrz09bZ8
+tZg1nJsmqQamd/0OJcKFDJeJ5XqdplsCwDfJKpk/UPx52cI75CDlLrQhGXFlH0S6
+OAbDjy+uHuNB0mbQuWXXlyTtCm7kBGt2Te/TPWwRFmgjflIY5Jky9R5cCbfmAXj3
+5ieNPzfXtRiT7qAvLcofC+isVX7OPY6c0iMvJm1cHJ+hDwh56uPVdb5+Sa5+BFEd
+cCQ8uTBPkGc1e+nUYtu7b8WnUvzCXOSHTZ+ej93/3WefMBaiTigNdmPZyzkAgO+3
+bX18hv1YBPf6XnDj3kB8MZTVpPGqTJaD96mCSDCQQQKBgQD1Ds0/sy0fJ8XZ2nwn
+wJeqM6rctRbmutOA52z6xrRoqOl4ZgYEZ/MngAT0DyfenhaBu2ShD1wvlKE+TEJP
+sSwiWwMoNzxqMvIFdjj4NECBNREL5oV3vokz2XGOquyk9OXaOWP7iiZIswHoHhVp
+bqwC7Ga9iqVwt8Kj3l7RIf3aMQKBgQDXTdDJPj0MBXWuQp3nH3y5h49I3AKGiefW
+H8G834DMA3pU3//VT7Q14qNSkQ7dvWISLG6zkXIWnMtv2w7VMJhSK3dRTYBEw3hs
+67mg5DJMHz2xXLShPUM3Fcx12z0JFOLd72da/GXB5BSjYDxLEZ4KO+jZeqFHNC+o
+D6GpqOPd7QKBgAiT6g9OwEeU5tIHWc0yapykjliHZjPRWlHqx9/HUM1RDEsQlylU
+UiiRzJqWZTjfo74Kxyz0Eq//rd02YiPT+c2CDgw8UrsM6XfTeY8GlTNwnhYijY1x
+d+/+roDl7r6fa+RFmgBWB50H1ws+8lTscMzxZW9BCSV26TM/N2ZuoCohAoGAF7Z4
+UlHKg3JufZzUq0nqgLyPaWTh2lOB9zFUMysiklWnuYVaNfIrVOv7NPLJAl8DWCEQ
+qDJSsG7gcRddUNmjTRmAcLHqeKhWsRhdP30ilQOz1b7yHfgTWRPLiwd0d3WXbv4Z
+EgpOYsZuB3hn65SrJVFn2dwJuz/iJ85g7cCuKBkCgYEA6C6O18FYYqa0sY2qZifs
+ryW1ekJJFUhE4rluJCx4J3YvXtzpbbAXqRzfQX+BgSjosTuhKDstYR7J8C5drFpS
+oU4PxqxrmoxfAgCca84prbaHRVPA1r1mj7LSHv0jAfGMa3TpKHBbk5wMwO/g1OMi
+/tYajeoYLP9p39sNtgsF8HE=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIEszCCA5ugAwIBAgIUE2YQ4Gyrr1+4i0VAQU4llwTyjNYwDQYJKoZIhvcNAQEL
+BQAwgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw
+CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwKcGFydG5lcmJjYTEm
+MCQGCSqGSIb3DQEJARYXcGFydG5lcmJjYUBwYXJ0bmVyYi5jb20wIBcNMjEwNzA5
+MTkxMjE2WhgPMjEyMTA2MTUxOTEyMTZaMHcxCzAJBgNVBAYTAlVTMQswCQYDVQQI
+DAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEO
+MAwGA1UEAwwFbm9kZTIxITAfBgkqhkiG9w0BCQEWEm5vZGUyQHBhcnRuZXJiLmNv
+bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM4Z67DmmrgTXwBxk5h0
+tIRvK5JAyZYq2nXkGWlvVu4PhUS37rHEHBC+roELwDbgBZEUY8MzoYWROGv2+dTr
+jCDrECMJBkRBioCdw7sVcoslZqBopgTTetFMoac1BmwfW4sTLAh0SKtXyPffXM4y
+BCSTwlL4q/a2yh05nNthMhrG9Gl5OovPO/796DxFCg02v1eyoh9itUOG8Fy19Kme
+zFW5H8YDEqKo3TTUMVr5iOfSxOsSOXJNueJNbwjlXl2dQ59TxrBZ2NcUUEthoNYe
+c45ABGVkvKDYAV1I1fo25iFxS40EQIcV1C0EqRc1kQHoGrH5kc0boBmPBiTolj7S
+TF0CAwEAAaOCASgwggEkMBEGCWCGSAGG+EIBAQQEAwIGwDAdBgNVHQ4EFgQUC+rE
+//mis2iLbyls/S/ja/4/qtgwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBeAwHQYD
+VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMIG1BgNVHSMEga0wgaqAFHlqInWc
+DUceLRfNtGynhXtPx4oGoXykejB4MQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0Ex
+DDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTALBgNVBAsMBHJvb3QxEDAOBgNV
+BAMMB2ludGVyY2ExIDAeBgkqhkiG9w0BCQEWEWludGVyY2FAYWRtaW4uY29tghRw
+BMj83j0mxnIC7JLyB9boGml0EjANBgkqhkiG9w0BAQsFAAOCAQEApOPnX+voWhWH
+cwc2ZOa2+lp8VMysh939AKQWLWvUmTUBcnPtvcN5pgTUzTW5xbsnLBvX4yBpsufa
+RqqQps6/pMJudHPiyiE2cswnYDhOH1Lb735YOewqVjD+cvrm1rWiilMyb5WNmxZH
+ktuyOlp6hkSIG6788SHJQyyOYcgPlenE43iAk7Mz9ESxXWnolCCawgYlYFI3qF/r
+g5fJrR7Ys1+J9gbqBzjXys9cWyQlfg6y4G8Naa3xfrVmH1LhVc0sSzTIneZK1fFh
+PwZ+exAhAUnbXCALp8B2Hd9Mehr13fTWzi6vfq5BB0PalB4w0Qg/7v7/W4de6sZw
+4t9Yo0Vpyg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBIwDQYJKoZIhvcNAQEL
+BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
+KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTEyMTFaGA8y
+MTIxMDYxNTE5MTIxMVowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
+A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
+cGFydG5lcmJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmJjYUBwYXJ0bmVyYi5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNTP8IviC0X2ozlU2+
+9+mPLL9NqJKRCsEiH7XypcXkqkzCYZv/+6nNWXGLr6HsF5qXaM/YVMJYtwiaJquw
+qW1CpOKxhHA1gubNt0Fzmt69/5yP6D1zxTPzAcybNMuCy8VcLJpovYHO40+2HD6I
+D91/zh3jtrgKPoEXgaW3eX4+hykQWaru3P/G4PrIvPyZXnccoCdBSRCqyZSBJUko
+e5ZLnCQMlkwgDONGT3MqQyUC5lqFFMzZ75pOm2reiBe6HzP3H4wK7Ldpxds9ubGk
+Acb08+QzcUT7uHvENyvLm5mbf68QurFTwIDEVg2K03dgqQWbJudSzRJAmJYSszFQ
+vLZdAgMBAAGjZjBkMB0GA1UdDgQWBBR5aiJ1nA1HHi0XzbRsp4V7T8eKBjAfBgNV
+HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAsmFsG3SV1fQg6kO+
+dYvFrDKNOJzTBdVYmFhg4y4H7Qt+dwQcs/ZcOCIaAFUfMUH6CWe1AAdCymfwUHxn
+l/FMeJHh/+d1cybC+Wj9wtBbz7nPsWh/PXbbg3Zi8N4+a6Y0NhZAGlNn1UgMHx+E
+SkSIXk63FkGT01xM2aYtfr9ABuDdoLK/YPecduiawZoRb02WwIpZFNeEE/MS7XG6
+fX9TdUrNOal8pnWUM79K+rzdlzstpCx7uFFbACUEiiIuYiqG6X+DuypfGmQnjRXB
+zbc6NsQONUxg7fnJObdpV7kKTlbpREFoECkTBdqKd7AuJwYRvGaQDWK9P1IYFr1W
+Cnm4Cg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
+AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
+4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
+7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
+jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
+m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
+Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
+AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
+gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
+TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
+8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
+c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
+xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
+Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
+AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
+Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
+fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
+kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
+PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
+XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
+uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
+BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
+OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
+oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
+JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
+9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
+h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
+-----END CERTIFICATE-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/node2/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/node2/truststore.jks
new file mode 100644
index 00000000000..a94ec44bc5a
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/node2/truststore.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/crl.pem
new file mode 100644
index 00000000000..8ced006c911
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/crl.pem
@@ -0,0 +1,27 @@
+-----BEGIN X509 CRL-----
+MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNV
+BAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJBgNVBAoMAk1DMQ0wCwYDVQQLDARyb290
+MRMwEQYDVQQDDApwYXJ0bmVyYWNhMSYwJAYJKoZIhvcNAQkBFhdwYXJ0bmVyYWNh
+QHBhcnRuZXJhLmNvbRcNMjEwNzA5MTkxMjM1WhcNMjIwNzA5MTkxMjM1WjAnMCUC
+FF9rJlU9U6JdFIeK/xRojaoxHdc5Fw0yMTA3MDkxOTEyMzVaoA4wDDAKBgNVHRQE
+AwIBADANBgkqhkiG9w0BAQsFAAOCAQEAfByR//FGHSsVQbaS51d59o82XocOGnnT
+p1hjceqtLGv3bhiebVrsRCOB5TsvE/r2IbB/yHYTe3+LJisIUqBxblQ6xK6IM+qA
+3fY646YnPT5pvdZAPZ2BCN/xP3xqGffFKapQ9cz0/36YE3vaEoUDlC2VHK0OXI0t
+4CLwAmiptUT2GW4Bk1RtokAsFiUNwNIOlRX5bywUNwkG7EuitR90QSGH3l/vyii2
+0c1Fm9He9MskwipjXpJKKb+t+m1pdpOVkSjRfjmVqi4BZwWlnQjELSLywhJ+WZG2
+Z1NgRjzPXotFKK+YD97Kx1L260A1eUZ46zSq73oUZr0EDZRnNJTr6A==
+-----END X509 CRL-----
+-----BEGIN X509 CRL-----
+MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD
+VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v
+dDETMBEGA1UEAwwKcGFydG5lcmJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmJj
+YUBwYXJ0bmVyYi5jb20XDTIxMDcwOTE5MTIzNVoXDTIyMDcwOTE5MTIzNVowTjAl
+AhQTZhDgbKuvX7iLRUBBTiWXBPKM1xcNMjEwNzA5MTkxMjM1WjAlAhRfayZVPVOi
+XRSHiv8UaI2qMR3XORcNMjEwNzA5MTkxMjM1WqAOMAwwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAMIltmJ036f1BmK/baISJTZTu7PKZgSZMNORnpFT8KvC
+s2GNRor5bGp5qvD6LHvsx92YVppCC6xd/beCFBtdyYifqw5xtOvqLQKuqCfxruLz
+EqYjKXE/3v8VdyU71J7kFqi0U0Gy4/h/YCL92e5KNbATlmcn5ToyI2EBIEfBfV08
+mm7FBXvbHRzqhfrnCNEjBWBWz3zkJMc9Rib26eCCofYIDkY2HvYSN78YgrnMmD6O
+hWOXrPoxArxvmDr5rG4vCadqbQYRkkCAOP0hBeMiB0SAcO2W2LNNAmHWXX7FvU3n
+ZRZUX31WoVjhNeEQtNBb2mPYBXHQzLC66qYm1p97afc=
+-----END X509 CRL-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/keys.p12
new file mode 100644
index 00000000000..30115f1a0db
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/keys.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/keystore.jks
new file mode 100644
index 00000000000..310fbb591ca
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/keystore.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nss.cfg
new file mode 100644
index 00000000000..3615d46bd88
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nss.cfg
@@ -0,0 +1,6 @@
+
+name = NSScrypto-non-validator
+nssSecmodDirectory = ./src/test/resources/pki-certs/non-validator/nssdb
+nssDbMode = readOnly
+nssModule = keystore
+    
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nssdb/cert8.db
new file mode 100644
index 00000000000..13f76b09f90
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nssdb/cert8.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nssdb/key3.db
new file mode 100644
index 00000000000..9ae401fba81
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nssdb/key3.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nssdb/secmod.db
new file mode 100644
index 00000000000..1320aa6f1c3
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nssdb/secmod.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nsspin.txt
new file mode 100644
index 00000000000..5271a526801
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/nsspin.txt
@@ -0,0 +1 @@
+test123
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/ssl-ca.pem
new file mode 100644
index 00000000000..61a8f5230ed
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/ssl-ca.pem
@@ -0,0 +1,70 @@
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBEwDQYJKoZIhvcNAQEL
+BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
+KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTExNTRaGA8y
+MTIxMDYxNTE5MTE1NFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
+A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
+cGFydG5lcmFjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmFjYUBwYXJ0bmVyYS5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDccGhUDD8T8m6e2x13
+B0LgCDR8F2vlfAw9FN/tXOKKU3DpagJk0CAutL6YFFYs9MXg8D6bZx+w0iXUnaN/
+6rjIC1LFs79AizpEaoFWDzcVI66ItSW1Swu3ts0I1kK7EGgAMba0TDTnssfrtuPw
+rOA2TOdVX03owOE+gaaPonIQlnew5+NNGhbW+P/5ix1IQXhyuNjV/uu3VEJBGNTh
+cAuMGdjvglFuz4zyFon4kNRcQvghs5ztjs2h5ZNHjEo6YtNIdJuRS/XOXII9MfPN
+plcwJArWTM3yEATNBtdc5FypOSI6cO/Pl+SVEf4kKmnzJQZWOSGiDXbpm938hGVw
+ByZPAgMBAAGjZjBkMB0GA1UdDgQWBBQhpkZg+Ktqh6sFCjtm9HE+9bLJ3TAfBgNV
+HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAIggdc0DCxEiNaKak
+/xbc7uGiGBb+UzBTjk4BmX9kEFrZf4XEaHzsptltqcQDCVtzcbFFFxMYhv/w/1g/
+WMNuUhL0mmGIGMxfoqkg50tNyuHW6aSrBXErel9WthGXAhUSzdHgkWxl3pe2wgda
+qIcSwTCFgOeVWTZRdKWqKNPHirBglJHUpMgLo0qa0Ug1hxiyOQRt2yXLpe/mH3pG
+cozhrEDYQMOcDhYTpPwM2Bl+TsRPpxFaV4QDfiOyvUDFLMM0dyhl2pukjay/Xpp2
++6Tsnaa+Ui0sDcM3A36Q07+E4Vugxjzfb9a36Eg4XE+Jg3jDA8UOqjeFg9gkK3aY
+NaI0qQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
+AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
+4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
+7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
+jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
+m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
+Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
+AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
+gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
+TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
+8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
+c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
+xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
+Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
+AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
+Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
+fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
+kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
+PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
+XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
+uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
+BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
+OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
+oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
+JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
+9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
+h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
+-----END CERTIFICATE-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/ssl.pem
new file mode 100644
index 00000000000..c885996bea1
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/ssl.pem
@@ -0,0 +1,126 @@
+-----BEGIN PRIVATE KEY-----
+MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDE53iE0LzazjEw
+rPyUsnsn6GAwRmL8YdEQsD2SyUN59DnEV2gNuwmI446xv+eimdOcxaQTG4zjlIzN
+RHpjYeV9JVrMfUV0T39/rbBVtv4mwsa2rTaC9qUyBzX7NjzYr+fEJ4G0TYlVaiGz
+We8KyIRn47zlkmYPx42Hip75pE/7EcP87G0b38i6phdYkvsyAq6eIDbgTYa/otMx
+z+mSejtcWgFxkShib6jXa5ycDJdxaAUlzqqUoYprvbiixgr/ga1gZs6lhB+sBO1P
+hKjHFNnLNogFz+xDF8JRcYwqHPp4dCr150+mZasZcKxGRxB+a9/Ccjz2ZMlGRjGE
+Vu6qwK0DAgMBAAECggEBALuBlaIcyQsweWVaBjlv8ZmiTx8JmC+w0o8q1afXozsa
+WHxhpAQXTdAeqv8XuXR9Oie7ijBr9vGtv5ulj0reqdRP4zSCQsatAcRLWXV2inXM
+28CQGC4ExHFsrnooPy816+Y+nORfRd2h8K/Df8BsDLKGC5cun6R9KoideCBQ2Z1C
+tJYVrVC4/pPzAQAJIpE+xH6UwsrUnnBo31HdzaIl7Nh/4S/4F0RVSyrqKjZfEE4p
+7Xt1ZpcQOQUo32YLOPjPwJuWGwVDM9jwaqI4fR3ckpaicMb8ihc0zlLjxQk2Cj8X
+tockv6X4RdnviHp56Z9Lzfr+A/u9/dlT5Q8Sqz10K/ECgYEA6/ss5kbEEy4QjOlz
+6lgJJhdTD5Tb1Zbbwu5unk8vVQrIbFCFc8o29qSQ5NCoRQ0b4BAPTlL5UsUMfwi2
++g3iXmZScuNpR8ai9cfImEkZcxezknKBnJxLZ0nAym5eGCoF/da2dWGZ9NL/3kN2
+6e4Tz5++xp12/oQ58MoYd+eZFJkCgYEA1ZuoPPdy3NA/dgjoaJ6r0HYgNW18FMq/
+Lj7fGXT4IluCRndXhW/FBcNfqpzXcOBwRsf0PiiMuLW+LDJnT9XLr58/IqpbjS+s
+I/oAtaTwkwBtcmSAR/L33O/IpZ9lh2PD0I+5JDlvAQp8ESoSS2ceD1xxyz4nyIVn
+xTaRVKdnM/sCgYEAmzlUVoD0Fv21C0vA4MRZ+EFddKFhXYTnN7ko8F977f+yyHTK
+49h/AQxM9wY9uXYfAOrvdoDj2cseJi2wVpltbtT1pPbr2LfTl8J7s5hZ8jgD+e/y
+S/cPLnj4JPAmWtTBrjBfQqUZ5U4p2qUcAlKFm4wjrHgFvvNxPW9iWvTv3/kCgYEA
+oChvgha+hpWVn3iaWSbvCAQpriWC7Uv/ADufp0Sub4RRL2h3tNLS1LliV1f1qOp/
+BHMTzC83I58REa5RC+jvKaSq/+DfeAKQfQEL2yXqQy4E4co87LVd5sfal2PmChdh
+UFUSqfhuJEeqMmxq/yI3xai4oXze81gjMBjz6pcBqFUCgYEArVZbnwTSueEwSSGn
+Ba9FBjwj44hrD+khAGODcpyBg0sC22hYuSJiUgpiRHb77XGNLK/Rn2i3ZUyuww03
+HfYgeXFO6DeuSy8jU7nP0FcLFmvZq7JqzFS6T46z7zepTSnIK5PSVuHAPy7nZTqC
+BAHouXhT1BsH1rCY7vVH7LVXQhs=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIExDCCA6ygAwIBAgIUX2smVT1Tol0Uh4r/FGiNqjEd1zYwDQYJKoZIhvcNAQEL
+BQAwgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw
+CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwKcGFydG5lcmFjYTEm
+MCQGCSqGSIb3DQEJARYXcGFydG5lcmFjYUBwYXJ0bmVyYS5jb20wIBcNMjEwNzA5
+MTkxMjAzWhgPMjEyMTA2MTUxOTEyMDNaMIGHMQswCQYDVQQGEwJVUzELMAkGA1UE
+CAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTALBgNVBAsMBHJvb3Qx
+FjAUBgNVBAMMDW5vbi12YWxpZGF0b3IxKTAnBgkqhkiG9w0BCQEWGm5vbi12YWxp
+ZGF0b3JAcGFydG5lcmEuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAxOd4hNC82s4xMKz8lLJ7J+hgMEZi/GHRELA9kslDefQ5xFdoDbsJiOOOsb/n
+opnTnMWkExuM45SMzUR6Y2HlfSVazH1FdE9/f62wVbb+JsLGtq02gvalMgc1+zY8
+2K/nxCeBtE2JVWohs1nvCsiEZ+O85ZJmD8eNh4qe+aRP+xHD/OxtG9/IuqYXWJL7
+MgKuniA24E2Gv6LTMc/pkno7XFoBcZEoYm+o12ucnAyXcWgFJc6qlKGKa724osYK
+/4GtYGbOpYQfrATtT4SoxxTZyzaIBc/sQxfCUXGMKhz6eHQq9edPpmWrGXCsRkcQ
+fmvfwnI89mTJRkYxhFbuqsCtAwIDAQABo4IBKDCCASQwEQYJYIZIAYb4QgEBBAQD
+AgbAMB0GA1UdDgQWBBRXMoam1AQo0jGVQxCRxbHlU18FPTAJBgNVHRMEAjAAMA4G
+A1UdDwEB/wQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwgbUG
+A1UdIwSBrTCBqoAUIaZGYPiraoerBQo7ZvRxPvWyyd2hfKR6MHgxCzAJBgNVBAYT
+AlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsG
+A1UECwwEcm9vdDEQMA4GA1UEAwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50
+ZXJjYUBhZG1pbi5jb22CFHAEyPzePSbGcgLskvIH1ugaaXQRMA0GCSqGSIb3DQEB
+CwUAA4IBAQCdXem4j/D85ME7kOU6G4DpMOfFsGJEQ20oovKpEoqm0wKaEp61TGci
+q9UjEQI0Istxb0x7xykqP5UAlGXk/xDXFLcz+pe2M/vKo/4sJBEvxV+yr33Cgwli
+PL3XgiRqaDEXVcRXa2RcwW+HVzrBOvQz8IYdFeeqt7y+sCqw3oMkaAPKDv9H+gcL
+5EI+3r9WRnQmy8VWF8FuGWZG1daDnlFC0mm/PvOctVP+YROB7mbwfs+68xtqadWe
+pHdIG+rX7Bs4hZ5mXNu4Hwl+iCPRRj1uyfNkwfx3BsWnR142RksFgZjlTLaGCFCk
+Qf3PEFIHpi+kiPzI5Qm8hUVLNWcJiHhO
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBEwDQYJKoZIhvcNAQEL
+BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
+KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTExNTRaGA8y
+MTIxMDYxNTE5MTE1NFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
+A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
+cGFydG5lcmFjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmFjYUBwYXJ0bmVyYS5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDccGhUDD8T8m6e2x13
+B0LgCDR8F2vlfAw9FN/tXOKKU3DpagJk0CAutL6YFFYs9MXg8D6bZx+w0iXUnaN/
+6rjIC1LFs79AizpEaoFWDzcVI66ItSW1Swu3ts0I1kK7EGgAMba0TDTnssfrtuPw
+rOA2TOdVX03owOE+gaaPonIQlnew5+NNGhbW+P/5ix1IQXhyuNjV/uu3VEJBGNTh
+cAuMGdjvglFuz4zyFon4kNRcQvghs5ztjs2h5ZNHjEo6YtNIdJuRS/XOXII9MfPN
+plcwJArWTM3yEATNBtdc5FypOSI6cO/Pl+SVEf4kKmnzJQZWOSGiDXbpm938hGVw
+ByZPAgMBAAGjZjBkMB0GA1UdDgQWBBQhpkZg+Ktqh6sFCjtm9HE+9bLJ3TAfBgNV
+HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAIggdc0DCxEiNaKak
+/xbc7uGiGBb+UzBTjk4BmX9kEFrZf4XEaHzsptltqcQDCVtzcbFFFxMYhv/w/1g/
+WMNuUhL0mmGIGMxfoqkg50tNyuHW6aSrBXErel9WthGXAhUSzdHgkWxl3pe2wgda
+qIcSwTCFgOeVWTZRdKWqKNPHirBglJHUpMgLo0qa0Ug1hxiyOQRt2yXLpe/mH3pG
+cozhrEDYQMOcDhYTpPwM2Bl+TsRPpxFaV4QDfiOyvUDFLMM0dyhl2pukjay/Xpp2
++6Tsnaa+Ui0sDcM3A36Q07+E4Vugxjzfb9a36Eg4XE+Jg3jDA8UOqjeFg9gkK3aY
+NaI0qQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
+AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
+4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
+7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
+jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
+m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
+Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
+AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
+gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
+TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
+8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
+c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
+xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
+Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
+AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
+Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
+fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
+kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
+PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
+XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
+uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
+BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
+OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
+oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
+JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
+9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
+h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
+-----END CERTIFICATE-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/truststore.jks
new file mode 100644
index 00000000000..bac9b25c751
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/non-validator/truststore.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/crl.pem
new file mode 100644
index 00000000000..8ced006c911
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/crl.pem
@@ -0,0 +1,27 @@
+-----BEGIN X509 CRL-----
+MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNV
+BAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJBgNVBAoMAk1DMQ0wCwYDVQQLDARyb290
+MRMwEQYDVQQDDApwYXJ0bmVyYWNhMSYwJAYJKoZIhvcNAQkBFhdwYXJ0bmVyYWNh
+QHBhcnRuZXJhLmNvbRcNMjEwNzA5MTkxMjM1WhcNMjIwNzA5MTkxMjM1WjAnMCUC
+FF9rJlU9U6JdFIeK/xRojaoxHdc5Fw0yMTA3MDkxOTEyMzVaoA4wDDAKBgNVHRQE
+AwIBADANBgkqhkiG9w0BAQsFAAOCAQEAfByR//FGHSsVQbaS51d59o82XocOGnnT
+p1hjceqtLGv3bhiebVrsRCOB5TsvE/r2IbB/yHYTe3+LJisIUqBxblQ6xK6IM+qA
+3fY646YnPT5pvdZAPZ2BCN/xP3xqGffFKapQ9cz0/36YE3vaEoUDlC2VHK0OXI0t
+4CLwAmiptUT2GW4Bk1RtokAsFiUNwNIOlRX5bywUNwkG7EuitR90QSGH3l/vyii2
+0c1Fm9He9MskwipjXpJKKb+t+m1pdpOVkSjRfjmVqi4BZwWlnQjELSLywhJ+WZG2
+Z1NgRjzPXotFKK+YD97Kx1L260A1eUZ46zSq73oUZr0EDZRnNJTr6A==
+-----END X509 CRL-----
+-----BEGIN X509 CRL-----
+MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD
+VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v
+dDETMBEGA1UEAwwKcGFydG5lcmJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmJj
+YUBwYXJ0bmVyYi5jb20XDTIxMDcwOTE5MTIzNVoXDTIyMDcwOTE5MTIzNVowTjAl
+AhQTZhDgbKuvX7iLRUBBTiWXBPKM1xcNMjEwNzA5MTkxMjM1WjAlAhRfayZVPVOi
+XRSHiv8UaI2qMR3XORcNMjEwNzA5MTkxMjM1WqAOMAwwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAMIltmJ036f1BmK/baISJTZTu7PKZgSZMNORnpFT8KvC
+s2GNRor5bGp5qvD6LHvsx92YVppCC6xd/beCFBtdyYifqw5xtOvqLQKuqCfxruLz
+EqYjKXE/3v8VdyU71J7kFqi0U0Gy4/h/YCL92e5KNbATlmcn5ToyI2EBIEfBfV08
+mm7FBXvbHRzqhfrnCNEjBWBWz3zkJMc9Rib26eCCofYIDkY2HvYSN78YgrnMmD6O
+hWOXrPoxArxvmDr5rG4vCadqbQYRkkCAOP0hBeMiB0SAcO2W2LNNAmHWXX7FvU3n
+ZRZUX31WoVjhNeEQtNBb2mPYBXHQzLC66qYm1p97afc=
+-----END X509 CRL-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/keys.p12
new file mode 100644
index 00000000000..0f5879ff1c0
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/keys.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/keystore.jks
new file mode 100644
index 00000000000..1adfb524170
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/keystore.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nss.cfg
new file mode 100644
index 00000000000..afe2f17e0f2
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nss.cfg
@@ -0,0 +1,6 @@
+
+name = NSScrypto-nonValidator
+nssSecmodDirectory = ./src/test/resources/pki-certs/nonValidator/nssdb
+nssDbMode = readOnly
+nssModule = keystore
+    
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nssdb/cert8.db
new file mode 100644
index 00000000000..3a477ba52eb
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nssdb/cert8.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nssdb/key3.db
new file mode 100644
index 00000000000..b6d6179cd2c
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nssdb/key3.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nssdb/secmod.db
new file mode 100644
index 00000000000..1d70f9b3a97
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nssdb/secmod.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nsspin.txt
new file mode 100644
index 00000000000..5271a526801
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/nsspin.txt
@@ -0,0 +1 @@
+test123
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/ssl-ca.pem
new file mode 100644
index 00000000000..61a8f5230ed
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/ssl-ca.pem
@@ -0,0 +1,70 @@
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBEwDQYJKoZIhvcNAQEL
+BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
+KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTExNTRaGA8y
+MTIxMDYxNTE5MTE1NFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
+A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
+cGFydG5lcmFjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmFjYUBwYXJ0bmVyYS5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDccGhUDD8T8m6e2x13
+B0LgCDR8F2vlfAw9FN/tXOKKU3DpagJk0CAutL6YFFYs9MXg8D6bZx+w0iXUnaN/
+6rjIC1LFs79AizpEaoFWDzcVI66ItSW1Swu3ts0I1kK7EGgAMba0TDTnssfrtuPw
+rOA2TOdVX03owOE+gaaPonIQlnew5+NNGhbW+P/5ix1IQXhyuNjV/uu3VEJBGNTh
+cAuMGdjvglFuz4zyFon4kNRcQvghs5ztjs2h5ZNHjEo6YtNIdJuRS/XOXII9MfPN
+plcwJArWTM3yEATNBtdc5FypOSI6cO/Pl+SVEf4kKmnzJQZWOSGiDXbpm938hGVw
+ByZPAgMBAAGjZjBkMB0GA1UdDgQWBBQhpkZg+Ktqh6sFCjtm9HE+9bLJ3TAfBgNV
+HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAIggdc0DCxEiNaKak
+/xbc7uGiGBb+UzBTjk4BmX9kEFrZf4XEaHzsptltqcQDCVtzcbFFFxMYhv/w/1g/
+WMNuUhL0mmGIGMxfoqkg50tNyuHW6aSrBXErel9WthGXAhUSzdHgkWxl3pe2wgda
+qIcSwTCFgOeVWTZRdKWqKNPHirBglJHUpMgLo0qa0Ug1hxiyOQRt2yXLpe/mH3pG
+cozhrEDYQMOcDhYTpPwM2Bl+TsRPpxFaV4QDfiOyvUDFLMM0dyhl2pukjay/Xpp2
++6Tsnaa+Ui0sDcM3A36Q07+E4Vugxjzfb9a36Eg4XE+Jg3jDA8UOqjeFg9gkK3aY
+NaI0qQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
+AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
+4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
+7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
+jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
+m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
+Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
+AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
+gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
+TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
+8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
+c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
+xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
+Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
+AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
+Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
+fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
+kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
+PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
+XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
+uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
+BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
+OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
+oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
+JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
+9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
+h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
+-----END CERTIFICATE-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/ssl.pem
new file mode 100644
index 00000000000..5fa819c3f6d
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/ssl.pem
@@ -0,0 +1,126 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQD2G3cW10hPZCtX
+rRYKLaa+yvxmnMNm4HijA1QbK/biD1j+6HDlbL00VVw5w3E8fc8DJD/qkL6lHy4w
+u12Y1OL8EuZeBEz6+u3xp4OB5YH4LsMXc3gUcLI25wx7eqfaFcPuqSu+blGXwpJ9
+lGzwj69+lX8AYqA/+ZXufdWmyU5syTwvbWAiXF8SGnjoeNIEABYgdQ5ngy3ZLYVS
+7mDwDWBoPkv1tfInZlzq9pjZFRicVNR0zfQKfMS6X2FX2M06A0R9MvWe55DJxA0s
+082AHGI2+XuPomvwI+nje1b3RQhvW2SekYoHUtKnI6La4/wrLNuEEWV2UzphUa3v
+fiT7aqF/AgMBAAECggEAVHC7/ZRD9SlzTZPPmhJrwc63pyVmTef6vEOqGeCNxqZp
+bJyoD6+tg0U+bXtHYO/xlSxc2chsAQ+fs4y14ng4oTCC5gMnvn1WIrHNB0aNv2+b
+9HHj429/ViMUP1GoQcVyAnL81UvYpu9Vf8zrS+ag2hfFCYbNYOXrsXZvVdiAFgaR
+ZXh65uU7nBEODyqFj9sRtD+/ABfdoC9Vf9qs9vMaVxuIanNPtu7hHAUQ5z/WVIX/
+ZQGnfePvq5OyYDKzCHh2kWjWLLXPd/ICn6XNvjfY6k618R+3fafQ4SVyRFHNSn6H
+7k7SInp4kw+QBCJXP3L47sZzZXrMEeoNslrOGMUkQQKBgQD9Vn/94JQHgAlZ8PaS
+LdoNDQz53jWjBv7TZqwtZj76nHcZxGmXceSls4TZnuzZVyfk1RRxu6V4vj7sjlCB
+nGnESm+158PqNcpHm2qkvuSYxZxupcx6gbnK8AWitD4Ruah2xLtIWZe75HNJPdA8
+8lew2xE9j/jo4qt1GpswCIFJzwKBgQD4sYOo5VAuNLnpV3QrXLu0svAAUZNVrQi3
+/SbYdrOg52BfmHiSPdhUy6xYgmWpcPsSPsgwl7Xr4SEMevbxNN1XvOnTVi+aTtR3
+7VmdSjpepqvx15QKXw2IekxiP3lueaJqjRgrfHNC3uv4wS+UHw4Kgx5qNL8rqoZw
+nN4IjvYJUQKBgQCbzEaKa0KeGi+mEHqTC3+95vjD8dQqnnK4r7vTb73rga39Or11
+VaW4Ad8BtqsSPndaU3BvQWdSCi3IbP01uGuTO/PXeuEReGMeBoZfKsaK7Xx2z6Ag
+9wa7t0C//vjtDbB82iATLoYSFzyPHmSiFqe3LAI+SfxZvIyVR/eIYrKgIQKBgHKO
+6vQpNccjGKSpWWUEIZ86ch3jdfgYbhS682LxQwuSqa0/ggLzpCxjae+XmZb06WLd
+MsBXkkCnAt9J4Wj5DiD1b8yfPexZ9buMxSQUZlDle/06bgJdCNHebEMxtBE0zKFC
+f2jAuiOKpq5+5xjXOVOUVLVduNY3hhhn2kuc9y8RAoGAKgRwLBSk5XfOFdIkiulh
+oeJ2xZHUDGxUPxteBqjXPdvMmVOJuPpLhvvV+4HwA0OXtG5GZXsl8zKhdouiVzUv
+z0LXtlGX/4s1Oin+7N0qs4y+iPa4FSaypy3W5hzepwLr3HrrVnZRIjkWE0HZkBPl
+MEfmbKXS0HuPCklNjx0yYio=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIEwjCCA6qgAwIBAgIUX2smVT1Tol0Uh4r/FGiNqjEd1zUwDQYJKoZIhvcNAQEL
+BQAwgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw
+CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwKcGFydG5lcmFjYTEm
+MCQGCSqGSIb3DQEJARYXcGFydG5lcmFjYUBwYXJ0bmVyYS5jb20wIBcNMjEwNzA5
+MTkxMTU5WhgPMjEyMTA2MTUxOTExNTlaMIGFMQswCQYDVQQGEwJVUzELMAkGA1UE
+CAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTALBgNVBAsMBHJvb3Qx
+FTATBgNVBAMMDG5vblZhbGlkYXRvcjEoMCYGCSqGSIb3DQEJARYZbm9uVmFsaWRh
+dG9yQHBhcnRuZXJhLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+APYbdxbXSE9kK1etFgotpr7K/Gacw2bgeKMDVBsr9uIPWP7ocOVsvTRVXDnDcTx9
+zwMkP+qQvqUfLjC7XZjU4vwS5l4ETPr67fGng4HlgfguwxdzeBRwsjbnDHt6p9oV
+w+6pK75uUZfCkn2UbPCPr36VfwBioD/5le591abJTmzJPC9tYCJcXxIaeOh40gQA
+FiB1DmeDLdkthVLuYPANYGg+S/W18idmXOr2mNkVGJxU1HTN9Ap8xLpfYVfYzToD
+RH0y9Z7nkMnEDSzTzYAcYjb5e4+ia/Aj6eN7VvdFCG9bZJ6RigdS0qcjotrj/Css
+24QRZXZTOmFRre9+JPtqoX8CAwEAAaOCASgwggEkMBEGCWCGSAGG+EIBAQQEAwIG
+wDAdBgNVHQ4EFgQUUxNHyKHVtefbfv7VxdzZLgFQd9cwCQYDVR0TBAIwADAOBgNV
+HQ8BAf8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMIG1BgNV
+HSMEga0wgaqAFCGmRmD4q2qHqwUKO2b0cT71ssndoXykejB4MQswCQYDVQQGEwJV
+UzELMAkGA1UECAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTALBgNV
+BAsMBHJvb3QxEDAOBgNVBAMMB2ludGVyY2ExIDAeBgkqhkiG9w0BCQEWEWludGVy
+Y2FAYWRtaW4uY29tghRwBMj83j0mxnIC7JLyB9boGml0ETANBgkqhkiG9w0BAQsF
+AAOCAQEAWMx7UZJTA7XWCSODWiGh1bJkvTCSc7XSY3h0hNjAwWOZQIvjIUAEaxtX
+2sPlVWWnd2gt05mHbiiTqgcCPJuydGE9ne9PcSGU5fj11ZN7ofOP+V49Ru+R44KL
+dV5zWsYN+STBjESwOE1uGa6ri1aUF9Viebp4Sg7/WZWOYO6WOop2Kc9KDnSm5NYP
+ThQtcwbwZzmiNN62RodnpIlYU4QOu6B7wddNSGtzlGYvBI2aCCQuXxMpxKCfQ63t
+QKznbR+DJXXPshcbKOMjXJZG9MSTYww9bPV50Ok4DtWfgP048CNAm4KYp+WsyoAj
+RW8R1hN3vIf9V30mTixkLcTt7JVqBA==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBEwDQYJKoZIhvcNAQEL
+BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
+KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTExNTRaGA8y
+MTIxMDYxNTE5MTE1NFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
+A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
+cGFydG5lcmFjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmFjYUBwYXJ0bmVyYS5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDccGhUDD8T8m6e2x13
+B0LgCDR8F2vlfAw9FN/tXOKKU3DpagJk0CAutL6YFFYs9MXg8D6bZx+w0iXUnaN/
+6rjIC1LFs79AizpEaoFWDzcVI66ItSW1Swu3ts0I1kK7EGgAMba0TDTnssfrtuPw
+rOA2TOdVX03owOE+gaaPonIQlnew5+NNGhbW+P/5ix1IQXhyuNjV/uu3VEJBGNTh
+cAuMGdjvglFuz4zyFon4kNRcQvghs5ztjs2h5ZNHjEo6YtNIdJuRS/XOXII9MfPN
+plcwJArWTM3yEATNBtdc5FypOSI6cO/Pl+SVEf4kKmnzJQZWOSGiDXbpm938hGVw
+ByZPAgMBAAGjZjBkMB0GA1UdDgQWBBQhpkZg+Ktqh6sFCjtm9HE+9bLJ3TAfBgNV
+HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAIggdc0DCxEiNaKak
+/xbc7uGiGBb+UzBTjk4BmX9kEFrZf4XEaHzsptltqcQDCVtzcbFFFxMYhv/w/1g/
+WMNuUhL0mmGIGMxfoqkg50tNyuHW6aSrBXErel9WthGXAhUSzdHgkWxl3pe2wgda
+qIcSwTCFgOeVWTZRdKWqKNPHirBglJHUpMgLo0qa0Ug1hxiyOQRt2yXLpe/mH3pG
+cozhrEDYQMOcDhYTpPwM2Bl+TsRPpxFaV4QDfiOyvUDFLMM0dyhl2pukjay/Xpp2
++6Tsnaa+Ui0sDcM3A36Q07+E4Vugxjzfb9a36Eg4XE+Jg3jDA8UOqjeFg9gkK3aY
+NaI0qQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
+AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
+4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
+7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
+jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
+m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
+Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
+AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
+gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
+TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
+8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
+c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
+xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
+Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
+AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
+Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
+fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
+kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
+PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
+XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
+uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
+BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
+OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
+oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
+JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
+9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
+h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
+-----END CERTIFICATE-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/truststore.jks
new file mode 100644
index 00000000000..d50fba298f8
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/nonValidator/truststore.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/truststore/truststore.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/truststore/truststore.p12
new file mode 100644
index 00000000000..33079569a10
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/truststore/truststore.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator/crl.pem
new file mode 100644
index 00000000000..8ced006c911
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator/crl.pem
@@ -0,0 +1,27 @@
+-----BEGIN X509 CRL-----
+MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNV
+BAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJBgNVBAoMAk1DMQ0wCwYDVQQLDARyb290
+MRMwEQYDVQQDDApwYXJ0bmVyYWNhMSYwJAYJKoZIhvcNAQkBFhdwYXJ0bmVyYWNh
+QHBhcnRuZXJhLmNvbRcNMjEwNzA5MTkxMjM1WhcNMjIwNzA5MTkxMjM1WjAnMCUC
+FF9rJlU9U6JdFIeK/xRojaoxHdc5Fw0yMTA3MDkxOTEyMzVaoA4wDDAKBgNVHRQE
+AwIBADANBgkqhkiG9w0BAQsFAAOCAQEAfByR//FGHSsVQbaS51d59o82XocOGnnT
+p1hjceqtLGv3bhiebVrsRCOB5TsvE/r2IbB/yHYTe3+LJisIUqBxblQ6xK6IM+qA
+3fY646YnPT5pvdZAPZ2BCN/xP3xqGffFKapQ9cz0/36YE3vaEoUDlC2VHK0OXI0t
+4CLwAmiptUT2GW4Bk1RtokAsFiUNwNIOlRX5bywUNwkG7EuitR90QSGH3l/vyii2
+0c1Fm9He9MskwipjXpJKKb+t+m1pdpOVkSjRfjmVqi4BZwWlnQjELSLywhJ+WZG2
+Z1NgRjzPXotFKK+YD97Kx1L260A1eUZ46zSq73oUZr0EDZRnNJTr6A==
+-----END X509 CRL-----
+-----BEGIN X509 CRL-----
+MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD
+VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v
+dDETMBEGA1UEAwwKcGFydG5lcmJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmJj
+YUBwYXJ0bmVyYi5jb20XDTIxMDcwOTE5MTIzNVoXDTIyMDcwOTE5MTIzNVowTjAl
+AhQTZhDgbKuvX7iLRUBBTiWXBPKM1xcNMjEwNzA5MTkxMjM1WjAlAhRfayZVPVOi
+XRSHiv8UaI2qMR3XORcNMjEwNzA5MTkxMjM1WqAOMAwwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAMIltmJ036f1BmK/baISJTZTu7PKZgSZMNORnpFT8KvC
+s2GNRor5bGp5qvD6LHvsx92YVppCC6xd/beCFBtdyYifqw5xtOvqLQKuqCfxruLz
+EqYjKXE/3v8VdyU71J7kFqi0U0Gy4/h/YCL92e5KNbATlmcn5ToyI2EBIEfBfV08
+mm7FBXvbHRzqhfrnCNEjBWBWz3zkJMc9Rib26eCCofYIDkY2HvYSN78YgrnMmD6O
+hWOXrPoxArxvmDr5rG4vCadqbQYRkkCAOP0hBeMiB0SAcO2W2LNNAmHWXX7FvU3n
+ZRZUX31WoVjhNeEQtNBb2mPYBXHQzLC66qYm1p97afc=
+-----END X509 CRL-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/validator/keys.p12
new file mode 100644
index 00000000000..c3be57147fe
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator/keys.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/validator/keystore.jks
new file mode 100644
index 00000000000..4fb942a9e0f
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator/keystore.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/validator/nss.cfg
new file mode 100644
index 00000000000..f3849919caa
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator/nss.cfg
@@ -0,0 +1,6 @@
+
+name = NSScrypto-validator
+nssSecmodDirectory = ./src/test/resources/pki-certs/validator/nssdb
+nssDbMode = readOnly
+nssModule = keystore
+    
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator/nssdb/cert8.db
new file mode 100644
index 00000000000..f1aa64c06ca
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator/nssdb/cert8.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator/nssdb/key3.db
new file mode 100644
index 00000000000..cb2eb74985d
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator/nssdb/key3.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator/nssdb/secmod.db
new file mode 100644
index 00000000000..c51600ebfcf
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator/nssdb/secmod.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/validator/nsspin.txt
new file mode 100644
index 00000000000..5271a526801
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator/nsspin.txt
@@ -0,0 +1 @@
+test123
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator/ssl-ca.pem
new file mode 100644
index 00000000000..61a8f5230ed
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator/ssl-ca.pem
@@ -0,0 +1,70 @@
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBEwDQYJKoZIhvcNAQEL
+BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
+KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTExNTRaGA8y
+MTIxMDYxNTE5MTE1NFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
+A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
+cGFydG5lcmFjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmFjYUBwYXJ0bmVyYS5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDccGhUDD8T8m6e2x13
+B0LgCDR8F2vlfAw9FN/tXOKKU3DpagJk0CAutL6YFFYs9MXg8D6bZx+w0iXUnaN/
+6rjIC1LFs79AizpEaoFWDzcVI66ItSW1Swu3ts0I1kK7EGgAMba0TDTnssfrtuPw
+rOA2TOdVX03owOE+gaaPonIQlnew5+NNGhbW+P/5ix1IQXhyuNjV/uu3VEJBGNTh
+cAuMGdjvglFuz4zyFon4kNRcQvghs5ztjs2h5ZNHjEo6YtNIdJuRS/XOXII9MfPN
+plcwJArWTM3yEATNBtdc5FypOSI6cO/Pl+SVEf4kKmnzJQZWOSGiDXbpm938hGVw
+ByZPAgMBAAGjZjBkMB0GA1UdDgQWBBQhpkZg+Ktqh6sFCjtm9HE+9bLJ3TAfBgNV
+HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAIggdc0DCxEiNaKak
+/xbc7uGiGBb+UzBTjk4BmX9kEFrZf4XEaHzsptltqcQDCVtzcbFFFxMYhv/w/1g/
+WMNuUhL0mmGIGMxfoqkg50tNyuHW6aSrBXErel9WthGXAhUSzdHgkWxl3pe2wgda
+qIcSwTCFgOeVWTZRdKWqKNPHirBglJHUpMgLo0qa0Ug1hxiyOQRt2yXLpe/mH3pG
+cozhrEDYQMOcDhYTpPwM2Bl+TsRPpxFaV4QDfiOyvUDFLMM0dyhl2pukjay/Xpp2
++6Tsnaa+Ui0sDcM3A36Q07+E4Vugxjzfb9a36Eg4XE+Jg3jDA8UOqjeFg9gkK3aY
+NaI0qQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
+AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
+4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
+7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
+jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
+m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
+Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
+AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
+gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
+TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
+8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
+c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
+xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
+Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
+AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
+Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
+fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
+kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
+PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
+XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
+uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
+BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
+OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
+oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
+JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
+9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
+h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
+-----END CERTIFICATE-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator/ssl.pem
new file mode 100644
index 00000000000..a699dca2af4
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator/ssl.pem
@@ -0,0 +1,126 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCoFSKbOeGCRhkr
+fL6hOZ/+Nddfcep2vLcRXW/7MIN4OK26uGQx2xJr2p3Svl+m6ib4jLWx6E//tPVs
+PbsipMWIazlwM6pa8rA2SHmJ7WORq/S7RRgElxqgOnRsmgxyylhffAyHvb1aOtGl
+Hqzy3C3p+k6wSwleQfDhPdV1+4CLWJFJA9iHjVZzo7wr2JlOzsvnUZmlsIBeN7sb
+M+Nn5ttdL9FAEbB0YtALEdbhJQrOTASzR+rK36VGn2iYQVuhCxUHb35WbZ0E/U/M
+76QkMHRZs2sQ4BAluS2bOl1pXtaVW1ZSNCcNgzSBlu5gUJSoNqdaWqh5RSQDHRaU
+1subXekFAgMBAAECggEAIgvd7alkx3mhgZCMIKZGhTysupWdk52YS3ksxKnIB6Mb
+dbYB/aNNcPFghJ6xS2Mkr7X42+edxMMH73v1mwfbR03I3bRpbnC4RtaZX9npEEnP
+kdtmCQ/+gbQ1fwYZPWtFSVocQ6aoY02Ex7iV+b+lwT5FkCoy5Jfgzg8zXOmr2Q2s
+k/7wX8rj01/our7SSO7piwrlBz/uFKpRA/1NFa42R2FdYhHVTUa3nacpI2YBUSCB
+TdN9tzWT7hOmVBFQm6RBnUE31sLDvyfJ2cFTpzbIogg1ZZ1DqUbY0obIwR4EBLfS
+BvmsMRmCelgrRBENCDgV4CFcxN9oADH897avIy/QQQKBgQDWJnfjDAIAjSwN3f1M
+Q9AzjLuNcWIg45sWdO8k0UnfUNAyPjNFlAu9GQ2nkvsUF/J5+ujATYbLo5GkzoH8
+A7aAljYU2jsErlMb0CRfQwvetQDTDwomeKSGH+6vjV54dqJ8y5/USswpy77zo5KF
+ocFZPcViyZM+e3OsAKd1wSx91QKBgQDI7fyhXo4GAAFPuJDS+kVq3ObFSvxA9ahk
+vDVB+Ryvuomblekm1sZT3mOgjTiWNfU3XeS4FM0EOTXAtUFRXUBEuum/G6/gNoHq
+/FPpBICEHg6mKlHs3esOUWX1VENg0zA0oQYn23ZtlYel9Wm+2tqflX3TCUR10sFd
+R0QqVHnmcQKBgDLcTgrpliwlWzor5/XOAUvM99pe/GxNQk8yFH4NCttz6Q6VwT2c
+LLGLmrea6/DYwyj/U3ogr4v73CJlPW/qPdUKV+vZ7Lxu3qQzagAJ/260VG7MGqAK
+dSC5wsmE7NP1cR/siJg174lZr49T4P/F7BLS3edZcpQbY9yNBzirWXLFAoGAUK3W
+scjwyBH6dNNMO5rIgtc+RlwMm9zIB+LWk63+ScVh+bohCzpUGlsCr/XkkdQKqXen
+Hg8kHx0Fq2JcXtpNswtGTjlEzoe0dPFqk/b9z47uHOSDTtPwzSf8A50ZDOjfw1Ig
+0aI6lFflRssa8cqY3Fk/U5y2A4VjpRu3kDOpWtECgYEAvyJCc69wZSphrX3lRG75
+hw92hMAB0FEqLz0L0j5iM5CS7T7nte5i0AGOWkokFeL12KAk6yH7+2mJNNfCIepm
+H4DuDMOqUAhXNEKjOUUcZTSzzyIa05OnLbIflHLtNXrQWcx66H64aUyolALr3HQ/
+Nzs74GQxjAgkS6nSB0xk1wE=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIEuzCCA6OgAwIBAgIUX2smVT1Tol0Uh4r/FGiNqjEd1zQwDQYJKoZIhvcNAQEL
+BQAwgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw
+CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwKcGFydG5lcmFjYTEm
+MCQGCSqGSIb3DQEJARYXcGFydG5lcmFjYUBwYXJ0bmVyYS5jb20wIBcNMjEwNzA5
+MTkxMTU2WhgPMjEyMTA2MTUxOTExNTZaMH8xCzAJBgNVBAYTAlVTMQswCQYDVQQI
+DAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDES
+MBAGA1UEAwwJdmFsaWRhdG9yMSUwIwYJKoZIhvcNAQkBFhZ2YWxpZGF0b3JAcGFy
+dG5lcmEuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqBUimznh
+gkYZK3y+oTmf/jXXX3Hqdry3EV1v+zCDeDiturhkMdsSa9qd0r5fpuom+Iy1sehP
+/7T1bD27IqTFiGs5cDOqWvKwNkh5ie1jkav0u0UYBJcaoDp0bJoMcspYX3wMh729
+WjrRpR6s8twt6fpOsEsJXkHw4T3VdfuAi1iRSQPYh41Wc6O8K9iZTs7L51GZpbCA
+Xje7GzPjZ+bbXS/RQBGwdGLQCxHW4SUKzkwEs0fqyt+lRp9omEFboQsVB29+Vm2d
+BP1PzO+kJDB0WbNrEOAQJbktmzpdaV7WlVtWUjQnDYM0gZbuYFCUqDanWlqoeUUk
+Ax0WlNbLm13pBQIDAQABo4IBKDCCASQwEQYJYIZIAYb4QgEBBAQDAgbAMB0GA1Ud
+DgQWBBS3AIMGNhY4RF3tSpfawFoYcyjy3jAJBgNVHRMEAjAAMA4GA1UdDwEB/wQE
+AwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwgbUGA1UdIwSBrTCB
+qoAUIaZGYPiraoerBQo7ZvRxPvWyyd2hfKR6MHgxCzAJBgNVBAYTAlVTMQswCQYD
+VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v
+dDEQMA4GA1UEAwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1p
+bi5jb22CFHAEyPzePSbGcgLskvIH1ugaaXQRMA0GCSqGSIb3DQEBCwUAA4IBAQCm
+e6f/tVSVbIzdwJiqBL6yMoaC26m7nVk8pcVArQJQeHzQ6rVkyv/MWdJiYXzWjBfx
+YaFoeLTLoM/hiLjjL/PtskHny/rLlYVhV8sFVpv0xsXG6OP22UZEbpoESDVU3e8D
+7XPNXTvqyOdaht7VzRJNK/iv49EdDkOVTAUsK8kOukx6DZPAQGQT+5fkt2dq0sNH
++MH/Z8p5Ue/WxL1L8XLgGv1P0K1xpW7CJoSx5pa+vds4F9NuD4TThY0xK4F1hD3+
+nTtExFHquh0DhansjOG5EZPuj8HLf2Sn9cyFXErAAOedtwWKx4HjSatdHcVCysWm
+jiQxcAxGeRqlG0te9oX4
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBEwDQYJKoZIhvcNAQEL
+BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
+KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTExNTRaGA8y
+MTIxMDYxNTE5MTE1NFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
+A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
+cGFydG5lcmFjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmFjYUBwYXJ0bmVyYS5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDccGhUDD8T8m6e2x13
+B0LgCDR8F2vlfAw9FN/tXOKKU3DpagJk0CAutL6YFFYs9MXg8D6bZx+w0iXUnaN/
+6rjIC1LFs79AizpEaoFWDzcVI66ItSW1Swu3ts0I1kK7EGgAMba0TDTnssfrtuPw
+rOA2TOdVX03owOE+gaaPonIQlnew5+NNGhbW+P/5ix1IQXhyuNjV/uu3VEJBGNTh
+cAuMGdjvglFuz4zyFon4kNRcQvghs5ztjs2h5ZNHjEo6YtNIdJuRS/XOXII9MfPN
+plcwJArWTM3yEATNBtdc5FypOSI6cO/Pl+SVEf4kKmnzJQZWOSGiDXbpm938hGVw
+ByZPAgMBAAGjZjBkMB0GA1UdDgQWBBQhpkZg+Ktqh6sFCjtm9HE+9bLJ3TAfBgNV
+HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAIggdc0DCxEiNaKak
+/xbc7uGiGBb+UzBTjk4BmX9kEFrZf4XEaHzsptltqcQDCVtzcbFFFxMYhv/w/1g/
+WMNuUhL0mmGIGMxfoqkg50tNyuHW6aSrBXErel9WthGXAhUSzdHgkWxl3pe2wgda
+qIcSwTCFgOeVWTZRdKWqKNPHirBglJHUpMgLo0qa0Ug1hxiyOQRt2yXLpe/mH3pG
+cozhrEDYQMOcDhYTpPwM2Bl+TsRPpxFaV4QDfiOyvUDFLMM0dyhl2pukjay/Xpp2
++6Tsnaa+Ui0sDcM3A36Q07+E4Vugxjzfb9a36Eg4XE+Jg3jDA8UOqjeFg9gkK3aY
+NaI0qQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
+AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
+4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
+7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
+jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
+m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
+Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
+AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
+gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
+TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
+8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
+c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
+xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
+Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
+AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
+Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
+fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
+kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
+PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
+XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
+uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
+BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
+OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
+oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
+JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
+9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
+h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
+-----END CERTIFICATE-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/validator/truststore.jks
new file mode 100644
index 00000000000..711a7b5148d
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator/truststore.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator1/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/crl.pem
new file mode 100644
index 00000000000..8ced006c911
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/crl.pem
@@ -0,0 +1,27 @@
+-----BEGIN X509 CRL-----
+MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNV
+BAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJBgNVBAoMAk1DMQ0wCwYDVQQLDARyb290
+MRMwEQYDVQQDDApwYXJ0bmVyYWNhMSYwJAYJKoZIhvcNAQkBFhdwYXJ0bmVyYWNh
+QHBhcnRuZXJhLmNvbRcNMjEwNzA5MTkxMjM1WhcNMjIwNzA5MTkxMjM1WjAnMCUC
+FF9rJlU9U6JdFIeK/xRojaoxHdc5Fw0yMTA3MDkxOTEyMzVaoA4wDDAKBgNVHRQE
+AwIBADANBgkqhkiG9w0BAQsFAAOCAQEAfByR//FGHSsVQbaS51d59o82XocOGnnT
+p1hjceqtLGv3bhiebVrsRCOB5TsvE/r2IbB/yHYTe3+LJisIUqBxblQ6xK6IM+qA
+3fY646YnPT5pvdZAPZ2BCN/xP3xqGffFKapQ9cz0/36YE3vaEoUDlC2VHK0OXI0t
+4CLwAmiptUT2GW4Bk1RtokAsFiUNwNIOlRX5bywUNwkG7EuitR90QSGH3l/vyii2
+0c1Fm9He9MskwipjXpJKKb+t+m1pdpOVkSjRfjmVqi4BZwWlnQjELSLywhJ+WZG2
+Z1NgRjzPXotFKK+YD97Kx1L260A1eUZ46zSq73oUZr0EDZRnNJTr6A==
+-----END X509 CRL-----
+-----BEGIN X509 CRL-----
+MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD
+VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v
+dDETMBEGA1UEAwwKcGFydG5lcmJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmJj
+YUBwYXJ0bmVyYi5jb20XDTIxMDcwOTE5MTIzNVoXDTIyMDcwOTE5MTIzNVowTjAl
+AhQTZhDgbKuvX7iLRUBBTiWXBPKM1xcNMjEwNzA5MTkxMjM1WjAlAhRfayZVPVOi
+XRSHiv8UaI2qMR3XORcNMjEwNzA5MTkxMjM1WqAOMAwwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAMIltmJ036f1BmK/baISJTZTu7PKZgSZMNORnpFT8KvC
+s2GNRor5bGp5qvD6LHvsx92YVppCC6xd/beCFBtdyYifqw5xtOvqLQKuqCfxruLz
+EqYjKXE/3v8VdyU71J7kFqi0U0Gy4/h/YCL92e5KNbATlmcn5ToyI2EBIEfBfV08
+mm7FBXvbHRzqhfrnCNEjBWBWz3zkJMc9Rib26eCCofYIDkY2HvYSN78YgrnMmD6O
+hWOXrPoxArxvmDr5rG4vCadqbQYRkkCAOP0hBeMiB0SAcO2W2LNNAmHWXX7FvU3n
+ZRZUX31WoVjhNeEQtNBb2mPYBXHQzLC66qYm1p97afc=
+-----END X509 CRL-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator1/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/keys.p12
new file mode 100644
index 00000000000..e98020b148e
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/keys.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator1/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/keystore.jks
new file mode 100644
index 00000000000..2b652b862ec
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/keystore.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator1/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/nss.cfg
new file mode 100644
index 00000000000..b908a6800f8
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/nss.cfg
@@ -0,0 +1,6 @@
+
+name = NSScrypto-validator1
+nssSecmodDirectory = ./src/test/resources/pki-certs/validator1/nssdb
+nssDbMode = readOnly
+nssModule = keystore
+    
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator1/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/nssdb/cert8.db
new file mode 100644
index 00000000000..c9633c71418
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/nssdb/cert8.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator1/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/nssdb/key3.db
new file mode 100644
index 00000000000..2b98e97f3b0
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/nssdb/key3.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator1/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/nssdb/secmod.db
new file mode 100644
index 00000000000..bc3748fac05
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/nssdb/secmod.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator1/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/nsspin.txt
new file mode 100644
index 00000000000..5271a526801
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/nsspin.txt
@@ -0,0 +1 @@
+test123
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator1/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/ssl-ca.pem
new file mode 100644
index 00000000000..61a8f5230ed
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/ssl-ca.pem
@@ -0,0 +1,70 @@
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBEwDQYJKoZIhvcNAQEL
+BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
+KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTExNTRaGA8y
+MTIxMDYxNTE5MTE1NFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
+A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
+cGFydG5lcmFjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmFjYUBwYXJ0bmVyYS5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDccGhUDD8T8m6e2x13
+B0LgCDR8F2vlfAw9FN/tXOKKU3DpagJk0CAutL6YFFYs9MXg8D6bZx+w0iXUnaN/
+6rjIC1LFs79AizpEaoFWDzcVI66ItSW1Swu3ts0I1kK7EGgAMba0TDTnssfrtuPw
+rOA2TOdVX03owOE+gaaPonIQlnew5+NNGhbW+P/5ix1IQXhyuNjV/uu3VEJBGNTh
+cAuMGdjvglFuz4zyFon4kNRcQvghs5ztjs2h5ZNHjEo6YtNIdJuRS/XOXII9MfPN
+plcwJArWTM3yEATNBtdc5FypOSI6cO/Pl+SVEf4kKmnzJQZWOSGiDXbpm938hGVw
+ByZPAgMBAAGjZjBkMB0GA1UdDgQWBBQhpkZg+Ktqh6sFCjtm9HE+9bLJ3TAfBgNV
+HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAIggdc0DCxEiNaKak
+/xbc7uGiGBb+UzBTjk4BmX9kEFrZf4XEaHzsptltqcQDCVtzcbFFFxMYhv/w/1g/
+WMNuUhL0mmGIGMxfoqkg50tNyuHW6aSrBXErel9WthGXAhUSzdHgkWxl3pe2wgda
+qIcSwTCFgOeVWTZRdKWqKNPHirBglJHUpMgLo0qa0Ug1hxiyOQRt2yXLpe/mH3pG
+cozhrEDYQMOcDhYTpPwM2Bl+TsRPpxFaV4QDfiOyvUDFLMM0dyhl2pukjay/Xpp2
++6Tsnaa+Ui0sDcM3A36Q07+E4Vugxjzfb9a36Eg4XE+Jg3jDA8UOqjeFg9gkK3aY
+NaI0qQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
+AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
+4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
+7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
+jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
+m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
+Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
+AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
+gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
+TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
+8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
+c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
+xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
+Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
+AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
+Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
+fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
+kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
+PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
+XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
+uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
+BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
+OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
+oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
+JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
+9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
+h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
+-----END CERTIFICATE-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator1/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/ssl.pem
new file mode 100644
index 00000000000..696511ad10b
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/ssl.pem
@@ -0,0 +1,126 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDL9plpUXsE94Ok
+8bCw5GLKlh0UQEjS9UWVFpBSSxJrTuL/nCvAAVsn76XHxhgXBnbBgUHZ+eIzCKaq
+jV+cIvbihF+u1uGlvQc6zDiWKv9ijQaTr0aN0ZbKvs0h40FJyEONZqNwODp4kXnU
+Cptf6iIeu7xUXclUKg0WOHYGasBGxN5vx6BRHYmY6LiyBcO560gs/fLKk5nHla1j
+/oxRQ47SVEdB8aDVxJJtKZC0d0a6ik69WpmnUpCLf/+zws7zYXC3sgs80uNnXDzV
+iuk9ydWMKm4w2YvsCgMgzQETJu7GLFCtR1kAWPXDkpFfIicrj0J0xMyaus/VwRdl
+CCV+ENSHAgMBAAECggEAXIgPqTwR93ri+l27r0StnQLlRl6zqyEi5DRMXUk5nf03
+9oa/QmhbFo8eQreYDjocfkVJvr4i5Mwz8IQasBccsj8juYo67JoJQZ+MvHPdULRy
+G2YVOBmxs2FEZu9Wm0aDfw7lbu/Tdwdooc3+F1F9ETxSgGPcBpbdQQt0YAzmFjRC
+b1xVIM4bC89ks5rIRcWi0dE0dMHeZG8NKryox/baTEWzb43lv2gK+vd4aQIjKsX3
+4TqqLFO4lyTv0PW4MmlHp+iEAAlS/UtSzKogVOJqain+yOeOzaVQWGASM7c/ht5Z
+cdftRguBYCj31UZ/4dT1rb6OaL0Sja9AdenVhm5lQQKBgQD0/ddhyjQHF9E+99rs
+xR9zh2CAXHyenflPKpHmYi7QHKZrbYB6t308oGqaSqig0Y3WWQN34LrDlb5aMJHI
+WmZw+h3ejSKLdeb1Nd9GQmDIvjfMLsAWaySzP5aOFNbZB+JhUng625oV7D744HO/
+Hc+RyOG47fEPNqpBgBuwtPZfnwKBgQDVIM5Zn02P63V+utN/kxrm8JfHcq9SLNX5
+XZsun/kjY2ZK9c3Is/pxOS34pdmzv18nxcCGzMaqvELgzbVoM8ey0tPSg9WDheEC
+rESUoPHSP/GpCyv00lAzJDJlvEblTRCoKdtIdF3TGc/b4GeexxGPhBI5q2Fm+3HG
+l6cYypXCGQKBgE6EfF7u+zW6wGk57oQruSTBooABJD+BycFBl3kKxo4UYJHVinPK
+Eu03THMesmS4RIkKBj6JW9ILT/J/1nkr3+EdiC0ndobTxq2YEnLmGza7IA7kfNOy
+ixSXsJzguOrdyAQA9l+Guh+Ek7oX1YDPARNsGku2lqeVkYNkl3tOxBdpAoGAQNrt
+0Dn42U3WgE0L5St3qUUXetr8XO5F4s9IVMTbhJhP3Ym1KFkUYfX7dknJ2LfolerI
+bnzMC9KkK1KN3Hq9Tz52tP3nMFHCKhUP/YaIb+mDeWRr6OFDBH0EVQ8ZJ9futK2g
+DAlVL9MP/KHqBlgfkOOoxCHRzwu/EKa/c3zaW6kCgYEAqdSB1tmhNOTyfZduxFUQ
+W+kSHxTvXtyy88qSx9mhOqD+9Xq/liD14Y4sprplFaIBsErZaNXEPheVsEbXmdzU
+PNfdu95Vqpc+gFDpsTzKHnwt0twmRqXsusQzr3ppOrs/GPdetS46ck2yrOd/r5bt
+IeHhV43mdsgE4XpPLhZSWyk=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIEvjCCA6agAwIBAgIUX2smVT1Tol0Uh4r/FGiNqjEd1zMwDQYJKoZIhvcNAQEL
+BQAwgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw
+CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwKcGFydG5lcmFjYTEm
+MCQGCSqGSIb3DQEJARYXcGFydG5lcmFjYUBwYXJ0bmVyYS5jb20wIBcNMjEwNzA5
+MTkxMTU0WhgPMjEyMTA2MTUxOTExNTRaMIGBMQswCQYDVQQGEwJVUzELMAkGA1UE
+CAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTALBgNVBAsMBHJvb3Qx
+EzARBgNVBAMMCnZhbGlkYXRvcjExJjAkBgkqhkiG9w0BCQEWF3ZhbGlkYXRvcjFA
+cGFydG5lcmEuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy/aZ
+aVF7BPeDpPGwsORiypYdFEBI0vVFlRaQUksSa07i/5wrwAFbJ++lx8YYFwZ2wYFB
+2fniMwimqo1fnCL24oRfrtbhpb0HOsw4lir/Yo0Gk69GjdGWyr7NIeNBSchDjWaj
+cDg6eJF51AqbX+oiHru8VF3JVCoNFjh2BmrARsTeb8egUR2JmOi4sgXDuetILP3y
+ypOZx5WtY/6MUUOO0lRHQfGg1cSSbSmQtHdGuopOvVqZp1KQi3//s8LO82Fwt7IL
+PNLjZ1w81YrpPcnVjCpuMNmL7AoDIM0BEybuxixQrUdZAFj1w5KRXyInK49CdMTM
+mrrP1cEXZQglfhDUhwIDAQABo4IBKDCCASQwEQYJYIZIAYb4QgEBBAQDAgbAMB0G
+A1UdDgQWBBTYucEx67wBKeANHFZjSwmx+7kSszAJBgNVHRMEAjAAMA4GA1UdDwEB
+/wQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwgbUGA1UdIwSB
+rTCBqoAUIaZGYPiraoerBQo7ZvRxPvWyyd2hfKR6MHgxCzAJBgNVBAYTAlVTMQsw
+CQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwE
+cm9vdDEQMA4GA1UEAwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBh
+ZG1pbi5jb22CFHAEyPzePSbGcgLskvIH1ugaaXQRMA0GCSqGSIb3DQEBCwUAA4IB
+AQCo3ZgqNtVIf99TEsVOpvQQRQw0ccZCpsQSgN6vITxInYEydyg9NxGgFHVNwcSY
+XpGw0r+Ghz7BS/a2AIz1PHmf0FjpkKLMJ72StaspovMLONPc4yHjMy1bUbe+7JAn
+1zC8u9JyjnGX7UIA8qPnAvV+ZAI/MM5674Q3D9waQHiuToo1tV6/HlwMWQthbIy6
+iQyztsEHq+M2edWZmEOwiUk+aIgNFtpFk9gBj09RBgm93iVscmykX5vAPjxOJ8Zh
+71jW0P3Q0ZTZImxZYIv7SOcseioneZBQJekdg3UDUrPQlh4WVuKY5aqVh4x2kJRG
+jZI47U1/ihglkdSuDuStTS/S
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBEwDQYJKoZIhvcNAQEL
+BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
+KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTExNTRaGA8y
+MTIxMDYxNTE5MTE1NFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
+A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
+cGFydG5lcmFjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmFjYUBwYXJ0bmVyYS5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDccGhUDD8T8m6e2x13
+B0LgCDR8F2vlfAw9FN/tXOKKU3DpagJk0CAutL6YFFYs9MXg8D6bZx+w0iXUnaN/
+6rjIC1LFs79AizpEaoFWDzcVI66ItSW1Swu3ts0I1kK7EGgAMba0TDTnssfrtuPw
+rOA2TOdVX03owOE+gaaPonIQlnew5+NNGhbW+P/5ix1IQXhyuNjV/uu3VEJBGNTh
+cAuMGdjvglFuz4zyFon4kNRcQvghs5ztjs2h5ZNHjEo6YtNIdJuRS/XOXII9MfPN
+plcwJArWTM3yEATNBtdc5FypOSI6cO/Pl+SVEf4kKmnzJQZWOSGiDXbpm938hGVw
+ByZPAgMBAAGjZjBkMB0GA1UdDgQWBBQhpkZg+Ktqh6sFCjtm9HE+9bLJ3TAfBgNV
+HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAIggdc0DCxEiNaKak
+/xbc7uGiGBb+UzBTjk4BmX9kEFrZf4XEaHzsptltqcQDCVtzcbFFFxMYhv/w/1g/
+WMNuUhL0mmGIGMxfoqkg50tNyuHW6aSrBXErel9WthGXAhUSzdHgkWxl3pe2wgda
+qIcSwTCFgOeVWTZRdKWqKNPHirBglJHUpMgLo0qa0Ug1hxiyOQRt2yXLpe/mH3pG
+cozhrEDYQMOcDhYTpPwM2Bl+TsRPpxFaV4QDfiOyvUDFLMM0dyhl2pukjay/Xpp2
++6Tsnaa+Ui0sDcM3A36Q07+E4Vugxjzfb9a36Eg4XE+Jg3jDA8UOqjeFg9gkK3aY
+NaI0qQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
+AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
+4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
+7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
+jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
+m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
+Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
+AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
+gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
+TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
+8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
+c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
+xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
+Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
+AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
+Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
+fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
+kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
+PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
+XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
+uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
+BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
+OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
+oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
+JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
+9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
+h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
+-----END CERTIFICATE-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator1/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/truststore.jks
new file mode 100644
index 00000000000..c6fd60f037d
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator1/truststore.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator2/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/crl.pem
new file mode 100644
index 00000000000..8ced006c911
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/crl.pem
@@ -0,0 +1,27 @@
+-----BEGIN X509 CRL-----
+MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNV
+BAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJBgNVBAoMAk1DMQ0wCwYDVQQLDARyb290
+MRMwEQYDVQQDDApwYXJ0bmVyYWNhMSYwJAYJKoZIhvcNAQkBFhdwYXJ0bmVyYWNh
+QHBhcnRuZXJhLmNvbRcNMjEwNzA5MTkxMjM1WhcNMjIwNzA5MTkxMjM1WjAnMCUC
+FF9rJlU9U6JdFIeK/xRojaoxHdc5Fw0yMTA3MDkxOTEyMzVaoA4wDDAKBgNVHRQE
+AwIBADANBgkqhkiG9w0BAQsFAAOCAQEAfByR//FGHSsVQbaS51d59o82XocOGnnT
+p1hjceqtLGv3bhiebVrsRCOB5TsvE/r2IbB/yHYTe3+LJisIUqBxblQ6xK6IM+qA
+3fY646YnPT5pvdZAPZ2BCN/xP3xqGffFKapQ9cz0/36YE3vaEoUDlC2VHK0OXI0t
+4CLwAmiptUT2GW4Bk1RtokAsFiUNwNIOlRX5bywUNwkG7EuitR90QSGH3l/vyii2
+0c1Fm9He9MskwipjXpJKKb+t+m1pdpOVkSjRfjmVqi4BZwWlnQjELSLywhJ+WZG2
+Z1NgRjzPXotFKK+YD97Kx1L260A1eUZ46zSq73oUZr0EDZRnNJTr6A==
+-----END X509 CRL-----
+-----BEGIN X509 CRL-----
+MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD
+VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v
+dDETMBEGA1UEAwwKcGFydG5lcmJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmJj
+YUBwYXJ0bmVyYi5jb20XDTIxMDcwOTE5MTIzNVoXDTIyMDcwOTE5MTIzNVowTjAl
+AhQTZhDgbKuvX7iLRUBBTiWXBPKM1xcNMjEwNzA5MTkxMjM1WjAlAhRfayZVPVOi
+XRSHiv8UaI2qMR3XORcNMjEwNzA5MTkxMjM1WqAOMAwwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAMIltmJ036f1BmK/baISJTZTu7PKZgSZMNORnpFT8KvC
+s2GNRor5bGp5qvD6LHvsx92YVppCC6xd/beCFBtdyYifqw5xtOvqLQKuqCfxruLz
+EqYjKXE/3v8VdyU71J7kFqi0U0Gy4/h/YCL92e5KNbATlmcn5ToyI2EBIEfBfV08
+mm7FBXvbHRzqhfrnCNEjBWBWz3zkJMc9Rib26eCCofYIDkY2HvYSN78YgrnMmD6O
+hWOXrPoxArxvmDr5rG4vCadqbQYRkkCAOP0hBeMiB0SAcO2W2LNNAmHWXX7FvU3n
+ZRZUX31WoVjhNeEQtNBb2mPYBXHQzLC66qYm1p97afc=
+-----END X509 CRL-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator2/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/keys.p12
new file mode 100644
index 00000000000..c74b1a39873
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/keys.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator2/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/keystore.jks
new file mode 100644
index 00000000000..414b903e133
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/keystore.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator2/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/nss.cfg
new file mode 100644
index 00000000000..a6725a100fe
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/nss.cfg
@@ -0,0 +1,6 @@
+
+name = NSScrypto-validator2
+nssSecmodDirectory = ./src/test/resources/pki-certs/validator2/nssdb
+nssDbMode = readOnly
+nssModule = keystore
+    
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator2/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/nssdb/cert8.db
new file mode 100644
index 00000000000..7dd3fae7dee
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/nssdb/cert8.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator2/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/nssdb/key3.db
new file mode 100644
index 00000000000..3cdbd6121b4
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/nssdb/key3.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator2/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/nssdb/secmod.db
new file mode 100644
index 00000000000..40f3b7e3c4d
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/nssdb/secmod.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator2/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/nsspin.txt
new file mode 100644
index 00000000000..5271a526801
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/nsspin.txt
@@ -0,0 +1 @@
+test123
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator2/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/ssl-ca.pem
new file mode 100644
index 00000000000..c0c4bf478f6
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/ssl-ca.pem
@@ -0,0 +1,70 @@
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBIwDQYJKoZIhvcNAQEL
+BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
+KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTEyMTFaGA8y
+MTIxMDYxNTE5MTIxMVowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
+A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
+cGFydG5lcmJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmJjYUBwYXJ0bmVyYi5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNTP8IviC0X2ozlU2+
+9+mPLL9NqJKRCsEiH7XypcXkqkzCYZv/+6nNWXGLr6HsF5qXaM/YVMJYtwiaJquw
+qW1CpOKxhHA1gubNt0Fzmt69/5yP6D1zxTPzAcybNMuCy8VcLJpovYHO40+2HD6I
+D91/zh3jtrgKPoEXgaW3eX4+hykQWaru3P/G4PrIvPyZXnccoCdBSRCqyZSBJUko
+e5ZLnCQMlkwgDONGT3MqQyUC5lqFFMzZ75pOm2reiBe6HzP3H4wK7Ldpxds9ubGk
+Acb08+QzcUT7uHvENyvLm5mbf68QurFTwIDEVg2K03dgqQWbJudSzRJAmJYSszFQ
+vLZdAgMBAAGjZjBkMB0GA1UdDgQWBBR5aiJ1nA1HHi0XzbRsp4V7T8eKBjAfBgNV
+HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAsmFsG3SV1fQg6kO+
+dYvFrDKNOJzTBdVYmFhg4y4H7Qt+dwQcs/ZcOCIaAFUfMUH6CWe1AAdCymfwUHxn
+l/FMeJHh/+d1cybC+Wj9wtBbz7nPsWh/PXbbg3Zi8N4+a6Y0NhZAGlNn1UgMHx+E
+SkSIXk63FkGT01xM2aYtfr9ABuDdoLK/YPecduiawZoRb02WwIpZFNeEE/MS7XG6
+fX9TdUrNOal8pnWUM79K+rzdlzstpCx7uFFbACUEiiIuYiqG6X+DuypfGmQnjRXB
+zbc6NsQONUxg7fnJObdpV7kKTlbpREFoECkTBdqKd7AuJwYRvGaQDWK9P1IYFr1W
+Cnm4Cg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
+AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
+4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
+7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
+jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
+m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
+Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
+AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
+gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
+TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
+8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
+c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
+xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
+Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
+AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
+Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
+fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
+kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
+PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
+XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
+uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
+BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
+OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
+oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
+JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
+9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
+h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
+-----END CERTIFICATE-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator2/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/ssl.pem
new file mode 100644
index 00000000000..dbe6313f06c
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/ssl.pem
@@ -0,0 +1,126 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDDR/V9lCYi6g49
+91p6yUVKsPmPedT4/gNS2gVOLhGrgwxNJW2cWMjv4wZG0864LxtK/gkoMR4hN4lM
+BvePO73bnUBHwTmm2fAOelmoJAdLAhUkXXgbsHnok6PP7v8hgZEFMLw4+UXO+LB5
+5YbZIyNOB1FcCteac7bdVRJfswgdO5MdhlZOVcg766TMK9/8ezSthExN06exvViZ
+4v/L9X5MOLmdRRPq/I1X9wCKf/fIY/FO/zJkwv2VZNhPwkW8SpiS3UevsIhxRJz6
+8zyYXfKhnUBIShDuERladJqthPkdgOp6ca0dZrTqS64MqDE7rZE6cU3xOkRLhVbd
+vEbGPfTTAgMBAAECggEAXxy9RNzTdk3pgeTn/MXrKeXopyj/wgZ2N/RYgSuPD6pU
+Y37HVE8qDyzT8ctX8/19nZj9fMXvlt4l0RHTob/HSR/eHxTNr6aWdXbCFFL3+mCZ
+S4z64wGhXtYKA0y0lu00ZQLHqjg+9//IdJaGh1vF5ktKJTpiqKeTeVnmCRZ57UIr
+j8LF8M/I1NO/ScF+CeMDHmiyecLGlFjqiEu9GtE1u9ZQNA1rmPMQ/0/nITOrmTJz
+IhZK7H5xIRCdCENNuB41JGmO4Y5tMn8Bj11vJRFW+9OPF5R+lefBl2J9ZVxH3beu
+yTtAdf7HDhQsVe45vHohDjkVbqEo4D2HyUShWsYiAQKBgQD8UyPPr7uqGCPXDxif
+cuc7kySuWL2XbnFb8xcXsj+l6TtAod4O5ei31xcGw2hy2G8f0yGQ2U+OVKPCAXum
+18rkjQNWCpPY0sRdM849bF9ZDCNrlTihD45xnPrrFdQfF5JDnPOyku7hrUs18k8R
+IhPxXazJJpXmUmPJZM67z7tbMQKBgQDGIB3UGLeuuGdF/sTp9TsSHTrpAVzk1VR3
+D1PiJST3dsiCAnqnzs75agbOI8f8bdrMcWVrHUbMShuRjQWkcnRN/J9nOduCUIMr
+AMTEozNfF6MQBc5nceZtvvuCGqD2TUg/bmoC3yp4q0SGIx4ZufhYUhmQ65FQvrGX
+rvrNkPLHQwKBgC9IgSh1HOyl82lkic+vX4d5bmFBfd23s4RwjD5Dh8vWZeUZsBwI
+l1CD/OumiJck2cYT8XFMV60rTTiYwIwmWf30MtDX0JbMAEIa6CX4ffGY5bZOUztT
+R/UgXqDZCVP+PclvyvcGs78Uk0h7rLdgNG6BiFR1Z5eujsZ5nofxSIGxAoGBAJdA
+jYUOGaxZOv5EsS+q952skvyu/av08La0DOXoVYBWPlyCaAET8Q6X0vosdtBPTWom
+Z7aOcy4ipUlIz7Xrar7ezRKRKPMjY//AZnd34BAIi4P/6sMuQSwnUPrSOW/PMAi8
+0lG+7T2SAo4k4SXiw6UpiDsKm7V43ztdajrlHXLhAoGAXTpF0AGnc5uje11Y1Tvi
+zhu3NIXfZYzbtPR8UOxCDmUvwwKiW5DkLBe6rSx2DnVuGdS6ntQLq0Us1Tamo6mW
+CNhOZmJyU9kzz/XfHFzkWaen92Cq41w7Hd0oziF1T8W0UqLSk42Xq8qERorRoqlg
+1rV/3EvT/wSYmTdTdPsdcsk=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIEvjCCA6agAwIBAgIUE2YQ4Gyrr1+4i0VAQU4llwTyjNQwDQYJKoZIhvcNAQEL
+BQAwgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw
+CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwKcGFydG5lcmJjYTEm
+MCQGCSqGSIb3DQEJARYXcGFydG5lcmJjYUBwYXJ0bmVyYi5jb20wIBcNMjEwNzA5
+MTkxMjExWhgPMjEyMTA2MTUxOTEyMTFaMIGBMQswCQYDVQQGEwJVUzELMAkGA1UE
+CAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTALBgNVBAsMBHJvb3Qx
+EzARBgNVBAMMCnZhbGlkYXRvcjIxJjAkBgkqhkiG9w0BCQEWF3ZhbGlkYXRvcjJA
+cGFydG5lcmIuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw0f1
+fZQmIuoOPfdaeslFSrD5j3nU+P4DUtoFTi4Rq4MMTSVtnFjI7+MGRtPOuC8bSv4J
+KDEeITeJTAb3jzu9251AR8E5ptnwDnpZqCQHSwIVJF14G7B56JOjz+7/IYGRBTC8
+OPlFzviweeWG2SMjTgdRXArXmnO23VUSX7MIHTuTHYZWTlXIO+ukzCvf/Hs0rYRM
+TdOnsb1YmeL/y/V+TDi5nUUT6vyNV/cAin/3yGPxTv8yZML9lWTYT8JFvEqYkt1H
+r7CIcUSc+vM8mF3yoZ1ASEoQ7hEZWnSarYT5HYDqenGtHWa06kuuDKgxO62ROnFN
+8TpES4VW3bxGxj300wIDAQABo4IBKDCCASQwEQYJYIZIAYb4QgEBBAQDAgbAMB0G
+A1UdDgQWBBRvD8e/IWuuGwe8ErupvKv8q5mbcTAJBgNVHRMEAjAAMA4GA1UdDwEB
+/wQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwgbUGA1UdIwSB
+rTCBqoAUeWoidZwNRx4tF820bKeFe0/HigahfKR6MHgxCzAJBgNVBAYTAlVTMQsw
+CQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwE
+cm9vdDEQMA4GA1UEAwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBh
+ZG1pbi5jb22CFHAEyPzePSbGcgLskvIH1ugaaXQSMA0GCSqGSIb3DQEBCwUAA4IB
+AQBOM0aMjtCa34n3o4MRUkGOSgcw8bhnKmJSHIjBKvhkiroPVJbXHC72UZTJ/yiO
+/C1rrIrWES4iosAEE+qhqFqRxyHiLlrLrnRqIbNchaNVQch2Q2IZOY0vwSIv+0Vh
+cnHMWGOPtMwvWRZdM7eXIiB0bjvXnvCk1erI00UjTeuXMxtQkKe5l3CVl7QYU/ns
+WbihGXkt4Gzp2vtUhUVcpZOahhlAMTCxkeArrFTCi2zyX9beR2oFqqD4U78QmvSD
+pSGonPFj7YxgbDx63LXvvcCRkQqVfK3SnqAlI1LkPnV0zVNxNOBol/5Fr7oZec5q
+VkVF2lVfOUIwg6OXsNS21mzR
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBIwDQYJKoZIhvcNAQEL
+BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
+KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTEyMTFaGA8y
+MTIxMDYxNTE5MTIxMVowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
+A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
+cGFydG5lcmJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmJjYUBwYXJ0bmVyYi5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNTP8IviC0X2ozlU2+
+9+mPLL9NqJKRCsEiH7XypcXkqkzCYZv/+6nNWXGLr6HsF5qXaM/YVMJYtwiaJquw
+qW1CpOKxhHA1gubNt0Fzmt69/5yP6D1zxTPzAcybNMuCy8VcLJpovYHO40+2HD6I
+D91/zh3jtrgKPoEXgaW3eX4+hykQWaru3P/G4PrIvPyZXnccoCdBSRCqyZSBJUko
+e5ZLnCQMlkwgDONGT3MqQyUC5lqFFMzZ75pOm2reiBe6HzP3H4wK7Ldpxds9ubGk
+Acb08+QzcUT7uHvENyvLm5mbf68QurFTwIDEVg2K03dgqQWbJudSzRJAmJYSszFQ
+vLZdAgMBAAGjZjBkMB0GA1UdDgQWBBR5aiJ1nA1HHi0XzbRsp4V7T8eKBjAfBgNV
+HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAsmFsG3SV1fQg6kO+
+dYvFrDKNOJzTBdVYmFhg4y4H7Qt+dwQcs/ZcOCIaAFUfMUH6CWe1AAdCymfwUHxn
+l/FMeJHh/+d1cybC+Wj9wtBbz7nPsWh/PXbbg3Zi8N4+a6Y0NhZAGlNn1UgMHx+E
+SkSIXk63FkGT01xM2aYtfr9ABuDdoLK/YPecduiawZoRb02WwIpZFNeEE/MS7XG6
+fX9TdUrNOal8pnWUM79K+rzdlzstpCx7uFFbACUEiiIuYiqG6X+DuypfGmQnjRXB
+zbc6NsQONUxg7fnJObdpV7kKTlbpREFoECkTBdqKd7AuJwYRvGaQDWK9P1IYFr1W
+Cnm4Cg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
+AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
+4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
+7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
+jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
+m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
+Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
+AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
+gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
+TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
+8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
+c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
+xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
+Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
+AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
+Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
+fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
+kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
+PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
+XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
+uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
+BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
+OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
+oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
+JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
+9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
+h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
+-----END CERTIFICATE-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator2/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/truststore.jks
new file mode 100644
index 00000000000..fb45ce73051
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator2/truststore.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator3/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/crl.pem
new file mode 100644
index 00000000000..8ced006c911
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/crl.pem
@@ -0,0 +1,27 @@
+-----BEGIN X509 CRL-----
+MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNV
+BAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJBgNVBAoMAk1DMQ0wCwYDVQQLDARyb290
+MRMwEQYDVQQDDApwYXJ0bmVyYWNhMSYwJAYJKoZIhvcNAQkBFhdwYXJ0bmVyYWNh
+QHBhcnRuZXJhLmNvbRcNMjEwNzA5MTkxMjM1WhcNMjIwNzA5MTkxMjM1WjAnMCUC
+FF9rJlU9U6JdFIeK/xRojaoxHdc5Fw0yMTA3MDkxOTEyMzVaoA4wDDAKBgNVHRQE
+AwIBADANBgkqhkiG9w0BAQsFAAOCAQEAfByR//FGHSsVQbaS51d59o82XocOGnnT
+p1hjceqtLGv3bhiebVrsRCOB5TsvE/r2IbB/yHYTe3+LJisIUqBxblQ6xK6IM+qA
+3fY646YnPT5pvdZAPZ2BCN/xP3xqGffFKapQ9cz0/36YE3vaEoUDlC2VHK0OXI0t
+4CLwAmiptUT2GW4Bk1RtokAsFiUNwNIOlRX5bywUNwkG7EuitR90QSGH3l/vyii2
+0c1Fm9He9MskwipjXpJKKb+t+m1pdpOVkSjRfjmVqi4BZwWlnQjELSLywhJ+WZG2
+Z1NgRjzPXotFKK+YD97Kx1L260A1eUZ46zSq73oUZr0EDZRnNJTr6A==
+-----END X509 CRL-----
+-----BEGIN X509 CRL-----
+MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD
+VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v
+dDETMBEGA1UEAwwKcGFydG5lcmJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmJj
+YUBwYXJ0bmVyYi5jb20XDTIxMDcwOTE5MTIzNVoXDTIyMDcwOTE5MTIzNVowTjAl
+AhQTZhDgbKuvX7iLRUBBTiWXBPKM1xcNMjEwNzA5MTkxMjM1WjAlAhRfayZVPVOi
+XRSHiv8UaI2qMR3XORcNMjEwNzA5MTkxMjM1WqAOMAwwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAMIltmJ036f1BmK/baISJTZTu7PKZgSZMNORnpFT8KvC
+s2GNRor5bGp5qvD6LHvsx92YVppCC6xd/beCFBtdyYifqw5xtOvqLQKuqCfxruLz
+EqYjKXE/3v8VdyU71J7kFqi0U0Gy4/h/YCL92e5KNbATlmcn5ToyI2EBIEfBfV08
+mm7FBXvbHRzqhfrnCNEjBWBWz3zkJMc9Rib26eCCofYIDkY2HvYSN78YgrnMmD6O
+hWOXrPoxArxvmDr5rG4vCadqbQYRkkCAOP0hBeMiB0SAcO2W2LNNAmHWXX7FvU3n
+ZRZUX31WoVjhNeEQtNBb2mPYBXHQzLC66qYm1p97afc=
+-----END X509 CRL-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator3/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/keys.p12
new file mode 100644
index 00000000000..b36ede08e5a
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/keys.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator3/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/keystore.jks
new file mode 100644
index 00000000000..228bb46ce74
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/keystore.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator3/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/nss.cfg
new file mode 100644
index 00000000000..d2c68dae6c4
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/nss.cfg
@@ -0,0 +1,6 @@
+
+name = NSScrypto-validator3
+nssSecmodDirectory = ./src/test/resources/pki-certs/validator3/nssdb
+nssDbMode = readOnly
+nssModule = keystore
+    
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator3/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/nssdb/cert8.db
new file mode 100644
index 00000000000..cbfa00c240b
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/nssdb/cert8.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator3/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/nssdb/key3.db
new file mode 100644
index 00000000000..6414460a69c
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/nssdb/key3.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator3/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/nssdb/secmod.db
new file mode 100644
index 00000000000..75bd6e3d96d
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/nssdb/secmod.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator3/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/nsspin.txt
new file mode 100644
index 00000000000..5271a526801
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/nsspin.txt
@@ -0,0 +1 @@
+test123
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator3/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/ssl-ca.pem
new file mode 100644
index 00000000000..a5fdc343f56
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/ssl-ca.pem
@@ -0,0 +1,70 @@
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBMwDQYJKoZIhvcNAQEL
+BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
+KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTEyMThaGA8y
+MTIxMDYxNTE5MTIxOFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
+A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
+cGFydG5lcmNjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmNjYUBwYXJ0bmVyYy5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+31Xz+vdtagGGF4Zs
+JPzLNkPRWUZ2aB2nB6O3GFFItRERIeKQQ809jpuWb+3nPwmHgAeu/5KDuHExXUp3
+zsq/pBhjmIxysN/tSB0ZWgnDZj0T/O1cFxmFPSIQi2YqN9ex/k1P0A/bPLYid6sp
+BrMB2oDuemjG9OL8zwWxTWFstwMZgh+PUoLv4xPt3vnv8hiBvMxIRe2IjseFRvR9
+zoaxAW94oeLPngPgWanUZvU+hL0BR2h0RZbsmPciw4K7PzHKCfOnDcJN3/k32GuQ
+1ETYXVqBZstMwZ/yUAZzHDUFuungfM/VyuVVqjV1Njmi1ulrZNaLj3pe+x0WwrXq
+VbgfAgMBAAGjZjBkMB0GA1UdDgQWBBRoOd/JgcA/UZW816OxlkI45xhLJDAfBgNV
+HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAbIUXWJ1SU2cwnGfJ
+gor9Y3QX8q3bLRBQ6nuVXUhyHtOKnecEYY+6cvTgAy4tcaEbTrmXnIwwddzWXR5c
+IEgpem6t9tJqjvDZ3SMmlIf57L/rKp1rQQXmOBm2fBy86zC6RChYMshf9LQ3pCeZ
+kESZ+WzHqmTDe2vpe3AaZTsGy+HucyVv5Ha5WLATFMPSMbY76sMbFDEr8viskCNm
+JzDvYbqHMfZUJu4eiWiRJ8v6GY1HJ8SJrFUz2ry6WNYiizoEABHC8VrWV+Kss1Vq
+MiFfAZND4wBS5TZmaKi4BQt/+cnUAX0ej6wYSug/+Atz9DSu/b+AsEZ5tXnxDMGO
+vqwj8g==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
+AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
+4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
+7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
+jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
+m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
+Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
+AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
+gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
+TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
+8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
+c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
+xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
+Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
+AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
+Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
+fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
+kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
+PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
+XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
+uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
+BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
+OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
+oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
+JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
+9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
+h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
+-----END CERTIFICATE-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator3/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/ssl.pem
new file mode 100644
index 00000000000..474187b0e21
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/ssl.pem
@@ -0,0 +1,126 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDW0t2JaCSa2iXy
+7Njgdb7vpTBUxYV44tueVscVtVEAKbe9HN0iOro3cmHymmujuxmqXJA4bHK8OqeX
+fsWoyhnK17aRXhRGUNHcd7OTLSsmWgLsTCQ3syfYrC1G8Dbgggdw7gp/KXDfHRLc
+WZY/1H2JSH0QJwTyiNPE1Jhz7Dw2YHlTE5iOC95g02ABXI7LLiB1DvTkjwkBT9bk
+Bcokx8OgX/aUScV4OJsMcog+zf2bic/lcU/SI/wPSu95EGmLB/0PER8TOCbp+GTk
+Q1CiIkL1ZSjW6JtRwGhPoc3JGhKED5P+y1t6LHdE3wBbX37AfcPJqd4vMErlkn98
+1spNvckHAgMBAAECggEBALhlG5/ccr8wzS4tuyNALnqJsmixexX+tEC/f/fUQQkA
+xiRf6Dh/bGQ3nHefsRFDgo5HEcw82mdTeZOCT6vIfkcszhsNRB3vNZQmc0+7j7RF
+wwiNevEMqQFFGUAw5Qnk0vpOeVgZfDcnP49AnsV/YZo7TI5Wz9pXNF9ZlNq8Rhrt
+NYTF92vzWfrCskQnYL2Tn29qUTWIvsqq6wt7oR0NKwTfbm4420ZGbpAKgtVWsnXN
+13nRhAgB7aNEAAXn9FsRjn/aVaOLWv8rfL7AnWx/DREMOBOKNUIW7mkT4xwNFrnl
+kVS4mjnMRVtMG+/xK781E9voJ+2GYXiCE3ldEY1ZhDECgYEA9I7ej9ZWYLwnf6jS
+IsRDWLwqLsy5upHv88zeqGTNR/kiO8On5+GMaFT93II53TQk+gLBTdmUYR1jYdq+
+raR9nOSVjV35kE747NZIhqRGkMCJg3qLLF7haK5bvynAD60dIpme6IiDEKLjgPmr
+k2CQo0rPIASed+vXpdYVYGVsaMUCgYEA4N/cLv/Mi59tAdFNUaxyIAVgFD++bG1r
+RkJmhYcCqj563kIRhqd+YtWhtedeBMTrmMBztd/1p1qjUmnB/drhvl60J+4WoULR
+1YSA1hLOz25iGTBEPJH05115hD4OC7o2R88NdC4TYizIqzSbyuYIw3kTLGDzO9b9
+wYaR4+TdD1sCgYEAo8a985O1uwimZw6200OeWmGA2mCODQzIpfvQLPN8qjOEooNw
+AZEBx6kLbU3k1GekT63iqHEKtlLJCHJGeeELojNOmCKUC/lnKKyEW27ONwhJzzwU
+0f0kdUc29/lMvvLO7Sn1yoIJS+3Z77jEF2l203Q465dMTMErZMrO/ARQKoUCgYBW
+n0T0wcpsGjxmT9al2HSZyxhIlIlowPlqthdB5lDrfWfdB7wyj4CK19oT9Qztb2GF
+lNS9wYiiL7LsAxscC12b9GUXYIpNEi08P29VhyctFkspgsM2Rc799K7jdvf4IoHY
+RXTcRQdocPHXqUs97ECB87ikBrCLY3SaQJkgHT/eMwKBgGRqRCW3J+DHaGYVrfFh
+jTtVnMAw+eNMrfEzbueav8XYFDA035lHANMaW1ImCEnGcNxTKTNHYlEI+GJGlf3j
+nLyFxHt2t7t3EH+Z1TRBpTWcI9NIBA9suGSwHF6JSYYoP/XycknvHR3CKnptVqEh
+2BvRskmyqDqlJ3or8iilBVG4
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIEvjCCA6agAwIBAgIUeHwvCYkMzLzluPyGlFa5V/lmFnowDQYJKoZIhvcNAQEL
+BQAwgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw
+CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwKcGFydG5lcmNjYTEm
+MCQGCSqGSIb3DQEJARYXcGFydG5lcmNjYUBwYXJ0bmVyYy5jb20wIBcNMjEwNzA5
+MTkxMjE4WhgPMjEyMTA2MTUxOTEyMThaMIGBMQswCQYDVQQGEwJVUzELMAkGA1UE
+CAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTALBgNVBAsMBHJvb3Qx
+EzARBgNVBAMMCnZhbGlkYXRvcjMxJjAkBgkqhkiG9w0BCQEWF3ZhbGlkYXRvcjNA
+cGFydG5lcmMuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1tLd
+iWgkmtol8uzY4HW+76UwVMWFeOLbnlbHFbVRACm3vRzdIjq6N3Jh8ppro7sZqlyQ
+OGxyvDqnl37FqMoZyte2kV4URlDR3Hezky0rJloC7EwkN7Mn2KwtRvA24IIHcO4K
+fylw3x0S3FmWP9R9iUh9ECcE8ojTxNSYc+w8NmB5UxOYjgveYNNgAVyOyy4gdQ70
+5I8JAU/W5AXKJMfDoF/2lEnFeDibDHKIPs39m4nP5XFP0iP8D0rveRBpiwf9DxEf
+Ezgm6fhk5ENQoiJC9WUo1uibUcBoT6HNyRoShA+T/stbeix3RN8AW19+wH3Dyane
+LzBK5ZJ/fNbKTb3JBwIDAQABo4IBKDCCASQwEQYJYIZIAYb4QgEBBAQDAgbAMB0G
+A1UdDgQWBBSl7BsGlNKcg8bg/9K/Pt6beFmUbDAJBgNVHRMEAjAAMA4GA1UdDwEB
+/wQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwgbUGA1UdIwSB
+rTCBqoAUaDnfyYHAP1GVvNejsZZCOOcYSyShfKR6MHgxCzAJBgNVBAYTAlVTMQsw
+CQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwE
+cm9vdDEQMA4GA1UEAwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBh
+ZG1pbi5jb22CFHAEyPzePSbGcgLskvIH1ugaaXQTMA0GCSqGSIb3DQEBCwUAA4IB
+AQAM49KuL0GR6f9O6bS8YkPNcNcOP3y5AbGzV08boCHcnL0iJmSyUoYwD4ksEj+Z
+41YcBOGtPE++MR27LvpMXV6wMoJvmg4G97M1Oql+fs+eZnKyWRuQSWoCLUpsh5Cq
+j9QUHv95xUyadH3HSQnDHd2Khhsu60MEqF6wuyU+EsjoNp5Ejsmk0DDWobXPwA8K
+WaqyleZOjA52HeRwAeextO9Zvv4yJX/I/DeGf3LTPz8IAE0rLXROpEj31rX0CeKA
+BPiBVVn0qRTeimjm9G22AUwKKBNCta2plMkbq2shHAKTXWzI72aW6kHHG35zdXWV
+qnQZrcVShlqsexiZAGRfKqsb
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBMwDQYJKoZIhvcNAQEL
+BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
+KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTEyMThaGA8y
+MTIxMDYxNTE5MTIxOFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
+A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
+cGFydG5lcmNjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmNjYUBwYXJ0bmVyYy5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+31Xz+vdtagGGF4Zs
+JPzLNkPRWUZ2aB2nB6O3GFFItRERIeKQQ809jpuWb+3nPwmHgAeu/5KDuHExXUp3
+zsq/pBhjmIxysN/tSB0ZWgnDZj0T/O1cFxmFPSIQi2YqN9ex/k1P0A/bPLYid6sp
+BrMB2oDuemjG9OL8zwWxTWFstwMZgh+PUoLv4xPt3vnv8hiBvMxIRe2IjseFRvR9
+zoaxAW94oeLPngPgWanUZvU+hL0BR2h0RZbsmPciw4K7PzHKCfOnDcJN3/k32GuQ
+1ETYXVqBZstMwZ/yUAZzHDUFuungfM/VyuVVqjV1Njmi1ulrZNaLj3pe+x0WwrXq
+VbgfAgMBAAGjZjBkMB0GA1UdDgQWBBRoOd/JgcA/UZW816OxlkI45xhLJDAfBgNV
+HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAbIUXWJ1SU2cwnGfJ
+gor9Y3QX8q3bLRBQ6nuVXUhyHtOKnecEYY+6cvTgAy4tcaEbTrmXnIwwddzWXR5c
+IEgpem6t9tJqjvDZ3SMmlIf57L/rKp1rQQXmOBm2fBy86zC6RChYMshf9LQ3pCeZ
+kESZ+WzHqmTDe2vpe3AaZTsGy+HucyVv5Ha5WLATFMPSMbY76sMbFDEr8viskCNm
+JzDvYbqHMfZUJu4eiWiRJ8v6GY1HJ8SJrFUz2ry6WNYiizoEABHC8VrWV+Kss1Vq
+MiFfAZND4wBS5TZmaKi4BQt/+cnUAX0ej6wYSug/+Atz9DSu/b+AsEZ5tXnxDMGO
+vqwj8g==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
+AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
+4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
+7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
+jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
+m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
+Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
+AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
+gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
+TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
+8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
+c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
+xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
+Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
+AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
+Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
+fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
+kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
+PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
+XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
+uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
+BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
+OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
+oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
+JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
+9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
+h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
+-----END CERTIFICATE-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator3/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/truststore.jks
new file mode 100644
index 00000000000..7acd9015b86
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator3/truststore.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator4/crl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/crl.pem
new file mode 100644
index 00000000000..8ced006c911
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/crl.pem
@@ -0,0 +1,27 @@
+-----BEGIN X509 CRL-----
+MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNV
+BAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJBgNVBAoMAk1DMQ0wCwYDVQQLDARyb290
+MRMwEQYDVQQDDApwYXJ0bmVyYWNhMSYwJAYJKoZIhvcNAQkBFhdwYXJ0bmVyYWNh
+QHBhcnRuZXJhLmNvbRcNMjEwNzA5MTkxMjM1WhcNMjIwNzA5MTkxMjM1WjAnMCUC
+FF9rJlU9U6JdFIeK/xRojaoxHdc5Fw0yMTA3MDkxOTEyMzVaoA4wDDAKBgNVHRQE
+AwIBADANBgkqhkiG9w0BAQsFAAOCAQEAfByR//FGHSsVQbaS51d59o82XocOGnnT
+p1hjceqtLGv3bhiebVrsRCOB5TsvE/r2IbB/yHYTe3+LJisIUqBxblQ6xK6IM+qA
+3fY646YnPT5pvdZAPZ2BCN/xP3xqGffFKapQ9cz0/36YE3vaEoUDlC2VHK0OXI0t
+4CLwAmiptUT2GW4Bk1RtokAsFiUNwNIOlRX5bywUNwkG7EuitR90QSGH3l/vyii2
+0c1Fm9He9MskwipjXpJKKb+t+m1pdpOVkSjRfjmVqi4BZwWlnQjELSLywhJ+WZG2
+Z1NgRjzPXotFKK+YD97Kx1L260A1eUZ46zSq73oUZr0EDZRnNJTr6A==
+-----END X509 CRL-----
+-----BEGIN X509 CRL-----
+MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD
+VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v
+dDETMBEGA1UEAwwKcGFydG5lcmJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmJj
+YUBwYXJ0bmVyYi5jb20XDTIxMDcwOTE5MTIzNVoXDTIyMDcwOTE5MTIzNVowTjAl
+AhQTZhDgbKuvX7iLRUBBTiWXBPKM1xcNMjEwNzA5MTkxMjM1WjAlAhRfayZVPVOi
+XRSHiv8UaI2qMR3XORcNMjEwNzA5MTkxMjM1WqAOMAwwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAMIltmJ036f1BmK/baISJTZTu7PKZgSZMNORnpFT8KvC
+s2GNRor5bGp5qvD6LHvsx92YVppCC6xd/beCFBtdyYifqw5xtOvqLQKuqCfxruLz
+EqYjKXE/3v8VdyU71J7kFqi0U0Gy4/h/YCL92e5KNbATlmcn5ToyI2EBIEfBfV08
+mm7FBXvbHRzqhfrnCNEjBWBWz3zkJMc9Rib26eCCofYIDkY2HvYSN78YgrnMmD6O
+hWOXrPoxArxvmDr5rG4vCadqbQYRkkCAOP0hBeMiB0SAcO2W2LNNAmHWXX7FvU3n
+ZRZUX31WoVjhNeEQtNBb2mPYBXHQzLC66qYm1p97afc=
+-----END X509 CRL-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator4/keys.p12 b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/keys.p12
new file mode 100644
index 00000000000..70373b93084
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/keys.p12 differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator4/keystore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/keystore.jks
new file mode 100644
index 00000000000..ef941f664e3
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/keystore.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator4/nss.cfg b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/nss.cfg
new file mode 100644
index 00000000000..c114f78b09d
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/nss.cfg
@@ -0,0 +1,6 @@
+
+name = NSScrypto-validator4
+nssSecmodDirectory = ./src/test/resources/pki-certs/validator4/nssdb
+nssDbMode = readOnly
+nssModule = keystore
+    
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator4/nssdb/cert8.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/nssdb/cert8.db
new file mode 100644
index 00000000000..7c94b589ac7
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/nssdb/cert8.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator4/nssdb/key3.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/nssdb/key3.db
new file mode 100644
index 00000000000..0b60173dbf9
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/nssdb/key3.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator4/nssdb/secmod.db b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/nssdb/secmod.db
new file mode 100644
index 00000000000..346dc33e691
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/nssdb/secmod.db differ
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator4/nsspin.txt b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/nsspin.txt
new file mode 100644
index 00000000000..5271a526801
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/nsspin.txt
@@ -0,0 +1 @@
+test123
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator4/ssl-ca.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/ssl-ca.pem
new file mode 100644
index 00000000000..8a3ea186f1c
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/ssl-ca.pem
@@ -0,0 +1,70 @@
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBQwDQYJKoZIhvcNAQEL
+BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
+KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTEyMjRaGA8y
+MTIxMDYxNTE5MTIyNFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
+A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
+cGFydG5lcmRjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmRjYUBwYXJ0bmVyZC5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbWjqued8UEhetS67V
+pNCkbCBjdeSXyjZgEIxMqmPILY6oymkClkty1ktxMYkEKcDi44+oCq93MIQOAkHx
+qRGlu+z9Eql/aEJzVu85gIfa+64/GJ5OgGIqfI0XOaETu1MGhZN3P7Kb38tmqX7l
+ppP/lfADvdlA/C+SY21Y2OMmeXo8VUtrW5YcUZ2OHt6esFZHCanI7FGYi7A71l/R
+3ZXX1BVvHYJlssY5GwBLT3Yng6sshMihhXviU4f+RBEUm1pSRG/P+0RSjQVyp3bW
+EiwXHu0WD9j7Kjgesrz7J2mFTgjNEQQ6lQioN6ZCrboM6WbxWM2zzSWCPSV/ON1W
+QUVTAgMBAAGjZjBkMB0GA1UdDgQWBBRdtro7rYf1BatcNzBHlkpYj4sW7jAfBgNV
+HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAJd86d928wxKO8C6+
+VksOT7G2RcYNk9ok90bcAJdj6zAhEM4h5XZPomHYibKvdmGD1IH2TlzX+P4+Z2tc
+mHOkpHCa99vwGlIeb+objfR5fYrZDPlFMfYdzeesXhlmZ5j9bzxMUEAMGVCZOm99
+Gq+uHoj1+bPaLkyaFfETchhlXw6EYXoM5bkdXGZMnXvL3DWWvPauA53tUiRh++Q7
+bPCSbmT9YooVbjqyT2IGzIWXzU0O6u5H4PHMNs+DCiGcoTqvC9uZDcU0l+4g6UV7
+v83YnAhDr+Ed/WJ8EpfvbxmNFu5d/SCmmzJnv2sBn27//q4xUNxV9OaNkbxzVOwd
+cQyzwQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
+AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
+4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
+7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
+jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
+m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
+Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
+AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
+gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
+TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
+8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
+c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
+xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
+Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
+AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
+Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
+fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
+kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
+PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
+XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
+uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
+BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
+OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
+oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
+JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
+9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
+h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
+-----END CERTIFICATE-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator4/ssl.pem b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/ssl.pem
new file mode 100644
index 00000000000..75a6df9ec29
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/ssl.pem
@@ -0,0 +1,126 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC4R9B0DJ8/0ZNm
+0dOt8wv86NvtIXFggiIol5YhOeCP2uHNDZd+B5IfigMHJKNVW5lB0pxgltSM8T8v
+R8zIUV1KcBkdbG0LXd6RBu8T7MtuGpIYkPG+PNXp6VNWG5e6+3IdtFp6tsg+ht6K
+qgzp4n5ILjibZRQpSPSn37vw6D2v/HHH9MXOUIraMenB+RixTM+5F/eArNOrKxtn
+DEXPMTA0kb5LGQsRm4S7new8opAIGaCXtGnhFgZYvmD/GlZQmYgPVw/IaRjHy69D
+6/6ogtoKwrdGJoI36IUB6Obvz/VVxl1BZ0H05PPb0warAH2gmeAIYgHQs3lMjyLw
+Qy04dBIhAgMBAAECggEBAIBNV8AErbekNclnm8bHqngKtFyUZTi5QgkbCWbWwhfG
+YGIA7ZHMuZsF3vfRNXsPjFO8zC2fthrvOHu1tMlfhOF3zLSksgMw9u3ocvpfan+d
+NkyuVfGKr7DtR51zFqATwy8VS82WhzKpejX3EYihriSZMcZXiML5zYU4C8U+HPzy
+Sq0SCbpMd+3yXHu3RKJKDXtvXwF+6Iu3Pcgir7zAP8kRqpnnb/Ve3qyzkXtZhhHg
+ka2+1EfEFw8YoI/VKe81Y1hS+Ra2A+a/iYgDnqpD0C1Aa2/1Yf5zBP7oXlrQyOP/
+N9Of6yOgWWQixcl+26cnJ65JN1NlyBmZc3SJTDkMvsUCgYEA4SeeyCBNOl0ehOfw
+DkifuVUetFW8BsCq2TjvLoWYAK2Atc90tNfvN7z/f5Mw47s7THLoFxyhGLMnXa9W
+FSkg4baSwUrHlUyMC4bQ1BK6tsfv+zbc5xoGQr1B256wZPQ4Ab5RrJ8NgnrPqAgq
+CnfDiFph1YoFG93QUmeBl+5WY0MCgYEA0YaymqLi4+a5joab67SNyEdjoPVq0RBz
+jyozVOHiJCL2SMaWGpTcZieDHgaq4uBrkD81mRR+XEjBWIgxT+QK+phapHHjOy5A
+8f2Knr0+Pb9n5t7+Xq0V1siDZkGDokkJqOGa83nUeY/ZMju8czoOj3CMwEEb/C8q
+Gm4DMX0TdMsCgYAcyG3Z85cr0N+n6eacTNhuXt1P/G3PBy5QGqEo91cZLxT3KRAo
+Vjp0i6q16mEjm7nW6hGVcsl9WNm9dj6w8dMMR8S3BRJCmciFaLSlh8dqumCJYtgW
+ixMl0P/sTXsLTNUkE+ppAOQ/O+fz+Sc2s1zBv5wmKkDA8ThCcIz2mTdd9QKBgBNd
+WJp0HXYkt9eVV0nEiSoOdwXESNgDpjqAEvhwW/8tAAgf2nWgdnI2iqa2xQps5WQS
+g3ifbUJIMx5kj/IrSFx6wj3ajL7Gepgi77HWGa+JRigPSgEkDBWquII14d2Y1Hy4
+RSLlip6ljdRXswYPQpM9OrT2D4kSLtj8e+0R+z9bAoGBAIvnrMlmScUlshKO8Z9Y
+x7Xxmtwsagv/TYuaJcizTzUOZ5VcHTrZXd9oAzmaITmw0VxOsb2wbm7OvIsV/iqr
+0GmAeWBMl00dHnvqLSH1fO59THpYxBuH612OIGMdJ3qYguqzSTrRPN3C1ivTH2U8
+qy4tgRxhH9uSfnZ+H6RfL5Ph
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIEvjCCA6agAwIBAgIUBBRpdaDIsULA/tPnSkiiUQ2MPqgwDQYJKoZIhvcNAQEL
+BQAwgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw
+CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwKcGFydG5lcmRjYTEm
+MCQGCSqGSIb3DQEJARYXcGFydG5lcmRjYUBwYXJ0bmVyZC5jb20wIBcNMjEwNzA5
+MTkxMjI1WhgPMjEyMTA2MTUxOTEyMjVaMIGBMQswCQYDVQQGEwJVUzELMAkGA1UE
+CAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTALBgNVBAsMBHJvb3Qx
+EzARBgNVBAMMCnZhbGlkYXRvcjQxJjAkBgkqhkiG9w0BCQEWF3ZhbGlkYXRvcjRA
+cGFydG5lcmQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuEfQ
+dAyfP9GTZtHTrfML/Ojb7SFxYIIiKJeWITngj9rhzQ2XfgeSH4oDBySjVVuZQdKc
+YJbUjPE/L0fMyFFdSnAZHWxtC13ekQbvE+zLbhqSGJDxvjzV6elTVhuXuvtyHbRa
+erbIPobeiqoM6eJ+SC44m2UUKUj0p9+78Og9r/xxx/TFzlCK2jHpwfkYsUzPuRf3
+gKzTqysbZwxFzzEwNJG+SxkLEZuEu53sPKKQCBmgl7Rp4RYGWL5g/xpWUJmID1cP
+yGkYx8uvQ+v+qILaCsK3RiaCN+iFAejm78/1VcZdQWdB9OTz29MGqwB9oJngCGIB
+0LN5TI8i8EMtOHQSIQIDAQABo4IBKDCCASQwEQYJYIZIAYb4QgEBBAQDAgbAMB0G
+A1UdDgQWBBTiYWgjfuJswsCgAvS4hMukchm0/TAJBgNVHRMEAjAAMA4GA1UdDwEB
+/wQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwgbUGA1UdIwSB
+rTCBqoAUXba6O62H9QWrXDcwR5ZKWI+LFu6hfKR6MHgxCzAJBgNVBAYTAlVTMQsw
+CQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwE
+cm9vdDEQMA4GA1UEAwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBh
+ZG1pbi5jb22CFHAEyPzePSbGcgLskvIH1ugaaXQUMA0GCSqGSIb3DQEBCwUAA4IB
+AQB0yQiERMtzUId9mShNX/h09rI74S1e2YNNppGXaDv+ZAKoutYDaP/V1LLnQJ7a
+aChpGIW4O66d2I0y5On8SbNTIxXhfJhqQd/vWPGEozekFw2+gaH6D3rqghQUNT4V
+6gV7WRRCn5TgXZ7wDfWQua7/H1A7B+Axg19n5if9wUo3bvvwrk2q9vFj0D/jGTVd
+LLoROx5dif+urxwPouwpe11rJouuolSRlkxC9kaFvWpR1ELLfrYG0fj6tFUSUNuw
+p+lNisyoifUgHlzARnNCXCilAo4yq9dcYXHeY+0uB1pY1Na/xiue21GUTAVtpr4a
+QvnaWDse4YykkozutA/iETLW
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIUcATI/N49JsZyAuyS8gfW6BppdBQwDQYJKoZIhvcNAQEL
+BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
+KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA3MDkxOTEyMjRaGA8y
+MTIxMDYxNTE5MTIyNFowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
+A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
+cGFydG5lcmRjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcmRjYUBwYXJ0bmVyZC5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbWjqued8UEhetS67V
+pNCkbCBjdeSXyjZgEIxMqmPILY6oymkClkty1ktxMYkEKcDi44+oCq93MIQOAkHx
+qRGlu+z9Eql/aEJzVu85gIfa+64/GJ5OgGIqfI0XOaETu1MGhZN3P7Kb38tmqX7l
+ppP/lfADvdlA/C+SY21Y2OMmeXo8VUtrW5YcUZ2OHt6esFZHCanI7FGYi7A71l/R
+3ZXX1BVvHYJlssY5GwBLT3Yng6sshMihhXviU4f+RBEUm1pSRG/P+0RSjQVyp3bW
+EiwXHu0WD9j7Kjgesrz7J2mFTgjNEQQ6lQioN6ZCrboM6WbxWM2zzSWCPSV/ON1W
+QUVTAgMBAAGjZjBkMB0GA1UdDgQWBBRdtro7rYf1BatcNzBHlkpYj4sW7jAfBgNV
+HSMEGDAWgBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAJd86d928wxKO8C6+
+VksOT7G2RcYNk9ok90bcAJdj6zAhEM4h5XZPomHYibKvdmGD1IH2TlzX+P4+Z2tc
+mHOkpHCa99vwGlIeb+objfR5fYrZDPlFMfYdzeesXhlmZ5j9bzxMUEAMGVCZOm99
+Gq+uHoj1+bPaLkyaFfETchhlXw6EYXoM5bkdXGZMnXvL3DWWvPauA53tUiRh++Q7
+bPCSbmT9YooVbjqyT2IGzIWXzU0O6u5H4PHMNs+DCiGcoTqvC9uZDcU0l+4g6UV7
+v83YnAhDr+Ed/WJ8EpfvbxmNFu5d/SCmmzJnv2sBn27//q4xUNxV9OaNkbxzVOwd
+cQyzwQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID6jCCAtKgAwIBAgIUYdazVD+VnI7jBu7xLaW+npfwHJIwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
+AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ8QgVwEjy3CgJFvET7tYNBw97
+4i33EHQT4ZuayGCJ+ADY3ZFpsw2M1IPlbAguqfBkcLd8TAjWNRAdsm9ubGlIcTZr
+7LNle3gvc7qEP4qg0i6M7D06CDqtBaIJ1PMTJchOouGU9ntBe+h0qg8tzpiqJdIw
+jIOPRWW98Hw9KgF6++2jtlcOW1IxiFSWqf0Mpc81qKukcxnsHjvdxmBp/Z1vL42E
+m5xNOGXoxpjq8NygSuVDhQ/bZUnmHLmvv9MXe9Ob52rlzea/YafLpOeNGSA1aCxm
+Fx0lcoXWp4xpoyJn9St7vmH3t7quBKdqt54zwcuHjhgZPSR6RikodKHtsl8TAgMB
+AAGjZjBkMB0GA1UdDgQWBBTdAXu8aBbvkvxYD5Ss9/Ml5VgohjAfBgNVHSMEGDAW
+gBSMsBNO3UGBteMZOTq5fDPG2aPx8DASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEA0hJCtrCI9Mf47+y3pvsTjiaT
+TZwpNE0cdxHjpcCHJWX2jmGbqqA6wvQ7yy4PFarmnFOoW3hQFeiLgpz9X86YTRzF
+8dj3Q2MKXf6i6/iW+Y96GFqurshKp7wV25wfzWwLXcVCiM1xYPWYSyGsZAGotu4M
+c7uolVABjJu5nci9mBxVmaYV5oT1mxrvq3dCPm2AvmVFNWPNRbMSAuT5B7FUDvWG
+xvd1aDFduqL0iLAcrTifMIYI3XL4pBSIlL78dgY45WL6616EF3mHhW/Y4k4PNq1I
+Fz08Q3y99ilhzeAci1jv6KBVHiALZNFFtYjd10KX95qnF9SomBjCTPsQ9PTC5g==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2zCCAsOgAwIBAgIUdxRGMrv1ONRI/dJXUHa3isjVXuwwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNzA5MTkxMTU0
+WhgPMjEyMTA2MTUxOTExNTRaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
+AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Bqlx+ngRZfWjktX6urJ
+Tpg2//n3uMW8Gp55SVq+lbpkNXuA3W0uTlom/2fsnzmMmBAJUvv/NaLcFSN++0/d
+fYGVhogxjlRoyaXa4sdFPg2ocM+lCHLGhWpYuVdTWPknikTOVNbh9z94SLRfrP8N
+kuxGNZNktnVm+QJmrCLmjvnPvQlcP/WqFYehFM26NaRzswOhLLRU1YK8aVlh9Vto
+PGSTPtZK60XwTfyCj/zEvHqpbGbKJPp7W0rpxl7ehPQIzGQt5IMH3zKrqLm4/pt+
+XFEVqy724sstthS73bvXguWxBLOzuMze8CbI6SJpcHaH8HO5pfFMPyE5N5l2x9Co
+uQIDAQABo1MwUTAdBgNVHQ4EFgQUjLATTt1BgbXjGTk6uXwzxtmj8fAwHwYDVR0j
+BBgwFoAUjLATTt1BgbXjGTk6uXwzxtmj8fAwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAL9/7YtxIbuTt7dgH1KOMb/y6P3Qb79fTVZTx073E2ZBj
+OfSuMGUhKC30LWQXCQEsY4WpugJ4cS0NsArSYsO5XWguqgjYlWL6poOmYhGvj7ou
+oi44oYqcPm6EbvLrAKdI67bkbSPLzgs+6TrxTyXHzPKFBqGBnuHaFKjgb4hGiPmd
+JWKrh3fbTtuLjqSHd0Gey2uBNFql4LhPutdsCUhSOD3BibAeTbXyln70AgpTCoWT
+9Qr9Ux6HYIiAHSDBzzuN8EcrlnAm9RO4zRyUVwxDsHoNsOUwybn50IM66p83HuiY
+h/iX5uNjaFAADfRR4rQOwb6MLreVH2XYUSiz4M/ijg==
+-----END CERTIFICATE-----
diff --git a/acceptance-tests/tests/src/test/resources/pki-certs/validator4/truststore.jks b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/truststore.jks
new file mode 100644
index 00000000000..0128950f21c
Binary files /dev/null and b/acceptance-tests/tests/src/test/resources/pki-certs/validator4/truststore.jks differ
diff --git a/acceptance-tests/tests/src/test/resources/qbft/qbft-emptyextradata.json b/acceptance-tests/tests/src/test/resources/qbft/qbft-emptyextradata.json
new file mode 100644
index 00000000000..ada399d0ebc
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/qbft/qbft-emptyextradata.json
@@ -0,0 +1,39 @@
+{
+  "config": {
+    "chainid": 2017,
+    "byzantiumBlock": 0,
+    "qbft": {
+      "blockperiodseconds": 1,
+      "epochlength": 30000,
+      "requesttimeoutseconds": 5,
+      "blockreward": "5000000000000000000"
+    }
+  },
+  "nonce": "0x0",
+  "timestamp": "0x0",
+  "extraData": "0xe5a00000000000000000000000000000000000000000000000000000000000000000c0c080c0",
+  "gasLimit": "0x29b92700",
+  "difficulty": "0x1",
+  "mixHash": "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365",
+  "coinbase": "0x0000000000000000000000000000000000000000",
+  "alloc": {
+    "fe3b557e8fb62b89f4916b721be55ceb828dbd73": {
+      "privateKey": "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "0xad78ebc5ac6200000"
+    },
+    "627306090abaB3A6e1400e9345bC60c78a8BEf57": {
+      "privateKey": "c87509a1c067bbde78beb793e6fa76530b6382a4c0241e5e4a9ec0a0f44dc0d3",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "90000000000000000000000"
+    },
+    "f17f52151EbEF6C7334FAD080c5704D77216b732": {
+      "privateKey": "ae6ae8e5ccbfb04590405997ee2d52d2b330726137b875053c36d94e974d162f",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "90000000000000000000000"
+    }
+  },
+  "number": "0x0",
+  "gasUsed": "0x0",
+  "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+}
diff --git a/acceptance-tests/tests/src/test/resources/qbft/qbft.json b/acceptance-tests/tests/src/test/resources/qbft/qbft.json
new file mode 100644
index 00000000000..b614538b60f
--- /dev/null
+++ b/acceptance-tests/tests/src/test/resources/qbft/qbft.json
@@ -0,0 +1,39 @@
+{
+  "config": {
+    "chainId": 4,
+    "berlinBlock": 0,
+    "qbft": {
+      "blockperiodseconds": 1,
+      "epochlength": 30000,
+      "requesttimeoutseconds": 5,
+      "blockreward": "5000000000000000000"
+    }
+  },
+  "nonce": "0x0",
+  "timestamp": "0x58ee40ba",
+  "extraData": "%extraData%",
+  "gasLimit": "0x47b760",
+  "difficulty": "0x1",
+  "mixHash": "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365",
+  "coinbase": "0x0000000000000000000000000000000000000000",
+  "alloc": {
+    "fe3b557e8fb62b89f4916b721be55ceb828dbd73": {
+      "privateKey": "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "0xad78ebc5ac6200000"
+    },
+    "627306090abaB3A6e1400e9345bC60c78a8BEf57": {
+      "privateKey": "c87509a1c067bbde78beb793e6fa76530b6382a4c0241e5e4a9ec0a0f44dc0d3",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "90000000000000000000000"
+    },
+    "f17f52151EbEF6C7334FAD080c5704D77216b732": {
+      "privateKey": "ae6ae8e5ccbfb04590405997ee2d52d2b330726137b875053c36d94e974d162f",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "90000000000000000000000"
+    }
+  },
+  "number": "0x0",
+  "gasUsed": "0x0",
+  "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+}
diff --git a/benchmark/caliper-benchmarks/.keep b/benchmark/caliper-benchmarks/.keep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/benchmark/config/besu-keystore/key b/benchmark/config/besu-keystore/key
new file mode 100644
index 00000000000..ec25faa230c
--- /dev/null
+++ b/benchmark/config/besu-keystore/key
@@ -0,0 +1 @@
+0xa67bee5d6fb43acd42e307eb67547ab5006ad2fbb9567829e9b4b2ef3580acea
diff --git a/benchmark/config/caliper-benchconfig-offchain.yaml b/benchmark/config/caliper-benchconfig-offchain.yaml
new file mode 100644
index 00000000000..b8fa2f00f8d
--- /dev/null
+++ b/benchmark/config/caliper-benchconfig-offchain.yaml
@@ -0,0 +1,69 @@
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+---
+    test:
+      name: Simple Storage
+      description: Test private transactions
+      workers:
+        type: local
+        number: 1
+      rounds:
+        - label: warm-up (ignore results)
+          txDuration: 10
+          rateControl:
+            type: fixed-load
+            opts:
+              startingTps: 200
+              transactionLoad: 200
+          workload:
+            module: /config/store.js
+            arguments:
+               contract: private_storage_offchain
+               private: legacy_group
+        - label: legacy private transaction (run 1)
+          txDuration: 10
+          rateControl:
+            type: fixed-load
+            opts:
+              startingTps: 200
+              transactionLoad: 200
+          workload:
+            module: /config/store.js
+            arguments:
+               contract: private_storage_offchain
+               private: legacy_group
+        - label: public transaction (run 2)
+          txDuration: 10
+          rateControl:
+            type: fixed-load
+            opts:
+              startingTps: 200
+              transactionLoad: 200
+          workload:
+            module: /config/store.js
+            arguments:
+              contract: public_storage
+        - label: legacy private transaction (run 2)
+          txDuration: 10
+          rateControl:
+            type: fixed-load
+            opts:
+              startingTps: 200
+              transactionLoad: 200
+          workload:
+            module: /config/store.js
+            arguments:
+               contract: private_storage_offchain
+               private: legacy_group
diff --git a/benchmark/config/caliper-benchconfig-onchain.yaml b/benchmark/config/caliper-benchconfig-onchain.yaml
new file mode 100644
index 00000000000..ea307f689ba
--- /dev/null
+++ b/benchmark/config/caliper-benchconfig-onchain.yaml
@@ -0,0 +1,80 @@
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+---
+    test:
+      name: Simple Storage
+      description: Test private transactions
+      workers:
+        type: local
+        number: 1
+      rounds:
+        - label: warm-up (ignore results)
+          txDuration: 10
+          rateControl:
+            type: fixed-load
+            opts:
+              startingTps: 200
+              transactionLoad: 200
+          workload:
+            module: /config/store.js
+            arguments:
+               contract: private_storage_onchain
+               private: onchain_group
+        - label: public transaction (run 1)
+          txDuration: 10
+          rateControl:
+            type: fixed-load
+            opts:
+              startingTps: 200
+              transactionLoad: 200
+          workload:
+            module: /config/store.js
+            arguments:
+              contract: public_storage
+        - label: onchain private transaction (run 1)
+          txDuration: 10
+          rateControl:
+            type: fixed-load
+            opts:
+              startingTps: 200
+              transactionLoad: 200
+          workload:
+            module: /config/store.js
+            arguments:
+               contract: private_storage_onchain
+               private: onchain_group
+        - label: public transaction (run 2)
+          txDuration: 10
+          rateControl:
+            type: fixed-load
+            opts:
+              startingTps: 200
+              transactionLoad: 200
+          workload:
+            module: /config/store.js
+            arguments:
+              contract: public_storage
+        - label: onchain private transaction (run 2)
+          txDuration: 10
+          rateControl:
+            type: fixed-load
+            opts:
+              startingTps: 200
+              transactionLoad: 200
+          workload:
+            module: /config/store.js
+            arguments:
+               contract: private_storage_onchain
+               private: onchain_group
diff --git a/benchmark/config/caliper-networkconfig-offchain.json b/benchmark/config/caliper-networkconfig-offchain.json
new file mode 100644
index 00000000000..c0d15ba3feb
--- /dev/null
+++ b/benchmark/config/caliper-networkconfig-offchain.json
@@ -0,0 +1,35 @@
+{
+    "caliper": {
+        "blockchain": "ethereum"
+    },
+    "ethereum": {
+        "url": "ws://besu:8546",
+        "contractDeployerAddress": "0xD1cf9D73a91DE6630c2bb068Ba5fDdF9F0DEac09",
+        "contractDeployerAddressPrivateKey": "0x797c13f7235c627f6bd013dc17fff4c12213ab49abcf091f77c83f16db10e90b",
+        "fromAddressSeed": "0x3f841bf589fdf83a521e55d51afddc34fa65351161eead24f064855fc29c9580",
+        "transactionConfirmationBlocks": 1,
+        "chainId": 48122,
+         "privacy":  {
+            "legacy_group": {
+                "groupType": "legacy",
+                "privateFrom": "GGilEkXLaQ9yhhtbpBT03Me9iYa7U/mWXxrJhnbl1XY=",
+                "privateFor": ["GGilEkXLaQ9yhhtbpBT03Me9iYa7U/mWXxrJhnbl1XY="]
+            }
+        },
+        "contracts": {
+            "public_storage": {
+                "path": "/config/storage.json",
+                "gas": {
+                    "update": 30000
+                }
+            },
+            "private_storage_offchain": {
+                "path": "/config/storage.json",
+                "gas": {
+                    "update": 30000
+                },
+                "private": "legacy_group"
+            }
+        }
+    }
+}
diff --git a/benchmark/config/caliper-networkconfig-onchain.json b/benchmark/config/caliper-networkconfig-onchain.json
new file mode 100644
index 00000000000..98076790096
--- /dev/null
+++ b/benchmark/config/caliper-networkconfig-onchain.json
@@ -0,0 +1,35 @@
+{
+    "caliper": {
+        "blockchain": "ethereum"
+    },
+    "ethereum": {
+        "url": "ws://besu:8546",
+        "contractDeployerAddress": "0xD1cf9D73a91DE6630c2bb068Ba5fDdF9F0DEac09",
+        "contractDeployerAddressPrivateKey": "0x797c13f7235c627f6bd013dc17fff4c12213ab49abcf091f77c83f16db10e90b",
+        "fromAddressSeed": "0x3f841bf589fdf83a521e55d51afddc34fa65351161eead24f064855fc29c9580",
+        "transactionConfirmationBlocks": 1,
+        "chainId": 48122,
+        "privacy":  {
+            "onchain_group": {
+                "groupType": "onchain",
+                "privateFrom": "GGilEkXLaQ9yhhtbpBT03Me9iYa7U/mWXxrJhnbl1XY=",
+                "privateKey": "uTJGpd4ZEEtDPFSZM0+GT11xn5NFIr2KGP2Q4SdVPRM="
+            }
+        },
+        "contracts": {
+            "public_storage": {
+                "path": "/config/storage.json",
+                "gas": {
+                    "update": 30000
+                }
+            },
+            "private_storage_onchain": {
+                "path": "/config/storage.json",
+                "gas": {
+                    "update": 30000
+                },
+                "private": "onchain_group"
+            }
+        }
+    }
+}
diff --git a/benchmark/config/caliper-offchain.yaml b/benchmark/config/caliper-offchain.yaml
new file mode 100644
index 00000000000..b31252bc102
--- /dev/null
+++ b/benchmark/config/caliper-offchain.yaml
@@ -0,0 +1,31 @@
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+caliper:
+    report:
+        path: 'report-offchain.html'
+    benchconfig: caliper-benchconfig.yaml
+    networkconfig: caliper-networkconfig.json
+    txupdatetime: 500
+    workspace: ./
+    logging:
+        targets:
+            console:
+                target: console
+                enabled: true
+                options:
+                    level: info
+            file:
+                target: file
+                enabled: false
diff --git a/benchmark/config/caliper-onchain.yaml b/benchmark/config/caliper-onchain.yaml
new file mode 100644
index 00000000000..dc35d7dcdda
--- /dev/null
+++ b/benchmark/config/caliper-onchain.yaml
@@ -0,0 +1,49 @@
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+caliper:
+    report:
+        path: 'report-onchain.html'
+    benchconfig: caliper-benchconfig.yaml
+    networkconfig: caliper-networkconfig.json
+    txupdatetime: 500
+    workspace: ./
+    logging:
+        template: '%timestamp%%level%%module%%message%%metadata%'
+        formats:
+            timestamp: 'YYYY.MM.DD-HH:mm:ss.SSS ZZ'
+            label: false
+            json: false
+            pad: true
+            align: false
+            attributeformat:
+                level: ' %attribute%'
+                module: ' [%attribute%] '
+                metadata: ' (%attribute%)'
+            colorize:
+                all: true
+                colors:
+                    info: green
+                    error: red
+                    warn: yellow
+                    debug: grey
+        targets:
+            console:
+                target: console
+                enabled: true
+                options:
+                    level: info
+            file:
+                target: file
+                enabled: false
diff --git a/benchmark/config/genesis.json b/benchmark/config/genesis.json
new file mode 100644
index 00000000000..ad32e929e46
--- /dev/null
+++ b/benchmark/config/genesis.json
@@ -0,0 +1,75 @@
+{
+  "config": {
+    "chainId": 48122,
+    "berlinblock": 0,
+    "clique": {
+      "blockperiodseconds": 1,
+      "epoch": 30000
+    }
+  },
+  "nonce": "0x0",
+  "timestamp": "0x5ca916c6",
+  "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000c0A8e4D217eB85b812aeb1226fAb6F588943C2C20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "gasLimit": "0x47b760",
+  "difficulty": "0x1",
+  "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "coinbase": "0xc0A8e4D217eB85b812aeb1226fAb6F588943C2C2",
+  "number": "0x0",
+  "gasUsed": "0x0",
+  "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "alloc": {
+    "0xc0A8e4D217eB85b812aeb1226fAb6F588943C2C2": {
+      "balance": "0x200000000000000000000000000000000000000000000000000000000000000"
+    },
+    "0xD1cf9D73a91DE6630c2bb068Ba5fDdF9F0DEac09": {
+      "balance": "0x200000000000000000000000000000000000000000000000000000000000000",
+      "privatekey": "0x797c13f7235c627f6bd013dc17fff4c12213ab49abcf091f77c83f16db10e90b",
+      "derivation": "m/44'/60'/0'/0/0"
+    },
+    "0xd826E703658FA2CE8D1018D42E637C08d9846A17": {
+      "balance": "0x200000000000000000000000000000000000000000000000000000000000000",
+      "privatekey": "0x4be84b298ccb944e96befc4f03b943ec13709f6a8e5b5d8595c486dfa88fd254",
+      "derivation": "m/44'/60'/1'/0/0"
+    },
+    "0x247DdfA00415710E0416f8c103b5E6428782C916": {
+      "balance": "0x200000000000000000000000000000000000000000000000000000000000000",
+      "privatekey": "0xaa682edca26f3e17889d69276e6c6a4fcf1594af97e48f4dc3ac6dbb29e7924b",
+      "derivation": "m/44'/60'/2'/0/0"
+    },
+    "0x500a8704F86C0d9126Dfb949fDC4dc248c228fB4": {
+      "balance": "0x200000000000000000000000000000000000000000000000000000000000000",
+      "privatekey": "0x45d09c64e4973b16422b31d5e4a1fbf57ae8fd25037566af8bc1d046022d754b",
+      "derivation": "m/44'/60'/3'/0/0"
+    },
+    "0x32d9ad8F398995fFF658E74430749d65E0ee6702": {
+      "balance": "0x200000000000000000000000000000000000000000000000000000000000000",
+      "privatekey": "0x2f51f2d881e0a6f7f249139a2afe8da084424616d08aa0ce9fb1c960b49f022f",
+      "derivation": "m/44'/60'/4'/0/0"
+    },
+    "0xd32d3f6dA1664C4ee7acae64fEC3661cEa6ee448": {
+      "balance": "0x200000000000000000000000000000000000000000000000000000000000000",
+      "privatekey": "0x87abeb4c0230ca6fdf42f7d2cb2baa510856e42f039ab7670b13845e45dc3245",
+      "derivation": "m/44'/60'/5'/0/0"
+    },
+    "0x5F6C5F2431CE84f2Fa84deB6B27A1764DB6feB1a": {
+      "balance": "0x200000000000000000000000000000000000000000000000000000000000000",
+      "privatekey": "0x5f0ad910e681553c9407582f620d9560541fa8b8c4d03e9e2e3caed5eea6a220",
+      "derivation": "m/44'/60'/6'/0/0"
+    },
+    "0x9fCDe74bf5465D5C32a09f158047803a061B3C1B": {
+      "balance": "0x200000000000000000000000000000000000000000000000000000000000000",
+      "privatekey": "0x76930906e95c96a9be735b0f182184424f450feca5ea71bf743a8c47ea6e2635",
+      "derivation": "m/44'/60'/7'/0/0"
+    },
+    "0xb582703c0a0e2b598f9362A5e5c17Ab6865b0342": {
+      "balance": "0x200000000000000000000000000000000000000000000000000000000000000",
+      "privatekey": "0x32e90654e141cb4f92dd9fccef100778c112636b20b9017a9ae56be9a8c2c648",
+      "derivation": "m/44'/60'/8'/0/0"
+    },
+    "0x179740E29B1E7b2C61F6004b8d5caD575D6eaa88": {
+      "balance": "0x200000000000000000000000000000000000000000000000000000000000000",
+      "privatekey": "0x028bf0ee2807cf9a8d22db99f12aea783a2e6b4897c9ddb7557e33291c7d35c5",
+      "derivation": "m/44'/60'/9'/0/0"
+    }
+  }
+}
diff --git a/benchmark/config/storage.json b/benchmark/config/storage.json
new file mode 100644
index 00000000000..646d67460ac
--- /dev/null
+++ b/benchmark/config/storage.json
@@ -0,0 +1,37 @@
+{
+    "name": "storage",
+    "abi": [
+        {
+            "constant": false,
+            "inputs": [
+                {
+                    "internalType": "uint256",
+                    "name": "_value",
+                    "type": "uint256"
+                }
+            ],
+            "name": "update",
+            "outputs": [],
+            "payable": false,
+            "stateMutability": "nonpayable",
+            "type": "function"
+        },
+        {
+            "constant": true,
+            "inputs": [],
+            "name": "value",
+            "outputs": [
+                {
+                    "internalType": "uint256",
+                    "name": "",
+                    "type": "uint256"
+                }
+            ],
+            "payable": false,
+            "stateMutability": "view",
+            "type": "function"
+        }
+    ],
+    "bytecode": "0x608060405234801561001057600080fd5b5060c38061001f6000396000f3fe6080604052348015600f57600080fd5b506004361060325760003560e01c80633fa4f24514603757806382ab890a146053575b600080fd5b603d607e565b6040518082815260200191505060405180910390f35b607c60048036036020811015606757600080fd5b81019080803590602001909291905050506084565b005b60005481565b806000819055505056fea265627a7a72315820e8496d56b71870b96edb4d71a4fd8101b771c4c269eb0d8ee8c27c6085fa76fc64736f6c63430005110032",
+    "gas": 3000000
+}
\ No newline at end of file
diff --git a/benchmark/config/store.js b/benchmark/config/store.js
new file mode 100644
index 00000000000..454ae0b81a8
--- /dev/null
+++ b/benchmark/config/store.js
@@ -0,0 +1,109 @@
+/*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+'use strict';
+
+const { WorkloadModuleBase } = require('@hyperledger/caliper-core');
+const Web3 = require('web3');
+
+class StoreWorkload extends WorkloadModuleBase {
+
+    /**
+     * Initializes the parameters of the workload.
+     */
+    constructor() {
+        super();
+        this.txIndex = -1;
+        this.private = false;
+        this.contract = {};
+    }
+
+    /**
+     * Generates simple workload.
+     * @returns {{verb: String, args: Object[]}[]} Array of workload argument objects.
+     */
+    _generateWorkload() {
+        let web3 = new Web3(this.nodeUrl);
+
+        let workload = [];
+        for(let i= 0; i < this.roundArguments.txnPerBatch; i++) {
+            this.txIndex++;
+
+            let value = i;
+
+            let args = {
+                contract: this.roundArguments.contract,
+                verb: 'update',
+                args: [value],
+                readOnly: false,
+            }
+
+            if (this.isPrivate) {
+                args.privacy = this.privacyOpts;
+                args.privacy.sender = web3.eth.accounts.create();
+                args.privacy.sender.nonce = 0;
+            }
+
+            workload.push(args);
+        }
+
+        return workload;
+    }
+
+    /**
+     * Initialize the workload module with the given parameters.
+     * @param {number} workerIndex The 0-based index of the worker instantiating the workload module.
+     * @param {number} totalWorkers The total number of workers participating in the round.
+     * @param {number} roundIndex The 0-based index of the currently executing round.
+     * @param {Object} roundArguments The user-provided arguments for the round from the benchmark configuration file.
+     * @param {BlockchainConnector} sutAdapter The adapter of the underlying SUT.
+     * @param {Object} sutContext The custom context object provided by the SUT adapter.
+     * @async
+     */
+    async initializeWorkloadModule(workerIndex, totalWorkers, roundIndex, roundArguments, sutAdapter, sutContext) {
+        await super.initializeWorkloadModule(workerIndex, totalWorkers, roundIndex, roundArguments, sutAdapter, sutContext);
+
+        if (!this.roundArguments.contract) {
+            throw new Error('store - argument "contract" missing');
+        }
+
+        this.nodeUrl = sutContext.url;
+
+        if(this.roundArguments.private) {
+            this.isPrivate = true;
+            this.privacyOpts = sutContext.privacy[this.roundArguments.private];
+            this.privacyOpts['id'] = this.roundArguments.private;
+        } else {
+            this.isPrivate = false;
+        }
+
+        if(!this.roundArguments.txnPerBatch) {
+            this.roundArguments.txnPerBatch = 1;
+        }
+    }
+
+    /**
+     * Assemble TXs for opening new accounts.
+     */
+    async submitTransaction() {
+        let args = this._generateWorkload();
+        await this.sutAdapter.sendRequests(args);
+    }
+}
+
+function createWorkloadModule() {
+    return new StoreWorkload();
+}
+
+module.exports.createWorkloadModule = createWorkloadModule;
\ No newline at end of file
diff --git a/benchmark/config/tessera/config.json b/benchmark/config/tessera/config.json
new file mode 100644
index 00000000000..0901b5f37b9
--- /dev/null
+++ b/benchmark/config/tessera/config.json
@@ -0,0 +1,48 @@
+{
+  "mode": "orion",
+  "useWhiteList": false,
+  "jdbc": {
+    "username": "sa",
+    "password": "",
+    "url": "jdbc:h2:/data/tm/db;MODE=Oracle;TRACE_LEVEL_SYSTEM_OUT=0",
+    "autoCreateTables": true
+  },
+  "serverConfigs": [
+    {
+      "app": "ThirdParty",
+      "serverAddress": "http://tessera:9080",
+      "communicationType": "REST"
+    },
+    {
+      "app": "Q2T",
+      "serverAddress": "http://tessera:9101",
+      "sslConfig": {
+        "tls": "OFF"
+      },
+      "communicationType": "REST"
+    },
+    {
+      "app": "P2P",
+      "serverAddress": "http://tessera:9000",
+      "sslConfig": {
+        "tls": "OFF"
+      },
+      "communicationType": "REST"
+    }
+  ],
+  "peer": [
+    {
+      "url": "http://tessera:9000"
+    }
+  ],
+  "keys": {
+    "passwords": [],
+    "keyData": [
+      {
+          "config": {"data":{"bytes":"uTJGpd4ZEEtDPFSZM0+GT11xn5NFIr2KGP2Q4SdVPRM="},"type":"unlocked"},
+          "publicKey": "GGilEkXLaQ9yhhtbpBT03Me9iYa7U/mWXxrJhnbl1XY="
+      }
+    ]
+  },
+  "alwaysSendTo": []
+}
diff --git a/benchmark/docker-compose.yml b/benchmark/docker-compose.yml
new file mode 100644
index 00000000000..a62afa7b151
--- /dev/null
+++ b/benchmark/docker-compose.yml
@@ -0,0 +1,109 @@
+version: '2'
+
+x-besu:
+  &besu
+  container_name: besu
+  image: "hyperledger/besu:develop"
+  cpuset: 4-5
+  environment:
+    - NODE_INGRESS_CONTRACT_ADDRESS=0x0000000000000000000000000000000000009999
+    - ACCOUNT_INGRESS_CONTRACT_ADDRESS=0x0000000000000000000000000000000000008888
+    - BESU_NODE_PERM_ACCOUNT=D1cf9D73a91DE6630c2bb068Ba5fDdF9F0DEac09
+    - BESU_NODE_PERM_KEY=797c13f7235c627f6bd013dc17fff4c12213ab49abcf091f77c83f16db10e90b
+    - CHAIN_ID=48122
+  volumes:
+    - ./config:/config:ro
+
+x-caliper:
+  &caliper
+  container_name: caliper
+  # TODO: this image is build using the custom branch
+  # https://github.com/taccatisid/caliper/tree/besu-performance-benchmark-container. Once
+  # all the changes of this branch are merged into the caliper main
+  # branch, we should use the official caliper image here.
+  image: "taccatisid/caliper"
+  cpuset: 0-3
+  entrypoint: caliper launch manager
+  volumes:
+    - ./config:/config:ro
+    - ./caliper-benchmarks:/hyperledger/caliper/workspace
+
+services:
+  caliper-offchain:
+    << : *caliper
+    environment:
+      - CALIPER_PROJECTCONFIG=/config/caliper-offchain.yaml
+      - CALIPER_BIND_SUT=besu:latest
+      - CALIPER_BENCHCONFIG=/config/caliper-benchconfig-offchain.yaml
+      - CALIPER_NETWORKCONFIG=/config/caliper-networkconfig-offchain.json
+    depends_on:
+      besu-offchain:
+        condition: service_started
+      tessera:
+        condition: service_healthy
+
+  caliper-onchain:
+    << : *caliper
+    environment:
+      - CALIPER_PROJECTCONFIG=/config/caliper-onchain.yaml
+      - CALIPER_BIND_SUT=besu:latest
+      - CALIPER_BENCHCONFIG=/config/caliper-benchconfig-onchain.yaml
+      - CALIPER_NETWORKCONFIG=/config/caliper-networkconfig-onchain.json
+    depends_on:
+      besu-onchain:
+        condition: service_started
+      tessera:
+        condition: service_healthy
+
+  besu-offchain:
+    << : *besu
+    entrypoint:
+    - /opt/besu/bin/besu
+    - --genesis-file=/config/genesis.json
+    - --node-private-key-file=/config/besu-keystore/key
+    - --min-gas-price=0
+    - --revert-reason-enabled
+    - --rpc-ws-enabled
+    - --rpc-ws-apis=admin,eth,miner,web3,net,priv,eea
+    - --rpc-ws-host=0.0.0.0
+    - --host-whitelist=*
+    - --graphql-http-enabled
+    - --discovery-enabled=false
+    - --privacy-enabled=true
+    - --privacy-url=http://tessera:9101
+    - --privacy-public-key-file=/config/orion/key/orion.pub
+
+  besu-onchain:
+    << : *besu
+    entrypoint:
+    - /opt/besu/bin/besu
+    - --genesis-file=/config/genesis.json
+    - --node-private-key-file=/config/besu-keystore/key
+    - --min-gas-price=0
+    - --revert-reason-enabled
+    - --rpc-ws-enabled
+    - --rpc-ws-apis=admin,eth,miner,web3,net,priv,eea
+    - --rpc-ws-host=0.0.0.0
+    - --host-whitelist=*
+    - --graphql-http-enabled
+    - --discovery-enabled=false
+    - --privacy-enabled=true
+    - --privacy-url=http://tessera:9101
+    - --privacy-public-key-file=/config/orion/key/orion.pub
+    - --privacy-flexible-groups-enabled
+  tessera:
+    container_name: tessera
+    image: quorumengineering/tessera:latest
+    healthcheck:
+      test: ["CMD", "wget", "--spider", "--proxy", "off", "http://localhost:9000/upcheck"]
+      interval: 1s
+      timeout: 1s
+      retries: 10
+    volumes:
+      - ./config/tessera:/config:ro
+    entrypoint:
+      - /bin/sh
+      - -c
+      - |
+        mkdir -p /data/tm/;
+        /tessera/bin/tessera -configfile /config/config.json
diff --git a/besu/build.gradle b/besu/build.gradle
index 936fce81d82..969571b565c 100644
--- a/besu/build.gradle
+++ b/besu/build.gradle
@@ -28,12 +28,17 @@ jar {
 }
 
 dependencies {
+  api 'org.slf4j:slf4j-api'
+
   implementation project(':config')
+  implementation project(':pki')
   implementation project(':consensus:clique')
   implementation project(':consensus:common')
   implementation project(':consensus:ibft')
-  implementation project(':consensus:ibftlegacy')
-  implementation project(':crypto')
+  implementation project(':consensus:merge')
+  implementation project(':consensus:qbft')
+  implementation project(':crypto:services')
+  implementation project(':datatypes')
   implementation project(':enclave')
   implementation project(':ethereum:api')
   implementation project(':ethereum:blockcreation')
@@ -46,63 +51,57 @@ dependencies {
   implementation project(':ethereum:trie')
   implementation project(':ethereum:stratum')
   implementation project(':ethereum:ethstats')
+  implementation project(':evm')
   implementation project(':metrics:core')
   implementation project(':nat')
   implementation project(':plugin-api')
   implementation project(':plugins:rocksdb')
   implementation project(':services:kvstore')
+  implementation project(':util')
 
   implementation 'com.fasterxml.jackson.core:jackson-databind'
   implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8'
+  implementation 'com.github.oshi:oshi-core'
   implementation 'com.google.guava:guava'
+  implementation 'com.google.dagger:dagger'
   implementation 'com.graphql-java:graphql-java'
   implementation 'info.picocli:picocli'
   implementation 'io.vertx:vertx-core'
   implementation 'io.vertx:vertx-web'
-  implementation 'org.apache.logging.log4j:log4j-api'
+  implementation 'org.apache.commons:commons-lang3'
   implementation 'org.apache.logging.log4j:log4j-core'
-  implementation 'org.apache.tuweni:bytes'
-  implementation 'org.apache.tuweni:config'
-  implementation 'org.apache.tuweni:toml'
-  implementation 'org.apache.tuweni:units'
+  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-config'
+  implementation 'org.apache.tuweni:tuweni-toml'
+  implementation 'org.apache.tuweni:tuweni-units'
   implementation 'org.springframework.security:spring-security-crypto'
   implementation 'org.xerial.snappy:snappy-java'
+  implementation 'tech.pegasys:jc-kzg-4844'
 
-
-  runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl'
   runtimeOnly 'org.apache.logging.log4j:log4j-jul'
   runtimeOnly 'com.splunk.logging:splunk-library-javalogging'
   runtimeOnly 'org.fusesource.jansi:jansi' // for color logging in windows
 
   testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
-  testImplementation project(path: ':crypto', configuration: 'testSupportArtifacts')
+  testImplementation project(path: ':crypto:services', configuration: 'testSupportArtifacts')
   testImplementation project(':testutil')
 
   testImplementation 'com.google.auto.service:auto-service'
   testImplementation 'com.squareup.okhttp3:okhttp'
+  testImplementation 'commons-io:commons-io'
+  testImplementation 'io.opentelemetry:opentelemetry-api'
   testImplementation 'junit:junit'
   testImplementation 'org.apache.commons:commons-text'
-  testImplementation 'org.apache.tuweni:bytes'
-  testImplementation 'org.apache.tuweni:units'
+  testImplementation 'org.apache.tuweni:tuweni-bytes'
+  testImplementation 'org.apache.tuweni:tuweni-units'
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.awaitility:awaitility'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.mockito:mockito-core'
-}
+  testImplementation 'org.mockito:mockito-junit-jupiter'
+  testImplementation 'org.testcontainers:testcontainers'
+  testImplementation 'tech.pegasys.discovery:discovery'
 
-task testJar(type: Jar) {
-  archiveFileName = 'testPlugins.jar'
-  manifest {
-    attributes(
-      'Specification-Title': archiveBaseName,
-      'Specification-Version': project.version,
-      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
-      )
-  }
-  archiveClassifier = 'tests'
-  from sourceSets.test.output
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
+  annotationProcessor 'com.google.dagger:dagger-compiler'
 }
-
-configurations { testArtifacts }
-
-artifacts { testArtifacts testJar }
diff --git a/besu/src/main/java/org/hyperledger/besu/Besu.java b/besu/src/main/java/org/hyperledger/besu/Besu.java
index 4760b2cc745..6bdd87d0cff 100644
--- a/besu/src/main/java/org/hyperledger/besu/Besu.java
+++ b/besu/src/main/java/org/hyperledger/besu/Besu.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,48 +14,50 @@
  */
 package org.hyperledger.besu;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
-
-import org.hyperledger.besu.chainexport.RlpBlockExporter;
-import org.hyperledger.besu.chainimport.JsonBlockImporter;
-import org.hyperledger.besu.chainimport.RlpBlockImporter;
 import org.hyperledger.besu.cli.BesuCommand;
 import org.hyperledger.besu.cli.logging.BesuLoggingConfigurationFactory;
-import org.hyperledger.besu.controller.BesuController;
-import org.hyperledger.besu.services.BesuPluginContextImpl;
+import org.hyperledger.besu.components.DaggerBesuComponent;
 
 import io.netty.util.internal.logging.InternalLoggerFactory;
 import io.netty.util.internal.logging.Log4J2LoggerFactory;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import picocli.CommandLine.RunLast;
 
+/** Besu bootstrap class. */
 public final class Besu {
-  private static final int SUCCESS_EXIT_CODE = 0;
-  private static final int ERROR_EXIT_CODE = 1;
 
+  /**
+   * The main entrypoint to Besu application
+   *
+   * @param args command line arguments.
+   */
   public static void main(final String... args) {
-    final Logger logger = setupLogging();
-
-    final BesuCommand besuCommand =
-        new BesuCommand(
-            logger,
-            RlpBlockImporter::new,
-            JsonBlockImporter::new,
-            RlpBlockExporter::new,
-            new RunnerBuilder(),
-            new BesuController.Builder(),
-            new BesuPluginContextImpl(),
-            System.getenv());
+    setupLogging();
+    final BesuCommand besuCommand = DaggerBesuComponent.create().getBesuCommand();
+    int exitCode =
+        besuCommand.parse(
+            new RunLast(),
+            besuCommand.parameterExceptionHandler(),
+            besuCommand.executionExceptionHandler(),
+            System.in,
+            args);
 
-    besuCommand.parse(
-        new RunLast().andExit(SUCCESS_EXIT_CODE),
-        besuCommand.exceptionHandler().andExit(ERROR_EXIT_CODE),
-        System.in,
-        args);
+    System.exit(exitCode);
   }
 
-  private static Logger setupLogging() {
-    InternalLoggerFactory.setDefaultFactory(Log4J2LoggerFactory.INSTANCE);
+  /**
+   * a Logger setup for handling any exceptions during the bootstrap process, to indicate to users
+   * their CLI configuration had problems.
+   */
+  public static void setupLogging() {
+    try {
+      InternalLoggerFactory.setDefaultFactory(Log4J2LoggerFactory.INSTANCE);
+    } catch (Throwable t) {
+      System.out.printf(
+          "Could not set netty log4j logger factory: %s - %s%n",
+          t.getClass().getSimpleName(), t.getMessage());
+    }
     try {
       System.setProperty(
           "vertx.logger-delegate-factory-class-name",
@@ -63,21 +65,31 @@ private static Logger setupLogging() {
       System.setProperty(
           "log4j.configurationFactory", BesuLoggingConfigurationFactory.class.getName());
       System.setProperty("log4j.skipJansi", String.valueOf(false));
-    } catch (SecurityException e) {
-      System.out.println(
-          "Could not set logging system property as the security manager prevented it:"
-              + e.getMessage());
+    } catch (Throwable t) {
+      System.out.printf(
+          "Could not set logging system property: %s - %s%n",
+          t.getClass().getSimpleName(), t.getMessage());
     }
-    final Logger logger = getLogger();
-    Thread.setDefaultUncaughtExceptionHandler(log4jExceptionHandler(logger));
-    Thread.currentThread().setUncaughtExceptionHandler(log4jExceptionHandler(logger));
+  }
+
+  /**
+   * Returns the first logger to be created. This is used to set the default uncaught exception
+   *
+   * @return Logger
+   */
+  public static Logger getFirstLogger() {
+    final Logger logger = LoggerFactory.getLogger(Besu.class);
+    Thread.setDefaultUncaughtExceptionHandler(slf4jExceptionHandler(logger));
+    Thread.currentThread().setUncaughtExceptionHandler(slf4jExceptionHandler(logger));
 
     return logger;
   }
 
-  private static Thread.UncaughtExceptionHandler log4jExceptionHandler(final Logger logger) {
-    return (thread, error) ->
-        logger.error(
-            () -> String.format("Uncaught exception in thread \"%s\"", thread.getName()), error);
+  private static Thread.UncaughtExceptionHandler slf4jExceptionHandler(final Logger logger) {
+    return (thread, error) -> {
+      if (logger.isErrorEnabled()) {
+        logger.error(String.format("Uncaught exception in thread \"%s\"", thread.getName()), error);
+      }
+    };
   }
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/BesuInfo.java b/besu/src/main/java/org/hyperledger/besu/BesuInfo.java
index 7c664ad2832..54447a59600 100644
--- a/besu/src/main/java/org/hyperledger/besu/BesuInfo.java
+++ b/besu/src/main/java/org/hyperledger/besu/BesuInfo.java
@@ -18,6 +18,10 @@
 
 import java.util.Optional;
 
+/**
+ * Represent Besu information such as version, OS etc. Used with --version option and during Besu
+ * start.
+ */
 public final class BesuInfo {
   private static final String CLIENT = "besu";
   private static final String VERSION = BesuInfo.class.getPackage().getImplementationVersion();
@@ -26,10 +30,31 @@ public final class BesuInfo {
 
   private BesuInfo() {}
 
+  /**
+   * Generate version-only Besu version
+   *
+   * @return Besu version in format such as "v23.1.0" or "v23.1.1-dev-ac23d311"
+   */
+  public static String shortVersion() {
+    return VERSION;
+  }
+
+  /**
+   * Generate full Besu version
+   *
+   * @return Besu version in format such as "besu/v23.1.1-dev-ac23d311/osx-x86_64/graalvm-java-17"
+   *     or "besu/v23.1.0/osx-aarch_64/corretto-java-19"
+   */
   public static String version() {
     return String.format("%s/v%s/%s/%s", CLIENT, VERSION, OS, VM);
   }
 
+  /**
+   * Generate node name including identity.
+   *
+   * @param maybeIdentity optional node identity to include in the version string.
+   * @return Version with optional identity if provided.
+   */
   public static String nodeName(final Optional<String> maybeIdentity) {
     return maybeIdentity
         .map(identity -> String.format("%s/%s/v%s/%s/%s", CLIENT, identity, VERSION, OS, VM))
diff --git a/besu/src/main/java/org/hyperledger/besu/Runner.java b/besu/src/main/java/org/hyperledger/besu/Runner.java
index 7180d04209a..32c4a46ddeb 100644
--- a/besu/src/main/java/org/hyperledger/besu/Runner.java
+++ b/besu/src/main/java/org/hyperledger/besu/Runner.java
@@ -16,17 +16,20 @@
 
 import org.hyperledger.besu.controller.BesuController;
 import org.hyperledger.besu.ethereum.api.graphql.GraphQLHttpService;
+import org.hyperledger.besu.ethereum.api.jsonrpc.EngineJsonRpcService;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcHttpService;
+import org.hyperledger.besu.ethereum.api.jsonrpc.ipc.JsonRpcIpcService;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketService;
 import org.hyperledger.besu.ethereum.api.query.cache.AutoTransactionLogBloomCachingService;
 import org.hyperledger.besu.ethereum.api.query.cache.TransactionLogBloomCacher;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolEvictionService;
 import org.hyperledger.besu.ethereum.p2p.network.NetworkRunner;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
 import org.hyperledger.besu.ethereum.stratum.StratumServer;
 import org.hyperledger.besu.ethstats.EthStatsService;
 import org.hyperledger.besu.metrics.MetricsService;
 import org.hyperledger.besu.nat.NatService;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -45,25 +48,29 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import io.vertx.core.Vertx;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Runner controls various Besu services lifecycle. */
 public class Runner implements AutoCloseable {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(Runner.class);
 
   private final Vertx vertx;
   private final CountDownLatch vertxShutdownLatch = new CountDownLatch(1);
   private final CountDownLatch shutdown = new CountDownLatch(1);
 
-  private final NetworkRunner networkRunner;
   private final NatService natService;
-  private final Optional<Path> pidPath;
-  private final Optional<JsonRpcHttpService> jsonRpc;
+  private final NetworkRunner networkRunner;
+  private final Optional<EthStatsService> ethStatsService;
   private final Optional<GraphQLHttpService> graphQLHttp;
-  private final Optional<WebSocketService> websocketRpc;
+  private final Optional<JsonRpcHttpService> jsonRpc;
+  private final Optional<EngineJsonRpcService> engineJsonRpc;
   private final Optional<MetricsService> metrics;
-  private final Optional<EthStatsService> ethStatsService;
+  private final Optional<JsonRpcIpcService> ipcJsonRpc;
+  private final Optional<Path> pidPath;
+  private final Optional<WebSocketService> webSocketRpc;
+  private final TransactionPoolEvictionService transactionPoolEvictionService;
 
   private final BesuController besuController;
   private final Path dataDir;
@@ -71,13 +78,35 @@ public class Runner implements AutoCloseable {
   private final Optional<AutoTransactionLogBloomCachingService>
       autoTransactionLogBloomCachingService;
 
+  /**
+   * Instantiates a new Runner.
+   *
+   * @param vertx the vertx
+   * @param networkRunner the network runner
+   * @param natService the nat service
+   * @param jsonRpc the json rpc
+   * @param engineJsonRpc the engine json rpc
+   * @param graphQLHttp the graph ql http
+   * @param webSocketRpc the web socket rpc
+   * @param ipcJsonRpc the ipc json rpc
+   * @param stratumServer the stratum server
+   * @param metrics the metrics
+   * @param ethStatsService the eth stats service
+   * @param besuController the besu controller
+   * @param dataDir the data dir
+   * @param pidPath the pid path
+   * @param transactionLogBloomCacher the transaction log bloom cacher
+   * @param blockchain the blockchain
+   */
   Runner(
       final Vertx vertx,
       final NetworkRunner networkRunner,
       final NatService natService,
       final Optional<JsonRpcHttpService> jsonRpc,
+      final Optional<EngineJsonRpcService> engineJsonRpc,
       final Optional<GraphQLHttpService> graphQLHttp,
-      final Optional<WebSocketService> websocketRpc,
+      final Optional<WebSocketService> webSocketRpc,
+      final Optional<JsonRpcIpcService> ipcJsonRpc,
       final Optional<StratumServer> stratumServer,
       final Optional<MetricsService> metrics,
       final Optional<EthStatsService> ethStatsService,
@@ -92,7 +121,9 @@ public class Runner implements AutoCloseable {
     this.graphQLHttp = graphQLHttp;
     this.pidPath = pidPath;
     this.jsonRpc = jsonRpc;
-    this.websocketRpc = websocketRpc;
+    this.engineJsonRpc = engineJsonRpc;
+    this.webSocketRpc = webSocketRpc;
+    this.ipcJsonRpc = ipcJsonRpc;
     this.metrics = metrics;
     this.ethStatsService = ethStatsService;
     this.besuController = besuController;
@@ -101,9 +132,36 @@ public class Runner implements AutoCloseable {
     this.autoTransactionLogBloomCachingService =
         transactionLogBloomCacher.map(
             cacher -> new AutoTransactionLogBloomCachingService(blockchain, cacher));
+    this.transactionPoolEvictionService =
+        new TransactionPoolEvictionService(vertx, besuController.getTransactionPool());
+  }
+
+  /** Start external services. */
+  public void startExternalServices() {
+    LOG.info("Starting external services ... ");
+    metrics.ifPresent(service -> waitForServiceToStart("metrics", service.start()));
+
+    jsonRpc.ifPresent(service -> waitForServiceToStart("jsonRpc", service.start()));
+    engineJsonRpc.ifPresent(service -> waitForServiceToStart("engineJsonRpc", service.start()));
+    graphQLHttp.ifPresent(service -> waitForServiceToStart("graphQLHttp", service.start()));
+    webSocketRpc.ifPresent(service -> waitForServiceToStart("websocketRpc", service.start()));
+    ipcJsonRpc.ifPresent(
+        service ->
+            waitForServiceToStart(
+                "ipcJsonRpc", service.start().toCompletionStage().toCompletableFuture()));
+    stratumServer.ifPresent(
+        server ->
+            waitForServiceToStart(
+                "stratum", server.start().toCompletionStage().toCompletableFuture()));
+    autoTransactionLogBloomCachingService.ifPresent(AutoTransactionLogBloomCachingService::start);
   }
 
-  public void start() {
+  private void startExternalServicePostMainLoop() {
+    ethStatsService.ifPresent(EthStatsService::start);
+  }
+
+  /** Start ethereum main loop. */
+  public void startEthereumMainLoop() {
     try {
       LOG.info("Starting Ethereum main loop ... ");
       natService.start();
@@ -112,32 +170,34 @@ public void start() {
         besuController.getSynchronizer().start();
       }
       besuController.getMiningCoordinator().start();
-      stratumServer.ifPresent(server -> waitForServiceToStart("stratum", server.start()));
-      vertx.setPeriodic(
-          TimeUnit.MINUTES.toMillis(1),
-          time ->
-              besuController.getTransactionPool().getPendingTransactions().evictOldTransactions());
-      jsonRpc.ifPresent(service -> waitForServiceToStart("jsonRpc", service.start()));
-      graphQLHttp.ifPresent(service -> waitForServiceToStart("graphQLHttp", service.start()));
-      websocketRpc.ifPresent(service -> waitForServiceToStart("websocketRpc", service.start()));
-      metrics.ifPresent(service -> waitForServiceToStart("metrics", service.start()));
-      ethStatsService.ifPresent(EthStatsService::start);
+      transactionPoolEvictionService.start();
+
       LOG.info("Ethereum main loop is up.");
+      // we write these values to disk to be able to access them during the acceptance tests
       writeBesuPortsToFile();
       writeBesuNetworksToFile();
-      autoTransactionLogBloomCachingService.ifPresent(AutoTransactionLogBloomCachingService::start);
       writePidFile();
 
+      // start external service that depends on information from main loop
+      startExternalServicePostMainLoop();
     } catch (final Exception ex) {
-      LOG.error("Startup failed", ex);
-      throw new IllegalStateException(ex);
+      LOG.error("unable to start main loop", ex);
+      throw new IllegalStateException("Startup failed", ex);
     }
   }
 
+  /** Stop services. */
   public void stop() {
+    transactionPoolEvictionService.stop();
     jsonRpc.ifPresent(service -> waitForServiceToStop("jsonRpc", service.stop()));
+    engineJsonRpc.ifPresent(service -> waitForServiceToStop("engineJsonRpc", service.stop()));
     graphQLHttp.ifPresent(service -> waitForServiceToStop("graphQLHttp", service.stop()));
-    websocketRpc.ifPresent(service -> waitForServiceToStop("websocketRpc", service.stop()));
+    webSocketRpc.ifPresent(service -> waitForServiceToStop("websocketRpc", service.stop()));
+    ipcJsonRpc.ifPresent(
+        service ->
+            waitForServiceToStop(
+                "ipcJsonRpc", service.stop().toCompletionStage().toCompletableFuture()));
+    waitForServiceToStop("Transaction Pool", besuController.getTransactionPool().setDisabled());
     metrics.ifPresent(service -> waitForServiceToStop("metrics", service.stop()));
     ethStatsService.ifPresent(EthStatsService::stop);
     besuController.getMiningCoordinator().stop();
@@ -158,6 +218,7 @@ public void stop() {
     shutdown.countDown();
   }
 
+  /** Await stop. */
   public void awaitStop() {
     try {
       shutdown.await();
@@ -205,8 +266,7 @@ private void waitForServiceToStart(
         Thread.currentThread().interrupt();
         throw new IllegalStateException("Interrupted while waiting for service to start", e);
       } catch (final ExecutionException e) {
-        LOG.error("Service " + serviceName + " failed to start", e);
-        throw new IllegalStateException(e);
+        throw new IllegalStateException("Service " + serviceName + " failed to start", e);
       } catch (final TimeoutException e) {
         LOG.warn("Service {} is taking an unusually long time to start", serviceName);
       }
@@ -234,17 +294,25 @@ private void writeBesuPortsToFile() {
               });
     }
 
-    if (getJsonRpcPort().isPresent()) {
-      properties.setProperty("json-rpc", String.valueOf(getJsonRpcPort().get()));
+    Optional<Integer> port = getJsonRpcPort();
+    if (port.isPresent()) {
+      properties.setProperty("json-rpc", String.valueOf(port.get()));
     }
-    if (getGraphQLHttpPort().isPresent()) {
-      properties.setProperty("graphql-http", String.valueOf(getGraphQLHttpPort().get()));
+    port = getGraphQLHttpPort();
+    if (port.isPresent()) {
+      properties.setProperty("graphql-http", String.valueOf(port.get()));
     }
-    if (getWebsocketPort().isPresent()) {
-      properties.setProperty("ws-rpc", String.valueOf(getWebsocketPort().get()));
+    port = getWebSocketPort();
+    if (port.isPresent()) {
+      properties.setProperty("ws-rpc", String.valueOf(port.get()));
     }
-    if (getMetricsPort().isPresent()) {
-      properties.setProperty("metrics", String.valueOf(getMetricsPort().get()));
+    port = getMetricsPort();
+    if (port.isPresent()) {
+      properties.setProperty("metrics", String.valueOf(port.get()));
+    }
+    port = getEngineJsonRpcPort();
+    if (port.isPresent()) {
+      properties.setProperty("engine-json-rpc", String.valueOf(port.get()));
     }
     // create besu.ports file
     createBesuFile(
@@ -295,18 +363,47 @@ private void writePidFile() {
         });
   }
 
+  /**
+   * Gets json rpc port.
+   *
+   * @return the json rpc port
+   */
   public Optional<Integer> getJsonRpcPort() {
     return jsonRpc.map(service -> service.socketAddress().getPort());
   }
 
+  /**
+   * Gets engine json rpc port.
+   *
+   * @return the engine json rpc port
+   */
+  public Optional<Integer> getEngineJsonRpcPort() {
+    return engineJsonRpc.map(service -> service.socketAddress().getPort());
+  }
+
+  /**
+   * Gets GraphQl http port.
+   *
+   * @return the graph ql http port
+   */
   public Optional<Integer> getGraphQLHttpPort() {
     return graphQLHttp.map(service -> service.socketAddress().getPort());
   }
 
-  public Optional<Integer> getWebsocketPort() {
-    return websocketRpc.map(service -> service.socketAddress().getPort());
+  /**
+   * Gets web socket port.
+   *
+   * @return the web socket port
+   */
+  public Optional<Integer> getWebSocketPort() {
+    return webSocketRpc.map(service -> service.socketAddress().getPort());
   }
 
+  /**
+   * Gets metrics port.
+   *
+   * @return the metrics port
+   */
   public Optional<Integer> getMetricsPort() {
     if (metrics.isPresent()) {
       return metrics.get().getPort();
@@ -315,6 +412,11 @@ public Optional<Integer> getMetricsPort() {
     }
   }
 
+  /**
+   * Gets local enode.
+   *
+   * @return the local enode
+   */
   @VisibleForTesting
   Optional<EnodeURL> getLocalEnode() {
     return networkRunner.getNetwork().getLocalEnode();
@@ -322,6 +424,11 @@ Optional<EnodeURL> getLocalEnode() {
 
   @FunctionalInterface
   private interface SynchronousShutdown {
+    /**
+     * Await for shutdown.
+     *
+     * @throws InterruptedException the interrupted exception
+     */
     void await() throws InterruptedException;
   }
 
@@ -329,7 +436,6 @@ private void createBesuFile(
       final Properties properties, final String fileName, final String fileHeader) {
     final File file = new File(dataDir.toFile(), String.format("besu.%s", fileName));
     file.deleteOnExit();
-
     try (final FileOutputStream fileOutputStream = new FileOutputStream(file)) {
       properties.store(
           fileOutputStream,
diff --git a/besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java b/besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java
index a07e28df906..d54a9149429 100644
--- a/besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java
+++ b/besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java
@@ -19,29 +19,41 @@
 import static java.util.function.Predicate.isEqual;
 import static java.util.function.Predicate.not;
 import static org.hyperledger.besu.controller.BesuController.CACHE_PATH;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY;
 
 import org.hyperledger.besu.cli.config.EthNetworkConfig;
+import org.hyperledger.besu.cli.config.NetworkName;
+import org.hyperledger.besu.cli.options.stable.EthstatsOptions;
 import org.hyperledger.besu.controller.BesuController;
-import org.hyperledger.besu.crypto.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKey;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.ApiConfiguration;
 import org.hyperledger.besu.ethereum.api.graphql.GraphQLConfiguration;
-import org.hyperledger.besu.ethereum.api.graphql.GraphQLDataFetcherContextImpl;
+import org.hyperledger.besu.ethereum.api.graphql.GraphQLContextType;
 import org.hyperledger.besu.ethereum.api.graphql.GraphQLDataFetchers;
 import org.hyperledger.besu.ethereum.api.graphql.GraphQLHttpService;
 import org.hyperledger.besu.ethereum.api.graphql.GraphQLProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.EngineJsonRpcService;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcHttpService;
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
+import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationService;
+import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.DefaultAuthenticationService;
+import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.EngineAuthService;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.AuthenticatedJsonRpcProcessor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.BaseJsonRpcProcessor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.JsonRpcExecutor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.JsonRpcProcessor;
 import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService;
 import org.hyperledger.besu.ethereum.api.jsonrpc.health.LivenessCheck;
 import org.hyperledger.besu.ethereum.api.jsonrpc.health.ReadinessCheck;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManagerBuilder;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.ipc.JsonRpcIpcConfiguration;
+import org.hyperledger.besu.ethereum.api.jsonrpc.ipc.JsonRpcIpcService;
 import org.hyperledger.besu.ethereum.api.jsonrpc.methods.JsonRpcMethodsFactory;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
-import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketRequestHandler;
+import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketMessageHandler;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketService;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods.PrivateWebSocketMethodsFactory;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods.WebSocketMethodsFactory;
@@ -54,15 +66,16 @@
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.query.PrivacyQueries;
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.privacy.OnChainPrivacyPrecompiledContract;
+import org.hyperledger.besu.ethereum.mainnet.precompiles.privacy.FlexiblePrivacyPrecompiledContract;
 import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration;
 import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
 import org.hyperledger.besu.ethereum.p2p.config.RlpxConfiguration;
@@ -74,9 +87,10 @@
 import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
 import org.hyperledger.besu.ethereum.p2p.network.ProtocolManager;
 import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeDnsConfiguration;
 import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions;
 import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissionsDenylist;
+import org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty.TLSConfiguration;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol;
 import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController;
@@ -94,7 +108,7 @@
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 import org.hyperledger.besu.ethstats.EthStatsService;
-import org.hyperledger.besu.ethstats.util.NetstatsUrl;
+import org.hyperledger.besu.ethstats.util.EthStatsConnectOptions;
 import org.hyperledger.besu.metrics.MetricsService;
 import org.hyperledger.besu.metrics.ObservableMetricsSystem;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
@@ -107,7 +121,10 @@
 import org.hyperledger.besu.nat.kubernetes.KubernetesNatManager;
 import org.hyperledger.besu.nat.upnp.UpnpNatManager;
 import org.hyperledger.besu.plugin.BesuPlugin;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.services.BesuPluginContextImpl;
+import org.hyperledger.besu.services.PermissioningServiceImpl;
+import org.hyperledger.besu.services.RpcEndpointServiceImpl;
 import org.hyperledger.besu.util.NetworkUtility;
 
 import java.io.IOException;
@@ -119,6 +136,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -127,13 +145,16 @@
 import com.google.common.base.Strings;
 import graphql.GraphQL;
 import io.vertx.core.Vertx;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import io.vertx.core.VertxOptions;
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The builder for Runner class. */
 public class RunnerBuilder {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(RunnerBuilder.class);
 
   private Vertx vertx;
   private BesuController besuController;
@@ -141,6 +162,7 @@ public class RunnerBuilder {
   private NetworkingConfiguration networkingConfiguration = NetworkingConfiguration.create();
   private final Collection<Bytes> bannedNodeIds = new ArrayList<>();
   private boolean p2pEnabled = true;
+  private Optional<TLSConfiguration> p2pTLSConfiguration = Optional.empty();
   private boolean discovery;
   private String p2pAdvertisedHost;
   private String p2pListenInterface = NetworkUtility.INADDR_ANY;
@@ -148,14 +170,10 @@ public class RunnerBuilder {
   private NatMethod natMethod = NatMethod.AUTO;
   private String natManagerServiceName;
   private boolean natMethodFallbackEnabled;
-  private int maxPeers;
-  private boolean limitRemoteWireConnectionsEnabled = false;
-  private float fractionRemoteConnectionsAllowed;
   private EthNetworkConfig ethNetworkConfig;
-
-  private String ethstatsUrl;
-  private String ethstatsContact;
+  private EthstatsOptions ethstatsOptions;
   private JsonRpcConfiguration jsonRpcConfiguration;
+  private Optional<JsonRpcConfiguration> engineJsonRpcConfiguration = Optional.empty();
   private GraphQLConfiguration graphQLConfiguration;
   private WebSocketConfiguration webSocketConfiguration;
   private ApiConfiguration apiConfiguration;
@@ -163,184 +181,428 @@ public class RunnerBuilder {
   private Optional<Path> pidPath = Optional.empty();
   private MetricsConfiguration metricsConfiguration;
   private ObservableMetricsSystem metricsSystem;
+  private PermissioningServiceImpl permissioningService;
   private Optional<PermissioningConfiguration> permissioningConfiguration = Optional.empty();
   private Collection<EnodeURL> staticNodes = Collections.emptyList();
   private Optional<String> identityString = Optional.empty();
   private BesuPluginContextImpl besuPluginContext;
   private boolean autoLogBloomCaching = true;
-  private boolean randomPeerPriority;
   private StorageProvider storageProvider;
-
+  private RpcEndpointServiceImpl rpcEndpointServiceImpl;
+  private JsonRpcIpcConfiguration jsonRpcIpcConfiguration;
+  private boolean legacyForkIdEnabled;
+  private Optional<Long> rpcMaxLogsRange;
+  private Optional<EnodeDnsConfiguration> enodeDnsConfiguration;
+
+  /**
+   * Add Vertx.
+   *
+   * @param vertx the vertx instance
+   * @return runner builder
+   */
   public RunnerBuilder vertx(final Vertx vertx) {
     this.vertx = vertx;
     return this;
   }
 
+  /**
+   * Add Besu controller.
+   *
+   * @param besuController the besu controller
+   * @return the runner builder
+   */
   public RunnerBuilder besuController(final BesuController besuController) {
     this.besuController = besuController;
     return this;
   }
 
+  /**
+   * P2p enabled.
+   *
+   * @param p2pEnabled the p 2 p enabled
+   * @return the runner builder
+   */
   public RunnerBuilder p2pEnabled(final boolean p2pEnabled) {
     this.p2pEnabled = p2pEnabled;
     return this;
   }
 
+  /**
+   * TLSConfiguration p2pTLSConfiguration.
+   *
+   * @param p2pTLSConfiguration the TLSConfiguration p2pTLSConfiguration
+   * @return the runner builder
+   */
+  public RunnerBuilder p2pTLSConfiguration(final TLSConfiguration p2pTLSConfiguration) {
+    this.p2pTLSConfiguration = Optional.of(p2pTLSConfiguration);
+    return this;
+  }
+
+  /**
+   * Optional TLSConfiguration p2pTLSConfiguration.
+   *
+   * @param p2pTLSConfiguration the TLSConfiguration p2pTLSConfiguration
+   * @return the runner builder
+   */
+  public RunnerBuilder p2pTLSConfiguration(final Optional<TLSConfiguration> p2pTLSConfiguration) {
+    if (null != p2pTLSConfiguration) {
+      this.p2pTLSConfiguration = p2pTLSConfiguration;
+    }
+    return this;
+  }
+
+  /**
+   * Enable Discovery.
+   *
+   * @param discovery the discovery
+   * @return the runner builder
+   */
   public RunnerBuilder discovery(final boolean discovery) {
     this.discovery = discovery;
     return this;
   }
 
+  /**
+   * Add Eth network config.
+   *
+   * @param ethNetworkConfig the eth network config
+   * @return the runner builder
+   */
   public RunnerBuilder ethNetworkConfig(final EthNetworkConfig ethNetworkConfig) {
     this.ethNetworkConfig = ethNetworkConfig;
     return this;
   }
 
+  /**
+   * Add Networking configuration.
+   *
+   * @param networkingConfiguration the networking configuration
+   * @return the runner builder
+   */
   public RunnerBuilder networkingConfiguration(
       final NetworkingConfiguration networkingConfiguration) {
     this.networkingConfiguration = networkingConfiguration;
     return this;
   }
 
+  /**
+   * Add P2p advertised host.
+   *
+   * @param p2pAdvertisedHost the P2P advertised host
+   * @return the runner builder
+   */
   public RunnerBuilder p2pAdvertisedHost(final String p2pAdvertisedHost) {
     this.p2pAdvertisedHost = p2pAdvertisedHost;
     return this;
   }
 
+  /**
+   * Add P2P Listener interface ip/host name.
+   *
+   * @param ip the ip
+   * @return the runner builder
+   */
   public RunnerBuilder p2pListenInterface(final String ip) {
     checkArgument(!isNull(ip), "Invalid null value supplied for p2pListenInterface");
     this.p2pListenInterface = ip;
     return this;
   }
 
+  /**
+   * Add P2P listen port.
+   *
+   * @param p2pListenPort the p 2 p listen port
+   * @return the runner builder
+   */
   public RunnerBuilder p2pListenPort(final int p2pListenPort) {
     this.p2pListenPort = p2pListenPort;
     return this;
   }
 
+  /**
+   * Add Nat method.
+   *
+   * @param natMethod the nat method
+   * @return the runner builder
+   */
   public RunnerBuilder natMethod(final NatMethod natMethod) {
     this.natMethod = natMethod;
     return this;
   }
 
+  /**
+   * Add Nat manager service name.
+   *
+   * @param natManagerServiceName the nat manager service name
+   * @return the runner builder
+   */
   public RunnerBuilder natManagerServiceName(final String natManagerServiceName) {
     this.natManagerServiceName = natManagerServiceName;
     return this;
   }
 
+  /**
+   * Enable Nat method fallback.
+   *
+   * @param natMethodFallbackEnabled the nat method fallback enabled
+   * @return the runner builder
+   */
   public RunnerBuilder natMethodFallbackEnabled(final boolean natMethodFallbackEnabled) {
     this.natMethodFallbackEnabled = natMethodFallbackEnabled;
     return this;
   }
 
-  public RunnerBuilder maxPeers(final int maxPeers) {
-    this.maxPeers = maxPeers;
-    return this;
-  }
-
-  public RunnerBuilder limitRemoteWireConnectionsEnabled(
-      final boolean limitRemoteWireConnectionsEnabled) {
-    this.limitRemoteWireConnectionsEnabled = limitRemoteWireConnectionsEnabled;
-    return this;
-  }
-
-  public RunnerBuilder fractionRemoteConnectionsAllowed(
-      final float fractionRemoteConnectionsAllowed) {
-    this.fractionRemoteConnectionsAllowed = fractionRemoteConnectionsAllowed;
-    return this;
-  }
-
-  public RunnerBuilder randomPeerPriority(final boolean randomPeerPriority) {
-    this.randomPeerPriority = randomPeerPriority;
+  /**
+   * Add EthStatsOptions
+   *
+   * @param ethstatsOptions the ethstats options
+   * @return Runner builder instance
+   */
+  public RunnerBuilder ethstatsOptions(final EthstatsOptions ethstatsOptions) {
+    this.ethstatsOptions = ethstatsOptions;
     return this;
   }
 
-  public RunnerBuilder ethstatsUrl(final String ethstatsUrl) {
-    this.ethstatsUrl = ethstatsUrl;
-    return this;
-  }
-
-  public RunnerBuilder ethstatsContact(final String ethstatsContact) {
-    this.ethstatsContact = ethstatsContact;
+  /**
+   * Add Json RPC configuration.
+   *
+   * @param jsonRpcConfiguration the json rpc configuration
+   * @return the runner builder
+   */
+  public RunnerBuilder jsonRpcConfiguration(final JsonRpcConfiguration jsonRpcConfiguration) {
+    this.jsonRpcConfiguration = jsonRpcConfiguration;
     return this;
   }
 
-  public RunnerBuilder jsonRpcConfiguration(final JsonRpcConfiguration jsonRpcConfiguration) {
-    this.jsonRpcConfiguration = jsonRpcConfiguration;
+  /**
+   * Add Engine json RPC configuration.
+   *
+   * @param engineJsonRpcConfiguration the engine json rpc configuration
+   * @return the runner builder
+   */
+  public RunnerBuilder engineJsonRpcConfiguration(
+      final JsonRpcConfiguration engineJsonRpcConfiguration) {
+    this.engineJsonRpcConfiguration = Optional.ofNullable(engineJsonRpcConfiguration);
     return this;
   }
 
+  /**
+   * Add GraphQl configuration.
+   *
+   * @param graphQLConfiguration the graph ql configuration
+   * @return the runner builder
+   */
   public RunnerBuilder graphQLConfiguration(final GraphQLConfiguration graphQLConfiguration) {
     this.graphQLConfiguration = graphQLConfiguration;
     return this;
   }
 
+  /**
+   * Add Web socket configuration.
+   *
+   * @param webSocketConfiguration the web socket configuration
+   * @return the runner builder
+   */
   public RunnerBuilder webSocketConfiguration(final WebSocketConfiguration webSocketConfiguration) {
     this.webSocketConfiguration = webSocketConfiguration;
     return this;
   }
 
+  /**
+   * Add Api configuration.
+   *
+   * @param apiConfiguration the api configuration
+   * @return the runner builder
+   */
   public RunnerBuilder apiConfiguration(final ApiConfiguration apiConfiguration) {
     this.apiConfiguration = apiConfiguration;
     return this;
   }
 
+  /**
+   * Add Permissioning configuration.
+   *
+   * @param permissioningConfiguration the permissioning configuration
+   * @return the runner builder
+   */
   public RunnerBuilder permissioningConfiguration(
-      final PermissioningConfiguration permissioningConfiguration) {
-    this.permissioningConfiguration = Optional.of(permissioningConfiguration);
+      final Optional<PermissioningConfiguration> permissioningConfiguration) {
+    this.permissioningConfiguration = permissioningConfiguration;
     return this;
   }
 
+  /**
+   * Add pid path.
+   *
+   * @param pidPath the pid path
+   * @return the runner builder
+   */
   public RunnerBuilder pidPath(final Path pidPath) {
     this.pidPath = Optional.ofNullable(pidPath);
     return this;
   }
 
+  /**
+   * Add Data dir.
+   *
+   * @param dataDir the data dir
+   * @return the runner builder
+   */
   public RunnerBuilder dataDir(final Path dataDir) {
     this.dataDir = dataDir;
     return this;
   }
 
+  /**
+   * Add list of Banned node id.
+   *
+   * @param bannedNodeIds the banned node ids
+   * @return the runner builder
+   */
   public RunnerBuilder bannedNodeIds(final Collection<Bytes> bannedNodeIds) {
     this.bannedNodeIds.addAll(bannedNodeIds);
     return this;
   }
 
+  /**
+   * Add Metrics configuration.
+   *
+   * @param metricsConfiguration the metrics configuration
+   * @return the runner builder
+   */
   public RunnerBuilder metricsConfiguration(final MetricsConfiguration metricsConfiguration) {
     this.metricsConfiguration = metricsConfiguration;
     return this;
   }
 
+  /**
+   * Add Metrics system.
+   *
+   * @param metricsSystem the metrics system
+   * @return the runner builder
+   */
   public RunnerBuilder metricsSystem(final ObservableMetricsSystem metricsSystem) {
     this.metricsSystem = metricsSystem;
     return this;
   }
 
+  /**
+   * Add Permissioning service.
+   *
+   * @param permissioningService the permissioning service
+   * @return the runner builder
+   */
+  public RunnerBuilder permissioningService(final PermissioningServiceImpl permissioningService) {
+    this.permissioningService = permissioningService;
+    return this;
+  }
+
+  /**
+   * Add Static nodes collection.
+   *
+   * @param staticNodes the static nodes
+   * @return the runner builder
+   */
   public RunnerBuilder staticNodes(final Collection<EnodeURL> staticNodes) {
     this.staticNodes = staticNodes;
     return this;
   }
 
+  /**
+   * Add Node identity string.
+   *
+   * @param identityString the identity string
+   * @return the runner builder
+   */
   public RunnerBuilder identityString(final Optional<String> identityString) {
     this.identityString = identityString;
     return this;
   }
 
+  /**
+   * Add Besu plugin context.
+   *
+   * @param besuPluginContext the besu plugin context
+   * @return the runner builder
+   */
   public RunnerBuilder besuPluginContext(final BesuPluginContextImpl besuPluginContext) {
     this.besuPluginContext = besuPluginContext;
     return this;
   }
 
+  /**
+   * Enable Auto log bloom caching.
+   *
+   * @param autoLogBloomCaching the auto log bloom caching
+   * @return the runner builder
+   */
   public RunnerBuilder autoLogBloomCaching(final boolean autoLogBloomCaching) {
     this.autoLogBloomCaching = autoLogBloomCaching;
     return this;
   }
 
+  /**
+   * Add Storage provider.
+   *
+   * @param storageProvider the storage provider
+   * @return the runner builder
+   */
   public RunnerBuilder storageProvider(final StorageProvider storageProvider) {
     this.storageProvider = storageProvider;
     return this;
   }
 
+  /**
+   * Add Rpc endpoint service.
+   *
+   * @param rpcEndpointService the rpc endpoint service
+   * @return the runner builder
+   */
+  public RunnerBuilder rpcEndpointService(final RpcEndpointServiceImpl rpcEndpointService) {
+    this.rpcEndpointServiceImpl = rpcEndpointService;
+    return this;
+  }
+
+  /**
+   * Add Json Rpc Ipc configuration.
+   *
+   * @param jsonRpcIpcConfiguration the json rpc ipc configuration
+   * @return the runner builder
+   */
+  public RunnerBuilder jsonRpcIpcConfiguration(
+      final JsonRpcIpcConfiguration jsonRpcIpcConfiguration) {
+    this.jsonRpcIpcConfiguration = jsonRpcIpcConfiguration;
+    return this;
+  }
+
+  /**
+   * Add Rpc max logs range.
+   *
+   * @param rpcMaxLogsRange the rpc max logs range
+   * @return the runner builder
+   */
+  public RunnerBuilder rpcMaxLogsRange(final Long rpcMaxLogsRange) {
+    this.rpcMaxLogsRange = rpcMaxLogsRange > 0 ? Optional.of(rpcMaxLogsRange) : Optional.empty();
+    return this;
+  }
+
+  /**
+   * Add enode DNS configuration
+   *
+   * @param enodeDnsConfiguration the DNS configuration for enodes
+   * @return the runner builder
+   */
+  public RunnerBuilder enodeDnsConfiguration(final EnodeDnsConfiguration enodeDnsConfiguration) {
+    this.enodeDnsConfiguration =
+        enodeDnsConfiguration != null ? Optional.of(enodeDnsConfiguration) : Optional.empty();
+    return this;
+  }
+
+  /**
+   * Build Runner instance.
+   *
+   * @return the runner
+   */
   public Runner build() {
 
     Preconditions.checkNotNull(besuController);
@@ -353,12 +615,16 @@ public Runner build() {
     if (discovery) {
       final List<EnodeURL> bootstrap;
       if (ethNetworkConfig.getBootNodes() == null) {
-        bootstrap = DiscoveryConfiguration.MAINNET_BOOTSTRAP_NODES;
+        bootstrap = EthNetworkConfig.getNetworkConfig(NetworkName.MAINNET).getBootNodes();
       } else {
         bootstrap = ethNetworkConfig.getBootNodes();
       }
       discoveryConfiguration.setBootnodes(bootstrap);
       discoveryConfiguration.setDnsDiscoveryURL(ethNetworkConfig.getDnsDiscoveryUrl());
+      discoveryConfiguration.setDiscoveryV5Enabled(
+          networkingConfiguration.getDiscovery().isDiscoveryV5Enabled());
+      discoveryConfiguration.setFilterOnEnrForkId(
+          networkingConfiguration.getDiscovery().isFilterOnEnrForkIdEnabled());
     } else {
       discoveryConfiguration.setActive(false);
     }
@@ -382,11 +648,8 @@ public Runner build() {
         RlpxConfiguration.create()
             .setBindHost(p2pListenInterface)
             .setBindPort(p2pListenPort)
-            .setMaxPeers(maxPeers)
             .setSupportedProtocols(subProtocols)
-            .setClientId(BesuInfo.nodeName(identityString))
-            .setLimitRemoteWireConnectionsEnabled(limitRemoteWireConnectionsEnabled)
-            .setFractionRemoteWireConnectionsAllowed(fractionRemoteConnectionsAllowed);
+            .setClientId(BesuInfo.nodeName(identityString));
     networkingConfiguration.setRlpx(rlpxConfiguration).setDiscovery(discoveryConfiguration);
 
     final PeerPermissionsDenylist bannedNodes = PeerPermissionsDenylist.create();
@@ -414,20 +677,29 @@ public Runner build() {
     LOG.info("Detecting NAT service.");
     final boolean fallbackEnabled = natMethod == NatMethod.AUTO || natMethodFallbackEnabled;
     final NatService natService = new NatService(buildNatManager(natMethod), fallbackEnabled);
-    final NetworkBuilder inactiveNetwork = (caps) -> new NoopP2PNetwork();
+    final NetworkBuilder inactiveNetwork = caps -> new NoopP2PNetwork();
     final NetworkBuilder activeNetwork =
-        (caps) ->
-            DefaultP2PNetwork.builder()
-                .vertx(vertx)
-                .nodeKey(nodeKey)
-                .config(networkingConfiguration)
-                .peerPermissions(peerPermissions)
-                .metricsSystem(metricsSystem)
-                .supportedCapabilities(caps)
-                .natService(natService)
-                .randomPeerPriority(randomPeerPriority)
-                .storageProvider(storageProvider)
-                .build();
+        caps -> {
+          final EthPeers ethPeers = besuController.getEthPeers();
+          return DefaultP2PNetwork.builder()
+              .vertx(vertx)
+              .nodeKey(nodeKey)
+              .config(networkingConfiguration)
+              .legacyForkIdEnabled(legacyForkIdEnabled)
+              .peerPermissions(peerPermissions)
+              .metricsSystem(metricsSystem)
+              .supportedCapabilities(caps)
+              .natService(natService)
+              .storageProvider(storageProvider)
+              .p2pTLSConfiguration(p2pTLSConfiguration)
+              .blockchain(context.getBlockchain())
+              .blockNumberForks(besuController.getGenesisConfigOptions().getForkBlockNumbers())
+              .timestampForks(besuController.getGenesisConfigOptions().getForkBlockTimestamps())
+              .allConnectionsSupplier(ethPeers::getAllConnections)
+              .allActiveConnectionsSupplier(ethPeers::getAllActiveConnections)
+              .peersLowerBound(ethPeers.getPeerLowerBound())
+              .build();
+        };
 
     final NetworkRunner networkRunner =
         NetworkRunner.builder()
@@ -437,7 +709,18 @@ public Runner build() {
             .metricsSystem(metricsSystem)
             .build();
 
+    besuController.getEthPeers().setRlpxAgent(networkRunner.getRlpxAgent());
+
     final P2PNetwork network = networkRunner.getNetwork();
+    // ForkId in Ethereum Node Record needs updating when we transition to a new protocol spec
+    context
+        .getBlockchain()
+        .observeBlockAdded(
+            blockAddedEvent -> {
+              if (protocolSchedule.isOnMilestoneBoundary(blockAddedEvent.getBlock().getHeader())) {
+                network.updateNodeRecord();
+              }
+            });
     nodePermissioningController.ifPresent(
         n ->
             n.setInsufficientPeersPermissioningProvider(
@@ -464,27 +747,36 @@ public Runner build() {
             .build();
     vertx.deployVerticle(filterManager);
 
-    createPrivateTransactionObserver(filterManager, privacyParameters);
+    createPrivateTransactionObserver(
+        filterManager, privacyParameters, context.getBlockchain().getGenesisBlockHeader());
 
     final P2PNetwork peerNetwork = networkRunner.getNetwork();
 
     final MiningParameters miningParameters = besuController.getMiningParameters();
     Optional<StratumServer> stratumServer = Optional.empty();
+
     if (miningParameters.isStratumMiningEnabled()) {
+      if (!(miningCoordinator instanceof PoWMiningCoordinator powMiningCoordinator)) {
+        throw new IllegalArgumentException(
+            "Stratum server requires an PoWMiningCoordinator not "
+                + ((miningCoordinator == null) ? "null" : miningCoordinator.getClass().getName()));
+      }
       stratumServer =
           Optional.of(
               new StratumServer(
                   vertx,
-                  miningCoordinator,
+                  powMiningCoordinator,
                   miningParameters.getStratumPort(),
                   miningParameters.getStratumNetworkInterface(),
-                  miningParameters.getStratumExtranonce()));
+                  miningParameters.getStratumExtranonce(),
+                  metricsSystem));
       miningCoordinator.addEthHashObserver(stratumServer.get());
+      LOG.debug("added ethash observer: {}", stratumServer.get());
     }
 
     sanitizePeers(network, staticNodes)
         .map(DefaultPeer::fromEnodeURL)
-        .forEach(peerNetwork::addMaintainConnectionPeer);
+        .forEach(peerNetwork::addMaintainedConnectionPeer);
 
     final Optional<NodeLocalConfigPermissioningController> nodeLocalConfigPermissioningController =
         nodePermissioningController.flatMap(NodePermissioningController::localConfigController);
@@ -502,10 +794,12 @@ public Runner build() {
                 AccountPermissioningController::getAccountLocalConfigPermissioningController);
 
     Optional<JsonRpcHttpService> jsonRpcHttpService = Optional.empty();
+
     if (jsonRpcConfiguration.isEnabled()) {
-      final Map<String, JsonRpcMethod> jsonRpcMethods =
+      final Map<String, JsonRpcMethod> nonEngineMethods =
           jsonRpcMethods(
               protocolSchedule,
+              context,
               besuController,
               peerNetwork,
               blockchainQueries,
@@ -514,7 +808,9 @@ public Runner build() {
               miningCoordinator,
               metricsSystem,
               supportedCapabilities,
-              jsonRpcConfiguration.getRpcApis(),
+              jsonRpcConfiguration.getRpcApis().stream()
+                  .filter(apiGroup -> !apiGroup.toLowerCase().startsWith("engine"))
+                  .collect(Collectors.toList()),
               filterManager,
               accountLocalConfigPermissioningController,
               nodeLocalConfigPermissioningController,
@@ -524,7 +820,9 @@ public Runner build() {
               metricsConfiguration,
               natService,
               besuPluginContext.getNamedPlugins(),
-              dataDir);
+              dataDir,
+              rpcEndpointServiceImpl);
+
       jsonRpcHttpService =
           Optional.of(
               new JsonRpcHttpService(
@@ -533,21 +831,86 @@ public Runner build() {
                   jsonRpcConfiguration,
                   metricsSystem,
                   natService,
-                  jsonRpcMethods,
+                  nonEngineMethods,
                   new HealthService(new LivenessCheck()),
                   new HealthService(new ReadinessCheck(peerNetwork, synchronizer))));
     }
 
-    Optional<GraphQLHttpService> graphQLHttpService = Optional.empty();
-    if (graphQLConfiguration.isEnabled()) {
-      final GraphQLDataFetchers fetchers = new GraphQLDataFetchers(supportedCapabilities);
-      final GraphQLDataFetcherContextImpl dataFetcherContext =
-          new GraphQLDataFetcherContextImpl(
-              blockchainQueries,
+    final SubscriptionManager subscriptionManager =
+        createSubscriptionManager(vertx, transactionPool, blockchainQueries);
+
+    Optional<EngineJsonRpcService> engineJsonRpcService = Optional.empty();
+    if (engineJsonRpcConfiguration.isPresent() && engineJsonRpcConfiguration.get().isEnabled()) {
+      final Map<String, JsonRpcMethod> engineMethods =
+          jsonRpcMethods(
               protocolSchedule,
+              context,
+              besuController,
+              peerNetwork,
+              blockchainQueries,
+              synchronizer,
               transactionPool,
               miningCoordinator,
-              synchronizer);
+              metricsSystem,
+              supportedCapabilities,
+              engineJsonRpcConfiguration.get().getRpcApis(),
+              filterManager,
+              accountLocalConfigPermissioningController,
+              nodeLocalConfigPermissioningController,
+              privacyParameters,
+              engineJsonRpcConfiguration.get(),
+              webSocketConfiguration,
+              metricsConfiguration,
+              natService,
+              besuPluginContext.getNamedPlugins(),
+              dataDir,
+              rpcEndpointServiceImpl);
+
+      final Optional<AuthenticationService> authToUse =
+          engineJsonRpcConfiguration.get().isAuthenticationEnabled()
+              ? Optional.of(
+                  new EngineAuthService(
+                      vertx,
+                      Optional.ofNullable(
+                          engineJsonRpcConfiguration.get().getAuthenticationPublicKeyFile()),
+                      dataDir))
+              : Optional.empty();
+
+      final WebSocketConfiguration engineSocketConfig =
+          webSocketConfiguration.isEnabled()
+              ? webSocketConfiguration
+              : WebSocketConfiguration.createEngineDefault();
+
+      final WebSocketMethodsFactory websocketMethodsFactory =
+          new WebSocketMethodsFactory(subscriptionManager, engineMethods);
+
+      engineJsonRpcService =
+          Optional.of(
+              new EngineJsonRpcService(
+                  vertx,
+                  dataDir,
+                  engineJsonRpcConfiguration.orElse(JsonRpcConfiguration.createEngineDefault()),
+                  metricsSystem,
+                  natService,
+                  websocketMethodsFactory.methods(),
+                  Optional.ofNullable(engineSocketConfig),
+                  besuController.getProtocolManager().ethContext().getScheduler(),
+                  authToUse,
+                  new HealthService(new LivenessCheck()),
+                  new HealthService(new ReadinessCheck(peerNetwork, synchronizer))));
+    }
+
+    Optional<GraphQLHttpService> graphQLHttpService = Optional.empty();
+    if (graphQLConfiguration.isEnabled()) {
+      final GraphQLDataFetchers fetchers = new GraphQLDataFetchers(supportedCapabilities);
+      final Map<GraphQLContextType, Object> graphQlContextMap = new ConcurrentHashMap<>();
+      graphQlContextMap.putIfAbsent(GraphQLContextType.BLOCKCHAIN_QUERIES, blockchainQueries);
+      graphQlContextMap.putIfAbsent(GraphQLContextType.PROTOCOL_SCHEDULE, protocolSchedule);
+      graphQlContextMap.putIfAbsent(GraphQLContextType.TRANSACTION_POOL, transactionPool);
+      graphQlContextMap.putIfAbsent(GraphQLContextType.MINING_COORDINATOR, miningCoordinator);
+      graphQlContextMap.putIfAbsent(GraphQLContextType.SYNCHRONIZER, synchronizer);
+      graphQlContextMap.putIfAbsent(
+          GraphQLContextType.CHAIN_ID, protocolSchedule.getChainId().map(UInt256::valueOf));
       final GraphQL graphQL;
       try {
         graphQL = GraphQLProvider.buildGraphQL(fetchers);
@@ -562,15 +925,16 @@ public Runner build() {
                   dataDir,
                   graphQLConfiguration,
                   graphQL,
-                  dataFetcherContext,
+                  graphQlContextMap,
                   besuController.getProtocolManager().ethContext().getScheduler()));
     }
 
     Optional<WebSocketService> webSocketService = Optional.empty();
     if (webSocketConfiguration.isEnabled()) {
-      final Map<String, JsonRpcMethod> webSocketsJsonRpcMethods =
+      final Map<String, JsonRpcMethod> nonEngineMethods =
           jsonRpcMethods(
               protocolSchedule,
+              context,
               besuController,
               peerNetwork,
               blockchainQueries,
@@ -579,7 +943,9 @@ public Runner build() {
               miningCoordinator,
               metricsSystem,
               supportedCapabilities,
-              webSocketConfiguration.getRpcApis(),
+              webSocketConfiguration.getRpcApis().stream()
+                  .filter(apiGroup -> !apiGroup.toLowerCase().startsWith("engine"))
+                  .collect(Collectors.toList()),
               filterManager,
               accountLocalConfigPermissioningController,
               nodeLocalConfigPermissioningController,
@@ -589,10 +955,8 @@ public Runner build() {
               metricsConfiguration,
               natService,
               besuPluginContext.getNamedPlugins(),
-              dataDir);
-
-      final SubscriptionManager subscriptionManager =
-          createSubscriptionManager(vertx, transactionPool, blockchainQueries);
+              dataDir,
+              rpcEndpointServiceImpl);
 
       createLogsSubscriptionService(
           context.getBlockchain(),
@@ -611,23 +975,29 @@ public Runner build() {
                   vertx,
                   webSocketConfiguration,
                   subscriptionManager,
-                  webSocketsJsonRpcMethods,
+                  nonEngineMethods,
                   privacyParameters,
                   protocolSchedule,
                   blockchainQueries,
-                  transactionPool));
+                  DefaultAuthenticationService.create(vertx, webSocketConfiguration),
+                  metricsSystem));
 
-      createPrivateTransactionObserver(subscriptionManager, privacyParameters);
+      createPrivateTransactionObserver(
+          subscriptionManager, privacyParameters, context.getBlockchain().getGenesisBlockHeader());
     }
 
-    Optional<MetricsService> metricsService = createMetricsService(vertx, metricsConfiguration);
+    final Optional<MetricsService> metricsService =
+        createMetricsService(vertx, metricsConfiguration);
 
     final Optional<EthStatsService> ethStatsService;
-    if (!Strings.isNullOrEmpty(ethstatsUrl)) {
+    if (isEthStatsEnabled()) {
       ethStatsService =
           Optional.of(
               new EthStatsService(
-                  NetstatsUrl.fromParams(ethstatsUrl, ethstatsContact),
+                  EthStatsConnectOptions.fromParams(
+                      ethstatsOptions.getEthstatsUrl(),
+                      ethstatsOptions.getEthstatsContact(),
+                      ethstatsOptions.getEthstatsCaCert()),
                   blockchainQueries,
                   besuController.getProtocolManager(),
                   transactionPool,
@@ -641,13 +1011,54 @@ public Runner build() {
       ethStatsService = Optional.empty();
     }
 
+    final Optional<JsonRpcIpcService> jsonRpcIpcService;
+    if (jsonRpcIpcConfiguration.isEnabled()) {
+      final Map<String, JsonRpcMethod> ipcMethods =
+          jsonRpcMethods(
+              protocolSchedule,
+              context,
+              besuController,
+              peerNetwork,
+              blockchainQueries,
+              synchronizer,
+              transactionPool,
+              miningCoordinator,
+              metricsSystem,
+              supportedCapabilities,
+              jsonRpcIpcConfiguration.getEnabledApis().stream()
+                  .filter(apiGroup -> !apiGroup.toLowerCase().startsWith("engine"))
+                  .collect(Collectors.toList()),
+              filterManager,
+              accountLocalConfigPermissioningController,
+              nodeLocalConfigPermissioningController,
+              privacyParameters,
+              jsonRpcConfiguration,
+              webSocketConfiguration,
+              metricsConfiguration,
+              natService,
+              besuPluginContext.getNamedPlugins(),
+              dataDir,
+              rpcEndpointServiceImpl);
+
+      jsonRpcIpcService =
+          Optional.of(
+              new JsonRpcIpcService(
+                  vertx,
+                  jsonRpcIpcConfiguration.getPath(),
+                  new JsonRpcExecutor(new BaseJsonRpcProcessor(), ipcMethods)));
+    } else {
+      jsonRpcIpcService = Optional.empty();
+    }
+
     return new Runner(
         vertx,
         networkRunner,
         natService,
         jsonRpcHttpService,
+        engineJsonRpcService,
         graphQLHttpService,
         webSocketService,
+        jsonRpcIpcService,
         stratumServer,
         metricsService,
         ethStatsService,
@@ -658,6 +1069,10 @@ public Runner build() {
         context.getBlockchain());
   }
 
+  private boolean isEthStatsEnabled() {
+    return ethstatsOptions != null && !Strings.isNullOrEmpty(ethstatsOptions.getEthstatsUrl());
+  }
+
   private Stream<EnodeURL> sanitizePeers(
       final P2PNetwork network, final Collection<EnodeURL> enodeURLS) {
     if (network.getLocalEnode().isEmpty()) {
@@ -687,7 +1102,23 @@ private Optional<NodePermissioningController> buildNodePermissioningController(
                   localNodeId,
                   transactionSimulator,
                   metricsSystem,
-                  blockchain);
+                  blockchain,
+                  permissioningService.getConnectionPermissioningProviders());
+
+      return Optional.of(nodePermissioningController);
+    } else if (permissioningService.getConnectionPermissioningProviders().size() > 0) {
+      final NodePermissioningController nodePermissioningController =
+          new NodePermissioningControllerFactory()
+              .create(
+                  new PermissioningConfiguration(
+                      Optional.empty(), Optional.empty(), Optional.empty()),
+                  synchronizer,
+                  fixedNodes,
+                  localNodeId,
+                  transactionSimulator,
+                  metricsSystem,
+                  blockchain,
+                  permissioningService.getConnectionPermissioningProviders());
 
       return Optional.of(nodePermissioningController);
     } else {
@@ -738,6 +1169,13 @@ private Optional<NatManager> buildNatManager(final NatMethod natMethod) {
     }
   }
 
+  /**
+   * Gets fixed nodes. Visible for testing.
+   *
+   * @param someFixedNodes the fixed nodes
+   * @param moreFixedNodes nodes added to fixed nodes
+   * @return the fixed and more nodes combined
+   */
   @VisibleForTesting
   public static Collection<EnodeURL> getFixedNodes(
       final Collection<EnodeURL> someFixedNodes, final Collection<EnodeURL> moreFixedNodes) {
@@ -748,6 +1186,7 @@ public static Collection<EnodeURL> getFixedNodes(
 
   private Map<String, JsonRpcMethod> jsonRpcMethods(
       final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
       final BesuController besuController,
       final P2PNetwork network,
       final BlockchainQueries blockchainQueries,
@@ -756,7 +1195,7 @@ private Map<String, JsonRpcMethod> jsonRpcMethods(
       final MiningCoordinator miningCoordinator,
       final ObservableMetricsSystem metricsSystem,
       final Set<Capability> supportedCapabilities,
-      final Collection<RpcApi> jsonRpcApis,
+      final Collection<String> jsonRpcApis,
       final FilterManager filterManager,
       final Optional<AccountLocalConfigPermissioningController> accountAllowlistController,
       final Optional<NodeLocalConfigPermissioningController> nodeAllowlistController,
@@ -766,7 +1205,11 @@ private Map<String, JsonRpcMethod> jsonRpcMethods(
       final MetricsConfiguration metricsConfiguration,
       final NatService natService,
       final Map<String, BesuPlugin> namedPlugins,
-      final Path dataDir) {
+      final Path dataDir,
+      final RpcEndpointServiceImpl rpcEndpointServiceImpl) {
+    // sync vertx for engine consensus API, to process requests in FIFO order;
+    final Vertx consensusEngineServer = Vertx.vertx(new VertxOptions().setWorkerPoolSize(1));
+
     final Map<String, JsonRpcMethod> methods =
         new JsonRpcMethodsFactory()
             .methods(
@@ -777,6 +1220,7 @@ private Map<String, JsonRpcMethod> jsonRpcMethods(
                 blockchainQueries,
                 synchronizer,
                 protocolSchedule,
+                protocolContext,
                 filterManager,
                 transactionPool,
                 miningCoordinator,
@@ -792,8 +1236,22 @@ private Map<String, JsonRpcMethod> jsonRpcMethods(
                 natService,
                 namedPlugins,
                 dataDir,
-                besuController.getProtocolManager().ethContext().getEthPeers());
+                besuController.getProtocolManager().ethContext().getEthPeers(),
+                consensusEngineServer,
+                rpcMaxLogsRange,
+                enodeDnsConfiguration);
     methods.putAll(besuController.getAdditionalJsonRpcMethods(jsonRpcApis));
+
+    final var pluginMethods =
+        rpcEndpointServiceImpl.getPluginMethods(jsonRpcConfiguration.getRpcApis());
+
+    final var overriddenMethods =
+        methods.keySet().stream().filter(pluginMethods::containsKey).collect(Collectors.toList());
+    if (overriddenMethods.size() > 0) {
+      throw new RuntimeException("You can not override built in methods " + overriddenMethods);
+    }
+
+    methods.putAll(pluginMethods);
     return methods;
   }
 
@@ -845,18 +1303,20 @@ private void createLogsSubscriptionService(
 
   private void createPrivateTransactionObserver(
       final PrivateTransactionObserver privateTransactionObserver,
-      final PrivacyParameters privacyParameters) {
-    // register privateTransactionObserver as observer of events fired by the onchain precompile.
-    if (privacyParameters.isOnchainPrivacyGroupsEnabled()
+      final PrivacyParameters privacyParameters,
+      final BlockHeader genesisBlockHeader) {
+    // register privateTransactionObserver as observer of events fired by the flexible precompile.
+    if (privacyParameters.isFlexiblePrivacyGroupsEnabled()
         && privacyParameters.isMultiTenancyEnabled()) {
-      final OnChainPrivacyPrecompiledContract onchainPrivacyPrecompiledContract =
-          (OnChainPrivacyPrecompiledContract)
+      final FlexiblePrivacyPrecompiledContract flexiblePrivacyPrecompiledContract =
+          (FlexiblePrivacyPrecompiledContract)
               besuController
                   .getProtocolSchedule()
-                  .getByBlockNumber(1)
+                  .getByBlockHeader(genesisBlockHeader)
                   .getPrecompileContractRegistry()
-                  .get(Address.ONCHAIN_PRIVACY, Account.DEFAULT_VERSION);
-      onchainPrivacyPrecompiledContract.addPrivateTransactionObserver(privateTransactionObserver);
+                  .get(FLEXIBLE_PRIVACY);
+
+      flexiblePrivacyPrecompiledContract.addPrivateTransactionObserver(privateTransactionObserver);
     }
   }
 
@@ -883,7 +1343,8 @@ private WebSocketService createWebsocketService(
       final PrivacyParameters privacyParameters,
       final ProtocolSchedule protocolSchedule,
       final BlockchainQueries blockchainQueries,
-      final TransactionPool transactionPool) {
+      final Optional<AuthenticationService> authenticationService,
+      final ObservableMetricsSystem metricsSystem) {
 
     final WebSocketMethodsFactory websocketMethodsFactory =
         new WebSocketMethodsFactory(subscriptionManager, jsonRpcMethods);
@@ -891,27 +1352,52 @@ private WebSocketService createWebsocketService(
     if (privacyParameters.isEnabled()) {
       final PrivateWebSocketMethodsFactory privateWebSocketMethodsFactory =
           new PrivateWebSocketMethodsFactory(
-              privacyParameters,
-              subscriptionManager,
-              protocolSchedule,
-              blockchainQueries,
-              transactionPool);
+              privacyParameters, subscriptionManager, protocolSchedule, blockchainQueries);
 
       privateWebSocketMethodsFactory.methods().forEach(websocketMethodsFactory::addMethods);
     }
 
-    final WebSocketRequestHandler websocketRequestHandler =
-        new WebSocketRequestHandler(
+    rpcEndpointServiceImpl
+        .getPluginMethods(configuration.getRpcApis())
+        .values()
+        .forEach(websocketMethodsFactory::addMethods);
+
+    final JsonRpcProcessor jsonRpcProcessor;
+    if (authenticationService.isPresent()) {
+      jsonRpcProcessor =
+          new AuthenticatedJsonRpcProcessor(
+              new BaseJsonRpcProcessor(),
+              authenticationService.get(),
+              configuration.getRpcApisNoAuth());
+    } else {
+      jsonRpcProcessor = new BaseJsonRpcProcessor();
+    }
+    final JsonRpcExecutor jsonRpcExecutor =
+        new JsonRpcExecutor(jsonRpcProcessor, websocketMethodsFactory.methods());
+    final WebSocketMessageHandler websocketMessageHandler =
+        new WebSocketMessageHandler(
             vertx,
-            websocketMethodsFactory.methods(),
+            jsonRpcExecutor,
             besuController.getProtocolManager().ethContext().getScheduler(),
             webSocketConfiguration.getTimeoutSec());
 
-    return new WebSocketService(vertx, configuration, websocketRequestHandler);
+    return new WebSocketService(
+        vertx, configuration, websocketMessageHandler, authenticationService, metricsSystem);
   }
 
   private Optional<MetricsService> createMetricsService(
       final Vertx vertx, final MetricsConfiguration configuration) {
     return MetricsService.create(vertx, configuration, metricsSystem);
   }
+
+  /**
+   * Add Legacy fork id.
+   *
+   * @param legacyEth64ForkIdEnabled the legacy eth64 fork id enabled
+   * @return the runner builder
+   */
+  public RunnerBuilder legacyForkId(final boolean legacyEth64ForkIdEnabled) {
+    this.legacyForkIdEnabled = legacyEth64ForkIdEnabled;
+    return this;
+  }
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/chainexport/BlockExporter.java b/besu/src/main/java/org/hyperledger/besu/chainexport/BlockExporter.java
index e9403a2c38f..de5b058fc7b 100644
--- a/besu/src/main/java/org/hyperledger/besu/chainexport/BlockExporter.java
+++ b/besu/src/main/java/org/hyperledger/besu/chainexport/BlockExporter.java
@@ -25,14 +25,19 @@
 import java.io.IOException;
 import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Besu Block Export Util. */
 public abstract class BlockExporter {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(BlockExporter.class);
   private final Blockchain blockchain;
 
+  /**
+   * Instantiates a new Block exporter.
+   *
+   * @param blockchain the blockchain
+   */
   protected BlockExporter(final Blockchain blockchain) {
     this.blockchain = blockchain;
   }
@@ -90,6 +95,13 @@ public void exportBlocks(
     LOG.info("Export complete at block {}", blockNumber);
   }
 
+  /**
+   * Export block.
+   *
+   * @param outputStream The FileOutputStream where the block will be exported
+   * @param block The block to export
+   * @throws IOException In case of an error while exporting.
+   */
   protected abstract void exportBlock(final FileOutputStream outputStream, final Block block)
       throws IOException;
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/chainexport/RlpBlockExporter.java b/besu/src/main/java/org/hyperledger/besu/chainexport/RlpBlockExporter.java
index fcd7ec5696f..cfca4f7f9a3 100644
--- a/besu/src/main/java/org/hyperledger/besu/chainexport/RlpBlockExporter.java
+++ b/besu/src/main/java/org/hyperledger/besu/chainexport/RlpBlockExporter.java
@@ -23,8 +23,14 @@
 
 import org.apache.tuweni.bytes.Bytes;
 
+/** The Rlp block exporter. */
 public class RlpBlockExporter extends BlockExporter {
 
+  /**
+   * Instantiates a new Rlp block exporter.
+   *
+   * @param blockchain the blockchain
+   */
   public RlpBlockExporter(final Blockchain blockchain) {
     super(blockchain);
   }
diff --git a/besu/src/main/java/org/hyperledger/besu/chainimport/JsonBlockImporter.java b/besu/src/main/java/org/hyperledger/besu/chainimport/JsonBlockImporter.java
index 65a399aaf29..13c239d6d88 100644
--- a/besu/src/main/java/org/hyperledger/besu/chainimport/JsonBlockImporter.java
+++ b/besu/src/main/java/org/hyperledger/besu/chainimport/JsonBlockImporter.java
@@ -17,16 +17,18 @@
 import org.hyperledger.besu.chainimport.internal.BlockData;
 import org.hyperledger.besu.chainimport.internal.ChainData;
 import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.config.PowAlgorithm;
 import org.hyperledger.besu.controller.BesuController;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockImporter;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.WorldState;
+import org.hyperledger.besu.ethereum.mainnet.BlockImportResult;
 import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
+import org.hyperledger.besu.evm.worldstate.WorldState;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -39,17 +41,22 @@
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Tool for importing blocks with transactions from human-readable json. */
 public class JsonBlockImporter {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(JsonBlockImporter.class);
 
   private final ObjectMapper mapper;
   private final BesuController controller;
 
+  /**
+   * Instantiates a new Json block importer.
+   *
+   * @param controller the controller
+   */
   public JsonBlockImporter(final BesuController controller) {
     this.controller = controller;
     mapper = new ObjectMapper();
@@ -59,6 +66,12 @@ public JsonBlockImporter(final BesuController controller) {
     mapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true);
   }
 
+  /**
+   * Import chain.
+   *
+   * @param chainJson the chain json
+   * @throws IOException the io exception
+   */
   public void importChain(final String chainJson) throws IOException {
     warnIfDatabaseIsNotEmpty();
 
@@ -84,7 +97,7 @@ private Block processBlockData(final BlockData blockData, final BlockHeader pare
         controller
             .getProtocolContext()
             .getWorldStateArchive()
-            .get(parentHeader.getStateRoot())
+            .get(parentHeader.getStateRoot(), parentHeader.getHash())
             .get();
     final List<Transaction> transactions =
         blockData.streamTransactions(worldState).collect(Collectors.toList());
@@ -119,9 +132,9 @@ private void setOptionalFields(
       final BlockData blockData,
       final GenesisConfigOptions genesisConfig) {
     // Some fields can only be configured for ethash
-    if (genesisConfig.isEthHash()) {
-      // For simplicity only set these for ethash.  Other consensus algorithms use these fields for
-      // special purposes or ignore them
+    if (genesisConfig.getPowAlgorithm() != PowAlgorithm.UNSUPPORTED) {
+      // For simplicity only set these for PoW consensus algorithms.
+      // Other consensus algorithms use these fields for special purposes or ignore them.
       miner.setCoinbase(blockData.getCoinbase().orElse(Address.ZERO));
       miner.setExtraData(blockData.getExtraData().orElse(Bytes.EMPTY));
     } else if (blockData.getCoinbase().isPresent() || blockData.getExtraData().isPresent()) {
@@ -140,14 +153,11 @@ private void setOptionalFields(
 
   private void importBlock(final Block block) {
     final BlockImporter importer =
-        controller
-            .getProtocolSchedule()
-            .getByBlockNumber(block.getHeader().getNumber())
-            .getBlockImporter();
+        controller.getProtocolSchedule().getByBlockHeader(block.getHeader()).getBlockImporter();
 
-    final boolean imported =
+    final BlockImportResult importResult =
         importer.importBlock(controller.getProtocolContext(), block, HeaderValidationMode.NONE);
-    if (imported) {
+    if (importResult.isImported()) {
       LOG.info(
           "Successfully created and imported block at height {} ({})",
           block.getHeader().getNumber(),
@@ -219,7 +229,7 @@ private BlockHeader getParentHeader(final BlockData blockData, final List<Block>
 
     if (importedBlocks.size() > 0 && blockData.getNumber().isPresent()) {
       final long targetParentBlockNumber = blockData.getNumber().get() - 1L;
-      Optional<BlockHeader> maybeHeader =
+      final Optional<BlockHeader> maybeHeader =
           importedBlocks.stream()
               .map(Block::getHeader)
               .filter(h -> h.getNumber() == targetParentBlockNumber)
@@ -229,7 +239,7 @@ private BlockHeader getParentHeader(final BlockData blockData, final List<Block>
       }
     }
 
-    long blockNumber;
+    final long blockNumber;
     if (blockData.getNumber().isPresent()) {
       blockNumber = blockData.getNumber().get() - 1L;
     } else if (importedBlocks.size() > 0) {
@@ -240,7 +250,7 @@ private BlockHeader getParentHeader(final BlockData blockData, final List<Block>
     }
 
     if (blockNumber < BlockHeader.GENESIS_BLOCK_NUMBER) {
-      throw new IllegalArgumentException("Invalid block number: " + blockNumber + 1);
+      throw new IllegalArgumentException("Invalid block number: " + (blockNumber + 1));
     }
 
     return controller
diff --git a/besu/src/main/java/org/hyperledger/besu/chainimport/RlpBlockImporter.java b/besu/src/main/java/org/hyperledger/besu/chainimport/RlpBlockImporter.java
index f458d2cae76..6004bf621f1 100644
--- a/besu/src/main/java/org/hyperledger/besu/chainimport/RlpBlockImporter.java
+++ b/besu/src/main/java/org/hyperledger/besu/chainimport/RlpBlockImporter.java
@@ -21,10 +21,12 @@
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.core.BlockImporter;
 import org.hyperledger.besu.ethereum.core.Difficulty;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
+import org.hyperledger.besu.ethereum.mainnet.BlockImportResult;
 import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
@@ -41,15 +43,16 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Stopwatch;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Tool for importing rlp-encoded block data from files. */
 public class RlpBlockImporter implements Closeable {
-  private static final Logger LOG = LogManager.getFormatterLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(RlpBlockImporter.class);
 
   private final Semaphore blockBacklog = new Semaphore(2);
 
@@ -78,6 +81,17 @@ public RlpBlockImporter.ImportResult importBlockchain(
     return importBlockchain(blocks, besuController, skipPowValidation, 0L, Long.MAX_VALUE);
   }
 
+  /**
+   * Import blockchain.
+   *
+   * @param blocks the blocks
+   * @param besuController the besu controller
+   * @param skipPowValidation the skip pow validation
+   * @param startBlock the start block
+   * @param endBlock the end block
+   * @return the rlp block importer - import result
+   * @throws IOException the io exception
+   */
   public RlpBlockImporter.ImportResult importBlockchain(
       final Path blocks,
       final BesuController besuController,
@@ -89,15 +103,12 @@ public RlpBlockImporter.ImportResult importBlockchain(
     final ProtocolContext context = besuController.getProtocolContext();
     final MutableBlockchain blockchain = context.getBlockchain();
     int count = 0;
-
-    try (final RawBlockIterator iterator =
-        new RawBlockIterator(
-            blocks,
-            rlp ->
-                BlockHeader.readFrom(
-                    rlp, ScheduleBasedBlockHeaderFunctions.create(protocolSchedule)))) {
+    final BlockHeaderFunctions blockHeaderFunctions =
+        ScheduleBasedBlockHeaderFunctions.create(protocolSchedule);
+    try (final RawBlockIterator iterator = new RawBlockIterator(blocks, blockHeaderFunctions)) {
       BlockHeader previousHeader = null;
       CompletableFuture<Void> previousBlockFuture = null;
+      final AtomicReference<Throwable> threadedException = new AtomicReference<>();
       while (iterator.hasNext()) {
         final Block block = iterator.next();
         final BlockHeader header = block.getHeader();
@@ -113,7 +124,7 @@ public RlpBlockImporter.ImportResult importBlockchain(
         if (previousHeader == null) {
           previousHeader = lookupPreviousHeader(blockchain, header);
         }
-        final ProtocolSpec protocolSpec = protocolSchedule.getByBlockNumber(blockNumber);
+        final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(header);
         final BlockHeader lastHeader = previousHeader;
 
         final CompletableFuture<Void> validationFuture =
@@ -132,7 +143,12 @@ public RlpBlockImporter.ImportResult importBlockchain(
         }
 
         try {
-          blockBacklog.acquire();
+          do {
+            final Throwable t = (Exception) threadedException.get();
+            if (t != null) {
+              throw new RuntimeException("Error importing block " + header.getNumber(), t);
+            }
+          } while (!blockBacklog.tryAcquire(1, SECONDS));
         } catch (final InterruptedException e) {
           LOG.error("Interrupted adding to backlog.", e);
           break;
@@ -142,6 +158,11 @@ public RlpBlockImporter.ImportResult importBlockchain(
                 calculationFutures,
                 () -> evaluateBlock(context, block, header, protocolSpec, skipPowValidation),
                 importExecutor);
+        previousBlockFuture.exceptionally(
+            exception -> {
+              threadedException.set(exception);
+              return null;
+            });
 
         ++count;
         previousHeader = header;
@@ -196,7 +217,7 @@ private void evaluateBlock(
       cumulativeTimer.start();
       segmentTimer.start();
       final BlockImporter blockImporter = protocolSpec.getBlockImporter();
-      final boolean blockImported =
+      final BlockImportResult blockImported =
           blockImporter.importBlock(
               context,
               block,
@@ -204,7 +225,7 @@ private void evaluateBlock(
                   ? HeaderValidationMode.LIGHT_SKIP_DETACHED
                   : HeaderValidationMode.SKIP_DETACHED,
               skipPowValidation ? HeaderValidationMode.LIGHT : HeaderValidationMode.FULL);
-      if (!blockImported) {
+      if (!blockImported.isImported()) {
         throw new IllegalStateException(
             "Invalid block at block number " + header.getNumber() + ".");
       }
@@ -225,7 +246,7 @@ private void logProgress(final long blockNum) {
     final long elapseMicros = segmentTimer.elapsed(TimeUnit.MICROSECONDS);
     //noinspection PlaceholderCountMatchesArgumentCount
     LOG.info(
-        "Import at block %8d / %,14d gas %,11d micros / Mgps %7.3f segment %6.3f cumulative",
+        "Import at block {} / {} gas {} micros / Mgps {} segment {} cumulative",
         blockNum,
         segmentGas,
         elapseMicros,
@@ -251,6 +272,7 @@ private BlockHeader lookupPreviousHeader(
   public void close() {
     validationExecutor.shutdownNow();
     try {
+      //noinspection ResultOfMethodCallIgnored
       validationExecutor.awaitTermination(5, SECONDS);
     } catch (final Exception e) {
       LOG.error("Error shutting down validatorExecutor.", e);
@@ -258,18 +280,28 @@ public void close() {
 
     importExecutor.shutdownNow();
     try {
+      //noinspection ResultOfMethodCallIgnored
       importExecutor.awaitTermination(5, SECONDS);
     } catch (final Exception e) {
       LOG.error("Error shutting down importExecutor", e);
     }
   }
 
+  /** The Import result. */
   public static final class ImportResult {
 
+    /** The difficulty. */
     public final Difficulty td;
 
+    /** The Count. */
     final int count;
 
+    /**
+     * Instantiates a new Import result.
+     *
+     * @param td the td
+     * @param count the count
+     */
     ImportResult(final Difficulty td, final int count) {
       this.td = td;
       this.count = count;
diff --git a/besu/src/main/java/org/hyperledger/besu/chainimport/internal/BlockData.java b/besu/src/main/java/org/hyperledger/besu/chainimport/internal/BlockData.java
index 7a10a6f490a..b8dde10a7e9 100644
--- a/besu/src/main/java/org/hyperledger/besu/chainimport/internal/BlockData.java
+++ b/besu/src/main/java/org/hyperledger/besu/chainimport/internal/BlockData.java
@@ -15,11 +15,11 @@
 package org.hyperledger.besu.chainimport.internal;
 
 import org.hyperledger.besu.chainimport.internal.TransactionData.NonceProvider;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.WorldState;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.worldstate.WorldState;
 
 import java.util.HashMap;
 import java.util.List;
@@ -33,6 +33,9 @@
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.units.bigints.UInt256;
 
+/**
+ * Represents BlockData used in ChainData. Meant to be constructed by Json serializer/deserializer.
+ */
 @JsonIgnoreProperties("comment")
 public class BlockData {
 
@@ -42,6 +45,15 @@ public class BlockData {
   private final Optional<Address> coinbase;
   private final Optional<Bytes> extraData;
 
+  /**
+   * Constructor for BlockData
+   *
+   * @param number Block number in hex format.
+   * @param parentHash Parent hash in hex format.
+   * @param coinbase Coinbase Address in hex format.
+   * @param extraData Extra data in hex format.
+   * @param transactions list of TransactionData.
+   */
   @JsonCreator
   public BlockData(
       @JsonProperty("number") final Optional<String> number,
@@ -56,27 +68,59 @@ public BlockData(
     this.transactionData = transactions;
   }
 
+  /**
+   * Gets number.
+   *
+   * @return the number
+   */
   public Optional<Long> getNumber() {
     return number;
   }
 
+  /**
+   * Gets parent hash.
+   *
+   * @return the parent hash
+   */
   public Optional<Hash> getParentHash() {
     return parentHash;
   }
 
+  /**
+   * Gets coinbase.
+   *
+   * @return the coinbase
+   */
   public Optional<Address> getCoinbase() {
     return coinbase;
   }
 
+  /**
+   * Gets extra data.
+   *
+   * @return the extra data
+   */
   public Optional<Bytes> getExtraData() {
     return extraData;
   }
 
+  /**
+   * Stream transactions.
+   *
+   * @param worldState the world state
+   * @return the stream of Transaction
+   */
   public Stream<Transaction> streamTransactions(final WorldState worldState) {
     final NonceProvider nonceProvider = getNonceProvider(worldState);
     return transactionData.stream().map((tx) -> tx.getSignedTransaction(nonceProvider));
   }
 
+  /**
+   * Gets nonce provider.
+   *
+   * @param worldState the world state
+   * @return the nonce provider
+   */
   public NonceProvider getNonceProvider(final WorldState worldState) {
     final HashMap<Address, Long> currentNonceValues = new HashMap<>();
     return (Address address) ->
diff --git a/besu/src/main/java/org/hyperledger/besu/chainimport/internal/ChainData.java b/besu/src/main/java/org/hyperledger/besu/chainimport/internal/ChainData.java
index 1c525255c8c..cb9528b7e5c 100644
--- a/besu/src/main/java/org/hyperledger/besu/chainimport/internal/ChainData.java
+++ b/besu/src/main/java/org/hyperledger/besu/chainimport/internal/ChainData.java
@@ -20,16 +20,27 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+/** The Chain data. */
 @JsonIgnoreProperties("comment")
 public class ChainData {
 
   private final List<BlockData> blocks;
 
+  /**
+   * Instantiates a new Chain data.
+   *
+   * @param blocks the blocks
+   */
   @JsonCreator
   public ChainData(@JsonProperty("blocks") final List<BlockData> blocks) {
     this.blocks = blocks;
   }
 
+  /**
+   * Gets blocks.
+   *
+   * @return the blocks
+   */
   public List<BlockData> getBlocks() {
     return blocks;
   }
diff --git a/besu/src/main/java/org/hyperledger/besu/chainimport/internal/TransactionData.java b/besu/src/main/java/org/hyperledger/besu/chainimport/internal/TransactionData.java
index 558efc55d83..6358021af17 100644
--- a/besu/src/main/java/org/hyperledger/besu/chainimport/internal/TransactionData.java
+++ b/besu/src/main/java/org/hyperledger/besu/chainimport/internal/TransactionData.java
@@ -14,21 +14,26 @@
  */
 package org.hyperledger.besu.chainimport.internal;
 
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.crypto.SECP256K1.PrivateKey;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SECPPrivateKey;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
 
 import java.util.Optional;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.units.bigints.UInt256;
 
+/** The Transaction data. */
 @JsonIgnoreProperties("comment")
 public class TransactionData {
 
@@ -37,8 +42,21 @@ public class TransactionData {
   private final Bytes data;
   private final Wei value;
   private final Optional<Address> to;
-  private final PrivateKey privateKey;
+  private final SECPPrivateKey privateKey;
 
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+
+  /**
+   * Instantiates a new Transaction data.
+   *
+   * @param gasLimit the gas limit
+   * @param gasPrice the gas price
+   * @param data the data
+   * @param value the value
+   * @param to the to
+   * @param secretKey the secret key
+   */
   @JsonCreator
   public TransactionData(
       @JsonProperty("gasLimit") final String gasLimit,
@@ -52,11 +70,17 @@ public TransactionData(
     this.data = data.map(Bytes::fromHexString).orElse(Bytes.EMPTY);
     this.value = value.map(Wei::fromHexString).orElse(Wei.ZERO);
     this.to = to.map(Address::fromHexString);
-    this.privateKey = PrivateKey.create(Bytes32.fromHexString(secretKey));
+    this.privateKey = SIGNATURE_ALGORITHM.get().createPrivateKey(Bytes32.fromHexString(secretKey));
   }
 
+  /**
+   * Gets signed transaction.
+   *
+   * @param nonceProvider the nonce provider
+   * @return the signed transaction
+   */
   public Transaction getSignedTransaction(final NonceProvider nonceProvider) {
-    final KeyPair keyPair = KeyPair.create(privateKey);
+    final KeyPair keyPair = SIGNATURE_ALGORITHM.get().createKeyPair(privateKey);
 
     final Address fromAddress = Address.extract(keyPair.getPublicKey());
     final long nonce = nonceProvider.get(fromAddress);
@@ -71,8 +95,15 @@ public Transaction getSignedTransaction(final NonceProvider nonceProvider) {
         .signAndBuild(keyPair);
   }
 
+  /** The interface Nonce provider. */
   @FunctionalInterface
   public interface NonceProvider {
+    /**
+     * Get Nonce.
+     *
+     * @param address the address
+     * @return the Nonce
+     */
     long get(final Address address);
   }
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
index 5df5a0d11e9..87fc5a545d3 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
@@ -15,18 +15,23 @@
 package org.hyperledger.besu.cli;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 import static org.hyperledger.besu.cli.DefaultCommandValues.getDefaultBesuDataPath;
 import static org.hyperledger.besu.cli.config.NetworkName.MAINNET;
 import static org.hyperledger.besu.cli.util.CommandLineUtils.DEPENDENCY_WARNING_MSG;
+import static org.hyperledger.besu.cli.util.CommandLineUtils.DEPRECATION_WARNING_MSG;
 import static org.hyperledger.besu.controller.BesuController.DATABASE_PATH;
 import static org.hyperledger.besu.ethereum.api.graphql.GraphQLConfiguration.DEFAULT_GRAPHQL_HTTP_PORT;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration.DEFAULT_ENGINE_JSON_RPC_PORT;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration.DEFAULT_JSON_RPC_PORT;
-import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.DEFAULT_JSON_RPC_APIS;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.DEFAULT_RPC_APIS;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.VALID_APIS;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.authentication.EngineAuthService.EPHEMERAL_JWT_FILE;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration.DEFAULT_WEBSOCKET_PORT;
-import static org.hyperledger.besu.ethereum.permissioning.QuorumPermissioningConfiguration.QIP714_DEFAULT_BLOCK;
+import static org.hyperledger.besu.ethereum.permissioning.GoQuorumPermissioningConfiguration.QIP714_DEFAULT_BLOCK;
 import static org.hyperledger.besu.metrics.BesuMetricCategory.DEFAULT_METRIC_CATEGORIES;
 import static org.hyperledger.besu.metrics.MetricsProtocol.PROMETHEUS;
 import static org.hyperledger.besu.metrics.prometheus.MetricsConfiguration.DEFAULT_METRICS_PORT;
@@ -41,22 +46,31 @@
 import org.hyperledger.besu.chainimport.RlpBlockImporter;
 import org.hyperledger.besu.cli.config.EthNetworkConfig;
 import org.hyperledger.besu.cli.config.NetworkName;
+import org.hyperledger.besu.cli.converter.FractionConverter;
 import org.hyperledger.besu.cli.converter.MetricCategoryConverter;
 import org.hyperledger.besu.cli.converter.PercentageConverter;
-import org.hyperledger.besu.cli.converter.RpcApisConverter;
 import org.hyperledger.besu.cli.custom.CorsAllowedOriginsProperty;
 import org.hyperledger.besu.cli.custom.JsonRPCAllowlistHostsProperty;
 import org.hyperledger.besu.cli.custom.RpcAuthFileValidator;
-import org.hyperledger.besu.cli.error.BesuExceptionHandler;
-import org.hyperledger.besu.cli.options.unstable.DataStorageOptions;
+import org.hyperledger.besu.cli.error.BesuExecutionExceptionHandler;
+import org.hyperledger.besu.cli.error.BesuParameterExceptionHandler;
+import org.hyperledger.besu.cli.options.stable.DataStorageOptions;
+import org.hyperledger.besu.cli.options.stable.EthstatsOptions;
+import org.hyperledger.besu.cli.options.stable.LoggingLevelOption;
+import org.hyperledger.besu.cli.options.stable.NodePrivateKeyFileOption;
+import org.hyperledger.besu.cli.options.stable.P2PTLSConfigOptions;
+import org.hyperledger.besu.cli.options.unstable.ChainPruningOptions;
 import org.hyperledger.besu.cli.options.unstable.DnsOptions;
 import org.hyperledger.besu.cli.options.unstable.EthProtocolOptions;
-import org.hyperledger.besu.cli.options.unstable.EthstatsOptions;
+import org.hyperledger.besu.cli.options.unstable.EvmOptions;
+import org.hyperledger.besu.cli.options.unstable.IpcOptions;
 import org.hyperledger.besu.cli.options.unstable.MetricsCLIOptions;
 import org.hyperledger.besu.cli.options.unstable.MiningOptions;
 import org.hyperledger.besu.cli.options.unstable.NatOptions;
 import org.hyperledger.besu.cli.options.unstable.NativeLibraryOptions;
 import org.hyperledger.besu.cli.options.unstable.NetworkingOptions;
+import org.hyperledger.besu.cli.options.unstable.PkiBlockCreationOptions;
+import org.hyperledger.besu.cli.options.unstable.PrivacyPluginOptions;
 import org.hyperledger.besu.cli.options.unstable.RPCOptions;
 import org.hyperledger.besu.cli.options.unstable.SynchronizerOptions;
 import org.hyperledger.besu.cli.options.unstable.TransactionPoolOptions;
@@ -65,60 +79,76 @@
 import org.hyperledger.besu.cli.subcommands.PasswordSubCommand;
 import org.hyperledger.besu.cli.subcommands.PublicKeySubCommand;
 import org.hyperledger.besu.cli.subcommands.RetestethSubCommand;
+import org.hyperledger.besu.cli.subcommands.ValidateConfigSubCommand;
 import org.hyperledger.besu.cli.subcommands.blocks.BlocksSubCommand;
 import org.hyperledger.besu.cli.subcommands.operator.OperatorSubCommand;
 import org.hyperledger.besu.cli.subcommands.rlp.RLPSubCommand;
+import org.hyperledger.besu.cli.subcommands.storage.StorageSubCommand;
 import org.hyperledger.besu.cli.util.BesuCommandCustomFactory;
 import org.hyperledger.besu.cli.util.CommandLineUtils;
 import org.hyperledger.besu.cli.util.ConfigOptionSearchAndRunHandler;
 import org.hyperledger.besu.cli.util.VersionProvider;
+import org.hyperledger.besu.components.BesuComponent;
+import org.hyperledger.besu.config.CheckpointConfigOptions;
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.config.GenesisConfigOptions;
-import org.hyperledger.besu.config.GoQuorumOptions;
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
+import org.hyperledger.besu.config.MergeConfigOptions;
+import org.hyperledger.besu.consensus.qbft.pki.PkiBlockCreationConfiguration;
+import org.hyperledger.besu.consensus.qbft.pki.PkiBlockCreationConfigurationProvider;
 import org.hyperledger.besu.controller.BesuController;
 import org.hyperledger.besu.controller.BesuControllerBuilder;
-import org.hyperledger.besu.controller.TargetingGasLimitCalculator;
-import org.hyperledger.besu.crypto.KeyPairSecurityModule;
+import org.hyperledger.besu.crypto.Blake2bfMessageDigest;
+import org.hyperledger.besu.crypto.KeyPair;
 import org.hyperledger.besu.crypto.KeyPairUtil;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.crypto.SignatureAlgorithmType;
+import org.hyperledger.besu.cryptoservices.KeyPairSecurityModule;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.enclave.EnclaveFactory;
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.api.ApiConfiguration;
 import org.hyperledger.besu.ethereum.api.ImmutableApiConfiguration;
 import org.hyperledger.besu.ethereum.api.graphql.GraphQLConfiguration;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.JwtAlgorithm;
+import org.hyperledger.besu.ethereum.api.jsonrpc.ipc.JsonRpcIpcConfiguration;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.tls.FileBasedPasswordProvider;
 import org.hyperledger.besu.ethereum.api.tls.TlsClientAuthConfiguration;
 import org.hyperledger.besu.ethereum.api.tls.TlsConfiguration;
-import org.hyperledger.besu.ethereum.blockcreation.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.AbstractAltBnPrecompiledContract;
+import org.hyperledger.besu.ethereum.mainnet.FrontierTargetingGasLimitCalculator;
 import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration;
 import org.hyperledger.besu.ethereum.p2p.peers.EnodeDnsConfiguration;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.peers.StaticNodesParser;
+import org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty.TLSConfiguration;
+import org.hyperledger.besu.ethereum.permissioning.GoQuorumPermissioningConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.LocalPermissioningConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.PermissioningConfigurationBuilder;
-import org.hyperledger.besu.ethereum.permissioning.QuorumPermissioningConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.SmartContractPermissioningConfiguration;
 import org.hyperledger.besu.ethereum.privacy.storage.keyvalue.PrivacyKeyValueStorageProvider;
 import org.hyperledger.besu.ethereum.privacy.storage.keyvalue.PrivacyKeyValueStorageProviderBuilder;
+import org.hyperledger.besu.ethereum.storage.StorageProvider;
+import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProvider;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProviderBuilder;
 import org.hyperledger.besu.ethereum.worldstate.PrunerConfiguration;
+import org.hyperledger.besu.evm.precompile.AbstractAltBnPrecompiledContract;
+import org.hyperledger.besu.evm.precompile.BigIntegerModularExponentiationPrecompiledContract;
+import org.hyperledger.besu.evm.precompile.KZGPointEvalPrecompiledContract;
 import org.hyperledger.besu.metrics.BesuMetricCategory;
 import org.hyperledger.besu.metrics.MetricCategoryRegistryImpl;
 import org.hyperledger.besu.metrics.MetricsProtocol;
@@ -128,24 +158,40 @@
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
 import org.hyperledger.besu.metrics.vertx.VertxMetricsAdapterFactory;
 import org.hyperledger.besu.nat.NatMethod;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.plugin.services.BesuConfiguration;
 import org.hyperledger.besu.plugin.services.BesuEvents;
+import org.hyperledger.besu.plugin.services.BlockchainService;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.plugin.services.PermissioningService;
 import org.hyperledger.besu.plugin.services.PicoCLIOptions;
+import org.hyperledger.besu.plugin.services.PrivacyPluginService;
+import org.hyperledger.besu.plugin.services.RpcEndpointService;
 import org.hyperledger.besu.plugin.services.SecurityModuleService;
 import org.hyperledger.besu.plugin.services.StorageService;
+import org.hyperledger.besu.plugin.services.TraceService;
+import org.hyperledger.besu.plugin.services.TransactionSelectionService;
 import org.hyperledger.besu.plugin.services.exception.StorageException;
 import org.hyperledger.besu.plugin.services.metrics.MetricCategory;
 import org.hyperledger.besu.plugin.services.metrics.MetricCategoryRegistry;
 import org.hyperledger.besu.plugin.services.securitymodule.SecurityModule;
 import org.hyperledger.besu.plugin.services.storage.PrivacyKeyValueStorageFactory;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBPlugin;
+import org.hyperledger.besu.plugin.services.txselection.TransactionSelectorFactory;
 import org.hyperledger.besu.services.BesuEventsImpl;
 import org.hyperledger.besu.services.BesuPluginContextImpl;
+import org.hyperledger.besu.services.BlockchainServiceImpl;
+import org.hyperledger.besu.services.PermissioningServiceImpl;
 import org.hyperledger.besu.services.PicoCLIOptionsImpl;
+import org.hyperledger.besu.services.PrivacyPluginServiceImpl;
+import org.hyperledger.besu.services.RpcEndpointServiceImpl;
 import org.hyperledger.besu.services.SecurityModuleServiceImpl;
 import org.hyperledger.besu.services.StorageServiceImpl;
+import org.hyperledger.besu.services.TraceServiceImpl;
+import org.hyperledger.besu.services.TransactionSelectionServiceImpl;
 import org.hyperledger.besu.services.kvstore.InMemoryStoragePlugin;
+import org.hyperledger.besu.util.InvalidConfigurationException;
+import org.hyperledger.besu.util.LogConfigurator;
 import org.hyperledger.besu.util.NetworkUtility;
 import org.hyperledger.besu.util.PermissioningConfigurationValidator;
 import org.hyperledger.besu.util.number.Fraction;
@@ -161,8 +207,11 @@
 import java.net.URI;
 import java.net.UnknownHostException;
 import java.nio.file.Path;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
 import java.time.Clock;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -174,8 +223,11 @@
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
@@ -186,19 +238,20 @@
 import io.vertx.core.VertxOptions;
 import io.vertx.core.json.DecodeException;
 import io.vertx.core.metrics.MetricsOptions;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.config.Configurator;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.units.bigints.UInt256;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import picocli.AutoComplete;
 import picocli.CommandLine;
-import picocli.CommandLine.AbstractParseResultHandler;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.ExecutionException;
+import picocli.CommandLine.IExecutionStrategy;
+import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Option;
 import picocli.CommandLine.ParameterException;
 
+/** Represents the main Besu CLI command that runs the Besu Ethereum client full node. */
 @SuppressWarnings("FieldCanBeLocal") // because Picocli injected fields report false positives
 @Command(
     description = "This command runs the Besu Ethereum client full node.",
@@ -206,10 +259,10 @@
     name = "besu",
     mixinStandardHelpOptions = true,
     versionProvider = VersionProvider.class,
-    header = "Usage:",
+    header = "@|bold,fg(cyan) Usage:|@",
     synopsisHeading = "%n",
-    descriptionHeading = "%nDescription:%n%n",
-    optionListHeading = "%nOptions:%n",
+    descriptionHeading = "%n@|bold,fg(cyan) Description:|@%n%n",
+    optionListHeading = "%n@|bold,fg(cyan) Options:|@%n",
     footerHeading = "%n",
     footer = "Besu is licensed under the Apache License 2.0")
 public class BesuCommand implements DefaultCommandValues, Runnable {
@@ -230,31 +283,49 @@ public class BesuCommand implements DefaultCommandValues, Runnable {
   final EthProtocolOptions unstableEthProtocolOptions = EthProtocolOptions.create();
   final MetricsCLIOptions unstableMetricsCLIOptions = MetricsCLIOptions.create();
   final TransactionPoolOptions unstableTransactionPoolOptions = TransactionPoolOptions.create();
-  private final EthstatsOptions unstableEthstatsOptions = EthstatsOptions.create();
-  private final DataStorageOptions unstableDataStorageOptions = DataStorageOptions.create();
   private final DnsOptions unstableDnsOptions = DnsOptions.create();
   private final MiningOptions unstableMiningOptions = MiningOptions.create();
   private final NatOptions unstableNatOptions = NatOptions.create();
   private final NativeLibraryOptions unstableNativeLibraryOptions = NativeLibraryOptions.create();
   private final RPCOptions unstableRPCOptions = RPCOptions.create();
+  private final PrivacyPluginOptions unstablePrivacyPluginOptions = PrivacyPluginOptions.create();
+  private final EvmOptions unstableEvmOptions = EvmOptions.create();
+  private final IpcOptions unstableIpcOptions = IpcOptions.create();
+  private final ChainPruningOptions unstableChainPruningOptions = ChainPruningOptions.create();
+
+  // stable CLI options
+  private final DataStorageOptions dataStorageOptions = DataStorageOptions.create();
+  private final EthstatsOptions ethstatsOptions = EthstatsOptions.create();
+  private final NodePrivateKeyFileOption nodePrivateKeyFileOption =
+      NodePrivateKeyFileOption.create();
+  private final LoggingLevelOption loggingLevelOption = LoggingLevelOption.create();
 
   private final RunnerBuilder runnerBuilder;
   private final BesuController.Builder controllerBuilderFactory;
   private final BesuPluginContextImpl besuPluginContext;
   private final StorageServiceImpl storageService;
   private final SecurityModuleServiceImpl securityModuleService;
+  private final PermissioningServiceImpl permissioningService;
+  private final PrivacyPluginServiceImpl privacyPluginService;
+  private final RpcEndpointServiceImpl rpcEndpointServiceImpl;
+
   private final Map<String, String> environment;
   private final MetricCategoryRegistryImpl metricCategoryRegistry =
       new MetricCategoryRegistryImpl();
   private final MetricCategoryConverter metricCategoryConverter = new MetricCategoryConverter();
 
-  // Public IP stored to prevent having to research it each time we need it.
-  private InetAddress autoDiscoveredDefaultIP = null;
-
   private final PreSynchronizationTaskRunner preSynchronizationTaskRunner =
       new PreSynchronizationTaskRunner();
 
   private final Set<Integer> allocatedPorts = new HashSet<>();
+  private final PkiBlockCreationConfigurationProvider pkiBlockCreationConfigProvider;
+  private GenesisConfigOptions genesisConfigOptions;
+
+  private RocksDBPlugin rocksDBPlugin;
+
+  private int maxPeers;
+  private int maxRemoteInitiatedPeers;
+  private int peersLowerBound;
 
   // CLI options defined by user at runtime.
   // Options parsing is done with CLI library Picocli https://picocli.info/
@@ -286,110 +357,155 @@ public class BesuCommand implements DefaultCommandValues, Runnable {
           "Genesis file. Setting this option makes --network option ignored and requires --network-id to be set.")
   private final File genesisFile = null;
 
-  @CommandLine.Option(
-      names = {"--node-private-key-file"},
-      paramLabel = MANDATORY_PATH_FORMAT_HELP,
-      description =
-          "The node's private key file (default: a file named \"key\" in the Besu data folder)")
-  private final File nodePrivateKeyFile = null;
-
   @Option(
       names = "--identity",
       paramLabel = "<String>",
       description = "Identification for this node in the Client ID",
       arity = "1")
   private final Optional<String> identityString = Optional.empty();
+  // P2P Discovery Option Group
+  @CommandLine.ArgGroup(validate = false, heading = "@|bold P2P Discovery Options|@%n")
+  P2PDiscoveryOptionGroup p2PDiscoveryOptionGroup = new P2PDiscoveryOptionGroup();
+
+  private final TransactionSelectionServiceImpl transactionSelectionServiceImpl;
+
+  static class P2PDiscoveryOptionGroup {
+
+    // Public IP stored to prevent having to research it each time we need it.
+    private InetAddress autoDiscoveredDefaultIP = null;
+
+    // Completely disables P2P within Besu.
+    @Option(
+        names = {"--p2p-enabled"},
+        description = "Enable P2P functionality (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private final Boolean p2pEnabled = true;
+
+    // Boolean option to indicate if peers should NOT be discovered, default to
+    // false indicates that
+    // the peers should be discovered by default.
+    //
+    // This negative option is required because of the nature of the option that is
+    // true when
+    // added on the command line. You can't do --option=false, so false is set as
+    // default
+    // and you have not to set the option at all if you want it false.
+    // This seems to be the only way it works with Picocli.
+    // Also many other software use the same negative option scheme for false
+    // defaults
+    // meaning that it's probably the right way to handle disabling options.
+    @Option(
+        names = {"--discovery-enabled"},
+        description = "Enable P2P discovery (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private final Boolean peerDiscoveryEnabled = true;
+
+    // A list of bootstrap nodes can be passed
+    // and a hardcoded list will be used otherwise by the Runner.
+    // NOTE: we have no control over default value here.
+    @Option(
+        names = {"--bootnodes"},
+        paramLabel = "<enode://id@host:port>",
+        description =
+            "Comma separated enode URLs for P2P discovery bootstrap. "
+                + "Default is a predefined list.",
+        split = ",",
+        arity = "0..*")
+    private final List<String> bootNodes = null;
+
+    @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
+    @Option(
+        names = {"--p2p-host"},
+        paramLabel = MANDATORY_HOST_FORMAT_HELP,
+        description = "IP address this node advertises to its peers (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private String p2pHost = autoDiscoverDefaultIP().getHostAddress();
+
+    @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
+    @Option(
+        names = {"--p2p-interface"},
+        paramLabel = MANDATORY_HOST_FORMAT_HELP,
+        description =
+            "The network interface address on which this node listens for P2P communication (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private String p2pInterface = NetworkUtility.INADDR_ANY;
+
+    @Option(
+        names = {"--p2p-port"},
+        paramLabel = MANDATORY_PORT_FORMAT_HELP,
+        description = "Port on which to listen for P2P communication (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private final Integer p2pPort = EnodeURLImpl.DEFAULT_LISTENING_PORT;
+
+    @Option(
+        names = {"--max-peers", "--p2p-peer-upper-bound"},
+        paramLabel = MANDATORY_INTEGER_FORMAT_HELP,
+        description = "Maximum P2P connections that can be established (default: ${DEFAULT-VALUE})")
+    private final Integer maxPeers = DEFAULT_MAX_PEERS;
+
+    @Option(
+        names = {"--remote-connections-limit-enabled"},
+        description =
+            "Whether to limit the number of P2P connections initiated remotely. (default: ${DEFAULT-VALUE})")
+    private final Boolean isLimitRemoteWireConnectionsEnabled = true;
+
+    @Option(
+        names = {"--remote-connections-max-percentage"},
+        paramLabel = MANDATORY_DOUBLE_FORMAT_HELP,
+        description =
+            "The maximum percentage of P2P connections that can be initiated remotely. Must be between 0 and 100 inclusive. (default: ${DEFAULT-VALUE})",
+        arity = "1",
+        converter = PercentageConverter.class)
+    private final Integer maxRemoteConnectionsPercentage =
+        Fraction.fromFloat(DEFAULT_FRACTION_REMOTE_WIRE_CONNECTIONS_ALLOWED)
+            .toPercentage()
+            .getValue();
+
+    @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
+    @CommandLine.Option(
+        names = {"--discovery-dns-url"},
+        description = "Specifies the URL to use for DNS discovery")
+    private String discoveryDnsUrl = null;
+
+    @Option(
+        names = {"--random-peer-priority-enabled"},
+        description =
+            "Allow for incoming connections to be prioritized randomly. This will prevent (typically small, stable) networks from forming impenetrable peer cliques. (default: ${DEFAULT-VALUE})")
+    private final Boolean randomPeerPriority = Boolean.FALSE;
+
+    @Option(
+        names = {"--banned-node-ids", "--banned-node-id"},
+        paramLabel = MANDATORY_NODE_ID_FORMAT_HELP,
+        description = "A list of node IDs to ban from the P2P network.",
+        split = ",",
+        arity = "1..*")
+    void setBannedNodeIds(final List<String> values) {
+      try {
+        bannedNodeIds =
+            values.stream()
+                .filter(value -> !value.isEmpty())
+                .map(EnodeURLImpl::parseNodeId)
+                .collect(Collectors.toList());
+      } catch (final IllegalArgumentException e) {
+        throw new ParameterException(
+            new CommandLine(this),
+            "Invalid ids supplied to '--banned-node-ids'. " + e.getMessage());
+      }
+    }
 
-  // Completely disables P2P within Besu.
-  @Option(
-      names = {"--p2p-enabled"},
-      description = "Enable P2P functionality (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private final Boolean p2pEnabled = true;
-
-  // Boolean option to indicate if peers should NOT be discovered, default to
-  // false indicates that
-  // the peers should be discovered by default.
-  //
-  // This negative option is required because of the nature of the option that is
-  // true when
-  // added on the command line. You can't do --option=false, so false is set as
-  // default
-  // and you have not to set the option at all if you want it false.
-  // This seems to be the only way it works with Picocli.
-  // Also many other software use the same negative option scheme for false
-  // defaults
-  // meaning that it's probably the right way to handle disabling options.
-  @Option(
-      names = {"--discovery-enabled"},
-      description = "Enable P2P discovery (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private final Boolean peerDiscoveryEnabled = true;
-
-  // A list of bootstrap nodes can be passed
-  // and a hardcoded list will be used otherwise by the Runner.
-  // NOTE: we have no control over default value here.
-  @Option(
-      names = {"--bootnodes"},
-      paramLabel = "<enode://id@host:port>",
-      description =
-          "Comma separated enode URLs for P2P discovery bootstrap. "
-              + "Default is a predefined list.",
-      split = ",",
-      arity = "0..*")
-  private final List<String> bootNodes = null;
-
-  @Option(
-      names = {"--max-peers"},
-      paramLabel = MANDATORY_INTEGER_FORMAT_HELP,
-      description = "Maximum P2P connections that can be established (default: ${DEFAULT-VALUE})")
-  private final Integer maxPeers = DEFAULT_MAX_PEERS;
-
-  @Option(
-      names = {"--remote-connections-limit-enabled"},
-      description =
-          "Whether to limit the number of P2P connections initiated remotely. (default: ${DEFAULT-VALUE})")
-  private final Boolean isLimitRemoteWireConnectionsEnabled = true;
-
-  @Option(
-      names = {"--remote-connections-max-percentage"},
-      paramLabel = MANDATORY_DOUBLE_FORMAT_HELP,
-      description =
-          "The maximum percentage of P2P connections that can be initiated remotely. Must be between 0 and 100 inclusive. (default: ${DEFAULT-VALUE})",
-      arity = "1",
-      converter = PercentageConverter.class)
-  private final Integer maxRemoteConnectionsPercentage =
-      Fraction.fromFloat(DEFAULT_FRACTION_REMOTE_WIRE_CONNECTIONS_ALLOWED)
-          .toPercentage()
-          .getValue();
+    private Collection<Bytes> bannedNodeIds = new ArrayList<>();
 
-  @Option(
-      names = {"--random-peer-priority-enabled"},
-      description =
-          "Allow for incoming connections to be prioritized randomly. This will prevent (typically small, stable) networks from forming impenetrable peer cliques. (default: ${DEFAULT-VALUE})")
-  private final Boolean randomPeerPriority = false;
+    // Used to discover the default IP of the client.
+    // Loopback IP is used by default as this is how smokeTests require it to be
+    // and it's probably a good security behaviour to default only on the localhost.
+    private InetAddress autoDiscoverDefaultIP() {
+      autoDiscoveredDefaultIP =
+          Optional.ofNullable(autoDiscoveredDefaultIP).orElseGet(InetAddress::getLoopbackAddress);
 
-  @Option(
-      names = {"--banned-node-ids", "--banned-node-id"},
-      paramLabel = MANDATORY_NODE_ID_FORMAT_HELP,
-      description = "A list of node IDs to ban from the P2P network.",
-      split = ",",
-      arity = "1..*")
-  void setBannedNodeIds(final List<String> values) {
-    try {
-      bannedNodeIds =
-          values.stream()
-              .filter(value -> !value.isEmpty())
-              .map(EnodeURL::parseNodeId)
-              .collect(Collectors.toList());
-    } catch (final IllegalArgumentException e) {
-      throw new ParameterException(
-          commandLine, "Invalid ids supplied to '--banned-node-ids'. " + e.getMessage());
+      return autoDiscoveredDefaultIP;
     }
   }
 
-  private Collection<Bytes> bannedNodeIds = new ArrayList<>();
-
   @Option(
       names = {"--sync-mode"},
       paramLabel = MANDATORY_MODE_FORMAT_HELP,
@@ -401,41 +517,18 @@ void setBannedNodeIds(final List<String> values) {
       names = {"--fast-sync-min-peers"},
       paramLabel = MANDATORY_INTEGER_FORMAT_HELP,
       description =
-          "Minimum number of peers required before starting fast sync. (default: ${DEFAULT-VALUE})")
+          "Minimum number of peers required before starting fast sync. Has only effect on PoW networks. (default: ${DEFAULT-VALUE})")
   private final Integer fastSyncMinPeerCount = FAST_SYNC_MIN_PEER_COUNT;
 
   @Option(
       names = {"--network"},
       paramLabel = MANDATORY_NETWORK_FORMAT_HELP,
+      defaultValue = "MAINNET",
       description =
           "Synchronize against the indicated network, possible values are ${COMPLETION-CANDIDATES}."
-              + " (default: MAINNET)")
+              + " (default: ${DEFAULT-VALUE})")
   private final NetworkName network = null;
 
-  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
-  @Option(
-      names = {"--p2p-host"},
-      paramLabel = MANDATORY_HOST_FORMAT_HELP,
-      description = "Ip address this node advertises to its peers (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private String p2pHost = autoDiscoverDefaultIP().getHostAddress();
-
-  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
-  @Option(
-      names = {"--p2p-interface"},
-      paramLabel = MANDATORY_HOST_FORMAT_HELP,
-      description =
-          "The network interface address on which this node listens for P2P communication (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private String p2pInterface = NetworkUtility.INADDR_ANY;
-
-  @Option(
-      names = {"--p2p-port"},
-      paramLabel = MANDATORY_PORT_FORMAT_HELP,
-      description = "Port on which to listen for P2P communication (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private final Integer p2pPort = EnodeURL.DEFAULT_LISTENING_PORT;
-
   @Option(
       names = {"--nat-method"},
       description =
@@ -452,275 +545,488 @@ void setBannedNodeIds(final List<String> values) {
   private final BigInteger networkId = null;
 
   @Option(
-      names = {"--graphql-http-enabled"},
-      description = "Set to start the GraphQL HTTP service (default: ${DEFAULT-VALUE})")
-  private final Boolean isGraphQLHttpEnabled = false;
-
-  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
-  @Option(
-      names = {"--graphql-http-host"},
-      paramLabel = MANDATORY_HOST_FORMAT_HELP,
-      description = "Host for GraphQL HTTP to listen on (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private String graphQLHttpHost = autoDiscoverDefaultIP().getHostAddress();
-
-  @Option(
-      names = {"--graphql-http-port"},
-      paramLabel = MANDATORY_PORT_FORMAT_HELP,
-      description = "Port for GraphQL HTTP to listen on (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private final Integer graphQLHttpPort = DEFAULT_GRAPHQL_HTTP_PORT;
-
-  @Option(
-      names = {"--graphql-http-cors-origins"},
-      description = "Comma separated origin domain URLs for CORS validation (default: none)")
-  private final CorsAllowedOriginsProperty graphQLHttpCorsAllowedOrigins =
-      new CorsAllowedOriginsProperty();
-
-  @Option(
-      names = {"--rpc-http-enabled"},
-      description = "Set to start the JSON-RPC HTTP service (default: ${DEFAULT-VALUE})")
-  private final Boolean isRpcHttpEnabled = false;
-
-  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
-  @Option(
-      names = {"--rpc-http-host"},
-      paramLabel = MANDATORY_HOST_FORMAT_HELP,
-      description = "Host for JSON-RPC HTTP to listen on (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private String rpcHttpHost = autoDiscoverDefaultIP().getHostAddress();
-
-  @Option(
-      names = {"--rpc-http-port"},
-      paramLabel = MANDATORY_PORT_FORMAT_HELP,
-      description = "Port for JSON-RPC HTTP to listen on (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private final Integer rpcHttpPort = DEFAULT_JSON_RPC_PORT;
-
-  // A list of origins URLs that are accepted by the JsonRpcHttpServer (CORS)
-  @Option(
-      names = {"--rpc-http-cors-origins"},
-      description = "Comma separated origin domain URLs for CORS validation (default: none)")
-  private final CorsAllowedOriginsProperty rpcHttpCorsAllowedOrigins =
-      new CorsAllowedOriginsProperty();
-
-  @Option(
-      names = {"--rpc-http-api", "--rpc-http-apis"},
-      paramLabel = "<api name>",
-      split = ",",
-      arity = "1..*",
-      converter = RpcApisConverter.class,
-      description =
-          "Comma separated list of APIs to enable on JSON-RPC HTTP service (default: ${DEFAULT-VALUE})")
-  private final Collection<RpcApi> rpcHttpApis = DEFAULT_JSON_RPC_APIS;
-
-  @Option(
-      names = {"--rpc-http-authentication-enabled"},
-      description =
-          "Require authentication for the JSON-RPC HTTP service (default: ${DEFAULT-VALUE})")
-  private final Boolean isRpcHttpAuthenticationEnabled = false;
-
-  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
-  @CommandLine.Option(
-      names = {"--rpc-http-authentication-credentials-file"},
-      paramLabel = MANDATORY_FILE_FORMAT_HELP,
-      description =
-          "Storage file for JSON-RPC HTTP authentication credentials (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private String rpcHttpAuthenticationCredentialsFile = null;
-
-  @CommandLine.Option(
-      names = {"--rpc-http-authentication-jwt-public-key-file"},
-      paramLabel = MANDATORY_FILE_FORMAT_HELP,
-      description = "JWT public key file for JSON-RPC HTTP authentication",
-      arity = "1")
-  private final File rpcHttpAuthenticationPublicKeyFile = null;
-
-  @Option(
-      names = {"--rpc-http-tls-enabled"},
-      description = "Enable TLS for the JSON-RPC HTTP service (default: ${DEFAULT-VALUE})")
-  private final Boolean isRpcHttpTlsEnabled = false;
-
-  @Option(
-      names = {"--rpc-http-tls-keystore-file"},
-      paramLabel = MANDATORY_FILE_FORMAT_HELP,
-      description =
-          "Keystore (PKCS#12) containing key/certificate for the JSON-RPC HTTP service. Required if TLS is enabled.")
-  private final Path rpcHttpTlsKeyStoreFile = null;
-
-  @Option(
-      names = {"--rpc-http-tls-keystore-password-file"},
-      paramLabel = MANDATORY_FILE_FORMAT_HELP,
-      description =
-          "File containing password to unlock keystore for the JSON-RPC HTTP service. Required if TLS is enabled.")
-  private final Path rpcHttpTlsKeyStorePasswordFile = null;
-
-  @Option(
-      names = {"--rpc-http-tls-client-auth-enabled"},
-      description =
-          "Enable TLS client authentication for the JSON-RPC HTTP service (default: ${DEFAULT-VALUE})")
-  private final Boolean isRpcHttpTlsClientAuthEnabled = false;
-
-  @Option(
-      names = {"--rpc-http-tls-known-clients-file"},
-      paramLabel = MANDATORY_FILE_FORMAT_HELP,
-      description =
-          "Path to file containing clients certificate common name and fingerprint for client authentication")
-  private final Path rpcHttpTlsKnownClientsFile = null;
-
-  @Option(
-      names = {"--rpc-http-tls-ca-clients-enabled"},
-      description =
-          "Enable to accept clients certificate signed by a valid CA for client authentication (default: ${DEFAULT-VALUE})")
-  private final Boolean isRpcHttpTlsCAClientsEnabled = false;
-
-  @Option(
-      names = {"--rpc-ws-enabled"},
-      description = "Set to start the JSON-RPC WebSocket service (default: ${DEFAULT-VALUE})")
-  private final Boolean isRpcWsEnabled = false;
-
-  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
-  @Option(
-      names = {"--rpc-ws-host"},
-      paramLabel = MANDATORY_HOST_FORMAT_HELP,
-      description = "Host for JSON-RPC WebSocket service to listen on (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private String rpcWsHost = autoDiscoverDefaultIP().getHostAddress();
-
-  @Option(
-      names = {"--rpc-ws-port"},
-      paramLabel = MANDATORY_PORT_FORMAT_HELP,
-      description = "Port for JSON-RPC WebSocket service to listen on (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private final Integer rpcWsPort = DEFAULT_WEBSOCKET_PORT;
-
-  @Option(
-      names = {"--rpc-ws-api", "--rpc-ws-apis"},
-      paramLabel = "<api name>",
-      split = ",",
-      arity = "1..*",
-      converter = RpcApisConverter.class,
-      description =
-          "Comma separated list of APIs to enable on JSON-RPC WebSocket service (default: ${DEFAULT-VALUE})")
-  private final List<RpcApi> rpcWsApis = DEFAULT_JSON_RPC_APIS;
-
-  @Option(
-      names = {"--rpc-ws-authentication-enabled"},
-      description =
-          "Require authentication for the JSON-RPC WebSocket service (default: ${DEFAULT-VALUE})")
-  private final Boolean isRpcWsAuthenticationEnabled = false;
-
-  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
-  @CommandLine.Option(
-      names = {"--rpc-ws-authentication-credentials-file"},
-      paramLabel = MANDATORY_FILE_FORMAT_HELP,
-      description =
-          "Storage file for JSON-RPC WebSocket authentication credentials (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private String rpcWsAuthenticationCredentialsFile = null;
-
-  @CommandLine.Option(
-      names = {"--rpc-ws-authentication-jwt-public-key-file"},
-      paramLabel = MANDATORY_FILE_FORMAT_HELP,
-      description = "JWT public key file for JSON-RPC WebSocket authentication",
-      arity = "1")
-  private final File rpcWsAuthenticationPublicKeyFile = null;
-
-  @Option(
-      names = {"--privacy-tls-enabled"},
-      paramLabel = MANDATORY_FILE_FORMAT_HELP,
-      description = "Enable TLS for connecting to privacy enclave (default: ${DEFAULT-VALUE})")
-  private final Boolean isPrivacyTlsEnabled = false;
-
-  @Option(
-      names = "--privacy-tls-keystore-file",
-      paramLabel = MANDATORY_FILE_FORMAT_HELP,
-      description =
-          "Path to a PKCS#12 formatted keystore; used to enable TLS on inbound connections.")
-  private final Path privacyKeyStoreFile = null;
-
-  @Option(
-      names = "--privacy-tls-keystore-password-file",
-      paramLabel = MANDATORY_FILE_FORMAT_HELP,
-      description = "Path to a file containing the password used to decrypt the keystore.")
-  private final Path privacyKeyStorePasswordFile = null;
-
-  @Option(
-      names = "--privacy-tls-known-enclave-file",
+      names = {"--kzg-trusted-setup"},
       paramLabel = MANDATORY_FILE_FORMAT_HELP,
-      description = "Path to a file containing the fingerprints of the authorized privacy enclave.")
-  private final Path privacyTlsKnownEnclaveFile = null;
-
-  @Option(
-      names = {"--metrics-enabled"},
-      description = "Set to start the metrics exporter (default: ${DEFAULT-VALUE})")
-  private final Boolean isMetricsEnabled = false;
-
-  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
-  @Option(
-      names = {"--metrics-protocol"},
-      description =
-          "Metrics protocol, one of PROMETHEUS, OPENTELEMETRY or NONE. (default: ${DEFAULT-VALUE})")
-  private MetricsProtocol metricsProtocol = PROMETHEUS;
-
-  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
-  @Option(
-      names = {"--metrics-host"},
-      paramLabel = MANDATORY_HOST_FORMAT_HELP,
-      description = "Host for the metrics exporter to listen on (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private String metricsHost = autoDiscoverDefaultIP().getHostAddress();
-
-  @Option(
-      names = {"--metrics-port"},
-      paramLabel = MANDATORY_PORT_FORMAT_HELP,
-      description = "Port for the metrics exporter to listen on (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private final Integer metricsPort = DEFAULT_METRICS_PORT;
-
-  @Option(
-      names = {"--metrics-category", "--metrics-categories"},
-      paramLabel = "<category name>",
-      split = ",",
-      arity = "1..*",
-      description =
-          "Comma separated list of categories to track metrics for (default: ${DEFAULT-VALUE})")
-  private final Set<MetricCategory> metricCategories = DEFAULT_METRIC_CATEGORIES;
-
-  @Option(
-      names = {"--metrics-push-enabled"},
-      description = "Enable the metrics push gateway integration (default: ${DEFAULT-VALUE})")
-  private final Boolean isMetricsPushEnabled = false;
-
-  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
-  @Option(
-      names = {"--metrics-push-host"},
-      paramLabel = MANDATORY_HOST_FORMAT_HELP,
-      description = "Host of the Prometheus Push Gateway for push mode (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private String metricsPushHost = autoDiscoverDefaultIP().getHostAddress();
-
-  @Option(
-      names = {"--metrics-push-port"},
-      paramLabel = MANDATORY_PORT_FORMAT_HELP,
-      description = "Port of the Prometheus Push Gateway for push mode (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private final Integer metricsPushPort = DEFAULT_METRICS_PUSH_PORT;
-
-  @Option(
-      names = {"--metrics-push-interval"},
-      paramLabel = MANDATORY_INTEGER_FORMAT_HELP,
       description =
-          "Interval in seconds to push metrics when in push mode (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private final Integer metricsPushInterval = 15;
-
-  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
-  @Option(
-      names = {"--metrics-push-prometheus-job"},
-      description = "Job name to use when in push mode (default: ${DEFAULT-VALUE})",
+          "Path to file containing the KZG trusted setup, mandatory for custom networks that support data blobs, "
+              + "optional for overriding named networks default.",
       arity = "1")
-  private String metricsPrometheusJob = "besu-client";
+  private final Path kzgTrustedSetupFile = null;
+
+  @CommandLine.ArgGroup(validate = false, heading = "@|bold GraphQL Options|@%n")
+  GraphQlOptionGroup graphQlOptionGroup = new GraphQlOptionGroup();
+
+  static class GraphQlOptionGroup {
+    @Option(
+        names = {"--graphql-http-enabled"},
+        description = "Set to start the GraphQL HTTP service (default: ${DEFAULT-VALUE})")
+    private final Boolean isGraphQLHttpEnabled = false;
+
+    @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
+    @Option(
+        names = {"--graphql-http-host"},
+        paramLabel = MANDATORY_HOST_FORMAT_HELP,
+        description = "Host for GraphQL HTTP to listen on (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private String graphQLHttpHost;
+
+    @Option(
+        names = {"--graphql-http-port"},
+        paramLabel = MANDATORY_PORT_FORMAT_HELP,
+        description = "Port for GraphQL HTTP to listen on (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private final Integer graphQLHttpPort = DEFAULT_GRAPHQL_HTTP_PORT;
+
+    @Option(
+        names = {"--graphql-http-cors-origins"},
+        description = "Comma separated origin domain URLs for CORS validation (default: none)")
+    protected final CorsAllowedOriginsProperty graphQLHttpCorsAllowedOrigins =
+        new CorsAllowedOriginsProperty();
+  }
+
+  // Engine JSON-PRC Options
+  @CommandLine.ArgGroup(validate = false, heading = "@|bold Engine JSON-RPC Options|@%n")
+  EngineRPCOptionGroup engineRPCOptionGroup = new EngineRPCOptionGroup();
+
+  static class EngineRPCOptionGroup {
+    @Option(
+        names = {"--engine-rpc-enabled"},
+        description =
+            "enable the engine api, even in the absence of merge-specific configurations.")
+    private final Boolean overrideEngineRpcEnabled = false;
+
+    @Option(
+        names = {"--engine-rpc-port", "--engine-rpc-http-port"},
+        paramLabel = MANDATORY_PORT_FORMAT_HELP,
+        description = "Port to provide consensus client APIS on (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private final Integer engineRpcPort = DEFAULT_ENGINE_JSON_RPC_PORT;
+
+    @Option(
+        names = {"--engine-jwt-secret"},
+        paramLabel = MANDATORY_FILE_FORMAT_HELP,
+        description = "Path to file containing shared secret key for JWT signature verification")
+    private final Path engineJwtKeyFile = null;
+
+    @Option(
+        names = {"--engine-jwt-enabled"},
+        description = "deprecated option, engine jwt auth is enabled by default",
+        hidden = true)
+    @SuppressWarnings({"FieldCanBeFinal", "UnusedVariable"})
+    private final Boolean deprecatedIsEngineAuthEnabled = true;
+
+    @Option(
+        names = {"--engine-jwt-disabled"},
+        description = "Disable authentication for Engine APIs (default: ${DEFAULT-VALUE})")
+    private final Boolean isEngineAuthDisabled = false;
+
+    @Option(
+        names = {"--engine-host-allowlist"},
+        paramLabel = "<hostname>[,<hostname>...]... or * or all",
+        description =
+            "Comma separated list of hostnames to allow for ENGINE API access (applies to both HTTP and websockets), or * to accept any host (default: ${DEFAULT-VALUE})",
+        defaultValue = "localhost,127.0.0.1")
+    private final JsonRPCAllowlistHostsProperty engineHostsAllowlist =
+        new JsonRPCAllowlistHostsProperty();
+  }
+
+  // JSON-RPC HTTP Options
+  @CommandLine.ArgGroup(validate = false, heading = "@|bold JSON-RPC HTTP Options|@%n")
+  JsonRPCHttpOptionGroup jsonRPCHttpOptionGroup = new JsonRPCHttpOptionGroup();
+
+  static class JsonRPCHttpOptionGroup {
+    @Option(
+        names = {"--rpc-http-enabled"},
+        description = "Set to start the JSON-RPC HTTP service (default: ${DEFAULT-VALUE})")
+    private final Boolean isRpcHttpEnabled = false;
+
+    @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
+    @Option(
+        names = {"--rpc-http-host"},
+        paramLabel = MANDATORY_HOST_FORMAT_HELP,
+        description = "Host for JSON-RPC HTTP to listen on (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private String rpcHttpHost;
+
+    @Option(
+        names = {"--rpc-http-port"},
+        paramLabel = MANDATORY_PORT_FORMAT_HELP,
+        description = "Port for JSON-RPC HTTP to listen on (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private final Integer rpcHttpPort = DEFAULT_JSON_RPC_PORT;
+
+    @Option(
+        names = {"--rpc-http-max-active-connections"},
+        description =
+            "Maximum number of HTTP connections allowed for JSON-RPC (default: ${DEFAULT-VALUE}). Once this limit is reached, incoming connections will be rejected.",
+        arity = "1")
+    private final Integer rpcHttpMaxConnections = DEFAULT_HTTP_MAX_CONNECTIONS;
+
+    // A list of origins URLs that are accepted by the JsonRpcHttpServer (CORS)
+    @Option(
+        names = {"--rpc-http-cors-origins"},
+        description = "Comma separated origin domain URLs for CORS validation (default: none)")
+    private final CorsAllowedOriginsProperty rpcHttpCorsAllowedOrigins =
+        new CorsAllowedOriginsProperty();
+
+    @Option(
+        names = {"--rpc-http-api", "--rpc-http-apis"},
+        paramLabel = "<api name>",
+        split = " {0,1}, {0,1}",
+        arity = "1..*",
+        description =
+            "Comma separated list of APIs to enable on JSON-RPC HTTP service (default: ${DEFAULT-VALUE})")
+    private final List<String> rpcHttpApis = DEFAULT_RPC_APIS;
+
+    @Option(
+        names = {"--rpc-http-api-method-no-auth", "--rpc-http-api-methods-no-auth"},
+        paramLabel = "<api name>",
+        split = " {0,1}, {0,1}",
+        arity = "1..*",
+        description =
+            "Comma separated list of API methods to exclude from RPC authentication services, RPC HTTP authentication must be enabled")
+    private final List<String> rpcHttpApiMethodsNoAuth = new ArrayList<String>();
+
+    @Option(
+        names = {"--rpc-http-authentication-enabled"},
+        description =
+            "Require authentication for the JSON-RPC HTTP service (default: ${DEFAULT-VALUE})")
+    private final Boolean isRpcHttpAuthenticationEnabled = false;
+
+    @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
+    @CommandLine.Option(
+        names = {"--rpc-http-authentication-credentials-file"},
+        paramLabel = MANDATORY_FILE_FORMAT_HELP,
+        description =
+            "Storage file for JSON-RPC HTTP authentication credentials (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private String rpcHttpAuthenticationCredentialsFile = null;
+
+    @CommandLine.Option(
+        names = {"--rpc-http-authentication-jwt-public-key-file"},
+        paramLabel = MANDATORY_FILE_FORMAT_HELP,
+        description = "JWT public key file for JSON-RPC HTTP authentication",
+        arity = "1")
+    private final File rpcHttpAuthenticationPublicKeyFile = null;
+
+    @Option(
+        names = {"--rpc-http-authentication-jwt-algorithm"},
+        description =
+            "Encryption algorithm used for HTTP JWT public key. Possible values are ${COMPLETION-CANDIDATES}"
+                + " (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private final JwtAlgorithm rpcHttpAuthenticationAlgorithm = DEFAULT_JWT_ALGORITHM;
+
+    @Option(
+        names = {"--rpc-http-tls-enabled"},
+        description = "Enable TLS for the JSON-RPC HTTP service (default: ${DEFAULT-VALUE})")
+    private final Boolean isRpcHttpTlsEnabled = false;
+
+    @Option(
+        names = {"--rpc-http-tls-keystore-file"},
+        paramLabel = MANDATORY_FILE_FORMAT_HELP,
+        description =
+            "Keystore (PKCS#12) containing key/certificate for the JSON-RPC HTTP service. Required if TLS is enabled.")
+    private final Path rpcHttpTlsKeyStoreFile = null;
+
+    @Option(
+        names = {"--rpc-http-tls-keystore-password-file"},
+        paramLabel = MANDATORY_FILE_FORMAT_HELP,
+        description =
+            "File containing password to unlock keystore for the JSON-RPC HTTP service. Required if TLS is enabled.")
+    private final Path rpcHttpTlsKeyStorePasswordFile = null;
+
+    @Option(
+        names = {"--rpc-http-tls-client-auth-enabled"},
+        description =
+            "Enable TLS client authentication for the JSON-RPC HTTP service (default: ${DEFAULT-VALUE})")
+    private final Boolean isRpcHttpTlsClientAuthEnabled = false;
+
+    @Option(
+        names = {"--rpc-http-tls-known-clients-file"},
+        paramLabel = MANDATORY_FILE_FORMAT_HELP,
+        description =
+            "Path to file containing clients certificate common name and fingerprint for client authentication")
+    private final Path rpcHttpTlsKnownClientsFile = null;
+
+    @Option(
+        names = {"--rpc-http-tls-ca-clients-enabled"},
+        description =
+            "Enable to accept clients certificate signed by a valid CA for client authentication (default: ${DEFAULT-VALUE})")
+    private final Boolean isRpcHttpTlsCAClientsEnabled = false;
+
+    @Option(
+        names = {"--rpc-http-tls-protocol", "--rpc-http-tls-protocols"},
+        description =
+            "Comma separated list of TLS protocols to support (default: ${DEFAULT-VALUE})",
+        split = ",",
+        arity = "1..*")
+    private final List<String> rpcHttpTlsProtocols = new ArrayList<>(DEFAULT_TLS_PROTOCOLS);
+
+    @Option(
+        names = {"--rpc-http-tls-cipher-suite", "--rpc-http-tls-cipher-suites"},
+        description = "Comma separated list of TLS cipher suites to support",
+        split = ",",
+        arity = "1..*")
+    private final List<String> rpcHttpTlsCipherSuites = new ArrayList<>();
+
+    @CommandLine.Option(
+        names = {"--rpc-http-max-batch-size"},
+        paramLabel = MANDATORY_INTEGER_FORMAT_HELP,
+        description =
+            "Specifies the maximum number of requests in a single RPC batch request via RPC. -1 specifies no limit  (default: ${DEFAULT-VALUE})")
+    private final Integer rpcHttpMaxBatchSize = DEFAULT_HTTP_MAX_BATCH_SIZE;
+
+    @CommandLine.Option(
+        names = {"--rpc-http-max-request-content-length"},
+        paramLabel = MANDATORY_LONG_FORMAT_HELP,
+        description = "Specifies the maximum request content length. (default: ${DEFAULT-VALUE})")
+    private final Long rpcHttpMaxRequestContentLength = DEFAULT_MAX_REQUEST_CONTENT_LENGTH;
+  }
+
+  // JSON-RPC Websocket Options
+  @CommandLine.ArgGroup(validate = false, heading = "@|bold JSON-RPC Websocket Options|@%n")
+  JsonRPCWebsocketOptionGroup jsonRPCWebsocketOptionGroup = new JsonRPCWebsocketOptionGroup();
+
+  static class JsonRPCWebsocketOptionGroup {
+    @Option(
+        names = {"--rpc-ws-authentication-jwt-algorithm"},
+        description =
+            "Encryption algorithm used for Websockets JWT public key. Possible values are ${COMPLETION-CANDIDATES}"
+                + " (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private final JwtAlgorithm rpcWebsocketsAuthenticationAlgorithm = DEFAULT_JWT_ALGORITHM;
+
+    @Option(
+        names = {"--rpc-ws-enabled"},
+        description = "Set to start the JSON-RPC WebSocket service (default: ${DEFAULT-VALUE})")
+    private final Boolean isRpcWsEnabled = false;
+
+    @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
+    @Option(
+        names = {"--rpc-ws-host"},
+        paramLabel = MANDATORY_HOST_FORMAT_HELP,
+        description =
+            "Host for JSON-RPC WebSocket service to listen on (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private String rpcWsHost;
+
+    @Option(
+        names = {"--rpc-ws-port"},
+        paramLabel = MANDATORY_PORT_FORMAT_HELP,
+        description =
+            "Port for JSON-RPC WebSocket service to listen on (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private final Integer rpcWsPort = DEFAULT_WEBSOCKET_PORT;
+
+    @Option(
+        names = {"--rpc-ws-max-frame-size"},
+        description =
+            "Maximum size in bytes for JSON-RPC WebSocket frames (default: ${DEFAULT-VALUE}). If this limit is exceeded, the websocket will be disconnected.",
+        arity = "1")
+    private final Integer rpcWsMaxFrameSize = DEFAULT_WS_MAX_FRAME_SIZE;
+
+    @Option(
+        names = {"--rpc-ws-max-active-connections"},
+        description =
+            "Maximum number of WebSocket connections allowed for JSON-RPC (default: ${DEFAULT-VALUE}). Once this limit is reached, incoming connections will be rejected.",
+        arity = "1")
+    private final Integer rpcWsMaxConnections = DEFAULT_WS_MAX_CONNECTIONS;
+
+    @Option(
+        names = {"--rpc-ws-api", "--rpc-ws-apis"},
+        paramLabel = "<api name>",
+        split = " {0,1}, {0,1}",
+        arity = "1..*",
+        description =
+            "Comma separated list of APIs to enable on JSON-RPC WebSocket service (default: ${DEFAULT-VALUE})")
+    private final List<String> rpcWsApis = DEFAULT_RPC_APIS;
+
+    @Option(
+        names = {"--rpc-ws-api-methods-no-auth", "--rpc-ws-api-method-no-auth"},
+        paramLabel = "<api name>",
+        split = " {0,1}, {0,1}",
+        arity = "1..*",
+        description =
+            "Comma separated list of RPC methods to exclude from RPC authentication services, RPC WebSocket authentication must be enabled")
+    private final List<String> rpcWsApiMethodsNoAuth = new ArrayList<String>();
+
+    @Option(
+        names = {"--rpc-ws-authentication-enabled"},
+        description =
+            "Require authentication for the JSON-RPC WebSocket service (default: ${DEFAULT-VALUE})")
+    private final Boolean isRpcWsAuthenticationEnabled = false;
+
+    @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
+    @CommandLine.Option(
+        names = {"--rpc-ws-authentication-credentials-file"},
+        paramLabel = MANDATORY_FILE_FORMAT_HELP,
+        description =
+            "Storage file for JSON-RPC WebSocket authentication credentials (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private String rpcWsAuthenticationCredentialsFile = null;
+
+    @CommandLine.Option(
+        names = {"--rpc-ws-authentication-jwt-public-key-file"},
+        paramLabel = MANDATORY_FILE_FORMAT_HELP,
+        description = "JWT public key file for JSON-RPC WebSocket authentication",
+        arity = "1")
+    private final File rpcWsAuthenticationPublicKeyFile = null;
+  }
+
+  // Privacy Options Group
+  @CommandLine.ArgGroup(validate = false, heading = "@|bold Privacy Options|@%n")
+  PrivacyOptionGroup privacyOptionGroup = new PrivacyOptionGroup();
+
+  static class PrivacyOptionGroup {
+    @Option(
+        names = {"--privacy-tls-enabled"},
+        paramLabel = MANDATORY_FILE_FORMAT_HELP,
+        description = "Enable TLS for connecting to privacy enclave (default: ${DEFAULT-VALUE})")
+    private final Boolean isPrivacyTlsEnabled = false;
+
+    @Option(
+        names = "--privacy-tls-keystore-file",
+        paramLabel = MANDATORY_FILE_FORMAT_HELP,
+        description =
+            "Path to a PKCS#12 formatted keystore; used to enable TLS on inbound connections.")
+    private final Path privacyKeyStoreFile = null;
+
+    @Option(
+        names = "--privacy-tls-keystore-password-file",
+        paramLabel = MANDATORY_FILE_FORMAT_HELP,
+        description = "Path to a file containing the password used to decrypt the keystore.")
+    private final Path privacyKeyStorePasswordFile = null;
+
+    @Option(
+        names = "--privacy-tls-known-enclave-file",
+        paramLabel = MANDATORY_FILE_FORMAT_HELP,
+        description =
+            "Path to a file containing the fingerprints of the authorized privacy enclave.")
+    private final Path privacyTlsKnownEnclaveFile = null;
+
+    @Option(
+        names = {"--privacy-enabled"},
+        description = "Enable private transactions (default: ${DEFAULT-VALUE})")
+    private final Boolean isPrivacyEnabled = false;
+
+    @Option(
+        names = {"--privacy-multi-tenancy-enabled"},
+        description = "Enable multi-tenant private transactions (default: ${DEFAULT-VALUE})")
+    private final Boolean isPrivacyMultiTenancyEnabled = false;
+
+    @Option(
+        names = {"--privacy-url"},
+        description = "The URL on which the enclave is running")
+    private final URI privacyUrl = PrivacyParameters.DEFAULT_ENCLAVE_URL;
+
+    @Option(
+        names = {"--privacy-public-key-file"},
+        description = "The enclave's public key file")
+    private final File privacyPublicKeyFile = null;
+
+    @Option(
+        names = {"--privacy-marker-transaction-signing-key-file"},
+        description =
+            "The name of a file containing the private key used to sign privacy marker transactions. If unset, each will be signed with a random key.")
+    private final Path privateMarkerTransactionSigningKeyPath = null;
+
+    @Option(
+        names = {"--privacy-enable-database-migration"},
+        description = "Enable private database metadata migration (default: ${DEFAULT-VALUE})")
+    private final Boolean migratePrivateDatabase = false;
+
+    @Option(
+        names = {"--privacy-flexible-groups-enabled"},
+        description = "Enable flexible privacy groups (default: ${DEFAULT-VALUE})")
+    private final Boolean isFlexiblePrivacyGroupsEnabled = false;
+
+    @Option(
+        hidden = true,
+        names = {"--privacy-onchain-groups-enabled"},
+        description =
+            "!!DEPRECATED!! Use `--privacy-flexible-groups-enabled` instead. Enable flexible (onchain) privacy groups (default: ${DEFAULT-VALUE})")
+    private final Boolean isOnchainPrivacyGroupsEnabled = false;
+  }
+
+  // Metrics Option Group
+  @CommandLine.ArgGroup(validate = false, heading = "@|bold Metrics Options|@%n")
+  MetricsOptionGroup metricsOptionGroup = new MetricsOptionGroup();
+
+  static class MetricsOptionGroup {
+    @Option(
+        names = {"--metrics-enabled"},
+        description = "Set to start the metrics exporter (default: ${DEFAULT-VALUE})")
+    private final Boolean isMetricsEnabled = false;
+
+    @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
+    @Option(
+        names = {"--metrics-protocol"},
+        description =
+            "Metrics protocol, one of PROMETHEUS, OPENTELEMETRY or NONE. (default: ${DEFAULT-VALUE})")
+    private MetricsProtocol metricsProtocol = PROMETHEUS;
+
+    @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
+    @Option(
+        names = {"--metrics-host"},
+        paramLabel = MANDATORY_HOST_FORMAT_HELP,
+        description = "Host for the metrics exporter to listen on (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private String metricsHost;
+
+    @Option(
+        names = {"--metrics-port"},
+        paramLabel = MANDATORY_PORT_FORMAT_HELP,
+        description = "Port for the metrics exporter to listen on (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private final Integer metricsPort = DEFAULT_METRICS_PORT;
+
+    @Option(
+        names = {"--metrics-category", "--metrics-categories"},
+        paramLabel = "<category name>",
+        split = ",",
+        arity = "1..*",
+        description =
+            "Comma separated list of categories to track metrics for (default: ${DEFAULT-VALUE})")
+    private final Set<MetricCategory> metricCategories = DEFAULT_METRIC_CATEGORIES;
+
+    @Option(
+        names = {"--metrics-push-enabled"},
+        description = "Enable the metrics push gateway integration (default: ${DEFAULT-VALUE})")
+    private final Boolean isMetricsPushEnabled = false;
+
+    @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
+    @Option(
+        names = {"--metrics-push-host"},
+        paramLabel = MANDATORY_HOST_FORMAT_HELP,
+        description =
+            "Host of the Prometheus Push Gateway for push mode (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private String metricsPushHost;
+
+    @Option(
+        names = {"--metrics-push-port"},
+        paramLabel = MANDATORY_PORT_FORMAT_HELP,
+        description =
+            "Port of the Prometheus Push Gateway for push mode (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private final Integer metricsPushPort = DEFAULT_METRICS_PUSH_PORT;
+
+    @Option(
+        names = {"--metrics-push-interval"},
+        paramLabel = MANDATORY_INTEGER_FORMAT_HELP,
+        description =
+            "Interval in seconds to push metrics when in push mode (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private final Integer metricsPushInterval = 15;
+
+    @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
+    @Option(
+        names = {"--metrics-push-prometheus-job"},
+        description = "Job name to use when in push mode (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private String metricsPrometheusJob = "besu-client";
+  }
 
   @Option(
       names = {"--host-allowlist"},
@@ -738,17 +1044,11 @@ void setBannedNodeIds(final List<String> values) {
           "Deprecated in favor of --host-allowlist. Comma separated list of hostnames to allow for RPC access, or * to accept any host (default: ${DEFAULT-VALUE})")
   private final JsonRPCAllowlistHostsProperty hostsWhitelist = new JsonRPCAllowlistHostsProperty();
 
-  @Option(
-      names = {"--logging", "-l"},
-      paramLabel = "<LOG VERBOSITY LEVEL>",
-      description = "Logging verbosity levels: OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE, ALL")
-  private final Level logLevel = null;
-
   @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"})
   @Option(
       names = {"--color-enabled"},
       description =
-          "Force color output to be enabled/disabled (default: colorized only if printing to console")
+          "Force color output to be enabled/disabled (default: colorized only if printing to console)")
   private static Boolean colorEnabled = null;
 
   @Option(
@@ -757,34 +1057,48 @@ void setBannedNodeIds(final List<String> values) {
           "How deep a chain reorganization must be in order for it to be logged (default: ${DEFAULT-VALUE})")
   private final Long reorgLoggingThreshold = 6L;
 
-  @Option(
-      names = {"--miner-enabled"},
-      description = "Set if node will perform mining (default: ${DEFAULT-VALUE})")
-  private final Boolean isMiningEnabled = false;
-
-  @Option(
-      names = {"--miner-stratum-enabled"},
-      description = "Set if node will perform Stratum mining (default: ${DEFAULT-VALUE})")
-  private final Boolean iStratumMiningEnabled = false;
-
-  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
-  @Option(
-      names = {"--miner-stratum-host"},
-      description = "Host for Stratum network mining service (default: ${DEFAULT-VALUE})")
-  private String stratumNetworkInterface = "0.0.0.0";
-
-  @Option(
-      names = {"--miner-stratum-port"},
-      description = "Stratum port binding (default: ${DEFAULT-VALUE})")
-  private final Integer stratumPort = 8008;
-
-  @Option(
-      names = {"--miner-coinbase"},
-      description =
-          "Account to which mining rewards are paid. You must specify a valid coinbase if "
-              + "mining is enabled using --miner-enabled option",
-      arity = "1")
-  private final Address coinbase = null;
+  // Miner options group
+  @CommandLine.ArgGroup(validate = false, heading = "@|bold Miner Options|@%n")
+  MinerOptionGroup minerOptionGroup = new MinerOptionGroup();
+
+  static class MinerOptionGroup {
+    @Option(
+        names = {"--miner-enabled"},
+        description = "Set if node will perform mining (default: ${DEFAULT-VALUE})")
+    private final Boolean isMiningEnabled = false;
+
+    @Option(
+        names = {"--miner-stratum-enabled"},
+        description = "Set if node will perform Stratum mining (default: ${DEFAULT-VALUE})")
+    private final Boolean iStratumMiningEnabled = false;
+
+    @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
+    @Option(
+        names = {"--miner-stratum-host"},
+        description = "Host for Stratum network mining service (default: ${DEFAULT-VALUE})")
+    private String stratumNetworkInterface = "0.0.0.0";
+
+    @Option(
+        names = {"--miner-stratum-port"},
+        description = "Stratum port binding (default: ${DEFAULT-VALUE})")
+    private final Integer stratumPort = 8008;
+
+    @Option(
+        names = {"--miner-coinbase"},
+        description =
+            "Account to which mining rewards are paid. You must specify a valid coinbase if "
+                + "mining is enabled using --miner-enabled option",
+        arity = "1")
+    private final Address coinbase = null;
+
+    @Option(
+        names = {"--miner-extra-data"},
+        description =
+            "A hex string representing the (32) bytes to be included in the extra data "
+                + "field of a mined block (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private final Bytes extraData = DEFAULT_EXTRA_DATA;
+  }
 
   @Option(
       names = {"--min-gas-price"},
@@ -807,81 +1121,70 @@ void setBannedNodeIds(final List<String> values) {
       arity = "1")
   private final Double minBlockOccupancyRatio = DEFAULT_MIN_BLOCK_OCCUPANCY_RATIO;
 
-  @Option(
-      names = {"--miner-extra-data"},
-      description =
-          "A hex string representing the (32) bytes to be included in the extra data "
-              + "field of a mined block (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private final Bytes extraData = DEFAULT_EXTRA_DATA;
-
   @Option(
       names = {"--pruning-enabled"},
       description =
           "Enable disk-space saving optimization that removes old state that is unlikely to be required (default: ${DEFAULT-VALUE})")
   private final Boolean pruningEnabled = false;
 
-  @Option(
-      names = {"--permissions-nodes-config-file-enabled"},
-      description = "Enable node level permissions (default: ${DEFAULT-VALUE})")
-  private final Boolean permissionsNodesEnabled = false;
-
-  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
-  @CommandLine.Option(
-      names = {"--permissions-nodes-config-file"},
-      description =
-          "Node permissioning config TOML file (default: a file named \"permissions_config.toml\" in the Besu data folder)")
-  private String nodePermissionsConfigFile = null;
-
-  @Option(
-      names = {"--permissions-accounts-config-file-enabled"},
-      description = "Enable account level permissions (default: ${DEFAULT-VALUE})")
-  private final Boolean permissionsAccountsEnabled = false;
-
-  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
-  @CommandLine.Option(
-      names = {"--permissions-accounts-config-file"},
-      description =
-          "Account permissioning config TOML file (default: a file named \"permissions_config.toml\" in the Besu data folder)")
-  private String accountPermissionsConfigFile = null;
-
-  @Option(
-      names = {"--permissions-nodes-contract-address"},
-      description = "Address of the node permissioning smart contract",
-      arity = "1")
-  private final Address permissionsNodesContractAddress = null;
-
-  @Option(
-      names = {"--permissions-nodes-contract-version"},
-      description = "Version of the EEA Node Permissioning interface (default: ${DEFAULT-VALUE})")
-  private final Integer permissionsNodesContractVersion = 1;
-
-  @Option(
-      names = {"--permissions-nodes-contract-enabled"},
-      description = "Enable node level permissions via smart contract (default: ${DEFAULT-VALUE})")
-  private final Boolean permissionsNodesContractEnabled = false;
-
-  @Option(
-      names = {"--permissions-accounts-contract-address"},
-      description = "Address of the account permissioning smart contract",
-      arity = "1")
-  private final Address permissionsAccountsContractAddress = null;
-
-  @Option(
-      names = {"--permissions-accounts-contract-enabled"},
-      description =
-          "Enable account level permissions via smart contract (default: ${DEFAULT-VALUE})")
-  private final Boolean permissionsAccountsContractEnabled = false;
-
-  @Option(
-      names = {"--privacy-enabled"},
-      description = "Enable private transactions (default: ${DEFAULT-VALUE})")
-  private final Boolean isPrivacyEnabled = false;
-
-  @Option(
-      names = {"--privacy-multi-tenancy-enabled"},
-      description = "Enable multi-tenant private transactions (default: ${DEFAULT-VALUE})")
-  private final Boolean isPrivacyMultiTenancyEnabled = false;
+  // Permission Option Group
+  @CommandLine.ArgGroup(validate = false, heading = "@|bold Permissions Options|@%n")
+  PermissionsOptionGroup permissionsOptionGroup = new PermissionsOptionGroup();
+
+  static class PermissionsOptionGroup {
+    @Option(
+        names = {"--permissions-nodes-config-file-enabled"},
+        description = "Enable node level permissions (default: ${DEFAULT-VALUE})")
+    private final Boolean permissionsNodesEnabled = false;
+
+    @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
+    @CommandLine.Option(
+        names = {"--permissions-nodes-config-file"},
+        description =
+            "Node permissioning config TOML file (default: a file named \"permissions_config.toml\" in the Besu data folder)")
+    private String nodePermissionsConfigFile = null;
+
+    @Option(
+        names = {"--permissions-accounts-config-file-enabled"},
+        description = "Enable account level permissions (default: ${DEFAULT-VALUE})")
+    private final Boolean permissionsAccountsEnabled = false;
+
+    @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
+    @CommandLine.Option(
+        names = {"--permissions-accounts-config-file"},
+        description =
+            "Account permissioning config TOML file (default: a file named \"permissions_config.toml\" in the Besu data folder)")
+    private String accountPermissionsConfigFile = null;
+
+    @Option(
+        names = {"--permissions-nodes-contract-address"},
+        description = "Address of the node permissioning smart contract",
+        arity = "1")
+    private final Address permissionsNodesContractAddress = null;
+
+    @Option(
+        names = {"--permissions-nodes-contract-version"},
+        description = "Version of the EEA Node Permissioning interface (default: ${DEFAULT-VALUE})")
+    private final Integer permissionsNodesContractVersion = 1;
+
+    @Option(
+        names = {"--permissions-nodes-contract-enabled"},
+        description =
+            "Enable node level permissions via smart contract (default: ${DEFAULT-VALUE})")
+    private final Boolean permissionsNodesContractEnabled = false;
+
+    @Option(
+        names = {"--permissions-accounts-contract-address"},
+        description = "Address of the account permissioning smart contract",
+        arity = "1")
+    private final Address permissionsAccountsContractAddress = null;
+
+    @Option(
+        names = {"--permissions-accounts-contract-enabled"},
+        description =
+            "Enable account level permissions via smart contract (default: ${DEFAULT-VALUE})")
+    private final Boolean permissionsAccountsContractEnabled = false;
+  }
 
   @Option(
       names = {"--revert-reason-enabled"},
@@ -897,79 +1200,80 @@ void setBannedNodeIds(final List<String> values) {
       split = ",")
   private final Map<Long, Hash> requiredBlocks = new HashMap<>();
 
-  @Option(
-      names = {"--privacy-url"},
-      description = "The URL on which the enclave is running")
-  private final URI privacyUrl = PrivacyParameters.DEFAULT_ENCLAVE_URL;
-
-  @CommandLine.Option(
-      names = {"--privacy-public-key-file"},
-      description = "The enclave's public key file")
-  private final File privacyPublicKeyFile = null;
-
-  @Option(
-      names = {"--privacy-precompiled-address"},
-      description =
-          "The address to which the privacy pre-compiled contract will be mapped (default: ${DEFAULT-VALUE})",
-      hidden = true)
-  private final Integer privacyPrecompiledAddress = Address.PRIVACY;
-
-  @Option(
-      names = {"--privacy-marker-transaction-signing-key-file"},
-      description =
-          "The name of a file containing the private key used to sign privacy marker transactions. If unset, each will be signed with a random key.")
-  private final Path privacyMarkerTransactionSigningKeyPath = null;
-
-  @Option(
-      names = {"--privacy-enable-database-migration"},
-      description = "Enable private database metadata migration (default: ${DEFAULT-VALUE})")
-  private final Boolean migratePrivateDatabase = false;
-
-  @Option(
-      names = {"--privacy-flexible-groups-enabled", "--privacy-onchain-groups-enabled"},
-      description = "Enable flexible (onchain) privacy groups (default: ${DEFAULT-VALUE})")
-  private final Boolean isFlexiblePrivacyGroupsEnabled = false;
-
   @Option(
       names = {"--target-gas-limit"},
       description =
-          "Sets target gas limit per block. If set each block's gas limit will approach this setting over time if the current gas limit is different.")
+          "Sets target gas limit per block. If set, each block's gas limit will approach this setting over time if the current gas limit is different.")
   private final Long targetGasLimit = null;
 
-  @Option(
-      names = {"--tx-pool-max-size"},
-      paramLabel = MANDATORY_INTEGER_FORMAT_HELP,
-      description =
-          "Maximum number of pending transactions that will be kept in the transaction pool (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private final Integer txPoolMaxSize = TransactionPoolConfiguration.MAX_PENDING_TRANSACTIONS;
-
-  @Option(
-      names = {"--tx-pool-hashes-max-size"},
-      paramLabel = MANDATORY_INTEGER_FORMAT_HELP,
-      description =
-          "Maximum number of pending transaction hashes that will be kept in the transaction pool (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private final Integer pooledTransactionHashesSize =
-      TransactionPoolConfiguration.MAX_PENDING_TRANSACTIONS_HASHES;
-
-  @Option(
-      names = {"--tx-pool-retention-hours"},
-      paramLabel = MANDATORY_INTEGER_FORMAT_HELP,
-      description =
-          "Maximum retention period of pending transactions in hours (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private final Integer pendingTxRetentionPeriod =
-      TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS;
-
-  @Option(
-      names = {"--tx-pool-price-bump"},
-      paramLabel = MANDATORY_INTEGER_FORMAT_HELP,
-      converter = PercentageConverter.class,
-      description =
-          "Price bump percentage to replace an already existing transaction  (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  private final Integer priceBump = TransactionPoolConfiguration.DEFAULT_PRICE_BUMP.getValue();
+  // Tx Pool Option Group
+  @CommandLine.ArgGroup(validate = false, heading = "@|bold Tx Pool Options|@%n")
+  TxPoolOptionGroup txPoolOptionGroup = new TxPoolOptionGroup();
+
+  static class TxPoolOptionGroup {
+    @CommandLine.Option(
+        names = {"--tx-pool-disable-locals"},
+        paramLabel = "<Boolean>",
+        description =
+            "Set to true if transactions sent via RPC should have the same checks and not be prioritized over remote ones (default: ${DEFAULT-VALUE})",
+        fallbackValue = "true",
+        arity = "0..1")
+    private Boolean disableLocalTxs = TransactionPoolConfiguration.DEFAULT_DISABLE_LOCAL_TXS;
+
+    @CommandLine.Option(
+        names = {"--tx-pool-enable-save-restore"},
+        paramLabel = "<Boolean>",
+        description =
+            "Set to true to enable saving the txpool content to file on shutdown and reloading it on startup (default: ${DEFAULT-VALUE})",
+        fallbackValue = "true",
+        arity = "0..1")
+    private Boolean saveRestoreEnabled = TransactionPoolConfiguration.DEFAULT_ENABLE_SAVE_RESTORE;
+
+    @CommandLine.Option(
+        names = {"--tx-pool-limit-by-account-percentage"},
+        paramLabel = "<DOUBLE>",
+        converter = FractionConverter.class,
+        description =
+            "Maximum portion of the transaction pool which a single account may occupy with future transactions (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private Float txPoolLimitByAccountPercentage =
+        TransactionPoolConfiguration.DEFAULT_LIMIT_TX_POOL_BY_ACCOUNT_PERCENTAGE;
+
+    @CommandLine.Option(
+        names = {"--tx-pool-save-file"},
+        paramLabel = "<STRING>",
+        description =
+            "If saving the txpool content is enabled, define a custom path for the save file (default: ${DEFAULT-VALUE} in the data-dir)",
+        arity = "1")
+    private File saveFile = TransactionPoolConfiguration.DEFAULT_SAVE_FILE;
+
+    @Option(
+        names = {"--tx-pool-max-size"},
+        paramLabel = MANDATORY_INTEGER_FORMAT_HELP,
+        description =
+            "Maximum number of pending transactions that will be kept in the transaction pool (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private final Integer txPoolMaxSize =
+        TransactionPoolConfiguration.DEFAULT_MAX_PENDING_TRANSACTIONS;
+
+    @Option(
+        names = {"--tx-pool-retention-hours"},
+        paramLabel = MANDATORY_INTEGER_FORMAT_HELP,
+        description =
+            "Maximum retention period of pending transactions in hours (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private final Integer pendingTxRetentionPeriod =
+        TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS;
+
+    @Option(
+        names = {"--tx-pool-price-bump"},
+        paramLabel = MANDATORY_INTEGER_FORMAT_HELP,
+        converter = PercentageConverter.class,
+        description =
+            "Price bump percentage to replace an already existing transaction  (default: ${DEFAULT-VALUE})",
+        arity = "1")
+    private final Integer priceBump = TransactionPoolConfiguration.DEFAULT_PRICE_BUMP.getValue();
+  }
 
   @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
   @Option(
@@ -1029,45 +1333,77 @@ void setBannedNodeIds(final List<String> values) {
 
   @CommandLine.Option(
       names = {"--api-gas-price-blocks"},
-      paramLabel = MANDATORY_PATH_FORMAT_HELP,
       description = "Number of blocks to consider for eth_gasPrice (default: ${DEFAULT-VALUE})")
   private final Long apiGasPriceBlocks = 100L;
 
   @CommandLine.Option(
       names = {"--api-gas-price-percentile"},
-      paramLabel = MANDATORY_PATH_FORMAT_HELP,
       description = "Percentile value to measure for eth_gasPrice (default: ${DEFAULT-VALUE})")
   private final Double apiGasPricePercentile = 50.0;
 
   @CommandLine.Option(
       names = {"--api-gas-price-max"},
-      paramLabel = MANDATORY_PATH_FORMAT_HELP,
       description = "Maximum gas price for eth_gasPrice (default: ${DEFAULT-VALUE})")
   private final Long apiGasPriceMax = 500_000_000_000L;
 
-  @Option(
-      names = {"--goquorum-compatibility-enabled"},
-      hidden = true,
-      description = "Start Besu in GoQuorum compatibility mode (default: ${DEFAULT-VALUE})")
-  private final Boolean isGoQuorumCompatibilityMode = false;
+  @CommandLine.Option(
+      names = {"--static-nodes-file"},
+      paramLabel = MANDATORY_FILE_FORMAT_HELP,
+      description =
+          "Specifies the static node file containing the static nodes for this node to connect to")
+  private final Path staticNodesFile = null;
+
+  @CommandLine.Option(
+      names = {"--rpc-max-logs-range"},
+      description =
+          "Specifies the maximum number of blocks to retrieve logs from via RPC. Must be >=0. 0 specifies no limit  (default: ${DEFAULT-VALUE})")
+  private final Long rpcMaxLogsRange = 5000L;
+
+  @Mixin private P2PTLSConfigOptions p2pTLSConfigOptions;
+
+  @Mixin private PkiBlockCreationOptions pkiBlockCreationOptions;
 
   private EthNetworkConfig ethNetworkConfig;
   private JsonRpcConfiguration jsonRpcConfiguration;
+  private JsonRpcConfiguration engineJsonRpcConfiguration;
   private GraphQLConfiguration graphQLConfiguration;
   private WebSocketConfiguration webSocketConfiguration;
+  private JsonRpcIpcConfiguration jsonRpcIpcConfiguration;
   private ApiConfiguration apiConfiguration;
   private MetricsConfiguration metricsConfiguration;
   private Optional<PermissioningConfiguration> permissioningConfiguration;
+  private Optional<TLSConfiguration> p2pTLSConfiguration;
   private Collection<EnodeURL> staticNodes;
   private BesuController besuController;
   private BesuConfiguration pluginCommonConfiguration;
+
+  private BesuComponent besuComponent;
   private final Supplier<ObservableMetricsSystem> metricsSystem =
-      Suppliers.memoize(() -> MetricsSystemFactory.create(metricsConfiguration()));
+      Suppliers.memoize(
+          () ->
+              besuComponent == null || besuComponent.getObservableMetricsSystem() == null
+                  ? MetricsSystemFactory.create(metricsConfiguration())
+                  : besuComponent.getObservableMetricsSystem());
   private Vertx vertx;
   private EnodeDnsConfiguration enodeDnsConfiguration;
+  private KeyValueStorageProvider keyValueStorageProvider;
+  /** Sets GoQuorum compatibility mode. */
+  protected Boolean isGoQuorumCompatibilityMode = false;
 
+  /**
+   * Besu command constructor.
+   *
+   * @param besuComponent BesuComponent which acts as our application context
+   * @param rlpBlockImporter RlpBlockImporter supplier
+   * @param jsonBlockImporterFactory instance of {@code Function<BesuController, JsonBlockImporter>}
+   * @param rlpBlockExporterFactory instance of {@code Function<Blockchain, RlpBlockExporter>}
+   * @param runnerBuilder instance of RunnerBuilder
+   * @param controllerBuilderFactory instance of BesuController.Builder
+   * @param besuPluginContext instance of BesuPluginContextImpl
+   * @param environment Environment variables map
+   */
   public BesuCommand(
-      final Logger logger,
+      final BesuComponent besuComponent,
       final Supplier<RlpBlockImporter> rlpBlockImporter,
       final Function<BesuController, JsonBlockImporter> jsonBlockImporterFactory,
       final Function<Blockchain, RlpBlockExporter> rlpBlockExporterFactory,
@@ -1076,7 +1412,7 @@ public BesuCommand(
       final BesuPluginContextImpl besuPluginContext,
       final Map<String, String> environment) {
     this(
-        logger,
+        besuComponent,
         rlpBlockImporter,
         jsonBlockImporterFactory,
         rlpBlockExporterFactory,
@@ -1085,12 +1421,36 @@ public BesuCommand(
         besuPluginContext,
         environment,
         new StorageServiceImpl(),
-        new SecurityModuleServiceImpl());
+        new SecurityModuleServiceImpl(),
+        new PermissioningServiceImpl(),
+        new PrivacyPluginServiceImpl(),
+        new PkiBlockCreationConfigurationProvider(),
+        new RpcEndpointServiceImpl(),
+        new TransactionSelectionServiceImpl());
   }
 
+  /**
+   * Overloaded Besu command constructor visible for testing.
+   *
+   * @param besuComponent BesuComponent which acts as our application context
+   * @param rlpBlockImporter RlpBlockImporter supplier
+   * @param jsonBlockImporterFactory instance of {@code Function<BesuController, JsonBlockImporter>}
+   * @param rlpBlockExporterFactory instance of {@code Function<Blockchain, RlpBlockExporter>}
+   * @param runnerBuilder instance of RunnerBuilder
+   * @param controllerBuilderFactory instance of BesuController.Builder
+   * @param besuPluginContext instance of BesuPluginContextImpl
+   * @param environment Environment variables map
+   * @param storageService instance of StorageServiceImpl
+   * @param securityModuleService instance of SecurityModuleServiceImpl
+   * @param permissioningService instance of PermissioningServiceImpl
+   * @param privacyPluginService instance of PrivacyPluginServiceImpl
+   * @param pkiBlockCreationConfigProvider instance of PkiBlockCreationConfigurationProvider
+   * @param rpcEndpointServiceImpl instance of RpcEndpointServiceImpl
+   * @param transactionSelectionServiceImpl instance of TransactionSelectionServiceImpl
+   */
   @VisibleForTesting
   protected BesuCommand(
-      final Logger logger,
+      final BesuComponent besuComponent,
       final Supplier<RlpBlockImporter> rlpBlockImporter,
       final Function<BesuController, JsonBlockImporter> jsonBlockImporterFactory,
       final Function<Blockchain, RlpBlockExporter> rlpBlockExporterFactory,
@@ -1099,8 +1459,14 @@ protected BesuCommand(
       final BesuPluginContextImpl besuPluginContext,
       final Map<String, String> environment,
       final StorageServiceImpl storageService,
-      final SecurityModuleServiceImpl securityModuleService) {
-    this.logger = logger;
+      final SecurityModuleServiceImpl securityModuleService,
+      final PermissioningServiceImpl permissioningService,
+      final PrivacyPluginServiceImpl privacyPluginService,
+      final PkiBlockCreationConfigurationProvider pkiBlockCreationConfigProvider,
+      final RpcEndpointServiceImpl rpcEndpointServiceImpl,
+      final TransactionSelectionServiceImpl transactionSelectionServiceImpl) {
+    this.besuComponent = besuComponent;
+    this.logger = besuComponent.getBesuCommandLogger();
     this.rlpBlockImporter = rlpBlockImporter;
     this.rlpBlockExporterFactory = rlpBlockExporterFactory;
     this.jsonBlockImporterFactory = jsonBlockImporterFactory;
@@ -1110,42 +1476,100 @@ protected BesuCommand(
     this.environment = environment;
     this.storageService = storageService;
     this.securityModuleService = securityModuleService;
-
+    this.permissioningService = permissioningService;
+    this.privacyPluginService = privacyPluginService;
     pluginCommonConfiguration = new BesuCommandConfigurationService();
     besuPluginContext.addService(BesuConfiguration.class, pluginCommonConfiguration);
+    this.pkiBlockCreationConfigProvider = pkiBlockCreationConfigProvider;
+    this.rpcEndpointServiceImpl = rpcEndpointServiceImpl;
+    this.transactionSelectionServiceImpl = transactionSelectionServiceImpl;
   }
 
-  public void parse(
-      final AbstractParseResultHandler<List<Object>> resultHandler,
-      final BesuExceptionHandler exceptionHandler,
+  /**
+   * Parse Besu command line arguments. Visible for testing.
+   *
+   * @param resultHandler execution strategy. See PicoCLI. Typical argument is RunLast.
+   * @param parameterExceptionHandler Exception handler for handling parameters
+   * @param executionExceptionHandler Exception handler for business logic
+   * @param in Standard input stream
+   * @param args arguments to Besu command
+   * @return success or failure exit code.
+   */
+  public int parse(
+      final IExecutionStrategy resultHandler,
+      final BesuParameterExceptionHandler parameterExceptionHandler,
+      final BesuExecutionExceptionHandler executionExceptionHandler,
       final InputStream in,
       final String... args) {
-    commandLine =
-        new CommandLine(this, new BesuCommandCustomFactory(besuPluginContext))
-            .setCaseInsensitiveEnumValuesAllowed(true);
 
-    enableExperimentalEIPs();
-    addSubCommands(resultHandler, in);
+    toCommandLine();
+
+    handleStableOptions();
+    addSubCommands(in);
     registerConverters();
     handleUnstableOptions();
     preparePlugins();
-    parse(resultHandler, exceptionHandler, args);
+
+    final int exitCode =
+        parse(resultHandler, executionExceptionHandler, parameterExceptionHandler, args);
+
+    return exitCode;
+  }
+
+  /** Used by Dagger to parse all options into a commandline instance. */
+  public void toCommandLine() {
+    commandLine =
+        new CommandLine(this, new BesuCommandCustomFactory(besuPluginContext))
+            .setCaseInsensitiveEnumValuesAllowed(true);
   }
 
   @Override
   public void run() {
+    if (network != null && network.isDeprecated()) {
+      logger.warn(NetworkDeprecationMessage.generate(network));
+    }
+
     try {
       configureLogging(true);
-      configureNativeLibs();
-      logger.info("Starting Besu version: {}", BesuInfo.nodeName(identityString));
+      // Set the goquorum compatibility mode based on the genesis file
+      if (genesisFile != null) {
+        genesisConfigOptions = readGenesisConfigOptions();
+
+        if (genesisConfigOptions.isQuorum()) {
+          enableGoQuorumCompatibilityMode();
+        }
+      }
+
+      // set merge config on the basis of genesis config
+      setMergeConfigOptions();
+
+      setIgnorableStorageSegments();
+
+      instantiateSignatureAlgorithmFactory();
+
+      logger.info("Starting Besu");
+
       // Need to create vertx after cmdline has been parsed, such that metricsSystem is configurable
       vertx = createVertx(createVertxOptions(metricsSystem.get()));
 
-      final BesuCommand controller = validateOptions().configure().controller();
+      validateOptions();
+      configure();
+      configureNativeLibs();
+      besuController = initController();
+
+      besuPluginContext.beforeExternalServices();
 
-      preSynchronizationTaskRunner.runTasks(controller.besuController);
+      final var runner = buildRunner();
+      runner.startExternalServices();
+
+      startPlugins();
+      validatePluginOptions();
+      setReleaseMetrics();
+      preSynchronization();
+
+      runner.startEthereumMainLoop();
+      runner.awaitStop();
 
-      controller.startPlugins().startSynchronization();
     } catch (final Exception e) {
       throw new ParameterException(this.commandLine, e.getMessage(), e);
     }
@@ -1156,37 +1580,39 @@ void setBesuConfiguration(final BesuConfiguration pluginCommonConfiguration) {
     this.pluginCommonConfiguration = pluginCommonConfiguration;
   }
 
-  private void enableExperimentalEIPs() {
-    // Usage of static command line flags is strictly reserved for experimental EIPs
-    commandLine.addMixin("experimentalEIPs", ExperimentalEIPs.class);
-  }
-
-  private void addSubCommands(
-      final AbstractParseResultHandler<List<Object>> resultHandler, final InputStream in) {
+  private void addSubCommands(final InputStream in) {
     commandLine.addSubcommand(
         BlocksSubCommand.COMMAND_NAME,
         new BlocksSubCommand(
             rlpBlockImporter,
             jsonBlockImporterFactory,
             rlpBlockExporterFactory,
-            resultHandler.out()));
+            commandLine.getOut()));
     commandLine.addSubcommand(
-        PublicKeySubCommand.COMMAND_NAME,
-        new PublicKeySubCommand(resultHandler.out(), this::buildNodeKey));
+        PublicKeySubCommand.COMMAND_NAME, new PublicKeySubCommand(commandLine.getOut()));
     commandLine.addSubcommand(
-        PasswordSubCommand.COMMAND_NAME, new PasswordSubCommand(resultHandler.out()));
+        PasswordSubCommand.COMMAND_NAME, new PasswordSubCommand(commandLine.getOut()));
     commandLine.addSubcommand(RetestethSubCommand.COMMAND_NAME, new RetestethSubCommand());
     commandLine.addSubcommand(
-        RLPSubCommand.COMMAND_NAME, new RLPSubCommand(resultHandler.out(), in));
+        RLPSubCommand.COMMAND_NAME, new RLPSubCommand(commandLine.getOut(), in));
+    commandLine.addSubcommand(
+        OperatorSubCommand.COMMAND_NAME, new OperatorSubCommand(commandLine.getOut()));
+    commandLine.addSubcommand(
+        ValidateConfigSubCommand.COMMAND_NAME,
+        new ValidateConfigSubCommand(commandLine, commandLine.getOut()));
+    commandLine.addSubcommand(
+        StorageSubCommand.COMMAND_NAME, new StorageSubCommand(commandLine.getOut()));
+    final String generateCompletionSubcommandName = "generate-completion";
     commandLine.addSubcommand(
-        OperatorSubCommand.COMMAND_NAME, new OperatorSubCommand(resultHandler.out()));
+        generateCompletionSubcommandName, AutoComplete.GenerateCompletion.class);
+    final CommandLine generateCompletionSubcommand =
+        commandLine.getSubcommands().get(generateCompletionSubcommandName);
+    generateCompletionSubcommand.getCommandSpec().usageMessage().hidden(true);
   }
 
   private void registerConverters() {
     commandLine.registerConverter(Address.class, Address::fromHexStringStrict);
     commandLine.registerConverter(Bytes.class, Bytes::fromHexString);
-    commandLine.registerConverter(Level.class, Level::valueOf);
-    commandLine.registerConverter(SyncMode.class, SyncMode::fromString);
     commandLine.registerConverter(MetricsProtocol.class, MetricsProtocol::fromString);
     commandLine.registerConverter(UInt256.class, (arg) -> UInt256.valueOf(new BigInteger(arg)));
     commandLine.registerConverter(Wei.class, (arg) -> Wei.of(Long.parseUnsignedLong(arg)));
@@ -1200,6 +1626,13 @@ private void registerConverters() {
     commandLine.registerConverter(MetricCategory.class, metricCategoryConverter);
   }
 
+  private void handleStableOptions() {
+    commandLine.addMixin("Ethstats", ethstatsOptions);
+    commandLine.addMixin("Private key file", nodePrivateKeyFileOption);
+    commandLine.addMixin("Logging level", loggingLevelOption);
+    commandLine.addMixin("Data Storage Options", dataStorageOptions);
+  }
+
   private void handleUnstableOptions() {
     // Add unstable options
     final ImmutableMap.Builder<String, Object> unstableOptionsBuild = ImmutableMap.builder();
@@ -1211,12 +1644,14 @@ private void handleUnstableOptions() {
             .put("RPC", unstableRPCOptions)
             .put("DNS Configuration", unstableDnsOptions)
             .put("NAT Configuration", unstableNatOptions)
+            .put("Privacy Plugin Configuration", unstablePrivacyPluginOptions)
             .put("Synchronizer", unstableSynchronizerOptions)
             .put("TransactionPool", unstableTransactionPoolOptions)
-            .put("Ethstats", unstableEthstatsOptions)
             .put("Mining", unstableMiningOptions)
             .put("Native Library", unstableNativeLibraryOptions)
-            .put("Data Storage Options", unstableDataStorageOptions)
+            .put("EVM Options", unstableEvmOptions)
+            .put("IPC Options", unstableIpcOptions)
+            .put("Chain Data Pruning Options", unstableChainPruningOptions)
             .build();
 
     UnstableOptionsSubCommand.createUnstableOptions(commandLine, unstableOptions);
@@ -1227,9 +1662,15 @@ private void preparePlugins() {
     besuPluginContext.addService(SecurityModuleService.class, securityModuleService);
     besuPluginContext.addService(StorageService.class, storageService);
     besuPluginContext.addService(MetricCategoryRegistry.class, metricCategoryRegistry);
+    besuPluginContext.addService(PermissioningService.class, permissioningService);
+    besuPluginContext.addService(PrivacyPluginService.class, privacyPluginService);
+    besuPluginContext.addService(RpcEndpointService.class, rpcEndpointServiceImpl);
+    besuPluginContext.addService(
+        TransactionSelectionService.class, transactionSelectionServiceImpl);
 
     // register built-in plugins
-    new RocksDBPlugin().register(besuPluginContext);
+    rocksDBPlugin = new RocksDBPlugin();
+    rocksDBPlugin.register(besuPluginContext);
     new InMemoryStoragePlugin().register(besuPluginContext);
 
     besuPluginContext.registerPlugins(pluginsDir());
@@ -1244,40 +1685,60 @@ private void preparePlugins() {
   }
 
   private SecurityModule defaultSecurityModule() {
-    return new KeyPairSecurityModule(loadKeyPair());
+    return new KeyPairSecurityModule(loadKeyPair(nodePrivateKeyFileOption.getNodePrivateKeyFile()));
   }
 
-  @VisibleForTesting
-  SECP256K1.KeyPair loadKeyPair() {
-    return KeyPairUtil.loadKeyPair(nodePrivateKeyFile());
+  // loadKeyPair() is public because it is accessed by subcommands
+
+  /**
+   * Load key pair from private key. Visible to be accessed by subcommands.
+   *
+   * @param nodePrivateKeyFile File containing private key
+   * @return KeyPair loaded from private key file
+   */
+  public KeyPair loadKeyPair(final File nodePrivateKeyFile) {
+    return KeyPairUtil.loadKeyPair(resolveNodePrivateKeyFile(nodePrivateKeyFile));
   }
 
-  private void parse(
-      final AbstractParseResultHandler<List<Object>> resultHandler,
-      final BesuExceptionHandler exceptionHandler,
+  private int parse(
+      final CommandLine.IExecutionStrategy resultHandler,
+      final BesuExecutionExceptionHandler besuExecutionExceptionHandler,
+      final BesuParameterExceptionHandler besuParameterExceptionHandler,
       final String... args) {
     // Create a handler that will search for a config file option and use it for
     // default values
     // and eventually it will run regular parsing of the remaining options.
+
     final ConfigOptionSearchAndRunHandler configParsingHandler =
         new ConfigOptionSearchAndRunHandler(
-            resultHandler, exceptionHandler, CONFIG_FILE_OPTION_NAME, environment);
-    commandLine.parseWithHandlers(configParsingHandler, exceptionHandler, args);
+            resultHandler, besuParameterExceptionHandler, environment);
+
+    return commandLine
+        .setExecutionStrategy(configParsingHandler)
+        .setParameterExceptionHandler(besuParameterExceptionHandler)
+        .setExecutionExceptionHandler(besuExecutionExceptionHandler)
+        .execute(args);
+  }
+
+  private void preSynchronization() {
+    preSynchronizationTaskRunner.runTasks(besuController);
   }
 
-  private void startSynchronization() {
-    synchronize(
+  private Runner buildRunner() {
+    return synchronize(
         besuController,
-        p2pEnabled,
-        peerDiscoveryEnabled,
+        p2PDiscoveryOptionGroup.p2pEnabled,
+        p2pTLSConfiguration,
+        p2PDiscoveryOptionGroup.peerDiscoveryEnabled,
         ethNetworkConfig,
-        maxPeers,
-        p2pHost,
-        p2pInterface,
-        p2pPort,
+        p2PDiscoveryOptionGroup.p2pHost,
+        p2PDiscoveryOptionGroup.p2pInterface,
+        p2PDiscoveryOptionGroup.p2pPort,
         graphQLConfiguration,
         jsonRpcConfiguration,
+        engineJsonRpcConfiguration,
         webSocketConfiguration,
+        jsonRpcIpcConfiguration,
         apiConfiguration,
         metricsConfiguration,
         permissioningConfiguration,
@@ -1285,7 +1746,7 @@ private void startSynchronization() {
         pidPath);
   }
 
-  private BesuCommand startPlugins() {
+  private void startPlugins() {
     besuPluginContext.addService(
         BesuEvents.class,
         new BesuEventsImpl(
@@ -1294,64 +1755,218 @@ private BesuCommand startPlugins() {
             besuController.getTransactionPool(),
             besuController.getSyncState()));
     besuPluginContext.addService(MetricsSystem.class, getMetricsSystem());
+
+    besuPluginContext.addService(
+        BlockchainService.class,
+        new BlockchainServiceImpl(besuController.getProtocolContext().getBlockchain()));
+
+    besuPluginContext.addService(
+        TraceService.class,
+        new TraceServiceImpl(
+            new BlockchainQueries(
+                besuController.getProtocolContext().getBlockchain(),
+                besuController.getProtocolContext().getWorldStateArchive()),
+            besuController.getProtocolSchedule()));
+
     besuController.getAdditionalPluginServices().appendPluginServices(besuPluginContext);
     besuPluginContext.startPlugins();
-    return this;
   }
 
+  private void validatePluginOptions() {
+    // plugins do not 'wire up' until start has been called
+    // consequently you can only do some configuration checks
+    // after start has been called on plugins
+
+    if (Boolean.TRUE.equals(privacyOptionGroup.isPrivacyEnabled)) {
+
+      if (privacyOptionGroup.privateMarkerTransactionSigningKeyPath != null
+          && privacyPluginService != null
+          && privacyPluginService.getPrivateMarkerTransactionFactory() != null) {
+        throw new ParameterException(
+            commandLine,
+            "--privacy-marker-transaction-signing-key-file can not be used in conjunction with a plugin that specifies a PrivateMarkerTransactionFactory");
+      }
+
+      if (Wei.ZERO.compareTo(minTransactionGasPrice) < 0
+          && (privacyOptionGroup.privateMarkerTransactionSigningKeyPath == null
+              && (privacyPluginService == null
+                  || privacyPluginService.getPrivateMarkerTransactionFactory() == null))) {
+        // if gas is required, cannot use random keys to sign private tx
+        // ie --privacy-marker-transaction-signing-key-file must be set
+        throw new ParameterException(
+            commandLine,
+            "Not a free gas network. --privacy-marker-transaction-signing-key-file must be specified and must be a funded account. Private transactions cannot be signed by random (non-funded) accounts in paid gas networks");
+      }
+
+      if (unstablePrivacyPluginOptions.isPrivacyPluginEnabled()
+          && privacyPluginService != null
+          && privacyPluginService.getPayloadProvider() == null) {
+        throw new ParameterException(
+            commandLine,
+            "No Payload Provider has been provided. You must register one when enabling privacy plugin!");
+      }
+
+      if (unstablePrivacyPluginOptions.isPrivacyPluginEnabled()
+          && (privacyOptionGroup.isFlexiblePrivacyGroupsEnabled
+              || privacyOptionGroup.isOnchainPrivacyGroupsEnabled)) {
+        throw new ParameterException(
+            commandLine, "Privacy Plugin can not be used with flexible privacy groups");
+      }
+    }
+  }
+
+  private void setReleaseMetrics() {
+    metricsSystem
+        .get()
+        .createLabelledGauge(
+            StandardMetricCategory.PROCESS, "release", "Release information", "version")
+        .labels(() -> 1, BesuInfo.version());
+  }
+
+  /**
+   * Configure logging framework for Besu
+   *
+   * @param announce sets to true to print the logging level on standard output
+   */
   public void configureLogging(final boolean announce) {
     // To change the configuration if color was enabled/disabled
-    Configurator.reconfigure();
+    LogConfigurator.reconfigure();
     // set log level per CLI flags
+    final String logLevel = loggingLevelOption.getLogLevel();
     if (logLevel != null) {
       if (announce) {
-        System.out.println("Setting logging level to " + logLevel.name());
+        System.out.println("Setting logging level to " + logLevel);
       }
-      Configurator.setAllLevels("", logLevel);
+      LogConfigurator.setLevel("", logLevel);
     }
   }
 
+  /**
+   * Logging in Color enabled or not.
+   *
+   * @return Optional true or false representing logging color is enabled. Empty if not set.
+   */
   public static Optional<Boolean> getColorEnabled() {
     return Optional.ofNullable(colorEnabled);
   }
 
   private void configureNativeLibs() {
-    if (unstableNativeLibraryOptions.getNativeAltbn128()) {
-      AbstractAltBnPrecompiledContract.enableNative();
+    if (unstableNativeLibraryOptions.getNativeAltbn128()
+        && AbstractAltBnPrecompiledContract.isNative()) {
+      logger.info("Using the native implementation of alt bn128");
+    } else {
+      AbstractAltBnPrecompiledContract.disableNative();
+      logger.info("Using the Java implementation of alt bn128");
     }
-    if (unstableNativeLibraryOptions.getNativeSecp256k1()) {
-      SECP256K1.enableNative();
+
+    if (unstableNativeLibraryOptions.getNativeModExp()
+        && BigIntegerModularExponentiationPrecompiledContract.isNative()) {
+      logger.info("Using the native implementation of modexp");
+    } else {
+      BigIntegerModularExponentiationPrecompiledContract.disableNative();
+      logger.info("Using the Java implementation of modexp");
+    }
+
+    if (unstableNativeLibraryOptions.getNativeSecp()
+        && SignatureAlgorithmFactory.getInstance().isNative()) {
+      logger.info("Using the native implementation of the signature algorithm");
+    } else {
+      SignatureAlgorithmFactory.getInstance().disableNative();
+      logger.info("Using the Java implementation of the signature algorithm");
+    }
+
+    if (unstableNativeLibraryOptions.getNativeBlake2bf()
+        && Blake2bfMessageDigest.Blake2bfDigest.isNative()) {
+      logger.info("Using the native implementation of the blake2bf algorithm");
+    } else {
+      Blake2bfMessageDigest.Blake2bfDigest.disableNative();
+      logger.info("Using the Java implementation of the blake2bf algorithm");
+    }
+
+    if (getActualGenesisConfigOptions().getCancunTime().isPresent()) {
+      // if custom genesis provided, then trusted setup file is mandatory
+      if (genesisFile != null && kzgTrustedSetupFile == null) {
+        throw new ParameterException(
+            this.commandLine,
+            "--kzg-trusted-setup is mandatory when providing a custom genesis that support data blobs");
+      }
+      if (kzgTrustedSetupFile != null) {
+        KZGPointEvalPrecompiledContract.init(kzgTrustedSetupFile);
+      } else {
+        KZGPointEvalPrecompiledContract.init(network.name());
+      }
+    } else if (kzgTrustedSetupFile != null) {
+      throw new ParameterException(
+          this.commandLine,
+          "--kzg-trusted-setup can only be specified on networks with data blobs enabled");
     }
   }
 
-  private BesuCommand validateOptions() {
+  private void validateOptions() {
+    validateRequiredOptions();
     issueOptionWarnings();
-
-    validateP2PInterface(p2pInterface);
+    validateP2PInterface(p2PDiscoveryOptionGroup.p2pInterface);
     validateMiningParams();
     validateNatParams();
     validateNetStatsParams();
     validateDnsOptionsParams();
-
-    return this;
+    ensureValidPeerBoundParams();
+    validateRpcOptionsParams();
+    validateChainDataPruningParams();
+    validatePostMergeCheckpointBlockRequirements();
+    p2pTLSConfigOptions.checkP2PTLSOptionsDependencies(logger, commandLine);
+    pkiBlockCreationOptions.checkPkiBlockCreationOptionsDependencies(logger, commandLine);
+  }
+
+  private void validateRequiredOptions() {
+    commandLine
+        .getCommandSpec()
+        .options()
+        .forEach(
+            option -> {
+              if (option.required() && option.stringValues().isEmpty()) {
+                throw new ParameterException(
+                    this.commandLine, "Missing required option: " + option.longestName());
+              }
+            });
   }
 
   @SuppressWarnings("ConstantConditions")
   private void validateMiningParams() {
-    if (isMiningEnabled && coinbase == null) {
+    if (Boolean.TRUE.equals(minerOptionGroup.isMiningEnabled)
+        && minerOptionGroup.coinbase == null) {
       throw new ParameterException(
           this.commandLine,
           "Unable to mine without a valid coinbase. Either disable mining (remove --miner-enabled) "
               + "or specify the beneficiary of mining (via --miner-coinbase <Address>)");
     }
-    if (!isMiningEnabled && iStratumMiningEnabled) {
+    if (Boolean.FALSE.equals(minerOptionGroup.isMiningEnabled)
+        && Boolean.TRUE.equals(minerOptionGroup.iStratumMiningEnabled)) {
       throw new ParameterException(
           this.commandLine,
           "Unable to mine with Stratum if mining is disabled. Either disable Stratum mining (remove --miner-stratum-enabled) "
               + "or specify mining is enabled (--miner-enabled)");
     }
+    if (unstableMiningOptions.getPosBlockCreationMaxTime() <= 0
+        || unstableMiningOptions.getPosBlockCreationMaxTime()
+            > MiningParameters.DEFAULT_POS_BLOCK_CREATION_MAX_TIME) {
+      throw new ParameterException(
+          this.commandLine, "--Xpos-block-creation-max-time must be positive and ≤ 12000");
+    }
+
+    if (unstableMiningOptions.getPosBlockCreationRepetitionMinDuration() <= 0
+        || unstableMiningOptions.getPosBlockCreationRepetitionMinDuration() > 2000) {
+      throw new ParameterException(
+          this.commandLine,
+          "--Xpos-block-creation-repetition-min-duration must be positive and ≤ 2000");
+    }
   }
 
+  /**
+   * Validates P2P interface IP address/host name. Visible for testing.
+   *
+   * @param p2pInterface IP Address/host name
+   */
   protected void validateP2PInterface(final String p2pInterface) {
     final String failMessage = "The provided --p2p-interface is not available: " + p2pInterface;
     try {
@@ -1383,12 +1998,12 @@ private void validateNatParams() {
   }
 
   private void validateNetStatsParams() {
-    if (Strings.isNullOrEmpty(unstableEthstatsOptions.getEthstatsUrl())
-        && !unstableEthstatsOptions.getEthstatsContact().isEmpty()) {
+    if (Strings.isNullOrEmpty(ethstatsOptions.getEthstatsUrl())
+        && !ethstatsOptions.getEthstatsContact().isEmpty()) {
       throw new ParameterException(
           this.commandLine,
-          "The `--Xethstats-contact` requires ethstats server URL to be provided. Either remove --Xethstats-contact"
-              + " or provide an url (via --Xethstats=nodename:secret@host:port)");
+          "The `--ethstats-contact` requires ethstats server URL to be provided. Either remove --ethstats-contact"
+              + " or provide a URL (via --ethstats=nodename:secret@host:port)");
     }
   }
 
@@ -1401,24 +2016,111 @@ private void validateDnsOptionsParams() {
     }
   }
 
+  private void ensureValidPeerBoundParams() {
+    maxPeers = p2PDiscoveryOptionGroup.maxPeers;
+    peersLowerBound = unstableNetworkingOptions.toDomainObject().getPeerLowerBound();
+    if (peersLowerBound > maxPeers) {
+      logger.warn(
+          "`--Xp2p-peer-lower-bound` "
+              + peersLowerBound
+              + " must not exceed --max-peers "
+              + maxPeers);
+      logger.warn("setting --Xp2p-peer-lower-bound=" + maxPeers);
+      peersLowerBound = maxPeers;
+    }
+    final Boolean isLimitRemoteWireConnectionsEnabled =
+        p2PDiscoveryOptionGroup.isLimitRemoteWireConnectionsEnabled;
+    if (isLimitRemoteWireConnectionsEnabled) {
+      final float fraction =
+          Fraction.fromPercentage(p2PDiscoveryOptionGroup.maxRemoteConnectionsPercentage)
+              .getValue();
+      checkState(
+          fraction >= 0.0 && fraction <= 1.0,
+          "Fraction of remote connections allowed must be between 0.0 and 1.0 (inclusive).");
+      maxRemoteInitiatedPeers = (int) Math.floor(fraction * maxPeers);
+    } else {
+      maxRemoteInitiatedPeers = maxPeers;
+    }
+  }
+
+  private void validateRpcOptionsParams() {
+    final Predicate<String> configuredApis =
+        apiName ->
+            Arrays.stream(RpcApis.values())
+                    .anyMatch(builtInApi -> apiName.equals(builtInApi.name()))
+                || rpcEndpointServiceImpl.hasNamespace(apiName);
+
+    if (!jsonRPCHttpOptionGroup.rpcHttpApis.stream().allMatch(configuredApis)) {
+      final List<String> invalidHttpApis =
+          new ArrayList<String>(jsonRPCHttpOptionGroup.rpcHttpApis);
+      invalidHttpApis.removeAll(VALID_APIS);
+      throw new ParameterException(
+          this.commandLine,
+          "Invalid value for option '--rpc-http-api': invalid entries found "
+              + invalidHttpApis.toString());
+    }
+
+    if (!jsonRPCWebsocketOptionGroup.rpcWsApis.stream().allMatch(configuredApis)) {
+      final List<String> invalidWsApis =
+          new ArrayList<String>(jsonRPCWebsocketOptionGroup.rpcWsApis);
+      invalidWsApis.removeAll(VALID_APIS);
+      throw new ParameterException(
+          this.commandLine,
+          "Invalid value for option '--rpc-ws-api': invalid entries found " + invalidWsApis);
+    }
+
+    final boolean validHttpApiMethods =
+        jsonRPCHttpOptionGroup.rpcHttpApiMethodsNoAuth.stream()
+            .allMatch(RpcMethod::rpcMethodExists);
+
+    if (!validHttpApiMethods) {
+      throw new ParameterException(
+          this.commandLine,
+          "Invalid value for option '--rpc-http-api-methods-no-auth', options must be valid RPC methods");
+    }
+
+    final boolean validWsApiMethods =
+        jsonRPCWebsocketOptionGroup.rpcWsApiMethodsNoAuth.stream()
+            .allMatch(RpcMethod::rpcMethodExists);
+
+    if (!validWsApiMethods) {
+      throw new ParameterException(
+          this.commandLine,
+          "Invalid value for option '--rpc-ws-api-methods-no-auth', options must be valid RPC methods");
+    }
+  }
+
+  private void validateChainDataPruningParams() {
+    if (unstableChainPruningOptions.getChainDataPruningEnabled()
+        && unstableChainPruningOptions.getChainDataPruningBlocksRetained()
+            < ChainPruningOptions.DEFAULT_CHAIN_DATA_PRUNING_MIN_BLOCKS_RETAINED) {
+      throw new ParameterException(
+          this.commandLine,
+          "--Xchain-pruning-blocks-retained must be >= "
+              + ChainPruningOptions.DEFAULT_CHAIN_DATA_PRUNING_MIN_BLOCKS_RETAINED);
+    }
+  }
+
   private GenesisConfigOptions readGenesisConfigOptions() {
-    final GenesisConfigOptions genesisConfigOptions;
+
     try {
       final GenesisConfigFile genesisConfigFile = GenesisConfigFile.fromConfig(genesisConfig());
       genesisConfigOptions = genesisConfigFile.getConfigOptions(genesisConfigOverrides);
-    } catch (Exception e) {
-      throw new IllegalStateException("Unable to read genesis file for GoQuorum options", e);
+    } catch (final Exception e) {
+      throw new ParameterException(
+          this.commandLine, "Unable to load genesis file. " + e.getCause());
     }
     return genesisConfigOptions;
   }
 
   private void issueOptionWarnings() {
+
     // Check that P2P options are able to work
     CommandLineUtils.checkOptionDependencies(
         logger,
         commandLine,
         "--p2p-enabled",
-        !p2pEnabled,
+        !p2PDiscoveryOptionGroup.p2pEnabled,
         asList(
             "--bootnodes",
             "--discovery-enabled",
@@ -1429,53 +2131,96 @@ private void issueOptionWarnings() {
             "--p2p-interface",
             "--p2p-port",
             "--remote-connections-max-percentage"));
+
+    // Check that block producer options work
+    if (!isMergeEnabled()) {
+      CommandLineUtils.checkOptionDependencies(
+          logger,
+          commandLine,
+          "--miner-enabled",
+          !minerOptionGroup.isMiningEnabled,
+          asList(
+              "--miner-coinbase",
+              "--min-gas-price",
+              "--min-block-occupancy-ratio",
+              "--miner-extra-data"));
+    }
     // Check that mining options are able to work
     CommandLineUtils.checkOptionDependencies(
         logger,
         commandLine,
         "--miner-enabled",
-        !isMiningEnabled,
+        !minerOptionGroup.isMiningEnabled,
         asList(
-            "--miner-coinbase",
-            "--min-gas-price",
-            "--min-block-occupancy-ratio",
-            "--miner-extra-data",
             "--miner-stratum-enabled",
             "--Xminer-remote-sealers-limit",
             "--Xminer-remote-sealers-hashrate-ttl"));
 
-    CommandLineUtils.checkOptionDependencies(
-        logger,
+    CommandLineUtils.failIfOptionDoesntMeetRequirement(
         commandLine,
-        "--sync-mode",
-        !SyncMode.FAST.equals(syncMode),
+        "--fast-sync-min-peers can't be used with FULL sync-mode",
+        !SyncMode.isFullSync(getDefaultSyncModeIfNotSet()),
         singletonList("--fast-sync-min-peers"));
 
-    if (!securityModuleName.equals(DEFAULT_SECURITY_MODULE) && nodePrivateKeyFile != null) {
+    CommandLineUtils.failIfOptionDoesntMeetRequirement(
+        commandLine,
+        "--Xcheckpoint-post-merge-enabled can only be used with X_CHECKPOINT sync-mode",
+        SyncMode.X_CHECKPOINT.equals(getDefaultSyncModeIfNotSet()),
+        singletonList("--Xcheckpoint-post-merge-enabled"));
+
+    CommandLineUtils.failIfOptionDoesntMeetRequirement(
+        commandLine,
+        "--Xsnapsync-synchronizer-flat option can only be used when -Xsnapsync-synchronizer-flat-db-healing-enabled is true",
+        unstableSynchronizerOptions.isSnapsyncFlatDbHealingEnabled(),
+        asList(
+            "--Xsnapsync-synchronizer-flat-account-healed-count-per-request",
+            "--Xsnapsync-synchronizer-flat-slot-healed-count-per-request"));
+
+    if (!securityModuleName.equals(DEFAULT_SECURITY_MODULE)
+        && nodePrivateKeyFileOption.getNodePrivateKeyFile() != null) {
       logger.warn(
           DEPENDENCY_WARNING_MSG,
           "--node-private-key-file",
           "--security-module=" + DEFAULT_SECURITY_MODULE);
     }
+
+    if (Boolean.TRUE.equals(privacyOptionGroup.isOnchainPrivacyGroupsEnabled)) {
+      logger.warn(
+          DEPRECATION_WARNING_MSG,
+          "--privacy-onchain-groups-enabled",
+          "--privacy-flexible-groups-enabled");
+    }
   }
 
-  private BesuCommand configure() throws Exception {
+  private void configure() throws Exception {
     checkPortClash();
+    checkIfRequiredPortsAreAvailable();
+    syncMode = getDefaultSyncModeIfNotSet();
 
-    syncMode =
-        Optional.ofNullable(syncMode)
-            .orElse(
-                genesisFile == null && !isPrivacyEnabled && network != NetworkName.DEV
-                    ? SyncMode.FAST
-                    : SyncMode.FULL);
+    ethNetworkConfig = updateNetworkConfig(network);
 
-    ethNetworkConfig = updateNetworkConfig(getNetwork());
-    if (isGoQuorumCompatibilityMode) {
-      checkGoQuorumCompatibilityConfig(ethNetworkConfig);
+    checkGoQuorumCompatibilityConfig(ethNetworkConfig);
+
+    jsonRpcConfiguration =
+        jsonRpcConfiguration(
+            jsonRPCHttpOptionGroup.rpcHttpPort, jsonRPCHttpOptionGroup.rpcHttpApis, hostsAllowlist);
+    if (isEngineApiEnabled()) {
+      engineJsonRpcConfiguration =
+          createEngineJsonRpcConfiguration(
+              engineRPCOptionGroup.engineRpcPort, engineRPCOptionGroup.engineHostsAllowlist);
     }
-    jsonRpcConfiguration = jsonRpcConfiguration();
+    p2pTLSConfiguration = p2pTLSConfigOptions.p2pTLSConfiguration(commandLine);
     graphQLConfiguration = graphQLConfiguration();
-    webSocketConfiguration = webSocketConfiguration();
+    webSocketConfiguration =
+        webSocketConfiguration(
+            jsonRPCWebsocketOptionGroup.rpcWsPort,
+            jsonRPCWebsocketOptionGroup.rpcWsApis,
+            hostsAllowlist);
+    jsonRpcIpcConfiguration =
+        jsonRpcIpcConfiguration(
+            unstableIpcOptions.isEnabled(),
+            unstableIpcOptions.getIpcPath(),
+            unstableIpcOptions.getRpcIpcApis());
     apiConfiguration = apiConfiguration();
     // hostsWhitelist is a hidden option. If it is specified, add the list to hostAllowlist
     if (!hostsWhitelist.isEmpty()) {
@@ -1490,8 +2235,6 @@ private BesuCommand configure() throws Exception {
     permissioningConfiguration = permissioningConfiguration();
     staticNodes = loadStaticNodes();
 
-    logger.info("Connecting to {} static nodes.", staticNodes.size());
-    logger.trace("Static Nodes = {}", staticNodes);
     final List<EnodeURL> enodeURIs = ethNetworkConfig.getBootNodes();
     permissioningConfiguration
         .flatMap(PermissioningConfiguration::getLocalConfig)
@@ -1502,14 +2245,24 @@ private BesuCommand configure() throws Exception {
         .ifPresent(p -> ensureAllNodesAreInAllowlist(staticNodes, p));
     metricsConfiguration = metricsConfiguration();
 
+    instantiateSignatureAlgorithmFactory();
+
+    logger.info(generateConfigurationOverview());
+    logger.info("Connecting to {} static nodes.", staticNodes.size());
+    logger.trace("Static Nodes = {}", staticNodes);
     logger.info("Security Module: {}", securityModuleName);
-    return this;
   }
 
-  private NetworkName getNetwork() {
-    // noinspection ConstantConditions network is not always null but injected by
-    // PicoCLI if used
-    return network == null ? MAINNET : network;
+  private JsonRpcIpcConfiguration jsonRpcIpcConfiguration(
+      final Boolean enabled, final Path ipcPath, final List<String> rpcIpcApis) {
+    final Path actualPath;
+    if (ipcPath == null) {
+      actualPath = IpcOptions.getDefaultPath(dataDir());
+    } else {
+      actualPath = ipcPath;
+    }
+    return new JsonRpcIpcConfiguration(
+        vertx.isNativeTransportEnabled() && enabled, actualPath, rpcIpcApis);
   }
 
   private void ensureAllNodesAreInAllowlist(
@@ -1523,57 +2276,95 @@ private void ensureAllNodesAreInAllowlist(
     }
   }
 
-  private BesuCommand controller() {
-    besuController = buildController();
-    return this;
+  private BesuController initController() {
+    return buildController();
   }
 
+  /**
+   * Builds BesuController
+   *
+   * @return instance of BesuController
+   */
   public BesuController buildController() {
     try {
-      return getControllerBuilder().build();
+      return this.besuComponent == null
+          ? getControllerBuilder().build()
+          : getControllerBuilder().besuComponent(this.besuComponent).build();
     } catch (final Exception e) {
       throw new ExecutionException(this.commandLine, e.getMessage(), e);
     }
   }
 
+  /**
+   * Builds BesuControllerBuilder which can be used to build BesuController
+   *
+   * @return instance of BesuControllerBuilder
+   */
   public BesuControllerBuilder getControllerBuilder() {
+    final KeyValueStorageProvider storageProvider = keyValueStorageProvider(keyValueStorageName);
+    final Optional<TransactionSelectorFactory> transactionSelectorFactory =
+        getTransactionSelectorFactory();
     return controllerBuilderFactory
-        .fromEthNetworkConfig(updateNetworkConfig(getNetwork()), genesisConfigOverrides)
+        .fromEthNetworkConfig(
+            updateNetworkConfig(network), genesisConfigOverrides, getDefaultSyncModeIfNotSet())
         .synchronizerConfiguration(buildSyncConfig())
         .ethProtocolConfiguration(unstableEthProtocolOptions.toDomainObject())
+        .networkConfiguration(unstableNetworkingOptions.toDomainObject())
+        .transactionSelectorFactory(transactionSelectorFactory)
         .dataDirectory(dataDir())
         .miningParameters(
-            new MiningParameters(
-                coinbase,
-                minTransactionGasPrice,
-                extraData,
-                isMiningEnabled,
-                iStratumMiningEnabled,
-                stratumNetworkInterface,
-                stratumPort,
-                unstableMiningOptions.getStratumExtranonce(),
-                Optional.empty(),
-                minBlockOccupancyRatio,
-                unstableMiningOptions.getRemoteSealersLimit(),
-                unstableMiningOptions.getRemoteSealersTimeToLive()))
+            new MiningParameters.Builder()
+                .coinbase(minerOptionGroup.coinbase)
+                .targetGasLimit(targetGasLimit)
+                .minTransactionGasPrice(minTransactionGasPrice)
+                .extraData(minerOptionGroup.extraData)
+                .miningEnabled(minerOptionGroup.isMiningEnabled)
+                .stratumMiningEnabled(minerOptionGroup.iStratumMiningEnabled)
+                .stratumNetworkInterface(minerOptionGroup.stratumNetworkInterface)
+                .stratumPort(minerOptionGroup.stratumPort)
+                .stratumExtranonce(unstableMiningOptions.getStratumExtranonce())
+                .minBlockOccupancyRatio(minBlockOccupancyRatio)
+                .remoteSealersLimit(unstableMiningOptions.getRemoteSealersLimit())
+                .remoteSealersTimeToLive(unstableMiningOptions.getRemoteSealersTimeToLive())
+                .powJobTimeToLive(unstableMiningOptions.getPowJobTimeToLive())
+                .maxOmmerDepth(unstableMiningOptions.getMaxOmmersDepth())
+                .posBlockCreationMaxTime(unstableMiningOptions.getPosBlockCreationMaxTime())
+                .posBlockCreationRepetitionMinDuration(
+                    unstableMiningOptions.getPosBlockCreationRepetitionMinDuration())
+                .build())
         .transactionPoolConfiguration(buildTransactionPoolConfiguration())
-        .nodeKey(buildNodeKey())
+        .nodeKey(new NodeKey(securityModule()))
         .metricsSystem(metricsSystem.get())
+        .messagePermissioningProviders(permissioningService.getMessagePermissioningProviders())
         .privacyParameters(privacyParameters())
+        .pkiBlockCreationConfiguration(maybePkiBlockCreationConfiguration())
         .clock(Clock.systemUTC())
         .isRevertReasonEnabled(isRevertReasonEnabled)
-        .storageProvider(keyStorageProvider(keyValueStorageName))
+        .storageProvider(storageProvider)
         .isPruningEnabled(isPruningEnabled())
         .pruningConfiguration(
             new PrunerConfiguration(pruningBlockConfirmations, pruningBlocksRetained))
         .genesisConfigOverrides(genesisConfigOverrides)
         .gasLimitCalculator(
             Optional.ofNullable(targetGasLimit)
-                .<GasLimitCalculator>map(TargetingGasLimitCalculator::new)
+                .<GasLimitCalculator>map(z -> new FrontierTargetingGasLimitCalculator())
                 .orElse(GasLimitCalculator.constant()))
         .requiredBlocks(requiredBlocks)
         .reorgLoggingThreshold(reorgLoggingThreshold)
-        .dataStorageConfiguration(unstableDataStorageOptions.toDomainObject());
+        .evmConfiguration(unstableEvmOptions.toDomainObject())
+        .dataStorageConfiguration(dataStorageOptions.toDomainObject())
+        .maxPeers(p2PDiscoveryOptionGroup.maxPeers)
+        .lowerBoundPeers(peersLowerBound)
+        .maxRemotelyInitiatedPeers(maxRemoteInitiatedPeers)
+        .randomPeerPriority(p2PDiscoveryOptionGroup.randomPeerPriority)
+        .chainPruningConfiguration(unstableChainPruningOptions.toDomainObject());
+  }
+
+  @NotNull
+  private Optional<TransactionSelectorFactory> getTransactionSelectorFactory() {
+    final Optional<TransactionSelectionService> txSelectionService =
+        besuPluginContext.getService(TransactionSelectionService.class);
+    return txSelectionService.isPresent() ? txSelectionService.get().get() : Optional.empty();
   }
 
   private GraphQLConfiguration graphQLConfiguration() {
@@ -1582,35 +2373,109 @@ private GraphQLConfiguration graphQLConfiguration() {
         logger,
         commandLine,
         "--graphql-http-enabled",
-        !isGraphQLHttpEnabled,
+        !graphQlOptionGroup.isGraphQLHttpEnabled,
         asList("--graphql-http-cors-origins", "--graphql-http-host", "--graphql-http-port"));
-
     final GraphQLConfiguration graphQLConfiguration = GraphQLConfiguration.createDefault();
-    graphQLConfiguration.setEnabled(isGraphQLHttpEnabled);
-    graphQLConfiguration.setHost(graphQLHttpHost);
-    graphQLConfiguration.setPort(graphQLHttpPort);
+    graphQLConfiguration.setEnabled(graphQlOptionGroup.isGraphQLHttpEnabled);
+    graphQLConfiguration.setHost(
+        Strings.isNullOrEmpty(graphQlOptionGroup.graphQLHttpHost)
+            ? p2PDiscoveryOptionGroup.autoDiscoverDefaultIP().getHostAddress()
+            : graphQlOptionGroup.graphQLHttpHost);
+    graphQLConfiguration.setPort(graphQlOptionGroup.graphQLHttpPort);
     graphQLConfiguration.setHostsAllowlist(hostsAllowlist);
-    graphQLConfiguration.setCorsAllowedDomains(graphQLHttpCorsAllowedOrigins);
+    graphQLConfiguration.setCorsAllowedDomains(graphQlOptionGroup.graphQLHttpCorsAllowedOrigins);
     graphQLConfiguration.setHttpTimeoutSec(unstableRPCOptions.getHttpTimeoutSec());
 
     return graphQLConfiguration;
   }
 
-  private JsonRpcConfiguration jsonRpcConfiguration() {
+  private JsonRpcConfiguration createEngineJsonRpcConfiguration(
+      final Integer listenPort, final List<String> allowCallsFrom) {
+    final JsonRpcConfiguration engineConfig =
+        jsonRpcConfiguration(listenPort, Arrays.asList("ENGINE", "ETH"), allowCallsFrom);
+    engineConfig.setEnabled(isEngineApiEnabled());
+    if (!engineRPCOptionGroup.isEngineAuthDisabled) {
+      engineConfig.setAuthenticationEnabled(true);
+      engineConfig.setAuthenticationAlgorithm(JwtAlgorithm.HS256);
+      if (Objects.nonNull(engineRPCOptionGroup.engineJwtKeyFile)
+          && java.nio.file.Files.exists(engineRPCOptionGroup.engineJwtKeyFile)) {
+        engineConfig.setAuthenticationPublicKeyFile(engineRPCOptionGroup.engineJwtKeyFile.toFile());
+      } else {
+        logger.warn(
+            "Engine API authentication enabled without key file. Expect ephemeral jwt.hex file in datadir");
+      }
+    }
+    return engineConfig;
+  }
+
+  private JsonRpcConfiguration jsonRpcConfiguration(
+      final Integer listenPort, final List<String> apiGroups, final List<String> allowCallsFrom) {
     checkRpcTlsClientAuthOptionsDependencies();
     checkRpcTlsOptionsDependencies();
+    checkRpcHttpOptionsDependencies();
+
+    if (jsonRPCHttpOptionGroup.isRpcHttpAuthenticationEnabled) {
+      CommandLineUtils.checkOptionDependencies(
+          logger,
+          commandLine,
+          "--rpc-http-authentication-public-key-file",
+          jsonRPCHttpOptionGroup.rpcHttpAuthenticationPublicKeyFile == null,
+          asList("--rpc-http-authentication-jwt-algorithm"));
+    }
+
+    if (jsonRPCHttpOptionGroup.isRpcHttpAuthenticationEnabled
+        && rpcHttpAuthenticationCredentialsFile() == null
+        && jsonRPCHttpOptionGroup.rpcHttpAuthenticationPublicKeyFile == null) {
+      throw new ParameterException(
+          commandLine,
+          "Unable to authenticate JSON-RPC HTTP endpoint without a supplied credentials file or authentication public key file");
+    }
+
+    final JsonRpcConfiguration jsonRpcConfiguration = JsonRpcConfiguration.createDefault();
+    jsonRpcConfiguration.setEnabled(jsonRPCHttpOptionGroup.isRpcHttpEnabled);
+    jsonRpcConfiguration.setHost(
+        Strings.isNullOrEmpty(jsonRPCHttpOptionGroup.rpcHttpHost)
+            ? p2PDiscoveryOptionGroup.autoDiscoverDefaultIP().getHostAddress()
+            : jsonRPCHttpOptionGroup.rpcHttpHost);
+    jsonRpcConfiguration.setPort(listenPort);
+    jsonRpcConfiguration.setMaxActiveConnections(jsonRPCHttpOptionGroup.rpcHttpMaxConnections);
+    jsonRpcConfiguration.setCorsAllowedDomains(jsonRPCHttpOptionGroup.rpcHttpCorsAllowedOrigins);
+    jsonRpcConfiguration.setRpcApis(apiGroups.stream().distinct().collect(Collectors.toList()));
+    jsonRpcConfiguration.setNoAuthRpcApis(
+        jsonRPCHttpOptionGroup.rpcHttpApiMethodsNoAuth.stream()
+            .distinct()
+            .collect(Collectors.toList()));
+    jsonRpcConfiguration.setHostsAllowlist(allowCallsFrom);
+    jsonRpcConfiguration.setAuthenticationEnabled(
+        jsonRPCHttpOptionGroup.isRpcHttpAuthenticationEnabled);
+    jsonRpcConfiguration.setAuthenticationCredentialsFile(rpcHttpAuthenticationCredentialsFile());
+    jsonRpcConfiguration.setAuthenticationPublicKeyFile(
+        jsonRPCHttpOptionGroup.rpcHttpAuthenticationPublicKeyFile);
+    jsonRpcConfiguration.setAuthenticationAlgorithm(
+        jsonRPCHttpOptionGroup.rpcHttpAuthenticationAlgorithm);
+    jsonRpcConfiguration.setTlsConfiguration(rpcHttpTlsConfiguration());
+    jsonRpcConfiguration.setHttpTimeoutSec(unstableRPCOptions.getHttpTimeoutSec());
+    jsonRpcConfiguration.setMaxBatchSize(jsonRPCHttpOptionGroup.rpcHttpMaxBatchSize);
+    jsonRpcConfiguration.setMaxRequestContentLength(
+        jsonRPCHttpOptionGroup.rpcHttpMaxRequestContentLength);
+    return jsonRpcConfiguration;
+  }
 
+  private void checkRpcHttpOptionsDependencies() {
     CommandLineUtils.checkOptionDependencies(
         logger,
         commandLine,
         "--rpc-http-enabled",
-        !isRpcHttpEnabled,
+        !jsonRPCHttpOptionGroup.isRpcHttpEnabled,
         asList(
             "--rpc-http-api",
             "--rpc-http-apis",
+            "--rpc-http-api-method-no-auth",
+            "--rpc-http-api-methods-no-auth",
             "--rpc-http-cors-origins",
             "--rpc-http-host",
             "--rpc-http-port",
+            "--rpc-http-max-active-connections",
             "--rpc-http-authentication-enabled",
             "--rpc-http-authentication-credentials-file",
             "--rpc-http-authentication-public-key-file",
@@ -1619,29 +2484,11 @@ private JsonRpcConfiguration jsonRpcConfiguration() {
             "--rpc-http-tls-keystore-password-file",
             "--rpc-http-tls-client-auth-enabled",
             "--rpc-http-tls-known-clients-file",
-            "--rpc-http-tls-ca-clients-enabled"));
-
-    if (isRpcHttpAuthenticationEnabled
-        && rpcHttpAuthenticationCredentialsFile() == null
-        && rpcHttpAuthenticationPublicKeyFile == null) {
-      throw new ParameterException(
-          commandLine,
-          "Unable to authenticate JSON-RPC HTTP endpoint without a supplied credentials file or authentication public key file");
-    }
-
-    final JsonRpcConfiguration jsonRpcConfiguration = JsonRpcConfiguration.createDefault();
-    jsonRpcConfiguration.setEnabled(isRpcHttpEnabled);
-    jsonRpcConfiguration.setHost(rpcHttpHost);
-    jsonRpcConfiguration.setPort(rpcHttpPort);
-    jsonRpcConfiguration.setCorsAllowedDomains(rpcHttpCorsAllowedOrigins);
-    jsonRpcConfiguration.setRpcApis(rpcHttpApis.stream().distinct().collect(Collectors.toList()));
-    jsonRpcConfiguration.setHostsAllowlist(hostsAllowlist);
-    jsonRpcConfiguration.setAuthenticationEnabled(isRpcHttpAuthenticationEnabled);
-    jsonRpcConfiguration.setAuthenticationCredentialsFile(rpcHttpAuthenticationCredentialsFile());
-    jsonRpcConfiguration.setAuthenticationPublicKeyFile(rpcHttpAuthenticationPublicKeyFile);
-    jsonRpcConfiguration.setTlsConfiguration(rpcHttpTlsConfiguration());
-    jsonRpcConfiguration.setHttpTimeoutSec(unstableRPCOptions.getHttpTimeoutSec());
-    return jsonRpcConfiguration;
+            "--rpc-http-tls-ca-clients-enabled",
+            "--rpc-http-authentication-jwt-algorithm",
+            "--rpc-http-tls-protocols",
+            "--rpc-http-tls-cipher-suite",
+            "--rpc-http-tls-cipher-suites"));
   }
 
   private void checkRpcTlsOptionsDependencies() {
@@ -1649,13 +2496,16 @@ private void checkRpcTlsOptionsDependencies() {
         logger,
         commandLine,
         "--rpc-http-tls-enabled",
-        !isRpcHttpTlsEnabled,
+        !jsonRPCHttpOptionGroup.isRpcHttpTlsEnabled,
         asList(
             "--rpc-http-tls-keystore-file",
             "--rpc-http-tls-keystore-password-file",
             "--rpc-http-tls-client-auth-enabled",
             "--rpc-http-tls-known-clients-file",
-            "--rpc-http-tls-ca-clients-enabled"));
+            "--rpc-http-tls-ca-clients-enabled",
+            "--rpc-http-tls-protocols",
+            "--rpc-http-tls-cipher-suite",
+            "--rpc-http-tls-cipher-suites"));
   }
 
   private void checkRpcTlsClientAuthOptionsDependencies() {
@@ -1663,7 +2513,7 @@ private void checkRpcTlsClientAuthOptionsDependencies() {
         logger,
         commandLine,
         "--rpc-http-tls-client-auth-enabled",
-        !isRpcHttpTlsClientAuthEnabled,
+        !jsonRPCHttpOptionGroup.isRpcHttpTlsClientAuthEnabled,
         asList("--rpc-http-tls-known-clients-file", "--rpc-http-tls-ca-clients-enabled"));
   }
 
@@ -1672,7 +2522,7 @@ private void checkPrivacyTlsOptionsDependencies() {
         logger,
         commandLine,
         "--privacy-tls-enabled",
-        !isPrivacyTlsEnabled,
+        !privacyOptionGroup.isPrivacyTlsEnabled,
         asList(
             "--privacy-tls-keystore-file",
             "--privacy-tls-keystore-password-file",
@@ -1684,39 +2534,60 @@ private Optional<TlsConfiguration> rpcHttpTlsConfiguration() {
       return Optional.empty();
     }
 
-    if (rpcHttpTlsKeyStoreFile == null) {
+    if (jsonRPCHttpOptionGroup.rpcHttpTlsKeyStoreFile == null) {
       throw new ParameterException(
           commandLine, "Keystore file is required when TLS is enabled for JSON-RPC HTTP endpoint");
     }
 
-    if (rpcHttpTlsKeyStorePasswordFile == null) {
+    if (jsonRPCHttpOptionGroup.rpcHttpTlsKeyStorePasswordFile == null) {
       throw new ParameterException(
           commandLine,
           "File containing password to unlock keystore is required when TLS is enabled for JSON-RPC HTTP endpoint");
     }
 
-    if (isRpcHttpTlsClientAuthEnabled
-        && !isRpcHttpTlsCAClientsEnabled
-        && rpcHttpTlsKnownClientsFile == null) {
+    if (jsonRPCHttpOptionGroup.isRpcHttpTlsClientAuthEnabled
+        && !jsonRPCHttpOptionGroup.isRpcHttpTlsCAClientsEnabled
+        && jsonRPCHttpOptionGroup.rpcHttpTlsKnownClientsFile == null) {
       throw new ParameterException(
           commandLine,
           "Known-clients file must be specified or CA clients must be enabled when TLS client authentication is enabled for JSON-RPC HTTP endpoint");
     }
 
+    jsonRPCHttpOptionGroup.rpcHttpTlsProtocols.retainAll(getJDKEnabledProtocols());
+    if (jsonRPCHttpOptionGroup.rpcHttpTlsProtocols.isEmpty()) {
+      throw new ParameterException(
+          commandLine,
+          "No valid TLS protocols specified (the following protocols are enabled: "
+              + getJDKEnabledProtocols()
+              + ")");
+    }
+
+    for (final String cipherSuite : jsonRPCHttpOptionGroup.rpcHttpTlsCipherSuites) {
+      if (!getJDKEnabledCipherSuites().contains(cipherSuite)) {
+        throw new ParameterException(
+            commandLine, "Invalid TLS cipher suite specified " + cipherSuite);
+      }
+    }
+
+    jsonRPCHttpOptionGroup.rpcHttpTlsCipherSuites.retainAll(getJDKEnabledCipherSuites());
+
     return Optional.of(
         TlsConfiguration.Builder.aTlsConfiguration()
-            .withKeyStorePath(rpcHttpTlsKeyStoreFile)
+            .withKeyStorePath(jsonRPCHttpOptionGroup.rpcHttpTlsKeyStoreFile)
             .withKeyStorePasswordSupplier(
-                new FileBasedPasswordProvider(rpcHttpTlsKeyStorePasswordFile))
+                new FileBasedPasswordProvider(
+                    jsonRPCHttpOptionGroup.rpcHttpTlsKeyStorePasswordFile))
             .withClientAuthConfiguration(rpcHttpTlsClientAuthConfiguration())
+            .withSecureTransportProtocols(jsonRPCHttpOptionGroup.rpcHttpTlsProtocols)
+            .withCipherSuites(jsonRPCHttpOptionGroup.rpcHttpTlsCipherSuites)
             .build());
   }
 
   private TlsClientAuthConfiguration rpcHttpTlsClientAuthConfiguration() {
-    if (isRpcHttpTlsClientAuthEnabled) {
+    if (jsonRPCHttpOptionGroup.isRpcHttpTlsClientAuthEnabled) {
       return TlsClientAuthConfiguration.Builder.aTlsClientAuthConfiguration()
-          .withKnownClientsFile(rpcHttpTlsKnownClientsFile)
-          .withCaClientsEnabled(isRpcHttpTlsCAClientsEnabled)
+          .withKnownClientsFile(jsonRPCHttpOptionGroup.rpcHttpTlsKnownClientsFile)
+          .withCaClientsEnabled(jsonRPCHttpOptionGroup.isRpcHttpTlsCAClientsEnabled)
           .build();
     }
 
@@ -1724,42 +2595,70 @@ private TlsClientAuthConfiguration rpcHttpTlsClientAuthConfiguration() {
   }
 
   private boolean isRpcTlsConfigurationRequired() {
-    return isRpcHttpEnabled && isRpcHttpTlsEnabled;
+    return jsonRPCHttpOptionGroup.isRpcHttpEnabled && jsonRPCHttpOptionGroup.isRpcHttpTlsEnabled;
   }
 
-  private WebSocketConfiguration webSocketConfiguration() {
+  private WebSocketConfiguration webSocketConfiguration(
+      final Integer listenPort, final List<String> apiGroups, final List<String> allowCallsFrom) {
 
     CommandLineUtils.checkOptionDependencies(
         logger,
         commandLine,
         "--rpc-ws-enabled",
-        !isRpcWsEnabled,
+        !jsonRPCWebsocketOptionGroup.isRpcWsEnabled,
         asList(
             "--rpc-ws-api",
             "--rpc-ws-apis",
+            "--rpc-ws-api-method-no-auth",
+            "--rpc-ws-api-methods-no-auth",
             "--rpc-ws-host",
             "--rpc-ws-port",
+            "--rpc-ws-max-frame-size",
+            "--rpc-ws-max-active-connections",
             "--rpc-ws-authentication-enabled",
             "--rpc-ws-authentication-credentials-file",
-            "--rpc-ws-authentication-public-key-file"));
+            "--rpc-ws-authentication-public-key-file",
+            "--rpc-ws-authentication-jwt-algorithm"));
 
-    if (isRpcWsAuthenticationEnabled
+    if (jsonRPCWebsocketOptionGroup.isRpcWsAuthenticationEnabled) {
+      CommandLineUtils.checkOptionDependencies(
+          logger,
+          commandLine,
+          "--rpc-ws-authentication-public-key-file",
+          jsonRPCWebsocketOptionGroup.rpcWsAuthenticationPublicKeyFile == null,
+          asList("--rpc-ws-authentication-jwt-algorithm"));
+    }
+
+    if (jsonRPCWebsocketOptionGroup.isRpcWsAuthenticationEnabled
         && rpcWsAuthenticationCredentialsFile() == null
-        && rpcWsAuthenticationPublicKeyFile == null) {
+        && jsonRPCWebsocketOptionGroup.rpcWsAuthenticationPublicKeyFile == null) {
       throw new ParameterException(
           commandLine,
           "Unable to authenticate JSON-RPC WebSocket endpoint without a supplied credentials file or authentication public key file");
     }
 
     final WebSocketConfiguration webSocketConfiguration = WebSocketConfiguration.createDefault();
-    webSocketConfiguration.setEnabled(isRpcWsEnabled);
-    webSocketConfiguration.setHost(rpcWsHost);
-    webSocketConfiguration.setPort(rpcWsPort);
-    webSocketConfiguration.setRpcApis(rpcWsApis);
-    webSocketConfiguration.setAuthenticationEnabled(isRpcWsAuthenticationEnabled);
+    webSocketConfiguration.setEnabled(jsonRPCWebsocketOptionGroup.isRpcWsEnabled);
+    webSocketConfiguration.setHost(
+        Strings.isNullOrEmpty(jsonRPCWebsocketOptionGroup.rpcWsHost)
+            ? p2PDiscoveryOptionGroup.autoDiscoverDefaultIP().getHostAddress()
+            : jsonRPCWebsocketOptionGroup.rpcWsHost);
+    webSocketConfiguration.setPort(listenPort);
+    webSocketConfiguration.setMaxFrameSize(jsonRPCWebsocketOptionGroup.rpcWsMaxFrameSize);
+    webSocketConfiguration.setMaxActiveConnections(jsonRPCWebsocketOptionGroup.rpcWsMaxConnections);
+    webSocketConfiguration.setRpcApis(apiGroups);
+    webSocketConfiguration.setRpcApisNoAuth(
+        jsonRPCWebsocketOptionGroup.rpcWsApiMethodsNoAuth.stream()
+            .distinct()
+            .collect(Collectors.toList()));
+    webSocketConfiguration.setAuthenticationEnabled(
+        jsonRPCWebsocketOptionGroup.isRpcWsAuthenticationEnabled);
     webSocketConfiguration.setAuthenticationCredentialsFile(rpcWsAuthenticationCredentialsFile());
-    webSocketConfiguration.setHostsAllowlist(hostsAllowlist);
-    webSocketConfiguration.setAuthenticationPublicKeyFile(rpcWsAuthenticationPublicKeyFile);
+    webSocketConfiguration.setHostsAllowlist(allowCallsFrom);
+    webSocketConfiguration.setAuthenticationPublicKeyFile(
+        jsonRPCWebsocketOptionGroup.rpcWsAuthenticationPublicKeyFile);
+    webSocketConfiguration.setAuthenticationAlgorithm(
+        jsonRPCWebsocketOptionGroup.rpcWebsocketsAuthenticationAlgorithm);
     webSocketConfiguration.setTimeoutSec(unstableRPCOptions.getWsTimeoutSec());
     return webSocketConfiguration;
   }
@@ -1773,8 +2672,13 @@ private ApiConfiguration apiConfiguration() {
         .build();
   }
 
+  /**
+   * Metrics Configuration for Besu
+   *
+   * @return instance of MetricsConfiguration.
+   */
   public MetricsConfiguration metricsConfiguration() {
-    if (isMetricsEnabled && isMetricsPushEnabled) {
+    if (metricsOptionGroup.isMetricsEnabled && metricsOptionGroup.isMetricsPushEnabled) {
       throw new ParameterException(
           this.commandLine,
           "--metrics-enabled option and --metrics-push-enabled option can't be used at the same "
@@ -1785,14 +2689,14 @@ public MetricsConfiguration metricsConfiguration() {
         logger,
         commandLine,
         "--metrics-enabled",
-        !isMetricsEnabled,
+        !metricsOptionGroup.isMetricsEnabled,
         asList("--metrics-host", "--metrics-port"));
 
     CommandLineUtils.checkOptionDependencies(
         logger,
         commandLine,
         "--metrics-push-enabled",
-        !isMetricsPushEnabled,
+        !metricsOptionGroup.isMetricsPushEnabled,
         asList(
             "--metrics-push-host",
             "--metrics-push-port",
@@ -1801,23 +2705,30 @@ public MetricsConfiguration metricsConfiguration() {
 
     return unstableMetricsCLIOptions
         .toDomainObject()
-        .enabled(isMetricsEnabled)
-        .host(metricsHost)
-        .port(metricsPort)
-        .protocol(metricsProtocol)
-        .metricCategories(metricCategories)
-        .pushEnabled(isMetricsPushEnabled)
-        .pushHost(metricsPushHost)
-        .pushPort(metricsPushPort)
-        .pushInterval(metricsPushInterval)
+        .enabled(metricsOptionGroup.isMetricsEnabled)
+        .host(
+            Strings.isNullOrEmpty(metricsOptionGroup.metricsHost)
+                ? p2PDiscoveryOptionGroup.autoDiscoverDefaultIP().getHostAddress()
+                : metricsOptionGroup.metricsHost)
+        .port(metricsOptionGroup.metricsPort)
+        .protocol(metricsOptionGroup.metricsProtocol)
+        .metricCategories(metricsOptionGroup.metricCategories)
+        .pushEnabled(metricsOptionGroup.isMetricsPushEnabled)
+        .pushHost(
+            Strings.isNullOrEmpty(metricsOptionGroup.metricsPushHost)
+                ? p2PDiscoveryOptionGroup.autoDiscoverDefaultIP().getHostAddress()
+                : metricsOptionGroup.metricsPushHost)
+        .pushPort(metricsOptionGroup.metricsPushPort)
+        .pushInterval(metricsOptionGroup.metricsPushInterval)
         .hostsAllowlist(hostsAllowlist)
-        .prometheusJob(metricsPrometheusJob)
+        .prometheusJob(metricsOptionGroup.metricsPrometheusJob)
         .build();
   }
 
   private Optional<PermissioningConfiguration> permissioningConfiguration() throws Exception {
     if (!(localPermissionsEnabled() || contractPermissionsEnabled())) {
-      if (rpcHttpApis.contains(RpcApis.PERM) || rpcWsApis.contains(RpcApis.PERM)) {
+      if (jsonRPCHttpOptionGroup.rpcHttpApis.contains(RpcApis.PERM.name())
+          || jsonRPCWebsocketOptionGroup.rpcWsApis.contains(RpcApis.PERM.name())) {
         logger.warn(
             "Permissions are disabled. Cannot enable PERM APIs when not using Permissions.");
       }
@@ -1827,30 +2738,32 @@ private Optional<PermissioningConfiguration> permissioningConfiguration() throws
     final Optional<LocalPermissioningConfiguration> localPermissioningConfigurationOptional;
     if (localPermissionsEnabled()) {
       final Optional<String> nodePermissioningConfigFile =
-          Optional.ofNullable(nodePermissionsConfigFile);
+          Optional.ofNullable(permissionsOptionGroup.nodePermissionsConfigFile);
       final Optional<String> accountPermissioningConfigFile =
-          Optional.ofNullable(accountPermissionsConfigFile);
+          Optional.ofNullable(permissionsOptionGroup.accountPermissionsConfigFile);
 
       final LocalPermissioningConfiguration localPermissioningConfiguration =
           PermissioningConfigurationBuilder.permissioningConfiguration(
-              permissionsNodesEnabled,
+              permissionsOptionGroup.permissionsNodesEnabled,
               getEnodeDnsConfiguration(),
               nodePermissioningConfigFile.orElse(getDefaultPermissioningFilePath()),
-              permissionsAccountsEnabled,
+              permissionsOptionGroup.permissionsAccountsEnabled,
               accountPermissioningConfigFile.orElse(getDefaultPermissioningFilePath()));
 
       localPermissioningConfigurationOptional = Optional.of(localPermissioningConfiguration);
     } else {
-      if (nodePermissionsConfigFile != null && !permissionsNodesEnabled) {
+      if (permissionsOptionGroup.nodePermissionsConfigFile != null
+          && !permissionsOptionGroup.permissionsNodesEnabled) {
         logger.warn(
             "Node permissioning config file set {} but no permissions enabled",
-            nodePermissionsConfigFile);
+            permissionsOptionGroup.nodePermissionsConfigFile);
       }
 
-      if (accountPermissionsConfigFile != null && !permissionsAccountsEnabled) {
+      if (permissionsOptionGroup.accountPermissionsConfigFile != null
+          && !permissionsOptionGroup.permissionsAccountsEnabled) {
         logger.warn(
             "Account permissioning config file set {} but no permissions enabled",
-            accountPermissionsConfigFile);
+            permissionsOptionGroup.accountPermissionsConfigFile);
       }
       localPermissioningConfigurationOptional = Optional.empty();
     }
@@ -1858,40 +2771,40 @@ private Optional<PermissioningConfiguration> permissioningConfiguration() throws
     final SmartContractPermissioningConfiguration smartContractPermissioningConfiguration =
         SmartContractPermissioningConfiguration.createDefault();
 
-    if (permissionsNodesContractEnabled) {
-      if (permissionsNodesContractAddress == null) {
+    if (Boolean.TRUE.equals(permissionsOptionGroup.permissionsNodesContractEnabled)) {
+      if (permissionsOptionGroup.permissionsNodesContractAddress == null) {
         throw new ParameterException(
             this.commandLine,
             "No node permissioning contract address specified. Cannot enable smart contract based node permissioning.");
       } else {
         smartContractPermissioningConfiguration.setSmartContractNodeAllowlistEnabled(
-            permissionsNodesContractEnabled);
+            permissionsOptionGroup.permissionsNodesContractEnabled);
         smartContractPermissioningConfiguration.setNodeSmartContractAddress(
-            permissionsNodesContractAddress);
+            permissionsOptionGroup.permissionsNodesContractAddress);
         smartContractPermissioningConfiguration.setNodeSmartContractInterfaceVersion(
-            permissionsNodesContractVersion);
+            permissionsOptionGroup.permissionsNodesContractVersion);
       }
-    } else if (permissionsNodesContractAddress != null) {
+    } else if (permissionsOptionGroup.permissionsNodesContractAddress != null) {
       logger.warn(
           "Node permissioning smart contract address set {} but smart contract node permissioning is disabled.",
-          permissionsNodesContractAddress);
+          permissionsOptionGroup.permissionsNodesContractAddress);
     }
 
-    if (permissionsAccountsContractEnabled) {
-      if (permissionsAccountsContractAddress == null) {
+    if (Boolean.TRUE.equals(permissionsOptionGroup.permissionsAccountsContractEnabled)) {
+      if (permissionsOptionGroup.permissionsAccountsContractAddress == null) {
         throw new ParameterException(
             this.commandLine,
             "No account permissioning contract address specified. Cannot enable smart contract based account permissioning.");
       } else {
         smartContractPermissioningConfiguration.setSmartContractAccountAllowlistEnabled(
-            permissionsAccountsContractEnabled);
+            permissionsOptionGroup.permissionsAccountsContractEnabled);
         smartContractPermissioningConfiguration.setAccountSmartContractAddress(
-            permissionsAccountsContractAddress);
+            permissionsOptionGroup.permissionsAccountsContractAddress);
       }
-    } else if (permissionsAccountsContractAddress != null) {
+    } else if (permissionsOptionGroup.permissionsAccountsContractAddress != null) {
       logger.warn(
           "Account permissioning smart contract address set {} but smart contract account permissioning is disabled.",
-          permissionsAccountsContractAddress);
+          permissionsOptionGroup.permissionsAccountsContractAddress);
     }
 
     final PermissioningConfiguration permissioningConfiguration =
@@ -1903,27 +2816,29 @@ private Optional<PermissioningConfiguration> permissioningConfiguration() throws
     return Optional.of(permissioningConfiguration);
   }
 
-  private Optional<QuorumPermissioningConfiguration> quorumPermissioningConfig() {
+  private Optional<GoQuorumPermissioningConfiguration> quorumPermissioningConfig() {
     if (!isGoQuorumCompatibilityMode) {
       return Optional.empty();
     }
 
     try {
-      final GenesisConfigOptions genesisConfigOptions = readGenesisConfigOptions();
       final OptionalLong qip714BlockNumber = genesisConfigOptions.getQip714BlockNumber();
       return Optional.of(
-          QuorumPermissioningConfiguration.enabled(qip714BlockNumber.orElse(QIP714_DEFAULT_BLOCK)));
-    } catch (Exception e) {
+          GoQuorumPermissioningConfiguration.enabled(
+              qip714BlockNumber.orElse(QIP714_DEFAULT_BLOCK)));
+    } catch (final Exception e) {
       throw new IllegalStateException("Error reading GoQuorum permissioning options", e);
     }
   }
 
   private boolean localPermissionsEnabled() {
-    return permissionsAccountsEnabled || permissionsNodesEnabled;
+    return permissionsOptionGroup.permissionsAccountsEnabled
+        || permissionsOptionGroup.permissionsNodesEnabled;
   }
 
   private boolean contractPermissionsEnabled() {
-    return permissionsNodesContractEnabled || permissionsAccountsContractEnabled;
+    return permissionsOptionGroup.permissionsNodesContractEnabled
+        || permissionsOptionGroup.permissionsAccountsContractEnabled;
   }
 
   private PrivacyParameters privacyParameters() {
@@ -1932,17 +2847,20 @@ private PrivacyParameters privacyParameters() {
         logger,
         commandLine,
         "--privacy-enabled",
-        !isPrivacyEnabled,
-        asList(
-            "--privacy-url",
-            "--privacy-public-key-file",
-            "--privacy-multi-tenancy-enabled",
-            "--privacy-tls-enabled"));
+        !privacyOptionGroup.isPrivacyEnabled,
+        asList("--privacy-multi-tenancy-enabled", "--privacy-tls-enabled"));
+
+    CommandLineUtils.checkMultiOptionDependencies(
+        logger,
+        commandLine,
+        "--privacy-url and/or --privacy-public-key-file ignored because none of --privacy-enabled or isQuorum (in genesis file) was defined.",
+        List.of(!privacyOptionGroup.isPrivacyEnabled, !isGoQuorumCompatibilityMode),
+        List.of("--privacy-url", "--privacy-public-key-file"));
 
     checkPrivacyTlsOptionsDependencies();
 
     final PrivacyParameters.Builder privacyParametersBuilder = new PrivacyParameters.Builder();
-    if (isPrivacyEnabled) {
+    if (Boolean.TRUE.equals(privacyOptionGroup.isPrivacyEnabled)) {
       final String errorSuffix = "cannot be enabled with privacy.";
       if (syncMode == SyncMode.FAST) {
         throw new ParameterException(commandLine, String.format("%s %s", "Fast sync", errorSuffix));
@@ -1950,24 +2868,49 @@ private PrivacyParameters privacyParameters() {
       if (isPruningEnabled()) {
         throw new ParameterException(commandLine, String.format("%s %s", "Pruning", errorSuffix));
       }
+      if (isGoQuorumCompatibilityMode) {
+        throw new ParameterException(
+            commandLine, String.format("GoQuorum privacy is no longer supported in Besu"));
+      }
 
-      if (isPrivacyMultiTenancyEnabled
-          && !jsonRpcConfiguration.isAuthenticationEnabled()
-          && !webSocketConfiguration.isAuthenticationEnabled()) {
+      if (Boolean.TRUE.equals(privacyOptionGroup.isPrivacyMultiTenancyEnabled)
+          && Boolean.FALSE.equals(jsonRpcConfiguration.isAuthenticationEnabled())
+          && Boolean.FALSE.equals(webSocketConfiguration.isAuthenticationEnabled())) {
         throw new ParameterException(
             commandLine,
             "Privacy multi-tenancy requires either http authentication to be enabled or WebSocket authentication to be enabled");
       }
 
       privacyParametersBuilder.setEnabled(true);
-      privacyParametersBuilder.setEnclaveUrl(privacyUrl);
-      privacyParametersBuilder.setMultiTenancyEnabled(isPrivacyMultiTenancyEnabled);
-      privacyParametersBuilder.setOnchainPrivacyGroupsEnabled(isFlexiblePrivacyGroupsEnabled);
+      privacyParametersBuilder.setEnclaveUrl(privacyOptionGroup.privacyUrl);
+      privacyParametersBuilder.setMultiTenancyEnabled(
+          privacyOptionGroup.isPrivacyMultiTenancyEnabled);
+      privacyParametersBuilder.setFlexiblePrivacyGroupsEnabled(
+          privacyOptionGroup.isFlexiblePrivacyGroupsEnabled
+              || privacyOptionGroup.isOnchainPrivacyGroupsEnabled);
+      privacyParametersBuilder.setPrivacyPluginEnabled(
+          unstablePrivacyPluginOptions.isPrivacyPluginEnabled());
+
+      final boolean hasPrivacyPublicKey = privacyOptionGroup.privacyPublicKeyFile != null;
+
+      if (hasPrivacyPublicKey
+          && Boolean.TRUE.equals(privacyOptionGroup.isPrivacyMultiTenancyEnabled)) {
+        throw new ParameterException(
+            commandLine, "Privacy multi-tenancy and privacy public key cannot be used together");
+      }
 
-      final boolean hasPrivacyPublicKey = privacyPublicKeyFile != null;
-      if (hasPrivacyPublicKey && !isPrivacyMultiTenancyEnabled) {
+      if (!hasPrivacyPublicKey
+          && !privacyOptionGroup.isPrivacyMultiTenancyEnabled
+          && !unstablePrivacyPluginOptions.isPrivacyPluginEnabled()) {
+        throw new ParameterException(
+            commandLine, "Please specify Enclave public key file path to enable privacy");
+      }
+
+      if (hasPrivacyPublicKey
+          && Boolean.FALSE.equals(privacyOptionGroup.isPrivacyMultiTenancyEnabled)) {
         try {
-          privacyParametersBuilder.setEnclavePublicKeyUsingFile(privacyPublicKeyFile);
+          privacyParametersBuilder.setPrivacyUserIdUsingFile(
+              privacyOptionGroup.privacyPublicKeyFile);
         } catch (final IOException e) {
           throw new ParameterException(
               commandLine, "Problem with privacy-public-key-file: " + e.getMessage(), e);
@@ -1975,59 +2918,43 @@ private PrivacyParameters privacyParameters() {
           throw new ParameterException(
               commandLine, "Contents of privacy-public-key-file invalid: " + e.getMessage(), e);
         }
-      } else if (hasPrivacyPublicKey) {
-        throw new ParameterException(
-            commandLine, "Privacy multi-tenancy and privacy public key cannot be used together");
-      } else if (!isPrivacyMultiTenancyEnabled) {
-        throw new ParameterException(
-            commandLine, "Please specify Enclave public key file path to enable privacy");
-      }
-
-      if (Wei.ZERO.compareTo(minTransactionGasPrice) < 0) {
-        // if gas is required, cannot use random keys to sign private tx
-        // ie --privacy-marker-transaction-signing-key-file must be set
-        if (privacyMarkerTransactionSigningKeyPath == null) {
-          throw new ParameterException(
-              commandLine,
-              "Not a free gas network. --privacy-marker-transaction-signing-key-file must be specified and must be a funded account. Private transactions cannot be signed by random (non-funded) accounts in paid gas networks");
-        }
-      }
-
-      if (!Address.PRIVACY.equals(privacyPrecompiledAddress)) {
-        logger.warn(
-            "--privacy-precompiled-address option is deprecated. This address is derived, based on --privacy-onchain-groups-enabled.");
       }
 
-      privacyParametersBuilder.setPrivateKeyPath(privacyMarkerTransactionSigningKeyPath);
+      privacyParametersBuilder.setPrivateKeyPath(
+          privacyOptionGroup.privateMarkerTransactionSigningKeyPath);
       privacyParametersBuilder.setStorageProvider(
           privacyKeyStorageProvider(keyValueStorageName + "-privacy"));
-      if (isPrivacyTlsEnabled) {
-        privacyParametersBuilder.setPrivacyKeyStoreFile(privacyKeyStoreFile);
-        privacyParametersBuilder.setPrivacyKeyStorePasswordFile(privacyKeyStorePasswordFile);
-        privacyParametersBuilder.setPrivacyTlsKnownEnclaveFile(privacyTlsKnownEnclaveFile);
+      if (Boolean.TRUE.equals(privacyOptionGroup.isPrivacyTlsEnabled)) {
+        privacyParametersBuilder.setPrivacyKeyStoreFile(privacyOptionGroup.privacyKeyStoreFile);
+        privacyParametersBuilder.setPrivacyKeyStorePasswordFile(
+            privacyOptionGroup.privacyKeyStorePasswordFile);
+        privacyParametersBuilder.setPrivacyTlsKnownEnclaveFile(
+            privacyOptionGroup.privacyTlsKnownEnclaveFile);
       }
       privacyParametersBuilder.setEnclaveFactory(new EnclaveFactory(vertx));
-    } else {
-      if (anyPrivacyApiEnabled()) {
-        logger.warn("Privacy is disabled. Cannot use EEA/PRIV API methods when not using Privacy.");
-      }
     }
 
+    if (Boolean.FALSE.equals(privacyOptionGroup.isPrivacyEnabled) && anyPrivacyApiEnabled()) {
+      logger.warn("Privacy is disabled. Cannot use EEA/PRIV API methods when not using Privacy.");
+    }
+
+    privacyParametersBuilder.setPrivacyService(privacyPluginService);
     final PrivacyParameters privacyParameters = privacyParametersBuilder.build();
 
-    if (isPrivacyEnabled) {
+    if (Boolean.TRUE.equals(privacyOptionGroup.isPrivacyEnabled)) {
       preSynchronizationTaskRunner.addTask(
-          new PrivateDatabaseMigrationPreSyncTask(privacyParameters, migratePrivateDatabase));
+          new PrivateDatabaseMigrationPreSyncTask(
+              privacyParameters, privacyOptionGroup.migratePrivateDatabase));
     }
 
     return privacyParameters;
   }
 
   private boolean anyPrivacyApiEnabled() {
-    return rpcHttpApis.contains(RpcApis.EEA)
-        || rpcWsApis.contains(RpcApis.EEA)
-        || rpcHttpApis.contains(RpcApis.PRIV)
-        || rpcWsApis.contains(RpcApis.PRIV);
+    return jsonRPCHttpOptionGroup.rpcHttpApis.contains(RpcApis.EEA.name())
+        || jsonRPCWebsocketOptionGroup.rpcWsApis.contains(RpcApis.EEA.name())
+        || jsonRPCHttpOptionGroup.rpcHttpApis.contains(RpcApis.PRIV.name())
+        || jsonRPCWebsocketOptionGroup.rpcWsApis.contains(RpcApis.PRIV.name());
   }
 
   private PrivacyKeyValueStorageProvider privacyKeyStorageProvider(final String name) {
@@ -2046,16 +2973,37 @@ private PrivacyKeyValueStorageFactory privacyKeyValueStorageFactory(final String
                 () -> new StorageException("No KeyValueStorageFactory found for key: " + name));
   }
 
-  private KeyValueStorageProvider keyStorageProvider(final String name) {
-    return new KeyValueStorageProviderBuilder()
-        .withStorageFactory(
-            storageService
-                .getByName(name)
-                .orElseThrow(
-                    () -> new StorageException("No KeyValueStorageFactory found for key: " + name)))
-        .withCommonConfiguration(pluginCommonConfiguration)
-        .withMetricsSystem(getMetricsSystem())
-        .build();
+  private KeyValueStorageProvider keyValueStorageProvider(final String name) {
+    if (this.keyValueStorageProvider == null) {
+      this.keyValueStorageProvider =
+          new KeyValueStorageProviderBuilder()
+              .withStorageFactory(
+                  storageService
+                      .getByName(name)
+                      .orElseThrow(
+                          () ->
+                              new StorageException(
+                                  "No KeyValueStorageFactory found for key: " + name)))
+              .withCommonConfiguration(pluginCommonConfiguration)
+              .withMetricsSystem(getMetricsSystem())
+              .build();
+    }
+    return this.keyValueStorageProvider;
+  }
+
+  /**
+   * Get the storage provider
+   *
+   * @return the storage provider
+   */
+  public StorageProvider getStorageProvider() {
+    return keyValueStorageProvider(keyValueStorageName);
+  }
+
+  private Optional<PkiBlockCreationConfiguration> maybePkiBlockCreationConfiguration() {
+    return pkiBlockCreationOptions
+        .asDomainConfig(commandLine)
+        .map(pkiBlockCreationConfigProvider::load);
   }
 
   private SynchronizerConfiguration buildSyncConfig() {
@@ -2069,31 +3017,45 @@ private SynchronizerConfiguration buildSyncConfig() {
   private TransactionPoolConfiguration buildTransactionPoolConfiguration() {
     return unstableTransactionPoolOptions
         .toDomainObject()
-        .txPoolMaxSize(txPoolMaxSize)
-        .pooledTransactionHashesSize(pooledTransactionHashesSize)
-        .pendingTxRetentionPeriod(pendingTxRetentionPeriod)
-        .priceBump(Percentage.fromInt(priceBump))
+        .enableSaveRestore(txPoolOptionGroup.saveRestoreEnabled)
+        .disableLocalTransactions(txPoolOptionGroup.disableLocalTxs)
+        .txPoolLimitByAccountPercentage(txPoolOptionGroup.txPoolLimitByAccountPercentage)
+        .txPoolMaxSize(txPoolOptionGroup.txPoolMaxSize)
+        .pendingTxRetentionPeriod(txPoolOptionGroup.pendingTxRetentionPeriod)
+        .priceBump(Percentage.fromInt(txPoolOptionGroup.priceBump))
         .txFeeCap(txFeeCap)
+        .saveFile(dataPath.resolve(txPoolOptionGroup.saveFile.getPath()).toFile())
         .build();
   }
 
+  /**
+   * Return the file where to save txpool content if the relative option is enabled.
+   *
+   * @return the save file
+   */
+  public File getSaveFile() {
+    return txPoolOptionGroup.saveFile;
+  }
+
   private boolean isPruningEnabled() {
     return pruningEnabled;
   }
 
-  // Blockchain synchronisation from peers.
-  private void synchronize(
+  // Blockchain synchronization from peers.
+  private Runner synchronize(
       final BesuController controller,
       final boolean p2pEnabled,
+      final Optional<TLSConfiguration> p2pTLSConfiguration,
       final boolean peerDiscoveryEnabled,
       final EthNetworkConfig ethNetworkConfig,
-      final int maxPeers,
       final String p2pAdvertisedHost,
       final String p2pListenInterface,
       final int p2pListenPort,
       final GraphQLConfiguration graphQLConfiguration,
       final JsonRpcConfiguration jsonRpcConfiguration,
+      final JsonRpcConfiguration engineJsonRpcConfiguration,
       final WebSocketConfiguration webSocketConfiguration,
+      final JsonRpcIpcConfiguration jsonRpcIpcConfiguration,
       final ApiConfiguration apiConfiguration,
       final MetricsConfiguration metricsConfiguration,
       final Optional<PermissioningConfiguration> permissioningConfiguration,
@@ -2102,7 +3064,7 @@ private void synchronize(
 
     checkNotNull(runnerBuilder);
 
-    permissioningConfiguration.ifPresent(runnerBuilder::permissioningConfiguration);
+    p2pTLSConfiguration.ifPresent(runnerBuilder::p2pTLSConfiguration);
 
     final ObservableMetricsSystem metricsSystem = this.metricsSystem.get();
     final Runner runner =
@@ -2115,44 +3077,54 @@ private void synchronize(
             .natMethodFallbackEnabled(unstableNatOptions.getNatMethodFallbackEnabled())
             .discovery(peerDiscoveryEnabled)
             .ethNetworkConfig(ethNetworkConfig)
+            .permissioningConfiguration(permissioningConfiguration)
             .p2pAdvertisedHost(p2pAdvertisedHost)
             .p2pListenInterface(p2pListenInterface)
             .p2pListenPort(p2pListenPort)
-            .maxPeers(maxPeers)
-            .limitRemoteWireConnectionsEnabled(isLimitRemoteWireConnectionsEnabled)
-            .fractionRemoteConnectionsAllowed(
-                Fraction.fromPercentage(maxRemoteConnectionsPercentage).getValue())
-            .randomPeerPriority(randomPeerPriority)
             .networkingConfiguration(unstableNetworkingOptions.toDomainObject())
+            .legacyForkId(unstableEthProtocolOptions.toDomainObject().isLegacyEth64ForkIdEnabled())
             .graphQLConfiguration(graphQLConfiguration)
             .jsonRpcConfiguration(jsonRpcConfiguration)
+            .engineJsonRpcConfiguration(engineJsonRpcConfiguration)
             .webSocketConfiguration(webSocketConfiguration)
+            .jsonRpcIpcConfiguration(jsonRpcIpcConfiguration)
             .apiConfiguration(apiConfiguration)
             .pidPath(pidPath)
             .dataDir(dataDir())
-            .bannedNodeIds(bannedNodeIds)
+            .bannedNodeIds(p2PDiscoveryOptionGroup.bannedNodeIds)
             .metricsSystem(metricsSystem)
+            .permissioningService(permissioningService)
             .metricsConfiguration(metricsConfiguration)
             .staticNodes(staticNodes)
             .identityString(identityString)
             .besuPluginContext(besuPluginContext)
             .autoLogBloomCaching(autoLogBloomCachingEnabled)
-            .ethstatsUrl(unstableEthstatsOptions.getEthstatsUrl())
-            .ethstatsContact(unstableEthstatsOptions.getEthstatsContact())
-            .storageProvider(keyStorageProvider(keyValueStorageName))
+            .ethstatsOptions(ethstatsOptions)
+            .storageProvider(keyValueStorageProvider(keyValueStorageName))
+            .rpcEndpointService(rpcEndpointServiceImpl)
+            .rpcMaxLogsRange(rpcMaxLogsRange)
+            .enodeDnsConfiguration(getEnodeDnsConfiguration())
             .build();
 
     addShutdownHook(runner);
-    runner.start();
-    runner.awaitStop();
+
+    return runner;
   }
 
+  /**
+   * Builds Vertx instance from VertxOptions. Visible for testing.
+   *
+   * @param vertxOptions Instance of VertxOptions
+   * @return Instance of Vertx.
+   */
+  @VisibleForTesting
   protected Vertx createVertx(final VertxOptions vertxOptions) {
     return Vertx.vertx(vertxOptions);
   }
 
   private VertxOptions createVertxOptions(final MetricsSystem metricsSystem) {
     return new VertxOptions()
+        .setPreferNativeTransport(true)
         .setMetricsOptions(
             new MetricsOptions()
                 .setEnabled(true)
@@ -2167,45 +3139,20 @@ private void addShutdownHook(final Runner runner) {
                   try {
                     besuPluginContext.stopPlugins();
                     runner.close();
-                    LogManager.shutdown();
+                    LogConfigurator.shutdown();
                   } catch (final Exception e) {
                     logger.error("Failed to stop Besu");
                   }
-                }));
-  }
-
-  // Used to discover the default IP of the client.
-  // Loopback IP is used by default as this is how smokeTests require it to be
-  // and it's probably a good security behaviour to default only on the localhost.
-  private InetAddress autoDiscoverDefaultIP() {
-
-    if (autoDiscoveredDefaultIP != null) {
-      return autoDiscoveredDefaultIP;
-    }
-
-    autoDiscoveredDefaultIP = InetAddress.getLoopbackAddress();
-
-    return autoDiscoveredDefaultIP;
+                },
+                "BesuCommand-Shutdown-Hook"));
   }
 
   private EthNetworkConfig updateNetworkConfig(final NetworkName network) {
     final EthNetworkConfig.Builder builder =
         new EthNetworkConfig.Builder(EthNetworkConfig.getNetworkConfig(network));
 
-    // custom genesis file use comes with specific default values for the genesis
-    // file itself
-    // but also for the network id and the bootnodes list.
     if (genesisFile != null) {
-
-      // noinspection ConstantConditions network is not always null but injected by
-      // PicoCLI if used
-      if (this.network != null) {
-        // We check if network option was really provided by user and not only looking
-        // at the
-        // default value.
-        // if user provided it and provided the genesis file option at the same time, it
-        // raises a
-        // conflict error
+      if (commandLine.getParseResult().hasMatchedOption("network")) {
         throw new ParameterException(
             this.commandLine,
             "--network option and --genesis-file option can't be used at the same time.  Please "
@@ -2215,17 +3162,7 @@ private EthNetworkConfig updateNetworkConfig(final NetworkName network) {
       builder.setGenesisConfig(genesisConfig());
 
       if (networkId == null) {
-        // if no network id option is defined on the CLI we have to set a default value
-        // from the
-        // genesis file.
-        // We do the genesis parsing only in this case as we already have network id
-        // constants
-        // for known networks to speed up the process.
-        // Also we have to parse the genesis as we don't already have a parsed version
-        // at this
-        // stage.
-        // If no chain id is found in the genesis as it's an optional, we use mainnet
-        // network id.
+        // If no chain id is found in the genesis, use mainnet network id
         try {
           builder.setNetworkId(
               getGenesisConfigFile()
@@ -2243,35 +3180,44 @@ private EthNetworkConfig updateNetworkConfig(final NetworkName network) {
         }
       }
 
-      if (bootNodes == null) {
-        // We default to an empty bootnodes list if the option is not provided on CLI
-        // because
-        // mainnet bootnodes won't work as the default value for a custom genesis,
-        // so it's better to have an empty list as default value that forces to create a
-        // custom one
-        // than a useless one that may make user think that it can work when it can't.
+      if (p2PDiscoveryOptionGroup.bootNodes == null) {
         builder.setBootNodes(new ArrayList<>());
       }
       builder.setDnsDiscoveryUrl(null);
     }
 
+    if (p2PDiscoveryOptionGroup.discoveryDnsUrl != null) {
+      builder.setDnsDiscoveryUrl(p2PDiscoveryOptionGroup.discoveryDnsUrl);
+    } else if (genesisConfigOptions != null) {
+      final Optional<String> discoveryDnsUrlFromGenesis =
+          genesisConfigOptions.getDiscoveryOptions().getDiscoveryDnsUrl();
+      discoveryDnsUrlFromGenesis.ifPresent(builder::setDnsDiscoveryUrl);
+    }
+
     if (networkId != null) {
       builder.setNetworkId(networkId);
     }
 
-    if (bootNodes != null) {
+    List<EnodeURL> listBootNodes = null;
+    if (p2PDiscoveryOptionGroup.bootNodes != null) {
       try {
-
-        final List<EnodeURL> listBootNodes =
-            bootNodes.stream()
-                .filter(value -> !value.isEmpty())
-                .map(url -> EnodeURL.fromString(url, getEnodeDnsConfiguration()))
-                .collect(Collectors.toList());
-        DiscoveryConfiguration.assertValidBootnodes(listBootNodes);
-        builder.setBootNodes(listBootNodes);
+        listBootNodes = buildEnodes(p2PDiscoveryOptionGroup.bootNodes, getEnodeDnsConfiguration());
       } catch (final IllegalArgumentException e) {
         throw new ParameterException(commandLine, e.getMessage());
       }
+    } else if (genesisConfigOptions != null) {
+      final Optional<List<String>> bootNodesFromGenesis =
+          genesisConfigOptions.getDiscoveryOptions().getBootNodes();
+      if (bootNodesFromGenesis.isPresent()) {
+        listBootNodes = buildEnodes(bootNodesFromGenesis.get(), getEnodeDnsConfiguration());
+      }
+    }
+    if (listBootNodes != null) {
+      if (!p2PDiscoveryOptionGroup.peerDiscoveryEnabled) {
+        logger.warn("Discovery disabled: bootnodes will be ignored.");
+      }
+      DiscoveryConfiguration.assertValidBootnodes(listBootNodes);
+      builder.setBootNodes(listBootNodes);
     }
     return builder.build();
   }
@@ -2285,11 +3231,24 @@ private String genesisConfig() {
       return Resources.toString(genesisFile.toURI().toURL(), UTF_8);
     } catch (final IOException e) {
       throw new ParameterException(
-          this.commandLine, String.format("Unable to load genesis file %s.", genesisFile), e);
+          this.commandLine, String.format("Unable to load genesis URL %s.", genesisFile), e);
+    }
+  }
+
+  private static String genesisConfig(final NetworkName networkName) {
+    try (final InputStream genesisFileInputStream =
+        EthNetworkConfig.class.getResourceAsStream(networkName.getGenesisFile())) {
+      return new String(genesisFileInputStream.readAllBytes(), UTF_8);
+    } catch (final IOException | NullPointerException e) {
+      throw new IllegalStateException(e);
     }
   }
 
-  // dataDir() is public because it is accessed by subcommands
+  /**
+   * Returns data directory used by Besu. Visible as it is accessed by other subcommands.
+   *
+   * @return Path representing data directory.
+   */
   public Path dataDir() {
     return dataPath.toAbsolutePath();
   }
@@ -2303,11 +3262,6 @@ private Path pluginsDir() {
     }
   }
 
-  @VisibleForTesting
-  NodeKey buildNodeKey() {
-    return new NodeKey(securityModule());
-  }
-
   private SecurityModule securityModule() {
     return securityModuleService
         .getByName(securityModuleName)
@@ -2315,13 +3269,13 @@ private SecurityModule securityModule() {
         .get();
   }
 
-  private File nodePrivateKeyFile() {
+  private File resolveNodePrivateKeyFile(final File nodePrivateKeyFile) {
     return Optional.ofNullable(nodePrivateKeyFile)
         .orElseGet(() -> KeyPairUtil.getDefaultKeyFile(dataDir()));
   }
 
   private String rpcHttpAuthenticationCredentialsFile() {
-    final String filename = rpcHttpAuthenticationCredentialsFile;
+    final String filename = jsonRPCHttpOptionGroup.rpcHttpAuthenticationCredentialsFile;
 
     if (filename != null) {
       RpcAuthFileValidator.validate(commandLine, filename, "HTTP");
@@ -2330,7 +3284,7 @@ private String rpcHttpAuthenticationCredentialsFile() {
   }
 
   private String rpcWsAuthenticationCredentialsFile() {
-    final String filename = rpcWsAuthenticationCredentialsFile;
+    final String filename = jsonRPCWebsocketOptionGroup.rpcWsAuthenticationCredentialsFile;
 
     if (filename != null) {
       RpcAuthFileValidator.validate(commandLine, filename, "WS");
@@ -2344,21 +3298,63 @@ private String getDefaultPermissioningFilePath() {
         + DefaultCommandValues.PERMISSIONING_CONFIG_LOCATION;
   }
 
+  /**
+   * Metrics System used by Besu
+   *
+   * @return Instance of MetricsSystem
+   */
   public MetricsSystem getMetricsSystem() {
     return metricsSystem.get();
   }
 
   private Set<EnodeURL> loadStaticNodes() throws IOException {
-    final String staticNodesFilename = "static-nodes.json";
-    final Path staticNodesPath = dataDir().resolve(staticNodesFilename);
-
+    final Path staticNodesPath;
+    if (staticNodesFile != null) {
+      staticNodesPath = staticNodesFile.toAbsolutePath();
+      if (!staticNodesPath.toFile().exists()) {
+        throw new ParameterException(
+            commandLine, String.format("Static nodes file %s does not exist", staticNodesPath));
+      }
+    } else {
+      final String staticNodesFilename = "static-nodes.json";
+      staticNodesPath = dataDir().resolve(staticNodesFilename);
+    }
+    logger.debug("Static Nodes file: {}", staticNodesPath);
     return StaticNodesParser.fromPath(staticNodesPath, getEnodeDnsConfiguration());
   }
 
-  public BesuExceptionHandler exceptionHandler() {
-    return new BesuExceptionHandler(this::getLogLevel);
+  private List<EnodeURL> buildEnodes(
+      final List<String> bootNodes, final EnodeDnsConfiguration enodeDnsConfiguration) {
+    return bootNodes.stream()
+        .filter(bootNode -> !bootNode.isEmpty())
+        .map(bootNode -> EnodeURLImpl.fromString(bootNode, enodeDnsConfiguration))
+        .collect(Collectors.toList());
+  }
+
+  /**
+   * Besu CLI Paramaters exception handler used by VertX. Visible for testing.
+   *
+   * @return instance of BesuParameterExceptionHandler
+   */
+  public BesuParameterExceptionHandler parameterExceptionHandler() {
+    return new BesuParameterExceptionHandler(this::getLogLevel);
+  }
+
+  /**
+   * Returns BesuExecutionExceptionHandler. Visible as it is used in testing.
+   *
+   * @return instance of BesuExecutionExceptionHandler used by Vertx.
+   */
+  public BesuExecutionExceptionHandler executionExceptionHandler() {
+    return new BesuExecutionExceptionHandler();
   }
 
+  /**
+   * Represents Enode DNS Configuration. Visible for testing.
+   *
+   * @return instance of EnodeDnsConfiguration
+   */
+  @VisibleForTesting
   public EnodeDnsConfiguration getEnodeDnsConfiguration() {
     if (enodeDnsConfiguration == null) {
       enodeDnsConfiguration = unstableDnsOptions.toDomainObject();
@@ -2382,6 +3378,35 @@ private void checkPortClash() {
             });
   }
 
+  /**
+   * Check if required ports are available
+   *
+   * @throws InvalidConfigurationException if ports are not available.
+   */
+  protected void checkIfRequiredPortsAreAvailable() {
+    final List<Integer> unavailablePorts = new ArrayList<>();
+    getEffectivePorts().stream()
+        .filter(Objects::nonNull)
+        .filter(port -> port > 0)
+        .forEach(
+            port -> {
+              if (port.equals(p2PDiscoveryOptionGroup.p2pPort)
+                  && !NetworkUtility.isPortAvailable(port)) {
+                unavailablePorts.add(port);
+              }
+              if (!port.equals(p2PDiscoveryOptionGroup.p2pPort)
+                  && !NetworkUtility.isPortAvailableForTcp(port)) {
+                unavailablePorts.add(port);
+              }
+            });
+    if (!unavailablePorts.isEmpty()) {
+      throw new InvalidConfigurationException(
+          "Port(s) '"
+              + unavailablePorts
+              + "' already in use. Check for other processes using the port(s).");
+    }
+  }
+
   /**
    * * Gets the list of effective ports (ports that are enabled).
    *
@@ -2389,18 +3414,30 @@ private void checkPortClash() {
    */
   private List<Integer> getEffectivePorts() {
     final List<Integer> effectivePorts = new ArrayList<>();
-    addPortIfEnabled(effectivePorts, p2pPort, p2pEnabled);
-    addPortIfEnabled(effectivePorts, graphQLHttpPort, isGraphQLHttpEnabled);
-    addPortIfEnabled(effectivePorts, rpcHttpPort, isRpcHttpEnabled);
-    addPortIfEnabled(effectivePorts, rpcWsPort, isRpcWsEnabled);
-    addPortIfEnabled(effectivePorts, metricsPort, isMetricsEnabled);
-    addPortIfEnabled(effectivePorts, metricsPushPort, isMetricsPushEnabled);
-    addPortIfEnabled(effectivePorts, stratumPort, iStratumMiningEnabled);
+    addPortIfEnabled(
+        effectivePorts, p2PDiscoveryOptionGroup.p2pPort, p2PDiscoveryOptionGroup.p2pEnabled);
+    addPortIfEnabled(
+        effectivePorts,
+        graphQlOptionGroup.graphQLHttpPort,
+        graphQlOptionGroup.isGraphQLHttpEnabled);
+    addPortIfEnabled(
+        effectivePorts,
+        jsonRPCHttpOptionGroup.rpcHttpPort,
+        jsonRPCHttpOptionGroup.isRpcHttpEnabled);
+    addPortIfEnabled(
+        effectivePorts,
+        jsonRPCWebsocketOptionGroup.rpcWsPort,
+        jsonRPCWebsocketOptionGroup.isRpcWsEnabled);
+    addPortIfEnabled(effectivePorts, engineRPCOptionGroup.engineRpcPort, isEngineApiEnabled());
+    addPortIfEnabled(
+        effectivePorts, metricsOptionGroup.metricsPort, metricsOptionGroup.isMetricsEnabled);
+    addPortIfEnabled(
+        effectivePorts, minerOptionGroup.stratumPort, minerOptionGroup.iStratumMiningEnabled);
     return effectivePorts;
   }
 
   /**
-   * Adds port in the passed list only if enabled.
+   * Adds port to the specified list only if enabled.
    *
    * @param ports The list of ports
    * @param port The port value
@@ -2415,46 +3452,35 @@ private void addPortIfEnabled(
 
   private void checkGoQuorumCompatibilityConfig(final EthNetworkConfig ethNetworkConfig) {
     if (isGoQuorumCompatibilityMode) {
-      final GenesisConfigOptions genesisConfigOptions = readGenesisConfigOptions();
-      // this static flag is read by the RLP decoder
-      GoQuorumOptions.goquorumCompatibilityMode = true;
 
-      if (!genesisConfigOptions.isQuorum()) {
-        throw new IllegalStateException(
-            "GoQuorum compatibility mode (enabled) can only be used if genesis file has 'isQuorum' flag set to true.");
-      }
-      genesisConfigOptions
-          .getChainId()
-          .ifPresent(
-              chainId ->
-                  ensureGoQuorumCompatibilityModeNotUsedOnMainnet(
-                      chainId, isGoQuorumCompatibilityMode));
-
-      if (genesisFile != null
-          && getGenesisConfigFile().getConfigOptions().isQuorum()
-          && !minTransactionGasPrice.isZero()) {
+      logger.warn(
+          DEPRECATION_WARNING_MSG,
+          "isQuorum mode in genesis file (GoQuorum-compatible privacy mode)",
+          "--privacy-enabled");
+      if (!minTransactionGasPrice.isZero()) {
         throw new ParameterException(
             this.commandLine,
-            "--min-gas-price must be set to zero if GoQuorum compatibility is enabled in the genesis config.");
+            "--min-gas-price must be set to zero if isQuorum mode is enabled in the genesis file.");
       }
-      if (ethNetworkConfig.getNetworkId().equals(EthNetworkConfig.MAINNET_NETWORK_ID)) {
-        throw new ParameterException(
-            this.commandLine, "GoQuorum compatibility mode (enabled) cannot be used on Mainnet.");
+
+      if (ensureGoQuorumCompatibilityModeNotUsedOnMainnet(genesisConfigOptions, ethNetworkConfig)) {
+        throw new ParameterException(this.commandLine, "isQuorum mode cannot be used on Mainnet.");
       }
     }
   }
 
-  private void ensureGoQuorumCompatibilityModeNotUsedOnMainnet(
-      final BigInteger chainId, final boolean isGoQuorumCompatibilityMode) {
-    if (isGoQuorumCompatibilityMode && chainId.equals(EthNetworkConfig.MAINNET_NETWORK_ID)) {
-      throw new IllegalStateException(
-          "GoQuorum compatibility mode (enabled) cannot be used on Mainnet.");
-    }
+  private static boolean ensureGoQuorumCompatibilityModeNotUsedOnMainnet(
+      final GenesisConfigOptions genesisConfigOptions, final EthNetworkConfig ethNetworkConfig) {
+    return ethNetworkConfig.getNetworkId().equals(MAINNET.getNetworkId())
+        || genesisConfigOptions
+            .getChainId()
+            .map(chainId -> chainId.equals(MAINNET.getNetworkId()))
+            .orElse(false);
   }
 
   @VisibleForTesting
-  Level getLogLevel() {
-    return logLevel;
+  String getLogLevel() {
+    return loggingLevelOption.getLogLevel();
   }
 
   private class BesuCommandConfigurationService implements BesuConfiguration {
@@ -2471,10 +3497,184 @@ public Path getDataPath() {
 
     @Override
     public int getDatabaseVersion() {
-      return unstableDataStorageOptions
-          .toDomainObject()
-          .getDataStorageFormat()
-          .getDatabaseVersion();
+      return dataStorageOptions.toDomainObject().getDataStorageFormat().getDatabaseVersion();
+    }
+  }
+
+  private void instantiateSignatureAlgorithmFactory() {
+    if (SignatureAlgorithmFactory.isInstanceSet()) {
+      return;
+    }
+
+    final Optional<String> ecCurve = getEcCurveFromGenesisFile();
+
+    if (ecCurve.isEmpty()) {
+      SignatureAlgorithmFactory.setDefaultInstance();
+      return;
+    }
+
+    try {
+      SignatureAlgorithmFactory.setInstance(SignatureAlgorithmType.create(ecCurve.get()));
+    } catch (final IllegalArgumentException e) {
+      throw new CommandLine.InitializationException(
+          new StringBuilder()
+              .append("Invalid genesis file configuration for ecCurve. ")
+              .append(e.getMessage())
+              .toString());
+    }
+  }
+
+  private Optional<String> getEcCurveFromGenesisFile() {
+    if (genesisFile == null) {
+      return Optional.empty();
+    }
+    return genesisConfigOptions.getEcCurve();
+  }
+
+  /** Enables Go Quorum Compatibility mode. Visible for testing. */
+  @VisibleForTesting
+  protected void enableGoQuorumCompatibilityMode() {
+    // this static flag is still used for GoQuorum permissioning compatibility
+    isGoQuorumCompatibilityMode = true;
+  }
+
+  private GenesisConfigOptions getActualGenesisConfigOptions() {
+    return Optional.ofNullable(genesisConfigOptions)
+        .orElseGet(
+            () ->
+                GenesisConfigFile.fromConfig(
+                        genesisConfig(Optional.ofNullable(network).orElse(MAINNET)))
+                    .getConfigOptions(genesisConfigOverrides));
+  }
+
+  private void setMergeConfigOptions() {
+    MergeConfigOptions.setMergeEnabled(
+        getActualGenesisConfigOptions().getTerminalTotalDifficulty().isPresent());
+  }
+
+  private void setIgnorableStorageSegments() {
+    if (!unstableChainPruningOptions.getChainDataPruningEnabled()) {
+      rocksDBPlugin.addIgnorableSegmentIdentifier(KeyValueSegmentIdentifier.CHAIN_PRUNER_STATE);
+    }
+  }
+
+  private void validatePostMergeCheckpointBlockRequirements() {
+    final GenesisConfigOptions genesisOptions = getActualGenesisConfigOptions();
+    final SynchronizerConfiguration synchronizerConfiguration =
+        unstableSynchronizerOptions.toDomainObject().build();
+    final Optional<UInt256> terminalTotalDifficulty = genesisOptions.getTerminalTotalDifficulty();
+    final CheckpointConfigOptions checkpointConfigOptions = genesisOptions.getCheckpointOptions();
+    if (synchronizerConfiguration.isCheckpointPostMergeEnabled()) {
+      if (!checkpointConfigOptions.isValid()) {
+        throw new InvalidConfigurationException(
+            "PoS checkpoint sync requires a checkpoint block configured in the genesis file");
+      }
+      terminalTotalDifficulty.ifPresentOrElse(
+          ttd -> {
+            if (UInt256.fromHexString(
+                        genesisOptions.getCheckpointOptions().getTotalDifficulty().get())
+                    .equals(UInt256.ZERO)
+                && ttd.equals(UInt256.ZERO)) {
+              throw new InvalidConfigurationException(
+                  "PoS checkpoint sync can't be used with TTD = 0 and checkpoint totalDifficulty = 0");
+            }
+            if (UInt256.fromHexString(
+                    genesisOptions.getCheckpointOptions().getTotalDifficulty().get())
+                .lessThan(ttd)) {
+              throw new InvalidConfigurationException(
+                  "PoS checkpoint sync requires a block with total difficulty greater or equal than the TTD");
+            }
+          },
+          () -> {
+            throw new InvalidConfigurationException(
+                "PoS checkpoint sync requires TTD in the genesis file");
+          });
     }
   }
+
+  private boolean isMergeEnabled() {
+    return MergeConfigOptions.isMergeEnabled();
+  }
+
+  private boolean isEngineApiEnabled() {
+    return engineRPCOptionGroup.overrideEngineRpcEnabled || isMergeEnabled();
+  }
+
+  private static List<String> getJDKEnabledCipherSuites() {
+    try {
+      final SSLContext context = SSLContext.getInstance("TLS");
+      context.init(null, null, null);
+      final SSLEngine engine = context.createSSLEngine();
+      return Arrays.asList(engine.getEnabledCipherSuites());
+    } catch (final KeyManagementException | NoSuchAlgorithmException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private static List<String> getJDKEnabledProtocols() {
+    try {
+      final SSLContext context = SSLContext.getInstance("TLS");
+      context.init(null, null, null);
+      final SSLEngine engine = context.createSSLEngine();
+      return Arrays.asList(engine.getEnabledProtocols());
+    } catch (final KeyManagementException | NoSuchAlgorithmException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private SyncMode getDefaultSyncModeIfNotSet() {
+    return Optional.ofNullable(syncMode)
+        .orElse(
+            genesisFile == null
+                    && !privacyOptionGroup.isPrivacyEnabled
+                    && Optional.ofNullable(network).map(NetworkName::canFastSync).orElse(false)
+                ? SyncMode.FAST
+                : SyncMode.FULL);
+  }
+
+  private String generateConfigurationOverview() {
+    final ConfigurationOverviewBuilder builder = new ConfigurationOverviewBuilder(logger);
+
+    if (environment != null) {
+      builder.setEnvironment(environment);
+    }
+
+    if (network != null) {
+      builder.setNetwork(network.normalize());
+    }
+
+    builder.setHasCustomGenesis(genesisFile != null);
+    builder.setNetworkId(ethNetworkConfig.getNetworkId());
+
+    builder
+        .setDataStorage(dataStorageOptions.normalizeDataStorageFormat())
+        .setSyncMode(syncMode.normalize());
+
+    if (jsonRpcConfiguration != null && jsonRpcConfiguration.isEnabled()) {
+      builder
+          .setRpcPort(jsonRpcConfiguration.getPort())
+          .setRpcHttpApis(jsonRpcConfiguration.getRpcApis());
+    }
+
+    if (engineJsonRpcConfiguration != null && engineJsonRpcConfiguration.isEnabled()) {
+      builder
+          .setEnginePort(engineJsonRpcConfiguration.getPort())
+          .setEngineApis(engineJsonRpcConfiguration.getRpcApis());
+      if (engineJsonRpcConfiguration.isAuthenticationEnabled()) {
+        if (engineJsonRpcConfiguration.getAuthenticationPublicKeyFile() != null) {
+          builder.setEngineJwtFile(
+              engineJsonRpcConfiguration.getAuthenticationPublicKeyFile().getAbsolutePath());
+        } else {
+          // default ephemeral jwt created later
+          builder.setEngineJwtFile(dataDir().toAbsolutePath() + "/" + EPHEMERAL_JWT_FILE);
+        }
+      }
+    }
+
+    if (rocksDBPlugin.isHighSpecEnabled()) {
+      builder.setHighSpecEnabled();
+    }
+
+    return builder.build();
+  }
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/ConfigurationOverviewBuilder.java b/besu/src/main/java/org/hyperledger/besu/cli/ConfigurationOverviewBuilder.java
new file mode 100644
index 00000000000..1682aa14ba9
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/cli/ConfigurationOverviewBuilder.java
@@ -0,0 +1,295 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cli;
+
+import org.hyperledger.besu.BesuInfo;
+import org.hyperledger.besu.util.log.FramedLogMessage;
+import org.hyperledger.besu.util.platform.PlatformDetector;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import oshi.PlatformEnum;
+import oshi.SystemInfo;
+import oshi.hardware.HardwareAbstractionLayer;
+
+/** The Configuration overview builder. */
+public class ConfigurationOverviewBuilder {
+  @SuppressWarnings("PrivateStaticFinalLoggers")
+  private final Logger logger;
+
+  private String network;
+  private BigInteger networkId;
+  private boolean hasCustomGenesis;
+  private String dataStorage;
+  private String syncMode;
+  private Integer rpcPort;
+  private Collection<String> rpcHttpApis;
+  private Integer enginePort;
+  private Collection<String> engineApis;
+  private String engineJwtFilePath;
+  private boolean isHighSpec = false;
+  private Map<String, String> environment;
+
+  /**
+   * @param logger the logger
+   */
+  public ConfigurationOverviewBuilder(final Logger logger) {
+    this.logger = logger;
+  }
+
+  /**
+   * Sets network.
+   *
+   * @param network the network
+   * @return the network
+   */
+  public ConfigurationOverviewBuilder setNetwork(final String network) {
+    this.network = network;
+    return this;
+  }
+
+  /**
+   * Sets whether a networkId has been specified
+   *
+   * @param networkId the specified networkId
+   * @return the builder
+   */
+  public ConfigurationOverviewBuilder setNetworkId(final BigInteger networkId) {
+    this.networkId = networkId;
+    return this;
+  }
+
+  /**
+   * Sets whether a custom genesis has been specified.
+   *
+   * @param hasCustomGenesis a boolean representing whether a custom genesis file was specified
+   * @return the builder
+   */
+  public ConfigurationOverviewBuilder setHasCustomGenesis(final boolean hasCustomGenesis) {
+    this.hasCustomGenesis = hasCustomGenesis;
+    return this;
+  }
+
+  /**
+   * Sets data storage.
+   *
+   * @param dataStorage the data storage
+   * @return the builder
+   */
+  public ConfigurationOverviewBuilder setDataStorage(final String dataStorage) {
+    this.dataStorage = dataStorage;
+    return this;
+  }
+
+  /**
+   * Sets sync mode.
+   *
+   * @param syncMode the sync mode
+   * @return the builder
+   */
+  public ConfigurationOverviewBuilder setSyncMode(final String syncMode) {
+    this.syncMode = syncMode;
+    return this;
+  }
+
+  /**
+   * Sets rpc port.
+   *
+   * @param rpcPort the rpc port
+   * @return the builder
+   */
+  public ConfigurationOverviewBuilder setRpcPort(final Integer rpcPort) {
+    this.rpcPort = rpcPort;
+    return this;
+  }
+
+  /**
+   * Sets rpc http apis.
+   *
+   * @param rpcHttpApis the rpc http apis
+   * @return the builder
+   */
+  public ConfigurationOverviewBuilder setRpcHttpApis(final Collection<String> rpcHttpApis) {
+    this.rpcHttpApis = rpcHttpApis;
+    return this;
+  }
+
+  /**
+   * Sets engine port.
+   *
+   * @param enginePort the engine port
+   * @return the builder
+   */
+  public ConfigurationOverviewBuilder setEnginePort(final Integer enginePort) {
+    this.enginePort = enginePort;
+    return this;
+  }
+
+  /**
+   * Sets engine apis.
+   *
+   * @param engineApis the engine apis
+   * @return the builder
+   */
+  public ConfigurationOverviewBuilder setEngineApis(final Collection<String> engineApis) {
+    this.engineApis = engineApis;
+    return this;
+  }
+
+  /**
+   * Sets high spec enabled.
+   *
+   * @return the builder
+   */
+  public ConfigurationOverviewBuilder setHighSpecEnabled() {
+    isHighSpec = true;
+    return this;
+  }
+
+  /**
+   * Sets the engine jwt file path.
+   *
+   * @param engineJwtFilePath the engine apis
+   * @return the builder
+   */
+  public ConfigurationOverviewBuilder setEngineJwtFile(final String engineJwtFilePath) {
+    this.engineJwtFilePath = engineJwtFilePath;
+    return this;
+  }
+
+  /**
+   * Sets the environment variables.
+   *
+   * @param environment the enveironment variables
+   * @return the builder
+   */
+  public ConfigurationOverviewBuilder setEnvironment(final Map<String, String> environment) {
+    this.environment = environment;
+    return this;
+  }
+
+  /**
+   * Build configuration overview.
+   *
+   * @return the string representing configuration overview
+   */
+  public String build() {
+    final List<String> lines = new ArrayList<>();
+    lines.add("Besu version " + BesuInfo.class.getPackage().getImplementationVersion());
+    lines.add("");
+    lines.add("Configuration:");
+
+    // Don't include the default network if a genesis file has been supplied
+    if (network != null && !hasCustomGenesis) {
+      lines.add("Network: " + network);
+    }
+
+    if (hasCustomGenesis) {
+      lines.add("Network: Custom genesis file specified");
+    }
+
+    if (networkId != null) {
+      lines.add("Network Id: " + networkId);
+    }
+
+    if (dataStorage != null) {
+      lines.add("Data storage: " + dataStorage);
+    }
+
+    if (syncMode != null) {
+      lines.add("Sync mode: " + syncMode);
+    }
+
+    if (rpcHttpApis != null) {
+      lines.add("RPC HTTP APIs: " + String.join(",", rpcHttpApis));
+    }
+    if (rpcPort != null) {
+      lines.add("RPC HTTP port: " + rpcPort);
+    }
+
+    if (engineApis != null) {
+      lines.add("Engine APIs: " + String.join(",", engineApis));
+    }
+    if (enginePort != null) {
+      lines.add("Engine port: " + enginePort);
+    }
+    if (engineJwtFilePath != null) {
+      lines.add("Engine JWT: " + engineJwtFilePath);
+    }
+
+    if (isHighSpec) {
+      lines.add("High spec configuration enabled");
+    }
+
+    lines.add("");
+    lines.add("Host:");
+
+    lines.add("Java: " + PlatformDetector.getVM());
+    lines.add("Maximum heap size: " + normalizeSize(Runtime.getRuntime().maxMemory()));
+    lines.add("OS: " + PlatformDetector.getOS());
+
+    if (SystemInfo.getCurrentPlatform() == PlatformEnum.LINUX) {
+      final String glibcVersion = PlatformDetector.getGlibc();
+      if (glibcVersion != null) {
+        lines.add("glibc: " + glibcVersion);
+      }
+
+      detectJemalloc(lines);
+    }
+
+    final HardwareAbstractionLayer hardwareInfo = new SystemInfo().getHardware();
+
+    lines.add("Total memory: " + normalizeSize(hardwareInfo.getMemory().getTotal()));
+    lines.add("CPU cores: " + hardwareInfo.getProcessor().getLogicalProcessorCount());
+
+    return FramedLogMessage.generate(lines);
+  }
+
+  private void detectJemalloc(final List<String> lines) {
+    Optional.ofNullable(Objects.isNull(environment) ? null : environment.get("BESU_USING_JEMALLOC"))
+        .ifPresentOrElse(
+            t -> {
+              try {
+                final String version = PlatformDetector.getJemalloc();
+                lines.add("jemalloc: " + version);
+              } catch (final Throwable throwable) {
+                logger.warn(
+                    "BESU_USING_JEMALLOC is present but we failed to load jemalloc library to get the version",
+                    throwable);
+              }
+            },
+            () -> {
+              // in case the user is using jemalloc without BESU_USING_JEMALLOC env var
+              try {
+                final String version = PlatformDetector.getJemalloc();
+                lines.add("jemalloc: " + version);
+              } catch (final Throwable throwable) {
+                logger.info(
+                    "jemalloc library not found, memory usage may be reduced by installing it");
+              }
+            });
+  }
+
+  private String normalizeSize(final long size) {
+    return String.format("%.02f", (double) (size) / 1024 / 1024 / 1024) + " GB";
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/DefaultCommandValues.java b/besu/src/main/java/org/hyperledger/besu/cli/DefaultCommandValues.java
index 1e34c764141..887e6120419 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/DefaultCommandValues.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/DefaultCommandValues.java
@@ -14,7 +14,8 @@
  */
 package org.hyperledger.besu.cli;
 
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.JwtAlgorithm;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
 import org.hyperledger.besu.ethereum.p2p.config.RlpxConfiguration;
 import org.hyperledger.besu.nat.NatMethod;
@@ -26,42 +27,91 @@
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.List;
 
 import org.apache.tuweni.bytes.Bytes;
 import picocli.CommandLine;
 
+/** The interface Default command values. */
 public interface DefaultCommandValues {
+  /** The constant CONFIG_FILE_OPTION_NAME. */
   String CONFIG_FILE_OPTION_NAME = "--config-file";
 
+  /** The constant MANDATORY_PATH_FORMAT_HELP. */
   String MANDATORY_PATH_FORMAT_HELP = "<PATH>";
+  /** The constant MANDATORY_FILE_FORMAT_HELP. */
   String MANDATORY_FILE_FORMAT_HELP = "<FILE>";
+  /** The constant MANDATORY_DIRECTORY_FORMAT_HELP. */
   String MANDATORY_DIRECTORY_FORMAT_HELP = "<DIRECTORY>";
+  /** The constant BESU_HOME_PROPERTY_NAME. */
   String BESU_HOME_PROPERTY_NAME = "besu.home";
+  /** The constant DEFAULT_DATA_DIR_PATH. */
   String DEFAULT_DATA_DIR_PATH = "./build/data";
+  /** The constant MANDATORY_INTEGER_FORMAT_HELP. */
   String MANDATORY_INTEGER_FORMAT_HELP = "<INTEGER>";
+  /** The constant MANDATORY_DOUBLE_FORMAT_HELP. */
   String MANDATORY_DOUBLE_FORMAT_HELP = "<DOUBLE>";
+  /** The constant MANDATORY_LONG_FORMAT_HELP. */
   String MANDATORY_LONG_FORMAT_HELP = "<LONG>";
+  /** The constant MANDATORY_MODE_FORMAT_HELP. */
   String MANDATORY_MODE_FORMAT_HELP = "<MODE>";
+  /** The constant MANDATORY_NETWORK_FORMAT_HELP. */
   String MANDATORY_NETWORK_FORMAT_HELP = "<NETWORK>";
+  /** The constant MANDATORY_NODE_ID_FORMAT_HELP. */
   String MANDATORY_NODE_ID_FORMAT_HELP = "<NODEID>";
+  /** The constant DEFAULT_MIN_TRANSACTION_GAS_PRICE. */
   Wei DEFAULT_MIN_TRANSACTION_GAS_PRICE = Wei.of(1000);
+  /** The constant DEFAULT_RPC_TX_FEE_CAP. */
   Wei DEFAULT_RPC_TX_FEE_CAP = TransactionPoolConfiguration.DEFAULT_RPC_TX_FEE_CAP;
 
+  /** The constant DEFAULT_MIN_BLOCK_OCCUPANCY_RATIO. */
   Double DEFAULT_MIN_BLOCK_OCCUPANCY_RATIO = 0.8;
+  /** The constant DEFAULT_EXTRA_DATA. */
   Bytes DEFAULT_EXTRA_DATA = Bytes.EMPTY;
-  long DEFAULT_MAX_REFRESH_DELAY = 3600000;
-  long DEFAULT_MIN_REFRESH_DELAY = 1;
+  /** The constant PERMISSIONING_CONFIG_LOCATION. */
   String PERMISSIONING_CONFIG_LOCATION = "permissions_config.toml";
+  /** The constant MANDATORY_HOST_FORMAT_HELP. */
   String MANDATORY_HOST_FORMAT_HELP = "<HOST>";
+  /** The constant MANDATORY_PORT_FORMAT_HELP. */
   String MANDATORY_PORT_FORMAT_HELP = "<PORT>";
+  /** The constant DEFAULT_NAT_METHOD. */
   NatMethod DEFAULT_NAT_METHOD = NatMethod.AUTO;
+  /** The constant DEFAULT_JWT_ALGORITHM. */
+  JwtAlgorithm DEFAULT_JWT_ALGORITHM = JwtAlgorithm.RS256;
+  /** The constant FAST_SYNC_MIN_PEER_COUNT. */
   int FAST_SYNC_MIN_PEER_COUNT = 5;
+  /** The constant DEFAULT_MAX_PEERS. */
   int DEFAULT_MAX_PEERS = 25;
+  /** The constant DEFAULT_P2P_PEER_LOWER_BOUND. */
+  int DEFAULT_P2P_PEER_LOWER_BOUND = 25;
+  /** The constant DEFAULT_HTTP_MAX_CONNECTIONS. */
+  int DEFAULT_HTTP_MAX_CONNECTIONS = 80;
+  /** The constant DEFAULT_HTTP_MAX_BATCH_SIZE. */
+  int DEFAULT_HTTP_MAX_BATCH_SIZE = 1024;
+  /** The constant DEFAULT_MAX_REQUEST_CONTENT_LENGTH. */
+  long DEFAULT_MAX_REQUEST_CONTENT_LENGTH = 5 * 1024 * 1024; // 5MB
+  /** The constant DEFAULT_WS_MAX_CONNECTIONS. */
+  int DEFAULT_WS_MAX_CONNECTIONS = 80;
+  /** The constant DEFAULT_WS_MAX_FRAME_SIZE. */
+  int DEFAULT_WS_MAX_FRAME_SIZE = 1024 * 1024;
+  /** The constant DEFAULT_FRACTION_REMOTE_WIRE_CONNECTIONS_ALLOWED. */
   float DEFAULT_FRACTION_REMOTE_WIRE_CONNECTIONS_ALLOWED =
       RlpxConfiguration.DEFAULT_FRACTION_REMOTE_CONNECTIONS_ALLOWED;
+  /** The constant DEFAULT_KEY_VALUE_STORAGE_NAME. */
   String DEFAULT_KEY_VALUE_STORAGE_NAME = "rocksdb";
+  /** The constant DEFAULT_SECURITY_MODULE. */
   String DEFAULT_SECURITY_MODULE = "localfile";
+  /** The constant DEFAULT_KEYSTORE_TYPE. */
+  String DEFAULT_KEYSTORE_TYPE = "JKS";
+  /** The Default tls protocols. */
+  List<String> DEFAULT_TLS_PROTOCOLS = List.of("TLSv1.3", "TLSv1.2");
 
+  /**
+   * Gets default besu data path.
+   *
+   * @param command the command
+   * @return the default besu data path
+   */
   static Path getDefaultBesuDataPath(final Object command) {
     // this property is retrieved from Gradle tasks or Besu running shell script.
     final String besuHomeProperty = System.getProperty(BESU_HOME_PROPERTY_NAME);
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/NetworkDeprecationMessage.java b/besu/src/main/java/org/hyperledger/besu/cli/NetworkDeprecationMessage.java
new file mode 100644
index 00000000000..10c97d6a5ad
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/cli/NetworkDeprecationMessage.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cli;
+
+import org.hyperledger.besu.cli.config.NetworkName;
+import org.hyperledger.besu.util.log.FramedLogMessage;
+
+import java.util.List;
+
+/** The Network deprecation message. */
+public class NetworkDeprecationMessage {
+
+  /**
+   * Generate deprecation message for specified testnet network.
+   *
+   * @param network the network
+   * @return the deprecation message for specified network
+   */
+  public static String generate(final NetworkName network) {
+    if (network.getDeprecationDate().isEmpty()) {
+      throw new AssertionError("Deprecation date is not set. Cannot print a deprecation message");
+    }
+
+    return FramedLogMessage.generateCentered(
+        List.of(
+            network.normalize()
+                + " is deprecated and will be shutdown "
+                + network.getDeprecationDate().get(),
+            "",
+            "For more details please go to",
+            "https://blog.ethereum.org/2022/06/21/testnet-deprecation/"));
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/config/EthNetworkConfig.java b/besu/src/main/java/org/hyperledger/besu/cli/config/EthNetworkConfig.java
index d59db1ff232..3af85016c8c 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/config/EthNetworkConfig.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/config/EthNetworkConfig.java
@@ -15,81 +15,82 @@
 package org.hyperledger.besu.cli.config;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.CLASSIC_BOOTSTRAP_NODES;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.GOERLI_BOOTSTRAP_NODES;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.GOERLI_DISCOVERY_URL;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.KOTTI_BOOTSTRAP_NODES;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.MAINNET_BOOTSTRAP_NODES;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.MAINNET_DISCOVERY_URL;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.MORDOR_BOOTSTRAP_NODES;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.RINKEBY_BOOTSTRAP_NODES;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.RINKEBY_DISCOVERY_URL;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.ROPSTEN_BOOTSTRAP_NODES;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.ROPSTEN_DISCOVERY_URL;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.YOLO_V2_BOOTSTRAP_NODES;
-
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+
+import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.math.BigInteger;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
-import com.google.common.base.Preconditions;
-import com.google.common.io.Resources;
-
+/** The Eth network config. */
 public class EthNetworkConfig {
-  public static final BigInteger MAINNET_NETWORK_ID = BigInteger.valueOf(1);
-  public static final BigInteger ROPSTEN_NETWORK_ID = BigInteger.valueOf(3);
-  public static final BigInteger RINKEBY_NETWORK_ID = BigInteger.valueOf(4);
-  public static final BigInteger GOERLI_NETWORK_ID = BigInteger.valueOf(5);
-  public static final BigInteger DEV_NETWORK_ID = BigInteger.valueOf(2018);
-  public static final BigInteger CLASSIC_NETWORK_ID = BigInteger.valueOf(1);
-  public static final BigInteger KOTTI_NETWORK_ID = BigInteger.valueOf(6);
-  public static final BigInteger MORDOR_NETWORK_ID = BigInteger.valueOf(7);
-  private static final BigInteger YOLO_V2_NETWORK_ID = BigInteger.valueOf(133519467574834L);
-  private static final String MAINNET_GENESIS = "/mainnet.json";
-  private static final String ROPSTEN_GENESIS = "/ropsten.json";
-  private static final String RINKEBY_GENESIS = "/rinkeby.json";
-  private static final String GOERLI_GENESIS = "/goerli.json";
-  private static final String DEV_GENESIS = "/dev.json";
-  private static final String CLASSIC_GENESIS = "/classic.json";
-  private static final String KOTTI_GENESIS = "/kotti.json";
-  private static final String MORDOR_GENESIS = "/mordor.json";
-  private static final String YOLO_GENESIS = "/yolo.json";
+
   private final String genesisConfig;
   private final BigInteger networkId;
   private final List<EnodeURL> bootNodes;
   private final String dnsDiscoveryUrl;
 
+  /**
+   * Instantiates a new Eth network config.
+   *
+   * @param genesisConfig the genesis config
+   * @param networkId the network id
+   * @param bootNodes the boot nodes
+   * @param dnsDiscoveryUrl the dns discovery url
+   */
   public EthNetworkConfig(
       final String genesisConfig,
       final BigInteger networkId,
       final List<EnodeURL> bootNodes,
       final String dnsDiscoveryUrl) {
-    Preconditions.checkNotNull(genesisConfig);
-    Preconditions.checkNotNull(bootNodes);
+    Objects.requireNonNull(genesisConfig);
+    Objects.requireNonNull(bootNodes);
     this.genesisConfig = genesisConfig;
     this.networkId = networkId;
     this.bootNodes = bootNodes;
     this.dnsDiscoveryUrl = dnsDiscoveryUrl;
   }
 
+  /**
+   * Gets genesis config.
+   *
+   * @return the genesis config
+   */
   public String getGenesisConfig() {
     return genesisConfig;
   }
 
+  /**
+   * Gets network id.
+   *
+   * @return the network id
+   */
   public BigInteger getNetworkId() {
     return networkId;
   }
 
+  /**
+   * Gets boot nodes.
+   *
+   * @return the boot nodes
+   */
   public List<EnodeURL> getBootNodes() {
     return bootNodes;
   }
 
+  /**
+   * Gets dns discovery url.
+   *
+   * @return the dns discovery url
+   */
   public String getDnsDiscoveryUrl() {
     return dnsDiscoveryUrl;
   }
@@ -128,85 +129,51 @@ public String toString() {
         + '}';
   }
 
+  /**
+   * Gets network config.
+   *
+   * @param networkName the network name
+   * @return the network config
+   */
   public static EthNetworkConfig getNetworkConfig(final NetworkName networkName) {
-    switch (networkName) {
-      case ROPSTEN:
-        return new EthNetworkConfig(
-            jsonConfig(ROPSTEN_GENESIS),
-            ROPSTEN_NETWORK_ID,
-            ROPSTEN_BOOTSTRAP_NODES,
-            ROPSTEN_DISCOVERY_URL);
-      case RINKEBY:
-        return new EthNetworkConfig(
-            jsonConfig(RINKEBY_GENESIS),
-            RINKEBY_NETWORK_ID,
-            RINKEBY_BOOTSTRAP_NODES,
-            RINKEBY_DISCOVERY_URL);
-      case GOERLI:
-        return new EthNetworkConfig(
-            jsonConfig(GOERLI_GENESIS),
-            GOERLI_NETWORK_ID,
-            GOERLI_BOOTSTRAP_NODES,
-            GOERLI_DISCOVERY_URL);
-      case DEV:
-        return new EthNetworkConfig(
-            jsonConfig(DEV_GENESIS), DEV_NETWORK_ID, new ArrayList<>(), null);
-      case CLASSIC:
-        return new EthNetworkConfig(
-            jsonConfig(CLASSIC_GENESIS), CLASSIC_NETWORK_ID, CLASSIC_BOOTSTRAP_NODES, null);
-      case KOTTI:
-        return new EthNetworkConfig(
-            jsonConfig(KOTTI_GENESIS), KOTTI_NETWORK_ID, KOTTI_BOOTSTRAP_NODES, null);
-      case MORDOR:
-        return new EthNetworkConfig(
-            jsonConfig(MORDOR_GENESIS), MORDOR_NETWORK_ID, MORDOR_BOOTSTRAP_NODES, null);
-      case YOLO_V2:
-        return new EthNetworkConfig(
-            jsonConfig(YOLO_GENESIS), YOLO_V2_NETWORK_ID, YOLO_V2_BOOTSTRAP_NODES, null);
-      case MAINNET:
-      default:
-        return new EthNetworkConfig(
-            jsonConfig(MAINNET_GENESIS),
-            MAINNET_NETWORK_ID,
-            MAINNET_BOOTSTRAP_NODES,
-            MAINNET_DISCOVERY_URL);
-    }
+    final String genesisContent = jsonConfig(networkName.getGenesisFile());
+    final GenesisConfigOptions genesisConfigOptions =
+        GenesisConfigFile.fromConfig(genesisContent).getConfigOptions();
+    final Optional<List<String>> rawBootNodes =
+        genesisConfigOptions.getDiscoveryOptions().getBootNodes();
+    final List<EnodeURL> bootNodes =
+        rawBootNodes
+            .map(
+                strings ->
+                    strings.stream().map(EnodeURLImpl::fromString).collect(Collectors.toList()))
+            .orElse(Collections.emptyList());
+    return new EthNetworkConfig(
+        genesisContent,
+        networkName.getNetworkId(),
+        bootNodes,
+        genesisConfigOptions.getDiscoveryOptions().getDiscoveryDnsUrl().orElse(null));
   }
 
   private static String jsonConfig(final String resourceName) {
-    try {
-      final URI uri = EthNetworkConfig.class.getResource(resourceName).toURI();
-      return Resources.toString(uri.toURL(), UTF_8);
-    } catch (final URISyntaxException | IOException e) {
+    try (final InputStream genesisFileInputStream =
+        EthNetworkConfig.class.getResourceAsStream(resourceName)) {
+      return new String(genesisFileInputStream.readAllBytes(), UTF_8);
+    } catch (IOException | NullPointerException e) {
       throw new IllegalStateException(e);
     }
   }
 
+  /**
+   * Json config string.
+   *
+   * @param network the network
+   * @return the string
+   */
   public static String jsonConfig(final NetworkName network) {
-    switch (network) {
-      case MAINNET:
-        return jsonConfig(MAINNET_GENESIS);
-      case ROPSTEN:
-        return jsonConfig(ROPSTEN_GENESIS);
-      case RINKEBY:
-        return jsonConfig(RINKEBY_GENESIS);
-      case GOERLI:
-        return jsonConfig(GOERLI_GENESIS);
-      case DEV:
-        return jsonConfig(DEV_GENESIS);
-      case CLASSIC:
-        return jsonConfig(CLASSIC_GENESIS);
-      case KOTTI:
-        return jsonConfig(KOTTI_GENESIS);
-      case MORDOR:
-        return jsonConfig(MORDOR_GENESIS);
-      case YOLO_V2:
-        return jsonConfig(YOLO_GENESIS);
-      default:
-        throw new IllegalArgumentException("Unknown network:" + network);
-    }
+    return jsonConfig(network.getGenesisFile());
   }
 
+  /** The type Builder. */
   public static class Builder {
 
     private String dnsDiscoveryUrl;
@@ -214,6 +181,11 @@ public static class Builder {
     private BigInteger networkId;
     private List<EnodeURL> bootNodes;
 
+    /**
+     * Instantiates a new Builder.
+     *
+     * @param ethNetworkConfig the eth network config
+     */
     public Builder(final EthNetworkConfig ethNetworkConfig) {
       this.genesisConfig = ethNetworkConfig.genesisConfig;
       this.networkId = ethNetworkConfig.networkId;
@@ -221,26 +193,55 @@ public Builder(final EthNetworkConfig ethNetworkConfig) {
       this.dnsDiscoveryUrl = ethNetworkConfig.dnsDiscoveryUrl;
     }
 
+    /**
+     * Sets genesis config.
+     *
+     * @param genesisConfig the genesis config
+     * @return the genesis config
+     */
     public Builder setGenesisConfig(final String genesisConfig) {
       this.genesisConfig = genesisConfig;
       return this;
     }
 
+    /**
+     * Sets network id.
+     *
+     * @param networkId the network id
+     * @return the network id
+     */
     public Builder setNetworkId(final BigInteger networkId) {
       this.networkId = networkId;
       return this;
     }
 
+    /**
+     * Sets boot nodes.
+     *
+     * @param bootNodes the boot nodes
+     * @return the boot nodes
+     */
     public Builder setBootNodes(final List<EnodeURL> bootNodes) {
       this.bootNodes = bootNodes;
       return this;
     }
 
+    /**
+     * Sets dns discovery url.
+     *
+     * @param dnsDiscoveryUrl the dns discovery url
+     * @return the dns discovery url
+     */
     public Builder setDnsDiscoveryUrl(final String dnsDiscoveryUrl) {
       this.dnsDiscoveryUrl = dnsDiscoveryUrl;
       return this;
     }
 
+    /**
+     * Build eth network config.
+     *
+     * @return the eth network config
+     */
     public EthNetworkConfig build() {
       return new EthNetworkConfig(genesisConfig, networkId, bootNodes, dnsDiscoveryUrl);
     }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java b/besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java
index 7f47f44efd8..9d949b08ae3 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java
@@ -14,14 +14,100 @@
  */
 package org.hyperledger.besu.cli.config;
 
+import java.math.BigInteger;
+import java.util.Optional;
+
+import org.apache.commons.lang3.StringUtils;
+
+/** The enum Network name. */
 public enum NetworkName {
-  MAINNET,
-  RINKEBY,
-  ROPSTEN,
-  GOERLI,
-  DEV,
-  CLASSIC,
-  KOTTI,
-  MORDOR,
-  YOLO_V2
+  /** Mainnet network name. */
+  MAINNET("/mainnet.json", BigInteger.valueOf(1)),
+  /** Sepolia network name. */
+  SEPOLIA("/sepolia.json", BigInteger.valueOf(11155111)),
+  /** Goerli network name. */
+  GOERLI("/goerli.json", BigInteger.valueOf(5)),
+  /** Dev network name. */
+  DEV("/dev.json", BigInteger.valueOf(2018), false),
+  /** Future EIPs network name. */
+  FUTURE_EIPS("/future.json", BigInteger.valueOf(2022), false),
+  /** Experimental EIPs network name. */
+  EXPERIMENTAL_EIPS("/experimental.json", BigInteger.valueOf(2023), false),
+  /** Classic network name. */
+  CLASSIC("/classic.json", BigInteger.valueOf(1)),
+  /** Kotti network name. */
+  KOTTI("/kotti.json", BigInteger.valueOf(6)),
+  /** Mordor network name. */
+  MORDOR("/mordor.json", BigInteger.valueOf(7));
+
+  private final String genesisFile;
+  private final BigInteger networkId;
+  private final boolean canFastSync;
+  private final String deprecationDate;
+
+  NetworkName(final String genesisFile, final BigInteger networkId) {
+    this(genesisFile, networkId, true);
+  }
+
+  NetworkName(final String genesisFile, final BigInteger networkId, final boolean canFastSync) {
+    this.genesisFile = genesisFile;
+    this.networkId = networkId;
+    this.canFastSync = canFastSync;
+    // no deprecations planned
+    this.deprecationDate = null;
+  }
+
+  /**
+   * Gets genesis file.
+   *
+   * @return the genesis file
+   */
+  public String getGenesisFile() {
+    return genesisFile;
+  }
+
+  /**
+   * Gets network id.
+   *
+   * @return the network id
+   */
+  public BigInteger getNetworkId() {
+    return networkId;
+  }
+
+  /**
+   * Can fast sync boolean.
+   *
+   * @return the boolean
+   */
+  public boolean canFastSync() {
+    return canFastSync;
+  }
+
+  /**
+   * Normalize string.
+   *
+   * @return the string
+   */
+  public String normalize() {
+    return StringUtils.capitalize(name().toLowerCase());
+  }
+
+  /**
+   * Is deprecated boolean.
+   *
+   * @return the boolean
+   */
+  public boolean isDeprecated() {
+    return deprecationDate != null;
+  }
+
+  /**
+   * Gets deprecation date.
+   *
+   * @return the deprecation date
+   */
+  public Optional<String> getDeprecationDate() {
+    return Optional.ofNullable(deprecationDate);
+  }
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/converter/FractionConverter.java b/besu/src/main/java/org/hyperledger/besu/cli/converter/FractionConverter.java
index e3fc064891e..969a6be8e9e 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/converter/FractionConverter.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/converter/FractionConverter.java
@@ -19,6 +19,7 @@
 
 import picocli.CommandLine;
 
+/** The Fraction converter to convert floats in CLI. */
 public class FractionConverter implements CommandLine.ITypeConverter<Float> {
 
   @Override
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/converter/MetricCategoryConverter.java b/besu/src/main/java/org/hyperledger/besu/cli/converter/MetricCategoryConverter.java
index 9752c6df28d..684c3ce30c0 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/converter/MetricCategoryConverter.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/converter/MetricCategoryConverter.java
@@ -23,6 +23,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import picocli.CommandLine;
 
+/** The Metric category converter for CLI options. */
 public class MetricCategoryConverter implements CommandLine.ITypeConverter<MetricCategory> {
 
   private final Map<String, MetricCategory> metricCategories = new HashMap<>();
@@ -36,15 +37,31 @@ public MetricCategory convert(final String value) {
     return category;
   }
 
+  /**
+   * Add Metrics categories.
+   *
+   * @param <T> the type parameter
+   * @param categoryEnum the category enum
+   */
   public <T extends Enum<T> & MetricCategory> void addCategories(final Class<T> categoryEnum) {
     EnumSet.allOf(categoryEnum)
         .forEach(category -> metricCategories.put(category.name(), category));
   }
 
+  /**
+   * Add registry category.
+   *
+   * @param metricCategory the metric category
+   */
   public void addRegistryCategory(final MetricCategory metricCategory) {
     metricCategories.put(metricCategory.getName().toUpperCase(), metricCategory);
   }
 
+  /**
+   * Gets metric categories.
+   *
+   * @return the metric categories
+   */
   @VisibleForTesting
   Map<String, MetricCategory> getMetricCategories() {
     return metricCategories;
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/converter/PercentageConverter.java b/besu/src/main/java/org/hyperledger/besu/cli/converter/PercentageConverter.java
index d1b4ad836fd..23a2d94d33d 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/converter/PercentageConverter.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/converter/PercentageConverter.java
@@ -19,6 +19,7 @@
 
 import picocli.CommandLine;
 
+/** The Percentage Cli type converter. */
 public class PercentageConverter implements CommandLine.ITypeConverter<Integer> {
 
   @Override
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/converter/RpcApisConverter.java b/besu/src/main/java/org/hyperledger/besu/cli/converter/RpcApisConverter.java
deleted file mode 100644
index fd84d526ac1..00000000000
--- a/besu/src/main/java/org/hyperledger/besu/cli/converter/RpcApisConverter.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.cli.converter;
-
-import org.hyperledger.besu.cli.converter.exception.RpcApisConversionException;
-import org.hyperledger.besu.consensus.clique.jsonrpc.CliqueRpcApis;
-import org.hyperledger.besu.consensus.ibft.jsonrpc.IbftRpcApis;
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
-
-import java.util.Optional;
-import java.util.function.Function;
-import java.util.stream.Stream;
-
-import picocli.CommandLine;
-
-public class RpcApisConverter implements CommandLine.ITypeConverter<RpcApi> {
-
-  @Override
-  public RpcApi convert(final String name) throws RpcApisConversionException {
-    return Stream.<Function<String, Optional<RpcApi>>>of(
-            RpcApis::valueOf, CliqueRpcApis::valueOf, IbftRpcApis::valueOf)
-        .map(f -> f.apply(name.trim().toUpperCase()))
-        .filter(Optional::isPresent)
-        .map(Optional::get)
-        .findFirst()
-        .orElseThrow(() -> new RpcApisConversionException(name));
-  }
-}
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/converter/exception/FractionConversionException.java b/besu/src/main/java/org/hyperledger/besu/cli/converter/exception/FractionConversionException.java
index dd908213806..4dc3d446b05 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/converter/exception/FractionConversionException.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/converter/exception/FractionConversionException.java
@@ -16,8 +16,14 @@
 
 import static java.lang.String.format;
 
+/** The custom Fraction conversion exception. */
 public final class FractionConversionException extends Exception {
 
+  /**
+   * Instantiates a new Fraction conversion exception.
+   *
+   * @param value the value
+   */
   public FractionConversionException(final String value) {
     super(format("Invalid value: %s, should be a decimal between 0.0 and 1.0 inclusive.", value));
   }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/converter/exception/PercentageConversionException.java b/besu/src/main/java/org/hyperledger/besu/cli/converter/exception/PercentageConversionException.java
index 42eab94947f..f016996d255 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/converter/exception/PercentageConversionException.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/converter/exception/PercentageConversionException.java
@@ -16,8 +16,14 @@
 
 import static java.lang.String.format;
 
+/** The custom Percentage conversion exception. */
 public final class PercentageConversionException extends Exception {
 
+  /**
+   * Instantiates a new Percentage conversion exception.
+   *
+   * @param value the invalid value to add in exception message
+   */
   public PercentageConversionException(final String value) {
     super(format("Invalid value: %s, should be a number between 0 and 100 inclusive.", value));
   }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/converter/exception/RpcApisConversionException.java b/besu/src/main/java/org/hyperledger/besu/cli/converter/exception/RpcApisConversionException.java
index 0de6ea638fe..8d58a166322 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/converter/exception/RpcApisConversionException.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/converter/exception/RpcApisConversionException.java
@@ -16,8 +16,14 @@
 
 import static java.lang.String.format;
 
+/** The custom Rpc Apis conversion exception. */
 public final class RpcApisConversionException extends Exception {
 
+  /**
+   * Instantiates a new Rpc apis conversion exception.
+   *
+   * @param name the invalid Rpc Api name to report in exception message
+   */
   public RpcApisConversionException(final String name) {
     super(format("Invalid value: %s", name));
   }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/custom/CorsAllowedOriginsProperty.java b/besu/src/main/java/org/hyperledger/besu/cli/custom/CorsAllowedOriginsProperty.java
index 2b3a04b5266..9bdb2599d3d 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/custom/CorsAllowedOriginsProperty.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/custom/CorsAllowedOriginsProperty.java
@@ -28,10 +28,12 @@
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
 
+/** The Cors allowed origins property used in CLI */
 public class CorsAllowedOriginsProperty extends AbstractList<String> {
 
   private final List<String> domains = new ArrayList<>();
 
+  /** Instantiates a new Cors allowed origins property. */
   public CorsAllowedOriginsProperty() {}
 
   @Override
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/custom/EnodeToURIPropertyConverter.java b/besu/src/main/java/org/hyperledger/besu/cli/custom/EnodeToURIPropertyConverter.java
index 54dc2aefe6b..c51a1772dda 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/custom/EnodeToURIPropertyConverter.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/custom/EnodeToURIPropertyConverter.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.cli.custom;
 
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 
 import java.net.URI;
 import java.util.function.Function;
@@ -22,14 +22,21 @@
 import com.google.common.annotations.VisibleForTesting;
 import picocli.CommandLine.ITypeConverter;
 
+/** The Enode to uri property converter. */
 public class EnodeToURIPropertyConverter implements ITypeConverter<URI> {
 
   private final Function<String, URI> converter;
 
+  /** Instantiates a new Enode to uri property converter. */
   EnodeToURIPropertyConverter() {
-    this.converter = (s) -> EnodeURL.fromString(s).toURI();
+    this.converter = (s) -> EnodeURLImpl.fromString(s).toURI();
   }
 
+  /**
+   * Instantiates a new Enode to uri property converter.
+   *
+   * @param converter the converter
+   */
   @VisibleForTesting
   EnodeToURIPropertyConverter(final Function<String, URI> converter) {
     this.converter = converter;
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/custom/JsonRPCAllowlistHostsProperty.java b/besu/src/main/java/org/hyperledger/besu/cli/custom/JsonRPCAllowlistHostsProperty.java
index d99ba0b3b62..6eec1f0ef67 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/custom/JsonRPCAllowlistHostsProperty.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/custom/JsonRPCAllowlistHostsProperty.java
@@ -25,10 +25,12 @@
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
 
+/** The Json Rpc allowlist hosts list for CLI option. */
 public class JsonRPCAllowlistHostsProperty extends AbstractList<String> {
 
   private final List<String> hostnamesAllowlist = new ArrayList<>();
 
+  /** Instantiates a new Json rpc allowlist hosts property. */
   public JsonRPCAllowlistHostsProperty() {}
 
   @Override
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/custom/RpcAuthFileValidator.java b/besu/src/main/java/org/hyperledger/besu/cli/custom/RpcAuthFileValidator.java
index 40a9155799e..35c5bf13865 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/custom/RpcAuthFileValidator.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/custom/RpcAuthFileValidator.java
@@ -27,8 +27,17 @@
 import picocli.CommandLine;
 import picocli.CommandLine.ParameterException;
 
+/** The Rpc authentication file validator. */
 public class RpcAuthFileValidator {
 
+  /**
+   * Validate auth file.
+   *
+   * @param commandLine the command line to use for parameter exceptions
+   * @param filename the auth file
+   * @param type the RPC type
+   * @return the auth filename
+   */
   public static String validate(
       final CommandLine commandLine, final String filename, final String type) {
 
@@ -80,9 +89,7 @@ private static boolean verifyAllUsersHavePassword(final TomlParseResult tomlPars
     int configuredUsers = tomlParseResult.getTable("Users").keySet().size();
 
     int usersWithPasswords =
-        tomlParseResult
-            .keyPathSet()
-            .parallelStream()
+        tomlParseResult.keyPathSet().parallelStream()
             .filter(
                 keySet ->
                     keySet.contains("Users")
@@ -95,9 +102,7 @@ private static boolean verifyAllUsersHavePassword(final TomlParseResult tomlPars
   }
 
   private static boolean verifyAllEntriesHaveValues(final TomlParseResult tomlParseResult) {
-    return tomlParseResult
-        .dottedKeySet()
-        .parallelStream()
+    return tomlParseResult.dottedKeySet().parallelStream()
         .filter(keySet -> !keySet.contains("password"))
         .allMatch(dottedKey -> verifyEntry(dottedKey, tomlParseResult));
   }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/error/BesuExceptionHandler.java b/besu/src/main/java/org/hyperledger/besu/cli/error/BesuExceptionHandler.java
deleted file mode 100644
index da44caf2d8d..00000000000
--- a/besu/src/main/java/org/hyperledger/besu/cli/error/BesuExceptionHandler.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.cli.error;
-
-import java.util.List;
-import java.util.function.Supplier;
-
-import org.apache.logging.log4j.Level;
-import picocli.CommandLine;
-
-public class BesuExceptionHandler
-    extends CommandLine.AbstractHandler<List<Object>, BesuExceptionHandler>
-    implements CommandLine.IExceptionHandler2<List<Object>> {
-
-  private final Supplier<Level> levelSupplier;
-
-  public BesuExceptionHandler(final Supplier<Level> levelSupplier) {
-    this.levelSupplier = levelSupplier;
-  }
-
-  @Override
-  public List<Object> handleParseException(
-      final CommandLine.ParameterException ex, final String[] args) {
-    final Level logLevel = levelSupplier.get();
-    if (logLevel != null && Level.DEBUG.isMoreSpecificThan(logLevel)) {
-      ex.printStackTrace(err());
-    } else {
-      err().println(ex.getMessage());
-    }
-
-    CommandLine.UnmatchedArgumentException.printSuggestions(ex, err());
-
-    // don't print full help, just the instructions required to get it
-    ex.getCommandLine().getErr().println();
-    ex.getCommandLine().getErr().println("To display full help:");
-    ex.getCommandLine().getErr().println("besu [COMMAND] --help");
-
-    return returnResultOrExit(null);
-  }
-
-  @Override
-  public List<Object> handleExecutionException(
-      final CommandLine.ExecutionException ex, final CommandLine.ParseResult parseResult) {
-    return throwOrExit(ex);
-  }
-
-  @Override
-  protected BesuExceptionHandler self() {
-    return this;
-  }
-}
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/error/BesuExecutionExceptionHandler.java b/besu/src/main/java/org/hyperledger/besu/cli/error/BesuExecutionExceptionHandler.java
new file mode 100644
index 00000000000..77b458eb78c
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/cli/error/BesuExecutionExceptionHandler.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cli.error;
+
+import picocli.CommandLine;
+import picocli.CommandLine.IExecutionExceptionHandler;
+import picocli.CommandLine.Model.CommandSpec;
+
+/** Custom Execution Exception Handler used by PicoCLI framework. */
+public class BesuExecutionExceptionHandler implements IExecutionExceptionHandler {
+  @Override
+  public int handleExecutionException(
+      final Exception ex,
+      final CommandLine commandLine,
+      final CommandLine.ParseResult parseResult) {
+    final CommandSpec spec = commandLine.getCommandSpec();
+    commandLine.getErr().println(ex);
+    return commandLine.getExitCodeExceptionMapper() != null
+        ? commandLine.getExitCodeExceptionMapper().getExitCode(ex)
+        : spec.exitCodeOnExecutionException();
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/error/BesuParameterExceptionHandler.java b/besu/src/main/java/org/hyperledger/besu/cli/error/BesuParameterExceptionHandler.java
new file mode 100644
index 00000000000..6b7d8d6d6cb
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/cli/error/BesuParameterExceptionHandler.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cli.error;
+
+import java.io.PrintWriter;
+import java.util.function.Supplier;
+
+import picocli.CommandLine;
+import picocli.CommandLine.Model.CommandSpec;
+
+/** The custom parameter exception handler for Besu PicoCLI. */
+public class BesuParameterExceptionHandler implements CommandLine.IParameterExceptionHandler {
+
+  private final Supplier<String> levelSupplier;
+
+  /**
+   * Instantiates a new Besu parameter exception handler.
+   *
+   * @param levelSupplier the logging level supplier
+   */
+  public BesuParameterExceptionHandler(final Supplier<String> levelSupplier) {
+    this.levelSupplier = levelSupplier;
+  }
+
+  @Override
+  public int handleParseException(final CommandLine.ParameterException ex, final String[] args) {
+    final CommandLine cmd = ex.getCommandLine();
+    final PrintWriter err = cmd.getErr();
+    final String logLevel = levelSupplier.get();
+    if (logLevel != null
+        && (logLevel.equals("DEBUG") || logLevel.equals("TRACE") || logLevel.equals("ALL"))) {
+      ex.printStackTrace(err);
+    } else {
+      err.println(ex.getMessage());
+    }
+
+    CommandLine.UnmatchedArgumentException.printSuggestions(ex, err);
+
+    // don't print full help, just the instructions required to get it
+    err.println();
+    err.println("To display full help:");
+    err.println("besu [COMMAND] --help");
+
+    final CommandSpec spec = cmd.getCommandSpec();
+
+    return cmd.getExitCodeExceptionMapper() != null
+        ? cmd.getExitCodeExceptionMapper().getExitCode(ex)
+        : spec.exitCodeOnInvalidInput();
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/logging/BesuLoggingConfigurationFactory.java b/besu/src/main/java/org/hyperledger/besu/cli/logging/BesuLoggingConfigurationFactory.java
index f7e593a8270..c4af7e23b5b 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/logging/BesuLoggingConfigurationFactory.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/logging/BesuLoggingConfigurationFactory.java
@@ -19,6 +19,7 @@
 import org.apache.logging.log4j.core.config.ConfigurationFactory;
 import org.apache.logging.log4j.core.config.ConfigurationSource;
 
+/** Custom Log4J Configuration Factory for Besu */
 public class BesuLoggingConfigurationFactory extends ConfigurationFactory {
 
   @Override
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/logging/XmlExtensionConfiguration.java b/besu/src/main/java/org/hyperledger/besu/cli/logging/XmlExtensionConfiguration.java
index 34f5f93674a..d2ae7071bdb 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/logging/XmlExtensionConfiguration.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/logging/XmlExtensionConfiguration.java
@@ -19,7 +19,6 @@
 import java.io.IOException;
 import java.util.stream.Stream;
 
-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.appender.ConsoleAppender;
 import org.apache.logging.log4j.core.config.AbstractConfiguration;
@@ -27,9 +26,18 @@
 import org.apache.logging.log4j.core.config.ConfigurationSource;
 import org.apache.logging.log4j.core.config.xml.XmlConfiguration;
 import org.apache.logging.log4j.core.layout.PatternLayout;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Xml extension configuration for Logging framework. */
 public class XmlExtensionConfiguration extends XmlConfiguration {
 
+  /**
+   * Instantiates a new Xml extension configuration.
+   *
+   * @param loggerContext the logger context
+   * @param configSource the Configuration Source
+   */
   public XmlExtensionConfiguration(
       final LoggerContext loggerContext, final ConfigurationSource configSource) {
     super(loggerContext, configSource);
@@ -57,11 +65,13 @@ public Configuration reconfigure() {
         createConsoleAppender();
         return refreshed;
       } catch (final IOException e) {
-        LogManager.getLogger().error("Failed to reload the Log4j2 Xml configuration file", e);
+        LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME)
+            .error("Failed to reload the Log4j2 Xml configuration file", e);
       }
     }
 
-    LogManager.getLogger().warn("Cannot programmatically reconfigure loggers");
+    LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME)
+        .warn("Cannot programmatically reconfigure loggers");
     return refreshedParent;
   }
 
@@ -83,7 +93,7 @@ private void createConsoleAppender() {
     final PatternLayout patternLayout =
         PatternLayout.newBuilder()
             .withConfiguration(this)
-            .withDisableAnsi(!BesuCommand.getColorEnabled().orElse(true))
+            .withDisableAnsi(!BesuCommand.getColorEnabled().orElse(!noColorSet()))
             .withNoConsoleNoAnsi(!BesuCommand.getColorEnabled().orElse(false))
             .withPattern(
                 String.join(
@@ -100,6 +110,10 @@ private void createConsoleAppender() {
     this.getRootLogger().addAppender(consoleAppender, null, null);
   }
 
+  private static boolean noColorSet() {
+    return System.getenv("NO_COLOR") != null;
+  }
+
   private boolean customLog4jConfigFilePresent() {
     return Stream.of("LOG4J_CONFIGURATION_FILE", "log4j.configurationFile")
         .flatMap(
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/OptionParser.java b/besu/src/main/java/org/hyperledger/besu/cli/options/OptionParser.java
index 76d5b269511..73161742f90 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/options/OptionParser.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/OptionParser.java
@@ -22,34 +22,77 @@
 import com.google.common.collect.Range;
 import org.apache.tuweni.units.bigints.UInt256;
 
+/** The Option parser. */
 public class OptionParser {
 
+  /**
+   * Parse long range range.
+   *
+   * @param arg the arg
+   * @return the range
+   */
   public static Range<Long> parseLongRange(final String arg) {
     checkArgument(arg.matches("-?\\d+\\.\\.-?\\d+"));
     final Iterator<String> ends = Splitter.on("..").split(arg).iterator();
     return Range.closed(parseLong(ends.next()), parseLong(ends.next()));
   }
 
+  /**
+   * Parse long from String.
+   *
+   * @param arg long value to parse from String
+   * @return the long
+   */
   public static long parseLong(final String arg) {
     return Long.parseLong(arg, 10);
   }
 
+  /**
+   * Format Long values range.
+   *
+   * @param range the range
+   * @return the string
+   */
   public static String format(final Range<Long> range) {
     return format(range.lowerEndpoint()) + ".." + format(range.upperEndpoint());
   }
 
+  /**
+   * Format int to String.
+   *
+   * @param value the value
+   * @return the string
+   */
   public static String format(final int value) {
     return Integer.toString(value, 10);
   }
 
+  /**
+   * Format long to String.
+   *
+   * @param value the value
+   * @return the string
+   */
   public static String format(final long value) {
     return Long.toString(value, 10);
   }
 
+  /**
+   * Format float to string.
+   *
+   * @param value the value
+   * @return the string
+   */
   public static String format(final float value) {
     return Float.toString(value);
   }
 
+  /**
+   * Format UInt256 to string.
+   *
+   * @param value the value
+   * @return the string
+   */
   public static String format(final UInt256 value) {
     return value.toBigInteger().toString(10);
   }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/stable/DataStorageOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/stable/DataStorageOptions.java
new file mode 100644
index 00000000000..c93761fdae1
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/stable/DataStorageOptions.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.cli.options.stable;
+
+import static org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration.DEFAULT_BONSAI_MAX_LAYERS_TO_LOAD;
+
+import org.hyperledger.besu.cli.options.CLIOptions;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.ethereum.worldstate.ImmutableDataStorageConfiguration;
+
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import picocli.CommandLine.Option;
+
+/** The Data storage CLI options. */
+public class DataStorageOptions implements CLIOptions<DataStorageConfiguration> {
+
+  private static final String DATA_STORAGE_FORMAT = "--data-storage-format";
+
+  private static final String BONSAI_STORAGE_FORMAT_MAX_LAYERS_TO_LOAD =
+      "--bonsai-historical-block-limit";
+
+  // Use Bonsai DB
+  @Option(
+      names = {DATA_STORAGE_FORMAT},
+      description =
+          "Format to store trie data in.  Either FOREST or BONSAI (default: ${DEFAULT-VALUE}).",
+      arity = "1")
+  private final DataStorageFormat dataStorageFormat = DataStorageFormat.FOREST;
+
+  @Option(
+      names = {BONSAI_STORAGE_FORMAT_MAX_LAYERS_TO_LOAD, "--bonsai-maximum-back-layers-to-load"},
+      paramLabel = "<LONG>",
+      description =
+          "Limit of historical layers that can be loaded with BONSAI (default: ${DEFAULT-VALUE}).",
+      arity = "1")
+  private final Long bonsaiMaxLayersToLoad = DEFAULT_BONSAI_MAX_LAYERS_TO_LOAD;
+
+  /**
+   * Create data storage options.
+   *
+   * @return the data storage options
+   */
+  public static DataStorageOptions create() {
+    return new DataStorageOptions();
+  }
+
+  @Override
+  public DataStorageConfiguration toDomainObject() {
+    return ImmutableDataStorageConfiguration.builder()
+        .dataStorageFormat(dataStorageFormat)
+        .bonsaiMaxLayersToLoad(bonsaiMaxLayersToLoad)
+        .build();
+  }
+
+  @Override
+  public List<String> getCLIOptions() {
+    return List.of(
+        DATA_STORAGE_FORMAT,
+        dataStorageFormat.toString(),
+        BONSAI_STORAGE_FORMAT_MAX_LAYERS_TO_LOAD,
+        bonsaiMaxLayersToLoad.toString());
+  }
+
+  /**
+   * Normalize data storage format string.
+   *
+   * @return the normalized string
+   */
+  public String normalizeDataStorageFormat() {
+    return StringUtils.capitalize(dataStorageFormat.toString().toLowerCase());
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/stable/EthstatsOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/stable/EthstatsOptions.java
new file mode 100644
index 00000000000..a6e939fdf0e
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/stable/EthstatsOptions.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cli.options.stable;
+
+import org.hyperledger.besu.cli.options.CLIOptions;
+import org.hyperledger.besu.ethstats.util.EthStatsConnectOptions;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+import picocli.CommandLine;
+
+/** The Ethstats CLI options. */
+public class EthstatsOptions implements CLIOptions<EthStatsConnectOptions> {
+
+  private static final String ETHSTATS = "--ethstats";
+  private static final String ETHSTATS_CONTACT = "--ethstats-contact";
+  private static final String ETHSTATS_CACERT_FILE = "--ethstats-cacert-file";
+
+  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"})
+  @CommandLine.Option(
+      names = {ETHSTATS},
+      paramLabel = "<[ws://|wss://]nodename:secret@host:[port]>",
+      description = "Reporting URL of a ethstats server. Scheme and port can be omitted.",
+      arity = "1")
+  private String ethstatsUrl = "";
+
+  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"})
+  @CommandLine.Option(
+      names = {ETHSTATS_CONTACT},
+      description = "Contact address to send to ethstats server",
+      arity = "1")
+  private String ethstatsContact = "";
+
+  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"})
+  @CommandLine.Option(
+      names = {ETHSTATS_CACERT_FILE},
+      paramLabel = "<FILE>",
+      description =
+          "Specifies the path to the root CA (Certificate Authority) certificate file that has signed ethstats server certificate. This option is optional.")
+  private Path ethstatsCaCert = null;
+
+  private EthstatsOptions() {}
+
+  /**
+   * Create ethstats options.
+   *
+   * @return the ethstats options
+   */
+  public static EthstatsOptions create() {
+    return new EthstatsOptions();
+  }
+
+  @Override
+  public EthStatsConnectOptions toDomainObject() {
+    return EthStatsConnectOptions.fromParams(ethstatsUrl, ethstatsContact, ethstatsCaCert);
+  }
+
+  /**
+   * Gets ethstats url.
+   *
+   * @return the ethstats url
+   */
+  public String getEthstatsUrl() {
+    return ethstatsUrl;
+  }
+
+  /**
+   * Gets ethstats contact.
+   *
+   * @return the ethstats contact
+   */
+  public String getEthstatsContact() {
+    return ethstatsContact;
+  }
+
+  /**
+   * Returns path to root CA cert file.
+   *
+   * @return Path to CA file. null if no CA file to set.
+   */
+  public Path getEthstatsCaCert() {
+    return ethstatsCaCert;
+  }
+
+  @Override
+  public List<String> getCLIOptions() {
+    final List<String> options = new ArrayList<>();
+    options.add(ETHSTATS + "=" + ethstatsUrl);
+    options.add(ETHSTATS_CONTACT + "=" + ethstatsContact);
+    if (ethstatsCaCert != null) {
+      options.add(ETHSTATS_CACERT_FILE + "=" + ethstatsCaCert);
+    }
+    return options;
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/stable/LoggingLevelOption.java b/besu/src/main/java/org/hyperledger/besu/cli/options/stable/LoggingLevelOption.java
new file mode 100644
index 00000000000..ad119ea61a0
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/stable/LoggingLevelOption.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cli.options.stable;
+
+import java.util.Set;
+
+import picocli.CommandLine;
+import picocli.CommandLine.Model.CommandSpec;
+import picocli.CommandLine.Spec;
+
+/** The Logging level CLI option. */
+public class LoggingLevelOption {
+
+  /**
+   * Create logging level option.
+   *
+   * @return the logging level option
+   */
+  public static LoggingLevelOption create() {
+    return new LoggingLevelOption();
+  }
+
+  private static final Set<String> ACCEPTED_VALUES =
+      Set.of("OFF", "ERROR", "WARN", "INFO", "DEBUG", "TRACE", "ALL");
+  /** The Picocli CommandSpec. Visible for testing. Injected by Picocli framework at runtime. */
+  @Spec CommandSpec spec;
+
+  private String logLevel;
+
+  /**
+   * Sets log level.
+   *
+   * @param logLevel the log level
+   */
+  @CommandLine.Option(
+      names = {"--logging", "-l"},
+      paramLabel = "<LOG VERBOSITY LEVEL>",
+      description = "Logging verbosity levels: OFF, ERROR, WARN, INFO, DEBUG, TRACE, ALL")
+  public void setLogLevel(final String logLevel) {
+    if ("FATAL".equalsIgnoreCase(logLevel)) {
+      System.out.println("FATAL level is deprecated");
+      this.logLevel = "ERROR";
+    } else if (ACCEPTED_VALUES.contains(logLevel.toUpperCase())) {
+      this.logLevel = logLevel.toUpperCase();
+    } else {
+      throw new CommandLine.ParameterException(
+          spec.commandLine(), "Unknown logging value: " + logLevel);
+    }
+  }
+
+  /**
+   * Gets log level.
+   *
+   * @return the log level
+   */
+  public String getLogLevel() {
+    return logLevel;
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/stable/NodePrivateKeyFileOption.java b/besu/src/main/java/org/hyperledger/besu/cli/options/stable/NodePrivateKeyFileOption.java
new file mode 100644
index 00000000000..42789627d64
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/stable/NodePrivateKeyFileOption.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cli.options.stable;
+
+import static org.hyperledger.besu.cli.DefaultCommandValues.MANDATORY_PATH_FORMAT_HELP;
+
+import java.io.File;
+
+import picocli.CommandLine;
+
+/** The Node private key file Cli option. */
+public class NodePrivateKeyFileOption {
+
+  /**
+   * Create node private key file option.
+   *
+   * @return the node private key file option
+   */
+  public static NodePrivateKeyFileOption create() {
+    return new NodePrivateKeyFileOption();
+  }
+
+  @CommandLine.Option(
+      names = {"--node-private-key-file"},
+      paramLabel = MANDATORY_PATH_FORMAT_HELP,
+      description =
+          "The node's private key file (default: a file named \"key\" in the Besu data directory)")
+  private final File nodePrivateKeyFile = null;
+
+  /**
+   * Gets node private key file.
+   *
+   * @return the node private key file
+   */
+  public File getNodePrivateKeyFile() {
+    return nodePrivateKeyFile;
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/stable/P2PTLSConfigOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/stable/P2PTLSConfigOptions.java
new file mode 100644
index 00000000000..fefea4bb758
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/stable/P2PTLSConfigOptions.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cli.options.stable;
+
+import static java.util.Arrays.asList;
+import static org.hyperledger.besu.cli.DefaultCommandValues.DEFAULT_KEYSTORE_TYPE;
+import static org.hyperledger.besu.cli.DefaultCommandValues.MANDATORY_FILE_FORMAT_HELP;
+
+import org.hyperledger.besu.cli.util.CommandLineUtils;
+import org.hyperledger.besu.ethereum.api.tls.FileBasedPasswordProvider;
+import org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty.TLSConfiguration;
+
+import java.nio.file.Path;
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import picocli.CommandLine;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.ParameterException;
+
+/** The P2P TLS Config Cli Options. */
+public class P2PTLSConfigOptions {
+  @Option(
+      names = {"--Xp2p-tls-enabled"},
+      hidden = true,
+      description = "Enable P2P TLS functionality (default: ${DEFAULT-VALUE})")
+  private final Boolean p2pTLSEnabled = false;
+
+  @SuppressWarnings({
+    "FieldCanBeFinal",
+    "FieldMayBeFinal"
+  }) // p2pTLSKeyStoreType requires non-final Strings.
+  @Option(
+      names = {"--Xp2p-tls-keystore-type"},
+      hidden = true,
+      paramLabel = "<NAME>",
+      description = "P2P service keystore type. Required if P2P TLS is enabled.")
+  private String p2pTLSKeyStoreType = DEFAULT_KEYSTORE_TYPE;
+
+  @Option(
+      names = {"--Xp2p-tls-keystore-file"},
+      hidden = true,
+      paramLabel = MANDATORY_FILE_FORMAT_HELP,
+      description = "Keystore containing key/certificate for the P2P service.")
+  private final Path p2pTLSKeyStoreFile = null;
+
+  @Option(
+      names = {"--Xp2p-tls-keystore-password-file"},
+      hidden = true,
+      paramLabel = MANDATORY_FILE_FORMAT_HELP,
+      description =
+          "File containing password to unlock keystore for the P2P service. Required if P2P TLS is enabled.")
+  private final Path p2pTLSKeyStorePasswordFile = null;
+
+  @SuppressWarnings({
+    "FieldCanBeFinal",
+    "FieldMayBeFinal"
+  }) // p2pTLSTrustStoreType requires non-final Strings.
+  @Option(
+      names = {"--Xp2p-tls-truststore-type"},
+      hidden = true,
+      paramLabel = "<NAME>",
+      description = "P2P service truststore type.")
+  private String p2pTLSTrustStoreType = DEFAULT_KEYSTORE_TYPE;
+
+  @Option(
+      names = {"--Xp2p-tls-truststore-file"},
+      hidden = true,
+      paramLabel = MANDATORY_FILE_FORMAT_HELP,
+      description = "Truststore containing trusted certificates for the P2P service.")
+  private final Path p2pTLSTrustStoreFile = null;
+
+  @Option(
+      names = {"--Xp2p-tls-truststore-password-file"},
+      hidden = true,
+      paramLabel = MANDATORY_FILE_FORMAT_HELP,
+      description = "File containing password to unlock truststore for the P2P service.")
+  private final Path p2pTLSTrustStorePasswordFile = null;
+
+  @Option(
+      names = {"--Xp2p-tls-crl-file"},
+      hidden = true,
+      paramLabel = MANDATORY_FILE_FORMAT_HELP,
+      description = "Certificate revocation list for the P2P service.")
+  private final Path p2pCrlFile = null;
+
+  @Option(
+      names = {"--Xp2p-tls-clienthello-sni"},
+      hidden = true,
+      description =
+          "Whether to send a SNI header in the TLS ClientHello message (default: ${DEFAULT-VALUE})")
+  private final Boolean p2pTlsClientHelloSniHeaderEnabled = false;
+
+  /**
+   * Generate P2p tls configuration.
+   *
+   * @param commandLine the command line object to report exceptions
+   * @return the optional TLSConfiguration
+   */
+  public Optional<TLSConfiguration> p2pTLSConfiguration(final CommandLine commandLine) {
+    if (!p2pTLSEnabled) {
+      return Optional.empty();
+    }
+
+    if (p2pTLSKeyStoreType == null) {
+      throw new ParameterException(
+          commandLine, "Keystore type is required when p2p TLS is enabled");
+    }
+
+    if (p2pTLSKeyStorePasswordFile == null) {
+      throw new ParameterException(
+          commandLine,
+          "File containing password to unlock keystore is required when p2p TLS is enabled");
+    }
+
+    return Optional.of(
+        TLSConfiguration.Builder.tlsConfiguration()
+            .withKeyStoreType(p2pTLSKeyStoreType)
+            .withKeyStorePath(p2pTLSKeyStoreFile)
+            .withKeyStorePasswordSupplier(new FileBasedPasswordProvider(p2pTLSKeyStorePasswordFile))
+            .withKeyStorePasswordPath(p2pTLSKeyStorePasswordFile)
+            .withTrustStoreType(p2pTLSTrustStoreType)
+            .withTrustStorePath(p2pTLSTrustStoreFile)
+            .withTrustStorePasswordSupplier(
+                null == p2pTLSTrustStorePasswordFile
+                    ? null
+                    : new FileBasedPasswordProvider(p2pTLSTrustStorePasswordFile))
+            .withTrustStorePasswordPath(p2pTLSTrustStorePasswordFile)
+            .withCrlPath(p2pCrlFile)
+            .withClientHelloSniEnabled(p2pTlsClientHelloSniHeaderEnabled)
+            .build());
+  }
+
+  /**
+   * Check P2P Tls options dependencies.
+   *
+   * @param logger the logger
+   * @param commandLine the command line
+   */
+  public void checkP2PTLSOptionsDependencies(final Logger logger, final CommandLine commandLine) {
+    CommandLineUtils.checkOptionDependencies(
+        logger,
+        commandLine,
+        "--Xp2p-tls-enabled",
+        !p2pTLSEnabled,
+        asList("--Xp2p-tls-keystore-type", "--Xp2p-tls-keystore-password-file"));
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/ChainPruningOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/ChainPruningOptions.java
new file mode 100644
index 00000000000..e164ec8fa85
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/ChainPruningOptions.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.cli.options.unstable;
+
+import org.hyperledger.besu.cli.options.CLIOptions;
+import org.hyperledger.besu.ethereum.chain.ChainPrunerConfiguration;
+import org.hyperledger.besu.util.number.PositiveNumber;
+
+import java.util.Arrays;
+import java.util.List;
+
+import picocli.CommandLine;
+
+/** The Chain pruning CLI options. */
+public class ChainPruningOptions implements CLIOptions<ChainPrunerConfiguration> {
+  private static final String CHAIN_PRUNING_ENABLED_FLAG = "--Xchain-pruning-enabled";
+  private static final String CHAIN_PRUNING_BLOCKS_RETAINED_FLAG =
+      "--Xchain-pruning-blocks-retained";
+  private static final String CHAIN_PRUNING_FREQUENCY_FLAG = "--Xchain-pruning-frequency";
+  /** The constant DEFAULT_CHAIN_DATA_PRUNING_MIN_BLOCKS_RETAINED. */
+  public static final long DEFAULT_CHAIN_DATA_PRUNING_MIN_BLOCKS_RETAINED = 7200;
+  /** The constant DEFAULT_CHAIN_DATA_PRUNING_FREQUENCY. */
+  public static final int DEFAULT_CHAIN_DATA_PRUNING_FREQUENCY = 256;
+
+  @CommandLine.Option(
+      hidden = true,
+      names = {CHAIN_PRUNING_ENABLED_FLAG},
+      description =
+          "Enable the chain pruner to actively prune old chain data (default: ${DEFAULT-VALUE})")
+  private final Boolean chainDataPruningEnabled = Boolean.FALSE;
+
+  @CommandLine.Option(
+      hidden = true,
+      names = {CHAIN_PRUNING_BLOCKS_RETAINED_FLAG},
+      description =
+          "The number of recent blocks for which to keep the chain data. Must be >= "
+              + DEFAULT_CHAIN_DATA_PRUNING_MIN_BLOCKS_RETAINED
+              + " (default: ${DEFAULT-VALUE})")
+  private final Long chainDataPruningBlocksRetained =
+      DEFAULT_CHAIN_DATA_PRUNING_MIN_BLOCKS_RETAINED;
+
+  @CommandLine.Option(
+      hidden = true,
+      names = {CHAIN_PRUNING_FREQUENCY_FLAG},
+      description =
+          "The number of blocks added to the chain between two pruning operations. Must be non-negative (default: ${DEFAULT-VALUE})")
+  private final PositiveNumber chainDataPruningBlocksFrequency =
+      PositiveNumber.fromInt(DEFAULT_CHAIN_DATA_PRUNING_FREQUENCY);
+
+  /**
+   * Create chain pruning options.
+   *
+   * @return the chain pruning options
+   */
+  public static ChainPruningOptions create() {
+    return new ChainPruningOptions();
+  }
+
+  /**
+   * Gets chain data pruning enabled.
+   *
+   * @return the chain data pruning enabled
+   */
+  public Boolean getChainDataPruningEnabled() {
+    return chainDataPruningEnabled;
+  }
+
+  /**
+   * Gets chain data pruning blocks retained.
+   *
+   * @return the chain data pruning blocks retained
+   */
+  public Long getChainDataPruningBlocksRetained() {
+    return chainDataPruningBlocksRetained;
+  }
+
+  @Override
+  public ChainPrunerConfiguration toDomainObject() {
+    return new ChainPrunerConfiguration(
+        chainDataPruningEnabled,
+        chainDataPruningBlocksRetained,
+        chainDataPruningBlocksFrequency.getValue());
+  }
+
+  @Override
+  public List<String> getCLIOptions() {
+    return Arrays.asList(
+        CHAIN_PRUNING_ENABLED_FLAG,
+        chainDataPruningEnabled.toString(),
+        CHAIN_PRUNING_BLOCKS_RETAINED_FLAG,
+        chainDataPruningBlocksRetained.toString(),
+        CHAIN_PRUNING_FREQUENCY_FLAG,
+        chainDataPruningBlocksFrequency.toString());
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/DataStorageOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/DataStorageOptions.java
deleted file mode 100644
index c35ed4407a7..00000000000
--- a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/DataStorageOptions.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-
-package org.hyperledger.besu.cli.options.unstable;
-
-import org.hyperledger.besu.cli.options.CLIOptions;
-import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
-import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
-import org.hyperledger.besu.ethereum.worldstate.ImmutableDataStorageConfiguration;
-
-import java.util.List;
-
-import picocli.CommandLine.Option;
-
-public class DataStorageOptions implements CLIOptions<DataStorageConfiguration> {
-
-  private static final String DATA_STORAGE_FORMAT = "--Xdata-storage-format";
-
-  // Use Bonsai DB
-  @Option(
-      names = {DATA_STORAGE_FORMAT},
-      hidden = true,
-      description =
-          "Format to store trie data in.  Either FOREST or BONSAI (default: ${DEFAULT-VALUE}).",
-      arity = "1")
-  private final DataStorageFormat dataStorageFormat = DataStorageFormat.FOREST;
-
-  public static DataStorageOptions create() {
-    return new DataStorageOptions();
-  }
-
-  @Override
-  public DataStorageConfiguration toDomainObject() {
-    return ImmutableDataStorageConfiguration.builder().dataStorageFormat(dataStorageFormat).build();
-  }
-
-  @Override
-  public List<String> getCLIOptions() {
-    return List.of(DATA_STORAGE_FORMAT, dataStorageFormat.toString());
-  }
-}
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/DnsOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/DnsOptions.java
index 8926ea38d54..8d65a3264e9 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/DnsOptions.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/DnsOptions.java
@@ -23,6 +23,7 @@
 
 import picocli.CommandLine;
 
+/** The Dns CLI options. */
 public class DnsOptions implements CLIOptions<EnodeDnsConfiguration> {
 
   private final String DNS_ENABLED = "--Xdns-enabled";
@@ -42,10 +43,21 @@ public class DnsOptions implements CLIOptions<EnodeDnsConfiguration> {
       arity = "1")
   private Boolean dnsUpdateEnabled = Boolean.FALSE;
 
+  /**
+   * Create dns options.
+   *
+   * @return the dns options
+   */
   public static DnsOptions create() {
     return new DnsOptions();
   }
 
+  /**
+   * From config dns options.
+   *
+   * @param enodeDnsConfiguration the enode dns configuration
+   * @return the dns options
+   */
   public static DnsOptions fromConfig(final EnodeDnsConfiguration enodeDnsConfiguration) {
     final DnsOptions cliOptions = new DnsOptions();
     cliOptions.dnsEnabled = enodeDnsConfiguration.dnsEnabled();
@@ -53,10 +65,20 @@ public static DnsOptions fromConfig(final EnodeDnsConfiguration enodeDnsConfigur
     return cliOptions;
   }
 
+  /**
+   * Gets dns enabled.
+   *
+   * @return the dns enabled
+   */
   public Boolean getDnsEnabled() {
     return dnsEnabled;
   }
 
+  /**
+   * Gets dns update enabled.
+   *
+   * @return the dns update enabled
+   */
   public Boolean getDnsUpdateEnabled() {
     return dnsUpdateEnabled;
   }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/EthProtocolOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/EthProtocolOptions.java
index b838f6646d0..1d5434ff022 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/EthProtocolOptions.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/EthProtocolOptions.java
@@ -24,16 +24,29 @@
 
 import picocli.CommandLine;
 
+/** The Eth protocol CLI options. */
 public class EthProtocolOptions implements CLIOptions<EthProtocolConfiguration> {
+  private static final String MAX_MESSAGE_SIZE_FLAG = "--Xeth-max-message-size";
   private static final String MAX_GET_HEADERS_FLAG = "--Xewp-max-get-headers";
   private static final String MAX_GET_BODIES_FLAG = "--Xewp-max-get-bodies";
   private static final String MAX_GET_RECEIPTS_FLAG = "--Xewp-max-get-receipts";
   private static final String MAX_GET_NODE_DATA_FLAG = "--Xewp-max-get-node-data";
   private static final String MAX_GET_POOLED_TRANSACTIONS = "--Xewp-max-get-pooled-transactions";
-  private static final String ETH_65_ENABLED = "--Xeth-65-enabled";
   private static final String LEGACY_ETH_64_FORK_ID_ENABLED =
       "--compatibility-eth64-forkid-enabled";
 
+  private static final String MAX_CAPABILITY = "--Xeth-capability-max";
+  private static final String MIN_CAPABILITY = "--Xeth-capability-min";
+
+  @CommandLine.Option(
+      hidden = true,
+      names = {MAX_MESSAGE_SIZE_FLAG},
+      paramLabel = "<INTEGER>",
+      description =
+          "Maximum message size (in bytes) for Ethereum Wire Protocol messages. (default: ${DEFAULT-VALUE})")
+  private PositiveNumber maxMessageSize =
+      PositiveNumber.fromInt(EthProtocolConfiguration.DEFAULT_MAX_MESSAGE_SIZE);
+
   @CommandLine.Option(
       hidden = true,
       names = {MAX_GET_HEADERS_FLAG},
@@ -79,13 +92,6 @@ public class EthProtocolOptions implements CLIOptions<EthProtocolConfiguration>
   private PositiveNumber maxGetPooledTransactions =
       PositiveNumber.fromInt(EthProtocolConfiguration.DEFAULT_MAX_GET_POOLED_TRANSACTIONS);
 
-  @CommandLine.Option(
-      hidden = true,
-      names = {ETH_65_ENABLED},
-      paramLabel = "<Boolean>",
-      description = "Enable the Eth/65 subprotocol. (default: ${DEFAULT-VALUE})")
-  private Boolean eth65Enabled = EthProtocolConfiguration.DEFAULT_ETH_65_ENABLED;
-
   @CommandLine.Option(
       names = {LEGACY_ETH_64_FORK_ID_ENABLED},
       paramLabel = "<Boolean>",
@@ -93,40 +99,71 @@ public class EthProtocolOptions implements CLIOptions<EthProtocolConfiguration>
   private Boolean legacyEth64ForkIdEnabled =
       EthProtocolConfiguration.DEFAULT_LEGACY_ETH_64_FORK_ID_ENABLED;
 
+  @CommandLine.Option(
+      hidden = true,
+      names = {MAX_CAPABILITY},
+      paramLabel = "<INTEGER>",
+      description = "Max protocol version to support")
+  private int maxEthCapability = EthProtocolConfiguration.DEFAULT_MAX_CAPABILITY;
+
+  @CommandLine.Option(
+      hidden = true,
+      names = {MIN_CAPABILITY},
+      paramLabel = "<INTEGER>",
+      description = "Min protocol version to support")
+  private int minEthCapability = EthProtocolConfiguration.DEFAULT_MIN_CAPABILITY;
+
   private EthProtocolOptions() {}
 
+  /**
+   * Create eth protocol options.
+   *
+   * @return the eth protocol options
+   */
   public static EthProtocolOptions create() {
     return new EthProtocolOptions();
   }
 
+  /**
+   * From config eth protocol options.
+   *
+   * @param config the config
+   * @return the eth protocol options
+   */
   public static EthProtocolOptions fromConfig(final EthProtocolConfiguration config) {
     final EthProtocolOptions options = create();
+    options.maxMessageSize = PositiveNumber.fromInt(config.getMaxMessageSize());
     options.maxGetBlockHeaders = PositiveNumber.fromInt(config.getMaxGetBlockHeaders());
     options.maxGetBlockBodies = PositiveNumber.fromInt(config.getMaxGetBlockBodies());
     options.maxGetReceipts = PositiveNumber.fromInt(config.getMaxGetReceipts());
     options.maxGetNodeData = PositiveNumber.fromInt(config.getMaxGetNodeData());
     options.maxGetPooledTransactions = PositiveNumber.fromInt(config.getMaxGetPooledTransactions());
-    options.eth65Enabled = config.isEth65Enabled();
     options.legacyEth64ForkIdEnabled = config.isLegacyEth64ForkIdEnabled();
+    options.maxEthCapability = config.getMaxEthCapability();
+    options.minEthCapability = config.getMinEthCapability();
     return options;
   }
 
   @Override
   public EthProtocolConfiguration toDomainObject() {
     return EthProtocolConfiguration.builder()
+        .maxMessageSize(maxMessageSize)
         .maxGetBlockHeaders(maxGetBlockHeaders)
         .maxGetBlockBodies(maxGetBlockBodies)
         .maxGetReceipts(maxGetReceipts)
         .maxGetNodeData(maxGetNodeData)
         .maxGetPooledTransactions(maxGetPooledTransactions)
-        .eth65Enabled(eth65Enabled)
         .legacyEth64ForkIdEnabled(legacyEth64ForkIdEnabled)
+        .maxEthCapability(maxEthCapability)
+        .minEthCapability(minEthCapability)
         .build();
   }
 
   @Override
   public List<String> getCLIOptions() {
     return Arrays.asList(
+        MAX_MESSAGE_SIZE_FLAG,
+        OptionParser.format(maxMessageSize.getValue()),
         MAX_GET_HEADERS_FLAG,
         OptionParser.format(maxGetBlockHeaders.getValue()),
         MAX_GET_BODIES_FLAG,
@@ -137,7 +174,6 @@ public List<String> getCLIOptions() {
         OptionParser.format(maxGetNodeData.getValue()),
         MAX_GET_POOLED_TRANSACTIONS,
         OptionParser.format(maxGetPooledTransactions.getValue()),
-        ETH_65_ENABLED + "=" + eth65Enabled,
         LEGACY_ETH_64_FORK_ID_ENABLED + "=" + legacyEth64ForkIdEnabled);
   }
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/EthstatsOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/EthstatsOptions.java
deleted file mode 100644
index 556e96adc57..00000000000
--- a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/EthstatsOptions.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.cli.options.unstable;
-
-import org.hyperledger.besu.cli.options.CLIOptions;
-import org.hyperledger.besu.ethstats.util.NetstatsUrl;
-
-import java.util.Arrays;
-import java.util.List;
-
-import picocli.CommandLine;
-
-public class EthstatsOptions implements CLIOptions<NetstatsUrl> {
-
-  private static final String ETHSTATS = "--Xethstats";
-  private static final String ETHSTATS_CONTACT = "--Xethstats-contact";
-
-  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"})
-  @CommandLine.Option(
-      hidden = true,
-      names = {ETHSTATS},
-      paramLabel = "<nodename:secret@host:port>",
-      description = "Reporting URL of a ethstats server",
-      arity = "1")
-  private String ethstatsUrl = "";
-
-  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"})
-  @CommandLine.Option(
-      hidden = true,
-      names = {ETHSTATS_CONTACT},
-      description = "Contact address to send to ethstats server",
-      arity = "1")
-  private String ethstatsContact = "";
-
-  private EthstatsOptions() {}
-
-  public static EthstatsOptions create() {
-    return new EthstatsOptions();
-  }
-
-  @Override
-  public NetstatsUrl toDomainObject() {
-    return NetstatsUrl.fromParams(ethstatsUrl, ethstatsContact);
-  }
-
-  public String getEthstatsUrl() {
-    return ethstatsUrl;
-  }
-
-  public String getEthstatsContact() {
-    return ethstatsContact;
-  }
-
-  @Override
-  public List<String> getCLIOptions() {
-    return Arrays.asList(ETHSTATS + "=" + ethstatsUrl, ETHSTATS_CONTACT + "=" + ethstatsContact);
-  }
-}
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/EvmOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/EvmOptions.java
new file mode 100644
index 00000000000..7e787cf83b8
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/EvmOptions.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.cli.options.unstable;
+
+import org.hyperledger.besu.cli.options.CLIOptions;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+
+import java.util.Arrays;
+import java.util.List;
+
+import picocli.CommandLine;
+
+/** The Evm CLI options. */
+public class EvmOptions implements CLIOptions<EvmConfiguration> {
+
+  /** The constant JUMPDEST_CACHE_WEIGHT. */
+  public static final String JUMPDEST_CACHE_WEIGHT = "--Xevm-jumpdest-cache-weight-kb";
+
+  /**
+   * Create evm options.
+   *
+   * @return the evm options
+   */
+  public static EvmOptions create() {
+    return new EvmOptions();
+  }
+
+  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"})
+  @CommandLine.Option(
+      names = {JUMPDEST_CACHE_WEIGHT},
+      description =
+          "size in kilobytes to allow the cache "
+              + "of valid jump destinations to grow to before evicting the least recently used entry",
+      fallbackValue = "32000",
+      defaultValue = "32000",
+      hidden = true,
+      arity = "1")
+  private Long jumpDestCacheWeightKilobytes =
+      32_000L; // 10k contracts, (25k max contract size / 8 bit) + 32byte hash
+
+  @Override
+  public EvmConfiguration toDomainObject() {
+    return new EvmConfiguration(jumpDestCacheWeightKilobytes);
+  }
+
+  @Override
+  public List<String> getCLIOptions() {
+    return Arrays.asList(JUMPDEST_CACHE_WEIGHT);
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/IpcOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/IpcOptions.java
new file mode 100644
index 00000000000..d8b868ef909
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/IpcOptions.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cli.options.unstable;
+
+import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.DEFAULT_RPC_APIS;
+
+import java.nio.file.Path;
+import java.util.List;
+
+import picocli.CommandLine;
+
+/** The Ipc CLI options. */
+public class IpcOptions {
+  private static final String DEFAULT_IPC_FILE = "besu.ipc";
+
+  /**
+   * Create ipc options.
+   *
+   * @return the ipc options
+   */
+  public static IpcOptions create() {
+    return new IpcOptions();
+  }
+
+  /**
+   * Gets default path.
+   *
+   * @param dataDir the data dir
+   * @return the default path
+   */
+  public static Path getDefaultPath(final Path dataDir) {
+    return dataDir.resolve(DEFAULT_IPC_FILE);
+  }
+
+  @CommandLine.Option(
+      names = {"--Xrpc-ipc-enabled"},
+      hidden = true,
+      description = "Set to start the JSON-RPC IPC service (default: ${DEFAULT-VALUE})")
+  private final Boolean enabled = false;
+
+  @CommandLine.Option(
+      names = {"--Xrpc-ipc-path"},
+      hidden = true,
+      description =
+          "IPC socket/pipe file (default: a file named \""
+              + DEFAULT_IPC_FILE
+              + "\" in the Besu data directory)")
+  private Path ipcPath;
+
+  @CommandLine.Option(
+      names = {"--Xrpc-ipc-api", "--Xrpc-ipc-apis"},
+      hidden = true,
+      paramLabel = "<api name>",
+      split = " {0,1}, {0,1}",
+      arity = "1..*",
+      description =
+          "Comma separated list of APIs to enable on JSON-RPC IPC service (default: ${DEFAULT-VALUE})")
+  private final List<String> rpcIpcApis = DEFAULT_RPC_APIS;
+
+  /**
+   * Whether IPC options are enabled.
+   *
+   * @return true for enabled, false otherwise.
+   */
+  public Boolean isEnabled() {
+    return enabled;
+  }
+
+  /**
+   * Gets ipc path.
+   *
+   * @return the ipc path
+   */
+  public Path getIpcPath() {
+    return ipcPath;
+  }
+
+  /**
+   * Gets rpc ipc apis.
+   *
+   * @return the rpc ipc apis
+   */
+  public List<String> getRpcIpcApis() {
+    return rpcIpcApis;
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/MetricsCLIOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/MetricsCLIOptions.java
index c66a7f7671c..45270c808c9 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/MetricsCLIOptions.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/MetricsCLIOptions.java
@@ -22,35 +22,59 @@
 
 import picocli.CommandLine;
 
+/** The Metrics cli options. */
 public class MetricsCLIOptions implements CLIOptions<MetricsConfiguration.Builder> {
   private static final String TIMERS_ENABLED_FLAG = "--Xmetrics-timers-enabled";
+  private static final String IDLE_TIMEOUT_FLAG = "--Xmetrics-idle-timeout";
 
   @CommandLine.Option(
       names = TIMERS_ENABLED_FLAG,
       hidden = true,
       defaultValue = "true",
       description = "Whether to enable timer metrics (default: ${DEFAULT-VALUE}).")
-  private Boolean timersEnabled = MetricsConfiguration.DEFAULT_TIMERS_ENABLED;
+  private Boolean timersEnabled = MetricsConfiguration.DEFAULT_METRICS_TIMERS_ENABLED;
+
+  @CommandLine.Option(
+      hidden = true,
+      names = {IDLE_TIMEOUT_FLAG},
+      paramLabel = "<INTEGER>",
+      description = "Timeout for metrics TCP connections, in seconds (default: ${DEFAULT-VALUE})",
+      arity = "1")
+  private int idleTimeout = MetricsConfiguration.DEFAULT_METRICS_IDLE_TIMEOUT_SECONDS;
 
   private MetricsCLIOptions() {}
 
+  /**
+   * Create metrics cli options.
+   *
+   * @return the metrics cli options
+   */
   public static MetricsCLIOptions create() {
     return new MetricsCLIOptions();
   }
 
+  /**
+   * From configuration metrics cli options.
+   *
+   * @param config the config
+   * @return the metrics cli options
+   */
   public static MetricsCLIOptions fromConfiguration(final MetricsConfiguration config) {
     final MetricsCLIOptions metricsOptions = create();
     metricsOptions.timersEnabled = config.isTimersEnabled();
+    metricsOptions.idleTimeout = config.getIdleTimeout();
     return metricsOptions;
   }
 
   @Override
   public MetricsConfiguration.Builder toDomainObject() {
-    return MetricsConfiguration.builder().timersEnabled(timersEnabled);
+    return MetricsConfiguration.builder().timersEnabled(timersEnabled).idleTimeout(idleTimeout);
   }
 
   @Override
   public List<String> getCLIOptions() {
-    return Arrays.asList(TIMERS_ENABLED_FLAG + "=" + timersEnabled.toString());
+    return Arrays.asList(
+        TIMERS_ENABLED_FLAG + "=" + timersEnabled.toString(),
+        IDLE_TIMEOUT_FLAG + "=" + idleTimeout);
   }
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/MiningOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/MiningOptions.java
index 0f5960b4a8d..232554722e2 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/MiningOptions.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/MiningOptions.java
@@ -14,11 +14,16 @@
  */
 package org.hyperledger.besu.cli.options.unstable;
 
+import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_MAX_OMMERS_DEPTH;
+import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_POS_BLOCK_CREATION_MAX_TIME;
+import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_POS_BLOCK_CREATION_REPETITION_MIN_DURATION;
+import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_POW_JOB_TTL;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_REMOTE_SEALERS_LIMIT;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_REMOTE_SEALERS_TTL;
 
 import picocli.CommandLine;
 
+/** The Mining CLI options. */
 public class MiningOptions {
 
   @CommandLine.Option(
@@ -35,6 +40,20 @@ public class MiningOptions {
           "Specifies the lifetime of each entry in the cache. An entry will be automatically deleted if no update has been received before the deadline (default: ${DEFAULT-VALUE} minutes)")
   private final Long remoteSealersTimeToLive = DEFAULT_REMOTE_SEALERS_TTL;
 
+  @CommandLine.Option(
+      hidden = true,
+      names = {"--Xminer-pow-job-ttl"},
+      description =
+          "Specifies the time PoW jobs are kept in cache and will accept a solution from miners (default: ${DEFAULT-VALUE} milliseconds)")
+  private final Long powJobTimeToLive = DEFAULT_POW_JOB_TTL;
+
+  @CommandLine.Option(
+      hidden = true,
+      names = {"--Xmax-ommers-depth"},
+      description =
+          "Specifies the depth of ommer blocks to accept when receiving solutions (default: ${DEFAULT-VALUE})")
+  private final Integer maxOmmersDepth = DEFAULT_MAX_OMMERS_DEPTH;
+
   @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
   @CommandLine.Option(
       hidden = true,
@@ -42,19 +61,91 @@ public class MiningOptions {
       description = "Extranonce for Stratum network miners (default: ${DEFAULT-VALUE})")
   private String stratumExtranonce = "080c";
 
+  @CommandLine.Option(
+      hidden = true,
+      names = {"--Xpos-block-creation-max-time"},
+      description =
+          "Specifies the maximum time, in milliseconds, a PoS block creation jobs is allowed to run. Must be positive and ≤ 12000 (default: ${DEFAULT-VALUE} milliseconds)")
+  private final Long posBlockCreationMaxTime = DEFAULT_POS_BLOCK_CREATION_MAX_TIME;
+
+  @CommandLine.Option(
+      hidden = true,
+      names = {"--Xpos-block-creation-repetition-min-duration"},
+      description =
+          "If a PoS block creation repetition takes less than this duration, in milliseconds,"
+              + " then it waits before next repetition. Must be positive and ≤ 2000 (default: ${DEFAULT-VALUE} milliseconds)")
+  private final Long posBlockCreationRepetitionMinDuration =
+      DEFAULT_POS_BLOCK_CREATION_REPETITION_MIN_DURATION;
+
+  /**
+   * Create mining options.
+   *
+   * @return the mining options
+   */
   public static MiningOptions create() {
     return new MiningOptions();
   }
 
+  /**
+   * Gets remote sealers limit.
+   *
+   * @return the remote sealers limit
+   */
   public Integer getRemoteSealersLimit() {
     return remoteSealersLimit;
   }
 
+  /**
+   * Gets remote sealers time to live.
+   *
+   * @return the remote sealers time to live
+   */
   public Long getRemoteSealersTimeToLive() {
     return remoteSealersTimeToLive;
   }
 
+  /**
+   * Gets stratum extra nonce.
+   *
+   * @return the stratum extra nonce
+   */
   public String getStratumExtranonce() {
     return stratumExtranonce;
   }
+
+  /**
+   * Gets pow job time to live.
+   *
+   * @return the pow job time to live
+   */
+  public Long getPowJobTimeToLive() {
+    return powJobTimeToLive;
+  }
+
+  /**
+   * Gets max ommers depth.
+   *
+   * @return the max ommers depth
+   */
+  public int getMaxOmmersDepth() {
+    return maxOmmersDepth;
+  }
+
+  /**
+   * Gets pos block creation max time.
+   *
+   * @return the pos block creation max time
+   */
+  public Long getPosBlockCreationMaxTime() {
+    return posBlockCreationMaxTime;
+  }
+
+  /**
+   * Gets pos block creation repetition min duration.
+   *
+   * @return the pos block creation repetition min duration.
+   */
+  public Long getPosBlockCreationRepetitionMinDuration() {
+    return posBlockCreationRepetitionMinDuration;
+  }
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/NatOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/NatOptions.java
index e622d367b3a..0a93d09a202 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/NatOptions.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/NatOptions.java
@@ -18,6 +18,7 @@
 
 import picocli.CommandLine;
 
+/** The Nat Cli options. */
 public class NatOptions {
 
   @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
@@ -36,14 +37,29 @@ public class NatOptions {
       arity = "1")
   private final Boolean natMethodFallbackEnabled = true;
 
+  /**
+   * Create nat options.
+   *
+   * @return the nat options
+   */
   public static NatOptions create() {
     return new NatOptions();
   }
 
+  /**
+   * Gets nat manager service name.
+   *
+   * @return the nat manager service name
+   */
   public String getNatManagerServiceName() {
     return natManagerServiceName;
   }
 
+  /**
+   * Whether nat method fallback is enabled.
+   *
+   * @return true if enabled, false otherwise.
+   */
   public Boolean getNatMethodFallbackEnabled() {
     return natMethodFallbackEnabled;
   }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/NativeLibraryOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/NativeLibraryOptions.java
index 319e4adfef2..5869aab0da9 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/NativeLibraryOptions.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/NativeLibraryOptions.java
@@ -16,31 +16,87 @@
 
 import picocli.CommandLine;
 
+/** The Native library CLI options. */
 public class NativeLibraryOptions {
 
   @CommandLine.Option(
       hidden = true,
-      names = {"--Xsecp256k1-native-enabled"},
-      description = "Path to PID file (optional)",
+      names = {"--Xsecp-native-enabled", "--Xsecp256k1-native-enabled"},
+      description =
+          "Per default a native library is used for the signature algorithm. "
+              + "If the Java implementation should be used instead, this option must be set to false",
       arity = "1")
-  private final Boolean nativeSecp256k1 = Boolean.TRUE;
+  private final Boolean nativeSecp = Boolean.TRUE;
 
   @CommandLine.Option(
       hidden = true,
       names = {"--Xaltbn128-native-enabled"},
-      description = "Path to PID file (optional)",
+      description =
+          "Per default a native library is used for altbn128. "
+              + "If the Java implementation should be used instead, this option must be set to false",
       arity = "1")
   private final Boolean nativeAltbn128 = Boolean.TRUE;
 
+  @CommandLine.Option(
+      hidden = true,
+      names = {"--Xblake2bf-native-enabled"},
+      description =
+          "Per default a native library is used for blake2bf if present. "
+              + "If the Java implementation should be used instead, this option must be set to false",
+      arity = "1")
+  private final Boolean nativeBlake2bf = Boolean.TRUE;
+
+  @CommandLine.Option(
+      hidden = true,
+      names = {"--Xmodexp-native-enabled"},
+      description =
+          "Per default a native library is used for modexp. "
+              + "If the Java implementation should be used instead, this option must be set to false",
+      arity = "1")
+  private final Boolean nativeModExp = Boolean.TRUE;
+
+  /**
+   * Create native library options.
+   *
+   * @return the native library options
+   */
   public static NativeLibraryOptions create() {
     return new NativeLibraryOptions();
   }
 
-  public Boolean getNativeSecp256k1() {
-    return nativeSecp256k1;
+  /**
+   * Whether native secp is enabled.
+   *
+   * @return true if enabled, false otherwise.
+   */
+  public Boolean getNativeSecp() {
+    return nativeSecp;
   }
 
+  /**
+   * Whether native Altbn128 is enabled.
+   *
+   * @return true if enabled, false otherwise.
+   */
   public Boolean getNativeAltbn128() {
     return nativeAltbn128;
   }
+
+  /**
+   * Whether native blake2bf is enabled.
+   *
+   * @return true if enabled, false otherwise.
+   */
+  public Boolean getNativeBlake2bf() {
+    return nativeBlake2bf;
+  }
+
+  /**
+   * Whether native mod exp is enabled.
+   *
+   * @return true if enabled, false otherwise.
+   */
+  public Boolean getNativeModExp() {
+    return nativeModExp;
+  }
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/NetworkingOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/NetworkingOptions.java
index 630efee2bf3..0ad68e3627b 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/NetworkingOptions.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/NetworkingOptions.java
@@ -14,20 +14,30 @@
  */
 package org.hyperledger.besu.cli.options.unstable;
 
+import org.hyperledger.besu.cli.DefaultCommandValues;
 import org.hyperledger.besu.cli.options.CLIOptions;
 import org.hyperledger.besu.cli.options.OptionParser;
 import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
 
 import picocli.CommandLine;
 
+/** The Networking Cli options. */
 public class NetworkingOptions implements CLIOptions<NetworkingConfiguration> {
+  /** The constant PEER_LOWER_BOUND_FLAG */
+  public static final String PEER_LOWER_BOUND_FLAG = "--Xp2p-peer-lower-bound";
+
   private final String INITIATE_CONNECTIONS_FREQUENCY_FLAG =
       "--Xp2p-initiate-connections-frequency";
   private final String CHECK_MAINTAINED_CONNECTIONS_FREQUENCY_FLAG =
       "--Xp2p-check-maintained-connections-frequency";
+  private final String DNS_DISCOVERY_SERVER_OVERRIDE_FLAG = "--Xp2p-dns-discovery-server";
+  private final String DISCOVERY_PROTOCOL_V5_ENABLED = "--Xv5-discovery-enabled";
+  /** The constant FILTER_ON_ENR_FORK_ID. */
+  public static final String FILTER_ON_ENR_FORK_ID = "--Xfilter-on-enr-fork-id";
 
   @CommandLine.Option(
       names = INITIATE_CONNECTIONS_FREQUENCY_FLAG,
@@ -47,37 +57,92 @@ public class NetworkingOptions implements CLIOptions<NetworkingConfiguration> {
       description =
           "The frequency (in seconds) at which to check maintained connections (default: ${DEFAULT-VALUE})")
   private int checkMaintainedConnectionsFrequencySec =
-      NetworkingConfiguration.DEFAULT_CHECK_MAINTAINED_CONNECTSION_FREQUENCY_SEC;
+      NetworkingConfiguration.DEFAULT_CHECK_MAINTAINED_CONNECTIONS_FREQUENCY_SEC;
+
+  @CommandLine.Option(
+      names = DNS_DISCOVERY_SERVER_OVERRIDE_FLAG,
+      hidden = true,
+      description =
+          "DNS server host to use for doing DNS Discovery of peers, rather than the machine's configured DNS server")
+  private Optional<String> dnsDiscoveryServerOverride = Optional.empty();
+
+  @CommandLine.Option(
+      names = DISCOVERY_PROTOCOL_V5_ENABLED,
+      hidden = true,
+      defaultValue = "false",
+      description = "Whether to enable P2P Discovery Protocol v5 (default: ${DEFAULT-VALUE})")
+  private final Boolean isPeerDiscoveryV5Enabled = false;
+
+  @CommandLine.Option(
+      names = FILTER_ON_ENR_FORK_ID,
+      hidden = true,
+      defaultValue = "false",
+      description = "Whether to enable filtering of peers based on the ENR field ForkId)")
+  private final Boolean filterOnEnrForkId = false;
+
+  @CommandLine.Option(
+      hidden = true,
+      names = PEER_LOWER_BOUND_FLAG,
+      description =
+          "Lower bound on the target number of P2P connections (default: ${DEFAULT-VALUE})")
+  private Integer peerLowerBoundConfig = DefaultCommandValues.DEFAULT_P2P_PEER_LOWER_BOUND;
 
   private NetworkingOptions() {}
 
+  /**
+   * Create networking options.
+   *
+   * @return the networking options
+   */
   public static NetworkingOptions create() {
     return new NetworkingOptions();
   }
 
+  /**
+   * Create networking options from Networking Configuration.
+   *
+   * @param networkingConfig the networking config
+   * @return the networking options
+   */
   public static NetworkingOptions fromConfig(final NetworkingConfiguration networkingConfig) {
     final NetworkingOptions cliOptions = new NetworkingOptions();
     cliOptions.checkMaintainedConnectionsFrequencySec =
         networkingConfig.getCheckMaintainedConnectionsFrequencySec();
     cliOptions.initiateConnectionsFrequencySec =
         networkingConfig.getInitiateConnectionsFrequencySec();
+    cliOptions.dnsDiscoveryServerOverride = networkingConfig.getDnsDiscoveryServerOverride();
+    cliOptions.peerLowerBoundConfig = networkingConfig.getPeerLowerBound();
+
     return cliOptions;
   }
 
   @Override
   public NetworkingConfiguration toDomainObject() {
-    NetworkingConfiguration config = NetworkingConfiguration.create();
+    final NetworkingConfiguration config = NetworkingConfiguration.create();
     config.setCheckMaintainedConnectionsFrequency(checkMaintainedConnectionsFrequencySec);
     config.setInitiateConnectionsFrequency(initiateConnectionsFrequencySec);
+    config.setDnsDiscoveryServerOverride(dnsDiscoveryServerOverride);
+    config.getDiscovery().setDiscoveryV5Enabled(isPeerDiscoveryV5Enabled);
+    config.getDiscovery().setFilterOnEnrForkId(filterOnEnrForkId);
+    config.setPeerLowerBound(peerLowerBoundConfig);
     return config;
   }
 
   @Override
   public List<String> getCLIOptions() {
-    return Arrays.asList(
-        CHECK_MAINTAINED_CONNECTIONS_FREQUENCY_FLAG,
-        OptionParser.format(checkMaintainedConnectionsFrequencySec),
-        INITIATE_CONNECTIONS_FREQUENCY_FLAG,
-        OptionParser.format(initiateConnectionsFrequencySec));
+    final List<String> retval =
+        Arrays.asList(
+            CHECK_MAINTAINED_CONNECTIONS_FREQUENCY_FLAG,
+            OptionParser.format(checkMaintainedConnectionsFrequencySec),
+            INITIATE_CONNECTIONS_FREQUENCY_FLAG,
+            OptionParser.format(initiateConnectionsFrequencySec),
+            PEER_LOWER_BOUND_FLAG,
+            OptionParser.format((peerLowerBoundConfig)));
+
+    if (dnsDiscoveryServerOverride.isPresent()) {
+      retval.add(DNS_DISCOVERY_SERVER_OVERRIDE_FLAG);
+      retval.add(dnsDiscoveryServerOverride.get());
+    }
+    return retval;
   }
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/PkiBlockCreationOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/PkiBlockCreationOptions.java
new file mode 100644
index 00000000000..e3673a1ab8e
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/PkiBlockCreationOptions.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.cli.options.unstable;
+
+import static java.util.Arrays.asList;
+import static org.hyperledger.besu.cli.DefaultCommandValues.MANDATORY_FILE_FORMAT_HELP;
+
+import org.hyperledger.besu.cli.util.CommandLineUtils;
+import org.hyperledger.besu.pki.config.PkiKeyStoreConfiguration;
+
+import java.nio.file.Path;
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import picocli.CommandLine;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.ParameterException;
+
+/** The Pki block creation Cli options. */
+public class PkiBlockCreationOptions {
+
+  /** The pki block creation enabled. */
+  @Option(
+      names = {"--Xpki-block-creation-enabled"},
+      hidden = true,
+      description = "Enable PKI integration (default: ${DEFAULT-VALUE})")
+  Boolean enabled = false;
+
+  /** The Key store type. */
+  @Option(
+      names = {"--Xpki-block-creation-keystore-type"},
+      hidden = true,
+      paramLabel = "<NAME>",
+      description = "PKI service keystore type. Required if PKI Block Creation is enabled.")
+  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"})
+  String keyStoreType = PkiKeyStoreConfiguration.DEFAULT_KEYSTORE_TYPE;
+
+  /** The Key store file. */
+  @Option(
+      names = {"--Xpki-block-creation-keystore-file"},
+      hidden = true,
+      paramLabel = MANDATORY_FILE_FORMAT_HELP,
+      description = "Keystore containing key/certificate for PKI Block Creation.")
+  Path keyStoreFile = null;
+
+  /** The Key store password file. */
+  @Option(
+      names = {"--Xpki-block-creation-keystore-password-file"},
+      hidden = true,
+      paramLabel = MANDATORY_FILE_FORMAT_HELP,
+      description =
+          "File containing password to unlock keystore for PKI Integration. Required if PKI Block Creation is enabled.")
+  Path keyStorePasswordFile = null;
+
+  /** The Certificate alias. */
+  @Option(
+      names = {"--Xpki-block-creation-keystore-certificate-alias"},
+      hidden = true,
+      paramLabel = "<NAME>",
+      description =
+          "Alias of the certificate that will be included in the blocks proposed by this validator.")
+  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"})
+  String certificateAlias = PkiKeyStoreConfiguration.DEFAULT_CERTIFICATE_ALIAS;
+
+  /** The Trust store type. */
+  @Option(
+      names = {"--Xpki-block-creation-truststore-type"},
+      hidden = true,
+      paramLabel = "<NAME>",
+      description = "PKI Integration truststore type.")
+  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"})
+  String trustStoreType = PkiKeyStoreConfiguration.DEFAULT_KEYSTORE_TYPE;
+
+  /** The Trust store file. */
+  @Option(
+      names = {"--Xpki-block-creation-truststore-file"},
+      hidden = true,
+      paramLabel = MANDATORY_FILE_FORMAT_HELP,
+      description = "Truststore containing trusted certificates for PKI Block Creation.")
+  Path trustStoreFile = null;
+
+  /** The Trust store password file. */
+  @Option(
+      names = {"--Xpki-block-creation-truststore-password-file"},
+      hidden = true,
+      paramLabel = MANDATORY_FILE_FORMAT_HELP,
+      description = "File containing password to unlock truststore for PKI Block Creation.")
+  Path trustStorePasswordFile = null;
+
+  /** The Crl file. */
+  @Option(
+      names = {"--Xpki-block-creation-crl-file"},
+      hidden = true,
+      paramLabel = MANDATORY_FILE_FORMAT_HELP,
+      description = "File with all CRLs for PKI Block Creation.")
+  Path crlFile = null;
+
+  /**
+   * As domain config optional.
+   *
+   * @param commandLine the command line
+   * @return the optional
+   */
+  public Optional<PkiKeyStoreConfiguration> asDomainConfig(final CommandLine commandLine) {
+    if (!enabled) {
+      return Optional.empty();
+    }
+
+    if (keyStoreFile == null) {
+      throw new ParameterException(
+          commandLine, "KeyStore file is required when PKI Block Creation is enabled");
+    }
+
+    if (keyStorePasswordFile == null) {
+      throw new ParameterException(
+          commandLine,
+          "File containing password to unlock keystore is required when PKI Block Creation is enabled");
+    }
+
+    return Optional.of(
+        new PkiKeyStoreConfiguration.Builder()
+            .withKeyStoreType(keyStoreType)
+            .withKeyStorePath(keyStoreFile)
+            .withKeyStorePasswordPath(keyStorePasswordFile)
+            .withCertificateAlias(certificateAlias)
+            .withTrustStoreType(trustStoreType)
+            .withTrustStorePath(trustStoreFile)
+            .withTrustStorePasswordPath(trustStorePasswordFile)
+            .withCrlFilePath(crlFile)
+            .build());
+  }
+
+  /**
+   * Check pki block creation options dependencies.
+   *
+   * @param logger the logger
+   * @param commandLine the command line
+   */
+  public void checkPkiBlockCreationOptionsDependencies(
+      final Logger logger, final CommandLine commandLine) {
+    CommandLineUtils.checkOptionDependencies(
+        logger,
+        commandLine,
+        "--Xpki-block-creation-enabled",
+        !enabled,
+        asList(
+            "--Xpki-block-creation-keystore-file", "--Xpki-block-creation-keystore-password-file"));
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/PrivacyPluginOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/PrivacyPluginOptions.java
new file mode 100644
index 00000000000..212d810f9d7
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/PrivacyPluginOptions.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cli.options.unstable;
+
+import static picocli.CommandLine.Option;
+
+/** The Privacy plugin Cli options. */
+public class PrivacyPluginOptions {
+
+  /**
+   * Create privacy plugin options.
+   *
+   * @return the privacy plugin options
+   */
+  public static PrivacyPluginOptions create() {
+    return new PrivacyPluginOptions();
+  }
+
+  @Option(
+      names = "--Xprivacy-plugin-enabled",
+      description =
+          "Enables the use of a plugin to implement your own privacy strategy (default: ${DEFAULT-VALUE})",
+      hidden = true)
+  private final Boolean isPrivacyPluginEnabled = false;
+
+  /**
+   * Is privacy plugin enabled boolean.
+   *
+   * @return the boolean
+   */
+  public boolean isPrivacyPluginEnabled() {
+    return isPrivacyPluginEnabled;
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/RPCOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/RPCOptions.java
index 11a185efb6b..3cb23655a08 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/RPCOptions.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/RPCOptions.java
@@ -18,6 +18,7 @@
 
 import picocli.CommandLine;
 
+/** The Rpc Cli options. */
 public class RPCOptions {
 
   @CommandLine.Option(
@@ -34,14 +35,29 @@ public class RPCOptions {
       arity = "1")
   private final Long wsTimeoutSec = TimeoutOptions.defaultOptions().getTimeoutSeconds();
 
+  /**
+   * Create rpc options.
+   *
+   * @return the rpc options
+   */
   public static RPCOptions create() {
     return new RPCOptions();
   }
 
+  /**
+   * Gets http timeout sec.
+   *
+   * @return the http timeout sec
+   */
   public Long getHttpTimeoutSec() {
     return httpTimeoutSec;
   }
 
+  /**
+   * Gets WebSocket timeout sec.
+   *
+   * @return the WebSocket timeout sec
+   */
   public Long getWsTimeoutSec() {
     return wsTimeoutSec;
   }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/SynchronizerOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/SynchronizerOptions.java
index ed641dcf4f3..8760258fba2 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/SynchronizerOptions.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/SynchronizerOptions.java
@@ -17,6 +17,8 @@
 import org.hyperledger.besu.cli.options.CLIOptions;
 import org.hyperledger.besu.cli.options.OptionParser;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.ImmutableSnapSyncConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncConfiguration;
 
 import java.util.Arrays;
 import java.util.List;
@@ -25,6 +27,7 @@
 import org.apache.tuweni.units.bigints.UInt256;
 import picocli.CommandLine;
 
+/** The Synchronizer Cli options. */
 public class SynchronizerOptions implements CLIOptions<SynchronizerConfiguration.Builder> {
   private static final String BLOCK_PROPAGATION_RANGE_FLAG =
       "--Xsynchronizer-block-propagation-range";
@@ -59,6 +62,33 @@ public class SynchronizerOptions implements CLIOptions<SynchronizerConfiguration
   private static final String WORLD_STATE_TASK_CACHE_SIZE_FLAG =
       "--Xsynchronizer-world-state-task-cache-size";
 
+  private static final String SNAP_PIVOT_BLOCK_WINDOW_VALIDITY_FLAG =
+      "--Xsnapsync-synchronizer-pivot-block-window-validity";
+  private static final String SNAP_PIVOT_BLOCK_DISTANCE_BEFORE_CACHING_FLAG =
+      "--Xsnapsync-synchronizer-pivot-block-distance-before-caching";
+  private static final String SNAP_STORAGE_COUNT_PER_REQUEST_FLAG =
+      "--Xsnapsync-synchronizer-storage-count-per-request";
+  private static final String SNAP_BYTECODE_COUNT_PER_REQUEST_FLAG =
+      "--Xsnapsync-synchronizer-bytecode-count-per-request";
+  private static final String SNAP_TRIENODE_COUNT_PER_REQUEST_FLAG =
+      "--Xsnapsync-synchronizer-trienode-count-per-request";
+
+  private static final String SNAP_FLAT_ACCOUNT_HEALED_COUNT_PER_REQUEST_FLAG =
+      "--Xsnapsync-synchronizer-flat-account-healed-count-per-request";
+
+  private static final String SNAP_FLAT_STORAGE_HEALED_COUNT_PER_REQUEST_FLAG =
+      "--Xsnapsync-synchronizer-flat-slot-healed-count-per-request";
+
+  private static final String SNAP_FLAT_DB_HEALING_ENABLED_FLAG =
+      "--Xsnapsync-synchronizer-flat-db-healing-enabled";
+
+  private static final String CHECKPOINT_POST_MERGE_FLAG = "--Xcheckpoint-post-merge-enabled";
+
+  /**
+   * Parse block propagation range.
+   *
+   * @param arg the range such as -10..30
+   */
   @CommandLine.Option(
       names = BLOCK_PROPAGATION_RANGE_FLAG,
       hidden = true,
@@ -212,12 +242,115 @@ public void parseBlockPropagationRange(final String arg) {
   private int worldStateTaskCacheSize =
       SynchronizerConfiguration.DEFAULT_WORLD_STATE_TASK_CACHE_SIZE;
 
+  @CommandLine.Option(
+      names = SNAP_PIVOT_BLOCK_WINDOW_VALIDITY_FLAG,
+      hidden = true,
+      defaultValue = "126",
+      paramLabel = "<INTEGER>",
+      description =
+          "The size of the pivot block window before having to change it (default: ${DEFAULT-VALUE})")
+  private int snapsyncPivotBlockWindowValidity =
+      SnapSyncConfiguration.DEFAULT_PIVOT_BLOCK_WINDOW_VALIDITY;
+
+  @CommandLine.Option(
+      names = SNAP_PIVOT_BLOCK_DISTANCE_BEFORE_CACHING_FLAG,
+      hidden = true,
+      defaultValue = "60",
+      paramLabel = "<INTEGER>",
+      description =
+          "The distance from the head before loading a pivot block into the cache to have a ready pivot block when the window is finished (default: ${DEFAULT-VALUE})")
+  private int snapsyncPivotBlockDistanceBeforeCaching =
+      SnapSyncConfiguration.DEFAULT_PIVOT_BLOCK_DISTANCE_BEFORE_CACHING;
+
+  @CommandLine.Option(
+      names = SNAP_STORAGE_COUNT_PER_REQUEST_FLAG,
+      hidden = true,
+      defaultValue = "384",
+      paramLabel = "<INTEGER>",
+      description = "Snap sync storage queried per request (default: ${DEFAULT-VALUE})")
+  private int snapsyncStorageCountPerRequest =
+      SnapSyncConfiguration.DEFAULT_STORAGE_COUNT_PER_REQUEST;
+
+  @CommandLine.Option(
+      names = SNAP_BYTECODE_COUNT_PER_REQUEST_FLAG,
+      hidden = true,
+      defaultValue = "84",
+      paramLabel = "<INTEGER>",
+      description = "Snap sync bytecode queried per request (default: ${DEFAULT-VALUE})")
+  private int snapsyncBytecodeCountPerRequest =
+      SnapSyncConfiguration.DEFAULT_BYTECODE_COUNT_PER_REQUEST;
+
+  @CommandLine.Option(
+      names = SNAP_TRIENODE_COUNT_PER_REQUEST_FLAG,
+      hidden = true,
+      defaultValue = "384",
+      paramLabel = "<INTEGER>",
+      description = "Snap sync trie node queried per request (default: ${DEFAULT-VALUE})")
+  private int snapsyncTrieNodeCountPerRequest =
+      SnapSyncConfiguration.DEFAULT_TRIENODE_COUNT_PER_REQUEST;
+
+  @CommandLine.Option(
+      names = SNAP_FLAT_ACCOUNT_HEALED_COUNT_PER_REQUEST_FLAG,
+      hidden = true,
+      defaultValue = "128",
+      paramLabel = "<INTEGER>",
+      description =
+          "Snap sync flat accounts verified and healed per request (default: ${DEFAULT-VALUE})")
+  private int snapsyncFlatAccountHealedCountPerRequest =
+      SnapSyncConfiguration.DEFAULT_LOCAL_FLAT_ACCOUNT_COUNT_TO_HEAL_PER_REQUEST;
+
+  @CommandLine.Option(
+      names = SNAP_FLAT_STORAGE_HEALED_COUNT_PER_REQUEST_FLAG,
+      hidden = true,
+      defaultValue = "1024",
+      paramLabel = "<INTEGER>",
+      description =
+          "Snap sync flat slots verified and healed per request (default: ${DEFAULT-VALUE})")
+  private int snapsyncFlatStorageHealedCountPerRequest =
+      SnapSyncConfiguration.DEFAULT_LOCAL_FLAT_STORAGE_COUNT_TO_HEAL_PER_REQUEST;
+
+  @CommandLine.Option(
+      names = SNAP_FLAT_DB_HEALING_ENABLED_FLAG,
+      hidden = true,
+      defaultValue = "false",
+      paramLabel = "<Boolean>",
+      description = "Snap sync flat db healing enabled (default: ${DEFAULT-VALUE})")
+  private Boolean snapsyncFlatDbHealingEnabled =
+      SnapSyncConfiguration.DEFAULT_IS_FLAT_DB_HEALING_ENABLED;
+
+  @CommandLine.Option(
+      names = {CHECKPOINT_POST_MERGE_FLAG},
+      hidden = true,
+      description = "Enable the sync to start from a post-merge block.")
+  private Boolean checkpointPostMergeSyncEnabled =
+      SynchronizerConfiguration.DEFAULT_CHECKPOINT_POST_MERGE_ENABLED;
+
   private SynchronizerOptions() {}
 
+  /**
+   * Create synchronizer options.
+   *
+   * @return the synchronizer options
+   */
   public static SynchronizerOptions create() {
     return new SynchronizerOptions();
   }
 
+  /**
+   * Flag to know whether the flat db healing feature is enabled or disabled.
+   *
+   * @return true is the flat db healing is enabled
+   */
+  public boolean isSnapsyncFlatDbHealingEnabled() {
+    return snapsyncFlatDbHealingEnabled;
+  }
+
+  /**
+   * Create synchronizer options from Synchronizer Configuration.
+   *
+   * @param config the Synchronizer Configuration
+   * @return the synchronizer options
+   */
   public static SynchronizerOptions fromConfig(final SynchronizerConfiguration config) {
     final SynchronizerOptions options = new SynchronizerOptions();
     options.blockPropagationRange = config.getBlockPropagationRange();
@@ -238,6 +371,23 @@ public static SynchronizerOptions fromConfig(final SynchronizerConfiguration con
     options.worldStateMaxRequestsWithoutProgress = config.getWorldStateMaxRequestsWithoutProgress();
     options.worldStateMinMillisBeforeStalling = config.getWorldStateMinMillisBeforeStalling();
     options.worldStateTaskCacheSize = config.getWorldStateTaskCacheSize();
+    options.snapsyncPivotBlockWindowValidity =
+        config.getSnapSyncConfiguration().getPivotBlockWindowValidity();
+    options.snapsyncPivotBlockDistanceBeforeCaching =
+        config.getSnapSyncConfiguration().getPivotBlockDistanceBeforeCaching();
+    options.snapsyncStorageCountPerRequest =
+        config.getSnapSyncConfiguration().getStorageCountPerRequest();
+    options.snapsyncBytecodeCountPerRequest =
+        config.getSnapSyncConfiguration().getBytecodeCountPerRequest();
+    options.snapsyncTrieNodeCountPerRequest =
+        config.getSnapSyncConfiguration().getTrienodeCountPerRequest();
+    options.snapsyncFlatAccountHealedCountPerRequest =
+        config.getSnapSyncConfiguration().getLocalFlatAccountCountToHealPerRequest();
+    options.snapsyncFlatStorageHealedCountPerRequest =
+        config.getSnapSyncConfiguration().getLocalFlatStorageCountToHealPerRequest();
+    options.snapsyncFlatDbHealingEnabled =
+        config.getSnapSyncConfiguration().isFlatDbHealingEnabled();
+    options.checkpointPostMergeSyncEnabled = config.isCheckpointPostMergeEnabled();
     return options;
   }
 
@@ -260,43 +410,76 @@ public SynchronizerConfiguration.Builder toDomainObject() {
     builder.worldStateMaxRequestsWithoutProgress(worldStateMaxRequestsWithoutProgress);
     builder.worldStateMinMillisBeforeStalling(worldStateMinMillisBeforeStalling);
     builder.worldStateTaskCacheSize(worldStateTaskCacheSize);
+    builder.snapSyncConfiguration(
+        ImmutableSnapSyncConfiguration.builder()
+            .pivotBlockWindowValidity(snapsyncPivotBlockWindowValidity)
+            .pivotBlockDistanceBeforeCaching(snapsyncPivotBlockDistanceBeforeCaching)
+            .storageCountPerRequest(snapsyncStorageCountPerRequest)
+            .bytecodeCountPerRequest(snapsyncBytecodeCountPerRequest)
+            .trienodeCountPerRequest(snapsyncTrieNodeCountPerRequest)
+            .localFlatAccountCountToHealPerRequest(snapsyncFlatAccountHealedCountPerRequest)
+            .localFlatStorageCountToHealPerRequest(snapsyncFlatStorageHealedCountPerRequest)
+            .isFlatDbHealingEnabled(snapsyncFlatDbHealingEnabled)
+            .build());
+    builder.checkpointPostMergeEnabled(checkpointPostMergeSyncEnabled);
+
     return builder;
   }
 
   @Override
   public List<String> getCLIOptions() {
-    return Arrays.asList(
-        BLOCK_PROPAGATION_RANGE_FLAG,
-        OptionParser.format(blockPropagationRange),
-        DOWNLOADER_CHANGE_TARGET_THRESHOLD_BY_HEIGHT_FLAG,
-        OptionParser.format(downloaderChangeTargetThresholdByHeight),
-        DOWNLOADER_CHANGE_TARGET_THRESHOLD_BY_TD_FLAG,
-        OptionParser.format(downloaderChangeTargetThresholdByTd),
-        DOWNLOADER_HEADER_REQUEST_SIZE_FLAG,
-        OptionParser.format(downloaderHeaderRequestSize),
-        DOWNLOADER_CHECKPOINT_TIMEOUTS_PERMITTED_FLAG,
-        OptionParser.format(downloaderCheckpointTimeoutsPermitted),
-        DOWNLOADER_CHAIN_SEGMENT_SIZE_FLAG,
-        OptionParser.format(downloaderChainSegmentSize),
-        DOWNLOADER_PARALLELISM_FLAG,
-        OptionParser.format(downloaderParallelism),
-        TRANSACTIONS_PARALLELISM_FLAG,
-        OptionParser.format(transactionsParallelism),
-        COMPUTATION_PARALLELISM_FLAG,
-        OptionParser.format(computationParallelism),
-        PIVOT_DISTANCE_FROM_HEAD_FLAG,
-        OptionParser.format(fastSyncPivotDistance),
-        FULL_VALIDATION_RATE_FLAG,
-        OptionParser.format(fastSyncFullValidationRate),
-        WORLD_STATE_HASH_COUNT_PER_REQUEST_FLAG,
-        OptionParser.format(worldStateHashCountPerRequest),
-        WORLD_STATE_REQUEST_PARALLELISM_FLAG,
-        OptionParser.format(worldStateRequestParallelism),
-        WORLD_STATE_MAX_REQUESTS_WITHOUT_PROGRESS_FLAG,
-        OptionParser.format(worldStateMaxRequestsWithoutProgress),
-        WORLD_STATE_MIN_MILLIS_BEFORE_STALLING_FLAG,
-        OptionParser.format(worldStateMinMillisBeforeStalling),
-        WORLD_STATE_TASK_CACHE_SIZE_FLAG,
-        OptionParser.format(worldStateTaskCacheSize));
+    List<String> value =
+        Arrays.asList(
+            BLOCK_PROPAGATION_RANGE_FLAG,
+            OptionParser.format(blockPropagationRange),
+            DOWNLOADER_CHANGE_TARGET_THRESHOLD_BY_HEIGHT_FLAG,
+            OptionParser.format(downloaderChangeTargetThresholdByHeight),
+            DOWNLOADER_CHANGE_TARGET_THRESHOLD_BY_TD_FLAG,
+            OptionParser.format(downloaderChangeTargetThresholdByTd),
+            DOWNLOADER_HEADER_REQUEST_SIZE_FLAG,
+            OptionParser.format(downloaderHeaderRequestSize),
+            DOWNLOADER_CHECKPOINT_TIMEOUTS_PERMITTED_FLAG,
+            OptionParser.format(downloaderCheckpointTimeoutsPermitted),
+            DOWNLOADER_CHAIN_SEGMENT_SIZE_FLAG,
+            OptionParser.format(downloaderChainSegmentSize),
+            DOWNLOADER_PARALLELISM_FLAG,
+            OptionParser.format(downloaderParallelism),
+            TRANSACTIONS_PARALLELISM_FLAG,
+            OptionParser.format(transactionsParallelism),
+            COMPUTATION_PARALLELISM_FLAG,
+            OptionParser.format(computationParallelism),
+            PIVOT_DISTANCE_FROM_HEAD_FLAG,
+            OptionParser.format(fastSyncPivotDistance),
+            FULL_VALIDATION_RATE_FLAG,
+            OptionParser.format(fastSyncFullValidationRate),
+            WORLD_STATE_HASH_COUNT_PER_REQUEST_FLAG,
+            OptionParser.format(worldStateHashCountPerRequest),
+            WORLD_STATE_REQUEST_PARALLELISM_FLAG,
+            OptionParser.format(worldStateRequestParallelism),
+            WORLD_STATE_MAX_REQUESTS_WITHOUT_PROGRESS_FLAG,
+            OptionParser.format(worldStateMaxRequestsWithoutProgress),
+            WORLD_STATE_MIN_MILLIS_BEFORE_STALLING_FLAG,
+            OptionParser.format(worldStateMinMillisBeforeStalling),
+            WORLD_STATE_TASK_CACHE_SIZE_FLAG,
+            OptionParser.format(worldStateTaskCacheSize),
+            SNAP_PIVOT_BLOCK_WINDOW_VALIDITY_FLAG,
+            OptionParser.format(snapsyncPivotBlockWindowValidity),
+            SNAP_PIVOT_BLOCK_DISTANCE_BEFORE_CACHING_FLAG,
+            OptionParser.format(snapsyncPivotBlockDistanceBeforeCaching),
+            SNAP_STORAGE_COUNT_PER_REQUEST_FLAG,
+            OptionParser.format(snapsyncStorageCountPerRequest),
+            SNAP_BYTECODE_COUNT_PER_REQUEST_FLAG,
+            OptionParser.format(snapsyncBytecodeCountPerRequest),
+            SNAP_TRIENODE_COUNT_PER_REQUEST_FLAG,
+            OptionParser.format(snapsyncTrieNodeCountPerRequest));
+    if (isSnapsyncFlatDbHealingEnabled()) {
+      value.addAll(
+          Arrays.asList(
+              SNAP_FLAT_ACCOUNT_HEALED_COUNT_PER_REQUEST_FLAG,
+              OptionParser.format(snapsyncFlatAccountHealedCountPerRequest),
+              SNAP_FLAT_STORAGE_HEALED_COUNT_PER_REQUEST_FLAG,
+              OptionParser.format(snapsyncFlatStorageHealedCountPerRequest)));
+    }
+    return value;
   }
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/TransactionPoolOptions.java b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/TransactionPoolOptions.java
index cbfa263af43..e199966c25f 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/TransactionPoolOptions.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/options/unstable/TransactionPoolOptions.java
@@ -23,16 +23,41 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
 
+/** The Transaction pool Cli options. */
 public class TransactionPoolOptions
     implements CLIOptions<ImmutableTransactionPoolConfiguration.Builder> {
+  private static final Logger LOG = LoggerFactory.getLogger(TransactionPoolOptions.class);
+
   private static final String TX_MESSAGE_KEEP_ALIVE_SEC_FLAG =
       "--Xincoming-tx-messages-keep-alive-seconds";
 
   private static final String ETH65_TX_ANNOUNCED_BUFFERING_PERIOD_FLAG =
       "--Xeth65-tx-announced-buffering-period-milliseconds";
 
+  private static final String STRICT_TX_REPLAY_PROTECTION_ENABLED_FLAG =
+      "--strict-tx-replay-protection-enabled";
+
+  private static final String LAYERED_TX_POOL_ENABLED_FLAG = "--Xlayered-tx-pool";
+  private static final String LAYERED_TX_POOL_LAYER_MAX_CAPACITY =
+      "--Xlayered-tx-pool-layer-max-capacity";
+  private static final String LAYERED_TX_POOL_MAX_PRIORITIZED =
+      "--Xlayered-tx-pool-max-prioritized";
+  private static final String LAYERED_TX_POOL_MAX_FUTURE_BY_SENDER =
+      "--Xlayered-tx-pool-max-future-by-sender";
+
+  @CommandLine.Option(
+      names = {STRICT_TX_REPLAY_PROTECTION_ENABLED_FLAG},
+      paramLabel = "<Boolean>",
+      description =
+          "Require transactions submitted via JSON-RPC to use replay protection in accordance with EIP-155 (default: ${DEFAULT-VALUE})",
+      fallbackValue = "true",
+      arity = "0..1")
+  private Boolean strictTxReplayProtectionEnabled = false;
+
   @CommandLine.Option(
       names = {TX_MESSAGE_KEEP_ALIVE_SEC_FLAG},
       paramLabel = "<INTEGER>",
@@ -53,33 +78,107 @@ public class TransactionPoolOptions
   private long eth65TrxAnnouncedBufferingPeriod =
       TransactionPoolConfiguration.ETH65_TRX_ANNOUNCED_BUFFERING_PERIOD.toMillis();
 
+  @CommandLine.Option(
+      names = {LAYERED_TX_POOL_ENABLED_FLAG},
+      paramLabel = "<Boolean>",
+      hidden = true,
+      description = "Enable the Layered Transaction Pool (default: ${DEFAULT-VALUE})",
+      arity = "0..1")
+  private Boolean layeredTxPoolEnabled =
+      TransactionPoolConfiguration.DEFAULT_LAYERED_TX_POOL_ENABLED;
+
+  @CommandLine.Option(
+      names = {LAYERED_TX_POOL_LAYER_MAX_CAPACITY},
+      paramLabel = "<Long>",
+      hidden = true,
+      description =
+          "Max amount of memory space, in bytes, that any layer within the transaction pool could occupy (default: ${DEFAULT-VALUE})",
+      arity = "1")
+  private long layeredTxPoolLayerMaxCapacity =
+      TransactionPoolConfiguration.DEFAULT_PENDING_TRANSACTIONS_LAYER_MAX_CAPACITY_BYTES;
+
+  @CommandLine.Option(
+      names = {LAYERED_TX_POOL_MAX_PRIORITIZED},
+      paramLabel = "<Int>",
+      hidden = true,
+      description =
+          "Max number of pending transactions that are prioritized and thus kept sorted (default: ${DEFAULT-VALUE})",
+      arity = "1")
+  private int layeredTxPoolMaxPrioritized =
+      TransactionPoolConfiguration.DEFAULT_MAX_PRIORITIZED_TRANSACTIONS;
+
+  @CommandLine.Option(
+      names = {LAYERED_TX_POOL_MAX_FUTURE_BY_SENDER},
+      paramLabel = "<Int>",
+      hidden = true,
+      description =
+          "Max number of future pending transactions allowed for a single sender (default: ${DEFAULT-VALUE})",
+      arity = "1")
+  private int layeredTxPoolMaxFutureBySender =
+      TransactionPoolConfiguration.DEFAULT_MAX_FUTURE_BY_SENDER;
+
   private TransactionPoolOptions() {}
 
+  /**
+   * Create transaction pool options.
+   *
+   * @return the transaction pool options
+   */
   public static TransactionPoolOptions create() {
     return new TransactionPoolOptions();
   }
 
+  /**
+   * Create Transaction Pool Options from Transaction Pool Configuration.
+   *
+   * @param config the Transaction Pool Configuration
+   * @return the transaction pool options
+   */
   public static TransactionPoolOptions fromConfig(final TransactionPoolConfiguration config) {
     final TransactionPoolOptions options = TransactionPoolOptions.create();
     options.txMessageKeepAliveSeconds = config.getTxMessageKeepAliveSeconds();
     options.eth65TrxAnnouncedBufferingPeriod =
         config.getEth65TrxAnnouncedBufferingPeriod().toMillis();
+    options.strictTxReplayProtectionEnabled = config.getStrictTransactionReplayProtectionEnabled();
+    options.layeredTxPoolEnabled = config.getLayeredTxPoolEnabled();
+    options.layeredTxPoolLayerMaxCapacity = config.getPendingTransactionsLayerMaxCapacityBytes();
+    options.layeredTxPoolMaxPrioritized = config.getMaxPrioritizedTransactions();
+    options.layeredTxPoolMaxFutureBySender = config.getMaxFutureBySender();
     return options;
   }
 
   @Override
   public ImmutableTransactionPoolConfiguration.Builder toDomainObject() {
+    if (layeredTxPoolEnabled) {
+      LOG.warn(
+          "Layered transaction pool enabled, ignoring settings for "
+              + "--tx-pool-max-size and --tx-pool-limit-by-account-percentage");
+    }
+
     return ImmutableTransactionPoolConfiguration.builder()
+        .strictTransactionReplayProtectionEnabled(strictTxReplayProtectionEnabled)
         .txMessageKeepAliveSeconds(txMessageKeepAliveSeconds)
-        .eth65TrxAnnouncedBufferingPeriod(Duration.ofMillis(eth65TrxAnnouncedBufferingPeriod));
+        .eth65TrxAnnouncedBufferingPeriod(Duration.ofMillis(eth65TrxAnnouncedBufferingPeriod))
+        .layeredTxPoolEnabled(layeredTxPoolEnabled)
+        .pendingTransactionsLayerMaxCapacityBytes(layeredTxPoolLayerMaxCapacity)
+        .maxPrioritizedTransactions(layeredTxPoolMaxPrioritized)
+        .maxFutureBySender(layeredTxPoolMaxFutureBySender);
   }
 
   @Override
   public List<String> getCLIOptions() {
     return Arrays.asList(
+        STRICT_TX_REPLAY_PROTECTION_ENABLED_FLAG + "=" + strictTxReplayProtectionEnabled,
         TX_MESSAGE_KEEP_ALIVE_SEC_FLAG,
         OptionParser.format(txMessageKeepAliveSeconds),
         ETH65_TX_ANNOUNCED_BUFFERING_PERIOD_FLAG,
-        OptionParser.format(eth65TrxAnnouncedBufferingPeriod));
+        OptionParser.format(eth65TrxAnnouncedBufferingPeriod),
+        LAYERED_TX_POOL_ENABLED_FLAG + "=" + layeredTxPoolEnabled,
+        LAYERED_TX_POOL_LAYER_MAX_CAPACITY,
+        OptionParser.format(layeredTxPoolLayerMaxCapacity),
+        LAYERED_TX_POOL_MAX_PRIORITIZED,
+        OptionParser.format(layeredTxPoolMaxPrioritized),
+        LAYERED_TX_POOL_MAX_FUTURE_BY_SENDER,
+        OptionParser.format(layeredTxPoolMaxFutureBySender));
   }
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/presynctasks/PreSynchronizationTask.java b/besu/src/main/java/org/hyperledger/besu/cli/presynctasks/PreSynchronizationTask.java
index 7126013e374..d3da7bf8b28 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/presynctasks/PreSynchronizationTask.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/presynctasks/PreSynchronizationTask.java
@@ -14,14 +14,20 @@
  */
 package org.hyperledger.besu.cli.presynctasks;
 
+import org.hyperledger.besu.Runner;
 import org.hyperledger.besu.cli.BesuCommand;
 import org.hyperledger.besu.controller.BesuController;
 
 /**
  * All PreSynchronizationTask instances execute after the {@link BesuController} instance in {@link
- * BesuCommand} is ready and before {@link BesuCommand#startSynchronization()} is called
+ * BesuCommand}* is ready and before {@link Runner#startEthereumMainLoop()} is called
  */
 public interface PreSynchronizationTask {
 
+  /**
+   * Run.
+   *
+   * @param besuController the besu controller
+   */
   void run(final BesuController besuController);
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/presynctasks/PreSynchronizationTaskRunner.java b/besu/src/main/java/org/hyperledger/besu/cli/presynctasks/PreSynchronizationTaskRunner.java
index b4871a9d44f..eb95ea216b5 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/presynctasks/PreSynchronizationTaskRunner.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/presynctasks/PreSynchronizationTaskRunner.java
@@ -19,14 +19,25 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/** The Pre synchronization task runner. */
 public class PreSynchronizationTaskRunner {
 
   private final List<PreSynchronizationTask> tasks = new ArrayList<>();
 
+  /**
+   * Add task.
+   *
+   * @param task the task
+   */
   public void addTask(final PreSynchronizationTask task) {
     tasks.add(task);
   }
 
+  /**
+   * Run tasks.
+   *
+   * @param besuController the besu controller
+   */
   public void runTasks(final BesuController besuController) {
     tasks.forEach(t -> t.run(besuController));
   }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/presynctasks/PrivateDatabaseMigrationPreSyncTask.java b/besu/src/main/java/org/hyperledger/besu/cli/presynctasks/PrivateDatabaseMigrationPreSyncTask.java
index 2d82b83f904..b310a49a744 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/presynctasks/PrivateDatabaseMigrationPreSyncTask.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/presynctasks/PrivateDatabaseMigrationPreSyncTask.java
@@ -19,11 +19,18 @@
 import org.hyperledger.besu.ethereum.privacy.storage.migration.PrivateStorageMigrationService;
 import org.hyperledger.besu.util.PrivateStorageMigrationBuilder;
 
+/** The Private database migration pre sync task. */
 public class PrivateDatabaseMigrationPreSyncTask implements PreSynchronizationTask {
 
   private final PrivacyParameters privacyParameters;
   private final boolean migratePrivateDatabaseFlag;
 
+  /**
+   * Instantiates a new Private database migration pre sync task.
+   *
+   * @param privacyParameters the privacy parameters
+   * @param migratePrivateDatabaseFlag the migrate private database flag
+   */
   public PrivateDatabaseMigrationPreSyncTask(
       final PrivacyParameters privacyParameters, final boolean migratePrivateDatabaseFlag) {
     this.privacyParameters = privacyParameters;
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/PasswordSubCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/PasswordSubCommand.java
index 017917b844f..b35cc2f5cfa 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/PasswordSubCommand.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/PasswordSubCommand.java
@@ -19,8 +19,9 @@
 
 import org.hyperledger.besu.cli.BesuCommand;
 import org.hyperledger.besu.cli.subcommands.PasswordSubCommand.HashSubCommand;
+import org.hyperledger.besu.cli.util.VersionProvider;
 
-import java.io.PrintStream;
+import java.io.PrintWriter;
 
 import org.springframework.security.crypto.bcrypt.BCrypt;
 import picocli.CommandLine.Command;
@@ -29,13 +30,16 @@
 import picocli.CommandLine.ParentCommand;
 import picocli.CommandLine.Spec;
 
+/** The Password sub command. */
 @Command(
     name = COMMAND_NAME,
     description = "This command provides password related actions.",
     mixinStandardHelpOptions = true,
+    versionProvider = VersionProvider.class,
     subcommands = {HashSubCommand.class})
 public class PasswordSubCommand implements Runnable {
 
+  /** The constant COMMAND_NAME. */
   public static final String COMMAND_NAME = "password";
 
   @SuppressWarnings("unused")
@@ -46,9 +50,14 @@ public class PasswordSubCommand implements Runnable {
   @Spec
   private CommandSpec spec;
 
-  final PrintStream out;
+  private final PrintWriter out;
 
-  public PasswordSubCommand(final PrintStream out) {
+  /**
+   * Instantiates a new Password sub command.
+   *
+   * @param out The PrintWriter where the usage will be reported.
+   */
+  public PasswordSubCommand(final PrintWriter out) {
     this.out = out;
   }
 
@@ -57,10 +66,12 @@ public void run() {
     spec.commandLine().usage(out);
   }
 
+  /** The Hash sub command for password. */
   @Command(
       name = "hash",
       description = "This command generates the hash of a given password.",
-      mixinStandardHelpOptions = true)
+      mixinStandardHelpOptions = true,
+      versionProvider = VersionProvider.class)
   static class HashSubCommand implements Runnable {
 
     @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
@@ -79,7 +90,7 @@ static class HashSubCommand implements Runnable {
     public void run() {
       checkNotNull(parentCommand);
 
-      parentCommand.out.print(BCrypt.hashpw(password, BCrypt.gensalt()));
+      parentCommand.out.println(BCrypt.hashpw(password, BCrypt.gensalt()));
     }
   }
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/PublicKeySubCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/PublicKeySubCommand.java
index d55598d42e4..73916a936ef 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/PublicKeySubCommand.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/PublicKeySubCommand.java
@@ -20,24 +20,28 @@
 
 import org.hyperledger.besu.cli.BesuCommand;
 import org.hyperledger.besu.cli.DefaultCommandValues;
+import org.hyperledger.besu.cli.options.stable.NodePrivateKeyFileOption;
 import org.hyperledger.besu.cli.subcommands.PublicKeySubCommand.AddressSubCommand;
 import org.hyperledger.besu.cli.subcommands.PublicKeySubCommand.ExportSubCommand;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.cli.util.VersionProvider;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.crypto.SignatureAlgorithmType;
 import org.hyperledger.besu.ethereum.core.Util;
 
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
-import java.io.PrintStream;
+import java.io.PrintWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Optional;
-import java.util.function.Supplier;
+import java.util.function.Function;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import picocli.CommandLine;
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Model.CommandSpec;
 import picocli.CommandLine.Option;
 import picocli.CommandLine.ParentCommand;
@@ -48,10 +52,12 @@
     name = COMMAND_NAME,
     description = "This command provides node public key related actions.",
     mixinStandardHelpOptions = true,
+    versionProvider = VersionProvider.class,
     subcommands = {ExportSubCommand.class, AddressSubCommand.class})
 public class PublicKeySubCommand implements Runnable {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PublicKeySubCommand.class);
 
+  /** The constant COMMAND_NAME. */
   public static final String COMMAND_NAME = "public-key";
 
   @SuppressWarnings("unused")
@@ -62,12 +68,15 @@ public class PublicKeySubCommand implements Runnable {
   @Spec
   private CommandSpec spec; // Picocli injects reference to command spec
 
-  private final PrintStream out;
-  private final Supplier<NodeKey> nodeKey;
+  private final PrintWriter out;
 
-  public PublicKeySubCommand(final PrintStream out, final Supplier<NodeKey> nodeKey) {
+  /**
+   * Instantiates a new Public key sub command.
+   *
+   * @param out the out
+   */
+  public PublicKeySubCommand(final PrintWriter out) {
     this.out = out;
-    this.nodeKey = nodeKey;
   }
 
   @Override
@@ -75,10 +84,6 @@ public void run() {
     spec.commandLine().usage(out);
   }
 
-  private NodeKey getNodeKey() {
-    return nodeKey.get();
-  }
-
   /**
    * Public key export sub-command
    *
@@ -90,8 +95,9 @@ private NodeKey getNodeKey() {
   @Command(
       name = "export",
       description = "This command outputs the node public key. Default output is standard output.",
-      mixinStandardHelpOptions = true)
-  static class ExportSubCommand implements Runnable {
+      mixinStandardHelpOptions = true,
+      versionProvider = VersionProvider.class)
+  static class ExportSubCommand extends KeyPairSubcommand implements Runnable {
 
     @Option(
         names = "--to",
@@ -100,33 +106,10 @@ static class ExportSubCommand implements Runnable {
         arity = "1..1")
     private final File publicKeyExportFile = null;
 
-    @SuppressWarnings("unused")
-    @ParentCommand
-    private PublicKeySubCommand parentCommand; // Picocli injects reference to parent command
-
     @Override
     public void run() {
-      checkNotNull(parentCommand);
-      checkNotNull(parentCommand.parentCommand);
-
-      final NodeKey nodeKey = parentCommand.getNodeKey();
-      Optional.ofNullable(nodeKey).ifPresent(this::outputPublicKey);
-    }
-
-    private void outputPublicKey(final NodeKey nodeKey) {
-      // if we have an output file defined, print to it
-      // otherwise print to standard output.
-      if (publicKeyExportFile != null) {
-        final Path path = publicKeyExportFile.toPath();
-
-        try (final BufferedWriter fileWriter = Files.newBufferedWriter(path, UTF_8)) {
-          fileWriter.write(nodeKey.getPublicKey().toString());
-        } catch (final IOException e) {
-          LOG.error("An error occurred while trying to write the public key", e);
-        }
-      } else {
-        parentCommand.out.println(nodeKey.getPublicKey().toString());
-      }
+      configureEcCurve(ecCurve, parentCommand.spec.commandLine());
+      run(publicKeyExportFile, keyPair -> keyPair.getPublicKey().toString());
     }
   }
 
@@ -143,8 +126,9 @@ private void outputPublicKey(final NodeKey nodeKey) {
       description =
           "This command outputs the node's account address. "
               + "Default output is standard output.",
-      mixinStandardHelpOptions = true)
-  static class AddressSubCommand implements Runnable {
+      mixinStandardHelpOptions = true,
+      versionProvider = VersionProvider.class)
+  static class AddressSubCommand extends KeyPairSubcommand implements Runnable {
 
     @Option(
         names = "--to",
@@ -153,34 +137,88 @@ static class AddressSubCommand implements Runnable {
         arity = "1..1")
     private final File addressExportFile = null;
 
+    @Override
+    public void run() {
+      configureEcCurve(ecCurve, parentCommand.spec.commandLine());
+      run(addressExportFile, keyPair -> Util.publicKeyToAddress(keyPair.getPublicKey()).toString());
+    }
+  }
+
+  private static class KeyPairSubcommand {
+
+    /** The Parent command. */
     @SuppressWarnings("unused")
     @ParentCommand
-    private PublicKeySubCommand parentCommand; // Picocli injects reference to parent command
+    protected PublicKeySubCommand parentCommand; // Picocli injects reference to parent command
 
-    @Override
-    public void run() {
-      checkNotNull(parentCommand);
-      checkNotNull(parentCommand.parentCommand);
+    @Mixin private final NodePrivateKeyFileOption nodePrivateKeyFileOption = null;
 
-      final NodeKey nodeKey = parentCommand.getNodeKey();
-      Optional.ofNullable(nodeKey).ifPresent(this::outputAddress);
-    }
+    /** The Ec curve. */
+    @Option(
+        names = "--ec-curve",
+        paramLabel = "<NAME>",
+        description =
+            "Elliptic curve to use when creating a new key (default: "
+                + SignatureAlgorithmType.DEFAULT_EC_CURVE_NAME
+                + ")",
+        arity = "0..1")
+    @SuppressWarnings("FieldCanBeFinal")
+    protected String ecCurve = null;
+
+    @Spec private final CommandSpec spec = null;
+
+    /**
+     * Run.
+     *
+     * @param exportFile the export file
+     * @param outputFunction the output function
+     */
+    protected final void run(
+        final File exportFile, final Function<KeyPair, String> outputFunction) {
+      checkNotNull(parentCommand);
+      final BesuCommand besuCommand = parentCommand.parentCommand;
+      checkNotNull(besuCommand);
 
-    private void outputAddress(final NodeKey nodeKey) {
-      final Address address = Util.publicKeyToAddress(nodeKey.getPublicKey());
+      final File nodePrivateKeyFile = nodePrivateKeyFileOption.getNodePrivateKeyFile();
+      if (nodePrivateKeyFile != null && !nodePrivateKeyFile.exists()) {
+        throw new CommandLine.ParameterException(
+            spec.commandLine(), "Private key file doesn't exist");
+      }
 
-      // if we have an output file defined, print to it
-      // otherwise print to standard output.
-      if (addressExportFile != null) {
-        final Path path = addressExportFile.toPath();
+      final KeyPair keyPair;
+      try {
+        keyPair = besuCommand.loadKeyPair(nodePrivateKeyFileOption.getNodePrivateKeyFile());
+      } catch (IllegalArgumentException e) {
+        throw new CommandLine.ParameterException(
+            spec.commandLine(), "Private key cannot be loaded from file", e);
+      }
+      final String output = outputFunction.apply(keyPair);
+      if (exportFile != null) {
+        final Path path = exportFile.toPath();
 
         try (final BufferedWriter fileWriter = Files.newBufferedWriter(path, UTF_8)) {
-          fileWriter.write(address.toString());
+          fileWriter.write(output);
         } catch (final IOException e) {
-          LOG.error("An error occurred while trying to write the account address", e);
+          LOG.error("An error occurred while trying to write to output file", e);
         }
       } else {
-        parentCommand.out.println(address.toString());
+        parentCommand.out.println(output);
+      }
+    }
+
+    /**
+     * Configure ec curve.
+     *
+     * @param ecCurve the ec curve
+     * @param commandLine the command line
+     */
+    protected static void configureEcCurve(final String ecCurve, final CommandLine commandLine) {
+      if (ecCurve != null) {
+        try {
+          SignatureAlgorithmFactory.setInstance(SignatureAlgorithmType.create(ecCurve));
+        } catch (IllegalArgumentException e) {
+          throw new CommandLine.ParameterException(commandLine, e.getMessage(), e);
+        }
       }
     }
   }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/RetestethSubCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/RetestethSubCommand.java
index 40cd93e6c53..36fe7ffab42 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/RetestethSubCommand.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/RetestethSubCommand.java
@@ -19,29 +19,34 @@
 import org.hyperledger.besu.BesuInfo;
 import org.hyperledger.besu.cli.DefaultCommandValues;
 import org.hyperledger.besu.cli.custom.JsonRPCAllowlistHostsProperty;
+import org.hyperledger.besu.cli.options.stable.LoggingLevelOption;
+import org.hyperledger.besu.cli.util.VersionProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
 import org.hyperledger.besu.ethereum.retesteth.RetestethConfiguration;
 import org.hyperledger.besu.ethereum.retesteth.RetestethService;
+import org.hyperledger.besu.util.LogConfigurator;
 
 import java.net.InetAddress;
 import java.nio.file.Path;
 
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.config.Configurator;
-import picocli.CommandLine;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Option;
 
+/** Subcommand to run a Retesteth compatible server for reference tests. */
 @Command(
     name = COMMAND_NAME,
     description = "Run a Retesteth compatible server for reference tests.",
-    mixinStandardHelpOptions = true)
+    mixinStandardHelpOptions = true,
+    versionProvider = VersionProvider.class)
+@SuppressWarnings("unused")
 public class RetestethSubCommand implements Runnable {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(RetestethSubCommand.class);
 
+  /** The constant COMMAND_NAME. */
   public static final String COMMAND_NAME = "retesteth";
 
   /**
@@ -51,18 +56,13 @@ public class RetestethSubCommand implements Runnable {
    */
   public static final int RETESTETH_PORT = 47710;
 
-  @CommandLine.Option(
+  @Option(
       names = {"--data-path"},
       paramLabel = DefaultCommandValues.MANDATORY_PATH_FORMAT_HELP,
       description = "The path to Besu data directory (default: ${DEFAULT-VALUE})")
   private final Path dataPath = DefaultCommandValues.getDefaultBesuDataPath(this);
 
-  @Option(
-      names = {"--logging", "-l"},
-      paramLabel = "<LOG VERBOSITY LEVEL>",
-      description =
-          "Logging verbosity levels: OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE, ALL (default: ${DEFAULT-VALUE})")
-  private final Level logLevel = LogManager.getRootLogger().getLevel();
+  @Mixin private LoggingLevelOption loggingLevelOption;
 
   @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
   @Option(
@@ -105,9 +105,10 @@ private InetAddress autoDiscoverDefaultIP() {
 
   private void prepareLogging() {
     // set log level per CLI flags
+    final String logLevel = loggingLevelOption.getLogLevel();
     if (logLevel != null) {
-      System.out.println("Setting logging level to " + logLevel.name());
-      Configurator.setAllLevels("", logLevel);
+      System.out.println("Setting logging level to " + logLevel);
+      LogConfigurator.setLevel("", logLevel);
     }
   }
 
@@ -130,7 +131,7 @@ public void run() {
                 () -> {
                   try {
                     retestethService.close();
-                    LogManager.shutdown();
+                    LogConfigurator.shutdown();
                   } catch (final Exception e) {
                     LOG.error("Failed to stop Besu Retesteth");
                   }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/ValidateConfigSubCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/ValidateConfigSubCommand.java
new file mode 100644
index 00000000000..f34ac97470c
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/ValidateConfigSubCommand.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cli.subcommands;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.hyperledger.besu.cli.subcommands.ValidateConfigSubCommand.COMMAND_NAME;
+
+import org.hyperledger.besu.cli.BesuCommand;
+import org.hyperledger.besu.cli.DefaultCommandValues;
+import org.hyperledger.besu.cli.util.TomlConfigFileDefaultProvider;
+import org.hyperledger.besu.cli.util.VersionProvider;
+
+import java.io.PrintWriter;
+import java.nio.file.Path;
+
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.ParentCommand;
+
+/** The Besu configuration Validate sub command. */
+@Command(
+    name = COMMAND_NAME,
+    description = "This command provides basic Besu config validation (syntax only).",
+    mixinStandardHelpOptions = true,
+    versionProvider = VersionProvider.class)
+public class ValidateConfigSubCommand implements Runnable {
+
+  /** The constant COMMAND_NAME. */
+  public static final String COMMAND_NAME = "validate-config";
+
+  @Option(
+      names = "--config-file",
+      paramLabel = DefaultCommandValues.MANDATORY_PATH_FORMAT_HELP,
+      description = "Path to Besu config file")
+  private final Path dataPath = DefaultCommandValues.getDefaultBesuDataPath(this);
+
+  @SuppressWarnings("unused")
+  @ParentCommand
+  private BesuCommand parentCommand;
+
+  private final PrintWriter out;
+  private final CommandLine commandLine;
+
+  /**
+   * Instantiates a new Validate config sub command.
+   *
+   * @param commandLine the command line
+   * @param out the PrintWriter where validation results will be reported.
+   */
+  public ValidateConfigSubCommand(final CommandLine commandLine, final PrintWriter out) {
+    this.out = out;
+    this.commandLine = commandLine;
+  }
+
+  @Override
+  public void run() {
+    checkNotNull(parentCommand);
+    try {
+      new TomlConfigFileDefaultProvider(commandLine, dataPath.toFile()).loadConfigurationFromFile();
+    } catch (Exception e) {
+      this.out.println(e);
+      return;
+    }
+    this.out.println(
+        "TOML config file is valid on basic inspection. Further dependencies between related options are checked when Besu starts.");
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/blocks/BlockExportFormat.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/blocks/BlockExportFormat.java
index 77acaf842cd..58e62eb6827 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/blocks/BlockExportFormat.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/blocks/BlockExportFormat.java
@@ -14,6 +14,8 @@
  */
 package org.hyperledger.besu.cli.subcommands.blocks;
 
+/** The enum Block export format. */
 public enum BlockExportFormat {
+  /** Rlp block export format. */
   RLP
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/blocks/BlockImportFormat.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/blocks/BlockImportFormat.java
index 38f532cd420..77e58cfb7bd 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/blocks/BlockImportFormat.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/blocks/BlockImportFormat.java
@@ -14,7 +14,10 @@
  */
 package org.hyperledger.besu.cli.subcommands.blocks;
 
+/** The enum Block import format. */
 public enum BlockImportFormat {
+  /** RLP block import format. */
   RLP,
+  /** Json block import format. */
   JSON
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/blocks/BlocksSubCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/blocks/BlocksSubCommand.java
index 2034631d27e..9417aad8f55 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/blocks/BlocksSubCommand.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/blocks/BlocksSubCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -16,6 +16,8 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.hyperledger.besu.cli.subcommands.blocks.BlocksSubCommand.COMMAND_NAME;
+import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_MAX_OMMERS_DEPTH;
+import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_POW_JOB_TTL;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_REMOTE_SEALERS_LIMIT;
 import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_REMOTE_SEALERS_TTL;
 
@@ -26,20 +28,21 @@
 import org.hyperledger.besu.cli.DefaultCommandValues;
 import org.hyperledger.besu.cli.subcommands.blocks.BlocksSubCommand.ExportSubCommand;
 import org.hyperledger.besu.cli.subcommands.blocks.BlocksSubCommand.ImportSubCommand;
+import org.hyperledger.besu.cli.util.VersionProvider;
 import org.hyperledger.besu.controller.BesuController;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.blockcreation.IncrementingNonceGenerator;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.metrics.MetricsService;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.PrintStream;
+import java.io.PrintWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -53,9 +56,9 @@
 import java.util.function.Supplier;
 
 import io.vertx.core.Vertx;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.ExecutionException;
@@ -71,11 +74,13 @@
     name = COMMAND_NAME,
     description = "This command provides blocks related actions.",
     mixinStandardHelpOptions = true,
+    versionProvider = VersionProvider.class,
     subcommands = {ImportSubCommand.class, ExportSubCommand.class})
 public class BlocksSubCommand implements Runnable {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(BlocksSubCommand.class);
 
+  /** The constant COMMAND_NAME. */
   public static final String COMMAND_NAME = "blocks";
 
   @SuppressWarnings("unused")
@@ -90,13 +95,21 @@ public class BlocksSubCommand implements Runnable {
   private final Function<BesuController, JsonBlockImporter> jsonBlockImporterFactory;
   private final Function<Blockchain, RlpBlockExporter> rlpBlockExporterFactory;
 
-  private final PrintStream out;
+  private final PrintWriter out;
 
+  /**
+   * Instantiates a new Blocks sub command.
+   *
+   * @param rlpBlockImporter the RLP block importer
+   * @param jsonBlockImporterFactory the Json block importer factory
+   * @param rlpBlockExporterFactory the RLP block exporter factory
+   * @param out Instance of PrintWriter where command usage will be written.
+   */
   public BlocksSubCommand(
       final Supplier<RlpBlockImporter> rlpBlockImporter,
       final Function<BesuController, JsonBlockImporter> jsonBlockImporterFactory,
       final Function<Blockchain, RlpBlockExporter> rlpBlockExporterFactory,
-      final PrintStream out) {
+      final PrintWriter out) {
     this.rlpBlockImporter = rlpBlockImporter;
     this.rlpBlockExporterFactory = rlpBlockExporterFactory;
     this.jsonBlockImporterFactory = jsonBlockImporterFactory;
@@ -116,7 +129,8 @@ public void run() {
   @Command(
       name = "import",
       description = "This command imports blocks from a file into the database.",
-      mixinStandardHelpOptions = true)
+      mixinStandardHelpOptions = true,
+      versionProvider = VersionProvider.class)
   static class ImportSubCommand implements Runnable {
     @SuppressWarnings("unused")
     @ParentCommand
@@ -188,6 +202,10 @@ public void run() {
       if (blockImportFiles.isEmpty()) {
         throw new ParameterException(spec.commandLine(), "No files specified to import.");
       }
+      if (skipPow && format.equals(BlockImportFormat.JSON)) {
+        throw new ParameterException(
+            spec.commandLine(), "Can't skip proof of work validation for JSON blocks");
+      }
       LOG.info("Import {} block data from {} files", format, blockImportFiles.size());
       final Optional<MetricsService> metricsService = initMetrics(parentCommand);
 
@@ -244,7 +262,7 @@ private BesuController createController() {
             .miningParameters(getMiningParameters())
             .build();
       } catch (final Exception e) {
-        throw new ExecutionException(new CommandLine(parentCommand), e.getMessage(), e);
+        throw new ExecutionException(parentCommand.spec.commandLine(), e.getMessage(), e);
       }
     }
 
@@ -253,19 +271,22 @@ private MiningParameters getMiningParameters() {
       // Extradata and coinbase can be configured on a per-block level via the json file
       final Address coinbase = Address.ZERO;
       final Bytes extraData = Bytes.EMPTY;
-      return new MiningParameters(
-          coinbase,
-          minTransactionGasPrice,
-          extraData,
-          false,
-          false,
-          "0.0.0.0",
-          8008,
-          "080c",
-          Optional.of(new IncrementingNonceGenerator(0)),
-          0.0,
-          DEFAULT_REMOTE_SEALERS_LIMIT,
-          DEFAULT_REMOTE_SEALERS_TTL);
+      return new MiningParameters.Builder()
+          .coinbase(coinbase)
+          .minTransactionGasPrice(minTransactionGasPrice)
+          .extraData(extraData)
+          .miningEnabled(false)
+          .stratumMiningEnabled(false)
+          .stratumNetworkInterface("0.0.0.0")
+          .stratumPort(8008)
+          .stratumExtranonce("080c")
+          .maybeNonceGenerator(new IncrementingNonceGenerator(0))
+          .minBlockOccupancyRatio(0.0)
+          .remoteSealersLimit(DEFAULT_REMOTE_SEALERS_LIMIT)
+          .remoteSealersTimeToLive(DEFAULT_REMOTE_SEALERS_TTL)
+          .powJobTimeToLive(DEFAULT_POW_JOB_TTL)
+          .maxOmmerDepth(DEFAULT_MAX_OMMERS_DEPTH)
+          .build();
     }
 
     private void importJsonBlocks(final BesuController controller, final Path path)
@@ -293,7 +314,8 @@ private void importRlpBlocks(final BesuController controller, final Path path)
   @Command(
       name = "export",
       description = "This command exports a specific block, or list of blocks from storage.",
-      mixinStandardHelpOptions = true)
+      mixinStandardHelpOptions = true,
+      versionProvider = VersionProvider.class)
   static class ExportSubCommand implements Runnable {
     @SuppressWarnings("unused")
     @ParentCommand
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/BackupState.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/BackupState.java
index 63e23c4c2fc..0c5c4c0e32e 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/BackupState.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/BackupState.java
@@ -20,6 +20,7 @@
 import static org.hyperledger.besu.cli.DefaultCommandValues.MANDATORY_LONG_FORMAT_HELP;
 
 import org.hyperledger.besu.BesuInfo;
+import org.hyperledger.besu.cli.util.VersionProvider;
 import org.hyperledger.besu.controller.BesuController;
 import org.hyperledger.besu.ethereum.api.query.StateBackupService;
 import org.hyperledger.besu.ethereum.api.query.StateBackupService.BackupStatus;
@@ -38,10 +39,12 @@
 import picocli.CommandLine.Option;
 import picocli.CommandLine.ParentCommand;
 
+/** Subcommand that performs back up of state and accounts at a specified block */
 @Command(
     name = "x-backup-state",
-    description = "Backups up the state and accounts of a specified block.",
-    mixinStandardHelpOptions = true)
+    description = "Backs up the state and accounts at a specified block.",
+    mixinStandardHelpOptions = true,
+    versionProvider = VersionProvider.class)
 public class BackupState implements Runnable {
 
   @Option(
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/GenerateBlockchainConfig.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/GenerateBlockchainConfig.java
index 6490cd855de..0fe2b2f2cf8 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/GenerateBlockchainConfig.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/GenerateBlockchainConfig.java
@@ -18,11 +18,20 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import org.hyperledger.besu.cli.DefaultCommandValues;
+import org.hyperledger.besu.cli.util.VersionProvider;
+import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.config.GenesisConfigOptions;
 import org.hyperledger.besu.config.JsonGenesisConfigOptions;
 import org.hyperledger.besu.config.JsonUtil;
-import org.hyperledger.besu.consensus.ibft.IbftExtraData;
-import org.hyperledger.besu.crypto.SECP256K1;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.consensus.ibft.IbftExtraDataCodec;
+import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SECPPrivateKey;
+import org.hyperledger.besu.crypto.SECPPublicKey;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.crypto.SignatureAlgorithmType;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.core.Util;
 
 import java.io.File;
@@ -33,26 +42,33 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.IntStream;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.JsonNodeType;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import com.google.common.io.Resources;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 import picocli.CommandLine.ParentCommand;
 
 @Command(
     name = "generate-blockchain-config",
-    description = "Generates node keypairs and genesis file with RLP encoded IBFT 2.0 extra data.",
-    mixinStandardHelpOptions = true)
+    description = "Generates node keypairs and genesis file with RLP encoded extra data.",
+    mixinStandardHelpOptions = true,
+    versionProvider = VersionProvider.class)
 class GenerateBlockchainConfig implements Runnable {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(GenerateBlockchainConfig.class);
+
+  private final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
 
   @Option(
       required = true,
@@ -124,6 +140,7 @@ private void generateBlockchainConfig() {
     try {
       handleOutputDirectory();
       parseConfig();
+      processEcCurve();
       if (generateNodesKeys) {
         generateNodesKeys();
       } else {
@@ -156,8 +173,18 @@ private void importPublicKey(final JsonNode publicKeyJson) {
     final String publicKeyText = publicKeyJson.asText();
 
     try {
-      final SECP256K1.PublicKey publicKey =
-          SECP256K1.PublicKey.create(Bytes.fromHexString(publicKeyText));
+      final SECPPublicKey publicKey =
+          SIGNATURE_ALGORITHM.get().createPublicKey(Bytes.fromHexString(publicKeyText));
+
+      if (!SIGNATURE_ALGORITHM.get().isValidPublicKey(publicKey)) {
+        throw new IllegalArgumentException(
+            new StringBuilder()
+                .append(publicKeyText)
+                .append(" is not a valid public key for elliptic curve ")
+                .append(SIGNATURE_ALGORITHM.get().getCurveName())
+                .toString());
+      }
+
       writeKeypair(publicKey, null);
       LOG.info("Public key imported from configuration.({})", publicKey.toString());
     } catch (final IOException e) {
@@ -180,7 +207,7 @@ private void generateNodesKeys() {
   private void generateNodeKeypair(final int node) {
     try {
       LOG.info("Generating keypair for node {}.", node);
-      final SECP256K1.KeyPair keyPair = SECP256K1.KeyPair.generate();
+      final KeyPair keyPair = SIGNATURE_ALGORITHM.get().generateKeyPair();
       writeKeypair(keyPair.getPublicKey(), keyPair.getPrivateKey());
 
     } catch (final IOException e) {
@@ -196,8 +223,7 @@ private void generateNodeKeypair(final int node) {
    * @param privateKey The private key. No file is created if privateKey is NULL.
    * @throws IOException If the file cannot be written or accessed.
    */
-  private void writeKeypair(
-      final SECP256K1.PublicKey publicKey, final SECP256K1.PrivateKey privateKey)
+  private void writeKeypair(final SECPPublicKey publicKey, final SECPPrivateKey privateKey)
       throws IOException {
     final Address nodeAddress = Util.publicKeyToAddress(publicKey);
     addressesForGenesisExtraData.add(nodeAddress);
@@ -211,13 +237,22 @@ private void writeKeypair(
 
   /** Computes RLP encoded exta data from pre filled list of addresses. */
   private void processExtraData() {
-    final ObjectNode configNode = JsonUtil.getObjectNode(genesisConfig, "config").orElse(null);
+    final ObjectNode configNode =
+        JsonUtil.getObjectNode(genesisConfig, "config")
+            .orElseThrow(
+                () -> new IllegalArgumentException("Missing config section in config file"));
+
     final JsonGenesisConfigOptions genesisConfigOptions =
         JsonGenesisConfigOptions.fromJsonObject(configNode);
     if (genesisConfigOptions.isIbft2()) {
       LOG.info("Generating IBFT extra data.");
       final String extraData =
-          IbftExtraData.fromAddresses(addressesForGenesisExtraData).encode().toString();
+          IbftExtraDataCodec.encodeFromAddresses(addressesForGenesisExtraData).toString();
+      genesisConfig.put("extraData", extraData);
+    } else if (genesisConfigOptions.isQbft()) {
+      LOG.info("Generating QBFT extra data.");
+      final String extraData =
+          QbftExtraDataCodec.encodeFromAddresses(addressesForGenesisExtraData).toString();
       genesisConfig.put("extraData", extraData);
     }
   }
@@ -248,6 +283,27 @@ private void parseConfig() throws IOException {
     generateNodesKeys = JsonUtil.getBoolean(nodesConfig, "generate", false);
   }
 
+  /** Sets the selected signature algorithm instance in SignatureAlgorithmFactory. */
+  private void processEcCurve() {
+    GenesisConfigOptions options = GenesisConfigFile.fromConfig(genesisConfig).getConfigOptions();
+    Optional<String> ecCurve = options.getEcCurve();
+
+    if (ecCurve.isEmpty()) {
+      SignatureAlgorithmFactory.setInstance(SignatureAlgorithmType.createDefault());
+      return;
+    }
+
+    try {
+      SignatureAlgorithmFactory.setInstance(SignatureAlgorithmType.create(ecCurve.get()));
+    } catch (IllegalArgumentException e) {
+      throw new IllegalArgumentException(
+          new StringBuilder()
+              .append("Invalid parameter for ecCurve in genesis config: ")
+              .append(e.getMessage())
+              .toString());
+    }
+  }
+
   /**
    * Checks if the output directory exists.
    *
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/GenerateLogBloomCache.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/GenerateLogBloomCache.java
index 4fe584f922e..c1a813183ff 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/GenerateLogBloomCache.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/GenerateLogBloomCache.java
@@ -21,6 +21,7 @@
 import static org.hyperledger.besu.cli.DefaultCommandValues.MANDATORY_LONG_FORMAT_HELP;
 import static org.hyperledger.besu.ethereum.api.query.cache.TransactionLogBloomCacher.BLOCKS_PER_BLOOM_CACHE;
 
+import org.hyperledger.besu.cli.util.VersionProvider;
 import org.hyperledger.besu.controller.BesuController;
 import org.hyperledger.besu.ethereum.api.query.cache.TransactionLogBloomCacher;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
@@ -33,10 +34,12 @@
 import picocli.CommandLine.Option;
 import picocli.CommandLine.ParentCommand;
 
+/** The generate-log-bloom-cache CLI command. */
 @Command(
     name = "generate-log-bloom-cache",
     description = "Generate cached values of block log bloom filters.",
-    mixinStandardHelpOptions = true)
+    mixinStandardHelpOptions = true,
+    versionProvider = VersionProvider.class)
 public class GenerateLogBloomCache implements Runnable {
 
   @Option(
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/OperatorSubCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/OperatorSubCommand.java
index a91da803ac6..705b8fd9e5e 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/OperatorSubCommand.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/OperatorSubCommand.java
@@ -17,8 +17,9 @@
 import static org.hyperledger.besu.cli.subcommands.operator.OperatorSubCommand.COMMAND_NAME;
 
 import org.hyperledger.besu.cli.BesuCommand;
+import org.hyperledger.besu.cli.util.VersionProvider;
 
-import java.io.PrintStream;
+import java.io.PrintWriter;
 
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Model.CommandSpec;
@@ -30,6 +31,7 @@
     name = COMMAND_NAME,
     description = "Operator related actions such as generating configuration and caches.",
     mixinStandardHelpOptions = true,
+    versionProvider = VersionProvider.class,
     subcommands = {
       GenerateBlockchainConfig.class,
       GenerateLogBloomCache.class,
@@ -38,10 +40,13 @@
     })
 public class OperatorSubCommand implements Runnable {
 
+  /** The constant COMMAND_NAME. */
   public static final String COMMAND_NAME = "operator";
+  /** The constant GENERATE_BLOCKCHAIN_CONFIG_SUBCOMMAND_NAME. */
   public static final String GENERATE_BLOCKCHAIN_CONFIG_SUBCOMMAND_NAME =
       "generate-blockchain-config";
 
+  /** The Parent command. */
   @SuppressWarnings("unused")
   @ParentCommand
   BesuCommand parentCommand; // Picocli injects reference to parent command
@@ -50,9 +55,14 @@ public class OperatorSubCommand implements Runnable {
   @Spec
   private CommandSpec spec; // Picocli injects reference to command spec
 
-  private final PrintStream out;
+  private final PrintWriter out;
 
-  public OperatorSubCommand(final PrintStream out) {
+  /**
+   * Instantiates a new Operator sub command.
+   *
+   * @param out the out
+   */
+  public OperatorSubCommand(final PrintWriter out) {
     this.out = out;
   }
 
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/RestoreState.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/RestoreState.java
index cac9d58ee03..47452b6eb32 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/RestoreState.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/RestoreState.java
@@ -19,15 +19,16 @@
 import static org.hyperledger.besu.cli.DefaultCommandValues.MANDATORY_LONG_FORMAT_HELP;
 import static org.hyperledger.besu.ethereum.trie.CompactEncoding.bytesToPath;
 
+import org.hyperledger.besu.cli.util.VersionProvider;
 import org.hyperledger.besu.config.JsonUtil;
 import org.hyperledger.besu.controller.BesuController;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.query.StateBackupService;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
@@ -47,21 +48,23 @@
 import java.util.List;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 import picocli.CommandLine.ParentCommand;
 
+/** The Restore state subcommand. */
 @Command(
     name = "x-restore-state",
     description = "Restores the chain from a previously generated backup-state.",
-    mixinStandardHelpOptions = true)
+    mixinStandardHelpOptions = true,
+    versionProvider = VersionProvider.class)
 public class RestoreState implements Runnable {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(RestoreState.class);
 
   @Option(
       names = "--backup-path",
@@ -128,7 +131,7 @@ private void restoreBlocks() throws IOException {
             new RollingFileReader(this::receiptFileName, compressed)) {
       final MutableBlockchain blockchain = besuController.getProtocolContext().getBlockchain();
       // target block is "including" the target block, so LE test not LT.
-      for (int i = 0; i <= targetBlock; i++) {
+      for (long i = 0; i <= targetBlock; i++) {
         if (i % 100000 == 0) {
           LOG.info("Loading chain data {} / {}", i, targetBlock);
         }
@@ -142,7 +145,7 @@ private void restoreBlocks() throws IOException {
             BlockHeader.readFrom(
                 new BytesValueRLPInput(Bytes.wrap(headerEntry), false, true), functions);
         final BlockBody body =
-            BlockBody.readFrom(
+            BlockBody.readWrappedBodyFrom(
                 new BytesValueRLPInput(Bytes.wrap(bodyEntry), false, true), functions);
         final RLPInput receiptsRlp = new BytesValueRLPInput(Bytes.wrap(receiptEntry), false, true);
         final int receiptsCount = receiptsRlp.enterList();
@@ -171,7 +174,7 @@ private void restoreAccounts() throws IOException {
 
     try (final RollingFileReader reader =
         new RollingFileReader(this::accountFileName, compressed)) {
-      for (int i = 0; i < accountCount; i++) {
+      for (long i = 0; i < accountCount; i++) {
         if (i % 100000 == 0) {
           LOG.info("Loading account data {} / {}", i, accountCount);
         }
@@ -260,7 +263,7 @@ private void maybeCommitUpdater() {
 
   private void updateCode(final Bytes code) {
     maybeCommitUpdater();
-    updater.putCode(code);
+    updater.putCode(null, code);
   }
 
   private void updateAccountState(final Bytes32 key, final Bytes value) {
@@ -273,7 +276,7 @@ private void updateAccountState(final Bytes32 key, final Bytes value) {
   private void updateAccountStorage(final Bytes32 key, final Bytes value) {
     maybeCommitUpdater();
     // restore by path not supported
-    updater.putAccountStorageTrieNode(null, key, value);
+    updater.putAccountStorageTrieNode(null, null, key, value);
     trieNodeCount++;
   }
 
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/IbftExtraDataCLIAdapter.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/IbftExtraDataCLIAdapter.java
index 4992ef51c43..68d88478df2 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/IbftExtraDataCLIAdapter.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/IbftExtraDataCLIAdapter.java
@@ -14,8 +14,8 @@
  */
 package org.hyperledger.besu.cli.subcommands.rlp;
 
-import org.hyperledger.besu.consensus.ibft.IbftExtraData;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.consensus.ibft.IbftExtraDataCodec;
+import org.hyperledger.besu.datatypes.Address;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -31,17 +31,16 @@
  */
 public class IbftExtraDataCLIAdapter implements JSONToRLP {
   private static final ObjectMapper MAPPER = new ObjectMapper();
-  private static final TypeReference<Collection<String>> TYPE_REF =
-      new TypeReference<Collection<String>>() {};
+  private static final TypeReference<Collection<String>> TYPE_REF = new TypeReference<>() {};
 
   @Override
   public Bytes encode(final String json) throws IOException {
-    return fromJsonAddresses(json).encode();
+    return fromJsonAddresses(json);
   }
 
-  public static IbftExtraData fromJsonAddresses(final String jsonAddresses) throws IOException {
+  private Bytes fromJsonAddresses(final String jsonAddresses) throws IOException {
     final Collection<String> validatorAddresses = MAPPER.readValue(jsonAddresses, TYPE_REF);
-    return IbftExtraData.fromAddresses(
+    return IbftExtraDataCodec.encodeFromAddresses(
         validatorAddresses.stream().map(Address::fromHexString).collect(Collectors.toList()));
   }
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/QbftExtraDataCLIAdapter.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/QbftExtraDataCLIAdapter.java
new file mode 100644
index 00000000000..9caea69d936
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/QbftExtraDataCLIAdapter.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cli.subcommands.rlp;
+
+import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
+import org.hyperledger.besu.datatypes.Address;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.tuweni.bytes.Bytes;
+
+/** Adapter to convert a typed JSON of addresses to a QBFT RLP extra data encoding */
+public class QbftExtraDataCLIAdapter implements JSONToRLP {
+  private static final ObjectMapper MAPPER = new ObjectMapper();
+  private static final TypeReference<Collection<String>> TYPE_REF = new TypeReference<>() {};
+
+  @Override
+  public Bytes encode(final String json) throws IOException {
+    return fromJsonAddresses(json);
+  }
+
+  private Bytes fromJsonAddresses(final String jsonAddresses) throws IOException {
+    final Collection<String> validatorAddresses = MAPPER.readValue(jsonAddresses, TYPE_REF);
+    return QbftExtraDataCodec.encodeFromAddresses(
+        validatorAddresses.stream().map(Address::fromHexString).collect(Collectors.toList()));
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/RLPSubCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/RLPSubCommand.java
index 271da4689c8..834e238987b 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/RLPSubCommand.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/RLPSubCommand.java
@@ -20,13 +20,14 @@
 import org.hyperledger.besu.cli.BesuCommand;
 import org.hyperledger.besu.cli.DefaultCommandValues;
 import org.hyperledger.besu.cli.subcommands.rlp.RLPSubCommand.EncodeSubCommand;
+import org.hyperledger.besu.cli.util.VersionProvider;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.PrintStream;
+import java.io.PrintWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Scanner;
@@ -41,16 +42,19 @@
 import picocli.CommandLine.ParentCommand;
 import picocli.CommandLine.Spec;
 
+/** The RLP sub command. */
 @Command(
     name = RLPSubCommand.COMMAND_NAME,
     description = "This command provides RLP data related actions.",
     mixinStandardHelpOptions = true,
+    versionProvider = VersionProvider.class,
     subcommands = {EncodeSubCommand.class})
 public class RLPSubCommand implements Runnable {
 
+  /** The constant COMMAND_NAME. */
   public static final String COMMAND_NAME = "rlp";
 
-  private final PrintStream out;
+  private final PrintWriter out;
   private final InputStream in;
 
   @SuppressWarnings("unused")
@@ -61,7 +65,13 @@ public class RLPSubCommand implements Runnable {
   @Spec
   private CommandSpec spec;
 
-  public RLPSubCommand(final PrintStream out, final InputStream in) {
+  /**
+   * Instantiates a new Rlp sub command.
+   *
+   * @param out the PrintWriter where the output of subcommand will be reported
+   * @param in the InputStream which will be used to read the input for this subcommand.
+   */
+  public RLPSubCommand(final PrintWriter out, final InputStream in) {
     this.out = out;
     this.in = in;
   }
@@ -79,7 +89,8 @@ public void run() {
   @Command(
       name = "encode",
       description = "This command encodes a JSON typed data into an RLP hex string.",
-      mixinStandardHelpOptions = true)
+      mixinStandardHelpOptions = true,
+      versionProvider = VersionProvider.class)
   static class EncodeSubCommand implements Runnable {
 
     @SuppressWarnings("unused")
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/RLPType.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/RLPType.java
index 0bd6b09385b..d73f1e0fe5b 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/RLPType.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/rlp/RLPType.java
@@ -16,8 +16,11 @@
 
 /** Type of the RLP data to encode/decode */
 public enum RLPType {
+  /** The Ibft extra data. */
   // Enum is used to enable the listing of the possible values in PicoCLI.
-  IBFT_EXTRA_DATA(new IbftExtraDataCLIAdapter());
+  IBFT_EXTRA_DATA(new IbftExtraDataCLIAdapter()),
+  /** The Qbft extra data. */
+  QBFT_EXTRA_DATA(new QbftExtraDataCLIAdapter());
 
   private final JSONToRLP adapter;
 
@@ -26,6 +29,11 @@ public enum RLPType {
     this.adapter = adapter;
   }
 
+  /**
+   * Gets adapter.
+   *
+   * @return the adapter
+   */
   public JSONToRLP getAdapter() {
     return adapter;
   }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/subcommands/storage/StorageSubCommand.java b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/storage/StorageSubCommand.java
new file mode 100644
index 00000000000..f7a1a6eca11
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/cli/subcommands/storage/StorageSubCommand.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cli.subcommands.storage;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.hyperledger.besu.cli.subcommands.storage.StorageSubCommand.COMMAND_NAME;
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.CHAIN_HEAD_HASH;
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.FINALIZED_BLOCK_HASH;
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.FORK_HEADS;
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.SAFE_BLOCK_HASH;
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.SEQ_NO_STORE;
+
+import org.hyperledger.besu.cli.BesuCommand;
+import org.hyperledger.besu.cli.util.VersionProvider;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.storage.StorageProvider;
+import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
+
+import java.io.PrintWriter;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Model.CommandSpec;
+import picocli.CommandLine.ParentCommand;
+import picocli.CommandLine.Spec;
+
+/** The Storage sub command. */
+@Command(
+    name = COMMAND_NAME,
+    description = "This command provides storage related actions.",
+    mixinStandardHelpOptions = true,
+    versionProvider = VersionProvider.class,
+    subcommands = {StorageSubCommand.RevertVariablesStorage.class})
+public class StorageSubCommand implements Runnable {
+
+  /** The constant COMMAND_NAME. */
+  public static final String COMMAND_NAME = "storage";
+
+  @SuppressWarnings("unused")
+  @ParentCommand
+  private BesuCommand parentCommand;
+
+  @SuppressWarnings("unused")
+  @Spec
+  private CommandSpec spec;
+
+  private final PrintWriter out;
+
+  /**
+   * Instantiates a new Storage sub command.
+   *
+   * @param out The PrintWriter where the usage will be reported.
+   */
+  public StorageSubCommand(final PrintWriter out) {
+    this.out = out;
+  }
+
+  @Override
+  public void run() {
+    spec.commandLine().usage(out);
+  }
+
+  /** The Hash sub command for password. */
+  @Command(
+      name = "revert-variables",
+      description = "This command revert the modifications done by the variables storage feature.",
+      mixinStandardHelpOptions = true,
+      versionProvider = VersionProvider.class)
+  static class RevertVariablesStorage implements Runnable {
+    private static final Logger LOG = LoggerFactory.getLogger(RevertVariablesStorage.class);
+    private static final Bytes VARIABLES_PREFIX = Bytes.of(1);
+
+    @SuppressWarnings("unused")
+    @ParentCommand
+    private StorageSubCommand parentCommand;
+
+    @Override
+    public void run() {
+      checkNotNull(parentCommand);
+
+      final var storageProvider = getStorageProvider();
+
+      revert(storageProvider);
+    }
+
+    private StorageProvider getStorageProvider() {
+      return parentCommand.parentCommand.getStorageProvider();
+    }
+
+    private void revert(final StorageProvider storageProvider) {
+      final var variablesStorage = storageProvider.createVariablesStorage();
+      final var blockchainStorage =
+          getStorageProvider().getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.BLOCKCHAIN);
+      final var blockchainUpdater = blockchainStorage.startTransaction();
+      final var variablesUpdater = variablesStorage.updater();
+
+      variablesStorage
+          .getChainHead()
+          .ifPresent(
+              v -> {
+                setBlockchainVariable(
+                    blockchainUpdater, VARIABLES_PREFIX, CHAIN_HEAD_HASH.getBytes(), v);
+                LOG.info("Reverted variable storage for key {}", CHAIN_HEAD_HASH);
+              });
+
+      variablesStorage
+          .getFinalized()
+          .ifPresent(
+              v -> {
+                setBlockchainVariable(
+                    blockchainUpdater, VARIABLES_PREFIX, FINALIZED_BLOCK_HASH.getBytes(), v);
+                LOG.info("Reverted variable storage for key {}", FINALIZED_BLOCK_HASH);
+              });
+
+      variablesStorage
+          .getSafeBlock()
+          .ifPresent(
+              v -> {
+                setBlockchainVariable(
+                    blockchainUpdater, VARIABLES_PREFIX, SAFE_BLOCK_HASH.getBytes(), v);
+                LOG.info("Reverted variable storage for key {}", SAFE_BLOCK_HASH);
+              });
+
+      final var forkHeads = variablesStorage.getForkHeads();
+      if (!forkHeads.isEmpty()) {
+        setBlockchainVariable(
+            blockchainUpdater,
+            VARIABLES_PREFIX,
+            FORK_HEADS.getBytes(),
+            RLP.encode(o -> o.writeList(forkHeads, (val, out) -> out.writeBytes(val))));
+        LOG.info("Reverted variable storage for key {}", FORK_HEADS);
+      }
+
+      variablesStorage
+          .getLocalEnrSeqno()
+          .ifPresent(
+              v -> {
+                setBlockchainVariable(blockchainUpdater, Bytes.EMPTY, SEQ_NO_STORE.getBytes(), v);
+                LOG.info("Reverted variable storage for key {}", SEQ_NO_STORE);
+              });
+
+      variablesUpdater.removeAll();
+
+      variablesUpdater.commit();
+      blockchainUpdater.commit();
+    }
+
+    private void setBlockchainVariable(
+        final KeyValueStorageTransaction blockchainTransaction,
+        final Bytes prefix,
+        final Bytes key,
+        final Bytes value) {
+      blockchainTransaction.put(
+          Bytes.concatenate(prefix, key).toArrayUnsafe(), value.toArrayUnsafe());
+    }
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/util/BesuCommandCustomFactory.java b/besu/src/main/java/org/hyperledger/besu/cli/util/BesuCommandCustomFactory.java
index 32a06d07c4d..f05a960e245 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/util/BesuCommandCustomFactory.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/util/BesuCommandCustomFactory.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.cli.util;
 
-import org.hyperledger.besu.services.PluginVersionsProvider;
+import org.hyperledger.besu.plugin.services.PluginVersionsProvider;
 
 import picocli.CommandLine;
 
@@ -26,6 +26,11 @@ public class BesuCommandCustomFactory implements CommandLine.IFactory {
   private final PluginVersionsProvider pluginVersionsProvider;
   private final CommandLine.IFactory defaultFactory = CommandLine.defaultFactory();
 
+  /**
+   * BesuCommandCustomFactory Constructor
+   *
+   * @param pluginVersionsProvider instance of PluginVersionsProvider
+   */
   public BesuCommandCustomFactory(final PluginVersionsProvider pluginVersionsProvider) {
     this.pluginVersionsProvider = pluginVersionsProvider;
   }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/util/CascadingDefaultProvider.java b/besu/src/main/java/org/hyperledger/besu/cli/util/CascadingDefaultProvider.java
index a84f5a2145f..489d61af95c 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/util/CascadingDefaultProvider.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/util/CascadingDefaultProvider.java
@@ -21,10 +21,19 @@
 import picocli.CommandLine.IDefaultValueProvider;
 import picocli.CommandLine.Model.ArgSpec;
 
+/**
+ * The custom default value provider for Besu CLI options which uses multiple default value
+ * providers such as environment variables or TOML file.
+ */
 public class CascadingDefaultProvider implements IDefaultValueProvider {
 
   private final List<IDefaultValueProvider> defaultValueProviders;
 
+  /**
+   * Instantiates a new Cascading default provider.
+   *
+   * @param defaultValueProviders List of default value providers
+   */
   public CascadingDefaultProvider(final IDefaultValueProvider... defaultValueProviders) {
     this.defaultValueProviders = asList(defaultValueProviders);
   }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/util/CommandLineUtils.java b/besu/src/main/java/org/hyperledger/besu/cli/util/CommandLineUtils.java
index 95268421497..5c191bb4fce 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/util/CommandLineUtils.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/util/CommandLineUtils.java
@@ -20,12 +20,23 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.logging.log4j.Logger;
+import com.google.common.base.Strings;
+import org.slf4j.Logger;
 import picocli.CommandLine;
 
+/** The Command line utils. */
 public class CommandLineUtils {
+  /** The constant DEPENDENCY_WARNING_MSG. */
   public static final String DEPENDENCY_WARNING_MSG =
       "{} has been ignored because {} was not defined on the command line.";
+  /** The constant MULTI_DEPENDENCY_WARNING_MSG. */
+  public static final String MULTI_DEPENDENCY_WARNING_MSG =
+      "{} ignored because none of {} was defined.";
+  /** The constant DEPRECATION_WARNING_MSG. */
+  public static final String DEPRECATION_WARNING_MSG = "{} has been deprecated, use {} instead.";
+  /** The constant DEPRECATED_AND_USELESS_WARNING_MSG. */
+  public static final String DEPRECATED_AND_USELESS_WARNING_MSG =
+      "{} has been deprecated and is now useless, remove it.";
 
   /**
    * Check if options are passed that require an option to be true to have any effect and log a
@@ -51,20 +62,86 @@ public static void checkOptionDependencies(
       final boolean isMainOptionCondition,
       final List<String> dependentOptionsNames) {
     if (isMainOptionCondition) {
-      final String affectedOptions =
-          commandLine.getCommandSpec().options().stream()
-              .filter(
-                  option ->
-                      Arrays.stream(option.names()).anyMatch(dependentOptionsNames::contains)
-                          && !option.stringValues().isEmpty())
-              .map(option -> option.names()[0])
-              .collect(
-                  Collectors.collectingAndThen(
-                      Collectors.toList(), StringUtils.joiningWithLastDelimiter(", ", " and ")));
+      final String affectedOptions = getAffectedOptions(commandLine, dependentOptionsNames);
 
       if (!affectedOptions.isEmpty()) {
         logger.warn(DEPENDENCY_WARNING_MSG, affectedOptions, mainOptionName);
       }
     }
   }
+
+  /**
+   * Check if options are passed that require an option to be true to have any effect and log a
+   * warning with the list of affected options. Multiple main options may be passed to check
+   * dependencies against.
+   *
+   * <p>Note that in future version of PicoCLI some options dependency mechanism may be implemented
+   * that could replace this. See https://github.com/remkop/picocli/issues/295
+   *
+   * @param logger the logger instance used to log the warning
+   * @param commandLine the command line containing the options we want to check display.
+   * @param stringToLog the string that is going to be logged.
+   * @param isMainOptionCondition the conditions to test dependent options against. If all
+   *     conditions are true, dependent options will be checked.
+   * @param dependentOptionsNames a list of option names that can't be used if condition is met.
+   *     Example: if --min-gas-price is in the list and condition is that --miner-enabled should not
+   *     be false, we log a warning.
+   */
+  public static void checkMultiOptionDependencies(
+      final Logger logger,
+      final CommandLine commandLine,
+      final String stringToLog,
+      final List<Boolean> isMainOptionCondition,
+      final List<String> dependentOptionsNames) {
+    if (isMainOptionCondition.stream().allMatch(isTrue -> isTrue)) {
+      final String affectedOptions = getAffectedOptions(commandLine, dependentOptionsNames);
+
+      if (!affectedOptions.isEmpty()) {
+        logger.warn(stringToLog);
+      }
+    }
+  }
+
+  /**
+   * Fail if option doesnt meet requirement.
+   *
+   * @param commandLine the command line
+   * @param errorMessage the error message
+   * @param requirement the requirement
+   * @param dependentOptionsNames the dependent options names
+   */
+  public static void failIfOptionDoesntMeetRequirement(
+      final CommandLine commandLine,
+      final String errorMessage,
+      final boolean requirement,
+      final List<String> dependentOptionsNames) {
+    if (!requirement) {
+      final String affectedOptions = getAffectedOptions(commandLine, dependentOptionsNames);
+
+      if (!affectedOptions.isEmpty()) {
+        throw new CommandLine.ParameterException(commandLine, errorMessage);
+      }
+    }
+  }
+
+  private static String getAffectedOptions(
+      final CommandLine commandLine, final List<String> dependentOptionsNames) {
+    return commandLine.getCommandSpec().options().stream()
+        .filter(option -> Arrays.stream(option.names()).anyMatch(dependentOptionsNames::contains))
+        .filter(CommandLineUtils::isOptionSet)
+        .map(option -> option.names()[0])
+        .collect(
+            Collectors.collectingAndThen(
+                Collectors.toList(), StringUtils.joiningWithLastDelimiter(", ", " and ")));
+  }
+
+  private static boolean isOptionSet(final CommandLine.Model.OptionSpec option) {
+    final CommandLine commandLine = option.command().commandLine();
+    try {
+      return !option.stringValues().isEmpty()
+          || !Strings.isNullOrEmpty(commandLine.getDefaultValueProvider().defaultValue(option));
+    } catch (final Exception e) {
+      return false;
+    }
+  }
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/util/ConfigOptionSearchAndRunHandler.java b/besu/src/main/java/org/hyperledger/besu/cli/util/ConfigOptionSearchAndRunHandler.java
index b1b18ba4d2a..17cf2e649c9 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/util/ConfigOptionSearchAndRunHandler.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/util/ConfigOptionSearchAndRunHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -22,56 +22,97 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import picocli.CommandLine;
-import picocli.CommandLine.AbstractParseResultHandler;
-import picocli.CommandLine.ExecutionException;
 import picocli.CommandLine.IDefaultValueProvider;
+import picocli.CommandLine.IExecutionStrategy;
+import picocli.CommandLine.IParameterExceptionHandler;
 import picocli.CommandLine.Model.OptionSpec;
+import picocli.CommandLine.ParameterException;
 import picocli.CommandLine.ParseResult;
 
-public class ConfigOptionSearchAndRunHandler extends AbstractParseResultHandler<List<Object>> {
-  private final AbstractParseResultHandler<List<Object>> resultHandler;
-  private final CommandLine.IExceptionHandler2<List<Object>> exceptionHandler;
-  private final String configFileOptionName;
+/** Custom Config option search and run handler. */
+public class ConfigOptionSearchAndRunHandler extends CommandLine.RunLast {
+  private final IExecutionStrategy resultHandler;
+  private final IParameterExceptionHandler parameterExceptionHandler;
   private final Map<String, String> environment;
 
+  /**
+   * Instantiates a new Config option search and run handler.
+   *
+   * @param resultHandler the result handler
+   * @param parameterExceptionHandler the parameter exception handler
+   * @param environment the environment variables map
+   */
   public ConfigOptionSearchAndRunHandler(
-      final AbstractParseResultHandler<List<Object>> resultHandler,
-      final CommandLine.IExceptionHandler2<List<Object>> exceptionHandler,
-      final String configFileOptionName,
+      final IExecutionStrategy resultHandler,
+      final IParameterExceptionHandler parameterExceptionHandler,
       final Map<String, String> environment) {
     this.resultHandler = resultHandler;
-    this.exceptionHandler = exceptionHandler;
-    this.configFileOptionName = configFileOptionName;
+    this.parameterExceptionHandler = parameterExceptionHandler;
     this.environment = environment;
-    // use the same output as the regular options handler to ensure that outputs are all going
-    // in the same place. No need to do this for the exception handler as we reuse it directly.
-    this.useOut(resultHandler.out());
   }
 
   @Override
-  public List<Object> handle(final ParseResult parseResult) throws ExecutionException {
-    final CommandLine commandLine = parseResult.asCommandLineList().get(0);
+  public List<Object> handle(final ParseResult parseResult) throws ParameterException {
+    final CommandLine commandLine = parseResult.commandSpec().commandLine();
     final Optional<File> configFile = findConfigFile(parseResult, commandLine);
+    validatePrivacyOptions(parseResult, commandLine);
     commandLine.setDefaultValueProvider(createDefaultValueProvider(commandLine, configFile));
-    commandLine.parseWithHandlers(
-        resultHandler, exceptionHandler, parseResult.originalArgs().toArray(new String[0]));
+    commandLine.setExecutionStrategy(resultHandler);
+    commandLine.setParameterExceptionHandler(parameterExceptionHandler);
+    commandLine.execute(parseResult.originalArgs().toArray(new String[0]));
+
     return new ArrayList<>();
   }
 
+  private void validatePrivacyOptions(
+      final ParseResult parseResult, final CommandLine commandLine) {
+    if (parseResult.hasMatchedOption("--privacy-onchain-groups-enabled")
+        && parseResult.hasMatchedOption("--privacy-flexible-groups-enabled")) {
+      throw new ParameterException(
+          commandLine,
+          "The `--privacy-onchain-groups-enabled` option is deprecated and you should only use `--privacy-flexible-groups-enabled`");
+    }
+  }
+
   private Optional<File> findConfigFile(
       final ParseResult parseResult, final CommandLine commandLine) {
-    if (parseResult.hasMatchedOption(configFileOptionName)) {
-      final OptionSpec configFileOption = parseResult.matchedOption(configFileOptionName);
+    if (parseResult.hasMatchedOption("--config-file")
+        && environment.containsKey("BESU_CONFIG_FILE")) {
+      throw new ParameterException(
+          commandLine,
+          String.format(
+              "TOML file specified using BESU_CONFIG_FILE=%s and --config-file %s",
+              environment.get("BESU_CONFIG_FILE"),
+              parseResult.matchedOption("--config-file").stringValues()));
+    } else if (parseResult.hasMatchedOption("--config-file")) {
+      final OptionSpec configFileOption = parseResult.matchedOption("--config-file");
       try {
         return Optional.of(configFileOption.getter().get());
       } catch (final Exception e) {
-        throw new ExecutionException(commandLine, e.getMessage(), e);
+        throw new ParameterException(commandLine, e.getMessage(), e);
+      }
+    } else if (environment.containsKey("BESU_CONFIG_FILE")) {
+      final File toml = new File(environment.get("BESU_CONFIG_FILE"));
+      if (!toml.exists()) {
+        throw new ParameterException(
+            commandLine,
+            String.format(
+                "TOML file %s specified in environment variable BESU_CONFIG_FILE not found",
+                environment.get("BESU_CONFIG_FILE")));
       }
+      return Optional.of(toml);
     }
 
     return Optional.empty();
   }
 
+  /**
+   * Create default value provider default value provider.
+   *
+   * @param commandLine the command line
+   * @param configFile the config file
+   * @return the default value provider
+   */
   @VisibleForTesting
   IDefaultValueProvider createDefaultValueProvider(
       final CommandLine commandLine, final Optional<File> configFile) {
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/util/EnvironmentVariableDefaultProvider.java b/besu/src/main/java/org/hyperledger/besu/cli/util/EnvironmentVariableDefaultProvider.java
index bb83f74ccb7..674495799ac 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/util/EnvironmentVariableDefaultProvider.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/util/EnvironmentVariableDefaultProvider.java
@@ -24,12 +24,18 @@
 import picocli.CommandLine.Model.ArgSpec;
 import picocli.CommandLine.Model.OptionSpec;
 
+/** The Environment variable default provider used in PicoCli. */
 public class EnvironmentVariableDefaultProvider implements IDefaultValueProvider {
   private static final String ENV_VAR_PREFIX = "BESU_";
   private static final String LEGACY_ENV_VAR_PREFIX = "PANTHEON_";
 
   private final Map<String, String> environment;
 
+  /**
+   * Instantiates a new Environment variable default provider.
+   *
+   * @param environment the environment
+   */
   public EnvironmentVariableDefaultProvider(final Map<String, String> environment) {
     this.environment = environment;
   }
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/util/TomlConfigFileDefaultProvider.java b/besu/src/main/java/org/hyperledger/besu/cli/util/TomlConfigFileDefaultProvider.java
index a254595373a..ec9ee7d593f 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/util/TomlConfigFileDefaultProvider.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/util/TomlConfigFileDefaultProvider.java
@@ -14,12 +14,14 @@
  */
 package org.hyperledger.besu.cli.util;
 
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.datatypes.Wei;
 
 import java.io.File;
 import java.io.IOException;
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -36,12 +38,19 @@
 import picocli.CommandLine.Model.OptionSpec;
 import picocli.CommandLine.ParameterException;
 
+/** The Toml config file default value provider used by PicoCli. */
 public class TomlConfigFileDefaultProvider implements IDefaultValueProvider {
 
   private final CommandLine commandLine;
   private final File configFile;
   private TomlParseResult result;
 
+  /**
+   * Instantiates a new Toml config file default value provider.
+   *
+   * @param commandLine the command line
+   * @param configFile the config file
+   */
   public TomlConfigFileDefaultProvider(final CommandLine commandLine, final File configFile) {
     this.commandLine = commandLine;
     this.configFile = configFile;
@@ -69,11 +78,17 @@ private String getConfigurationValue(final OptionSpec optionSpec) {
     } else if (optionSpec.isMultiValue() || isArray) {
       defaultValue = getListEntryAsString(optionSpec);
     } else if (optionSpec.type().equals(Integer.class) || optionSpec.type().equals(int.class)) {
-      defaultValue = getIntegerEntryAsString(optionSpec);
+      defaultValue = getNumericEntryAsString(optionSpec);
+    } else if (optionSpec.type().equals(Long.class) || optionSpec.type().equals(long.class)) {
+      defaultValue = getNumericEntryAsString(optionSpec);
     } else if (optionSpec.type().equals(Wei.class)) {
-      defaultValue = getIntegerEntryAsString(optionSpec);
+      defaultValue = getNumericEntryAsString(optionSpec);
     } else if (optionSpec.type().equals(BigInteger.class)) {
-      defaultValue = getIntegerEntryAsString(optionSpec);
+      defaultValue = getNumericEntryAsString(optionSpec);
+    } else if (optionSpec.type().equals(Double.class) || optionSpec.type().equals(double.class)) {
+      defaultValue = getNumericEntryAsString(optionSpec);
+    } else if (optionSpec.type().equals(Float.class) || optionSpec.type().equals(float.class)) {
+      defaultValue = getNumericEntryAsString(optionSpec);
     } else { // else will be treated as String
       defaultValue = getEntryAsString(optionSpec);
     }
@@ -89,11 +104,49 @@ private String getEntryAsString(final OptionSpec spec) {
   private Optional<String> getKeyName(final OptionSpec spec) {
     // If any of the names of the option are used as key in the toml results
     // then returns the value of first one.
-    return Arrays.stream(spec.names())
-        // remove leading dashes on option name as we can have "--" or "-" options
-        .map(name -> name.replaceFirst("^-+", ""))
-        .filter(result::contains)
-        .findFirst();
+    Optional<String> keyName =
+        Arrays.stream(spec.names())
+            // remove leading dashes on option name as we can have "--" or "-" options
+            .map(name -> name.replaceFirst("^-+", ""))
+            .filter(result::contains)
+            .findFirst();
+
+    if (keyName.isEmpty()) {
+      // If the base key name doesn't exist in the file it may be under a TOML table heading
+      // e.g. TxPool.tx-pool-max-size
+      keyName = getDottedKeyName(spec);
+    }
+
+    return keyName;
+  }
+
+  /*
+   For all spec names, look to see if any of the TOML keyPathSet entries contain
+   the name. A key path set might look like ["TxPool", "tx-max-pool-size"] where
+   "TxPool" is the TOML table heading (which we ignore) and "tx-max-pool-size" is
+   the name of the option being requested. For a request for "tx-max-pool-size" this
+   function will return "TxPool.tx-max-pool-size" which can then be used directly
+   as a query on the TOML result structure.
+  */
+  private Optional<String> getDottedKeyName(final OptionSpec spec) {
+    List<String> foundNames = new ArrayList<>();
+
+    Arrays.stream(spec.names())
+        .forEach(
+            nextSpecName -> {
+              String specName =
+                  result.keyPathSet().stream()
+                      .filter(option -> option.contains(nextSpecName.replaceFirst("^-+", "")))
+                      .findFirst()
+                      .orElse(new ArrayList<>())
+                      .stream()
+                      .collect(Collectors.joining("."));
+              if (specName.length() > 0) {
+                foundNames.add(specName);
+              }
+            });
+
+    return foundNames.stream().findFirst();
   }
 
   private String getListEntryAsString(final OptionSpec spec) {
@@ -125,11 +178,12 @@ private String getBooleanEntryAsString(final OptionSpec spec) {
     return getKeyName(spec).map(result::getBoolean).map(Object::toString).orElse(null);
   }
 
-  private String getIntegerEntryAsString(final OptionSpec spec) {
-    // return the string representation of the integer value corresponding to the option in toml
-    // file
+  private String getNumericEntryAsString(final OptionSpec spec) {
+    // return the string representation of the numeric value corresponding to the option in toml
+    // file - this works for integer, double, and float
     // or null if not present in the config
-    return getKeyName(spec).map(result::get).map(String::valueOf).orElse(null);
+
+    return getKeyName(spec).map(result::get).map(Object::toString).orElse(null);
   }
 
   private void checkConfigurationValidity() {
@@ -138,7 +192,8 @@ private void checkConfigurationValidity() {
           commandLine, String.format("Unable to read TOML configuration file %s", configFile));
   }
 
-  private void loadConfigurationFromFile() {
+  /** Load configuration from file. */
+  public void loadConfigurationFromFile() {
 
     if (result == null) {
       try {
@@ -170,8 +225,23 @@ private void loadConfigurationFromFile() {
   private void checkUnknownOptions(final TomlParseResult result) {
     final CommandSpec commandSpec = commandLine.getCommandSpec();
 
+    // Besu ignores TOML table headings (e.g. [TxPool]) so we use keyPathSet() and take the
+    // last element in each one. For a TOML parameter that's not defined inside a table, the lists
+    // returned in keyPathSet() will contain a single entry - the config parameter itself. For a
+    // TOML
+    // entry that is in a table the list will contain N entries, the last one being the config
+    // parameter itself.
+    final Set<String> optionsWithoutTables = new HashSet<String>();
+    result.keyPathSet().stream()
+        .forEach(
+            strings -> {
+              optionsWithoutTables.add(strings.get(strings.size() - 1));
+            });
+
+    // Once we've stripped TOML table headings from the lists, we can check that the remaining
+    // options are valid
     final Set<String> unknownOptionsList =
-        result.keySet().stream()
+        optionsWithoutTables.stream()
             .filter(option -> !commandSpec.optionsMap().containsKey("--" + option))
             .collect(Collectors.toSet());
 
diff --git a/besu/src/main/java/org/hyperledger/besu/cli/util/VersionProvider.java b/besu/src/main/java/org/hyperledger/besu/cli/util/VersionProvider.java
index 0f6dff3f809..cad8707bb3f 100644
--- a/besu/src/main/java/org/hyperledger/besu/cli/util/VersionProvider.java
+++ b/besu/src/main/java/org/hyperledger/besu/cli/util/VersionProvider.java
@@ -15,15 +15,21 @@
 package org.hyperledger.besu.cli.util;
 
 import org.hyperledger.besu.BesuInfo;
-import org.hyperledger.besu.services.PluginVersionsProvider;
+import org.hyperledger.besu.plugin.services.PluginVersionsProvider;
 
 import java.util.stream.Stream;
 
 import picocli.CommandLine;
 
+/** The Version provider used by PicoCli to report Besu version on Cli. */
 public class VersionProvider implements CommandLine.IVersionProvider {
   private final PluginVersionsProvider pluginVersionsProvider;
 
+  /**
+   * Instantiates a new Version provider.
+   *
+   * @param pluginVersionsProvider the plugin versions provider
+   */
   public VersionProvider(final PluginVersionsProvider pluginVersionsProvider) {
     this.pluginVersionsProvider = pluginVersionsProvider;
   }
diff --git a/besu/src/main/java/org/hyperledger/besu/components/BesuCommandModule.java b/besu/src/main/java/org/hyperledger/besu/components/BesuCommandModule.java
new file mode 100644
index 00000000000..b418153521d
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/components/BesuCommandModule.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.components;
+
+import org.hyperledger.besu.Besu;
+import org.hyperledger.besu.RunnerBuilder;
+import org.hyperledger.besu.chainexport.RlpBlockExporter;
+import org.hyperledger.besu.chainimport.JsonBlockImporter;
+import org.hyperledger.besu.chainimport.RlpBlockImporter;
+import org.hyperledger.besu.cli.BesuCommand;
+import org.hyperledger.besu.controller.BesuController;
+import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
+
+import java.util.Optional;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+import org.slf4j.Logger;
+
+/**
+ * A dagger module that know how to create the BesuCommand, which collects all configuration
+ * settings.
+ */
+@Module
+public class BesuCommandModule {
+
+  @Provides
+  @Singleton
+  BesuCommand provideBesuCommand(final BesuComponent besuComponent) {
+    final BesuCommand besuCommand =
+        new BesuCommand(
+            besuComponent,
+            RlpBlockImporter::new,
+            JsonBlockImporter::new,
+            RlpBlockExporter::new,
+            new RunnerBuilder(),
+            new BesuController.Builder(),
+            Optional.ofNullable(besuComponent.getBesuPluginContext()).orElse(null),
+            System.getenv());
+    besuCommand.toCommandLine();
+    return besuCommand;
+  }
+
+  @Provides
+  @Singleton
+  MetricsConfiguration provideMetricsConfiguration(final BesuCommand provideFrom) {
+    return provideFrom.metricsConfiguration();
+  }
+
+  @Provides
+  @Named("besuCommandLogger")
+  @Singleton
+  Logger provideBesuCommandLogger() {
+    return Besu.getFirstLogger();
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/components/BesuComponent.java b/besu/src/main/java/org/hyperledger/besu/components/BesuComponent.java
new file mode 100644
index 00000000000..005008ef62b
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/components/BesuComponent.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.components;
+
+import org.hyperledger.besu.cli.BesuCommand;
+import org.hyperledger.besu.ethereum.bonsai.cache.CachedMerkleTrieLoader;
+import org.hyperledger.besu.ethereum.bonsai.cache.CachedMerkleTrieLoaderModule;
+import org.hyperledger.besu.metrics.MetricsSystemModule;
+import org.hyperledger.besu.metrics.ObservableMetricsSystem;
+import org.hyperledger.besu.services.BesuPluginContextImpl;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import dagger.Component;
+import org.slf4j.Logger;
+
+/** An application context that knows how to provide dependencies based on Dagger setup. */
+@Singleton
+@Component(
+    modules = {
+      BesuCommandModule.class,
+      MetricsSystemModule.class,
+      CachedMerkleTrieLoaderModule.class,
+      BesuPluginContextModule.class
+    })
+public interface BesuComponent {
+
+  /**
+   * the configured and parsed representation of the user issued command to run Besu
+   *
+   * @return BesuCommand
+   */
+  BesuCommand getBesuCommand();
+
+  /**
+   * a cached trie node loader
+   *
+   * @return CachedMerkleTrieLoader
+   */
+  CachedMerkleTrieLoader getCachedMerkleTrieLoader();
+
+  /**
+   * a metrics system that is observable by a Prometheus or OTEL metrics collection subsystem
+   *
+   * @return ObservableMetricsSystem
+   */
+  ObservableMetricsSystem getObservableMetricsSystem();
+
+  /**
+   * a Logger specifically configured to provide configuration feedback to users.
+   *
+   * @return Logger
+   */
+  @Named("besuCommandLogger")
+  Logger getBesuCommandLogger();
+
+  /**
+   * Besu plugin context for doing plugin service discovery.
+   *
+   * @return BesuComponent
+   */
+  @Named("besuPluginContext")
+  BesuPluginContextImpl getBesuPluginContext();
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/components/BesuPluginContextModule.java b/besu/src/main/java/org/hyperledger/besu/components/BesuPluginContextModule.java
new file mode 100644
index 00000000000..ddbb4c2a6e0
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/components/BesuPluginContextModule.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.components;
+
+import org.hyperledger.besu.services.BesuPluginContextImpl;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+/** A dagger module that know how to create the BesuPluginContextImpl singleton. */
+@Module
+public class BesuPluginContextModule {
+
+  /**
+   * Creates a BesuPluginContextImpl, used for plugin service discovery.
+   *
+   * @return the BesuPluginContext
+   */
+  @Provides
+  @Named("besuPluginContext")
+  @Singleton
+  public BesuPluginContextImpl provideBesuPluginContext() {
+    return new BesuPluginContextImpl();
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/controller/BesuController.java b/besu/src/main/java/org/hyperledger/besu/controller/BesuController.java
index aa09aa3bc97..bb46003b24b 100644
--- a/besu/src/main/java/org/hyperledger/besu/controller/BesuController.java
+++ b/besu/src/main/java/org/hyperledger/besu/controller/BesuController.java
@@ -14,39 +14,51 @@
  */
 package org.hyperledger.besu.controller;
 
+import static org.hyperledger.besu.ethereum.eth.sync.SyncMode.isCheckpointSync;
+
 import org.hyperledger.besu.cli.config.EthNetworkConfig;
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.config.GenesisConfigOptions;
-import org.hyperledger.besu.crypto.NodeKey;
+import org.hyperledger.besu.config.PowAlgorithm;
+import org.hyperledger.besu.config.QbftConfigOptions;
+import org.hyperledger.besu.cryptoservices.NodeKey;
 import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.methods.JsonRpcMethods;
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
+import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.p2p.config.SubProtocolConfiguration;
+import org.hyperledger.besu.ethereum.storage.StorageProvider;
 
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Besu controller. */
 public class BesuController implements java.io.Closeable {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(BesuController.class);
 
+  /** The constant DATABASE_PATH. */
   public static final String DATABASE_PATH = "database";
+  /** The constant CACHE_PATH. */
   public static final String CACHE_PATH = "caches";
+
   private final ProtocolSchedule protocolSchedule;
   private final ProtocolContext protocolContext;
   private final EthProtocolManager ethProtocolManager;
@@ -63,7 +75,28 @@ public class BesuController implements java.io.Closeable {
   private final MiningParameters miningParameters;
   private final PluginServiceFactory additionalPluginServices;
   private final SyncState syncState;
+  private final EthPeers ethPeers;
+  private final StorageProvider storageProvider;
 
+  /**
+   * Instantiates a new Besu controller.
+   *
+   * @param protocolSchedule the protocol schedule
+   * @param protocolContext the protocol context
+   * @param ethProtocolManager the eth protocol manager
+   * @param genesisConfigOptions the genesis config options
+   * @param subProtocolConfiguration the sub protocol configuration
+   * @param synchronizer the synchronizer
+   * @param syncState the sync state
+   * @param transactionPool the transaction pool
+   * @param miningCoordinator the mining coordinator
+   * @param privacyParameters the privacy parameters
+   * @param miningParameters the mining parameters
+   * @param additionalJsonRpcMethodsFactory the additional json rpc methods factory
+   * @param nodeKey the node key
+   * @param closeables the closeables
+   * @param additionalPluginServices the additional plugin services
+   */
   BesuController(
       final ProtocolSchedule protocolSchedule,
       final ProtocolContext protocolContext,
@@ -79,7 +112,9 @@ public class BesuController implements java.io.Closeable {
       final JsonRpcMethods additionalJsonRpcMethodsFactory,
       final NodeKey nodeKey,
       final List<Closeable> closeables,
-      final PluginServiceFactory additionalPluginServices) {
+      final PluginServiceFactory additionalPluginServices,
+      final EthPeers ethPeers,
+      final StorageProvider storageProvider) {
     this.protocolSchedule = protocolSchedule;
     this.protocolContext = protocolContext;
     this.ethProtocolManager = ethProtocolManager;
@@ -95,44 +130,109 @@ public class BesuController implements java.io.Closeable {
     this.closeables = closeables;
     this.miningParameters = miningParameters;
     this.additionalPluginServices = additionalPluginServices;
+    this.ethPeers = ethPeers;
+    this.storageProvider = storageProvider;
   }
 
+  /**
+   * Gets protocol context.
+   *
+   * @return the protocol context
+   */
   public ProtocolContext getProtocolContext() {
     return protocolContext;
   }
 
+  /**
+   * Gets protocol schedule.
+   *
+   * @return the protocol schedule
+   */
   public ProtocolSchedule getProtocolSchedule() {
     return protocolSchedule;
   }
 
+  /**
+   * Gets protocol manager.
+   *
+   * @return the protocol manager
+   */
   public EthProtocolManager getProtocolManager() {
     return ethProtocolManager;
   }
 
+  /**
+   * Gets genesis config options.
+   *
+   * @return the genesis config options
+   */
   public GenesisConfigOptions getGenesisConfigOptions() {
     return genesisConfigOptions;
   }
 
+  /**
+   * Gets synchronizer.
+   *
+   * @return the synchronizer
+   */
   public Synchronizer getSynchronizer() {
     return synchronizer;
   }
 
+  /**
+   * Gets sub protocol configuration.
+   *
+   * @return the sub protocol configuration
+   */
   public SubProtocolConfiguration getSubProtocolConfiguration() {
     return subProtocolConfiguration;
   }
 
+  /**
+   * Gets node key.
+   *
+   * @return the node key
+   */
   public NodeKey getNodeKey() {
     return nodeKey;
   }
 
+  /**
+   * Gets transaction pool.
+   *
+   * @return the transaction pool
+   */
   public TransactionPool getTransactionPool() {
     return transactionPool;
   }
 
+  /**
+   * Gets mining coordinator.
+   *
+   * @return the mining coordinator
+   */
   public MiningCoordinator getMiningCoordinator() {
     return miningCoordinator;
   }
 
+  /**
+   * get the collection of eth peers
+   *
+   * @return the EthPeers collection
+   */
+  public EthPeers getEthPeers() {
+    return ethPeers;
+  }
+
+  /**
+   * Get the storage provider
+   *
+   * @return the storage provider
+   */
+  public StorageProvider getStorageProvider() {
+    return storageProvider;
+  }
+
   @Override
   public void close() {
     closeables.forEach(this::tryClose);
@@ -141,68 +241,187 @@ public void close() {
   private void tryClose(final Closeable closeable) {
     try {
       closeable.close();
-    } catch (IOException e) {
+    } catch (final IOException e) {
       LOG.error("Unable to close resource.", e);
     }
   }
 
+  /**
+   * Gets privacy parameters.
+   *
+   * @return the privacy parameters
+   */
   public PrivacyParameters getPrivacyParameters() {
     return privacyParameters;
   }
 
+  /**
+   * Gets mining parameters.
+   *
+   * @return the mining parameters
+   */
   public MiningParameters getMiningParameters() {
     return miningParameters;
   }
 
+  /**
+   * Gets additional json rpc methods.
+   *
+   * @param enabledRpcApis the enabled rpc apis
+   * @return the additional json rpc methods
+   */
   public Map<String, JsonRpcMethod> getAdditionalJsonRpcMethods(
-      final Collection<RpcApi> enabledRpcApis) {
+      final Collection<String> enabledRpcApis) {
     return additionalJsonRpcMethodsFactory.create(enabledRpcApis);
   }
 
+  /**
+   * Gets sync state.
+   *
+   * @return the sync state
+   */
   public SyncState getSyncState() {
     return syncState;
   }
 
+  /**
+   * Gets additional plugin services.
+   *
+   * @return the additional plugin services
+   */
   public PluginServiceFactory getAdditionalPluginServices() {
     return additionalPluginServices;
   }
 
+  /** The type Builder. */
   public static class Builder {
 
-    public BesuControllerBuilder fromEthNetworkConfig(final EthNetworkConfig ethNetworkConfig) {
-      return fromEthNetworkConfig(ethNetworkConfig, Collections.emptyMap());
-    }
-
+    /**
+     * From eth network config besu controller builder.
+     *
+     * @param ethNetworkConfig the eth network config
+     * @param genesisConfigOverrides the genesis config overrides
+     * @param syncMode The sync mode
+     * @return the besu controller builder
+     */
     public BesuControllerBuilder fromEthNetworkConfig(
-        final EthNetworkConfig ethNetworkConfig, final Map<String, String> genesisConfigOverrides) {
+        final EthNetworkConfig ethNetworkConfig,
+        final Map<String, String> genesisConfigOverrides,
+        final SyncMode syncMode) {
       return fromGenesisConfig(
               GenesisConfigFile.fromConfig(ethNetworkConfig.getGenesisConfig()),
-              genesisConfigOverrides)
+              genesisConfigOverrides,
+              syncMode)
           .networkId(ethNetworkConfig.getNetworkId());
     }
 
-    public BesuControllerBuilder fromGenesisConfig(final GenesisConfigFile genesisConfig) {
-      return fromGenesisConfig(genesisConfig, Collections.emptyMap());
+    /**
+     * From genesis config besu controller builder.
+     *
+     * @param genesisConfig the genesis config
+     * @param syncMode The Sync Mode
+     * @return the besu controller builder
+     */
+    public BesuControllerBuilder fromGenesisConfig(
+        final GenesisConfigFile genesisConfig, final SyncMode syncMode) {
+      return fromGenesisConfig(genesisConfig, Collections.emptyMap(), syncMode);
     }
 
+    /**
+     * From genesis config besu controller builder.
+     *
+     * @param genesisConfig the genesis config
+     * @param genesisConfigOverrides the genesis config overrides
+     * @return the besu controller builder
+     */
     BesuControllerBuilder fromGenesisConfig(
-        final GenesisConfigFile genesisConfig, final Map<String, String> genesisConfigOverrides) {
+        final GenesisConfigFile genesisConfig,
+        final Map<String, String> genesisConfigOverrides,
+        final SyncMode syncMode) {
       final GenesisConfigOptions configOptions =
           genesisConfig.getConfigOptions(genesisConfigOverrides);
       final BesuControllerBuilder builder;
 
-      if (configOptions.isEthHash()) {
+      if (configOptions.isConsensusMigration()) {
+        return createConsensusScheduleBesuControllerBuilder(genesisConfig, configOptions);
+      }
+
+      if (configOptions.getPowAlgorithm() != PowAlgorithm.UNSUPPORTED) {
         builder = new MainnetBesuControllerBuilder();
       } else if (configOptions.isIbft2()) {
         builder = new IbftBesuControllerBuilder();
       } else if (configOptions.isIbftLegacy()) {
-        builder = new IbftLegacyBesuControllerBuilder();
+        throw new IllegalStateException(
+            "IBFT1 (legacy) is no longer supported. Consider using IBFT2 or QBFT.");
+      } else if (configOptions.isQbft()) {
+        builder = new QbftBesuControllerBuilder();
       } else if (configOptions.isClique()) {
         builder = new CliqueBesuControllerBuilder();
       } else {
         throw new IllegalArgumentException("Unknown consensus mechanism defined");
       }
-      return builder.genesisConfigFile(genesisConfig);
+
+      // wrap with TransitionBesuControllerBuilder if we have a terminal total difficulty:
+      if (configOptions.getTerminalTotalDifficulty().isPresent()) {
+        // Enable start with vanilla MergeBesuControllerBuilder for PoS checkpoint block
+        if (isCheckpointSync(syncMode) && isCheckpointPoSBlock(configOptions)) {
+          return new MergeBesuControllerBuilder().genesisConfigFile(genesisConfig);
+        } else {
+          // TODO this should be changed to vanilla MergeBesuControllerBuilder and the Transition*
+          // series of classes removed after we successfully transition to PoS
+          // https://github.com/hyperledger/besu/issues/2897
+          return new TransitionBesuControllerBuilder(builder, new MergeBesuControllerBuilder())
+              .genesisConfigFile(genesisConfig);
+        }
+
+      } else return builder.genesisConfigFile(genesisConfig);
+    }
+
+    private BesuControllerBuilder createConsensusScheduleBesuControllerBuilder(
+        final GenesisConfigFile genesisConfig, final GenesisConfigOptions configOptions) {
+      final Map<Long, BesuControllerBuilder> besuControllerBuilderSchedule = new HashMap<>();
+
+      final BesuControllerBuilder originalControllerBuilder;
+      if (configOptions.isIbft2()) {
+        originalControllerBuilder = new IbftBesuControllerBuilder();
+      } else if (configOptions.isIbftLegacy()) {
+        throw new IllegalStateException(
+            "IBFT1 (legacy) is no longer supported. Consider using IBFT2 or QBFT.");
+      } else {
+        throw new IllegalStateException(
+            "Invalid genesis migration config. Migration is supported from IBFT (legacy) or IBFT2 to QBFT)");
+      }
+      besuControllerBuilderSchedule.put(0L, originalControllerBuilder);
+
+      final QbftConfigOptions qbftConfigOptions = configOptions.getQbftConfigOptions();
+      final Long qbftBlock = readQbftStartBlockConfig(qbftConfigOptions);
+      besuControllerBuilderSchedule.put(qbftBlock, new QbftBesuControllerBuilder());
+
+      return new ConsensusScheduleBesuControllerBuilder(besuControllerBuilderSchedule)
+          .genesisConfigFile(genesisConfig);
+    }
+
+    private Long readQbftStartBlockConfig(final QbftConfigOptions qbftConfigOptions) {
+      final long startBlock =
+          qbftConfigOptions
+              .getStartBlock()
+              .orElseThrow(
+                  () ->
+                      new IllegalStateException("Missing QBFT startBlock config in genesis file"));
+
+      if (startBlock <= 0) {
+        throw new IllegalStateException("Invalid QBFT startBlock config in genesis file");
+      }
+
+      return startBlock;
+    }
+
+    private boolean isCheckpointPoSBlock(final GenesisConfigOptions configOptions) {
+      final UInt256 terminalTotalDifficulty = configOptions.getTerminalTotalDifficulty().get();
+
+      return configOptions.getCheckpointOptions().isValid()
+          && (UInt256.fromHexString(configOptions.getCheckpointOptions().getTotalDifficulty().get())
+              .greaterThan(terminalTotalDifficulty));
     }
   }
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java
index 44df5792052..aed7e9cb8bb 100644
--- a/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java
+++ b/besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java
@@ -16,46 +16,74 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import org.hyperledger.besu.components.BesuComponent;
+import org.hyperledger.besu.config.CheckpointConfigOptions;
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.config.GenesisConfigOptions;
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
-import org.hyperledger.besu.crypto.NodeKey;
+import org.hyperledger.besu.consensus.merge.MergeContext;
+import org.hyperledger.besu.consensus.merge.UnverifiedForkchoiceSupplier;
+import org.hyperledger.besu.consensus.qbft.pki.PkiBlockCreationConfiguration;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ConsensusContext;
+import org.hyperledger.besu.ethereum.ConsensusContextFactory;
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.methods.JsonRpcMethods;
-import org.hyperledger.besu.ethereum.blockcreation.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
-import org.hyperledger.besu.ethereum.bonsai.BonsaiWorldStateArchive;
+import org.hyperledger.besu.ethereum.bonsai.BonsaiWorldStateProvider;
+import org.hyperledger.besu.ethereum.bonsai.cache.CachedMerkleTrieLoader;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.chain.BlockchainStorage;
+import org.hyperledger.besu.ethereum.chain.ChainDataPruner;
+import org.hyperledger.besu.ethereum.chain.ChainDataPrunerStorage;
+import org.hyperledger.besu.ethereum.chain.ChainPrunerConfiguration;
+import org.hyperledger.besu.ethereum.chain.DefaultBlockchain;
 import org.hyperledger.besu.ethereum.chain.GenesisState;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.chain.VariablesStorage;
+import org.hyperledger.besu.ethereum.core.Difficulty;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
-import org.hyperledger.besu.ethereum.core.fees.EIP1559;
 import org.hyperledger.besu.ethereum.eth.EthProtocol;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
+import org.hyperledger.besu.ethereum.eth.SnapProtocol;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthMessages;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
 import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.eth.manager.MergePeerFilter;
+import org.hyperledger.besu.ethereum.eth.manager.MonitoredExecutors;
+import org.hyperledger.besu.ethereum.eth.manager.snap.SnapProtocolManager;
+import org.hyperledger.besu.ethereum.eth.peervalidation.CheckpointBlocksPeerValidator;
 import org.hyperledger.besu.ethereum.eth.peervalidation.ClassicForkPeerValidator;
 import org.hyperledger.besu.ethereum.eth.peervalidation.DaoForkPeerValidator;
 import org.hyperledger.besu.ethereum.eth.peervalidation.PeerValidator;
 import org.hyperledger.besu.ethereum.eth.peervalidation.RequiredBlocksPeerValidator;
 import org.hyperledger.besu.ethereum.eth.sync.DefaultSynchronizer;
+import org.hyperledger.besu.ethereum.eth.sync.PivotBlockSelector;
 import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.PivotSelectorFromPeers;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.PivotSelectorFromSafeBlock;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.checkpoint.Checkpoint;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.checkpoint.ImmutableCheckpoint;
+import org.hyperledger.besu.ethereum.eth.sync.fullsync.SyncTerminationCondition;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolFactory;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
 import org.hyperledger.besu.ethereum.p2p.config.SubProtocolConfiguration;
 import org.hyperledger.besu.ethereum.storage.StorageProvider;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
 import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.ethereum.worldstate.DefaultWorldStateArchive;
 import org.hyperledger.besu.ethereum.worldstate.MarkSweepPruner;
 import org.hyperledger.besu.ethereum.worldstate.Pruner;
@@ -63,7 +91,11 @@
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 import org.hyperledger.besu.metrics.ObservableMetricsSystem;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.plugin.services.permissioning.NodeMessagePermissioningProvider;
+import org.hyperledger.besu.plugin.services.txselection.TransactionSelectorFactory;
 
 import java.io.Closeable;
 import java.math.BigInteger;
@@ -75,140 +107,441 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalLong;
+import java.util.function.Supplier;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public abstract class BesuControllerBuilder {
-  private static final Logger LOG = LogManager.getLogger();
+/** The Besu controller builder that builds Besu Controller. */
+public abstract class BesuControllerBuilder implements MiningParameterOverrides {
+  private static final Logger LOG = LoggerFactory.getLogger(BesuControllerBuilder.class);
 
-  protected GenesisConfigFile genesisConfig;
-  private SynchronizerConfiguration syncConfig;
-  private EthProtocolConfiguration ethereumWireProtocolConfiguration;
+  private GenesisConfigFile genesisConfig;
+  private Map<String, String> genesisConfigOverrides = Collections.emptyMap();
+
+  /** The Config options supplier. */
+  protected Supplier<GenesisConfigOptions> configOptionsSupplier =
+      () ->
+          Optional.ofNullable(genesisConfig)
+              .map(conf -> conf.getConfigOptions(genesisConfigOverrides))
+              .orElseThrow();
+
+  /** The Sync config. */
+  protected SynchronizerConfiguration syncConfig;
+  /** The Ethereum wire protocol configuration. */
+  protected EthProtocolConfiguration ethereumWireProtocolConfiguration;
+  /** The Transaction pool configuration. */
   protected TransactionPoolConfiguration transactionPoolConfiguration;
+  /** The Network id. */
   protected BigInteger networkId;
+  /** The Mining parameters. */
   protected MiningParameters miningParameters;
+  /** The Metrics system. */
   protected ObservableMetricsSystem metricsSystem;
+  /** The Privacy parameters. */
   protected PrivacyParameters privacyParameters;
+  /** The Pki block creation configuration. */
+  protected Optional<PkiBlockCreationConfiguration> pkiBlockCreationConfiguration =
+      Optional.empty();
+  /** The Data directory. */
   protected Path dataDirectory;
+  /** The Clock. */
   protected Clock clock;
+  /** The Node key. */
   protected NodeKey nodeKey;
+  /** The Is revert reason enabled. */
   protected boolean isRevertReasonEnabled;
+  /** The Gas limit calculator. */
   GasLimitCalculator gasLimitCalculator;
-  private StorageProvider storageProvider;
-  private boolean isPruningEnabled;
-  private PrunerConfiguration prunerConfiguration;
-  Map<String, String> genesisConfigOverrides;
-  private Map<Long, Hash> requiredBlocks = Collections.emptyMap();
-  private long reorgLoggingThreshold;
-  private DataStorageConfiguration dataStorageConfiguration =
+  /** The Storage provider. */
+  protected StorageProvider storageProvider;
+  /** The Is pruning enabled. */
+  protected boolean isPruningEnabled;
+  /** The Pruner configuration. */
+  protected PrunerConfiguration prunerConfiguration;
+  /** The Required blocks. */
+  protected Map<Long, Hash> requiredBlocks = Collections.emptyMap();
+  /** The Reorg logging threshold. */
+  protected long reorgLoggingThreshold;
+  /** The Data storage configuration. */
+  protected DataStorageConfiguration dataStorageConfiguration =
       DataStorageConfiguration.DEFAULT_CONFIG;
+  /** The Message permissioning providers. */
+  protected List<NodeMessagePermissioningProvider> messagePermissioningProviders =
+      Collections.emptyList();
+  /** The Evm configuration. */
+  protected EvmConfiguration evmConfiguration;
+  /** The Max peers. */
+  protected int maxPeers;
+
+  private int peerLowerBound;
+  private int maxRemotelyInitiatedPeers;
+  /** The Chain pruner configuration. */
+  protected ChainPrunerConfiguration chainPrunerConfiguration = ChainPrunerConfiguration.DEFAULT;
+
+  private NetworkingConfiguration networkingConfiguration;
+  private Boolean randomPeerPriority;
+  private Optional<TransactionSelectorFactory> transactionSelectorFactory = Optional.empty();
+  /** the Dagger configured context that can provide dependencies */
+  protected Optional<BesuComponent> besuComponent = Optional.empty();
 
+  /**
+   * Provide a BesuComponent which can be used to get other dependencies
+   *
+   * @param besuComponent application context that can be used to get other dependencies
+   * @return the besu controller builder
+   */
+  public BesuControllerBuilder besuComponent(final BesuComponent besuComponent) {
+    this.besuComponent = Optional.ofNullable(besuComponent);
+    return this;
+  }
+
+  /**
+   * Storage provider besu controller builder.
+   *
+   * @param storageProvider the storage provider
+   * @return the besu controller builder
+   */
   public BesuControllerBuilder storageProvider(final StorageProvider storageProvider) {
     this.storageProvider = storageProvider;
     return this;
   }
 
+  /**
+   * Genesis config file besu controller builder.
+   *
+   * @param genesisConfig the genesis config
+   * @return the besu controller builder
+   */
   public BesuControllerBuilder genesisConfigFile(final GenesisConfigFile genesisConfig) {
     this.genesisConfig = genesisConfig;
     return this;
   }
 
+  /**
+   * Synchronizer configuration besu controller builder.
+   *
+   * @param synchronizerConfig the synchronizer config
+   * @return the besu controller builder
+   */
   public BesuControllerBuilder synchronizerConfiguration(
       final SynchronizerConfiguration synchronizerConfig) {
     this.syncConfig = synchronizerConfig;
     return this;
   }
 
+  /**
+   * Eth protocol configuration besu controller builder.
+   *
+   * @param ethProtocolConfiguration the eth protocol configuration
+   * @return the besu controller builder
+   */
   public BesuControllerBuilder ethProtocolConfiguration(
       final EthProtocolConfiguration ethProtocolConfiguration) {
     this.ethereumWireProtocolConfiguration = ethProtocolConfiguration;
     return this;
   }
 
+  /**
+   * Network id besu controller builder.
+   *
+   * @param networkId the network id
+   * @return the besu controller builder
+   */
   public BesuControllerBuilder networkId(final BigInteger networkId) {
     this.networkId = networkId;
     return this;
   }
 
+  /**
+   * Mining parameters besu controller builder.
+   *
+   * @param miningParameters the mining parameters
+   * @return the besu controller builder
+   */
   public BesuControllerBuilder miningParameters(final MiningParameters miningParameters) {
     this.miningParameters = miningParameters;
     return this;
   }
 
+  /**
+   * Message permissioning providers besu controller builder.
+   *
+   * @param messagePermissioningProviders the message permissioning providers
+   * @return the besu controller builder
+   */
+  public BesuControllerBuilder messagePermissioningProviders(
+      final List<NodeMessagePermissioningProvider> messagePermissioningProviders) {
+    this.messagePermissioningProviders = messagePermissioningProviders;
+    return this;
+  }
+
+  /**
+   * Node key besu controller builder.
+   *
+   * @param nodeKey the node key
+   * @return the besu controller builder
+   */
   public BesuControllerBuilder nodeKey(final NodeKey nodeKey) {
     this.nodeKey = nodeKey;
     return this;
   }
 
+  /**
+   * Metrics system besu controller builder.
+   *
+   * @param metricsSystem the metrics system
+   * @return the besu controller builder
+   */
   public BesuControllerBuilder metricsSystem(final ObservableMetricsSystem metricsSystem) {
     this.metricsSystem = metricsSystem;
     return this;
   }
 
+  /**
+   * Privacy parameters besu controller builder.
+   *
+   * @param privacyParameters the privacy parameters
+   * @return the besu controller builder
+   */
   public BesuControllerBuilder privacyParameters(final PrivacyParameters privacyParameters) {
     this.privacyParameters = privacyParameters;
     return this;
   }
 
+  /**
+   * Pki block creation configuration besu controller builder.
+   *
+   * @param pkiBlockCreationConfiguration the pki block creation configuration
+   * @return the besu controller builder
+   */
+  public BesuControllerBuilder pkiBlockCreationConfiguration(
+      final Optional<PkiBlockCreationConfiguration> pkiBlockCreationConfiguration) {
+    this.pkiBlockCreationConfiguration = pkiBlockCreationConfiguration;
+    return this;
+  }
+
+  /**
+   * Data directory besu controller builder.
+   *
+   * @param dataDirectory the data directory
+   * @return the besu controller builder
+   */
   public BesuControllerBuilder dataDirectory(final Path dataDirectory) {
     this.dataDirectory = dataDirectory;
     return this;
   }
 
+  /**
+   * Clock besu controller builder.
+   *
+   * @param clock the clock
+   * @return the besu controller builder
+   */
   public BesuControllerBuilder clock(final Clock clock) {
     this.clock = clock;
     return this;
   }
 
+  /**
+   * Transaction pool configuration besu controller builder.
+   *
+   * @param transactionPoolConfiguration the transaction pool configuration
+   * @return the besu controller builder
+   */
   public BesuControllerBuilder transactionPoolConfiguration(
       final TransactionPoolConfiguration transactionPoolConfiguration) {
     this.transactionPoolConfiguration = transactionPoolConfiguration;
     return this;
   }
 
+  /**
+   * Is revert reason enabled besu controller builder.
+   *
+   * @param isRevertReasonEnabled the is revert reason enabled
+   * @return the besu controller builder
+   */
   public BesuControllerBuilder isRevertReasonEnabled(final boolean isRevertReasonEnabled) {
     this.isRevertReasonEnabled = isRevertReasonEnabled;
     return this;
   }
 
+  /**
+   * Is pruning enabled besu controller builder.
+   *
+   * @param isPruningEnabled the is pruning enabled
+   * @return the besu controller builder
+   */
   public BesuControllerBuilder isPruningEnabled(final boolean isPruningEnabled) {
     this.isPruningEnabled = isPruningEnabled;
     return this;
   }
 
+  /**
+   * Pruning configuration besu controller builder.
+   *
+   * @param prunerConfiguration the pruner configuration
+   * @return the besu controller builder
+   */
   public BesuControllerBuilder pruningConfiguration(final PrunerConfiguration prunerConfiguration) {
     this.prunerConfiguration = prunerConfiguration;
     return this;
   }
 
+  /**
+   * Genesis config overrides besu controller builder.
+   *
+   * @param genesisConfigOverrides the genesis config overrides
+   * @return the besu controller builder
+   */
   public BesuControllerBuilder genesisConfigOverrides(
       final Map<String, String> genesisConfigOverrides) {
     this.genesisConfigOverrides = genesisConfigOverrides;
     return this;
   }
 
+  /**
+   * Gas limit calculator besu controller builder.
+   *
+   * @param gasLimitCalculator the gas limit calculator
+   * @return the besu controller builder
+   */
   public BesuControllerBuilder gasLimitCalculator(final GasLimitCalculator gasLimitCalculator) {
     this.gasLimitCalculator = gasLimitCalculator;
     return this;
   }
 
+  /**
+   * Required blocks besu controller builder.
+   *
+   * @param requiredBlocks the required blocks
+   * @return the besu controller builder
+   */
   public BesuControllerBuilder requiredBlocks(final Map<Long, Hash> requiredBlocks) {
     this.requiredBlocks = requiredBlocks;
     return this;
   }
 
+  /**
+   * Reorg logging threshold besu controller builder.
+   *
+   * @param reorgLoggingThreshold the reorg logging threshold
+   * @return the besu controller builder
+   */
   public BesuControllerBuilder reorgLoggingThreshold(final long reorgLoggingThreshold) {
     this.reorgLoggingThreshold = reorgLoggingThreshold;
     return this;
   }
 
+  /**
+   * Data storage configuration besu controller builder.
+   *
+   * @param dataStorageConfiguration the data storage configuration
+   * @return the besu controller builder
+   */
   public BesuControllerBuilder dataStorageConfiguration(
       final DataStorageConfiguration dataStorageConfiguration) {
     this.dataStorageConfiguration = dataStorageConfiguration;
     return this;
   }
 
+  /**
+   * Evm configuration besu controller builder.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the besu controller builder
+   */
+  public BesuControllerBuilder evmConfiguration(final EvmConfiguration evmConfiguration) {
+    this.evmConfiguration = evmConfiguration;
+    return this;
+  }
+
+  /**
+   * Max peers besu controller builder.
+   *
+   * @param maxPeers the max peers
+   * @return the besu controller builder
+   */
+  public BesuControllerBuilder maxPeers(final int maxPeers) {
+    this.maxPeers = maxPeers;
+    return this;
+  }
+
+  /**
+   * Lower bound of peers where we stop actively trying to initiate new outgoing connections
+   *
+   * @param peerLowerBound lower bound of peers where we stop actively trying to initiate new
+   *     outgoing connections
+   * @return the besu controller builder
+   */
+  public BesuControllerBuilder lowerBoundPeers(final int peerLowerBound) {
+    this.peerLowerBound = peerLowerBound;
+    return this;
+  }
+
+  /**
+   * Maximum number of remotely initiated peer connections
+   *
+   * @param maxRemotelyInitiatedPeers aximum number of remotely initiated peer connections
+   * @return the besu controller builder
+   */
+  public BesuControllerBuilder maxRemotelyInitiatedPeers(final int maxRemotelyInitiatedPeers) {
+    this.maxRemotelyInitiatedPeers = maxRemotelyInitiatedPeers;
+    return this;
+  }
+
+  /**
+   * Chain pruning configuration besu controller builder.
+   *
+   * @param chainPrunerConfiguration the chain pruner configuration
+   * @return the besu controller builder
+   */
+  public BesuControllerBuilder chainPruningConfiguration(
+      final ChainPrunerConfiguration chainPrunerConfiguration) {
+    this.chainPrunerConfiguration = chainPrunerConfiguration;
+    return this;
+  }
+
+  /**
+   * sets the networkConfiguration in the builder
+   *
+   * @param networkingConfiguration the networking config
+   * @return the besu controller builder
+   */
+  public BesuControllerBuilder networkConfiguration(
+      final NetworkingConfiguration networkingConfiguration) {
+    this.networkingConfiguration = networkingConfiguration;
+    return this;
+  }
+
+  /**
+   * sets the randomPeerPriority flag in the builder
+   *
+   * @param randomPeerPriority the random peer priority flag
+   * @return the besu controller builder
+   */
+  public BesuControllerBuilder randomPeerPriority(final Boolean randomPeerPriority) {
+    this.randomPeerPriority = randomPeerPriority;
+    return this;
+  }
+
+  /**
+   * sets the transactionSelectorFactory in the builder
+   *
+   * @param transactionSelectorFactory the optional transaction selector factory
+   * @return the besu controller builder
+   */
+  public BesuControllerBuilder transactionSelectorFactory(
+      final Optional<TransactionSelectorFactory> transactionSelectorFactory) {
+    this.transactionSelectorFactory = transactionSelectorFactory;
+    return this;
+  }
+
+  /**
+   * Build besu controller.
+   *
+   * @return the besu controller
+   */
   public BesuController build() {
     checkNotNull(genesisConfig, "Missing genesis config");
     checkNotNull(syncConfig, "Missing sync config");
@@ -223,34 +556,77 @@ public BesuController build() {
     checkNotNull(nodeKey, "Missing node key");
     checkNotNull(storageProvider, "Must supply a storage provider");
     checkNotNull(gasLimitCalculator, "Missing gas limit calculator");
-
+    checkNotNull(evmConfiguration, "Missing evm config");
+    checkNotNull(networkingConfiguration, "Missing network configuration");
     prepForBuild();
 
     final ProtocolSchedule protocolSchedule = createProtocolSchedule();
     final GenesisState genesisState = GenesisState.fromConfig(genesisConfig, protocolSchedule);
-    final WorldStateStorage worldStateStorage = storageProvider.createWorldStateStorage();
-    final WorldStateArchive worldStateArchive = createWorldStateArchive(worldStateStorage);
+
+    final VariablesStorage variablesStorage = storageProvider.createVariablesStorage();
+
+    final WorldStateStorage worldStateStorage =
+        storageProvider.createWorldStateStorage(dataStorageConfiguration.getDataStorageFormat());
+
+    final BlockchainStorage blockchainStorage =
+        storageProvider.createBlockchainStorage(protocolSchedule, variablesStorage);
+
+    final MutableBlockchain blockchain =
+        DefaultBlockchain.createMutable(
+            genesisState.getBlock(),
+            blockchainStorage,
+            metricsSystem,
+            reorgLoggingThreshold,
+            dataDirectory.toString());
+
+    final CachedMerkleTrieLoader cachedMerkleTrieLoader =
+        besuComponent
+            .map(BesuComponent::getCachedMerkleTrieLoader)
+            .orElseGet(() -> new CachedMerkleTrieLoader(metricsSystem));
+
+    final WorldStateArchive worldStateArchive =
+        createWorldStateArchive(worldStateStorage, blockchain, cachedMerkleTrieLoader);
+
+    if (blockchain.getChainHeadBlockNumber() < 1) {
+      genesisState.writeStateTo(worldStateArchive.getMutable());
+    }
+
     final ProtocolContext protocolContext =
-        ProtocolContext.init(
-            storageProvider,
+        createProtocolContext(
+            blockchain,
             worldStateArchive,
-            genesisState,
             protocolSchedule,
-            metricsSystem,
             this::createConsensusContext,
-            reorgLoggingThreshold);
+            transactionSelectorFactory);
     validateContext(protocolContext);
 
+    if (chainPrunerConfiguration.getChainPruningEnabled()) {
+      protocolContext
+          .safeConsensusContext(MergeContext.class)
+          .ifPresent(
+              mergeContext -> {
+                mergeContext.setIsChainPruningEnabled(true);
+              });
+      final ChainDataPruner chainDataPruner = createChainPruner(blockchainStorage);
+      blockchain.observeBlockAdded(chainDataPruner);
+      LOG.info(
+          "Chain data pruning enabled with recent blocks retained to be: "
+              + chainPrunerConfiguration.getChainPruningBlocksRetained()
+              + " and frequency to be: "
+              + chainPrunerConfiguration.getChainPruningBlocksFrequency());
+    }
+
     protocolSchedule.setPublicWorldStateArchiveForPrivacyBlockProcessor(
         protocolContext.getWorldStateArchive());
 
-    final MutableBlockchain blockchain = protocolContext.getBlockchain();
-
     Optional<Pruner> maybePruner = Optional.empty();
     if (isPruningEnabled) {
       if (!storageProvider.isWorldStateIterable()) {
         LOG.warn(
             "Cannot enable pruning with current database version. Disabling. Resync to get the latest database version or disable pruning explicitly on the command line to remove this warning.");
+      } else if (dataStorageConfiguration.getDataStorageFormat().equals(DataStorageFormat.BONSAI)) {
+        LOG.warn(
+            "Cannot enable pruning with Bonsai data storage format. Disabling. Change the data storage format or disable pruning explicitly on the command line to remove this warning.");
       } else {
         maybePruner =
             Optional.of(
@@ -265,27 +641,54 @@ public BesuController build() {
                     prunerConfiguration));
       }
     }
-    final EthPeers ethPeers = new EthPeers(getSupportedProtocol(), clock, metricsSystem);
+    final int maxMessageSize = ethereumWireProtocolConfiguration.getMaxMessageSize();
+    final Supplier<ProtocolSpec> currentProtocolSpecSupplier =
+        () -> protocolSchedule.getByBlockHeader(blockchain.getChainHeadHeader());
+    final EthPeers ethPeers =
+        new EthPeers(
+            getSupportedProtocol(),
+            currentProtocolSpecSupplier,
+            clock,
+            metricsSystem,
+            maxMessageSize,
+            messagePermissioningProviders,
+            nodeKey.getPublicKey().getEncodedBytes(),
+            peerLowerBound,
+            maxPeers,
+            maxRemotelyInitiatedPeers,
+            randomPeerPriority);
+
     final EthMessages ethMessages = new EthMessages();
+    final EthMessages snapMessages = new EthMessages();
+
     final EthScheduler scheduler =
         new EthScheduler(
             syncConfig.getDownloaderParallelism(),
             syncConfig.getTransactionsParallelism(),
             syncConfig.getComputationParallelism(),
             metricsSystem);
-    final EthContext ethContext = new EthContext(ethPeers, ethMessages, scheduler);
-    final SyncState syncState = new SyncState(blockchain, ethPeers);
-    final boolean fastSyncEnabled = SyncMode.FAST.equals(syncConfig.getSyncMode());
 
-    final Optional<EIP1559> eip1559;
-    final GenesisConfigOptions genesisConfigOptions =
+    final GenesisConfigOptions configOptions =
         genesisConfig.getConfigOptions(genesisConfigOverrides);
-    if (ExperimentalEIPs.eip1559Enabled
-        && genesisConfigOptions.getEIP1559BlockNumber().isPresent()) {
-      eip1559 = Optional.of(new EIP1559(genesisConfigOptions.getEIP1559BlockNumber().getAsLong()));
-    } else {
-      eip1559 = Optional.empty();
+
+    Optional<Checkpoint> checkpoint = Optional.empty();
+    if (configOptions.getCheckpointOptions().isValid()) {
+      checkpoint =
+          Optional.of(
+              ImmutableCheckpoint.builder()
+                  .blockHash(
+                      Hash.fromHexString(configOptions.getCheckpointOptions().getHash().get()))
+                  .blockNumber(configOptions.getCheckpointOptions().getNumber().getAsLong())
+                  .totalDifficulty(
+                      Difficulty.fromHexString(
+                          configOptions.getCheckpointOptions().getTotalDifficulty().get()))
+                  .build());
     }
+
+    final EthContext ethContext = new EthContext(ethPeers, ethMessages, snapMessages, scheduler);
+    final boolean fullSyncDisabled = !SyncMode.isFullSync(syncConfig.getSyncMode());
+    final SyncState syncState = new SyncState(blockchain, ethPeers, fullSyncDisabled, checkpoint);
+
     final TransactionPool transactionPool =
         TransactionPoolFactory.createTransactionPool(
             protocolSchedule,
@@ -294,36 +697,43 @@ public BesuController build() {
             clock,
             metricsSystem,
             syncState,
-            miningParameters.getMinTransactionGasPrice(),
-            transactionPoolConfiguration,
-            ethereumWireProtocolConfiguration.isEth65Enabled(),
-            eip1559);
+            miningParameters,
+            transactionPoolConfiguration);
+
+    final List<PeerValidator> peerValidators = createPeerValidators(protocolSchedule);
 
     final EthProtocolManager ethProtocolManager =
         createEthProtocolManager(
             protocolContext,
-            fastSyncEnabled,
+            syncConfig,
             transactionPool,
             ethereumWireProtocolConfiguration,
             ethPeers,
             ethContext,
             ethMessages,
             scheduler,
-            createPeerValidators(protocolSchedule));
+            peerValidators,
+            Optional.empty());
+
+    final Optional<SnapProtocolManager> maybeSnapProtocolManager =
+        createSnapProtocolManager(peerValidators, ethPeers, snapMessages, worldStateArchive);
+
+    final PivotBlockSelector pivotBlockSelector =
+        createPivotSelector(
+            protocolSchedule, protocolContext, ethContext, syncState, metricsSystem);
 
     final Synchronizer synchronizer =
-        new DefaultSynchronizer(
-            syncConfig,
+        createSynchronizer(
             protocolSchedule,
-            protocolContext,
             worldStateStorage,
-            ethProtocolManager.getBlockBroadcaster(),
+            protocolContext,
             maybePruner,
-            ethProtocolManager.ethContext(),
+            ethContext,
             syncState,
-            dataDirectory,
-            clock,
-            metricsSystem);
+            ethProtocolManager,
+            pivotBlockSelector);
+
+    protocolContext.setSynchronizer(Optional.of(synchronizer));
 
     final MiningCoordinator miningCoordinator =
         createMiningCoordinator(
@@ -335,15 +745,17 @@ public BesuController build() {
             ethProtocolManager);
 
     final PluginServiceFactory additionalPluginServices =
-        createAdditionalPluginServices(blockchain);
+        createAdditionalPluginServices(blockchain, protocolContext);
 
     final SubProtocolConfiguration subProtocolConfiguration =
-        createSubProtocolConfiguration(ethProtocolManager);
+        createSubProtocolConfiguration(ethProtocolManager, maybeSnapProtocolManager);
+    ;
 
     final JsonRpcMethods additionalJsonRpcMethodFactory =
         createAdditionalJsonRpcMethodFactory(protocolContext);
 
     final List<Closeable> closeables = new ArrayList<>();
+    closeables.add(protocolContext.getWorldStateArchive());
     closeables.add(storageProvider);
     if (privacyParameters.getPrivateStorageProvider() != null) {
       closeables.add(privacyParameters.getPrivateStorageProvider());
@@ -353,7 +765,7 @@ public BesuController build() {
         protocolSchedule,
         protocolContext,
         ethProtocolManager,
-        genesisConfig.getConfigOptions(genesisConfigOverrides),
+        configOptionsSupplier.get(),
         subProtocolConfiguration,
         synchronizer,
         syncState,
@@ -364,21 +776,150 @@ public BesuController build() {
         additionalJsonRpcMethodFactory,
         nodeKey,
         closeables,
-        additionalPluginServices);
+        additionalPluginServices,
+        ethPeers,
+        storageProvider);
   }
 
+  /**
+   * Create synchronizer synchronizer.
+   *
+   * @param protocolSchedule the protocol schedule
+   * @param worldStateStorage the world state storage
+   * @param protocolContext the protocol context
+   * @param maybePruner the maybe pruner
+   * @param ethContext the eth context
+   * @param syncState the sync state
+   * @param ethProtocolManager the eth protocol manager
+   * @param pivotBlockSelector the pivot block selector
+   * @return the synchronizer
+   */
+  protected Synchronizer createSynchronizer(
+      final ProtocolSchedule protocolSchedule,
+      final WorldStateStorage worldStateStorage,
+      final ProtocolContext protocolContext,
+      final Optional<Pruner> maybePruner,
+      final EthContext ethContext,
+      final SyncState syncState,
+      final EthProtocolManager ethProtocolManager,
+      final PivotBlockSelector pivotBlockSelector) {
+
+    final DefaultSynchronizer toUse =
+        new DefaultSynchronizer(
+            syncConfig,
+            protocolSchedule,
+            protocolContext,
+            worldStateStorage,
+            ethProtocolManager.getBlockBroadcaster(),
+            maybePruner,
+            ethContext,
+            syncState,
+            dataDirectory,
+            storageProvider,
+            clock,
+            metricsSystem,
+            getFullSyncTerminationCondition(protocolContext.getBlockchain()),
+            pivotBlockSelector);
+
+    return toUse;
+  }
+
+  private PivotBlockSelector createPivotSelector(
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final EthContext ethContext,
+      final SyncState syncState,
+      final MetricsSystem metricsSystem) {
+
+    final GenesisConfigOptions genesisConfigOptions = configOptionsSupplier.get();
+
+    if (genesisConfigOptions.getTerminalTotalDifficulty().isPresent()) {
+      LOG.info("TTD difficulty is present, creating initial sync for PoS");
+
+      final MergeContext mergeContext = protocolContext.getConsensusContext(MergeContext.class);
+      final UnverifiedForkchoiceSupplier unverifiedForkchoiceSupplier =
+          new UnverifiedForkchoiceSupplier();
+      final long subscriptionId =
+          mergeContext.addNewUnverifiedForkchoiceListener(unverifiedForkchoiceSupplier);
+
+      final Runnable unsubscribeForkchoiceListener =
+          () -> {
+            mergeContext.removeNewUnverifiedForkchoiceListener(subscriptionId);
+            LOG.info("Initial sync done, unsubscribe forkchoice supplier");
+          };
+
+      return new PivotSelectorFromSafeBlock(
+          protocolContext,
+          protocolSchedule,
+          ethContext,
+          metricsSystem,
+          genesisConfigOptions,
+          unverifiedForkchoiceSupplier,
+          unsubscribeForkchoiceListener);
+    } else {
+      LOG.info("TTD difficulty is not present, creating initial sync phase for PoW");
+      return new PivotSelectorFromPeers(ethContext, syncConfig, syncState, metricsSystem);
+    }
+  }
+
+  /**
+   * Gets full sync termination condition.
+   *
+   * @param blockchain the blockchain
+   * @return the full sync termination condition
+   */
+  protected SyncTerminationCondition getFullSyncTerminationCondition(final Blockchain blockchain) {
+    return configOptionsSupplier
+        .get()
+        .getTerminalTotalDifficulty()
+        .map(difficulty -> SyncTerminationCondition.difficulty(difficulty, blockchain))
+        .orElse(SyncTerminationCondition.never());
+  }
+
+  /** Prep for build. */
   protected void prepForBuild() {}
 
+  /**
+   * Create additional json rpc method factory json rpc methods.
+   *
+   * @param protocolContext the protocol context
+   * @return the json rpc methods
+   */
   protected JsonRpcMethods createAdditionalJsonRpcMethodFactory(
       final ProtocolContext protocolContext) {
     return apis -> Collections.emptyMap();
   }
 
+  /**
+   * Create sub protocol configuration sub protocol configuration.
+   *
+   * @param ethProtocolManager the eth protocol manager
+   * @param maybeSnapProtocolManager the maybe snap protocol manager
+   * @return the sub protocol configuration
+   */
   protected SubProtocolConfiguration createSubProtocolConfiguration(
-      final EthProtocolManager ethProtocolManager) {
-    return new SubProtocolConfiguration().withSubProtocol(EthProtocol.get(), ethProtocolManager);
+      final EthProtocolManager ethProtocolManager,
+      final Optional<SnapProtocolManager> maybeSnapProtocolManager) {
+    final SubProtocolConfiguration subProtocolConfiguration =
+        new SubProtocolConfiguration().withSubProtocol(EthProtocol.get(), ethProtocolManager);
+    maybeSnapProtocolManager.ifPresent(
+        snapProtocolManager -> {
+          subProtocolConfiguration.withSubProtocol(SnapProtocol.get(), snapProtocolManager);
+        });
+    return subProtocolConfiguration;
   }
 
+  /**
+   * Create mining coordinator mining coordinator.
+   *
+   * @param protocolSchedule the protocol schedule
+   * @param protocolContext the protocol context
+   * @param transactionPool the transaction pool
+   * @param miningParameters the mining parameters
+   * @param syncState the sync state
+   * @param ethProtocolManager the eth protocol manager
+   * @return the mining coordinator
+   */
   protected abstract MiningCoordinator createMiningCoordinator(
       ProtocolSchedule protocolSchedule,
       ProtocolContext protocolContext,
@@ -387,27 +928,68 @@ protected abstract MiningCoordinator createMiningCoordinator(
       SyncState syncState,
       EthProtocolManager ethProtocolManager);
 
+  /**
+   * Create protocol schedule protocol schedule.
+   *
+   * @return the protocol schedule
+   */
   protected abstract ProtocolSchedule createProtocolSchedule();
 
+  /**
+   * Validate context.
+   *
+   * @param context the context
+   */
   protected void validateContext(final ProtocolContext context) {}
 
-  protected abstract Object createConsensusContext(
-      Blockchain blockchain, WorldStateArchive worldStateArchive);
+  /**
+   * Create consensus context consensus context.
+   *
+   * @param blockchain the blockchain
+   * @param worldStateArchive the world state archive
+   * @param protocolSchedule the protocol schedule
+   * @return the consensus context
+   */
+  protected abstract ConsensusContext createConsensusContext(
+      Blockchain blockchain,
+      WorldStateArchive worldStateArchive,
+      ProtocolSchedule protocolSchedule);
 
+  /**
+   * Gets supported protocol.
+   *
+   * @return the supported protocol
+   */
   protected String getSupportedProtocol() {
     return EthProtocol.NAME;
   }
 
+  /**
+   * Create eth protocol manager eth protocol manager.
+   *
+   * @param protocolContext the protocol context
+   * @param synchronizerConfiguration the synchronizer configuration
+   * @param transactionPool the transaction pool
+   * @param ethereumWireProtocolConfiguration the ethereum wire protocol configuration
+   * @param ethPeers the eth peers
+   * @param ethContext the eth context
+   * @param ethMessages the eth messages
+   * @param scheduler the scheduler
+   * @param peerValidators the peer validators
+   * @param mergePeerFilter the merge peer filter
+   * @return the eth protocol manager
+   */
   protected EthProtocolManager createEthProtocolManager(
       final ProtocolContext protocolContext,
-      final boolean fastSyncEnabled,
+      final SynchronizerConfiguration synchronizerConfiguration,
       final TransactionPool transactionPool,
       final EthProtocolConfiguration ethereumWireProtocolConfiguration,
       final EthPeers ethPeers,
       final EthContext ethContext,
       final EthMessages ethMessages,
       final EthScheduler scheduler,
-      final List<PeerValidator> peerValidators) {
+      final List<PeerValidator> peerValidators,
+      final Optional<MergePeerFilter> mergePeerFilter) {
     return new EthProtocolManager(
         protocolContext.getBlockchain(),
         networkId,
@@ -418,15 +1000,60 @@ protected EthProtocolManager createEthProtocolManager(
         ethMessages,
         ethContext,
         peerValidators,
-        fastSyncEnabled,
+        mergePeerFilter,
+        synchronizerConfiguration,
         scheduler,
-        genesisConfig.getForks());
+        genesisConfig.getForkBlockNumbers(),
+        genesisConfig.getForkTimestamps());
+  }
+
+  /**
+   * Create protocol context protocol context.
+   *
+   * @param blockchain the blockchain
+   * @param worldStateArchive the world state archive
+   * @param protocolSchedule the protocol schedule
+   * @param consensusContextFactory the consensus context factory
+   * @param transactionSelectorFactory optional transaction selector factory
+   * @return the protocol context
+   */
+  protected ProtocolContext createProtocolContext(
+      final MutableBlockchain blockchain,
+      final WorldStateArchive worldStateArchive,
+      final ProtocolSchedule protocolSchedule,
+      final ConsensusContextFactory consensusContextFactory,
+      final Optional<TransactionSelectorFactory> transactionSelectorFactory) {
+    return ProtocolContext.init(
+        blockchain,
+        worldStateArchive,
+        protocolSchedule,
+        consensusContextFactory,
+        transactionSelectorFactory);
   }
 
-  public WorldStateArchive createWorldStateArchive(final WorldStateStorage worldStateStorage) {
+  private Optional<SnapProtocolManager> createSnapProtocolManager(
+      final List<PeerValidator> peerValidators,
+      final EthPeers ethPeers,
+      final EthMessages snapMessages,
+      final WorldStateArchive worldStateArchive) {
+    return Optional.of(
+        new SnapProtocolManager(peerValidators, ethPeers, snapMessages, worldStateArchive));
+  }
+
+  WorldStateArchive createWorldStateArchive(
+      final WorldStateStorage worldStateStorage,
+      final Blockchain blockchain,
+      final CachedMerkleTrieLoader cachedMerkleTrieLoader) {
     switch (dataStorageConfiguration.getDataStorageFormat()) {
       case BONSAI:
-        return new BonsaiWorldStateArchive(storageProvider);
+        return new BonsaiWorldStateProvider(
+            (BonsaiWorldStateKeyValueStorage) worldStateStorage,
+            blockchain,
+            Optional.of(dataStorageConfiguration.getBonsaiMaxLayersToLoad()),
+            cachedMerkleTrieLoader,
+            metricsSystem,
+            besuComponent.map(BesuComponent::getBesuPluginContext).orElse(null));
+
       case FOREST:
       default:
         final WorldStatePreimageStorage preimageStorage =
@@ -435,19 +1062,39 @@ public WorldStateArchive createWorldStateArchive(final WorldStateStorage worldSt
     }
   }
 
-  private List<PeerValidator> createPeerValidators(final ProtocolSchedule protocolSchedule) {
+  private ChainDataPruner createChainPruner(final BlockchainStorage blockchainStorage) {
+    return new ChainDataPruner(
+        blockchainStorage,
+        new ChainDataPrunerStorage(
+            storageProvider.getStorageBySegmentIdentifier(
+                KeyValueSegmentIdentifier.CHAIN_PRUNER_STATE)),
+        chainPrunerConfiguration.getChainPruningBlocksRetained(),
+        chainPrunerConfiguration.getChainPruningBlocksFrequency(),
+        MonitoredExecutors.newBoundedThreadPool(
+            ChainDataPruner.class.getSimpleName(),
+            1,
+            1,
+            ChainDataPruner.MAX_PRUNING_THREAD_QUEUE_SIZE,
+            metricsSystem));
+  }
+
+  /**
+   * Create peer validators list.
+   *
+   * @param protocolSchedule the protocol schedule
+   * @return the list
+   */
+  protected List<PeerValidator> createPeerValidators(final ProtocolSchedule protocolSchedule) {
     final List<PeerValidator> validators = new ArrayList<>();
 
-    final OptionalLong daoBlock =
-        genesisConfig.getConfigOptions(genesisConfigOverrides).getDaoForkBlock();
+    final OptionalLong daoBlock = configOptionsSupplier.get().getDaoForkBlock();
     if (daoBlock.isPresent()) {
       // Setup dao validator
       validators.add(
           new DaoForkPeerValidator(protocolSchedule, metricsSystem, daoBlock.getAsLong()));
     }
 
-    final OptionalLong classicBlock =
-        genesisConfig.getConfigOptions(genesisConfigOverrides).getClassicForkBlock();
+    final OptionalLong classicBlock = configOptionsSupplier.get().getClassicForkBlock();
     // setup classic validator
     if (classicBlock.isPresent()) {
       validators.add(
@@ -460,9 +1107,27 @@ private List<PeerValidator> createPeerValidators(final ProtocolSchedule protocol
               protocolSchedule, metricsSystem, requiredBlock.getKey(), requiredBlock.getValue()));
     }
 
+    final CheckpointConfigOptions checkpointConfigOptions =
+        genesisConfig.getConfigOptions(genesisConfigOverrides).getCheckpointOptions();
+    if (SyncMode.X_CHECKPOINT.equals(syncConfig.getSyncMode())
+        && checkpointConfigOptions.isValid()) {
+      validators.add(
+          new CheckpointBlocksPeerValidator(
+              protocolSchedule,
+              metricsSystem,
+              checkpointConfigOptions.getNumber().orElseThrow(),
+              checkpointConfigOptions.getHash().map(Hash::fromHexString).orElseThrow()));
+    }
     return validators;
   }
 
+  /**
+   * Create additional plugin services plugin service factory.
+   *
+   * @param blockchain the blockchain
+   * @param protocolContext the protocol context
+   * @return the plugin service factory
+   */
   protected abstract PluginServiceFactory createAdditionalPluginServices(
-      final Blockchain blockchain);
+      final Blockchain blockchain, final ProtocolContext protocolContext);
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/controller/BftBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/BftBesuControllerBuilder.java
new file mode 100644
index 00000000000..4e15a3829c3
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/controller/BftBesuControllerBuilder.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.controller;
+
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+
+import java.util.function.Supplier;
+
+import com.google.common.base.Suppliers;
+
+/** Base class for BFT based Besu Controller Builders. */
+public abstract class BftBesuControllerBuilder extends BesuControllerBuilder {
+
+  /**
+   * Bft extra data codec supplier.
+   *
+   * @return the supplier of type BftExtraDataCodec.
+   */
+  protected abstract Supplier<BftExtraDataCodec> bftExtraDataCodec();
+
+  /**
+   * Bft block interface supplier.
+   *
+   * @return the supplier of type BftBlockInterface.
+   */
+  protected Supplier<BftBlockInterface> bftBlockInterface() {
+    return Suppliers.memoize(() -> new BftBlockInterface(bftExtraDataCodec().get()));
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/controller/BftQueryPluginServiceFactory.java b/besu/src/main/java/org/hyperledger/besu/controller/BftQueryPluginServiceFactory.java
new file mode 100644
index 00000000000..3de7245710a
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/controller/BftQueryPluginServiceFactory.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.controller;
+
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.queries.BftQueryServiceImpl;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.plugin.services.metrics.PoAMetricsService;
+import org.hyperledger.besu.plugin.services.query.BftQueryService;
+import org.hyperledger.besu.plugin.services.query.PoaQueryService;
+import org.hyperledger.besu.services.BesuPluginContextImpl;
+
+/** Bft query plugin service factory which is a concrete implementation of PluginServiceFactory. */
+public class BftQueryPluginServiceFactory implements PluginServiceFactory {
+
+  private final Blockchain blockchain;
+  private final BftExtraDataCodec bftExtraDataCodec;
+  private final ValidatorProvider validatorProvider;
+  private final NodeKey nodeKey;
+  private final String consensusMechanismName;
+
+  /**
+   * Instantiates a new Bft query plugin service factory.
+   *
+   * @param blockchain the blockchain
+   * @param bftExtraDataCodec the bft extra data codec
+   * @param validatorProvider the validator provider
+   * @param nodeKey the node key
+   * @param consensusMechanismName the consensus mechanism name
+   */
+  public BftQueryPluginServiceFactory(
+      final Blockchain blockchain,
+      final BftExtraDataCodec bftExtraDataCodec,
+      final ValidatorProvider validatorProvider,
+      final NodeKey nodeKey,
+      final String consensusMechanismName) {
+    this.blockchain = blockchain;
+    this.bftExtraDataCodec = bftExtraDataCodec;
+    this.validatorProvider = validatorProvider;
+    this.nodeKey = nodeKey;
+    this.consensusMechanismName = consensusMechanismName;
+  }
+
+  @Override
+  public void appendPluginServices(final BesuPluginContextImpl besuContext) {
+    final BftBlockInterface blockInterface = new BftBlockInterface(bftExtraDataCodec);
+
+    final BftQueryServiceImpl service =
+        new BftQueryServiceImpl(
+            blockInterface, blockchain, validatorProvider, nodeKey, consensusMechanismName);
+    besuContext.addService(BftQueryService.class, service);
+    besuContext.addService(PoaQueryService.class, service);
+    besuContext.addService(PoAMetricsService.class, service);
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/controller/CliqueBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/CliqueBesuControllerBuilder.java
index 2795c3b23ca..790cb431018 100644
--- a/besu/src/main/java/org/hyperledger/besu/controller/CliqueBesuControllerBuilder.java
+++ b/besu/src/main/java/org/hyperledger/besu/controller/CliqueBesuControllerBuilder.java
@@ -14,6 +14,8 @@
  */
 package org.hyperledger.besu.controller;
 
+import static org.hyperledger.besu.consensus.clique.CliqueHelpers.installCliqueBlockChoiceRule;
+
 import org.hyperledger.besu.config.CliqueConfigOptions;
 import org.hyperledger.besu.consensus.clique.CliqueBlockInterface;
 import org.hyperledger.besu.consensus.clique.CliqueContext;
@@ -25,14 +27,12 @@
 import org.hyperledger.besu.consensus.clique.jsonrpc.CliqueJsonRpcMethods;
 import org.hyperledger.besu.consensus.common.BlockInterface;
 import org.hyperledger.besu.consensus.common.EpochManager;
-import org.hyperledger.besu.consensus.common.VoteProposer;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
-import org.hyperledger.besu.consensus.common.VoteTallyUpdater;
+import org.hyperledger.besu.consensus.common.validator.blockbased.BlockValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.methods.JsonRpcMethods;
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.Util;
@@ -42,12 +42,13 @@
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Clique consensus controller builder. */
 public class CliqueBesuControllerBuilder extends BesuControllerBuilder {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(CliqueBesuControllerBuilder.class);
 
   private Address localAddress;
   private EpochManager epochManager;
@@ -57,8 +58,7 @@ public class CliqueBesuControllerBuilder extends BesuControllerBuilder {
   @Override
   protected void prepForBuild() {
     localAddress = Util.publicKeyToAddress(nodeKey.getPublicKey());
-    final CliqueConfigOptions cliqueConfig =
-        genesisConfig.getConfigOptions(genesisConfigOverrides).getCliqueConfigOptions();
+    final CliqueConfigOptions cliqueConfig = configOptionsSupplier.get().getCliqueConfigOptions();
     final long blocksPerEpoch = cliqueConfig.getEpochLength();
     secondsBetweenBlocks = cliqueConfig.getBlockPeriodSeconds();
 
@@ -88,11 +88,10 @@ protected MiningCoordinator createMiningCoordinator(
             miningParameters,
             new CliqueBlockScheduler(
                 clock,
-                protocolContext.getConsensusState(CliqueContext.class).getVoteTallyCache(),
+                protocolContext.getConsensusContext(CliqueContext.class).getValidatorProvider(),
                 localAddress,
                 secondsBetweenBlocks),
-            epochManager,
-            gasLimitCalculator);
+            epochManager);
     final CliqueMiningCoordinator miningCoordinator =
         new CliqueMiningCoordinator(
             protocolContext.getBlockchain(),
@@ -109,10 +108,11 @@ protected MiningCoordinator createMiningCoordinator(
   @Override
   protected ProtocolSchedule createProtocolSchedule() {
     return CliqueProtocolSchedule.create(
-        genesisConfig.getConfigOptions(genesisConfigOverrides),
+        configOptionsSupplier.get(),
         nodeKey,
         privacyParameters,
-        isRevertReasonEnabled);
+        isRevertReasonEnabled,
+        evmConfiguration);
   }
 
   @Override
@@ -125,21 +125,29 @@ protected void validateContext(final ProtocolContext context) {
   }
 
   @Override
-  protected PluginServiceFactory createAdditionalPluginServices(final Blockchain blockchain) {
+  protected PluginServiceFactory createAdditionalPluginServices(
+      final Blockchain blockchain, final ProtocolContext protocolContext) {
     return new CliqueQueryPluginServiceFactory(blockchain, nodeKey);
   }
 
   @Override
   protected CliqueContext createConsensusContext(
-      final Blockchain blockchain, final WorldStateArchive worldStateArchive) {
-    return new CliqueContext(
-        new VoteTallyCache(
-            blockchain,
-            new VoteTallyUpdater(epochManager, blockInterface),
+      final Blockchain blockchain,
+      final WorldStateArchive worldStateArchive,
+      final ProtocolSchedule protocolSchedule) {
+    final CliqueContext cliqueContext =
+        new CliqueContext(
+            BlockValidatorProvider.nonForkingValidatorProvider(
+                blockchain, epochManager, blockInterface),
             epochManager,
-            blockInterface),
-        new VoteProposer(),
-        epochManager,
-        blockInterface);
+            blockInterface);
+    installCliqueBlockChoiceRule(blockchain, cliqueContext);
+    return cliqueContext;
+  }
+
+  @Override
+  public MiningParameters getMiningParameterOverrides(final MiningParameters fromCli) {
+    // Clique mines by default, reflect that with in the mining parameters:
+    return new MiningParameters.Builder(fromCli).miningEnabled(true).build();
   }
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/controller/CliqueQueryPluginServiceFactory.java b/besu/src/main/java/org/hyperledger/besu/controller/CliqueQueryPluginServiceFactory.java
index 069631e5466..5395e2426eb 100644
--- a/besu/src/main/java/org/hyperledger/besu/controller/CliqueQueryPluginServiceFactory.java
+++ b/besu/src/main/java/org/hyperledger/besu/controller/CliqueQueryPluginServiceFactory.java
@@ -17,17 +17,24 @@
 import org.hyperledger.besu.consensus.clique.CliqueBlockInterface;
 import org.hyperledger.besu.consensus.common.BlockInterface;
 import org.hyperledger.besu.consensus.common.PoaQueryServiceImpl;
-import org.hyperledger.besu.crypto.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKey;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.plugin.services.metrics.PoAMetricsService;
 import org.hyperledger.besu.plugin.services.query.PoaQueryService;
 import org.hyperledger.besu.services.BesuPluginContextImpl;
 
+/** The Clique query plugin service factory. */
 public class CliqueQueryPluginServiceFactory implements PluginServiceFactory {
 
   private final Blockchain blockchain;
   private final NodeKey nodeKey;
 
+  /**
+   * Instantiates a new Clique query plugin service factory.
+   *
+   * @param blockchain the blockchain
+   * @param nodeKey the node key
+   */
   public CliqueQueryPluginServiceFactory(final Blockchain blockchain, final NodeKey nodeKey) {
     this.blockchain = blockchain;
     this.nodeKey = nodeKey;
diff --git a/besu/src/main/java/org/hyperledger/besu/controller/ConsensusScheduleBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/ConsensusScheduleBesuControllerBuilder.java
new file mode 100644
index 00000000000..6d0d02b22f0
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/controller/ConsensusScheduleBesuControllerBuilder.java
@@ -0,0 +1,444 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ *  the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.controller;
+
+import static org.hyperledger.besu.ethereum.core.BlockHeader.GENESIS_BLOCK_NUMBER;
+
+import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.consensus.common.CombinedProtocolScheduleFactory;
+import org.hyperledger.besu.consensus.common.ForkSpec;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.MigratingContext;
+import org.hyperledger.besu.consensus.common.MigratingMiningCoordinator;
+import org.hyperledger.besu.consensus.common.MigratingProtocolContext;
+import org.hyperledger.besu.consensus.qbft.pki.PkiBlockCreationConfiguration;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ConsensusContext;
+import org.hyperledger.besu.ethereum.ConsensusContextFactory;
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.methods.JsonRpcMethods;
+import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthMessages;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.eth.manager.MergePeerFilter;
+import org.hyperledger.besu.ethereum.eth.manager.snap.SnapProtocolManager;
+import org.hyperledger.besu.ethereum.eth.peervalidation.PeerValidator;
+import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.p2p.config.SubProtocolConfiguration;
+import org.hyperledger.besu.ethereum.storage.StorageProvider;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
+import org.hyperledger.besu.ethereum.worldstate.PrunerConfiguration;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.metrics.ObservableMetricsSystem;
+import org.hyperledger.besu.plugin.services.permissioning.NodeMessagePermissioningProvider;
+import org.hyperledger.besu.plugin.services.txselection.TransactionSelectorFactory;
+
+import java.math.BigInteger;
+import java.nio.file.Path;
+import java.time.Clock;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableSet;
+import java.util.Optional;
+import java.util.TreeSet;
+import java.util.function.BiFunction;
+import java.util.stream.Collectors;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+
+/**
+ * This is a placeholder class for the QBFT migration logic. For now, all it does is to delegate any
+ * BesuControllerBuilder to the first controller in the list.
+ */
+public class ConsensusScheduleBesuControllerBuilder extends BesuControllerBuilder {
+
+  private final Map<Long, BesuControllerBuilder> besuControllerBuilderSchedule = new HashMap<>();
+  private final BiFunction<
+          NavigableSet<ForkSpec<ProtocolSchedule>>, Optional<BigInteger>, ProtocolSchedule>
+      combinedProtocolScheduleFactory;
+
+  /**
+   * Instantiates a new Consensus schedule Besu controller builder.
+   *
+   * @param besuControllerBuilderSchedule the besu controller builder schedule
+   */
+  public ConsensusScheduleBesuControllerBuilder(
+      final Map<Long, BesuControllerBuilder> besuControllerBuilderSchedule) {
+    this(
+        besuControllerBuilderSchedule,
+        (protocolScheduleSpecs, chainId) ->
+            new CombinedProtocolScheduleFactory().create(protocolScheduleSpecs, chainId));
+  }
+
+  /**
+   * Instantiates a new Consensus schedule besu controller builder. Visible for testing.
+   *
+   * @param besuControllerBuilderSchedule the besu controller builder schedule
+   * @param combinedProtocolScheduleFactory the combined protocol schedule factory
+   */
+  @VisibleForTesting
+  protected ConsensusScheduleBesuControllerBuilder(
+      final Map<Long, BesuControllerBuilder> besuControllerBuilderSchedule,
+      final BiFunction<
+              NavigableSet<ForkSpec<ProtocolSchedule>>, Optional<BigInteger>, ProtocolSchedule>
+          combinedProtocolScheduleFactory) {
+    Preconditions.checkNotNull(
+        besuControllerBuilderSchedule, "BesuControllerBuilder schedule can't be null");
+    Preconditions.checkArgument(
+        !besuControllerBuilderSchedule.isEmpty(), "BesuControllerBuilder schedule can't be empty");
+    this.besuControllerBuilderSchedule.putAll(besuControllerBuilderSchedule);
+    this.combinedProtocolScheduleFactory = combinedProtocolScheduleFactory;
+  }
+
+  @Override
+  protected void prepForBuild() {
+    besuControllerBuilderSchedule.values().forEach(BesuControllerBuilder::prepForBuild);
+    super.prepForBuild();
+  }
+
+  @Override
+  protected MiningCoordinator createMiningCoordinator(
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final TransactionPool transactionPool,
+      final MiningParameters miningParameters,
+      final SyncState syncState,
+      final EthProtocolManager ethProtocolManager) {
+
+    final List<ForkSpec<MiningCoordinator>> miningCoordinatorForkSpecs =
+        besuControllerBuilderSchedule.entrySet().stream()
+            .map(
+                e ->
+                    new ForkSpec<>(
+                        e.getKey(),
+                        e.getValue()
+                            .createMiningCoordinator(
+                                protocolSchedule,
+                                protocolContext,
+                                transactionPool,
+                                miningParameters,
+                                syncState,
+                                ethProtocolManager)))
+            .collect(Collectors.toList());
+    final ForksSchedule<MiningCoordinator> miningCoordinatorSchedule =
+        new ForksSchedule<>(miningCoordinatorForkSpecs);
+
+    return new MigratingMiningCoordinator(
+        miningCoordinatorSchedule, protocolContext.getBlockchain());
+  }
+
+  @Override
+  protected ProtocolSchedule createProtocolSchedule() {
+    final NavigableSet<ForkSpec<ProtocolSchedule>> protocolScheduleSpecs =
+        besuControllerBuilderSchedule.entrySet().stream()
+            .map(e -> new ForkSpec<>(e.getKey(), e.getValue().createProtocolSchedule()))
+            .collect(Collectors.toCollection(() -> new TreeSet<>(ForkSpec.COMPARATOR)));
+    final Optional<BigInteger> chainId = configOptionsSupplier.get().getChainId();
+    return combinedProtocolScheduleFactory.apply(protocolScheduleSpecs, chainId);
+  }
+
+  @Override
+  protected ProtocolContext createProtocolContext(
+      final MutableBlockchain blockchain,
+      final WorldStateArchive worldStateArchive,
+      final ProtocolSchedule protocolSchedule,
+      final ConsensusContextFactory consensusContextFactory,
+      final Optional<TransactionSelectorFactory> transactionSelectorFactory) {
+    return MigratingProtocolContext.init(
+        blockchain,
+        worldStateArchive,
+        protocolSchedule,
+        consensusContextFactory,
+        transactionSelectorFactory);
+  }
+
+  @Override
+  protected ConsensusContext createConsensusContext(
+      final Blockchain blockchain,
+      final WorldStateArchive worldStateArchive,
+      final ProtocolSchedule protocolSchedule) {
+    final List<ForkSpec<ConsensusContext>> consensusContextSpecs =
+        besuControllerBuilderSchedule.entrySet().stream()
+            .map(
+                e ->
+                    new ForkSpec<>(
+                        e.getKey(),
+                        e.getValue()
+                            .createConsensusContext(
+                                blockchain, worldStateArchive, protocolSchedule)))
+            .collect(Collectors.toList());
+    final ForksSchedule<ConsensusContext> consensusContextsSchedule =
+        new ForksSchedule<>(consensusContextSpecs);
+    return new MigratingContext(consensusContextsSchedule);
+  }
+
+  @Override
+  protected PluginServiceFactory createAdditionalPluginServices(
+      final Blockchain blockchain, final ProtocolContext protocolContext) {
+    return besuControllerBuilderSchedule
+        .get(0L)
+        .createAdditionalPluginServices(blockchain, protocolContext);
+  }
+
+  @Override
+  protected JsonRpcMethods createAdditionalJsonRpcMethodFactory(
+      final ProtocolContext protocolContext) {
+    return besuControllerBuilderSchedule
+        .get(0L)
+        .createAdditionalJsonRpcMethodFactory(protocolContext);
+  }
+
+  @Override
+  protected SubProtocolConfiguration createSubProtocolConfiguration(
+      final EthProtocolManager ethProtocolManager,
+      final Optional<SnapProtocolManager> maybeSnapProtocolManager) {
+    return besuControllerBuilderSchedule
+        .get(0L)
+        .createSubProtocolConfiguration(ethProtocolManager, maybeSnapProtocolManager);
+  }
+
+  @Override
+  protected void validateContext(final ProtocolContext context) {
+    besuControllerBuilderSchedule.get(GENESIS_BLOCK_NUMBER).validateContext(context);
+  }
+
+  @Override
+  protected String getSupportedProtocol() {
+    return besuControllerBuilderSchedule.get(0L).getSupportedProtocol();
+  }
+
+  @Override
+  protected EthProtocolManager createEthProtocolManager(
+      final ProtocolContext protocolContext,
+      final SynchronizerConfiguration synchronizerConfiguration,
+      final TransactionPool transactionPool,
+      final EthProtocolConfiguration ethereumWireProtocolConfiguration,
+      final EthPeers ethPeers,
+      final EthContext ethContext,
+      final EthMessages ethMessages,
+      final EthScheduler scheduler,
+      final List<PeerValidator> peerValidators,
+      final Optional<MergePeerFilter> mergePeerFilter) {
+    return besuControllerBuilderSchedule
+        .get(0L)
+        .createEthProtocolManager(
+            protocolContext,
+            synchronizerConfiguration,
+            transactionPool,
+            ethereumWireProtocolConfiguration,
+            ethPeers,
+            ethContext,
+            ethMessages,
+            scheduler,
+            peerValidators,
+            mergePeerFilter);
+  }
+
+  @Override
+  public BesuControllerBuilder storageProvider(final StorageProvider storageProvider) {
+    besuControllerBuilderSchedule.values().forEach(b -> b.storageProvider(storageProvider));
+    return super.storageProvider(storageProvider);
+  }
+
+  @Override
+  public BesuControllerBuilder genesisConfigFile(final GenesisConfigFile genesisConfig) {
+    besuControllerBuilderSchedule.values().forEach(b -> b.genesisConfigFile(genesisConfig));
+    return super.genesisConfigFile(genesisConfig);
+  }
+
+  @Override
+  public BesuControllerBuilder synchronizerConfiguration(
+      final SynchronizerConfiguration synchronizerConfig) {
+    besuControllerBuilderSchedule
+        .values()
+        .forEach(b -> b.synchronizerConfiguration(synchronizerConfig));
+    return super.synchronizerConfiguration(synchronizerConfig);
+  }
+
+  @Override
+  public BesuControllerBuilder ethProtocolConfiguration(
+      final EthProtocolConfiguration ethProtocolConfiguration) {
+    besuControllerBuilderSchedule
+        .values()
+        .forEach(b -> b.ethProtocolConfiguration(ethProtocolConfiguration));
+    return super.ethProtocolConfiguration(ethProtocolConfiguration);
+  }
+
+  @Override
+  public BesuControllerBuilder networkId(final BigInteger networkId) {
+    besuControllerBuilderSchedule.values().forEach(b -> b.networkId(networkId));
+    return super.networkId(networkId);
+  }
+
+  @Override
+  public BesuControllerBuilder miningParameters(final MiningParameters miningParameters) {
+    besuControllerBuilderSchedule.values().forEach(b -> b.miningParameters(miningParameters));
+    return super.miningParameters(miningParameters);
+  }
+
+  @Override
+  public BesuControllerBuilder messagePermissioningProviders(
+      final List<NodeMessagePermissioningProvider> messagePermissioningProviders) {
+    besuControllerBuilderSchedule
+        .values()
+        .forEach(b -> b.messagePermissioningProviders(messagePermissioningProviders));
+    return super.messagePermissioningProviders(messagePermissioningProviders);
+  }
+
+  @Override
+  public BesuControllerBuilder nodeKey(final NodeKey nodeKey) {
+    besuControllerBuilderSchedule.values().forEach(b -> b.nodeKey(nodeKey));
+    return super.nodeKey(nodeKey);
+  }
+
+  @Override
+  public BesuControllerBuilder metricsSystem(final ObservableMetricsSystem metricsSystem) {
+    besuControllerBuilderSchedule.values().forEach(b -> b.metricsSystem(metricsSystem));
+    return super.metricsSystem(metricsSystem);
+  }
+
+  @Override
+  public BesuControllerBuilder privacyParameters(final PrivacyParameters privacyParameters) {
+    besuControllerBuilderSchedule.values().forEach(b -> b.privacyParameters(privacyParameters));
+    return super.privacyParameters(privacyParameters);
+  }
+
+  @Override
+  public BesuControllerBuilder pkiBlockCreationConfiguration(
+      final Optional<PkiBlockCreationConfiguration> pkiBlockCreationConfiguration) {
+    besuControllerBuilderSchedule
+        .values()
+        .forEach(b -> b.pkiBlockCreationConfiguration(pkiBlockCreationConfiguration));
+    return super.pkiBlockCreationConfiguration(pkiBlockCreationConfiguration);
+  }
+
+  @Override
+  public BesuControllerBuilder dataDirectory(final Path dataDirectory) {
+    besuControllerBuilderSchedule.values().forEach(b -> b.dataDirectory(dataDirectory));
+    return super.dataDirectory(dataDirectory);
+  }
+
+  @Override
+  public BesuControllerBuilder clock(final Clock clock) {
+    besuControllerBuilderSchedule.values().forEach(b -> b.clock(clock));
+    return super.clock(clock);
+  }
+
+  @Override
+  public BesuControllerBuilder transactionPoolConfiguration(
+      final TransactionPoolConfiguration transactionPoolConfiguration) {
+    besuControllerBuilderSchedule
+        .values()
+        .forEach(b -> b.transactionPoolConfiguration(transactionPoolConfiguration));
+    return super.transactionPoolConfiguration(transactionPoolConfiguration);
+  }
+
+  @Override
+  public BesuControllerBuilder isRevertReasonEnabled(final boolean isRevertReasonEnabled) {
+    besuControllerBuilderSchedule
+        .values()
+        .forEach(b -> b.isRevertReasonEnabled(isRevertReasonEnabled));
+    return super.isRevertReasonEnabled(isRevertReasonEnabled);
+  }
+
+  @Override
+  public BesuControllerBuilder isPruningEnabled(final boolean isPruningEnabled) {
+    besuControllerBuilderSchedule.values().forEach(b -> b.isPruningEnabled(isPruningEnabled));
+    return super.isPruningEnabled(isPruningEnabled);
+  }
+
+  @Override
+  public BesuControllerBuilder pruningConfiguration(final PrunerConfiguration prunerConfiguration) {
+    besuControllerBuilderSchedule
+        .values()
+        .forEach(b -> b.pruningConfiguration(prunerConfiguration));
+    return super.pruningConfiguration(prunerConfiguration);
+  }
+
+  @Override
+  public BesuControllerBuilder genesisConfigOverrides(
+      final Map<String, String> genesisConfigOverrides) {
+    besuControllerBuilderSchedule
+        .values()
+        .forEach(b -> b.genesisConfigOverrides(genesisConfigOverrides));
+    return super.genesisConfigOverrides(genesisConfigOverrides);
+  }
+
+  @Override
+  public BesuControllerBuilder gasLimitCalculator(final GasLimitCalculator gasLimitCalculator) {
+    besuControllerBuilderSchedule.values().forEach(b -> b.gasLimitCalculator(gasLimitCalculator));
+    return super.gasLimitCalculator(gasLimitCalculator);
+  }
+
+  @Override
+  public BesuControllerBuilder requiredBlocks(final Map<Long, Hash> requiredBlocks) {
+    besuControllerBuilderSchedule.values().forEach(b -> b.requiredBlocks(requiredBlocks));
+    return super.requiredBlocks(requiredBlocks);
+  }
+
+  @Override
+  public BesuControllerBuilder reorgLoggingThreshold(final long reorgLoggingThreshold) {
+    besuControllerBuilderSchedule
+        .values()
+        .forEach(b -> b.reorgLoggingThreshold(reorgLoggingThreshold));
+    return super.reorgLoggingThreshold(reorgLoggingThreshold);
+  }
+
+  @Override
+  public BesuControllerBuilder dataStorageConfiguration(
+      final DataStorageConfiguration dataStorageConfiguration) {
+    besuControllerBuilderSchedule
+        .values()
+        .forEach(b -> b.dataStorageConfiguration(dataStorageConfiguration));
+    return super.dataStorageConfiguration(dataStorageConfiguration);
+  }
+
+  @Override
+  public BesuControllerBuilder evmConfiguration(final EvmConfiguration evmConfiguration) {
+    besuControllerBuilderSchedule.values().forEach(b -> b.evmConfiguration(evmConfiguration));
+    return super.evmConfiguration(evmConfiguration);
+  }
+
+  /**
+   * Gets besu controller builder schedule. Visible for testing.
+   *
+   * @return the Besu controller builder schedule
+   */
+  @VisibleForTesting
+  Map<Long, BesuControllerBuilder> getBesuControllerBuilderSchedule() {
+    return besuControllerBuilderSchedule;
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/controller/IbftBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/IbftBesuControllerBuilder.java
index 76e66424733..0bd8c38bb80 100644
--- a/besu/src/main/java/org/hyperledger/besu/controller/IbftBesuControllerBuilder.java
+++ b/besu/src/main/java/org/hyperledger/besu/controller/IbftBesuControllerBuilder.java
@@ -14,56 +14,59 @@
  */
 package org.hyperledger.besu.controller;
 
+import org.hyperledger.besu.config.BftConfigOptions;
+import org.hyperledger.besu.config.BftFork;
 import org.hyperledger.besu.config.GenesisConfigOptions;
-import org.hyperledger.besu.config.IbftConfigOptions;
-import org.hyperledger.besu.config.IbftFork;
 import org.hyperledger.besu.consensus.common.BftValidatorOverrides;
-import org.hyperledger.besu.consensus.common.BlockInterface;
 import org.hyperledger.besu.consensus.common.EpochManager;
-import org.hyperledger.besu.consensus.common.ForkingVoteTallyCache;
-import org.hyperledger.besu.consensus.common.VoteProposer;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
-import org.hyperledger.besu.consensus.common.VoteTallyUpdater;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.bft.BftContext;
 import org.hyperledger.besu.consensus.common.bft.BftEventQueue;
 import org.hyperledger.besu.consensus.common.bft.BftExecutors;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
 import org.hyperledger.besu.consensus.common.bft.BftProcessor;
+import org.hyperledger.besu.consensus.common.bft.BftProtocolSchedule;
 import org.hyperledger.besu.consensus.common.bft.BlockTimer;
 import org.hyperledger.besu.consensus.common.bft.EthSynchronizerUpdater;
 import org.hyperledger.besu.consensus.common.bft.EventMultiplexer;
 import org.hyperledger.besu.consensus.common.bft.MessageTracker;
 import org.hyperledger.besu.consensus.common.bft.RoundTimer;
+import org.hyperledger.besu.consensus.common.bft.UniqueMessageMulticaster;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.BftBlockCreatorFactory;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.BftMiningCoordinator;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.ProposerSelector;
+import org.hyperledger.besu.consensus.common.bft.network.ValidatorPeers;
+import org.hyperledger.besu.consensus.common.bft.protocol.BftProtocolManager;
 import org.hyperledger.besu.consensus.common.bft.statemachine.BftEventHandler;
-import org.hyperledger.besu.consensus.ibft.IbftBlockInterface;
-import org.hyperledger.besu.consensus.ibft.IbftContext;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftFinalState;
+import org.hyperledger.besu.consensus.common.bft.statemachine.FutureMessageBuffer;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.common.validator.blockbased.BlockValidatorProvider;
+import org.hyperledger.besu.consensus.ibft.IbftExtraDataCodec;
+import org.hyperledger.besu.consensus.ibft.IbftForksSchedulesFactory;
 import org.hyperledger.besu.consensus.ibft.IbftGossip;
-import org.hyperledger.besu.consensus.ibft.IbftProtocolSchedule;
-import org.hyperledger.besu.consensus.ibft.UniqueMessageMulticaster;
-import org.hyperledger.besu.consensus.ibft.blockcreation.IbftBlockCreatorFactory;
-import org.hyperledger.besu.consensus.ibft.blockcreation.IbftMiningCoordinator;
-import org.hyperledger.besu.consensus.ibft.blockcreation.ProposerSelector;
+import org.hyperledger.besu.consensus.ibft.IbftProtocolScheduleBuilder;
 import org.hyperledger.besu.consensus.ibft.jsonrpc.IbftJsonRpcMethods;
-import org.hyperledger.besu.consensus.ibft.network.ValidatorPeers;
 import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
-import org.hyperledger.besu.consensus.ibft.protocol.IbftProtocolManager;
 import org.hyperledger.besu.consensus.ibft.protocol.IbftSubProtocol;
-import org.hyperledger.besu.consensus.ibft.statemachine.FutureMessageBuffer;
 import org.hyperledger.besu.consensus.ibft.statemachine.IbftBlockHeightManagerFactory;
 import org.hyperledger.besu.consensus.ibft.statemachine.IbftController;
-import org.hyperledger.besu.consensus.ibft.statemachine.IbftFinalState;
 import org.hyperledger.besu.consensus.ibft.statemachine.IbftRoundFactory;
 import org.hyperledger.besu.consensus.ibft.validation.MessageValidatorFactory;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.methods.JsonRpcMethods;
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.Util;
 import org.hyperledger.besu.ethereum.eth.EthProtocol;
+import org.hyperledger.besu.ethereum.eth.SnapProtocol;
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
+import org.hyperledger.besu.ethereum.eth.manager.snap.SnapProtocolManager;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
@@ -74,23 +77,33 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import com.google.common.base.Suppliers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class IbftBesuControllerBuilder extends BesuControllerBuilder {
+/** The Ibft besu controller builder. */
+public class IbftBesuControllerBuilder extends BftBesuControllerBuilder {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(IbftBesuControllerBuilder.class);
   private BftEventQueue bftEventQueue;
-  private IbftConfigOptions ibftConfig;
+  private BftConfigOptions bftConfig;
+  private ForksSchedule<BftConfigOptions> forksSchedule;
   private ValidatorPeers peers;
-  private final BlockInterface blockInterface = new IbftBlockInterface();
+
+  @Override
+  protected Supplier<BftExtraDataCodec> bftExtraDataCodec() {
+    return Suppliers.memoize(IbftExtraDataCodec::new);
+  }
 
   @Override
   protected void prepForBuild() {
-    ibftConfig = genesisConfig.getConfigOptions(genesisConfigOverrides).getIbft2ConfigOptions();
-    bftEventQueue = new BftEventQueue(ibftConfig.getMessageQueueLimit());
+    bftConfig = configOptionsSupplier.get().getBftConfigOptions();
+    bftEventQueue = new BftEventQueue(bftConfig.getMessageQueueLimit());
+    forksSchedule = IbftForksSchedulesFactory.create(configOptionsSupplier.get());
   }
 
   @Override
@@ -101,10 +114,20 @@ protected JsonRpcMethods createAdditionalJsonRpcMethodFactory(
 
   @Override
   protected SubProtocolConfiguration createSubProtocolConfiguration(
-      final EthProtocolManager ethProtocolManager) {
-    return new SubProtocolConfiguration()
-        .withSubProtocol(EthProtocol.get(), ethProtocolManager)
-        .withSubProtocol(IbftSubProtocol.get(), new IbftProtocolManager(bftEventQueue, peers));
+      final EthProtocolManager ethProtocolManager,
+      final Optional<SnapProtocolManager> maybeSnapProtocolManager) {
+    final SubProtocolConfiguration subProtocolConfiguration =
+        new SubProtocolConfiguration()
+            .withSubProtocol(EthProtocol.get(), ethProtocolManager)
+            .withSubProtocol(
+                IbftSubProtocol.get(),
+                new BftProtocolManager(
+                    bftEventQueue, peers, IbftSubProtocol.IBFV1, IbftSubProtocol.get().getName()));
+    maybeSnapProtocolManager.ifPresent(
+        snapProtocolManager -> {
+          subProtocolConfiguration.withSubProtocol(SnapProtocol.get(), snapProtocolManager);
+        });
+    return subProtocolConfiguration;
   }
 
   @Override
@@ -116,49 +139,51 @@ protected MiningCoordinator createMiningCoordinator(
       final SyncState syncState,
       final EthProtocolManager ethProtocolManager) {
     final MutableBlockchain blockchain = protocolContext.getBlockchain();
-    final BftExecutors bftExecutors = BftExecutors.create(metricsSystem);
+    final BftExecutors bftExecutors =
+        BftExecutors.create(metricsSystem, BftExecutors.ConsensusType.IBFT);
 
     final Address localAddress = Util.publicKeyToAddress(nodeKey.getPublicKey());
-    final IbftBlockCreatorFactory blockCreatorFactory =
-        new IbftBlockCreatorFactory(
-            gasLimitCalculator,
+    final BftProtocolSchedule bftProtocolSchedule = (BftProtocolSchedule) protocolSchedule;
+    final BftBlockCreatorFactory<?> blockCreatorFactory =
+        new BftBlockCreatorFactory<>(
             transactionPool.getPendingTransactions(),
             protocolContext,
-            protocolSchedule,
+            bftProtocolSchedule,
+            forksSchedule,
             miningParameters,
             localAddress,
-            ibftConfig.getMiningBeneficiary().map(Address::fromHexString).orElse(localAddress));
+            bftExtraDataCodec().get());
 
-    // NOTE: peers should not be used for accessing the network as it does not enforce the
-    // "only send once" filter applied by the UniqueMessageMulticaster.
-    final VoteTallyCache voteTallyCache =
-        protocolContext.getConsensusState(IbftContext.class).getVoteTallyCache();
+    final ValidatorProvider validatorProvider =
+        protocolContext.getConsensusContext(BftContext.class).getValidatorProvider();
 
     final ProposerSelector proposerSelector =
-        new ProposerSelector(blockchain, blockInterface, true, voteTallyCache);
+        new ProposerSelector(blockchain, bftBlockInterface().get(), true, validatorProvider);
 
-    peers = new ValidatorPeers(voteTallyCache);
+    // NOTE: peers should not be used for accessing the network as it does not enforce the
+    // "only send once" filter applied by the UniqueMessageMulticaster.
+    peers = new ValidatorPeers(validatorProvider, IbftSubProtocol.NAME);
 
     final UniqueMessageMulticaster uniqueMessageMulticaster =
-        new UniqueMessageMulticaster(peers, ibftConfig.getGossipedHistoryLimit());
+        new UniqueMessageMulticaster(peers, bftConfig.getGossipedHistoryLimit());
 
     final IbftGossip gossiper = new IbftGossip(uniqueMessageMulticaster);
 
-    final IbftFinalState finalState =
-        new IbftFinalState(
-            voteTallyCache,
+    final BftFinalState finalState =
+        new BftFinalState(
+            validatorProvider,
             nodeKey,
             Util.publicKeyToAddress(nodeKey.getPublicKey()),
             proposerSelector,
             uniqueMessageMulticaster,
-            new RoundTimer(bftEventQueue, ibftConfig.getRequestTimeoutSeconds(), bftExecutors),
-            new BlockTimer(bftEventQueue, ibftConfig.getBlockPeriodSeconds(), bftExecutors, clock),
+            new RoundTimer(bftEventQueue, bftConfig.getRequestTimeoutSeconds(), bftExecutors),
+            new BlockTimer(bftEventQueue, forksSchedule, bftExecutors, clock),
             blockCreatorFactory,
-            new MessageFactory(nodeKey),
             clock);
 
     final MessageValidatorFactory messageValidatorFactory =
-        new MessageValidatorFactory(proposerSelector, protocolSchedule, protocolContext);
+        new MessageValidatorFactory(
+            proposerSelector, bftProtocolSchedule, protocolContext, bftExtraDataCodec().get());
 
     final Subscribers<MinedBlockObserver> minedBlockObservers = Subscribers.create();
     minedBlockObservers.subscribe(ethProtocolManager);
@@ -166,11 +191,13 @@ protected MiningCoordinator createMiningCoordinator(
 
     final FutureMessageBuffer futureMessageBuffer =
         new FutureMessageBuffer(
-            ibftConfig.getFutureMessagesMaxDistance(),
-            ibftConfig.getFutureMessagesLimit(),
+            bftConfig.getFutureMessagesMaxDistance(),
+            bftConfig.getFutureMessagesLimit(),
             blockchain.getChainHeadBlockNumber());
     final MessageTracker duplicateMessageTracker =
-        new MessageTracker(ibftConfig.getDuplicateMessageLimit());
+        new MessageTracker(bftConfig.getDuplicateMessageLimit());
+
+    final MessageFactory messageFactory = new MessageFactory(nodeKey);
 
     final BftEventHandler ibftController =
         new IbftController(
@@ -181,10 +208,13 @@ protected MiningCoordinator createMiningCoordinator(
                 new IbftRoundFactory(
                     finalState,
                     protocolContext,
-                    protocolSchedule,
+                    bftProtocolSchedule,
                     minedBlockObservers,
-                    messageValidatorFactory),
-                messageValidatorFactory),
+                    messageValidatorFactory,
+                    messageFactory,
+                    bftExtraDataCodec().get()),
+                messageValidatorFactory,
+                messageFactory),
             gossiper,
             duplicateMessageTracker,
             futureMessageBuffer,
@@ -194,7 +224,7 @@ protected MiningCoordinator createMiningCoordinator(
     final BftProcessor bftProcessor = new BftProcessor(bftEventQueue, eventMultiplexer);
 
     final MiningCoordinator ibftMiningCoordinator =
-        new IbftMiningCoordinator(
+        new BftMiningCoordinator(
             bftExecutors,
             ibftController,
             bftProcessor,
@@ -207,56 +237,59 @@ protected MiningCoordinator createMiningCoordinator(
   }
 
   @Override
-  protected PluginServiceFactory createAdditionalPluginServices(final Blockchain blockchain) {
-    return new IbftQueryPluginServiceFactory(blockchain, nodeKey);
+  protected PluginServiceFactory createAdditionalPluginServices(
+      final Blockchain blockchain, final ProtocolContext protocolContext) {
+    final ValidatorProvider validatorProvider =
+        protocolContext.getConsensusContext(BftContext.class).getValidatorProvider();
+    return new IbftQueryPluginServiceFactory(
+        blockchain, bftBlockInterface().get(), validatorProvider, nodeKey);
   }
 
   @Override
   protected ProtocolSchedule createProtocolSchedule() {
-    return IbftProtocolSchedule.create(
-        genesisConfig.getConfigOptions(genesisConfigOverrides),
+    return IbftProtocolScheduleBuilder.create(
+        configOptionsSupplier.get(),
+        forksSchedule,
         privacyParameters,
-        isRevertReasonEnabled);
+        isRevertReasonEnabled,
+        bftExtraDataCodec().get(),
+        evmConfiguration);
   }
 
   @Override
   protected void validateContext(final ProtocolContext context) {
     final BlockHeader genesisBlockHeader = context.getBlockchain().getGenesisBlock().getHeader();
 
-    if (blockInterface.validatorsInBlock(genesisBlockHeader).isEmpty()) {
+    if (bftBlockInterface().get().validatorsInBlock(genesisBlockHeader).isEmpty()) {
       LOG.warn("Genesis block contains no signers - chain will not progress.");
     }
   }
 
   @Override
-  protected IbftContext createConsensusContext(
-      final Blockchain blockchain, final WorldStateArchive worldStateArchive) {
-    final GenesisConfigOptions configOptions =
-        genesisConfig.getConfigOptions(genesisConfigOverrides);
-    final IbftConfigOptions ibftConfig = configOptions.getIbft2ConfigOptions();
+  protected BftContext createConsensusContext(
+      final Blockchain blockchain,
+      final WorldStateArchive worldStateArchive,
+      final ProtocolSchedule protocolSchedule) {
+    final GenesisConfigOptions configOptions = configOptionsSupplier.get();
+    final BftConfigOptions ibftConfig = configOptions.getBftConfigOptions();
     final EpochManager epochManager = new EpochManager(ibftConfig.getEpochLength());
 
-    final Map<Long, List<Address>> ibftValidatorForkMap =
+    final BftValidatorOverrides validatorOverrides =
         convertIbftForks(configOptions.getTransitions().getIbftForks());
 
-    return new IbftContext(
-        new ForkingVoteTallyCache(
-            blockchain,
-            new VoteTallyUpdater(epochManager, new IbftBlockInterface()),
-            epochManager,
-            new IbftBlockInterface(),
-            new BftValidatorOverrides(ibftValidatorForkMap)),
-        new VoteProposer(),
+    return new BftContext(
+        BlockValidatorProvider.forkingValidatorProvider(
+            blockchain, epochManager, bftBlockInterface().get(), validatorOverrides),
         epochManager,
-        blockInterface);
+        bftBlockInterface().get());
   }
 
-  private Map<Long, List<Address>> convertIbftForks(final List<IbftFork> ibftForks) {
+  private BftValidatorOverrides convertIbftForks(final List<BftFork> bftForks) {
     final Map<Long, List<Address>> result = new HashMap<>();
 
-    for (final IbftFork fork : ibftForks) {
+    for (final BftFork fork : bftForks) {
       fork.getValidators()
-          .map(
+          .ifPresent(
               validators ->
                   result.put(
                       fork.getForkBlock(),
@@ -265,7 +298,7 @@ private Map<Long, List<Address>> convertIbftForks(final List<IbftFork> ibftForks
                           .collect(Collectors.toList())));
     }
 
-    return result;
+    return new BftValidatorOverrides(result);
   }
 
   private static MinedBlockObserver blockLogger(
diff --git a/besu/src/main/java/org/hyperledger/besu/controller/IbftLegacyBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/IbftLegacyBesuControllerBuilder.java
deleted file mode 100644
index 28751d44687..00000000000
--- a/besu/src/main/java/org/hyperledger/besu/controller/IbftLegacyBesuControllerBuilder.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.controller;
-
-import org.hyperledger.besu.config.IbftConfigOptions;
-import org.hyperledger.besu.consensus.common.BlockInterface;
-import org.hyperledger.besu.consensus.common.EpochManager;
-import org.hyperledger.besu.consensus.common.VoteProposer;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
-import org.hyperledger.besu.consensus.common.VoteTallyUpdater;
-import org.hyperledger.besu.consensus.ibft.IbftContext;
-import org.hyperledger.besu.consensus.ibftlegacy.IbftLegacyBlockInterface;
-import org.hyperledger.besu.consensus.ibftlegacy.IbftProtocolSchedule;
-import org.hyperledger.besu.consensus.ibftlegacy.protocol.Istanbul64Protocol;
-import org.hyperledger.besu.consensus.ibftlegacy.protocol.Istanbul64ProtocolManager;
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
-import org.hyperledger.besu.ethereum.blockcreation.NoopMiningCoordinator;
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.MiningParameters;
-import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
-import org.hyperledger.besu.ethereum.eth.manager.EthContext;
-import org.hyperledger.besu.ethereum.eth.manager.EthMessages;
-import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
-import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
-import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
-import org.hyperledger.besu.ethereum.eth.peervalidation.PeerValidator;
-import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.ethereum.p2p.config.SubProtocolConfiguration;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
-
-import java.util.List;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-public class IbftLegacyBesuControllerBuilder extends BesuControllerBuilder {
-
-  private static final Logger LOG = LogManager.getLogger();
-  private final BlockInterface blockInterface = new IbftLegacyBlockInterface();
-
-  @Override
-  protected SubProtocolConfiguration createSubProtocolConfiguration(
-      final EthProtocolManager ethProtocolManager) {
-    return new SubProtocolConfiguration()
-        .withSubProtocol(Istanbul64Protocol.get(), ethProtocolManager);
-  }
-
-  @Override
-  protected MiningCoordinator createMiningCoordinator(
-      final ProtocolSchedule protocolSchedule,
-      final ProtocolContext protocolContext,
-      final TransactionPool transactionPool,
-      final MiningParameters miningParameters,
-      final SyncState syncState,
-      final EthProtocolManager ethProtocolManager) {
-    return new NoopMiningCoordinator(miningParameters);
-  }
-
-  @Override
-  protected ProtocolSchedule createProtocolSchedule() {
-    return IbftProtocolSchedule.create(
-        genesisConfig.getConfigOptions(genesisConfigOverrides),
-        privacyParameters,
-        isRevertReasonEnabled);
-  }
-
-  @Override
-  protected IbftContext createConsensusContext(
-      final Blockchain blockchain, final WorldStateArchive worldStateArchive) {
-    final IbftConfigOptions ibftConfig =
-        genesisConfig.getConfigOptions(genesisConfigOverrides).getIbftLegacyConfigOptions();
-    final EpochManager epochManager = new EpochManager(ibftConfig.getEpochLength());
-    final VoteTallyCache voteTallyCache =
-        new VoteTallyCache(
-            blockchain,
-            new VoteTallyUpdater(epochManager, blockInterface),
-            epochManager,
-            blockInterface);
-
-    final VoteProposer voteProposer = new VoteProposer();
-    return new IbftContext(voteTallyCache, voteProposer, epochManager, blockInterface);
-  }
-
-  @Override
-  protected PluginServiceFactory createAdditionalPluginServices(final Blockchain blockchain) {
-    return new NoopPluginServiceFactory();
-  }
-
-  @Override
-  protected void validateContext(final ProtocolContext context) {
-    final BlockHeader genesisBlockHeader = context.getBlockchain().getGenesisBlock().getHeader();
-
-    if (blockInterface.validatorsInBlock(genesisBlockHeader).isEmpty()) {
-      LOG.warn("Genesis block contains no signers - chain will not progress.");
-    }
-  }
-
-  @Override
-  protected String getSupportedProtocol() {
-    return Istanbul64Protocol.get().getName();
-  }
-
-  @Override
-  protected EthProtocolManager createEthProtocolManager(
-      final ProtocolContext protocolContext,
-      final boolean fastSyncEnabled,
-      final TransactionPool transactionPool,
-      final EthProtocolConfiguration ethereumWireProtocolConfiguration,
-      final EthPeers ethPeers,
-      final EthContext ethContext,
-      final EthMessages ethMessages,
-      final EthScheduler scheduler,
-      final List<PeerValidator> peerValidators) {
-    LOG.info("Operating on IBFT-1.0 network.");
-    return new Istanbul64ProtocolManager(
-        protocolContext.getBlockchain(),
-        networkId,
-        protocolContext.getWorldStateArchive(),
-        transactionPool,
-        ethereumWireProtocolConfiguration,
-        ethPeers,
-        ethMessages,
-        ethContext,
-        peerValidators,
-        fastSyncEnabled,
-        scheduler);
-  }
-}
diff --git a/besu/src/main/java/org/hyperledger/besu/controller/IbftQueryPluginServiceFactory.java b/besu/src/main/java/org/hyperledger/besu/controller/IbftQueryPluginServiceFactory.java
index 67223f6e5c8..b02f9a519c3 100644
--- a/besu/src/main/java/org/hyperledger/besu/controller/IbftQueryPluginServiceFactory.java
+++ b/besu/src/main/java/org/hyperledger/besu/controller/IbftQueryPluginServiceFactory.java
@@ -14,34 +14,55 @@
  */
 package org.hyperledger.besu.controller;
 
-import org.hyperledger.besu.consensus.common.BlockInterface;
-import org.hyperledger.besu.consensus.ibft.IbftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.queries.BftQueryServiceImpl;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
 import org.hyperledger.besu.consensus.ibft.queries.IbftQueryServiceImpl;
-import org.hyperledger.besu.crypto.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKey;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.plugin.services.metrics.PoAMetricsService;
+import org.hyperledger.besu.plugin.services.query.BftQueryService;
 import org.hyperledger.besu.plugin.services.query.IbftQueryService;
 import org.hyperledger.besu.plugin.services.query.PoaQueryService;
 import org.hyperledger.besu.services.BesuPluginContextImpl;
 
+/** The IBFT query plugin service factory. */
 public class IbftQueryPluginServiceFactory implements PluginServiceFactory {
 
   private final Blockchain blockchain;
+  private final BftBlockInterface blockInterface;
+  private final ValidatorProvider validatorProvider;
   private final NodeKey nodeKey;
 
-  public IbftQueryPluginServiceFactory(final Blockchain blockchain, final NodeKey nodeKey) {
+  /**
+   * Instantiates a new Ibft query plugin service factory.
+   *
+   * @param blockchain the blockchain
+   * @param blockInterface the block interface
+   * @param validatorProvider the validator provider
+   * @param nodeKey the node key
+   */
+  public IbftQueryPluginServiceFactory(
+      final Blockchain blockchain,
+      final BftBlockInterface blockInterface,
+      final ValidatorProvider validatorProvider,
+      final NodeKey nodeKey) {
     this.blockchain = blockchain;
+    this.blockInterface = blockInterface;
+    this.validatorProvider = validatorProvider;
     this.nodeKey = nodeKey;
   }
 
   @Override
   public void appendPluginServices(final BesuPluginContextImpl besuContext) {
-    final BlockInterface blockInterface = new IbftBlockInterface();
-
     final IbftQueryServiceImpl service =
         new IbftQueryServiceImpl(blockInterface, blockchain, nodeKey);
     besuContext.addService(IbftQueryService.class, service);
     besuContext.addService(PoaQueryService.class, service);
     besuContext.addService(PoAMetricsService.class, service);
+
+    final BftQueryServiceImpl bftService =
+        new BftQueryServiceImpl(blockInterface, blockchain, validatorProvider, nodeKey, "ibft");
+    besuContext.addService(BftQueryService.class, bftService);
   }
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/controller/MainnetBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/MainnetBesuControllerBuilder.java
index af5e63ecc87..7bd297e9975 100644
--- a/besu/src/main/java/org/hyperledger/besu/controller/MainnetBesuControllerBuilder.java
+++ b/besu/src/main/java/org/hyperledger/besu/controller/MainnetBesuControllerBuilder.java
@@ -14,11 +14,12 @@
  */
 package org.hyperledger.besu.controller;
 
+import org.hyperledger.besu.ethereum.ConsensusContext;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.blockcreation.DefaultBlockScheduler;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMinerExecutor;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMinerExecutor;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
@@ -30,6 +31,7 @@
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 
+/** The Mainnet besu controller builder. */
 public class MainnetBesuControllerBuilder extends BesuControllerBuilder {
 
   private EpochCalculator epochCalculator = new EpochCalculator.DefaultEpochCalculator();
@@ -42,8 +44,9 @@ protected MiningCoordinator createMiningCoordinator(
       final MiningParameters miningParameters,
       final SyncState syncState,
       final EthProtocolManager ethProtocolManager) {
-    final EthHashMinerExecutor executor =
-        new EthHashMinerExecutor(
+
+    final PoWMinerExecutor executor =
+        new PoWMinerExecutor(
             protocolContext,
             protocolSchedule,
             transactionPool.getPendingTransactions(),
@@ -52,11 +55,12 @@ protected MiningCoordinator createMiningCoordinator(
                 MainnetBlockHeaderValidator.MINIMUM_SECONDS_SINCE_PARENT,
                 MainnetBlockHeaderValidator.TIMESTAMP_TOLERANCE_S,
                 clock),
-            gasLimitCalculator,
-            epochCalculator);
+            epochCalculator,
+            miningParameters.getPowJobTimeToLive(),
+            miningParameters.getMaxOmmerDepth());
 
-    final EthHashMiningCoordinator miningCoordinator =
-        new EthHashMiningCoordinator(
+    final PoWMiningCoordinator miningCoordinator =
+        new PoWMiningCoordinator(
             protocolContext.getBlockchain(),
             executor,
             syncState,
@@ -72,28 +76,29 @@ protected MiningCoordinator createMiningCoordinator(
   }
 
   @Override
-  protected Void createConsensusContext(
-      final Blockchain blockchain, final WorldStateArchive worldStateArchive) {
+  protected ConsensusContext createConsensusContext(
+      final Blockchain blockchain,
+      final WorldStateArchive worldStateArchive,
+      final ProtocolSchedule protocolSchedule) {
     return null;
   }
 
   @Override
-  protected PluginServiceFactory createAdditionalPluginServices(final Blockchain blockchain) {
+  protected PluginServiceFactory createAdditionalPluginServices(
+      final Blockchain blockchain, final ProtocolContext protocolContext) {
     return new NoopPluginServiceFactory();
   }
 
   @Override
   protected ProtocolSchedule createProtocolSchedule() {
     return MainnetProtocolSchedule.fromConfig(
-        genesisConfig.getConfigOptions(genesisConfigOverrides),
-        privacyParameters,
-        isRevertReasonEnabled);
+        configOptionsSupplier.get(), privacyParameters, isRevertReasonEnabled, evmConfiguration);
   }
 
   @Override
   protected void prepForBuild() {
-    genesisConfig
-        .getConfigOptions()
+    configOptionsSupplier
+        .get()
         .getThanosBlockNumber()
         .ifPresent(
             activationBlock -> epochCalculator = new EpochCalculator.Ecip1099EpochCalculator());
diff --git a/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java
new file mode 100644
index 00000000000..3ff13a472f2
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java
@@ -0,0 +1,269 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.controller;
+
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.consensus.merge.MergeContext;
+import org.hyperledger.besu.consensus.merge.MergeProtocolSchedule;
+import org.hyperledger.besu.consensus.merge.PostMergeContext;
+import org.hyperledger.besu.consensus.merge.TransitionBestPeerComparator;
+import org.hyperledger.besu.consensus.merge.blockcreation.MergeCoordinator;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthMessages;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.eth.manager.MergePeerFilter;
+import org.hyperledger.besu.ethereum.eth.manager.MonitoredExecutors;
+import org.hyperledger.besu.ethereum.eth.peervalidation.PeerValidator;
+import org.hyperledger.besu.ethereum.eth.peervalidation.RequiredBlocksPeerValidator;
+import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.backwardsync.BackwardChain;
+import org.hyperledger.besu.ethereum.eth.sync.backwardsync.BackwardSyncContext;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Merge besu controller builder. */
+public class MergeBesuControllerBuilder extends BesuControllerBuilder {
+  private final AtomicReference<SyncState> syncState = new AtomicReference<>();
+  private static final Logger LOG = LoggerFactory.getLogger(MergeBesuControllerBuilder.class);
+
+  @Override
+  protected MiningCoordinator createMiningCoordinator(
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final TransactionPool transactionPool,
+      final MiningParameters miningParameters,
+      final SyncState syncState,
+      final EthProtocolManager ethProtocolManager) {
+    return createTransitionMiningCoordinator(
+        protocolSchedule,
+        protocolContext,
+        transactionPool,
+        miningParameters,
+        syncState,
+        new BackwardSyncContext(
+            protocolContext,
+            protocolSchedule,
+            metricsSystem,
+            ethProtocolManager.ethContext(),
+            syncState,
+            BackwardChain.from(
+                storageProvider, ScheduleBasedBlockHeaderFunctions.create(protocolSchedule))),
+        metricsSystem);
+  }
+
+  @Override
+  protected EthProtocolManager createEthProtocolManager(
+      final ProtocolContext protocolContext,
+      final SynchronizerConfiguration synchronizerConfiguration,
+      final TransactionPool transactionPool,
+      final EthProtocolConfiguration ethereumWireProtocolConfiguration,
+      final EthPeers ethPeers,
+      final EthContext ethContext,
+      final EthMessages ethMessages,
+      final EthScheduler scheduler,
+      final List<PeerValidator> peerValidators,
+      final Optional<MergePeerFilter> mergePeerFilter) {
+
+    var mergeContext = protocolContext.getConsensusContext(MergeContext.class);
+
+    var mergeBestPeerComparator =
+        new TransitionBestPeerComparator(
+            configOptionsSupplier
+                .get()
+                .getTerminalTotalDifficulty()
+                .map(Difficulty::of)
+                .orElseThrow());
+    ethPeers.setBestChainComparator(mergeBestPeerComparator);
+    mergeContext.observeNewIsPostMergeState(mergeBestPeerComparator);
+
+    Optional<MergePeerFilter> filterToUse = Optional.of(new MergePeerFilter());
+
+    if (mergePeerFilter.isPresent()) {
+      filterToUse = mergePeerFilter;
+    }
+    mergeContext.observeNewIsPostMergeState(filterToUse.get());
+    mergeContext.addNewUnverifiedForkchoiceListener(filterToUse.get());
+
+    EthProtocolManager ethProtocolManager =
+        super.createEthProtocolManager(
+            protocolContext,
+            synchronizerConfiguration,
+            transactionPool,
+            ethereumWireProtocolConfiguration,
+            ethPeers,
+            ethContext,
+            ethMessages,
+            scheduler,
+            peerValidators,
+            filterToUse);
+
+    return ethProtocolManager;
+  }
+
+  /**
+   * Create transition mining coordinator.
+   *
+   * @param protocolSchedule the protocol schedule
+   * @param protocolContext the protocol context
+   * @param transactionPool the transaction pool
+   * @param miningParameters the mining parameters
+   * @param syncState the sync state
+   * @param backwardSyncContext the backward sync context
+   * @param metricsSystem the metrics system
+   * @return the mining coordinator
+   */
+  protected MiningCoordinator createTransitionMiningCoordinator(
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final TransactionPool transactionPool,
+      final MiningParameters miningParameters,
+      final SyncState syncState,
+      final BackwardSyncContext backwardSyncContext,
+      final MetricsSystem metricsSystem) {
+
+    this.syncState.set(syncState);
+
+    final ExecutorService blockBuilderExecutor =
+        MonitoredExecutors.newSingleThreadExecutor("PoS-Block-Builder", metricsSystem);
+
+    final GenesisConfigOptions genesisConfigOptions = configOptionsSupplier.get();
+    final Optional<Address> depositContractAddress =
+        genesisConfigOptions.getDepositContractAddress();
+
+    return new MergeCoordinator(
+        protocolContext,
+        protocolSchedule,
+        task -> {
+          LOG.debug("Block builder executor status {}", blockBuilderExecutor);
+          return CompletableFuture.runAsync(task, blockBuilderExecutor);
+        },
+        transactionPool.getPendingTransactions(),
+        miningParameters,
+        backwardSyncContext,
+        depositContractAddress);
+  }
+
+  @Override
+  protected ProtocolSchedule createProtocolSchedule() {
+    return MergeProtocolSchedule.create(
+        configOptionsSupplier.get(), privacyParameters, isRevertReasonEnabled);
+  }
+
+  @Override
+  protected MergeContext createConsensusContext(
+      final Blockchain blockchain,
+      final WorldStateArchive worldStateArchive,
+      final ProtocolSchedule protocolSchedule) {
+
+    final GenesisConfigOptions genesisConfigOptions = configOptionsSupplier.get();
+    final OptionalLong terminalBlockNumber = genesisConfigOptions.getTerminalBlockNumber();
+    final Optional<Hash> terminalBlockHash = genesisConfigOptions.getTerminalBlockHash();
+    final boolean isPostMergeAtGenesis =
+        genesisConfigOptions.getTerminalTotalDifficulty().isPresent()
+            && genesisConfigOptions.getTerminalTotalDifficulty().get().isZero()
+            && blockchain.getGenesisBlockHeader().getDifficulty().isZero();
+
+    final MergeContext mergeContext =
+        PostMergeContext.get()
+            .setSyncState(syncState.get())
+            .setTerminalTotalDifficulty(
+                genesisConfigOptions
+                    .getTerminalTotalDifficulty()
+                    .map(Difficulty::of)
+                    .orElse(Difficulty.ZERO))
+            .setCheckpointPostMergeSync(syncConfig.isCheckpointPostMergeEnabled())
+            .setPostMergeAtGenesis(isPostMergeAtGenesis);
+
+    blockchain
+        .getFinalized()
+        .flatMap(blockchain::getBlockHeader)
+        .ifPresent(mergeContext::setFinalized);
+
+    blockchain
+        .getSafeBlock()
+        .flatMap(blockchain::getBlockHeader)
+        .ifPresent(mergeContext::setSafeBlock);
+
+    if (terminalBlockNumber.isPresent() && terminalBlockHash.isPresent()) {
+      Optional<BlockHeader> termBlock = blockchain.getBlockHeader(terminalBlockNumber.getAsLong());
+      mergeContext.setTerminalPoWBlock(termBlock);
+    }
+    blockchain.observeBlockAdded(
+        blockAddedEvent ->
+            blockchain
+                .getTotalDifficultyByHash(blockAddedEvent.getBlock().getHeader().getHash())
+                .ifPresent(mergeContext::setIsPostMerge));
+
+    return mergeContext;
+  }
+
+  @Override
+  protected PluginServiceFactory createAdditionalPluginServices(
+      final Blockchain blockchain, final ProtocolContext protocolContext) {
+    return new NoopPluginServiceFactory();
+  }
+
+  @Override
+  protected List<PeerValidator> createPeerValidators(final ProtocolSchedule protocolSchedule) {
+    List<PeerValidator> retval = super.createPeerValidators(protocolSchedule);
+    final OptionalLong powTerminalBlockNumber =
+        configOptionsSupplier.get().getTerminalBlockNumber();
+    final Optional<Hash> powTerminalBlockHash = configOptionsSupplier.get().getTerminalBlockHash();
+    if (powTerminalBlockHash.isPresent() && powTerminalBlockNumber.isPresent()) {
+      retval.add(
+          new RequiredBlocksPeerValidator(
+              protocolSchedule,
+              metricsSystem,
+              powTerminalBlockNumber.getAsLong(),
+              powTerminalBlockHash.get(),
+              0));
+    } else {
+      LOG.debug("unable to validate peers with terminal difficulty blocks");
+    }
+    return retval;
+  }
+
+  @Override
+  public BesuController build() {
+    final BesuController controller = super.build();
+    PostMergeContext.get().setSyncState(controller.getSyncState());
+    return controller;
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/controller/MiningParameterOverrides.java b/besu/src/main/java/org/hyperledger/besu/controller/MiningParameterOverrides.java
new file mode 100644
index 00000000000..a00186ea0c2
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/controller/MiningParameterOverrides.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.controller;
+
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+
+/**
+ * This interface wraps the provided MiningParameters to enable controller-specific parameter
+ * overrides.
+ */
+public interface MiningParameterOverrides {
+  /**
+   * Overrides MiningParameter.
+   *
+   * @param fromCli The mining parameters that contains original values.
+   * @return MiningParameters constructed from provided param with additional overridden parameters.
+   */
+  default MiningParameters getMiningParameterOverrides(final MiningParameters fromCli) {
+    return fromCli;
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/controller/NoopPluginServiceFactory.java b/besu/src/main/java/org/hyperledger/besu/controller/NoopPluginServiceFactory.java
index 7daba41e266..a538b1d04e7 100644
--- a/besu/src/main/java/org/hyperledger/besu/controller/NoopPluginServiceFactory.java
+++ b/besu/src/main/java/org/hyperledger/besu/controller/NoopPluginServiceFactory.java
@@ -16,6 +16,7 @@
 
 import org.hyperledger.besu.services.BesuPluginContextImpl;
 
+/** The Noop plugin service factory. */
 public class NoopPluginServiceFactory implements PluginServiceFactory {
 
   @Override
diff --git a/besu/src/main/java/org/hyperledger/besu/controller/PluginServiceFactory.java b/besu/src/main/java/org/hyperledger/besu/controller/PluginServiceFactory.java
index b6dca4d1d37..5f31e03d56a 100644
--- a/besu/src/main/java/org/hyperledger/besu/controller/PluginServiceFactory.java
+++ b/besu/src/main/java/org/hyperledger/besu/controller/PluginServiceFactory.java
@@ -16,7 +16,13 @@
 
 import org.hyperledger.besu.services.BesuPluginContextImpl;
 
+/** The interface Plugin service factory. */
 public interface PluginServiceFactory {
 
+  /**
+   * Appends concrete plugin service in provided Besu Plugin Context.
+   *
+   * @param besuContext An instance of BesuPluginContextImpl.
+   */
   void appendPluginServices(BesuPluginContextImpl besuContext);
 }
diff --git a/besu/src/main/java/org/hyperledger/besu/controller/QbftBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/QbftBesuControllerBuilder.java
new file mode 100644
index 00000000000..126dfd0cd91
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/controller/QbftBesuControllerBuilder.java
@@ -0,0 +1,389 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.controller;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import org.hyperledger.besu.config.BftFork;
+import org.hyperledger.besu.config.QbftConfigOptions;
+import org.hyperledger.besu.config.QbftFork;
+import org.hyperledger.besu.consensus.common.BftValidatorOverrides;
+import org.hyperledger.besu.consensus.common.EpochManager;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.bft.BftContext;
+import org.hyperledger.besu.consensus.common.bft.BftEventQueue;
+import org.hyperledger.besu.consensus.common.bft.BftExecutors;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.BftProcessor;
+import org.hyperledger.besu.consensus.common.bft.BftProtocolSchedule;
+import org.hyperledger.besu.consensus.common.bft.BlockTimer;
+import org.hyperledger.besu.consensus.common.bft.EthSynchronizerUpdater;
+import org.hyperledger.besu.consensus.common.bft.EventMultiplexer;
+import org.hyperledger.besu.consensus.common.bft.MessageTracker;
+import org.hyperledger.besu.consensus.common.bft.RoundTimer;
+import org.hyperledger.besu.consensus.common.bft.UniqueMessageMulticaster;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.BftBlockCreatorFactory;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.BftMiningCoordinator;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.ProposerSelector;
+import org.hyperledger.besu.consensus.common.bft.network.ValidatorPeers;
+import org.hyperledger.besu.consensus.common.bft.protocol.BftProtocolManager;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftEventHandler;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftFinalState;
+import org.hyperledger.besu.consensus.common.bft.statemachine.FutureMessageBuffer;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.common.validator.blockbased.BlockValidatorProvider;
+import org.hyperledger.besu.consensus.qbft.QbftContext;
+import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
+import org.hyperledger.besu.consensus.qbft.QbftForksSchedulesFactory;
+import org.hyperledger.besu.consensus.qbft.QbftGossip;
+import org.hyperledger.besu.consensus.qbft.QbftProtocolScheduleBuilder;
+import org.hyperledger.besu.consensus.qbft.blockcreation.QbftBlockCreatorFactory;
+import org.hyperledger.besu.consensus.qbft.jsonrpc.QbftJsonRpcMethods;
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.qbft.pki.PkiQbftExtraDataCodec;
+import org.hyperledger.besu.consensus.qbft.protocol.Istanbul100SubProtocol;
+import org.hyperledger.besu.consensus.qbft.statemachine.QbftBlockHeightManagerFactory;
+import org.hyperledger.besu.consensus.qbft.statemachine.QbftController;
+import org.hyperledger.besu.consensus.qbft.statemachine.QbftRoundFactory;
+import org.hyperledger.besu.consensus.qbft.validation.MessageValidatorFactory;
+import org.hyperledger.besu.consensus.qbft.validator.ForkingValidatorProvider;
+import org.hyperledger.besu.consensus.qbft.validator.TransactionValidatorProvider;
+import org.hyperledger.besu.consensus.qbft.validator.ValidatorContractController;
+import org.hyperledger.besu.consensus.qbft.validator.ValidatorModeTransitionLogger;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.methods.JsonRpcMethods;
+import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.core.Util;
+import org.hyperledger.besu.ethereum.eth.EthProtocol;
+import org.hyperledger.besu.ethereum.eth.SnapProtocol;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
+import org.hyperledger.besu.ethereum.eth.manager.snap.SnapProtocolManager;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.p2p.config.SubProtocolConfiguration;
+import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.util.Subscribers;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import com.google.common.base.Suppliers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Qbft Besu controller builder. */
+public class QbftBesuControllerBuilder extends BftBesuControllerBuilder {
+
+  private static final Logger LOG = LoggerFactory.getLogger(QbftBesuControllerBuilder.class);
+  private BftEventQueue bftEventQueue;
+  private QbftConfigOptions qbftConfig;
+  private ForksSchedule<QbftConfigOptions> qbftForksSchedule;
+  private ValidatorPeers peers;
+  private TransactionValidatorProvider transactionValidatorProvider;
+
+  @Override
+  protected Supplier<BftExtraDataCodec> bftExtraDataCodec() {
+    return Suppliers.memoize(
+        () -> {
+          if (pkiBlockCreationConfiguration.isPresent()) {
+            return new PkiQbftExtraDataCodec();
+          } else {
+            return new QbftExtraDataCodec();
+          }
+        });
+  }
+
+  @Override
+  protected void prepForBuild() {
+    qbftConfig = configOptionsSupplier.get().getQbftConfigOptions();
+    bftEventQueue = new BftEventQueue(qbftConfig.getMessageQueueLimit());
+    qbftForksSchedule = QbftForksSchedulesFactory.create(configOptionsSupplier.get());
+  }
+
+  @Override
+  protected JsonRpcMethods createAdditionalJsonRpcMethodFactory(
+      final ProtocolContext protocolContext) {
+
+    return new QbftJsonRpcMethods(
+        protocolContext, createReadOnlyValidatorProvider(protocolContext.getBlockchain()));
+  }
+
+  private ValidatorProvider createReadOnlyValidatorProvider(final Blockchain blockchain) {
+    checkNotNull(
+        transactionValidatorProvider, "transactionValidatorProvider should have been initialised");
+    final EpochManager epochManager = new EpochManager(qbftConfig.getEpochLength());
+    // Must create our own voteTallyCache as using this would pollute the main voteTallyCache
+    final BlockValidatorProvider readOnlyBlockValidatorProvider =
+        BlockValidatorProvider.nonForkingValidatorProvider(
+            blockchain, epochManager, bftBlockInterface().get());
+    return new ForkingValidatorProvider(
+        blockchain,
+        qbftForksSchedule,
+        readOnlyBlockValidatorProvider,
+        transactionValidatorProvider);
+  }
+
+  @Override
+  protected SubProtocolConfiguration createSubProtocolConfiguration(
+      final EthProtocolManager ethProtocolManager,
+      final Optional<SnapProtocolManager> maybeSnapProtocolManager) {
+    final SubProtocolConfiguration subProtocolConfiguration =
+        new SubProtocolConfiguration()
+            .withSubProtocol(EthProtocol.get(), ethProtocolManager)
+            .withSubProtocol(
+                Istanbul100SubProtocol.get(),
+                new BftProtocolManager(
+                    bftEventQueue,
+                    peers,
+                    Istanbul100SubProtocol.ISTANBUL_100,
+                    Istanbul100SubProtocol.get().getName()));
+    maybeSnapProtocolManager.ifPresent(
+        snapProtocolManager -> {
+          subProtocolConfiguration.withSubProtocol(SnapProtocol.get(), snapProtocolManager);
+        });
+    return subProtocolConfiguration;
+  }
+
+  @Override
+  protected MiningCoordinator createMiningCoordinator(
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final TransactionPool transactionPool,
+      final MiningParameters miningParameters,
+      final SyncState syncState,
+      final EthProtocolManager ethProtocolManager) {
+    final MutableBlockchain blockchain = protocolContext.getBlockchain();
+    final BftExecutors bftExecutors =
+        BftExecutors.create(metricsSystem, BftExecutors.ConsensusType.QBFT);
+
+    final Address localAddress = Util.publicKeyToAddress(nodeKey.getPublicKey());
+    final BftProtocolSchedule bftProtocolSchedule = (BftProtocolSchedule) protocolSchedule;
+    final BftBlockCreatorFactory<?> blockCreatorFactory =
+        new QbftBlockCreatorFactory(
+            transactionPool.getPendingTransactions(),
+            protocolContext,
+            bftProtocolSchedule,
+            qbftForksSchedule,
+            miningParameters,
+            localAddress,
+            bftExtraDataCodec().get());
+
+    final ValidatorProvider validatorProvider =
+        protocolContext.getConsensusContext(BftContext.class).getValidatorProvider();
+
+    final ProposerSelector proposerSelector =
+        new ProposerSelector(blockchain, bftBlockInterface().get(), true, validatorProvider);
+
+    // NOTE: peers should not be used for accessing the network as it does not enforce the
+    // "only send once" filter applied by the UniqueMessageMulticaster.
+    peers = new ValidatorPeers(validatorProvider, Istanbul100SubProtocol.NAME);
+
+    final UniqueMessageMulticaster uniqueMessageMulticaster =
+        new UniqueMessageMulticaster(peers, qbftConfig.getGossipedHistoryLimit());
+
+    final QbftGossip gossiper = new QbftGossip(uniqueMessageMulticaster, bftExtraDataCodec().get());
+
+    final BftFinalState finalState =
+        new BftFinalState(
+            validatorProvider,
+            nodeKey,
+            Util.publicKeyToAddress(nodeKey.getPublicKey()),
+            proposerSelector,
+            uniqueMessageMulticaster,
+            new RoundTimer(bftEventQueue, qbftConfig.getRequestTimeoutSeconds(), bftExecutors),
+            new BlockTimer(bftEventQueue, qbftForksSchedule, bftExecutors, clock),
+            blockCreatorFactory,
+            clock);
+
+    final MessageValidatorFactory messageValidatorFactory =
+        new MessageValidatorFactory(
+            proposerSelector, bftProtocolSchedule, protocolContext, bftExtraDataCodec().get());
+
+    final Subscribers<MinedBlockObserver> minedBlockObservers = Subscribers.create();
+    minedBlockObservers.subscribe(ethProtocolManager);
+    minedBlockObservers.subscribe(blockLogger(transactionPool, localAddress));
+
+    final FutureMessageBuffer futureMessageBuffer =
+        new FutureMessageBuffer(
+            qbftConfig.getFutureMessagesMaxDistance(),
+            qbftConfig.getFutureMessagesLimit(),
+            blockchain.getChainHeadBlockNumber());
+    final MessageTracker duplicateMessageTracker =
+        new MessageTracker(qbftConfig.getDuplicateMessageLimit());
+
+    final MessageFactory messageFactory = new MessageFactory(nodeKey);
+
+    final BftEventHandler qbftController =
+        new QbftController(
+            blockchain,
+            finalState,
+            new QbftBlockHeightManagerFactory(
+                finalState,
+                new QbftRoundFactory(
+                    finalState,
+                    protocolContext,
+                    bftProtocolSchedule,
+                    minedBlockObservers,
+                    messageValidatorFactory,
+                    messageFactory,
+                    bftExtraDataCodec().get()),
+                messageValidatorFactory,
+                messageFactory,
+                new ValidatorModeTransitionLogger(qbftForksSchedule)),
+            gossiper,
+            duplicateMessageTracker,
+            futureMessageBuffer,
+            new EthSynchronizerUpdater(ethProtocolManager.ethContext().getEthPeers()),
+            bftExtraDataCodec().get());
+
+    final EventMultiplexer eventMultiplexer = new EventMultiplexer(qbftController);
+    final BftProcessor bftProcessor = new BftProcessor(bftEventQueue, eventMultiplexer);
+
+    final MiningCoordinator miningCoordinator =
+        new BftMiningCoordinator(
+            bftExecutors,
+            qbftController,
+            bftProcessor,
+            blockCreatorFactory,
+            blockchain,
+            bftEventQueue);
+    miningCoordinator.enable();
+
+    return miningCoordinator;
+  }
+
+  @Override
+  protected PluginServiceFactory createAdditionalPluginServices(
+      final Blockchain blockchain, final ProtocolContext protocolContext) {
+    final ValidatorProvider validatorProvider =
+        protocolContext.getConsensusContext(BftContext.class).getValidatorProvider();
+    return new BftQueryPluginServiceFactory(
+        blockchain, bftExtraDataCodec().get(), validatorProvider, nodeKey, "qbft");
+  }
+
+  @Override
+  protected ProtocolSchedule createProtocolSchedule() {
+    return QbftProtocolScheduleBuilder.create(
+        configOptionsSupplier.get(),
+        qbftForksSchedule,
+        privacyParameters,
+        isRevertReasonEnabled,
+        bftExtraDataCodec().get(),
+        evmConfiguration);
+  }
+
+  @Override
+  protected void validateContext(final ProtocolContext context) {
+    final BlockHeader genesisBlockHeader = context.getBlockchain().getGenesisBlock().getHeader();
+
+    if (usingValidatorContractModeButSignersExistIn(genesisBlockHeader)) {
+      LOG.warn(
+          "Using validator contract mode but genesis block contains signers - the genesis block signers will not be used.");
+    }
+
+    if (usingValidatorBlockHeaderModeButNoSignersIn(genesisBlockHeader)) {
+      LOG.warn("Genesis block contains no signers - chain will not progress.");
+    }
+  }
+
+  private boolean usingValidatorContractModeButSignersExistIn(
+      final BlockHeader genesisBlockHeader) {
+    return isValidatorContractMode() && signersExistIn(genesisBlockHeader);
+  }
+
+  private boolean usingValidatorBlockHeaderModeButNoSignersIn(
+      final BlockHeader genesisBlockHeader) {
+    return !isValidatorContractMode() && !signersExistIn(genesisBlockHeader);
+  }
+
+  private boolean isValidatorContractMode() {
+    return configOptionsSupplier.get().getQbftConfigOptions().isValidatorContractMode();
+  }
+
+  private boolean signersExistIn(final BlockHeader genesisBlockHeader) {
+    return bftBlockInterface().get().validatorsInBlock(genesisBlockHeader).size() > 0;
+  }
+
+  @Override
+  protected BftContext createConsensusContext(
+      final Blockchain blockchain,
+      final WorldStateArchive worldStateArchive,
+      final ProtocolSchedule protocolSchedule) {
+    final EpochManager epochManager = new EpochManager(qbftConfig.getEpochLength());
+
+    final BftValidatorOverrides validatorOverrides =
+        convertBftForks(configOptionsSupplier.get().getTransitions().getQbftForks());
+    final BlockValidatorProvider blockValidatorProvider =
+        BlockValidatorProvider.forkingValidatorProvider(
+            blockchain, epochManager, bftBlockInterface().get(), validatorOverrides);
+
+    final TransactionSimulator transactionSimulator =
+        new TransactionSimulator(blockchain, worldStateArchive, protocolSchedule);
+    transactionValidatorProvider =
+        new TransactionValidatorProvider(
+            blockchain, new ValidatorContractController(transactionSimulator), qbftForksSchedule);
+
+    final ValidatorProvider validatorProvider =
+        new ForkingValidatorProvider(
+            blockchain, qbftForksSchedule, blockValidatorProvider, transactionValidatorProvider);
+
+    return new QbftContext(
+        validatorProvider, epochManager, bftBlockInterface().get(), pkiBlockCreationConfiguration);
+  }
+
+  private BftValidatorOverrides convertBftForks(final List<QbftFork> bftForks) {
+    final Map<Long, List<Address>> result = new HashMap<>();
+
+    for (final BftFork fork : bftForks) {
+      fork.getValidators()
+          .ifPresent(
+              validators ->
+                  result.put(
+                      fork.getForkBlock(),
+                      validators.stream()
+                          .map(Address::fromHexString)
+                          .collect(Collectors.toList())));
+    }
+
+    return new BftValidatorOverrides(result);
+  }
+
+  private static MinedBlockObserver blockLogger(
+      final TransactionPool transactionPool, final Address localAddress) {
+    return block ->
+        LOG.info(
+            String.format(
+                "%s #%,d / %d tx / %d pending / %,d (%01.1f%%) gas / (%s)",
+                block.getHeader().getCoinbase().equals(localAddress) ? "Produced" : "Imported",
+                block.getHeader().getNumber(),
+                block.getBody().getTransactions().size(),
+                transactionPool.getPendingTransactions().size(),
+                block.getHeader().getGasUsed(),
+                (block.getHeader().getGasUsed() * 100.0) / block.getHeader().getGasLimit(),
+                block.getHash().toHexString()));
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/controller/TargetingGasLimitCalculator.java b/besu/src/main/java/org/hyperledger/besu/controller/TargetingGasLimitCalculator.java
deleted file mode 100644
index 2d830d57170..00000000000
--- a/besu/src/main/java/org/hyperledger/besu/controller/TargetingGasLimitCalculator.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 2019 ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.controller;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import org.hyperledger.besu.ethereum.blockcreation.GasLimitCalculator;
-import org.hyperledger.besu.ethereum.mainnet.AbstractGasLimitSpecification;
-
-import java.util.Objects;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-public class TargetingGasLimitCalculator extends AbstractGasLimitSpecification
-    implements GasLimitCalculator {
-  private static final Logger LOG = LogManager.getLogger();
-  private final long maxConstantAdjustmentIncrement;
-  private Long targetGasLimit;
-
-  public TargetingGasLimitCalculator(final long targetGasLimit) {
-    this(targetGasLimit, 1024L, 5000L, Long.MAX_VALUE);
-  }
-
-  public TargetingGasLimitCalculator(
-      final long targetGasLimit,
-      final long maxConstantAdjustmentIncrement,
-      final long minGasLimit,
-      final long maxGasLimit) {
-    super(minGasLimit, maxGasLimit);
-    this.maxConstantAdjustmentIncrement = maxConstantAdjustmentIncrement;
-    changeTargetGasLimit(targetGasLimit);
-  }
-
-  @Override
-  public long nextGasLimit(final long currentGasLimit) {
-    final long nextGasLimit;
-    if (targetGasLimit > currentGasLimit) {
-      nextGasLimit = Math.min(targetGasLimit, safeAddAtMost(currentGasLimit));
-    } else if (targetGasLimit < currentGasLimit) {
-      nextGasLimit = Math.max(targetGasLimit, safeSubAtMost(currentGasLimit));
-    } else {
-      nextGasLimit = currentGasLimit;
-    }
-
-    if (nextGasLimit != currentGasLimit) {
-      LOG.debug("Adjusting block gas limit from {} to {}", currentGasLimit, nextGasLimit);
-    }
-
-    return nextGasLimit;
-  }
-
-  @Override
-  public void changeTargetGasLimit(final Long targetGasLimit) {
-    checkArgument(
-        targetGasLimit >= minGasLimit,
-        "targetGasLimit of " + targetGasLimit + " is below the minGasLimit of " + minGasLimit);
-
-    checkArgument(
-        targetGasLimit <= maxGasLimit,
-        "targetGasLimit of " + targetGasLimit + " is above the maxGasLimit of " + maxGasLimit);
-    this.targetGasLimit = targetGasLimit;
-  }
-
-  private long adjustAmount(final long currentGasLimit) {
-    final long maxProportionalAdjustmentLimit = Math.max(deltaBound(currentGasLimit) - 1, 0);
-    return Math.min(maxConstantAdjustmentIncrement, maxProportionalAdjustmentLimit);
-  }
-
-  private long safeAddAtMost(final long gasLimit) {
-    try {
-      return Math.addExact(gasLimit, adjustAmount(gasLimit));
-    } catch (final ArithmeticException ex) {
-      return Long.MAX_VALUE;
-    }
-  }
-
-  private long safeSubAtMost(final long gasLimit) {
-    try {
-      return Math.max(Math.subtractExact(gasLimit, adjustAmount(gasLimit)), 0);
-    } catch (final ArithmeticException ex) {
-      return 0;
-    }
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    TargetingGasLimitCalculator that = (TargetingGasLimitCalculator) o;
-    return Objects.equals(targetGasLimit, that.targetGasLimit);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(targetGasLimit);
-  }
-}
diff --git a/besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java b/besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java
new file mode 100644
index 00000000000..9323f3b81d6
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java
@@ -0,0 +1,444 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.controller;
+
+import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.consensus.merge.MergeContext;
+import org.hyperledger.besu.consensus.merge.PostMergeContext;
+import org.hyperledger.besu.consensus.merge.TransitionBackwardSyncContext;
+import org.hyperledger.besu.consensus.merge.TransitionContext;
+import org.hyperledger.besu.consensus.merge.TransitionProtocolSchedule;
+import org.hyperledger.besu.consensus.merge.blockcreation.TransitionCoordinator;
+import org.hyperledger.besu.consensus.qbft.pki.PkiBlockCreationConfiguration;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ConsensusContext;
+import org.hyperledger.besu.ethereum.ConsensusContextFactory;
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.core.Synchronizer;
+import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthMessages;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.eth.manager.MergePeerFilter;
+import org.hyperledger.besu.ethereum.eth.peervalidation.PeerValidator;
+import org.hyperledger.besu.ethereum.eth.sync.DefaultSynchronizer;
+import org.hyperledger.besu.ethereum.eth.sync.PivotBlockSelector;
+import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.backwardsync.BackwardSyncContext;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.storage.StorageProvider;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
+import org.hyperledger.besu.ethereum.worldstate.Pruner;
+import org.hyperledger.besu.ethereum.worldstate.PrunerConfiguration;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.metrics.ObservableMetricsSystem;
+import org.hyperledger.besu.plugin.services.permissioning.NodeMessagePermissioningProvider;
+import org.hyperledger.besu.plugin.services.txselection.TransactionSelectorFactory;
+
+import java.math.BigInteger;
+import java.nio.file.Path;
+import java.time.Clock;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Consumer;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Transition besu controller builder. */
+public class TransitionBesuControllerBuilder extends BesuControllerBuilder {
+  private final BesuControllerBuilder preMergeBesuControllerBuilder;
+  private final MergeBesuControllerBuilder mergeBesuControllerBuilder;
+
+  private static final Logger LOG = LoggerFactory.getLogger(TransitionBesuControllerBuilder.class);
+  private TransitionProtocolSchedule transitionProtocolSchedule;
+
+  /**
+   * Instantiates a new Transition besu controller builder.
+   *
+   * @param preMergeBesuControllerBuilder the pre merge besu controller builder
+   * @param mergeBesuControllerBuilder the merge besu controller builder
+   */
+  public TransitionBesuControllerBuilder(
+      final BesuControllerBuilder preMergeBesuControllerBuilder,
+      final MergeBesuControllerBuilder mergeBesuControllerBuilder) {
+    this.preMergeBesuControllerBuilder = preMergeBesuControllerBuilder;
+    this.mergeBesuControllerBuilder = mergeBesuControllerBuilder;
+  }
+
+  @Override
+  protected void prepForBuild() {
+    preMergeBesuControllerBuilder.prepForBuild();
+    mergeBesuControllerBuilder.prepForBuild();
+  }
+
+  @Override
+  protected MiningCoordinator createMiningCoordinator(
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final TransactionPool transactionPool,
+      final MiningParameters miningParameters,
+      final SyncState syncState,
+      final EthProtocolManager ethProtocolManager) {
+
+    // cast to transition schedule for explicit access to pre and post objects:
+    final TransitionProtocolSchedule transitionProtocolSchedule =
+        (TransitionProtocolSchedule) protocolSchedule;
+
+    // PoA consensus mines by default, get consensus-specific mining parameters for
+    // TransitionCoordinator:
+    MiningParameters transitionMiningParameters =
+        preMergeBesuControllerBuilder.getMiningParameterOverrides(miningParameters);
+
+    // construct a transition backward sync context
+    BackwardSyncContext transitionBackwardsSyncContext =
+        new TransitionBackwardSyncContext(
+            protocolContext,
+            transitionProtocolSchedule,
+            metricsSystem,
+            ethProtocolManager.ethContext(),
+            syncState,
+            storageProvider);
+
+    final TransitionCoordinator composedCoordinator =
+        new TransitionCoordinator(
+            preMergeBesuControllerBuilder.createMiningCoordinator(
+                transitionProtocolSchedule.getPreMergeSchedule(),
+                protocolContext,
+                transactionPool,
+                new MiningParameters.Builder(miningParameters).miningEnabled(false).build(),
+                syncState,
+                ethProtocolManager),
+            mergeBesuControllerBuilder.createTransitionMiningCoordinator(
+                transitionProtocolSchedule,
+                protocolContext,
+                transactionPool,
+                transitionMiningParameters,
+                syncState,
+                transitionBackwardsSyncContext,
+                metricsSystem));
+    initTransitionWatcher(protocolContext, composedCoordinator);
+    return composedCoordinator;
+  }
+
+  @Override
+  protected EthProtocolManager createEthProtocolManager(
+      final ProtocolContext protocolContext,
+      final SynchronizerConfiguration synchronizerConfiguration,
+      final TransactionPool transactionPool,
+      final EthProtocolConfiguration ethereumWireProtocolConfiguration,
+      final EthPeers ethPeers,
+      final EthContext ethContext,
+      final EthMessages ethMessages,
+      final EthScheduler scheduler,
+      final List<PeerValidator> peerValidators,
+      final Optional<MergePeerFilter> mergePeerFilter) {
+    return mergeBesuControllerBuilder.createEthProtocolManager(
+        protocolContext,
+        synchronizerConfiguration,
+        transactionPool,
+        ethereumWireProtocolConfiguration,
+        ethPeers,
+        ethContext,
+        ethMessages,
+        scheduler,
+        peerValidators,
+        mergePeerFilter);
+  }
+
+  @Override
+  protected ProtocolSchedule createProtocolSchedule() {
+    transitionProtocolSchedule =
+        new TransitionProtocolSchedule(
+            preMergeBesuControllerBuilder.createProtocolSchedule(),
+            mergeBesuControllerBuilder.createProtocolSchedule(),
+            PostMergeContext.get());
+    return transitionProtocolSchedule;
+  }
+
+  @Override
+  protected ProtocolContext createProtocolContext(
+      final MutableBlockchain blockchain,
+      final WorldStateArchive worldStateArchive,
+      final ProtocolSchedule protocolSchedule,
+      final ConsensusContextFactory consensusContextFactory,
+      final Optional<TransactionSelectorFactory> transactionSelectorFactory) {
+    final ProtocolContext protocolContext =
+        super.createProtocolContext(
+            blockchain,
+            worldStateArchive,
+            protocolSchedule,
+            consensusContextFactory,
+            transactionSelectorFactory);
+    transitionProtocolSchedule.setProtocolContext(protocolContext);
+    return protocolContext;
+  }
+
+  @Override
+  protected ConsensusContext createConsensusContext(
+      final Blockchain blockchain,
+      final WorldStateArchive worldStateArchive,
+      final ProtocolSchedule protocolSchedule) {
+    return new TransitionContext(
+        preMergeBesuControllerBuilder.createConsensusContext(
+            blockchain, worldStateArchive, protocolSchedule),
+        mergeBesuControllerBuilder.createConsensusContext(
+            blockchain, worldStateArchive, protocolSchedule));
+  }
+
+  @Override
+  protected PluginServiceFactory createAdditionalPluginServices(
+      final Blockchain blockchain, final ProtocolContext protocolContext) {
+    return new NoopPluginServiceFactory();
+  }
+
+  @Override
+  protected Synchronizer createSynchronizer(
+      final ProtocolSchedule protocolSchedule,
+      final WorldStateStorage worldStateStorage,
+      final ProtocolContext protocolContext,
+      final Optional<Pruner> maybePruner,
+      final EthContext ethContext,
+      final SyncState syncState,
+      final EthProtocolManager ethProtocolManager,
+      final PivotBlockSelector pivotBlockSelector) {
+
+    DefaultSynchronizer sync =
+        (DefaultSynchronizer)
+            super.createSynchronizer(
+                protocolSchedule,
+                worldStateStorage,
+                protocolContext,
+                maybePruner,
+                ethContext,
+                syncState,
+                ethProtocolManager,
+                pivotBlockSelector);
+    final GenesisConfigOptions maybeForTTD = configOptionsSupplier.get();
+
+    if (maybeForTTD.getTerminalTotalDifficulty().isPresent()) {
+      LOG.info(
+          "TTD present, creating DefaultSynchronizer that stops propagating after finalization");
+      protocolContext
+          .getConsensusContext(MergeContext.class)
+          .addNewUnverifiedForkchoiceListener(sync);
+    }
+
+    return sync;
+  }
+
+  private void initTransitionWatcher(
+      final ProtocolContext protocolContext, final TransitionCoordinator composedCoordinator) {
+
+    PostMergeContext postMergeContext = protocolContext.getConsensusContext(PostMergeContext.class);
+    postMergeContext.observeNewIsPostMergeState(
+        (isPoS, priorState, difficultyStoppedAt) -> {
+          if (isPoS) {
+            // if we transitioned to post-merge, stop and disable any mining
+            composedCoordinator.getPreMergeObject().disable();
+            composedCoordinator.getPreMergeObject().stop();
+            // set the blockchoiceRule to never reorg, rely on forkchoiceUpdated instead
+            protocolContext
+                .getBlockchain()
+                .setBlockChoiceRule((newBlockHeader, currentBlockHeader) -> -1);
+
+          } else if (composedCoordinator.isMiningBeforeMerge()) {
+            // if our merge state is set to mine pre-merge and we are mining, start mining
+            composedCoordinator.getPreMergeObject().enable();
+            composedCoordinator.getPreMergeObject().start();
+          }
+        });
+
+    // initialize our merge context merge status before we would start either
+    Blockchain blockchain = protocolContext.getBlockchain();
+    blockchain
+        .getTotalDifficultyByHash(blockchain.getChainHeadHash())
+        .ifPresent(postMergeContext::setIsPostMerge);
+  }
+
+  @Override
+  public BesuControllerBuilder storageProvider(final StorageProvider storageProvider) {
+    super.storageProvider(storageProvider);
+    return propagateConfig(z -> z.storageProvider(storageProvider));
+  }
+
+  @Override
+  public BesuController build() {
+    final BesuController controller = super.build();
+    PostMergeContext.get().setSyncState(controller.getSyncState());
+    return controller;
+  }
+
+  @Override
+  public BesuControllerBuilder evmConfiguration(final EvmConfiguration evmConfiguration) {
+    super.evmConfiguration(evmConfiguration);
+    return propagateConfig(z -> z.evmConfiguration(evmConfiguration));
+  }
+
+  @Override
+  public BesuControllerBuilder genesisConfigFile(final GenesisConfigFile genesisConfig) {
+    super.genesisConfigFile(genesisConfig);
+    return propagateConfig(z -> z.genesisConfigFile(genesisConfig));
+  }
+
+  @Override
+  public BesuControllerBuilder synchronizerConfiguration(
+      final SynchronizerConfiguration synchronizerConfig) {
+    super.synchronizerConfiguration(synchronizerConfig);
+    return propagateConfig(z -> z.synchronizerConfiguration(synchronizerConfig));
+  }
+
+  @Override
+  public BesuControllerBuilder ethProtocolConfiguration(
+      final EthProtocolConfiguration ethProtocolConfiguration) {
+    super.ethProtocolConfiguration(ethProtocolConfiguration);
+    return propagateConfig(z -> z.ethProtocolConfiguration(ethProtocolConfiguration));
+  }
+
+  @Override
+  public BesuControllerBuilder networkId(final BigInteger networkId) {
+    super.networkId(networkId);
+    return propagateConfig(z -> z.networkId(networkId));
+  }
+
+  @Override
+  public BesuControllerBuilder miningParameters(final MiningParameters miningParameters) {
+    super.miningParameters(miningParameters);
+    return propagateConfig(z -> z.miningParameters(miningParameters));
+  }
+
+  @Override
+  public BesuControllerBuilder messagePermissioningProviders(
+      final List<NodeMessagePermissioningProvider> messagePermissioningProviders) {
+    super.messagePermissioningProviders(messagePermissioningProviders);
+    return propagateConfig(z -> z.messagePermissioningProviders(messagePermissioningProviders));
+  }
+
+  @Override
+  public BesuControllerBuilder nodeKey(final NodeKey nodeKey) {
+    super.nodeKey(nodeKey);
+    return propagateConfig(z -> z.nodeKey(nodeKey));
+  }
+
+  @Override
+  public BesuControllerBuilder metricsSystem(final ObservableMetricsSystem metricsSystem) {
+    super.metricsSystem(metricsSystem);
+    return propagateConfig(z -> z.metricsSystem(metricsSystem));
+  }
+
+  @Override
+  public BesuControllerBuilder privacyParameters(final PrivacyParameters privacyParameters) {
+    super.privacyParameters(privacyParameters);
+    return propagateConfig(z -> z.privacyParameters(privacyParameters));
+  }
+
+  @Override
+  public BesuControllerBuilder pkiBlockCreationConfiguration(
+      final Optional<PkiBlockCreationConfiguration> pkiBlockCreationConfiguration) {
+    super.pkiBlockCreationConfiguration(pkiBlockCreationConfiguration);
+    return propagateConfig(z -> z.pkiBlockCreationConfiguration(pkiBlockCreationConfiguration));
+  }
+
+  @Override
+  public BesuControllerBuilder dataDirectory(final Path dataDirectory) {
+    super.dataDirectory(dataDirectory);
+    return propagateConfig(z -> z.dataDirectory(dataDirectory));
+  }
+
+  @Override
+  public BesuControllerBuilder clock(final Clock clock) {
+    super.clock(clock);
+    return propagateConfig(z -> z.clock(clock));
+  }
+
+  @Override
+  public BesuControllerBuilder transactionPoolConfiguration(
+      final TransactionPoolConfiguration transactionPoolConfiguration) {
+    super.transactionPoolConfiguration(transactionPoolConfiguration);
+    return propagateConfig(z -> z.transactionPoolConfiguration(transactionPoolConfiguration));
+  }
+
+  @Override
+  public BesuControllerBuilder isRevertReasonEnabled(final boolean isRevertReasonEnabled) {
+    super.isRevertReasonEnabled(isRevertReasonEnabled);
+    return propagateConfig(z -> z.isRevertReasonEnabled(isRevertReasonEnabled));
+  }
+
+  @Override
+  public BesuControllerBuilder isPruningEnabled(final boolean isPruningEnabled) {
+    super.isPruningEnabled(isPruningEnabled);
+    return propagateConfig(z -> z.isPruningEnabled(isPruningEnabled));
+  }
+
+  @Override
+  public BesuControllerBuilder pruningConfiguration(final PrunerConfiguration prunerConfiguration) {
+    super.pruningConfiguration(prunerConfiguration);
+    return propagateConfig(z -> z.pruningConfiguration(prunerConfiguration));
+  }
+
+  @Override
+  public BesuControllerBuilder genesisConfigOverrides(
+      final Map<String, String> genesisConfigOverrides) {
+    super.genesisConfigOverrides(genesisConfigOverrides);
+    return propagateConfig(z -> z.genesisConfigOverrides(genesisConfigOverrides));
+  }
+
+  @Override
+  public BesuControllerBuilder gasLimitCalculator(final GasLimitCalculator gasLimitCalculator) {
+    super.gasLimitCalculator(gasLimitCalculator);
+    return propagateConfig(z -> z.gasLimitCalculator(gasLimitCalculator));
+  }
+
+  @Override
+  public BesuControllerBuilder requiredBlocks(final Map<Long, Hash> requiredBlocks) {
+    super.requiredBlocks(requiredBlocks);
+    return propagateConfig(z -> z.requiredBlocks(requiredBlocks));
+  }
+
+  @Override
+  public BesuControllerBuilder reorgLoggingThreshold(final long reorgLoggingThreshold) {
+    super.reorgLoggingThreshold(reorgLoggingThreshold);
+    return propagateConfig(z -> z.reorgLoggingThreshold(reorgLoggingThreshold));
+  }
+
+  @Override
+  public BesuControllerBuilder dataStorageConfiguration(
+      final DataStorageConfiguration dataStorageConfiguration) {
+    super.dataStorageConfiguration(dataStorageConfiguration);
+    return propagateConfig(z -> z.dataStorageConfiguration(dataStorageConfiguration));
+  }
+
+  private BesuControllerBuilder propagateConfig(final Consumer<BesuControllerBuilder> toPropogate) {
+    toPropogate.accept(preMergeBesuControllerBuilder);
+    toPropogate.accept(mergeBesuControllerBuilder);
+    return this;
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/services/BesuConfigurationImpl.java b/besu/src/main/java/org/hyperledger/besu/services/BesuConfigurationImpl.java
index 7d746052f71..a2974115522 100644
--- a/besu/src/main/java/org/hyperledger/besu/services/BesuConfigurationImpl.java
+++ b/besu/src/main/java/org/hyperledger/besu/services/BesuConfigurationImpl.java
@@ -18,11 +18,18 @@
 
 import java.nio.file.Path;
 
+/** A concrete implementation of BesuConfiguration which is used in Besu plugin framework. */
 public class BesuConfigurationImpl implements BesuConfiguration {
 
   private final Path storagePath;
   private final Path dataPath;
 
+  /**
+   * BesuConfigurationImpl Constructor.
+   *
+   * @param dataPath The Path representing data folder
+   * @param storagePath The path representing storage folder
+   */
   public BesuConfigurationImpl(final Path dataPath, final Path storagePath) {
     this.dataPath = dataPath;
     this.storagePath = storagePath;
diff --git a/besu/src/main/java/org/hyperledger/besu/services/BesuEventsImpl.java b/besu/src/main/java/org/hyperledger/besu/services/BesuEventsImpl.java
index 6bf7a3f4526..205b325ea52 100644
--- a/besu/src/main/java/org/hyperledger/besu/services/BesuEventsImpl.java
+++ b/besu/src/main/java/org/hyperledger/besu/services/BesuEventsImpl.java
@@ -16,18 +16,18 @@
 
 import static java.util.stream.Collectors.toUnmodifiableList;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.query.LogsQuery;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.LogTopic;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 import org.hyperledger.besu.ethereum.eth.sync.BlockBroadcaster;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.evm.log.LogTopic;
 import org.hyperledger.besu.plugin.data.AddedBlockContext;
-import org.hyperledger.besu.plugin.data.Address;
 import org.hyperledger.besu.plugin.data.BlockHeader;
 import org.hyperledger.besu.plugin.data.PropagatedBlockContext;
 import org.hyperledger.besu.plugin.services.BesuEvents;
@@ -38,12 +38,21 @@
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.units.bigints.UInt256;
 
+/** A concrete implementation of BesuEvents used in Besu plugin framework. */
 public class BesuEventsImpl implements BesuEvents {
   private final Blockchain blockchain;
   private final BlockBroadcaster blockBroadcaster;
   private final TransactionPool transactionPool;
   private final SyncState syncState;
 
+  /**
+   * Constructor for BesuEventsImpl
+   *
+   * @param blockchain An instance of Blockchain
+   * @param blockBroadcaster An instance of BlockBroadcaster
+   * @param transactionPool An instance of TransactionPool
+   * @param syncState An instance of SyncState
+   */
   public BesuEventsImpl(
       final Blockchain blockchain,
       final BlockBroadcaster blockBroadcaster,
@@ -137,16 +146,12 @@ public long addLogListener(
       final List<Address> addresses,
       final List<List<Bytes32>> topics,
       final LogListener logListener) {
-    final List<org.hyperledger.besu.ethereum.core.Address> besuAddresses =
-        addresses.stream()
-            .map(org.hyperledger.besu.ethereum.core.Address::fromPlugin)
-            .collect(toUnmodifiableList());
     final List<List<LogTopic>> besuTopics =
         topics.stream()
             .map(subList -> subList.stream().map(LogTopic::wrap).collect(toUnmodifiableList()))
             .collect(toUnmodifiableList());
 
-    final LogsQuery logsQuery = new LogsQuery(besuAddresses, besuTopics);
+    final LogsQuery logsQuery = new LogsQuery(addresses, besuTopics);
 
     return blockchain.observeLogs(
         logWithMetadata -> {
diff --git a/besu/src/main/java/org/hyperledger/besu/services/BesuPluginContextImpl.java b/besu/src/main/java/org/hyperledger/besu/services/BesuPluginContextImpl.java
index 2a5531be785..04bf5447a44 100644
--- a/besu/src/main/java/org/hyperledger/besu/services/BesuPluginContextImpl.java
+++ b/besu/src/main/java/org/hyperledger/besu/services/BesuPluginContextImpl.java
@@ -19,6 +19,8 @@
 
 import org.hyperledger.besu.plugin.BesuContext;
 import org.hyperledger.besu.plugin.BesuPlugin;
+import org.hyperledger.besu.plugin.services.BesuService;
+import org.hyperledger.besu.plugin.services.PluginVersionsProvider;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -40,29 +42,49 @@
 import java.util.stream.Stream;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Besu plugin context implementation. */
 public class BesuPluginContextImpl implements BesuContext, PluginVersionsProvider {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(BesuPluginContextImpl.class);
 
   private enum Lifecycle {
+    /** Uninitialized lifecycle. */
     UNINITIALIZED,
+    /** Registering lifecycle. */
     REGISTERING,
+    /** Registered lifecycle. */
     REGISTERED,
-    STARTING,
-    STARTED,
+    /** Before external services started lifecycle. */
+    BEFORE_EXTERNAL_SERVICES_STARTED,
+    /** Before external services finished lifecycle. */
+    BEFORE_EXTERNAL_SERVICES_FINISHED,
+    /** Before main loop started lifecycle. */
+    BEFORE_MAIN_LOOP_STARTED,
+    /** Before main loop finished lifecycle. */
+    BEFORE_MAIN_LOOP_FINISHED,
+    /** Stopping lifecycle. */
     STOPPING,
+    /** Stopped lifecycle. */
     STOPPED
   }
 
   private Lifecycle state = Lifecycle.UNINITIALIZED;
-  private final Map<Class<?>, ? super Object> serviceRegistry = new HashMap<>();
+  private final Map<Class<?>, ? super BesuService> serviceRegistry = new HashMap<>();
   private final List<BesuPlugin> plugins = new ArrayList<>();
   private final List<String> pluginVersions = new ArrayList<>();
 
-  public <T> void addService(final Class<T> serviceType, final T service) {
+  /**
+   * Add service.
+   *
+   * @param <T> the type parameter
+   * @param serviceType the service type
+   * @param service the service
+   */
+  @Override
+  public <T extends BesuService> void addService(final Class<T> serviceType, final T service) {
     checkArgument(serviceType.isInterface(), "Services must be Java interfaces.");
     checkArgument(
         serviceType.isInstance(service),
@@ -72,10 +94,15 @@ public <T> void addService(final Class<T> serviceType, final T service) {
 
   @SuppressWarnings("unchecked")
   @Override
-  public <T> Optional<T> getService(final Class<T> serviceType) {
+  public <T extends BesuService> Optional<T> getService(final Class<T> serviceType) {
     return Optional.ofNullable((T) serviceRegistry.get(serviceType));
   }
 
+  /**
+   * Register plugins.
+   *
+   * @param pluginsDir the plugins dir
+   */
   public void registerPlugins(final Path pluginsDir) {
     checkState(
         state == Lifecycle.UNINITIALIZED,
@@ -92,7 +119,7 @@ public void registerPlugins(final Path pluginsDir) {
     for (final BesuPlugin plugin : serviceLoader) {
       try {
         plugin.register(this);
-        LOG.debug("Registered plugin of type {}.", plugin.getClass().getName());
+        LOG.info("Registered plugin of type {}.", plugin.getClass().getName());
         addPluginVersion(plugin);
       } catch (final Exception e) {
         LOG.error(
@@ -124,13 +151,45 @@ private void addPluginVersion(final BesuPlugin plugin) {
     pluginVersions.add(pluginVersion);
   }
 
-  public void startPlugins() {
+  /** Before external services. */
+  public void beforeExternalServices() {
     checkState(
         state == Lifecycle.REGISTERED,
         "BesuContext should be in state %s but it was in %s",
         Lifecycle.REGISTERED,
         state);
-    state = Lifecycle.STARTING;
+    state = Lifecycle.BEFORE_EXTERNAL_SERVICES_STARTED;
+    final Iterator<BesuPlugin> pluginsIterator = plugins.iterator();
+
+    while (pluginsIterator.hasNext()) {
+      final BesuPlugin plugin = pluginsIterator.next();
+
+      try {
+        plugin.beforeExternalServices();
+        LOG.debug(
+            "beforeExternalServices called on plugin of type {}.", plugin.getClass().getName());
+      } catch (final Exception e) {
+        LOG.error(
+            "Error calling `beforeExternalServices` on plugin of type "
+                + plugin.getClass().getName()
+                + ", stop will not be called.",
+            e);
+        pluginsIterator.remove();
+      }
+    }
+
+    LOG.debug("Plugin startup complete.");
+    state = Lifecycle.BEFORE_EXTERNAL_SERVICES_FINISHED;
+  }
+
+  /** Start plugins. */
+  public void startPlugins() {
+    checkState(
+        state == Lifecycle.BEFORE_EXTERNAL_SERVICES_FINISHED,
+        "BesuContext should be in state %s but it was in %s",
+        Lifecycle.BEFORE_EXTERNAL_SERVICES_FINISHED,
+        state);
+    state = Lifecycle.BEFORE_MAIN_LOOP_STARTED;
     final Iterator<BesuPlugin> pluginsIterator = plugins.iterator();
 
     while (pluginsIterator.hasNext()) {
@@ -150,14 +209,15 @@ public void startPlugins() {
     }
 
     LOG.debug("Plugin startup complete.");
-    state = Lifecycle.STARTED;
+    state = Lifecycle.BEFORE_MAIN_LOOP_FINISHED;
   }
 
+  /** Stop plugins. */
   public void stopPlugins() {
     checkState(
-        state == Lifecycle.STARTED,
+        state == Lifecycle.BEFORE_MAIN_LOOP_FINISHED,
         "BesuContext should be in state %s but it was in %s",
-        Lifecycle.STARTED,
+        Lifecycle.BEFORE_MAIN_LOOP_FINISHED,
         state);
     state = Lifecycle.STOPPING;
 
@@ -187,6 +247,11 @@ private static URL pathToURIOrNull(final Path p) {
     }
   }
 
+  /**
+   * Gets plugins.
+   *
+   * @return the plugins
+   */
   @VisibleForTesting
   List<BesuPlugin> getPlugins() {
     return Collections.unmodifiableList(plugins);
@@ -215,6 +280,11 @@ private Optional<ClassLoader> pluginDirectoryLoader(final Path pluginsDir) {
     return Optional.empty();
   }
 
+  /**
+   * Gets named plugins.
+   *
+   * @return the named plugins
+   */
   public Map<String, BesuPlugin> getNamedPlugins() {
     return plugins.stream()
         .filter(plugin -> plugin.getName().isPresent())
diff --git a/besu/src/main/java/org/hyperledger/besu/services/BlockchainServiceImpl.java b/besu/src/main/java/org/hyperledger/besu/services/BlockchainServiceImpl.java
new file mode 100644
index 00000000000..a3b37a6665a
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/services/BlockchainServiceImpl.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.services;
+
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.plugin.Unstable;
+import org.hyperledger.besu.plugin.data.BlockContext;
+import org.hyperledger.besu.plugin.data.BlockHeader;
+import org.hyperledger.besu.plugin.services.BlockchainService;
+
+import java.util.Optional;
+import java.util.function.Supplier;
+
+/** The Blockchain service implementation. */
+@Unstable
+public class BlockchainServiceImpl implements BlockchainService {
+
+  private final Blockchain blockchain;
+
+  /**
+   * Instantiates a new Blockchain service.
+   *
+   * @param blockchain the blockchain
+   */
+  public BlockchainServiceImpl(final Blockchain blockchain) {
+    this.blockchain = blockchain;
+  }
+
+  /**
+   * Gets block by number
+   *
+   * @param number the block number
+   * @return the BlockContext if block exists otherwise empty
+   */
+  @Override
+  public Optional<BlockContext> getBlockByNumber(final long number) {
+    return blockchain
+        .getBlockByNumber(number)
+        .map(block -> blockContext(block::getHeader, block::getBody));
+  }
+
+  private static BlockContext blockContext(
+      final Supplier<BlockHeader> blockHeaderSupplier,
+      final Supplier<BlockBody> blockBodySupplier) {
+    return new BlockContext() {
+      @Override
+      public BlockHeader getBlockHeader() {
+        return blockHeaderSupplier.get();
+      }
+
+      @Override
+      public BlockBody getBlockBody() {
+        return blockBodySupplier.get();
+      }
+    };
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/services/PermissioningServiceImpl.java b/besu/src/main/java/org/hyperledger/besu/services/PermissioningServiceImpl.java
new file mode 100644
index 00000000000..a44e70843bc
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/services/PermissioningServiceImpl.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.services;
+
+import org.hyperledger.besu.plugin.services.PermissioningService;
+import org.hyperledger.besu.plugin.services.permissioning.NodeConnectionPermissioningProvider;
+import org.hyperledger.besu.plugin.services.permissioning.NodeMessagePermissioningProvider;
+
+import java.util.List;
+
+import com.google.common.collect.Lists;
+
+/** The Permissioning service implementation. */
+public class PermissioningServiceImpl implements PermissioningService {
+
+  private final List<NodeConnectionPermissioningProvider> connectionPermissioningProviders =
+      Lists.newArrayList();
+
+  @Override
+  public void registerNodePermissioningProvider(
+      final NodeConnectionPermissioningProvider provider) {
+    connectionPermissioningProviders.add(provider);
+  }
+
+  /**
+   * Gets connection permissioning providers.
+   *
+   * @return the connection permissioning providers
+   */
+  public List<NodeConnectionPermissioningProvider> getConnectionPermissioningProviders() {
+    return connectionPermissioningProviders;
+  }
+
+  private final List<NodeMessagePermissioningProvider> messagePermissioningProviders =
+      Lists.newArrayList();
+
+  @Override
+  public void registerNodeMessagePermissioningProvider(
+      final NodeMessagePermissioningProvider provider) {
+    messagePermissioningProviders.add(provider);
+  }
+
+  /**
+   * Gets message permissioning providers.
+   *
+   * @return the message permissioning providers
+   */
+  public List<NodeMessagePermissioningProvider> getMessagePermissioningProviders() {
+    return messagePermissioningProviders;
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/services/PicoCLIOptionsImpl.java b/besu/src/main/java/org/hyperledger/besu/services/PicoCLIOptionsImpl.java
index 5d4a0cb3cc4..de43f08a027 100644
--- a/besu/src/main/java/org/hyperledger/besu/services/PicoCLIOptionsImpl.java
+++ b/besu/src/main/java/org/hyperledger/besu/services/PicoCLIOptionsImpl.java
@@ -16,18 +16,24 @@
 
 import org.hyperledger.besu.plugin.services.PicoCLIOptions;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
 import picocli.CommandLine.Model.CommandSpec;
 import picocli.CommandLine.Model.OptionSpec;
 
+/** The Pico cli options service implementation to specify plugins. */
 public class PicoCLIOptionsImpl implements PicoCLIOptions {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PicoCLIOptionsImpl.class);
 
   private final CommandLine commandLine;
 
+  /**
+   * Instantiates a new Pico cli options.
+   *
+   * @param commandLine the command line
+   */
   public PicoCLIOptionsImpl(final CommandLine commandLine) {
     this.commandLine = commandLine;
   }
diff --git a/besu/src/main/java/org/hyperledger/besu/services/PrivacyPluginServiceImpl.java b/besu/src/main/java/org/hyperledger/besu/services/PrivacyPluginServiceImpl.java
new file mode 100644
index 00000000000..25a8782b7b3
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/services/PrivacyPluginServiceImpl.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.services;
+
+import org.hyperledger.besu.plugin.services.PrivacyPluginService;
+import org.hyperledger.besu.plugin.services.privacy.PrivacyGroupAuthProvider;
+import org.hyperledger.besu.plugin.services.privacy.PrivacyGroupGenesisProvider;
+import org.hyperledger.besu.plugin.services.privacy.PrivacyPluginPayloadProvider;
+import org.hyperledger.besu.plugin.services.privacy.PrivateMarkerTransactionFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Privacy plugin service implementation. */
+public class PrivacyPluginServiceImpl implements PrivacyPluginService {
+  private static final Logger LOG = LoggerFactory.getLogger(PrivacyPluginServiceImpl.class);
+
+  private PrivacyPluginPayloadProvider privacyPluginPayloadProvider;
+  private PrivateMarkerTransactionFactory privateMarkerTransactionFactory;
+
+  private PrivacyGroupAuthProvider privacyGroupAuthProvider =
+      (privacyGroupId, privacyUserId, blockNumber) -> true;
+  private PrivacyGroupGenesisProvider privacyGroupGenesisProvider;
+
+  @Override
+  public void setPayloadProvider(final PrivacyPluginPayloadProvider privacyPluginPayloadProvider) {
+    this.privacyPluginPayloadProvider = privacyPluginPayloadProvider;
+  }
+
+  @Override
+  public PrivacyPluginPayloadProvider getPayloadProvider() {
+    if (privacyPluginPayloadProvider == null) {
+      LOG.error(
+          "You must register a PrivacyPluginService and register a PrivacyPluginPayloadProvider by calling setPayloadProvider when enabling privacy plugin!");
+    }
+    return privacyPluginPayloadProvider;
+  }
+
+  @Override
+  public void setPrivacyGroupAuthProvider(final PrivacyGroupAuthProvider privacyGroupAuthProvider) {
+    this.privacyGroupAuthProvider = privacyGroupAuthProvider;
+  }
+
+  @Override
+  public PrivacyGroupAuthProvider getPrivacyGroupAuthProvider() {
+    return privacyGroupAuthProvider;
+  }
+
+  @Override
+  public PrivateMarkerTransactionFactory getPrivateMarkerTransactionFactory() {
+    return privateMarkerTransactionFactory;
+  }
+
+  @Override
+  public void setPrivateMarkerTransactionFactory(
+      final PrivateMarkerTransactionFactory privateMarkerTransactionFactory) {
+    this.privateMarkerTransactionFactory = privateMarkerTransactionFactory;
+  }
+
+  @Override
+  public void setPrivacyGroupGenesisProvider(
+      final PrivacyGroupGenesisProvider privacyGroupGenesisProvider) {
+    this.privacyGroupGenesisProvider = privacyGroupGenesisProvider;
+  }
+
+  @Override
+  public PrivacyGroupGenesisProvider getPrivacyGroupGenesisProvider() {
+    return privacyGroupGenesisProvider;
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/services/RpcEndpointServiceImpl.java b/besu/src/main/java/org/hyperledger/besu/services/RpcEndpointServiceImpl.java
new file mode 100644
index 00000000000..4513bf0bf39
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/services/RpcEndpointServiceImpl.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.services;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.PluginJsonRpcMethod;
+import org.hyperledger.besu.plugin.services.RpcEndpointService;
+import org.hyperledger.besu.plugin.services.rpc.PluginRpcRequest;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/** The Rpc endpoint service implementation. */
+public class RpcEndpointServiceImpl implements RpcEndpointService {
+  private final Map<String, Function<PluginRpcRequest, ?>> rpcMethods = new HashMap<>();
+
+  @Override
+  public <T> void registerRPCEndpoint(
+      final String namespace,
+      final String functionName,
+      final Function<PluginRpcRequest, T> function) {
+    checkArgument(namespace.matches("\\p{Alnum}+"), "Namespace must be only alpha numeric");
+    checkArgument(functionName.matches("\\p{Alnum}+"), "Function Name must be only alpha numeric");
+    checkNotNull(function);
+
+    rpcMethods.put(namespace + "_" + functionName, function);
+  }
+
+  /**
+   * Gets plugin methods.
+   *
+   * @param namespaces the namespaces collection
+   * @return the Json Rpc Methods from plugins
+   */
+  public Map<String, ? extends JsonRpcMethod> getPluginMethods(
+      final Collection<String> namespaces) {
+    return rpcMethods.entrySet().stream()
+        .filter(
+            entry ->
+                namespaces.stream()
+                    .anyMatch(
+                        namespace ->
+                            entry.getKey().toUpperCase().startsWith(namespace.toUpperCase())))
+        .map(entry -> new PluginJsonRpcMethod(entry.getKey(), entry.getValue()))
+        .collect(Collectors.toMap(PluginJsonRpcMethod::getName, e -> e));
+  }
+
+  /**
+   * Checks if RPC methods belongs to a namespace
+   *
+   * @param namespace the namespace to check against
+   * @return true if any of the RPC method starts with given namespace, false otherwise.
+   */
+  public boolean hasNamespace(final String namespace) {
+    return rpcMethods.keySet().stream()
+        .anyMatch(key -> key.toUpperCase().startsWith(namespace.toUpperCase()));
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/services/SecurityModuleServiceImpl.java b/besu/src/main/java/org/hyperledger/besu/services/SecurityModuleServiceImpl.java
index 212ed837138..d2cc953ecbc 100644
--- a/besu/src/main/java/org/hyperledger/besu/services/SecurityModuleServiceImpl.java
+++ b/besu/src/main/java/org/hyperledger/besu/services/SecurityModuleServiceImpl.java
@@ -22,6 +22,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Supplier;
 
+/** The Security module service implementation. */
 public class SecurityModuleServiceImpl implements SecurityModuleService {
   private final Map<String, Supplier<SecurityModule>> securityModuleSuppliers =
       new ConcurrentHashMap<>();
diff --git a/besu/src/main/java/org/hyperledger/besu/services/StorageServiceImpl.java b/besu/src/main/java/org/hyperledger/besu/services/StorageServiceImpl.java
index b6f924c07e8..6629da690e8 100644
--- a/besu/src/main/java/org/hyperledger/besu/services/StorageServiceImpl.java
+++ b/besu/src/main/java/org/hyperledger/besu/services/StorageServiceImpl.java
@@ -24,11 +24,13 @@
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 
+/** The Storage service implementation. */
 public class StorageServiceImpl implements StorageService {
 
   private final List<SegmentIdentifier> segments;
   private final Map<String, KeyValueStorageFactory> factories;
 
+  /** Instantiates a new Storage service. */
   public StorageServiceImpl() {
     this.segments = List.of(KeyValueSegmentIdentifier.values());
     this.factories = new ConcurrentHashMap<>();
diff --git a/besu/src/main/java/org/hyperledger/besu/services/TraceServiceImpl.java b/besu/src/main/java/org/hyperledger/besu/services/TraceServiceImpl.java
new file mode 100644
index 00000000000..321996d51ea
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/services/TraceServiceImpl.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.services;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import org.hyperledger.besu.datatypes.DataGas;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.TraceBlock.ChainUpdater;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.Tracer;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.ethereum.vm.CachingBlockHashLookup;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.plugin.Unstable;
+import org.hyperledger.besu.plugin.services.TraceService;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Trace service implementation. */
+@Unstable
+public class TraceServiceImpl implements TraceService {
+  private static final Logger LOG = LoggerFactory.getLogger(TraceServiceImpl.class);
+
+  private final BlockchainQueries blockchainQueries;
+  private final ProtocolSchedule protocolSchedule;
+
+  /**
+   * Instantiates a new TraceServiceImpl service.
+   *
+   * @param blockchainQueries the blockchainQueries
+   * @param protocolSchedule the protocolSchedule
+   */
+  public TraceServiceImpl(
+      final BlockchainQueries blockchainQueries, final ProtocolSchedule protocolSchedule) {
+    this.blockchainQueries = blockchainQueries;
+    this.protocolSchedule = protocolSchedule;
+  }
+
+  /**
+   * Traces block
+   *
+   * @param blockNumber the block number to be traced
+   * @param tracer an instance of OperationTracer
+   */
+  @Override
+  public void traceBlock(final long blockNumber, final OperationTracer tracer) {
+    checkArgument(tracer != null);
+    final Optional<Block> block = blockchainQueries.getBlockchain().getBlockByNumber(blockNumber);
+    block.ifPresent(value -> trace(value, tracer));
+  }
+
+  /**
+   * Traces block
+   *
+   * @param hash the block hash to be traced
+   * @param tracer an instance of OperationTracer
+   */
+  @Override
+  public void traceBlock(final Hash hash, final OperationTracer tracer) {
+    checkArgument(tracer != null);
+    final Optional<Block> block = blockchainQueries.getBlockchain().getBlockByHash(hash);
+    block.ifPresent(value -> trace(value, tracer));
+  }
+
+  private void trace(final Block block, final OperationTracer tracer) {
+    LOG.debug("Tracing block {}", block.toLogString());
+    final List<TransactionProcessingResult> results = new ArrayList<>();
+    Tracer.processTracing(
+        blockchainQueries,
+        block.getHash(),
+        traceableState -> {
+          final Blockchain blockchain = blockchainQueries.getBlockchain();
+          final ChainUpdater chainUpdater = new ChainUpdater(traceableState);
+          final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(block.getHeader());
+          final MainnetTransactionProcessor transactionProcessor =
+              protocolSpec.getTransactionProcessor();
+          final BlockHeader header = block.getHeader();
+          block
+              .getBody()
+              .getTransactions()
+              .forEach(
+                  transaction -> {
+                    final Optional<BlockHeader> maybeParentHeader =
+                        blockchain.getBlockHeader(header.getParentHash());
+                    final Wei dataGasPrice =
+                        protocolSpec
+                            .getFeeMarket()
+                            .dataPrice(
+                                maybeParentHeader
+                                    .flatMap(BlockHeader::getExcessDataGas)
+                                    .orElse(DataGas.ZERO));
+                    final TransactionProcessingResult result =
+                        transactionProcessor.processTransaction(
+                            blockchain,
+                            chainUpdater.getNextUpdater(),
+                            header,
+                            transaction,
+                            header.getCoinbase(),
+                            tracer,
+                            new CachingBlockHashLookup(header, blockchain),
+                            false,
+                            dataGasPrice);
+                    results.add(result);
+                  });
+          return Optional.of(results);
+        });
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/services/TransactionSelectionServiceImpl.java b/besu/src/main/java/org/hyperledger/besu/services/TransactionSelectionServiceImpl.java
new file mode 100644
index 00000000000..42b1ae88a76
--- /dev/null
+++ b/besu/src/main/java/org/hyperledger/besu/services/TransactionSelectionServiceImpl.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.services;
+
+import org.hyperledger.besu.plugin.services.TransactionSelectionService;
+import org.hyperledger.besu.plugin.services.txselection.TransactionSelectorFactory;
+
+import java.util.Optional;
+
+/** The Transaction Selection service implementation. */
+public class TransactionSelectionServiceImpl implements TransactionSelectionService {
+
+  private Optional<TransactionSelectorFactory> factory = Optional.empty();
+
+  @Override
+  public Optional<TransactionSelectorFactory> get() {
+    return factory;
+  }
+
+  @Override
+  public void registerTransactionSelectorFactory(
+      final TransactionSelectorFactory transactionSelectorFactory) {
+    factory = Optional.ofNullable(transactionSelectorFactory);
+  }
+}
diff --git a/besu/src/main/java/org/hyperledger/besu/util/PermissioningConfigurationValidator.java b/besu/src/main/java/org/hyperledger/besu/util/PermissioningConfigurationValidator.java
index 2c1898cdfff..f8e5c65dbc0 100644
--- a/besu/src/main/java/org/hyperledger/besu/util/PermissioningConfigurationValidator.java
+++ b/besu/src/main/java/org/hyperledger/besu/util/PermissioningConfigurationValidator.java
@@ -16,16 +16,24 @@
 
 import static java.util.stream.Collectors.toList;
 
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
 import org.hyperledger.besu.ethereum.permissioning.LocalPermissioningConfiguration;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.net.URI;
 import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 
+/** The Permissioning configuration validator. */
 public class PermissioningConfigurationValidator {
 
+  /**
+   * Check if all nodes are in allowlist.
+   *
+   * @param nodeURIs the node URIs
+   * @param permissioningConfiguration the permissioning configuration
+   * @throws Exception In case of nodes are not in allow list
+   */
   public static void areAllNodesAreInAllowlist(
       final Collection<EnodeURL> nodeURIs,
       final LocalPermissioningConfiguration permissioningConfiguration)
diff --git a/besu/src/main/java/org/hyperledger/besu/util/PrivateStorageMigrationBuilder.java b/besu/src/main/java/org/hyperledger/besu/util/PrivateStorageMigrationBuilder.java
index 353235ab767..7a456761dd7 100644
--- a/besu/src/main/java/org/hyperledger/besu/util/PrivateStorageMigrationBuilder.java
+++ b/besu/src/main/java/org/hyperledger/besu/util/PrivateStorageMigrationBuilder.java
@@ -15,8 +15,8 @@
 package org.hyperledger.besu.util;
 
 import org.hyperledger.besu.controller.BesuController;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.privacy.PrivateStateRootResolver;
@@ -26,21 +26,32 @@
 import org.hyperledger.besu.ethereum.privacy.storage.migration.PrivateStorageMigration;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 
+/** The Private storage migration builder. */
 public class PrivateStorageMigrationBuilder {
 
   private final BesuController besuController;
   private final PrivacyParameters privacyParameters;
 
+  /**
+   * Instantiates a new Private storage migration builder.
+   *
+   * @param besuController the besu controller
+   * @param privacyParameters the privacy parameters
+   */
   public PrivateStorageMigrationBuilder(
       final BesuController besuController, final PrivacyParameters privacyParameters) {
     this.besuController = besuController;
     this.privacyParameters = privacyParameters;
   }
 
+  /**
+   * Build private storage migration.
+   *
+   * @return the private storage migration
+   */
   public PrivateStorageMigration build() {
     final Blockchain blockchain = besuController.getProtocolContext().getBlockchain();
-    final Address privacyPrecompileAddress =
-        Address.privacyPrecompiled(privacyParameters.getPrivacyAddress());
+    final Address privacyPrecompileAddress = privacyParameters.getPrivacyAddress();
     final ProtocolSchedule protocolSchedule = besuController.getProtocolSchedule();
     final WorldStateArchive publicWorldStateArchive =
         besuController.getProtocolContext().getWorldStateArchive();
diff --git a/besu/src/main/resources/log4j2.xml b/besu/src/main/resources/log4j2.xml
index 6b13a49ea0d..6bf83a973f7 100644
--- a/besu/src/main/resources/log4j2.xml
+++ b/besu/src/main/resources/log4j2.xml
@@ -3,7 +3,7 @@
     <Properties>
         <Property name="root.log.level">${env:LOG_LEVEL:-INFO}</Property>
         <Property name="root.log.logger">${env:LOGGER:-Console}</Property>
-        <Property name="host">${env:HOST:-${docker:containerId:-localhost}}</Property>
+        <Property name="host">${env:HOST:-${docker:containerId:-${hostName:-localhost}}}</Property>
         <Property name="splunk.url">${env:SPLUNK_URL}</Property>
         <Property name="splunk.token">${env:SPLUNK_TOKEN}</Property>
         <Property name="splunk.index">${env:SPLUNK_INDEX}</Property>
@@ -39,6 +39,9 @@
     </Appenders>
     <Loggers>
         <Logger name="org.apache.logging.log4j.status.StatusLogger" level="OFF"/>
+        <Logger name="org.apache.tuweni.discovery.DNSTimerTask">
+            <RegexFilter regex="Refreshing DNS records with .*" onMatch="DENY" onMismatch="NEUTRAL" />
+        </Logger>
         <Root level="${sys:root.log.level}">
             <AppenderRef ref="Router" />
         </Root>
diff --git a/besu/src/main/resources/org/hyperledger/besu/cli/launcher.json b/besu/src/main/resources/org/hyperledger/besu/cli/launcher.json
new file mode 100644
index 00000000000..6db0ef2e5bc
--- /dev/null
+++ b/besu/src/main/resources/org/hyperledger/besu/cli/launcher.json
@@ -0,0 +1,184 @@
+{
+  "config-file-name": "config.toml",
+  "steps": [
+    {
+      "prompt-type": "LIST",
+      "question": "Which Ethereum network would you like to use ?",
+      "config-key": "network",
+      "available-options": "org.hyperledger.besu.cli.config.NetworkName"
+    },
+    {
+      "prompt-type": "LIST",
+      "question": "Which synchronization mode?",
+      "config-key": "sync-mode",
+      "available-options": "org.hyperledger.besu.ethereum.eth.sync.SyncMode"
+    },
+    {
+      "prompt-type": "CONFIRM",
+      "question": "Do you want to enable pruning?",
+      "config-key": "pruning-enabled",
+      "default-option": "no"
+    },
+    {
+      "prompt-type": "INPUT",
+      "question": "What is the data directory ?",
+      "config-key": "data-path"
+    },
+    {
+      "prompt-type": "CONFIRM",
+      "question": "Do you want to enable the JSON-RPC HTTP service ?",
+      "config-key": "rpc-http-enabled",
+      "default-option": "yes",
+      "sub-questions": [
+        {
+          "prompt-type": "CONFIRM",
+          "question": "Do you want to configure the JSON-RPC options now ?",
+          "default-option": "yes",
+          "sub-questions": [
+            {
+              "prompt-type": "INPUT",
+              "question": "What is the JSON RPC HTTP host address ?",
+              "config-key": "rpc-http-host"
+            },
+            {
+              "prompt-type": "INPUT",
+              "question": "What is the JSON RPC HTTP port ?",
+              "config-key": "rpc-http-port",
+              "regex": "[0-9]+"
+            },
+            {
+              "prompt-type": "CHECKBOX",
+              "question": "Select the list of APIs to enable on JSON-RPC HTTP service",
+              "config-key": "rpc-http-apis",
+              "available-options": "org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis$ALL_JSON_RPC_APIS",
+              "default-option": "ETH, NET, WEB3"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "prompt-type": "CONFIRM",
+      "question": "Do you want to enable the JSON-RPC Websocket service ?",
+      "config-key": "rpc-ws-enabled",
+      "default-option": "no",
+      "sub-questions": [
+        {
+          "prompt-type": "CONFIRM",
+          "question": "Do you want to configure the JSON-RPC options now ?",
+          "default-option": "yes",
+          "sub-questions": [
+            {
+              "prompt-type": "INPUT",
+              "question": "What is the JSON RPC Websocket host address ?",
+              "config-key": "rpc-ws-host"
+            },
+            {
+              "prompt-type": "INPUT",
+              "question": "What is the JSON RPC Websocket port ?",
+              "config-key": "rpc-ws-port",
+              "regex": "[0-9]+"
+            },
+            {
+              "prompt-type": "CHECKBOX",
+              "question": "Select the list of APIs to enable on JSON-RPC Websocket service",
+              "config-key": "rpc-ws-apis",
+              "available-options": "org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis$ALL_JSON_RPC_APIS",
+              "default-option": "ETH, NET, WEB3"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "prompt-type": "CONFIRM",
+      "question": "Do you want to enable GraphQL functionality ?",
+      "config-key": "graphql-http-enabled",
+      "default-option": "no",
+      "sub-questions": [
+        {
+          "prompt-type": "CONFIRM",
+          "question": "Do you want to configure the GraphQL options now ?",
+          "default-option": "yes",
+          "sub-questions": [
+            {
+              "prompt-type": "INPUT",
+              "question": "What is the GraphQL host address ?",
+              "config-key": "graphql-http-host"
+            },
+            {
+              "prompt-type": "INPUT",
+              "question": "What is the GraphQL port ?",
+              "config-key": "graphql-http-port",
+              "regex": "[0-9]+"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "prompt-type": "CONFIRM",
+      "question": "Do you want to use Ethstats ?",
+      "default-option": "no",
+      "sub-questions": [
+        {
+          "prompt-type": "INPUT",
+          "question": "What is the URL of Ethstats (nodename:secret@host:port) ?",
+          "config-key": "ethstats",
+          "regex": "([-\\w]+):([\\w]+)?@([-.\\w]+):([\\d]+)"
+        },
+        {
+          "prompt-type": "INPUT",
+          "question": "What is the contact address ?",
+          "config-key": "ethstats-contact"
+        }
+      ]
+    },
+    {
+      "prompt-type": "CONFIRM",
+      "question": "Do you want to enable NAT ?",
+      "default-option": "no",
+      "sub-questions": [
+        {
+          "prompt-type": "LIST",
+          "question": "Which NAT method would you like to use ?",
+          "config-key": "nat-method",
+          "available-options": "org.hyperledger.besu.nat.NatMethod"
+        }
+      ]
+    },
+    {
+      "prompt-type": "CONFIRM",
+      "question": "Do you want to enable mining ?",
+      "default-option": "no",
+      "config-key": "miner-enabled",
+      "sub-questions": [
+        {
+          "prompt-type": "INPUT",
+          "question": "What is the account to which mining rewards are paid ?",
+          "config-key": "miner-coinbase",
+          "regex": "^0x[0-9a-fA-F]{40}$"
+        },
+        {
+          "prompt-type": "CONFIRM",
+          "question": "Do you want to use Stratum ?",
+          "default-option": "no",
+          "config-key": "miner-stratum-enabled",
+          "sub-questions": [
+            {
+              "prompt-type": "INPUT",
+              "question": "What is the Stratum host address ?",
+              "config-key": "miner-stratum-host"
+            },
+            {
+              "prompt-type": "INPUT",
+              "question": "What is the Stratum port service ?",
+              "config-key": "miner-stratum-port",
+              "regex": "[0-9]+"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/besu/src/main/scripts/unixStartScript.txt b/besu/src/main/scripts/unixStartScript.txt
new file mode 100644
index 00000000000..3302b9c2fe1
--- /dev/null
+++ b/besu/src/main/scripts/unixStartScript.txt
@@ -0,0 +1,200 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  ${applicationName} start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: \$0 may be a link
+PRG="\$0"
+# Need this for relative symlinks.
+while [ -h "\$PRG" ] ; do
+    ls=`ls -ld "\$PRG"`
+    link=`expr "\$ls" : '.*-> \\(.*\\)\$'`
+    if expr "\$link" : '/.*' > /dev/null; then
+        PRG="\$link"
+    else
+        PRG=`dirname "\$PRG"`"/\$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"\$PRG\"`/${appHomeRelativePath}" >/dev/null
+APP_HOME="`pwd -P`"
+cd "\$SAVED" >/dev/null
+
+APP_NAME="${applicationName}"
+APP_BASE_NAME=`basename "\$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and ${optsEnvironmentVar} to pass JVM options to this script.
+DEFAULT_JVM_OPTS=${defaultJvmOpts}
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "\$*"
+}
+
+die () {
+    echo
+    echo "\$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MSYS* | MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$classpath
+<% if ( mainClassName.startsWith('--module ') ) { %>MODULE_PATH=$modulePath<% } %>
+
+# Determine the Java command to use to start the JVM.
+if [ -n "\$JAVA_HOME" ] ; then
+    if [ -x "\$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="\$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="\$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "\$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: \$JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "\$cygwin" = "false" -a "\$darwin" = "false" -a "\$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ \$? -eq 0 ] ; then
+        if [ "\$MAX_FD" = "maximum" -o "\$MAX_FD" = "max" ] ; then
+            MAX_FD="\$MAX_FD_LIMIT"
+        fi
+        ulimit -n \$MAX_FD
+        if [ \$? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: \$MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: \$MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if \$darwin; then
+    GRADLE_OPTS="\$GRADLE_OPTS \\"-Xdock:name=\$APP_NAME\\" \\"-Xdock:icon=\$APP_HOME/media/gradle.icns\\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "\$cygwin" = "true" -o "\$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "\$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "\$CLASSPATH"`
+<% if ( mainClassName.startsWith('--module ') ) { %>    MODULE_PATH=`cygpath --path --mixed "\$MODULE_PATH"`<% } %>
+    JAVACMD=`cygpath --unix "\$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in \$ROOTDIRSRAW ; do
+        ROOTDIRS="\$ROOTDIRS\$SEP\$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^(\$ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "\$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="\$OURCYGPATTERN|(\$GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "\$@" ; do
+        CHECK=`echo "\$arg"|egrep -c "\$OURCYGPATTERN" -`
+        CHECK2=`echo "\$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ \$CHECK -ne 0 ] && [ \$CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args\$i`=`cygpath --path --ignore --mixed "\$arg"`
+        else
+            eval `echo args\$i`="\"\$arg\""
+        fi
+        i=`expr \$i + 1`
+    done
+    case \$i in
+        0) set -- ;;
+        1) set -- "\$args0" ;;
+        2) set -- "\$args0" "\$args1" ;;
+        3) set -- "\$args0" "\$args1" "\$args2" ;;
+        4) set -- "\$args0" "\$args1" "\$args2" "\$args3" ;;
+        5) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" ;;
+        6) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" "\$args5" ;;
+        7) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" "\$args5" "\$args6" ;;
+        8) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" "\$args5" "\$args6" "\$args7" ;;
+        9) set -- "\$args0" "\$args1" "\$args2" "\$args3" "\$args4" "\$args5" "\$args6" "\$args7" "\$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\\\n "\$i" | sed "s/'/'\\\\\\\\''/g;1s/^/'/;\\\$s/\\\$/' \\\\\\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "\$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- \$DEFAULT_JVM_OPTS \$JAVA_OPTS \$${optsEnvironmentVar} <% if ( appNameSystemProperty ) { %>"\"-D${appNameSystemProperty}=\$APP_BASE_NAME\"" <% } %>-classpath "\"\$CLASSPATH\"" <% if ( mainClassName.startsWith('--module ') ) { %>--module-path "\"\$MODULE_PATH\"" <% } %>${mainClassName} "\$APP_ARGS"
+
+unset BESU_USING_JEMALLOC
+if [ "\$darwin" = "false" -a "\$msys" = "false" ]; then
+  # check if jemalloc is available
+  TEST_JEMALLOC=\$(LD_PRELOAD=libjemalloc.so sh -c true 2>&1)
+
+  # if jemalloc is available the output is empty, otherwise the output has an error line
+  if [ -z "\$TEST_JEMALLOC" ]; then
+    export LD_PRELOAD=libjemalloc.so
+    export BESU_USING_JEMALLOC=true
+  else
+    # jemalloc not available, as fallback limit malloc to 2 arenas
+    export MALLOC_ARENA_MAX=2
+  fi
+fi
+
+exec "\$JAVACMD" "\$@"
diff --git a/besu/src/main/scripts/windowsStartScript.txt b/besu/src/main/scripts/windowsStartScript.txt
new file mode 100644
index 00000000000..747fe6b0e6d
--- /dev/null
+++ b/besu/src/main/scripts/windowsStartScript.txt
@@ -0,0 +1,90 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  ${applicationName} startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.\
+
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%${appHomeRelativePath}
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and ${optsEnvironmentVar} to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=${defaultJvmOpts}
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=$classpath
+<% if ( mainClassName.startsWith('--module ') ) { %>set MODULE_PATH=$modulePath<% } %>
+
+@rem Execute ${applicationName}
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %${optsEnvironmentVar}% <% if ( appNameSystemProperty ) { %>"-D${appNameSystemProperty}=%APP_BASE_NAME%"<% } %> -classpath "%CLASSPATH%" <% if ( mainClassName.startsWith('--module ') ) { %>--module-path "%MODULE_PATH%" <% } %>${mainClassName} %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable ${exitEnvironmentVar} if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%${exitEnvironmentVar}%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/besu/src/test/java/org/hyperledger/besu/BesuInfoTest.java b/besu/src/test/java/org/hyperledger/besu/BesuInfoTest.java
index 8491702a644..5a1cec440c1 100644
--- a/besu/src/test/java/org/hyperledger/besu/BesuInfoTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/BesuInfoTest.java
@@ -18,8 +18,11 @@
 
 import java.util.Optional;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
+@ExtendWith(MockitoExtension.class)
 public final class BesuInfoTest {
 
   /**
diff --git a/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java b/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java
new file mode 100644
index 00000000000..94ed79a8bf4
--- /dev/null
+++ b/besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java
@@ -0,0 +1,229 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.cli.config.EthNetworkConfig;
+import org.hyperledger.besu.cli.config.NetworkName;
+import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.consensus.merge.MergeProtocolSchedule;
+import org.hyperledger.besu.consensus.merge.PostMergeContext;
+import org.hyperledger.besu.consensus.merge.TransitionProtocolSchedule;
+import org.hyperledger.besu.consensus.merge.TransitionUtils;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.chain.GenesisState;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.MilestoneStreamingProtocolSchedule;
+import org.hyperledger.besu.ethereum.forkid.ForkId;
+import org.hyperledger.besu.ethereum.forkid.ForkIdManager;
+import org.hyperledger.besu.ethereum.mainnet.DefaultProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import com.google.common.collect.Streams;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Test;
+import org.junit.experimental.runners.Enclosed;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Enclosed.class)
+public class ForkIdsNetworkConfigTest {
+
+  public static class NotParameterized {
+    @Test
+    public void testFromRaw() {
+      final ForkId forkId = new ForkId(Bytes.ofUnsignedInt(0xfe3366e7L), 1735371L);
+      final List<List<Bytes>> forkIdAsBytesList = List.of(forkId.getForkIdAsBytesList());
+      assertThat(ForkId.fromRawForkId(forkIdAsBytesList).get()).isEqualTo(forkId);
+    }
+  }
+
+  @RunWith(Parameterized.class)
+  public static class ParametrizedForkIdTest {
+
+    @Parameterized.Parameter public NetworkName chainName;
+
+    @Parameterized.Parameter(1)
+    public List<ForkId> expectedForkIds;
+
+    @Parameterized.Parameters(name = "{0}")
+    public static Collection<Object[]> parameters() {
+      return List.of(
+          new Object[] {
+            NetworkName.SEPOLIA,
+            List.of(
+                new ForkId(Bytes.ofUnsignedInt(0xfe3366e7L), 1735371L),
+                new ForkId(Bytes.ofUnsignedInt(0xb96cbd13L), 1677557088L),
+                new ForkId(Bytes.ofUnsignedInt(0xf7f9bc08L), 0L),
+                new ForkId(Bytes.ofUnsignedInt(0xf7f9bc08L), 0L))
+          },
+          new Object[] {
+            NetworkName.GOERLI,
+            List.of(
+                new ForkId(Bytes.ofUnsignedInt(0xa3f5ab08L), 1561651L),
+                new ForkId(Bytes.ofUnsignedInt(0xc25efa5cL), 4460644L),
+                new ForkId(Bytes.ofUnsignedInt(0x757a1c47L), 5062605L),
+                new ForkId(Bytes.ofUnsignedInt(0xb8c6299dL), 1678832736L),
+                new ForkId(Bytes.ofUnsignedInt(0xf9843abfL), 0L),
+                new ForkId(Bytes.ofUnsignedInt(0xf9843abfL), 0L))
+          },
+          new Object[] {
+            NetworkName.MAINNET,
+            List.of(
+                new ForkId(Bytes.ofUnsignedInt(0xfc64ec04L), 1150000L),
+                new ForkId(Bytes.ofUnsignedInt(0x97c2c34cL), 1920000L),
+                new ForkId(Bytes.ofUnsignedInt(0x91d1f948L), 2463000L),
+                new ForkId(Bytes.ofUnsignedInt(0x91d1f948L), 2463000L),
+                new ForkId(Bytes.ofUnsignedInt(0x91d1f948L), 2463000L),
+                new ForkId(Bytes.ofUnsignedInt(0x7a64da13L), 2675000L),
+                new ForkId(Bytes.ofUnsignedInt(0x3edd5b10L), 4370000L),
+                new ForkId(Bytes.ofUnsignedInt(0xa00bc324L), 7280000L),
+                new ForkId(Bytes.ofUnsignedInt(0x668db0afL), 9069000L),
+                new ForkId(Bytes.ofUnsignedInt(0x879d6e30L), 9200000L),
+                new ForkId(Bytes.ofUnsignedInt(0xe029e991L), 12244000L),
+                new ForkId(Bytes.ofUnsignedInt(0xeb440f6L), 12965000L),
+                new ForkId(Bytes.ofUnsignedInt(0xb715077dL), 13773000L),
+                new ForkId(Bytes.ofUnsignedInt(0x20c327fcL), 15050000L),
+                new ForkId(Bytes.ofUnsignedInt(0xf0afd0e3L), 1681338455L),
+                new ForkId(Bytes.ofUnsignedInt(0xdce96c2dL), 0L),
+                new ForkId(Bytes.ofUnsignedInt(0xdce96c2dL), 0L))
+          },
+          new Object[] {
+            NetworkName.MORDOR,
+            List.of(
+                new ForkId(Bytes.ofUnsignedInt(0x175782aaL), 301243L),
+                new ForkId(Bytes.ofUnsignedInt(0x604f6ee1L), 999983L),
+                new ForkId(Bytes.ofUnsignedInt(0xf42f5539L), 2520000L),
+                new ForkId(Bytes.ofUnsignedInt(0x66b5c286L), 3985893),
+                new ForkId(Bytes.ofUnsignedInt(0x92b323e0L), 5520000L),
+                new ForkId(Bytes.ofUnsignedInt(0x8c9b1797L), 0L),
+                new ForkId(Bytes.ofUnsignedInt(0x8c9b1797L), 0L))
+          },
+          new Object[] {
+            NetworkName.KOTTI,
+            List.of(
+                new ForkId(Bytes.ofUnsignedInt(0x550152eL), 716617L),
+                new ForkId(Bytes.ofUnsignedInt(0xa3270822L), 1705549L),
+                new ForkId(Bytes.ofUnsignedInt(0x8f3698e0L), 2200013L),
+                new ForkId(Bytes.ofUnsignedInt(0x6f402821L), 4368634),
+                new ForkId(Bytes.ofUnsignedInt(0xf03e54e7L), 5578000L),
+                new ForkId(Bytes.ofUnsignedInt(0xc5459816L), 0L),
+                new ForkId(Bytes.ofUnsignedInt(0xc5459816L), 0L))
+          },
+          new Object[] {
+            NetworkName.CLASSIC,
+            List.of(
+                new ForkId(Bytes.ofUnsignedInt(0xfc64ec04L), 1150000L),
+                new ForkId(Bytes.ofUnsignedInt(0x97c2c34cL), 2500000L),
+                new ForkId(Bytes.ofUnsignedInt(0x97c2c34cL), 2500000L),
+                new ForkId(Bytes.ofUnsignedInt(0x97c2c34cL), 2500000L),
+                new ForkId(Bytes.ofUnsignedInt(0xdb06803fL), 3000000L),
+                new ForkId(Bytes.ofUnsignedInt(0xaff4bed4L), 5000000L),
+                new ForkId(Bytes.ofUnsignedInt(0xf79a63c0L), 5900000L),
+                new ForkId(Bytes.ofUnsignedInt(0x744899d6L), 8772000L),
+                new ForkId(Bytes.ofUnsignedInt(0x518b59c6L), 9573000L),
+                new ForkId(Bytes.ofUnsignedInt(0x7ba22882L), 10500839L),
+                new ForkId(Bytes.ofUnsignedInt(0x9007bfccL), 11700000L),
+                new ForkId(Bytes.ofUnsignedInt(0xdb63a1caL), 13189133),
+                new ForkId(Bytes.ofUnsignedInt(0x0f6bf187L), 14525000L),
+                new ForkId(Bytes.ofUnsignedInt(0x7fd1bb25L), 0L),
+                new ForkId(Bytes.ofUnsignedInt(0x7fd1bb25L), 0L))
+          });
+    }
+
+    @Test
+    public void testForkId() {
+      final GenesisConfigFile genesisConfigFile =
+          GenesisConfigFile.fromConfig(EthNetworkConfig.jsonConfig(chainName));
+      final MilestoneStreamingTransitionProtocolSchedule schedule =
+          createSchedule(genesisConfigFile);
+      final GenesisState genesisState = GenesisState.fromConfig(genesisConfigFile, schedule);
+      final Blockchain mockBlockchain = mock(Blockchain.class);
+      final BlockHeader mockBlockHeader = mock(BlockHeader.class);
+
+      when(mockBlockchain.getGenesisBlock()).thenReturn(genesisState.getBlock());
+
+      final AtomicLong blockNumber = new AtomicLong();
+      when(mockBlockchain.getChainHeadHeader()).thenReturn(mockBlockHeader);
+      when(mockBlockHeader.getNumber()).thenAnswer(o -> blockNumber.get());
+      when(mockBlockHeader.getTimestamp()).thenAnswer(o -> blockNumber.get());
+
+      final ForkIdManager forkIdManager =
+          new ForkIdManager(
+              mockBlockchain,
+              genesisConfigFile.getForkBlockNumbers(),
+              genesisConfigFile.getForkTimestamps(),
+              false);
+
+      final List<ForkId> actualForkIds =
+          Streams.concat(schedule.streamMilestoneBlocks(), Stream.of(Long.MAX_VALUE))
+              .map(
+                  block -> {
+                    blockNumber.set(block);
+                    return forkIdManager.getForkIdForChainHead();
+                  })
+              .collect(Collectors.toList());
+
+      assertThat(actualForkIds).containsExactlyElementsOf(expectedForkIds);
+    }
+
+    private static MilestoneStreamingTransitionProtocolSchedule createSchedule(
+        final GenesisConfigFile genesisConfigFile) {
+      final GenesisConfigOptions configOptions = genesisConfigFile.getConfigOptions();
+      MilestoneStreamingProtocolSchedule preMergeProtocolSchedule =
+          new MilestoneStreamingProtocolSchedule(
+              (DefaultProtocolSchedule) MainnetProtocolSchedule.fromConfig(configOptions));
+      MilestoneStreamingProtocolSchedule postMergeProtocolSchedule =
+          new MilestoneStreamingProtocolSchedule(
+              (DefaultProtocolSchedule) MergeProtocolSchedule.create(configOptions, false));
+      final MilestoneStreamingTransitionProtocolSchedule schedule =
+          new MilestoneStreamingTransitionProtocolSchedule(
+              preMergeProtocolSchedule, postMergeProtocolSchedule);
+      return schedule;
+    }
+
+    public static class MilestoneStreamingTransitionProtocolSchedule
+        extends TransitionProtocolSchedule {
+
+      private final TransitionUtils<MilestoneStreamingProtocolSchedule> transitionUtils;
+
+      public MilestoneStreamingTransitionProtocolSchedule(
+          final MilestoneStreamingProtocolSchedule preMergeProtocolSchedule,
+          final MilestoneStreamingProtocolSchedule postMergeProtocolSchedule) {
+        super(preMergeProtocolSchedule, postMergeProtocolSchedule, PostMergeContext.get());
+        transitionUtils =
+            new TransitionUtils<>(
+                preMergeProtocolSchedule, postMergeProtocolSchedule, PostMergeContext.get());
+      }
+
+      public Stream<Long> streamMilestoneBlocks() {
+        return transitionUtils.dispatchFunctionAccordingToMergeState(
+            MilestoneStreamingProtocolSchedule::streamMilestoneBlocks);
+      }
+    }
+  }
+}
diff --git a/besu/src/test/java/org/hyperledger/besu/PrivacyReorgTest.java b/besu/src/test/java/org/hyperledger/besu/PrivacyReorgTest.java
index e8ea03ee12f..6a161f272d3 100644
--- a/besu/src/test/java/org/hyperledger/besu/PrivacyReorgTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/PrivacyReorgTest.java
@@ -15,6 +15,7 @@
 package org.hyperledger.besu;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.DEFAULT_PRIVACY;
 import static org.hyperledger.besu.ethereum.privacy.PrivateStateRootResolver.EMPTY_ROOT_HASH;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
@@ -22,85 +23,93 @@
 
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.controller.BesuController;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.enclave.Enclave;
 import org.hyperledger.besu.enclave.EnclaveFactory;
-import org.hyperledger.besu.enclave.types.PrivacyGroup;
-import org.hyperledger.besu.enclave.types.SendResponse;
+import org.hyperledger.besu.enclave.types.ReceiveResponse;
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.blockcreation.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.chain.DefaultBlockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
 import org.hyperledger.besu.ethereum.core.InMemoryPrivacyStorageProvider;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
-import org.hyperledger.besu.ethereum.core.LogsBloomFilter;
-import org.hyperledger.besu.ethereum.core.MiningParametersTestBuilder;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
 import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
-import org.hyperledger.besu.ethereum.privacy.DefaultPrivacyController;
+import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
 import org.hyperledger.besu.ethereum.privacy.PrivateStateRootResolver;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
-import org.hyperledger.besu.ethereum.privacy.Restriction;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivacyGroupHeadBlockMap;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivacyStorageProvider;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateStateStorage;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.data.Restriction;
 import org.hyperledger.besu.plugin.data.TransactionType;
 import org.hyperledger.besu.testutil.TestClock;
-import org.hyperledger.orion.testutil.OrionKeyConfiguration;
-import org.hyperledger.orion.testutil.OrionTestHarness;
-import org.hyperledger.orion.testutil.OrionTestHarnessFactory;
 
 import java.io.IOException;
 import java.math.BigInteger;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Collections;
-import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
+import java.util.function.Supplier;
 
-import io.vertx.core.Vertx;
+import com.google.common.base.Suppliers;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 @SuppressWarnings("rawtypes")
 public class PrivacyReorgTest {
-  @Rule public final TemporaryFolder folder = new TemporaryFolder();
 
-  private static final SECP256K1.KeyPair KEY_PAIR =
-      SECP256K1.KeyPair.create(
-          SECP256K1.PrivateKey.create(
-              new BigInteger(
-                  "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63", 16)));
+  @TempDir private static Path folder;
+
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+
+  private static final KeyPair KEY_PAIR =
+      SIGNATURE_ALGORITHM
+          .get()
+          .createKeyPair(
+              SIGNATURE_ALGORITHM
+                  .get()
+                  .createPrivateKey(
+                      new BigInteger(
+                          "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63", 16)));
   private static final Bytes ENCLAVE_PUBLIC_KEY =
       Bytes.fromBase64String("A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=");
 
   private static final String FIRST_BLOCK_WITH_NO_TRANSACTIONS_STATE_ROOT =
-      "0x1bdf13f6d14c7322d6e695498aab258949e55574bef7eac366eb777f43d7dd2b";
+      "0xb0784ff11dffceac824188583f20f3b8bb4ca275e033b3b1c0e280915743be7f";
   private static final String FIRST_BLOCK_WITH_SINGLE_TRANSACTION_STATE_ROOT =
-      "0x16979b290f429e06d86a43584c7d8689d4292ade9a602e5c78e2867c6ebd904e";
+      "0xe33629724501c0bc271a2b6858da64d3e92048d7e0cd019c5646770330694ff4";
   private static final String BLOCK_WITH_SINGLE_TRANSACTION_RECEIPTS_ROOT =
       "0xc8267b3f9ed36df3ff8adb51a6d030716f23eeb50270e7fce8d9822ffa7f0461";
-  private static final String STATE_ROOT_AFTER_TRANSACTION_APPENDED_TO_EMTPY_STATE =
+  private static final String STATE_ROOT_AFTER_TRANSACTION_APPENDED_TO_EMPTY_STATE =
       "0x2121b68f1333e93bae8cd717a3ca68c9d7e7003f6b288c36dfc59b0f87be9590";
   private static final Bytes32 PRIVACY_GROUP_BYTES32 =
       Bytes32.fromHexString("0xf250d523ae9164722b06ca25cfa2a7f3c45df96b09e215236f886c876f715bfa");
+  private static final Bytes32 PRIVACY_TRANSACTION_PAYLOAD =
+      Bytes32.fromHexString("0xa250d523ae9164722b06ca25cfa2a7f3c45df96b09e215236f886c876f715bfa");
 
   // EventEmitter contract binary
   private static final Bytes MOCK_PAYLOAD =
@@ -108,7 +117,7 @@ public class PrivacyReorgTest {
           "0x608060405234801561001057600080fd5b5060008054600160a060020a03191633179055610199806100326000396000f3fe6080604052600436106100565763ffffffff7c01000000000000000000000000000000000000000000000000000000006000350416633fa4f245811461005b5780636057361d1461008257806367e404ce146100ae575b600080fd5b34801561006757600080fd5b506100706100ec565b60408051918252519081900360200190f35b34801561008e57600080fd5b506100ac600480360360208110156100a557600080fd5b50356100f2565b005b3480156100ba57600080fd5b506100c3610151565b6040805173ffffffffffffffffffffffffffffffffffffffff9092168252519081900360200190f35b60025490565b604080513381526020810183905281517fc9db20adedc6cf2b5d25252b101ab03e124902a73fcb12b753f3d1aaa2d8f9f5929181900390910190a16002556001805473ffffffffffffffffffffffffffffffffffffffff191633179055565b60015473ffffffffffffffffffffffffffffffffffffffff169056fea165627a7a72305820c7f729cb24e05c221f5aa913700793994656f233fe2ce3b9fd9a505ea17e8d8a0029");
   private static final PrivateTransaction PRIVATE_TRANSACTION =
       PrivateTransaction.builder()
-          .chainId(BigInteger.valueOf(2018))
+          .chainId(BigInteger.valueOf(1337))
           .gasLimit(1000)
           .gasPrice(Wei.ZERO)
           .nonce(0)
@@ -122,54 +131,76 @@ public class PrivacyReorgTest {
 
   private final BlockDataGenerator gen = new BlockDataGenerator();
   private BesuController besuController;
-  private OrionTestHarness enclave;
   private PrivateStateRootResolver privateStateRootResolver;
   private PrivacyParameters privacyParameters;
-  private DefaultPrivacyController privacyController;
+  private Enclave mockEnclave;
+  private Transaction privacyMarkerTransaction;
 
-  @Before
+  @BeforeEach
   public void setUp() throws IOException {
-    // Start Enclave
-    enclave =
-        OrionTestHarnessFactory.create(
-            folder.newFolder().toPath(),
-            new OrionKeyConfiguration("enclavePublicKey", "enclavePrivateKey"));
-    enclave.start();
-
-    // Create Storage
-    final Path dataDir = folder.newFolder().toPath();
+    mockEnclave = mock(Enclave.class);
+    final BytesValueRLPOutput rlpOutput = new BytesValueRLPOutput();
+    PRIVATE_TRANSACTION.writeTo(rlpOutput);
+
+    when(mockEnclave.receive(any()))
+        .thenReturn(
+            new ReceiveResponse(
+                rlpOutput.encoded().toBase64String().getBytes(StandardCharsets.UTF_8),
+                PRIVACY_GROUP_BYTES32.toBase64String(),
+                ENCLAVE_PUBLIC_KEY.toBase64String()));
+
+    privacyMarkerTransaction =
+        Transaction.builder()
+            .type(TransactionType.FRONTIER)
+            .chainId(BigInteger.valueOf(1337))
+            .gasLimit(60000)
+            .gasPrice(Wei.of(1000))
+            .nonce(0)
+            .payload(PRIVACY_TRANSACTION_PAYLOAD)
+            .to(DEFAULT_PRIVACY)
+            .value(Wei.ZERO)
+            .signAndBuild(KEY_PAIR);
 
     // Configure Privacy
+    EnclaveFactory enclaveFactory = mock(EnclaveFactory.class);
+    when(enclaveFactory.createVertxEnclave(any())).thenReturn(mockEnclave);
+
     privacyParameters =
         new PrivacyParameters.Builder()
             .setEnabled(true)
             .setStorageProvider(createKeyValueStorageProvider())
-            .setEnclaveUrl(enclave.clientUrl())
-            .setEnclaveFactory(new EnclaveFactory(Vertx.vertx()))
+            .setEnclaveUrl(URI.create("http//1.1.1.1:1234"))
+            .setEnclaveFactory(enclaveFactory)
             .build();
-    privacyParameters.setEnclavePublicKey(ENCLAVE_PUBLIC_KEY.toBase64String());
-    privacyController = mock(DefaultPrivacyController.class);
-    when(privacyController.findOffChainPrivacyGroupByGroupId(any(), any()))
-        .thenReturn(Optional.of(new PrivacyGroup()));
+
+    privacyParameters.setPrivacyUserId(ENCLAVE_PUBLIC_KEY.toBase64String());
 
     privateStateRootResolver =
         new PrivateStateRootResolver(privacyParameters.getPrivateStateStorage());
 
     besuController =
         new BesuController.Builder()
-            .fromGenesisConfig(GenesisConfigFile.development())
+            .fromGenesisConfig(
+                GenesisConfigFile.genesisFileFromResources("/privacy_reorg_genesis.json"),
+                SyncMode.FULL)
             .synchronizerConfiguration(SynchronizerConfiguration.builder().build())
             .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
-            .storageProvider(new InMemoryStorageProvider())
+            .storageProvider(new InMemoryKeyValueStorageProvider())
             .networkId(BigInteger.ONE)
-            .miningParameters(new MiningParametersTestBuilder().enabled(false).build())
+            .miningParameters(
+                new MiningParameters.Builder()
+                    .minTransactionGasPrice(Wei.of(1000))
+                    .miningEnabled(false)
+                    .build())
             .nodeKey(NodeKeyUtils.generate())
             .metricsSystem(new NoOpMetricsSystem())
-            .dataDirectory(dataDir)
+            .dataDirectory(folder)
             .clock(TestClock.fixed())
             .privacyParameters(privacyParameters)
             .transactionPoolConfiguration(TransactionPoolConfiguration.DEFAULT)
             .gasLimitCalculator(GasLimitCalculator.constant())
+            .evmConfiguration(EvmConfiguration.DEFAULT)
+            .networkConfiguration(NetworkingConfiguration.create())
             .build();
   }
 
@@ -180,8 +211,6 @@ public void privacyGroupHeadIsTracked() {
     final DefaultBlockchain blockchain = (DefaultBlockchain) protocolContext.getBlockchain();
     final PrivateStateStorage privateStateStorage = privacyParameters.getPrivateStateStorage();
 
-    final Transaction privacyMarkerTransaction =
-        buildMarkerTransaction(getEnclaveKey(enclave.clientUrl()));
     final Block firstBlock =
         gen.block(
             getBlockOptionsWithTransaction(
@@ -203,7 +232,7 @@ public void privacyGroupHeadIsTracked() {
         .contains(expected);
 
     final String secondBlockStateRoot =
-        "0xd86a520e49caf215e7e4028262924db50540a5b26e415ab7c944e46a0c01d704";
+        "0x57a19f52a9ff4405428b3e605e136662d5c1b6be6f84f98f3b8c42ddac5139c2";
     final Block secondBlock =
         gen.block(getBlockOptionsNoTransaction(firstBlock, secondBlockStateRoot));
 
@@ -225,14 +254,14 @@ public void reorgToChainAtEqualHeight() {
         gen.block(
             getBlockOptionsWithTransaction(
                 blockchain.getGenesisBlock(),
-                buildMarkerTransaction(getEnclaveKey(enclave.clientUrl())),
+                privacyMarkerTransaction,
                 FIRST_BLOCK_WITH_SINGLE_TRANSACTION_STATE_ROOT));
 
     appendBlock(besuController, blockchain, protocolContext, firstBlock);
 
     // Check that the private state root is not the empty state
     assertPrivateStateRoot(
-        privateStateRootResolver, blockchain, STATE_ROOT_AFTER_TRANSACTION_APPENDED_TO_EMTPY_STATE);
+        privateStateRootResolver, blockchain, STATE_ROOT_AFTER_TRANSACTION_APPENDED_TO_EMPTY_STATE);
 
     // Create parallel fork of length 1 which removes privacy marker transaction
     final Block forkBlock =
@@ -260,13 +289,11 @@ public void reorgToShorterChain() {
         gen.block(getBlockOptionsNoTransaction(blockchain.getGenesisBlock(), firstBlockStateRoot));
 
     final String secondBlockStateRoot =
-        "0x35c315ee7d272e5b612d454ee87c948657310ab33208b57122f8d0525e91f35e";
+        "0xb3d70bce4428fb9b4549240b2130c4eea12c4ea36ae13108ed21289366a8d65f";
     final Block secondBlock =
         gen.block(
             getBlockOptionsWithTransaction(
-                firstBlock,
-                buildMarkerTransaction(getEnclaveKey(enclave.clientUrl())),
-                secondBlockStateRoot));
+                firstBlock, privacyMarkerTransaction, secondBlockStateRoot));
 
     appendBlock(besuController, blockchain, protocolContext, firstBlock);
     appendBlock(besuController, blockchain, protocolContext, secondBlock);
@@ -275,7 +302,7 @@ public void reorgToShorterChain() {
 
     // Check that the private state root is not the empty state
     assertPrivateStateRoot(
-        privateStateRootResolver, blockchain, STATE_ROOT_AFTER_TRANSACTION_APPENDED_TO_EMTPY_STATE);
+        privateStateRootResolver, blockchain, STATE_ROOT_AFTER_TRANSACTION_APPENDED_TO_EMPTY_STATE);
 
     // Create parallel fork of length 1 which removes privacy marker transaction
     final Difficulty remainingDifficultyToOutpace =
@@ -287,7 +314,7 @@ public void reorgToShorterChain() {
             .plus(blockchain.getBlockByNumber(2).get().getHeader().getDifficulty());
 
     final String forkBlockStateRoot =
-        "0x4a33bdf9d16e6dd4f4c67f1638971f663f132ebceac0c7c65c9a3f35172af4de";
+        "0x5c0adcdde38d38b4365c238c4ba05bf9ebfdf506f749b884b67003f375e43e4b";
     final Block forkBlock =
         gen.block(
             getBlockOptionsNoTransactionWithDifficulty(
@@ -313,7 +340,7 @@ public void reorgToLongerChain() {
         gen.block(
             getBlockOptionsWithTransaction(
                 blockchain.getGenesisBlock(),
-                buildMarkerTransaction(getEnclaveKey(enclave.clientUrl())),
+                privacyMarkerTransaction,
                 FIRST_BLOCK_WITH_SINGLE_TRANSACTION_STATE_ROOT));
 
     appendBlock(besuController, blockchain, protocolContext, firstBlock);
@@ -322,7 +349,7 @@ public void reorgToLongerChain() {
 
     // Check that the private state root is not the empty state
     assertPrivateStateRoot(
-        privateStateRootResolver, blockchain, STATE_ROOT_AFTER_TRANSACTION_APPENDED_TO_EMTPY_STATE);
+        privateStateRootResolver, blockchain, STATE_ROOT_AFTER_TRANSACTION_APPENDED_TO_EMPTY_STATE);
 
     // Create parallel fork of length 1 which removes privacy marker transaction
     final Block forkBlock =
@@ -334,10 +361,10 @@ public void reorgToLongerChain() {
 
     // Check that the private state root did not change
     assertPrivateStateRoot(
-        privateStateRootResolver, blockchain, STATE_ROOT_AFTER_TRANSACTION_APPENDED_TO_EMTPY_STATE);
+        privateStateRootResolver, blockchain, STATE_ROOT_AFTER_TRANSACTION_APPENDED_TO_EMPTY_STATE);
 
     final String secondForkBlockStateRoot =
-        "0xd35eea814b8b5a0b12e690ab320785f3a33d9685bbf6875637c40a64203915da";
+        "0x76b8747d05fabcc87b2cfba519da0b1359b29fe7553bfd4837746edf31fb95fc";
     final Block secondForkBlock =
         gen.block(
             getBlockOptionsNoTransactionWithDifficulty(
@@ -355,12 +382,12 @@ public void reorgToLongerChain() {
 
     // Add another private transaction
     final String thirdForkBlockStateRoot =
-        "0xe22344ade05260177b79dcc6c4fed8f87ab95a506c2a6147631ac6547cf44846";
+        "0xcae9fa05107c1501c1962239f729d2f34186414abbaeb0dd1a3e0a6c899f79a3";
     final Block thirdForkBlock =
         gen.block(
             getBlockOptionsWithTransactionAndDifficulty(
                 secondForkBlock,
-                buildMarkerTransaction(getEnclaveKey(enclave.clientUrl())),
+                privacyMarkerTransaction,
                 secondForkBlock.getHeader().getDifficulty().plus(10L),
                 thirdForkBlockStateRoot));
 
@@ -368,7 +395,7 @@ public void reorgToLongerChain() {
 
     // Check that the private state did change after reorg
     assertPrivateStateRoot(
-        privateStateRootResolver, blockchain, STATE_ROOT_AFTER_TRANSACTION_APPENDED_TO_EMTPY_STATE);
+        privateStateRootResolver, blockchain, STATE_ROOT_AFTER_TRANSACTION_APPENDED_TO_EMPTY_STATE);
   }
 
   @SuppressWarnings("unchecked")
@@ -379,7 +406,7 @@ private void appendBlock(
       final Block block) {
     besuController
         .getProtocolSchedule()
-        .getByBlockNumber(blockchain.getChainHeadBlockNumber())
+        .getByBlockHeader(blockchain.getChainHeadHeader())
         .getBlockImporter()
         .importBlock(protocolContext, block, HeaderValidationMode.NONE);
   }
@@ -388,62 +415,6 @@ private PrivacyStorageProvider createKeyValueStorageProvider() {
     return new InMemoryPrivacyStorageProvider();
   }
 
-  private Bytes getEnclaveKey(final URI enclaveURI) {
-    final Enclave enclave = new EnclaveFactory(Vertx.vertx()).createVertxEnclave(enclaveURI);
-    final SendResponse sendResponse =
-        sendRequest(enclave, PRIVATE_TRANSACTION, ENCLAVE_PUBLIC_KEY.toBase64String());
-    final Bytes payload = Bytes.fromBase64String(sendResponse.getKey());
-
-    // If the key has 0 bytes generate a new key.
-    // This is to keep the gasUsed constant allowing
-    // hard-coded receipt roots in the block headers
-    for (int i = 0; i < payload.size(); i++) {
-      if (payload.get(i) == 0) {
-        return getEnclaveKey(enclaveURI);
-      }
-    }
-
-    return payload;
-  }
-
-  private SendResponse sendRequest(
-      final Enclave enclave,
-      final PrivateTransaction privateTransaction,
-      final String enclavePublicKey) {
-    final BytesValueRLPOutput rlpOutput = new BytesValueRLPOutput();
-    privateTransaction.writeTo(rlpOutput);
-    final String payload = rlpOutput.encoded().toBase64String();
-
-    if (privateTransaction.getPrivacyGroupId().isPresent()) {
-      return enclave.send(
-          payload, enclavePublicKey, privateTransaction.getPrivacyGroupId().get().toBase64String());
-    } else {
-      final List<String> privateFor =
-          privateTransaction.getPrivateFor().get().stream()
-              .map(Bytes::toBase64String)
-              .collect(Collectors.toList());
-
-      if (privateFor.isEmpty()) {
-        privateFor.add(privateTransaction.getPrivateFrom().toBase64String());
-      }
-      return enclave.send(
-          payload, privateTransaction.getPrivateFrom().toBase64String(), privateFor);
-    }
-  }
-
-  private Transaction buildMarkerTransaction(final Bytes payload) {
-    return Transaction.builder()
-        .type(TransactionType.FRONTIER)
-        .chainId(BigInteger.valueOf(2018))
-        .gasLimit(60000)
-        .gasPrice(Wei.of(1000))
-        .nonce(0)
-        .payload(payload)
-        .to(Address.DEFAULT_PRIVACY)
-        .value(Wei.ZERO)
-        .signAndBuild(KEY_PAIR);
-  }
-
   private void assertPrivateStateRoot(
       final PrivateStateRootResolver privateStateRootResolver,
       final DefaultBlockchain blockchain,
@@ -515,6 +486,7 @@ private BlockDataGenerator.BlockOptions getBlockOptionsWithTransactionAndDifficu
   private BlockDataGenerator.BlockOptions getBlockOptions(
       final BlockDataGenerator.BlockOptions blockOptions, final Block parentBlock) {
     return blockOptions
+        .setBaseFee(Optional.empty())
         .setBlockNumber(parentBlock.getHeader().getNumber() + 1)
         .setParentHash(parentBlock.getHash())
         .hasOmmers(false)
diff --git a/besu/src/test/java/org/hyperledger/besu/PrivacyTest.java b/besu/src/test/java/org/hyperledger/besu/PrivacyTest.java
index be171239de3..bfdd71b3d2a 100644
--- a/besu/src/test/java/org/hyperledger/besu/PrivacyTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/PrivacyTest.java
@@ -15,24 +15,34 @@
 package org.hyperledger.besu;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.DEFAULT_PRIVACY;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY;
+import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_BACKGROUND_THREAD_COUNT;
+import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_CACHE_CAPACITY;
+import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_IS_HIGH_SPEC;
+import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_OPEN_FILES;
 
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.controller.BesuController;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.enclave.EnclaveFactory;
-import org.hyperledger.besu.ethereum.blockcreation.GasLimitCalculator;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
-import org.hyperledger.besu.ethereum.core.MiningParametersTestBuilder;
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
-import org.hyperledger.besu.ethereum.mainnet.PrecompiledContract;
+import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivacyStorageProvider;
 import org.hyperledger.besu.ethereum.privacy.storage.keyvalue.PrivacyKeyValueStorageProviderBuilder;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.evm.precompile.PrecompiledContract;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBKeyValuePrivacyStorageFactory;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBKeyValueStorageFactory;
@@ -45,26 +55,22 @@
 import java.math.BigInteger;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
 
 import io.vertx.core.Vertx;
-import org.junit.After;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class PrivacyTest {
 
-  private static final int MAX_OPEN_FILES = 1024;
-  private static final long CACHE_CAPACITY = 8388608;
-  private static final int MAX_BACKGROUND_COMPACTIONS = 4;
-  private static final int BACKGROUND_THREAD_COUNT = 4;
   private final Vertx vertx = Vertx.vertx();
 
-  @Rule public final TemporaryFolder folder = new TemporaryFolder();
+  @TempDir private static Path dataDir;
 
-  @After
+  @AfterEach
   public void cleanUp() {
     vertx.close();
   }
@@ -73,41 +79,39 @@ public void cleanUp() {
   public void defaultPrivacy() throws IOException, URISyntaxException {
     final BesuController besuController = setUpControllerWithPrivacyEnabled(false);
 
-    final PrecompiledContract precompiledContract =
-        getPrecompile(besuController, Address.DEFAULT_PRIVACY);
+    final PrecompiledContract precompiledContract = getPrecompile(besuController, DEFAULT_PRIVACY);
 
     assertThat(precompiledContract.getName()).isEqualTo("Privacy");
   }
 
   @Test
-  public void onchainEnabledPrivacy() throws IOException, URISyntaxException {
+  public void flexibleEnabledPrivacy() throws IOException, URISyntaxException {
     final BesuController besuController = setUpControllerWithPrivacyEnabled(true);
 
-    final PrecompiledContract onchainPrecompiledContract =
-        getPrecompile(besuController, Address.ONCHAIN_PRIVACY);
+    final PrecompiledContract flexiblePrecompiledContract =
+        getPrecompile(besuController, FLEXIBLE_PRIVACY);
 
-    assertThat(onchainPrecompiledContract.getName()).isEqualTo("OnChainPrivacy");
+    assertThat(flexiblePrecompiledContract.getName()).isEqualTo("FlexiblePrivacy");
   }
 
-  private BesuController setUpControllerWithPrivacyEnabled(final boolean onChainEnabled)
+  private BesuController setUpControllerWithPrivacyEnabled(final boolean flexibleEnabled)
       throws IOException, URISyntaxException {
-    final Path dataDir = folder.newFolder().toPath();
-    final Path dbDir = dataDir.resolve("database");
+    final Path dbDir = Files.createTempDirectory(dataDir, "database");
     final PrivacyParameters privacyParameters =
         new PrivacyParameters.Builder()
             .setEnabled(true)
             .setEnclaveUrl(new URI("http://127.0.0.1:8000"))
             .setStorageProvider(createKeyValueStorageProvider(dataDir, dbDir))
             .setEnclaveFactory(new EnclaveFactory(vertx))
-            .setOnchainPrivacyGroupsEnabled(onChainEnabled)
+            .setFlexiblePrivacyGroupsEnabled(flexibleEnabled)
             .build();
     return new BesuController.Builder()
-        .fromGenesisConfig(GenesisConfigFile.mainnet())
+        .fromGenesisConfig(GenesisConfigFile.mainnet(), SyncMode.FULL)
         .synchronizerConfiguration(SynchronizerConfiguration.builder().build())
         .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
-        .storageProvider(new InMemoryStorageProvider())
+        .storageProvider(new InMemoryKeyValueStorageProvider())
         .networkId(BigInteger.ONE)
-        .miningParameters(new MiningParametersTestBuilder().enabled(false).build())
+        .miningParameters(new MiningParameters.Builder().miningEnabled(false).build())
         .nodeKey(NodeKeyUtils.generate())
         .metricsSystem(new NoOpMetricsSystem())
         .dataDirectory(dataDir)
@@ -115,6 +119,8 @@ private BesuController setUpControllerWithPrivacyEnabled(final boolean onChainEn
         .privacyParameters(privacyParameters)
         .transactionPoolConfiguration(TransactionPoolConfiguration.DEFAULT)
         .gasLimitCalculator(GasLimitCalculator.constant())
+        .evmConfiguration(EvmConfiguration.DEFAULT)
+        .networkConfiguration(NetworkingConfiguration.create())
         .build();
   }
 
@@ -126,10 +132,10 @@ private PrivacyStorageProvider createKeyValueStorageProvider(
                 new RocksDBKeyValueStorageFactory(
                     () ->
                         new RocksDBFactoryConfiguration(
-                            MAX_OPEN_FILES,
-                            MAX_BACKGROUND_COMPACTIONS,
-                            BACKGROUND_THREAD_COUNT,
-                            CACHE_CAPACITY),
+                            DEFAULT_MAX_OPEN_FILES,
+                            DEFAULT_BACKGROUND_THREAD_COUNT,
+                            DEFAULT_CACHE_CAPACITY,
+                            DEFAULT_IS_HIGH_SPEC),
                     Arrays.asList(KeyValueSegmentIdentifier.values()),
                     RocksDBMetricsFactory.PRIVATE_ROCKS_DB_METRICS)))
         .withCommonConfiguration(new BesuConfigurationImpl(dataDir, dbDir))
@@ -141,8 +147,12 @@ private PrecompiledContract getPrecompile(
       final BesuController besuController, final Address defaultPrivacy) {
     return besuController
         .getProtocolSchedule()
-        .getByBlockNumber(1)
+        .getByBlockHeader(blockHeader(0))
         .getPrecompileContractRegistry()
-        .get(defaultPrivacy, Account.DEFAULT_VERSION);
+        .get(defaultPrivacy);
+  }
+
+  private BlockHeader blockHeader(final long number) {
+    return new BlockHeaderTestFixture().number(number).buildHeader();
   }
 }
diff --git a/besu/src/test/java/org/hyperledger/besu/RunnerBuilderTest.java b/besu/src/test/java/org/hyperledger/besu/RunnerBuilderTest.java
index 1352bb1c389..6db9f68efad 100644
--- a/besu/src/test/java/org/hyperledger/besu/RunnerBuilderTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/RunnerBuilderTest.java
@@ -15,97 +15,140 @@
 package org.hyperledger.besu;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier.VARIABLES;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.cli.config.EthNetworkConfig;
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.config.MergeConfigOptions;
 import org.hyperledger.besu.consensus.common.bft.BftEventQueue;
-import org.hyperledger.besu.consensus.ibft.network.PeerConnectionTracker;
-import org.hyperledger.besu.consensus.ibft.protocol.IbftProtocolManager;
+import org.hyperledger.besu.consensus.common.bft.network.PeerConnectionTracker;
+import org.hyperledger.besu.consensus.common.bft.protocol.BftProtocolManager;
 import org.hyperledger.besu.consensus.ibft.protocol.IbftSubProtocol;
+import org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator;
 import org.hyperledger.besu.controller.BesuController;
-import org.hyperledger.besu.crypto.NodeKey;
 import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.cryptoservices.KeyPairSecurityModule;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.graphql.GraphQLConfiguration;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
+import org.hyperledger.besu.ethereum.api.jsonrpc.ipc.JsonRpcIpcConfiguration;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
+import org.hyperledger.besu.ethereum.chain.DefaultBlockchain;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
 import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
 import org.hyperledger.besu.ethereum.p2p.config.SubProtocolConfiguration;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
+import org.hyperledger.besu.ethereum.storage.StorageProvider;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 import org.hyperledger.besu.metrics.ObservableMetricsSystem;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
+import org.hyperledger.besu.nat.NatMethod;
+import org.hyperledger.besu.plugin.data.EnodeURL;
+import org.hyperledger.besu.services.BesuPluginContextImpl;
+import org.hyperledger.besu.services.PermissioningServiceImpl;
+import org.hyperledger.besu.services.RpcEndpointServiceImpl;
 
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
 import java.util.Collections;
 
 import io.vertx.core.Vertx;
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
+import org.apache.tuweni.units.bigints.UInt64;
+import org.ethereum.beacon.discovery.schema.NodeRecord;
+import org.ethereum.beacon.discovery.schema.NodeRecordFactory;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public final class RunnerBuilderTest {
 
-  @Rule public TemporaryFolder dataDir = new TemporaryFolder();
+  @TempDir private Path dataDir;
 
   @Mock BesuController besuController;
+  @Mock ProtocolSchedule protocolSchedule;
+  @Mock ProtocolContext protocolContext;
+  @Mock WorldStateArchive worldstateArchive;
   @Mock Vertx vertx;
+  private NodeKey nodeKey;
 
-  @Before
+  @BeforeEach
   public void setup() {
     final SubProtocolConfiguration subProtocolConfiguration = mock(SubProtocolConfiguration.class);
     final EthProtocolManager ethProtocolManager = mock(EthProtocolManager.class);
     final EthContext ethContext = mock(EthContext.class);
-    final ProtocolContext protocolContext = mock(ProtocolContext.class);
-    final NodeKey nodeKey = mock(NodeKey.class);
-    final SECP256K1.PublicKey publicKey = mock(SECP256K1.PublicKey.class);
+    nodeKey = new NodeKey(new KeyPairSecurityModule(new SECP256K1().generateKeyPair()));
 
     when(subProtocolConfiguration.getProtocolManagers())
         .thenReturn(
             Collections.singletonList(
-                new IbftProtocolManager(
-                    mock(BftEventQueue.class), mock(PeerConnectionTracker.class))));
+                new BftProtocolManager(
+                    mock(BftEventQueue.class),
+                    mock(PeerConnectionTracker.class),
+                    IbftSubProtocol.IBFV1,
+                    IbftSubProtocol.get().getName())));
     when(ethContext.getScheduler()).thenReturn(mock(EthScheduler.class));
     when(ethProtocolManager.ethContext()).thenReturn(ethContext);
     when(subProtocolConfiguration.getSubProtocols())
         .thenReturn(Collections.singletonList(new IbftSubProtocol()));
-    when(protocolContext.getBlockchain()).thenReturn(mock(MutableBlockchain.class));
-    when(publicKey.getEncodedBytes()).thenReturn(Bytes.of(new byte[64]));
-    when(nodeKey.getPublicKey()).thenReturn(publicKey);
 
+    when(protocolContext.getWorldStateArchive()).thenReturn(worldstateArchive);
     when(besuController.getProtocolManager()).thenReturn(ethProtocolManager);
     when(besuController.getSubProtocolConfiguration()).thenReturn(subProtocolConfiguration);
     when(besuController.getProtocolContext()).thenReturn(protocolContext);
+    when(besuController.getProtocolSchedule()).thenReturn(protocolSchedule);
     when(besuController.getNodeKey()).thenReturn(nodeKey);
     when(besuController.getMiningParameters()).thenReturn(mock(MiningParameters.class));
     when(besuController.getPrivacyParameters()).thenReturn(mock(PrivacyParameters.class));
-    when(besuController.getTransactionPool()).thenReturn(mock(TransactionPool.class));
+    when(besuController.getTransactionPool())
+        .thenReturn(mock(TransactionPool.class, RETURNS_DEEP_STUBS));
     when(besuController.getSynchronizer()).thenReturn(mock(Synchronizer.class));
     when(besuController.getMiningCoordinator()).thenReturn(mock(MiningCoordinator.class));
+    when(besuController.getMiningCoordinator()).thenReturn(mock(MergeMiningCoordinator.class));
+    when(besuController.getEthPeers()).thenReturn(mock(EthPeers.class));
+    final GenesisConfigOptions genesisConfigOptions = mock(GenesisConfigOptions.class);
+    when(genesisConfigOptions.getForkBlockNumbers()).thenReturn(Collections.emptyList());
+    when(genesisConfigOptions.getForkBlockTimestamps()).thenReturn(Collections.emptyList());
+    when(besuController.getGenesisConfigOptions()).thenReturn(genesisConfigOptions);
   }
 
   @Test
   public void enodeUrlShouldHaveAdvertisedHostWhenDiscoveryDisabled() {
+    setupBlockchainAndBlock();
+
     final String p2pAdvertisedHost = "172.0.0.1";
-    final int p2pListenPort = 30301;
+    final int p2pListenPort = 30302;
 
     final Runner runner =
         new RunnerBuilder()
-            .discovery(true)
             .p2pListenInterface("0.0.0.0")
             .p2pListenPort(p2pListenPort)
             .p2pAdvertisedHost(p2pAdvertisedHost)
@@ -115,22 +158,255 @@ public void enodeUrlShouldHaveAdvertisedHostWhenDiscoveryDisabled() {
             .ethNetworkConfig(mock(EthNetworkConfig.class))
             .metricsSystem(mock(ObservableMetricsSystem.class))
             .jsonRpcConfiguration(mock(JsonRpcConfiguration.class))
+            .permissioningService(mock(PermissioningServiceImpl.class))
             .graphQLConfiguration(mock(GraphQLConfiguration.class))
             .webSocketConfiguration(mock(WebSocketConfiguration.class))
+            .jsonRpcIpcConfiguration(mock(JsonRpcIpcConfiguration.class))
             .metricsConfiguration(mock(MetricsConfiguration.class))
             .vertx(vertx)
-            .dataDir(dataDir.getRoot().toPath())
-            .storageProvider(mock(KeyValueStorageProvider.class))
+            .dataDir(dataDir.getRoot())
+            .storageProvider(mock(KeyValueStorageProvider.class, RETURNS_DEEP_STUBS))
+            .rpcEndpointService(new RpcEndpointServiceImpl())
             .build();
-    runner.start();
+    runner.startEthereumMainLoop();
 
-    final EnodeURL expectedEodeURL =
-        EnodeURL.builder()
+    final EnodeURL expectedEnodeURL =
+        EnodeURLImpl.builder()
             .ipAddress(p2pAdvertisedHost)
             .discoveryPort(0)
             .listeningPort(p2pListenPort)
-            .nodeId(new byte[64])
+            .nodeId(nodeKey.getPublicKey().getEncoded())
+            .build();
+    assertThat(runner.getLocalEnode().orElseThrow()).isEqualTo(expectedEnodeURL);
+  }
+
+  @Test
+  public void movingAcrossProtocolSpecsUpdatesNodeRecord() {
+    final BlockDataGenerator gen = new BlockDataGenerator();
+    final String p2pAdvertisedHost = "172.0.0.1";
+    final int p2pListenPort = 30301;
+    final StorageProvider storageProvider = new InMemoryKeyValueStorageProvider();
+    final Block genesisBlock = gen.genesisBlock();
+    final MutableBlockchain inMemoryBlockchain =
+        createInMemoryBlockchain(genesisBlock, new MainnetBlockHeaderFunctions());
+    when(protocolContext.getBlockchain()).thenReturn(inMemoryBlockchain);
+    final Runner runner =
+        new RunnerBuilder()
+            .discovery(true)
+            .p2pListenInterface("0.0.0.0")
+            .p2pListenPort(p2pListenPort)
+            .p2pAdvertisedHost(p2pAdvertisedHost)
+            .p2pEnabled(true)
+            .natMethod(NatMethod.NONE)
+            .besuController(besuController)
+            .ethNetworkConfig(mock(EthNetworkConfig.class))
+            .metricsSystem(mock(ObservableMetricsSystem.class))
+            .permissioningService(mock(PermissioningServiceImpl.class))
+            .jsonRpcConfiguration(mock(JsonRpcConfiguration.class))
+            .graphQLConfiguration(mock(GraphQLConfiguration.class))
+            .webSocketConfiguration(mock(WebSocketConfiguration.class))
+            .jsonRpcIpcConfiguration(mock(JsonRpcIpcConfiguration.class))
+            .metricsConfiguration(mock(MetricsConfiguration.class))
+            .vertx(Vertx.vertx())
+            .dataDir(dataDir.getRoot())
+            .storageProvider(storageProvider)
+            .rpcEndpointService(new RpcEndpointServiceImpl())
+            .build();
+    runner.startEthereumMainLoop();
+
+    when(protocolSchedule.isOnMilestoneBoundary(any(BlockHeader.class))).thenReturn(true);
+
+    for (int i = 0; i < 2; ++i) {
+      final Block block =
+          gen.block(
+              BlockDataGenerator.BlockOptions.create()
+                  .setBlockNumber(1 + i)
+                  .setParentHash(inMemoryBlockchain.getChainHeadHash()));
+      inMemoryBlockchain.appendBlock(block, gen.receipts(block));
+      assertThat(
+              storageProvider
+                  .getStorageBySegmentIdentifier(VARIABLES)
+                  .get("local-enr-seqno".getBytes(StandardCharsets.UTF_8))
+                  .map(Bytes::of)
+                  .map(NodeRecordFactory.DEFAULT::fromBytes)
+                  .map(NodeRecord::getSeq))
+          .contains(UInt64.valueOf(2 + i));
+    }
+  }
+
+  @Test
+  public void whenEngineApiAddedListensOnDefaultPort() {
+    setupBlockchainAndBlock();
+
+    final JsonRpcConfiguration jrpc = JsonRpcConfiguration.createDefault();
+    jrpc.setEnabled(true);
+    final JsonRpcConfiguration engine = JsonRpcConfiguration.createEngineDefault();
+    engine.setEnabled(true);
+    final EthNetworkConfig mockMainnet = mock(EthNetworkConfig.class);
+    when(mockMainnet.getNetworkId()).thenReturn(BigInteger.ONE);
+    MergeConfigOptions.setMergeEnabled(true);
+    when(besuController.getMiningCoordinator()).thenReturn(mock(MergeMiningCoordinator.class));
+
+    final Runner runner =
+        new RunnerBuilder()
+            .discovery(true)
+            .p2pListenInterface("0.0.0.0")
+            .p2pListenPort(30303)
+            .p2pAdvertisedHost("127.0.0.1")
+            .p2pEnabled(true)
+            .natMethod(NatMethod.NONE)
+            .besuController(besuController)
+            .ethNetworkConfig(mockMainnet)
+            .metricsSystem(mock(ObservableMetricsSystem.class))
+            .permissioningService(mock(PermissioningServiceImpl.class))
+            .jsonRpcConfiguration(jrpc)
+            .engineJsonRpcConfiguration(engine)
+            .graphQLConfiguration(mock(GraphQLConfiguration.class))
+            .webSocketConfiguration(mock(WebSocketConfiguration.class))
+            .jsonRpcIpcConfiguration(mock(JsonRpcIpcConfiguration.class))
+            .metricsConfiguration(mock(MetricsConfiguration.class))
+            .vertx(Vertx.vertx())
+            .dataDir(dataDir.getRoot())
+            .storageProvider(mock(KeyValueStorageProvider.class, RETURNS_DEEP_STUBS))
+            .rpcEndpointService(new RpcEndpointServiceImpl())
+            .besuPluginContext(mock(BesuPluginContextImpl.class))
+            .build();
+
+    assertThat(runner.getJsonRpcPort()).isPresent();
+    assertThat(runner.getEngineJsonRpcPort()).isPresent();
+  }
+
+  @Test
+  public void whenEngineApiAddedWebSocketReadyOnSamePort() {
+    setupBlockchainAndBlock();
+
+    final WebSocketConfiguration wsRpc = WebSocketConfiguration.createDefault();
+    wsRpc.setEnabled(true);
+    final EthNetworkConfig mockMainnet = mock(EthNetworkConfig.class);
+    when(mockMainnet.getNetworkId()).thenReturn(BigInteger.ONE);
+    MergeConfigOptions.setMergeEnabled(true);
+    when(besuController.getMiningCoordinator()).thenReturn(mock(MergeMiningCoordinator.class));
+    final JsonRpcConfiguration engineConf = JsonRpcConfiguration.createEngineDefault();
+    engineConf.setEnabled(true);
+
+    final Runner runner =
+        new RunnerBuilder()
+            .discovery(true)
+            .p2pListenInterface("0.0.0.0")
+            .p2pListenPort(30303)
+            .p2pAdvertisedHost("127.0.0.1")
+            .p2pEnabled(true)
+            .natMethod(NatMethod.NONE)
+            .besuController(besuController)
+            .ethNetworkConfig(mockMainnet)
+            .metricsSystem(mock(ObservableMetricsSystem.class))
+            .permissioningService(mock(PermissioningServiceImpl.class))
+            .jsonRpcConfiguration(JsonRpcConfiguration.createDefault())
+            .engineJsonRpcConfiguration(engineConf)
+            .webSocketConfiguration(wsRpc)
+            .jsonRpcIpcConfiguration(mock(JsonRpcIpcConfiguration.class))
+            .graphQLConfiguration(mock(GraphQLConfiguration.class))
+            .metricsConfiguration(mock(MetricsConfiguration.class))
+            .vertx(Vertx.vertx())
+            .dataDir(dataDir.getRoot())
+            .storageProvider(mock(KeyValueStorageProvider.class, RETURNS_DEEP_STUBS))
+            .rpcEndpointService(new RpcEndpointServiceImpl())
+            .besuPluginContext(mock(BesuPluginContextImpl.class))
+            .build();
+
+    assertThat(runner.getEngineJsonRpcPort()).isPresent();
+  }
+
+  @Test
+  public void whenEngineApiAddedEthSubscribeAvailable() {
+    setupBlockchainAndBlock();
+
+    final WebSocketConfiguration wsRpc = WebSocketConfiguration.createDefault();
+    wsRpc.setEnabled(true);
+    final EthNetworkConfig mockMainnet = mock(EthNetworkConfig.class);
+    when(mockMainnet.getNetworkId()).thenReturn(BigInteger.ONE);
+    MergeConfigOptions.setMergeEnabled(true);
+    when(besuController.getMiningCoordinator()).thenReturn(mock(MergeMiningCoordinator.class));
+    final JsonRpcConfiguration engineConf = JsonRpcConfiguration.createEngineDefault();
+    engineConf.setEnabled(true);
+
+    final Runner runner =
+        new RunnerBuilder()
+            .discovery(true)
+            .p2pListenInterface("0.0.0.0")
+            .p2pListenPort(30303)
+            .p2pAdvertisedHost("127.0.0.1")
+            .p2pEnabled(true)
+            .natMethod(NatMethod.NONE)
+            .besuController(besuController)
+            .ethNetworkConfig(mockMainnet)
+            .metricsSystem(mock(ObservableMetricsSystem.class))
+            .permissioningService(mock(PermissioningServiceImpl.class))
+            .jsonRpcConfiguration(JsonRpcConfiguration.createDefault())
+            .engineJsonRpcConfiguration(engineConf)
+            .webSocketConfiguration(wsRpc)
+            .jsonRpcIpcConfiguration(mock(JsonRpcIpcConfiguration.class))
+            .graphQLConfiguration(mock(GraphQLConfiguration.class))
+            .metricsConfiguration(mock(MetricsConfiguration.class))
+            .vertx(Vertx.vertx())
+            .dataDir(dataDir.getRoot())
+            .storageProvider(mock(KeyValueStorageProvider.class, RETURNS_DEEP_STUBS))
+            .rpcEndpointService(new RpcEndpointServiceImpl())
+            .besuPluginContext(mock(BesuPluginContextImpl.class))
             .build();
-    assertThat(runner.getLocalEnode().orElseThrow()).isEqualTo(expectedEodeURL);
+
+    assertThat(runner.getEngineJsonRpcPort()).isPresent();
+    runner.startExternalServices();
+    // assert that rpc method collection has eth_subscribe in it.
+    runner.stop();
+  }
+
+  @Test
+  public void noEngineApiNoServiceForMethods() {
+    setupBlockchainAndBlock();
+
+    final JsonRpcConfiguration defaultRpcConfig = JsonRpcConfiguration.createDefault();
+    defaultRpcConfig.setEnabled(true);
+    final WebSocketConfiguration defaultWebSockConfig = WebSocketConfiguration.createDefault();
+    defaultWebSockConfig.setEnabled(true);
+    final EthNetworkConfig mockMainnet = mock(EthNetworkConfig.class);
+    when(mockMainnet.getNetworkId()).thenReturn(BigInteger.ONE);
+    MergeConfigOptions.setMergeEnabled(true);
+
+    final Runner runner =
+        new RunnerBuilder()
+            .discovery(true)
+            .p2pListenInterface("0.0.0.0")
+            .p2pListenPort(30303)
+            .p2pAdvertisedHost("127.0.0.1")
+            .p2pEnabled(true)
+            .natMethod(NatMethod.NONE)
+            .besuController(besuController)
+            .ethNetworkConfig(mockMainnet)
+            .metricsSystem(mock(ObservableMetricsSystem.class))
+            .permissioningService(mock(PermissioningServiceImpl.class))
+            .jsonRpcConfiguration(defaultRpcConfig)
+            .graphQLConfiguration(mock(GraphQLConfiguration.class))
+            .webSocketConfiguration(defaultWebSockConfig)
+            .jsonRpcIpcConfiguration(mock(JsonRpcIpcConfiguration.class))
+            .metricsConfiguration(mock(MetricsConfiguration.class))
+            .vertx(Vertx.vertx())
+            .dataDir(dataDir.getRoot())
+            .storageProvider(mock(KeyValueStorageProvider.class, RETURNS_DEEP_STUBS))
+            .rpcEndpointService(new RpcEndpointServiceImpl())
+            .besuPluginContext(mock(BesuPluginContextImpl.class))
+            .networkingConfiguration(NetworkingConfiguration.create())
+            .build();
+
+    assertThat(runner.getJsonRpcPort()).isPresent();
+    assertThat(runner.getEngineJsonRpcPort()).isEmpty();
+  }
+
+  private void setupBlockchainAndBlock() {
+    final DefaultBlockchain blockchain = mock(DefaultBlockchain.class);
+    when(protocolContext.getBlockchain()).thenReturn(blockchain);
+    final Block block = mock(Block.class);
+    when(blockchain.getGenesisBlock()).thenReturn(block);
+    when(block.getHash()).thenReturn(Hash.ZERO);
   }
 }
diff --git a/besu/src/test/java/org/hyperledger/besu/RunnerTest.java b/besu/src/test/java/org/hyperledger/besu/RunnerTest.java
index e0b728e33b7..93207b1d11a 100644
--- a/besu/src/test/java/org/hyperledger/besu/RunnerTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/RunnerTest.java
@@ -16,51 +16,64 @@
 
 import static java.util.Collections.emptySet;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.cli.config.EthNetworkConfig.DEV_NETWORK_ID;
 import static org.hyperledger.besu.cli.config.NetworkName.DEV;
+import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_BACKGROUND_THREAD_COUNT;
+import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_CACHE_CAPACITY;
+import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_IS_HIGH_SPEC;
+import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_OPEN_FILES;
 
 import org.hyperledger.besu.cli.config.EthNetworkConfig;
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.config.JsonUtil;
+import org.hyperledger.besu.config.MergeConfigOptions;
 import org.hyperledger.besu.controller.BesuController;
 import org.hyperledger.besu.controller.MainnetBesuControllerBuilder;
 import org.hyperledger.besu.crypto.KeyPairUtil;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.graphql.GraphQLConfiguration;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
+import org.hyperledger.besu.ethereum.api.jsonrpc.ipc.JsonRpcIpcConfiguration;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
-import org.hyperledger.besu.ethereum.blockcreation.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockImporter;
 import org.hyperledger.besu.ethereum.core.BlockSyncTestUtils;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
-import org.hyperledger.besu.ethereum.core.MiningParametersTestBuilder;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
 import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.mainnet.BlockImportResult;
 import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.storage.StorageProvider;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProviderBuilder;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 import org.hyperledger.besu.metrics.ObservableMetricsSystem;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBKeyValueStorageFactory;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBMetricsFactory;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration;
 import org.hyperledger.besu.services.BesuConfigurationImpl;
 import org.hyperledger.besu.services.BesuPluginContextImpl;
+import org.hyperledger.besu.services.PermissioningServiceImpl;
+import org.hyperledger.besu.services.RpcEndpointServiceImpl;
 import org.hyperledger.besu.testutil.TestClock;
 
+import java.io.IOException;
 import java.math.BigInteger;
 import java.net.InetAddress;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -72,11 +85,11 @@
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.vertx.core.Future;
+import io.vertx.core.Promise;
 import io.vertx.core.Vertx;
 import io.vertx.core.http.HttpClient;
 import io.vertx.core.json.Json;
 import io.vertx.core.json.JsonObject;
-import okhttp3.Call;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -84,41 +97,39 @@
 import okhttp3.Response;
 import org.apache.tuweni.units.bigints.UInt256;
 import org.awaitility.Awaitility;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.io.TempDir;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 /** Tests for {@link Runner}. */
+@ExtendWith(MockitoExtension.class)
 public final class RunnerTest {
 
-  private static final int MAX_OPEN_FILES = 1024;
-  private static final long CACHE_CAPACITY = 8388608;
-  private static final int MAX_BACKGROUND_COMPACTIONS = 4;
-  private static final int BACKGROUND_THREAD_COUNT = 4;
-
+  public static final BigInteger NETWORK_ID = BigInteger.valueOf(2929);
   private Vertx vertx;
 
-  @Before
+  @BeforeEach
   public void initVertx() {
     vertx = Vertx.vertx();
   }
 
-  @After
+  @AfterEach
   public void stopVertx() {
     vertx.close();
   }
 
-  @Rule public final TemporaryFolder temp = new TemporaryFolder();
+  @TempDir private static Path temp;
 
   @Test
   public void getFixedNodes() {
     final EnodeURL staticNode =
-        EnodeURL.fromString(
+        EnodeURLImpl.fromString(
             "enode://8f4b88336cc40ef2516d8b27df812e007fb2384a61e93635f1899051311344f3dcdbb49a4fe49a79f66d2f589a9f282e8cc4f1d7381e8ef7e4fcc6b0db578c77@127.0.0.1:30301");
     final EnodeURL bootnode =
-        EnodeURL.fromString(
+        EnodeURLImpl.fromString(
             "enode://8f4b88336cc40ef2516d8b27df812e007fb2384a61e93635f1899051311344f3dcdbb49a4fe49a79f66d2f589a9f282e8cc4f1d7381e8ef7e4fcc6b0db578c77@127.0.0.1:30302");
     final List<EnodeURL> bootnodes = new ArrayList<>();
     bootnodes.add(bootnode);
@@ -132,96 +143,76 @@ public void getFixedNodes() {
 
   @Test
   public void fullSyncFromGenesis() throws Exception {
-    syncFromGenesis(SyncMode.FULL, GenesisConfigFile.mainnet());
+    // set merge flag to false, otherwise this test can fail if a merge test runs first
+    MergeConfigOptions.setMergeEnabled(false);
+
+    syncFromGenesis(SyncMode.FULL, getFastSyncGenesis());
   }
 
   @Test
   public void fastSyncFromGenesis() throws Exception {
+    // set merge flag to false, otherwise this test can fail if a merge test runs first
+    MergeConfigOptions.setMergeEnabled(false);
+
     syncFromGenesis(SyncMode.FAST, getFastSyncGenesis());
   }
 
   private void syncFromGenesis(final SyncMode mode, final GenesisConfigFile genesisConfig)
       throws Exception {
-    final Path dataDirAhead = temp.newFolder().toPath();
+    final Path dataDirAhead = Files.createTempDirectory(temp, "db-ahead");
     final Path dbAhead = dataDirAhead.resolve("database");
     final int blockCount = 500;
     final NodeKey aheadDbNodeKey = NodeKeyUtils.createFrom(KeyPairUtil.loadKeyPair(dbAhead));
+    final NodeKey behindDbNodeKey = NodeKeyUtils.generate();
     final SynchronizerConfiguration syncConfigAhead =
         SynchronizerConfiguration.builder().syncMode(SyncMode.FULL).build();
     final ObservableMetricsSystem noOpMetricsSystem = new NoOpMetricsSystem();
-    final BigInteger networkId = BigInteger.valueOf(2929);
-
-    // Setup state with block data
-    try (final BesuController controller =
-        new MainnetBesuControllerBuilder()
-            .genesisConfigFile(genesisConfig)
-            .synchronizerConfiguration(syncConfigAhead)
-            .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
-            .dataDirectory(dataDirAhead)
-            .networkId(networkId)
-            .miningParameters(new MiningParametersTestBuilder().enabled(false).build())
-            .nodeKey(aheadDbNodeKey)
-            .metricsSystem(noOpMetricsSystem)
-            .privacyParameters(PrivacyParameters.DEFAULT)
-            .clock(TestClock.fixed())
-            .transactionPoolConfiguration(TransactionPoolConfiguration.DEFAULT)
-            .storageProvider(createKeyValueStorageProvider(dataDirAhead, dbAhead))
-            .gasLimitCalculator(GasLimitCalculator.constant())
-            .build()) {
-      setupState(blockCount, controller.getProtocolSchedule(), controller.getProtocolContext());
-    }
 
     // Setup Runner with blocks
     final BesuController controllerAhead =
-        new MainnetBesuControllerBuilder()
-            .genesisConfigFile(genesisConfig)
-            .synchronizerConfiguration(syncConfigAhead)
-            .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
-            .dataDirectory(dataDirAhead)
-            .networkId(networkId)
-            .miningParameters(new MiningParametersTestBuilder().enabled(false).build())
-            .nodeKey(aheadDbNodeKey)
-            .metricsSystem(noOpMetricsSystem)
-            .privacyParameters(PrivacyParameters.DEFAULT)
-            .clock(TestClock.fixed())
-            .transactionPoolConfiguration(TransactionPoolConfiguration.DEFAULT)
-            .storageProvider(createKeyValueStorageProvider(dataDirAhead, dbAhead))
-            .gasLimitCalculator(GasLimitCalculator.constant())
-            .build();
+        getController(
+            genesisConfig,
+            syncConfigAhead,
+            dataDirAhead,
+            aheadDbNodeKey,
+            createKeyValueStorageProvider(dataDirAhead, dbAhead),
+            noOpMetricsSystem);
+    setupState(
+        blockCount, controllerAhead.getProtocolSchedule(), controllerAhead.getProtocolContext());
+
     final String listenHost = InetAddress.getLoopbackAddress().getHostAddress();
-    final JsonRpcConfiguration aheadJsonRpcConfiguration = jsonRpcConfiguration();
-    final GraphQLConfiguration aheadGraphQLConfiguration = graphQLConfiguration();
-    final WebSocketConfiguration aheadWebSocketConfiguration = wsRpcConfiguration();
-    final MetricsConfiguration aheadMetricsConfiguration = metricsConfiguration();
-    final Path pidPath = temp.getRoot().toPath().resolve("pid");
+    final Path pidPath = dataDirAhead.resolve("pid");
     final RunnerBuilder runnerBuilder =
         new RunnerBuilder()
             .vertx(vertx)
             .discovery(true)
             .p2pAdvertisedHost(listenHost)
             .p2pListenPort(0)
-            .maxPeers(3)
             .metricsSystem(noOpMetricsSystem)
+            .permissioningService(new PermissioningServiceImpl())
             .staticNodes(emptySet())
-            .storageProvider(new InMemoryStorageProvider());
+            .storageProvider(new InMemoryKeyValueStorageProvider())
+            .rpcEndpointService(new RpcEndpointServiceImpl());
 
     Runner runnerBehind = null;
     final Runner runnerAhead =
         runnerBuilder
             .besuController(controllerAhead)
             .ethNetworkConfig(EthNetworkConfig.getNetworkConfig(DEV))
-            .jsonRpcConfiguration(aheadJsonRpcConfiguration)
-            .graphQLConfiguration(aheadGraphQLConfiguration)
-            .webSocketConfiguration(aheadWebSocketConfiguration)
-            .metricsConfiguration(aheadMetricsConfiguration)
+            .jsonRpcConfiguration(jsonRpcConfiguration())
+            .graphQLConfiguration(graphQLConfiguration())
+            .webSocketConfiguration(wsRpcConfiguration())
+            .jsonRpcIpcConfiguration(new JsonRpcIpcConfiguration())
+            .metricsConfiguration(metricsConfiguration())
             .dataDir(dbAhead)
             .pidPath(pidPath)
             .besuPluginContext(new BesuPluginContextImpl())
+            .rpcEndpointService(new RpcEndpointServiceImpl())
             .build();
     try {
-
-      runnerAhead.start();
-      assertThat(pidPath.toFile().exists()).isTrue();
+      runnerAhead.startExternalServices();
+      runnerAhead.startEthereumMainLoop();
+      assertThat(pidPath.toFile()).exists();
 
       final SynchronizerConfiguration syncConfigBehind =
           SynchronizerConfiguration.builder()
@@ -229,147 +220,146 @@ private void syncFromGenesis(final SyncMode mode, final GenesisConfigFile genesi
               .fastSyncPivotDistance(5)
               .fastSyncMinimumPeerCount(1)
               .build();
-      final Path dataDirBehind = temp.newFolder().toPath();
-      final JsonRpcConfiguration behindJsonRpcConfiguration = jsonRpcConfiguration();
-      final GraphQLConfiguration behindGraphQLConfiguration = graphQLConfiguration();
-      final WebSocketConfiguration behindWebSocketConfiguration = wsRpcConfiguration();
-      final MetricsConfiguration behindMetricsConfiguration = metricsConfiguration();
+      final Path dataDirBehind = Files.createTempDirectory(temp, "db-behind");
 
       // Setup runner with no block data
       final BesuController controllerBehind =
-          new MainnetBesuControllerBuilder()
-              .genesisConfigFile(genesisConfig)
-              .synchronizerConfiguration(syncConfigBehind)
-              .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
-              .dataDirectory(dataDirBehind)
-              .networkId(networkId)
-              .miningParameters(new MiningParametersTestBuilder().enabled(false).build())
-              .nodeKey(NodeKeyUtils.generate())
-              .storageProvider(new InMemoryStorageProvider())
-              .metricsSystem(noOpMetricsSystem)
-              .privacyParameters(PrivacyParameters.DEFAULT)
-              .clock(TestClock.fixed())
-              .transactionPoolConfiguration(TransactionPoolConfiguration.DEFAULT)
-              .gasLimitCalculator(GasLimitCalculator.constant())
-              .build();
-      final EnodeURL enode = runnerAhead.getLocalEnode().get();
+          getController(
+              genesisConfig,
+              syncConfigBehind,
+              dataDirBehind,
+              behindDbNodeKey,
+              new InMemoryKeyValueStorageProvider(),
+              noOpMetricsSystem);
+
+      final EnodeURL aheadEnode = runnerAhead.getLocalEnode().get();
       final EthNetworkConfig behindEthNetworkConfiguration =
           new EthNetworkConfig(
               EthNetworkConfig.jsonConfig(DEV),
-              DEV_NETWORK_ID,
-              Collections.singletonList(enode),
+              DEV.getNetworkId(),
+              Collections.singletonList(aheadEnode),
               null);
+
       runnerBehind =
           runnerBuilder
               .besuController(controllerBehind)
               .ethNetworkConfig(behindEthNetworkConfiguration)
-              .jsonRpcConfiguration(behindJsonRpcConfiguration)
-              .graphQLConfiguration(behindGraphQLConfiguration)
-              .webSocketConfiguration(behindWebSocketConfiguration)
-              .metricsConfiguration(behindMetricsConfiguration)
-              .dataDir(temp.newFolder().toPath())
+              .jsonRpcConfiguration(jsonRpcConfiguration())
+              .graphQLConfiguration(graphQLConfiguration())
+              .webSocketConfiguration(wsRpcConfiguration())
+              .metricsConfiguration(metricsConfiguration())
+              .dataDir(dataDirBehind)
               .metricsSystem(noOpMetricsSystem)
               .build();
 
-      runnerBehind.start();
+      runnerBehind.startExternalServices();
+      runnerBehind.startEthereumMainLoop();
 
       final int behindJsonRpcPort = runnerBehind.getJsonRpcPort().get();
-      final Call.Factory client = new OkHttpClient();
+      final OkHttpClient client = new OkHttpClient();
       Awaitility.await()
           .ignoreExceptions()
-          .atMost(5L, TimeUnit.MINUTES)
+          .atMost(2L, TimeUnit.MINUTES)
           .untilAsserted(
               () -> {
                 final String baseUrl = String.format("http://%s:%s", listenHost, behindJsonRpcPort);
-                try (final Response resp =
-                    client
-                        .newCall(
-                            new Request.Builder()
-                                .post(
-                                    RequestBody.create(
-                                        MediaType.parse("application/json; charset=utf-8"),
-                                        "{\"jsonrpc\":\"2.0\",\"id\":"
-                                            + Json.encode(7)
-                                            + ",\"method\":\"eth_blockNumber\"}"))
-                                .url(baseUrl)
-                                .build())
-                        .execute()) {
-
-                  assertThat(resp.code()).isEqualTo(200);
+                try (final Response blockNumberResp =
+                    client.newCall(getRequest("eth_blockNumber", baseUrl)).execute()) {
+                  assertThat(blockNumberResp.code()).isEqualTo(200);
+                  final int currentBlock = getNumber(blockNumberResp);
+                  blockNumberResp.close();
+
                   final Response syncingResp =
-                      client
-                          .newCall(
-                              new Request.Builder()
-                                  .post(
-                                      RequestBody.create(
-                                          MediaType.parse("application/json; charset=utf-8"),
-                                          "{\"jsonrpc\":\"2.0\",\"id\":"
-                                              + Json.encode(7)
-                                              + ",\"method\":\"eth_syncing\"}"))
-                                  .url(baseUrl)
-                                  .build())
-                          .execute();
+                      client.newCall(getRequest("eth_syncing", baseUrl)).execute();
                   assertThat(syncingResp.code()).isEqualTo(200);
+                  final JsonObject syncingRespJson = new JsonObject(syncingResp.body().string());
+                  syncingResp.close();
 
-                  final int currentBlock =
-                      UInt256.fromHexString(
-                              new JsonObject(resp.body().string()).getString("result"))
-                          .intValue();
+                  final Response peerCountResp =
+                      client.newCall(getRequest("net_peerCount", baseUrl)).execute();
+                  assertThat(peerCountResp.code()).isEqualTo(200);
+                  final int peerCount = getNumber(peerCountResp);
+                  peerCountResp.close();
+
+                  // if the test fails here, it means the node is not peering. check your config.
+                  // Expecting value to be true but was false
+                  assertThat(peerCount > 0).isTrue();
+
+                  // if not yet at blockCount, we should get a sync result from eth_syncing
                   if (currentBlock < blockCount) {
-                    // if not yet at blockCount, we should get a sync result from eth_syncing
+                    // if the test fails here, it means that the node is not syncing ->
+                    //                    Expecting actual:
+                    //                    false
+                    //                    to be an instance of:
+                    //                    io.vertx.core.json.JsonObject
+                    //                    but was instance of:
+                    //                    java.lang.Boolean
+                    assertThat(syncingRespJson.getValue("result")).isInstanceOf(JsonObject.class);
                     final int syncResultCurrentBlock =
                         UInt256.fromHexString(
-                                new JsonObject(syncingResp.body().string())
-                                    .getJsonObject("result")
-                                    .getString("currentBlock"))
+                                syncingRespJson.getJsonObject("result").getString("currentBlock"))
                             .intValue();
                     assertThat(syncResultCurrentBlock).isLessThan(blockCount);
                   }
                   assertThat(currentBlock).isEqualTo(blockCount);
-                  resp.close();
 
                   // when we have synced to blockCount, eth_syncing should return false
-                  final boolean syncResult =
-                      new JsonObject(syncingResp.body().string()).getBoolean("result");
+                  final boolean syncResult = syncingRespJson.getBoolean("result");
                   assertThat(syncResult).isFalse();
-                  syncingResp.close();
                 }
               });
-
-      final Future<Void> future = Future.future();
+      final Promise<String> promise = Promise.promise();
       final HttpClient httpClient = vertx.createHttpClient();
-      httpClient.websocket(
-          runnerBehind.getWebsocketPort().get(),
+      httpClient.webSocket(
+          runnerBehind.getWebSocketPort().get(),
           WebSocketConfiguration.DEFAULT_WEBSOCKET_HOST,
           "/",
           ws -> {
-            ws.writeTextMessage(
-                "{\"id\": 1, \"method\": \"eth_subscribe\", \"params\": [\"syncing\"]}");
-            ws.textMessageHandler(
-                payload -> {
-                  final boolean matches =
-                      payload.equals("{\"jsonrpc\":\"2.0\",\"id\":2,\"result\":\"0x0\"}");
-                  if (matches) {
-                    future.complete();
-                  } else {
-                    future.fail("Unexpected result");
-                  }
-                });
+            ws.result()
+                .writeTextMessage(
+                    "{\"id\": 1, \"method\": \"eth_subscribe\", \"params\": [\"syncing\"]}");
+            ws.result()
+                .textMessageHandler(
+                    payload -> {
+                      final boolean matches =
+                          payload.equals("{\"jsonrpc\":\"2.0\",\"id\":2,\"result\":\"0x0\"}");
+                      if (matches) {
+                        promise.complete(payload);
+                      } else {
+                        promise.fail("Unexpected result: " + payload);
+                      }
+                    });
           });
+      final Future<String> future = promise.future();
       Awaitility.await()
           .catchUncaughtExceptions()
-          .atMost(5L, TimeUnit.MINUTES)
+          .atMost(2L, TimeUnit.MINUTES)
           .until(future::isComplete);
     } finally {
       if (runnerBehind != null) {
         runnerBehind.close();
         runnerBehind.awaitStop();
       }
-      runnerAhead.close();
-      runnerAhead.awaitStop();
     }
   }
 
+  private int getNumber(final Response response) throws IOException {
+    final int currentBlock =
+        UInt256.fromHexString(new JsonObject(response.body().string()).getString("result"))
+            .intValue();
+    return currentBlock;
+  }
+
+  private Request getRequest(final String method, final String baseUrl) {
+    return new Request.Builder()
+        .post(
+            RequestBody.create(
+                "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(7) + ",\"method\":\"" + method + "\"}",
+                MediaType.parse("application/json; charset=utf-8")))
+        .url(baseUrl)
+        .build();
+  }
+
   private GenesisConfigFile getFastSyncGenesis() {
     final ObjectNode jsonNode = GenesisConfigFile.mainnetJsonNode();
     final Optional<ObjectNode> configNode = JsonUtil.getObjectNode(jsonNode, "config");
@@ -377,7 +367,8 @@ private GenesisConfigFile getFastSyncGenesis() {
         (node) -> {
           // Clear DAO block so that inability to validate DAO block won't interfere with fast sync
           node.remove("daoForkBlock");
-          node.put("daoForkSupport", false);
+          // remove merge terminal difficulty for fast sync in the absence of a CL mock
+          node.remove("terminalTotalDifficulty");
         });
     return GenesisConfigFile.fromConfig(jsonNode);
   }
@@ -388,10 +379,10 @@ private StorageProvider createKeyValueStorageProvider(final Path dataDir, final
             new RocksDBKeyValueStorageFactory(
                 () ->
                     new RocksDBFactoryConfiguration(
-                        MAX_OPEN_FILES,
-                        MAX_BACKGROUND_COMPACTIONS,
-                        BACKGROUND_THREAD_COUNT,
-                        CACHE_CAPACITY),
+                        DEFAULT_MAX_OPEN_FILES,
+                        DEFAULT_BACKGROUND_THREAD_COUNT,
+                        DEFAULT_CACHE_CAPACITY,
+                        DEFAULT_IS_HIGH_SPEC),
                 Arrays.asList(KeyValueSegmentIdentifier.values()),
                 RocksDBMetricsFactory.PUBLIC_ROCKS_DB_METRICS))
         .withCommonConfiguration(new BesuConfigurationImpl(dataDir, dbDir))
@@ -434,14 +425,43 @@ private static void setupState(
 
     for (int i = 1; i < count + 1; ++i) {
       final Block block = blocks.get(i);
-      final ProtocolSpec protocolSpec =
-          protocolSchedule.getByBlockNumber(block.getHeader().getNumber());
+      final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(block.getHeader());
       final BlockImporter blockImporter = protocolSpec.getBlockImporter();
-      final boolean result =
+      final BlockImportResult result =
           blockImporter.importBlock(protocolContext, block, HeaderValidationMode.FULL);
-      if (!result) {
+      if (!result.isImported()) {
         throw new IllegalStateException("Unable to import block " + block.getHeader().getNumber());
       }
     }
   }
+
+  private BesuController getController(
+      final GenesisConfigFile genesisConfig,
+      final SynchronizerConfiguration syncConfig,
+      final Path dataDir,
+      final NodeKey nodeKey,
+      final StorageProvider storageProvider,
+      final ObservableMetricsSystem metricsSystem) {
+    return new MainnetBesuControllerBuilder()
+        .genesisConfigFile(genesisConfig)
+        .synchronizerConfiguration(syncConfig)
+        .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
+        .dataDirectory(dataDir)
+        .networkId(NETWORK_ID)
+        .miningParameters(new MiningParameters.Builder().miningEnabled(false).build())
+        .nodeKey(nodeKey)
+        .storageProvider(storageProvider)
+        .metricsSystem(metricsSystem)
+        .privacyParameters(PrivacyParameters.DEFAULT)
+        .clock(TestClock.fixed())
+        .transactionPoolConfiguration(TransactionPoolConfiguration.DEFAULT)
+        .gasLimitCalculator(GasLimitCalculator.constant())
+        .evmConfiguration(EvmConfiguration.DEFAULT)
+        .networkConfiguration(NetworkingConfiguration.create())
+        .randomPeerPriority(Boolean.FALSE)
+        .maxPeers(25)
+        .lowerBoundPeers(25)
+        .maxRemotelyInitiatedPeers(15)
+        .build();
+  }
 }
diff --git a/besu/src/test/java/org/hyperledger/besu/chainexport/RlpBlockExporterTest.java b/besu/src/test/java/org/hyperledger/besu/chainexport/RlpBlockExporterTest.java
index cd97ad53cb7..e6b60dad197 100644
--- a/besu/src/test/java/org/hyperledger/besu/chainexport/RlpBlockExporterTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/chainexport/RlpBlockExporterTest.java
@@ -20,21 +20,25 @@
 import org.hyperledger.besu.chainimport.RlpBlockImporter;
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.controller.BesuController;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.ethereum.blockcreation.GasLimitCalculator;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
-import org.hyperledger.besu.ethereum.core.MiningParametersTestBuilder;
+import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
 import org.hyperledger.besu.ethereum.util.RawBlockIterator;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.testutil.BlockTestUtil;
 import org.hyperledger.besu.testutil.TestClock;
@@ -49,8 +53,11 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /** Tests for {@link BlockExporter}. */
+@RunWith(MockitoJUnitRunner.class)
 public final class RlpBlockExporterTest {
 
   @ClassRule public static final TemporaryFolder folder = new TemporaryFolder();
@@ -79,12 +86,12 @@ private static Blockchain importBlocks(final BesuController controller, final Pa
   private static BesuController createController() throws IOException {
     final Path dataDir = folder.newFolder().toPath();
     return new BesuController.Builder()
-        .fromGenesisConfig(GenesisConfigFile.mainnet())
+        .fromGenesisConfig(GenesisConfigFile.mainnet(), SyncMode.FAST)
         .synchronizerConfiguration(SynchronizerConfiguration.builder().build())
         .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
-        .storageProvider(new InMemoryStorageProvider())
+        .storageProvider(new InMemoryKeyValueStorageProvider())
         .networkId(BigInteger.ONE)
-        .miningParameters(new MiningParametersTestBuilder().enabled(false).build())
+        .miningParameters(new MiningParameters.Builder().miningEnabled(false).build())
         .nodeKey(NodeKeyUtils.generate())
         .metricsSystem(new NoOpMetricsSystem())
         .privacyParameters(PrivacyParameters.DEFAULT)
@@ -92,6 +99,8 @@ private static BesuController createController() throws IOException {
         .clock(TestClock.fixed())
         .transactionPoolConfiguration(TransactionPoolConfiguration.DEFAULT)
         .gasLimitCalculator(GasLimitCalculator.constant())
+        .evmConfiguration(EvmConfiguration.DEFAULT)
+        .networkConfiguration(NetworkingConfiguration.create())
         .build();
   }
 
@@ -236,10 +245,9 @@ public void exportBlocks_outOfOrderBounds() throws IOException {
   }
 
   private RawBlockIterator getBlockIterator(final Path blocks) throws IOException {
-    return new RawBlockIterator(
-        blocks,
-        rlp ->
-            BlockHeader.readFrom(rlp, ScheduleBasedBlockHeaderFunctions.create(protocolSchedule)));
+    final BlockHeaderFunctions blockHeaderFunctions =
+        ScheduleBasedBlockHeaderFunctions.create(protocolSchedule);
+    return new RawBlockIterator(blocks, blockHeaderFunctions);
   }
 
   private Block getBlock(final Blockchain blockchain, final long blockNumber) {
diff --git a/besu/src/test/java/org/hyperledger/besu/chainimport/JsonBlockImporterTest.java b/besu/src/test/java/org/hyperledger/besu/chainimport/JsonBlockImporterTest.java
index d22d31dfc03..00c86133ea6 100644
--- a/besu/src/test/java/org/hyperledger/besu/chainimport/JsonBlockImporterTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/chainimport/JsonBlockImporterTest.java
@@ -21,21 +21,24 @@
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.config.JsonUtil;
 import org.hyperledger.besu.controller.BesuController;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.ethereum.blockcreation.GasLimitCalculator;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
-import org.hyperledger.besu.ethereum.core.MiningParametersTestBuilder;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.testutil.TestClock;
 
@@ -138,7 +141,7 @@ public void importChain_validJson_withBlockNumbers() throws IOException {
       assertThat(tx.getTo())
           .hasValue(Address.fromHexString("627306090abaB3A6e1400e9345bC60c78a8BEf57"));
       assertThat(tx.getGasLimit()).isEqualTo(0xFFFFF1L);
-      assertThat(tx.getGasPrice()).isEqualTo(Wei.fromHexString("0xFF"));
+      assertThat(tx.getGasPrice().get()).isEqualTo(Wei.fromHexString("0xFF"));
       assertThat(tx.getValue()).isEqualTo(Wei.of(1L));
       assertThat(tx.getNonce()).isEqualTo(0L);
       // Check second tx
@@ -148,7 +151,7 @@ public void importChain_validJson_withBlockNumbers() throws IOException {
       assertThat(tx.getTo())
           .hasValue(Address.fromHexString("f17f52151EbEF6C7334FAD080c5704D77216b732"));
       assertThat(tx.getGasLimit()).isEqualTo(0xFFFFF2L);
-      assertThat(tx.getGasPrice()).isEqualTo(Wei.fromHexString("0xEF"));
+      assertThat(tx.getGasPrice().get()).isEqualTo(Wei.fromHexString("0xEF"));
       assertThat(tx.getValue()).isEqualTo(Wei.of(0L));
       assertThat(tx.getNonce()).isEqualTo(1L);
 
@@ -166,7 +169,7 @@ public void importChain_validJson_withBlockNumbers() throws IOException {
       assertThat(tx.getTo())
           .hasValue(Address.fromHexString("f17f52151EbEF6C7334FAD080c5704D77216b732"));
       assertThat(tx.getGasLimit()).isEqualTo(0xFFFFFFL);
-      assertThat(tx.getGasPrice()).isEqualTo(Wei.fromHexString("0xFF"));
+      assertThat(tx.getGasPrice().get()).isEqualTo(Wei.fromHexString("0xFF"));
       assertThat(tx.getValue()).isEqualTo(Wei.of(0L));
       assertThat(tx.getNonce()).isEqualTo(0L);
 
@@ -192,7 +195,7 @@ public void importChain_validJson_withBlockNumbers() throws IOException {
           .isEqualTo(Address.fromHexString("627306090abaB3A6e1400e9345bC60c78a8BEf57"));
       assertThat(tx.getTo()).isEmpty();
       assertThat(tx.getGasLimit()).isEqualTo(0xFFFFFFL);
-      assertThat(tx.getGasPrice()).isEqualTo(Wei.fromHexString("0xFF"));
+      assertThat(tx.getGasPrice().get()).isEqualTo(Wei.fromHexString("0xFF"));
       assertThat(tx.getValue()).isEqualTo(Wei.of(0L));
       assertThat(tx.getNonce()).isEqualTo(1L);
     }
@@ -229,7 +232,7 @@ public void importChain_validJson_noBlockIdentifiers() throws IOException {
       assertThat(tx.getTo())
           .hasValue(Address.fromHexString("627306090abaB3A6e1400e9345bC60c78a8BEf57"));
       assertThat(tx.getGasLimit()).isEqualTo(0xFFFFF1L);
-      assertThat(tx.getGasPrice()).isEqualTo(Wei.fromHexString("0xFF"));
+      assertThat(tx.getGasPrice().get()).isEqualTo(Wei.fromHexString("0xFF"));
       assertThat(tx.getValue()).isEqualTo(Wei.of(1L));
       assertThat(tx.getNonce()).isEqualTo(0L);
       // Check second tx
@@ -239,7 +242,7 @@ public void importChain_validJson_noBlockIdentifiers() throws IOException {
       assertThat(tx.getTo())
           .hasValue(Address.fromHexString("f17f52151EbEF6C7334FAD080c5704D77216b732"));
       assertThat(tx.getGasLimit()).isEqualTo(0xFFFFF2L);
-      assertThat(tx.getGasPrice()).isEqualTo(Wei.fromHexString("0xEF"));
+      assertThat(tx.getGasPrice().get()).isEqualTo(Wei.fromHexString("0xEF"));
       assertThat(tx.getValue()).isEqualTo(Wei.of(0L));
       assertThat(tx.getNonce()).isEqualTo(1L);
 
@@ -257,7 +260,7 @@ public void importChain_validJson_noBlockIdentifiers() throws IOException {
       assertThat(tx.getTo())
           .hasValue(Address.fromHexString("f17f52151EbEF6C7334FAD080c5704D77216b732"));
       assertThat(tx.getGasLimit()).isEqualTo(0xFFFFFFL);
-      assertThat(tx.getGasPrice()).isEqualTo(Wei.fromHexString("0xFF"));
+      assertThat(tx.getGasPrice().get()).isEqualTo(Wei.fromHexString("0xFF"));
       assertThat(tx.getValue()).isEqualTo(Wei.of(0L));
       assertThat(tx.getNonce()).isEqualTo(0L);
 
@@ -283,7 +286,7 @@ public void importChain_validJson_noBlockIdentifiers() throws IOException {
           .isEqualTo(Address.fromHexString("627306090abaB3A6e1400e9345bC60c78a8BEf57"));
       assertThat(tx.getTo()).isEmpty();
       assertThat(tx.getGasLimit()).isEqualTo(0xFFFFFFL);
-      assertThat(tx.getGasPrice()).isEqualTo(Wei.fromHexString("0xFF"));
+      assertThat(tx.getGasPrice().get()).isEqualTo(Wei.fromHexString("0xFF"));
       assertThat(tx.getValue()).isEqualTo(Wei.of(0L));
       assertThat(tx.getNonce()).isEqualTo(1L);
     }
@@ -334,7 +337,7 @@ public void importChain_validJson_withParentHashes() throws IOException {
       assertThat(tx.getTo())
           .hasValue(Address.fromHexString("627306090abaB3A6e1400e9345bC60c78a8BEf57"));
       assertThat(tx.getGasLimit()).isEqualTo(0xFFFFF1L);
-      assertThat(tx.getGasPrice()).isEqualTo(Wei.fromHexString("0xFF"));
+      assertThat(tx.getGasPrice().get()).isEqualTo(Wei.fromHexString("0xFF"));
       assertThat(tx.getValue()).isEqualTo(Wei.of(1L));
       assertThat(tx.getNonce()).isEqualTo(2L);
     }
@@ -412,15 +415,15 @@ protected BesuController createController(final GenesisConfigFile genesisConfigF
       throws IOException {
     final Path dataDir = folder.newFolder().toPath();
     return new BesuController.Builder()
-        .fromGenesisConfig(genesisConfigFile)
+        .fromGenesisConfig(genesisConfigFile, SyncMode.FAST)
         .synchronizerConfiguration(SynchronizerConfiguration.builder().build())
         .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
-        .storageProvider(new InMemoryStorageProvider())
+        .storageProvider(new InMemoryKeyValueStorageProvider())
         .networkId(BigInteger.valueOf(10))
         .miningParameters(
-            new MiningParametersTestBuilder()
+            new MiningParameters.Builder()
                 .minTransactionGasPrice(Wei.ZERO)
-                .enabled(true)
+                .miningEnabled(true)
                 .build())
         .nodeKey(NodeKeyUtils.generate())
         .metricsSystem(new NoOpMetricsSystem())
@@ -429,6 +432,8 @@ protected BesuController createController(final GenesisConfigFile genesisConfigF
         .clock(TestClock.fixed())
         .transactionPoolConfiguration(TransactionPoolConfiguration.DEFAULT)
         .gasLimitCalculator(GasLimitCalculator.constant())
+        .evmConfiguration(EvmConfiguration.DEFAULT)
+        .networkConfiguration(NetworkingConfiguration.create())
         .build();
   }
 }
diff --git a/besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java b/besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java
index 13bd58428da..3260b8ee55b 100644
--- a/besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java
@@ -14,38 +14,41 @@
  */
 package org.hyperledger.besu.chainimport;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.config.MergeConfigOptions;
 import org.hyperledger.besu.controller.BesuController;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.ethereum.blockcreation.GasLimitCalculator;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
-import org.hyperledger.besu.ethereum.core.MiningParametersTestBuilder;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.testutil.BlockTestUtil;
 import org.hyperledger.besu.testutil.TestClock;
 
 import java.io.IOException;
 import java.math.BigInteger;
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
 import java.util.concurrent.CompletionException;
 
-import com.google.common.io.Resources;
 import org.apache.tuweni.units.bigints.UInt256;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /** Tests for {@link RlpBlockImporter}. */
+@RunWith(MockitoJUnitRunner.class)
 public final class RlpBlockImporterTest {
 
   @Rule public final TemporaryFolder folder = new TemporaryFolder();
@@ -59,12 +62,12 @@ public void blockImport() throws IOException {
     BlockTestUtil.write1000Blocks(source);
     final BesuController targetController =
         new BesuController.Builder()
-            .fromGenesisConfig(GenesisConfigFile.mainnet())
+            .fromGenesisConfig(GenesisConfigFile.mainnet(), SyncMode.FAST)
             .synchronizerConfiguration(SynchronizerConfiguration.builder().build())
             .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
-            .storageProvider(new InMemoryStorageProvider())
+            .storageProvider(new InMemoryKeyValueStorageProvider())
             .networkId(BigInteger.ONE)
-            .miningParameters(new MiningParametersTestBuilder().enabled(false).build())
+            .miningParameters(new MiningParameters.Builder().miningEnabled(false).build())
             .nodeKey(NodeKeyUtils.generate())
             .metricsSystem(new NoOpMetricsSystem())
             .privacyParameters(PrivacyParameters.DEFAULT)
@@ -72,6 +75,8 @@ public void blockImport() throws IOException {
             .clock(TestClock.fixed())
             .transactionPoolConfiguration(TransactionPoolConfiguration.DEFAULT)
             .gasLimitCalculator(GasLimitCalculator.constant())
+            .evmConfiguration(EvmConfiguration.DEFAULT)
+            .networkConfiguration(NetworkingConfiguration.create())
             .build();
     final RlpBlockImporter.ImportResult result =
         rlpBlockImporter.importBlockchain(source, targetController, false);
@@ -82,17 +87,20 @@ public void blockImport() throws IOException {
 
   @Test
   public void blockImportRejectsBadPow() throws IOException {
+    // set merge flag to false, otherwise this test can fail if a merge test runs first
+    MergeConfigOptions.setMergeEnabled(false);
+
     final Path dataDir = folder.newFolder().toPath();
     final Path source = dataDir.resolve("badpow.blocks");
     BlockTestUtil.writeBadPowBlocks(source);
     final BesuController targetController =
         new BesuController.Builder()
-            .fromGenesisConfig(GenesisConfigFile.mainnet())
+            .fromGenesisConfig(GenesisConfigFile.mainnet(), SyncMode.FAST)
             .synchronizerConfiguration(SynchronizerConfiguration.builder().build())
             .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
-            .storageProvider(new InMemoryStorageProvider())
+            .storageProvider(new InMemoryKeyValueStorageProvider())
             .networkId(BigInteger.ONE)
-            .miningParameters(new MiningParametersTestBuilder().enabled(false).build())
+            .miningParameters(new MiningParameters.Builder().miningEnabled(false).build())
             .nodeKey(NodeKeyUtils.generate())
             .metricsSystem(new NoOpMetricsSystem())
             .privacyParameters(PrivacyParameters.DEFAULT)
@@ -100,6 +108,8 @@ public void blockImportRejectsBadPow() throws IOException {
             .clock(TestClock.fixed())
             .transactionPoolConfiguration(TransactionPoolConfiguration.DEFAULT)
             .gasLimitCalculator(GasLimitCalculator.constant())
+            .evmConfiguration(EvmConfiguration.DEFAULT)
+            .networkConfiguration(NetworkingConfiguration.create())
             .build();
 
     assertThatThrownBy(
@@ -115,12 +125,12 @@ public void blockImportCanSkipPow() throws IOException {
     BlockTestUtil.writeBadPowBlocks(source);
     final BesuController targetController =
         new BesuController.Builder()
-            .fromGenesisConfig(GenesisConfigFile.mainnet())
+            .fromGenesisConfig(GenesisConfigFile.mainnet(), SyncMode.FAST)
             .synchronizerConfiguration(SynchronizerConfiguration.builder().build())
             .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
-            .storageProvider(new InMemoryStorageProvider())
+            .storageProvider(new InMemoryKeyValueStorageProvider())
             .networkId(BigInteger.ONE)
-            .miningParameters(new MiningParametersTestBuilder().enabled(false).build())
+            .miningParameters(new MiningParameters.Builder().miningEnabled(false).build())
             .nodeKey(NodeKeyUtils.generate())
             .metricsSystem(new NoOpMetricsSystem())
             .privacyParameters(PrivacyParameters.DEFAULT)
@@ -128,6 +138,8 @@ public void blockImportCanSkipPow() throws IOException {
             .clock(TestClock.fixed())
             .transactionPoolConfiguration(TransactionPoolConfiguration.DEFAULT)
             .gasLimitCalculator(GasLimitCalculator.constant())
+            .evmConfiguration(EvmConfiguration.DEFAULT)
+            .networkConfiguration(NetworkingConfiguration.create())
             .build();
 
     final RlpBlockImporter.ImportResult result =
@@ -135,44 +147,4 @@ public void blockImportCanSkipPow() throws IOException {
     assertThat(result.count).isEqualTo(1);
     assertThat(result.td).isEqualTo(UInt256.valueOf(34351349760L));
   }
-
-  @Test
-  public void ibftImport() throws IOException {
-    final Path dataDir = folder.newFolder().toPath();
-    final Path source = dataDir.resolve("ibft.blocks");
-    final String config =
-        Resources.toString(this.getClass().getResource("/ibftlegacy_genesis.json"), UTF_8);
-
-    try {
-      Files.write(
-          source,
-          Resources.toByteArray(this.getClass().getResource("/ibft.blocks")),
-          StandardOpenOption.CREATE,
-          StandardOpenOption.TRUNCATE_EXISTING);
-    } catch (final IOException ex) {
-      throw new IllegalStateException(ex);
-    }
-
-    final BesuController controller =
-        new BesuController.Builder()
-            .fromGenesisConfig(GenesisConfigFile.fromConfig(config))
-            .synchronizerConfiguration(SynchronizerConfiguration.builder().build())
-            .ethProtocolConfiguration(EthProtocolConfiguration.defaultConfig())
-            .storageProvider(new InMemoryStorageProvider())
-            .networkId(BigInteger.valueOf(10))
-            .miningParameters(new MiningParametersTestBuilder().enabled(false).build())
-            .nodeKey(NodeKeyUtils.generate())
-            .metricsSystem(new NoOpMetricsSystem())
-            .privacyParameters(PrivacyParameters.DEFAULT)
-            .dataDirectory(dataDir)
-            .clock(TestClock.fixed())
-            .transactionPoolConfiguration(TransactionPoolConfiguration.DEFAULT)
-            .gasLimitCalculator(GasLimitCalculator.constant())
-            .build();
-    final RlpBlockImporter.ImportResult result =
-        rlpBlockImporter.importBlockchain(source, controller, false);
-
-    // Don't count the Genesis block
-    assertThat(result.count).isEqualTo(958);
-  }
 }
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java
index 455189d8627..de87890b169 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java
@@ -17,69 +17,93 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.startsWith;
 import static org.hyperledger.besu.cli.config.NetworkName.CLASSIC;
 import static org.hyperledger.besu.cli.config.NetworkName.DEV;
+import static org.hyperledger.besu.cli.config.NetworkName.EXPERIMENTAL_EIPS;
+import static org.hyperledger.besu.cli.config.NetworkName.FUTURE_EIPS;
 import static org.hyperledger.besu.cli.config.NetworkName.GOERLI;
 import static org.hyperledger.besu.cli.config.NetworkName.KOTTI;
 import static org.hyperledger.besu.cli.config.NetworkName.MAINNET;
 import static org.hyperledger.besu.cli.config.NetworkName.MORDOR;
-import static org.hyperledger.besu.cli.config.NetworkName.RINKEBY;
-import static org.hyperledger.besu.cli.config.NetworkName.ROPSTEN;
+import static org.hyperledger.besu.cli.config.NetworkName.SEPOLIA;
 import static org.hyperledger.besu.cli.util.CommandLineUtils.DEPENDENCY_WARNING_MSG;
+import static org.hyperledger.besu.cli.util.CommandLineUtils.DEPRECATION_WARNING_MSG;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.ENGINE;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.ETH;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.NET;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.PERM;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.WEB3;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.GOERLI_BOOTSTRAP_NODES;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.GOERLI_DISCOVERY_URL;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.MAINNET_BOOTSTRAP_NODES;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.MAINNET_DISCOVERY_URL;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.RINKEBY_BOOTSTRAP_NODES;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.RINKEBY_DISCOVERY_URL;
+import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_POS_BLOCK_CREATION_MAX_TIME;
+import static org.hyperledger.besu.ethereum.p2p.config.DefaultDiscoveryConfiguration.GOERLI_BOOTSTRAP_NODES;
+import static org.hyperledger.besu.ethereum.p2p.config.DefaultDiscoveryConfiguration.GOERLI_DISCOVERY_URL;
+import static org.hyperledger.besu.ethereum.p2p.config.DefaultDiscoveryConfiguration.MAINNET_BOOTSTRAP_NODES;
+import static org.hyperledger.besu.ethereum.p2p.config.DefaultDiscoveryConfiguration.MAINNET_DISCOVERY_URL;
+import static org.hyperledger.besu.ethereum.worldstate.DataStorageFormat.BONSAI;
 import static org.hyperledger.besu.nat.kubernetes.KubernetesNatManager.DEFAULT_BESU_SERVICE_NAME_FILTER;
+import static org.junit.Assume.assumeThat;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.contains;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isNotNull;
 import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.atMost;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.BesuInfo;
 import org.hyperledger.besu.cli.config.EthNetworkConfig;
+import org.hyperledger.besu.cli.options.unstable.TransactionPoolOptions;
 import org.hyperledger.besu.config.GenesisConfigFile;
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
-import org.hyperledger.besu.controller.TargetingGasLimitCalculator;
+import org.hyperledger.besu.config.MergeConfigOptions;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.api.graphql.GraphQLConfiguration;
 import org.hyperledger.besu.ethereum.api.handlers.TimeoutOptions;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.JwtAlgorithm;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
 import org.hyperledger.besu.ethereum.api.tls.TlsConfiguration;
-import org.hyperledger.besu.ethereum.blockcreation.GasLimitCalculator;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.permissioning.LocalPermissioningConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.SmartContractPermissioningConfiguration;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
 import org.hyperledger.besu.ethereum.worldstate.PrunerConfiguration;
+import org.hyperledger.besu.evm.precompile.AbstractAltBnPrecompiledContract;
 import org.hyperledger.besu.metrics.StandardMetricCategory;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
 import org.hyperledger.besu.nat.NatMethod;
+import org.hyperledger.besu.pki.config.PkiKeyStoreConfiguration;
+import org.hyperledger.besu.plugin.data.EnodeURL;
+import org.hyperledger.besu.plugin.services.privacy.PrivateMarkerTransactionFactory;
+import org.hyperledger.besu.plugin.services.rpc.PluginRpcRequest;
 import org.hyperledger.besu.util.number.Fraction;
 import org.hyperledger.besu.util.number.Percentage;
+import org.hyperledger.besu.util.platform.PlatformDetector;
 
 import java.io.File;
 import java.io.IOException;
 import java.math.BigInteger;
+import java.net.ServerSocket;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -89,25 +113,31 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import com.google.common.collect.Lists;
 import com.google.common.io.Resources;
 import io.vertx.core.json.JsonObject;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.text.StringEscapeUtils;
-import org.apache.logging.log4j.Level;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.toml.Toml;
 import org.apache.tuweni.toml.TomlParseResult;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
 import picocli.CommandLine;
 
+@RunWith(MockitoJUnitRunner.class)
 public class BesuCommandTest extends CommandTestAbstract {
 
   private static final String ENCLAVE_URI = "http://1.2.3.4:5555";
@@ -129,17 +159,36 @@ public class BesuCommandTest extends CommandTestAbstract {
       (new JsonObject())
           .put(
               "config",
-              new JsonObject().put("isquorum", true).put("chainId", GENESIS_CONFIG_TEST_CHAINID));
+              new JsonObject().put("isQuorum", true).put("chainId", GENESIS_CONFIG_TEST_CHAINID));
   private static final JsonObject INVALID_GENESIS_QUORUM_INTEROP_ENABLED_MAINNET =
-      (new JsonObject()).put("config", new JsonObject().put("isquorum", true));
+      (new JsonObject()).put("config", new JsonObject().put("isQuorum", true));
+  private static final JsonObject INVALID_GENESIS_EC_CURVE =
+      (new JsonObject()).put("config", new JsonObject().put("ecCurve", "abcd"));
+  private static final JsonObject VALID_GENESIS_EC_CURVE =
+      (new JsonObject()).put("config", new JsonObject().put("ecCurve", "secp256k1"));
   private static final String ENCLAVE_PUBLIC_KEY_PATH =
       BesuCommand.class.getResource("/orion_publickey.pub").getPath();
 
-  private final String[] validENodeStrings = {
+  private static final String[] VALID_ENODE_STRINGS = {
     "enode://" + VALID_NODE_ID + "@192.168.0.1:4567",
     "enode://" + VALID_NODE_ID + "@192.168.0.2:4567",
     "enode://" + VALID_NODE_ID + "@192.168.0.3:4567"
   };
+  private static final String DNS_DISCOVERY_URL =
+      "enrtree://AM5FCQLWIZX2QFPNJAP7VUERCCRNGRHWZG3YYHIUV7BVDQ5FDPRT2@nodes.example.org";
+  private static final JsonObject VALID_GENESIS_WITH_DISCOVERY_OPTIONS =
+      new JsonObject()
+          .put(
+              "config",
+              new JsonObject()
+                  .put(
+                      "discovery",
+                      new JsonObject()
+                          .put("bootnodes", List.of(VALID_ENODE_STRINGS))
+                          .put("dns", DNS_DISCOVERY_URL)));
+
+  private static final JsonObject GENESIS_WITH_DATA_BLOBS_ENABLED =
+      new JsonObject().put("config", new JsonObject().put("cancunTime", 1L));
 
   static {
     DEFAULT_JSON_RPC_CONFIGURATION = JsonRpcConfiguration.createDefault();
@@ -148,33 +197,45 @@ public class BesuCommandTest extends CommandTestAbstract {
     DEFAULT_METRICS_CONFIGURATION = MetricsConfiguration.builder().build();
   }
 
+  @Before
+  public void setup() {
+    MergeConfigOptions.setMergeEnabled(false);
+  }
+
+  @After
+  public void tearDown() {
+    MergeConfigOptions.setMergeEnabled(false);
+  }
+
   @Test
   public void callingHelpSubCommandMustDisplayUsage() {
     parseCommand("--help");
     final String expectedOutputStart = String.format("Usage:%n%nbesu [OPTIONS] [COMMAND]");
-    assertThat(commandOutput.toString()).startsWith(expectedOutputStart);
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).startsWith(expectedOutputStart);
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void callingHelpDisplaysDefaultRpcApisCorrectly() {
     parseCommand("--help");
-    assertThat(commandOutput.toString()).contains("default: [ETH, NET, WEB3]");
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).contains("default: [ETH, NET, WEB3]");
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void callingVersionDisplayBesuInfoVersion() {
     parseCommand("--version");
-    assertThat(commandOutput.toString()).isEqualToIgnoringWhitespace(BesuInfo.version());
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEqualToIgnoringWhitespace(BesuInfo.version());
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   // Testing default values
   @Test
-  public void callingBesuCommandWithoutOptionsMustSyncWithDefaultValues() throws Exception {
+  public void callingBesuCommandWithoutOptionsMustSyncWithDefaultValues() {
     parseCommand();
 
+    final int maxPeers = 25;
+
     final ArgumentCaptor<EthNetworkConfig> ethNetworkArg =
         ArgumentCaptor.forClass(EthNetworkConfig.class);
     verify(mockRunnerBuilder).discovery(eq(true));
@@ -182,22 +243,22 @@ public void callingBesuCommandWithoutOptionsMustSyncWithDefaultValues() throws E
         .ethNetworkConfig(
             new EthNetworkConfig(
                 EthNetworkConfig.jsonConfig(MAINNET),
-                EthNetworkConfig.MAINNET_NETWORK_ID,
+                MAINNET.getNetworkId(),
                 MAINNET_BOOTSTRAP_NODES,
                 MAINNET_DISCOVERY_URL));
     verify(mockRunnerBuilder).p2pAdvertisedHost(eq("127.0.0.1"));
     verify(mockRunnerBuilder).p2pListenPort(eq(30303));
-    verify(mockRunnerBuilder).maxPeers(eq(25));
-    verify(mockRunnerBuilder).fractionRemoteConnectionsAllowed(eq(0.6f));
     verify(mockRunnerBuilder).jsonRpcConfiguration(eq(DEFAULT_JSON_RPC_CONFIGURATION));
     verify(mockRunnerBuilder).graphQLConfiguration(eq(DEFAULT_GRAPH_QL_CONFIGURATION));
     verify(mockRunnerBuilder).webSocketConfiguration(eq(DEFAULT_WEB_SOCKET_CONFIGURATION));
     verify(mockRunnerBuilder).metricsConfiguration(eq(DEFAULT_METRICS_CONFIGURATION));
     verify(mockRunnerBuilder).ethNetworkConfig(ethNetworkArg.capture());
     verify(mockRunnerBuilder).autoLogBloomCaching(eq(true));
+    verify(mockRunnerBuilder).rpcMaxLogsRange(eq(5000L));
     verify(mockRunnerBuilder).build();
 
-    verify(mockControllerBuilderFactory).fromEthNetworkConfig(ethNetworkArg.capture(), any());
+    verify(mockControllerBuilderFactory)
+        .fromEthNetworkConfig(ethNetworkArg.capture(), any(), any());
     final ArgumentCaptor<MiningParameters> miningArg =
         ArgumentCaptor.forClass(MiningParameters.class);
     verify(mockControllerBuilder).synchronizerConfiguration(syncConfigurationCaptor.capture());
@@ -206,11 +267,14 @@ public void callingBesuCommandWithoutOptionsMustSyncWithDefaultValues() throws E
     verify(mockControllerBuilder).nodeKey(isNotNull());
     verify(mockControllerBuilder).storageProvider(storageProviderArgumentCaptor.capture());
     verify(mockControllerBuilder).gasLimitCalculator(eq(GasLimitCalculator.constant()));
+    verify(mockControllerBuilder).maxPeers(eq(maxPeers));
+    verify(mockControllerBuilder).lowerBoundPeers(eq(maxPeers));
+    verify(mockControllerBuilder).maxRemotelyInitiatedPeers(eq((int) Math.floor(0.6 * maxPeers)));
     verify(mockControllerBuilder).build();
 
     assertThat(storageProviderArgumentCaptor.getValue()).isNotNull();
     assertThat(syncConfigurationCaptor.getValue().getSyncMode()).isEqualTo(SyncMode.FAST);
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
     assertThat(miningArg.getValue().getCoinbase()).isEqualTo(Optional.empty());
     assertThat(miningArg.getValue().getMinTransactionGasPrice()).isEqualTo(Wei.of(1000));
     assertThat(miningArg.getValue().getExtraData()).isEqualTo(Bytes.EMPTY);
@@ -225,8 +289,8 @@ public void callingWithConfigOptionButNoConfigFileShouldDisplayHelp() {
 
     final String expectedOutputStart =
         "Missing required parameter for option '--config-file' (<FILE>)";
-    assertThat(commandErrorOutput.toString()).startsWith(expectedOutputStart);
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).startsWith(expectedOutputStart);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -236,8 +300,8 @@ public void callingWithConfigOptionButNonExistingFileShouldDisplayHelp() throws
 
     final String expectedOutputStart =
         "Unable to read TOML configuration file " + tempConfigFilePath;
-    assertThat(commandErrorOutput.toString()).startsWith(expectedOutputStart);
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).startsWith(expectedOutputStart);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -245,8 +309,8 @@ public void callingWithConfigOptionButTomlFileNotFoundShouldDisplayHelp() {
     parseCommand("--config-file", "./an-invalid-file-name-sdsd87sjhqoi34io23.toml");
 
     final String expectedOutputStart = "Unable to read TOML configuration, file not found.";
-    assertThat(commandErrorOutput.toString()).startsWith(expectedOutputStart);
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).startsWith(expectedOutputStart);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -260,8 +324,8 @@ public void callingWithConfigOptionButInvalidContentTomlFileShouldDisplayHelp()
     final String expectedOutputStart =
         "Invalid TOML configuration: org.apache.tuweni.toml.TomlParseError: Unexpected '.', expected a-z, A-Z, 0-9, ', \", a table key, "
             + "a newline, or end-of-input (line 1, column 1)";
-    assertThat(commandErrorOutput.toString()).startsWith(expectedOutputStart);
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).startsWith(expectedOutputStart);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -274,8 +338,8 @@ public void callingWithNoBootnodesConfig() throws Exception {
     verify(mockRunnerBuilder).ethNetworkConfig(ethNetworkConfigArgumentCaptor.capture());
     assertThat(ethNetworkConfigArgumentCaptor.getValue().getBootNodes()).isEmpty();
 
-    assertThat(commandErrorOutput.toString()).isEmpty();
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -288,8 +352,8 @@ public void callingWithConfigOptionButInvalidValueTomlFileShouldDisplayHelp() th
     final String expectedOutputStart =
         "Invalid TOML configuration: org.apache.tuweni.toml.TomlParseError: Unexpected '=', expected ', \", ''', \"\"\", a number, "
             + "a boolean, a date/time, an array, or a table (line 1, column 8)";
-    assertThat(commandErrorOutput.toString()).startsWith(expectedOutputStart);
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).startsWith(expectedOutputStart);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -306,7 +370,7 @@ public void overrideDefaultValuesIfKeyIsPresentInConfigFile() throws IOException
 
     final Path toml = createTempFile("toml", updatedConfig.getBytes(UTF_8));
 
-    final List<RpcApi> expectedApis = asList(ETH, WEB3);
+    final List<String> expectedApis = asList(ETH.name(), WEB3.name());
 
     final JsonRpcConfiguration jsonRpcConfiguration = JsonRpcConfiguration.createDefault();
     jsonRpcConfiguration.setEnabled(false);
@@ -314,6 +378,7 @@ public void overrideDefaultValuesIfKeyIsPresentInConfigFile() throws IOException
     jsonRpcConfiguration.setPort(5678);
     jsonRpcConfiguration.setCorsAllowedDomains(Collections.emptyList());
     jsonRpcConfiguration.setRpcApis(expectedApis);
+    jsonRpcConfiguration.setMaxActiveConnections(1000);
 
     final GraphQLConfiguration graphQLConfiguration = GraphQLConfiguration.createDefault();
     graphQLConfiguration.setEnabled(false);
@@ -335,7 +400,6 @@ public void overrideDefaultValuesIfKeyIsPresentInConfigFile() throws IOException
     verify(mockRunnerBuilder).ethNetworkConfig(ethNetworkConfigArgumentCaptor.capture());
     verify(mockRunnerBuilder).p2pAdvertisedHost(eq("1.2.3.4"));
     verify(mockRunnerBuilder).p2pListenPort(eq(1234));
-    verify(mockRunnerBuilder).maxPeers(eq(42));
     verify(mockRunnerBuilder).jsonRpcConfiguration(eq(jsonRpcConfiguration));
     verify(mockRunnerBuilder).graphQLConfiguration(eq(graphQLConfiguration));
     verify(mockRunnerBuilder).webSocketConfiguration(eq(webSocketConfiguration));
@@ -344,9 +408,9 @@ public void overrideDefaultValuesIfKeyIsPresentInConfigFile() throws IOException
 
     final List<EnodeURL> nodes =
         asList(
-            EnodeURL.fromString("enode://" + VALID_NODE_ID + "@192.168.0.1:4567"),
-            EnodeURL.fromString("enode://" + VALID_NODE_ID + "@192.168.0.1:4567"),
-            EnodeURL.fromString("enode://" + VALID_NODE_ID + "@192.168.0.1:4567"));
+            EnodeURLImpl.fromString("enode://" + VALID_NODE_ID + "@192.168.0.1:4567"),
+            EnodeURLImpl.fromString("enode://" + VALID_NODE_ID + "@192.168.0.1:4567"),
+            EnodeURLImpl.fromString("enode://" + VALID_NODE_ID + "@192.168.0.1:4567"));
     assertThat(ethNetworkConfigArgumentCaptor.getValue().getBootNodes()).isEqualTo(nodes);
 
     final EthNetworkConfig networkConfig =
@@ -357,36 +421,36 @@ public void overrideDefaultValuesIfKeyIsPresentInConfigFile() throws IOException
             .setDnsDiscoveryUrl(null)
             .build();
     verify(mockControllerBuilder).dataDirectory(eq(dataFolder.toPath()));
-    verify(mockControllerBuilderFactory).fromEthNetworkConfig(eq(networkConfig), any());
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(eq(networkConfig), any(), any());
     verify(mockControllerBuilder).synchronizerConfiguration(syncConfigurationCaptor.capture());
 
     assertThat(syncConfigurationCaptor.getValue().getSyncMode()).isEqualTo(SyncMode.FAST);
     assertThat(syncConfigurationCaptor.getValue().getFastSyncMinimumPeerCount()).isEqualTo(13);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void nodePermissionsSmartContractWithoutOptionMustError() {
     parseCommand("--permissions-nodes-contract-address");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandErrorOutput.toString(UTF_8))
         .startsWith("Missing required parameter for option '--permissions-nodes-contract-address'");
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void nodePermissionsEnabledWithoutContractAddressMustError() {
     parseCommand("--permissions-nodes-contract-enabled");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("No node permissioning contract address specified");
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -396,10 +460,10 @@ public void nodePermissionsEnabledWithInvalidContractAddressMustError() {
         "--permissions-nodes-contract-address",
         "invalid-smart-contract-address");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandErrorOutput.toString()).contains("Invalid value");
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).contains("Invalid value");
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -407,10 +471,10 @@ public void nodePermissionsEnabledWithTooShortContractAddressMustError() {
     parseCommand(
         "--permissions-nodes-contract-enabled", "--permissions-nodes-contract-address", "0x1234");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandErrorOutput.toString()).contains("Invalid value");
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).contains("Invalid value");
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -432,12 +496,14 @@ public void nodePermissionsSmartContractMustUseOption() {
         .permissioningConfiguration(permissioningConfigurationArgumentCaptor.capture());
     verify(mockRunnerBuilder).build();
 
-    final PermissioningConfiguration config = permissioningConfigurationArgumentCaptor.getValue();
+    final PermissioningConfiguration config =
+        permissioningConfigurationArgumentCaptor.getValue().get();
     assertThat(config.getSmartContractConfig().get())
-        .isEqualToComparingFieldByField(smartContractPermissioningConfiguration);
+        .usingRecursiveComparison()
+        .isEqualTo(smartContractPermissioningConfiguration);
 
-    assertThat(commandErrorOutput.toString()).isEmpty();
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -458,12 +524,14 @@ public void nodePermissionsContractVersionDefaultValue() {
         .permissioningConfiguration(permissioningConfigurationArgumentCaptor.capture());
     verify(mockRunnerBuilder).build();
 
-    final PermissioningConfiguration config = permissioningConfigurationArgumentCaptor.getValue();
+    final PermissioningConfiguration config =
+        permissioningConfigurationArgumentCaptor.getValue().get();
     assertThat(config.getSmartContractConfig().get())
-        .isEqualToComparingFieldByField(expectedConfig);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedConfig);
 
-    assertThat(commandErrorOutput.toString()).isEmpty();
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -486,35 +554,37 @@ public void nodePermissionsContractVersionSetsValue() {
         .permissioningConfiguration(permissioningConfigurationArgumentCaptor.capture());
     verify(mockRunnerBuilder).build();
 
-    final PermissioningConfiguration config = permissioningConfigurationArgumentCaptor.getValue();
+    final PermissioningConfiguration config =
+        permissioningConfigurationArgumentCaptor.getValue().get();
     assertThat(config.getSmartContractConfig().get())
-        .isEqualToComparingFieldByField(expectedConfig);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedConfig);
 
-    assertThat(commandErrorOutput.toString()).isEmpty();
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void accountPermissionsSmartContractWithoutOptionMustError() {
     parseCommand("--permissions-accounts-contract-address");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandErrorOutput.toString(UTF_8))
         .startsWith(
             "Missing required parameter for option '--permissions-accounts-contract-address'");
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void accountPermissionsEnabledWithoutContractAddressMustError() {
     parseCommand("--permissions-accounts-contract-enabled");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("No account permissioning contract address specified");
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -524,10 +594,10 @@ public void accountPermissionsEnabledWithInvalidContractAddressMustError() {
         "--permissions-accounts-contract-address",
         "invalid-smart-contract-address");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandErrorOutput.toString()).contains("Invalid value");
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).contains("Invalid value");
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -537,10 +607,10 @@ public void accountPermissionsEnabledWithTooShortContractAddressMustError() {
         "--permissions-accounts-contract-address",
         "0x1234");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandErrorOutput.toString()).contains("Invalid value");
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).contains("Invalid value");
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -560,7 +630,7 @@ public void accountPermissionsSmartContractMustUseOption() {
     verify(mockRunnerBuilder)
         .permissioningConfiguration(permissioningConfigurationArgumentCaptor.capture());
     final PermissioningConfiguration permissioningConfiguration =
-        permissioningConfigurationArgumentCaptor.getValue();
+        permissioningConfigurationArgumentCaptor.getValue().get();
     assertThat(permissioningConfiguration.getSmartContractConfig()).isPresent();
 
     final SmartContractPermissioningConfiguration effectiveSmartContractConfig =
@@ -569,30 +639,30 @@ public void accountPermissionsSmartContractMustUseOption() {
     assertThat(effectiveSmartContractConfig.getAccountSmartContractAddress())
         .isEqualTo(Address.fromHexString(smartContractAddress));
 
-    assertThat(commandErrorOutput.toString()).isEmpty();
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void nodePermissioningTomlPathWithoutOptionMustDisplayUsage() {
     parseCommand("--permissions-nodes-config-file");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandErrorOutput.toString(UTF_8))
         .startsWith("Missing required parameter for option '--permissions-nodes-config-file'");
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void accountPermissioningTomlPathWithoutOptionMustDisplayUsage() {
     parseCommand("--permissions-accounts-config-file");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandErrorOutput.toString(UTF_8))
         .startsWith("Missing required parameter for option '--permissions-accounts-config-file'");
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -602,10 +672,10 @@ public void nodePermissioningEnabledWithNonexistentConfigFileMustError() {
         "--permissions-nodes-config-file",
         "file-does-not-exist");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandErrorOutput.toString()).contains("Configuration file does not exist");
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).contains("Configuration file does not exist");
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -615,10 +685,10 @@ public void accountPermissioningEnabledWithNonexistentConfigFileMustError() {
         "--permissions-accounts-config-file",
         "file-does-not-exist");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandErrorOutput.toString()).contains("Configuration file does not exist");
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).contains("Configuration file does not exist");
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -630,8 +700,8 @@ public void nodePermissioningTomlFileWithNoPermissionsEnabledMustNotError() thro
 
     verify(mockRunnerBuilder).build();
 
-    assertThat(commandErrorOutput.toString()).isEmpty();
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -644,8 +714,8 @@ public void accountPermissioningTomlFileWithNoPermissionsEnabledMustNotError()
 
     verify(mockRunnerBuilder).build();
 
-    assertThat(commandErrorOutput.toString()).isEmpty();
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -654,17 +724,17 @@ public void defaultPermissionsTomlFileWithNoPermissionsEnabledMustNotError() {
 
     verify(mockRunnerBuilder).build();
 
-    assertThat(commandErrorOutput.toString()).doesNotContain("no permissions enabled");
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).doesNotContain("no permissions enabled");
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void nodePermissioningTomlPathMustUseOption() throws IOException {
     final List<EnodeURL> allowedNodes =
         Lists.newArrayList(
-            EnodeURL.fromString(
+            EnodeURLImpl.fromString(
                 "enode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@192.168.0.9:4567"),
-            EnodeURL.fromString(
+            EnodeURLImpl.fromString(
                 "enode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@192.169.0.9:4568"));
 
     final URL configFile = this.getClass().getResource(PERMISSIONING_CONFIG_TOML);
@@ -687,12 +757,14 @@ public void nodePermissioningTomlPathMustUseOption() throws IOException {
         .permissioningConfiguration(permissioningConfigurationArgumentCaptor.capture());
     verify(mockRunnerBuilder).build();
 
-    final PermissioningConfiguration config = permissioningConfigurationArgumentCaptor.getValue();
+    final PermissioningConfiguration config =
+        permissioningConfigurationArgumentCaptor.getValue().get();
     assertThat(config.getLocalConfig().get())
-        .isEqualToComparingFieldByField(localPermissioningConfiguration);
+        .usingRecursiveComparison()
+        .isEqualTo(localPermissioningConfiguration);
 
-    assertThat(commandErrorOutput.toString()).isEmpty();
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -714,7 +786,7 @@ public void accountPermissioningTomlPathMustUseOption() throws IOException {
     verify(mockRunnerBuilder)
         .permissioningConfiguration(permissioningConfigurationArgumentCaptor.capture());
     final PermissioningConfiguration permissioningConfiguration =
-        permissioningConfigurationArgumentCaptor.getValue();
+        permissioningConfigurationArgumentCaptor.getValue().get();
     assertThat(permissioningConfiguration.getLocalConfig()).isPresent();
 
     final LocalPermissioningConfiguration effectiveLocalPermissioningConfig =
@@ -723,8 +795,8 @@ public void accountPermissioningTomlPathMustUseOption() throws IOException {
     assertThat(effectiveLocalPermissioningConfig.getAccountPermissioningConfigFilePath())
         .isEqualTo(permToml.toString());
 
-    assertThat(commandErrorOutput.toString()).isEmpty();
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -757,6 +829,8 @@ public void tomlThatConfiguresEverythingExceptPermissioningToml() throws IOExcep
         tomlResult.getArray(tomlKey);
       } else if (optionSpec.type().equals(Double.class)) {
         tomlResult.getDouble(tomlKey);
+      } else if (optionSpec.type().equals(Float.class)) {
+        tomlResult.getDouble(tomlKey);
       } else if (Number.class.isAssignableFrom(optionSpec.type())) {
         tomlResult.getLong(tomlKey);
       } else if (Wei.class.isAssignableFrom(optionSpec.type())) {
@@ -778,7 +852,7 @@ public void tomlThatConfiguresEverythingExceptPermissioningToml() throws IOExcep
   }
 
   @Test
-  public void noOverrideDefaultValuesIfKeyIsNotPresentInConfigFile() throws IOException {
+  public void noOverrideDefaultValuesIfKeyIsNotPresentInConfigFile() {
     final String configFile = this.getClass().getResource("/partial_config.toml").getFile();
 
     parseCommand("--config-file", configFile);
@@ -795,14 +869,11 @@ public void noOverrideDefaultValuesIfKeyIsNotPresentInConfigFile() throws IOExce
         .ethNetworkConfig(
             new EthNetworkConfig(
                 EthNetworkConfig.jsonConfig(MAINNET),
-                EthNetworkConfig.MAINNET_NETWORK_ID,
+                MAINNET.getNetworkId(),
                 MAINNET_BOOTSTRAP_NODES,
                 MAINNET_DISCOVERY_URL));
     verify(mockRunnerBuilder).p2pAdvertisedHost(eq("127.0.0.1"));
     verify(mockRunnerBuilder).p2pListenPort(eq(30303));
-    verify(mockRunnerBuilder).maxPeers(eq(25));
-    verify(mockRunnerBuilder).limitRemoteWireConnectionsEnabled(eq(true));
-    verify(mockRunnerBuilder).fractionRemoteConnectionsAllowed(eq(0.6f));
     verify(mockRunnerBuilder).jsonRpcConfiguration(eq(jsonRpcConfiguration));
     verify(mockRunnerBuilder).graphQLConfiguration(eq(graphQLConfiguration));
     verify(mockRunnerBuilder).webSocketConfiguration(eq(webSocketConfiguration));
@@ -815,10 +886,10 @@ public void noOverrideDefaultValuesIfKeyIsNotPresentInConfigFile() throws IOExce
     assertThat(syncConfig.getSyncMode()).isEqualTo(SyncMode.FAST);
     assertThat(syncConfig.getFastSyncMinimumPeerCount()).isEqualTo(5);
 
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -830,11 +901,12 @@ public void envVariableOverridesValueFromConfigFile() {
 
     verify(mockControllerBuilder)
         .miningParameters(
-            new MiningParameters(
-                Address.fromHexString(expectedCoinbase),
-                DefaultCommandValues.DEFAULT_MIN_TRANSACTION_GAS_PRICE,
-                DefaultCommandValues.DEFAULT_EXTRA_DATA,
-                false));
+            new MiningParameters.Builder()
+                .coinbase(Address.fromHexString(expectedCoinbase))
+                .minTransactionGasPrice(DefaultCommandValues.DEFAULT_MIN_TRANSACTION_GAS_PRICE)
+                .extraData(DefaultCommandValues.DEFAULT_EXTRA_DATA)
+                .miningEnabled(false)
+                .build());
   }
 
   @Test
@@ -846,11 +918,12 @@ public void cliOptionOverridesEnvVariableAndConfig() {
 
     verify(mockControllerBuilder)
         .miningParameters(
-            new MiningParameters(
-                Address.fromHexString(expectedCoinbase),
-                DefaultCommandValues.DEFAULT_MIN_TRANSACTION_GAS_PRICE,
-                DefaultCommandValues.DEFAULT_EXTRA_DATA,
-                false));
+            new MiningParameters.Builder()
+                .coinbase(Address.fromHexString(expectedCoinbase))
+                .minTransactionGasPrice(DefaultCommandValues.DEFAULT_MIN_TRANSACTION_GAS_PRICE)
+                .extraData(DefaultCommandValues.DEFAULT_EXTRA_DATA)
+                .miningEnabled(false)
+                .build());
   }
 
   @Test
@@ -863,12 +936,12 @@ public void nodekeyOptionMustBeUsed() throws Exception {
     verify(mockControllerBuilder).nodeKey(isNotNull());
     verify(mockControllerBuilder).build();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
-  public void dataDirOptionMustBeUsed() throws Exception {
+  public void dataDirOptionMustBeUsed() {
     final Path path = Paths.get(".");
 
     parseCommand("--data-path", path.toString());
@@ -879,8 +952,8 @@ public void dataDirOptionMustBeUsed() throws Exception {
 
     assertThat(pathArgumentCaptor.getValue()).isEqualByComparingTo(path.toAbsolutePath());
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -891,14 +964,14 @@ public void genesisPathOptionMustBeUsed() throws Exception {
 
     parseCommand("--genesis-file", genesisFile.toString());
 
-    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any());
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
     verify(mockControllerBuilder).build();
 
     assertThat(networkArg.getValue().getGenesisConfig())
         .isEqualTo(encodeJsonGenesis(GENESIS_VALID_JSON));
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -910,10 +983,10 @@ public void testGenesisPathEthOptions() throws Exception {
 
     parseCommand("--genesis-file", genesisFile.toString());
 
-    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any());
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
     verify(mockControllerBuilder).build();
 
-    EthNetworkConfig config = networkArg.getValue();
+    final EthNetworkConfig config = networkArg.getValue();
     assertThat(config.getBootNodes()).isEmpty();
     assertThat(config.getDnsDiscoveryUrl()).isNull();
     assertThat(config.getNetworkId()).isEqualTo(BigInteger.valueOf(3141592));
@@ -926,60 +999,128 @@ public void testGenesisPathMainnetEthConfig() throws Exception {
 
     parseCommand("--network", "mainnet");
 
-    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any());
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
     verify(mockControllerBuilder).build();
 
-    EthNetworkConfig config = networkArg.getValue();
+    final EthNetworkConfig config = networkArg.getValue();
     assertThat(config.getBootNodes()).isEqualTo(MAINNET_BOOTSTRAP_NODES);
     assertThat(config.getDnsDiscoveryUrl()).isEqualTo(MAINNET_DISCOVERY_URL);
     assertThat(config.getNetworkId()).isEqualTo(BigInteger.valueOf(1));
+
+    verify(mockLogger, never()).warn(contains("Mainnet is deprecated and will be shutdown"));
   }
 
   @Test
-  public void testGenesisPathGoerliEthConfig() throws Exception {
+  public void testGenesisPathGoerliEthConfig() {
     final ArgumentCaptor<EthNetworkConfig> networkArg =
         ArgumentCaptor.forClass(EthNetworkConfig.class);
 
     parseCommand("--network", "goerli");
 
-    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any());
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
     verify(mockControllerBuilder).build();
 
-    EthNetworkConfig config = networkArg.getValue();
+    final EthNetworkConfig config = networkArg.getValue();
     assertThat(config.getBootNodes()).isEqualTo(GOERLI_BOOTSTRAP_NODES);
     assertThat(config.getDnsDiscoveryUrl()).isEqualTo(GOERLI_DISCOVERY_URL);
     assertThat(config.getNetworkId()).isEqualTo(BigInteger.valueOf(5));
   }
 
   @Test
-  public void testGenesisPathRinkebyEthConfig() throws Exception {
+  public void testGenesisPathFutureEipsEthConfig() {
+    final ArgumentCaptor<EthNetworkConfig> networkArg =
+        ArgumentCaptor.forClass(EthNetworkConfig.class);
+
+    parseCommand("--network", "future_eips");
+
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
+    verify(mockControllerBuilder).build();
+
+    final EthNetworkConfig config = networkArg.getValue();
+    assertThat(config.getBootNodes()).isEmpty();
+    assertThat(config.getDnsDiscoveryUrl()).isNull();
+    assertThat(config.getNetworkId()).isEqualTo(BigInteger.valueOf(2022));
+  }
+
+  @Test
+  public void testGenesisPathExperimentalEipsEthConfig() {
     final ArgumentCaptor<EthNetworkConfig> networkArg =
         ArgumentCaptor.forClass(EthNetworkConfig.class);
 
-    parseCommand("--network", "rinkeby");
+    parseCommand("--network", "experimental_eips");
 
-    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any());
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
     verify(mockControllerBuilder).build();
 
-    EthNetworkConfig config = networkArg.getValue();
-    assertThat(config.getBootNodes()).isEqualTo(RINKEBY_BOOTSTRAP_NODES);
-    assertThat(config.getDnsDiscoveryUrl()).isEqualTo(RINKEBY_DISCOVERY_URL);
-    assertThat(config.getNetworkId()).isEqualTo(BigInteger.valueOf(4));
+    final EthNetworkConfig config = networkArg.getValue();
+    assertThat(config.getBootNodes()).isEmpty();
+    assertThat(config.getDnsDiscoveryUrl()).isNull();
+    assertThat(config.getNetworkId()).isEqualTo(BigInteger.valueOf(2023));
   }
 
   @Test
   public void genesisAndNetworkMustNotBeUsedTogether() throws Exception {
     final Path genesisFile = createFakeGenesisFile(GENESIS_VALID_JSON);
 
-    parseCommand("--genesis-file", genesisFile.toString(), "--network", "rinkeby");
+    parseCommand("--genesis-file", genesisFile.toString(), "--network", "mainnet");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .startsWith("--network option and --genesis-file option can't be used at the same time.");
   }
 
+  @Test
+  public void nonExistentGenesisGivesError() throws Exception {
+    final String nonExistentGenesis = "non-existent-genesis.json";
+    parseCommand("--genesis-file", nonExistentGenesis);
+
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).startsWith("Unable to load genesis file");
+    assertThat(commandErrorOutput.toString(UTF_8)).contains(nonExistentGenesis);
+  }
+
+  @Test
+  public void testDnsDiscoveryUrlEthConfig() throws Exception {
+    final ArgumentCaptor<EthNetworkConfig> networkArg =
+        ArgumentCaptor.forClass(EthNetworkConfig.class);
+
+    parseCommand(
+        "--discovery-dns-url",
+        "enrtree://AM5FCQLWIZX2QFPNJAP7VUERCCRNGRHWZG3YYHIUV7BVDQ5FDPRT2@nodes.example.org");
+
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
+    verify(mockControllerBuilder).build();
+
+    final EthNetworkConfig config = networkArg.getValue();
+    assertThat(config.getDnsDiscoveryUrl())
+        .isEqualTo(
+            "enrtree://AM5FCQLWIZX2QFPNJAP7VUERCCRNGRHWZG3YYHIUV7BVDQ5FDPRT2@nodes.example.org");
+  }
+
+  @Test
+  public void testDnsDiscoveryUrlOverridesNetworkEthConfig() throws Exception {
+    final ArgumentCaptor<EthNetworkConfig> networkArg =
+        ArgumentCaptor.forClass(EthNetworkConfig.class);
+
+    parseCommand(
+        "--network",
+        "dev",
+        "--discovery-dns-url",
+        "enrtree://AM5FCQLWIZX2QFPNJAP7VUERCCRNGRHWZG3YYHIUV7BVDQ5FDPRT2@nodes.example.org");
+
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
+    verify(mockControllerBuilder).build();
+
+    final EthNetworkConfig config = networkArg.getValue();
+    assertThat(config.getDnsDiscoveryUrl())
+        .isEqualTo(
+            "enrtree://AM5FCQLWIZX2QFPNJAP7VUERCCRNGRHWZG3YYHIUV7BVDQ5FDPRT2@nodes.example.org");
+  }
+
   @Test
   public void defaultNetworkIdAndBootnodesForCustomNetworkOptions() throws Exception {
     final Path genesisFile = createFakeGenesisFile(GENESIS_VALID_JSON);
@@ -989,7 +1130,7 @@ public void defaultNetworkIdAndBootnodesForCustomNetworkOptions() throws Excepti
     final ArgumentCaptor<EthNetworkConfig> networkArg =
         ArgumentCaptor.forClass(EthNetworkConfig.class);
 
-    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any());
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
     verify(mockControllerBuilder).build();
 
     assertThat(networkArg.getValue().getGenesisConfig())
@@ -997,8 +1138,8 @@ public void defaultNetworkIdAndBootnodesForCustomNetworkOptions() throws Excepti
     assertThat(networkArg.getValue().getBootNodes()).isEmpty();
     assertThat(networkArg.getValue().getNetworkId()).isEqualTo(GENESIS_CONFIG_TEST_CHAINID);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1010,7 +1151,7 @@ public void defaultNetworkIdForInvalidGenesisMustBeMainnetNetworkId() throws Exc
     final ArgumentCaptor<EthNetworkConfig> networkArg =
         ArgumentCaptor.forClass(EthNetworkConfig.class);
 
-    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any());
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
     verify(mockControllerBuilder).build();
 
     assertThat(networkArg.getValue().getGenesisConfig())
@@ -1019,8 +1160,8 @@ public void defaultNetworkIdForInvalidGenesisMustBeMainnetNetworkId() throws Exc
     //    assertThat(networkArg.getValue().getNetworkId())
     //        .isEqualTo(EthNetworkConfig.getNetworkConfig(MAINNET).getNetworkId());
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1041,30 +1182,33 @@ public void predefinedNetworkIdsMustBeEqualToChainIds() {
   public void identityValueTrueMustBeUsed() {
     parseCommand("--identity", "test");
 
-    verify(mockRunnerBuilder.identityString(eq(Optional.of("test")))).build();
+    verify(mockRunnerBuilder).identityString(eq(Optional.of("test")));
+    verify(mockRunnerBuilder).build();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void p2pEnabledOptionValueTrueMustBeUsed() {
     parseCommand("--p2p-enabled", "true");
 
-    verify(mockRunnerBuilder.p2pEnabled(eq(true))).build();
+    verify(mockRunnerBuilder).p2pEnabled(eq(true));
+    verify(mockRunnerBuilder).build();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void p2pEnabledOptionValueFalseMustBeUsed() {
     parseCommand("--p2p-enabled", "false");
 
-    verify(mockRunnerBuilder.p2pEnabled(eq(false))).build();
+    verify(mockRunnerBuilder).p2pEnabled(eq(false));
+    verify(mockRunnerBuilder).build();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1077,7 +1221,7 @@ public void p2pOptionsRequiresServiceToBeEnabled() {
         "--p2p-enabled",
         "false",
         "--bootnodes",
-        String.join(",", validENodeStrings),
+        String.join(",", VALID_ENODE_STRINGS),
         "--discovery-enabled",
         "false",
         "--max-peers",
@@ -1097,28 +1241,125 @@ public void p2pOptionsRequiresServiceToBeEnabled() {
         "--banned-node-ids",
         "--remote-connections-max-percentage");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void p2pOptionsRequiresServiceToBeEnabledToml() throws IOException {
+    final String[] nodes = {
+      "6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0"
+    };
+
+    final Path toml =
+        createTempFile(
+            "toml",
+            "p2p-enabled=false\n"
+                + "bootnodes=[\""
+                + String.join("\",\"", VALID_ENODE_STRINGS)
+                + "\"]\n"
+                + "discovery-enabled=false\n"
+                + "max-peers=42\n"
+                + "remote-connections-max-percentage=50\n"
+                + "banned-node-id=[\""
+                + String.join(",", nodes)
+                + "\"]\n"
+                + "banned-node-ids=[\""
+                + String.join(",", nodes)
+                + "\"]\n");
+
+    parseCommand("--config-file", toml.toString());
+
+    verifyOptionsConstraintLoggerCall(
+        "--p2p-enabled",
+        "--discovery-enabled",
+        "--bootnodes",
+        "--max-peers",
+        "--banned-node-ids",
+        "--remote-connections-max-percentage");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void discoveryOptionValueTrueMustBeUsed() {
     parseCommand("--discovery-enabled", "true");
 
-    verify(mockRunnerBuilder.discovery(eq(true))).build();
+    verify(mockRunnerBuilder).discovery(eq(true));
+    verify(mockRunnerBuilder).build();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void discoveryOptionValueFalseMustBeUsed() {
     parseCommand("--discovery-enabled", "false");
 
-    verify(mockRunnerBuilder.discovery(eq(false))).build();
+    verify(mockRunnerBuilder).discovery(eq(false));
+    verify(mockRunnerBuilder).build();
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void loadDiscoveryOptionsFromGenesisFile() throws IOException {
+    final Path genesisFile = createFakeGenesisFile(VALID_GENESIS_WITH_DISCOVERY_OPTIONS);
+    parseCommand("--genesis-file", genesisFile.toString());
+
+    final ArgumentCaptor<EthNetworkConfig> networkArg =
+        ArgumentCaptor.forClass(EthNetworkConfig.class);
+
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
+    verify(mockControllerBuilder).build();
+
+    final EthNetworkConfig config = networkArg.getValue();
+    assertThat(config.getDnsDiscoveryUrl()).isEqualTo(DNS_DISCOVERY_URL);
+
+    assertThat(config.getBootNodes())
+        .extracting(bootnode -> bootnode.toURI().toString())
+        .containsExactly(VALID_ENODE_STRINGS);
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void discoveryDnsUrlCliArgTakesPrecedenceOverGenesisFile() throws IOException {
+    final Path genesisFile = createFakeGenesisFile(VALID_GENESIS_WITH_DISCOVERY_OPTIONS);
+    final String discoveryDnsUrlCliArg =
+        "enrtree://XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX@nodes.example.org";
+    parseCommand(
+        "--genesis-file", genesisFile.toString(), "--discovery-dns-url", discoveryDnsUrlCliArg);
+
+    final ArgumentCaptor<EthNetworkConfig> networkArg =
+        ArgumentCaptor.forClass(EthNetworkConfig.class);
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
+    verify(mockControllerBuilder).build();
+
+    final EthNetworkConfig config = networkArg.getValue();
+    assertThat(config.getDnsDiscoveryUrl()).isEqualTo(discoveryDnsUrlCliArg);
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void bootnodesUrlCliArgTakesPrecedenceOverGenesisFile() throws IOException {
+    final Path genesisFile = createFakeGenesisFile(VALID_GENESIS_WITH_DISCOVERY_OPTIONS);
+    final URI bootnode =
+        URI.create(
+            "enode://d2567893371ea5a6fa6371d483891ed0d129e79a8fc74d6df95a00a6545444cd4a6960bbffe0b4e2edcf35135271de57ee559c0909236bbc2074346ef2b5b47c@127.0.0.1:30304");
+
+    parseCommand("--genesis-file", genesisFile.toString(), "--bootnodes", bootnode.toString());
+
+    final ArgumentCaptor<EthNetworkConfig> networkArg =
+        ArgumentCaptor.forClass(EthNetworkConfig.class);
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
+    verify(mockControllerBuilder).build();
+
+    final EthNetworkConfig config = networkArg.getValue();
+    assertThat(config.getBootNodes()).extracting(EnodeURL::toURI).containsExactly(bootnode);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1130,8 +1371,8 @@ public void callingWithBootnodesOptionButNoValueMustPassEmptyBootnodeList() {
 
     assertThat(ethNetworkConfigArgumentCaptor.getValue().getBootNodes()).isEmpty();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1139,18 +1380,31 @@ public void callingWithValidBootnodeMustSucceed() {
     parseCommand(
         "--bootnodes",
         "enode://d2567893371ea5a6fa6371d483891ed0d129e79a8fc74d6df95a00a6545444cd4a6960bbffe0b4e2edcf35135271de57ee559c0909236bbc2074346ef2b5b47c@127.0.0.1:30304");
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void callingWithValidBootnodeButDiscoveryDisabledMustDisplayWarning() {
+    parseCommand(
+        "--bootnodes",
+        "enode://d2567893371ea5a6fa6371d483891ed0d129e79a8fc74d6df95a00a6545444cd4a6960bbffe0b4e2edcf35135271de57ee559c0909236bbc2074346ef2b5b47c@127.0.0.1:30304",
+        "--discovery-enabled",
+        "false");
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    verify(mockRunnerBuilder).build();
+    verify(mockLogger, atLeast(1)).warn("Discovery disabled: bootnodes will be ignored.");
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void callingWithInvalidBootnodeMustDisplayError() {
     parseCommand("--bootnodes", "invalid_enode_url");
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
     final String expectedErrorOutputStart =
-        "Invalid enode URL syntax. Enode URL should have the following format "
+        "Invalid enode URL syntax 'invalid_enode_url'. Enode URL should have the following format "
             + "'enode://<node_id>@<ip>:<listening_port>[?discport=<discovery_port>]'.";
-    assertThat(commandErrorOutput.toString()).startsWith(expectedErrorOutputStart);
+    assertThat(commandErrorOutput.toString(UTF_8)).startsWith(expectedErrorOutputStart);
   }
 
   @Test
@@ -1161,36 +1415,38 @@ public void callingWithBootnodeThatHasDiscoveryDisabledMustDisplayError() {
         "enode://02567893371ea5a6fa6371d483891ed0d129e79a8fc74d6df95a00a6545444cd4a6960bbffe0b4e2edcf35135271de57ee559c0909236bbc2074346ef2b5b47c@127.0.0.1:30303?discport=0";
     final String bootnodesValue = validBootnode + "," + invalidBootnode;
     parseCommand("--bootnodes", bootnodesValue);
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
     final String expectedErrorOutputStart =
         "Bootnodes must have discovery enabled. Invalid bootnodes: " + invalidBootnode + ".";
-    assertThat(commandErrorOutput.toString()).startsWith(expectedErrorOutputStart);
+    assertThat(commandErrorOutput.toString(UTF_8)).startsWith(expectedErrorOutputStart);
   }
 
   // This test ensures non regression on https://pegasys1.atlassian.net/browse/PAN-2387
   @Test
   public void callingWithInvalidBootnodeAndEqualSignMustDisplayError() {
     parseCommand("--bootnodes=invalid_enode_url");
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
     final String expectedErrorOutputStart =
-        "Invalid enode URL syntax. Enode URL should have the following format "
+        "Invalid enode URL syntax 'invalid_enode_url'. Enode URL should have the following format "
             + "'enode://<node_id>@<ip>:<listening_port>[?discport=<discovery_port>]'.";
-    assertThat(commandErrorOutput.toString()).startsWith(expectedErrorOutputStart);
+    assertThat(commandErrorOutput.toString(UTF_8)).startsWith(expectedErrorOutputStart);
   }
 
   @Test
   public void bootnodesOptionMustBeUsed() {
-    parseCommand("--bootnodes", String.join(",", validENodeStrings));
+    parseCommand("--bootnodes", String.join(",", VALID_ENODE_STRINGS));
 
     verify(mockRunnerBuilder).ethNetworkConfig(ethNetworkConfigArgumentCaptor.capture());
     verify(mockRunnerBuilder).build();
 
     assertThat(ethNetworkConfigArgumentCaptor.getValue().getBootNodes())
         .isEqualTo(
-            Stream.of(validENodeStrings).map(EnodeURL::fromString).collect(Collectors.toList()));
+            Stream.of(VALID_ENODE_STRINGS)
+                .map(EnodeURLImpl::fromString)
+                .collect(Collectors.toList()));
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1213,26 +1469,26 @@ public void bannedNodeIdsOptionMustBeUsed() {
 
     assertThat(bytesCollectionCollector.getValue().toArray()).isEqualTo(nodes);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void callingWithBannedNodeidsOptionButNoValueMustDisplayError() {
     parseCommand("--banned-node-ids");
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
     final String expectedErrorOutputStart =
         "Missing required parameter for option '--banned-node-ids' at index 0 (<NODEID>)";
-    assertThat(commandErrorOutput.toString()).startsWith(expectedErrorOutputStart);
+    assertThat(commandErrorOutput.toString(UTF_8)).startsWith(expectedErrorOutputStart);
   }
 
   @Test
   public void callingWithBannedNodeidsOptionWithInvalidValuesMustDisplayError() {
     parseCommand("--banned-node-ids", "0x10,20,30");
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
     final String expectedErrorOutputStart =
         "Invalid ids supplied to '--banned-node-ids'. Expected 64 bytes in 0x10";
-    assertThat(commandErrorOutput.toString()).startsWith(expectedErrorOutputStart);
+    assertThat(commandErrorOutput.toString(UTF_8)).startsWith(expectedErrorOutputStart);
   }
 
   @Test
@@ -1249,8 +1505,8 @@ public void p2pHostAndPortOptionsAreRespected() {
     assertThat(stringArgumentCaptor.getValue()).isEqualTo(host);
     assertThat(intArgumentCaptor.getValue()).isEqualTo(port);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1259,8 +1515,8 @@ public void p2pInterfaceOptionIsRespected() {
     final String ip = "1.2.3.4";
     parseCommand("--p2p-interface", ip);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
 
     verify(mockRunnerBuilder).p2pListenInterface(stringArgumentCaptor.capture());
     verify(mockRunnerBuilder).build();
@@ -1279,8 +1535,8 @@ public void p2pHostMayBeLocalhost() {
 
     assertThat(stringArgumentCaptor.getValue()).isEqualTo(host);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1294,8 +1550,8 @@ public void p2pHostMayBeIPv6() {
 
     assertThat(stringArgumentCaptor.getValue()).isEqualTo(host);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1304,13 +1560,99 @@ public void maxpeersOptionMustBeUsed() {
     final int maxPeers = 123;
     parseCommand("--max-peers", String.valueOf(maxPeers));
 
-    verify(mockRunnerBuilder).maxPeers(intArgumentCaptor.capture());
+    verify(mockControllerBuilder).maxPeers(intArgumentCaptor.capture());
+    verify(mockControllerBuilder).build();
+
+    assertThat(intArgumentCaptor.getValue()).isEqualTo(maxPeers);
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void rpcMaxLogsRangeOptionMustBeUsed() {
+    final long rpcMaxLogsRange = 150L;
+    parseCommand("--rpc-max-logs-range", Long.toString(rpcMaxLogsRange));
+
+    verify(mockRunnerBuilder).rpcMaxLogsRange(longArgumentCaptor.capture());
+    verify(mockRunnerBuilder).build();
+
+    assertThat(longArgumentCaptor.getValue()).isEqualTo(rpcMaxLogsRange);
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void p2pPeerUpperBound_without_p2pPeerLowerBound_shouldSetLowerBoundEqualToUpperBound() {
+
+    final int maxPeers = 23;
+    parseCommand("--p2p-peer-upper-bound", String.valueOf(maxPeers));
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+
+    verify(mockControllerBuilder).maxPeers(intArgumentCaptor.capture());
+    assertThat(intArgumentCaptor.getValue()).isEqualTo(maxPeers);
+
+    verify(mockControllerBuilder).lowerBoundPeers(intArgumentCaptor.capture());
+    assertThat(intArgumentCaptor.getValue()).isEqualTo(maxPeers);
+
+    verify(mockRunnerBuilder).build();
+  }
+
+  @Test
+  public void rpcHttpMaxBatchSizeOptionMustBeUsed() {
+    final int rpcHttpMaxBatchSize = 1;
+    parseCommand("--rpc-http-max-batch-size", Integer.toString(rpcHttpMaxBatchSize));
+
+    verify(mockRunnerBuilder).jsonRpcConfiguration(jsonRpcConfigArgumentCaptor.capture());
+    verify(mockRunnerBuilder).build();
+
+    assertThat(jsonRpcConfigArgumentCaptor.getValue().getMaxBatchSize())
+        .isEqualTo(rpcHttpMaxBatchSize);
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void rpcHttpMaxRequestContentLengthOptionMustBeUsed() {
+    final int rpcHttpMaxRequestContentLength = 1;
+    parseCommand(
+        "--rpc-http-max-request-content-length", Long.toString(rpcHttpMaxRequestContentLength));
+
+    verify(mockRunnerBuilder).jsonRpcConfiguration(jsonRpcConfigArgumentCaptor.capture());
     verify(mockRunnerBuilder).build();
 
+    assertThat(jsonRpcConfigArgumentCaptor.getValue().getMaxRequestContentLength())
+        .isEqualTo(rpcHttpMaxRequestContentLength);
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void maxpeersSet_p2pPeerLowerBoundSet() {
+
+    final int maxPeers = 123;
+    final int minPeers = 66;
+    parseCommand(
+        "--max-peers",
+        String.valueOf(maxPeers),
+        "--Xp2p-peer-lower-bound",
+        String.valueOf(minPeers));
+
+    verify(mockControllerBuilder).maxPeers(intArgumentCaptor.capture());
     assertThat(intArgumentCaptor.getValue()).isEqualTo(maxPeers);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    verify(mockControllerBuilder).lowerBoundPeers(intArgumentCaptor.capture());
+    assertThat(intArgumentCaptor.getValue()).isEqualTo(minPeers);
+
+    verify(mockRunnerBuilder).build();
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1318,19 +1660,19 @@ public void remoteConnectionsPercentageOptionMustBeUsed() {
 
     final int remoteConnectionsPercentage = 12;
     parseCommand(
-        "--remote-connections-limit-enabled",
+        "--remote-connections-limit-enabled=true",
         "--remote-connections-max-percentage",
         String.valueOf(remoteConnectionsPercentage));
 
-    verify(mockRunnerBuilder).fractionRemoteConnectionsAllowed(floatCaptor.capture());
-    verify(mockRunnerBuilder).build();
+    verify(mockControllerBuilder).maxRemotelyInitiatedPeers(intArgumentCaptor.capture());
+    verify(mockControllerBuilder).build();
 
-    assertThat(floatCaptor.getValue())
+    assertThat(intArgumentCaptor.getValue())
         .isEqualTo(
-            Fraction.fromPercentage(Percentage.fromInt(remoteConnectionsPercentage)).getValue());
+            (int) Math.floor(25 * Fraction.fromPercentage(remoteConnectionsPercentage).getValue()));
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1338,9 +1680,9 @@ public void remoteConnectionsPercentageWithInvalidFormatMustFail() {
 
     parseCommand(
         "--remote-connections-limit-enabled", "--remote-connections-max-percentage", "invalid");
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains(
             "Invalid value for option '--remote-connections-max-percentage'",
             "should be a number between 0 and 100 inclusive");
@@ -1351,30 +1693,14 @@ public void remoteConnectionsPercentageWithOutOfRangeMustFail() {
 
     parseCommand(
         "--remote-connections-limit-enabled", "--remote-connections-max-percentage", "150");
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains(
             "Invalid value for option '--remote-connections-max-percentage'",
             "should be a number between 0 and 100 inclusive");
   }
 
-  @Test
-  public void enableRandomConnectionPrioritization() {
-    parseCommand("--random-peer-priority-enabled");
-    verify(mockRunnerBuilder).randomPeerPriority(eq(true));
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
-  }
-
-  @Test
-  public void randomConnectionPrioritizationDisabledByDefault() {
-    parseCommand();
-    verify(mockRunnerBuilder).randomPeerPriority(eq(false));
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
-  }
-
   @Test
   public void syncMode_fast() {
     parseCommand("--sync-mode", "FAST");
@@ -1383,8 +1709,8 @@ public void syncMode_fast() {
     final SynchronizerConfiguration syncConfig = syncConfigurationCaptor.getValue();
     assertThat(syncConfig.getSyncMode()).isEqualTo(SyncMode.FAST);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1395,8 +1721,19 @@ public void syncMode_full() {
     final SynchronizerConfiguration syncConfig = syncConfigurationCaptor.getValue();
     assertThat(syncConfig.getSyncMode()).isEqualTo(SyncMode.FULL);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void syncMode_invalid() {
+    parseCommand("--sync-mode", "bogus");
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains(
+            "Invalid value for option '--sync-mode': expected one of [FULL, FAST, X_SNAP, X_CHECKPOINT] (case-insensitive) but was 'bogus'");
   }
 
   @Test
@@ -1407,20 +1744,32 @@ public void syncMode_full_by_default_for_dev() {
     final SynchronizerConfiguration syncConfig = syncConfigurationCaptor.getValue();
     assertThat(syncConfig.getSyncMode()).isEqualTo(SyncMode.FULL);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void helpShouldDisplayFastSyncOptions() {
     parseCommand("--help");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandOutput.toString()).contains("--fast-sync-min-peers");
+    assertThat(commandOutput.toString(UTF_8)).contains("--fast-sync-min-peers");
     // whitelist is now a hidden option
-    assertThat(commandOutput.toString()).doesNotContain("whitelist");
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).doesNotContain("whitelist");
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void checkValidDefaultFastSyncMinPeers() {
+    parseCommand("--sync-mode", "FAST");
+    verify(mockControllerBuilder).synchronizerConfiguration(syncConfigurationCaptor.capture());
+
+    final SynchronizerConfiguration syncConfig = syncConfigurationCaptor.getValue();
+    assertThat(syncConfig.getSyncMode()).isEqualTo(SyncMode.FAST);
+    assertThat(syncConfig.getFastSyncMinimumPeerCount()).isEqualTo(5);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1431,17 +1780,17 @@ public void parsesValidFastSyncMinPeersOption() {
     final SynchronizerConfiguration syncConfig = syncConfigurationCaptor.getValue();
     assertThat(syncConfig.getSyncMode()).isEqualTo(SyncMode.FAST);
     assertThat(syncConfig.getFastSyncMinimumPeerCount()).isEqualTo(11);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void parsesInvalidFastSyncMinPeersOptionWrongFormatShouldFail() {
 
     parseCommand("--sync-mode", "FAST", "--fast-sync-min-peers", "ten");
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Invalid value for option '--fast-sync-min-peers': 'ten' is not an int");
   }
 
@@ -1454,6 +1803,9 @@ public void natMethodOptionIsParsedCorrectly() {
     parseCommand("--nat-method", "UPNP");
     verify(mockRunnerBuilder).natMethod(eq(NatMethod.UPNP));
 
+    parseCommand("--nat-method", "UPNPP2PONLY");
+    verify(mockRunnerBuilder).natMethod(eq(NatMethod.UPNPP2PONLY));
+
     parseCommand("--nat-method", "AUTO");
     verify(mockRunnerBuilder).natMethod(eq(NatMethod.AUTO));
 
@@ -1463,48 +1815,86 @@ public void natMethodOptionIsParsedCorrectly() {
     parseCommand("--nat-method", "KUBERNETES");
     verify(mockRunnerBuilder).natMethod(eq(NatMethod.KUBERNETES));
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void parsesInvalidNatMethodOptionsShouldFail() {
 
     parseCommand("--nat-method", "invalid");
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains(
-            "Invalid value for option '--nat-method': expected one of [UPNP, DOCKER, KUBERNETES, AUTO, NONE] (case-insensitive) but was 'invalid'");
+            "Invalid value for option '--nat-method': expected one of [UPNP, UPNPP2PONLY, DOCKER, KUBERNETES, AUTO, NONE] (case-insensitive) but was 'invalid'");
   }
 
   @Test
   public void ethStatsOptionIsParsedCorrectly() {
     final String url = "besu-node:secret@host:443";
-    parseCommand("--Xethstats", url);
-    verify(mockRunnerBuilder).ethstatsUrl(url);
+    parseCommand("--ethstats", url);
+    verify(mockRunnerBuilder).ethstatsOptions(ethstatsOptionsArgumentCaptor.capture());
+    assertThat(ethstatsOptionsArgumentCaptor.getValue().getEthstatsUrl()).isEqualTo(url);
   }
 
   @Test
   public void ethStatsContactOptionIsParsedCorrectly() {
     final String contact = "contact@mail.net";
-    parseCommand("--Xethstats", "besu-node:secret@host:443", "--Xethstats-contact", contact);
-    verify(mockRunnerBuilder).ethstatsContact(contact);
+    parseCommand("--ethstats", "besu-node:secret@host:443", "--ethstats-contact", contact);
+    verify(mockRunnerBuilder).ethstatsOptions(ethstatsOptionsArgumentCaptor.capture());
+    assertThat(ethstatsOptionsArgumentCaptor.getValue().getEthstatsContact()).isEqualTo(contact);
   }
 
   @Test
   public void ethStatsContactOptionCannotBeUsedWithoutEthStatsServerProvided() {
-    parseCommand("--Xethstats-contact", "besu-updated");
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    parseCommand("--ethstats-contact", "besu-updated");
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains(
+            "The `--ethstats-contact` requires ethstats server URL to be provided. Either remove --ethstats-contact or provide a URL (via --ethstats=nodename:secret@host:port)");
+  }
+
+  @Test
+  public void privacyOnchainGroupsEnabledCannotBeUsedWithPrivacyFlexibleGroupsEnabled() {
+    parseCommand("--privacy-onchain-groups-enabled", "--privacy-flexible-groups-enabled");
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains(
+            "The `--privacy-onchain-groups-enabled` option is deprecated and you should only use `--privacy-flexible-groups-enabled`");
+  }
+
+  @Test
+  public void parsesValidBonsaiTrieLimitBackLayersOption() {
+    parseCommand("--data-storage-format", "BONSAI", "--bonsai-historical-block-limit", "11");
+    verify(mockControllerBuilder)
+        .dataStorageConfiguration(dataStorageConfigurationArgumentCaptor.capture());
+
+    final DataStorageConfiguration dataStorageConfiguration =
+        dataStorageConfigurationArgumentCaptor.getValue();
+    assertThat(dataStorageConfiguration.getDataStorageFormat()).isEqualTo(BONSAI);
+    assertThat(dataStorageConfiguration.getBonsaiMaxLayersToLoad()).isEqualTo(11);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void parsesInvalidBonsaiTrieLimitBackLayersOption() {
+
+    parseCommand("--data-storage-format", "BONSAI", "--bonsai-maximum-back-layers-to-load", "ten");
+
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains(
-            "The `--Xethstats-contact` requires ethstats server URL to be provided. Either remove --Xethstats-contact or provide an url (via --Xethstats=nodename:secret@host:port)");
+            "Invalid value for option '--bonsai-maximum-back-layers-to-load': 'ten' is not a long");
   }
 
   @Test
   public void dnsEnabledOptionIsParsedCorrectly() {
-    TestBesuCommand besuCommand = parseCommand("--Xdns-enabled", "true");
+    final TestBesuCommand besuCommand = parseCommand("--Xdns-enabled", "true");
 
     assertThat(besuCommand.getEnodeDnsConfiguration().dnsEnabled()).isTrue();
     assertThat(besuCommand.getEnodeDnsConfiguration().updateEnabled()).isFalse();
@@ -1512,7 +1902,7 @@ public void dnsEnabledOptionIsParsedCorrectly() {
 
   @Test
   public void dnsUpdateEnabledOptionIsParsedCorrectly() {
-    TestBesuCommand besuCommand =
+    final TestBesuCommand besuCommand =
         parseCommand("--Xdns-enabled", "true", "--Xdns-update-enabled", "true");
 
     assertThat(besuCommand.getEnodeDnsConfiguration().dnsEnabled()).isTrue();
@@ -1522,9 +1912,9 @@ public void dnsUpdateEnabledOptionIsParsedCorrectly() {
   @Test
   public void dnsUpdateEnabledOptionCannotBeUsedWithoutDnsEnabled() {
     parseCommand("--Xdns-update-enabled", "true");
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains(
             "The `--Xdns-update-enabled` requires dns to be enabled. Either remove --Xdns-update-enabled or specify dns is enabled (--Xdns-enabled)");
   }
@@ -1533,10 +1923,10 @@ public void dnsUpdateEnabledOptionCannotBeUsedWithoutDnsEnabled() {
   public void helpShouldDisplayNatMethodInfo() {
     parseCommand("--help");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandOutput.toString()).contains("--nat-method");
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).contains("--nat-method");
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1545,8 +1935,8 @@ public void natMethodPropertyDefaultIsAuto() {
 
     verify(mockRunnerBuilder).natMethod(eq(NatMethod.AUTO));
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1555,8 +1945,8 @@ public void natManagerPodNamePropertyDefaultIsBesu() {
 
     verify(mockRunnerBuilder).natManagerServiceName(eq(DEFAULT_BESU_SERVICE_NAME_FILTER));
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1566,16 +1956,16 @@ public void natManagerPodNamePropertyIsCorrectlyUpdated() {
 
     verify(mockRunnerBuilder).natManagerServiceName(eq(podName));
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void natManagerPodNameCannotBeUsedWithNatDockerMethod() {
     parseCommand("--nat-method", "DOCKER", "--Xnat-kube-service-name", "besu-updated");
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains(
             "The `--Xnat-kube-service-name` parameter is only used in kubernetes mode. Either remove --Xnat-kube-service-name or select the KUBERNETES mode (via --nat--method=KUBERNETES)");
   }
@@ -1583,9 +1973,9 @@ public void natManagerPodNameCannotBeUsedWithNatDockerMethod() {
   @Test
   public void natManagerPodNameCannotBeUsedWithNatNoneMethod() {
     parseCommand("--nat-method", "NONE", "--Xnat-kube-service-name", "besu-updated");
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains(
             "The `--Xnat-kube-service-name` parameter is only used in kubernetes mode. Either remove --Xnat-kube-service-name or select the KUBERNETES mode (via --nat--method=KUBERNETES)");
   }
@@ -1598,8 +1988,8 @@ public void natMethodFallbackEnabledPropertyIsCorrectlyUpdatedWithKubernetes() {
     parseCommand("--nat-method", "KUBERNETES", "--Xnat-method-fallback-enabled", "true");
     verify(mockRunnerBuilder).natMethodFallbackEnabled(eq(true));
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1610,8 +2000,8 @@ public void natMethodFallbackEnabledPropertyIsCorrectlyUpdatedWithDocker() {
     parseCommand("--nat-method", "DOCKER", "--Xnat-method-fallback-enabled", "true");
     verify(mockRunnerBuilder).natMethodFallbackEnabled(eq(true));
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1622,16 +2012,16 @@ public void natMethodFallbackEnabledPropertyIsCorrectlyUpdatedWithUpnp() {
     parseCommand("--nat-method", "UPNP", "--Xnat-method-fallback-enabled", "true");
     verify(mockRunnerBuilder).natMethodFallbackEnabled(eq(true));
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void natMethodFallbackEnabledCannotBeUsedWithAutoMethod() {
     parseCommand("--nat-method", "AUTO", "--Xnat-method-fallback-enabled", "false");
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains(
             "The `--Xnat-method-fallback-enabled` parameter cannot be used in AUTO mode. Either remove --Xnat-method-fallback-enabled or select another mode (via --nat--method=XXXX)");
   }
@@ -1645,8 +2035,8 @@ public void rpcHttpEnabledPropertyDefaultIsFalse() {
 
     assertThat(jsonRpcConfigArgumentCaptor.getValue().isEnabled()).isFalse();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1658,8 +2048,8 @@ public void rpcHttpEnabledPropertyMustBeUsed() {
 
     assertThat(jsonRpcConfigArgumentCaptor.getValue().isEnabled()).isTrue();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1671,8 +2061,8 @@ public void graphQLHttpEnabledPropertyDefaultIsFalse() {
 
     assertThat(graphQLConfigArgumentCaptor.getValue().isEnabled()).isFalse();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1684,8 +2074,8 @@ public void graphQLHttpEnabledPropertyMustBeUsed() {
 
     assertThat(graphQLConfigArgumentCaptor.getValue().isEnabled()).isTrue();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1698,10 +2088,24 @@ public void rpcApisPropertyMustBeUsed() {
         .warn("Permissions are disabled. Cannot enable PERM APIs when not using Permissions.");
 
     assertThat(jsonRpcConfigArgumentCaptor.getValue().getRpcApis())
-        .containsExactlyInAnyOrder(ETH, NET, PERM);
+        .containsExactlyInAnyOrder(ETH.name(), NET.name(), PERM.name());
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void rpcApisSupportsEngine() {
+    parseCommand("--rpc-http-api", "ENGINE", "--rpc-http-enabled");
+
+    verify(mockRunnerBuilder).jsonRpcConfiguration(jsonRpcConfigArgumentCaptor.capture());
+    verify(mockRunnerBuilder).build();
+
+    assertThat(jsonRpcConfigArgumentCaptor.getValue().getRpcApis())
+        .containsExactlyInAnyOrder(ENGINE.name());
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1712,10 +2116,85 @@ public void rpcApisPropertyIgnoresDuplicatesAndMustBeUsed() {
     verify(mockRunnerBuilder).build();
 
     assertThat(jsonRpcConfigArgumentCaptor.getValue().getRpcApis())
-        .containsExactlyInAnyOrder(ETH, NET);
+        .containsExactlyInAnyOrder(ETH.name(), NET.name());
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void rpcApiNoAuthMethodsIgnoresDuplicatesAndMustBeUsed() {
+    parseCommand(
+        "--rpc-http-api-methods-no-auth",
+        "admin_peers, admin_peers, eth_getWork",
+        "--rpc-http-enabled");
+
+    verify(mockRunnerBuilder).jsonRpcConfiguration(jsonRpcConfigArgumentCaptor.capture());
+    verify(mockRunnerBuilder).build();
+
+    assertThat(jsonRpcConfigArgumentCaptor.getValue().getNoAuthRpcApis())
+        .containsExactlyInAnyOrder(
+            RpcMethod.ADMIN_PEERS.getMethodName(), RpcMethod.ETH_GET_WORK.getMethodName());
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void engineApiAuthOptions() {
+    // TODO: once we have mainnet TTD, we can remove the TTD override parameter here
+    // https://github.com/hyperledger/besu/issues/3874
+    parseCommand(
+        "--override-genesis-config",
+        "terminalTotalDifficulty=1337",
+        "--rpc-http-enabled",
+        "--engine-jwt-secret",
+        "/tmp/fakeKey.hex");
+    verify(mockRunnerBuilder).engineJsonRpcConfiguration(jsonRpcConfigArgumentCaptor.capture());
+    assertThat(jsonRpcConfigArgumentCaptor.getValue().isAuthenticationEnabled()).isTrue();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void engineApiDisableAuthOptions() {
+    // TODO: once we have mainnet TTD, we can remove the TTD override parameter here
+    // https://github.com/hyperledger/besu/issues/3874
+    parseCommand(
+        "--override-genesis-config",
+        "terminalTotalDifficulty=1337",
+        "--rpc-http-enabled",
+        "--engine-jwt-disabled",
+        "--engine-jwt-secret",
+        "/tmp/fakeKey.hex");
+    verify(mockRunnerBuilder).engineJsonRpcConfiguration(jsonRpcConfigArgumentCaptor.capture());
+    assertThat(jsonRpcConfigArgumentCaptor.getValue().isAuthenticationEnabled()).isFalse();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void rpcHttpNoAuthApiMethodsCannotBeInvalid() {
+    parseCommand("--rpc-http-enabled", "--rpc-http-api-method-no-auth", "invalid");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains(
+            "Invalid value for option '--rpc-http-api-methods-no-auth', options must be valid RPC methods");
+  }
+
+  @Test
+  public void rpcWsNoAuthApiMethodsCannotBeInvalid() {
+    parseCommand("--rpc-ws-enabled", "--rpc-ws-api-methods-no-auth", "invalid");
+
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains(
+            "Invalid value for option '--rpc-ws-api-methods-no-auth', options must be valid RPC methods");
   }
 
   @Test
@@ -1728,17 +2207,45 @@ public void rpcHttpOptionsRequiresServiceToBeEnabled() {
         "--rpc-http-port",
         "1234",
         "--rpc-http-cors-origins",
-        "all");
+        "all",
+        "--rpc-http-max-active-connections",
+        "88");
 
     verifyOptionsConstraintLoggerCall(
         "--rpc-http-enabled",
         "--rpc-http-host",
         "--rpc-http-port",
         "--rpc-http-cors-origins",
-        "--rpc-http-api");
+        "--rpc-http-api",
+        "--rpc-http-max-active-connections");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void rpcHttpOptionsRequiresServiceToBeEnabledToml() throws IOException {
+    final Path toml =
+        createTempFile(
+            "toml",
+            "rpc-http-api=[\"ETH\",\"NET\"]\n"
+                + "rpc-http-host=\"0.0.0.0\"\n"
+                + "rpc-http-port=1234\n"
+                + "rpc-http-cors-origins=[\"all\"]\n"
+                + "rpc-http-max-active-connections=88");
+
+    parseCommand("--config-file", toml.toString());
+
+    verifyOptionsConstraintLoggerCall(
+        "--rpc-http-enabled",
+        "--rpc-http-host",
+        "--rpc-http-port",
+        "--rpc-http-cors-origins",
+        "--rpc-http-api",
+        "--rpc-http-max-active-connections");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1763,40 +2270,106 @@ public void privacyTlsOptionsRequiresTlsToBeEnabled() {
 
     verifyOptionsConstraintLoggerCall("--privacy-tls-enabled", "--privacy-tls-keystore-file");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
-  public void privacyTlsOptionsRequiresPrivacyToBeEnabled() {
-    parseCommand("--privacy-tls-enabled", "--privacy-tls-keystore-file", "/Users/me/key");
+  public void privacyTlsOptionsRequiresTlsToBeEnabledToml() throws IOException {
+    when(storageService.getByName("rocksdb-privacy"))
+        .thenReturn(Optional.of(rocksDBSPrivacyStorageFactory));
+    final URL configFile = this.getClass().getResource("/orion_publickey.pub");
+    final String coinbaseStr = String.format("%040x", 1);
+
+    final Path toml =
+        createTempFile(
+            "toml",
+            "privacy-enabled=true\n"
+                + "miner-enabled=true\n"
+                + "miner-coinbase=\""
+                + coinbaseStr
+                + "\"\n"
+                + "min-gas-price=0\n"
+                + "privacy-url=\""
+                + ENCLAVE_URI
+                + "\"\n"
+                + "privacy-public-key-file=\""
+                + configFile.getPath()
+                + "\"\n"
+                + "privacy-tls-keystore-file=\"/Users/me/key\"");
+
+    parseCommand("--config-file", toml.toString());
+
+    verifyOptionsConstraintLoggerCall("--privacy-tls-enabled", "--privacy-tls-keystore-file");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void privacyTlsOptionsRequiresPrivacyToBeEnabled() {
+    parseCommand("--privacy-tls-enabled", "--privacy-tls-keystore-file", "/Users/me/key");
 
     verifyOptionsConstraintLoggerCall("--privacy-enabled", "--privacy-tls-enabled");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
-  public void fastSyncOptionsRequiresFastSyncModeToBeSet() {
-    parseCommand("--fast-sync-min-peers", "5");
+  public void privacyTlsOptionsRequiresPrivacyToBeEnabledToml() throws IOException {
+    final Path toml =
+        createTempFile(
+            "toml", "privacy-tls-enabled=true\n" + "privacy-tls-keystore-file=\"/Users/me/key\"");
+
+    parseCommand("--config-file", toml.toString());
 
-    verifyOptionsConstraintLoggerCall("--sync-mode", "--fast-sync-min-peers");
+    verifyOptionsConstraintLoggerCall("--privacy-enabled", "--privacy-tls-enabled");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void rpcApisPropertyWithInvalidEntryMustDisplayError() {
     parseCommand("--rpc-http-api", "BOB");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
     // PicoCLI uses longest option name for message when option has multiple names, so here plural.
-    assertThat(commandErrorOutput.toString())
-        .contains("Invalid value for option '--rpc-http-apis'");
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains("Invalid value for option '--rpc-http-api': invalid entries found [BOB]");
+  }
+
+  @Test
+  public void rpcWsApisPropertyWithInvalidEntryMustDisplayError() {
+    parseCommand("--rpc-ws-api", "ETH,BOB,TEST");
+
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+
+    assertThat(commandErrorOutput.toString(UTF_8).trim())
+        .contains("Invalid value for option '--rpc-ws-api': invalid entries found [BOB, TEST]");
+  }
+
+  @Test
+  public void rpcApisPropertyWithPluginNamespaceAreValid() {
+
+    rpcEndpointServiceImpl.registerRPCEndpoint(
+        "bob", "method", (Function<PluginRpcRequest, Object>) request -> "nothing");
+
+    parseCommand("--rpc-http-api", "BOB");
+
+    verify(mockRunnerBuilder).jsonRpcConfiguration(jsonRpcConfigArgumentCaptor.capture());
+    verify(mockRunnerBuilder).build();
+
+    assertThat(jsonRpcConfigArgumentCaptor.getValue().getRpcApis())
+        .containsExactlyInAnyOrder("BOB");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1813,8 +2386,8 @@ public void rpcHttpHostAndPortOptionsMustBeUsed() {
     assertThat(jsonRpcConfigArgumentCaptor.getValue().getHost()).isEqualTo(host);
     assertThat(jsonRpcConfigArgumentCaptor.getValue().getPort()).isEqualTo(port);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1828,8 +2401,8 @@ public void rpcHttpHostMayBeLocalhost() {
 
     assertThat(jsonRpcConfigArgumentCaptor.getValue().getHost()).isEqualTo(host);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1843,8 +2416,52 @@ public void rpcHttpHostMayBeIPv6() {
 
     assertThat(jsonRpcConfigArgumentCaptor.getValue().getHost()).isEqualTo(host);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void rpcHttpMaxActiveConnectionsPropertyMustBeUsed() {
+    final int maxConnections = 99;
+    parseCommand("--rpc-http-max-active-connections", String.valueOf(maxConnections));
+
+    verify(mockRunnerBuilder).jsonRpcConfiguration(jsonRpcConfigArgumentCaptor.capture());
+    verify(mockRunnerBuilder).build();
+
+    assertThat(jsonRpcConfigArgumentCaptor.getValue().getMaxActiveConnections())
+        .isEqualTo(maxConnections);
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void rpcWsMaxFrameSizePropertyMustBeUsed() {
+    final int maxFrameSize = 65535;
+    parseCommand("--rpc-ws-max-frame-size", String.valueOf(maxFrameSize));
+
+    verify(mockRunnerBuilder).webSocketConfiguration(wsRpcConfigArgumentCaptor.capture());
+    verify(mockRunnerBuilder).build();
+
+    assertThat(wsRpcConfigArgumentCaptor.getValue().getMaxFrameSize()).isEqualTo(maxFrameSize);
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void rpcWsMaxActiveConnectionsPropertyMustBeUsed() {
+    final int maxConnections = 99;
+    parseCommand("--rpc-ws-max-active-connections", String.valueOf(maxConnections));
+
+    verify(mockRunnerBuilder).webSocketConfiguration(wsRpcConfigArgumentCaptor.capture());
+    verify(mockRunnerBuilder).build();
+
+    assertThat(wsRpcConfigArgumentCaptor.getValue().getMaxActiveConnections())
+        .isEqualTo(maxConnections);
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1853,16 +2470,28 @@ public void rpcHttpTlsRequiresRpcHttpEnabled() {
 
     verifyOptionsConstraintLoggerCall("--rpc-http-enabled", "--rpc-http-tls-enabled");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void rpcHttpTlsRequiresRpcHttpEnabledToml() throws IOException {
+    final Path toml = createTempFile("toml", "rpc-http-tls-enabled=true\n");
+
+    parseCommand("--config-file", toml.toString());
+
+    verifyOptionsConstraintLoggerCall("--rpc-http-enabled", "--rpc-http-tls-enabled");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void rpcHttpTlsWithoutKeystoreReportsError() {
     parseCommand("--rpc-http-enabled", "--rpc-http-tls-enabled");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Keystore file is required when TLS is enabled for JSON-RPC HTTP endpoint");
   }
 
@@ -1874,8 +2503,8 @@ public void rpcHttpTlsWithoutPasswordfileReportsError() {
         "--rpc-http-tls-keystore-file",
         "/tmp/test.p12");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains(
             "File containing password to unlock keystore is required when TLS is enabled for JSON-RPC HTTP endpoint");
   }
@@ -1886,6 +2515,7 @@ public void rpcHttpTlsKeystoreAndPasswordMustBeUsed() {
     final int port = 1234;
     final String keystoreFile = "/tmp/test.p12";
     final String keystorePasswordFile = "/tmp/test.txt";
+
     parseCommand(
         "--rpc-http-enabled",
         "--rpc-http-host",
@@ -1909,8 +2539,8 @@ public void rpcHttpTlsKeystoreAndPasswordMustBeUsed() {
     assertThat(tlsConfiguration.get().getKeyStorePath()).isEqualTo(Path.of(keystoreFile));
     assertThat(tlsConfiguration.get().getClientAuthConfiguration().isEmpty()).isTrue();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -1932,8 +2562,8 @@ public void rpcHttpTlsClientAuthWithoutKnownFileReportsError() {
         keystorePasswordFile,
         "--rpc-http-tls-client-auth-enabled");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains(
             "Known-clients file must be specified or CA clients must be enabled when TLS client authentication is enabled for JSON-RPC HTTP endpoint");
   }
@@ -1976,8 +2606,8 @@ public void rpcHttpTlsClientAuthWithKnownClientFile() {
     assertThat(tlsConfiguration.get().getClientAuthConfiguration().get().isCaClientsEnabled())
         .isFalse();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2021,8 +2651,8 @@ public void rpcHttpTlsClientAuthWithCAClient() {
     assertThat(tlsConfiguration.get().getClientAuthConfiguration().get().isCaClientsEnabled())
         .isTrue();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2064,8 +2694,173 @@ public void rpcHttpTlsClientAuthWithCAClientAndKnownClientFile() {
     assertThat(tlsConfiguration.get().getClientAuthConfiguration().get().isCaClientsEnabled())
         .isTrue();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void rpcHttpTlsCheckDefaultProtocolsAndCipherSuites() {
+    final String host = "1.2.3.4";
+    final int port = 1234;
+    final String keystoreFile = "/tmp/test.p12";
+    final String keystorePasswordFile = "/tmp/test.txt";
+
+    parseCommand(
+        "--rpc-http-enabled",
+        "--rpc-http-host",
+        host,
+        "--rpc-http-port",
+        String.valueOf(port),
+        "--rpc-http-tls-enabled",
+        "--rpc-http-tls-keystore-file",
+        keystoreFile,
+        "--rpc-http-tls-keystore-password-file",
+        keystorePasswordFile);
+
+    verify(mockRunnerBuilder).jsonRpcConfiguration(jsonRpcConfigArgumentCaptor.capture());
+    verify(mockRunnerBuilder).build();
+
+    assertThat(jsonRpcConfigArgumentCaptor.getValue().getHost()).isEqualTo(host);
+    assertThat(jsonRpcConfigArgumentCaptor.getValue().getPort()).isEqualTo(port);
+    final Optional<TlsConfiguration> tlsConfiguration =
+        jsonRpcConfigArgumentCaptor.getValue().getTlsConfiguration();
+    assertThat(tlsConfiguration).isPresent();
+    assertThat(tlsConfiguration.get().getKeyStorePath()).isEqualTo(Path.of(keystoreFile));
+    assertThat(tlsConfiguration.get().getClientAuthConfiguration()).isEmpty();
+    assertThat(tlsConfiguration.get().getCipherSuites().get()).isEmpty();
+    assertThat(tlsConfiguration.get().getSecureTransportProtocols().get())
+        .containsExactly("TLSv1.3", "TLSv1.2");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void rpcHttpTlsCheckInvalidProtocols() {
+    final String host = "1.2.3.4";
+    final int port = 1234;
+    final String keystoreFile = "/tmp/test.p12";
+    final String keystorePasswordFile = "/tmp/test.txt";
+    final String protocol = "TLsv1.4";
+
+    parseCommand(
+        "--rpc-http-enabled",
+        "--rpc-http-host",
+        host,
+        "--rpc-http-port",
+        String.valueOf(port),
+        "--rpc-http-tls-enabled",
+        "--rpc-http-tls-keystore-file",
+        keystoreFile,
+        "--rpc-http-tls-keystore-password-file",
+        keystorePasswordFile,
+        "--rpc-http-tls-protocols",
+        protocol);
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).contains("No valid TLS protocols specified");
+  }
+
+  @Test
+  public void rpcHttpTlsCheckInvalidCipherSuites() {
+    final String host = "1.2.3.4";
+    final int port = 1234;
+    final String keystoreFile = "/tmp/test.p12";
+    final String keystorePasswordFile = "/tmp/test.txt";
+    final String cipherSuites = "Invalid";
+
+    parseCommand(
+        "--rpc-http-enabled",
+        "--rpc-http-host",
+        host,
+        "--rpc-http-port",
+        String.valueOf(port),
+        "--rpc-http-tls-enabled",
+        "--rpc-http-tls-keystore-file",
+        keystoreFile,
+        "--rpc-http-tls-keystore-password-file",
+        keystorePasswordFile,
+        "--rpc-http-tls-cipher-suites",
+        cipherSuites);
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains("Invalid TLS cipher suite specified " + cipherSuites);
+  }
+
+  @Test
+  public void rpcHttpTlsCheckValidProtocolsAndCipherSuites() {
+    final String host = "1.2.3.4";
+    final int port = 1234;
+    final String keystoreFile = "/tmp/test.p12";
+    final String keystorePasswordFile = "/tmp/test.txt";
+    final String protocols = "TLSv1.3,TLSv1.2";
+    final String cipherSuites =
+        "TLS_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256";
+
+    parseCommand(
+        "--rpc-http-enabled",
+        "--rpc-http-host",
+        host,
+        "--rpc-http-port",
+        String.valueOf(port),
+        "--rpc-http-tls-enabled",
+        "--rpc-http-tls-keystore-file",
+        keystoreFile,
+        "--rpc-http-tls-keystore-password-file",
+        keystorePasswordFile,
+        "--rpc-http-tls-protocols",
+        protocols,
+        "--rpc-http-tls-cipher-suites",
+        cipherSuites);
+
+    verify(mockRunnerBuilder).jsonRpcConfiguration(jsonRpcConfigArgumentCaptor.capture());
+    verify(mockRunnerBuilder).build();
+
+    assertThat(jsonRpcConfigArgumentCaptor.getValue().getHost()).isEqualTo(host);
+    assertThat(jsonRpcConfigArgumentCaptor.getValue().getPort()).isEqualTo(port);
+    final Optional<TlsConfiguration> tlsConfiguration =
+        jsonRpcConfigArgumentCaptor.getValue().getTlsConfiguration();
+    assertThat(tlsConfiguration).isPresent();
+    assertThat(tlsConfiguration.get().getKeyStorePath()).isEqualTo(Path.of(keystoreFile));
+    assertThat(tlsConfiguration.get().getClientAuthConfiguration()).isEmpty();
+    assertThat(tlsConfiguration.get().getCipherSuites().get())
+        .containsExactlyInAnyOrder(
+            "TLS_AES_256_GCM_SHA384",
+            "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
+            "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256");
+    assertThat(tlsConfiguration.get().getSecureTransportProtocols().get())
+        .containsExactlyInAnyOrder("TLSv1.2", "TLSv1.3");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void rpcHttpTlsWarnIfCipherSuitesSpecifiedWithoutTls() {
+    final String host = "1.2.3.4";
+    final int port = 1234;
+    final String cipherSuites = "Invalid";
+
+    parseCommand(
+        "--rpc-http-enabled",
+        "--engine-rpc-enabled",
+        "--rpc-http-host",
+        host,
+        "--rpc-http-port",
+        String.valueOf(port),
+        "--rpc-http-tls-cipher-suite",
+        cipherSuites);
+    verify(
+            mockLogger,
+            times(2)) // this is verified for both the full suite of apis, and the engine group.
+        .warn(
+            "{} has been ignored because {} was not defined on the command line.",
+            "--rpc-http-tls-cipher-suite",
+            "--rpc-http-tls-enabled");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2086,8 +2881,8 @@ public void graphQLHttpHostAndPortOptionsMustBeUsed() {
     assertThat(graphQLConfigArgumentCaptor.getValue().getHost()).isEqualTo(host);
     assertThat(graphQLConfigArgumentCaptor.getValue().getPort()).isEqualTo(port);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2101,8 +2896,8 @@ public void graphQLHttpHostMayBeLocalhost() {
 
     assertThat(graphQLConfigArgumentCaptor.getValue().getHost()).isEqualTo(host);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2116,8 +2911,8 @@ public void graphQLHttpHostMayBeIPv6() {
 
     assertThat(graphQLConfigArgumentCaptor.getValue().getHost()).isEqualTo(host);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2131,8 +2926,8 @@ public void rpcHttpCorsOriginsTwoDomainsMustBuildListWithBothDomains() {
     assertThat(jsonRpcConfigArgumentCaptor.getValue().getCorsAllowedDomains().toArray())
         .isEqualTo(origins);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2146,8 +2941,8 @@ public void rpcHttpCorsOriginsDoubleCommaFilteredOut() {
     assertThat(jsonRpcConfigArgumentCaptor.getValue().getCorsAllowedDomains().toArray())
         .isEqualTo(origins);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2161,8 +2956,8 @@ public void rpcHttpCorsOriginsWithWildcardMustBuildListWithWildcard() {
     assertThat(jsonRpcConfigArgumentCaptor.getValue().getCorsAllowedDomains().toArray())
         .isEqualTo(origins);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2174,8 +2969,8 @@ public void rpcHttpCorsOriginsWithAllMustBuildListWithWildcard() {
 
     assertThat(jsonRpcConfigArgumentCaptor.getValue().getCorsAllowedDomains()).containsExactly("*");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2188,8 +2983,8 @@ public void rpcHttpCorsOriginsWithNoneMustBuildEmptyList() {
 
     assertThat(jsonRpcConfigArgumentCaptor.getValue().getCorsAllowedDomains()).isEmpty();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2197,10 +2992,10 @@ public void rpcHttpCorsOriginsNoneWithAnotherDomainMustFail() {
     final String[] origins = {"http://domain1.com", "none"};
     parseCommand("--rpc-http-cors-origins", String.join(",", origins));
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Value 'none' can't be used with other domains");
   }
 
@@ -2209,10 +3004,10 @@ public void rpcHttpCorsOriginsNoneWithAnotherDomainMustFailNoneFirst() {
     final String[] origins = {"none", "http://domain1.com"};
     parseCommand("--rpc-http-cors-origins", String.join(",", origins));
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Value 'none' can't be used with other domains");
   }
 
@@ -2220,10 +3015,10 @@ public void rpcHttpCorsOriginsNoneWithAnotherDomainMustFailNoneFirst() {
   public void rpcHttpCorsOriginsAllWithAnotherDomainMustFail() {
     parseCommand("--rpc-http-cors-origins=http://domain1.com,all");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Values '*' or 'all' can't be used with other domains");
   }
 
@@ -2231,10 +3026,10 @@ public void rpcHttpCorsOriginsAllWithAnotherDomainMustFail() {
   public void rpcHttpCorsOriginsAllWithAnotherDomainMustFailAsFlags() {
     parseCommand("--rpc-http-cors-origins=http://domain1.com", "--rpc-http-cors-origins=all");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Values '*' or 'all' can't be used with other domains");
   }
 
@@ -2242,10 +3037,10 @@ public void rpcHttpCorsOriginsAllWithAnotherDomainMustFailAsFlags() {
   public void rpcHttpCorsOriginsWildcardWithAnotherDomainMustFail() {
     parseCommand("--rpc-http-cors-origins=http://domain1.com,*");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Values '*' or 'all' can't be used with other domains");
   }
 
@@ -2253,10 +3048,10 @@ public void rpcHttpCorsOriginsWildcardWithAnotherDomainMustFail() {
   public void rpcHttpCorsOriginsWildcardWithAnotherDomainMustFailAsFlags() {
     parseCommand("--rpc-http-cors-origins=http://domain1.com", "--rpc-http-cors-origins=*");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Values '*' or 'all' can't be used with other domains");
   }
 
@@ -2265,10 +3060,10 @@ public void rpcHttpCorsOriginsInvalidRegexShouldFail() {
     final String[] origins = {"**"};
     parseCommand("--rpc-http-cors-origins", String.join(",", origins));
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Domain values result in invalid regex pattern");
   }
 
@@ -2276,10 +3071,10 @@ public void rpcHttpCorsOriginsInvalidRegexShouldFail() {
   public void rpcHttpCorsOriginsEmptyValueFails() {
     parseCommand("--rpc-http-cors-origins=");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Domain cannot be empty string or null string.");
   }
 
@@ -2297,8 +3092,8 @@ public void rpcHttpHostWhitelistAcceptsSingleArgument() {
     assertThat(jsonRpcConfigArgumentCaptor.getValue().getHostsAllowlist())
         .doesNotContain("localhost");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2313,8 +3108,8 @@ public void rpcHttpHostAllowlistAcceptsSingleArgument() {
     assertThat(jsonRpcConfigArgumentCaptor.getValue().getHostsAllowlist())
         .doesNotContain("localhost");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2329,8 +3124,8 @@ public void rpcHttpHostAllowlistAcceptsMultipleArguments() {
     assertThat(jsonRpcConfigArgumentCaptor.getValue().getHostsAllowlist())
         .doesNotContain("*", "localhost");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2345,8 +3140,8 @@ public void rpcHttpHostAllowlistAcceptsDoubleComma() {
     assertThat(jsonRpcConfigArgumentCaptor.getValue().getHostsAllowlist())
         .doesNotContain("*", "localhost");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Deprecated
@@ -2362,8 +3157,8 @@ public void rpcHttpHostWhitelistAllowlistAcceptsMultipleFlags() {
     assertThat(jsonRpcConfigArgumentCaptor.getValue().getHostsAllowlist())
         .doesNotContain("*", "localhost");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2378,8 +3173,8 @@ public void rpcHttpHostAllowlistAcceptsMultipleFlags() {
     assertThat(jsonRpcConfigArgumentCaptor.getValue().getHostsAllowlist())
         .doesNotContain("*", "localhost");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2387,10 +3182,10 @@ public void rpcHttpHostAllowlistStarWithAnotherHostnameMustFail() {
     final String[] origins = {"friend", "*"};
     parseCommand("--host-allowlist", String.join(",", origins));
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Values '*' or 'all' can't be used with other hostnames");
   }
 
@@ -2399,10 +3194,10 @@ public void rpcHttpHostAllowlistStarWithAnotherHostnameMustFailStarFirst() {
     final String[] origins = {"*", "friend"};
     parseCommand("--host-allowlist", String.join(",", origins));
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Values '*' or 'all' can't be used with other hostnames");
   }
 
@@ -2411,10 +3206,10 @@ public void rpcHttpHostAllowlistAllWithAnotherHostnameMustFail() {
     final String[] origins = {"friend", "all"};
     parseCommand("--host-allowlist", String.join(",", origins));
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Values '*' or 'all' can't be used with other hostnames");
   }
 
@@ -2428,8 +3223,8 @@ public void rpcHttpHostAllowlistWithNoneMustBuildEmptyList() {
 
     assertThat(jsonRpcConfigArgumentCaptor.getValue().getHostsAllowlist()).isEmpty();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2437,10 +3232,10 @@ public void rpcHttpHostAllowlistNoneWithAnotherDomainMustFail() {
     final String[] origins = {"http://domain1.com", "none"};
     parseCommand("--host-allowlist", String.join(",", origins));
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Value 'none' can't be used with other hostnames");
   }
 
@@ -2449,10 +3244,10 @@ public void rpcHttpHostAllowlistNoneWithAnotherDomainMustFailNoneFirst() {
     final String[] origins = {"none", "http://domain1.com"};
     parseCommand("--host-allowlist", String.join(",", origins));
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Value 'none' can't be used with other hostnames");
   }
 
@@ -2460,10 +3255,10 @@ public void rpcHttpHostAllowlistNoneWithAnotherDomainMustFailNoneFirst() {
   public void rpcHttpHostAllowlistEmptyValueFails() {
     parseCommand("--host-allowlist=");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Hostname cannot be empty string or null string.");
   }
 
@@ -2476,8 +3271,8 @@ public void rpcWsRpcEnabledPropertyDefaultIsFalse() {
 
     assertThat(wsRpcConfigArgumentCaptor.getValue().isEnabled()).isFalse();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2489,33 +3284,74 @@ public void rpcWsRpcEnabledPropertyMustBeUsed() {
 
     assertThat(wsRpcConfigArgumentCaptor.getValue().isEnabled()).isTrue();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void rpcWsOptionsRequiresServiceToBeEnabled() {
-    parseCommand("--rpc-ws-api", "ETH,NET", "--rpc-ws-host", "0.0.0.0", "--rpc-ws-port", "1234");
+    parseCommand(
+        "--rpc-ws-api",
+        "ETH,NET",
+        "--rpc-ws-host",
+        "0.0.0.0",
+        "--rpc-ws-port",
+        "1234",
+        "--rpc-ws-max-active-connections",
+        "77",
+        "--rpc-ws-max-frame-size",
+        "65535");
+
+    verifyOptionsConstraintLoggerCall(
+        "--rpc-ws-enabled",
+        "--rpc-ws-host",
+        "--rpc-ws-port",
+        "--rpc-ws-api",
+        "--rpc-ws-max-active-connections",
+        "--rpc-ws-max-frame-size");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void rpcWsOptionsRequiresServiceToBeEnabledToml() throws IOException {
+    final Path toml =
+        createTempFile(
+            "toml",
+            "rpc-ws-api=[\"ETH\", \"NET\"]\n"
+                + "rpc-ws-host=\"0.0.0.0\"\n"
+                + "rpc-ws-port=1234\n"
+                + "rpc-ws-max-active-connections=77\n"
+                + "rpc-ws-max-frame-size=65535\n");
+
+    parseCommand("--config-file", toml.toString());
 
     verifyOptionsConstraintLoggerCall(
-        "--rpc-ws-enabled", "--rpc-ws-host", "--rpc-ws-port", "--rpc-ws-api");
+        "--rpc-ws-enabled",
+        "--rpc-ws-host",
+        "--rpc-ws-port",
+        "--rpc-ws-api",
+        "--rpc-ws-max-active-connections",
+        "--rpc-ws-max-frame-size");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void rpcWsApiPropertyMustBeUsed() {
-    parseCommand("--rpc-ws-enabled", "--rpc-ws-api", "ETH, NET");
+    final TestBesuCommand command = parseCommand("--rpc-ws-enabled", "--rpc-ws-api", "ETH, NET");
 
+    assertThat(command).isNotNull();
     verify(mockRunnerBuilder).webSocketConfiguration(wsRpcConfigArgumentCaptor.capture());
     verify(mockRunnerBuilder).build();
 
     assertThat(wsRpcConfigArgumentCaptor.getValue().getRpcApis())
-        .containsExactlyInAnyOrder(ETH, NET);
+        .containsExactlyInAnyOrder(ETH.name(), NET.name());
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2530,8 +3366,8 @@ public void rpcWsHostAndPortOptionMustBeUsed() {
     assertThat(wsRpcConfigArgumentCaptor.getValue().getHost()).isEqualTo(host);
     assertThat(wsRpcConfigArgumentCaptor.getValue().getPort()).isEqualTo(port);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2544,8 +3380,8 @@ public void rpcWsHostAndMayBeLocalhost() {
 
     assertThat(wsRpcConfigArgumentCaptor.getValue().getHost()).isEqualTo(host);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2558,8 +3394,8 @@ public void rpcWsHostAndMayBeIPv6() {
 
     assertThat(wsRpcConfigArgumentCaptor.getValue().getHost()).isEqualTo(host);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2571,8 +3407,8 @@ public void metricsEnabledPropertyDefaultIsFalse() {
 
     assertThat(metricsConfigArgumentCaptor.getValue().isEnabled()).isFalse();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2584,8 +3420,8 @@ public void metricsEnabledPropertyMustBeUsed() {
 
     assertThat(metricsConfigArgumentCaptor.getValue().isEnabled()).isTrue();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2607,8 +3443,31 @@ public void metricsPushOptionsRequiresPushToBeEnabled() {
         "--metrics-push-interval",
         "--metrics-push-prometheus-job");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void metricsPushOptionsRequiresPushToBeEnabledToml() throws IOException {
+    final Path toml =
+        createTempFile(
+            "toml",
+            "metrics-push-host=\"0.0.0.0\"\n"
+                + "metrics-push-port=1234\n"
+                + "metrics-push-interval=2\n"
+                + "metrics-push-prometheus-job=\"job-name\"\n");
+
+    parseCommand("--config-file", toml.toString());
+
+    verifyOptionsConstraintLoggerCall(
+        "--metrics-push-enabled",
+        "--metrics-push-host",
+        "--metrics-push-port",
+        "--metrics-push-interval",
+        "--metrics-push-prometheus-job");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2617,8 +3476,20 @@ public void metricsOptionsRequiresPullMetricsToBeEnabled() {
 
     verifyOptionsConstraintLoggerCall("--metrics-enabled", "--metrics-host", "--metrics-port");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void metricsOptionsRequiresPullMetricsToBeEnabledToml() throws IOException {
+    final Path toml = createTempFile("toml", "metrics-host=\"0.0.0.0\"\n" + "metrics-port=1234\n");
+
+    parseCommand("--config-file", toml.toString());
+
+    verifyOptionsConstraintLoggerCall("--metrics-enabled", "--metrics-host", "--metrics-port");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2634,8 +3505,8 @@ public void metricsHostAndPortOptionMustBeUsed() {
     assertThat(metricsConfigArgumentCaptor.getValue().getHost()).isEqualTo(host);
     assertThat(metricsConfigArgumentCaptor.getValue().getPort()).isEqualTo(port);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2648,8 +3519,8 @@ public void metricsHostMayBeLocalhost() {
 
     assertThat(metricsConfigArgumentCaptor.getValue().getHost()).isEqualTo(host);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2662,8 +3533,8 @@ public void metricsHostMayBeIPv6() {
 
     assertThat(metricsConfigArgumentCaptor.getValue().getHost()).isEqualTo(host);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2676,8 +3547,8 @@ public void metricsCategoryPropertyMustBeUsed() {
     assertThat(metricsConfigArgumentCaptor.getValue().getMetricCategories())
         .containsExactly(StandardMetricCategory.JVM);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2689,8 +3560,8 @@ public void metricsPushEnabledPropertyMustBeUsed() {
 
     assertThat(metricsConfigArgumentCaptor.getValue().isPushEnabled()).isTrue();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2710,8 +3581,8 @@ public void metricsPushHostAndPushPortOptionMustBeUsed() {
     assertThat(metricsConfigArgumentCaptor.getValue().getPushHost()).isEqualTo(host);
     assertThat(metricsConfigArgumentCaptor.getValue().getPushPort()).isEqualTo(port);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2724,8 +3595,8 @@ public void metricsPushHostMayBeLocalhost() {
 
     assertThat(metricsConfigArgumentCaptor.getValue().getPushHost()).isEqualTo(host);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2737,8 +3608,8 @@ public void metricsPushIntervalMustBeUsed() {
 
     assertThat(metricsConfigArgumentCaptor.getValue().getPushInterval()).isEqualTo(42);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2751,18 +3622,18 @@ public void metricsPrometheusJobMustBeUsed() {
     assertThat(metricsConfigArgumentCaptor.getValue().getPrometheusJob())
         .isEqualTo("besu-command-test");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void metricsAndMetricsPushMustNotBeUsedTogether() {
     parseCommand("--metrics-enabled", "--metrics-push-enabled");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .startsWith("--metrics-enabled option and --metrics-push-enabled option can't be used");
   }
 
@@ -2770,7 +3641,7 @@ public void metricsAndMetricsPushMustNotBeUsedTogether() {
   public void besuDoesNotStartInMiningModeIfCoinbaseNotSet() {
     parseCommand("--miner-enabled");
 
-    Mockito.verifyZeroInteractions(mockControllerBuilder);
+    Mockito.verifyNoInteractions(mockControllerBuilder);
   }
 
   @Test
@@ -2784,8 +3655,8 @@ public void miningIsEnabledWhenSpecified() throws Exception {
     verify(mockControllerBuilder).miningParameters(miningArg.capture());
     verify(mockControllerBuilder).build();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
     assertThat(miningArg.getValue().isMiningEnabled()).isTrue();
     assertThat(miningArg.getValue().getCoinbase())
         .isEqualTo(Optional.of(Address.fromHexString(coinbaseStr)));
@@ -2802,8 +3673,8 @@ public void stratumMiningIsEnabledWhenSpecified() throws Exception {
     verify(mockControllerBuilder).miningParameters(miningArg.capture());
     verify(mockControllerBuilder).build();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
     assertThat(miningArg.getValue().isMiningEnabled()).isTrue();
     assertThat(miningArg.getValue().getCoinbase())
         .isEqualTo(Optional.of(Address.fromHexString(coinbaseStr)));
@@ -2811,53 +3682,147 @@ public void stratumMiningIsEnabledWhenSpecified() throws Exception {
   }
 
   @Test
-  public void miningOptionsRequiresServiceToBeEnabled() {
+  public void stratumMiningOptionsRequiresServiceToBeEnabled() {
+
+    parseCommand("--miner-stratum-enabled");
+
+    verifyOptionsConstraintLoggerCall("--miner-enabled", "--miner-stratum-enabled");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .startsWith(
+            "Unable to mine with Stratum if mining is disabled. Either disable Stratum mining (remove --miner-stratum-enabled) or specify mining is enabled (--miner-enabled)");
+  }
+
+  @Test
+  public void stratumMiningOptionsRequiresServiceToBeEnabledToml() throws IOException {
+    final Path toml = createTempFile("toml", "miner-stratum-enabled=true\n");
+
+    parseCommand("--config-file", toml.toString());
+
+    verifyOptionsConstraintLoggerCall("--miner-enabled", "--miner-stratum-enabled");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .startsWith(
+            "Unable to mine with Stratum if mining is disabled. Either disable Stratum mining (remove --miner-stratum-enabled) or specify mining is enabled (--miner-enabled)");
+  }
+
+  @Test
+  public void blockProducingOptionsWarnsMinerShouldBeEnabled() {
 
     final Address requestedCoinbase = Address.fromHexString("0000011111222223333344444");
     parseCommand(
+        "--network",
+        "dev",
         "--miner-coinbase",
         requestedCoinbase.toString(),
         "--min-gas-price",
         "42",
         "--miner-extra-data",
-        "0x1122334455667788990011223344556677889900112233445566778899001122",
-        "--miner-stratum-enabled");
+        "0x1122334455667788990011223344556677889900112233445566778899001122");
 
     verifyOptionsConstraintLoggerCall(
-        "--miner-enabled",
-        "--miner-coinbase",
-        "--min-gas-price",
-        "--miner-extra-data",
-        "--miner-stratum-enabled");
+        "--miner-enabled", "--miner-coinbase", "--min-gas-price", "--miner-extra-data");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
-        .startsWith(
-            "Unable to mine with Stratum if mining is disabled. Either disable Stratum mining (remove --miner-stratum-enabled) or specify mining is enabled (--miner-enabled)");
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
-  public void miningParametersAreCaptured() throws Exception {
+  public void blockProducingOptionsWarnsMinerShouldBeEnabledToml() throws IOException {
+
     final Address requestedCoinbase = Address.fromHexString("0000011111222223333344444");
-    final String extraDataString =
-        "0x1122334455667788990011223344556677889900112233445566778899001122";
-    parseCommand(
-        "--miner-enabled",
-        "--miner-coinbase=" + requestedCoinbase.toString(),
-        "--min-gas-price=15",
-        "--miner-extra-data=" + extraDataString);
 
-    final ArgumentCaptor<MiningParameters> miningArg =
-        ArgumentCaptor.forClass(MiningParameters.class);
+    final Path toml =
+        createTempFile(
+            "toml",
+            "network=\"dev\"\n"
+                + "miner-coinbase=\""
+                + requestedCoinbase
+                + "\"\n"
+                + "min-gas-price=42\n"
+                + "miner-extra-data=\"0x1122334455667788990011223344556677889900112233445566778899001122\"\n");
 
-    verify(mockControllerBuilder).miningParameters(miningArg.capture());
-    verify(mockControllerBuilder).build();
+    parseCommand("--config-file", toml.toString());
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
-    assertThat(miningArg.getValue().getCoinbase()).isEqualTo(Optional.of(requestedCoinbase));
-    assertThat(miningArg.getValue().getMinTransactionGasPrice()).isEqualTo(Wei.of(15));
-    assertThat(miningArg.getValue().getExtraData()).isEqualTo(Bytes.fromHexString(extraDataString));
+    verifyOptionsConstraintLoggerCall(
+        "--miner-enabled", "--miner-coinbase", "--min-gas-price", "--miner-extra-data");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void blockProducingOptionsDoNotWarnWhenMergeEnabled() {
+
+    final Address requestedCoinbase = Address.fromHexString("0000011111222223333344444");
+    // TODO: once we have mainnet TTD, we can remove the TTD override parameter here
+    // https://github.com/hyperledger/besu/issues/3874
+    parseCommand(
+        "--override-genesis-config",
+        "terminalTotalDifficulty=1337",
+        "--miner-coinbase",
+        requestedCoinbase.toString(),
+        "--min-gas-price",
+        "42",
+        "--miner-extra-data",
+        "0x1122334455667788990011223344556677889900112233445566778899001122");
+
+    verify(mockLogger, atMost(0))
+        .warn(
+            stringArgumentCaptor.capture(),
+            stringArgumentCaptor.capture(),
+            stringArgumentCaptor.capture());
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void minGasPriceRequiresMainOption() {
+    parseCommand("--min-gas-price", "0", "--network", "dev");
+
+    verifyOptionsConstraintLoggerCall("--miner-enabled", "--min-gas-price");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void minGasPriceRequiresMainOptionToml() throws IOException {
+    final Path toml = createTempFile("toml", "min-gas-price=0\nnetwork=\"dev\"\n");
+
+    parseCommand("--config-file", toml.toString());
+
+    verifyOptionsConstraintLoggerCall("--miner-enabled", "--min-gas-price");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void miningParametersAreCaptured() {
+    final Address requestedCoinbase = Address.fromHexString("0000011111222223333344444");
+    final String extraDataString =
+        "0x1122334455667788990011223344556677889900112233445566778899001122";
+    parseCommand(
+        "--miner-enabled",
+        "--miner-coinbase=" + requestedCoinbase.toString(),
+        "--min-gas-price=15",
+        "--miner-extra-data=" + extraDataString);
+
+    final ArgumentCaptor<MiningParameters> miningArg =
+        ArgumentCaptor.forClass(MiningParameters.class);
+
+    verify(mockControllerBuilder).miningParameters(miningArg.capture());
+    verify(mockControllerBuilder).build();
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    assertThat(miningArg.getValue().getCoinbase()).isEqualTo(Optional.of(requestedCoinbase));
+    assertThat(miningArg.getValue().getMinTransactionGasPrice()).isEqualTo(Wei.of(15));
+    assertThat(miningArg.getValue().getExtraData()).isEqualTo(Bytes.fromHexString(extraDataString));
   }
 
   @Test
@@ -2877,8 +3842,8 @@ public void pruningIsEnabledIfSyncModeIsFast() {
     verify(mockControllerBuilder).isPruningEnabled(true);
     verify(mockControllerBuilder).build();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Ignore
@@ -2888,8 +3853,8 @@ public void pruningIsDisabledIfSyncModeIsFull() {
     verify(mockControllerBuilder).isPruningEnabled(false);
     verify(mockControllerBuilder).build();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2899,8 +3864,8 @@ public void pruningEnabledExplicitly() {
     verify(mockControllerBuilder).isPruningEnabled(true);
     verify(mockControllerBuilder).build();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Ignore
@@ -2910,8 +3875,8 @@ public void pruningDisabledExplicitly() {
     verify(mockControllerBuilder).isPruningEnabled(false);
     verify(mockControllerBuilder).build();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2920,8 +3885,8 @@ public void pruningDisabledByDefault() {
 
     verify(mockControllerBuilder).isPruningEnabled(false);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -2935,8 +3900,8 @@ public void pruningParametersAreCaptured() throws Exception {
     verify(mockControllerBuilder).pruningConfiguration(pruningArg.capture());
     verify(mockControllerBuilder).build();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
     assertThat(pruningArg.getValue().getBlocksRetained()).isEqualTo(15);
     assertThat(pruningArg.getValue().getBlockConfirmations()).isEqualTo(4);
   }
@@ -2948,61 +3913,82 @@ public void devModeOptionMustBeUsed() throws Exception {
     final ArgumentCaptor<EthNetworkConfig> networkArg =
         ArgumentCaptor.forClass(EthNetworkConfig.class);
 
-    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any());
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
     verify(mockControllerBuilder).build();
 
     assertThat(networkArg.getValue()).isEqualTo(EthNetworkConfig.getNetworkConfig(DEV));
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
-  public void rinkebyValuesAreUsed() throws Exception {
-    parseCommand("--network", "rinkeby");
+  public void goerliValuesAreUsed() {
+    parseCommand("--network", "goerli");
 
     final ArgumentCaptor<EthNetworkConfig> networkArg =
         ArgumentCaptor.forClass(EthNetworkConfig.class);
 
-    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any());
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
     verify(mockControllerBuilder).build();
 
-    assertThat(networkArg.getValue()).isEqualTo(EthNetworkConfig.getNetworkConfig(RINKEBY));
+    assertThat(networkArg.getValue()).isEqualTo(EthNetworkConfig.getNetworkConfig(GOERLI));
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    verify(mockLogger, never()).warn(contains("Goerli is deprecated and will be shutdown"));
   }
 
   @Test
-  public void ropstenValuesAreUsed() throws Exception {
-    parseCommand("--network", "ropsten");
+  public void futureEipsValuesAreUsed() {
+    parseCommand("--network", "future_eips");
 
     final ArgumentCaptor<EthNetworkConfig> networkArg =
         ArgumentCaptor.forClass(EthNetworkConfig.class);
 
-    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any());
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
     verify(mockControllerBuilder).build();
 
-    assertThat(networkArg.getValue()).isEqualTo(EthNetworkConfig.getNetworkConfig(ROPSTEN));
+    assertThat(networkArg.getValue()).isEqualTo(EthNetworkConfig.getNetworkConfig(FUTURE_EIPS));
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
-  public void goerliValuesAreUsed() throws Exception {
-    parseCommand("--network", "goerli");
+  public void experimentalEipsValuesAreUsed() {
+    parseCommand("--network", "experimental_eips");
 
     final ArgumentCaptor<EthNetworkConfig> networkArg =
         ArgumentCaptor.forClass(EthNetworkConfig.class);
 
-    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any());
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
     verify(mockControllerBuilder).build();
 
-    assertThat(networkArg.getValue()).isEqualTo(EthNetworkConfig.getNetworkConfig(GOERLI));
+    assertThat(networkArg.getValue())
+        .isEqualTo(EthNetworkConfig.getNetworkConfig(EXPERIMENTAL_EIPS));
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void sepoliaValuesAreUsed() {
+    parseCommand("--network", "sepolia");
+
+    final ArgumentCaptor<EthNetworkConfig> networkArg =
+        ArgumentCaptor.forClass(EthNetworkConfig.class);
+
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
+    verify(mockControllerBuilder).build();
+
+    assertThat(networkArg.getValue()).isEqualTo(EthNetworkConfig.getNetworkConfig(SEPOLIA));
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+
+    verify(mockLogger, never()).warn(contains("Sepolia is deprecated and will be shutdown"));
   }
 
   @Test
@@ -3012,13 +3998,13 @@ public void classicValuesAreUsed() throws Exception {
     final ArgumentCaptor<EthNetworkConfig> networkArg =
         ArgumentCaptor.forClass(EthNetworkConfig.class);
 
-    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any());
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
     verify(mockControllerBuilder).build();
 
     assertThat(networkArg.getValue()).isEqualTo(EthNetworkConfig.getNetworkConfig(CLASSIC));
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -3028,13 +4014,13 @@ public void kottiValuesAreUsed() throws Exception {
     final ArgumentCaptor<EthNetworkConfig> networkArg =
         ArgumentCaptor.forClass(EthNetworkConfig.class);
 
-    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any());
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
     verify(mockControllerBuilder).build();
 
     assertThat(networkArg.getValue()).isEqualTo(EthNetworkConfig.getNetworkConfig(KOTTI));
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -3044,28 +4030,28 @@ public void mordorValuesAreUsed() throws Exception {
     final ArgumentCaptor<EthNetworkConfig> networkArg =
         ArgumentCaptor.forClass(EthNetworkConfig.class);
 
-    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any());
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
     verify(mockControllerBuilder).build();
 
     assertThat(networkArg.getValue()).isEqualTo(EthNetworkConfig.getNetworkConfig(MORDOR));
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
-  public void rinkebyValuesCanBeOverridden() throws Exception {
-    networkValuesCanBeOverridden("rinkeby");
+  public void goerliValuesCanBeOverridden() throws Exception {
+    networkValuesCanBeOverridden("goerli");
   }
 
   @Test
-  public void goerliValuesCanBeOverridden() throws Exception {
-    networkValuesCanBeOverridden("goerli");
+  public void futureEipsValuesCanBeOverridden() throws Exception {
+    networkValuesCanBeOverridden("future_eips");
   }
 
   @Test
-  public void ropstenValuesCanBeOverridden() throws Exception {
-    networkValuesCanBeOverridden("ropsten");
+  public void experimentalEipsValuesCanBeOverridden() throws Exception {
+    networkValuesCanBeOverridden("experimental_eips");
   }
 
   @Test
@@ -3095,33 +4081,35 @@ private void networkValuesCanBeOverridden(final String network) throws Exception
         "--network-id",
         "1234567",
         "--bootnodes",
-        String.join(",", validENodeStrings));
+        String.join(",", VALID_ENODE_STRINGS));
 
     final ArgumentCaptor<EthNetworkConfig> networkArg =
         ArgumentCaptor.forClass(EthNetworkConfig.class);
 
-    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any());
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(networkArg.capture(), any(), any());
     verify(mockControllerBuilder).build();
 
     assertThat(networkArg.getValue().getBootNodes())
         .isEqualTo(
-            Stream.of(validENodeStrings).map(EnodeURL::fromString).collect(Collectors.toList()));
+            Stream.of(VALID_ENODE_STRINGS)
+                .map(EnodeURLImpl::fromString)
+                .collect(Collectors.toList()));
     assertThat(networkArg.getValue().getNetworkId()).isEqualTo(1234567);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void fullCLIOptionsShown() {
     parseCommand("--help");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandOutput.toString()).contains("--config-file");
-    assertThat(commandOutput.toString()).contains("--data-path");
-    assertThat(commandOutput.toString()).contains("--genesis-file");
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).contains("--config-file");
+    assertThat(commandOutput.toString(UTF_8)).contains("--data-path");
+    assertThat(commandOutput.toString(UTF_8)).contains("--genesis-file");
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -3145,10 +4133,10 @@ public void mustUseEnclaveUriAndOptions() {
 
     assertThat(enclaveArg.getValue().isEnabled()).isEqualTo(true);
     assertThat(enclaveArg.getValue().getEnclaveUri()).isEqualTo(URI.create(ENCLAVE_URI));
-    assertThat(enclaveArg.getValue().getEnclavePublicKey()).isEqualTo(ENCLAVE_PUBLIC_KEY);
+    assertThat(enclaveArg.getValue().getPrivacyUserId()).isEqualTo(ENCLAVE_PUBLIC_KEY);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -3159,18 +4147,18 @@ public void privacyOptionsRequiresServiceToBeEnabled() {
 
     parseCommand("--privacy-url", ENCLAVE_URI, "--privacy-public-key-file", file.toString());
 
-    verifyOptionsConstraintLoggerCall(
-        "--privacy-enabled", "--privacy-url", "--privacy-public-key-file");
+    verifyMultiOptionsConstraintLoggerCall(
+        "--privacy-url and/or --privacy-public-key-file ignored because none of --privacy-enabled or isQuorum (in genesis file) was defined.");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void privacyWithoutPrivacyPublicKeyFails() {
     parseCommand("--privacy-enabled", "--privacy-url", ENCLAVE_URI);
 
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandErrorOutput.toString(UTF_8))
         .startsWith("Please specify Enclave public key file path to enable privacy");
   }
 
@@ -3184,8 +4172,8 @@ public void mustVerifyPrivacyIsDisabled() {
     verify(mockControllerBuilder).privacyParameters(enclaveArg.capture());
     verify(mockControllerBuilder).build();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
     assertThat(enclaveArg.getValue().isEnabled()).isEqualTo(false);
   }
 
@@ -3217,7 +4205,7 @@ public void privacyMultiTenancyWithoutAuthenticationFails() {
         "--rpc-http-authentication-jwt-public-key-file",
         "/non/existent/file");
 
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandErrorOutput.toString(UTF_8))
         .startsWith(
             "Privacy multi-tenancy requires either http authentication to be enabled or WebSocket authentication to be enabled");
   }
@@ -3233,12 +4221,12 @@ public void privacyMultiTenancyWithPrivacyPublicKeyFileFails() {
         "--privacy-public-key-file",
         ENCLAVE_PUBLIC_KEY_PATH);
 
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandErrorOutput.toString(UTF_8))
         .startsWith("Privacy multi-tenancy and privacy public key cannot be used together");
   }
 
   @Test
-  public void onChainPrivacyGroupEnabledFlagDefaultValueIsFalse() {
+  public void flexiblePrivacyGroupEnabledFlagDefaultValueIsFalse() {
     parseCommand(
         "--privacy-enabled",
         "--privacy-public-key-file",
@@ -3252,15 +4240,15 @@ public void onChainPrivacyGroupEnabledFlagDefaultValueIsFalse() {
     verify(mockControllerBuilder).privacyParameters(privacyParametersArgumentCaptor.capture());
     verify(mockControllerBuilder).build();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
 
     final PrivacyParameters privacyParameters = privacyParametersArgumentCaptor.getValue();
-    assertThat(privacyParameters.isOnchainPrivacyGroupsEnabled()).isEqualTo(false);
+    assertThat(privacyParameters.isFlexiblePrivacyGroupsEnabled()).isEqualTo(false);
   }
 
   @Test
-  public void onChainPrivacyGroupEnabledFlagValueIsSet() {
+  public void onchainPrivacyGroupEnabledFlagValueIsSet() {
     parseCommand(
         "--privacy-enabled",
         "--privacy-public-key-file",
@@ -3275,11 +4263,28 @@ public void onChainPrivacyGroupEnabledFlagValueIsSet() {
     verify(mockControllerBuilder).privacyParameters(privacyParametersArgumentCaptor.capture());
     verify(mockControllerBuilder).build();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
 
     final PrivacyParameters privacyParameters = privacyParametersArgumentCaptor.getValue();
-    assertThat(privacyParameters.isOnchainPrivacyGroupsEnabled()).isEqualTo(true);
+    assertThat(privacyParameters.isFlexiblePrivacyGroupsEnabled()).isEqualTo(true);
+  }
+
+  @Test
+  public void onchainPrivacyGroupEnabledOptionIsDeprecated() {
+    parseCommand(
+        "--privacy-enabled",
+        "--privacy-public-key-file",
+        ENCLAVE_PUBLIC_KEY_PATH,
+        "--privacy-onchain-groups-enabled",
+        "--min-gas-price",
+        "0");
+
+    verify(mockLogger)
+        .warn(
+            DEPRECATION_WARNING_MSG,
+            "--privacy-onchain-groups-enabled",
+            "--privacy-flexible-groups-enabled");
   }
 
   @Test
@@ -3298,22 +4303,95 @@ public void flexiblePrivacyGroupEnabledFlagValueIsSet() {
     verify(mockControllerBuilder).privacyParameters(privacyParametersArgumentCaptor.capture());
     verify(mockControllerBuilder).build();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
 
     final PrivacyParameters privacyParameters = privacyParametersArgumentCaptor.getValue();
-    assertThat(privacyParameters.isOnchainPrivacyGroupsEnabled()).isEqualTo(true);
+    assertThat(privacyParameters.isFlexiblePrivacyGroupsEnabled()).isEqualTo(true);
   }
 
   @Test
-  public void privacyMarkerTransactionSigningKeyFileRequiredIfMinGasPriceNonZero() {
-    parseCommand("--privacy-enabled", "--privacy-public-key-file", ENCLAVE_PUBLIC_KEY_PATH);
+  public void privateMarkerTransactionSigningKeyFileRequiredIfMinGasPriceNonZero() {
+    parseCommand(
+        "--privacy-enabled",
+        "--privacy-public-key-file",
+        ENCLAVE_PUBLIC_KEY_PATH,
+        "--min-gas-price",
+        "1");
 
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandErrorOutput.toString(UTF_8))
         .startsWith(
             "Not a free gas network. --privacy-marker-transaction-signing-key-file must be specified");
   }
 
+  @Test
+  public void
+      privateMarkerTransactionSigningKeyFileNotRequiredIfMinGasPriceNonZeroAndUsingPluginPrivateMarkerTransactionFactory() {
+
+    when(privacyPluginService.getPrivateMarkerTransactionFactory())
+        .thenReturn(mock(PrivateMarkerTransactionFactory.class));
+
+    parseCommand(
+        "--privacy-enabled",
+        "--privacy-public-key-file",
+        ENCLAVE_PUBLIC_KEY_PATH,
+        "--min-gas-price",
+        "1");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void
+      privateMarkerTransactionSigningKeyFileNotCanNotBeUsedWithPluginPrivateMarkerTransactionFactory()
+          throws IOException {
+    when(privacyPluginService.getPrivateMarkerTransactionFactory())
+        .thenReturn(mock(PrivateMarkerTransactionFactory.class));
+    final Path toml =
+        createTempFile(
+            "key",
+            "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63".getBytes(UTF_8));
+
+    parseCommand(
+        "--privacy-enabled",
+        "--privacy-public-key-file",
+        ENCLAVE_PUBLIC_KEY_PATH,
+        "--privacy-marker-transaction-signing-key-file",
+        toml.toString());
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    //    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .startsWith(
+            "--privacy-marker-transaction-signing-key-file can not be used in conjunction with a plugin that specifies");
+  }
+
+  @Test
+  public void mustProvidePayloadWhenPrivacyPluginEnabled() {
+    parseCommand("--privacy-enabled", "--Xprivacy-plugin-enabled", "--min-gas-price", "0");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .startsWith(
+            "No Payload Provider has been provided. You must register one when enabling privacy plugin!");
+  }
+
+  @Test
+  public void canNotUseFlexiblePrivacyWhenPrivacyPluginEnabled() {
+    parseCommand(
+        "--privacy-enabled",
+        "--Xprivacy-plugin-enabled",
+        "--min-gas-price",
+        "0",
+        "--privacy-flexible-groups-enabled");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .startsWith(
+            "No Payload Provider has been provided. You must register one when enabling privacy plugin!");
+  }
+
   private Path createFakeGenesisFile(final JsonObject jsonGenesis) throws IOException {
     final Path genesisFile = Files.createTempFile("genesisFile", "");
     Files.write(genesisFile, encodeJsonGenesis(jsonGenesis).getBytes(UTF_8));
@@ -3368,20 +4446,45 @@ private void verifyOptionsConstraintLoggerCall(
     assertThat(stringArgumentCaptor.getAllValues().get(2)).isEqualTo(mainOption);
   }
 
+  /**
+   * Check logger calls
+   *
+   * <p>Here we check the calls to logger and not the result of the log line as we don't test the
+   * logger itself but the fact that we call it.
+   *
+   * @param stringToLog the string that is logged
+   */
+  private void verifyMultiOptionsConstraintLoggerCall(final String stringToLog) {
+    verify(mockLogger, atLeast(1)).warn(stringToLog);
+  }
+
   @Test
   public void privacyWithFastSyncMustError() {
     parseCommand("--sync-mode=FAST", "--privacy-enabled");
 
-    assertThat(commandErrorOutput.toString()).contains("Fast sync cannot be enabled with privacy.");
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains("Fast sync cannot be enabled with privacy.");
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void privacyWithPruningMustError() {
     parseCommand("--pruning-enabled", "--privacy-enabled");
 
-    assertThat(commandErrorOutput.toString()).contains("Pruning cannot be enabled with privacy.");
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains("Pruning cannot be enabled with privacy.");
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void privacyWithGoQuorumModeMustError() throws IOException {
+    final Path genesisFile =
+        createFakeGenesisFile(VALID_GENESIS_QUORUM_INTEROP_ENABLED_WITH_CHAINID);
+    parseCommand(
+        "--privacy-enabled", "--genesis-file", genesisFile.toString(), "--min-gas-price", "0");
+
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains("GoQuorum privacy is no longer supported in Besu");
   }
 
   @Rule public TemporaryFolder testFolder = new TemporaryFolder();
@@ -3394,7 +4497,7 @@ public void errorIsRaisedIfStaticNodesAreNotAllowed() throws IOException {
     permissioningConfig.deleteOnExit();
 
     final EnodeURL staticNodeURI =
-        EnodeURL.builder()
+        EnodeURLImpl.builder()
             .nodeId(
                 "50203c6bfca6874370e71aecc8958529fd723feb05013dc1abca8fc1fff845c5259faba05852e9dfe5ce172a7d6e7c2a3a5eaa8b541c8af15ea5518bbff5f2fa")
             .ipAddress("127.0.0.1")
@@ -3402,7 +4505,7 @@ public void errorIsRaisedIfStaticNodesAreNotAllowed() throws IOException {
             .build();
 
     final EnodeURL allowedNode =
-        EnodeURL.builder()
+        EnodeURLImpl.builder()
             .nodeId(
                 "50203c6bfca6874370e71aecc8958529fd723feb05013dc1abca8fc1fff845c5259faba05852e9dfe5ce172a7d6e7c2a3a5eaa8b541c8af15ea5518bbff5f2fa")
             .useDefaultPorts()
@@ -3421,10 +4524,122 @@ public void errorIsRaisedIfStaticNodesAreNotAllowed() throws IOException {
         "--bootnodes",
         "--permissions-nodes-config-file-enabled=true",
         "--permissions-nodes-config-file=" + permissioningConfig.getPath());
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains(staticNodeURI.toString(), "not in nodes-allowlist");
   }
 
+  @Test
+  public void disableLocalsDefault() {
+    parseCommand();
+    verify(mockControllerBuilder)
+        .transactionPoolConfiguration(transactionPoolConfigCaptor.capture());
+    assertThat(transactionPoolConfigCaptor.getValue().getDisableLocalTransactions()).isFalse();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void disableLocalsOn() {
+    parseCommand("--tx-pool-disable-locals=true");
+
+    verify(mockControllerBuilder)
+        .transactionPoolConfiguration(transactionPoolConfigCaptor.capture());
+    assertThat(transactionPoolConfigCaptor.getValue().getDisableLocalTransactions()).isTrue();
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void disableLocalsOff() {
+    parseCommand("--tx-pool-disable-locals=false");
+
+    verify(mockControllerBuilder)
+        .transactionPoolConfiguration(transactionPoolConfigCaptor.capture());
+    assertThat(transactionPoolConfigCaptor.getValue().getDisableLocalTransactions()).isFalse();
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void saveToFileDisabledByDefault() {
+    parseCommand();
+    verify(mockControllerBuilder)
+        .transactionPoolConfiguration(transactionPoolConfigCaptor.capture());
+    assertThat(transactionPoolConfigCaptor.getValue().getEnableSaveRestore()).isFalse();
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void saveToFileEnabledDefaultPath() {
+    parseCommand("--tx-pool-enable-save-restore=true");
+
+    verify(mockControllerBuilder)
+        .transactionPoolConfiguration(transactionPoolConfigCaptor.capture());
+    assertThat(transactionPoolConfigCaptor.getValue().getEnableSaveRestore()).isTrue();
+    assertThat(transactionPoolConfigCaptor.getValue().getSaveFile())
+        .hasName(TransactionPoolConfiguration.DEFAULT_SAVE_FILE_NAME);
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void saveToFileEnabledCustomPath() {
+    parseCommand("--tx-pool-enable-save-restore=true", "--tx-pool-save-file=my.save.file");
+
+    verify(mockControllerBuilder)
+        .transactionPoolConfiguration(transactionPoolConfigCaptor.capture());
+    assertThat(transactionPoolConfigCaptor.getValue().getEnableSaveRestore()).isTrue();
+    assertThat(transactionPoolConfigCaptor.getValue().getSaveFile()).hasName("my.save.file");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void senderLimitedTxPool_derived() {
+    parseCommand("--tx-pool-limit-by-account-percentage=0.002");
+
+    verify(mockControllerBuilder)
+        .transactionPoolConfiguration(transactionPoolConfigCaptor.capture());
+    assertThat(transactionPoolConfigCaptor.getValue().getTxPoolMaxFutureTransactionByAccount())
+        .isEqualTo(9);
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void senderLimitedTxPoolFloor_derived() {
+    parseCommand("--tx-pool-limit-by-account-percentage=0.0001");
+
+    verify(mockControllerBuilder)
+        .transactionPoolConfiguration(transactionPoolConfigCaptor.capture());
+    assertThat(transactionPoolConfigCaptor.getValue().getTxPoolMaxFutureTransactionByAccount())
+        .isEqualTo(1);
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void senderLimitedTxPoolCeiling_violated() {
+    TestBesuCommand commandTest = parseCommand("--tx-pool-limit-by-account-percentage=1.00002341");
+
+    TransactionPoolOptions txPoolOption = commandTest.getTransactionPoolOptions();
+
+    final TransactionPoolConfiguration config = txPoolOption.toDomainObject().build();
+    assertThat(config.getTxPoolLimitByAccountPercentage())
+        .isEqualTo(TransactionPoolConfiguration.DEFAULT_LIMIT_TX_POOL_BY_ACCOUNT_PERCENTAGE);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains("Invalid value for option '--tx-pool-limit-by-account-percentage'");
+  }
+
   @Test
   public void pendingTransactionRetentionPeriod() {
     final int pendingTxRetentionHours = 999;
@@ -3433,8 +4648,8 @@ public void pendingTransactionRetentionPeriod() {
         .transactionPoolConfiguration(transactionPoolConfigCaptor.capture());
     assertThat(transactionPoolConfigCaptor.getValue().getPendingTxRetentionPeriod())
         .isEqualTo(pendingTxRetentionHours);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -3444,14 +4659,14 @@ public void transactionPoolPriceBump() {
     verify(mockControllerBuilder)
         .transactionPoolConfiguration(transactionPoolConfigCaptor.capture());
     assertThat(transactionPoolConfigCaptor.getValue().getPriceBump()).isEqualTo(priceBump);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void invalidTansactionPoolPriceBumpShouldFail() {
     parseCommand("--tx-pool-price-bump", "101");
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains(
             "Invalid value for option '--tx-pool-price-bump'",
             "should be a number between 0 and 100 inclusive");
@@ -3460,18 +4675,18 @@ public void invalidTansactionPoolPriceBumpShouldFail() {
   @Test
   public void transactionPoolTxFeeCap() {
     final Wei txFeeCap = Wei.fromEth(2);
-    parseCommand("--rpc-tx-feecap", txFeeCap.toString());
+    parseCommand("--rpc-tx-feecap", txFeeCap.toDecimalString());
     verify(mockControllerBuilder)
         .transactionPoolConfiguration(transactionPoolConfigCaptor.capture());
     assertThat(transactionPoolConfigCaptor.getValue().getTxFeeCap()).isEqualTo(txFeeCap);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void invalidTansactionPoolTxFeeCapShouldFail() {
     parseCommand("--rpc-tx-feecap", "abcd");
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Invalid value for option '--rpc-tx-feecap'", "cannot convert 'abcd' to Wei");
   }
 
@@ -3479,10 +4694,10 @@ public void invalidTansactionPoolTxFeeCapShouldFail() {
   public void txMessageKeepAliveSecondsWithInvalidInputShouldFail() {
     parseCommand("--Xincoming-tx-messages-keep-alive-seconds", "acbd");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains(
             "Invalid value for option '--Xincoming-tx-messages-keep-alive-seconds': 'acbd' is not an int");
   }
@@ -3491,10 +4706,10 @@ public void txMessageKeepAliveSecondsWithInvalidInputShouldFail() {
   public void eth65TrxAnnouncedBufferingPeriodWithInvalidInputShouldFail() {
     parseCommand("--Xeth65-tx-announced-buffering-period-milliseconds", "acbd");
 
-    Mockito.verifyZeroInteractions(mockRunnerBuilder);
+    Mockito.verifyNoInteractions(mockRunnerBuilder);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains(
             "Invalid value for option '--Xeth65-tx-announced-buffering-period-milliseconds': 'acbd' is not a long");
   }
@@ -3518,7 +4733,7 @@ public void tomlThatHasInvalidOptions() throws IOException {
     // Parse it.
     parseCommand("--config-file", toml.toString());
 
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Unknown options in TOML configuration file: invalid_option, invalid_option2");
   }
 
@@ -3527,17 +4742,17 @@ public void targetGasLimitIsEnabledWhenSpecified() {
     parseCommand("--target-gas-limit=10000000");
 
     @SuppressWarnings("unchecked")
-    final ArgumentCaptor<GasLimitCalculator> gasLimitCalculatorArgumentCaptor =
-        ArgumentCaptor.forClass(GasLimitCalculator.class);
+    final ArgumentCaptor<MiningParameters> miningParametersArgumentCaptor =
+        ArgumentCaptor.forClass(MiningParameters.class);
 
-    verify(mockControllerBuilder).gasLimitCalculator(gasLimitCalculatorArgumentCaptor.capture());
+    verify(mockControllerBuilder).miningParameters(miningParametersArgumentCaptor.capture());
     verify(mockControllerBuilder).build();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
 
-    assertThat(gasLimitCalculatorArgumentCaptor.getValue())
-        .isEqualTo(new TargetingGasLimitCalculator(10_000_000L));
+    assertThat(miningParametersArgumentCaptor.getValue().getTargetGasLimit().get().longValue())
+        .isEqualTo(10_000_000L);
   }
 
   @Test
@@ -3551,8 +4766,8 @@ public void targetGasLimitIsDisabledWhenNotSpecified() {
     verify(mockControllerBuilder).gasLimitCalculator(gasLimitCalculatorArgumentCaptor.capture());
     verify(mockControllerBuilder).build();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
 
     assertThat(gasLimitCalculatorArgumentCaptor.getValue())
         .isEqualTo(GasLimitCalculator.constant());
@@ -3571,8 +4786,8 @@ public void requiredBlocksSetWhenSpecified() {
     verify(mockControllerBuilder).requiredBlocks(requiredBlocksArg.capture());
     verify(mockControllerBuilder).build();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
 
     assertThat(requiredBlocksArg.getValue()).containsOnlyKeys(blockNumber);
     assertThat(requiredBlocksArg.getValue())
@@ -3589,8 +4804,8 @@ public void requiredBlocksEmptyWhenNotSpecified() {
     verify(mockControllerBuilder).requiredBlocks(requiredBlocksArg.capture());
     verify(mockControllerBuilder).build();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
 
     assertThat(requiredBlocksArg.getValue()).isEmpty();
   }
@@ -3610,8 +4825,8 @@ public void requiredBlocksMulpleBlocksOneArg() {
     verify(mockControllerBuilder).requiredBlocks(requiredBlocksArg.capture());
     verify(mockControllerBuilder).build();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
 
     assertThat(requiredBlocksArg.getValue()).containsOnlyKeys(block1, block2);
     assertThat(requiredBlocksArg.getValue())
@@ -3636,8 +4851,8 @@ public void requiredBlocksMultipleBlocksTwoArgs() {
     verify(mockControllerBuilder).requiredBlocks(requiredBlocksArg.capture());
     verify(mockControllerBuilder).build();
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
 
     assertThat(requiredBlocksArg.getValue()).containsOnlyKeys(block1, block2);
     assertThat(requiredBlocksArg.getValue())
@@ -3646,6 +4861,28 @@ public void requiredBlocksMultipleBlocksTwoArgs() {
         .containsEntry(block2, Hash.fromHexStringLenient(hash2));
   }
 
+  @Test
+  public void httpAuthenticationAlgorithIsConfigured() {
+    parseCommand("--rpc-http-authentication-jwt-algorithm", "ES256");
+
+    verify(mockRunnerBuilder).jsonRpcConfiguration(jsonRpcConfigArgumentCaptor.capture());
+    verify(mockRunnerBuilder).build();
+
+    assertThat(jsonRpcConfigArgumentCaptor.getValue().getAuthenticationAlgorithm())
+        .isEqualTo(JwtAlgorithm.ES256);
+  }
+
+  @Test
+  public void webSocketAuthenticationAlgorithIsConfigured() {
+    parseCommand("--rpc-ws-authentication-jwt-algorithm", "ES256");
+
+    verify(mockRunnerBuilder).webSocketConfiguration(wsRpcConfigArgumentCaptor.capture());
+    verify(mockRunnerBuilder).build();
+
+    assertThat(wsRpcConfigArgumentCaptor.getValue().getAuthenticationAlgorithm())
+        .isEqualTo(JwtAlgorithm.ES256);
+  }
+
   @Test
   public void httpAuthenticationPublicKeyIsConfigured() throws IOException {
     final Path publicKey = Files.createTempFile("public_key", "");
@@ -3663,8 +4900,8 @@ public void httpAuthenticationWithoutRequiredConfiguredOptionsMustFail() {
     parseCommand("--rpc-http-enabled", "--rpc-http-authentication-enabled");
 
     verifyNoInteractions(mockRunnerBuilder);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains(
             "Unable to authenticate JSON-RPC HTTP endpoint without a supplied credentials file or authentication public key file");
   }
@@ -3686,8 +4923,8 @@ public void wsAuthenticationWithoutRequiredConfiguredOptionsMustFail() {
     parseCommand("--rpc-ws-enabled", "--rpc-ws-authentication-enabled");
 
     verifyNoInteractions(mockRunnerBuilder);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains(
             "Unable to authenticate JSON-RPC WebSocket endpoint without a supplied credentials file or authentication public key file");
   }
@@ -3700,8 +4937,8 @@ public void privHttpApisWithPrivacyDisabledLogsWarning() {
     verify(mockLogger)
         .warn("Privacy is disabled. Cannot use EEA/PRIV API methods when not using Privacy.");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -3712,8 +4949,8 @@ public void privWsApisWithPrivacyDisabledLogsWarning() {
     verify(mockLogger)
         .warn("Privacy is disabled. Cannot use EEA/PRIV API methods when not using Privacy.");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -3724,8 +4961,8 @@ public void eeaHttpApisWithPrivacyDisabledLogsWarning() {
     verify(mockLogger)
         .warn("Privacy is disabled. Cannot use EEA/PRIV API methods when not using Privacy.");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -3736,17 +4973,22 @@ public void eeaWsApisWithPrivacyDisabledLogsWarning() {
     verify(mockLogger)
         .warn("Privacy is disabled. Cannot use EEA/PRIV API methods when not using Privacy.");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void privEnclaveKeyFileDoesNotExist() {
+    assumeThat(
+        "Ignored if system language is not English",
+        System.getProperty("user.language"),
+        startsWith("en"));
     parseCommand("--privacy-enabled=true", "--privacy-public-key-file", "/non/existent/file");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).startsWith("Problem with privacy-public-key-file");
-    assertThat(commandErrorOutput.toString()).contains("No such file");
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .startsWith("Problem with privacy-public-key-file");
+    assertThat(commandErrorOutput.toString(UTF_8)).contains("No such file");
   }
 
   @Test
@@ -3754,10 +4996,11 @@ public void privEnclaveKeyFileInvalidContentTooShort() throws IOException {
     final Path file = createTempFile("privacy.key", "lkjashdfiluhwelrk");
     parseCommand("--privacy-enabled=true", "--privacy-public-key-file", file.toString());
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .startsWith("Contents of privacy-public-key-file invalid");
-    assertThat(commandErrorOutput.toString()).contains("needs to be 44 characters long");
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains("Last unit does not have enough valid bits");
   }
 
   @Test
@@ -3765,10 +5008,10 @@ public void privEnclaveKeyFileInvalidContentNotValidBase64() throws IOException
     final Path file = createTempFile("privacy.key", "l*jashdfillk9ashdfillkjashdfillkjashdfilrtg=");
     parseCommand("--privacy-enabled=true", "--privacy-public-key-file", file.toString());
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .startsWith("Contents of privacy-public-key-file invalid");
-    assertThat(commandErrorOutput.toString()).contains("Illegal base64 character");
+    assertThat(commandErrorOutput.toString(UTF_8)).contains("Illegal base64 character");
   }
 
   @Test
@@ -3782,27 +5025,13 @@ public void logLevelHasNullAsDefaultValue() {
   public void logLevelIsSetByLoggingOption() {
     final TestBesuCommand command = parseCommand("--logging", "WARN");
 
-    assertThat(command.getLogLevel()).isEqualTo(Level.WARN);
-  }
-
-  @Test
-  public void assertThatEnablingExperimentalEIPsWorks() {
-    parseCommand("--Xeip1559-enabled=true");
-    assertThat(commandErrorOutput.toString()).isEmpty();
-    assertThat(ExperimentalEIPs.eip1559Enabled).isTrue();
-  }
-
-  @Test
-  public void assertThatDisablingExperimentalEIPsWorks() {
-    parseCommand("--Xeip1559-enabled=false");
-    assertThat(commandErrorOutput.toString()).isEmpty();
-    assertThat(ExperimentalEIPs.eip1559Enabled).isFalse();
+    assertThat(command.getLogLevel()).isEqualTo("WARN");
   }
 
   @Test
   public void assertThatDefaultHttpTimeoutSecondsWorks() {
     parseCommand();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
     verify(mockRunnerBuilder).jsonRpcConfiguration(jsonRpcConfigArgumentCaptor.capture());
     verify(mockRunnerBuilder).build();
     assertThat(jsonRpcConfigArgumentCaptor.getValue().getHttpTimeoutSec())
@@ -3812,7 +5041,7 @@ public void assertThatDefaultHttpTimeoutSecondsWorks() {
   @Test
   public void assertThatHttpTimeoutSecondsWorks() {
     parseCommand("--Xhttp-timeout-seconds=513");
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
     verify(mockRunnerBuilder).jsonRpcConfiguration(jsonRpcConfigArgumentCaptor.capture());
     verify(mockRunnerBuilder).build();
     assertThat(jsonRpcConfigArgumentCaptor.getValue().getHttpTimeoutSec()).isEqualTo(513);
@@ -3821,14 +5050,14 @@ public void assertThatHttpTimeoutSecondsWorks() {
   @Test
   public void assertThatInvalidHttpTimeoutSecondsFails() {
     parseCommand("--Xhttp-timeout-seconds=abc");
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Invalid value for option", "--Xhttp-timeout-seconds", "abc", "is not a long");
   }
 
   @Test
   public void assertThatDefaultWsTimeoutSecondsWorks() {
     parseCommand();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
     verify(mockRunnerBuilder).webSocketConfiguration(wsRpcConfigArgumentCaptor.capture());
     verify(mockRunnerBuilder).build();
     assertThat(wsRpcConfigArgumentCaptor.getValue().getTimeoutSec())
@@ -3838,7 +5067,7 @@ public void assertThatDefaultWsTimeoutSecondsWorks() {
   @Test
   public void assertThatWsTimeoutSecondsWorks() {
     parseCommand("--Xws-timeout-seconds=11112018");
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
     verify(mockRunnerBuilder).webSocketConfiguration(wsRpcConfigArgumentCaptor.capture());
     verify(mockRunnerBuilder).build();
     assertThat(wsRpcConfigArgumentCaptor.getValue().getTimeoutSec()).isEqualTo(11112018);
@@ -3847,7 +5076,7 @@ public void assertThatWsTimeoutSecondsWorks() {
   @Test
   public void assertThatInvalidWsTimeoutSecondsFails() {
     parseCommand("--Xws-timeout-seconds=abc");
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Invalid value for option", "--Xws-timeout-seconds", "abc", "is not a long");
   }
 
@@ -3859,20 +5088,20 @@ public void assertThatDuplicatePortSpecifiedFails() {
         "--rpc-http-port=10",
         "--rpc-ws-port=10",
         "--rpc-ws-enabled");
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Port number '10' has been specified multiple times.");
   }
 
   @Test
   public void assertThatDuplicatePortZeroSucceeds() {
     parseCommand("--p2p-port=0", "--rpc-http-port=0", "--rpc-ws-port=0");
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void assertThatNoPortsSpecifiedSucceeds() {
     parseCommand();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -3885,7 +5114,7 @@ public void assertThatAllPortsSpecifiedSucceeds() {
         "--metrics-port=13",
         "--metrics-push-port=14",
         "--miner-stratum-port=15");
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -3895,8 +5124,8 @@ public void compatibilityEth64ForkIdEnabledMustBeUsed() {
         .ethProtocolConfiguration(ethProtocolConfigurationArgumentCaptor.capture());
     assertThat(ethProtocolConfigurationArgumentCaptor.getValue().isLegacyEth64ForkIdEnabled())
         .isTrue();
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -3906,8 +5135,8 @@ public void compatibilityEth64ForkIdNotEnabledMustBeUsed() {
         .ethProtocolConfiguration(ethProtocolConfigurationArgumentCaptor.capture());
     assertThat(ethProtocolConfigurationArgumentCaptor.getValue().isLegacyEth64ForkIdEnabled())
         .isFalse();
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -3917,114 +5146,609 @@ public void assertThatCompatibilityEth64ForkIdIsNotEnabledByDefault() {
         .ethProtocolConfiguration(ethProtocolConfigurationArgumentCaptor.capture());
     assertThat(ethProtocolConfigurationArgumentCaptor.getValue().isLegacyEth64ForkIdEnabled())
         .isFalse();
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void assertThatCompatibilityEth64ForkIdIsPresentInHelpMessage() {
     parseCommand("--help");
-    assertThat(commandOutput.toString())
+    assertThat(commandOutput.toString(UTF_8))
         .contains(
             "--compatibility-eth64-forkid-enabled",
             "Enable the legacy Eth/64 fork id. (default: false)");
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
-  public void quorumInteropDisabledDoesNotEnforceZeroGasPrice() throws IOException {
-    final Path genesisFile =
-        createFakeGenesisFile(VALID_GENESIS_QUORUM_INTEROP_ENABLED_WITH_CHAINID);
-    parseCommand(
-        "--goquorum-compatibility-enabled=false", "--genesis-file", genesisFile.toString());
-    assertThat(commandErrorOutput.toString()).isEmpty();
+  public void quorumInteropNotDefinedInGenesisDoesNotEnforceZeroGasPrice() throws IOException {
+    final Path genesisFile = createFakeGenesisFile(GENESIS_VALID_JSON);
+    parseCommand("--genesis-file", genesisFile.toString());
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void quorumInteropEnabledFailsWithoutGasPriceSet() throws IOException {
     final Path genesisFile =
         createFakeGenesisFile(VALID_GENESIS_QUORUM_INTEROP_ENABLED_WITH_CHAINID);
-    parseCommand("--goquorum-compatibility-enabled", "--genesis-file", genesisFile.toString());
-    assertThat(commandErrorOutput.toString())
+    parseCommand("--genesis-file", genesisFile.toString());
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains(
-            "--min-gas-price must be set to zero if GoQuorum compatibility is enabled in the genesis config.");
+            "--min-gas-price must be set to zero if isQuorum mode is enabled in the genesis file.");
   }
 
   @Test
   public void quorumInteropEnabledFailsWithoutGasPriceSetToZero() throws IOException {
     final Path genesisFile =
         createFakeGenesisFile(VALID_GENESIS_QUORUM_INTEROP_ENABLED_WITH_CHAINID);
+    parseCommand("--genesis-file", genesisFile.toString(), "--min-gas-price", "1");
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains(
+            "--min-gas-price must be set to zero if isQuorum mode is enabled in the genesis file.");
+  }
+
+  @Test
+  public void quorumInteropEnabledFailsWithMainnetChainId() throws IOException {
+    final Path genesisFile =
+        createFakeGenesisFile(INVALID_GENESIS_QUORUM_INTEROP_ENABLED_MAINNET.put("chainId", "1"));
+    parseCommand("--genesis-file", genesisFile.toString(), "--min-gas-price", "0");
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains("isQuorum mode cannot be used on Mainnet.");
+  }
+
+  @Test
+  public void assertThatCheckPortClashAcceptsAsExpected() throws Exception {
+    // use WS port for HTTP
+    final int port = 8546;
+    parseCommand("--rpc-http-enabled", "--rpc-http-port", String.valueOf(port));
+    verify(mockRunnerBuilder).jsonRpcConfiguration(jsonRpcConfigArgumentCaptor.capture());
+    verify(mockRunnerBuilder).build();
+    assertThat(jsonRpcConfigArgumentCaptor.getValue().getPort()).isEqualTo(port);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void assertThatCheckPortClashRejectsAsExpected() throws Exception {
+    // use WS port for HTTP
+    final int port = 8546;
+    parseCommand("--rpc-http-enabled", "--rpc-http-port", String.valueOf(port), "--rpc-ws-enabled");
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains(
+            "Port number '8546' has been specified multiple times. Please review the supplied configuration.");
+  }
+
+  @Test
+  public void assertThatCheckPortClashRejectsAsExpectedForEngineApi() throws Exception {
+    // use WS port for HTTP
+    final int port = 8545;
+    // TODO: once we have mainnet TTD, we can remove the TTD override parameter here
+    // https://github.com/hyperledger/besu/issues/3874
+    parseCommand(
+        "--override-genesis-config",
+        "terminalTotalDifficulty=1337",
+        "--rpc-http-enabled",
+        "--rpc-http-port",
+        String.valueOf(port),
+        "--engine-rpc-port",
+        String.valueOf(port));
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains(
+            "Port number '8545' has been specified multiple times. Please review the supplied configuration.");
+  }
+
+  @Test
+  public void staticNodesFileOptionValueAbsentMessage() {
+    parseCommand("--static-nodes-file");
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .startsWith("Missing required parameter for option");
+  }
+
+  @Test
+  public void staticNodesFilesOptionInvalidJSONFormatError() throws IOException {
+    final Path tempfile =
+        createTempFile(
+            "static-nodes-badformat.json",
+            "\"enode://c0b0e1151971f8a22dc2493c622317c8706c731f6fcf46d93104ef"
+                + "3a08f21f7750b5d5e17f311091f732c9f917b02e1ae6d39f076903779fd1e7"
+                + "e7e6cd2fcef6@192.168.1.25:30303\"\n]");
+    parseCommand("--static-nodes-file", tempfile.toString());
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .startsWith("Failed to decode:Cannot deserialize ");
+  }
+
+  @Test
+  public void staticNodesFileOptionFileDoesNotExistMessage() {
+    parseCommand("--static-nodes-file", "this-file-does-not-exist-at-all.json");
+    assertThat(commandErrorOutput.toString(UTF_8)).contains("Static nodes file", "does not exist");
+  }
+
+  @Test
+  public void staticNodesFileOptionValidParamenter() throws IOException {
+    final Path staticNodeTempFile =
+        createTempFile(
+            "static-nodes-goodformat.json",
+            "[\n"
+                + "\"enode://c0b0e1151971f8a22dc2493c622317c8706c731f6fcf46d93104ef"
+                + "3a08f21f7750b5d5e17f311091f732c9f917b02e1ae6d39f076903779fd1e7"
+                + "e7e6cd2fcef6@192.168.1.25:30303\"\n]");
+    parseCommand("--static-nodes-file", staticNodeTempFile.toString());
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void invalidEcCurveFailsWithErrorMessage() throws IOException {
+    SignatureAlgorithmFactory.resetInstance();
+    final Path genesisFile = createFakeGenesisFile(INVALID_GENESIS_EC_CURVE);
+
+    parseCommand("--genesis-file", genesisFile.toString());
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains(
+            "Invalid genesis file configuration for ecCurve. "
+                + "abcd is not in the list of valid elliptic curves [secp256k1, secp256r1]");
+  }
+
+  @Test
+  public void validEcCurveSucceeds() throws IOException {
+    SignatureAlgorithmFactory.resetInstance();
+    final Path genesisFile = createFakeGenesisFile(VALID_GENESIS_EC_CURVE);
+
+    parseCommand("--genesis-file", genesisFile.toString());
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void nativeSecp256IsDisabled() {
+    SignatureAlgorithmFactory.resetInstance();
+    parseCommand("--Xsecp256k1-native-enabled", "false");
+
+    verify(mockLogger).info("Using the Java implementation of the signature algorithm");
+    assertThat(SignatureAlgorithmFactory.getInstance().isNative()).isFalse();
+  }
+
+  @Test
+  public void nativeAltBn128IsDisabled() {
+    // it is necessary to reset it, because the tested variable
+    // is static and it will stay true if it has been set in another test
+    // AbstractAltBnPrecompiledContract.resetNative();
+
+    parseCommand("--Xaltbn128-native-enabled", "false");
+
+    verify(mockLogger).info("Using the Java implementation of alt bn128");
+    assertThat(AbstractAltBnPrecompiledContract.isNative()).isFalse();
+  }
+
+  @Test
+  public void nativeLibrariesAreEnabledByDefault() {
+    parseCommand();
+
+    assertThat(SignatureAlgorithmFactory.getInstance().isNative()).isTrue();
+    verify(mockLogger).info("Using the native implementation of the signature algorithm");
+
+    assertThat(AbstractAltBnPrecompiledContract.isNative()).isTrue();
+    verify(mockLogger).info("Using the native implementation of alt bn128");
+  }
+
+  @Test
+  public void pkiBlockCreationIsDisabledByDefault() {
+    parseCommand();
+
+    verifyNoInteractions(mockPkiBlockCreationConfigProvider);
+  }
+
+  @Test
+  public void pkiBlockCreationKeyStoreFileRequired() {
+    parseCommand(
+        "--Xpki-block-creation-enabled",
+        "--Xpki-block-creation-keystore-password-file",
+        "/tmp/pwd");
+
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains("KeyStore file is required when PKI Block Creation is enabled");
+  }
+
+  @Test
+  public void pkiBlockCreationPasswordFileRequired() {
+    parseCommand(
+        "--Xpki-block-creation-enabled", "--Xpki-block-creation-keystore-file", "/tmp/keystore");
+
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains(
+            "File containing password to unlock keystore is required when PKI Block Creation is enabled");
+  }
+
+  @Rule public TemporaryFolder pkiTempFolder = new TemporaryFolder();
+
+  @Test
+  public void pkiBlockCreationFullConfig() throws Exception {
+    // Create temp file with password
+    final File pwdFile = pkiTempFolder.newFile("pwd");
+    FileUtils.writeStringToFile(pwdFile, "foo", UTF_8);
+
+    parseCommand(
+        "--Xpki-block-creation-enabled",
+        "--Xpki-block-creation-keystore-type",
+        "JKS",
+        "--Xpki-block-creation-keystore-file",
+        "/tmp/keystore",
+        "--Xpki-block-creation-keystore-password-file",
+        pwdFile.getAbsolutePath(),
+        "--Xpki-block-creation-keystore-certificate-alias",
+        "anAlias",
+        "--Xpki-block-creation-truststore-type",
+        "JKS",
+        "--Xpki-block-creation-truststore-file",
+        "/tmp/truststore",
+        "--Xpki-block-creation-truststore-password-file",
+        pwdFile.getAbsolutePath(),
+        "--Xpki-block-creation-crl-file",
+        "/tmp/crl");
+
+    final PkiKeyStoreConfiguration pkiKeyStoreConfig =
+        pkiKeyStoreConfigurationArgumentCaptor.getValue();
+
+    assertThat(pkiKeyStoreConfig).isNotNull();
+    assertThat(pkiKeyStoreConfig.getKeyStoreType()).isEqualTo("JKS");
+    assertThat(pkiKeyStoreConfig.getKeyStorePath()).isEqualTo(Path.of("/tmp/keystore"));
+    assertThat(pkiKeyStoreConfig.getKeyStorePassword()).isEqualTo("foo");
+    assertThat(pkiKeyStoreConfig.getCertificateAlias()).isEqualTo("anAlias");
+    assertThat(pkiKeyStoreConfig.getTrustStoreType()).isEqualTo("JKS");
+    assertThat(pkiKeyStoreConfig.getTrustStorePath()).isEqualTo(Path.of("/tmp/truststore"));
+    assertThat(pkiKeyStoreConfig.getTrustStorePassword()).isEqualTo("foo");
+    assertThat(pkiKeyStoreConfig.getCrlFilePath()).hasValue(Path.of("/tmp/crl"));
+  }
+
+  @Test
+  public void logsWarningWhenFailToLoadJemalloc() {
+    assumeThat(PlatformDetector.getOSType(), is("linux"));
+    setEnvironmentVariable("BESU_USING_JEMALLOC", "true");
+    parseCommand();
+    verify(mockLogger)
+        .warn(
+            eq(
+                "BESU_USING_JEMALLOC is present but we failed to load jemalloc library to get the version"),
+            any(Throwable.class));
+  }
+
+  @Test
+  public void logsSuggestInstallingJemallocWhenEnvVarNotPresent() {
+    assumeThat(PlatformDetector.getOSType(), is("linux"));
+    parseCommand();
+    verify(mockLogger)
+        .info("jemalloc library not found, memory usage may be reduced by installing it");
+  }
+
+  @Test
+  public void logWarnIfFastSyncMinPeersUsedWithFullSync() {
+    parseCommand("--sync-mode", "FULL", "--fast-sync-min-peers", "1");
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains("--fast-sync-min-peers can't be used with FULL sync-mode");
+  }
+
+  @Test
+  public void posBlockCreationMaxTimeDefaultValue() {
+    parseCommand();
+    assertThat(getPosBlockCreationMaxTimeValue()).isEqualTo(DEFAULT_POS_BLOCK_CREATION_MAX_TIME);
+  }
+
+  @Test
+  public void posBlockCreationMaxTimeOption() {
+    parseCommand("--Xpos-block-creation-max-time", "7000");
+    assertThat(getPosBlockCreationMaxTimeValue()).isEqualTo(7000L);
+  }
+
+  private long getPosBlockCreationMaxTimeValue() {
+    final ArgumentCaptor<MiningParameters> miningArg =
+        ArgumentCaptor.forClass(MiningParameters.class);
+
+    verify(mockControllerBuilder).miningParameters(miningArg.capture());
+    verify(mockControllerBuilder).build();
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    return miningArg.getValue().getPosBlockCreationMaxTime();
+  }
+
+  @Test
+  public void posBlockCreationMaxTimeOutOfAllowedRange() {
+    parseCommand("--Xpos-block-creation-max-time", "17000");
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains("--Xpos-block-creation-max-time must be positive and ≤ 12000");
+  }
+
+  @Test
+  public void portInUseReportsError() throws IOException {
+    final ServerSocket serverSocket = new ServerSocket(8545);
+
+    parseCommandWithPortCheck("--rpc-http-enabled");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains("Port(s) '[8545]' already in use. Check for other processes using the port(s).");
+
+    serverSocket.close();
+  }
+
+  @Test
+  public void presentRequiredOptionShouldPass() {
+    parseCommandWithRequiredOption("--accept-terms-and-conditions", "true");
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void missingRequiredOptionShouldFail() {
+    parseCommandWithRequiredOption();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .startsWith(
+            "Missing required option: '--accept-terms-and-conditions=<acceptTermsAndConditions>'");
+  }
+
+  @Test
+  public void havingRequiredOptionInEnvVarShouldFail() {
+    setEnvironmentVariable("BESU_ACCEPT_TERMS_AND_CONDITIONS", "true");
+    parseCommandWithRequiredOption();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .startsWith(
+            "Missing required option: '--accept-terms-and-conditions=<acceptTermsAndConditions>'");
+  }
+
+  @Test
+  public void havingRequiredOptionInConfigShouldFail() throws IOException {
+    final Path toml = createTempFile("toml", "accept-terms-and-conditions=true\n");
+    parseCommandWithRequiredOption("--config-file", toml.toString());
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .startsWith(
+            "Missing required option: '--accept-terms-and-conditions=<acceptTermsAndConditions>'");
+  }
+
+  @Test
+  public void checkpointPostMergeShouldFailWhenGenesisHasNoTTD() throws IOException {
+    final String configText =
+        Resources.toString(
+            Resources.getResource("invalid_post_merge_near_head_checkpoint.json"),
+            StandardCharsets.UTF_8);
+    final Path genesisFile = createFakeGenesisFile(new JsonObject(configText));
+
     parseCommand(
-        "--goquorum-compatibility-enabled",
         "--genesis-file",
         genesisFile.toString(),
-        "--min-gas-price",
-        "1");
-    assertThat(commandErrorOutput.toString())
+        "--sync-mode",
+        "X_CHECKPOINT",
+        "--Xcheckpoint-post-merge-enabled");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains("PoS checkpoint sync requires TTD in the genesis file");
+  }
+
+  @Test
+  public void checkpointPostMergeShouldFailWhenGenesisUsesCheckpointFromPreMerge() {
+    // using the default genesis which has a checkpoint sync block prior to the merge
+    parseCommand("--sync-mode", "X_CHECKPOINT", "--Xcheckpoint-post-merge-enabled");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains(
-            "--min-gas-price must be set to zero if GoQuorum compatibility is enabled in the genesis config.");
+            "PoS checkpoint sync requires a block with total difficulty greater or equal than the TTD");
   }
 
   @Test
-  public void quorumInteropEnabledSucceedsWithGasPriceSetToZero() throws IOException {
-    final Path genesisFile =
-        createFakeGenesisFile(VALID_GENESIS_QUORUM_INTEROP_ENABLED_WITH_CHAINID);
+  public void checkpointPostMergeShouldFailWhenSyncModeIsNotCheckpoint() {
+
+    parseCommand("--sync-mode", "X_SNAP", "--Xcheckpoint-post-merge-enabled");
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains("--Xcheckpoint-post-merge-enabled can only be used with X_CHECKPOINT sync-mode");
+  }
+
+  @Test
+  public void checkpointPostMergeWithPostMergeBlockSucceeds() throws IOException {
+    final String configText =
+        Resources.toString(
+            Resources.getResource("valid_post_merge_near_head_checkpoint.json"),
+            StandardCharsets.UTF_8);
+    final Path genesisFile = createFakeGenesisFile(new JsonObject(configText));
+
     parseCommand(
-        "--goquorum-compatibility-enabled",
         "--genesis-file",
         genesisFile.toString(),
-        "--min-gas-price",
-        "0");
-    assertThat(commandErrorOutput.toString()).isEmpty();
+        "--sync-mode",
+        "X_CHECKPOINT",
+        "--Xcheckpoint-post-merge-enabled");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
-  public void quorumInteropEnabledFailsWithMainnetDefaultNetwork() throws IOException {
-    final Path genesisFile = createFakeGenesisFile(INVALID_GENESIS_QUORUM_INTEROP_ENABLED_MAINNET);
+  public void checkpointPostMergeWithPostMergeBlockTDEqualsTTDSucceeds() throws IOException {
+    final String configText =
+        Resources.toString(
+            Resources.getResource("valid_pos_checkpoint_pos_TD_equals_TTD.json"),
+            StandardCharsets.UTF_8);
+    final Path genesisFile = createFakeGenesisFile(new JsonObject(configText));
+
     parseCommand(
-        "--goquorum-compatibility-enabled",
         "--genesis-file",
         genesisFile.toString(),
-        "--min-gas-price",
-        "0");
-    assertThat(commandErrorOutput.toString())
-        .contains("GoQuorum compatibility mode (enabled) cannot be used on Mainnet");
+        "--sync-mode",
+        "X_CHECKPOINT",
+        "--Xcheckpoint-post-merge-enabled");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
-  public void quorumInteropEnabledFailsWithMainnetChainId() throws IOException {
-    final Path genesisFile =
-        createFakeGenesisFile(INVALID_GENESIS_QUORUM_INTEROP_ENABLED_MAINNET.put("chainId", "1"));
+  public void checkpointMergeAtGenesisWithGenesisBlockDifficultyZeroFails() throws IOException {
+    final String configText =
+        Resources.toString(
+            Resources.getResource("invalid_post_merge_merge_at_genesis.json"),
+            StandardCharsets.UTF_8);
+    final Path genesisFile = createFakeGenesisFile(new JsonObject(configText));
+
     parseCommand(
-        "--goquorum-compatibility-enabled",
         "--genesis-file",
         genesisFile.toString(),
-        "--min-gas-price",
-        "0");
-    assertThat(commandErrorOutput.toString())
-        .contains("GoQuorum compatibility mode (enabled) cannot be used on Mainnet");
+        "--sync-mode",
+        "X_CHECKPOINT",
+        "--Xcheckpoint-post-merge-enabled");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains(
+            "PoS checkpoint sync can't be used with TTD = 0 and checkpoint totalDifficulty = 0");
   }
 
   @Test
-  public void assertThatCheckPortClashAcceptsAsExpected() throws Exception {
-    // use WS port for HTTP
-    final int port = 8546;
-    parseCommand("--rpc-http-enabled", "--rpc-http-port", String.valueOf(port));
-    verify(mockRunnerBuilder).jsonRpcConfiguration(jsonRpcConfigArgumentCaptor.capture());
-    verify(mockRunnerBuilder).build();
-    assertThat(jsonRpcConfigArgumentCaptor.getValue().getPort()).isEqualTo(port);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+  public void checkP2pPeerLowerBound_isSet() {
+    final int lowerBound = 13;
+    parseCommand("--Xp2p-peer-lower-bound", String.valueOf(lowerBound));
+
+    verify(mockControllerBuilder).lowerBoundPeers(intArgumentCaptor.capture());
+    verify(mockControllerBuilder).build();
+
+    assertThat(intArgumentCaptor.getValue()).isEqualTo(lowerBound);
+
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
-  public void assertThatCheckPortClashRejectsAsExpected() throws Exception {
-    // use WS port for HTTP
-    final int port = 8546;
-    parseCommand("--rpc-http-enabled", "--rpc-http-port", String.valueOf(port), "--rpc-ws-enabled");
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+  public void kzgTrustedSetupFileRequiresDataBlobEnabledNetwork() throws IOException {
+    final Path genesisFileWithoutBlobs =
+        createFakeGenesisFile(new JsonObject().put("config", new JsonObject()));
+    parseCommand(
+        "--genesis-file",
+        genesisFileWithoutBlobs.toString(),
+        "--kzg-trusted-setup",
+        "/etc/besu/kzg-trusted-setup.txt");
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains("--kzg-trusted-setup can only be specified on networks with data blobs enabled");
+  }
+
+  @Test
+  public void kzgTrustedSetupFileIsMandatoryWithCustomGenesisFile()
+      throws IOException, URISyntaxException {
+    final Path genesisFileWithBlobs = createFakeGenesisFile(GENESIS_WITH_DATA_BLOBS_ENABLED);
+    parseCommand("--genesis-file", genesisFileWithBlobs.toString());
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains(
-            "Port number '8546' has been specified multiple times. Please review the supplied configuration.");
+            "--kzg-trusted-setup is mandatory when providing a custom genesis that support data blobs");
+  }
+
+  @Test
+  public void kzgTrustedSetupFileLoadedWithCustomGenesisFile()
+      throws IOException, URISyntaxException {
+    final Path testSetupAbsolutePath =
+        Path.of(BesuCommandTest.class.getResource("/trusted_setup.txt").toURI());
+    final Path genesisFileWithBlobs = createFakeGenesisFile(GENESIS_WITH_DATA_BLOBS_ENABLED);
+    parseCommand(
+        "--genesis-file",
+        genesisFileWithBlobs.toString(),
+        "--kzg-trusted-setup",
+        testSetupAbsolutePath.toString());
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void txpoolDefaultSaveFileRelativeToDataPath() throws IOException {
+    final Path dataDir = Files.createTempDirectory("data-dir");
+    parseCommand("--data-path", dataDir.toString(), "--tx-pool-enable-save-restore", "true");
+    verify(mockControllerBuilder)
+        .transactionPoolConfiguration(transactionPoolConfigCaptor.capture());
+
+    assertThat(transactionPoolConfigCaptor.getValue().getSaveFile())
+        .isEqualTo(dataDir.resolve(TransactionPoolConfiguration.DEFAULT_SAVE_FILE_NAME).toFile());
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void txpoolCustomSaveFileRelativeToDataPath() throws IOException {
+    final Path dataDir = Files.createTempDirectory("data-dir");
+    dataDir.toFile().deleteOnExit();
+    final File saveFile = Files.createTempFile(dataDir, "txpool", "save").toFile();
+    saveFile.deleteOnExit();
+    parseCommand(
+        "--data-path",
+        dataDir.toString(),
+        "--tx-pool-enable-save-restore",
+        "true",
+        "--tx-pool-save-file",
+        saveFile.getName());
+    verify(mockControllerBuilder)
+        .transactionPoolConfiguration(transactionPoolConfigCaptor.capture());
+
+    final File configuredSaveFile = transactionPoolConfigCaptor.getValue().getSaveFile();
+    assertThat(configuredSaveFile).isEqualTo(saveFile);
+    assertThat(configuredSaveFile.toPath().getParent()).isEqualTo(dataDir);
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void txpoolSaveFileAbsolutePathOutsideDataPath() throws IOException {
+    final Path dataDir = Files.createTempDirectory("data-dir");
+    dataDir.toFile().deleteOnExit();
+    final File saveFile = File.createTempFile("txpool", "dump");
+    saveFile.deleteOnExit();
+    parseCommand(
+        "--data-path",
+        dataDir.toString(),
+        "--tx-pool-enable-save-restore",
+        "true",
+        "--tx-pool-save-file",
+        saveFile.getAbsolutePath());
+    verify(mockControllerBuilder)
+        .transactionPoolConfiguration(transactionPoolConfigCaptor.capture());
+
+    final File configuredSaveFile = transactionPoolConfigCaptor.getValue().getSaveFile();
+    assertThat(configuredSaveFile).isEqualTo(saveFile);
+    assertThat(configuredSaveFile.toPath().getParent()).isNotEqualTo(dataDir);
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void snapsyncHealingOptionShouldBeDisabledByDefault() {
+    final TestBesuCommand besuCommand = parseCommand();
+    assertThat(besuCommand.unstableSynchronizerOptions.isSnapsyncFlatDbHealingEnabled()).isFalse();
+  }
+
+  @Test
+  public void snapsyncHealingOptionShouldWork() {
+    final TestBesuCommand besuCommand =
+        parseCommand("--Xsnapsync-synchronizer-flat-db-healing-enabled", "true");
+    assertThat(besuCommand.unstableSynchronizerOptions.isSnapsyncFlatDbHealingEnabled()).isTrue();
+  }
+
+  @Test
+  public void snapsyncForHealingFeaturesShouldFailWhenHealingIsNotEnabled() {
+    parseCommand("--Xsnapsync-synchronizer-flat-account-healed-count-per-request", "100");
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains(
+            "--Xsnapsync-synchronizer-flat option can only be used when -Xsnapsync-synchronizer-flat-db-healing-enabled is true");
+
+    parseCommand("--Xsnapsync-synchronizer-flat-slot-healed-count-per-request", "100");
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains(
+            "--Xsnapsync-synchronizer-flat option can only be used when -Xsnapsync-synchronizer-flat-db-healing-enabled is true");
   }
 }
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/CommandLineUtilsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/CommandLineUtilsTest.java
index eadcbdc884a..f8bc8d8972d 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/CommandLineUtilsTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/CommandLineUtilsTest.java
@@ -21,16 +21,26 @@
 import static picocli.CommandLine.defaultExceptionHandler;
 
 import org.hyperledger.besu.cli.util.CommandLineUtils;
+import org.hyperledger.besu.cli.util.EnvironmentVariableDefaultProvider;
+import org.hyperledger.besu.cli.util.TomlConfigFileDefaultProvider;
+import org.hyperledger.besu.util.StringUtils;
 
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
-import org.apache.logging.log4j.Logger;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.slf4j.Logger;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
@@ -51,9 +61,12 @@ private abstract static class AbstractTestCommand implements Runnable {
 
     final CommandLine commandLine;
 
+    final Map<String, String> environment = new HashMap<>();
+
     AbstractTestCommand(final Logger logger) {
       this.logger = logger;
       commandLine = new CommandLine(this);
+      commandLine.setDefaultValueProvider(new EnvironmentVariableDefaultProvider(environment));
     }
 
     // Completely disables p2p within Besu.
@@ -62,6 +75,11 @@ private abstract static class AbstractTestCommand implements Runnable {
         arity = "1")
     final Boolean optionEnabled = true;
 
+    @Option(
+        names = {"--other-option-enabled"},
+        arity = "1")
+    final Boolean otherOptionEnabled = true;
+
     @Option(names = {"--option2"})
     final Integer option2 = 2;
 
@@ -104,6 +122,22 @@ public void run() {
     }
   }
 
+  private static class TestMultiCommandWithDeps extends AbstractTestCommand {
+    TestMultiCommandWithDeps(final Logger logger) {
+      super(logger);
+    }
+
+    @Override
+    public void run() {
+      CommandLineUtils.checkMultiOptionDependencies(
+          logger,
+          commandLine,
+          "--option2 and/or --option3 ignored because none of --option-enabled or --other-option-enabled was defined.",
+          List.of(!optionEnabled, !otherOptionEnabled),
+          Arrays.asList("--option2", "--option3"));
+    }
+  }
+
   @Test
   public void optionsAreNotExpected() {
     final AbstractTestCommand testCommand = new TestCommandWithDeps(mockLogger);
@@ -186,6 +220,68 @@ public void noDependencies() {
     assertThat(testCommand.option4).isEqualTo(40);
   }
 
+  @Test
+  public void multipleMainOptions() {
+    final AbstractTestCommand testCommand = new TestMultiCommandWithDeps(mockLogger);
+    testCommand.commandLine.parseWithHandlers(
+        new RunLast(),
+        defaultExceptionHandler(),
+        "--option-enabled",
+        "false",
+        "--other-option-enabled",
+        "false",
+        "--option2",
+        "20");
+    verifyMultiOptionsConstraintLoggerCall(
+        mockLogger,
+        "--option2 and/or --option3 ignored because none of --option-enabled or --other-option-enabled was defined.");
+
+    assertThat(testCommand.optionEnabled).isFalse();
+    assertThat(testCommand.otherOptionEnabled).isFalse();
+    assertThat(testCommand.option2).isEqualTo(20);
+  }
+
+  @Test
+  public void multipleMainOptionsToml() throws IOException {
+    final Path toml = Files.createTempFile("toml", "");
+    Files.write(
+        toml,
+        ("option-enabled=false\n" + "other-option-enabled=false\n" + "option2=30")
+            .getBytes(StandardCharsets.UTF_8));
+    toml.toFile().deleteOnExit();
+
+    final AbstractTestCommand testCommand = new TestMultiCommandWithDeps(mockLogger);
+    testCommand.commandLine.setDefaultValueProvider(
+        new TomlConfigFileDefaultProvider(testCommand.commandLine, toml.toFile()));
+    testCommand.commandLine.parseWithHandlers(new RunLast(), defaultExceptionHandler());
+
+    verifyMultiOptionsConstraintLoggerCall(
+        mockLogger,
+        "--option2 and/or --option3 ignored because none of --option-enabled or --other-option-enabled was defined.");
+
+    assertThat(testCommand.optionEnabled).isFalse();
+    assertThat(testCommand.otherOptionEnabled).isFalse();
+    assertThat(testCommand.option2).isEqualTo(30);
+  }
+
+  @Test
+  public void multipleMainOptionsEnv() {
+    final AbstractTestCommand testCommand = new TestMultiCommandWithDeps(mockLogger);
+    testCommand.environment.put("BESU_OPTION_ENABLED", "false");
+    testCommand.environment.put("BESU_OTHER_OPTION_ENABLED", "false");
+    testCommand.environment.put("BESU_OPTION2", "40");
+
+    testCommand.commandLine.parseWithHandlers(new RunLast(), defaultExceptionHandler());
+
+    verifyMultiOptionsConstraintLoggerCall(
+        mockLogger,
+        "--option2 and/or --option3 ignored because none of --option-enabled or --other-option-enabled was defined.");
+
+    assertThat(testCommand.optionEnabled).isFalse();
+    assertThat(testCommand.otherOptionEnabled).isFalse();
+    assertThat(testCommand.option2).isEqualTo(40);
+  }
+
   /**
    * Check logger calls
    *
@@ -193,10 +289,18 @@ public void noDependencies() {
    * logger itself but the fact that we call it.
    *
    * @param dependentOptions the string representing the list of dependent options names
-   * @param mainOption the main option name
+   * @param mainOptions the main option name
    */
   private void verifyOptionsConstraintLoggerCall(
-      final Logger logger, final String dependentOptions, final String mainOption) {
+      final Logger logger, final String dependentOptions, final String... mainOptions) {
+    verifyCall(logger, dependentOptions, DEPENDENCY_WARNING_MSG, mainOptions);
+  }
+
+  private void verifyCall(
+      final Logger logger,
+      final String dependentOptions,
+      final String dependencyWarningMsg,
+      final String... mainOptions) {
 
     final ArgumentCaptor<String> stringArgumentCaptor = ArgumentCaptor.forClass(String.class);
 
@@ -205,8 +309,25 @@ private void verifyOptionsConstraintLoggerCall(
             stringArgumentCaptor.capture(),
             stringArgumentCaptor.capture(),
             stringArgumentCaptor.capture());
-    assertThat(stringArgumentCaptor.getAllValues().get(0)).isEqualTo(DEPENDENCY_WARNING_MSG);
+    assertThat(stringArgumentCaptor.getAllValues().get(0)).isEqualTo(dependencyWarningMsg);
     assertThat(stringArgumentCaptor.getAllValues().get(1)).isEqualTo(dependentOptions);
-    assertThat(stringArgumentCaptor.getAllValues().get(2)).isEqualTo(mainOption);
+
+    final String joinedMainOptions =
+        StringUtils.joiningWithLastDelimiter(", ", " or ").apply(Arrays.asList(mainOptions));
+    assertThat(stringArgumentCaptor.getAllValues().get(2)).isEqualTo(joinedMainOptions);
+  }
+
+  /**
+   * Check logger calls, where multiple main options have been specified
+   *
+   * <p>Here we check the calls to logger and not the result of the log line as we don't test the
+   * logger itself but the fact that we call it.
+   *
+   * @param stringToLog the string representing the list of dependent options names
+   */
+  private void verifyMultiOptionsConstraintLoggerCall(
+      final Logger logger, final String stringToLog) {
+
+    verify(logger).warn(stringToLog);
   }
 }
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/CommandTestAbstract.java b/besu/src/test/java/org/hyperledger/besu/cli/CommandTestAbstract.java
index 3a9fcebf20f..3b9aafe35dc 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/CommandTestAbstract.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/CommandTestAbstract.java
@@ -14,9 +14,9 @@
  */
 package org.hyperledger.besu.cli;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyFloat;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyString;
@@ -31,44 +31,63 @@
 import org.hyperledger.besu.chainimport.JsonBlockImporter;
 import org.hyperledger.besu.chainimport.RlpBlockImporter;
 import org.hyperledger.besu.cli.config.EthNetworkConfig;
+import org.hyperledger.besu.cli.options.stable.EthstatsOptions;
 import org.hyperledger.besu.cli.options.unstable.EthProtocolOptions;
 import org.hyperledger.besu.cli.options.unstable.MetricsCLIOptions;
 import org.hyperledger.besu.cli.options.unstable.NetworkingOptions;
 import org.hyperledger.besu.cli.options.unstable.SynchronizerOptions;
 import org.hyperledger.besu.cli.options.unstable.TransactionPoolOptions;
+import org.hyperledger.besu.components.BesuComponent;
+import org.hyperledger.besu.consensus.qbft.pki.PkiBlockCreationConfiguration;
+import org.hyperledger.besu.consensus.qbft.pki.PkiBlockCreationConfigurationProvider;
 import org.hyperledger.besu.controller.BesuController;
 import org.hyperledger.besu.controller.BesuControllerBuilder;
 import org.hyperledger.besu.controller.NoopPluginServiceFactory;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.KeyPairUtil;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.graphql.GraphQLConfiguration;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
 import org.hyperledger.besu.ethereum.eth.sync.BlockBroadcaster;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
 import org.hyperledger.besu.ethereum.storage.StorageProvider;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
+import org.hyperledger.besu.pki.config.PkiKeyStoreConfiguration;
 import org.hyperledger.besu.plugin.services.BesuConfiguration;
 import org.hyperledger.besu.plugin.services.PicoCLIOptions;
 import org.hyperledger.besu.plugin.services.StorageService;
+import org.hyperledger.besu.plugin.services.securitymodule.SecurityModule;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorageFactory;
 import org.hyperledger.besu.plugin.services.storage.PrivacyKeyValueStorageFactory;
 import org.hyperledger.besu.services.BesuPluginContextImpl;
+import org.hyperledger.besu.services.PermissioningServiceImpl;
+import org.hyperledger.besu.services.PrivacyPluginServiceImpl;
+import org.hyperledger.besu.services.RpcEndpointServiceImpl;
 import org.hyperledger.besu.services.SecurityModuleServiceImpl;
 import org.hyperledger.besu.services.StorageServiceImpl;
+import org.hyperledger.besu.services.TransactionSelectionServiceImpl;
 import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
 
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -81,10 +100,9 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
+import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.vertx.core.Vertx;
 import io.vertx.core.VertxOptions;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.awaitility.Awaitility;
@@ -97,25 +115,26 @@
 import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
-import picocli.CommandLine.Help.Ansi;
 import picocli.CommandLine.Model.CommandSpec;
 import picocli.CommandLine.RunLast;
 
 @RunWith(MockitoJUnitRunner.class)
 public abstract class CommandTestAbstract {
-
-  private static final Logger TEST_LOGGER = LogManager.getLogger();
-
+  private static final Logger TEST_LOGGER = LoggerFactory.getLogger(CommandTestAbstract.class);
+  protected final PrintStream originalOut = System.out;
+  protected final PrintStream originalErr = System.err;
   protected final ByteArrayOutputStream commandOutput = new ByteArrayOutputStream();
-  private final PrintStream outPrintStream = new PrintStream(commandOutput);
-
   protected final ByteArrayOutputStream commandErrorOutput = new ByteArrayOutputStream();
-  private final PrintStream errPrintStream = new PrintStream(commandErrorOutput);
   private final HashMap<String, String> environment = new HashMap<>();
 
   private final List<TestBesuCommand> besuCommands = new ArrayList<>();
-  private SECP256K1.KeyPair keyPair;
+  private KeyPair keyPair;
+
+  protected static final RpcEndpointServiceImpl rpcEndpointServiceImpl =
+      new RpcEndpointServiceImpl();
 
   @Mock protected RunnerBuilder mockRunnerBuilder;
   @Mock protected Runner mockRunner;
@@ -133,21 +152,32 @@ public abstract class CommandTestAbstract {
   @Mock protected RlpBlockImporter rlpBlockImporter;
   @Mock protected StorageServiceImpl storageService;
   @Mock protected SecurityModuleServiceImpl securityModuleService;
+  @Mock protected SecurityModule securityModule;
   @Mock protected BesuConfiguration commonPluginConfiguration;
   @Mock protected KeyValueStorageFactory rocksDBStorageFactory;
   @Mock protected PrivacyKeyValueStorageFactory rocksDBSPrivacyStorageFactory;
   @Mock protected PicoCLIOptions cliOptions;
   @Mock protected NodeKey nodeKey;
   @Mock protected BesuPluginContextImpl mockBesuPluginContext;
+  @Mock protected MutableBlockchain mockMutableBlockchain;
+  @Mock protected WorldStateArchive mockWorldStateArchive;
+  @Mock protected TransactionPool mockTransactionPool;
+  @Mock protected PrivacyPluginServiceImpl privacyPluginService;
 
   @SuppressWarnings("PrivateStaticFinalLoggers") // @Mocks are inited by JUnit
   @Mock
   protected Logger mockLogger;
 
+  @Mock protected BesuComponent mockBesuComponent;
+
+  @Mock protected PkiBlockCreationConfigurationProvider mockPkiBlockCreationConfigProvider;
+  @Mock protected PkiBlockCreationConfiguration mockPkiBlockCreationConfiguration;
+
   @Captor protected ArgumentCaptor<Collection<Bytes>> bytesCollectionCollector;
   @Captor protected ArgumentCaptor<Path> pathArgumentCaptor;
   @Captor protected ArgumentCaptor<String> stringArgumentCaptor;
   @Captor protected ArgumentCaptor<Integer> intArgumentCaptor;
+  @Captor protected ArgumentCaptor<Long> longArgumentCaptor;
   @Captor protected ArgumentCaptor<Float> floatCaptor;
   @Captor protected ArgumentCaptor<EthNetworkConfig> ethNetworkConfigArgumentCaptor;
   @Captor protected ArgumentCaptor<SynchronizerConfiguration> syncConfigurationCaptor;
@@ -157,12 +187,17 @@ public abstract class CommandTestAbstract {
   @Captor protected ArgumentCaptor<MetricsConfiguration> metricsConfigArgumentCaptor;
   @Captor protected ArgumentCaptor<StorageProvider> storageProviderArgumentCaptor;
   @Captor protected ArgumentCaptor<EthProtocolConfiguration> ethProtocolConfigurationArgumentCaptor;
+  @Captor protected ArgumentCaptor<DataStorageConfiguration> dataStorageConfigurationArgumentCaptor;
+  @Captor protected ArgumentCaptor<PkiKeyStoreConfiguration> pkiKeyStoreConfigurationArgumentCaptor;
 
   @Captor
-  protected ArgumentCaptor<PermissioningConfiguration> permissioningConfigurationArgumentCaptor;
+  protected ArgumentCaptor<Optional<PermissioningConfiguration>>
+      permissioningConfigurationArgumentCaptor;
 
   @Captor protected ArgumentCaptor<TransactionPoolConfiguration> transactionPoolConfigCaptor;
 
+  @Captor protected ArgumentCaptor<EthstatsOptions> ethstatsOptionsArgumentCaptor;
+
   @Rule public final TemporaryFolder temp = new TemporaryFolder();
 
   @Before
@@ -170,7 +205,7 @@ public void initMocks() throws Exception {
     // doReturn used because of generic BesuController
     doReturn(mockControllerBuilder)
         .when(mockControllerBuilderFactory)
-        .fromEthNetworkConfig(any(), any());
+        .fromEthNetworkConfig(any(), any(), any());
     when(mockControllerBuilder.synchronizerConfiguration(any())).thenReturn(mockControllerBuilder);
     when(mockControllerBuilder.ethProtocolConfiguration(any())).thenReturn(mockControllerBuilder);
     when(mockControllerBuilder.transactionPoolConfiguration(any()))
@@ -179,7 +214,11 @@ public void initMocks() throws Exception {
     when(mockControllerBuilder.miningParameters(any())).thenReturn(mockControllerBuilder);
     when(mockControllerBuilder.nodeKey(any())).thenReturn(mockControllerBuilder);
     when(mockControllerBuilder.metricsSystem(any())).thenReturn(mockControllerBuilder);
+    when(mockControllerBuilder.messagePermissioningProviders(any()))
+        .thenReturn(mockControllerBuilder);
     when(mockControllerBuilder.privacyParameters(any())).thenReturn(mockControllerBuilder);
+    when(mockControllerBuilder.pkiBlockCreationConfiguration(any()))
+        .thenReturn(mockControllerBuilder);
     when(mockControllerBuilder.clock(any())).thenReturn(mockControllerBuilder);
     when(mockControllerBuilder.isRevertReasonEnabled(false)).thenReturn(mockControllerBuilder);
     when(mockControllerBuilder.storageProvider(any())).thenReturn(mockControllerBuilder);
@@ -190,7 +229,18 @@ public void initMocks() throws Exception {
     when(mockControllerBuilder.requiredBlocks(any())).thenReturn(mockControllerBuilder);
     when(mockControllerBuilder.reorgLoggingThreshold(anyLong())).thenReturn(mockControllerBuilder);
     when(mockControllerBuilder.dataStorageConfiguration(any())).thenReturn(mockControllerBuilder);
-
+    when(mockControllerBuilder.evmConfiguration(any())).thenReturn(mockControllerBuilder);
+    when(mockControllerBuilder.networkConfiguration(any())).thenReturn(mockControllerBuilder);
+    when(mockControllerBuilder.randomPeerPriority(any())).thenReturn(mockControllerBuilder);
+    when(mockControllerBuilder.maxPeers(anyInt())).thenReturn(mockControllerBuilder);
+    when(mockControllerBuilder.chainPruningConfiguration(any())).thenReturn(mockControllerBuilder);
+    when(mockControllerBuilder.maxPeers(anyInt())).thenReturn(mockControllerBuilder);
+    when(mockControllerBuilder.lowerBoundPeers(anyInt())).thenReturn(mockControllerBuilder);
+    when(mockControllerBuilder.maxRemotelyInitiatedPeers(anyInt()))
+        .thenReturn(mockControllerBuilder);
+    when(mockControllerBuilder.transactionSelectorFactory(any())).thenReturn(mockControllerBuilder);
+    when(mockControllerBuilder.besuComponent(any(BesuComponent.class)))
+        .thenReturn(mockControllerBuilder);
     // doReturn used because of generic BesuController
     doReturn(mockController).when(mockControllerBuilder).build();
     lenient().when(mockController.getProtocolManager()).thenReturn(mockEthProtocolManager);
@@ -203,6 +253,10 @@ public void initMocks() throws Exception {
 
     when(mockEthProtocolManager.getBlockBroadcaster()).thenReturn(mockBlockBroadcaster);
 
+    when(mockProtocolContext.getBlockchain()).thenReturn(mockMutableBlockchain);
+    lenient().when(mockProtocolContext.getWorldStateArchive()).thenReturn(mockWorldStateArchive);
+    when(mockController.getTransactionPool()).thenReturn(mockTransactionPool);
+
     when(mockRunnerBuilder.vertx(any())).thenReturn(mockRunnerBuilder);
     when(mockRunnerBuilder.besuController(any())).thenReturn(mockRunnerBuilder);
     when(mockRunnerBuilder.discovery(anyBoolean())).thenReturn(mockRunnerBuilder);
@@ -211,37 +265,40 @@ public void initMocks() throws Exception {
     when(mockRunnerBuilder.p2pAdvertisedHost(anyString())).thenReturn(mockRunnerBuilder);
     when(mockRunnerBuilder.p2pListenPort(anyInt())).thenReturn(mockRunnerBuilder);
     when(mockRunnerBuilder.p2pListenInterface(anyString())).thenReturn(mockRunnerBuilder);
-    when(mockRunnerBuilder.maxPeers(anyInt())).thenReturn(mockRunnerBuilder);
-    when(mockRunnerBuilder.limitRemoteWireConnectionsEnabled(anyBoolean()))
-        .thenReturn(mockRunnerBuilder);
-    when(mockRunnerBuilder.fractionRemoteConnectionsAllowed(anyFloat()))
-        .thenReturn(mockRunnerBuilder);
-    when(mockRunnerBuilder.randomPeerPriority(anyBoolean())).thenReturn(mockRunnerBuilder);
+    when(mockRunnerBuilder.permissioningConfiguration(any())).thenReturn(mockRunnerBuilder);
     when(mockRunnerBuilder.p2pEnabled(anyBoolean())).thenReturn(mockRunnerBuilder);
     when(mockRunnerBuilder.natMethod(any())).thenReturn(mockRunnerBuilder);
     when(mockRunnerBuilder.natManagerServiceName(any())).thenReturn(mockRunnerBuilder);
     when(mockRunnerBuilder.natMethodFallbackEnabled(anyBoolean())).thenReturn(mockRunnerBuilder);
     when(mockRunnerBuilder.jsonRpcConfiguration(any())).thenReturn(mockRunnerBuilder);
+    when(mockRunnerBuilder.engineJsonRpcConfiguration(any())).thenReturn(mockRunnerBuilder);
     when(mockRunnerBuilder.graphQLConfiguration(any())).thenReturn(mockRunnerBuilder);
     when(mockRunnerBuilder.webSocketConfiguration(any())).thenReturn(mockRunnerBuilder);
+    when(mockRunnerBuilder.jsonRpcIpcConfiguration(any())).thenReturn(mockRunnerBuilder);
     when(mockRunnerBuilder.apiConfiguration(any())).thenReturn(mockRunnerBuilder);
     when(mockRunnerBuilder.dataDir(any())).thenReturn(mockRunnerBuilder);
     when(mockRunnerBuilder.bannedNodeIds(any())).thenReturn(mockRunnerBuilder);
     when(mockRunnerBuilder.metricsSystem(any())).thenReturn(mockRunnerBuilder);
+    when(mockRunnerBuilder.permissioningService(any())).thenReturn(mockRunnerBuilder);
     when(mockRunnerBuilder.metricsConfiguration(any())).thenReturn(mockRunnerBuilder);
     when(mockRunnerBuilder.staticNodes(any())).thenReturn(mockRunnerBuilder);
     when(mockRunnerBuilder.identityString(any())).thenReturn(mockRunnerBuilder);
     when(mockRunnerBuilder.besuPluginContext(any())).thenReturn(mockRunnerBuilder);
     when(mockRunnerBuilder.autoLogBloomCaching(anyBoolean())).thenReturn(mockRunnerBuilder);
     when(mockRunnerBuilder.pidPath(any())).thenReturn(mockRunnerBuilder);
-    when(mockRunnerBuilder.ethstatsUrl(anyString())).thenReturn(mockRunnerBuilder);
-    when(mockRunnerBuilder.ethstatsContact(anyString())).thenReturn(mockRunnerBuilder);
+    when(mockRunnerBuilder.ethstatsOptions(any())).thenReturn(mockRunnerBuilder);
     when(mockRunnerBuilder.storageProvider(any())).thenReturn(mockRunnerBuilder);
+    when(mockRunnerBuilder.rpcEndpointService(any())).thenReturn(mockRunnerBuilder);
+    when(mockRunnerBuilder.legacyForkId(anyBoolean())).thenReturn(mockRunnerBuilder);
+    when(mockRunnerBuilder.rpcMaxLogsRange(any())).thenReturn(mockRunnerBuilder);
+    when(mockRunnerBuilder.enodeDnsConfiguration(any())).thenReturn(mockRunnerBuilder);
     when(mockRunnerBuilder.build()).thenReturn(mockRunner);
 
+    final SignatureAlgorithm signatureAlgorithm = SignatureAlgorithmFactory.getInstance();
+
     final Bytes32 keyPairPrvKey =
         Bytes32.fromHexString("0xf7a58d5e755d51fa2f6206e91dd574597c73248aaf946ec1964b8c6268d6207b");
-    keyPair = SECP256K1.KeyPair.create(SECP256K1.PrivateKey.create(keyPairPrvKey));
+    keyPair = signatureAlgorithm.createKeyPair(signatureAlgorithm.createPrivateKey(keyPairPrvKey));
 
     lenient().when(nodeKey.getPublicKey()).thenReturn(keyPair.getPublicKey());
 
@@ -251,6 +308,9 @@ public void initMocks() throws Exception {
     lenient()
         .when(storageService.getByName(eq("rocksdb-privacy")))
         .thenReturn(Optional.of(rocksDBSPrivacyStorageFactory));
+    lenient()
+        .when(securityModuleService.getByName(eq("localfile")))
+        .thenReturn(Optional.of(() -> securityModule));
     lenient()
         .when(rocksDBSPrivacyStorageFactory.create(any(), any(), any()))
         .thenReturn(new InMemoryKeyValueStorage());
@@ -261,19 +321,32 @@ public void initMocks() throws Exception {
     lenient()
         .when(mockBesuPluginContext.getService(StorageService.class))
         .thenReturn(Optional.of(storageService));
+
+    lenient()
+        .doReturn(mockPkiBlockCreationConfiguration)
+        .when(mockPkiBlockCreationConfigProvider)
+        .load(pkiKeyStoreConfigurationArgumentCaptor.capture());
+    when(mockBesuComponent.getBesuCommandLogger()).thenReturn(mockLogger);
+  }
+
+  @Before
+  public void setUpStreams() {
+    // reset the global opentelemetry singleton
+    GlobalOpenTelemetry.resetForTest();
+    commandOutput.reset();
+    commandErrorOutput.reset();
+    System.setOut(new PrintStream(commandOutput));
+    System.setErr(new PrintStream(commandErrorOutput));
   }
 
   // Display outputs for debug purpose
   @After
   public void displayOutput() throws IOException {
-    TEST_LOGGER.info("Standard output {}", commandOutput.toString());
-    TEST_LOGGER.info("Standard error {}", commandErrorOutput.toString());
+    TEST_LOGGER.info("Standard output {}", commandOutput.toString(UTF_8));
+    TEST_LOGGER.info("Standard error {}", commandErrorOutput.toString(UTF_8));
 
-    outPrintStream.close();
-    commandOutput.close();
-
-    errPrintStream.close();
-    commandErrorOutput.close();
+    System.setOut(originalOut);
+    System.setErr(originalErr);
     besuCommands.forEach(TestBesuCommand::close);
   }
 
@@ -289,53 +362,106 @@ protected TestBesuCommand parseCommand(final String... args) {
     return parseCommand(System.in, args);
   }
 
+  protected TestBesuCommand parseCommand(final InputStream in, final String... args) {
+    return parseCommand(TestType.NO_PORT_CHECK, in, args);
+  }
+
+  protected TestBesuCommand parseCommandWithRequiredOption(final String... args) {
+    return parseCommand(TestType.REQUIRED_OPTION, System.in, args);
+  }
+
+  protected TestBesuCommand parseCommandWithPortCheck(final String... args) {
+    return parseCommand(TestType.PORT_CHECK, System.in, args);
+  }
+
   private JsonBlockImporter jsonBlockImporterFactory(final BesuController controller) {
     return jsonBlockImporter;
   }
 
-  protected TestBesuCommand parseCommand(final InputStream in, final String... args) {
+  protected TestBesuCommand parseCommand(
+      final TestType testType, final InputStream in, final String... args) {
     // turn off ansi usage globally in picocli
     System.setProperty("picocli.ansi", "false");
+    // reset GlobalOpenTelemetry
+    GlobalOpenTelemetry.resetForTest();
 
-    final TestBesuCommand besuCommand =
-        new TestBesuCommand(
-            mockLogger,
-            nodeKey,
-            keyPair,
-            () -> rlpBlockImporter,
-            this::jsonBlockImporterFactory,
-            (blockchain) -> rlpBlockExporter,
-            mockRunnerBuilder,
-            mockControllerBuilderFactory,
-            mockBesuPluginContext,
-            environment,
-            storageService,
-            securityModuleService);
+    final TestBesuCommand besuCommand = getTestBesuCommand(testType);
     besuCommands.add(besuCommand);
 
+    final File defaultKeyFile =
+        KeyPairUtil.getDefaultKeyFile(DefaultCommandValues.getDefaultBesuDataPath(besuCommand));
+    try {
+      Files.writeString(defaultKeyFile.toPath(), keyPair.getPrivateKey().toString());
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
+    }
     besuCommand.setBesuConfiguration(commonPluginConfiguration);
 
     // parse using Ansi.OFF to be able to assert on non formatted output results
     besuCommand.parse(
-        new RunLast().useOut(outPrintStream).useAnsi(Ansi.OFF),
-        besuCommand.exceptionHandler().useErr(errPrintStream).useAnsi(Ansi.OFF),
+        new RunLast(),
+        besuCommand.parameterExceptionHandler(),
+        besuCommand.executionExceptionHandler(),
         in,
         args);
     return besuCommand;
   }
 
+  private TestBesuCommand getTestBesuCommand(final TestType testType) {
+    switch (testType) {
+      case REQUIRED_OPTION:
+        return new TestBesuCommandWithRequiredOption(
+            mockBesuComponent,
+            () -> rlpBlockImporter,
+            this::jsonBlockImporterFactory,
+            (blockchain) -> rlpBlockExporter,
+            mockRunnerBuilder,
+            mockControllerBuilderFactory,
+            mockBesuPluginContext,
+            environment,
+            storageService,
+            securityModuleService,
+            mockPkiBlockCreationConfigProvider,
+            privacyPluginService);
+      case PORT_CHECK:
+        return new TestBesuCommand(
+            mockBesuComponent,
+            () -> rlpBlockImporter,
+            this::jsonBlockImporterFactory,
+            (blockchain) -> rlpBlockExporter,
+            mockRunnerBuilder,
+            mockControllerBuilderFactory,
+            mockBesuPluginContext,
+            environment,
+            storageService,
+            securityModuleService,
+            mockPkiBlockCreationConfigProvider,
+            privacyPluginService);
+      default:
+        return new TestBesuCommandWithoutPortCheck(
+            mockBesuComponent,
+            () -> rlpBlockImporter,
+            this::jsonBlockImporterFactory,
+            (blockchain) -> rlpBlockExporter,
+            mockRunnerBuilder,
+            mockControllerBuilderFactory,
+            mockBesuPluginContext,
+            environment,
+            storageService,
+            securityModuleService,
+            mockPkiBlockCreationConfigProvider,
+            privacyPluginService);
+    }
+  }
+
   @CommandLine.Command
   public static class TestBesuCommand extends BesuCommand {
 
     @CommandLine.Spec CommandLine.Model.CommandSpec spec;
     private Vertx vertx;
-    private final NodeKey mockNodeKey;
-    private final SECP256K1.KeyPair keyPair;
 
     TestBesuCommand(
-        final Logger mockLogger,
-        final NodeKey mockNodeKey,
-        final SECP256K1.KeyPair keyPair,
+        final BesuComponent besuComponent,
         final Supplier<RlpBlockImporter> mockBlockImporter,
         final Function<BesuController, JsonBlockImporter> jsonBlockImporterFactory,
         final Function<Blockchain, RlpBlockExporter> rlpBlockExporterFactory,
@@ -344,9 +470,11 @@ public static class TestBesuCommand extends BesuCommand {
         final BesuPluginContextImpl besuPluginContext,
         final Map<String, String> environment,
         final StorageServiceImpl storageService,
-        final SecurityModuleServiceImpl securityModuleService) {
+        final SecurityModuleServiceImpl securityModuleService,
+        final PkiBlockCreationConfigurationProvider pkiBlockCreationConfigProvider,
+        final PrivacyPluginServiceImpl privacyPluginService) {
       super(
-          mockLogger,
+          besuComponent,
           mockBlockImporter,
           jsonBlockImporterFactory,
           rlpBlockExporterFactory,
@@ -355,9 +483,12 @@ public static class TestBesuCommand extends BesuCommand {
           besuPluginContext,
           environment,
           storageService,
-          securityModuleService);
-      this.mockNodeKey = mockNodeKey;
-      this.keyPair = keyPair;
+          securityModuleService,
+          new PermissioningServiceImpl(),
+          privacyPluginService,
+          pkiBlockCreationConfigProvider,
+          rpcEndpointServiceImpl,
+          new TransactionSelectionServiceImpl());
     }
 
     @Override
@@ -371,18 +502,6 @@ protected Vertx createVertx(final VertxOptions vertxOptions) {
       return vertx;
     }
 
-    @Override
-    NodeKey buildNodeKey() {
-      // for testing.
-      return mockNodeKey;
-    }
-
-    @Override
-    SECP256K1.KeyPair loadKeyPair() {
-      // for testing.
-      return keyPair;
-    }
-
     public CommandSpec getSpec() {
       return spec;
     }
@@ -415,4 +534,90 @@ public void close() {
       }
     }
   }
+
+  @CommandLine.Command
+  public static class TestBesuCommandWithRequiredOption extends TestBesuCommand {
+
+    @CommandLine.Option(
+        names = {"--accept-terms-and-conditions"},
+        description = "You must explicitly accept terms and conditions",
+        arity = "1",
+        required = true)
+    private final Boolean acceptTermsAndConditions = false;
+
+    TestBesuCommandWithRequiredOption(
+        final BesuComponent besuComponent,
+        final Supplier<RlpBlockImporter> mockBlockImporter,
+        final Function<BesuController, JsonBlockImporter> jsonBlockImporterFactory,
+        final Function<Blockchain, RlpBlockExporter> rlpBlockExporterFactory,
+        final RunnerBuilder mockRunnerBuilder,
+        final BesuController.Builder controllerBuilderFactory,
+        final BesuPluginContextImpl besuPluginContext,
+        final Map<String, String> environment,
+        final StorageServiceImpl storageService,
+        final SecurityModuleServiceImpl securityModuleService,
+        final PkiBlockCreationConfigurationProvider pkiBlockCreationConfigProvider,
+        final PrivacyPluginServiceImpl privacyPluginService) {
+      super(
+          besuComponent,
+          mockBlockImporter,
+          jsonBlockImporterFactory,
+          rlpBlockExporterFactory,
+          mockRunnerBuilder,
+          controllerBuilderFactory,
+          besuPluginContext,
+          environment,
+          storageService,
+          securityModuleService,
+          pkiBlockCreationConfigProvider,
+          privacyPluginService);
+    }
+
+    public Boolean getAcceptTermsAndConditions() {
+      return acceptTermsAndConditions;
+    }
+  }
+
+  @CommandLine.Command
+  public static class TestBesuCommandWithoutPortCheck extends TestBesuCommand {
+
+    TestBesuCommandWithoutPortCheck(
+        final BesuComponent context,
+        final Supplier<RlpBlockImporter> mockBlockImporter,
+        final Function<BesuController, JsonBlockImporter> jsonBlockImporterFactory,
+        final Function<Blockchain, RlpBlockExporter> rlpBlockExporterFactory,
+        final RunnerBuilder mockRunnerBuilder,
+        final BesuController.Builder controllerBuilderFactory,
+        final BesuPluginContextImpl besuPluginContext,
+        final Map<String, String> environment,
+        final StorageServiceImpl storageService,
+        final SecurityModuleServiceImpl securityModuleService,
+        final PkiBlockCreationConfigurationProvider pkiBlockCreationConfigProvider,
+        final PrivacyPluginServiceImpl privacyPluginService) {
+      super(
+          context,
+          mockBlockImporter,
+          jsonBlockImporterFactory,
+          rlpBlockExporterFactory,
+          mockRunnerBuilder,
+          controllerBuilderFactory,
+          besuPluginContext,
+          environment,
+          storageService,
+          securityModuleService,
+          pkiBlockCreationConfigProvider,
+          privacyPluginService);
+    }
+
+    @Override
+    protected void checkIfRequiredPortsAreAvailable() {
+      // For testing, don't check for port conflicts
+    }
+  }
+
+  private enum TestType {
+    REQUIRED_OPTION,
+    PORT_CHECK,
+    NO_PORT_CHECK
+  }
 }
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/ConfigurationOverviewBuilderTest.java b/besu/src/test/java/org/hyperledger/besu/cli/ConfigurationOverviewBuilderTest.java
new file mode 100644
index 00000000000..bb330127451
--- /dev/null
+++ b/besu/src/test/java/org/hyperledger/besu/cli/ConfigurationOverviewBuilderTest.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cli;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+
+class ConfigurationOverviewBuilderTest {
+  private ConfigurationOverviewBuilder builder;
+
+  @BeforeEach
+  void setUp() {
+    builder = new ConfigurationOverviewBuilder(mock(Logger.class));
+  }
+
+  @Test
+  void setNetwork() {
+    final String noNetworkSet = builder.build();
+    assertThat(noNetworkSet).doesNotContain("Network:");
+
+    builder.setNetwork("foobar");
+    final String networkSet = builder.build();
+    assertThat(networkSet).contains("Network: foobar");
+  }
+
+  @Test
+  void setGenesisFile() {
+    final String noGenesisSet = builder.build();
+    assertThat(noGenesisSet).doesNotContain("Network: Custom genesis file specified");
+
+    builder.setNetwork("foobar");
+    final String networkSet = builder.build();
+    assertThat(networkSet).contains("Network: foobar");
+
+    builder.setHasCustomGenesis(true);
+    final String genesisSet = builder.build();
+    assertThat(genesisSet).contains("Network: Custom genesis file specified");
+    assertThat(genesisSet).doesNotContain("Network: foobar");
+  }
+
+  @Test
+  void setNetworkId() {
+    final String noNetworkIdSet = builder.build();
+    assertThat(noNetworkIdSet).doesNotContain("Network Id:");
+
+    builder.setNetworkId(BigInteger.ONE);
+    final String networkIdSet = builder.build();
+    assertThat(networkIdSet).contains("Network Id: 1");
+  }
+
+  @Test
+  void setDataStorage() {
+    final String noDataStorageSet = builder.build();
+    assertThat(noDataStorageSet).doesNotContain("Data storage:");
+
+    builder.setDataStorage("bonsai");
+    final String dataStorageSet = builder.build();
+    assertThat(dataStorageSet).contains("Data storage: bonsai");
+  }
+
+  @Test
+  void setSyncMode() {
+    final String noSyncModeSet = builder.build();
+    assertThat(noSyncModeSet).doesNotContain("Sync mode:");
+
+    builder.setSyncMode("fast");
+    final String syncModeSet = builder.build();
+    assertThat(syncModeSet).contains("Sync mode: fast");
+  }
+
+  @Test
+  void setRpcPort() {
+    final String noRpcPortSet = builder.build();
+    assertThat(noRpcPortSet).doesNotContain("RPC HTTP port:");
+
+    builder.setRpcPort(42);
+    final String rpcPortSet = builder.build();
+    assertThat(rpcPortSet).contains("RPC HTTP port: 42");
+  }
+
+  @Test
+  void setRpcHttpApis() {
+    final String noRpcApisSet = builder.build();
+    assertThat(noRpcApisSet).doesNotContain("RPC HTTP APIs:");
+
+    final Collection<String> rpcApis = new ArrayList<>();
+    rpcApis.add("api1");
+    rpcApis.add("api2");
+    builder.setRpcHttpApis(rpcApis);
+    final String rpcApisSet = builder.build();
+    assertThat(rpcApisSet).contains("RPC HTTP APIs: api1,api2");
+  }
+
+  @Test
+  void setEnginePort() {
+    final String noEnginePortSet = builder.build();
+    assertThat(noEnginePortSet).doesNotContain("Engine port:");
+
+    builder.setEnginePort(42);
+    final String enginePortSet = builder.build();
+    assertThat(enginePortSet).contains("Engine port: 42");
+  }
+
+  @Test
+  void setEngineApis() {
+    final String noEngineApisSet = builder.build();
+    assertThat(noEngineApisSet).doesNotContain("Engine APIs:");
+
+    final Collection<String> engineApis = new ArrayList<>();
+    engineApis.add("api1");
+    engineApis.add("api2");
+    builder.setEngineApis(engineApis);
+    final String engineApisSet = builder.build();
+    assertThat(engineApisSet).contains("Engine APIs: api1,api2");
+  }
+
+  @Test
+  void setHighSpecEnabled() {
+    final String highSpecNotEnabled = builder.build();
+    assertThat(highSpecNotEnabled).doesNotContain("High spec configuration enabled");
+
+    builder.setHighSpecEnabled();
+    final String highSpecEnabled = builder.build();
+    assertThat(highSpecEnabled).contains("High spec configuration enabled");
+  }
+}
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/EnvironmentVariableDefaultProviderTest.java b/besu/src/test/java/org/hyperledger/besu/cli/EnvironmentVariableDefaultProviderTest.java
index 63f8e34428d..af609327340 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/EnvironmentVariableDefaultProviderTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/EnvironmentVariableDefaultProviderTest.java
@@ -22,9 +22,12 @@
 import java.util.Map;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 import picocli.CommandLine.Model.OptionSpec;
 import picocli.CommandLine.Model.PositionalParamSpec;
 
+@RunWith(MockitoJUnitRunner.class)
 public class EnvironmentVariableDefaultProviderTest {
 
   private final Map<String, String> environment = new HashMap<>();
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/NetworkDeprecationMessageTest.java b/besu/src/test/java/org/hyperledger/besu/cli/NetworkDeprecationMessageTest.java
new file mode 100644
index 00000000000..bd73c2670ee
--- /dev/null
+++ b/besu/src/test/java/org/hyperledger/besu/cli/NetworkDeprecationMessageTest.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cli;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.hyperledger.besu.cli.config.NetworkName;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+
+class NetworkDeprecationMessageTest {
+
+  @Disabled("There are no deprecation planned at this time, but keeping for reference")
+  @ParameterizedTest
+  @EnumSource(
+      value = NetworkName.class,
+      names = {"A_DEPRECATED_NETWORK_NAME"})
+  void shouldGenerateDeprecationMessageForDeprecatedNetworks(final NetworkName network) {
+    assertThat(NetworkDeprecationMessage.generate(network))
+        .contains(network.normalize() + " is deprecated and will be shutdown");
+  }
+
+  @ParameterizedTest
+  @EnumSource(
+      value = NetworkName.class,
+      names = {
+        "MAINNET", "SEPOLIA", "GOERLI", "DEV", "CLASSIC", "KOTTI", "MORDOR",
+      })
+  void shouldThrowErrorForNonDeprecatedNetworks(final NetworkName network) {
+    assertThatThrownBy(() -> NetworkDeprecationMessage.generate(network))
+        .isInstanceOf(AssertionError.class);
+  }
+}
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/PasswordSubCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/PasswordSubCommandTest.java
index 70105dc1249..62d35830c0b 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/PasswordSubCommandTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/PasswordSubCommandTest.java
@@ -14,11 +14,17 @@
  */
 package org.hyperledger.besu.cli;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.hyperledger.besu.BesuInfo;
+
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 import picocli.CommandLine.Model.CommandSpec;
 
+@RunWith(MockitoJUnitRunner.class)
 public class PasswordSubCommandTest extends CommandTestAbstract {
 
   @Test
@@ -26,24 +32,25 @@ public void passwordSubCommandExistsWithHashSubCommand() {
     final CommandSpec spec = parseCommand().getSpec();
     assertThat(spec.subcommands()).containsKeys("password");
     assertThat(spec.subcommands().get("password").getSubcommands()).containsKeys("hash");
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void passwordSubCommandExists() {
     parseCommand("password");
 
-    assertThat(commandOutput.toString()).contains("This command provides password related actions");
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8))
+        .contains("This command provides password related actions");
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void passwordHashSubCommandExists() {
     parseCommand("password", "hash");
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Missing required option: '--password=<password>'");
   }
 
@@ -51,18 +58,32 @@ public void passwordHashSubCommandExists() {
   public void passwordHashSubCommandHelpDisplaysHelp() {
     parseCommand("password", "hash", "--help");
 
-    assertThat(commandOutput.toString())
+    assertThat(commandOutput.toString(UTF_8))
         .contains("Usage: besu password hash [-hV] --password=<password>");
-    assertThat(commandOutput.toString())
+    assertThat(commandOutput.toString(UTF_8))
         .contains("This command generates the hash of a given password");
   }
 
+  @Test
+  public void passwordSubCommandVersionDisplaysVersion() {
+    parseCommand("password", "--version");
+    assertThat(commandOutput.toString(UTF_8)).isEqualToIgnoringWhitespace(BesuInfo.version());
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void passwordHashSubCommandVersionDisplaysVersion() {
+    parseCommand("password", "hash", "--version");
+    assertThat(commandOutput.toString(UTF_8)).isEqualToIgnoringWhitespace(BesuInfo.version());
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
   @Test
   public void passwordHashSubCommandHashesPassword() {
     parseCommand("password", "hash", "--password", "foo");
 
     // we can't predict the final value so we are only checking if it starts with the hash marker
-    assertThat(commandOutput.toString()).startsWith("$2");
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).startsWith("$2");
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 }
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/PublicKeySubCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/PublicKeySubCommandTest.java
index 7bc2ea5e75c..3da574e8e32 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/PublicKeySubCommandTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/PublicKeySubCommandTest.java
@@ -14,17 +14,35 @@
  */
 package org.hyperledger.besu.cli;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.contentOf;
 
-import org.hyperledger.besu.crypto.NodeKey;
+import org.hyperledger.besu.BesuInfo;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SECPPrivateKey;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
 import org.hyperledger.besu.ethereum.core.Util;
 
 import java.io.File;
-
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.bouncycastle.asn1.sec.SECNamedCurves;
+import org.bouncycastle.asn1.x9.X9ECParameters;
+import org.bouncycastle.crypto.params.ECDomainParameters;
+import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 import picocli.CommandLine.Model.CommandSpec;
 
+@RunWith(MockitoJUnitRunner.class)
 public class PublicKeySubCommandTest extends CommandTestAbstract {
 
   private static final String EXPECTED_PUBLIC_KEY_USAGE =
@@ -48,34 +66,76 @@ public class PublicKeySubCommandTest extends CommandTestAbstract {
           + System.lineSeparator();
 
   private static final String EXPECTED_PUBLIC_KEY_EXPORT_USAGE =
-      "Usage: besu public-key export [-hV] [--to=<FILE>]"
+      "Usage: besu public-key export [-hV] [--ec-curve[=<NAME>]]"
+          + System.lineSeparator()
+          + "                              [--node-private-key-file=<PATH>] [--to=<FILE>]"
           + System.lineSeparator()
           + "This command outputs the node public key. Default output is standard output."
           + System.lineSeparator()
-          + "  -h, --help        Show this help message and exit."
+          + "      --ec-curve[=<NAME>]   Elliptic curve to use when creating a new key"
+          + System.lineSeparator()
+          + "                              (default: secp256k1)"
+          + System.lineSeparator()
+          + "  -h, --help                Show this help message and exit."
+          + System.lineSeparator()
+          + "      --node-private-key-file=<PATH>"
+          + System.lineSeparator()
+          + "                            The node's private key file (default: a file named"
+          + System.lineSeparator()
+          + "                              \"key\" in the Besu data directory)"
+          + System.lineSeparator()
+          + "      --to=<FILE>           File to write public key to instead of standard"
           + System.lineSeparator()
-          + "      --to=<FILE>   File to write public key to instead of standard output"
+          + "                              output"
           + System.lineSeparator()
-          + "  -V, --version     Print version information and exit."
+          + "  -V, --version             Print version information and exit."
           + System.lineSeparator();
 
   private static final String EXPECTED_PUBLIC_KEY_EXPORT_ADDRESS_USAGE =
-      "Usage: besu public-key export-address [-hV] [--to=<FILE>]"
+      "Usage: besu public-key export-address [-hV] [--ec-curve[=<NAME>]]"
+          + System.lineSeparator()
+          + "                                      [--node-private-key-file=<PATH>]"
+          + System.lineSeparator()
+          + "                                      [--to=<FILE>]"
           + System.lineSeparator()
           + "This command outputs the node's account address. Default output is standard"
           + System.lineSeparator()
           + "output."
           + System.lineSeparator()
-          + "  -h, --help        Show this help message and exit."
+          + "      --ec-curve[=<NAME>]   Elliptic curve to use when creating a new key"
+          + System.lineSeparator()
+          + "                              (default: secp256k1)"
+          + System.lineSeparator()
+          + "  -h, --help                Show this help message and exit."
           + System.lineSeparator()
-          + "      --to=<FILE>   File to write address to instead of standard output"
+          + "      --node-private-key-file=<PATH>"
           + System.lineSeparator()
-          + "  -V, --version     Print version information and exit."
+          + "                            The node's private key file (default: a file named"
+          + System.lineSeparator()
+          + "                              \"key\" in the Besu data directory)"
+          + System.lineSeparator()
+          + "      --to=<FILE>           File to write address to instead of standard output"
+          + System.lineSeparator()
+          + "  -V, --version             Print version information and exit."
           + System.lineSeparator();
 
   private static final String PUBLIC_KEY_SUBCOMMAND_NAME = "public-key";
   private static final String PUBLIC_KEY_EXPORT_SUBCOMMAND_NAME = "export";
   private static final String PUBLIC_KEY_EXPORT_ADDRESS_SUBCOMMAND_NAME = "export-address";
+  private static final String CURVE_NAME = "secp256k1";
+  private static final String ALGORITHM = SignatureAlgorithm.ALGORITHM;
+  private static ECDomainParameters curve;
+
+  @BeforeClass
+  public static void setUp() {
+    final X9ECParameters params = SECNamedCurves.getByName(CURVE_NAME);
+    curve = new ECDomainParameters(params.getCurve(), params.getG(), params.getN(), params.getH());
+  }
+
+  @Before
+  public void before() {
+    SignatureAlgorithmFactory.resetInstance();
+  }
 
   // public-key sub-command
   @Test
@@ -85,30 +145,44 @@ public void publicKeySubCommandExistsAndHasSubCommands() {
     assertThat(spec.subcommands().get(PUBLIC_KEY_SUBCOMMAND_NAME).getSubcommands())
         .containsKeys(PUBLIC_KEY_EXPORT_SUBCOMMAND_NAME)
         .containsKeys(PUBLIC_KEY_EXPORT_ADDRESS_SUBCOMMAND_NAME);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void callingPublicKeySubCommandWithoutSubSubcommandMustDisplayUsage() {
     parseCommand(PUBLIC_KEY_SUBCOMMAND_NAME);
-    assertThat(commandOutput.toString()).startsWith(EXPECTED_PUBLIC_KEY_USAGE);
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_PUBLIC_KEY_USAGE);
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void callingPublicKeySubCommandHelpMustDisplayUsage() {
     parseCommand(PUBLIC_KEY_SUBCOMMAND_NAME, "--help");
-    assertThat(commandOutput.toString()).startsWith(EXPECTED_PUBLIC_KEY_USAGE);
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_PUBLIC_KEY_USAGE);
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void callingPublicKeySubCommandVersionMustDisplayVersion() {
+    parseCommand(PUBLIC_KEY_SUBCOMMAND_NAME, "--version");
+    assertThat(commandOutput.toString(UTF_8)).isEqualToIgnoringWhitespace(BesuInfo.version());
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   // Export public key sub-sub-command
   @Test
   public void callingPublicKeyExportSubCommandHelpMustDisplayUsage() {
     parseCommand(PUBLIC_KEY_SUBCOMMAND_NAME, PUBLIC_KEY_EXPORT_SUBCOMMAND_NAME, "--help");
-    assertThat(commandOutput.toString()).startsWith(EXPECTED_PUBLIC_KEY_EXPORT_USAGE);
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_PUBLIC_KEY_EXPORT_USAGE);
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void callingPublicKeyExportSubCommandVersionMustDisplayVersion() {
+    parseCommand(PUBLIC_KEY_SUBCOMMAND_NAME, PUBLIC_KEY_EXPORT_SUBCOMMAND_NAME, "--version");
+    assertThat(commandOutput.toString(UTF_8)).isEqualToIgnoringWhitespace(BesuInfo.version());
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -118,8 +192,8 @@ public void callingPublicKeyExportSubCommandWithoutPathMustWriteKeyToStandardOut
     parseCommand(PUBLIC_KEY_SUBCOMMAND_NAME, PUBLIC_KEY_EXPORT_SUBCOMMAND_NAME);
 
     final String expectedOutputStart = nodeKey.getPublicKey().toString();
-    assertThat(commandOutput.toString()).startsWith(expectedOutputStart);
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).startsWith(expectedOutputStart);
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -137,16 +211,74 @@ public void callingPublicKeyExportSubCommandWithFilePathMustWritePublicKeyInThis
         .startsWith(nodeKey.getPublicKey().toString())
         .endsWith(nodeKey.getPublicKey().toString());
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void callingPublicKeyExportSubCommandWithPrivateKeyFileMustWriteKeyToStandardOutput()
+      throws IOException {
+    final SECPPrivateKey privateKey =
+        SECPPrivateKey.create(
+            Bytes32.fromHexString(
+                "0x8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63"),
+            ALGORITHM);
+    final KeyPair keyPair = KeyPair.create(privateKey, curve, ALGORITHM);
+
+    final Path privateKeyFile = Files.createTempFile("private", "address");
+    Files.writeString(privateKeyFile, privateKey.toString());
+
+    parseCommand(
+        PUBLIC_KEY_SUBCOMMAND_NAME,
+        PUBLIC_KEY_EXPORT_SUBCOMMAND_NAME,
+        "--node-private-key-file",
+        privateKeyFile.toString());
+
+    final String expectedOutputStart = keyPair.getPublicKey().toString();
+    assertThat(commandOutput.toString(UTF_8)).startsWith(expectedOutputStart);
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void callingPublicKeyExportSubCommandWithNonExistentMustDisplayError() {
+    parseCommand(
+        PUBLIC_KEY_SUBCOMMAND_NAME,
+        PUBLIC_KEY_EXPORT_SUBCOMMAND_NAME,
+        "--node-private-key-file",
+        "/non/existent/file");
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).startsWith("Private key file doesn't exist");
+  }
+
+  @Test
+  public void callingPublicKeyExportSubCommandWithInvalidFileMustDisplayError() throws IOException {
+    final Path privateKeyFile = Files.createTempFile("private", "address");
+    Files.writeString(privateKeyFile, "invalid private key");
+
+    parseCommand(
+        PUBLIC_KEY_SUBCOMMAND_NAME,
+        PUBLIC_KEY_EXPORT_SUBCOMMAND_NAME,
+        "--node-private-key-file",
+        privateKeyFile.toString());
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .startsWith("Private key cannot be loaded from file");
   }
 
   // Export address sub-sub-command
   @Test
   public void callingPublicKeyExportAddressSubCommandHelpMustDisplayUsage() {
     parseCommand(PUBLIC_KEY_SUBCOMMAND_NAME, PUBLIC_KEY_EXPORT_ADDRESS_SUBCOMMAND_NAME, "--help");
-    assertThat(commandOutput.toString()).startsWith(EXPECTED_PUBLIC_KEY_EXPORT_ADDRESS_USAGE);
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_PUBLIC_KEY_EXPORT_ADDRESS_USAGE);
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void callingPublicKeyExportAddressSubCommandVersionMustDisplayVersion() {
+    parseCommand(
+        PUBLIC_KEY_SUBCOMMAND_NAME, PUBLIC_KEY_EXPORT_ADDRESS_SUBCOMMAND_NAME, "--version");
+    assertThat(commandOutput.toString(UTF_8)).isEqualToIgnoringWhitespace(BesuInfo.version());
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -156,8 +288,8 @@ public void callingPublicKeyExportAddressSubCommandWithoutPathMustWriteAddressTo
     parseCommand(PUBLIC_KEY_SUBCOMMAND_NAME, PUBLIC_KEY_EXPORT_ADDRESS_SUBCOMMAND_NAME);
 
     final String expectedOutputStart = Util.publicKeyToAddress(nodeKey.getPublicKey()).toString();
-    assertThat(commandOutput.toString()).startsWith(expectedOutputStart);
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).startsWith(expectedOutputStart);
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -178,7 +310,184 @@ public void callingPublicKeyExportAddressSubCommandWithFilePathMustWriteAddressI
         .startsWith(Util.publicKeyToAddress(nodeKey.getPublicKey()).toString())
         .endsWith(Util.publicKeyToAddress(nodeKey.getPublicKey()).toString());
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void
+      callingPublicKeyExportAddressSubCommandWithPrivateKeyFileMustWriteKeyToStandardOutput()
+          throws IOException {
+    final SECPPrivateKey privateKey =
+        SECPPrivateKey.create(
+            Bytes32.fromHexString(
+                "0x8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63"),
+            ALGORITHM);
+    final KeyPair keyPair = KeyPair.create(privateKey, curve, ALGORITHM);
+
+    final Path privateKeyFile = Files.createTempFile("private", "address");
+    Files.writeString(privateKeyFile, privateKey.toString());
+
+    parseCommand(
+        PUBLIC_KEY_SUBCOMMAND_NAME,
+        PUBLIC_KEY_EXPORT_ADDRESS_SUBCOMMAND_NAME,
+        "--node-private-key-file",
+        privateKeyFile.toString());
+
+    final String expectedOutputStart = Util.publicKeyToAddress(keyPair.getPublicKey()).toString();
+    assertThat(commandOutput.toString(UTF_8)).startsWith(expectedOutputStart);
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void callingPublicKeyExportAddressSubCommandWithNonExistentMustDisplayError() {
+    parseCommand(
+        PUBLIC_KEY_SUBCOMMAND_NAME,
+        PUBLIC_KEY_EXPORT_ADDRESS_SUBCOMMAND_NAME,
+        "--node-private-key-file",
+        "/non/existent/file");
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).startsWith("Private key file doesn't exist");
+  }
+
+  @Test
+  public void callingPublicKeyExportAddressSubCommandWithInvalidFileMustDisplayError()
+      throws IOException {
+    final Path privateKeyFile = Files.createTempFile("private", "address");
+    Files.writeString(privateKeyFile, "invalid private key");
+
+    parseCommand(
+        PUBLIC_KEY_SUBCOMMAND_NAME,
+        PUBLIC_KEY_EXPORT_ADDRESS_SUBCOMMAND_NAME,
+        "--node-private-key-file",
+        privateKeyFile.toString());
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .startsWith("Private key cannot be loaded from file");
+  }
+
+  @Test
+  public void
+      callingPublicKeyExportSubCommandWithEcCurveNameCorrectlyConfiguresSignatureAlgorithmFactory()
+          throws Exception {
+    assertThat(SignatureAlgorithmFactory.isInstanceSet()).isFalse();
+
+    final File file = File.createTempFile("public", "key");
+
+    parseCommand(
+        PUBLIC_KEY_SUBCOMMAND_NAME,
+        PUBLIC_KEY_EXPORT_SUBCOMMAND_NAME,
+        "--to",
+        file.getPath(),
+        "--ec-curve",
+        CURVE_NAME);
+
+    assertThat(SignatureAlgorithmFactory.isInstanceSet()).isTrue();
+    assertThat(SignatureAlgorithmFactory.getInstance().getCurveName()).isEqualTo(CURVE_NAME);
+  }
+
+  @Test
+  public void
+      callingPublicKeyExportSubCommandWithoutEcCurveNameDoesNotConfiguresSignatureAlgorithmFactory()
+          throws Exception {
+    assertThat(SignatureAlgorithmFactory.isInstanceSet()).isFalse();
+
+    final File file = File.createTempFile("public", "key");
+
+    parseCommand(
+        PUBLIC_KEY_SUBCOMMAND_NAME, PUBLIC_KEY_EXPORT_SUBCOMMAND_NAME, "--to", file.getPath());
+
+    assertThat(SignatureAlgorithmFactory.isInstanceSet()).isFalse();
+  }
+
+  @Test
+  public void callingPublicKeyExportSubCommandWithInvalidEcCurveNameFails() throws Exception {
+    final File file = File.createTempFile("public", "key");
+
+    parseCommand(
+        PUBLIC_KEY_SUBCOMMAND_NAME,
+        PUBLIC_KEY_EXPORT_SUBCOMMAND_NAME,
+        "--to",
+        file.getPath(),
+        "--ec-curve",
+        "foo");
+
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains("foo is not in the list of valid elliptic curves");
+  }
+
+  @Test
+  public void
+      callingPublicKeyExportAddressSubCommandWithEcCurveNameCorrectlyConfiguresSignatureAlgorithmFactory()
+          throws Exception {
+    assertThat(SignatureAlgorithmFactory.isInstanceSet()).isFalse();
+
+    final SECPPrivateKey privateKey =
+        SECPPrivateKey.create(
+            Bytes32.fromHexString(
+                "0x8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63"),
+            ALGORITHM);
+
+    final Path privateKeyFile = Files.createTempFile("private", "address");
+    Files.writeString(privateKeyFile, privateKey.toString());
+
+    parseCommand(
+        PUBLIC_KEY_SUBCOMMAND_NAME,
+        PUBLIC_KEY_EXPORT_ADDRESS_SUBCOMMAND_NAME,
+        "--node-private-key-file",
+        privateKeyFile.toString(),
+        "--ec-curve",
+        CURVE_NAME);
+
+    assertThat(SignatureAlgorithmFactory.isInstanceSet()).isTrue();
+    assertThat(SignatureAlgorithmFactory.getInstance().getCurveName()).isEqualTo(CURVE_NAME);
+  }
+
+  @Test
+  public void
+      callingPublicKeyExportAddressSubCommandWithoutEcCurveNameDoesNotConfiguresSignatureAlgorithmFactory()
+          throws Exception {
+    assertThat(SignatureAlgorithmFactory.isInstanceSet()).isFalse();
+
+    final SECPPrivateKey privateKey =
+        SECPPrivateKey.create(
+            Bytes32.fromHexString(
+                "0x8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63"),
+            ALGORITHM);
+
+    final Path privateKeyFile = Files.createTempFile("private", "address");
+    Files.writeString(privateKeyFile, privateKey.toString());
+
+    parseCommand(
+        PUBLIC_KEY_SUBCOMMAND_NAME,
+        PUBLIC_KEY_EXPORT_ADDRESS_SUBCOMMAND_NAME,
+        "--node-private-key-file",
+        privateKeyFile.toString());
+
+    assertThat(SignatureAlgorithmFactory.isInstanceSet()).isFalse();
+  }
+
+  @Test
+  public void callingPublicKeyExportAddressSubCommandWithInvalidEcCurveNameFails()
+      throws Exception {
+    final SECPPrivateKey privateKey =
+        SECPPrivateKey.create(
+            Bytes32.fromHexString(
+                "0x8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63"),
+            ALGORITHM);
+
+    final Path privateKeyFile = Files.createTempFile("private", "address");
+    Files.writeString(privateKeyFile, privateKey.toString());
+
+    parseCommand(
+        PUBLIC_KEY_SUBCOMMAND_NAME,
+        PUBLIC_KEY_EXPORT_ADDRESS_SUBCOMMAND_NAME,
+        "--node-private-key-file",
+        privateKeyFile.toString(),
+        "--ec-curve",
+        "foo");
+
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains("foo is not in the list of valid elliptic curves");
   }
 }
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/TomlConfigFileDefaultProviderTest.java b/besu/src/test/java/org/hyperledger/besu/cli/TomlConfigFileDefaultProviderTest.java
index 92f8d9fb8e7..1481db9526d 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/TomlConfigFileDefaultProviderTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/TomlConfigFileDefaultProviderTest.java
@@ -16,10 +16,11 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.cli.util.TomlConfigFileDefaultProvider;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.datatypes.Wei;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -31,7 +32,6 @@
 
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -49,13 +49,12 @@ public class TomlConfigFileDefaultProviderTest {
 
   @Rule public final TemporaryFolder temp = new TemporaryFolder();
 
-  @Rule public ExpectedException exceptionRule = ExpectedException.none();
-
   @Test
   public void defaultValueForMatchingKey() throws IOException {
     when(mockCommandLine.getCommandSpec()).thenReturn(mockCommandSpec);
     Map<String, OptionSpec> validOptionsMap = new HashMap<>();
     validOptionsMap.put("--a-short-option", null);
+    validOptionsMap.put("--an-actual-long-option", null);
     validOptionsMap.put("--a-longer-option", null);
     when(mockCommandSpec.optionsMap()).thenReturn(validOptionsMap);
 
@@ -65,6 +64,8 @@ public void defaultValueForMatchingKey() throws IOException {
 
       fileWriter.write("a-short-option='123'");
       fileWriter.newLine();
+      fileWriter.write("an-actual-long-option=" + Long.MAX_VALUE);
+      fileWriter.newLine();
       fileWriter.write("a-longer-option='1234'");
       fileWriter.flush();
 
@@ -86,6 +87,15 @@ public void defaultValueForMatchingKey() throws IOException {
                       .build()))
           .isEqualTo("123");
 
+      // this option must be found in config as one of its names is present in the file.
+      // also this is a long.
+      assertThat(
+              providerUnderTest.defaultValue(
+                  OptionSpec.builder("an-actual-long-option", "another-name-for-the-option")
+                      .type(Long.class)
+                      .build()))
+          .isEqualTo(String.valueOf(Long.MAX_VALUE));
+
       // this option must be found in config as one of its names is present in the file.
       // also this is the longest one.
       assertThat(
@@ -109,6 +119,8 @@ public void defaultValueForOptionMustMatchType() throws IOException {
     validOptionsMap.put("--a-wei-value-option", null);
     validOptionsMap.put("--a-string-value-option", null);
     validOptionsMap.put("--a-nested-multi-value-option", null);
+    validOptionsMap.put("--a-double-value-option", null);
+    validOptionsMap.put("--a-double-value-option-int", null);
 
     when(mockCommandSpec.optionsMap()).thenReturn(validOptionsMap);
 
@@ -136,6 +148,10 @@ public void defaultValueForOptionMustMatchType() throws IOException {
       fileWriter.newLine();
       fileWriter.write(
           "a-nested-multi-value-option=[ [\"value1\", \"value2\"], [\"value3\", \"value4\"] ]");
+      fileWriter.newLine();
+      fileWriter.write("a-double-value-option=0.01");
+      fileWriter.newLine();
+      fileWriter.write("a-double-value-option-int=1"); // should be able to parse int as double
       fileWriter.flush();
 
       final TomlConfigFileDefaultProvider providerUnderTest =
@@ -188,6 +204,16 @@ public void defaultValueForOptionMustMatchType() throws IOException {
                   OptionSpec.builder("a-string-value-option").type(String.class).build()))
           .isEqualTo("my value");
 
+      assertThat(
+              providerUnderTest.defaultValue(
+                  OptionSpec.builder("a-double-value-option").type(Double.class).build()))
+          .isEqualTo("0.01");
+
+      assertThat(
+              providerUnderTest.defaultValue(
+                  OptionSpec.builder("a-double-value-option-int").type(Double.class).build()))
+          .isEqualTo("1");
+
       assertThat(
               providerUnderTest.defaultValue(
                   OptionSpec.builder("a-nested-multi-value-option").type(Collection.class).build()))
@@ -198,74 +224,152 @@ public void defaultValueForOptionMustMatchType() throws IOException {
   @Test
   public void configFileNotFoundMustThrow() {
 
-    exceptionRule.expect(ParameterException.class);
-
     final File nonExistingFile = new File("doesnt.exit");
-    exceptionRule.expectMessage("Unable to read TOML configuration, file not found.");
 
     final TomlConfigFileDefaultProvider providerUnderTest =
         new TomlConfigFileDefaultProvider(mockCommandLine, nonExistingFile);
 
-    providerUnderTest.defaultValue(OptionSpec.builder("an-option").type(String.class).build());
+    assertThatThrownBy(
+            () ->
+                providerUnderTest.defaultValue(
+                    OptionSpec.builder("an-option").type(String.class).build()))
+        .isInstanceOf(ParameterException.class)
+        .hasMessage("Unable to read TOML configuration, file not found.");
   }
 
   @Test
   public void invalidConfigMustThrow() throws IOException {
 
-    exceptionRule.expect(ParameterException.class);
-    exceptionRule.expectMessage("Unable to read TOML configuration file");
-
     final File tempConfigFile = temp.newFile("config.toml");
 
     final TomlConfigFileDefaultProvider providerUnderTest =
         new TomlConfigFileDefaultProvider(mockCommandLine, tempConfigFile);
 
-    providerUnderTest.defaultValue(OptionSpec.builder("an-option").type(String.class).build());
+    assertThatThrownBy(
+            () ->
+                providerUnderTest.defaultValue(
+                    OptionSpec.builder("an-option").type(String.class).build()))
+        .isInstanceOf(ParameterException.class)
+        .hasMessageContaining("Unable to read TOML configuration file");
   }
 
   @Test
   public void invalidConfigContentMustThrow() throws IOException {
 
-    exceptionRule.expect(ParameterException.class);
-    exceptionRule.expectMessage(
-        "Invalid TOML configuration: org.apache.tuweni.toml.TomlParseError: Unexpected '=', expected ', \", ''', "
-            + "\"\"\", a number, a boolean, a date/time, an array, or a table (line 1, column 19)");
-
     final File tempConfigFile = temp.newFile("config.toml");
-    try (final BufferedWriter fileWriter =
-        Files.newBufferedWriter(tempConfigFile.toPath(), UTF_8)) {
+    final BufferedWriter fileWriter = Files.newBufferedWriter(tempConfigFile.toPath(), UTF_8);
 
-      fileWriter.write("an-invalid-syntax=======....");
-      fileWriter.flush();
+    fileWriter.write("an-invalid-syntax=======....");
+    fileWriter.flush();
 
-      final TomlConfigFileDefaultProvider providerUnderTest =
-          new TomlConfigFileDefaultProvider(mockCommandLine, tempConfigFile);
+    final TomlConfigFileDefaultProvider providerUnderTest =
+        new TomlConfigFileDefaultProvider(mockCommandLine, tempConfigFile);
 
-      providerUnderTest.defaultValue(OptionSpec.builder("an-option").type(String.class).build());
-    }
+    assertThatThrownBy(
+            () ->
+                providerUnderTest.defaultValue(
+                    OptionSpec.builder("an-option").type(String.class).build()))
+        .isInstanceOf(ParameterException.class)
+        .hasMessage(
+            "Invalid TOML configuration: org.apache.tuweni.toml.TomlParseError: Unexpected '=', expected ', \", ''', "
+                + "\"\"\", a number, a boolean, a date/time, an array, or a table (line 1, column 19)");
   }
 
   @Test
   public void unknownOptionMustThrow() throws IOException {
 
-    exceptionRule.expect(ParameterException.class);
-    exceptionRule.expectMessage("Unknown option in TOML configuration file: invalid_option");
+    when(mockCommandLine.getCommandSpec()).thenReturn(mockCommandSpec);
+    Map<String, OptionSpec> validOptionsMap = new HashMap<>();
+    when(mockCommandSpec.optionsMap()).thenReturn(validOptionsMap);
+
+    final File tempConfigFile = temp.newFile("config.toml");
+    final BufferedWriter fileWriter = Files.newBufferedWriter(tempConfigFile.toPath(), UTF_8);
+
+    fileWriter.write("invalid_option=true");
+    fileWriter.flush();
+
+    final TomlConfigFileDefaultProvider providerUnderTest =
+        new TomlConfigFileDefaultProvider(mockCommandLine, tempConfigFile);
+
+    assertThatThrownBy(
+            () ->
+                providerUnderTest.defaultValue(
+                    OptionSpec.builder("an-option").type(String.class).build()))
+        .isInstanceOf(ParameterException.class)
+        .hasMessage("Unknown option in TOML configuration file: invalid_option");
+  }
+
+  @Test
+  public void tomlTableHeadingsMustBeIgnored() throws IOException {
 
     when(mockCommandLine.getCommandSpec()).thenReturn(mockCommandSpec);
+
     Map<String, OptionSpec> validOptionsMap = new HashMap<>();
+    validOptionsMap.put("--a-valid-option", null);
+    validOptionsMap.put("--another-valid-option", null);
+    validOptionsMap.put("--onemore-valid-option", null);
     when(mockCommandSpec.optionsMap()).thenReturn(validOptionsMap);
 
     final File tempConfigFile = temp.newFile("config.toml");
-    try (final BufferedWriter fileWriter =
-        Files.newBufferedWriter(tempConfigFile.toPath(), UTF_8)) {
+    final BufferedWriter fileWriter = Files.newBufferedWriter(tempConfigFile.toPath(), UTF_8);
+
+    fileWriter.write("a-valid-option=123");
+    fileWriter.newLine();
+    fileWriter.write("[ignoreme]");
+    fileWriter.newLine();
+    fileWriter.write("another-valid-option=456");
+    fileWriter.newLine();
+    fileWriter.write("onemore-valid-option=789");
+    fileWriter.newLine();
+    fileWriter.flush();
 
-      fileWriter.write("invalid_option=true");
-      fileWriter.flush();
+    final TomlConfigFileDefaultProvider providerUnderTest =
+        new TomlConfigFileDefaultProvider(mockCommandLine, tempConfigFile);
 
-      final TomlConfigFileDefaultProvider providerUnderTest =
-          new TomlConfigFileDefaultProvider(mockCommandLine, tempConfigFile);
+    assertThat(
+            providerUnderTest.defaultValue(
+                OptionSpec.builder("a-valid-option").type(Integer.class).build()))
+        .isEqualTo("123");
 
-      providerUnderTest.defaultValue(OptionSpec.builder("an-option").type(String.class).build());
-    }
+    assertThat(
+            providerUnderTest.defaultValue(
+                OptionSpec.builder("another-valid-option").type(Integer.class).build()))
+        .isEqualTo("456");
+
+    assertThat(
+            providerUnderTest.defaultValue(
+                OptionSpec.builder("onemore-valid-option").type(Integer.class).build()))
+        .isEqualTo("789");
+  }
+
+  @Test
+  public void tomlTableHeadingsMustNotSkipValidationOfUnknownOptions() throws IOException {
+
+    when(mockCommandLine.getCommandSpec()).thenReturn(mockCommandSpec);
+
+    Map<String, OptionSpec> validOptionsMap = new HashMap<>();
+    validOptionsMap.put("--a-valid-option", null);
+    when(mockCommandSpec.optionsMap()).thenReturn(validOptionsMap);
+
+    final File tempConfigFile = temp.newFile("config.toml");
+    final BufferedWriter fileWriter = Files.newBufferedWriter(tempConfigFile.toPath(), UTF_8);
+
+    fileWriter.write("[ignoreme]");
+    fileWriter.newLine();
+    fileWriter.write("a-valid-option=123");
+    fileWriter.newLine();
+    fileWriter.write("invalid-option=789");
+    fileWriter.newLine();
+    fileWriter.flush();
+
+    final TomlConfigFileDefaultProvider providerUnderTest =
+        new TomlConfigFileDefaultProvider(mockCommandLine, tempConfigFile);
+
+    assertThatThrownBy(
+            () ->
+                providerUnderTest.defaultValue(
+                    OptionSpec.builder("an-option").type(String.class).build()))
+        .isInstanceOf(ParameterException.class)
+        .hasMessage("Unknown option in TOML configuration file: invalid-option");
   }
 }
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/ValidateConfigSubCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/ValidateConfigSubCommandTest.java
new file mode 100644
index 00000000000..dc8d0548e0c
--- /dev/null
+++ b/besu/src/test/java/org/hyperledger/besu/cli/ValidateConfigSubCommandTest.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cli;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.BesuInfo;
+
+import java.io.IOException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import com.google.common.io.Resources;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+import picocli.CommandLine.Model.CommandSpec;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ValidateConfigSubCommandTest extends CommandTestAbstract {
+
+  private static final String EXPECTED_PUBLIC_KEY_USAGE =
+      "Usage: besu validate-config [-hV] [--config-file=<PATH>]"
+          + System.lineSeparator()
+          + "This command provides basic Besu config validation (syntax only)."
+          + System.lineSeparator()
+          + "      --config-file=<PATH>   Path to Besu config file"
+          + System.lineSeparator()
+          + "  -h, --help                 Show this help message and exit."
+          + System.lineSeparator()
+          + "  -V, --version              Print version information and exit."
+          + System.lineSeparator();
+
+  private static final String VALIDATE_CONFIG_SUBCOMMAND_NAME = "validate-config";
+
+  @Test
+  public void validateConfigSubCommandExists() {
+    CommandSpec spec = parseCommand().getSpec();
+    assertThat(spec.subcommands()).containsKeys(VALIDATE_CONFIG_SUBCOMMAND_NAME);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void callingValidateConfigSubCommandHelpMustDisplayUsage() {
+    parseCommand(VALIDATE_CONFIG_SUBCOMMAND_NAME, "--help");
+    assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_PUBLIC_KEY_USAGE);
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void callingValidateConfigSubCommandVersionMustDisplayVersion() {
+    parseCommand(VALIDATE_CONFIG_SUBCOMMAND_NAME, "--version");
+    assertThat(commandOutput.toString(UTF_8)).isEqualToIgnoringWhitespace(BesuInfo.version());
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void callingValidateConfigSubCommandWithNonExistentMustDisplayError() {
+    parseCommand(VALIDATE_CONFIG_SUBCOMMAND_NAME, "--config-file", "/non/existent/file");
+    assertThat(commandOutput.toString(UTF_8))
+        .contains("Unable to read TOML configuration, file not found.");
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void callingValidateConfigSubCommandWithInvalidFileMustDisplayError() throws IOException {
+    final Path invalidToml = Files.createTempFile("invalid", "toml");
+    Files.writeString(invalidToml, "xyz=");
+    invalidToml.toFile().deleteOnExit();
+
+    parseCommand(VALIDATE_CONFIG_SUBCOMMAND_NAME, "--config-file", invalidToml.toString());
+    assertThat(commandOutput.toString(UTF_8)).contains("Invalid TOML configuration");
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void callingValidateConfigSubCommandWithValidTomlFileSucceeds() throws IOException {
+
+    final URL configFile = this.getClass().getResource("/everything_config.toml");
+    final Path validToml = Files.createTempFile("valid", "toml");
+    Files.write(validToml, Resources.toByteArray(configFile));
+    validToml.toFile().deleteOnExit();
+
+    parseCommand(VALIDATE_CONFIG_SUBCOMMAND_NAME, "--config-file", validToml.toString());
+    assertThat(commandOutput.toString(UTF_8)).startsWith("TOML config file is valid");
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+}
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/config/EthNetworkConfigTest.java b/besu/src/test/java/org/hyperledger/besu/cli/config/EthNetworkConfigTest.java
index bab4fd68a19..66e8592b5e4 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/config/EthNetworkConfigTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/config/EthNetworkConfigTest.java
@@ -16,17 +16,18 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hyperledger.besu.cli.config.NetworkName.MAINNET;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.GOERLI_BOOTSTRAP_NODES;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.GOERLI_DISCOVERY_URL;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.MAINNET_BOOTSTRAP_NODES;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.MAINNET_DISCOVERY_URL;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.RINKEBY_BOOTSTRAP_NODES;
-import static org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration.RINKEBY_DISCOVERY_URL;
+import static org.hyperledger.besu.ethereum.p2p.config.DefaultDiscoveryConfiguration.GOERLI_BOOTSTRAP_NODES;
+import static org.hyperledger.besu.ethereum.p2p.config.DefaultDiscoveryConfiguration.GOERLI_DISCOVERY_URL;
+import static org.hyperledger.besu.ethereum.p2p.config.DefaultDiscoveryConfiguration.MAINNET_BOOTSTRAP_NODES;
+import static org.hyperledger.besu.ethereum.p2p.config.DefaultDiscoveryConfiguration.MAINNET_DISCOVERY_URL;
 
 import java.math.BigInteger;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class EthNetworkConfigTest {
 
   @Test
@@ -37,14 +38,6 @@ public void testDefaultMainnetConfig() {
     assertThat(config.getNetworkId()).isEqualTo(BigInteger.ONE);
   }
 
-  @Test
-  public void testDefaultRinkebyConfig() {
-    EthNetworkConfig config = EthNetworkConfig.getNetworkConfig(NetworkName.RINKEBY);
-    assertThat(config.getDnsDiscoveryUrl()).isEqualTo(RINKEBY_DISCOVERY_URL);
-    assertThat(config.getBootNodes()).isEqualTo(RINKEBY_BOOTSTRAP_NODES);
-    assertThat(config.getNetworkId()).isEqualTo(BigInteger.valueOf(4));
-  }
-
   @Test
   public void testDefaultGoerliConfig() {
     EthNetworkConfig config = EthNetworkConfig.getNetworkConfig(NetworkName.GOERLI);
@@ -61,6 +54,22 @@ public void testDefaultDevConfig() {
     assertThat(config.getNetworkId()).isEqualTo(BigInteger.valueOf(2018));
   }
 
+  @Test
+  public void testDefaultFutureConfig() {
+    EthNetworkConfig config = EthNetworkConfig.getNetworkConfig(NetworkName.FUTURE_EIPS);
+    assertThat(config.getDnsDiscoveryUrl()).isNull();
+    assertThat(config.getBootNodes()).isEmpty();
+    assertThat(config.getNetworkId()).isEqualTo(BigInteger.valueOf(2022));
+  }
+
+  @Test
+  public void testDefaultExperimentalConfig() {
+    EthNetworkConfig config = EthNetworkConfig.getNetworkConfig(NetworkName.EXPERIMENTAL_EIPS);
+    assertThat(config.getDnsDiscoveryUrl()).isNull();
+    assertThat(config.getBootNodes()).isEmpty();
+    assertThat(config.getNetworkId()).isEqualTo(BigInteger.valueOf(2023));
+  }
+
   @Test
   public void testBuilderWithNetworkId() {
     EthNetworkConfig config =
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/converter/FractionConverterTest.java b/besu/src/test/java/org/hyperledger/besu/cli/converter/FractionConverterTest.java
index 271149fbe71..022bca1ec27 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/converter/FractionConverterTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/converter/FractionConverterTest.java
@@ -20,7 +20,10 @@
 import org.hyperledger.besu.cli.converter.exception.FractionConversionException;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class FractionConverterTest {
 
   private final FractionConverter fractionConverter = new FractionConverter();
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/converter/PercentageConverterTest.java b/besu/src/test/java/org/hyperledger/besu/cli/converter/PercentageConverterTest.java
index a2a5e7ce9ca..6fc6f9dc7e7 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/converter/PercentageConverterTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/converter/PercentageConverterTest.java
@@ -20,7 +20,10 @@
 import org.hyperledger.besu.cli.converter.exception.PercentageConversionException;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class PercentageConverterTest {
 
   private final PercentageConverter percentageConverter = new PercentageConverter();
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/operator/OperatorSubCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/operator/OperatorSubCommandTest.java
index 24b86d74c46..414412ebb4a 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/operator/OperatorSubCommandTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/operator/OperatorSubCommandTest.java
@@ -19,36 +19,46 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.Files.createTempDirectory;
 import static java.util.Arrays.asList;
-import static java.util.Arrays.stream;
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.contentOf;
 import static org.hyperledger.besu.cli.operator.OperatorSubCommandTest.Cmd.cmd;
 
+import org.hyperledger.besu.BesuInfo;
 import org.hyperledger.besu.cli.CommandTestAbstract;
 import org.hyperledger.besu.cli.subcommands.operator.OperatorSubCommand;
+import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.SECP256R1;
+import org.hyperledger.besu.crypto.SECPPrivateKey;
+import org.hyperledger.besu.crypto.SECPPublicKey;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
 
 import java.io.File;
+import java.io.FilenameFilter;
 import java.io.IOException;
 import java.net.URL;
 import java.nio.file.FileSystems;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.stream.Stream;
+import java.util.Optional;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.vertx.core.json.JsonObject;
+import org.apache.tuweni.bytes.Bytes32;
 import org.junit.Before;
 import org.junit.Test;
-import picocli.CommandLine;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 import picocli.CommandLine.Model.CommandSpec;
 
+@RunWith(MockitoJUnitRunner.class)
 public class OperatorSubCommandTest extends CommandTestAbstract {
 
   private static final String EXPECTED_OPERATOR_USAGE =
@@ -64,7 +74,7 @@ public class OperatorSubCommandTest extends CommandTestAbstract {
           + System.lineSeparator()
           + "  generate-blockchain-config  Generates node keypairs and genesis file with RLP"
           + System.lineSeparator()
-          + "                                encoded IBFT 2.0 extra data."
+          + "                                encoded extra data."
           + System.lineSeparator()
           + "  generate-log-bloom-cache    Generate cached values of block log bloom filters.";
 
@@ -72,6 +82,7 @@ public class OperatorSubCommandTest extends CommandTestAbstract {
 
   @Before
   public void init() throws IOException {
+    SignatureAlgorithmFactory.resetInstance();
     tmpOutputDirectoryPath = createTempDirectory(format("output-%d", currentTimeMillis()));
   }
 
@@ -81,22 +92,57 @@ public void operatorSubCommandExistAndHaveSubCommands() {
     assertThat(spec.subcommands()).containsKeys(OperatorSubCommand.COMMAND_NAME);
     assertThat(spec.subcommands().get(OperatorSubCommand.COMMAND_NAME).getSubcommands())
         .containsKeys(OperatorSubCommand.GENERATE_BLOCKCHAIN_CONFIG_SUBCOMMAND_NAME);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void callingOperatorSubCommandWithoutSubSubcommandMustDisplayUsage() {
     parseCommand(OperatorSubCommand.COMMAND_NAME);
-    assertThat(commandOutput.toString()).startsWith(EXPECTED_OPERATOR_USAGE);
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_OPERATOR_USAGE);
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void callingOperatorCommandHelpMustDisplayUsage() {
     parseCommand(OperatorSubCommand.COMMAND_NAME, "--help");
-    assertThat(commandOutput.toString()).startsWith(EXPECTED_OPERATOR_USAGE);
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_OPERATOR_USAGE);
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void callingOperatorCommandVersionMustDisplayVersion() {
+    parseCommand(OperatorSubCommand.COMMAND_NAME, "--version");
+    assertThat(commandOutput.toString(UTF_8)).isEqualToIgnoringWhitespace(BesuInfo.version());
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void callingBackupStateCommandVersionMustDisplayVersion() {
+    parseCommand("x-backup-state", "--version");
+    assertThat(commandOutput.toString(UTF_8)).isEqualToIgnoringWhitespace(BesuInfo.version());
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void callingGenerateBlockchainConfigCommandVersionMustDisplayVersion() {
+    parseCommand("generate-blockchain-config", "--version");
+    assertThat(commandOutput.toString(UTF_8)).isEqualToIgnoringWhitespace(BesuInfo.version());
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void callingGenerateLogBloomCacheCommandVersionMustDisplayVersion() {
+    parseCommand("generate-log-bloom-cache", "--version");
+    assertThat(commandOutput.toString(UTF_8)).isEqualToIgnoringWhitespace(BesuInfo.version());
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void callingRestoreStateCommandVersionMustDisplayVersion() {
+    parseCommand("x-restore-state", "--version");
+    assertThat(commandOutput.toString(UTF_8)).isEqualToIgnoringWhitespace(BesuInfo.version());
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -107,7 +153,8 @@ public void generateBlockchainConfigMustGenerateKeysWhenGenerateIsTrue() throws
         tmpOutputDirectoryPath,
         "genesis.json",
         true,
-        asList("key.pub", "key.priv"));
+        asList("key.pub", "key.priv"),
+        Optional.of(new SECP256K1()));
   }
 
   @Test
@@ -129,7 +176,8 @@ public void genesisFileNameShouldBeEqualToOption() throws IOException {
         tmpOutputDirectoryPath,
         "option.json",
         true,
-        asList("key.pub", "key.priv"));
+        asList("key.pub", "key.priv"),
+        Optional.of(new SECP256K1()));
   }
 
   @Test
@@ -140,7 +188,8 @@ public void publicKeyFileNameShouldBeEqualToOption() throws IOException {
         tmpOutputDirectoryPath,
         "genesis.json",
         true,
-        asList("pub.test", "key.priv"));
+        asList("pub.test", "key.priv"),
+        Optional.of(new SECP256K1()));
   }
 
   @Test
@@ -151,50 +200,105 @@ public void privateKeyFileNameShouldBeEqualToOption() throws IOException {
         tmpOutputDirectoryPath,
         "genesis.json",
         true,
-        asList("key.pub", "priv.test"));
+        asList("key.pub", "priv.test"),
+        Optional.of(new SECP256K1()));
   }
 
   @Test
   public void shouldFailIfDuplicateFiles() {
-    assertThatThrownBy(
-            () ->
-                runCmdAndCheckOutput(
-                    cmd(
-                        "--private-key-file-name",
-                        "dup.test",
-                        "--public-key-file-name",
-                        "dup.test"),
-                    "/operator/config_generate_keys.json",
-                    tmpOutputDirectoryPath,
-                    "genesis.json",
-                    true,
-                    asList("key.pub", "priv.test")))
-        .isInstanceOf(CommandLine.ExecutionException.class);
+    String[] args =
+        new String[] {"--private-key-file-name", "dup.test", "--public-key-file-name", "dup.test"};
+    runCmdAndAssertErrorMsg(
+        "/operator/config_generate_keys.json",
+        tmpOutputDirectoryPath.toString(),
+        args,
+        "Output file paths must be unique.");
   }
 
   @Test
   public void shouldFailIfPublicKeysAreWrongType() {
-    assertThatThrownBy(
-            () ->
-                runCmdAndCheckOutput(
-                    cmd(),
-                    "/operator/config_import_keys_invalid_keys.json",
-                    tmpOutputDirectoryPath,
-                    "genesis.json",
-                    false,
-                    singletonList("key.pub")))
-        .isInstanceOf(CommandLine.ExecutionException.class);
-  }
-
-  @Test(expected = CommandLine.ExecutionException.class)
+    runCmdAndAssertErrorMsg(
+        "/operator/config_import_keys_invalid_keys.json", "Invalid key json of type: OBJECT");
+  }
+
+  @Test
   public void shouldFailIfOutputDirectoryNonEmpty() throws IOException {
+    runCmdAndAssertErrorMsg(
+        "/operator/config_generate_keys.json",
+        FileSystems.getDefault().getPath(".").toString(),
+        new String[0],
+        "Output directory already exists.");
+  }
+
+  @Test
+  public void shouldFailIfInvalidEcCurveIsSet() {
+    runCmdAndAssertErrorMsg(
+        "/operator/config_generate_keys_ec_invalid.json",
+        "Invalid parameter for ecCurve in genesis config: abcd is not in the list of valid elliptic curves [secp256k1, secp256r1]");
+  }
+
+  @Test
+  public void shouldGenerateSECP256R1KeysWhenSetAsEcCurve() throws IOException {
     runCmdAndCheckOutput(
         cmd(),
-        "/operator/config_generate_keys.json",
-        FileSystems.getDefault().getPath("."),
+        "/operator/config_generate_keys_secp256r1.json",
+        tmpOutputDirectoryPath,
         "genesis.json",
         true,
-        asList("key.pub", "key.priv"));
+        asList("key.pub", "key.priv"),
+        Optional.of(new SECP256R1()));
+  }
+
+  @Test
+  public void shouldFailIfImportedKeysAreFromDifferentEllipticCurve() {
+    runCmdAndAssertErrorMsg(
+        "/operator/config_import_keys_secp256r1_invalid_keys.json",
+        "0xb295c4242fb40c6e8ac7b831c916846050f191adc560b8098ba6ad513079571ec1be6e5e1a715857a13a91963097962e048c36c5863014b59e8f67ed3f667680 is not a valid public key for elliptic curve secp256r1");
+  }
+
+  @Test
+  public void shouldFailIfNoConfigSection() {
+    runCmdAndAssertErrorMsg(
+        "/operator/config_no_config_section.json", "Missing config section in config file");
+  }
+
+  @Test
+  public void shouldImportSecp256R1Keys() throws IOException {
+    runCmdAndCheckOutput(
+        cmd(),
+        "/operator/config_import_keys_secp256r1.json",
+        tmpOutputDirectoryPath,
+        "genesis.json",
+        false,
+        singletonList("key.pub"));
+  }
+
+  @Test
+  public void shouldCreateIbft2ExtraData() throws IOException {
+    runCmdAndCheckOutput(
+        cmd(),
+        "/operator/config_import_keys.json",
+        tmpOutputDirectoryPath,
+        "genesis.json",
+        false,
+        singletonList("key.pub"),
+        Optional.empty(),
+        Optional.of(
+            "0xf853a00000000000000000000000000000000000000000000000000000000000000000ea94d5feb0fc5a54a89f97aeb34c3df15397c19f6dd294d6a9a4c886eb008ac307abdc1f38745c1dd13a88808400000000c0"));
+  }
+
+  @Test
+  public void shouldCreateQbftExtraData() throws IOException {
+    runCmdAndCheckOutput(
+        cmd(),
+        "/operator/config_import_keys_qbft.json",
+        tmpOutputDirectoryPath,
+        "genesis.json",
+        false,
+        singletonList("key.pub"),
+        Optional.empty(),
+        Optional.of(
+            "0xf84fa00000000000000000000000000000000000000000000000000000000000000000ea94d5feb0fc5a54a89f97aeb34c3df15397c19f6dd294d6a9a4c886eb008ac307abdc1f38745c1dd13a88c080c0"));
   }
 
   private void runCmdAndCheckOutput(
@@ -205,6 +309,47 @@ private void runCmdAndCheckOutput(
       final boolean generate,
       final Collection<String> expectedKeyFiles)
       throws IOException {
+    runCmdAndCheckOutput(
+        cmd,
+        configFile,
+        outputDirectoryPath,
+        genesisFileName,
+        generate,
+        expectedKeyFiles,
+        Optional.empty(),
+        Optional.empty());
+  }
+
+  private void runCmdAndCheckOutput(
+      final Cmd cmd,
+      final String configFile,
+      final Path outputDirectoryPath,
+      final String genesisFileName,
+      final boolean generate,
+      final Collection<String> expectedKeyFiles,
+      final Optional<SignatureAlgorithm> signatureAlgorithm)
+      throws IOException {
+    runCmdAndCheckOutput(
+        cmd,
+        configFile,
+        outputDirectoryPath,
+        genesisFileName,
+        generate,
+        expectedKeyFiles,
+        signatureAlgorithm,
+        Optional.empty());
+  }
+
+  private void runCmdAndCheckOutput(
+      final Cmd cmd,
+      final String configFile,
+      final Path outputDirectoryPath,
+      final String genesisFileName,
+      final boolean generate,
+      final Collection<String> expectedKeyFiles,
+      final Optional<SignatureAlgorithm> signatureAlgorithm,
+      final Optional<String> expectedExtraData)
+      throws IOException {
     final URL configFilePath = this.getClass().getResource(configFile);
     parseCommand(
         cmd(
@@ -216,7 +361,7 @@ private void runCmdAndCheckOutput(
                 outputDirectoryPath.toString())
             .args(cmd.argsArray())
             .argsArray());
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
 
     final Path outputGenesisExpectedPath = outputDirectoryPath.resolve(genesisFileName);
     final File outputGenesisFile = new File(outputGenesisExpectedPath.toUri());
@@ -224,6 +369,8 @@ private void runCmdAndCheckOutput(
     final String genesisString = contentOf(outputGenesisFile, UTF_8);
     final JsonObject genesisContent = new JsonObject(genesisString);
     assertThat(genesisContent.containsKey("extraData")).isTrue();
+    expectedExtraData.ifPresent(
+        extraData -> assertThat(genesisContent.getString("extraData")).isEqualTo(extraData));
 
     final Path expectedKeysPath = outputDirectoryPath.resolve("keys");
     final File keysDirectory = new File(expectedKeysPath.toUri());
@@ -238,10 +385,72 @@ private void runCmdAndCheckOutput(
       final int nodeCount = jsonNode.get("blockchain").get("nodes").get("count").asInt();
       assertThat(nodeCount).isEqualTo(nodesKeysFolders.length);
     }
-    final Stream<File> nodesKeysFoldersStream = stream(nodesKeysFolders);
 
-    nodesKeysFoldersStream.forEach(
-        nodeFolder -> assertThat(nodeFolder.list()).containsAll(expectedKeyFiles));
+    for (File nodeFolder : nodesKeysFolders) {
+      assertThat(nodeFolder.list()).containsAll(expectedKeyFiles);
+
+      if (signatureAlgorithm.isPresent()) {
+        checkPublicKey(nodeFolder, signatureAlgorithm.get());
+      }
+    }
+  }
+
+  private void runCmdAndAssertErrorMsg(final String configPath, final String expectedErrorMessage) {
+    runCmdAndAssertErrorMsg(
+        configPath, tmpOutputDirectoryPath.toString(), new String[0], expectedErrorMessage);
+  }
+
+  private void runCmdAndAssertErrorMsg(
+      final String configPath,
+      final String outPutDirectory,
+      final String[] args,
+      final String expectedErrorMessage) {
+    final URL configFilePath = this.getClass().getResource(configPath);
+    parseCommand(
+        cmd(
+                OperatorSubCommand.COMMAND_NAME,
+                OperatorSubCommand.GENERATE_BLOCKCHAIN_CONFIG_SUBCOMMAND_NAME,
+                "--config-file",
+                configFilePath.getPath(),
+                "--to",
+                outPutDirectory)
+            .args(cmd(args).argsArray())
+            .argsArray());
+
+    assertThat(commandErrorOutput.toString(UTF_8).trim()).endsWith(expectedErrorMessage);
+  }
+
+  private void checkPublicKey(final File dir, final SignatureAlgorithm signatureAlgorithm)
+      throws IOException {
+    String publicKeyHex = readPubFile(dir);
+    String privateKeyHex = readPrivFile(dir);
+
+    SECPPrivateKey privateKey =
+        signatureAlgorithm.createPrivateKey(Bytes32.fromHexString(privateKeyHex));
+    SECPPublicKey expectedPublicKey = signatureAlgorithm.createPublicKey(privateKey);
+
+    assertThat(publicKeyHex).isEqualTo(expectedPublicKey.getEncodedBytes().toHexString());
+  }
+
+  private String readPubFile(final File dir) throws IOException {
+    FilenameFilter pubFilter = (folder, name) -> name.contains("pub");
+
+    return readFile(dir, pubFilter);
+  }
+
+  private String readPrivFile(final File dir) throws IOException {
+    FilenameFilter privFilter = (folder, name) -> name.contains("priv");
+
+    return readFile(dir, privFilter);
+  }
+
+  private String readFile(final File dir, final FilenameFilter fileFilter) throws IOException {
+    File[] files = dir.listFiles(fileFilter);
+
+    assertThat(files).isNotNull();
+    assertThat(files.length).isEqualTo(1);
+
+    return Files.readString(Path.of(files[0].getAbsolutePath()));
   }
 
   static class Cmd {
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/options/AbstractCLIOptionsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/AbstractCLIOptionsTest.java
index 8818eaee945..91d7e35c39c 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/options/AbstractCLIOptionsTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/options/AbstractCLIOptionsTest.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.cli.options;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.hyperledger.besu.cli.CommandTestAbstract;
@@ -41,7 +42,10 @@ private void fromDomainObject(final D domainObject) {
 
     final List<String> fieldsToIgnore = getFieldsToIgnore();
     final String[] ignored = fieldsToIgnore.toArray(new String[0]);
-    assertThat(domainObjectFromOptions).isEqualToIgnoringGivenFields(domainObject, ignored);
+    assertThat(domainObjectFromOptions)
+        .usingRecursiveComparison()
+        .ignoringFields(ignored)
+        .isEqualTo(domainObject);
   }
 
   @Test
@@ -61,10 +65,10 @@ private void getCLIOptions(final D domainObject) {
     final TestBesuCommand cmd = parseCommand(cliOptions);
     final T optionsFromCommand = getOptionsFromBesuCommand(cmd);
 
-    assertThat(optionsFromCommand).isEqualToComparingFieldByField(options);
+    assertThat(optionsFromCommand).usingRecursiveComparison().isEqualTo(options);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -77,7 +81,10 @@ public void defaultValues() {
 
     // Check default values supplied by CLI match expected default values
     final String[] fieldsToIgnore = getFieldsWithComputedDefaults().toArray(new String[0]);
-    assertThat(optionsFromCommand).isEqualToIgnoringGivenFields(defaultOptions, fieldsToIgnore);
+    assertThat(optionsFromCommand)
+        .usingRecursiveComparison()
+        .ignoringFields(fieldsToIgnore)
+        .isEqualTo(defaultOptions);
   }
 
   abstract D createDefaultDomainObject();
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/options/EthProtocolOptionsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/EthProtocolOptionsTest.java
index ba652c7946f..1dc6f0329fb 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/options/EthProtocolOptionsTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/options/EthProtocolOptionsTest.java
@@ -14,18 +14,43 @@
  */
 package org.hyperledger.besu.cli.options;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.verifyNoInteractions;
 
 import org.hyperledger.besu.cli.options.unstable.EthProtocolOptions;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
-import org.hyperledger.besu.util.number.PositiveNumber;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class EthProtocolOptionsTest
     extends AbstractCLIOptionsTest<EthProtocolConfiguration, EthProtocolOptions> {
 
+  @Test
+  public void parsesValidMaxMessageSizeOptions() {
+
+    final TestBesuCommand cmd = parseCommand("--Xeth-max-message-size", "4");
+
+    final EthProtocolOptions options = getOptionsFromBesuCommand(cmd);
+    final EthProtocolConfiguration config = options.toDomainObject();
+    assertThat(config.getMaxMessageSize()).isEqualTo(4);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void parsesInvalidMaxMessageSizeOptionsShouldFail() {
+    parseCommand("--Xeth-max-message-size", "-4");
+    verifyNoInteractions(mockRunnerBuilder);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
+        .contains(
+            "Invalid value for option '--Xeth-max-message-size': cannot convert '-4' to PositiveNumber");
+  }
+
   @Test
   public void parsesValidEwpMaxGetHeadersOptions() {
 
@@ -34,16 +59,16 @@ public void parsesValidEwpMaxGetHeadersOptions() {
     final EthProtocolOptions options = getOptionsFromBesuCommand(cmd);
     final EthProtocolConfiguration config = options.toDomainObject();
     assertThat(config.getMaxGetBlockHeaders()).isEqualTo(13);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void parsesInvalidEwpMaxGetHeadersOptionsShouldFail() {
     parseCommand("--Xewp-max-get-headers", "-13");
     verifyNoInteractions(mockRunnerBuilder);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains(
             "Invalid value for option '--Xewp-max-get-headers': cannot convert '-13' to PositiveNumber");
   }
@@ -56,16 +81,16 @@ public void parsesValidEwpMaxGetBodiesOptions() {
     final EthProtocolConfiguration config = options.toDomainObject();
     assertThat(config.getMaxGetBlockBodies()).isEqualTo(14);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void parsesInvalidEwpMaxGetBodiesOptionsShouldFail() {
     parseCommand("--Xewp-max-get-bodies", "-14");
     verifyNoInteractions(mockRunnerBuilder);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains(
             "Invalid value for option '--Xewp-max-get-bodies': cannot convert '-14' to PositiveNumber");
   }
@@ -78,8 +103,8 @@ public void parsesValidEwpMaxGetReceiptsOptions() {
     final EthProtocolConfiguration config = options.toDomainObject();
     assertThat(config.getMaxGetReceipts()).isEqualTo(15);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -87,8 +112,8 @@ public void parsesInvalidEwpMaxGetReceiptsOptionsShouldFail() {
     parseCommand("--Xewp-max-get-receipts", "-15");
 
     verifyNoInteractions(mockRunnerBuilder);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains(
             "Invalid value for option '--Xewp-max-get-receipts': cannot convert '-15' to PositiveNumber");
   }
@@ -101,20 +126,44 @@ public void parsesValidEwpMaxGetNodeDataOptions() {
     final EthProtocolConfiguration config = options.toDomainObject();
     assertThat(config.getMaxGetNodeData()).isEqualTo(16);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void parsesInvalidEwpMaxGetNodeDataOptionsShouldFail() {
     parseCommand("--Xewp-max-get-node-data", "-16");
     verifyNoInteractions(mockRunnerBuilder);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains(
             "Invalid value for option '--Xewp-max-get-node-data': cannot convert '-16' to PositiveNumber");
   }
 
+  @Test
+  public void parsesValidEthMaxProtocol() {
+    final TestBesuCommand cmd = parseCommand("--Xeth-capability-max", "66");
+
+    final EthProtocolOptions options = getOptionsFromBesuCommand(cmd);
+    final EthProtocolConfiguration config = options.toDomainObject();
+    assertThat(config.getMaxEthCapability()).isEqualTo(66);
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void parsesValidEthMinProtocol() {
+    final TestBesuCommand cmd = parseCommand("--Xeth-capability-min", "66");
+
+    final EthProtocolOptions options = getOptionsFromBesuCommand(cmd);
+    final EthProtocolConfiguration config = options.toDomainObject();
+    assertThat(config.getMinEthCapability()).isEqualTo(66);
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
   @Override
   EthProtocolConfiguration createDefaultDomainObject() {
     return EthProtocolConfiguration.builder().build();
@@ -123,18 +172,14 @@ EthProtocolConfiguration createDefaultDomainObject() {
   @Override
   EthProtocolConfiguration createCustomizedDomainObject() {
     return EthProtocolConfiguration.builder()
-        .maxGetBlockHeaders(
-            PositiveNumber.fromInt(EthProtocolConfiguration.DEFAULT_MAX_GET_BLOCK_HEADERS + 2))
-        .maxGetBlockBodies(
-            PositiveNumber.fromInt(EthProtocolConfiguration.DEFAULT_MAX_GET_BLOCK_BODIES + 2))
-        .maxGetReceipts(
-            PositiveNumber.fromInt(EthProtocolConfiguration.DEFAULT_MAX_GET_RECEIPTS + 2))
-        .maxGetNodeData(
-            PositiveNumber.fromInt(EthProtocolConfiguration.DEFAULT_MAX_GET_NODE_DATA + 2))
-        .maxGetPooledTransactions(
-            PositiveNumber.fromInt(
-                EthProtocolConfiguration.DEFAULT_MAX_GET_POOLED_TRANSACTIONS + 2))
-        .eth65Enabled(!EthProtocolConfiguration.DEFAULT_ETH_65_ENABLED)
+        .maxMessageSize(EthProtocolConfiguration.DEFAULT_MAX_MESSAGE_SIZE * 2)
+        .maxGetBlockHeaders(EthProtocolConfiguration.DEFAULT_MAX_GET_BLOCK_HEADERS + 2)
+        .maxGetBlockBodies(EthProtocolConfiguration.DEFAULT_MAX_GET_BLOCK_BODIES + 2)
+        .maxGetReceipts(EthProtocolConfiguration.DEFAULT_MAX_GET_RECEIPTS + 2)
+        .maxGetNodeData(EthProtocolConfiguration.DEFAULT_MAX_GET_NODE_DATA + 2)
+        .maxGetPooledTransactions(EthProtocolConfiguration.DEFAULT_MAX_GET_POOLED_TRANSACTIONS + 2)
+        .maxEthCapability(EthProtocolConfiguration.DEFAULT_MAX_CAPABILITY)
+        .minEthCapability(EthProtocolConfiguration.DEFAULT_MIN_CAPABILITY)
         .build();
   }
 
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/options/MetricsCLIOptionsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/MetricsCLIOptionsTest.java
index 668b9bef0a3..5bcaaa553fc 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/options/MetricsCLIOptionsTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/options/MetricsCLIOptionsTest.java
@@ -17,6 +17,10 @@
 import org.hyperledger.besu.cli.options.unstable.MetricsCLIOptions;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
 
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
 public class MetricsCLIOptionsTest
     extends AbstractCLIOptionsTest<MetricsConfiguration.Builder, MetricsCLIOptions> {
 
@@ -28,7 +32,8 @@ MetricsConfiguration.Builder createDefaultDomainObject() {
   @Override
   MetricsConfiguration.Builder createCustomizedDomainObject() {
     return MetricsConfiguration.builder()
-        .timersEnabled(!MetricsConfiguration.DEFAULT_TIMERS_ENABLED);
+        .timersEnabled(!MetricsConfiguration.DEFAULT_METRICS_TIMERS_ENABLED)
+        .idleTimeout(MetricsConfiguration.DEFAULT_METRICS_IDLE_TIMEOUT_SECONDS);
   }
 
   @Override
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/options/NetworkingOptionsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/NetworkingOptionsTest.java
index c6ad67291ec..c59747dac73 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/options/NetworkingOptionsTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/options/NetworkingOptionsTest.java
@@ -14,13 +14,20 @@
  */
 package org.hyperledger.besu.cli.options;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.hyperledger.besu.cli.options.unstable.NetworkingOptions;
 import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
 
+import java.util.Arrays;
+import java.util.List;
+
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class NetworkingOptionsTest
     extends AbstractCLIOptionsTest<NetworkingConfiguration, NetworkingOptions> {
 
@@ -32,8 +39,8 @@ public void checkMaintainedConnectionsFrequencyFlag_isSet() {
     final NetworkingConfiguration networkingConfig = options.toDomainObject();
     assertThat(networkingConfig.getCheckMaintainedConnectionsFrequencySec()).isEqualTo(2);
 
-    assertThat(commandErrorOutput.toString()).isEmpty();
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -44,8 +51,8 @@ public void checkMaintainedFrequencyConnectionsFlag_isNotSet() {
     final NetworkingConfiguration networkingConfig = options.toDomainObject();
     assertThat(networkingConfig.getCheckMaintainedConnectionsFrequencySec()).isEqualTo(60);
 
-    assertThat(commandErrorOutput.toString()).isEmpty();
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -56,8 +63,8 @@ public void initiateConnectionsFrequencyFlag_isSet() {
     final NetworkingConfiguration networkingConfig = options.toDomainObject();
     assertThat(networkingConfig.getInitiateConnectionsFrequencySec()).isEqualTo(2);
 
-    assertThat(commandErrorOutput.toString()).isEmpty();
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -68,8 +75,93 @@ public void initiateConnectionsFrequencyFlag_isNotSet() {
     final NetworkingConfiguration networkingConfig = options.toDomainObject();
     assertThat(networkingConfig.getInitiateConnectionsFrequencySec()).isEqualTo(30);
 
-    assertThat(commandErrorOutput.toString()).isEmpty();
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void checkDnsServerOverrideFlag_isSet() {
+    final TestBesuCommand cmd = parseCommand("--Xp2p-dns-discovery-server", "localhost");
+
+    final NetworkingOptions options = cmd.getNetworkingOptions();
+    final NetworkingConfiguration networkingConfig = options.toDomainObject();
+    assertThat(networkingConfig.getDnsDiscoveryServerOverride()).isPresent();
+    assertThat(networkingConfig.getDnsDiscoveryServerOverride().get()).isEqualTo("localhost");
+
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void checkDnsServerOverrideFlag_isNotSet() {
+    final TestBesuCommand cmd = parseCommand();
+
+    final NetworkingOptions options = cmd.getNetworkingOptions();
+    final NetworkingConfiguration networkingConfig = options.toDomainObject();
+    assertThat(networkingConfig.getDnsDiscoveryServerOverride()).isEmpty();
+
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void checkDiscoveryV5Enabled_isSet() {
+    final TestBesuCommand cmd = parseCommand("--Xv5-discovery-enabled");
+
+    final NetworkingOptions options = cmd.getNetworkingOptions();
+    final NetworkingConfiguration networkingConfig = options.toDomainObject();
+    assertThat(networkingConfig.getDiscovery().isDiscoveryV5Enabled()).isTrue();
+
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void checkDiscoveryV5Enabled_isNotSet() {
+    final TestBesuCommand cmd = parseCommand();
+
+    final NetworkingOptions options = cmd.getNetworkingOptions();
+    final NetworkingConfiguration networkingConfig = options.toDomainObject();
+    assertThat(networkingConfig.getDiscovery().isDiscoveryV5Enabled()).isFalse();
+
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void checkFilterByForkIdNotSet() {
+    final TestBesuCommand cmd = parseCommand();
+
+    final NetworkingOptions options = cmd.getNetworkingOptions();
+    final NetworkingConfiguration networkingConfig = options.toDomainObject();
+    assertThat(networkingConfig.getDiscovery().isFilterOnEnrForkIdEnabled()).isEqualTo(false);
+
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void checkFilterByForkIdSet() {
+    final TestBesuCommand cmd = parseCommand(NetworkingOptions.FILTER_ON_ENR_FORK_ID + "=true");
+
+    final NetworkingOptions options = cmd.getNetworkingOptions();
+    final NetworkingConfiguration networkingConfig = options.toDomainObject();
+    assertThat(networkingConfig.getDiscovery().isFilterOnEnrForkIdEnabled()).isEqualTo(true);
+
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void checkFilterByForkIdSetToFalse() {
+    final TestBesuCommand cmd = parseCommand(NetworkingOptions.FILTER_ON_ENR_FORK_ID + "=false");
+
+    final NetworkingOptions options = cmd.getNetworkingOptions();
+    final NetworkingConfiguration networkingConfig = options.toDomainObject();
+    assertThat(networkingConfig.getDiscovery().isFilterOnEnrForkIdEnabled()).isEqualTo(false);
+
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
   }
 
   @Override
@@ -83,7 +175,8 @@ NetworkingConfiguration createCustomizedDomainObject() {
     config.setInitiateConnectionsFrequency(
         NetworkingConfiguration.DEFAULT_INITIATE_CONNECTIONS_FREQUENCY_SEC + 10);
     config.setCheckMaintainedConnectionsFrequency(
-        NetworkingConfiguration.DEFAULT_CHECK_MAINTAINED_CONNECTSION_FREQUENCY_SEC + 10);
+        NetworkingConfiguration.DEFAULT_CHECK_MAINTAINED_CONNECTIONS_FREQUENCY_SEC + 10);
+    config.setPeerLowerBound(NetworkingConfiguration.DEFAULT_PEER_LOWER_BOUND - 10);
     return config;
   }
 
@@ -96,4 +189,9 @@ NetworkingOptions optionsFromDomainObject(final NetworkingConfiguration domainOb
   NetworkingOptions getOptionsFromBesuCommand(final TestBesuCommand besuCommand) {
     return besuCommand.getNetworkingOptions();
   }
+
+  @Override
+  protected List<String> getFieldsToIgnore() {
+    return Arrays.asList("rlpx.peerLowerBound");
+  }
 }
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/options/OptionParserTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/OptionParserTest.java
index 9c1951a74ab..7dbb3958c2c 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/options/OptionParserTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/options/OptionParserTest.java
@@ -22,7 +22,10 @@
 import com.google.common.collect.Range;
 import org.apache.tuweni.units.bigints.UInt256;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class OptionParserTest {
 
   @Test
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/options/SynchronizerOptionsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/SynchronizerOptionsTest.java
index ba782398313..affb5a9d4d3 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/options/SynchronizerOptionsTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/options/SynchronizerOptionsTest.java
@@ -16,12 +16,17 @@
 
 import org.hyperledger.besu.cli.options.unstable.SynchronizerOptions;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.ImmutableSnapSyncConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncConfiguration;
 
 import java.util.Arrays;
 import java.util.List;
 
 import com.google.common.collect.Range;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class SynchronizerOptionsTest
     extends AbstractCLIOptionsTest<SynchronizerConfiguration.Builder, SynchronizerOptions> {
 
@@ -61,7 +66,19 @@ SynchronizerConfiguration.Builder createCustomizedDomainObject() {
             SynchronizerConfiguration.DEFAULT_DOWNLOADER_CHAIN_SEGMENT_SIZE + 2)
         .downloaderParallelism(SynchronizerConfiguration.DEFAULT_DOWNLOADER_PARALLELISM + 2)
         .transactionsParallelism(SynchronizerConfiguration.DEFAULT_TRANSACTIONS_PARALLELISM + 2)
-        .computationParallelism(SynchronizerConfiguration.DEFAULT_COMPUTATION_PARALLELISM + 2);
+        .computationParallelism(SynchronizerConfiguration.DEFAULT_COMPUTATION_PARALLELISM + 2)
+        .snapSyncConfiguration(
+            ImmutableSnapSyncConfiguration.builder()
+                .pivotBlockWindowValidity(
+                    SnapSyncConfiguration.DEFAULT_PIVOT_BLOCK_WINDOW_VALIDITY + 2)
+                .pivotBlockDistanceBeforeCaching(
+                    SnapSyncConfiguration.DEFAULT_PIVOT_BLOCK_DISTANCE_BEFORE_CACHING - 2)
+                .trienodeCountPerRequest(
+                    SnapSyncConfiguration.DEFAULT_TRIENODE_COUNT_PER_REQUEST + 2)
+                .storageCountPerRequest(SnapSyncConfiguration.DEFAULT_STORAGE_COUNT_PER_REQUEST + 2)
+                .bytecodeCountPerRequest(
+                    SnapSyncConfiguration.DEFAULT_BYTECODE_COUNT_PER_REQUEST + 2)
+                .build());
   }
 
   @Override
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/options/TransactionPoolOptionsTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/TransactionPoolOptionsTest.java
index c9313d39889..5a235524c6a 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/options/TransactionPoolOptionsTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/options/TransactionPoolOptionsTest.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.cli.options;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.hyperledger.besu.cli.options.unstable.TransactionPoolOptions;
@@ -23,11 +24,62 @@
 import java.time.Duration;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class TransactionPoolOptionsTest
     extends AbstractCLIOptionsTest<
         ImmutableTransactionPoolConfiguration.Builder, TransactionPoolOptions> {
 
+  @Test
+  public void strictTxReplayProtection_enabled() {
+    final TestBesuCommand cmd = parseCommand("--strict-tx-replay-protection-enabled");
+
+    final TransactionPoolOptions options = getOptionsFromBesuCommand(cmd);
+    final TransactionPoolConfiguration config = options.toDomainObject().build();
+    assertThat(config.getStrictTransactionReplayProtectionEnabled()).isTrue();
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void strictTxReplayProtection_enabledWithBooleanArg() {
+    final TestBesuCommand cmd = parseCommand("--strict-tx-replay-protection-enabled=true");
+
+    final TransactionPoolOptions options = getOptionsFromBesuCommand(cmd);
+    final TransactionPoolConfiguration config = options.toDomainObject().build();
+    assertThat(config.getStrictTransactionReplayProtectionEnabled()).isTrue();
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void strictTxReplayProtection_disabled() {
+    final TestBesuCommand cmd = parseCommand("--strict-tx-replay-protection-enabled=false");
+
+    final TransactionPoolOptions options = getOptionsFromBesuCommand(cmd);
+    final TransactionPoolConfiguration config = options.toDomainObject().build();
+    assertThat(config.getStrictTransactionReplayProtectionEnabled()).isFalse();
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void strictTxReplayProtection_default() {
+    final TestBesuCommand cmd = parseCommand();
+
+    final TransactionPoolOptions options = getOptionsFromBesuCommand(cmd);
+    final TransactionPoolConfiguration config = options.toDomainObject().build();
+    assertThat(config.getStrictTransactionReplayProtectionEnabled()).isFalse();
+
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
   @Test
   public void txMessageKeepAliveSeconds() {
     final int txMessageKeepAliveSeconds = 999;
@@ -40,8 +92,8 @@ public void txMessageKeepAliveSeconds() {
     final TransactionPoolConfiguration config = options.toDomainObject().build();
     assertThat(config.getTxMessageKeepAliveSeconds()).isEqualTo(txMessageKeepAliveSeconds);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -57,8 +109,8 @@ public void eth65TrxAnnouncedBufferingPeriod() {
     assertThat(config.getEth65TrxAnnouncedBufferingPeriod())
         .hasMillis(eth65TrxAnnouncedBufferingPeriod);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Override
@@ -66,17 +118,28 @@ ImmutableTransactionPoolConfiguration.Builder createDefaultDomainObject() {
     final ImmutableTransactionPoolConfiguration defaultValue =
         ImmutableTransactionPoolConfiguration.builder().build();
     return ImmutableTransactionPoolConfiguration.builder()
+        .strictTransactionReplayProtectionEnabled(false)
         .txMessageKeepAliveSeconds(defaultValue.getTxMessageKeepAliveSeconds())
-        .eth65TrxAnnouncedBufferingPeriod(defaultValue.getEth65TrxAnnouncedBufferingPeriod());
+        .eth65TrxAnnouncedBufferingPeriod(defaultValue.getEth65TrxAnnouncedBufferingPeriod())
+        .layeredTxPoolEnabled(defaultValue.getLayeredTxPoolEnabled())
+        .pendingTransactionsLayerMaxCapacityBytes(
+            defaultValue.getPendingTransactionsLayerMaxCapacityBytes())
+        .maxPrioritizedTransactions(defaultValue.getMaxPrioritizedTransactions())
+        .maxFutureBySender(defaultValue.getMaxFutureBySender());
   }
 
   @Override
   ImmutableTransactionPoolConfiguration.Builder createCustomizedDomainObject() {
     return ImmutableTransactionPoolConfiguration.builder()
+        .strictTransactionReplayProtectionEnabled(true)
         .txMessageKeepAliveSeconds(TransactionPoolConfiguration.DEFAULT_TX_MSG_KEEP_ALIVE + 1)
         .eth65TrxAnnouncedBufferingPeriod(
             TransactionPoolConfiguration.ETH65_TRX_ANNOUNCED_BUFFERING_PERIOD.plus(
-                Duration.ofMillis(100)));
+                Duration.ofMillis(100)))
+        .layeredTxPoolEnabled(true)
+        .pendingTransactionsLayerMaxCapacityBytes(1_000_000L)
+        .maxPrioritizedTransactions(1000)
+        .maxFutureBySender(10);
   }
 
   @Override
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/options/stable/LoggingLevelOptionTest.java b/besu/src/test/java/org/hyperledger/besu/cli/options/stable/LoggingLevelOptionTest.java
new file mode 100644
index 00000000000..4d0a67e75ca
--- /dev/null
+++ b/besu/src/test/java/org/hyperledger/besu/cli/options/stable/LoggingLevelOptionTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cli.options.stable;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+
+import java.util.Arrays;
+
+import org.apache.logging.log4j.Level;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import picocli.CommandLine.Model.CommandSpec;
+import picocli.CommandLine.ParameterException;
+
+public class LoggingLevelOptionTest {
+
+  private LoggingLevelOption levelOption;
+
+  @Before
+  public void setUp() {
+    levelOption = new LoggingLevelOption();
+  }
+
+  @Test
+  public void fatalLevelEqualsToError() {
+    levelOption.setLogLevel("fatal");
+    assertThat(levelOption.getLogLevel()).isEqualTo("ERROR");
+  }
+
+  @Test
+  public void setsExpectedLevels() {
+    Arrays.stream(Level.values())
+        .filter(level -> !Level.FATAL.equals(level))
+        .forEach(
+            level -> {
+              levelOption.setLogLevel(level.name());
+              assertThat(levelOption.getLogLevel()).isEqualTo(level.name());
+            });
+  }
+
+  @Test
+  public void failsOnUnknownLevel() {
+    levelOption.spec = Mockito.mock(CommandSpec.class, RETURNS_DEEP_STUBS);
+    assertThatThrownBy(() -> levelOption.setLogLevel("unknown"))
+        .isInstanceOf(ParameterException.class);
+  }
+}
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/rlp/RLPSubCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/rlp/RLPSubCommandTest.java
index 623f3f58347..822c7322718 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/rlp/RLPSubCommandTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/rlp/RLPSubCommandTest.java
@@ -18,11 +18,13 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.contentOf;
 
+import org.hyperledger.besu.BesuInfo;
 import org.hyperledger.besu.cli.CommandTestAbstract;
 
 import java.io.BufferedWriter;
 import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.IOException;
 import java.nio.file.Files;
 
 import org.junit.After;
@@ -57,12 +59,15 @@ public class RLPSubCommandTest extends CommandTestAbstract {
           + System.lineSeparator()
           + "      --type=<type>   Type of the RLP data to encode, possible values are"
           + System.lineSeparator()
-          + "                        IBFT_EXTRA_DATA. (default: IBFT_EXTRA_DATA)"
+          + "                        IBFT_EXTRA_DATA, QBFT_EXTRA_DATA. (default:"
+          + System.lineSeparator()
+          + "                        IBFT_EXTRA_DATA)"
           + System.lineSeparator()
           + "  -V, --version       Print version information and exit.";
 
   private static final String RLP_SUBCOMMAND_NAME = "rlp";
   private static final String RLP_ENCODE_SUBCOMMAND_NAME = "encode";
+  private static final String RLP_QBFT_TYPE = "QBFT_EXTRA_DATA";
 
   // RLP sub-command
   @Test
@@ -71,30 +76,44 @@ public void rlpSubCommandExistsAndHasSubCommands() {
     assertThat(spec.subcommands()).containsKeys(RLP_SUBCOMMAND_NAME);
     assertThat(spec.subcommands().get(RLP_SUBCOMMAND_NAME).getSubcommands())
         .containsKeys(RLP_ENCODE_SUBCOMMAND_NAME);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void callingRLPSubCommandWithoutSubSubcommandMustDisplayUsage() {
     parseCommand(RLP_SUBCOMMAND_NAME);
-    assertThat(commandOutput.toString()).startsWith(EXPECTED_RLP_USAGE);
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_RLP_USAGE);
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void callingRPLSubCommandHelpMustDisplayUsage() {
     parseCommand(RLP_SUBCOMMAND_NAME, "--help");
-    assertThat(commandOutput.toString()).startsWith(EXPECTED_RLP_USAGE);
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_RLP_USAGE);
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   // Encode RLP sub-command
   @Test
   public void callingRPLEncodeSubCommandHelpMustDisplayUsage() {
     parseCommand(RLP_SUBCOMMAND_NAME, RLP_ENCODE_SUBCOMMAND_NAME, "--help");
-    assertThat(commandOutput.toString()).startsWith(EXPECTED_RLP_ENCODE_USAGE);
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_RLP_ENCODE_USAGE);
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void callingRPLSubCommandVersionMustDisplayVersion() {
+    parseCommand(RLP_SUBCOMMAND_NAME, "--version");
+    assertThat(commandOutput.toString(UTF_8)).isEqualToIgnoringWhitespace(BesuInfo.version());
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void callingRPLEncodeSubCommandVersionMustDisplayVersion() {
+    parseCommand(RLP_SUBCOMMAND_NAME, RLP_ENCODE_SUBCOMMAND_NAME, "--version");
+    assertThat(commandOutput.toString(UTF_8)).isEqualToIgnoringWhitespace(BesuInfo.version());
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -111,8 +130,8 @@ public void encodeWithoutPathMustWriteToStandardOutput() {
     final String expectedRlpString =
         "0xf853a00000000000000000000000000000000000000000000000000000000000000000ea94be068f726a13c8d"
             + "46c44be6ce9d275600e1735a4945ff6f4b66a46a2b2310a6f3a93aaddc0d9a1c193808400000000c0";
-    assertThat(commandOutput.toString()).contains(expectedRlpString);
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).contains(expectedRlpString);
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -134,8 +153,8 @@ public void encodeWithOutputFileMustWriteInThisFile() throws Exception {
 
     assertThat(contentOf(file)).contains(expectedRlpString);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -155,8 +174,34 @@ public void encodeWithInputFilePathMustReadFromThisFile() throws Exception {
       final String expectedRlpString =
           "0xf853a00000000000000000000000000000000000000000000000000000000000000000ea94be068f726a13c8d"
               + "46c44be6ce9d275600e1735a4945ff6f4b66a46a2b2310a6f3a93aaddc0d9a1c193808400000000c0";
-      assertThat(commandOutput.toString()).contains(expectedRlpString);
-      assertThat(commandErrorOutput.toString()).isEmpty();
+      assertThat(commandOutput.toString(UTF_8)).contains(expectedRlpString);
+      assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+    }
+  }
+
+  @Test
+  public void canEncodeToQbftExtraData() throws IOException {
+    final File tempJsonFile = temp.newFile("test.json");
+    try (final BufferedWriter fileWriter = Files.newBufferedWriter(tempJsonFile.toPath(), UTF_8)) {
+
+      fileWriter.write(
+          "[\"be068f726a13c8d46c44be6ce9d275600e1735a4\", \"5ff6f4b66a46a2b2310a6f3a93aaddc0d9a1c193\"]");
+
+      fileWriter.flush();
+
+      parseCommand(
+          RLP_SUBCOMMAND_NAME,
+          RLP_ENCODE_SUBCOMMAND_NAME,
+          "--from",
+          tempJsonFile.getPath(),
+          "--type",
+          RLP_QBFT_TYPE);
+
+      final String expectedRlpString =
+          "0xf84fa00000000000000000000000000000000000000000000000000000000000000000ea94be068f726a13c8d"
+              + "46c44be6ce9d275600e1735a4945ff6f4b66a46a2b2310a6f3a93aaddc0d9a1c193c080c0";
+      assertThat(commandOutput.toString(UTF_8)).contains(expectedRlpString);
+      assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
     }
   }
 
@@ -173,8 +218,8 @@ public void encodeWithInvalidInputMustRaiseAnError() throws Exception {
       parseCommand(
           RLP_SUBCOMMAND_NAME, RLP_ENCODE_SUBCOMMAND_NAME, "--from", tempJsonFile.getPath());
 
-      assertThat(commandOutput.toString()).isEmpty();
-      assertThat(commandErrorOutput.toString())
+      assertThat(commandOutput.toString(UTF_8)).isEmpty();
+      assertThat(commandErrorOutput.toString(UTF_8))
           .startsWith(
               "Unable to map the JSON data with selected type. Please check JSON input format.");
     }
@@ -187,8 +232,8 @@ public void encodeWithEmptyInputMustRaiseAnError() throws Exception {
 
     parseCommand(RLP_SUBCOMMAND_NAME, RLP_ENCODE_SUBCOMMAND_NAME, "--from", tempJsonFile.getPath());
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .startsWith("An error occurred while trying to read the JSON data.");
   }
 
@@ -201,8 +246,8 @@ public void encodeWithEmptyStdInputMustRaiseAnError() throws Exception {
 
     parseCommand(stdIn, RLP_SUBCOMMAND_NAME, RLP_ENCODE_SUBCOMMAND_NAME);
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8))
         .startsWith("An error occurred while trying to read the JSON data.");
   }
 
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/subcommands/blocks/BlocksSubCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/subcommands/blocks/BlocksSubCommandTest.java
index 84b11627d6c..6a0b5592d27 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/subcommands/blocks/BlocksSubCommandTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/subcommands/blocks/BlocksSubCommandTest.java
@@ -19,10 +19,12 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.isNotNull;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+import org.hyperledger.besu.BesuInfo;
 import org.hyperledger.besu.cli.CommandTestAbstract;
 import org.hyperledger.besu.controller.BesuController;
 
@@ -37,8 +39,11 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 import picocli.CommandLine.Model.CommandSpec;
 
+@RunWith(MockitoJUnitRunner.class)
 public class BlocksSubCommandTest extends CommandTestAbstract {
 
   @Rule public final TemporaryFolder folder = new TemporaryFolder();
@@ -118,22 +123,29 @@ public void blockSubCommandExistsAndHasSubCommands() {
     assertThat(spec.subcommands()).containsKeys(BLOCK_SUBCOMMAND_NAME);
     assertThat(spec.subcommands().get(BLOCK_SUBCOMMAND_NAME).getSubcommands())
         .containsKeys(BLOCK_IMPORT_SUBCOMMAND_NAME);
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void callingBlockSubCommandWithoutSubSubcommandMustDisplayUsage() {
     parseCommand(BLOCK_SUBCOMMAND_NAME);
-    assertThat(commandOutput.toString()).startsWith(EXPECTED_BLOCK_USAGE);
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_BLOCK_USAGE);
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
   public void callingBlockSubCommandHelpMustDisplayUsage() {
     parseCommand(BLOCK_SUBCOMMAND_NAME, "--help");
-    assertThat(commandOutput.toString()).startsWith(EXPECTED_BLOCK_USAGE);
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_BLOCK_USAGE);
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void callingBlockSubCommandVersionMustDisplayVersion() {
+    parseCommand(BLOCK_SUBCOMMAND_NAME, "--version");
+    assertThat(commandOutput.toString(UTF_8)).isEqualToIgnoringWhitespace(BesuInfo.version());
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   // Import sub-sub-command
@@ -141,15 +153,36 @@ public void callingBlockSubCommandHelpMustDisplayUsage() {
   public void callingBlockImportSubCommandWithoutPathMustDisplayErrorAndUsage() {
     parseCommand(BLOCK_SUBCOMMAND_NAME, BLOCK_IMPORT_SUBCOMMAND_NAME);
     final String expectedErrorOutputStart = "No files specified to import.";
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).startsWith(expectedErrorOutputStart);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).startsWith(expectedErrorOutputStart);
+  }
+
+  @Test
+  public void callingBlockImportSubCommandWithJSONAndSkipPOWFails() {
+    parseCommand(
+        BLOCK_SUBCOMMAND_NAME,
+        BLOCK_IMPORT_SUBCOMMAND_NAME,
+        "--format",
+        "JSON",
+        "--skip-pow-validation-enabled",
+        "blocks.file");
+    final String expectedErrorOutputStart = "Can't skip";
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).startsWith(expectedErrorOutputStart);
   }
 
   @Test
   public void callingBlockImportSubCommandHelpMustDisplayUsage() {
     parseCommand(BLOCK_SUBCOMMAND_NAME, BLOCK_IMPORT_SUBCOMMAND_NAME, "--help");
-    assertThat(commandOutput.toString()).isEqualTo(EXPECTED_BLOCK_IMPORT_USAGE);
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEqualTo(EXPECTED_BLOCK_IMPORT_USAGE);
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void callingBlockImportSubCommandVersionMustDisplayVersion() {
+    parseCommand(BLOCK_SUBCOMMAND_NAME, BLOCK_IMPORT_SUBCOMMAND_NAME, "--version");
+    assertThat(commandOutput.toString(UTF_8)).isEqualToIgnoringWhitespace(BesuInfo.version());
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -163,8 +196,8 @@ public void callingBlockImportSubCommandWithPathMustImportBlocksWithThisPath() t
 
     assertThat(pathArgumentCaptor.getValue()).isEqualByComparingTo(fileToImport.toPath());
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -183,8 +216,8 @@ public void blocksImport_rlpFormat() throws Exception {
 
     assertThat(pathArgumentCaptor.getValue()).isEqualByComparingTo(fileToImport.toPath());
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -208,8 +241,8 @@ public void blocksImport_rlpFormatMultiple() throws Exception {
         .containsExactlyInAnyOrder(
             fileToImport.toPath(), file2ToImport.toPath(), file3ToImport.toPath());
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   @Test
@@ -228,8 +261,8 @@ public void blocksImport_jsonFormat() throws Exception {
         "--from",
         fileToImport.getPath());
 
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
 
     verify(jsonBlockImporter, times(1)).importChain(stringArgumentCaptor.capture());
     assertThat(stringArgumentCaptor.getValue()).isEqualTo(fileContent);
@@ -244,8 +277,8 @@ public void blocksExport_missingFileParam() throws IOException {
         BLOCK_SUBCOMMAND_NAME,
         BLOCK_EXPORT_SUBCOMMAND_NAME);
     final String expectedErrorOutputStart = "Missing required option: '--to=<FILE>'";
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).startsWith(expectedErrorOutputStart);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).startsWith(expectedErrorOutputStart);
 
     verify(rlpBlockExporter, never()).exportBlocks(any(), any(), any());
   }
@@ -264,8 +297,8 @@ public void blocksExport_noDbDirectory() throws IOException {
             + folder.getRoot().getAbsolutePath()
             + File.separator
             + BesuController.DATABASE_PATH;
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).startsWith(expectedErrorOutputStart);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).startsWith(expectedErrorOutputStart);
 
     verify(rlpBlockExporter, never()).exportBlocks(any(), any(), any());
   }
@@ -285,8 +318,8 @@ public void blocksExport_emptyDbDirectory() throws IOException {
             + folder.getRoot().getAbsolutePath()
             + File.separator
             + BesuController.DATABASE_PATH;
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).startsWith(expectedErrorOutputStart);
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).startsWith(expectedErrorOutputStart);
 
     verify(rlpBlockExporter, never()).exportBlocks(any(), any(), any());
   }
@@ -301,8 +334,8 @@ public void blocksExport_noStartOrEnd() throws IOException {
         BLOCK_EXPORT_SUBCOMMAND_NAME,
         "--to",
         outputFile.getPath());
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
 
     verify(rlpBlockExporter, times(1)).exportBlocks(outputFile, Optional.empty(), Optional.empty());
   }
@@ -318,8 +351,8 @@ public void blocksExport_withStartAndNoEnd() throws IOException {
         "--to",
         outputFile.getPath(),
         "--start-block=1");
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
 
     verify(rlpBlockExporter, times(1)).exportBlocks(outputFile, Optional.of(1L), Optional.empty());
   }
@@ -335,8 +368,8 @@ public void blocksExport_withEndAndNoStart() throws IOException {
         "--to",
         outputFile.getPath(),
         "--end-block=10");
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
 
     verify(rlpBlockExporter, times(1)).exportBlocks(outputFile, Optional.empty(), Optional.of(10L));
   }
@@ -353,8 +386,8 @@ public void blocksExport_withStartAndEnd() throws IOException {
         outputFile.getPath(),
         "--start-block=1",
         "--end-block=10");
-    assertThat(commandOutput.toString()).isEmpty();
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
 
     verify(rlpBlockExporter, times(1)).exportBlocks(outputFile, Optional.of(1L), Optional.of(10L));
   }
@@ -371,9 +404,9 @@ public void blocksExport_withOutOfOrderStartAndEnd() throws IOException {
         outputFile.getPath(),
         "--start-block=10",
         "--end-block=1");
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Parameter --end-block (1) must be greater start block (10)");
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
 
     verify(rlpBlockExporter, never()).exportBlocks(any(), any(), any());
   }
@@ -390,9 +423,9 @@ public void blocksExport_withEmptyRange() throws IOException {
         outputFile.getPath(),
         "--start-block=10",
         "--end-block=10");
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Parameter --end-block (10) must be greater start block (10)");
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
 
     verify(rlpBlockExporter, never()).exportBlocks(any(), any(), any());
   }
@@ -408,9 +441,9 @@ public void blocksExport_withInvalidStart() throws IOException {
         "--to",
         outputFile.getPath(),
         "--start-block=-1");
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Parameter --start-block (-1) must be greater than or equal to zero");
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
 
     verify(rlpBlockExporter, never()).exportBlocks(any(), any(), any());
   }
@@ -426,9 +459,9 @@ public void blocksExport_withInvalidEnd() throws IOException {
         "--to",
         outputFile.getPath(),
         "--end-block=-1");
-    assertThat(commandErrorOutput.toString())
+    assertThat(commandErrorOutput.toString(UTF_8))
         .contains("Parameter --end-block (-1) must be greater than or equal to zero");
-    assertThat(commandOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).isEmpty();
 
     verify(rlpBlockExporter, never()).exportBlocks(any(), any(), any());
   }
@@ -436,8 +469,15 @@ public void blocksExport_withInvalidEnd() throws IOException {
   @Test
   public void callingBlockExportSubCommandHelpMustDisplayUsage() {
     parseCommand(BLOCK_SUBCOMMAND_NAME, BLOCK_EXPORT_SUBCOMMAND_NAME, "--help");
-    assertThat(commandOutput.toString()).startsWith(EXPECTED_BLOCK_EXPORT_USAGE);
-    assertThat(commandErrorOutput.toString()).isEmpty();
+    assertThat(commandOutput.toString(UTF_8)).startsWith(EXPECTED_BLOCK_EXPORT_USAGE);
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void callingBlockExportSubCommandVersionMustDisplayVersion() {
+    parseCommand(BLOCK_SUBCOMMAND_NAME, BLOCK_EXPORT_SUBCOMMAND_NAME, "--version");
+    assertThat(commandOutput.toString(UTF_8)).isEqualToIgnoringWhitespace(BesuInfo.version());
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
   }
 
   private void createDbDirectory(final boolean createDataFiles) throws IOException {
@@ -448,4 +488,13 @@ private void createDbDirectory(final boolean createDataFiles) throws IOException
       assertThat(success).isTrue();
     }
   }
+
+  @Test
+  public void blocksImportWithNoSyncModeDoesNotRaiseNPE() throws IOException {
+    final File fileToImport = temp.newFile("blocks.file");
+    parseCommand(
+        BLOCK_SUBCOMMAND_NAME, BLOCK_IMPORT_SUBCOMMAND_NAME, "--from", fileToImport.getPath());
+
+    verify(mockControllerBuilderFactory).fromEthNetworkConfig(any(), any(), isNotNull());
+  }
 }
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/subcommands/storage/StorageSubCommandTest.java b/besu/src/test/java/org/hyperledger/besu/cli/subcommands/storage/StorageSubCommandTest.java
new file mode 100644
index 00000000000..a8a1bedc649
--- /dev/null
+++ b/besu/src/test/java/org/hyperledger/besu/cli/subcommands/storage/StorageSubCommandTest.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cli.subcommands.storage;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.FINALIZED_BLOCK_HASH;
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.SAFE_BLOCK_HASH;
+import static org.hyperledger.besu.ethereum.core.VariablesStorageHelper.assertNoVariablesInStorage;
+import static org.hyperledger.besu.ethereum.core.VariablesStorageHelper.assertVariablesPresentInBlockchainStorage;
+import static org.hyperledger.besu.ethereum.core.VariablesStorageHelper.getSampleVariableValues;
+import static org.hyperledger.besu.ethereum.core.VariablesStorageHelper.populateBlockchainStorage;
+import static org.hyperledger.besu.ethereum.core.VariablesStorageHelper.populateVariablesStorage;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.cli.CommandTestAbstract;
+import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
+import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.Silent.class)
+public class StorageSubCommandTest extends CommandTestAbstract {
+
+  @Test
+  public void storageSubCommandExists() {
+    parseCommand("storage");
+
+    assertThat(commandOutput.toString(UTF_8))
+        .contains("This command provides storage related actions");
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void storageRevertVariablesSubCommandExists() {
+    parseCommand("storage", "revert-variables", "--help");
+
+    assertThat(commandOutput.toString(UTF_8))
+        .contains("This command revert the modifications done by the variables storage feature");
+    assertThat(commandErrorOutput.toString(UTF_8)).isEmpty();
+  }
+
+  @Test
+  public void revertVariables() {
+    final var kvVariables = new InMemoryKeyValueStorage();
+    final var kvBlockchain = new InMemoryKeyValueStorage();
+    when(rocksDBStorageFactory.create(eq(KeyValueSegmentIdentifier.VARIABLES), any(), any()))
+        .thenReturn(kvVariables);
+    when(rocksDBStorageFactory.create(eq(KeyValueSegmentIdentifier.BLOCKCHAIN), any(), any()))
+        .thenReturn(kvBlockchain);
+
+    final var variableValues = getSampleVariableValues();
+    assertNoVariablesInStorage(kvBlockchain);
+    populateVariablesStorage(kvVariables, variableValues);
+
+    parseCommand("storage", "revert-variables");
+
+    assertNoVariablesInStorage(kvVariables);
+    assertVariablesPresentInBlockchainStorage(kvBlockchain, variableValues);
+  }
+
+  @Test
+  public void revertVariablesWhenSomeVariablesDoNotExist() {
+    final var kvVariables = new InMemoryKeyValueStorage();
+    final var kvBlockchain = new InMemoryKeyValueStorage();
+    when(rocksDBStorageFactory.create(eq(KeyValueSegmentIdentifier.VARIABLES), any(), any()))
+        .thenReturn(kvVariables);
+    when(rocksDBStorageFactory.create(eq(KeyValueSegmentIdentifier.BLOCKCHAIN), any(), any()))
+        .thenReturn(kvBlockchain);
+
+    final var variableValues = getSampleVariableValues();
+    variableValues.remove(FINALIZED_BLOCK_HASH);
+    variableValues.remove(SAFE_BLOCK_HASH);
+    assertNoVariablesInStorage(kvBlockchain);
+    populateVariablesStorage(kvVariables, variableValues);
+
+    parseCommand("storage", "revert-variables");
+
+    assertNoVariablesInStorage(kvVariables);
+    assertVariablesPresentInBlockchainStorage(kvBlockchain, variableValues);
+  }
+
+  @Test
+  public void doesNothingWhenVariablesAlreadyReverted() {
+    final var kvVariables = new InMemoryKeyValueStorage();
+    final var kvBlockchain = new InMemoryKeyValueStorage();
+    when(rocksDBStorageFactory.create(eq(KeyValueSegmentIdentifier.VARIABLES), any(), any()))
+        .thenReturn(kvVariables);
+    when(rocksDBStorageFactory.create(eq(KeyValueSegmentIdentifier.BLOCKCHAIN), any(), any()))
+        .thenReturn(kvBlockchain);
+
+    final var variableValues = getSampleVariableValues();
+    assertNoVariablesInStorage(kvVariables);
+    populateBlockchainStorage(kvBlockchain, variableValues);
+
+    parseCommand("storage", "revert-variables");
+
+    assertNoVariablesInStorage(kvVariables);
+    assertVariablesPresentInBlockchainStorage(kvBlockchain, variableValues);
+  }
+}
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/util/BesuCommandCustomFactoryTest.java b/besu/src/test/java/org/hyperledger/besu/cli/util/BesuCommandCustomFactoryTest.java
index 9f8e46d8032..d83fa43a655 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/util/BesuCommandCustomFactoryTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/util/BesuCommandCustomFactoryTest.java
@@ -18,7 +18,7 @@
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.BesuInfo;
-import org.hyperledger.besu.services.PluginVersionsProvider;
+import org.hyperledger.besu.plugin.services.PluginVersionsProvider;
 
 import java.util.Arrays;
 
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/util/ConfigOptionSearchAndRunHandlerTest.java b/besu/src/test/java/org/hyperledger/besu/cli/util/ConfigOptionSearchAndRunHandlerTest.java
index 348e52fe417..0f0c1e696a3 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/util/ConfigOptionSearchAndRunHandlerTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/util/ConfigOptionSearchAndRunHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -16,15 +16,18 @@
 
 import static java.util.Collections.singletonMap;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.io.ByteArrayOutputStream;
+import org.hyperledger.besu.cli.error.BesuParameterExceptionHandler;
+import org.hyperledger.besu.cli.options.stable.LoggingLevelOption;
+
 import java.io.File;
-import java.io.PrintStream;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -33,16 +36,14 @@
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import picocli.CommandLine;
-import picocli.CommandLine.AbstractParseResultHandler;
-import picocli.CommandLine.DefaultExceptionHandler;
-import picocli.CommandLine.Help.Ansi;
 import picocli.CommandLine.IDefaultValueProvider;
+import picocli.CommandLine.IExecutionStrategy;
+import picocli.CommandLine.Model.CommandSpec;
 import picocli.CommandLine.Model.IGetter;
 import picocli.CommandLine.Model.OptionSpec;
 import picocli.CommandLine.ParseResult;
@@ -51,64 +52,87 @@
 @RunWith(MockitoJUnitRunner.class)
 public class ConfigOptionSearchAndRunHandlerTest {
 
-  private static final String CONFIG_FILE_OPTION_NAME = "--config";
+  private static final String CONFIG_FILE_OPTION_NAME = "--config-file";
   @Rule public final TemporaryFolder temp = new TemporaryFolder();
 
-  @Rule public ExpectedException exceptionRule = ExpectedException.none();
-
-  private final ByteArrayOutputStream commandOutput = new ByteArrayOutputStream();
-  private final ByteArrayOutputStream commandErrorOutput = new ByteArrayOutputStream();
-  private final PrintStream outPrintStream = new PrintStream(commandOutput);
-  private final PrintStream errPrintStream = new PrintStream(commandErrorOutput);
+  private LoggingLevelOption levelOption;
+  private final IExecutionStrategy resultHandler = new RunLast();
 
-  private final AbstractParseResultHandler<List<Object>> resultHandler =
-      new RunLast().useOut(outPrintStream).useAnsi(Ansi.OFF);
-  private final DefaultExceptionHandler<List<Object>> exceptionHandler =
-      new DefaultExceptionHandler<List<Object>>().useErr(errPrintStream).useAnsi(Ansi.OFF);
   private final Map<String, String> environment = singletonMap("BESU_LOGGING", "ERROR");
-  private final ConfigOptionSearchAndRunHandler configParsingHandler =
-      new ConfigOptionSearchAndRunHandler(
-          resultHandler, exceptionHandler, CONFIG_FILE_OPTION_NAME, environment);
+  private ConfigOptionSearchAndRunHandler configParsingHandler;
 
   @Mock ParseResult mockParseResult;
+  @Mock CommandSpec mockCommandSpec;
   @Mock CommandLine mockCommandLine;
   @Mock OptionSpec mockConfigOptionSpec;
   @Mock IGetter mockConfigOptionGetter;
+  @Mock BesuParameterExceptionHandler mockParameterExceptionHandler;
 
   @Before
   public void initMocks() {
-    final List<CommandLine> commandLines = new ArrayList<>();
-    commandLines.add(mockCommandLine);
-    when(mockParseResult.asCommandLineList()).thenReturn(commandLines);
+    when(mockCommandSpec.commandLine()).thenReturn(mockCommandLine);
+    when(mockParseResult.commandSpec()).thenReturn(mockCommandSpec);
     final List<String> originalArgs = new ArrayList<>();
     originalArgs.add(CONFIG_FILE_OPTION_NAME);
     when(mockParseResult.originalArgs()).thenReturn(originalArgs);
     when(mockParseResult.matchedOption(CONFIG_FILE_OPTION_NAME)).thenReturn(mockConfigOptionSpec);
     when(mockParseResult.hasMatchedOption(CONFIG_FILE_OPTION_NAME)).thenReturn(true);
     when(mockConfigOptionSpec.getter()).thenReturn(mockConfigOptionGetter);
+    levelOption = new LoggingLevelOption();
+    levelOption.setLogLevel("INFO");
+    configParsingHandler =
+        new ConfigOptionSearchAndRunHandler(
+            resultHandler, mockParameterExceptionHandler, environment);
   }
 
   @Test
-  public void handle() throws Exception {
+  public void handleWithCommandLineOption() throws Exception {
     when(mockConfigOptionGetter.get()).thenReturn(temp.newFile());
     final List<Object> result = configParsingHandler.handle(mockParseResult);
     verify(mockCommandLine).setDefaultValueProvider(any(IDefaultValueProvider.class));
-    verify(mockCommandLine).parseWithHandlers(eq(resultHandler), eq(exceptionHandler), anyString());
+    verify(mockCommandLine).setExecutionStrategy(eq(resultHandler));
+    verify(mockCommandLine).setParameterExceptionHandler(eq(mockParameterExceptionHandler));
+    verify(mockCommandLine).execute(anyString());
+
     assertThat(result).isEmpty();
   }
 
   @Test
-  public void handleShouldRaiseExceptionIfNoFileParam() throws Exception {
-    exceptionRule.expect(Exception.class);
+  public void handleWithEnvironmentVariable() throws IOException {
+    when(mockParseResult.hasMatchedOption(CONFIG_FILE_OPTION_NAME)).thenReturn(false);
+
+    final ConfigOptionSearchAndRunHandler environmentConfigFileParsingHandler =
+        new ConfigOptionSearchAndRunHandler(
+            resultHandler,
+            mockParameterExceptionHandler,
+            singletonMap("BESU_CONFIG_FILE", temp.newFile().getAbsolutePath()));
+
+    when(mockParseResult.hasMatchedOption(CONFIG_FILE_OPTION_NAME)).thenReturn(false);
+
+    environmentConfigFileParsingHandler.handle(mockParseResult);
+  }
+
+  @Test
+  public void handleWithCommandLineOptionShouldRaiseExceptionIfNoFileParam() throws Exception {
     final String error_message = "an error occurred during get";
-    exceptionRule.expectMessage(error_message);
     when(mockConfigOptionGetter.get()).thenThrow(new Exception(error_message));
-    configParsingHandler.handle(mockParseResult);
+    assertThatThrownBy(() -> configParsingHandler.handle(mockParseResult))
+        .isInstanceOf(Exception.class)
+        .hasMessage(error_message);
   }
 
   @Test
-  public void selfMustReturnTheHandler() {
-    assertThat(configParsingHandler.self()).isSameAs(configParsingHandler);
+  public void handleWithEnvironmentVariableOptionShouldRaiseExceptionIfNoFileParam() {
+    final ConfigOptionSearchAndRunHandler environmentConfigFileParsingHandler =
+        new ConfigOptionSearchAndRunHandler(
+            resultHandler,
+            mockParameterExceptionHandler,
+            singletonMap("BESU_CONFIG_FILE", "not_found.toml"));
+
+    when(mockParseResult.hasMatchedOption(CONFIG_FILE_OPTION_NAME)).thenReturn(false);
+
+    assertThatThrownBy(() -> environmentConfigFileParsingHandler.handle(mockParseResult))
+        .isInstanceOf(CommandLine.ParameterException.class);
   }
 
   @Test
@@ -127,4 +151,20 @@ public void shouldRetrieveConfigFromEnvironmentWhenConfigFileNotSpecified() thro
     final String value = defaultValueProvider.defaultValue(OptionSpec.builder("--logging").build());
     assertThat(value).isEqualTo("ERROR");
   }
+
+  @Test
+  public void handleThrowsErrorWithWithEnvironmentVariableAndCommandLineSpecified()
+      throws IOException {
+
+    final ConfigOptionSearchAndRunHandler environmentConfigFileParsingHandler =
+        new ConfigOptionSearchAndRunHandler(
+            resultHandler,
+            mockParameterExceptionHandler,
+            singletonMap("BESU_CONFIG_FILE", temp.newFile().getAbsolutePath()));
+
+    when(mockParseResult.hasMatchedOption(CONFIG_FILE_OPTION_NAME)).thenReturn(true);
+
+    assertThatThrownBy(() -> environmentConfigFileParsingHandler.handle(mockParseResult))
+        .isInstanceOf(CommandLine.ParameterException.class);
+  }
 }
diff --git a/besu/src/test/java/org/hyperledger/besu/cli/util/VersionProviderTest.java b/besu/src/test/java/org/hyperledger/besu/cli/util/VersionProviderTest.java
index 8b4b8dece87..6fba9cf66a4 100644
--- a/besu/src/test/java/org/hyperledger/besu/cli/util/VersionProviderTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/cli/util/VersionProviderTest.java
@@ -19,7 +19,7 @@
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.BesuInfo;
-import org.hyperledger.besu.services.PluginVersionsProvider;
+import org.hyperledger.besu.plugin.services.PluginVersionsProvider;
 
 import java.util.Collections;
 
diff --git a/besu/src/test/java/org/hyperledger/besu/controller/BesuControllerBuilderTest.java b/besu/src/test/java/org/hyperledger/besu/controller/BesuControllerBuilderTest.java
new file mode 100644
index 00000000000..bd8d06d2a5e
--- /dev/null
+++ b/besu/src/test/java/org/hyperledger/besu/controller/BesuControllerBuilderTest.java
@@ -0,0 +1,203 @@
+/*
+ * Copyright 2019 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.controller;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.CheckpointConfigOptions;
+import org.hyperledger.besu.config.EthashConfigOptions;
+import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
+import org.hyperledger.besu.ethereum.bonsai.cache.CachedMerkleTrieLoader;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.bonsai.worldview.BonsaiWorldState;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
+import org.hyperledger.besu.ethereum.storage.StorageProvider;
+import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
+import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage;
+import org.hyperledger.besu.ethereum.storage.keyvalue.VariablesKeyValueStorage;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.ethereum.worldstate.ImmutableDataStorageConfiguration;
+import org.hyperledger.besu.ethereum.worldstate.PrunerConfiguration;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.metrics.ObservableMetricsSystem;
+import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
+
+import java.math.BigInteger;
+import java.time.Clock;
+import java.util.OptionalLong;
+
+import com.google.common.collect.Range;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class BesuControllerBuilderTest {
+
+  private BesuControllerBuilder besuControllerBuilder;
+  private static final NodeKey nodeKey = NodeKeyUtils.generate();
+
+  @Mock GenesisConfigFile genesisConfigFile;
+  @Mock GenesisConfigOptions genesisConfigOptions;
+  @Mock EthashConfigOptions ethashConfigOptions;
+  @Mock CheckpointConfigOptions checkpointConfigOptions;
+  @Mock SynchronizerConfiguration synchronizerConfiguration;
+  @Mock EthProtocolConfiguration ethProtocolConfiguration;
+  @Mock MiningParameters miningParameters;
+  @Mock ObservableMetricsSystem observableMetricsSystem;
+  @Mock PrivacyParameters privacyParameters;
+  @Mock Clock clock;
+  @Mock TransactionPoolConfiguration poolConfiguration;
+  @Mock StorageProvider storageProvider;
+  @Mock GasLimitCalculator gasLimitCalculator;
+  @Mock WorldStateStorage worldStateStorage;
+  @Mock WorldStateArchive worldStateArchive;
+  @Mock BonsaiWorldStateKeyValueStorage bonsaiWorldStateStorage;
+  @Mock WorldStatePreimageStorage worldStatePreimageStorage;
+
+  BigInteger networkId = BigInteger.ONE;
+
+  @Rule public final TemporaryFolder tempDirRule = new TemporaryFolder();
+
+  @Before
+  public void setup() {
+    when(genesisConfigFile.getParentHash()).thenReturn(Hash.ZERO.toHexString());
+    when(genesisConfigFile.getDifficulty()).thenReturn(Bytes.of(0).toHexString());
+    when(genesisConfigFile.getExtraData()).thenReturn(Bytes.EMPTY.toHexString());
+    when(genesisConfigFile.getMixHash()).thenReturn(Hash.ZERO.toHexString());
+    when(genesisConfigFile.getNonce()).thenReturn(Long.toHexString(1));
+    when(genesisConfigFile.getConfigOptions(any())).thenReturn(genesisConfigOptions);
+    when(genesisConfigFile.getConfigOptions()).thenReturn(genesisConfigOptions);
+    when(genesisConfigOptions.getThanosBlockNumber()).thenReturn(OptionalLong.empty());
+    when(genesisConfigOptions.getEthashConfigOptions()).thenReturn(ethashConfigOptions);
+    when(genesisConfigOptions.getCheckpointOptions()).thenReturn(checkpointConfigOptions);
+    when(ethashConfigOptions.getFixedDifficulty()).thenReturn(OptionalLong.empty());
+    when(storageProvider.getStorageBySegmentIdentifier(any()))
+        .thenReturn(new InMemoryKeyValueStorage());
+    when(storageProvider.createBlockchainStorage(any(), any()))
+        .thenReturn(
+            new KeyValueStoragePrefixedKeyBlockchainStorage(
+                new InMemoryKeyValueStorage(),
+                new VariablesKeyValueStorage(new InMemoryKeyValueStorage()),
+                new MainnetBlockHeaderFunctions()));
+    when(synchronizerConfiguration.getDownloaderParallelism()).thenReturn(1);
+    when(synchronizerConfiguration.getTransactionsParallelism()).thenReturn(1);
+    when(synchronizerConfiguration.getComputationParallelism()).thenReturn(1);
+
+    when(synchronizerConfiguration.getBlockPropagationRange()).thenReturn(Range.closed(1L, 2L));
+
+    when(observableMetricsSystem.createLabelledCounter(
+            any(), anyString(), anyString(), anyString()))
+        .thenReturn(labels -> null);
+
+    when(storageProvider.createWorldStateStorage(DataStorageFormat.FOREST))
+        .thenReturn(worldStateStorage);
+    when(storageProvider.createWorldStatePreimageStorage()).thenReturn(worldStatePreimageStorage);
+    when(storageProvider.isWorldStateIterable()).thenReturn(true);
+
+    when(worldStateStorage.isWorldStateAvailable(any(), any())).thenReturn(true);
+    when(worldStatePreimageStorage.updater())
+        .thenReturn(mock(WorldStatePreimageStorage.Updater.class));
+    when(worldStateStorage.updater()).thenReturn(mock(WorldStateStorage.Updater.class));
+    besuControllerBuilder = spy(visitWithMockConfigs(new MainnetBesuControllerBuilder()));
+  }
+
+  BesuControllerBuilder visitWithMockConfigs(final BesuControllerBuilder builder) {
+    return builder
+        .gasLimitCalculator(gasLimitCalculator)
+        .genesisConfigFile(genesisConfigFile)
+        .synchronizerConfiguration(synchronizerConfiguration)
+        .ethProtocolConfiguration(ethProtocolConfiguration)
+        .miningParameters(miningParameters)
+        .metricsSystem(observableMetricsSystem)
+        .privacyParameters(privacyParameters)
+        .dataDirectory(tempDirRule.getRoot().toPath())
+        .clock(clock)
+        .transactionPoolConfiguration(poolConfiguration)
+        .nodeKey(nodeKey)
+        .storageProvider(storageProvider)
+        .evmConfiguration(EvmConfiguration.DEFAULT)
+        .networkConfiguration(NetworkingConfiguration.create())
+        .networkId(networkId);
+  }
+
+  @Test
+  public void shouldDisablePruningIfBonsaiIsEnabled() {
+    BonsaiWorldState mockWorldState = mock(BonsaiWorldState.class, Answers.RETURNS_DEEP_STUBS);
+    doReturn(worldStateArchive)
+        .when(besuControllerBuilder)
+        .createWorldStateArchive(
+            any(WorldStateStorage.class), any(Blockchain.class), any(CachedMerkleTrieLoader.class));
+    doReturn(mockWorldState).when(worldStateArchive).getMutable();
+
+    when(storageProvider.createWorldStateStorage(DataStorageFormat.BONSAI))
+        .thenReturn(bonsaiWorldStateStorage);
+    besuControllerBuilder
+        .isPruningEnabled(true)
+        .dataStorageConfiguration(
+            ImmutableDataStorageConfiguration.builder()
+                .dataStorageFormat(DataStorageFormat.BONSAI)
+                .bonsaiMaxLayersToLoad(DataStorageConfiguration.DEFAULT_BONSAI_MAX_LAYERS_TO_LOAD)
+                .build());
+    besuControllerBuilder.build();
+
+    verify(storageProvider, never())
+        .getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.PRUNING_STATE);
+  }
+
+  @Test
+  public void shouldUsePruningIfForestIsEnabled() {
+    besuControllerBuilder
+        .isPruningEnabled(true)
+        .pruningConfiguration(new PrunerConfiguration(1, 2))
+        .dataStorageConfiguration(
+            ImmutableDataStorageConfiguration.builder()
+                .dataStorageFormat(DataStorageFormat.FOREST)
+                .bonsaiMaxLayersToLoad(DataStorageConfiguration.DEFAULT_BONSAI_MAX_LAYERS_TO_LOAD)
+                .build());
+    besuControllerBuilder.build();
+
+    verify(storageProvider).getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.PRUNING_STATE);
+  }
+}
diff --git a/besu/src/test/java/org/hyperledger/besu/controller/BesuControllerTest.java b/besu/src/test/java/org/hyperledger/besu/controller/BesuControllerTest.java
new file mode 100644
index 00000000000..e6b631a4e88
--- /dev/null
+++ b/besu/src/test/java/org/hyperledger/besu/controller/BesuControllerTest.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ *  the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.config.QbftConfigOptions;
+import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.Locale;
+import java.util.Map;
+import java.util.OptionalLong;
+
+import com.google.common.io.Resources;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class BesuControllerTest {
+
+  @Spy private GenesisConfigFile genesisConfigFile = GenesisConfigFile.mainnet();
+  @Mock private GenesisConfigOptions genesisConfigOptions;
+  @Mock private QbftConfigOptions qbftConfigOptions;
+
+  @Test
+  public void missingQbftStartBlock() {
+    mockGenesisConfigForMigration("ibft2", OptionalLong.empty());
+    assertThatThrownBy(
+            () -> new BesuController.Builder().fromGenesisConfig(genesisConfigFile, SyncMode.FULL))
+        .isInstanceOf(IllegalStateException.class)
+        .hasMessage("Missing QBFT startBlock config in genesis file");
+  }
+
+  @Test
+  public void invalidQbftStartBlock() {
+    mockGenesisConfigForMigration("ibft2", OptionalLong.of(-1L));
+    assertThatThrownBy(
+            () -> new BesuController.Builder().fromGenesisConfig(genesisConfigFile, SyncMode.FULL))
+        .isInstanceOf(IllegalStateException.class)
+        .hasMessage("Invalid QBFT startBlock config in genesis file");
+  }
+
+  @Test
+  public void invalidConsensusCombination() {
+    when(genesisConfigFile.getConfigOptions(any())).thenReturn(genesisConfigOptions);
+    when(genesisConfigOptions.isConsensusMigration()).thenReturn(true);
+    // explicitly not setting isIbft2() for genesisConfigOptions
+
+    assertThatThrownBy(
+            () -> new BesuController.Builder().fromGenesisConfig(genesisConfigFile, SyncMode.FULL))
+        .isInstanceOf(IllegalStateException.class)
+        .hasMessage(
+            "Invalid genesis migration config. Migration is supported from IBFT (legacy) or IBFT2 to QBFT)");
+  }
+
+  @Test
+  public void createConsensusScheduleBesuControllerBuilderWhenMigratingFromIbft2ToQbft() {
+    final long qbftStartBlock = 10L;
+    mockGenesisConfigForMigration("ibft2", OptionalLong.of(qbftStartBlock));
+
+    final BesuControllerBuilder besuControllerBuilder =
+        new BesuController.Builder().fromGenesisConfig(genesisConfigFile, SyncMode.FULL);
+
+    assertThat(besuControllerBuilder).isInstanceOf(ConsensusScheduleBesuControllerBuilder.class);
+
+    final Map<Long, BesuControllerBuilder> besuControllerBuilderSchedule =
+        ((ConsensusScheduleBesuControllerBuilder) besuControllerBuilder)
+            .getBesuControllerBuilderSchedule();
+
+    assertThat(besuControllerBuilderSchedule).containsKeys(0L, qbftStartBlock);
+    assertThat(besuControllerBuilderSchedule.get(0L)).isInstanceOf(IbftBesuControllerBuilder.class);
+    assertThat(besuControllerBuilderSchedule.get(qbftStartBlock))
+        .isInstanceOf(QbftBesuControllerBuilder.class);
+  }
+
+  private void mockGenesisConfigForMigration(
+      final String consensus, final OptionalLong startBlock) {
+    when(genesisConfigFile.getConfigOptions(any())).thenReturn(genesisConfigOptions);
+    when(genesisConfigOptions.isConsensusMigration()).thenReturn(true);
+
+    switch (consensus.toLowerCase(Locale.ROOT)) {
+      case "ibft2":
+        {
+          when(genesisConfigOptions.isIbft2()).thenReturn(true);
+          break;
+        }
+      default:
+        fail("Invalid consensus algorithm");
+    }
+
+    when(genesisConfigOptions.getQbftConfigOptions()).thenReturn(qbftConfigOptions);
+    when(qbftConfigOptions.getStartBlock()).thenReturn(startBlock);
+  }
+
+  @Test
+  public void postMergeCheckpointSyncUsesMergeControllerBuilder() throws IOException {
+    final GenesisConfigFile postMergeGenesisFile =
+        GenesisConfigFile.fromConfig(
+            Resources.toString(
+                Resources.getResource("valid_post_merge_near_head_checkpoint.json"),
+                StandardCharsets.UTF_8));
+
+    final BesuControllerBuilder besuControllerBuilder =
+        new BesuController.Builder()
+            .fromGenesisConfig(postMergeGenesisFile, Collections.emptyMap(), SyncMode.X_CHECKPOINT);
+
+    assertThat(besuControllerBuilder).isInstanceOf(MergeBesuControllerBuilder.class);
+  }
+
+  @Test
+  public void postMergeCheckpointSyncWithTotalDifficultyEqualsTTDUsesTransitionControllerBuilder()
+      throws IOException {
+    final GenesisConfigFile mergeAtGenesisFile =
+        GenesisConfigFile.fromConfig(
+            Resources.toString(
+                Resources.getResource(
+                    "invalid_post_merge_checkpoint_total_difficulty_same_as_TTD.json"),
+                StandardCharsets.UTF_8));
+
+    final BesuControllerBuilder besuControllerBuilder =
+        new BesuController.Builder()
+            .fromGenesisConfig(mergeAtGenesisFile, Collections.emptyMap(), SyncMode.X_CHECKPOINT);
+
+    assertThat(besuControllerBuilder).isInstanceOf(TransitionBesuControllerBuilder.class);
+  }
+
+  @Test
+  public void preMergeCheckpointSyncUsesTransitionControllerBuilder() {
+    final BesuControllerBuilder besuControllerBuilder =
+        new BesuController.Builder()
+            .fromGenesisConfig(genesisConfigFile, Collections.emptyMap(), SyncMode.X_CHECKPOINT);
+
+    assertThat(besuControllerBuilder).isInstanceOf(TransitionBesuControllerBuilder.class);
+  }
+
+  @Test
+  public void nonCheckpointSyncUsesTransitionControllerBuild() {
+    final BesuControllerBuilder besuControllerBuilder =
+        new BesuController.Builder()
+            .fromGenesisConfig(genesisConfigFile, Collections.emptyMap(), SyncMode.X_SNAP);
+
+    assertThat(besuControllerBuilder).isInstanceOf(TransitionBesuControllerBuilder.class);
+  }
+}
diff --git a/besu/src/test/java/org/hyperledger/besu/controller/ConsensusScheduleBesuControllerBuilderTest.java b/besu/src/test/java/org/hyperledger/besu/controller/ConsensusScheduleBesuControllerBuilderTest.java
new file mode 100644
index 00000000000..4e1d87f4a68
--- /dev/null
+++ b/besu/src/test/java/org/hyperledger/besu/controller/ConsensusScheduleBesuControllerBuilderTest.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ *  the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.config.StubGenesisConfigOptions;
+import org.hyperledger.besu.consensus.common.ForkSpec;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.MigratingContext;
+import org.hyperledger.besu.consensus.common.MigratingMiningCoordinator;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.BftMiningCoordinator;
+import org.hyperledger.besu.ethereum.ConsensusContext;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
+import org.hyperledger.besu.ethereum.blockcreation.NoopMiningCoordinator;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+
+import java.math.BigInteger;
+import java.util.Collections;
+import java.util.Map;
+import java.util.NavigableSet;
+import java.util.Optional;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.function.BiFunction;
+
+import org.assertj.core.api.SoftAssertions;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ConsensusScheduleBesuControllerBuilderTest {
+  private @Mock BiFunction<
+          NavigableSet<ForkSpec<ProtocolSchedule>>, Optional<BigInteger>, ProtocolSchedule>
+      combinedProtocolScheduleFactory;
+  private @Mock GenesisConfigFile genesisConfigFile;
+  private @Mock BesuControllerBuilder besuControllerBuilder1;
+  private @Mock BesuControllerBuilder besuControllerBuilder2;
+  private @Mock BesuControllerBuilder besuControllerBuilder3;
+  private @Mock ProtocolSchedule protocolSchedule1;
+  private @Mock ProtocolSchedule protocolSchedule2;
+  private @Mock ProtocolSchedule protocolSchedule3;
+  private @Mock NoopMiningCoordinator miningCoordinator1;
+  private @Mock BftMiningCoordinator miningCoordinator2;
+
+  @Test
+  public void mustProvideNonNullConsensusScheduleWhenInstantiatingNew() {
+    assertThatThrownBy(() -> new ConsensusScheduleBesuControllerBuilder(null))
+        .isInstanceOf(NullPointerException.class)
+        .hasMessage("BesuControllerBuilder schedule can't be null");
+  }
+
+  @Test
+  public void mustProvideNonEmptyConsensusScheduleWhenInstantiatingNew() {
+    assertThatThrownBy(() -> new ConsensusScheduleBesuControllerBuilder(Collections.emptyMap()))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage("BesuControllerBuilder schedule can't be empty");
+  }
+
+  @Test
+  public void mustCreateCombinedProtocolScheduleUsingProtocolSchedulesOrderedByBlock() {
+    // Use an ordered map with keys in the incorrect order so that we can show that set is created
+    // with the correct order
+    final Map<Long, BesuControllerBuilder> besuControllerBuilderSchedule = new TreeMap<>();
+    besuControllerBuilderSchedule.put(30L, besuControllerBuilder3);
+    besuControllerBuilderSchedule.put(10L, besuControllerBuilder2);
+    besuControllerBuilderSchedule.put(0L, besuControllerBuilder1);
+
+    when(besuControllerBuilder1.createProtocolSchedule()).thenReturn(protocolSchedule1);
+    when(besuControllerBuilder2.createProtocolSchedule()).thenReturn(protocolSchedule2);
+    when(besuControllerBuilder3.createProtocolSchedule()).thenReturn(protocolSchedule3);
+
+    final StubGenesisConfigOptions genesisConfigOptions = new StubGenesisConfigOptions();
+    genesisConfigOptions.chainId(BigInteger.TEN);
+    when(genesisConfigFile.getConfigOptions(anyMap())).thenReturn(genesisConfigOptions);
+
+    final ConsensusScheduleBesuControllerBuilder consensusScheduleBesuControllerBuilder =
+        new ConsensusScheduleBesuControllerBuilder(
+            besuControllerBuilderSchedule, combinedProtocolScheduleFactory);
+    consensusScheduleBesuControllerBuilder.genesisConfigFile(genesisConfigFile);
+    consensusScheduleBesuControllerBuilder.createProtocolSchedule();
+
+    final NavigableSet<ForkSpec<ProtocolSchedule>> expectedProtocolSchedulesSpecs =
+        new TreeSet<>(ForkSpec.COMPARATOR);
+    expectedProtocolSchedulesSpecs.add(new ForkSpec<>(0L, protocolSchedule1));
+    expectedProtocolSchedulesSpecs.add(new ForkSpec<>(10L, protocolSchedule2));
+    expectedProtocolSchedulesSpecs.add(new ForkSpec<>(30L, protocolSchedule3));
+    Mockito.verify(combinedProtocolScheduleFactory)
+        .apply(expectedProtocolSchedulesSpecs, Optional.of(BigInteger.TEN));
+  }
+
+  @Test
+  public void createsMigratingMiningCoordinator() {
+    final Map<Long, BesuControllerBuilder> consensusSchedule =
+        Map.of(0L, besuControllerBuilder1, 5L, besuControllerBuilder2);
+
+    when(besuControllerBuilder1.createMiningCoordinator(any(), any(), any(), any(), any(), any()))
+        .thenReturn(miningCoordinator1);
+    when(besuControllerBuilder2.createMiningCoordinator(any(), any(), any(), any(), any(), any()))
+        .thenReturn(miningCoordinator2);
+    final ProtocolContext mockProtocolContext = mock(ProtocolContext.class);
+    when(mockProtocolContext.getBlockchain()).thenReturn(mock(MutableBlockchain.class));
+
+    final ConsensusScheduleBesuControllerBuilder builder =
+        new ConsensusScheduleBesuControllerBuilder(consensusSchedule);
+    final MiningCoordinator miningCoordinator =
+        builder.createMiningCoordinator(
+            protocolSchedule1,
+            mockProtocolContext,
+            mock(TransactionPool.class),
+            mock(MiningParameters.class),
+            mock(SyncState.class),
+            mock(EthProtocolManager.class));
+
+    assertThat(miningCoordinator).isInstanceOf(MigratingMiningCoordinator.class);
+    final MigratingMiningCoordinator migratingMiningCoordinator =
+        (MigratingMiningCoordinator) miningCoordinator;
+
+    SoftAssertions.assertSoftly(
+        (softly) -> {
+          softly
+              .assertThat(
+                  migratingMiningCoordinator.getMiningCoordinatorSchedule().getFork(0L).getValue())
+              .isSameAs(miningCoordinator1);
+          softly
+              .assertThat(
+                  migratingMiningCoordinator.getMiningCoordinatorSchedule().getFork(4L).getValue())
+              .isSameAs(miningCoordinator1);
+          softly
+              .assertThat(
+                  migratingMiningCoordinator.getMiningCoordinatorSchedule().getFork(5L).getValue())
+              .isSameAs(miningCoordinator2);
+          softly
+              .assertThat(
+                  migratingMiningCoordinator.getMiningCoordinatorSchedule().getFork(6L).getValue())
+              .isSameAs(miningCoordinator2);
+        });
+  }
+
+  @Test
+  public void createsMigratingContext() {
+    final ConsensusContext context1 = Mockito.mock(ConsensusContext.class);
+    final ConsensusContext context2 = Mockito.mock(ConsensusContext.class);
+
+    final Map<Long, BesuControllerBuilder> besuControllerBuilderSchedule = new TreeMap<>();
+    besuControllerBuilderSchedule.put(0L, besuControllerBuilder1);
+    besuControllerBuilderSchedule.put(10L, besuControllerBuilder2);
+
+    when(besuControllerBuilder1.createConsensusContext(any(), any(), any())).thenReturn(context1);
+    when(besuControllerBuilder2.createConsensusContext(any(), any(), any())).thenReturn(context2);
+
+    final ConsensusScheduleBesuControllerBuilder controllerBuilder =
+        new ConsensusScheduleBesuControllerBuilder(besuControllerBuilderSchedule);
+    final ConsensusContext consensusContext =
+        controllerBuilder.createConsensusContext(
+            Mockito.mock(Blockchain.class),
+            Mockito.mock(WorldStateArchive.class),
+            Mockito.mock(ProtocolSchedule.class));
+
+    assertThat(consensusContext).isInstanceOf(MigratingContext.class);
+    final MigratingContext migratingContext = (MigratingContext) consensusContext;
+
+    final ForksSchedule<ConsensusContext> contextSchedule =
+        migratingContext.getConsensusContextSchedule();
+
+    final NavigableSet<ForkSpec<ConsensusContext>> expectedConsensusContextSpecs =
+        new TreeSet<>(ForkSpec.COMPARATOR);
+    expectedConsensusContextSpecs.add(new ForkSpec<>(0L, context1));
+    expectedConsensusContextSpecs.add(new ForkSpec<>(10L, context2));
+    assertThat(contextSchedule.getForks()).isEqualTo(expectedConsensusContextSpecs);
+
+    assertThat(contextSchedule.getFork(0).getValue()).isSameAs(context1);
+    assertThat(contextSchedule.getFork(1).getValue()).isSameAs(context1);
+    assertThat(contextSchedule.getFork(9).getValue()).isSameAs(context1);
+    assertThat(contextSchedule.getFork(10).getValue()).isSameAs(context2);
+    assertThat(contextSchedule.getFork(11).getValue()).isSameAs(context2);
+  }
+}
diff --git a/besu/src/test/java/org/hyperledger/besu/controller/MergeBesuControllerBuilderTest.java b/besu/src/test/java/org/hyperledger/besu/controller/MergeBesuControllerBuilderTest.java
new file mode 100644
index 00000000000..15fb3fd3ec2
--- /dev/null
+++ b/besu/src/test/java/org/hyperledger/besu/controller/MergeBesuControllerBuilderTest.java
@@ -0,0 +1,283 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.CheckpointConfigOptions;
+import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.consensus.merge.MergeContext;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.chain.GenesisState;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.LondonFeeMarket;
+import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
+import org.hyperledger.besu.ethereum.storage.StorageProvider;
+import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage;
+import org.hyperledger.besu.ethereum.storage.keyvalue.VariablesKeyValueStorage;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.metrics.ObservableMetricsSystem;
+import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
+
+import java.math.BigInteger;
+import java.time.Clock;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.OptionalLong;
+
+import com.google.common.collect.Range;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class MergeBesuControllerBuilderTest {
+
+  private MergeBesuControllerBuilder besuControllerBuilder;
+  private static final NodeKey nodeKey = NodeKeyUtils.generate();
+
+  @Mock GenesisConfigFile genesisConfigFile;
+  @Mock GenesisConfigOptions genesisConfigOptions;
+  @Mock SynchronizerConfiguration synchronizerConfiguration;
+  @Mock EthProtocolConfiguration ethProtocolConfiguration;
+  @Mock CheckpointConfigOptions checkpointConfigOptions;
+  @Mock MiningParameters miningParameters;
+  @Mock ObservableMetricsSystem observableMetricsSystem;
+  @Mock PrivacyParameters privacyParameters;
+  @Mock Clock clock;
+  @Mock TransactionPoolConfiguration poolConfiguration;
+  @Mock StorageProvider storageProvider;
+  @Mock GasLimitCalculator gasLimitCalculator;
+  @Mock WorldStateStorage worldStateStorage;
+  @Mock WorldStatePreimageStorage worldStatePreimageStorage;
+
+  BigInteger networkId = BigInteger.ONE;
+  private final BlockHeaderTestFixture headerGenerator = new BlockHeaderTestFixture();
+  private final BaseFeeMarket feeMarket = new LondonFeeMarket(0, Optional.of(Wei.of(42)));
+
+  @Rule public final TemporaryFolder tempDirRule = new TemporaryFolder();
+
+  @Before
+  public void setup() {
+    when(genesisConfigFile.getParentHash()).thenReturn(Hash.ZERO.toHexString());
+    when(genesisConfigFile.getDifficulty()).thenReturn(Bytes.of(0).toHexString());
+    when(genesisConfigFile.getExtraData()).thenReturn(Bytes.EMPTY.toHexString());
+    when(genesisConfigFile.getMixHash()).thenReturn(Hash.ZERO.toHexString());
+    when(genesisConfigFile.getNonce()).thenReturn(Long.toHexString(1));
+    when(genesisConfigFile.getConfigOptions(any())).thenReturn(genesisConfigOptions);
+    when(genesisConfigFile.getConfigOptions()).thenReturn(genesisConfigOptions);
+    when(genesisConfigOptions.getCheckpointOptions()).thenReturn(checkpointConfigOptions);
+    when(genesisConfigOptions.getTerminalTotalDifficulty())
+        .thenReturn((Optional.of(UInt256.valueOf(100L))));
+    when(genesisConfigOptions.getThanosBlockNumber()).thenReturn(OptionalLong.empty());
+    when(genesisConfigOptions.getTerminalBlockHash()).thenReturn(Optional.of(Hash.ZERO));
+    when(genesisConfigOptions.getTerminalBlockNumber()).thenReturn(OptionalLong.of(1L));
+    when(storageProvider.createBlockchainStorage(any(), any()))
+        .thenReturn(
+            new KeyValueStoragePrefixedKeyBlockchainStorage(
+                new InMemoryKeyValueStorage(),
+                new VariablesKeyValueStorage(new InMemoryKeyValueStorage()),
+                new MainnetBlockHeaderFunctions()));
+    when(storageProvider.getStorageBySegmentIdentifier(any()))
+        .thenReturn(new InMemoryKeyValueStorage());
+    when(synchronizerConfiguration.getDownloaderParallelism()).thenReturn(1);
+    when(synchronizerConfiguration.getTransactionsParallelism()).thenReturn(1);
+    when(synchronizerConfiguration.getComputationParallelism()).thenReturn(1);
+
+    when(synchronizerConfiguration.getBlockPropagationRange()).thenReturn(Range.closed(1L, 2L));
+
+    when(observableMetricsSystem.createLabelledCounter(
+            any(), anyString(), anyString(), anyString()))
+        .thenReturn(labels -> null);
+
+    when(storageProvider.createWorldStateStorage(DataStorageFormat.FOREST))
+        .thenReturn(worldStateStorage);
+    when(storageProvider.createWorldStatePreimageStorage()).thenReturn(worldStatePreimageStorage);
+
+    when(worldStateStorage.isWorldStateAvailable(any(), any())).thenReturn(true);
+    when(worldStatePreimageStorage.updater())
+        .thenReturn(mock(WorldStatePreimageStorage.Updater.class));
+    when(worldStateStorage.updater()).thenReturn(mock(WorldStateStorage.Updater.class));
+
+    besuControllerBuilder = visitWithMockConfigs(new MergeBesuControllerBuilder());
+  }
+
+  MergeBesuControllerBuilder visitWithMockConfigs(final MergeBesuControllerBuilder builder) {
+    return (MergeBesuControllerBuilder)
+        builder
+            .gasLimitCalculator(gasLimitCalculator)
+            .genesisConfigFile(genesisConfigFile)
+            .synchronizerConfiguration(synchronizerConfiguration)
+            .ethProtocolConfiguration(ethProtocolConfiguration)
+            .miningParameters(miningParameters)
+            .metricsSystem(observableMetricsSystem)
+            .privacyParameters(privacyParameters)
+            .dataDirectory(tempDirRule.getRoot().toPath())
+            .clock(clock)
+            .transactionPoolConfiguration(poolConfiguration)
+            .nodeKey(nodeKey)
+            .storageProvider(storageProvider)
+            .evmConfiguration(EvmConfiguration.DEFAULT)
+            .networkConfiguration(NetworkingConfiguration.create())
+            .networkId(networkId);
+  }
+
+  @Test
+  public void assertTerminalTotalDifficultyInMergeContext() {
+    when(genesisConfigOptions.getTerminalTotalDifficulty())
+        .thenReturn(Optional.of(UInt256.valueOf(1500L)));
+
+    final Difficulty terminalTotalDifficulty =
+        visitWithMockConfigs(new MergeBesuControllerBuilder())
+            .build()
+            .getProtocolContext()
+            .getConsensusContext(MergeContext.class)
+            .getTerminalTotalDifficulty();
+
+    assertThat(terminalTotalDifficulty).isEqualTo(Difficulty.of(1500L));
+  }
+
+  @Test
+  public void assertConfiguredBlock() {
+    final Blockchain mockChain = mock(Blockchain.class);
+    when(mockChain.getBlockHeader(anyLong())).thenReturn(Optional.of(mock(BlockHeader.class)));
+    final MergeContext mergeContext =
+        besuControllerBuilder.createConsensusContext(
+            mockChain,
+            mock(WorldStateArchive.class),
+            this.besuControllerBuilder.createProtocolSchedule());
+    assertThat(mergeContext).isNotNull();
+    assertThat(mergeContext.getTerminalPoWBlock()).isPresent();
+  }
+
+  @Test
+  public void assertBuiltContextMonitorsTTD() {
+    final GenesisState genesisState =
+        GenesisState.fromConfig(
+            genesisConfigFile, this.besuControllerBuilder.createProtocolSchedule());
+    final MutableBlockchain blockchain = createInMemoryBlockchain(genesisState.getBlock());
+    final MergeContext mergeContext =
+        spy(
+            besuControllerBuilder.createConsensusContext(
+                blockchain,
+                mock(WorldStateArchive.class),
+                this.besuControllerBuilder.createProtocolSchedule()));
+    assertThat(mergeContext).isNotNull();
+    final Difficulty over = Difficulty.of(10000L);
+    final Difficulty under = Difficulty.of(10L);
+
+    final BlockHeader parent =
+        headerGenerator
+            .difficulty(under)
+            .parentHash(genesisState.getBlock().getHash())
+            .number(genesisState.getBlock().getHeader().getNumber() + 1)
+            .gasLimit(genesisState.getBlock().getHeader().getGasLimit())
+            .stateRoot(genesisState.getBlock().getHeader().getStateRoot())
+            .buildHeader();
+    blockchain.appendBlock(new Block(parent, BlockBody.empty()), Collections.emptyList());
+
+    final BlockHeader terminal =
+        headerGenerator
+            .difficulty(over)
+            .parentHash(parent.getHash())
+            .number(parent.getNumber() + 1)
+            .gasLimit(parent.getGasLimit())
+            .stateRoot(parent.getStateRoot())
+            .buildHeader();
+
+    blockchain.appendBlock(new Block(terminal, BlockBody.empty()), Collections.emptyList());
+    assertThat(mergeContext.isPostMerge()).isTrue();
+  }
+
+  @Test
+  public void assertNoFinalizedBlockWhenNotStored() {
+    final Blockchain mockChain = mock(Blockchain.class);
+    when(mockChain.getFinalized()).thenReturn(Optional.empty());
+    final MergeContext mergeContext =
+        besuControllerBuilder.createConsensusContext(
+            mockChain,
+            mock(WorldStateArchive.class),
+            this.besuControllerBuilder.createProtocolSchedule());
+    assertThat(mergeContext).isNotNull();
+    assertThat(mergeContext.getFinalized()).isEmpty();
+  }
+
+  @Test
+  public void assertFinalizedBlockIsPresentWhenStored() {
+    final BlockHeader finalizedHeader = finalizedBlockHeader();
+
+    final Blockchain mockChain = mock(Blockchain.class);
+    when(mockChain.getFinalized()).thenReturn(Optional.of(finalizedHeader.getHash()));
+    when(mockChain.getBlockHeader(finalizedHeader.getHash()))
+        .thenReturn(Optional.of(finalizedHeader));
+    final MergeContext mergeContext =
+        besuControllerBuilder.createConsensusContext(
+            mockChain,
+            mock(WorldStateArchive.class),
+            this.besuControllerBuilder.createProtocolSchedule());
+    assertThat(mergeContext).isNotNull();
+    assertThat(mergeContext.getFinalized().get()).isEqualTo(finalizedHeader);
+  }
+
+  private BlockHeader finalizedBlockHeader() {
+    final long blockNumber = 42;
+    final Hash magicHash = Hash.wrap(Bytes32.leftPad(Bytes.ofUnsignedInt(42)));
+
+    return headerGenerator
+        .difficulty(Difficulty.MAX_VALUE)
+        .parentHash(magicHash)
+        .number(blockNumber)
+        .baseFeePerGas(feeMarket.computeBaseFee(blockNumber, Wei.of(0x3b9aca00), 0, 15000000l))
+        .gasLimit(30000000l)
+        .stateRoot(magicHash)
+        .buildHeader();
+  }
+}
diff --git a/besu/src/test/java/org/hyperledger/besu/controller/QbftBesuControllerBuilderTest.java b/besu/src/test/java/org/hyperledger/besu/controller/QbftBesuControllerBuilderTest.java
new file mode 100644
index 00000000000..395abeb22d6
--- /dev/null
+++ b/besu/src/test/java/org/hyperledger/besu/controller/QbftBesuControllerBuilderTest.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright Hyperledger Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.CheckpointConfigOptions;
+import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.config.JsonQbftConfigOptions;
+import org.hyperledger.besu.config.TransitionsConfigOptions;
+import org.hyperledger.besu.consensus.common.bft.BftContext;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.qbft.MutableQbftConfigOptions;
+import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
+import org.hyperledger.besu.consensus.qbft.validator.ForkingValidatorProvider;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
+import org.hyperledger.besu.ethereum.storage.StorageProvider;
+import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage;
+import org.hyperledger.besu.ethereum.storage.keyvalue.VariablesKeyValueStorage;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.metrics.ObservableMetricsSystem;
+import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
+
+import java.math.BigInteger;
+import java.time.Clock;
+import java.util.List;
+
+import com.google.common.collect.Range;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class QbftBesuControllerBuilderTest {
+
+  private BesuControllerBuilder qbftBesuControllerBuilder;
+
+  @Mock private GenesisConfigFile genesisConfigFile;
+  @Mock private GenesisConfigOptions genesisConfigOptions;
+  @Mock private SynchronizerConfiguration synchronizerConfiguration;
+  @Mock private EthProtocolConfiguration ethProtocolConfiguration;
+  @Mock CheckpointConfigOptions checkpointConfigOptions;
+  @Mock private MiningParameters miningParameters;
+  @Mock private ObservableMetricsSystem observableMetricsSystem;
+  @Mock private PrivacyParameters privacyParameters;
+  @Mock private Clock clock;
+  @Mock private TransactionPoolConfiguration poolConfiguration;
+  @Mock private StorageProvider storageProvider;
+  @Mock private GasLimitCalculator gasLimitCalculator;
+  @Mock private WorldStateStorage worldStateStorage;
+  @Mock private WorldStatePreimageStorage worldStatePreimageStorage;
+  private static final BigInteger networkId = BigInteger.ONE;
+  private static final NodeKey nodeKey = NodeKeyUtils.generate();
+
+  @Rule public final TemporaryFolder tempDirRule = new TemporaryFolder();
+
+  @Before
+  public void setup() {
+    // besu controller setup
+    when(genesisConfigFile.getParentHash()).thenReturn(Hash.ZERO.toHexString());
+    when(genesisConfigFile.getDifficulty()).thenReturn(Bytes.of(0).toHexString());
+    when(genesisConfigFile.getExtraData()).thenReturn(Bytes.EMPTY.toHexString());
+    when(genesisConfigFile.getMixHash()).thenReturn(Hash.ZERO.toHexString());
+    when(genesisConfigFile.getNonce()).thenReturn(Long.toHexString(1));
+    when(genesisConfigFile.getConfigOptions(any())).thenReturn(genesisConfigOptions);
+    when(genesisConfigFile.getConfigOptions()).thenReturn(genesisConfigOptions);
+    when(genesisConfigOptions.getCheckpointOptions()).thenReturn(checkpointConfigOptions);
+    when(storageProvider.createBlockchainStorage(any(), any()))
+        .thenReturn(
+            new KeyValueStoragePrefixedKeyBlockchainStorage(
+                new InMemoryKeyValueStorage(),
+                new VariablesKeyValueStorage(new InMemoryKeyValueStorage()),
+                new MainnetBlockHeaderFunctions()));
+    when(storageProvider.createWorldStateStorage(DataStorageFormat.FOREST))
+        .thenReturn(worldStateStorage);
+    when(worldStateStorage.isWorldStateAvailable(any(), any())).thenReturn(true);
+    when(worldStateStorage.updater()).thenReturn(mock(WorldStateStorage.Updater.class));
+    when(worldStatePreimageStorage.updater())
+        .thenReturn(mock(WorldStatePreimageStorage.Updater.class));
+    when(storageProvider.createWorldStatePreimageStorage()).thenReturn(worldStatePreimageStorage);
+    when(synchronizerConfiguration.getDownloaderParallelism()).thenReturn(1);
+    when(synchronizerConfiguration.getTransactionsParallelism()).thenReturn(1);
+    when(synchronizerConfiguration.getComputationParallelism()).thenReturn(1);
+    when(observableMetricsSystem.createLabelledCounter(
+            any(), anyString(), anyString(), anyString()))
+        .thenReturn(labels -> null);
+    when(synchronizerConfiguration.getBlockPropagationRange()).thenReturn(Range.closed(1L, 2L));
+
+    // qbft prepForBuild setup
+    when(genesisConfigOptions.getQbftConfigOptions())
+        .thenReturn(new MutableQbftConfigOptions(JsonQbftConfigOptions.DEFAULT));
+    when(genesisConfigOptions.getTransitions()).thenReturn(mock(TransitionsConfigOptions.class));
+    when(genesisConfigFile.getExtraData())
+        .thenReturn(
+            QbftExtraDataCodec.createGenesisExtraDataString(List.of(Address.fromHexString("1"))));
+
+    qbftBesuControllerBuilder =
+        new QbftBesuControllerBuilder()
+            .genesisConfigFile(genesisConfigFile)
+            .synchronizerConfiguration(synchronizerConfiguration)
+            .ethProtocolConfiguration(ethProtocolConfiguration)
+            .networkId(networkId)
+            .miningParameters(miningParameters)
+            .metricsSystem(observableMetricsSystem)
+            .privacyParameters(privacyParameters)
+            .dataDirectory(tempDirRule.getRoot().toPath())
+            .clock(clock)
+            .transactionPoolConfiguration(poolConfiguration)
+            .nodeKey(nodeKey)
+            .storageProvider(storageProvider)
+            .gasLimitCalculator(gasLimitCalculator)
+            .evmConfiguration(EvmConfiguration.DEFAULT)
+            .networkConfiguration(NetworkingConfiguration.create());
+  }
+
+  @Test
+  public void forkingValidatorProviderIsAvailableOnBftContext() {
+    final BesuController besuController = qbftBesuControllerBuilder.build();
+
+    final ValidatorProvider validatorProvider =
+        besuController
+            .getProtocolContext()
+            .getConsensusContext(BftContext.class)
+            .getValidatorProvider();
+    assertThat(validatorProvider).isInstanceOf(ForkingValidatorProvider.class);
+  }
+
+  @Test
+  public void missingTransactionValidatorProviderThrowsError() {
+    final ProtocolContext protocolContext = mock(ProtocolContext.class);
+    when(protocolContext.getBlockchain()).thenReturn(mock(MutableBlockchain.class));
+
+    assertThatThrownBy(
+            () -> qbftBesuControllerBuilder.createAdditionalJsonRpcMethodFactory(protocolContext))
+        .isInstanceOf(NullPointerException.class)
+        .hasMessage("transactionValidatorProvider should have been initialised");
+  }
+}
diff --git a/besu/src/test/java/org/hyperledger/besu/controller/TargetingGasLimitCalculatorTest.java b/besu/src/test/java/org/hyperledger/besu/controller/TargetingGasLimitCalculatorTest.java
deleted file mode 100644
index a97611afdfc..00000000000
--- a/besu/src/test/java/org/hyperledger/besu/controller/TargetingGasLimitCalculatorTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 2019 ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.controller;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.GasLimitRangeAndDeltaValidationRule;
-
-import org.junit.Test;
-
-public class TargetingGasLimitCalculatorTest {
-  private static final long ADJUSTMENT_FACTOR = 1024L;
-
-  @Test
-  public void verifyGasLimitIsIncreasedWithinLimits() {
-    TargetingGasLimitCalculator targetingGasLimitCalculator =
-        new TargetingGasLimitCalculator(10_000_000L, ADJUSTMENT_FACTOR, 5000L, 0x7fffffffffffffffL);
-    assertThat(targetingGasLimitCalculator.nextGasLimit(8_000_000L))
-        .isEqualTo(8_000_000L + ADJUSTMENT_FACTOR);
-  }
-
-  @Test
-  public void verifyGasLimitIsDecreasedWithinLimits() {
-    TargetingGasLimitCalculator targetingGasLimitCalculator =
-        new TargetingGasLimitCalculator(10_000_000L, ADJUSTMENT_FACTOR, 5000L, 0x7fffffffffffffffL);
-    assertThat(targetingGasLimitCalculator.nextGasLimit(12_000_000L))
-        .isEqualTo(12_000_000L - ADJUSTMENT_FACTOR);
-  }
-
-  @Test
-  public void verifyGasLimitReachesTarget() {
-    final long target = 10_000_000L;
-    final long offset = ADJUSTMENT_FACTOR / 2;
-    TargetingGasLimitCalculator targetingGasLimitCalculator =
-        new TargetingGasLimitCalculator(target, ADJUSTMENT_FACTOR, 5000L, 0x7fffffffffffffffL);
-    assertThat(targetingGasLimitCalculator.nextGasLimit(target - offset)).isEqualTo(target);
-    assertThat(targetingGasLimitCalculator.nextGasLimit(target + offset)).isEqualTo(target);
-  }
-
-  @Test
-  public void verifyMinGasLimit() {
-    assertThatThrownBy(
-            () ->
-                new TargetingGasLimitCalculator(0L, ADJUSTMENT_FACTOR, 5000L, 0x7fffffffffffffffL))
-        .isInstanceOf(IllegalArgumentException.class);
-  }
-
-  @Test
-  public void verifyMaxGasLimit() {
-    assertThatThrownBy(
-            () -> new TargetingGasLimitCalculator(10001L, ADJUSTMENT_FACTOR, 5000L, 10000L))
-        .isInstanceOf(IllegalArgumentException.class);
-  }
-
-  @Test
-  public void changeTargetGasLimit() {
-    final long targetGasLimit = 10_000_000L;
-    final TargetingGasLimitCalculator targetingGasLimitCalculator =
-        new TargetingGasLimitCalculator(
-            targetGasLimit, ADJUSTMENT_FACTOR, 5000L, 0x7fffffffffffffffL);
-
-    assertThat(targetingGasLimitCalculator.nextGasLimit(targetGasLimit)).isEqualTo(targetGasLimit);
-    targetingGasLimitCalculator.changeTargetGasLimit(8_000_000L);
-    assertThat(targetingGasLimitCalculator.nextGasLimit(targetGasLimit))
-        .isEqualTo(targetGasLimit - ADJUSTMENT_FACTOR);
-  }
-
-  @Test
-  public void changeTargetGasLimitInvalidValue() {
-    assertThatThrownBy(() -> new TargetingGasLimitCalculator(-1L))
-        .isInstanceOf(IllegalArgumentException.class);
-
-    assertThatThrownBy(() -> new TargetingGasLimitCalculator(0L).changeTargetGasLimit(-1L))
-        .isInstanceOf(IllegalArgumentException.class);
-  }
-
-  @Test
-  public void verifyWithinGasLimitDelta() {
-    final long targetGasLimit = 10_000_000L;
-    final long currentGasLimit = 1024L * 1024L;
-    final TargetingGasLimitCalculator targetingGasLimitCalculator =
-        new TargetingGasLimitCalculator(targetGasLimit);
-    final GasLimitRangeAndDeltaValidationRule rule =
-        new GasLimitRangeAndDeltaValidationRule(5000, 0x7fffffffffffffffL);
-
-    // parent
-    final BlockHeader parent = new BlockHeaderTestFixture().gasLimit(currentGasLimit).buildHeader();
-
-    // current
-    final long nextGasLimit = targetingGasLimitCalculator.nextGasLimit(parent.getGasLimit());
-    final BlockHeader header = new BlockHeaderTestFixture().gasLimit(nextGasLimit).buildHeader();
-
-    assertThat(rule.validate(header, parent)).isTrue();
-  }
-}
diff --git a/besu/src/test/java/org/hyperledger/besu/controller/TransitionControllerBuilderTest.java b/besu/src/test/java/org/hyperledger/besu/controller/TransitionControllerBuilderTest.java
new file mode 100644
index 00000000000..9fc337095f2
--- /dev/null
+++ b/besu/src/test/java/org/hyperledger/besu/controller/TransitionControllerBuilderTest.java
@@ -0,0 +1,262 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.controller;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.consensus.clique.BlockHeaderValidationRulesetFactory;
+import org.hyperledger.besu.consensus.clique.CliqueContext;
+import org.hyperledger.besu.consensus.common.EpochManager;
+import org.hyperledger.besu.consensus.merge.MergeContext;
+import org.hyperledger.besu.consensus.merge.PostMergeContext;
+import org.hyperledger.besu.consensus.merge.TransitionProtocolSchedule;
+import org.hyperledger.besu.consensus.merge.blockcreation.TransitionCoordinator;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
+import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderValidator;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.ethereum.storage.StorageProvider;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+
+import java.util.Optional;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+/**
+ * We only bother testing transitionControllerBuilder for PoW and Clique since those are the only
+ * network types that are transitioning to PoS.
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class TransitionControllerBuilderTest {
+
+  @Mock ProtocolSchedule preMergeProtocolSchedule;
+  @Mock ProtocolSchedule postMergeProtocolSchedule;
+  @Mock ProtocolContext protocolContext;
+  @Mock MutableBlockchain mockBlockchain;
+  @Mock TransactionPool transactionPool;
+  @Mock SyncState syncState;
+  @Mock EthProtocolManager ethProtocolManager;
+  @Mock PostMergeContext mergeContext;
+  StorageProvider storageProvider = new InMemoryKeyValueStorageProvider();
+
+  CliqueBesuControllerBuilder cliqueBuilder = new CliqueBesuControllerBuilder();
+  BesuControllerBuilder powBuilder = new MainnetBesuControllerBuilder();
+  MergeBesuControllerBuilder postMergeBuilder = new MergeBesuControllerBuilder();
+  MiningParameters miningParameters;
+
+  TransitionProtocolSchedule transitionProtocolSchedule;
+
+  @Before
+  public void setup() {
+    transitionProtocolSchedule =
+        spy(
+            new TransitionProtocolSchedule(
+                preMergeProtocolSchedule, postMergeProtocolSchedule, mergeContext));
+    transitionProtocolSchedule.setProtocolContext(protocolContext);
+    cliqueBuilder.nodeKey(NodeKeyUtils.generate());
+    cliqueBuilder.genesisConfigFile(GenesisConfigFile.DEFAULT);
+    powBuilder.genesisConfigFile(GenesisConfigFile.DEFAULT);
+    postMergeBuilder.genesisConfigFile(GenesisConfigFile.DEFAULT);
+    postMergeBuilder.storageProvider(storageProvider);
+    when(protocolContext.getBlockchain()).thenReturn(mockBlockchain);
+    when(transitionProtocolSchedule.getPostMergeSchedule()).thenReturn(postMergeProtocolSchedule);
+    when(transitionProtocolSchedule.getPreMergeSchedule()).thenReturn(preMergeProtocolSchedule);
+    when(protocolContext.getConsensusContext(CliqueContext.class))
+        .thenReturn(mock(CliqueContext.class));
+    when(protocolContext.getConsensusContext(PostMergeContext.class)).thenReturn(mergeContext);
+    when(protocolContext.getConsensusContext(MergeContext.class)).thenReturn(mergeContext);
+    miningParameters = new MiningParameters.Builder().miningEnabled(false).build();
+  }
+
+  @Test
+  public void assertCliqueMiningOverridePreMerge() {
+    assertThat(miningParameters.isMiningEnabled()).isFalse();
+    var transCoordinator = buildTransitionCoordinator(cliqueBuilder, postMergeBuilder);
+    assertThat(transCoordinator.isMiningBeforeMerge()).isTrue();
+  }
+
+  @Test
+  public void assertPoWIsNotMiningPreMerge() {
+    assertThat(miningParameters.isMiningEnabled()).isFalse();
+    var transCoordinator = buildTransitionCoordinator(powBuilder, postMergeBuilder);
+    assertThat(transCoordinator.isMiningBeforeMerge()).isFalse();
+  }
+
+  @Test
+  public void assertPowMiningPreMerge() {
+    miningParameters = new MiningParameters.Builder().miningEnabled(true).build();
+    var transCoordinator = buildTransitionCoordinator(powBuilder, postMergeBuilder);
+    assertThat(transCoordinator.isMiningBeforeMerge()).isTrue();
+  }
+
+  @Test
+  public void assertPreMergeScheduleForNotPostMerge() {
+    var mockBlock = new BlockHeaderTestFixture().buildHeader();
+    var preMergeProtocolSpec = mock(ProtocolSpec.class);
+    when(mergeContext.isPostMerge()).thenReturn(Boolean.FALSE);
+    when(mergeContext.getFinalized()).thenReturn(Optional.empty());
+    when(preMergeProtocolSchedule.getByBlockHeader(any())).thenReturn(preMergeProtocolSpec);
+    assertThat(transitionProtocolSchedule.getByBlockHeaderWithTransitionReorgHandling(mockBlock))
+        .isEqualTo(preMergeProtocolSpec);
+  }
+
+  @Test
+  public void assertPostMergeScheduleForAnyBlockWhenPostMergeAndFinalized() {
+    var mockBlock = new BlockHeaderTestFixture().buildHeader();
+    var postMergeProtocolSpec = mock(ProtocolSpec.class);
+    when(mergeContext.getFinalized()).thenReturn(Optional.of(mockBlock));
+    when(postMergeProtocolSchedule.getByBlockHeader(any())).thenReturn(postMergeProtocolSpec);
+    assertThat(transitionProtocolSchedule.getByBlockHeaderWithTransitionReorgHandling(mockBlock))
+        .isEqualTo(postMergeProtocolSpec);
+  }
+
+  @Test
+  public void assertPreMergeScheduleForBelowTerminalBlockWhenPostMergeIfNotFinalized() {
+    var mockParentBlock = new BlockHeaderTestFixture().number(100).buildHeader();
+    var mockBlock =
+        new BlockHeaderTestFixture()
+            .number(101)
+            .difficulty(Difficulty.of(1L))
+            .parentHash(mockParentBlock.getHash())
+            .buildHeader();
+
+    var preMergeProtocolSpec = mock(ProtocolSpec.class);
+
+    when(mergeContext.getTerminalTotalDifficulty()).thenReturn(Difficulty.of(1337L));
+    when(mergeContext.isPostMerge()).thenReturn(Boolean.TRUE);
+    when(mergeContext.getFinalized()).thenReturn(Optional.empty());
+    when(mockBlockchain.getTotalDifficultyByHash(any()))
+        .thenReturn(Optional.of(Difficulty.of(1335L)));
+
+    when(preMergeProtocolSchedule.getByBlockHeader(any())).thenReturn(preMergeProtocolSpec);
+    assertThat(transitionProtocolSchedule.getByBlockHeaderWithTransitionReorgHandling(mockBlock))
+        .isEqualTo(preMergeProtocolSpec);
+  }
+
+  @Test
+  public void assertPostMergeScheduleForPostMergeExactlyAtTerminalDifficultyIfNotFinalized() {
+    var mockParentBlock = new BlockHeaderTestFixture().number(100).buildHeader();
+    var mockBlock =
+        new BlockHeaderTestFixture()
+            .number(101)
+            .difficulty(Difficulty.of(0L))
+            .parentHash(mockParentBlock.getHash())
+            .buildHeader();
+
+    var postMergeProtocolSpec = mock(ProtocolSpec.class);
+
+    when(mergeContext.getTerminalTotalDifficulty()).thenReturn(Difficulty.of(1337L));
+    when(mergeContext.isPostMerge()).thenReturn(Boolean.TRUE);
+    when(mergeContext.getFinalized()).thenReturn(Optional.empty());
+    when(mockBlockchain.getTotalDifficultyByHash(any()))
+        .thenReturn(Optional.of(Difficulty.of(1337L)));
+
+    when(postMergeProtocolSchedule.getByBlockHeader(any())).thenReturn(postMergeProtocolSpec);
+    assertThat(transitionProtocolSchedule.getByBlockHeaderWithTransitionReorgHandling(mockBlock))
+        .isEqualTo(postMergeProtocolSpec);
+  }
+
+  @Test
+  public void assertCliqueDetachedHeaderValidationPreMerge() {
+    BlockHeaderValidator cliqueValidator =
+        BlockHeaderValidationRulesetFactory.cliqueBlockHeaderValidator(
+                5L, new EpochManager(5L), Optional.of(FeeMarket.london(1L)), true)
+            .build();
+    assertDetachedRulesForPostMergeBlocks(cliqueValidator);
+  }
+
+  @Test
+  public void assertPoWDetachedHeaderValidationPreMerge() {
+    BlockHeaderValidator powValidator =
+        MainnetBlockHeaderValidator.createBaseFeeMarketValidator(FeeMarket.london(1L), true)
+            .build();
+    assertDetachedRulesForPostMergeBlocks(powValidator);
+  }
+
+  void assertDetachedRulesForPostMergeBlocks(final BlockHeaderValidator validator) {
+    var preMergeProtocolSpec = mock(ProtocolSpec.class);
+    when(preMergeProtocolSpec.getBlockHeaderValidator()).thenReturn(validator);
+
+    when(preMergeProtocolSchedule.getByBlockHeader(any())).thenReturn(preMergeProtocolSpec);
+
+    var mockParentBlock =
+        new BlockHeaderTestFixture()
+            .number(100L)
+            .baseFeePerGas(Wei.of(7L))
+            .gasLimit(5000L)
+            .buildHeader();
+
+    var mockBlock =
+        new BlockHeaderTestFixture()
+            .number(101L)
+            .timestamp(1000L)
+            .baseFeePerGas(Wei.of(7L))
+            .gasLimit(5000L)
+            .difficulty(Difficulty.of(0L))
+            .parentHash(mockParentBlock.getHash())
+            .buildHeader();
+
+    var mergeFriendlyValidation =
+        transitionProtocolSchedule
+            .getPreMergeSchedule()
+            .getByBlockHeader(mockBlock)
+            .getBlockHeaderValidator()
+            .validateHeader(
+                mockBlock, mockParentBlock, protocolContext, HeaderValidationMode.DETACHED_ONLY);
+    assertThat(mergeFriendlyValidation).isTrue();
+  }
+
+  TransitionCoordinator buildTransitionCoordinator(
+      final BesuControllerBuilder preMerge, final MergeBesuControllerBuilder postMerge) {
+    var builder = new TransitionBesuControllerBuilder(preMerge, postMerge);
+    builder.genesisConfigFile(GenesisConfigFile.mainnet());
+    builder.storageProvider(storageProvider);
+    builder.metricsSystem(new NoOpMetricsSystem());
+    var coordinator =
+        builder.createMiningCoordinator(
+            transitionProtocolSchedule,
+            protocolContext,
+            transactionPool,
+            miningParameters,
+            syncState,
+            ethProtocolManager);
+
+    assertThat(coordinator).isInstanceOf(TransitionCoordinator.class);
+    var transCoordinator = (TransitionCoordinator) coordinator;
+    return transCoordinator;
+  }
+}
diff --git a/besu/src/test/java/org/hyperledger/besu/ethereum/p2p/config/DefaultDiscoveryConfiguration.java b/besu/src/test/java/org/hyperledger/besu/ethereum/p2p/config/DefaultDiscoveryConfiguration.java
new file mode 100644
index 00000000000..3a63648bcbb
--- /dev/null
+++ b/besu/src/test/java/org/hyperledger/besu/ethereum/p2p/config/DefaultDiscoveryConfiguration.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.config;
+
+import static java.util.stream.Collectors.toList;
+
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
+import org.hyperledger.besu.plugin.data.EnodeURL;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Stream;
+
+public class DefaultDiscoveryConfiguration {
+  public static final String GOERLI_DISCOVERY_URL =
+      "enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@all.goerli.ethdisco.net";
+  public static final String MAINNET_DISCOVERY_URL =
+      "enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@all.mainnet.ethdisco.net";
+
+  public static final List<EnodeURL> MAINNET_BOOTSTRAP_NODES =
+      Collections.unmodifiableList(
+          Stream.of(
+                  // Ethereum Foundation Bootnodes
+                  "enode://d860a01f9722d78051619d1e2351aba3f43f943f6f00718d1b9baa4101932a1f5011f16bb2b1bb35db20d6fe28fa0bf09636d26a87d31de9ec6203eeedb1f666@18.138.108.67:30303", // Singapore AWS
+                  "enode://22a8232c3abc76a16ae9d6c3b164f98775fe226f0917b0ca871128a74a8e9630b458460865bab457221f1d448dd9791d24c4e5d88786180ac185df813a68d4de@3.209.45.79:30303", // Virginia AWS
+                  "enode://2b252ab6a1d0f971d9722cb839a42cb81db019ba44c08754628ab4a823487071b5695317c8ccd085219c3a03af063495b2f1da8d18218da2d6a82981b45e6ffc@65.108.70.101:30303", // Helsinki Hetzner
+                  "enode://4aeb4ab6c14b23e2c4cfdce879c04b0748a20d8e9b59e25ded2a08143e265c6c25936e74cbc8e641e3312ca288673d91f2f93f8e277de3cfa444ecdaaf982052@157.90.35.166:30303" // Falkenstein Hetzner
+                  )
+              .map(EnodeURLImpl::fromString)
+              .collect(toList()));
+  public static final List<EnodeURL> GOERLI_BOOTSTRAP_NODES =
+      Collections.unmodifiableList(
+          Stream.of(
+                  "enode://011f758e6552d105183b1761c5e2dea0111bc20fd5f6422bc7f91e0fabbec9a6595caf6239b37feb773dddd3f87240d99d859431891e4a642cf2a0a9e6cbb98a@51.141.78.53:30303",
+                  "enode://176b9417f511d05b6b2cf3e34b756cf0a7096b3094572a8f6ef4cdcb9d1f9d00683bf0f83347eebdf3b81c3521c2332086d9592802230bf528eaf606a1d9677b@13.93.54.137:30303",
+                  "enode://46add44b9f13965f7b9875ac6b85f016f341012d84f975377573800a863526f4da19ae2c620ec73d11591fa9510e992ecc03ad0751f53cc02f7c7ed6d55c7291@94.237.54.114:30313",
+                  "enode://b5948a2d3e9d486c4d75bf32713221c2bd6cf86463302339299bd227dc2e276cd5a1c7ca4f43a0e9122fe9af884efed563bd2a1fd28661f3b5f5ad7bf1de5949@18.218.250.66:30303",
+
+                  // Ethereum Foundation bootnode
+                  "enode://a61215641fb8714a373c80edbfa0ea8878243193f57c96eeb44d0bc019ef295abd4e044fd619bfc4c59731a73fb79afe84e9ab6da0c743ceb479cbb6d263fa91@3.11.147.67:30303",
+
+                  // Goerli Initiative bootnodes
+                  "enode://d4f764a48ec2a8ecf883735776fdefe0a3949eb0ca476bd7bc8d0954a9defe8fea15ae5da7d40b5d2d59ce9524a99daedadf6da6283fca492cc80b53689fb3b3@46.4.99.122:32109",
+                  "enode://d2b720352e8216c9efc470091aa91ddafc53e222b32780f505c817ceef69e01d5b0b0797b69db254c586f493872352f5a022b4d8479a00fc92ec55f9ad46a27e@88.99.70.182:30303")
+              .map(EnodeURLImpl::fromString)
+              .collect(toList()));
+  public static final List<EnodeURL> SEPOLIA_BOOTSTRAP_NODES =
+      Collections.unmodifiableList(
+          Stream.of(
+                  "enode://4e5e92199ee224a01932a377160aa432f31d0b351f84ab413a8e0a42f4f36476f8fb1cbe914af0d9aef0d51665c214cf653c651c4bbd9d5550a934f241f1682b@138.197.51.181:30303",
+                  "enode://143e11fb766781d22d92a2e33f8f104cddae4411a122295ed1fdb6638de96a6ce65f5b7c964ba3763bba27961738fef7d3ecc739268f3e5e771fb4c87b6234ba@146.190.1.103:30303",
+                  "enode://8b61dc2d06c3f96fddcbebb0efb29d60d3598650275dc469c22229d3e5620369b0d3dedafd929835fe7f489618f19f456fe7c0df572bf2d914a9f4e006f783a9@170.64.250.88:30303",
+                  "enode://10d62eff032205fcef19497f35ca8477bea0eadfff6d769a147e895d8b2b8f8ae6341630c645c30f5df6e67547c03494ced3d9c5764e8622a26587b083b028e8@139.59.49.206:30303",
+                  "enode://9e9492e2e8836114cc75f5b929784f4f46c324ad01daf87d956f98b3b6c5fcba95524d6e5cf9861dc96a2c8a171ea7105bb554a197455058de185fa870970c7c@138.68.123.152:30303")
+              .map(EnodeURLImpl::fromString)
+              .collect(toList()));
+  public static final List<EnodeURL> CLASSIC_BOOTSTRAP_NODES =
+      Collections.unmodifiableList(
+          Stream.of(
+                  // ETC Cooperative
+                  "enode://8e73168affd8d445edda09c561d607081ca5d7963317caae2702f701eb6546b06948b7f8687a795de576f6a5f33c44828e25a90aa63de18db380a11e660dd06f@159.203.37.80:30303",
+                  "enode://2b1ef75e8b7119b6e0294f2e51ead2cf1a5400472452c199e9587727ada99e7e2b1199e36adcad6cbae65dce2410559546e4d83d8c93d45a559e723e56444c03@67.207.93.100:30303",
+                  "enode://40b37d729fdc2c29620bbecc61264f450c3e849b5e60d1a362e6af04d84ae36e15120573498bcf56f97aeec18e530113a4d0b55b18e6a6523de8cf5a45e1db23@128.199.160.131:30303",
+                  "enode://84e70a981a436efd7d6ae80b5d7ecb82636de77029635a2fb25ccf5d02106172d1cafdd7d8171a136d3fd545e5df94f4d63299eda7f8aec79967aa568ddaa71e@165.22.202.207:30303",
+                  "enode://6ec7ac618a7147d8b0e41bc1e63080abfd56a48f50f06095c112e30f72cd5eee262b06aa168cb46ab470d56885f842a1ae44a3714bfb029ced83dab461852062@164.90.218.200:30303",
+                  "enode://feba6c4bd757efce4fec0fa5775780d2c209e86231553a72738c2c4e95d0cfd7ac2189f6d30d3c059dd25d93ea060ca28f9936b564f7d04c4270bb60e8e1487b@178.128.171.230:30303",
+                  "enode://c0b698f9fb1c5dd3b348c46dffbc524cebbfa48fd03c52523892d43d31d5fabacf4e27f215f5647c96190567975e423a5708cbdcd6441da2705bd85533e78eca@209.97.136.89:30303",
+                  "enode://37b20dc1ca0ba428dc07f4bf87c548aa57b53e6883c607a041c88cc0f72c27ef3487b0e94f50e787fff8af5e2baf029cd6105461aa8ec250ccae93d6972107a9@134.209.30.110:30303",
+
+                  // ETC Labs
+                  "enode://66498ac935f3f54d873de4719bf2d6d61e0c74dd173b547531325bcef331480f9bedece91099810971c8567eeb1ae9f6954b013c47c6dc51355bbbbae65a8c16@54.148.165.1:30303",
+                  "enode://73e74ce7426a17aa2d8b5bb64d796ec7dc4dcee2af9bbdd4434394d1e4e52e650b9e39202435fca29ce65c242fd6e59b93ed2cf37f04b645fb23e306273816ad@54.148.165.1:30304",
+                  "enode://f1d4bde4cc8df2b8ce46194247450e54b9ba9e69410a30974a894a49273b10c069e7a1ff0ffd4921cb23af9f903d8257ed0133317850e670f2792f20e771a69e@123.57.29.99:30303",
+                  "enode://7a7768a1603b6714acd16f646b84a5aff418869b5715fa606172d19e4e7d719699448b7707e30c7b59470b4fb8b38a020135641304861483a7dc3ba988e98490@47.108.52.30:30303",
+                  "enode://903fceb08534c13fe1114b0c753a89c6c2ec50f973a85d308456c46721f8904b1cd47df9231114299be84e1e954db06552f791a0facbd86359aa9fd321d2ef50@47.240.106.205:30303",
+                  "enode://c7ec057ad9450d2d5c4002e49e53e1d90142acd54128c89e794d11401de026b91aa0e84e3f679fb6b47f7940e08b5e7d21d8178c5fa6ba0f36971098cb566ea6@101.133.229.66:30303",
+                  "enode://70b74fef51aa4f36330cc52ac04f16d38e1838f531f58bbc88365ca5fd4a3da6e8ec32316c43f79b157d0575faf53064fd925644d0f620b2b201b028c2b410d0@47.115.150.90:30303",
+                  "enode://fa64d1fcb2d4cd1d1606cb940ea2b69fee7dc6c7a85ac4ad05154df1e9ae9616a6a0fa67a59cb15f79346408efa5a4efeba1e5993ddbf4b5cedbda27644a61cf@47.91.30.48:30303",
+
+                  // @q9f ceibo
+                  "enode://942bf2f0754972391467765be1d98206926fc8ad0be8a49cd65e1730420c37fa63355bddb0ae5faa1d3505a2edcf8fad1cf00f3c179e244f047ec3a3ba5dacd7@176.9.51.216:30355",
+                  "enode://0b0e09d6756b672ac6a8b70895da4fb25090b939578935d4a897497ffaa205e019e068e1ae24ac10d52fa9b8ddb82840d5d990534201a4ad859ee12cb5c91e82@176.9.51.216:30365",
+
+                  // @whilei
+                  "enode://158ac5a4817265d0d8b977660b3dbe9abee5694ed212f7091cbf784ddf47623ed015e1cb54594d10c1c46118747ddabe86ebf569cf24ae91f2daa0f1adaae390@159.203.56.33:30303",
+                  "enode://efd48ad0879eeb7f9cb5e50f33f7bc21e805a72e90361f145baaa22dd75d111e7cd9c93f1b7060dcb30aa1b3e620269336dbf32339fea4c18925a4c15fe642df@18.205.66.229:30303",
+                  "enode://5fbfb426fbb46f8b8c1bd3dd140f5b511da558cd37d60844b525909ab82e13a25ee722293c829e52cb65c2305b1637fa9a2ea4d6634a224d5f400bfe244ac0de@162.243.55.45:30303",
+                  "enode://6dd3ac8147fa82e46837ec8c3223d69ac24bcdbab04b036a3705c14f3a02e968f7f1adfcdb002aacec2db46e625c04bf8b5a1f85bb2d40a479b3cc9d45a444af@104.237.131.102:30303",
+                  "enode://b9e893ea9cb4537f4fed154233005ae61b441cd0ecd980136138c304fefac194c25a16b73dac05fc66a4198d0c15dd0f33af99b411882c68a019dfa6bb703b9d@18.130.93.66:30303",
+                  "enode://3fe9705a02487baea45c1ffebfa4d84819f5f1e68a0dbc18031553242a6a08e39499b61e361a52c2a92f9553efd63763f6fdd34692be0d4ba6823bb2fc346009@178.62.238.75:30303",
+                  "enode://d50facc65e46bda6ff594b6e95491efa16e067de41ae96571d9f3cb853d538c44864496fa5e4df10115f02bbbaf47853f932e110a44c89227da7c30e96840596@188.166.163.187:30303",
+                  "enode://a0d5c589dc02d008fe4237da9877a5f1daedee0227ab612677eabe323520f003eb5e311af335de9f7964c2092bbc2b3b7ab1cce5a074d8346959f0868b4e366e@46.101.78.44:30303",
+                  "enode://c071d96b0c0f13006feae3977fb1b3c2f62caedf643df9a3655bc1b60f777f05e69a4e58bf3547bb299210092764c56df1e08380e91265baa845dca8bc0a71da@68.183.99.5:30303",
+                  "enode://83b33409349ffa25e150555f7b4f8deebc68f3d34d782129dc3c8ba07b880c209310a4191e1725f2f6bef59bce9452d821111eaa786deab08a7e6551fca41f4f@206.189.68.191:30303",
+                  "enode://0daae2a30f2c73b0b257746587136efb8e3479496f7ea1e943eeb9a663b72dd04582f699f7010ee02c57fc45d1f09568c20a9050ff937f9139e2973ddd98b87b@159.89.169.103:30303",
+                  "enode://50808461dd73b3d70537e4c1e5fafd1132b3a90f998399af9205f8889987d62096d4e853813562dd43e7270a71c9d9d4e4dd73a534fdb22fbac98c389c1a7362@178.128.55.119:30303",
+                  "enode://5cd218959f8263bc3721d7789070806b0adff1a0ed3f95ec886fb469f9362c7507e3b32b256550b9a7964a23a938e8d42d45a0c34b332bfebc54b29081e83b93@35.187.57.94:30303")
+              .map(EnodeURLImpl::fromString)
+              .collect(toList()));
+  public static final List<EnodeURL> KOTTI_BOOTSTRAP_NODES =
+      Collections.unmodifiableList(
+          Stream.of(
+                  // Authority Nodes
+                  "enode://a59e33ccd2b3e52d578f1fbd70c6f9babda2650f0760d6ff3b37742fdcdfdb3defba5d56d315b40c46b70198c7621e63ffa3f987389c7118634b0fefbbdfa7fd@51.158.191.43:37956", // @q9f Mizar
+                  "enode://93c94e999be5dd854c5d82a7cf5c14822973b5d9badb56ad4974586ec4d4f1995c815af795c20bb6e0a6226d3ee55808435c4dc89baf94ee581141b064d19dfc@80.187.116.161:25720",
+                  "enode://ae8658da8d255d1992c3ec6e62e11d6e1c5899aa1566504bc1ff96a0c9c8bd44838372be643342553817f5cc7d78f1c83a8093dee13d77b3b0a583c050c81940@18.232.185.151:30303",
+                  "enode://b477ca6d507a3f57070783eb62ba838847635f8b1a0cbffb8b7f8173f5894cf550f0225a5c279341e2d862a606e778b57180a4f1db3db78c51eadcfa4fdc6963@40.68.240.160:30303",
+
+                  // @q9f Bootnodes
+                  "enode://4956f6924335c951cb70cbc169a85c081f6ff0b374aa2815453b8a3132b49613f38a1a6b8e103f878dbec86364f60091e92a376d7cd3aca9d82d2f2554794e63@51.15.97.240:41235", // @q9f Ginan
+                  "enode://6c9a052c01bb9995fa53bebfcdbc17733fe90708270d0e6d8e38dc57b32e1dbe8c287590b634ee9753b94ba302f411c96519c7fa07df0df6a6848149d819b2c5@51.15.70.7:41235", // @q9f Polis
+                  "enode://95a7302fd8f35d9ad716a591b90dfe839dbf2d3d6a6737ef39e07899f844ad82f1659dd6212492922dd36705fb0a1e984c1d5d5c42069d5bd329388831e820c1@51.15.97.240:45678", // @q9f Ginan
+                  "enode://8c5c4dec9a0728c7058d3c29698bae888adc244e443cebc21f3d708a20751511acbf98a52b5e5ea472f8715c658913e8084123461fd187a4980a0600420b0791@51.15.70.7:45678", // @q9f Polis
+                  "enode://efd7391a3bed73ad74ae5760319bb48f9c9f1983ff22964422688cdb426c5d681004ece26c47121396653cf9bafe7104aa4ecff70e24cc5b11fd76be8e5afce0@51.158.191.43:45678", // @q9f Mizar
+                  "enode://93b12383c74c39b67afa99a7ff44ce250fe94295fa1fc087465cc4fe2d0b33b91a8d8cabe03b250104a9096aa0e06bcde5f95665a5bd9f890edd2ab33e16ae47@51.15.41.19:30303" // @q9f Zibal
+                  )
+              .map(EnodeURLImpl::fromString)
+              .collect(toList()));
+  public static final List<EnodeURL> MORDOR_BOOTSTRAP_NODES =
+      Collections.unmodifiableList(
+          Stream.of(
+                  "enode://642cf9650dd8869d42525dbf6858012e3b4d64f475e733847ab6f7742341a4397414865d953874e8f5ed91b0e4e1c533dee14ad1d6bb276a5459b2471460ff0d@157.230.152.87:30303", // @meowbits Mordor
+                  "enode://651b484b652c07c72adebfaaf8bc2bd95b420b16952ef3de76a9c00ef63f07cca02a20bd2363426f9e6fe372cef96a42b0fec3c747d118f79fd5e02f2a4ebd4e@51.158.190.99:45678", // @q9f Lyrae
+                  "enode://859ed8c19ea04eaea41f1cf17c8d2710e2e0affb97328c8392a79f1764118edf2344f1941299f0d676772fa6054447e6f9b3af96444e350b417442bfd7cc832b@34.68.243.226:30303",
+                  "enode://9b1bf9613d859ac2071d88509ab40a111b75c1cfc51f4ad78a1fdbb429ff2405de0dc5ea8ae75e6ac88e03e51a465f0b27b517e78517f7220ae163a2e0692991@51.158.190.99:30426", // @q9f Lyrae
+                  "enode://534d18fd46c5cd5ba48a68250c47cea27a1376869755ed631c94b91386328039eb607cf10dd8d0aa173f5ec21e3fb45c5d7a7aa904f97bc2557e9cb4ccc703f1@51.158.190.99:30303", // @q9f Lyrae
+                  "enode://0d70715514674189792de4ad294b658c96d0ec40fe517fbe9cb7949d3792f25f82357ec77d1bd8bed6ec719ca0c1d608bb34cc702bf3d4bb4507f7280f835452@154.5.137.161:61410",
+                  "enode://f50f52b5fe18fd281748905bf5dad5439471f32cc02d99fecf960a983c1f4eba701ffca96afd2f2a68dcf6f97c5d02b566bafce1f361b51717e1a03c1dd9a836@157.230.42.102:30303",
+                  "enode://111bd28d5b2c1378d748383fd83ff59572967c317c3063a9f475a26ad3f1517642a164338fb5268d4e32ea1cc48e663bd627dec572f1d201c7198518e5a506b1@88.99.216.30:45834",
+                  "enode://07fa944c83597d5e935a2abe6194ed40fc7239e86111c971a43537a33d0184d1cd1b3f1291b8dd3bcfaebfbb802de77c843465a00065b39120c338fdd877ca4a@35.238.126.60:51240",
+                  "enode://4ca79bbff7491fed82221259e3f27492e27b95b600594e2f8d5f1fa011123ea267e71873a0db3993e5109845d519d8b849ba2c7e4b48b09bedebb99e1c2ce304@35.238.132.8:30303",
+                  "enode://06fdbeb591d26f53b2e7250025fe955ca013431ded930920cf1e3cd1f0c920e9a5e727949d209bc25a07288327b525279b11c5551315c50ff0db483e69fc159b@34.218.225.178:32000",
+                  "enode://03b133f731049e3f7be827339c3759be92778c05e54a1847d178c0fdb56fa168aa1e7e61fc77791a7afdd0328a00318f73c01212eb3f3bbe919f5ce8f5b4a314@192.227.105.4:32000",
+                  "enode://2592745efd35b4be443b8ee25fd2099de132e037951f9f6d3e8805e0a78f213537f71264b973f1a83a57372f57bbe6acac8d6ae678f39393221c045ccbe3b18c@51.15.116.226:30304",
+                  "enode://c0afb552bfe932c72598caa245aef82d55c23555622c5ab946d4e49bb0ab694e46086dcff6793a606527f323ef94d0eb499d01ceb26aefb6fa3f8977105d7dd8@157.230.152.87:52138",
+                  "enode://5a1399e6ba3268721dd7656530cd81230dbeb950570c6e3ec2a45effc50c032f66633c5eaaa1a49c51ba1849db37a7bef6e402779ad12dc9943f117e058d7760@35.225.124.17:39306",
+                  "enode://15b6ae4e9e18772f297c90d83645b0fbdb56667ce2d747d6d575b21d7b60c2d3cd52b11dec24e418438caf80ddc433232b3685320ed5d0e768e3972596385bfc@51.158.191.43:41235", // @q9f Mizar
+                  "enode://5a1399e6ba3268721dd7656530cd81230dbeb950570c6e3ec2a45effc50c032f66633c5eaaa1a49c51ba1849db37a7bef6e402779ad12dc9943f117e058d7760@34.69.121.227:30303",
+                  "enode://f840b007500f50c98ea6f9c9e56dabf4690bbbbb7036d43682c531204341aff8315013547e5bee54117eb22bd3603585ae6bf713d9fa710659533fcab65d5b84@34.69.50.155:42078",
+                  "enode://b45f008ab8ad73966d0c8c0c923c50f47c0ae50c37a9ea05cc28b00cb94802145a4158412a526fdadd7e539db5eaab72f06a9046a34576ecf5a68efc41ba9d01@34.68.40.145:30303",
+                  "enode://1f378945c9b2eeb292d910f461911fd99520a23beda1bc5c8aea12be09e249f8d92615aa3d4d75c938004db5281dabad4a9cf7a0f07ec7c1fc8e7721addc7c85@34.205.41.164:40218",
+                  "enode://2b69a3926f36a7748c9021c34050be5e0b64346225e477fe7377070f6289bd363b2be73a06010fd516e6ea3ee90778dd0399bc007bb1281923a79374f842675a@51.15.116.226:30303",
+                  "enode://a59e33ccd2b3e52d578f1fbd70c6f9babda2650f0760d6ff3b37742fdcdfdb3defba5d56d315b40c46b70198c7621e63ffa3f987389c7118634b0fefbbdfa7fd@51.158.191.43:38556", // @q9f Mizar
+                  "enode://f840b007500f50c98ea6f9c9e56dabf4690bbbbb7036d43682c531204341aff8315013547e5bee54117eb22bd3603585ae6bf713d9fa710659533fcab65d5b84@35.238.101.58:30303",
+                  "enode://07fa944c83597d5e935a2abe6194ed40fc7239e86111c971a43537a33d0184d1cd1b3f1291b8dd3bcfaebfbb802de77c843465a00065b39120c338fdd877ca4a@35.238.126.60:30000",
+                  "enode://617a2009783a09085ed0d5d5e7250e2e3c142f73448bf28200284bf4825c5926a80f3e9fb481edf38b89ade2aa0ad5a2f14cc935f3150e36e648eddda674fd70@35.225.5.185:51320",
+                  "enode://64897cb66fb209548b333467d701e5d205188023d3779411eb2032fd74315723d9bd6e002a7121214fdb68b09173d383d24f92134380fa6f1d2a193030acba1d@91.203.110.229:30303", // @q9f Dubhe
+                  "enode://8fa15f5012ac3c47619147220b7772fcc5db0cb7fd132b5d196e7ccacb166ac1fcf83be1dace6cd288e288a85e032423b6e7e9e57f479fe7373edea045caa56b@176.9.51.216:31355", // @q9f Ceibo
+                  "enode://34c14141b79652afc334dcd2ba4d8047946246b2310dc8e45737ebe3e6f15f9279ca4702b90bc5be12929f6194e2c3ce19a837b7fec7ebffcee9e9fe4693b504@176.9.51.216:31365" // @q9f Ceibo
+                  )
+              .map(EnodeURLImpl::fromString)
+              .collect(toList()));
+}
diff --git a/besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java b/besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java
index 4a06d63e66f..4ce430e787d 100644
--- a/besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java
@@ -16,11 +16,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.DefaultBlockchain;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
@@ -29,10 +32,10 @@
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldState;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthMessages;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
@@ -49,7 +52,9 @@
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage;
+import org.hyperledger.besu.ethereum.storage.keyvalue.VariablesKeyValueStorage;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.plugin.data.AddedBlockContext;
@@ -61,6 +66,7 @@
 import org.hyperledger.besu.testutil.TestClock;
 
 import java.math.BigInteger;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -68,6 +74,8 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Stream;
 
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -78,9 +86,11 @@
 @RunWith(MockitoJUnitRunner.class)
 public class BesuEventsImplTest {
 
-  private static final KeyPair KEY_PAIR1 = KeyPair.generate();
-  private static final org.hyperledger.besu.ethereum.core.Transaction TX1 = createTransaction(1);
-  private static final org.hyperledger.besu.ethereum.core.Transaction TX2 = createTransaction(2);
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+  private static final KeyPair KEY_PAIR1 = SIGNATURE_ALGORITHM.get().generateKeyPair();
+  private static final org.hyperledger.besu.ethereum.core.Transaction TX1 = createTransaction(0);
+  private static final org.hyperledger.besu.ethereum.core.Transaction TX2 = createTransaction(1);
 
   @Mock private ProtocolSchedule mockProtocolSchedule;
   @Mock private ProtocolContext mockProtocolContext;
@@ -92,7 +102,7 @@ public class BesuEventsImplTest {
   @Mock private MainnetTransactionValidator mockTransactionValidator;
   @Mock private ProtocolSpec mockProtocolSpec;
   @Mock private WorldStateArchive mockWorldStateArchive;
-  @Mock private WorldState mockWorldState;
+  @Mock private MutableWorldState mockWorldState;
   private TransactionPool transactionPool;
   private BlockBroadcaster blockBroadcaster;
   private BesuEventsImpl serviceImpl;
@@ -105,27 +115,27 @@ public void setUp() {
         DefaultBlockchain.createMutable(
             gen.genesisBlock(),
             new KeyValueStoragePrefixedKeyBlockchainStorage(
-                new InMemoryKeyValueStorage(), new MainnetBlockHeaderFunctions()),
+                new InMemoryKeyValueStorage(),
+                new VariablesKeyValueStorage(new InMemoryKeyValueStorage()),
+                new MainnetBlockHeaderFunctions()),
             new NoOpMetricsSystem(),
             0);
 
     when(mockEthContext.getEthMessages()).thenReturn(mockEthMessages);
     when(mockEthContext.getEthPeers()).thenReturn(mockEthPeers);
     when(mockEthContext.getScheduler()).thenReturn(mockEthScheduler);
-    when(mockEthPeers.streamAvailablePeers())
-        .thenReturn(Stream.empty())
-        .thenReturn(Stream.empty())
-        .thenReturn(Stream.empty())
-        .thenReturn(Stream.empty());
+    when(mockEthPeers.streamAvailablePeers()).thenAnswer(z -> Stream.empty());
     when(mockProtocolContext.getBlockchain()).thenReturn(blockchain);
     when(mockProtocolContext.getWorldStateArchive()).thenReturn(mockWorldStateArchive);
-    when(mockProtocolSchedule.getByBlockNumber(anyLong())).thenReturn(mockProtocolSpec);
+    when(mockProtocolSchedule.getByBlockHeader(any())).thenReturn(mockProtocolSpec);
     when(mockProtocolSpec.getTransactionValidator()).thenReturn(mockTransactionValidator);
-    when(mockTransactionValidator.validate(any(), any(Optional.class)))
+    when(mockProtocolSpec.getFeeMarket()).thenReturn(FeeMarket.london(0L));
+    when(mockTransactionValidator.validate(any(), any(Optional.class), any()))
         .thenReturn(ValidationResult.valid());
     when(mockTransactionValidator.validateForSender(any(), any(), any()))
         .thenReturn(ValidationResult.valid());
-    when(mockWorldStateArchive.get(any())).thenReturn(Optional.of(mockWorldState));
+    when(mockWorldStateArchive.getMutable(any(), anyBoolean()))
+        .thenReturn(Optional.of(mockWorldState));
 
     blockBroadcaster = new BlockBroadcaster(mockEthContext);
     syncState = new SyncState(blockchain, mockEthPeers);
@@ -137,13 +147,11 @@ public void setUp() {
             mockProtocolSchedule,
             mockProtocolContext,
             mockEthContext,
-            TestClock.fixed(),
+            TestClock.system(ZoneId.systemDefault()),
             new NoOpMetricsSystem(),
             syncState,
-            Wei.ZERO,
-            txPoolConfig,
-            true,
-            Optional.empty());
+            new MiningParameters.Builder().minTransactionGasPrice(Wei.ZERO).build(),
+            txPoolConfig);
 
     serviceImpl = new BesuEventsImpl(blockchain, blockBroadcaster, transactionPool, syncState);
   }
@@ -186,7 +194,8 @@ private void setSyncTarget() {
     syncState.setSyncTarget(
         mock(EthPeer.class),
         new org.hyperledger.besu.ethereum.core.BlockHeader(
-            null, null, null, null, null, null, null, null, 1, 1, 1, 1, null, null, null, 1, null));
+            null, null, null, null, null, null, null, null, 1, 1, 1, 1, null, null, null, 1, null,
+            null, null, null));
   }
 
   private void clearSyncTarget() {
@@ -299,11 +308,22 @@ public void reorgedBlockEventFiresAfterSubscribe() {
     blockchain.appendBlock(block, gen.receipts(block));
     assertThat(result.get()).isNull();
 
-    final var reorgBlock =
+    final var forkBlock =
         gen.block(
             new BlockDataGenerator.BlockOptions()
                 .setParentHash(blockchain.getGenesisBlock().getHash())
-                .setBlockNumber(blockchain.getGenesisBlock().getHeader().getNumber() + 2));
+                .setDifficulty(block.getHeader().getDifficulty().subtract(1))
+                .setBlockNumber(blockchain.getGenesisBlock().getHeader().getNumber() + 1));
+    blockchain.appendBlock(forkBlock, gen.receipts(forkBlock));
+    assertThat(result.get()).isNull();
+
+    final var reorgBlock =
+        gen.block(
+            new BlockDataGenerator.BlockOptions()
+                .setParentHash(forkBlock.getHash())
+                .setDifficulty(Difficulty.of(10000000))
+                .setBlockNumber(forkBlock.getHeader().getNumber() + 1));
+
     List<TransactionReceipt> transactionReceipts = gen.receipts(reorgBlock);
     blockchain.appendBlock(reorgBlock, transactionReceipts);
     assertThat(result.get()).isNotNull();
@@ -367,7 +387,7 @@ public void transactionAddedEventFiresAfterSubscribe() {
     serviceImpl.addTransactionAddedListener(result::set);
 
     assertThat(result.get()).isNull();
-    transactionPool.addLocalTransaction(TX1);
+    transactionPool.addTransactionViaApi(TX1);
 
     assertThat(result.get()).isNotNull();
   }
@@ -378,13 +398,13 @@ public void transactionAddedEventDoesNotFireAfterUnsubscribe() {
     final long id = serviceImpl.addTransactionAddedListener(result::set);
 
     assertThat(result.get()).isNull();
-    transactionPool.addLocalTransaction(TX1);
+    transactionPool.addTransactionViaApi(TX1);
     assertThat(result.get()).isNotNull();
 
     serviceImpl.removeTransactionAddedListener(id);
     result.set(null);
 
-    transactionPool.addLocalTransaction(TX2);
+    transactionPool.addTransactionViaApi(TX2);
     assertThat(result.get()).isNull();
   }
 
@@ -400,9 +420,10 @@ public void transactionDroppedEventFiresAfterSubscribe() {
     serviceImpl.addTransactionDroppedListener(result::set);
 
     assertThat(result.get()).isNull();
-    // The max pool size is configured to 1 so adding two transactions should trigger a drop
-    transactionPool.addLocalTransaction(TX1);
-    transactionPool.addLocalTransaction(TX2);
+    // sending a replacement with higher gas should drop the previous one
+    transactionPool.addTransactionViaApi(TX1);
+    transactionPool.addTransactionViaApi(
+        bumpTransactionGasPrice(TX1, TX1.getGasPrice().get().multiply(2)));
 
     assertThat(result.get()).isNotNull();
   }
@@ -413,14 +434,18 @@ public void transactionDroppedEventDoesNotFireAfterUnsubscribe() {
     final long id = serviceImpl.addTransactionDroppedListener(result::set);
 
     assertThat(result.get()).isNull();
-    transactionPool.addLocalTransaction(TX1);
-    transactionPool.addLocalTransaction(TX2);
+    transactionPool.addTransactionViaApi(TX1);
+    // first replacement with higher gas should drop the previous one
+    transactionPool.addTransactionViaApi(
+        bumpTransactionGasPrice(TX1, TX1.getGasPrice().get().multiply(2)));
 
     assertThat(result.get()).isNotNull();
-    serviceImpl.removeTransactionAddedListener(id);
+    serviceImpl.removeTransactionDroppedListener(id);
     result.set(null);
 
-    transactionPool.addLocalTransaction(TX2);
+    // second replacement with higher gas should drop the previous one
+    transactionPool.addTransactionViaApi(
+        bumpTransactionGasPrice(TX1, TX1.getGasPrice().get().multiply(4)));
     assertThat(result.get()).isNull();
   }
 
@@ -473,4 +498,13 @@ private static org.hyperledger.besu.ethereum.core.Transaction createTransaction(
         .gasLimit(0)
         .createTransaction(KEY_PAIR1);
   }
+
+  private static org.hyperledger.besu.ethereum.core.Transaction bumpTransactionGasPrice(
+      final Transaction originalTx, final Wei gasPriceBump) {
+    return new TransactionTestFixture()
+        .nonce(originalTx.getNonce())
+        .gasPrice(Wei.fromQuantity(originalTx.getGasPrice().get()).add(gasPriceBump))
+        .gasLimit(originalTx.getGasLimit())
+        .createTransaction(KEY_PAIR1);
+  }
 }
diff --git a/besu/src/test/java/org/hyperledger/besu/services/PicoCLIOptionsImplTest.java b/besu/src/test/java/org/hyperledger/besu/services/PicoCLIOptionsImplTest.java
index e19db8f2e13..ac7e7fb9593 100644
--- a/besu/src/test/java/org/hyperledger/besu/services/PicoCLIOptionsImplTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/services/PicoCLIOptionsImplTest.java
@@ -19,11 +19,14 @@
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 import picocli.CommandLine.UnmatchedArgumentException;
 
+@RunWith(MockitoJUnitRunner.class)
 public class PicoCLIOptionsImplTest {
 
   @Command
diff --git a/besu/src/test/java/org/hyperledger/besu/util/LocalPermissioningConfigurationValidatorTest.java b/besu/src/test/java/org/hyperledger/besu/util/LocalPermissioningConfigurationValidatorTest.java
index e46e10ac3e7..f8dd890c21f 100644
--- a/besu/src/test/java/org/hyperledger/besu/util/LocalPermissioningConfigurationValidatorTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/util/LocalPermissioningConfigurationValidatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright contributors to Hyperledger Besu.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -21,10 +21,11 @@
 import org.hyperledger.besu.cli.config.EthNetworkConfig;
 import org.hyperledger.besu.cli.config.NetworkName;
 import org.hyperledger.besu.ethereum.p2p.peers.EnodeDnsConfiguration;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.peers.ImmutableEnodeDnsConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.LocalPermissioningConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.PermissioningConfigurationBuilder;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.net.URL;
 import java.nio.file.Files;
@@ -33,12 +34,15 @@
 
 import com.google.common.collect.Lists;
 import com.google.common.io.Resources;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
+@ExtendWith(MockitoExtension.class)
 public class LocalPermissioningConfigurationValidatorTest {
 
-  static final String PERMISSIONING_CONFIG_ROPSTEN_BOOTNODES =
-      "/permissioning_config_ropsten_bootnodes.toml";
+  static final String PERMISSIONING_CONFIG_SEPOLIA_BOOTNODES =
+      "/permissioning_config_sepolia_bootnodes.toml";
   static final String PERMISSIONING_CONFIG = "/permissioning_config.toml";
   static final String PERMISSIONING_CONFIG_VALID_HOSTNAME =
       "/permissioning_config_valid_hostname.toml";
@@ -46,12 +50,12 @@ public class LocalPermissioningConfigurationValidatorTest {
       "/permissioning_config_unknown_hostname.toml";
 
   @Test
-  public void ropstenWithNodesAllowlistOptionWhichDoesIncludeRopstenBootnodesMustNotError()
+  public void sepoliaWithNodesAllowlistOptionWhichDoesIncludeRopstenBootnodesMustNotError()
       throws Exception {
 
-    EthNetworkConfig ethNetworkConfig = EthNetworkConfig.getNetworkConfig(NetworkName.ROPSTEN);
+    EthNetworkConfig ethNetworkConfig = EthNetworkConfig.getNetworkConfig(NetworkName.SEPOLIA);
 
-    final URL configFile = this.getClass().getResource(PERMISSIONING_CONFIG_ROPSTEN_BOOTNODES);
+    final URL configFile = this.getClass().getResource(PERMISSIONING_CONFIG_SEPOLIA_BOOTNODES);
     final Path toml = Files.createTempFile("toml", "");
     Files.write(toml, Resources.toByteArray(configFile));
 
@@ -71,7 +75,7 @@ public void ropstenWithNodesAllowlistOptionWhichDoesIncludeRopstenBootnodesMustN
   @Test
   public void nodesAllowlistOptionWhichDoesNotIncludeBootnodesMustError() throws Exception {
 
-    EthNetworkConfig ethNetworkConfig = EthNetworkConfig.getNetworkConfig(NetworkName.ROPSTEN);
+    EthNetworkConfig ethNetworkConfig = EthNetworkConfig.getNetworkConfig(NetworkName.SEPOLIA);
 
     final URL configFile = this.getClass().getResource(PERMISSIONING_CONFIG);
     final Path toml = Files.createTempFile("toml", "");
@@ -90,15 +94,24 @@ public void nodesAllowlistOptionWhichDoesNotIncludeBootnodesMustError() throws E
       final List<EnodeURL> enodeURIs = ethNetworkConfig.getBootNodes();
       PermissioningConfigurationValidator.areAllNodesAreInAllowlist(
           enodeURIs, permissioningConfiguration);
-      fail("expected exception because ropsten bootnodes are not in node-allowlist");
+      fail("expected exception because sepolia bootnodes are not in node-allowlist");
     } catch (Exception e) {
       assertThat(e.getMessage()).startsWith("Specified node(s) not in nodes-allowlist");
       assertThat(e.getMessage())
           .contains(
-              "enode://6332792c4a00e3e4ee0926ed89e0d27ef985424d97b6a45bf0f23e51f0dcb5e66b875777506458aea7af6f9e4ffb69f43f3778ee73c81ed9d34c51c4b16b0b0f@52.232.243.152:30303");
+              "enode://4e5e92199ee224a01932a377160aa432f31d0b351f84ab413a8e0a42f4f36476f8fb1cbe914af0d9aef0d51665c214cf653c651c4bbd9d5550a934f241f1682b@138.197.51.181:30303");
       assertThat(e.getMessage())
           .contains(
-              "enode://94c15d1b9e2fe7ce56e458b9a3b672ef11894ddedd0c6f247e0f1d3487f52b66208fb4aeb8179fce6e3a749ea93ed147c37976d67af557508d199d9594c35f09@192.81.208.223:30303");
+              "enode://143e11fb766781d22d92a2e33f8f104cddae4411a122295ed1fdb6638de96a6ce65f5b7c964ba3763bba27961738fef7d3ecc739268f3e5e771fb4c87b6234ba@146.190.1.103:30303");
+      assertThat(e.getMessage())
+          .contains(
+              "enode://8b61dc2d06c3f96fddcbebb0efb29d60d3598650275dc469c22229d3e5620369b0d3dedafd929835fe7f489618f19f456fe7c0df572bf2d914a9f4e006f783a9@170.64.250.88:30303");
+      assertThat(e.getMessage())
+          .contains(
+              "enode://10d62eff032205fcef19497f35ca8477bea0eadfff6d769a147e895d8b2b8f8ae6341630c645c30f5df6e67547c03494ced3d9c5764e8622a26587b083b028e8@139.59.49.206:30303");
+      assertThat(e.getMessage())
+          .contains(
+              "enode://9e9492e2e8836114cc75f5b929784f4f46c324ad01daf87d956f98b3b6c5fcba95524d6e5cf9861dc96a2c8a171ea7105bb554a197455058de185fa870970c7c@138.68.123.152:30303");
     }
   }
 
@@ -119,7 +132,7 @@ public void nodeAllowlistCheckShouldIgnoreDiscoveryPortParam() throws Exception
 
     // This node is defined in the PERMISSIONING_CONFIG file without the discovery port
     final EnodeURL enodeURL =
-        EnodeURL.fromString(
+        EnodeURLImpl.fromString(
             "enode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@192.168.0.9:4567?discport=30303");
 
     // In an URI comparison the URLs should not match
@@ -156,7 +169,7 @@ public void nodeAllowlistCheckShouldWorkWithHostnameIfDnsEnabled() throws Except
 
     // This node is defined in the PERMISSIONING_CONFIG_DNS file without the discovery port
     final EnodeURL enodeURL =
-        EnodeURL.fromString(
+        EnodeURLImpl.fromString(
             "enode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@localhost:4567?discport=30303",
             enodeDnsConfiguration);
 
@@ -195,7 +208,8 @@ public void nodeAllowlistCheckShouldNotWorkWithHostnameWhenDnsDisabled() throws
                     toml.toAbsolutePath().toString()))
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessageContaining(
-            "Invalid enode URL syntax. Enode URL should have the following format 'enode://<node_id>@<ip>:<listening_port>[?discport=<discovery_port>]'. Invalid ip address.");
+            "Invalid enode URL syntax 'enode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@localhost:4567'. "
+                + "Enode URL should have the following format 'enode://<node_id>@<ip>:<listening_port>[?discport=<discovery_port>]'. Invalid ip address.");
   }
 
   @Test
@@ -207,7 +221,7 @@ public void nodeAllowlistCheckShouldNotWorkWithUnknownHostnameWhenOnlyDnsEnabled
     Files.write(toml, Resources.toByteArray(configFile));
 
     final ImmutableEnodeDnsConfiguration enodeDnsConfiguration =
-        ImmutableEnodeDnsConfiguration.builder().dnsEnabled(false).updateEnabled(false).build();
+        ImmutableEnodeDnsConfiguration.builder().dnsEnabled(true).updateEnabled(false).build();
 
     assertThatThrownBy(
             () ->
@@ -219,6 +233,6 @@ public void nodeAllowlistCheckShouldNotWorkWithUnknownHostnameWhenOnlyDnsEnabled
                     toml.toAbsolutePath().toString()))
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessageContaining(
-            "Invalid enode URL syntax. Enode URL should have the following format 'enode://<node_id>@<ip>:<listening_port>[?discport=<discovery_port>]'. Invalid ip address.");
+            "Invalid IP address (or DNS query resolved an invalid IP). --Xdns-enabled is true but --Xdns-update-enabled flag is false.");
   }
 }
diff --git a/besu/src/test/java/org/hyperledger/besu/util/PrivateStorageMigrationServiceTest.java b/besu/src/test/java/org/hyperledger/besu/util/PrivateStorageMigrationServiceTest.java
index fdccf5b8740..b54d8ffdfa9 100644
--- a/besu/src/test/java/org/hyperledger/besu/util/PrivateStorageMigrationServiceTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/util/PrivateStorageMigrationServiceTest.java
@@ -31,12 +31,12 @@
 import org.hyperledger.besu.ethereum.privacy.storage.migration.PrivateStorageMigrationException;
 import org.hyperledger.besu.ethereum.privacy.storage.migration.PrivateStorageMigrationService;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class PrivateStorageMigrationServiceTest {
 
   @Mock private PrivateStateStorage privateStateStorage;
diff --git a/besu/src/test/java/org/hyperledger/besu/util/StringUtilsTest.java b/besu/src/test/java/org/hyperledger/besu/util/StringUtilsTest.java
index 41d1ff6defe..1c3e6f2c954 100644
--- a/besu/src/test/java/org/hyperledger/besu/util/StringUtilsTest.java
+++ b/besu/src/test/java/org/hyperledger/besu/util/StringUtilsTest.java
@@ -22,8 +22,11 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
+@ExtendWith(MockitoExtension.class)
 public class StringUtilsTest {
 
   @Test
diff --git a/besu/src/test/resources/everything_config.toml b/besu/src/test/resources/everything_config.toml
index 51fc22b90cf..d0bb8c2cf76 100644
--- a/besu/src/test/resources/everything_config.toml
+++ b/besu/src/test/resources/everything_config.toml
@@ -15,6 +15,7 @@ color-enabled=false
 node-private-key-file="./path/to/privateKey"
 pid-path="~/.pid"
 reorg-logging-threshold=0
+static-nodes-file="~/besudata/static-nodes.json"
 
 # Security Module plugin to use
 security-module="localfile"
@@ -42,7 +43,12 @@ remote-connections-max-percentage=60
 random-peer-priority-enabled=false
 host-whitelist=["all"]
 host-allowlist=["all"]
+engine-host-allowlist=["all"]
+engine-rpc-enabled=true
+engine-jwt-disabled=true
+engine-jwt-secret="/tmp/jwt.hex"
 required-blocks=["8675309=123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"]
+discovery-dns-url="enrtree://AM5FCQLWIZX2QFPNJAP7VUERCCRNGRHWZG3YYHIUV7BVDQ5FDPRT2@nodes.example.org"
 
 # chain
 network="MAINNET"
@@ -50,13 +56,20 @@ genesis-file="~/genesis.json"
 sync-mode="fast"
 fast-sync-min-peers=5
 network-id=303
+kzg-trusted-setup="/etc/besu/kzg-trusted-setup.txt"
 
 # JSON-RPC
 rpc-http-enabled=false
 rpc-http-host="5.6.7.8"
 rpc-http-port=5678
+engine-rpc-port=5679
+rpc-http-max-active-connections=100
 rpc-http-api=["DEBUG","ETH"]
 rpc-http-apis=["DEBUG","ETH"]
+rpc-http-api-method-no-auth=["admin_peers"]
+rpc-http-api-methods-no-auth=["admin_peers"]
+rpc-ws-api-method-no-auth=["admin_peers"]
+rpc-ws-api-methods-no-auth=["admin_peers"]
 rpc-http-cors-origins=["none"]
 rpc-http-authentication-enabled=false
 rpc-http-authentication-credentials-file="none"
@@ -67,6 +80,13 @@ rpc-http-tls-keystore-password-file="none.passwd"
 rpc-http-tls-client-auth-enabled=false
 rpc-http-tls-known-clients-file="rpc_tls_clients.txt"
 rpc-http-tls-ca-clients-enabled=false
+rpc-http-authentication-jwt-algorithm="RS256"
+rpc-ws-authentication-jwt-algorithm="RS256"
+rpc-http-tls-protocols=["TLSv1.2,TlSv1.1"]
+rpc-http-tls-cipher-suites=["TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384","TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"]
+rpc-http-max-batch-size=1
+rpc-http-max-request-content-length = 5242880
+rpc-max-logs-range=100
 
 # PRIVACY TLS
 privacy-tls-enabled=false
@@ -86,6 +106,8 @@ rpc-ws-api=["DEBUG","ETH"]
 rpc-ws-apis=["DEBUG","ETH"]
 rpc-ws-host="9.10.11.12"
 rpc-ws-port=9101
+rpc-ws-max-active-connections=101
+rpc-ws-max-frame-size=65535
 rpc-ws-authentication-enabled=false
 rpc-ws-authentication-credentials-file="none"
 rpc-ws-authentication-jwt-public-key-file="none"
@@ -118,6 +140,8 @@ miner-stratum-host="0.0.0.0"
 miner-stratum-port=8008
 Xminer-remote-sealers-limit=1000
 Xminer-remote-sealers-hashrate-ttl=10
+Xpos-block-creation-max-time=5
+
 # Pruning
 pruning-enabled=true
 pruning-blocks-retained=1024
@@ -139,18 +163,22 @@ privacy-url="http://127.0.0.1:8888"
 privacy-public-key-file="./pubKey.pub"
 privacy-enabled=false
 privacy-multi-tenancy-enabled=true
-privacy-precompiled-address=9
 privacy-marker-transaction-signing-key-file="./signerKey"
 privacy-enable-database-migration=false
 privacy-onchain-groups-enabled=false
+privacy-flexible-groups-enabled=false
 
 # Transaction Pool
 tx-pool-retention-hours=999
 tx-pool-price-bump=13
 tx-pool-max-size=1234
-tx-pool-hashes-max-size=10000
+tx-pool-limit-by-account-percentage=0.017
 Xincoming-tx-messages-keep-alive-seconds=60
 rpc-tx-feecap=2000000000000000000
+strict-tx-replay-protection-enabled=true
+tx-pool-disable-locals=false
+tx-pool-enable-save-restore=true
+tx-pool-save-file="txpool.dump"
 
 # Revert Reason
 revert-reason-enabled=false
@@ -165,12 +193,31 @@ target-gas-limit=8000000
 auto-log-bloom-caching-enabled=true
 
 # ethstats
-Xethstats="nodename:secret@host:1234"
-Xethstats-contact="contact@mail.n"
+ethstats="nodename:secret@host:1234"
+ethstats-contact="contact@mail.n"
+ethstats-cacert-file="./root.cert"
+
+# Data storage
+data-storage-format="BONSAI"
+bonsai-historical-block-limit=512
 
 # feature flags
 Xsecp256k1-native-enabled=false
 Xaltbn128-native-enabled=false
 
 # compatibility flags
-compatibility-eth64-forkid-enabled=false
\ No newline at end of file
+compatibility-eth64-forkid-enabled=false
+
+#p2p over ssl
+Xp2p-tls-enabled=false
+Xp2p-tls-keystore-type="none"
+Xp2p-tls-keystore-file="none.file"
+Xp2p-tls-truststore-password-file="none"
+Xp2p-tls-truststore-type="none"
+Xp2p-tls-truststore-file="none.file"
+Xp2p-tls-keystore-password-file="none"
+Xp2p-tls-crl-file="none.file"
+Xp2p-tls-clienthello-sni=false
+
+#contracts
+Xevm-jumpdest-cache-weight-kb=32000
diff --git a/besu/src/test/resources/ibftlegacy_genesis.json b/besu/src/test/resources/ibftlegacy_genesis.json
deleted file mode 100644
index 84a297fd192..00000000000
--- a/besu/src/test/resources/ibftlegacy_genesis.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "config": {
-        "chainId": 2017,
-        "homesteadBlock": 0,
-        "eip150Block": 0,
-        "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-        "eip155Block": 0,
-        "eip158Block": 0,
-
-        "ibft": {
-            "epochLength": 30000,
-            "blockPeriodSeconds" : 1,
-            "requestTimeoutSeconds": 10
-        }
-    },
-    "nonce": "0x0",
-    "timestamp": "0x5b3c3d18",
-    "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000f89af85494c332d0db1704d18f89a590e7586811e36d37ce049424defc2d149861d3d245749b81fe0e6b28e04f31943814f17bd4b7ce47ab8146684b3443c0a4b2fc2c942a813d7db3de19b07f92268b6d4125ed295cbe00b8410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0",
-    "gasLimit": "0x47b760",
-    "difficulty": "0x1",
-    "mixHash": "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365",
-    "coinbase": "0x0000000000000000000000000000000000000000",
-    "alloc": {
-        "24defc2d149861d3d245749b81fe0e6b28e04f31": {
-            "balance": "0x446c3b15f9926687d2c40534fdb564000000000000"
-        },
-        "2a813d7db3de19b07f92268b6d4125ed295cbe00": {
-            "balance": "0x446c3b15f9926687d2c40534fdb564000000000000"
-        },
-        "3814f17bd4b7ce47ab8146684b3443c0a4b2fc2c": {
-            "balance": "0x446c3b15f9926687d2c40534fdb564000000000000"
-        },
-        "c332d0db1704d18f89a590e7586811e36d37ce04": {
-            "balance": "0x446c3b15f9926687d2c40534fdb564000000000000"
-        }
-    },
-    "number": "0x0",
-    "gasUsed": "0x0",
-    "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-}
diff --git a/besu/src/test/resources/invalid_post_merge_checkpoint_total_difficulty_same_as_TTD.json b/besu/src/test/resources/invalid_post_merge_checkpoint_total_difficulty_same_as_TTD.json
new file mode 100644
index 00000000000..8910740006c
--- /dev/null
+++ b/besu/src/test/resources/invalid_post_merge_checkpoint_total_difficulty_same_as_TTD.json
@@ -0,0 +1,37 @@
+{
+  "config": {
+    "chainId": 1,
+    "homesteadBlock": 1150000,
+    "daoForkBlock": 1920000,
+    "eip150Block": 2463000,
+    "eip158Block": 2675000,
+    "byzantiumBlock": 4370000,
+    "petersburgBlock": 7280000,
+    "istanbulBlock": 9069000,
+    "muirGlacierBlock": 9200000,
+    "berlinBlock": 12244000,
+    "londonBlock": 12965000,
+    "arrowGlacierBlock": 13773000,
+    "grayGlacierBlock": 15050000,
+    "terminalTotalDifficulty": 58750000000000000000000,
+    "ethash": {
+    },
+    "checkpoint": {
+      "hash": "0x186642d6084eb7799cb01c7eb69c1a7f3b2c32cd141e62d309f30081a1ea3c91",
+      "number": 16015954,
+      "totalDifficulty": "0xC70D808A128D7380000"
+    }
+  },
+  "nonce": "0x42",
+  "timestamp": "0x0",
+  "extraData": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
+  "gasLimit": "0x1388",
+  "difficulty": "0x400000000",
+  "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "coinbase": "0x0000000000000000000000000000000000000000",
+  "alloc": {
+    "000d836201318ec6899a67540690382780743280": {
+      "balance": "0xad78ebc5ac6200000"
+    }
+  }
+}
diff --git a/besu/src/test/resources/invalid_post_merge_merge_at_genesis.json b/besu/src/test/resources/invalid_post_merge_merge_at_genesis.json
new file mode 100644
index 00000000000..88691864109
--- /dev/null
+++ b/besu/src/test/resources/invalid_post_merge_merge_at_genesis.json
@@ -0,0 +1,37 @@
+{
+  "config": {
+    "chainId": 1,
+    "homesteadBlock": 0,
+    "daoForkBlock": 0,
+    "eip150Block": 0,
+    "eip158Block": 0,
+    "byzantiumBlock": 0,
+    "petersburgBlock": 0,
+    "istanbulBlock": 0,
+    "muirGlacierBlock": 0,
+    "berlinBlock": 0,
+    "londonBlock": 0,
+    "arrowGlacierBlock": 0,
+    "grayGlacierBlock": 0,
+    "terminalTotalDifficulty": 0,
+    "ethash": {
+    },
+    "checkpoint": {
+      "hash": "0x186642d6084eb7799cb01c7eb69c1a7f3b2c32cd141e62d309f30081a1ea3c91",
+      "number": 1,
+      "totalDifficulty": "0x0"
+    }
+  },
+  "nonce": "0x42",
+  "timestamp": "0x0",
+  "extraData": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
+  "gasLimit": "0x1388",
+  "difficulty": "0x0",
+  "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "coinbase": "0x0000000000000000000000000000000000000000",
+  "alloc": {
+    "000d836201318ec6899a67540690382780743280": {
+      "balance": "0xad78ebc5ac6200000"
+    }
+  }
+}
diff --git a/besu/src/test/resources/invalid_post_merge_near_head_checkpoint.json b/besu/src/test/resources/invalid_post_merge_near_head_checkpoint.json
new file mode 100644
index 00000000000..c940505a9ee
--- /dev/null
+++ b/besu/src/test/resources/invalid_post_merge_near_head_checkpoint.json
@@ -0,0 +1,36 @@
+{
+  "config": {
+    "chainId": 1,
+    "homesteadBlock": 1150000,
+    "daoForkBlock": 1920000,
+    "eip150Block": 2463000,
+    "eip158Block": 2675000,
+    "byzantiumBlock": 4370000,
+    "petersburgBlock": 7280000,
+    "istanbulBlock": 9069000,
+    "muirGlacierBlock": 9200000,
+    "berlinBlock": 12244000,
+    "londonBlock": 12965000,
+    "arrowGlacierBlock": 13773000,
+    "grayGlacierBlock": 15050000,
+    "ethash": {
+    },
+    "checkpoint": {
+      "hash": "0x186642d6084eb7799cb01c7eb69c1a7f3b2c32cd141e62d309f30081a1ea3c91",
+      "number": 16015954,
+      "totalDifficulty": "0xC70D815D562D3CFA955"
+    }
+  },
+  "nonce": "0x42",
+  "timestamp": "0x0",
+  "extraData": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
+  "gasLimit": "0x1388",
+  "difficulty": "0x400000000",
+  "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "coinbase": "0x0000000000000000000000000000000000000000",
+  "alloc": {
+    "000d836201318ec6899a67540690382780743280": {
+      "balance": "0xad78ebc5ac6200000"
+    }
+  }
+}
diff --git a/besu/src/test/resources/log4j2.xml b/besu/src/test/resources/log4j2.xml
deleted file mode 100644
index 3465f7ef823..00000000000
--- a/besu/src/test/resources/log4j2.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN" monitorInterval="30">
-    <Properties>
-        <Property name="root.log.level">INFO</Property>
-    </Properties>
-    <Appenders>
-        <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSSZZZ} | %t | %-5level | %c{1} | %msg%n" />
-        </Console>
-    </Appenders>
-    <Loggers>
-        <Root level="${sys:root.log.level}">
-            <AppenderRef ref="Console" />
-        </Root>
-    </Loggers>
-</Configuration>
diff --git a/besu/src/test/resources/operator/config_generate_keys.json b/besu/src/test/resources/operator/config_generate_keys.json
index 6402efbbf8b..3723fdc3bce 100644
--- a/besu/src/test/resources/operator/config_generate_keys.json
+++ b/besu/src/test/resources/operator/config_generate_keys.json
@@ -2,10 +2,7 @@
   "genesis": {
     "config": {
       "chainId": 2017,
-      "constantinoplefixblock": 0,
-      "homesteadBlock": 0,
       "eip150Block": 0,
-      "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
       "ibft2": {
 
       }
diff --git a/besu/src/test/resources/operator/config_generate_keys_ec_invalid.json b/besu/src/test/resources/operator/config_generate_keys_ec_invalid.json
new file mode 100644
index 00000000000..1483c45f381
--- /dev/null
+++ b/besu/src/test/resources/operator/config_generate_keys_ec_invalid.json
@@ -0,0 +1,40 @@
+{
+  "genesis": {
+    "config": {
+      "chainId": 2017,
+      "eip150Block": 0,
+      "ecCurve": "abcd",
+      "ibft2": {
+
+      }
+    },
+    "nonce": "0x0",
+    "timestamp": "0x5b3c3d18",
+    "number": "0x0",
+    "gasUsed": "0x0",
+    "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "gasLimit": "0x47b760",
+    "difficulty": "0x1",
+    "mixHash": "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365",
+    "coinbase": "0x0000000000000000000000000000000000000000",
+    "ibft2": {
+      "blockperiodseconds": 2,
+      "epochlength": 30000,
+      "requesttimeoutseconds": 10
+    },
+    "alloc": {
+      "24defc2d149861d3d245749b81fe0e6b28e04f31": {
+        "balance": "0x446c3b15f9926687d2c40534fdb564000000000000"
+      },
+      "2a813d7db3de19b07f92268b6d4125ed295cbe00": {
+        "balance": "0x446c3b15f9926687d2c40534fdb542000000000000"
+      }
+    }
+  },
+  "blockchain": {
+    "nodes": {
+      "generate": true,
+      "count": 4
+    }
+  }
+}
\ No newline at end of file
diff --git a/besu/src/test/resources/operator/config_generate_keys_secp256r1.json b/besu/src/test/resources/operator/config_generate_keys_secp256r1.json
new file mode 100644
index 00000000000..f66f588ffe8
--- /dev/null
+++ b/besu/src/test/resources/operator/config_generate_keys_secp256r1.json
@@ -0,0 +1,40 @@
+{
+  "genesis": {
+    "config": {
+      "chainId": 2017,
+      "eip150Block": 0,
+      "ecCurve": "secp256r1",
+      "ibft2": {
+
+      }
+    },
+    "nonce": "0x0",
+    "timestamp": "0x5b3c3d18",
+    "number": "0x0",
+    "gasUsed": "0x0",
+    "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "gasLimit": "0x47b760",
+    "difficulty": "0x1",
+    "mixHash": "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365",
+    "coinbase": "0x0000000000000000000000000000000000000000",
+    "ibft2": {
+      "blockperiodseconds": 2,
+      "epochlength": 30000,
+      "requesttimeoutseconds": 10
+    },
+    "alloc": {
+      "24defc2d149861d3d245749b81fe0e6b28e04f31": {
+        "balance": "0x446c3b15f9926687d2c40534fdb564000000000000"
+      },
+      "2a813d7db3de19b07f92268b6d4125ed295cbe00": {
+        "balance": "0x446c3b15f9926687d2c40534fdb542000000000000"
+      }
+    }
+  },
+  "blockchain": {
+    "nodes": {
+      "generate": true,
+      "count": 4
+    }
+  }
+}
\ No newline at end of file
diff --git a/besu/src/test/resources/operator/config_import_keys.json b/besu/src/test/resources/operator/config_import_keys.json
index b8b55169cbb..db4e57b5455 100644
--- a/besu/src/test/resources/operator/config_import_keys.json
+++ b/besu/src/test/resources/operator/config_import_keys.json
@@ -2,10 +2,7 @@
   "genesis": {
     "config": {
       "chainId": 2017,
-      "constantinoplefixblock": 0,
-      "homesteadBlock": 0,
-      "eip150Block": 0,
-      "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "petersburgBlock": 0,
       "ibft2": {
 
       }
@@ -36,8 +33,8 @@
   "blockchain": {
     "nodes": {
       "keys": [
-        "0xb295c4242fb40c6e8ac7b831c916846050f191adc560b8098ba6ad513079571ec1be6e5e1a715857a13a91963097962e048c36c5863014b59e8f67ed3f667680",
-        "0x6295c4242fb40c6e8ac7b831c916846050f191adc560b8098ba6ad513079571ec1be6e5e1a715857a13a91963097962e048c36c5863014b59e8f67ed3f667680"
+        "0x9481ee2b34196827e8c4807ae29c2675c15d3641e482ab81cc0bc3ef535755b426b9f5c474213df28a563fab0bf0830b455ee8955b3faac93075422a6abf160d",
+        "0xf9dff57fc0bae7cba6577d82caf40cf6d266afc2a212775eb45c2188ab30aeed01e724daf4203649d4aa7e30717bfeeaf0b4c30b5d651bad39bcae8429759889"
       ]
     }
   }
diff --git a/besu/src/test/resources/operator/config_import_keys_invalid_keys.json b/besu/src/test/resources/operator/config_import_keys_invalid_keys.json
index 69d2a84dce9..3fc4561e3a1 100644
--- a/besu/src/test/resources/operator/config_import_keys_invalid_keys.json
+++ b/besu/src/test/resources/operator/config_import_keys_invalid_keys.json
@@ -2,10 +2,7 @@
   "genesis": {
     "config": {
       "chainId": 2017,
-      "constantinoplefixblock": 0,
-      "homesteadBlock": 0,
-      "eip150Block": 0,
-      "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "petersburgBlock": 0,
       "ibft2": {
 
       }
diff --git a/besu/src/test/resources/operator/config_import_keys_qbft.json b/besu/src/test/resources/operator/config_import_keys_qbft.json
new file mode 100644
index 00000000000..fe757326b40
--- /dev/null
+++ b/besu/src/test/resources/operator/config_import_keys_qbft.json
@@ -0,0 +1,41 @@
+{
+  "genesis": {
+    "config": {
+      "chainId": 2017,
+      "petersburgBlock": 0,
+      "qbft": {
+
+      }
+    },
+    "nonce": "0x0",
+    "timestamp": "0x5b3c3d18",
+    "number": "0x0",
+    "gasUsed": "0x0",
+    "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "gasLimit": "0x47b760",
+    "difficulty": "0x1",
+    "mixHash": "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365",
+    "coinbase": "0x0000000000000000000000000000000000000000",
+    "ibft2": {
+      "blockperiodseconds": 2,
+      "epochlength": 30000,
+      "requesttimeoutseconds": 10
+    },
+    "alloc": {
+      "24defc2d149861d3d245749b81fe0e6b28e04f31": {
+        "balance": "0x446c3b15f9926687d2c40534fdb564000000000000"
+      },
+      "2a813d7db3de19b07f92268b6d4125ed295cbe00": {
+        "balance": "0x446c3b15f9926687d2c40534fdb542000000000000"
+      }
+    }
+  },
+  "blockchain": {
+    "nodes": {
+      "keys": [
+        "0x9481ee2b34196827e8c4807ae29c2675c15d3641e482ab81cc0bc3ef535755b426b9f5c474213df28a563fab0bf0830b455ee8955b3faac93075422a6abf160d",
+        "0xf9dff57fc0bae7cba6577d82caf40cf6d266afc2a212775eb45c2188ab30aeed01e724daf4203649d4aa7e30717bfeeaf0b4c30b5d651bad39bcae8429759889"
+      ]
+    }
+  }
+}
diff --git a/besu/src/test/resources/operator/config_import_keys_secp256r1.json b/besu/src/test/resources/operator/config_import_keys_secp256r1.json
new file mode 100644
index 00000000000..bd189d0235c
--- /dev/null
+++ b/besu/src/test/resources/operator/config_import_keys_secp256r1.json
@@ -0,0 +1,42 @@
+{
+  "genesis": {
+    "config": {
+      "chainId": 2017,
+      "petersburgBlock": 0,
+      "ecCurve": "secp256r1",
+      "ibft2": {
+
+      }
+    },
+    "nonce": "0x0",
+    "timestamp": "0x5b3c3d18",
+    "number": "0x0",
+    "gasUsed": "0x0",
+    "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "gasLimit": "0x47b760",
+    "difficulty": "0x1",
+    "mixHash": "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365",
+    "coinbase": "0x0000000000000000000000000000000000000000",
+    "ibft2": {
+      "blockperiodseconds": 2,
+      "epochlength": 30000,
+      "requesttimeoutseconds": 10
+    },
+    "alloc": {
+      "24defc2d149861d3d245749b81fe0e6b28e04f31": {
+        "balance": "0x446c3b15f9926687d2c40534fdb564000000000000"
+      },
+      "2a813d7db3de19b07f92268b6d4125ed295cbe00": {
+        "balance": "0x446c3b15f9926687d2c40534fdb542000000000000"
+      }
+    }
+  },
+  "blockchain": {
+    "nodes": {
+      "keys": [
+        "0x69b48fbfeaf1275afb2773b8b2ce485660e8d6b92f74b55814a567189339dab9ec75726c13206fdf716bb107eb52666a95b7d8188af60cd1bdb66493959ec3b6",
+        "0x6256fbfe4731d350d35261d2fa720cc2883d4f6d7f43797e5fee0c6b4c29ea6fc16abb3a8b30384d443f45eb7099b71bf4a61128a03b80c376e3883c8d0ffd0d"
+      ]
+    }
+  }
+}
diff --git a/besu/src/test/resources/operator/config_import_keys_secp256r1_invalid_keys.json b/besu/src/test/resources/operator/config_import_keys_secp256r1_invalid_keys.json
new file mode 100644
index 00000000000..4f59b9ebd7f
--- /dev/null
+++ b/besu/src/test/resources/operator/config_import_keys_secp256r1_invalid_keys.json
@@ -0,0 +1,42 @@
+{
+  "genesis": {
+    "config": {
+      "chainId": 2017,
+      "petersburgBlock": 0,
+      "ecCurve": "secp256r1",
+      "ibft2": {
+
+      }
+    },
+    "nonce": "0x0",
+    "timestamp": "0x5b3c3d18",
+    "number": "0x0",
+    "gasUsed": "0x0",
+    "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "gasLimit": "0x47b760",
+    "difficulty": "0x1",
+    "mixHash": "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365",
+    "coinbase": "0x0000000000000000000000000000000000000000",
+    "ibft2": {
+      "blockperiodseconds": 2,
+      "epochlength": 30000,
+      "requesttimeoutseconds": 10
+    },
+    "alloc": {
+      "24defc2d149861d3d245749b81fe0e6b28e04f31": {
+        "balance": "0x446c3b15f9926687d2c40534fdb564000000000000"
+      },
+      "2a813d7db3de19b07f92268b6d4125ed295cbe00": {
+        "balance": "0x446c3b15f9926687d2c40534fdb542000000000000"
+      }
+    }
+  },
+  "blockchain": {
+    "nodes": {
+      "keys": [
+        "0xb295c4242fb40c6e8ac7b831c916846050f191adc560b8098ba6ad513079571ec1be6e5e1a715857a13a91963097962e048c36c5863014b59e8f67ed3f667680",
+        "0x6295c4242fb40c6e8ac7b831c916846050f191adc560b8098ba6ad513079571ec1be6e5e1a715857a13a91963097962e048c36c5863014b59e8f67ed3f667680"
+      ]
+    }
+  }
+}
diff --git a/besu/src/test/resources/operator/config_no_config_section.json b/besu/src/test/resources/operator/config_no_config_section.json
new file mode 100644
index 00000000000..2841aea9c47
--- /dev/null
+++ b/besu/src/test/resources/operator/config_no_config_section.json
@@ -0,0 +1,32 @@
+{
+  "genesis": {
+    "nonce": "0x0",
+    "timestamp": "0x5b3c3d18",
+    "number": "0x0",
+    "gasUsed": "0x0",
+    "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "gasLimit": "0x47b760",
+    "difficulty": "0x1",
+    "mixHash": "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365",
+    "coinbase": "0x0000000000000000000000000000000000000000",
+    "ibft2": {
+      "blockperiodseconds": 2,
+      "epochlength": 30000,
+      "requesttimeoutseconds": 10
+    },
+    "alloc": {
+      "24defc2d149861d3d245749b81fe0e6b28e04f31": {
+        "balance": "0x446c3b15f9926687d2c40534fdb564000000000000"
+      },
+      "2a813d7db3de19b07f92268b6d4125ed295cbe00": {
+        "balance": "0x446c3b15f9926687d2c40534fdb542000000000000"
+      }
+    }
+  },
+  "blockchain": {
+    "nodes": {
+      "generate": true,
+      "count": 4
+    }
+  }
+}
\ No newline at end of file
diff --git a/besu/src/test/resources/org/hyperledger/besu/chainimport/clique/genesis.json b/besu/src/test/resources/org/hyperledger/besu/chainimport/clique/genesis.json
index c46060ffd37..43f399bf0e2 100644
--- a/besu/src/test/resources/org/hyperledger/besu/chainimport/clique/genesis.json
+++ b/besu/src/test/resources/org/hyperledger/besu/chainimport/clique/genesis.json
@@ -1,14 +1,7 @@
 {
   "config": {
     "chainId": 2018,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
-    "byzantiumBlock": 0,
-    "constantinopleBlock": 0,
-    "constantinopleFixBlock": 0,
+    "petersburgBlock": 0,
     "contractSizeLimit": 2147483647,
     "clique": {
       "blockperiodseconds": 15,
diff --git a/besu/src/test/resources/org/hyperledger/besu/chainimport/ethash/genesis.json b/besu/src/test/resources/org/hyperledger/besu/chainimport/ethash/genesis.json
index 9c7ed48ad88..71e5a4ab795 100644
--- a/besu/src/test/resources/org/hyperledger/besu/chainimport/ethash/genesis.json
+++ b/besu/src/test/resources/org/hyperledger/besu/chainimport/ethash/genesis.json
@@ -1,14 +1,7 @@
 {
   "config": {
     "chainId": 2018,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
-    "byzantiumBlock": 0,
-    "constantinopleBlock": 0,
-    "constantinopleFixBlock": 0,
+    "petersburgBlock": 0,
     "contractSizeLimit": 2147483647,
     "ethash": {
       "fixeddifficulty": 100
diff --git a/besu/src/test/resources/org/hyperledger/besu/chainimport/unsupported/genesis.json b/besu/src/test/resources/org/hyperledger/besu/chainimport/unsupported/genesis.json
index fd6b595d2dc..f0d9a8e18d1 100644
--- a/besu/src/test/resources/org/hyperledger/besu/chainimport/unsupported/genesis.json
+++ b/besu/src/test/resources/org/hyperledger/besu/chainimport/unsupported/genesis.json
@@ -1,14 +1,7 @@
 {
   "config": {
     "chainId": 2018,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
-    "byzantiumBlock": 0,
-    "constantinopleBlock": 0,
-    "constantinopleFixBlock": 0,
+    "petersburgBlock": 0,
     "contractSizeLimit": 2147483647,
     "ibft2": {
       "blockperiodseconds": 1,
diff --git a/besu/src/test/resources/permissioning_config_ropsten_bootnodes.toml b/besu/src/test/resources/permissioning_config_ropsten_bootnodes.toml
deleted file mode 100644
index df6df20546d..00000000000
--- a/besu/src/test/resources/permissioning_config_ropsten_bootnodes.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Permissioning TOML file
-
-accounts-allowlist=["0x0000000000000000000000000000000000000009"]
-nodes-allowlist=["enode://6332792c4a00e3e4ee0926ed89e0d27ef985424d97b6a45bf0f23e51f0dcb5e66b875777506458aea7af6f9e4ffb69f43f3778ee73c81ed9d34c51c4b16b0b0f@52.232.243.152:30303",
-  "enode://94c15d1b9e2fe7ce56e458b9a3b672ef11894ddedd0c6f247e0f1d3487f52b66208fb4aeb8179fce6e3a749ea93ed147c37976d67af557508d199d9594c35f09@192.81.208.223:30303",
-  "enode://30b7ab30a01c124a6cceca36863ece12c4f5fa68e3ba9b0b51407ccc002eeed3b3102d20a88f1c1d3c3154e2449317b8ef95090e77b312d5cc39354f86d5d606@52.176.7.10:30303",
-  "enode://865a63255b3bb68023b6bffd5095118fcc13e79dcf014fe4e47e065c350c7cc72af2e53eff895f11ba1bbb6a2b33271c1116ee870f266618eadfc2e78aa7349c@52.176.100.77:30303"]
diff --git a/besu/src/test/resources/permissioning_config_sepolia_bootnodes.toml b/besu/src/test/resources/permissioning_config_sepolia_bootnodes.toml
new file mode 100644
index 00000000000..8e902c3eb75
--- /dev/null
+++ b/besu/src/test/resources/permissioning_config_sepolia_bootnodes.toml
@@ -0,0 +1,9 @@
+# Permissioning TOML file
+
+accounts-allowlist = ["0x0000000000000000000000000000000000000009"]
+nodes-allowlist = [
+    "enode://4e5e92199ee224a01932a377160aa432f31d0b351f84ab413a8e0a42f4f36476f8fb1cbe914af0d9aef0d51665c214cf653c651c4bbd9d5550a934f241f1682b@138.197.51.181:30303",
+    "enode://143e11fb766781d22d92a2e33f8f104cddae4411a122295ed1fdb6638de96a6ce65f5b7c964ba3763bba27961738fef7d3ecc739268f3e5e771fb4c87b6234ba@146.190.1.103:30303",
+    "enode://8b61dc2d06c3f96fddcbebb0efb29d60d3598650275dc469c22229d3e5620369b0d3dedafd929835fe7f489618f19f456fe7c0df572bf2d914a9f4e006f783a9@170.64.250.88:30303",
+    "enode://10d62eff032205fcef19497f35ca8477bea0eadfff6d769a147e895d8b2b8f8ae6341630c645c30f5df6e67547c03494ced3d9c5764e8622a26587b083b028e8@139.59.49.206:30303",
+    "enode://9e9492e2e8836114cc75f5b929784f4f46c324ad01daf87d956f98b3b6c5fcba95524d6e5cf9861dc96a2c8a171ea7105bb554a197455058de185fa870970c7c@138.68.123.152:30303"]
diff --git a/besu/src/test/resources/privacy_reorg_genesis.json b/besu/src/test/resources/privacy_reorg_genesis.json
new file mode 100644
index 00000000000..a005ebf8c69
--- /dev/null
+++ b/besu/src/test/resources/privacy_reorg_genesis.json
@@ -0,0 +1,34 @@
+{
+  "config": {
+    "chainId": 1337,
+    "petersburgBlock": 0,
+    "contractSizeLimit": 2147483647,
+    "ethash": {
+      "fixeddifficulty": 100
+    }
+  },
+  "nonce": "0x42",
+  "timestamp": "0x0",
+  "extraData": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
+  "gasLimit": "0x1fffffffffffff",
+  "difficulty": "0x10000",
+  "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "coinbase": "0x0000000000000000000000000000000000000000",
+  "alloc": {
+    "fe3b557e8fb62b89f4916b721be55ceb828dbd73": {
+      "privateKey": "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "0xad78ebc5ac6200000"
+    },
+    "627306090abaB3A6e1400e9345bC60c78a8BEf57": {
+      "privateKey": "c87509a1c067bbde78beb793e6fa76530b6382a4c0241e5e4a9ec0a0f44dc0d3",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "90000000000000000000000"
+    },
+    "f17f52151EbEF6C7334FAD080c5704D77216b732": {
+      "privateKey": "ae6ae8e5ccbfb04590405997ee2d52d2b330726137b875053c36d94e974d162f",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "90000000000000000000000"
+    }
+  }
+}
diff --git a/besu/src/test/resources/trusted_setup.txt b/besu/src/test/resources/trusted_setup.txt
new file mode 100644
index 00000000000..c22cfff7515
--- /dev/null
+++ b/besu/src/test/resources/trusted_setup.txt
@@ -0,0 +1,4163 @@
+4096
+65
+97f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb
+854262641262cb9e056a8512808ea6864d903dbcad713fd6da8dddfa5ce40d85612c912063ace060ed8c4bf005bab839
+86f708eee5ae0cf40be36993e760d9cb3b2371f22db3209947c5d21ea68e55186b30871c50bf11ef29e5248bf42d5678
+94f9c0bafb23cbbf34a93a64243e3e0f934b57593651f3464de7dc174468123d9698f1b9dfa22bb5b6eb96eae002f29f
+82b8775b874067bdd4479ac237f8d56036a742c17901354caaf38bf8c70e696650fbec76f0cd941ed8c658f44ea359ff
+a7ce299c79c7d7e4f1adecd754c5aff8a720728ab27f5737b7b399f72724407ac54965088596375b8c876665ed8e4ff1
+81ca4c808a76a6f217f8b0540ff400199295da69b2587b7be6aeb56447fa4fac08d154a27c4aa6082bc40660078d36e9
+a70bad5311c97f1f3fea5d3375da1a11ba948aca41609ea28666dd343e07af766834e1256dc685ac1dcd915073250864
+a91c2911a658ba79f56abe30716a3398387630e785b351b07344022a04b2f5c90de5573bd6e8048fe8878dde19336c5b
+a8c560283fce9813bcbaddfb78cff93efcbc39b33025cfad94ebd40942a9fa605d2a947dc3a1f03c2e454075892e96bf
+aa14f07fbd2c1ce7bd995e335c69b5f675ea573517c1834e787b30ab4fa10aecc62ecc5e617ac8a539af1aff114dc9ec
+87f03429aff126b7c5a918423da278e17b5f48a4cdd6d34dba77a75f4f99e26a417e65d6a8579bcb2eaaf1d4d8c64dce
+b1ac81ba91ede78315f712d524e9d821a152203f04141ba77f4e481ad5881473dff14a71788ce941f0905b429e7ee5b2
+8f5c2af611ddfa3edf7e442d00e56a24d615bac848c05070c908c741ba18b67eb2e82e6651c9b3c70fb8edbf051810c4
+aa4115b19221e4d17cc335d4f9b0aad22df566231f2286d550e97ff2875cbc419edfa189c4ecb24001123b95c6aaa2da
+b363ba913969df0debd4e2712ae6e9177ce82e169ce7e0ff1d7616ef8e352aff3efb40fffbf7bff1b21cb8a33e19b455
+b1013d778727d20466778cea47e1bf56a77168a8ce1b33bb1265f66438ab2bf4a7df4f4142b8681f2993ea9baf798d17
+83b7250ee17d8529207db97b73c1c4a92ac076951a577ce2fe3a2cd633b461c1820c139ab36a895a5962e143c6198386
+86d180bd2f0a4919764e6f4e846ec0d5ebe44060ec1e529ed15101d7e531bf1b8f9412916ea5aeb93b37b2d7c6bfb408
+827451462c79d74b504c01bda199481b3c70416f66a95b2216686ca4d48da48932b0d323d0cd630a1e86e8033e832e5f
+b789d217cb12c334fedff0ae01f85b96e968fb98761755d1ba3ee17934e8fbd83172225df7c0c6cb99432a30a0ef8c24
+b730e5412dfbd646b0d2fe084a1a32eb5596c3fe8a5bc0f430151804f9e67f05f70b522e9aef08082b0afdc652a1d213
+9987653bacd9bc1659b17f6964aec06ea63b787813d4601bee0479706aed5595ac82c87ed4f96f0cd30c19e1d9510a91
+9506a9ba38f1d26c35a17c7e2554e28eb347a19cef523846a2559fb80fb40306b2f85bdc2c9fb98c2267df21c1ee3589
+98dda58de74c0cdaef97b2826b4a9d53c9e9ea592dc0a755ccf5b3fbc1264979578563f5979aaa246e679918053c5f83
+b00aaa16841ab53883af481e2f925050f5f7bf7d8088bc696f55f30593bdbbaf434f5d2b46095ed097b6cdb96c8fbc3b
+b463d656480f89335d3a840a7b9398877003985388871b148ba708c60f9857c7585ef17c8b2ae67fbb191c04ad61e692
+80af54f3d0584126e23635276d650292baf7e3e12bb06468708107bcd80937d36575721ee7472c5f085ffa71dbf438ad
+94ccb8ade84e834685110c96908b42e10d2184208f434d7f98d96cc158e0c0c95135979600e5e9f465d5846b0bb3c787
+8e13674b00c633d7cceb4f6ecd61e4f99420d6cccf9db5e81f8c90f6c661bc76e10939b83b56c225fce8565f525d4fa4
+a46a15b2e671c1a1df2490768dec1093caf537e1a21fbc11ff8ba8b21b9f2be8d50257027d9357df20d9fbb1307d7249
+b8ed532d48b0533a3084d7a5eea7b401255c5825e9a1b80ed81fd530cd69e347d152b1ad8a899acff7d68e0103bbfbde
+ad6b7df980ebaa24177d830c4aa522d6179a9a489257f60ee6604cccc2cbe90fb1f72aa9d5bee0d3a88f73b179485f56
+a56855e9fcf62ceef3043991a93ec24f8f6b5667ef5fb7ad1771249ece68a73580ec3cf3e58a009ca4650c01241ad172
+ab2f25517d4b0b33d317eb78d091d3c3f98dc352b8a3e4650f7005f9327129e23d95f38eaeda5e9b51c50a31d20a4c20
+a2d4071385b8a421da86f39739eaadcdea5685466feb6ac083cba0ea4c71dbbdf655032097276d703f9a77a4ca6fab03
+a8681d7c258984f01e92e92c95738692b7bbd59c3a802adf4dda8d34add69590b080391c09e98e3b75c085c9f191e5e5
+97685643da6c07b5e5fe91393122813ba11c8ef3dbd43a03b3a22a7a1603201fd516c1929418eafb14039270694c239a
+a7bb3b85d6101e4fb0bcf540f52041cdb3e819d517465e342b832f0e91346a9a18bdb38845ea4d2b71ab87ef3bf59f96
+8afc90b7d35336fdcf8f81cd024e921e244520ecfcb5a3994f2bbd595366b68bfa792a8dceb11e1e889b11432c9dad6b
+94d9db7bd04f962d8d6caa3b7aa0f19acbd58a09d35ae187158d77e537d2fc65215f51f1afd62d4ba378e7d176a680f9
+ad62d7c01b14b6f97e6084ec9f9d084f106a7ff3d603032e6e34c027cdce4b0fe3c20ac7931f1209439a59c9fede4815
+a5b44a87bd0ada7498e011e495a2818a8694746c4e7dc9d24c0c1096f54be6439e08c1b11c10d7c4bf68fe392000e971
+828626c6609acc599f1bf216e9a4310fc3cb227e0d2e47bfe3360239427c8b0cc300cddf92456a5c36620596a6d37027
+8380f91baac6447dd39886455ec5d99b874ac114a3c6a6ded18fc4ef69c2208ec19732428d8329d200a69f31792b852e
+85a8389b522b0a686234450165514127006baaa3907f6eb29c976522591a542ffb681b3b88c4886814fd7ba3cc8110f7
+b8ae7949ddafad37c0bc4d48325a7cbcd3096fb92c04a027c650a03cc609c7eac250d6a7ba341616bc36f64f1b4c8be4
+8f9b9d2c2ab5c85abe946ed9986e0f304281b277d4d48c7760ea2331b55a9e9a1c4d53a6bdd83fa6294f421ca7431e29
+9464b906ea8bc994b31e03c5f2af2be0724a43293fd42cbd2263b2de75a2ec04832d1100ce62ac2c0708f05fb6bb3ce6
+93d923f6805e7cf972d8387b352d77215724a3e1f5489c4114fcf0b25fc2231963eda872387a1369a02b2e8b888d6427
+aba4af392884eb7283fc5611ddc1cebfecf9477462e951bdae650e311606e129b4424452a3a14717146f954a7fa1cfc3
+a8d0bab694d116e4f21fa19ff8fa4c6fe4061dbb54cbceda8235a7e05159737f87e008beccb90df0bac9c7d572281903
+85743e3ecbac7ae04a81a09c2961397aa4bd20401533cd24d5fc0693cbfbdd2b37bbee6dec2ae5d0a66250d1fcba6944
+80ae913447d7d3f6c54f9cb584aa1603308146daeb3024c8e06ede66ddc97821df09f9591453e9b617b828a02d54c719
+803c2a64bb1c68890b5f1909be3aa180830ee3ef316d3aac38bfd909e2b19d890525e18e8fc2f405ee70ac14f5569b3f
+964d2968724eb790f2f42263fcaaa1869c373b57b3eeee904f8b36f13169f07d5e29cb2b03c74d3a7adb772e91d5a59a
+98a72ce71a57262aa058643a5cd39af64cc9eee88bef7edb003143983f29d87c7f9658b1ec89712f79f6f79dc24a6a45
+91f3479c5d7c76acd2d51883961179efc975c714720187cc9c0aa7aeff71ca1b3e2db5b0a90fd3ff6abf880ebc49fe36
+84312757edd09f111420bfede10ed3c1fa39d1723ddb9bd4d0004c829f0c1eb060e9648fd75f2e5427a67a5b37945a9f
+95edd726cf4042a082d786262304c51d8d5e6a89b1b58e825a11febe5f861d5ce076bdcb2fc0a5dfa95eb2e5b0ffc32e
+96500da38f942871d78fcc46cda1e72944c7888b538b82e2a979f149e5061a20c7602860f82b76510d02efdf3a911f5a
+8ac62eda98bef8864df243696b53651a02a391b898535d2d76ac5a8e9322e0178a290c83f5afe72ffe80ad56183469e3
+8ab2d4427fb6d3da5cf6c59835bdb39fb0c2de82c213b5de77edae3304458ea505511bd98fda95bdbbb9058bd5e92c34
+ab67c4344a5080930029ca3b803883ad05ca004ddefb48d5164e71a1c6dd96b27aaec70f62b39bb126ce1a57bbff1453
+86c6bf91686bff714a873a78b0fe449db5317a5172a0a14eb3a96b2997b888d5d3f440de8baa32a6966fe44c3625b014
+81d4f1e9d9e550125290d993a4886d46aac8cb29dbbba1e608aefc3432569c5faf14d8b49fcb485d9b75b649ad6b2fa5
+8594140f253ced6fa98dd90ab4f38899916bcc6f1052572f182e46c00752f3053c390512338a0bc8f8c27a91916b855f
+911284d4fad4999bb37590206d582b9e62ffbb815f414fd829f5b2843e6f0e1a132cd64464c131d5a0f476469a37daa1
+8631a6a4987410982db9c0ba632023a5b613f553b6b8ffd3cfd501b2417523ba8cf06741c62f24b405554bd93e39e626
+906ac35d22794a10a7273fdbca499fd921799b1ce9414643779dce9e1ec37920a5aa2caceb4b70a0eaf56c6032ef1b43
+87374cdb8b7a1ce3c182b31eec465d435e35df782fe3a11f421462b48cf56c6fef2a9cb8ee4fe89672ba7804156d9e3a
+a1f825e0246eee506c8ce40f849a17f75e8a0d6fc3f68b6a4dd431173b4fe997d30dca53005829e4e2422a4077ce35c7
+875ad0379abd9873f6634692e33e9b36353e1a0d15b13d3215eb591244e1f236eb2f8f75274ca7f096179d1714fa68b7
+b87b4e1acc09c5701fd9d75375ab896f178c1b3648fb9a2e2c6e1478778156decc32cd390766f3e80b36beb1e3a6bdec
+836ca80949269eb52395776ac5ceb35b7df717a981c5cbbbb627f73c274aa8164e973a7b01012fa72a02404e878a9918
+a770b13a8f07f74e5a75842b18f2520f6d0be42c865a29dd81bfe485e69a83c40ad10ce229afce276ccc9cb46c54b912
+b4b919322bba2866baeed38bf0e2389d4fe6ab6166597e87dbfee75acac7c2f5ad3bef55293b56957c103d5825051bb5
+b6171f1bbeedb3ee1af368c9c9f327d1dc3e55aeaffbe15f14db8038cd72540b62fe65f44ad0b5486dcf4023f0e91af8
+8e42d0c1e8e8c2ccaf06edcc3c686aed56b8c987f9d68f20937fc088120a410cb92fb0ab45bba5db70b86876015a6b72
+937bcff1af9685fd0d1f6616acf91d97ac9fcb1eb96d49d1c880c9945c1fcf1414f63d59fb78348d08a8546f6e83e407
+a6eeb4873c0531fbcd407c2e702c68e4980fa77c9c032b9913b89031702cfa56f335fc413576c37ac4d523357a841203
+b3962b5eed69cfa27fb94edba74b6cedd7569352ea71861494dd579da96d9743655b6308e54f8a42ee6d7e805c1bc0f9
+8eea944dce7202b033ce734c9e88e82dd760c916e00b217cf1f00bf6ec5f20e21885d5fe95d6138871d167de4c46359e
+81e6c7b356e2703ee333a9dfeb2b54260636422b9bda118e0523a20ce83b30fefc2f019e8291a8db05d207f0fa7332fb
+83817f6164dc9e8e2506252511cb9871a8c9b595dde45f67e75ce3505f947b3fb3b804c18c054ad13b1518a98f59f008
+a9ab4dbe7699e7982cd750d7effe031f273fab6b2e024a0b4f8beccb5c280903bcd3f2400b9cac7e8c94e157b4658ab6
+84d2e3bc66fc6b59a1ee98b8981ebca0901d846c40d207e5bb5004ec9339d28956d16f054af52453f6a7ff3fc66c346b
+b24bf0f69c3e86f610b6d27885ac5f4556fbb14e8286681538ddbb0b4921aa0d5604fedef0daf4a514ae15268a640174
+a4be967f7f31995562669bf9587f5463bd1d9873fe9169687790e75961efa5ce2252fd21276d022f580de23527282838
+a3f3c4e673b302bdb91fa3cbdec88499752e6ffe37e2215d69b8a426f4da98c3a10e4c659e77c656172e4e8b1b1a41bb
+b704ffbb3434563bbbce69ca7e812a8bd30757b1e90630bf3261735f9ea221524b36f97dec324ffd209bef45bdf6f2b4
+959dde49f15c663a2de000195e182a11d8c396c1380f98322cbe5521b697bc3bec3223ca9e94ee2734c4ffdfb6a19e8c
+a469685143cd82b78d7b1854c350da63819d9d86670e9b35a72381d0362cf5c3f1d24e22ef2ea6a12176c9dad39fd51c
+adb97ef4463e5e13d91b75a3086d72a841a60be278e9651d9ac5f76c9537bac5eac33424a1ea00522b3357fcefea0738
+a4597b2ced7566576e71b4f105b5ee48aa4ffca93901e9b626f7059824f53be3e8f3560e6861285f3d97fe88054fee83
+a18d9b1b81564447f798ce5966bf10c823aedb14b143972eb4dbbba9312fc79f46635aa016cd20c53be90f170f06fb84
+ac4724069177d3c6ac1b72ea2a7d6bc5ac3d4b2a4dbad124152fbd170c9c1038cdcf255d162a25c14ae8df11a3849945
+892683f64179ba84f6a447c5c7489e3cdf02474d2837dd7bf3b82a4dd05a6461ce94fff28d65b9539cacaf47dddedbc1
+a68ad797bbc1b2909e216a0b3f39aa6c3e4dfc7a49f81a206b530ec0c6ba30f871e4a0053625aeb99448026ae2e0a6eb
+964ff8badf35b6b93be6d97209d87f4ac8847be1c2ac4bcafa1db5c3f604f61834c85b3dcf58af50d09bd03ff8d78f27
+b76dc9ec64b1fab7be269097a18a77144623d37bc656934fa1562817c922485e69b18ef40413ee309e100fde645fa7b2
+b2a812be6e69f284580ebdec5ae2cdffd587bc7eae10989e9d2f290498b1eaa934b148ec7783edec300be5d7a9b34af0
+85ffcabc623f8ffc58c5f640f857e27b7c105359315a3969f346e1366acb2af88f4acc025b299b9c324a8535c380a2c5
+8d0140f79fb8ef02d13b1d51c4ba1af5b5ffb19322f88912215d4198f9a592f7ec6800c8a3ca853a3b68f9bf0353a13a
+b3174deb53c1ebb6a1e16c915cac287573b70fe4e0036e8e971e8e807a77362ede632f6e3f29cb87a80a318213946ff1
+8c58d603f6420e3f55522ec2853065125af4e7773a909e28296552f7f8ec4691ada9211d834dca38e118f432b6cfe03b
+aa7ac268e155ff074bfc197844e21fc2a9f9aec9b50d9cda63f50d3c4fbbf9221e6fac3a6ba0f7e4cde71fecd493a15d
+a191337721bc9fd2d3ec2ca6f6f97ca2462ef5e207464bf9e746a650a67d69abb5f578a8238521cee3f704b275845e47
+93521abea8f38c103ebed3313a3af8f27f03c9a54681847f4201bf9f72f1f63064b18175986fca64f80b4380905e894c
+a1b9d063d6538885f9826b84944123d7d6027dd030aef29fd6229f4cf5d32404f7dd0e899a0c8f4b6bdf4649e8a8966f
+a15d5497f0fd2fd0b2c2e5df58a25a72a9d99df8215951ea58c15569d312c6f096f78034f6a8502f808e649f6cb9283a
+b3c275306852612362e1073d0f4da3ce598dc5fac3f3eefa22ccee35dd57a4caae347b43342cd1f6a6e068d3ea9fd30c
+94eb678e0700bf39caf428c65bbf2fbf7f601c39e382570a4df9186ff1dd5a958d78e051a5fd084e4f75536a14b7690b
+97b13995bbcb8e824bec28488994a830a9c1f34ae4c1a16d5528d57f09e4c8b5d81677ea9f979f0acb8cac629ee09c85
+817c99ad48bc05bd4fd29f952dbdc5ef56bb02f3442c18e3b91cb6d72ac2d2a5df901c099165ded1bee62c3ed13c41e8
+a884acf980f6470e11cff347692d8a7cb7860d4822112f7bfeb02efb05948ea98c837d5d98dd7a104aa36eb8f016a0f4
+95debd2ed23a23a16a393f59f666cfc864f63751238b73981faec4a85b4c04cfa11520c9e4cbe4e23fe80e86c260093a
+937b4691c59453bc6cf6468ed5b17dbb25496bfa3817798562cd5fd86ab5ee35745991afea2fe271ce0fbe5a990c41c7
+b4da98c879e6b475c540ff2c5501299f0e3e97b7b93beb45faef1253f7de96968898505e672cfc4a3ee7e20c1f72c256
+8ec9d806f344d0c675bb5ecd47c54defb5f059a5233dfb2d459632b9b22edd6c4b8c47fd7899ab13e35f37ede9b124f8
+aab4408410abb4d2cd98694f71b5452e6fab2690daa3066b3f9747e7dc40b57259d52e6fddeaeeca227b733d049b9694
+b85a12f39808961c331038159255140a61dedc56050345a2eb13b1f7d140ae07b353d68d22f2cf60925fe66e598213e9
+b61bc3bd68bffdbe9731f48fcd523491da04dab83add49fde390070513b9ad87a489010f1ccfe6f54e9a48edaf88b5f9
+8f50f6d8235824cf25031f09e4b139bd89c1090269dae95a5aa0dacaf5f9b59c329a5a3cdddf9efe6c77cd61f481dcbc
+91a543b85e18f34361d7df5ece8504d456627fbce65abff437007e9109359538a03996e35393a40f0586f962921eccaf
+b7557bc52931324dd4c58d0e63c89a8dbdd2d00d0baf79d81d7a062aedd2de9dd743ea30fb031b18c806ba03175d7e1d
+8e056b842a9af7aeb6c0d113a3acc8bfb5c6a8980fa81869747f75abef76b7fd20cb67694e70016e3de6e7821cde030b
+966c00fd6472bb13ffa531d8eedc145ffb7733114e0f4a6a9fddb34ab7601f6cfb056460f757636230b692453d8b31d6
+a25d85947c6939547fbee088e0131988053c5bb23aa2bd48ca764f4ef2b29235a817b8918d1de6865695977a95711e9d
+958567f217ce7a6d74861777801663d7175eeeca8ff62e240582fb603ac91dc402331034fb4855632352df2328fe0233
+85e53f3802a7d32dec2db84fad7f8c8fc856037cc0cd4ef9a8988e97ab580d4b929023f1fcde7633828b5e8bcdab08c7
+878d1fbbedee7f7ff72eaa3848d7f6bc3cd13b40149278b3afe5e3621e6d1f0386f8ede32971d3f33be189c927bef6f7
+b041e880e4ecb254f6f8d92635a1ef3be3d5d885c751f247bec2d8a016aada6a7fd2f7c599f458ee466886abe721bba9
+920747dac9f35ba0b2670f82c762a71ee9bfb9e490825fb7ed613bf2548ef4ea00bc01e9d2c952dd9c56f3586a3ffb49
+800005cefda1ddb860fd8974342fe315d227902dcb5f3736f8b9ad1fa2f8fbeff8c8ba0eb3f0c21a6706f288ef4bb13b
+91f2b822b728fc5d1f15b69a303985bab14c08df5e929decbfa5aa5689f3cd93ccfe19ab10499d31df9d38c84039e492
+957a909486abd85b1e627a4739c7d212cd03f2b62952045b704c415acdf2e6c0cc627af93f382836603f33d1a716ac7d
+9733ec7a30ed833cc1e7e0ada4badddb1cd1908bcbd3d4e4694576421c94090a9297aacd7f42d9d305b87d711828304a
+ac2785a0dadfd246fe12b63f759e9f021006cff4f06b2b5a9986f0b02a40f29513feb1c9044af6e27d1c5029b1e1db35
+948b22bddf55f4b4bc26892e83f70b882a0458582ed87fbbc81bbd037c946d833c19162327354240c42e05cfef55394b
+a49c5d81544028d56f4caf8699477bcda589c65f6754dd40a487ef88d93925008dc7fefa6d458619d51a54b3edb5e5c4
+ac57b8ca2d0623f5c4137cada67afd6935fb75fd82567f2c57cb22e89a0562d3c0716d5e903fc06694a8c2edbc9a6f1c
+ad52af6a0cf838bbca5a97aec5d87fee1aec4fcf5e802b8bbad1b110c31ed777de0b0ebf74384bae68289af20e351bb3
+b0c7c48d734e5a1b37674465eb07a629dbdf8f9080c44a578f3dd687261d9d1cc5cbdc084488c745c9114fd998bfefb2
+8a2b2ccd4c52d15bf7aa4a8847b8015bd53f58ee484589339b4510ef08a27db56178c15b4d79a9c6eba1ac0b641eaa61
+98f659a37bffd7a9b7759bb111412ea9e9eec483645511590f683064eaf15e1b101b5eac3b98f79ea38662b1956a06d2
+af6cda3fb2479b6f2d959f2d03e52b49afd12bdccd7a65a1bf6b91e345387924d5e355363f79bbe32a4624287cf4c1ac
+a24d325d8c2dbf9d2e346e3504154018937efb74246ee0658e68d148d9ad0f4bfe348ea9bdca77d4467ea1b3dc2fae5f
+81a729dad3798121027c29e9310d56e36a48c1c479cffe674cbf9131c562f541d7e6c52c2718025d3470b05b67cdd321
+95bd5cd6d9895c775e58cd4296ebefa51ab9e324418208c3c4d073be59410497a4d0daddba6c1e7373abc08e13d32b89
+809fa97a229b056def6b548902d8d90c873e496db6cb1b2d448709b9ae08d9b9762559666cd96b6bba396eebbab4ea4e
+8bcae63cc680494606e44037a3bf6dc7bae2e723e5ec3ac0451550b8ca7914ee1d4bed0f40adc3dfa45f8f80a36c11a5
+b3474711a0f933cf269e97e4e1e98762ddbbf49dd72e468f1e8a2f89514c1c35cb8db32d08dff50f93e50db43bed54f2
+9788a37c3d95310627deec58ba6d9e0324618469275276632a3fa7841fb127c8fefc1b7392064f2eecb508056bd346c7
+8d031fdb156023e185fe5fcac67b966baf9c098fddead4a6f1a3cef54d8e912d0de2d1e1d3f3f05da538eac4af5b6973
+a5efe72b86a714dbbae40fa69fbccf41042e0647d177cd60275700257aa583708130a64b2f9dcacde4fb636b5cbd5aac
+824092ea32eb7a8c619182d926f292cedce7ac3d3fc64f60d00fcd767649e1d6cffc20dd9c1d1c8ef6f64be315d1e2b3
+900ad22d3b63376b1ac80c7343a58df23c03c4e7d6e5740dc10d8cdee793be07fec09cfbdf29e1d1c6484d3077630d6a
+826815005550844ac5a6e831de0e25fadc49aff808cd601d70743d4873a341e3f0cd40d490422c87df3f3c40921fa723
+b39d189aea740c52b03660c0abc8e796cab72193ed44a4b1f59fd1ec0e283ef7d5e157ed23741eaf289cf968597c0900
+968ed61662d1e656e039900912ab61173b49d2e24aa6b7d3af07c3b04a2c89c4516540934aa543bb48ee14153780d10a
+a433b8b689007ecae7f1df15d442b0570664a2db6318de66c6e5fd68884615778d296bd260ab7d07469bfb5f6d8c94ca
+a69ed4a0f39920d1a62a01214daec143fb7596212e2439583df9ba508784ef4d2fe86334f0f9a6b7a3342ec0a72ef15f
+96f260d9cd88757e7c45201d57bd816f1cfd37587ba17a64997bf7716ca1c2cfe16a7119c36acf1754231f303058a9cf
+a51f2bb09d30028eeb0860e2de38094623e5b5514fd5d591a7d4a9731cd4b9c4c12c5dd6ef409e009dafb10d185d5346
+8abe821036140ccb3ff9063dcb5e8b8724cff1cf0784b8f44486c8380fc51715cf55b443cc20870f426c4874be93caeb
+acd73facb964d9012ad12405dc866beb52d8de3ef81fe966cfdb14d22a19bbd2e7ad3a29cf029617b9d6510ed323c6a2
+8f18f6883c8e4741cd6c52e0d3335dd71b5571446ee28e8c27cb0625f77a9f5bd0720d960e5e8970257907f503d58a9a
+b66457a91e7ddcf56c8ce4936a209c69ee53d71236b72ea386f7719c8b8c9b4ba4ea19039a8de17a0a869da427da42e7
+80b1de58bb3ac5f264e0273061f485e49413de604b5ade73ef81bc249f5e89ce97dbec7d99b088b5a2ff65c0bb93fa76
+8bdf276c88f80371ef0ef7e1224929681629aaebc8cba3c0db0b258be3c26cd17268f56369832f564b1679be33e98c69
+943cf6fc88678816da42e4f337c730eb2dd59f8d738ea638a799e8b77214ad7e74723056bae96b100f9a972155885d26
+91c8c1a8a61f47119005869c11edf0b69d0bcf40534b82e46aa96bb6107f940e582b6733f855144accb8dc21d79acc39
+96ba98bd291faa0904ca0398d6c50eb5bc2ab5a389c359ca42b8909f41f4fc37dcedc370ece777d5035074a597da503e
+b4598e6f889d319713a9896161a6c9bd8575ca30c21d3fdd37cff15dc0141ce28dc536f73957e6fc8f6185fc0adb731d
+af1ed593a0547c26ff729c159ef14bd0818f25e7c1c6c51ce8ce5425bd2526086eff9fa3341279daf82e480bfe431230
+8c02b9ad3aebf156c80fec9b012241f3794d736adfbe4a272faf505ab818cb121ad2ad7c2eb1716e252d0a2e7ee6b246
+8d2a8a31784c446eff4c2ed7b004009f08b86c87a4786a0b7be3df36ca9130a0ec42a58d09dfede1279a4a6d3d37b501
+a78b61be13005b1718a3aa3deba103ce71e1ff73163c76815f9cbcc101d993f119ca128a25c51a12fa52f46550c4b609
+b990d81d7aec9fc50d798eb8c38b40b162004f78730e9ed4a103faeea0995bb654893e557e5eee9b74046ddcaa70617b
+ad56d68777d0ed53d3331b0cfd44503b27435278416ac2268965d8ef711fdd819c16ef5499d8d7fddadd229c3d0d4bd6
+b5110140b9ee542ec03c945cd6180ab1af205537704fd408fc4490d799d87a3f3aa0f1f0ae9c8daa55c1757f7bb53cbd
+b7d8a4080c5eeb00be4540a00e65e744f4c7792b518c9fd2dbdd25abd0dd89e76563618cdb92e4cda0fe3ba4597508dd
+a880b33af98cc0bd1065767a2600145e6e326c3cee25602dd22d531c26c4b8543f846fadf679e26749c929310779d858
+941f124078990e03310cacd79e4a38667f4dac4dda4dfa3173a03c14aafbf538fdaa01b940fd5be770c1cde0a84bfefd
+b234e9d0f04da6efc5aa5c77bf71cb05001cd193178fdd546e4ec81875830113d3d4f1512e7405b16d0b3aead285999d
+b857bf6f62c4b19ca9441f700ea6676ffa3b0c7138299533ede59a9b9cf9b94295046e7eafcf1d4ecaf0341898ed6b15
+a2b0d74f17d3387566bb4f17dfef214cdc6b61dc50698fbbe298a7e2f4a82d20aefd719c5e82bbf4ba4fee0e2e35b4c6
+b5ffae433aafad3fd51ac137976e2c22661d8a286b221e0107baf19f5c8f2f6c7eac1e785f145bf7c16a497310fbf51d
+a69e9dfb14f8c6cda716166cb69f06879718656c9f46730d94f194e2888fec371a11c9701071bf8690e57996fa91d213
+a1f51ecd5c5d73155013dcf02b327cdbae9f9c2fbc62f73959050cd3a0bd66192213d1f4bb56a85cd21343722ff3f57c
+ab3e54b8f4829f1115694a4be7d16e8214c94387ae783263cfe145f965705d51943176191c706f6211c8be2699dc79a9
+8cd6a64c5d30149ca4dae4fb7e8974dce1200aba9be9c8cf9af5d43e40098746ecff7bcde7ff84a0072138dcd04c2771
+a52f6fe24305bcff685f2d047c9a8d9a1f70c2b416cfe55fc137c6b5b185029f3644890418873665712dba4886e3fc07
+b2e8e3d2ba2d64815bafb678dfc1180534186eca415bd8cd32b303bbac6cfb637b17200aa7cacb953e656ad19dd5c9b4
+b5412d1073b3b80bf0d18f791a6d02727cd9c40a86ab0f13ccfd847bf4e767b8b79aba3935194398da2c9cf17c6bfc8a
+8bbaee84aca9089585d5ff385dc2ee6e653d0fcb9088f98bc5fb1c6c83db026d9a73d77c33c6cae3268be90805d862fa
+9691343d1a8b7fcebefe2584b28ab5808764ed79d8f28168a65ca90b0094e7920fa43e56b960331209f4b8465cb8a5bd
+8ea475e12088d558f5cf6dea2da71837791093a622d5cbee608a95b4c8a61296255c1545d454562e371ea0e2cb2e0b1f
+951d6b404667ccca099d01328562790d1e8446231d7d22bc2b1c4c6b15785bf59f2099accc58817a06d24d59ff4e6a2f
+a5d012687f341eb9c783c1c2040388eb7ad662cfb2b84cd94d270bcc99116939aea80440d7ab726f9abcad22fcd90274
+818fb57b7a8cc59f06af054ce09dfef812f8f115eb2473d06c8f20fc50cf17423331aae1f843bcae57fe4e2926ad5aaa
+aad27bde8eaa2e7fb1a9a5ab531eb41f475afdc89b7f02085f7289f8f84d172fe516d0104560a40c89e97db7e5e836ee
+b8cd923efac1b09d9c6b1d97a0c1bce9fe4eba1d872eaa3c0df34dcff2e7ea2354f1b31b69c6b266944ec8cae2a16865
+af628e772d609224aa7cd3eddbbfe965fdae6a05cf6d14959c5c26c4806043afd5fef803091bec710c6854ec095ba18e
+b662e1d32704d96919f5dbefc3cc40e7d41d4124c5865b46408c2ee5c40926eed71fa3df71fa7ad349d476d9a525d7fc
+ae4c5512396f9c26381394ff8e22b1d6267e3d3a5d3fe48457450694520c5e173716572b68fc1dc352761991abd262b4
+86b530978a7e549e6ca014168fa4aeda9438bcd3a29f7edb1f4e9c712c16faa58b81b028c25a8e90b421b61a1766d7d7
+97b32f1371f76dac7a449295365780d1bd03f290a041b3d19db3f14bee6365a614ca356e7cbd6f966260420b451f6117
+8be97569ea08d0b6c4d46e9565ae14f79d1990f192a26ec935a865cedd6bb5f69f608b069f7d645877c5081fb4a68c54
+9733488f48de05f57f623752b80b37c91f6c9afc0f9b4df4cf400f3f82b137bdf06fee82190f2a4ad4aad20e964cc214
+a794f6dbf155666056529748a792be13011bee6ca10e0d55c82c3e84c5dfa1f370c8e8abf2971a75c73a4ddef3da3319
+95ff5d16c0d9bd679738257a1f7f309f257c20469f2fa41bcfadc671ad65acb249793defab591f515bb3d8072e2e05f3
+8d849150bf8dc3452839256ec4eb65cc9ef87aa0f90dfea4d1d486f16ee855d6c480a8fa4b6cf8d536e435f9fb7bf507
+b61c29121dca2bbc6024ad2f487bb57b926786ae60a9e7a721440787752432ba9c7e1df86ef0d74c2592d23f0e89326e
+819630a678e4a5e6adbde9b292f5c8f2b6e3f2ecc9bcec60ba0f8502e503f697b0ded4f0f7157b60ddc976ded66713aa
+b3525b071e26babf669ae2b98319b3516c083e797d74bd5b9b0e1f67792a2e8ab2c60921812690b5928de66290ff7b86
+a344c6670718b9824ae62b309813bd31984eefb5efee38052cd06812308edcc39fdee165f8164629267bc0e98fb50ba6
+81d78d54738817dadee7bf70a468a51728de0e9775f8779fea5d0d95e55b2004377b4e2db595d420f017af18a384d9aa
+848c97b9413ba6ede751ece925ba57b8f8ae27168c5d46347d39e0232a5eb42069a85f1ee2d30d8b94fde574642be5d1
+b020048c5a5a2d186df628550c6f61a204f16e6eb991283e975de520c4f916badc999b3b7e9402ccc39db5c0b510e2d4
+9298c1aec9664ab3fe328f532428e9b037efe8412ccfdd15e33c9c82dc3631e49f84e0d2d75dced85e3a4e0fd0f3f2dc
+8c4a78841f51e2f8b91defb0a3844933999f9884e2b324bd89a01e482756758b1b5a278289163409947c73106bf934f7
+b328a9db915c4bea1783218c7668e2bd7a8fa62e52d3a005a43590041d34ff388c0555b044ec5ff85368352a3643b7eb
+8a395d89469d374c1ec472c4d571ae670849549d05124907faae5a086519686683c1773d22d290ebdcfb8dab926d10b5
+aec52b8a883f4ff68fa5f418cc91c8e9d08ef324544356b0ac56a7f0980fab6b376b8f567e357ba96b408652b8e568ed
+af80f0c5d50ab23d8ad99c7fba504f2f02b7307b5ae5ff529142bead28d69c3d55f4e2226c44549548fdf761ce30cff2
+af73700803caf7b06f5453a620253731de33a458da01f5790106e9418fb59e7aecf6fc1d1b650e1c7b3456f7a55d4301
+8be3ee3caa86cbe21ce9998fe1c0de73ba6481125ef28e312002377676317b5ac4c27180086fb83794efbf86438ad27e
+a0439d051d06a7fbd5ab83f32f0f95364bc043d9d934ac64df7031223e731d7992206879d567e77f35badcb7623f03fc
+b99de1a16670fbbe3ec26ccd37399e2a23c96813c26428deda4f74dd3afdbd28cbe47e074379f6094b85176f8ab349fc
+8a943a039aa33f38d3887de4e77566d446e87225bb8333e3ea991466c15c6487077c6decb9cc10e5de6af03e6b81a10f
+80b109fb49ab810121fd411e4cb85773a1004af2d257e85ab5b4c99aad8d66e5803a8ca7b95587197e88abaaef0b8d42
+892148bd190b042fe9b7914b8aab073c0d19001158087077a5946690dd60d99a1ef372ac01e372a434d00b0568a75fd7
+a266dcc9ccbda054e396e1605eabde6cf79a028b697898090e9f34a4a4e0b771c121b8d470b14130a79cebc19f8d6e58
+b1ab30b97c76392712b173460c227247cac50597c036f674361c63c3638a4c03420fa5b7efdacd0496a9b83956cf5d06
+8a33c46084f669455ba089b369b9c8493a97c131f09c66f9347873504f35d6b94a09483b2775656ab32a12c7b9766ab1
+b77a7c1402edd9ae448b7a606ba2eed192a9bb8f852b647b6ed689b0a3ccb81a4632edbca4c113750f62643a0626e2a2
+8586e85e3bb07b07a39ecbd822d2adbfbf1fc66cf2377fbe6b1bc38369f86292c6cfdb5b405a0bc4d584c0600178321f
+80cfe5b1b032d5a28662d13772fe112e9b73c997f8ef0fc796576bb39e02189c3ec0228d192c981061dcccb9dd3c4f39
+873c085029b900d1fcbe93f8789d635e3a8fa558766701ba9fee76dcf05abb6cef518f2b56c4ca5e26f3847cf23bfd72
+ae8075937a23505f51a1a26f7f54e35caadff44ffc43465368daa9c330b553cb4548adbdb04e24c3977e35a08841c36a
+b1c7076afec527912f7648bedef633ea0e3b02e5fc3fc495779b93e8a9f64eb503f46a1372c8dcd8fc2572c198112da2
+b5233c4545bae360b07c4411776218a1d9040bad1e788e099f90149c58258ecdf01dbf246ddea48ac8fc2dcde6f34f20
+b62655a8376ce1ca225dba04cb29f1a95d09e1a20b58f0330c478c6acf931ae52268779d6cab87d9074a362b9e82b205
+9684e676088b409052773bb740bd3577bf0dc15d0392ea792393a158e643b165f8cbdd91cf355d5425682c77f2a91f34
+a892744cc0c428c97bc929913ada86c36f280f49bd1603e21bf6b6abf8ed195cb05b22e586f0c841ee02f234731985cd
+a62c089a73c6dcf3f7d957719c7d452962ee851d6ed8c4b57ade8a1e57156762c348fe5f20adf6d6ce47b4e98f93d60d
+91b29be6022d43937df9c597d19e23cbb83cb6f5b764e1f7db6cf60dd9b3e9c79f1f617c3101c60fe6c7af9b5719fd5d
+91d13fe99d7dd7b4744fa2fde41bb51f4edbefb2189ef3ca5d337ee84ca3f728e300aec19b96dee18aec090669c85400
+b17a5328808ca929b794dbf0bf3a3fc318f8df144a892ec0ac2163a0f7c3a4614d7ec433b66bc491c05a286fe986d986
+84a9e84bbecfc2aaf8bd623d79bd4240c630b81ecd55a50198de21758255207238179a345700e65d9bc6eec1a1a1985a
+8d428be451efbe630740449ab3677ce6f69d94d75c5a9d91d14b2493a838260d6418be3d4658fd15218eabe3adfe455d
+af11126224f6ff0e88a09dbc0de6db3c70e3db3f6e154deb448d044100f989ea41c6c0259a8ecefdcf531f892a957d82
+a51716b900a00277aa932bb03fb61eab3bd8e74edfad6153a06f85aece6f832af710f1477d883dd8e48931deca12bae9
+9542a82039c2d3c538f15da884f090622c5af556c16370d21bdd6544208cb17e0a30e511b0af4a618e8ef70d0c43af07
+af76f93250bd7bda2b5e30e6f88416ef6fc8ce0cb614515a1f8d81dec717077209493cb47b79e8b1a62e09e394038338
+8fa8d657f1d584b06d5bf41a52bc2c73853e4092290789df04eb8952c6eb236df601a1c6cc81de420a424d8e748dfc38
+a6e93e27421b9e32b170d240b4cf2710c97b49dabfc0ea25759c5f61937eb3da8d45a6400f8bcfbb42bc9a7ae9b66ef1
+81848c8d66d34d274b21dfc10bb36fb9497a1b152aad64a8f7c874e58d31d5dd5f39e30e6000b6d7b444e573da1e043f
+b85692a84154f87869d97cb5f16c81fb0559e097fc37473bb11dc9cbd311ab91a46b01aa9debcada590992c2473ef0fe
+b565371692ab0f0d899d8139d3eaacd213e7d23d6f5df6ac3409c961aca019ce861fb4ca8317f462be01e8c1dc7af154
+82ae2bda0228d36343f6153fbc41fc5c79fafbc03c99a7926c624dfa28ed0a1d215e11ab83cfd438fe5d85d7fee50363
+923f38a2f839e165fd197e1711ad52673deed9774e0590ff63ff9a9985f99612aabe003b9a98db2407c2878abc6d9b0a
+af8d5e1048de3b813308544705eeb0facbd604a0ed03e66c1d221be64cad35d71748d2a55d1ff3049e1e5053c7b1f712
+a90a4b3b9d3b7c87c34f85c7643fd67dc771caa940c9e2ea81294ce6c072eaed698368a0e8056d7b819ce3d73de4424e
+93a106e914d2c6892fee866602edfbf8d03dea1918d82d511e528b99c8423c260c0d103bfaf9992e0e24638b913af737
+864cb44b1adf5a59ce7baeda0ddec3a0ecedd42923205dfabf30dcdb216a7b760d8895dedab52ee09bb09e999486b521
+acb5f2bc1257c49c7df89837502e699bcb9652567c1716513f258f021755092954f2dc65b9766ffd9a10584bba424c7c
+86653b3a479bf6e10e781e316e61437af1abc988f59399bed8fb4ff128f5f6d53f50a293da58774acd42b8d342e52429
+926b7b90eb7d81fdad2a8a59e13b1573970e15c10515954b7c232c37955755b6758178314439ee6c3b0c881d4092c838
+ac05f011011a354f0e16fbbfb7e9dff03b3cf403dcc449eb5c71067128e314badf4d4dc5dca4b8616994ecdb15909c93
+8e063c6601e553f33abc64f9553db5a19ea794a1f254d5a5f7b8ff2db4ed9d180f68ec919a0f83142c5710813baef4a7
+b6e891dd4d44fd54120b7b8716292c27d4bc8744d96253a841433cf4b07895606db4a3cc5872c480616b863073bf77e1
+8dc623d7928234bfbb8cd0b4fce5c8d9a9db848ab0af967ba9c49daffdf719cf8b55e1dad0b7e421571b8770cdfe9df0
+b5b53f7d6b5d1af75e5a1720281feefb8c9039ef7f1e1969d83bed5a2f73cfbca91dbf4fb8179d9b0d3bd06d1207089b
+a5dbce9e6db637e053b4b4d3df07b724b50d11eacd3327ddfc5aa8f37b9a5bf628cc9b428328e16cacc552c1dba505c9
+acb82d6c9af9af0dd426a07b1aec81b388b61042bd601546cde248730ef85a09016bdc66dd014447fbb56fdcc23011a7
+a41692e96f1d775b3a9378b3634495a8350dcfa52b4b2b7773b39d36f7d349fd5ee9a2b3e72769ca98f2319319890216
+a0b4bd6a68ac5735539cbbdd78ee4faaef7d6488eb7a11e091d94e315cfcc49a90f204f636dd8033857378ddd67cc153
+ac3dab32427b0583159482f73f94236980d69f9f8f781b93f44aeb43dbeaa740c77898c38c57677b42c248b9bbb1d673
+a6cd1090b97826486f59a056ed90cde29f2ed821211391f2f16e66f1e8914398348cf6f0df6d3acaadab31f0382bb5bb
+abd1252b722aa56010e3bd4119f2a28a852e9ac1a8ce68c96b6da9d00fac0c9fa70e67cd4afd45e0a8042a810b8e0a91
+9194b629ca80b3bfefc0144553017343d0915aab59faa3d0e2bb3720dd3c8fe07804be6e582c6d57c764be96cd40f2c9
+b6bece03ae1c5935eb38b14f0f64d9d0b4410c02ac309e085a233c74bc3e67ce63edea56ea37f4532e8b864aecacadd0
+b753eb9184f5b30e77bcb5d3487323e0f1178f1ab3e15130953381272209a97c3e8084e810dcebf1ea7b22f0a90b9c77
+87dd4a76955bc98326823cffd653fb7b7eda5df1a971b72ec2a4d25fb3958b9d6092369539361069e7e4f1dc9343d929
+b0f1e8b25a2687d98cc037272473b4e3f33cc8d49a3c83a335d48b8a0d3ca5f84e8e2bde304ade6f7d50e5f3539d639b
+afce1c0205adad1ce52fcca71a99cd6df9da5b748209c2ed1013b5b7d484b937bfbb26db9e9f8e77c081e0a0384114b4
+b363d31209c075b94441d1a8ddcc6bcf9eaee78f8adbf0992d5c7e7d638a02d58e19203247443c35d700fc8ac8a1b7ef
+a0aac7dbb08a10f6cc2c6a4d37aea6bc3dc034d933f49de3dcc79bc0b7a011b1e27df7cb882d155287436b72092a1da7
+86dde01fb7090c80fb404afdc9ec64ac40909b64c4e16460a4c862c3a3f857ebfc0c3122250306c266cb1e9f9f245934
+8b3ebbbb0ccc466c72afb4c27ad99d2d4e98b5aee9c05bc283ea3332e5f67a3d9263b71d16b20db31ad4d8f48174b0d7
+8610c492ce130e76c06b7e0204617087ebd8f285cc3f007897c253a0e1af50f80a825ea7fa3167f882e146402fd342b7
+b17f04a257d3142005b8517dfb57d28661604eea9050ce39c60ba9a05d23897114c59c55af199ed186034e456e111cb2
+a04cd806847686ffe023db1721fffbc26160582c239d5bdef08f4730e2fbb64c341fbabf1fd831af6eb84a113ad7e2f7
+879018340deed1fc762e1b8f3a8b78a40539d6f917215621b725c0a3aa347eeff60765e5ad6f4a36bbea51ab77f88726
+b421e65891dd0c6641e8ddf479b065163897a418d723fc6dce19046501e01c616bd19c9d5fd6b395e65abe0ef956d53b
+89350af1d432a8c209b69f937d2aa20a24d5eb95c5b4cec097ca3dbbb3ea9efcde2a8c56c58f8d7901b96a627c45df9e
+a32d6b31cc9efbad4bcffd8b0ffa46b8fa97ddf3453ed151d7de1d03a02cf233f07415584893155d2d7e14b9534921d1
+8efad47caa32277eb04137c92def618e0715c1e77b5053b0cdd60fa03256fa1c9fba9aa86fdf1c04cda9c5450863d58f
+8dff9d309f7294ba750158e70474c978d1dd98739df654945f5f29fedc607caa06b2866c93a0c7b830ff9b26955833a6
+84bb00fbaa4358a2563abf96d2434e4a26acda87b189cd8d2aabde1323dc1eb2eefcdaba3b90e9ad1215ee469745b72e
+b75acb924159ecdcf49df587d5ac1b1b04291600a4f530fb7cb6231e7fd1029f8cfc957c891a59182518480c2947f472
+8d2c671ad0d442664a0cf267b39be742b1d3760935137e4c50195695bdb99254c4a4d5830634059d96dfb2b4e214b067
+ac27b31843caa8140e729a01e7d0229d7c221feccc89ffc173c11a419af3db0f8a47a41cac358e15ef41f679a3f0b96b
+b0b3e33c590bc00faeb83f4b160748fea4fad3e21dfa324bc14a138ee8c5e18743b6bb27cd0ad7c7c28c2b3e92040b0e
+b0d2882c5a0a21fe05b522f2e8a4f43a402bfc961874deec962a1e3d039e411d43bd3d95a26d930c2509aec8ed69e2e0
+aded1e47b3ea6ea7276736fbd1896297b9ead21dc634d68ee56c20fae3da90170f30ad0642be10929ecfe7de5ad8ce5e
+aefe525c0dd24d6c0a66b43ebc6403ac75bfc322d1a22f76340948cf3536d2ae87290ca80acd3e55d2df9aaf0fe6bfcf
+979d1510d3271ff1f06d9cefe30badaece436fae8de70b01ac843850f678aa5f48821dea48ce1c363fa35eec37283f3e
+b8e8d10692f1bad943052fc366291c134a0fc7ca4696feb216aed46eb32de7333a9ba4f553389e7e58c8fa96ba023f58
+913353bc585c0248a54d4705b5e29cc778f304472446eb4baaf30bafa30f2ad0643aaf21196a6c4d177b11eb4e2ad5b2
+b25a0e3b9f983c47b8faaae8549fa7d00d12d7145e1b232d1813ff94058ed603957a340beff25711075cefacde767661
+8515151729ce9a7984af3b94f74880a2402ff853b99f924d581fd3935d8ecfc80e2a1185918a5b1c4902106bd1561ff8
+88e4282ded5e2163874f6464236d5bdcc3c484a0fef8ed0da8d0177973e8175432b75afcde2a4d7d6aefeaed52fbeaa7
+81c31113f2a5ff37250f395d6722a43cebe2a267a0ee40ac06faccaffd7d6eb522103f0431a325aa46a54e606b14de84
+9302ade30ccd62a803b9610a397661298941a644b1ee9d293c63a6c3368fa3557dcf6bfd0c9b44c5c2a6be06d1baf663
+b4ff9f1f6a2a64c50b0a16980ca7cdcc297c6f93e11c580019de52f58381fd0f60a66d3e010fa7ab56bdd250e7b2df2b
+8e57eb61ed3c919dfa0f0cbca2cf559cbede5bbb1e89ae4849b380339cb1c567c98fc2c671211fff4df1a058d46a42bc
+b3d5b45b4096eb088523d16bda1c6aacda01473533314961e6a8de36ccfb35d4b717eeb1ee1bce47ad3b80e9e5084d4e
+b933ff4d3c5a77cd7cd32926266d4f05198178ce350f7215e512e71b07177ac1ff89ba183e424138e1fbf088ecf86c24
+8cf430a6e4eafd23bcb5ec8ca3d711bb56ae719c8621ecee964ef3bae7c53044f7ab3d5d0b911e09c7543e56c1e82e11
+8b3c34f5321c9ed48024196e1e941fb7a5975a045a5a9de88d7f200fc7ffaa0b3e500ab7b535e02bc5c35fbe420e2c3a
+b3c235b65fbdd5c4c2aa45271b9e51674f9a0383a8ac383b0de53125a67c87261540a95b8f81ffe67ecdbf3955b13814
+aaa93ce79ed6e7084fe906c9a1002435ed6829ee3d1380681b902d35dc9e5a23a214ae12dd4fb76691b0016f28d43651
+b4c9533e50ec58f75ea82e2aa7f735c4257bdc1ecd0da0b6521d1442fa61f19e4f73cc90972b47a762f5cd9af591d957
+ae0255dd70befe7eb979d41f9a7407040937e7a879daa64353c66d524d3d3cf1d5e854886a6c32c142f4673c56a4df1d
+805fc5ea840d1c2e6b35ce586309698530f056b41de7a403d9e7d81efc2d7068976e8e23bc0b9ee256f39b15bc4f7ecd
+a8de5055b6d2310b6ccb211a397077b211683b05c7e68e55ff05b546c5c81522e6097a3c3b4b4c21fe06667071beaa4c
+a4014d39b23c13efb4326956c5ee476b1d474663950c9e3e45aa1345037be862cfa14aa1d03bb388085bdb4ba9d70a59
+aebe9a9ba34d6cd3692a8bc0b0aff5648e16b36d6c123e636e9260386642e29d52ba71ef7778481c1b1cfeca7fe6acba
+b59706380c9271918ee16a04e84e91046caf99623a0120aeb37a7a98d4c954d3d880960086de6cb180c8b922ca1d7405
+8dc0713371808850f2137a89c33fd55ec2df6a028e22b2679e09f7084d5c471451187f6488fbd9b5100b84593540e5f3
+b492c55e470c35c7a7efa536f3e7c1e586b623c6669ba6eceeebaa1f81fe3b8b927c2e522fb12e603ae246d9566e4d23
+a5148eadcedab9ae08f5db6265326fa415aef46d0b24155910210338500be6d77bc9fa6f6e284a4c2552dac09167e450
+a0af7b66c8a1319ffbe7a0180795b442cffde153f9a871046d6bdef959378c3068813c516e280371825af06ef2320b15
+95479ffc4903f252fe58632e833d63d963469e89744d5c91315d38eca21b98f1ad6fb3ca77d620a6f97d9ca3aefa1f7e
+84861bdb5880f663a5d9b5e89b59a940611a233d82a9895a330464f7e9b7a6965c2420704f3adc61f876584d06771f03
+933c374f176381a3a63fa98d238d3b7d337aa745528e271168f5b550fb703664c3128097b927b5922b4ae8fad30d5e40
+a3ed2c5080c52ad1235fd93c9bbf128b48ba8abe364247104bbf298582930bf3faaa4f4b6103062a4696e68c44f79555
+94668bae91eccfa8ad459588f927bd1a169af834a76132b2f2d5cda26a91094cb94661e3c59f7547b290f827eb43125f
+b704404a487a7dce87ea8207dd5d813378a345375e8e2c07de349c1448a39af8672bb4436779b3485adc46df2212f409
+9347dacaf6dd678574a4f1a95df79369e3f5543c565b1580f907ecfd17b5d6e1ee3322d83601cbbc6d6ffe0bd2833a83
+92841abd813bd9934bfe945e428193e33ae6d4dd235a16edfecd6e4184abefb8a1f85015ee83caf9532dda380fd678b6
+95c14a1d3a1e1ea18f8a61f34b85ee8a794c95d3b4b0ce6ffc89013c9a80291a9a2487b00bb3de51ca2e4290fead7482
+962fb52a2134123ca31d91027fe9fb62dff4e0542c66b55899a163e50f6ff2c4c4b9c1f5b5b3d6c6dbda40e757c0bd3a
+8aa06ae95b0ff361dea2792e465436d810b86f803ba6121ff93fddd9ba60ce47e846eb2d248b28f2c47bccc9457c1ece
+81adde02ddc49b6cc89561716a839fdee2879c78d1ea0fc0418a6cd4a2a8189a2bc245bf2d1e535dde07e93b8a5e18c0
+a7a5713055455728d6d982a6650d1edf1a3b4612c9072ee8ee0bdaa3992963a6fe91ca242fe36f839595d09f6a47aaa5
+93900cefff6f918dfb12ccbb256adec89fb8da019324b811398eea03f6fd34f28a6eac2ce5580904cdb289879bd4b4d1
+820262cbf7864213e768b5a38f39d27dcfa7baa5abca557ab575b07c33917f7b0f06f0a6abd81222fe8a5a69d95d774f
+a33114d4cc3cc84258fdf252e754c8bb1feb6a130785d35a78b4b05d0f782424a5ce0f34be3c1a14e3bb1bc0246bf0b6
+b966ca0a11f0361e611ab2a8907f78a3d639980cae405d380f3a080125c734059acb08431a42ef3a60ae9331a07e6a5b
+9305d107311654ee727182a1683f322a78fc637bc214eae311f8778773e5bc52063bb0a902a5a962a4a26fa0cba3b06c
+b3dc808231c75e681aa2bc4358c41f01e371bfa5bd504e7bd2282e35e72a2889a51747cc008dd4d8b2a070c8e4c2d7a5
+8f05cc76848367abf2020461b6bcc1ecc412ae9f114d44715875f25f34d8cd26b84b01fd6c0640648676b8d2d5120814
+8798c23f0ca8a7b23152ce17086f31e2a80533067f15ab4a7b43c127a5d8af3297115a3cd7978ace811fcc38805abccb
+99a917f54253059a45103e15e92e1bbdb03e80584a85b658f231aa5947b29388f5b04588de1ed6de998741d360015313
+8b0ce3f6afb5aa83ff229ae1ee0f986ec4d31b113070c7ef3c1ca3613d74e3f23cc1cc81957bddc709a5c5bd85cc64f1
+9035b71e4cbdc7c410fc03a85543aed34a1c0a98e07ddc933e64886f1796416ff3a0f7754b5246ec93d617aad0f53d5d
+87478f69c45394f94c67b7196f60aca42823ad92ea86a427d705576fa6a9bead40b1a4106767b8a20411e757f8762b68
+b36901adf577f159b4263821a48fc5888e7bbd6c9f3857968a9cd02e1a1a788c08a566b7bd5bb6be294fa5ab92b4ff6f
+8a738b1392aecb35a5a1f12920522997c9016a0455354e41d2e1b81d8ec9b30a90f71492c7bc122505b2ecb0654545ec
+a5a422515f17f2bf4b9b6c4b5b94df27ce80826cc3ad2a8579eb6666c67a96355e60bf227b36e1f082d749ade7a38a92
+b6d0e36a98e0518b14728bfd79db76c408f58220111e8c4dbf5bcfbd7a85bc68022456196f07b9f40158037a3c3eb90b
+82ad91b812d08bfa815a93b47bd3656b493853bad52656450eb408fc915e430192ae123fb9daf4aeef4608800e818b74
+b8ae5b30118dda7b972464e14a96853147c4b362e9cde22130250447575c0d8d05053202db4c650467dc16330cb54b36
+835d913a3d15ff205497b98107eca77058beebe1aa35ffc20241bbc2a9b4d2019ba41fa3c9b43fe2265a1110b5c2fbe7
+a283d88acbddb50983356f2aed99c2f153b6a8f489b0597d8db08ff7e3b04392609e01aceb37fe985f59773327258195
+b6927dc3318931eac59c6e21def3ca79154beeaa4c57e11ec1f3362aeb33445366dae770e533aaf33c273eaa4f54275e
+a6033a62119e077b438e0170f27835597e21c1d6e4acbd53fec7df69bd1372148f90966732fc5c004857cdd44b8a03c2
+acc764a116e31d63f534b3e0e42a3f899d817d3ec32fb4504045bce7ba3a952ddc81a33d48c5b0499eacbef4268bd5ae
+af5d1f6a67dc6361e19f222a24163be388033a3fd0d33ad204f4411302668436f933c4a91c6472fd4262397417e3c588
+a2b1fe93eb481d4fec6fccbd64945a12cfeca85aa8b8bbadc4e4ecab2f3ef65616294dc168d6c955744b7c6acd712012
+acb6d3e123572ec20d0ecceaf4916401874f0298218b36a0ce089acef90329204611968c7397c2a518c0a78d02a9285e
+88e4457b1c9b56957b76a08e98c569fb588b081e0e420a0d859b70296f648a8d64ff35ca61a39d1b8ac3613ea5fdc2eb
+a7d1643b3bbef49b2f9fff326061cc27a7f65228e40929562de73e1c66a9d164d42bfcc3dae9103b2acf27606f18b031
+a66e3b97efb7ce4e81534453d3d41ecd4b5b6e9bb829b07b5afbf11fc6ea30382a0059c33c97afd906656ec19432830d
+ae9a17d0044abbf3e6aa2e388a986754d6b0fa35d115e410f69ad4aa114db1af5dd0389222b838cfd859d436aded1b5c
+a4a66a163365528b08333f15c6673ca48d7a9b6d17822f1e5390fecad122bcf7ec5656eed2f22fbc6ccb6dd96ee260f3
+b7dd42c938c2ec50c3b3fde92ff629a571e46f8ce128fde7c2d8f18796ba1b1d7eaf7337212f55cf5cfc540c7d2dbf31
+a36bcad22f3408b3bfd45d272f3387cdfbff57e014226dcd1db54bf3f8d1d896fc4fd16640b5d1484c9567ab9322a37d
+8c9831fd5f74ffac203aa6b6ce03acfde8a2fd939b79236a01931d28b424fd8f6b6e44522d28e086aa12f0b110e5688c
+b48bc95abd331d901610335299580ecec02a263d2b03bb0579cae3aa87ebf5e93dd110e7fa4306d31974099fe6e8f58b
+a15e27a87bcd8ba69ebfb6228c3c48e19d79b22978d3a63af553b3083ad13e48dca496896cec195e63b8a4e2c40cae7e
+96f3de6fa492dd2d653888311bc918ab832d6342dc7af9155bc7070004e89ca940b7672dce0a1b4976a7c3018f13e49b
+81a022bee3593997f556ea53e2ee484188cfba0be4b831ccc048ae4b5a6df9e3b4d57c436caae5cba92486abb71813b0
+b9d8e46df67e481c84d5520a9613aa92750c8e8a1e8f376b8ad7b71a3ebd95d2d191ce538e6f7fde3ac5943f70c670a9
+8f0b52365d944f59d2ed445b6ecc4f88c687fd281c1913912c8e6075c3a59667060b42f2c1589a5955e9f3791e23aa02
+ad07429bab813045fd909b928ba4eaf262b6ea40b353aa43157e1e683b2752c5bf19eea7ab6ebb8daa8ee91241fbe84f
+b90a99ec1f31c43060ef649e047bf24f2fa7fa9daf904136c6a5846d9479966b54090ded7093e481c52d872c6377eb65
+8cb05fab3ee23db24c9bac109db52895b200dd115209bfa41fde510b29d9871907d44f689fa0f5474d12314a711f6fa4
+b00d8f280ee21866b01ba3de3bf943a7d0825ed67db03d13a0b69f54a4ab389df1cb10909e831ec0af8f1675fa7dc399
+b383d14fdc47df80be46390420603e7f505052b1a44ebf595354726f2b487f7f18d4243709d347e1e584c28167a0e988
+aa951f60d1e069304222a8eb0338a94c8b3b4515d7cee833864b6c222ad76f6c48e0346c5603c35a3b52edb6f9381911
+b887070ecae2884109eed80ff9341f5fc514d59158f5dc755ea46ba396f6783b8a86ffd2fae4419cec2ed57f4dfd4327
+b1a6f1e4d25f4aade76714e52bc426beaa7592b975f07d0a6b372a3f94e7a3ab0e8829575bccc953195ba0c9bf46e68c
+aa64bc4e0d9502d294f0d3e6a1400dc38f28e87c85d3429ab3575c821e1229f1dc8e2c13f03080006bc897e8fc3555c8
+8f215476d94bc2af7d2e0eb68783292e314c9a4f812f3065cf064f427aae165990dc9665011af502f5713f3664317989
+a578c8991e9e29bf3ad7be44bce3817e1c4af3e4a8ba3d82643378da78538787f581b9caea7602b87619e5f8cfb337fc
+abe5453b650106cf65bf2b7faf8ff973b7b3be0e6f42983daaa5359dd4ca225edb7228bcca3d71bcb8d77241b320fa90
+b7ed1d027dfa91d0ca5d797295e359bdb1b0221b1f5eabd2ef76ea3bf456f9aa9788dd00ea24fe0add9e3d9b09ae2428
+96ba0f0c5ac0eae3f0031f8b7a87543ac369c22122681cade0ea33a6ca370cafd360ea6b80758476ab94cb07ad6820e6
+966f6191951b998202b8a63e3b10ece69616b989e9695cda84a450cb953acaf9c4f902200b7492eb66cb9ae0cdc8ecf0
+8d7bf21f76ca0e3b3758c293e66e977f83533d918dc445a09f4f38975ccf7220855627de6460d318290daa03a5f5c68f
+b10dcd91d6602852783bb76b0a286523a0942e8eaaca4e0ee5bc76cf19d33bc631f6d0fda1c1ca51bb3d5d5c7dd43728
+884d502d934e2b045357e981506900849e6eb051ca3ecf3079b485b348372496db97da384f8d2b5a52216b4d223c90ea
+b074162e5d33171477ed48f2f185b1c83e8fc2e7906681f96ed97da8ee86be7476d65e61648383c2766ad9853ead35b5
+90bd3d8b475da20c6e32324e30bab475f2059cd81fa67840a6c831026cf3d5806496a3a25192128da4b819c1b7cd6bd8
+8da4889258cd6ffdf1608af8325230f74abe6a2a511872c2dd10123b491cb09407fb979d80fb1185ebedf421ba22d0fc
+96fe1d9137c24fba18b1ac431ccffc01ef1792623bc334ec362751b7bac73c4d4f7e9bdc2d595ad4731c71808adea15e
+ac816ee0b9103f0bbdb50cc05f9c5c8f7ff2f14bb827541c51ae5d788f979c00fe4796b86eb9e3ba5d810925c1f34a17
+b231e98ecb3a534dfda5b40916fd4fda270e316399c9d514dd510f0602cbc29e51c5ed60107b73e3c9721f7ada779f91
+80115e104f22ff2653ba7c4e1cc417dc054663d488f861a9bbec4b9e907dedbb985e6e78f31dc16defa3aaf4f88dabe8
+a0dbc25dde933e6114f2ec22445f1e209836585997b14100f3f8b7e62f5fdc6aa2a85ba5ec39a5197c9d4dabc9a5c452
+8d2deffdeb1f0abed8ba62187f5e1cc06a1e2bc49b3e15f73c3d8e574dfba7efdfb762ab512cce53d7db790a7354c56b
+b73f4897e221927feedbbf209e3d5b9c08f52bb732dc0d710822576abb7ba5ef0e728d2d95c802a00eba925ce99d734a
+970761c7ee891b3ed08253d2c0d28478145d0776e2429c85b4734e5eb7a6416d197d0b1ad3392b37ce8d86fcaf9de7ec
+b4c9e2acb4c05236357be37609abc437612244bb4421d69486050e390d5ddb52887a1b3e1bfe968a90f1695d892ba8cd
+87caac2c93e192c34b5dabc36abe26a844a33bf63e9b01a668c90b70701360a0417ae3248173450c64034685d913f4f1
+a16ac64cd1a7ad46cde1c93024fdeff724afe228818b72bb66176c7daa090acf58e7fc0aabc582ad22486e46f0b96c5c
+936bdd6d67d666274c29765690f4ad9c4b9203e9bc9dd5af558a8d908dfe8d6d4346f6fbbfa69158cdaccb0058ed0193
+b39af8d43ce9d120497888fba0dc95ceeabdd3d84421c1a30fea226e03b78cadca0eee57db524f6ccf1f6235fadd1470
+847da75509ca07fde2277aac9e7622c5874256903a92f7a56382ad3f79d1b3b0cc0b06b2a6b2bd1749ed567e68816d31
+969407bab3f8106a49be63f17ddd603e185afc1c9fc0ca0e90ac415f53923e3c6a69fe488d33403521231c5008bc11e4
+82e25ef35abbd9b98c55a45e7a71791925639afd92780e64a154ad8a94e9807f2643854250f30bff1c5e8806632778f7
+8e6da5cb8cd80d6b8e2321ba3f034ece1813a7b6ee3afac73371a51434a3e66221188162cd9b9ec035326e7e04e74b25
+9868bc3e60478fd0ce37d35e0e4f7695f1ffb7cf2e05842b3a09e832af33c7ba48448935d425196fdaea9c3e8a5122e7
+ac7733adfeba1da388eee6540a127d0eadcbd23770f2deec39edc0bfb1002beacb9a8c7106baedb22e664f37771c1410
+912581c23e3ad0d7eb886cfc22633fc704e530b6b4977086f68f1d9f839bbca3bf0162acede87c853e8ad8137b5cf345
+a0315fee6285a33d4ec60f6c1557ebe4473e8990ade0feff7e008d3be1a709f5f486abe784398734d9ea1193929697e8
+a44a08d6fe0a22849a8f518ed9b30b78367de205c3301fc8159ea273076488299b35c362530436dbb7e21b6b9f36835c
+a591ea6ef83f2ec78a402a86ae5b82e330998e18ce66126a89046f169dee58634dfc531b1286277eed49f571df5202a8
+a60d86619b41f59b48c800a302775656266725b44ff8318014fb668f331bec82b3b543ca848a7d40b2718f29e5ce6cd1
+9420d0219d407583fff43c560964e1da06b105043187ea156771b1e4dfb5d5851d06fcfd819c7d8bb6568fa1bdacd916
+97ba0b6731c78eed331530be7cc374a7f4a7cb2144ac73b7c000ca36036f68754d4edccf73ce373dd6c6be55177d89d0
+b4e07b5c1376900fa2dfef8fd1a5a4b6152df7b805d5efc29057d1df2343f8bc841284ed23d2bab5cd1431fb95f71b60
+8017de31e62a24bed74460dbdde1717f3a9cc17e2e2ca9848d77c3b5c364e7e1d58ac0eabb3daa2b7336edcc8a418b01
+ab6e409231b778bbc1ab74c3062a376c5287c0cbd7d19d4ac1d5da1a8d0571864d0723944da72581783cd7b6b0d529a6
+b5f2fd4ef29a2ac847358abf2b3e7a3567b8653a4b9ed8da70809f2affc6ab44c65cd17f255db0cd8315e4801bb1a408
+91b61d5d047e9c672d7312f563b8da90d9c2c1c1268913656f061028748a351e116f524593b1be7117a46f168b3e829a
+b6c10b09ecfb92168906191756cb824694caa32c6f2f9b19c51658d44dc330dcd344e7b04333392a8a93c73346a3845b
+9431d01a121e6ffa15c32e724dadcebff65f806c11717b050c106c0c80e43e622130f41224533d13be4a8d14a66ae1e7
+a1248085c85855b4df6eb5a02df0dbd5de5a8a82656e1a5f61214885fcb75428647c8545a848960701d61c3002840647
+9867caba8f4be9483df9b48e2bfa024e79e6797adc2198f2b5115d7283931fe4cefc382323edfa1e850c3970bd1a2d53
+89e88c50c43d7e966e60d49b3afea792429563c93550b10584c91e4a827a3617971eb286c39205e2af4e7dfbc523fd8e
+8ed261502f95814410fb081e7348eb09f3a3df22cc3ca82a2f071abca0190e9f041e8714b811418caf7e1753cf284e9e
+87ac65370073b6bb85a945e138e4d0a5d71ed88739f72b9ba747d2a03b5d4877e8e526026348d2578c752bc4102055ed
+b07de38d07906dc2838be840c291f467d9b695c62175c5afa46d80f34674d061107d6fec6847ba5f17f2d8729f31f5f5
+899348bd385a7c3d38f9d740001c9a543dd8496b58807a6a73180c94f3aa5c15a56cbb85cd7124458e2ae44a454a8a58
+91b70c3543b8e21cbcc8a40cbe00cf2ee0372ba9ddc7f610b711a070110508159e6a52e8778b20f0194ca09b109881bb
+8ab84d75831ec1e708ec74eb6d6de2b13bf97e2d2262ece39e5ba5a4a3049c8303023e40fce5e87b237bb1dabfff5246
+914ac70dd91ccb6d7b83a5ed0a9250c66e77a815aca17416f1796fc0e1c26bee7acec5de11e65061a44d2d9c35f5d19a
+8867260f8024f533fcb75d9c3f2ab113d349504b40f650a2c92bb46aebae3a55de6a113cb6387bf00eeb2bd4719d87ea
+9976dd4e56b16fe11533dce2734e2903a3ec986dca6540bd9ca8b758a59a1e45b1e69c0b8f094d42cf7e015363ce37ff
+b48c840786653a0f3ed6b07f8f980284c5eb2dd22e9ecd5a0566754a1534300e129b39a8a6d4fc48bd403b351e714f05
+b1633aae7c5e5c51a82aa4e4bf9f92c0cd30cc1067b03364825ecc492fa43391ea075195f2f73b99a11dc49f670c0e89
+8769a592f503bf8ab03d767524d9ec2223c502ebf15b69eb4b3d53325ab366888afbb668bcb380230b5bd74b32d90a44
+87439671fda66bf5989fe1fa2aa32519ef908aa6ab3eb34eb5b7d908e9a7db2d679170cf3fa0e0a388a355b8c51d306c
+ae1ca219832c90554a91a7258ca5598f8bcaaa7059c574803b2688d8026df9083985c2f8f4ad3aa9b122efe64e0b2481
+94916e6dca309d9c7afb9aa4c0bc89a3de875a8537cae1fd32258b34782994e5be5c4987577d697ddc86b8d68dbbcbaa
+8c5361b85176adf77ab1949d34edd562d8c16979e33b59d09548ad372b8c913ef385166bae53c8fef814a529fceafaef
+b968172a6a831c6ae53e876dc4ef8686879cdadff0aef4147c4dc3ccbc173f89748b840a30ad393eaab69e422363bb86
+8fabda060f8bb2bfcd675803ff0a3f834e2356152f88bc79c23f58fbfa6b0c82850f281f7b8fd2a5e16230aeb4077320
+8e5c887c318335c5561e63fd3c3f64edc669c0b03b217e3ae40ea29245885442864dde15751d7c6ab177a91fdc1f7235
+b2f67f9d64650c6b51b88e7ee6d6a796b453131c93a7791cdb2d0a4922d3c913a4ac988bac5b4b9bfe61469886e1e7a4
+96b836824dc2a12ffecc6a053f7549b7faad9808e98bf20f3c9146fab05098df56fc2833a6002eb39c935fd8757d4716
+a4aa33fa77b62605f751bcad91333659e9345967845226371e5f38d5a7f72405d0e30777b485b730e6c62d8216790cba
+a041bf3467320df4bb7baee569cd685a65c9d0e431824b7de93ee47ab8b3ab20298d60746fea7fefb5bc82d3f7e25dd6
+a85842f11f490bda22e9f73409de0909a2e61efc6d8be0c3f561d881988b4d2e6924ffaf0a4c40843481892b272943cc
+94de0ecf58ef27228f5afb12496c53b075bb347f900b2df98f47ceda8675bc2941aec04d1c8ca0dec0233430f2759824
+b1795a70651be509c0955b07d58a1b8655a2e6c292b939b6c156f0c0983abd7e416cb0cf14afac6ceec85f2c46b83a28
+b6beb936ea1f1639ae59eaf53015dc1855ca0f798d9ed72607edbc6c119741e10af5354c29571af8befd83b8255a8f58
+9424188ceb15c1b470c4bb17c71a37af56c87625e7b7fa752099802673c3a5a99d16e7d6dd8f8b680e89b75cbe7920f9
+b9e22b5df8318bc0ff81003e8208ff3217ba1a84edf6a0b326b7180208d3a9144c6fa54c57ce6d6071ccb1a40eaf4509
+8e5fb55da49feb7a9152528ad6a6766af75cce249eadaaf4806c6d4162f65f3c7311bcf8da72b96f6636cc019546c05e
+a55f751de82aed5842f94d1ba1e29976c3d0146267b11eacaa4fc765da8d2acf617d3a65a2a74aa983130851f8c57d05
+9647758fc596b78fb52db58f2ec31cea186d9d4f68692f56e474961b277396af4a51781b0a358a6a6aa8138e46443a43
+9461f6dc72988b44c662865cdc01c0f970f078637859cbe6314fb17d2cfb3451b222cfb93a5c6eecafd1ddb36de075ef
+93b30bbf4fa0926cc5483ba9803c8b001aa80322addcc866bc514f2a10aa43bbd86008e4671ea26d8e0d2ffd4bb8f2f1
+b44020d0f062a001bd6dca2bc3ce61b17efc7a121a9035709f01a8c34708ed0c1c85cfe98c534189e0669eea719c88fb
+afabce43f35e0d3201b60226c72c30177c4c5d75bac654fd2b58b3ce9de7d83ef01be60514817f1e7bdb525c910b8bca
+a97bbab394253ebb02ba47ad391db3aec1b4d03e88ab3e7505730640558c11fbfce42d53b7f85787cb564208d3dc826f
+805a34cb0c8c7ade28c69dfdde46b7a283e539977602aab165316e973c62bc65396b6fe2c96750ba028c550de03100ea
+a0be38fdba281e0c248933ed73f1119f90e34d5b4435bb704a5fb7c20805e195518a2a424bb483f16500d74f440d4a53
+abbabc7db0a20030c6e687b89162e704720a010d7ac53b9766a9ccb7e02d4ea1926792f5263d715cb97d67f2010288c2
+b9e471a7a433a678090fe4324739dffe238ed7e9a867159e0b43fa80c9c0798cac6b58bc09a389223f94f22fec43e18b
+9818e9a42ebf415c6d970c87261645f876d709751c8629d1ffbcba4abc8e3a2a1db8c4c6a6324dbf433c43fff62803d1
+8290ed53eecdb61157cc458dd081b9e890bed5e4cfb643d11b549b2c65fe68fb981d4311473510781945b0ee763a84aa
+ae730a7c69866f22d8f9b0d8e17d7564c25763cc77a5eb718d5651b9c5198b2b9d3eed1c066f4985b2f6d7edb0a109d2
+88325e421a1be440175293efd498cd167dcd0914c8827ebf64ad86788f1fdeb3c16d3de7a681f958b0f49046c54fd804
+a8f592d6ba7fc3ab8ce8260f13f9c4886191530cb1d7505d0beae54d4c97d09712930b8f34ad74f1ac5ebedcea25dc8b
+81c0853b0310a96674a92a144a14c48fcee0d72a772451ed046c284f16fd6447f67389ff7841d752a025da172d62e73e
+b9f50526ce4bee12fc3fd8f3582f3829b90840f6eba06f37b53febc1d0987bbf58107d73fe4373d79e53827270bcd817
+a2ca28f619d4821f450b9431bdcdb129d4f35dbc2a4976e4d416dbd14e378d4d60a517457aa0343f7a5e60a7e246e22f
+b9576225cf7e13374d3975703b3850251d53ccafc6feeedd07be2b0bdea63b899139a1fb446dcf76f62f3c03beea0486
+a88df9f6e95df995345c6265af546158499fc0d89447d3b387e7708fa037f95ac9c4e20ed35b749b8d8a7471dedeea87
+a853ec333af8f35d51ddd6c4d45972b68fb36219e34278efa6cce02bf8193d72c6014ba6961f8448785b0a43a31a688d
+a1ead9282496e590bb43908dc64341595cd22b844624e02f2daf597f708ab0d336bcacb5862bce3ce23d1a9616fc6179
+b97398d8ebb52535a1ce3a10b2255d358142ff653def823ad9e9ce4ca5f372c6e7c9301588ae5d914b2b921a0fac7442
+8d0d292c7e9122b8d001b3a3323f9d37dca61de5a595f9402ab0e53e941c83f80237a853abe4aaf012a35cf59df48c68
+830535a5a8268d5ce4e7462fca4f809348908ae7ee117312244e0a9c30b09d91b6f798654d8064091078400346614e04
+a44a90d3d307ee3a3c3838ce43a873311789a9b9292c62a01622bb813a02f6defd21b0889cb6dda6d7225009cc6d2641
+a219afe00a9327f2c937afabdf5f10bca0687f48d8f7a2a046a52e6924af613f38cf82454df4f412f5991ba20b7db74e
+b448ed4b15ced4de098781793a6e850ea1547d514646fb8f1c137c86e14231ac4340b308bf07813fb813cd02e47c015e
+905fb68b8f5bc14834a06d61f3da686bee77b3b590a33c640c82f34e68ab993f8c4897df463973d6d9f0d53f9ac5cf5e
+991cb6857dd0b3ee6597aa2fb1f4ccc962cb038228615466964680795587240e6ccf7861ec220a53ede1e2e9752e1cb7
+b823dc0249ae72e2de91108cd4ae6d6af3e464f12a53a46ca583727c7351a67f2d12c911534e234ee187389fcbf1f621
+981ba6bda1816036e75a864f635629a141905a4805c706260e7a5e12b82dfa9de4f4058143065b10a1012adca6b7d083
+8bd8ec0e77a6867057e5393d82132474eba9fcc4bbe025544bab0ada4ebad3d296ceffa3788acfea0a44406e2ab637bc
+93eaca3a7f9a0dc809eb9f604905b0cab18750a9bfa42d98d99728a6de6e0f1e05b6e98bb3b0d9862a69eb57ee2e18f3
+90b077d7b7b1651ac0d723978b3e408191c2b8b08247fe2a7fd69afe0615dec09e43771cd845c2cd064b56295e53f634
+847e8f607332129e95eb1f3e00003b087e92ebf1ac9477304b0d54ea38419fe8581122d21bef8d034f788a9c92f4ec00
+b0301becb003dc7cd56ea7d830bf0fb4b85bdb33606d8d9ab2b70c6415ab5c8f4934bb7079ced16081b8f6d16b77c0c0
+9068fbbfcc95fff7ef79ab64063dd9bff0c40b4855eedb39bfced9250cc351b5b3b1bc6c2d038cb6d59a12a41b3db664
+84857e081fa1c6c08bf7b0bcfe7c6d74b57cbad1b67676e99686bcca0b17715ede19f826517dce3f84cfa014e11909b0
+98fbfd6a94ac3e4b53b811e4d275b865486a52884352ff514889313c7a15b07822f76d428533a0f8d3cb42f1e6f72356
+b4faa1b1245aa6339b5bb987f3423d187f6e7e5d4b4b341de87ebdea53b124932cd0e586470cf4a3b1060a126e4ce7e1
+973e88d073071c2cf5ed643d770a45f6be7b230896caf72a2cef10e56ff0a4e032d6ae1ff4c19bba2cc29f29ba70cc19
+8d40b3285879fb9ac0b6c9d92199afaf4716fe21edcd56b1a1fcb6ed298b5ec5b3b64222eb6f0cd1086d41872911068a
+b5e338a02076ad851778d590ada4af1c217d035c2505b891163689a554e5a957219410bbb435bbb38c8a1515146f8789
+b1d3e990d027a38fc8a38579e39e199d9984dc6d857bf51e2ed5fae061c8723fed3c74662405378c29342bc4f1fff7ca
+8679f10f866804b19dd0b14b24068c1d32908a52149d33ab03394990cc60c0f388eef02bc0db819f92f8197b1fc60c17
+aee5157db1cb7ca8013b0c19201ea1e7af32e4117896b3f8ec0ef0b2a4ded6a5e7c893281865cdae7deff4532a6a3fe0
+950315818b710d3903b679dd0de0619059bea7dac3bf4edc8fd4a6dba81b7aff9bca7cf1972940b789458f287609439b
+ade345a6171b8e8afce7a455cb98024d0d91dfa347632e1a5a40721868bfed1c1959300f1e1e39a551d99a4e1abb563a
+adde1719c13b3ec224bdb6b44dc2c5f2daad54e7ee736209653a0198a769180019d87fe6bdc37ec1b48f0212ea5a8927
+a3397eba3ed2ea491e8d0328333689f66b2bbed0e1892d7b14b2aa45460a12e4d592d78a5d0ac20bd6d34c88b8f1f7a3
+8613160aca85f0154e170b1b3f1052ba984f5c422c4c25e0771a53469c274130a31f875a0ba9650f77fabd910cb10467
+a91ae4d048c56d5b2383a9d8f6396837543b609d8b0be139ebd5fd31fe4a90071656442ca7f14136cb8205734d929b5b
+8e42732269c77887f105d1c326488025f9938cbade678bc6b39941311360408ea6baf274bbf5ffff996756cd2390bf1d
+b96e1ca66d51a186237fef402bc4e14f8f96a138db377b7e2c3243954b6f47ca75cf4fb5dd081aaee634b5e2efe2a065
+81d1c20d76ed054923c17b362b50205050f185137ea10559e35ee7e191bd89383b68179c0aa4531eb61abdc239ae6891
+a350b5778e26ee808466619f73900e09bd387849d072c0c014517d16adb4e3394673238c4f4e705d30b4ec2edfe5a695
+a13657433e39c0241d48075ae8ab1efe3680c96d078685c5dc0ac3c49d468db98f2094dd4204f44e8e90bf54059b5807
+a96255abe489be9d42ce6fa76ee90e4bb6a36421fb78068432cc935632ea5b5bb2ab70790ef79422f93d35d1034568b0
+b745d643480edb577b1f92ded38a522236fa1be2944ad8102ca64c3d55f6297b7e0aa1beb082261af1cc334f5a723614
+b235ccbf94e2bbd3c794bcaf84266141c0e04ecdcd7d2def83a7eeb86a2ff4dd3ddbd8245296b27344770f3d5d332f90
+935f3e4e9dceb4f58404ba1a489985001827e96bf6be227a8ac4e2eb8a950d4a446320ce3a245d09d2d74776c7033a3e
+99cb7f3d6256ee8918f40642f5cb788f0047a04c482146e70687c3298629bf082dd98d4a4c222fbfea3afa3d7d806f00
+ad6abd2fcc67af691e76792432b83b8cd9b0a9e5e73de21f89ab54081ea002ffd904d77ab8efb6906790987e29c53ff9
+b6de4c3a45ed7898abc037a47507f46f7327c057a911529d3a671286f98e79a421f4586a7ff3235f1892d0cbbd0e7bff
+9120311b071d38214e39f4b48ce6299ae9297c7b76ab364353d3816669cba56592fe4c7f1f93507bec7ddc1df471f0f1
+a6daf71681485d01ae7fd4bb81a326d3d2764bbed5d3be45efcbc04aed190163ce8f9d04a84bacf25ec151790f8fe917
+9534da45c2a497607f7440f61943f4c16878a18f0bbce00dd644de88383470705b489225f5be4428d1f988256b70c926
+b2d1b633b4832dab1a530a1d85415e7fa3e4a1fd383ddb898a79c7ad028f2dd8fbd56b83600cf481eb14a073cd65431a
+8c43dc994dfeb5f22df9560518df32deb1af43f254acb8e6f93eec3fb3ac80081b39610800d0822246e130e8c5f7a067
+a18174ffb85d13b7edde5822f22872ece12383d79fbbdb8c02bcc9f654cea904ed8c03b8709d70736dd4b308ecc1607c
+a54e4bb27d6d561261a3fc48705781399f337448c0afa68c074918d2c14ea7d51263199b01070b7161c3db8b9949717d
+a7457cba2c5b455584980ab6d0bb5253dbf2cafea4efe5bd769020b970dc35fba4109d002f5934610b8b4a158252ebdc
+877d4111f50f77463b60e07843b4521b2c44629a7deff20dbabd412206a4fe03f976de1a3897b9df7eed16217f03e2c2
+84d1ab99732fed1470f69fdb499dd3de795b055354e89d522c6a7df4d6a5375052c8befa4dc7615d29b3d92ce7df2f24
+93bd139c343d8b83403e04547072c3e546c67445220afd06c119f7119730288629439640302d0628e74fa596e305c0e0
+8157b5ab48d026684f6b51b802b4d8e7f85ef82583d1e8dfeca042b47a0e0f58e30cfdf4738e6d51394b260a4ca7e19f
+8f03d5c1720540c29a1dee44ef5c7f8b209094ba8376d8e5eb9b52537d9843912b68562eff742f0a7a07f5faf6abd1ba
+a15e4999a0028b8b083c2afbf4968a1f0397c26cda8dd7f6c134c6a860e740ac4bf1a1936849a4f2080e0cc9f8e44387
+8b71fb85363158c7afc3c41422e9a32ecb2d1f9d3c01fff00b77e0ec6a8661e95b552a7f05f4acebee751448ed750684
+b34125432d0704c0638090fc4566780d2d8038d803f96e19ff748325f8b5579cb8867e12491921feaf3c0df949f36aab
+968196e10bcdc6cba28331a229acd54b59edaa83cad0f8d14f39d787467bd5ea725a3dc3d50accc334e74c81fd762cff
+968abfa40af365986e68c47b4eb3562a72793fbd66a7d1b3804a5bac8137f0a3cbbf5cd306097cbf1a3b95c3414fb061
+85395fa84223dcc16b7e620a7ef6f902f7b29dce7760f57baafb37d985755e65623768b8bd745c8de7d00e2035aba7ab
+b57ad86ab3f5cb00ca0855088921865893b6e539edbbd504238df2f9b2fa7c7bdbf2d6eec6ba8e2a70a4c4fa3f459a97
+a2f203ed1f07cca3f8c0d35ccf7a63216ab98c9e71557e829dea45e2c723583bfbaa7a83d66521b08a0718c63973a6b2
+99a3522974525f4ed10623bae83dddace6f9495687cb9cf4ef52c8530b05672c2b226d3fc5058c56462ab3737a068baf
+a4a50d127ad06067f1eac2d61c0a1e813fceba2e5e895467b5e6045c9b7308d3678bed9212b98e44c19a1783e0f57bef
+a62d103ecc1d5e1d5cb98a0bbf9682ad65774d63f67f95bcbfb0cdb5e2437f2279043e4426d490f534961a2487782cce
+b12fdaa5ca77456e6e96eccf97a303ee2d73f547916ed67378835402136c2aa03e63912edf5a67785f7ac1636f6ddb51
+91315750043c4e08c7e4359b9cba25309eedc9c85672851f05a0651dd9b9329bef00a79cfe73ddc308d97cf548486b47
+947115aa6cb3c635bda7f3c5fc3dd0e4881500d74db4c0579e4b9039b75b131eb5db54174b1bb970064740551e6cd1c7
+aff091a9c7e86c80646cfffbf154ecbcfeb66877c5b773b6e8759649ada1094270e57970cbf2b0a4bcde9bbfa9689b1c
+81e3cb9116f81e583b7579f9af06931a5337fae0d57d9ef777003f32e0eb619b75b74137385f9e30dfe0e10c2120b02e
+81ab49647db2a5a6f47ec757d8427325fe721142377a287c547fbe04ea280acb32d71f3dedf7ec0f67b43ffc5d748342
+84b0e16d8478b798694503ac4a87ff31affe0ef6d2bad47abe0fcb3a2571fc8e4e9c966276a5f4968b2675827a115818
+9567b2edd65974393cf2181d235f877f5827a6d5ca16e77165ef35f6c66370f0c55a2dca5387c02ae73a66b81f01798c
+af19f841026271e284548b2cfe9fe7d6f9acdb4759ca76fc566de7a8d835408f86627185fe32e705f94e6a719e463cd3
+83883e1c9d215c90948d066d2210528552093a726f0a27b8342b611e4b8639f6d2a5f95bef8cfea4312c1f2203f34986
+a48019b2da37a232b7999f6b668e2758f82132e15ea93608bb2350d3188297c8ff8c791977f2a083ad9773570bb560db
+a1fcc29974eb065a350cdcb4283b2a813f02421b872eb3c15056ef96e2d5ffe2fba0e10ba19a4d271937cf08838e4106
+86f9ec59a1f5a5796e498247c0ef1457ea7ab098247f363329a336a1ee57afb31cc18d35e008a5263e7c401fad5719eb
+a903f95675c14cc618b02f7a0401ab67170b4a143925979791d76aacc90ad1faab828fe904f13d155425b2ffd79c008e
+8f652c4982220b8e9868a621a91eee85279b13b0c2974472fbba11775e6bb1d8d53309f500fbdacdd432170bc76c93a8
+a9b02cfa052b5808c1c9ee65ade446a6ce20174bd2e9d9c7388a1973b0290debbb6fe82697f09afee6ed01c9dd99b905
+8b4c700fdbcb13854c7b1d257a781fb7449a9e3236b962871f11b31b1f2e69ecfa6039e2d168ebdf2f142f93b91f5882
+a9ba2295980603515f80f0130993f1be434281fd4442ce7e68b2fee12b24e440bc0282df67707e460bc67a4706bdf8b8
+a382b85dd64b70296a2d16d1d15d6de80687dec9cc074445fac8de7bad616a95972ec399bda7c2cffa4247bd04413b76
+b6adb37da1c6cba5ddfaafa3718aa66fe2821b43923ec371cd4eb9e974ebf3d0e94dff1ffc1347cee5c9e19af7c76be9
+b5b531ea7f93c4756e5799118654ebc478a3ab57ea51125fd31c012053c759c8a52c8830b53208f74215e437d059eda6
+89c88a5ecee1931dc027d1553b5aa82dbc5fed2a4bed329809467f79f2712fa5529c0f80ce6891817927d0b66d356db6
+b4ad1964f73d3b7bc338909df2ab8889c4faad9b3b8a5959ea81f44c6c4bec95f0fb6e8fea1fb7e09789c690423e2b85
+b573bcbd8f484e350db04eb263187ae4e99ecd03494058e68221aad8d044db82957f4bf23f71a9634b2ef9612a78ecc8
+93c3dd86f7c3105fe482f62b0a56fe43338aef50f0d10f237ca774f834151273aa653e17bf919e54aeb35343ed790c0e
+9069c429e7c6507a755871b301b31c3b4233006c51bb66ea2c9051c6caa52e933ad81a8e879129e0c1b099a124bcb295
+a22203e5bb65593bd22cd5bc6e95a2f5c9a9aac1e14d948a7e0aebce4f009a56623026e0980bd194a633b42f15822ad5
+b1585de69b3014634da2ba76218321ff4ce8476b653ea985a7330290b1bb1445db3e1f3c510f9ae7c22940157e2df36f
+802a70ea7fa057a03d12538c3ad6b348a8e694bc6b483cd62c97af8809627a161223557f1d5196e23f13eddce15c814f
+afe8b0e94d8d9b44652602c5ad15bb0140456d90c95af4ba58cff528e2834e0036572af867488f27cb2d27d81cf02e30
+93bb332d924bcacc41b4b9bf726647d7cbb642847fee5ee7dbf3d2a0489d71802d959a3e905a80ab1f34097328632f00
+8caad1d29fe712bf09d505ccfc724574c8edaf5fc743953b2771cdae006ad9792a889e0c8136409b8f92e2cab5ba09f9
+8678be67412da4d43d74660df98744c54365cf10aa59e522c59afc3836d115380416cb1ae497ba4b50ad31a23ece8b92
+a48e64a5447ebeb5f6b0e0fea29fd5845b378e83f6b06b79b604081e5e723930a0d4c6025627382f6baba8d47425cd27
+b8914eefa2f5613dfe99f11212912dd53d678ed349fe871781074d5b6eed1fc7f2e5bbfad3356a685c52a3c8a26e7963
+836ba66155facd2a1839f603644aa5520cecaad130fcd5cf379139056d3e163bf35f172a4a1f015924b89137f83d366a
+835b70cc340b57a09b1fecac678be381ffa4c4951f6742322c2751cf1c748ffc2b9bee8f155c007d88ca69c12bd9db20
+8e98b4ae7c68941a48a70f703c3d5bc9a4cf6c20c61eb4c1338095920c4f23aa9eeb474a0430dc28d355b15dc6e83b22
+b24be8171a105f203c5bf2ab0797dca8ce61ee07307e1d82fd26fcc064bd8a8a5b6bcae8dd611f8ab650176e694da677
+b057bec8ca008dbfd4982ce4516a4925a61bd68e7a36b182575c6a4044c7a413ecd1dffa66ae3cfe2213763dd0f55a01
+8d270924c541120a18d587cee51711486f09a39444182800355c4193a76789614c6925e6a448f46c1891106f866f08db
+a0ebf85c44453153764bfc817364493166833b0f84b7a7c505a955cf3a7d4c1b4d2dd00145220d8a3207758a82dd8e4c
+a56fbc83a3f1034337ca0d5aa89a0a18f900c3654d171d47ee86b0720c6a965c09c9b06678e3f25b151b115d129ff7bb
+833618f5d13b7919206c8e9666997ef26c04a74844f57150e7268bea540e30b93eb785803535566765bdc899d4f10667
+987daa13c00dcacdfb1f0eb13c38ddf773e7e8e19af125604ede42c6d0907f9ed1e4b8b8c9118b14f9449026802a6200
+99b6e669cd7532b435d01b20dfed29211042beea6de58acd68b6eba26baa1687d80aadff901b5607a2553df047ac51d0
+82c81899cb76ae21838558a1946425c719cf68d07950b0f106b859048107c13e4e83b0f2762ac8590cdd044c3e731f6f
+8f1c5f634e38f47cc6967f2a80a449f5bf69585622c333d784263e3f6f027bccf8910da76435a84155a6fbe9a8adc4cc
+92d3b5515744115dd20742be1a72a455c6d481855f4366a0e960104665db4ecae8925182f32d4e1d9dd7fb9aa246726c
+ac86e14775cc4ef22cafa8ac3298bff27fbefa9b7004ccb16d2937128492a2c1319641062f609d27b9314aa225301d14
+a07e1ac19f4c374d68084415fa4a8068c0be540c8b9d81c0837347fe096547d8318bbd804b7642820e43c284af663258
+839266a2fe6dddc446d4b515eb538a27b5a3a5e1a8246f6df77c2de8267e172bb7522aa7985e0503c68db9cf93399b95
+8a381fa29e553fb57e3780f915a86048aa82a8a09059c80154df9490271aa6b99baf6bb217df43c8ea1265e85f07adfc
+8d8806db0093161d7f83aaa2cbf0bfb8cabf823cb54bec094f886da6461397f41d54c39f216d7ff4a8262d12aa8ebfc7
+90aff3f98394674791e194b57c3f4e6e019471df1a74dc47bed725d4c47399e91c88a955612be47e89002f451ebacb55
+8bce2d60f3e82042ba94cddd02543b46cebb8770e9b7833b4e79289d4c491df7f4da0ab69778cef92dd81e5a6f0eb71d
+8246fc9424b5d5ae0a3344acd7d6962fba6b68cde09332c262d7b3f379cac2c650d80cb5ed4baeea16a5557efb6878d9
+92ea8547fedbf440517522c687f1d652ae4637cd072147ef31338a40e11017bfdeac42a32808d33522a71136cc3bf26b
+84f6a64600184c54d3d5c320498282947b8a8166f09ccfdfd6d285cff374312da57087fec3838a49eac5b93315f03b80
+86dfa1485e343c861286c057109119ce8e20abc646a4411696a3bf4718ce03d37fe14b6ea1600d8a7b172fcca6d08ea1
+8dd3404facfe49c2f096d2e74641c474c9c54cd6121771061db3c1757cdb1cd6813d3ffd79e3b839b348d34b7b4f1ba4
+8870cf255b342ffbaa2dcff41910a37afb29ca6a721774953dec182d95b426a481eac7bc107c4c2ef3df9f70e04e0b88
+b0b843ccc630209b9ab35a69f3aad58c76b2cd3cbe94579b5757350460633217246b342fd098e365fb3ae88d5b7d13f0
+804fe307b2d477085f8d9800c8a11c2dbf6f662d684d6a0d2fd415cbe4a09255e47535a08796a805188e1bad779ce121
+93d91029bce430ecc5f41a460c02cefd3fdcb8c3e761ba26a020e108e06520cbe2eb0c04139aad0c0fe58ed34d8b2215
+830867ec984210b314e7f23dc5b10e6d9ca53789cc447e29ebca229f4c79c9120618a540a9d21e4ba2ed8a811d6c456b
+8d7a89ae9d7318d6578c1fa75b3babfa7c9df7099eefc2a9983ffa96627f4e7fc99dfde21b92fef5e0034dfaee35e97b
+8eb68f5875dac63cdbbeb5df2fad7c1426939ecb6e3b6a48f737bbac1179ed4cf5a1e6919529878169d6d8552fa5ad56
+861e26c9a31d21839735cca8a384b981f7346b026cab7d60fa95a7ad7a4a370cfb409812ca285090c3f1c3a95e5194b0
+a02ab98589d48b2240209f54b0be78edb56b614b1aa02095ab5a9cec6a04faf065eb7b81bfe45aead551b1f774c60161
+88124374273a2425bd5932a6b446986756379c7eb93d3ba0c5d7cbc3477e6267d9c67e5e956cf6df841bb263d1a8e224
+91a766128a4c718a45db571606867bfe6e1b1049f0ccf71a01138d5443014c9758000a8be4dae0caca56321e3f992e99
+8dbfc433e2477b9d86f221e9c49fb8db67c85438fd54b670ce44b68b62d4c0a9cd56c37a2127fb2adef22c07643fdd3d
+880cb650f01191db0dbfe63215d208f70f924380fa22baa0e5bcab60f61ece3c6d4cca0e4363291f6a10aca9649da69d
+8532214650619e201bd330865a3228e9ffaf1f64ddd33d206be5616c691b1965814f8bc507fc8a695c8291c2f8713dae
+90e81d5a9d8fc976a3bf6ee6d3022107d3a9441ff212305cbc7c35bc9163321cadb352632181ccdc1450f91f51872b00
+94d656836edd68384df1fe61239d40a36a0fadd59abead673e4a2ae58de5e2a6bcc4b980dd9b517e7212726b8ac94ee7
+afa70edfed2d81326f26f111982aafad55f510de95555a4d05d9916a600f3ca6c1e3f66d6b092c91c1fce6c407e022a8
+95cfbd616c2a59acde8152578737d3ed329aa82a950dcbb9378bebc3ec8beef9be2759a937381ed5aec1a46d486d1afc
+a0a1ae94bcd07ba44c30bf50cbe0ddca2fdb5db82ae73e53c2efe9446c2464fea8e5de31da4afb99c6405798f0f9a59c
+848e10f6c12a6adcf711ae3af8382178c46b90b9ff9970350f14b1a1b565a7efd91eb96871277b86040d26561acee099
+815e749e4a56c3b982b50ef5ed249c4defee558647a5c6062022c3ef42b5ebb219ba770f0de74869bea14a98eec02360
+a4d88794689a0f2e194988114ab96d28f77a29cfff606228ebe030a62eb4fba25cefd59d3d5f2fb66acaeda866f5c24c
+ad59a8541eb9641c3045d5cea6e3930b35886da4c96906f701ed3ef90cf74431df3c444174d9071a1657efc8cebdc739
+97ae83289d535707039e9df8ebc73262f881ee8e288f73b9f0d6fd209385d3e2b761fb87ca852e10cc4818384ee155de
+b47983e11702462a23e26c8d6407b01b67ad532bce3f1e0626fe3164886603bbc803c688729a64a69d119b15235389bd
+b447011409a07a2d9074e08502e882098799f3b649e947de44c79ecf86a63045a19985857ec500638a3baa2b228a79c7
+870f506356aa4f8df7d61449a7c7a8689705388b8b81dfe08fd79e8a734c998a7ba71f1f6e9df085b8aa5813a4ec4adc
+a07abf6abcacd7612338b455c1461ff484dccda7430d4e9c5f9b4e5c1cb65055f4be650e6d67179b2c62709cd52a9b07
+988b73c2a71f3b1d6b4734d231c089ad6cb07f7ea6f4b8fcfdd34aa33f09feab6cda91232c06b47e90ae9930ea46beeb
+886443bb8d7d6c7634f55da1c5695f1691750fbf9ad2d63621589f91a0205ed4adbd4b905c62effaab235e740a172040
+b66caf1ac38a8a66c43767e8597ddb66fbefd888989ca1ed56abb96ab9fb41937927a792ce422577c68286e53bb4856b
+a84be3b37007cc932429ba2b4064ab7fabbd0b77400bbeaff09f8c6b818b5cd127ff8497e131dd8bf4323e092c690219
+a99e9898b6f9b7b1b9ef6f28f60fe2ea71e961b64b262cceae41003f6aaa16fa3dc1c2ab63bf63534718ad812e882a35
+a1cea8f3f5605a5c60144fed53943d3f259e3e33545eb0dfeb211a9dad8d99cb3cd3b2cf5031b85778ef6520700eac4f
+8b979026924097a06b3827ad28f3efd7f0e5aaf7920ebe5347fabc61b000631f0ee973b61b7468fcc60ba6e4381ee478
+b5dd7393dcff33d6d337328167ceaa7a04a98e0acf1dcbaf454247e85793fcc9a7d280ab14693cf2cee01afdf44506d4
+8580c90d72c0c83c6c003dcc340553ea547eca5989780493c2551ea9f04225d77ea76acc1bde20fef1a0bb7ec01685c4
+8c77db66f09e76ebf7ac14fe2fadabd41291f7ec5971060580b317f6af0daabe099f9db2c3d09c4c6edfa41211da0c4a
+b6dec051200c25f150d3b9a7802f5b7c361b074528c79dccefa77d26ea2f67562a6d9fb8246369c6a60f832fec6b7636
+8620173e19eac12fdc7796df12bd3648c66f78fb83a8e6f6c9077c34027a3acd0884ef2e3455a3de0fbfd4ca130ed545
+b44e3ae4047f917fe1af378cacae2813f8774307c20d54c565b674de197fdf90e1a6da0733e948c3218353c613d23fbc
+b330af874ac5d749a4ce1a23f4fbfa67f71e8fd16f6da07c714218be431b2a30cc4ad2594994a7a35f5aa06bf87ea3ff
+a5be67aad05a965685aadfe03d66ea1136e6979cef00605e92912fe8f84be7351a6acf6b73c567a20ce6045a703cf557
+a1672ed63df30aabe34e8eb81209ff31f4e5eee620b58074d92d9cf2687e40217169df59be8af7374aa5a9107c5f51c1
+ac01de17b74e2dacfe3db539910b6c370de94e646b6f2dd2a828a381b04f2979f8a62bac473659fe7b6e126f15ed7aed
+b978099cd3aec49300ef9ce5561aa30da4d37cb5c697e0b5cbc3c42ccf2f96e53e948fc579cbd24605101176a353a962
+8c8c439d9da3627e9f74da784bab8191552b945bb5bf9abb673659c939a60903e11f37300dddcbc8a495adf5c038234c
+8b4570ac55ea349560a4e7043fa17f264dbaae15a2f3dbc5ef8a6579e1f9b5a440aeda94122982fe564f78b615de3e1f
+a76bbb163db2ba26f5dcae8267d1a890815a76196af10444d3a04c1debeaa3c7cd51102fd0bff8944710c743f5393745
+8d3ba2494b612f93b4ebab77e6f207b636e2d09a3e4a9666d4ddd5859fdbb9747a88eddb7749356b141a071584677ec5
+a8bfd973dee352ae653f7c7bc7df2b32d790653a3f1f2b239d71677992938cabe941fa609e915e607809b5fa954c9073
+aeb4c1ccee15753d4fbba545ec4ebb05c7428427f087fdc0852a18439b19b1669a3c744a0ae2e7f74c46905f520c3231
+8fffac3ff9de863257a836aff3cdb705fe7f4bf604c2cbe10180d81c0956f723b69438bb8a3aa094fc755e386234dbf9
+a583153b241d31223ebec9a95e11ebc4a657b14056b8ca052aebdd9866140dc4669bef4f02b5ffdf667ddc9a87e0bac4
+93177005082ccf2143f24c063d20068fda393948bfac34af57ca58cfbcd0bf9a0de46f8f41312e83a502b7ad69b8f2ce
+a79b0967599894340ef2408b48f42e6ba4f406e5ccaff13b46414ee38e5329ffc145f6c34d8e8acc6aba41c23e57e7f8
+809a356a76d54a05e5006f2cddf0decf73e5392b57ead32ab56bea9fe13c1ad090cd69a8e297fa6e017b39361906360f
+b051226cb44ab1bf94a9cc0e4f246751d68f32ffd12f1d077d3318de642f3997fbfb0f2ae1dd103264542c2bd0293e57
+8cac28256b1a82d0be373d884d00e9ff2e384d5afbeedda706f942b1d222694f126ad44f9453fc8a985cf69fe11ad70d
+a13b073290de7a2f01a65e429e1adb78cd37eb23c24d6fd5a1632cce2275496179e3c22e0b7f59fb51d526402c0f3f7a
+92dab68d1dbf07e5b058120422ae610806809ddecd2aeb9d11d8fcac738c72eca584b88ff52c95817b79b9e0369e3ba6
+b24267fbee28883cc8649c243b13905874e5d97a285b9c6abec749a53e106db0a6fd6fd8671d5b7c9a1851da75a4ac5a
+99cdf977dbfc10084b698c81cffb431a9eabb55b1323e1b15baed5984a1ed212ec5f6c58372f965fe18de0100292e26c
+b021c697c56989bc8c06636cd623c3672e8885598fd2014f5e560fa2f721f9487cfdbcf4adfa34c178ac84771fbb77a1
+8fd7e3ad3330d4eb1a0bd42801d95ce40a82b43c366abc823e25311aa1ed882446d60b6309e1a1e201e725326736257a
+b1b3c641ef4cbd5e9c69955217f53373cbd104916e04d012eb40a24d798e76bf05ed0a218862ce02619ef694c42be170
+a376d0296c0105789e9fe539a5d22bf62ee36a2de4c9aa0f5e57210ae49e2cfc5209fe0f467ed19dc95b9746595255e0
+8a0ec125a145e373929ae33efb978bdaf16041eba684ada612c244bc3e28c7027886e6308373a5ea53c9c3d8e868ce1b
+93fde45cbf04cc386507b03eeb93c885da12bfe519df9fbdac5ada735934ea6e1a6cce066d033be66163b078e96e2100
+80c1839ee1d2ddcae1fed77d5f8091ae3074409461e04153db801e05b44a7658c6ccadd33ad682e51e211dd9e3c80f72
+87112961553b4a243875ac8d46bb6e274325699ccbdc40d7d9b7f7e58d3fd164f86b0b1df5df5f980785cb3918dc9b33
+a011463964a319c1ea11c7c55c607bffe0116fc834b8a1d3684df33f77f6e51dbe16a891307c9f51d5b4d205c4530072
+b316c4be33abd10400a4925f9d20ba02ab1feb50af39b6f6120d6dbcf1bde0a8dff7e08c64bd1f5c43543b013e242483
+9555b696d428c4b74806a7d08b9ff17c8512a86cbb13040360ce248de241facc42c042d3779c28fe98dc3ca96a47b2fa
+819f54bcfc58a7b793d185d8ffe411bde6207b77cf22b0d5e1b3d9843e4638009c907fdec1966b485f95870da57f131a
+82c3f9623bfb8a8ff3573197497c175fcb314addafadd025528f805b7a63c87b0e54b48d46c0322110b0043f7f77153c
+abc023b35318fd97ec81933ce55799d8c36c3d55cf59b9efb302b276a76a37c517d5c690287f216ffc5d1fc082e116c3
+a6579226d602a7ceec06d402d38f217b836c8804e9da202bfaf1f3f4f15c24762ad6a2414ac022d8de68fb76ba8a725f
+b701d6d60387d4e2308a77cebd210e868eaec10d86532ea18c0c6393475b3976a3eddd79e469458bae4f496da7398fcc
+ab202a2acd4ff874cfc147ad1b02d4515ace254f8b828f619df2537698f4e1b2687e004c70a152d605a73ab1ae40fb3c
+a7e09ef6c86ec7475eb3ed69e57e0cbe86114ca5c0748069d00b6e3a1e2ed74e4366adfcb4d938023560fd91d0f64612
+a9fc42b05ceaff4312d5dacd78fd2394dfb8dc87d52efb0529595877727747827c1c7e3a3da81255356033fce1f97513
+b0150a1dadde09cd60ec3686256b4378f47dc6a55c092c60a3a3f0bbf586013dc37ed53ba7a91c72791c0d52e4c49c2e
+ac88e91b48f031df297c29fbb2cd0d2bcc767be5e0a7db87acc87fcc0f4300cce6deffc0b1cb6fc7e51c6ab13ec2ea24
+a8fb1542a956fdb1dcf90da2672d40c90a4aaa2f1232318b4112816bab660657eb97e3d0fee9f327793f6ba9bf8df2cd
+b78191d1ec4615b03b21d7730d48fd9643c78c31feea19866429073f4cbb0d1a67f7d7ed210ab62b760c679515b20acb
+967c20d53d46011f59ae675a26aaadbb7512d9f7fe87b7a20c3a84c76569d23920121063235e37cee2692bca3af69039
+9766abf0251cefbcfbf85ab1322f62267c22e6556b7fb909413a7819f635e3ac1670da6f5f72d3bb4b739e12eae5ccc6
+b0e9c5c327fba5347474366eed1ff60b986a41aabab00abe18a91dec69aa54197d3f5680603057f05d5efa0a48dbc92b
+ae2f5defdbd14e2c7eaf595b017b4a97edf521f561ca649b6bc2e66382478b5323aaf84f0b90f0147e20ad078d185248
+b841bb6e04d2409a419dff4bf97dd3d4f06f6fa4e5e23e4c85f23533b7f25fe3da9285ba033c6eae7e5e447e35329c0c
+85e26db850536cb6d3de259f662a88d23577fd56d1f99b3113ef1bb166456324d3f141a7ff63dbccc639cff68e7ae5a5
+8cc36d89424da80bcc2b9d9969bbd75bab038c0cf836f561080e14bb691e8e0c17306fd6d42522030d4640a01d5c0704
+817e72d50f68dfbdfc9d5611eef7c6b490ef1509559801fe1ff916050429a5f79c8d03c60d2bcb02e72310b3c4c9d068
+a15ed72881c49b545413102975fc69649fd5417f5b7ea9091f8209974024785496fa0682352c879953cd1e9edb3fbee7
+adafd20b962921334f4be2188f9ced4a5914389d0afcdbb485096d3848db85152e2881aed0fdfca11f9c8a9858a745eb
+8d8aaea706815f1ec45d9ee470698ff199c40b1ff2d75bb54afd4a29250b094335538dd41637eb862e822c4cf0e2bebf
+b8480d2a79cb6ada254435dd19d793598adda44f44a386ccb1a90d32cd13fe129a8d66d8babd67044de375ee59d8db51
+97c17d6594ccefd8f17944fb760fd32cc41a9b046f87893bb7ab2260090de291e8260ffc63e774a4b6b1dfe0e5107ef8
+b5b7e1d4d9683de7193120be850395762ac9a5669cded9226f5ca2a3de13eb13b2900af083645ec35345894de349433f
+9405d473872cc9f9b9c57bb9976d3ec6892ea429cbd1b12f22962b74d88448d4ccdfcc6d5c6ffa068d560d7bdc3208a1
+b99cca139a3733b365f4718beb4ff4a5fd6aada0173471156640d8be2cc69f2a70d959b57688f927bca2329c3b30477a
+94872ec872f19279fd26abfb132b4a7fd8c485fbdf04515c7b416fc564e61a7b0fc5da9f1a380d2b3db989f1832ac1b4
+92aba716538bd66e35a7bb877cd364c1b8dc3055a9cba2da23c7d9c0a010209ba8afab455da99747fb4bcc8fd3144cd8
+95ec4c205be3dd5df181220c96bba3f4e3b526fe5369035edfcf706c1eca43f29a4c95cfcf94cecfc974e01547e55125
+b48c719d7cbda1e79b3f7ee9c17c13bbac197bb015b344f79bc6785b28a1e9484e2349178178a2fe94c46132c54983c3
+908c495c355a0555544ec6f0b8e0dd0926ef2c5c640fcb89049e6178697625b85492722d42bb5c966aee2cee9981607e
+98ded9cdfa92bc8e3664ae90af87f88759503715f6eaccfc983e3ab53f7b3af6802999da93caa7eb3530402ec4d8901e
+993266bb366ba46d532973391af7204aab46a3189c83ce7cfd2713bc11e99066b1a5a012bead2fedb09274e7b362e8be
+88d462a3a17f84326b1e4177799d6e9c5f4ef57152cb83ffff4353a8382ac8be7d50381723aeca77d33d8f07fccf69f7
+80438d9eadea15c90008ccf4758d4e3fd5a7bd02809eed5b683f2c96a15d24524ffe75683b7167d42a47161c65d533a2
+b9e7dbbd3d3d0d86e347831cf99657fb269930087920637ac6cdf185d5eded3f09cf3eb27759ce3f4b46f41411e2fdce
+8f0215f23b4945470f74b99607c12c36eca41aaaf99747f522d8531244b668d6ab8c1096b9b5697208c3931e1fefaed4
+b2c8d8515ff16beae04c855b4365e450e0ebfb423acf5da2501fea76259f862bf29738a858a4093b98c2a444396249f6
+b27364a7258c30a59d1f13d358eb49dcef298a92bfa699b3b91817d2f324be8fff91c0b71cabf26747802a92582e7dea
+aee7d6f71fd674cdd8dd1f22195981e7160990c16647c871835d988e881a3d4c52345e74f7a54768fd97a65fdbd84567
+91356cb2024f7703ccd662f50baee33409c28ff13bb5eb92fa93f303913e9bf31bf83b0babff4b5e3649003ae95492e6
+b744e4754043d3ed85c3bf6ccda60e665568dd087548ac70670b90328509d0d5013cbdd07bf603949067e54d8094fc2a
+8146cbea5899401a80676850d0b43b02d376b4b8f02ed63a7d92532d13689e2c02846df79cffa0f33ff81c3bf492339a
+94bba8a1508c6296d3dd5d2e609d6d732ab2541849deea5436a4a9034e1e6f1c8d26f6b781fa34dcdae7cbf8899d006b
+80260b321d932e1179667de4916428c1b77ee1ea537a569dc64a12da5ddc85d09896939718ce08ea7e0fe8f8b115c408
+89d4640cbbca5d105dd67250f3bbfaa96d7ce19a89f8d6e188353f3a9b8737f2db1707c506f8ffe1d3144dd1da371920
+92f5962946ef7190fbb7bd3935427157ffc815a52ef44397ead3aaddddc82e5f85b1edcca1e9082a500960e19b492614
+8b89240c9b7257cbbfcd6e415fd035ce33bb46c773569d217c82ecee5dc2d66eedc9333e0b043616b0cbf21744909b60
+a3d23484916d2c0ad1b81fc7df70c97d711040799cab076223e0ee02a45a0fe9ab564faf7a225982468f3e62e32424d0
+b31751386bcd471b5858d001fee15d566215e34d2d62556c51ddc60a834d3f1acf18c415c23a36b581cdf4791f461ce1
+860a99003b841221dc5ea2bd7e226e5aad72db8a5959d5d4dae8a86114d30b9e8915b2314ef867e9c2a477d9424a2d94
+ac925b330cafddc7d95d115a9e62b2c135acd22b5e35a4aa789f4318f03aabef818805845f2532e9504bb19f69171809
+95d8180cae0815d33bf8854f4590be652f95f72fc29f0c519ca9bf3f490ba4a724b23d9054e08e3d31bd61d609a8f0dc
+994f223740ff95764fb88de1ad6dd90c9c58c0dfbf8482e1dd9bafc20c099a6772acf40569c54143f6697fab72772296
+971d93cb1e7aec5defa52815bf202b11de6a2ac9c5d4c0eb236cf2c4941460731e12b718f4a5b980ec6f4c54c3d17deb
+a341095fe5adb96dec2be367f09804ef4fe77d553102ddf7d643b7277992708e84be9a7748a97a56f065002a97dd7cbe
+843709280fba29d446779b1ac6e31bc3ec8ab8082e8b063ef8d2f3733ee77a4191b55772302964bf867fe1044dbfad65
+b7ccc71fd0d0c9642c32d292ae88ca369d1fb5cabb97b1745c621aee41da8f94bb580c1ab23664c1baee65e97b21f0b0
+a9b41f31be84f8ba061570633bd9e5f4d8af6fcc5276c25d9ab67b2b88c1f8c2a87eb19280cd4fe7b4c04da8b2d02d7e
+93eb14ce0632cd325429e1c23340da9655d3d7c2b42a4594bfd5a4e07815afc9eb1ac737228771492020f6528c0b7c61
+959aedea532471b9610150657b895c5f51ca950aaca910df137dbda2d17184173cf2638a2a0efea3f61d82b6ef8a7c3e
+8ebfb50bd48fbf9a6f782454ea900acf0c7143164de9b5b46c1cd072c69b76143ac4c99bd43139b5e55f847841fa6a1c
+851499b3a1eae6da530a47d3e8bc068e6e7144b744d5eca5394f96253df65094e5f3c34abfaf7c7d78c4d5a5d4863da4
+a8d68bf15b900cc47197739856557b43a5eb233b6c095f21a14a90ac8c36caaa1a54690c95840f0a4d2e2ffad0874a2d
+81a6ff8fb1dc4d4042089d4cfc10cf826e39083aa5983e53f4866f8f4c10cf06cd8608c4cb1b785f8d309bdb9b2dda63
+82f658bd1a95fac0b65d337efc95d856aa65541d49aa993b094d70e527e7d478970eeb3daa2904a1309d755e1d677691
+b46ba4f3d8f287eb92390e5d930df4f1a40abe500c9aebf62e2eeeb2e5ecfe5296b09fa22d6c9cfdae28d431fd10a00a
+b5b38508befa4623166f6213cfd160782fae5b7c3c7ec279b42a83d43a7adcfaa6c5b34cedbf98bba357fa663eec896c
+89b8a0fb37a0c45eb1f234ae9c7be65c8a708f08d431728572169b33f8288b1e17b7d4b18de9fb76afc37ae609290623
+a7d1f5779c043900f3ddf29b6b7ae4301699c0ee9e70314fcd3bb2643f912fb1225a0164f45c47419ab762420bf8e5ad
+89d2a69fc014068aa6d0b79784b8953f3519f563b5c9f774f4b148334d822aa645b662d5efe7dc6f9cccc2f67268c3fa
+a698d3f0b1b6b72b72358d5fd5e49e928cfde69bfda10e163b9b43bb9604362b32af1909d28da5e0364abcf5e96cc226
+91c12dc25c48aee56484172de8c6aba0d9f5eae8db848a7b53d76001c292d115ec57d816c2cf10bb9e901b2707dcb71d
+b0740219e084d56db4829daa30b2812115b2e95ae85ee96a140b7c4012860e8017e19b482e981547e50e25bd4ba76716
+8c84d4fa255e2de7cd23b0bbd110687edc47ed7fa87bd42658fbaf3831c6d68cde3ef403ed6c585f8654d0cd32074bad
+a530d3272aa1740a73e15cb9b31c5e2e54c404db72274b0840c19b164642389acdab4514b9b2bf9688ce51392d8b6793
+a601f52bf7b3226fcab93c67dccd95c1d6673270671c4a099b867bd5578d5711fe9acc9b935b867ca780ba4a394279ef
+8a238082dc8ae33314fe1257e7bec69e905c194ded6f894267bce97443166fb443628490755e1d453545f389b5beaa2f
+88a9737f3e9ded874681fb6cc8abe0f6e1ce18a05ab599b2f855f73e6fe5bf804de5c5dddeb11057aeca6613bba72c8c
+8a5cf70293eb99ad3c34992c47299646c8702d1035b75e4784cbec67b28cd4c88eb8c721f4cb8982d3c6a42d1b9f7fae
+8a62228b84fa7463a6a8392a7af767b661382175633c5e00b36979d816a53b388f31afedfc47a5d8cbcb645e8d5928b7
+92836b5a41900a1c1ceec83cf4f15c6177dc20f95eed23a203810116ede2a072a8d6c96532ef32c93ee21acfb14448b9
+b4e538d7bf40c263dd1ede65c81883dd31f9237a0fc8d134a2b480a1a681dd89cd2edb19e63070ee69e96cd12069ce3f
+913eceddd4c9939cf82c7e9ca5ac300cd79dc5a72b8458cd69e9f8929168eb19e5f21eac12a3b09eb8d3998e28e3801f
+81f4a3e7195661b174aa2059796dd88d3206bedeb7d7cfbb7e61aee335a01ac50bb8edeb258a68949492d4ac6215d95f
+913a393eba8eb88d1076effa8d2a30258d83635ccb346f1bfe099fb5fcc69d0457ce5a79363a618f9e8b43f53728433b
+b11d721b08be428254665bd64a8864d78c5112e252feccca113631b2818fb729129fcff1e739178507ece41b807ffafd
+92603fb7d50d11b59fe376720aa57412b866fcd5da90195a5a401e6222201b30c29f8797dcc1b41ee2cbc6349bd5ee1d
+a466c5d41cd4a8d1f47a650ca67b529ad3873ba3fd3a36db27f7a5869b74b42381788bb1a1c100ed184118839b9879e5
+85c50607a86d4f76826220286784fa9b6ccbaadccb661fb3489fd35a3a8917d6999ac891190f2297afac3c37abba2967
+966320c2762b266cf7eac7aae39221599df4fd608036f6101cb8c68192fcbfd5f61c7f93172aa2be0934486fdf4816f6
+ab69525f1c77b6706592cdd5b98f840184b49efc6fc2687d6dad3b014f6a12c4d5cbcb5120d8869246da010823534d8b
+aa2c9df15c06b58d7b9bdf617df8bcda83ccaaf6ddeb8074db931f7f03dc06a7914e322777e297226ee51dc8268e80af
+97035b62f8db4df6e787cc2c940f2298c7d26c2127c7a76e4660d132a14f43c8bac8dd4e261605611b2e9c08929f2bac
+8ace33e696953806f594427f137e84ea6b22ca9b48c3bdf3830b3e951e5a463d4a7067c68d2033eff452295a741fa1cb
+b621fe49b12580bc8ec68fa39d5133875da23524a5ebc793c35040fa3436350d0f3e4bb4e53eaa23d312a7847e2eb2d6
+ab7d6ccc0de9c7ddea145e83fb423a535cf26d470af3326d1d6a9a579592b32ededb078bae4613028557877a9fe71642
+97528eef76389dd77d33ee7daebbb290814911beb725ef1326c3160b9003c3043be09bf3f84e4818bc2a7960ce1acef5
+a408eaf5c675b50dc1c655f83b9595dabed68e74e6d2eca5a4948252667413cfffb46358400df5d35f92657811ae56e2
+b36537726b26b474e184dce0ad868a66f0944b4105ff6d35a2cae0f3a520fd14a66630388aeba178d400b5fe104e521b
+b2b88518d10bdcb111c82a261076367e34718f1d0a1a06b421891b4eca1e3c1f904b66e65dc914ff1ea5991f6a638a02
+aa3172531879a5c8f594ce96277b2c8c8d4a2d0f4bbe567ae40d5b36fa6108e00f0b1dc94b81f36c9eb6d1e9ee1896ca
+a53975587f10667a9474ae2756faefe43e7f81bf9e051049de175a8ec085530fdee3d5e3db15d4be874ecacf49f31691
+a1abdc58bff4fad0f6562338daeacdac8e37f9f3212aa252b17389bd9c54db58706129a63bd0695d299d043b5ef0e2d3
+b8588fa1090597fe0f6275e5779da11a4d128c52fb8954e475c4940f1a3e10fc23ce1f61e9aabe8a75e82824f718a94c
+8a1981c536747d4cc06315c794f1536db7ab3c9dfa024a0df854b948d93bee72083b6c9c4c4a7ce999c98b904813a659
+95b2b1ed525d629eed454bd6bd059b01869423c3463a56689a7c39cffbd3453c962426a1126ed631b25ae8cd7538302c
+8032c60f083477693f533c2d8ae391d62ea754b8eb41ce9cd59bc469b980dd959a8ac840ccac54b404a9d08a6f9e4b98
+a72ccc14eeed758d3d43c51d68341fd7e98880c3687e122238d77dac8d987c8edb3067bb63baf13a0e57fe02334545c7
+aac3eb536a5061a8ec788ce131582dea691957ce8b9c6af5ab7224bdf0fd15c77bc6bc63ad037bd83e0ae52fda738361
+97dfa193800e57e6b19d1b7fbab40da6dd1463f043eeec34b316ba6bee21b6bb633ec0c4fe107c9dab6e06e07e0acdce
+966ee3cf2f54777968fbc34f08c8de121ae7c1d6b2cdf1f1f9c675828d22ccb909bfdffa2e3f2ce51b0cc85bb29f8504
+a9df6dfd12f8c43c28b929280355cb23ab0ddd2cc2e4fe76603a2e5dc2ef5d1aca2edf89b304a27345cbb1f24a86cad6
+abbceef80c744e5a1194313f7b84b5dee1c9861cd4bd3d0d12c433e5f2e8c6ef6f10b860abf3b788aa04896f708426bf
+b1dffdd81711e9782c992c4b14583ad9d6c39ef88974682a72e717e21923da6892490d7efd121423fdc638467e62e064
+817f30dd799c422da33e13ac2bada8cce3930233ddad495f714a1c789b7aa8f41ff6e688bbffc5f2e8dfc72e5243b645
+96760a79e4414ff1d19fee65b6e65b2dd6665323981ce8b4ee93d0a9c410b018ac086c08fcbc7a71720e1e3a676f2b3f
+95445cabb75909262975a5b06381af2bff5c4c6cf51cc84adbc0b7f2a985117f35c014e33672cd5216a9737d3f37e067
+a279c905fd9d49482d213f5eb98256d020c2b90bebac45004d6f152ee4ddcfc72a7e6b188ce3b6c93ebb9ba9b8be587f
+8591e8379a78af8860e6a0e002be5b25aa4b93c5e556f5ae2e40400f828dfa19d93a4910823e230a51e2c1ea5464d437
+a6fde17d41fd9f03605ab6ddfc992e36535a23b2c39608d30cd6d72588f1ec6afb9db193e88eb609e104e73ddde779a7
+93e2cb6352a5eec063151e5c9a822f6fd475a072dfde2464af4afaf6a730a6af1fd74c424c09727328a7f23505b91407
+a7b1e4f703386fdd16f5fc9b59ef1dd682bfe5a23bd42b3c4b1385bff894e758ab09674dd6d0ded5b32a0a0526aa6d98
+aa7f01c450e619c4bb42d6cb1a90a94dfe132a641728a642997b71e2c3b02d09a7695b544712b2e14416e7de0252fb11
+ae840b870a938668d0d4404b76f5d4d252d8ae1e3619661df0890ccbab900e3d8dbd5dc9f96013413e3f1e30dc541db3
+ab7552930ab07b0f5d50edea3a2e5ea3ac1a05cc985246ca066fc3350bc58949dfb99d4f6a6408d1bba64d3de47a3c2b
+8053634d4c730b5e90d68c2830a73e93f1c9e522ae0e00a04e2ba15a1b7b4fffb8b25516ceea61719f886c7763d46219
+880c39ca4cafa622bc767d3127d62143434d0a1d7de8dce1a2f94cdcaa023a7096641a46e6b97e1b1ce9c233c873a519
+ab9d46e46cb2f382ee7d21b6da01578b786b7998e0fc2b5d5a4e1a0d93aaab997b5c481c2d9a741865d6460ceef57a5b
+857a5957adc3a888cf93f144aa809c70a211932742a258978af5e657f4f57fcb6d9e39dbe8d3128fac6c592dd5bc4ddb
+8c98656861fb8c8a03d491db45077f1d136a759177842ecf6c1ca36923088237e928558433d5b631590f395db56f96c1
+abddacadd7d536e91d36609fd0047f5db113be0f4d84abc7631ffc5c00df919c085c049c013a05131150b0043d51f892
+a8b14af12cfdd0e11c8487334efbfdd22c8b4fe6bf350333d42ac8c704efe54f50a4bb51d9d802e5185ce72e4b21aa58
+a8badc2bb3cad0143db1bb3cc81751f9974ff3f0e2ee35921d04985409def84ac2803a657571699eba34767b773666e5
+a6739a05d270efdab18462e8536f43dad577158e1c1655fa130da97e469adce9bb7cda6f9ac26f4a9ba3f9b22329b066
+842ed6efb4395603e7fef0bf92326c0c63992da4ce7912f850c4960f7a19e0b2ecc720d9510f15ba6f73a2c5ada8ea71
+8502ede859944047898d533e1923ef90e1b5c17d985c9fb4c6aa39d50636de4c5a4df278f2f62cfd3ad08bba4c5ca6cb
+8c738573226dd5617b3ca1dec8780000a77f3fa8de241cac99b0d9b1b6c90cbb8aa2009668005f2c5c7abb09c0ab3f99
+b101335c403d769313bd05c755a9196769465f7068fd6f9e00937f3cc843d48f013f5931f999bb5c0082d4315134f5d5
+925ace190259b321981fcf8bcf52c6852b206099f25c0f278439ef6edc4320d6f926cd6fccf1b4cd224bc52e5c681612
+95f5855ad1bf14224e51f7d5e0d229683c0d38fa324b1abe9d595685d3497955e30289618c4775f6083bbf923ff3a37d
+a3d3c7100962c8b60c40b830af834ddc48858e7eba5ebe2874ebf74e505c25cf52e661b49d7619f2f2a039e1df02f5c8
+af7e66c1d5dca63e6be117b210c616efd533e77199d67d8f694e4278841963e0a46e4e44f0416e69bce6a7156e1872ca
+ab796760166d1e1fceb20f9bf19b1b7cfcd327650cc7cc35c161ddbb3cd4846e9a971b541f303cf62fdc0124688fbd41
+b920211c5b440b3567942dedf62a65ffbcad1e3516f58d14d8f8dbe86f45c4b9745fbce43f5219b7052b27a3a04df12b
+ab6d5d25b9fc46b0824df1628993e44535febd7c62185b6795550388185035ae12bab60fa34848f465fb4f4a8add3544
+a6539b67dfd6f3976cb6b304f4d152532b3f08c02bb97730c03c746da0f7b38ba65536faa43953d46e5e7687a86c356e
+95bb225586b1c82d894ababea7e5dfa8468bc0e10a2ef34e5f736fd1611114cddaf1a5c58bc9d664b667adef68b5c25c
+a16eefa4e6161a8e7bac63cffb2dd5cefcae57144e63b3fded581abf7ce32016a654aaa582fc25bfa51c83f352e09372
+8b742428f6af81261a47a0df061e480ef9176694d361ecb57967bea67e11cd44df686e38e35b7d4a6ee02ebd520aa1c0
+a2a4f2307f646384a0238a711c2dcf7000b4747b8df1d46c5da962fdb106c5339790b48682e8ec2532b8d319ccafae5f
+81910c1d72f6731d27d3a4059ccb0316faf51fa58e0fb3d1287b798ea8f9b00bbbde31fac03f93c7e9a1cdbc9502d5df
+b846b933c2acd71e9f9845f1013cea14d35cd4b8f7a371b9be9bec9d4b3c37a2d0da315ba766c3a126f8e2893f10af4b
+8ffad59284b41b75064c277ab01c5b4b3a4f3c4b355bf9128160b1a55ed6b0d91366f7804006b4e6991525d3435d5235
+82ff36a72533fd5d6745d0c3a346fce4f62b6aca0b8eccd11399b482f91cdf6a5a4135c627043008cb137ef4ccd935d0
+a11c27f6eefe54cf32fd86333d9ccb59477a655bb0c35dcd028eea58d4cc40ef9a26cf3432fad4e9d058a27b419b8f04
+96642ce0eea3c2c0fd155a75bec3b5cd573d41e8081632c56528464cd69a1141be3180c457213128bcd37f5fae47f7f2
+8349a9e390e05150bbab2351b77a3674f1af000b6eb6752927ef838b6f0a1200e6fd7201dad8565e3caf3802f204246c
+b8ae7fea6275ea61935d3047d8156e8fbc4a95c9fefd1c36439b2111b9ebeb7ccc306e0f8c875fa772f7b433cff848aa
+b366f056e23905bae10ef7ce1728b317b83f504d128f5bd34701ecb0d25ec08491969625e23d5a2fcf0048af610664df
+a3d88d506ba46b73bf07729aafe9698e788fd688647a6b4145761275257d262cc450c7889b8a40d698455baca55e3da4
+891ebaac7a7a408aee4ba61605f44f9ca5a6d5e046eebfd8f5108b6dc4479482806dd01686045b4c7760051f22bce468
+a6ddb74e3e3725e6f2d9025532ee3f357ee35289e1cb38dcd5b2ea8ebc0bb697416fb3aa73e1eba632d593d40fdb030c
+a7dc097f440ebd31ec1a005648468c702bb77073ac8cfa32b050e90a9e1cf388f138abdd18f07951c752f7e19f706af1
+a200f25299f9a0542c196adc2e00289f453411066b88b125d3f0e6b17e98efe9da8096312a2f1841e01837da90a65440
+97cd3a9d4185d77d4c7bd4ee80928def7b660d8b949b0face798c62a7cadce1000997af29504d28ccf9070fc3016dc56
+b9ebaba1a15eecae6b1998ae6d08233d05610dc0933b16922076b2dc4418cbeb4e5cbe099bbded3139d8a47f2b2eae10
+86f5fe8fb36b419fe6fece1c5c4b9d64468b4aa0154bb5dca466a243b6fb1227c3b8bdaf7ce5c2d4fd05c061979f87df
+8050e011011e7918ebc25825d9863c91046fc3756703bdedf936dec2815cbd10c2403ce6f4a0b4f576cdfa1347efdb85
+ac22132a482d2950be9442167be214ed9d24519073bf5ef1c8e3e6f4a77065da198a851950330fe4d62b2a1272835015
+819e2e8e3ac43b6ae4885899346f3b558bd7658ef7d380070588154694957596695a925a001a9fec7cf3655326c50c2c
+b00f40c084d2eafa36811e0d822ffef874a0d4bebd4817690408a737624be05c920a08307cfa0c1195505c5e7a5fd878
+8355768c09515a593c8fc8289baa3b6cf7fc10d302abc93f72090ad99a70a1ef1107eccf839be722132259500a565d68
+8bf0615d2cd11b03546ab7a0c90c0c938776aca8a8b989a709c367f0f5eea7b0a7cdd78f96050cdd5d0a123d01b99c53
+827c2cce458464fdc716a2198fc67b3cf2ed7802a1f53f7a2793b2314789998b13ea61343c723da8863cb63def6a285c
+b609cfe6acfccd632759700bbb0a06fc7903a6c0c5875c2c3bd85c65bfae7b29b03e77092f29d565a6a89b85012396fc
+b73ddbc330e872363bed36578b245b666d42923393a1341816769ce0af24b700c19ea0f579e4f9aff1c3ff369e63da8b
+976d658085e5978807e13b150c7aa539b44ab8855a386bb58a52d9ec9b5e21ddaf89a18b043394d6cf47bd589d04b240
+a213897312aa28cbb2c572e643d3aed003c84bc2ca571dc5fbea8a0b642313be94db0047e293078d975fbc6800751a87
+b54f2914f6a7508b6686280d3cc955730458ff035978be29645fba161ed54ef3d4086f956e68d2a48c49afe904edff5a
+af99e470055062390904673e18d04427c16afeb7b9f13ad83bc2599e9a92314bd91d6f1f81b55419a4d668bd889ec8c5
+946ff0cff4030b73a1342a9173fe697ab20cc5e43ea6158573f2def601e12a174da431f8170bd31ceed4be48c90b4f6b
+abc51f8bb5f74cee819ee383cbab739026c453bb55336fdf423af2c2ac6712ba90006d62dd72d8cc1b2ff6cac900c8b6
+b43623a56c5fd1bf28bc356fb4a875d72dd4cbb00c9c863646a3376937088f9932a4a0aa26afe2ad69840b06242ec76c
+b0f371952f99eabf7ed368a142ee07d06bf2b7ec1ff852fd948b8c53eaa52300753fb9ff6765201e35873b5167583f3a
+b3906488172c09e148c571ef0712f88bc9f1ecae0db95380f61901660fc1aa090d0740378d5b9b76883507bed100093c
+945373b5e6ffce11d39a722df7b24eb929b14a967d211be3b969f48fe1ad3dd4280317d1ca772a69b033f3bf26c02c4f
+b2ad3490389fe5bfdd5ac7eb5bd61facff8d57a8f9969f4938ea56f4a85eaa2c1179a2e5b4f87d9e6409925c75b61828
+a4d61547e405319cbc20cad16a2bfd9e6d093a064522c332dd22134ab05e893bc84786b21b4c71a6265bbd06da2ef4b1
+86749c26715d22b185e1b25dd34818e96aad319d7add22a98486ef9f9808b5e4b938c6320d391dc4e0fb5d57bd41778c
+acc554d5b866693a453a9ec46d422c8b410458fe8397384b927a62bf5f2b1fb9706c8c21af9845050fea8a91786e3577
+8eb7e763d297cd93a7a54dbe4654c39c0ebfd73fcc34d3f1338de0c347676f445d32f270664fcb7b33347bd377c9f867
+a1b469e3f9dabd36b13149c83aa5b7b5987eb0ecc1ce6b68c72acb39ed503a11ab4451e658576a92df4aa51d1bc709f6
+b1ef105cd0259486be8f265a73ea089d5b7fab7bd7547932134539963467fb917b2206aa72446e2fed5a8185b04d345d
+b3e211c1a14925f6de451271728a3c1e555ebebecd4bae29bf666927868039d4ec99d9f9aa98d835da7845a5c863dfaf
+a416632a50500f29b6bb471bf00b37558975ac91e5c5b5004b67e130be1acc954a8ebaee7efcaf6883187ee9173d1ccb
+8c655a85f66b5f28ab8760c94b6cf01cdc36fedd19a09c261e432fa7eda7928c3c88355384e689f1d2715d419fd8d898
+b1fa9f82c9866d4f296755bef5b7c39fadd09374f38ef9954aa57b1431a1ea4cc17a9750da844fa1f5848f0ab7ca295c
+b45cdf1a9eaaf85c0b07bfe239da618ee649ce90b417d90b08eb518b1fd88c0d25cd29fa7a0d8058d6616627a3dda306
+a2be1552d3c4142755e0371a9543032ee82ad669d7edd24c4e2941bde3b78c5c6df427228fc45812a55943b3663cdbda
+a28feb053e86dd9e2f9ccbb7c38467e2425fd580ba0f63190036fb47d01eb198ba8590b5cf68d1c0f47638e9dbdaec74
+ae06b849e080efcdba86fa03a0c9dacb38a15ba911aaec624d15787c3e11ada6909b1e33a2e3de928a23818d833eade4
+b4888445d86bcf4d1f6a9c2d253f277596795084c3d45a4591b307b7ae4ba177d6ce871c2cacdcf9457f9c132f244722
+87a568aa2f5471214f63932b0d48e589898e82a1f4c1055a9e73120763430537c233e9a3cb6cc178df53768e4c58c993
+81e0ec97cdf91ae66d065234492a1119198c396e2db204b7edf192c88eb4238e0a45bf7e245f3714bd864244cba0ebed
+a954a3785588d4bb3cfd7cb27df45c82e6958051f916594d76cdb35bb07e4f88e2831a5cda35fe1f3c99f32a275f0668
+a9c9f4d54339d414342e87b03679baf29c219d28b6548f01891cf94d0313a64d3384658d82373d6e838d886235ac446d
+8ef46cb24432b419b4cc803e60b3ef5872db8ea614dc37643e4592fbb2891cdff61f6b2a10653d9e99e6c7359ca4c590
+b23eeb458c05ffa5d58be21cd0699974694dc61a9a928fb1eb509954a3dfe7d8a71620a2d4046a448de0fb213be7e97d
+ad631be8e17285f6310fb72ba913c564fc66d14460c4e8c4b0c68c572a5c2a45b088ef60eaa9d317403bacf534d57a23
+b7130f5607f236374f5e023fd43cc6dee38286ca47d504c9e75c6504957ac2bb9134fd59d8bb1010d545c56ad9c71c4b
+b83cb511757d80781e26b5e9b3e0597c4cf9a976a3fb60c84efeab2b6793e46282612da45b1bb8b45af4b7f39877feb2
+a0c5f8b0027ee11cd5f86515698f689ad514cfa890ac4ead5502b5ede9d7d7ad12285f5806c9c85ab58f89bd9f188938
+aa8e8f9335c6e34bca3472b5f412ce93ab1ed5f9e51c3affdf986a5badd2ba3ca1ee69eae53ba8144927f082371b4cf3
+b2a4f775a10cd9caa776123771f08e928ecdb22dcb91efc440c69e37c6b467acfa6112c2776d4a530bfd6df3b04fd50d
+a0c553d5d2a9b0525f71a5a0a539d579d937275df9220a0c3c322d6c0ac7fbd2fc55335a1a283e687856e2b30398e4b6
+8ab800ab4c810e8f6a9d42d2dae9be89841bc7328bab06b88bbe1256f720ca99c056fbe4e1378d7cf805586ae18dcc55
+b9a8766f4f4bf796e2517a8a7a05bafaa6d3ec601a85c466d33b8a7e0498fa1dd4e2a9e42161fe2362c81d4c8ee1fbf3
+8cb7d054162e9f41245b0914e7dcf6108ec11456b39b473ecf6c40e56b172fe5be4e7b0753a3685667436796a977b977
+9131d0395897f5591ad56b62ef83a3ed9e7b3951080b33ea606a15742f78a283f924373e813b877f32762dd69884658e
+8d784d7f0884cce988305d314896dc6dac2d2934cf5d650904e1397f9b9dca397eb7f3accad60ab5e34cb2e494bb640b
+8819629608ca1535bfc156c1e17f8fce5821d81e6661bca75a1754a5919d0404e31e65bd509387383a4111535e949f5a
+820a6f46e251a1e6d92784aee18fb0d265d7e2f0a5b7e0b15180273eabdefb34f1d575e1d8e93dfc2be1114d10abf31c
+8d10d0e0557beb8db344c2d8bcada724e720823fc37ee7c51b322c3269559ae932bb2ea07e50d7ada88ede788839dc8f
+911a333e2f7578a0ff6533284176cf235036047a11534acb649a0043a326723662bccddaf1970b7c37b5146977277b88
+a4be2104cc5d6fce4a46de5de8d210559a6b743b6347b8d9990315bb56cbf80695ff936afadfdcc415d88b23ce6863ce
+87ec5877ea8f1123371c49263dd9fedfbde41846a23e12073ef80f7afddf5a0ddab298cc02e861a90188ef1282139ecf
+a3f1dae70745b8284b1353aa6902ebe3cf5580e24e02490d42b2f509ffec7e8e777fdce4f1a92d83bbb23cbaeaddac57
+8ed5a0733b42482d88da7c24e85a841ece65f6066dec060bb267a8d1f1ec165ad5f7964c2908d3fbdc2999c580eb8990
+b124a1db23f4875e0caff1c7f4b9a411564b93a9ec3ad8143bc7a70b8305d380b934c194de8201f7e3699e905a1f0115
+8af58886d4ac5578a29c2e309a68f19a62edef5285d0757c42f0ec2550c633c0e991c4cd7a60df4523cdde40c3909345
+a63fbdbde883f54667c6cacb356db1fb976bad147b790064ff25ae72be53bb6f4d74b22ca803996e0d95d216caa3fa81
+b99fc9012ad938b36246a4471d29f0a2b37b2a3be6fbfae7ec9fdccbfd14d48fdbede0d88ef3b6cc273f2488f4cab55f
+acb6cd4e1672eabf530d38f50ae651db8bc4025c2557c59ac4f1a278b4741f1e2cda978e5d1337f9e5aae77c95ccb872
+8f8f6964534e4a9294c61c76206674d836d4d56970e9c14ad6835adc6b0d256402742d8a4879764569d9082ea6a750cb
+969607ac6ca9bbef4fbc2fac22b12714a31f5d6103dfb998c3b6f2776283ebc7346e81a22da168af40752f28ff60d97b
+b633f60cf6eb8ed588c545c04972ff156cee767edf31720c9715be3cda8c8de0290b623b22cb8fadb1690bf3665a7be6
+8235bc2e818e4d259bf2c9fcc9646ccf83b7e238044e26be417d1d0dd5283d7b38c86e8c88a5447645be191516e2993c
+b503052246ea840a4083bb4a8978029af3e242e831518bcca015f2c2df504e98a48c9002b6b9fbb97e861a0a3c5b4b5c
+a145ac57d7c028c3cbd2a2bfea25caa35a9b5d69cb491b13eaadc2b0d927a590decb7c4995541f8f29089a2cbde6429a
+80b4c0938058fa5d03c948777f13c70f46fc025d4d6c2f2051915b476eb0c0bef902374d784df57ac368c01e1fd51c00
+92eb253e3b1770b36c4b2869a944caeed7b5c8a5b8356b25dcd4102df79fab8dd2c9d01e3253070f1206d149c43f64e2
+b7979ad6187f7921e725787b0a99050f4c98762c63fa64a467f7f110932f6d07556453a95e3a2c0162bf1c9c41424c90
+8808ae4c7cb38202c8c8bca0321e827580155197a700fa54b6a15b0f14b001327d4c9a0923168bb5afdd1b45d6a78367
+b16a4ceee9de5f49a99430e18aefc192f3c1ffdc4b41392069f690893bccdca760e6dadf4127539a763e4f60aef37dde
+8ac113da7ca59ca97d6bf7d6e03f1e9570867bed27230515475f965ce9ce0b424c85810e18a584ae5a3d5c2c80c6d4a0
+847ae1b0ef5cb11be37320f3ab5e30f59d7910ba3d7cbf8265c74df25f4b8f56f1ac96cf49fd166c3b6985d1e8091e6f
+aaa9b04f50ed6778e2481842cda30c7dbc7d462b40c7602a438ca9f2c1599e83fe6423f30d7789fd240d2e3166836f5d
+8c18492569faa8cfa1c2a05a0edeea3f63d003e38d9ce23c4a5b31cde993a4ec88c9db83011ae15b578e0d0f6b72ddb8
+838b400217af9241755032c21a3ac4610f77f3ad76abc43f0c59a59f9bd52f2251e46fcf1552b6ee0220f4f2902e54e5
+8675f8de084c6c05644deeed1ff45090096c72c0db6bb2ceaf1c0d070bd10ff1e83b2dcd89b6f99bf132d3e131ef6d0f
+89611bc63c83d56131bc2a8653278b234b4635aa7a05033d71a8377a5d188ffed7506a50a5c37a33d199a42b9e55fea4
+90c290c17f1687a87023fadf74b1e10ad0c0414cf08629b2a313347f0f6913bbe511e5d18d1c3264b47f65dee7887d4a
+a590bcb6391506035466dea82617f11dd9417c9f379d32b4c3bbf723840e1a3124d2327deb28849aacac278470d7ae20
+97c55f459ebdf94ade7bc3bb18b329bbe2bccea345f0b4dc38cfff2839749b8f9365e8a1cf31722649c165e265344c35
+8159d02fd03c1d0b3c928658b3df1a27a57699ed8a573e0c3a179e97f50b6c1a6467b7055e42f9f9c6c858459eed517f
+84d4f009c052f3bf76b2b972b3d8f7a4b2d78605a566478670c33016aab06828a1737a36d3c9173583e7bed0aee84fcc
+b99d7558944ac2d61f5a800c24ee47fca719e69f7284956be94596623cf434a214c042aa46d54019de3556540ea53236
+8d1efbad46f69b80efc5776d8afe95dc0a8182d57318b9f2d6fb5b7d5c48e7181e6bd61a8446a553c58f7899ea7a7c78
+84a9cf6a9d64cee7e7d8f0b678d3606c9080ab3ecf62fe0d6f994a681de68b30534ded61db1445a257b2c5427e97b36c
+b6a5d2c55a23841a4263b10cdf784be6fdfe1b25350a4af510ca294949716711363ca19f9c44ab1c347aa3fcd60f0573
+b1b5b6dbe6945db539fe7e2de07d222c88d7b91753118593ad9890c55c4c3d83b4194f886ea7f66ccbb348f5a23a2a22
+a8a58169edd3e58f87fe8529f5cf7da7679807467ec707ab96faedf75085185a78f2ef912d9180a5e820adfad32ae4ae
+874c1f416f866756ae3e93360342848afdea0048a575f977fb1f8a57325e50da122d3e9f423e308f0acb1b28fd47a6eb
+95cbe8b47ec42a5c72ef7b1f91e3de0b1f648ae8069416c48d5529c9cffb104ba4dcbe87cc06e4e798a1b23bf1595f9a
+a1b6e9c5d63ab1262559727872d1140b74a4f01c12366ed2d401c64007faf7917ec591b631c6bb4dd44b39aa43c7f965
+89e6f4a05679c95d45b54e760056378a5eeacc72624eec8b5f19aecf8ef0d8acfb2d807d3b88c6b1206827203f219905
+b7f7b30cdea6377d5f16d200b987e3b4a6f28387faa701dc579cf7b3c6887d74ca43609c5bc36414a6dfd0317ec75448
+83474b58135f3e2c5e8355e31ae44a77721db71cb2919c3f3403f44903622d4116e812ea9ee9ca073938dee780f4aa22
+a3e4cbbec770630c5e2f3b67059a55b1217435bb70ba5b5010244e241ad6a3e6b8d9261d8a0765c4b42bf795fa4e96d4
+87d3ebf0fc03ad67299f3b9cf9c9ff0890b1d0d2d1a0ca2a62147444922d207663329e49898d79bd8e09ee48a1560fa5
+a1d33282cb17c7a4c5cfeab4dee8875d324aca8d0513567c4e5eae180d1e8ac98b2ef16b31afa7c3f2ec25cf3e8bbd11
+b10b6cfe3ba563b41ae0d66813105948416ce0848ba3b34b8e96547e8842086b632a52904e56eb61d93e0cbdd402d305
+84c4feb35c8d3583ca17245e6f7e73cb488aed515c2ef671b09a04d8eebe6b7579e5b1fc8634fcd4c3bf8100d2cb98de
+918d8fa2f52a9b3957ba412c24cc579dbd1f0b0834b909a6ac0da5dc602ceec17046f61b3d4a2658f724757ca8041fb9
+87296e4775fb887bb00dd3265f202f31a8fdeae5c6ad8ec63508476cc57d330827d0d241c68091bb724a2ba921694a7a
+a8908019d96c506b314c84b22c475157daa36016a9b94feecc4571e869918e4e5a9e39fb7c9ae0f73f9f868bdc50e2af
+abedfabf75a93e7521eb339ce2e22e0e887f94ea28d3adfa42d1e0523686c6cbee4c96b2bbab3b8393feda1099b24d4b
+a464d6bb17386cb431520cdbb3818beb3951b0255d72f58c300fd780aea1fe4dbce5532f5321e80e16db2f9b9bfe8a1b
+8cb8fe0df930e1e19446ff0183c7034e35e33442da346df8a802160120a5f4d8abac236763114a650dcb1a1d38bafb37
+975c47ea6412bfa97db9cf12c2b4c07ebbda436716aaa7253b2343138b36de6c897386833849f539bad7659d9319abce
+8cf94457a5a708cc91bca9615e599b0c0afa92a7f2d9c83704e05a3dba56a90c4eedebb6d2d25b3080786e16c27194c6
+950d02a5e41c8f704184c7c59715fdf3b48d86b53b04dff7c21738c7c38c9f4f75349ac1e70ca18a0744b01fb8b13504
+9458faad893db4458b330ee283d6a90f68346332c99cbe8e121c890bfca908f0c91168072aa221c3c078d7fd5e4b44d9
+b0262948c113fa2a122dc6208250b62ff35b12d3aa1e5735e95198424cf16a4829e9211c9edad83989c537572c5b41ad
+abed7125de7dc52b0b42cd34fb350d4c6c45016319ab776b52289bc8c2b341a15d48165c0eb09511a1a5a5ed7ff39e4e
+b4c352b4a127afb5b0833d210dc2c216bea666e7c5a940a3372988c0b02dfd236e4ac7c124664bcbf353132d6f061f3f
+a334c5919909dadca50f3124de06400df660082b527f1f32b386b9216d021d38685f1839bafbaa7950eea6c1cb14bf53
+a52f4534e9de29f91039af3fce055f2f6726fd9b10595a43ae41f7b466cc4ea6314487081e867ff4b5e35cd622fb428a
+a68c6ba9673896bf49ed145935773fa50d95ec0103f97a6f1ed698d93b4dd78111325f797e47fe153fb3852f4590ee89
+a5c456d516a557aaca80441705cda63d081181199097e83b22e9cf7b9947a8bb78cc476642f04a5ca3b13032319591eb
+8a359a3dacc7b45da2b826dc27700178553f6a52e9705451f24c6d6026a0c597328acaa10b3b5a883b6353eee4eca594
+807217b435d73c1374bca84d2d3e069db756176220a01607b81438a70f69232b82099c676fff361dd909271be8d5d555
+965d0f46eb0804f19dd700d8721349287335c70e992efdfe89058ec424b87acccb3fbb18d84b727ff5ccb6f6783e9065
+aeb5f2a0bff1e6115bc2fa73093019f8c679efec91d03398e24651be187265f7ca80369a1dfa61e8701385dc0ce9a0a8
+85732f872228dd5d691f1507ba00cc94e054baa59a764565401e9e9b3287d2d0cd0f2af290b28b5e3c80da9cf23ded63
+8e9a315c5b40e7cdb866b8a7e6ec01eeb27a52a76a88d5956ac3e66fd9ade3ec954acce816227b57fea6ae9244f1303c
+80436457879607efd008f959cfd7507fbe22e417c701f59b5a36e878a04e51e87eb38c48c0992333656b24a4e671bfb3
+a012f6d166cd1d98098544bcddfbdfa956ce60011694b640b012da3a0a22ac8a054a9e205aa9fae4df764ad60c65a6f2
+b8225afd6e4d45520678e243d97bf48f87c2b8d2cbc24b43f94bf6e7f60b7768d4c3b30d28a490e7c8a1c3a104ac8317
+8437fc2ab6d90716419f544a1d16c607173fae5bdc242d8224d7714c115cc54f2246d1062ecd77d5a9cd3ebed3a8adc9
+b113c6c63125930882c18f548c1baa69a26f9f3dcfbedf5be41aecd61adb896ff9622ce038f0ed27a5ac602b6020740e
+b893aee6291a3962fe17ea41322de7edbea6ebd51d2c564fe23ba8a4cf4b6270b7ac72c87f2cbca209be1ba607ecab75
+92e6a7494114cb4dcf2b86ba61f57f6db7e4d52895ba6c896433139eb2ec9c9604f3e9100c690e1949e32f5b7e29de93
+881a323e772a639553cbb401e2b6a255094412addcece2c99ec9e1346aea2f4e9eb247552435eab74799ee4c7a927b6b
+8d5d3ec378922311374fcb998fe5a42176448b629a6475abe494fa56abd5faa5835af37624c138beeba649f7803a4855
+b1a082ba449e93cc15fb4dc5114351437599fbd4d28eb6b4746d1bd242172518f94b2ca8b1f76c08d9f6ef260d9cfbb2
+8fd2b7728a3c61cd8e0c607cf40e935dc45d52d040ef1259f62e3eeb30bd3a6cd030fcf407fa0b21423b23a795a02b90
+9214aee5787f4666c3e2aff70949dd679d4203a2c3e7b6f88c548b80a3e52d7763f2bc2b7df714eef053f60eda4db331
+b15df25b62c6f4ac9edc414ecacfe8eec055bb07a1220e327bf35c5e452da7620df03416a449197bfc8d948445c5f734
+b41ff69731e7f4308fa18ad286d3ecd7be21afef3d32f5133a0bae877a347f8773c6e9d9b3b850d054236a6f186e6913
+8d9d13d1b7d9df41cf5d30dd62b9d1d2c4933d62b6cf8d1830bd1ae4dd5fa3de36bfa1fc4d57681ae13996f85ad2551e
+8011a7fd7534b248db40050edd9752c960ffd89b0300a91520759ad51da1698454affb4aa8907946605a02ca09a7f340
+9159054fbc10164fa19f68736c2a683d374681e6e9d5e56f7496aeebb0969b8eb1a91e377b3a2928879147a7fb60b3e2
+afd4980aa4661fe05bf9040f6551d980af562da69ec5072104d8ea34a8ebd28baa0b70e0fe3c11f631005693fb99213e
+a92879cac7940c6d363ab3d0ba7f7f24bad0b16142c78969a737c27ebb09a62071540bec1822ae6224d943d02804da50
+89338d27ba29343279dd83827ae17a53e7d634bc77bbd848f3b6a352fe92f6021dc1c81ea6693b3cbcb1f24188edc757
+a2490a856c273b6eb5242672f817e60a157a1dfdf25b1d32e0f4836a9c2371fae72c93b94d78267b3cb142b4f4d7148b
+8efcf5d06107554f896084e32e8dc95c49fc5da3f8c4be4ef6f2ed89914233eaacfea886040bfff14759ce28a1eeaf3b
+a3516280b169a6832e997a4a45daf46aeaec1d8953387f493cacc2835a5791d4dcb24a0c0ad5de79988d76f843d79994
+95eb7531a46bdc51acacf7fd9e7210bf6d5ca59b0efe58f79422394447adcca6f4ea991600e8558da8e19e029701c5d7
+b1fcb4177f16187c76b421c29f715f1551ff365bdce9fe17b74425f76dd90fb4ebe828ffff3d20f75ac620abeb9381a8
+886246027be4062258b232926cc82b6a51591138561ddd0173ec6e4b7ff750e15d9ba175f569c266148c653ac905d498
+952c089dd09dbe531f2fd4137c971622fc1d85a78ff07de634f63853f62110dbae3646564addef8f2a070f5a16396ef4
+812ed85f4559fb28732d17c8fd7c6b09a70da454a2318a0276949df0a5dd2714b14096656b7b5b6398f54c74eb9ca49a
+9340db62e43e43144e1afb1da748e81a1b00f7b0600e8eed117e92ffcf801b9d89b494ffb003b4ebd5bb4e0eb96c9374
+9287c0745b4bbe24b56784ac28bec43ed2abb6bb15bf11ba2b18b01801da7d162aef88e967d2f10fb9f52f6645d7702e
+9615bc232ba6053fe86c6328eead899bd62c4f975273f72595407fe36ea43e30eeac7524bc17dbe78b4692d42ae81c04
+a387899b521b1a89e860756bd0986b302f3c06271ece653425d6c697e0b330a3ed7789efe0e5a1b32e60257a12fa0147
+b4c99909fbb92b1f39e9b2fabe05abf58af834b6c15ab0f62304ccfc5047f187a3ce35388ef293d2857b777f9938bd55
+97dcb90d2dd9291366b557936931550d665cd05bb1b19a7a53a31c2a39d264789477a47ae14f6bdeb171e78941a9d9e2
+81417b4a3e61ab9b48e0ff1afa8b523bf63ef95a6d6980092408b61f4293fb202395b10a5d12dcc54961370c134d5b0d
+9135da893ef0a9d45a719207659cad4a0590218303d0e02016bcc5d14f54de5fb8de642efc7826b3b3212f714114600e
+a00d0f8e2ea06b13f5a75a6dbd1f2ba7ce3f3bb3e62cd3b53f8b6ab39431fd2ce156a1aa4a1988613d4a2b6d91550147
+a3f8f17dfdda07166a7e5503366dbef45ea6b6eaa1dbe02b8051dff58453f1ac24762c82f6db6de4370869f9b25d6d51
+847c2b79076f9284d9a866a72f74f62fd73cccbe2df18c0fe34a35416d4825d364e24f95f728bc0e6a5215b08b6f0d2a
+9816284cd6b8b35e1f5409d3a5899af5f4524a4826470fd164fcfe863994ee3aac77cbc16831f0866b9f0ae561903d61
+8ab1f9feaa8ba2e1691acbfbd5460a4bab531344ce4accbabdbe5ba8cedb5d5fc0967def4365d755ecb62d83b7ffa4bc
+b0cb477aee9bd113959ff7b7675f81ef251b76cccbb67cf68ba571fc08561736e32c18aae93fc8d1912e7eb2fc0ecca2
+8cc41304caf0357d13a25ecf66336bece67d5d319bc5a50328a96199d7ca4fad05dbd7b5edda58be73141bb06e269c8e
+a7b4d91a884abad5337925c34d7fd5f2aea5a09ff3c027cac98c646b5058f7fe2cbf47208930509e2a4eef1468f64c89
+97d942e97efe46594e8fc86828ad3ed1c9133a8067f9b11bc0f4ee3815affbc0c7c46a91c40f989d50f1d8df96982ada
+95a7d369f3ce7f7ad7ddf85bc994667ca25a0c2f11b9312d06654599410d5325ca3ea74f33f21b5aeedfb582a9e40c62
+b0a05b564a754b46fc7aa4f5289f02bd9f19708b5ecb9db5c36bb7505c8b56ec22b53fedefc1df289c0f636c97e8ec47
+ab6e2801ea8bc600f9159d05a3b39e8b0973fb9c2696b3f2685424757a6953a9f8ddf5e29c97399c4821b8d7fd9f1bc4
+a6fbbad2ad3ce8e4f9b939080e9e7049eba9f76b8ffb57f7cac2aa46793a064743239ce287e156d49cf4936517632290
+a606632b62194aec737403ce5a9b6316178c1d27baffdac83981baab63e75d51caa414ea92465ef37d6d687b4fd90141
+a5a99b7bf8f4c109af04c31af9b5f3148370319c8483796cbb5ef555ee1d4858b2c1acb82ab5e26180254399fd7a0625
+ab2b00f64355ad294436339636e7764403b821d4dd4fd74a6bbdc2aae450f14d7dbe8423336e793a393f4580f1b9e35b
+a6c98a6ad7f36f16633fc216c12ca34e596b292524753ca1067eb75ab52facd28ed3a7c55e0a0cf1d3c9115a2a0d6524
+84acda31e618eaf0424a37cb3c386585a3870b2c24020550a16134ad8802d427c918e2854c98e5def58a2363a8e1a314
+9911ec15af39af1a18003ae120da8d909ad4bd43ff03078091d54de71de70e19786b2aaebaa5d55d9b2877004da2c271
+8cb5a148f065e36b67a219bdb347a625a7a4be8f20dfb1cffbb38fd4d843c2b1b1886c1f015793bbcb02af04ed91b170
+815d9adf22a36533fd4a3efae3c4326213ba2aad48724ef958cdd6f0dd5059b519e12d91ed5d92f1418a07b62b108bfe
+ae5c244f309467ada13e2fcd8942886f563bd996a5c65aee73a364c2ecab49be3ba6bc8a387f3baad44776f4f1042eb8
+a47d93b35f57ad890239a6f2f69ef8760268adbe614d5877802db4b6cc75cc093baf101f75be0f7b4d71ad8724dbb9f7
+a0d089701b965df9fea938e337016ab20e0e567e736e6652955f1a93760b4a9f128be5a594e71df8e7db47c3f88c2fa7
+a9d9a7170a860e2860f785edbe18ad909ecfa489cd3a2abc580869c7eb8e9a2db93c1c473a5f1474ec0d51dfdedf95e1
+b665abdd084abd292548c336e3e6fa1c5ed1a53d2e61a10ad6a4c66487d8a9e101632ff468b012506135907f0896156e
+a10ccb363b26beb9622e1d91021d08a3bf02bec96a059ead01961ad51610992ef03558c5f77e074442836c9d2ff44e0a
+96d6476066264eb3090ba3544dbfec7c8a0d90985a1697985db0d04773f6d37d5899a9d4fb5a3207c320ca78c37492e6
+b4290ff9213e2ecd30d303b2b4ecc66c2614b8df246e70ece4e55bea9a1f5a0bae9df6dcbd8efdcf8c4b0f2f4cb44d48
+8ef10b2e53e6770a36b6403678ffb86f5d85e3e87bb1b3ce9f1f0cb0cf32f1fe991c565595389ad83d8c8d54a47dcc82
+91f950ef60014e3dd28f7661e6275ab6f085c803988b7d6dbb2cab25f10b0372e271267245761e1af97da6f48c230205
+97c626e7114396daa337ada4f08da5129464d8e8c68a407c8798949817337578733fbcabf454a22b57926485c28d9d62
+b596984b609a9858b1adefd15a546d4b8a417c8b54504efadffcc805caf8935b9c7f55d9e6b34592241195f513453572
+a3fdd36f3eefffe0cd2a9e6cbfc4eb9c3a499eec25230df8786b23f5eb71efddde062940ac23d5b2885081da48d3c1c1
+aa1822db9ee136d0a51910f0a59bf0d2af6819e4ec0b859b790e01bb08c1def87e9613b355525d4ab7d088b520a6a3dc
+a9089edfa96fdb7204a68c4ffcb7e0a875106886a0c589dbc57a6709e7822747affb07035b99d056baf11d0852720489
+85664ab9d32ab0cc2d2e61901b2682f88a7259c2da4ae6263b917ae8afc232614b4ee56539a868a24940eab74142198f
+b90e06a1a117659b52b364359e2265daaa8981954e9a9c37e3256cbabf133dd4900974a895dde6ec6b394fb36b5bc1c8
+b414aefaa4833283dce85add23d1cfd776567735f2ba9018cd791d652bab55bb0cc0cb38b88fe47e3b4b877e63edbd75
+ae579eae9c0b09c906cc2824eeebe5b4ea031547055c8ad635194f3e864c7a184dc21a3eca9c43c01d9a2f272cb2ce81
+a7b1d13997c283c13f770d5203cb09b5d3ca7d45324ec89c069928e1ed1a17c57510e0ebaaf54a21d27b0f9f057bccec
+b15d4555520565b76ec21d87e094ece2e04c7c4bbbf560264da37604f1a484ecc3ce8143b04759fe716411293876d0a6
+810bb0773c06caae8cc06ffc92303d51eadca1e1b0acd57ed23f5feda70378e180619f68b8db98e61d792568f49a8316
+87dee32807e2e5f2c884822b31098e5be2a4d950ae728e3281a39e661937c4b7e9fc025b50f437f01d69e5c33dd751a0
+b46810bd73d077a6b73757d22b5939c02a3632e81287073b00ebee30cdd402e89c318e0b03d01fa331193842f3a1ae53
+95a136a7bdca77f764d2c2d4795a8fc9e5b9097d73bb3956b7a45b42185a99c949db8ac5627ca263206cab9cbecbc31c
+967eee3c3afc138a482bd120050dcb9b45a9fe258e5e4b678b1d67b4691f4c5d89cd260210fb50f9cf2d3e2e2802968b
+b2d59a9ed0448b88f8eb26d8017a129ebaf27f11e0a031130266796e5f777bce93cf2c7e0fba8f8ccc997315db9aeb9a
+aec708d3093b12caf29efbd8afe3ace1de24496cee72270223aeaefe4f0ba3a7acea7f2f5f85c1f274aaf5188616133f
+8563ec52704c1c7ab515451a8f89f87201d30a12c95812ac95fde2af033e5019615a07f28b540a92781ed35786b5614b
+b1c8f819a4ceb17d35ab997c14f81ae2af9d4510caffc61d4a19e9129e0bf7264482a10f329054908f99909999b6f538
+8a65668637ba24358800076d8edc90979d6e614e6a683dff7859ce7d686014e6de85298f523ab060c9a9a4c4b8862cfd
+b4df02dd6f4d3908142654a42af60fef034379b1526c12be66afcfc4f1177991811646495aa85702f3461060732cce80
+8991bef253f0bb9b86e68e81f78116c51097004b0309e199025e45ac7ea55f8f6b2bdc58886899d275424ebd405ffac0
+a74f1048548fb41e57f679d632280fd2e4cc6ab88c81675c59fe143b74dc7ccf050db53dac5611ed6b45b6a0b1b7f3dc
+92011c668bff7ea995a71e4774e3fb5d521ee2552bdc33d9a65afd9677572c2a303a940751ffea470af898b01b9285ad
+881a0e6042771492633b46b6101f96a48a93aa3860533dc207cdc90783fbe52b4a9ade1eea9117cea004bae802cd3fbd
+b3e578bfd77a3a13368ecf8139b69f729cc720aab25853cc9e2f505c2e03e75cb779d685698af8cc4aba8d1c17f5ec29
+a025b6e8dbeb68e7ac4a595b34089fed0d24eb29a7be235048205e35a97634d6015ab24c21a017b5012c3175677fd0bb
+b751acd86ead936ed0f22d770872cdb5aeca3b1ec75a5a1e65748b665f8d1c859b5620d761d5f0a2a86331188e82b2a7
+a05faf0bdb81caada6c662ed2fd145eff5db5c423258d6609bfd4c467edf3ddba6480ab95ac9f4dbc932f4887b070c82
+8fd1faccaa7cf1d59be37bad69b7a99b7641cbfe930d778e0f712ae1fe9e78d53f37d7d5d3aafde48452eaeb65d980b8
+86042bc710953f0042940625d8b69ef57c615f9631fc49aae169ca595446e9d55e149c92994d4bce7b544877d7b6f22a
+b396047f716c5fa8ca9234c7026f1772d83f41be03410b4a32a376e5a038d252b8f36cb813bc3684f1b50326994c31cb
+a2eece2d76db005f5d95f5f480bb3353ec67a9c27896fe54a2cd5cc7f802507d8d518596601bb3d2798842b96fc03df2
+b738c1264d094f7b7edd27b0ddd8e29716c73bcf7b450ad7715fd21e1052998675873ccbec486fe45a8f72d9b006f239
+826c4c5fea1596e353f6c15d91a9bbacd9ea592aba4d22e735263062eac44f073e5defb794f8ae4afb7d4dbcd1ace959
+a8f1d170f63ae3b05ca9996347a1b3987136e7bafd02774698829986d48da3d421d269d31743bfd3e7917c5ace7ce729
+ae6871a8278f24d816657889ccdef509df0fb941fe6c5839cbfb704e81b942ea2a324fe0ac9881b385bc97410fd94b0f
+8aa6bb564b6a0354be89c4ac10309f941162fb3a546259c5d789d4608cc628f69ecf814b59bb8bce364162f7552e628e
+8ed85481cdc58fc540384213dd1b86f80af8908683d7d2c63ef5f8c4ac2e90f0e5f4e07b1b841eaecaab1f7e091423bf
+88741d9c9d875e2c1ee5b95bafa4d8a22d72a728260297d048e4f0cd1c5f1eaa94fc233be3fa15a69163f218d62ab17a
+8a99655974ad5c0f27b49d88a9c52a5375e16b9ac4f22b1e1bde53ce0a21589022c0ea926a4c2d7c432a53656ccffa37
+8e2628878858764824471fd613cf40d1bbb3fa84ed081a762da0d6d491d54688723273d87a587ed1d3067976ab74fe1b
+8f1a6162bd6cbd2353265bb348311073bcfca5a86f41cd0c63ab91b14aabbeffade5ae8a94f8e91faa386223fc2bf849
+aabe8cd92f0193d12b032a9bab4bf4f02ebc0b24d1ac09f8ca8906621d6c7d4bb436b2dd879a1a1cca2b44ebb5642995
+91cd27988ae8100d48ace10ac9cac4cf1cc8539bb492521a8a6489f8575a737f2a1d37fcdbe88dd651179145a59af920
+8baefbda554bc0a0b425f2e132c7de061fdd120ebd452ecff0d78cc5bc5b15401997231727a37e9bc4abf1a553a4cbd8
+971b12e25b989511477c04602f48f584485a0a0773b46643190263c0288c2434969bdddb1e55dc1f5b1b028c1c53eb32
+a0e47f42444a16e51323af6f519c0dd2271a85746882818d02373ba33c2e2f7bd6a1c321497377e4781f72427fa34224
+b52bc02de867d7b20cd247cbf496e03d940be2d7ca5755145e9a0168889db345fa9ab17c41635ab275a459fc9d02ff16
+b01db7077e9f01e675c62f5095400cdc68a059e1a5005027033ac535a0505f45f89faae4fb9831f7ff9cbad3b55db02d
+81ae065f1d55f4643a2ee120bc1245b9730455ad9e5402df8d6fcbb1bec71e40f1bfe7b8e67f96fff76d1478cd3973ca
+a1be3723920044be80f398279e2f8432aaed45a36cc4fc71c87f5dbfd52225379e94600793f40aedaac2391caa57d155
+b682f74fe46d4b647196b7c14804dc0b35e36cdff59671d7164ece874107964ff9f76c29b23c190796a9a3aa2df822fb
+b8152e458970ab53f6b5bf6101008c5c31d2f58993474eed6bccda074555f7ad2351810d78676b62612e7eba2d86247d
+9132a8fab2010360ca80adcc08b3a01658dc8ba8f60bbc45e1144c1219f69b985436c36c65cd7910a8aebd91ea1d3d38
+805cd373a0919de801b6bb7a6ebf55530037fa41a1993c159e90213c492165c42b5642dda5fe7283ac4e3ade6e63a155
+91f20d77fb7a8276174989faed41fa6da841d35b074c4a756c2b4730a7efb9b124ea6c7d5eb150a8b1126636cdb2ff0b
+8cda3ffbd0ab6846dbee6cb8c0360842837a65f83b6ba17085161a7371a4466172354e494a8614cf2f1f4726d0a7262b
+adc603e61dc36ee605dd7f2761ed568bf91b9dd3d40903eb7d77b11d10e4f762694fbbbcece72a7ec26976054139c768
+a6accdb3df5029f19273a39bc30cb622f87522ca5a63372dfe61d993dd783ca5e918218b5c519d25e535d8b8238339a2
+a188897269053f2494bd0de8cf098e41010fdd01f5a49d7ddd7b294ea748f1139e0d92fa7841dda9f8dc923ed6f02615
+b26ad5dde632259293d91109fad4f742ab74de91f68ed2416ff53c060d1ea4377a875b2ce960cb7962c37a5fd47e85c8
+82cfa86a17b27f375172d66b389df727734480a224b91585fb4782401d6c49d4dd347b8d1e8df6b9c0c1d2f8ae658de6
+82911748e1471bf5d7fe3ff111ac06dcaf5b8a43c76f6583ca491e0aa845b61cdd443613c5728863c163952d86bfd482
+b7b0d4ff87df02b5481183066f6ac0d1636718fbddc19889e92a71a168fbe338ffe780a792ec5642aaa4024d0964db69
+8ec21f08594ad38e9ac365e5246aa5c2c8e34ae66382ac483b47771c33390ccace4d906695b1ac0f1c9204c46576946b
+b9617d746596b26b84f2709a03b64fe77e9a10d0c85535d92d28dae9de3bbf6455a247f775dd9f67061792cb924e3925
+abb2ff3f16309fcfe0a3b1bc928ca5cf618706cad3645b029bd54e5305682754e6ca47e364ff21b1750f45041eeeb358
+867abcb8029b35a54552c57346024ae7eea38e9ae4bdbd68bb3c1de3935126880f237d9aa95d6644dba8ddce67e343e7
+86eb4283147a9e595d639f29a967310acbed9ff09d9043868fd18f0b735d8619eb4ee0250764f35a51e00b58543bcc66
+af1779d2115ca7021533bcf55a100b4d3ff4e45f8ce6a6d98df22881526a429d97818fa1867ede09918a438957a03534
+b10b36d0b69b0dbecb6f7efb6c612b0462c346079109970a26541a21aa2b5b81c1e121ed0d5c81af00ea8eb709a83dfd
+911f81ed75fed55f1fabc5f86f9f38490e006820e5380963a739ebc0f87a1dd3b7da8c69dff1e580c5ad2246bc08e2cc
+8379449499da9159cac2c09c61777955e61c63378d051bd28b59c78409ee5d09c43e7a6c246572bf34233a314511bbdf
+84b48ec8895049bd03dc3256bd0d63f6e9abb178221f7d47703b447c709fc5fda47b19a3439f30f10d2670194f390915
+ab3bb5afe824d8aa20f97ead4c40aaa93350f33d980b5783cf56c8552a4298c989b7b188d023711a2eb79631f3a8c317
+ababba2722186a3b2272feebaf2ff46c93883b7265a6a4fba039d5fc0e7fe81b7d4dc2cef7738406f156f693ba3a55eb
+ad50302a51eeebe63085d3c1705eee9142bf8717d07c5d87e0e4ef5a12207dd5432994c72b9493f9ceb558a20929c9f6
+8bcc3d83a6b8998e1a1066347c647ab122eac80c9c505d5cfbc370f466349671d8da4d500201226c15c1f62162efc62f
+aad6946b5d5df34ee6f7422fbefc6de33dcf4461868ed7ee7f47fe9b8eb2f7a89759c73b7a029d422b02afd0f550e722
+b0fe1d9a30759d83084b4c567b586e5a8f5a080bfa93b4a3feba59edaec33b6a2ebc98ccd82aa9d8cf0bd254d5f03baa
+b993c4c2b77fcfbdb213bfd5f8d655d1d41a52583de63b432e2732df2f9d88c4c6779f314848417c06a089fcb970c0f2
+842ea3aa645e5852695405b6ff2184e55bdfcf50be2319761e717b7b52d904ec47ad3abf986850c643003442e302ef30
+8093b0ef1f6c84a8253d086a6fda6be8376f925f416a9d1f44ea72489f60fbd8b53cee616cc5ece43e2a202653c0640d
+8c75f10b6aa848d84baa4120e75d3edb7f8471473851326cbd9ed7b29b22c5403028f49430bfe4320c3f4227827e667c
+b4fde4f20ab98f76f55afd533f1b09ee4ffbac9486399714514fd694fecd0ad1fdafe13b2b80721829c7a59e4c951a76
+843b2ed867cd8edc2eee84497dbd49f3dc481e7ece69310d06225325ef032a4e72907e16e7b6215ca775f88983d55e5c
+9881e5caa9706e4d7ba6ab81525090e29ecdf1808931f3f2b11ff9ff5cc97f83f3e14fcf18abf18159c3fcf4cbc27042
+b6c4acc868c05c955eb36a24652314be37004bfc14283600523729d466c56018c99a45a41ec0389449fcc3f8aa745638
+b6820864d07715dcf4a9ece336464aeef9ce381ca7dba25acd48f60af056a3405c22792cdc57c641e782896c0ea05b25
+a1bb482e35f71772486675cb4ee0fa5709b757083d18a29d4f4344e6ce901b2edb2889b7eac92c498b90c7d3844c450c
+8cd8d8d47de859d0c68bdbe1834a1c9a34e92636600fc592a08f96d66426c5f41f388138f42c9b8ad72c596f4bf85496
+801cc0631310656864b25d980c9e99a98fec2316414819afeaf182d3e7ff93b32a989e2ce63f5ea9301745080854188c
+8fcc6b2b656f7960d9ad48c091c1ea71b6f0f61553f7695049c770afd509ee58ca8e1dcb403aa2c5acfbbba58676bd44
+b997b9a6b994e3eb2de8723ec485d8181fd674de19ac9c2f50704785d9f5a28fe3ad194eb052b5ce122ab5e6e6968a70
+a909e7002b82b371952ca9d0832f531db15882180e97c12c56da649fd65334904fbbc3f097b6a954469221d181e718bf
+acfc712e1a61504814e37b3aad0d7a5cafce5901ffa43c13bc5f70507800ff03ed261367ccd09db7429cc5dbb892a7e6
+8d634a07b69ad87e41d941aca08550ae9cd72fe31f3075511d030c364fd6578a36f3f0f3785d19305a1e772486ca097a
+9746ce2d890248002c1bfb755e06f4f4570cefa7636e10319bf491c654b83608766e95fe9c77f1a6a630f5add77b71f8
+a9dfa56bf82297f709f1b4bdbe4bc194bf22c0424815bafa6c1a536f2d15f35bfdebe0867ff20781a49274075622861e
+a723af2702c6b473caa4a64142464f201bd1e2f765454fb0236082fe3ad77f22b4353e5981e6bc37e974c7ef797f875e
+a42a1a0c50befa6864fa35c25a17f5309684c53257376f8111fe96c84a5e09376fad9c8545e1946f360e16e1e4c941e3
+84231f6bc3038320dc13f3ac014977326dd13e5b2ba112c084d366b5255729b2abe665aca8a41d7aa6645412765887ca
+a64e21d651bed6dce8dcfcb4caa60791b9345cd7b6a100f5bb78f7423fba5ea0d0cb3668f3415c27af29ac35e5dab0ae
+b8eeb2128ea14d81fec5b1103d8511a3dfdab925212363c75c5cc01515fd94be8db2335bb84e221654380e58e9f2be67
+a92e9cb287981b33a5e697eb1e757bd44f45efdda1759122fb27dd4bd4ce3694f1b6b2082ce4e6e3919d9d7a0b7c8a12
+88f22b83fd9dad63e800b0bef709759f380c6dd9af7058100413e7b09c7517eba258d6367e0cb1a41b7762b86b2ef137
+8353d45a2096fb4bde82ca22381bd2ed93fb58b236b16e68bb37df3024672067c4378d7f04a4da4d116e7d57a2211f7d
+9076205bf231de091fcba7f5a4fe1d4a359f07236efa39f5715f206e5cb7eb3d9adb56af8181f63a9d3e965dc909556c
+93ab7f56e8d37b47d3a8cbd222f2dab4bdbf94a1152302752f0a731294f4dc214fdba17977f11aaff2eea9517fdd5789
+96d9883ee108c88342befc358325356dfe5d72c521d71e4b3a58d6773ea3d1a1de1a20572aa96ca0e8483eba62466504
+950e0d61ce4e76fe0cdc3d59c5bf23d8e1cfa9d6ee13b9fe41e6ddc0fd52081bb16bcdd973d319c20709ec517fe15626
+88809c1e272b552d46137165e5396917d107547b65059fa646b742489e8892acebeccbb3eb8f2d676e3836c985cb1756
+945f13ff081b74403a19dbb04173780f04766f7624ac6b77f46464df5f4f3b547c459f41fb1842164d8f1c126ad6be65
+abfbadc599bcab1c2b7cf1fc5aac7798d9f617d6afa0469ee23230c0d004fcd3de0ea645feddc74e676ecab1fcdcd8a2
+83ea1571b064d05e1b7f4527b20ada121024a4b2dd8f7d551945488ccfddd671ed2ed3895578afcb3cf958f9a2c75c29
+8fa75050bda001409f2bc0a275d8dc0fefaa47b3a0ae132758bd711eaed0851d6bf3e4b7f355377a93fb8eb02b3ac6f5
+b2fff49083bb30e2661e2d8978149e0d0588dc972222f46d5d120d01dc5c9978830c442827c8fa295f6b8e6d8c786198
+a352c2dbe4f18b311bf0690d77fbc9439a1b8088c806a9d89071b3ea04ff387325cdc04a091d2bde5fd087bcd0f4f482
+948ea89408826ded81549cce823dfd7605ffc2279ca7d0964b1ab3d5f35f4b174e81575291edeb9eaa4baad3610ba3a4
+998073b618140b04ec394ffe4af02df044d923a5cbc8f06f26c9eb4ece17abedd4f72e10c9738bd16863327c0f6ee20b
+b3bfdda0d6960af897ab508bd9312d9c166157f78b45157b46fd2e38ab2e430e8a19335d8a611366cf74642bda77bc78
+b8dae3e2ec5eb97ce3b5e9be719bb747e6e8f28dfb1a6b7bf5063822b502a5422cd586bacd87ef83c0af081ea4d30a57
+859713ddf0ae843ba690fd8177ce6c08e2fe5fc1c8893d829d39a199e04758719bd3046034926de40973a992ecbfeda2
+866f150d4b6a015b03ce8ad93a70644b55ca1818a0f50d24795698c62f3abe59d3b8abe4c11ffcbef20127d3b7afb970
+9145367ce9e2a5a6140db58cb097767b5a6e19eb36d1c03acadef612af95eba80048f2b02c6fb46eaf38c75288e3e4eb
+8c298aee778f4af13329975754e9b428e127680f26be139307d43268dc63892ac98284d78ced0ecd384301e26d5b63e2
+b4c2cc9256fc33ed09531abd7c3e34f8f24830a8a2cf2d684cdde46155f43ff2715c94e7dfc7377765ec0cdefb21cd2d
+b9193113b81bba4ebfe40e97be436515254bc67a94939220e5e69a197765bba40dac3369e5cde115d1bbb65e1c826038
+8474d72b7cb52768c484ff92d014d7733003b511c0c915649f65dfceced47ecd933ce876eae254cdf2f6357ea865580e
+808e9a59f947b2b39af51deab4c164878e02d95773dddf1123091e27de87cfffc07aecd7c9cf3e08c0b9f525bd87fff8
+a8e0049eec8eb70c12446596ba5c8a29823704be3753312c34cb271000b6c154b1022812dd02d1352cd263b655437d6d
+ab7894a75e40d888a4d0539582cfd6b458da009a5017e561c14d312335a75745ce134b57466fd30c250ca07e0529c8a4
+b30c5c0abfd35ded7a3da8f9c95e3e1c320857be1af317f6ff5e35101d3f31de3735ff8741f6460ae1e63cee543081fc
+b15557ec268b4eba9628ccec0a5f3c947e624b61edc876e2ad8c36ada061fda76f69c8afb95270b85f4672171678d078
+b7ec103d6695fa64107f66622148902019ff3acbff7b77ad80993bdf209b73990b0fef92dddc5fb66aed77cdb59af9d3
+b3d002f0a35808e3785d58d0074be620416ee9381bdbdc889805ec2acfd169e1ccb60045d87cae3e90d5da94cd58bf80
+a17c44ade6eca0942742edd237661ed406a129a968fdab28a58d19308d207a1e7853099a4a3c1c181695fcf265107a55
+91fe5c0d672fce368e229e735eef43868e31265502e2876e54aa44470a257d1c126ed73d6df860f42d8e1dd425d8987c
+8434fa331278fcdff2c8c07596a051847425fd7cf09af31bb235d208ef6e282cae173d6ffb73c0475307453d6133ae7e
+940188d6c20924edf1d9343ea85ef9e08d9d87d2a188f8b69514a22cae10aa2d3ea8e662d43d60b8b77183b3c6e8cb1e
+a89f57a730437fc511e1873830b300df7a417493a468afeed2f837f31641cba04924effe11be92d3bfabbad0bbb7d04c
+a561550cb347fc9178c875ebd8dbf5d14c0afbefa79f7b93b893a25ca8fcdeb0293de5a350ef63413aa70745cbce9a5e
+89fe7dcaa6a10cdbeee9d0d3bc8dfeacd47e1490a6c3b591f66d3a64ed668e6034381e0ea9f5f04fd2a5d9ad5044b8b4
+aac54b334514d41665b80b2cf18285391f47be820446e2272d69edce022f6d7689c8e137e2e9579d0846bf5440d768c8
+a231a04b942d471b32cdd12eac3eba00b8910fca0812c9470802246c479050d6c860f64bcdc6b6e39ed0e9609df9239c
+a6bf6eca52b5f3ffd89b79be6edc4f517fe9c9bc67051179157734689fd63649e321d1fabda916a9c4666b64ed60bb4c
+a7c4f791a1d77cfcdf34c3b73ec7a43aa1c8ec81c39ce81d12c51973ddb0bfacc79e1a128ce17afc5838982f66cede6a
+a1644b337c4398f00e9ebfed20d9b2c900ccb667be036abba0c4d372939f881df2bdb5d40b64354f65c8f2ad9ffcd656
+84f6e86481d3322de791ad01d8c1556e5480534e52970fa601b295a40270882476779301d78bc2ebc323323ad0b62253
+b32eb2beaaeab27e190c9d381b9f3446038391da552db5ded0f5b58d070694f07c737315a465175da29e2a236c539e9b
+857029d97cb9fcbb67e194d9aeadf5b25cf8184b3b704ff5da424fb4b39abdf3f7f317b3f79c762605bd9bdd5823e7aa
+883926170997ba84cf45691c117912f6be5c691abab77fd18fe114577e6dcba18f8c0a6641ef59affcba1b2c92e093cf
+945be3febcff77b4238500054a053c983add7a96ef43cd91921dad908c20d4ae08857fb93a5bb588e9b441aa9a536567
+b9efb8be322722302d1c06640f772596fc362586d8f2e49c41810f4bd2b59e8e9abf3d5369b2421e1ce6949c067f07be
+920ad6d5cacbdb46af424141391817da2fe3d463bab8db760026f98e50bb51aa4f3668520c133ccf9622d66eb8a60e86
+a1a9ca07d8d3a44fe372aceda194f15a2dc3d29267aedcfc3fdbadff0bab1c4397da1049bc0feb9097afdcf1cd1ab603
+935eb5fe97d580c10766bfc2fbff71d8584e00e1a321018540c25f6b04791b63a0d6992257fe110b0d17712f334c9b49
+9530bde6dc33e48e05d98b77844766afc0d5581922e382a2fc1c183adf998c8137df29e56b868c7892b2c1af56edeeac
+a8cd3698276c2bb8d39ebf7fb5fec139580755adbf81bf362e1cc19f4a8be750707bdf4e1fde3064873495cce5cf5171
+ac5a83c82004728b34677bc6b1fa507687992b5b78745e5820de08f3fd99e35c905608936ccab62ae39f0408334b3c6c
+927b0077386a5055b499cb5a597ec3c9934767343fd91214fbbb5487faa4339837eab52c75a627d7addc5cda5ee35108
+a8acc2ea4a548d9a2fc2738abcf75cc0efa189b92a99296c0635d53f2c0d7ee40ccc8ae410d2779f95ac6f2027c81d06
+a74c24b8c695920b12a86ed6da6ecff72f8e19fb06fdfee9cd1c1e8e5f1c202d26fbf2fbedc9a5deaeb2d986425477ce
+871251e8d69de5c3117f364bb95d876fb89974428bc167666088d5ff1b83328b675ac2efa2d0e215831e69ee254623fa
+946f7a6d3d6700f65088c817636ed3c1349e4f5122fbc22723d131d8ccd055931dec977cd0cb8dd888c6abc51a5f4194
+82f7c1dc3f133725570c7b64e31b0397fc3a82cb4966948803de210182b9716ccd19e59c0e0382c0c970d05c5e13509e
+8bc45b43102e0df4767156b1e8ec635cc07fd629793d289be1f2470297e8a084bc9af0d76566cc485a8ac898c0493fc5
+85000f8c8130abca642ae94b4feb3448390745decb1f443c34fd06575f1d0de35bbe649b46251df0a4bdc7a8bc133b2b
+ad1ef07d34c59afa37fd5147646c24c03622ae4884c163b80d45ebfb5fa994699ad9166ce1ef727c22be3c28e0838cbf
+8d1dd5500229f463f94c611bb2674640d20f2d34dd40b28c4d2a21d3e64ba7355fae55228f1c70095d1b288828a1950e
+834cf56a4f2c2eb04b89383213b84bc6ba554a4715c3c1547278e5501102f6ff2af27cce0f876a2aa2da57b5ac6f3b3f
+a468d06083d770bb4e484718d1c147b49770757b5b296fc6d6035ecb3c2f5c4155176f12ccbe6616184789350403f387
+8abe730d80ea895705bf67ac4f6b6a36fef7403702d8458a383d04e4859b4c8c7a75598721cc75793d29276afea27ccc
+a3890145fa43e6b5c7b8aa0a73a62c39d623c9a75d17c5a05bdddec08d114ab5b0a865c9edb2be6ef31c3dc9544119ea
+b2b7c1cd0aed6b776515a12a0f3a86353fa3d3a3b6027422bf7f2c21e6917dab543e189e860c8fd3aab65484b77efbe5
+95215b7d3d504ff83ae2bff789feb6b5919287d354d567141bae68a0f0d27b3e898edd8a9be5a51c04dd28ce9d4ab937
+a93a3da0e101797c690c38a5bf5bc14e10842e48a18c9888807b2233809ea8a34a76d20a8ece0b682d36c086853cee40
+849a7fee901a9279dcc36fe8f276ea6dfc37c30f75b679ddca2cae9c283de19c4df56790e6ae12c4bde33e837fcbc324
+b5c1587d84b0826e64438d8ee7c103119b164bede8d243a0256b5b798240259dd63281b81bfc613a4874a6732d05e143
+97600c536388c942e0a72ba3bc33b3af48045994a3ad0948fe0741391c1eb99693d072d1efdb644abcb08e10474b7885
+94c2120a5b4743496e7ab9bb2e474580ed27d7cf5b6fb132efcdd7bf934434d2be8d6f0af009c637b31727b3ad5d2280
+8a5ff1e7f552fa8b34b22a220eb1cb018c9c9430f0f14a634121923497cdb4a69fbb8b60eb33e5fdf9b0feb3e9f5afe6
+8b4c9032f25181e6fb9f60eb07e3d6cfa2b14ffdd6a0fc1b309b078f8290901e229a5a6ed96dda74e1a9a894224ff588
+a5e04e164ffc46da1dfe026ffdcd99332874a110cd168c44762c461a5560b5c098ec71673d509fc053f6d9064d4ba255
+97d21cf8327a81385fd3915c7e8efac7662f4b39a9785b4a936fe1b581d630678f42a3e9ea7e02bb4413da7ca9a6f35f
+806d8462bbf148eb4cff812cab11b3d819669ef5f0d76b228fa166b83727c92fdac98ff3afe946855685b050d9d4c6aa
+8a9899b0ddbcf4ba3f16bb006218022efca867a5b32e1de9c7efe1d7039c8e200a406bfd09ebb8921bf1997185e9266c
+8fad2d8629c546c5de443b36927b068cfa333c8c4c1328e1221a1f6af7be5363ab8981fee54307532f239eda7656e6f2
+930146a1f6c3decf40198955059f70c98de7c5bb1b25bdc97fc72de3a84db1b121430cf7a7456a692d8bbb6b325b6001
+82987887016fdb90f79f045c16629c5b2b17b1b4702cd89d06b70086e5922cd10c5763cba6f3d30a2c33bc84be36c6f5
+a6fd7e4834f7f29da41170c13d29acbba86c74d5924cd361588cdda26a3ea7f11ec34c31869537ff7ee0b57a24555e9c
+97b2474cbfb632148869a6b911c2ab91e4af9eff6c181566a1eb34a05d2ef3fa9da4fdf14e8fd8746a7c3123e20d572e
+99ea177bb7d98dce25d300b09bf6ce08a7061360c4ed9a54e30c1aa5a467be6225737b62ae921e91547b5b9d39b800d9
+b9dae836e37d51c9611e6522aa6aa8bccf2644f23113584c74c963d79af0a7ae533af823215fdcbbd8df62f00ec1505a
+b1a7165aa1ac480b4eb1f0b3d4284c69907d1b5056a343a2da84b3863c9a2ec4d757493f5daf9ef252a253bb3b2b6745
+a1322eec41b38b8bf3f4566bd12f9c230dd04d085e0526218489e986d59895d471bd8bb08351edf40021efab1d29b2d7
+96d559df46015e62d8876f4d8679f9a9867dff31eb151238cd75b3a10bbb2ab0f51c804a2f5adec1decbfa355042a6c6
+ab55e38cd273bffaa94400bf4913ce0ec1c1c848e8c53be1808d4ce5338ec92b4a4160b8faf0d1d8ee8b71ae751d0ae7
+b61c2987e2b402a52670abe305f8a9976efa9720ad0d7c5c1d0d6d9ec6f1569f51621b6edae84d9bb3fef32bae31a088
+b5234aa19fd9e714c7a9f3ea33d39a5c49f42e7a8edabd8f306083669df4898711d4b50b049dfb91815588ca60052673
+8e98a7b90baa4693c6a1e1c2e556d018c3408bbbb5dcf2c32d120f797fd8ed1373f1f112dbca114863801ec6efc1a5d0
+a7e1e77cbd6274f8c74b37a607cc20596bb7fc35ff1ab4358de15b07952aea397e409b30188c8516676cdd05d4919f3b
+a5f2336ed9338772b71e490b1b3916d33df8b013e4d38dd57185b7314ec9aedaa34eda2733c38e06e656a8cec74080ab
+b5de079ec867af3a3910fe47628c7d793c7d70b79e25a9a436e0a75405e2c58b740c1b86e1b073842d475e0b717d0bd9
+abcadb7a09173f1eda179ab7e3a5722f020402eaeafb9d604641645c21f1e009b758f2a6fd262f115d80e23f8baf7328
+8694ad59d4cc328b064884d147f66095605d9bf339d09e45652d68de765f2b09d45558d45daf9b4b36dcf881df8d4fb8
+a2cc7b2e812041f17b450b5fa7429cf62e2da06a7bb3c08a63d6f802ddf13e8b73d2056bcd6407476dd322fa35b9b065
+a97b0e7e22214f329fc57b6d7ba882ca563f863c06f1afcb60c0bbc81ef08ec866d39c81a80a7843889fc957d532cc0e
+a8a809392dbf35911df8566dc20e2373e2fb3272bd9eaf9f474588a9132f06b5a1433ba9f36a738c6cd3fee403188fca
+a3fb0038f83116eef1d6b023e2e17ba2795f7f90ed7c857d9f04337cb4e0c2e7d691bcea54aa72ac5e4383125b74b755
+a80ada835fede8d121162aabfc8c349f685775406693d599e3c288364097b02d96c10ddc20e72fd308fc882e5b70c064
+b6e6c4b24731a2895b7513ad97c0928efeeb0c645dac9fc8cbb0a6419221807073f6996f2b778e1dcdde63acc3a6b2cd
+880a2e8fc2eb57f44b08cf4db5cf1751bf9f4aa688708039007d2a198f4e7f0f808aa566b36b15b971e804835102400c
+8b3baeb4e1c1d7493bd885dde7873afdc235b58e45b515cf51ebcd02a9b81911c5ca182a9e340575585186c99e71d2bd
+a6248e1bef3c6c6ddc155dfe95631a3f00308fa77b1c1779935e76401e750f151b7377f9376c08e8273680e924382af1
+800133df4ea65de3935d98b0249e335a918c44167a34a16c0a4adaa4654f458c376eaa76ef088672d39aec4c7d951833
+8317a6e0667fb524f35672e070f047db29450b06348604319765e4db09f966ad995098cf38acd30346c7fef5dd62528a
+81fc2ef2ee0e6f21f406c51f02b9b7be8d99d30a054df918cf89c708d64c34d8b0dd060dff4383de858c0dbff25d71d3
+a28611f96138fe6974e3e1925b582cba76166259c32b39e95702fa0c4957ef2ca32d575b1c08cc8dbe96ddc0eb56a9f2
+86c6773f4e0261413d6d3944e0f7e498a6dae518120e3940d2f45054a912e706b3b615fd160e6143a7e54942406f9af5
+ae91e3db099d165b198d80b6d9af894203949d87cb980f4db97dd43ee55fbe1a45df156b72e3c3e9306975f9e5e62d77
+ad00ceaea52dcef616be9f9815548f8e9b800bc9c1a8832a4d8acca6c8779317d1951e5700e54db070a23db41266c934
+94426f78470aea2d82eded320b45bea09b7cbdf02a3d7c2af4ae4567a3493b352b36f43c3669237879910dcefcc82fe0
+8aad924eb1a30d2844654c9829d82c65fefe964d815572b6c9f902c6a826c247257a7d0d4967e2bae331d52fb3b7c0ed
+ac9489ec928e4f43f8d194b8f3ab83382b66b045f18efdfcb05c1d4e67af7b3745ffbb7f52cab4b8895550d10132e2a8
+af8f390c7cc40a08c0143b467634c10e8046ce40466006a4b4297c76a6c16309b50f41a4a022fc838738c4c72edfb34e
+923b0384e87a2ddfb7a2c47f628172e8dee76fe812c44a756c67cb20527d8e9029a561bd4ef446a013d4be7db7259f6b
+856316b53f09a90af770bafb5c9ea7deb921687fdfcf512840e96fb83df08820c42263c9ccf51465da33f1b03db04d09
+92e8823b523f90ab75ac6e30869dcb257d232b55a3e167769ab5b54cbb83be94cf5d84eed4b1653db17f3f1350ab5e53
+8d0d05fac92079a3df86a72fa399e606fec7e56f81d3443cdf0cd373b3330235b76890197ae61f24d17de39dd1aadd06
+8a801fc71b9b6988a829044060679a7cc3d40630fba81f72bcd15c0e5728867f4bfe938066e68cbb54b042a39600fde2
+b40a6a786ca1a21159b72990b4d3ae8729722cdace4e8124f8cbcc3fa96005563535d28e9d92cda02e91d979d27f8f97
+914f30250d79829919c8ed184c2e471c0d9835f2348e628164dbfe39a51dcdc3f8bf99c945b1f413e65fc5424014e5c2
+8ab8b347b7846fbc7ffe69c89ff67dafd522bec708b7ffea312b3a7eac47fb9d6006cb9038962a07dd89d4688ee6a18b
+8e755f8cde0750700252e41f6d16b825e7f02748a13744c004a52b19e52d58c42d1ac32cd5ed1d6ad14cee5174b4ddf4
+88d6192d72e1fefbbc9ab400e5b0018bd300839cf604cfc1034657f62fe8fcfc52acd86c207dad0fa6383361d338b2bc
+971fa2ab593578b341076d98c49c71dc7d9eb4ca706efe252441499037cc86fea49af681d8a4d324d302526b2a3e5c18
+b2deac648501d7e284a85c19f514f8744c48d2b5516c993c2111128a9fa042aed34dc371a0cc3f00e918531dbf16c0fb
+b63fab8600fa531d7f48f8d207298544d2e03d4da23cfb43d99b0612f1a20441526de63b7609f5969429e763147ee5e2
+a8f30d9b4ac3675d61199e8e624f88b9dc52658a2ba26a2bda5f9cd3780f0b1e32b56c825d9dbc3a059d6c61fd37e261
+8a6f8e963dccbf1db9c839c21a4e832c7a218b00fc31400346b5379fdb8394142bf8f8b981fca3f4d3c43d4e34dd3e31
+b4883e6a4213c799abb2a9b6998ebd4c89aeadfbabbe4c363b22beaff46939dfbe4dd20d113688a293a41daf5cd82c8d
+aedb55058fb467ee9556a3b601af86962f99fc06f7eaf837b4deda030b1899f565da07ddc7108e9f5e7024e11c723ed0
+a8185aafdbd22a2df2ea0f0cf67fc88c4c3f8e64040da08cfa9e8075b792406c20d3155d6ea6fdcbe9f5502c44125545
+b2b27ff20d24cff756e8edbd6f8686d202d687016c561e56dcffebc78f404ff544c4d3ae8802b91bed0487792d6dfd05
+b6fba06a70d8b1000555b8c6d791b1db3fb7f57a0f8b1fa8dd00b2ee14242877e1e836cef89be3f9e0565e61a6b4c275
+92b3dd6e18600ab856c276bc787429d42b8c02abf5243f7919625aa1f4e8cc3eca61cbe106b81d0e4909393a5efc021a
+a508e1a1d4375f5130c95a169fd1d4df51cecd84822dc28b18e464c2189d464e6dc6a5855e0cbb94500d041319749ef7
+84b3e9a6b5d1a7bc7df44ce760b5b686fba006945f6e1f3f67ea2c90dfa6ed70bc1f021828a0461fe158ece87deb1e30
+add83e686118fc5eb56d79199d33cf0c90fb2a5996c6f453fcd9b9eb3a273a466776adba1cccd6be62a4ea154480fe17
+a1fb58d9a323dcd7862ad4bc6359ab2bae35a608276a3053d40bb3abdaf3e8827027284d964e51ae7b61dbf299f2bea3
+ac901ece7cf087c782f75f1c61371f77ba061bb752ad680c9b1012768e5ebb6241b492bafd9e016e989cea1ff51aaf5c
+961b9ef616b7faa3befd807772893c7c66ab6990a9405cf4345ec29cf13d75dbb6da41ec87af5b5c4bddc8787b88b480
+b386f7ba0b94ced118691d883549d70ecd28d1c0d1b718cb82a92a246e61de4ba80b6a76d6039c261e342f9ac136941c
+b6415848092dd93da62b5a5307d356d968bd7c935d3626f40e9446573e5794f37a23ca072fe8af2a9355a4b04ad35e58
+843b3e3221bb08122a1e649e81759297d985c7f393c36cc3bc707a7aaf2f53b9cdd449e7a4384981c5976fb3955871d4
+94083ab99a73dc5cd463b5259a0f4e99847bf32ae03739a440f8f48e12f078602c76b3fe4e7ecd31d52a7aa31168c5ee
+b6f994b5482aabe833e388b24b9445c01e47fd6e354c3684094237189001290aa77a327181e7e7e756682a04b8b3c56a
+8366f418a3fb2dbc9ffb5b798adb968aab991fa689ec24a4c4bde6f046989b1815e1bce5e846f3554028e16799e17281
+b8e5680915eb37153daa9a3a977b47c88b4f30fd358901888a1056e07d2a7070d28a47acac7aa7856ede16bd0c93ff2a
+871cc7a122cd7b9ae2199801e6a0974ba8cea64e5866a5130ee0ec926adda24f91b3ff2785932cb55537030bb5ad811e
+9370ff1ba27d33080efb22836147f766c60f0a8ca250ac6b2a82bb464ffa543da056284b712dc3cac53dfd1680a4cf87
+8614d8029df5058f5a072716489f734131b228972ea9b2b952ab1150bc50b6637543aec1c35763f8dc578275f7c9df3d
+b8efd01dd0016a27a0e2df65b571d405be4dc8e0df5dc0d8354fb187b96589e95847ba0c2856613924125d21193753ca
+a86e524431247115ee497c07ca2a73387eb820d293e8bb74e1ef1ae7ffdb21a9dd8ef1a6e3f391e6f02ee0b51fae2a06
+9151e2dcc0b928573421ffbe43b1761b6ccefa4ecd58be7fbc8ea8e975e18d52c264f682104480d590e6f8c0b8b9f63d
+85ac8cb79fb8916f7eb5431b7e81606b38afba15895909873f85d9577c87ed2c1d0fd489fe058362f20ac05626681346
+a076dd75ed807bb7afcae8bb9821ed46758c1a8d00e7f3d3c91a18e6b95dff3958ed70441a1f4691ac3268d95e243614
+89d8dbe170b9804de3fff5b6512d04643ea0041c3f9bedd7432b171ced1577b0c0a7bb911852c6bafe154ba36cd30320
+809a63ba788e618a281804ef97a75df39c7115900078a6bdb203bd79d3df87e863c631e934dcee62e28a16cb8735acfd
+9727e6720f8b73b6ccad519d8ca1d4f90c2db33ab536f399e2c4ce269be15d99e22504ef153aa26c40d4cfbc450f25f6
+83e77918ba6e28ee01ba6b8dbdd84c53faf65446a90bcef46f262f341dace2e237b1ff8f8d566fdfefc6973deafde716
+b5a4d3fff76905bbb229d579b8433e76f2f070108230f20a30e4f974f12f29ed017aa66e9b298a4de0fd535a0e1a44dd
+876d3a0bb439e7da26539b98abd0f7e0b7e8035eafed08df623a77fdac30ac85ab4d58984396319a88e072dd7a5149a9
+98923e83be5b2877ac18415f9391ea792933db718b29b6970001682cc8434ae9fc640427c0a27f6d62af5f78f3901bcc
+805c675a34443a14c0098613d11b4c015264e038a8d1adf083844f2e3e3f2414689788423dd0ff77c02130331d511068
+8d8cd51d4146bfa48492e9d3f3e4b845d4ad1442ce6bbd95979f9778ffeb108c641c9ffc2ebbba532f922237e5849222
+839862454707a99eef931335e5c5ed80805ba06bab0337c5301fe9fb92fd59c9ff6620e66de7369352b079dc52bf2113
+b3cf3bd867f60b345a0b91314b34ce1c02e64dfbaabd70782614208d32fcb5d4448102bd54728fb05d1ed18a750e88e1
+8207a421d010e1c5854b8e41460c6a13035ee77f7add0df83c5c31bb00d7acdbb676478a7dfc738b9aef5c29d345ab63
+ad2b14f87281ad6e1d2b713e6e8303f1a45cefe097820d6a1bdf4652364e70d28ca92193e2bc3d0a1e69da5a51c90ff2
+98025be2d7e59ffd3f6c3c2b28b27ec42206968c0f96d09330598fe17a207baa6574aa22cc26555139766cc284224fe7
+8e80fe898b7fee849f7dc8e5eac668c76f1fe18d159c51eaf4ddd8d4d600c852dbf6c2abcb878c64f37db7fba3d56968
+871c0e2dd929ba4e157ed606741a6301aef759e10a3f919166faab23e599d3409b232240e3afe9c0e1622a11cd453c1a
+919f7e465b399e2819ec17aacc199421d267ff2979ea8dc8962542ddbae51e2bbdf6cac92f8a35e05e4d95a4a8315cd4
+a6e6667e6127ee4f0224a9a94be3c22831a1ab3b16f57462562b11473c425e7112b33bbbb6af860c81bd6e84bdbd3b86
+87eaa9e3515f2d94acf113d77dc085609d06cb038f5e8e90ed29bd04bd4814e95ed0d6db5a1d65572dfaf73ab2e50ba9
+90b30c66ebc16f767f3f0bc1d8bb17ca1951a616292297ca8dd06d54cc53e5fb5fd6321ce158c04cb4c91a04c01f7fbb
+b5fda3715566188630f96207c4253315a9cd166ef96651afa0ae1d6f0aa8856e7642e2f8ef3b1fb1eb2c14a7331f6592
+a54143f662a6946da901ddaa9e514a0e96bd6397020cf5d88084a1e1edc092b94facc150b1c029a508fb3995acee50b7
+8dfdb813296bd105d5813657c98337a24c8bea19bf0d119efca052c018ff5c88f31e05e110fa12f306ae4b0a8498f113
+8b7429599915ffec755060d9cfc2c445df9184ba6bf298bfff5b54c2ec8747a9b65bdc6c73746a94a54b0a62d93b6a28
+8a1d1108174d383465a57ab4b1a6811ab86dc007de4f342d37f4cd311650382e0352d3664ef09cf1626c0b74e2f21ace
+98cb860aee0b7251da2d114b2253daf977badf82027a018c956fd59c6c93b716bfe69a132a4778ee4b7168fbfe390ad2
+94d5a0d33a0aa590fe76c71e80b21246dd9bd8c2f5ecc647e47a423c2dddd743010484cf2fa363ea73bb217247429066
+a082b7a109fad08e2c01dd7322625c18f47497b32269ae4e529b1681aeeb3c4a813cc6088ebb4427b486320fbc4b7872
+86c23e2d3b23244c7763c123ad67a41a2dad8e4556cac23696906d1acf5f4cd7f661281b8ab2027d268405b08eee6771
+801522a5c211e49eb96294a9113022d86c84bb8741e44fa7328122836a39ba7e11e27d0d6773550b234531400ba1e7eb
+9683d154b18ed641867fe67b2dc70e8b8afba79f73fdeafdf9015d85aa0c74d270b290952683c3667c0202a83626687e
+994febc16f8d216a20774955523262966e955cf964950b4b2831a3483f818c20ee6f51cd24f499dda0d3191910a9fd35
+aaa8f12184525e89ce980468fd24e1a9af846246297546655763ecabf0b5b5047394543f1791ba1c70e21637cd815877
+9193a37d5692ff1bacb0265bd7825c479624d2adf33a419b0a71c8a744ca1b0c9828127831302ffea4fcceb1a53ccd54
+b9f3213d5d588ad73b86365cbcf0fabcec5c30cddad418281ff2408dc140e3f6a25afcb6bb569605191665706c675e35
+96aa280b2f0ae5c3ac51edaea4435ecff8ecf8f2536a3400d8c4c9b12c64d16418838dd7ffc1b815656109ca63261050
+8486373d67804e9832bddca04a0084d1976d324d85c22a52ce2bcf7518f014ad00e4795e61c71e0dcad1f23316288dcc
+b4f2e7f7e2ed7917e7c5036681e1ceff18b688c1abbd203c2bda0731ab56701a847cef4f753f68119110680913c2dd4c
+87dc2336d88edd81b94ef78e7bcb6d3876257c326d28b3f4484465d6c65faa6c17aa7a2f85c6b94ddece39f6736751aa
+b4b3502ebe175820f53da8e3fa28160579c4150d79d932923739aab545af537b3301d5b21f5138ab4100e737fb61a084
+88063af42d5845267d979df07be0735cbb42d9b57d3625eb5d0aa7e4ee90ca88fa52aed480a4d60eaf0ab8dbc4f444fe
+85cb81247c09e21de6deec42e668b72f513c7b105f60ed478b08b85fdc8a886a97bb7e39eca0cab09b294e4b1490b0c1
+9920fcfcf836faafd211fa1ca78302aa6feffcda98aadb6302300c250fe8621b60d9c214ea92087c44996ae0999eae78
+a1f91af5b378d61ea277e5dac81cb71d71a4ac35322aaf42b3a8aab1641fd51d8da1783bae0e8ccb66d73db8e1003478
+87507b427d381ce3906e372a12f4e61514ad7a102334826266df14542adcbc8bb7c8450a1fe110069d9dc2e9bf0687c7
+b7581b0cb549d71201583e0987e9e9bc6cd36585c96664f836e1b7326e5375ce8d0a450343fe0b106dcc581b77de88f9
+b26504a6a7a64c44d7f97d0402bf752740934ea4c6e101ec131666deaf574d55fd7f96c8807473722b6629dbda2ca3b5
+b90accb5c6b78322ef88d017fee2ae1cf87194f4b3f6f4ba6510c0adf4c11b20870043cdaf45372844f5e801464bb682
+a904dfa6e1f813b4aa0b242f3eaaf893da7ea854efe514487a237a01fe244721482476b81ed75ef1a951fc54802b29a1
+a00373aa8d98f4dedf9cec4d227b5fab00f3af2a7bb4c8b0dcedecb5a04244321d5f25a81d57ed0ddcf293c701d290f5
+91bedcb316698e73f43e9dbe0229772c856f34901fa4c1e018e96eb898e4ae02b19d900e87d01501099163be56db57ae
+b84dd6b9a61cfc0817da422380b0dcc5221deb600b4b6a6f6c5ad934110a3b66c59f7407ad68bf8642b2bcb5427e8050
+8507c172e499856675ba69fc1b0389a08e58f8e5658c9268172b926dabb4a67b7c836a44d865f736e8fcb14aa2809529
+86609a1d82d90a971786da9ad342035ae4865136e513559069b6dc8ba82ec0bd1ac695fe8afa5f61f85c2310194014ed
+94914f127a645594ed372855550ec0817663224208c127a08bff3d5c4f463b7939cf13a45dee68586b678ae453c6d60d
+80b55565972213814afd6ad9b1884a4d8143ae90c148ba730ca77b0937c2faabb23a6f985dd0bbbe05705fada4cb1a00
+930f5fe58dabae91c26c6fcbb61c3e336678dcc35d028e5c958d2ee7d50b80e1693c0693b82d719dfd9fbe2c03b52c10
+a45053c493da932896d95d5fb158869c1051e1bf99658b183c9cf4415fc8d4fa1b6a8752b8bb26e8b706a03a57fc05d2
+af7434b48d2ebe639c8082be09060422f662317bdc136d534b76ee3e3aba5ea8f234cd4936aa2b928f6eafdbe5165a6b
+a57a073bbbb3020a92497f0ce854666997a182f2b437e7b06c9888db8acb2fd2128e3959f45c391f0548a3de49e37e76
+a0ea8131b2d8cfb799e806d8cb92cb02d32de37869cf2ac3c82f7c5d9a963d562755b16d25c4b60f4ca214e323790a9c
+82f920aed42eb630281919b9c1fa4acc02b05ef34020cad3583a29375bdaee167a47ca3366ef065cd8e658301942dbfd
+8415ef32a93820618abb91329224bc46d478ee8749ef42e372ae4ea29b6c05a65d5ef515ffc7d720b2f41ccbc040f176
+a0fbbb0113daceaa05478163fa835b070be5898dd9bbfa9abc582409a7b671c0e41a5070de4cb6dd2072888b11825acf
+adfc99221d7f044b57ed40f4ef8a9e47e57265ef8eac654043cf5e777950af6fbdc2c2d5a5b916048fab1c19acd69dbb
+b3d8e85fccf623fb3848e4886d580469bd41ec0533975298bfbedc7a1a9b4e554714991ec4238d8ff976a83cab6383b7
+8b09702f3789ae1f7799ce58a0ffc2327b3ebf2b56cd870f2be66c0d6781cc1f34c2d721d0de63e0fe9db85bee842fbe
+a935864851b73676cb49f509a198caab467e5dfe4358e7088d2a76e9b8c13e5d20b01eb7c0cb9e51ee98c90cfc393c71
+b5035d76a5a8251bcb18f33968b077d43403c69492b809eaa3e202eef174a5649aee30f701ef0be050ba5026957093ab
+b1cedb563cfb09713009b2263975a56abb9932b8cdebf10f7836c5c34785149e9875ff590fe1414ad2d21da977b7ba26
+98a718c23d44b24ac295b328d91ab7a40b23ffbccaa90bc5888efbd32b6a95c530bf5e999ccbd4f1c85263104f336ce9
+8d9d2ee952d5b135eac2f06f0478faaac175f23cb3789144f3a490f2ed34c885ae4d8ad7ed48db85cc6c2bd70b38c6c2
+8155763582ff6c68d7071ba842b6543361cd5f65b7c70d5bb838da2dab2c02f3363e2324307e7d2149b12700d96bde38
+b18b277334ef7f24706b7d48fb764a487bc4e21fcbfb01627b7524e9a5d3253be99d84c417084fea769b550b3ecb4574
+b80db9d83cb1ae861a3f61197a1f14b6c5004a2b3d031fb207adda94d725f3e265535ed7b69b9c801f2e95e1d64c1901
+82cb673ac9c0c124fc546c59505fe4fdbc05a1fece0fa579f6a6df96f74bfa877ad82b6fa768cb678ff04ae4cec58d1e
+b2e190b785a4a882939489b86d0a06cb637b7be8b14204645bdd9d6c37626e8623e35e1e4eab5c8fdec0f8349ede8918
+a82237c64f15d306365be19085e1c725cd148702fb66658c7974b02051b685715fb9e35fd4a596ec24d532df4711f82d
+ad6f7e3992518ba04b510b705fa6b28e3733e0000a5480e8a3c30fe71394de2bfa43333c69e750bdc3e7092b9e0f7ffe
+8c0ee358f37c28f3b80cb9ad5487c342fab734886e31e30c667e616f3aba737a3a07bac4da552d8405ad8b00c03e09f0
+b7851e0b88486b0a858a218f4307e0c0c8c314fc69e2b90cce8ba86d3fdb796b572e50eb4e82f83f73c7f048484b45ac
+a7c35abc2e15723a9f395d16d2484b798d098be5414ddef083c8283b0c29823226fbc4727d9cccf96e33b27fc40e032a
+8ec5ff2ba7c3ca8a2d18df81d46e93a3bc94ceca88134ea75cc8ec2ec4b1ba3d0de49dcd4d385083c648a63483377fdd
+80ca7ee722c3253e7b534b42a8947e38741c542dee1d671b603a9a743f5ba2fa95f193ace46c01000ed20ea05ad0639b
+ac14edc2d803b28a169154364dac5360cf0926d911a615077a94858fb4cbbe31bae2f30a6a68b248cd8bed015e0f3b29
+a4bdb63e91fa72995316d03cd117347cbefd14eb1b19a0adea1c9d39f49d82ca1ceeb2a4184187e1dade109d10b83090
+ac8f528e9e8fafde00e66a75d4bb68c99029456ae9b3b7cc76ea4816e89aca2b8b7d094db214bad1e87dd4e84d1c1a5e
+8a8d090a01aff14383419735840fc5286e71a5feefb98c563b2d7ee593b518c3aef6654f10da8a77f40feb52e1d31fac
+ac4259562982b355fe5e57e1cef574a6a40a7144598c13a6bf07cdd8000bfda95b0b0b44f215e9dbc71be114a1857441
+b53741dc30b11fdc6c9778555c1f714fde60890c191a0effe419fe2b6100228d07cd0738d0dd73057cfc7e340c75f0c4
+80ff52fdfae53dd2410ea556ea6504696439919687d2dcce1e952d9d17b6e3699816ee623b0153bb0e0588e36b6f56b1
+a92b34d785a71d10e6796ad07df788c6878717cef4f1f0623898370725006d46fa00a0a22a3934fc5cf323be85fc7767
+ac1cc08cd1a8fd6c946bbe14662b18e89725933a79965c663b73ae3cf5f5ab87e794559ed579564884e430e108385e18
+88b8b2264d84106d38c321c3a4927b9b41cac172ae27f6292ea44cd9ce11d185d0061a59148e50474d4dad3c9e940476
+b7ac9f257b4f676d69899a181b45f40358dcaa70fa2dad38870d52838aad9001f3a3145f6550fa2826018952431e4cd4
+ade67b3d1602ab0af6a256f25a65b621dded7a0adca65c526ab34c5ca3088a549b7ccf76c586993cef0d2d38af541617
+8fcd8bdc44ab42a70c174682a1e8b929004834d4962a902de460eaf8649883c868cde1cd660d14d7d3ce589fe3aa83ab
+b914f6ec60f1767a12fa34a4b400ce102564dac4c1c42f1497c7bb824bfb9000c9e23ed7cadaa16ad79d5ac906070710
+abb1683b313612b583e87228384eddc3e2e7539e0aa26e825f5c27da222941b6a37ec47127cb0f11b6b8e0d02a6f66e9
+b01efb31962345a2fc71b7c370e7d3117bb1d1e1a9b6984ce11bd83c898dc127fec2e821669deca7c74d406e4678a736
+92439394c6c811d908b05c626f1afeda3a0f8c925747bedf66a4a5895ee76e7445a1982e99d8658117128df5866eb64e
+956bfdcb00837be56d44f159bab9bcc2292295ec1ca7424615e3b163b5d14f7143e214609c0b65ab74a0dbddbed4d782
+880b9a8dc9bf6499f1f71828e6c906e2ae59660c9aaa824a6f36116746406351b4e364b6fa26c45e9d90018555bc7dd4
+83f4a0dcf523d414e023075ce0dde10161d65c0abdba522c811f0e446980cbc21eb0bb42737136bce30fcaae3c673b6a
+abfc5593e02dff15161c4da67a806af3170bb2bbc65e3a0457b4bd994ecf5e001d02bdd417655c2b4433dec270a6273c
+99c6d8bab7d937a4cb5c272c4bc3856a3cb8295cd77ec9e2fcc6a50e0545999cac4c413c3ca8e5408afdb60388c82ae9
+b08f5d230713639ec98a7afcb2a25b9b2d1c48820447d28b6a3ef448aedc4b9a90b6c5ffc6613a70ff1766b51992074f
+99d4b54e35dd3f844088155f114ef93507372ed32a6898b9954d5a6d0743e55d8e7de20d67671454d26561ed5e4fb05c
+b7cad70deba1622c79f1ecfdb2612e380e9048fb6146760ba61cb62e98cef129d3944c5f442b15fc11c102fcc6e2adb4
+95feea870c86525ed214e3e0ecca9f66c5e0babf6da8473e5cc5e2f305c26939f6afda0207bf5855b6a6c928815577ea
+ad6e77ec226053ab331f3f871d7fb770ae78227a85096d263bb42915299147a7a7b57a4f8f929765cfb323267b94865d
+82339f53ab7344f8dad554fd0270c2aedb34f7b0c630f0a56ca9217c04f0e4a38781eec769354a44fa90f556b388ad01
+837d4672d73588f19b872d81b7993e5e0628139f5685d0520b1b766d40e71b9d83a8d2bd65a03987eef89b3d5c254683
+b3c27e19f579133f1ded8c066dbc3e4edaf449a1edcb1aaf215939d63a7f2b250b9b7afb62d4cd7cf37c28da81898a67
+91f669f9db8fbc6d7a5ee92cb67c2fc1ccef6dde622efa455dd7535b11f506f4e309a8878b859d6605a3917f6d7d67e8
+8332dc636222829a83501a8312904096c2984cc0c5dc077e067d8962bd87666226e3324a9e5057c1cbc3ba700a3b22f3
+97e81e20bf33baa4412d6b81c5fbd406dccbe70973bd73e956d8ce85c99d2199daee5fa6e99fc6d40071b352b5044865
+b716066fb9e470cca4546a401048c0e6c6408c8c9f4cd80aca6778d3f4121378e11cccf8a005845fcc8dea2e1b9f16df
+a7b340eb603da43f2aa542dfad1ef3d3357f583c46040f2dab234c8246d7c55d6885f9f7a14f319e22355ad498c22a04
+8281ea97a28ade9a0cdc73a077c72a92810b70912006611a00df8e7d2ee1036af73c0f062b367f3d4d75be4b9bf78aa4
+a481ffa0813a4f2110c6ac535fb446282dce73c182eb99baf786ad42b804ef12df078b2f534e3cd8210973880bba6a63
+b71a581ae08eda0437f9e9274c1f9431d6b357e4866e40d4c2470252f0888978497af823dbf464785479e5f35eb89aa8
+a07c9010308bcfb0c97a1059d5213980000841ca0565697d45aa46e82fb36494e4940aa435ede417856d24f73d374757
+8fc353fa8733947ba067ca2bf5e14a6c334e4ff30efdfa67829dc86f49424f4548e879b153e79dc75f1ec00afd6693c6
+a663faca50e1fe5d00f62abb0b7828d6b761fde9f5a54f27c0b726d8d53281f83ac165b3d3db87f970913350a7dd07f2
+970535269744905640d6ab238930dff375ea7efb2f391db324724166f0c436e7a3eab7ef6eb2e5d6724c58d588a4c592
+800f33f5936498e16fd0f58210a5a5c104074039db7d9d5d92dc62cc00d796ea0a3a22e5d368fe269cedcf30bf6149fd
+b4b921cc901a7775df7ae73e97cdd108d98c54534015a1469f0ca6b07989827e0d3f9bea2ec015fabe9d309054aef802
+93295c8a7e5c0bd9decd99ee2d704d814cb6bd0061404fe00984a8afc337e78af11965a8560288529c2a722e8b54b488
+af43d382ff7951bea94f4540a3a2dbb53ed527e966d0dcd117d5212f36112976e1fa00a47bb9870d3841cb01621c5d7e
+b4d106b21e4676556bedc6e7f5a7eb5c2ad0d5fe8004a1d968bc7806ba871e241d38892b1fa73e9648b23158802ab57b
+a96cbe38f86165288a365efa796b0e2076ae9fa94bb6377cb80c7d5db9d376e9c18164a8a3667dddb3f5b847f52fd319
+a0bde83e1f3e925561c481ceb58c7575027f9641e69f14242b886e7fbc532a2bc54aeeb94ca39bd7da3ac984bfe8cced
+8211c4a70d08fe052246d3ccda60c9e9677910a93d9262d572606d99e273c1ade353eeeadf5b1e3c1ac3c4b9019d5f61
+954ba6744e3f991580b6633e5d184550e44400f20f00149d899d97bc4b51b01d09bb4f82ad975cd55189320523fd60f6
+b7e3f17ae79c2faaf5f3cbe0dc528c6aab0035eb3f38954820556bdf7c3546585fb9814717302c5f45fde7170748ff63
+880446589f33ffe7ff5e105fa1c380d401d6c46e80526948fbf4edcb779753a594f3891461f52eeb3f5f2f6051c361b2
+a26c06cf79c412d49f39e0e27e37c82c4cf0c8648638ee66a97d22d822e064a9a7cbb0b1ede46806ea0430639769cb88
+a968341c5e4a3e6d2a2116222e3c58c2e558f5bb0a2877a27c69fdbd38dc3892f9ed7d7c114f557e52a351c73614fedb
+ae9b8bf4774ce3b84185be77723ec62b9a415e21cd60e86513c1500916c96d62519ee8cc061d81ac9db9709d6e191649
+83a30c1ebc046c9a1ba911ecf6f147644f58f54e32357dc395388e6bab66d71fb9b691754b11bf414d43816af8058828
+ab5b804fcfb68b6439f311d0420005b083a84da15a8415cc4013898806e67c47698a9d594263fd9be42bf48efdfbe2fd
+a41c18185f8111ddd551ecc8f6dcb87036cebb6eabbce7faba40c6c5c8af2ab59ef027c6fb2dc523eb0159335a1ab189
+b24cd94b7c6e161e651107769d863fe5a3d7a847b9c60c7c803846bd782cec0bd54e6278a318ed23b90cd7ad25933fa2
+a5ba23ead78d1678414d4e986b448e7a24b23a5c0f529ba604a51e4ee0f87baee450fd121b43a954be50bff6c0d7908a
+b89c17de4809e722527832b90b810d9691b437f19db9cb88ca5cdb67bbc6946ec1d454dc0990b66093ebeb6eeb6896a6
+914f436fe0ac7540129c3deb04d51bc61192ab5d0d16eda77ef70ecf8cab5f55a13492f54e8052f2f214186a113d8949
+8e0b3d1dd756a9008894028d0443083c21e99de69b8d8f4e7eb3ca7fc52ad540355d4a1081774a6d51a093110f4bc838
+a9c1730eb5c0a42deda9d9b39390661717479e29007f5f8499d0645b8b85bc0ff12cea2ac4328f6588a12126f56284ee
+a2318a42c99f7613ac78cb110656c6e470cac6903a5bfdc1bb182af21e0f0f409bd39324a13e2790f0facba04459d3c0
+a11ba34521434cb718f1b2015bbf451ba1a7c60e59b1620ea843835c7e75bb42b6ad29263cd3705f7f6f1e40a0ebdfe7
+90705112b625973e1cb35e30f9e15e3c752b2e972231b4caf53518f44b4a40b8a6bd15c4af2adbce5dc194169b860cba
+828035b0e70af8db1294379b4b70e56624e1138ef49f7be81d938e8b25aa5dcc03655e045a95a79e0143c23a77407004
+a7abb1836282917d1eb9886c79b6a36d720612e3b823d9420a4a705e8add6c6bfff2f682e6f992a6af10ae2f71ca8828
+81e97c7f980dbbe93df9efdd9c0a8172ba0f00378e9375c926b9e24758e8b827037ba67e06e994fa9d05942320353d71
+afa640b2a7fb997cffc5db74a91dece901be4a36415786190dfd17a77ac837a2fb2d73e973b8e60582e71824c57104cc
+ae860a6850068f2b0e1e5a03afbd08b667f44c4f06e431f1f83269e754f37e18a764b00e100dcdbd1c1d18af9d6304a5
+9443fd7e1263d5ab9baa8b1a3c893765da1dbed0bdf62ac9c886425ea9f05876df1920889b707a2cf248e7a029883588
+acb38feff88de8db3477ea9ae3b33e0c5715cfc91cc71926dce26f4f290dc4f437461a186cf1bdcfcd6d121e087bba33
+942882666a9f49ac24d9099facbf1e65484ee76cfdd2eacef25e0f30260654a7b5c0cb7dc37aa1601980877f945c51dc
+ab2c9035b2ee9c5e57d8de70b24329cfbd247324309eb30ac78c404ced268dbe2aaea8d417300c90d87924a48702b793
+80aedcea9c5a9911731ebb444500eb95b519e2d4650c1d465afc61f4997879d60750ae3fe049e54654a06eaa2db7d8c2
+a63e1ba5fac918c8bc0f4364b5fc8d26214deee825aa1bff111e03c0ed43baad47e8bae154ad580b851a0f66be85c88e
+aea7f5f8c387c21cf671246803cd5baac61cd6359848ad4fd685b1350ed6298a129ed74dace279fe7846001bd6577dfb
+906ad36bbec72813b368bd2b79c1c9624966dcbe94ca9dbacc297d0d8af86edbd80cd702ed04f0adebb913a6a7bc1a62
+a46201c20560ef2ded1ed3047fc196bfaef445c4a716890d9235f3a06d6993a8ab29e816eba54c6a2e2590dc8dd61216
+b37eb2c0d765b044ed2fa2923160a19e11509e764025e43a62b4ccbe38e534ab59e68c2cc92cc5aff9d97154b8210c50
+91f93b1404a4bfd3fc8ea019d76230637ceee315da0faf366c712c3ba19088cd3efa2dd30172dcdac11e636f8473a26d
+b6b905abc4a795bf95d055ea09c3f9d0a8a9ba0014e288492a3751d2aef60cd3b7846e1ca8366635a94988b2e197191f
+847529bf842d7623150a3bb91fc4ccbdc66010bf008179a32359f98bd007330bbfabfdc487f4b98691ad65680af67a8e
+b3d37a8098d02b5ee69ed060527f3d924c727016fd92b21d6a52fb1c1ca18c7eaf0caf8144e9e6bb5b6a039ca85cb1e8
+98cef893dbcec865cceae01138613de146d563f13853ae34bed5f142da716673c105ecbf4f2aa7d187bdee20702d8582
+97f60078d18928c4d7dee1ab244b2b7540928e20cf7ccbbf6684148611afdd9cce60dbf412c1fc544ab8c356fda8fe11
+872a6758004e6c87c3788c5c11bcc74db78f076efaeb75127f0baec28febd02528c65b227b7619fb8c29cc92d7c8e799
+8d72cf1191629440d7af8daf3b76b6b1bcdaa8d6ddcde52603dc8b092c2ac78d6e24bec32e1223eeda15dd17ba2c26d5
+89dcc8c10be08277a1e394de336bb1b135bcc5131dee5eece80973ef364a305235936a3b6dc40f2eeec2aaf227a86376
+972c4ee3b4b3b028ab683415bdfecb2454d326a19d274f499e48bb2cfd55165b928bdfa7f97c4fb6d27082cb88b73dd5
+ab5438a8af3acf2eb75bea0ae71d8aeae363d6644c54e3b020082c80809ef86faf5811808adc8240c7693515ed8bf199
+b594133dc9f71f72e448796316ff3ce2f8a03c21ef9c54e551d23723d5f197f7fb0bf1c33e9cb3f51188db7dca51bf49
+aee981b45d570a666d0d0b2c7aeaca3cc22d4873812b4424d1f91144142393fd64c49401dfb970c7d5ae91233676cacd
+8f978d21de1e264178f88cad7213463a5efd139c30dfce81a7eecb46942870a3c1971f6e6e6a50e0a8b20c379ac084e6
+9153701c8b82ab43fa4635cf677789c9c9911efcf23250bd393301c0be51f14fd0acc4e467ec9682acc89085b94641d7
+8681989a1be217d77cc8e012c95128557de70b362442e7f1e6162bd52ec6e4ebb0ab28f9ad3f67c1d35ff00216ceeb74
+8e85421256fc71a82d35de9645a6da9cbe4dabb9670758c4eafbcf42b26fb99866bb2b4c374601749738ad34e51dba6a
+976774296281bbe1e8dabaee7453613d0a615cc6abaeffd8e15ca4484b5a743e298522b2dfbdcaa697e1eea2b2bff736
+a585501faf955b6acfb328d801cfec5b59be8ff2fe46ef0bd73b86ba4c19c1dbfcc1df844d61a5acc64bb5e8a68f6cc5
+a776217e5073714b36bd2ff0621246a48799eb5ae3ca438d1efff6f9f9beb13779bc18ae5ddb77c838732e8925018118
+992d726bd4889f4e7565bcdc31c7b4a58ba44da5f361e3b46e0a67a6e4f00c25e3503c94e7b2bece737d7efd47ff9beb
+b277f124d5dd8dd669ef1f6840276c0bb0b60379ca3a0aaf00ca337c40f478d511b1a73e73df6c3b600e6bfaf37a8fa9
+b037e78617c235e6528e535bf13bf5e82c70588d1d0bd08de754d089bd47a4fdcfee79b5666b95698cd98c0e32164afb
+aefef9e398e0edb60615713d7c1334005b21844d3f1401903e09af2db20d7b342b8d80796fccab583c8607c533c9b735
+aad20eec7cf4f0b518007ec1df7dbf4935f6f9ecb36a11d148dbf9e5281aab43feebcc8ce9001374be40776c5ffde825
+a4ebd6018e004ac8b5d022cfbb7c5b3833456faff4f198a3d9dbbd077c8752087bda1ea060466fde4a5f31cb8a50a7b0
+a56ebb8ac9901915400234c1c6c8502905765a7224de56b084f9b0a3468a065e78b4daea27d9887b4f44a72fa61a15fa
+b0269890863c63203dd4da3a08a1bf06621cca212acb49799bfc48be7e41c951d807f85dd4171ed57c372914dbd2ffee
+ae11fc0f5fd5ba488104bfc07fed50799f51ceab4768afdab300325e9a913b1f257fea067d357e54950c8d08af5ecf59
+aefce65396c61e835ffa38857df426f64508de6e93f966cc46b54dcbc5e2bfd72df927b00489fc4460414569ce99e610
+a5a1fed75677dc956c000b9135c4b6138e0cff53770399ffbc3b12ff0c1677ace264aef2058aea535ee1a7195afb034d
+8071def0890d01f0d10dab3afb13125f0194e79608b9ff129572b5daffb49cde5bf6d9f24da3f84483612aaac3cb8eb1
+b5e5bb8c0be22349ea51e249cf2159189fb9aee615dd62c5f67cc9f43745676e703abfa6561df4f5f1d79b86c459b11c
+978dfc57cf0d3538ef336a25ca7a2cf373f84b71bc06d1c74907464e3e816d834087ee126bbbbd5090a09ed063f87a46
+a2ff4b59b3e7fef169835e67d47218eff5368aed3e6e2f1cacd29a5efe6c1c2e7e1839d87759bad8ad1871b39c481bf3
+96de49b44bcd2f5ac3d07d6f5270af081776d8631fefbaf9fec6771e13d40a4e5158767067297029bd38e8c6847971b6
+8f2f820e8e3645f2ab9a27b3c23b5f656b681264d08e298ec546c5aaf51119893e0dc8e04d6f64fef48d3cece89692f0
+8de2eeac7dd4b53119d02f0ec99f127cbd8f6a57120d94a9a554c04467fa74ecbdfebbb111d9f15cdc1be2be8c2396db
+b6616f68b00ea0fb78a25ecd51d3018b9ef13664a7da42663d1bfd6fe71fab615624af863f3b41e625b36a607bb42dc4
+abab5be2ab033afd6d110a340c658fb512bb53368886d8a5ea29e3c916a6b1bc46decb2cd0f508b5667f9dd88033ef7d
+8872d0cb09df44c2a75895d46588316a4c9c743080f7a03a384bf4d4be80d341f8dcf0e208383bf3587a3509f3324fe5
+a3f57fda2e8c06fa7ce9de223f5ff56d53ce9fbc48486d88d2845e7011dc038b6f2f270dcfd46ef5222ae9a1557070f8
+a82c4e46f0d1962cb48d6c3d8ed3976c4fd4c174d119470479d9770619a45e6e16e30693b2804a82b516ccdd400508c5
+b53188c6b2907abcfe47fab98f23ac602525e05a5ac6b4421c437025819c80529e9d2d63f8a3c10cb9dced196e572506
+951934cad4c2772aa0ffdfc4f12a55f490824e104f669e4dffc70d9c14239570c87eb998dbb2a6d423bdfe1ab50f4377
+a276bddb27d86e1e70ebb96103a239ae4848ad20c4c5b7de85f480c3f293c934ebe35792361d9767de4333ac6de11643
+b9c8eccc03d7270779a87dd7c52a42c7bd632b9bdf94274b1dc864bc7a59e13eb30870ab740066040aff0beeefe14d2a
+8e0908e4d15aaa582dc028e015c4b2bd97c82b8086737cdd1f2820641e65d88166d1fc763bc483f8fb4643339182473a
+810c6c46945ad5b4f699c51130bf204e47c62066fbe54fd099c3567ca79aa8aa8b04dc5321c09e03df4bb7c9b93857ad
+916d4b23adf202ccfaea7dd124d28573c73b39ebd74bf4dfe32a366f9dd48f4160b8cb0e687e7dca887c4b4f19570cb8
+b1b8fff52dbbd5b9bc6915ba20f3185fa8e23fe52c026a41cdedea5301dfcf6c79c4fe1058f3abf280a00c7b2cbb20a0
+95f9623510e12ddc6f4ae59d06448f496cc911c99a4d5f5c6ff7e434b807fcd4b35ec1ec976a40208ee1a505a892e38d
+ac7217596d42d40380fddef22e83db9e6d6b2d0d2e912f868d7fc07bacfb83e8e6f01af544e8f450d31db014fb094c9a
+b10855b8ff1a81ac32d81773ce8a6391169902290af0637038b58ab59fc84e3403d515ba7c99e26b7382c2e2d0edcedc
+89eebe9789a333f5db0aa9e8604798b15a934ff45e19699c2e7fdb46b6863ce02defcef9f6dbd0cb799ffe2b669428c8
+b9cc540b405c5ec78a2d8fc17ee4a08690e347cc1d860885205bc19cba09e62f25b94ffc2cab1f638c87caf217f7b6e3
+b16d06b120906f085cb183a96a2b635334afda4272ac650259f23059407fdcc8b83e91f2521223f79769ba45428c04bb
+83e0a2d9d9f6654d916a822ab1725d58a10efd64e889a17f44860db4d2c77ec1bdde7d0ec8deabc12f8ffa5af879d4e5
+98cef31d7ee167d9c4248e29402ea8d5546288d1b7ca54a5370e80a9ce371bc4aa3f5c7a24c2e4805d8c99af059b4156
+8fd55a0dc38b65c2b0b45c9127c14b9396db4898f14e1559e428a2951cb5076bff9e3f202a83236f15c1d2530539e5ad
+b3252594c3060118acb12eb91d002a74c068c0b8f9bd735a9ecb082f787c7e046dd6e40ddf4b3ba56bf89f223bb5d76b
+a88446262600f605fc4f067dca855ebc56990a9ea050c708961e486fe685707d9e9ca734068b92778a144c0f3c23b4bf
+97beed96ba821515996045a40f17ad46f8f4d927cd9a2c7ce134a60d19ec4a5819a19aab1bb0df886d9cafcff872bcea
+98ce98dc7908161ceefa0ac132b63c860ec2e53f7ba28e66c6c5e45c5945e459797c65668e58c0a5b8a26811f17c3f41
+b0419cef96d4d44fff0338132d53d2c03e7e9b4618dc2c6b9f4475368e21700fc08b844a2f140158fff81f56aef83b7e
+ae1eba4a4a715f6d077e90e9efb59852b7025adced47fd9f705c2745e6734f2fd2f2f86f07ce24695a06e24e63f00b03
+86db2fd15dd3cef1e504fb057136f0405758f6fcadc391e6f64b3080f92bfbd4537a0d8f59cd1a0e913b2b188093feb6
+b418cff26800f8793b083a879c8b1823285f7a3cac6fa34cf48ac5355f04f6ba74255eaf436739c4d26d0d80d2607129
+8eda3c25b5699569c03b85bc585acf25bc3f9539e9dc3e8707b34520ae5ac53920f45528f0870d93f84647cae36b6aeb
+a2622af11642fb6cd60cddcd4c242cf13045f4ce20539d11727e8942b4f9a7fd1ea2192e83596a35c096fec3658c0c2a
+80735f92d09dc0af19f593ea118bf52146143c1d2a7343f6e2ab95e00debfbd329d4e887f7421e4a361d815dc1a27973
+a7eff30a31db635e239c8632f7f84263c9a9d82511422f49077823aeb124e6ee3c995ceb846902fcd2cff0f5f219db51
+99129aedaac32b3ec18d689a2589e35fc9715fb3f1a72d28a09ad95e39a68ea939ec5721c501a9e35c60cecb3f4379df
+b9995d65636ce1e70967a8ffdf45e50eb264eb64f15ee887781455c5472459cbb309ab58b1645bd6e8f2bd29e69d81b0
+b8049f4c3ddc22405880bf55b5d5d94a6dbb071485f25a49a6457db0446663f8d4fabcf14106b9cabb1b3222d8786773
+b581027c7d9bf7b97f6eb085934b9caa43a46368cc6740139e33e4cb2c94683411710a52d5933a27c9d12a43e75163ae
+b5dfce672e670158c259f36fa549aaacb0699da2f13702c81f5a93afb00361f9ca22d02dcebeaceaee6813a3c9bf7aa5
+b8184f3eb809be1986530dffd7464d84750df02196274955769a0afa02b65e87686d915ecdc7e75a0a76be8b7ad8d064
+b7ab837f300f4aa2ebd2d770f7a36dedaaa68e1d601eb36a28fada4dc73dbd55e7f31c88ab2835aeb57ff113a14c5f32
+a72013c811ca674c3e909064777df1484190fffb0643b6b1435892f5dd0f1d09579189fe00c862bcd18d03309b958b72
+87fb528e03f1b6a000141f4a6ee24a9738d9d2efa795cc262203fec10d76adcd0f89968a46fdebac99af8d048300b8ee
+b2a1ca5d5d16c7addb73341ebed1f8e832250c2f8e03915a417064750d7deec3289e646c06a09c6a3ae40ea2817636a4
+a90cba4d0928da2a5d8c6935790e1a1f026073632a4c1460fe686d06c3f2933661c2b3c49bb0bbeef386f2bcc4d08485
+a5b684d544500be25136b0b5b95d9f363103a6d08cf49f4934d6c96d43720a79cdffe66698de0ffe5b02bb3c2e30286f
+b246952dcdc38a500e64ccf4f312bc7c690d33a3a951fde5f839f6eec77ac78147f1fcf26ff7b990e8868f5cefe1c4eb
+981ed33458e8ead67d4adeb884153bb0fee0ad98ebd9010ee706ea1da7975c290f82c492cf16fb42d1b739632e66e50e
+88bdec223786c894fbd8f964ab2c92c5ad7fa7ed2b97a6bf31423a6ad5bbb5a946ae3cebccce8cc97af9e788d03f547b
+ae852b074e5716e3190593e11fb17f1135d7a5d888986d2be53973fa14c1d4a9887381e648a10a4725291ff062c9d88b
+b87050f914c4f09e2dfef845ace5a06504b6fdb815f685921710c7e82a9fac11f864e3e6023ed5807256d6269271d051
+8cbd11617ab819680cfa68e70e205f3ffecf6e469d88dbdb1d9b0c9c7c38746dd6e64bd526306a8ab59cb7e66841a757
+a1c51cbc1a91618b1ede5cdd77fce26b04971081e5cbf83be20c22b9b30cc9197b9bfd5998fd9ade9b665c8218afe94c
+b5cdb2091d114847dc14a4c922bfe944021549df2d75cfc08ccacc2d740726e90e20a0bc2bb73303e9f0bbb5192fb982
+8e60327955c5de97f56838cdebd24c2ed4021d9e3d74ab9eefd4543a286c1be82a1e8455f8cfc0a17f03358c4648683b
+87f9c1c0987493c631279112fbc79c5f5d7dbf46544119492785f444d063fcb0da4f2d1129735ab77663a9000d9e18ee
+a970df3d50c4ef3d76d53dd2b887e9274fdedced7a83560eb1950fed2075879d9fe1d5af811f04ec92d557a0be0380f7
+95a69bf4092567f5b55a401329d5a08220ae65825f05d56043974fb7b7090372e941a85e2d197c46c9165031b3bd36fd
+8e62c98171e54ff549ccac5d6d381291d0861439dd24e584d356a862d22942e0ff17cdc0d1faab07e496374a547ee812
+ab62d0eed8422a3172269de0e325eae9294914fa67f1ed8e5d0609afa2991a26b1e1b9a04ccda8436d04ec085957b110
+a3292bc88e2a9dec7b55ae4c27a3a8ea46a7b2dfe3a817675eb3712f95264c08668703771b65afcdf6d305e396d5f005
+afbaf9cc19adf63a0716cb868a970a372d7a1e24a4c78718a114ced412a12fda6fdf42f701ca1492a8f8c1ef0466f7a3
+b41a5f064f9d900d1534a68c74796927e4018e23f949d86eb76dd5b26e5b686115d63d858a49b545924b3941bcec2341
+b4e1ef520119f9a238fc4988ab2f1266606f53079744b92c1039541aee78b67ac570d7839fc9b2331244d734ad4637ed
+b0ce754a33a506174d5feaff4e9a79295c743b2a122c8a1788c1427482585b398a750b7bd93cc53c38bd3e557caed172
+9842cd13ee9490d9ca7ddc83d1f7d79495afb7301d1f51f4b007dd2b2eaf15abbff18666126adc25df5ae26b98a80f41
+a976af142268d20a248c4b71304a878efec29b5022199cfc88bf82c081f55d06a89f178606d50bd3f8576f0c5c01a6ad
+985ac6f315ab1d2db1b4f2b107eb1652810e63e36b8c14e8852f072d2c8b14922f20d1374a57d75cec62db0d050a0c7c
+8c1be9e8317fdf847a8131ac14cedda922bbfbe15cf95537493c4e7eccc7f2f1a56ddd1a8832e6300734d6019d8b128b
+b55d129c88d252556fe688f84982becce253736ef3b1fb88328e41300ed0713465c8bd15918386844c725fe7a94e8364
+a96384d2d81cf6a79614c7fd6bb68fec6e74064435a1a79dd8b1533e9c7e578da5ecf03e979969d983da893f42adcd84
+8c2b3c06b7249ef5ecedeb4f2c65c0925cda8877bb4b672afb7a15bb5a7b5818748d6b022c6ab8fe9c5a1499e2037c69
+91c8b2b8b204897741124a37f85ddc45c3ef94ceb5dff681b13771e712f2ba5ac95cb1bd2d3e94a84625d384b51b099b
+8bf852945910e9a773120c5ad975f080c07c8fa37c2158e1138162a82983211da70f27e22876741d58c20a6c9dd770da
+b9e907d9176a0fcba87a2797651765c814df756bbd1d0a86a9b7b06d9d886d1908d4e74ab27d618129dcde81e7d969d1
+ac4d3b156db2570c349e21f07fd17df935872f9687842035b533c6e4773ad5752f4ba8f9ea4501953f6b8c4232a4562d
+ad91c4a7ea0a314d7d1ed7a69a74adf6ad810586c1bf907ae9878ee5f6528437c048c6ae785cc255707ea3e58a4b452b
+8013b76604bda0c429e37006b01750999414100d0ff59ff5ab7b233399adaacb34906ee65054abb94db80fc92ac6d2e8
+b26a2a660af34a4b9b8910463d0dd439a3dc563494f5ec280dd5eec0b14b0e9426a0422f3c75370201299d394c4d90ad
+8e1c7ea11dd513fb8527fa99b899444bf89a1188089d3bb65e3eb87025de9a48e8b4a3068a955fe752f2416de282ca20
+b6cbdbf2b143330db09841aa0e7d22d32772ee62006e7cee13d8c4ac911ff4a59a9dba3d84bc46ace1760353d847bbd3
+b8f5aa3ee213a44c41f63c11f685e754997cac37b27e91d07bcb69947344d94f3b86284b3b1655e168befc01c880d550
+89f93b37bda703494263b10768118ce998ac1f395d422c0ae840e47c6d649a3ec59b404c164a1ad5ed14ccc2408fc662
+97255607a1aaae89530a3bdbb7f2b7ba3fb9d5dc93509991021152dde08a638bb3152503cf0c896c9c19d61f8eea36d7
+909c7ecafb798e6aa45867976f59cdc9d219aca6fd0881f82f296a83a2a3cc5ed47f08794e6e3009f8847f16345f5f4b
+9560fbc2c531571eee5b7389855117644f156ddb00b23a7c2189205d4cc613ec83952b96e941cc1e725c2b574c46ee9c
+aaa69f68b6086bd369fd92355f3a0bc632c1b1b4284529c18a7cd4d71d827291bc997ce74bc92dcd6900419be68efb37
+af9ab7e6a27e61a99f37b89fc816974ff916b6a24ec3aa31d76579204bdd5ff01a2eea26e76188976c033db4af167db5
+b026dc8850af970d2ffd300dce6ae07db0ca2d21978e4f3a6797b6e3e81f1d9680465080a983c31d473a77ffb62acb5c
+8f82f92ca992ac352ed1e8fe31d24f8090ce6a7f02d6086720422b9bab20f3e3c38a5f63c7fdb193e30d63f08e53c900
+8b896a2ae84c66109c8501cf6070c4da65c43ca8ef9b6b06fc85b6cd92bf2e5397d492796c528c7b2cf29ba93341a87b
+961bf4c0b8068c8406a864595e156004d427138e06b390519cef53af8eb00c748bdfdd480521c6aa0d53a78e8f806217
+a6fa456250d20c6842dde55d3884eaecfe8a39f546cc5e4a77f57907192e849a956a33a81369b0f2633c55bd6608eb63
+b1d1d2f3e3e058ee97c9b6246cf073236438ed5e782bb21c68cd0d77b44f29745dc24d01edbce4437d93071b6fa6e0a4
+81a0bec80ecd1b1e72256ed5be7de8deb11046ead7a96e1d150573f4d896e642b4af095735343f6831bb6b7f4037cfca
+b48d8e15fa8e0b46937637de3c727157f8073eb8a9a04bf127e68977758385a791da2e9c69fedb89b334fc638ece78d3
+afdee0774369653bf371b8820e285e1b48b40745a44d22cf2098b630b8ac95796a74f79337cb97fc60b6d6b903a61321
+8fcd9ff2991902149db29cd4674d60387d4f65397891fbf91b7699a42f579f6b0afdaccec70e5e82d1abd81de859183a
+8af5c73367a8439b2e3e5f1b65e00ebef2eda640bfba2eae48582cdfb244e1b1cc540bc0ef72f9e24399affce1c3e222
+b58cad4da101363bb8d6e8cd0ec7c078f7719462856d7ea573e2bf95e00cc23020031901bd1f2112ffb90d847241e5a1
+a671f7fe2ad81e9e0d5e3260a9dd7808125dcebd970877b000bdaa3207ca45ae1e5458d5ab7bd69b2adfca8b6abd88d0
+a8411cde9eefe73fbceec3e5e3628b159ca4e4c19385ab50b8d7a482f4258f405c47051a89f11dbedb2b15e84d8bfcc9
+b5dd09d5ebb26e341b6df80e836c6de2305ce4941238e3e96da549857ec314b1658f8b03ef069633625b6e4bc13b531c
+81bc9bc924039fcca8892b40aa9fe8f5d6f305343f6054e36647d5f14cad3e4d754dd6ce9ded67ae65825adb4e16df31
+935ec74c2dba94b1c5ef2060c31bb5c1426965f68d9f4125cdd891f20495da9d5dca513f65bf3e8c599f1562e81a0c1b
+b9581e11f361097620130e753d134cce6d40ddc7c516388fe4c881fceadf738f314d241dc14d4f87be8ff0481e898c4b
+b7be50ea49e09d10cbcf21b6f717e0cdca582d57935d72d17e62cdd7bf2071e5d5c91ad7bea79476537e515f0d2fa5af
+ab467b7fd32a795411e991417be57af8b62ca199983efc1f744799136ae5339173111465e91083dbce60e77f9f2c0fc6
+b99afb338f747ae89e7cebf069612e22f9704f247d66548d305aacdfae395609a57d4d5405ff0f1eb1045dca4c3827ce
+99a5e52374e1c55f65e44951f68cc3d607157e60d52cd088125a81bc60f2009d1b894eff8e1efb175509aa4b57af7276
+87e3323cf6f11b595ed745a9475a6d99d11333043d512bb61d5f9d8c3f0cb6957aa8c3f041688f63ac13a51df29fa061
+96a5f9ed28056138439eedba186b754f5f7693c09422f42ef82a315b7413b418c4971112f4261e1b9793ec9066c3641c
+b9b5fd36d2d861d40b947c3c879a42fff24b9ee346163e544ce6c3301d0003cdb47218644fd5f1f7f0d6f19bf647ceed
+a8899296b58e5d56d7da438ea48bd76310364ffe666d698c86f20683343663d742a0b3f8c1255e33f1d424cbf61bf1e6
+ac4be82ca78df2a367f13c8bd1cb73a28015853f2745e025626c325a10b778cf4bd9942439e35015cb38504bc02993c8
+ae5d6b99ef56cebd5e25a9c002e9e80c1d3e8e5fb5dcefc8ea7b7798c7e09b02147da2ba14e42e2b6db2b2a6a738f598
+8c94abefc71d245b0bf04f34085da0a9b8d4d798ee7441596c5166ac353425175dfcab0f76bdabab8f0ef5a2b453255d
+960ab6939b1185806e9f985c9381206c7032ea8a7a99eae5a66f276ad5cf450e654a6f1e956a2a63f33d6f715064d051
+a4c7c7d0fce514db07bae5582f5e4f7a05d79f7605b33fe2a1ae980bc388b31c056438616bc8391ddc7dd5f98810c74e
+ad5df00f96ee6e9e1ee65b562d6311c38bc2a0a25aa9ee36f39766a2a03141e95285dd2850a598385f45b9935d63b78c
+b051de656e37ccdf3844a6e095d3b42ea9c5a545e0dc2a5234e2016570375bff6b55ee0dff04ece5713ba8e85629a7da
+ac01fad1ac299567a22da6949a011f429bd9775de956dcdc247d5c186ec577fbc12a482ebff3a4ab18a8e35f3e2218c2
+9654db9c6b5e58e0b68fc49718773d44129a0e77bfeee3fb56d27c282de6b75fe9c10f4f3b5d3374443a9fad45c400ce
+a556631390e6cecc2ebe390e605e6fd754f1961e4bbc063c31c08812e0993eff5b5b7449b9732bfd3a22c87f9c528743
+b41b7abb971e253dfec3aaec4443e875d73373c70c33e9ea19c1176f8cf1278c7716a76a4eeb641c142b2c6c1ace5db7
+8bf37cbe29245c5e217a48140d7f0374f46596f2e82c1144ceb41c9801211869b96d7f1d0f7345233abcfead0309cc3e
+a380a799b80f1309ba326f26ee46ba3081b12b5a1143f8289b2fa067aa3ba80c3690fcefded8534a80368799b71ee9c1
+93dce0a2aee4d67efec1b284142d890d1e0d7abdbbfac82f90dcbaea94eef829645675cf17050af7b2e504a46d1bd288
+b8e90f54bc57ff52b84fa3fc3c3047f379c5587ca18d9988c613a3bfe614fd5fc381106729bd62eda298faaf17b10210
+8d8e4f508c284c52a6f907ec39950235c9443c5c6046762911f4818b98293d7d60a2c3f94c5cf60ccfeaeb8f283d8ce1
+a513b66299ba5104ba633cd68121b9ec848e0c8c5252d04a0bdbab5e3bfe6ceac93ebb1ee6f0274920d84eae27df1520
+80e2db8b919dd2ca33e833270738b1f437ae312b1c53a73106b6d12672a395fc3b941292fbb019d40e31b8e96bcb85c5
+a4c28fba416985d47c947b0669cc22153ce887ec54535a18cf457622d03120b6aca71a45fd8704166f6f7a9ea2e9d608
+850b05b9c7e168a83b0e0e77d16181a52d78aa96f4026c4420824cbd44dea9f27f3336b1736bd545bfdf548eb3f4276c
+8efabbd63f3b9ae6111dceb1cffe45dd23f1500f87382816d4192161a77dd0776da2a4463d32da85b802ba7299fa726b
+9426e75c6f7fb77072773a2ee03e1e3f1d90878fdb5d8c294265262f5c1cdd74a7aca339b46af8a5c43823dac7e57edd
+a1c4d2ed335a3c92d867c5cb999b2b807dfb1d45e35b3960dfab19da43e2d1ca9a8748738380cefd137088d8b80d3006
+987a7e22092931f39f05f5a6b38f419750370a71157d4443510b61fe07ac5aa31cd7f88ea04121947b1c0d0419d2a25f
+ae73cbce7cda7cd90404302388d41b49ed7d7f505a9a406f0317fccb29e32a5be61a6eb0951657f2d93abbb497be62ad
+a1c7cb4056984c22a57ce76272428a50fd33f0f7a68c29c9438af05a87bec23d8de72062fb4829adafe597a278de0c01
+b72c81a9a747a83a650b58ee01015a8882789983b67ac4f2fbedbbf47dbe30f04f686877d8f118b4634289866aecf9da
+91ba1797d6913270ac1cb9c87d9d8440a651e294c45b2301ff8c40416e58126318f0f2d411b7d9c09c8e19f4da8ca0ef
+864107657717124339cb2ec06cdfa75fb9c4a7ad5155cbdd03d155a7f9e9026e237d7cf5f4cbf07239e7bfbd79900957
+87af853a334b8cdd10bf5f78753b27a0c9aac9f55db7570e2d9d42f13d0e2f8bfc4ca64b77b21e478f23385f17eb4f6d
+8658227bb8733d6c7608d66a748caba761f28da4d95e70506dcfdc18300a559b4a84d11a9a048e82b292eb1b5d88bbf9
+b078413570ead3243b9666c109a17678fe60dd1240caf01d1d344de09e346015cba7a40560b0d68b18df82a0a37ca529
+af6dd12875a891eea9d846aa660a207a527d08f5959976f6cb7585a98b1133f341f4ae29157f6ea8e0500fb6b49fb9c1
+abc0fb42239fa531cf09f7288fb00f1d1587f2a86503593d481bb19b1159a6a9d6f4794565fe923a545d45b058d3a74b
+b95966d42c59bb12029aef1da7fd50e9e8aa9ea287649ec3ba44247b185b485260af077e0d755f322ee4ecf8e2c8137b
+8b1a2350f9bb0d6de377c00f0897081bfbaac5d47cac852a22dd8a427fd2e3029a1708f452e958a07236c7f35ddeb565
+acaff21e9740b831fee42d80a9a80cffa6673e39f85b815b4f546f538dcd803320f90f4f25436796721c8a11f5a1b25e
+a0dd42f019eedba19f4345553965508aa9d2eb1499a363056d95e27f7083c2343e74a0e7dfb101567250148ee1bec1d7
+a08d1b1863e594bfcfa2e21ef4edee8535c8ee69490a4113787899ad8cf2f2ebbdea54de193ded85af82fde074ccd0fc
+960912b621ff08e27781a4f9b80ef1014a4064fa3c96f534b67e5a094a5c11d9cadb2b69cd2011cdddb463f2936c7ff5
+b3437f1e0872f6b9ec071a951f26120f27425789e00c1a8d3183879ed02e3b017406c051f32580b78b4d0f090474b42a
+a90e6d1b11ebd1f1dec54d7b3fb336b9a53c821f295a592e147d5fd453d66e63295a96ce827c4ad64c37d4bc0df2c7e7
+b357a785f3dc1f9bc1034da77033c0c64b29b78c7381ca59ef81e24ab14448d67dbf84756ea233b9e3539b5ed517d9c3
+9360adb42210abb9d7644bb95532e1f461464446e94cb5047bf8ed5513398414130630866b6980b6afec5401e608f6f5
+9145a7f8b2cf1bdd90b9a860051eacdb937189e8d68793e52bed202fa1e23a87db9c51a18f0bc050dfc3c600780099c3
+ae086e289e16608f02281bbde5a6fb2479e3151a2464b86ea737f8a43e15af4fe781312d0e5620a42a096cfbec885b0a
+92b57fb14a0c567a16567f83e72b03b8b564ff6d830a5776014167cea06205579dd10715071097710dbf50b660b9143b
+83e6a3f027163e635c2a1a397d2661a2d6c72c25082df129572082db29b1587c78dc3d2e5999112983a040ca46bc983c
+b1667d022c8099dac5af4ce3b4ed6f524819240275725c7580a2386f067fdc9b3a49b74195cc6f661212fb07ff133463
+aa2eb0c44df0a80047eec28a80440ed5f363e3d42908506bf8418bf04e9c17a5e9f550bec9c8ab8dc9979736ce325780
+a2c1d257de1a55e4c10879eadd49af8950b0cf25121e8d7de30049360470aeecfbef263739262bf1f97020c6b025f9cd
+af29d1afc9f76417e4396c54300773fd283f1bc2cb00308da5e6b1deac7a48cb117c0e8c87b03076c7a1b8414d25dc97
+a44d4f2186f5d728fdb224f10b496c9b57d96204325c452842423cbd29bbb2d07e98013a3880c7dfd63ede725d15953a
+a30c45d1cdc68a5d5ab65b57d60c8b386be836c5bfda7e2f0347229b7807f6a97b632bf54ba3711066bcbd5e0831e5bb
+a8c3c93d6a3526270ae47bc2628da82bbdb8b2c8e4d6a4cb5e9cf70b49999a963f3e856ff9db12cfd2575187bec668c7
+a03566f1a99f5b82e8243678d0bb033441cb8a2f160c0c66dcebd0b6922a56f895a69b94a9c65f4adc9ed73420fd30dd
+a4e3c839a6f4f4317e7bd06f25c5236e42fb0e54bb975f18f0240bdc214780049f0258dae24fba6301aad508ef9abf69
+b7e0349d89616156679d06d1626f45dbc9683ad73ed91f0d92f8f82cb0ea2ae8d3ba3a752e73a39da70569d41e84015e
+8c9ec5ff6be4b0d9337c5336b467c6d4f552af691bf083a23f1f9856e18b5a13852143dabf03869009febc443b2edbef
+a12ff782575aca7b48844f0402a311bcb3e19514dd4d2ba5b39694c66846b22dc9ba25ea39c3c1bc325eda3afa1f00b1
+b55bb586ebf5c9a3c83a04bae254e22547f37b9090151d96f5d8aa81be17bb38d2763a08cf0519a91878633ced6ce0f4
+b3957203932032fe180ba9cb5347c2c1865a3094d03f6611148af4094fa6a8eae522f2651780d9bc49b41f5c36054eab
+a0c865b498e30180c48fcab93342a50ca1cddd8759d6e0bb54e9f92e7b60c51c373f7ab1432aeb5e5c2d3ffcd79e8180
+9503ffb3529c3415c07247211c2a4f35d8ecef98ce9f921e67438ffd538caa54520fc6d248a081f46221a0f1165011bb
+906deaabf6e8dd0c24a4b22757b7681bf88268d9b4ff97f2844f9de825af511155d0bbc48dc4c03b87007be94f835d92
+96c2a7f48990ecffccbefe128a28cd5b26c664b8dc9bbae16d857f7efc1b7711c734ba7d1476945d09ace569297ea96b
+a37ea083b0a61f400b498ac5ba2360c22e40b688428ff4a02e3cc80206b61061bde037cd52d97eeca175394dc675e216
+89b15c3af439769829ca930fa83c47afe070f6e2d7a7df88e5a4f3a2c0630f9d143bb3cc43ebf9bbc1b91be03d35ffda
+8eca6996ba407886d3b9d2e4b1aae1983023dbb1c9ae47b6637458c73ffb7f422b0a893eb0b07fea2c5172ba335595b4
+81df4d7f576930b2865af5ee1525718a09b65d9a013feafd19cad335e4e425485531807078b9564c8db3bad95d23bb0f
+b6635aa3ca31c851a0283c0c6356235a5d8de9d1db9780e62087be32089c1c081bdc642f067224e88c14252efb960e3d
+a0120e81025ba07848ef24ca9a94699db5274a8c85eb9c2f3b41a81f630d09d100127154ddc3270525961613a41ed81e
+aaa8dd063f9f4f73f5a7c440671e1375ca8c224f8f869af736edcc435329487902249c68ef646fbf71c33a8bd1a04d9d
+a36bfb14bbf3956c317e01fe744bd9c6c6f526a3881f6800592501ca1d9caba7f81b3b54f53b2ee1b13aa6de42ba06ec
+819cd123fd793c0c9aba75aa96293268a4731c68c0a26a52561a695fc4acc409752de84ebd19494bae70849ce538138a
+ad4e50ce325477621b6eb4d453b087c3d7df6e3d019ab41239f2ad0615c6030aeaf85e0e020f3e6c89e46b8586b4a347
+a4327072fbcf33be1e57ee4bd5db4c079c5ec11694a25fa2fb30932f8a2a35a63183b24d3ded7f6c8a8d0ad111586dbf
+9454f17aa8fbdd2b15dfa6600ad305936a37b205eb554c915adc43aceb4dff6b0d1414e61584d5b15265f2ec0c85abea
+80eed3725282c83dde575620bc0d86e50412df5dac3b3556d1e3bd9e7ef6f56dab202f4dfe4ce542babd49c1fa7dea5a
+b90d1a07ff760daa23b7408b067c322f126023389beb7bf373f0c68b85ba0ea8a2c03e77e6d3339a01ed3ff8ba51f1f6
+92789ad894995ba07f36a0814fc3289810136f9dbc6c70c57ea80db464772d760b57d5b059d4ed458f256af7603fa2c3
+96a4ae1ca46d3b26029767e02fcf2f623d32c952712badf2a2af721226473f4875c40d5b14e66bf961a5a56aaced3aeb
+8c5073f4846df9a0e057f52fdefe01a9b8c9ace91ef5ac253e823e165ae698e733eb936ad9cb04d2c54cd8570f328c4e
+a9f36450b5ca66a20e52bc196620852a41f1f40262a2e12c278818b6071e6972c3cc6fdf83a9ccf586db6cc177173cae
+8f101df23aa7e353ac1034c38adab8f20b8753aacabd10d70acb41d0fd0b1f34277546b30f64d0a861f448f112e38acf
+b45b0779ef1ffbfa86d7e02e89bba0316c5ce60742b350296eff0d04246f1c8b1bf5bff68bc97792c85f1e5d4dcabacf
+b7e89d015f6c7122a2f35f1c48b43eb0076ac4269158d52e38bf2a11de11cf2928175f717ee5c1bf543ea38945658558
+ade2a57ebd7600929dcdacc290168443437bc288371ef40580df515012350f3453b09aad8ae9e64bbc3fe6a3456f2c31
+91c2f8de02bd8dfed1eeebc40a422d444e3459f9c33476b55de3e950d2c38d8463c4edf4d4f95347b0599a48cb2d47e5
+8f6e77d9ceec539e0407a8d75d4e855e376838c0f886b36615a9c7715bce56a8669586f6d7cef75812d84b8be91380bd
+87637da91b051ad92081e682e289bb904c51d95ee1a6ae2b8956982093a7bb4f8a66d91874265dc32229f9db5bd51ba0
+94691811eb74f2970a95e9a2d64435952145f1d0caa76040f9811c9ea1ed7327750d57d6e8dd63c6378f336421d11093
+884cff4ebea1bb48c0d651bcf0a710ebccab9062c96364aa64aa1275e9364a4c261e40a4b9f7e1e135572681a5a7a965
+93f21d4b6b53cdc1dd41cb1b80ff73c0f1620db41c35aeccc059128704e9d1d7da5fd3240e7d075a2503273e7525664c
+b9afe0a9b64dc43fa78f607cdcfe337ac952fccfde41c2e88abe3a8dbb36a51b3445d724908e552ba74bf67ea2cab56d
+910280ba145bcb6a99d89d1526f10632206d2ca9e1a8596e5d181dfa37e5f407e1264b9c71c39530caa59894c10b371b
+a5f583c9fbed59f99cf5e21b9a734de6d5685b9c33931325dd4b581bcf5aa4764c2a250924e7b6f7931dc5278bd17152
+a87267f2ad292572a1cfc89308c96aec0d12e5f0fc2b4135ff8df7cf83bb1e71d619906d415db5841bbbeb173868ca82
+899d7ff8d7f8d0daf62ec8d28adbfe4e7856582a23e62dee175e3bb9461f38bf8e4f73dffe10654a046573896f6de690
+a8f3601e6787e788d46a9d7592dd4bdd8ea8b5136e3c897d79ce560e9511f6236e67a85a35c59295428c1f9c019a0841
+b180a16448f085227a6f3e363b0dbcab285bf419d438a13be2cac1ac9f97973ff6b8aee38294f70a8d72bb4ff474577f
+869038341a2f68ba85f5b2de58d2d794584a3c00a76ad0dda5aec31d4e3ee433be20c197b40618f89f7c8f1692ea3cc9
+8366f825dabdf4f7714c5d089443d0de315198e23fb93c3ed063c4b8fca0727b05665c04beca145dc4c02f333e300c18
+93291da32b501cdfa3624b39f6e38ed982c75c1209cd85630cf83288204032c0a90f013f1dfb4dcedee7aaf0fd95566a
+96c95a1e73016fecc3483fc94dfaceea376ac700fd4804b24e9eda7135048e521daf96f8f63d5a1439950a64296d8124
+866429fba47fb691a4c39460031a7e614096abbca3073e9246babd23075e8e5f6051e424e47d860296ac8ac646f8a283
+b817f3d9985cf9f9657fa800ebd36a9622566697ce68f91c509d9ad7df8146532e24ad85c07f399908f87d1206c7642c
+8761c3755cf5440775fe00081f79dbf59829f8d400adf7448188b97f756ad35658295649294ac9626c2569ab21a5df86
+aad65ace72ef89783507c9feb5555275d70a421a95f306b7613c894bc24e978be809410b519e9314ac56fdae0c71d326
+8ed16ed07d0e989061db5087d50cebfcd6983fd54be5062e333bfb8f6f609bf1b7b840c91ffe4b66fd674eeae2dd1558
+af3919bbc0df42b1e2e8f62e931701f7c35cfefe3ac3f1985ddb70212476112e8a19d51c673da931777ffa28944306f2
+99a364d8819b5ea0f6d900167b60063f40f9afcf291ded7adaa2d0e46f344751cb312df1c2113bad8d84a028f680b41b
+8d970bad8f95ced0b0323f4b7b087efd0624ce21834b3c9ed435dc0a394cc2c7ce58f1741c1a64265c81654eeb6801ee
+a5f96a4d794f6f844b38f9b82ee15c2441cce293b6b2ba26b25643165236db05ffa918ebbe20aa89ed2a8ffc8df393fa
+8ca69e0006f6a72e5abcc32c3961aeeebb8c0a76d877fdd8a093467485c19662b75f2ad8c750acc9cc12c8fcbfbe9b0c
+b5378b855f6ed3eec19546cc21c947dd12e98783164d95a95d3cac36c89a840bcb9f7c99b191fa7730ec28d57e7326dc
+884e50d5e20bebca96dda539daeb0e15edaac7fc88bca254a7239f30aaec47a64f29b69fb2d90041b82f8ad8e3f13d3c
+abcce1f6149037ac8d27497831acb867cd5e05f637b7579736ba5c384b8145f127c56b82b1876881b782b94a84d32d04
+8747985d53fac369c4a23224d50bdc556c00f406e7ab3e38427aec317ae7c0feee5b48b9386c5764de883cf296ed1daa
+a153c77887f271316d5a7185fe0d2bb7359cad86ba80b03434bee8f21b3a5e52263d28cb9d3d2e6d5b7443196e03cf80
+a77b16b2b7b6e999144af6c919e0a74b9a6ff70de41a133f7f820befc1261bf261142717133dd4a99e168a5cca4791e5
+b89beb83489db9fb62fa32d1a8ecb66fe9ed41d318820d13c3e07e1c97802dfd7b05d34652a478a1deb3b17b4243a499
+a80200902da696d0d3974ab29676f0eb67d15166b173fd63b247a17cc49f56b6ffa28d9690841ed4865229248650601f
+8210103eccfd1f4be55e33991a831c50260bbabc1f311564fc1c52c3b2755d3e4a11ad69cd95e398dffdb9a0f5b77df0
+9958745d00d8f29d05d97875746d863007b1c05d3ae920794e6c65adb47ec208734fdaed1b49982c4f4cdd1d3043c369
+94a4f28dc7a9d2dd01ebc2f3ed11a5bb01a2095e7c772d2753c022d991da7b2e4c80c2170209bcc4771d68ef8cf007c0
+a6b5c5543ae3de57e074fac82221590a8d771e93e22fffc2029b44e8a1c2c8c9cb0362416de54d00fd5420e5b1375eb3
+875e801265871509c71dce38005ad6423fd027206e6ab4c58d2978ab4812d5720401c1310b56ce9ecd95241a17ce0e7a
+b6819bc6497ed57feb41bd82f56216b513085b6d1a560a958adcc06a6da304424ee34ab2580604b0e59f6b0091ffe6ad
+93bef0806f21f8bac88a5d6e2e6d1adda06f9daad5cc3c8de61162495d8fcc3889b767a3e2f3380f162166ce40a0ce80
+a1f699cd7446cdb1321a05f970bc70cc98593aaf0145a0d097e60e5897aa311b00d019e09cd533d0c0b7cc5c00a753e5
+89ae140ad75a83db2903a93a3711be90986d08dcfe962aec5ea4ee69656026dce77821993c1defc4464442bfe7d44734
+a4110c80ba92f545a1a7545cbeef997d6c0242fd4d771977192269d626b35c88c361df53bb36dfa8ea7e40da68e45f81
+906786f38eb7e98c431fa2464048ac3f1f1df8f908a25262978327224bc82168f564b2f3e6da77f49457ce49c1a72c2b
+b28d92b3228547f03a3f489e09070ad9a1e20a73e49f7ada96ce41c19cd6416ad809b3a3a01f141b3698e85c641d795d
+a25b9df9b377baafc8c735a772e0ed9ac007c0b6ebac2cc0f8f2e799e5e6038a616968c9896cea862e99b1750224ffe7
+8085eaabc79a2faf1ed0b9fdd017fba1e46c671c6d8ed78fb089494f792765b0617f790016d8f55697dd0f45d17de4b1
+a0e81b557af74efb95cf94054264d30396121312c643052070ab53eac8e75075f1fd0b384cdf1d96bd39cc98681b2d92
+b8e0ffc7548969ae28beaa9d8bd65872840a03150e2140dd799d9924249f92d962a0089171bf4b311520ab527198668f
+a6188827a500b99af6eb91094a0e464e394c8c0a6d80cfcc5d8be89e8810732a03ca75b2befd00d07d1dfbe7dbe89be5
+a4e5a47c656e74107e6007199b940d8381f706d5bb4226a0b2fb13eda725a556530b8d4876dc49c5f9631dc6bfcc4c9f
+90330a50442db9a9c459e06d42cf7a69e009332976c3950ae7d9981d99066fd2af22f22ac429850b998f1ec929c82bfd
+89dcc51fb717212b2dcbd0fa0da189e194b4ad5bf7f43ab2cc2c96f11c186d0872bd930aeaae01661ce2dd9f94eefce9
+adee914ece15575cc34ab485f2dbdf3979406ce7cd8cd82197f156f373beee6d80e5e3623d79a2fef14b0b4ed1678a51
+87e97e8866002364bbe9b49c5f2b5eb729c7018ec61dff7b8bcee1c1ea349e5e04a3f3781617d46d8fe0e62afe55d62b
+b6b7bd0bc652a0bf79aeeea1767f0f17dd543b9de582531bb3e14ba2bfe1b720a6c6b613cfc295372eab9202f5e2d340
+a6f9cd96d8e422d9897d50bf36288bf4c09d28cb0f5c4e13ef7f76cef6c75bb594d0ca954ff7339590cdece16414fdba
+b9bc319dc5e55630d1ee8cb48978a256b69c96aaabb5269bed8c5366add03a2c38da11cb03a44e150a5c7f34bb49bcd5
+868c36924f0056b3464bff8831543a280ced62be748d60f82ac860c32025c4589e9354984e1cedf24678374c959383a8
+a6244602362c09b382926dabae5793ca4fc50600193c69e645fe229a471f7cf9e58c4a59124d6d2dabaecf50f1e1fd1d
+b42df58ee9e20fce589837d5ed8a938eb83a00c6ffe2f6afc973f6ce26559b8d220976ea1fc18ffbafe739c92dda6618
+90c0b2ed8ed7cd6f6ff812c84ed297b3231f6e2106f2df6d5e4b4bbf5378231025582cf39f35dc9344d9fad3adf04685
+a968386bf1221425cee0d0b926689426fd77e8e8bca5ad3bd07298fbbeef4fc676e0cf7a4f29cf981c682a78a54a2d1e
+a3a46bb7db36e0294b509036a40875850ea5ce4e8853cc0a7d85e8455fc2bd7d5b593879408ef2f3b2b2bfa44aca2276
+af825963207f046b23534896086a3e56247d752982417047f850bf306d0cce285b537508747afc700dff6472fe3b5569
+8022af88981249b5da08ccc19e4ffbc35feb2cb5308b34064de4d5bfc8ff2b933363988c833ec70723e3b5107f8fbd67
+89687fe6e424c7f0d2751e5f7838e9a3fca4c0bca043806fe511442bbf41cb67d01165ecb662b1ece1b2adede5a9537e
+99c925763420fdac4149a02131831449c1df8be4867a6d2d09e6b14abb821d46bc1fc4fc9aacfa4e9de1a93f9b56fbcc
+b819ee6a0724de9c944ce2ca51ffd3f1d93c77ff25e39de8be2a612abe732dddbf2219e839686a4373609a560041291f
+b5eabf12513e91139025f1236c7ec235368eb8586522dce04d370acd3d854c1e6676d92014b60ea3e4e21e9d6f063f2a
+b82e94f1013db6cc682032c7760aca2a1082826d280801aad9c6564704362e61a61cb52c6f35f769bd8ca191e68e0b0a
+95dcb02a676b17f20b75632c7a9060f990e44b0c1fba84ec8e633554f875ebcf6e54caeb9816267e84a11808d68728af
+b0c7c401dcc019d2108eab7e87d6494e06399f6eb4fd95b8ff9ba4a56e549a3d3a4aff13771229f4c456283fc3cbc53c
+b1a8e3e500e3ed74bacf91a82b39f2b870963dec0b98b7d5ccefa3212fc9f3ef923101887572e14d08145aaafa8da5ba
+b2caf72c47870ce9f0524c4b3df6ab3eb3695765c010a27c0f3cda0ee1c1f5bee64e5392ef8b3f0f11e66bd8c9d4630d
+a8fb4864bce5f1c48d681eb37efe7d9ed1a83ed36bdc1f2627539b92c90e100d4dd64ab664e404b0eb7b645a8f95642e
+a1b6164a4f0467444fd56a1f4668c8d1f295f6e6f5191355dcfd004c34153317202823d72162b621f677c970a3f0bfd0
+b2cc59a2f6f3b7e18064720f93b28801fb684d98ee808ec5c04a5235dc40372aa0e0521410d8f736161470443bd97ed7
+b5d9a823649c09151b214406189d75d7f1ca150cc7431d79b7d60348b6d7405014a44bb7840e35f9c0a634b4c6785561
+af6b8229fe035cbd6a5da3a3aad93e7ca5ed233dea5fe4477dce46ed17bac9243ebf25a8439ac2896c41baa671c0fdfc
+b42d9023551d999d2be3ee51f6ca82c3b2d41fce51e1dab52095af6d4b59edcad70a1f9b1e71eddff894e3fe35a1f11c
+b868543c09fa9b9b990b276ddc5b68a2415965d3de71b9ac538c26a6333543a7c33d0b432f57756ac0077d0021878944
+846577a8c877461a58a94c5829f2ed9d7ed107fa63a48ee77a1ef1f1d1f940b2605fc742cb5ef849e3cbfc86942488fc
+967ca22cc8c21382b15d73b4dd4f6f0a0bdb2056c21e3c75eb3d9c13dd41336672ceca03065d8cd1062389afa4726974
+8e0b872d766c439f3f868f18ef0c173896eac883783dcc58917f76d5a2e8c291967a032d254450fa7f9a12fa7d7a4cf9
+a0236eb36a4ce3b7d649ff02de9279d364ecd5059932328230314ecdce3278c42cb836f547bb9da9de0fc96cda2fbc7c
+92eac5a5a88648e6d821d3bb51b280fc106f751d85a1742a6a1ceed071eaaa215a0a0238492ddbefbdcdf2e38e4149fc
+88e1036f9b20a2c4b3534175c93d59c1ade3fa6652a4c5c490f21f6c3340769c7f8147d53a92fbfd84c23d7c4295cdd2
+8b094165ad429a339f12696bc8967ca89ec47a4778f387e42e273a1863a38199dd795d120d198d3cbd93203604c6914c
+8f8013229eb6bc6a8f93c17d3b4a1b206c258f14091c6dc39cb1ec492d403cdf5f696070ef5a6c0ab9ed4ec141b08d73
+81c7ad27bd7a48b444b2be3d4b5d4845743d6ac4857b061e659d7ed48ebacdeac29cabd0cd163f3fe6c5cc28753148cc
+91c8a92749183e3e6f3499d3b0e9b080109d5e88ce8acb03b35f3d04591e13b4c489ae323a149def1edaaf62f93bbbe4
+a6a2d69f012d877460c33095924771065fdcdddc30670ea84576b72dd3f7769f90d1735f8914b6841c7d938a2046ff4d
+a8ad4b976a5e4477a97d48a3cfcce16b358fd3dc1ed1df301fad6d6f0e188782c518796faf1465e52312b47bd713e2d4
+afa2bab9363187473a85f7020106b176903bc3a3e3df1f4938feed5145b79b66db8aa608cdda554166ec47e60fb34b95
+af691bf473160cfb84ea517702f3c01daa6155f31393d807c897b39523448c5af09be581ad713c76aba194f90895cd9e
+b74f3cbc198c9e4b2c7316fffd57fc749e367b7d1cf81b3f5311d266c9a3ab9598075ffb9230dceee230d5f1bbe3f796
+8c28d21c49a15299f7ff3eff7568b8450e6404a168554b8965a291c03fdbbd3dae9ea6b9760869cb1f2e8c7206183195
+a496a0df4e79827cf3bec117b92b5b248dfe129d783841935363362aee4822399974e6c03a92797b3ecde80b207fd7c0
+b39fa07fc8f4be41588ff5560ed68a33c3020bceaf172fd11e0c1288ea885c6dcfb56a151e4773e57d864dce06fdbea0
+990cd050ab056ea447c114217219d9c0c7526803f63952e22ae60a3996608bfa3c6119a56befc597592761e3a90ef448
+b6f02dff3dc330daf82d1edbd4e6964d2e9c38481e74cde8d9d85a9e602ed22c4fe6c9b6f41ec76582f0a4e4414bf300
+84440e4a7146ec2f34e8099e85c09b8d7bf505a15638aa34cd2b42a20f1f335cbc9f0e4fdaf2e53fa0ebb2dcb00519e7
+af389aed116fe58580810fc474eb15518dcd9746f04a7efd2de44c9774824db79f8ce4c4fa108e7396e1fc016132a402
+b202985e01c62d0de1f6807fe600a3b81fd11f30f5aa033b1e7baf7a62f34fa5342d42ad6a6e309560e3e9ebc662920c
+8a07641140db9701c676b2c094c24cd663a5a34d3534fd4f5f1e38ca0c46772d141679730b5d0cd71d056c257d9a125c
+99dc01e76174370a741e8e9ef5654a3a7769a010da85de41dd315b674ba8786e6a697b74a79ea782a1fcf74a48e51775
+93fc897841609670a1eb88d4e4498c54e286e25238309fc95389b16e4edfb82b8ee8447a436893c7180827a996b9a0f7
+8e2dd561acc8954a53635c0108ff964774fe98d12b28a0c6ea8b5ec5ea3523a45b81ec642c1453e3b2a1c0e0749562be
+a95b0b7f9e53720f4b0394bb6ae8222aa5be00a2050f59ccb595d50e0dd9100e397af9ea77b0335be02d1713c361357c
+8e21dcb67da3eaff5b950f989939237e3735a31e346e1bec8e6ca11edff5223e33c1c6f2f79da975de2fd86dea286e1c
+ac02cadeba36143767bdb8cd4e1caf8cb287296b53955f33ed07f771a1fea521fd64b7e153c90d5e270c12ab959cfd24
+af95bca4016b2ddbca61c9c854cf999ed59ab4b5d619dd55460f20cde5ecc86081a2586a7eb37f15c20280dd06b65809
+b7d7c81261e8c6a8983442e1e801f5072bbada1eb2e49b8e90759dcad653c52c0afdff9cbec41bf21cfe832e49ef8db8
+97fe8c6d071dc80355bf2a74c15ecb16c59bc042eff323e999f4fdc39e1209803d32622c642ad25673c84761f0d357bf
+b37da716119c00a0955a7fee59b93185a6e325bc5cb2a7fb35681fca0688d0ad2d25a0e40dfdbec1a11deadb1cc69d47
+afb8091548179fd2a17d95ca47909d97866e4fe54099736e6414682ad083fce300e0a20dfe3a017c1ee4ee7d271bc470
+9306ba1f3f2f74964dfcbcf9b87bafa44b5e013853c46cb501e10409f3c2af7269aa17c8cab261fe82e52a188ce0d18a
+82430e3c25970411f40aa72ef1cda5b2b51bbc7e243a1b4951e92cb56a2f5b200a039f5554d0d1bb44330d89d1ef8840
+aabfccb8f3dfbd4012b9d196448e83f17bd1ddb8c857dbf98e80ffc60c1af3493ac5c70e3a2f1f26352b1ead143dee87
+832cd6dc83380d068c068d815ad0f4677de0ef602890835b8d32b73223490a6f753092d651968cb3d798cbf2a227960d
+80e3e7f0c46fe5d962322f3fb2535de40dc078db80e7ef57923d46b742a8e4d6dd35ef74234f2b1637a317364d57abbf
+9306bcc29d6f8a478ec085b144161850afa29d282cec756d0d3fcce6f4860f4a4b8c8a5952cce54ea893cf84abd6c4fb
+9234c03bebfe6b47aedc7c5452058ca6a8def3c368bdbc9019ef121ad44171d6b31d9bda9c82300b5b396187324684ec
+abc2ec6016ee252f5693558b694eeeddeabf4579b7e03d37504c26ecc29263e455ce8f0158fbfc54135600b72dc54315
+b46fe7b51df64cf46888a810365f891d43db5b34ac4d3505f0692603adef04b1d08eadb3e31d039817e7b89bf0789802
+988e0dd101bba7d7e4094cde99eeeb6d4411341e684fc06ae78d163d30c4b585375a868eda7ba1e5495ee7f0a7d509e1
+94d3033ee1926aef656b31192653d3da96d5c533ac2436d68fcbaebf827475778689ecf14fc53042a523e4652fb9d713
+993b598555bd2a35e9a03f99950d09f55a48ba63f9e0e65802ecb95602d045001f82f25c3bb60221adcb8ab4e2709ba1
+a0acd921ea7db9870716acb595c65a934a5a06a07c6e54cd26efc86c97eadaae1522a4a26c8f93b7b7cbc4746ecfc21d
+8dbd8f492764bee920e0224dbe39d650be6732b56976a5e1b636b2e7371c1509431175b66c6ca879ba8f915f9df8fa36
+a01b24c1e3aa044cd2598032950755763345534f95f6f71d50565d25cbbbdf9c42e35253e35b683f6c3156f5c998ca4d
+b895522dee1ec9c5289e6fec652093519cbbdca7a2936fd1df3ef956eb404f1a24272c9ae6ce58eceeceff36d76d34d5
+b91cea120e200858457a64a60aa876f167b1b88c1dacd9988700b9f0f0d1bd1dfdd8dab56c2e7197a174b7b8bb8422e0
+8406767e4f7cee2e12431b093ce82f633ffc76b451ac8414716fc74fbadff30c52a22869607d5de465d0f4df8a740343
+a2cf431d18b2fa526291c7027d59b18cbd73a9b48d68cfd6e4b745d27774941af809edba06c8534b1864045d6fc1bc20
+ab3fe23aa8c45ab2efb2ca0c593c8644d3f47f748c2f753626289b0b9c761add755e3b52521ef37fd609429b2f8770ff
+af4530dfc5b3f37888900d9fd08554bef4e47c4c09a8c82bb48c4b9c6c9089465f98762d81ba4272b6861121b65f3c5d
+80f61d086511b9b8b2033921336a68adde99cd25fac71d8f8fd0e476dd30cdfba49363784f0d0578c1f648f93ae23f8f
+82ca682cc254952330d1be8c0e53da24aa943ffe0209b00bbf046e1e4f9425886a01d6582e2853137a9c256316e6f737
+ad1d508d2ea2806c351d5bd1098c46ae7ef83f4e49e4e87f83fa2c63f715ec56109996284a541c2005693687b4813623
+9061817ee94bd2895064f4af04777b499a1fedd9688ed64bdba848202c3cf9286b699c92400ed456db926ee23a34f90a
+a8bda55cf6f3f9edb78b43a52b7fe76e5cc2cde21e08487ea597cc266e54700ddcea1a287ec6d8f16b738b67caa27152
+b605576e55d1fa4fd9d7fac2ce549dfe23fd6ade41fa859bf809baa3f1497d078cab06a257ccfd6cd59f67f17eb22f5f
+a92d22ff5b5ec6dbb1d57db1b740521e82b4bef84dec3e130cab63d0641c3a8fec1f6f86141fb1918dc0f3fcfcbd8cb6
+a0165df8dfd7b3cb58883768471cf485b886ece529d5bb78b26acf9ef6c44314cf9f34914233c93b10b1918533dcb8c7
+88b79c9c721c1936fdbe22d68459d1033fdc986d3e52f39341ab06cc85a3f230ecf0965ee8d2dd54496981fd08a02657
+939b77fcd53a523240bee730c2d7b8dae0b32bc3dbbd31428c7b5fdb4c3d34afe7f2a377b2918497574606bc06cac750
+abbf82d0156439761b36a913b661e3d452dfa57e443ddb61613f80e110acf52765139fe3d1dd59c9e7773b262140cb90
+aba28324844cd19b2d5d07a87e6f3180a3c02c7326bca846c1e7a7c131c7ddbefeabbd6787b4e1e910449f3cd1249ed6
+ab2f71af8596c10351f7ce9c3a9bec08a5c7837cee92a7400826284752c98531a0199e2a7f9ba7ccccc8fa0a2207aa43
+a71d5a4f8af3a16ec9c3c110ca2135c68103109d4384a299cb7ed09d96231c90b04ce34ce12de02a40924d84947f7f31
+b9dd79bf3286ea08c9b779910c84fdd02a33dbff7adc2d6612cd58e81aaff3f64ba021f875ea9e1201243ce353510350
+9838fce2f70e7c47dca7239883229c1573ea97d469f120e4af659b18bca31cb68d12220fbd6e4e9e952b28eb29c1e5ee
+8dd341e67e4c567a4ea95252854cfff8a7631c228ac852b33b2ea9211b2a6c606e4b0db28afec61a1a55e6b5f0a6604f
+ae9b02d60441859e3e6f3866a9bab8895f0cd6168f8e84dda7c9b1cd7917f1c454f10aff9a8de39909e36576bc0b4828
+89fba7834469a06cb0da39c39a288245e577fd956c241707c432c2590e18e956e8ea3f67e4bee5a5562377617af53334
+b7ab26d79ee65eb9612e54f41f75e22abd83db45010e1a94ce5026a24675bdf670e806c71f0964a33d6ed277d464732b
+8a25bae10ef86d7e91a7d686965d17fe16ed635d787d4d6ca337b10ea32082938f4354620a72b5aa43ae62c7a0e751b9
+b18fd9213bf3b2d7d191266c7bc1c31f683fc7da7dc5ddb4c600e1ebf5fa80a399af9e31b4ae747581a07ccb736b4b32
+9968346d8a867eb57f628e2ba00f69e9d6aa8e713377a69413323b1b9b26218f527c0e719dcc1027daf10c3392f59733
+831ee266686776eae4e3de1f2bc37761a5e1b918d4bf0bbeeb20b490902ae97722bcb1c98c485407491f248eecb841fd
+b0e949d7c50b852055f38f3542a974bbfe7a33409d67c557d70c1204f87265bd7478e1751251792435fa22097d1762e4
+8b0bee83715e20f2ef832347c926249b5b168e4ad87b2e5a9149ea4e07513e4790f60b1769ddd1816d7126a0f6fdbac3
+84edc35061dbe8f3de90c2f9ace94be5ab4170b66c42583a0643ff776256217bbc6fa31612e68bfb9ab678f8e8e49457
+afb4ca7a4781dd31a7d81ba8a739eb65c43f3374e76b4ffeb2c7048b055f837e6853b14ed2d3224a40dea35799f0e4a4
+9945fd5ecdda5ac952785310e87917126917fd4f504fc5565c236db9b96f9666934766f46a1989c1aa176e543c6e33af
+a6d4466b53c48d7facb9cc33ced1bec98897e545b10586857e896d35c850f2cdda65e19bb934a8c74f6def805b1df4f2
+81e3fe4330948c279d99a8a1a4e4e141a039b3ccb7287aaba6f9041c3a8a41db1a4763fe04a36bdadd3d3295becb9d41
+b6be2ef16b60a78b17991d27463e401eca731129843021e302830c2fd665726547240ec3a3240586b01a05ca8206dba1
+b9d7fe5671b220a3da83bfccdc16c0b6f5e9e5c87810db14f070dfee582fa190a360c62acff13cd877c818d705a8a872
+86867f22bf6b859e7f0ae7724a1174a65c4902cdcf74bdb22415875d72b67f49c62ea8bf9ed0d6883ab76512ebb951f1
+ab728a8167b9e82d608d4939a0712f82843f624d08d4013dfd3de41bc526e9d495cbfd40c443f67ac59dc4b5f30ff217
+a5c4d10a04452c1ad12c18ce8ed7eadea1f3cdb34fa5ce0cbd804f5dd92eae2551b771523e711e8037770cb66d1951e4
+8808f69b975f363bc08f8578729a6e68445138dada78d5818d33fb83a7af6cc6e7030f7b76286829861a4534e0b30248
+a280773d32e1ce3544d3ba5025896d21e358592504737de72ae76d164009fdad05c8a1e5e1f8658ca6374b347d47c29b
+ace91a3971be87b1ca8e737802918d86375088e74380c444751c65978afba2b017cbd8fdcd3f9a0c19c0782b0034a589
+b5445d816d65ea36c9bc6a3d5ec44ce6b76dcc18343d7084567dcf2603d2af93fa8469a1c493e19f1853c96f89621fce
+a238867fce5b09e8695240f936a3f3cb12a715511b7516de995543b2e15aed8860a12754ac8d1c5ca2364e4471a9c5ac
+9467528341f5b93b89c7f37c5dac8bafd0af620230a9f7de3e809f01cf73b8ddf70c38c5023a631a1978ac05ca35c318
+8e5f1c3c411f0939ce4b6a5ced42172fc5c3774f596a114e7c5c8ba433c4efd94ca84affc0bfa89a1c5ace5090276a43
+a6351818f7553d446cbe8d3a318841b0607d1f1890ebf9c6220a092bad3ece9ef8acad4d17935e437377af8f9309606e
+86630d0fb2bc104d8cf840b0e545c0c149c1a8e4dd6d460dd15a52a5935c8ea5c934ef099653d783894a6d1f68414a84
+b357b5d9cc645b645fbce2020db583cdb68772751d6d11d635f1e3ecf995a55bc374be7750b6e8bd4968a55600ca9806
+a9b659b8cacb73a81093eeec42dd7f4fc5d955f9fc543037f31bbcf456af6476f303aaf0ef960a2df88365c2704bb61a
+8b6ff5201c15cffe64bdeb818422fa10dc503ef2a6a4d686364afd0f35b6473e4463719173550d234639f6077e19542d
+98efe45bca5ac679cadc25ad0bdb1f8deffba13d2d7eb14c6149d5addfac06b82fbba6d24b323d615eeee1465b3cc30d
+8c2329c976d78f1d5e30ac34a3fab1f96436947d85f0dd190301a1868e5dcbe4ce60f48fdeffc3e6a05ee34a461d7dd9
+aec012ad25d99ce014101d7da512fe032673399526435f6e1faca4b63759e8f6694a46ad01672da9eaaa4634f61ce89b
+b8d52e530c942c3c7a67bbd0366f4cfdc6a1a075471878516b7a2258aa073eba50a113cf433879a0e15462e82087d17b
+b40c5ce16f94837c86e81d98e2130a9e1dd229da5aea52e79cb42217d3b5908a53d76782cbe3934fa8769db58b00dee8
+877300304eb69720f7cfb4f907b4a7e238920fda129a38516dffcbdaae2e46633d31080590d6df05756781224d532fe8
+973632dc791a5214516c3e59b2b48169470678b7dab66d513e35a0fd1df86b992e27ffe6050a5233af20b5d4998d283c
+a8ae0e723a8ea6e95d721337465a388b60b92b1d9b1deb0b9f59ea30842de356184fd55d9b8331d8a29ef473c1ac2315
+92ed6cca30f76135c4b7e7893c3460501e92592f7d2d6409c1e1d80074120243a5b9ec14d801991204f5ec4f94ff1daa
+a9f575b8518dacdbc5cae766389ab2ec01c876038414b7796f640f633367a5281cb49b48b5e80f6416a33b401c21309a
+b9793588283cfdd47cc4547cecfd987f9f8f92c2b408725f39c1d879199d695e87675fa7e5a190ab3bbc97683a0b9587
+8329a844dd67dfd48546791c4330af65501baf9524ecf8ed4fec9ea87067d0afbd33099052c1c2df819ca1afcf25dfc6
+b908eba1b40edc300b63ff6e20e87b17e6dfe975c37ca63c92e8866968070a2c07204264646bbc9318145fcb90c23555
+8123871ed78f46e9eff4fc7af9f490594fd7c20fb814e505481ac5c7bc7588c1706a79b14b85d29bd7b97d7c82b2ae79
+833ed8928f154fe0a88ae98e5d8c74f816e3ad679c1c4ac1322604093e85ed4b9b9c4361ac188f0da5443c72ee4bf3d4
+b9fcbb8a422bd8d996e713d176b7e63edcc6d73b3d1fe3f2c4b59da637a168accb5fb4d227b709f979742cc0af8c0ea8
+ad3759a6a6bac3047935443347e3c63819905f6c01f58f0ba76aab422d723cee10c769663be9554473e668bffde1d500
+a60c1909703211a93d7b5e8b8ec1cf4ca06ada653c27696a7dc9a2ff75cb712918888c6b61b8f792ce9b413aac09f48d
+91f05985ff17f9ae20498185f6558f9f38b67966876dcc6981af4d179cd055661adc63155f4afa6167ad61b7038ac49f
+95c5add9bab6b9792517772f9f8b21bf7cc325dfd13a43177b0bd982d0f620185d8596c2cba46a5e10aae597129870ce
+ac0b4b6e2b3e417166ad9b17de0b3ba775df6ad3a78ad13a1892c0992735ae54c06b1e6123b0c0bc90544441630c6a1b
+b0135c25f74ae776c241faa6c91a3f7ed6138d19a2100928b7ede64b79e177d92c5cf921dcce3c614e32de34975fa6ca
+b2215b560d5a36f045de7257098e9d75a40122919d4726990b4395eb2bf1ec789cd0c64c46b775f6a8be28f23958e17a
+870dc7f7a513728f2b428a3c08b15a6af88a288824e790f41b1190fbe02b59dce2914a1339f7203cdb7f2f9c98d8d721
+8e3895f03952cdab36f602418cd746bc0b6a07629eab0a20bbd8de6c993030c5287fc146fc45fe97a06c992e0a9ddf02
+a4cea15ebc0dfad9feb3d18168fd33768e8ac69e263263ceffcdfa35e8638711c2971697b7d5b2aaa0fd8c5440f3e164
+8cfaf5369781a59f4117283fd3f290b81816abd3124a9486ab1faf7018d36a73c1630efc4ad648ce462e541827d51975
+82b420eb25736126ef18d91e91ca2ecaea8983b8091df88343e8e54ca5ea7a3da6918c97695cc0cd5c2df95afb1e3cb7
+b3c13923a3d46d990aaa6a1eff3ad32f162ccc5186e16a549dc29ad4d63de6287cd05579452785cab32e2485636d568a
+ad8a43ad6195e08a36f755dd536842ec88a7d920bc302451c860444a3fdaf294e5b5dc5a122423474d322af5de8cd8a1
+ae40d1a90a77965366b5b5ce87d6fe86eb255cc3d127526930d128ef7763455adb82475ebfb7be31f9c512394f2a22fb
+9763bb9459fd4c0de2534767bd99f98b859030b6af5739a7081d889d6875f5c23f0154c30d00b7240baf6450b4459987
+94aace9e9318d79d3c7ab533baca31724bfec839b01187e326b1fdef846968b1b29882f2520a9e237dc41ada01bc3761
+b6084f9e0051be76244ead401e8d2758717e93c4cdac58443261b3603cfee0eaec7d758b2e4357650d2c1f5391edf798
+8c656a798fea470163e70869a13edd30d138bc148460d122a2275df8cb43f2b45a14e0d8a8a49eeb7c1afd02484b6ffe
+8ec317e63df2881f49401eb2f6a82e261b07474006fc293bbb54e0fb7437697b16ec1d6ea101fcd56543bf4d69374cf4
+b27d9b3b8c3cc59d08159c765d24fd4660bd0a54b2b7fa9fa00b47e6770e6e8d3ca353d305fd772c8171e20765c8a66c
+863ca045abc38ceee09c4a21a3dd18f1c0f70c0289437957aaa39ff764760bc422b748bef8ef133ee28d88c46e6be1c3
+b0de194caa68f5288dc365faf9e9ca3c69b0a8376cdb532cd6f1cc3478671a1e755d0e8afbde4e3a88440fd9cff4e8f6
+8a259f48cf5a45773522f3c5f283a6c01a0febdae09f873e009e4635c57fe5060b01243b2e5e1c9d2ff7490f2dd3b334
+8c4398e1e579778c88976ba12feaeac0c96fc97b4e26a133ae74fca1b9c315c1112ce3977d20fbe9ae5866ca6544fdcf
+b54b25aeebf1917bb4981b43f39491918773bacce37e994b74f877d4a636f1b3f4a2f164b858f95259f285ca0c294f24
+a9db33b15331e852da3693f6328bde30b8cdd79c9b9b63107cf78dedcf14da68446c462720b9ffa5a1bfdaa68f5d931e
+9966b6bea54405df1dc4edfde9f8c3ed7c0733d5a73bcd8b349035744d5eabbad0d19801a678d48cec84c0335346af33
+a3d0c32b5e3036c4a4b222c13f7db23924bc2b2f724bd908a38db3b8f9c95cf5034c4cda0c5083c0967d34061a216b57
+92ca6b883b2b20015fbb56cac4c4b5ef22e555a9b75f4f020822fba9167eebff8f9fe5c729c574cfa5ac27bae1a83fdd
+b72b58d6ddf54c2d37bdc1599ac966c54cb4926c8d2f70d1bd4cdc383c6eec5e4b87efc59466682f8db964d80a4b740a
+89ba63ee57a1e6f13d7c66150a8d6721329b385eed92be3ea784eed89c76a1ea88595725612b109a9e4aae41d3f6c972
+8727bb53bb62fb714e4e5de461c6cb298730641e38a0b49b3b3d4a29fa24167c7c6f4ff47f4f3b91e464a581a4181853
+816699bc7c3ed65747d34786b7fca4e35e79907f459f2df0918669adee54a70c03580c4e7d2e410ceb45c71fcadd44e5
+979688c14ce623dd17344e67373e5852bc1d3ea12d37f7b28095e5d578d8c9c646e4b97a3a69a97764ed0a88f62c99c7
+b4539a9eb6578ed3b8dd54cbf57419e99b69c0ae1ca3ae3b4a21f204813b2a78438d6c72f86c13dfa06a0b9244b98688
+a5d957181c30701fe6eabe3e65a53a33dc43df364c45f0c4d882ab88a069024bf04b71015f1c2fbf03f368e63bd82fe9
+b9ce9a54d9b17d4da41ba3135d077c546cf39dc83230506a4ee88cfe39e76f7e35664ff1b571e231054cf1b764b9267f
+ae6bf2eec8046137016ba94442a7a0aaed0924ec1558885135fd339d2996aeff31ac29f1de07e84f7b7391fc5355f429
+85c7c247766a4ca44278be81752f4170dcc069f76992b236b40e71e31e08f30de6a5ecaddc44debe4f94151cdd8d735f
+a19d41fcac394b750248e575c300b9a96dfc5b3dca07ad6e1d68dd3f8ab94d10aaf8edf500e3fc7774e7ee52935f73ea
+b3c959a22fddce5a2e199bc8724e825a6d9776455c033299b5cdc9a9d184be169d807829d5df5e747476d172b5701cca
+916aa7bc58f34bb8f32808858cecd3e90ea26c3ec1f80a40e863ba18fe9af6e67c0b2664a2274eca6d36ed72e59a9341
+864d945b7be551926f747406d72057c7a141110f5d269fb6657cf347cfad7178670dd294f6a98c19dc0943a68d7ed45f
+b3480f8a42ba0e8eb020c2e1c1284a8a9102fa68b43f6eaf28e031621b9f68bc399899e35a1a283fb52530c8574484a3
+a8cd1cb93974d1a6072ed51f356449ac19b04539517cde34bb7b2ba55949d213ee07d387ce7b5534175bd8a044556ff3
+8e81fcc5fa5579f2479011caaa393f47a4e12828e2e82072736d85ba1bf70ffef9fe3b2c22fd11ce8eaeccdfa2579758
+897f935b4542b9ccf8c0660c8fb1a570a8ba108fe8440e17e6c50e01affc2a8597b7f7cde5244c7026013b52c7331b5d
+b9a20f612c74821da05f48d8bcfa7a4a550979e35b49d52031be8bc9cf717fff21db0142b633465c5edafc42b7c73c84
+b88caeb2157d636fe26d3b221143443940427e8722596746bc337679e10ae6e5a9b33c456ac271f8b01db2f5d1b00a62
+b23bbd978725aae647ca2778e801235f605dde17897d4d56914b0d2241eb31f930028904a6555581ad5b2b74ec3c9587
+97a331ffcd02eda1d6e0e15deb110ad6106d3159ea641cfbf424d2e3065bf65c9b14f72a27ff3f576dc51eb068bfb22f
+a9317840cd8f437ea97d80a3f445a99eef463a5e2beba3c986da8fa67def4ae9a0e8d1a675a35e5616ee90986366bb70
+8c26dd7451b12c65351d5ede6a00ac7b9316f9e28be8c692d20709c3b4a5dbc76fb914667a2f1e9a654f8d2850b7dc3a
+8bf4aa18a988f82dfc54668bd4ad5161f276e31567c949b7857cec331c74c6b68849afe852892816c802736cf7c547c4
+836fd166bb9689520cefd6f23905e4c1260f97167b17534930923107fe934d4afb1216e4b89679a564433dc952a77b0c
+94d6a5a4a11f41887eb814acf9b5a031d013d614621642384504eb78e65b6a07c50326632af47b408d8ccf43faf8399a
+a213812713128750bbc5311dc317992bfb5124fa067072891f452880183d64d6fdfac8825552cb809178a3f3a641c9b5
+976d1290308868c5e41dd3766447b29ab8c3b72047a0b7de85d3ee5b1e13d522147a02572cc0d1ed8976d411faff5b9a
+82a4494a95738ebe56578e1e4c0e486eea66d5cc44141f478bfc5a6b3ebbae6f32063725284df81b438603aa564a2b6e
+8a6f4dee79baf71a4a40843437c16b2f304785f3e56b32d9ab2474666fce2c7749c776bd898a65f4a4d542a497cb6d6d
+a04a3484be07c2d60f1a90f9dd8d4170270a808cfdb863864377c2515dd71c152920b65fcd5f47004d27d14d7ee7eaf2
+a984f6633ce3d42c75083ef7732e5d0ea15d91e73cf893be3ebac5e56defb8db97088c5cb3acb661e26bbb354ad91ce8
+a5ab5b4b0dab86706d68c9ad921d4917215c4fbcadc8adacef7309c0c853bc3c2ea34b3868d8f03cda6f504793832594
+88f03e55eb028353b70352dbe91f298ade322951ca115972f1207744254fdd01ccf899aa40ca747da8812dda5bd5f985
+a4bab627f7de273f8085169cf05413bc368c5d9e5f58bf10995a8bbd95e511b1ce15d008405728ae8e8a83621efb56f1
+8ed518d0f225b90fe7f01b0fe4c451589390325044f0d18a8c47bf13e24eae8627feb0c9e9514397536f73f33f67a044
+97c73837e77d965f401b4e4f089ef4de7aed1126bef6be4e9002b2b68014b98997213e492f7aabfd2e47cd0917a11d6a
+a99e8a55ed0385bd279e11a80255b375f2d59bf8b0879bf2337ab5e3be450a2ec05d1bd8867a633e359a02cece4dc1e4
+82a74b5efaf3c217ee2bb56c9b8e76b3eedfc553c73177e59d982f503a5b0572b5cc0d1292820823307eec956c42b28d
+9800ad3e10e8a19d65d5963673c183bd536b65e14ec18dca45e881ff3bc74eac32bef2ef845515ac4fd6caf558a6926b
+a2933c78a67cb40489ffb8096c021ca017b99feda1f9c5d702227d7f0a2ff66a539d68a47ad90ffdfb5c31c774946f87
+947b29715258ca20da5b17a8e3d99665b7e599aa5bcdc5d2d7830a2e3cd78364d51a3d7c0d8bce48a1992b27d1ac4980
+86f2e2d3e160d3ff979ca70c456785b4b2437eb64e58adcb78c4aebc96b470f1b8b999a3ce8ce20e3d3f030d163cd138
+958f4435d35932a91eaad0dc476bfc2761a85f336ad2ca6fe0c6830fe54e8f417434616df9e6f07a9454a4403b00b64d
+8b1755af961e0f9f59651d56b538ea59af489e859a1c93726cee62649da0e304093d62db9a2c5854c8da1be61bde990b
+a5e11042f73f979c8649592f6cd01dafb319344e379a65aa9200d3b636abc569edf822c2bc12b3db5c30b9ee74f2c981
+92ac5584de1adcd38a2ebe361225f224e9b498344521be519faff77f87c1f22fe8e112f9df7cf960b16e358efca0db08
+81db84f05f75a218045d7d5fd4620648bd4a95cf468cbd69787011d615778ba7300b729163e7c8abd1a5b0ea66fffbf7
+ac2f522e9f030a7c576fbe19041f5db3913af58da75b87e8ad64b93bb34850a79b852804dc68ad5e7de66d90878544cb
+ade9763d1c7e9f68b5f817cdfeebf31bb3ec1391dad04576c55fbe4bb13cf0d45abced3d51b5512c73b2d0f403906340
+a0b431bdd9641595fe1eb8d96ba4fe86a447a31ccf36cd2f7d94c5c86a7d96bbc95b204fcfe7c69c1385997b1daea3b1
+b3b093bd8fbd84414609ec9a108507f97d7f77833b93b15439423d2a2928e40b192247c8471cdbc12891d83c765cc6e2
+8531a5ce8e0c44e887ebf4beac65352c8a9673c51b6a1edc439e08bda1354d359e1ab2e27b82636c6dc0daa3aade931a
+b22c2f3a77ae4813a75004dc2c9593cb2a51c430c559bc7d07d83e95592883b99fbd0f9ad24d2d80d86c871cfaad2721
+8b6dc7d5b8cb6bf36352fb19e42aa37647505436e1442eb1f228b0804916d569643102b2282ef66bc9a4442520521dee
+b29a811ab81dba820242a990dc774cd937cd299495cf721cd11971b9f1dd9441ac687dfff0e91656b9764963a56e4625
+805b280e31664008fdd874bc38e870db271027da70fc2246fa82c499742a9a8de1152275e0be61f307dc8f7a918e270c
+929f690538a500d238208930b55caa9c489bfd3476f6be2d385c36df3159dc3d8bdeb24a1ffd7b028ff4d881551e2888
+a92bbf103ad851a41e5230e1e37ec7802e08f4610c0db9706806afc4a247679b9525f9a534c70d970a1acb47fec9bcdb
+b9f2698a39d6d7aa8aca181fc5d95dec796ed6eec002557d4b63369bd90aa4438c27ab90da4f3ce81168cb42f7400070
+b08703bc97292c56833d8e61105f1431c334f98a7946850c6175f37f703ff790d9a1522c0003f08dd111eeb083235073
+9355141cfadf46f37afb73414c8803f9094b06952c9fccb24a1f8c18a13fa7b1197321b19cb832de3f83ebdf8deee53f
+b7c23f7cd8e212108906b7809df90db58d2c2f3a8e1f775274181bd81c74fd7c2f8d68bc7d4aef639ff4e19f86243f98
+92728e009fc3faa08e81c36c268b3ac18627da7618c96c97598b13242286645789c15c99518a07e658d92eb8d2b89c79
+8fbe36d4f2f08cd6245e8999728884c636a264451e4ed894d2116375f3d9eafcaa72ee59cf7923ed8ddacb53cc478761
+a6b2bffd6bf8f54231fabe46ab2c1d014ddaa797d08e5914f13988140bf804019fff3ad07ac2cb31283fc3e74e28d0fb
+886387540b5a7acc8b2bd107124bd17d6515697e09c85c4e932a6421965c872f014d11d1ddf321651e4b3564eed4f252
+8b81f3ebc962e9ecd13a11e919d86ce14dd89d373cffa158b807fc91555a4ec1d7164504fb67edd9599b10fac5e32aa5
+91e3213ded5f82e34389408e95d4f7fcd0f50ecbdef9726a289238e4159c6d3cd2f401479a1f785865e91ca213d2f8b3
+99154b88ca5462f62031300177e571708821348e1027cad4867eebe42a6fe92a58ee1dc21da9031002f1b051351b3785
+b5c2b7cfd87f2f65df07b39f8a26dccb16946fef6b89268b9300c8529d730a1469ba565a480d7c5ae9df8600ac50e90d
+87df32def37370bf8c4c3a22a670bf5605c78f240eccf8dba13bf19c8a3a9d0560f8899259c4e51c6b0fa64d7d1e4c76
+980a20e5cd352786bffeca1b8a31930d8898eff9f4a6b2570829248410bbe1c78105b6a61cce7e3ed1642e5e2af127e9
+b18b8dbb9eda5cf333ea29fad7734235ac9e7234b49fd04f178136b15d97595d5b415a92455a319ab594b81200cb17d5
+b713a71be9bd22ef6a2747d0bc8f4d008cdf6182e287c1e0274689e915a68150d6083268188c1f4a7fc76d21a219ec85
+b86ff129a981359972bb793a81fd422e0b37f89e76fea70da012fad160b9eb7b029ced81c7e34679f6897a45b4e8da4e
+a74a4cb9707156e21caa20b95a2a4b4eae8f773cf679e2073fca2cd3b1e502ef06de8a3c010833d525a7f8bb6bd24601
+b51f06da38a76c2728cd01f6073f402fc49cf4bc5c60113a2700b5bb0ca500e465e541c467013a2804bd7641604bd2d4
+9855dd73307d8671b6f9ebcf676de3ab7e37e7ac1544447c7ff34a213da46123b57ce23bb0f381da8fdefbcbe6c35645
+8fb382c63f4c935462d013a0d3e2321d72fb4781c10afe6e31ac51766832218a05addc6dbb1f644aa61b5da9bccfd5ae
+855dcff23e0ebbaa3562fd27c43957cfb35d492837aa71f27cfd1bf65a59a12d2beded9d09f3ddb4f801aca8cc34d2af
+b7e7b317f10cdd13bc879c2fb0bfcd137af23e0cb70917e48d53b2bcf8c157ed7e5f58cdb966383ece9d3a4c92012746
+80d2f84c39422afcb449aa68b34fa9d72e9de79a473c3ea5897f6f3576d2bb6fa2d49f0b44aebe5e68b11e85e066e028
+a35b083749f8a5551f0dcf529e845aee189cdcc6ba779f4e88765adc49cc4779cdc2290598908ccedd8dccfdce29d53f
+a30c412f4bbc2de80fe5c577b4f94442255cb3061a40649b0ee5357977503c6fe54821ecc8cc92d5056b6977c4695e70
+a2ed0d90ab612fa3526f7450a43d45a2d9e886f2e5888ccb8405adeb8ca3e41c6a94d18a54b3cb1eab5b8f3851841ebf
+8d4dd3f8f8a3d69bb217d338e757c814eb69e6a776f55cf51fa7c1b2f1ce5f8e9bce8353dd335e793d68eef676cf7c36
+880d1ca33d5d3bb47b788a7ec64b9130752610816facec99af53b6e58a7e414616e9c815b1bad870d426380085f6b5cd
+a287578293da4354f2c3c46d637aa77b91526f9618799dec4bc602305ffd8336d373786eb67eef01dbaab88f07f292c6
+a86d3fad257a64c84954a7530822346da0215ebf4ad9c583f35cdbe16a02fd70d58ab34c93681fbf55d6075db6425cbc
+a7bd884d343a6bde5f6c2512d81ba701fae7afa6389389e4776eacc0698a54c3ab1a0e1652c1a7a23d3a1d2a63cde8c6
+8e0653c8b7279d5c958ab1b53dd77b73fd30d9781630a870d0a75681d38cde4fb7c2183b9c5758596ac556578b43fef3
+b76a00c6f5093e7b28703df85bf968dffb70c455c91e75cc81189598df052244f7549d18e45dc70d98d3d86e0094ab2a
+b270f2ad3dbc8b43ee2603c4e641be76820f07a4757cfa96be2be9c310b7e39b574572103253594a51fa9243298cbd94
+977b8b86841ab8be7d1d50da7369e2bf71f24360aab8448d7748d59e010ce81bfe79530ee6f6644b987fc0d83df3ed15
+8e18bc59841b7d56f8d9eff8818eee06288cd6ca86200eee7b5e6b230070debaf254a2198b4cd7dfbda8a1d55a916c8f
+8e7a328ada969ed6289972b7f43eb5958d23688603ee6d118b6ccd8978378dce2d733ff64c30519b19007a78340fafa9
+98a0fea70a219292584c69546d6d242cebb2f1d84f69c5aa275a257a87de652e721078b983ed67410e3a5eb0cfbb2bdb
+a09fbecfd05772a9989008281a9585accba3850831485802f042413da533b1c7ee45a8cc679804340bd9142b2f9e0069
+99890a6b273a2787fcfdd8e8500134efd60df99410e8432664a3e5325e55e78942f4bb11024c90e4c3618a70729a277b
+a5f3eb1617a77f2d5c76bbd1bc3546ad1628be90fafa9a8b62c605d04e599ab2eb74b25afe0e68fd020daf4868dadcfb
+8b53517d93f42b833f7669c131dc67f14c3b0639c46d3b02bfdb24cc9e642133e0c665236a7ba851c100ca733d673341
+849fd288217bdb154213e79abe1a78672903e15429e37f6846019986e1cc8dd2b3ed28e4cb52dee1762a4dddb9ca95de
+954d839198c3dd2ea1ffddf98050e2c52ee81b89f38d967bd30c6863672e43bfc32e1030bb12f5aa424983bfa31dbf5b
+b52fe86414a98d0896d7a427d57739da35cac4ee24be565956d15a5c1cf5b4b95e5425dd2607fb9f6d6024549b59a4ec
+9586070415a6bf1e11304d2819330eda88e81a88b9347aa866692c163e1af772be9fb747d9281d7aabaf5c9934596934
+a5b78e5bea362df26a89df682df61287763ca1b87ab9618609c99e52e6ba047fba7ec828c0552ee26279aa8a48751334
+aabf36b9dd465ae03551dc82bed9cbf1d22a2236ded28964334f7ad474f317f4fb8515b853354bc06181fc9af82714a4
+910f0b2efc608cae8cdd39df7a5ef9e570592b31df2331baa7721708057188ae96e1b43e2f2f2c8cb360b961d687b60f
+a5c5b131205c21ca68d6103f8499279621da337a743e4a08547c3b4507d52d2d6e5014fa5d920b351a6f53a195687766
+a6898dac2d8748b8bae155a7d8c169e7eded73cace1e382c4dae8633f19463151399c5cf877f8ba344a698a98228864e
+92919d8be671b4f490efb49bae145f419c84a1e81d3ef78761fa326f67d749ff3530f5de04f984a018065f42e852e1e3
+81083de978e025f0b5995550fa17915d02489344cabf8a79248352d78dd6e893d28a5c5204a65a8873756a34ee3c0120
+a6de92ecef84d188cefe29a03b564b1e7bef2a6afd785b58897f7f97a958573a35aa0767bef12a49b352de30b4f0dc18
+985cb3475c7a9f582c11784cf61a1988240d74e49084a4c0f55f3f6068c4da0b08b136f8fa62e9001e0a265bf65fa3d4
+97e6d360b504991d51119a78c5b647f25d5fcc1298631209d82c2ca40ead0380835fe3cbf8b82148b0b01b8157e884e8
+b313df44b2c47126b58064599a0dd6ea49e5ace9ffa663de03ad30c1e95301cc68eed67d37ae6238469e45124c59bd39
+8a58f70545db2242cbdbb12492cc11ec4d2b2ab0ed8450d21ceb573558d7bda91ab03c98736e13d041bcab84fd8248b9
+9077880ac352a5ab0e5e15ac89b14d173cda0b41b6f7fa66bb357195f10cfcf491fad6bdb49d71cc20d99cc6c8e28d04
+a09b2930fb3b1a60af8c5214e8c3f6deecb3fd3d0a5662f3885948f48d1836b5ad3dc74affc54dbeb5b522b90a17dc4d
+9163bd2e5f58fb1d81007422b91147685542fb1c7e2c8421af284c7cbfdcd2d2b399a37123b58a2a349f27b31bfa47ab
+8a3d859f141457f9d63818634f81deb5c858ac48bfbf2e1da21f4f0dcd66b3e1d2d8fe99c4cad38206b1e15dad94934d
+86d3fec476b59782d0477ff333fa79922fb9fe3d6d6b6c5be9da9e88b006b46b2a0f8f86ba4159c5085e66e32fba67a3
+8041cd57335bcdddd37651de2c3e92edc600ac23041d0e383baf55651b1b0960b6a601491608307160f0d7d48ce395f9
+805c284059f8c03b2bf006b1af95ef726874c5548e93ea965b402931f42b189f9f674b6b52ff09df35320085172973c5
+8acf781a0b40cc56b1013cc1fc3bc43036545ce35591f3b905543c09cb1ac1a70a074202b6d5ce3680be913200c58879
+ae670c448996156c80d063f1dfb03d7770201a35c71cf8e70b38d52dcb5e2bf73d5286d63ba2f561525d62cd67d43125
+b0fcd0150fc0005ca438d6b0fdd6a70b121d35ecd74e62bc119bb0187cdf6bf674ce9fe01eeac5d46a68ff4d4210ad09
+b752c6850985ab13a057028887bc84674697c012e9da0265dd5ce1e48f0aeddce5e07e3e7cb68ae17a648cd1207eef19
+a6a5c71915a980fd0225847b45e2e9f3731c6b2a627cefb1e2c6a0cd7f1d0555dd32b6b601a7ae9cfc4b9d06a56a578a
+b7d96f59a988a7a810c25018f7f85cd6e81b335a84504ec76c97d7257f9cbfe88215ec89553f0dbf39507d990b3a7f84
+a7cea7b3ba43cf6ecc488c34511b17fc7b97150b2d265785c09c676ad3123b322db32e043c5961384ed6d90d20c63061
+809dc467b304e9bda732cd92b15c0f9b363cc707432788971508b8d60844911ed4edfca96d8cc20b9874f1e38a2d1685
+a5b6a089e022fe460d62c4c5228e1381902c9a796ad92c03211c855541a7fe27c5a39d9123b001b0b892ffdf0a1fa065
+95d67a21154a49bcdc79ed5f2773b651c81fba1ad82bd373239f09a67a50371a147310623fcbc1211ac57aa154e8b300
+a4a4f0ca8073407575dfd5d04ebf76f8bb467598824f2ce7fa74756803d9645d63c9eb3ed39aa202dabafa4ff0a0bf34
+8a77374f6e449d94a443f2d4593a0c3e4925527e0653e873dc20756396a9a4e5696fe44fc1b49e456711259deeb3f037
+82585a825011d6eefa85cd530685b103862aa0777510d22942d8f77a0a7f489f5d10e5b36ee38f66cc96dc57d13f5893
+98e24625c31d5d97c789eacb91c3d51cc6edb38cedcc474deee459f55de557c42e4d0754ca4ce472d0123638eeafb55b
+ad4351c76d96c35ee37362f2384ffb809bf6a47213863330aeac1ff9be2c6cc7275f0f974e46bfb716a89ce1bdbd0710
+afc8f5af4f9c38ae672d20e7bc3796aba23a41eb033619b4c0a06e07884e1e0c7a7326f069068dd22e69fa5f672efece
+983d5af05af31f9082f381378fca3526f88309bbe51d0cea5860813bb0fcf6b32a3be110336bd728952dcd6ff8a26361
+ad3b55b67b64b188447a1fb10d027bf7f86ce0a0fac966d709e8b6ccdbb7333964045f0c4719c45c36b7f3c9ff73944b
+b410fde230d8dd24b9f1bdbce8338b05110b130591913f23a34c5fd092cdd3f747c383f6967cdb529ade1a264a3ece39
+b3e4f0a046f93c332be07058db00c5182a498987759315bcc3a58d9334e09a59333031c3144b59d03596925703491cd6
+b77e58619c8c471531d9b2e5dce8f82bb8794223bc9459599a911440e64e0b5be1d37e289807733ddbc2858bded1c34c
+b450945bc3e290df96a196083a45aa929ee080bf45112e678eac0a939db2ba67334ef782c855b9b354caccd94b3babb4
+9794d81e968770a6e12add60b32ccbbe80cb2680b157d125461cc3db998691e836d98cb3b3cfff4f156b2800d426b955
+98d1284b4c035e93b4ea0431884d91d5a7855ac6c5b1ea2a994e653cf77f0ac1a771dc75899bd1485066da17e40ee341
+b1da89b14efc14d15b2bc967ffab85c41dc447b6a7922b619b5d5b06dcda725bc4530959b70355ee20eee7c1802601b9
+b8e50ae98515dbd9ccaf27192e58a5c34def86b1d0d181e63e64439107c30254267969f6069e0b863c254440c3480de3
+915f0c7dc95f630bf1114b02e7d9936b0911a69c932950ecb7f800cb1aa1a4e1f1b6bef6ff4a23301cfd904c39025863
+85392fe0edd316031c69d90b106b6685bed56a0d8d814db2cd5d77d07b18fadb632694a214a176ef60aa0f82ea14b00e
+ae4cdff23859b7570179586549165c728de4ca254a5da29668cfda259d43a387b3caea8537888d43f713d458da6bd4e8
+aa0b6a3e0555d64a5cd1201fdff7ba7ff3019e9ada1d86c90c626a710df3d97d2ed62d2b63e5632963e09cfbedf83732
+add726d97dcff922dfd748eb897e540a2b4b8bdbb4eac1feb74717bf086b1760a957f83586a57b5345bf4c73d791ab9e
+9721889b6fd55cf9a914e5aeefdfbfb94d379c6312001ba50ec4bb1dcd03f95fdb45041330da8871cf3dc3c6a6b5e330
+8eb9417573ec6af24a610da5260639efcdfc802a95aba8efa829dd70ff179dec061da9facac95b6af02cba6a8646f7bb
+a477ad7d2885e1f081556a98b3904cd75a4ac7a8c27fb0ccf15d117feca59f891a677fb4ff4fbf38203055a9436ebd1d
+95b3b2ff92e8a0bace130d165984966637a74280d0e056cebdefa6f825b1d55c9bc6e13cc8f263e657dba3dc7fa68627
+b096fc33c038b425a7a922a4274d01eb366a488fc969497a575587ada74b9452a607992aa2d8b9de66705fe20b4abb39
+a813ef1053ea6ae8a37f4da722f16b6ad0213b0ec7829998362292aef68c28357ee27a406b567a629592447db8ea6085
+84248425c3201ed389fa1b64b9e1d151b5a6f5fcb8f5e28ebd665db57156ecf9b2fa77bca857200df9f54383b7c5eae5
+86d0a3c7fa1e64111115469ed0373dc3dbd448e1098250e9e8c5c7e775fd1f267d49b4123c347af07a28e686d5f357fa
+8340b2ef4fc2afab3a3d51b6c0361cef4aec3d5e1d0f779f9fcb258711cb79ba4083508644e2bd182fb25b21523557c1
+b840749c259b5af5874750853b4de6f4d7a274e18fb77f774f5f454c82efc5979a431e28bc8e43bb831715c7fda96db4
+b168d333cf20b053c1b2a915c3485200a7590c3c3661507990390800fb95d3772ec6815d53aec5e2964eaec19833e787
+8f1bb538dd5005384f38f88cd2588228aeb0c6313aede14ccc12affa9715cdb938ed4573c391572f0a7ba6e33a1ace89
+ae4a8ec2eb938eec00e6608c087471128b14a773d75a99634671f6fed95f7b24b14f04b3271d1c32faff7f0f2d98547c
+a4ad66552924a6831b657f8b318f303225b2cf29b09790a48285b028bb1420c56dfa2ca0df2e823f694e8e3b27952a01
+8af4eed962eeff534234d7c34f1033c68e8cf798c99880a67eabf38b533570a3776399b883f8658265cd14277b060790
+ab2c6406132413cba89a951d919bbe123fe4f220364ec2282d8ee0c140ad8d48ded0df7ab56f8f18ec7526ea2f1cbbd4
+9154df8800e26020155b98f630e640be97a3ac41b182fcdbcf31a3e4f233810e34e224c97df8ef0f39ccca29a9921fb5
+8f306dfc5b8376a88a104cdf67eab54f93e478ca09036eb780050ba2e8112b400bcc09d49665ab37d21b5a2d8440b3c8
+b768260e94bbabaa527b2af8be423577cec3bf4aec3c569a4fb69e1fb997a2157c59f1169065d24a8aa3625d89d988fd
+af06139ca7d240f2495314d941890c078d504b2bc09d98a6156c373de29781e7581f33adfc738650cad0da3f6e07af88
+849a6e458ab2f4101167cbf75bf47ec1f9e481f556b1b9d297a6b4737584011d7881695bbf3ba31e3e4180696fff6407
+b107e7aff27aa19a4a92d1a65679bf40e85ac6f08d4e5f14859d97c170ceb431858fa4c46d00131527c605164b5f7bfd
+a00666055e18f34ce02e8b67b6f181327ec0a11547c0795bee61802aabef9a3a76ea138b905cebcff9c4c86391763e6c
+a65cd8dec5166949696dcccf031c300895c5fdd53709a1897c61d795dc22bae2f7717e7ae52a9950f9d00471ba6257e7
+8b49aeac3550ef28b5de37576a5d4e2e43bcce82de09f491984171251e26c27fd0a884daa6f3d30dda107dde4544b34f
+91666b88be09799c7de9a5d9a9d4c1bc1b6fbc44c664adb15a2eb27229be910226514c2ce22818fd38b850c89291a7fb
+85abf4084c735b20333b1c2145571b793f96188850bae161160b47dea7c48b0f588adcbe9cf80e05d17851cfe3400f1d
+aedaee73c52d71d7ac3854fa41199615ecf49cb0c35d8203f95175d1ddf565499a8e9cb8d31d89e7cd9cb75a9fb56f9d
+9413589f0746d3b81e2f88b280e354fbd63ac164369dec353e6259a2c4acc6bbcc10f2a851901f39f90da7e523d77848
+826121abbcefe3ad431c713a1a2cef336a0f06f69980a14d0a8adae5640e9aeebf4eb82be4621165ba32ce5e16de4880
+adbff68221279985891e9f3fdb7b1dc71db3e20213b7c8e1931e6f75c6f02e7a1f6f05ec0687885de55ac85440f372ae
+99ce8b064f874cf028e85281bbfa43145893f80a8b12813d047bedbf88699266652de6ae9e4ef9ce575e67065854fdb4
+a809a71a663b0a9719c0327d33215b63c6ebb12da3477da8534d7e8f79fb81e06adfdad79686e40efb2c75abde559a34
+b26c4cd057118f9b12c9b86e77d370b3fdbf2654a5d80a7763ae98c68cc2769a7cb293ea89b3a08250c2f699b8d76e22
+867c56da9a2ed672f47924cce82c9d7e801d6a1fd18cdfdbbe07c82091c70ba0ebc6008b0b9d505632a97aa23c45b8c2
+8cf14633888f2ba0b02fc8ca7536f39fa290678c7e0840c58c53a9d2fe10628be343a86acd74b2fc01b0c03af0996f59
+86696802e4f27928dd6b0287d0188f8067283496d154060383c5ee295a468df32a2e8e24648d93ba868120ac429b68cc
+b15439762d0f7b6c98e6946b3c0a7ea0521845fc68b47fe9c673194d81a6cb375c79b0122e81a027f21a7fa4cd6bbf56
+b1bc19c9a3756098c02bfe36429c0f0d8166a5c9274edc7f80ce65ae7d6c67864a457f19cfde6924d204b81f2a195fe6
+997f1cc78d707f29e3eea0952b5514b34c2cf0720f33a3244cc466df62b13031bea13df2296270eed42b3667c53d6c26
+94f599c9995caffc9b47543b822dd8f84f921fe2a31e82d5d0fc79dd93a4da0b87a0906b82fe7c2a8c23c7829c21dc2d
+a7fc8a6ed802660bcc07d3ca454c415da18d798719dc2688eeafeb8971910377ce909de68721fd97c4d9fe439f37a8d7
+ab16f93e6df2464018be01fe040fea08c67e0b032fe1950fa37c7593c8ecbca24dcf0fdb9e1209d5b0def622f3f6e92d
+aeaf19b49843e3fac538075dccbb29a63d55d12f8c4150185b1ae62de778c983632542eb495808ba629cd4cbd629e07e
+85614d537efaee823452d0427ea3a2f7d5a3c988b10cf7adef8715becaa519a9b5174b63e401946362176dc0d65667d4
+aa08d8365e78efc1919cbbe562be7b28c57eb05c36e8da89378cfcad9f21e134eed923559530aa3f62bec758b00c70ff
+b4c2760454170276885d66f03e9fc4e6a4254547b04fea3c233c11dfbf71ab05dd755b9697b442ec419aca000152f2a8
+b814059b189c0ed46f9dab604fca25d881a12fdfaf834a75cc2c0e1d8454ce0ed9f2a79b34bc5e27004903a48c6ace90
+847707b0aeb4fe91c12ea8570cf0d16caece8946951360433c8a375a69fa4c01136172ff2acab6d5164ff6d3b5340858
+a7a9304ecc5ff6fdaaba6e774556bcd7c5dfe8ee7580a677301dece55c6a8564e7c64b60fc4efe89ff73954f3c3f5b0f
+a1a86fc5648edd58cc7eb61cc30c62edb5314caca5551ffedf088fc9c1b92ec5b487f670c5bcd2127067e8fd5faff03c
+9086a31715283fd525034d59d4ba3465d6c30059b967b1eeb7d537f3bf8caf6879481ada2849167e997212f3300f8ff3
+99c11903cebf722e1cfd63a46b0ae93312439ff2f014b6653fc61927ba430c432b4955b30b7f078c340f5aad4ae24313
+934b7a8b7bcf0108ed31d35a645d73f661c064a6fc6a5d1ad417ccf1b8864623b0cfb54707f10baa86643afb5c5ec980
+89d5a69ae8cc18ad77995ae92d30236d5a5ef00cc63274e318d18abcf9d936453d18a8e6392b52d2d66b51c18d904d6f
+ad2448cea1948f0a4915ab054273bdae33a08c494203d11f46888f852d0abefa310b50367c80cacfb602cbc249b31a71
+807274fbe6f08c332a5d2e2ae12cfabccfb53511b8d83bdc875856cf15ab52c2d01cf706c9be428307ea62fbfd67f87a
+b2f4fee9f32c0ea7fae306605b62d983b130e4d423e2de286bf9f4343b79e5c4545214250cd1348402d8278140c61c00
+8a36f79ab3ee0063098a39382061ec3e1234e67087b9519d0b762aa9cad54a7e0bd5d24e2b0a57a690993e3182f3e83c
+86668e6743a7b6d1ee62e70e6031fc8639ecffed38afdb1afb41d64ec402a308fe0438a22387d9b0c130ed301c39acb4
+b816309d1730cb39b1ab00c5333c6962fd5f5d8b22f3c3ba987b1e0a0065334d206141dcf0e68eba717a4eea533aa6f0
+8754e190b8f751aaf9f8e7076d21bd31db8d9ebbee6b26517b190f624b3a892050312cee9d73cf3d7245446c6a376437
+87826589ac28f442c608faeaf3d63ff057af7724f9d412d1f2cce8c58fad0adde325aa496c6e4e8441775c02d8a74c2c
+af30e5e32fcb17226edc54030f1eff8af619c207cd9e42a2ded7f15cd29fe52f140901f0925ebe4e997b56f34d3f406a
+a62a4e5b6591d336744481a0797eb23ccd0f580d04cfacbb3e415ae3f273761042b8901b0312f93a6eafc42a50f81cc6
+968a9ccc95e8c124f4475c348a33ad2a52a42e191a93bab3d7f0d211df999aa081efa935391a8289cdc4a5a8f7433822
+93350cd99ab7d3e51756eb01c89172cb406c1debd3f0001d2fa8a01018be5609d73df671e1ff43e612ddbfe7076d9ecb
+8df26dbc565ea7e758ce4c2656b65c1f0396761c9360d7092d12c121d3bc1c293ed28d82f1057f4eb5375b15443e9258
+80a0dc22fb4a12b06cf05ce39f76537eb3db9691ca466ca89b2585237c03d13fe3fcd311ce2b3dbd1b7382044b803782
+818b79cab08e11dff3d55bb0f55333f6340c5b462609d43334c14fd878b0f310b77c542c74d3674a94c692de704e88a9
+ad1bda19b1bc3f6d757fe4d189ca82bdcd0a9c1ef509c43e3f49700f84be33bb9b8b8e70f7a09bc6bc00a78cad0cf9e0
+a22ab44c676ba2b3889341fb137dfa14cfc5491ce4c3c1fbe2cb7103fdf720ff2b77806a40109dea9a68d8f072e1c167
+8eba6af1659b6145676d3663b04ebe58c199a1c24837ac4969793f07ed97165d20bb0410421e561cb9283faafd9eb51c
+81b216cf08a29dfc3e16b2865e712e15f494b914cb24526a96799a3078f200a3fd403767119732ca4de07203b479ce8c
+a023ac601c8e0c22553068ce4a7b8361b0b37bef5705fa68a71c3cfa80510041cef3640bec2cdb4f317904521e99443e
+aaaab84c8aea75303fec31694114b3ee10fc1a67357cdd675ac9d0e33c3279e3117d389e9ab017882d517131b14e6088
+8bf9a44b3df3d7e0c776e7ea5eb76f16f1870960f32e7c5b63aee9b432a0adeebbd378c574ed60e15a3abadb409376f4
+a93faee621d930f336f4fd952954ffcbdb261c9dcc4e60cb848362223374010c555a73c0563e7933d1596b0526bf75cb
+88753d0e35e87f7572f2012a40bb757364af5cf6e5dc0dfd16d082e698d3fedfab3c671bd58edbf11cedca247e9fa55a
+b7de5f03681634991d2aa8a0ffdafd223b1a0d1ff70fbd9c00d03f228c6772d93c388c02045461d51326483af97bca37
+81f96d4fbef3cf00da423a1c48ab8acc222016c21f6be3df778342c1d1aa1a420faa8ce906bfcdf955be045efa4b447e
+8dc75ec37122afaf0aafdbea333291ebb735792b4d5934fd16bf28b536fa759dd851e1de448c3efac3d2b0097e0b349c
+9186f66655fc1c551d0233b761c6982a3b8539085ca9a2baebb826091e179026b90f7ba6a825f38c6a09b190a31bace1
+a1cf319c9ed31ffdb2108b684bc21cb495e77c853e6c502e03f2ea08e88a0c2b4e31958004d9879242df420b628acd8f
+b3d3e5a75c34640bb2fbc7b62f8aced8dcb4b9b165992717fdffdf765bfc81fb4e67f3e737e6f70f24d3c24812ec0ed2
+86ee6ce0480f73cc89ce7959b4af52351317cb6406cc368e889472ee5567e8a98560dc1f13b87442c9a8c5d6b31fc446
+9478256948d960e3148acec3487da232fc2ae6818ac2c6eba491adf130c55badfe83f9a519379fc5ed0b63366de86a02
+898a8130718ac6f98ef673fa8b725af6012ef28be3f2320359a5c2c40e479969e5926f1864624ebec10f27594b24f618
+906f45d4ec3f647d0c49deb95884629a04fa65cf91a075bcde67940634cdc98f76fea8717fc1e714ecebb337e9fd6998
+874c5a55bca05fe52a5d1743b8254b642431b720eaa74f73b0faacff2225f448ef94e12585b2d3bcf12c140ee3e81510
+96f76cf34b14263a30df2135131dea00074f2ee853677b94fc32e04cd9872424dd93b32c55026b89c18bdb4e58bfd19d
+b62e2ebd543f3e9a11b72f45275cadf77b1033713625c7374c4d2284d63acaeb64977fd2fdc90145066146c311a68737
+b1759d3b667af9f15da8d4e77440fba4193d0db159a0bf73df32215b2d292bfed7cbaf41c07c7a94ae1f04bab23cefb6
+88423607f005af97b5f8131bdb1fd6d7cdfc4c2da4a4a14bb818b3ecf50c2ae6d3b8cf55e23632354537f5c0dcb0f48a
+8ba63acf22ffc1576935467af19f555a0c27a4b56e5bf752163038f0010fbdbff8a2131124f4cf36a326dfc188740e77
+8b1996a0cdac9c6d896111671ac4dfa84a3a3738c43db6d6788f1a7b8ccd6df16a31606db00cf0107eedab28af05cd7c
+912a604a97457a6b46d48731fb44dbaca26e7cc70a4628dcf553b43a9efddc4e5fb040a1b89e31902888a7cbbf709333
+86eaf5b2fa873bb56b94eb7fc823527ae50364c1bce87e36fc13de149f1fc937af858a25cc477277dc6eddbf9efd5480
+a0169e6e915e7216b83b00b31eeda207a02c9db6825b5ea44134368eae5bd009b7c95005c621e0d258c33c59085cb66c
+8c8ac664946b5e69b4e34ffaa486b745ac8afc8ac702e4a4cc36c59f420a81b31ebf8b875b1f572dad8e4ef1f547a1af
+aa6fd75ca832fe60eda078fc81a1a529364cfa8a4b4fac071d89e33cdbafa7d88ff3df611720b48e6fcdca2e3eeea0da
+8d30857ada34991ce6faa82b4326bc353691ca32aa25511cf3d52cebefb262d6db8d93521020a2d11b3ea085287ad54d
+b78bd8ea8bd6a2fd5741228502b9777177039ac8f033071c82ae11fed7f0a51d8bc64fa9aee44df25eb4b3822d571144
+90904aeb1a99c4818ef21498a583848f4d1ee9253d70c10b03ed7d669b587f8712fd26d4409f00fafc3e26b5d72b4c5e
+87cc8ebf78ff2ad752843792e11aeddbfdc628e03e13e0db598e08b496313f463f481f3a17ec889a3acfd128fb89aa81
+b4fd122c4830f339fc019da6372286d3a0565ac04d4f5ac4f28b2c066ed507316e1b7beb7b552f60060825977a2db9c5
+86e709d48d03738ca97d6140f13effa03137570c43ef00469eb0310909f66061d9fb933fbcf30bf04f13839e36d45a4d
+b4a595cdd219aff5b8d0f80b679e58d9a7ab9cc389b47784484704e7d2c5249981b2b86be4c37ccb11b9afbcc8070214
+97c6bf26c8b28b982b7a56ff867b2f5785b37260b90e0ae680920f368478a3c88f4a47bc394c07bbe88fa1aa1776f255
+aa48418728684c9a10992d1851b69e54529dbc3548fe46721758ac6b33f82254d56738b351d146268fcc56a9b7f05df5
+962a282caf6f08a63aaaf7ed2146dd61d527144f3fdacf1beef36b34356df50302330598b8602f1447f6beb4439a1048
+b55d325499ce03c9b1c35e6aea30622841aff2a2c225276d677338579ce83177c0d64d78e7d11eac657a30648ef702c3
+8a91b9296e5633b3b9144f61e5436654cffaf04623a864ccbcdd21c8f981618a908e890f61c74df19ce5b6995bc358c2
+a7b6b32333377df24c0b0194393a1487a72a8783e06b1cd00ce6bc39337b34ff58ace57c8dee5b7f0ea2c9a54048a61f
+97db4494e4208c9f297b484cb8159e8f600c61a44e1d878b07d29f0406fd32a0c12ebccd42ee7ac4c0bf33ff54a582e8
+8697bc039265f7b6e73c133823dcac9041d18634c68fe16412b4af41286a4164dc86f7e71ab7a493223a84e185cb6f1b
+b18a66cf37f93ca0189201811e7de02ee029445132f0fd4209e5efbcef46ba6a28aaaee42b30cc7e97a25b08f4bbb43d
+8b69f189f3cfc34cc3968a07e13d1cab0f5c7e093027a9fac38504acdf12e2defced4261a686a2fc850336187e017957
+96afba402124d9ff7048200acf329ccb4e35dabcd609e62d04d25140729e110a674849037e4b8aedfc99c889b132cfab
+b75a809fa3b1c17139962bc22ddfce47d38d017d585a4e76ae1eb8f02849551ff7bdae178cb4546067bbab45b7041ddd
+89196f1fe0869f2fd18f5c01118853503d71c4073aed8bd9cfaf694ca4a9e87974a9ad6e37449bafd391a2045ef5cd2b
+ae52921b5d8eb5df7d4923aed1afb125cb98aa6606f8cbc2129cfee56ba3cdb7225a30d98ca9271cca67fe39c763d508
+99f1cfd27833fb64905f8678a532aa984329b2369ade3860025ad334131a9550214297bb2f7d3569eed7a9cc558a5922
+a77fabcb76e8c6ac2a5196666e0c75c7f6c73fd8a0a5fca32a454a9457870689c83f5821f90f28dfd91abc3bc62ee761
+92a4b97b7c14ec14c74e06363b0ab2e263d0d7d84125e2cfbf659bbee996a4d8561992e19789e507f4c24e5afbb91b2d
+a2387e7857600a93de57faa0484650289c7553b9ae5fb001d011f43e5bf31c010c9c8b5bb82e7000465b546236e79066
+8641b6f2dbe9f0b83e0a7ad8098b0836af158fa2ee6ff1bcdf3e2ac8b3d25d2e5a24d515e9d549feab4e82b49e468fa3
+937306770a47ab2d5d2eec4bd6d9b3a8ffbb8c8067504571609a7e7a85c665b34ad2662701b67858e01530907172768f
+b6b1b89f261e56b0cee15e2f5284c76789db26a6ca4762500745e260bda40b00b65add4826be6131775202c8c6c4247d
+b1caac20a1b2aeaf287d38d42987e2c381e74495d9e880eda3ff59821d5974d01c7e3c611f4773a13ff41bef0f2ad44c
+81ef049b849d7b0a732579299a86f1cfeb85f27ecee4280066dedf6024159fd47f311f1ebc46b58f63f71735a05480c9
+b3b6b657e64fc154eb33b6056b8279ef736839b56f2c8f8ca438cdaceeb5398b8d3625676cd393c196f664d7baa3a615
+a450678001e8db1ebd8fbd5c808c99945bb3549e834a346cdff316ef8d3b49b818cf9642e5b8097181cf40583ce901b0
+af3edcbfae3c8f368958cd11c95df4682ed10f894f770783e967fac1eed533ac427c1d4eee51f968ffdef080593ca262
+8348eee6ec1102884929736d6768477029961c3d6d09e9ebf84d2fbe55c0501165f274fc1c0549ab831388d431e051ef
+8d799492659dc44aa38262f8a4ae37b6ba6eb10dd20481f652a1c77ee9a4529efe042ea873c13bb2ba3ec4792b167c14
+b4d3962f574c3298ffb0958ac999367db8207dacf2ca9d563cc1efb42fc889e19b7f00db15ffa91d145ff05eed97c3bf
+a3a7c0e45dc8ae816d8765bbf097502b56651c0c11a03f476e362b64ddaee223128defbcec5629f4d7f1f9c3e4cb9f2f
+951036c2878582d84d90dff79ecaca673df4760fbf9e09e63d35facf3e3257be6e1bd504f3c3daf8ac1e91d306e80d6a
+8ae85094b13d349e60c8f303550cf4b01e96e24fa3a9f12d44c9822c004f1b3e9cbd772a2b4699e54023176074778993
+a7292b61d2667d74cf62a47aeb559499f19dfab2a9f41f16e7b8d6e77909457eb2aeefadd9d3d3f6db18a438ae53ea0d
+804310f5d2ce8bcf9095945f931eecff79f999ffdd24abb9e91d92f6e405decccffe4a8d9e731c4553de79baf7a5dd98
+a77d3af0fb79b6f5b6cb640d04f4e13a28f8aaad1f60e732b88f86de547b33117386636d1afc7bfb7bd1d4e527812365
+a431f239ffc68f6b1ea13bbd45675f0323cacb279e11a14f664acbb15d1673b99cf3603b335a100a0e297c305d743383
+a64f4c28cc36b86dca65359cfdb50ed3dcc06fdb22ad567c7e0f833c880e76a53c330720fc2b96235cb0638394bae41e
+b6fcd2c047de58003e9af3a416a2cdb143899441d82c691fa46d89045a12d3b087ee4603b401287a0f2629154bfc9bdc
+a06e3b863bd183d8f91dea6d0211913663b3924f1e3476cfe0f328ff7c388aeb8e5c97757bcb56992c104ce0ab6ff27c
+aea78204081cf5d24162686a824ff8e72fc0f88388525d646af7739265f60695b7d80b53cd1ddfd046bfcf59aa25f5cb
+a89f556d42541a655864adcc1d5d67459ab488143e1b4eb48c67af30a8e753541fbcb479558ac26e1fa498f74a59025e
+afc385b6b08c355a05fdc75e9360f4ffb384fcd74e8c9db34bbae9e0c67e0d1fa7efbff4160b387428ed58e129fcc027
+9428d05e17e5525fae515e1ba3f04742fad1a43baa2ee166d2f9431dabb46895b7345ad833d495c99939f0c57cbaf1c3
+b7a62d36ae55e681d48c911e1a433b568871c65a97916f939bfd638a054d6f1136a78c96640779ce1e3afcf90e3bb23f
+a45b6d24930d91fc610e57ee78c6dc7557cb2ad976cb92e2157769447cd7c9a6a040f1008be9eb5dda2a7b8c9e524774
+8b24eddad804790df3ed82db7c0ba05082c61a81763c44c98ad436dcc7e1e89a2800ff9c2deaf350f6222cf4278fdf9b
+895409dc0aba4d29ff322d2414b33c1458126c023a3d53b25b9038bb90372b7c20d3e9f6b791fcf8f76449fa0aafa758
+b22767ed218b575f397ad8306ec48fe07e8dc3a9f2f090fbaee411b6ba673a1258785d61adcba007d748cb019c458fd3
+ad4b9e4164010c4ba05a23f9a46957c8625fd4281a4e76f76ef7b4d6040d2228dbd2e6faf22b4a966ab42f32467a4655
+92340f1051f88c25a915d0504c1413146f37f709ab060e3859b14aff9be7f8c91352dcc3fc866910a84192d301029cc1
+b4e19bae926db3e1e295ba856984b32b796d86cbc81e81c6978e989f5331f27ce9004f90536a741ca996d19f998541c8
+91502e2a69aeac8e709553501311b4392dea3d5b6f14e7523bf780b8af246e1f2bdc4b29fc4ec3ceb725fafa31bf51e0
+b20607db1bdd6136130ba9683d581f5f45d8623ec4a2d35946723e0d8768654bdd9aeed55ba38303d8d1e312bc4f2442
+8fec23ac3b4cde8c18346dda1afb2b72d4af1a6c013dcea36cd8cbf7223626690ce933b920bd9137f673d0985b64d54f
+996bba551ae3b76c5aafadfadfcf80fcb554ff26e6a9e14e60440b3864239129734115d11a89ba79c19e452525cb5a39
+a632f25ec68f02f7758103caf613511a1fa2e529e0861f286b4e490e8fca6874af2c13e3aa6ca97c63f3c621c197ae24
+b332292c6213c7216bb78612457de615da878619024626383914f9c28f835f1289818514038c30eb2bc3566d2da470b4
+b5bd5ed7e990ed8abf7de268aa1ef7ccf5562cf9c92486c2472051c1b5506bc9e72594380e7bd00c91771ed4e9707851
+8781393278ffd5c522ec450220698328e60294ae1e35f60b25baa290a125cc47fbf7435eaf9b22ea819d431de0656f38
+80a308c1acc4363f9bc54e6831c5aebca2b2af47d699a17ae2fba24495984acd4a25c7c95b96aeae3027f0fef9549284
+94a55b36389e05b848c6d0e6426a400d1596195c2cfb4a972b6bf8abde2cf86a932b769a90b62a65d0aaf388e66d516f
+8d29a5db4ab3a1199946a79ebaee9de225284f0523637f90e4ac16fc609dd3dd5a71072c30e869fdf6f057b7806ec254
+99caa565547b13953b91f0468b78551784d947b5a3fe1b7278e4a45b294f074a93281e9ee084647d1b24c83b39a0cc90
+aeee1c88769e7bae12f163a056d19b0090c7fd866d451963bc855bda2736c41500bb97a8d72a1a077357419ca94bc3a5
+a94bd8b793a57b4fd79a84daf1f7fed5820bfeb44cfec0248f6aef130fb3219e1bbce68a6a55d332b124e1cc55224c51
+8528607774d780b31417bf85fa3e54a94e4ef6e8cc233ad2a1dc795c68c299abae209c46ba77c33ba74c6ae75ee004a1
+930f2c302a87d6bd159bd6b4db43212e7c806e17f572277ab14dd9715a435bd67b3624a9e72d9a2777f9b2080ef5cc36
+b50d97fd2fbe60105dd1dd44cd12d8ad62b8a3127329f969be917fbf10132f1c6c6fda8029deb990fa1ed26e8c220c39
+b685aea07aa1a45941f5eb2a593c0d97ecb5a803fd2977783488fb00fe6580c41ab83ab6cdd678704311c5542129c510
+8cec65b68f4b3b10d032d39ec4c448e6d76e7615560bb754a53c4c6929c2470a884e7d39d9f3e58a2a9f121ad4175a34
+96279388cc3e91dba49763ef50faa7550c3b4c277b2a0b0ae3541a2f990f9352748db75755a7b13efaffc9b8df40c74e
+a7599c33614456b1b02b57921cb76b01109811a82f230f9e7e82675d57757f06021ac3f514d557ed9f2dec025364284c
+869684197084f42dfd95350f8a54b0c7d940ceae2bbe49ec18fcfd178b6b0d21903447509e0ef356aa3d2aee83701bb3
+85e9ab73165878b93e0229e3384f048e9651ae29980f9c5e26492c45e180e09a3af9058fada434d1c398b43d99d13056
+a453a46ae96e6330c1b315d1b5f37d160731309d49d13d6c38c5d7f0b4f23ff1d18c985c471564afb54e4477c5d28d19
+a5999c704320d4468f94d647d83c9e8720c19782d2a03677143c7216dc434b3160d193389b0115dc638f6e2e12f2d441
+abc7a466cd848304616b2eca049c4b7509c5260c9236dc1432044ebe3e912afcc3a6ffe3e27d5d79d3ad4636ecda09a4
+89ca07faeef1118c6b840a2c328fd32a5709b31850057302a7e607891e11f3f9f62e4fafd420564ff10a35b9a44c0f06
+b0002f9d2a8aa850b9f22dd8d3b7881e8656cfc53e6c2ae6a913d88f6934e0062f30da2702dcebfbfafe36785203cefd
+b8527c70bc791c87f5fbc67e2856e45b7254c5a0b673d4a5d3e9b79fe0715b608a2f35d88a61eb1d8d7cb615fea650bc
+b9be558dbe778ba11fac7080789522fc004510f7b740c42023d850946933362a173267106aea046f338533e4cb29aea6
+b021f9e635e64d3c9b4ecc8075fb74cf0e5727ecbacad15f822c8608f0d981ad2c300fe6e47c6148a6b1a13cf920d85d
+ae59f2a83a1384ef0b5613e8843cc9a934f7126430df7cd7f5a8508e3d83aba83bf3d18be7380570b24ba0e00e05e0e8
+b403e4d0495a0137a710c43393798593bf131cb8d49beb0f3b3d344554dfc3355ebee14e884f543bb94bf9aae40aac59
+a73b722287df7558c503f89d113fe0c017765c73181eeaa9ebe6de5c8a15ffe76fdb85ab93051a6f565653046624216a
+a7d1a28fe1d36b17e37cf5eac7e27549ce9f6eddcb36203b58797d3372371f3b195cd3432db54aae4bf99768969f5b60
+a3447ece13c415c457b899d4a8b8ff388ba25bc920b5711f8687cc86e9c1b3f3af42c490ec6352fa8609b044e642e3f3
+b12f2ac1e033b6a627e7f7822317f629c896c8f8dd94ad91512855882dbb10b8e80a1e29c3e39138402f1f7e0de673bc
+a7c65988996741bf59888415fc2264495050cb13500b6597d9d0e034898121b605784f681962cfdc80b0af291c316e7e
+8c40cfc07dd7a4bcf514f2e87a1830c911e8168b0b8531a2838d2a14e790922b76c4642ae237b7547d8a3625decc7f0a
+b480d70b57434467a40d6dd066f51b9e637abd2f49dcfa6450460aeec2bc895347e21aa82baa1bec7589b6a5a694fa73
+a919a033c24e96af1eb0cb1ede3684e9a3bc338c7ef37b67cc9e9982586f74072cc540981e2d1a2524e99144bb21a64c
+921e0b350907e9993a596b80f827b2d40aad60e9c62f4b65a67d3fa4c0acfa924c93352dad6eb3e868264bb24904e3a9
+8d5419cea0bfebaa9c1509cd748c8af3869aedc3ae27fdbca3a0f08b3751a3b870e8dd3640f4abd4b46a2a1e745758bc
+8b25e6eb600de81fdd03584fb9db9a7bf4c154ef1482553d7bef880bdc5baa7b64abac6db96fcfc4408329adf8fa351b
+88cdb72bee7a6768b7c24d124dd5e8b29f0c866a0624e5a7c4759962ce1d71de7faa97f7baa56d5f51e35bca43862bee
+af1d59add7df3b3ba234b0b4f758349225b9cee65691c102294eb7e6fb683d7588fca33ed97eda361060253acfdc36af
+b19370b8fe123f1dd2ea6d5bc75e151b0d1514224f5824437166fce77ac41ac5ecc1e7c1e75b75e948acf04c420efea3
+a1ebfe84f1c012524cb475e68ae6c7cec79fb3372f1380321a0e306d15828613589567efe8bb5784360aed568e26db49
+a0f964e3cb594c359e2308defd3eaec476a638b6e1c216157009e11f7c7d0c33fb9e62c4243057cbca49ba315d4b508f
+9391e5087374e45f03d36f6919463c473938a653adf3880571850374ef0a0e521b25ef84b6012a19a02ec88f0ca3891c
+aeb86d4426d2836e6e10c3277583a37b6684ba35f4f30d2d073043f0a0148f763b99fc42c3935026b56c32e5cd0cecfe
+aa98c07dcfb1b0a708486d83763511c7004896856e851bd83d25a9551efc28f059c3fb8752ece0296964e8c13ec829b0
+a466fd8dc1aea7022a86e12a119b16de35412a1b461680f6a1cec408e9b9c1418a8e406fd4a5656c73488adddf17dfba
+8c9b0e18a033c27731fb3d22b7c83ba7a86fdc2234e8f2a19d7659aa67bad7a85ef25264e8eb81af529feb3fa9340ef3
+a371feccc2f1a1b96ad8a9a7d8db0c06fefb1f2800933134299027459b0eb8cd101b9a37c76c22dcbded01a74b13d465
+aeb34fc2758d8b68d17f15ab3c299344ed630f7351c498a5fe7986f7e14d62e74ac9a8f5d2de7c6289771210539383d2
+aff9e961d0acc71a077e3af52ced373bc694f9154302abc908710e500e908f33bdd10b3c41bb8fa8066758a18d64c667
+98bd5a8751e598896e9aec90649294934f81c36d2d0fb60070e9b96eb47d0988f71d9b68f4c475477eb4c996a9265c13
+b25a92c6260f389f6443a572960e0a52ab9c9250d8760ed148082584b2347ec7d103358c033266bec02374e69d0102fd
+b876968bedba7f4712f5e5eea605c1e5fc40bc5773c61f08c32e0c0f3ec575eed3e13e48809983153beccdbca2123edb
+8c4091ef8946c9b27490099d5c0b47c404b5a1113500592515deab1c3f2778bbe933b09c9824a3a7ccad2141f9b5dcc4
+ab85f95d318ce235929531e2e397d09b9906c58958fdff1209a514624a099d3b8c103a51b2fcfa0b17a8f008744b5d71
+9016714cbe49fac5e7b3e493574078c462e18f6363f413270c23da6327731f71e2dba5dbf1da6bbe0e29f57f0c33f869
+8c90df700c0e2d104ce7b76be7899209136498999f78195cd888aec6f069778d657e5032ad7db56381470dd1f519dcf9
+83dea8472e8418aa069a0837a5c44835aa1e00979a217f6295aa35548f509fbafc7db5b31b8767621e4f89957892e8f4
+80a1d673220144973ab70d977b94cd3d6b8fff7f82f23bd4b30ea393952951d2f07c24e6d411b2ec19f3bec13583d9fe
+804864b58f9747bb3ae54c588dff46eb6e16b6d98e0f711828e97d9f019297b743aa2202f823e3153ef5bc4b95da3501
+b08eaae2eca2c64001e1da7d0e345f96dbd3e09888f9ab86f178718ea5a04321a8b8633e72dea68cc05687042808e3b3
+b962f91819dc570c2cf131b89882fb2a44a999b94fd1ea8b83f400e9b66075a35c89f0fe0e8dbc3a597cdd1aa3135888
+a5f33e8f04a2d7aab44e832f8ab4640519aa4ef88b58e0a398e45347492b040043e494de4b355f07cb4bc728b67f1ac9
+8ed80bfb4cd15bb87175cff427c6a1bfc3e6292bc5c2d04dd42b497bc068baac5602d41366448ee7f37d85a5d8437750
+83441e746afadf64583571a9918ba5122ca987e76a6e37f98514b1a8a178380366d10ded5c70d4feb08be6fa6d4bc25a
+8807fb8adb2aaa6833960f435ace162c01a9cd0692a4cf038c89ef7405600868efe7bdb3e8a3db48901367ebafb0a1c0
+82c64b1f77fb78dec00cab089cb7a88ae16c72c94d0870bc92df11587feb62277eb941d2f7d3d2fb033d7bfee12013bb
+ab2f1e3f1fcde3b8b2c07135acf3a492ae7675d9bc971ba57e06c99fdfb39e1f68d1c826cd9bba872749cab375e44009
+b4a25f1f5a2aeabc29870ab9a815721f3cc031ab1a55417b457ca6504e5e96e4fd0d2d364ae17738726c8f40cae9c36b
+9519efa4774cb4de4ea834376d6213d946fe6882e2b36342f683762fe50d754765dc301569a836febb2c7c9dbcf44f64
+a75de0d0320e8cee962d6ed4b07db718615e75543fb25f0d28ec5e76f56d72b18d648ae42d7bd3da18f54ec1e4497a08
+a2a17aac11e732097b25c0b9f7b97d807dd78ecd33d88aea5ee0a46a42198d379a241e888ddba940b3307e9c560ec45e
+936ebfc2234d46282ec4de88958553759d766f682d6f9669d2b77a2cb0cf9cea9b1ac02014ac3f5cd47dc5d8af2da314
+b33def3135e7ad61a660ef1266d61216220c7e0bdd867b727ff3deea904072e33a195e4febe64ee1e263349fc9096cdc
+94337e4f14752676a703fab8544ea0ab7acea0ef924b85b05ffb84e4476f1087acc9a6d6250893a32b82f02651a179e2
+8f22942bbeca0118747a22d0aa13438e40bd6a383e310eafacbffa1490f5758504da4a11e6320e1c55b3daabc72c63f9
+86e3ed934fc613d0b3269cf368e32e67f4add59e4dc1ecb1f016fbdc6c53101c2435f95fc36625aa8c69c596acd9b0bc
+86f04807460e1d93f8eea2a284119d889659b5a6b124d41dfb2825b31685361e8163fc3a253a49cf878e316463c9ace8
+b043b2a99b94661ef8b270842fe4d3c51891ec23ba749d9c999982553ecade6f658242b373982c9a3669a886889e4f33
+8b6a33a68ba7b5932ce11b3f0e23c3da580510fa37668f2154c59c3bf788dd2276a2a8c66a6bba1a68084e8b9bbf378e
+b54581c88d4880fa4a0ec6d3c17b6f0ba339e8f7100242efd3b820ac942d75d1f898259d6f1e64a3870fc301d9dea2b5
+9449dc9bce23c7e3b41eb34789dc7765c2f7855f9670c1d145bbd1b2d1b47a9318862ef3738511b4f89cb16669c0af18
+926245ae9d4eb213ebcb88ab2d7e2a7d198557721051fef4cc966cd11be3490a3f83d4ff48f5fb60cbad9c5de4b98d1c
+8518dab07ab15887c68d0de9fe3c0c09ea6bfddb99c145b3f6ff84659e7799da93e97bdd17884b228772398caa8c2ed3
+9969575cbd7953b6308391e9ce2cf4da466b3e730c9cec0e88522258639be35fd31abdedd94b445d7075919482513103
+8b1f28002c19b17d6ac1a6f50afc3448f390b3209b1a76a9a024ceaa274de4588ce82a891a03e878ea08747ae5d98211
+a611963d1bc45b60ffe6756a743ab379e4022bb3fb263f5f305a615c92432199c7e1060a79aa42f7662fa89a0812a4d3
+a3c7706ab74e976464fc341e5a9f7284264c1610fbff02fc36b88e15d6859fbf40fd8c5e93c8237b97acaa0900a03764
+aa623fb8892dbbf4fc02004a44e07c21a422e5553e4b02fcca24dc1f416a54eed36f2f7376dc1e66218e850772676e99
+8133cccf10b1686bf53143bd3520515ec72e7295f6945c43bcef7304de597b767265a3a9f7b281fa353acbc3cf6997f1
+852e4aaf4da9dafc988d0da13a7f31fe8403f6bdab88dec363eb8cb8d3e64c48ff34102f6660642749d11d69b613f8de
+a616028c6cd54a6514fd9f7aa9ff13000eaaf39f582441f73a3ed8208a513b580eb7874b5cd0b1e9a542c40c5887bdef
+a48ec58bc3bd4b512c21d3d55618e9c51836efa97cad42bf79e748542804114714db23d79ad03e410e0989055c9bd46b
+ab480f3750420119ccfcf8d32c4a18ca580ce88bffe81433c1d6999c221c8aac482de5c0e41a5531806bd17897698d6c
+8522bf3b7157cd29e948afc8f479d6192364a11f85dd5c58d4ea0443aa6b655f55a80e6a3152fc02a8eea4c0815fcf19
+86c91a6021e738103031c1ece906ff43227eb23088e5ce1b6a1cd58664d4a80d7bbcb0d56c3b0e02cba1e1c2ca22e058
+8ee51a59ce6becf098256e19c9aae5ef0c2c9e66c587d9a32cb4ba1ee0b64c13e2e008908e35f43314316508956654ce
+b94766a0fb91c8de2338a68c4ab08ce5bcf62f6efa221067807dc647b595fe5a342d7122111540a1ca6ea7743b6ee772
+83f917b8f6aaeb9eb2eb742546e3f2dfc9cfe00cfec60051010113d55dba2421974098c157dc2601902d8f40bc84693b
+996e489890dad3c4dc35faf53d870bf1cd76f1dc24e0cc8a1f899bdb44e89dbfc77fb11f7b33c270a1394c909f7a27f5
+a89936283190b2d1ce8d166b36694afddb4c3df01bfb1fa7bae69c55d1acb4e68e5e29867ea33eee8031029b3c6409b1
+b08e5a5d6797ca252d12428b2086e528a6e5c3965d2e5ff2bf83bc71ae9c0346a4ceb3bb2f2e3f8a1685fc343f36997e
+a05bd12a7a6d52d234a1b3e9ddea7b18d6d41026a0d18251b1761f1cc863064dacf821707cfeef2dd1c02536f584ed94
+87c638feef9c88a9f89d10b56fe4bef6406c1d734cd1f01006e2f2b331196a49c7184c10786e855b3de8978927df42bb
+aa194f3e4d0fc1d3107f9564b13e6274bbbfc7b8c1e73ce6677cc66d9319dc34b5a0e790d6d44c614c11feb50530a252
+b2ab7be7ee9d72d1015e94d006020e758b73f200dde81e89e52cd33f25aced0cd84b8c300413d32565c253edbcd2fb1f
+8ec08b22265aaaf27a84a6cca5f0875a3ebc70fb36c4f5e59d60c55bdf2a4fe11ab7ba4b387f5d668e67682a0978fa46
+93643b9541db11b48e0c84caccc8da9ff7696717aa176ce6d863446ef8d887f3159b0ab6fe1f79fac883a371f6736e93
+8325654fd8388ac96935149165fa3238d0848151a04be57f2386c3304056013efb49febee0a871cfc2ee3c11bb029042
+a2c15cbe5d5167f55f2a454390b61d99601614037fd67fd198968531ca2f84f3c214b971ef300a20a114fabc6c67db0f
+b40ed63b0367174b5b4b08396afe2385b0f75ec2569fa3cf60f87e1b17fdee888dd66057be2cfb185e9f32df59b7a8eb
+a466d2c8052a115f121177979620385bb07148e202631979f4ffb01e7e0f6fbce28747df9bf70b2168653096aa704fbc
+99395136290cd020cfba0ca896642c245182e2020ca2299be8ebb2f62e2fc62fe0be593838f62681f6632fbdffd640c9
+8e4f081d9a724bb54fafb66297a32f84687493464550c09259cc6f8abf770d076a514ae1d6726cb29349e27ef69a74b8
+a8d5c941e7c03dba0232c763590e93e3d99fa519b0a65996d20dd20deed1d0192738f3b339edac68ad42016223733582
+877baee9ee979be8ce3bef02422e57799dcadc34fefd8bf2baaf945f267883f67211ac5c06246f7b49f1ea5c99550a63
+b6fcc2a73dbbba54760d244bc13e1564a3c61097e9b525b247cc8687ca08625a7330fc6b15e45a3ee508b4d34853d852
+adf720dde6e9b5c63e361d69a2ab46ed73e0deb82f8e30f27ca2b19c2d8fc43e18ac04b4fa029f553f8d7dd79457ecda
+8956c9038f3338f541bae9ef1f5bfad039d532dbbbe7814e3a3d5442d393ea6114aa666559d8a7e3a026c758a17c79d6
+8d6de7f95f30a5a4b3d441781c7f819a0265852ab78b8416227089b489787c8ae9dffbb0bf88acf1b4c4d6b8a29c1a53
+81d4efd71c9d08e9f6d7f7d7a2fa5089e80cc3f8dcc685686aabf3b4c8bd531b4aa07e328c0fde32b638f23eb78de588
+a30053b681ed8328b5d64587b0d38edef0e366a2762cf5068dae177e4f4084c4333f9a5fa5fede93db80f7a8fd5fbf57
+b340ddfaab2dcded58930e5dc2b72cbedd0e79ef652f34356fcf72054a87fc2373bd3aaf8a88af8d4633f73dfa7d9a28
+b9f3a7809be0bf834bd7affa2059d9371b848dd5e5fa93e83e90d9e078a2fd3aea64410a72457c32d33ff1ca11dc9300
+a9a8ce26a38dcf277ed66d75e111b07348101e93d03f446ea72bd903198122f8a08569f7125f6d4ecaeda8c093a00ec4
+81e78b705b44533e2e997f549f46723a5e6b88241d7a86ca20448ae3ab140e967347abaeb8700594a0cddf1e82285abe
+84724094dae5b7ece30cc01b5f2acc8787de57dc0c37a437c3e8e26fc03069b6e8562302a0f1c95de85937f07fe63d3e
+97a715861e5bb715a17a948d6b6a389b89744e8ccd3699fdea9ac3d890fad027b78d436f8012b0abeedd078a20ba91e1
+b710b2e7d87771416aa34ba2d93a044bb118f279fff62c1224c150ebc30f21abff212019f0f38c334daa5a96598ab900
+853034af5ad08c563ed096ab2d0590ea644d372cb400bfb03867092768d90b7432d35c5506378d001f986c59769d6d56
+b340ab52f751e9d516348faddb45f0115ba0619ec9db820f870007e3a4d305ba2bd0b2a58a7576296531fb78886b16f8
+b8ed8feff520009743ca3313899a118df025a61e6e03bd5fd27898a23beab472746ca3636c22ea3835e9526e17c06dc9
+87af435e3e4ef611d6da74c8d98e8d3f3de64ac8748105dc20287a7dc866f57d10a2b854f7e0e09235eee647dae1ab86
+84108b1f0f0ff73a179cb1be1b2ecb4268e7fd2fac3dfc7f6f99889c90a33b4310946909b9eef31b256b8d0e3ba56bf8
+a6b9fe966293e60bd384a1e4d472b0a72544aba41b31172ac8bfc3e19beaf51da54a66625d73a9ae22c7c4d1b0840a30
+92e82e92aa615e198ba3c83c039b0adcf4393b3fbf9721b2e47ab17a84bded2bc8bc2bfe257d2d76162a87e8bc7ce759
+b9286dd48800606b7ff9c3fe2abf5c49ef0a6b981711b5ba1f62952d6fc4a9999bfdf061c4664a019120f15e341925d0
+b5da5dbceaa7e82f30fa5fde88b03ea88e7003a50eeb53e3f3aeaa63aa586900525b42fe1b699451b5d915d1b83c3705
+b06072869fb8526d3077cc61a3c55d54a7a1197bbbcc875aeaf617d7d1eff3dd3ac243e2c76caf57dcdfe306edcab4d7
+b132db9ee3ed16e6d76db9e6e3dcdc2b142cd70b9582518bbdf5415b3bb476ad900d50004dc0ab6b87ba697c6314b4c9
+adca92336f3546ea50b034525fdf548a36049ca82d9d3cec10073e7cca186227cd662d4d66673e7214a6ed58cf75da6f
+81bbb3fa241f9514575fb3f6cba8e34301187681354c94e7976a4205c0bb238dab52b29a76a5f0e0d4cb1bc82f8857c7
+91008dda2bb7dfffd6746e3544ef540d9a1ac7ee9c68ca9984a1d81041a18fa9f35b8c4bdb44ef3a860c37481d5e9a14
+8224195cf18ca0d8f01521a0ea92c9c598c556746c825a4dda49ecbe324d570a96775eb81dde1d3a14aa3660d50e27a4
+8b355eeadef5fc7cececee71aec3ed30349df8f43f25da1d75d62ab00fc73702b405fab6d422053c2b0fbc7469ace9a3
+a4d657dbf2bb30c1e57e0b63960663bd86ce17204979a9ab82624943ea370119f040b58b067a05ff6d1867a22a58698a
+9379a367c918b2be61a9a42a495ec03f0168a4ec36f753dd37eac6e9f58a26c8510ae7b579a89afdee1d192edefb4bb3
+85b37bddc80754f0432573204a1a4b86a550bfe9689f6c710a61810aa94dedeb28763ece40f28fb3a6f3791ca4c86b8b
+b41c3269b96e190e40cc16e6c7cc8054cd0b7902a43c69b79d8ce471a417d3096b2271badfcdc59deb6271ad3e5a35b4
+941185020a227b7a995f59805c8900f7f6ecff1e7b948a8b714f85a54449a0d41e28db5e17874e018eab72ade20eede0
+8a0795ce082f74e4633acb1649b52b46ea2b4360860fef6ec107910e245b30466bfee8ce59a6854f866f55ec5cc7bbd1
+931fa63550530af5a7ee24964b8b4d0c66c2bd59108131f375c7de86bce59cf52890191ec8540666c895e832dc312360
+8fb86918190a3455014a5cbd15c7b490d68c10cb7b505e9233b3eacdf52e63299d49ded75fd74f8c2bcb3632a9c29d14
+92c896826c9d871a83c4609f9988cec0db6fc980c8b88a7baeea2856ec2a0a56c3d5a846a87d03393dea966b534aa8c4
+a9d4c780c94384f5a13cab61c734836f5729482cde62f2888648a44317b749135b511668834d49296ed47c0a3b9fa8b8
+b7c26da09c3998367063fad19340f53217e8545535d376815773e201ef49e9e1b6bf1423b0b6bb363586f5f05307fc89
+8c445b3655f1f554c2a7f6f7d035121939a8987837dcb1a1663586614dcf2cf47f73633950d8803e2781baaac52c12c8
+8764f924f41d8c5c91fcd77de26ee3bbb86d5a5bfbcc45188be453c8dbe4b875fbc5ef5b01ea3a26b889d7b45417f173
+8605a8186d5716dd5f955a7125619bc72ff385cdecb187a9a646a4bdf6595d67f00e777836261f3a69c19d2e2cae27d6
+a97dca2185e4fcd7583b1e695333d55f54edd751da436b8982de8c344b5f57e35ddb61ad4a611dcde08e287c78c757c9
+b11c576a049f93e0731652f1a1ade62b0124cb7b4e2b13f6505206c27ebf7998ebdb3d887bed01e43ce5c24714903aff
+a46dc516b8ab4aabe35f38af1236052564b01d66c558e7107175064a5226713e8550912867eafe4da133f56950df57c8
+a13e75bca5bd3b08030205cef4faa56a49e5d7da94bc41c708deb2f65343c1687aff26368915a490b89006185f18fda4
+8ef5135a6f1f635a4966aa540cb877dc98c6a88fe462be3226c1a270c82cad8e091aa49ad39862f012edb3c93d15fb4c
+99158ace79ceed67b6d8e884050c6fb7c7a1509e41f0d2b9069ce8dea392f17f88303d0942cf3c0af3ea52d3194123a3
+8805c76ada9dc7e57545a5e1a874e6105592601213e22c1601b0b157b622e51f004a1da754a8fccc8f2a2241c14e21a6
+ac3dfe87e17ccda6196f621008716a14be4b983d187265eabb8f5eba7268cf770a70ffa19d1c7e77fab0373eca7a4045
+ad78a31ad6f2c84f6e5348f33631d876daa3d5978f6d1a77db80aa219e12c9ea656e9c18e6316f899bbf6c2469cdee37
+8c8726f8f6fdc40516bb64b6c624a6eb4caa931e3a9ca8ce2c31c282ad59f0624ea290b804ba84e339e83422070df419
+9303d1906cf416a184e15f13cf7dbdca5fb296b078079782c9044b9cbfdf06b0c965305a8d88678b53f0a10220e56f4f
+99b9735a77cdc1c675988e613b3e8843e2b0469030a33f5c14383803a1b20e328d45d2fde6ff0d15f6bc2eb8da4f4d88
+892a18f4ceae3fe7cde8f32b84c6bd3d9ca867143a30fab4f939281cec12587929faf07225725bf33ddf154b90972214
+a100a35a2865bb465830ce2f68406d8a92bdeb21056bcba28c0ce8ce5ddfec6e293e926d764499e53facbbacd3f72994
+b797ab22a57520a0584edff499cd1aa1663d8b3f411faa542022c5f1a645a3f952f9164f61d200e4500673a8d95a938c
+b1a457d100def2e26b2b30617ee866264a3ea649bcd9edc7be132f5cad02f3209f5dccb02b95a462b5af9a71fb88a341
+84c1f6d4f29869a359cf89118b1a80224cb574393fb557d1c61730a1fb1884895c4cb07f23c52165975b89fe9d6f5a77
+b6d53e49025bcd1d7960ce46d4f64ff8f29e4239fde1b19e5167d506b086152da3bc3b86fec8ea531a20afe1c785fa59
+9635b053c03d1be0bdf81e9876c63e8541b793ddeeb2a8f3ab0e44fb78f81a9e61f8c68ce393c7c959b62b67f9724409
+a19ca9ac5a345c96a607f979a958d83eef4350ebc9cea0e0aa11469dc554fcc39d9b22f8a3c92de599ca08ff4152ec23
+8e7d45d35f6fb95799846fab51b0ff2415857bb54b049694c1ebf93f45167b8497c3341b656f194edd5804195a7c96bd
+87c05c7d5834394507ad3d363dd0ca5132a7763644e354c3b7a803fa594d951084d37942f59211660f10098cf49adcdd
+b276246af578557aad38190878111e804db0f29846185d7033c913a31e7657d035114448ddfed2f3d75c04c79ee01e79
+868bbcf14f96547192053823e4f85b50fb988da5c4cf73f5cbf23953252b665ef7aea4421c8baec90522f58f027a2b19
+ac2be3dcb8082b64a3745ce0d2b97cf341483713e1bcbb37369123d6723968d3bad1410467aac7fcd3b623bfb1d90d9b
+b1e5cf361e0857373814e8db7fc275ccc1dbac8559e8487cc892bf82d4c6be00d1b2ffe40289692a70072c5f80dbacf6
+98e16a5854635c72bce6e263bb57c071194df076e1ddd81e645884367b730d4d557ebb8c74b3c582e09046d2b9ad8078
+a0016bfaa348d44a3ef814b348f7d56fa83b78baeed4a7b58617b6f4772dfa990e912ebf91c2321307884be85dbf81fa
+85690a2c5cec392b6f98cd2d03e4204cc51868612543c7a3112066ebeefd4304c5c8b21da44534224398648b413634f8
+a3a1d00d0fdd8c8cfee153347d590ed78cce48eeeb7ad42032a95baa73cc458d46882d0e9707f3dd519b1844f236bcdb
+aaf2774fb26da59c115a28d86f0c6320368fc6d2c0bc2b7e4516cdfce3058cb423b0026b6c75030ddace9ccb7f058227
+af507cef7320bd003526fdf43c04af46beaaca5b6ddcad835ae14da60a2ce732b453d8164553e95f2b776df55ddb5efa
+b2656c07a8ba2a2248d0313a7795b99f5acc120648c08e3a77fff5cb9b861827c94d4f2f99a2f2dec1d1667ca3ab26af
+b426b97a51f0439f2da2d0d934693aaf52482bbb48893de12fbdbed1b2155e30791e7098baa18f93ecc45f8dea4f22aa
+a71a7e08426518ef7307c2a1be7aaacd843794601c0d49f4f0e474098ea0faff74fb5ae2bee416aab849afe04be434cb
+b6d510022dd3b9ca35e93ddd2ae77877967dd6966706f339b2197d2891bf523b5d55b7cdc80274368333f9249b62a7fb
+95d2f6cec1b4038f56c571ee0f5aa14fe5fe7b9a2efab89eab4c51a696d2ada549a42095245bea14d7f7ffc69ade417b
+89147eec9de685483d0a5e21b877cb550518a1bbcba0ee65e9519c294fb0c422a729bb0f5a8c8e3fe77070e1a89fcdb2
+a66e7116eb277ba900c06fa48baf274e2a6865977698a504dcc1d0c20f90a7030bb2a841fdbfaa5c8ef6d81aac4fced7
+815053a8483ce2a84a34f81909bc3eabefdce59140f0fda6da77ec005e5dcfdbc6f289d0f0513efbbeef0358daf94025
+b480d2b6320ebf29f3781f04dd88e835ad81d2c63b716f6f244fd2b113ba3781001a34189df586cd629e70c2baa0e5cb
+a74281bddc3a93503a695f0375121b3bdf98db4b2b053eb2cf0773647f6f69d1d98a61efcf82e2a823035ce803b82001
+b84fb99a6943447cad21bfe2b34dd8da43d349e53e85b73fba8a5fd0fe3f41e7dc629960b3325d08af1544e5dc66de28
+a8d11ccfb0dec31b39efeee74c58536f29abb02d06dfa11acb7134cac626a17ff4e204d1d138a472c63c629b6f8406c4
+b5017d42a2388d90bcf4d0b6e015c63612a0864b2b379e9cebcf2e869e5fd45d2713bc549ea472d77e82fa8750f364b7
+83c8e090de4ab6ed169a033aa4ab84f7f3e2b54186106790b30741e9d87d9a5d61bd6a285447e0d1a8e1865ee618a91d
+8db64f3a1680cf461f9afaed4e714709d37559071bcee52e13feb5627c1fa7c093fc8923ede3e70db07563d2d1eae69f
+b6d20dce2f50b78b094949e64edc2ce1b077a3258692ecc2cdaa01ec19add246d0832a319bb0d4153198e3a35091d86e
+a61e585ed55dedfad57352d2abbf8ab336a999a5abbaefeb5d0da9fb0d5bb791119e52034844ffeecca9655675d17228
+8ff58b27196f589ce0d3461e0c00d695da47a79809719b4bd4a229ea7bc9319469744f2254be4469092b1a27532439e8
+b5edaf7c3f9dad7a54908da0e7a153d69a6bdb99fde07fc42928a0dd38031e32dec81c864147066412a8ca240e7dfd0d
+ade064bb3f87431a32b361074a89dd280cc1160a57fb3cf21eea5066e886c7bfc3655fe39099a1913b8b53242b23b2ff
+9169621f97887db46384b43ca24b1447e23fcf5abf141e70fcd1834e9d691b9bfc6e8059d060bebdf9922608593bb972
+8727bb06fadf0633fb8137a54d6912cedda0bbeb0f93af97deef3490b1b47e58fdb37a972dbab1534a5172ff0c840114
+91991b98243bd7c138bcb60cf703a9d0828f6791eff5c2c1c5cc7e8edda258d3cf72680bff2c563c8e964f87450a3037
+a1bddb74f5892597ac687451b932449305d6deba20e97e10989bae311d532a7b72a3fab08dd832589e6a22c0fcb548dc
+afc52ed64208e4beb029d1428697fea6add02210f613551d1e5ba6011c5d13f66ce26b3dd2a39b30186c566b1af66c06
+929bb88a9e30862be5f45c002c11537780d151f9836edeadcaa4a617b0bf958046ce331e15bee646f9eeb4d9ff854661
+b3376241793ab9f1732997cdf515b9114f88bb2c25c0bd3f3b22e5b665e1ae94fa3f6a9f88de37b7792c3aafddc682a2
+88fef7680a7fb665043264c9733dcbd23e20628909278711aad2e54f2eb8fa3d07011f593069b6ba7ed312d9ddc3a950
+b031434d514d0878b7011ce2840e23e94a4386034dce422f37fde539aa35cedad1511f9eec39fc23c7396f43ec22cf92
+a4a32f1e58c4ccb2cb4ac6c2dd8acafa292810c77126844f33287c8d522bb8c32dd89ce8f7c1dc9a273165b0879a45ba
+82e5b11b9fad7c7d5e2a8abf03943aef271ffa43ed8127dfd85c7957b59d7cea56039116edd0b0b992262751c347f75f
+a650327144db1806cefedd1daec1de3164b77c02a0aa652371ca0401b50ec3b7a392ef6a80de6d4724892d71cf48eb07
+a88d8370d88379b52bcaaf596c32faba155db4857bbc7eccf89b5d67a97ae481e53e81de6c9461a6719d179f3ffbaf16
+aae8b3d1b1bb0d71f19e37867885a1fd550f7805fd1306881515d77e5f6a990e0bb40c685e350ed09eb4a55298f3a393
+ac024fdd79688628ee188a7a9d39cd1306883c260dbda9e79eaf2d2f57051b5379834dccfc641302cd12a8a24fa2224b
+90cda91b9e71b7bbc091b9e8e28d79f0fce42255e24a7a3bbf3348651405c46d3b6e2e33c5fb5e99fb4d0fbc326f77a7
+91325730bf7d71855ce0462a2fd0840f3753964b296f7901e1ad761f48fd133371fcb805c315c4d8cb2ffe34e98ab9cb
+b9e1a298ce9efdc004903b21e573c113c771b1bb5b25e2e88baac6dd7bded130016b2f09e50a4346c59adee607a71760
+a703a60c430e365bdf9023c923a04fd9db427ca0da2da8dad6b0f0d5d352524943839d859c15dca64b590ace6cb1ca89
+995a5ef468a38caf66d58880245064a7c0ab520ebf3c9e9f956110a9dd68658baae22ae274a48d59464c8d37d2f8b643
+889c6e4516ece0e0fdb8c99aa482f367f2cef0ae2ce0987b6b602f6c856b02fab27114a6f4b82050738bc98a48ef5837
+b432ce5f638aa48ba952b9c2e06ce822d531c9a24011d14650cac0722a4c5ad1bf22109a2f429cbdd22a567ce6f03094
+86fe41234d309118d1256a9ac79b7bf01da1fdfcfd579b655f31b7c4cdab6f687d46855d56bb11bedd4b0be17e892b2d
+905ec536f23dfdcc4f8128fc1c00daa877eb3caded7637dc911aff0e6279eab12f1748949e4bf015e4f8e30626d3177a
+b6b9f47cb82244d7b1102b37cb52f5c9336e4c05e4c90f5e448fa92444bef12d2fbcfc39af9e1fd05811f5f864f12047
+ab56e7c534ee1f921351dfed3f3eaa127869849b44540b39b0dc021b3dc4dc94027e4161f7f3ed40bf42a1d08315264e
+b9c62b4e679dbb3405733bbe0740450e72ccf39bf953142cce65fe014f132d5af5864ad96167027012c98dc8b8889e8f
+82b8036a3fb6f648c6fb0492334fb3dc8f57c32779d4eef78ac2becb0b93f046dd68c2fea3b5039c21ce8e1efefcc685
+8525738182748d6f901650cc328ae498cc3c712300441042441f66c683e06dd741b644e8e98732552e55839b66f86b82
+b625cca7bf4ce510f21e8197b223dc49e7ce245c5a5d1e901438eecf7160a0bd37d0196191b1d934779f4b6a387b6db4
+b63d753d728670f3b63d4c24acc4a3d4859e5f15ad775e502fc50d7ca42b0d2484a8649eaaef9eb22cef28a23e10d5e3
+8e951028c0b4c5a691a219a6dbf348ef66edef60796094d5f6abaff1ad5802b53a5abec9b8b3b3b98f8b5858672847ee
+b6b71004d898a3bddbcf7f730b8d5c0d8bba0f3b508155412446732ed9abbc1d03a90864f4689e6ab207aed495830e1b
+98f33a74e36c035d9476b198dbf3a75573856264d45313e5bdd89db291dceaf4084917a2242b0a30d3b1ba4ee3016c42
+912fdb4358fe617d7981bf9a9986dade7fe279a0445d7b14951ed77eb88c77c4aff4162467e40fdaa9dafe78da0ab4f1
+b17bdf7a896480ae70b3696cffefbca468b57493d5db59362dd85a3da296e1162356358080c8b0a7f3fde798a3ad1d15
+b47ebba84e62bf453ab223496a892fea2244ba6c37615c3db31c2ecc16a5f9519dd79aa710ec1220a2cebd254f7690f2
+b3361190434ab75e46a40e0ce21ccc251fd0139bce90664bd33d9eb6400317c3210509e4ffeef604c7b05b260544e19f
+966916b3966d7d33be49fa4eba925aa2f92adc2d0228d1144ef633dc5d67fd8231087c488b492688fa142a8cdb45ca70
+8ffb1491d4448af82b7cab5409ad26d99ef6ef08158c73a9ee9626c5a84d2fc6d852e2c786c94b47b5931c7194d5b82a
+a2d4a5bb458688b8f593f39cce2b27fc05f8ee3985f4c5be453706e8f174d5a6585c2070c0bdbb54aa1d8e79b5ab40e9
+ac180389d0432699bafff42a4c3da59bd32ab1bd1c4b4a4829580577fb3c5eaf8aed4dc61a93262f23ac44255e6c2b11
+87f8fe99acc93080e2a2ae51eba24f0b146c1355855a202dedb7deb8e1cb5c6ad8664ba0e93ded5ce253597fe015fdc1
+a554d88dcef521dbf5e4823bcc9145c8ea98c598cab56c85f101ca7be82297dd7f361d457966bc69584adda6d40ecab5
+86ee126cc839d869c7e91f0f8d919929f66c1f67675ae8c5eaf6bc35866580c49d45ec8edf0891b546ec2fe7bebbd304
+970d74575be6cabcd2e33a8dacf25b378ce750478bb44086e1821c97b6b27055b7f00cc8ca189954f0150de7381c80c6
+963badd0cac713d8a23dabb8ac7da5e9a83ca7d580ec81dbbe3e5d53c5c9370b86222ca685215eb282c8f67a977b4b66
+8d2735c85136625b3f8c4196a8f892e276845ca7c876648498143f1897637807a9a5162bb90773099a7b0cdfaa292263
+a1a8507bb8a300e1df882651b0155e46a0f58399375f4e5f993251663b5935a76a02e60999a4851fa082a89d5cec2e63
+b712dd139d791a95486d8fe48e35bb8bbddf890435dbf8dbb670699dcfb143fc582d4bdc8a6751f6bf58a13dd8c2871c
+8f108fcadbaa43dff904a23c89d809746a9f732be817c2c882ac3493624aa5e49af7dd9b46de7d9d01ae982bb78761cf
+80e270c6620756d3d127457fa2e51592604f85479a1004d63c184d7d2ffe2eea4ff75faa436f24bd1494f4eaf90543be
+81f039fce432a5d3bf9649ad0fc2d93de831f5b9c0d0e5fa92d35b5bf4a52c739d478289c2386efc964026134f91ac0a
+89401011d51b6106855487a37459351f18c39f08ce90b15e52a876cf36e969a9c9fa6cad94a55b844ad45fcf1807f705
+ad66c149ad105ce8b53d38c410d73a3cb3ec910a9f0ae798f3aa5207501c7ee39b85f10e91b4cd91e6b280f3912c492d
+b709445e56d02a558a1496bd2b9115d2635855b18984cfb908cbd54cd279d29ecab21cce704cd9ebcf34456dd1195d79
+851059069d9fef4eadf6ba508ca330ecb7436ccb91d09f5d0416874f9fbcdc56472d2adbaebc63a63f190b6abe7650d9
+a933c1b614e6d5a58c599b7189d06bfa3683995f449d636805c8307195d8e98b62ced873997898d6b1b01f6e6a52b743
+a692ba436613db22bc30c3f36a516971158d5489bf2c50c39d0627a74048a6d0b229606823f37a0832913425ddc30d06
+830999596d203b96329185c100bb7360189a50f7930286c36544d20e57b8418c71d8db331e4352a98f380c68a49b2005
+a56d7c262bb3d443fc0cacb2b61f24554ce35b8984fa3418bb4e271d5fe4f5378ef7b12c6cd02f537820040bcee95f98
+844a4e9a8c9eea0b6f929a80da9f4e4e273e999fbe182d3855b0a40577afaced6f8ea285595573e99e13b6a71b985c03
+b34df6205fc429c9b7cec189b2634d49a4877f22bb8060b9f7baf8c2eac4e1d476ed1f30fff1f4c019c65fce96abc554
+b3a97648b3b79cc513246d3d1722afdf7645e7216af233645fca6a2756686592635facec913d19acf99ee586436cb58f
+b9cac906123f2a4aa13d5d7eaac84e84eeb0a1b7919526de5198b5475fb815ce556f8451c953bb0bc910c93c6fb3fab7
+a5e441019d492897de73d31a44a0055fd04e8cac894d626d0457ffe9de5394d0bf851dc5941790cba388b403b86864ab
+8e3081cc7999d91d787e4c0937c9e22c959d2ba4be6fa04eb97471997ef150836a910ef28455f117dd54fa9ec655148d
+98eb793d88faa691ecac3a7c78b25eb3a833ccfd0275186a63b1b1517bd2b984d9908c84e55f044b31c2dc5e251d0414
+b38b5454c2debaf1a4e9e467c6205cfe26d52d1c1dde5356c089abfd6a90dbae89525442419f108c7c8e82e34ec3d5a8
+942545089077b9f27304d2d6ceb3d549e983f100417e88332bf05bebfe8d42b75a96171ab3bcd049acc859f3cc9ad1fc
+b9d444777403590be63076b5dbd9325ad58c1eb244dde2c9628234b62ba74f6b0e956642af2d08cc65f82a1b2e24bfbd
+aee8deefc7ac67882ed7ee6c01c08d7739b6642deb2614064c69ea38c5c65e06cf609bcaf7db74545199cfa6122f23eb
+b3e476268770abfe0cd64a4f878c58c027ff352569d8cf571bb067368e777eba6c003d344746fd006c8bbd474fc3360d
+858137d63f90f66b9ef2a38d7ebfdae1bb89e5bc1d9032c96d699ef276aa2d7461366c00de8c47de9231d9ec436572b6
+a3dc8fe541c9cdf89d83753347d8c573c49e8471dc07b5d41bc48ad1b10a3fdc218adaeb72bda0f362c8af8e1194df45
+ac75940ae476a6ff07cacf70a379096786d10a5a5244fa5c466bdd8af69b1f98e97a3a27877739dd4b223627e0ce6d55
+8c6809f893c5fd03ca80d845147a82d8d54bb7dc6a688733b1404dafc360c45d5ea742f98f6a70ac2decfcead05d876e
+b0818eee75f08ab207832c591aa783193aee5742147eebf75cf7f1eee6a6d8855b309db4f7ab51a16ab77bf619e14fef
+b339ac167debc92cc9132dce076bce281e7f1b9c88978d36e1b5b9bdeabc974af318ff142f746319681764bc4db191e3
+a51dc040c75a8a8bc3b0ecef47ca313ae13d9560c782ee014257ee728a09432c4486a3f87b5ebab690231735fceadf80
+802500a52dc271c52f893b620952604b79d25ad243489dca7cd679b22907fa85947c88dc04463268d25dcccc8a6c34fd
+97b136a881f500b07e5b0b79fccb84b93dd108074f92a1cd76e441239041ff389dbf03483fe76cf7c22a5f40b73b51f3
+9155dfb5d7f7915e50da7a715d1a5ac5b43d7093546d6d342ec8b69d47a86cfcb9dc11d8079f123854033b8d3e1ec928
+9423ac1e11f70b5d0cbbae48b7a5be8350387460631126ebda095b3b33a7ee2845776aa20ad60e2bfaf975722d43064d
+afa907dc76e03d10cfbcc226e50e3bcee56baa4acd8db2cef8e484ee7b7bc536e1765e764180663710c4396e22fb4dc0
+8b6fb4bc641fe2147d3394322418e2e8e091718e3b54dab8d0d6bba687bc300d73cf1b17f81e2812f0943a8bbc1de538
+a8bb533bf42f56edf112b03d34eb64f6dccd57251244f39daeb6531af650d0368f6e4a0f9171aaf4f5a5b4a17debeb56
+8d763490dbc9a9b73bd571833afce20654348cd553a69678ec89454c4cdac044ed3ef0458cabdb60ff35af5e63405961
+8d3ebac80c55b7ce726f4cdac41c7e2f6a5ff4ffcd5f1803c463ae524243f136dcd15f9bc74f8b271ce90a4776c94868
+ab63cd85311fb9889041e692bc9d5c1153b26a805b511721154d28f11dc8ab84733387fd20cfa30c566ab2f8e066af4c
+a506ba11063b14f25c26c92667dbd9eb67c8585d05d3980284aa19a09ae97599a1cf8d7cf45b70a32063f1fa3174d3bc
+b834434632307602d9e046de6f625af5de673996108911c6b05d6bd3e2aee17246b2d860f01dc2d6415fa61c73110e13
+8248b69f51196ce1e15fcdc25d487153896d1f74818a5617500cf0bedd5180028e6567533536919156860e34ba275f1e
+86a5ed8b6a1e9d8d17b69640220bb80c9065198c8f7610d4ee6a60d2d808508771a84d6bc679ee4db34f43f94315e0ff
+8fde55abc106b2afdac3b8796f83c8ce1b90405532fd586d349340c4d7a4f4c46e2a56fe2663fba770a8004dc7b9d523
+82489db9dccdd13293499194068bb4ee8fff51f74f1b504d203c5deb5216287a6d614a2e0a769d4c929bc103582c92b8
+82b2d71281cf886e80e09ff907c1f9213dc444c058e965f964bd17fd36dc0382da2449fdbc3aa7b6d07004d6722a5848
+b0729dd38dd64c441e81a94fac0c8b5b3588081e43a5b0298bb576b16a9713acbdf09b9bc2499c677064619cb3a172c8
+97c4bd5c97182e80f55e82648e387c4a3362c6088381e96b67cf0f04bcdac3dc670890904180a5388b97002c70481235
+98d99f80ae9c59c921c6ff71ef01c2ba283f531ec32666cca1fe7dfd9bbfb09f197e9112af1761068cba8d6319af5d74
+b0569d892ce82d87a3d809f4c86a88ce627ed420dd106ae49b88b8c470ddb081a3dbdbd92d7fc032a7082650e4197ed2
+8ff68d42ec2dc5b13ff5c7ef506c619c4bbb0f62fd4c08e320953e5cddded2aa34624c6c5768b546cc2f00add0dda58f
+8b53131206c80638dcff21d7f2dabdbc6faec545f19ab1f4f2bb858d6b01d87adf886072c3a744d58124b8a7a0c87573
+8b9c9aa127ddb950cad4fc21cd7c8eb802cef6db7290664b1773b9744836450e48af503009d4bb266ceac83d765b3b9c
+ac61e051add512e749588e2549ff55f3e6fee5378443cbf64c80cfd7b260cfa63f16fc3e242aa140ea243435be28179b
+9240700fdcde974f319a90ec4a9b92a0323424fe39e513c7412c621cb33072d193476118636bd2655867ed2816e03034
+b6b05975d0653079034f9792d5d8cf5743e1737e1b3860e431a1e159199efa5a55b2d3283f6d270c9ed3156a233e858c
+a2ea8fc31294943a3a6d02509cf8b75a7b5d94de917ced468fa64a6c24ead4edef11c34782eed848792b0570219fb77b
+ad0b54dc5dceb242c05a7f7c529289c8caed93ebe743f6609df653aedffbd7eaffceb53a18dfd109f28d14c80e1f7935
+81e4d4667900eb5a8434e2153503b2318f63708499534a8d58382931791eb0ad0522b41cecc7eb0e6ddf99002bd0127c
+a4c5c329fe159bdeeaecbaf479c60c8f43a58ce613e135e9e9eed4af6bf5b6116bdbfea31c82bf0ba87c3f651e1464f8
+b95eaf48a9128df7f970754af926f9865c2078cabb4da4918d8b45e95d72748750ffd12f1d8d3f76cac0936ad0097d16
+8567385d52e6f6dceeee52f6b690781f7c05c26f0d20912bacc38c23afe8f64925ba18f8b6464d4a0557670ed0cea232
+8f7483cacd15fb7e49b2f8deb7ab05e64bac18ac9dba475666649c2cdbc5d6df0d5e789fdaaaa997a3b524521f0470ae
+9252efa0698c0cb30dd431a72a0f5f2f14429f6ba50bb60f7039df45777557afe3ae732b9283b4a814d2146a8cd8b7b9
+a54da5287928a02cd5eedabe70cff80e56db252e2811842545beb14f25ab67788460a71ab8ee47cf0c1a5f8d01635256
+991a80279c622565a03929c94590f33cf0621a79b70a2168a41a4376bb3f0dd12a9ed9b16c0b6a4a59c50b5802449874
+924ff5d3a6f0ff4ee58c3674319971257543d2e19f0ce3fd0b0edb214faee920f8d6199ca794a173363a9fa06c96d7b4
+96b136b8df76ba24e4dcd68065c650fdc224fdfc9c1ab6410e008fa5b9580680c3c85801fa217917c620c86dcb5ce3eb
+95934e64af642e7d45ada1bbe8b9fe972877a674252005afc34ec2e857f755ea0d77e7759ddb24255f21252d6c739305
+ab14c6bdd6d1ccaf69e0dfc6c832751afb70f89e4800c6fafd22db2e7e5d6f2addab8b1267c8f3fb85cee51c761e69f0
+87e2edb8dec1253547cece2a7e6934b0299715e634d599316af0f076c61726c7f2aec83eaddcc9add1c397cbc9fed0ca
+91170baea88ba00fe00db375e8d948f58061f9e7b36a4573031b9996757afcc2c7e9c2d9642bc51402aa586569f0a398
+89d99b120e4565b0538b2ef4f8d8c05997cdbdf61840e068054e7f21677cdc1dc2f63adab1b6814225d14275c737b0e0
+880c2b79bff714665e9b3a0a647773a212ec5f0dea37ee6b29ed6850692055013e108a86affbe44d1abd0ae80a748950
+b564181f9ea65ca25b1ae7f25eee84b73f9db109ad1939e6b9351663ac0b083fc13e6518ad8eaafa3caba9ab959bf7c5
+93cd91391deaa726320574bb46706fd8e30ffc2308290c79abfe2d234d0f0f59ee4c38791e3bbd8c3f840a920489ebaf
+8e846d48e7b120b59c6556a0394d25f744dfda0cd58d4e70029837753a82afb63a015e79157fe8c810cc68bb481d19d6
+b36904e7dd71bada7c9b9172e4a6748287cfa0cb6960ccfb7202a36c57bc28d351e1f5371c2b449437cd266f2d22e7f7
+8947c11af34a42f314983ba9c673e62fcf44c6c1f733a697351e1b8422a75338a85bb19149fc130d01492ee18b3c9492
+905afc0103e34fa9787102fbb80967b8c917bd03abb02731fe49ba1acff1e96059227616cd21080563e92dd021117a84
+88c7acdc65e6373e4c8ac6a13d1bce1d534aeef2965a4d9f887b2e823c7ee7921db1397df5cb5e7f12030e310172d6e7
+b028c19082411efe8a46c8abfb9936c005e766e2ad3120be774172f16419e2b04ba3f31132ed2bc209e7214c2d7b2b61
+b6b3a561d583870193226391ebf51ef47185ab6efb3556ae59106b6f266776064e5cdb66f0c93748e60d557db64e8f84
+93732aa1473dc2e50610eab2c8152f2d96992fea840ac2d82c6e2c5760d8c1c05e8ecbd69e14d03713f43e77ced9d3bd
+9734c433ad41a8fd91e161de033a2a55189ae31e2af406d1fae443a182bf1977dddff93f6fe2ac7d9c4fb955c26ed59e
+a1f305d17c36c06c515d30fdfb560f899e80a2e2461d0bd947032e5ec764116c7ccbd528ea42a3b9351e3c9b45904431
+b517f46b582655e551f766930637e8dc2a762dd7a2c54fce429fdc4cd503e9fe4bfbf323f50860be2c18b3a17d528654
+b395b5c48b1cb0daa8c156188b390a78441c8f16ecc8650520f9f2914bd1d992b83849bb11ec17a47f9f2d40d138e3d1
+9147b715b62fd50e59bc96d210e10f1062c87a90263b5586746325deeea89e759464be55a09b0548766e13bc910c4d3f
+a7dfe5e7a39767d14d531d371b92fc4979d326ed0f966eeb7b4b4252d78117bf5295b3c17d1fd636dc2c0097cac901c2
+aa3f9fb858b30675e9e57170a1835717521eafe4bd0a0690b10020c7a753951576b4c7dc80cf9f042894fd5741b41b1a
+a1f11dec034733e862cdd4aefaf0252a9e8175b6d4c834b7a7d30ab884bb6ed6a1d92bb0e958f0082085cd80157a0e40
+a1751d7452b7c5596fb801466d8d07a70831e568b8ca66fdd75e5898739709795a5768726ebe13c469b1d51092d86a60
+80acf49051b7caa6efe78318792d05401f5246c5b3bef25170b2a49adfeec8048ad5a5e6d50cc498b23896176a9d9669
+94156df9959c678578ec6e12ac068f3a28d69a981443fc35161d14b1f0327b8424746d62869ea9377a86ca6fd2c95b5e
+95dd91b1e9b457de913a65f198dcdceb1fca75692853bd5ed44eda6343f32126e6aa2a309411e019dbdb9519c865b96d
+b2516bc36a726cf2dd5553e319c64fc508682c7446a2a5ae696e43f1a8c129ca9602f5a41bfbb57865a9dad1d56728d3
+90cd63b4f9216fb70635e4dcbc9a6c5874cabeabe4f9ea83bb923146d03366d9befa48b20a64f3a2cfdb0c3a84007ab2
+a55bfe9b33781501f10d5632e8f5330841eba2d0a64b0aaaa92db56f014b5e44dbeda3b1f5b2e4c17eb6a243977b2a82
+b9e84b3c617708971f5e174fb8718906f9bd353f8b0fec8fa03d1a6e4bec20430212396a5406595343cd15777c5a3f8b
+97deb79dd82185555442f91fb9a70cbd30a564751528fa0df0a681315b8a71bab5073716908ee0546d70dc41efa3b53c
+ac77c2fe555584b9cba7438a4e3904958f671c49536f185cf1f3b25c5a57ea65e15554de22def94c5c623e8c99e47a9a
+a27c62d39508552d79d2899bac6138783f308e3befab65a96a1ae4ab108b799628cf37db1ec72859a0ce1ac68f68b106
+a2aa287741f03e31f2c87fc37e228279b1acb886f32c6438b3e9807b8126da875fca7f194295c45531e939a13048a882
+84df8999c4c5ecc807819248957d68909d16ef64d94a820dd0d266cddb6775c9c7464f0b2385b7bdde8fc0f2169a4177
+8388e1a1babb941e03806b392fdc1bbe1a01438292ea1db4087b010de0805be78cfa56d20e9ef7c8b6be5a04bab1b1e0
+8cb6ec409cec27e7c4537ee2e5bcf82a33e7cd4761d19059e902b6068a9744e897a6010e2ab42ce72625cbc433892ec5
+b6e71cf74455b0f506e03eecc0976831ec9a56eb8fd0e39e5e12ae199180a4c6e5123174ddea6ce6cfd7a414cf0afc5f
+815dd267d9f67b4d229a798a499b70ea2a611f3bf2a9d3698d1105890a2b6462fcc7c6ebff0d5d709707ee4ffa981689
+b4e5b7fbab4d8a66d1b167a5acaa4d53949e1fbdb00107e62b727b4b4b2cc70e2685cd4a16266e8d13ab176f9be09c10
+8d1bae7566ff551f06baacd8c640d0d04accdd49fbfedda0841914aa1bceaf9f3f27344b80bdf5f9b93ada438a4e6d68
+adb054123e27afd4a691d2cd808a3232ab58f56fbd514935caf47b8193b4c64aaafed4d08a7a10ec4deb66be8c292e64
+8ab5255246e01478ba7dc6807c84850308a719f8f8433eb049d5b11cbc361c08930722e7e5878ad99fe1586b3d11cb1f
+90e862be1e3d0824106da33aec437a87dbd2599aeb58d46b4a39a5f651097d49943c3248a154e09e309eaa7abff3d500
+abf16f35e3b2b29a72cd96802c900fbc54100484299198b2d40cc6071945781cc9bb3eb43f6ebe433a14c1aeb172929c
+867a0f396374cca7303845d8a1e4bcebaa53cc0fc2e790dd58cdd0b5ff2b9a99e18ad4e57aa2b061826545935a5607b5
+a6b6a2e22932d7c9ba8f27b1e1de8559631a81effc77ed2cd7c45c48e49ea7d2f68c59d07a155757493ad82f733d93ee
+885e4c3904c545c0eecc9cd02e16d359ce69a78e3a355e7fbe6485762d4523f2604f2f663a4521152a8bdb6fd4a9d4be
+a668f417391b07a35c5d40ee5212cb7bdaffcf040a4f20a3d7e70e9d715bd908d4f8fca87a7dbf7b676e088ac8651ee8
+a70d67f3379e1ee0708c34c4c7a7f552267ff679460b9d8891549077c724becb99ff79b35bd80420a4290f293ed4133f
+a523cca782ced0d8a3f7e19707f9c64ff38495f739e035bcfb5483f202b209c07c50c764eb28d3bd8cf68ae093c46f19
+8ce98e5f96889ebada090449ae198208cae5c247cc5f6fe7800b4c2254b0e7f2475b632cbd5021a0871b466c5b943dc8
+a69cfdeb27ce1163ae6b6b4b5d46b49507c7e62789f2f90f7f5a0fdce79de988c755cc9afd8397b1c02976e03589f985
+acbffc94dc0445f7797a0d83e5107ad3ec8bf61620fa83e73a999ce4f9b6bbabb00245a619aa6f9b082a2711bad5ce8a
+b64162794503c86e478c23f060228105bab4f3f5d46582bd455a94526aa6d71f4c9630d8d63854c8c67aff3904681e0c
+b1288073c012a0b2b7e31708e874106031a8cc98b2c94ad0ef1d7b9df42f429f58caef5494f6d581baf12970cded2a17
+8d7ad217c3c1cb74cc301540a0e43be6d74d5a3c0383ab7c9dae57e25f8725781735b58301ebc014476171725299782a
+924a33c759249af270617767101385910494724a51fc63600836ca00d06f0ca86a4a0a85e5e87cc29e404ff8e04d036c
+a7b21ad39bcacc96cd857328a83e5d26cddd0a5bb2326da9a8f593927ae7b5927704acda9ee217176618c964d0452d54
+a5c3616c308bef98807a852e16f146859b0b1f31ea8a721941d90abcbe37eeacb4403c6568480b6d6e773bbb94a89307
+aefaa1033e47673ca2b68e4c945e6ed892e223146d4fd24219304c2667777c1b18a19488b73053cf7b0e6e09ba1278e3
+b308c690176bc43051f51839d3ae1636f6de5a57c626e8def464820ce2f96ca09ff26294a3dbc9b4573cfc42dd03bbb0
+8f7b1253ea9e257195ee92c54de41f2e7a310c90602a628ba3180e059e5bba79d6bb8110d1964c59daf4b65cd9735704
+a387f003f7731b81bace54c8501a3a2a25d8a910cbb28dd603ed16ce61ef1df34e233dc8579071856d7198a071efedf6
+955ad5523828c0fbe8ad6a77a191661ee9c8005b741b7b0439b76711b6992795758d76133399d266df5e494e4f86cd67
+a44441964f5cad7b54d0105f162ed3ec40d12870fe8c5c30bf16238440143b330ba986d6adb00c9626747e99449f765c
+a52df726de07cccbc77e81abf4f1712657c9261f65feee8815ef0e8a4ca61b8e470503801f1da8a23fe6d52f3306807c
+b5d239222c3d852f2c49997e76d97b70bcfe73d85e81258d9781f5f7de87f9c81648bcf58cfffd554e4685b2f860e6d8
+96f0193aecbeb1540678f1a3369401e916ee75d2a85f7124c555466a3def91a5d8b5f774e3156a163e1010690d457c5d
+886b9f4965120d942b076d053571837780232e139c3efcc6bd6c64eabddbed2d55c3a9a06001bd7a2ccebb36135edf4b
+897a1e4e9f4eaf755807bed984ef0bfea251740386a168061f4386819acaa337fa6d3f038b4cff9a11926e68f7888f90
+989d9706f8396ba422a34b55897b9e261ac1ba0c7a7a11a30562ebfab92473b9e9b604ea8baa6067137a4ded070fda10
+96376812651020f68c6a1f0aecd04591fdb628051f01daae179f7008ae33af5abb42e8f304662c9b6e2584e8b02ba6a6
+9344e6f3ce42ada6281d0fff654f408e61f0acce81e23ce47466bf1145a99cf60dfba9a22304efbb1f428c92357d644e
+b90c5463445156c8de69d8c35db656a76f3e195c325808396a829c11c06a7503f3c092816b3f23a263d56d3f2c075ff7
+b4dc6d948f4b67b513ce27fd12bc8efe43813c119d01b2da391d01c1cb0abb7d51350a5446e0a72a6f8bbbde2ee4b0c4
+84d208ab983941bde208fd71d58c7f9335e14db237cec42df453155a3a8dcb21dec8696a1334cfe5d035c192fc44e88f
+9577996c78372d2d6c9de27d497afb29c918bd894bfefad9059bd85cf2ab520ce1d517994724e1567f12e385c126f26a
+b778b9054776a2b8ee81be356050b977bc8aca0d0a202be91d56ba89d8a384bd29c5c652ea084709d4fb365b107962b9
+b7ea99f8c841678dc854527ad0c8ffc700b43b5b36b3d18303e51175b3901b144c53e22eea6ce7cd500f6879a80a8c21
+b466aa7d1a5ae3d9aea240c8114b3dc3af38f7d8f1e323800a6382de5766f19626d07cd6ca6eddfc4d71a43d2d49a07a
+8a72b1ee7993f16400396982b6a5198f0de08821431bc66489189d5b364b0e36daff5077b48aff1d55c9a88580cd1dc2
+a7c4dd6095f8cf61f42c5901ab67e9d1ad21a42d1eae9ca5e147a9396507c7a21747c2794f71ac66002840f4fa4e1dd0
+abe40e33cca787e7c521e2e97fb5f95cd4ca7ad6148a505afdc94e0c003e4903b1524164a1df2b2a1330fd800ac33b7d
+ab8e1930b1e592aa2379cff636e7fda9fd7f05b358f47d9cbadcfe35fbdee5bf06469fefc052f62159c10942ea2bc5af
+b28edfbfdcc27c3892d64e7e05a2aebb173808c020186c225590b03d91dacb866108370f2c14ac97a6d20d95a8e32f8a
+97d4841704bacb06bce2778104e4437c930fdd9320d85cac383d11ce9246525ad5167cbd63ef04a8ea39c8fbe3d88169
+b4b178a1c3ccd3344831936b784203919cffb611cd18def1a52ffa2a8e4286f9f9681bd48dff9b2abfe62da5fd619fa7
+afb01a4777a128b02fc22e282e0c4ab1d86246d8e0813a7e85c51907bce079766ae40c31d3c440d5f99c92e89d3a683e
+91cd070a607c20140c1f35b25057bfa20290b1435e99c5b33068c4e5755ff8f1aa2be61fba28dcfc131cf881aa1c39ec
+aaac82ccda92c6090970f60a56668c011ac20dcab26347ad40585a60b5a9b5a9af883307c55526d4eca1b110a079fd3d
+a7480de83b4cbb2eedece3d3b27b8d934e9183f448d56d5f49e0b63e24575014a94e09d406d7ca5afda08da9f4eafbc1
+8e568ae356775b06d963b440f75bad9b5977b7bcfb8fbd1dbb4daad5192521bd189674654d4ab86ded4a6be5fee27ef7
+a501a84cd0b4138383572fdd09242e3a748e593f55400fa7600698d4f916a2fc1feb96557a34f4ef0f13eee580fe9f54
+8be0f6b98d52b83e9deccf09d05fc4a7b4ae1cb11972f01baee4fabdb804cee2b0e9b44a1385238f755d2c1ce395cfa5
+afd01e3658ed9204d39fcdda2d79239b8c45dcf80fda8a680a8797b6be294e7e8bf56ce345896c3f08446e9a2a053a61
+851f0def025a50910bfb6c2fbe5ca62a31426747d9cf4634c8faa714a014fa22586c3eabde84e23ca77371ae25d720d9
+90a1aa7bbe7842cd361d0ab2e16203a56318885d2d32409370ffb64ef0ffd3c8c57658573a0714b04dd1595aabfc8f21
+af56f30bbd796de5cbf6f3d041c2f649d0f36e0a1335ba923eb1487e0b29d0ab307a1143e6cabb79674ddc01dd9a5cd9
+8429afa5476d0f3a4eed4104fdeafb79f80e94e709b59aa44b4caf0a94bf75fb3efadf76e96389179eafc389fe896efa
+91d8399bcc3b82f0044b9a697b2bc402285f6d2e7b76eec25ffecab769f3fbdd45d20897d28a8676f090edf847eb3c70
+a06f8d37404ae58c35732db58c4c6270e4311c691ecaa7d89b3e9b2bb1421ee3c3cde555d066340c0f2479faea1ae162
+8011fcbb711ba6511960245c69a73fa99167eeb4d238426bc31ce359a90a2339d5936042b281f3ff3eb976357db96885
+8dff2bc19830b4a58d2cc3c1598d060da34c8fde11635062dd4222c96dcbf2bef79b339c63fefdb1653153ef9af79c48
+84ae7869e2405e326bd167249f89c2e018817d3edf59f3db8adc25f64836ea4606c78158cb30020a54551283bcd9f39e
+b7be6cfbb7cbb7788fd60fbfcae3504d441b0af3b46317944e00a23079c605c08fd116311432be5b378ed8a11da219e7
+a3656ce4a79484e365b6b7f81a9dd72a09746da16175a61794bc5fcc0c3dd608751ea2cfcf7bb0c14421e0b05d94df75
+929d5603a936bedc69ede2d1277692012d0c820a23915ac6e776b832b9f4e0e6276fb3b257c7abbca32ea166d4482149
+82d47138de8b6ed4bdaf69526ace4f6fdc50fe5abee63f1c6d4447fe4948a84a63b7963c8a65858442856e282fabaf26
+8f8b2d05e77e9e4e2cc5229ea98c5c02ef9d9b6939ce6663d98d8e2dbed73af3d41628662c354972c1b48157f8d3c459
+9353ee31f477b51558f4ba5ca437d801f59d01ed995a8801552f8c578d1937997bd76c31aedab99fb5532789e72469b0
+941f777fc9115fe948f3a979e1ab87f133238935acdc19d33e1d86a1a64924eb9008e91bdff8d650f5e3ad06db931234
+8ee79ecb7d07e3a5fb80ec15c085898e97876448685891e09ebee9aacd5cd0147715dc60b6f75b601fbe83598f1a939b
+a96a50de4fa25367706c99abe9dba95ce1717483f50692bde7c8c3a6b427d02d59ef6e8bee82762fe774f5afa528f0d0
+a451ff58246340157fd94d028ce1ebe5ce49e5ed87d9b61884c8ad903ef9b697c4ab9e5acf66180a89a17749046c99fe
+b12739d77fb96e9e93065fe279307eafb11c795da2b9efba4cb239425faf687b9762235700d9f2cd5df9cd9fb2b36e3f
+a665e34895d02e68f1dee7ad8090558514720ff3e809cf46cc06d1e1274d219fd08781fd430367a3f09e2c591dfd7cf4
+a262410cb60409720ce68935e91c743aed5eccb4a0427449f32a4acca103f9d65413290ffe2cbc895e2e1cef96ba7c6e
+9597cf4d49db896796132aed4bdfbec71ebba08a617a611d1fece75bbfcce902e8ba228b662d0ec5fb927429f082eb38
+80a045d2bd30aff2267a5385be12c646b65b24a586c4f5cb1bdb81387e3ff8edd2358cc8e3c4c5c60cab88d4dce61d90
+80323f4a9fc78bc89aaa172f739bbd4f57f9321a7b8e9eddb74ee5c99d6c7b8dfe847f7103110f0a44d4e7c20ed29114
+943b749ab77112be7593bb2ac11094c66c94bb89d5ee2cc05316ad623a3997a38aec741ec93c24770adc670b6ad12e91
+a8e1b4935aad8a84112a99fd5a4d3786ccf1c985aca0b256c46d52a8801a132024391431cc2cfee760c25eb18289041e
+8abbe403bf13bad914a4d5bb0c8709f5b264a7a81ba0542850cb89c3c45bc294f62b22a36d7f829ca80830a3be5832aa
+9084defe85d170967c08d1f5e74ad1dd592c2b013b01b84b5fe3f2ceb260bde2e52ca22e4006b07f01e3dc7a36774e94
+a34cf1cfca622dda528589b5e5e36a4a68cee7e18cc621736e3e165b06a5df9a8e9f3ddc406838c1fe94ebdc44bfaa18
+8c5f5d7e98828d0a063d90d5f78bc493c46316fec3245d47ef8900241fffd5316e0d6d6f1653cb3b22bbf05286736c06
+ae7f2beef46b6645a6d0b3ca664c826be205ca6de35bd2809a4871f19368bd2c009ad7de0cb4c269c2934357e87c7f64
+abae2cd1ff7320d0803b6b5345ef9dd364fcc001d91fa456199dde24f474ff3d0ce94d460be9659caffe7ae0a6814217
+b86710fd69a6eeca8a813c7c1d643b487a32cadd70013a4aff4b7331ec08d1469fb17a06d06926e68f546e7f5238e1f5
+b42e9dd8d0f12f95a16112ef7ea60e6f4c76a39cb64e7f6bb4fde6ed1fc54fe8317e93160d736d97d87ff7af69ac2a41
+86e5561a7b621e68afda9d63945dc69bcd615cc099c84ac51ebf6350b25c9c07ab371ed5b160a86488e8213d143335fe
+831c730524214b8368bdc619e5c7e55a0731b6c5ddd035e9d7cd90577a472a429e779efb0ce47320c8d3b62997eec0de
+a3bcbb6c321b329ea2bb944f48ac984f8bb6cbcd38a5f80e8780257765756cd902d252a51804879104527bc7b251c1b5
+8b1a0ee0219a010653f816de88b05116269325c42811d717544468b3bf477953900394a71d56b6dea13e4e6ef9c9c5cf
+a5d06e2a43d965e47d400343c093d64bd5d4adcbe3928093c80439f815938b9e952bf59da7fb26f459a5439fe60fd49c
+b92df54cd0515bb9868a8dadb2a808d3e62fec12be3c708fa6c845c833c3321017e2f8d71f10b064fdde02b098e22962
+afd8fb1d8ced274650ecb6c370c5bbe8f09d263391af7c2f2290b5c99196ddeaeedc8b9b6173b6fa349872f58c83149e
+b359418883d3425b1bb896a9a9e2a3068c19abbb18ebaccadb85dee713b14bca5b83992cf239cfbb73adbe2f07c63f04
+b8cb045dcb0735b02d6e81d9aa9906ab2f19df2e2adb5bff0533022c03a9a530bb27fcd45173faac63a8d13bf0f41565
+b8b8ed443891d3ecd807d3f92d8c2afe714a423b97019cec3690c24002cd0444548ba6b454e1f9934f01a419206896b8
+a3c28de7e71c54dfba701b7e1053a1719032bf48d0e520bf8d513d155d588d08d14af3cf1e9ba3083f8e59dc947ef99b
+a94d1569107e659db2ca58864eb8feb03c83ca083c75a6d949805faaf7095a4f981cbd1f89a464aa46107a891ba758f7
+a9c98b0501a8c5102ec0daffddce83ab40bd097c4ccce66a8f8a61a3fc28564ce5dec37940092640b36a0ef6efbea4a2
+a473b784935b52ce73755894177ead52cd9f2a10521e9c034298fc0461aa6cfb03d499812189eddbce4b3cfb58774a3f
+8c7a7984739a3db7b28b7ef10f081e2cbec93e1da39738d082898fc73e83db206fb52cbec476c9809c7de61ff5871b71
+88b87148a573e576d0a8fa912858b7a9876001d8364bdaa7dd2759dd908555119f6f580c0d3a663ff5c2a2bcb05fef99
+b169b58fa10256b2753221aa33dc4f0f3308a294b98300528347ea4e89128a1a1da502990c9f2d266fcc10031b3c5a07
+85b1f0e49528ec8e51112771686b5b9f18e4cab091f6f97dc9a327221fde48be87f59cb46e6caac6e1af1a8c70135e66
+954021598c24f5889a642b9d20488a04e3c78c5b04bafcd0a01f377cf24b49f64b1d820ee8a73f8cc193e1de9a106a6f
+8954b280ae11638d6e9c27f826fe66c0ec584fccefda8665f75e0699ed640e8e74fb1945753f84baf606d2fcc804b1a4
+899303d3bfcf48d28aa49e915ddfe263117ab87384f611bf7d555ed141dd728a39b97eca74b6b623a20d44458f35a157
+8d792116aaba18c94069cbaf0da373c4e61662189e8bd0f24dd675531ee6f99d574f91844ace86e3d018c4603ff0e2c6
+876c457846f27161c796f2d063aac7f73c2197ce707872c828af81ffabe91a6f353c6e887464c921718425d046c0a722
+a0382a36d4f8007d444643bd5d85d0b6c3c892c7ef8158f51c878b13af6a5b7c8b098ac7a6e3241a6e13b4ae987addc9
+81d668e292ae20a5a39b55e6798255c39368d9b83ca46e986c343ff9cf4f3140e3f07115995b8fc2554dc0372e4acfdf
+85e58c950d8089ebd5d0a9d852c9e78d1e066c4cf1f1e64b4e76356745d3eddc13f1abf177dd32f0aede2f190053f8c9
+9420d1c470588085057549b7e6544aca2ca329ac9b232187d8ac894b7a878d6d3ea351357174089943b43a83f057ab8e
+b6ea12644c6ae73b8b9752f8eb8bf06312ca14d93fddeb5f79b92167ed78338964d620379387ffc9e12ac0e323f3500e
+82767d1ca19c7672d38216bf17a8ca0a52aed5dca77684da56419430f9129ed25b6c547fce50c834746cab666ddd43cc
+b1864c611fdb1b641708a5be8140ca0ac52d59d7c3fa3eaa10bd815f7f5e34413751f829f5fc0faa259064b73d43f4c8
+92f67f02d17a1ead3b01478687cf26b40fb32f055f3b34feff21de083852460e02afb834f61c37fb91100709891379ac
+b640a52bf00e4b29623c9b150635391b4dd42f0016e827daaad7aeff6e6a64fae4d67193664bc5bb368c72b138c76efe
+941c8aed9a85a005059b83d35f6a70dae2e2b5f645719b567de0da3bbf1d2b85704ac977970a7206bd98609182090160
+aa976af6c9809550721103fc8bb8359cc4313f672421a4ddd760bc4ddd86a036c1b4145049d9c8165335309fb608d6e4
+afb11dfe01bb6a9d2cc2c040e18152645b4aa972fa01b6cb4285312bcb11a317107e743efb53aeb4bb6f8a7fb7741f50
+95f8f780fae2878792aa3f60eab8954ecb107942bf07f0e2854173595eb2d4b914f4aa208f98a63b0ebcfbca46840123
+b1dbec7871209fea98676e68d7a02dd82179a74e389bb9dc0eaeb2ac2d446d26810146586b637869ddec4caac8281bcb
+931c9d571e50dfd2e1bee0c36f42085e4aa4e7d80a1c3bf99573d9d09ff710f6fa27f30712daba107d43d263b226d130
+b080bc730ed34724851d00be3bba84093a296d6320fe7671a83364ab1faf922189ffe997eca0e1ce4ac2c4435d7b7f10
+8dbbdb4f82398c891d16dbd4169716e078de5d677d3d550fd3853ff6ac8d15d278f17a2950333545bab823fad09a4922
+a71bb5b71699082cc45037805fcd95e410c29575d229a556a7c5f2969fb6f957f0c63861048c65d5b73fc4680a5c3c70
+b5bc06a742016a20c60d61cf55006cd7c2c7b8f367968f279815087b2bda7009c1773b9c91b8a4b78717b2bdf6a5e96e
+91aa31c68634a81c9784d0d6adf4dc85c981e122635d4e1f25604c8184da860b1292d65324d4bb9bd8a002572cc96bff
+85484fa47e235410e2ebc49f4dbbea9847ea064f6f6776dceb0d868280fe88bf6c5bb72e24c0ed3cb0a3f1d96ef8c9ce
+88ab35f32986f0bbd8502dc81506cb18638298e856934fa374480dc455463482ca780385537e7ea73c4c863107b74f7a
+b3022847a668b6d5d52d0af14d594c3e842afaab5416e3ffef21224bede0e1bbecb0799ddb7e095623a3a6f28b6d5f43
+8802d0e6e5203d0018d243301c57934ca85a002f91e5763b2f7372816c7b3ddf719c3b743f2530d9b7330f4f35d69d83
+85709fddeaaddead7a27d3f75e5ac568b0c9691c797f1505f5b33678158f5dff96ab98b921bfbc83368c6763420bf949
+a45ddf8ed1c273d61578bf6830fabd4927f82e3efe7732d64a1c82887b9693dcabdad1e7a65f09bde459fef89c0eef82
+970fb837063e059b1c2b4ec88011131e8cdc459daa1e704095bd327b7c94115c57cc1d9e8b4a29d6cc4f20895e309c61
+b789aabda019356bc5c5dcb015f8e7c5da25150988af0d44cfb11d8702da22fbb43f69c4af889dddc0647745d162d91e
+8ccd44696d8c52454c833b0b256ed0073527616ce49ef25a113cb9f16d41f39d27e3bf169ef0d3b2fe78f2a5910ec83a
+9846a3ae6a2c339b09f53b6cb1262114d1ce2fa3ea43d77b04816eea6451e8620f0030ba428eff80d72d8e907c8f9e3d
+80c18de89a31e2c8309353be974e42ca97dcebefc1a914e76b57609b9cb7c1c6298e2ee1bb35ab9d587f195010d24337
+a43ac7ac3798af0923ef5bcf2342550aef8551c198a31b0bc9015ecb24fd2633bdcffd84a2c84f9eb72b4e67084caed4
+8cc1551213a33114c8e6b3e00c68dd26b9cb3728376b498c95aeec60e7506a3346641ed5297fd4ead33c0e42b85079be
+afb54536b43e311eef9f584b8f1074866f6d33cfc75a3294aad5aea870cdbc3c97ab6e849ef719e2e1e4386a8a360fe2
+a2c5a2240256c64673372b63359b646dcadb108d785b4fb16a165f4b3b0ab3dc3dd5058582b25ed7b728d56d5aa45649
+b35e3e4407b63edf3eb567fdbe03eef00dadddcf41b799c80a9c9e26ddcf0c6b0b9dc4df0a0c5d54bf31ac8273740a32
+a3ce737baa7e1c1c69931a5b2fe1493a06fa0dcfc0b819ef8242b4fdae8d63bec8d15561d4fa24ef6d6c3a326d0abafa
+910a67b377fb17d3f9cd1f994db52eb5f35a4aa002bc1b7208b259b12c64c095e4dd65ffe54772f8e2773923a890bc97
+908c5ee131dea3f444a9ee2052c93a657d28f2f58e604bf08e51500a306decb2db964f68e87d5ac2f8207cc4e92adb09
+8f3de5e756409b575ac2786590fc85de506f0adb51450f5c24669bb3a688f080c1cc37cb8e7a3c8db8e25c49a4bd76cc
+aa62ceaef91fdf09d2ac2edbc07fcc651584a7e7d7d93e7bd4bb4c42105144c2da32326b3ae320b36a2df8aed07e5610
+959fc29ce63dcac2b4dbe8180577cecf9bfbb6db6505d76aada43ddfde5f48ec8f6fed14fac19389f6c9ed3555ef7882
+984cbe54156763d6ae078d6a8205cb6f9d63eee390dc5990f5d8e85b9a19fef563653d3dcc190c9b18c2232a916b1409
+923b448808d9ac04488e8345d3fbf9aa57cc3b3f375af138b674daa0e5a864faaeabed08f94010478543f3e1248c699c
+8c0823bf2706d9aa4c074673e9d221eb021de2baffe8b703e64e676b6801da73440b7793254fe4c8c48d2ff395e44bfd
+93c9cb050494824aba0d57320e2d1dfc95c988bec46dc8d73f7036be9ce0d7de02e56ad1ea3dd8fc129100800aa639bd
+9339fa01caba0f4837efca7a3d983fda1f6a479f63890db7f7beb837e3f6535b1f1d0788884dbeb73fa657410a4ad308
+953f213ec904d4540b356d53eb88f646a98581a6deeebdf99a6646cf612e5b07110839d46c57b76545f6879f12371b10
+99a4576f12de20fbecd3906e48dcc784cdbdf7fa0843c570c6f59f13cf3a559cc1f4882fc1d31015304090f83306280b
+b07fb8b73793a236e58b7181df5a0a2e8d50c1d3069c475c6e178e32d14b6e75c45af60a8b54823c23ffbb316bd4a98e
+98781507866499ce396730ee91a08e91d3be337690f7195750bd43a601a8f78e9475d5ebb43e347934429a4ff3db58b3
+972a5a21354beadf80d8a6e449cc4f072d6b747de293f075b8e0925c89660db9195a30188dfc8b73dba02467ae02913f
+827dd2e21ca88891b9b37e10f0d6b6304438cd6aaf9cb125ea7ed822078a233f3e1b49a8bc65f843e9551691b46cf91f
+ad3a4ebaccc157a7b880db6990a937e2d230875f509ce864fb0b7ba5febc7f4668191bf3aa55b85f3c17ce8b7d75b349
+976672c981d106fe1835188e202adf6ce77314f8d7c8f797aacf25f00d57f8cfea31b057f6afcb40b9f97df6ea387979
+8c77ba87e3e8fd5de85802a764b719d67f4edbdace75433af7fe966d3d18a94778c4414572b84f98bc6b5993a3225212
+84ca9b0435001c246143e50487a55349bf38300cde86219d29199e2e9137e262a1619ee7d6f6c44b9551319f1ea8526f
+ab06e3313800a7dbb970145c1e89b7849db8a1e3169560fe2c64956a1f9d1d3157d531713a8d7c2213356b22fd3014ed
+a0d04163ae987227aaba1ae82f74fd1b44387501fa47fa61b66728a0697155f48bb44b9eb5e87050a5bdb7605038db12
+8e76d3e50853ba5945610251dd18736b8541bf72bd643f6b561cab1c028dd044c820fcf79a5b45882e7dde0ba6db164d
+967ec8fdee2e6d61f0ca2cc255f4e72c41a9c1a62150318be0fa508b424487d9254ad135fbe8dcda55caa51b9901eda1
+ae25c496f872f7380d9c64fc9bee0dfdc0f05cc1d2d6ea7747e166cae7e67c17a72a24a9e351de15f52baad355625d7c
+b8a95f3bc67ad2a2d3cfbbf2de2003b7bc894b3f99f0364fd181eb11d154a7193b1df9b671a3a8eb8bbabafeee2d1a86
+b79996f818d94842175b06650a1e7819cb12c96b6ba37e61fa14b67684c2879e7d3884fa6bae06faba009329db2b0d1c
+856e1478ef99338f144757fe4be68d935f0069a05b0a6209be2fac9ebc5cc669c6a80825d3c74801a54ff8b1a3777da8
+8024798b150aa722dc599f288cdf455479763a9bf776da74d5f9cf76026500e5a0282d840e5ae5451a0e28d507b397a5
+97cb767ebfc0a6cfe25666089f85e5a3705c108096a38151baa22308276ebf7cb3c04079ecd130cb8cae1689508d4bcb
+874ff07def0f8d32f2ffce7cf31a43e8bc5e633b279acd7138ae938e46889e486c092ac34924aed9a4e1f93a91994211
+ab5b6bec8c81133b6edddcd048fbd526d59fc8a1f5acd7aa72d07852696faf5e8d305e85077450188cddd43d6c1aad27
+8402f5173327a95438797cee3b107407e8b277759c942bf1b1f975dc63ab89b8c43f0f4ce2a11de6e5727e9952b8923b
+a5179a16297f7a0913ba61d69879014b9adb5e41813ac33acb8973e2b43cbc17a2f9a7d98210b39471a47b534f0eea23
+8f7cf3928b51b0b1bce18a34da935e7e2558595e4ebc50cc1cb698f0bf3c1ea0050aadbcec33786118d791218e1734b1
+81552a8927942591572429892e5a1572c8bc4fa7901395a5a2de3ce9f1ead122e4e5ffef6cc8434b3b18af1aa62e45b3
+8999a1bf4f22fdc884f9310e7a3f5baa0d32c04e887c51a20736cff3216f3dac5bbede43632d29704536d7f275b0be9b
+85d9952816412a890a3e479025d1c0c8858337498ae28731ae23332c16a788cfe51fa9836bee73d03b253803096100a9
+b6a736447acaa6f4d83998973cd2bc3e12d34c6c076880e6765513c04087eeee5b5dfe9394c120a85bec8fbe127f1f54
+89302db4ea39662024c748ff5b22108c0f34850f0fda476051a89a3eba0e02a2294a4511666987d89f3b3bbcc334fdf3
+88ef018d32e6b379cea9ce35d1c12af698d8241c4c7468a5d558099f5101f04ac8e49d09b6bf031a811970faf02ed0ac
+b33afb11f73195a7132430dc3961252251aef42150e9aa63a8c7cae724f467543a4afec289bf27e10ccabcad2f7f812a
+b706315deef0529725fa6c4520e5d320a028b4607d47fa6c4c8ca3558afd68ed65dc072a354d263d20405bb13ca119f0
+8ba035d75939c1a3cfc72a9ad3aa4ade105880345eaad9286a182950368e688a182f6175357a2e62d977ff7ae08959cf
+b47ca04b80107eefd3a596be2e990f5f021cafc6b7fb64cbb78802f9bb7bd2cec4f37755c451bb1fc8786a076e90bad9
+b6fb1676fbdf6cf95add7173c264b820042511e34dbcafa76273ef5e4500ad1208b274855985f0eff5196e7200e5a8b5
+8c7493894853f4e9fef5a0143dc134f03eeeaa10c80c5a72afb12f10ca5207df1c7bcefba6728d61f3f89d3978902629
+97d14d9debd4228be04f2352e57d9c8138d4e40228c269100930e2a3f6eb6e66f2f99807be0c9857082ff8b9a089049e
+86e327360a19f6ddc8d0362cf92fa84677737064a94d9d0c1031bae92b85abed36193428199b0f66720be0d6edb0d28c
+ac79bf758fe91d47d1ddfba62bba87f5e64d93f82309d4d07b62d78ad6ae95908e1989299db99ec52c5ad8c8f3d7132f
+804712afd93328864a52a9f9ca1ae148de26fdec7d9f51d1bf8c0385959ddfb639ae0904c855180dd418ac21f9a8a7d0
+a789e15cf3c1e911fca7f6759a2c5d0a281c6ab744f29709b8d0623c1fc197ed9bf56b89fb0953baf261ffc4bd8d1552
+b738474bd1788f326c5145ca2a468d914ead6dbc338680f62ee21b1e5fed49fa501236d70dce5363a72147b0a8974c8c
+a34019db5e8d5cb680a78c1692978ce0f3f8b21c1615ff65f3d103ed5a1e32884680c90d1dc18f0edcd8a506b1003806
+b1b1f26ed57a7bf77257e2ab1bf314b22e47f8a4f4c5cd154beaafdc34b257e9b976b26c8d9f1508498b6e8c9e9fd2ff
+a5f645d7a75741f536e5218d4a38ac75f5f2d759e62bde2c9b628a4cac299b477a833bca98010b6c2a8f30b85f407250
+b3947ca7df831d68107713bbd52fa300411bc14362c37c2617780f5d621e211b8bcf5fb7099d903748420818d840234a
+ad16157ac24899485e7eae71eabf9e4262d01b8f8bde30d7c79fd00ffb4c347d765bf2b4a30c260c9fe2e5153a3e1c69
+b1bcde4588570576872430e704a64d7130f921667c13101c3fb771efc1e0bd72c4ad4b8e35cbb98d709062257f0ef59f
+ab45dce0e29201e79cb1da61cc4353840eb8b47db99319ff7802d2e18f00e3fa8d5e70aa6a797684b4a6741277ae033e
+b6977424f2f5b968a4eaa9dc1ac1018ca51e6158a6a4c189f0adc94ea1c2f30bb33c57960a5c972a1800cca2650e2f6e
+899f48fedeee4badd5b69632f78a244756458529f27c75d05e9c54cb29579abcbe4ff7567445ccef96274c8cf5b7d31e
+a8225095071acb2610d28d9ce2645280a84c702f5f5040df7a4134de1144fe1a1b07d3e28d4ff5e2517b4b2bbae674f9
+b48316873f8245854568a37ad9c5fe9d5e6d9ebd60c9cbbf9e6f63c512bd8568e3a736039422d21d383378c77d8f10b7
+8b40afa65e47ba365e723b9e24bd4a13335455e059346187356ff9abe99cf71eae383ee33bc184a9ec17b32d0800f158
+96c3b7ad1e31b8d4ac0e14358655e21e687beac6f6b7b48dd3750641315ac7088352976e9804b9c625a712f9d4fcfc4e
+914dcb36d621753286340077d16b36bdaa1414eac7a8e7ee84404a37f8fadda837bf4c5a932e8b0f3e8e673832e9b3f6
+b20a438985a4bdaea41b98e831537027f4bf19ea9c1ac5fd37546eef117cd3d41b9c1b125d2302ae3d41176ab5d9e9dd
+94a4cf3cc42d7055b55cf58959a7715232a273e66ec6f83fbcdb79d01769f7e6b1e328f6b0a910d1f8cf7a5ba4934779
+a62b07dc466c2f83dcac7fa98215ce5bece548164e32b4bb3aac055b3c0aa68ef5cad58bf7d392e3b1d54ea6f0d9f0d7
+9870784890da6cb0223daa367163cdd41ead23c300d246d62debe980fc3e7de0b42576309ae35da914474b8ed2c5acdf
+b0f28a74169391fbb179ffe8647f3e6228e75b409c49ba81d34ce780b12d408d2db5968e9664b9de6a7416d2f6d1c1cc
+857697b0222cce1458ff591e1add39f5632cb3aa2e589a64166738d8c00855e354c2ed44c4cee8dd707188790fffe6b1
+b3566bb224742d0871ec5d15ee890755d7e6727aa7e2f374abe965ef8380b49422897545e2cf8fd3f58bc81f05abf173
+88271995f9c647da82820b042e59011121ac723b4d0a2e461cfc1351d89cc10eb7d18830adf1c7b9fca55ed3e910aedf
+863a43548db29c9cf35f24c1d5f7aa984ba21bb924dd9e09210a1feadb1e0ddca98df47e970c230879faa5e7434b118b
+af5c71b27157a2391247622a5029ba11d17ab4329001b01b3236f38d67ddd6b8902aebb48ee9c963983c16f6d8c53d26
+97abbcd4fff0d1ee2ea777788cc146c1b32601fd93a5ff9908fdc2de225b954d8fc0c9874c258dcb90ecc7fd169823c3
+94129bc418ff5d00ba3a3389b62986fcda5714ad25d25091db12a66e138a35a9e38999c4cf38fe7cdb1340c099c467ab
+8a785f303473e763578a5bff75a069764e346224fa2dd8ee3105ca779cccd5939ed8c21f7369bab9947a4ca92d3b605e
+b37d1644a00401b213f29191a238f4c9c32ba550db2ab3b4c9d1f02021a8f6972ab0fc76d0bc5b9c6291d5edb9632658
+8e42a2c87d7feadf1a2dad9dc822b40029eeb8afb785ce574a340929c4c6ddfe4d750bd3a482e62bfef1bdfdc36f5bd9
+8837b0408f48c8b975ae777b0516c569dad0daf607da51f187bc2c67d3f67315340848fabf7ca78dfa46b05e3fe33005
+96d53e8e9b14e602dec666fcbff8ac2a7ca0474605b294365bab5f5228d8cf0a17a772cf2f37f7de3607f7ea6127d0e0
+b286888ab9afd161a714fcb1954f6046754c1e3e398cf639bc215327057ae68ed69113481da88627839b551cb9660be3
+ae5747c882d3ad685e481b0b42907f0934a717ef5b0bcf110fe3125d40628959b879186464f95bc4a69d90754034c141
+b1ca38e7b1f87e4c878d4b878afbca750fdc2509f625a06871da830c1f68a6cb20dde7d51ec73a78454ffdf54451ed47
+82225700e9b32f416618b074479302629114761fc721ff492d792d4d1a4d6fec887185aa81395703fc8d07a67fa4d87d
+a132ead3cac6087bc7bf5153f29ea858a115249d779419e5c52f4d1f2180f4631caf45ab7cf90129af68bf67665b8dd6
+afd4778ab2921b6c9c3d3e2d8ab7e33882f7fde3c8f66d6704f0859f3bec468178eb25a103b78ab092de5b694f2d2ff6
+aa0123ab3e8af146e974c9fc72dce94554cbab212336c8aebe618ea082c15ef02c6b47b6c575d262d1cc6b0cf2d11f47
+a5e35113393e82c0ff3a39afc99a60f90993d5e4995e5d21a9a395ae31074ed5e2244214d4dd877c3d89e52fac6c4252
+b2f476cd5d9df15e624713f22716ff01790f2fe16957b526677bdd3d203fa8af98ae58daaffca10f84a7c61e29ba1d79
+82d6d062828337677ae19ce13d27ef45ee55270a27e674946c7c1c762bf43af6391d77454dda4dc613b519f4cde43636
+8e86b1803d4ee07791269ec9175dc3d3b595197c089551e5bec3edc55c77532235e64848aba62e43936d3e9438635f5a
+845b7233e40eab725c241853013d1884d782457ec188ff7ea535926c36da0893882fea2c9609f96b6d85392471b71d2c
+a2090ef73e125c0809f2bddcdd7b74b4f4eae452d76afebdf47691d2afacd1db7c6a3032e9a4c4ca744bb496258b8ead
+98e759616bf468bb4feedbebaa8df381d01cb4b0009a5ca5fc980426e160698abd6fcd2095cf964eca6f8d92fe1bfc42
+8a29df48ccec0ecb8b3d904078897d996ecea1d2db6b40b79fe51bc5dad04358d7f7edb6543d7d1cf0c1f54544c3d85e
+9422e88414d88e5d84b17f9d2f1c50fb48e9c5b8de215dcd7c52bb26a6ea71cf92c90f3004c4fcb34040eacf5b60b06b
+a643123915445bf0e528d36dd7f2da9a3b993f93a7fc9f6148049fe14eb5a0063575d971ec955aeffbdce069d0bc2937
+81741f92a157bfe12aaabf0d81121e5a8c7df2dae86f5fdba826167c4558103363c653a928babf4ad7e3e80634d26375
+904fe8e258be2500bc5566c3890a9372c9404935ba19396e8cd30289cf02bda13ff3d776bef56dd87ce57aba0a8539bf
+811997c1d70feed33ae3684eee512a46ea91400b39638d405a8bd6f1d0169706f48d1c04beb1c5afc5b10879390a1a0f
+a4fff30378dcf1f04eb97951b85abc0f5257b9e53b7bee814a5acf060919d73504db14d55edaf54e4030b4c1d7278c57
+ac84f2568084ee7a715b2387e3fa3b15e6940a27ea99b4fc9889c828179c55f29992b68d719323c2ede8ded3a4e16553
+8fa542c15bd29bcf72a34b3c56eac1e7d4e4f3b15b82672cd956d23a9b9863233816ffbcc6738a225c86d9dd13d1c3d8
+90d94517e7f1236e49ed6903db72c0de3098b42fbc76afae7abc1b09a903cf92cb1bb6a6ec8c29331e05b8946c2e9e2b
+916c0d6b1fb7c74c0001599211ca37812f30c309cb6cae529c876221c5e7187876d37268776451df2aa44f91a3a17a11
+b9ae0c4f0c00e8b07b489e015711346caedfc7cbbcb36acf3a2ffadf2a8f11118f93cb70181c27443d42634b2f2f6d90
+97a51eb35da8b67e82d55fed968ac9aa42cf2d1348ac146d534344c4c7535c29ce25dacf9901abcd7e8c43a83e34e25f
+b2f035822c552cfe3325da99f28aa31b847477a644402d43379947ee219fed751497cfffd3536c91f2474a94bf758203
+aa2fc0777c208a2efb2884dff33c459f2f6c9dd4cba360a65918c8604cb02fd493c8e5d26069953bba56039f8bb694ea
+84c63bbbea15e06775bd39f39995afc613586fcbaf32c9ada1410dfdeff09b8e7f3dd0c99b23c678ee72e44543ee6443
+8259332662ff222d4d2f817bb94033d458e650e5f6e2c31ca84c6f3a4b3d2e8d1f40593083337a17193cddd960ea86c7
+899fc292aafc17d01c06cac50a78edf1f11c8c3253f4b32116625537351a1e82ee3cac67725973e3563fdd73781985b1
+92d3b9aab29854556666588d94c3b49d159c9ba9046487583469ace7a6b8ffa61164839dee24d28dc2fd36b9387b6225
+b54f62077e1e42e18586a03b3d3fbe3fd680dda6988bee8aadc95dcde46c215167b261433d6cfaad8e2b3b6207662af8
+a6c021aa10019319f944f8a77455ad5b153a502dc9eabd9d306be3830a4fa2539e3cb380355953c3581f12348b919214
+8cdbc2c995699cc83768dd23383fe492a1bebcdfa55fc4b9d1113e510a6f4432ae55fd57db732eb56265dba6ad452c46
+aa474f1710bf6556538fe389694b4fb737713dbbc9c93d8a879dd3aee8e004c2441dd14b5f4cdd4a98e804d031ce00ca
+95448d62b1503e71d47ef4f5a01c60c938fc3cfd9280d7b6d3490ef331131130630425adcc53c9c96f262a80c3251e4e
+a4535757aedbf6d7b9bbea99f4bb7bdfd1c99d5d976bd8d4f8c69ee09c9902ea81884d8b6f4fc084e12702fcbb9e4b3d
+87796bbc38d5c2d9a56a65ca91a40530b57fc2a768e9e08a2081734bde163f39e069edc99e87a84b539606164993f30b
+8cb7647e60f023066c4835c956186b9e997a7425cc38465e95be568ab448b7303977c7ddaca73b78f6bc137f25e5e020
+90584dbd8f672a349682effe2f775f2bccb1911b06d20cd02f3a6e30311c6678e5082ab87ee47af72e0c064a43592bea
+8886147e87a552c74767faa64516438d6473ae275e72b4cdc174825696a4d7878297b1ecd0fe1a62fa4559ed232e9e26
+b739745959c324a62943a225140daa51faa8e41c8e20ebd68d6f000351101a89341641933dcb2ac5b3a45ebbbf7fb26c
+814f858b4c709694472eae1c82cfb7370191ad6d0cc5aad69084fb8e9d81e90ac2fae52b4051af25f1b806c273f61e0c
+a00426131acb84ee08684f2fc2a3ef01290e48e6b5f96bcb0459adb62f4190a4b2616eff2a2712991c48adc551ddaf64
+b37a1e92b72e3ba42b79dd997bbeb031a392e42606254965597ea4b8a2ca51f8c324619fc2b9f886e17b632ea3bee629
+90817db93eed264f49445d1d3a14ddc0d5ca93191b6baae278b4c48231a56b25725ba6f7ac0e9c7326755f0082b79587
+95b7f470ef1630dee768698a31398e8cb407df3b651a15493c38f6be6c7eb387148124a2cb1fe1237117617017c12203
+ac49be639391aa5dc08e8678cc690ff617e9a0ab40166285f90c2d889c87ac70c455a972e61cfc339db59be4394a0ad1
+a6f5a698508f8047edc45bd605ad4e88245de20013e7a4e51994e99fc60d81dc945504b24f23f7241f28059f4b5d6756
+a4d30a6db06153074871c6adb0ef4e562c1491c1f9841c110359dc41a3bc0bfcba3b49fa53c29b8258a814b8ba1ba328
+b25a500efa7d38f797395cbec660250f4a00d104459cdf7a15b541db3917e26bb7568526444d469d363040fd094680ab
+8444d11f8a0c686e2b22642ba1b28cc556ab7311686028e3fb4040fcce22959b7b6cf244b77c711ba86e350e17411823
+8ce90bfdfa93cbe58421be78e30e471b2c6e6beb1f9b3f85031cbe269305e18d25a2170819f2699346bdd735b6f5d664
+b73970a3dc993e28b71bc236b3391acbd85a8cc622b79e669109f9d3ad7ce7a01a8686e75d85408c54bb70ff9771ca80
+a64cebe05fd027069a18f152a18be155ed65b6b563696e395e045c8b2f0455fa75c2ff41c1247e596451b36ddf258460
+afec84a7a480b09cecdeafd025ee3ee02e3b3338b02d26cb3b7575ecb895057650f0955978d1d732ca2e6b391ed97728
+8caaf53038bfad6e0651e61e9a44a39027d456ff3ea46ee9d8e190698d5a66938d5c5723dd7bc75f0ddab660e178383f
+a91607e39108d2540b4b5c9d33d96328f56ce9574ac9d1d4a81ab5c938443c3d7014e19f77cd55ef7be0a408e44efa43
+a3f4c6629a3c0f34ea060a8b976096e6fd3a91c24d2b056e9b6b60088bb0c706e25dfb31079f42e0ec031aa840f46afa
+96b9c7d3f47ec35ab0270cc57841e9f3b3f5bce3d26faf6abf6cf657b6e949ce0bd1ccdcf9d490beebce722aea48caef
+abd2433b4003b7d861b35e99b51e2eedaea4831776e7c289beae2b561ad69a771233e3d6bc4a7f869d0744c5be61b5a9
+a989e5080d39d4031aea86c03b77abe069ea9b7fbc515c6a79c825eedd6a9bf6a0ced1891eed20edc605f9e25a691f74
+93ca5b311d28e4dfbf4de84a1e1530a9153599e0853c9abd3671a1ce04995e00f7d3092895461137fd78c72d24a99494
+8acebb0309595f4eeb990b7a1543f0633690b7469ce89884d5654a7bd2d2543f09232693a04e1e1b445e6e0041c8b242
+abe3858cea5a873a7576d641571965736d55d46f9040fec219803740dc2a5b43c72689e94c9b61d3c3c44dd3a821b694
+947cd395aef4faeca9b78b6cfcc8b2f8f361de884b29181266fd95b21ca6176e7944058e20cc77c7757fbca4fe445394
+8c2e50234c75d645f3c887693e2439ef42433eff328111b9c37aa3ad5a3b21678ee44ee2959a91610006b27a0f5363b2
+967253e02e34069ac676063aae9a493bc6d52b8bcbf1da6243bfeaa9fe05f8c840ada0a282df9c0180d05eb866402441
+a16a4c9a11686a5294d8329983c8a4aa0e6e5ad0003ab319b493842e8d072aaef45c3335d9a64bfde6bba120a48a72a3
+85187b866fbc72e5b42b91d76e7ec2647b93bedecb060b7475236d7d152d17f901c778b704f7c2c1d3d269341890c233
+83b192d925e3f4a1fafcf22cb48083b2f88632ba93c1d498539bbc4997f61f74a0a3b8d4947253a0daaca8999c407b87
+8338eb3e7f549988435f4f618f4ae1942c6756bdc28a80dba7ccc530bef161c0bbd20f77c8c4d63c94e60bc12f7cd387
+adc869c5acec5e58459eb804c2141e03e3582ce1fef7d40fc1dffa3ca0f923919e291a2ca4a60129e2a470cdb395be31
+9279068c28840f2c34e48e9a7e7e9406907ac14bdf4eec7b8c28ebcfe16a18fcb047015e4309f19e6fd73d6e6c454157
+98c4fb637a868f161f2f4222f93f3bdf13a61ec1f4e4c20435c150fca1bc0c01c790da91afb6227ed2a6aa540d70366c
+9209fc7b307f40294bd9cce166277a7ade9c64277c600b3ff09579fbfffa471a887061e9cb5fac97c423eada30a8a52c
+b1d63569d5d47d052f3a6e8b2c390bfac1e92098291a2adb209f20af875ebb2a8669533155b1d15b232690e26d399ab2
+a2c975c004e69e7b0f22636141d34adfb2dd1396c7355e95fcd0493e931eb7eb99b4df0f0f202945d7bf837809a29ed2
+818f48e65e337913c52e9256af134f4311be84dc332e3ac4cb5ef659b9c6e9cb34f04b0bcc0e2a3a574c9c3cc51d7368
+b92b63d0b363a368a348a4abb10661c38ced99a3132afa6cf002b81e6cac26f862c9d0a6886aede555d7bc453753cd37
+b4051275cef361cdebd254115275b0b86692d3802241cae5e2c75accee7df98d3165cd1de86226f382e736b12d9dbac3
+ad89d85749c23e045bcb95c3433eb8038139a51c8edaf06b5cb235549a2f9ad17589097ff8a350e934c8662a8879a3d4
+802010e6dbf4265cdb5b5362c0b197317f2435253237561a3a7bc6766f98b129ee06d370382998ae70080624fd65831e
+8ed6a5b601a5ee11e983035f3109075444b063aff693b3601f87c0d76d2ac253459de48d0fee32330c3785d38eab5cc2
+a6c8bee787c4b87137f70c2c54ad3ad0955269c7ea57ddabb1a215e613e250944cada7f241430c0ef09f8eee29fadaa7
+a3fc6a643e1ce110b08344f8913ea7f8c9e44bdf1a02978df8dcd3671d9b357397df9857fb11ba220521d1ce40064ee5
+94089626bd9c81247f45e25e573bd6bf727a0e1a7dcd630dd5e661f65d4b6f35bdc16b64da648dfda404b5eab39d9152
+88362a160a95f01026a2e52aee3521e8496340f96a35351892034198740d8b6159175c60b910a4ee05af488dfa578c8b
+b55a5b875f5594bf41949c212543517bb1ce34db3a896f93d0216813261aa95f73663c789ea0ceb2bf8815255bd328ca
+8f9acdca0158df5ecea4d574e0ef0c256ab271d9d3d3bb4100761f5062f0a1a5d2b8a23685097a1a2b2a08287a2e2c94
+b6d4e3bd49a17fe7d929b41fb223eaf93141453f7dc233eaa74424290014a63ca6a099174b687048d59cefd41fc720db
+ac0fa8aeca20a0b4189e96c57c85a2174338550855f9d0ff0c553e773a1a1c32fe3f8db7c8362bddf601e41380c9177a
+82f05710f08f12b206b2ad6a2d06161c884b2511ad90b43fbfcdf54933c2360b7c85dfa4f598b5bdce8809a803d483a0
+a2ca711642fd498cfeb897e4072d13e43b5cdb2480449975188fdfbd4b471070cad941af03a2dd8938d3c376366fd199
+90c27a1df934339bd0821cacaac41fa70496900044aadfccf6e5fe28ceaebae5cbc500fd6f2f88c5552b7fafea79d06e
+818651b7c7a6f691fc47a61ae4960bba7239007e14930f3a8cc9c95dcc0b03643047671f819e30d89c2d1891640fc13e
+a88f01062ded714e7f2f1523644222cd8e8cb8e535eda88738f4b4b19079f4f7be664abedcdb618ad1de3e74689042df
+8174282a183f3f393667352fdd60460d2199de16752c372a44465f8b71ca134c410d1d81f15afac839748447875f8643
+a358c3e53dd70e1a608f36a1fdbe225e28c13b5817dba890ed8e82adcb7ae86fa68ff6cbda7e02e8116c11587ae1ded1
+8aa0bc208a84d5a58b0206a8fe5ee3c8d224ccb86b11b7c9d924e16b2853a6c3623502dd60b94f8d720810e0079078b8
+8bca870eb6cc5f7b5f6b84f88b49d9a3994e61ca3f2ad963f28f925e58430887f5362ed4bdc2a2a38b5fb9e774a75cbb
+ab86840fe84b1eab81675eeee17f85a500dfcc95dc4872e57b39919ccc71b702585ab9ac66146d264d2bc8fa39338a72
+87c46966a4bbf2523dde607852a40b26cf3431d0bde9b2c609997c0f29c5932d28014026862abb7d4107b28ab8e2ba70
+a91666a8c846a9944ee7ab243ab535e4124ca8bbb756777609aad848527b354060c484acc19c333459c09012670f03f7
+b7145784894c6df87d2ce6a06cbaa713e46097b5f83db60e5449e62ed5bf382a7fc3136e5599226a2fe7951847527c4c
+951bdbaaa06ba8b427fc4ec6bb44e93e70692bcef6369fa06c7a6882227d27f09465f37f0a5868ce43ade188a5f37f8c
+b69662dd5dcc9ce7bf24be8a0e85e80c8e5af9b030e740796f91de548569bafa2fbcb19d98e13900c76cae3fb601a8ca
+9630a7eb15718a2324518f78f26a71e3c801a8e2eab3236be7623807321c128ccd79c74ab657ea8e115d6ff3078a6887
+a2f98c2084f8cd556cc1bab19398e98921ef56f6445f63444384efe5d7c895690c57d0d94cfd24e99f63f5e31859e34c
+8c3994d3cb76fc6ac22ba2049ea4547db92ef78f009d24f08695b282c95e395f2c1477bd52d3f569d64551aa5e259b5b
+b58571076faaaa547df9522b48c684b310500850339d79d2349dd8211bc2c8307d13cd5bb7571e0b5baaa013b502e410
+93e07feb14f691e66be756b37467f290da9a6677b8ff565964f010fc20ed9c58d8c712c4abaf012c787bbb22cd1473d9
+b4bc6159db1578111190b19aa678281eb2fcf7a82c7f699da7473720493e66e0ab54429da7af24315ed9f7399863c954
+93cfc98563f25b45c15a07780ae0a38c4ada52ffc1350233a3b45417c16cef92e7926354b761d0e0de55aea4c1314406
+820c37c923807790d77d2cec39f0eca63fa3ac6eaf0a1978522f0b1d293a5c46af3a0b4ca542cf39e796afc1fb3d7195
+b87fec722faec6a739355fd30a2757e5d184c07b5bbab8581b74eabc2da413faa6d11ccd65cc93f886c788239b1eefb7
+a183bac7f647a0c15b14089879a8aadb712f079bcf2078d3c65851137a00dd3ed7e47263c064feb19362f98180aa425b
+996233b2010c20e0246295735b6d5b3e932f2aeaf0b35aa3dee66b6296f39e2e7ee95a7e1a15838ff3389ecc8052e315
+85c943e09a6c77e15d49ef4fe57d89744fcdb705ca370cdf70b3d84aeeccbf2155868f6790333f88fe36e08042ce195d
+b88f82b35ae14a3e6fb972c47123236bb7db08b9f9f3828033fbf5a895b09b9b0de423f1caa04b3e8e754409b21f3a52
+a12c957409b6dd335964532ce3c045aabd280188b4d6ee809cef479e51dba030cbecc86b0ea8777cc8828c087006c5ec
+87227fb4299efa535240793cf0079e952e971a18ee62cd71a62d6a5db921da669c5d8eb1bbda318ed5f3b03b38798a73
+84b5c7585fb1c98d031a0bf6fa8ad5484c7766025af552cdd72e7ae59247deb845f8678862c44ebe640a7333cef8391b
+a94cdb0f42ae3afb4b1878f960669bd99008c7ddc24f2fed45ca521c60472e5587fa9bf97b315efee1f74619a4d9b762
+969a9bd21a6a90aa30fea44e397cc88118fd5abeb68839556194f9ab0076806aa320928a8ec94a47c4eade15498f5175
+b2fb215bbe7acc3baa04b0aa9be654afdc450faabe2702a0c9fa760c9e9389a58aa5e3a4c6af4f6f5c934640d90b59d0
+8be6a43071464e6c7dfb0e9a791a658214c1a95adc88f144d8349ecaa0e76b8ea5f88cfe95e82694bc170e49a43ec4cd
+b75d56cfa1f3b61428d24784d51dd65b78b977bbb52cd71401ac7d3c2643f3dc097d6e7668104af402cf7e7e6ddfbaaf
+811005c49d1be377ebd2fd3bea9771089a0f5675c55e9da5f31fe13cfc9d1ff8520f085918279ccbdb0363eda16f8056
+a487f7000c16429f2b7bd7e8bf4990bf26f666f8aeb11a99114d33e24f946cb0e3e025ec8c0b0721f9be101504c8a1ca
+99b72e711ba7b97083976b2db7b97346000a78bff9b20ed910eaad02f6c03b45fb3f0f1217b328c3e2d87b481eaab52b
+828429d387a0b83ac8e377b32db1c893a4555ca253b8e3159399cd053c5de726655a2ad39348c8e7ef11b37b0bca78e6
+835de10c73da7f0c07295a3306ffb18991334c86e5fa4c6df2d8091e8989f6454c8b43721b13696e1f665480a64284de
+a4ea48f0cc5915993c83309df99247dcd7df4c15c723d168759175010fbe8d84adab8393707cb338fb90a6a77b69745e
+9976bc842b06ffbc5afb309eef8964908802e9a5c733de4a8292d5d5773ecafb6daeecc63a8dc8847d76b77d4c3915ef
+aae89156b013e4adb4bd8e7b6007937f0ece09af077fd407798e4155dc09a129d44fe8f8b5f6cf6b3c84746181d7f4a3
+81891cf2d70a8c326c6870a8158edb79babf302b4f9d51229bbafdf038cee39b97f01694eb719df99a62478bbf909a85
+97bdcb526108ef3cc2205aac074ef3001d528f56b4889573e0f4a3a2504232adf23880f7fa2f57bb787ff30b89599da9
+9778949a95fc663c742e70596faf91ccaf8b5b93b78bc2d4993480722ffe10bab3c8df3ae50535d258b6e749a0abb86e
+88bffdb927dd88c1ba3eefe7da3fd6a42ae494bf282e094893e144330cf08e3f518f47aa1dd76d6f249cf83e6bb9d4a7
+b53effa345fe59917f4f1ae754e9f6b8fec9bd34cee85872b3fc47e52fee29c418b9406aa50c8d5a2e853d6f2056a49c
+a616775e7e77e846066fcea413f0023dd491d8176dc450b0941368680571cdd236f0f83883d268842fa61dcbf3e4864a
+8b5ae13dbbd07ad19bd2c7bdb48eb3c760244fe0caa73d28df3f0c31f5418f8b06862526f5a84bb16b2a92eb2c7ebc28
+a62294830750dbf43ea497155b185d611d75e767aafa8c2c30256f8a4875b6fdadaac429e8363848b39e964cab2aaabb
+94b6973fb87c2efef5efc0e7dd7ecff5ffbe76320fed8a20d730f9e3751efe9e5db39981f45477ddfe037e18cb971930
+b931b6f789947b5298c258c8f0b221ca927c447f190f0d8afe2f18ce9b90979eb3247e77e128a1d6c57d3bf5523e787c
+968259d9d001a08c0329bc19b2438b48dceb5942bc6ff9892d78fc36014f1b60a5ce7deecc7a808e41aeb4e26143aa41
+a52c1906f103e3fbee8c12fecd93f7b7d6f37eb733147bed841b32caabc880fd6e72884380a3cf93129d9800ee7877a7
+969dd12f0f6ef0b868e21539dcba5dc7327033eb546570f5bbf91b13f9c2ba6070da430538c40bc53a2ace4794514038
+a853a74380d78710c212bcfa92d3f9c433b8ccc6936356f3bdf923b8e420e1017bc530ce73bb8d04bf7a25b20594c753
+a84dfbbd3d9f409badc8ac2da5a0db98124df9d01bd71b1cf5b2b9c32866309304848a4bc1fcad1130bddfb9636c1b56
+a9599f55173e77dad54cfce6ddc77bc48588f36b79a98c156963a2f5397262ae07634a98ab9bfe1aa6357f78aaf89d89
+91e429b5ad0bafc09b5eefe600e179ef56f1ee045765ab3d5ecbd73eb201305a6de4382038b1350abc70bd1435151a0d
+8785056b83a726622c565985e815847b63745fb66b138d24c985d6f42d5762c61ccd5172d4a3237222c881e5f036b98d
+85869796ef180f500dae84f669b76a9b245e2ff4614a58d74820c22e439837b7d9866f480b72d88f44682be54c6dafb8
+a118baf9c17d85e22ac3315f5ba9aa4e230ca2a031906f99bc43fc750a0f96aaa5e6774d1cf16b492726a37db7b51327
+ac8e33f32c1cd14c6de14e75f83b8518bf1bf6f0a70e23ea0e5a29f096e2992f1259a121bbccc5252b9668c605240435
+97babe93e2016d29af74f776e167d82f1cf2242202bdcbaac4a1eba2b3fbd9e7ce57cdfbfe799a0f6a06a0e6838c4e99
+a70acd7e1f159adf7381d3f3ec2cc42b56232601f18ee62fb650e13a80954cd06d39a57217ebf4d8927e28c910671ae0
+b33ef5c10d0588df0b9d2d963912b294a2375a26bd25225f002cdc206a1cc058465c64180d348cccc899baf3d677033f
+93086926eb1be21ab929b0098767611bdf1a853b6b67045c14f00714f806f8655be37150be1da05c5d2e6d9c66057bf9
+8890aad532a6c9b818ddb9f1ea12d627010b4120fd4969bd239a9654a05116272d4cf783ff8256de337bc01f9b4154d5
+b878977630f647a5ed7c99f59ca5eb653cd647277b899b918e5f667eb17b6dc433b56c2f3a2a18a785a4b5a9ae95f372
+975582fadbc276c9afc4d8ef767a66684df5f56e898d2a8749cbc2763982c013e5fd0ad0ca7ebc67758124a609b59663
+ac45e154a651857f0464db38afb2fb25853e8bb1eb476df31908b13b4fc86491d4f831c0a15ed6bed0c873b3dcff55e3
+a778d373e361753964a7fe4e1d28702c62a919e5203b941b04b0e74cdd3b4e838cd9b6dac3c39dd523f3227f1b5e6766
+b1bab7994941f8de4235e2e188b302bba847c1618ebdec7fb782241e9eca8d32dd506d254d865e0319c66396535cc484
+8c4ae5b346325f1d1609328e41d20108c4388bbe021361a86a1f9681caf1e6fd64896d72641ba8c984e153537317420a
+8cd312c6a23e56657624d21f230a2c22d102badbfb2e38a8c067186abc5a459d0c78433ae7b54334591862c18864d7fd
+8739d71181c5a657c6fcfee1df71756c3b6b8c48e8d97460fb64eb891abfd23433ccd08574a677fff600ffa5519a2363
+ad3c8d1e9eaa6f9122fb14d323318bb0338c5f9f29c719715cbeb15a2738493930542769b596098a5f505359c0314381
+a6d78b78227f8c1203e502caab1213092f320e77a6e9729e1659cf81e981cf905170e99b56c4eed1326320acc6aa60fe
+8e5ba0e69e0f08a49ea4fa28ce0792f7ff6c032844ceef11be90b2215940d4b0f3e4acd5e4b189b189b0a0ef8045aa26
+b7b31957e7a85a640b851d4241c7b2f6af64f59ac221783b88c1b51cc4185f5ae6446a3c7137ee072c2eeb97c929d7ce
+b066bb41c5818d6008349dc6015ab780633cd961b5d947062e14618c1ee1abfe42139c86b77e7f5be0c275fc3f5b8909
+a6597158957e1a0af153183151fbc4c73bbf8156c77f7b409d0f97470b5e127beee6d9246bde770127d3e3ad400cddd4
+82a6de6344e5bd0c5ca95f3be1ccd42fc974403269874603944c08ae1cd3ca887e66fc51ed61da8b7af3cce02f152e6a
+89fd363aea11ddb2dc71288bb534a4a6e32feb5b9e4b88d132f4181f2579f8f8f39d19fcdb3d3d7ea118b9f4431520ba
+b70c945986c8227d239201857e12cc7cebc932c3bda8913c82b62c872b18f866313738788e11bddd630bb5953492fec4
+b4e3a1e8f82d988c85cbb58d9cec69bc63fadb4c1c9a09f36b5a61f1ee96baac1a9458bfd0f3250e1734ab3fc6c0a0d6
+8d01d1eff496e8bdad1e6fb4b60e4bef0ada39a378c8b57cce2c115e611e0c4fa54f9b599e4c34dac925bc06e940eceb
+90857123505746f7bff08e03b1a90f67051a71ba47b49e7bc63f1a8ec30e02a98aecf56465d3b4746aae166081099da8
+98b9d3b7fe1d5449bf6498c30036e3f60c8b90962fe04ede9ebf605d07497f617d99d51f0f0c0c14381377de765ecfd4
+891e7867e70582ade85730a21c19f6fc239760f76f8bbd8c6dafeddfaabd6fa4845f62d649b454fd3af8ae7028ee5f9c
+945136f71f290d8cc6bf282b554cdf8ff92200feb7901987a1348f2d2edd3bd7b7bff6f57ec25fa302a27121a1a959af
+b574d8379842467c5f3cdabc2da9a45e5a6083efd7298b077ccef2c4c3bab03abf1dc11507f4c896d745ffd41e4dd319
+946fea5c1b1d840c10a5a732c7dc23c2bc5eeeedba6956f85ad78fc1ee4a95b309c0d4a4919d1f7155814e3f36fe322e
+98befb2f7d0a860de662f28968fb6200cee5a33cd7a6c376405a9cc6f0718b90fcc5cd5b9142e84e95223a3dfbd10f29
+8c5f208ca23aeae44a056bc21e04b570c13bfd49b14681cc085d5b318e62e4c088f0bea9dde52376967649919b59829b
+b14478442f8e985618272d4c56d43a28e10112ea200b52fbb32b19a4d1eae965fd5ee1e9772416d52dc0e2db57d3ecd6
+aa308b19a57159ff702bceeb69a385f91339db7e683db991b1414bf3af9916d8e52dec4c492d7e8b5a5a011680defc1b
+a8ac18a1adeeaadc192e15b7e92b611c936ba9cc9aee01f03c2a236827ba527039c719f16149d7aa5fb297cd63878766
+aa09af54f9a5fab6a61552421c13ca62f99fae212a9606f8a5a050997271ab6dbc763390bb98d90b1af3bbe9e8d9513f
+96b8ce26b346a0d3fc99b6e463f0c619196cd85340b795fe1c1c0cd4f1b3a9f2bef5454e0bc7d51d75ce26f217460602
+a3efa46273c392704ba0718a44f306edfea03b1a6be0bc1e5c67c62c89671c650eb8ac9bacc35372ade6bed12321f1ff
+b484881108a43a1dbc16a6e7369a04286f896aaa1dae847b4019fa287c18e9d82c8ba4ad22cea2837bc220524a9a7a17
+827b63d83e15ef61d54dfc365ed8a4f9e200d526884ec4b1d35032227245410ad7e1b1dd3c1d0ad48ddc4720f0fb5e1c
+b513c3ddafb01b6189590b74d20348db74e400c106202dacd9ea9552ee2c642909a7a73ed7ab45a986eda3a0701be79d
+831f4030463c84cc6cced28dfce0b3e6b6ead01afa200ddffd807f31ddd4ab93a8699ccc9d26970407628d521118ba6c
+86312e006a800720329b82f6feb2934e2cc156958ba394278caa6766ee10800d2fb8907aa92346dcf6d389c4f66f5e1f
+ab6841da372a286fde1dbbc57cfe967cb4bebd6fe2ab9e317cb9f9eda04a4db0d5844ffa8db72eb9cc6bf311667ff6e5
+b8238dca3f2be29bfc4aa65a9f59bd4e2c17fae78114a69bba1170782b993afacee3755e768317a923fd32d860f6a74f
+923c1b60c052a3ed4736da7e84e52b0e9e154627cd90cae335dbdf05af109ceeaa016954d6e47fbfc40d9d5649c198d9
+96a69d18c838512d95d97735263a8cde752b2bc790b3827ce048e177a063dd11e2a69b86b3184873503a68170b2ec255
+aed7c3af469a93c22afb47a904bc70b7d88262ecdad48ea6a6c07eba7398410bf5a97a786beb11843cf40ddea9a37098
+a6b50f6369ae558dda3ceb8cc9d99382a1e62d0d9804b903086845479b9381fadf8d4595c2f342307c94d09e02e0ba2c
+89fd703d457580a76544bbaecf65f93d3335d7a22e93d14afbaa61e5236d9c8d8b005e403e9f5e7a103b0386971a5e65
+8e909a3638208c8f885820af8bca6ae839128ce0d902a2b7b6f9713d21da8c943a7984d9aeee7fb104df4cbd1092967d
+b41e2d7a1a0082eef43e886eab5e781bd961a83155d6a14d62756ab7144a208f4e4574d47d2ea094a7fb50d0ddd7a241
+acc6c63450d124014a1db846bf578c44e910436c83190fae428fc3125ff2065d4c6a1165aea799b46093a86126d4c483
+8dc63127435cf2f269a83024b562b3f4da18aee3399ed5255c295e6b80c357cd8f1887de94bcea29f84db3193570c417
+8c4cc72a98d42b9c5807322f596ac0b48b08b16ec956ea4a70c641a16a70895644e5b14aee85a4046673849249115abf
+992afaccf05d79a3147d2985970c1793459130ddfb18a9d31f3036c260790109c9ee6a19a812f5d55779c2facf87785c
+91394d3e84649cbfe018d9c709604f6aeed53e91cd57e2b29d0e84aca3c413f1e0135c6bcbc70784dc8985a30b9f3fb5
+a33fc126a8f9652c6905b1f522bee45848ce42d7f4c3a4cb3f6ce0e6e64c82de74e175c2ab6b5a867a8d42322d257ea8
+962d5fb816010a14140767c2486cd629f7793b304a96cb82ab85a867bd9a407bc8ed44131f87238c34a1e4ba41adb1f4
+b09048879ce26a34f56e1d4b2cbd6eb2a55d4ddcf3738c462329ba6726fc0a21b8c1bb55169cb8338b2debf20dc0927f
+a9f9ddcb86b7427e268973bc7f3239212716df394394fa535b9fa5225b6191d234a44a126766eb470ade18c469a2d166
+87cba6afb115c0b3a515b08cc842e7cc2c705880c82184174837c0a06e1687ef668609c2ca080840fff80282caec7390
+ada109548c449990dd8f1bd42c9cbf194a62625d165416ca469c334222446fad7a743b1f584ec3f20526c3c44d870696
+a69a0c58fdfac715311dbd37c4464f0475120362234f5366ffc65227e8178e037ae91efa5a52cda5fe28243f47390175
+98e726cf884c6f706fa25fe25be154afaecc0c3bcfe682a85afed225bb44ea07cd1767b4d9f2201358ef19770330f0bb
+988ad5bc57f0621e3ce1256720f1161e785371fd478c467c39e554e2de27df5ab8176508658aa90ed7179bc212ed0dac
+ad0ff6dbfb397da51fa4d9d959ba5819adbf1a1ee31f68fbd62ae07a9cbce0641588cb1008dcd0056c17d74e83c7114b
+94c703cd32b9f52c41b07aee3e3c19b8c2b4182da80487ed7991d568ea8827f0cdbd1e977d482dbc102c4de2058903c9
+906fc2a06cda5d82445e50bf475dc4ff2c17e64c982539c26545798f9e4dce0bd4daa8d55b027cc0a8e1b26c3e45cb08
+b09a51f22a9a24cde25f805cb18754e27d3d168e64db4ff13a202839a81c69dee8372b5872faa0d23fea283609cf4391
+93c908f514e97502d170310bc495d02948d99eca51e71f9a4779ebabae1431e1f7ba465af485546a9fc97c025877df50
+8337859db710ed7e276a47e90cb3912c829151cc2bd3dbbd4dd04acc90c9cb4870c44f4233b407db8240a93aaaf7302a
+b13b16ea0943e235f8cb064d6dfaba9bd8dac67e9b6275a4c3f54a1770b9c905d8855517415ef6489843848108dc85ff
+b28489f0de1a76839a898b8d2f302c95610f17e893a6e7f2e824fec773cde6f2b219038a3f1fa212bed98c97daa66d5d
+af13afb48d56caffa32f941ac5542ec2b7fc0d6dbc3b16e51bd2a8b633f0a041ba1e098d9a68c470da00e630f08f24bc
+81465afadc45ec24825cba7c9edbb36858bd2ca8f8b0b9d7240152b58a411b08503b530932e7b6ec3b0f8612869cb244
+b2e6b7438fb6f70b52b8726aa870f18191920bcb213a375817d100297b507908d79567d0c1780b3f25be807a8ddcb853
+aa7ed2b0b2bb2070b5f001578efb3d1085950c19f9d06584a2d31e1c235e6d6d1d7f081ca6fa2b0b0616b01b9a467005
+91a245f1aa8c8ffe03f7db1412e5466f0345196727eb8e6f98b80c01672e4260e90724a538d26b094e678a3d85f2dda6
+b9ecde963c8176d6a726b129f229d803d1a6259533e432eecd7404703c972ec7296ba35015acb1f4b5ab2653a3991902
+8cf535bff6e98f75d98c5d2a691a5d1aa645c7ea18d677d07d3a11a9cfa222a7b8edd048529d163120a5aca411161314
+ad2e51afe96dd0e942a7da5a37587ca1359fc17cf66ab70cf37ab70ea34f90054fa52503d6527e89e464f8058f5cde79
+97337d62f83ecbaa1f402c3964dabfaeb279b916ca08430a61fad6c31d60087c7e3a9decd541651a2b6e68fb2816bf45
+898b7581288bc7f97987138b7481d29e2cfd5255ebef133177d9060790a0973ba07de62cdf38568c336c237cb084b7c5
+ab53c0759663bd976de62f9f98fc82fa4f58c146b8a6a3053d4dad836c762063ad69a54d51b5499e9def86f8d4bd7ce5
+b35ba58109d44c14be159333b999c1e471fb61f5ed48f9d2a6bc689eb045864f3fe88a6ecae12315183703e2b1fc1ae3
+858a20e233f2860c24c5a3f4a820cac7544eb3ce91a2d8284f12013b13120121fea3c4f25427c3524a1e883aead429e6
+965be1a56adffa51f5d80761327cf69656e6c37577225b36a34afc2f8a959d8799ad0ecc3eff4470d49eb22ebf8f198b
+8e575ee39077bd865d70fca2d93473f51dbc99ef4f715f4a3b1d9eb21deb2afcd0873b4dc53035b77e05f52029f069e0
+a5c670a73da241f5888c5cb44c27eff2b8ad3f491e0b128e5f1d498aa6d76640c9e625f3c5399ad8e99b666e4b2a9759
+920e1524255b03cbe500edb230696c55b7774963535c063121c9e9987ab74d504f2f1cfa14ba7ca82a6f66745fb0b392
+8a0bb7cb267b8e1e0cddee208734632b28313b3ad89f9c2168f341be5390bea3f09eaa51f8923b87697799a53201dc26
+859ab9b3cd602e78dbee8d8d5c3a9eb4270f130ea4a1b417ca5612be753d20106cb2724097840ca8919a9a96e73f96b9
+a76126d9a997fb0e7e2b27ac682dda1c6b99067313371387084be1f6e7a9a59bfac395e91f089e14cecafd151674a446
+8aeb466c58e2829790975fa08dd31f18a51a63777070d2e24605adb1a77b5e0e5c5e0bcb483076d23a6fddee5f402f8d
+a8959f312f2ce0d7d974a4998bb709bb98ff6456413ef4ae9bcaa8d687b8b5ecad91414bce8f704aa44a83d8a0c86462
+b9545c8567827fb28d070624579702ab96af4f06fce515ad880893b97ad9a374c4c91d6288e2a584ef14b1ce4930a6bc
+ace41f9c2756ced611da16e21704a367b122ee1c2feb83145103203ace1a5cce0ebd3bf295caaeff05281672c92574cf
+93b90e75f56601191e3b568368bf1d24f97512cd42cac1da8b42f0019e07fa04cd5f835b7e9503fe4702632df27ddc19
+973c8feba289eb473448c32b141ab4a6f861222626b3f2fa265a431a54675dfe5eb479100a33c172ff935464d6e85f90
+a6b0798ce89512644490d65ce3d0441ad950f9a25f6fe2c9a766a58b9c8222fa6cba753f314cc7ad6b6e3da881c67abf
+a79c560dfa179075e0d1506adf5082318915c15048328b15ddca5748ebc6ed8b10fc5d7a50bfaf8942cf9ddc6912be0b
+8841b34df170519d07edffc4d33a0e70c518dcf53ea8d0a9f13563822312a65d16f99cf596bb95eb0daf85435d4bc0a9
+88527539258323edc2c296dc742cc26b9a4a984ca299a81705c702a425ebc7345a79b4df84b2d440a1e73a09fa18b5d4
+88026753926a068e1cbf49a9a0fa545846cc7ca9abc0778e44f5b7510c1b6b73e9a9b1aff754199379522b2a985c0881
+aa2c306ccf91f967b5cdcb50808771ede36acb9a6cd84fa15c6de4c873cc2d0a64e79778a2822a109b41f5205fccc30f
+9751fd8bc2a07ffe0566e5587e652d3d8d5250517278bcf8754e14717b8941c07c194f14fa757f9a2f3461ca6376bdee
+919746e5eaa18b734ef59c0de09ee8ec65e348efa659219d9eb6a3a77b8edd9449a6dab727e9860ca0d3837b161c0352
+a271c146794d6a65c6fb87797262c22b1d938ecb2624e03809233469296d33ac0de6909183c8efa438b5f3971c8c3eed
+82fbadd9049248914a15755dff692bf689eb2650fdc6e44e8f3ae003b8f15a0f2858c7a2a8dd137b3448420c5f434229
+b90992cad6df98d2fd1c75bf90978205280d993d439c44d6721cb95d52eb042e01b418e45c3c48ed667aad577f3fd1c1
+a0c3d1e8b80ed4a979a22d6a9647bd57f22ac8d73c37ec3d56d06dc178a5c9d5ad3ffd6dba9eb7844c1f40b8c89d3d33
+b513aaf2f0a07fff3543d8687426d07773677ca4d23554ca517e50bcb891164d1f5651944a2f6e0a634475f6d33bf0dc
+a0b179aa2ecf572ac4a3ed898aa34679be3cf3d8d9bc74e33609345cf1743e915124a59ffcff41bec012ed2a99447e6a
+8e991c5549126d64e0b515a03d266e19097eee38d08121d942973d568f8ae23a15b037337cead0686f7c944b9fda3e39
+93cab29e1bb116a39ce1a82897776da1bcac06ea131a7dd141a688ecd4089c5a0b8616d6721b1c6d92309ae0820a367a
+8d4e0159fd3534172b2481764cae7746b1a47e9b7b9465fcec0824ef234674fc567c16ca7116dc90ba9b2ac3eef28d60
+88cbd9ff6ca551a7efca30b5f59fedaca8f9efaacd4e9bdd17ef0dcfe4f3449b52c7d3066716f3e7fd478f264d10714e
+873c71b2feef5230c31f13d8425f8b0eb0171eacb9225f484a36da3cc796d62594fa4771af9ce1e7ba951f5377e5db76
+939eb99d7fefc9fd5b3dabaaa5b331365121374a4ced862b8cbe0cb3c574fb1f0cf4932106088a1d87522acc31ba7f77
+b283f1d54bcc72e31ef572498821ded40485f38d2ffc67f70bac68a100612b020a538b36001d94228a4dc97da8fdaf17
+b2e4c2be605c8ab3038b4e91bca7e77e127c5c3106913ec1341102e138bc8aa1d218c3d3c2ec1d36fb8e044b4bc211a5
+82e73cb5b2cfd78c17131e871e92026643bb56916ae64f009a009555903df878fa3a2019b82f7e71a3ef7eb503c792d1
+a6d828a5b7de0e7818975b65244f6efeefc712c29f2f17b27f3264e19856d869c350ab39750ba63d6d46afa3aeb369fd
+865b17027e9d5bdf2de0afa2f524f67b6defed87b14e0af5f4b6b1966c2de45550fd2b6b39b1be88ee9cb06e755f917d
+ac8b47f9b7e675b556445d103271e6bd3b39b94d15ee1f3108fd1b777d439c75437c78ec3b281f7104af6d0efbf0ecbd
+85c2f71ae18105fe499aa4da0a835de3e92ce05d0f28ccbcffdd2860898ae9909e1c05831ca4fed96545133bb3170302
+8bdb4a72b06562591ee44799bd7400ebe71f6737290420dd4ba2bffe0050d8ea4d586b7e329541a52611e945ff1b16b8
+aee4843c9ab02026ae723531112170bc7464f51460bd4ba5166fed54ecda0f53342cdf94f4354a5bc1b941e8ab085a80
+84de368006db07c89a7a43b7de54a63637ed72379a41d029430f6b4ebe404866896d2e84996998f7b2c20324143649f8
+a8375f69c01289cebbc97843f417d0146f68c6416981032bc1f42d3e09845d5131eb9b4d68fd0ba7f5b1223b83e51bab
+b1ae126dda1a88fee9265ed8e5bccb810014044d83c70e01e7f80059a685067f4204cd15809b230caf5dd77738a64e38
+8177544c7b1f77181735c660102da20fbf9a2ca4efa79b21c92f1cd2b912630aa6c830b7513980656bd275097be59d1b
+874fe8038905065ff3b77f1e53904854fa4fcbdc4c8959fd2df2e3967b3b84100c6f63fc44338c01fb26c042c454991a
+b19324d737364cabef3d2ee4785e8f19cae399afc06fedff8fdc120e0ce525b3755161183a1f5ad11ee758104081a49b
+8e7525bffe35c1f5c2db63ee911e7e0197951ebd25868660e6672a3e7d4fb309738268b36677921be3be2f323ca718cd
+846c51c7d22e7d43f6e2addb7fb25113c25ddaa51252a898fc1d7d5b510f772534c4f5d37ed3074d124cb259e2bf8110
+aafe2a16cbc901730178841c39803ed84d3a78f92f42f84a1c01be4aa3b63ed7ad9d054ceaa8a2d56eadddecb287e8b2
+8781c9810ffe3d93fbee3b576a15b8786c3efd6b5a96b75819b1f93daf413d4fd0f56d1ec277e8f5adcb784b17f08371
+ad66011f0e2927ee1924725bcf8a296069f74df78ec66ef6aa8792f68425e48e9d7f717d022f68a079501770ce192fce
+acd0ef46fafb06f336565d86e0b22f9e5500d2f73d047c827d6a207af40b706440afdaceb32e6571deaa1a79f5e6fe27
+8f65bb98baaae22e84a3ff375e7598b5c61ebec676fbb5a4f79c8463c427eaa96ebc51b1fb504840b7b0206ca6c2c72c
+a4078341325d7debf766e43679b8b68331dc13651455a73912afe062525d2ea909d8829ac08771d9b32f2eea28b64022
+88eb29841b022f2ec9029ecd1a137173cfb79addde1c7cd4be425e5806ea6ee295b11a0459a940ba79f789689a8fdb81
+b762b9923a40a1965847bc7d046723c3b8f0d63323303aa3b25e93b4af8e527f1afb3dafda831f50baaf79926d1b1e78
+a21551dffcdb069cb8f30b625c8404dfe5efec83227e3a1a67ef0c9c9b49c658bbb31240c3ff6f8c68e02f67974c732c
+b4735a6610c371754001425772aa5314b759c24da50b38a9390969c27e215ad9d463a76762323b7954756a8d5ee7936f
+81bd78e545938f8a3e53ecc2e88dc26bfbc30941cbfd009572d9b38f8eee47a85209a318cafe8cbe055eccd5e62d50e4
+82ea5495db9dd48da97723bcfce02788549c6006773eb9f4aa4f0f3ae13414430edfecb5cd095259179ec2014b6ee1d9
+8493147b8f0818c2d5e75acda498139f95fa6f904b47f87a8c07e258c60f39bb1faa1d29cf0834c8a1ef1d6015d37b42
+a491233ab353f9daad86e60fd48b6f70dce60dbe36775958d8e270725cbbda96578b17a0c4925ba1298e630c6b9ca9a3
+a8c148b9e1373afa54778b6d4f76cb12f40eb6e07404a7f27b271fbce0d18d621675f1dfcb30e3908d7df1d962de2e5f
+9826a45c29ee22cc26ae399be25cabd16180a291669fc822a44d14cfac81aa7ce85112d7f2c30effc7e83d131c9937cf
+a793c75e716aed4048a2893f11eeba78ec565ac250bdae16594d056f06f4aa7d2a156e1617fc26def4e39984fb28936d
+b6c454d822343cd1b1ef7161cd2ddc28145134d4e59e6d69634c010ad1bd44120aa8458eafc28f6103ece7e34b368e1f
+a3340a0edc3fa82fe4f31ca2d19d295aa09c74cda3bfc3534c66eb71bbb7903843bafa92f7120de4505c7ec819a89664
+a18e5218cd4349985f412ffc7741b5db21bb14c6e00431daba194771300e740f75fd46aef1876543967e8719bc6517de
+885ce63a88617bee05144bc67d08f1c7072d8c4e09b23b7359f020995aa8cc9654378d382de6340ddf0803717687eddf
+8d8a0b614be7df01a12e534bac102b1881905a9d084146b3d0cf2086dc7d400129e0de8e48fc966adf9d8ec8c1336429
+8baad19f604bad656398a4010b20ffb6ec6131681d120220dbf2cc5779de1ee146d0b773bdbdf4e8e30aa0f464f2b18b
+a39ae3d204491871c2e88d7772055b35af341ba66531ce3575f47c749eb8e380d63a7939d3408cd51356cca29c76d4b3
+813afd593876667ebf0fff2b8a8a5bfd0f42a4fe2e4a0b7c78b6183605706c97dfc40b627340e1d9527f618719d60e88
+a013e458d678fb302bcb6f002a52e3e0ace443009eecc9113ab5b78f4663acadb8ca9cd757a7cab1e850aa23f09ed698
+b6e14f351fc47b9e46a83984756812cfac795cac5ebbc6f00d673ee23209d0d91a6bd7d576c7d35ec3c7e7cafb758a46
+b94246a346966caf6fc1e0081a211f27b38f058dbb9dff915e3e65391dd36d66c51324667e3d7469a865c0cc064589ab
+a1bf4bcc7420bd17acba90ee67af96e73502777e1723255a73b1ae3e92fc77e80a287ce7c3d4088040e0edd64577c8c7
+8b6f5eb9b6bc7320349b19876864baa6cd8e07da4f70653d7369740184ad416c40b4395c04750f5d8b54b3b3ba68295f
+83250b957d920b1b738f4d0f44f9eefc01b5b0582128f5ddb5a282a11ee207ba1ea7867f00588f8b891bbde2e56b4c43
+8eab312cac9de78c9fece9d67a6b26d58c4e15d5e0668ca2cca2d9c51636eea5210a893f9321c2fb232e09f9d0b40fa6
+b4d1e5f284d50360dffd2a0d21c4b31d81f521158aa21bf333a525cc68e690ce8ce4f0eff8e71a0c2d5853e2fed18231
+b1f194c28bbe217a2c98ca8212fdca744f0806d60e51f9da81548155cfb97a39e2a98e753be8b2196c83f7db8caad2e9
+a7905cbb59722d9463c6317ae59adc10d5bcd6e9788f2a54f4ff4a4de03df3f830d6b8faebcda541d429a7e42d158c9b
+8a3b31d0d0b33e7011dafe25ba5c3b7629cdb5dd5b31385d786fd80888fb8409812b96d28fedf6a401a93310b045c620
+86e4990bf50b27bac76926dbc65a1ca34a759d005e56eca56fd0e00ce82635dffed6f3052740cac2f1f37204699bba9d
+8f0b6a0b66f1f5fa3d12af444963c6a45785a36dbd9e1a5f42830b5534ca8773a05fb618292e718cfe8a066b8fea7980
+b7f206827d715b33989de5c02f0886d3a457d0ae34931ddfdfe2dbab121b69ccb560a71fdafcc3ff204217611674f5d3
+a6e2ffb0c5f29043984c54f5fe6449ac4b7a86f2982c909606b88316ef1f0a54638d565f44d2fe8cf00279e0eee435a9
+8cdde76212e73f9430cac210b52507583e81aae0bea491f6cbe27e5e2c8fdda373ce8c7a5f16bcf8c6238b282d06639d
+8030955eecc9b8e2161d40f1f514d58024d25e07c6710916824ed8982b8bcf7ebebc5643f0260e1ef6150b6901dc2dbc
+8938fc90e836d7bdf1cfefb2716cc25aff34e7c4dcf66b349d1fc6681580de7f58665faac29494b30bfa0c743d6f33e3
+b182f9b4a5d838e9d534e41ecbf06330c56a8a64800eee561de1fc2dd9486565ae6099f40d0f1901066f45047641bd65
+81f98b85de7b6c581613f4a42e0cb0dd9e6336399b39d38a4751c2a9f195b65c9e5592fa1728b91d83cac0ebfec7d675
+94681572da95137ce41d913360cd567b570a87c9a439f2b67b90d623561b75bd3dd0486a90a63d49eaeb412cb97768da
+8e64922606ce05375556901b8c042d4f41a18fafeca24c1d56998e0bc9054bcee7ab079c3729a67d908d0d7967a85edb
+8e10e8952b24125321d0cd9ba922affc93908b3abdce47eed22fb2d44cd556842c31c36de6d4c28b4a1b5dd84e07df81
+b6d464020a51bbb53670c81d5f1474ef439e006851d5d5a3fcf74219614a2a9c983737f20b254d38a2fc7333b35fb3a6
+91801712ba264cc2eb65e8a3d5a032674a89f4c2dff95ef9d80d3a9285f3c2cc108e775dc326881484756814c2a03637
+986e5a00f13326735bfc6b41b086623101f01dd55f2a88bf995a3b81054da86bb2f97fcf647d58e90428e8e9555eb020
+b2875b4ebbab678fcafd270a0238a208b19803012fdb3c23f06c74bfd45929a9856b7a0f9881b75c7e97fa9d35e49d1a
+b3d1acb9c844d8d2232834a81862c59548cfa849e8e5408ee66b4c8b86ddac0fc231b2538a752eb6c1ceee92ca443d1f
+ad0b1b5d6bb50c43f5f3b692c5d3569d2117b01caa7f0ffff502d5ab727f7702a2d458b89d77d218d3f92351b4c2b92c
+95b1b99dc260ae6ac7c387bedd43fba793274b15768d93df13c88ff6cf637732cb6b1719467919b444c3b5166f4f0107
+a0c3c8b59016056742145e7f4ca6568d4393124efac6540645152bf71173dea3d0058bb11b3093228ca4729cdd5b3033
+9278afba60643257d9f21a4033df3b57743c3b43d66d96ccf413154a63db054fbc3a36f2ef378169f4f19987964c0bce
+b558754c97f9824a72644de1725127dd36e284fc07ce89006b990f09db77c48ad6728e5c1891a691460bd5416ad65faa
+833a02af76172f868a25e850d35f4d164889bab8381fa9c8d9880ab0564a3769ce3961cde72bc94ed73a1723daa35cef
+aca496f3e528a2e3eceee138291107ddddd68bb088b2e49ea76d0c4136c6924b3251d7661ff467a36dff29f07ed09102
+a9367961ae88a19038c446df3eadb280da005d120c16f48ffeabbe4cb8e5e2784902cfa1192876ab934bc90606baf2cf
+b43feb49373dc36cb46e050e3cea43e636a64289efa3af790dd3fe960446492b858f51b3be62c6b75b510d8e2b985573
+8cf24955965468125fba2c5a5799672845ea6ce97cd307b09236ef1a3cfe55c88958ffa311e8bc8335bf261a84275d93
+88ceac98b512e5bb915554af92318a5d07a494e0b8734c4415e192e7405d6b06d170fbbe254e3bf387759f6d4961c34c
+8a9044ddde945daf3e0cb3f897ca00d0d4e6a5f7c99aaa3929f0beb9a44d2ed23c191e37c57140ebf3ec759f50f84d57
+8b2a2c0fb51e7c5fa51e8c593bcf118696b8411bc93e35cfe5de6c5465c6e80bba64398d7c6b71badda616b918bcc7d0
+ad8bba2b7d5577f971a1a561b17a9d8f6b7c35fba55e3e421a0d8d77b520eccd52122f02afaf3899218b652980986a92
+a8d743b56896d44bec838e10ac1ba5a43f58c26655c71be0a5417d936260453a8e91752c87334676c5dd1dcdeef4fbd7
+b0b0540f8d2d1ebdcd74d6e4007324de8f8bdea0531880520d79773c0b8eda65ed49e672c5a294fca6b4560442085829
+96da830d1c1625d002008e9a364005b2ef16cf56f5aa4a758ee963388493cbf90aa75c25dd67d496af17212537ad44ab
+89e819577a95195056b872f8f790d001fde3253a23120e2c41b3ced7fe8e9bae0df74907b7d65ddf9bbd6d2efa18eba3
+90a139ffc7dc0992c023651517db4c195aa2f618dc3002f4a0a43013b6c6022d8d9844a49cfbaca543c9cf5d9b2210f3
+a2061f543b216fc9c801d885ed681f9253f67cac40528b23aa8a709f24e0992fa42a10f1bddc7f10af2c22209343ca26
+b5f53715b9146966f386f214477743e2fd2b771bcf90b192a5863c06d7225be34edb6bf71389085edf344e60afd88561
+9634ce27272f3c687035789fa4eaea2aaa71db5b5531b21b8e029645827b40561a5901b33afd80a3aeb5777aa89850f8
+9674736cdb4a823bf982d54876794e99c7672eaea7455be90e815abd03ac06ce1fd9e73bb987a515863c6cb4ae597835
+90379303e285b19fd7816a6d02c0b8f94e6291b56c196d76aa389cbf813dee7ebf64e45555ebe8a281daeecfd7aa5b00
+8a1f759f6cd6e5134f67b96e0edce7170e4be1b39afaa7af1c2de989116a6ec9d38a2c077c8e6e65ce0bdf729f20f1c7
+b416f9937a51a298548e91cbe8fff71585335c00e69602423adc9cd72d18821987b8fb5ede32fd8bd2166e2ba9aaa792
+a423073148046c81f840a481d57909f7ef621a51827e44706da9e1f0e27fccb8f88652097a9880ca64c41f6386aa9069
+a173305a5aa2a17349eca704fee25593f5c2fdc5cd8cb932a1bbc0ef34bf54ec2f867ca93d8e6aa33679cbb71fe11083
+87c6756d14d815ac8237ed4a75fb11206f615585ed527ad582841526371366ab19f602c7448a21722adbf2d987d89b81
+8a1a6f06d6375d2bfbdc7531e9177a45330458da2581f65ad129367c400cd77f548aa748bb470bc560c0b02ee5b802ab
+a24a05c30d0fcc8334f6974c30d13a5593bd3b388e2146ba006f232bcd6886edffaf7e48ed6126efd3e651997dcceb12
+b35c5f8a5842d97cbe19105305cae1f971da5662c52eb979975efa0753bb60a050206fc0babac5b5083799e9ce8a68e0
+939ca5532c922d00d08ec5914e6c58f8a1302a1214a1cbd5c844b334ddc84e694768edaf1a2af02289ad74970800198a
+911d6104a240f84e0f6502597405b47a7faf5e68717f6d389baca62bf82fbb7207ce8d0c584fd9d57d3afe1f957b7cc6
+88777ba7a4bdaecee78d42687cb4fd6dcf04402b43524e2ae67506d93acfdc29d9dae640c05d01c90caee1d04cf3d35a
+9226e684606f8169e38dc21a14911d0306b1c9ce5244500e4b108eb1a0c0783486acaafd2e0b3b60c413bb003448ff21
+b2f527adbb9feef9553bf508f192b5ca211d0e491925a2331bb294fcde7d8e0fd72b441e9f07c838640dd35fba03e1a7
+b474e6d6ce22ea272a93a3c078197f40c01b9121c6f3083a8e587c367200b8c97ad94e156883475603f0a66d0340fa52
+95c4d9896df11d2b5a8205a19d6331ea02a2de038aded8e6fea6d79bf5a6648d5d986bd29430e4cb5a6afde8b07a9a48
+a12bc53ba6b6f8350b400fde04518a741a1d755123a6ad1d435c7642492c7df28f7091f17b254e793561923de781eae8
+8a0578ac03070bc920a3b5a7a33d976b3133501309af5339b0cc70536965465b4f7288af70db3d5be16bc2a1e5c26a86
+a66e27284ce6114e48ab56d7f623dc37a6e79cc5f487cb2bdf0acee099cae744cf3a9de53b111492b5ef99b0deaae0a7
+832a338951022c80444ad8c6d0285e86db54254d2689defecac2ed87f5eb4d876373af6d76e3d613523e32c3966142f2
+81e83f01bac3ac3fb67e780b28de30b32247a774aaaae118db3d45c8e74d1d4f1defbf9c2a7ffdf176f5c1cf4ae4167e
+a1b214ba7265f692b4637352c6139bae8bcaf3e7db5806fad0014ded93048fa4a36ac9c9e0b7cca0a86cd45bbbba2fe1
+a7ab6f470a421e72fb703a9d153362056ce80c40264a3ee5698168130cab8e827df5ce3e6321ce9a669c87a2e5c67499
+aefafd219f2d062a378474c48d2650b51901b6bce00e4ba0b509395a6fb39699037577da353cbde187e65de87ad01575
+93db16a0a77d1b181f33ef10300112fd8db5b2eea26732bffa3b1fbebb792c6ecdf2899cf6f26b505dfb46deb81b217d
+a63b6d9d1cc2f31ac5f836133ae66bc9de3e07ced5026f5bc90116599461dbdc03cd7680c1bb43dade9218ebfe1bc1fc
+984b49ca86d38a486f6315f4f9e6ad521901a06f8862ce1fc095d9c66bb2164e334718c71d7472ed765367db5fede105
+ab49ae93955a38f45f756afc4248a37773ba8d0a19779253fca3b744854715b9c9b10c09a37d3426614ffd3a8ced7bcb
+b22166dd64c83fe16feecc09d4b1df2d967ce7f4ab526ae39799dd5a5a4a9ebb1d4a432c5efb90e0875a4eb6b079e2fd
+aabad619d887b69b9562066fba2179c69c684b8cc9318c9e39646f4a5381535c024ab277a0f0be46abc95283b337212a
+99f5d484db149e9f8dc9c6758647c4e3702d88986600a3226874d612bb4b5e92a76b1dfbdb0909b8f21afc773ec67c7b
+adc8bb04eb8c56dc4ce97c3fc1670da10db134cff2edc214ee3221079251b968e2dbc087c56c01c9260b49506958a6ac
+ad625ddf5cd211102543e0943a7770a9b45cf3550d12dbb484cb5522b70cb626f9ac795b07a305be3e6949d7ad475f66
+8f9f5b2b43624e89e8535dc73fc54b744f247572b2920679bdf6a3ef346e654ec40fe8f81a0f7c7ce7cd5b48f3975359
+b70b1642f28bad56bb24b342eeddf5c3782e0cf6e0d5007c252413bb44b32586da1e3b4d8b45a72c91e44e07334da68b
+81b0311e557c47ec22c5f5d1f757c6193cfffae357dd2460019247178b13733484dc8630fe2e13037a1a3d681c69066d
+951c9f1504b19acdac1c04aaf535d3cd3e39c431b2b5d9def9b374468e93d378ecc3f5aa02c91ddb93eea431b327ca4b
+a85e1f4c292723d18a49cc9323dc7af12bb5a8d0c95d71881ae235ce123c50018907f46bfc846dda1a01b14ec45dce14
+8a46c8b86bf9890df60de4c210cd7865892d0c11fdf2747620289d73bad597e6b482c208dc310c25955dae8392d8f278
+ab65408622c63b67842a80c4ed665258ab617ccd07871fa3f0fde2e5ddfeec49f01d7501790a60b3a05d7579b087b787
+8706913d42b557d9ea4d7b70697069281504b3c4e1172a2291e3b3e0a0305c8d0bff6b7721356d971d2fe58e32d4556f
+8d9b8f3c113ca1215dcd15d4c37913d023c8c5d04f617319af76bb7bab72fb756c5bd992db6b9e765cd7695c316360f3
+942d4d3351b2a9bfaab2500b27d24fc2d7237e791993a7d0335f36fe6456c5a1a8bd28dde9228fb139e95288d6de5bbb
+ab014e9cc7d3ca08f1d3d24473ddbd693331f4bf21ebdee0fc997aa2faadb43db6a1195644c459b52a969f3d98a85b8b
+8b679da80561955990c91da9093837953f4ff7fdc658b51639c462b578a2b31443421712c6b7742fddbe0ced48c21cb9
+a9132ac18b1bce93e815f6d2f8a0d2f433ae4d6fa04269eb0f5f25864a8009b01531c7c3ebe87f07454927a010ab6dbc
+8ab02c113149efc877967c92621a8ef618bf423017e78b9cd30cbb13c51200c6ce27c46be75e19ba843d64a3050d4467
+a881043298341efc28c60d850d90d90279fa6d8428953337ba57b74eefd858e362c6118a82ebb025c9c102c91b4aeafc
+92e4a587479c64b8df955c6bf1abf1d7979a978e45d96f05bc1b9648f10428d77890be9ee03bc1b1982f5ae7b926f0a3
+90c21a22826e2e9978dd7522f51353fb33224cb65603779de41db3ba41e01d664e131233bf873e28d6c71294b565c533
+88e8ccbdc54ff06380c2243203d3f8c8a75fcfe638d6e6a010c0b3a39d5cda31f8d2cc416ee5264267aad2b457c94e50
+a256198394b458f6468dc91c35f579da0ef02a55fd93e98b25e43b1bcb650ff889df4899236765c1a6b35cf49da940bb
+b5c7d9c03c36cbca068abc6778053727e77d9b58c5dc33b11629f1ade1c228b1c964f5a7d8dea16057e76662c4d79f18
+9588e133517f0d49622222b4de5c124b1aa4260971e43e4aa767fba8055540f2848954886b7f245583ea527fe2fd1de7
+b66025d75169bfc7ea366cd32419e24fbff829709e3e9587d7d59620b3a7b72034d3303106f965f5f7a71d66b7f314f8
+891357bbe44e60627b975c10c872a34b78d6b264380e351f3a86dbf99abf8e2dd8d20c52dd6073086e48e1ca782e2ac1
+8a066a3482526a92476bb8c3e5caf07575c725d72203d67ce98f654f5ee8b7f979187416fe3d7ae0128800b253d7209d
+80a9e3d8900046b71fcd5b7034d1e0f57d95d2756da8307a11aec0553e5715518a125a653d356f399409545256a1984c
+924a13fb2da7a899cebf2ac09c8c0a183491777100de1aa056a6c2bceffd5a63e255f16a9066e4ed89ef28096a1230bd
+866cfc8116d2e0216d8049d5ae2ef0e3fffd377028850716a4bc2cfe16c5a6be023334bd6ddafa0c77913dd4ff0a34ff
+95eb74bebbbc59d793e3fbae8e98c258451bf9bc5097df4edd832e9f1c30a1446a59e1f75a44832d0658d5ecc13dfc86
+972517b2d72ab53193db5d682db2de7790a418ce4952c29d64e1f9107d51a782f4084591b7c775648f103445b797e8e5
+a14ad2cb69da568f2f958ef4253d7a6daf574c6976f4f5d771ae7673853ca22eca81e20400092bac84453b6eedf5aea2
+ad95bfcec6c06cdc11d316b7ad33fe65555e985bb33b15c9f481a09caba1e5990601ed6a88038c0ae2e04b1607e2da48
+b7e3bf3a585af1029d83f12cf75acda894fc4441cd7b3d56efb6991ea91b07512bcd7d6d68738557a48f0446b2cb21af
+a57efb1e2d2e10e41f356768385375a21d9f78bdb34d618117581bf7a15024eba43570c3956ddb85a025d39476f831d2
+a66d3622b1cdd472a2a4491881de035c2eb4f1c94927902a3bb9f10739f900130907c6b002982e03785c43ac30b8109d
+a79f2417d32fd772e46f3bca61ac788af8fab174e1e1e48a84ac557f7e80a9cb4e2d7b467365ad18f9777f4cb5bb2b8f
+b952b976e3b6660326c0ed357ff25ee1291b74891f3eb7bcea39dec2ebb11e287d6e26ae0506425a20e5e445273cc63b
+8c23929e9740ab51d9b82c6b7840067e7163e6c7b9b9441e1bf867ca2e532926981c98641e6c798ef12d35108abc1dd6
+a519578772c9ed2d691a8c423d360e4bad76afa422f1a5218a7a08ed52c9a5935ce2ae4c0be182eac0712259a43f849d
+b1529dd189cbf3bcca50e97199bfb85b42f2b26edd95b35758d988d1d3740f5d0d2e249763874fdfadcefad9ea1b3d02
+aa3fed8d14a4f38df75b9eed7f187a31cbb7a748bd3225dacd8325a71dfb680729fcc91ad8cf0b67ce314e1fa8ba02c4
+b77c28abce17732a08e682491182f63fb55640e60384932f6a9c6d3d7886508c9e67a841cb93e59448d2d59fceec4620
+b7a24c58e3b85d60d654ed14d78993a9cc78c130442c8cca42921ade8ec94bbd0653c9fe5c69ad1fb2aa46ffba04da39
+b7d08f3ce97901261514a5dbae582848e75515c5f9f41f5e70ec17a8d0db3067ddb19aa1c86803bdbb757230b148bb21
+a5b8a6818be4d59079d88f72d7aa4957c48ff5898f3fd01def48ff6bc7aaf9840aa91f2f05617d340092dd9299115c2e
+8e548db6b871fb23ca1cb8538d44b77ad02f4cae4d33c8c43228b820abee1aa913ff9acf2483725b195b4e65e2e92063
+9509189e063812fa04f4e26f87b33a2289a05c229ed1038fde0dacecd87aa55ae0fdc678a1c86bf13b81f4b3a872426a
+b355f24a5dfb7a8f3ea717111a038487632bf00d67cc2cfa2ab61e1cace7bc7f5bc9e04b190aa6be0652627ee219bf76
+a9b335f235df51b92f40f44f19150e182a938b9abb3bdd8e8c447b2b128050d228e0115a268af4c1bc2ca49552b4e0a6
+b306d3e6cd7ab56f5f7572fe51175ac6b29b189220fe2d380b959d131a35804da5ce95adcfa51d799f18e27d8d5eee0c
+aa49cd2bd34c37ce1f05e192fa6837f964c068170ab97989e1cb22ea7e13c2400417a51282519e74d8fb6983ba89a549
+b1d4fff41d95613e30427ae2ae1d3df8c9d06389e1e0f404f8cd40199d6c4277b7a898d06f1579be107fc5744247c36f
+99d220454889f476931b0cba3570eb1a8eae30b4c3617513833a551aab0a2630125f72dafc64a766b1a322dd42dc385a
+8267ae38c9c8532c7d4ec4455279a5ed4f2e48746cb0f2619937157534b0e5466c5f4b99b7c342c095f71f3b77fd5882
+8bba0794cc4ca00eac50309a92878084a6a22e4c23206c68b8d7268f9e7f615da4b9d0f3e006d9dd84bc3dcf32261e27
+adc965bd7c7bb2a52cd3f4d2cd3fbd72a196876a678863c6a67a25b4a2330d1d3be603220de22c8c3f60c1411df57b7d
+a7d5f38a3c4ca0541d5ab101af9c27b04c5bfaa42a1715e882c5e7715e460c4666aac4b6272b9fc54514346fc49d0560
+af94b91ad9b0f01df1d41a459f16ffbe30710325617651cf1da000eec43876161957f079a27b70018ba34d1d5d68cf6f
+a0e2a492da4614f41741157d3a1d19a2370ecc8e178d813e22b902cf7454b8237f1ce3c16270eb6f3ead1f92797e36f2
+8dfcd39155d7b8073b0a1a9a617fa75218f569520d4817f3ead375850ea8a3e3dca64c44e83f54afc37173d927070601
+98302358e5b740b73e1a6c568b99affc6de3c7245ae96d9c712d377fd363d8b8f49dbb714aa8d39b5b947b6de341ece7
+a2fe0f9fad663cbbf4bb05f61edfc90716564d5ee5a9529ac3cb8f06f96329248cda85c43f24a2382a9056e9a53520ac
+ac50b0727ca2ba80692c0b7f564417916695ea3760ce9fd71593050912bb97366d29ae5ed05ce52984e52218854b8e3e
+86f56bea946a4516336a90328fb4b24cc7f82d8710d0d1e34c2e27b6af73c4f4a9d6a848dcc56a87d6259a99ac444557
+b33d0244948c430a58b210943e41aa3cfecc9a823dd3e160634ccc45ea2680987db2912ab2a173ab6cb9cc2b7e16f7d5
+8808f8c2c2377cf52e7314820d88234d7819a6108fe9e1c6a675dc47cd59f81f95594ba2f5fa10e3719580f53edda641
+ad34a814be6019931972a76b3300a4fc9ce763d6f4fa1ea131a67d575c00c827b9ae7260d88577b4b3689e90a845137e
+9370abc67ad0fedf30b929d1613e336c6e99e4bf83ce969e61e5d77061b48a1a493f28fe2eff436d4a979af700a83b5d
+b0db136c8f4ba2fb7148b1451b18f694769f5e53650d68342f15817b04734ef8ae59681a5754df617d755a687b6ee45e
+9149909d24382054a05fc0b057613d059721f132a19017a92198b30e48fbbc5f8f0b5f5db55347dbd9d190ca88f9a28e
+883d1d170fb0fa95b55b10b32ebed24b1232dbfb5c783148a63a765fda200e796aaec52747441704967914433a01a323
+8f55fd5ea11c4fac277112d72489ac1de28fe163a756b125f27acb78aa6651c70d1cd8c45e0daae417bf894149ed2d57
+8d08685f99aa8525b008b868f5486e24a08568a5afba9b729f7d26370fb1b162937db28b935d67e4d22f7fda69a3a6a4
+b1882e23d784ab48b2f9e58114c5920bc9d0c4c01d2d7fa5111561df0cf2d738e31a32963cfa58939af87e79428659da
+a3eba902d376063e48634c9436802cdc6b89d3a7c7cd03b26a3fccc7218dca85a3ed939eb53956d2e001805aa5c2d63c
+b97330c40d51a4b71f91f56292b628379ba735509a66c7df054112578b9df40d3aa32598bc64c03c78a3311a17997bd1
+b84f3d2af2aae2aefdfec9a0693f6bd71eaf4d477cd72d80f4919235a471607c5483b354c9d46628a76d6b6fe7c586af
+8a1c39bea7fa580de967d8ced7e3860a9031b07842d71f8c5941b8877cd55ba15ef7aec6116ba38ba290b887b4530685
+b120fccf939e7d7959c2c1e70d7a7aa3b84684dd1ca8e5cfa9d281fd06d23eb67a629b1a27052614c3ba639ff9c90dde
+827a8e0dc841af0e2c4a9ca36c84a0ea60099aecfa40294344f82878b6909f5581f7b34fa9510883113795bd09b5e4bb
+88c24cc54dac5a2982be5ac49684d99f95574bb8cc44afae4f6e18231ebea0f2ab65b49870840bd3e8f2c9247f62c7c0
+b91fc3f2cf743f4ed42e49007514d43dea1d7bab388a18de6f71367fb8f2e9b8e88ed9f7492b647e548396ef3e3d7765
+a175000c4765a57c57b219b21f8302cfd85aedbc3340fa1690119bbe7cd93dac4fd0ba676b1784ebac83efe3e78d4bf6
+881a373630ebc24dfe17e27b3f176de6651347ae741d55675675e9e6904ebf157e787d86eec42ecebfe4eb8f28de6fc7
+a47c8b155c8ce8e16f38deb345a051fe0c9b217cb7a266fce78d7694134247887789645a82c0ac24341f51da8ee6ef00
+adfa5bcc682d4449adcc436649b444dc61157154e24d68615b0ceab50eced1ab55e15b45562dd8e00785806e9ef2b7e7
+b7d2ecddf47e9fd25dcb283eb80e323300bf5c3ee3344abbc3a1f2a3296c631577a1fadfbf685abb336d5d7059d17166
+8833f6b388e46e1f8fef1086777466277cd418051ac0323e2cdac5902d7ae45eefef93ce90b088bbd618e0381c1ada78
+b6abf44c5aee5d0fbfdbcbf1e77354d5a2ccc239b894e1e06d7ffa76584683f707384319ab0e0d17afd93a854d7d26b2
+a8c61859a9553a83bac398c14c987b20c8dc27d63112115b8aad26bca275cf98913783c802ebe3b7c3d878c130407b34
+a5de7a519f8de4daad9137f2c2838544219834cd70457ef09467d869f4dc32098b7a8d4fa85e1eb283632f6d09971318
+98c33a315a66cd8ab9ca8a58c87e5ec588107a6416c4ea498d0b91bf7597f53a405e437ca0a9d9c6acea27ad0ddbf4cf
+b2909b1f8752f4eec25180a17163ab215fc20c4a931d4471d3be0ab64207a65c7e462fc0707791286a92ff2f2b7dcb0f
+8b96c2fec34cda02e98510a3ed80a980b0cbf4ec03e3c4260f84027cc7453acfedb5f708c401d26db137032c6cb4a31b
+aff645dd6ffe8b5076c83a823daca4149f0769bea3293b61330ebd97a17fe16758e4fbbcb5bea7449595c6e261127b34
+a45f8b3b7196449f9952cadc8d87a787a28b4ed89f8c7599e7db361cd0f0aac6bfa464024ded5c0ffc660e417594fd41
+85016b5f7ea9863557eccb0e742cfbf0b09630f0bad3de55aec92b95d4645055cac60d03602586b34f774bd356dd5554
+94fd89dff2fc6099e5ab90149458a4c794eb1857f1dd9a2c84b88099412477dccfc2996cca2abee68d23a05265dcf271
+945a52621ec19d26f7c8abb5d01e4f5630924b75a349ce74219377a137f4a0d386172da523edaa522d27902444023cd9
+afbd452dcc57f5db6b3fdd55368807320459c16559d944ee8ecd1af6acfe9d58c13f37961f78030883f8ad7dbfac66e7
+8ce96b3be871a1f33d559a6e55e4d86a0b92ec3954417f8d98676264596c3296296532097b9b20c83c341527a0c929b6
+ac6a4dcd58486d25a4db1751a60ca4d02b80c939b39ca165a37d9a0a52d8675b3753719f136a59ac400bde3efd036c8c
+ac87a37a14a5d48842d30432935929a0e9dce5642142a8c5b95e377ad1bf52120dc64697f0508b7c258af24a0ef484ae
+859f0ba02d496861455d9c39c269a1ae5bd224319918fdc3648311c93303c0e13301ae7f3f77eab4ae43f1184a912b64
+96d9b1d2d2fe70b8fcac136a65b62a4ded85aad9d350c19bb955750a0b24f93174e9cd00c0e0a1987793e1180dfdf66c
+a7f5135873a1c08c7c8d46adfed19d0ed0e33168d463ca74f75116168355318ad588ebcca1946d7669c5106bc9f5a8f1
+830b0587587b80df078ecfe0857a4b4cfc05b722c0f4f3e1217048ee18749e9940cd0200c1f7a0f60de832a5a44e9f1a
+b6625ed0199097acc9aae20611f02d2fb837e4695762cdeeb4dd722517ba5a344e5011f14d5076783f3c32bb5c4a027f
+a17be2e528c463aa4ce4bba2df5b005f88e363b87be7324239413ecd5bd68e350d290370e1080ab9911a0d54856536da
+834064460f0e5f38950cf5ec197818712f01950ee1f32b1987dcf7f4098d20e1d91fae6d48e8a054390693a2e572f888
+86217b9bd269408ac92b5cffda5716bb3bf8674b7e222668d72939a626f4ab64f30efddf85108c0764127cdbcbad7d69
+8d7cf47b0648be0bcbd3ad1062d90010e5ee84e397895ce98160d5a568d60a19582c985944ec27bb284459789ad8f6eb
+ac056e3ed3487427142b3a4e4f9db53f1a752e1994f178577c46dad71be5fad4d03d24ae7019804c41232705a4bffaa1
+94b83d67af6735e81b2e392e6af8ee4dbafb0071d84486389f36f222dfd015da718c621acdc4360630403762dffcbe3f
+8ad27bb51c6cb860c21954f5d09dfefcbe3a9a0bff3e24fd1f74850edcbcc76b5b389a616ea0c0796b239b0c22357a44
+af9990dc4c9f536385811528f207a8352b083a4abe6dc016eb5eece0ad74da65b2c6c475a78cd0ecce0b2b550e4412cc
+816dcb8ff8556540b54dcc1efbd2242dada0acc1e3d3da13ae581d905a9106bdfb8c138eee93992a23e7740593e8ad80
+b8fcf8e11e5924d3d38643b2a4bed4b54e69f816f40d4020e76655eba8ffee758c16cdc2d970d3c8c1163cf501044c03
+a50e0ef4ddfba6d969e7dd864a20cafc7fa6aa232fa7a806c3d53c3e029cf110828c5a9c354ea42aca5688896f27e6fb
+a560435900c48879ff3f89067daa8e512482f061c68474d951c608ebb5a69c7863a28fd1e216eb4b140e32124e50fc73
+b9202d152b7b708ee61c4fde6cf423b481854538d2580bc43462610f12141b89ce779c7398a35c27ea6ed0afa5332bb2
+a9b3f8be28f9546bc70f680dfb9b08c1eea6fc381cb6f3ebfbe33bcab48294347d4e64004c11dde5eb409ecb19941ad1
+8cb3086d265060f8e52a96fcecddfd261886002c1821a8f59a1ddde19a6bb1354b17cd19a9cbec19149dc219a4c394c5
+906e8dea406ba0f0ef43ff623f8521039a9455a2290cae4ca9bb6494ee0aa812528267d1349bd5d339113dc9d1616b28
+b9b5212b76d5824d66b8df7cdd5effcb05ccab5df6ce67558872c99d1e484ab8d21037bc0e22f5c4082b192972b80acc
+a1fe817596bbb5bed93a5dc4c03e14eab627484cdc7ab7e4fba569ad0aaa93b34c4fc8680c4f8180d8190113218d26fc
+82fe7a20fe93564cfaf7eade8d4d1394d1b4e36048cb8632bf366d3d8084ee52c74d65c4c69d9d24208f7916278aa592
+81f42f9a3b8007e5f02c26770947f884c715bce1e600f38f164a390f159e2e5b6f8522ef566bf36422b14340bb6d3556
+b53d3c89bf2a4b29bdd8f1bfc001c2533f86d869fbdb383fe9cd93ef0c49da0692361baa9f537094e1af662a3461f8af
+8fbeee613823ebfd514e991d81babc05176d5c115907ec36dbf83a69eaaacd622f1f36be2e47b984cd6ac66a6b35816d
+a9068ba463ac13d4dba25f9bbe3c93baa35828563f357c53a7009cf0c809a23502e023a32f651e29f14424c5daab2884
+87468aa4c942476b3ac3000e740c4dc72d320884357dd99eb25e81d7b52a859b9ebeb55f3070022bcea3855a9a198e9a
+a5f1219eb902234ffe8ba809df590080ce8329ee574eb346f6b4372892d66b0725f048465221655b70b3d4c2deba9fa0
+8d9663d4b48cb86201d343b20a8e7a6ec47a4bce0e85a905be31121a01fbef95d9f29d83530faf79dda163c6c76ec514
+9921ea9176744e15f64b20ac6e95ec132052eb853ef47e9334108778fee60d9d9b53fa0b8011c6a4aaae472eb11cc61f
+a04c2c5e2c5a7673652919aecbc5fe09a636fcae2d06003ca6775018112b606e50bd2d6ae6ec6131d2a9999837186bd0
+a00ddb29776d2747e3a6e68eb51a7cb00ca0066a9aac5a2da632f355db515b32e2c441fde870c9731a9dcc8d9834557b
+85afeeae8bfd92c51522320cded430c2fef57b1950f9f966f47ce6354e492e9c40f950a7ef6d5202fc79fc020f7a6260
+b047d214201744cf7e675af5fbd29579c3b26020c5e0a53e2ce078778b3d3a673f0fd87eae8af8f0fba3bf0f8341b63c
+b8aa5364d914020158d11fe82c2b77197ed2b1a12492435200204e20a9209d3c0b4fdb6fd3f0b1db71ee3b986400ff46
+a59a903fcafaa8b5876a3eb1d79a7db17c37457dca018e393324d8db3be7c2aa3ed2303eb3530d6fe1612fd75dd92e08
+b1929c1711ce44465daada15808099234c0c5c8f43b050b2792b6ef9b77825996a74abdcd84d6ef08d648e77cf804357
+85bdc33f8dda0d853074e0657688899befb6356c38f0ec2ac27c46c39fff06617edbb1c5cd220314335bd1b792f1e240
+862047e51f9119f5a0a607469496c0574b0087d566bc58cb5b61a9a841a3cb693b89837a7c927c542ca03d0106055438
+84ba54c002150e5989f59064b68989413abb5f289f3ccba215b923f86f76c19718be51d503ce3bcec68322a7c7d5446d
+adc9ea06c11bf3f0d704b321005020917e731e6706f18a5aeb1b56dab3de39a94fe8aca3c248a47565ca5ce82face9f8
+868324c4ef80bae55510316f3a8b13aa40e60c8a3d55f4994439d1dca6f5928c4cb202769d78c21597d8737e391536d2
+a6e3b57e9909b5fbea2114c352b34235a4d4147417e480580c291308b4b9cd696b36278480893667e8ba01fe3bce571f
+b92e1d6ba0a2a244ac5ae2e7b20e152591c1c466c9b4c658c72cc5985ded0392b04ec00e32291f1652d21dcb633919a6
+a3e2bb4dc07ffb1e8dc9055ab45bf22864980f64b612548ca7feac85ecdc426f773d6d48bb7e6c7a578025bfe99307e8
+af764cdb70d5afdbb49dddd519451218db4e97ef3ee622585880425c3d85a8df88613f4b51ad40a1f6635e45b2efa5f5
+a426230b8ed77eca3d1ef7f4735fcfe0e51ae37efea5b96ea3bf313c241bd703b91a592f035e98056315c9822ffe8c26
+96a3ae7f1b80690f97372d086d2d13ea2b40802bd053980f73cddfd37045364ebe38064a8cf3531e9bcbfed421040f20
+8cdfbf0663bde624b703d7e6c36c5753282487147e10e5a24fdec75836f7034e4c38f3fa3df373476af969a4f835cec9
+b7f7a549cdfcca30b78349b831ea5173bf5b91d56dbb999b2dbf6b85d8c22ca8a9a62b38e37dcad7ee5136a32edd5743
+82ca90321c43d616670a7d85447afaa9034459b796b51792c970fd5b8f124e47a13ef661291a4ea58a495e68aa36dd87
+a824a36e4e2db2bbc513d39e4e2a841fa81106437eeb4fca9ebd78050667d0b284b7217a35ee3eac67d8be58c0af317a
+9370dd0c0f9c7585761eb5f06e7899d75eac07e13c140c64d4c506b90495fb8ea914f222608c478708d4b47163dc9907
+88c07e19252e905faf129e3e877dff8dfe93e81b3903b150aa33a93a7eda2820a8471be935825d709dc662d06c9f99b7
+81e936c00425f7db8f0dd88b16c3c5208e8d95a5072e69524f3b5de45f4e2dd25f0aba8ef17016bd914bc8f5a42fcb6b
+b23227dceec18d6dda92a15b7dc8623d9928d545db93b3547fb068c99cacb3fcf3d7f88e4357801de8a652b919dd907a
+b23f1627219587773c17070bbb190e1280ab27c5d7e98b43adea0e1f5017790149b71f90c3691301bd514d20238c5e6c
+821b7bff6349c204ce50e00e296982536baff68031165ae4c639122195e7295ea0c82ce66fe32a1b762f6a311aec384c
+a26c15bf1ef4d5543c4a006e4ad2a450d44c93c62c0f0b035698530cbbf925f6705d375e1dc8b2c6fd9a2c69f4126b77
+b5c5bfff4697fe13a5177fd87a8e293fd1c6782cfb3d1f95c5ddcb13c309dd1ddbeb14cd359c9f3029b57ba52996c9a1
+87a0d37f04155bc22ade44f567dd8a81445facff15d643886cbe6534aa44505e331bb75c9ea2f27624154a5890aaa2cf
+ad85c0e6345e2333a0ff76b769592f2b24fd0661984498dec6fbd2d9b0cec5f139bd71331a28b13aa490baa7fe27b635
+a9e6298b90aa8d3f4385858e08f393b3bd61376ac3dc44a0907ccfb372813bbfab1388d544c1a4907aac38a87dab2abc
+b5cfc8bbe4cd3ac1a66b1c8138c5c68e643f7f4c310cbf1483f6e48d4f7e2d1cf24b2704fc687032eb03978f18239072
+9493895ce0c815b60b0ab3a989f63c6ba4c752976160f3e52290a724ddaac9075e07dfa913e113807e0e57725b1cd593
+b1e800c2aa32d34d34b24dcf890f6ccde7da60b98c4646a5471fea7cc6df8862b7a9c4c40f38d0554e33e2984fd564ae
+90a18f877f149a314767f5dc15c8726efe5d20a8e15ad4922c6042420a2cd82018be813debf02c6d69b96e8a27c0c5dc
+8fe35142442c103e7bca602445b87cb017c76befc83d66894d4f810e343b3a571f3fba14d94521340ee7c5ccb13338dc
+b43547cfaaae899fc6295f496f213916e5adf9b0d75805c32df0f969fbc1b4f8584759b2a06b81546b48004d72f2e8d9
+9410d55865098325c7b559eb4e84fef8a3ae890e1d6053b3f173ce22e60ec6563041ad8cedaa2dedbb59f3dd645dd1b1
+b127d9e4b8280e10434d53207a7191782464ae83b4463cd8a32026e5d8a7a8c5306ba43ed9b7ea637d65f64d6a08bcec
+87de8fe67524c7d107d7033d4107659206c347c47cbbdf85e3441b53c933417feedcfb049465c67f4c4156219a4f63ac
+a582f976e77b861731595ea8450c6b525e371c6548cbf7911f05560d4c7a4b62a425d5c785190628d1aa1f8f27c43b51
+a195e358742d924fe2a7f955eb21ced7b211cfcd5dc3e598e0d2713c3639b72f986aa586b7a22a75f8547bfb46cd52a4
+97c249b70ca2f9da728a256d18d600bb923005ebad3e1d541ebd580af3fe07123fdf87f4e8f98fdf9dc8ddd826ab7344
+8fc7891e2f540d8f20464a36056f227ac2ef3bcf2b6edd4cd2d9024a48fce19480fba36afc7f5c4bd7234787b8d17f31
+9047512fa27e2d8d901516b5714133c1845494b6f2aeb2a0570dd8533852f00a8d9a8ca64979310e83ac73fbeccc33ef
+a1be9cba454617af0dd38865ec29e7d0777d7c68968c856f90b5bd63a7cc4274fd8b179be54143bed972b921864424df
+b086ccc8a705999184f51e9b45c76975ca8b108b32a3955e122711fc1ee007d8417a85c9cef217f28d6c7799b60aae4a
+ab0938a72118ee2980b28dbea9f7100c6f54fa82d93fba8bfa81b6bc34f9d2033a987e5d6d3816fe0bad53cb88bb8c2b
+90fca0bddc14f70282f11998fb4c289fad5c0e78c8e8f9e7a811f20413459a05c9d107ae771e9da501854022d827f2b8
+84cc69b7200f63c2214375a7a0a5ccc14bc02ae45bb6f3b27f67ac538d01e628c66b40e5c40cee38bc8634f1a3c3cc6d
+8a07a1cc0a96e6c6da0d27a540e235c2ab6a95d087e624c90cdccd781a9bea6abc0456d896574950a9e21e7d87fdc582
+87f2084a2f2218d7f9eb7725617ea37db0a19fb0bcfd7c95501f62fec0bb6bde3950690420a40d93e26f426fc622c825
+8c9fc9b470dcf8e576af943edaad28c29f53ac7e24657618c21d910eeba6d7b16f16c418bdd5cea3d639c3919e93b7dc
+8f026883d9d8c7c2a5c04e4c7220ba7061a48392a8a7794a3e290a94967d14caf040a3da3513fd9b4e695376e706006b
+83bef852b9f387a2aed0d3537e77c895799c639310cac98e7b699e9f5d74b2b21cbca58ef910c6583e0b849d665ad379
+b08a03accdc64474490706edce9df7853b78b719ee731c195f70871b7586ed274778d99b84ec3cb8cc0b5e38c102bce0
+99fada688669b2ea8d9b7cd730b057292ec3fabd30cb733ea3f7cb76f756b244cfb26df03b9c087b6d9c58f5233dd1b1
+8eb0fc7ab6b4238f2317620191dbe835d4ebaad0882e22e8f0857053d25d6d9077754251202472d875303669dbb806ef
+8fac2cb38c3a1e361aae5313ebdc1c7e0b7d1a440482fbbe24389a7fcd381169fb325c79e430be170452326cd4931732
+92bacde1472436209032f0592973a5a40d505a9b2c9de648eed1ce392d0c18e23aed9114a9634ad3a7e6afc4ea80ff21
+a28b394018434be07323a2356fcfd6c70b3a4b1c6b6ea44da1da66c389a659235e0dc941019bc5053ca41f10d9b6db2e
+a6d23d7fe7ef475bfe6486ad4a99ea376c6a6db3e70a0a7af421ef6e6c4d6b9cff68d03a7239a56eac784769f63b2bf0
+a1232e6747573e19df98a088fdba57116745612cfdd4ff21f8df82a66c7d5df7e0a6c0cd73117121a516dfaabd0f5016
+8dc574376016b73f6730103cc45c952c5df5d047d0b4ab3da0303f66f43f7d147b5eba5300750e885c621e72b4a64b43
+a66e9eaec79c958e624655fc2adb7b89ff3da0393898e028bb07cbd6511ca8d9318e1d60dc11cf0265a498290e756ecb
+8e5299b661dc0e088527904d2c2fc0256613a1fc2b92bb92c633acf145edbeeb053e82b468a3877f6f14f0878fab57b6
+969943ce7b54f6e728724b26cfdf4df90faf9f9796bafb910ba66d96cf34062fee6ed9121abd193c9e322950c8eadbcb
+ad29ce021d7fc875d1e61ad3a99e112ff092ffd7900a608bad30517e50e2270e0f8dc7fb5cd42f1bb995c17d86268f48
+a55fd82520f4d35434066bf93a9601c96549cb4714d9ac05c32e16803daf8763e23c3125d2005eb229bf5d7e2a91ec3e
+a95eccc21af531c5e1a36ce88eda6b87732f5fa680e851bdeaef73421c1c87c8e66bc314b07ab472ecb67a08ec53cd4c
+8f48b5a0636bd89a1ee259223065449523984cf3bd9be78c9242276c848d2140bd94d1a6670e446b51b178ff694b5c7f
+8a58b340e30f0cbabcba1c565b68eae66405fa2242b43a7f7d3bdce279af42fcb4ef58c85fe89cc2dc56a41a51f058b9
+99103a659e26c9a4d19404db4220dcc5defbfacfdd969eb7d70b4fbf9b2c91c92112c0097e8f0c32ddcfc35741da21ee
+a088cc15a45094cffac52c38df427b7144d621cd1d12ae87d74c00a039d757e36fe3cc2fb35fda9b33b375553585497c
+a0f1d15bc388f6602c975b4b9cb23ab83fe31124acd946195b999620c3c20c6610157a891114a43e3af551d7b8c3e4be
+a571057592f3a9008bdf726254c364975705a71bce4e084a37915c5317f635528088a2f50afdbe7240c14d813e8e979e
+a31e425feee58f8372e2bd4c21c48c299850df34044f27db3e4df55fc5e7c042cd19be59500acb375fd3478379f06053
+94645ca6400f80d9a90f5b1c5b515816d6049ab04a552109c9c16b41366a7f3931d49338d944ee8eaf2ef5c77062c362
+a61fba865027b7ccb03a4ea966081325eb64db5a64c5d765d2893f6a19411d40dd957d8a0b34733aeb3f002a4e0279bf
+8199b89ea13ef8eb2f54d27bdcc781a5a7fe5bfef4ba4444bd651ac6021f4d90250b2f2cd8c63fa3ef237ac6eb1bab36
+b39e1e98d07c95a4fc19ab175147547e5a20e66c044f29e4855818db4a7d0e7e2c24192aa8c89fe378f8d8ab3e9f0e1b
+b807bb0069474e190b40bb2b34165351e73a392ffb0de83879ddb181989a22bccaebfdc90748f54de81c41ea244e7ebd
+8b058266df90032a1a9befc7abb759b64a23ab628edd051da8b81db4211c72fd63093dbd94796b0690ff2b0c0fe16cd9
+865decd95200fe45947a4249d2d8551ca5d7b3d7955adf10f94ada3e69d684e5c5b8939fee9a4457f22d21bbd3ce9670
+95fb5ce7af13976320b36422b5cd9dd46379d13110fce619969308ed6a250cf3eb84c73e8ba1d32edc01aa2f6e367707
+a1a176350aed82d5ac01a072ac7f3cc1535e20fb597ebc7e417921537f9bfc4cfc0d490d4df831f0f8ecedb6be970a15
+974ddd091c1aaab7ed356b65c244748a713e98b133c5606436e531c31b31f6ccdcad2037b12c68fb54af4b19bd1d82ab
+8ae9b7a8cd856087300ca90799ec3265b92f84da8ee9e98c6ede1be378dc040d0fe68b8ffc94b146f2521b9fe3d19e54
+ae17df60b83e4530af584991b545bf4b3cc1045416dc15250a6b75a9a04defae4c0f60b8bfbeb54c8a21fa84fee58e69
+aca1e75d4a05282b0cbe6256925c0f269a4a8323888bece4a48aa0b5e7bde7fbf1d3e4f5cc38fe6a38aaa091ccbba4f6
+ac19171d3ee2f2e5021418c37a0eb25c083de6a6396290ed35b4771abcd07fda745fd082e3c32c117bbab7d9fec2b67c
+ad8a35eebd3bb28e08b9ef64bf2d8b75ead69db29c96544d71686ccc0819ebc6823e49b3b879ce0e5ee3131153900632
+9479f12dab191269b020b70132996cb32059ac087e2a3f3e559d297494189e1d6849c340ace032946e12bd4923a3908e
+8885e680de6c158cd67d66c142b2b4ac42b96e97eab8e2dcb90c3b454dd214bc530fbab6b5d5746064b9813775b6d5a0
+a16d8d27d9b2fa04c7eb8436062a53ee0a4d679bb205d7d7cfc24e5f28e3752a9959847e9e31496bb0cb1c11caadc30d
+951b00c69dfd9fc80b17733b843c440c58095989bb8744fc9db63a4a6116f24d5f224a279478fba8cf57753261bde217
+8a693564994a1dd298f0b279e618b46bed349c53236fed9d8e05ad9383ce55fed02b8a361fb8c09ec5ffa8a271cee015
+a09fbd62995a33904b4a34ac55c80f6d4cbd39a902f5db1038d909f1a2d385c3f5eab04b157b5662558bf35ed29cabc4
+8662373988373409a4b31d45c5110afc32aa008bccbeab39d5b09a0e10370dd879684e722a8856b0da278e2bb91d67a2
+8980d3cb8a82b3a827ba65f44e50efed0a6f37d6c150d70e4dafb67b1db173b46ca29d487ef9db92d37ca8312d246008
+a279558faa11850aa4f0dd9ca8bddf69cb98bcd4edfbb0c19f22d1bff85d808e8f2cc026d95afd09fec2d15c116bcf73
+a3fadf9c3066c93aa6a31d2346ad0a1d012c12ca7a24630aee46a087eafe5fa518d20647856d44ac03576bb3a9f81a76
+8a8a19b09417e1b1607aeb54841fa69f58e094b46971c6a5cd0fbeb2aaa98c56599ac242272e6973ca0a9d2c09ff8d77
+858a636f510b494edc76e86b1718228f076b8a21306b02abd086dc2a96c7a034704d743ca5d89b17903fe7b2e43e6fe7
+b031b789e4073b82bb8c78f9d3fc2b901d75278733a4fa0a5aaf985a298269a735217e85eacc0dd554375d610a425359
+b8603ce7cff755f5e07eaeb4d74dff179cde405234bbd7b3f62fd903054aaa34a9b868b04617d7d407c2b8e377227f07
+aa41829c941acb3f9f0e2008e852fe855e153960cd3c85c4b8ab9f97ca91b7a5aa18f997cd023ba9e03a653f238a4f46
+a35639f920619dff592176aad2b4b071d5c960f149c3a75311b16841d1872f29aeeb7c155cc9bff41ea7ee56f799de78
+b252195aaa52e9a34936ccd1aeb40d28fc262cc4570d4f9685da8c591080e97438edf64d4d4d074491344bb5e86b6b23
+abe2e52d10620b503dd1aa584e005d857294565ad90dd89217a77fcce4bea7b0c72d54dca7a1c31b5a9042a9602557cb
+818085f2f1b525d9b2322c8785bf27a6759af9aeb231b0977cdcc7d7e77cab5de056e522dc791e72b8d9b93a9c41e833
+930f64d40ab26be006e91deb854c5b22bf6951308dc406b2c7c7791d5dcec470529957fbcfd6a3c9655d544d974de7ad
+92b28bdbea8c7588ad3a27992c19d73bd3a478b276f0e11c4e82ee2482e4e167cbcfddd17a1ac6bebdd862be65f54098
+afa6a85fb906f5ffe52b6e9715435dcdf9f7892a396d740d67560fc42248d23bef470989663a73190ac9da442cfe6a82
+82d3338e58fb316d66694ff4674a5d99bf0b13204dd251fdec95d48382f2d2ac60176a19e5ecbaab5e00af2a39a338b9
+b30cd35eb15b3910b8b8f91cf04c223d79d587a7ef713030f0ab93f446caeef52c60ada365f8d3d645b477e7fca61d94
+89554d2a9a11dd7e56f0b568f2a50c72d86362d95eab5d94a2386397012e18bef7c9e01a2d71fd325c0692e4d316dd16
+ad58326fea1c00e0f8aa92923661be4b3ecc79164d68e91c4d1366c9894b6d049a4f31c9bef6e5f21466ec014ba6b94a
+8915a16afb0e68a84fd12a9203f8f348954920126d88136ec027a81f541b67c421b84ebb3d6e8f085c38c2499c28ea61
+8e246e1acf655572863481367da007e94bc1bdc1f28aeaa1fb163dc05a51c3526a2bb9bda0a14fc6d658d85a9322e44d
+af83f9ad3c7c1504fcf60084e0948624fccfe3a9892dbcba8f166d0d67b475ce57ba008f286069da20a0da0cffe3b4ae
+aec86d2d803612e8d27a01e3382e0a876164baaf2f3b8c4e9455ea00bc2e525378018e6a41ed9686c6408148e852bec7
+871bdd8c84abeb1456ef73595360de6cf9f92ca9e6a8b6b816ec7497be60a9f509ef2c91332d17cb5fbd347bb0113d2d
+9503ce513df28b61d721fd5e8667272a28f210ef787bee58538f786acd16f04a412387c6f5e6313c43f426a70aab65b3
+b2cb0526e7e524ca9fe918e951c19460aca911d2b5ebf97c2bc74aeb69778a28316dec8916a4e3628b46bc51586c1bd9
+98f52ee1896b632dff5153e3d1fe389c6200b14cdda6b27e12d4a4182763b63e0f587386aed78c97a32114dc286b975b
+abbea974929c9ba70551231e3833d5cecc71c60988826771f792f190ca77c80efee7607dc1d6bf01a53796d8d9b73017
+a4cfea1d06cf840bd599b14c011b6b204b2cf6f57fc7d7f310052062a4fe8870f02504e6c837c2b556c925921e543556
+b957529d7e5d1fc45c5a822a6e0e480e46af2f5cc3801c31996b9b1acacfdd8d142265148b3e1453a0df0c5e6cffc5e6
+b7411aaebb1b6a6a75568f81d052e60fa7752a64c20dd7cd5457f999f0185807987de8fb72ed94ca9d1148c19ecbe1d6
+84be67a5ca80a1fd0f43cce4c00a465f167445e42232c2d2cad5e1097a62d3ad564041a55f0c76a340387503f15e0ac4
+98803688f8e7b445c7ad14277b9f5f12acfba4f9a4ba6df9e2b7dadb726f1bee5098fd15e0b5308b6686a38864f84912
+b085eaa421e566276bcd45d8b9fb71475c4530d63e90914eb2a33c17333d5628c1ec8a45691cbae82ccad97d4addcc94
+a08ff7dc59dadb183dd0b5d336b6174464604bb2b49315e0c42f34ea08a8bca9dc9207750638bb7ebb6387257411956a
+94d72607cd8a75b2fe2e9333959bb9d5b54d74ec36fb8c123c157b19a17f01f310b3311116b34bcfac305e9deabc79db
+85fa61a796226ce555f8195c792ff6f3d483f62dac41c17b7e8295bd49ae6039574896548728fad4ce966be84a62a6ca
+829ab1087ebb61db05c59e3c9d03e7010f8c546db117a6409bb813f6fa04061833771c8aa4c5e2981bd1ee551df0ea59
+97f5c5261db0b130bb8352fbcf65002327bd6d8a7d4fee2a9bc293173c8c54be37ae229c5488c1983bc1f7857c66188c
+8756439e5978ba19e2cef95dc55f706d53a05d1fa964c64d89b0e95470b5344b2f8d44680080626c37c77a00ff0e6b00
+915d33f90980089c33f403ba4fc5c689ea7f1656f5c4e1110db987c59eb981b6a46dd9fe82c8efe7d1e3504f1d2c4d2b
+ab5bbb84884ef036c9b00a84f7d5ffa2931854e2afa5a63121fe64d548531af4203495b977bfb9301bb1e4679d42665a
+9830b846a9041e4539eb858a179b4db6da89b507424e6d858ca4334d973ddae255bbfb04ae25c3276ccbe97c46f5816d
+8e35f4563b8a5c9a76cc1da87ab21cd894de393dd61bc977cf22d3de454de350836e032ccf7d6ea55e2e6b83c4424146
+b6338ced0f05806c625905cc51b7e772c5db3bac144e897339f67b6949f4d648d41b7d23bd3f299f4879507951ec031a
+b3afa470fc71b92f415b879a814feb0702b6adfa08e395cee4f7d8b0e3537288f16c83b28ad4e2db02c1fd6d39e6afad
+b4fcf7af3196bec84fe1f6e3bbebb8abadbcd46de02a37966d0ebe20972fd890803d570e4a201f2a89f479e09f19191d
+a21fe1f8f57691165d0c7d8436765562cc935288f24fe765351be335f906c6c4dd1d0714b134c51255b14511c957319e
+880a3a8f6b4ba410be06628a011e6bfd38d86919cf8014b4b4e1c930f8e3035749579389690f21bddc4d4699de8a4b1c
+907d93a7666d847a140367c0a0ff80a96d6a8295b07cc4ee52d3be987f431d8dcb95d3717dfd248a5643c5395ec2891a
+b8f38c78b8a2c487874c1a6a92d15cf0dcfd26319d4cf65c2f4fa9432203ba5ffefb02b7324022c34bfe0da369d96d65
+8bd4ebb6d720fe52d626a621670a06c8a304faefca3846df1f619f4d456e14f8bdc547fa7210b8639b89c6584ea5c5d3
+8ebdaa288a71a2d3188d6294ad0948a4f72c1eb6a2e921ec82cecda4d315a86e3e6233b5ffdc7219f34a99e9b4555317
+83320fb9dc62119655bb0055192471ae06b7641dd4af64670a4d9475155733555ad06a93ad2fae72e029049601780654
+80b3d022738318238dd32f122bd88cf2f734a61e315ece521e9e038f4a9bd7b54b5e67784f5949fbcc5fa911dd4b048a
+891a23b4bf5cb8558b4540b66fb6b9fa54e9d0b2c084f660c8bc77af5ddb97cb5d8042b538f61330d9fa8ccbee6c8a41
+8e5651d9c95aee23835bb1a06eea76efc9d5c881cf87ee847ee5149fdbf3d67dcd8ad0675dec8fca6cef25368348abaa
+86bf1d094bc4fc7c21b21cfc7adbc750db0b27c35bb160d306b26fefb2699cbbb1fe624df1b9e7f6f895f1b81a829361
+aebc3cb2623344315875029378c71ab7ed3cdc9d3d42d4b835b373c8420adefd177a44e532f3f06f74f0a40d53713e5a
+9527f659e93a740b4c50d0d3d9aaf1a85936f04866ffde1aed30ab2fa1c1d565b46bec5fdfa510fc3ea934137bbd46df
+8488673a4bc29c3ce9133cbf41c546fab4ff28c5d46048a21e710a8df4f2bd1c77d0ee242dfd962a30d646e5ebee8c01
+8cf29773c0e0fdb75bf6f52d7066e7d6e9a3ef056bbb70a98026464b32316189addb5766822f57df63bb68b78c85e1de
+810c6c1aa53f9c3fd0018651b1bf25215fe24687b568f21a121e0bebee576a75e5f0d08ac9c6c21085e52228b314c6f8
+b529a87fe47402aa9ddaceac63a060a6640418891f931036c6e4098a1b308821a6f1a244fd5c1c22a6ed5f72f6bcf825
+ace9284ce89b5c81049d329db2376a85feeacdd9f735cf00038adc51865bb78bd9bd5d060efd0b727c509ec19988f99b
+a2e7a949c951bddc99e68d80b3f3fc4ab960b682229fdd794f9eadc80bee91dfd5eda0052149d05c74fa33bb40d75ecb
+86bac22daefca9143e0b1d25534900b1f7711ade4437642043c4a8c65f0d963cd1f0f958c7391e5a663dd3c59ed9de60
+b7d2a6e2d44edcaad19498ab3368bfb87f9ab039cf2249d6e76091dc3db0c3bf45012779c02811cc818e95796e6ad9c3
+ab474f74e1ebb3dc696e7a6bfd8845ef15fb6411fa28426c486f7b0f789a6af3016ed5f7da2a36215729f5cca0b36b4d
+86616a1a9dcb50d1896f3eb937bde67f213558feb401aae9898e41cf1fe33b443170c7c2dbd1648c9e3cdd0c24289286
+a466169a2d95a5fadb6a69c7061cd2911c3eabc0b1a2488e216f8cdbd2c5bd87e80908b002b9efa51a67f02d7af2155b
+8368af8b7c0f55f3c4f7036fbefc9d6a0ee9ff61197cea8ce48546753bdbc0b61eab604b8fe2c1aa91ced7a879e5899c
+996c91779ff9767232ae603c5b1da5bbe0e303c4c2c72ad2d5944ee1297af3535f6bb3548fd1fe8a92cf4b281e1d83ab
+ad4a93d1ceecedd27389c658b38dd71cb13c729b27e490381d8c3ed4815b11ecbc37b1f82c0656e0ebf77e5bc35196b1
+a3538c7ea3dddfbae80d67caa9fc547938bf77114559f9fc5180d9d0ab837d7fb1b27bc37405686f212f2e98b0028e59
+8abc9fe135fbd48414f2ba28344d9f49ec2d5ce94fcb314ab8dc31c754f3ab7e6ab268184a67dafe8b1fb811a762c112
+99ace100d8db88a83f1727b7b48baa1cf45b971d08112e452f5003566815ccba0ac3f8b1df6504f55a392efac8e3e70a
+91ff50978ce629651f1501708908d75b490c18615e933191cd37613a83d4b605b0b48d024d27807637e662056d76276e
+8e4104331ff1a40cbee9f489a814cf5bbd6fe4eaa1cbe1e13625fc3e6697b27d933265e5ef8728cfa8fc4ba5b19a614d
+a442360d49bc9ce3e75eb40bf2ba05e9437fa594e8b8de34bbc822cc7b706dfa0dd10bd6bccb702d8556cd1320924821
+b6ed6cb0aa34d5793e929e0d9b9651e41da3457a0b20c1bfa93a8f65bbb65bc07c7507482d71c1c285f5f663ae60019e
+86d64df2dcd36d0c7348c77480c8af33dfd889bae7bb045888eecbd317cf3e4731b96ac18f410a99ed33a3f22d448f77
+b8dd25415275d5ef8260bf5195ddb9b15b78a8799e4d15cca7d6317a18eab7bcb8fc759be61360915a28a8fcb5d6ddfe
+a325a334c84dc1d9acc0a9315b399d4be93351c7049f474702ab58b4cccfd69aa50b8731ffd598ef0144ca96477c273a
+9012a2dfedda5147cb9ceac681fa9e75e2901eeb3c94d87465a44d11250de4bc66d1e00ff674f2da1d800b43f686df9e
+a1049d59da2a942d4d2aabfc0d972ebf3babef9c5d8fc5598ea23a048c2e58f7f17b4d860e437276bdae221d9e41e3b5
+8c9d9a8826c812943d74c4d4f0fd2f1c8087135c37bcd9647b722b59801b01775a644e38c24b43e8e70f83bccc4afa27
+b9cebd7bc7b041c18bd35b970f87e9b5183e4ace034e21117001fff8a05b2a7f9ab65cf6ab8b818b8192d1db5649312c
+826710d6432ef97625db25104fc8dc3225bea594a10cdd4473d5ab72be57b74928ff356d210032a61ca590bc68509880
+a18422ceb8c61af305277628e154d3a9c49f47e230a44c6216128d73db7c3ca9eca9f87e29cb2126f1c312f423c61463
+919d357886de9eaddcfc46cd43e2b3dda3f82e926a3aedf02ebda9159faa00736bd2cd7aa044c76ae238a3a95a5bef38
+a822d5a726f5c38e9d4a750ddec80bb965a6e5374a3d87757e2e48a18421f3142c3985450d1833f3ff4ca36e3b838c89
+86bfb86eece6f6ea8f51985e312171b9bc821e0c3ab4cace556da28dd7bf89cfd5be3fbdadcacc19f2371c6a11c564d5
+91b42643b297d8eb2c1bb3f16b57ab2964de99dd22bcfa07db1d0010715ebde94d11851df575f4f1ae602644e454fe0b
+a5e444ed3d5fb3c5afd2c9c24d676adbf396f5d1d47bd532edbc72c83845970582ec49ed026b3b982c9c1ea725192cfd
+8448387a14d84aac6afef682a27be67e5b05d31b59346748d2940072eec771adb53339f335daf4463f555da2d8543f18
+a5034b66a26bad0f753be56dec722fc98a072bcdaeab0bb9cf35a56a573d9424cfbadbbaa8ae30690f7c6c6495331fc8
+9317ac32da1772099f41564ddd8247e3532528b240db753a1fa6fb35cc039c6a4ac4546597bb2fb28721684bdfebdb88
+8b4b0001a6234335502c8b17c4de274b83b0610960b5c46b9075c6e41f357ef0d8c94e9b14bff8be7849435512626ce7
+b1aa903511fe4219acabf8761a8e4316cc4f8955ac8640c68a7b547cfc65365a8fe0843a4098f9f17a4c9beb75624393
+8384f4953395aba4939b24b0669853df78f2fcc01b2145c08d3fc333ee2a7d4adc12f2d81c37d0cc187ef45b5f69f59d
+92beb5a3c14637f84ee7a3c9b4d9b305b10af8963c087b86047e9fa959f41ff362d56eaccfe887bad1ccbedc488abe2e
+8c60e16dbdfed2d1c8cf3f1bb0b0f462489293892f9d2e0221b1691321a771b163fbb599daec4cbd917da75f5f662de7
+a8a6e3041a0c2a12c76f51139b221b03ccd1afaea3b72ba2c3533b797d5f67d8b90d3474b4f6f8e19a77894fb90842e4
+966aaf74560bd4d164ee46c7d393b2c628e307019ca4289dbfb6a9a991608ad80efc1ee6e9847a19382ff8f3004aac8e
+adeaec475d4bfb6075be90cc37d61d45ce14da77f8a9a508b9f829ddf2abf91683aa2fd0372d3025a660c94b0f612685
+b3392bd1ad0c202d4a95912e0e06d8c64d7e2a8818dba8f895abcd0f6932efa9a0bff8a2aac107046d3478782fe42d33
+ab38804443da16d32f11c0e364449ed351dd36b7c82b5c7ababcc33a930acefe09fdb5261da04f6dfab29421fb1cc017
+a34e0df9e953841bc44c09e16d69235a26ff390a6d128339ac97aaae5616865f86153d8d7466519dec6c52ad592dd3ad
+99581db106391e6816403b1e9d13747aa05bfbfa5b46696cdfdedd1627b60e1ddb92215d138e007770512e93bc6184f7
+ae60c3b1ae3594aa4e3f08eeba3951157921aa6511148c6d32003d42157654d4a3a39efb1bb317135620f09729d134d0
+adab0bc35ca3fefb14729259b16907a34e10ddb6d78a23f28596d3d9b244709651be7719537df33bcf003c0e43bb1a66
+a31b7b2f3411f986b3415870ae42f90bb678a9fc44c942f6613cc4f90f3dbffa4b5fb8bf3abfa4361dd8e396d9a3c5ab
+a69b188a8662eee48fc98201fde6f0d14f6b54db83ab79c2ec2f4b6be809773231704fae2cb281fed8b05107c63f2fda
+b79e1e7a9045af6537981f54dfeed0a1335606301b73eff001880798f01ae9c0fef6e427e171afbb1d0a78135ba912cc
+b1b883fbe379995b3741836a849516a0f21b18f42a34db2c8cba01f86711a2baa5d14910a110f1058e36431dec163cbf
+87bc463b90123cd9e177f2284d72a7f4a1d4151659e1e4e8900bc21986f641af2f9a3386aba56601e6fb64da630b84a1
+97a51bb7d717495f943db162837d3bf700ee0653da9a94b36153443584602156e168fde97d77407d0861641d8d373094
+8b02561709564d0721b5247775dc66c6c09cf68a8ea62fd7dd361905ebcd98bdbb2c554fa272de71c6d22b04d33e6902
+a914b9406e71c09deae875bbd628af3f54de5ccf811365cf229dfc69541d996689d05679eb02d42a0adda02be6e32d2d
+85dcc5f3f77f72cf0818bd04c037cef560f0b0eece3191e06fcbb54228d11f7afbb8d9f8675b404bb39ffd04a3b65bae
+b15bcb96a98bc6cc7b802dc29b79a903223b1712a10a22e776f45c530a4f767665dab1a3c6d1b52157f4b79055d5ac81
+965e353e665b3734042b61951e105c1800718eb3c46759952755321ff5c639327d045c58fe90befa896e96b826910298
+96776a5cd26b69f08a68af0201b2f739cdfb9553b466271063a6c8b8307f2a3f51294ea12c7e8118c0e6b884886e1bd9
+a369453bfbe7ef0b2445231704abba25527b073bf735a968758975fad789c74110a573bc7ec50001368209a0ff385500
+8e54dc4f2a557703b2d8bdb74ff107bbb239034ed363818197b2569c03572c14cff21273e94802159563d50205edd651
+a1c66a1a82c60dcbd139b8ef4de62be423e7641a6b94ce0d0468e60bb1b000d268755946a028d3961d8b4d3722016ad1
+b14b3c26dd9d17d6fd8eeefc7f706c177ebbee9b8d05f9b01174deb37649f77f97ef1a1abc0cd4ca7a13618a4036067d
+8fe8f9754c5ee102bf96ba6b6f29a14fbf83cfe3c5f81b5358ccd4db87fd8c5d88760172373bdfaba7eaac98ab1fa863
+a8c308c15242bd9c7b28e110715315a1f9818ebe03662027a6f1feac13a5dc9bb111d29444d13546d8e441e49960b0a6
+85d87035d74a1f4662f42a8c6d26782daceded0aecee9232b78139b1b50fb764e87cdc5d1ca9d6905735dd9c3dd00dbb
+986c31370f594d4c8a9096c091cb1484c1c0755804819a9462ad1b67937c6b378d97f1e4c27900405b21de2646be70ca
+832b4b427f3347b0073c24f54e17ac16d5a80d04261c1d464f89dce89f42750d69dc8a83ee0481e410f94cf1d108c0ab
+b13e54d91d5d414223caf43a7fad36930300594b8cb3ba97c0c873cfefedc165d05f05deec8d74a0412d5f0932813088
+89c931d595849c8e54f50d550ae4a5d71c4bc74af436965bc32adbfe829a48ab15c856a69070b4a4602e0113131ce4cf
+b03731793db466b74112a1b9dec3344fa952e81bfcc7fb2bef3cb20f566c3b2bf60c16a93f84f77f4c83d8f2a535a2d2
+92e8fc80d49001139363e3201c93db8326c41322db51937ab641ee7f1b2f7d03089e20eab19afd27abc23de039ab4b0f
+b27d95c90dfa91886aa91c9c8c85ce09fc875279028bef49abfeaf44437a0528ade620c8c2b3d712ab594e73c5c032f5
+a42e2598731a792975feb5b24bf00b1e7cba1620922f8c2319dd5878419ce6099663b448299c0623ce400875c48e12a1
+b062840f63b555a254e3bc36e9075d57c816ed2e9cb0e262f9de0f3692456d94eef702489e5b11c9746b949b5e84c06b
+886226745d906664c476615dd41deef6c338ee10380657fdb75cf9ef28b4d9f56e69c8d0ef01e9cb80eeb42f3e5773ba
+854a3649dd5b22def4f246eb0d1f1a206d3dfe42b5e44b5fa963a7c5b8bdaaf7f35b542b3e9cc53187e66a2315ed9f9e
+b5a48cef68a056955ef4c080c85e4044e9f8a562f2beac9fbb5e19f8d618718c86794338c6dae8f94b6f5e9f8e98404b
+8f8bea7304cab80d0009b417c198bfffd166eed6f6db19f28b7616e8b0733cf0a4d54d204361d7f8f179985c8c3a16ad
+8af81f10339e2f75f6b6fe22a641298bf90c8676260abeeef90bcd52f46ef013f5aa4bd9d0b5ec15be61b7c3e0f32350
+b0397c64034598c825f9ef653ff16f680325546695ee6e9c2957d3c87593161a063c5219304ce6a16b7db75f1a2c5f7f
+8d2e7677ab6fbe2b0f5ab6dc356190bb3ecd7fc468c698d512a6c69f22ea97b71fa961c88635897a5b539ea51b70b4a0
+b4e91a693cca1007fdaeb7e679c6837bb8eae0bf61aae447560ca6eb5ba918cbd9952b41769657978413106b359e169d
+a8331a907ba7d95a5e4090a7680d1bce3cd803db49fb84a48996e96514701de1602c4eeb4b5e0b1c2a106c4f678a72a7
+b54dd28a97a5f934a34c2817af91a41e57f88d7eb5fb584d3b6692f2d1c4b2a4e273c4de5fa33a0fd1fa02c9d7cd1fb1
+b8b780e0f6059ea27aec9f3693ac9adf0b93f75fe7fac5230deee1e7471df0bce9b5b2f260a6a0a346afa723860471b2
+980e9847ec83d61442a86cf8c7464b357694dbe67aa5de3a8c88ccd1a038256453101366dcdfe11a565065d78ce89807
+9350a17e397bdc3d2bfbb84ddc79a48bdc6ef5c3d8c1ea39251e762fddf9962b69cdd42c563d03f64615b72c9dab07bd
+a34d24b69089cb5ffc5f06eb2acfeba13c96a1096d1af9620aea28753baf3d0aad0bcb30037ef3a5ac36b178816e878d
+a7c8b9108fceb4e0377eed48af9846530114df986cbdd35f6d54026104fe6bfb3b58e57fa2b3a750225528f8dcb8bb9b
+b0f71f6a04cc7119db96033f89530853d58a445565de2efd269b1e3956397c35a49c328102325b780fa5d0cf5adc2a4a
+92be082f04722fdf3abca7ebfd162b7062939c3410ec204d5478dc8de2bae2b25e2654441d29fe2c350895512d333ab0
+95e7afbcac22dc2d04c5635d7a8c6293f6ce29bc6c932850d24ab5216b449251bdf7aaea838ef40e0e4eee1de8f63bfe
+ae0a877b488865f21194470677e12ea7e357c5d63f6bc454f608e33df9a3b20e9aaea5b6aa42e8999779b8b445831c39
+98df977479667e23b897b91f2db8f4cdee7ece7fc3ecf8a07d752efae090d8bd34d781353ec1394550d8a207bffe582c
+aaa0f1bfece62a63f3bc76862b8789e2593b4bb40b3c413956e9e5c4eec604e39d722cbe1db210396eca7c2293489099
+b362703d2b72909d06407d139531fc144e68ba94e55643cc3cbb9ed24145223aff460b1627b41eb9a3b709978aee5a58
+b020025128804bd642fdb1d2b70b07d181e5ba30a5ee16f6bd00d7e2d0c6af782e454cec107304823be61647e65221fd
+a409894c0030081a2c7f8fba27bd0ac53997a31b35a33498d78bbcfa0b7ec0a89b9efa99dc1b8770ba889060f39d56e2
+862f9eace3f54288749ca8402c22ddd7829f0454d17ff4891727c86eace899cbf72d302065f5f581169f00186c23b4dc
+91432f2a823c3ce95bdeb5854e8dc7faea5031fd65c82dc69e4adbc5ead2e5a5b58a9cd1428d3f526cf94a217f37d7de
+9543a9038fdecaffecc4d3023fd67f7976dcdbc7014e82edb4573479b1789b4c610c3964643e031f69ac7a3e3dfbe241
+b4f31d580987f47c550eabd2d276678a294a612ac26806a06634b8812a571391151d84c29b6b82218cd84dac85bdcc88
+8d922ae4eecb45ebc23eb1a8404aa1524b281d0f0ceda58ea93a0cfd4184efb894c047f0a46e2d007704f5506544907e
+98973979672d1d52e561cae7331b730a577c422258c22720edc344aae35ce071be1b017816d58bb29b9cf5c433fd64b4
+a46be974ea72c5e5bd16de591bf27087d97b9030fb4a74743bde5e480052a0de58bd962dbbf0e0fbb0559566c3d9780b
+b2b4464973322d865207949afa4dadbd888c9b0230737561c3b76a1953a85ea9439fbb1db9d0d42083c62419db512450
+ae811a9eac5f4ee6cb3a4dab456a3e5d95cb1ab303c19e76fc4b36ef6b4c83ec0b2803ab8680ad1663bdec0ea2f19aaf
+95a426f3d2ae6c6069f888010bb20c392bcbb65d0986125e0f0066d4206f4f443f70dcba8a789da042b57a36980e75be
+a9ec01a5777d10275153ba7441f2e27ba3d6f1a875f204469220ad999bb8a0372369278bf5a11640ac0709771b814a31
+adf1091e24bdf10d848f1a0920eabca0a2087220fa0c3f8e5b4c72ca0424ff3e0c77ad4c259c12c3cd1c0eb0cf32c67f
+b9a57eb8642729541088164b9974775934d7a4c56a3a3ff2a190d549b294fa87002810f31251170b0407c7e9695cfba2
+8625501e5c56948812b72b3495747412e03ede90096be089cb8040069e49cddfe697766ee72505bf715802fc77c08fa3
+8a745aeeddd1be100474d96aedc737208ef19a93a8ad72c10bdc0218073fde6209510048eb46e271553b04d8e6529f46
+8b8d9ac3b91ac0333094c85e81fe2b8cd5c2207073a33f66bb1939e8f1c84ef064a8b2ee984a9f450f0a6e54bb56ccc4
+8cace31444da99fa5dadc7c46f689fa427949d8c089af3d90c604fbdbe0dab052392fbad4b5aeab707e4caa9e739f366
+8750c8bd1f1abe5acfb29ecab0923008cb4455ae8a1db01bf3317df05e1e02f9df3c74e879d9c57b8f59877591939ab4
+8904a39ad86cb42c06692d4801b3718bb63a07a2dc5ef13de16f668b08968db34966457ff2e4cb770dc61a216f4abc5e
+967d1750b0db53e977bb9ba65aa820d7970f8c75d5355cf12a3f4c509dee7e9b6c0f7a828474b167c25b15d74f0e9cb3
+b37297bb6c2d9175e0a7654c5bc6d248f47f7183c3b10375f07e21e9f3e66f6581caebfcf468dc0f8c04132a2a0ede55
+803862e6fbca945cb6c0ba202257df5c7e1e1fadd78b842970206575f70c9757d4a54e9b1a0a269dd37c4f830a40d2d6
+a7a27f2fc7a1e6d276522177f0ae6630dcf5205d08c19319c315bacb165b687d125832d97ed689960885bb7cf42fdf36
+87fbc08506fdf980cdd534d4ecc4dcfbd381f3937dafa09db402e07a67e1cde579e680d3f77865b5669f35fc00901530
+8fab8bd57f76d187f1cc22e40b51736b1b0234e70813ca02559ded9c7835cb3dc71a24c8f679081510c32f330d6ca45b
+8fb917b7dd71e1728bbf32fcb55343890aa6fc890740f41f42e9620b5bc3ef8b1ec67d9c047e4a9de0863a5eec18e5f9
+b7429e758850bb7f69db000d49763df43d18af11460ee0f158b741dd6b7575527c5c8068cf54f7f78098f9ddb92a82db
+8bd3c73c1b6f88ed2696d53d2a0617f74bfada964d2eef2afb5e1cf00bfb646f552643c55d5453cc622c9ecfb23ad492
+8e025e91b30b0f328cd6b79df9603698f1715eb6209e64ef8705cdde5ee1c4ec737a61d9b8a4e72e83b2157c621e1590
+ac0b91bbb5ce5bbc8e8d6c0d9d4e51b3960169c608b6220a352aeb13072133aa9d934b4e69d7c5c39fde68d467fa8069
+88255d08bde3b967dfb1dd338dfbdec12a2079851aa796be070a1d70204048c34f2739b7461840136b03429a8b83b1f8
+97a83477e765f3f17eef0d3243ba9bbdcc50fc581f904e92a853a076adeba917279fc0e01aeca42de1aed8af9579bca1
+b0d9f1afb807e0e6f839632393edef25731ab2141cfa1cd965e986940a4916c8788733a39def0cf67afedc516dcc6ce4
+b563e9ed9ba2134011d7bea6314af5d71f63caa1bcbf878c26d7162dfc76343c38308955215252962fd0c9c87200f1f7
+838d4e97bd67822c22cda558f0d35f971a0ab7debd3da3f15c27f7d4b3301b2c17b60cdbca0da8e067f23fc97d136ae7
+a7bccea326cccbbc4773de402fdf2cbc21a028197be98cebf6e691a7679fc948e6bc4981a14fbf493a254eedc444dd7a
+8b2687732f7aebb153bd6030dfca0b6d257b8f2945eb8221ffd36ede50d463172cfc4bb17dc30bd21d8572aae2540d6f
+a4a3e87ec5984c3a755cb39fb04472583a0d2c771552b0701788f03b4618c87690a13a905420358701777e8b5ff2d190
+904c4dee5dfff129de3fb8cd0a6e0576c18ed3d77f49b8f0601997013cdd4ecadb86690389555ebe8a436d8084024f2f
+ad1d9c7a6236b22474fe8d45fde2e1f072101b5cb7018ac73c0541c0f9ebec4d5c4469e0570cc188cb5f5ba1d8958be1
+87fc8ca6f737cfdedee973f1586b94d971564a1fada0e4d65894222edcca6552764f1ca0b02782066f19f871ba5842d8
+851829a8b39eb6b91523548ad600bb876408cabed98d30958056367c686bdedbc876e1903b8af8ffa3d3618e3580e3db
+b99270859bfe7d8a4c1a22e2d88a644dfd2f100c54070ffd9c4e1044140fc0d21d62c61214a2b81a9cfadf944327ef8e
+b89a2ddc91c59dc2ed9b8d11e4838002e731b0bcc576e0e18106238cd3282264b14cebebd8a64f004521cbdc690c4182
+8be96bb11a025d265b7b3ff3151e9e227a8416e6118595ac29bf836ef751504eaa3a9cc05bbdcdeabde11f2dc3d20c3d
+87185ed410be571fb532e32d0ff4ef68e98ba2d3d5fbe92180cf1fe8ddfbcc89fd1e03694a9fde1a12ab905db89323d6
+97ef023f71850ddb282f244b3f39579eab69ce5bf3fe5dd2159329b7def4982cdbdb4e71476471acfea0f7ba5a7fd061
+9944324d804fd3978e7e137e6e65348d7473ea23c591136d55779b5a31f45f9e4d866d8a18c76a3a0e8cf2ee61cdd041
+b9930c9aff260105d4d15fb749aa33436f6fb52cf9d50e39dca19d9cc7938d752773f06756af86369e1f5fd5aa71d5ea
+a85ac6bc027ade2a9bbbab2b231241cbbe56e562fe621ea19208a8ea36e1baced89ec9ab8e2f83b602539e5c053f5764
+9917d40d37549caae646848e18ffcb49f5c6c4e396ebe7e74129a41b0cfe2726b4dad34d51f4bc706063e654da898824
+a25f8a4d8ab34724a732dacd2b316c80a6544d4b8c1f45115c4f55c3efae6129b83623ffb31da80e2601f70ca51ead16
+932b54b2bd26670936843a92346d231f2f3e3659542f4d4def73fb36ac0350733853130a5e5e9d8e386d34f817f5a91d
+871bf29d7263bce62a02690681d4e1c3c2f9c2751de4e35810ece13c9480eab93b80a00230ef0ffb858a829ee6bd96e2
+ab9643bb1c32dc2e8c05ef49bbde9937072af214c19c3932be137b7b75268edbcdd81d1370089be44462b8032bba3c57
+b67d510c460a2f14b7cebaf9a15642a14b2542c13ebb1d1690596447ddfce6a86327ffa377c28891f6bbd8febc2c17ca
+93a5ad5019a8e680bd053a524e0ffaf8cb18adfcdb22ccb6cbed67012316bcebed65294bcc0cf4f4e2915dbf19ff0948
+ac7a7fc1140b1197f2aa424b053e8ceaf48abf41819efaff87a2e63cd6e962c278942c2b97742ffbbedc5cd426a8df50
+af0115d9c2f887ff97ee15a1116ab06af1920f2f42700b75cc010d4c8038eea941c9bcc8e7cf4a41036813143ab3e8eb
+90c768d880b6ac17ed7ff9bcf76cbd5c1c4879247a757d8cc8b31c4c7bb0ec763d746e6e06e361afa8ee158e36ccaffc
+b3f10561432a97c95d02c1a6f317bb1ab5b98cc88cf5d56e1492ca84eb2ae1db92e9e31fa454de562e719b71442e69f0
+8d94729b5fb0afc196064991f9b3c8e04c0858199aa951f49421ab890079804179fe00707978f15637b8d16246794001
+968515d07a0f0eb52adf439d8f70ecd1f6655072abbeea45431dad26c8937f4aaeda552a22a420598d2136f576a966d9
+91f50e6f292e2bbbe226b221cedb9db36bcd459bfd74fd6356b0620766d96869266315e8503435af1719d8ff765467ea
+968b328d79e183ec560e8f0de113298755cb23a893a631406defdd26ecd52e4b6f28934ad2e219382837fbb8f87f4360
+94c126a9035059d2d817c4fb16cb13fe6047c356fc495aeb369acb1c45e89306554631f50d313707e82624b6107d2fa0
+90ee85deb494043a1cb280d687e3f55345085e576484308755df1bdb6f734e7dd25fd2489cea746be5d2c6384e7986e0
+92a4f64d98e7e633271bdafb1eb88474013b5ed2c65137c243729df0d79ccdc6b210118ed3587ad00d3f0f757400e47b
+af31031fcc867a53760216cc1f467901aeaa3b28438fb3ec90d6a1c8a46590062c40fac939bc3c7e7a7deff8f83c262f
+94306afe09f20d5de9ea26f37f5fc8df1e29b3a6963caa94df031efd428545493d53e0d8d7af12ee525e2e21cba23324
+ab6285371b981d5443ecea699af9da916f9320b3ed0a11c15503f3b10eada3ff5dc95d24a54f5aaab97d3312de5b985b
+8e9735364ae128f790dfcbedcfe0e11b991602dce0c90ab3cfd4aac74526c30a798fcb51a8ebcc5528d88c724e9c2b02
+89a3c12bcc68129b14fdc1d9b5db8d26d11c6c9467f5bff7c40abb8ec23b193746697421ea4400d5ebe53bb3fbfe59d9
+8368e44144947f9ecfa5d126f4a57bb1d3728fe3c5d3bf83310174d638a10cea02ae79fca91d5489ecc9fa679feab49c
+a0474ff532e1a6a3dc8f16ae27e77d6ab72b62535ba0d3ed09da5c692c6fd34424141cd68470922e1e147fb7f7479d5e
+b9ae0e47fa8d999135f78c733cdcad786b96087a340f86e4cc2bdf019b07fd4a76f9b4b041eb397f61bda20c31d27838
+a7262ca18a7179924d28161d64e6b6cec5da35b7eaf695642dbc127a7bf4a52bffad82b8d3fcd010b308dd72eb567f26
+a23ecfac8a3f978f9ca8810458973f528846de6bb92fa6422b9547d55d29d7db7d8bdc5181e9ee2257a458466f714449
+b04c32403400f82677d831314956acd3cb507520ff14d856cf8ec4fab37a4428a5d24ecfabfd2c6086e4ea6d26b005e5
+9669b2725cd5965305c6ea48331e693086f4c1c4ca7dec26bc6290e9a8e70f9f0bedca6e36985c39ea35b412abc7f4b5
+a6f68cecace45317a758658463c5fc1f005283d8c3d3de9364e7dea453007d8d4bc849a21205d61ef81019e0d25858fa
+8ee19ccc1c83b2c4d7c7b712bb370c129201bfb340c5b49d991207c995f870de2d0efaa88e05bc9eac567c4c36e20175
+8a530ece1992d1de92c4e845e71a1ab24e53a8a0679aa5bdeefc60fd890ca3cee2121f66c6f4b29c437440e7644e65d0
+924338d7f356da9b8477b3aeaad6f754a8d8f6a791d70c3ff23c2a6d4488efde9b9fc351319f3ea1f545dd11cd23ab76
+8eb76f86e057cfe9f655ba29bac89cc97db07f0487c86e7b41555b5549897bd3d042cd2ede35e312cbea357df622c6c2
+a2c0da965489d15ced574f5e27cd4781a1dce8fa4f17762a25fef1320096b9eddd92a007d58a194ef57def3aaf4e925b
+a3fc89753e8896d796859c9e5a00d184be7d37c4d5741ae8a60cae9a7a30c5d840325d6479701e1f61e37065fce81870
+8b2f90cdb3add567b94f4c7fc89a8a57a0f06877639c33df2697f7c39e52c1869aadc98a2f8b85a58fbb02bb1bc1a441
+aeb2c22d9186725ea40d3a4bf551482bddeef42c0ad33801e35361d3695769429449c2a13955cccab55778d3ff29b664
+80bce007abd8ebe2238d465a312c2d125d1a695184b93108d728075595c7716786f9188e90ae37fea89009d087e71b07
+86f5df2b83383c737bb6db4e435f496ebfd56b51300612c402bea9ac2f439ee7e98cbc2655d31646472ef983aa6ccbbe
+880e8a19af5ad76f14cdf94396b8dacf061e02eeaba02d4c29ddf0d07c6d2a737c987d69ea2eee52f0db5a4dec318932
+8b82368968f9b5bb175c95862ad403beee68d199a20d5dd618395daf11ff0c2e1fbf3a31c23d3e582556276b44e70b99
+94a062abbdc5ba740077fb9de722ad2ccf3f6ffc8b4a9dfbb0bf2ff789bd529e7b9d8da520d0342af91808fc00431638
+890b4ee1e9837a4c215616819dadbd3c6ed7586ad391498012a54d735c6df0b72c2dc3969d1b24cf6fe822f37f9c10e7
+a7dfcf43c9c22fd22f47db490e8f0b8f42597a5b4ae3e7bc4a9b12252b32f89412a2aed946eec19b133cee89b4a70322
+acbd9e85b9d9c3b068220f893d7b6368984f6cdb1cd06a784cc9571f0c632775ef890dbd51371e8701894cbf667d04f2
+a9b1f84f053ef6f41c59b1758836a82d53932cc4b8ee9c2cafe705150e1c717e3f5c15fc21a2532c071e9dd9bccb4dac
+b2c63345748a28d04680e3e451d1f7d430bc8ff2031b6bd4237a1f55dfadaec20d1854ac158cd6a1466dae525c1b9b06
+a23e7b2e5b8f3e3b0e350e1a461708be9c1434d49fe2e51473e2e360bb0be140a96f8ddac99e3b804557cc25d3e44776
+a4c4729a38f5f32f155ca4d1994b61802ee418b276486e2dcd681fec13316f3b6d4a8e76eb9f48e2df0339543b11326c
+93be67dbdec2655edfe40dcdcc0a7e761b7259a9d909ebb12fd7c9a5d4efa10de065d2eb049660ed01ede2f26388d43e
+932480849f97e32fb14d4a69af4073c377e949af7293951b3ca371a306d9e2096157f51c8e5036a44eb73c7c842c5aa9
+8b5e79ddafd675ff88d8f65176321a08183429d42d7fc1e7cc3cfccdef0dc5824ee40f279a05edbf4d50418a4cab2126
+962bd6fcf7c7f2a9c569d584658a735bd16440de2ffae236c68ccbf2ddc5e13836efb163690062537d52f7d8bbb24222
+af80793655c0b3ec3029673c50a7f212d297f9f80d7d1c7cb1409d292f3bd7dbb8b24581017d9f3964e3432f46e79ca1
+94c8cf3c737c102e9e91216752c82b17e4e42074e08ce44e701c2f8ac7c08902b911cabf38c4c5bd41400eeb1fc97acb
+8708ea7af8c86b2a1964edf64a9e9c56c7febffa742c3ff2e3088a61d3ccd63e135811212878ba7ad8a819e1859f4e95
+ab8e726d468417c168c892c10c7e2297e50c67e4283e5b48c3f3b014981ec482e211374f779faa0c1ead906f5dd4114d
+a93911e672aa3d8dd686280cf062f128bd8eefc058fbaea52cc0a9bb255fda84e65ea546f662fc75fee4c5b24bdc61fd
+8aae6d9289d8adf0f81e7990cc79cb704d0a975f03b9ec02be66089d62954fd9a8b005c5ba8179cede366d25ccf40869
+91e44ca55de8ad3ab42816504813cd9ed9c6d64abf6373e8891f909cb49c8a951ee823cd1f947058d542f0bf6290a11c
+a377f97e075b66e740b8476f085d50ce8ac21f206802384e2e072f6b9700a5f9cf0e6f2236307775c0e0d6ae8459d864
+953c08d9f2a9d6ccb22cab906efda69ec1c228aa5c2ab93822b6f71c007fa3bced68c6a70ac605c6145e4af770b60de0
+86d8dcf5a9ba81cf6a3149b2fff96e36639767e9de461bbd3ccc870634e8db331b98a888d7e8d3d70b6ed241d8ce54da
+88db73952866ec07c49b484c6b18de70d439e67d971c1b436684d489253cb96d793cc4d9a4362b51dffce837dbd03bf6
+970b7aa9070334b0649bea1f0b4e53fded64665f87e055e3527e0e567cb57a0e97d369aa16a005155cb69000073d7695
+928c8aaf72b3f51e38c866ab457f75cbd7131b676817a3c6d522fb8f876b01a9ab3a84238eaadaa0a095ccd6c1ac060b
+9561e78d16061b5361ba0be11387c3f6029415f83bcc8477b8729e88c55f4bfe74b59c1b24bec0eebd9779cdfcfbc96c
+aef133788d1e04ac64f573f3ffab473209dfdcaf2c675fddcff83724d17b91d6340830409b391a94405d6ade005cd01b
+b8ad4ab0a1ad6383e4cb12d479cde732f202687ebf886184507371ac277446b3bd1648c49c89343920e5d57fa6b255c3
+a8d00257e331f342b79b3d25b74d300b070326b358f690edbaad5e325293d8b55078605a43ecd9dfd27206013db4c286
+aa71abee2720052cce7a5a0c3968e64c2c540cc852dfe08b742fefe005dbfd10397f66386744c9bfbbaa40779c2ae190
+80c6680857b88afd3ae8801677720100f0fdcb9e49c82f74b8ca5a27aef34e6df03462cf9ef5f80169c72da15be567b2
+8c2f2865e132869fca5232ba5e6844ac0540a53a66971ad54ff91f186e011e5412450df9099fbe0b987be443867dfdb6
+89cf681e0506baaa528043a15ab3bae09b8817853e889f0b3de138992e52612fa3e50d54b3686cbca6428a7644f58208
+89ddf69b72b9ddf7d535f742bd3c942000061a5a54987f2ccc7a09e035be978cb32f653df9568526c5857a5df4321f59
+9908a3288b9a9972c3f3f0d5923d9840756b74f31ae0b24ef2188465efaa5247b1ed13b774991bbe4c065c7e71b487ea
+9454ea9a664390fb1ba79fbb5c0cc765d8ccd32a02d946a14353290fa2a1ba911605ff2e302c340e9ed6fbe8543ee6a9
+aa4f4d9ef843ca3ba334d73af634a0ee800b3393f8f7701cd152274f4296eb79d63869d452b5e83976eca246203d6f03
+8fce1e2e59dfc4fb46f3741d27772579fbf2f48acf1a38c49b0e5dae7d35f2624af3a46a48b89bd835b7d452ab0cec80
+810ec0e58504ed556e788e23067296a8e4b4ef31257d508f05e5245bfe6d2c2f658fca8c81538c6c9ea6ed05a8f249a9
+b6667bad0a7d49cd2dc60af85e373fdaac2af0d34fdee51a9fbc1fe8b77470c162a04da38228fe68b7d5247d43026734
+8982971d57bdf35e0f34e867fecbe0c140d94101484ef4ea01b796633beba184f980c3ced28b24ff42de1dc504dbc854
+86d8d1f3edef9e61058a58d966169a05f07fed0d93bd4f4a7cfca5a872b2aad0d1a78f8ec7784828e5813c8da577469c
+b491624c3d5e517c9019258db6284d7533778e44b1a0060dec5f655a7b79057141079115f5cb1d8d97a90af33cd7563e
+856e1cd4f9ab7cf323f5988bb5d272857d2fa90527f800362569a39defd93e37be2a60c11f498c482654f55560356f7c
+a08884d0e642c479fc8e5a9837d1babbe63f3165c02a57b19d0547fa1fdc18ee382ea82a86cfd3135dec8f2aff793f53
+b1a4de5ea703fa5ac8a70ec515bc65203a9415f6da109b67fa32843a39d7fa6232c9c13920d78c0f16e99fa5f6a27e83
+931a2ee3220ac7888157c426d1b33b8a56f8879fecf1461af4cd6c85f94e193bd6ae6f8dc3946fc689e42bee213f0027
+a844a78e65ea6f75bb55a5db1e78b88896caa1d54b624f218eeb302397dc98a084a2ff4b964acd0650667160928ceea4
+b9c214280a15b423654a36b11646c928fb42ed2a692aedc01441c67522760df29c6ae7bbcb9237938a823188ad4d83f4
+a19575f9bbdfccf970bb3754818e49c709d1bf0af015541182fc7203f7aab51cad31544072d52c0234a3b649d03d9a52
+8cd1127b7485ea7f349e2c89a4b78fab3e5fabe5a95ff0cee10a3f4fd48940e431ca5e526f6342f7da93e32e8eaa1448
+9906abc725e445092dd7dd0aef90f989e3c78aee96f3c0a67ccb62fb2a51363c71d783490fa5fdda0ff9ea69f5b9233b
+8996df92e014c226e5ac724075c19d19a9204b2e086ed5e75a9bfa1f8391c4c77fd5c0b85a29f28b302a4af29d38735e
+90225c9490b39d151a80a9f4d9a7f2595961c44779a54d5e195ec95096f77e30157c6c629cb1c36d995f6c3ee129ad20
+85925b1dfe3884ae3a0e993b67b6c49685deeab6cf0d9997309961b7f727cd6133797bf04d21ef7b620d1d6392450b64
+88a6c518e577a820d83f87e9d5f236f43d262756b1bae0fde72af241fcc192417ca9724428d17a3f9dd813712a772cac
+8f501fd5634fddd00a8411c0e9c6947bab0dded26339821bc3543a64c519d9575c3129f6619c6079d5e95237c11cfeac
+af2b42945d7c81bc422a1bcdeb80027a1a243f89c65c173294d6c92e4cb3cd650740cac17408e7ba1a34d37d865b9bc5
+abfa5e76f1112602ddf152aceaa9f588beda3aba1115d0823d6a6b074d28389fd4c8178e8a845262200b9af024a33a88
+9732a0e3efcef5ad4d43811bcaffaa1418c791d3fd6ca4489d6cbbb7c44b55156d218f0fe86f2ec96ac306fefab2e694
+8837a6c4e60839ffb0b59e94b37d81bf1ea392d44cc81717c1c9104468d31fb5fc3c35b1efd9991b5e7e9819c66a7221
+b6545fd0b455748ac3482e0ead3b0157563cea7bf6bdd5ae2af7afe1ade921e5ba80466885ba73a89657a735c92658a2
+b72fc49fd3be541bc26cb968ba4eb3078ce7c71fe0ac06340f7ac25c0befb86af03c4cf8f31c857f9e5d946401e86bb0
+929f424548e29c3b47fbbd59ec00d17b00ee1c4f6b966c1fa7e0f8528d52078278f2852da976b8931fe813b0c3b71ac9
+b37861ba981001aa6192cff06c13f041410aa60f965ea03dd48068b4295d61d2fa276c3f477f985f50189e33308c1876
+a73c7cdffd646cffb255d2519d8e08dd8d9a9eca0610211177e259230b8f8c7ec8727015853197a0f11eec8b59d4f2bc
+8da1260ce51220ad107c3127e871715bd738639cd90824d1c9f5b6181304f363b8bdbdb42c21e4e360cbdee496b573a9
+aac6bbc35bce8b54820ef8d7219a4092c49aa5d4fbb187968cb91ac04bc44fa119766f8c630a727ba184cad19278d9c8
+b964de0bd31847ada13dc3f6e1bdc679f421e262c03353e39f0ef1df720ba05e6d806dba15b6e10df559519ca125fc39
+a62e4336b61f85eaa415f57e21cebc7d54c68f6febab02de76bc04a69658ab1d2f7cf0104da79448e32e2b7c92b684c8
+897c6ca595bb2884b643ce8e69078431979d7e6e1b2dcc6effaf5a62fc906db6466f85020bf5930597adbd99e2ff90d3
+932956e0ba09f6499f1ed231732a444b0adf17080237d9345d06d4262fe8a5fb0f704c919513ed42473751069c57dafe
+a24b9cb4ea9c2203a95b0056bb95342c4fa0d91bcc25595fea0161e7d6f45595f7ea171e0ac1bbde13a6d8ca6ad10bf5
+a7714728bc3318f6ac005e350de94f59495ef3972b328c673c5e608fa9059be3277b48f03a5a9634c3d03397af7d089f
+b98732aec7a0a9a7998ba51e2b76e5232379482d0047f4876cd39918119776ae2683590f7fe5e44d12b3b3efdd916e8a
+87700c3fe20cad8fa3041976c87ee761941d323f2d64a9818f20fcdf0259f796a11e55cdee31446bd19307cbe8becf09
+a37cd03fd348694b2ea5cf081696d12dc4ae108da8d48695bf74c921b90612d18c1aa71b1071bbcc02829e05ba1363ab
+830e4e7ac24fb3f64294e5c64563ab5708ebf0e133540b35b985390d68c420a6d680d779fc87245bb1f5c58e59c5ff39
+b5922242a82565753dd2c1438008462d531f820af1b565756d4d27a30e3406ecc503b1e5b628012ea0329fd75561dd7b
+91068438d2bfbb0666824d3cc2be488f2eaf3a8a9f21805838f9f2d582ca6bcb103b2f0f313b57bc86f87704aad7c7d1
+a9a2133fe55e99114e526904f5fb3e2e141f31963562887a9fe6a262496dc405c756bf6dfdd6acb8853ef5a0a5146037
+8e48e79f9eb1f8757b4c4afc4e3d6da4d368bb25b4d54e3a1f34f3af13d8037b0d465b29894f68272b79cc60fa676071
+9378b90495b0e6468dce3102a97e9965a5d21fa4a6494d401888b8777bd58616b99d49177f2eb2796476ae84d20b67b7
+b0aea247d7d7c7767519b87dd66f56c306d9eec88b0db8060bb97370099892957e2c950fa2e05f24f8ad097889cab087
+89d0d48769ad81699d5b83f26ac49a29c3e835caee03469e93c11e5f4b8470eb02b52290bb2c37f06afb0746630803fb
+94de42d8554583b24317d9ea283dad5849e2f124f659d0afa11414898ffdc4347a9c4ebe783dded21679337b58b67f4d
+b76c3047eaecaf4a4e6fb6176c7f4a1d393fec3a360f4c711d6293a993aee39d5aea654fc6429c2e4d4955b12fea5c8e
+a307fcef0915e3e3a27b94ddb9561e5d210a091714b73afbc0b3fa5e8140e8c3818f4914903975e8f78d0492d7784c25
+95079c4a5008fb6ae0d653c00ad901a108df0b8c442a68492740eacd15048106b7c4cb5ee88bc6b1dc089987935bdba1
+b65a354aa8e92d6ca2e11f4ed3c1ed011852bab8f0e5b8157a10c26db2748be688512423c11d582b3dc1da57b9d6a826
+a32c2fc62c38eb19dea24b545d2537dfe596423f8ae530e562ba7eaac34139fb443d88f18f39d65d36a65ed1277973ef
+81b83b37927e9a6a7c34cfe587dc9cfbd560db3ac57a8a88161fe4ae9a7c66843d32f6f568c927e2ff8f21d8b4299475
+8b6993ef73c2021842060ec0424464412242aeb711da2c43d3985f9d15e4d936eb7a1b5098bfe892fcd3b6ba8bf42369
+965535b46a18f94a1203fafa4dee5963742511ab77e98e471e03376847850357d543dc6ef2dbb765cbc1f03f66ebbc14
+a9386ef496b4f96bd591847baf6dcf8520f7cb5aaf1713025ee894b40b10f243aef06c553376663488377fb8b1b0a022
+a6bae4486fc16ec1f12817f2d47871c8bb61f5f1a2db5f828c6e2c06bca64b1ff7cf4c059a10d6bc2f561fc3a12aa38d
+a2b6cda6a75fac16f324935cc1820bfdf013ae02c209802befecac0288d90263a7f84762dfb7c9aa1351415c03288714
+aac87216619a8c50b5d54432ed5681b1cbb2c7084f33e9a91889bfbb94fd18c8071b79ebdb403ad81fea495bc1e37dcc
+8bb3b3a7ceca82e4268ab52c00322d5d0822427e43c1d8b88b2f43c3dfae7100f6a29832d16454e093579cbaa1074062
+a2363b4506b1464391a194412a73d47d0cd4ea1ffa541cf8b936c97a46bfeaebd1fec409c6aa2109d277bfae0ea7f0fb
+b56911be2bbf1e564715191a526c2ae73bb6e85c45e3dc22bd9dd87cde620de93875c48b11e02ea66eebb68f533f353e
+81609eacf4b2e78a9d7f469e0882ad24c86ad98dd18f466d321aa32a762171cfc334dcc049962ef5e63248ef48244229
+866b26d3dbab7837edec84217c85653c6abaa617e0ba2657d67757fd1c7dfc0c7f83f6198fb85a49b402108d6fedeea6
+9771f5796d5d47d22100c7ff7d191795677d53796f4a1e1aada949b372ec12decb6c49e28f2662e729d44f0e09eac063
+a9fdfbfbe114c7f93806b988c50f8ae4e13a4d433f2e40c72b81d0ed7fe879db5e89216a0b0c8392a6d9d54f57760ecc
+965336222244229fac41336464c36dac8700d5289c0aba78016db76e436289a0797af8c96d52583618f8c6dbe7b3562d
+99719ac482b72d54fa515395847e9a65b733da84f7d10a0be82f34afc20159d64411aacca15041726251fd90ae06a9f4
+ab96b7ac88842ad0ab61f7550b7b4697d6a3b651cfa3c10ad404e7505c742e2c1364bbfd08ad0039ca3b81ffa9d6a6e5
+ae96088cf12f76140888582f6f6404b6f2666c048950166e37bbe46c1398fec343fcacd3e8f332f7afa222ca13fbdb87
+b5b5c1ad493b2e72ce8ba698351f596cb85841f7f7055e31325cadbb4fec3e8045b335643190d6b97c3049d10551764c
+85f066c7ffd2bfc4519f42f0778ce0e46195466768322a22673a073ebb66cd77c7b8b3a14157845cdb369d3f40911421
+99f4f10397cb7ff47a2d9d2f29021d1ca96f0da01f8afd76f72457cba6e6376f925fcee28ce77475b90c9466042ac414
+85116606b18f6e5404e9176570bf6d7a9d86116e5a29721a1b20d6b28a733886e2085a7563cbff45d1f11bf3d552ea12
+a17d81b236fb138ed820d335dde2640ac3a44cccb5f11fc6bea5fe3132c4a9247b874e75fba55bdf8093f0f56310a999
+8a16a5cfe10c5dbecb4fd9f4b0c370162071f88198e016111937199b87d006d1b24f3f412d853d7c6541e1c68076b70a
+8cb83fd2b1afbad7c454430fb9dbf6530230b782c7dfb01443c2c16563e833c5b230f4c4268dc37a55a681a5f0bef420
+b8851a8dd6a3a17619e7c84b18f29ac9680b456c03e8c8489376e6de9a22ea75d1730787ca5d269af44eeae47f87bc24
+a8f990c9290456e849ae4cc0c320580fcfd50263af8945d01b00baddf801aa0a7bef2ac119d4d1b4be6290615c781656
+b0fa1c28c8c67ff87427691047c362aa35de0be9b0121d83b116b23170ad2b712a0b5bdf6a57a25c59201ba165d5f0d6
+afcd2f5e66a277cef775b636abb598ee9d7e3bc1b48b521da787dc561cea8d7ad963f593c3ac6f23a66a27c15876b775
+92888863568ef01b40d51f467e8364cb1b09808238644bbee5ed118b392475e90c6a1e03a0ef826dff5ada8d10be716c
+a8ddad388f2dc94294371d0ebbce02016c463a65bcf3a5366419a7a910d3d24748fb5716ddd81cbab44a2362ee3c077e
+8b8ef4f818ca3de1683064ea7e968edc8d9fe2675b8bb2ae637a5784a20cd909d18eed45140189eb9f080c53c06376fd
+a52d9c49db4819cf6280c220a6cd306a5851b771de3032f28c7f8750c20e80cbfda57323a55a8c03085b41f4f236b5ba
+b01fbfa0f80ef574a1d6733899002a8672cc309e1014fec8e81ea1e96a7be9c247a570f825b7862e814e1f006a8227ac
+b07e163eb0f96a51d74aa8a7fab5d23e44e37b1b1027ae9c4155280d8d159f0cdeecd3258c098a7358c5bf2fcf1eb7e2
+80c4512a5bb5e8255488fed7b7e297988732473f0ccc1192cab716a88d035e23cc374a937fca7da87e18048ab026d9f7
+b3e343b13c1d4c98b7706edbf362eab12b1fa87510d5cf168e510844b24c8a9624f1e7e0babf455c6d425741c23e1ca6
+83e4b53953ef683c512756b3fea37756b3c562c88a15cddd902eeecf0de82d0345fb05feeba511e8a6de91aa1f722ef7
+922512dd5ce444df62fded2c53a73385570804e7305cde401116c06dff5ec7812b776b8cccdfdafe422f1ba53b2b56f5
+8d1f7feee880abfe9f09708ccf72f376013b2910886edcceb76018759b88b95cab9c0e8f176faf042729b405a10242f5
+abb7cd087d0cea2cdbb47cdf9be2c6a0c6ec113e1ad5fac083f66a027697d477ec69f46b9aff40c239ad9959b9854e11
+b10592443daa8708f8c882da795da07465efb9829305170bc3bdd781cb6651b503d3b21eca027486d413f1748f40f068
+b14dcb895ab22335373d2b736628c1ed0e815072fd3844867ae24638aec60f8591c6885869ad0bfe509fa3fa3101a5f0
+89631708996651bba6b2113626a2fe1ef0f2ea2f21857b2a1e5544ad31e8a53e755b6d611546ebbba4b2213acde65e72
+82e9436700fcc5b842ac2f0482de4248ec9d1f206db3dd36917c00c7749bda257fedaec513d8a9ef3765057bf5aff25e
+b1c2b26d93658451fb4e9cfcd77209dbfea909b2212c000fcc576ef29b808061c9f58827682cfa09e357c1722c3215b1
+8be32f59768777a785d8b257f941215f37db8912183aef4a39a856b88cc680ae7124789c58cb3c6c6f06a951dc96a1ce
+8cb60a3d0c9a1efb89f89f78e6f0e4bcf5eabeae6cb215e98cd7f9eb58699ed70dabed73a8b95daf32a5e4bf0d411d3f
+8ec7156d6b672e631ebd88467f40caa9ba5411ab727602f3146b468bc00ae54fe44b3228572670215a0dbd59feb66e2d
+97b7162101d740aedc894bd5f74b8cfa7ca7e7fe8363b05491c15e8cd54f21b0b09eb41f756b9089c379ea0ab189c468
+8524c9de6be47cb6808df761ed03c505932ba715e757dfb3c97b6deb462433d98953ee6cbc7a576b6837e68eb16d3188
+b024c8fc3fa4f602ab73448418548d9896200065a95e8a001f6c8d4cc3f53f18ec8b85524377fd93e2d2a18eb4c48b57
+b344dc93d3057465592460b7f35dc015f4f8025fbcb44a645dcc3dfb37044d5681d8abd81bd544272dc57cd50048f29a
+a7b270b94d9870f8afec3bf2ed58afb76f4ea576a2175502630d0d3f92f9152c1ab0c019f175f566eed29713dd97712d
+b86dd953c40d4f5574bc7489323d71e9798f7c6f2dff8d41f6295655c5a275179ffb4bb8d2408b88226c98583a7c26b1
+b73074289a5b08aa695de03ce2f5b106107c6cf2bee8061e3195056e799b0bd8b4172deff7f413ce8e477391ee6294cd
+98b801a58ac7e083da541ba058c64b00ba709d4d0ba1683e5d83dfb80a29272fc2a33a18f32351b103b227abd5123da1
+a7cf232c6ec6b9dfb32d729b9d4216688f6d2b6e68053ddfb293ebd5774218c69133baaccec7ba3da9b221af619c2ed1
+8cc1d33ffedcea05f3c593e5b63dbfebdf26d05a5719cbf642997be929336b92457fd9df0d6be6c063918ada8fa2d322
+8d273497dd9f822984f1d8dffd471cc703d03c342f022b2bb24492209a3889f010c4f7ec124f9fb9f884a1a11f84a414
+b62cd013944d8d9d72fbe54897a94e804c93eb84a24beb0880cd98fd5d48fccf5dedf5076abcb1b857adcc986b729cb1
+a1bc703a67ee709f7776b2871f2a88d8574c9e2910690c9242c162ad926ef2263d5260f5c19015ddd5ee1c8ad1a444ae
+87de434e8ab5b1d067188cb9c12ed936c26ddb0ee76c4c9cee9bd1ea916e411a354bfab2ce77ed8c8ab5d8c62038f933
+ab128e9de30bad31dc2eaad851da1e39741ea61bd203b48e5671e37f7b4e3db86687574d3cea1f561bbea84f68cd17c2
+b54576c9c4bc3b43270b83b89eb75cb7e89057c99e14021ca42237dce393dc6a8614c5af5c2f69160001b2ecbb407c9f
+93adf38f161ea886f41e4af8e42c69c53a51074db9ecd7b7e4e36c858426237167aa49b79737625c9f9826dfd22f39ed
+a6907c8dc4073d3d4d40df8302c1637c15f9197aad8511dc95c210f6a60b06f3aab2622b826d16596af27e42f2c9d5b2
+a8b0c4a3a5d3dd5b6a85802039f48fc80350f6f0be2e55bdf75e3197a22f6547ff4a7dce38ef3667006128141364625b
+8a5f4c17c729509309b2ac7e0dbadfbf0baabbcfb1fab02f91d055238faa3b66aae850ac9b8d7b7245f0a26bc5253c99
+8bfc5d594700287da2a85a78630c616af8e555cbd7864ea604ba38eb75742fabf6aca12ed99a2439e2e046d8f048a29d
+b0f91b7546613341cd95ea112e04b0963fbf7795f118c393fbdc37e37dc25244d10d987c13d6fa6eff3c4721fd0a328c
+a70b6fdc66ce4c2e7f1d830b7765b7f0640ceb7306cc85778488964cbcc336ac378b74b9c4ec27358f27378380b3dec1
+87387cd6b643721aac8e1a8533c27602d9632168d3a3532059163dc5e4613838bb4f07803e6852b23c58f7103d134f92
+888722a5a56f5b6b00daba53991ab6fccc32a029a7f1748f779b57732285e56e09ecdb7d4848abb3dbf3e167cf8033c7
+b7f5b9ffa8ba66f54cac387c197058eb9025cb3761550c78429db95f9e1e3b49c208ce86b6126c162a62939e1080895a
+a53f38c068233b584211157c66d9d2452c811bcd340d8cfafd32b070c326169306975e558745d63e1617f4b4528a2399
+b1c3e9b0f19993f973f038bc45be6a834b1cd3d56f112c857711c8e6c30303eeb0b205bd5dfe75e46b1f4d4bbb68fabb
+a81fc28620e640ccb57dedd40c79b73b0c51565dc61097527b2341bbaa3e1c9ccf20f9d8da1c16704e881b24df0b7335
+910a7f4960a0ec2aae66cbe2ac98f43646b017de84ef3d486c19b7809aa16813400bc2dccfc80e09c63422a9d4d88f56
+a463868e3a8c2d2a7c49850be2740e01c7892c83063d381f405282b4c521cb6e3317361abaa92042c38bb68695c10bb9
+991957100ea0f66cd4ebd23d9f6bc7aa62220f6ecb71ac947cbffc6f36f7891173670977bc58a6f57b9a1e8766100c2c
+961dcbd2e6cb94574a33fd48b5d87e0623411574666d5d37f4ff7dc587980e2644cf056e002746088c3c3b0ee7044510
+a27cdb374cdbff217370015d78c7f5c4674ec9948339475cc80a5805979a4c6a2614b6904f943374e96bb838549ea517
+a567bd4a59f9df9f5f30a70cd9f6cea7dc0e19b7fca37fef5846aeb1697dcf7925a4735367be0828f2ded5007f711f03
+823937a900e3b8705b657d40470357d91eeb339324f0fed58695ad72dda7c64f2a6b7bb7ae4a20cd1b2016cb9edbdd1a
+b07f2248802ba7dce15b2698a60a4896323d37ecae6666a71cdf85878094bbd4e9c0e4733bd8bc6e9c850e57727e1d86
+adfcdea69c5608f02630db045e5679f9f0768fbfa9c8e97bc9cf9cafe1f747d3813e7bb1adc6085cd57102afd71db133
+908153d3eb2eb2b93c15aa606531b08981bcfc8b76684c2483bf869f335f9d8773a9aa3986ee54d9392856daaf82b684
+8fbb2acf533e7d6e96e9b68e77f7a1df2ea6c652cd8862b946c93c084436d7349ef4a0c453197a9769e986322e9174b5
+b83cf4ddee6140c9df0a08a39bfda79c0d55516fd799c1c24b59397b87a33ea5a0885b2998dadc354cb6f65a4bd946a5
+957a52cb24f19106d80d4115a8a0843d047d157c4a8535775593c1dba9be24318dd434bf43a82aa7755897f895d2ed15
+ad93dbc2c055f9d7e42717391cfae64962a78bddbb9fd102a05cea520654d4a9cb6634234d3a188693c87c5b4c78959e
+8dc4b8e49de9b05c33d2a98973e223c01ed5745eeaada3a4c0e474cc22430644a53a60c3d6efb1212ca298c4331763f7
+948b0172df27db83e70fbfdc896ed82696876ac4c51842d270d9ce1e7f1fcc9487d781eab97f40074861401b809dd7a0
+ace190f75cc102a79412fceebc013bda8cf329798db4b4dba658e63228ca7f141bf0849d30139ffdededf98986f3066e
+8f968dd6d7e06008a1374743b965a6204c11a610ad92705e8dbe6df3c58baf36b47c5d9988e4a417c80ffd5e7725da7f
+b8ba0d5b36cc41f6839543d43166a08bf512f7b56040891ab80efefc774db28c833ecd444a703c75547fa1404fa1ec22
+a29944dd0e5c861eb37c744c429a0dce596cdb2e5b0b2d2438a259a0faaf3d261faee1434bd28ebb2e6adab59ff3951d
+85c70422fde0ac6e7a0574512eff2a19df8049757bf78b5a7d7870848626850f17e8b0a5661e5292f3df0f613886306e
+a5ff5c3ca2c70b88d15633f9c38d2e065bcfb0e447adca33301a0d4f05b761049c8f795444f11e39357fe6bc0d7f1880
+a2167cdb114d7707f1010e0be9cad488fe56cef65941c35a5878a100adbe522a8abdf7eab7bc689b8727fafb174032c2
+ad3f526ef9ed367b2a25c95453135510472581a758760d47eb9f9b57b04f8c061152e5a792584d6ca7124dfeb7e21703
+86443033ece13fd386485115765aa95673be72b0543fac2138e1488d22419591176423213ec06e5e4549a025eb6aafd8
+887e4ccd58603e6c9cc99bd2740bb1db2fc4127e8d3ec9cf41bcfa3589b0fe1931ed2a6140ae1199d323d2870882ef6b
+b701f7d7637662ea7024d31e94245a5f745c7ca889f4f7a8362537df82b0164eae83da5a107a21c0ca889926aa50de49
+ab6bc11d6049cc5945011d3973eb2dbd5a3d786b3824bc125786e734887254a6ed61fdc2a97ea34e6b37b13cd97eb781
+9901a1f44122bf5aec7cea28e9405c33567eb118752edc60f3cf6c80642370f86557cbd76478d6b0ea33be92a22c746f
+b9f453650996f14629642bef8fea66c90105c8523f3875d86694100f8022d4fff2915ac9f9b9efd6f425751b113d5623
+a5bf9385a1c94c09ec326c49b6b603f2de987b2878faf0263ed109410536543095c07320f762fb6fe56ee72a082daed6
+ab003c86dd62c801cb16b727fbd1037aeacbec0f76e8abda4c6d87066cf0a33dc1c61721f2134c3b78975efe013cddb7
+8dd8c580c288168f896fd7ffbcf5c8167a55d34f17b2c362d0ada0f33a08cc0568b37b01cf0cef1fd5e2c2e250fcdf7b
+acfe675aca83a774d3f526ad461f0deeebfc73a15ab3d37b224f8740ac2d9df238373e6cd1f03ca78a9daa0a796c96f0
+a45cf3242600fb9733dd5e0dda1994e8d37fc483885a34a76cc16bd245f6d9c8d15bef360ef59d0a2c3cd59114280b87
+b64097145d97cdc8b7a84edd1da7e84f8aa44c3c2a4823e6e8485fc3a44d94cde7d7ce8bfb3da5d583386461ccb42afe
+a10ec5859c274c0972ec39ac80e461c29995b35d03603dc97dc30ff826ef24c5e52d5dc9296319ffc672b9e1d57d7936
+9702ee805b70a1bfac7318e8470667ee20739e3db3030bbcb9a08568e96c9c8d2af2cbeb26837c43e04997457c623486
+acb3f5a663333d1b4d54dd76a23c6601fd4540e2b050ec2a7fbf0b850b6f592837155e6bee5ca942406643f98bb2ca83
+a577b96723f64d2671f1253fca72df86ef3247006c92cedcfb26eba4b4f4ba71bfffe1d5eb87b0192378d0303177fdba
+8c397ac56cb723df015d0ef202fe486d1acb42f8129d3e4b37125a7ff9e81aefb1e19f477d528be1e6b18e7bced27ba3
+a7a6e6994324a80ee0a85e8e8cf818f5f8d16d299f21b2fca8a9f65231982584afe921e76723701abea873275ce0c15f
+82c8ee7a39e49528efa60ce1cbcb3017904de6beaeb751c406b64a94aa73af72932e32b63c1d3fa22619498fc46de6bf
+a1d0193ac8bdd44ffcd37092a5dcf6e775824e5dee4c0aea5bd46f2e25b312fe58e1e6b9dccf9dd14f240d7ced4fe071
+82c48967f22b8aa1dc63dbda0f66ff2f40f3ca9a7b3e752e1a950dd7daadf9afd81ae1fe3d0e440259dccbc1520d4e22
+a69d43e6f962b728d223f6d474a923dd13c04eb8858f7fdd2df2c25dd4d13a0a69e71132f450613e8e2d9a65938f31f5
+a613b731fe0d23ebf376cb1f3707ab9b2d428d1ea3a95faca9988a1ff4fcbde0a077b38b5942590e594307acf88c9db8
+a7d2f249ec666f59dc51f9c31db6168f33a94b17ab95123d4b19aa00dbe9e1cdf340dc6f64bffc6dabb11912e10edbba
+8e64b8f99ada5f317c6e2fd64ac17c4d6e5314c82848efe1eb97a5a52e6bf08923360dcb44c05d3fa59a82119610a898
+865d9512ec4a18ab31e4062b2ea6c43ef32c7c58d89bb0afdad9fe57dadaddd2150f78a0e85086454812855bf09f31ef
+b2d23f01a0d182abcd6862ab6f4bf924ccaac399ec143fe2614908dddec102e2feb8555479bfb71ec3476cbdd71b1137
+b50d176e628e06258b518be78c6dcbc3c9b2b4a1ed4ba10ee822b3ebfeaedc4fa69c61c1985e1bb20ea9f3d6df7a27e5
+8174953f4023e31e39f1cc3bad674bf2f1605ec9fc053948bb60dbf2cabade885376f8c76f45b638c95fdb14f5bc562c
+92b95a12d1fb1ec489943b3a2a1c8e3c8c6a30d0767125b87fb491f9d4f8de0629afa39fb5c8a84078b08bcc26e88c4c
+93f4b80d76689d5936aff6cf195d579ff5328ccd0f04db42522a225f96b0bde2088706356675f185186548006940898e
+a5f7f4577943741def19df611c2ad3d459c386a5e3c765eaa5a0cb6c192873675cccbe62845418dbe47d7a9822e4038b
+b59bdb196d59928326572807b2ff2edfc93a28632542b270ed462567d32bc36cefc40300619aafe4cd1e91c38d6c9c30
+90df4b921e13ca1e63e8a5c9968ff64bbcc5b829e3421d74bf7f678aa1dccc1db9ed9dfe5aff05539bcc5379dd59e575
+837b0b6813249c456631b2f2fea9402a2303a454a114149bc35efb400813397366eabeb4477f2cfe037f722d78a5849a
+ab5b33ae561312d9791bcafc8faf6d65f2c4260f126f11ab5c20c7626d88f2c00177588ec62ca763a7ca44c6ed60eb0f
+b0ed2e48cf650a4267c3da1378b8164cf6b774200a5898155716f85f7abda093a60b802ce549811644e5f075d2b26067
+8d47a4e27f448773fa2d592f052bbdbdf30cbef152db6d8cbeb3d7b1a0dc0f2c820ed7572eacddcb51c19a8268426b33
+a56ccd0961bf238ccd197e5bbf430d7c637ff6e01590febab3529776403682ee32d0a776c3dbc6581f60002dac86c38a
+9163bbdbf468be88a391698ab1f40a919517beb6c780062d4bab3bf8fd42eed6546a8c743e249fd61c3c347ea60ee185
+8d59f46606f063e68198457917004ae50ebb99cccb07755825782ddb25b96c3cf8973a6c5092c9db71a4b8ed075876af
+8ebffeae4fef7a83d81f31a88589e05f885dd0c0b4360545b22a18369a3e6762f187ea6a173f25419e70031861936463
+96013c6b47119e017c8bf473b3d643d0bea1cc12d84d412c2b9f6f55f22543a6e15ff7e818e9799af43984ca2ec3bfb3
+af46ef7696d9908fb343a6754de37e31cbb41dc1a4ab8203d2a2483d1cb0dd3183e5015d8048ff146ec34a6c3f2eae21
+ae047ec4584a962a7ae9359292c98f4d8e0916dd98a414e2e15429ff30ffadb3e0296282f0f7e257495e8ec4bc0e5328
+a16de787896a056d31e3f174418aa3882c03c879a292246a43dafb81f8e0e05564f1cd3ecfa251cdb159f63777fc6346
+97d1c4a94182ada88aa3cac95520711802cd3889e3e057e99a72a69589fd222b241d35a54b04f42503756ec3c1a3d701
+86be4ebe8b92f5bfceba757e1e2eb649f9803c8cb10130b88b13caab6bc04dac4e26d538b7adef68413b047ab9031252
+95d4c0b08caa283ffa9e307f78db15470fca5b577189a33bcdf14c36d4ae3f571d004c5aa1e69172a4068e72b7dc25d3
+965b7053a1d14f9091de5df8bf033a07b9f8d39a6d66979ab5424bbfa32b803075afc2d74e71235a0f881bacb6704689
+a93e72836e2efc704f87065dac0463ddd4b063eab125d834df583d8833873f575a0179781b72aeb2a35533a34a395481
+a2997d7c377060d910654550316ea7374a0329fcf30e743d613e2ebaa15b1bc6c936c2529f5466ef0e60ff53aa2b709f
+af5259d4d08617d9be068d1b79a8209497972910938831a435487395512187691d0cb021bd57eff0f694f32efc1487ab
+a78b8318838b1049f308200782c4409fc6c97ca5bb6af28996eb191027c8935b7a43a41961ec046e6c8539376c1aa293
+a4a6a9ec652d1c95883d21d3767b13a7e1dee73be907dacad197cfee025755db3cc7a8fb9f40146912f8a3f4c2c49c14
+a8a8ab62334a3c67793fa0691a0d2e80ac1681ce64a02df93b78e4a2f6fbf3af9b160d9ca6b4e835d58ed60d8ce627d1
+980c32e492464a6f36ce12ed06541e3b2eb098934c0ebccdcc984cdbfee4a506d15afe1a30a84d642322c2987d9d51a6
+8ea8c1adfd73747db98705e9fe1aec441484d2e4862b84817cdf1262fcce91f56cd26073d4dd23b04f836e0962428593
+b0f20edb8552d2b08613cb574e9de1c4dce1eae55ba9ab05dd7f2ca3590a7496d63d55af88b3dff881e16d8bf9147037
+915af4e9a28b12ea126668db7de6ff0c2cc9935b138022fadbb1f385f327fdc927388c945b93d252cb51803c242f7e1f
+a553e08f67c61ecc5c8955f7251cfe18cde02e6170845e70db1761bc00f42a31cc10de26d4c904200166311f32a3e56a
+99f4b066a805512e16addb0bcb08d76f017213ca6aa6afb5c2fc621805c4e123bbe0aa85eb5a0f89d3112635905093e0
+9236c5b0f4d2e58033735d7bd5d53ccbe82c05aa290149286a16a318043ffedfdca9d2d07817601d4216fed50c1082f0
+90a4c7898c58c9af83f94095f6afd5ca65664f16c0af4c8121407cf0864fdeb09958500b2bd0b78950aa9051e3480928
+a589666688e6e7f8e4d99b84d21a1f9ebfe681fad346a237de20a11a2b210eb99c4d3e2f645b23a85c93bcccd51f63f8
+a010849ed4df0e3a8eb61f7fd114d05a8669bfa36cb95d089bb1964ea8f5fa26be0cd10fcd9b38b259722c5a14ba3a1f
+b21f974a10a2dfe9987370ef4b6af294cbe8f4bbe35ce9400d0538c5f71287498054d73606e26f93e2f19584aa18e285
+81fea77bad05c3bfa8d5d8409b189fd5c759613cd69ddb19b2d46673d4df944b2c7293989f79580d229d20959c74b18f
+ac962b0819a03d2a2fa42c492f54c3d293c6d5ead403c50f7a1ccc2faad58beeb0dfe888a928e505fea9e09807e13a23
+b78b913f2ad9622d20c175ed23f80f235b5336343b0353f82383fa6aab99aef77cb489df822bb168e56496c1854f623d
+8c06abf72913ffcb6b59bb8201c00034b447011880733aa6b563acc423e90bdae19f2a7a286943b55488fc863d09269c
+b34168972fcd90c78286bfc6078ce559e3c216d8d1885ecd5044bf9f23a4ad15bfc9830aabb4273472c43e2980048586
+88350e0ffe9b5576dd0afabc6d8445d25b2b9a0945c71e6b9a5587649ac5d95cbd722db5ea1e65d3fb8230c794fda5fc
+a3bec1fc362a33f38795158f1b869e9ee857a7f2e1acb92c6a7dcfffa64443a5b7f6dffb656452e7f855051ae849be3e
+a21f64c49334720883e1243a27575648f53637a644c308ff24f5c26bfe65cc690a5e46b8e432171f31c4229aff4db416
+85dcd8ebef8f7f44372912b4a3a0dfe66a56f16c3757a8ec01b71aa81eeda9f8e5082f92e3ae8cbf3c1eddf5e6ffed03
+af3c1a770f34f2acc504f38ffa7a18cc4b38f8f84f310cdf2d7346b18824ebc7c7663cc0e00b44cfb5494fe6081aff84
+a5dc7c5989fb5cea87c2d878d8436d858458171b667ab5200dc2cafd8af2d9c2bfe2515b0c002cdc9c3e61e4cfe4b444
+b136dcd4577ef3a3a8bc946cf2ec79d3fab301114ee2a692a6c219e252c9128db63fedebc6bd6695a8ae58e7d28501e8
+91d3a1ba625632d59dc963ed54c0310d0447df3e1d9151299722d10f8b26161bb73e0020d408b748fa6fd1db51adabd3
+b89f1a2497b04b3f1b018dc88b52133e1d7470f97f846965fbc934d34dbc8d38f2d8b07d218e62c609de33b61831cc9c
+92fec43fc5af23fda5dfab78234f5ea7813d8de34f8ec269c5fa35dd916b9143ff0033d35e7a284c0ef4f41047e98fe4
+8a0b89cd35ecf5b6db26c39705b416a4b950aafaf3b00a9d75f864955e9074aac03826ff9393456871107563eacc024a
+b04db63ebce71161fd42bb878e89155bc9e887329e164481077c6a1db092477370a362810d291444f5463437e0ec5906
+88ecd5275592f8b133928770e2273a0e0c23424d72b9e505130b0599ba28d1c11eceb2318a49dee054a8ba0971874357
+8eb0271197fb9f1eeedaadd8eb603b8753ada11abf04ce90950034f51f756ed6ec6a6182a47e1f3ae51e3a1f3ecdf467
+81cc996bc6b12ac56a1ae3add4483ae4f2e2284e9d304f5fa1723231d0e5b196813b6dbbc20b70f5d51fcbb65bf284bd
+8e1d94ecca2928c4c68fbc13199b6281f8782c75c119b763e0eb122f81c35f8fd079d1bd76b498393371a08dac95dd1d
+a92f98bc09f8a91fd165bb8d05e3b5ec50121d760b353d7e4ea23c0e04ff29614ad9028a4a16bdfe323f2af647e515ce
+82e8dc99a14da065200699e458150dc6d49ec0e098bbd91ab8f1fc1767e8732f53855499c8f24da7b9dd681100633be0
+a67b6cb4eeab4fe5f4ebdf5649b7d61bf5fbf7b6cd2d357fdf348ba32dbfa9d6830b1265ea76a1c666b266e30d119182
+a64e3af1d0e600bde18d7f53a4e8d89d296eab4bcd9cc3a9f476c5b8425e6e8082066948fbf40689f626e27e4830edfd
+8f66b59782cbccdb31cb1bb2d6385307633ba4db31c375c0a8424a497b2fdf309e7ec1c95490324b9a909bb43041998d
+b93f4817eb1d91ac78eb650c110f7c29df40df47ed1d5d3209c3abe5cf59a5e7aee3d1cd232bcce77e157b1a9daa2557
+864b6cd72029640fc041fd3efa71bb210edb40589a26981724b944192c3c2543352b4b757836a7b0b13bf830f22b8374
+9064a0ac94f2f133e287b796363f6d27e9646a8b531cd9ac0eb45b99fa73f327238161a43f7c4fc914036d69abd1473f
+a40e60d4aaf9f50f7bfebd0e714fcfeba64e0f7ccaa0f4829144a7efeaf15a7cda2d62d771a76f98a45cda9196b0522b
+93e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb8
+99aca9fb2f7760cecb892bf7262c176b334824f5727f680bba701a33e322cb6667531410dfc7c8e4321a3f0ea8af48cb1436638a2093123f046f0f504cc2a864825542873edbbc5d7ed17af125a4f2cf6433c6f4f61b81173726981dd989761d
+88e2e982982bf8231e747e9dfcd14c05bd02623d1332734d2af26246c6869fb56ee6c994843f593178a040495ba61f4a083b0e18110b1d9f5224783d8f9a895e8ee744e87929430e9ba96bd29251cbf61240b256d1525600f3d562894d93d659
+a2d33775e3d9e6af0d1b27d389e6c021a578e617a3d6627686db6288d4b3dffd7a847a00f7ef01828b7f42885b660e4204923402aca18fbae74ccd4e9c50dd8c2281b38dc09c022342ed1ac695d53f7081cb21f05fdfc0a3508c04759196fcd3
+af565445d2ad54c83a75c40e8895f5ad7219a8c728bce9d58d7a83716e095432993ebbd3f6911c66415a6f920d1a4d171478509b54a114308a020b33bf4487a7a8d0aa76ae4676a9b54e765a680f562d3a4fcb2e92c58b14b49b5b2917cc258f
+8aa99cfaf514cef4801599cadd780d222194ca1ad69a34779c2bcfda93e5dbeb931e13914421b5809a6c81f12cf7038b04a35257cc9e94c33761e68565b1274aa6a6f9d66477229747a66b308b138f92aa4326a3bf23df65a1fe33b3b289bfe1
+99ba36d8b4f56bde026099278548b1afc0a987cbd7c9baa51fc8e6cbb8237a17636f1a44a385cec69b05a5802059956a11fe793cabb939c38800f9c239ca2518e898ade1ec2513c9ee492071a35aabd78182392a09123d28dbc233313c9120c4
+a7dc40c36afccb30a2eaff250860b28b227c195cf05674704c567d77d6655c446ae835f8fc8667e71147ab02afcb2dad0babe60cbfa37d7c2cddc68d2dec54f28a4142f8353590a3902d5ddaa22066ab563dd1435dda83f276387b9767d69120
+939e6cc97a8b88572852a5b7f25e4838556307f60aeafb5d2b6961edbcafd4b48cb6ac980ffbacf4be963f324ba81e3d12de4f1459d8c746d0762c66ae1b166027f7fbe641d9c48f3c7d97b06d956b0be51dcc9aab65f3e99e1388e63bdd79f9
+b391e156541dfd4003d1697cdb7ec815b309807320574906b2e652ef0175828b356d215cd374b1b34d9f470b3fa0e643113e67b2273268f922f04f072cfb89008358185b25cd631f82911a3f20f90f75758ffb99bebb8076458ae1e9d1ae898c
+b9ac9c84934cc2a85c876eff65577e1dfce1935cd6392c877dd881a7d2f5c3e9344f28c04f90c62a6db4237ca00f9e0d00cb5f63e3f060fc7303916e19273b6fe455f331cabbe2fe5a22d584484f0d4176120fec9819fbb0a01e6d38695acfcd
+88209eb030c5d78734bf2c2a5c539653fd3c24b4c08e624f9ddc4a6550efbdc1054a56eb0c807595aad6de56fda326aa196d032a8b4b48d40140a2d77df3c7243eda6507936389a321a5811eb38e32ee433c788deeae1eb928b00940e2944bcc
+a8632ddc9cf7cbc1e8b74a05b7d4a89618c64afe30367ca0c9550ae7d320bf4e51c5a69e1501a1d8bee4240d13d7835501aa39fdc401a74f4d5734e268a7ce29a1fcfdb0a8bc64e0dd4a9e8578d6985bc2bc6a3764ce7a3703f6fb2e52557a2b
+a037ac67e8bb6f4193ac967e05d080a489f58ef8d3d30a89798246f3e4936121ee445b03e410a09e8ebc0db2e2477d110aad0ade99b0887f1eb016e750f42135866907f150bd6f4f99a8cb94281474166874808ebe03b118c5daab16dafdc38b
+a50d9143116bffa3b237da8e1805327e81e9cd25e658289bd727d5f9e0020172cc8690dcfe31a240e5cbc48353b88c4908baa1dd7320165556e0aa633f62fcbe7870222d345a3bbcdb7ab6c07f0fd86be559964afabf56f0a8cbc0b4b91d477e
+afa988ea6fa4f40c5ad07d2d580d29025ddf56d6ef1171a8b8de3464203f70b97d6f5ace72747345204b35150e06154d1477516a989ce8eea7871cc0d0de00a077c0fb23ad4837e409d0b885bf3f2dde11a30fa6273d662e68e09f461e52932f
+97fa1a943ed8b81574304a3d03f4f15907f6e6e0cd36a66bd2ad2c75afafc70a61d3ff69b77ebe4dae9ca0fcedef80081062705e60bbb6ea0f1f398c84d2f8e4a3ac142ac66426c21ad5e9994ebbcc406af474c4aec5e32fadcb21875af7c9f1
+b30a564614493886f14a5dd71c89457504f8c59a7ac01b665ed167e9a8f9ee5832198fd319ecd234196ee57031bdf3840bd5a923e203a1938bc795c704b5285389750e1fd10d7050061ba19db00a60a2c0384a7d661d7d48ebe6962272230859
+84c8dea942cfae71cb02e705ec496d967425793ce8812e7ee53c2f23713abeaff566a658cd1c73dfd18187d16253a6ee0a623e82cd18e31cd1a1875d19c078835dc9292e141686150a88065226ada264740143e87c03a0f6c4da8c187438ebf4
+8c3abae8aed60338f8c4ff80aab22f8a2ae56756a93566c906f490a97151d34a1c3318054e1c494c60cc53327ad86a2d02c6c76a406726ce4f88635bc32eff0db0b61762dc518b95fa8da82e87e4bf3de54f1d72180ef53ed7bc5413e6a9a510
+a328230c92a6b1cef6a444bcb64edb992f71e3d7b93f0b6b8b408ba7c908db746d92ddb2c7588bab438ef3bc61be1c2f0dfc86ba2ff514b42b35c80f89b2e780f813ea1dfb977fbded2cd9b553b747fa952e227ebd8f071163d421fc337f04c9
+b482cab423cd5f1c5df036070aade7aa016283d69619d664025c3feab866a0a5691d344b2ee2bedc5dedd1f9a73eae16003a3827c9e5bbe22ded32d848fba840ffad1141ad158f5c40bc8ae0d03781b9705d851a7f1391b096c576c0f4f2a6b0
+919ee1df27fabcb21237a1b7b98f53d41d849e1b6a8f9e28c3fae2841c6b5a250e4041c737e6725476e5cd715e34d3880f58d80f61efaabc261bdc703e8750f48a923e9bf8980931b9fd9e40014c66c54b3e7c98241d76d1aa47af43313a65a1
+ac94830145dbe9a8f7e6e0fc1f5fb454502d22abcafdc2dd96c6933c604461fa83b2b37385f4bc454875a02a6d4157841250956783515d11c7456e7f11b745f12856d89f5feedaf6a61a483a6c33a21cd2ba0c18eb41a1a2e7fc33bb53e4c570
+b209c699f1233735c5bb4bce848e4365fd76651ae2184d2279a90df0c2f69ffa2a24d84a9b9f274021072953c0d65e1a0202d490d6c37186af240114e445d87bff754b4824937e4f2c90a574061b1c4910fed88d90f698025a2a264e656cb8a4
+93320dc0576b0d069de63c40e5582b4486d9adf5e69e77e3ebaf3da26976fe42147a65051501bc8383f99e7ba75479c70a6726c2cd08bf98c7481f1f819712292d833a879f21a1221a9610bc748fb5e911055122fdb4055cdc84e8bfe0f4df9b
+a4380b240e998cdf668591f71a0c88ed143b0185a920787627ce65095f8223dc606fa5bce93377af100de92d663e675c0736d7f1973603a84a5c4162fb5e01c88c7493503ae1d7e9fbe8ece9b418397d68c21eeb88dae226e09875d372c646dd
+aab48517d69135a16b36b685adfe9b2544a709135a21ba3e75981a2cba4ec81d1fe28ac0f72fde0c0001c15300ed6a810f58d3117bdd58d0149751d6508cf8a1a1ff7b63dd02d2730a9d6fe96c77c502fe8ed46d50a181ec4bb35e37dfbd6af4
+8277265fe75ab89ce4ec65b33fb4084bec0a56d81faf2f7a9070d2ca3065678e03a790350eba56323a54e0285bc32fe8007d5259740fde226e16cbde8354eacd562294eb9b7f727ed72ffbdad86f467cf057c737b34b80a41deb92634ed866f5
+aa40a24cb2ebe606d969392c03020070f044c95088d80f57f771b837c048342d2cd3474600d7660441090ffb8d2ffb7f0eddd67eb378e3e1477a6ba0bc38096d5d2d3355bc8b60f605f57f0c1899da591457440352381d2b38c0aa9acc7fe419
+80815d10685808cb630820629bcd2fa9041c9b74433630c0b9c1b7f7e8edf1440b520217f76ec9a50c125cf4438aa66006a1928a9ed2321da7ea325c3d56b65462b72118ca2c99a0ea733aa11da9abbeda6cc71ffeed301ae70213a29e697dcd
+ac235d079f91b00b1fead7523da8f73a5409fa8970907af0c5d5e4c6a0996dccfcdb0d822d08c7fbc0c24799457d011d04312d20831825f23cf988141056a6814c8a1cac9efe37bdcbfa272aed24cd92810fea7c49b0d07683a5c53643872179
+b8aa59534d75fa5ac1c2c3f963bf73899aff5210059dbde8a8635561c6249e5143affee3bd2fd57575213b52d9a73d5702525867a7dcbb1d0a49b98c2925556fc5463ff0209742046a24ab29e74257d6419401093cc4371944d811cc300b6a67
+80bbfc5b816eea29a6d84e2217dee4d547306994d39e5592515e1b0807b67fe960d1d5addb0ff1a20c158bdb294c04bf093d28996121845a2c9268e2c9ac0f4067e889c6aaca62f8535d35b45036954bd069e3afa84f04721538c26003304c20
+a535c17d0e151d0e03d42dd58ba8c715bee3fabca2890e0e016071d34184b6b34e770d2be29c8ec76b69bcc471d50f4d043c2c240e9b93a81cff7ee2724e02018dfd9b534e40be641fdb4884abcd83b76f517557ffba508f1ba2f56313f4de94
+b237eb7465df0d325a3aa58269be2627e4978f9863f4f100ed4c303cb1f6549e606f2e3c9180824d8049191965c8dacd0a0c76cc56cb22cf1bcfdb39372c8aa29b4f7b34582b1719e6bd59c930d87d5ccd838743b585d6e229d5ed42337315c0
+805c335a2a9d2de30809cf30808ef836d88e9453c510716f01696f14c72dd60505eca8f128970edc8e63a9aa1f8792ac0dd50dcc84fbf4cc8b32349c682a6a27bc7551c7aa273a94c1606d07710188d93579afe3be1781bded15a34ed6047922
+b25dadf385ddd3c39bcb0a014d3d4f66127946b1aceae8809e3a03d66cc25e27142ca108316391f857fe82fdea4db2520cc73793b695eafbf3ade00ef7ec747b0457e49303f5e1a370f5263b436566fe24a0876e5fe088238c7be37a0718d65f
+b0f753081cabe2c8fce73aba82ff67dbc9842598b3e7fa3ce2a1f534536f8ac63c532fe66552ac6b7adb28c73ed4c8a4184849be7c1756a4681ce29ebf5e1c3aa806b667ee6bd68f6397aba3215dc1caec6742f21d681e32cd1160d6a3b1d7ee
+b798771eeb3d7a17c62ba5916cc034bba870da6b1ac14c2e1cae71af3ad4e0c0d1ff983f691e0e55289d5a33b131f2ec12430c9566dd71f4d8be9c79155357a5c30c5efcfd75bbe1bb6d5ada4d50604ea49ed838d3641f268ca6e25c9c4b6b72
+b52554c017388b099804abbe565346591a086d9979e10140ddaccc0a3680e506db775d7cbeafde67563adf0f09f5c2420caf19629f4e8f03e6fe02e9416ecd5269989e482b90004a083967d1141387eb74865bac6bd17e7a6d5f58225e52d4b7
+b520ff694520919023d44d53f98a7de2f78ff37b2d9193dcaa35556a6a0febf767781a4c961dce7c804bfdf81935f8f0082865253da52e79dfa1c5ff74d61495b2da76e167d46114709e877a7791a3a95e33a42f56b83f5f5afe271c67ae997c
+b721401983440797a03d5b99f2088a0b249aa911969c34dd6c615b0060325da555d2ad99d931170c0868b0488a2234a4114cc0013d5163b833f5c45c5eb536421c016cf85788390176bb2dc4c196d6be26bbbfceae048b82f0d8039222e71c94
+acd9d833ba0a8cbd8d1ba939a11ea0fa5607e1bc6e693ec318bdb097aedd042d76e695dcebebd142e2e4ac30b1905dff03ec36d9cc70577e4dbe5e9ed7c20c7afb13a7f0155f203c6b83b9f1ad3d20a0d4aef0fbbbcf466ffc1bcd482bc2f5e0
+8cc1795de015f2b0e72116f169f3b4624b7738ceebea354e0bd9051c27b86f647ea36cad57ea6884c1a8adf9b45cd83514fa687e68878bbd613d793aa10986d5a0411f081689229e0d72133b3667b9f3f1a02211d0e680564eb1ea43393e1f36
+aa9281c61113c343a108de1036570feefc72fb7a96ff11f73024de12b83f29631f5a8a5900e6f10b15227c6f7462881511271bf785ebdf95ce288100e5dab391f664f6ff76c72b65b34479a4f43e5e8eba292209d6654157286ad3242ac342db
+aaf16866275082e59d415db317aa874267d048ee405a553e852e6d175711d31a1fee99912345915bce121f43bc3e00d81338e5fcd3c8a1012fb4f172a9fe15622dd368b4d9d5cb60d189f423b071791fe26cea7676aca8df07965cacf80b0cd0
+accc80b3d8a6ffa648487a3d3c0ce1aeeb5401edf3cf2e385ea4a6d5fc110054fcce38f01f1da7141bbed30eb7a0a6810c82212bbb9da75d6033082dbcf6bc6a5791f85aa0f045a10da5de015edbf369b4d23b32b0c058962d2ee88e6911f994
+83f1089395a16077738cc7c9a6d6a3dc9033aac4abc508af5a1f007ca92e1a80b2e6f2dbda7fdcf0d5646de790a6201d0a9cfbcb6620a1426600e3a6a425ec004384f49fb9dcd166691a47177d45dcbcb761a11d46220b0aa09fc946131f7aa5
+9246bb586d43cb817c2e15ed609156e9f1cd284ba2f4797bbfa51c0341e1ba382eaac059aa9f63fb88d228a1a932839a171e7c7d00199dc7c4d6c5ea038a02cbc3cc5297c70401520e70ebbcffacd6a703f62896f3c788f94dde3c33ab0ecbdb
+a316cb7c74feb0563c56cc79015e2774fbeca458bf8e9fb07894f9d6bcd73f7fb9428e87c816e5629e4bf7f3ec567fbc091549471b75492dde08217cb334b716b4582b24384586e53388873a78a90ec01bd7c3bace9cfc52161467df16e27c33
+ade18c74bbe60d1d69f4a570f8e5fd8696c26cc9e02829040b6b14cb9c49a4b3263b5bd5e16ec0b29010b4be054c16ab09304e23442af7d7f5fcc60bc6c5634ab6e4aed7ef334b2785e4c7672d59a687278e42d310342db5e5975d716e6d1595
+b7728800bb2039acf228fa3d8028569c426cb85d28b2b5820bbef938d5ca8c4df981d3e01a309e26ca101e8295d0f6990c03b8c239798323575874a4ee5bfe46cfe99b9657189142aacd8f8d1f26cf4c0e73c6397c31ba8f18102b9ea315b638
+8fb14f2a9be193f54977ecd3021663108ea143627b9a9d9faff85d1a86b855f6c437eab435fad3304f245bd7732af07f1173494cdb802fb96e85d2db89e1643206e183f3b228ca8d3f586e71aa9308eaf0223100bf07942fc39e465016d1f775
+ac1e025e53d98fdb3380489dce82d9d4bd3a6c98f0a523b841cb09a6f26ddd4d22efd98776e78d10fd996995fd00e81e08d3c25dd14a54b25a9d483677a24bbb8d1cb41a443b2c71038e6893b1b30f70758424e0f2039a48060191389033ef55
+a4c017311b9e930868132527a9849072b91db04fd36c619ae39c98da9e2174e6201d3c2ff1246c06b1b6815bbf3ea4a1116564f55ee2fe4c4d655e2294c0ded842cba209c255ca3d7b7f82d162f97890dfdeed087aa2f87cbfc61d61815da39d
+89516315a3956b455843c2555248bd94dcb19993060fe75fdd51f7aa9c9147ab13997d8a98036a8f04bee5c91d78d2990907e35a52537a8ab3ed15f1a71afdcd38044a5b6e93f662b9d36c16933a881927cacae668c4c06ee6f004c9e3989bad
+a1e78a011e210400c68ca76045f7da74119bff3cbe382efd2bd2ac76567c52d68d75536a91999d084043e1ce2d07d02e0b69fb99924101d2543521747536fbc51b0454aa9a4cbbec101121f597863a5c0fee2ca5eab35dff9b9085bef8b2b0d0
+830fd8d083e39153ecab43cabb22e29d7b44a55fba467af4ddd3f069439d2972ef53c3518de788f96b3f4f64963987d0155ba27afc28643af3de8e476ff515a68285728167408f45d99e574680bda6bacdd4322e587e4aa99386e035c0e931ad
+b89584da22237e3061d991b1a55a5e55dc637b8b671130d304587729348138ef87885180310efe9f9f6d3580b9d7fdcf0649e8a79d2dec8c25a9f53df0fac5d517db999029cbfdd7c2cbd3e9a5503e5d267d3d8ad752335915c92b850b14bafb
+959b8030733799882c5e3735479924b013756e57b893f9792bab4043e2d362d77cf308166d782e3989caa771b8a0c0a01302cb7b5e8ca12e2d6cebd59d4cd173c9dc25f438bac597fab17b4ff44997a489c168e7204b7d7c21d0938f0a2e3b51
+a0a9e5503d9afe0027891dab890c687fd5f5fac5741418490c64d7c15f59533dd603a50163c79402afa61bd02de486761983c94501da17e6bbe78c497f2122210071602f578adc0ebe7a4679f87fe77e09c8c122de69105f13455fea25f08e6f
+9811487283ad620cd7c9b303ae2f348d0e6f5ee17b504baaa817ae207adb912a00d3cc36dbf48745eb899e6b6e22f09f0f9ba29d949ecd7350fbbfe87a8c7cdd5d0e687fc807751d07634aaf7c38baf3b24a0670c38fa6ccd7431436fc95525f
+8a13aa5071c526e560def7d8583393942f07d88c9d8d26c98738fd65f57af2e3326dbb1edff0f39fe98eda4a13ed4fd71844254b954690154c4804e1c4a53df9dc4643f4b7b09d0860070f6b2318d0d63d28fb56bf5b6ff456a18dfc72fdfbbe
+b9c90ff6bff5dd97d90aee27ea1c61c1afe64b054c258b097709561fe00710e9e616773fc4bdedcbf91fbd1a6cf139bf14d20db07297418694c12c6c9b801638eeb537cb3741584a686d69532e3b6c12d8a376837f712032421987f1e770c258
\ No newline at end of file
diff --git a/besu/src/test/resources/valid_pos_checkpoint_pos_TD_equals_TTD.json b/besu/src/test/resources/valid_pos_checkpoint_pos_TD_equals_TTD.json
new file mode 100644
index 00000000000..eb69f824861
--- /dev/null
+++ b/besu/src/test/resources/valid_pos_checkpoint_pos_TD_equals_TTD.json
@@ -0,0 +1,37 @@
+{
+  "config": {
+    "chainId": 1337,
+    "homesteadBlock": 0,
+    "daoForkBlock": 0,
+    "eip150Block": 0,
+    "eip158Block": 0,
+    "byzantiumBlock": 0,
+    "petersburgBlock": 0,
+    "istanbulBlock": 0,
+    "muirGlacierBlock": 0,
+    "berlinBlock": 0,
+    "londonBlock": 0,
+    "arrowGlacierBlock": 0,
+    "grayGlacierBlock": 0,
+    "terminalTotalDifficulty": 10,
+    "ethash": {
+    },
+    "checkpoint": {
+      "hash": "0x186642d6084eb7799cb01c7eb69c1a7f3b2c32cd141e62d309f30081a1ea3c91",
+      "number": 3,
+      "totalDifficulty": "0x0a"
+    }
+  },
+  "nonce": "0x42",
+  "timestamp": "0x0",
+  "extraData": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
+  "gasLimit": "0x1388",
+  "difficulty": "0x400000000",
+  "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "coinbase": "0x0000000000000000000000000000000000000000",
+  "alloc": {
+    "000d836201318ec6899a67540690382780743280": {
+      "balance": "0xad78ebc5ac6200000"
+    }
+  }
+}
diff --git a/besu/src/test/resources/valid_post_merge_near_head_checkpoint.json b/besu/src/test/resources/valid_post_merge_near_head_checkpoint.json
new file mode 100644
index 00000000000..29d33e1c045
--- /dev/null
+++ b/besu/src/test/resources/valid_post_merge_near_head_checkpoint.json
@@ -0,0 +1,37 @@
+{
+  "config": {
+    "chainId": 1,
+    "homesteadBlock": 1150000,
+    "daoForkBlock": 1920000,
+    "eip150Block": 2463000,
+    "eip158Block": 2675000,
+    "byzantiumBlock": 4370000,
+    "petersburgBlock": 7280000,
+    "istanbulBlock": 9069000,
+    "muirGlacierBlock": 9200000,
+    "berlinBlock": 12244000,
+    "londonBlock": 12965000,
+    "arrowGlacierBlock": 13773000,
+    "grayGlacierBlock": 15050000,
+    "terminalTotalDifficulty": 58750000000000000000000,
+    "ethash": {
+    },
+    "checkpoint": {
+      "hash": "0x186642d6084eb7799cb01c7eb69c1a7f3b2c32cd141e62d309f30081a1ea3c91",
+      "number": 16015954,
+      "totalDifficulty": "0xC70D815D562D3CFA955"
+    }
+  },
+  "nonce": "0x42",
+  "timestamp": "0x0",
+  "extraData": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
+  "gasLimit": "0x1388",
+  "difficulty": "0x400000000",
+  "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "coinbase": "0x0000000000000000000000000000000000000000",
+  "alloc": {
+    "000d836201318ec6899a67540690382780743280": {
+      "balance": "0xad78ebc5ac6200000"
+    }
+  }
+}
diff --git a/build.gradle b/build.gradle
index b9d3821c316..8a005a4338f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,17 +20,31 @@ import net.ltgt.gradle.errorprone.CheckSeverity
 import java.text.SimpleDateFormat
 
 plugins {
-  id 'com.diffplug.gradle.spotless' version '4.3.0'
-  id 'com.jfrog.bintray' version '1.8.5'
-  id 'com.github.ben-manes.versions' version '0.28.0'
-  id 'com.github.hierynomus.license' version '0.15.0'
-  id 'io.spring.dependency-management' version '1.0.9.RELEASE'
-  id 'me.champeau.gradle.jmh' version '0.5.0' apply false
-  id 'net.ltgt.errorprone' version '1.2.1'
+  id 'com.diffplug.spotless' version '6.12.0'
+  id 'com.github.ben-manes.versions' version '0.42.0'
+  id 'com.github.hierynomus.license' version '0.16.1-fix'
+  id 'com.jfrog.artifactory' version '4.28.3'
+  id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+  id 'me.champeau.jmh' version '0.7.0' apply false
+  id 'net.ltgt.errorprone' version '2.0.2'
+  id 'maven-publish'
+  id 'org.sonarqube' version '3.4.0.2513'
 }
 
-if (!JavaVersion.current().java11Compatible) {
-  throw new GradleException("Java 11 or later is required to build Besu.\n" +
+sonarqube {
+  properties {
+    property "sonar.projectKey", "hyperledger_besu"
+    property "sonar.organization", "hyperledger"
+    property "sonar.host.url", "https://sonarcloud.io"
+    property "sonar.coverage.jacoco.xmlReportPaths", "${buildDir}/reports/jacoco/jacocoRootReport/jacocoRootReport.xml"
+    property "sonar.coverage.exclusions", "acceptance-tests/**/*"
+  }
+}
+
+project.tasks["sonarqube"].dependsOn "jacocoRootReport"
+
+if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
+  throw new GradleException("Java 17 or later is required to build Besu.\n" +
   "  Detected version ${JavaVersion.current()}")
 }
 
@@ -71,24 +85,6 @@ def _strListCmdArg(name) {
   return _strListCmdArg(name, null)
 }
 
-apply plugin: 'com.jfrog.bintray'
-
-def bintrayUser = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
-def bintrayKey = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_KEY')
-def bintrayPackage = bintray.pkg {
-  repo = 'besu-repo'
-  name = 'besu'
-  userOrg = 'hyperledger-org'
-  licenses = ['Apache-2.0']
-  websiteUrl = 'https://github.com/hyperledger/besu'
-  vcsUrl = 'https://github.com/hyperledger/besu.git'
-
-  version {
-    name = project.version
-    released = new Date()
-  }
-}
-
 allprojects {
   apply plugin: 'java-library'
   apply plugin: 'io.spring.dependency-management'
@@ -100,7 +96,7 @@ allprojects {
   version = rootProject.version
 
   jacoco {
-    toolVersion = '0.8.5'
+    toolVersion = '0.8.8'
     if (project.tasks.findByName('referenceTests')) {
       applyTo referenceTests
     }
@@ -113,19 +109,13 @@ allprojects {
 
   task javadocJar(type: Jar, dependsOn: javadoc) {
     classifier = 'javadoc'
-    from javadoc.destinationDir
+    from javadoc.outputDirectory
   }
 
-  sourceCompatibility = 11
-  targetCompatibility = 11
+  sourceCompatibility = 17
+  targetCompatibility = 17
 
   repositories {
-    mavenCentral()
-    mavenLocal()
-    maven { url "https://hyperledger-org.bintray.com/besu-repo" }
-    maven { url "https://consensys.bintray.com/pegasys-repo" }
-    maven { url "https://splunk.jfrog.io/splunk/ext-releases-local" }
-    maven { url "https://dl.bintray.com/open-telemetry/maven" }
     maven {
       name = "GitHubPackages"
       url = uri("https://maven.pkg.github.com/lacchain/liboqs-java/")
@@ -133,49 +123,59 @@ allprojects {
         username = project.findProperty("gpr.user") ?: System.getenv("USERNAME")
         password = project.findProperty("gpr.key") ?: System.getenv("TOKEN")
       }
+    maven {
+      url 'https://hyperledger.jfrog.io/hyperledger/besu-maven'
+      content { includeGroupByRegex('org\\.hyperledger\\..*') }
+    }
+    maven {
+      url 'https://artifacts.consensys.net/public/maven/maven/'
+      content { includeGroupByRegex('tech\\.pegasys(\\..*)?') }
+    }
+    maven {
+      url 'https://splunk.jfrog.io/splunk/ext-releases-local'
+      content { includeGroupByRegex('com\\.splunk\\..*') }
+    }
+    mavenCentral()
+
+    // ethereum execution spec tests fixtures. Exclusively for ethereum submodule to run ref tests
+    def ethExecSpecTestsRepo = ivy {
+      url 'https://github.com'
+      patternLayout {
+        artifact '/[organisation]/[module]/releases/download/v[revision]/[classifier].[ext]'
+      }
+      metadataSources {
+        artifact()
+      }
+    }
+    exclusiveContent {
+      forRepositories(ethExecSpecTestsRepo)
+      filter { includeModule('ethereum', 'execution-spec-tests')}
     }
   }
 
-  dependencies { errorprone "com.google.errorprone:error_prone_core" }
+  dependencies { errorprone 'com.google.errorprone:error_prone_core' }
 
-  apply plugin: 'com.diffplug.gradle.spotless'
+  apply plugin: 'com.diffplug.spotless'
   spotless {
     java {
       // This path needs to be relative to each project
-      target fileTree('.') {
-        include '**/src/*/java/**/*.java'
-        exclude '**/generalstate/GeneralStateReferenceTest*.java'
-        exclude '**/generalstate/GeneralStateRegressionReferenceTest*.java'
-        exclude '**/generalstate/LegacyGeneralStateReferenceTest*.java'
-        exclude '**/blockchain/BlockchainReferenceTest*.java'
-        exclude '**/blockchain/LegacyBlockchainReferenceTest*.java'
-        exclude '**/.gradle/**'
-      }
+      target 'src/**/*.java'
+      targetExclude '**/src/reference-test/**', '**/src/main/generated/**', '**/src/test/generated/**', '**/src/jmh/generated/**'
       removeUnusedImports()
-      googleJavaFormat('1.7')
+      googleJavaFormat('1.15.0')
       importOrder 'org.hyperledger', 'java', ''
       trimTrailingWhitespace()
       endWithNewline()
     }
     groovyGradle {
       target '*.gradle'
-      greclipse().configFile(rootProject.file('gradle/formatter.properties'))
+      greclipse('4.21.0').configFile(rootProject.file('gradle/formatter.properties'))
       endWithNewline()
     }
-
     // Below this line are currently only license header tasks
     format 'groovy', { target '**/src/*/grovy/**/*.groovy' }
-
-    // Currently disabled due to referencetest issues
-    //  format 'bash', {
-    //    target fileTree('.') {
-    //      include '**/*.sh'
-    //     exclude '**/ansible/**'
-    //    }
-    //  }
-    //  format 'sol', {
-    //    target fileTree('.') { include '**/*.sol' }
-    //  }
+    format 'bash', { target '**/*.sh' }
+    format 'sol', { target '**/*.sol' }
   }
 
   tasks.withType(JavaCompile) {
@@ -191,7 +191,7 @@ allprojects {
     ]
 
     options.errorprone {
-      excludedPaths = '.*/(generated/*.*|.*ReferenceTest_.*)'
+      excludedPaths = '.*/(generated/*.*|.*ReferenceTest_.*|build/.*/annotation-output/.*)'
 
       // Our equals need to be symmetric, this checker doesn't respect that.
       check('EqualsGetClass', CheckSeverity.OFF)
@@ -257,7 +257,24 @@ allprojects {
       '--add-opens',
       'java.base/java.util.concurrent=ALL-UNNAMED',
       '--add-opens',
-      'java.base/java.util.concurrent.atomic=ALL-UNNAMED'
+      'java.base/java.util.concurrent.atomic=ALL-UNNAMED',
+      // errorprone tests need access to the javac compiler
+      '--add-exports',
+      'jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED',
+      '--add-exports',
+      'jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED',
+      '--add-exports',
+      'jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED',
+      '--add-exports',
+      'jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED',
+      '--add-exports',
+      'jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED',
+      '--add-exports',
+      'jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED',
+      '--add-exports',
+      'jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED',
+      '--add-exports',
+      'jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED'
     ]
     Set toImport = [
       'test.ethereum.include',
@@ -271,10 +288,23 @@ allprojects {
         systemProperty name, System.getProperty(name)
       }
     }
+    useJUnitPlatform {}
   }
 
   javadoc {
-    options.addStringOption('Xdoclint:all', '-quiet')
+    options.addBooleanOption('Xdoclint:all', true)
+    // disable doc lint checking for generated code and acceptance tests dsl.
+    options.addBooleanOption('Xdoclint/package:-org.hyperledger.besu.privacy.contracts.generated,' +
+      '-org.hyperledger.besu.tests.acceptance.*,' +
+      '-org.hyperledger.besu.tests.web3j.generated,' +
+      // TODO: these are temporary disabled (ethereum and sub modules), it should be removed in a future PR.
+      '-org.hyperledger.besu.ethereum,' +
+      '-org.hyperledger.besu.ethereum.*,' +
+      '-org.hyperledger.besu.ethstats.*,' +
+      '-org.hyperledger.besu.evmtool',
+      true)
+    options.addStringOption('Xmaxerrs','65535')
+    options.addStringOption('Xmaxwarns','65535')
     options.addStringOption('Xwerror', '-html5')
     options.encoding = 'UTF-8'
   }
@@ -287,7 +317,7 @@ task checkMavenCoordinateCollisions {
   doLast {
     def coordinates = [:]
     getAllprojects().forEach {
-      if (it.properties.containsKey('publishing')) {
+      if (it.properties.containsKey('publishing') && it.jar?.enabled) {
         def coordinate = it.publishing?.publications[0].coordinates
         if (coordinates.containsKey(coordinate)) {
           throw new GradleException("Duplicate maven coordinates detected, ${coordinate} is used by " +
@@ -319,9 +349,7 @@ subprojects {
       }
     }
 
-    dependencies {
-      testImplementation sourceSets.testSupport.output
-    }
+    dependencies { testImplementation sourceSets.testSupport.output }
 
     task testSupportJar(type: Jar) {
       archiveBaseName = "${project.name}-support-test"
@@ -343,9 +371,7 @@ subprojects {
     }
 
     if (file('src/test-support').directory) {
-      dependencies {
-        integrationTestImplementation sourceSets.testSupport.output
-      }
+      dependencies { integrationTestImplementation sourceSets.testSupport.output }
     }
 
     task integrationTest(type: Test, dependsOn: ["compileTestJava"]) {
@@ -361,6 +387,7 @@ subprojects {
       testClassesDirs = sourceSets.integrationTest.output.classesDirs
       classpath = sourceSets.integrationTest.runtimeClasspath
       outputs.upToDateWhen { false }
+      useJUnitPlatform {}
     }
   }
 
@@ -371,7 +398,7 @@ subprojects {
   }
 
   if (sourceSetIsPopulated("main") || sourceSetIsPopulated("testSupport")) {
-    apply plugin: 'com.jfrog.bintray'
+    apply plugin: 'com.jfrog.artifactory'
     apply plugin: 'maven-publish'
 
     publishing {
@@ -411,16 +438,25 @@ subprojects {
       }
     }
 
-    bintray {
-      user = bintrayUser
-      key = bintrayKey
-
-      publications = ['mavenJava']
-      override = version.endsWith('SNAPSHOT')
-
-      publish = true
-
-      pkg = bintrayPackage
+    def artifactoryUser = project.hasProperty('artifactoryUser') ? project.property('artifactoryUser') : System.getenv('ARTIFACTORY_USER')
+    def artifactoryKey = project.hasProperty('artifactoryApiKey') ? project.property('artifactoryApiKey') : System.getenv('ARTIFACTORY_KEY')
+    def artifactoryRepo = System.getenv('ARTIFACTORY_REPO') ?: 'besu-maven'
+    def artifactoryOrg = System.getenv('ARTIFACTORY_ORG') ?: 'hyperledger'
+
+    artifactory {
+      contextUrl = "https://hyperledger.jfrog.io/${artifactoryOrg}"
+      publish {
+        repository {
+          repoKey = "${artifactoryRepo}"
+          username = artifactoryUser
+          password = artifactoryKey
+        }
+        defaults {
+          publications('mavenJava')
+          publishArtifacts = true
+          publishPom = true
+        }
+      }
     }
   }
 
@@ -442,7 +478,7 @@ subprojects {
   }
 
   if (file('src/jmh').directory) {
-    apply plugin: 'me.champeau.gradle.jmh'
+    apply plugin: 'me.champeau.jmh'
 
     jmh {
       // Allows to control JMH execution directly from the command line. I typical execution may look
@@ -455,13 +491,13 @@ subprojects {
       fork = _intCmdArg('f')
       iterations = _intCmdArg('i')
       benchmarkMode = _strListCmdArg('bm')
-      include = _strListCmdArg('include', [''])
+      includes = _strListCmdArg('include', [''])
       humanOutputFile = project.file("${project.buildDir}/reports/jmh/results.txt")
       resultFormat = 'JSON'
-      duplicateClassesStrategy = 'warn'
+      duplicateClassesStrategy = DuplicatesStrategy.WARN
     }
 
-    dependencies { jmh 'org.apache.logging.log4j:log4j-api' }
+    dependencies { jmh 'org.slf4j:slf4j-api' }
   }
 }
 
@@ -476,6 +512,8 @@ applicationDefaultJvmArgs = [
   // We shutdown log4j ourselves, as otherwise this shutdown hook runs before our own and whatever
   // happens during shutdown is not logged.
   '-Dlog4j.shutdownHookEnabled=false',
+  // Disable JNI lookups in log4j messages to improve security
+  '-Dlog4j2.formatMsgNoLookups=true',
   // Redirect java.util.logging loggers to use log4j2.
   '-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager',
   // Suppress Java JPMS warnings.  Document the reason for each suppression.
@@ -496,8 +534,6 @@ applicationDefaultJvmArgs = [
 run {
   args project.hasProperty("besu.run.args") ? project.property("besu.run.args").toString().split("\\s+") : []
   doFirst {
-    applicationDefaultJvmArgs.add(0, "-Dotel.resource.attributes=service.name=besu-dev")
-    applicationDefaultJvmArgs.add(0, "-javaagent:"+ configurations.javaAgent.singleFile.toPath() + "")
     applicationDefaultJvmArgs = applicationDefaultJvmArgs.collect {
       it.replace('BESU_HOME', "$buildDir/besu")
     }
@@ -511,19 +547,6 @@ def tweakStartScript(createScriptTask) {
 
   createScriptTask.unixScript.text = createScriptTask.unixScript.text.replace('BESU_HOME', '\$APP_HOME')
   createScriptTask.windowsScript.text = createScriptTask.windowsScript.text.replace('BESU_HOME', '%~dp0..')
-  // OpenTelemetry Wiring for unix scripts
-  def agentFileName = configurations.javaAgent.singleFile.toPath().getFileName()
-  def unixRegex = $/exec "$$JAVACMD" /$
-  def forwardSlash = "/"
-  def unixReplacement = $/if [ -n "$$TRACING" ];then
- TRACING_AGENT="-javaagent:$$APP_HOME/agent${forwardSlash}${agentFileName}"
-fi
-exec "$$JAVACMD" $$TRACING_AGENT /$
-  createScriptTask.unixScript.text = createScriptTask.unixScript.text.replace(unixRegex, unixReplacement)
-  // OpenTelemetry Wiring for windows scripts
-  def windowsRegex = $/"%JAVA_EXE%" %DEFAULT_JVM_OPTS%/$
-  def windowsReplacement = $/if Defined TRACING (TRACING_AGENT="-javaagent:" "%APP_HOME%\agent\/$ + agentFileName + '")\r\n"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %TRACING_AGENT%'
-  createScriptTask.windowsScript.text = createScriptTask.windowsScript.text.replace(windowsRegex, windowsReplacement)
 
   // Prevent the error originating from the 8191 chars limit on Windows
   createScriptTask.windowsScript.text =
@@ -534,28 +557,46 @@ exec "$$JAVACMD" $$TRACING_AGENT /$
 }
 
 startScripts {
-  doLast {
-    tweakStartScript(startScripts)
-  }
+  unixStartScriptGenerator.template = resources.text.fromFile("${projectDir}/besu/src/main/scripts/unixStartScript.txt")
+  windowsStartScriptGenerator.template = resources.text.fromFile("${projectDir}/besu/src/main/scripts/windowsStartScript.txt")
+  doLast { tweakStartScript(startScripts) }
 }
 
 task evmToolStartScripts(type: CreateStartScripts) {
-  mainClassName = 'org.hyperledger.besu.evmtool.EvmTool'
+  mainClass = 'org.hyperledger.besu.evmtool.EvmTool'
   classpath = startScripts.classpath
   outputDir = startScripts.outputDir
   applicationName = 'evm'
   defaultJvmOpts = [
     "-Dsecp256k1.randomize=false"
   ]
+  unixStartScriptGenerator.template = resources.text.fromFile("${projectDir}/besu/src/main/scripts/unixStartScript.txt")
+  windowsStartScriptGenerator.template = resources.text.fromFile("${projectDir}/besu/src/main/scripts/windowsStartScript.txt")
+  doLast { tweakStartScript(evmToolStartScripts) }
+}
+
+task autocomplete(type: JavaExec) {
+  dependsOn compileJava
+  def tempAutocompleteFile = File.createTempFile("besu", ".autocomplete")
+  standardOutput tempAutocompleteFile.newOutputStream()
+  outputs.file "$buildDir/besu.autocomplete.sh"
+
+  mainClass = application.mainClass
+  args "generate-completion"
+  classpath sourceSets.main.runtimeClasspath
   doLast {
-    tweakStartScript(evmToolStartScripts)
+    copy {
+      from tempAutocompleteFile
+      into "$buildDir"
+      rename tempAutocompleteFile.getName(), 'besu.autocomplete.sh'
+    }
   }
 }
 
 installDist { dependsOn checkLicenses }
 
 distTar {
-  dependsOn checkLicenses
+  dependsOn checkLicenses, autocomplete
   doFirst {
     delete fileTree(dir: 'build/distributions', include: '*.tar.gz')
   }
@@ -564,14 +605,59 @@ distTar {
 }
 
 distZip {
-  dependsOn checkLicenses
+  dependsOn checkLicenses, autocomplete
   doFirst {
     delete fileTree(dir: 'build/distributions', include: '*.zip')
   }
 }
 
-def dockerVariants = [
-  "openjdk-11"
+publishing {
+  publications {
+    distArtifactory(MavenPublication) {
+      groupId = '.'
+      version = project.version
+      artifactId = 'besu'
+      artifact("$buildDir/distributions/besu-${project.version}.zip")
+      artifact("$buildDir/distributions/besu-${project.version}.tar.gz") { extension = 'tar.gz' }
+    }
+  }
+}
+
+def artifactoryUser = project.hasProperty('artifactoryUser') ? project.property('artifactoryUser') : System.getenv('ARTIFACTORY_USER')
+def artifactoryKey = project.hasProperty('artifactoryApiKey') ? project.property('artifactoryApiKey') : System.getenv('ARTIFACTORY_KEY')
+def artifactoryOrg = System.getenv('ARTIFACTORY_ORG') ?: 'hyperledger'
+
+artifactory {
+  contextUrl = "https://hyperledger.jfrog.io/${artifactoryOrg}"
+  publish {
+    repository {
+      repoKey = "besu-binaries"
+      username = artifactoryUser
+      password = artifactoryKey
+    }
+    defaults {
+      publications('distArtifactory')
+      publishArtifacts = true
+      publishPom = false
+    }
+  }
+}
+
+artifactoryPublish {
+  dependsOn distTar
+  dependsOn distZip
+}
+
+def dockerBuildVersion = project.hasProperty('release.releaseVersion') ? project.property('release.releaseVersion') : "${rootProject.version}"
+def dockerOrgName = project.hasProperty('dockerOrgName') ? project.getProperty("dockerOrgName") : "hyperledger"
+def dockerArtifactName = project.hasProperty("dockerArtifactName") ? project.getProperty("dockerArtifactName") : "besu"
+def dockerImageName = "${dockerOrgName}/${dockerArtifactName}"
+def dockerVariants = project.hasProperty("dockerVariants") ? project.getProperty("dockerVariants").split(",") : [
+  "openjdk-17",
+  "openjdk-17-debug",
+  "openj9-jdk-17",
+  "graalvm",
+  "openjdk-latest"
 ]
 
 // rename the top level dir from besu-<version> to besu and this makes it really
@@ -589,6 +675,7 @@ tasks.register("dockerDistUntar") {
       from tarTree(distTarFile)
       into(dockerBuildDir)
     }
+    project.delete(files("${dockerBuildDir}/besu"))
     file("${dockerBuildDir}/${distTarFileName}").renameTo("${dockerBuildDir}/besu")
   }
 }
@@ -596,27 +683,37 @@ tasks.register("dockerDistUntar") {
 task distDocker {
   dependsOn dockerDistUntar
   inputs.dir("build/docker-besu/")
-  def dockerBuildVersion = project.hasProperty('release.releaseVersion') ? project.property('release.releaseVersion') : "${rootProject.version}"
   def dockerBuildDir = "build/docker-besu/"
   def imageName = "ghcr.io/lacchain/besu"
 
   doLast {
-    for (def variant in dockerVariants) {
+    for (def jvmVariant in dockerVariants) {
       copy {
-        from file("${projectDir}/docker/${variant}/Dockerfile")
+        from file("${projectDir}/docker/${jvmVariant}/Dockerfile")
         into(dockerBuildDir)
       }
       exec {
-        def image = "${imageName}:${dockerBuildVersion}-${variant}"
+        def image = "${dockerImageName}:${dockerBuildVersion}-${jvmVariant}"
+        def dockerPlatform = ""
+        if (project.hasProperty('docker-platform')){
+          dockerPlatform = "--platform ${project.getProperty('docker-platform')}"
+          println "Building for platform ${project.getProperty('docker-platform')}"
+        }
         executable "sh"
         workingDir dockerBuildDir
-        args "-c", "docker build --build-arg BUILD_DATE=${buildTime()} --build-arg VERSION=${dockerBuildVersion} --build-arg VCS_REF=${getCheckedOutGitCommitHash()} -t ${image} ."
+        args "-c", "docker build ${dockerPlatform} --build-arg BUILD_DATE=${buildTime()} --build-arg VERSION=${dockerBuildVersion} --build-arg VCS_REF=${getCheckedOutGitCommitHash()} -t ${image} ."
       }
     }
+
     // tag the "default" (which is the variant in the zero position)
     exec {
       executable "sh"
-      args "-c", "docker tag '${imageName}:${dockerBuildVersion}-${dockerVariants[0]}' '${imageName}:${dockerBuildVersion}'"
+      args "-c", "docker tag '${dockerImageName}:${dockerBuildVersion}-${dockerVariants[0]}' '${dockerImageName}:${dockerBuildVersion}'"
+    }
+    // create a static tag for the benchmark target
+    exec {
+      executable "sh"
+      args "-c", "docker tag '${dockerImageName}:${dockerBuildVersion}-${dockerVariants[0]}' '${dockerImageName}:benchmark'"
     }
   }
 }
@@ -649,7 +746,7 @@ task dockerUpload {
   def image = "${imageName}:${dockerBuildVersion}"
   def additionalTags = []
 
-  if (project.hasProperty('branch') && project.property('branch') == 'master') {
+  if (project.hasProperty('branch') && project.property('branch') == 'main') {
     additionalTags.add('develop')
   }
 
@@ -657,22 +754,152 @@ task dockerUpload {
     for (def variant in dockerVariants) {
       def variantImage = "${image}-${variant}"
       exec {
-        def cmd = "docker push '${variantImage}'"
-        additionalTags.each { tag ->
-          cmd += " && docker tag '${variantImage}' '${imageName}:${tag.trim()}-${variant}' && docker push '${imageName}:${tag.trim()}-${variant}'"
-        }
+        def archVariantImage = "${variantImage}-${architecture}"
+        def cmd = "docker tag '${variantImage}' '${archVariantImage}' && docker push '${archVariantImage}'"
+        additionalTags.each { tag -> cmd += " && docker tag '${variantImage}' '${dockerImageName}:${tag.trim()}-${variant}-${architecture}' && docker push '${dockerImageName}:${tag.trim()}-${variant}-${architecture}'" }
+        println "Executing '${cmd}'"
         executable "sh"
         args "-c", cmd
       }
     }
 
     exec {
-      def cmd = "docker push '${image}'"
-      additionalTags.each { tag ->
-        cmd += " && docker tag '${image}' '${imageName}:${tag.trim()}' && docker push '${imageName}:${tag.trim()}'"
-        // temporarily commented out because AWS credentials are broken
-        // cmd += " && docker tag '${image}' '${azureImageName}:${tag.trim()}' && docker push '${azureImageName}:${tag.trim()}'"
+      def archImage = "${image}-${architecture}"
+      def cmd = "docker tag ${image} ${archImage} && docker push '${archImage}'"
+      additionalTags.each { tag -> cmd += " && docker tag '${image}' '${dockerImageName}:${tag.trim()}-${architecture}' && docker push '${dockerImageName}:${tag.trim()}-${architecture}'" }
+      println "Executing '${cmd}'"
+      executable "sh"
+      args "-c", cmd
+    }
+  }
+}
+
+task dockerUploadRelease {
+  def archs = ["arm64", "amd64"]
+  def image = "${dockerImageName}:${dockerBuildVersion}"
+
+  doLast {
+    for (def architecture in archs) {
+      for (def variant in dockerVariants) {
+        def variantImage = "${image}-${variant}"
+        exec {
+          def cmd = "docker pull '${variantImage}-${architecture}' && docker tag '${variantImage}-${architecture}' '${dockerImageName}:latest-${variant}-${architecture}'"
+          println "Executing '${cmd}'"
+          executable "sh"
+          args "-c", cmd
+        }
+        exec {
+          def cmd = "docker push '${dockerImageName}:latest-${variant}-${architecture}'"
+          println "Executing '${cmd}'"
+          executable "sh"
+          args "-c", cmd
+        }
+      }
+
+      exec {
+        def archImage = "${image}-${architecture}"
+        def cmd = "docker pull '${archImage}' && docker tag ${archImage} '${dockerImageName}:latest-${architecture}'"
+        println "Executing '${cmd}'"
+        executable "sh"
+        args "-c", cmd
+      }
+      exec {
+        def cmd = "docker push '${dockerImageName}:latest-${architecture}'"
+        println "Executing '${cmd}'"
+        executable "sh"
+        args "-c", cmd
+      }
+    }
+  }
+}
+
+task manifestDocker {
+  def image = "${dockerImageName}:${dockerBuildVersion}"
+  def archs = ["arm64", "amd64"]
+  def tags = ["${image}"]
+
+  if (project.hasProperty('branch') && project.property('branch') == 'main') {
+    tags.add("${dockerImageName}:develop")
+  }
+
+  if (!isInterimBuild(dockerBuildVersion)) {
+    tags.add("${dockerImageName}:" + dockerBuildVersion.split(/\./)[0..1].join('.'))
+  }
+
+  doLast {
+    for (baseTag in tags) {
+      for (def variant in dockerVariants) {
+        def variantImage = "${baseTag}-${variant}"
+        def targets = ""
+        archs.forEach { arch -> targets += "'${variantImage}-${arch}' " }
+
+        exec {
+          def cmd = "docker manifest create '${variantImage}' ${targets}"
+          println "Executing '${cmd}'"
+          executable "sh"
+          args "-c", cmd
+        }
+        exec {
+          def cmd = "docker manifest push '${variantImage}'"
+          println "Executing '${cmd}'"
+          executable "sh"
+          args "-c", cmd
+        }
       }
+
+      exec {
+        def targets = ""
+        archs.forEach { arch -> targets += "'${baseTag}-${arch}' " }
+        def cmd = "docker manifest create '${baseTag}' ${targets}"
+        println "Executing '${cmd}'"
+        executable "sh"
+        args "-c", cmd
+      }
+      exec {
+        def cmd = "docker manifest push '${baseTag}'"
+        println "Executing '${cmd}'"
+        executable "sh"
+        args "-c", cmd
+      }
+    }
+  }
+}
+
+task manifestDockerRelease {
+  def archs = ["arm64", "amd64"]
+  def baseTag = "${dockerImageName}:latest";
+
+  doLast {
+    for (def variant in dockerVariants) {
+      def variantImage = "${baseTag}-${variant}"
+      def targets = ""
+      archs.forEach { arch -> targets += "'${variantImage}-${arch}' " }
+
+      exec {
+        def cmd = "docker manifest create '${variantImage}' ${targets} --amend"
+        println "Executing '${cmd}'"
+        executable "sh"
+        args "-c", cmd
+      }
+      exec {
+        def cmd = "docker manifest push '${variantImage}'"
+        println "Executing '${cmd}'"
+        executable "sh"
+        args "-c", cmd
+      }
+    }
+
+    exec {
+      def targets = ""
+      archs.forEach { arch -> targets += "'${baseTag}-${arch}' " }
+      def cmd = "docker manifest create '${baseTag}' ${targets} --amend"
+      println "Executing '${cmd}'"
+      executable "sh"
+      args "-c", cmd
+    }
+    exec {
+      def cmd = "docker manifest push '${baseTag}'"
+      println "Executing '${cmd}'"
       executable "sh"
       args "-c", cmd
     }
@@ -695,7 +922,7 @@ task checkSpdxHeader(type: CheckSpdxHeader) {
     "(.*/.idea/.*)",
     "(.*/out/.*)",
     "(.*/build/.*)",
-    "(.*/src/[^/]+/generated/.*)",
+    "(.*/src/[^/]+/generated/.*)"
   ].join("|")
 
 }
@@ -703,11 +930,12 @@ task checkSpdxHeader(type: CheckSpdxHeader) {
 task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
   additionalSourceDirs.from files(subprojects.sourceSets.main.allSource.srcDirs)
   sourceDirectories.from files(subprojects.sourceSets.main.allSource.srcDirs)
-  classDirectories.from files(subprojects.sourceSets.main.output)
+  classDirectories.from files(subprojects.sourceSets.main.output).asFileTree.matching { exclude 'org/hyperledger/besu/tests/acceptance/**' }
   executionData.from fileTree(dir: '.', includes: ['**/jacoco/*.exec'])
   reports {
-    xml.enabled true
-    csv.enabled true
+    xml.required = true
+    xml.enabled = true
+    csv.required = true
     html.destination file("build/reports/jacocoHtml")
   }
   onlyIf = { true }
@@ -744,15 +972,16 @@ def calculateVersion() {
   return version
 }
 
-def getCheckedOutGitCommitHash() {
+
+def getCheckedOutGitCommitHash(length = 8) {
   try {
     def gitFolder = "$projectDir/.git/"
     if (!file(gitFolder).isDirectory()) {
       // We are in a submodule.  The file's contents are `gitdir: <gitFolder>\n`.
       // Read the file, cut off the front, and trim the whitespace.
-      gitFolder = file(gitFolder).text.substring(8).trim() + "/"
+      gitFolder = file(gitFolder).text.substring(length).trim() + "/"
     }
-    def takeFromHash = 8
+    def takeFromHash = length
     /*
      * '.git/HEAD' contains either
      *      in case of detached head: the currently checked out commit hash
@@ -772,6 +1001,12 @@ def getCheckedOutGitCommitHash() {
   }
 }
 
+// Takes the version and if it contains SNAPSHOT, alpha, beta or RC in version then return true indicating an interim build
+def isInterimBuild(dockerBuildVersion) {
+  return (dockerBuildVersion ==~ /.*-SNAPSHOT/) || (dockerBuildVersion ==~ /.*-alpha/)
+  || (dockerBuildVersion ==~ /.*-beta/) || (dockerBuildVersion ==~ /.*-RC.*/)
+}
+
 tasks.register("verifyDistributions") {
   dependsOn distTar
   dependsOn distZip
@@ -790,14 +1025,8 @@ tasks.register("verifyDistributions") {
   }
 }
 
-configurations {
-  javaAgent
-}
-
 dependencies {
   implementation project(':besu')
-  implementation project(':ethereum:evmtool')
-  javaAgent group: 'io.opentelemetry.instrumentation.auto', name: 'opentelemetry-javaagent', classifier: 'all'
   errorprone 'com.google.errorprone:error_prone_core'
 }
 
@@ -808,31 +1037,14 @@ distributions {
       from("build/reports/license/license-dependency.html") { into "." }
       from("./docs/GettingStartedBinaries.md") { into "." }
       from("./docs/DocsArchive0.8.0.html") { into "." }
-      from(configurations.javaAgent.singleFile.toPath()) { into "agent"}
+      from("build/besu.autocomplete.sh") { into "." }
     }
   }
 }
 
-bintray {
-  user = bintrayUser
-  key = bintrayKey
-
-  filesSpec {
-    from distTar.destinationDirectory
-    from distZip.destinationDirectory
-    from file("plugin-api/build/libs/plugin-api-$version-javadoc.jar")
-    into '.'
-  }
-
-  publish = true
-  override = version.endsWith('SNAPSHOT')
-
-  pkg = bintrayPackage
-}
-
 check.dependsOn checkSpdxHeader
 build.dependsOn verifyDistributions
-bintrayUpload.dependsOn verifyDistributions
-bintrayUpload.mustRunAfter(distTar)
-bintrayUpload.mustRunAfter(distZip)
-bintrayUpload.mustRunAfter(javadocJar)
+artifactoryPublish.dependsOn verifyDistributions
+artifactoryPublish.mustRunAfter(distTar)
+artifactoryPublish.mustRunAfter(distZip)
+artifactoryPublish.mustRunAfter(javadocJar)
diff --git a/config/build.gradle b/config/build.gradle
index ac2be75cdc5..842bf9e1322 100644
--- a/config/build.gradle
+++ b/config/build.gradle
@@ -28,17 +28,21 @@ jar {
 }
 
 dependencies {
+  api 'org.slf4j:slf4j-api'
+
+  implementation project(':datatypes')
+  implementation project(':util')
+
   implementation 'com.fasterxml.jackson.core:jackson-databind'
   implementation 'com.google.guava:guava'
-  implementation 'org.apache.logging.log4j:log4j-api'
   implementation 'info.picocli:picocli'
-  implementation 'org.apache.tuweni:bytes'
-  runtimeOnly 'org.apache.logging.log4j:log4j-core'
+  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-units'
 
   testImplementation project(':testutil')
 
-  testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.mockito:mockito-core'
 }
 
diff --git a/config/src/main/java/org/hyperledger/besu/config/BftConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/BftConfigOptions.java
new file mode 100644
index 00000000000..4dd5b3d0f91
--- /dev/null
+++ b/config/src/main/java/org/hyperledger/besu/config/BftConfigOptions.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.config;
+
+import org.hyperledger.besu.datatypes.Address;
+
+import java.math.BigInteger;
+import java.util.Map;
+import java.util.Optional;
+
+/** The interface Bft config options. */
+public interface BftConfigOptions {
+
+  /**
+   * Gets epoch length.
+   *
+   * @return the epoch length
+   */
+  long getEpochLength();
+
+  /**
+   * Gets block period seconds.
+   *
+   * @return the block period seconds
+   */
+  int getBlockPeriodSeconds();
+
+  /**
+   * Gets request timeout seconds.
+   *
+   * @return the request timeout seconds
+   */
+  int getRequestTimeoutSeconds();
+
+  /**
+   * Gets gossiped history limit.
+   *
+   * @return the gossiped history limit
+   */
+  int getGossipedHistoryLimit();
+
+  /**
+   * Gets message queue limit.
+   *
+   * @return the message queue limit
+   */
+  int getMessageQueueLimit();
+
+  /**
+   * Gets duplicate message limit.
+   *
+   * @return the duplicate message limit
+   */
+  int getDuplicateMessageLimit();
+
+  /**
+   * Gets future messages limit.
+   *
+   * @return the future messages limit
+   */
+  int getFutureMessagesLimit();
+
+  /**
+   * Gets future messages max distance.
+   *
+   * @return the future messages max distance
+   */
+  int getFutureMessagesMaxDistance();
+
+  /**
+   * Gets mining beneficiary.
+   *
+   * @return the mining beneficiary
+   */
+  Optional<Address> getMiningBeneficiary();
+
+  /**
+   * Gets block reward wei.
+   *
+   * @return the block reward wei
+   */
+  BigInteger getBlockRewardWei();
+
+  /**
+   * As map.
+   *
+   * @return the map
+   */
+  Map<String, Object> asMap();
+}
diff --git a/config/src/main/java/org/hyperledger/besu/config/BftFork.java b/config/src/main/java/org/hyperledger/besu/config/BftFork.java
new file mode 100644
index 00000000000..2b2031cea45
--- /dev/null
+++ b/config/src/main/java/org/hyperledger/besu/config/BftFork.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.config;
+
+import org.hyperledger.besu.datatypes.Address;
+
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Optional;
+import java.util.OptionalInt;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.collect.Lists;
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Bft fork. */
+public class BftFork {
+
+  /** The constant FORK_BLOCK_KEY. */
+  public static final String FORK_BLOCK_KEY = "block";
+  /** The constant VALIDATORS_KEY. */
+  public static final String VALIDATORS_KEY = "validators";
+  /** The constant BLOCK_PERIOD_SECONDS_KEY. */
+  public static final String BLOCK_PERIOD_SECONDS_KEY = "blockperiodseconds";
+  /** The constant BLOCK_REWARD_KEY. */
+  public static final String BLOCK_REWARD_KEY = "blockreward";
+  /** The constant MINING_BENEFICIARY_KEY. */
+  public static final String MINING_BENEFICIARY_KEY = "miningbeneficiary";
+
+  /** The Fork config root. */
+  protected final ObjectNode forkConfigRoot;
+
+  /**
+   * Instantiates a new Bft fork.
+   *
+   * @param forkConfigRoot the fork config root
+   */
+  @JsonCreator
+  public BftFork(final ObjectNode forkConfigRoot) {
+    this.forkConfigRoot = forkConfigRoot;
+  }
+
+  /**
+   * Gets fork block.
+   *
+   * @return the fork block
+   */
+  public long getForkBlock() {
+    return JsonUtil.getLong(forkConfigRoot, FORK_BLOCK_KEY)
+        .orElseThrow(
+            () ->
+                new IllegalArgumentException(
+                    "Fork block not specified for Bft fork in custom forks"));
+  }
+
+  /**
+   * Gets block period seconds.
+   *
+   * @return the block period seconds
+   */
+  public OptionalInt getBlockPeriodSeconds() {
+    return JsonUtil.getPositiveInt(forkConfigRoot, BLOCK_PERIOD_SECONDS_KEY);
+  }
+
+  /**
+   * Gets block reward wei.
+   *
+   * @return the block reward wei
+   */
+  public Optional<BigInteger> getBlockRewardWei() {
+    final Optional<String> configFileContent = JsonUtil.getString(forkConfigRoot, BLOCK_REWARD_KEY);
+
+    if (configFileContent.isEmpty()) {
+      return Optional.empty();
+    }
+    final String weiStr = configFileContent.get();
+    if (weiStr.toLowerCase().startsWith("0x")) {
+      return Optional.of(new BigInteger(1, Bytes.fromHexStringLenient(weiStr).toArrayUnsafe()));
+    }
+    return Optional.of(new BigInteger(weiStr));
+  }
+
+  /**
+   * Gets mining beneficiary.
+   *
+   * @return the mining beneficiary
+   */
+  public Optional<Address> getMiningBeneficiary() {
+    try {
+      return JsonUtil.getString(forkConfigRoot, MINING_BENEFICIARY_KEY)
+          .map(String::trim)
+          .filter(s -> !s.isEmpty())
+          .map(Address::fromHexStringStrict);
+    } catch (final IllegalArgumentException e) {
+      throw new IllegalArgumentException(
+          "Mining beneficiary in transition config is not a valid ethereum address", e);
+    }
+  }
+
+  /**
+   * Is mining beneficiary configured boolean.
+   *
+   * @return the boolean
+   */
+  public boolean isMiningBeneficiaryConfigured() {
+    return JsonUtil.hasKey(forkConfigRoot, MINING_BENEFICIARY_KEY);
+  }
+
+  /**
+   * Gets validators.
+   *
+   * @return the validators
+   * @throws IllegalArgumentException the illegal argument exception
+   */
+  public Optional<List<String>> getValidators() throws IllegalArgumentException {
+    final Optional<ArrayNode> validatorNode = JsonUtil.getArrayNode(forkConfigRoot, VALIDATORS_KEY);
+
+    if (validatorNode.isEmpty()) {
+      return Optional.empty();
+    }
+
+    List<String> validators = Lists.newArrayList();
+    validatorNode
+        .get()
+        .elements()
+        .forEachRemaining(
+            value -> {
+              if (!value.isTextual()) {
+                throw new IllegalArgumentException(
+                    "Bft Validator fork does not contain a string " + value);
+              }
+
+              validators.add(value.asText());
+            });
+    return Optional.of(validators);
+  }
+}
diff --git a/config/src/main/java/org/hyperledger/besu/config/CheckpointConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/CheckpointConfigOptions.java
new file mode 100644
index 00000000000..360a0bf002f
--- /dev/null
+++ b/config/src/main/java/org/hyperledger/besu/config/CheckpointConfigOptions.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.config;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.OptionalLong;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.collect.ImmutableMap;
+
+/** The Checkpoint config options. */
+public class CheckpointConfigOptions {
+
+  /** The constant DEFAULT. */
+  public static final CheckpointConfigOptions DEFAULT =
+      new CheckpointConfigOptions(JsonUtil.createEmptyObjectNode());
+
+  private final ObjectNode checkpointConfigRoot;
+
+  /**
+   * Instantiates a new Checkpoint config options.
+   *
+   * @param checkpointConfigRoot the checkpoint config root
+   */
+  CheckpointConfigOptions(final ObjectNode checkpointConfigRoot) {
+    this.checkpointConfigRoot = checkpointConfigRoot;
+  }
+
+  /**
+   * Gets total difficulty.
+   *
+   * @return the total difficulty
+   */
+  public Optional<String> getTotalDifficulty() {
+    return JsonUtil.getString(checkpointConfigRoot, "totaldifficulty");
+  }
+
+  /**
+   * Gets number.
+   *
+   * @return the number
+   */
+  public OptionalLong getNumber() {
+    return JsonUtil.getLong(checkpointConfigRoot, "number");
+  }
+
+  /**
+   * Gets hash.
+   *
+   * @return the hash
+   */
+  public Optional<String> getHash() {
+    return JsonUtil.getString(checkpointConfigRoot, "hash");
+  }
+
+  /**
+   * Is valid option.
+   *
+   * @return true if total difficulty, number and hash is present.
+   */
+  public boolean isValid() {
+    return getTotalDifficulty().isPresent() && getNumber().isPresent() && getHash().isPresent();
+  }
+
+  /**
+   * As map.
+   *
+   * @return the map
+   */
+  Map<String, Object> asMap() {
+    final ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
+    getTotalDifficulty().ifPresent(l -> builder.put("totaldifficulty", l));
+    getNumber().ifPresent(l -> builder.put("number", l));
+    getHash().ifPresent(l -> builder.put("hash", l));
+    return builder.build();
+  }
+
+  @Override
+  public String toString() {
+    return "CheckpointConfigOptions{" + "checkpointConfigRoot=" + checkpointConfigRoot + '}';
+  }
+}
diff --git a/config/src/main/java/org/hyperledger/besu/config/CliqueConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/CliqueConfigOptions.java
index 5b43d226cd5..b4d3b6e6d77 100644
--- a/config/src/main/java/org/hyperledger/besu/config/CliqueConfigOptions.java
+++ b/config/src/main/java/org/hyperledger/besu/config/CliqueConfigOptions.java
@@ -19,8 +19,10 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.ImmutableMap;
 
+/** The Clique config options. */
 public class CliqueConfigOptions {
 
+  /** The constant DEFAULT. */
   public static final CliqueConfigOptions DEFAULT =
       new CliqueConfigOptions(JsonUtil.createEmptyObjectNode());
 
@@ -29,18 +31,39 @@ public class CliqueConfigOptions {
 
   private final ObjectNode cliqueConfigRoot;
 
+  /**
+   * Instantiates a new Clique config options.
+   *
+   * @param cliqueConfigRoot the clique config root
+   */
   CliqueConfigOptions(final ObjectNode cliqueConfigRoot) {
     this.cliqueConfigRoot = cliqueConfigRoot;
   }
 
+  /**
+   * Gets epoch length.
+   *
+   * @return the epoch length
+   */
   public long getEpochLength() {
     return JsonUtil.getLong(cliqueConfigRoot, "epochlength", DEFAULT_EPOCH_LENGTH);
   }
 
+  /**
+   * Gets block period seconds.
+   *
+   * @return the block period seconds
+   */
   public int getBlockPeriodSeconds() {
-    return JsonUtil.getInt(cliqueConfigRoot, "blockperiodseconds", DEFAULT_BLOCK_PERIOD_SECONDS);
+    return JsonUtil.getPositiveInt(
+        cliqueConfigRoot, "blockperiodseconds", DEFAULT_BLOCK_PERIOD_SECONDS);
   }
 
+  /**
+   * As map.
+   *
+   * @return the map
+   */
   Map<String, Object> asMap() {
     return ImmutableMap.of(
         "epochLength", getEpochLength(), "blockPeriodSeconds", getBlockPeriodSeconds());
diff --git a/config/src/main/java/org/hyperledger/besu/config/DiscoveryOptions.java b/config/src/main/java/org/hyperledger/besu/config/DiscoveryOptions.java
new file mode 100644
index 00000000000..7347615f3f3
--- /dev/null
+++ b/config/src/main/java/org/hyperledger/besu/config/DiscoveryOptions.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.config;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+/** The Discovery options. */
+public class DiscoveryOptions {
+  /** The constant DEFAULT. */
+  public static final DiscoveryOptions DEFAULT =
+      new DiscoveryOptions(JsonUtil.createEmptyObjectNode());
+
+  private static final String ENODES_KEY = "bootnodes";
+  private static final String DNS_KEY = "dns";
+
+  private final ObjectNode discoveryConfigRoot;
+
+  /**
+   * Instantiates a new Discovery options.
+   *
+   * @param discoveryConfigRoot the discovery config root
+   */
+  public DiscoveryOptions(final ObjectNode discoveryConfigRoot) {
+    this.discoveryConfigRoot = discoveryConfigRoot;
+  }
+
+  /**
+   * Gets boot nodes.
+   *
+   * @return optional list of boot nodes
+   */
+  public Optional<List<String>> getBootNodes() {
+    final Optional<ArrayNode> bootNodesArray =
+        JsonUtil.getArrayNode(discoveryConfigRoot, ENODES_KEY);
+    if (bootNodesArray.isEmpty()) {
+      return Optional.empty();
+    }
+    final List<String> bootNodes = new ArrayList<>();
+    bootNodesArray
+        .get()
+        .elements()
+        .forEachRemaining(
+            bootNodeElement -> {
+              if (!bootNodeElement.isTextual()) {
+                throw new IllegalArgumentException(
+                    ENODES_KEY + " does not contain a string: " + bootNodeElement);
+              }
+              bootNodes.add(bootNodeElement.asText());
+            });
+    return Optional.of(bootNodes);
+  }
+
+  /**
+   * Gets discovery dns url.
+   *
+   * @return the discovery dns url
+   */
+  public Optional<String> getDiscoveryDnsUrl() {
+    return JsonUtil.getString(discoveryConfigRoot, DNS_KEY);
+  }
+}
diff --git a/config/src/main/java/org/hyperledger/besu/config/EthashConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/EthashConfigOptions.java
index 3f8ad9eec97..c55971a84f8 100644
--- a/config/src/main/java/org/hyperledger/besu/config/EthashConfigOptions.java
+++ b/config/src/main/java/org/hyperledger/besu/config/EthashConfigOptions.java
@@ -20,21 +20,38 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.ImmutableMap;
 
+/** The Ethash config options. */
 public class EthashConfigOptions {
 
+  /** The constant DEFAULT. */
   public static final EthashConfigOptions DEFAULT =
       new EthashConfigOptions(JsonUtil.createEmptyObjectNode());
 
   private final ObjectNode ethashConfigRoot;
 
+  /**
+   * Instantiates a new Ethash config options.
+   *
+   * @param ethashConfigRoot the ethash config root
+   */
   EthashConfigOptions(final ObjectNode ethashConfigRoot) {
     this.ethashConfigRoot = ethashConfigRoot;
   }
 
+  /**
+   * Gets fixed difficulty.
+   *
+   * @return the fixed difficulty
+   */
   public OptionalLong getFixedDifficulty() {
     return JsonUtil.getLong(ethashConfigRoot, "fixeddifficulty");
   }
 
+  /**
+   * As map.
+   *
+   * @return the map
+   */
   Map<String, Object> asMap() {
     final ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
     getFixedDifficulty().ifPresent(l -> builder.put("fixeddifficulty", l));
diff --git a/config/src/main/java/org/hyperledger/besu/config/GenesisAllocation.java b/config/src/main/java/org/hyperledger/besu/config/GenesisAllocation.java
index b426464c548..c53ded9e865 100644
--- a/config/src/main/java/org/hyperledger/besu/config/GenesisAllocation.java
+++ b/config/src/main/java/org/hyperledger/besu/config/GenesisAllocation.java
@@ -16,38 +16,85 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
+/** The Genesis allocation configuration. */
 public class GenesisAllocation {
   private final String address;
   private final ObjectNode data;
 
+  /**
+   * Instantiates a new Genesis allocation.
+   *
+   * @param address the address
+   * @param data the data
+   */
   GenesisAllocation(final String address, final ObjectNode data) {
     this.address = address;
     this.data = data;
   }
 
+  /**
+   * Gets address.
+   *
+   * @return the address
+   */
   public String getAddress() {
     return address;
   }
 
+  /**
+   * Gets private key.
+   *
+   * @return the private key
+   */
+  public Optional<String> getPrivateKey() {
+    return Optional.ofNullable(JsonUtil.getString(data, "privatekey", null));
+  }
+
+  /**
+   * Gets balance.
+   *
+   * @return the balance
+   */
   public String getBalance() {
     return JsonUtil.getValueAsString(data, "balance", "0");
   }
 
+  /**
+   * Gets code.
+   *
+   * @return the code
+   */
   public String getCode() {
     return JsonUtil.getString(data, "code", null);
   }
 
+  /**
+   * Gets nonce.
+   *
+   * @return the nonce
+   */
   public String getNonce() {
     return JsonUtil.getValueAsString(data, "nonce", "0");
   }
 
+  /**
+   * Gets version.
+   *
+   * @return the version
+   */
   public String getVersion() {
     return JsonUtil.getValueAsString(data, "version", null);
   }
 
+  /**
+   * Gets storage map.
+   *
+   * @return fields under storage as a map
+   */
   public Map<String, String> getStorage() {
     final Map<String, String> map = new HashMap<>();
     JsonUtil.getObjectNode(data, "storage")
diff --git a/config/src/main/java/org/hyperledger/besu/config/GenesisConfigFile.java b/config/src/main/java/org/hyperledger/besu/config/GenesisConfigFile.java
index 6b8b4e4fe5b..73d7174303e 100644
--- a/config/src/main/java/org/hyperledger/besu/config/GenesisConfigFile.java
+++ b/config/src/main/java/org/hyperledger/besu/config/GenesisConfigFile.java
@@ -17,8 +17,12 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.hyperledger.besu.config.JsonUtil.normalizeKeys;
 
+import org.hyperledger.besu.datatypes.Wei;
+
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -28,26 +32,36 @@
 import com.google.common.collect.Streams;
 import com.google.common.io.Resources;
 
+/** The Genesis config file. */
 public class GenesisConfigFile {
 
+  /** The constant DEFAULT. */
   public static final GenesisConfigFile DEFAULT =
       new GenesisConfigFile(JsonUtil.createEmptyObjectNode());
 
+  /** The constant BASEFEE_AT_GENESIS_DEFAULT_VALUE. */
+  public static final Wei BASEFEE_AT_GENESIS_DEFAULT_VALUE = Wei.of(1_000_000_000L);
+
   private final ObjectNode configRoot;
 
   private GenesisConfigFile(final ObjectNode config) {
     this.configRoot = config;
   }
 
+  /**
+   * Mainnet genesis config file.
+   *
+   * @return the genesis config file
+   */
   public static GenesisConfigFile mainnet() {
-    try {
-      return fromConfig(
-          Resources.toString(GenesisConfigFile.class.getResource("/mainnet.json"), UTF_8));
-    } catch (final IOException e) {
-      throw new IllegalStateException(e);
-    }
+    return genesisFileFromResources("/mainnet.json");
   }
 
+  /**
+   * Mainnet json node object node.
+   *
+   * @return the object node
+   */
   public static ObjectNode mainnetJsonNode() {
     try {
       final String jsonString =
@@ -58,33 +72,87 @@ public static ObjectNode mainnetJsonNode() {
     }
   }
 
+  /**
+   * Development genesis config file.
+   *
+   * @return the genesis config file
+   */
   public static GenesisConfigFile development() {
+    return genesisFileFromResources("/dev.json");
+  }
+
+  /**
+   * Genesis file from resources genesis config file.
+   *
+   * @param resourceName the resource name
+   * @return the genesis config file
+   */
+  public static GenesisConfigFile genesisFileFromResources(final String resourceName) {
     try {
       return fromConfig(
-          Resources.toString(GenesisConfigFile.class.getResource("/dev.json"), UTF_8));
+          Resources.toString(GenesisConfigFile.class.getResource(resourceName), UTF_8));
     } catch (final IOException e) {
       throw new IllegalStateException(e);
     }
   }
 
+  /**
+   * From config genesis config file.
+   *
+   * @param jsonString the json string
+   * @return the genesis config file
+   */
   public static GenesisConfigFile fromConfig(final String jsonString) {
     return fromConfig(JsonUtil.objectNodeFromString(jsonString, false));
   }
 
+  /**
+   * From config genesis config file.
+   *
+   * @param config the config
+   * @return the genesis config file
+   */
   public static GenesisConfigFile fromConfig(final ObjectNode config) {
     return new GenesisConfigFile(normalizeKeys(config));
   }
 
+  /**
+   * Gets config options.
+   *
+   * @return the config options
+   */
   public GenesisConfigOptions getConfigOptions() {
     return getConfigOptions(Collections.emptyMap());
   }
 
+  /**
+   * Gets config options.
+   *
+   * @param overrides the overrides
+   * @return the config options
+   */
   public GenesisConfigOptions getConfigOptions(final Map<String, String> overrides) {
     final ObjectNode config =
         JsonUtil.getObjectNode(configRoot, "config").orElse(JsonUtil.createEmptyObjectNode());
-    return JsonGenesisConfigOptions.fromJsonObjectWithOverrides(config, overrides);
+
+    Map<String, String> overridesRef = overrides;
+
+    // if baseFeePerGas has been explicitly configured, pass it as an override:
+    final var optBaseFee = getBaseFeePerGas();
+    if (optBaseFee.isPresent()) {
+      // streams and maps cannot handle null values.
+      overridesRef = new HashMap<>(overrides);
+      overridesRef.put("baseFeePerGas", optBaseFee.get().toShortHexString());
+    }
+
+    return JsonGenesisConfigOptions.fromJsonObjectWithOverrides(config, overridesRef);
   }
 
+  /**
+   * Stream allocations stream.
+   *
+   * @return the stream
+   */
   public Stream<GenesisAllocation> streamAllocations() {
     return JsonUtil.getObjectNode(configRoot, "alloc").stream()
         .flatMap(
@@ -96,44 +164,123 @@ public Stream<GenesisAllocation> streamAllocations() {
                                 key, JsonUtil.getObjectNode(allocations, key).get())));
   }
 
+  /**
+   * Gets parent hash.
+   *
+   * @return the parent hash
+   */
   public String getParentHash() {
     return JsonUtil.getString(configRoot, "parenthash", "");
   }
 
+  /**
+   * Gets difficulty.
+   *
+   * @return the difficulty
+   */
   public String getDifficulty() {
     return getRequiredString("difficulty");
   }
 
+  /**
+   * Gets extra data.
+   *
+   * @return the extra data
+   */
   public String getExtraData() {
     return JsonUtil.getString(configRoot, "extradata", "");
   }
 
+  /**
+   * Gets gas limit.
+   *
+   * @return the gas limit
+   */
   public long getGasLimit() {
-    return parseLong("gasLimit", getRequiredString("gaslimit"));
+    return parseLong("gasLimit", getFirstRequiredString("gaslimit", "gastarget"));
+  }
+
+  /**
+   * Gets base fee per gas.
+   *
+   * @return the base fee per gas
+   */
+  public Optional<Wei> getBaseFeePerGas() {
+    return JsonUtil.getString(configRoot, "basefeepergas")
+        .map(baseFeeStr -> Wei.of(parseLong("baseFeePerGas", baseFeeStr)));
+  }
+
+  /**
+   * Gets genesis base fee per gas.
+   *
+   * @return the genesis base fee per gas
+   */
+  public Optional<Wei> getGenesisBaseFeePerGas() {
+    if (getBaseFeePerGas().isPresent()) {
+      // always use specified basefee if present
+      return getBaseFeePerGas();
+    } else if (getConfigOptions().getLondonBlockNumber().orElse(-1L) == 0) {
+      // if not specified, and we specify london at block zero use a default fee
+      // this is needed for testing.
+      return Optional.of(BASEFEE_AT_GENESIS_DEFAULT_VALUE);
+    } else {
+      // no explicit base fee and no london block zero means no basefee at genesis
+      return Optional.empty();
+    }
   }
 
+  /**
+   * Gets mix hash.
+   *
+   * @return the mix hash
+   */
   public String getMixHash() {
     return JsonUtil.getString(configRoot, "mixhash", "");
   }
 
+  /**
+   * Gets nonce.
+   *
+   * @return the nonce
+   */
   public String getNonce() {
     return JsonUtil.getValueAsString(configRoot, "nonce", "0x0");
   }
 
+  /**
+   * Gets coinbase.
+   *
+   * @return the coinbase
+   */
   public Optional<String> getCoinbase() {
     return JsonUtil.getString(configRoot, "coinbase");
   }
 
+  /**
+   * Gets timestamp.
+   *
+   * @return the timestamp
+   */
   public long getTimestamp() {
     return parseLong("timestamp", JsonUtil.getValueAsString(configRoot, "timestamp", "0x0"));
   }
 
   private String getRequiredString(final String key) {
-    if (!configRoot.has(key)) {
-      throw new IllegalArgumentException(
-          String.format("Invalid genesis block configuration, missing value for '%s'", key));
-    }
-    return configRoot.get(key).asText();
+    return getFirstRequiredString(key);
+  }
+
+  private String getFirstRequiredString(final String... keys) {
+    List<String> keysList = Arrays.asList(keys);
+    return keysList.stream()
+        .filter(configRoot::has)
+        .findFirst()
+        .map(key -> configRoot.get(key).asText())
+        .orElseThrow(
+            () ->
+                new IllegalArgumentException(
+                    String.format(
+                        "Invalid genesis block configuration, missing value for one of '%s'",
+                        keysList)));
   }
 
   private long parseLong(final String name, final String value) {
@@ -149,7 +296,21 @@ private long parseLong(final String name, final String value) {
     }
   }
 
-  public List<Long> getForks() {
-    return getConfigOptions().getForks();
+  /**
+   * Get Fork Block numbers
+   *
+   * @return list of fork block numbers
+   */
+  public List<Long> getForkBlockNumbers() {
+    return getConfigOptions().getForkBlockNumbers();
+  }
+
+  /**
+   * Get fork time stamps
+   *
+   * @return list of fork time stamps
+   */
+  public List<Long> getForkTimestamps() {
+    return getConfigOptions().getForkBlockTimestamps();
   }
 }
diff --git a/config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java
index 14acd68c55d..caf339f42cd 100644
--- a/config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java
+++ b/config/src/main/java/org/hyperledger/besu/config/GenesisConfigOptions.java
@@ -14,6 +14,10 @@
  */
 package org.hyperledger.besu.config;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+
 import java.math.BigInteger;
 import java.util.List;
 import java.util.Map;
@@ -21,50 +25,271 @@
 import java.util.OptionalInt;
 import java.util.OptionalLong;
 
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** The interface Genesis config options. */
 public interface GenesisConfigOptions {
 
+  /**
+   * Is eth hash boolean.
+   *
+   * @return the boolean
+   */
   boolean isEthHash();
 
+  /**
+   * Is ibft legacy boolean (NOTE this is a deprecated feature).
+   *
+   * @return the boolean
+   */
   boolean isIbftLegacy();
 
+  /**
+   * Is ibft 2 boolean.
+   *
+   * @return the boolean
+   */
   boolean isIbft2();
 
+  /**
+   * Is qbft boolean.
+   *
+   * @return the boolean
+   */
+  boolean isQbft();
+
+  /**
+   * Is clique boolean.
+   *
+   * @return the boolean
+   */
   boolean isClique();
 
+  /**
+   * Is consensus migration boolean.
+   *
+   * @return the boolean
+   */
+  default boolean isConsensusMigration() {
+    return isIbft2() && isQbft();
+  }
+
+  /**
+   * Gets consensus engine.
+   *
+   * @return the consensus engine
+   */
   String getConsensusEngine();
 
-  IbftConfigOptions getIbftLegacyConfigOptions();
+  /**
+   * Gets checkpoint options.
+   *
+   * @return the checkpoint options
+   */
+  CheckpointConfigOptions getCheckpointOptions();
 
+  /**
+   * Gets clique config options.
+   *
+   * @return the clique config options
+   */
   CliqueConfigOptions getCliqueConfigOptions();
 
-  IbftConfigOptions getIbft2ConfigOptions();
+  /**
+   * Gets bft config options.
+   *
+   * @return the bft config options
+   */
+  BftConfigOptions getBftConfigOptions();
 
+  /**
+   * Gets qbft config options.
+   *
+   * @return the qbft config options
+   */
+  QbftConfigOptions getQbftConfigOptions();
+
+  /**
+   * Gets discovery options.
+   *
+   * @return the discovery options
+   */
+  DiscoveryOptions getDiscoveryOptions();
+
+  /**
+   * Gets ethash config options.
+   *
+   * @return the ethash config options
+   */
   EthashConfigOptions getEthashConfigOptions();
 
+  /**
+   * Gets homestead block number.
+   *
+   * @return the homestead block number
+   */
   OptionalLong getHomesteadBlockNumber();
 
+  /**
+   * Gets dao fork block.
+   *
+   * @return the dao fork block
+   */
   OptionalLong getDaoForkBlock();
 
+  /**
+   * Gets tangerine whistle block number.
+   *
+   * @return the tangerine whistle block number
+   */
   OptionalLong getTangerineWhistleBlockNumber();
 
+  /**
+   * Gets spurious dragon block number.
+   *
+   * @return the spurious dragon block number
+   */
   OptionalLong getSpuriousDragonBlockNumber();
 
+  /**
+   * Gets byzantium block number.
+   *
+   * @return the byzantium block number
+   */
   OptionalLong getByzantiumBlockNumber();
 
+  /**
+   * Gets constantinople block number.
+   *
+   * @return the constantinople block number
+   */
   OptionalLong getConstantinopleBlockNumber();
 
-  OptionalLong getConstantinopleFixBlockNumber();
+  /**
+   * Gets petersburg block number.
+   *
+   * @return the petersburg block number
+   */
+  OptionalLong getPetersburgBlockNumber();
 
+  /**
+   * Gets istanbul block number.
+   *
+   * @return the istanbul block number
+   */
   OptionalLong getIstanbulBlockNumber();
 
+  /**
+   * Gets muir glacier block number.
+   *
+   * @return the muir glacier block number
+   */
   OptionalLong getMuirGlacierBlockNumber();
 
+  /**
+   * Gets berlin block number.
+   *
+   * @return the berlin block number
+   */
   OptionalLong getBerlinBlockNumber();
 
-  // TODO EIP-1559 change for the actual fork name when known
-  OptionalLong getEIP1559BlockNumber();
+  /**
+   * Gets london block number.
+   *
+   * @return the london block number
+   */
+  OptionalLong getLondonBlockNumber();
+
+  /**
+   * Gets arrow glacier block number.
+   *
+   * @return the arrow glacier block number
+   */
+  OptionalLong getArrowGlacierBlockNumber();
+
+  /**
+   * Gets gray glacier block number.
+   *
+   * @return the gray glacier block number
+   */
+  OptionalLong getGrayGlacierBlockNumber();
+
+  /**
+   * Gets merge net split block number.
+   *
+   * @return the merge net split block number
+   */
+  OptionalLong getMergeNetSplitBlockNumber();
+
+  /**
+   * Gets shanghai time.
+   *
+   * @return the shanghai time
+   */
+  OptionalLong getShanghaiTime();
+
+  /**
+   * Gets cancun time.
+   *
+   * @return the cancun time
+   */
+  OptionalLong getCancunTime();
+
+  /**
+   * Gets future eips time.
+   *
+   * @return the future eips time
+   */
+  OptionalLong getFutureEipsTime();
+
+  /**
+   * Gets experimental eips time.
+   *
+   * @return the experimental eips time
+   */
+  OptionalLong getExperimentalEipsTime();
+
+  /**
+   * Gets base fee per gas.
+   *
+   * @return the base fee per gas
+   */
+  Optional<Wei> getBaseFeePerGas();
+
+  /**
+   * Gets terminal total difficulty.
+   *
+   * @return the terminal total difficulty
+   */
+  Optional<UInt256> getTerminalTotalDifficulty();
 
-  List<Long> getForks();
+  /**
+   * Gets terminal block number.
+   *
+   * @return the terminal block number
+   */
+  OptionalLong getTerminalBlockNumber();
+
+  /**
+   * Gets terminal block hash.
+   *
+   * @return the terminal block hash
+   */
+  Optional<Hash> getTerminalBlockHash();
+
+  /**
+   * Gets fork block numbers.
+   *
+   * @return the fork block numbers
+   */
+  List<Long> getForkBlockNumbers();
+
+  /**
+   * Gets fork block timestamps.
+   *
+   * @return the fork block timestamps
+   */
+  List<Long> getForkBlockTimestamps();
 
   /**
    * Block number for the Dao Fork, this value is used to tell node to connect with peer that did
@@ -79,9 +304,9 @@ public interface GenesisConfigOptions {
    * IO-heavy operations to mitigate transaction spam attacks In reference to EIP-150 (ETH Tangerine
    * Whistle) Note, this fork happens after Homestead (Mainnet definition) and before DieHard fork
    *
+   * @return block number to activate ECIP-1015 code
    * @see <a
    *     href="https://ecips.ethereumclassic.org/ECIPs/ecip-1015">https://ecips.ethereumclassic.org/ECIPs/ecip-1015</a>
-   * @return block number to activate ECIP-1015 code
    */
   OptionalLong getEcip1015BlockNumber();
 
@@ -90,12 +315,12 @@ public interface GenesisConfigOptions {
    * specification for ECIP-1010 and EIP-160 Note, this fork happens after ECIP-1015 (classic
    * tangerine whistle) and before Gotham fork ECIP-1010: Delay Difficulty Bomb Explosion
    *
+   * @return block number to activate Classic DieHard fork
    * @see <a
    *     href="https://ecips.ethereumclassic.org/ECIPs/ecip-1010">https://ecips.ethereumclassic.org/ECIPs/ecip-1010</a>
    *     EIP-160: EXP cost increase
    * @see <a
    *     href="https://eips.ethereum.org/EIPS/eip-160">https://eips.ethereum.org/EIPS/eip-160</a>
-   * @return block number to activate Classic DieHard fork
    */
   OptionalLong getDieHardBlockNumber();
 
@@ -103,23 +328,23 @@ public interface GenesisConfigOptions {
    * Block number for Gotham fork on Classic network, the Gotham form includes changes to meet
    * specification for ECIP-1017 and ECIP-1039 both regarding Monetary Policy (rewards).
    *
+   * @return block to activate Classic Gotham fork
    * @see <a
    *     href="https://ecips.ethereumclassic.org/ECIPs/ecip-1017">https://ecips.ethereumclassic.org/ECIPs/ecip-1017</a>
    *     ECIP-1017: Monetary Policy and Final Modification to the Ethereum Classic Emission Schedule
    * @see <a
    *     href="https://ecips.ethereumclassic.org/ECIPs/ecip-1039">https://ecips.ethereumclassic.org/ECIPs/ecip-1039</a>
    *     ECIP-1039: Monetary policy rounding specification
-   * @return block to activate Classic Gotham fork
    */
   OptionalLong getGothamBlockNumber();
 
   /**
    * Block number to remove difficulty bomb, to meet specification for ECIP-1041.
    *
+   * @return block number to remove difficulty bomb on classic network
    * @see <a
    *     href="https://ecips.ethereumclassic.org/ECIPs/ecip-1041">https://ecips.ethereumclassic.org/ECIPs/ecip-1041</a>
    *     ECIP-1041: Remove Difficulty Bomb
-   * @return block number to remove difficulty bomb on classic network
    */
   OptionalLong getDefuseDifficultyBombBlockNumber();
 
@@ -129,9 +354,9 @@ public interface GenesisConfigOptions {
    * Enable the outstanding Ethereum Foundation Spurious Dragon and Byzantium network protocol
    * upgrades for the Ethereum Classic network.
    *
+   * @return block number for Atlantis fork on Classic network
    * @see <a
    *     href="https://ecips.ethereumclassic.org/ECIPs/ecip-1054">https://ecips.ethereumclassic.org/ECIPs/ecip-1054</a>
-   * @return block number for Atlantis fork on Classic network
    * @see <a
    *     href="https://ecips.ethereumclassic.org/ECIPs/ecip-1054">https://ecips.ethereumclassic.org/ECIPs/ecip-1054</a>
    */
@@ -142,8 +367,6 @@ public interface GenesisConfigOptions {
    * Constaninople and Petersburg network protocol upgrades on the Ethereum Classic network in a
    * hard-fork code-named Agharta to enable maximum compatibility across these networks.
    *
-   * @see <a
-   *     href="https://ecips.ethereumclassic.org/ECIPs/ecip-1056">https://ecips.ethereumclassic.org/ECIPs/ecip-1056</a>
    * @return block number for Agharta fork on Classic network
    * @see <a
    *     href="https://ecips.ethereumclassic.org/ECIPs/ecip-1056">https://ecips.ethereumclassic.org/ECIPs/ecip-1056</a>
@@ -173,10 +396,43 @@ public interface GenesisConfigOptions {
 
   OptionalLong getLacchainPostQuantumBlockNumber();
 
+  /**
+   * Block number to activate Magneto on Classic networks.
+   *
+   * @return block number of Magneto fork on Classic networks
+   * @see <a
+   *     href="https://github.com/ethereumclassic/ECIPs/issues/424">https://github.com/ethereumclassic/ECIPs/issues/424</a>
+   */
+  OptionalLong getMagnetoBlockNumber();
+
+  /**
+   * Block number to activate Mystique on Classic networks.
+   *
+   * @return block number of Mystique fork on Classic networks
+   * @see <a
+   *     href="https://ecips.ethereumclassic.org/ECIPs/ecip-1104">https://ecips.ethereumclassic.org/ECIPs/ecip-1104</a>
+   */
+  OptionalLong getMystiqueBlockNumber();
+
+  /**
+   * Gets chain id.
+   *
+   * @return the chain id
+   */
   Optional<BigInteger> getChainId();
 
+  /**
+   * Gets contract size limit.
+   *
+   * @return the contract size limit
+   */
   OptionalInt getContractSizeLimit();
 
+  /**
+   * Gets evm stack size.
+   *
+   * @return the evm stack size
+   */
   OptionalInt getEvmStackSize();
 
   /**
@@ -191,8 +447,18 @@ public interface GenesisConfigOptions {
    */
   OptionalLong getEcip1017EraRounds();
 
+  /**
+   * As map map.
+   *
+   * @return the map
+   */
   Map<String, Object> asMap();
 
+  /**
+   * Gets transitions.
+   *
+   * @return the transitions
+   */
   TransitionsConfigOptions getTransitions();
 
   /**
@@ -203,10 +469,40 @@ public interface GenesisConfigOptions {
   boolean isQuorum();
 
   /**
-   * Block number to activate Quorum Permissioning. This options is used on Quorum-compatibility
+   * Block number to activate Quorum Permissioning. This option is used on Quorum-compatibility
    * mode.
    *
    * @return block number to activate Quorum Permissioning
    */
   OptionalLong getQip714BlockNumber();
+
+  /**
+   * The PoW algorithm associated with the genesis file.
+   *
+   * @return the PoW algorithm in use.
+   */
+  PowAlgorithm getPowAlgorithm();
+
+  /**
+   * The elliptic curve which should be used in SignatureAlgorithm.
+   *
+   * @return the name of the elliptic curve.
+   */
+  Optional<String> getEcCurve();
+
+  /**
+   * Set a Zero Base Fee network so that free gas can be used with London/EIP-1559. Once the chain
+   * has a zero base fee, you cannot go back to a non-zero base fee.
+   *
+   * @return true, if you want the next block to use zero for the base fee.
+   */
+  boolean isZeroBaseFee();
+
+  /**
+   * The deposit contract address that should be in the logger field in Receipt of Deposit
+   * transaction
+   *
+   * @return the deposit address
+   */
+  Optional<Address> getDepositContractAddress();
 }
diff --git a/config/src/main/java/org/hyperledger/besu/config/GoQuorumOptions.java b/config/src/main/java/org/hyperledger/besu/config/GoQuorumOptions.java
deleted file mode 100644
index 772e634875a..00000000000
--- a/config/src/main/java/org/hyperledger/besu/config/GoQuorumOptions.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.config;
-
-/**
- * Flag to determine whether we are processing in GoQuorum mode. Note that this mode is incompatible
- * with MainNet.
- */
-public class GoQuorumOptions {
-  // To make it easier for tests to reset the value to default
-  public static final boolean GOQUORUM_COMPATIBILITY_MODE_DEFAULT_VALUE = false;
-
-  public static boolean goquorumCompatibilityMode = GOQUORUM_COMPATIBILITY_MODE_DEFAULT_VALUE;
-}
diff --git a/config/src/main/java/org/hyperledger/besu/config/IbftConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/IbftConfigOptions.java
deleted file mode 100644
index 7a3d956da0a..00000000000
--- a/config/src/main/java/org/hyperledger/besu/config/IbftConfigOptions.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.config;
-
-import java.math.BigInteger;
-import java.util.Map;
-import java.util.Optional;
-
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.collect.ImmutableMap;
-import org.apache.tuweni.bytes.Bytes;
-
-public class IbftConfigOptions {
-
-  public static final IbftConfigOptions DEFAULT =
-      new IbftConfigOptions(JsonUtil.createEmptyObjectNode());
-
-  private static final long DEFAULT_EPOCH_LENGTH = 30_000;
-  private static final int DEFAULT_BLOCK_PERIOD_SECONDS = 1;
-  private static final int DEFAULT_ROUND_EXPIRY_SECONDS = 1;
-  // In a healthy network this can be very small. This default limit will allow for suitable
-  // protection for on a typical 20 node validator network with multiple rounds
-  private static final int DEFAULT_GOSSIPED_HISTORY_LIMIT = 1000;
-  private static final int DEFAULT_MESSAGE_QUEUE_LIMIT = 1000;
-  private static final int DEFAULT_DUPLICATE_MESSAGE_LIMIT = 100;
-  private static final int DEFAULT_FUTURE_MESSAGES_LIMIT = 1000;
-  private static final int DEFAULT_FUTURE_MESSAGES_MAX_DISTANCE = 10;
-
-  private final ObjectNode ibftConfigRoot;
-
-  IbftConfigOptions(final ObjectNode ibftConfigRoot) {
-    this.ibftConfigRoot = ibftConfigRoot;
-  }
-
-  public long getEpochLength() {
-    return JsonUtil.getLong(ibftConfigRoot, "epochlength", DEFAULT_EPOCH_LENGTH);
-  }
-
-  public int getBlockPeriodSeconds() {
-    return JsonUtil.getInt(ibftConfigRoot, "blockperiodseconds", DEFAULT_BLOCK_PERIOD_SECONDS);
-  }
-
-  public int getRequestTimeoutSeconds() {
-    return JsonUtil.getInt(ibftConfigRoot, "requesttimeoutseconds", DEFAULT_ROUND_EXPIRY_SECONDS);
-  }
-
-  public int getGossipedHistoryLimit() {
-    return JsonUtil.getInt(ibftConfigRoot, "gossipedhistorylimit", DEFAULT_GOSSIPED_HISTORY_LIMIT);
-  }
-
-  public int getMessageQueueLimit() {
-    return JsonUtil.getInt(ibftConfigRoot, "messagequeuelimit", DEFAULT_MESSAGE_QUEUE_LIMIT);
-  }
-
-  public int getDuplicateMessageLimit() {
-    return JsonUtil.getInt(
-        ibftConfigRoot, "duplicatemessagelimit", DEFAULT_DUPLICATE_MESSAGE_LIMIT);
-  }
-
-  public int getFutureMessagesLimit() {
-    return JsonUtil.getInt(ibftConfigRoot, "futuremessageslimit", DEFAULT_FUTURE_MESSAGES_LIMIT);
-  }
-
-  public int getFutureMessagesMaxDistance() {
-    return JsonUtil.getInt(
-        ibftConfigRoot, "futuremessagesmaxdistance", DEFAULT_FUTURE_MESSAGES_MAX_DISTANCE);
-  }
-
-  public Optional<String> getMiningBeneficiary() {
-    return JsonUtil.getString(ibftConfigRoot, "miningbeneficiary");
-  }
-
-  public BigInteger getBlockRewardWei() {
-    final Optional<String> configFileContent = JsonUtil.getString(ibftConfigRoot, "blockreward");
-
-    if (configFileContent.isEmpty()) {
-      return BigInteger.ZERO;
-    }
-    final String weiStr = configFileContent.get();
-    if (weiStr.startsWith("0x")) {
-      return new BigInteger(1, Bytes.fromHexStringLenient(weiStr).toArrayUnsafe());
-    }
-    return new BigInteger(weiStr);
-  }
-
-  Map<String, Object> asMap() {
-    final ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
-    if (ibftConfigRoot.has("epochlength")) {
-      builder.put("epochLength", getEpochLength());
-    }
-    if (ibftConfigRoot.has("blockperiodseconds")) {
-      builder.put("blockPeriodSeconds", getBlockPeriodSeconds());
-    }
-    if (ibftConfigRoot.has("requesttimeoutseconds")) {
-      builder.put("requestTimeoutSeconds", getRequestTimeoutSeconds());
-    }
-    if (ibftConfigRoot.has("gossipedhistorylimit")) {
-      builder.put("gossipedHistoryLimit", getGossipedHistoryLimit());
-    }
-    if (ibftConfigRoot.has("messagequeuelimit")) {
-      builder.put("messageQueueLimit", getMessageQueueLimit());
-    }
-    if (ibftConfigRoot.has("duplicatemessagelimit")) {
-      builder.put("duplicateMessageLimit", getDuplicateMessageLimit());
-    }
-    if (ibftConfigRoot.has("futuremessageslimit")) {
-      builder.put("futureMessagesLimit", getFutureMessagesLimit());
-    }
-    if (ibftConfigRoot.has("futuremessagesmaxdistance")) {
-      builder.put("futureMessagesMaxDistance", getFutureMessagesMaxDistance());
-    }
-    return builder.build();
-  }
-}
diff --git a/config/src/main/java/org/hyperledger/besu/config/IbftFork.java b/config/src/main/java/org/hyperledger/besu/config/IbftFork.java
deleted file mode 100644
index ed60e2a8b44..00000000000
--- a/config/src/main/java/org/hyperledger/besu/config/IbftFork.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.config;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.OptionalInt;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.collect.Lists;
-
-public class IbftFork {
-
-  private static final String FORK_BLOCK_KEY = "block";
-  private static final String VALIDATORS_KEY = "validators";
-  private static final String BLOCK_PERIOD_SECONDS_KEY = "blockperiodseconds";
-
-  private final ObjectNode forkConfigRoot;
-
-  @JsonCreator
-  public IbftFork(final ObjectNode forkConfigRoot) {
-    this.forkConfigRoot = forkConfigRoot;
-  }
-
-  public long getForkBlock() {
-    return JsonUtil.getLong(forkConfigRoot, FORK_BLOCK_KEY)
-        .orElseThrow(
-            () ->
-                new IllegalArgumentException(
-                    "Fork block not specified for IBFT2 fork in custom forks"));
-  }
-
-  public OptionalInt getBlockPeriodSeconds() {
-    return JsonUtil.getInt(forkConfigRoot, BLOCK_PERIOD_SECONDS_KEY);
-  }
-
-  public Optional<List<String>> getValidators() throws IllegalArgumentException {
-    final Optional<ArrayNode> validatorNode = JsonUtil.getArrayNode(forkConfigRoot, VALIDATORS_KEY);
-
-    if (validatorNode.isEmpty()) {
-      return Optional.empty();
-    }
-
-    List<String> validators = Lists.newArrayList();
-    validatorNode
-        .get()
-        .elements()
-        .forEachRemaining(
-            value -> {
-              if (!value.isTextual()) {
-                throw new IllegalArgumentException(
-                    "Ibft Validator fork does not contain a string " + value.toString());
-              }
-
-              validators.add(value.asText());
-            });
-    return Optional.of(validators);
-  }
-}
diff --git a/config/src/main/java/org/hyperledger/besu/config/JsonBftConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/JsonBftConfigOptions.java
new file mode 100644
index 00000000000..4dfa49fa3a0
--- /dev/null
+++ b/config/src/main/java/org/hyperledger/besu/config/JsonBftConfigOptions.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.config;
+
+import org.hyperledger.besu.datatypes.Address;
+
+import java.math.BigInteger;
+import java.util.Map;
+import java.util.Optional;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.collect.ImmutableMap;
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Json Bft config options. */
+public class JsonBftConfigOptions implements BftConfigOptions {
+
+  /** The constant DEFAULT. */
+  public static final JsonBftConfigOptions DEFAULT =
+      new JsonBftConfigOptions(JsonUtil.createEmptyObjectNode());
+
+  private static final long DEFAULT_EPOCH_LENGTH = 30_000;
+  private static final int DEFAULT_BLOCK_PERIOD_SECONDS = 1;
+  private static final int DEFAULT_ROUND_EXPIRY_SECONDS = 1;
+  // In a healthy network this can be very small. This default limit will allow for suitable
+  // protection for on a typical 20 node validator network with multiple rounds
+  private static final int DEFAULT_GOSSIPED_HISTORY_LIMIT = 1000;
+  private static final int DEFAULT_MESSAGE_QUEUE_LIMIT = 1000;
+  private static final int DEFAULT_DUPLICATE_MESSAGE_LIMIT = 100;
+  private static final int DEFAULT_FUTURE_MESSAGES_LIMIT = 1000;
+  private static final int DEFAULT_FUTURE_MESSAGES_MAX_DISTANCE = 10;
+
+  /** The Bft config root. */
+  protected final ObjectNode bftConfigRoot;
+
+  /**
+   * Instantiates a new Json bft config options.
+   *
+   * @param bftConfigRoot the bft config root
+   */
+  public JsonBftConfigOptions(final ObjectNode bftConfigRoot) {
+    this.bftConfigRoot = bftConfigRoot;
+  }
+
+  @Override
+  public long getEpochLength() {
+    return JsonUtil.getLong(bftConfigRoot, "epochlength", DEFAULT_EPOCH_LENGTH);
+  }
+
+  @Override
+  public int getBlockPeriodSeconds() {
+    return JsonUtil.getPositiveInt(
+        bftConfigRoot, "blockperiodseconds", DEFAULT_BLOCK_PERIOD_SECONDS);
+  }
+
+  @Override
+  public int getRequestTimeoutSeconds() {
+    return JsonUtil.getInt(bftConfigRoot, "requesttimeoutseconds", DEFAULT_ROUND_EXPIRY_SECONDS);
+  }
+
+  @Override
+  public int getGossipedHistoryLimit() {
+    return JsonUtil.getInt(bftConfigRoot, "gossipedhistorylimit", DEFAULT_GOSSIPED_HISTORY_LIMIT);
+  }
+
+  @Override
+  public int getMessageQueueLimit() {
+    return JsonUtil.getInt(bftConfigRoot, "messagequeuelimit", DEFAULT_MESSAGE_QUEUE_LIMIT);
+  }
+
+  @Override
+  public int getDuplicateMessageLimit() {
+    return JsonUtil.getInt(bftConfigRoot, "duplicatemessagelimit", DEFAULT_DUPLICATE_MESSAGE_LIMIT);
+  }
+
+  @Override
+  public int getFutureMessagesLimit() {
+    return JsonUtil.getInt(bftConfigRoot, "futuremessageslimit", DEFAULT_FUTURE_MESSAGES_LIMIT);
+  }
+
+  @Override
+  public int getFutureMessagesMaxDistance() {
+    return JsonUtil.getInt(
+        bftConfigRoot, "futuremessagesmaxdistance", DEFAULT_FUTURE_MESSAGES_MAX_DISTANCE);
+  }
+
+  @Override
+  public Optional<Address> getMiningBeneficiary() {
+    try {
+      return JsonUtil.getString(bftConfigRoot, "miningbeneficiary")
+          .map(String::trim)
+          .filter(s -> !s.isBlank())
+          .map(Address::fromHexStringStrict);
+    } catch (final IllegalArgumentException e) {
+      throw new IllegalArgumentException(
+          "Mining beneficiary in config is not a valid ethereum address", e);
+    }
+  }
+
+  @Override
+  public BigInteger getBlockRewardWei() {
+    final Optional<String> configFileContent = JsonUtil.getString(bftConfigRoot, "blockreward");
+
+    if (configFileContent.isEmpty()) {
+      return BigInteger.ZERO;
+    }
+    final String weiStr = configFileContent.get();
+    if (weiStr.toLowerCase().startsWith("0x")) {
+      return new BigInteger(1, Bytes.fromHexStringLenient(weiStr).toArrayUnsafe());
+    }
+    return new BigInteger(weiStr);
+  }
+
+  @Override
+  public Map<String, Object> asMap() {
+    final ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
+    if (bftConfigRoot.has("epochlength")) {
+      builder.put("epochLength", getEpochLength());
+    }
+    if (bftConfigRoot.has("blockperiodseconds")) {
+      builder.put("blockPeriodSeconds", getBlockPeriodSeconds());
+    }
+    if (bftConfigRoot.has("requesttimeoutseconds")) {
+      builder.put("requestTimeoutSeconds", getRequestTimeoutSeconds());
+    }
+    if (bftConfigRoot.has("gossipedhistorylimit")) {
+      builder.put("gossipedHistoryLimit", getGossipedHistoryLimit());
+    }
+    if (bftConfigRoot.has("messagequeuelimit")) {
+      builder.put("messageQueueLimit", getMessageQueueLimit());
+    }
+    if (bftConfigRoot.has("duplicatemessagelimit")) {
+      builder.put("duplicateMessageLimit", getDuplicateMessageLimit());
+    }
+    if (bftConfigRoot.has("futuremessageslimit")) {
+      builder.put("futureMessagesLimit", getFutureMessagesLimit());
+    }
+    if (bftConfigRoot.has("futuremessagesmaxdistance")) {
+      builder.put("futureMessagesMaxDistance", getFutureMessagesMaxDistance());
+    }
+    return builder.build();
+  }
+}
diff --git a/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java
index 30a42d939e3..8dde977b4dc 100644
--- a/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java
+++ b/config/src/main/java/org/hyperledger/besu/config/JsonGenesisConfigOptions.java
@@ -17,10 +17,11 @@
 import static java.util.Collections.emptyMap;
 import static java.util.Objects.isNull;
 
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 
 import java.math.BigInteger;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -30,40 +31,54 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.ImmutableMap;
+import org.apache.tuweni.units.bigints.UInt256;
 
+/** The Json genesis config options. */
 public class JsonGenesisConfigOptions implements GenesisConfigOptions {
 
   private static final String ETHASH_CONFIG_KEY = "ethash";
   private static final String IBFT_LEGACY_CONFIG_KEY = "ibft";
   private static final String IBFT2_CONFIG_KEY = "ibft2";
+  private static final String QBFT_CONFIG_KEY = "qbft";
   private static final String CLIQUE_CONFIG_KEY = "clique";
-
+  private static final String EC_CURVE_CONFIG_KEY = "eccurve";
   private static final String TRANSITIONS_CONFIG_KEY = "transitions";
+  private static final String DISCOVERY_CONFIG_KEY = "discovery";
+  private static final String CHECKPOINT_CONFIG_KEY = "checkpoint";
+  private static final String ZERO_BASE_FEE_KEY = "zerobasefee";
+  private static final String DEPOSIT_CONTRACT_ADDRESS_KEY = "depositcontractaddress";
+
   private final ObjectNode configRoot;
   private final Map<String, String> configOverrides = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
   private final TransitionsConfigOptions transitions;
 
+  /**
+   * From json object json genesis config options.
+   *
+   * @param configRoot the config root
+   * @return the json genesis config options
+   */
   public static JsonGenesisConfigOptions fromJsonObject(final ObjectNode configRoot) {
     return fromJsonObjectWithOverrides(configRoot, emptyMap());
   }
 
+  /**
+   * From json object with overrides json genesis config options.
+   *
+   * @param configRoot the config root
+   * @param configOverrides the config overrides
+   * @return the json genesis config options
+   */
   static JsonGenesisConfigOptions fromJsonObjectWithOverrides(
       final ObjectNode configRoot, final Map<String, String> configOverrides) {
     final TransitionsConfigOptions transitionsConfigOptions;
-    try {
-      transitionsConfigOptions = loadTransitionsFrom(configRoot);
-    } catch (final JsonProcessingException e) {
-      throw new RuntimeException("Transitions section of genesis file failed to decode.", e);
-    }
+    transitionsConfigOptions = loadTransitionsFrom(configRoot);
     return new JsonGenesisConfigOptions(configRoot, configOverrides, transitionsConfigOptions);
   }
 
-  private static TransitionsConfigOptions loadTransitionsFrom(final ObjectNode parentNode)
-      throws JsonProcessingException {
-
+  private static TransitionsConfigOptions loadTransitionsFrom(final ObjectNode parentNode) {
     final Optional<ObjectNode> transitionsNode =
         JsonUtil.getObjectNode(parentNode, TRANSITIONS_CONFIG_KEY);
     if (transitionsNode.isEmpty()) {
@@ -73,11 +88,13 @@ private static TransitionsConfigOptions loadTransitionsFrom(final ObjectNode par
     return new TransitionsConfigOptions(transitionsNode.get());
   }
 
-  private JsonGenesisConfigOptions(
-      final ObjectNode maybeConfig, final TransitionsConfigOptions transitionsConfig) {
-    this(maybeConfig, Collections.emptyMap(), transitionsConfig);
-  }
-
+  /**
+   * Instantiates a new Json genesis config options.
+   *
+   * @param maybeConfig the optional config
+   * @param configOverrides the config overrides map
+   * @param transitionsConfig the transitions configuration
+   */
   JsonGenesisConfigOptions(
       final ObjectNode maybeConfig,
       final Map<String, String> configOverrides,
@@ -95,8 +112,8 @@ public String getConsensusEngine() {
       return ETHASH_CONFIG_KEY;
     } else if (isIbft2()) {
       return IBFT2_CONFIG_KEY;
-    } else if (isIbftLegacy()) {
-      return IBFT_LEGACY_CONFIG_KEY;
+    } else if (isQbft()) {
+      return QBFT_CONFIG_KEY;
     } else if (isClique()) {
       return CLIQUE_CONFIG_KEY;
     } else {
@@ -125,17 +142,37 @@ public boolean isIbft2() {
   }
 
   @Override
-  public IbftConfigOptions getIbftLegacyConfigOptions() {
-    return JsonUtil.getObjectNode(configRoot, IBFT_LEGACY_CONFIG_KEY)
-        .map(IbftConfigOptions::new)
-        .orElse(IbftConfigOptions.DEFAULT);
+  public boolean isQbft() {
+    return configRoot.has(QBFT_CONFIG_KEY);
+  }
+
+  @Override
+  public BftConfigOptions getBftConfigOptions() {
+    final String fieldKey = isIbft2() ? IBFT2_CONFIG_KEY : QBFT_CONFIG_KEY;
+    return JsonUtil.getObjectNode(configRoot, fieldKey)
+        .map(JsonBftConfigOptions::new)
+        .orElse(JsonBftConfigOptions.DEFAULT);
+  }
+
+  @Override
+  public QbftConfigOptions getQbftConfigOptions() {
+    return JsonUtil.getObjectNode(configRoot, QBFT_CONFIG_KEY)
+        .map(JsonQbftConfigOptions::new)
+        .orElse(JsonQbftConfigOptions.DEFAULT);
   }
 
   @Override
-  public IbftConfigOptions getIbft2ConfigOptions() {
-    return JsonUtil.getObjectNode(configRoot, IBFT2_CONFIG_KEY)
-        .map(IbftConfigOptions::new)
-        .orElse(IbftConfigOptions.DEFAULT);
+  public DiscoveryOptions getDiscoveryOptions() {
+    return JsonUtil.getObjectNode(configRoot, DISCOVERY_CONFIG_KEY)
+        .map(DiscoveryOptions::new)
+        .orElse(DiscoveryOptions.DEFAULT);
+  }
+
+  @Override
+  public CheckpointConfigOptions getCheckpointOptions() {
+    return JsonUtil.getObjectNode(configRoot, CHECKPOINT_CONFIG_KEY)
+        .map(CheckpointConfigOptions::new)
+        .orElse(CheckpointConfigOptions.DEFAULT);
   }
 
   @Override
@@ -192,7 +229,7 @@ public OptionalLong getConstantinopleBlockNumber() {
   }
 
   @Override
-  public OptionalLong getConstantinopleFixBlockNumber() {
+  public OptionalLong getPetersburgBlockNumber() {
     final OptionalLong petersburgBlock = getOptionalLong("petersburgblock");
     final OptionalLong constantinopleFixBlock = getOptionalLong("constantinoplefixblock");
     if (constantinopleFixBlock.isPresent()) {
@@ -217,25 +254,70 @@ public OptionalLong getMuirGlacierBlockNumber() {
 
   @Override
   public OptionalLong getBerlinBlockNumber() {
-    if (ExperimentalEIPs.berlinEnabled) {
-      final OptionalLong berlinBlock = getOptionalLong("berlinblock");
-      final OptionalLong yolov2Block = getOptionalLong("yolov2block");
-      if (yolov2Block.isPresent()) {
-        if (berlinBlock.isPresent()) {
-          throw new RuntimeException(
-              "Genesis files cannot specify both berlinblock and yoloV2Block.");
-        }
-        return yolov2Block;
-      }
-      return berlinBlock;
-    }
-    return OptionalLong.empty();
+    return getOptionalLong("berlinblock");
+  }
+
+  @Override
+  public OptionalLong getLondonBlockNumber() {
+    return getOptionalLong("londonblock");
+  }
+
+  @Override
+  public OptionalLong getArrowGlacierBlockNumber() {
+    return getOptionalLong("arrowglacierblock");
+  }
+
+  @Override
+  public OptionalLong getGrayGlacierBlockNumber() {
+    return getOptionalLong("grayglacierblock");
+  }
+
+  @Override
+  public OptionalLong getMergeNetSplitBlockNumber() {
+    return getOptionalLong("mergenetsplitblock");
+  }
+
+  @Override
+  public OptionalLong getShanghaiTime() {
+    return getOptionalLong("shanghaitime");
+  }
+
+  @Override
+  public OptionalLong getCancunTime() {
+    return getOptionalLong("cancuntime");
+  }
+
+  @Override
+  public OptionalLong getFutureEipsTime() {
+    return getOptionalLong("futureeipstime");
+  }
+
+  @Override
+  public OptionalLong getExperimentalEipsTime() {
+    return getOptionalLong("experimentaleipstime");
+  }
+
+  @Override
+  public Optional<Wei> getBaseFeePerGas() {
+    return Optional.ofNullable(configOverrides.get("baseFeePerGas"))
+        .map(Wei::fromHexString)
+        .map(Optional::of)
+        .orElse(Optional.empty());
+  }
+
+  @Override
+  public Optional<UInt256> getTerminalTotalDifficulty() {
+    return getOptionalBigInteger("terminaltotaldifficulty").map(UInt256::valueOf);
   }
 
   @Override
-  // TODO EIP-1559 change for the actual fork name when known
-  public OptionalLong getEIP1559BlockNumber() {
-    return ExperimentalEIPs.eip1559Enabled ? getOptionalLong("eip1559block") : OptionalLong.empty();
+  public OptionalLong getTerminalBlockNumber() {
+    return getOptionalLong("terminalblocknumber");
+  }
+
+  @Override
+  public Optional<Hash> getTerminalBlockHash() {
+    return getOptionalHash("terminalblockhash");
   }
 
   @Override
@@ -286,6 +368,13 @@ public OptionalLong getThanosBlockNumber() {
   @Override
   public OptionalLong getLacchainPostQuantumBlockNumber() {
     return getOptionalLong("lacchainpqblock");
+  public OptionalLong getMagnetoBlockNumber() {
+    return getOptionalLong("magnetoblock");
+  }
+
+  @Override
+  public OptionalLong getMystiqueBlockNumber() {
+    return getOptionalLong("mystiqueblock");
   }
 
   @Override
@@ -318,41 +407,72 @@ public OptionalLong getQip714BlockNumber() {
     return getOptionalLong("qip714block");
   }
 
+  @Override
+  public PowAlgorithm getPowAlgorithm() {
+    return isEthHash() ? PowAlgorithm.ETHASH : PowAlgorithm.UNSUPPORTED;
+  }
+
+  @Override
+  public Optional<String> getEcCurve() {
+    return JsonUtil.getString(configRoot, EC_CURVE_CONFIG_KEY);
+  }
+
+  @Override
+  public boolean isZeroBaseFee() {
+    return getOptionalBoolean(ZERO_BASE_FEE_KEY).orElse(false);
+  }
+
+  @Override
+  public Optional<Address> getDepositContractAddress() {
+    Optional<String> inputAddress = JsonUtil.getString(configRoot, DEPOSIT_CONTRACT_ADDRESS_KEY);
+    return inputAddress.map(Address::fromHexString);
+  }
+
   @Override
   public Map<String, Object> asMap() {
     final ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
     getChainId().ifPresent(chainId -> builder.put("chainId", chainId));
+
+    // mainnet fork blocks
     getHomesteadBlockNumber().ifPresent(l -> builder.put("homesteadBlock", l));
-    getDaoForkBlock()
-        .ifPresent(
-            l -> {
-              builder.put("daoForkBlock", l);
-              builder.put("daoForkSupport", Boolean.TRUE);
-            });
-    getTangerineWhistleBlockNumber()
-        .ifPresent(
-            l -> {
-              builder.put("eip150Block", l);
-              getOptionalString("eip150hash")
-                  .ifPresent(eip150hash -> builder.put("eip150Hash", eip150hash));
-            });
-    getSpuriousDragonBlockNumber()
-        .ifPresent(
-            l -> {
-              builder.put("eip155Block", l);
-              builder.put("eip158Block", l);
-            });
+    getDaoForkBlock().ifPresent(l -> builder.put("daoForkBlock", l));
+    getTangerineWhistleBlockNumber().ifPresent(l -> builder.put("eip150Block", l));
+    getSpuriousDragonBlockNumber().ifPresent(l -> builder.put("eip158Block", l));
     getByzantiumBlockNumber().ifPresent(l -> builder.put("byzantiumBlock", l));
     getConstantinopleBlockNumber().ifPresent(l -> builder.put("constantinopleBlock", l));
-    getConstantinopleFixBlockNumber().ifPresent(l -> builder.put("petersburgBlock", l));
+    getPetersburgBlockNumber().ifPresent(l -> builder.put("petersburgBlock", l));
     getIstanbulBlockNumber().ifPresent(l -> builder.put("istanbulBlock", l));
     getMuirGlacierBlockNumber().ifPresent(l -> builder.put("muirGlacierBlock", l));
     getBerlinBlockNumber().ifPresent(l -> builder.put("berlinBlock", l));
-    getEIP1559BlockNumber().ifPresent(l -> builder.put("eip1559Block", l));
+    getLondonBlockNumber().ifPresent(l -> builder.put("londonBlock", l));
+    getArrowGlacierBlockNumber().ifPresent(l -> builder.put("arrowGlacierBlock", l));
+    getGrayGlacierBlockNumber().ifPresent(l -> builder.put("grayGlacierBlock", l));
+    getMergeNetSplitBlockNumber().ifPresent(l -> builder.put("mergeNetSplitBlock", l));
+    getShanghaiTime().ifPresent(l -> builder.put("shanghaiTime", l));
+    getCancunTime().ifPresent(l -> builder.put("cancunTime", l));
+    getTerminalBlockNumber().ifPresent(l -> builder.put("terminalBlockNumber", l));
+    getTerminalBlockHash().ifPresent(h -> builder.put("terminalBlockHash", h.toHexString()));
+    getFutureEipsTime().ifPresent(l -> builder.put("futureEipsTime", l));
+    getExperimentalEipsTime().ifPresent(l -> builder.put("experimentalEipsTime", l));
+
+    // classic fork blocks
+    getClassicForkBlock().ifPresent(l -> builder.put("classicForkBlock", l));
+    getEcip1015BlockNumber().ifPresent(l -> builder.put("ecip1015Block", l));
+    getDieHardBlockNumber().ifPresent(l -> builder.put("dieHardBlock", l));
+    getGothamBlockNumber().ifPresent(l -> builder.put("gothamBlock", l));
+    getDefuseDifficultyBombBlockNumber().ifPresent(l -> builder.put("ecip1041Block", l));
+    getAtlantisBlockNumber().ifPresent(l -> builder.put("atlantisBlock", l));
+    getAghartaBlockNumber().ifPresent(l -> builder.put("aghartaBlock", l));
+    getPhoenixBlockNumber().ifPresent(l -> builder.put("phoenixBlock", l));
+    getThanosBlockNumber().ifPresent(l -> builder.put("thanosBlock", l));
+    getMagnetoBlockNumber().ifPresent(l -> builder.put("magnetoBlock", l));
+    getMystiqueBlockNumber().ifPresent(l -> builder.put("mystiqueBlock", l));
+
     getContractSizeLimit().ifPresent(l -> builder.put("contractSizeLimit", l));
     getEvmStackSize().ifPresent(l -> builder.put("evmstacksize", l));
     getEcip1017EraRounds().ifPresent(l -> builder.put("ecip1017EraRounds", l));
-    getThanosBlockNumber().ifPresent(l -> builder.put("thanosBlock", l));
+
+    getDepositContractAddress().ifPresent(l -> builder.put("depositContractAddress", l));
 
     if (isClique()) {
       builder.put("clique", getCliqueConfigOptions().asMap());
@@ -360,11 +480,11 @@ public Map<String, Object> asMap() {
     if (isEthHash()) {
       builder.put("ethash", getEthashConfigOptions().asMap());
     }
-    if (isIbftLegacy()) {
-      builder.put("ibft", getIbftLegacyConfigOptions().asMap());
-    }
     if (isIbft2()) {
-      builder.put("ibft2", getIbft2ConfigOptions().asMap());
+      builder.put("ibft2", getBftConfigOptions().asMap());
+    }
+    if (isQbft()) {
+      builder.put("qbft", getQbftConfigOptions().asMap());
     }
 
     if (isQuorum()) {
@@ -372,16 +492,11 @@ public Map<String, Object> asMap() {
       getQip714BlockNumber().ifPresent(blockNumber -> builder.put("qip714block", blockNumber));
     }
 
-    return builder.build();
-  }
-
-  private Optional<String> getOptionalString(final String key) {
-    if (configOverrides.containsKey(key)) {
-      final String value = configOverrides.get(key);
-      return value == null || value.isEmpty() ? Optional.empty() : Optional.of(value);
-    } else {
-      return JsonUtil.getString(configRoot, key);
+    if (isZeroBaseFee()) {
+      builder.put("zeroBaseFee", true);
     }
+
+    return builder.build();
   }
 
   private OptionalLong getOptionalLong(final String key) {
@@ -428,8 +543,17 @@ private Optional<Boolean> getOptionalBoolean(final String key) {
     }
   }
 
+  private Optional<Hash> getOptionalHash(final String key) {
+    if (configOverrides.containsKey(key)) {
+      final String overrideHash = configOverrides.get(key);
+      return Optional.of(Hash.fromHexString(overrideHash));
+    } else {
+      return JsonUtil.getValueAsString(configRoot, key).map(Hash::fromHexString);
+    }
+  }
+
   @Override
-  public List<Long> getForks() {
+  public List<Long> getForkBlockNumbers() {
     Stream<OptionalLong> forkBlockNumbers =
         Stream.of(
             getHomesteadBlockNumber(),
@@ -438,10 +562,14 @@ public List<Long> getForks() {
             getSpuriousDragonBlockNumber(),
             getByzantiumBlockNumber(),
             getConstantinopleBlockNumber(),
-            getConstantinopleFixBlockNumber(),
+            getPetersburgBlockNumber(),
             getIstanbulBlockNumber(),
             getMuirGlacierBlockNumber(),
-            getEIP1559BlockNumber(),
+            getBerlinBlockNumber(),
+            getLondonBlockNumber(),
+            getArrowGlacierBlockNumber(),
+            getGrayGlacierBlockNumber(),
+            getMergeNetSplitBlockNumber(),
             getEcip1015BlockNumber(),
             getDieHardBlockNumber(),
             getGothamBlockNumber(),
@@ -449,7 +577,10 @@ public List<Long> getForks() {
             getAtlantisBlockNumber(),
             getAghartaBlockNumber(),
             getPhoenixBlockNumber(),
-            getThanosBlockNumber());
+            getThanosBlockNumber(),
+            getMagnetoBlockNumber(),
+            getMystiqueBlockNumber());
+    // when adding forks add an entry to ${REPO_ROOT}/config/src/test/resources/all_forks.json
 
     return forkBlockNumbers
         .filter(OptionalLong::isPresent)
@@ -458,4 +589,19 @@ public List<Long> getForks() {
         .sorted()
         .collect(Collectors.toList());
   }
+
+  @Override
+  public List<Long> getForkBlockTimestamps() {
+    Stream<OptionalLong> forkBlockTimestamps =
+        Stream.of(
+            getShanghaiTime(), getCancunTime(), getFutureEipsTime(), getExperimentalEipsTime());
+    // when adding forks add an entry to ${REPO_ROOT}/config/src/test/resources/all_forks.json
+
+    return forkBlockTimestamps
+        .filter(OptionalLong::isPresent)
+        .map(OptionalLong::getAsLong)
+        .distinct()
+        .sorted()
+        .collect(Collectors.toList());
+  }
 }
diff --git a/config/src/main/java/org/hyperledger/besu/config/JsonQbftConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/JsonQbftConfigOptions.java
new file mode 100644
index 00000000000..a9bcf750f2e
--- /dev/null
+++ b/config/src/main/java/org/hyperledger/besu/config/JsonQbftConfigOptions.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.config;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.OptionalLong;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.collect.ImmutableMap;
+
+/** The Json QBFT config options. */
+public class JsonQbftConfigOptions extends JsonBftConfigOptions implements QbftConfigOptions {
+  /** The constant DEFAULT. */
+  public static final JsonQbftConfigOptions DEFAULT =
+      new JsonQbftConfigOptions(JsonUtil.createEmptyObjectNode());
+  /** The constant VALIDATOR_CONTRACT_ADDRESS. */
+  public static final String VALIDATOR_CONTRACT_ADDRESS = "validatorcontractaddress";
+  /** The constant START_BLOCK. */
+  public static final String START_BLOCK = "startblock";
+
+  /**
+   * Instantiates a new Json QBFT config options.
+   *
+   * @param bftConfigRoot the bft config root
+   */
+  public JsonQbftConfigOptions(final ObjectNode bftConfigRoot) {
+    super(bftConfigRoot);
+  }
+
+  @Override
+  public Optional<String> getValidatorContractAddress() {
+    return JsonUtil.getString(bftConfigRoot, VALIDATOR_CONTRACT_ADDRESS).map(String::toLowerCase);
+  }
+
+  @Override
+  public OptionalLong getStartBlock() {
+    return JsonUtil.getLong(bftConfigRoot, START_BLOCK);
+  }
+
+  @Override
+  public Map<String, Object> asMap() {
+    final Map<String, Object> map = super.asMap();
+    final ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
+    builder.putAll(map);
+
+    getValidatorContractAddress()
+        .ifPresent((address) -> builder.put(VALIDATOR_CONTRACT_ADDRESS, address));
+    getStartBlock().ifPresent((startBlock) -> builder.put(START_BLOCK, getStartBlock()));
+
+    return builder.build();
+  }
+}
diff --git a/config/src/main/java/org/hyperledger/besu/config/JsonUtil.java b/config/src/main/java/org/hyperledger/besu/config/JsonUtil.java
index fcfaa4629ba..45c933d09d8 100644
--- a/config/src/main/java/org/hyperledger/besu/config/JsonUtil.java
+++ b/config/src/main/java/org/hyperledger/besu/config/JsonUtil.java
@@ -14,6 +14,8 @@
  */
 package org.hyperledger.besu.config;
 
+import org.hyperledger.besu.util.number.PositiveNumber;
+
 import java.io.IOException;
 import java.util.Locale;
 import java.util.Map;
@@ -29,6 +31,7 @@
 import com.fasterxml.jackson.databind.node.JsonNodeType;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
+/** The Json util class. */
 public class JsonUtil {
 
   /**
@@ -50,6 +53,8 @@ public static ObjectNode normalizeKeys(final ObjectNode objectNode) {
               final String normalizedKey = key.toLowerCase(Locale.US);
               if (value instanceof ObjectNode) {
                 normalized.set(normalizedKey, normalizeKeys((ObjectNode) value));
+              } else if (value instanceof ArrayNode) {
+                normalized.set(normalizedKey, normalizeKeysInArray((ArrayNode) value));
               } else {
                 normalized.set(normalizedKey, value);
               }
@@ -57,6 +62,21 @@ public static ObjectNode normalizeKeys(final ObjectNode objectNode) {
     return normalized;
   }
 
+  private static ArrayNode normalizeKeysInArray(final ArrayNode arrayNode) {
+    final ArrayNode normalizedArray = JsonUtil.createEmptyArrayNode();
+    arrayNode.forEach(
+        value -> {
+          if (value instanceof ObjectNode) {
+            normalizedArray.add(normalizeKeys((ObjectNode) value));
+          } else if (value instanceof ArrayNode) {
+            normalizedArray.add(normalizeKeysInArray((ArrayNode) value));
+          } else {
+            normalizedArray.add(value);
+          }
+        });
+    return normalizedArray;
+  }
+
   /**
    * Get the string representation of the value at {@code key}. For example, a numeric value like 5
    * will be returned as "5".
@@ -83,6 +103,17 @@ public static String getValueAsString(
     return getValueAsString(node, key).orElse(defaultValue);
   }
 
+  /**
+   * Checks whether an {@code ObjectNode} contains the given key.
+   *
+   * @param node The {@code ObjectNode} to inspect.
+   * @param key The key to check.
+   * @return Returns true if the given key is set.
+   */
+  public static boolean hasKey(final ObjectNode node, final String key) {
+    return node.has(key);
+  }
+
   /**
    * Returns textual (string) value at {@code key}. See {@link #getValueAsString} for retrieving
    * non-textual values in string form.
@@ -111,6 +142,13 @@ public static String getString(
     return getString(node, key).orElse(defaultValue);
   }
 
+  /**
+   * Gets int.
+   *
+   * @param node the node
+   * @param key the key
+   * @return the int
+   */
   public static OptionalInt getInt(final ObjectNode node, final String key) {
     return getValue(node, key)
         .filter(jsonNode -> validateType(jsonNode, JsonNodeType.NUMBER))
@@ -120,10 +158,61 @@ public static OptionalInt getInt(final ObjectNode node, final String key) {
         .orElse(OptionalInt.empty());
   }
 
+  /**
+   * Gets int.
+   *
+   * @param node the node
+   * @param key the key
+   * @param defaultValue the default value
+   * @return the int
+   */
   public static int getInt(final ObjectNode node, final String key, final int defaultValue) {
     return getInt(node, key).orElse(defaultValue);
   }
 
+  /**
+   * Gets positive int.
+   *
+   * @param node the node
+   * @param key the key
+   * @return the positive int
+   */
+  public static OptionalInt getPositiveInt(final ObjectNode node, final String key) {
+    return getValueAsString(node, key)
+        .map(v -> OptionalInt.of(parsePositiveInt(key, v)))
+        .orElse(OptionalInt.empty());
+  }
+
+  /**
+   * Gets positive int.
+   *
+   * @param node the node
+   * @param key the key
+   * @param defaultValue the default value
+   * @return the positive int
+   */
+  public static int getPositiveInt(
+      final ObjectNode node, final String key, final int defaultValue) {
+    final String value = getValueAsString(node, key, String.valueOf(defaultValue));
+    return parsePositiveInt(key, value);
+  }
+
+  private static int parsePositiveInt(final String key, final String value) {
+    try {
+      return PositiveNumber.fromString(value).getValue();
+    } catch (IllegalArgumentException e) {
+      throw new IllegalArgumentException(
+          "Invalid property value, " + key + " should be a positive integer: " + value);
+    }
+  }
+
+  /**
+   * Gets long.
+   *
+   * @param json the json
+   * @param key the key
+   * @return the long
+   */
   public static OptionalLong getLong(final ObjectNode json, final String key) {
     return getValue(json, key)
         .filter(jsonNode -> validateType(jsonNode, JsonNodeType.NUMBER))
@@ -133,34 +222,91 @@ public static OptionalLong getLong(final ObjectNode json, final String key) {
         .orElse(OptionalLong.empty());
   }
 
+  /**
+   * Gets long.
+   *
+   * @param json the json
+   * @param key the key
+   * @param defaultValue the default value
+   * @return the long
+   */
   public static long getLong(final ObjectNode json, final String key, final long defaultValue) {
     return getLong(json, key).orElse(defaultValue);
   }
 
+  /**
+   * Gets boolean.
+   *
+   * @param node the node
+   * @param key the key
+   * @return the boolean
+   */
   public static Optional<Boolean> getBoolean(final ObjectNode node, final String key) {
     return getValue(node, key)
         .filter(jsonNode -> validateType(jsonNode, JsonNodeType.BOOLEAN))
         .map(JsonNode::asBoolean);
   }
 
+  /**
+   * Gets boolean.
+   *
+   * @param node the node
+   * @param key the key
+   * @param defaultValue the default value
+   * @return the boolean
+   */
   public static boolean getBoolean(
       final ObjectNode node, final String key, final boolean defaultValue) {
     return getBoolean(node, key).orElse(defaultValue);
   }
 
+  /**
+   * Create empty object node object node.
+   *
+   * @return the object node
+   */
   public static ObjectNode createEmptyObjectNode() {
     final ObjectMapper mapper = getObjectMapper();
     return mapper.createObjectNode();
   }
 
+  /**
+   * Create empty array node array node.
+   *
+   * @return the array node
+   */
+  public static ArrayNode createEmptyArrayNode() {
+    final ObjectMapper mapper = getObjectMapper();
+    return mapper.createArrayNode();
+  }
+
+  /**
+   * Object node from map object node.
+   *
+   * @param map the map
+   * @return the object node
+   */
   public static ObjectNode objectNodeFromMap(final Map<String, Object> map) {
     return (ObjectNode) getObjectMapper().valueToTree(map);
   }
 
+  /**
+   * Object node from string object node.
+   *
+   * @param jsonData the json data
+   * @return the object node
+   */
   public static ObjectNode objectNodeFromString(final String jsonData) {
     return objectNodeFromString(jsonData, false);
   }
 
+  /**
+   * Object node from string object node.
+   *
+   * @param jsonData the json data
+   * @param allowComments true to allow comments
+   * @return the object node
+   */
   public static ObjectNode objectNodeFromString(
       final String jsonData, final boolean allowComments) {
     final ObjectMapper objectMapper = new ObjectMapper();
@@ -175,10 +321,25 @@ public static ObjectNode objectNodeFromString(
     }
   }
 
+  /**
+   * Gets json.
+   *
+   * @param objectNode the object node
+   * @return the json
+   * @throws JsonProcessingException the json processing exception
+   */
   public static String getJson(final Object objectNode) throws JsonProcessingException {
     return getJson(objectNode, true);
   }
 
+  /**
+   * Gets json.
+   *
+   * @param objectNode the object node
+   * @param prettyPrint true for pretty print
+   * @return the json
+   * @throws JsonProcessingException the json processing exception
+   */
   public static String getJson(final Object objectNode, final boolean prettyPrint)
       throws JsonProcessingException {
     final ObjectMapper mapper = getObjectMapper();
@@ -189,14 +350,34 @@ public static String getJson(final Object objectNode, final boolean prettyPrint)
     }
   }
 
+  /**
+   * Gets object mapper.
+   *
+   * @return the object mapper
+   */
   public static ObjectMapper getObjectMapper() {
     return new ObjectMapper();
   }
 
+  /**
+   * Gets object node.
+   *
+   * @param json the json
+   * @param fieldKey the field key
+   * @return the object node
+   */
   public static Optional<ObjectNode> getObjectNode(final ObjectNode json, final String fieldKey) {
     return getObjectNode(json, fieldKey, true);
   }
 
+  /**
+   * Gets object node.
+   *
+   * @param json the json
+   * @param fieldKey the field key
+   * @param strict true for strict mode
+   * @return the object node
+   */
   public static Optional<ObjectNode> getObjectNode(
       final ObjectNode json, final String fieldKey, final boolean strict) {
     final JsonNode obj = json.get(fieldKey);
@@ -215,10 +396,25 @@ public static Optional<ObjectNode> getObjectNode(
     return Optional.of((ObjectNode) obj);
   }
 
+  /**
+   * Gets array node.
+   *
+   * @param json the json
+   * @param fieldKey the field key
+   * @return the array node
+   */
   public static Optional<ArrayNode> getArrayNode(final ObjectNode json, final String fieldKey) {
     return getArrayNode(json, fieldKey, true);
   }
 
+  /**
+   * Gets array node.
+   *
+   * @param json the json
+   * @param fieldKey the field key
+   * @param strict true for strict mode
+   * @return the array node
+   */
   public static Optional<ArrayNode> getArrayNode(
       final ObjectNode json, final String fieldKey, final boolean strict) {
     final JsonNode obj = json.get(fieldKey);
diff --git a/config/src/main/java/org/hyperledger/besu/config/MergeConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/MergeConfigOptions.java
new file mode 100644
index 00000000000..bfc9cd3e784
--- /dev/null
+++ b/config/src/main/java/org/hyperledger/besu/config/MergeConfigOptions.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.config;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/** The Merge config options. */
+public class MergeConfigOptions {
+  private static final AtomicBoolean mergeEnabled = new AtomicBoolean(false);
+
+  /**
+   * Enables merge.
+   *
+   * @param bool true to enable merge, false otherwise.
+   */
+  public static void setMergeEnabled(final boolean bool) {
+    mergeEnabled.set(bool);
+  }
+
+  /**
+   * Is merge enabled.
+   *
+   * @return true if merge is enabled, false otherwise.
+   */
+  public static boolean isMergeEnabled() {
+    return mergeEnabled.get();
+  }
+}
diff --git a/config/src/main/java/org/hyperledger/besu/config/PowAlgorithm.java b/config/src/main/java/org/hyperledger/besu/config/PowAlgorithm.java
new file mode 100644
index 00000000000..6a3f737a421
--- /dev/null
+++ b/config/src/main/java/org/hyperledger/besu/config/PowAlgorithm.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.config;
+
+/** An enumeration of supported Proof-of-work algorithms. */
+public enum PowAlgorithm {
+  /** Unsupported pow algorithm. */
+  UNSUPPORTED,
+  /** Ethash pow algorithm. */
+  ETHASH;
+
+  /**
+   * From string pow algorithm.
+   *
+   * @param str pow algorithm as string
+   * @return the pow algorithm interface. null if not valid enum.
+   */
+  public static PowAlgorithm fromString(final String str) {
+    for (final PowAlgorithm powAlgorithm : PowAlgorithm.values()) {
+      if (powAlgorithm.name().equalsIgnoreCase(str)) {
+        return powAlgorithm;
+      }
+    }
+    return null;
+  }
+}
diff --git a/config/src/main/java/org/hyperledger/besu/config/QbftConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/QbftConfigOptions.java
new file mode 100644
index 00000000000..65135954341
--- /dev/null
+++ b/config/src/main/java/org/hyperledger/besu/config/QbftConfigOptions.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.config;
+
+import java.util.Optional;
+import java.util.OptionalLong;
+
+/** The interface Qbft config options. */
+public interface QbftConfigOptions extends BftConfigOptions {
+
+  /**
+   * Gets validator contract address.
+   *
+   * @return the validator contract address
+   */
+  Optional<String> getValidatorContractAddress();
+
+  /**
+   * Is validator contract mode.
+   *
+   * @return true of validator contract mode, false otherwise.
+   */
+  default boolean isValidatorContractMode() {
+    return getValidatorContractAddress().isPresent();
+  }
+
+  /**
+   * Gets start block.
+   *
+   * @return the start block
+   */
+  OptionalLong getStartBlock();
+}
diff --git a/config/src/main/java/org/hyperledger/besu/config/QbftFork.java b/config/src/main/java/org/hyperledger/besu/config/QbftFork.java
new file mode 100644
index 00000000000..b080a557499
--- /dev/null
+++ b/config/src/main/java/org/hyperledger/besu/config/QbftFork.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.config;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+/** The Qbft fork. */
+public class QbftFork extends BftFork {
+
+  /** The enum Validator selection mode. */
+  public enum VALIDATOR_SELECTION_MODE {
+    /** Blockheader validator selection mode. */
+    BLOCKHEADER,
+    /** Contract validator selection mode. */
+    CONTRACT
+  }
+
+  /** The constant VALIDATOR_SELECTION_MODE_KEY. */
+  public static final String VALIDATOR_SELECTION_MODE_KEY = "validatorselectionmode";
+  /** The constant VALIDATOR_CONTRACT_ADDRESS_KEY. */
+  public static final String VALIDATOR_CONTRACT_ADDRESS_KEY = "validatorcontractaddress";
+
+  /**
+   * Instantiates a new Qbft fork.
+   *
+   * @param forkConfigRoot the fork config root
+   */
+  @JsonCreator
+  public QbftFork(final ObjectNode forkConfigRoot) {
+    super(forkConfigRoot);
+  }
+
+  /**
+   * Gets validator selection mode.
+   *
+   * @return the validator selection mode
+   */
+  public Optional<VALIDATOR_SELECTION_MODE> getValidatorSelectionMode() {
+    final Optional<String> mode = JsonUtil.getString(forkConfigRoot, VALIDATOR_SELECTION_MODE_KEY);
+    return mode.flatMap(
+        m ->
+            Arrays.stream(VALIDATOR_SELECTION_MODE.values())
+                .filter(v -> v.name().equalsIgnoreCase(m))
+                .findFirst());
+  }
+
+  /**
+   * Gets validator contract address.
+   *
+   * @return the validator contract address
+   */
+  public Optional<String> getValidatorContractAddress() {
+    return JsonUtil.getString(forkConfigRoot, VALIDATOR_CONTRACT_ADDRESS_KEY);
+  }
+}
diff --git a/config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java
index 67ea6a4c843..affb9ecae40 100644
--- a/config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java
+++ b/config/src/main/java/org/hyperledger/besu/config/StubGenesisConfigOptions.java
@@ -14,7 +14,9 @@
  */
 package org.hyperledger.besu.config;
 
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 
 import java.math.BigInteger;
 import java.util.Collections;
@@ -25,8 +27,10 @@
 import java.util.OptionalLong;
 
 import com.google.common.collect.ImmutableMap;
+import org.apache.tuweni.units.bigints.UInt256;
 
-public class StubGenesisConfigOptions implements GenesisConfigOptions {
+/** The Stub genesis config options. */
+public class StubGenesisConfigOptions implements GenesisConfigOptions, Cloneable {
 
   private OptionalLong homesteadBlockNumber = OptionalLong.empty();
   private OptionalLong daoForkBlock = OptionalLong.empty();
@@ -34,26 +38,54 @@ public class StubGenesisConfigOptions implements GenesisConfigOptions {
   private OptionalLong spuriousDragonBlockNumber = OptionalLong.empty();
   private OptionalLong byzantiumBlockNumber = OptionalLong.empty();
   private OptionalLong constantinopleBlockNumber = OptionalLong.empty();
-  private OptionalLong constantinopleFixBlockNumber = OptionalLong.empty();
+  private OptionalLong petersburgBlockNumber = OptionalLong.empty();
   private OptionalLong istanbulBlockNumber = OptionalLong.empty();
   private OptionalLong muirGlacierBlockNumber = OptionalLong.empty();
   private OptionalLong berlinBlockNumber = OptionalLong.empty();
-  // TODO EIP-1559 change for the actual fork name when known
-  private final OptionalLong eip1559BlockNumber = OptionalLong.empty();
-  private final OptionalLong classicForkBlock = OptionalLong.empty();
-  private final OptionalLong ecip1015BlockNumber = OptionalLong.empty();
-  private final OptionalLong diehardBlockNumber = OptionalLong.empty();
-  private final OptionalLong gothamBlockNumber = OptionalLong.empty();
-  private final OptionalLong defuseDifficultyBombBlockNumber = OptionalLong.empty();
-  private final OptionalLong atlantisBlockNumber = OptionalLong.empty();
-  private final OptionalLong aghartaBlockNumber = OptionalLong.empty();
-  private final OptionalLong phoenixBlockNumber = OptionalLong.empty();
-  private final OptionalLong thanosBlockNumber = OptionalLong.empty();
   private final OptionalLong lacchainPostQuantumBlockNumber = OptionalLong.empty();
+  private OptionalLong londonBlockNumber = OptionalLong.empty();
+  private OptionalLong arrowGlacierBlockNumber = OptionalLong.empty();
+  private OptionalLong grayGlacierBlockNumber = OptionalLong.empty();
+  private OptionalLong mergeNetSplitBlockNumber = OptionalLong.empty();
+  private OptionalLong shanghaiTime = OptionalLong.empty();
+  private OptionalLong cancunTime = OptionalLong.empty();
+  private OptionalLong futureEipsTime = OptionalLong.empty();
+  private OptionalLong experimentalEipsTime = OptionalLong.empty();
+  private OptionalLong terminalBlockNumber = OptionalLong.empty();
+  private Optional<Hash> terminalBlockHash = Optional.empty();
+  private Optional<UInt256> terminalTotalDifficulty = Optional.empty();
+
+  private Optional<Wei> baseFeePerGas = Optional.empty();
+  private OptionalLong classicForkBlock = OptionalLong.empty();
+  private OptionalLong ecip1015BlockNumber = OptionalLong.empty();
+  private OptionalLong diehardBlockNumber = OptionalLong.empty();
+  private OptionalLong gothamBlockNumber = OptionalLong.empty();
+  private OptionalLong defuseDifficultyBombBlockNumber = OptionalLong.empty();
+  private OptionalLong atlantisBlockNumber = OptionalLong.empty();
+  private OptionalLong aghartaBlockNumber = OptionalLong.empty();
+  private OptionalLong phoenixBlockNumber = OptionalLong.empty();
+  private OptionalLong thanosBlockNumber = OptionalLong.empty();
+  private OptionalLong magnetoBlockNumber = OptionalLong.empty();
+  private OptionalLong mystiqueBlockNumber = OptionalLong.empty();
   private Optional<BigInteger> chainId = Optional.empty();
   private OptionalInt contractSizeLimit = OptionalInt.empty();
   private OptionalInt stackSizeLimit = OptionalInt.empty();
   private final OptionalLong ecip1017EraRounds = OptionalLong.empty();
+  private Optional<String> ecCurve = Optional.empty();
+  private QbftConfigOptions qbftConfigOptions = JsonQbftConfigOptions.DEFAULT;
+  private BftConfigOptions bftConfigOptions = JsonBftConfigOptions.DEFAULT;
+  private TransitionsConfigOptions transitions = TransitionsConfigOptions.DEFAULT;
+  private static final DiscoveryOptions DISCOVERY_OPTIONS = DiscoveryOptions.DEFAULT;
+  private boolean zeroBaseFee = false;
+
+  @Override
+  public StubGenesisConfigOptions clone() {
+    try {
+      return (StubGenesisConfigOptions) super.clone();
+    } catch (CloneNotSupportedException e) {
+      throw new RuntimeException(e);
+    }
+  }
 
   @Override
   public String getConsensusEngine() {
@@ -81,8 +113,13 @@ public boolean isIbft2() {
   }
 
   @Override
-  public IbftConfigOptions getIbftLegacyConfigOptions() {
-    return IbftConfigOptions.DEFAULT;
+  public boolean isQbft() {
+    return false;
+  }
+
+  @Override
+  public CheckpointConfigOptions getCheckpointOptions() {
+    return CheckpointConfigOptions.DEFAULT;
   }
 
   @Override
@@ -91,8 +128,18 @@ public CliqueConfigOptions getCliqueConfigOptions() {
   }
 
   @Override
-  public IbftConfigOptions getIbft2ConfigOptions() {
-    return IbftConfigOptions.DEFAULT;
+  public BftConfigOptions getBftConfigOptions() {
+    return bftConfigOptions;
+  }
+
+  @Override
+  public QbftConfigOptions getQbftConfigOptions() {
+    return qbftConfigOptions;
+  }
+
+  @Override
+  public DiscoveryOptions getDiscoveryOptions() {
+    return DISCOVERY_OPTIONS;
   }
 
   @Override
@@ -131,8 +178,8 @@ public OptionalLong getConstantinopleBlockNumber() {
   }
 
   @Override
-  public OptionalLong getConstantinopleFixBlockNumber() {
-    return constantinopleFixBlockNumber;
+  public OptionalLong getPetersburgBlockNumber() {
+    return petersburgBlockNumber;
   }
 
   @Override
@@ -147,13 +194,67 @@ public OptionalLong getMuirGlacierBlockNumber() {
 
   @Override
   public OptionalLong getBerlinBlockNumber() {
-    return ExperimentalEIPs.berlinEnabled ? berlinBlockNumber : OptionalLong.empty();
+    return berlinBlockNumber;
+  }
+
+  @Override
+  public OptionalLong getLondonBlockNumber() {
+    return londonBlockNumber;
+  }
+
+  @Override
+  public OptionalLong getArrowGlacierBlockNumber() {
+    return arrowGlacierBlockNumber;
+  }
+
+  @Override
+  public OptionalLong getGrayGlacierBlockNumber() {
+    return grayGlacierBlockNumber;
+  }
+
+  @Override
+  public OptionalLong getMergeNetSplitBlockNumber() {
+    return mergeNetSplitBlockNumber;
+  }
+
+  @Override
+  public OptionalLong getShanghaiTime() {
+    return shanghaiTime;
+  }
+
+  @Override
+  public OptionalLong getCancunTime() {
+    return cancunTime;
+  }
+
+  @Override
+  public OptionalLong getFutureEipsTime() {
+    return futureEipsTime;
+  }
+
+  @Override
+  public OptionalLong getExperimentalEipsTime() {
+    return experimentalEipsTime;
+  }
+
+  @Override
+  public Optional<Wei> getBaseFeePerGas() {
+    return baseFeePerGas;
+  }
+
+  @Override
+  public Optional<UInt256> getTerminalTotalDifficulty() {
+    return terminalTotalDifficulty;
+  }
+
+  @Override
+  public OptionalLong getTerminalBlockNumber() {
+    return terminalBlockNumber;
   }
 
   @Override
-  // TODO EIP-1559 change for the actual fork name when known
-  public OptionalLong getEIP1559BlockNumber() {
-    return ExperimentalEIPs.eip1559Enabled ? eip1559BlockNumber : OptionalLong.empty();
+  public Optional<Hash> getTerminalBlockHash() {
+    return terminalBlockHash;
   }
 
   @Override
@@ -205,6 +306,14 @@ public OptionalLong getThanosBlockNumber() {
   public OptionalLong getLacchainPostQuantumBlockNumber() {
     return lacchainPostQuantumBlockNumber;
   }
+  public OptionalLong getMagnetoBlockNumber() {
+    return magnetoBlockNumber;
+  }
+
+  @Override
+  public OptionalLong getMystiqueBlockNumber() {
+    return mystiqueBlockNumber;
+  }
 
   @Override
   public OptionalInt getContractSizeLimit() {
@@ -229,49 +338,60 @@ public Optional<BigInteger> getChainId() {
   @Override
   public Map<String, Object> asMap() {
     final ImmutableMap.Builder<String, Object> builder = ImmutableMap.builder();
-    getChainId().ifPresent(chainId -> builder.put("chainId", chainId));
+    getChainId().ifPresent(id -> builder.put("chainId", id));
+
+    // mainnet fork blocks
     getHomesteadBlockNumber().ifPresent(l -> builder.put("homesteadBlock", l));
-    getDaoForkBlock()
-        .ifPresent(
-            l -> {
-              builder.put("daoForkBlock", l);
-              builder.put("daoForkSupport", Boolean.TRUE);
-            });
+    getDaoForkBlock().ifPresent(l -> builder.put("daoForkBlock", l));
     getTangerineWhistleBlockNumber().ifPresent(l -> builder.put("eip150Block", l));
-    getSpuriousDragonBlockNumber()
-        .ifPresent(
-            l -> {
-              builder.put("eip155Block", l);
-              builder.put("eip158Block", l);
-            });
+    getSpuriousDragonBlockNumber().ifPresent(l -> builder.put("eip158Block", l));
     getByzantiumBlockNumber().ifPresent(l -> builder.put("byzantiumBlock", l));
     getConstantinopleBlockNumber().ifPresent(l -> builder.put("constantinopleBlock", l));
-    getConstantinopleFixBlockNumber().ifPresent(l -> builder.put("petersburgBlock", l));
+    getPetersburgBlockNumber().ifPresent(l -> builder.put("petersburgBlock", l));
     getIstanbulBlockNumber().ifPresent(l -> builder.put("istanbulBlock", l));
     getMuirGlacierBlockNumber().ifPresent(l -> builder.put("muirGlacierBlock", l));
     getBerlinBlockNumber().ifPresent(l -> builder.put("berlinBlock", l));
-    // TODO EIP-1559 change for the actual fork name when known
-    getEIP1559BlockNumber().ifPresent(l -> builder.put("eip1559Block", l));
+    getLondonBlockNumber().ifPresent(l -> builder.put("londonBlock", l));
+    getArrowGlacierBlockNumber().ifPresent(l -> builder.put("arrowGlacierBlock", l));
+    getGrayGlacierBlockNumber().ifPresent(l -> builder.put("grayGlacierBlock", l));
+    getMergeNetSplitBlockNumber().ifPresent(l -> builder.put("mergeNetSplitBlock", l));
+    getShanghaiTime().ifPresent(l -> builder.put("shanghaiTime", l));
+    getCancunTime().ifPresent(l -> builder.put("cancunTime", l));
+    getFutureEipsTime().ifPresent(l -> builder.put("futureEipsTime", l));
+    getExperimentalEipsTime().ifPresent(l -> builder.put("experimentalEipsTime", l));
+    getTerminalBlockNumber().ifPresent(l -> builder.put("terminalBlockNumber", l));
+    getTerminalBlockHash().ifPresent(h -> builder.put("terminalBlockHash", h));
+    // classic fork blocks
+    getClassicForkBlock().ifPresent(l -> builder.put("classicForkBlock", l));
+    getEcip1015BlockNumber().ifPresent(l -> builder.put("ecip1015Block", l));
+    getDieHardBlockNumber().ifPresent(l -> builder.put("dieHardBlock", l));
+    getGothamBlockNumber().ifPresent(l -> builder.put("gothamBlock", l));
+    getDefuseDifficultyBombBlockNumber().ifPresent(l -> builder.put("ecip1041Block", l));
+    getAtlantisBlockNumber().ifPresent(l -> builder.put("atlantisBlock", l));
+    getAghartaBlockNumber().ifPresent(l -> builder.put("aghartaBlock", l));
+    getPhoenixBlockNumber().ifPresent(l -> builder.put("phoenixBlock", l));
+    getThanosBlockNumber().ifPresent(l -> builder.put("thanosBlock", l));
+    getMagnetoBlockNumber().ifPresent(l -> builder.put("magnetoBlock", l));
+    getMystiqueBlockNumber().ifPresent(l -> builder.put("mystiqueBlock", l));
+
     getContractSizeLimit().ifPresent(l -> builder.put("contractSizeLimit", l));
     getEvmStackSize().ifPresent(l -> builder.put("evmStackSize", l));
+    getDepositContractAddress().ifPresent(l -> builder.put("depositContractAddress", l));
     if (isClique()) {
       builder.put("clique", getCliqueConfigOptions().asMap());
     }
     if (isEthHash()) {
       builder.put("ethash", getEthashConfigOptions().asMap());
     }
-    if (isIbftLegacy()) {
-      builder.put("ibft", getIbftLegacyConfigOptions().asMap());
-    }
     if (isIbft2()) {
-      builder.put("ibft2", getIbft2ConfigOptions().asMap());
+      builder.put("ibft2", getBftConfigOptions().asMap());
     }
     return builder.build();
   }
 
   @Override
   public TransitionsConfigOptions getTransitions() {
-    return TransitionsConfigOptions.DEFAULT;
+    return transitions;
   }
 
   @Override
@@ -285,72 +405,484 @@ public OptionalLong getQip714BlockNumber() {
   }
 
   @Override
-  public List<Long> getForks() {
+  public PowAlgorithm getPowAlgorithm() {
+    return isEthHash() ? PowAlgorithm.ETHASH : PowAlgorithm.UNSUPPORTED;
+  }
+
+  @Override
+  public Optional<String> getEcCurve() {
+    return ecCurve;
+  }
+
+  @Override
+  public boolean isZeroBaseFee() {
+    return zeroBaseFee;
+  }
+
+  @Override
+  public List<Long> getForkBlockNumbers() {
+    return Collections.emptyList();
+  }
+
+  @Override
+  public List<Long> getForkBlockTimestamps() {
     return Collections.emptyList();
   }
 
+  @Override
+  public Optional<Address> getDepositContractAddress() {
+    return Optional.empty();
+  }
+
+  /**
+   * Homestead block stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
   public StubGenesisConfigOptions homesteadBlock(final long blockNumber) {
     homesteadBlockNumber = OptionalLong.of(blockNumber);
     return this;
   }
 
+  /**
+   * Dao fork block stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
   public StubGenesisConfigOptions daoForkBlock(final long blockNumber) {
     daoForkBlock = OptionalLong.of(blockNumber);
     return this;
   }
 
+  /**
+   * Eip 150 block stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
   public StubGenesisConfigOptions eip150Block(final long blockNumber) {
     tangerineWhistleBlockNumber = OptionalLong.of(blockNumber);
     return this;
   }
 
+  /**
+   * Eip 158 block stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
   public StubGenesisConfigOptions eip158Block(final long blockNumber) {
     spuriousDragonBlockNumber = OptionalLong.of(blockNumber);
     return this;
   }
 
+  /**
+   * Byzantium block stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
   public StubGenesisConfigOptions byzantiumBlock(final long blockNumber) {
     byzantiumBlockNumber = OptionalLong.of(blockNumber);
     return this;
   }
 
+  /**
+   * Constantinople block stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
   public StubGenesisConfigOptions constantinopleBlock(final long blockNumber) {
     constantinopleBlockNumber = OptionalLong.of(blockNumber);
     return this;
   }
 
-  public StubGenesisConfigOptions constantinopleFixBlock(final long blockNumber) {
-    constantinopleFixBlockNumber = OptionalLong.of(blockNumber);
+  /**
+   * Petersburg block stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions petersburgBlock(final long blockNumber) {
+    petersburgBlockNumber = OptionalLong.of(blockNumber);
     return this;
   }
 
+  /**
+   * Istanbul block stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
   public StubGenesisConfigOptions istanbulBlock(final long blockNumber) {
     istanbulBlockNumber = OptionalLong.of(blockNumber);
     return this;
   }
 
+  /**
+   * Muir glacier block stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
   public StubGenesisConfigOptions muirGlacierBlock(final long blockNumber) {
     muirGlacierBlockNumber = OptionalLong.of(blockNumber);
     return this;
   }
 
+  /**
+   * Berlin block stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
   public StubGenesisConfigOptions berlinBlock(final long blockNumber) {
     berlinBlockNumber = OptionalLong.of(blockNumber);
     return this;
   }
 
+  /**
+   * London block stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions londonBlock(final long blockNumber) {
+    londonBlockNumber = OptionalLong.of(blockNumber);
+    return this;
+  }
+
+  /**
+   * Arrow glacier block stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions arrowGlacierBlock(final long blockNumber) {
+    arrowGlacierBlockNumber = OptionalLong.of(blockNumber);
+    return this;
+  }
+
+  /**
+   * Gray glacier block stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions grayGlacierBlock(final long blockNumber) {
+    grayGlacierBlockNumber = OptionalLong.of(blockNumber);
+    return this;
+  }
+
+  /**
+   * Merge net split block stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions mergeNetSplitBlock(final long blockNumber) {
+    mergeNetSplitBlockNumber = OptionalLong.of(blockNumber);
+    return this;
+  }
+
+  /**
+   * Shanghai time stub genesis config options.
+   *
+   * @param timestamp the timestamp
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions shanghaiTime(final long timestamp) {
+    shanghaiTime = OptionalLong.of(timestamp);
+    return this;
+  }
+
+  /**
+   * Cancun time.
+   *
+   * @param timestamp the timestamp
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions cancunTime(final long timestamp) {
+    cancunTime = OptionalLong.of(timestamp);
+    return this;
+  }
+
+  /**
+   * Future EIPs Time block.
+   *
+   * @param timestamp the block timestamp
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions futureEipsTime(final long timestamp) {
+    futureEipsTime = OptionalLong.of(timestamp);
+    return this;
+  }
+
+  /**
+   * Experimental EIPs Time block.
+   *
+   * @param timestamp the block timestamp
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions experimentalEipsTime(final long timestamp) {
+    experimentalEipsTime = OptionalLong.of(timestamp);
+    return this;
+  }
+
+  /**
+   * Terminal total difficulty stub genesis config options.
+   *
+   * @param updatedTerminalTotalDifficulty the updated terminal total difficulty
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions terminalTotalDifficulty(
+      final UInt256 updatedTerminalTotalDifficulty) {
+    terminalTotalDifficulty = Optional.of(updatedTerminalTotalDifficulty);
+    return this;
+  }
+
+  /**
+   * Terminal block number stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions terminalBlockNumber(final long blockNumber) {
+    terminalBlockNumber = OptionalLong.of(blockNumber);
+    return this;
+  }
+
+  /**
+   * Terminal block hash stub genesis config options.
+   *
+   * @param blockHash the block hash
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions terminalBlockHash(final Hash blockHash) {
+    terminalBlockHash = Optional.of(blockHash);
+    return this;
+  }
+
+  /**
+   * Base fee per gas stub genesis config options.
+   *
+   * @param baseFeeOverride the base fee override
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions baseFeePerGas(final long baseFeeOverride) {
+    baseFeePerGas = Optional.of(Wei.of(baseFeeOverride));
+    return this;
+  }
+
+  /**
+   * Zero base fee per gas stub genesis config options.
+   *
+   * @param zeroBaseFee the zero base fee override
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions zeroBaseFee(final boolean zeroBaseFee) {
+    this.zeroBaseFee = zeroBaseFee;
+    return this;
+  }
+
+  /**
+   * Classic fork block stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions classicForkBlock(final long blockNumber) {
+    classicForkBlock = OptionalLong.of(blockNumber);
+    return this;
+  }
+
+  /**
+   * Ecip 1015 stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions ecip1015(final long blockNumber) {
+    ecip1015BlockNumber = OptionalLong.of(blockNumber);
+    return this;
+  }
+
+  /**
+   * Die hard stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions dieHard(final long blockNumber) {
+    diehardBlockNumber = OptionalLong.of(blockNumber);
+    return this;
+  }
+
+  /**
+   * Gotham stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions gotham(final long blockNumber) {
+    gothamBlockNumber = OptionalLong.of(blockNumber);
+    return this;
+  }
+
+  /**
+   * Defuse difficulty bomb stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions defuseDifficultyBomb(final long blockNumber) {
+    defuseDifficultyBombBlockNumber = OptionalLong.of(blockNumber);
+    return this;
+  }
+
+  /**
+   * Atlantis stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions atlantis(final long blockNumber) {
+    atlantisBlockNumber = OptionalLong.of(blockNumber);
+    return this;
+  }
+
+  /**
+   * Agharta stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions agharta(final long blockNumber) {
+    aghartaBlockNumber = OptionalLong.of(blockNumber);
+    return this;
+  }
+
+  /**
+   * Phoenix stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions phoenix(final long blockNumber) {
+    phoenixBlockNumber = OptionalLong.of(blockNumber);
+    return this;
+  }
+
+  /**
+   * Thanos stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions thanos(final long blockNumber) {
+    thanosBlockNumber = OptionalLong.of(blockNumber);
+    return this;
+  }
+
+  /**
+   * Magneto stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions magneto(final long blockNumber) {
+    magnetoBlockNumber = OptionalLong.of(blockNumber);
+    return this;
+  }
+
+  /**
+   * Mystique stub genesis config options.
+   *
+   * @param blockNumber the block number
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions mystique(final long blockNumber) {
+    mystiqueBlockNumber = OptionalLong.of(blockNumber);
+    return this;
+  }
+
+  /**
+   * Chain id stub genesis config options.
+   *
+   * @param chainId the chain id
+   * @return the stub genesis config options
+   */
   public StubGenesisConfigOptions chainId(final BigInteger chainId) {
     this.chainId = Optional.ofNullable(chainId);
     return this;
   }
 
+  /**
+   * Contract size limit stub genesis config options.
+   *
+   * @param contractSizeLimit the contract size limit
+   * @return the stub genesis config options
+   */
   public StubGenesisConfigOptions contractSizeLimit(final int contractSizeLimit) {
     this.contractSizeLimit = OptionalInt.of(contractSizeLimit);
     return this;
   }
 
+  /**
+   * Stack size limit stub genesis config options.
+   *
+   * @param stackSizeLimit the stack size limit
+   * @return the stub genesis config options
+   */
   public StubGenesisConfigOptions stackSizeLimit(final int stackSizeLimit) {
     this.stackSizeLimit = OptionalInt.of(stackSizeLimit);
     return this;
   }
+
+  /**
+   * Ec curve stub genesis config options.
+   *
+   * @param ecCurve the ec curve
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions ecCurve(final Optional<String> ecCurve) {
+    this.ecCurve = ecCurve;
+    return this;
+  }
+
+  /**
+   * Qbft config options stub genesis config options.
+   *
+   * @param qbftConfigOptions the qbft config options
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions qbftConfigOptions(final QbftConfigOptions qbftConfigOptions) {
+    this.qbftConfigOptions = qbftConfigOptions;
+    return this;
+  }
+
+  /**
+   * Bft config options stub genesis config options.
+   *
+   * @param bftConfigOptions the bft config options
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions bftConfigOptions(final BftConfigOptions bftConfigOptions) {
+    this.bftConfigOptions = bftConfigOptions;
+    return this;
+  }
+
+  /**
+   * Transitions stub genesis config options.
+   *
+   * @param transitions the transitions
+   * @return the stub genesis config options
+   */
+  public StubGenesisConfigOptions transitions(final TransitionsConfigOptions transitions) {
+    this.transitions = transitions;
+    return this;
+  }
 }
diff --git a/config/src/main/java/org/hyperledger/besu/config/TransitionsConfigOptions.java b/config/src/main/java/org/hyperledger/besu/config/TransitionsConfigOptions.java
index d53e197b686..0b6687efce0 100644
--- a/config/src/main/java/org/hyperledger/besu/config/TransitionsConfigOptions.java
+++ b/config/src/main/java/org/hyperledger/besu/config/TransitionsConfigOptions.java
@@ -19,47 +19,71 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Function;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.Lists;
 
+/** The Transitions config options. */
 public class TransitionsConfigOptions {
 
-  public static final String IBFT2_FORKS = "ibft2";
-
+  /** The constant DEFAULT. */
   public static final TransitionsConfigOptions DEFAULT =
       new TransitionsConfigOptions(JsonUtil.createEmptyObjectNode());
 
   private final ObjectNode customForkConfigRoot;
 
+  /**
+   * Instantiates a new Transitions config options.
+   *
+   * @param customForkConfigRoot the custom fork config root
+   */
   @JsonCreator
   public TransitionsConfigOptions(final ObjectNode customForkConfigRoot) {
     this.customForkConfigRoot = customForkConfigRoot;
   }
 
-  public List<IbftFork> getIbftForks() {
-    final Optional<ArrayNode> ibftForksNode =
-        JsonUtil.getArrayNode(customForkConfigRoot, IBFT2_FORKS);
+  /**
+   * Gets ibft forks.
+   *
+   * @return the ibft forks
+   */
+  public List<BftFork> getIbftForks() {
+    return getBftForks("ibft2", BftFork::new);
+  }
+
+  /**
+   * Gets qbft forks.
+   *
+   * @return the qbft forks
+   */
+  public List<QbftFork> getQbftForks() {
+    return getBftForks("qbft", QbftFork::new);
+  }
+
+  private <T> List<T> getBftForks(
+      final String fieldKey, final Function<ObjectNode, T> forkConstructor) {
+    final Optional<ArrayNode> bftForksNode = JsonUtil.getArrayNode(customForkConfigRoot, fieldKey);
 
-    if (ibftForksNode.isEmpty()) {
+    if (bftForksNode.isEmpty()) {
       return emptyList();
     }
 
-    final List<IbftFork> ibftForks = Lists.newArrayList();
+    final List<T> bftForks = Lists.newArrayList();
 
-    ibftForksNode
+    bftForksNode
         .get()
         .elements()
         .forEachRemaining(
             node -> {
               if (!node.isObject()) {
-                throw new IllegalArgumentException("Ibft2 fork is illegally formatted.");
+                throw new IllegalArgumentException("Bft fork is illegally formatted.");
               }
-              ibftForks.add(new IbftFork((ObjectNode) node));
+              bftForks.add(forkConstructor.apply((ObjectNode) node));
             });
 
-    return Collections.unmodifiableList(ibftForks);
+    return Collections.unmodifiableList(bftForks);
   }
 }
diff --git a/config/src/main/java/org/hyperledger/besu/config/experimental/ExperimentalEIPs.java b/config/src/main/java/org/hyperledger/besu/config/experimental/ExperimentalEIPs.java
deleted file mode 100644
index c4ca40b8c5b..00000000000
--- a/config/src/main/java/org/hyperledger/besu/config/experimental/ExperimentalEIPs.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.config.experimental;
-
-import picocli.CommandLine.Option;
-
-/**
- * Flags defined in this class must be used with caution, and strictly reserved to experimental
- * EIPs.
- */
-public class ExperimentalEIPs {
-  // To make it easier for tests to reset the value to default
-  public static final boolean EIP1559_ENABLED_DEFAULT_VALUE = false;
-
-  @Option(
-      hidden = true,
-      names = {"--Xeip1559-enabled"},
-      description = "Enable experimental EIP-1559 fee market change (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  public static boolean eip1559Enabled = EIP1559_ENABLED_DEFAULT_VALUE;
-
-  // To make it easier for tests to reset the value to default
-  public static final boolean BERLIN_ENABLED_DEFAULT_VALUE = false;
-
-  @Option(
-      hidden = true,
-      names = {"--Xberlin-enabled"},
-      description = "Enable non-finalized Berlin features (default: ${DEFAULT-VALUE})",
-      arity = "1")
-  public static boolean berlinEnabled = BERLIN_ENABLED_DEFAULT_VALUE;
-
-  public static void eip1559MustBeEnabled() {
-    if (!eip1559Enabled) {
-      throw new RuntimeException("EIP-1559 feature flag must be enabled --Xeip1559-enabled");
-    }
-  }
-
-  @Option(
-      hidden = true,
-      names = {"--Xeip1559-basefee-max-change-denominator"},
-      arity = "1")
-  public static Long basefeeMaxChangeDenominator = 8L;
-
-  @Option(
-      hidden = true,
-      names = {"--Xeip1559-initial-base-fee"},
-      arity = "1")
-  public static Long initialBasefee = 1000000000L;
-
-  @Option(
-      hidden = true,
-      names = {"--Xeip1559-slack-coefficient"},
-      arity = "1")
-  public static Long slackCoefficient = 2L;
-}
diff --git a/config/src/main/resources/classic.json b/config/src/main/resources/classic.json
index 10434953bbe..efbc5be4fcf 100644
--- a/config/src/main/resources/classic.json
+++ b/config/src/main/resources/classic.json
@@ -4,15 +4,52 @@
     "homesteadBlock": 1150000,
     "classicForkBlock": 1920000,
     "ecip1015Block": 2500000,
-    "diehardBlock": 3000000,
+    "dieHardBlock": 3000000,
     "gothamBlock": 5000000,
     "ecip1041Block": 5900000,
     "atlantisBlock": 8772000,
     "aghartaBlock": 9573000,
     "phoenixBlock": 10500839,
     "thanosBlock": 11700000,
+    "magnetoBlock": 13189133,
+    "mystiqueBlock": 14525000,
     "ethash": {
 
+    },
+    "discovery" : {
+      "bootnodes" : [
+        "enode://8e73168affd8d445edda09c561d607081ca5d7963317caae2702f701eb6546b06948b7f8687a795de576f6a5f33c44828e25a90aa63de18db380a11e660dd06f@159.203.37.80:30303",
+        "enode://2b1ef75e8b7119b6e0294f2e51ead2cf1a5400472452c199e9587727ada99e7e2b1199e36adcad6cbae65dce2410559546e4d83d8c93d45a559e723e56444c03@67.207.93.100:30303",
+        "enode://40b37d729fdc2c29620bbecc61264f450c3e849b5e60d1a362e6af04d84ae36e15120573498bcf56f97aeec18e530113a4d0b55b18e6a6523de8cf5a45e1db23@128.199.160.131:30303",
+        "enode://84e70a981a436efd7d6ae80b5d7ecb82636de77029635a2fb25ccf5d02106172d1cafdd7d8171a136d3fd545e5df94f4d63299eda7f8aec79967aa568ddaa71e@165.22.202.207:30303",
+        "enode://6ec7ac618a7147d8b0e41bc1e63080abfd56a48f50f06095c112e30f72cd5eee262b06aa168cb46ab470d56885f842a1ae44a3714bfb029ced83dab461852062@164.90.218.200:30303",
+        "enode://feba6c4bd757efce4fec0fa5775780d2c209e86231553a72738c2c4e95d0cfd7ac2189f6d30d3c059dd25d93ea060ca28f9936b564f7d04c4270bb60e8e1487b@178.128.171.230:30303",
+        "enode://c0b698f9fb1c5dd3b348c46dffbc524cebbfa48fd03c52523892d43d31d5fabacf4e27f215f5647c96190567975e423a5708cbdcd6441da2705bd85533e78eca@209.97.136.89:30303",
+        "enode://37b20dc1ca0ba428dc07f4bf87c548aa57b53e6883c607a041c88cc0f72c27ef3487b0e94f50e787fff8af5e2baf029cd6105461aa8ec250ccae93d6972107a9@134.209.30.110:30303",
+        "enode://66498ac935f3f54d873de4719bf2d6d61e0c74dd173b547531325bcef331480f9bedece91099810971c8567eeb1ae9f6954b013c47c6dc51355bbbbae65a8c16@54.148.165.1:30303",
+        "enode://73e74ce7426a17aa2d8b5bb64d796ec7dc4dcee2af9bbdd4434394d1e4e52e650b9e39202435fca29ce65c242fd6e59b93ed2cf37f04b645fb23e306273816ad@54.148.165.1:30304",
+        "enode://f1d4bde4cc8df2b8ce46194247450e54b9ba9e69410a30974a894a49273b10c069e7a1ff0ffd4921cb23af9f903d8257ed0133317850e670f2792f20e771a69e@123.57.29.99:30303",
+        "enode://7a7768a1603b6714acd16f646b84a5aff418869b5715fa606172d19e4e7d719699448b7707e30c7b59470b4fb8b38a020135641304861483a7dc3ba988e98490@47.108.52.30:30303",
+        "enode://903fceb08534c13fe1114b0c753a89c6c2ec50f973a85d308456c46721f8904b1cd47df9231114299be84e1e954db06552f791a0facbd86359aa9fd321d2ef50@47.240.106.205:30303",
+        "enode://c7ec057ad9450d2d5c4002e49e53e1d90142acd54128c89e794d11401de026b91aa0e84e3f679fb6b47f7940e08b5e7d21d8178c5fa6ba0f36971098cb566ea6@101.133.229.66:30303",
+        "enode://70b74fef51aa4f36330cc52ac04f16d38e1838f531f58bbc88365ca5fd4a3da6e8ec32316c43f79b157d0575faf53064fd925644d0f620b2b201b028c2b410d0@47.115.150.90:30303",
+        "enode://fa64d1fcb2d4cd1d1606cb940ea2b69fee7dc6c7a85ac4ad05154df1e9ae9616a6a0fa67a59cb15f79346408efa5a4efeba1e5993ddbf4b5cedbda27644a61cf@47.91.30.48:30303",
+        "enode://942bf2f0754972391467765be1d98206926fc8ad0be8a49cd65e1730420c37fa63355bddb0ae5faa1d3505a2edcf8fad1cf00f3c179e244f047ec3a3ba5dacd7@176.9.51.216:30355",
+        "enode://0b0e09d6756b672ac6a8b70895da4fb25090b939578935d4a897497ffaa205e019e068e1ae24ac10d52fa9b8ddb82840d5d990534201a4ad859ee12cb5c91e82@176.9.51.216:30365",
+        "enode://158ac5a4817265d0d8b977660b3dbe9abee5694ed212f7091cbf784ddf47623ed015e1cb54594d10c1c46118747ddabe86ebf569cf24ae91f2daa0f1adaae390@159.203.56.33:30303",
+        "enode://efd48ad0879eeb7f9cb5e50f33f7bc21e805a72e90361f145baaa22dd75d111e7cd9c93f1b7060dcb30aa1b3e620269336dbf32339fea4c18925a4c15fe642df@18.205.66.229:30303",
+        "enode://5fbfb426fbb46f8b8c1bd3dd140f5b511da558cd37d60844b525909ab82e13a25ee722293c829e52cb65c2305b1637fa9a2ea4d6634a224d5f400bfe244ac0de@162.243.55.45:30303",
+        "enode://6dd3ac8147fa82e46837ec8c3223d69ac24bcdbab04b036a3705c14f3a02e968f7f1adfcdb002aacec2db46e625c04bf8b5a1f85bb2d40a479b3cc9d45a444af@104.237.131.102:30303",
+        "enode://b9e893ea9cb4537f4fed154233005ae61b441cd0ecd980136138c304fefac194c25a16b73dac05fc66a4198d0c15dd0f33af99b411882c68a019dfa6bb703b9d@18.130.93.66:30303",
+        "enode://3fe9705a02487baea45c1ffebfa4d84819f5f1e68a0dbc18031553242a6a08e39499b61e361a52c2a92f9553efd63763f6fdd34692be0d4ba6823bb2fc346009@178.62.238.75:30303",
+        "enode://d50facc65e46bda6ff594b6e95491efa16e067de41ae96571d9f3cb853d538c44864496fa5e4df10115f02bbbaf47853f932e110a44c89227da7c30e96840596@188.166.163.187:30303",
+        "enode://a0d5c589dc02d008fe4237da9877a5f1daedee0227ab612677eabe323520f003eb5e311af335de9f7964c2092bbc2b3b7ab1cce5a074d8346959f0868b4e366e@46.101.78.44:30303",
+        "enode://c071d96b0c0f13006feae3977fb1b3c2f62caedf643df9a3655bc1b60f777f05e69a4e58bf3547bb299210092764c56df1e08380e91265baa845dca8bc0a71da@68.183.99.5:30303",
+        "enode://83b33409349ffa25e150555f7b4f8deebc68f3d34d782129dc3c8ba07b880c209310a4191e1725f2f6bef59bce9452d821111eaa786deab08a7e6551fca41f4f@206.189.68.191:30303",
+        "enode://0daae2a30f2c73b0b257746587136efb8e3479496f7ea1e943eeb9a663b72dd04582f699f7010ee02c57fc45d1f09568c20a9050ff937f9139e2973ddd98b87b@159.89.169.103:30303",
+        "enode://50808461dd73b3d70537e4c1e5fafd1132b3a90f998399af9205f8889987d62096d4e853813562dd43e7270a71c9d9d4e4dd73a534fdb22fbac98c389c1a7362@178.128.55.119:30303",
+        "enode://5cd218959f8263bc3721d7789070806b0adff1a0ed3f95ec886fb469f9362c7507e3b32b256550b9a7964a23a938e8d42d45a0c34b332bfebc54b29081e83b93@35.187.57.94:30303"
+      ]
     }
   },
   "nonce": "0x42",
diff --git a/config/src/main/resources/dev.json b/config/src/main/resources/dev.json
index 9e92a1c836e..5fe4b15015f 100644
--- a/config/src/main/resources/dev.json
+++ b/config/src/main/resources/dev.json
@@ -1,14 +1,7 @@
 {
   "config": {
-    "chainId": 2018,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
-    "byzantiumBlock": 0,
-    "constantinopleBlock": 0,
-    "petersburgBlock": 0,
+    "chainId": 1337,
+    "londonBlock": 0,
     "lacchainpqblock": 0,
     "contractSizeLimit": 2147483647,
     "ethash": {
@@ -16,6 +9,7 @@
     }
   },
   "nonce": "0x42",
+  "baseFeePerGas":"0x0",
   "timestamp": "0x0",
   "extraData": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
   "gasLimit": "0x1fffffffffffff",
diff --git a/config/src/main/resources/experimental.json b/config/src/main/resources/experimental.json
new file mode 100644
index 00000000000..43eff251000
--- /dev/null
+++ b/config/src/main/resources/experimental.json
@@ -0,0 +1,40 @@
+{
+  "config": {
+    "chainId": 2023,
+    "experimentalEipsTime": 0,
+    "contractSizeLimit": 2147483647,
+    "ethash": {
+    },
+    "terminalTotalDifficulty": 0,
+    "checkpoint": {
+      "hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "number": 0,
+      "totalDifficulty": "0x0"
+    },
+    "depositContractAddress": "0x00000000219ab540356cbb839cbe05303d7705fa"
+  },
+  "nonce": "0x42",
+  "timestamp": "0x0",
+  "extraData": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
+  "gasLimit": "0x1fffffffffffff",
+  "difficulty": "0x10000",
+  "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "coinbase": "0x0000000000000000000000000000000000000000",
+  "alloc": {
+    "fe3b557e8fb62b89f4916b721be55ceb828dbd73": {
+      "privateKey": "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "0xad78ebc5ac6200000"
+    },
+    "627306090abaB3A6e1400e9345bC60c78a8BEf57": {
+      "privateKey": "c87509a1c067bbde78beb793e6fa76530b6382a4c0241e5e4a9ec0a0f44dc0d3",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "90000000000000000000000"
+    },
+    "f17f52151EbEF6C7334FAD080c5704D77216b732": {
+      "privateKey": "ae6ae8e5ccbfb04590405997ee2d52d2b330726137b875053c36d94e974d162f",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "90000000000000000000000"
+    }
+  }
+}
diff --git a/config/src/main/resources/future.json b/config/src/main/resources/future.json
new file mode 100644
index 00000000000..0d375369834
--- /dev/null
+++ b/config/src/main/resources/future.json
@@ -0,0 +1,38 @@
+{
+  "config": {
+    "chainId": 2022,
+    "futureEipsTime": 0,
+    "ethash": {
+    },
+    "terminalTotalDifficulty": 0,
+    "checkpoint": {
+      "hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "number": 0,
+      "totalDifficulty": "0x0"
+    }
+  },
+  "nonce": "0x42",
+  "timestamp": "0x0",
+  "extraData": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
+  "gasLimit": "0x1fffffffffffff",
+  "difficulty": "0x10000",
+  "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "coinbase": "0x0000000000000000000000000000000000000000",
+  "alloc": {
+    "fe3b557e8fb62b89f4916b721be55ceb828dbd73": {
+      "privateKey": "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "0xad78ebc5ac6200000"
+    },
+    "627306090abaB3A6e1400e9345bC60c78a8BEf57": {
+      "privateKey": "c87509a1c067bbde78beb793e6fa76530b6382a4c0241e5e4a9ec0a0f44dc0d3",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "90000000000000000000000"
+    },
+    "f17f52151EbEF6C7334FAD080c5704D77216b732": {
+      "privateKey": "ae6ae8e5ccbfb04590405997ee2d52d2b330726137b875053c36d94e974d162f",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "90000000000000000000000"
+    }
+  }
+}
diff --git a/config/src/main/resources/goerli.json b/config/src/main/resources/goerli.json
index 61f6fdb0824..5ccc9e420ad 100644
--- a/config/src/main/resources/goerli.json
+++ b/config/src/main/resources/goerli.json
@@ -1,19 +1,33 @@
 {
   "config":{
     "chainId":5,
-    "homesteadBlock":0,
-    "eip150Block":0,
-    "eip150Hash": "0xbf7e331f7f7c1dd2e05159666b3bf8bc7a8a3a9eb1d518969eab529dd9b88c1a",
-    "eip155Block":0,
-    "eip158Block":0,
-    "eip160Block":0,
-    "byzantiumBlock":0,
-    "constantinopleBlock":0,
     "petersburgBlock":0,
     "istanbulBlock":1561651,
+    "berlinBlock":4460644,
+    "londonBlock":5062605,
+    "terminalTotalDifficulty": 10790000,
+    "shanghaiTime": 1678832736,
     "clique":{
       "blockperiodseconds":15,
       "epochlength":30000
+    },
+    "discovery": {
+      "dns": "enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@all.goerli.ethdisco.net",
+      "bootnodes": [
+        "enode://011f758e6552d105183b1761c5e2dea0111bc20fd5f6422bc7f91e0fabbec9a6595caf6239b37feb773dddd3f87240d99d859431891e4a642cf2a0a9e6cbb98a@51.141.78.53:30303",
+        "enode://176b9417f511d05b6b2cf3e34b756cf0a7096b3094572a8f6ef4cdcb9d1f9d00683bf0f83347eebdf3b81c3521c2332086d9592802230bf528eaf606a1d9677b@13.93.54.137:30303",
+        "enode://46add44b9f13965f7b9875ac6b85f016f341012d84f975377573800a863526f4da19ae2c620ec73d11591fa9510e992ecc03ad0751f53cc02f7c7ed6d55c7291@94.237.54.114:30313",
+        "enode://b5948a2d3e9d486c4d75bf32713221c2bd6cf86463302339299bd227dc2e276cd5a1c7ca4f43a0e9122fe9af884efed563bd2a1fd28661f3b5f5ad7bf1de5949@18.218.250.66:30303",
+        "enode://a61215641fb8714a373c80edbfa0ea8878243193f57c96eeb44d0bc019ef295abd4e044fd619bfc4c59731a73fb79afe84e9ab6da0c743ceb479cbb6d263fa91@3.11.147.67:30303",
+        "enode://d4f764a48ec2a8ecf883735776fdefe0a3949eb0ca476bd7bc8d0954a9defe8fea15ae5da7d40b5d2d59ce9524a99daedadf6da6283fca492cc80b53689fb3b3@46.4.99.122:32109",
+        "enode://d2b720352e8216c9efc470091aa91ddafc53e222b32780f505c817ceef69e01d5b0b0797b69db254c586f493872352f5a022b4d8479a00fc92ec55f9ad46a27e@88.99.70.182:30303"
+      ]
+    },
+    "checkpoint": {
+      "hash": "0x50e55c39a725f062af438c5332a5c5bec9a36d02c829ee6ac2cc27d1db719446",
+      "number": 4350000,
+      "totalDifficulty": "0x61DBBF",
+      "_comment": "must be the beginning of a clique epoch"
     }
   },
   "coinbase":"0x0000000000000000000000000000000000000000",
diff --git a/config/src/main/resources/kotti.json b/config/src/main/resources/kotti.json
index d809428702e..e861afd95c8 100644
--- a/config/src/main/resources/kotti.json
+++ b/config/src/main/resources/kotti.json
@@ -5,9 +5,25 @@
     "atlantisBlock": 716617,
     "aghartaBlock": 1705549,
     "phoenixBlock": 2200013,
+    "magnetoBlock": 4368634,
+    "mystiqueBlock": 5578000,
     "clique":{
       "blockperiodseconds":15,
       "epochlength":30000
+    },
+    "discovery": {
+      "bootnodes": [
+        "enode://a59e33ccd2b3e52d578f1fbd70c6f9babda2650f0760d6ff3b37742fdcdfdb3defba5d56d315b40c46b70198c7621e63ffa3f987389c7118634b0fefbbdfa7fd@51.158.191.43:37956",
+        "enode://93c94e999be5dd854c5d82a7cf5c14822973b5d9badb56ad4974586ec4d4f1995c815af795c20bb6e0a6226d3ee55808435c4dc89baf94ee581141b064d19dfc@80.187.116.161:25720",
+        "enode://ae8658da8d255d1992c3ec6e62e11d6e1c5899aa1566504bc1ff96a0c9c8bd44838372be643342553817f5cc7d78f1c83a8093dee13d77b3b0a583c050c81940@18.232.185.151:30303",
+        "enode://b477ca6d507a3f57070783eb62ba838847635f8b1a0cbffb8b7f8173f5894cf550f0225a5c279341e2d862a606e778b57180a4f1db3db78c51eadcfa4fdc6963@40.68.240.160:30303",
+        "enode://4956f6924335c951cb70cbc169a85c081f6ff0b374aa2815453b8a3132b49613f38a1a6b8e103f878dbec86364f60091e92a376d7cd3aca9d82d2f2554794e63@51.15.97.240:41235",
+        "enode://6c9a052c01bb9995fa53bebfcdbc17733fe90708270d0e6d8e38dc57b32e1dbe8c287590b634ee9753b94ba302f411c96519c7fa07df0df6a6848149d819b2c5@51.15.70.7:41235",
+        "enode://95a7302fd8f35d9ad716a591b90dfe839dbf2d3d6a6737ef39e07899f844ad82f1659dd6212492922dd36705fb0a1e984c1d5d5c42069d5bd329388831e820c1@51.15.97.240:45678",
+        "enode://8c5c4dec9a0728c7058d3c29698bae888adc244e443cebc21f3d708a20751511acbf98a52b5e5ea472f8715c658913e8084123461fd187a4980a0600420b0791@51.15.70.7:45678",
+        "enode://efd7391a3bed73ad74ae5760319bb48f9c9f1983ff22964422688cdb426c5d681004ece26c47121396653cf9bafe7104aa4ecff70e24cc5b11fd76be8e5afce0@51.158.191.43:45678",
+        "enode://93b12383c74c39b67afa99a7ff44ce250fe94295fa1fc087465cc4fe2d0b33b91a8d8cabe03b250104a9096aa0e06bcde5f95665a5bd9f890edd2ab33e16ae47@51.15.41.19:30303"
+      ]
     }
   },
   "nonce": "0x0",
diff --git a/config/src/main/resources/kzg-trusted-setups/mainnet.txt b/config/src/main/resources/kzg-trusted-setups/mainnet.txt
new file mode 100644
index 00000000000..92f11f0286f
--- /dev/null
+++ b/config/src/main/resources/kzg-trusted-setups/mainnet.txt
@@ -0,0 +1,4163 @@
+4096
+65
+97f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb
+92a72fc2d2d7888d95bd8b479fd66555908ef365b31d181c6aae60b1cbbcc21110f057dd13f9b694b2b260cda1bcb516
+934c3d60d8a31e9cd617427b842dbd49d7dcc5c8949d932773f0a0d752786f229d7017c592b3303dc5f631d2c01d5c08
+a895d8f7f4f160ab3837d80b5f6aa743b28d22ed22116269f3857130709df107867ba7e0db0d5e171492fab0db2a635f
+82d3d5a542a525646953cf68517013508bf9aec3cd7faf0a311fb0970f07697c8efc6943fb7fb8e9ff208a30ce4e8027
+95e3d50c2686c92568f46c8aa3a0e7cb3d456cc532c4ea0d07d47dbbed678fca2976b0b28009a360a2fa3dcd2716a7dd
+b7b60fc315983545150f0b6545509ffe3f38b5562574e640dd9c61d1a5db441855df9b0cab10096fbca09024fe076602
+86836a32ca078c51b9e9012fd37cf6647bc4bc2b8331b8c51f0958aed321de1fe44c2ff374d34eba13fcac18f3061a63
+b50bd23db7116d7cdf19bb3bbf38d946f345c2b80e31bd3ac566efcb302561d3727df398ba913d7f3436b82003337c0c
+83298b2de8fc1e36765903cb94d1b3e45ea5a09f5e0468dd4978ccd9577f81e2985f98f7294a3233d822f54d8d3f35e7
+89c74ab72d45bce23aa7b71d063f0e24e03353909570ce9459e8da7f872880c0267774699a10e88ca8d169b7f906da30
+a6bafa458bad96b879b771a1173aadf9a6ab07b62525642554a9e8c62587af476925e0bbc853d745fde3c77433cc05fb
+8ef8070be49300c4a428b0cf1383608d4bbd0d7831e47cc210ae00f16193c4768b01c630dad6029f760fb8e22d1863ef
+972bc1b58ee7f483c768fbb64af19c87cc69c5f14f9268dd4cc6ff99c8f1a49e872030d840f46b8c18d39395693d1ef2
+a1243cd5fa37c1ac9c8a5ce77357f99a190204ba8a87acda038efd7a5e298afe7c645f88d38d2d52f56c85afebbac06e
+8f7e3506cb4608555759e84094654a7b725057b737efd9553c4a00531d54bfde9fa0dbed7bed84b20d34b88b3eb59112
+994b2a83f893d793c942781188ad76518beacce4a77cae5d9ed7f7dd47d12721f8c799ba8180e16acb3da06aa3788dbf
+b63d24f3dd00314b4d58ea119d1ea3e10303827e23f90dec00aa3723e8380bf8d16450cffb16631c887741834e3e9f3f
+8ab4e03e2d86abbe5dd0401744ca4bbc915b787a8a11b2ba0ad580b53f04d47809948c47345439c3cdc5ea47bcf705cb
+a505e73b25aee781f49df4b0d8f8e2456d6da95cf30eb58ec1e8bfcfebc80221ea2f988b7a7087bb6ceef6c96fbb294e
+9185b078e755a7ec66f503484bd8e75680670f99be8bfc0dd5f05ef50bd1f3da15c23671bd7146ba2919e6fa62b3f423
+a4b4eabf6621d9db591ab635bb50f60c54cac033eea827f2d3b0e5e6b60479127edcd07ee797e6eaf6135353b28ce5b1
+979230aa42f260e1993189932d93bc47d3d775283689492cee54c115ff7109f5362466040508de3dba2c9bfa1d08b216
+84793398dd6643bb8cfd62c14eb52aa6e1fd7735fedeb4ea49fb42fbdcf804f0b9d26e89a6ce4b0e4e70e8578b779be1
+b5af00da65a02da4791954598b465cd68d14a3e31b788b0e4d6cf63231c52d57f06781ab24390685c8f3e2690394ff97
+82a8cf6a5b252ba991b216b83138c7a2a473234fdbcfc8b9d630969e3beae91c3021e61184019ace7f0ca7171e33b589
+b58678c9a81684d9c88a8c639a98aba71e994543737e4fe6fc882641194f1190105358aa2294d61a7a610e03d4c9e72b
+97ebca7442c1328d8cd839aed48de80e10e41eaa482ea00351302cce0a29f8a8e70b75495ed43e041eb5c6829afec3a8
+91f3ef06c5be53d9fb26792c60390216493129a332a845fe58227627f67971fcb8b4bb6b8de3cd31fbe5fd63fe144721
+b2b42d9c7069f4cbb6b084c9088aa0025c4d7badeda1ca753e4a132641740bcb4728c7a4b61a1ea6fb6af67062b74bf3
+965fb54d9133351fcacf688195092c8c3507de2087f17e122c4ff778a1e6097ef754316f1591188ca1185b83a02877db
+8e9285aa4b559558f147c74e8aa491faffa7d09ef9d63ca928a0e1a1a0d1613c5e9fd4961a775333e89acf6a1d9d60e2
+969a42314a9c871f409a04d9260c160644df40ec3eae18c839dafb6b58afce77c869d6f88cbc0ff10513219ef16475e2
+a42b1d86ba0d0e09301fd6939540e01d5cd45a9c10a9220e4779dd93cf9a0b3618fccb81f6a27f56e437fcf3df493ea0
+96da42f72efc3cf2539cdfacb1feeedc0ddf2e739d00a07df341b0112a11ca76235f9bb9e317225fbe3c062da7eed1bd
+ae40e5146b9a3b1cd0b459043b3b438794b74acff9862fd00ae34324b1c7b6958763dc22f20dcdb0b5f6886aa5244a2e
+a3a9c0cc707cfd6586e8aa10fb4d3165686d8e63ce4ac8ca1e64879913870e7514fee5665d10b84e9b9aae01a96726cb
+8111811dc2ec713a14cfebff119b14dde24af1b2c2b0fddcb49542fa4a8e6b7cb0bcc31c81ed91d6c1da7738566881e0
+953ca02b2c059bb62138ba7f7134503a26e429f539a2854209c68d5507bc6574d71ba82cb34008175c88793feb981ea1
+a4c45e01365a5d601adf202d27c0a1ef61bfe6d6623847976f128c8f2a5d27a0931a5ba24980c186a6df24096733aff7
+85115bdeb44d8fc4b85607565169be934d4e7a5ed13e67f47ab4fab11dc99f1e5710601b76271a25af6c045b3cfcbe02
+871a84023c11a5f2f3bd6e7a40b41601e8aabbd8fd07b9a08a7dcd84d31875bc35e8e7c26505b5f829c1bef47fae2396
+977b3104c766bea6ef33075a7ce162c717fca7125eab518b83f9ab0d400d1fb9bd59a588a458ea9f7743c07409499a7f
+b80c65a8bf253c75e1d13e57252e941a3ba241d1ed8b560c0a8ebd89cf00192befdd0c3c23cae5eb1f26cfa6d17ff358
+aeed5438dffbc3af5dc6be921bc7a32af72a796e34719f4b376d797a127e5ccc500ca0e7e8eefc6568d6187f09bbfd08
+b67c9a8d0c1d38e40d7f5f84a80ca3d87532751de8527a2e99ce88c4b46b504f8b01b25f16e2816099497fcb13d3aeca
+8a285c6492874e340018a8d526eaac3be7e7e901be26206012ee88ce6b5d14ad3e6dd1949ffb10ce80da0b9ee18b71c2
+a29db630a03d4d2aa3d9d6f7484b027ad6c8426636c5b90bd15f333c33d7efcd306f794085154d5419aafc194c21ca74
+a8dd50311e524b87ca522b8cf2b008245736fc6f1f12ccb68bcf42e7e00b87658d858cdf005153574c424b945372213c
+b1da29d2978a5edb2c7db84e6848a63c311601f4a3c0597cffdb51aa59f8d0dad04965159bf5cc05e5d19ee0f1f51b4d
+b7f7ea74eb18c6434bd2d4a23ac5ae276299e6c6ecae09cc65c0baffadd79be32f34c1745b9fc89fb41e9a0b2f7f6c43
+81194eb94fe80325534f48058ecc85beb3d8ca45e4a17c03d513fcb3ef73e2ba9edeca47037bbe4b8a16bbe0be0b1ab2
+a8d7dd39a1122c6b7219af94fa818aec1a320b46c7d46595a97c786181302b362cf9a69ec019851b908ca637e4a9eb7d
+a0aa50fe56a96db810d7f757df69e77e9a60e805840f484635c96438711cf0092f344cc5c7615b32da036b639182a546
+ac0b94c25058d3eb5c1d1dfee8cda07d6f124840464f6571ecf6fba2604d95c16b6abc54f67d41265d534d67b39b3648
+a9c64c88c1413d1e7275fe769c77f0b5ef4ee80341a945839e029c3f96e8aab8b027008e0cb51d9cc5be28c2d1c6ff29
+a05dcbb9ead38d761a7f5e30e561e71d94d386333656b696e4b46c828db0c50c5c048621666fba4df562d3f915dcad1d
+894c40bb12acb7d45f3d38bc3f200b7dcaba14e804f0d3671e84b64dd650ba6a7928066f168c87334eb3c220d98b823a
+877179a5eb49cdffcf99afa0d39bae5b0d1b248580817f03c0440cd9ffb0a4c6388af364d2ec4d552996f85eadf8c80e
+a8760e2ac3a45072aea6000507cdd59fa51a9c60c29666d400db9219d72a2ea3123b7585f2e743fc2ed6777d63576d60
+8752882dab9f576f497504721e5f28e7153cf913d5acd4a22b831b43717bff078ea1b0dc3b2c0b53a169f6406dd2a77c
+b2e8c488b91d70df1423ad48b17af13d2ec4158ecb88f54ab7307d9b31dbb0f3152bce30c0b0879bf503e8fcafe41f2f
+81ac4644e831620ebea149a4e4fbc1e89c4868fa5e616467415c5557872f872336045e1fc230269469e19b36e4855c17
+a6a234e1f9299913a05146e2d4e09b00bf2ef91246c4a8232f65bac5b202991eefe1aa227af6b5f5bbd0a666363b88d4
+b0869efd9ce419e4c9cdcdbd81f62764a4e84f83628b06a74ff554b7f812695f52d9b2253f1e476919f515ceaa046be0
+91f374e120a16e21bc3b18d390d798a13194f7e7fc63a13853a7986fdeb1c67d6300f925d4251dfb81fce7ed3a5fdf36
+aec7525b13f52580e10d5dbbf08903f14f369a713e2f59e77ed21ce659965351c50dafdd0f3928b8ba4d21a0dd8e5b49
+b47e08d8c07f6cb4f1f0ee4c6e118d3d4d873b7140e0416654f0861a4dc011346af708db29280d15d2ee994a95557bd7
+8360037c6cf909812189421e61bf320a254485756434ce48e7c6bf681c9e0d52dcdb6027d3565892a4ffca5d8dd6c4bb
+b4a3b391f471228de19e589f478bbc6f6f6889a457679980d58575f8899120c94cce7db00253060979741924dbfd042f
+8852803515447255d950af8e74768c0786eea5b6404517ce600ba35a759728c3d257eca22507b1c2b4e42d220dee5617
+977292fe648a6166a85e57f1bc91b7ccc7d28cd3642715572db31c4efd1850b937fb7854d0d66aa925b930a072d2fe7f
+b56905a1da8011043bd759a61d0052b738bba0b6985c0b6e73e4055b72a6d704bcf2a496d410f999483c6c46d1aaac4b
+adc7ca377682ae3eb10338bac5fef01f5f99b31d2af06c7e03f0c10d3de464ba2f7a470803d73650a2a070d733344645
+a99c017f93ddc02e829b59ea6835b80604784f5c8caf32d28532abc67c7f8a13abf7eff8fca5a41fb176037c3b1e169a
+836eb0850e6b06f2ce31d0d6a5f48f7ec7ad926c3b69af797b1931001d5478b39d806fafc3e2c0a36e560fae0fcf6612
+8323c7d361d89635f2e61474fd9bdb43c79e140e0d196a80088740372382a6b7812930baf481a47e2336ada828ad3ae6
+8b2e185d19a44f666015898544fa48744d1352decebbf987605378cda0a31a21f45ac86897510e348572b62d44363858
+9865078f2d46334b99fdfe228f9c54236af4feb2ddc27597814e3e6ee217f668ada24ee3cf4de87866e67f23def4ee4d
+969e3ff317524ac96ba5de1b50d6c5933ab6cffbf7e9ceeb62ab58fc6a032a07dfd34b3f174b0aa8ad9a96513a9315a3
+a58c7cdc0912f6a78ca9660b3e44c8b19f36931fc4228ff04e5402ba468a64323126917cdb9eb65d9564e3eb101d0b87
+b97200d4fdda197a209a85243f530d92a0a8bd1da7f338a3c9f8f58f2b0a20330aa7e5671f48356b41076cf3207b508b
+ad3c167108b7254b25c5c28349ada82a134d333eeab895b226ecf1b66da637ea6143d5e97be4023efe02b7eeadf2db42
+ad96a77f490429faf562082e46372eeb9fb4688e4b1e2ae7086d338b51e03ca5ad3985800e9e123c99ad9912b76cd3d7
+90ba6dd740c76f7a98846e9ed4bddc3f85a34539d962a78f10e84bd322145a84e6cd3fb92afdd3dd4adb16b25b342786
+a7085652d463810b040163d775a90a911c2945b0b142b457c22e6be8b89b4840980572b271c8547eca317ff52282c491
+a92cf28cfa29dd9c803527daf06c23ed9e91bf8b5c3926879c4c9a80967ac418d1382ce21a06ceb684466bf856bab304
+8c0626c19b6d8bd9d56f2b038c6200083976da0cd4ae5d3c3a71d73cd789fbd99b3ef414657079e6d7365ba968c43ef8
+ae212cfe8f5927dc7441d4ce5e2b72182aeea2857c35c42f8a370d0aecc2a1c718d47d1130e3ef10ae1c917d1cd752e0
+a5280d4b30cc1989ceecab7bf81acaa39bffaada1bf5f41ed0def755840e929c2fa3e2b83640dc5d0d86e8670aab37ba
+93d4685a00d9f9d2023af38efae02ffe55291dff5506334bbc98399223891880b58d037c205f7768ea3d53b7de23ea26
+a0fd5e9691551ac479f91d496373940d0ddcf3563468c1be35722f746de52d1c9b9397fdde2eec33ccdbe39dc93c1027
+90d2a08f2a23a3455f73a2c3f9c8d686143e01d1b0c7cf833768efd936cd6a49d292aa1207aaefc42b75f00b70ac67a1
+b1a55052b853c1169006f8f81a3210f8d2096d483475c1ba4d641d960c0a63265d6db88037dd025bf683fd4555ac81bc
+ae1724431b6d0439e0b44168b1f62278ce7e21e3b2e7da664d0cef67a246b090afcc35244fdf50ff1cee87e406cb0c35
+a029df7b00a2b57d7bf6791000333c5bb2e416a06e019394617e92055e7c78d8bf29777143765ad6b389dbb0cd53a6a1
+a7fb942f2b95eefd7986e08f7a59c6f45f0a1c51be0e3f6e33ad67cf8dbf1e243632d001c52f7b441447b1fd03b51a63
+a76f84feba16773b55f23d2d66037e5c1a9c85647c8986a98200585ec2f9cb28158ef842fa61beb4c86a85c229692c20
+b5e605081999c80ce61b53408d71a892ac1d6f1b177ab2dc7a18b03ab612d14c51bd990e5f4826f2ba4c0310e332a9d3
+98e3d5a7bad4eb817838cadb18a7c2efc5d586a402f0b54b894366855018f316518eb2d0744e439ea0f40a83176eaf46
+93dd180318c952ea846f2e9f8eb780ce5549f03b7b17de14c6d59be19419969bec74b472e34eed67f57c32be0b8c12db
+963396aee89d4d7c5d54d0277a6763f8e1edd9dd608112afe9644d17b3c8c033f6c81b162dfc474c3c0a5adabb449f73
+8bf25f8b181f5f7fdaf6eaeb7016bd4e4680a011b244bdb717ceb8a99ea5f18479cf98ee247bcc76402760280b116248
+85084d95ae492f26c7b1fedb9077e9e65964e5ead9bb13bc7f1aa8cd7b8c0ee2b9c0663840c1702fdd27742ac462d5a0
+b78657254e839f00d4a9353470b2a83a782f7d8df5575e7fb9fcce85e4c8d7cde72419bacf874c57ec124dce174bcbe2
+87f2adf781f2f57c37be008947baf78d22d9daa228ea61369cf52c5f03b4e7f4d994b1269f77d315a0de3cc54f8dde14
+8b6ee9d824109ca2196e3061c821d2026c8b839d58993745076de76ed960132715678f226b289d20018fc4200d5330ad
+8d76f7a41c492e403de6bfd36e44fdd564606b6ffc9a6b90ec45c0dc5594860dbfeb20b07562ad14902363e121351417
+93d86f0a70396da3daf76da707d0373378082242bff6cafd9a0e36475745896c30ca40a03e5833cca69ed76d203429f6
+b443d71684a8d105d6504637a4bf93089154e713cd54553723665a9d5c15c460976c108f79b0200c90d55edaebd4294f
+a577dcb11f615cf70444675d4745dc5fa800334730c86112c05c525948e4106481b743b4b36ab12fa3144a245e9ac7ea
+b16116160db122d39f939485aac8070bd63be9750ce989fbed075163af12b5570f918009037dbf71800708a8d16ef3e3
+9245e9f5da5118c404b8bdaa9f9f158bd29d38f8b7ce5d67e9ad970aaf147cacc2487a2ff07cb2f3bbcc29f8492a7fc7
+b170d0caeb6a6a29d4157e058d077518b74cde13d0c918d5d2ee76914a483e77deba9ff4d298b14af64f53b6c8883cbc
+810f6c955d025d9d4b19b122e3616feb42565b8ccd914f9e91807a7d172ba3bbe4771f5ffea065d84c9200e62b9151a8
+902d496e263e8894c59493706b3d83b241040cdd4da44884872585658db410256b2f082b870cfa90c1a82bd70495707e
+80c1b7cc6d570b620edbdc7c0a4583b1f4dee1669bf56bf460bddbf8e653e25c835a935c464e5cdf29a81c58c943518f
+a9aa69f94b15bc7e128f9dde1632f02cf95258b99daa93b73d8c2afc060a55e9636e767b6b99efe262ae915ffd57b455
+b9b61931f1543db289aa5adab4234e48524de52e0227bc926d4365624d50a5001af70d9bd35b5a04ee57e764852684fe
+901be2ac33470af7876834faad7c7474399296a9c81787b49998d6216edb4686f4acf57d15d1626edc1e5e675911e577
+8a780304feff9563014aeeb51221fb88c75b22b8facb45718bb6d249610d19101b73e48ec8f77a243429aa9cbb4a4300
+9274a29e25b0a504ed37f894838859a0687883919a9c8c966989ff651207e6f4b98c27bf397e0cf4ee63846569904f38
+acd56e40a1e25a363144a5bdd04a2d68c411ef0d992023cc8270cef5ffb3a80219af80fd2926472846f5a7f68245d9e0
+9505c0985abf67e40c7dd2bd707ff9bc3fc9d26302bc25b61c21c0cf0e52299253176ebd73b754b496410805767ffb04
+8f827fe86bfdb18e698c96f2127841ac3a20b65fafa0c7c62a9195570e6e36dbd0fe29b70313b8a9818dcb9faf95b9ce
+b4289e96bd8426bba9ad67266d12e804d1452f013765db9134645d8cc2ed6979e57bb73069886e3cf688b0c294a2cf4e
+926163b50d645b27e75ffcea90a733207005457de284461d9bb8e6e4a5f7042fb02553175e33b5fcfe5da906b60a9edf
+ad634ee62af65d073e32662de6ca0f3d296904048ee07205100808faa1abd0bf29f53a69dcec076ddbd322bfb14c9816
+ad77be98757851ebba0c35a9be67333394819e9a65493f039e75c4c9705a88064fa3842f35441362f0d3d8002eb4b3df
+b281fbbb165a7ad0d4707d219ca4806f781a2b185a09a0f649cd68cf5533e4a5d205bb36a669ee51e831a4706af3f1ed
+b7834ffbe76ec1177f4dd72c5032998260c85b110f5b57a699301fa47eadc94a564075472770bb06ae2b98b973b20a07
+a5f402ea96f21ea35deb2907501f1157a649cd80a76e5a42e6c2e22b2f273098aa694cdd9fa24280c2dea82dc43efb51
+81cf72ade9fe586f7fb4f8389cc416fe691452fc2bf1cde708052f005572c098a8494c86edaca29abe456cc75d97362e
+aa3a68cb71acd5c501795201daaa21a35e3b8ad5c5cc4cc9c6d19279c439985caf25c29012915a9828b47844aa5c32f2
+ad7a6d1e27d888b4de3cf74893066fffa0b7028b9cad86caa0ab9dbebfc0b28a169ca3f6ea5e247266b1377746402bab
+b8cd1f7b160e8f018566c7b2bd42658dabc213004bece6ce2ebd6241882115a1a9d92db2e7ea5be85505c7054e493b80
+b040e163e22bd8f09e1aee245bc752266788b0a1d4bd731663a747286a5bea9813e9ca5d18acf50246738f130d488e21
+92780fd0e0866d4d88c809b344017e76110a2a94e6b83f885205db0634668a880cf589010e51394f16aa571e474def9a
+81ff76c79855652e4a4fe8edd473e65e3b0a3ab54917db2c520ae2f43d36fb02fdb32c7e06303490f167171e58a3a9de
+ad76067d73f590d68b6ed37388378b05ab5c052fee76c5832cf0cd7d12c150ecd225bdc0075c1fd98c1689c9bcb0e286
+836d5606167c62ef0bd7867d4d52c289e6bcba3d663d50d6749768edb0115be8a62168ac4e961904d7cbac8341b3c736
+b765e7d00c489029d8cc4206c4636a26fb011d28fc045875aaf81672678f8c9ec7ee27a98e5e181407a135f9d494d336
+ab782b686a3c7c8e66331ddaebf426ce649b11fb52569255ec8dbf5b6e1155208a34bd6376fa5413302b367eb9ea36c1
+a579e2d93b17576fad3a9607d40b92150d2ca88209724184aff9ebb524938f1d7889ea3b7a7e927519e3430b4bd04aed
+89e1db4b574e3b4493319f4ab3cc1d2a81d130f0c7aad00b70adfe2eaa8eec90eb5133561ce3202ff6bd3f718e68c67e
+b317b29982a28e865dbcd5076f0b70fbb6a389990dee3b2bbdbf2aaaaef07c363a56f263a77f6dbf180bc9610fc6afbe
+a8e36630d5836a7677bb537e2765c0a97087de716b26882e83c7329412bd9b4211f3a3d317f6af06d7aa9b9305c3c936
+935e77c8a17a99766bca67aca48e4f856e402f747f42678f092ed4a954858a21b8f478c9a9e0bbc9516fe5ab63a527b2
+a4aa13a9225a61df7096c3de4c38a525e5f8daa2e9f76adffb9634e69d995fe2869cb3a322073be9d1ba15eb70684437
+b9927830424ddc42769ef94377c7643e3168eedd7944bd27d4b95cd741e159cde1799200fa33d86484d54a6e1ea2a03b
+b315e14dd739b242855d7cd16b2bc98c669f51b91e387747ea1a612ebf481fb1b6aed8a0837ce27b9c9408a815f9322b
+a9be82a9e77e1c101330aaee739266e6ea30249d1d294bdba30d3921681acfe48ff0405d2596f1d323951420333a5aae
+97b46484207597cb28dbaa73605ea9c3c7397bff15c06176674cc2ad92746a32199e345cd21ec2d7a54f7a134d29505e
+859ec9284ddcd80f711fcd43d7d91614b435c85cfc500753c5ad0cc4ed4229258c1c2c45ded6771949f02ac0558faca1
+916e6a36204e3645e524b830839e2f0cb3ff277cc49102f446b6f46c3ae29a4b003824012d2c5513d07cc402a4a737e7
+8d2bd263d30b15a9c2c3eafea17d85502c6618c5f37496dc91728f09ed2dcbc616c6936281536077522858123ed8ed0f
+873272487ceab7dd687676352ca2f9da14d5ed453cf4c8c92f8bbd85341b77ea19230f78ae80b04712d53985b6f234c4
+88cc85af6d12f937078497df03c70abdca11d73a5421b9416f2a67ced7591d70b5a0e7ad562e55e0e337354bcd9818dd
+b01cdc53d317c93a4b504a33fa467f5def6a681ec1d5b98f94f0ba7fa9984d568cc859d0595b65049be3b127e7197ebe
+b352ad93c95e956388f33ec43e45b626f959f67d915e00c96bbb887a65a7abaefe462f9e90e4691bb71d22213a5da4b8
+b81fb507deb084d4392cbd8e527ef580d4281d462a2e46ab73d4bd9b8ca9579d2df7faf93aaf9008280a4c6a7cd0a56d
+ab4a6c890d9df128c68078a55eb5aff7047455923842d9e97dd62fcf24934749ca426929a0bce4e19830bccbc569936e
+8a7bd53db8401f92bf6a7633efffd0be80f92efa4845d7d1c3903fd63e54d71219cc8641f5f046267b045c584a53d934
+a8ea87452ead85ab9434a2d8ea7e47c56bdc6fe6246786cb048a5720da4274fcf007b9a35821bd2471ffe2cfd255a01e
+9355bce0ea787beb264148b9a0fc51e6bec0d392ffcf21ea580ad20ef0c60fa7fbb7e045f056ac16d2f0bfcd04e140cd
+ae8d7acb166734ca9ef8613222f4f0720a235a1559d77568fd4a449ad6b3b924b38b0c5852f144adea348bfdc9662450
+8e001807f943401cf12ec6d57a30c73cc7883a6a3f4bd16ee7298bb53f1187c6f45d2381ff321d57e993f339b4ba96cf
+912807db0e7fcf1a1adc594c3c6b283f219e835baaef2165928e3a3dfa73d3ea520ccd978efaf73dd685659493435914
+8530a95089ec2f2b86ba752f11bef5bbf62b29ee5735f6ae6a2ee4d64d75072089d17a27966a3648baddcb70b7aa7a95
+b15b3bd6d3a5c5ac39dede41ba2c86c99237c5711126ad184b90588d95cec3d39d8ef7b1049480817d7b4bd4e3c4c8f9
+a1ee1d1c8e7a9db20ce9394a297af7f70012aea33e85e0f33dc99d83a86c72f682c93b19e8bb645d741d18b3e9ac7d27
+b3e02bc2f4f1eb39dc18978b6d6c842a5e2d4aace2b39565b4178ff250053085a1d71af33c38704a9d16b68eadbdae4c
+989e460723c841a43563e12a62f16c7c8b1e59f961aebd1948df513654171dc321d72db988db819d4c5446cbb2b87279
+b3966e52b48072cdb4e9cb3392f2bb8e5b688f96f1d6782b937b3eb59c86023726090b2c33a6495071ed2f410e4a4b84
+86cf60512976a04efe244bad0c1882f94436afe1c0dc05fc2752947b413f33766556452fb7389cf80177183a4025a17d
+98e79f4c3ec507e0ac6d2366abb1b26e58cbd6c10bfd7bcc92c88a46684944a6d49f530f255682383ee9c294016a80f3
+95360d1a2d224271bea707dc27322e01ab38f1b2c396dd65d30a2397d89a80b74ab19fd99171732be64d1b0838314b16
+adf86841174a64726e7fb2bf576e3be5c57c1429c26ee8b7686543f9a09dc377b8db4a95e3d0ff5acb8335d039c003b5
+a6f36d08de9c01cd8ff59c9f78bbd2a09712116d6733e2a8397dea86b3dc5612b83386ed375a2291ce5a29e579ce5d68
+a81de0c93cc8459f75391bd05b217b26673f9f3126706f2f4d863f0550284092470224f61d78cdb2c744f527f874938c
+8a717a43e341495e244a4f33320cdbba4042f1e379db93394f1e6bbcd5bac41b873444ac466b75330e2f8f3b17db0a08
+b190346b2f98da03629ad3972971f9c7210474bcc48bbe76c75062c19e1fe12727596dcc2d5f921692644e99d1e2d3bd
+8c64dd862c70f72c80deb4ef0a000d7b2af2840a655ad466b62cadb9254b36b985dfec22888ea8ec4a19f4075ff2c584
+b428b84394436c48e511bfde561b8d9414429b0905e1450daf0ed4c75459be3acd321fc616f3c7d4b21207274ce9af38
+96037562c455863af9447f366cd0bc2fbc10aa95eef21cbf93c8b5bb3c7c62e88c8316a857322f7de2aa17328f98bb68
+81bec7f699758d6b762f2ad1bfb5520af698f052e8c0e43c48744dd8a7d125a563ffa1f1daafd50df6da03fc0d369222
+90ec28210b98edc7c2b108646a2b207bb710779564b528dce4caab378fd67a03173696439e512daa0f4fb0e2f5036af1
+b9a1b0f959f0126dcca0c526f1f778ffad81e9725747d24f05afc5673ff02ebdb1d58c85be3141a2e02699a582ed5875
+97cb98c9b00c4143807053bb1de5cfd21e5980fbc0f6f6901fd7191f97e3a5c1cb0687ff624f97b2e4a3a90808683406
+9097c23078c3cb4dd0ea432d0790ce9adf1e7dfe23b6121ed5126f0be62c4eff59e6d58dc955c95809d97fd9938f2553
+a1e43c5a9b046b5ebde6a0c45b947319079f5d23b2b7272dd8bbf2f40c16c8b238a7c7296b63d929f069a571c1d7ca6b
+8ae773c22c585927b7f29e2779463302859ad28a485dacca2cd40ab866313e73d6b6de08ef7476fc3c56941a34200d19
+8ffa098e8ef62e056508d144792b1faec04e869836375a78e1f62c5a39842507a62667984ca748c7a503d3f471372966
+83eccf75345f5d162aae2af1abc0f12a048484743f79675ec16d1146b85495ce3664ca9d88d8c8d9e8b90add6521aea3
+94ccd346b8f9e431cc0dc9b7996e24c3bec7270716cd46cde7b0ea86469809695089a39cc72ca25c33f77803b9d87529
+83b55069f117ce178400db1af5974696350a1be374934487ee28b311ce9052ad4ad8f9979931a7b36c71af00dec6b7c9
+960b626529f3c455acd5b9cf092bee0a39aba03cd09d8687d22c1c304fd27e6e28c25f030639ef75ae7e3f152b28fce0
+8d3c5247b21bb6d5af2631bf2d595343521192e8545f057e02a7a2c3e49a8e3fc752047f69eec04db386ed60002e1f44
+8d4fe310440cc3a9e7bfe60e060eaa5782b08d71619e7f2680142c95dd5353388b58ede30545f386ab16b3756bc412be
+927a2afbc50ac10466e917665a63d4d6d24e642b1869502c06d4dce3f5e6acdd7c0c0f1ee8d4e6789140ad4189356543
+a0ed782c624d7420509abd6103ff44417b7e29f991a38141068dc2c1bfe6568640854f2ec847e5bb8e5393fe83ede2ee
+a3ff9f2e62d86b3b82955efb19f8f1d617c2077b22e9d055bf2383499ed666a33e57148a4817448eb2e50b18cc8cb1bb
+ae219dc824129eb4ed674e59511d84f66b461ef77abd45ee752a8eadbef865c1243505a24a1bf6f73863340d2c69a121
+8327b02b7729afaa54b39cc12581a5324a0a14ee47a696cea2e8b8164f22cd8fb4385bfd00256dde2c32f89f0ef47c41
+abaac567c0235bc0feaba0665255ef120d6138bec713f1eab9812c8daf37b5ff97d4c4e4138c4052cb37a26b0becded8
+9110b96093c679df191daaf092187a937864e59c885c4814d08ea9fe0d5c5d2ef5bf29a5e821a4f95e7f27f9d1867662
+8e4e5e3448be3be0b22ee1b0b561d9031c836b6292ebdfa6785fe78a8f97a8e5f38e0388e932fe05cbacddbed3fe1a46
+a55d6708f2f2854a5f95fb9fad7c14a43ffb8b48b5e1051a954a5ca7ef229637532762f0db30f2e1da88f994f412e0a5
+a6f23f2f52228c46ab79acca79ac440ed895c8a1d0924b14c2ecc65cc61684847dad75e26534d57539452e128f22fa7b
+b0e1e5def6fc240556325ca345aa31f05515670b3bad6745cc9f19b109e16bdbcfa4b008e4aec200c56e093db1097c10
+8c0392a11e7109dad2358a5e034b1bac37066b50a34eaff7d2e692419feb9ef40a01909cce984d862c96c1460b474340
+a224ed90684d79d3496197aaf6430b8ae215ce56bf98f199f365daac20cfba59196ee9959665b18c5236d40b993940ad
+b955fbd63a3ccd1efa7bdefbe01ebf1e3e3cb44fbd04c5c6f25459ec8f4ff679bee4de9dd6806d29964a4ba053df6e86
+acffc3f12f69bea09afc14cfb5f63d44c2ae4143977d2aaa06ff74d0ed5c137443caf98bbb1691b49bad1e4522a118be
+959546657e459049397eabe338b7fcda8603f2f9e717c60cfcfa6af0cf5774d192b3687da34838bc7ef8cd0c5c59ed88
+a46d7ac7808410e35b3603662a9a8d2bd0de24150bed7c28df86bc137ae9f3711727f1178a0d20558f1e39e3c3698fef
+b156f79f65296e5efea35234c68b776f8eb0d1ccb79b7c951b57bc22712f72e8aea0ffe30d2a97ea8aae0f62e2e4a3d8
+8f816ce4e779207dba556f9b5fee19407ce873ed6d0a856b9ad472c183cbaf43243caed57e0065ac10869fde15ac84ef
+b5cc4b1870d4125307c7e1354243bd4c6aef88a268037208e1d1cf207fd16864486b1ca9b58bb5ec1152b62672afcf47
+88fe2321bb635558ac9f712566ac3297579aea00b67e2c2b6857e82f8c092886b3b11d1787acc19de14f393dafebc273
+8fe0ddd4f9c5a5cbb8d1120cbb698a8da1ea36179f87c8933146ddee1b2a635e0e54e45cda841645dafa55a242e6f33a
+b15837b03d304d324507776a5030a5f3d3b6b69c771a7e144763c2432df9acd1f2d3dc9936f59961d49be5117484820a
+9136b21549b7919c8575c90e8339f0ba2b6997a858a450194aa296e3cec838049b52270aa97506f872958427dace6a74
+acfcb0b69264e8800f7b8f00e0b8498fcb36f95122c7087f0e5f5ea8d6371248c68ce610d0b66c464759291fc603516c
+904f6dc6a143a40102d89557c6211e60a28d7a423c25e54033552b83ff68bfc93a384e66f771c4ac640a5de3070fcd72
+8e1c87da2af5c01302723dc7091f4d11c715ebcba43d038659a99a12d54e03a08b2868c1e837c1d60c3431603a879ef0
+9336bcee2029ab84b889eebf3cbf3e52ddf22482f4cc069d40796ac849167b18479d79642afb6df09fbb12be85a2e4b1
+b2679f9e7d2f5cd62aca4f123106e39d8aa0ee5ef5136d1c194491ad0a4e8257ca55b53fafeda9c1508a85863d2ad395
+b092d8e72d338e9d0b9c3776479223b0788325f60ec7f561faf637e604f6ce29342e7520765797b52793333dac9d04eb
+8a7aaf02d9e702b894a65c22e7440590d1739aee7f2ac967cfbf3ca950fe0c4ec04a0eb8e445547239605c0998f5564b
+b90b3f7eb407464cec7dcee507e1b3f361de225d0f5326c61a11e94a173f345debaa12e01784252aa1996d4700d1cfbe
+88664ecf12b67cf1d584e7b8b878cdc4ead8eb81b213dfe6914055a422563ea149626080f0ea1898308f466eeb4373c2
+9455063fc9535ec9feb3f05c282d5ef3da39ecd4b7a38a0983d1546e007a47ee3c23b6c8635192bb866cf92af60fb592
+99898733e4218076a729232fed49646275e08647b7b441aa84e019703f4fc18fb656b356fbbf97548d6f293a763317be
+99b5cee4527b689d6513e4a05ffa4ed78817645df53f4a0849e8162ed867c412e47208eba5489a1065cd5c73f14ebe78
+a90800759a3270d577d4159be6dcf08021586434bf931d88fbcc26ddbb0bde0ce402241cad87cf0eee35d4fc846d3dfb
+8e9466a5e11b611ca0edc0e6af0eeb77b2eed9e570fb0ec2692654de90d1d73c2dcf42f281128c9ade0473fe87543b69
+817607875e14440d1f7ee44a9987ceab26e47eecb8960f0ab2e3a98505bdeb3afbf2c92346a5f2564f32611af35eea20
+a497c02335c02b2527a0314da2ffb15d24df06ee396de5d9921ac6557d9f0acbb19c4bac457bd0ab3941b2881ce3e536
+86da85c393f8f291d7d7f5d0b8d98bc7179a951f79d7cd6fd0067383a002dcedeaa71264849284132f9fd69592f59f95
+b602c85dd940c1bff27b3ab7b93cc1981a1ee74966910baf698fe6f1c6be86f3d824cb5e4a8959df223e674738e71e03
+b4786f67b8f7799422fdeb4b4a6d649cc0bdc877487670056fedd8836c298984863986ba1365bcf9acaf29ef1eff990c
+afd123e4d2cebaa8319fe0f4e2f7b80432d58c164e1247228285d30d8bb47ddd610bd57e4ed2d54a287764cb3ee90cb8
+b988cee812c7c6387a814298bb3b39be19f793bfd0deadde4bf47e7ab7dc1db1d55c56fb19ce034f466e1fee6cebf084
+9993e7e2629b7d9ed90b169a8cc41cd7f153356b92a1527eb7b9518138898980c090bfb4d0938bf57f2af519b7fd51bf
+9096ef9a2ce7d5e94d62fd736a3743ecd8ddb9c5152975141714a263bb71ff57b9f8f39c6b15b968c920a53e2039683e
+85462eb8184f23b1d89c24b7d222905bccaba3c2665545d57548173abb60ae2c317b26de99fbf7a576e771566fb3531c
+87cc549572b2287b78c5a28c77ce42cd1eb46ba7413f827403efb8bf554d735f5366a49c1d146cd8398a123144b52ee6
+a6f0a427b8ec9cbc3cfa7cbf5b3f98ad5eec34824620c9215ff6ab7b933231ba1534a53141aaa59031470a3a994e75f3
+91c8bd19b39190f4b8916eec2d33b13f6b3605da7b511d41ed3dd5cf790caa755565224308b266c237999ed396699ffb
+b2614c5953e37f613a1489bc7745bed65264377758de39239b27372018b52d45ddaa174be167781908b59c0f389f9bfd
+8453d03b0a7f7d092354c51901c35fb09bc9c3a1d13a64d944ffaf309d1a8c453e586b481c25037e711976207073e89d
+86126ac6b68429356547d340cc9bf5225e851540eb4e59d2823a753129c1c98a14a89cf497af8cafbe6f233b59494193
+b526157f26068a35af48f3b182d5b04cc3ad352b33e19797dc9f9baed69a71140e1638b639a376ccac978e8be297a04a
+b7f97c6355782783a0df6c9a751d2a06fefd0dc0380deaed494393d559178355558ab10630dd4c23fdcf31455504eacf
+86cb6421bf1e4ab8bce161a6eaac0981506b1089ac537ceeb5d3f6926f5ff45e75cc9b7dbf3c2d01de97635096c3b909
+aa70c056a180509e9b02c5224f63a61abb87f649e28ef4cd33890ff2e49d76acecd0628c4b7edae410ce100d8cd3db7a
+839cfe9ea5543611c1218233dec1c0fb85499b5d9bc5dda58889bd6ab67defe96a66466185a33de8afa4d9340c01741f
+96f908d55d5d249822f9338018b4bb610e01fdb98f690d6dc886a238fff034b534c04e3da28565fcd785c42f127cc792
+b702a0775554e716dc53dc2c2001ce8d69df29dca24ecba72a31f3b76ba6e03cae7a57a359b21d56d2b1fa3a034d24bd
+acb79273bd0b0814c017894dedfca3bf1136754cfcdcbbca4490ad24c034f4f12d48318c33add943b4057036fb7242e9
+8e6ac189af56c52fc3b0bbc1f62b98904769d0bdca1c7d8895653f68ed0e3da7556ee691fe1196bcf9f944a2f2795f97
+ac21009993cb2e327dba835b714356db25199c7892b49f9b764db494e8c079f96d7c5d6b751fb75767eae6f87b7696cd
+b14365e06ebf557eb184c7146f7df72f07674419e31839f995c3c655c326ce886ee909a60a922f3e6d468f446a798eb8
+94d33c2a087c7e33a7bd25fc3bfec4990c8872c897ccc77bd324a4cd7efa87c9611e8005452ad101e3350f9de9dd4c35
+962d7a29f61eb82ef4444f6e114fd4d52b3b9bcd7ad8a96bd0fe5f4483530479a037852b8a34c6702a298d6d76d78d35
+84017833344df747ee5791266abf96431b678c8820dc01cbdbda980db0b314ea581af095d7971db6d7d0867002533d2b
+a45f6d37885e268172dcf59aea6dc997f261184e6acea2135d2a89d7b4646392238993a124da7432b22c801b6e847fb3
+96317db6195d8ab076203f9457db5f38359c5221ad365b31838139add58038893308742ba74cdca5160e00659da5985e
+91c35ac95b6ac02e9b900da3ab881fd98ad0df5f95da23d61a2833c79d9d49af29c511faa02ff6d3bcafc001e9d02282
+83da2069734885b03b6ee13d001f9ff59d7e98cce7e996b5e6abdc7991d99b6578b0ef47b72d676e311424f942d21d3d
+b4c04bec1e45e4e8e33fc447bd08ab55dc9b7cc8b5b0e8ae4fddb80adffa44467628f14a8b0afb9de6ee62b5a5324da1
+81854bc7236732ed97b8743dc2791ca0fc8c93478732832d3a3881cd1173350953cd194bd72885eeffd409d43795c962
+a9534d30a2f9d2b445049cd78c54db5443b4249ebdc45454f3d3508765f7d5419af696fc335a1ecefde473c63309c9bc
+a495a716801e2c7bcdaaf5358db667502ba41e4e82c236574cd4a093f694ee3749b968bfe150cf77e4189af052f6c0aa
+833b994fe58b52a9b3790bd0eecefcd77f146b5d8b5d29c84ec92b578450da8af63b1c02c94fa5b272d6e4c9c17be911
+904bcd0853ae8d33f58c208655d08d3d7788cc732012324d7108436e4201d6e02e86ef1681b013e18089e2cba8b0f955
+a67ed5e0c20d6a599c6acd1507d6921522e461a61fe80af4917ca653a2d71ac4cb63fcd37dd30df9344e79943ed07194
+8639af3e148c36fb0a47f89a5f1cacd8620cad81e0b506f4376af406e0ee86d59698c207ef1fe3eb0ff3f7930d92fff9
+93b85275f836797f4415321affc642614c2545c25589cf2250390fde618174a9fbb7b9f71c2fcfeb2c467c96b4a20fd2
+b653c967b7902b87cecc877a5743e546e599ff287571f92c07c29ed3399573eeec51d34bb9792c37e24d4e9ada810ce1
+b37842a364a50583b2b3dedaf06849c325dc4af676e974b923df3183725549fbf653713945376d67fb87a5f338a05c1f
+94f9122fbbe19ece712ac29a992adebce028f98c63f7d6f6e25e0f0971b301246f0282fafb6f586726776e8b00856e4b
+b3138d0a2cc2a902e6bf9eec98f2981c9257dfb53d9c8f31a0797706d3181a4ccd9b9e777792af1226e41c1ada736f76
+8774a599a9ff5b5e16d4bd807fadbba136f1c8705753163481dbe2ebd12eb298e200acab03a9a72358b8ff462ae17d92
+aa802d6e9dbbc659af0c3319310cde2d28d2a7244f11e10c4cb6290ffb75975d5ca05e6ee0504ca11b8b11c4e926f24e
+90132466d59ce7321c81d21428b573926fd5e1d29abd1808ead82504cc1507ab2d4346adf74280f828a5b8451eab0224
+b9d4104865f1e1b6bf694c3139f623597ccb17a97f75ef029d4ce26aae8704be3351e0363d23f77ad592227bcc64eec6
+885b0dae9c1a051b6b056a4b2ba10b49ea7e141685e63c7bf6423e1b2bf733e88caef28799a29e5d193fd0cb3c5081e6
+819f3a31608f7d5fdcf2987670ad635c3dc0c4807ba28cad9a1c04ee4ea04890bd261a52b0e07b0b7044a4ad008cbc98
+8e710bc738938aedb8defdecac2f92369ee32c0bd54354111b29924b8eeac56422812639a83d6b3187de14b406c88d5b
+86e8af697ae305e0d422c6529d343d7ff251b7730127d5461b9bd015f3837ddacaf58dac220d8b1e3c80c1b7e9cee747
+aa2e8338e14d36082225b81a816d225cc68b6e2e8cfdebcd98815b45f9569b2e7f2b43737205956a110b20dc22dce6ae
+88a2441e958fe2d2f45da8ada6e04781e06cab662385cc0cee0dbc50e9c0a4c47df6dd89b59036c394e0a5a209b18484
+a6eaf0ec69d2b2f2f907759ab1e5e99c35c69a7a1614646478d82e25956af1cf0a347c150a4f963adfb8215e9b296c2e
+a04d223e9733544b08e6ce1a80d7f276d825396b97e87423a808e1b80c1c08b02a4425a766e5e30a156207bad583e225
+b35f6e3d218833156f84746f7e5254a22be8f2cb57df5a518fb24c9c5d232ceea2a2037fa38da923f32ac43c5e6a70a6
+b3034ba8a0a28b967e53acf96ed8b3839c3f4f29e87a42506cb3c797e4e43ab6f67c78220925b063302b25e4b8c0a7cd
+90067fa4ac5813d8f9f4e21efaeba0492b4c1709a0aa9e83095437d77bc5f506c8823f6e659acb68a1a3c9dc13046040
+b4e12f0e4f85e27546b5e534bcea5754fa943aaea35a5658d9c810cdb4808e0a824a902fba89dfeb0af86220c3b4f6d4
+a7dbf474a2e82c9289e850fac5a5e6c95e1888067521ada0995d472c79581fc04665e2ea98ff1d47d704974a52578920
+a01a417c5da6f036c89c1e797d5cf1fe985cfeb16171c629dfa65feb0030894f3799dda25fde4f7c2d9ac260c4a62f34
+93d3a10c0db4c82c18321a2e68dddbd93b92884a27feb756b09d382fe30707df2605d12f8a938dfc84be45876a8e702b
+83a5e28541109205f9934f43ae640e4d363c677583cec6f5e1e3211fc82233f2fc33c8ed4c661d66bcfccaa822b65159
+80c9285c0b12dc605392e883d49376d87186b221a0b0247d1a4cc259fd15783b2c62d7fa7bf996fdc72779fa8bfcb56e
+91e838584d27c75c15a3af2465abb57b3b208f36e2e3b62ab6cc3e7a1d2a1924c3d35cb0a3ef76c86824efc6a0257d46
+85606ae7e00e8425365714b4d443e478256454402662de71b270b94eed43d9ed734b15f615fe6d2747afe0325771d89d
+a4c0337b50a3152198b00b0dcbc76ecff544b86932a4ceec981639bebaead6fa2422457950b9d81bf0865f8c735cd7b2
+a976f5d40d82658ba686aad9a4d139ecafc13c45e5256aba224f6fc3971e5bb63d3337f837eb23dde4af92244da3f4d4
+8ec5174814056e77d82b353e51036305bc35e42b5185d6c621e1e19ec6b3d8bad74695622f7fa04d86785cb8e11c5e15
+947f2505f807e6293b991880602960b459b7ff602cc1ee73ec9ed343ad353758d09bde973f2247a8bb4ead425db191cf
+b509b1d00ab53d57b6229e97cb5d5c426931560ae7f3dda8686f31974f7236833dba7e9aae014ddb1ca70f8a841fa0ad
+81776e3655bea83556ba387494230539ec5514aa460c66a75391e6bcae251e4a4855d466b5100dc611f638487b56e43b
+8dd0a988409285fca7913c1a503a304cdae2cf5d1d6577f907501b7fe7f6bc3794cad18620bcf8de071f6c78e6f76536
+b74538e28f5f74eded6a402adac2d4fadabc5a7ca0ef6580ee8663794c204b4496a634460087c53412627525063fc31b
+b43a027b5421058910b178f47f00846161d054007d771a224941e170ee07c2fff7415aa15b3ab76f0769dd09a09ab48f
+88fadf53da7b8ced103186d76be327d7f18a7e81078cba8ed0b509dc03be4f6c68a94315c4192a88ec4b568de67801aa
+8522ffce27b6ccef18c7cc2d2ee34c3cd584592e8a60df8f22a4bde6b8376ed56d42686e279701ba71e9e6f342abfea1
+b38d2f77014acaf060385d151e6c6a9abca0a30d0200bbec8a4da3ad33b7b4cbbb02f245ed8811779ad1472492a82b50
+8beaae22fc5a8d6d097250da9f2a71ae415a441dc7d2a90d2a34c2cf395b15016fba401c8badba7423bdd52328b96047
+824740663edcdd144c828ccea625122c10f2607bc7a1dac8fc1aa22d21feb635adc509cec6ca4f511dba89a48dc7812e
+8b108e890f01db768ce75f281fca63c2d0ad51a93a12cd5b224c5669db87c960c409bbe563b419134279f5bf218623d9
+8ee995ec787f81681001808d54bc0f4b59c43acc8582448f44ef8e6532c1679ddeaeb9a59471a32b068de3039f3cf1e4
+84913420e365aa1ea5d6bddaa0529efdafda33da30e53ad453057bec865780f0e8e7f710cec7d82922885e36458f5ce2
+a8c198ed2794f4478595bcb26ea008cd586118dfe618aac0d9066b6554d01a40aa80ceb6f26c87990d5cf1fc4eee577e
+85dd4cc4688242e1e2096ae5d1ea3316ad3b2a866e77a079f52b194bd5adcd21cd24dc29cc29996831d4c73cd2978322
+a01f2dab073ee2c94e2a93d6132fcd9a11f4a7ead2a77198415a6fd2f3acf6f72c7c049c8241a5367fdd41dbb4e8b16c
+99e5d15bd8d4e01621472cdc813b864014edcdecbf2d50236cfb27d8033c014e38e0ee86d55356879b941a5074b2d2dd
+b4fe24fbf81158136be6db8e32c326b4710045c36b2b360c1e1cdf9b7f3e3224591d88c7556ac34f1cf3648b45e0023e
+a30c202b71b6d441f684fa7ef3f9cb582ec916f9e2c3f06f214c989153978f4fb3c131bea4fec793c3cb6b8a0316ff5e
+8c0966533478e5d416cc7ac1f7e071122d66cca29ca7283da8d8f8fa2d42483798a7b45df8a2f9a0b976b77ec861220c
+8bffc2bb9a5b14f466b12b2620b31de959ac758799e8ccde00134ad91d037a582170b69231e4a6f349624e110a8914a6
+84a3ef37749eabe783283dc905b641ca3acd9651a0b7358ae212566329765fe8a0eb3d7d02c8cf84ac9f89cc7c1f092f
+a2dd434b8a2cde06e5acfe45734588b4fcb7d8a8ad7dd20101e6a96ad7621ab42a943c7fbf6151f3ec8082bdcbea1056
+a38a4c9a144770338a976b81ea5dc8782228a25064024e5fdb8a6ee0b79aaaea9a45cccf8f2776e731f69cc0bcb53a9d
+b382264fd466a88db982d8b83d8c6a21807c10afc213735d9a06bb5a08bfe9404613cd9c036deef03b65453dfa1b598a
+855cd6bdb77f86aa9e04aa8c93bc4c898d217314f850d0e55e2e435d213871fd4e2b73e46321b4373872678671a2efd2
+b00a43842982205eddf499473deefc3645ba52bf8e606d02c5a2b0528d1ad76f0c18f4c733acf301e05f5854e8cf1cd6
+a791723e8e9d2469077870cc29b096c9bb1afeb9c6d55f0fd0ef41eb4bce532dc2e10cf13c3fcab3ff7f1f22fff5515c
+98f26fa5ff80441af2abef79b9ee3d9785152088bc6212bba7f2aa500a5377839a307e3c42cc34a1966bfb5cdab90968
+a3d28d62217d1b8b5474af055a7605a2cf60d512f85d3ae70b34a31096d58868b110451636ab15707a8cf0078a7591c7
+8cffa106eebc653ee9e35a184035c130e52c1d9a72fb8b1af014075c327ad16f0110f7d1f5a146935565449ea9e61d34
+939cdc45529672571f6eb942855c156a4cb95252bd12fe16e082cee8bd4b8b33aef1307648c340420c013125366ac52f
+a0ef4b5f97a4f7e0ad95e6fc765584a18400be9bc71896772e304e7fc12b2a8ce89dedbfe3a3094f6a9b622216ddf909
+8e040266960e5629f8673314b93646990ddd95467d95a440087199930956594027c952e18cda1ab61205dd4c39da47f4
+98cc4fba2d6375589d6062e19f82f79a5d34d420edf626f512ddc68fc715381e675bb13ee30e3b9d9d810a246b6c8aeb
+97c72db6b896d1e5ada574515813fc6b1833e7b5bc8aa2b853cc580de0829d2bb87322f8becfe42c346f6faa8de9690f
+82e8d494f4b75ece8b882d2bb25fed514571b98971b87ac240f7d6d748477cfab2aee904e796c45502c04053da9cfef6
+a0d1699bb87bd6733fcd510e1e028640109fc389d7581685889e9521b9e5ee3ad25136025b23e783820a86743cb38db5
+8666c2200deef3b6b9330e21b2e342740264b069c58e46bee95984992e632c94723a53624bb30a0681acff0417e2f6a0
+aae412abf586079adc9025f7deceba6cb15cd85830b25fe568144fa6f4e6ae6ba3562f6c6e6c60b4cfb7c7873dbe7d4e
+86b796f30c0447bd08a6d01dba09801e480059fde0c53607d786ecae07beb18a560dcbb0676bc193ee3b69126f7b3de5
+a886596045fde66b9910e9fe065451ae635bf65b2ffa4bb6569d14e06eee48fb3806765188f4ab3cabc18eae2595f6ae
+84fdb7c6f688fb8f1d0f078aef13c448683562dcae1aac49d4b8cb691c96984fe4c47c44802e973e8a59014eee657f17
+8145d34f2bf14596a435469536210ad92c309dd5dc25550c27b4cc4e699b4456eecd95e28319486f36af2f3c77804804
+a07e27baee9073962df0cf1788da98775d98baa274dcd976e301f8706c97332280b525dda993208e35dfe834ee048bec
+aaedc7e5448a2b4ae0ba18c3946c4055b5026516f10b4cc245d9e9109d48ad097c4897fdee3ab394cb64fa1659056cae
+8a66b3e259ff237a619af1f5f04606475a5d02cb0435fd4cbc76326ff0c882e2e22212a261f07ae169ca454fcaaa433e
+a4840bdb2d5a23fdad5ea27ab2e80a5bfedde1a203a45c6e0babb6d417e7434a320aba2058c7bc80f98690e0ce147d77
+922114ecb80b6b7dbf568f92f4d1c3df5bb3247565830f7e5237572ce4f297b907d22cb934743ea8a6f709dd77239429
+82f979e27bd6586fbad02178f74698f30c60d938f55c10efc8a6108c1d231ecaa4077e31f783e2d87e7c125c6ba95827
+a3d7526008816caeed32cc4910834757bcc2a26b6d0edb21eb23c951cf096cd7cbfa0aee0c4837e26310352d755ce37f
+897369d1414d1809c676ec821fb1ac02a4b31c2a7a2b70117bfcda241288fe3c237866c4133fe362299ef902669cad7e
+b60af88a59213d0d649be2851d43babd85745c8c0326980459905d7d448752dc62b092df1b1de6640d578dcedaf21b49
+a1ae360b6111efa07d49dca10943d31e1754490306f9d0e5f1015a1c943a882176014bc2acd8d0cb5494ca92fdbaebad
+aea9be1f403daabdb0166cdb5f24444375a6523ad829d7cf3af3d95d0bd68b93e10bac514518c82aea1377e7fafe1930
+b88a4d22ebc820baaf83559f12a0bb19a0fff4bd9d7832abd3285ec5574095f44f84f1c9ba88931d2db94870f7a1aebe
+abed568d06b6a4364c1e1351ae89cc2918908d99a4462894e8b23f5bcc19fd1300228643b88645e536190e70a271f069
+8f21c94582b716227d120a7c39f3601e8d2b97821fc55ed8c757cdc5929300dbd06a0f41ac6ac2ff2580d797da569e0b
+8f37e8cfede6496384ddb09610c716097f26a601f42efc62456aa18939eb51eddffdc36a8b613a05df2982b68d5a9a5a
+aac43a69bab717ba1f2f9614797d79680bebf6910d682d1e548f67b086fa4b9e3dddc8d600e7846f2aa196721386d6ee
+915503f707c16759f12c953668cb3e6767d05a690f8fdaf717f5ad845f587f4e6e5b8ef1c1db905c7c490ec3c93f4925
+8d9f6b0761f045b69d110f533c6cc358c98237787e6e52997210e16089d3bfa03371421a40e524a003412e2a58166e27
+a8e602ffb00c2cfca33467ba5e63abec1ea4e7a037822173444362a1bc62317b23ce1ac37bd7e66bc7fb65fddb7430d0
+8f498b87a637f7064b0fb3ccf08cdfafd4ebb497c60bd1ef77440da832f9ff54cf7f8cad2c4147a86d4135ae50fcb2ef
+b0993bf9679567b3a1b554274b6b21c24404da8a0b4f38cbe864b4e1980d334919d3bea6b4446569f86a89853b1b1387
+a19026f8e776b678cd359d8b7815575685e654e01d7ad867edb7a001f6cd6d8e3d058088942a1a4aea0654d600d44306
+b4ad341f90c8285b2806e51efff2f6d957f8665605e0aa9c0a3e178864bb1f39e41c07d0397dcd6a058d4d78e8a46973
+97e740c4f9e48c16cdaa1360e5c36110438418b4c4b0ca433660f3e6d0e155470b09d11803ade72eaed5f56aef8f3ad8
+a7845ee3cbe37e88cb1da48d8c0fff7e60b26d9a31af3319abc51975d8df9db4cebb2e4c25716a9ac0729fe31fa36071
+b75df19efd2630425cb696ce8d12915b929922a97d5504c2ccf14d2f80c33c75aea0662fd41f0829ad54a1c3dce26f26
+88b9f09e41dd9db76a136031ed51e60a8eaf07546ccf394696bf9be77d323fbc85de55a435a453905f50d179385c37af
+a592c37bcdc9588c2c0442a8e04f7e396b169cc611b04f140754a5bfbd6feb5ab9d58c262ae0e7e1fbf2d019186565df
+94961f4255df80792cdb9e714f5ff2d57496d50d1542584f29c058a3b53883d0dc7cdb61c9b1dcc6ab4aa58062fbbc23
+a66404ced470420ebc6c6129e32b2cf40181c6e985cbe75a0c958c6b4cce246d9c02142d1a4cdb71b73273ee82e7d32b
+aa76b3bea6f14e21adea4b4e19ef905d2789e51e98425b7ed72c22d9011add2142789e4e86a758cd53ec884f4e861052
+91251420ec91bea38dd63418d3a395605b8929b3ef0c09eda606bd47b6dd9b8b5d99d18d5b99a2031e8c31fd01a184a6
+9887afcfff36dd9ac5aa45911b1513ad9d38d903eef6e43101df9d85e88a6d1b18c95834c5214151eee459d9f57cc7e7
+841e9ac3ab1a2042b91d9bc4b1ce36cada72d9e6196c097272306593696e74977ff7f07f9786e8ccc7e47b964428719a
+8f81c9bb13c6d3ea5927e187a78eea9bfa3f8bef55b821e476eea8a244fb54e4c8e6cddd7a5072bf4072a05375160ce1
+877a822a1bede0a012b15437c12e8e930429a325ea837579bc865443cecc7abcdbe2412d3a9fa22701460c7bb03879e8
+868b5bb9bed16a705f54bbba34316929e30ce6902031b1cb498d846e7a00887a662d2f17ee5e303ac80d4656e67af0ac
+97d5a1841f5ee52b3d09cbfc3a43d7e0606ad94fa81172577a7f5ad5d453bb2bac41e5266894b37e66fb3d157d1bfb3b
+b566a622e5b07c19fed347e55beede22ef5400c1928ee54298288919230e991f217cffc4701b314b9f48b7a5a447cad8
+87cfc897472cca7a8bf04f24e796b688cb2680a20b408113a1a0e7bb4bc2645f1a3e1c68c784a043244dfc0f08933763
+99b8cda2633b72d2277bc157abcd43b80db3895dff3a109c4e1c795a8eccc5ac47030d89500a1fec17474a893ed1dd65
+afda6bedfd1786c738b38f6934f9bd0bcc9717c008b854fca68827cb72691ed8e39e00ebab284595ca7af86b5ec6a032
+b4927edbdeaa0441dce64ad8650fed09ff2e32053f7f71df2da3550d5d8889745c1c11834f6436dba76c6799c681c40a
+94d1c187d7bab9738219f986994fed546ff6fb3e26bc1acdb2bbc76107defb06dee1b04ecf2d32cd71161919e05dde0e
+80d7f3b7be748695b607767640e65955376b79d1188fafedf866c0b98ad7f49a9cae34678513d523467194c89f3c4d3d
+a6c1503ec3208f573fa9a4589bda0bc533678f6d127af369248c4468ff2717278e5aa2ebd1eb570d303cee34a7119df3
+8ce7b9340ea4f0220ba13b5d75c0489f1c5f5f5f5ac9b5b0b546b4bbf191aa77ca7693b6e5fe2000ac9a530d863f356b
+b9ad6de16e650e06b23163fbdacf92badb1f74922492481c3da21699d38e3effc6cbcccbdff3085dd7f81c99366a7c51
+a3a4ad6425ecce4b3274aa107de052195b39dca47c771c128717fab88333d21bce6c96ee4c08f6abb3a2bac21eb24c02
+b8c7f52d9aeb9b60e9f465206f1b1fd6fb031f1724fd54aa95ea5e983311cf0b137db1e59453458ec36ea07302737c0e
+a282d4756e5dbbbbeca8e28dd419d31a9df41368ccf638caa285533318f593fda941a4c5871af05f7f6c65183c89e14b
+8763ee2cd57012aa44f787642bdca5045cea22ddc0b0bbed4e61473b58b1a5c7726121539d6766b32ee1428057da8b0d
+a89939dcb2c05e5fe223deec52f422965184698da2748874b5bb564b5c2eed3e7a5f7a78e76b44e2cf4ab670dac1494c
+a05f25876987243fdd2736902a268c122f2a7047320165d6003e6ca7c68ca828507e7bb9505e691ad2f83967c0a8e9e0
+b934f865aede261b639d63d6765cf9bcc4d85cf8cb84391930a4c2ddd6de0eb03a24b4c90b061694e9fad2aba38e6f61
+92cec5861d7fafdf3c9273a072835114d6e4a0331e13f7af88145f2bb523f30106361be3f46064284cbd4cc1b2f40c6c
+adac0093eea20db8eba318a3bf55f9b87164532c81aa9214a8d897a9e7a7e9cd232d97fd9ca7e30efd5932576ed96686
+a31eb8031d0f068339f3caeb1a6d845d3ecbcc0bdfb8986467e96d0a16d5c9491661dc8b07b7c8c378b84c153138bc98
+b485a3bd930e39eb4e5d0dc572114fea50150148541d10dd927618389c5a2da6da3353922354a7b908707a7f2b09d5bf
+91d1a5ff047845bf25aed4c11f33e02b4bb9041e856f1df75484be24d853f6db663c4a72157eac8575b337d589407dfc
+b4780a9d0eb818571953c1579b4c93532c7fbc63adbc736f5279cf10d42badde0c06c2b1a9afe6bf1e0052839e611154
+8868dc369edb68fe200d3287112775c88e9fff005b143da172b4e3536c06cb90b6b425f78b59d9fda2bb157ffdba3955
+997c280d7bde64752488f7d06fc3f5a887ec7b05504763cd087970f2ecddfc46635b7c6ee03779583092a0f999e9fb39
+aa2c842bfa8658eb65add3bd92bad2c1382162cb648819390b2c9d64d3c0e62d559a20e6ffb30bd77cbff2db202ee75c
+b3b6048daf1a92f85cf037638dc8a2efab333eadd1acccfb2ced33dfca0e85b522b0c5fd27c49ed56012f7aac20c7829
+a568b95e286c7cf960592feaef01956bf8836397e2c707eaf8efd6b4c2027bfa1b0dc7f25ba7b9697255e44fe46f5648
+abb3f268fe89490dde4ae1e62b8855d55a99404aa94c666477c57a64ddca6907bd8b90541979248dc1fbec33a0ad3248
+82ed0c36ae784b264c4e0cab543daa1b1bd8a3f733f409ac19099683a0fd82239f566f3e0cf884505ef9fe89352244e5
+8afade0bf744472146e48d1f9a8b5e9e1cb7b4dd6adad865bbdb5fd486be40c403d9776f29e0e955000aa799e1d5da6e
+8ee8d222245bd33e7bb7b08066a4161e4fdae131247b8227fbf5cdf25cea9dd9f06ced44a9b402b1cd55b36575eebdc1
+a3f166bfd953d398febe9330e7949d8cea96655dc89e435a7eabb77f6e574c62f7900b5184b99c8afb370e9e70b5ad08
+a3e7aa63d063f2e85e3fc69222c50ea247ca003f2f2ff3a68eb740c8d5fc520e423af63bc406db568a48f54b9a4c3d2a
+98baa3a8a39229c25eafcb621ec7621345f744cd4278a148bf871bfc4033c56554f519e658c2076bb5656f9b77011899
+94713808a25efc5dc1e2769836da6af30809f9a1bb084de0747365af029d614d01a0881966ecd7d694ed782bb4508246
+b1145e097d1ad7a8d304688dcdd593599285854142bc797a27f44a43ce544c5321c01f790c07976d29e8160f47b2886f
+989af1d1c28396a2f23aec1437c23350d8c406a6106ad7dea0268430c333375b772cd71665025ecc44265b993197a8cf
+a27c1730483212902364b627f84dfde5c4edbaf8e27673f73b053cdd03a44b1d9f0a62c3770bf12b1c6c999a44f647c9
+865fa094ae0dbc4da9a959cb9d0124469cabb80d2cae2cbd4f59674db08fcb2cca2c28f5cb1a0965eae6281f82392fed
+a285815f6f9b38f2fe0ae3d5783cab60757598a84a6a8691a3f22da6dfdb00ab7b65a162c2714acf370ab45784ebdd5c
+8736bd2c51fd32a3a45d6fa12b5a48c23753a8efa58056217ae3ae8d7d925cc4735286134f4fc9c45b647f2f31d828b1
+b4a8f5469337ffbbc4960f2b02afe25127b27aa2ac073b3d94f1d0b7e6fa1ef141f2713069c5934995f8e37eba5d148b
+a1dc3f7483b170e92edcd14234afbd0405eaec19150b64d0987d128d7c436eee8d353fdec7b784b179d74dc5e6bc1f26
+b8fda1dfe383756dc96383705f95d8573514c6395e0dc6b675ae9df4e58a8fcf42a1cfeec9d13b4c17ca511e49a4bb3e
+a8e52ba9f89dfb4c4d6c6e006376c1e3af2067101414c0d4770614115a16bca52b09b1615a5c9491e498fa692adbf1bc
+b04bc497383a3ee06109278c4ec584e5377da2b16773d84d5196e550fbda1a15d78b2b99c8163334714d2ff834445a08
+8a6b259f9ebee71ccdf673a6a8775bd088f6b2054f3d91819c7271272a684a16f51140a48bc62f86167b8c403c8909f1
+85f4142236cfa3b2957d064c31c5401a14d09474a85144429700efddf0c50b8729e322bd8f61ed4b44d09afe1cdab23c
+85c470febd2a084e5b14c2b339b40b1ee767e9f04e862ea16470d170d1d9bf429dfed415cec0e931df3787412ada3773
+9603f798791ef0365e334c6418f40a18e8d2b0c53ce1fa214d42212c223c583a75edba8e7e15aa74dc492256b695b700
+a2e348bf2a2b84a560318a67717d9c33dbe5a465c131ec804a051fa482d089352bd74aa37873b00e3509651ce7a9f44c
+b26d61fa3b9eada68ecd44fc338fe04eb7adad1066919da6c0ac1147b5f9b4e38d4314fc73f35701452127161880d367
+865a0c480fbf8154a1a4170be713e5d26deeeee6b2858a8095f3e3f2e613dfb7d01486097f9262663c381e2183dae367
+90e3a891f089e7c131a0e3ba2ac506e165bac8581e9b56043714c019798db2a9c10100768eb3be3b10d0c99ca1edf69a
+900dcbde25b6258b82ec686e2b046037e3b8db16c0bac92c14da5653e3fac2f6b78206584a8beca3b4a39a49a4c8c3b1
+8d0b05a7342f8ab9e80f6b4e532d1d12a805194fe3e06d54962b264e77e71cd52ed8f500e6febb8967b8fdfbd2577754
+b4d0b53897f983b87ae22f4fd32a27dfb15768170053188fbc1f27cd300ed425af46ee522eec54ec9fa9feee6cb07133
+94196112213d65ecd4996bab0cf14916959db441b73f033c88b9f477f130ad845f468f932d781a2a357d9ee25121d914
+99e8c44e69076500b0a0318d23c0edd3f6d4a43edfa93b7d3bba5bfe7aeecd3ee12b19be71a5731ecfad4843f5dd68e3
+b702798904d7f271576d2295dbf90a6d2a45848eb6ac703eefde92b0c303089e5294e35129fa15c157d023ea4a3cd52e
+8428458b24892c6ed694a8f8876ecb2c2db05419d6e7040cff3518989db12a49c20bd08a97a67a0376f8f05e0c9ceaa6
+90fbf15dcd3ba8ee1693392ef8796bea18170a887bd212650f9804b3b0f4dbf0b723269bb16a5d78244e0974b5c68a21
+a723cc2375f0728f38d8fa1a8784f41ea4210616e3ec0dbc1b236dfd8ba6f24911fb558dfd3220b8f1c5da2c5151e2fa
+916b2f94f6f4f4a9a0211d87acd7e4dc712701e78d8e45e100e2f955059d0f882a246e766722135bfb377b17e0b46478
+92726d28ddd3da02d9e88fbc622efda082a7c5e60e6c0ad83679517e83b5b58497fa1c6208748bdbe2b9751c30a6bf18
+82e2c93e563f097dcb52966743cd052b96ccea9ca2b831878416128688caf7dd92dce67a17f89f9ef7bc1e2a65d99f04
+837a9c2d03f5071410c274da522044d2e655cbdcec3d300270590029da6e7d6879390247ed595400492421767caca7a4
+8660f329f70b3dd6e08a212e0ec91be5a05e8c92316b5ac875fcc008bb9aa343887a98257e7fac99737a7ea027bc0449
+aabcd1baae69dfc37bc8550657e554ab68c92c9daf4a6f56ce0c9d7c388dbf83dbcfd911b64d51dfae0758346451eb3e
+96856362d4974ddea8195d03ed6b3fe7949930882e2943b38f828d959105a1e87de41f793dc5fcdce12a0e2209ef8bb6
+b39ff1047058b29823f824aa3dba5fbeaf5ea11576114c0c843db8ee3382df1092c11779104aa2c9d203f87b0ad46cfc
+a792d491221238f7b3c0ab5fad58a408f5e991738ed5b3be2864f2c5f638c32b8d44a9ad13816cd80a67c64143ca2bd8
+8a3b31488835be700004ac8acd6b680cf3704277e5ca781dbb72efca2e65f33fdc9ace3444334c85f206f3c162ee81b8
+945dbcddce9c048f9e6f1a2ec8f9564d77e9b4dfb21475cf6c535bcd1cdf5ccace63e3efaed1006cbb49f0717c2ff272
+816380ced8d65af4ba614b3bb6012d00bc2cf7cc1e990a4188a4f0003d93227aaae6ee75ac3202f828f8255030ff8a25
+ac844b97083ea7c4cd4a9a4998698c85ee21fc8fa5fea6e57a0bfb5e4bcb592585529ba4e2a95309eca8e1d644e56eb8
+b44ac2e0e07f64916ee0334f57a9b1bf0599cf4b75e17cf0e83832cf375aabad761ed06e8fd887f8e479c80a033e9174
+a6fca2bb2075f9cf375632d20618b830268ad55ba5c7235b039cd1030a7a7291e68d78bc0d7b847de53ecd7de9aff204
+8407f91ae41c93e9a2f7a5fd5f7db8723522f55bf95ebc53281b08c592fa832a893da65b8319a46a8683d75a9a9f8103
+8d16b3202958f22d26488194bf93f861d0b87e3bb29f2e0d05ae3863634df19338bd38945f81b6dd0bdd2a10a5a5971e
+94e3caee1c0fc176a3818a55f80e80fb1cab6fef21fad6c46dfb766a925749f9f4e3fa5c697c05d53efad50782059f9b
+8076e3edfdb34f679ef0fe178b1b1f1cc855753d9e60ad005f000a9ddf34e314e7b16863a9b52a1c8c234368e1afbe93
+94e1bcbf57598bc3eb0c392dd1293be99d0dce2f4c929228f5f2000096e1f2f3217ab28c0812c7f5b27f477b1ad2bc42
+87b120c919d9cd0ee1965479a8b4e63deb5f3a63e6a7665485fafdc77bf4f7f8862687b18aaa985409897a545765bb09
+a4b57758925e89fa455d8e145ba5cc28d2a5779b0aaac06d789c9d7ed31e91f6992cb9fac2b41949e3897ed21ac85423
+b0f7bde0fcff1ed5db0952e90de209991a1df965a838259eceb1ac38c93bb8fe37fe8b5c0758fbd3822e32354b4d12f4
+b499c556930cca080076b49d83aa0068d23aa18a0f6c8c5e5cf575c33e9e6d53253d728fd60c90d39e01625e40549a9d
+a4bc31a9b9e3530621183b3c0fd85b097999e7d278259cb1c71258d517b33ddd0a5f04e9ab70a854cc5b64308ebd08f2
+b5049a4787992f6a4b23d31ca07265d19f0e0dd1cfb814db01945eccd14eff717d9d7824089b3578c09e13d11e69bf19
+918051ff8e2635cd6a82f348463eb2bdfccfd83497d86418d59ad5843d3e5e6ee162682f67388de70f8096552c9bcf5d
+b35d2b22f74fdec716a5256296047aba7ea84b56ba3de0b3d276e48b6a980cf7beb296daca7bd9666f9c69d41793401c
+8da84fba90af2039006970d2f6f7d8f59e1bb4d714b3986951eda33c2b4c9154cdd7ce1861e3572da435a2b3307566fd
+898e0017c6ec8d2794ba2891f27e84917482e8db68a4ce3b4383b7fa1518ca38995d8e4e5c53712632058e9c7bf2e2ca
+a11853fe3ac63a7cd7c07876508cdb98ef6db35fe4b30a5e6a262a80d663ba5241c3e12d6b5cc904b6eaf9dbd3cb8f7b
+97b14c124f78711080c6b960478832cd87652464b36c30688676c03291783dc48f22399aaedf1d221149f8da5e036033
+8b547b1a9aa8735d902a7d7c92990101f4bd7c67839f6baab60b27447743fb739b62bd57cbf6c082e008a2eeaca025a9
+95ea9ced78849aa2c5eff42ec9ce6dc2a66c943e7b5d84d57e4b2ff29cd3711cfc86e5469590c46c33028f7767dfc0ce
+b6bdbd5f65ad8554632d89d367dec89acbdea3f58edccb8cad3cf5fd0bbe4c16639665b72bfdc7840a1e0fd254b8e482
+abfaf074f570631962a9ff24fcd844250e462d4eae858436c30fea63e59f7f3d36e038896d6cf3d5814c214709082c2f
+b1b9d5f71d924470b94da6f0f9ca122c1035b06bb8e0ae446061a0a5b831a5d6014094cf1577bf18c9e9fe5968d043b7
+89e6855457dc0d9c5df64a85d44fc9c4470def8bbd8b8b8da609f3b9ff8c1bbd248831a8da6900895158153ac9679a92
+8a178ca8bea61e15e3342777be250e23d7f55ce098203a75bb8e9f494adddf28bc3f39cbdd415d3be2812653e7a6427f
+8dccccd65fe3629a0e8d022b85259eab4ae0acb62b8d4513469960d5f035e46dbe47d2759a42b0f734636dfd4c7d0d57
+b4baeb5d03c45f2526201fc336d092f54b5d15288dd0be2b100ab09ca0e64a26f3da98a1e4b0a7c1218a65341dc8728a
+b89fa0ddb60aaa0bd07cb2ffdf50b1b150791cfdbf9f8dfb0a8726c330736ae8c3efc0032032513e3fa3d19f8e337129
+934ba52ebbef233b103377837141729d5382e62055bd58bc466908ac7597e97ae3be5418393ccb73e40602862f738281
+ae08ce01c61fee7237727945423851b57d056b7af398828d22c5108eca4ca66d0852493c0d8cdfa9aaed0d94d0e9307b
+ae793d07a722ec96ca96b95fe60499ab439b7af941a2ee3d8320570a27a226e42d80edb4d333704e82762ef7b97771a6
+889e34367f6bf78fa313ca8dd158a6aafc8c87ce12c72d804e3629d58bd26c4a78852d33544004c10637a45ed4f3be11
+af17544ed8d986d2ceb6600ca01c9f4cc46e974933cae13b6c2498c003f2b8a719a328332845bce498deef3b6fb31ee7
+8a8dff10b65e9b6941c368313398c1e83b0afc77e98dd5928367158aa288cbd970be7923a676ca190f55fe4cf50e901e
+b70b32577846656e156b7043155c460f7afcde96d0ffe527eb114a11e4e403e86c0e2f1f93f8a3fd23ebccfa8fc3f749
+98538a16e4955721765f1182d20d9866096d5161d361774f22ff18f01663a1eb4adf76073959cf2c8d26387d4d555047
+aac37c44436b1f356ab11d85a74da9804fc541bc8efcbad92c285723fa67c25f5a3f00e857b100c297d4f6249dcb788a
+a0fe9caa24c3b4a2324dbfeffaf1ff20dd58bc817b0298cfd45df1b724e7d6c6197e72ba3c7c5c8293005bdaf9524b0d
+a4afe4c7863120653a4c5b86a6827e05f33b6069a02416ccc985eb155c8f719b2a455ade7cd0e2aeddbe22070fac59d6
+b5912a91226464c3887e77f9fc3d3b4ee648c693fdb43174d877f0dd23dba87b79c4fcb06986e85e169248e7aaa6eff3
+a47f4fe084cd3524befe88347df98ca67996866081a0779dd46ba5f7118ed02217d533ccefc330e1d7f61b26004ed828
+aae526538a297fd939d4a2e0e0d98125c1c41cfdde376a9adc23a93073cd4b5148e40140f0ca15f767e5b63791bc923c
+b9f13b35604dfc07ed24895ab35ad68fbed971966926ca2149640d332b71489000f614db6cc1323be508364e6d66fbe3
+b0d1708df1b2b85493de242571f32086a1720192ccffd40431e6445b0b846c0dc3374d41a9eb15f127fe998d5eff15c3
+b38374d96539b82380073117d7de43dde45931aa2ef83b18fa8103b98d364869c8d71f08f325cf4839f75ad874f8e108
+af40b95922b72182751ac0f7b3587b5c8bb374347f03f55980861d2f0ae18251732712bece56ef4589e4473ff9cf43c3
+8a674ef81fbd4bedfc4ade661edea0350be4c2eb3b7c9a42964c9ebcf42f33b92351248c9adca894cc4bf8b77559b39c
+8a4783f35ee15be0f025ccb668559066b946d65bd756fe90c7a1252b9a80dad8357aee6668c1f0444f47e7739b459a9b
+a772693d76b6f4257890215c018511f9384c112097e51cdf44af40b47a02ebc88d83e93abc0977ba6a6c1afa901af088
+8d0919756ba58fca2747aebd729a817b7243cdc68ebb76137cb76734024e50e7544016f9483f2de15c4729d09b179ae2
+94b3a4d8188d2ce221734431af354ba133daf747cc75f59cb7baf819d50c45758eabee3aee178c9aea425028f938dcbf
+a31198be2203ec2a2eae7ab96116606ad6d1c6fd3ee180246f222bc308ac7dcceb60fbe55481c6594fd432932b210aa6
+885071ebb57c819740bb28b6c004d41a2d415373c174a5b952761888130a4e387aed90a8fd149ab1bb677cb550134ae7
+a8c100deaab7b7dc042ae6fbb3643eb2d3b6bda5803b69904d22f031d6ccbbd36836eb6ed650822cb2c4cda3d9408f57
+ae9c2ef68353eba0cbb39bea6de0e3ae4423d1abbb8c44739e1f1676fab8c8a2b45ae1a223526e6e46469575d1cc4900
+8dd30843f14a20ef1d3ceca1c3292186d53c7062eba073f4c38a6eed505b2786fc83ffab0211b76a8e06ac79616588d0
+92f6593f4043e5a15a2dc28a5359b5f3b8e51e02d66236907b00a30847b1b52a968cad17da1e83cc8154557a2e12879f
+b3c0daa751dcd9fdfdbd604ddc3a0767ce094c1226f325c8658b6d8d2af878bbc9551718ea96ecab3d7400ed553d963c
+900d9d5581dba88569d271c909424b4c9b6ad0246c1b0197c1aed58d04be4c8cc84fbbdc43f0ba2e48442ac2772e6280
+85031027b897b6308bdc22c22637f6cbf4b1e10771ae62d530038025249ebd2f777cf55399ce483ad59f31b65270c319
+912933196c27a5a5d5a5c99284369cd8bc9dc6ef2331c2c0e07d77c096aab0e231ea7c569e581550ee79d1377280e4a0
+a9642d96638270ff5c2699f8a0e3fd68dba37ec7528e892fc423da2e45d145d116b9ddb8c8c0fa034e1d5c062127ac43
+b7072eae6cb69bad41246ce431a8871fdd2b2042d28e116bdc2d37c233f17f4a7f08e199b190e2708d3742c2bcaa3050
+822c2bea46dc6aef170728e3d090af0f5106652865e4b7538c8aeec23cbd24b6a19712e46a729d3a49dedf41e42b782d
+b35bfe75f420d966822ee379f204c075f7ef97501f657a3b674dc639ac6fc70fdf70ceebc7953e5853fdcaa39b47666a
+98c9dd539bd14dcf639812ad0ca1a410d2394077fcb9cac3de65da9df0217d635f319de4c7bdff161ec58ffdaae17599
+8913516fd792a83819dd6cf54ab6c5754cc48a1b280a0c1f4854db02a690de4ae11c4b3c7ea74f8d4cbe373ee24742c3
+b7c84396e9f09e225e28f3b5484223f75372d38610a5f9801e09d5a7f41da29f0cf8a0ec075ad82aca9049b610289307
+a3eff696057ea98e56250a4b97c8cdd9acf68e44a96429d405fc60857e417c9ecbf4256abaa282c0cde17c3262eaafa3
+967314e8888eb67be45271336bf0976c77fa43c6dab2bbf8d0520ca5f85d0fcadd411e3c75d239c76585d4c4d6074b77
+80d7881e09b7b2637410145a604a07508e8bc03731372790095a5f0619c99a04e5e60753609c9a8eb431db1162737990
+8d4915d0c384060db69a956b13dff66ed4b5e4807eab322682994cd13f6f04e7e821cf05e4e6ca8c95fa15f91c70364a
+8aff910ad97099ece8b9df612794bb4a36953c8650ac70b97b1f0f4a57e5444fb9f830c4f794335c262afb0eeb88a68f
+8d51cfa1739d7e2342c63c43e950d1d929e42a777859aa5f01b2da6d440c4f656535f65113bd5aecfda8ba91999c41fc
+82f958a1e5a90d0372bda16a08a3b9dcf229d1da6943ca824781dd7d9d30e870510c027b8f6ed3a4cd09f19995ac5c5f
+ae0bdbb5f00915163a17908eddceedace34a14d6448f03f5910e6525a81c2f052642cf022740073d3b7a9950c53d6623
+8edbb4a5dc20cb3098af25edacb904d1f8104be53bd8c4eaa5f914ad71f9a3db1eb372ceda55f14a0067f92e20ff736a
+a342cc738143533f8f42982d517eba9d4a7a835def785a7fd1570cdfb5b36485e48d1ff425709a857a0cfe7f20f43a53
+90a5454dd703e8fbe88d28e7eb13807bfdbfd4bc9ec22b6658826018b244f17f58fcd8658614570b6e987447a569e7df
+a0e5aa66ef2c1ff33da963432f5effba31c9193573f860ddd36228e4a29e3b465dd44cf5ced67ce0e93eb3189120187d
+a19d00adf091a680e3dc91b9b7db02d3e027bf100acc28c08b931afac704d4117f5a9d37187e91b5258cca1040c51470
+88e5c4092929262568216ce66bec60adbaacabd367394fb43c8ff06b572ae7933536303323083837e54381d32ea3ce10
+8afa2df203defe6515f63a00ff80fc2264830aaea02cdbe34292d83f516d4af9e5945f43eb2e6d25445cb6a63037e6f4
+8114179272947f23fa4f6a5a4871561c03f3ed3f6ded5451c8a04ecd2deb987bf35773338c579090e54225d0718859e1
+aa9321f29a00330a5ef053126c84d9ebfb2130dd58617816edb3b8db91414872fd919357260bece160c74240cc2daae9
+8f75fa14ffc34b507113c3a0b8fa540a68ea9f39e900d11b75446038ea331fafdad76ac0dee3a453cce49ac826361187
+a4cebe77db731bc145e6b7023ea66b84b257725e38852e9e445a5214f7d0fc6e6d1129a696d0fc93f72718e904e686c7
+a016c639d479fa0cba5ffceb95635dd5ad22f793dd75e96fd98afe77a549dbef728920013f223c3985e5aa85e736d917
+ada22fa02e2aa41df77ac4f0b59efc6dfd7d23228d172587f8493ce5971d5c39840095a15add87fbb440145cde005286
+b08724f88274b73b3436b055c34a36fd62e4b853aaa28064054705f5eee192e863dd8882e500201b2a5ac0b3d265bf27
+af68227287a7016c3eb8379bd6cc689014c05f24b6a2fd80be48fe2cd295fea3adf597e983a4f2f8672eb536ca3eafde
+8f9d34524ed5588359d8eb4701748684568d6a5a385606fc2765fc622697bcaabb26ed06a574c4dd994855ba31d6853c
+91ff3dbc0ebc0209dec4a37cc9a4078cc3747ff380814e328a0e783d9a30a7add848011f64d706a962300c82d902d09e
+84e4e93ea0822c09f7fd2ab20fdb0d9ee2212df51fb54f79c0c04e510165f6674f4e061a8293edbbe357e72d2a74d44b
+a3ef6b1dcb6c81f3413a9606f64f71bcead3da1621cab8c4de702cff3ea8bc6968a966519311fb3b04f6898ffaa2b934
+85baed0c58533216eea5d8fb00ead2c3d7b7705621e3aa3273aa169dc48030fd17d4147d7ef012ad8c6e78742e2e6736
+83670e8adef8197743aab750dca036619b2332f605408a03e02cb5ea77676d53dee0ffbf55d9d1376a16d1380499902b
+964ae3ed47a75becdf6642d92d814087f354a6fdf302237b3d4ed377fb0e2861da71fe3870d69ec2cc288447dfc92cbe
+85e91aa028f1e3dcfb313bf270411db2fa781fdb47f6f7048641f33e6a7d6d4550ad9a55023fee330814799f6313694f
+a65c1db81b36d3dde2827c25dc165fcc0acbd2888de3fffad30c7ced8cfe52b22e4206e16e81962d23f88da231d1f4f4
+b8cf40de6932ab573ae728f1370d25aa6704ff4ff9a30df7318254c8afdc43d015d55245feb4b8948fcac6dcc26987b5
+ad264d25fd1305d9e2d1f05ac38e04aa4b0081ed51282011b886ffc1077adb13f8a2962a24010243a3e387a3c3547bac
+aceee86acadf975924ba28d3b39d2e5f36abcfe2e8ff7537df93a712f97274bbc081e35653d42c14ed9cde17f5866e23
+a7488f97a965156ecc45be6e65a17acff20404cf33c42b50b020b40e8487fb3c5adb23539d88425bdd8992e3608e6b9f
+839edd6319ed8f0bd1a7dd16662f8cdf0e10edb20a2a3b25778c697406a0dbb0f6d4ee3deede368c69c12538180b5815
+a0160015f24a154d2ba89b51da15c7c6ba2b3b7fd5921b6361d7be19c8500dfffa7069cf1554b6ddc06f13d6454b0b76
+a0d616f8c67a8d34f5d78ac4c4cb82018e994dea1fb87bef4b958f7e00f98080849e210b20a0b3751d7e1edc2f90144d
+ad2101804832725c535830c911d170d81ab5eb95b77a5a3e9647b55ff22714299195a79ca9ce0b9fcfef2ff235c40149
+a396e9fb081f58d7d87dfdacfd1aaa485b0cbffcdd73dc343f08722fd2b78a1d9886d69e3c2e46b337d0f2d113b266e3
+8a63c45dbe602e94eadcdcc480da8c19f3f3805c070d1288ce61ed42636553ddb788a2829640b95da796a31baf1610db
+b81dffff1861bd705bff21841d25a7e6b928665b0240db599dd5acedea06d5baed4438c13567d2e317b0b2a7289a7182
+a433432a9e7527ea1fbe58462dab5a2caded53d73faaa94ad5a8fc9c6ba82371d2e76560037fc3ab71cfc3d6a892487c
+909697ce08dd4a271dfdce06ebaf14434d14620a357507f1ebb684827b00aecaae087438aa12f0baf4ad50bd23f859a1
+8128edaf0df52d4f591daafdb224e489ffa48cfdd178f95e4d8249567ab33af5f43723880a9c2348e264e41b57852a57
+8f258d0d6688d7ce9a9c48a8d60723124299d83fa63a5293f470f4eb525f231518b2fd2eba019a85b54a85663d33696f
+8ab4d3e7fab2dc269f17c1e7999333414a068ee6cb7b5cba89a3913fec37a534c2174e91cc2e3a32d37c1d5a68d080b5
+81f5e9b2caae23d80578cdd80a157b194c1e526dbd46cfaa492396a1c99212c37d3fbe31a6f10bb9d46aca43a0e8de40
+b0ce70a0ac711fbd8a4eb3c4b54255e270fb06b182854b8f43ff6396bd231f53a0871ea4eb50a0ec334383a24c1fadcc
+a96b58cc5c0b0200064fbaff39e67671417a62a9f61b3879abc31e4ec7244ac76bddca1c71c1717754d5281da5c3dec7
+97545dbdb887352d72240ebcaa41f280db98b636f5669892562be259073fa44c91ed3cbe082846791ecc360f30f1ec1b
+b0ee85fbe4a4719534c6b4773c2689097c0649a3656b2f9424ff26857a31528b7426c93342f70312599781b908a83a59
+a6c6f6ea6f9c5de477fade06571ccc12020e17cd663d5288ea7ba45cc2208dd05bd2bb5ec1b6c6249cf0b90b82190100
+97ff89ad97fc129be2766e0218221b0db246aa8c2f639b2f2ea76ef66c68f77cef4e3415b0228aa5b42aad241bc0617b
+b2d806e6b614f3894cdb3fa247074d353843225991c4f719b3224393866c6e026c32e507825a7b8b1caf100bcc47356d
+a348a178e1aa5d07be48e34232b516347f92e1eaa4351fedaad438e1f10231c9f757530c00dac590dd18a51ef48caf4d
+9743734ff71182dae33e372ac979aada54453ccaabb4d3000636bf850b4a27bd1e45f415d472355594b7634c7b01951d
+b1971874c6d1e2ba49743581e95be50e4eb46c1168901692edbc361c706002fc840d58709a43dc05fe00348598f3a1e7
+863f56b08c5c70f3c4bf734a1920671f030dca9d6c960a30e021071dabfd63832ec50ce2438acda20c91fb8561fa76d7
+80eb19d134bfdf4aac1a71c05ca3a465fd138a7eb573d7cfc7005c14fa6b7d3a7ff2db6a27dd34acb2017bcc87356200
+af6d6c0c96fe7f079b467d12e96b9ee673fb44b094f5f98ae456346d987a86f969bb75e67aafd6ac9b08acd120631db5
+8b8abc499cf059826318274ae43fa4d20d3890aa4d5a4345b4837812628a88e42ffb0bb03c74f0f9a8178e222368395b
+a2569780b48343d1842da870be7d49f6362186479ed449a4e4a142f374eb962eb887e21a8c33100ac70281a5ea6710d1
+a91cb368416a31559e5e6fac21074efc194664081dae2766b5c1799356be760a88a6349d431935f50f7bcb5fbd7fcf2f
+a71dd9ef0f35c5ef0e3f5d7b1228b7abf3c626b8f944d9bb3572297b73f5a468d1f7f61425b2ea30f59e3dfa06d432be
+84f3d175ba62894daa9257cc1120eed5cd6a9a3eed9219dd5ffe0efad3e1b5db8e9aa4cc40f66390c6287ce71604639b
+b1db0256b3d835246fa5a101b403b1955c9676cc0fc6a6c8a18d1b8264c5319ffd1475f9ac09a7ffd425b7c00079bd20
+97cad8e1e0e402a989036c10d1afe0bf3f37f6bc5b80ba9a76503ed73c37a711119de53661a24879a8140f046db0b10e
+b2f1c8298ea24a9544c1b3a9aae5bf401aedb2be7ec18a4f838824db529ee42be375f150bb19839a574efb6101312d9a
+9366386ef6259c0b03af3250f4b47214f426b8da47fc21f8649f4bf987d3181611fcd15d4f9aed355786e3e795a136ba
+aeb85d2f5cdc6fd73cfbac9c05462895c15b76b440b9f70bd419d2cf13314327918582bb97ba488722defe1fc4f3f6f4
+939f3e6ff3fc4b725b738a5146c472b9b05bf25f4943a5a40bdbbe4dbc1e2c8fde6b23f591086797eb3fa645b9a51f4d
+96cc6a8fb32262ba66f77e2a3503806a37dc845ac708cc0ebab5a117ddcbf1db639ce5b286965d32fe5528e935c16c3f
+b9c29ab963a1fe07c91d31c69e96b33561a154b06ad2e200347bd4b45da8a92e88f2399bb16b709ad9bad79eb4526d64
+b371d0bd32750c6861ffc8508b56a6ec5da2089aab387b54865bfc995a1c26fce3e72487c1260814bebfcd0faac4965d
+a512416ed09e0cf4b6ec2d26c32c24f9f466153610d9cdc2d9d589fc8998cdfe5fa78dfb64095b3aac731b97dcd91c99
+a065ef8f4ed7549d4d0da4b0d34467427ea2f75830e7eda916ea009589c936da326fc14e8650831baebc8e8fe4e30f1e
+a6b5778203729b5b088eb3eb4221335c01e9bfb86e9b9c36b411a9a93527279fb9ee0bd38d8332d7d27f4dc5bde5c014
+8d861e128c2ed021944d0a1b3c2464cd09dd5fd0d3dbdd904451940a67500c1ac0eb5a9be0bc70abed64c9a0a834db3a
+abaa203eb2e0a933c37b5afb4c87f2f13017ff45be2d31d6eedf1ddab06b0220f2855f19d0661d7f85f9f26e24b564b2
+87fbc271212889afe590a9beb89347a3eefbb6e26017fe86d84b5fd3853f122e0d337a0116ceb6a4638905138385f4a3
+938808e973a6659029bb687b59eaa43fbcae2a2e74bb016ee8d72d8613405d42ac70feca852de0f893d4bb4adc1863a3
+aa8218cbe96b0bdc34cbb8a2db83cbb89cbcedef8732dc7a0e96518d5b26944085a25175568df6e764761309f0307b5b
+a72d58e059451683dbe879550df0414548a71ebb09afa92c611bff46255b3264c1a08f80b73f43295ff20f2cd985afba
+8d31705592483aeb390c6dbbe954cfadba4b3c7bfdd41c96fe37cff15e5f05529c55c4c7931f19a8c5726a8a93d4b74e
+830402323573567e4eebd3a45cb4d920bc4aae9ea8d6729aaeb98a92d408a24ff6398cc8b8f45f7260f409d5f168fddd
+a2ae9b856cb0bd4e07a55f3e6cbec869d5301b3594ef788d0ee9bb16b2a51feeb4f0b2c0ebeb2d7567732af68a545c11
+a37f593131b6eeea297a8b4137d4d7d7f76104f6e389bf506b1d0dc5f3decd3ac47b641ee105d52fe93a482bd8969505
+a596432e4085e7465d033818f362c01ec0e0f1489beb44032e8e2a7b22c9eb75781a814d22910bc00f23c4945997e2fa
+8317aa4eb78107316e5923ce628b0ded12736ec1a4b99a06911736e32194c14707be570811790a053278bcb58e4a640d
+b42002173f15971db599190ba89c890ab06d0f1f812ae56054b4ced4037c71cd44d3b4a05e0b9da6140df6b3ffe37037
+900ae3558cfca95fb570140550b75560adaa3a8c6a2bba0fef52e6a0858f30fc8110e8be24b07b1677d8482e443d368d
+a03d4c296e6b318b1be1929294803e95eab0ceca89d6edd7a3ac0eb599f63ff61512545d2f2e833fc4330ade64c6f367
+a370791b7037f9272847ed51674d7359f085dcf3be4f3e257cb58b33ffd61241b634092dba99778e5b7afd45d4169503
+ac158ca0e8e52e03a0ce1cd71aa6d5a1c523450f1946a7387723026e62537209a90523be7a3e0fdb0e56dc0f587c3a97
+a4e58e394382ae1f54c2ab3a26264d3b9eedb3b719ca9b67614f0c71ae6852e07c662f55dd89955b1513ec24c30d57f6
+96240c606e1373734cff4537cd35ea3b872e10db50e6c1844292e8f2dfc13011c02bd1fde7b3cadfe0b0365300879b01
+aca2f4b0b4cb842361db3fea6732c5abc7c86b35c8e17808821ffe46601bf837d4ad9bd4e2d63096728ef6abd197f660
+aa5db011966b34121f6e646ecff340037b8418e8fe8e5b3fbeb5d41768f131ad9094c894c570f5610e61d1a7fa0bbb22
+8ac096b615435701dc7f5909a750df7fce6d9c5e729f64f5f87cfb983382c908bd82084d07a86cdf159945015a619d4b
+82a45567195020377eb7f6997ab38a50b3b0cfe015bdde35755e1f82b190a6d7658180b541e5b372f5fcf5013c223e91
+b4b380fd0166d4b149132d5e03c77348d3c24de2ab1d6ad58e290e0d1a64366acb631254c19d40f38acd6287adfa24d7
+93004a44b6d837b2ba30e6722806a6f9a135e1bd08e7002f1b1e00e3f167039e0f9a4caa657ff5338db1a3d42b7c51da
+b34996beefac26556fda7e841c80a0c5b773b7058e1dce5d24a6f8a9ef676077725f8ae042cd43bd6316972fcc74284b
+a2f361d240f71b79bdc9d6c2e4a91e9c0acd2e8c30c06b3361bbda2cdb2e8399435487716ab4b3347f03ee169bc292c7
+9840e4e8aa479b156871048c4efefaf9f76e4b74f563050ce27072b0355ef8d2ead55fae908b5f5907e66fd851501078
+b58988544eaf6432b60fe4962dd107baf1d7ab49c30d73f8fef9bb30ce97c2208bd60c6fa38be450ed2f33e6aac7a2d1
+a59fe4a4d54760e6e4ab783a9c06c589a5733ac7b2a91fe55f3b70f9c61c93e705b1381750e714ef21a6c62af8bf28de
+8f9fd78d6827a073ec3689ee4868e98d4cb9fc11826950b858d6d97e9133cb24c1bc9cd19f80251301c5387b72bd498f
+b769d64a58f3b33fc90df5596be30d34eab62dc82d371cc859b1c457fc2c394456eb78be1aec2f3c5168ba7dcf556519
+898a6dd63488a5b79a2cf5a814216860699907ac8c97aadc2c11f81694250b88628e88c24a34dac5d2247993615f8b71
+8763629cbfd47e64d1717999075a6098cff2fa31e21cfdab855cc22929d339516d289e1af042be47e7d9bc07022bbfd3
+95c023e3fb832014861419394da3b9752ad27198df056f56410bf1c2af3ec260d3f156bdf63868203f70aef6a4d69615
+a0c265ff406c8e52058353d33c0e6b51ffe352254d8162fff65dd71bbd6d408d4e9c07e9ffd4c6cc789a734f8aab73a7
+918403559dcd9d1d571bad020550d123b4c6771f02d64720be3e7890946cec25e5537b62d905ebae3fb51c70033c1cf4
+a5590edceddcfa32f0b83ec20923c5fc29bb8351741fadbf0e2b33e0cdbd7164fcc457b1582f924a58b0cd14b2625a4f
+91a3d228f5449c6179c7b5cc7fae5a84cf5f9e633cbc7bd67cca33fd9358e7119a9d6d497622d0a8ba1978906cc570a9
+a896ccd7d373ff4eca5915e957b9fcb9f1f81b86a3b815466dbd684931a0fb7dcf77a335ca1605e6b3f40f8dc6133048
+aa4eeecda69ae4b8dfa4577d576f9c8504598b2554b918b6607040d3e2551bfa3acb513544e910a563bcb3eed0f6bdf1
+b5fd9607e0a18daf2a6cf189df03ccbdf380609d4ac93e7bd6a41b68737dbdd1da22c0855f0f2b86763307baef3620b3
+a881f02800149e2d0722510e8bf649e20cd95b848a6bac7c51424404f65e9dab08a76dd171d60459ad8a19766120db41
+8ba340aad01fa1db841eab78ccceb0a307a9075e73fbb942e3a3105d56cbd5f397882e58754312d3d5d677134b22b11a
+acd41901b371e3d6e5be2ea974f5c28a85b2745dab4a45bbe1a1fd5b257a1249c266a27a8d72613d93a27a305318d86a
+81a335cd393d400fc048e9776237783f330594393eae51003abbe6088e310897b2a2cef8ab41d53b9d1f035a2822b587
+93d3023e4901b3a7afbc80a5df6bb68037eede3a24da9526a5dff7a0343376f9ce37a791836d5aedebabba1e168f2b92
+afc6eab7d3be7f840f84cd377ce3e727232cb7e84f09b5b5c958da7f58f85dbfbf53fb86df0c63b49faea485484b2f29
+afbc391cd89945d65f8fbb9fae653d7eaa34922af6e50febc4b9f4c1dae93aaeab58f3fb7b24771c05cd86920f313f12
+803ca45299970982d5e8ae7667f90b5ec942b8537bbf947c4693411c2be55e9a013e8d304110739f00a3ceb66b382293
+94bbdd9d1d137d37fad717977445c2b47cdab7545827faef98767c6c8a3981e6e265f743f6211e69acc2daa02bd54def
+b8437af291342dac15736f6316e1a416619c948706f43a35a2246f447de2231b1aad10a6b201548f3b3af5d2b69251e7
+a54d969fec830635497d3e5796d9240d1cae0fb0c4cc64499836a8699be55721a2b14312b307ea82de6683f049b5aa3d
+b05e974e8b46cdbf532df990eb2d5b63a7706fb9bed3e36937675330289cbff5151a227c8602ce6dcb3dc2c1e066e4f6
+b5db56d1aff8e5edc041ee7dcd5f38ff5c40069c1c2ff4319d9df24bfcd0013161cf3cfc1c768128fa75ff3627f44eaa
+b222d049daaa343c282f65294122689fd672d67ec589016acbf13d21cb996bf6be0ce02915b373c1b8a7e5ff84d57410
+83dbffc0fbb585179c4a7c3986b67e7fd6eec0db319e9f3f41b22110bed89d89e30349363135e9c45e99fe326a6db175
+ae9b64c78e620d89ccedfb152f67c373e23df79650c334325f1c9d465cdeee6b9a7d181e409289b86c3dd863eaa01b2b
+a244db98b50b6ae80725964ce432b8f117004a1cc50cc7af5cd8d03d4f53095d6ed5515e63dc2a53d9b5c0bdcf0c6f06
+b7b62e68e502bcbd66b4bd40c8cbf96b7e97b4388169b72e0da7c162d89130e244a0b22e74873a73176d182f4401074a
+a984c5a1960b4bd4fa6d215f9d7a10154d95596b4a919841fad48b5de0a8921aeb7140326240b3a61b6d82a02915ed9e
+8ef36c5e37422c43616ce746983a4052018ef98af3370c629b2c7d6a01c2826a99a1f44bc6a8edceb5eed1770e4b2a96
+87ae3161cf5453e3d4e51fb335b3e576a6ae7e5a681641268e4ea1dcca24757a311b31f2381cc55b58320e4c56854237
+aef4349a3e2bd6e9248dfb1b2020833a81f7b29a615a928c3629f5a4e6e47fa2aa502756798b90799b3d12cdebc40c5f
+8e8aa1c55aaaa5437e92681968208f2f0c809982811fe0e7a6a7457c5cb453a2678b3b74e898ddcb0c77689b3cb3faae
+838bdd057cf0f8535a73bf5309c4c2e9a2239b44aca7b7fd00eda5a485ddc8078709e64f5445b27baa0f9e7a67f01875
+8fccc1ddbc0735a9b64fe55934301adc6abe9d3558555861b5984ebced26c69e477672db0ca32e0c6addbdc106735b7f
+b3a19ff36301280020886757f811fc507bc994a9031544c17ec672fab9e85e179572345c6b39e8aea2c180371d198b44
+96859072913f540253b25b4355c23c2fddcec3b3282abe5f3d02e0a759cfeab4120e0dde4e5c734a26bd4efa91e90ad1
+8dbd8e8ef11d529a346da1da3395accdc57937721935b69e45efe632fc7fca5ce1e03113a5dbaf7a1794067154eabd03
+b4a5782b4db5b5f2d1fd431472ea60ca8d1ede74f87fb0d247b7ea312ca316c0cbc8389b3cc2b0ca6f0a80d0f39f4f56
+99923e21d180d6f17b9f10b4d8875b0197031ac75457c1296839498e8fb3c787d12da2c78f4502bb2f9f6d251a2a5ba0
+810058558422ad6f0ad8dc189f623d167734215b88d1e092bd2e49d8d2d4fed870f6b7695345798abff7e1acd87e25a1
+b665fd7132875c917a0fa7bc8179764f3df02b8d2a7df539ada02d4ff8e75377f3db4a3435055b6e0d660deecde1ab08
+b02e3abb9175ebdad4f1ed140695612b67e8634d58dc8f8c3e87ef7c96a741e7c8d1c1136a1b2574fd91a77afee77ed8
+ae2d87c2ad90ea25aeeb850cd98ffc1c5e8c2b9a16377f1e2198fbc510193a23d53848b39ecf64dd46a6cd435011ccd6
+8e6216bd7ea092137f8ca97fa126c92e8d5b660b92bd47ed1166ed7a01babcba7db11f77c15914b81fec9ba3a92e8c97
+8aa232629118b0b945699e402f4e56e65eac6f2ecc4f7547d3537e2e83e36a8a57b3c55080d22d2a5e3a1433b67e5530
+854f384c7ff7323b7bc78400f0f23fad2ccfdbc583f173f7250099335d209bf95fb88c106f24d094c59025158b41141e
+8420368b4221d0fdcc1b855728446055d636c0e7ab2c41ed72c4ed44171cec300bc9d07c42d6b00dc2933f18933964a6
+8f917e6ac546cb79a13a25edb71de01afc8c6ef6339c0ed2bd99c45ad2ead42207ae5298d25921c55649e42643242429
+b841a412f2198d6a55ec27b8fbf5a7b63f6aaf66d18afb8a2edb93e4d1c03505a785739a0fcfeced96e30af988a6ad9d
+a39d2f86ea3df6c0a71e61803f6a1611b4a126f1f2ec986948c34771429a90399c1c9f6495e8c97acbc0c1df56ee2242
+a0289d0c001e9dd9d324e856ffaed6412fabf056a093ee2bccb7ecab7ad8bb4d0468a717f119c889a5fd0a0ae4079e77
+98063963c1fa5ef09bb3947040b1ebbf2fa47847c3e306f11aaeaf77e13cb7d4c6892e166ff20a88d4378875710d4d48
+8b1443a196869252784c26ed092841222af89c4d36f6517e33df0169137d4b0e0b27e5fb3ccf16fdb0d4c77f77e5ec44
+b37cfb13bcef2b83014be5e895205260dbc328bfa1e0d5661c89f017fe84757d95379d9015eb65fada510d8b766941a4
+b51a9e91a25a24b7e4f61de78e54c3313f0ca5f2b62b1625cdedb784bcbaf383d2ac38a8e0d2828d8431183a8b476b2a
+8e120c604ddec61675cf699ba9a59d435f8392588ec9ead4253734b489c0d3b065804579c3e3ef36e502cb0db834c352
+89a87bad33d3147e610dad3c0bb9eed97d46c062d3a62574eb0cde05cead09e4cf943b171303e0de7521677b299474a1
+a125a6c741156e635a9bb84226de5fd128e43b67a3250b69a760f8c05a2fa08c14bab843a08a72496480527c14683197
+8c32ef72c985d6d0b6aca2d18f6588e910a1f6b6d69c707bdac51d6a7c796108ca8cdad3695d9640c8560d1f9ce9c571
+b95ef06fe08e01d86af5003dbf5e2d3f633d3421d5531c4a6c769da958163bcfb4d2940615fb37e9474b047b7d541a03
+91a4934bebab72f7090cc3dd94fd6f9114b0f17bb8149f218e18680cc22887bd22adf3d6acb983fe03b87bb68dbd53ab
+81b450896aca89332a0bb3365314d29aa228bc39e8ed3288a58b6a7468db3915ea5e2be0ae8332863bd5a97c062b7be4
+8de03113af62b9fc128aae45fc29bd49f8137742be455814cb0351f43cf316df313ce33d6963ddab9d5511316201434a
+8c431605c0e09a583125d6be08b3475d9cef5d78e83ed5d8d74f6957c474412deb2bf18957b41b447538a147a75d96ef
+b698b1033b4b7677a6404c1f91d6d71afe48e85ccdcfcae75c92ea119bc7e166a92fe0a89dc4df83d8d73a10b285e980
+aaabad329717f3a0899098e750f4272acfbaef68db41e3af3ee3ebb24021233660cfede0c0f4308b0059d0a222bb6b41
+b88107f155f1e996ed859b7dd9571e784f62ffd4f93e420fde4df5128222a2ee995ab634089904aabcf9bb9e1e1759ba
+a094e712a8671963d54fdc10c97c3f2c3dba58f58c8a375a174242293ed7ba50069000d8871d3fc08527e20ee46976f5
+927030dfdfe56634aa8003811ec409ab1edf7436d01bcaaad7d17bc7de55bca29ceaca4a556bd20ba9aa8089efb846ed
+94d43222a32cb90424d81a31e61ef3b0ee624efecca23a64d68ef79238d36e8e3942d96dbb70cc9efaad313fcb79c6ba
+aa225dd0b39ace4be104a0f2fb73973eaae7de46992e529ad7476e7415924fb936ade4b9f5a341bc9542380bf48332ef
+876a08d3201ce8753e03d11ffdd6128f9b7503689f82ecaf7cf49096f0cf49f1c4020976c77eceb5037041daf1a88533
+a3db02726d73d8c2d85d9e5a740548885098151b85b4ad566b1168db4c008fefe39c8c19c47ab8e2e98d29cf2e0ca6db
+938e606ab19e3cb6c4356326c80a06477b639e4c999a0c8a2af339d45029e73273416bd681bff963d58eb0d51f6de2ad
+97151d15179031d52346f0ce34a20bc25fbf4bce2f22ffba3ba3afb94d546d9104c3abbe5a9dad056b73dbb92196a552
+aad246d39111771450cf05e0dcecd3c157d708f48b12c3939541ac67159dfe5526542b0fc47ceab2348014b6463462ab
+95dc539b8402b15501407cf6bbaf7980a1d5e5b3d1956f3207b41a88205657e2d68f79678740e8882ef42027a291cad1
+a15a0e7d2196e546ebb0814cd655334c5cb31ecd63b5cdf3e25e57f4a349424cc9b18d4bebdb4b6ce3dd5bda40afaf99
+a2516e8bc63c912fc2e1b5120de4eeb8881ff79e3e76069871a97850efdccd98ccc33700a4f45f4df5fb1b7ab48708bc
+8b3d59585cb65e7cc14d2305a339855bce49197490fe011d6c3d7e53d08261c9cdd500956872ac795feb7a8069db5589
+a2b38ba575e4035b6667f42365895cf623ad0deb8f9034d1a5152a0a0f92bc82a088aa6df531de59d2896f17ba107542
+b40407709905d2bf57072f48d97bf616e40761cfe063a4cf46083ffbcb5bb7b4f03365dd5ae3154c1b03e45c41eb0188
+8616fa00c0157abc75b34106fbab547890bacd79f2f6c3dd0cc57d1778234e98a6cde96876b40d2b1b5f41abfa1828e8
+8f4166998dc11be96d00067284b17c5fd5955612bfa778e27136e59e2f50e617d1350f5f71ee1e4fc1267d1312a67482
+b1cc89014ff795080e2eef431f3ecfd4996c91221ed9b2162a9ddf6bbf080d676d00445ef0ff8ad638a5fddf089bd760
+b449e34036924ff051b5632c65bd17e86063c684825df23792a11fc86cee34c04b7f4df1e7c03e626310e7fcbd1f93da
+b9c43a3ba4b3be883879f6edd1c5d7042152aa41350e588339093423d4efb4e3bea017269439809498ac87f2794edefb
+a7af51fd781c16cc82669c814327bc9b27f730b21c774aead773832b39721d3589a5d16acc302875e706bfac404c3ea7
+981af4e16aed2074d7efa032826e6e795d41a3814b59ce2b08011e26b72332d5259f50c796e1bb6a9d00e3cb74cafb85
+8bb3b5d865cca60631534122b2af336f85b422d802e237b68ff32954856be165d4aca1e9524e15001e20773d93dd6b4b
+8e3507b98cdc1f764222a9a3a2b1f1c5629134b9927813b63f541660894d12ba6c7125cedbe2df65506ce5613735af83
+8455432e4e96d5c66f4511d7a8f9354bbea9cedd5e841bc6ec59c8366941ac9653b54fc1e8f0054c1bee8a845f8a6a2b
+91c392d9edb2005daf49189446ed05a06da86f5a8f98019afd0e7265ef56e21917cc5dad39a2974f538b465008bf1c8a
+b04e185eedacb0058fa60261d0c6eda38799b57e26af75865ff986537bbd71af40279fd3ddbed5784e9c8516c46750f6
+b8d711015205854b9c9e132168920da8d305d832f8605b624d6928584b6b129b479825632beaa14aee0470265030ae50
+ab46f74d8cd5eb76b9692e9dc17d766fb9cdb1d4b5150ca2a12104e571eef22589adf6cb8f36bdcbc197c34e0fcc1669
+a64868b7d4b989dfc4b203fa11452c1508dc2c5c3ab70b05553053177a4bd6911f514f654c8538032ed5f27eae289328
+a06eb8f5cecdb2f22c51ae4d116b24b2ba3d1ae5ca78d9b6e68c1236771638a14c6f658451a82e0308ba18c944008b2b
+a062c1078055b84e7d6667ae319ee53d5775780b53ac6d0e14935726969bae506d4cac567d61c85c8fc7ee49fd15ea0e
+af25d65ac72963d2cd704315b2a2644a28c9babd8556b336ec92c2b3858a68a6d9287a169aae0beb3c1b3dd823457dff
+a299af91ca6a99d4b18589977a187c60f77a3969a02b198aeffa37e2c31d97da221ed2c118312c7fa4a59896d3f4355f
+ac3a2bc16a57e9c31287ae506eda9a33da5f6d2d332c3c11e76348b4a88d6ecd8180c23c46b5bd2f3b6131ffdd9a89e8
+9513ab2308945d5663dd78b7947cd7b1af4069aa8ee91e78ffbc59761bf5addd9d175527ad071613b7309727db6ee230
+a6caa49518386cf727a4807441142f0d4cfbe1b5af65b1a481db3a8567ffca87592989c8524e6fc9bb17d152fee1ba98
+aeb5732d108aae10e7001e3975572a7011b3dfed7896bac60ca20fdcb6987ebe28029b4cb88c0c0e089b51a9958a8077
+aa8bdc59089a268ceeba2f1ae72d417721ba7db13831f3f8459f5bfedcb13cd4215db8e95ad6bbbdaf6dfeb22957ba93
+871b8fbe47c39f588b39a83be5bb638ca40d8b67f28c86b736198063116bb21ae7307d074c8bee09af5bf8cdc715099f
+a0a63df7079f4c8b1ab6f03f6aa2dccb66814ad0dd8aeb9bbceff49f8d7f128aaadff1ba9423789609145b0d8c30ee0c
+a37cb4b8a4ac21b98e96c2e6fcff89b858375ed343b84fcc84686bdd34325a94f694ac778b04b2d1e47d8823c50c62de
+b66b6b21fe5b8c2770eab015b9fa68755f9ecf191b71601abfa93b086a39c2519d2699b27b972ee387b189217b4aa20f
+803b6fe1e211e81ed598bb6bb71708c232c4ce30819176d1f0871865d2bc2ecdd910a67aade9b90dd43c4b093f7d3539
+94e82e2b330709ef5a227130d8303b9d8dec46ce62c7bb98cfb32f6237532ffc779388651cf9225b15fa9d7ae0d0cc1d
+ab6c97a5cefef3b9cf3c24dea3606e2a6a779781d8844c01ddb84bfa170dfc17b9a1e8d3d9a94b785a45d869be6f6be9
+b44c2a73ef924d9026b9671ce54eaa18ed04a31d4e208cb72e781c6c6ca33bf3d0719d9783eb98e185854a3c1845b646
+a1102427966a4c31d79eee110307913c1474abcec8792dac7beaf00c7d1b8b9a9c4a1b6839c59a4662c17aa74a9ff978
+8103081fb9da8266acc1389a192819788b617482b5bad78a4ceecd9d61eb7d6d422b9fb96a7701650135cf53b7b02edd
+aa70eec19373a104684f75a2f0ab9e04a11758e7d8d084ae7c581d24eb8de4e730ce602233e39e6985dbac46b5b31d7c
+83ad5dd2b8f2d40a40747fecbb43f3acebafc401b9152c1fd4d6dca191feac67e772a3255af530d6c077166f87095129
+9612d53e783404194122b28814c30692848a8df340e8861219a7ba3a68d48135ff3a17f16745c4072edcb398100932f3
+859b45780538ee93ce7190bf44fed0ba3ac9404126825b5df7205f751734338f2dbf67ce77ad44f8cad2feb3198a29ce
+b4d08630a1824e38ff9d2c7945224dbfd06846724631706a44e0308128f8b32f848094fcbe0d666ed0b68b8877e9768d
+b7024a8522e7b1304e664ff4d994078d6b27409503badfd93b6d46688ee87892498aacb9dd7344686eb7ecadbc008135
+97fd9728c81d6c1b397627f9f2b9c2d325e8d322a2548b5145a120a2f982721d108e67744dbf7480d69f5361f38f1094
+847962abccdc4058882a6191c367bf6b1740008bb0bda738eed9e86e3d4f8c0b9a7802282b098ec89ead52946dfb6c91
+95f269e85cbc2eb22c964d25853dcce972f4cab07e17dbcf5c378166e7f4e59301b45091ae5db025aee2f7ee98a11440
+ae32874ade98cc4735f496d8983bdc40a5afed1925b5d5075c3d762653c8412c6f350b937021edcfa7fd36fcf9ce3807
+948baa72a58c7356278535883fb8d8cd53a302601f24a517fa2bced64f013064b3df50812e3ef1520a89e0a2c5b6216b
+b2b366f316eb4e01f42cedc02b55588ee588248f8a76399f4576cdab3b0e7693c283100f214f36f13840dc552b30a1c8
+82143b825c11793a3352a710ad98fb233ba5ba5fd7f747563261cb7210da1f0b8b5820e5f2a32f805eb71bc60ca4a802
+a00c9ae49dd513e76bf683c9a08d144243593ab3331ad9d15bfd2046eb0fd9b1b030d3ee1c7596c02124f6ea8838f5fa
+b63e46e0f04719f11b96ed24fc78b1436c2db43b609a143a396c17c1afea68c503a06d040c1bcb5bd658d2017fa4cef8
+80ed42fd52c5147ff899b4f6e0006677332408ec6206c9823286af51aa21e4712f1053621d1db012f9ebda7d087ec05d
+b2ea32bd02856d8f16a500cf516744571a326be577a008610aaeefded4e66848ec3ebd3c28d677d49da7055dd9dac3d1
+8e101f8901aff8b93a55827396f40ac816c3bd941e0c4a16a6a524c10657b99166010a6db72e4810583abcd61124039e
+a025ee88b7506bf580e3a088d6e6ba9d987811671d82a8a713149d8766cd9ba6876cef464af3799d117db61a69121578
+823274ffba3fa98e6da63378c8b8a7f126e6bf398ee58c3dcfda9257dedfaefa64222b4e30ba56a344a1312f59be0b17
+b60341190dc697e7eee593b8dff04dd5450c86fc7b59ab4c95047adeb66f550373fcd3d0a7e92555ffbfb1467fc813e0
+b0a873540769defedab58adfb094442fc20e065ad29d49303e7a2e755724d798d6dcefe226a66ccf9211f26075618cab
+a4bf3b4eeda02d170628acb15495967635897cc58e6805fb516d95b339fc72e01bc8c3b74c62b22bbb65c488f3c9a315
+a4fa6be0ebac0bf5327e87d63973ebf44d34763773eb623dd40a9ab09a8db4b49f6bf4acd9450bbc4a790ee8b4347d48
+93657b37b155ecf3282e68ef8f62999896b39d8cad4a0560a24ebf70f68008ede12b68dd7b70cd3f7104e51b903221c8
+93c33362bdb8398f332a52aaa3394682505996a8a0c76e22c0389be56915522c58da4d1583af137b417021d26dc3d84f
+ab338b0baa7ae9a75971b6750cb72457c1e918dba3fd449a576e1b0a9dfdd19356c232aa8f737b212c21831371223fdb
+97043c53b0f54ac81afe3c67fd4941dbba0769b9bed718171492afc07317271a4c36b591cd18f057a50e4c7527320109
+82c54f2950647b52c649ec7f25dcccfd71484c406a53a94dd4e9e63758ee2e559fdef8a4560ae2ef41b08b174a131761
+b35b2adfe6fc1be668745067f485dba3494f547d2603ff28b06fc241d48225a11c85891f144609337d2ebc0713f6696d
+a837aadc06ec942edab4116efc246540ac5db1bdd8981963a7462a2bc3f9397c4c634fc8c8789114cc1018fe8beb0585
+8fe5b4a7c8bb42b5ce8c401f7eeff20c034d83ef10d6e1541fdc135d389545d731258f42ec5e0d30512eee4aab053b7a
+81a42ec920b00761093bc856cd630e117c9ddbd7dd20584990d91e63f972073d9588cd948141fb9d6e9c7b61174ef4fb
+9805345e5ae2a2bb90bb9d058f01a2a7db6fa574fbed6ade4160ed9dd54d08257b1284cc4b80573a8f620aeafff014d6
+96d085def67e05ff835d1ffa00862b5f2380119ed272510da798492f9d5321e1cb5fab1df3202663b6b751d42138ca8d
+82390dde45bdf7f1595025f1c272daa8735c2af90f55da415c7624513982067ee77b54cb46936e1b583556db1c260e15
+8b793c439afaffef75d891d630c2c3bf2af67344ee02bbd3a3f80d02898a7b54c1f0e0527713422ef3270a1b7a32de9e
+8842e5a3ef7877a42ea39e2b614f7228fd77442cb125d14ef9ccb6fcb5ce100e7abb3cd34f009d741beac6015886ed4e
+b8a00fca614badec4996098428c60620b8ac7c41e3a60d33d9fb5efac101d28d5f38601c1d2cade8a8762f12e5c7f293
+985262af141e2b58c4c6ad685e9b7cb0b85195d183d7db0d7449e42a5ec64e7f2a078b49190ccce4b9c9648b9a999cbe
+87e4ad488400ac73a47cdd477457b67b2d97f812917cadda9cfb37d9b03885da94d20eccb58a61c772916c0b5591e71a
+98795f653a08ea25248544bcb113a16f13c36376831076f9b153ad6deccf07683a3db69968065ce672414aed53539852
+89cbcfab11dbdfe1699c2fde2ed918599e862771b7b866fecf903bda117a6c70ba23e4edcff84535f0177e7cc070a37c
+ada23420b0e5be2706e4446208589a2647e59d1f3b072448f7e4b04812add50dced41c7e41fc1a97c60d04c7144e5324
+a962d643ed5968de32bd6729c56ffc6a6f237221ee9952b28b3723179f6308d053fb484d199fbe6793a9e6fa16187cae
+a2ed7d506f146158d1be02e9a37b85a4462666d9332f45d0eba95e87810f0b47bd219aed4e3bda0e456e3784847e8ff4
+8b003cadcc9e7519bbfff1116206d13ae9e9ee258a7780fa35749e5fdc9485e934bd7559438653d62031afec801c8bb1
+8676eeeb2dc70760196b1313bf6a75aa71cc692a64c1d6fd6f6922e26d4520bd302f17ab954bd4016298e2bcaf91316e
+af45ef2ffc35a5f8dae6abdb373f8958ff975c9f7a2f74ba1545c2f5c8abb3ef2a997818f8fffa0be760016d3aa19cc2
+a5260b2c97ca579d72c13daa826cad8a9da4d5902443d29e60ed67203e21a7fddf83344dd94730e8f155aeb65df4e480
+a19267cff056a022cc8d0af55d41e78dd9152069affe22e9fe9d9dfc848aca4aac4909103b35300b358098c36456007b
+909eec06302c81ad6bfd3b96daf577456d28cad59bacf933fb0139cc6aceade01a686015d2cda20d25c778b9d00d5355
+87391a5bbb409e0fd6427b6dc805b69120181e34f53c73c0ae11e0521e97e036d5b736250f95c8ecba37b7ee27ea20a4
+b821e81e4f887d5780765fba9c79599b3fd74840d7c2578e03ab8859cabc982f4fcf9987e757a150aa81a000ca3442e6
+96470df0be386e1bdbbc94897386f22da7a80df9724927363142b074beab1bc16caddfcb731787b18b230becfa7ab0de
+b7d1e2de7254a18acffdf6c2cb50bb23be3030269a230b1237a0bdef1656875cbafd8736b6ef07322c20b8002e9d8d5c
+84e795c3d85b5f526766a32362c6f7f2fcddc99e89734c99929dfbf020d04f285a4f44f2d0a4a03b519375db43fb9f89
+95bf0f2965d9b29592c2168c79957db4779c9ed8da7ce11da7eb8d11c0fe165f8c37a38baa398af78b8a963f674282b5
+a6253e4f2090efdb5c26c0d50fa5fd2333e8f245b68ade9d6fcc6357ae2c6fde5cd0d1c6e5fefaf102ac8ef4122ae238
+b2b8692016f5fa5dfc720d382f0fc05f37c5726087198f5f6fcd6dc8105bcebf98ff819870e2b944c23d6d4ca8e7e62e
+af86a8f6ae1838ebdc29e2d949a1028aebf8f5dc7d2e907396db3d112d236035679fb2e0fbb1a49453ef120cb75bda88
+8da2742e7215e490e38a0cdd851e95ecec258bcbc0f5b49e9846397e3062dbdda8b5decbe22c7615a851928326b26ad6
+8d266bc0dfd6e35dd975fbcf3eac55103863fa3f62c29f12c6f825961670138aacc1c89829c88a8e1d3caa44c62b5891
+a40bde477fd236c36981b8bdc3191d70f01fedeb99a21a525ba8512eaa614290feb98cfe9351fe39c27d12020ef46100
+b3856656a88647aca31dda0260a6f7308f7cbf7dc93a0fcfd81a683cee5a008cfeb044d0688022da5f8fe52e7712c742
+8dea06d82705d27403bc89cce3cf99125709d6baf92aca6f40931cbf4ef1346feafc6f21207b897416ff9a2042ccf127
+85852dbafe41d671cc0c5014a6a666b933c95f831b4edb181b7460e6780ee430540230c2706ee6e1fd669bc9369c4421
+83271d68b89db416fef7ab75c64883732be779cdb7898eaf7f84f9756b006183c454ab99a1270661b93347cb25d5ec59
+8d2ab5e538c44cc5a2427e367d3d2535964a95185f0cba457377b53b9079f806df0a74c475543a80d4397bc60ee36877
+a966f71621491a0db22379473021d8157c3173d9ae7f331e076bb51b6d5f05b76d04656e702c78efadf71dd24e844692
+822f5d8b0f4f19f98b52234228a3a4d599c5391df1a019e5c3e69ef5fd39a49c396396488045408ca3f83475f5a94cf2
+8cab4eb002432c0044e0f1da2c8313516dc57913df7e7be4514e9283e759bf3e0fc67392cc09353d8d09d49a42b5557b
+84db5c6efecc833af8f4748f1c976f409faecec916fbcad97a4424f0f018bdd837e4411285ee912c217ce4f8b3494eb8
+993128e2d935a83ecd7ad5a223fe53c7915f8b258ceb680df88a682f3abb87edc922a4f2f2f16905c3f493ed91e1ec69
+86db3da05f3bf2f21aa3d6df245f35023eee4fe1df6f83c35ed060b17b51b5d88db0597a65ec6fe78f2f0e429362eaae
+a8b511e358d9b7f1211c9e54038540871864cdb5af32f7dfa53b9c042a8443b73927c9d42f88c3e19574e575feee0a77
+a3c8cc9ccb1bf0c3f38b147b4c060ef3c25e44524392ce244bba1ce3fa90d2b97f9ae61d95b5fba2428e5ff85a7a2f50
+b2fb21f203e07478b7ab94bbb22d1449567e52e3d41327d2a6d140a70a730eeb22b617e22882578bc228d082205aa5e9
+b22f61e7ed6823abbae7f7afac5ccb4a0265ac5e44ba0e362512917bb99a19c29ef93676af86279ff0b1c1e21b767970
+b2b212cdb1eb680d863c592f9d18e907677acf0bfe0b1cc824ac67cc0f9e8fac383bfcef1b7553e654675388509a7fc3
+a5ebe9c66cdbf144dd97470199108e50110d24cf1827df6d3ec4c15ebedbd4c588094a66db761980a5ae1de0bcfd0153
+8175a28a961b033467fc010aea4d6401c322c17b8e50d682428365b34f1edf87e80b9d4e83e14351dcb58fdc16d4785b
+8dda8c206dc3daed2100208494a2f74d5fba3f0d4157ce8260d09fc43eabead01ffead91898af37d6330fb1d6492a3f5
+8c97f0469be2c1e804620840f2fb9add5e169f3d9a515054c4c257a633f71a2e2ec28b64167fec1b25092d359db7919c
+98d7e6bce9423142d1a75898a5072a89fa2ac1cea71e2ccc52421e84d6bfe46e2a827e053a8ff1956ed87e554cff5ea7
+b37a7bb826efb2c71ee980127dc95c16461efa9da85a1af5c1f07a05cbc923b571f31812513e42798db148534302c2a4
+b23e5692e57914cdbbd48a40d09193e8de74168d29e44eafcf93acbeca3f4d38946597d23d0f203484b6ccf26fe0022b
+a75e05a667d03207bbc23699af1e5bfec382654417a67cb2ab43b7827ee6270240033624dffcf522e77f879b24c8c51b
+9082f568c7dd35651afb5b3a4a7fca8aca001168337e0a372daffea34693d73d582f1d39b860276504bade7088aba905
+a384f338360900a0c9676d75b4ee56b1a52f615a12cbec40ab9653132668fc464807d38069f34fbadde6fc44b9b17858
+99630818df6d307a9bec472a8bbfd59ef0a718aa6d6e1a0a9c1cce94691bcbc5124522edc0187f2aabce454840d3ca05
+883b09861a544f8b36a69aee91605df08ff83810d5a01ef14989e9c6d9983929f3b539f67887431729a3db5ecd8e1ffa
+b31f237af63f7bcbdeae18a43d2c640e8dd33c31e404225e10af733724b9a80f21ce9958528a30cf8fcb0fedf5921056
+8a120f0bf0c1e8dccf5092f8a3413fd81b30dc728dbe0f67768d2152b16ec286579c9fe0614bc7139d5c8f85d4542517
+b8400f4d89d747aae0e8fde37dca6915ecfa64c34504351ba34fcfd91886fd670944de3d5169bcdd95e7271ff67f2a06
+ae3658b2af425966770203237b34fa49d429898d82ecdaf685e2f82aaf3370efcfce31b5504c9109f048c416d4239b37
+ae3c26c8c9efaa1dcf33f5a2d9196a8e8efebcc7cc1f77d792be45e27c0f8dd7280474f4c87be9d0d898587eba6b5074
+8d2ca62a71717b9c8308af1b2e7642df12e6dcc20b6b83ff0e426839e9aca4b82171c33b86dfcd10e2f914a4a2e27111
+85c4564c09f5ad99ae5f51f587895e6a5a06e5f513e57fc0f91609ccac4055881a1009c3c45900fce6711dc7fda9db90
+a1dba47ab222520779e91c024250e3e454f7744d48c04c809a07991dff72794bf5990c5d23bc82e441e7d3917fd6de5b
+ad65b935bc07538780c56b735460bec2e647d321f28ecb20801ff313a211f003a4e1f9d4b094d0c66f238cbe41f08431
+a9c322f6fcd5e831f10be7372b8be14369b0333f82d87fb444cebafe6cbf90bdfaf2952b7a310d76831436100a625862
+ac5706f371793c45162e72812644293f491ff3b9a974a025c62cc98689e801d25c79f3b072fd62060afc0d05e07ef85c
+a9caf447df8db5679a3e88ebe8aa8d0005cbc9a1d0378817968e44ffd55a23026672e75eabc20e7739e727b98ef0d377
+b168a9731835b5d6a0b7b0771dc6776d3acc079f114a60912820f0c5ebb705c465452829702a041f6c9bd24414f94c6f
+ae5eb5a2b9ebe9131e394e9763108ec279777ffa1a6f5b8b6681dad229f20a9c1778f23cf72d1a24a753a65360213132
+9563d136dc234ff6eaf46c0630a163414f1f4c37d22448744b368c15f77ce11f42094b4b5e49c870ceeaef3424eaf89d
+a39f563d3ae876eb1629fb0e1e5173b096da74b57972ca630fd7d40462a9abb14ad34496f4fa8e4dac6ffff08d1378b3
+af9a1f6040f8936f3af1b3ae86efb09f7433eef92ef04527a7f960bf07f091cf54b7d108fd7b40b3a9052d5be1061ff5
+89ad6c6a1bd71a413895672fb29eab7ce146e746778dd7eb4968f551d57467e16e1f0ef73ece16db4abf5eafd85240ba
+87a5a23d2866b87785cc7159f475080de9c684963dc415ae3269fd0b590f5c9862473c7b6ef180fc7b96810096a3fd19
+99ccdecd6a4df1056e6eda6820cd2b6a21450d0e3a78131495767aa6f34c41e4593f78c8ad3e593f80fc6c7615a6f17a
+8902f569efa24ab3c6facd2b52d5f9a61a7e687d5837dcb9b2da1ce34a76a37b86812c75f62871d0dbdff06b42f077f5
+8b32d41254d26cc93bfec4e5e157bfec7a2d1f15a0c7cbc4562583e42588c1dbeb2d6c47fdbc02743a4dd0bf5af17675
+b391d9100c90af9d8ce6224b37b763c994790a9a97fd040f091d6fcf38c61f6d39944a14fbdbb24aaa9f311f539b7a57
+81e950e8e1d8704c5017e19dbebd1e7f8a3c22545815b840f42d2c75443c783f4f4c2c9fb53786b0a5ba1b36f238b91e
+b80e33661703bbdac230ac7759024e5bacd83c2432f7395311ab23a02d0df677d5f4a832be045d6b9778a80f07cb2089
+8d7a57b024391481985add75ec5691eec13e9463195ac058e0488e54ae8a79dad3a4614790f853cc56dc9471d51c83ff
+a4a824c80b84864865cb70b6480666b6297d65e827936ba726282ad0e0bda9787338909d3b2022762c9f9080e196e6a3
+b5a18c00759c83f5e417f0fb412200bcfbd3cf991b14a1d031c0cda35b539ce8724693a6f1e99dda25cc333a0c2d9113
+a4b6659247365ae1d34d8adbac5ef593ab9ac805297aab76f3a7c5512ab658ee7793fc0a27c15641a68d76450b083714
+b8fe57f1832e8f84ac67c1c9b293dcfe6904b51aaca5d2be14686974e110dc0e19c6de94fd75a5bf3259bae1a32aae54
+9734c43b2261feee5e9f3c2407221c6879f1c373f9a0c4d5e926774ab1ff28900c3bc23b4ed4e3c376f142c3ac198c00
+9693e8ac023bec1ae3f9f50a22d753cae7563a98084efc6d8459dc169d49ee2d22a38c1cdfc26fbb75e2b54eeed889d5
+866961869007a8592fac6f104d840f564b24acba1376c5704db2510be47058e9863b59f4f326d530fb470ec473552c80
+a8bb285361734bae3b5110fdaaa70facbdcb3f27bcfb43ac9953e28f5dc844f94149a53ff7bd4749d7f8833948f88015
+8e9e5d9605fe356d779e242df3219c0ef12bbece370ef44c4c19674a7873a477e5903b70d8fbfe884ccdce4ae693267e
+917c27c26cea38d8f0351df8c8ae3ca6332cbc5866bd52bbf73767cdecc62a1d7dc9c562da90a6796c8d6ffae3ef1952
+a3cbe2d6a84c296423fcf0e6bca08b1a306cd686be8486b7a7e030b7cb5c5f791bfffa38b1d51c5ec5e9f9d02ca8bbbb
+a1c019be4651babd247be6f8f5a8fcdef0c3afc62d06bdc0e4abf51559dcb19a95f0ecda6e5fb6df659ba5fba904e67b
+a9172867edc3de59059de8109f14fabc9cbed1567fb1dd77cf7b8a91a4e00bdfecc3f6b0fc149d63c75c488bee3b4bde
+91213bdad35d8c4cf3f9e1305da45b0f202fa8e4b3d872c4d7f1870667ebf5174b55e1912693e2850ccd3e507ff07923
+99a25653bab38a306a04c66ed0bb196ea9a522d0e30608111759c0752fbea1ee10b6a574c3e4ffe9ded91d748fdd9957
+8c4b08b4c9c5db17ebc393c279aefbd6f228b2831e94f298feb04a3cd4cd5cc5b7a1464e4884616adc1d54e6c6654406
+ae47e73080e00743a2b8d39b1a296fa47296fa19cef0ae2d4ddc949d7c18e80c44a3b43758e2deabec96c5ae8ebdde7d
+a4cbfc4f49e3285acbf2a3e9bdd5c328a5d2f0f38c43c727d424c36d7e97774598e844bdecf7cb85f6ebbad4f1e6a9fa
+85691977690857c611f219555cc2aacc305826fe68c735b01d562a78241df139023e1d6a971f136a7496e5a2073d304d
+b735f6e75b63734e0f3dcfa788d44bfdfa1658d5edd3cb36f54699ecafde0441eefbf672d7be9aa5878cda81c3903499
+b4ca2ffea56733bd0093d2a6fbb5b80d743444bb2a3003651a3929c7444bd4b60c8b6394d06f9b282c4f787e48a04950
+857b50a9e21ef372ed5e04ba189f9b963658dadc2014034b5e8eb594c64cb4d8b0c45146759136d0d7b537276eb3e85b
+84a36f7781c8cadab24fe41d225807ad19396435d602deabacdea6739ebaf3cdb227ce4533b2e558e3894628c115d6ed
+8421a4523c8b6645c16aab3cb2837274c1789fe6d17a7a646d0b60c6d3404175883cd1a10b9ff001a8119aefc8177b8e
+b58457173e92fb4a01d043199478863fd715270210e2badc16f11f22d685dac33520b16b2d9d9d27c089eb9caa37ae76
+b0faa3cf877801b399a0df58ca6ae2882a895b01f207f7006af366c6a4454a015db0318a2221e91418382e71f3a0471d
+90270514cdd3376ece65eae4a2b2c51b1b39373f6643e82d9b2e0c8576752c81c1c5c964b200bb239894ae267e61d5b7
+8fe94f4f6eb2f9d60a7bbec546bdc2744444f5e62555e30d11558da42efcee1947096a514edebbbd0570860d9b55e069
+84330eb1f20a6998af40d4b9e7ee1c1567cedb0401666a10c0d996ccfd3e7e9e4edf585e1fc2597c34c45f36d457057a
+aba97d70123cbcca89f325474fe8f952742eb092e03e9878cf6e32a5bd20c4ea92844c5311686cf8baeb72402f541a2a
+81e8bc4463115453fbaaf844d59484cb83f4ef9655b2d410e33262dea0902f7f8cc41580cfb6b4987425166bea1ce3b0
+94f8478aafa15c41539adb3309c919a9606afc1edb590930ec09d2212781e3c22333a2ae83b6a86d237c873ab3e28059
+abd522f0ecd0490b21464d4bb5fddf6a123db84aca829f66595812b05cbffa5e2adfbb6e48f0ce3946fa7e0f78a2bd4a
+b5dfdf94da381ba5eaf3dee38831b29d053f90d25baccc4dedffd2f8f5b7d4c635a5adf08a992ce16080514d94009732
+93f59a048a8140b5e112f100f426ceb923a63e2585424e2a6374d3d7b979f04e5a0223f6bc56c5c26b41128b272ccd5a
+b7521371be289921fd4f230a8c22727997ccfbc7aaffad9f89c10811a977031e5a7a2a1f924fc4745339208ad86bfbe7
+91708536a804e4feb12184d477935ab8aa80857ad4d2a3ecc25b82e28eb064f4f7482873a841ef90ce38a2035570b148
+b193714c58139bfa0fffbcb23dd77dd67279855b16965b23b12059b8b7c8d596d30239d0e7ddb8eee4a506b7fa974af7
+86e780e0be5105efb9aa74ebfea109ad286dc7c2f259165f78f853d161823b20d88afdca6e5630e04a6f01f05ce52cc3
+b03cea4d3e78cda4879eb498381fa06336e49b950267c5f4e9569570a987e120f7f7fdf34cca04a448feb268dcbf737b
+b504ce6ff4d2daa4a87cc24ec0e3c540d32a6e315d8fa5e95561428aff4694cc8d8aa9be4074b478482cfd27aa7d5482
+870045338218d28c7c04b5c35881a04eb5b5aececdc1aa0670087cec292eb3ed7061e25a62a8476bd5be066c01add42e
+a7a458be8f7108b009be6f43bbd37d0298575f3f4a2088739b0117fcfeed6c067790c3e45390bdc95d93f5188dac4c8a
+a91b31776550ff92e9ae28ad985763866475596612f041538cedf619dc68547bba4394aab553aefde1103d0b7bbd7ac7
+b5afd11d971c4e963039a6632b244970c783fff2d813d16dd64fe39e24fb7b7c1cdcf4e8bf105ed23016b7eaa7a42031
+afd6bd91477dc741ff3c7c9cb6f95268b213480df214a125e91f592ee28ddc5a7ed8adb15a3dd2d50dc793d1016f97f9
+8ae49e2fc2aec47f422c32ea2cadb055d1b11432f9362283a9233cec23d90337001109397b08dd640471f13ea5c75feb
+918972bcf1001b9b29b1e4c236f0c804caa618af7873030672944f03c52e465a512083ca57ad7c4d27dbee9e0598c9e9
+95dab13d1edf88871699219e5a841a0d29f60d1a738fe48e5b994ad49fbe4b193bdb520896593cfcdf3ac54c0767545f
+a985c2b4a52a592548c14b8b3fe1a519d5b43d13a7c6ab8469e62518c89dec4091a8fbe39565951cc515599391334987
+af5de579f796194538d942cbe4dd17db9022bd4a1e733fa6801baabd062ff04b91430232c99ba0a64da117089fad3a7b
+af0630c3973c54081bb5311700267a4e1072a2e031cef7b8a759ae70d34fe460f81fd9902078f57df82ea9a026c6527f
+89fdd70e79239b6307117da507cde8181a6083c0b3bd92ec9501fdeadf61e98b9bcc65f76f3db7b5343c9c4e3edfa47c
+8a8457c75030580d719642a5c19f39d9bb6032e9ccf59f033d7857276f61a7b71c402bb60066298e43e3ab27e1d17178
+88c175887b19a4540bfada4ae515cd5b88c814eeca464e1b4aefae226a9ffbb82380836c3d0e2bc23aaaa7d2d39cd988
+9169c8eda5925c9658d7b89424362c8242ba9c94de010b27622681f6232fd587dd4215c96ba6466c2e58e65099360f1a
+b7606b010b4ef7cbcb05fc4ab2413f9442da376c17ca59ea64cf3705d54916881dc34632a3c5022b092d68aa92a7f34e
+afe50503d1fb68471f14116afba2d2c3ada54cbae919116971792fd1bf928af95338ffc79ff877923c40bcbb3fcac884
+84b8abf84753e7bfa8310a1f28cfd0e548b92ee89dcd7d9f0f4d9f8bff32a47db28e633e531c851d4f343ef5aec63881
+a601422adfb6ad2f2619cecf13b6a7cfc56efcbfc6d154f17dabe036a81ee885edec82bcb46386647253b38728d2a662
+941dda044f880e5ea1a3e738adaf17d1fd5e22ff251cf8dfb8748aabfba36bd0b54cc5450bb92ca2add2809f192e1e5b
+a3e262c5a365ed24cfa5ddf50236bb0e3bcfa3b65561e0bb7422c8871cc58b3671d14956c725c5ff1cd10e477092525b
+874fa6d7a9c062600ff2bc836590162ac38b325b3460feebca3bce994c39a84bf3d79a7c716936c7fa8738302397568d
+a3b510950ee9dd109d1507b24f11c725d8132e57960f5ebaea1a0503cd63d70eab022ce3548a96816abcbfcc6b95d872
+802badde14c7c17e5c0e33ae8bbd9d47b19d6a48d950555871fb470d4a0904bb99f12352248055f147236dce9796364e
+aad6a156f82758677e6d11cc7caa66124dd0038ec15697531d89cca99337b1f817bccc678d617c2be7700d320456d993
+8fa6f41898c20d2c45dbd0bbcf18730d9e14d296214b176b3addd2b56582f22fdb0efdf743936532a94a1638fcc6b0b9
+a9e741ce09dfa9d5d845e0fd8a729ed088ac5d1b6a84709ab0b753ae58b93160064163a72c38c7ad6628cf7278ad1b26
+b1d07f1a7a19affe01f1fed47dae377ccf1cbb3724650cb85a40dba5f4be77aecea8dd01f8539e7071c252d348e4299f
+b2ca0f4f725f21fbfb39e151dea4539d961e55645b0b32bd89a94b5f437e6b3b11733fd39588e889cb111d52a2163ebb
+a73e4493bd5e8354e8c43a77f4509e411e4f71b41ec57142f5fb53616c26eddcdf87b8e58684eb0215ed91ead8aeb028
+929c423f8ba701474ccc1ce8bbcf0bfd13d993ed8915f628b9a447a87df32ecb8727d056785a9ccf1973d47348e76948
+a6ad64e1fafda6a7ff88d4358b5e56fb0ae0dfbf3f7e4e488e95b75b51ea432eea257523d46fcddb0171eb10d92ca96e
+89584633b7146779a810226a3664f11bd53db295f6ccbf68bc75ac65d335cb1ea2276a630084bff9b32522379342b0a7
+a7d48d4957df57d02dd2373acba5976f0b0cf5a08bcc75ed5ae3366b8348a6ea885f60745993cbc7d08426357d313943
+824c7fe6f5ccfcdfdd9632f404d0a24d8ed31efdbacd2073c4df0f152905783275947b2ddb4e16f668c7961ff2c64b0f
+895b41fdab7ceb53c0e34a9f9102eac3b07b59494b08dfbabbe371c724bb94af401f0a088b057f141f7d59ba37630e9b
+92964eea33e7bfaa502bb14a61f7b11d6e78579b47bb42f5b1d9b76f776c0d4c39e3edc4866fb2d5eb884cd6393b17d7
+b6bb929302086421d9340d59f2ab09b70e9de5c21f1aea362acf0ff9d12093d5429be7b79c73db6744eca6655e77d810
+808e98cb92d8812364b5d4df334fd2d5aadb2cf28bbef2687e488c32d314630b759b21e01d14e306faccc2e7e18d2b1e
+826d6371c5cc0ce439c2559ea7956a5d08d7e4223adee421177fff534630d719a90d9098cfee50b84eba8504c6b657c0
+911aecdd90a266f90edcbe0dce1d60a8aa3f1cf0f5eb34eedf30a552d298c5a16a59bbab1a6ac8621e33a109c202b653
+ae6760730faedeae6c9e04d9e238836b66565c5d640d6faea105d6e2d80d0729c3ce93e52983fc2570da82c1f813a115
+a171956ce56ac78660f3104d95a920be6e45b403770ab043ee745337db4dac6f0b29675b41bdd5d868b91bcc5ea825e9
+b2ebce9ee950de59caff41e18c8d4eaa3fb6f1efdf752d265b13633d6563d7cdf991982727f16f2d345727e0f19aba7f
+907ca32a898b6724ca06f602f643f339ca3dc5146614b18a82cf4101074a265af390fd2348338c56ddeeeaaa1923912f
+b29fc20a71072a7150363e32b4e70f3cdcd1f07a3a123f8c7f1a168991a38cf1f1271031fcec56abef8511ea56f24af2
+90a2608bdbe0ec8d9f7bccc11ca47989f259d139362f88a17dd5853d8041c8d0ae171983a2419eddc81ab2d6d9ed6f54
+a000d32501144549004cb758176bab726c18f22f733fada52cb758445e4468c2f37f24d379f2b8da8a1ec2ff897094e6
+b2964e64d6550bfeaacd028bd98a622257b03db1120c5427a6562474ed071f78abd245c1398aae36c73b6ba7c9be7a5d
+af0402a6a54784b4aae6eea1d77a9230fe7247fc036a18f4cd1b72e340a0d05460fcdb71a27673f96c0f3d516567fb15
+8f8a7177d7c0ec9daacbc4cc08cc8e79fe1171ae2aedc1e73bbdd7dbd19ff657b8b2ea47f273df47ff3b8b8350589f7d
+b70d568cb174982b2085754ce9805c3b1c5d84d254665525aff7070631cbd7bd8507e4804decd58b4634db2dc795f057
+8c9de130d33911142f0c695e336181fac12baaa86a46f1dbc3d7732b7ff3ab510c810f5b5e8f581d324a5b19e7608952
+a455067272e5d83502381d67043338f9383ef699d0c51d41d3d3e4b663dfb65019518da4c1c218ac3a161946c640dc6d
+ac66b2320624b299f34d8c783a99c431687a7ce6691122178abc0fb7475040e4b37295c3a40eae085658b73a5c20f7a0
+ac8f16eda4d2e2e827f127884bb9f3166479833c4e9547e5931474849855d9a18f20037684fe03954da89879ae49a164
+8bf0e93f327894b55443ce666cf5ba0eab98a73955a0c86f8930d6c7d7ef48fce428acfa9333395b50d3d7a64f8b32a0
+b4864d3ea19febc215a832f73d26684891746a119b25606cd3fae30cc23bc89438efc74554c9a38916294c47f16da6ad
+abcf5d2db0ce95154e769afcdf5aaf2121890df5e1337e38ee88406f68e203929c4610e62630a12f01672a5b6f04d166
+8f9b7c9c79472c6b843f168b1435c998e11f2dc0699b576dccb2323de78e7e3da3b90a49c03f53bf82947ad7ad8e943f
+a89c329c3abc9e09c2f34cbcffb64dc7b85973fe160a60e7e7efa648e3296d06aeec2c13bb732fae98deab60dd792d90
+925b28995da25a087816cd8a5a2c7333f60a6c2103fc8fb844e555423c278d8387e0fc2fc0b96ecb8c1484bf0ca152dd
+afecd3a4a94349654d120b15d2bf889b8c10bae16b0d128ba1572af01c66206c38ec33d72027add552f36d37f2aa4a55
+80213c7662a65d8d0769dbfe968ebc1e55c918236b732b9e7d84fc11cbca3065455ee8a4a96a354a5c285b23ab298d67
+a2ae0c26241c11142be790985071325ec6efa7975de5cfd4147ed9f52dce00e11fa97fab03dca5febc79855a618c390f
+8bb07a399319799bf8e638c3ee5eb13159b3e6358b9fff149b1c880cbef565e1c735c0e7600aa88fb41985b9e1f8cf32
+b445129df95b895f274278ddea97a9231f9338c85f675e5c87a85139171c57fdd191d61fd4f50d5d78dc0d0b4a623448
+85700e9a5c920594c6f13c532c462f8e0617ddce14525272356b1ea7f7220b2eb5ab4be5a66a973e9596cea6ad3b6709
+a7c4329b116f697c5b36f56d6fdf0d64cfc926cadbe1002143276205ed99ae677463774560e9bafb8e02829ec947cf90
+853e5f8c34d35222714264bd7ec2e94271f44aafbfbda308e947ee3287dae4b83d5b0824436a8c429b263047ab8f70fe
+ada60cdc0533b1bab7ed400dbcfbbf3ae2844265bcc4977c950d83a5caa9ccac38840d0939c1544f41c9706816fbcb5e
+ab3ba8161a9be537d1a0502846f4ece158c13f0e1aa58b748e729806695fd4cbc0c7abad92175fd04e817f2ae6d67f71
+b4bcf82b6131c65161f008409edda485e3edfeb61dfdab6944cfa0d02e0290693ab6a6b4a22bdb1b9fb07badd1f17b19
+8aa7e58efde80d8952e5b18cd1fa856ecf0ca04ef55c41780392feac675685cc394b6a08acc2ed5219f59c2df476bee1
+900cf373f2216f4c169e442f68ff271e7b28a05c29763df873426a12ac981a1a08aaaa0c731ed00b651c99f160c3e35a
+a35c6fc25f434e15cb98b3b58714298b0cb39fe71582404202f340edc1fc741c598b22c95405c03e850fd2306d398a99
+842b31dde20c3b9aa1cf814696f497279a4b074162b10c6c444155bd7728bdceaed4388d417841f3664dacb5e8e343e3
+8a588d64a90030555858f1f316f350700522262f8f8378869bfdd5a6b2e2ac62dde279e6903c2d85279b868216af020e
+b92d2dcc4658987b9e52b67306b3918c08cbc38c1a8600b7d9edb96d6813241e53e9fdd9b412b0288fbdb7de87a715c6
+93fb9780ac3d5334c1adc6e634b29a0f708598d620c7845d6c5b5a1ac87c36564395ac9e826529912986314ab75d6b45
+b2cedadb7c791656f3a93e254e43fa1af8370f8a9274876914e1db2f667e994ed183639a803e24cfc32f8df8db618a4e
+9972861060302b37df9a52d80f048e4d5791f593c16c97b3582ecbb49bd9861906e4ea7d5c6129e1cc4f1bc31f51fb7e
+b7c7e62877cda820c9d12b716666aed4e0e7c8f8b95c9510dfd0ae4904b800287249fcb3d64a7ef466be594042d029f7
+a6d44decf085de8a61ccf23c132f3e70af2abc8732aa46f4b2ebd6cff90160fc9c0863938315f53079ff51139dbdc9a3
+b57c378717cd46ed21395aa98851e899bd37d75b24a08c2e309e21f642a1658f6d1c0173edfa66d98df4e389ac337b7b
+8207fc98fe589a795d884ff859e614e2ec5e2b98d87dd31b4a197c018be913bf6a53021a2d74d879e0736c23b44d98cc
+8db222cc734adeef98c79be58e68780751b82c34b91ed6e532e11b922cec9d8da32e1129694c7653d16c2ceff62a55d7
+823602a4f5c867e0d790621ace7ee783ae91748b8b2a112d402352561a4814d0e128f8d772e096b0d272d287c7192332
+89b3344e3380760745a463a5cc4882635c189b9e50c749422dd4fa467373d97e8b4f0a1440c2e3c55b8e814a2ea8155d
+a15906172a85c6c0741544d02bfffb73d749f76b1acb3ee800ea6f3183cb70ad4b27ba6c0eaf46094886983afcac5c41
+ae70492e56634f7661826c1e176e63f92b70d11711dbad737a8c01ad0e523cfcc656990a8103cbcaf01bfa504f66ecfa
+89caf80cac28e2c8d874d0208c21cea2594d3ba0f0e0b7756e1d4405dcad55542d54c0040e6ee53cdafe21227472d961
+ae38ea2af6ff7a1f8f92a80eccde3e9eea111274d1a37e53a5c581836e228289feb4e1eb3739fa1642311f8179eaf4a2
+9932f5a85902c839c140cc76ea1ae79e4510a28fe365f002b57afbcf0eb813c9c7e670d49e319fec93111dd74e7619f5
+ab281d07e43197bb3649df41ee448aefad59e5550c905a500f6f7a22a77fa6f56b628565c83bac51e03ae23bdbe50698
+9556234d43d8f72c69c8c2ca37ce563d1ab3679de1fa1009f78288d317fdc26c193688704876e784e248fc9cdce647fb
+8366914e563b5926904398027a7405702686c1c96367add1094a33bded979d6d5870a429e999bcd0f49df892fcf4d0e2
+a01f30ea58ab75ec78565079d38d509da5274717127b89b551e744b44a8097c90482b3d7f7283994865f8c33993c23ed
+a16f3557712dc456eb9544b2b31ece03ac3a1e55373468c3176aa662997da69746878f07d659b73ce89174f7dd14328e
+90849671487c35b35910718d1bee03836099b263fd85e7ab519cb7549c1d8798832d7f3eeda3ce5157d202e73833240b
+850553f71df6378422fff8e52d76d2983971f68352e38906aab1e7ac0a400208099a3b67f84c22cd6ab9d4c31d4393ae
+b62abc189b6131823083d41f2849b5663ebb8d17e8a772234690793a0a3494a1cbe36ca6161fd80bd25a015ad20525ec
+b460b5277ccfb2d4e5ff751cf03727541bcdc60c29339020968f29aeaf3edf27cfd2dc672548cfd4d6e4fd88f883634c
+8b2b44c6f68ba4c0b8a5e81c1b8ef81ada56fdc8cab7aecf4b8615d57a65a0dfa0185c90a72713a84950b1376cdf77bd
+b450f25fb3fa3c0dd13a5c9178b7aa72b43f39b3a9c74fc24a618f8069414baae56ded1ac6ad66f4f30a44b2399f397f
+a2f9271c47a68a73d3d2dce4cf88ea6a3eba3d482037a3623c4f5130d8cfde60e6ed714d7d25cd1b647a7e7d553085fe
+b8a7e7335e4c060bc4fa72a90146e2f13581edc42edf84040baadaedacdca0d45072b48b8f1ba51d7aa1fe3e7d9c7108
+ae0dbdba0316562aa2147c91cc7a3402861d59e557951195cfba8365e90a62a5360944d571722bc10a5950c2ff82ada6
+89dffb86429e7afdef1bcaefd0f6081cf7f421af52d25a0379a22c93374aeec6832d0e6a236f56bc3efa98849a9550b0
+b9da55d3d8a1f9cd6ffe6f7807f6fe11470c940d4214406045fcbf1ca61e514066731a28507470f19ee4fc329aeb71be
+945f8e956f36f8345a16074248ee73286fc00abcd4ee34f2fb7268bc07555a2c7055dc6c766bce563b19af99fd3d262d
+8632c4f42f282893db3e3a50347a6f23718ce1c6e55a568291fe94165be9caf819edc8610e3a8e9bb3181a19b42db32c
+8642ef6aed39ef71af8a80b0bc7177bc0d7e575e9bed759f88bcf7e1a1375ed4538f2df6c7a5ee887a7ff440faf9ee6b
+89b17b8a26bb7721f30715210c6561147f8e6ac03489df1657bbc30845056db9ceeea0a7f7cbc211b7cdb172d1120ec8
+8cea2a9407985c328eaf2c5fa3f1ef93919459fed082867fd4e0be4f155df41a448d9f24caef89c2b5a64ede2f82591a
+ac227d5bc123780ba295e32fe9f3cecb0fc5e2bc87bb3d18dbc886c2fea09e37d0dfef830dfce7aa8b61a0fd6654e16b
+b49c7c4b0bf0a17540dbb6019453f4b27d43baa65414b47c90b603d18809727e8e844ccb4871bced384f8b9116555457
+8cf866afb94ac10a7443a8014d2d7e21ef4e2d202bcfb5e9d10f47d71bcc2b86861e377c5931199d591a3d02b475583a
+aa25cfabe1c313df181ada5716923bf4057cad7cab7face00bd904bc660773238ee8e0f615a5f9815e445c78d5b8e9db
+83ca763b5ba08cfaa9ae780ebe33bf2afd39120397c71d1213476f7290bebddd18ce9f9ad060f1ccd423573d566e04b7
+89a3acba12e9f7e4237331d9f1f4998a6f0299a3d4dbe546ce187302214d4614508d4b775a58d2d365766fa6275e07a2
+a26127a3502d14b92e35364bdd29c07ebbae240666756d4dcb246c0d99fcfafad98b0c33369ed02413ea9c32623ac082
+8f3439f26390c844518834d2d52474abc4819542a0378ba813a264140532fcf6e85c24ff58261e7671cbcd52bf49e7bf
+91439c54133ce9b505884beab1494fdc62ea957acaa875708f40e687db536e8a792ea4591f1bcf5177ef3e8518dffd50
+9477cfdae5369a59aacf26c370756148734737fd0f494f04a1d562eaa98f2e2b97ebcf32edf8654d48fdbcde4adc09a2
+afe71c35cc3e33489810cc45201e3fff52b7fd9faab39441ffb173d2333fd3e7d901e4570633aa2f9bc6b11970fe7742
+95ed1748d9b3f6e5ac35072edbc25c2e72d183dd10fb6cb27fda78ef7cf6211452310b103bee2cc373bfb0effc570902
+982e1eeabaa7e12f2323796712a2ff01ba0ad0d68f97413369fdc53e4463741d465dac5717e18e50d6fc292f259f23ba
+809a1c0abf6c9e06ce2f4ec57a9c68e5ee441ed5ce31e9f87d1852ab7a337809de2fc5eadcb830d15f2209f8cf0072e1
+92166578302b6d4ae165583324dc3f4f003ce52aae45f765cff7f4d78d5413d66d5cb17a8c9845e2d63bbb7754cac7a5
+b62419f9b93744b39a40eba6a37963bc885b286aa5de5246670c26624974a2c2b4d9a17b551b0589657b17c8d2ac2f50
+a7b5bfb381e75f35565eda4ae209cb051c22e79e80a81bf121b5c3620497020a4be6734e452005b707b0d04293c17f35
+ada1ddae5ed319259cee96dd20787ab09934e32c7daaf0bbb3a50e17af6d528e151632034560d4561a418a9727636a6a
+8cc9aa9ac525811b72b8a04f58db788b5fd921912dcd5dc0dcb3790d8244971072c7838b7286ebfd9b73e883ad9fab3f
+91c01239a1d07c041dd665c23acf74ceb011ac22934e4c046b0de75841f8cce94b321a9490ad7616a5d0ca6d976b69ab
+af7e6698f0ace7dd08cfd8bc0f7d3933e1020df1b101beb35bf8bcc40a13f37183b8943989d4f39c05d62c192d891697
+b0fd60eecc7600d4a1c17fe7bb899a323729c43de13e38dcc1c745c637229de260bf3e53df9aefb268b40119ddfcbdb3
+8dcb252effaf99207d92df32aa0a725a1a252722ef3b378c37ec5d8e1daac9f7a8258ea3cb99c5f1a7ff3ba4464e643c
+8ab01902afc9e7963bdddec3ec0162e535a1e1e222140d0d1cbf24f64a74ba74cc94bbcaf5987069b40ae82731423a77
+800033576380f6f6c3b05a9a8f6f48cacea7302f50b844ba22882b00c724446d835a9810f4e3c267b7ceaec3a620a344
+91fdc9925bbcffb2eb156c935ad573a310c37a421deb09cd045f2397f27245dbf5333ed044463e1f938ee8361855026a
+8901e7ebcaf9fc6b0c649d9e2d3008713e91849e4ce6b1288c9c32b46df96f5ac9ed1a0b4fa326b1bbc3ae201a9cc9e8
+84501003cba5eb5b26704aec93938ba27e8e1cd61513a3efc70923d1e5fced20dc4ca375f404d8be956dcf2d625fb705
+8eb4da12e6b7cbd1376fd7aaf282e81bb5257b1c895ea7f2056f700f5adaa2e4410a2cc8b738bb421a21de7cfb6da14e
+820cfc7fe92e440fbce966380edc8ac81fd825b213d63fc2f0a389b85f318967135bd9d167f1bb82893cf6f530494076
+972107296d7dceffa80aa47d23967c8edcec95b1c941f01b5f882766be3bd890f9fd0235c604d39615dadcd7ba9526c0
+986b277afa1e64c33232185dada5e49f06ecacaf45a98f3c3854f085927c34e714a58cacaf5e6b65bc065b10a86d82d9
+a59e7575dd124680a9ce7cacc44059574c95183d2ab0e48c99c966482c8930815f77386db66b72f5a22bf0de69c6f684
+956187de896db28085631690a30a87455e9a28f18e12d6ad1631be60d57207588b2b1c74bff8c83062bb743e411f3bc6
+82e01d894bca2484284a668e8c6787c5c074b0aaac0399219025c59cb85202bb3ce97a33a09f79cdd94db9ad8f9ff319
+837485ef346fc13df5e2f0ce8151d72ef05ca5100948ace04dc70c66a6b42f2b40530277c9330047c337edf0c6025bf4
+9753e650e0817ba23fbe57468fac8da4d45565872f210d7eec36157d95152b7d3fc843724c61440300a7c82e3af4f9be
+98bdcb902ef63046e03f5b93a21ab29782a16bd4d9ac4264b260904698445464f29dc4505548a511d4ef57940519ae4a
+8c161972f4f6a2c1c1ba9fa6a3fd580fe34d9ea6337ea3336f861b8450db838d5919e89257b21871d01d62b1d4cdaffb
+888472b71b06971a6016cb08265e3de688837bc312044e73ccd600666ae3633901051b40ac2db99a2c6c2e0fcaeab2a6
+8050c5b5b3e6dad7154228140d9a5565ed900de2c76c1cb584bb51b55c0b6bc6907593ba238028c74c9000b3de53e52b
+90cbad17b9b8fe56b34db2526e4d3819f7e494c52f3f10ac1577777b1bcadb0dc1478fc5737855571dbce3e508e12c51
+abdf4de4aa5bca87cfb082b6221d7d778b4b3ddabc73ffb668baafdce7cd665807990fc2fa8c48dc703c872509f9c239
+b003747b3471708c2fc4119694ee1a49e4305a805008cbe69a9ca5e9bd881f33c50971aeaa3109e730710f51057fb400
+957d15096e585e7436c4b09e24718bae6f7b8e57529de8919f6590c793bf5e7029daece21dc9d4c869c9fdcc304fe909
+b44683865e50f7e1a5889654cb2f0f988b604d3dd48045e39be6926e131894c5b45922f4a5c99b14e9b6ff9b0fd6d764
+a8c3357ec6da32b87ae3ba765bc551986d4a48c10cf9d63dc3d5741c8ada1ce04404ffdc8abf8a011b6a0be6f6df75ad
+a36cab5f77c06265ee2c5de52e7a949df78700d42694a722f1b730cb80e1c28fb16e049237b819a3375c4e3012564152
+94f1ba006e839d0d59ba4ba467b9a86816ef36c4fbf772fccead361854a54d19e0c8f2d01931b493f75e0746fd1a88a4
+90f5010bbd4ac4b1863a1e836793380e54b0d3e7ff864de935f3f2ec3452bac436e3b9a283486faaeadc84b3536a5cb5
+b7600dab8bea821696bed4fa62ad6b7da3d389ecd129bcf8cf4b9e051f12524f476f165e59f31310cec5c6d8adad6d8c
+b7ed011e2caba5e20c69a9bb1347d83c0f8dc80049d9c595cc67c69ae429fb935d648672c18e7d1de3855ab3832f7cc1
+b2e32d45670936b75b6f7252a9a0424d5efca0aee58b7407c95d55f8274186d24ec5802e9bae316cf1a691448bb6c343
+97b37b07f399d550aa17897dd6f900bd360a2e4b0cc3dbc01f2cb3b286d3825545bd31965047d7fe1eeead3cbaf13373
+b09b1237bd55ca5eacfc22870de32e9d62b9eaf8f82abbfdc9b72152e453063deda0862733ab16f85b858245c57119d3
+abaedfa830ef39d52ec646095f3bb9beae8a5846977aea57572880a55af193f1b4a9181560065d6bb80f2e7f02009dda
+81075b578ab950b7bfcd033856250c00f9ba19fe44160f37f6c3b685e72c9b597c69d6c7049e489622983dc81123519c
+84d4814756b6e2003d40242c6b4a5786c91633c7e7e35898e8ed85c3f5914082a67e84dac4a29a77bd6d1f5bd0a076eb
+85eca1066cf79df86f0021e4ea2f3ca5c4e6f1c1665842e17c1f800baff19ef07bb208f5cdd5a3c67730e612b617559e
+a73c83491c9ab66346c5fb318e58e04da31c36526172fae86c9f928f07324d4924f789c00947eeea7975cbe76917c947
+8e4e317a6495df0595c0c5c8d0a2ecc132eff18d59b95c30d53f80b93b1a84af63e6b4a13cd29b5b05c0034c6bd4f3bc
+8111f89d99ee085229f03206c3faa97e1697ee963eb727a1e472b959da1e6f7010885c5230821c00f214907f7df14bbd
+950bca4a0a796da47b8d20249a70efa37b78825f1041d0191931bb15804ea4094a779ae4c308aff1838b77c0349b5105
+9743e2343a75f5b26be5eaaf45b2c90131fee1bdc51be5a1c3528bd84be758e3603b8c524388974bb181542505be9cac
+98753f5e4893d342c7c1bda8f5ab603cb13297ca45ac70e48d9841bf179d7a7e89f4a42d543c215ff0c9cab085c43f8f
+8b59cc94de3c45ba3c435e455b0e13c11d27491181b183034faff0c5991d9b3ce17c4a9a8af046679cce5e6cfe9ba641
+a649ff0ca2dcd50650628a6632ff484d7d83a2635f7f8f64b242477c172815c70b10db2808f13d8217d631a5466ce229
+a11d300902f0206aec5efe7678b749aeba561592ecf10a20d3d15448a0a11449bab75a29c2174f6246ea834bd09d1abd
+873f64e5d3a94ecad56dcec7ffd577ef638c9965dfa41b931f703c9fc353555505aa708df02ebfb30dd303dbd27dafc6
+a282dbf9ddd9f9d5fa040105cb1d3231bff53cc9a5bd6abd6ba6237f25bfaec55ed9d564e447b37d2cf90bbb9b3fc899
+b633ed1e46aed7db30fcca556d7ecaa4660abcd79355357a6b0823b2b5c56db2ba98542b0a01b57a3721b94cf937fdd9
+80f8c27c772857c997c681cccb6f8f9cd5e5aba871516649d9238f4bdd05f17bd6a259608173a1680bd0fe62c26a3a1b
+9088464ecac788fb6f172a43793e9601df21a3118180aeeeeb9f006a4a3ae8122f815b776ade7bb853b8d682f571fa3c
+ab21eb54ff6d6c2b66414e50b09e06a3fa230423c633bd597efd32d5745e88ddaf8b04687a7715f7a106350c61ab12bb
+b5b25b462223cf04af61cbf16501dc91797087bf7bd462c31d1ad8f717df3ba970aeceac6c1208515d0deb7ba6f31061
+abfd331d9add9cb57b50c6287e23da675a6d317923b4144c1c483fc71c860ed4a405775cb77139232f9e0058a4011d2a
+89d91987a4f51250fd6458ad39613ddd1684cf6ccf469127a0cc28fca24f22a2b8dd871f7027e8245d1c6dea92d388ce
+96b0be61787d04bc33242bf47fdf8926e2e8859513ad37f1ef337b418f89fb4ad976216c3316d18ebf89436f24524470
+80d0abfc071388c00092ee7f56747b34cad5006e45adbbafca6044941ad67c7bc945afa050756eb337caff11a2ea35d5
+88d1513b1e59920aba986769129aaa86ac1390dd570d751456c0d5c304a74b383da3f9fb9d19bbb7351569736961267f
+8e835329cb92627eb816d67d5cc6ec4f8ec28e1026722531927e989e0dead65ed36d9ceb845651a85369d309c45931d7
+8c2d3af0c84a890728b24abef8e1d061ca74f822b54c8fa29c9a5090b0f876d907d9bd37672ef33d5f606745d7f50a3e
+974e4c1aea6452aca58d4ec134ee7598f9d4a361c081cf247e69a7e70da35b36292e13f58b6a80c7f27793d72f101b4c
+b48134934a48d6f7c588c9083bdea8b765bbf08dc34caabdcedeb5101bb1331e70ba8678abdab813a5a84a55cec9f23f
+97423cc7b679d37dc04ab1ef13e3d80b5f8080599aa55dc2972b8c49f215f30ada4aff8ced50b1704d6d3ec19de9649f
+996378cadc1c5368ba451c12a8376ddd4a5bd54a1772b73accb0a024503e8406bcf6565799c1b9e14b078230c71e294c
+88a2388ae4d2aae01b20c486da0fd3f5289921869d5a3b1d3b184baf6adafa1a7379b4fcd3be7e7a05f5c4eb45a8ec37
+88b53d4c6a16a308230d5d10278c8f439f0815f036db06ba2b2c905a1b2eefdef66f57efec299ba64ef63cabf475a153
+8c40d8e50ec024b124c6185b5a87e9c29be8ece392284986ddfd24e4485d84cf71a4843dbd8babbc2bc7750d66e34389
+895ec63734a6b9e8e476c4d85ad1e00b9905a0f900cf126c2c5710396228b162b307d24140e24a81db5bc6820b3dc8c8
+851c942f884cfe3c946c9fcb80a0651c31451fb3c07ae8b59c4d804e169d165b3fdac28406119025b450504418118263
+aa8adc591dff1cb710d03bed5ded71a67d71efd563b8848bed2eff00ec7327c9d8dfac6958fba08403a4310f4093c4c2
+b03bd5a2544ada5f9a394e6b3c2a759f2951e3330839e4be3818308d98f7bc51f2b0bcb624ec7cc3561a736f61e1a65b
+b7e9656dfc837fa1263068a950ebd37781339b46cbacf9db4167e61e8e2cd48e48a1d9133abc09e56b776c3ee9d9c06f
+84a23d09ad0e6fab688c225d319b12adb60f53b62647d9958743564f4bc02a46fdb661a56187e7f3c101304fe3add149
+ae6910e101ce9a47121f451060d81b7cf2ebec8dea54d1ad9c2ca028619575d09aa262bab2b71dabb8fff00d63f693f1
+a8e407fa60eb152eeadcd079dd61aa2b1e93c56870e4d5a6321cf87d3621f81b0629fd7a5cb221e2d7874c588dcc46b6
+a1afb62029726f5539aa88924a11a50eff945ab2b62e197625b25d3185caad5ba8bf7c49b425d7f320b48ae3c1370e37
+91bc8c89d0df80419f8cf7e9384327185a6ebc3fb1e22b61c627c40b438352164b5e5d7b75e785f1a7fe9fa1397a6c90
+b6232425d78ccd4cd3259639676a779af2143534a5ea52b5dbea6aa6e76e3cfb434b31872e864820b7a02c7886394999
+9465efbcad40d69869a6282269b038f030e01ef6ca32b174859ff0942685f0dfaf364fee7432cbe644dabb4ca85e955d
+86b4b41abb7144be3002724890619dbf336c2f38fa45844d6636ef3ea0b97999b87b95a98e220a816dd90561ac25c7e4
+83fbaa1b7f43bc9e4e3d9f9a44cd6a7c65395e48222d2540820c5e7441ab40b24a9bf3e4961ff28041bb6d07be9f12f2
+808bc511289484f032b153122a82d719d8b13bf5f2fc7f7f0a6509b9ad5ab132ed90cee390a4e72cc842e8632d167aeb
+8e4bdaa3b7b057f7825cd824c978904482aaf1ffb70b0d573da9b40eb8bae0df5911b3a356f5892c91470f1652a99c45
+8f224dc2aa20cc9c357d47a972cc4e5ea6b8f65c63924315bec47158f06bb8524dc4e9c1e0ce55939a61f4a8e0ceb8c9
+a809370c71bd64d37315b0ef483617c3637693fda702d2a4fb3dfd42015591af29722ab5381207d8920fe246e2334505
+878f9ae4c2b0d287d292873df9c87bedc45ba54bf6cdb1076c43d97c44dee0a32f105ffc67a0bf300ce84eb656f844ae
+8e3fda631dd1d2ad15756f9430dc157d6e1daae235b4296196c31233c906fa9936064367cbe8fc4f4d926d70fd2b812e
+8ee934bf12bfa342214e893e918d8c40b4824d0ca82f6cdfc34bd1b6b469235a26ccc7a15eb27c278c14b76274c861d8
+b59c220c7a9ef00213fe7da2b79f9ed8a45c7dbd1e9c1a7d16b4ccd6fdf6e5843ba1d20f1d69d249a86df5f6a70a5f5b
+96065ea9f2ca20469a851eafb84a1b10263c8be405a4d7f3dc569e2c7a8332ed1e838d2196916f628da6246c939942ee
+b0fcaa930887b72bc3a23cf17ad969d289d06b39e49db55a93052d4d9f8c110f3e07195ac3d74de3fd10cd73cc2aa811
+b2e8efb9fd890bdf38d944db8e2bdf34cbaeaa2c3bd3c018b982e2661b54587e69b67ac0515f6f8d1b9dc2da686242b4
+b7477f76fbd2f6cb042e0db1d5f738f4368369b73b0ae9972d6633f4b8cd63359074bdee83f86a9cfaebe63edc26f48a
+9835fadca0bb0e2c35ed2ade4496e415f8aebd295d5cec08d43e0528700242e7207b17c015898e165047cc60a6622a1b
+b956cf0854982226cfdf08457a7ad76576510af44e0ca5947539581a802caa7848bb89acacd2616a8363d2092af4086f
+b623b959d5b1568a4bf841f7d3db8b23b18f5e74d6920546ae4d026e17d05019d8a2ce533cbd719cd95bcabde40abc99
+9870c15c12bceb94d0758ae9c3213cd079d5bafce5b836bcfc8ef1a5fffa416dc23154bc8afc6446eedb3f74481193a9
+83e7b60040bc7cdc0a22f234d2cde0371ba9843e2a0cf7656368c471f9411a08218e3f38a26475cf295f9751791ab52c
+9398fb71cf88042f3c5c8f9edb46cd1b86fa541a82a9774d173270078ecf26683e18a8e963b458ba35fff42e1cb50886
+b9a0edad714d3e7e1fa248c946660364f4092994826338a7d376a4e9a137839cb93af86de5f5a43b530b42ec0ba90271
+91c2d320baec5a90293f009f9d3462bdab20ea462d8e1eee06c526223c0e817d4743a9b8ecac8c56e6f803594a8eb9df
+8056d637e4250684d7bbd59cdfaff55121e116961978efd26f27ef82ac832d0c47175835bee2464e39f2a3c4c037efd2
+91b7afd1a2b07bd4bfe02903c8b8eabf2c2d4753134caf38c9ab547e063ecac74fe9a740bc20483622e264b071e2bced
+b872a46732896fb881a9189abe18b87c8d5b11b0e655c41338a1c882033260b24116219588e037b5026511321e84882c
+83a9231dc64a8211105f39de667e475fdc87e9c336859cc80b531de191c1a09bdcd422add7cbe164f0fd810a83d1e17e
+ac7f8ecbe74c351fbeba9e6fbf6a041c491639a506a1f0e457cd61d9338a2b1c382c33a512a7d2bdd6ad220d5f4dff9a
+8a2150265171f97f7fc7eb56770bda654d91845540b9126cabb015db3f62d8f78c2845ce9bd6928250b289bffdb78af0
+981119d1385b5de53f1f1e894ed67b17cebfd943fb61b611a95cb81496fa6375f81e80f50803d60a4e8b430e0fc8fff7
+ab478a70772fb01532611029a9cfeab2b23506da69d5348489c0217e039c7ee1b287aaf0e22ae26e8abb23a05a184bbd
+9195743d8e943b9aa365b42e929f49bfc7d2ca84dd69ddc06da096ca681262ec1a32341a8fc6024c23823a666d9ef511
+8df2c92ac3e7fcdfbd2a5f319a10e39936176099fab0e6c47a1367153ed084fcd6163799fa62401e43353118de170cb8
+b388cda12c5b400794616585ac6d646b87d73d96f7ca05dfeefd85d409b53789025838850c430e629daae94b49eb9d00
+a46b2eb3741e2fd9278bed3b8e6c208f2ead291f1911371ad078506348c1e3017666ed7cd5c927bbbe94e1dfa6ee5d76
+87913b73e14ce516fcbdb87b547a60a8626fa3e5626c9ba88abf60315fe7536f7ab08d8f9bcbcbb89e8ab88b9e940965
+86cbe3bbbce67685e88727114e89387e9aa650ad48b02937fc456be93dd8c2a498d34cc98841782fa5dbd4c44a15f4d3
+abf37a47fa66584ec202f381fb0902864552a467f8fb3108f694ba927414c36f29e7ba80aa5a8bcc29c168e0a7406407
+a8a1e2f98e922ec615d98a967475a38e66f330ddb28db9cb68d8f762ed7b4943155bb8714970c15a007bfd1bdc247f4f
+b9fbfb18da6c54da8fd8fb8a7309c91bcae253456cb68f42ea8cc795f0bfb627af0084815da886d5ca9c11ac2b9ba305
+8a89215a3c4858654d55bdbb698e29734c47e729afad4ef929635b5c81b6df8aebddff2edf039675662ed672365a18b9
+b7fcdec77a81dd820a3b30a761414978a19c797883c45991709753f6b5bb8f1c18a739fdeffd5bae72f4e3e02e73f185
+a758cd7b6b199082bf7542d2c3cba834e252e78aebe11070bd317fafffece471aa9a14629197f31b2febfabb29fbd02e
+ae635672ff682db3821effc3bf7343e2fe773cdc9e65b38f950e14d40d75d556ce1436880cfc8ebf94a29ede76d0d914
+b5819263a5c3fcd6637e326c1e725c9745b372ed581b4367d5e1209f12ea5d8cbbe41799258fe0fe79f14a8643386dac
+b2d31a273e3c20835f807d169396c24998fa08f050ea7045a10a5d71b29297a705c8673c482fd169f8f6fe518dbf1e80
+ab8a24cdea5cd6a85be299e105c80c900d316c3a87910f248fd6324c673af793bad2bb1b2b10410335df2119ba1c1d09
+80fed5a8e0e57005fe9d1a95219afb022bdafb4ba03ce5877b5700c62219348536564e52739ae4a4ba94c48b225f8fae
+b9a8c38a1a75b49900974ea32b8966c4e7eb1b90a889a2a907cc42632e185f1ce714c42bbacf2d5c0748330d8673e170
+90e947c28c48fda8aeb1448866ba81805f7b8e66afa6906690cb9e5e4057e3cf33db75ea6c94ea1d2f7f74f1a1046f0c
+b15f8350a08192d2c0409b4c49842f1dbfd944471fbb7ff1a500138b74ce9d1312de757790210cecb00bbdf9915a43e5
+80b2f496ed36674e0448224d6b3d6add8a05e7f3c583e6d921b7c9bb819ee8844ab46e65016178d1176992a19bfc54f9
+a866b0233d2b441ec500b90a4300d1365a7fe579412e70414c2255541ceca8bfcf838381536b8c6593e016c689cbfb06
+a60646045a605928d928a680181b9648f404d4dd81eef04826c07819da7216a0b35cb246078e78da97988926dde58585
+b714167ac48a849bd61dd9970012a51c3494ef1c2f34720145cb1f4d7a9db1f78449c324c2d30e28b4bbb038b3d04a86
+b68c3c3ee0d123551d047f6028d5703c963030540b523ba86648164f4e2a24691597f0b2a3e3bdbc1558fb4ed6348473
+8697915a6fc75f4466319f6711d1e1b945b49714c2ae34be58d82369fc490b963916e809a3fb62c87225327460baac45
+ae55418375aefb77297da8f846bdc81dff73d16d37bd8d04518acdfcbff3b948b34249f4a268701b73144962e4b91c77
+806bd788bd291f36d8da93c63843a4318e09f09992a25d1e0c22843216aaa05894d59e749b357a532c553a41696c644a
+b1cb21a6de1f47594c97141b447202405328f8f132e22d386be88863f960feefb49901b553bf4156726979e4bc3f8003
+83ee909bea31d02eea1ce6a2d2ab840fe9ad1866e91abe71712602320281492239c5baffbf924f662ab7e547a2362c14
+a4a12fad59a482e6e951ed81f1a9b55c0bdeb3bcd8bbba4c7b8c75a31222f0565bffd82ad0a346ef354dbbf65edcc81b
+aa4eb0563ba8bf48131e95bb0bf08b02ccd261d06870670642abcc205d5c71a1d16eced0170c910be5994a4775e25f12
+874c9e395f1375c334829d790f7f127a88339a011d96f9d71153abd592fc74519fce0b99eff3353e51a4b939f3df3df7
+b88a068c26c1fb140637f4073084a8f4d927d2b3b175deec55c3589539059848e799d172d5c1dd1839a228c93d1fd443
+a700cddf34adc75501d3e76788a265362cf46a5ade7dfaab8dd5e3a4d12e6889df3bbd6f350b9e7403a45530e2159569
+89fd0b6282fb7f24c27d5841ac8f98085fd4517abaef35ab3f95baf0a7949df79644bd55ffb15caa1259334cd4f1206a
+948b6e2440fbdfee36e6f803d87bb185c628e0416806a2d2f3f5d507e1568ed944541f6425174180dc8fda5ad02f85e8
+896e8b40dfab92097d6fc61b68f87931ce1bfba4097345d6d03ccc69228f6af773a5704ce616a92e128b4fc29a7b777c
+b670d62c0349baa9cdb6698ce66825800e8c19f203f24cdec43431eb5f2649a16ef146fbd22870696e51ef0ec14683c9
+afa59f1fe510c1433c07ccb33b01ae03456011aec5b2283a3484f1b83a397eddf43a488ddee6054f416929c6a59a32c1
+86dd6c8908bfc961fc051108239a7a7f9817d6dfe246d869dc597570188716fa82f646e78e2925d268a5f41e4753c986
+a90557c3239ff96b569b1abe835b2cb416723e22b46c94bc9ad493c11e1198a3ec22cf523e62d318676acf7b8de4f68d
+93dbbb8829df5dde01126e963ed9e6a018b4f32e971220af3a0885e7214a030f2f32b218b95349ac03b513fb89bd79b2
+8abf5b250de156e2ddd74225b96098c1048a77588adcf6169036c8202e3b34d7d903af6faa2381fbf658b7f6294783a1
+941b133b3efd11236b812300f6b86f648114eb63b2acd5d69056dcee21d768e9b11bf94ded851fa86fbd4a34e19ec2b8
+ae044a3e783c7a9d201333f18fb8d2271c9ef992c1b159f34ec750ae47ebb94c19e894a3357f0ba6eb4a166d5e9a03b2
+8c99074fd22e374fd0f9f04b1ea71582a3b4781ee92719eb2cae4b1cc0add33dde4d27fa51952f4da7adc12c775c91f2
+969619df29f70b4b640d499f1cfb0a7fcb8f7172e03162c57b18e6f852b67f7b8011c08c96b96703650374c6cc74fdf5
+8dce5f9adadcd74ac898508dfb8d5c9e0af5c97bd7b7e4eda7530888edc3c3185b76912c784b50e94b068d8e89e5b3f3
+847e13a166ce6a3c5603534740e63846f8678f56a821c584aefa5fe8c6b329ae1c8733925e411265f4e22b766c04876f
+b45235563058e9ab8b60d18ee419a5273eea074946a36128b04e2e6fda9c0fd4a757dc38a8fb66f95c4142f632f30b4c
+afad39b4e71b1fee0e5638d8f1b451e46fc3b061f8567ba00dabbbfab4186dc35aa05718a67aada68398b1ce55344d21
+86ef83fba1207e07938905d71ac982a65f1d9c07b1dfdb353f8cf3cbb4d029d404fac9a469615e9516aa70f76d95ffb5
+a5d82ee7a0c78e86591ed6014ba357bc99d3c8f8055381e60635b26ff4c7d5d3a7647c123b2dcff3af0bec938bac00a1
+985ea179034ccc69e5e967ff6dd75736a65d75e3dcc0025ce77b601d88c71d2c83f714958cddc71855095eded030554b
+96fae05c8ce05803693e0f7d26d9a22a6fe84a288b0d6ab9510105165af7fcd22329324dc4bc4a8fe0cbd12e112bdb8a
+85f57814cdeec2c2058fc3775f9523d524e08628d0e26873eab34d50e6a6f85259286b869dbefce4fb52708828938225
+a0356a83491292ec1fdb3b52be3fb3d93736665b7890f0faeeb801ae9d7a5155c454b802b8053b684a283b5e2228df49
+b5e65a53da86fd205a5b08b0cde0651bc501dafc2a2cfd41cda2c1c832f40c104fbdeec19351bf2a64f2a0d924447b7c
+a6f1bb7b1be8a1da4b959ab89c1ca55507c8aca491dc0e4426574413797df1172b06bf81b2f8ad6d151274123a4970f5
+8731989df4554d1b01d3f4368e34d7a847db33999e1b539076410956241b66f64769b918a64007bff8c0e79d965074cd
+828f899705e275454b0e0c8ca03b28c0b29a553b386475e8145ee82e7e52df5c40935b2e7043aa5884c72d82398dcbe1
+ab76d40137e655f19bf82523a8eb41217f36e3e06465defdf7cb85f3441e68632ff80cdcebdd7e32d2dce1d1f4944fb7
+b199ab7264618de46abe65a38958b04837ba0f09f142c32df13ebfcb6d744b2e44190e5a75f55ea8823c6f24432ded75
+8d29e36142521a5698358e1d493a0f7050540b7b9d9ed4189e9e49cb209fd35d4376c7c775e845b05b6e76ae1e0b753b
+a74827a37dd70e170652a8419bc9c764fa5865c28b82a8da32bb0204ecbdfe6937fd12c358a1cf84ac5105d65fa18491
+87d8858eb200cf06cd79d0b40f6070a39cc068f0545003d58715801e6235764bef83dc1ab5172456ed62dacdb3822446
+833cdb0c49295457f0ebc2d0cb8529dfdcfdb374aad5d795e9269b329a3f42080c4ca6c6bd67c26112bf353af5e4cb48
+a6ae76017f72854535b900fc1b65c66d664b5116adff8ac5c98f4ce608394322fb1a55bd6b0d0a2a48cbcfad0088e44f
+b4b8e550e34f4dfda5a9a4728a9e98df7abeda2d98f59d2d669f6f2fef67ccc3cd84338df86246ccc3265baa33374da5
+83df0f4a96b738a4c7ba953383796e4104f91161e277c75929b868bb46ed7ebd6f11486a538198a79c5d968beecbb80a
+8bf116bf11a6cd50f64658c91fe70d87037c26737dc27c6b2e847f58ae68c80c5e18051a052855285b4aea6a2c59aa0a
+94282145933642e11dde303fdf0a3acc7efcda93d690ea1101e214668b32880f60b166b82857f226903c4035d0ddcba9
+87a386acadccf0657775291b3535c5feeeb8b539ed87f271649ad86dc4d627373004511cf5b992d32d0547f78767d59d
+a2ae82489beeb713b2ccfb18864e3d1360a41245d11d5e0540167a4c99c786040af5634f54a8e932573491cfdaf12e4b
+8155252708565223b5b16912ab6a3065074250fbed4531f00103ddfe70f503d6e44fb2840890d7e08f7a43163bdd6bd4
+8bc06269ca1c01887411a3f56093adf42f457eaa4cf71c2aed68d93cf33724551fbed7eb7eb6d9e175958261c3320802
+b56dea9e21465d07333950947a5ee834b4b65ec915484f6d3a1aa1fa139f590da063258bf836872170a7135ab77cb544
+b4814a15ca0e84fe0e227580d257b6928d486fbafb119c2637886cc5b1880c9f32873ef86d67994676f06ce5a370508a
+a966818554b445a5160a4a85f645451d410743e5d760e8773bbd48d696a6812086ea4cb04f4560118c3abdcc25d48c3d
+9487d339acaf52f6e9f4030c27aeb1de03973f8fd2f22261e52cd1639dfab125d2452907401baa2a3c8cd478a6d96f31
+b637ad911c7fe2df1415a0ca46c5d89c3c565e45326c11e1d2cb7ec0b6de4f3979005885f686a26949f92e07b872aa17
+8515e583b2c9306e200d45bd463eaf6b0825eb8305ccc94f0df3c0e4358d16f2e74ab6f38c4e41369688d10ee773c5cd
+814d548f00c441a998924ee541e9aa6c7446d671dd5903d9bda4423d0e0bfbcc17a60d67d8dda5e996aa58bdbac3f286
+82b06475ede16ca133f51f7134543f04d785ded9fd7ead6bdbe06a88640a7eb938237739ae0c25f7d7d31a4dedba348f
+914e544da2241f4f20e6423e71ea9d61faae3170470716828b1ba085c3add2524fe8b7fc829983f183df9eab93cf29a7
+84e7dedccff0096e76f1da10b7dab3751b5ae11ae064fb73fed166de0b443513bb5febcc9eaea70e6428f370ccc00cbc
+953a96582c03ed199ccb8b6559d917e10b3fb68e26cd1d79c55d7170d47068bcc2ee99867455c7515bd39fb8aa65f559
+991b6bb0d1c38454b66df5fd994f1f7e64c86cbbfc1e1fa9cefe43a3abb99d587ccfaa3917d7d17663d666ebf132b208
+a53c895486d4f1aa1ea51ec40480af48b605a793bbc744972bda0dac7537e34209823e7a209054b55baf72a04875cc46
+af2a939b6a1fa9c72a3f17b924e8aa79f30dd31e885a019429112bae06bd1ad1161d4e8e637d195a1f3f58021900215f
+923c825c417049b5e54387d6b2a54cfaef5b2b3e5670e365345143c5fde7e2e7a97d6a44d46a508fdc5cc2e380342271
+85fb356bf1cd8608f37b1345af5a3989772eb2ff57d246902591e3ca7cee4ec4bf3404887e48ed6bb665865edeba133d
+91f62dcb8f551ae315fbd364170ef5416e91dcb7608e4ed843304b7c43ee88f4d8dc83cfa17b864bb3905c6ea66e8796
+8bde8af0e6946e8c3e374246fb8a411c1c5d60be7de0183c4904eead260fcb928043bc7eaff317909596be4eb1eada53
+b5b356d98dbcad6631a9880536c2fd2865457f12771c5c93cf8f50e833515ab170ae90ca88132596bfca4ffc8663cd3f
+970fa9633dc4326cc46e338d9cc33a3342a48ca7ed37f08e4212ebd2654d550cd49e6cd4e4c9c81bdfe790f784fc7ef3
+a6853617e34061b2a7343f66562752412f6536be4d2dbc0d497feb1d8c433e3b97ed733f0ef7ae3bea8d19947258382f
+a9e0b9cfd54f565fa5338add602cf42a6f29df615c10f6411f071735a20c528be78cda5ff0a00c42ca995a02b83db048
+82b04be368041c9cfa86388159b7e3251e69de821ca812499f6c3a5b4617f6f7405716a55796ecfebce1eea91030c648
+a1de66607ae339df3ac0663c17f886fbbb3d171b4409261c6f6ba6393eb7d02c8d411501328092862697b0bdf6049209
+a3c87f4b678dabc307a13a3db0399068ce6c5911741c15626859b33a98f8890a9d6b369f9c2b0915b72dfa3df66f6865
+afbb00da7cc05ecb3b0f3541e95fdffe7cdced5fe7534d7a0baa1231ff108f3eac91081d74f2c34153f9415c75989f5c
+a6d5d93bf144bf242f87587d24c75e031311a9783a9626dc4bcddc0f5f2ad9aa481957dd34ca8ec1fe5bea6900577ba3
+850b02856ab59ca4647d58610856d945cc91b9e552b2ca0f177198eafbc7f27304ffab5601e5478c0d74b7a1923f7d06
+8709938390a6f908e5da062db82db283eeb4088b5dcbc9d98a85e70bd70f6e31a3bd9b4942dc8a784ce0e414dcd1f3eb
+b6ddf34b458ec683512b64d836a232b8922c3b636b73641186a086238cadd2800682899e51574b1cf6bea6fe3bdbb031
+99e61922cf2af203c20ae7d1c257d4a537d4090a88638acceb0643c52bd6324844a800338e758ce76e5af21465635a75
+a398a441646b0cb0da2a981f3dc328a2dab3bc30d4b1b2631fca87b4876376d77284588a95a3253b449058000e9487fd
+89af46bc559c9a1774c50bd52f19eff4a8912b368c2c07f16ec4842fc99c453bddc819604f9224c11433c87c018b8451
+ab79ca2bd57f367ac093096c2253e50f2b89e830d1d03fc54611dcb53b6cd43a17333cba1e8ec71c3c686a72ab57fe12
+8a1bb874c06309d9b955153850b3d7ade8438897a664a7d060366aa41415081b4d62853217115339dff7218777fa3764
+b9ab9b63f9de036956aba49e2b7ef84ecfd01e7e38141ee455d9dd40266e5d20f23c354ebfcc584d8d522a3139492872
+b21ffbf10b8cb1cd407ffaa0698083b23400648cd8261ad8ead00546e29aa4f31d2fe57faf03fbf82cdb580c6c68a822
+8fff4fb6964c648ba78e253717c12bc456b20d9592720d484e61bdd6fab86cef2a05c2753b19bde2fa34e48c5c6bebd5
+b15e375b81351549d84bc2ae0b15c5d533714caac8cd95af204192871b0e64a973b0f1eb43b00f277f5ae886ccb759f7
+b41b4335c44610752c02719fdea71d1a9afb55ed3f9525aa59c5fd5b34516d1d59f55627f3fbca6fff2d51247ec63b55
+9a003a004719cf96cdebb9da4e7e873e06c5a6917c88101a41812bd1e454bed7c6fe5c3bad0c91694e687ebb940e09e3
+8c4c051cd89d768f292ddd63cef95ce981185b2eaa6b00881dc4e2d4575a27585216151177bd3c89b0768eafaac0f314
+b5175f65864201d28304b6dffd1afe1e2bf6927a6e7ee7c2a72b33fdbceee6e8f038865aa0792f3497957ff0706f4368
+934c87e853a48ee9d972c598a869f0fad72e8aa08f9417a610de42e271b596b94799e3964a293050bbec68acf032a4a2
+8366feeab4b7e9d76981a2f339af9f2bb5fbdacc9d8f42ae5c9f35e3fb3a0682afba1409892855b06fd844f23de3fa95
+a7f37245d59907265403faebde6744a7e49900720622942e1807600eb12e30922fa2f31bae169ce03a03734f8140b0f6
+936b72ed53cff2899bc4a3a1f4b89b5952464ca2a392a743a57f32196b74b3ee3e2730298f927fc82344b5f7868f1106
+856c52396d73cff6fe3163c8e6a9df3edae08fffdabe613a6c7b571251b033f96e9ed537563a50a1e1269d94bca4151c
+b2752a0fde47d105e961271f7a7721d6c00b05b450b9139776fa3cda88b5a823011d3f94e466aa245bf6ec65268a4c3c
+b68de7ee49a342d05d081269c326dab75effca2640a4a8e4137187b17a2fadb9932f20005550abbe6b5ef7920cb80913
+aeda9b96b866e17ccda3c776925526ecebedb56df894ee4ba42a7175333c28bd3647e346b0be48151646422108322eb1
+810d6c783ce2b123deaf084b9a83474289e2b5f27f25375367f152662698a90076a3e0547e2cb2f5ce55d435bd6d8e17
+ac9d3ee378e6bc72b0ce27850e6785d3cd2a0eccfc58f9c1a57674b74145df788a8945a25a9bfcb9d92ebbfe3542a862
+b6b4add36e2833ee62c6e3af170ab98499c78393bf0d9a2c20ce90c084f6fb40d194c144e36e0ad858fe04652244d196
+aacdba3f33391a6d77717dee3b657b8d9b1959f0ed69086051085213b5568319e92a7e2f4244c8b1d08a49607fc2e785
+9612d7354ea9d498d084cfcb16f40448a41f9fbc8577f9019484f5e5f132c906516968df88683736e3be9ea56ad307df
+983ab9562091c6c22d679c490ec87d509284184282d88bd595d0654656fdcafb990b94686a1c78d9b3401152318e24b3
+b26da8843d02ae4d7e85eded2a14ef42ce8c9ed8de537ad71918ff904200125ba5a9dc6dbf91d88a55459c583f6a0c51
+ab1ff878d5b63be94b33bd2a020be63c2224ff2d9f280384a736165917292951b44941d897e5931642b5cd515d0bb21b
+a81e4ebe87d8c1e3a7da09859da87f5a41040a288246568523b289b4f462f2dae1ac2c98b73566fa5af64c45d9a38f12
+93a09c17764c560deaee921d7c4d201244e07b2e29144ccda36897807affb915ad8cdfd552508973a7e85443315bf185
+8a0bc818074f839e7c0f8ee790c558b7cd2b7a5fa2579e558de8e8e7e24f58a249993802cbd41e592577ba4bd33a8d4e
+841f3155709332ed0ca4de91f0785f544e97108df112b8242d418ed3bff63291b8a6441e44b03d0fc4db311ca657bc6f
+82eaa6dc58e10042585e49c981ecd01f8b4c56ef40cc40b834841d7c786e73fa64cce3b49c0f08ea425c3ca578d5facf
+b2914ff2d76c214039bfc251371de379cf845f2c554136063af259975a20e3a879b4d7b953f2e6077cd55aa1663562a9
+826f7f3d2e018b7afebe844822045b075801cb3336fac15267de78c4955651c6b5108169edece60ff0d79e2811804ad2
+92a335d7a69589aa8a6746a4b79ac6ba7dc0ff2e4a39138520139b2226abe993add64dd021336191eeffe2320c01b806
+8769450d7a06b03687d851ff4af7633d813763364804f1f282f887538e9dd8b73b8f9beea842e801702f3a35b47cb007
+8bb1f1a0e4928afdb3d0573f0961bb5baf9b0d8c5774d72fb47b9c7bf498b54c7ee313849929291caca0bbe8d84956e1
+96aa07703e73cfe7a07495e606f232eb979d43136b45dc09a113b9118fb60f3aa87fe262863d06e29450f1d5986c14ce
+954b63e620202bf53f7a218a8d85b4d002b10260312945f476e6cb418a061abfd6609d8fffa9a74ceee974144c2c6a3d
+a5bbd89697ade42f596923479cc31d48baa0ac2114c6d8f81e9c57e14e6d560d13d594eec7cf41978bc973f430155ad9
+9438a12e32aa515510b99bb1b1dc498399dd73738f3e43693bc1d8904a48cc21cc12e465c020e89d60f1be97635cd46b
+a31704645fb8c1c10b356883df2ddb170c94eefc124ce0a6b52952eadc9c7c58103d8a6783b9f63dc436809534686156
+a578b4603526bfe2ced9b3d33ddd105f1b13515f14e4b64ba86cdaafbe8e72e8d541174c6ff8f10eb3a0fdc14ef0fb87
+8190e840190cec3180eccacc18a06c64ec2c10cad9c0e5bbd4d8b33ce5f92c7aa48bdab7f16cc9fdb59b485d5a8feb19
+880a7eb87c08bb9919c26143b77dd02009274eeb872dd4d2afd1a0ca9bc16d883f5750af1b8df2b385955574560a9d35
+b02c6def10ca7e11ddc6b4f7ee82e8a71770b096aa4471f34f3be7984795c518b1b0993b3a95c240fb2d8b3009ebbb9c
+8dab9465b51613a08aca9dd5ed89724dc621cffbe854180c9fc349186ef43522cda30aeaf3bba2257ea0dc1c44e9d0b5
+94c4b590eda9644d443e1f5bd2a9882f5607b5ec02422b0f0a122d39272532dbaa64955ab85fc624fb1632911942cf98
+8e28830d75e787daba69971fb7c8908d9fe9a1e10d8c5680d69b2bfb5075a2400f490701725c2630e9d257f6bb661a93
+b4e4a18c10163c0d48beead3abebfa11e2de9b7a4fedf2ef9bcee3833858169bd4028bf70920ac8072a2646d6d3676e5
+a5ee5938e1e660245ceb17694b0f78af5072bdea8cfdbe91ab2ed82a172e8f98542befa934d4893e16c280e9252e17f0
+989182ea9a6505746fd56ab54db1f52536e820cc4aad5c680539f74fce835611afd72a893b9a01c91ee1432dbcaafab4
+a810d9b591c63561f91e50e81dd9ba78f25cf6e11937e9ef71b82953d8420292048f72d4efece0819cd1251bf2acc080
+9199465d63d8534a815c9dc600fe0a947fb46ab729f8d967dd4c74f7ef5f5828c2fc9b025f016387e5cabaccb20cf459
+b4c7c7708469c8cefebf1533958bf9287bfa68319a2a5dd8b4b80de5838b6e8ff48a35abe0bdc441ac747f62d8a5e889
+a2fd761a066d5aba3cbac530dc74b061733dc7fd1164741729194c324a4909fc337dedbd8cc6233d81977e16b073533d
+896ac094f7bc7616865a02dd345fcd515ad401ab7431d2db8559747abdb8dac8783e932f6615e70ffedbd0a192497935
+962418805a1540fcb471261263c8131ea4852e5743cb55cd389dd41a2bcc7d7cbfc66a7409ec2027f065aeabdb6a0c68
+91cd3c9c042e447074a4e81788a9e928498dceb4582afe96d7eb2aeda813ff5505863bf4c22342bbae3766dc5c76a4dc
+8f9bef4d010df67a3a6273e81fbd82c4b684047ab644bad7d075cee39a2b110b6bbbf66be37de53bb3ef737cf384ad9b
+b172457ba38a5049fd435cfda214bd886b73507e8f1e4f11244bb04abb1ca03111efa7bb0120d2d077bbdfe47979c418
+8ea5b73050aef2c83a1ca89285fa2f97fef3c154561e0e14970e7d3f64376590467e12f6a7756f92f5a56bbc62601a37
+8f211ff10056a4969916eb42e03cb804ab827c8a6acd65e9c2ceea50619e3c2a4c251a0ed20aab4231ec24c43095a227
+b6a5304eaa1971a291e029a0c745e509fe9e2972ee8767c0f6ea1dbdef74e949bad4f58300db49bde7db51847715fd90
+a75276fbd3a4c1cd7741976c3322d850e205077100309d8ecd9a75a37e7cb98502d0a1825c475873761c688d97bf44c4
+b1508cc9de8bb9b4a1ad1c3043ea010e484a47a800c0a0d89c5b1ce48408d8b0cc4ee9a53854e747695ece98998d6020
+b0bd8615cec78ed275af10f8f07862d46df627f2eabdaf8e2c0edffaa84bb65dc9694ebf6aa203fb046879ce7914dfa8
+960f0e7eaaa59c7b6d56e45a28fb70ff7af88f5e1c0f18df60991210b053ab9b266abc08632eedf3d2bb9220da794e7d
+8ed015d0b5f0572e034793fb7c4c95a0bcbae5a37535839dbf95c963d7b42bc4f3b77c57942b1b9ebbd3992b4d2a69d6
+83374eb9a0737a0e5044427ae20e69626b23376bd384d668327f5f94f4b6434e8b9b3cd474631d3173960562f5bf6489
+981191b111c84522a203da8e70d4e6705511760c1b2eba4f2dc7d26539aa3e78848d3910b89cec357ef00eb7bff538a0
+8f1fab82483781b0a074cffd02c31a5f2587e4501e013f41ab4cc4c82a03daf6d2f60ffba4b19013247dcef3a95700ee
+82148cf05f1bb1a6d6f359fe3fd50bac49d4ead747972a74665fb5f98e494b57c36574b4ad888cc145ae2f303bda04fc
+aaa1aff56f4edc7e8c418497133d3d1e46553e9af968288d357a9ac371c60a11d69329081888bb6e4b107c3d889cafab
+b8524852cc0d960f55b1bc2522582b6e8babd030eda069f1007ab239ceacf9ffa71843f65f13d44eeb545690596ba98a
+a5c548510e4748240e3fc16eea453460a6e79550dceb1b4915494706deff4b5a81c85ce0e671417596b94ccec433f903
+8b811108269365c612cf79cae9fe5bef5f26723779d65c9d691a49fd5dc2c4d0dd03abf306870b968a17f2d844a84c92
+838dada292006a290e595809dc7c90a1cbf30ef86584130a6aaa684a5345db729f23c37804a2c53d1fee7ffe98f2cdf9
+a07b85a33de86da460288517a4edac0ad8c90d1b345f94bd865267aec70afce7105fd3a6cc8c5a46fe597ea12e159c3f
+a4c7686a5f089cb3c22220381050e241b3108078fb25d1f76f9df3ff047d939c29c7817717a9043582d870ccb966157c
+845efc33d77bad49de56a86db8e49ec9d7b63be4846df0f8ecff24cdf2d483eef175fc4b86697aa4fb9ae13e50d34bb8
+b07218c43d7dba8f3828164e45d95a2145982086fd50cc25e020192f5f06fcacfebeca6800af122391361d91b5c9b289
+8ca01a848cf2c4a8d2494c3676df2ef21a493b302ef07eb91f35c86a037bd257115431cd2479b238d3e6704765783b39
+b888fce4d308100b80db530f77b6fa05aae79d5ab37424503b067e1645c6726ca853ecf464159afe5c21e2a644e7fa88
+894ef8a8981904bfb3bd52cc542bda628e4753afaa49715fbcd8e71416748fb3ac0c3a58dd99ad92a53846c057885c21
+84fa13dc2f74525c5608236ce203a725a6012377816217570f11f49c07cf0805bd65d07a3a3b04ac3f0216c08be03f3e
+994fd004f24f7a25602dfd673ff0de7d25e0f8bfb610a51ea1f5f53d62744ea13e35e07f1ca148eceb0fe5046e8ba6c5
+99d9172b43c5c3e4373839a8750eec2d9d116947d201afd3489bc756033a4653439dbcf2bc17c4b6f89d5f3b755938fc
+8c48ed35c377bee84d981b639fe51384dbde6aa9d233338bc67576e80fb3295c7680a1360e80d4849db15e1e6c96c177
+acb66cabaf2f1195a971ea6f541966daecb14f6b38a4b14aea1d533126c619f47a578cb0b0140c83c4584aebc6a5f7e9
+af8b47dd0a428ad4e8bbfa79ca4df5acdc09788bfa577eee3fd7d9340dea40cc3eefe0317cda42081cd6758145b23607
+912241030685892c0a0f7b506af2e91770c5d46801e67762290546317060efc97a01974a0891c7d80016d3c981e1a33b
+800a3847c01658e9254994c7c2e4cdfcefda1dc343b44e33a614db4fe4291bb69daf52706764eed00afb62c765548742
+93e4b46ff582300334088a34ac79f04ba952594b37dd600ee1d98def5f9f68c6104c61ac068b52e58d8018715e973909
+8e7405ee05a43ffccb09362448364895e366e6cc44b487c4387785a43db294d1d4d30ad5ad0586e9634e5307d3ce59d4
+a9945e23d916e8a91ade76764f3c8e82e0e84cdc75bb00fee29349a1d458d818139175e6bbb37431b10e89e1cabd62f9
+921503ad71f7b5bde9543deebcb26ef07ddd80de728c1430ae6e65fcd77f58ab3bfd96c5bd5896b299c6539786eaf703
+a1eccbcef6078dbbe4efe50d9165e6422efedcda8ce6e034159687fc4048df9a3b9b2ff0bbd064921213b8e3b9e1c171
+b26e68c4bb858c8abf57639883cc5d3361fdf65b46deb9dd072470e881fdbbc3d5ace4526bd78ee54302604b3e7588e7
+aefbc139edf03596be101473129b27d0f8dc0e3de3c0a7a15860c461f07be21b6a5ab64e6c4d02292b3dec6bc906e1ec
+b01e5628810d4954d47295436d4eae0b7a2342158ffcf39dd9d0cc3aec88fb8f60f7ea28715598a3f84cf74d7db21ce2
+a08503d0b996dd7ad60698f53c2897678f427e3f73f94676339cdce01a878a412d49c8ac30e07ec401563498aec4193f
+a5f0d9ab071d520d5581c8d27020c36427a8510e0a5cd3ebf4facb5b23a086d0e16075c25cb27a76ea3c33b66b801043
+aafa15fa92e0541830838049b172d51589926d46ce332b0b4842762bbdd5d34ef08542ecfc300334cc04ecb3079da726
+8297a2f4fe289e80197f37a6c470b53b4ebb7b981edca05f794cde9f99118e18a351e7cc545dc4297adeab7f98ccfd1f
+952628464ba502253f7c65baf8d9846b643bc6d2e2063d9950cebc4f038a5cb3b8ca6de03696ecdf5b4a8b29c8e71673
+89970155c803cc2c40afd62772385d013be58840dc83c707534d045af75eb74f23b8677e76425209dcd7eceed7dfaf1f
+90b8d942f2989392f4844b50bca7db21e76f9ea5203909a96ee344a780934e5edf1f93ca986c90e489844e87dd0d757d
+83f524793024a8e74c49a62218beaf7c9cbd0f19bc846da048063590e358f1d7f08fb5eac4967f45e91d618f7aee389c
+957dfa91c79b987eb2f841b60fcaa6bd2a068b822031e812ca8aff521151d1cdeb182cfd73ae267f28cd5dd593172764
+a56c349794dc95dd8cdd6f46ab1af1320b7b930679d9ed7086de286d331166f97451bbb73c92d6cf8cf72eda9c9e81eb
+af8a86cbb980cdbd1ab653f5cc520e446ec4281dde5fd2ba6d8c9b8f2a6b2752abab3ae114f05c5f83cccfe3e1ffd907
+b1f909066c8dc5dd144fd9072a2f98bcc5341f2423f213fcbd77ee3d175e0580f712e1849d6d0a93ee4761c0938b43ce
+8a5bcd3d30ffa1f3cf3832ed95c9196412cce5b87d5489c7236e09ce753502fc282683edfeb89ce7f2cb9193e58f9a13
+a7d56d4a3829d79e346f37869492e98231b780a821b620708e604ca7cb44c54da9eb7e64257af8cfa29d748675b84ccd
+9823c5101bf77d1bef4990eea5bf977d51bebdd065efabda6d9497eaa612fbb28e4442756b4f064b1dc404a4f526e062
+a306e649f4bb8c2fdfb2c4b4db44e5517d8f140d25f67116c70f4f5ba945bf2c6bd141c1d8c972ab97549ef76228b3a9
+b21a29d215eec2a859b4116830f3aa711385eed8f752b41bc0ae1a018ce26eca95d580cef66d482e1d93b9b13e4a0415
+9718ea189c371f7b5ec0bf0a7c021914222b0c0c097fed2abf1102b891fc9762447288d5b6e0540249844cfd6f8bc9d4
+97af54e990253d59462da44512dc9fdd827b19c33ef813897ac5c19eef81f826227ac9d5aad7592a55de2201e538aaa4
+94070ddc8ff58e7abe8f328bed1ff68ea40f2fd35f59a0177af230ccaa27dfc6de5aa1c355bb8f223a0729f253c8bd60
+a8ae193739dd68590c6013e6d39c7d1ff42b1ec7a23ac014e160fc6bb1f38921d52e9288eddb7a3c8f1e9e5d9fb54b4a
+97f1a8b05f21174283618eb824f6869daaf307090944539cdcdb939f186a1f4b71a7804bd3e84e04e18ba785a843e9f4
+a59b4b3d7396f91cc5d2a0de81b64e392a4d9078068550cb604ab404155d0e9f7d9b24ff5312f77245ead90f84404812
+a91e9b1002feb8a1ed0428623dca3716824f912fb3ac8705de17347a3c3f958666d4a9c733f85f7c7889b0722f4d397e
+8aa7e633c4302b2600102ff5be6ea69197912ba5c996281827ffa2dae626d004eb0e94ce6d2e56421d3b1b38f6c4f006
+a85bf62a088f01945fd9f106b66d05643d6e6dacddb1cb1a4862c4dc70ffee8658af000d59f14037121a255dd748acc6
+b89327857364e08e3282a7c3e1e948d5b471e7cc01c12363fe288a2288e14afda0f4f188d32c416bac0284956cac7d47
+a34419cf8c9e38cead5a4799fe9adfc5b163992857ffefdde31d4d3f7b78e1668f3c97a5983d8723a961b1c1d7a16953
+b3a759078c30c9daf097d4bda7e978a8c890b9500f448c9433a3a6a04a1fe602fa4f2f8579c835b308021ce9dfbacbd7
+adef01176472a6b1e7f754343431a6546e585154b9e1b8c8ad8b0931871915c4a1f4ea1191e97945935de8a20ad15935
+a5bf71db271304c3f7d45038af3edff9a8b46ca58bbe0148b613eaf10d0d9889f764fcdbe0d5c6679c60821a70e7218c
+8631082f83a0425dfe7804e5353774d94f0aa7e9ea5b550496a467a9004d6f2077780731661cdc98bd1678010a355429
+b94bde69b5962235352aa8362534d81ffb7fc231a4bbb2e3b78d21dba6b4ca5803b03019e0ea1d1599e4fd3b0834d379
+b0ccab1c13e0433401e13ebfe2c40de50f52f64fedc0b40e21b8a16d454231741f37371231c0a71e25defdd27af4958d
+ab39ba2f15003bf2301fac132672b30b8f9ba56914f735cf86e26d5b18b9ac21f9669e67c4d83603b9832b19355aabed
+b40f050f37e61809d528d4c5d3bc1e49695e148bebabe1258db4ae87b0b3f867f96f89a536fd552d9387341f982268b0
+84cf939dcb36c06287aecae9af6c1f10b7af60b95d5fb6835cb24f3de00aa7d29b3a183d6b5142e51910bf870b7beb28
+b876413fddd2841c3bdc5f68dfa5e3474733980305ff3f1b23a9b4c79f8c21147c70b85756d84b7f90cd72d81fd619ca
+86b94bd8b00d8c58d847888e5d3274ede565b7923c449eff6631c22e3287d129c43984e0830d5d4a56a161ab87b6ff0d
+8fc42831627e6664e0069dae30a7745ba859990a796caac5b35da7bafb76cb3fe6d35c17f4fe18731b5557c80286e1ce
+8fc1634581d595bd62a2056b9ffb0e1f192094adde9372c2c2c962104a03ada6a24375a90d841ab59612b143fd323be6
+99e8b7d5ffc168a6ed63210828445e5a1d0c92d0af838d68be18f8c1933c5eb3ca2b2de818ede8cd286d9601df807195
+8957b5411db6033291e4a4eb3c371b4a0d23e0cd32e3fce3223a18daeb6c6651ce52d3ef8e148231e4122ced19f622db
+a953eafc61744c73850370bb3c668026ff7da4c6111225b19366ff47171602aa7e7b804a07d66d11a7f846a4e1220c9e
+911ac05cd283720ba6c9823c4a6b0426863e6476cec90d04acd23bd70a836c3840c92c1c736fe3a00d228fff0740f5af
+aa9971dfd2f849afd3f543790e88ab0a3564300fc92fbb2e6d07ab2a3924fbf823306e0e64a4e61c3a3c29b7cc763331
+873a07881327a1b7cd89adc4378d345eb7e7ca8b07183556efe14256fd80fe815b081e222eaf1ca999dbd127276782bf
+a3abc764e38531b0faaa02d65b6d55fa5afe6718171c90b6881c62103a5f522aed8cebd9bc7646c22698bdf80766df3f
+8dd398d1b545c53e760a317c5e8986d30be632274f844a7307693194f922c3b64c57d6962ea2a08c3d038638efe05c36
+afa3cd1d7fbcbc5457d01f8c81168e742ffce1eed1c0ba7214e71877e4b398616b61c72deaf2750dab561bebe362266b
+a98301721ca2749b525eb7d9241c16369278ade01efdb3243177994ced890e85ac2866ee1edebb095a93c56f39343375
+900336e57bcbd83343e17044583d0d8554d4c30cd24a6d24b7c3ffab0937d73afb35b6fe0b6a62180089b066b1077504
+b4c301de41fa4eaa109953cdae91d7d7e07e99de6c24187d386c6b039712a6545e078dd10adee6537e9a3fca1a925449
+89f6ab5eb0e3b4d0a66f7f0e6d8be3b2a71c0bf17770223c986270b4abdd970dd15f38952280247dd5d7d8530f3aba07
+81363450b997a417b07bce8112e4bd8ceed7c2c926a41e7330bc932d8beaad97b3c9476624e42f51be94fe3a08d3b257
+87ad66a0cc4f47e7c67a768017c6d3ae7e2dcc79c45b62576e0c974fa996f1d8129ea61370b6c0fc96d57ae7f5ea7ee2
+b44fddfc8363a00d47e8b4a68610457363f0573f3334e91fad0fdd455f77b7ae53747771133f623179000e9754739197
+953ba496feea7aee5681bc6adcd94fec4c193b25d3c4e91475c2678dfe538798fbdbc3a2ac28b5fdb1d1245fc1694e8e
+962366ceb249f563ef4c25b71d398fab8ab2390e530f287eddd35f36b40456ec7475070518d743496c3c81e82751ba54
+8d99237960349003e9af91465bf3a1f05b0bb07668c2fcaa6c117213fab7d9fea045d444df7847688e6f9ad86673263d
+a0a7dd3b99b0081a89f75d07b62628836a2b8aabd0be7388148524f6c3e7f81f8c7667839200ff24db4662b0519f8849
+93905293e1b4bf83b693314495a3eba47db401f7454fe643300ecad40b5a7f95e4ce32ad3eb69321aa154d70e0bab49e
+ab9418b844163d0a65f8bf5685bcd65c33cc05e8baf67d39b189ec11e6a5e35dbc6e308845a9bb87436ba31d4058f9d9
+90faa906332541a1e2c1c920d1a522794acc5322cad37fa77664b9a1a574dcd4ca11f8fd74fda5201ea9cd82f16f1cad
+afb9e5f8252bd1c54afb3afc879653ba0353b911f4fe280049da34112c29f746a23a6602dea9854a8cdfd489dd2a8310
+97f5d30727e29a99c9293f24379d959cc12db68147c6bfd2c9c95c7ac900cf02cdc751dace8b14be742d56c98f987228
+855aeb6d1123a470a644494c31aca5d3fe2eac8fd46dd33596e75e08c6a8a9d7bdd2786b1b778ccea734ed66be31482d
+a42086a41f49e5748b258fd1bbfcad7ea68b9be599dfd33af003e0ae367ae1dab1c4322c345dd6c4106e8baad3d4773c
+b5818cd4a83b60d1cd3b217b54d40e10c95c786aaba40909e8e91dab2fd72bf60f245ff6e4e0eb6f33d6447bfb2b432d
+a53c70bd904b5f0db90ef096774d2a9aa7bf7a804261b2145ff36586b7da97d4a060a9d053f44a4d786b0ed6591c71f6
+a30d2977551bcab52d1af1d76f1858d58d91e64a5f17c72041717921a104dbd79d16cd9bafb3caa7367f547db2bb7b5d
+b69c7bf71a97af9032acb2729e0d1f3ef7f396584228eab2539aabbd249e5ebc072927dd2bccbed3497405e3191a92c0
+ad560e8ee9821d7f65e4b00cff74c9de653ee4d8d21d180bf576b1be9538576681c10fc3818b04619ff67f4eaf68d143
+a1c2fe8d19077a82921aee2ebe09ea9f9fefa03eb139d0332ba5c2d339305d9abc2f13a5fede869dece520a727b7180c
+a27ed8b82d83ca7d811b77ad1ecd271d50e3a2424ffc21c799b96f5901fab7bb98d226c6152ef5d8ec09c00445014307
+b838327b3c0f94e61a75ae7a8d24dddb63ad4973dca7dab35ec5fea80b47dcf5315da38367565f45a079ef500a5f85b2
+8bad947099d91caf0d7000deb2f30d8de55e219c32a479a767d1d194c59b60a80acd67e352bf55dc69adeeaaef035fd9
+abb4e41d1cf53d678cac153371d59db1afd9558f4a57c0d194c2adb5510b074811dc2240e175311110bba4f7fe96cd1e
+b775189bf863b8d9a0437d1eb4ee462223b6f577fe018e082b52b1150d4f9429a457768fb54aec43f3004650c7009371
+8cf5148e022bf824b9c109e3a7e6ea3f9e18c697ca9f0c87f14dbc83292eb9be6d3be63196d876c43f351080d22a2f4c
+a7fd5701ab8a86b22a564021d1a9c64f0950fc2d9d73da4760256741b9a1d38ece6aa6b09c4fae79ddefb9c7ca2124ab
+85f334609d8f2e1aaa90f9ec2fd3284998cb1863ce9f74242311c575dea8119367f3a3fbfa8261188358269ad2f2474d
+8aee9698351034bfc8256e465d4a0a9516858aa9cd78417d80d99eb85ae1516847f1bd3b1b0dc935a1228f704136339b
+a8b657811da7af90d6adcb6a593f7e393dbea46a88fbdfe9aff1c5b3e6b71a2a15054e4bf237bfa74268c0828175dee6
+ad8eaec222113d1b25d70eb2d72aac43e42a7d706ce6ed5539e10566944dfe912e640398e34efd63b0dc8f4d3c90f417
+91cc05b426252ac6ad46fbbd55839d6f18489c70a9f1374006e80f49fad3458f7a6ee7d48292e42e38ac5206afcb6c35
+8566a697b01b14ad3d7f3106c1a77aead26b5ea8386ef481c486f5d915cbb6f5d6b6d82a8f73e025dca9dcd914aa07f2
+85c0074220d7ac0b95156227a00e28c3024ef7d5c2f28c384ea8392dd6b8cb10f2ea08c3f2a39f08f12cbc2d68127411
+985f1f49789055455b15d3fae87118b2ae523870c713a03b0c1ab585225638133d39c1918e8bf3ffeda8dfa90809996a
+8933711c45b67084e34323238dbdb6b4a7e950574c751ace651e754821066b52b268516ea15d7627d2a8cb6179dee242
+b18d7dd71e7c3e3eb30f5d817c146623384da271e9db8cd93b0a1de990b57779542a80d0d46038a395c1eedf68ec0462
+a746f6a923a2bc6e8ad72281e1a5f2e8fadfb232c60c910bd4a06248ea9f9cdbe14728dbe36a01bece004fde28084078
+8c3929457fab0b88496bb9936c2cec7a536528b52a81037bb24c0b2a4f92b24e49d18d05fb4b4b561c99ff0886eac714
+a31fc840766f6ca8d71cdeb48ae96f810bc93d1391d2260464aa01636ceceb9fc8b7fb04069bc323971779a149f1bf4f
+aacc984cb1050c46062cf66235ac63eed0f6aae5e5856d14e8a7d2f2b0e0b6a2c8b02c524d087812f9284e70a307a6d9
+a2f56c851597a137271ccd1404234788b9b8fb4658d86a7cf52d1853d06d59e529f7b590662e03fa10b2d7337fba4358
+b0706daf17e5d489b38fe3ece28446f611e935cadc0afed74ca351477e865f01e7c2b981874d20a1e2088be907fcf3ff
+b2ccb9e6a8425d24b1fc8e9393783052772a797284f20ab5fcb0488bbdf3b2bc0d3e7ee1de50c640b2a1331f1ade7bf5
+a311e9a137a00968ed5710553c4e2e6b750b363138b4ec4d8ca64f69724c172254bb388597ddb541af4d60b3230f8b35
+92917cc9b65ecfcc58300780683352ee53e9d97f9c80e6957f2f33eb5715f338c248df91734a5ae311b927810de8c5f3
+b4848cc6950f2f6cf72a29512e0c5aa4809f92dd23052ded771c0d0f5983b9f1e757a3dad0d0f9367f4d7dc959143d07
+b137cd32f617aea12399b96732508a98b9fed9ee1826234b609809b8b6de78caea3efb9b2a02345ec6cd858f29be04f2
+ad50d176a8ed5880bf789808af9e1f644818692c42830035a0de1f2e84f05314540f26b131d620ee3ff06e5520018ccd
+a0a8b45da6ddb4ae76fa0d3b3e41c1a0c25e608d44db764653fc9ae386e31f21fc0e3f5d25c3d51acd6a29606809c497
+99169f72682034eb4159181ed7b06dd9d22b92f191b71a9fc1b1a2ab1f1dd1de81b146566824a2ccb82e963f8cdae939
+954da96017ebdb49ad8e37d0232772272e117b011f8f27cce61df875e40ddc020df7e13202b0bcf41de1b7a70f696f71
+b237224c78c3603bd96afdff5c18df4f34394c5ac6e9f9464a02c9ffe05d336b7c99e774c1c90741d9a578d31b330db6
+ac9acc3b3aca921cac56262c2cee12838d7a0fd0a6591a3608ee0dd125f4089e9e20341aa30dfff2b350c3e731e84c03
+9736965b0a62f6de4d7afa08f73eee59d13207be3a8d6172a9afb8634708ffb4f3b57d435be1d46d129e67f7484b36ee
+b66b26ebf416dd77533dd99b0b56eae07acf5ee1d25601c86273eada15125909aeb3bf952dd6edf51f487b0e72b5e26a
+92969a53a41c40bcec986bac33c93b5d9d5e2eb75da29de87d2bccfaa0b6e064f0569e6d5b073100dd337daa1e796cff
+92bdfcd98d045e0382b824eb85a7c139ccbab610351c121742263c67019f33eb1a0610c7205c48a0d0b66ef4e0a74ed5
+8ccef40286790a5821bacb43e62f2587ca8a6a39b75e571aaf7b23bef9dec7baca7560568beb5c4c2b9f0e8c932cce62
+94a7df48ea09c5a9447e8ced51c2ace333f4faf4faafc9e3891c81fbd124ee91c24518d33d4eb9c098a39fb1b7924e20
+98a9104df26593e242f776a7ce01720060dba0aff25964a92386912917922e683b80c92f0ad05d2cc3220d6776a81463
+853339a66cd99d55649f871cbf04dc9470683a17dc146205710a68d4b6a2eb3c5b11ca90a01eaabee3570347d4df3de4
+b4e6ebcb474f2492b603254e40def81501795cdebc5f55f8da94997486e515258d8369418caf7b0cafcb78eb6d12eee9
+872db3827d863bf86b858d0eb5bbfaacc6720ddee05df3f7f71aabfef4f00c30ae232dca52d76189eed6b67e2b9bc459
+9774fcbb9cd74304c3300a577bf02a7abb217f8baef4ea9e2e093ad4671f668e9620293c5ab79c787d751959fef06d21
+898a464814bcf68bdbd1eca6f5135550e9f6269381d3a007b9af3d8635bc1deaf975cbcdc50b8bbc7b4250ea1a4fd913
+a9483156760e5716532e81405e332184a2861444a91408c9309ad2d602f04276ce55b6ab2c80110049e8d1fbf6454f99
+b2b849982a14f02a493e6d4f87dde41276e3c9052a5901ae1bee3d8fa038fc8bc3b9d6bf3fb32c72f4e71b877522fe58
+a1f4a0c2d733413e77a6bf3521bd14847f73d6407cf687cbd22c9ff0447bbd6cf55cc637cad66888f092787e044cb383
+8a52c63985ad65384ef4839c2ce610d6d929d012b905eade48ac21e0c64c7f24dd6344450426f5f2f9bed8e8883075b4
+80ecbeada5350d85619bbf3d3a3b0398e69bbbdda4033fea24bf7163fc281049622d8de2765aa33c77e01b241bee0067
+a51ce6fca804bb1115128117dcc222e2e47a2fe9231249f356be20ff31ffeff9b89743e1696a6fbf67cc1e45a5d2aaaa
+8b18a22d9a1161a7da4351545680ed5588ed2d719f29fbe4b91f9dfcf80aaff745748692815afdc556b02421096a16ce
+80315c2e9c749c9ed2b7087d734adcc953a77f8bf15a76c1e57856233608dac7b394b0cddfe8fefc7918ce2e4fdafa22
+abfb47e401e4cb394e5f8fcf505f1408cdedf35a5fc792d3f249ffc49b0cb4a127e36969b41d0e44fae5f99544f505c1
+878293f50097b562bcac669a84bf8a74fcb965d3c339982474edcaf9acffff8adc20693a050dcd84e738667a41de7ec0
+b9e9af496479e97f1abcdce1e32581139aa0d242d794b1203a235d89302bc8cceb02582307f9a8ef40957d2a819b526e
+8eb026243b0c4cd00468b0664ff17c7dc5017fdb1ecbc32a2c69512c2e0c478820196e6a752a36ec44bcf079d0a30fff
+93bc985a1f17977f887d95b9d4b9552b8749d7aaacc1dcb996149f98d0b1ad2d2b520c539d505f188056f4eafe960c4d
+adc9ad21c21a59401da86ff91314f570fafc9a76408fdaba53431cfc4af68f004a3443f5459ddebc734d45388bd3e8b6
+a4931b824ac65f198466e8b9d0270820a0a652fca2478523c8d5ddbc65dca265bb8e33541398bdfbee08496db19d2cb1
+846b13341044f0b4d7a51feb8e443532cdbc31e55d7c6f3061b9322a3a139bdfe22753eb439aadc001ff8d038d3847a6
+8e8641eaa4b59f1d89ee862e090a72795323db84a44f713a2213bb35f24d0505e7f13eaf34b8af919a754996d4b7f747
+9394458456ed4f5394f686bdd2fcf1ce8da1d483c410ab8628d57d4a46ceb53bc7ce4a1422ae357e4f8168907efd95ea
+88a7c22d3f6c1db89f41852d8e873e6cd8d50c819b56e1f8723ccb9f70cf58626a835f0d30c03f61c96065f32b79fa01
+ab88e29d278efc36c91da55acc1fdeed510294c7704b50fd78615af26c591b88a749f806b1232a5beceef89f6b6f65e0
+ab58fe1634e840ac91b7f2a67a128fc124058e9c01fd41c484f71c450b46336ade2d8af9859d2682f584bc80f3467f1a
+afba6c6447e739fe6376ea0258cf7a5c7f6a0d9d3a1d9aaeefa674787659e49110ab71d4338eda00c01e742b8e8ca7f0
+aa311ef95246b2f40be0d4f841ca4940bf04234e3d14934353245617e025a35f2c67d7801520aa31ecb9664a9df992fc
+ae1194dbce94654c8f4928ac572bc621fc95561bcd7471177ddac8e3afd06a3f6eb12c778e7e8d9a0f9f9d85b2e70c22
+8cc37148d715c7ddcc8cac2fab5be88e38c03e3eaa6664810f01dcdad534ebbcb2a4221c61980e7ba8f4a877a2a3b283
+a22a4ea30e67a7588ebf1e82b8b4a0ae62c84886298ce177de3d120a9209f38d77be5a500d796945f0eb121f4c3b4ac1
+a1e4c85a1052e114938ecd70798912a18d553c23d90097a5ab1aaec196fd219032a3e6233cabb4a400bf8a06fd3d7bef
+b2a495d076e9989abc1d0d186125a41677a2130f5940c762ea96182607c79a911c041fcf7d1c48663ba6d7d5ed037d14
+b42042eb4d7228336ed9ba194b153d31592e68c2120d2a51841dfea91d18d8fd9d968f03adc451d902e73dd9dbef4ee9
+918363ef7aaf3b0055dc30638bd47dc6107e4e0bfe134321dc4ec55062dcf32367fe0a9567d5c9dfb89cae17f2901ddf
+aebf3052052a34bd36910688a783ed7940cbfbfe0fb69d87fc1976cd0ae5b5b0e0474b6028d052fdd58bb26e5c1d3812
+ab77ce15ef809d5eb82957d6f8dfcb118993ab1f9c2fce0e341a8e277f0ce1f336009846151369e6be1dfe1e68145127
+aeb7f47254b2b4cb814a51138b16ab0321a1d4472a99bb25fd7bdb808c21cdf43c37b8bf14260c6a8a4e7f76d0628c3d
+a94583221c9cc3493c1a67a9bdb928f87a41a4787522df84b20194ead596ba27cb4091ccd72cba0f5bd644cb3c166b6e
+91e169c186529add07c3990113b9a6c4c7cb684e8caa182001d4d8befe81f1109e1e55f76560e899aae4b914c99e2a0d
+aa05f0c1ad14f3e05ed82c9313b8fabba46c35e46992cdbbc6ac9b647125ae5b8cf99a61172fc69124929a47219512d2
+9583f86bae21e64079cd703d044e37b54a4ab02492ff6f79d3ab4c1b80e7ce30ef9c8d6b17b9755e936052e6d46158af
+b95df374d147581ade4ab83fcc2e89022e4df13639c31892bb141371c9bc9adc3f8bcfda0dc474f79244d1280a44f4c2
+83b911218e01d15fb1b2d012bfe1c558e86733de9726421dd929ba47aeda3b94ec63adb41ced6d78d4043ee49f59ea91
+88c990898b0f45c3b33919199a25450e41b204e79960ac77cd71f4c25673dc0374176eae07a11a696bc7493743956465
+9938a99c2b85ebb08fb1647657d11e046f878411cfa04d46ca86a846ae22317e98784762c9d117d41deee6f271b235b4
+a7534a38d879eddb4d9e5c88ffafe5adc72e79a940e3bf4837fa1ac6beb8bfcecd535b121958949e1de0054067f52db3
+a960483f4f5bc1593fa633a4999bf26191b385c9666d34133f3a764fa1fee747f30859464c5817a8d57460c7010fc7a0
+8411dba8ca101a94227705aec3ed53e0c1bc8a643e5b4708b438146ab7acee480c399964f3f2d9bb69540bef7a007fed
+992677e53aaeab9490b3532dd51279b9c7199f36027417d99ca7181812880b9b5cb202938e174c14615ca8c3de8d300c
+834b29582edcf7c1f9c3ee4f8dd68124ac3e3dacf41e8f0982f942d337b80896ba89e5793dea39da48aaa3448704c16c
+9543124834cd95958ed49bd4a3da93294237931be4866995832244f88323b8a6cfa7960722a08f0351c3a87637bcc00f
+aca0fed5e4cf09deca026667c7b7a3e3ccfa0164e64aefdc79cda25bc687977350a3396265e2c057b6506f3252a11f99
+8a7b2e2422040ae70de5712849422ad2e0e329ac6a29a366d75cf2500f98e1e6d828d480e915431784b28e5601469535
+a32f15218bbacad0939b68c1499a875010e77e3ce32fe20897ea290b001c6d518aeac9c90bd0badbbddfa5b75148d70e
+b46a8f7fd5806e1bf0ed6f9673712826558e22435fabeeecf9672843386807aceea61ad80323c0d0a7b0e3da8663453f
+a8f47a839c746fff19b8ef7ac322f310940cf210f069d0677ad62ffbec5037014f27a9c5879256033e55410fbfad55ad
+a23db24a1ef2fc67f72eb2a05860eac8c8e46e6b84f2ae8ff8c0fc2cce259dd84e33997638ec80a6167acda9a943fe39
+98076cad1074c54db0b34f1fa405632306c745c43ab96983377ec2f12400a6007395a35e31ae1b7b584e7b7f93242fe7
+8418abe5e3d7e33dced70e2967265a9fbbb947c2a8fd08696926e614685b52d872e0fd2605c042c4ae8a904d3f5db4bf
+8993c52c291c0cacc11e5893953c6c40a714c651fbdaad303e46d0b9820572c3cab41ddec6293799a30acd244570fda6
+88bdcd39f1a87b5db320fd8d2f049e752da3c11d95e30a92117ec70653aab1d0d0b4e5f9d80f299cc73deecc73f7d1a8
+b4337eef3967d4b0534134484b2559b39f0eaaee39e5d2bc5f5f061fe58280bd727769c51a6faac003cd019d8e8957c7
+b8c4e705a021cf2d9ad691d4ffd70e5d9065288b2334aa4a656f1b544b94efb69e292fa3e577bd4afc09521cd233766d
+846386ab374ccabf23a4c3b50c210c13021220485b6d63fd560c34fbcc0caa79224b18d2c6f393af72c411c2ebefc5e4
+a5c2aec8f5448348d7955e02d911e5299b48462cdb310d6a6b8fdd110af8bc0b19e8b5114c603f60797e1c49fa84d340
+aaaaad09d9304462c2a667c5d8ec0cfb69d74415611c28f0e63354f4659768e1fcafba4a4bc789c2ffe6d949a1df0673
+a88cd464b45e015fc3ccdf73cd9aa6e0f853adae85aa74f10491c77ee789013d9fea9728d4e093dff7d41f517678e1f2
+b0bd572c164fd55369b6f497ab08f92469f54efa7ab9a370e0267ab0407b342393a6dc1e254cd196ae8b3af87d6d470c
+abd3dd91f6605ef4eb5c66744912c66d65c1195cd03d3567102081a8f6a9bb742a31777163cad0012d2e827c0df4e76d
+b77105c960669db2bc7de180f8e2db6616bea6ef0579061e08042e9c3e51d223d4b54d775a0fca577d85bb3b5a16093a
+a1a531788243b5aa5f13480e2cfb2b57c97560a1b4fdb99e96963c4f3f5a738aab34835b377ece2a97bb219d2e8d13c1
+a8254089ac3bf7fa2ed1d0488325bb9f5cb8eedb6cdb854f74b820ef3a5026685f4235c08e3c43a943e802d2e19edc99
+a1a4a71ea5dce7da4362e94475e73c4e3c0dc89e2a4ca7f99f417432fcd42f8fd7c729ce7622262d57d9397b55406d44
+a5114fcb6bb48d8acfc37c67bbd4e85eee31c04836347f860e349a33a6f3d986299f8cdfc130c01d51f387b603913f94
+b04258899536ae19827321b030f124687fce06ea637a471bf3316df7bab61f9b446bdfd4f06488a6808ee632483f74ea
+b8cff2098ca286dcd5802bee95841dc437e8af076cc13eb7afc4a218ab947fe6ace914beb8fd423af5083dac972058e7
+a0db982bee635f0b4dfa2d71d3ad0e72d5e4b6ad67b5a840843231d18bd47fa2785caf87773fe864b0490b57fcbf0539
+b8bd5710bd99a87cb3e6a440adadbef75bce9674e3a311cc3042c229ae3b485e7253f8d51d6164100795778eb484001c
+aa68c476cf5232978919a86fd21acb7f43c700bf7893922720b2c0fb1109bfb28e9acd39a355c667a93534dcd4022f2e
+b9feb226d742029b5cdb88d10cd0bba4ec62e554554bb9724ac7852b5b720094fa48f76116204f0a7742e4b624a341ed
+87635324242b17632f5a17b63527119288a96d00a66a536870bdbb380a183e3bb3aa72c4522a467f7a3f7b1078fecd79
+a99c340fe2fc95b6d171cee4f794d14d3517a949c59f05fd6d3412077ea596193cfb375f6899982f4944db6c1fd514ac
+88da8e4fab1e171cd2d7784ab78e4e6b46a7e6ca3b74aa39a64a49579905112fe87ba03238b72f2335009c1dc9c00780
+a9a25e49c84ca64f2c61dae502be30f94409780bb2f8b560d9565ea7cfc98d6bffb7e47dbdbc5466e8e96eb4b8961d0b
+a9a94096d3ee0408a633a4101a5363ba052d11ffe184b9ea9136929b6a1551a49b4a30c2c20da2c6ac67e9264d659f6d
+8a732871fdc015dc35d31963b263c219dd9be7b0861199a08c1747d4c16eceb1e893faa7721fb21ab78aafb7b59af2ee
+8152789d57b3e741a4261bce2daa128f33909d74ac233ca04aaa027b3606a6e2983790f5c8b65ff391103132378f4b97
+8cfbd04a6d6c1ebfdc64314e0d899e8426688fe72a6aa847a2189600381e23df277c083d5d97be115ff13558b8e0a067
+aef256705fba9ec76391a76e0e3a5ad3e034cdc5d289e5725055fdc9ab64ac39e76d1a8d617b499c5e8f98f903275e86
+9621c68aa5d362874572064b4b5d39e7398e8f1a98034f2a43685b9d4a0d6cc0a1df1c956faf0848369bd9781dec62ac
+95f495261c2eacae60d4b4b14d5a418e00de331ac321ca9298ba126dc80c9b605d19af890c1c22304a12b617bdc75fbb
+a89a3e5332462aa968b7bd5bf60579cd1fca1372878232f7e833568e43854361498f8c5122383575fb6a239732df5eb9
+a490ad4a0e78b9c498af6314eb59bc4e6a0929f602799f0ee3df29dbb68e90cf87b3956dda72b36a3f1cf93b376f509b
+ae005b943c174e7e9261558be6510ff14d2d1305595fb377b230eba34115636d8fea55261677d39bdc4f1aa86ba4cd5e
+90b826b68dd1adc48afa0bf168b7e748ce2d7c61fc474e841061dac2458d95d26953af9cea6b7129da87f0e204c60439
+a79ba549799a31fdc4454610a72fd40933de9b433944afece7743b60d69094d724b1573f198a77f33755a0353898fb56
+8d50f15ca4795b65614af28eb35e178f2b3041840a90aa5fdf21c8b9f32dc30c44fff05e6754672ec8e6b03fd3fd1492
+b89fb6cea79a7bfb1752e2c55365260c01ee1ee59f47d4813af422a7c916801ad0eaf3da12132f724f5df69bbff8c552
+b98edf63b77155e2be84fea6154dda6166372eccfae5512eff71b4cb01782f7039256685347553e462e76f42ee070c9f
+b78b3e6ed58ed909fee1069b7b9561cd5a85991409b0893c7681ec009e7c01799341906e34613df36038a37aef181694
+8513fe1234d81214fe727ebe95aea5b879e8e44253b256b24aa1065490acf69c2f912705d2a41b46446061562c0b4e57
+8f4c9418ba3edd861d8a469113940aaacca6b7a7c284a18f7907f43fab8645fd59dd4758db57f31ae0cd37693f011ceb
+82d41bd0c435409798c7fc9ff73e6c5ee1b65db94a224a22cc9f856697f2702beb450749b780d3dbb72544c17297d8c5
+9536399cd60b384362cad29b39ab6612d193146d68a967c79bce92e7693ebbf44a8bb8b13c57cbe38e35baa671f3879e
+a4bb4c18b9d08ef81fa0bd1662dcb190d45e65a1c53dc96bf6c00dc20fdb289d798097aece4cd3266dc64cf3c86c9695
+a3f768e2a9b1f27fc113743f96f9167e064a28c9dd3ab0ec95a55b405d82ec6dba2f2cb3bfd8ab2a636e4ea268f3467b
+a1d6976ee4ed285a4596cc7e84aa0c6cae21901d4550331c751b6319b466bc0cdfe2ad0e382819b8fd62c9cc3dc5f59a
+acfa4b882343c1cf116048af0e21b91ad303d463019cb882491be205c8b2004f5a8c819e2f2db3d672f5c0838e0efc03
+8ee9a2c3cf12d864ffc45bce3a2892ee69d50bb6dc35e37495b69e25e71081fa26b14cca05defdb79ec0b76796d0a626
+b9b8008a9778da52657cd0bc8f27a655d9fde615f69037aceb8b1f535ea7f151e7a8d5291b7b85798d704af2491a3908
+94b3df07054728e622163ccbb200e8970ec1e2edd3c7fff3f9297d6119c7e557271a9364318dde606e98d5b637ca221e
+a80e7d1d6237056413cb6379285704f3aa432c658a5cac2f09025809d97ae0a1606037005758bc8163722aadc56c95db
+ab27f855c23a5cd24a4ebbb771545d4cb0514963ac165ad1213172155eead92b6a540354a91f61367efc9807a679958e
+8e58eeafbaad541bbd7ba046d88940d8856f15a1dfd686347bdfe815fedb8d74f85b8aba243bb7d39c44f92c303495d3
+8975d8f6d1de1028ec744d61f25d9068358b0b18081e84e8a455023f2b620789fc3fed03f3276ea712f4d3e5cc180540
+b96a7d69810f963cf84b2ade95cb4a8fa9605c6b30d61c70ef4de9750259aa4c0a99c0e2de8039eb11fec98fb522f8c1
+8686bfb1072b0995772bc013ff84996017b7629d413f0f5506a47cb86f3a4dd5be4c0b2db6cc6f12d8d57c36cec35e87
+a7ab3a9e9a1d96c436ec06e6252aa88896e24b176c19612069c4fc28bb768a9ee624ff12ce7a4bea7ba1aa4a99cc87f5
+aa355aebf12ae1c737e17b7c066619327ed821d68d09a5dde2dea6e1fc833fafb1362ff24e4da109ebae8b858486acbc
+82c6927f0238ceb5b3e07b2e7b7dd52f811add238420a34314a156a4abbfbc1aa0dfe3ad2fb7db6d01f7d47aa7973daa
+a2d344ac3d4c963b7c4281b9e10c223b5e208eb76cbfb2c5ff436f37af4a39c7d9e14d9bdd6fd49fa21c6877edc722ac
+96ffd354c3b8e1ba4eafdf9d5b7fe9c15c523233129f0cb4114cb671be16c8fcdf0354e09c3a0cc322367850b64272df
+8d7199456755617c7d2f94f2ee1a59b9a097eaea4b379fd497e302b2a23981d5d213761ea0afdcd3cd107eb09b900c63
+92dbaa1f38999c82817d963933fb5fc9cc309da895f1c1a481ccbb2210b62855e2e021e6d119df8a39a7b0e6748b93c5
+805d545b4986cbdfdd0638884001ab103909e5204859192018180e0f55ffbe2ee6d86f9ebd6be3e76009836b3be75de3
+b17b2b0cb94620a93217deb34430e4f1c331bca272ce05088933406b6823b3ffda51125232e33a03d230f00e4db75cb0
+a4005b9706c21a0043922b9f8341b5a6efb77db6b3d3260887077735d6ac5c04eeecd7c738ba69655decc2f6a4110baa
+b1320b58a52176bf6deba6f60cb30da9e2ce5815ccee503207afb6e70a7fd3fbceddc6133a90c3bc419d2e9148f6a1af
+96f31693981425ac9ca46fb39b5159f43d2dcd38c001c95dd2b9138f78c2ef98e632986d961de76544792c0d4d0b4fbc
+b1d01ea3234bdc2f92ca1ca9354cd3122a04255068edc386b66b0ca958e9b30f48de1a49e61714efaa276789c8c3d917
+987997835d6ba590ff402e0564e79855deb2c31e29241dc0d4f3a84d6416b8815708a0eaca9c8d0e9da9ca246d708d26
+8ba3eeea9e015def613543d6bdbbd917ac3859fa1b8ac2062e5616f575cbbc888bcac65f6b8d2f75dbcff0add39f7a21
+8e54360060695a2af4f8de39ca50f6455b91b0ad146daca7eb5d773fe2a99d50480bde665e8183f3e41183a39f72f141
+ab0dcd6ec9289d591ace4320c63bdaaf45a712c51e652308c2a3e9a33eaf6d5247b0ffb5b04b3fd0a43bb18e05a8542b
+af96c7de7b16537f8730d189207a55283aed0d0aed39df9c02b774b796aea6f5c56b7bad6ddf4a33c48f7d98f63a1216
+a0428b0b467992b17a6a8a8eb5dbaaa9810e7eb3699ef0fa278df344c4926af02718daa0b6b528a77e3f980d8d99d605
+a9dd4edf04e040a2f12f9878704f5934a5a5823e72b8ca37322605da0f947b072b3b73657f56de4b89526057358b9512
+95127bb6bd207db0ade92404768b2874614f3ae33aad5da8685d3ab896f607238a21a7f3b9d8e7a09b2dfc16bceac6e4
+a7988372f4d47973dc7ef7cf15a3dd405b02da7c288656cbacfbf515af0cd43b972824993fb88ed8ec62b2fbe7de0b66
+a8e295d5a26874ed10a18f592e762c73c508ec32ea74f9c214c65e9e7018f37472e1c97f0d4bf865451cc7c59a7141fb
+abda573fb81c9d890525c161b466c9ceccfccd29b5451a864f3feaa6f5d4e5d2cded27c06031469fda0e5a1a4396b698
+87741fa0563a75ab12f72030d4a18326b90104459c12cc0a775e5fe06590ee777284df6213dd9fe170cd972842265545
+ac084a5fea6e3bbc810d4534a83fd9ea6d603c5d68e4ba5674d792f222c1d055e5b8af0d21b19d174ef221ca77414505
+93bc255910c7812c41ac47eec728646e8385d5a53625664b669407ae0210b3b4209401886837eb157401e459ef485e59
+91f703d1a5ad97799c8306cc1c5df1ba227d7aeed401b6b7c3779cca64b54ad993dc6c7fb2d046a54c63a2e96be7f087
+8fb32c25a5a376ee0feb07ca2e2dd1c643680ee57b642bde6f6c25632e9b0d8ced0095d088e72ec5b8e5a2dcfcf2328a
+8c2e7ee2279625da667ee24eb345915203d35e8913fa54fdabf341afa9ac336ba623fda82114c9a9d8f3a746d374cf81
+9470d790b0b0fc0db3dc1f9feefd7b37568be3a7657a4d91cede9622a7da7c90e0f961efe4f37d1efaf9f96bd4114f29
+8a4073e46b302448892ca2c64bd3a4ef40ee371ca987533a3ba86c355c88804ae108aeb7d1ec66098e4c4248a92c3500
+8d8bdd8cdf8d0365826806fa89671958af091ab04169c45d7cca6d4dabcc47febe3698896408820f4bb7f243772fb4f8
+af58744540ff1e86de1c5376e12dad7a841a929ba0951a1ee3dba678f6553323fee62c79aa6741671127344973f8d5a2
+959b21b4642e5b0035acc59f0ae64a25cdeefc436fdb02cea97625c1c6e147bcdd77c2555f2210f9e88eda6bdbc6ab08
+921e75d2e857d32933f518840da0b13c5f3b6fbfeeddbf3465433bdb30e506bf05e1b79706235b522f843c87936d9cc3
+b2e4cddc742b5bcf2e5ff783d3ac797b31514fc5ad8ac9b9baaf934445e665bee16345c01a4c04999520cd1c41567a7f
+aa10650bfa5ce3328028abbd06128374345d8e6937f2f4a02201b1b305350742e0f67213b1c5f69a132e97e3e3967b59
+a53f11ecd11affe5cfbd174f63203de8e4e358ac59029b204df1244e72fa8cd600b99fcd2806e05b60973cc4f65d3e53
+b9581181eb4dc0a4e1faf7cd716f32854f15ec98853f296add58847ed4c4036a1f6cdaed4acfdc6422fed05264bf42dd
+88ab901304bb861d0a864b67096a6afeda10dbf9391c9f95a8b226541873e6a6d707cb652c7c7dbf3610b3d2ffd373a0
+aad6aa83da7bcb22ac4ce2817d3b0f9be1d81b1596aeec56758b6501912e50f7bc1557add13f03da1c7c083559a3e9c7
+a02d483d8f12f74d6dd3f45e79bcfa301dbbd7b67d7d0c158cd4af625591c2fbccfb27fd52449ba6da1544f885aba1cf
+878def0ff97d3e38a9a0c9307be4f557d3f47f4cbddeaffb9be86dfd268d1fb643df0093902e3618c5cafa033403b439
+858b952ae1b1b5a4e3285d8bbeb197c6626c8a2a33ffee06bfdfef531118b1b4983561d6d25bb94eeae297b2bc6dbed1
+88c798d495c036f6856f6d8e1226e522e83b5cd6f94d9dde41821ab2d203e2a8cc340c88f687494292ecf9a84fee0708
+a7a391d3266ca5c17239571397b48c2db71f416eb8d4fb8a015424cc9c55d00009fd1dfdb795bc5eff88c900f5d17558
+83a081663150f89cf796d998a0c9442b1136d762cfc7ece4e70b821a102e0c8c248a21f48006902e3bfa706219d5b456
+a20901c9c06b828347265074af47aff0bc363de5abb60d0e64a1387b51069456b62e2f97aa3cf4c3c6f8cdbc6be4ebeb
+8287a4f1b24485e726d426e17071bf65bb1996500a89d5ba0088d21919957faa47ce9e6410e346f608414c7da7cf085f
+b7fd366f4f8bc2a318551e05ee1103ef9cdf93cf6c2c63fcf0046028b91e299782f3d1812aa6b5bd6a5d06f061632c6b
+8ad22e713d6633b7ba8f7af60ffede735e2d539e2d59720bf73e17466d69cf6503378bee92ce0eb3f8243ff42ba3f9af
+b14339a24ea2f1e4b108679e1d5524eb312396bb496762fad31648dcc4501c337fc3a0223315560af3c20a3e1a0094f9
+8539b0816f3701971d7fc876baa4d40f09e9993cde5ab3ed79584361a598dc14c67173b1a6fb77fba79bc3e0f3a7ec09
+90f0438edc95da3d4fa561c071de828f1b59a7234d5773d55742e3adc2b7726fb93182a8dc1fbeadee0387daf962197a
+8fb545c3d291ded7aea40a5d5d36c4a75fe2a121e77954db5914266ac6a1f691bc8c619d5753d64385d7ca6eb053bd85
+9339da27f931f30fb4c5b5d9849eb40bb227d9e83f2e85a8721d9ed7f3d88f6419271bb20a1b89c26f80c936c626cba1
+a21c2dfacde8a657e5d7355ba753b3829bda7f9c2dc7dc5ebb3da442d2480a8d87b3e4e23b5da9dbba980c3ade01f1ea
+98c0c1873047a740591c4763993cc4131d6d64ff59883f0d9cfe0c7404ca98172e5616572656451995cfd0fd8d159169
+a891915dad75c8b2868379c7f040ae906ed30e69b76923d4343222b5217837b773364917e4251763b04c94f2ca22840d
+94c176e9b1e65122617685aff3973855aa1e0c648f2dc35f3c4c1fa3863a28c3301a260d26489a9755c278287c4a1253
+875f0556f2695fbae7736673a0731ee70a0c2953a758110f7699cc7221c46b616eb4e439f57618f154f0cfdff57a0148
+8e66dfb1252adcb59f3cd4c424c7341da5b74c33dcb053b751bede30129014174a556bd59270cae0595c669c092731ff
+ab749e76441eec1469b24aba8ad3b76937402ce158794539d38cc8647558eb9743c96038fdf4d001513d489a2dfb48de
+947e5a5af1da37ca4784005caf8280f5de2b69680feacc0a5789bb4444520d64ee40299d6492e19fbccfc39040f6274b
+919b01a297de7c979d27b94879c1fc3a6f5faa41c85f9d4647d2085c02cd0896eab1e7dd2feaf2b9c3f42f4dba5342a1
+88727fea0d63ac9198512eee5826aa69141c3907f3c172909328105d6c790eea272a82d1e1fe27e7e8ac5280e842a28e
+828d08128899a7bbfbd7fd31e4ebbda5ea3c66c1a177e678d46ce4937cce804cae81d3e7a4944239614e8f0775edf6df
+aa11487e1805eabefeb7a16e6b2c0a551b7f049067d3c1468b33df877ad1c50de0f1e279cf0bfa88d7f507fe2bf53b85
+8a45ddc21b8d232963341cfae10a0d57b9e65fc3b017f9bf2b5742eb4c45a3c11341cc3916f995b4a30d958ff65ca421
+8fca01c2184ffb86a22f4ed757a1364a0f37a3a1ea7c1a055b4e993e01d352748f6c22d902d28ee439ebdaacacffbda7
+b10b5b055a769ec45011a31fdfe3caefdf889b7c683446f41c4b775c74a4de192ac68b319a018c2dd434e69dcd40fd5c
+b5a45942fb9e6e83758ebbfa15bfa1f2cb2d39033f2ebe038db29eb137739f5cac31f35555bd8b14ac04f3206e0f2998
+843435a2d791c4ccf2ff9f783fe7dbc48bf875bb9bee845427dbf79755fd6d09ff6b14193de0bba3996ff17b9a473aae
+b5838d60df052f8febdcb2b16121838b5b228ea39650d89c2cf6655f06728afe3a323ac45f1c517e8bd1055067fd60f1
+98a1c5a8824e2f0bd33b56fe1bde5175e1f077b0074c79ae304df4abcdbed370a44db82ca7d22bf0071305f5b3ee3e9c
+8acde9dfc9c6d02704ee756f8dde1aa3e421b006325db56fedc8519f633fdccfc9250edfc6009b3bca8f6c2efead7f1d
+843b1ada23a5177028f68cc59928e358e0c90ec60bccf774605ef6f79869751129e84684662805ea85aad87e00c9b922
+80906aefeeb2d69ec8736149f8d19165143054002a16ce26501106cf5527bbf69011beb6f867cedb088895c6195c7627
+b8b4d45603783ac7325ae7c2b31d8a1f39cf60f56f9c7b1c7e9a7bd55363567f9eeea30f165713eacb12c4fe3286cd1d
+9287ce137873050a05c6844d6aaa1527d0a6dc9403594320624ce72063d6904fecad36fd909998e1c8376379e6bd2f11
+86abc48b1d239ae6091cabcaef10d2786a990b72c398633d831d669199d9ed3c40c347617e2c07f028fcdef057c929a5
+8c4cb5b4c2dcfdb5375a0df15c6c024373513d7bffa5fdd2ff545314b0c6b62870a3122a692db8e820e3f8ca1deb1772
+8cddc1b6e030c89e68fd2ba79feb2a63f11ce60cc534f004932f5a2f08b047dc5adce8491fbd0f19a015420e5bffb12d
+b4d56b178780d899c28bfac8894a28b9b53d7695b5c36b06ff624877281a502e5ed8c88d48f011dc8beb7816b70e29e0
+938e52f73596a253a61095ba2f84bad88b44949a4c1d903047be11a3d2e55df61c3b99073d3ced08242f9c3da50a8210
+830991af3a7d5cbc53a6d3659550dbf0e57af573ca57f1caae3724fc76e5ad9fe1898b540850d32b55528f4464f2b61b
+af9c2f3afc17f5df424571e6109ab51ae9c94e0ae24c041011a57c5b583b80a09b4309603365d57dbe0a3bb97a433ed4
+b823bc6941a9611f32b88fa2b35b9641fb61daa8f64ee0359461e2f55b55cc36fd7d632d7f1e3ca879b6c52d2ce057fa
+927086b6edafc055011643377767e075f044d7727ff412f55f45ef83dabd26bbc5c8bd838cacc986ec6c53a4ea978d4f
+b83c68c09aee1afd7644e7740d8be028bb12a8a3fb184a1db4614ad65672048f7c9e2bf59694debcf53626d73546981a
+82ed8483f7db084b572ea23fccfff00446a604a49d094980bcf2236e1a0565da783701e4c38bd74b95239bc28803dead
+82ea648b47f0ea46e66b76b4c14ae771d9e97502d24608794e51eb1f5baa301e9cc3cfb83ed8482d9f55d151df2a11d6
+ae6c89003cca4e25ad780381af7dbe00f2f83e12c237c54dc830f23be8ecba4bdb57d5c69168bec35502074451e4d979
+a541989f101bd01fc39db7f3abe4afb083de5999c5776343940f5704da8c933ad906331dfad7a18ee423398690e1cd90
+83513d748bf108c3018fb0bffa3224c220497e0cbcb0842151b4a8d24e17222bd826ba56f37eae52975688ee2a5da3fd
+b769d5256be8c0645beaccadeb1cb1a8b585210fd78dbf92990400070acdee073f6ea6c0eeafee081a95e2e8c0cf5f0e
+8822683c7651cdba554d9217b9d5433c8b8c8c5bb47421293d6ad0e1c5af67fa80714c04e58ae5fb0cc9b5a583f66123
+8b3b8255767f58a6cb8c13c711be8439fdc53c8433e97480b892e58384eeb2022ed7aef62fc6127c93228f5e3c7cae6b
+90f08d28267c51261b74f172b3dc1abc6a64e5056dca42728beff82d8539105621588a30cc3cc58541d0075320d6db82
+81245b834e0c0dd511894ce4e83eeec96a49c37a057af74f6d4f48fa24b48f4875de1b29777857556ee78852f40d0791
+a349072811a920c64116afcbeba12e34c7df0b6ce427b32a3ca59891d2eb15b69e852e966387c409329d359351f2b000
+a1301a0379264151b8320ed7e008cf70b22d9a2d188bad3d0df0cc4ab6b5e7f87392e87bb107781b3db25c1e023818c3
+b665feee8563ec8f66a346ae078c475fe480f4d11182ea636e4e95a059de525ddee7375a51a31c4166c6cecc93387fac
+955c20633e2f9f51efe4a8f717b0a822ccfb668ccb2724731fa77ee7bdb6a48f33bb1009cee611dd55eb42661ffd4d62
+b869018c7cc428b3499ed8edfbdae4e308e0ad2e93ad9a5b53a1cfe795a193a1b3c002f34afd98c7b1832c2494c21a6e
+b76611b7b43cb468cad7bc25e82b199e9e71c29bc6ed313f9b3edd6ee4303e200607820456a76b19c5334e14238a97e6
+b36dbb2e3c470d7948f3f6b22099be191988708ebff0db472e056b9becb3268ab2654bac9c61ef10af0ffc853f6165aa
+b9e4055e663401c3d3287221b2d3643a5001714f0261323af2c41f46d7220b5547ffbcd978fae521b0c71630dff4adcc
+a6415ddafe472a5d6c8f223bde24726b9b91fbd19470633c0a83ac2b64f4df8b0631ef4e6ab8fc2ddf1f708133d47949
+8914a742bd022c01ddc0a6a212bed566772169d8c3472ed40fe9708addb7ada84192c5abd7db23aca16c789c646d7251
+8e99ab9aee29ec3cc719136cfd735c122b037051cfdf09c5788fa34e8ec00ef6fdf6fdcde066ecb254aec3c59ff01697
+937427eb1c6c6f207f78f8a0ec71a5691eeaa3be14b8223f09f69b1ddf0e23dfd5d104b30dd3bc8e8e1596954a138256
+a29510302e473a00d02dc7913820946df3d6a28b723e8fcd3810cfe755f9f1db9f2fab7960e5a6a6fcd77ad0f74c5afb
+a6a2d8e915eaf1c18d8959a9527c253b1788be986887548510f80901386edbdcbf38d75adf0eb1e5076b5026517d919c
+b8cdb7094a221193be91e1c7fd9ab7b214410e9ad8a8c3ec3b672aae6b9e76356365b484d00545b85c7754b4e4703764
+8b96d96d83d322ceda9758b6efffdc12ec8b4c1450f1ae6a8bf5e94c42ba6d5bc14adb7fcf6195396d09769c50ccf05c
+974c86627bc5f115015cf5386509933ddc3dd91d9239df874761fa99bc894075ddd975ded95c8a83d862ee50951836a9
+af006c6e0778c1f97212363ff330ac0757431e2e70cf48c8ab2cd18138b1e715bcbb791d8907d30797dc393734335869
+a69f34f3a3886bf663b5c35172626ccc7d5640ce909a1779c7a62bea449f25be561dd04fdf286f872b77ccb057ee2555
+9932bdbb24a5dbf570e0ad97274421f2d08e58ff22fb73564ebfea4b77f6efdf78190365cd0cccdbcadf6df9f9a81fd3
+a3a772522ed9b62c61927c66041c40c19f0d63a5f9cace57dfba5d1f1e3f1b2b883f09106aaf8e2cccf2c2b454b490ff
+b1f17a262245ef9b03ce22dcfadfeaa244dc322a1f5da9e6c460971f2bac8bc072ba58e674051b9a9c004da0176733e1
+a18a7d160ce3e26108e22ab3f07dcc2e102691b4d1160a52362c778ad540e2799ba5b2228d39bc20f29392209e6756d3
+b2f1b158e12f6b3eb4790901bd37416b5719bd10d1bb181f540196e3ea4c38c430eee6bb1b049f606c2ad3d1d293f288
+894fed7dd85665ea411748c86542bb27efe39653178a41d5d32cf2496dc01175301a7100e04506f267360a6107e343b3
+b2a5a33929ccf9f9d6b57e0836aec4318f4b1183364bdfff822b154d2a8c6a791a9d1e6b01eb9a53a3c3b7962808c16c
+a3178509cc09849896264539b9b6c6eda142542c49a975ed7f1ec3e71240c15a7039a1a651064990712c0b1e9d0731c3
+93321d32589b5813e8ce1bdcf4a098fbc5196b3438f5995b163c7da4304e44f7b4668289e00a7aca22e2cb72ee058adc
+8c48852fafdffe3512759211f83041ebe47099da257f985ce9c4cb6b0e5f27c1ce88dce8885cec5f319d1ce4a1e971f5
+a70989d4dcb75f27e4e081d5432235c4d3894d6cec8100921ad31f797c43d4eec5974def4253812f72aa63a95dbd3ee3
+a2c1bced4da53f6158d4c13977f08ddf40690edf6a34590e1fde0b81d51cbb7b293771beb2a42fe496852f1fcccc0d01
+b5d70551355fd2ba7763eab19c9ff2f804e0b3f07516f69ce30d5c211fcceab5579e1dffb510bc1a9c63d7e08d6e345c
+b5aa934e466bfa04bc85fbbeac4be9e2bc3873dad5da438a2e3e62815ce286df9a25d8d097d62e02950e971c67846ace
+ac8a4b063890548aca055497c6ccdae82558434ac545a6f274345184b60c054f9c3d847b7d112ce2d4327b2a6422d818
+92c145b9cd7d2800386992e9b6b8ddefead0e8042a53cea2494842981789e14d680ac9523db01cc43594ef696b75e7f2
+8a5c2675a4df24549c2d5bb30df3c539930b360a653491a55e739054a0d45f6e89d6d4529b78e2c35af3b4853c91a0a9
+b7f669eaa4b0eef12bbae7841137de03c6bd3964accabb1c5127429907b14b0047040232ecba40904292e2a740e294ed
+90e594402a82ba13b8e6478d69760c512092cf8a1d5a87bff97c6f7302ea5cf9830b2ea3b4a80b2a8af5117ad69ebd47
+85308607535864a170f50b28616600cbfba5daa9933ba6193fac9344a39c5ce392856932a7c55abbef3c5fd105087659
+93def7c9eddc41188f32e5b978d97b8cbb05a0cd70cdf2ffbe1f5d3cd77a344333c575e830323f75fd77802512965fa8
+958c8d711daa777371e6cebb76084249381a2f8c374efe7371575e5459e7ece754b7d1e8bcef9597db3837b13cb461f7
+8644b8e96812a3fcb80c91f11bc4bb835f661d862541e61bc8911b8e41558d09423017d66dc7dd8624a296fd584b4903
+b5820fcf48ac2b76784a947c08677d966893f38644d8bb9b38299e1deffdf584d54a33d367f1f455b674400125a5cab2
+b46b25baa6e4ddc65396b246afc5b365c5b430153c261506974e74a058ff20dd2ac2fb8ab76720864425b206828b93ee
+81333c5faef2fb66d270ebc93b2e97b97d779650a1cb146770376b16a060b0f487d1ab59b0a9361132d3c2cbcd354a3d
+a0c7a14dfb78c731d8dcdf7869a8e9a63c26dbc1022f5311c0a19efe7cea4773868fdfe495d9f48ea681d57403ee20b3
+ae8e27522261adfe335d8ed32207d4dff7e03df53dee893768516542e17bfea3a23a5e6c594a7e74dbe78a51c1ba0fd6
+927d24e5a74c069bf7f8c6dec3c21ee3fa2aa2985fe26a02c88d6aefc6fdea6e27eaa51058800c518a61165546732a01
+af55c628d1c9ba0d95165ddfe367d11672dad2e6e71735952907e1f31eef8b5128a39eaea4aa90da7547da154d2722c0
+b1b6c0ad124282138dbbb55aaecf089f621d45bd5dc716dedb8cc96c93f3be337e0b4e0438dbac4cee0439af86c00e56
+834ff97a75bf3db75a3aa313f5f61eaf25862b5bba4bf039f15b68dde75edf4ec506fdf38f925835de419c6aa54e916e
+8d33fe5ed55daba07f500364211458e1c2258aefe787d20dd59de1efdba51ef87532adc766be8eb73f328a9800add583
+a73e1402daad660918f22a0fd7e2b81dc465c4d50573ba8fce5289328476a5c9fe855f4de7db3a635fa08952a0dd4b84
+8fa678cfbb278b22e93a8968af74c6a22bf0ade60cff484040fe0fd4fd897a8d428f1d1c31ca52b4794d7334d25a40ed
+9775bc71a9df2d8264d17d877fc152b3bb6358f0811c637b9e426afffb8406f6191be4d2f50b285e30018a2b4ce4fa0b
+b7ca93cffef6c05c0f185b1634030867e80ae128594637ecace4e6d9c4232f36513a9d92072643ec6eefb61da6468fcd
+a1ecff7179baa08194ecdd657ec3768cebd2187dc22d78624deb26f2af6cd059d5eeb956e9c2fe9f2ac387fded4ace38
+b51a901b1ed43b1673fcb592c9339156a58ec3f5c52b2f44445003bad46f8c9c6bf9b686df2e256a62b712bf4ec76409
+8fb385ded0aeac3e34843f8631b25b814bd9775f5522fb5435eb197a10376de79632d983f4a895f3759eca631214da20
+b1a0094caaff2257a81ee5cbf2b7c3914312182eb4ede24f9425a2cef0155a01177f9d439b8130205ac8e4b9a09d5f18
+84382ca6052fafeb165058c86fc7b9e09b01bd691075c80c992f5b43f533bd37e07d178e2489fabc8db909f27ebd5627
+a7a8a6ea8d49912d1ed1d8d0551cdbe9e70af07a3077ec2de39a77dbe237e4bbbc5ee7c838fa61cdebf4b7208bfb8c3b
+8da11fce90225a64d27da0c94cc8eb148594152e92aee5efd4c053ca6ac2dc29190bfd5ae59b4c7ab111800f723b97ec
+93d81c1f743297c7ef019be107ec6f3808c16f6232f240b1dc5081adc7d0c92dccb2478c2796433081d064b11d76adc0
+b300abb4d4c4992dbd35a1d3178565ae645e497ecca9d082a1fa8aa9f8ac44df60d37b8a81393c5820705dc242b3927b
+9293d80fccbe1b99a33cdb165e44bb6e431e33eae18232bd2dca2f66cab5844309854ebda1d663fd9f7f416d71196f82
+881091b811e332b56fbf2782e6f0e19532a4ee873e5b04815643cd0a5d2ea50c68fe4bb77a26b13c19b1a877e1a425b1
+831505afd8807e00a0c410bd6791d2789f48313e2d776a009a4ebec661305402824d03653590dfcf3b9e913b6da00bf9
+a16e023ebabb44d616efb0c7dd56314597ff1ff09dde50126e56a03bcfc56ec67667ef523d178907b8fdf75997c85dc9
+96a674aa933f64bf33741c145ec35b12d45886f60c2998aea60b107e157762ebfef962476c807bbbce55cb56d1bb70e6
+b49068129004ca04a00046a75d9eb51b660ba40b73de22a05a1e4b9169fe2291df1264e787de51b3fb9b4b914de363d5
+ac7390f9df12a4d60947a9dc63ba1e52ef424db9ffd969b127916a70513a6a9a1745e26ead31726629ca5d97bfefff31
+8116a7842b601ea48d4f2365b54f15353e86ff4dbe91584cc8c3f73c12acb919ef75d0eff6fbc2e98cdf05f1981aa41a
+8253665db0fda4a477d9eb6a21ddc4858367869aa88dc5797ac3f475dad6b4a29459dbb89371a79ffd3245bbf0ffef22
+8983db43909aeef8c9a8f9eef60e15fc0cd2eb6c5e58de40debdf1b9c49d86cfdf38a27e17f761ee64eafeec2ffec8f1
+b06b4f3435b4feae9c479d17f250892fdff00756f5e01357a553226dc928ccbfc822a49dc19cf230893f0b80d768be2c
+a1ed732f34153d98988b91732e9864e7686bc72eaa854a1343de46097e75966772283324ec2ed646ec3e7c2a20198248
+91feb47c3d6bcafc2ac69a23f5e04856440d6de47381ff3ba14374f8ef9fd6d98dc2d43ff02536ab8dfb93f934d89eac
+afd1a2fcae5234b68ad08d21d111a5aa71d73fe62db23dac1f2dd8188460e5352dada58b71956c0409147963974591a1
+99be215c619cc975fd98c4bdad9cd22c7efaa9044f310674cb52ffec23564c04d56c5af802a1052bda54d3546364f9aa
+a37547519a5ce60d249950746a0fe7db16a4fceb2ebaf93e0d9885f182488d52969e13960e55696b0f6dafcaa3f5a35c
+8c48b22f59110f4b2ccb2d3f5f5e77bcbf5067fccc194b5ed6cb83f8fc7326b01d6b62ef2283889d542818f6a744fca9
+ac531de47ee70c346c1bee7a25ef9d075fad69e2b0f2488c5088c62ca4a13286b9324ab1951db0d49cc3dd0a4c43ce1d
+ab2b51282eb8697eaa70d6f13e6872481b88ec2a60a042ea03a9e807cc9dd198fe75261b1e7d1694f667ee355fd300f2
+af9c1c93544bfcdac5ad547403515e68f6a976c739620d31cdd641a2ab188f1f638f83864a7bf8eecc4e1c817880fa46
+aeb84265097d015048d765258494bfb5cfb4079f86212810256614b46e41dc5e4f00b0e656c973222e42515e4d741fe0
+abc53294a22b8f0624a8a7c09d1d60779a8591a40184379d94276e8d9726d2275a7dda54aa11afa1602380414074e18d
+b5262451f7c0178449c669bb1aab6ab9b8e0da1ecdd353265b2975a01e1f2e4fffcc78fbc25815d070077e7f1c1e79ab
+afcef28d2751a083e4cafac04945792a32b53c54fc450a7e5b73671df8494953d3663f312737621ca3a5fb9b7a2422fc
+b4523991e849fa91274595a531f2a59cab43f62d38feb65da02aa6519ddd1758e5e292554bbfeaa13706b5c5c2f18191
+afe60f5388fc69a3c35270c0619d2d9c935c6e7bab91b05b56d702dacc672049fd9499a553ca4854fc63ca954ec51f6d
+b4ffc8820766ab25ec8e7de7edb7e3424ac82fd456ff18ea3a7bd2538c73e2087034368914875bad08373ed60be63a24
+8ca97af6e2a9ca415ad3397a88f92f4eed39280da2dfd09e040c163ae105ef2b2b2e6fda89c6859d183ad6089f758975
+b62bb47d0113c0e5c2f0138173d2b1a39b845dd827f21ed30ff4d75721b489782c5723857bc4258e111761b60ee1103d
+998e43472722d8b34e6a1ab963fffb9922f3a73c08b616186b8535a306c8ead0f90f9a1f400a6c954a389885e36b6105
+b5e78e5fca280ce9c0d0a76109119a271e800574bccd8bc0d66a621fb013a6f9178372f90f215b001b880d37afb8741d
+8f1b7dbd91996bd833107dba6c8d8b4d4067d1b1c15b941a5c8918659b50b4a0797f638528ea92a8506ac8e2f21a26be
+9968d2111b7017f098ab03505a517163a960ec792d7a41f5f40e617512d9f597250ed13d609793748be1c4f74e779621
+866ee7cf2ca9c66d765ce0c8b4cf45b94f6e7949a8542dea202a61ae71dc59a5b65e5eb2cd4290ca732e7cf009fd9b24
+953e72b9befb4b3eab3cfa3c5147aad2a28b32c51f261435f8481b95721eaa6527ab4ff7fc46fcfe228551b82f1d0867
+ad91d7b4b6def42c17b28fdf7afed6fe0fabf160fa6294f63389024ca9303f249fd6230917b86d5346028e8c139d6481
+b38ee62228b06b416c49fd527e25ec051f38a5df50f0bc1747dde107ee289c33d7c9fd20dbf629f72a86d859c488b0b5
+8a5af101ad8c3d0a0f43130a23e4b3c2825bc90f27d524c424d5575c4cd5b1536c14c4f0fef03093b0c0b47b4eaec312
+87effe6fbfe38cb8f08defe220fbc31951b5cc18d38ede1c545dc20c5bf8025e82eacbba71890e0f811e60e10dfdb36e
+b3bd26dd1c411676ca8d015a30a69593f5831cf52442062c3161e6c7343f4dc9d7fad8013cc4e41b613bbd4630b190f2
+9210c6a0c594775bf27d322f732663d63a0ed763c4fbb22df2309deb8c45ce12c2a34ff88b462a425368bd8ee13b2c30
+921cffdb2054e84a059fca5b36611a79a9a467fe2f3477a4b3184fc5d027b44a09dabb1c1729726dd6423e14f8e1130d
+b5b31caa4ea31b1d410bf7acc371aabd69a6f2fa31adcc6dce0a5e6491ba28a7e7303e058cf05dd80a4116a35c77c7c8
+afe1be264eceda023fbd780acd936853097b9f337fd3500086f71773ee0055bd2818207fbf5415eef33f18f387f557e9
+a2cd2a9bebcc3bea8516c68ae6d6539b5b3c4626b18a43a089ad88fcee8dc36eef35f30412daa6539e9da877dd947d76
+a8f53e2ca8b5f01d99c6cbd27e772713dc63dc509a1f786a1d7be295becb14560ede28a7d11341432a49e8f93088538f
+a4f486dea12b6c6d31c4a6345227bdc3066399cb9d0de5e0147bde1bcb5a8f8508301b8fab60f80316a52adac4db81fc
+a8e1b70bed423c1ec3f61f3371e273b1fe40a31ae3583b5f419ba8bb78f3704f8c4e69c249a3456abf74ded08993c84a
+b4f799b7767e71f4543109993457525a7d59b501080beae27b849d8552d9524cb5e58fa6fed7137495dae02789c29fcc
+b41d8ea06c3d11fa9103016e350ffdcf3d841c7da52a69646eeb798e01055795821b7ec98e86eced3b1e461db7f320b5
+b6b8d7090eda974164ecdbf9a5ceff6c45bd08e485644a5db46aaefa440f44eb7a5f2a3250570dc30e9b91ee3a57df5e
+b4da6623bfb4f65175c75d6ade848d4865b9ddee2084dc504cd1dc6113a976fe71da3c3bb938a1dffe91e950e3ab16fc
+85130d000e123a2e05b0a01f33e5e455cfe06141ea5e01e2a859bdf9647d8a61ea40429ba0436da4d6377fd75bfce761
+b3f91c6694a2e120fbe952f864c414617cb78c37045a919d35fd9cd2d0a7d6a655c0c76c4c35d2d59c2dbc36042ccf27
+b620c2d9ab94461a236fe4acb77c4ded3fc6258f8b3b72501a5fe8c1f8d5a09dc140dbab27d6954782917429be4f1ae8
+b36e44a93567073546568b399b471707924a71a918098129151eab1aedb5d3e3cda771443a9f17737caa29d39a415e34
+92f65794f7bbfc8149e8251c9b4be8efd81057b1d70a2f2d223e15bf2822b462d7445fc74b45157deb079d1994df23dc
+aa022e8ab8fbd6a6eec929b0462980d3f4a305084d1fe8a42e3e7b2124594521504fcd20043b7f078873c15dbcf15568
+b1af8e2492f72ea1aaa9b565110c60832d11ec8cac343f8998c04365259d54a72e1e191a9bcee25435e1c6077ff6c4e7
+b557adc4566fb9458715c02fcf126d4f6fe442eb1c5d1821ba2d7aef933250a241735a47de11148e52c45c229fdbaa20
+9112b026feac67581b4727ef78bcfa2caf2ad1a116dc3921a1a8249c397739c6701198461099e625b12dd55e20407f3b
+a3226cee104bbdce8e8d0b37fb7512a357cea6377a17126c89aa3ce3c29c8eb414762957d5a819cdce3137f84e7f06b8
+936ad86b123c1e277feb52d1084525269380a8c7ca4276cf1daffd2dcdf0870670376900e58a1e2ab361e2a8c80897f3
+94398a4244cf86153312ffeb888b5b8c73f0da07571e92364e02e015ff47da21a11f0fb390cf8b57542d3f62cef93a94
+a0d9b5748940bcc69d39a60a6f383903333687db85cca0ad291ef9d36b4d05d3f3fb3e126dd48e0e8aaccce0a60f2436
+a5ed10114c2c1102a9b5e1305ed4897c147c291f2175936448961495114129bf52cd30c54c7a7afe7e45af8abd9524f1
+800f57202c8960649c95e153326dc7dd1b6f8a332cbad9c8ab7ea6b69ab5d305ff92ad27c2b6d15c96d89541a814852f
+811b5a4d0f3388ed907810c70e42524e31ab14a209255af7cc2d47ec64ea076127470526a8478482edf2dcd60db28833
+b5ea43a78f4d7b0d05da9f7ace8bbf65386803565fe63c61e1a1934431716c431ecba66a0b4f4bb1b3a1e499187a0930
+89cd76d5d6e6cd77ebda0bd68b5deac567e437ea6249129e9799a9a02d62424dd5e04d98c7c7ac468f12d6e11af9a3fe
+8607c76db5fa7a2b058e40b5417ef1bf42c671d074cbe36578a8bb4b4c0ef69e5c2082f56b452586236762efb19cc8c4
+82009127f00d1d66e527b320fdba6c0895e0db84e14726d9f78ad4e00e3ba05d800d996737b6f5100f36ec5e0ed016a4
+a5f79381ce1f55085bc102a67e7cc4a27fb632e8a83b6e3e9d515d8dd2c23f5a4f2b79b6921aca19e89fc402d3c0b8c8
+af76109cf5d10384ddf9d9c18e74fd2a27cab4d4f749656e973275a3b7de712ad6929bf1ee4524bf9583e9b47fce454c
+992d1c3e15106d70feb0f557c14eed3bc9fe1a1616a1709421769e516d318229ffcf093e2d3974d95095966fe960a793
+8dd3e845b5432c567549fcd7afc569fb855fb85b83cd263369837fe8e12faced5b6f6aa95a490145dab1d96ce0ae95c2
+aa3d65abeb588b48e470564593e3b7879aabc3ce4bf36158758e73cede5d98e6cb365d661542e621c1646245192f31ac
+960b08358315841774f957f5b2b4b063a2d1629479054cc9a976a865efd4c6c7a72590321360a9c330512491801c2f65
+927efc6ca88f1c1e013039ceb968667e3fb381540c83435966341d3acbd77260aeb124e28f3fdc86f9c778f7f203925a
+b1ff1ae028d5de9b86f329d4795f9a41e7617813dc4aafed19277f8662c59228483ce3b2841ee48cb136b83776af4f59
+97e2deb04777b2b0cf107f09ae829b11262ae7f7997b672fb2fbf301dfdf233afc87d13cd3600db1ab4616c337e85c49
+96243826579e2edf6abbb579151e4dda81ab5ad8e56c29a69ba280c5f0a0071be571c2b9f1faf3ca189688efc2e20e78
+a8a82bd2c8bdddfc9ebe552866c704a1358c8524fcbb2af824857898e1816ee4b28c59a16a90cbafaf06369ac8cda2cc
+a49d81e2dc3fd2d41ee97dce14456825e5e5b55ec9d01447f0217c18d71dfa7fa3f3a7451fba91515636aa873fb67768
+b1aa85b302c0f1bb6be97affe6ce393fda7935cbe76b08bf632b891d11653f30c7da3eed2555d0fa2b068170275e1c10
+a9ca4ad1c30a5b9221a217b5a0dd155e601b1f479ebbd407d28803d373890247fe9c799c01adcf6b33948c4397e81e57
+87f101a43a228ccee4f2bf74f011edeea0d257bb270082191446c63a565654890386e593c3f73cb92716145a1dee6018
+b188017117ea3e5ba6ba559cc3ef45eeae577e068f21572bf0f6b4325584a458e51cd496650f1489e791b66f78fd0955
+8967a2bdbfb7eed1cc3a2671562cb4dace6286fd694c8347446faf537b5859dd8c5748de91e14231bb21abf56e7eff17
+adbb09ad50804762c79c3afe7c14c347249b564b29c9455cf97ec9a5d6a9dd758c9a9340588da23f7aa23848896be036
+87f970be41e5c523eb3176a97fc9dbce11c8dfdedf3e8497103f7db365ecdae3b463a874c7ee82e45bac6f3a09851ee8
+89d599bf75dc4ca47f7cfd28562fc9d8f4c16a9e479586db74c85c1008c656ff047cef1a39f0649adfd0337e3c0bf43d
+96bb53bddd7fe190da498fab9600e2825018463671eee0fd14360270223410f7adb1065e23f7b9453ea8ed97c1356db4
+a05be60c5188b922708139bd11d0e0bb65a6b2219280778efe2db6af22e949c0ab1d77df2d54eb487816e52b1c717d24
+aeaeb5ec9e425abc405a23e68004cc1777ef0ab94f34822c1d2aefc92831e5c14d649a8e01336ebe9fac670e38e8f68a
+a4507eddb52238dd8eefbb1c8479b3fd648859c9d44371f8d605149502d7e60fa2f3a2a1675e68639788ae1fa39ddb7d
+a1d39bbca54f0a5c6895b6d122bc4f68ee1d29e2064f91778112d3c4eeb895a4cbb0a2031cb7a468eeeadc7179accc91
+86d7f4e68e02a6f8d0d88e39e2333c876992592fcac7732654dd362bd5602efc8a0f70bd3454f43f4fcbee3378ee5b5a
+995dab276322f3055312e38acf3ae9897d9c179e98502639844c4ec99718543b9ac8ebb2c66d1c9283250c7033402d44
+b89f131422223d3c9b479164b96d27876d41323b6046d07c0533508ca5f0b0797751a6d37fcdf1e0a8e3d864dd714c8d
+a37cc6c9565d5eccc4352776a1e8183bfac56dfabd018b0630caaaa916584bf627cbf48c7b313b8d05209541c1abb44c
+a3bf3ce979464f402a0cbf8badf0d3866b8733af548eb92bb0aaf2055b32f439bfafd98e89491b688039314878240353
+916248d2b354028914886ea6fa8760ba8bd8fe2188b069e8e49959b122509ca85243b97305b3282c3ba5bcdd4c7a6bdd
+94c1609958002a5fce80bf55d825e92ad2cf486e5d4d0b8bf72ced15488fe83083a94d91f612ecda3a80c9883715a23a
+87f35fdd96b1f0531c89732e932aba166acc76221fe68aa1bb6189658b4e23383445a22078c4c36a8ae0adbc3efb5647
+8ff148f1d6dfd1badde791c32f6cf01112d8c666fed1778f7933ef319f553f204cc2261815814b38986509488f80df9c
+8ffb29dd648cd8c9d502691723e5267aabc390e7e7e9d112916fdadb571221f68d4036796a7e3a4ddfa6325066636fd7
+837f1a9d723bec4013bf005f49e3c0874aedb290a3762eb2215211c22d73545343ac0936a2d29e2a2422af62df7160e6
+89e6fc7c04b98c83a93013d8545a14139a56f478bcec83f5acec71970110bc8a0b6435c48f6e499213dfdfee84a7730b
+af9713d86a4bceea0e6563846de6f7a6050d1a48f14d068d8393b730a496e19249632c6f9e9b6fe6de5ef968aa3f502e
+980ea7adb8d80d2ae48d66f5682bb9c5e6ed246e63662eec9215f965e7f1f0bdfb6adebba78d2c17df8276f036c2df2f
+8e09794012712823a4effc243437786120d7eb3a42cd771e9dc5d7b713c830b777b8e1ebdd8c48efecf9c63e9af36085
+a5c90dd9cb1887065de156de7dd24f0a0215642646448c802cdb19b57713ba7eeb11174bf282cb626e000e5540893b54
+88acb1b813bc064b11f37f19e5f87dbcf8e270c7559867e993fca4b4aa10a395b3a473285439f151323de4cc5bdce948
+a6d030925c95b0ff75a948e1d1f3a6d414ebe4185d3e5a163d41865e7dd23ac3e14c791ebfc0722b55eb693270539042
+a500f2cc00e5a5c894b6ff4f2115cabff056be9c3075f06706a892d69fbe25bd25cad71c302ab8f237168e12e5cf69f4
+95a61840aae356efc98a9a1356e9e5922182348cdd5a0938505005bdd1d15ae6c047269064400ac0ae0aa67318497599
+a3a7fc9fb312a32f04df9fd8f3e1d6bb2a50efcc0f5b3ec3348756669b2a05582a6dc16360f776cd1e12ed41a5313f51
+88bab74790c699950f4facb5b1ff4b0e1e61e38d23d7956b6a8aa88cfb423bf5cb35a36aab66d0384e89bdd3e3daf654
+abd02136026e4b1d167b45afa830f435efb2619d22e00f015208e156991c74c0d14c06d1994a3032dbe114e06370cc72
+81620a6316b14c80d521e06a9f0e7971f1454081de20ea24888653b75f3c0bfd5aab8b58d7ba7a6141be9eb03bd7c1ca
+8baab042d5a0522f704a5b3c362ca939b06820db8e35026c890eeeceb00dc607b088dbcc54f8c7c89b04f0703c48639d
+b5493244928669273037c380a280e85e8e793d3f2d21d05e4471bd0307fd5077907f090926b88b2ee57c9c0cf217d181
+869932aa4d1307c910822c2da57376e64fadee2180696bcc45121056d63576b8a47c87f3859dc4cce29fab14f5bfc581
+a478015851be15bcbcbb735ccbf1bc05c482e5451f42898782e69a300c324180859d325cf340ee050aa19a25c0a46e6f
+8df19bb1ea55ba4e0a26fac6b25844828d30550dab3cf869856ebebb7f045a79201b63ce0a6518884fd70541263fac14
+9438d13c62e5b9127d7074f0ab9266148b358183958d53402b8c35b8fb0191e978ff62ab3b88d50a64ee6e38a6033576
+81e9dcbeca58d8226fcdd27418df047b640fcf53bf13bc34b7bd47fb749eba5d7c5c3eb249b345f1a253b45b188b4a36
+801583f8707218ead0c4e215051c3ff0e0323a712dae13c0dba0e3e82a8dc7a69dc016bae9e31eb4cdd5ddbe47711e4c
+9083e8c0508088fbf963bbabe7cb5ee4cd13c9513c8d15bb58f732aacef2d480441025c8c9ddd07540533dfd839414b2
+a183b8000ba2e20cc00d7e1f5b004a8b191ca41b0d21bfbfbb61d8c0a37925f6495132f5f9b240c411d6f40856497243
+84b5eccb5375180c56551d262875f7694033f6f1e1da98ea6e54ba75d5852360ceeff9e04c92b74b176c15f0255b8459
+a38bf79e3363c3e261d487f4c707d346d4e72da048dcaf750eefc846bfbe3f832780b9197c521c5f633fb434fe762b5c
+a24c9a171757f95a7c87fd30f5dae6e37eb18a0e11285590531cc911d158ee1f6863fe655fdd4a7be8d3e41ef3b7edf7
+96c5726534bd2e9f0e56704829fd684d2cbc1bd188407f88337eb1a3280b97e917d7b1ecda34a7fa64203351922f42a0
+873f2b6006bbd86dc17b4a9cec6dfff10c820824bc4c10e5d8b85c48531384cafb7d3ebf8e77557ee6706edff6e52484
+ae3a5440eb7849cc104f8ce22a55d4eeaa59b242c9088401b3ffe675921b4092e19db3cb4fcb1a5d79596ed66caeb832
+b9f21a31f2870ee0590c080efba434a76e55b03cd5e3ab280a2a87061a38093603a84b5da676359c5e9654613059160a
+8b58019e7b17cc02af600b4ee426158b8775f7a1922a1e216c5ec96dec57e7456443f3de84e7d035dcfce36973924106
+927fc1fec68c503918b860cdd8d33cbde51836209726f7ee79d58aaad8b9bfd81cd0020e96e7da36d5e72928525ee887
+841f179bf2297aba7b59354c8db4a64b1714806f3f33175df8cc69273d349932d58d86d742b4538a9ef83227fa86eb5a
+8390e88458b61efc64494cd01cb9b278b1263cc8f69847f1c20e117fed45f8fd548680bae1df8bfc3b43ab52e0d8afa4
+9867dc5030f9d1265bb1a5c6bd4a192fa9b41e8bbb6f1468f54e7337029c809dc8947ee3990e8fcc54f32f8bb8e89780
+a97999c8994a202f9eac7602faf63047310e103628bbfacb20be74739cd09e49ec26205bedc550d41e8487079065c56c
+aaee1ddaf788f80b93703e7ff19428cd80b83574d0a423013fe5217b137968355d4b24830f0f22e474f4464da541dba2
+97090cf4be99ae50baf1471035ad5f027a80889f89ad2af4e33ef23c6a789c179daa34f802c1b8ffc4c2a5dbdeadca0a
+ad0a19986b97ab377c9f9c05eac0fa335277f07a79aa6d26d0638c26b37e6a319041c8b90a13a9af83e26bba87679412
+945f6d0148dd09cfd839ff0933da07c9797e718c9303d3e37cd6b74671c92c555588928cb33e04f01eec781a35a19874
+b3788894f44f7e54eef966c11c7225d95f97ab3700f202beb6895500587cdb28dbfade3ec3c9694398b8042b16c867a9
+aebfd343848ae92f6782bca7bfef5d25d748012bbf199b2f54cbf655c1644dcd8cfebe824ae175f12acac8e7d9789343
+95bdbc98a3a912ca055d799e288c5c786dc0da4fbe0cbc6dc57a609af777c78fab1c7b1e4272bb2899f87b3e494a92c0
+99f9935e2515780999e2cbd85bb8ebe4bf09e99c1952c2843a4cf073dcda39b673f19b35b76885cfa5a2ea4ad13a5ad8
+b8b622c30b16157341b19cd2cbd762ecfe4d530aae4738406ac3c7670b566606796b075d1afcb236fab2323c850c9343
+b8bc4394c0351645fefd3f5854217bc30247f9079a0290d31831a1c44759e367b231bce707a9cf1d7f105cc56bceb6d8
+95548b61bc1dc7de0561fd4aac3c035c9aefb2d6a14f8241af92aa5b77a51f1654f2e1596299b4d86014c80ee82003a1
+b1f898a9e9be8874e4b71a6fd5f39c3b4998f03cfe15275c14eab2afa6049eb6e606acdd6b25dc87b74dcbb2d0da6e14
+aeacf5cec4447067d4b3697d9d3351ebd75d364d95aa92f28df560e1ff5ac8cef957029d950899ccaf53e514d605d148
+a97120dd147fc3357f6668107fa740b2bcb1241bec2f8a6e6777273cffdcf59c5e16aac952d894d95976844e51e6f04c
+8737de60bdcb31c2d2f024c1f39b3fc780a366b62b85b416d51593511d8eb7198f2746529a58b63e22e85720e74aee30
+adde4aa20cab0d548fe86223e5fa3bf0da7d8ec33dd1d76c86619c7788c3812e1337c76ae28cb6166bf5c761aa746fd3
+955713a9bb719f8f4b2f33d73bc8efac08eb2624de91faa5c6e36a765367830744471c34cc2962831a395916bbf349c7
+b2eca76ca5124f7b2328c2ce3acb87a07aa90215bbc9c481702cd785cf695b7901c27ea407db8d3a027ea2cecc96ac93
+9012c21b867a809630952fad4afcfacb8c4e20298b19a7c1cd060002025b38f9d34ea97475f761e3f9f59d3f7e12b927
+83d4f757b7cc01226f1bad2b404ad2315e0290aaa732225853677fdaad2baeef6acc64e1c8663a7803031f50302d4c16
+aced79069c89b201776926d1ef4c4fc822336faef9d5fae13e1dc935321b4c0648943cc8989871b906f387c46fea59c3
+911c240ea7e03df08465a5b5f4ff76878acadc38febde08bbbe031e5fea0a6f66a16ccb6ba2a26551aeb491bb17a90f5
+b9ef1fd0cefd5fc034539fc59c84b8bdf8cb2299f565124c883750426109e99a150cd2ca7681c074d6b55b9730606f77
+8031193d50402cc84152a3b05e361c66ab389e091f653d8b76f164881b36fb31813d3b011f5d5181abe8626fbe3c2204
+b9929c18c80a3438d03d36005446790814e1d8109a07c62fe3ce8d4226ff3872186589f0164e039b50dcfc80f2c7d85a
+a340caadc7f41cd535b4a2e0fdfe4d82a4cbb3a71399147c81e664eb0de11409347a4ceb48be3fe5aaf7ae516f336257
+8b5cc166400840c0c16471fec23f7c7ca541568ab7755d4165810aae56d10d08742b6acc82009db1d0625b1d7c872f1a
+b3ee860ed90a93db011d3b3736fbdc33485cdf341c72ce7d6efc44dc3ff1af9d2d8d8c915fc9bfa5bce035ff28bbf78e
+93d9608f7043d6c50c912cb94c54c11605b2f0bfe73e3b7144c68ce3041e5cafdc4c4be384df921a8ee240726321cf45
+97b658a607029fc0bcb25eaec3ff9d895269df869e35aae003ad4f7844b711b46479ee849124acc88a85c8a10d6c613b
+912d1b2f1fed1f57f64c7ae2e6d6a20b073ad2513f81d2610b98a76ba9ff86d9ac54dfc710a000d4f3cb014a03c1fa27
+9306587b7b2df4d2f9562c918ff2d98e9b68917847c51427b62392eab60dbc91697f224bc0548c56195c7a446742d702
+a86e55ec5bd24d68997f39187f75f75d00b2a289a856b9013282af945e424608ca7ec78227039cf11fa87ab9ab740d5a
+9782e3af956e640f62f12ec3af390d8a7f40d170d5e171eee3f2cd5d04e8711728fc3d5e18c813a83d608b4d3da4c18b
+ad44365a38ace92680fe0f54fcf901fa4fdd8f229eb9176dc1182e634720bcaa6de452fe2a31d7a4aeac5af7890c296a
+8ab5ccc21ffe87c3dc111a19e7ca54d9a09ab86316dbbfa50476c1fecfb707d119c245dffce2d0cdf1ac8b07d25c0f89
+8cd763b0173382e149a357569e32686a93cd39a872fff633e48f8eb45d0c5b05a3d73ab30892110249439ded8fbcfbf8
+a75c40aac57ba9bd816f6c1511d5a5236d876285e0ea1b3f36e57824b2d114150d8036cef7aa8eae26072b9802825e5b
+a49362fbf29438f6bcd3cd9ab6de5dda15a8b911d5a82d9d42806a0b9107b22dab5576dea8b731f407e995815ca90ae0
+a94a534b672181a8fcb688165666a55e42690046771b134ff7c68fddcaf61816f08225726198c4a252f94d52b38203b6
+a817438bcba5313d578bded71d91d916cca778a1d668b3dd1a58c662f8e7cac2fb4f5fc6123b4ac9f29755b77ed42385
+84b6d4d3feaa298fca23593b33c407174511377862d182a6a67967ba30333359cc16af2e96ac89f20df1fec8284f00cc
+97cb96c771be01dcb99c41f3fd847ac84bf37fcc16f22efc7767c5d2f60a7eea91f4aeb8422fc74a97358b5c3c05c789
+83a820968ae2adc5ce435233e81791f401ab4daa19f69f600d203eb7480787f7add771ed7f414be5b8e9a5c53b477e1d
+8ea8a8055b58ed95bb242444c7d736410225d5842a76f9db69722f98c48366e511e4001626f8ac7695dac1068c3ceb70
+8c9bcb062d9395c8834a99ce0620a7aec7e78c7fedee91ad2a1dc28308b12f34c4ca2255e453048261518f021c534aa9
+b9f39f3996b7c593a0c4fc64c319082466e6f3ca17cbee1276fe10d2eb62fbb6ad17f7d86ff92609c83ce96e260d5ae5
+b39f10e2a249243534da2a0a424f2e345e6092690bcb39aa2c5867cd8a86e70563b3d5c537a79ff0365b1326147f015d
+854f94bc11ec5c09eb3e51cec1a4e2da0be6af9679287ace99de0183a4523eb69aea00058a1cab4a3576f89a5da7cbdd
+92c53a9e985362be27923449e797fdf0fa36f925fa4e24bafc1506cda48258887f693dd4fffb48c03cf0501f08f493d7
+b9ed043637fbf1ef9fe1bebd14b38b37a78a4acce4ec829ba5ec15fef444a10c5c7d37cc8f14248545cb413bc654227d
+b2f50ea51925529ffb4e247e1373d4d325da79df8cbba8a0efd0b9e36d98f59db624f4162c9ea67c78c46b155f41f582
+896d49825c7972c22bf4685700abaa2daabcd4c15867e0554a643823ca84dd825ae9c08bcbe51dbe94a25e5f7b7f148b
+98a3e529e4b3849f20cc8af79e6bf3f85e862d4597bfea69c3286bf5c6372ab4b60938e194371eb7b91e0efd60b47e2a
+aa821aee646edf6f004b5ce6a07f14541691dfd709d8dbf9f4b70a358b887f00aa17d781b9358a8e4c950c2bd6f978f7
+a12033fe8e65452889684632cebbfd8254711fd5abb5d9d3115a7fa944000490061f8452da7d1e05e81d69c73db1e812
+ae3a93f6f7a672b663515e93ad7ec14d074c33de9238ae7ad4442c44d8585c5b36e34ea287d6bb9621b7b50fc169aa00
+a182c7004a82c7238e0c4bbc2a1d2162b9bad932747ec26bc09a3996930595db5864b174560b89f2558290fae51fd159
+855d38e9fba71089e6983c22e6eadc3049884ef2edc3d75cbab7b79a910c274ca9530e759add2d1f9342c29e161438c4
+905cc403ad93bb385fdf8ca28896c4686a3d9a7f8b7693e90fbce68c7fe9bfd4283f4b9c1e54ee246143abc579fd20f6
+8e135db52a7ddb31daf59632f1b52041530b03d84cead9e69464c940ae3cea3f14946b78ee7a9b8ccd1a94d288c545b7
+b337b06f800560b99d138e9b580a48875139b1e499fb0b137e24a2892efe5941cd080a4c69ec7d483a0dceb7303e257f
+99a564658e3c2d897b59f555f3d6000a91991d04800a450cdbe8f4796ef76c26f77d1f2ba9e3b8e56dc707e70ad0d34f
+b8bbf9cda24020515d3bde3edd53ed741b60e68274acb62c2ccd911463408934725e2e1f902f9358eac23d3a74cd7525
+a35ae3a9878c3535f9f8c7394702cfe0c9b30eafca92d69d3a49a942840261759e4eeaf77c1761529adfcfd0aaf90eb4
+acc63b50eb5916ad5c26fe8c23800ed4d47e391b4f61b3159db04d3bb98921144bf8f2ea06e2d40f50aeae23b5924feb
+a843dcbcb97f1d2c250df59d3d35e3788b5649d9845da3048057182469a41a4e3835d3da3ea5ab215c88a39cdbad0f29
+a8b58413c71da3fb575bc80668325d42fbf7f0f7c8396bb142ec903f28a81b2453987e70ce3966f7583f3481947db6d4
+a7058cf788fb7e6352839e74806e4361bdd6cc351d542697e590224b74e1e9477ed24aec8b7660b9133b5e3072f1556a
+a09a634d9cd439c60cb9ceafb756ba74945b6bbb4e8dc9d49a4fd44ed1fb6ad53bb943f20175905bfb39a72ad72b511c
+b216cdfe8f043d84c9b4ab7048f278cb8ab5037c39a50249f6ab0343ec4bc606e4f464e814d16f814677376fae42432e
+a63fe5214485e79ac7f110c165908838abac708c47c568a900e1fb98f63082827c0f798802242fb75881293caf3c3293
+84067591f0aec8c588443a919b549599959efd8c9297672c50f5d8a95d93a31b91e044f53cfcec65449342a5d28a0761
+b9c8d6f4232929af2f7807bf89f959da437068499ba23c5af5a3f23ad4ab90a8969238bc557673678a4f05e53e0da712
+99024d488eed42eedee3db5ebeac63a6ae5765c775155e0f4deb930d311b9d4d96bfe26a3609ac180778f0c9b13f0081
+a0f83967d92b4ad4736732420fb0a1cedf7caff51542c912eb24906b67e156ca222e83bcd603d4e0ad7f9aefa203b2c3
+a2e39b80dfc5a149172262ffd8cb79d8b5dd6c953b2b1de03c72291e239f9b7aa3319e369ffa29ec5dbf6d44c14108b7
+a84622d73da4ab80abf2e9ce68012645ba5a299e164d71e2a8778a5ecd7b5ed92f2b612195095ac321c1e515d4018d60
+8e3e5a8538530c8ab13a1d7a1895cb3588eefedc3ff02fccf776170de3d5e0dead94588eb7d77aac03d7571e13c28480
+ae008dbd0ad4ef043ea129100e94357468b892e274e6f786a83edee52504377938e294dfbd3c45e755d15184fde03623
+ab941cfac2ba6d0040dc297bcab5f8b0c21b6e872b45f1d2c817d6288ed81ad3c8e9eaf15477efdb4b20ed5d5ba3c15d
+b066f588357faf04b45e9834f3186ae9493982ee0b82fc9ad853a3dc1509ed9a53e96da3cf396970348a4347ba56a686
+a1152f10212399ab38bb5cc0db3e633437787bb092faa97138afd713c7849d24a10d59a17baea39b8ab5a3dfa3abdee5
+b3b9b9381c6829d9ce09d4db06d234264cee3aff62df4028451599c83d88aecc0091141261f446cccb6f5e66b6b1c734
+ae2a336a95836b3a76e8205aa26737ca10d62fed665b0b64511a657320fa564549347d416b8adfc5630a3f7d3f51544e
+9308905cf44f2ff58860a9feadec52ff32604cb4525ce86c420b6d4b5b04adeef12b1992646ae299c05b9bb5e344a7ce
+a866f694d7c72cefb6fb28b91a42ce811e993ba027334d79e4eb52fead55d1c659851c059289d22a8dd3c698a6be27b7
+8e838ab58c94bae5ea60eb229edd4d88dfdb12fbd3be50d817cb912507e056423c30dd07c048b7c83c7dbae7e6aba5cc
+93b51cfb97605ae6b476b2cf08cd5266cc7e701ddd717816b63980ee81072bbf33f00ba4a0466ed2e11f5a5a50bfc003
+ac82f49c94b55ffded6e9df7d1e3032cdd5e0c163c534ec6a20b8f303c4b27cfb57ffe34fea6a0ddb3c1fe9c59b29e51
+9105a660cba4c41eff786bc546c2cd62c7d83a652f4f4733d3b8cf798ff3bd212b26a406f53f999d523f0da93e0df8f7
+86b25f109246050bad54406d233930a4c280cb2fd0215f3af03b382d680c940683aec1f18f83e9373297836f189c78ee
+97fabfcfc7f77864c80ffb36d379a1e4adc211b56d1c2fa71d87f4f28fc426363ba99260dbaefd6321da910422513e93
+b302bc1b17fa98531cfe8599eb2428128df0cf6bc548f5c4342002435154e303c83574940896335d857dd9bb11b699af
+afd1c76328602fcddfe2be35a2b00cd939a5d883f7b7afbac676683bc214fb157052db60b0574a6e28b4ad7c1cadc7ab
+b738c71bc8b4693a7c1ba92bd6db6ffc29f7cab84ba9db38ef5b3c117ee8ae529eed0c26809e9dd78ce34c4b4447c9ba
+86501a7d58bbff4ec59f37f21f060d453fdf688dde2713a7ceabdfd766d5435cf0b2ed9c3d01e8d752e231408e4bdaf5
+a7b42913242edc8e12e75de764ceccf548189c060ba55e487df108dc0da0ab96f4beb1638c1e292c1e0e7ea21a650fb4
+b467e5f6a11cff057965bd6aaecd4ae87548f71e8cd49cef07545e79a9136a7f95815d426b784451160d9e26355e0225
+ae70f550098bd408fe496c0fa76c263d29cb4ea3b027ce2747686ba7e179eeb1f8af1c5ab18b3863da5eb75533798a0c
+9336662e219ac87358bee22f3a27b48977c2c5883d416f7d479a165134aa13a77145d90721b42a0287e018fb933fe8dd
+979b45e3fe95c75b49b075e0fd2a7f1b3a3c7b742761f1252feba0ee946283f9e6e14f61eaaf67a79f4923b15bfa3e41
+b5eec26acc77f1fe0ee621578d7f72d526da2d09bdf493f17c653745c0002f729ed66ba6625ece7ec13bb566786431e9
+92bfaa50bb0abe7143a4efc9c821de8e450482bd5b7f8b5fd0f27d335010dd21933b29b36aec5ed0335c45b7065abbf7
+a45c66fbdd358241efeddf91e0c31b84aa274724125ae6d8be2a798bfc39962ee6a8ec2a5515463b5e28ea35abed4781
+a24707a9c44925ee749a069927e64c317629aa0b0f78bfcf05ceb447ae58beaa264c3f3eeff9dfa176c26171ffc3eebe
+84bf55ad211ee3cc13ea03856b4dc631c26801a75651155c1da26d88c5bac0af0d22e4fb17f8ee1af76aee37387dd8cd
+8683169f6bb9763b46bf49a57ddea217a8b6d96080150aa95f9ddaef756538097cb2afb88e4e97dbfd9d9998acb2f65b
+8c9373c8618c54828d98acd0f14777d1150a4af1b622101bfbcea1f9df5a4d20047a900f2c26ed60b6350f22232511d9
+860a5b8e2b98a4ffc709d6f4c9024ff4ce807c2c97e6fc05c45ba8fc8a62aff7c7831fc911491fa139790e3582ba9d12
+86d108c5c176c62042b02ba3e552de7759d14b424a31b86925d4fced4ac271e91009609fe50c46d9dbd1389ce77f9ad6
+b2ecd36e1c0c74acd095dd255b101691e564301c67f59cf693b7a2b32acca3107b986689d9e9333d53b87e52f0864a9f
+a6d49129239f4f32474c72ae84d3a80141596fb72df8ad5d2952fc5da403acbe53085b249d38bccae43a0c9bf25b4965
+8565a6f889c5c06fdfb0e2bdf788bf1df6033d0993af85bd0029ebf38eddd1c3fde6de100a967d24268e4c722c1451e0
+abfccde4ee9dc18f7181cbe04883ed774f96a3856324bd3b0672745bb2bf4fc4aa8299fd4dc5af11fb7478c3e1f0891d
+89ba832468dd3a8b62180c2f823f778d0b336cc8e8c0b11ba8964616e0798c65051e52a4644019b62736d987181f2cbb
+aedbedb7fa647f743d0c697314b840ec8ccf6428c92a7c5ee797727893a72015a3ebeb95274d031a7540990bb994eb5a
+b932b1315265f49ff4db15461a8ed9a521f3bcbe9fa0fe2595ab0319125f1763f8557c9711eac809081a044aa5b9f6ab
+868881db332e4c46027dd7cff82e59130392648b983a7ebb059726ea0ba951edc087c45c72efa3c0ecd791a2085bda36
+aa4d0de0cdeb70a4e452d9d369939906a0930d93fb20d6db8ae3b1bdc6d7d4726ef2c7c939591e101c5fe6e0cf8cc357
+a052a19bdd2707f6ba59ae728a144d79992ebcbdeae69a99a9f4ae00edbf1ba23fd2d30059b3ca9790766943ff74a346
+ad5b92862ed7eddf496318ae7943db51d654f6c7d9365283f6f3a3f3b5491f8d2e23e86f8079e5b944e4132c8c4a7a34
+b173f3a3e0d4845fb222477850534ce1a66e7fcc43680533cd3bf4c9a1a942e24dcfa22c54f032b3fff856cc02f09ec4
+93ec8e7b983a51b42dce1ab37da9d2863cf5aaddbb1b97cc0b33a33a51692ac9f26c6ba0794f868edbeddc8a03b21ebe
+a97e8c3704fad405750be1c89ba8bbabc4b8a9465c8dc55206aab0ada8e0cbbea2563c37043ed1169e1b792cb0b19b68
+a3e190d789f48e9244fa1dfd2ca0019c5f5ea66dc463cd683b24aac71cdf8114c3b520ceaf8a2f9df8be17a7a7bb7a93
+87366c90d06453142bd80a496901f4500168ea004d78570c4fee1d1fd4c8a9cbf8d6e15376a9abc038792893f5caeba2
+8362b37b12e89b75c6137ef809d33d3c0ccb3f61b8166aa10c209acb47535bc2638fe2d15bd34f5a6eb6e90c98247ff1
+8990f1ab6e3da208a07819754772fd6d679405fe72508a9df6ff416971c51b749262fccfdeccd9bce051823b0a399e9e
+83f2d23a2e6a82ce87add2a7ecec0dc6fbe6eacecdaec8f5273dab91f422f4b2a22d278f10a72fa679903e39828a6f18
+95340f5c35769af7ec7daf3c63ed8dc812117151f644aa221d132eaffcdf2a282ff294b9b70f59b0649f56d2276b7c3a
+a8a8525c41a039846c2dbe5f3ae67b21f88ea96b1bf2db8429631d1cd35d2ecac9aba567e78a82f002ae63d9654b211a
+a379e0904ccd44e7e8f00a895de5843c04190ed8f8321c69f8dfb1fd2a0c130721812bf627c43ac9fc8139f17d29d4b4
+954b29268d81560aeb1e6c5f9e40a556d525d53e64444870c79225affd7cfa9550d02b22233ea3155dfbe23320b61165
+861ef250357eed2322725ed3f0a54faa178af238505bd8297f478679c146c7e80d2fc4fd26f2ace8791cb1b9ac475540
+802963ba13bb958d6671dc628416fe495682f8977ec295a584264afa0c883fb510c098429be9a4bcad0749ab4a330e89
+a7d1e6637af0aabdbd6232a76e19322b0f475664f5546feb43ab79682b7cd9c2759607bd26515d446e35c8945ce4d1cb
+877f2e3442afbb07890aa79765fbb9834da9e01c0ca268ffed62b5557f226517aee34d36e5b96973e2f388dc14c57b47
+b08bec12a00e48bdeec12192169dd2275ae768025f1eadce58652f81a449de44d42a2eef12722a6f53f48d9641272219
+93c8cfa679373a9c181679d0a995d74beeb1ec5d8262fafb0a8d5bc7407c534df8209877434525574f28e3c65d265c19
+96601667870868dbf9eeaede138aa33886f6f4ecd457fcb108d9b1bd2a3ff92bbf2c916c8f80b479aff6d911cba1af82
+8b298b1d2ce662a265d9d666c6d70470bd619505fc37d955b58d55150646fe52c707ded2495ca00cb68a33c938940bd9
+b2c9bca6e5f2dec4c4dd1c71cd4ee0e45914a33c01f7d7c1bd5f4a5d837f90da6b6be4b4e3abc1cfda727ae046032aaa
+b11488471dfd7d842a78cac4c3b8edf8edd879188d20f3fda06b24f3ab450256c96b9e02c34fdb82b5180a7efeca81be
+b70d876171eeb9ecd5d86ec792a537a6632e0a052d6249bccc0faeca2988d9277c1de4785d56b4c1b3938c4d7f0b7454
+861699c27aeff5f83068593bbdcb43719ae236f1642f68f1ae6546f56ea18309f43b97c985e1a85a8108ef5796e36b6d
+aba7eea67b9fbed1383b38f81fae2edafb000253bce24b3e55bdf24bf9b3a1e4d3df7d1297438cabae737fd6ace23037
+b88dfece0f6cb12aecf6fc13f7aae8f734ca14bcef14546ae2c60ee22ab54ddf2dd261c1b66ea57a326d272af0735ed9
+8b55a43820c940ca862f6a56dd58612157f6a1ae498d4068044791f684e8ea37034a1237f64043226a30d9359ffbd978
+a426b5317c68c415eaeb28f74e408971e7e54b6801a6ab8370b2be81edf6154a04e3e708b9d72b8975cd27f6f781fc60
+827388f3e7e832415ecf52e17f17ebc75200d08599d7b10a1a7f2d596d4c107455727d9df5c26c42e23759e37927b715
+84c454d14543d1260bfcce81dcdededdec6ce1246707e91129ed8de78d04e4615d1706802322f4ff026fdfa7ef1f4b88
+836fd4f0e801ca2de2d83d3fe83370e75ef11345770d4b69cbac688384e8eeb0465a265aff1c1388c7a9ff2e8f1c8448
+8f39874099919f326be7b8d0dc84031c28eefdcda6c53ce1d0aa9d63d719e3447e18496dcf7e2b669dfc268b06a863d4
+b146f954a29061034f394dfb6649b019067453a306e664d65b3533906fe17dafee55b5745121b357330014c71b636742
+a32481dec0f77f6d6a03e0752ba1a56bc8427c7c5bcaccc58e606805d8ea2503045c97ac1675c5a2254b53aef49ae9bf
+b9a2b5b2c03436fb87d37245c9edf505af8ae0b88e7a5e8756f0e620a0e228fb01acd68d5b334d770c727d0b6c4fd172
+a9c33916f4e5b50807aeef1aa200c9c5c2844ea96397a10684f68e0e84b233bb40a3b6c326262d2ca0096f4a23586a05
+8caa5b91f1d407b868ae9b727ba4aa2705b5cfd0b465d880f139ae26899cc3d98de31875e2e78cb994f493d3e11afa40
+af9bdac94874844502c05ab64399f653ea6fbf2a40d410787e2b4feca681df3d02abfb930a952bc969c8aedc99baaeca
+99a96e0c0f7e25774cb47f29954ec5cdd98e6c24787b5272c8f0a6452663ec50ab1e768cc70fb560dd0868041c4eff18
+aec5645076eae4922fb2b938744358d559af37e3d6818deff7bdacab3b71216b8b9487195e5a641db2e68cfbc685f419
+b264b75a75e783ca885213346e3605670d096764888a70fb949a99ef5561afa41cd173bdb80af1fa9d6ee0c8b97f344b
+a46e606e947db3eb7e25c9c58ac90109b69043ef447509c26fd716a34858ed2e161120f762df4715b8050e4573e9b347
+96b173f6d3122763dc93d8d9bad0e952bbc0cba53d2c2aaf79daa3a2516cccd74f5d8045504df59d69cf9b37106cd37f
+a1f3822e9987ace4cf457f80346fe17287a43ff589cef90e2aae8b52e0bbc651f8824f56f964f1d6e397c53e0d69052a
+889303ee671a1deb51a7b56a736ea2b7f9d2eb7301951457217fa0fe0d4c4d79abd3c8075a614c4287bef35db63bfb23
+a5acebc9496cc462523a9d38c675b51eaa4bf555cfe1ffc57cf4b0b38d3bb1f101be1c67df5647e51a1d491a3dba139f
+a5c47813ac9fa5c0732c6030e6e86e2db48a32d97b12dd2ce8d92a1a26945557828b8b1e4de05277165af45da104ff77
+87f7131c63a8dcd0d74baef8ab91cc5bd3f6367a6b5cc1f80293d9808f91df173a360b92621b240f8b03fe91c3ffd239
+b483cbed238b8d2b11769e1fa5cbfc5ac8bf14d4ed87142ae0cdffc04984b47d9854cc291daacfdf21708dad5a152e14
+a654a05cf89a742eb1d0f21d592287deb274e23b241dfd48759dcbd4b035da96b921db6337d0696d09c2e9c7ea98fa38
+8c3d475a03a9bea864ac714bd31a3c7dbe5ecf2a94bbacb054fd262602b9cfe7b55316d7e0ad1f932f733448a0948f54
+97f7150932e0d9fac35a4949b8e9b5839a70519c0ac08419a08ba4e45c34228e8df00b64f156f36512cbcf928d86e2e4
+a2aaf6efe0a8c3f67deaffad1e4dc4142f327ba5be6395376c56952a074e2a8816d9d8f0191e1aac26b9dedbb194376c
+991b37e00e1375cfba4e46e1e0102b5edc900b159ff8a868a5e578527acdbe9df1b6aed996379bce624fb23f12082bba
+9829631c25ad10d03a13586d4509d4fa17f38c564ae49f97ca2ce57171bab650b95151c8eee063d995348948df87a83f
+97865cc65b30c8da34dc650af10756b7088ba3128381e024f405c84033587941380df91e1aba53aec4145a62afa05136
+a518a4db7013ff59a889956eb6392a63df5e6940f96292ce929cc42506c203f36906a7c46a1bf20ce425ad4e919df551
+9563f074897461613f4416d163255b3d40be15a76898cbda59d5fca1d18b175ad826f807c77b382bd75115ba7391978d
+855e16b9f9fad0e227ca85a56c268c77e2d1f07221829e584dabe9caa925439db8289c56a068a55bcc2f1febf5cb8f97
+a5b88cdc77fc4320865f5a58577d81ca4204c87fae0520d480fd8dc346ac87a6c306c643293866e62c359c454f9fa210
+9949f904e1d44559ca7eabf551112b0e5aaba897c25f2eead5514b6131f8acbb274bf49821a2cc230ef1359a7545fc09
+942f37fb1914dbecc43c588b414ecda4a10b6a7dc378ab5df9ddeb6b2453233dc6a26415fb53eaf10904167c16600a44
+a1540bbdf981c6071c7b0e6ac06e2641088fab0f8856ae847c80479373d526cf6d0ee9ce47390ab468e298d7f85b4321
+b600026df69e114237fd68a945c4e6974a34765faded99b1c72757ac15e86983ec42a504b796c8ec1f004535cd0fa8d5
+b62244d25116ba73ef1f177e198da10e94af2660bf616efd9cc02bda2503ad979efa1d53df28b55f4042571881feb431
+8cbcf56edbf8c76bdee89cc88bd55bcdea6f2c13c1cf1bf2c0c0a26792ca63b72043fbcd46a32fa1d7497d363885cf3b
+b4162b1601954df9256362dea851daf2a889efe83c57a2a6bd1e1b9022417bfd08431ab532296c5c320ab4eb299677b1
+a423113be8ddc50bfe92bc9d6bc76055af3024c2b320b909adce68327f9e5012b26d8672d3810191df800b99a1d6274e
+8fb97e0f377a64c793591d889cd2c9ab26e6b6fe3bd885390ad6884f86050a38f0d34e9249098f070474459137dc21e8
+8496332f7bc848aacc43f0c24eb761258a3bb5d67447098defadd788e84863226115fb43411484ee6c86d341f1adc3c8
+8033dd2e37663eaece28c0849a0e2284d4cdfc90d4f03ddceaedd5b86c770b1b5eb48751ffe3fe623793021a6334f2ed
+b36fadcfaf6a277df14a42e02a3107e68986db35da2166e3f492ed3d6db03c6018d92bb34ab5dc30643b2f165b4135b0
+aa72a29bad0fe78dec3523bf692956d07086e82c56796908733a7dbcc801a7cf949425909b611421da1b01c7c3233e1d
+a8f23bbd39ebb4ef3ff37a69ca114d412d0e82ea27bd9a2c0c8836f6b15d773e98d43158652cdfba74855f9bfc764dad
+ad5cf7c7c1a68b52cddf4e64cc5e41eecb90d7d191bf24f20ef5978b31be4ac0c1b9da7123cdfc760fc2b66a7c312f92
+a0bb840ee52ab624e1ba2bb5c8ee72625c62479b361531a3172a7b5cb8f53310cae9ed4c64d4728f40f3beeef4c51266
+82a81d048e8c19b7e7f42b4125527a9541f8e9c4995379c58a8968665d2b5356ed721f60877bf815ae247e6aba8ae573
+8c1d8b6f01c3d22ddf8c36f1f293846bb1819b9d81d02bfa146d0b8594e62b1e0f1b05f763b01515691de1b1bd2f184f
+aa74c1fae5f97b58b843d804ef1f4acd1267c65898390f2a45d72f8cbcb22cb3b1a8b885a424b104366a945c4372c303
+8673e0415f1b4db544cf1fc39adeef6df6819e890ffaa27122ba1bacbf2aad312f94a140bf4d5253c5e090736bae310f
+ada4292eb29e733cd4843b532fea78edb4804295772754ff3f20fc8435a53ddbb5a4088bd05de217ef651bf5058939ba
+9362eb2639f4812cdff09baf7917250e4779b1a14dd0d5bcba109f825ea3ba76b2611a84bc91e21ed8364351573bf473
+ac07bbc11a784e5da3f477d1f0512cf7a0ecc0d993f2e80f9259318e6894f5b14bf4aa61aa318fc0ca8c210956eab5c2
+b774dfa8cbf6a784434988549f72aafa15d51ef4dcbe5c69c14b468dead0248e75fe10510c236c8900e4d4a4cc4d4046
+aaa5201e045cd538bfaed5162ef37939b75d17adbebb096a1c2f2b63ac593b55093fef72fe455f8c527b78f5d373078c
+a8af4682859a30a3c4db527cadad2867118be32afbfddfb4178280747c5206cb4a827b3a2bb817f9397842a1d1637b18
+b1172065b24ee54b77afd5dec43980000db0ba8182d29933a7d5dfbca6fc9fcc0b34f950527cf0bbc077373ed1e3e668
+965f0095ef53d9c536724d12047cfabedb311f67588d6152b0724d07ef3275d6de87dc7d8e613de2fa28ea38162f0308
+b2fd003b7347774288575c65c217c497df97ba4a187fe35264d2ed1d39e35d862fc904a206dcb11c181c835ab7480200
+8c4d0588ff2ef693ecac5ae22a312d94f545686d00c9ca8a989155cf3360c46f390f3e8a6f521163508aa899027d9ab9
+85db932750cbbb7cf46f72c97afb04bcf6f648d471fd2b6ead9a692c93ee41250d12dd21af0dcd23c2ffb68ee0103016
+883cb8b1bbc38f7658aa3b0464d8b04c141f8fad442bae3af5675103f452862b9a01fc06c2c3c06e607756dbec8fe59d
+b1c645742675db17324a7454126760e99a7424c9a889627db4670b5a739a2d3046782ca54dfb44e1d741efe80774ff9e
+a6b5d4fe4ff92a050a5bccbea768c65c595d9cd8ac79045934245131b8375cb3baf14e306dfab158dc19826f1f46c174
+a355ca87ac37b82f934d52ab75ac6b8d23c38a9a9409697b6f0adfb959a64ddefd030444d7c96424762e347e6052bacd
+8118148e0f0682ac8ade23c1212c24fdc8b75b643dfb86c9f862c0983b14c22dc514f19ce940275700a0ee9a367a784c
+8953c4ce63d343efefe2c90184247ae9d3d04c8c8077e46cb481de1b244f80ed1d0505d613f027b40f2567dd78fb12e5
+b4218ee61312099e9f65c865a6e697fc6ececc11676fec8aef5b9799ebcb9a561899e073bc0dc22821165184bcf1567a
+96e53184516e849a92f9ad6fd9fb2a0b1dacb6027050d40e7052853f14f7f725784fcf68d8d66468249d176908aaab6f
+af0309854bd495639c7426059e5f2cc7f3c62b96684c507e913839989b353f4225162c251296f2de471c537f7263bb2c
+98d5b1c0135e475b5a4a13dd2424bcbeb3b0bbdd40be2818b4f95af28e95b43dd3561dc194974981afaa5e3ee9eb1768
+a65f3de843eff34dc413a6cc3dd740ef3a71902792a1934bfa328bc185a4e86e08a61858b6034546eed6ca8d1b36a3aa
+a8eab8bdffb2feddd4b9b7853cba152f57a54d7b0dbefedf0c581f620044bafd6318d7e6bb7d0692b8b51e44ce4bcda6
+aae01d858392cd53fe52c5cfb29274f4826a15c4a6d9b3fa1fe55f10581e559cadc5864b99ef1d9460c54a236887ca74
+8aaa676b466d9ad6f90eacb5c95c43b5d8a7c161777a16a5ad05db9b85d5395bd6a827ed38a9341deb1761986791929c
+b9a659cc348db89f5037d1adaf47b3d617a6ff812f66f87885dad841eb306d5f6609d65fb045a92751d99b82808640d2
+8a1b5276c08409672ad39a5d051ef70f34fde64cea77fb9c46124d78af67163ef219fed9e4caea228115c8e5d13b4d6f
+b46ad5c5c6de77b5edec17ed38ada6fb63ab7cd66be5b57a4e37a267b9259f3794ed7a9662a6ba3b3ea88c3cb5e6aff3
+a0f683f9fdafb04583e5c3cdaaef18c1756348e57d1868faeb7a091034993874d38a064c5d7ab7cf77efa182c7e53d03
+8f76435e23cbc8dc7f5a87fb5ccfeb872bfc0fa7c76c19838f2c5465b9b60944378a7af5b37ade81614efe9573ee7711
+add037cebcaa3c78a5e860b8971e6d4183e6c8dc76edb04e959dadacbcb2ce2de8b1c2307ba7835c2d6542764c2ea080
+a2eb0a2d054c159332d5a18ef543c1769e037ad5d9fbdff224a27d6fd82e80405a529b37ee21f8d3979bbc3b06fb6326
+a2baca90282fd708882fbb0668e8d8b8f83fa51787cd45f86704a9a1579e0b5ebf91c0f8af24c2b5d7b86fec7ddfc3b3
+b1d6fd2da2ae66ca4352f50684c909a34c9b99640f202ab36bb89bbd6539b579b7a04b48a3829c2430c5940ac021a39b
+b1541deb6ece54c26572f4a4494a5f474852ec3588820005406269e442fe9d6911240fd64bb2ec36e24c337351e568a3
+8e16aa6f9c49d3e9b273aa8cc29ecd01d68922681c35c82abeb5faeeb3fb0e9df89b473649e28c87b16ffcd694d2d510
+a2f06e7da40723cd9360e042eb36aaea98e1e7bc464d3f0693f091ff55e417ff6a5450c0135457db5ee31ccbedd4c09b
+a6edd0e2b9a06d0caa3afae6a0be76af246a192cf5f93c219b156aa5c175d9859b2a0ba6ab654a79227d283eb5cf6cf9
+ae6d0ae9a9d1b941f3a150deebdc6ffea11e9caaaaf5e5557d9e7f66ade224e67b028d41b646e9f6b57e7e92749189cc
+aba3b61b423b5a1b744540c5732b4d6c15b3a20650f983ece43264901e43b776cd35caa01e0ca1586e60648b8a2a6c10
+ad79fb54357484eea57ca4ec6b77a142e138662dcafa36dfb978ef328a723019092afa7fc8692434d84f28176b5ad969
+997c7ab0a7514ca2624864a1e152d2130adf235815a12eb0e006216c4fe1b984e02fee5bbe58355aa55998798ac5bf89
+a9d81f9192a62728ecaf45bd308261c2f008af1e2797e223250ae62cac4438632e3fdbe8fb15ea62ef8478b1704cec83
+9168127f09f30200e9187e13c0067fc2481e1af74df49d22b5de7b48b82a56d0f2c19bacfc9521ae0b1520cc3dfd3bf4
+801890010d3b3efdce0602f8fbab3658e4a088f90117b099e08eab19ab1aeb837e20cf93b78c06b4a6b223444fb6e216
+90a30e3d40c230c111251320be19a02e7d4888078dcf3f8869ca29d7be724d1a724f087639e134525cd7e0a81f139550
+ac303a6337d5b7af335d853ea52c13e608b0537bee5b818b7c9eb2d63742cc3c7fd2856d0b996b9a2e94805c7f87c114
+a11e4b6e5585a51a556132a5aeb565cf86b0d2b2c983d033efd653bbfe6472d2dea5a66a1c67acbdbaf1cfecd0de37b4
+946354743a96b65cf60c39fc5386b7ac026a1ed64ce30686965900a73cc594d0964588452ee5cec08ba079cd089d436c
+af645f7a4eccff64b4a38fc90a57524f37bb809f0df45eeb2b58e7b850673f341c7991904f48f3dede366f4d300e22ba
+83196522898abc5ec71a60078a2c1085e68ea744ca69baf69fd3f6db2704aec328cb97cc81c8a9171fb3aaf1f7b24178
+a53b710c8f1736fefe2ba041735fff78d20662978810489841406b6ae8923103f342cbe6db436f3598ddd2d8f591fd1d
+aed77e28baf473b462049b53fd19ea0a7f912a59cd52ee38e9ea55f07c263a4ff60c74be6c06d9a7ce56685c014dde63
+8994a271bb2801d57c7cf42ab1387e66412c64746bd1550dd5f2b7d9ba4c89397a5e645604cdb92ecddb7e78918e08eb
+98418d8b3b334672ff391840c370a3cf8cb8b0f0b62c94dd6086d20af5a130573ec696ee185688327c115890648c5414
+b7f0d8ce87216871e6422443831b846247cd5720ef12c04c8169a23ce22b596390677f6909a01b147a45e69bc54b0ac6
+990da5648177d20c26dc3d221811343719ee26b2b53552696768fa531914cfd3b5327b480657655cbaf83a8b23a7c017
+af6c82ac32c139e5b893f1c2872f47f51f286486aa48b80f0ccdc4a8c04d7605055af57f645fccf89b1e8ae047069855
+b6478e1bfa11d124ad200c32164655bd01270df97aad817d048c7ae751a161240ab9ef298ca281c9f5325ae76c166f0f
+80656ee167fa8d4b78e966a98728dc222877245fac085c4ac36d620106e6d9557ec1ddc4379214c1a33c4dbcde81a9a2
+b16842af2e0ce8f6902a9d7acdd0b47fd90fc1a9aca19521df0f566d47dd8a9d9e0bd8096976e2580ba49ee5c6313e89
+b389d5d3ecdd4dbef69fdc2fb04d896c63d821f826c52519143164126efa607832ef363306c366535c18a9f2381058af
+865ad1888cb52019627b885d6acb447c4a9bf3114c3cc50a74b55601abeec4d74db5dae73f8485ff2e84367f5fb30636
+97d1dc43963b02d511b5238b74db8ff83a9f18d6e027bdb91bd66d051bf82d801c28b3f76d5425f89cda2a73841fa9e1
+a6686f0701b6c34ed66edbe945518c01321a31e3c2cfb18fb985c84732930a73e9b6fd2f64e11ee77d2a805b70af6526
+8e6dd566aa4efcd154d5cf5c34aa001fd02094e45fd8403785c15d49636f25c296eae1dc547ff3078fd9d9265e50f770
+986d09ec01b649370b824f8f92e5f980100009af221465ed7c14b1dcc5fb0dbf5935d066800f827aba839597048c4ad5
+a2a640b38f8559bf84e17b8803d57798b1398f645636a7553aa5a0e0c1a6f46755b7e77077be4510de9ffc8b7bc8f275
+88549651874af0fc68da48ee222e88dddd764d709edba3f285db3cd03afb716d26f9135907cb642db3936f922e7268b9
+9037bc6da84fd59986eb0957d804aae030dcfa78998b2150a2c378647b8982d208dacf436a1d0c64edd766966b0e81b1
+96ce84ed7d68d8418038f363fd254fe1b965f4a334268fe45a7dcd1aa1a62972f64c0448684029e102c34fe9ec61cf44
+93ba99e10a41e77692403d0594d692ecf4217642de974eb5383d1429985b9bea6533d1485f0813ef4e7d1de32b8ffb9d
+98bdcd80556812cdbbdd8f7a69f6f1d7cffda6784015cbe14ab19dfa164ddd88cac55edf883f471053992c681dd4344a
+8347019bce5475b7f1059be4f01baa85814acaded272014df819d2cb37fa6e94b7869c53bb82d6992bc32ba6fa20c249
+a253ce221af89e5e24ba2dc3522116e10b7f54a10f829eb0ea121f9b2f8772e080a5205c70e64650ddbe08d2d6526e50
+af0d9fb9fbbb7cf8957cb2ac38d68ab21ee169b2d02d45b248ff2923b8a10aa0f4189b199aa0edae15d115f5cac5a82e
+b0788499e6f663ad1da549f9faac5c6fed2fb7a62133fa7b04248b5db8df90c1b2088998c60bb153e09b351692064069
+a516362a13e88566ef3a7031315968b58abf53cd75ac3848e810a9b3fae54ab35f014a12b4bdc281418bbaba482ba0cc
+a49c6372635fe1173b12c750df547780ce41f3cd87fdc8e7815b14e663e8532e9eae7d3353da2725e83108e4a75b49a4
+8465563a21256ab7140f08f24d853d3c46b52a42c3b396efaee7235e424a9eec92e36a088b7fa7237d710d6240b3d2a8
+b5e689aa5f9eb85d424324b120af75449d068e832fb0a2d4a0ded9babffe977b40aa42af5c3c08b0805281095ce0d85a
+b11fffbdb735c9fc8d5ebcba5bf300d1ebd2315b2ec77f76248a864eb4523c01c4c66827e6638253d9cec06f10e8804b
+a2af078a9c2a194dae54dcb427c4ba6dad6ee747d271f3b6cf7ad601d2d9d4df6d81b3d422e7a2c3cc6ae7ddb02f676e
+809196d33d7c1a6e0389e79df44e31f95d721942057ac42f5b3a8102aff5faf9337c38110f316554c80c6aa98dc55803
+878380fe7ade20dc6d9ec52aa5e50f0dfd34abfd091f0d9f5e0a291a128d12f9f68cff712570ac1c705e6b92e3af47e1
+a571663c17e5d175c80af7cab390bb4321c29f775350a32a210503bfed41c5dccadca6bbf0c12ca307d4519e0ec7e3e9
+86c82c693cb491093e5372efebb71b4d4208ee5873d78eb242e1e4fb19739d00e7c404ba4eea5f0d989e7e05085140d1
+adad7dff03f10fe3bb23402d89be0006894013790e9c1f70404c788ff4ac69040899883fde6da139f600a12a5f979d0c
+8e07a2fa09c14943d85b27902f9dd91e8f9e2b36a016219a42841e733df73ebc164760f018c727425638230f294b5d2b
+ac967a24b209ba09c68128228639ded0e64bda4f3ef55ebdb9823ec0538ef3b14185ab7fbd4237496bedff13be04b920
+98217ab6bfff5e6c1ba271e288d8c06ac745aa1ec8bdd27f0d309ab1741f2ca21b6a5cec099d7b5bf072203e27878f1c
+a0489b7bad0a4d4838c2eff854a583afc0b38aaa3cc11ff41979beb9b0d56068da6d720428b5f7871fea0429a693c902
+8440520add696bda61419dc889d654d14e96fa2a76b40a4025a834ff6e0c3091747f4458d07a09f633ce36953d17cfca
+9527537d0f5766441621221d8ceafeeabd6c3d2de7e6d9826d7f323b87fdb58ff7280639d64be43c664ac944c5d2ce73
+94164c9f13fe33550db673001e160354c13d501df38b3e275204745395e558378d6c040611067a9d2a998f6ba01a14aa
+849e51bf310c68200d918c842e222727a49bfde514bb3dfbd7d50b394b7b1b879ab0b263dc03b3067970fe1b1c6de946
+b9cf657519dbecd3fdebbde4274741fbae8ea9254836460bb31ab2b2f80e811d2da3db977ac06b37e16b70ffe977a065
+b6597e56705376ff70b3c569a07d329e8c24619e1a1e795c25e04ccd1ee8be4973cfe0e320728f74b90e991dcf99eb87
+8cb69427a5398cadfc6207e6e8c33fec480521e6e32f34d8448a85d013db52860643e805e735688dadeb0adf2c8146c8
+8c43413357c19ced287c67696925f1a158d4a2f97d97a0ca52e0e2ed423eabad837b2e7f245b6bf71207b8631a77e2fb
+b158821f160c068c587418e6dac53dde6bc342457dd9e34cee9655534185edc5e3f31f57e38f22e8a1faa57a0c662ab7
+95a055aad56db57097e1e911fe567bcc31594a1e431643c32bed2a6da5bc4df4435b2cb6a7cbaa71c5ac63fcf2a87847
+88a9ae312b7edf2ccb7a866dbd8d38951bae97a11258c59955335c0b14e9edcb2f4e69b379f5117f89d2acac5f4b6942
+90eb01e2550a27191a22eced09f999ecb110acdff34d01d928f96def344c944d712d3303f8694aad070fedb6603163ff
+a9a85ebdf9322ff818ad3f7f21687b2059a67b85f60b1152d10d848081d012891b9ea1ad6141a2ab7558c67e35661e95
+b25f6657ef674cd5150f7f49a10c29d61ce52fa5dd061aca7e4787434f71d3b89ca9326140180f7d9a7f61ad2c896c56
+933ff2baae013d166b7d702a970ed2736c3f564a8ce739059952173141992aa47c3ae470567240de585f8c5fa015b96a
+a3fc388feaa7dfc5e0010d50fee2a2490f5e7009c098e1f0370468d33e301fbdefcaad83a20cf7fc7a714c75c6537ca9
+b097462c549fefb8369f621a865f2bfc93d8ff70e63c82998b1caa661516e1140693c28f75e5189394371ab557d0c605
+8edd93016d1cfa27ad7ee8242800c8706beccf2bb7c949b0dca2f06c3b5c9c07279d85d3b0840cbfd5b757fb954b21a8
+b4d71375c9e127d9726c5e9b3ff8997223e023571cca32842505ddef567c6fa628c62cd23ec058bb98a1def7ac0d8805
+956317c00252a2a3e8ccc6c3e46b10dd51195de837fabea2523d4804ddba47480ac814e1afc0c0c8c8a386c3551d5799
+9750524692428b3ecaaf6cc64f7f9eb0b89fba94f5ca2e10224155bfd570de837526b2e653a70a967e0bf774b01adbca
+ac62f1c1e190522974592b0b1c6c38b527f71fc91c20f9257de2a991af4fb4a46e7db206698f3bdb0f368c186a8a82c9
+90de9bab35eeedc160183e83fc460ba80e3c97a4f21e8e707a002a6304973692401a37c041795eec3cf40be928e80939
+872a90e49b0c246fbc3c48687b250dd6e22057956fcdf72808bba99d4f175fe4bdeb5576ae7d1e18505a900927fe5c8a
+b9f95ea64cc4a81c52c545e80c2e6991db77e5202d829f2205ea596c9727aae55cc6551eec1e5f99443f8f8705aaebee
+a4f7eae6d374de3da210cce1244f959ee61a49d0a87a19841b5b527b4aafe1b0dbe8f919d6d36ed9db6fb2516df97c72
+ad84458121874036d5f69b69c72cbfdcb3ee5860ecd62442dda4503b024e817ff913b6e3564af7e2fe1e4e3568959cfc
+ac77fffb0a942ac32c5b16188b09dc51c7fe098cbc147219cbb72e6af0d913a59fdabff6a2b011b9c33522cddb37f689
+846e0e513beadc4c0b5b73b7efe5c5bddcccbbe399bd0a4513df6f37c56adfe227717c7fff91f9b6b4e26b3d26a06d37
+b131293a482bb503c15a9ae1bcbbd141b415780b957973c8b6c2bb789278c0c861152231e1f8f6452944f50a057c27eb
+aefb847d417709a67144de4eb60d37eed3a46ba07454ed30b0a3f99074cb8c26981b4c66e9b6efac79be350d0ffeb93e
+a85bc60ecd2993a950e35f6fbaec65835e84f8092d13c4911a533ccc864dfea808a1e184ea402a7603e7f4e8bba086d5
+880a35008a1ebabcf882750bfd957231c561913e13148ccbd3f35fe0d6d0ec6d5d89db450f00162805d14bb91f1e6759
+8b76a23a94d0738ef5e456ab9cf149cdc918254fbf672f14b3b38a05874d842570850dd8e24fc5f3e3ce7cef6c7d40ba
+b4956aa8e986007c066a1702fba0a725efe57b8ad422f049008406a0dcbe33c3ba2dd516ed90e9c278fffd020aa062c2
+916f6316ce567aa203e87807753f92fac58a9ddaa5e4d6ebc585f717456914d5bdda9bd806424e47bf8deff70a418d0f
+a45b1e0696955a463cbb6a15ff33e1f638c381d2f51ad4de68026d8dd2cc6178c1a99f93011b2b27d739920dfaa66022
+b42abdbad1b327352dafa9c9a6ca595e7c8c592ba9feed3ab53f37bac5e31e8e2e56a996a8ad9eecfadbff8e36afacad
+ac4044190ec2080a270104cf16cb2cc5aaf02d251dadcc74e9326b674bf03d3ea74e062ac2edd8517c4d56345cd006d5
+942c1be47fadd306854ff046d84b46aca22bba52256541447adca324934c831186a98ceaac8ae31bb87ae9071b9f5b91
+84cb1baabcc63c62772c4ec78ced4a231ea19af7aaf63d0eeb10799754cbc391a62cc363441f8d2329debc13f11398c9
+b68f9607c522375a1926c92ee5d47e24b6a0744ee4266c13054794e50222b8537a199efa61a6653240b8bebf66b7b6cf
+85d90bdd90e476ce808c4327c217d16f5199c8f5f80833b79361afc45f98ad839fc11adca77ca85be7d7921b6cc1753f
+9244ff67da9d389cf15b6d7d063955957bccea82c403008e5d3316297f52fae384d9b8f64313ef036c51ac010f5e9eb9
+b5c874e3925774a47d28444722ee1720eecf1c273c09b9e084370d5d7c4bdc28412685fadcc564758b1749b77a1df4d7
+b3db13701cfa2170207c95d8622997fd2f1df206116f7e4884a6e4e42da59f854a46e2bcc1ee4fb8355d02aa8d6c20ee
+a8a4eb1659ffd9b0ab7196e7479408b4f3d23a3e36ab1010b5e770772bc5abbd2d101bddbde57e2b88e1ca03c39b2781
+8aa5737eae2ca4aaef89584205710bf4ea84fe6b9649e9d0b3e56d064b218f77fd70b7f16da5e9c00585ce19fecf86a4
+900f6aeeb79f6dee31cde510ed6b6cf667782cd7003cc598ca33100a058d4f34ecce24a76048df8bebdef7d3395a71eb
+a4f95cd10a76bba45d2db43a2d81d1b4f3b1aa68b32d0556d87e1b96630da5519d6665d36cb3c7689c26647115cfaea4
+a50e67ead8499efc0f7e25ee5e49fb8d171ec6201a57e45325b2a4a504256fdc7a85f259f806361973af9a716596b33e
+b69947f2564f20c65c9f784e235861cafefd52c89f0430cb4ccf43822b21f060df39888bef003e2923ddd459bf08728e
+99723542891b1ff1ef283cadbda31140f60e0796bd1e43783a41512b5845277b403f97aba57eb3eefbef408c76874e3f
+85eff0dde2069e611c0ddb0c8fe3b5f65a3eb62a658b82b369f5f44638011d060d92fd900db126707b6d84ce4386386c
+a53556a76b057f7580194d4c0846135807a434b4aa976f9fdbb9c4879a7f33a6f8248c09fca121331a7eb29ac53199ee
+b29af20147a2ccdeaf8da1b5c7eb1a472d530dedddebf0e0c6c61abbfa933bcbc7cb8d93e3d0aa27a5bb1e0bc526e7dc
+ad0907661bf039a34380e82f28fc89b4744561edcef73246eb8dc7cbd7b045bc804fedf448ef573bc336e963e43f1254
+a9df6297e309b6b524d338bd0125b285ec8af09e440fc42a4f82c66a86aaf061cd787f64878527f4c677e6eb13a53e06
+a6dde1b3c6a927c1e16edfd29e310d91a4e7f77ca513fea532364063d8c4f804f5f405d11f26dc87e707d4b3631c8113
+88ab16820cd37290d9e99b6bad1fa1a7704c0f828a35be31554c8ba0f1da2923bb17b5a56ef015b798b99da346665422
+99335b6267f3504d5878da64ec42c850d7bc848459bef19fffcd8562fd25981b779cfd1485a2c67edb7a72d3f40a6e49
+806e39953f2f3eb2471a1213021cc11f2d7ce7fd00f01bed239b2ccd16dae6846a5a05e9e7f3729523fd863983367aa0
+a8049858311cd62b13c8b104713d4c32d66284b9986d25f214d5a1aaa4dbb2e5f13ba25ce84c2d3aaff76456dc5a56c7
+84d8e255f875a8764d2b11354985c1939812c1eabecf364d2bf15e39f5df5e4c2041659da4ecfafb9ff7c4be861239a7
+99d2380183985e7a208e4872189023520d2201d16af92c0f08f677079842efd10999331c00289a19be6e6e86bcaa5ad5
+8ffe7b64f9567036f97866c6b3f7c9f9c49ddcce2841e8d40adb42e64cdd5c15e744b9d0b88d5a0b24662288d0b1c621
+a1851770194afd1225eb8b589bc0225b70530f8791e2df8a5fcb1e839f91a3ee0e7fa62757c3a2f04e635a55165c0543
+a233d3d62824a21ad0a71f2d0d5fff195ac7d65ce06f2565e50420b7b775d4d5ed9d3def6a2d6ca2ae8f8f9f11bc8166
+9644a96361e2506e84eb7d1daaf0ce471603e9d488b75b8cbc049d0877bef56621b8bc4da41831593b7552cc78edc158
+a8163b0bb4b7d860610cdefc4d7cea1862565961cbadf9dc80bb64b4b1a9cf29dbe0bcad510bc63e3b5f07331292aa85
+aed2d795c512c32fb9c020d0bb6a4ff16a5b0d3d43b2969754a7d619c353233d88bb334d477bd73d21a60cd278ca166f
+97ae28b31690e5acdbf5e0467aec83f17f988161ea15b4baaf613c77d460d2b4b36d9dd3bed1ea9a54c6d72887fb7ab4
+85edb3d4772eaf9985c74913dc1544af6fce60a18555617e1535ae512a151451f4d86f6761330970e0d86d32f6f3a4d8
+b1165b1c44acae6bc3d8d8261ac999c09e1c82f85d5731990ef3fa932724e5825b9b98dea4038dc55ec6dd7f22e918d1
+a5b32863d96cede51b7d18c9f0a8c1f369eaca9f893f74439c0071c0b22fe46fa17ee11b57473a936a34e766d71abff8
+a853384b8a0b7af96c86aa407b4fcf2130533cd9ee4e79e11a8a4b4f4b81906bb1bef7bc31cb499687397766795bb8dd
+807ac397d46e4d6c5db395d0c340edbd3227d380efb3b6a1139e151583295f3059df8004db0e88ffe786fba5b14d192a
+96243517993cec738c82ce64401fc24eabd2ea80feb5ad8d919b127d2ad35f8214130a454dcf9b36722b0c7865b56256
+8d50f62b0e1d317ad8ca4eaf188cf5deb8328dd0fbab71b81861b52e97f669991156aa143d95e0b11db1ee0dd23932d5
+b6200a9975e18a2f39ef6acf2f01442fda3c7e636a8ed966599d7006ebe2585d252d93351be99a988efb02117b74f995
+ae8ec1ef4306aee61b4d24e34de54ae49b1672a51497595455049a6414a2e9c960c82c09b53fe16ff32e03db210c94f6
+8fce7f1a40ae0e3a65e06bb95945e8a391c6d78d8b9a3a468154062cb4bceadac4bfa0ea3f7a9cf769acb91dd03462d2
+a26072945b36df44820a7d14d1544d073700269443d8debd1c830bd07773635117cb2022448eb37b581acf7a5b68f4d2
+b0758113625d397d96632ff4f751f0e9eb9fc8d7fa95701a52bbf6fa9e2e620ef1dc327b8495dd9a27ec7964105ffaaf
+8f1b6e9eca67bffa5fc249e8e27ed24b891a1ff4ae7b57c3a663b8601ae41a0562088f927aa75e6e0e3869f6f197e106
+91111edc465291a2cc7107d6dcff7b08d2765c7433082a28697ea67f72f9b9a7550074c693feece0825027bae9e393f3
+a962233c0012f45a4bcf4879e5feb32218ce879ef33db766bff01026510bb90b6a16a2236c65a216cac8708991b7d6e0
+99d958e36cf64171583455922dfb6efcf170a4dcd71ce2fe4229b0ca6275a3d0294281a67626edb12b4b7bd5a20fbf12
+a53dd036a1e86e3b613fd3dbe25d9907a9c308431b34c3d9be814a6be6dd1604deb2426e05a280488cca65ecc2ab89b1
+b16e964395c2810e66c822c6bfd413e3458aeeb73554365fc67a8bf1b6cd08467424c74cce06074aec1f5a5657992126
+b0dd4dea2fff95eea4f32127562cf174d8efb11f1f6cff9c4397b188171be7964f42f246f9e3fc0272e8c7e4f6df15c7
+b3bb0cca54a8ed932d339932d85e5889e79b632288af160095722646ff2f8e12ee91cbad6b5133052e628aacb17cfa0b
+a18d1f4e7ddf82da940625a661f1f810c89baec7995ef9cc93fbf892c3cdbec467164c4013b73cb2c4ed9da8208cc8c4
+8c5fdf33a996c71f907f1bc90ab75b3c464f7a9eca8d24af8f1ff283f4814e6104228cfe4844ff69ff10b2d0b20c2364
+afc4282baa65c302195feb2649fbb53c1c0b3b7e7ae0c70a3342b11a9af290df9df4f20a7d7544014e3edf3cebffa820
+a45d4b0ab470f413728ab94acf048c47ad08d825cecc631c06edfa9aa0d6c33ff02b2fc47503f721b86a03eae028315c
+8b8b6a7c45b222c8d3b6837c2689380e38c93df27ca5b5f02d6c3b299dac4193c7d4ee79b079bc36dafeed95967d68d8
+95ce009531fad05f74f71420ecf737df14e906f1fde4047046267e9774f784f77370cda0f76871ad953a2c47d55a90f9
+9574460ee565dc68882d87a344233273fb1b8d7aa008b4692bcdda50fd2ad0049dbff033d35ebec446ec58a22febabbb
+8034ee95602c07c037e1141d3d5002ed6b692d206fcd19f45a0e9827c1c36bce8dff0169f10bc8627061f860f26b7064
+95fa6cc99477b603e70fbc536534f7d109b6eff2dda0ff3e8e5cd18a79dd54b05f56d653df6990c65d5eb970fd43d425
+98a0f4b8ceaa63caa0dc40346a86442cf1bf03d4686d5430adc522c46db7aff953daeb7ceb9048fd59490472e84f8c58
+b29003c373c5d41193d52c83ed64a5b91bfaa6de1493d3be85eb15cab6d7dfde74e01a53c44c331df89cb13eb4389a98
+963dc5cbf7f3166947cbad21a7f7e3ae58f74bbe4f1c425c80a821f85baab7f812af95c4e8f4e403246962ebcc00e1ed
+9783b623e5f15d4ccf9d25a2bdd95309813d4fcb5057281a27ec547cdd755adc5ba890ec8eb3874fdcc04f66a51b384f
+b7134853b9712aa36931d84122e80e959bbf6b4129f9b196347ee6fe2c4ed35d93b2e52d4c2b7ed8d97ca8565528d743
+b59f48ef6cb8cd4d561f8ceb0fca576ae34a950725a67e294253eb230e252a9a0dc0bb7767e6aa73dffd0b23c5435bbf
+b8258e1a77859c26ba35cdf94c0b9d9dd55a9f5389783f22a3b62f8a50f536ddbe1a6759973f74e7b454808cfd08c6c7
+b574e3a13dfc7645a31f1dba975ef2a34108984a7a889c86fea2b9374d74bdbba0b5e595e5af97d22413b117c1d2cac4
+b7d01b73ab2d37c6c4f623b891cbd9f49cf1d95b82dcfeeec1c076da87cf86c258c488417363acd2d7a9154b7dd278f1
+ae6bafc9cc1c87556c78ce39d58e9d8e8bb627716970f914793de49842d6b9b50401471c9f70bd0559298ab693cbf73a
+959f555d27b78bf54cb28f5294a172cc3104abcf0dac8a01a1174e09d97d789e49c2d16c1edf77c0457ae196454a8d41
+82e43b2090c11c7cea141b2e95a1a536a4f5c2420f953cb1fd91431e603450e6b3c88fbef6b0bd027d960cb892c945d3
+b406417316a21eba0da34608f4d050c74a189df953456bb892f94828ed763a67d1f71e7ffc51e8080d8709043e35d29d
+8b02983e18417649e0e07dcc44c686d399bd67a289c934cee7e1f92032fd06163a1fc825b5dd4288c796416fe399d3df
+b64a101687eae9d98b609403ce53115e471e6ddcb6f4ba47c237609b6a9f963a6f90114ee619e75e2b128058036f4ac2
+839ab87851c8edf4f2023a8ffe9d9087f18fc87169469dffb575a78d1184585255ac0ce5d55e22293bdf84f35fd642c2
+a42aadf6ed8a5fb2492489b0b3668cf4bf8454f012c960d1ee9a4067bac36e4f8c51274b653f9f032aa05ec7b4384d4f
+851470154b8d5c8589238d0081f2eaefdfc0d0bb915d12680fd9a2304a3992c1d350dd9821e6272949d3324f3252d8e1
+8748b4069365c2235440f2401136647520d85d4b9b4a901b714b40a363a8888f0333fa44fb7e8b500a409653a9a7e089
+91c8ac7b0f46a8ae17cba495a9bb38d3b41b5b5a5b941f7a7381a7f9ad1370a20e795057b24767afa6fc0216855ea720
+ae0c08b6578d11a4622321e8e78c353613988f035e1e6a13389d53a8204ab8fa2b234daefc7a125481d06f9a775fb0d3
+988f5084ba69961ba916b1e388b0cb98fca8fe8deac78bd7a67427aebe1f996f8c79b4169da671e3f4e7c42e5c8315ea
+a524e54d1bac182dc82dee82078d1f3a4619ca19c66b4d2ef5a225a422d1a6a233c304b22f408353d29e05367cbcb233
+943b4d79f90c04841b2746f4b2d1cb7aec594ed6f0299a821c3c025d5d9084d481e137c6d95c07a97e0a5273dca22f4a
+97d59b2b84feae099e71d2d00cde3865edb35ca0c97ce037e337d763453c33100e06819a214bad69a0b41627234711d9
+96082b0ad8d75dc9cce0fcafff082a235106d52850c1ffddd5629f07736c0422cb266f4b2189ea2da9403ab6014eeebf
+8a08352718f0081ac3308da0070c731ad7d5a8c72b05541cf3b20a81729ffac171cbf82c920f48f02726eb3121b0adec
+93d061ceff8c77468d2f787351e3692ee2f52042190d7f860bd542ef5a7e37bf8dd925036d7ccfb673fb734eda6601a0
+a72fa4fb6f77f03774ec42b8c3e53b1cb22a86446d28dc94dce0f117281b7f6cf249902e7a4b41a9d16134bdb4d4f2d1
+b472f53ad487af04f7fe60eabbcf246f84d159ad6b120be7c9a85698d331f705b822fd82a460a8e93f829275ce2caa21
+8028156bf31ed106bb2f5b0ee2efbdf59415d77b22b91c292249966376fe95250139a3bdd28ab32579e8ebfa36a25b8a
+a1f43d0cb9f221f964b7d8a00dc81e787c9db8d9a85da462cdbb3de88e704d7650aea4286d7ca1e33b25a7606e56f822
+81c8cbd8dbc0ce5cd333849fc85e5cb9403efbde519e38755cf035f992c969d6219e5d212955bbdb7e2ef75a30b072e5
+a709e193e52b481fae8b32051523feb2b7ce5fde57553be93b74717714072e992f529cc93e3087a5b683f91c47ab776c
+8fb3de899dd7a003bb35a3d3ec2ee12ee1674d362e95c7ce8d8730e23e5ed5c79e909b4224930baae8adbf2b46fd4dec
+8056b7b2e2b10fd5d48f9a8a1cbf844e6654da3e724cb17251555d5baa0a4974cfded12319c9d18fdbdcb7894954bc4e
+a35f7b486956357d0dbc4b2a4104cfe4e4118089095018527f93b282646e3eeb85b07cf87acefcaf325a1a6b30e66801
+a0708e75513619a454971c48f111740f710c870c47c780847f16959637b097d6eccb9e85322b10db0f03ab3720995323
+8ab9f45b870cddba63d629d987573d106a2e2fc3c7653d48bf89645c87b4c57607c79bf648d7ab6a6e8cd29732aa7625
+8b61b28758d246c74b5fed9608d92f03f664db2d421c4ac3ae9b6021930a879a59ec8e61d18b275987f5d7bc3e80f4b7
+a2b3ccc0386dec926c907a0d20416dc2145b5d2776d1155de7411da25e81aac915817f6eee4bd26af4c9cb8ac06dece0
+a9d45649fc25edb6b192b37c669f48db1ba950b72ff49d9d1ddc83b3c6d7668cd10f2d9d41e1aa01f35176e0e83e2d21
+b2df2c7f21bc636572359fac7c491865863ad10d09cb7f4a199bcfa246e1dced483cf2d9439aed421605de694ef21216
+b5eecc458082e18d949dfb27caf0482f0e3ca662f2d42f9230411a0e57bcb48f11501ce8b8f0015a0318eecc956fc7bf
+813eb152034300168446cedb27c55a1cc2c85c6e7c3ca7e104bf7590f1fbd667b7f59de3a1ed89643493bf6b58ee8de4
+95b3f830e3dcbec1062d57a3d760367c9129e2fbeb619d2e24d5ca0c31b7d2750a835822b8953076c8661cfdfbfac522
+92501a1055bb5e2bf3b506a7d20919d555d6397e12a01a9830c32b15f47b66bc233fd4cd3033fff2f4de8e5d527e793d
+85d1de62e2389b0a54bb66364f289bc7de6249fa0bf3acba56f6842f9bcaa79ae3b25a116d48f56aba3bc829caa916c9
+92acec3fe9446c0c2fee3c1602bf3e447a5c2e2dde6aa81d0c641c1d9718464952cca7de4087de00a1d05c38ffaf320c
+8906ac02aa464a563c05b615b8fd1c3383129bf6c589b707aff1ef28f8981ea55732c9c76c7c7909aeefe2d34ed859f7
+980d61aa44dd326c7f63cd06fa3d1933de4bed43210f4afcd139b75a09c3807491eec558e614a7dbcc7370c63677f94f
+81371c929204b3dd8e6aa1b6e83370f944c8aaf4527bb297ea4c39a6c27b09a121d10dbcddaa3e1c257888f9b508c275
+b6ec123d9a3c3f1a998561541b396ae1ce6d1258dbf2f2d2a1a102927088d4d3a3deea7d4e07ab51ed8a474f15a92a0b
+98368213a92717383708cd8b3f4e829f3a6c7f325d5767b477d9d43b3d888757074b6ab34edb40b607faa7529ef1aecf
+875a5535c2f8a157597e285d9f103ad59a5ce00fe0b5d6b2851ec308002188e11b271c10427218695f94bd76e9a01cd0
+831c6701291554b78b6e7a73982706a21660c8f3b65e6c08bb731d4af287cd5271b71ebec38768dfc5f28b1a38e7ea86
+ab2a6d4e3d28bfe0d28a825f9bed7e7a26419540601c2a51dd746de5ecba9bc06f4879da2b1ddf79a4eab0710b397f4f
+85232f5ce0db77e4ff13b0a3a808bbcee2692b58b2641c2b8c401f5ac2d23f4a22eb694e61d15337e5706b98fa35b147
+b158b2100ede7d122b16d18f635b91354517635b64eefd38429451eed5c6b8a1308c922e20bc5db6d8bd377356873cad
+853460bf4206c194cb7d1b749c2b2a44655e192ccbfb1ced7e38a8409b90e973a90014a502f079efd044e20d2eccf7ad
+95441948c94ed3c98478d7bc11050fa4e68bd6d0320f306407f82459db5238bb05e4a7bd00faf05f032f9edfd77a5d70
+87d563ee65585d9626785fbf019dbce9f43442abd2259c5cc6012fadc350086655bbb9efe99835e1f2f90c8334e62c2e
+83473c4a7ebce1e84bf9c2acc567193ec21f353a6c658b6b3c1f2fa108eb1aa80b8e6b19ce898f1e7eb7255114ce7fc7
+b060a9f583c5f5ed3dfc0ddc1f0fb7c2f62ce70c2c0c6b3c5c1737d277d1dd0d6c3ebb0c7468f9890098454ebbb430b4
+b695327066765a477abf8e47d56e7a70d602b9f96055d01cbfe848985b263f845bcf9af787b288c4a424006afeccaaf7
+9576c4f921ac9090a1b6f8050e1db5eebddd135f2611f053ccb7fb6db1525a62ca19a68679a68d8b2094c0ae5dd9654f
+a7bd1bebd1aa82034dafa9b850a8713b01fae9d886fa33017e427de4ab4f9ad8c77f96d7a8ccf31d76ccdf08cb2b19a2
+a90f7a48aa60ba7dc9131d551e5576ebd092ef8c60b33a44fc68ca7753f6bac2837ea44d154406d0edf36d38b467616f
+889abad81855ad90ca13156e6110da0edd8917f69fe57941225f4d37f0bc2c0e8629f4858e5eca2404467b2d0770a196
+8856e8e2d5ab5a549f1b9988dcb45a63703d4e60d2ba8c4bfa63529ded407bb9c35a741fad10828c02e3b98fe45f3fc5
+a12440e3636f03c573cf59411ea99fc95645763a0af65d5668047d1d235c2e65d850fb8e7012e35aad63410724b2d62b
+8a2c5bb29f2e18ee9ba155473d2702721a7780688f917011bc11430b2ddcbd96acc519f568ee4c4868e7af64f083c28a
+b22053c983f20054d0badcd0910388f325e0046c5a123aae150db230a9a669d8cb02249c9b45cb1e95fae6b8256d951f
+a4d0e64e3f1e4123c2ed9c5aab5b0eb6865e3f7bd53c80b29cefcab388e2c2c3cc58369342b69318fa2255e609415fc8
+82788f75d9324aae66460f716daaed61bc5d5e794f104b48ec2dee0b0a25a7a899f560ef41d7466dffeac9136c4249c4
+926d5c134defc9c7fecf9323d49fcbd7335961b57a97c88d1e782baef198838e2923b6f1b43d6b78609596bfbb65f6dc
+a6210531f3480f2392fb733553dd544fe4e7f0064ae3f7f18210d7d221f9e19410e95a17ce89d17471ffc353f4d846a3
+a08bfc7ee45a90d82a2f73367c40d9050a78b35dadc6180c07274282d7300ca6c379948601d0acc435b78a16dbce21a4
+a85ad9b69951110bfd288a29ecc92ddb804e17416628c847d4c21e2eff6c5ea6b7e15e57ce0250ff9047b45ab3932458
+9863feb37d7f0929c59d8bc78a129c573161ec97e2130b836d3c72a3c3e6918620fe2a6feeb74f4a6465ab314b6b7244
+a9e37cd529cb2e21917acdb167bc2ab126cfbe991a49a148265e3e6b9a61bfe9da8b0e69d8bc34cc4c6036f422a2ee7d
+941ba451146ae3c0388e4a398f44aafc3bc462a705e29d4f5c615989f76f559527fb85537de359fb36a4a167fc13bfa8
+89db35c2b6bc54495dc41c48bfbc940044ec0f39ec927c625842b042f74074e4999c8907862adb83fe5e93f27ba20f1f
+820ff3255a5ca539217ea5ec3b1999493af1df68656f2d7c6b46bee636517674c1347af15be5440917c86855f9fc2444
+b7364e829cbb6254dd06d331692c2f99d22e68105aaa443bd3f492eace596d93539aaf83c1cf91ce40f541397522fec2
+b58bcb261b108989e3c999c4db3c5a253cc30c1441c0fab9ec181f3f26581406c09302ce2cbdc1d843786a9403023952
+af4560dbcd82314662f6ce2b0834e38cf15e6d7336b3535aeda976c664fb0a86153bedf3214e406e2e9477bd83ed60e2
+b7ba7a37f57a6079c3592b6aa6bbb9dd0bd7d1089566d744265a0d0c4bf815962d943740db23f225c53062f9b3caa6ba
+a34b4c068b4974535a30a5915e187856a5bfbd8d6497ee41c16645145ffc08c27afe3a2bb11d2b65d294bf5ce5e47470
+8b00f16aca70cee2cceccc6f38e7c6e557d31b3ec44ce045eaa25fdee9946477d8157f6d9409e868ee151dc0499e2fc9
+aad25d2f68199dcd5ca056377db1254613467a760635aab5ff5f97a9c713920160a4c1440336e6fc027abe50c443253c
+aca7ea8dc24d2289ab53b6333244d33a5f7b5a4dee44e71efae2952b00e84a438fbe8f66b21b89f5dd19b6cb9b3f9471
+b1defb61ac29018ec8aa4a78b89f5671c2cf438bf87e95ad7540fc431e1a8d302aaad3fd65c4afb83f5367720bc3c168
+aa7197ddd86bd09faffa64095dd4a0b98aac2db25e4b48806a0493f4688a47cbb92a21abe9cf2b92561973aaf036d4f8
+b47ef0359fcbaa3fef1a81a36ff9ef60ebc2d33fc387c365910be74b1dd2ac03014448096b97f6aaae16ab1588b1d3d0
+a77f86fc37c376fda10da5bcb49a59ba57f432d4181dcf5733514f9a3d82c873f5ff0f85eedec4917b11d83e0bbb0334
+b6c2832496892712c5d00bd6e2249c9b2709e5600b9bec71592503d615c291ae9756b7f9e0490995cbc49ff55757ada9
+a220b78550b4c516528a5a3c05c18072310199b8dc68b6b3459499551ee58355d29de01f8410747c775484bd1907f08a
+9646d151b92c5685f9ba1dcb213b3deed40858630f42d5c4c94fe0ccc897eace1c5b801fdadf8dca06dcab70a5164d36
+a430ddca81b2cd8b521f49cf62621eef15daec1a0dfbfabf54718bcb9f1c3e6675a227ed60bc0dd113270e081c6d017c
+96caf62e3f0741c40644d2287e23459f61d0c6f44ce5704b102aac845cf9fe7738a6ae56eec270beed724b1510694494
+b91d4cee532a02a66f6fa864fb5235620000051b7d17d184b3b5251272130c27a18abe51313fd83897333589b20eae2f
+8bce1637e1fd6a1855aa28f44c20f07c92ac818883d98757e33c0b66190e3d9d17fab33afb538001641a7c14cd834b86
+b26d24a08ad0fb3cf84565d4c4e30b24c7525f310cb6bc714da0daf2c0ec14184be1c7089584b8619eadbc9eb64584d7
+af74b366992c2773378bbb8a5dfa10241fee606dc94ac848a5853e62505d4e1b5e0de4fc299820b58ac5a8df3743194e
+98f73920a0866a505c53ca576e150590ab7c8cea8d6fad6fb6db6eba3a60c01f09b33c91bc221c972f7acd1d45ce49f9
+8ecee9d71cb5faaec3112dbd0ce6f0824b85a250951e0ffac49a3324a46530e3d7c3fe6fb67336a70597f8b7bb6637ae
+b3cbfad7d09984d6652540ca77c722563551384b8853e73a79b2fa1c8024da9710af1cdd165aa6d0488d41b0e191bbfd
+b03a031e3ba158c8fe32a0d5d0bdf4c53a97fef4c666ba79f5ba99cf26515d1d84c29e70145b6033f4b68f3c8a271d89
+9794219b32ec582bee819e89174b8e7a3f8a064ffcddf42499c947ad69fcd3d18fb5d1e8e27fed18ad64bae9a7d95611
+b286e55596e81fca030a90c9cc6e85bef89f192f99a52f06f35f88584dc68647a351612f9cb413ad670746f21724296e
+a46ac0c550585a5307da57c205a1c23e0a74483ccef10f9420c144ffcbb3b77109d48f9a5536617990e47db2e987ad45
+842e5ad46fd831f1864527773a4f841705a8be22054ea0bb3bf7b9f130120b1bb530e793841c28922803d781638ad6d3
+ab70deffb672912026f02f8b3be75e5c3128f30e9ece35347376d6fb4bae3c83c4efe4c6544da43e9f1a93760e993136
+a8f3b4321c5ad29c7cfb7e27557ff073bfaac3a89b1c531337be0d824b55a2fe391a8f8bee6853f95c10e7e80662daac
+8f1c88624135c1b6b34601e7ef4eafb4c1d825224b4ff9ac18ed04062585621068d872a7964fb79e016f78a2e0aeb61a
+82610794b2d351ecf90a6a6da26fbd77facf87ada4b88b4b2c3065bf5f42684893e72eadaec9d8c36d0c8f8e86909c0f
+b92f55a7d4dbc9e864a3fc5e6fa41c875a5e3321f29f0aed80d974e550e352e7c29623e9e51db17cbd111c42677e6e3b
+b274aac6b7c93fd65e53a6fa4fc875bb48ab675768e1504d74d5ee7c7402c389419328d596bf7658b91db7adc1cc596a
+8fc76ac0bbecdc5a4ab7e78bb2a2be1c4c713db68b70b5550f54c0062c9c398acc33c80a3c7c3478995449fc9601e8f8
+899f4babe86f459382e0fb1be838906dd6cfdea77508b6981cd0a30cfdb74b893e021e7b2ab6bd3f025c994a33b71c85
+a572ff063454eb1efbd9eeb2234c5aa593c8d2eade24b17d192b3bac2592595e770c6cf5d3f5140e43065283d712ad13
+92727709f08d27e432a529a9cb80462172fb8509e1c7991df89693f838e82a1638a7b7412c5d04b11ca215766a78c775
+8bcfd95ca0d9b6a57b18447084c243c01618da9b3e6e60567b9003a1ea96bc8af4064aeb2eb577cf94a770a9fc05ce37
+91f9d0a906162b40f74ae3d356aa9520881b4b496713bc312cd90114d0dede0c4239ac72382172b44da61a101e12d932
+b756b1ae8fd50508e2c552689ef6a7bf2d0125260646cfb58ba4ce18d67a6871585a1054d9736922e86afeb548cc7cb0
+b9eb5e3f66a9a1eaf058b160b2c24b04536a2f6af8037df749bc1ffdd7b1e914217b7106dd9c0603e1f0b1c26369a256
+8b9bc03d8774335ff7024602342083bc8417551b924a94d4ce1e70c157326f6f2c1be9028b522cce183fb53f2e1226fc
+8200cfd1b98eefa4d98d5f89d4ccefc728b0359b345f5e766e84544acf42c98af5ff65c7e07c9b4a2a6cb79434772bfb
+b250dec37883d06072f1cdd26a1d7082ce85a43338730db37ab5718497b3610fcc917c9de1a1e2141ad5434faf4de50a
+96e368defd6860c6854ff2c49a52b9cb0915099ffb3a6725dcbd25d1d9bda4935d59c72f1fbec7f245748f0f69552e40
+aa69207aae055d94028af14037d1ebab86533dd3bddd008977589d9a70e47287b8736cf1f3f5b5cd3757b1e4cb6bbaf2
+97d674162b1a67af09add60b9fff98661b94284a3b67edcd4c2535ef9234298c91d5e2466d024f609fb40df8b77aece2
+b966f875ab4f59238163f3399f72866666c6245eef6a164f31fe874342d6388704038531bcf0aaa3f374830778de5a5e
+a927194b4e3bb0185d9267a731d8c5290cf9b4df7cca16e9894b2a1f6cfec8d5a2a8bb3b2baeca2382939ddd1dd1ad0a
+84b04774e17d3383ed3851ca26aad77b65f8bfe030469a2ea388502a051175729bb2e6c9b8f245b20c1b7ee2bd247095
+8066379250a64a858e9ebc07e2ba1daf8ab3676f17207721b5e65a2e56ae8dc04403877512494e8ad36398decf31ebe7
+b65c929395693915d9079f0f92c6cd5ee6707167d9c1cf3926eed76dd2c979c882e1bc5f0a19143cf26a2feecd0c5b8c
+a4dfe26787c5d40e9a92ea77d72b1f5978f475d33bdd4a8e2639af3f4f2078d5e3205eea3d4ebf1cb8fd7703b75f4f5d
+ac4d46ae8c344d4089c5ea2cad3afc52bda7a8744f4546eae53cd60a18eea7fee758f14fbae4a24d97ee432eb355cc0b
+b21f051f823cc63124122b5bc209ff7e9e2d5999fbee70afab37a9e2a7b0ee96c9046c78a0996da2d5874bf16944d7c9
+a70ac024842516ba2550608f099ffec0a862fa10444a0f49fdfdc0c2e81cbbeca242b729abba25babeae69d3095fc449
+97912c70d890ab3bbbdeac9798fc53f2ffd163cd7ad287ec894cc503dadd1c077b434d33510b6832c4b7198ecc22f2cd
+89cf9874b6b0c4b56981ee63917898164dada5bc7ce6dd6d156c72a05326cd9a8e3ea3e224c3ce11f386b18cf6d49892
+9339ded5500df3eec9b0f8894248223865b44c14f093a41f6deec5ab4cac8585857dc874526278104da70a64cbdc3aa0
+8fd85bb2b7bb51c5257b63352e922ccb1ffc45095a59610027ffdfa00b7c19eddb0bb4b2934933fabf7e6240beb50188
+8cacc7464294d3067703678951aca3d0e569bf1af932609f05ec0b858518137a960f68824574d99640b48a95c748b317
+b6ff6a7d4fa3b733a053a64105d4fadc1751a9743489b15de1354d0747daa9cd2f748c1373a9716ac6db5144f668bf2c
+a2a34fd06e4bed3af82a6605f63102908ab3215366cdcae4225fdb2eecb510571c702f450e5613f7daba92754933f25d
+924b98a1037b287dbae6bab1e27afc54f72126d185fde40c4ccde3deeb9c3b44ef97a7f3ed7d9a134be6694ec6df15c9
+92f8616aabfa0099ceef2927796c74874a1b8a1228ffded92264ab5194b58e1460271ea14ac1de54e86313ee425e0cd5
+8f7a82718a03d18fc0da76887664926d5b3a68e6700ff2ba3ec46cf6953da75f7370b01e015d02a6c11f48cf7b013cb6
+80d5f80a5df53cec9cdc1b6fed5b3ca8702e5f77163b9ddbad567ced09a4627eaa66d10d2e9e874d0b8dd1aff4cbb00b
+80e42816628f28e3d2f2331428c49bcd29fa7eace0dc5b991133a3780ea8ca78c0804e8e0f977e933d159741b467badd
+870e25b9ce7d14503920e75228278005fc90c1aeed4fbf6c444d4d79e3203524cf3948408cbd0a3f5e535ac676554a30
+a9fc7c0aa72ba5bf6cc5368ea1c7f6ced95c42820b0168cd9f3b7d4b7b35c8e2c2c75ca6b33707a4b4466989772f34ea
+92452ee144ba6e6c4370d5f943097a87bc4da72a84335f130628307318be9915024aac2bb296fc16365e9dc96142aa02
+b1c9cb81ec027f63a1ad9fceacec6b71c4c36413ec01376f71064f1a7e0ce222c072821eba37dd25dea22e7b9a4dccfa
+95ef57c181a0cc9f88b3162a72ca45dacdd9b149d93e5daabea378530e41b01dc70875300e7636a3c6b201ebe0ee47ab
+a7f18a76871212138fb4e5779270704bfb49668a540c13e2044e46a500da6fb8924e50e7af450e67c163ec44c03942d6
+ad77e31f643424c4c57b04bc4f3dacce61e6a25d43590a079d02ce18b46ec6fcb181eb4f494fa8325fb3270f7d937b1d
+aa0ededefd32cec31f102a90c4f596d04f18d1a46272fcf12b6a2e76cfdcd7a7774099727fd3e9d02c9d8a9587bbcb5b
+a10b5a2dbc85f99674e59a44ed9c364fbb17483bc4aea21f728fdff7e6716a8fcf25e3ca19c74d0b2b5df791adb2e7d4
+b7d151b4e05b8506cef8d32b3d5df1c7ed9f44072a4b74d42645c18848a1e1be3909a9dafe13b49b53e1a232adb808f6
+916585c147acccc1f5d0295d02dffa39f1a2b8261c6b717f650d7b71622d381b39ea581b6dc559397b49184666fb2357
+b294d3d63400a2e2ae8ccea317f75ca3c3edfd88b7c1b58f0ed5e78c936bc854f032deda7dc7b288b580dffc58001e43
+8791a99221dc424ce26e43dac85d0f44c6db77f362dc11d79f1a937fb8e251dba45f0eea42261b8d3459c11c74e9d06f
+862c1ae7c68d1a03ebcbcace881c8df9a1c89e29e25889807ac7761030a7effd62b98a0be7bec0ce6be08434f777c2c8
+852793311ab561a999277a9a48af659c2f9cbb6f45edd7e0dbae5e5c9d15ec4573df3790cabef594ff204238bef099f8
+8332048a49b95efbcd4faba014ed92532fe8be3f20bc352812a068d84dd957c2faff7aeacd8b81d679b38a964ad9deb0
+b2fa5fe77f60a24ffc569d2e679c81b1e882227d3bd4085fe4cebcc69036e3a002a903a99e1dd99d8875fdf3deea02cd
+8b246a00ea29351641c4fe18874792d206da6db8fc0e9cb17c8746cc857fdd58bcb0e026ed8f9af3eef7cf06790f27d0
+a1d3b979a2ab624071d0289c06f2ebda76c4879983225bf45acac5ddb2f64b4db7a5d07bf21db930d4203dee28249746
+b5852be715dc25bed15fef741b678561a4c045a4632bdf13aa4b24b5ee0f8c605aabd373c99640dbd4e055da83cf49c8
+841b82b23de8d85cb82de2bca010395be1e8ca1aade965532cf8199c200565576f2750948a058445e95a3fa86067ea6a
+b6045d1afe64011b941bed44965b2c3155581698d96891d3fc8dfeca944ad73158b7796777ffe3e0af634b833b632734
+add836141d5be809df16be64a0b1c88fcb3b837e1d6ccea72fcb7c6b293e88648c17aad2a6cc92426aac37535ff55761
+b7ee1f1317397ca3bad0f53f6e043dfa47da6f2e2ad2cef300ec404d7a0f597bdc8384fbb689022c794bc9eca936ba00
+8333d0fa12ff7beaeb839c039d9ecad46478bdc13904b70f012b86df093226c1759dfdbfc896b337ce462c5254befb4d
+a92f21b5bb672f3b1581a6ee379b5130f5b2b709f167e48e61a50afdcad96c02caaeec50ae4efb3ae5519fcdfce97100
+8ff6c98810047b5c0fd90dd1440ee7b47aad0bcd758895beb97e45d11fb1ccfe89d9f0e5cd78fa9cbad6ffbc30a4b480
+b4550f7fd8794a5b5b1503ef30d389e0c5155a5e6ebc848f6f80031c00c21eb695b224f61e2d2f2953d8faf18ad27b1c
+9776959e34c10934263120a520e36b3a14cd57a395a1789c74d180ff29c68fa73f72bfd8434553e6ec07c9e4026278be
+894da0a3369b46fa4a150b166161d567ca7f2269a003636af4d23f95140dc9a3ddae4adc2adb50c8ee49120745c06e5a
+a05f644e53fdcd666d58ce85df5f88b639aa199d608d544d9493530b73e2fd74d3099d49d849e629b2db1796a632d1b6
+aa448c499f334eafef76999294fbd5f2f0d9d2a234d083aa8c9ab38b45556e0a9184633933b653f5001bf19a2946e0d1
+ae924c24b44d01d5240eee021f7023a3416351cf86a0290b2368dc2e4b2abffa71bc566f17c7c103cdb0622954d13ba8
+a001b9350a80999ba41fb01848df2577306a86620ee17f08361e84eca12dec5039b6e5a764ca7a665fd0dc143f71abfb
+b0251416b702cd48b81941fe2e5442c70e493c63c7ba8d6dce588cd4e025284fe516d22c950d33e4dd76b6cd597fa865
+9651633ff255cdd1b34eff1a435f4f3951df5a048a3dca3e5815cd84a97c4ba89f6e62602a9f9601dc350cf224a64149
+ae20ec91bd6fb11558c41179d3d14a8ab7380ae1b5e89a94949e64e7127c1067099d996fdcc5624f5be84374fbd1d0d2
+8fc0cd5738bae054cd1d68228c4c8f1fdaaa6d9b5328c91f7869188e24d5b42f8f9d28f0617cd318c8003c0ace5aec9c
+aa85c436e1b4d38f2d9fe22aa7a2f4d62a2a9bd3958b619e1ad5497e48f03a6af4fa4340f964883793a7cce7ecccff0a
+afca8b03c92697bb9b8f24edf223d4f85768d0ff8e143f1b17dc7126454d96d69f1a2d7b4efd08bb2c3242d80a965a08
+80de51fa361f4b6ec06710c60cbea24493a539154aae8054af9ccf1c7a9b5642f1365de68aa66ae06945bd9ff4bcf63e
+a66bbd638651241f9d754bf18fcee086b263510c43d4547a5b517f46f189504d8bf6e2340c0c86360942d894d6e55dfc
+b3ee246530cacad87ea2f65b25612e94a4a77aac99f3ddefc09341948cd8420b69a0e41a803cdbd53d5240adc73f73e6
+863a9fa6a509f5e3669453697373566bcc50eb3af892eacd305c411b586cd7317c51617a12337b9c8767d7ce2a91141b
+9826606e2f178e727bb7d32bf70498388dab3801e1269998563e9317a891fc2145e549f4440b7e3a73b377bb6552d68a
+839ac711c3d448d65d2dbccfa74731a8a2ff9f430d884da272c6d301e88284ae4ec19efea46830323eaed13c4a122c33
+b7030775214926dd45d9cfeedba0e575bd117cf485ce4bea47207a9c1411e1dcba34d891600e62235d2c48f5e57183ff
+a930e1d2c0ebb8ab28564f11767b7454c48c1d96edb46690b04398594f15dc44d7eea9fb0b2230e04b949e9cb7e4eaa6
+8c26df3156b39d648f5446b5316e13916d3b1c3743bc0fc6a98f2e8a3869b3ebe7b327a1b29c588bc2060b5d506a4cbc
+8286f511e5606e6a4d6eeb2ad665c319f356e4d6a8b81e13bcaa6d80a610cfafa3cfde465706ac1e7fc3328c7440ec10
+b4b6ab6c87257c54c58bbabca500d0054c9bbad083825d112fb6c66d5d080d66557fefc5587be461605fc0d5a947b672
+9894e3af61113c4a1746b2fc18a20df938ee99c64de1da27e67daa3367120ce3ded8a338f05f4ef6600fbfb7df18d804
+801ba201c919654e86c11b1e141a3f76e036f484c99fccb6e9db1b14512395659fcbc799ce526c6686eafa383d8e56c8
+985638e96a7abe027700c1cf30921d55e565151158a8f7a25beeb2b8b2745c25b56c1937d45740950d63925ffb49b8cd
+b1f2ee0a1740f58bc172c7753988da7c6028842fbf88ff82dc3408adb436993f7fee81a61ef1cc4a6f36f495906b1a07
+89c493ea1d23050bbdda0249137af9d7963e956888a6bc79d022e97610b246e0dee9cc9f058293e4c19d124224f39f2c
+8051634d6fb4ed4e9112f02a2ca6e99ea769e1bdc1863bb49e8ea494da17310a5c63e0391b740f065d90710f18669456
+a10225cd0bba00d871ec068d11d82989ba264990c8cdbeb9f856789276b6418c5661ee7d4fd474e0e4c83477ca581237
+a6f99ae74558e426b55972d4774ec0681c98f06e5b08e0caf1806a2bf2c80c04fe4b2090839be5d0f33dcd7b7018f568
+98453e6f44fe89159bec08fd324fa5e1874fb46ee4c8ac09e661c5ab3a86549aeba2d9b955ae3e69f2c104c0eecf8b3c
+943efa4ef74ca097a11e5dc8461bdd3ce94d9cd9c67b1e6854cb14b7cf90735c9226e5ea09d8d12467d740d1db4cc99f
+91bf02338414ef8f7f1c14ce772f54b9013a029dadd6b05a2f9e0cf25002dfafd9a55fcf8db1922af8ebd8a2a7bc939a
+ad13c0f5ba9f3dddd240d8574312205163609cdd518d6c5a2bf3af30dcc206e56f009e8ed1a491772f1f07b64b3dd268
+af88041418c54660212c90533b0717833945a373bd7158cf3d3fb43a8f4931418fb653f3e7533a837c0e4766fc3cf269
+852ef0561f23218a572031fcc76e29d5e75e2b82a2ab1ffe187489205c804a9528686dc818b5be4d5827e51eaf9298d5
+a1bbc950205a77e6eaaabf65dd95dac6a1166ee9c40555fb7a8ed344e0c62e84defa757cb4f3abf96798712e0830a3e4
+81fcaf652daa6e1c7a162b78a2554cbdd50bb437723bd1977eb875c44d5af95ba977d68eedf3bdfb1b454cfbfdb42527
+9941bf9fcd4834e404f6deba52aecf2028a490e6a13127b3ff1705fc5e0a56dc892998d4f0935110d35dc21ff94716e0
+a48dda2c268893faac3d95c0d8f2a15d090b4f57fa0c61dee774832827879e861d79f001dbdf29790f44778c34977627
+8e18505665d6b51db89243e441d3c8081ccbf771a88ccc7d10b024e3a65fbcf0edfae5145c1dacf662be1d9688b687db
+b615afcefd8db686bc2672c30a43de32948c1fde99e84d64e2b3f49f0a94120334f41e0019459a54d985164bf3a2df7e
+b160c3ab84387b85735bae44f2a006d5a7f108c2b1f864eb7ea178996d6de871699f576423727f68887a35fe7191d797
+8b0f9c9296b4f18e2225bdde1c75b7805d2610dc9bd37a2ee0ec6b367c598911393edadb789b708ab76a237caef63497
+b3e5c20439899ac3670186e79b970b3371aa451d147897e05112243ae2a568a386e18c0625c71487eca89709e704ac1b
+82285c1da01a03cbc13749afa50f9409ed6f4f26f7e05f4139dea2d741a8090d03584527f1ad7aaeb58b8f8a4c9e0c24
+a3a5fbd076976de6d31214faae3511c0b3222a55275b229d391f86e463052ab98a511999db879e0fa6f5b4bf70a4a871
+85ede78192003964c9df9f0c2b046b847f844fd946d6a2414e8fb8458402065f4a143829b4a0259cca30052e94148e52
+82325eb2b4c6e7a00315cd26b1ff49f53713eb34a93d2129836009b8615ec67bd880ea7d5f164cc8a0f264597c9236bf
+8e4936b0e350e933d53daa3020e3b4f952dcdb42ad674b3781a5438a3899e23ab1853974b9c8e511d456e2f6237a8f8c
+80180c3cfe604aac8c30d1cea7e85806f2c75eb52a26a8202459691b511436911232ea0a8d1727d7dc39d304a766afce
+858cad2b56bf8e557530a3dab2f3bf888498489305989093fc7ef36cea8ccf7ee83b3974f618506432223fd88f3e01da
+b2d3fa2bc045d304f0faa0c58c6a78fa6cf41ba4512bd1eb3d5742ffb3537cd0bf345a9ac2ccaa8dd93b6b85ce032d2b
+ae50f413f3b9ea1b653dcfc8518126dc9743399358f560256cee4944207ab03e149ff521b9a3ff97a67edf438ecead0c
+a83dbd2fa363200b7396923581f29b03d4e0936819e298aab1c5d3ab24039974a326fda55dede64159d91f1d07f95252
+91f1e053e302ad340551b0b2a82b9d1f317eaa3b9d936c390cd77ce93fe5919c737583d3354e5fea6641b0dbd3bf8148
+b07064fdac4da2b819830b4d1d8845cf45f58025757a3d433146a81235941d8b4cc03707e2f2852980b49c987926680e
+a7234cb6b9219b2e44cf44a0ac99e3439a0bd1558d92d4a3ce3ef2852a587d63f68ba89be126de7857ca5295b892a216
+97e0fd1e0a18ba40093b9b5d9fae43ed1c32297d926c15f068ada2a7e6f7fa51194c814295fd14fa8d40db1d7ab7bd17
+a2b26d79c69d337e8c0d1683f62bda6539e85f5f46c12a418df8846760dc92784cc9bf5733261c75c3b475587228ee9c
+8b1fd7908c5a6216efb37f4a91f38fe3e8b26d464c39d3cbe751257ac103a6c90bb14cde3dd6f6c34148f0337e0e3c2a
+a3b7bd36ca319d53533eddc2c59db18e48a2a97a2aa67d130025bf780d95cdd4eb3f6d4508b56424d2dfc6f40fa4ddcc
+8bffe6ae4f0a0a7c5aa4061c088772de1488560a1108bf5f6d4e768437943753096e9dad86a44454b1a92e7d4b622013
+ab3976ba734e3a303812797ebc6692332b10c4497147bf494b1154e38cc816c63b9eb57b9a878f4e4d2f3734c43a7d13
+8661afc5b35096963e48697629ccc05d8684ca5cef96492aeb8fa1fe85daf22ef813d5c83acfc8270ce46353b10c717f
+b59fe1532944a5f280f91af49681336de40454c399f67577558ac61828a5a2d0e03c22d9815f0b70a05ebc25a55ec554
+ada663edead029d7394dde0b1e7ec6d8e3ca10c95cc29d1aba12e8648166a217345f0a35a78bd47c56a0aa3d9cd62c8f
+a49c18de620623d8be54bfee982fa5cc68717895185e70b84a824fad88689835c533260317b1f05cff4be3400a1b1528
+b8898d2fe51bc10f5aced8d1e471ab7db65a1e4a9691fcc280ee5e36ae2971e1fcaed347000e71d292d5b50543a60dc8
+86eed3fa826564a932c70b610c46763a9b030a2dc284cc728ffaceb26da7d9b48e55c95ad181ffcdbde4a8efea0dfb39
+85117f830da74c05c04794503ef928aaf26017799fe177cb81ccce47f8275ccaeb4456c0f915ac06373fb1caa2a55896
+8b3a3636ac723052025f799089cc758238ece57ccef1ee74e39df3afd0fb27b6269b88832d70e14e33eec9b6e86ff917
+913586214ebd2644ec3b4cecf68bb1671b7c2ae5d1ecee03585cdebb72d0b645fd362ed59962601e59cd15989a6b85f0
+94667f40b6138ec2989d03f078f9dea3f30ae7827127076cbc0838d1beeca36060a2eff63ca49b08e6e9b4d5bc392f58
+b9d96388b59208ba8bf6c17ca3b2e56c5fb4d9e1a3ef6f4d65e66ed1e9edc3ab938768009de32d43d9060e952e336731
+889a30f693e02b425614e4dc9698a0a178538577b48d0f617eed51c93f5f43dacde14f6599c91269faf99c73174f1437
+ae03aa684bf06aa7d32c94888963ba4e7edec683cd88ab18dfb139214dfc28f78e57cf81bea4ed5ff83b9a59d76afbab
+86dc4ef045709f7a782279fdc017f204317d5715efe3627dbe70aef9cd5fcfa241531a033ffd45685f6ab17d4332125a
+932e005ad5d73664be4826b1d854ec6b65d353477b0f06a9ffc84283d70faa7db784b5a70c971bf74bf09b6407090702
+a69744de3938b7d3d7718a49fea7d0513280473da341c0937e6d03ea98fd719ab3f86c2e4fb15b94ea127436a058657d
+864b32fa2b2f477e711069b205d4a24610d3385b67d6d0edcd0fc66098683e6b1e72b2830c4dc7384352e02fd99d604f
+87590f7d8766a2b89b653cb61b28bcc646c909a678b863a3de7c62f6630ec4afb375ffa1435cfd08d454c17a492bab1f
+96a8be6962da42788dbae496fb2534d7b1290e961cdf7b38297d67ab7551cd5aed49880b5813c9a883311d95747120b1
+acb47e5c1e65e253bd097a3a5dc17ce309026e3152acf8b84728466432e68b4f9866b33b0499a081af5049267efa5fb0
+8fa6fcd27e51cd6eb87d194347aa772357e750795b7f72d39c7b0a065e638f38857d62bf6bad07f9fb57f0ec438de855
+875e491132fb6dec8ce5f28cecc8b26d1deda689e77bc478d9049f12edfa41c420ef624db50971ed72c9701bec2f5e78
+a30ddd4525c697c04427f04ab7a6855cf12ec2c41699fd2dbe85ba282d14647a97513a7f42057dfc8a4db52b80c8463e
+b927f38a288dcad6ff839a7c3ae0c4305b2b346a04417193e67b87495c31e51c301b55c9d5f3f3c16cd521dd23ba656a
+8c1f6519ffef2dd6ee2a43579ea4b341b38f6e48838354446e75b583ece42b14050632e6340ae43ede0e6c6c5a1f1bef
+8e962fa951b2e54f421457b0168c290b31822dcd361d1cc83ac0549650b89d3055a1d9bcd7e867c477b93df50a0ea1a0
+97f4bb5324e54bcfb85096d6c73eedf5a3325cfd2e2f55fb09a26ec787795a6e46f5ea447b0a01871a836b2640cc8051
+87bac34f222eb285fae3b0683be546eea44be99f03d33831be14a9046be066ba8f82316deb63cdf2da096fdc9045ab88
+a568f8305273c8147c1b77608642c02868494293be264bcf97bf263b3d73390aa37c3c0ea2aae43f29788a639ba856aa
+b208071f8ece0d16a4bb8721d3d57b338086dcdccc979f2859975af2f87adf7b451c9b5d34c76373496ba0588f6a70e9
+b384dbde6d7bd7a47c7f0ca23b0b761a632159a270fa26cc2fcb6f2bfb64c6be0ccad780e9bce5bfca8609167abdc01f
+b35d96b383ad732c2717e5acc3e5e8162e1e1b03182da9d0eddce790dfaeaa9e909db20fa6307243fe37e10838e937b0
+a99465c3423d401c551155f3eb7edc3a431f1b3af07e9a4238f4b1434595f72b7e25869f3477b7f5f188413058bc52bb
+807b5453075c47d2bebca0f8528b4b1505eb9937db1bfa20ca663a365e10f0bb14ccc220f79a34d961cfcfd0c8d9e1be
+886d7bfd63f00e05e31e43a611733e1bd37998abd947e4819b00bdf839f3d35b45d1bc0fd96208de8e2b4510c2375ca0
+875725cc90ea1c150ed509badb4b4e1cac0e88f7310591afe2098edc27326ca9f2725cdf13fe1b4ddb2dd45f43866240
+89d578a35262bfc1439e277e0becc22772358983d79e24219e1a8f43af6382e7cd0cd86b47b3d7d1b69e7c71e386c4fa
+b6003a3346481a1798041c07b7513a099b61b076d61b33134aa7f6d22bc4788d5e62726cd151bb62f9eb9c2e6fd75293
+937a28d529b020579bd2d1169496b6db569f51e61f32da6733195339d793eca15214883ab54b26cc99406ee1ce2d311c
+afe7ddbe703dd177e7bd509c7c7bf9103d8fb793d00a56e3e89a41b3021626dd9d6537ad41e71241c3a3e819f01f3174
+809d5ad8525a65ad313f46dae056588809360528815301a9d340fd7504dd90b6984ef60b8ff0fd12b522520734885b59
+a88d6ed70af96c93b1b55b1abdf395cfa540bdd207ca86be691b32bb02f69d9665fa819946fa63fa3a6fbe45c3d9c6fc
+a9011dec7ca1942e6a55e517948ebc872d055d401fb12203a54d9670dc6f0c4d3b0b51d6ffe8b8ffb60af3db39457f3f
+aff1df03b9a9f94c3afa7147538b4bf26c3cef54038761090e5ce9bf7ee60c3579dfaa1e9f747572cf0a2cea4ca32a48
+b9466d086e9400542f7f2f4e2d403d29350f8366ac20cf587fb46faf1517b4d7c9babb6b95d8955d51b712818247fcd6
+b75cb5fab147509fcdea400f99f7f8acd23d7958fae88404092670343b614cbecadfa1ab898397592736a3b552b57fc5
+9095f8e0eee696646aabe7806a10bcd002717f4b46a43a99fad8e906ed37adccecebd1a188f7c7f3fa2f901b7f4e287a
+a5b02ab5a5656a15c189c9fb96da33df0c317a0897455c15da26d01b37cf3d5f5d974737fe114816ccf342796305db98
+9449e0b6fd4a3be1ab17d1d7b73b9d32cf011249331901f47577b14da0af474cda749ceb3e00c0e201c5af15ffb5e7d6
+8610381608500c9a9d58a15b6037a21a58a122a21324580127e6ec6679346b0b0a4e3f7d7e6d71a1d73e8a0cd1640d24
+95fcefba018ed3616525b2e62a6b63ebb61502b185f95ebacd8c289147e830970f6bec3112aff607d4530e8fa2342808
+96d4dda39123108ce629688f7b9ac23209de0344e16d908bbad9cceefd8e3898b353cdaea61f8a192ad33e77de2f24b8
+a4ac38b0cef45b33475d850f7837ebec5b5fe5ab4fddf08eff4f50e3e8efa8df4d911e5cc89f0a579c5bd332375f3b8a
+82acb1661f7b17189471d18181d748ee7be1418c71cdb2a116809cc4fd6fb3c0c83d6ff60dc93c753d78f575c08f2535
+ad4e494f020b604f77ae051da3f692dd3d00be106ffa8bcf7bc2477d4015d7f9a507cfc5fbcdf5c91e5dfbf3aaf44ccb
+8dbdcccaf1ef351a20e2b7c5c45aca8e225f662eb70ea961bad9d617139a53e57291e7c44576c5e793762fb55e593c88
+a1582a2a3550ee02c95182c94adcd028268cd5f545706ee8210d1517c505a488c6cc2ffa7adb584a73a6cd9b0aa80d84
+a4a8714f4c0c604102d27070f9dbdc3b17d2f39a0df4770f04754023177d468eda82b842bca0dbd1814a8b8a3c6b7d8f
+85f3ca5918f12f0d5c3993054ecec5c1d7af0e089ec945e18e0408411fe70ee5b7d6714639e1eb1d08a2797dc108b6f8
+8473d2ac5388d0b5ceff365a78e202f67cd9f0570211f3a871c5bf029a0f0acf202dc967028b4131497b0ef99797bea7
+801056a91608dc72fc6805c4b5fc9224c45da08645c932b64c0e3ba941f100633611314e9be6a2133d683edd44f8b127
+b42e43a23418c0e6f8a984b9bd604de29932d53a5de1e21df212c3208aa2eecaf970af489d2fedd42fe170671cd17ab3
+8e42810296b90ce0a5575a3a251b3f58647c16adab1f0ae935dc43ae69aaeac199786f6edf4448e66d449963ba2bb00c
+ac17e675d5d9895a59a80f23a9d4bb70d5f7259c5b54aa59169fc2b202d39e68c1a48212aa42e4eb177d07906e33e7ee
+93d497eba141f2204b193c60d27f455e89c8342c647a76848becd19e9cc23f108f2497653c37534dceafc868b8826679
+b277b044915b67e4fb83f6f8b5e08b3b35c89f568bad81f3b827eb60b98a9cf31b21d4b4b1cb315963e9ba49b4fc3f51
+8b52904d92b2008b1bfbaf2de6fdc50c3f5238758dcfae34b056c1bee3ae3a55e4309ca9e14ff3bbf743f7f20f99f8d5
+8244a7c6ecbbaafc70710123a01e7a6bb73c1fecf3e8b4bc620c5a5159ec6485727d9912b07d05618bad92af02c22862
+8cef71c76198875631471920778afa4063a4d05442fe0ae6910c8e4c25a3ec96c06e7b0949af658d7b6b0b3f2e836e3b
+b583b9609c6a82ac7f637c96c36e0722debaf911e44a8c3ef9a804f30480b7ac297061420cf4e34cb8f2cacf216e54b5
+aaddc69c1fb29ecaf4b4c459313849e357fe783d35c91324cbfd81d971308d738d079457deb27de6a94e656d8b62fdd7
+974ebd2c8e1fb175611fb5b73d6ed8e8e05b7f4c8ff94d1c50a4b57fedcc86b1e24867262299050fec5d66c0ee161329
+8427fbfc692100b6cb3254effce8ce20dda5da38971885d5151713f909500d3cc0c17052f0277e8449a0d69426a8d723
+a7eb20b1b868512334809025cd7e56036d2479b3addde531cfffbeb87e70d8485c4c893a085739935665b9d13af84810
+80eea8dfe4d9e35c09e997bf4bd00d6be0692adb6d02104f6dc63e9373d38f40c79e40fc8f5855c337f69470940b909e
+98db9355dee3a5f0f5dcf386dd96978945e7056185ab51cf4e4f6850fc1a8564cfacb576c6f87c2f66e65b3f272b06c5
+911fcc4f4a8409a032209957120dd1aa05ef9fb7f6ea08bf24e5faa66b3f6bcd41e00bfdaadd0e4bba82d248227d8df0
+b7b39d74f4c213548df4ad7ff01a9058411b5e195569c19a712cb5ff8dd59ab54a9414ededb39c6b86539a53a0f7fe86
+b8e3a9b5663b8c7f23536f20a9eb3ec10a20677c38575a08830e3f10e6bcef9f573783c327f6b538fc61978c2a5038ff
+ab8af9b5f085f8cacd77cc16eb3a3af699bfb2e5b5360b6b291953491cbeb2444e388a994e4433b5d6cfd6078d4d9a39
+942dd57203818d4470a751e222db37c84b384352f136e44dbe57b0a2531024e6da8aad296094c9925030a212c790ac8b
+991e874b339863930a6fd667d86cfad76781dd34c82e1d24f013a4d46a825114e0d871f92ddea1e2fdd1a050a3668c39
+a1b9d8cd9ac605e92384049a19346c2a4c87da174e9232af4612a22757cbe3feeb8f2a9f74b4ac1c2131f2fdbf81a340
+809a670228fef54c5a404f7192d1f97d520a346ceebcf401cca959ff5cdc24220a0218800346a73db0570600923b1b0f
+ab672a9c4a28e2ef70e293f0875ca602e8677419155e9ad05f584d0958769e79df92330205f4f82c5cbb537ff9e2992c
+a73022e3fd2d0a721483d021710d1cff35211edd0865e08a4ba6281341dec7513ebc63bd3c0784e4906936639098739a
+a584db708fbe97085bcc65f804abd24e405ef0bc5bb9ba52010c2b42997d600dbb9d722c73675e859dd6eb031831a132
+86412ab916967d693d4d848c32a9d8067f46f67b377b3e650644f3ed02174f6832df13e83a158fa1ade9819c1290176f
+a113d6805d4f68703bfa2e41c016e3de57ebcf65c70960911b374d95c089b0519b095c7b3ba111c4d889c100e2fd7b58
+89bc37cf8f222ccd05732f7fdd07be06c27b318216ac2aa8b3388b57a74bb326f50579aa5a3384983aba8255c67da8b5
+aa8d3a2611af168bf819fb5949f3a00233625bca8e219cc1938b6177acb9eec91ef755148c27e902346ac6a754c4b3b1
+a5881b53bb825899fad350ca223bfe4921988544a598173f905cb204c4b3f9096cd16450b676214ad6d7cfe132140f1e
+a3b49a3b2a6a2d3d5cc974ac7946b1982f5ec04c747f84dff8d07e647ffcd27fe01f1134d6fad24cdac05c4233a99394
+a4b8da831ede2922bc0a783bc593cfab21ed3b0f922d4b8d014283bd012e179ba03840095844ce269d69b2fc947163fe
+85b9b2dbc38f8c95d84157ee815570ba76affef543a7a0d172b138d4a5845a67bdeb1fb21a0d4ab41c69253694f8f91e
+89c9660e369d4c28818335b385fe4eb651c7c57ee9525917a846157feb9bc21dfa8f7d6a7fdbd0ea362ebf647c9bd620
+878bc5d2734fdc1a4d672d9503ed6a819316270fb144b44ded691a2e2cde63a4a39d21b28fd42768836f662421a34569
+8c2cb14c3b72bd865860876b5f66cf8edcbb7d1d3f6ebdddab73ee71b0a0af4d730049833cdd361d253f0e9a026be6a9
+86d5224e05e7e5c5223cfee74e4f5b7215e8e8dd6c5aa302afce59b024c27dc323a1bab342ba2956708f012753fd3dc3
+a89ab4377eb57adcd27734553a138479e1521f856a1dee153fb28b58281442a248be14a87dfef1f72ef3ea670078e817
+a583b1896969778875d804d3374abe6219eed208007cb3959e2d65e1a20884cdff6d2c5336ea88baf913b608ada4058c
+8d4e75beca15bce8bcd22b4cfbf5a38e53dedb52a47a3fce155da875e4e561ed6a9df56a4d3ca84c2f6f5b9830d7e555
+adfc0ab5af6f3d68b4bdb3a7ffd810dec77458e567deb6f4f37447c653cc943c96059022437963a95ac6d43196084b93
+aba8b3be3f4f763c195c49a5623e6657e994dbe35b605e657c2673581c4eb52bbdea4b010d77ef9f97205742a2195cbc
+87da9e343c45e21518f67941879209d1ec598b7f8f9c4d8265c0e2e8514ba8a08ae96f84797e38c1409f7021989b18d1
+888f04db1918c177aadf8ed0e24f6a7bcab555ea0c89ed911837b1da307f459de0057bb6869fc11fd8297160cafb69cb
+b5d1e1424270bf9b4dceb3b87e591ad54bcbbe879306fada0cdf486e0edb22fb1e98dc827dbcce67d450cb0546df8316
+8aa0fd06946cc152718c66eb76f724e1782d047b1fab1706a3418ac0903676b6f73e5d64e1c4d013d29e552e9ee78ba2
+aec561ddceacf45f114a9e23bde9eb4cfe3fd7473de39238d84dc9632174fbc369408b2b17ef852d6d16472d42c24c91
+abb378b46dcbbf745b3cec2653fad529431c6dd5b120dc441b309bb7aa5a7bedbd20c60f9ed3f54ab42d2af72c2f753a
+9721f1ed94bbad718c8e61ab0fc743186ac38e35b76874e3324b888142e9f3024867d8a289a50aede7948de55907f58e
+adb2ec1dad7f8c056b314732b2e5511ff7173a050db22302b64b3d599f7add70946afdf46bd2b1815fc6b490603ab792
+b2f016d3b6fc024c2fc6333efd99e2c4707b1560f73f5f243f5fca5cc7c36faa99491515835de1bc2b4f3e00275717f1
+b99aa14bd756c42ec3785e99f09a589d3ada0dcb8de12a2d3b3803d691ad0e4e513fd4f58cefc0f762e20fdaa2cca3c7
+a5be04f7c022f899d1cdcc3ab5f932bab08f7550f967f386b5e2f473ed0c72cce0054042bfe4f6a22a6c20fed99515b1
+a1cf9c3c63ed317f9f638524d20dfaf957d5cbf338cf1d788252f75276fbe5459d055e13439c2a4412a1bbbffd43e0d1
+a748076793f96602b44d22d3ba80c04c3dc931a1813ce80c079118a455095b45294443c3caf236c0c7c301a0afd34c72
+8e02227b6ca28c1a7f1dc4ca55736f840be6455916a87b23f60a516bd096f254eff56a76d0c4d7ced26b13ab11368b43
+8e2975b903a98e0422637b8fc673c7c2012d56674816f274cbde238ea662ff2c729ae8c56cf95a17955833c82aa1da41
+a6b11eb5d8bf4d5f0b5aa4acef26a99e0aae01513d176edc70bf83f12af59fb5ba4c91c4b49bca8436d5b3847ada5e52
+a143b73aec5f1d48bb14d05e562964decb7293365fe93d99f0f71ec1b2636214c0091e96045efc9459a07e20e8398815
+a70cbeb9352452c91af2b0f3429d609e74dd2521982ab15b8a2b706b285a68805003929400042c233ee30b52471ba28b
+a747364b5cf81fa96980b865c73ce37a838d0a482d679db81dd0772c0f56d1c8f349a6c3ded476bad047dda179806d6a
+98e512dbd622bc6f2371ee73f6e74eaf0363d691bb7e0eb90f959856d6416eaffc2cdd1fe86d3cb22fc6a5a9b6508329
+945dface256b8dbef8ca45d258015f7ff126ea07d0ac960120a89c3ca188f5dbc8e336ddf6826605235866901ddff27f
+83d685302ad35527bf3c14f02d174ed25b1b48332fc26dd89ac924d4f598061e505033b7243a9316f3753f9f56d0fe1a
+b361bbf4144fb0e28b5ed08c9ee8c401758ba87198568e641ec1053742972c6095855c1388da0a467d0556cc7de20f4b
+b8b854dab7e5019ebbfe3e29104e2e1683a7c1877a4e01b5af31f156f903f6978dc1f2706f7b5026e40c01cfa1d368dc
+97f5b1e10f1fa40853799a87d12736ea85684585f7b605d0a6747c18b14c1e88fba135fe3d609219672de0076ab68e25
+839dd856dfe805de853bf4bf47d49af77aee5ba52deb627cd99047aafc4eae99284909c151ff6b8f87241c40e006a230
+adaca5f9b03a2a6ee24832ab2319a1441b163748185ca27fa2011f49050469ae79bd293b9700df0a9f7b074f428249f0
+8e08261dd36038e7f0b4563271373fe8f53a7e9cca82ee79ce8419bd1deebbf14b2a11b9b5333d9d7c03f4f3e47592e6
+81f72716c0b548cb503961963d1ee26469fb034c50715ac9394eee3162047fb5895d481f5ffb8e702bf81f7b1bda3694
+85c183f914d4e0e04402313fdbc2c9865ed9f33919a72b2664bce7fc6ab61454e6b54fd911e71fefe2d84e436f3cc514
+94e786a9b365ba9087f6b5165abbcd32c89a79d806ad3cb744847a8dbc3a6d06aa04e99bda162365c6393af4d62b80d7
+a706a51f3f31ad5ccc72dfa1280e576f95da3d6ad3146ec78a88461609b87a67f5d7769eacf23c41fb44c122f8829db8
+8461bd7681f454d60f5497b46d80c37c6aab5e80ee16ccf04a147025ebcd28f79dc6458ca40accbf26e22f6b5bad0d62
+8e7b57331dd6fce02b7d7ace7c22ba59282fc124f3e88f645397ead0dc23fcd95838a10d5bb95b037c660f806ad771ee
+b3ff7867a6c664cb34a3439a6e461d60f074e794ab3ee924032eb6f337b145c4bb8bde6977dee7b950562280a154ba43
+96ca48889c44c3f849a753afd8c4a1624b77ea28b5a87ae1924934f63da96c9fd1e4129805a0b19dd7e46736ad0c86a8
+a9f3d34ecb583cda425ad5e411fdde0d3a6ecaa4e35b3a3cafec29d7149c874b4b1410a6663b45937adefd774eaeba23
+b18c894224bab005e614e6c9d318e04c9088560642ce22b7697494beefdf82c4319ca0550fbbf30ba8e8e5fe19e2b4c2
+83c6ee85abe70d89416aa89e0ddc5b5c8907d67945e09c87c673c7aa6b7fa5d67287001fc77f5dab2cbd96b96650810f
+98574d68f754d640c4cecdb102dea0454d01ccebf23b75c037f38d3bc4e1b9d53c0f190ddd23258e5f81ecc9d637c84d
+a1ae3d5cd807b8987b1b48a449f6e4f470d0ef4c77b1932239657caa11be1aaeacc91a19ef0e4343c00cf690c0c67365
+b6ba6c4ab444a15eca9e8087d58e376646bc1472e94351722a502413ab19fccc1673c0b51d99e4cd80d217c17f8e15c7
+85d6917e78622be31c8d69f265b7e25161e8706975109b1223bbd7057b3c1040c898c6997993eb1a0947cae7a0b42cec
+ae16bcc66ba753ccdc6acdd5caf4779128ad9ae9f688b95f708bf7ab4a57083954908647bbee016d621266c0cf1d153d
+80edda09ca9ae6bd29b25ab642952dff5e76b5680e38940ac8d68a9476975a52723e7e35c38760f8a75b552584ba24b2
+8299925f517bae8e818499eaafac4ef035f7fbfa4c01eed4381c4daa3f2cd3a8e34ab41c741f81c8a18c62218c1ff22a
+939860c3da499a58a2c15783c88c0956b6c1d65613ae56f8281cfea571cc031bd6edc0f2b995d5aa8b8688786d8968d5
+8f22731c310fd000040cc11b825c911ebe8d2fe51016b7950f380cada1c448476afe8dad8fe653f7293dd4a16e300231
+920a733fb80634409cd15707d16af616216a4e06faf598c83c208efa5e0c50e67fada5ce40b1d20bf97ea8b90981e964
+ab82de22219c63126059d47d9f14a0ba9a600a1cb9946df0d536dbafa819333b5e82e202f4a9218f8d631c28469e4546
+95e4b4cc8ef1a6e551791833ebb63cfb50dfb4c7d5b7781e765f2accb2a5d7243b61a457a3d6cf6517f3548dfc5e599c
+927020bdfee591b6aff3b8d004a9ab80f0ca477a7ffe79df7bfd70342bfd05675130d8dbaa90cbdb0ac3f77599d03f81
+a49c81688bbf42be01d63fef035f4b30a687c417b1b9af4fb698014a667892da41b09eb469838b94dc0337f7fb244f7f
+b02640055a63480991820136a96343f3345bf4d748c784b6b9deb17ac0006e86ce0c91c3f8457396c2376491a2b5e75b
+95b471d0e32861a4684f1b2081e7984ccc8405868a461cbfad6e82779f93c1573f99177acefad1dd2cab366fdb21067e
+a72018b32aa3be2a319c2c465650d1884a5b101564532c665730023c8da6988d5608173dbd8dfd7046104ae8d7c7f2d3
+ac826c1cb3212be114bb0ded92bca0339b3452751b16a50d7173990862acc120193d3eef0249064be49b5835dca3a0ec
+a4dcf1b3c7909b0218b3046087f1427fb9b4f86183fe4b7eae81e907c9ebadcbbccd7625bce3e55cb7366f9bbb4c71f2
+8abf5a881ac9fbfa5e4bf60b84ff489a202a12f00d7776c4d365c34c152ef1b7d0a7a843183d8440454d4e5bdb9c2be3
+b3abeb78b0799e1d2bf3ad52dbacf49a9a678efdbe98ff0e8050f5573f6b1a52ad5c2757bc71dc1435fcca5a7c19496d
+95e0df552c6b4f1b9daaecf7608597255daf06cad9fc63383fb23de8989470ad9e963257d71fe2ee25f611d718dc1510
+aa980ad9830aa0ed3a149cf9049ac289252752030b900eda146e2c626ee15940fe2fe0ef7e894304cee646ed8616921b
+8248d312f2c662a5045e4c6b2c9c62b7ed094ffcaad94a680695c7bd7b032cc7f5cf088225225dde5ec0abafcbf932d6
+89eacaba980395c2e758a9dcc1014b13ac5ffb7c1dd435111bf92746af31e0ae1e2bf8e63234fa54fb97e96927f8d65c
+b775e27d4dde51482e3018279ec1b3c9100051fe9a0196d7cb2e5c31a599dc4cf55f5c51f54980f5814c67f57fcf4b0a
+b08278df723c1545121d1bb04b315607f89d3df8aa516ea6f0fa7668804480724c6695501cd725014290749ae4b909df
+827e14e2dd39e8bb3f602c3380f7737826c15588c6449dfd327822869377195e1f928a39af1ac5c3a86225622c1c0310
+82201faa981112390a8068e40114b22b64614ff42f95de48a301c480e579fe459d73f86739e2b27ef2a1c5dceb71075b
+843081b78ee2e394745b8c811190971dd5b21f5750e73077d31275850df4c1f48807fc4843d5bf4eb17233375babe2fe
+b7cc7bbf4f727dc060c433086b7d20b77c47c2b42a7ec10183c30938260a68142d9b3b5dacbc4dae4d1ec24f0bba8fbc
+b9f143a68ca5ad8c9c9dce39bec5d102911726d0b6a865a99f89ea4907d6dc06a36d2b054ac6385b2390087604dddd4f
+864c7a48f0713b69b49cef5ae12907590e42b3ad45be0408af6a466c6321d70bb9cd52d17519f06d435019107f704ec1
+b2ac2f1b5c4107a6c118900e98da6f825470a9dab5ddcc53383da55de4e125f13c56d6f9c191511efb2656725dbf09e1
+a02bb8b66fb18256e63d21f380336b87476756678a77241e254c53f962306d42e5bbc5cfaf7b02641644e88c5299c749
+814668631735ea6b2316eb034d04012c4ac6af2688c2ba0fa77055e7b2e9c538fa34058ae855787c127d002637a9514a
+b4841bc20f52369c9dbbb2a3297c747028f1f2d171d3c93f9590f8e8d0a89a78e2d1475b062f0ab74ce9dec23df18ce3
+9745bfa428294789fceb813ec0eba525295ee07b8a112ad14f834bd641089764a8ac5f820225b7623febe5cf7478e035
+ada617e5431027447d7a132234c1612d7237597bfa54d0cdc3c733a028b319e6828cabad531dc2e94115b7a3a1b571b1
+93ab735b634bdb94ea1d2e1e3760d343ca3e76c045fc9c98a3dd024da74c39bd21cf45815fb63186f6fa1319f62d1d0c
+964371421fed0ddd236c3fb639c4156528fd8bd3adcaaa0a5f9121926df6774ac9a33a44d5a4b60d723787963624c968
+91868d72011cc336d15fdefc26cae88103d5df796194dd1a0f9bee4afccc9958b102ebbad068501663fc94ca7a9f220c
+98134a70e43ef446493d59de3075a2194012d8f937833f208741ee91fc1562510aea52d99e273415ed3e77d65d6bcf62
+91f2739db9daf2ef68e61b135ea28668fdf4045d3014635a3d13aaa507876c1cd32d8f373b45d00491958a34d9e4ea96
+8ab25a2011bb5b02ea30748d7b90644b4b219baf97ee9dd6b58e6f3008c719a32004f83fb03be7e5ec66eb42ffa0ef80
+86c11d9bc416278036f449d7c69a328075be3bc5eb40606d45d41878cbd5815e54110c04782c7ff11c67e4b710ea07f1
+8d55ae41430af753f5473be4c329cc3ee579d59db760ee0c3bbaa2afa27f663a2f7ab9d5f49123020733a35bc79af5e6
+a31c238ed9aa5d35584f26b18dc36fba97aa053dc0e013dc9fb1d854ce9824f144fbd6f8eb47459b41b94f2d0353245b
+b2decb6e70411ee344b1c5c034a82e38a7d7b5039386ab8922b13da9674575139529d7c09a9c7305e0c69452aacfc49a
+b546e794b5e49dc0525a1eb86a83166f38313edb6200f3245b1bbc8fee707fa581679495e877a25f6378db7f3be7a93b
+972332197ef689bc9f55c22c53f4031147a50ede7f8e5b22defe5f827ee364213a740bc179c21ef281f4cd0c3bfe7530
+b3fcea592a9d6c993ff50832a872c7c26bf28f3a6e1fb51a03d31551f3a52c3059687a2367df7d1001c0405ad733fa0a
+8ec187bfcb70e2f6e82c1d9ef383e8ceda53a0a56652df2063fd7c0c03937d5dfcefb906f88f5b7d4c8a632c26182ca0
+94ea8734e2e3632c081680be7a46a7249f29357a558741021c9c57664eba21eaed03bcca1ffd601e11b04b1853ba3539
+8e1d5e9cb763ede4db8deb900702ac3da78c889af4e5fc67bf475f835d2a63ea97e5066444ca2aa4160c45a99202a585
+adb9a0ec32302a6bee76947c75112be44ec670e4e11e50af0441229afcb0d4fbd51ce2b124477c3b5663340e5ed6263a
+af325eede54e8a8276fa532d7a7c555672e219ef5eeb7e4000699201e8e65e116ae684bf3749a9722895c345ccd07ea9
+96a71210b0bd0b8f67d320463763b0ad8891fd6b408bdb94b94199d0f1764e82bff6189aad1d58a94ab0557f4cff38fe
+b6308b51474c93c075c8884d8e98a018ac6c84206f1675b519b42eccf451680b307fd930736a77b9d84876e762495768
+9651505e3092ee8ac931f41a5e8c16082cd923a64e2994b0c86de6c2b27e71661667ca38674b3bd8fc27778558cb9faa
+8dbf231801de8062d03c048deaf6fe2ed3519e0508280d1f5a84939df66f87d728e9a649bd9a9e40f67f73f1ef6bf3d1
+b0cac85a8aad5db95263876de2284b04088eb86eaa05d44f7719171ae3081ac11beb3057f8fade8b36af2766070adc80
+96ee67e8e8d5b465fdb3b5f47b307693361af0ecba5f28292a09e1a84a6e013a3fe10902306554becb0d8cafdf5cf16c
+88761bad99aeb9fa1e482158c6187c94b0aa9c060cc184ffeadcf566a8600a506bc337b46e361876d9510d54d1cfbf58
+9452ec5c63e15e26a05a553a1b846d6837c37aefd4cc0fc11c797c8505e2a9545b71565dc5645dc0ebc8586aacd4eeff
+ace8ea72f281ffb82604b19881626aee7a4d06dd0150befb60915efb566716cc725243c16d8e0ccecf84789d69e9320c
+83be6702adb341ec17439b7dadb70125f1c2a2fc344076241ffca3cabe10c6ee6b1e356a04f9f153413060ac97bc8f07
+b27b231f577727f33b527d6fc2c890cfebb58093174e04fa500f344bc0786898478977ce0a35fb758dc4385542551792
+97aae28188a02a7b336d0ed5ca20b0ae629c8c7cee95176ca70682b39df0ce947d1f1e0004446a7441063757725006e0
+a57dc495f413e61d9eceeb6ef794376b12dedd1d59b8da59b0ca849233a02c45a75c2eb250cb09f75f0587d082e0f099
+97ec10a5fe330fd3f0f4e57c978aef88a4d6535ca8c9074eb1d3af87593cd9180375906eae1c6f2fb7b9fee4b1fef436
+a50ce5b516c5eb6705f90c3bf820305a7dcbe9ca3799eb5656d5ad7039461b5ceb4d6f8bdbbb09a6c8985b728c38b8d8
+ab6e8c25440e4b95c173e3d775256a7e3ea559169782520a8ffd3e5cbba03d5ea72e97ccb9b98fc72a50c67f0719e5a2
+82ebfd3d95ae27d57370142e45ce43ac88a0fe09b5d9dfa6471e480571a971af69cecd94569b2eddff0799b87e2ebf9e
+80a38eead9c3ee45ce16ed44d5d56845b238c152574b7eef0db1d4fa06d1480686d9e909369552d603616f7e5dfd05cd
+90c1aff5b6bd05f0bd4f2f9de46a7c602241f1f14d9308a7ee1c04b1da25ccbf60e25471ba073a474de47be3e36ff43b
+8560512ffd589a00fdd05f7e141bf9122248d1c09a4c1310a09186ad1bc8e25491845274ff7202370e6f1eab9192bc80
+975cf601c767c9cb9e03d2a70b03b3d0e80244ecd748b38dbd408535edf4e643582fed2bf6f5310f8c9077c2041f81b5
+967959b9eb843cca99d6eb1ed3efb3c66fa0ff8a1c118cd5fa4378df645e85cbb9992ba815c31ef605405cc35ea69948
+91af4d2a1241b7f97eb72cd13516288224405c9c8fa4cbee5a8b77d14df62df799291d87887570fba1484e461c14b7c4
+b76b7ba24913f43b61d48ac2be068f85a6473bafcd4d66bd8ad9412b443888b2ac9786c209de253a922c10741c9ffffb
+ad51232fd771d1b76b6d43eeb64fe56d54664638720bd78c9ca5af2a6280153a83163f945f4c717f40c145ead1e10b59
+b7680ee2a6e3ce950fc6d4a4194cf82a0796dae7d144a0118f54c150dbfa0d8018490edfa36d72d62afa2f579f1db96f
+86f9168c5e9ac513a32d392d74acb951007090946cb834145c56a5eafaf587863d5f90bba429b428564cdd7179884377
+b21d00fbe4b0fe7b38444a40eff53df998d44dbba3c43ff3be30e553be2cd671c4f01d3d89231c460601b1be65bb3805
+b89c65d5886078d5653796790804afd6d18351c35d349331aec70cb9316fbbe81c9a7aac60b42c0da30bcbe394ab6aab
+a159953bd7fbfa5f1648d066b778a4c367644a4234784d4e898243c5f5db6817e758230d7be3b8f5defbc6f042a03400
+a2a04948452af186f41aa933d45180fe4694850e12b96c634c246960c0d1972032b4d8a115b10f495293542e10391032
+9733b372d2cbc04ef576e97c16c1545fe508811fc5b0267b01269e0c6d549ba610fcbc37193555a8838602e178414ab0
+a9bff69df0bb98d9ff6fdb659bc695bc8a96ac69ee871ddf4b8fbd646ce59847d9120c45d230ce97527b4457d2eaa844
+ae1973038d72171feefa8d59c25733c8067d3319b125f913a3b51d1fda203840fcb69342577571967fabcbede4954767
+a53a91e242569ce81abbaca5f6275284d208f03f628de99328d6ad2aa90b879f70288f54002cb12af2b374a99d4471bd
+aae34146afc355bb2b1e0ae29ca5bf1d00d6ce049bd29f32c37beae89bd23c38f037d0ad18f551d690c53c0892152ad5
+ab068a2b10eed57944c4ecd616034064beae9e82a1016ff3bc88ce565bb41067da5750584bb16c7bdeed9928572e6f7d
+a2b6c8441f4359a0b8f76eddf70695720566716b5c0680674e23eaaeb44d2a92cf9cdc892b1de18acd963359c10f08f3
+b75bcece73cf8b4b26028be9bdc36e242da8c8acdc7d94f2db64474dde770cfcd6e02f7450f47f43a6093e9c3cb0b4a8
+8bc131b08248bee7db453206bfbdea4de356dfc7a474de1266b0bd0ed692efd319a96fa362955f5dda2afe3dea7c39d8
+a066e3e41dd80961d6662877e0b70e750eb1b26512c55834be391d4a666ae5e1a9789537a0cc88d0e43e49565834a3a5
+a805141eddf3bb474159905de6139d68c67d8fdf070bdfb4d819eb76e86801019dbd30670c878f89cb74a966a51989ff
+962a9520048360c761180c386b2bc857bb30b38546c24f8ca5162aafff7c4d47deb90852fd2b0b280cc9157cff747e66
+8fdca12bcb7ad173e412ae5ad7edfb0bf1ab9c887f648717c26293a9d47b600458fd1f39eb82d1c403daf455b801b6d1
+ad57b4e52cfda70d178fd641717184d88b48ac96f2bb30f7f964ab44e173dbc5f9fd732b3cc292f7a33559aa512deb93
+b9871bc77623c5cae3eaa36abe65b44fe63dd3466084a263e7e14a9ff72a17e55383eb1afc06ea493d77021c1de45437
+ac1a94a0eabfc05958a3532c4935d93dcb4ae5ae5ed40a5afe9e3103f15ef5d499c61d76bba8acc224b6f0c38af0387e
+aaae28b61a109dee16b3c3fe58a81d803d2edeb1808ae49abae1849cc0f9bf14ed3227357b71a6f3c90e6e75abe8db1c
+a85d7dd3fd1bc1339a0c5e4b1da73f02c21313240dc04248c59ccd8427d4271ed998d89d42c84d367aeb7b82260a2388
+a6ffa50a5fdd99fac785a76004718102dee20fbf026864cf8ff6164547b94d3024e03b4b2bfa4072e61d3a8415b2beb1
+b930b90aff70417a63e8da0516c426bdd235cde16e54f64dd50feea86925499b4e146d56f0adbf3380ea4d27b3ff882f
+96bf13d7c897b3d6ee931e35fe515e613cd61a5ca3ef6c5cad49cf13bfce673b3c89fad4c29f35a2a1eb4f881d48c022
+9711c6439154321ea9853fe8af894c41edf9563bbc2693909347ff4578d281f71fbcc29ec1638c35cc1d74755ebc4855
+b7cecf450348f98e6ec472b7b9e5b627c1bcb438e506d93c7cf9d5d27adae8fc026702df0c6f904a85de99a16526d330
+858ae411c47df1211b4ccb2de5324cc57a9c9fdb6ffe6b6adfbb601f66df1de423c4fde3ebe6ef420e7abdb2fa4376ad
+b142e5768667ca28f357d46f3fbaf2022d35775d463f216ffd3ec246db4611055fa83bc42b39728b1e3bb4b950066a36
+85572b1f205e31fd04188603ff240fbe613f2744cdb03d881f283d4b4d4efa152ead22d6a3f0bda58921626d5190ff9c
+93a72f016f83139dd0ca9ef654887da9e7c67a4680bfec9376578b7a31d0012cae252546cbeb54639555fdd641fe4951
+ae86940a25be8a6c9e24887cecdfd492dbdf86a4b127b66c6c3966b2f4c151611afc1a78db810e7f787844df32863e13
+85bf4c85a21b87d25aca182abbeecc99dda23dd5c6568aefb20846ab0af6b464c5da72b9ee655209069686b476230b98
+8544918a9250f0ebb3639d0ea917920ad888ae3ba8daa8b4f94091cdc7f0724f8dd443b51021832fa9ef8d1443a2c29d
+8007f7c605692effd7cacc83b2254ea8fe9342b2aa47d271166cdfff54355b2f82e9f298ad37c42d64ac8ceacb83105e
+8d5fce5180a2c657854a6691c2ce65a6ae50da43c670dea6f12f2f1685f2d4a25734cdf4930151088ad64af806ff15f6
+95fbba182f8d3c154d66103f064cdda5743bef90bfbf534fba2df675dc05af4c2ed9e8caea217b0b3eecae699d1e0499
+a88719f38396b39320a92f97e145412069950afa1c8ec276816b010f709e05a43c7f3ec560b3d24adfde9a1f94f22043
+9895f350ccccf4c8f9bceb58a10270fbfe5e1b78e54902e94cca7e29b233c9caf7e9af17822d64125390d4576f044522
+a2d958bcfd99b62181304b84be177d9be42cf36e522519180e6c2ac9ddf6c02f2fa70234be50bc5dafce1fd348330031
+b924e346f9d13e1f9ac12676118104f88afc79d5888ed27dc741d27d37be30639f37cdb67a7722faf5913e44643cd0de
+b8be5078e38ac3b84cc8070a0a08adc3877ccbfb18058b79997fcb644c4b1b9f83463cd88dda3cddbaac549046c081de
+a97551e3872000e77b158d2e670bba1575d487af850a5192e73e5f93cb7f647c4c38f24911b0ae700770bc08b65f3e04
+93a8831f690e7263d39785bb1a8f0cda144079acd21434e8e40b4e84d6af1bf6adcec0f07623be8ba100bac7b0f880ee
+95aeb3d8e7005d820f3bb2ff4a88bf88d69f5d3a189db2355091c2db414e29dff3f8ce14587684ade9321807a0caeb3d
+a630df8b1bbb095339d8abdda46f7184ceb0ed09f0e75124bfbd3056ce4b40bf0856564b68a5a72e2f752ad5a6530cf6
+af4a873472c65befead228268b6b7e5f0604ff192ab3d509d74cfc231c9f3c2c0d8bfcda9c02e1c6aba2f3318769547c
+90e4d7dc4e03c549eeffa936de2f71dae77be9f2025ea8a72439562ccbdd1f3e6c146d90c3dab8525f1c2c4e130c8e84
+ac76112e97b2150d0edf5e7c7980aefd930e1830de6c6afca9a05a9d9e8bf15736b6931c930731d197d70f1936ac403d
+83958275157d1ba327e214a0648b42dca7094407bd480719bd87c0068af2409f558e725d46e6ff923d63a9fdf60f46a7
+8cdc2feee0f641dd4533ababc7adb4a4a7fb0e345a2821008a5f0cca5193df692f4c28760638c791293977e2ec847dd3
+92544dd0ee6c5aa43f0f4f9819b2e98924ca8b62363fdd2fba274c1315899fffdd168a42b46bd49cafce739ec6480898
+84f5b6af997e0d21e42b67fa442896cbb6cb311f4d20e349beb0746dac9331488e269b2a6a8f47fec11682bc3f6d865e
+89ec8b3d7b69de8cf8de9ea688f74b6bab6bf50cbba9fdb9df5e5c8b7a0fe3b5cce963754dc2619f1177a4751e3a92bc
+8e5607265c811019e9bf9860ef85dbae80c5a88e5dd59190fab116a2d39030656d405d5d45ef26a7ee69263b642fce00
+840c10d3ef360b66bac041828965726209f2edd67350b1b87ea40fa233336188816dd356a96c16a400bb7264184ecfe0
+aa692abd6ea3c1233acfb967d303c0ff4dbf06040f9f4125569c926a5b2023fee38e6be5c3d903f8b89d1fc5da0c5123
+895f8d6894852f581e58a1d3a38d441b2e09229196be6a0485bb05d4df819652218ec7633bdf72b40b118265a9a86d65
+87d0a49828809f004164bf763dc57a3d53736da639054bb246ead524bbbc756b3b54b8aa123536bbfbd60cdd6daa368d
+abbb9231831189aca4c97f2a7282c5152648002e500e5f489bee3fd20e70c9849aa9e580b924074b15566d698a316970
+82a8b321717ec28d78f37a85f2de33826b186fe8ea6952dd998e5c01d5ce43ce6f88de5d6beb04e8830dbd716fee95e3
+b2f28b28080627914071a05bd6e088f39766a1b6fb3d34e4eb8f8ad0ec4f72bee4341a391a378fe8be63746c17a7dc94
+a233eaba4f0a5165952838d280f68bea5a9bc41eeaa6abd074a17a1b21a946f98ab16f27d1e9f0610ba93533cd390170
+8a675908bb89daca05499a19197f222ca78025f0e6d248522e6a499c4858e6a5a8435aa0cabf6a88bb7043f9cef71e08
+b9c205fae160e28ace81bc9d3340f8af7f6350eab78d1f846bb563f8bc6dc8a2f60db4f3c83a64f55b5dda5a5bfe34ec
+b1fbc0a92ca6eae5fe919b27b52127eea3402bde2c3aadc981779e56e7f69aa85fe629f8693220d2f1e5c21fc0eb89f7
+80c79ebe23abc587c7ecfe700cfd6350ca8732e1f8e10942cf82f8cb9579d4438cc08168dce7a0df4405b4fbde47e077
+a9db69149199e6677d26ba780ec0ebf19a95d696dd88774d26e56f1ca7e579894d06a04e831923cbaed3d96e0f513c7c
+9235c8890e2d38fcc1e742993508e08397c2299503409aaeb96f83f805794c9e4baae8475c05b23d75c0434e15fa27ce
+82a89dd908ad63a1c3c1f102f06d94c57da7e9cd00251488842ea78102717b074bbc2f3c8269fa84b88e0d6527277af7
+a29d27a66a29441070c7abdc8fe5ba7a4bb1f86fef7b13807ddd8c575906f7e9e37d68dd8fa0926409d4a69eab3ca49e
+a76f20910708b939a5118833acbc9d406e4511e52340a3e542fc90486fa6f8a3cbad0672236aafa5095aed5728a0d4d9
+91bb8d3a58c7ecb8f79667fe79f888536730501a1986c012d358664620b44d4d88f76b3b7fc13ae03c69991d8bb9586a
+91f0ce478b207f5eb3afd2997861bc6ed3337f3baeaf06c065bb9ea18ba02b88afb417712d016cc1ebdcfd71d1559bfb
+8ff40891880e6c244164557a5fbfe5cf2e1668ff1135dbab2700f73bfcbce674a91718a9a10a00943845eee2960a2449
+8229fade9a4c778ec3faf66483ad09b6a22163f9db2bfa524842ddacc1e9d86f30a280f85f3e2e5d114aced05df03fad
+b760a8cc07984aab476f4821f1852df82b8c323ec69fe6ba58a3ff299412164d5ed4321c13bcf4d037660ca6a2eeec8e
+abb3f972e3d66fc83102f3d3ce5d9149e26428e2efbdfcf4ab706fed6dc191a4236536ecf7fd0f2ba5b117c63635ab8b
+871eab5cd68e6210483a92dae308efa65c34722863f7645725682755f06567132a85ea121cb360f4d3daa7ae5c79779f
+a3d3105c7892c5e37ab9885696483c2a9e21ae2543a1254763cda7843c9d911b34b40524701fa3dfd58798cdb5443706
+b7f04dec6ac8d4fd574633d1234b0e11dc79e84931c9feb88955b946e66f002b05fd368b839816d29d20739db079de48
+985265df8f1ccf16df6eb3ceddaf1cdeb708ad8195f213f6cd90cd8d6b434ed934b2a11a0dc7d881c788a3c3f39661e4
+aef74659cd7fe399ada47f7e891f3671c03525648a1ac9881e862afb4d6b0d3e2b019ed407845b99b96be58192921d25
+8df7e13253bef2a14b0f2562c758383deadb25323e048586c0ea73227798f4da01fc1b344a04ca7fa9bf37bbb7e7dc7d
+83548a03a65ec441c4752bcfec5676651dde5a93dfa5c79d7bf36bd5590afef2a423cc689a5058da20e25996b4c7bef0
+9069788c6ccaec6900644352337c54493212e9dd6c7d8439828fd9f6f7bd72e3bf418bc8d077fef398cd3136059a0293
+80874240efd3bf0b6e16a1755f8a8c194955f32e1f8d842af597293ff0189ff5f2993bbea01ce3dab17335374e4f82dc
+82976e21360d62e5bab7cdb6880a5c0b232cf16d267eadd8f5abad9c1eb72afbed8708cb4070ed3e26653e4015888cba
+a905fdfb61ecbadb5973e19f5e4de0fcc95b67e0fbbdbf93e44b63e97dd187b9d40dbf16696eeb05f9a2913c1f05b379
+862a6058a82e9739fae91d056f6cbd4424d3961986c328418896abebef7c34c17b5d7f8fd764075d26901169ee332d36
+af599034da083c34d8d9dbedc2bb935b9ae1ea3c12bb530fdf4eeef4eca9362856451f85c034a759fef4d509ece3af89
+80f645328b7127f2a87064b3c2e17b03bbb9f2b847c2b5e293e10c394bee8ecdaa1d410f3d91dcf2857589101529acf5
+a46cb8e80f38ecb0572eeba9ca3a729cc2e3c18aec7b0120f80352345329541690fafd5a7c829de841c1ae2f99545fd4
+8614aff88db1109e62341e34464b88e3d48ab0ade15d8f28e798c86d2ab8daf2d4102f92bf16d753dbfed160a6abb166
+a6b8fac54762a0fa32c3962731db1d4003dc37c2a3c281f86d073001a028acfdcc1038452fe18f7899e9aca6eee24218
+b5ff71d36c9d05f2ad9a3650b3cf8790f3fd37f8b822648d443234155033ef2a36b194daf12438a9c140ca39a24bdc9e
+a90c7c1c494deac27b9a5c7f1a4f094d05c560611e4f52d8449c5bbb4740f5c0032f36777ef751298de8995c6d96fac9
+b916572ee1b3e60c5293b2dcd31c7d22e09e005635cd858504e00238ff76d33330742f25febe0e81c8fae06d58a8c044
+aebbf9858c51349c4e6f8bc58361d84db7e4b4f68d160646a5eaafd2b30d2bc37e33c5c8f6f4f30ceca07d4defc4b4db
+a63858c60bdf3e84caa70787a4a1f263125e5677af9e00a51caa094cb653e62ba144a6f00dce4d6b4411c2a68ab8a389
+ae0500de653c64f3c95d070117fdf2038207af58fcf8f1e977edd4e55efcd81d8e6e6d42c537f25861d3aee2add1028d
+af550db81d086ba51560421f73ada3dbc187c55d7b9cd9d9a82d808cfddc0c3dc4769cd33a4a1a0898ef3972a11d0c38
+8fdcabffa49420cc665d1125aa44bd3ff221a78d5336467f58ee2f867d5132ac32c9527cc0c1da1d2e46f15b929bd658
+99a7479d6b9d4bab39c3bfaa95ff57b5312109c35660a76c89552d8693c9958c08e3ea7183832c831394b4cec8b609a6
+8e41800a484162826d3ddbafacf62b6332df04a3699adb2426b6540c10da2cf0f4e48eac0aff628ff845d7b73af33050
+a2e3d21c8b6097b3e81faa0904654f64123b8c1394ad2f79b94eb0764866843171ebf0f7c75b3a5671f665f0bd162b52
+a4ae60b19ce4cfb73ed515b06a2067c30ce7cc9c741d46b64d6d78c34e95bfc6fe28ceb69e109fc6031cb9a786407e3c
+8f4c4e7ee70d2cb70b9a1bebb1299fbed26a3bd42da3ac5a859924edc3d67eab05f5c8c945c65e4040a63c6b440c1832
+af8e5f12ac7687a55c003bb259fd03a20323662680960ef36778152fdc7a5c972a34ad6ddcfcb056c3cd737f6e917dd0
+ac0bef27e89aab1026316e95d01d251df5f51c3aab3878d85e242786c851ffb1c20b47615571d825aa13da52c6e04167
+a6cc7c4b7e8c61dcae72c503465d53f707fcf0ab464cd88643476685409815b81009720af4837b07efc49e125320782f
+a387370ace1d3318324bd6e7f39c458cba2d9ec9237532d4e1b307f305e419ca976fc8136f02b496ffd373b91d27f826
+a2edf48503b77b9f7c2e3aaf53cb2fc55d78d9a5b967ee7195ce55fddc92defae7833a1f3e2f4eeec287a8ef5dae5b7b
+b8b9a735b2f4feda7fe78cd81531213ff0117d71cfc75693cfe39f10827c7f59fcdcb27586c517fb49d25e5c4aab4a19
+ab3fff53a4e5de48e46125389c3a6b4b75a4998c62d11f5352a9b5c096547a1c309e6940222e95f4f63e46402b08b1c5
+9510675e0db61be931abb8361274dbfc8c45487385d21faa632b50866997f194e29ed6143eed5028b04dc301fc75b7a2
+b47d23450d55c242f5228d0cab08ba0d1df65640c2208f71ac960926cda573c83ab5e8732ac82b967474403028bb1c1c
+83ea07fc8b4a5637f8b141237a6164c1b3b853bfe05a7dc01e76825375882a6a0c57646a0f101e58f7001e4259d7b65d
+8fedc52a5e7716c2920cd3350018ed430caecd1776393edb1261f73c762943190c06d89023b935c643de23941ad710a3
+a7e3046e9ec4a16c9e82d02c5bb5e34a13b7e9e049f07c83ac06a47e1a7fdc74e3e4e542bd2936819579740dc442df37
+ab26e108eaf27f9f29bdbabdfdf2f42c9ea2ad2f2b8c9dadf460279b7c9f5211d4b8ff134e23dbb8eb946f51d02161c6
+b086e526eaf8d74c70466165283dab79005e488635da40d3d4d0b0be114744695dcb11a6b448e0d6cd78aeedddc6a942
+92fa4cec65a26d3ac7e57f51dc78825b33a3f3faf71cd7841932b4d6dc5b1383fd48f64654fd1b7a01b6df7d0223135e
+abd7f854a9e17d9b7b9fa25d8eb4ac3b4c3ee2b0738526fcc94cceeba812fb367afa2f508b04bcff556c67e69c8f22e4
+8262472f0cdb3fa497a97b48bf46d912b8bc8f8bb8a0be932b5988bee3c994a015f010fe79b92658a462fc3e6c449887
+abff4f751105d2b8eed9855607e78ba1b93d657d961d6457d879c7c8dc16c39b31f01ea24824162a13c17430cb648dfb
+a4f3878f951e5da4a7dd126c01350fc0cb9d1bc1fe6360580313e5490c06655c4920d6d8e8b8a2358dbf86c0c5179f24
+8d0bbb0bc507b1a56d6a97398b0ce0e8f43bc91e65e4bb90714303cc9964e9c31a79132e3b8b7abc45ee602f2db8dafd
+a453d578beed4ce9452c813375e3ec9370398415d7b95ca2a025bd054585cd036d01f7fdf4a2d109863942b35b187cb2
+8e799b132d3c3403944258bcc0475d0a27eff268ae3f64354a480b3d94be1d031cd691aa7c2dec7242ab8d60b84160f7
+a1c90f4c778921ee5570b9007db87e4b03a537e2979eb39fd37a7141601eae34fd81349e710193b4b1067cddae2de757
+a437108e7a200460701332e2e35dab0e65bd93ccf7567d02250ab04f27bb0d9e37c38063506b000a0b0755590ff8de9e
+b77bd387d773e5fe4094011613e2fcecab11d615c784dbf3f2471523673191979e8952ddeb59f86085c4962d48eeadd0
+97298b40a2e9264a624ad5bea377c4334a58a899e08aa29566e10edab5409bd2a5da3872904f679df2811be3522e8079
+b67ae831f6713a5b360b39e18361e01771189e7198cece81619d0c7bdbb669414739da33ae37f223441069dd0310fadd
+80555441f0bdca8c11a2d8762b1ce2c1e5b173bc2219c988840aacc91812f00a90d00a9cf0ec41a52a24401172abf39e
+8f1524fa24ae27749e3ada13e853c5b48ae9f625d971efb0852c9047428ff861001f4d9d13b3509e7e0d36c7195bbc8f
+a02d83ca38b3d2d79f3a5c378071eef81a71631a923efeb398f6ee8aef613a4afd13c17198687dcf9e3c19c5558cd5d1
+b2d1af2926d92d70501fbbe93d69107703de495fc6380551e26e15c82ae1e952c7eeecb2da4931e60f7e0201425c0b5c
+83ebfefe37d59a34b2af8a550e4315c07bd9e8e8b69d5a56d7ea445260873e741e35ade4a9c8bdf91ff6c7dc62f1fe7a
+8f0922c0f73333136b31d3ce8b941cc8315e646bb1910957ef98009b6bb4caacc6ffec3f27243f168230f76c5ceb9af8
+997d95de73ea163a236d81c195e685ae45f1de8ed1b32d5289dfcf0b48d4d9de5a09948bb34774c22aa89e310452b4e3
+a3132eb85ff3493fae216ff932bbf64c25456d922da5cf77212b4e2a6c06f57caf7e7f653817f3730279d5e927ab6022
+98064efd60b22bd6dc280091a70f70d7c52deb0b95d91ad7812abdc05d87dc46ec0b56b9fc9d9f6828e055cd07cc7d23
+8a523dba4df43d796e35a61c8ca09d41c8f86423bdfe4b38cd35702157de56b20d5fe521eb6b449d190f16d55e86974d
+925c3b847ce02942cf18cf168734d4b5eefa50da063912599b4a6daf08b0cc0ae0356bdc9038eabbcf49c49f9e66ab8e
+b028a4b2d938feeb45de0a788da0bf536e93605d0234d1888d5c95cae51def9ae5f3d5385a8e1bb2bd6cfe4e2bead56c
+ae6da7af98b0bfb1b1f3c1e0e6bd9d6b2580e0e9d0ee38fc3ac8dc24380ec00cd5c2ba60e7630b2c257f534f3e03ce3a
+9722ea65b6bae88ba8dff19752508d43897760e4dee834a3e5d0fab42da440988bf4a76eec95d9ff32b4818ef04edeb2
+a23d0f0b35d9b1987d164566fa2c32bb9eb3658add806f488c58798750b7c5d029f58bfebd79ff5280bd40f23c1be9dc
+a914a088e4bacb1c9fa9132c674eb0fa76e2a3d9c0f34db86026672a5e2ac616a4e49c694585ae3137e381bcb0556756
+b7805c412077ddc3438a150f62afbaf7c970460c88f50ca72fcda3b186b52c33f0b20e2e84a88d988714c672c65ecc50
+93862bf0ccc1a066df78aa668f1a106a38cb63ca2fbbcb8dc36fb2734ef354554ff44048def81f663d040e343b14bd68
+abcf367336107f5a171ad9de26b012a82021f74e44846a7ed1c9cf6966c6fc4d36f3e3469b505c71427f66dfd7c529cd
+93d08a06cef5c34cce8b3c8c67091d328e7abd9dd37d8fbdc37cdbd1ae268d7eafb8cdf727fac0ede2d786b56db2c945
+b20ad96af621943255a7b4da7066a3b276278a2a61225abf3be42f7b59fdb514d5383a7461c67596dd6df53540413a82
+afa34e15d5b485b1174e10ca95d69e4953cc5ec56934775be40fd8a75701a3b5d1c2ed53f8e428dd6a488a4907abaf77
+b83985e5ba6f76f4fd3bbda0b7e83f1a30364540163e7ddc021b633eb6d58422621f4d5ba5d86ad1d635780fc9570c48
+a0ab5bfcdbca4a3c8e15a2519fcdeb0f1871bedc80eb745a268d3a6095e9ef5e58ee5a5a304d44a121e7081bde3ca8a0
+8b71bd0dea1a2f12e7b3b51f68e7912079ca3708d0c2a8e882807bfdfe1b75830ec80c581a94593389d2c42c2a3f472e
+8e15b91410750039668928732fb3a89505e86da53c95a5ec8813df06a581ba8e18e59ea4054179872f2cdf50f5d2b0f2
+883d78243c7786e88562fcfc9ee46dc471892996314f5effe85d9a584796ded166ef1110f2b60494ec90582da73fe3a4
+99904cebec134301892de562fdfe20e4b05776d78d2595ec229b47d5e07ade53a9051d389368e17b1c2592934cfdfd0e
+964280d7097c3e8556abf5e6d2998a3bd73103a38b281e9203d23b12fb9b64508da5cb190827d935bd380082e722aa5d
+8467dcfcbbed38bbb10a53b359a051deea6b4a06c9235085e6eac7a874237438183d181ed7f505af6225f76807e9996b
+ae6abe0a4d86c17e7a7098674e768c4d38a7aaef6020721ea924ecf6eb0309aa1acbb669a4ec6d2793ccdcf46dd67fbe
+976c523f68a94aecde41616ac316b333eb08d1dfbb3eaf3ae581b89cdefe0dddc7298cf881ad5dcd2aec1ac610b9de68
+8c5d91d6aead146e1c9610403b539125b9727c2a815c6357852e7f001887ece31a4b1bdc37f528cd2730520b6d52d3be
+b47aab085b3be23b0a788cb639526c7b981d5edfc7afe6cd6df35065db0fca85923062bff2246ac4370d7f6581c0bc65
+a1a19f3d776b19d344ed69ed87fe40ee6745a5ead2a95acf865abcc0a887a0237d6319aa0edfd3d73edc08c15b86158e
+b3ea4e3670b9e828cb55749defceaf8e77bf6d4c8a770a83d1a44811dbc681069a08713f456077b69e0ce52f31063386
+a94fe891d3321e7c0b348485948d02f14bc56073c81c9e4c4fa6dd536bcdf52f365c9510d7c6e41a32ecf3abb7caa92a
+b197433b0649bd72f84eaa707cf1522243ead748f6c6d4909a3802c559fcba1414fe06382b61fa6dbf46ce1715a5f0d3
+a078ed708533b5be95862b654119876c190d203bc1a2e5b81ec039e62b572054547249e846000b8b2140943c4600b1cc
+83bd134d6550229c626b5a900012d6311c7ecb7fccd60fe4f96d8ec4e14babfee80bb8cc329c199a8a87e015dfe02eed
+8b457b0ad5b88d8524d3229d4be896f1cd8d8278de3686861ef0af91f27c8ea55f106dade616b364d1270cc24cec3ab8
+b9fb1653e0b80386024001a37504bdb7c474281ef8c1f047c293e15eb64b5f1d2f74a80a8e442c1156426d56b5f0bbca
+8439065b415b06f792e126cef2221a29b6fe4d55af4aac745316de796adee1ccd4964c2570121086fc465c2dff2b3d21
+adce3b68c0649efc7b895aac0c22f5770aad2883628e71ec53b36dd0be4f3ed0edc8a60e1251785966cbd3987e65b03e
+a46d19c2304f523586443a90070a3bba6a44fdf22d9a3f63320ac225caeac2ae389565d141c9a61610f6a28c68f24c55
+b245491cb5330184de7d0596d0800ae94bb2c27d4781c7e7f041d2609ac61ebd985f9453bf8c752893ac71efe5265ecb
+a91106977c6aaa8774b9fb85315312e1e5fa47487052377cb4fc1c73e9fbde1745cd494a07ac587d7a26f55eca93393d
+8b3454d96a6abbb9b650e010f42a3f276eeacf3108fd1d1f351968d667eeff0ead39d601ff501bcc4f9e02442cd7f885
+880d82ee5a00ce6f8e619ec1d2b7ddeb514debb85178d0326868f6b4858e312566ad106366f40fc7b0c9c89d93999295
+81df4a0c54e21e0ccb260daf05714bb155352986db76303d177f7f79a9064775ce8a6375ebe06032bcd978234b95cbf2
+afd0f51332ff145055a71f29ccb77aaee615b02258d2c73e3082a24f39caf6472d17f188650040e756b821be105158d8
+92bc592d88a9eded2f147eb9c05cf8a2156dcab1939a978fa7cd078f352816005ffcf0543bfd7827e4be66009337a2ea
+b43b46e9c46ca90d9dd988cbf2a4a419c2b9fdd513da4b0a1b3edc95f83e4b1fbfaae29c54639a45b5586e99317fcd50
+b67ad98710f7f970214995afe267264767fd84c6b57459f64cbd6a01403f694b985d2ac5c8715a820b780275dc03d0a5
+92b1d870d1f0b5620784b40f1b04afbac4a492b8c39995b62d7469571cdcf12cdbdc018257864f62e226b76ce224ada3
+a35068ed28633e92d0cb277bbc6738c344d157362ce6861b37092ca170a89780009207addbdf97a6ee51424a47644fa5
+b1b2ca8769c4095d097634f7736ba7fbd0156f00840fad457ee1ed84271d13842bf75c9443eb86aa4b120751e22d5ac7
+8cf4342744ad0b7fbb380b3d6218495ee3c66f3a255660bad7975405ace5ad4663e321931c21f0c8a777d3f08295de1a
+818dfcc79d7bbbe347e4fbfd567b4cbb7a9d7578faadd953e350c4851a05c8b3c6bb580edf13a37b9e56d32fe93a77a3
+8fc3d4f19c622dcb2d45a89a61e5b3b704bf13ee9c3cb9c5294971da13d4a9d897aa4ece68c2f9a71fecb2313cf6bfa8
+919cd2af2398bc4c52ecad6a0f50e92a17ea942a89ea78a711c2adadf200f7f3d5931d915cfa04f21cd9de8824a6ce15
+b0c902be67868929790e36293c4878ec213e01c8468a5a399c2980969418fff2f8a4b40cb56264d2f0d7b8ff58a82f7d
+91f6eda8ae29bd47416a4d9041d2a96c9d3355ac88e6815ad2431c0b08dd379ddd2446b1259cfd0af500f3e50fe47675
+83bb510922f25def48734a22c7a6f1cee7582b328aa786447e10dec2967e119cf724d7ff936cbc5de7f4b2565783bd05
+8a6652aaf8c0a67a61b863bb84aeb00f0a89d905eb708e7797b68c07f7d7e431bbfe43286b1317e2d1d8cb14099462f1
+883ba22b1585e2baf7fc68289e57bb1e42021d5902b516d8a07622cb017a22b5df7238d9e0efa13f8b88e77018f268f5
+b74dd2861a513356c7aa2eaa12a39921767317f59f81daff17b3f35bb6a78c886857b31427f53ddbe27d5f3b13003795
+82b186fe0f341fbc551af3190cfce4be511153e120567be4d82e445b2311cf421616291675feb324f39dba4aa8b025f0
+92a63c8ea0156c88ccbc3a80f5c301109e20d4be941d98e45267022c47ea6257e114b660a2b9e6c698f46314f260e238
+b56a9284852547150dceccda1e5e4370c78b6f79fb47a348e3947e07043287e81860b274e4e99d25371a4afd965a0da1
+ad4c180eb60adacfd75629d645bbc1ba9cbf1617da36c64cfbf5066a964e9fa2dfc4e4a9a0e206296f560ef01a0819b0
+8aa05524780e6031a35e794bce4d66ce1f388364a064e999fb037a5cae86ffed82e0b743aa9fceca533e3aa191eeee21
+8343c52a931b1c1914d80fb5d9f995e68e00bd9ce3bf64e8d557541ceab02c482fb0ccdaa8e44f290dd15350a96ad6a3
+8e526e58cfeed1a7057de8221439c3436ebf089a22b84948bac3cf2be8717af6a7d164be42666957d820be9ff023c15a
+8cd0a127dc55c4159bf5f57098756e01929393430745750767a024e084152cd9f366f1998f85ee290f0836c562ad28d4
+ad466a6ddf8778ea4853bd666bd321f40e727f49c85635e5f613747e3d8633f892a09558d830622f0a59cc68a6db62d2
+aa2200e6cc2eef1776da3920b98b5114380d1a59a5c822048ac4c85dccdcfca45643874ae3b5c0b582552dde2d938c83
+a38dbff9cff9611c6a8d10af8ce417048decbfa95b8bf95bc48c6e2adc4c3b73411f37a6bc87ffd4c75713431355de87
+ac35e566cc3a399f5f6659882bc6008dc023377df2743bdc3d7eed5b135ee590fd6ead0f53f67534a028a7e34a968eea
+b266d00ed68f28ec4c1942dc93b355b78068af916d56ce7a10dc36112bb104c72f15564d139b53019952e4825b0adcf7
+b2f309b11b0e6fac3a7d13256f5e519087ec255d5a7dc3b3abc77dbac072adb293d0001f9b7de41291aeee627c12b146
+8cb234aea711919cc74523e1a7b2eb477190bf4f7ac4e2bb83c85c9c7410773f4c164cdc1c1c6dcf34df546ec4f67b3f
+8165f4a17492ca163208f9fb93ce219fdc0935363bbe335f940de0159608a4115a2f7b264bebecbe5b227075a04d833c
+96ccefa2c07d5006cba587f308a4d517d4303e9f68f9eb30a1edcf2cb3327023fcb3f7c23d11850fa7f404b70ba025b0
+aa10435bc7a8d6c13efc2931f8348351680ff4bf7552c98698739c28c1577fc13ef9d22e9a2b5dabb69dbee4113d98ed
+b5000a583f4370e9f5de8d9307fdf1ad76f2b9d64706c65abab88afa2d5bc9f2ec5d4c5a5335c1d152ecfc347d82f5ca
+a96af6ebf7500f826999777a3b82780283121b7fc2a50acf37924d6b1ca8d481233b475410a67f5c0493bf44d9267afe
+8d9965f6ab952d978d3a798179d3590ae4ab213155964461d7469e0cce69d407967287ad2b990ad1127fcc401d7b7a63
+a727e2a86fdc7146442815fa81f860f3575e146417f2a1bf038d76cf1007f44efef97cb9ec39ec7da6bfe68d47a36fae
+82d39e220a49ea0354aa2fdf269cd05a7de7b061e8c125996d14adb6bf51e307579890279d09f17f6101779ea0391429
+a1eab09c819ff5e07d5d2587244aa6eb2c7f8dde0cf40568bda3e100820405f626a1f165f655a81e8f39be49672c10a2
+9569f9a156d52c16cc8b83ba461deccab4280172a47625da4f8f300f1825ed8c59aa5d8e0b3b4e89708bc49af7a0d035
+a5236d9cb1fd8baac728e50b773857b25b8755a32f787da3d613d714f43d6ef76ab81f319d96d56e511a67827babe688
+a5762059420bdb2000a616e3ba44af116d759902555ff310fecba6490242e0f163bb35f47dae98677e9958077db73842
+b0c30003617d7e924503dd32ca876e90ebcdf726dbebc83944b798dc9f5c90d14953daffb3abc9422546971818fa699e
+92db657e439c2efa905c9da0402d5af82a6d0aa65aed9e6b14f562cca24e93eddabde1e7f8dbad848c20dffb7005446e
+92a600652083717eb58b208e82337e4d61e4e60c5ed2d21162930813a8dcb5b8bd919941eca0f8fd2c47c00c5b978b1d
+b3826c1fde0583f919fb843d5cdf762d533687ce9b7fa5e7921b90b77a68fc9e04f3dbf3e4d2715bff1a2b17578900c7
+87386819db62e1b6d01410d8017bea98a1bd86a2f39b121bfe283ca2707b70cc4534fb114bf5902e3389e6d29fc831b2
+83e619d305c16d7d323ad2ab81dcb9e380e7e7a666f9e71a8310a9e8cf4d1b8ba003217f63aec6d83993f5d20d79aa47
+981b9d7bc517b3f72b7062bf75fdaf21f8ccf43fcc99d4dd5e33f984083ad06cf24425dfc70fdc449965abb3ce3de077
+8dffded967eaec03637e8328d8a67b1b2eb56f73bd370abffbadfcaf2747fcba0b24d61524d637ad4fb43c2b9b92036e
+af0fa75f2b7d5a4ff9c4f32b8b9b8135899050d65fd5c69c13e6e78766164f01b6b0561954e3a9cf43b518005757e52c
+84ca5c316157bb87ef1c5afa2a02cf3926da6a556fbb9a1ef7eb833770e8d94f7fc4ebc444b0b8eba9f5853da2c9b601
+805b0e7f6d64e384ff4d98e5495edc0fec4563cf9d117637dcad83a922b5eaabeb4f7b6ad441f9faaf96da8b2c0459c9
+a70c17690aacd71a82903f4b43a0866c37904e07313ef53c1d852e2362e223640f58d6d1fd6a752055c96530017a0313
+b387c51615101c21374cb6b85f109b88a7680ca0eec078d2ce2d8d3bf7b132df3e69e6f8164ea46905d4da6eeda24bf4
+b3ef1d01aba050ce9d365349aa250ce5713e0d928e64af737a70b0249bd81e38c8f34ef42c82ff4f79b535492c444251
+96579ef6391485b67ba39f57b4505fc3381f27fcafaa06d49b70bbea0a104e58c3b418c8390545ce176c463d796cde2c
+8fa8961e5ab9f9ef0bf7b51de8815892f3068d8240e7b2c89b0f6e791c8820a80f450302001131a22c194dec326f07eb
+b71ea51408c504f2731553a4f6e043712a97c2d754d3ffdac46f9a953bbe36c77d6d418c8304e8f6d961bdedbd1e2656
+918830ace4bef09da87807a1f4d0614379b49bb39ba888ede12c2c2dad47d8d5c376b1767c7ab60108c2d9fac8b537f6
+88b7850fcebcff11fccdbb739a470745da8e1251efe83c19785ced5f1b7eab422f4c8b949f1351f5dc4d58f7052edaf7
+8a63966c63a8907e101d00ca7fe5ed93989e7c4c1cd56e87d130ed62cd978cb2502311c9f9eae6f75e45779f63394206
+87ea261d93066a309a98a0335757057f7e7ff6eb45307982a3fa77f6a49a0125ca31fffbafb58e1767a5a7ed29afb028
+b3988758fc9a3ce524c408e74c2913e1250abeed4080b1dee3d43fca52043958f95ea96b95a285e3afc85a416b6d6c68
+8904ba0c408f2b2e2b8668056e2b9d6036fb472b5e2bfa23360a83164a5d8ae84bd9bea680f11c8c1b1a0f81366bf0d0
+9509780bebed875a6d6446de7200dffb6e31fa8a782585ffdd97f483d05ca055d4decc447b02d19d39e8e46719ac7f31
+8144639f8652aa4cd4c4f96debc1bff902767698d3529e8e606ab512db8b7a38d280f10e1d40e961f4bbc776cb04d706
+87200003b51cee3ce9b372e0596b8334bbd528f3eec8d0f7a7de3a113393c0893a7056b562194b794a57e650e04305bd
+9368b04a6ac6a007307ac321346eaf445cfa65e9334695d299925d55287181a5f643675fcb4c329a4b0a52d2aa47edeb
+8f9ad49465ecff41a9cadec62f150e70b65b75200223e3d12dbb27161104a09a58fc145defc4f57eac3f47ac9adf7dc3
+8295ed7e0a04a72f1382b2f7c7609bc763eca1c368c2270d072953ce3efb801af77eb3736fb5c526dc9aa46c3a6f302c
+aa2443b1ae5b124e978eb865595a5fdfe7090119f418ae9c552f4fe84014966c2d4d3728acba0b950ef8bf69d9d4d3c8
+8a56d85d1041b9ac7023ec757ae6bdf7182db0a9013add26cbe9259db8f0ea831ee00d633d56ad5c0f5ddd7b44db4b6b
+af1369cf9baf662fbcafaff6fd2dce2f0e25bf7032334972151f229386bb32741671b15e7288c57e46d597d6d4951962
+a599a85f665a0aca18b0c9ff7dbe974a41e0f59990a4da3f3f74a309e4d329c50ecabb108e2e7179ada76649d5d676e9
+8198bdc97492cd9ca1a730942fbce18ca26353f46eee756cb40b298bde0c645e469b90029b575c821b7ac01cd44ef7c9
+93f7ebe4bdf207abfb68a27f5218245eb03cdf932d04643c3ffd5cd5272ac37b8a1cab231f36eee006b1da8ae130f4e0
+99c5ed92cac6811b7cc15907802fa4c32cbdb42ef8becfdd29c4c3bfa44f230f561e6d014476d0eb8d21c475911003c8
+b94d580b5249ecedf59b9a03cca2f2c21ad0e17a51aab836bd9e9736ed132c5b23ba852c4e6d89071cf29c337f2d2582
+9052df4de5c289925823a8556c2cea87b44513f92bec8522017cc7526d009349192de50e7cd0c4ec18cfe9eeefee488c
+88a1c90116f86184e4e989eb24af6af34631aaab1e28d2974401d560d925329a8fe49062b6701b28b448776247d86365
+8ab6bb41977b58ae41ff642fc341f72574e0a8907af395627fe41cb728e37aee77dbeaee7bbd0659c0c5370fa953a64f
+b8b422e1e70ec4dd8fb1d79ec1381b4f9134710af3b2fc1fbb3c60913b0468d7caa98230ddd3e7bd61900ec4523e28b9
+952dcf9db231ea2abd5e4056bdeb906151f948a8f2cb977df1ffd3f62268279ac9212bd5c5b94ea7fbfe163572204090
+984cd3f20f84e0f9a58e406f983b46aefdc8b1bfa1854705c2fbd84593843c6e8c9945510660d204d93685293d0bb2ea
+b249f5566f3ecc2982548e406acc0e773717d9e6032103c31df3d800a47bf64afddb5f8786d0137e76e5851ac665468f
+8fe558cc8845e89f8d2f9d8e27151a78ea8ad452206db55dc94b29ff07dc9c4a60fc786c483c6d708712db9bff70e257
+af53896b4273a489323adc7e9c5b2f94f2aef6e2c8662c29071a5b1a5ae47e9a335820fb2664990d569fb59dbe98266a
+a766f2fb21609313dfebb79f54874210210e27efa32d128ee5753ba22805c770cd27cca8e182d9bc64faff61ef4f0b3a
+a5384375dda01f18bb57c73650127dd0c1a0c82f91cea436a9c670ea0ecbd6b47a6d10c0fe41dc12ddb0aed33ef95ff4
+95db3403ced35412a8e572d3b99ee09642cff5be67adc35ee881e8850ac4180b215e3404e7ad6fb18612c0e071dd7eec
+aa84fe00ba4c2d0421a998c24f63c050c37aa0540445041254d93800f3ab50c337a1b4cd41286f1da2eca1b7816feea5
+982d1fffe81b87f73314cc273982a70abc4fab3baddf7bb0197bfd10172f6cc6d54bc9987314e1dd6b061c911311090a
+ac7bfbc96d9588cab489c60c19a57db26d7bc7767f552842edca4ee40a7da544254ba309018617c73f57955f96eb2299
+917fc2d92973b0e73df5bdb9e1cacfc9bdb8daf608f63902f75ff880e256d75ff1edbf825eb3d1fca8704320ab9da75d
+a98bed8cb3864dd54aa62f65918a17dab8e5ab0026891e7c2ec9cb6fd68bb17ef8745212e61d30b77a9786042a427c4e
+8d574b4475ed6296fc82d05648c9f2bdb5ef925e423be513d5803f1d1ec6023274cd81a4221379bfe7d2eae79b7fe858
+a97a36e618bbe6bc1b2d320e78eac988d60c7315e780b449219a41c489029e8f76a9879dc2d3a28f80c521d70a159102
+921d1a332809f23c61d65041644b12589ba73a9ad5d4a8a73fb70d821608f1994cf6ce2c8f11075986711e6cad573ce1
+a3c20a0692e76787db3ef150b5fd98eb7c88cb161ecbb47323063d57f676821245a060a935f51f0fba15a59f1ef82c02
+8204b8a2d4abb6a6f60f2e1b86a91252b23b451202bd816b67b1a9b2546aa2149457ee101f2832d7c043d390763e6041
+920c56ebeddf8ea9dc437f580b1225547b5e3655d742f2868b08b82e70c095af9e070fd377e9cefbad4691e0a2a0b500
+ad36d7f526e2f59170cd4c4ee3ea2d4924ae5e1006d6891e52c09aa5941829ea4f59f93e47ddc4bd68c754d638b0ac88
+a8fb38042f73237564772eba8f89d91d924273c2e523660e7b5537bcafcb8075b403b06d656525460166bd69bc3eac5a
+86a2b6d2b204917c424d7e4087657e6d7c66f198458ce992765575495e76097095aa73d3363a1a97d39f2c1856e96ab7
+84feb5070b803e14d96497b698059e564d458e6e1b8887ff5516e66f6fc92d50b52334b0a320c5126599cfa4d603043b
+b2d57b0301ac57bf4917880f28faafadbc48f4aec7b82968f71286b355e386a05edcb0d5b02f99019d84e69d8bc910df
+afaed8ef4324ccb2e348c84d8297f74ffdfd63990e02129d2a60accac883087febab71fc3697c4dd341723858ab8a8fe
+af0126a72d2dc043a4b911452ef880adb86014f06384fa39b6a80340bc306dcd2671094bc4bb2372dce47e0a99ded473
+a669556ae9496e374feb1b6f496390d351514f858e47d1cfccd7ebf7c5c188953923c926d4bbd49dbaa646bc3d267ae1
+8fef55cbe88d8cbefcbb1bc71b9bbcd982c921c95876be0cf4e0cf8537ffaea562bf77daeac96c40a159ab69ac78a58d
+8c052737bd9fd14625b32b5fe8661e2dc02b7db6d79a4d5cbe335977e3c32274af3445b46d1c65ca3783cfcc762fc375
+934d85dd78ca99b4ec77c0c5fba884aa12ff30fcbd0717692e705983a769f8d53637f497fcf413eccb438ddfd259bb79
+a29aaf139e57ef0323aefaf3ac836deb9a0aa8e464ad36d5c18ff282a42008843a90725995e95175e3042880a3df3b0a
+8d1e5bba5c29a7e5d4103ddc3816ebe31f7a7f3735ec273dd437892bf452d818c4fdd89cd713600a25da6e63df154408
+ab42e2f489a595edbe62214929c78e4b61357e214d02ecaba9c5d650d2fee2cf6afe47d4fe6289ffb4d2e136fa4deb6f
+958fd7aec907f3c11fe5b1e6df7dbff555e2d270f04c0bfc834da6042dab3880a336fcf7fd81cbc6c3476887c1298ffe
+955c9009376d0b04eeaac2fc0b73d766ad36acf60ff06b738b7982d0c692f7775b33c1c36db6eb39fc72f0840df5d4ab
+a20de145c323ed6143a40cb76ef1df39d460b5347f4e102620fa8f990c97bfd1b86474e390b1416d685e11cbd900bf6e
+b5e8fe2034a7f70b884d99c57ded7eaaeb3241bb5a4b261ded0e320f5938fc568ec4d19f3d57f67a713265a8e0d375b6
+a780cbaa9a0e3ce85e9710fbcfcd3139586ac9c01e882234b6fad98954ec19f65a96b5849b742a8fb7bb061585ce378b
+935831fc78c44018eb4982df4ca3eb902c5122f090db3ff1135422ebb0fa1d576ec6b74c867f2d9c40a6617cbadbb780
+b99271ea8cf8fdfca12034e909f1644ceae383f10b5c5af348cdb3f0839f5f5446f61bd31327e7a67d3d89544959e4f8
+a2bfae7db7fc3d8227104cec70c1c64a08bcbc3f8193f920393676c987a2e718471dea1013a11eb8c04ee866577f520f
+805d10e056a8d7a6ac431741faffb18398c6f7eb59350dc80a6248afb435858d4f5365c82161fb93370acfef3d4f2692
+8e8efd8db5b869e30c35a2dd1e5cb9adcee10f595bd20039ee7ba9a6585908245a02302b49ad558892222b7d95fca9e9
+8c1719cf37ef916ad51035977c3614457dec6a449ed1b3dc99fa86a2a7beb6af54af806817fdd0c31a9a01ede4fc918f
+a8c4f4fe4fe76160aab7c0c5bc158a5909018561529bea4cbbbd0d76b2d9b9a5686cf33808a06b49a112f4ab0946bc7a
+8e6a529ee5cf317cc8dcc87d1207a3bc0ac3d65bcab385ada17d563cfa7ddb5fc4944534f2302367d420e2a957e5b238
+8a6649ea4ee194381c5186e714994c4f4c23533c135dd3074f9ddd7475122993b0f26e240f17a1db1980d5b2d01ad8e1
+af60c1343c84ddd86ebc201ba9b60145bfedd9ac6d714313e79e4927485ab7c0aaaa92de1e9e5bc3670c56ad14e2319d
+ab64357387f4fa634b66912c87e7db0e855b8a5d4bf3b14a9c1561a9fee4b9fb9a7b8e78577ad6a9a987453510d598d3
+8eaff9c063ff7cb0da79f06d483c99d896bd0b8fe70b19ae4d300fc9f310a2565bfcbd6355aef87c47db4f11dcce2847
+ab20c9febd36b7ca0650d4f5ad026277b082e63275de2799525f9d50e168dbfcfd2ad42d29b032e09c068276dc8515d3
+b63769f7cf181ae3eb833b958b93bbd1b79fc9300939f347c666723876b7f0abd279a07e66b888af632e8d07f440107f
+a3f129b5ed839a8a8e17612b0e2d2dc9a58d3847fdb0aa36e1589e830502744ec041dff4e4346a02e9cd0d6e55cc59d3
+95be94138fa99a68ff8fba01d38a4047cefedab262dd8b6fa28705511386ae58ca2b09394dae9db1034f9fd31f2a432b
+83f55a55c09d102d88f232ae5571188ef083c02039f2ddaa21d94b88e2bab04ac8fe6385caaec6bcd733fffb6c1f3164
+aad5d87989ac51d910d5058dfe46493314f308e3b1b7a5bac181cfadb7c217b12ba2ae14c53425107aba089d0929b296
+923f69083b00daba5c59342600975672be13e562ea74c5eda87f06c12ad62a0272ef1c7f4ac19d0f1fe4f8623d94ec12
+b45fabadb7b5b93fcb8e9c8761134dd8bb720847caf8ffc5008d2ae0939678fb99cfaf28b8fce3b109d46c09e7214e37
+92d406b997492a2281f9c85f86f5a4c9ca37c9afbba91d27b8a0dff9e84420b0292533cdc5420b4f07332edcf312c4cf
+8913462447189c164df3d1d48d7d350e947b2056a029702c29d7e7450d4255932b27ec429f54a4bf0a1770024725fc7d
+b263c4e00a3f6cdc27df5f3ef8cafddd07b60341361a96ed9a3991693d9ed9f6b22217ad72f0dfc4eafd31c8cac230d0
+a17aa8cc8fecb4e45f015548ee17fa663ab2b498adf4850f5c4bff1781fcae354fa5407a76e418162c48794a591083a6
+8b8746ea3c88bf033ee6fdd618e23f671569156d8515d135c5493efdc3d2c9abad7aac3cbf181101bb11aef7b325901c
+ae858cbcf1ac49503a3cccdddf57f00f90bb791b5e498ac619554b106ac53e44ceb9a4f8cdb74234b7617a40223bed55
+a89c76244bd9d3e46dcc2b91478cbf1d8f33ae104552fd8369ef073fd907728e79a505852091959f924941258ded15c8
+b67ef5be4e3576ccab40cfabe5ad28a6e258f3d9fab2f9affa31937c14df05d3d02a283d2fa151b9899fdeb64b326c17
+8a8e9ab29bcedabb3460f16e0ed295a92dabfd5dd5f7720ed5f0bda7bdcee9a9c4c5a06a66f81bc56962d41298158377
+b6ecb80bd1a5565bae594e51c223e18ca6ca8a519c2ebc7042c39d490fdc11ea251e07fb02da7d0506e9df84b34c78ba
+b27473ecb416eda4fc9f93f0b7712a98a1264949cbb2ddb09b94fdaa7bfb56a5ef0cb0574e72e06696bc3d2978d8f535
+abbd03bc64328592ca7c6e8d6f805a3725502a433bed08f5b47fb91f1973d0b16090450222036961c9e365763ec1f939
+a4eb17a82c7195ac79c4826118d04ba7bb37c5fd0e0f3f9ebc23eade15dac61ce989ff25bd12aeefca58ca617681e68c
+9134763d02167001dd1956ff2ef21a711b370491cf016cc6c25c3ca37ff507468bf355bd69aae847f17ffb3693466855
+8596c2c515cd9c138f2188a7838d9602e42878d464de2426d856affc474a22fbacc56633b9b8e82ec3ce93c9f1fe605b
+83e65e4d4a42ce9fe739d248e74d0b89e73826a6234351a13142426e459526aea645ea4ac3e46c24c1eb5f5a6d8986c1
+897e1c24cbd3797ffc593b5488bde97e8dcb9e8dd6f665fd0cc8b22c2729755866ff9cd700d194e2a6a6e3aa428af299
+8bc9fb3392aab49bced7485fec5109fdcebd58feeb8d460cb63690fb5bff9f2641ca7ef373fb9f0a0f6f5a30d28defea
+af9c73b869aecd8c7e1df934358cfd9f5c70601b6aa7bc4d828a15beb1c9d8cabd232999c196afd746500c566f53c4c4
+986ec1f953c3b13a03c63096fbf9e0c8ebd405bcb9176c69c9aa27c183e4147c798a2f00624fb00d7d1e267c8d595c04
+b09cd330ac3efd624598262507f9f19b790dbe615a6fa8e9a7383b899d2d87289019c0f7297fd20dcdac455d475d3dc7
+a934c732ba4e5597cc5f81792e209526c53d29083cbdfc1684d06a014a65711a6c7f37e2d64ff6891387f9e4c1e13214
+b06350f5d544b83b903fa614ecc1ee7db32c70c1702b89bf0c8c403f191e867ae0908e0402a48a28577d3a338582795c
+b9243ca5194102b7c74aff9550574a37ce6ec95e154acbeb006173eb39197daa986a84a94aecaaedb453885891c3025f
+b8732bb9cdf0849ff258b9ac610f294db2d75f3f383751d873f0eb3386a51e083994dc24efc1e176f6c0ed7637f994d1
+8e8302e19f7a44c3d136a13472f84c738baefe58f84f9d96bc389034988407b6a0a0688441672ef6bad09ac16cd2c33e
+88d5cd05025d9e2d4e1f9f5e1b9e415daf69df033fb69f88737d1ff5097eb45c61a000fd7de4afeeeb6c4ae57277df77
+b5cb2c6a8f85976eac2f9b12d4b4634de56a38df5d772475b13d74bc18b0ab71ede5ac06483601ed6398c7e90dd9526f
+a5dd5abd05fe92d65f9ea2780be6d3fcb14cf3d8ea8728b367a50741cf61c6952f6e1ad8cf5c2aa66fcf25a6f72cdfdc
+8e540b6717e55c01eea1f70af2de7752b395c05b671986a63c1cebb52662a83720e63d8ec7e2879076ac759f225f7690
+b5699d669639600760f5adae013c1fd731b642fc95cf7b60ffbed9562b191547b445df29bd7095f8871334a14d39f116
+b812314b92e3d1902abc43a69b5f6aface3a3cd065637591c16e4721f3bdef2ce3f149251f06cb38b85dffd4044c0353
+99507fb69c705b92441ece2c5b661163522a10be231185e04247f24e134bfb189a3ed06ee655f064f3fc8c71dd99cd14
+b3fca1730c8ae1ae575d8ec75dbbcacbfd1460b6dfb15ad42b87044670d259be103b5386ff1bd828e4ab1b93480d1f90
+a9bb4e1c86098269a2110405f90eec8c1d084e13975f49aeb7e6751b0d118731207f7db74737396278b71c2947d20386
+9137aaf24aaf2804beb7b957e3a0135157831c99e2ed6a663052306122f7e412b6a2e1f2d20ecbaa35004b833885621a
+a15586cb10f7db03f62d490ca33a417bba67e8b1f6031d4f6f7682db845b6200100aef072f247d399755f6d2f3eeb343
+82ccce2b29766b33f4ffbfe7c9705730f353091de994e36fbecdf1554bdf2fd2f656f30a1cf18305f63ea68f0c599fe5
+b0657dd5e228d6119a3d3ad9f5bf10c795957d064558ada78786f1789dada0cc1d3d1669e2269506ac7b290e13056ac0
+adc025943a687ad0dedcdb6bc696fe1f31e2b2e6ae1165c4a7b769b4042268cf2cd6c82c3a2546df4040e00872213f33
+b03b901d47294f7c35a0f3edfea4abad2419a01a3c024fa6f327c89bf7c10b67a3924b9eff74908d9d90883dd429be9c
+895b433223f053da8275563ebe7cd6f299272d2f74e4af5fdb4b3fe76ee2939978fd5421ceb49c17acfe33af01e048db
+b71e3b52d17e166023387c7efc6ba385e1d96950da6817f5c2f84288ffde1d3269d727db49fc80b4bc877621a444b1e9
+a89f01343f22ed143a4323127a0d10ae6e34ae1b6119c77268a018d4f1ab99da69aeb71b9978733686f0ec14115b3b80
+b76e79f595d0071b92d783298188dbe95210cc2f0e278d03773bb8a8618598bb9260080435d9cc6898f7d4484531cb78
+a7b1f26e04aba6eefc00d6f1b98bcc36d4b6aa712298aade84859d89fcf1fa90ce250cd573b500251a99bb039db041d9
+80d960d224d1b9cd377bcb5b0cb5f5b5e728c79323a2043cbcaca4c00c3ee4cdea4b910a39b75c976f6f71ddf48602cc
+85e6bce985d85da33135c0174fa60024a2a33188c2a9d143c3838cd2c4d1aad5ea7a6e07443ff78c33e2a530d3e64f59
+b5ebd5c29b65239275af29ec51159a37f1e5b1efe6815905b822318b11c9bce2ee99429f2df8f5c36612cac58dc81c86
+86c1cae998c7c2c8a8aaad02702a2fede242c6dfad003e778031c432e54905c12d865f3ab4ccce31d46f2442ab97e8a9
+b95640d418d1230af5d3ca60b5cf2bd2de84a8586730deb329b9cddeeec8c9a9728fd238fcbfc156f473aedc8d139500
+83c794cd2b0cadd4b0058daffa0dd2b14286a8fd5b83f290ef4b22c2c830e848fe167414e169105cb4320c6ae6efd3d0
+ad03b494f56db17bdc79caf82160c94ee9eaf1686cb08325116ea267f6e4b1db3e6c3481226c6dc1d58f3b17a435cfdb
+93538fb55d0ff17f4e3f06d9a44de86f0907537d8e2391790fe6403b25dabe475977a2fed14f8473fe1e7ecdac1da64b
+a1c22cf0e4b365a298d8e5f4621bbec7e2a5ce7346681c7a8cd14f4e828f72be229334aa20c6a3f52d91065f34d14dbd
+8711803102df64483b231b0deb3c92d69905f1fee288e9ca449bbf3f12b08c544c464b44d82d72a3a9daa04b7a8ca6dd
+95843b78c5bea2de702922933ffbe117ddb96c4bfb3d9f90299a3c8a6b5aabd62985b0107f568abbd5b930bad36d34ce
+b55774deef197b6ee82d822d7f3ffc8eaf4827d48a4d2ddc5de9acbf008dafdb31cf2d8e078b1248d5c8ef89308021b1
+af245d8555ae94e7e73371889234f52b0121b27fec354b0ad3745c84979c402d475efe8362629265109712a1e5c46c45
+b2911311fad929b4ee5edee39bdde8bc75c5d8a93ca7c364bd8b16c249c9692aad6ce0094982c5dd8e1a75b8cf065140
+921b0e0a07360e9818c5f7f2a5dbd8126f668642c76bb2bd4422ee598e5aee3783e793aa35e5394727fd8c7bc64c01c0
+8bdbcca62f1d8838df205ce1acb47562e0663d3dfa9cc8d6c627b548ac8c14aca2dae7a940dfcf86665c9c5618e0a214
+99199000ed7ed4bd5c3f1c5735549fdb15c235a72934aff81f07ad766b046e4fe839196e9aeb8dd2c3dc478e1551d918
+88359df71b006c18bb321911741a65dc057732d1ea2a5d0c916c341c923b5ee9a7634fcb0135b5f2ec09c231b8e674d7
+a16ec880727920cc910908f8956bb3506d2952e4baca9358ccc1591dc9b787596b95f5d4d9bd5bf6bd25eba8644ba127
+922e1ae936f4aa654ee3ce11440b953b0955dfa308973e6c0c77b580920bfa09b32c1fc6d06a633cb106d3c84bada228
+adbbff33f6d91c8584aa6710c24ac53dc3c1d860938332504ef211dd47c8eb38a4c55c785831932dc81e9d6422715930
+aa9bdab448347eec58c4403fc99abe30e07df67348fc676fe513ab380a80f61f1fcc93c2e6415966f574323d14d11ea8
+8817991c03a91112ea6712a050615d9a13796c930cbfbcbbdb56dc7cc35cb67a507f5a52eeb2262be3755be89bb6e56d
+a5df4be4aa15a9cd263d07b9c02a5293063a20c4f8f694c201cfdd528c83548b788dc01c90128dbd37821da8e2563b01
+83eeb934f51fe508d4155e6722b7070c4a1f9b68420023d961029dc5d5b120e77ab77837276f19115dad87a118feada2
+8e3ca52f2f5123e55d486cec5376f06bb3f6cc2a35238fd3f4a069c01ad1bb4dd85f5597b6f0f22a29f7c3fb4d178104
+91e820db15a4a112642780f86210aa7269fbd856087c013a6ec5eeb3389caa9182bf7783e1f35e357d7cad12ab982035
+8e8c3cfb5cd8149c702b3c9370688b72783c4922392ea025ce4ca76b34cc269f67de6fb2936edd55ea1533ba6c6ed8ea
+94b8709d7101af225ed26049e4fdfd5b6b01ee03defc3e175506cf1c95e2c76b05eacbd19f3bc21cc602b9f3d4f5275b
+a750655fb03723564ac969c24804253510065e4082b0686310d86b023e5f97f4717bf5d673b7908d78093f0791f91fe4
+b76e7955ef3ed7a7c3b81d7701bf4061a648cabf20c3b3aa53b4d5a63810b5fec4dc63f7ffdeca697712bf96469a78a0
+913093a722bc94e4327d0058191c591f81c0339fb2f53d2244e3bbf2f43ce3b4e4f03dd12077492446a90c532ef67a01
+a20b34e0c26b6f4b1c9a659616a8f1ea432b3a7584de048173a936f14c90a3ba8e16e07570875b3be7a7019af56c0287
+aa1950cc2bb99423dc2fd189880818eb5967ae555bae303aa6dcc4a77e7bc3d1e1084a6a5b00f0479a6fff9b18ad974e
+8807237a1257f953f72d37c540ee26aaa25c77e1f241cbe77b2efed37deeb220b12267f538f27ffac612f9873185147c
+a34eacee19eba80a88ff1ee65ddff9580053b4f2ad3c57d803449fae50e6871bb358bbef99915cefbdbda7c7aec8857f
+9772dce7cc392c1289fa9c44c7cc86e00fa502fcd4e53436dc8ad289db6183ec97071a65ee3b2012955f3a8e4ec8755c
+b1c179fc317dc59aa5ce0d70e998bc5edeba80877ea571e7627ca71bf957441a94bcfa10a18d03d865d7dd30ea66b5a3
+b850d81819fdad3760240a9a1c7081ceb8993ed85a31ca3e592b126c20d567c0ab54a3aafb97ba876bcbe0f86aa8c986
+a2812e48e11a2764507f8cd41d93587f7bf1d0b3ec0f92c7b8df7d203b48e17cbce0f2fae2e04239d8c2b6efcaee9e14
+b06fb5c88cd531031c61aaba9dd9557db91ace895f148f53bd5202ffbd0abfa6ec3ca89ec0cbaa7925e0a1876d2dd1c2
+9064829a280736a170eab0e097654ebd52aba383b457f1a34851ec75d5f11d328cca59f1ce62d95d7cfc27dee607a40b
+a90d9df142c02db2628099d0c2a53965526e9160e6dc6830fe4c4d853cb87119e23734f4262d058feb77651097ec8e9b
+91ddb64930a2622e496b7eed0028442fa17dcdd69bb0c1633fada47c3d5838bc60fde3e655c3333dcd2b371e3478deae
+b1069e98023843ef534232d09bb61cb2c839b29bfb6a4043bcc79ed36a75cd646e7f35f4599117b67169af63ec0b4c07
+9206340ade81d80f83a9ba8e57417b7ff7eb6834ed2736bb4d466e8b92a7ef487922165b3a44ff9f895c65ecc48c01e0
+990738833a0d95a8b506362422a967c5189d987b1c3494814aa41c852fd818e3ff1f1b8dfb0c48b4c67b52830fc2f104
+952c3f4770a13bea8d07d1988aac2c56e14612b55cd4e8b9b4a511f4fa94d2baa455afb71b8a84768128d39e70d9e59c
+880ea03ee556cb4fdd70c04ce130b72f5dae8eedfa9215091c14014cd8c4c5b13f788748e786b8859458d949248976da
+91116bc6c2ec6c9c53d432171ae1a8f9a8e39712a3c4e2c7b0ccdcaf515753be512e6e0916c82b9dcd286ebc10429ec4
+a98ffab9313c9139c9f372848e311e8983fabe5a2bdfa06ce891a381932ca94b260c917d3dbcd80a651214ef24cba353
+ab96357390995637ffa22a767183e3d2c386f5f7ec01d9fb8eef7d56176f4c1e025789b483224d5b982942c680b009f9
+a0d098d3dd8e93771f272359f00cc2c4a312728c99899788be35a2d194c607f2ec1b6d02883a9c83d338eca5dca8589e
+8befe9775c49b8a7f11946ae0e649ea26cd97e74ba747a2a4954accab52c3547fb877e71b25f26a9ff3767aa19dbf151
+864c4d2f7758ea7e98f82795d56a89cf4e24effc0977fc4cad63d89a5f8941eb95003153c6d978adf820efa8515efe3d
+910aff75111ee754b24cccfb37e9dea001346b099373fd30bb1370af7d2b4689e29ee0929b5d8beedc19d5e94b977952
+aa758f745dd998b9070a14e5d689353323f3d258f71b44f8a78b9d6e5e79be393b9d173d75a73c47d7e6ce6ddd786528
+975c8777759c48e60f53a9b8b2f151a5d36183aba236994c9278e5d09357774ea7b2dabf202def60d50b42e07931baa0
+86149eadfbba6619521f5cd30689db2feea32ca0a969dec7b3498f2559c9e158efea2677117de62595d2a219b676b217
+a19eb4c238272754ff1a0469a8f4df11d47246e430755d469e80127b4dac5974ba4c4f03cf494712ee0f55213704951e
+94ec7c279c656e3598acf763d4a56a15c3685e3a37eb415593a450a9d8d77f8f4579188f113d8391b9f0b7b270523d75
+933201b432733ad60953b02495b0d240c06ce6c4a34a89e4e9d9c97e001f66d9e2b507d546f0041a5d81572ebc3d257e
+ad8c6c40075f31904d5c633b058bbafe4387aebbff22d37d8045c546cd423305051fd0817c196e38e3da0c76920afa03
+82f6463d68dab6e86c5a82a24f91b5dcf534bb90cea762af9d97a45d490e51897c383e61108238d844599c481b37b8dd
+a3399d11e1dd7c0e723331d2de7058b85a2c97164de806d3cb51ea113115800b3f74e755da2c90cb9a16b0a42c851ca3
+83c09f540e6d18425af7587c198e7e44b0cd56c27544afa50c829262d1de5be2785f9c115b42ccf8275b8eaf96070a71
+8a0611e2aa7623c51e76448084657af6b76498cfe237694b477dff5ebd3a1f055132853a26fcf91f3ef9a20616100e31
+a0ef39bb2fd548694c3eda6af19aa70b4ea8db68ac9c9291abb6339a5a9893824e266c3d5aab6198b37e4e3f4136fd87
+a16169f3e71379933ad737a89926e329afa1f15df309a09b539211c45a3b21fc5b93b504a1cd4b86829739a045320d73
+8e1afa218a8e29f9673342b8c2a717ded674d3d98c768918216377b723c9f1e95019304960912fc507811a8419fc9ed6
+aeb9f7ac89d3ba31be6bf5d6c469913324f7a670aceaeb8a7ccb726efb278bf14ccda9e0d5d486727ebcc533cc627df1
+953cfbdc6da3fc61c510d0d22100253ab876b8ae955ec7cbd920b79be621c4a889a83616dc3ac102f05daebde1ca7092
+98f179b3020bc6d12eb1671d539775a79cedd35455c51cbf0f1e1fdd23809f0dbfbb1c4d320378512e3158f0e0e7b17c
+a2927c5ff70648d765d7c22d2c0cd146561f5bee36cd7136232dc0228e09a659aae45077dbecae09c57f3a791cefe96e
+8e1529599a03078e154736fb9a6d895508e0e54e3827147066f1348374b0ea0d81ccda5339957ffae77f0757fa8f6ee4
+b2b1fea6d2bb4130290bf027986d7bde69e69ea3a33b25a9a90331d9352e4a03353065a57699d64de856f6445ff05003
+891bc04a15932fd7dfeb73b2e3a4101dc0e4566d13aa8923d5214204baa27628da89a05812fa9dea666af4b613599bb0
+b9af7ebcc7c0103cfa857fbad0f90e2176f6a59b00eb66ddcf5cce69918ee6c01d4bd41abca6c5c77e581ebb86185298
+8b8bd576b0df1413d1f2782393acbabbc377b351edd86bd0b0365d12e9838f775693d9a6908478fa7b2ba05be85f10f9
+a020e51161e3edf9b39f1adf8b17db01842cd32a719f777700733cbd6fce25a1b9de42d2dc749e5fe37821ac98654869
+b201acb0906ed7417c344bdbc704f7bc33df29572b1c908efb2b9a5e0acf5e684167f434bc785ee67d4e30cc0ba85151
+82f0e6c085d1a346945cf8b688e9ab16526d6edec42ba90378ae278d1b622b80cf273f54dd4978cf2dbd2923f92d7157
+b91595fd25166fcdb1341a55466e4c2e5537de1a57b8fd45f6a04b3574f46aaef44b991329ab15030776ee2b7bb1d488
+919b0439befe8a2cf8a5ad897e088a5886163dba78a6026ab257b4b968309cdeb30dd39b3054f0222faea566ea081a40
+8096fc93e7128017ae42b2dbba0cda82f457fbca6d88f94d297c9576ca5a53c6148b26b5689aca218649b9e7137a05ee
+83d3892d32364e25ce75d458989da570796bb0dd4af9c95760f3f28c673a44e099b50321d7bba04e5a6e8ffd41e85eab
+a042a6b84bb0df37ef0b281f89398f611b3042fd7bfe5cd264ea59c38cffc836bfa8e6658dd9a08bc0a77ab6438a7e91
+b0afc50462a35bdb463a520cf7f5e27ade9ab1fffaafcb6083fb3bda64f9909b15b274d3b6140a2f4d13fb9196713efc
+86d8df9259018681a6a64ebf623c1926b6686d5f982c6a322d9e1213183680fb38ade15780b50aaa3010e9f44241d82f
+a44ef545202b37bd4bc021d999be64bf3b0b06792658e41f2c115f0c5ce1607fb0b7c0dbf4f050aea2737982bf97a4bc
+aecf43545ad7a0327fd07e2789879e90616a5fa23152e8fa865dde90a4ed5f5d65c3f1401782c624a9d1c0531923e4d3
+a186914d26698cfe54c105ed621d0b9d523e44dc3d9353964aed0a62e64aab735fc710ddf8581a398de08089fe71c7d6
+937e4bc999774fa6f6e56d68fc2fe878f1fd4149f4be478b67b2c8b659827dc23e962bd0c2089532243e4b4e5a65fe9b
+a764420dd2f8435a5163f88778083f3956c7dbedaf428a9ddce70aa81f99c2988a5d7996fded783a91ed2eeb437df4c8
+b3006b89a8ec4ab96c1b066f1687a794a9a8a617886b64bee094787161ae50ade927f32582f7a438359f4f390c83fce4
+93146b1416425560e8fb830d3b1f603f56a3decc40af54420da40c4c9552c4c909f365f509fbdb228de1a39a9f52840d
+a96391d9c8b46b210e61ff1852ed1c4ba5ef8a9445e159c8f0970c391da0aeadbe54d205609e9d55c5a36c1c50e08d34
+981b4f63467bfb617a3a38baa8a6b7a9dbd51ad13e0aad3c07ffbd8694d7e4f4bfae410d28252b7499e48e63e2a3e9a9
+910f003ae3aaf0e2385c17b194e44ca031e276a7614ff0e9401583ab43c627c7651153712f4f10c006d2ea4764d4c5bb
+afdc08a43dbeae1ccd04e036e4cb0b4fedb13c977d49bbfccc9634e91d35dfce6d55ef8817cfc4e79467508c07a43ff6
+b210cb18e0d53153ec48882ce6b137947bbaee9f9c23ff56195cfe5b730937b6df139c72591748b2c9f17b7ff62f385a
+a2ab3c9063bd56391b396876c39b074000bf32495f50cd67d710b86ec20e1eeeb04e92c9f39a29268e41e7a6cee1f479
+aac31b3f0e6c58242a7c5460b69a5b88b63b288c32bb8505674a40003e4af5ee2df8a6ec62fe77a4693fd4a6695cd80c
+96e057d57dbc656a6cf38f4c25b3ff2404d890178d5cad0d0e9690276daa315a08f39302bc1a7e1be00f4343dc342f98
+85fc4c65024367063287e29fc7c8ee78c30a8690b1752978a2045dfb3bf6dd06e30ef2d3da31c9d7dc513c29b10bb115
+a1d649c5068d844e6c86a288cbdccb02bbeefb7cf42d3dda78fd04cb1cd01f437bc965f583523e6d20aaa555741f2502
+b0ce53379fb618355069938894a7e213d78cd408df37cec32a9d3fa1109cd06d57472f0a994beb1c063f3ac849e24246
+85634a2199109c28fcf02c84e209d9a08f80d8e6ac195f11a55162b0ffa05a59b834ce1a8ffcecc11d3ed023ec5df1a8
+98538ebaa0e1546f2e004144eeb1013e91737d965ce9ac5e14eaea2253998cd6276c19619f4380537a36faeb0162b8cb
+971010911df12dba25f944d0d856adf7232d571896a025994114e3bb1d9dea08eabc8100d78abc07d115209e0897f3dc
+aa4ae66c2d5c995551ed563116d54eee55be4e1ff2b4769a33a974128b2032211fb1d7709413ab60c38562ef35c71c2b
+8ea33a37ed4ad34854f5d2d4c4c57e38b3723503ed68618b343302cef8ea571957988ec1357859491b8f6cf58dc080de
+9957ab2dbbb892f642c0461da51d977f91a0f07a587db513fc7a1e039582fc7edbb2b322db8708b736e5c99ffa08075a
+97f129c42e0c452db662f5ecf4aea09ae63bffa38db84fcadeb8f0889b1b5a6cd763735c0925dca71be44f6d1dcdbb5e
+93c27d8a21ef4227f631a73a0f10053f73b7340081307d9ceaabbc85c5e97dfb1abf9c7ee1ebfa61865adee22a69da3e
+ac8a8716b0fb65f75afa51e8184588c30da56455d7df00f0350cf173bf8f1eda8c96d0f3ce487bec5ccb8ba35f3f8ce0
+b6136d65875e9f9f2b2d21d1238a43905890ef03d438d98c15042ddfab5f8d4f0c7ed74791b3064a496cbbd09cae3d78
+8213d11129a6d1027cb5db26340c495cf97882383a1aba46b863ad7bc978fc64701b0fd9ed0a1bb69770bfc57c6b2156
+b146dbf3e10d3a1197e2cb49b7e5c9f3af6f72c1d470b9cce5300831db808506d859531aaea07e7b2199d872f9a3a402
+aee752221ca94e9dce1c30d58c405f9ac2e6a9588076e8b2ba0dfce58386d3f0aa7d762edc52857e805e3271d870cf53
+a5449b57845ab0260672ca878175aa838e6f10f6a72aeb9105d5ccec0300eb00c95efefb4512047d522ed6beca42ae15
+97ffafe9adfd84f16a3f8d7eca0e896a6285b5e1928a84e8ccba3fb307c1cfc2db0212cd9f7afc167437440be82678cb
+b7cfdeda43677807dc8ab2b29e5a02792e58f303bb198a17da6b8868c341132649cf3560cb614e9a1a834cd4bd571ed7
+b598659737b0898c2c343082aca4a8b94ab9d9c5d780372f414d20d457a03cb91e582bb36313125c303e721856c2b239
+8adabbe7365b7a4841ea815647e7b02d42d2ee2b608f14745e80dbecd3bb1a57bd25ea5a98711a8b8ebfaa9e1033ea2d
+9968778f94b8142c609d5dbf1a46302fb562402232d3527f6534ce7563e0d8f1350ade4a79441f48aa41c0724d8f787d
+8410e5e80ef25a0d562f6704f9767611edf081aaa0f110e71bdb3bd4ea89de03ad36de7452d6e398a336bc1446b5464a
+80cadd17472f05ef5d0f05a54645488b1382b218f561e1c0aa3c66b024db3f3677456fb2213fbfda47aefd413e6baec9
+ad00410ae25ee613a213950f7183286f0b92731d32bb990d64cd8c46f6327ab5b1a53966cff8ace636509bf50e05028c
+a58df09fc821b03114c7cf3c319bc1fd9576425849eab490301f1225155e0dfb7a27a4b220e99f48ebc9e7bb33e0b0e2
+a63c419428f753f9a62775392bae96bee4ff6c88a526dcebd949efb4c9df208af2353c1d9eb10df767e904b323380152
+b159b7b7885964005dfb3d0d3820433fadee814276db20ed0828438beca34090b7b7c19d7f78e9e3a840229abc189022
+8c1864ab1427ed50341897f6ef4c716ded5f53926611c44d26117f4bd4628b86166d0ae4a5006e4e7fdf907595e267a2
+b324a257d3c6605d8aefa84466a892ec72753a33193b7f927d705948e0ded31cba394f970a7413ffac2d6ff72ae8adb0
+b852d056d9e01198b8f970f6daad14124618f2a542d2197a915bc8b5c16668c610fb61d6b9a7bad81e29ef30afba600d
+959a513814ef445564f1dcf82078c17f4c90a90a7d25fb6d3b0b06ec345e29b3cf7913c2bbd8106c25d3b44d9bb6eff3
+a135ea86382b0fffc1feb0b627ab41a56d0a59183ee8c2e15bbf41101c1e40ca9e42e954a5a3326e5e2fee204735ee11
+a4fbb86f370efc93b1ebdea3ef625fbec6c25b8675c85531c70b1e1f9549ed633e6b108c43b901ecdcc94c289d153eb3
+9289c067662b7729be68282dd21ff6ee715dab73dffc630ec3c31d35d83d1a2104c92d47445d0d11b4181442cf213d44
+96cb7544412f438802eaf4e70d77d5b627b91a02f136cdc2c3674152ce5af5852806f3280048dce364fb88eae3a8483b
+b7c2dc77fde2c94dd07f16d731369eef12a35a4546b3c7f98bb8b32ae88d0c2779927754121787a72c6a4da40f253de5
+a942801627fc3b26a0d4d9cb6a48f4a5d35b26ed9314ffc6cb5be5fdd680857f0ebad809571e0631f4f512c786611193
+8359a72eb61fe327172dd53433f5e19018a12e8c7cec6c1938ed44abb194c2339ff94399df94c2cd1758ff9c92d9cfb3
+9707da6f81de22cf5db457eece8f1d35daf4acd769f507cd0e4ea8d057cad3c4969c469ca928bfe2651ca49ce24ed016
+8caa1d0f49f9535d351ae4db7f64d2dd1d6484c43faad3c00857e05d74919ab0f2ccc9bdb526556718cf9160329f78c3
+8a32813e72e587412a7050825a0acb0551f89bc61caa6c2ce6056bc9744e0d7ee124df18f6029a2f9f41aa902472a8d3
+aadeec65d10ddcdc7647e378ad5f2b9bf46bcd4196ff12834a4b23627b0a13765da0dc0f84c8dc84fe2612cd18a88ca2
+a4c97e2fc7ec2777ff74af1b255287b108cd9047b75ae7a10560f14fc3a5e8b001156a6d6797b2314a436244069b43eb
+aa474d3cf633e1d521998b2b34d3d3f8c5d5db7faa78fc37c970680a27c3463d85c2f01826717d5def3558fd37cfb7cd
+b9493ffb799ec6af7b31492bc5e392e7eb89adf7f98910aeee0ebc32c00b8e31b1a77391901857e62fe5d0c10a73899f
+944b68b2e1256af1d99998dada385863152a6558cd7a63cd9230997dedb434419545dc3833d99508cefe0c04b0296c1d
+a6cc5c80ad89a05881ec09a5ab6ccbb49a7523afb9c85a08dd090377149cc056ec0c63d3373ffb3f13a15f4abc020542
+8c6f0dcff087ac53693e48008255bd4329ec2da6130cd55c622d63d8b3ef19f207aafed8c9d7b11c7d60b3b87664e6fd
+aac51c05cc67466b386698fede62d436b79849a5710522cb7c2f41f54d36e39e2c9101fab7e454482f3ae263ea8be4a1
+90f19c9d81a9b099821210b58e59bc0e892bc92fac306e54962689fd7accb91de705743b0aa5ef3ab1b6942f0dc12bf3
+94d5fa9465cf93ef86e3cbc87342bb5d8c157c723b7748fc61d003bb415705b7599bacdcdae05dd391db188134ef14c2
+95804e19059342f8e9b2cc8857b027e35b7e289400541a85c5a2e796f6076b6378e2cea6fae7e8f29377ac0c69a77caf
+a0ba78959ad3a5cca7b214bd9bc817075d71c7f699d982648378776a3ce71fcfbf1062b04a8b4e16077d6940992154d5
+8c24699416cd41b2e906fd9fb8517185c7977b86e6a49395e2af4a6d25fa82f86ab1039ae4fec37f4a52b63804203b80
+a28b00ec3ab90abcbbb692c29ecf6ceeab09551847a1b4725a0ea3102e19dda5a99b64fbe5853664a6064109e212254b
+b5c3fab27875ddccbb4f93a500c9a6b3c634417e365cae99bff165a2d544c9cd6a6ff55e042fe2bd54ccdf4ce8306228
+ae0ef8516d8c4dc1514de3da39cfb5b3f3d2afe77e9381389bd9adb07c9eca587b48dd370893cf1a6bcb8c094ab8989a
+acd9a0b0b7aef79bff1532764162d13e08a0c34dc55a246e16ac47986877789c9061a68d30ef1a4946cc7608b79cf8c8
+8146a47ba4998bd4a4562ffeb9dcc85686916c67be2c4b4f8d561db51679005b9a47bc4ac7a472e6ab89d7e8ec2d479d
+8aa98ac804b0e71d7d3de780047fad561ac3ac5350282462625f3bd24ecd1ba0317b218d5086cff206c38ea39b30543e
+86129cc240a9c8f3597129b6dd817e5db183a8a38d63264e9ecedf4e0900f31eee17b3a6cd593480efcec9b6d3c4d553
+b038c48f9dd315fb05bacd3023ef24471311c595ebe6a5fb57c4d6206445ed18dfe45649cdbe263d73080efd41110695
+b3976527178c76c4c222297da0835669207c15646e1d0d24cfe6bda6a001f5c248011e0509ef2b616e16249a5c9c3f47
+95b205cb1ede704760707aea034cf9d19b26b273c8aa690241b8a461254b05fdb1fff688796b157a929ec0dfdbf9d610
+9762fa37cc6b1cc7f7fc23d97a17458aacde74b1f3792bf9e425a380dfaab970393fcddad7241bab10fa4292a70bfb0b
+a05276c63cfbfe5defbdb4ba5006a87a97959d80a3dbbe8fcf40c71e6e5f03ed85678e6894ee01f0f0bcc52dbe3eeee1
+9530ea93f98ab49ac8c284480a562d62682277e2fcfe7016ae643067cc0196380194780a0c2c03731186a9d229aaa45f
+93c03104f921fe6d41b370c5ffafd25bcf952bb7de2722aee7b7a1d28de02f6a326e508d4b2bdac330705e638a906d19
+a2f3061f5531b684e2b539eacd2faf2395fa28e270e55db7036c02e41f8bd244c579b7746cb36daf96f30758d46946d0
+b97fa4565f5f67febb9b60dbcc3e8047f7f0ed963f4f4b1b8095a6932bdb31d1eb47bca6ccec4bdfec115f3df1258857
+95c1f51a5f5cbc6637f628100897e384a814fc1606377879c7df06d54edec53bee10b80bfb18f679465b9f2613c3b117
+846b81e8089df8d288e0795a719dfaf307c659d53cc09102e30876368ed7d818264cad21460b38641e09441dabe42914
+aae382dc2ebb20bf89d44ef010d76a7212f5374a4fbc5caf394ca972fee54322d726c696b86d4e6b9f16a158c9065384
+899255fc47db3f1e2694d2f300b14e765b4595224deb9527033fd16f25ffafd3f21a023113fb848a0f96931b6ef31b77
+aa3ac7fd484eedf34ee9c48d4dcc1f5b658c54afa3697d573b2162d4b0a2529cf1139a1ec5c00bba27f2b344fb0d191f
+b66c43f81a1be23e806be5bbb4332d9448b8dbf507755bc0be2c86737a4bc62ee9a55cecef677b22300e7e00257068ad
+8d1bb37d004040f6843523dafc1b8bb7f8856dcb160c65631799708e5668003215954bc44eabb1aefc06f951ecdcbb40
+93a29e38574573be2f68b3cc2f683c3b7ea7bc58ecc58f4ced0d2bf908a47edc48cdbc84293fc468f1dec76a6ffa9919
+92a468d7f6ac9f14ec6a0bfff01888a40ca197ac817958a14bb38c403dc05d31252137d46950b0b9f242aea0ceb7a184
+b6b708061c43b0b28ab94cd0c9ebc33adb9205f5c0aa84d1367c4e5a4ccfdcbbcbe731aca830cef25feeb744e52775ef
+931c274184f3d5b61f23c5f7644694b956eb79edd238e6991c13c986838ae1049fc7b695c4d4ec2aac42799f7d59ad6b
+abaae09b111f9d85213fdfa953a8f7c15988a3b21f7a71264f323e39a91db4d9ec836d4b27ee84d1d8a267c570e06af4
+98a145c11bf6e0c98810b8983dead947ec765b3bd7f9e245637933372dc1ab0cb24441bce3f18c25f70bbc91d3f1555e
+a94ac8a11eb64bcb8185c1aaded79996e59395b5d130e57c12a946b3f0a9c06e2f583ea0ab98b38d944349e30bb393c0
+83facbac681dd218160be5721b7f70b6e0abc6963a721278f5f8f11816ea8848de2a12726031404f1bd3b0d93c7610bf
+ad7fc2b78179621f502029d229cc936039360fd541c760339d4f6690644b39c36f39c435c45ecd7b4c683b45b5de8d5b
+a93e6b114299c348a530c0adf04e3180de8c18bb04589b3fdd358dfdc118884c9554091815a01114a81011d9e8b9165a
+880a5b941e6e7d213f0912c4e2800227ffe3c1c5db141b6357ef422ab8e55ef2c4de9a7acd6c88cdd9057e9b700b62ce
+a79a25b8e8a2b6075c536822981d9bf95e71b60749a53fc7a40f309b92034a5a8a5aeb0e6e2f03e8e24f47d765fc27c6
+97e5e6a5b56d728e8cfa6eb048b74be6de7d1505a6e4354964c5f27aaecd8329b5d5150e26025d5e1542c613bf77a472
+a58bfcbb8bbf0bf556c0993936beab3a874b10ec56d25ab52a02b80ca4586d30d7f62990157244f326ad6de05c95dbbb
+b5e13af56257d4e4b77480dfd738a498a2a78e1dc12cee786d60100a0d4c0adbdebf2cecd2ddae56b0a3c143c3b48c9e
+88ce83c216b7f0a74dcc614f56ed9670eaa4052e8081124360cda319158e496b47edaaa8de28ad1d3e3887206f8c9fa9
+8c821c9d0f339837f9ad2136dee0e1385a078fda212375f2f79a56988f64e523bbce59cffc48834418cc37ddeef16e9e
+9249c78a361432d967e51746d2e892a71925ad205ed71b93911a27a3a1135431bb424ef0d6d1ec961547489b0e45bbe5
+994c0205a2c192053b676486091fa49f6385fd404d106ea0949a6d7b074b79bf974647b3fa9bbb29eef106b12d004310
+a15c25bdbe3d8da65874337dcecc8178c35cdbfbc9d9c6b80851bd97690fd2dc2df8012f671abf2f3d0a7c80dbbf853e
+8bf4a209ac8e7d639eb8aae0d22511a39d9427e8418198a34f59782dd9f6afbe8540c8a9485f121e8dbea8f654f3bfb0
+b455d43fd5dde19a3cd73b6f9b3f832f0f7995bee3cba01b0357209f4cfb0eedade3d3306815da4109d05850bb40acde
+912e13fd316f16b882fcef2f00cf043eb86045ab456118f7c3621a5414c281fae951b44c417fb733c43e146416fa54fe
+b9e6af5922ddba6584b56c5e3cbcf695aede93271a8a26c200026d9941c564dd27b38843597ec3924a81e6d209be5a82
+893e4d8ff12064c627128e0d33c499fdd6d884b41175e8dc5eea7a52ddff50c902b899eea64b549926a8478666aa8b23
+a07b337448f014805412c1f55516792eee49614f22b5b7fe7018742a6a389d496611f327a3cad1503c3eb3f416edf869
+a26760e5302364559671560026b6d4f26e3703238d4369dfa73536776bacabca0cb264a5806c0394c0c10b783ffc3f56
+88a0af353d6566b8ef5f32e2a5066feb9b9b942380aa557833371a24852e96a4983e03ad51e13ea4940e0eb4c75c7664
+8600082fa012be340643577af0417ee29ba540e23a1aff0f3568a0adc1a854e742ce1051b3d5da779066ddcffdc65d06
+88bd1dddb613991b9ccc3be5f96f79ded6c1e09ea96512b6ed17b18dac73facae88cdf0d17da01e7cfd5c38da3d06355
+aecae22f713b2792bc9351ca2ab301b28fc578c2c1ce6ad39800385e95ab275d0c1486cf5af08a54e15f17641ce60f0e
+afd04d76335c81e86ab9a08b1a6719fa5cea4d0f090f4c678fe96e09e7d38ae26766521dd20eff3c7290e9fbbec1f081
+8404e03d13266d3d331c7aeef8f905d04041abe496027b9f9dfa1e3c55c43dac78634fc5c860bee8a9ac856e10224694
+98195b3fc94e03ab66eef7325c36acaaaf3f0a28a2440cc891939e04281b2951e4b1316d7f82842e2001fed444cd880d
+ad672c6f852f812486cd8601472e36aaf66d5a873b0843c2f93e40865fe017ef710c48d286e188e127aba780dff24b75
+a3b9fffc17035d7d3a66cbea5c5014992078df6a437eb8d4235cacf6ba24041b918f4b61e6d285e278483c45206d1485
+aedfd94a7ab12c5c7fa25ef458fb227bf6cac8848a4873961e8fba90b1bf7b9b6e688c1217517e5ea08eaf39da43418d
+830837da3ff93282d6dfbb02ace35fb57771919b49b6bc51b32b3e7e41f2761cee29dd6861d106a6e7de24879f58674e
+aaed884ca90cae6dfd11408858f75b6b37db8085e221a278e7cea53a22928d6d01d43b7f98e9e5d0701df4639d28ec4c
+9981805cd99ac373b92f5bb4a0cfbce7f07298f8a5632014863f7a071c68494b5e637b7e150732c375aca06be3d79895
+b6b6bbca3f8833c02274f182cc9e53cf72755f7913b5354413cf16be5c09dfb308f1f045371284f467b7a40e0f36560d
+a7f0338a290d682cb2cf5b891df35642ea8f9befe1d229cad22a16c2735fdfd3f3c26ddafed41c7ed876b0cf54612ceb
+b038d6d7b5336bd9cf957951366f73d484bf1da3a6da1148484474f3a7f7e74ac7235ac63b7d9d1011a90ecea402ce00
+b43cdd53092f4195fa6a70a713c9096c8ac5102302f2a7ccae6afb933a579485e5fd6c947f979143e896a8d0a264b1cb
+8d3310f5e2e8546b57c69bd9bd012ce0a33cf6e80ee5c4b258a41e32db360b0487c88cf62e256dc5f6e9f41c0631d750
+92d4960d2f5cf834e24988f3ddc9380bda961de7d8c40a4f0684242a64e0ddc3ceec4feaaf097b7f99012fca57e74615
+b60ae72c7ef431db21c81b0ac9ca57a664fb257ba449191c92dbb88eb53b0100f0bffaa99bd44a4d84b7fe1730a7a5f4
+86b1ed40457e02b80c93120c8f17525cb4315c68c176fc3eb56e9e26d26c1c25eb3a24df2b6e93f1675e0f47f44f6a86
+a65d03f81d71530c768dae364f64a79b4f7ef33a9e03bbbd3f2c486c3813824a3d3c3953aca21e66fe0cb4552f2665e8
+8553f75b09a1d294367a16456287ee7c8d8bae29af9f9594a14658236db8acbb363bbb9275cac3d934619d95a83f38bb
+96f916427a025dded34a24fd49f49730725cc4fe6f27bec379b3e4f0b18556881badd4e588dab9a29ec4011f7ef7edb0
+856608c27413af9ea3297aeac5921781216904c76896906c746d07598fa258e7c561ceed240a0fe6eec5f0d6cfa9ecd5
+b03f150ea87f48e8ba533d448fefa5119515e6d47afc25d2928077680d562d6294e1cb501d0a428112ceebc42f0ffbce
+96e9be02b6fe585294b0f0e126b21ba2327b8e74095d1eb0dd8ebfb280758b07c43e1b1127f7dbf88af380f85846a983
+b866d4860775053c82c4c6fca8c0d5689bd673df26b30e528bb8406b0b871d97a7e950e90f2d95a95cf546bcb80fb6f0
+921e4409abbae325425d2e67b9fe9617ad4b00710e49f704485a3ec947bb7282b6ffad4a303e0110ecf46076852e929a
+a52e51329c2995cf47c87ffe47560ad3b5222d19bde8747a9fb056e77f74f869cb4c23f3fa4b21e9de5a61ecb6c52432
+85599c31338482e3f8216b1ea1664ddae5b15977efa0d8227cb58342e88b26581975d9b1cea91c98d4a86d22558fc78e
+b880e82d301ca15a01bebceaa7f54bcca3cd0fc92558d1b942dcc174a85ae8a1577c5e0feee963e41636fe372174e938
+b50ef1235b1283b490b6bfad836dd8cee72b86054f14ce46cd76b89c97f191f040fc4091af9c1bdad53a132bf751f7e6
+a8475ed4ba2f51f9041f71049b7fefa216c984494398656b58f317905736cce2091e4df7dbb3515d0ca72aa8ea749338
+95c4c4005cfdcf2778b8b27dedc17aada395eb80bece2d4fc8db43654f827d621e539d048e50373e9ce14a60180b7269
+99df65189d38997ebc4e6e2dd5075511f735058397a33d252539a0afe517623b7910295a8742682a2cdf4e21f603986a
+8fb5fa37b512b9b02182065abe7f2c74ffc1a487c78f225c6bb82da4e3f245a8b62b652a7e64a0f52edb30927046b6ab
+b242b2bf09d8c46a1955a121453893d455bb80e4dd648b5e87415a5df79a19b4094c55b813a5b1a488802e31d26982bb
+addbd7c3a9621e2c506b7a172cf2625bf52b3af988fc24f2ecf47753dbe1173d95b86bbf4824c247675f57bab328e9e9
+ae95b055a1a249d19a3f080ce5cbc7065f3d009ebdeed03362db903d1e5138371a1564a9afbfcb51b620807d0e8f192f
+8bfb763dcec00c041492d5a5e57f9c7442115201984f353aff71a08fce2ae242189cb098e43fb642e808b8761fa517d2
+b07b768339a8876887e920e5dc5e30a20fb24afa35b51269e154f5e75e93bfb334c6720f3ab143cfaa064221cacc1384
+9938f3d9d5a1da8c84dbad8e464e32dae0cecc232687d78b0984cd2b332ca7e41c6d5eade73ad9b95f0d9d076c8fecbd
+959553e80a715ad90f4c83dee5bb1cd12b408b7baeb190df58e341e51b74018265dd2344602c74b57a747a75269f3e88
+a443ccc6b4112469ac4fec7af54ed637a719c1b0e0639742589f7a6309555d4674154f6d26839b76e90e9f82bee7c79a
+8eed45cc7a9f3a0b2744488558c9abcc7a7e67a01784d4023cfc893ab88f443d355e4aee29c784d7195639ea7286a738
+996a81c4702567f42a957fe79e1db9f057b8d6a68ab4bd6b797c8f7319901919772dbfed7c0eaa9e717bbca61ce3aad9
+97829a09c35c566e6ba2b56d41ed069e6bdb48fed06dda7b8904306baf347d74467a65bc9505c9ff0ce2a1b1eb93ecc3
+94611efe2d155dbdf898312b53c51eeb30564e2608c3dd128e7ababfff92d5ebcdd8d8f3b6f57048cccc8da7d203c505
+ab83c9c8ec3db031b825af7c62fccf8a48a8a8746267ac7ff0c3cef0076e405b6ceeb459219d970239e76149bdb22278
+a5d8293e8bc13f832f1c277fb8534bb351f2e647f0558e0832850b74c35e101e5068752a9685770948d9203a68ddbfcd
+93e1535575cba89e954312e9cd70339c61800b6d5627552749fffd4a77bdbffbcf4841944b4e9b38cf17400647434657
+8cf070ae2e71bfd843f9a13f5eb668e2dea943122e5c5d8c52db9d42e257f84e3b02cc22eef3f29d847f89c8051c8811
+a7351f0c76b8b678aff461c1fc78e8a55d20634da44b73d68a00feeabce0cb145149ccb8261f0269e3b5a43c93532dbf
+9962048d16182ce28334b5c1c7b7a906dc54a739aa8a6e46878044f4293bac672904bec2292a288601cfb8b77db8390a
+80dd3875dda5a0e8b747d431f5be4f181858c88a347b14cda91fecb508c6fabd6844adbe5d24fb0884c23a6af3f2e968
+8a6a9b3f7f99c4178e8eddd369a760beebf04fae990ddc8f0c2addcfe958b3318328f2d44e92515d8fd9c5b7cdc3a8b2
+ae316364802ed4a156e4107795896db8cbf1321d5d0af5ffe0d0a4805910e36429d9d01610211e7d9c716b4efb1b68b3
+9393c2bb0ea1855edc3b844e55291f3212b09b868bdc37cd7689f0d7e92c7473937af7ac16d6516141ca1dc17ccc7150
+ac909d1394e7d3b373feed325873310f29dd8f46c911595c2e8325e90ab8ec52672d921c447e69ec2d9bd000bc41cecb
+80e58b3c07b9d8388a7bab67b77a68c7d1dd95f48b53f85a1366e2ff1b1d09ace885a80f49d686aa2d9dc6fc3579a700
+899bb130c5bc3703b0484a2aade21f4ad9099c482935b664d3db70eca3650b445e454578415622b01f8adb53403a06ff
+b449d6a5c20e1c36a35bd909854e336cb097e2382d048f332e21aad5954c50d105dfe7d4a28fec14f1edb263f2e2c25e
+b45b4ff01047afc7c64bcdb9ecf6a27201803c4ccc16ef36fcf3df02af5b447f7e36d7e150f847a5c767902028cd121d
+855f8c1046329430595bd7a6e2612f1b5000ed5a8904a4ae924b132a3916626394dd150c383dedbb22e4475787c13e8a
+8259182fcb8075805661c68773b5772781c45a1b406dbe3291c364e99336c89cbdf1a35b4e5cd742e0c09330967c79fb
+8513b09f6cca871ccb53e0087352a015fe23dc66b1cb7985336510754d30e25c555e0a0883c04d3d8f977d1b14f8380c
+98f6ef6f5267147ad71aeabda4ceb2a010b998ffde238cf461a4081cfe2f94b174c65a5b99f5bb12685a21f6d40e5d1d
+97def96137d35335fa3f8b3f0925c6f785644123385bff82c67320810e6bc3116d23788b7e7682d28cadcd7ebe9391b7
+908424f845cf4bb30f048dfb8d77429eece0dbb1f8114b812f835c0fc297c7743385f2d9c389b132abd8b799abb906b3
+9342c5de2b22e2ff330073e79491dbbb8e0721f7f78e2c4d26b15e7a038a3c83356d170f0545996ebc28fb4090415369
+94583de96cc41a83c572d66fc2c91c62fb2ecb727de8d3af460fdc6ee3d8bdf6db92eeee454d0f0911256455b3527e2b
+8923c81cfcb0b3826db821aa3ab3ca367b5ab75a14a73d98083d88d3c6c6f080b62c2376a18da975bdaf00ca3e3bf6ba
+8d2fcde9fe511d5c030ad76bdbe60147053382003d76ad0e823f88bcc3a9c0c2dae49d8456c285c4782dc6cd6945493a
+aedbd6629aa8732a94e860328ebf043ab713f36ac8055609e49ba250bc1a41f55f429788a3992c88a6769c1c37e45fb4
+8a692621506a50e26210b593712ab8cf40cfd79daf197d6130d603da70e2c89983221bd43113cb54471f500ea3b298e7
+8716022f429247192d04b007b4bfc6a35caf49a613641037143ce2dafe7b5a4930c0cf698c216b761b15ce63f4f4e4f1
+afd66da5617b07f6e14dd039019b28fb5aff8f14b4c0af5babf485d9e9ea77f3fdbabcfead1068c0415de93c99f7f69b
+973cd042b5b7d6d8d5f1654555efc16d77d6e3a9a4e3a80e782db6bb297e4269df882d59c73d8ece5001d93baaa28745
+b0fd22c75caac1eebb54d621e12a437d3f50370ffccba5e90fd65a934f7c14eeaefb9d2c2af8c105d9757cbabc52d65d
+adf8fe8f0daf405a5cdb26e4d99b10a9b4bbd1e7b8344dfed8ec89a0b452e1168eb12cd587606f3a0179f899305ff35e
+b66c5014864c1e2fac3b1a03d37584c270989d770a31c43f30c5c64e887069390006ddbe4f3d6096917fadfff0a82bca
+ad799ec175eae28694da6be84bf96b58ff464576b0b4dfa041ed43e18cb920dacaa8c2d6641d3ace5d80c01b0a885270
+b9c196d7d8095a4220d7ffa859ff843a19f0590a69ec1c7226f4132217770c122a3015454df562229d1cfb06bfbe75f8
+a88ec2554ad628af62c2301aebd842b1b613aef59deebb699ebce014ce49dc2136ad78d61fe3a5bddb52c1a37758564e
+a7d13ed42552238853ad75a56b0b4ac1eeaad35227e8f54e345948edf497cafe3aa67bf5734f508e3a34ea1f84a2d619
+8b315c5e62fe691c1104fc38f0792499c2131f6ec94000902edf0888537f26b8be3d9d20cea29300459594505b457b73
+952d39d655d22005c2c0d06bcb30bc7d9fb4b074c0bd67b361b83d34987923a86575c7d3bd7e727e1d5bb3b030989769
+8469a8fafe8c5634999f674fa5b35e1de52dce5075f6c4b2a88417618fa3e82f1216220a836c343540c3f82c3d8a27ce
+a0016f13768043458aec744bf7b052358f8a9efc0f26ddeec4bd8ddad09b40b7848c38b401e2bd67a353189b635fca74
+a7c9cd785192e32ef4fba350130af2dd577d6552c4365b9b7b30eb69dae48d68bc2ebd75ce6b80641d8f64420a1353eb
+89d22056f344b22441579fa70614fe3f90c53e444a68ba31a330238b7080410bb587f4461fe78661eebcd972b8c91c4f
+84c38a5e852387235b9805cf547ede71d7ca65827189a1ef25a83d9d6e2520e416e0afc28d91436a0a234f1e7efb99f1
+b1c170741d0fcd59b9d534a95e1a5d61106c1a2b671b16cb231de933c03f9b398fa9a5eae3b78b10043e3cf5183164ee
+96388535c09dc84a1cfc90f22f8491419ab3dbb69889999bf939852acb34af2c30c3dc067cadd372440da2469a7fc749
+ab1211da4e11830484b271a9accf219cb49ee4c35a67ad61b33bcbe1d91b37c72e8632667e32c6769b1ef1d642313d39
+b86b69f64c4e5b603279e7804413e0f9787144a8e3f0cbf3c62e8622131450b4258f72e43bb220fc5d5b857455b0c450
+89693d9a04166a2b9aabec99d6962a5867f9e71ba732463d01ddd36ac3faf1351d8da0d0d836f285999f75dff5e79429
+8f2e0e97ba00f8482ab677190649b41a32109f0391d0433b89b3e73910d66e0d34c33cc4244c0a3b8282c1e1ff4e46c2
+a0c695498081bd255bc21d2c99c4dd9f466dd2fbf93c07abec13ad3dfaac697c8e87fcadad51f8d7e1649b16133b7206
+8254985bf2d0e9f662aaa58fe902cd594fca1c4a0b6c1614bfe621741ba17fa87d55cc5eb0118b2b3e36ec41534d1e4b
+a3f674b4b6eb28a397b0768f3e442eced9ebc77f6b940d4fcf0c61410c77838c024d4c911521f11a0267e3c281f83876
+8d0fbc99adcf95044966448efa4c2e0a17f6799943662476d1877894562f3457a235b6ba0d34bd690125611fd1db881d
+b8815547debbde07b3106143a37f3eeb9bf823065e107dbac9c94083376da22e8db6e29d3c3bd51d64d1e2ebd8f2833c
+909001246abd7fb0dbde3d1e9410eccca09dd2c8d401bd9891f403c9b52c175008e052b2574493ed7a22299a737a7bc7
+8177f4a7276eb901c52afcee285ea905f1d6d01c1d4da2e9162e268897c020d81fe462d978e27ab42009467e918fbae9
+887128a316b4d253884786e62286a75a6aafb87ffe5e14cd44151bf5fd2aa93cc103ea46ff248225546eb124b0fdc618
+95aabc433f0233b5e45afa8d9adef84778393b3b366ade8e703f63e540105626926aff14c48ca896ba3cdb99b92e4113
+8c6d6b33017d87e15206ba8ddabffbf8610b5f05484137fd79ef98e77937465f85072eb5e079118a0f92c7ca996a38fe
+b2a573683d47be62501a33fd228cb38cae0e26e66fdcf4716a97bab823fe39342172c163b21fa6566bf140ee6c60d898
+affd9c21e842b5abd6db2e82e0ce355d8301282cef36e2a0776fa354ef4a64a80fe939ac03201e49ce36c77b95efa31f
+8e7e47f99294b735895118fdedff27918351ef22e16ddc814ad64935bd54ee68014349c75aa75081c7b35a19de981209
+937c44b8ffe0fccee348d5831dba4e4c5e83b6b39d056d4a4146987ab73b736eff92c138872e6da06e1eae3450050ea0
+8bc22e1faa0fea57db16e0a29cdccbb658b125f0da6c3121c156614dcc835b1eda596374883a043e3cf3d5812a32f6da
+acf0a8e002b5e47b0f591ac6d67ba7d2d03c0bb7f475dba09dbe877b50585339cf4367d35118d7fc062299f74076f06b
+988065fad7da459903d1c8b1c5c5b2a86898ba2ef40f259af52c100554574c0605eeadc5beab8631bd9751fdf3a099af
+865c29b5f6db4c557f26ae68cf3f09d2723e6a4214fa4de8252343e5b13ea98dc6a18c43a2a957f03d82ffac04d96742
+a4658ecbaab8010495d2253ba880cb9c5d5e4973544b982de1dd001210cb3dcde58627a196ed36d33387224a057d59eb
+8d7f1dc9229a4712f244f1e2bbde55f1ea9fe7bf30d90424d70391ebc839623c7f58924054dbdd813de971d171a1c895
+b918b80341da1be2635af51d33493e24a3a51468da0c53021f375319b6d7f142bbb9632c8ba512b0de42b51d8e2116f7
+82b633d66b9136f5da10fe6e7db0862eef339342653a1f5ec1b288495359bf67130fba5404b4a601b5cc1d9e931d2465
+a8b51cdc519fe1bb07517d64161b02c85ef763c265c2de76a8287b7edc63798b50afb168c324a83eeba514a126e9b291
+835f2cb916f75eabe0b7c7527bb688b1d38c7f033242169553b84d6885735f85330ac1085eb2a65f521331b853c76bf7
+b0f7e967bed7e73a64dab9fcc191426c50967c43c0b68b685241cbf87653f7061896adbe5839f685626307014ef3da47
+952726763e8ed7f06953bde904d0d85e9860c28038dd347efc18f7ef9a0926490c4ce8d9a244b33f07d9ff3d5c8000e0
+84f1d8c0f0de624e7b11c01c8fd5ca0f9f14fe223e4659866b3d25def1aec70ef2b84e98ba57e801fae2fb0c924e37f7
+8eba73a7f1222791916680e3d5051ac465b705167a3248846e41a9d38ae464365d2112e0504e001554d95a674fe02961
+ab8c38ea34fe35bcc1189015583a8ffaf4d1d3d25dededc316ab3ef323dd2b4e7b5848d3a1346a0830573304fe5789c8
+977b44b1953df7083b3aa462de8d4f1a939b7d53208a6e059a4667d57353b0dbb5aba81e7ef527c6ad34bbfe31b1df6e
+acae51ed5bdb79421e48141fdaaa2a0170bad2b5e97f29b1583cec868173f035b741cd0275bffdbd6b1c5075a858778c
+8ece5d5654085fb89fddf30ebd1ab7f7c09f22f36a3cca243065a93a1f17e3ddb8c5715ad7966bc358927753181e9c7b
+997bc4885b71261557d2c769a3495678268abedb4edb27e8e76639c337a6e3a78bbeeb7086f54542be43267901269257
+96ac5346877b79649d51e6a04468741028d7166bec53590e52b78bbcafa96cc4eaa6e92abe6c2af27b7103217cba65f7
+9475731d5e5b83c7055e58270baabb301b4823e155986d9ccedfd4bf4cebded42040db0f071a210e0ab22ead92e737ba
+ac5c47f50345ee85dc0fa567f976d8b7c038b3d9470062186042e2fa4b04381af438abc593ba4092f3cefa37e82c7017
+a85004428219e9488a27af2115efbceae9ed359ab20426cb6a213fec93a28175a1381a4e4465b6104aaff7494091ebe1
+a31a71e29ab0f714bec2a9411425bdf2ac3a4552840d5ba652d4c1f19a9b9b6eb5f06532e14b135cf02fa815f318cbdd
+a9c34fed2cf448acad354248c32a7573fd84309dd980bed3b16df6bfa017fa6c4612b34b951e08001bdde9225ecf9925
+87f7b7fc0546de30cc7dca29e736cd46b4a8dbc8cc1bd90a9997216a6cf05a624439077b4c3a64bd9f6a393fdda89931
+ad7643a4a8a78a47c9021339113dcdfe7b3d6ce49faa7bea89f6c93cf6e3c89163d36fd20af31bb05ec85224fa80114f
+8c42f70e3b415c8b8ee8bafdeec72df7d6e2d98f816de47accaef3bcc3eec79c16a9cf6e544b584a15df6d1a6a33adab
+8e798628a0de39fb8fa41a801830950129dae10ca3c921048754dd922a7cc57d4f7644253706630aa8e461ac812ae4cb
+abd8b79cdb7f10a1780c25bfddba5e5ef15f59479883447946f9d986ad7a56402d5fefe890127cf48ef4e400538fc674
+b0367e76fbd2868c4d26d2cef24df0f006a192ab19c52476d1ae0d3695f1070e6404a482af965035723c7e806cbbb08b
+afa927c8bd26e0d56779a25517ddc2d813762f3d051a39588d359387c798b782aade8ebba7b4f80c6f091b7eda2e9a0f
+b3a846e5aa6223123c7796eec02d139183ad6eb3e3c4936ddf8b56def9f33499611849a6377ada918f0da59e9cb23f5f
+892a88deb8ec826a2fe56f4f8b33243f366cf37aa60bb3e3f2d8537af87374316e222c77e8ea87aa2aa1cb4757fdad9d
+af22022daf80e3ec5495e2c413b5399c74e515562724b5beb916b5ed4ff9b8960848feac73f54dc460623c90efbd7aa4
+b9a11e155d91be316d08ce66ac1c9643afd007dd5868bc9e3b11db9f2d425bd4ee008449ec462482cec527767297ad63
+b0f8016f1440b8e3af6fdfe042af4023e04889093a38eb96f3a0a3855ed92ce18c752204b8325c4f0d308c69817215cf
+946231cf5357a6f936ac15c2e237b3bbd57449be54ef04fc9bc0f41558912f0ee9bd159098ecf63e4739365d147e334d
+911c1c4e3a95238efcc91a1e784966d6ec871517dd8621e50e39e29e3eaaf6f442867a4ad3920a467ab178bc6bcc497f
+b6a43a06726fb70958a97f60f5dddf36d638167db12673234134c4b50eb031e83b98e1fa59a8441246a14bb3c42b6975
+ab401f0d47d80f1694cfeafbbca230f212e3266a0bd7377053b2ff67c582d588ddd494894bc1eedbf737cd12bd521084
+93a72a6bdfda70792900c0fefd8d965a26b9459c78c1eba72725416887b7dafbf3537cf84a7c60b38dcf7b2f3a417226
+aea1f6932280a9a32bf7aa5cfe5fd8d12fe35e3c6197d1b24e8d006fba87645358b788168955754da7fe2e256b77a760
+86961d43deccb4d4a6e35129a1e58250cf744b5c8f7bfe4af40bea9ee9f859f2668872a46ef54d5590b793e70ceb44fc
+a00584fe7feec01d863b57894df34884fc4f05bfa3d6677bc6346e615eae261869651bc16e09f36b15e071d14b6d6ec2
+a9a33a813d7eaa1d242fb4e6f9f1d5bc6094e2fd344778c9ef83967243e38c77e0d95da9736dcc9f4d7eb48814564ef2
+98bb194ca38025d9d1bd0d39806f1e6aaba0f1601b34d62da293a71e07c01ef973f367886d920dca054212665396633c
+862c96a93a5c8b057f3f0b1bbd3ccfb9aa3fbf8fa54896c5bd5a4d472c873542dbe3f85fb3202f800de3a62afe7f24bd
+b791bd82dbe37e6367bb77504f6aebc9033a9c3726f4c5dc7e78cfdc240d811a447c5ec6a98328666ff4ccfcf34429ea
+93f71b1f8ee703ec9e1e846ceedea5588337d9ee55e536467fe3a183b57574ff7129ad4c4a90f8a85a473782d949f793
+857545a9c3876c8f91ac171d1245606d1331bd86e35dc899984b5482c6132d5038598d41620532882b04c0d120b0831e
+b3ed0887ca7680131c052b2493b119660d82fb776d78fdd9412db470bfb94d5bb99feb92c4378b72ebe0ef37db664ace
+85ff9f917acffeecefda709aecd72699092269284039a237329e80ee2a71e759f4490e25b274d31c8f4c60016753c40e
+99dbbaa49fde2a1c6e9a9491b09dbf8c6120a662a85ad37f310980002e9fa8a82ffb76e73376358364f0a9b021d1e3fa
+8cdd3168e8aa14a63d27bcfe4e2cdca9abafd8b77267e05f5ea2bee3e2dd75c0948f84ac196bd38dd4d552925653baa6
+b7d3eeca5832412b9bc37c04f81d45ce2b43ea6d1e0e7d4cee176604aefc51b1df898aa80c58f795f288fb65ceaff267
+8fb16ba37d8d49aae9f7ce48a9d2c511c4bada41d500f6666117617d1d83248e85af35604843959b420f1f0bf65f0ab5
+b4dae92205a4f863a1d77cfad94d604a90bbfc9863fb62e96e0019bc943a9fa04fbfd958e19f905e1fb5c834557e0f0a
+ab04b0590ac800d457b1a2f0493a4e7968391b623e0b54ea27362222eeb5dbd1629794566052add8fb09844388c85f7c
+afd1872d0eae250a73dbb8ea962eac230aa5c70ae8b34519c60cafebed21c35daef3d7cff73f354b511035f45e378553
+8408af10276f388ddc874c1aa7d475a52fa4eabf465d4ac91bd49cf6f602cfbfd94e0cbcd47e1fe60c2256f7216b0185
+aab2fa76a6b2c2c611b35cc4760eeb3183958734fc85cb94ea5f82364b034a65502b63c0853b1e34b404a52d5f27ab58
+aaa1c58fb59459f3cdc6dc763e67d61c275b3b713667b5574a5a8d7f728fb103b57fc82eb75afa70bee9ee0e4a1de5cd
+a2386a20d271f465c9070109b5cc271ac461718accfd6efec607078d4dfb183f83fcbc13507aae6d4bd3b75840adc792
+99aa7c9d89eaeadc27ada6d7b8e7da7a1f7689d67a980505354c76d516d4069320a6f008cb01248ff52c3f4792d35c11
+93301ba65e5000559171243790d4d1614e742ed2d7edaf5968e3fc808d9c7ffe9848fb90ccfd8335797c5efec6fb1fde
+8c09fb031063102eae48a49b6c8505971c3d0c5a51ed5d5772782f51f359165641659d4a8dc8b21c0170a2c301b418d6
+8503b5f9a5aa7b3fa1cb9a1331a1cdcac4d0f48b3d39eba44c91f1777826982ab435e2715277e4af568aba1e6d6e9c02
+994f42763593bd319c53881e775001e5dfc2f73431491e6bd7cee7f68d67c2fd07f9c3d42a67c701d81e78ee1d9dad32
+81cd9b37b5e0e4b981aa950b75af66c7920a9a14ef4bd533a1601f0cd657ccf30fef88f4f0e07bccf21e2b20dc209874
+91984357f1a830a696fbcc82877e1835dec6d7289a8fb7cc425cca09c29887a978cfc46e99a050203306c2628a58d144
+8b95c3e7825b165f4db6261f8b8cc64a2285021f3d51c1bca49b82d61f9549dbfb0aa0f292b29f2c53f20a1e37ddcd3f
+ae139cf1b9773fcc5f9ba2d55f77b1db1bcf6d55da09ad6ddcffd8f2431810eb59c6b6450c5a586274da856c10a06889
+8eead75951a2db5ecb0bdd965bebf38a87bbcd3923179aa34569085c0741539599a4fa354ec240ef6eda3dbe086507f8
+87dec9c32c4c432e2154c56a09d8799b3411ab85755745e16db16b5bfb9bebbf24fcb5c5abb39e5592ed45ca2ea1876b
+8612aa7aa27d5f2ba0c19fa4cec9a2430c34f8bcd45f12edd782c288a1232995046df0285c92e471570e563d05de08de
+b76728f34b64c11cc253a80f2e8eeead6bc6767284aa8a9055e04dbec5a0cd5e4941d625ebf9d9413d91712c57ca154f
+885760ad275549df56a2d4dd7df55cd63467f9ee81dad44542324571641040f5d2374959a1aa9e5a2908ae71c7d80c2d
+afe0ae20deacf08a337f439c667dcfce893d6dd889725faa8008ca3290f2fe4865ee2f74aba8f84424d6e7ce18ba3de4
+98a206aa52eebda387c026bdbd13b688a6dfaca9268c1940f6ac59965a7bc0eaa1018985ee66b4b69aa199814397ab76
+8d189b3c0e21d8869d966d76bbc0b039bcbf7d0969a9adaa400d213c3a1d25795c4381cbc3a84232a46ecb92bb5f6c86
+b5c3569590b612b978be1ec0d57a4dd136c12bf8508be7e4afe797bf5463480cbfefc7cac09dfb7f141c97f3096956ac
+9067cd2621a2eca18bf109f1f5bd9d0d1e6d298d95f20e6bfb6a532aa664dee6e7b035dc5a91a2d725e8b53ae047b2be
+8b8bd2a4fe2fc8db26cc8acf7b4baef6b57cde5663164655ede0096dfc4a82f74e35a4ec7acd23c8de139a7d640ff595
+818fd67c924aec500a6a3ef77f03fdff6bcd4d954fec7c047dfc0edca628dba603e42ca417bd58ad3c5e00706861a0d5
+84d1ec1bf9656e67fc5e3741b59e2da3124fd23bb90e55404d2c4644d4bc8b1b07da5672945861bd1ebd64a81bf94553
+a1f9009b2256b170c41cc21fec6c9c36dfbef1aa865051c53f95e90faf65d0bcc03419596c0b7ed6137c7c6bce826212
+a2938e2e6f96775ce1477a4af966b5cee118344ed0cfe1ed52b0e7f8c5cee32d7182855bc5108102bbc20fc44bf15db2
+a16a523356c46ab30dfc5746250c6c31328987ac06e8414d3a85ea44d09c7b8a8b1a02978b92aca0d5e40666202e258c
+a4b5999ee0b33dc847020fd737dd9ea3d8251d37e6f2c3c50bc6faf14781de90749652334e57cae4bbd2a666fae23ace
+8d46ae15ca8e3e85e0eed90ef311f7b043a29a244187bdbe561ea211a958a3c62e9c43a9f39e2cc2997c5e9c1cc75d1c
+809becd2ed50a407f1249dc15e8dec7975c8fd4320ab18003d882e7d842bd654a6c3a516e30734b27ea3119004cc4798
+82e1c72c911874bb06e089d233bb628840087e556b9f171e5bc106e1d419b9f33973e7946c0d324816777265e81e7727
+a1ded762dfe72cf06346ce1b244de5b3051d4286380ac0b25703f11c51e809021f3b5ddbb5e2bc50d70b6202274f62de
+b0f756a56322bce6f4427781dd0161657a6c09d31206199401e2c9db4d901a6ea8882fcbb447c500690269a82fa238b1
+b31c7b7bc410d9941243b1853ac1cdaddbe512221fd8d8ce21bc827c845a0aa679a37ac002c6698908316e4646d7a726
+a39d85cb0273c1bf5038a93c576de04016de8041edff99a75a5956357a3076ce466478e5b4eaea519e541aa0ace644f1
+81c3c61075652e356478b92ed8d62cf90b35626593ab5b6bd16e0f27374c6efd69fd50831955712e60937761c7261f50
+93abf5fa683e9472ca60cd77619466c8b762215814855e98b1f08daa333c6a40c292eca139f2b37e7e422f15a9828f5c
+b54fac1cd9a45070f7d5ad5a89047f83c059497bb110e5bb81212b3f7908036b80112f44102e49c2f39e367cf965a260
+83a1cd2049b70145761c2ac927007a88551e63ad43ac54b8f5cbc4ad85ac8cae01748bed5e5b532ffd941dbccdb10f21
+b2fbab6865b4ca51ef0ff696c7a3e7a77177c087254563a3955a5f8d015b66dc1f26a8fe09639fcbc3661bfab1ca1ac1
+97356cbe18a7240552a9b64be64f52551b4aa16e37028d899196fa1cf24add08a88321073221c72bfee2a41f5a03115b
+b81a98aac5b149793da7feaf62c8629f5672094f050207c747727ddacd3c41d8a9df7511d65b027b156c033f329f1973
+846bb6b03e89a33e0381edfe6a3ec4ab690c9a64b3a757435336f6ea41022201417552589158e529b475ded86b647c15
+9834ac83008a9f74307d7481ba8f1f932f898331e7c678d65b12d360796daad495ec4e0c795f40730948592055899402
+8da290ccf3e6f47779795ee48205a1b60ffd8244dcdfcf188400af74e0e40e424c6a002dd8c8ee0aa51c6458a960259b
+a673a522e817d997f5899ae2c771de59cded39da1468e3657014ed54b088683b08fe50fe06e3cf5730ed35766d73fd28
+8f54c627bf991b6099f498c3248e442e83332384b6ebaec682d8e6ce8020e5f4219f88e5238dea1f495805e131499ed8
+8b9b91fde73288973fa818d7e4093e8b9a4ab8f2091c8a2e970995bd6ff4f1262439e0baeb6554a93e9ea2771beeb358
+a880c5aab17bdbc05df6512d528ff5c92eb9878dccdf53bb703463a4e6e84f26802b0bb8ae5ced0bb72ebcaa2d446002
+97137ccba969d9169993bc47f3a45a9d1efb33fd6d58161ccc4a3579abc7e33c970ef3dddafce5e10a0d84494cc5f948
+870179510e908dffcff2ff7a88a926a13a9e174b0d1dd147f25190fc33f3ae90d056d6eac92c2aab90f9d3b9a1bdc824
+8afafbcb08ad1df0fa9b9ba9884d674e065bf9483ab243f6523b98d6750c4679640bebe281e9397487e003e63c8a628c
+88473f7d90ecd86829b85cb3366c3a7059cd6aef0325f4cf9d6cd94caeffa468a8a696b7f93bf4e522920a98b2a10529
+a56b3fbec7d0c1599f6a78baba8131756961a359b158b08ec9c9af398fa872132759ccee200cf0720f41d42dddc5567c
+8f27162a599e91daa46cdb86a1b8fb37f60511af76f0bc6bb90a92ae01874b010bf837fb2086cae501353727d8976876
+93e0a60bb8a8cc356c081bba6ec9f9094467fae81ee73661956329d59e6df76ffe8344c7ae09f62ace55de416c7cda9c
+a6c5b1db89f8515f8f7f729989a15a4556b7e7b83f1cecaf89b9cffe6f9c1dd853fd1761d40a0754fa177aa299a12587
+acc19a840c6df971bac15142d99f366303f2d29635e38fc41f2e3fa92a77ce8bae92337f917af007182aba3ca70cf294
+98fa25a57220facd6824eeaca320c65e3b99fd5091a509a6387993d76af39f6a32b1347cd3b8d4701d4f1af8420e7eec
+a0b5c70e057701fc16a465b47b5581066ebee6336abb1629dc4a57a7b202583081dbddb5e687fdd0048d5cba317eb7a7
+8be0fbc3853b94f7cafa728f919e557000e33a704481207f0ec92ced676cf2844b20e87fc073050c52680bd5ee6c5903
+ae702a6c5700fe0ba7b8e46002bfddef90f045e4e027058cef31663bf2cf9909a53ca0f747afe0d878529f1f25cdfda1
+95d505b2f1fbe253fcec152b94bcfa9b1d409ce2873ceb711d71f4293b4ab52cf836949e73bff2f72efd14021d9e5467
+a7a1f3a425ffbf8d32a9a3917b76c4173b2dd19acf9e1aefc50865a91fd50caf25f82ca15a9f3ce158eb6074b43be754
+91ccef5392d08d4ef660bc91dbf929192ce6625329f8756b498953daa9f3ba253410f30b51bb4c96bc5a9446fdf2b296
+8573696c19a40d47b0cc92db3e04c85d7f4b87a7843bc8ed5e626ca693bccd642f3b99c11de34afbc8609ffd305c7d06
+a2c18941d77b7bef39a55129464a642363ae28eaaf34959ed4272c9f2db38e8434cbf2f2d24ac5a401e2adab889641b1
+8cfc4256aee21b83c25405a86d6be842296be60281a2bc6bb9bb83beb963233b9b594d6f119c41dff79f292fe60bd4c1
+9923ce6b8831cab9f7cf2fefed7ec383f5fc1d8c46d49c6da6ad43f82fbe6a42e37f3d334b12f8bb1afb95b566b8952c
+88ea98718d9f795a8656020e8729096af0ff002b19fdee414e8abbe918d7b60561e3cdb68914fc6369721934dcbb5036
+86940ad730aa07d6cb8924d65513dbce1543f10bcb70915dead0d9f13c0db172fe5b8095d0a5a434c4effb892a9b8722
+939ef48e278334fc53a0b7225332641bf71bc8498b2896614e27864246d1f317ace6e2f40e2c498adec5d7b1c180e269
+9409d1a4cb5c52df40eaa46e97c0790cf1486ea6a076e6918a7ed173532f937fff7114371cbaac2d020f509d35e51ab6
+818145c4cf06027a64729013f0648741e31a6006c3521830b6a31f8240aa60d5469354939af50023893786be249ced86
+95a0e5f0fead474f24f8e3e340caaa294cf6847927a0591e2ecb671078a62f7af6d7675dc1ad7623064eea6e3bfbc57a
+a16b1cd85c9bfc75e6c871b09d752efcbee0ded772c9759da2b350eb80a17b35f6b91322f38fda65c8bc61c753543494
+a16ce416b46dfd0ebe92147c06eccc9bfc3b5ab741407fefd95ebd2168b9aea4a953e8d0a54436bb8f80c2b44ae5c6f6
+9494a4f8bbe0917a36e8ad79c701b13c7f0c9c47f012835e05277d92eb7030f8fe1dd7ea246c2db0a230e120aa338b44
+80db6fef17211a2be9909b6d419446059242130ed24805ccd3e70827a826dd6ad5eb09bca509ab16f62f6d4a84a900ff
+927ce984e665204e5959c70aaee03138f3e381bec132710b511c3fe9604424e0a736eca296356589cdfe5ab08b092289
+a07547ba349510d74b4e69c8ca2b6919f11e4f61644bb6b0ace151263ebf9ad1a2240b7d8b304afb160bc7d3ca322ebe
+aa2fac784487749fde49ebee555491482da0a085875f37f4ec04209a75480652d0049c6e1398e3767573c51899168cd4
+aaa9a4e638eb96ed7aa6fd634e425ed9aedad74dc5afce3d51d6d6f7d25dc76b60f1c5546708570b25c4333ac91fafec
+8112c9648d68ccfb4bee6282d4db075d9a7ed39e3f345223be56679dfb062f2e8f6386bddf50db5c4cd1f9131e3515fa
+8461924caba220050d35853a9879017ab501831536c4544c6c2830e39f6c54256d08c0ea2eebd10ab38719d224e2b704
+8574767231de600e150899094c55c629c050cb6681221e4b64d8d30dee1e40da5099168cadbaddedda39333e9e02a222
+860fb72054c886af7b55cfa90b229d6064a0953f3157b4a0c2d73123083fe5f47268ccd015f626e8326d5327454c8fee
+ab7b5696eee1b6ad6d42dccbfef004d0897148e4a38a9e9bf46d4ad1d0003176f831d1de7403b374acdbded0265d84cb
+9128301b1f5994843f4220bcae4df86c29e62bc30bda18f31d3fc776a8d8cce06bb74aa6afcb0cab16cecccbb8991974
+903569cb5bcd237ce4766e0b6509fe6e332609feec5526bc149d30018a851eb666a51b873d80a642644cd54875d245a6
+89748c9ab4480a747b5af86c7d5ae2980c303e5bcad925fd3526067d3dbfa1f02d917e9d9b3e6e254b49e74863a38bc9
+b87839691b4277ff4fa95eabd4d9caf4425be9c94c2a4e4795e263df8f6eddaddd476fcf52facf8548294a6ea4a4a179
+9247ac277d338b67c355e140bd41547fe35867d4fc088403319f88ee9bfbdbd80916d7f07e0cd0e9c26da535fef84b9b
+80557badc9f4520d91e36ef90ddcd626b3c41d019e0a2c02ba7cd3ece2d7b3621d732fec753035118e34af60e871990c
+8a3054d7f0a2ec33df3cf7c180f77480e775694cae4bff1ebd802a65efe68aa010299a8018c4782311a7f18347f2a77b
+ae6f26bfda86ff48ef213a467fbb27443c4fd7eef5e30a0f1891cc7b1ae90f287eb1df80b76c2addb459515d7eedfbf2
+b85deb5270f542e32cd9c090f48fca448ef4c259a09ba4dcdfec7c200171ce6b3ddc675a3dd655261b8dde7d2537cbef
+8df5c814840c03f3a71eff016787c76f42a63cf2cdc18ec21462b441c9741cd53a6f80a4b14a09f95de33b8faef55bdd
+b3f175f611093e70ce597e1eaae6256b5e11b178ba8c66f870c5fa8af22f493a85497fef146070df5a9ccc971fe31a1c
+862451a08072809673803f2848e252286b226f86a5ba3a1f9ef04c461e64873ecae57fce1d93ab4e4e0dfdc94e70d2ca
+ab9a55d848811b02e106974a7a366c7d713d75b728d84bfcb4a2fb5b7e16534267f4fc662f9746ea1be8a74249f8ff9d
+97e412fc1b368a4d5913051cd99bbfd631fb0dc29b83056264c54e1f34288f5c1fbcd6e7880b29ca9e579ad1b3473640
+b85d55af1635b1b1a3e0bc01e100ff7c8b79f6aa72738b6497071c6f16688b9e166c8c8714c4a49ad1983c6cb16d6d0b
+ac3e606fbeb77b39840909abd387c92c546cc6fcc8cf2b5266e77bbf949ed19e697345eb7c7fa2cbb1e2d4dca1b1ff67
+b588ee4f12c49b828f0489baa7558d3ce81265fb750bd4177dbc88a368713ff56f1e0ccd0ffeedb31f91741653bcbebe
+a334504ce0129de9be09beb53d7bf8bff47a4bd17a8ebeb710a273c3529d81072d24ee6bf04264e1740956a34115ad31
+86a8e199c565317be2450e125ac63e33824e1b17dd5faeddfd65e1718bd77d3ef91c435cb0517cb001ed96222c06dc14
+88e05c3f80b16347fc3845216d9a62e0a89a43a71e2267d6e4634fb46c1eb33191413faf8602c444fc859c0ffdf2ff2d
+b8f01fd968f6a60a217ecad284d909e80e247996056e410ddc7d5d059ce788a19c5e7d243b376a29c3c439430774dc63
+81547be3560d01d50fccd10379dbb149790c4b6325ec095086b60a90ff01f6b6c15419c8b2c32f5d021eeb44b20d9139
+872bfb96cb9a01e7036777a63ebd314381e45247a08986ef3bee15c8bbf3f5ea9c30725fada91a811a5358284def43cd
+abe550e6c3bd1e041c601bf07fe2829da3def8cf15fe208886631238df28281ddf75d43b373e515b2b97affc0ce89943
+a607fca817db0c565308146c873b58eaab8a953cec61df87d49301ce35b7adb8f4131996446e4788981a9a90201a6bbf
+877b31675e61949d2d369150fd8f7a0d8501ecf73207058053ad277a3381dbf441881bd05b626dc8bb716a16ba4d5a98
+b421488968877ed03c16561ffec5545225f8aaeed8c92eadeea6b07400360fd69a36ebac6a1eedef02e2b069079e4a51
+b9439a8a448a7501fff2f89efd933a521fec06928201828791fbb91b21740277106b61da5ddd52d9bffd88f52b9ba9d5
+83ebe6b769fdbb1c6ec4d70b914034030540bdc31385cbed84ffbd81e6a588808ea0f4a5e0dc5f9f2b5354f4ed16bf74
+b65794fa247fc03509883c23de6634e0c436d8383d6be4366e9b4e075939601097b7c6176e751e7d5b6213a85474d1d9
+994d90e9139433802f349cda5297917875f76b4cd0ca4c4566f0c391ab3c60dfa32f201252ba70b0a0e1102b8ffa080e
+b011d6163bd0b456b814d401c42af85b1629ef6e959e6138432a955bb6fef3df5db44573439be7a142be15335909fd1d
+a3904d86f0b5410cbc639235674f9393b430779badfb13dd477f3edee86f9255e91072f57042106f723d9b839311b348
+a33cc02f2047016a70cc3ef1bab2eb3737494ff854233e839857f4e579ee672eaec5da672b69161196d58a41e8421924
+9852b94b9afdad7861981d771a6c0ae2ab13a84129c2e60fc50d2587e3c14cef2847992f6e4256c940be588c43219d7c
+a8628e57ba20ff2150ba6e53ef2f30e411bd066a561797fb3c19ebae1e37ebfbf47eb5e40c9e23870cd1cc0ce64af5b4
+aac016a5a591c9886be4ef0eebb75a987d37ed4b5b4e53142cfe38553d2c26fa73020504ab9e1f005f39d030fec79f24
+864466929e8cf3c02dafd742a0a8ffc676816eb8e78a69ef038f3f0aa9bbbe783efeec676ec688ce26739fc8d21ea15d
+b9a475f1bdc6961b0a2cdfdcb8a2b079c6e94c7dde02a2cb3243920d3d7f3fa6a7547e1c67f4cf16807297f3f50c5c0a
+8347fe25e2bb7c215fb067a5770c660bf45068fae224c6d30951d7a2187e1f9af04056a9b95f68c18859831801c01b13
+97cb8013e9908d38661cc9456862c38f392689dc8d2457b006682bd2353bcace38f52f71a93c8baf26b0ceb259f35622
+abdf92b8a44bf5cc75c92d7a30f025c2fa9c7e89e098227c38e19774d9dfa7563df065897514fcf7cf8a541c446f7c00
+afbfc533af295ef01acf44504c37453ee5ead2ab0913edf0b76f031a275de985611a20a31477e18ded9f77a6d2a3bf34
+a17d982ad311e07c2a916ae6aa6567251ca9f3c366edaa43f0d278a02830d5a6963d243944a3f40239c61eecfee29568
+b2328077836623baac0ce3a9eb178fb60f6f489c7fcdc76f34cfc18399f8ff0a85289c78c498f3fafe554f09b22166da
+8c69eb1e6e9c31f934b999bd7bcb1c763a205c442631242b054d8a07917dbc11d7f29e619e42bd8d41359bf4655f5ccb
+acedfb69850555308fb29ddac6029504f46deb0cd38f878f525c082630c027e08119639e4c71aad65848a1704cd18261
+8ef1506c0974884bbf52bcf1749f679c3d1e8e2dfbf7460ec9602ec5bba493bc56a276e9cad4f19ccb678a6482cb7d70
+a181d4a660193a4c52848d39d56d7aafcbd6e0cdde6b83ec1758fd5923d0185b0e1fedeb400e44c95a4adbb1cec0182a
+8884286b6a0000e057c69b3f4782c8ddcf88e67229ae693a385bb70e8aa7ed54e3aea205dfef985b9d075f3ba434efa6
+90dbc43aba2d0d39a8e46f5112c405aac25a092ede5bb3e4d91fbbdb5d7011b8bc501fd4a2b3a3af668547064cf185d1
+a5e50ba4467cdec8889e52b9dfa2b2d3e8134aec120064a39440579e8738f3a6f88797a746f6371cb862f082f5f7f128
+9495c29711fb3cc4e2e3304ebdd27c2c04cf41b5d71aab98e1ba64d1ee937e6bf4291998997464f4befcfa31d3249655
+96d74b4750e5197c712e6191896a39b92e865ad1a15cde1847ce5ded06802dc150be388aa149194642763a4e44466db3
+98e13522b2ec70da640f3f3050102b18e8a8cee6711db74c8d20ba4e70a74193f6b605fd3d079ef8aa415347c0b5d26d
+8361e51bde71a47e66748b3a62fa7f18a114558372f57aa5362c9f8564c80f31d416a4efebfdf98dfa50acaa6c10a8f5
+a569e8619e8cdfe4d42475b379d7adb3ead5cc9f80c5cd0fa173f07210c7bd15768c2922c5a0a7b750d8342764393284
+898bea20c715ab6c2fef89c15c27e55fc8973d1ac370b49ae856ba4a1d5dbf2d71439729b89545e708773c2423f8d9e8
+981bbbea66e1d0d4bd6e5be0f443ed2358819e4d4c82ddfd57f1ff618966ffe5dd27d86223bb90a010e49d5b6ddf546c
+8beb2179a0ea1549d132f8b45d69e3d47d361a14b79880f504f53d5241884a205c7cebc7942b4e3e9d3dbc255cd5746a
+a1f5e71808a7bc2d25704853a1fc18963a63d12adc3648f56d1d3c6b872bbd1d4a35ca83bd00862eedd80031cace3920
+a23e7c9ab4be5aa98ae409b09adb8e60084049e3487eb5c50e4194fc22bbbab06587593c032a9ae6535531ed4496ee4e
+8c0a4ca74eed6582ba7a438c2be72e7037799110504158205d69ea24c1a85a9ccf1d11e1224789c29f3b122b19c2b25b
+aba8d9fd2c0a47ada83cf635e86922fe91b79f5f86898589b436a141e4239c29efd8cbe8f85eaa9dd7ffccb00ac777cd
+b6bc6b7eaf7606f95c16cbd1d82eeffc7e314412e8f77cfa353d7a713a6b4067be698f2be55f4c9dfb4f485431dcf04e
+827e48dd9bf2a549890f83340b4b95ee62be157b402eecb95a9fdf7c02235257907762f1ffd4e86ef871bfb334671cbf
+8c1e1566d315571bf4323f61f22b71f1332022a7688eddfad3780b51a91fe764d1039961c0a7ffd8e88a960dc4f491b8
+aee5d2e6bdc2d01778bcbe86dbcc19cdee45aa30887c3079e1f4c697ffa9b7cc7ca58716d953a5aaa186865fd0249d15
+820b28b56b9f2bc60ab47db8221952da5a08f52cd475ea1a47f4030bf48964a7edc0a71beea80ee13b480cc136d10d03
+819935fb10bd153010807e5fed0ff4333bab231ffc0e47af00279c882a0f8de25ce49076fc8057994cf803d623024006
+b65d45c0a04ea48c78233422bc755c49204fe42d6695be74e68e64626032cbe5743bff31548d9e6577b5e7a25b3c19e7
+98d9abec65b4d8c0ea421fcfe913c262dfd26b89a9de330d6836064596a9397c671a2b18c00faf1b1719bf2f51e65ced
+835934a445aae9683b0c23aa8f782038f7505002118b63908fb0e55f7123cf9ef224b85d4c2388e80f67d783d04ef70a
+a2ff9e7d1b04d0f5a0c526b34b357b2051295d4ad28e6e06a8fb24539d7d83b4ba775b4ff5bd7d2b887d240b9952475b
+9780eaaa0da81f53180982dfe751ae7b455e978aee65390d5574952f2d53f7bb82707481abfb3439c6489156c60de114
+942a658ec982e1eb1efd9927d5b60dfdf3ff41ebf976e4ac1b5bfc4a51cc9c0a90e70efc3054f9e4d8013244b963066c
+96ffdcd0bb052d69fe949927c6f14332d6649c6773e2b8254ba8500849c30c65428949d31a57efb3765f31d392425342
+b6dc51899a253c9e76de0704a32ae36c202da9168a896c12ddc9ed726ff3657f3e6aa1662ae1abd214f728f48a923215
+a35ed1514ab933932a584c4e1d9aac44ed03ea500c49dab3e82bf48edb905fbbbf895f2a6b295cc2607aa564f37b39e8
+a4f92c3a5d57c5a7994c9bf61c4831fb51cfcf5575405d22fbf1881033f19df1d03f6db0d5317cb1a3a2bad04e61750a
+a790f6c3537dd32aaf6b64d96edd48ebb3c90cfecaf367f6f37d0ced7bada67f71672141d14114278ccc61b58654cc33
+a5f2861e199685c462e110c7623bae3c732aba61b1d61f580ba84af75b06df4cee6e2eff23902d8e20e1bc204cdb0e73
+979a500bb6842c9b10864946ab0b004006164141c27d6d7b03cf497fe22e957bd371f8988f8f89c0fe0a3c163a30092e
+ac95f892ae422aa8993a3c7ebd23051253885ce0a775e7f5c90620782cf592518032696524900525c0d299818717e4e6
+8a60cc603343115aa6f700f6e12808a4cb4aa2af0bb9db502c032de7d1a01dc5c578b3fdf6cd4106153ed9b5eed1fa3e
+977b6fef14c43041ecc9d77a2165fee9e56cf77cfd232b2662026127e734bb1340a1b9206077d5f81c974489a185e98e
+9072d0de45572bcb528d1eb5a0c3ab695a713931033d8ca9e3ebde0e80ffbf1859e8b2022631b502b5a9b93b8ec189b0
+a0a022f5bf5f7d4312b10257159f3ab27484105432f4a152f85592bffdec1a3c474a99fa2ebc1a6952f4ba9967492e21
+b377d9dc0a36b2e23903cc308b09d50efb60f14f1122baebcbe1129d6fd20e4ca27bde74ae0553bede19cbd9866d6d02
+a838fc080b91b298b74bedbdfe123078ca2ff7fd7f27b2e4ddd61eff515a301b406e115713936ace6f75bdbdc5f47c9f
+b05bea29aed5ef8ff72f6305bf13b7511b6025ef8b0a39fd052e24a8d7fc08d4571070d5160d100f9f62663131bb8079
+a9c7326c04f882fe353399c85146434712ad3e22f26cb3e583a9161a7b1dc799f77be4e8c7519dd267f5bf32831b7314
+88acbe4dbced1a02168343a0f7e5897b7af4abcda4281ad68a62b07eedfc36d32b99edd159013db3bd7aab80793ef5e7
+a12a8e9ca2e8dfef9a53e76489723eed7fd2a444803491eb8217f093d61f5fc146834070a77b9a014dbbdbe393c5913f
+b409967600d99d3b510f703c2cd95ecfe981b310bc118142e3d54d2b274f11be5fe99998e92d1d848e53076dfe015fa6
+a3159d40c864eb0690c58a0a525293c99dedd8f8a283f46de1c235338b8a8d2fb8c88e1246ec18446b27e4aacfc1b915
+87f0c0b383593840c8ddc4716144005b8c0ea91ac6e43dbad5b14af92f19724615dde1a26c513e8e9d85d054546e4511
+98c1c3e3f3669c8eafc88a3d9a425b6ceafc8c5e7202014c1b58d07bca9aa1a37926909bc6c06baa63b00bfbc466bce7
+a8676ae8b28bde3d7dcdd68baf18de0a1b6924524d369e9831472453a96fdeb6d181f964cb7d0f630ecb572718694f57
+808a96dcad4b27774f505f4ef18e2ade99e87bf4ed566aa6eba8dfde7a19ed1a528d4e58fe26e5f0e223ac1376804e42
+9289ac76c1c425818a5de33f87fd8ce57f9c6e86f978ba4ee389ad13f8f0b3334f2941a5442e952fd7e5efae6a562d1a
+a189e8a8399ec5dfa6cd6d90e4bc1b8dd0e53f0e30e6892141de08b5930906101c6dbe5f4869978e2eb54418187a926a
+a7f454c20ba8b25362352f72c32ce0efa7115430f927ccf3e2c4f884b2dd4184b8c01d9dba9055446439117e2cc4dca9
+96d0558e58cf42f086562a9fadd5ebf799b2efc8bbbbf1c8f1eba0c4f9526d5a81a55fb6ee93b4538649fa5a0f4a80e2
+845e05c5b60390cfafb38dc086d0d105f8235e2e23bf3915e41aef6656398c018ec65ad355f9a973add083a7cf801dc6
+a4ee2f30376eaff528151584d565caa8b98ea03b3caa95a34379583d857d863e66130061e87f6b07a6be68bef4f50997
+b372e9985fc296ad8fcd42926a7f41cf46a94a0ea5a12475687c059fddf6b9d902b1d04320fdb596bef8e7f3b1fa34b4
+a603220b182a6ab95bbc244cc897c2c16b3de965ad7aef75e6b78eda578131642afb767c88bdf70b67d6328a06f16e1b
+a7acae7d6a024859bdc7b439e4a898936a9e5dcbe379c620241a53ae6871e77f9bd89ae381aea56bcca6c1ada6339a5b
+b67df929d8061c18a89b6f186b1861f97e6bbc46a121ecb71cbac71f54d4e246c473be1ef9417cdfe83f6dada4d5e38e
+8066a3e22b3e23a3387b1a02a14d0e8c44a492734f2e314a352ae74ca9369d641dc5536462055557238a0e807bbdb382
+990bedc385cb5f3e9197927bd3d0c35a9dd650384885f8fb1bea22ccd96f7b891b18979e86069245c16fbfb62ce40d38
+a49bb8bed9876778dde4c93ce81239fbf706bbc123952f4ab72b5847c78b442f1a55e68924348124f3d79e798976993d
+8a5ff2ce4dad2dbffba4fa8e664dddebd3c11519d8751347f1e9daa17bb667a6770f9f37b3f4169821ae36c1f5f5ff14
+b7004f7d467a0c74e3bbbab5725bca7b661e8bafe417655bf6a5965c7d60bdb93a1c52f0f0291ddab2e9ed6b013f3ef9
+8e78b2d17f787904438d10f8fd5f687d39dc6df6592aeca699c3dcb1ea644e6daf36f5f30964f004a4d5da3eda9d3c73
+883d3b89e87658ef6df8bcc8778b0aed1214ea14a7e8f85a0a40cf1fda4fa5b27a07e64d1b1f25012f4134d582e2225e
+8ad583ea75f2fe95a75eeb091322fd11fd89316bd02b8461050c8799d5126e6445bef3c87cf1ee13325db8bb15aeea5f
+a0ff1573983a10ddfe1706c43cc4723486c4f1d24200552ceb1849251d5fb65f542b9b967bbe9bc419f9ed5ee1715e53
+8befca726ad347d311ed180a3092f690b2e0cfd79be5f70cecb0aa30ff9f93a07d757f913deb79e5b966dec34a296729
+a6189acea271dabcc7072d4d6395e41b5f543065d676541658d97aaa113f19ba309f332c850e373616b712bd8067278a
+b3e026881ad00f3f8fd3da96174554e2c673851e33aaef0f7adb886ff9c1cbadc44ab31a46c4c1e5f749a5e5cbfdafef
+b98a7d424e6b25d19b20f2c79e3ccec111e94e2bd8db8e57c23607c46f12aa7d5812cb4c049a7e033f6de2b20aa2b650
+a4fce7c441b1d083933174aff776216efb0ac8dac9696b4a31a27d49c466c4fc866210375068f8e36b0f69ca00e97d85
+93a3d59479b99ac7eba650a55171af2e3b353a36bef91cf1813d3015484f22913c86cd32b7839443ad60c893016632ec
+980da3babbdb03c06340dc8f2e0dcd48ab3a8a4979764981f5ed49839e22aa4b20525c7147b64f79b70cd12f832b5e12
+b6a7fc9d85ffa892436a7538f9b6c5ad5735c3d5b0f4599687646247d25dce8c80dae4c16126df8f7e17712ada1227da
+b12d76b6a3048692e8c898e1cbd7cc67b772f46fb225a4553ab9d2fd6ca13ad5f43e7ba460597ee7d0a7ecf6a547fa91
+91395a8bee9932a7c254d903a815eb30cac0b13d391d2c7e3898c0c6fa1817d6f7a3c28293d248386ab4f7b48ac25e70
+a70d287fad703fb90864b688c6c5ad34bb8c6c1bec6b5565299a291495fa07028974a89013e132d6a4fd06a2d353498a
+9142d6d97f792be9684f51933498410e1dcfb14814ef7c92650cc92a5d3906050904edc097d0d6985403ea6811c91c5f
+8f4c7408c0eb12df8c06430706bb6b67a990049e2956adb9b4db7302657f6ed98ec21478cff5ec423bdf4c05286333d1
+a5dfa92ae114819505d86183e72d9f3f59335e407c589c0e9e782ce7cb7d80b267dee3a4eb03c60b1dbaff0979511f85
+8c2efc9f16ef0b88ea2d7c22a54e28f2ea2e7bbc96ec60f02b46ee2c3e27afda5379dd75487e3c8037fa724b16a3cfa5
+ab8d781d2a4763488987a230e7b829484d0fa8300d04449f215fca298fde403ad57fd21147ab6f579302a8fb75029bc5
+ac0d5a0ad0e19853051ffdd1f4f0dd0dedee2798d35ceebf167ae8c3bf3da500276bb2ca5f738a06b7d87defe43f2f01
+ab2db35e3af473ab171ad68c0fa7d5673a4b5ba3244c2f9aec739526753de72e62bc3a72629686644562d54ee6b1abe4
+885c0e19242394fd5b850aab741435be238f08ea1a19407c3931777f4f63962b8d45c38c09e9543dca54d424247a8470
+87b0e9f521a7bcf3025928763bf8baa1a677d292fde3f8ad9f42ca41eeee791652063d84e4ca75895ccb184b78d6f32d
+ae4632856da447504f0528384594111cd61b96832984a7f37e328712c9b9ba3d1a6c3035d0c14af95b027c0531c659d8
+a8f7654b7700a7186904da484831c66125d59ccf4829ac0a7fdaf524790fca4a907263c4ea51de8993ad43be4b21d299
+973b17f1dd4636516a7d26c11cff0f12b20b6d6fa61dafcfed38af6aa5801b1af39f6da464bb060d102dd69ddd009b3b
+b3883a95de9e815f7d2aab979276fdeb5c2b3eb3fdbba80e908e337d6204fc64a6ff578db6f75f862bc4c22ffe572ba0
+8e17059eb93dc9afbbeee6911abbecfcb10e1f7f873db189854e5387ca54ac8dba2f2d35c1254d6425bf00ce2ecf428b
+a9bab7e9dfc44d4085ff15dc24093ada6e70ad8adc3ac3306d7138cc0b1ab4f2d5b1285070787e92288c4f080b949987
+b1874ef379f8552a2a75c7cf5350ea87f8f92c0e58cab4ce5e62fed9648e1a3975283de4bc45a38325448bb8c80d7f0a
+922a4b13ec7900a96e85bd9ec1ae6740a53418b3980f58d5b9d89bf4a728cb9161dcfa9bdde85e4098e21076fe78e805
+80cac2d4c457fa381d277da285e99c8ae2d042b244c41ad1766960f56f2629ff291f36a8c875a3cc423ff6c7993c3e91
+b49ef553c1fc3b4f1edb83d7ef31b4a16a05d1430873a58e136992b4b57e46bbcffd45a7b65b60c2eb43e8c7d3904d74
+84a5de11e4aae5d874982531f7e5b55c0d3dec9c40bef1527c49a786949d9698e27c324dc65172c1a475bc3a40528185
+a4dcab5f41b25e5d3c2135074afab71df14d6a13f9367eb6b6d99f1f2b5394ffb5bff39dd019a1d7975e124f7f0309de
+aab4de444f4a48f783c9d5f3ec5a12b7312e3ed381ef6e9abc50104a62d7b443df72267960719e87d9ba3bf854f69696
+863bf4f35a483b708c7550ae35e45e77a2d415341c07002855a9796f4bd52629bf44cf4d292b7286f7574ed504d05288
+93a7404436e9d610c442145c78902de1e2acd0f87224e5468ae8d7f21a6efd73f476c0c61483fa65eafc816ddce81d22
+b771d17923cbbbe5e158253399ba54348068cc75a2366d6a71cfdc1f90622f6b9a55cf689db547ff5261e2daeb2b9438
+835aa6b8eec584ce13659673954cac5ada0002e3f990dab3779bba9cbb8d1cde4f91b0fa3ae1f1e2e25f8198d2c1a304
+803d99fd0eb07e668a88fcc6b6bca2adcca28897728e69c038cd5f3f14e4f0a6f818fa6320ae0dc2ea0cd1077c410e2d
+a727391adc4630eba3fc86a6a057306e1779e60f26abfff9d5f83d5e4d71596a13b13e7abcca8532bb42d328b8c7087c
+a114b5acd9a6c6b24316356bbafca9b6f16c9eb9691accfd242ff744ac400d45ff7f1b5adc2d1a54c2161f0de4518576
+b4c7036bf1a505f114e9794ffce88d88852e0fc3ad5352107839ac9d4e0d017bb9935509b8ffd22bfcefce714c0482db
+963134e8102f6dbc4f99a848a08fb661b95a163d8a1119749a6e8c4650bdd3f4bed6bf52951e8b7d6f84c75a2e030e2f
+a54f4186b18e27b5f0d30d36ab59880994e9a67b2040e4222fe975a7e908ca7a7ec8b341718d5778daa86ce4b6fc540c
+b0b1770bab4dcaa142acbbdd5e66f1d97f78ddbfde048584fdcb1bc7b755f53f2446f3154b52150f8fd07dbaca30ff74
+8e82bffce9911278f6903eac8e9a57208f53426749139fce2799a11513bd53ea3ef2f5c7a7d904a45b6420248b69101b
+8f5caa32991798509c0251b3e75ff8dea3068ff5e77f03f66bda01f0b9846ca79a6e6161755492bdaab6dd81eb0f5a00
+aa1621a752391a810ffb0ece696ac7846e76106a9f54d9d1dd8cb8f9609a71c9eaf9c94efaa516dd3d3bd4414a272d68
+98e86d315537b3e89099a15c3bdd08116f23c1c330b9b2122311b23d35f6ed58e3c14e6704624955c44a5e118cdc0826
+a21ebb89eaad4ce05d422dfeb689021872871eb934b26860eb875c883f7193b65ee0ea444f8ceafbe7fd8092b11cd1bd
+ab1034f602eb53ca863042855564b2971599d6790bca14a0893d940261e2f7b49327fd87f5adce0ec7a91d97093eca6e
+a44bd180e143408d64c60d9f3af3516231da072bfffa6304e3675fbdcb5b286f14441dda980f1c64373348247f790df4
+91d69c45577d4d3032e8de4f362e3c6dd978fb6dc0df2993b6211f3d886bd33ab7fcd148bcb5d4d098d58f63a36835c0
+834bc318b0d95fa2f6d61ab11d97f47fa0cf74e1cc40a9dbf627371333d24db5615bd93b62928698600a38322bbfb937
+a8074f278d1720a908fe5d63a0d34f8d57ecabb8d510ee78e6b9aa20115ca25b26c59f7b780b69ba9a46ef14d7d191a8
+b5fffeee2f3afe4e25f041fd0847094c5142c8f1d8a525cbf763780486fa92f63aace52682c4dbfafe2f959ffdd4afec
+a68d03d74107b6c429eb8d9aa00bee910121cfcf5a347e1ca4c127d19d419e7e46d34878338c9e458b24c612659c40ef
+967aaef03f3b660c1688bc8142e1d5a22c7cb981a9152e6f7df4c21c3378490232667db6b092e147bc16b542ffcb0635
+a2f9ab09224cef0393832888a3d2ae8c1de7599b734b217f117306e4808782324a1b7b1e9dde290f7816efc5d2b8682c
+8c713b63f99c08ce79e68734f38f0bc50b744899222d444de113ad5a3aab401b394355fbc3b0b0835b3db2d012212b9f
+9153b792d8b441f86fd59cef546fd74015699a0f8c7822416684bdb2159f01dc0bfd1e1cd21a806284d36c3db9477b48
+ab06ae28eff3417b2670c98089842b835ff4fb19113060057fe27d80d8e2ea5e0090ba055ca44af38efbdede1e1b80b6
+a12fa3e8114fa8bc9b321a0dfd1089933b755b2586c878f4bdf2a00a0c0b29b0abb37e319a95205e2e3067fe0313eb9d
+8b504ae8a69eb31a6529f10f105b121405c6a98660c642e0ead97fb5462f08058ad40a2a270422aaf8a92028498df5bb
+872549f0b46900c3ed0e42e1ee9692251bfa91861b9b7d84393865ab3971e2260a85940844cb0bd9d3a5cdea2be336a7
+8177f100ffa41362ebff98ba9c9169d05fef682cb6b2d5c35af9167d9d3f15b6562dda7751260f26c387fb9b478bb8c9
+99e0a9302a64ade79ba5ce2cdc881a01f6fab428f8e669bc06d275fec9b3c14aa5af6416b7d2945dbbc497a21af7c2b7
+a191004f60f03469498c50cf3db556dc75952a1b5c8313faa6b88693c86e4d300ca029239f0cefb0419d74d3b80bea8d
+86853e0c65bbb188d278f221173fc0f24c8f6a9e430dbb047ea11e421b5bb12f52625df972c76cfbd229b4651909834a
+88a4b8026e9dba209f63281767b790d6a0a65afcce2fc22d7f6ed7154780ae07c64447517f421acfb5235e9a1b86250b
+93b8ebd2632386a6ceda80e06134242838ab1341515aee6419d8d2d34eb927a59527eaa100f153fe1b2b115b39ae396f
+b43ee68e5f82363ced0ccd98252f409f1975674e00956ae6dafaef87f5e02b83c36bdcb80093ae2a8a3bd725b3567dca
+952063dff77655c477562181403cab520f66e8cc0fbda8c94c9d751870c1c87874e12dfacc36f1ac8a032d29d52000c6
+97581b37aa6df1205b01b431cdcd8c9ed53146851fdb4fbec0cdb55c171ba4be84158c84b6e400fb3dd1da6a3903ac44
+a90838133d778ed66ca110189e010e339bab6124e56d449c1432cf6045b7a46aed57c23ed77e4707680041b70621a966
+a5db677d15f8fd8c2d8a6fb8ceebac56f3d7e453e7ae748d5b54f257680d9b571929d08afd53cbc99f37b68144ee8ece
+b163cbab3bca5e5f71ef63824a887778704312b0913c2760fb8a9e8991331cf4895385f1a0c4fe8d92a9eac561839f22
+9471f5635dbc8d1c1162ed51f84fe321db60976c014ced076cda83c90b9eee9413ea4c3924821e4c247cdc43212b61d9
+9897b29e1ad8ec9e0625b1ce5766638ee20631c8a3abb0bcfa8b87fd5763c15fcf6b46edaf794bf3bac29ada046e3a02
+9508f42caceec35dbe66855c05e8437e353bd49365d7271d6eb47fcfc4025b2ed5895b3ca107412a677243e6d37996ef
+9009214c5716816c11fc558dc0d0975ca9e99ef706ec620bee7c5a0adf97c2d672bb6d81784d7f3470888b22e5f00102
+944f8f4df9cee411d86e344ab0d0fe95139300cbaed8bb06169b32f7fd8241936d0c22537cf5a05ebad50bd1eb826339
+b577e0281197b69275ea37bd669bdee7b9506fb081f41501a9c8296a21246ca6ec59c56b39a23d6c1d329e4bcc8009a6
+a6d2aa51c8f0bf345beffea2218a8a0c02d9cbd87804d5d254d802f02d717a87b376b3063cf5429fce6184ceb84e0f45
+aa381ecd4d49636a01610b1a437981dff765cd53d3525e8e54e80ff3c3f2430ae284debf7da67d5257143e6e95b0b9b4
+a5e6fd44c1df49aa9ead812d4a5398599e15dd01cb87fee04f812311bf5ae2fe19acec4fbd8b782d07f05bb6e3fe97c7
+8d3778a87602b01a112ee2922bd59f25ed5789b611decdc2206299ed732d9b8b5e064c51c8a6383be90077221c33fa2f
+a6d7a37a72956273ecd47642e0dccff73d4658d713c33659db0e8022fe5c5cfae203dad043b576e654928b0e05aad7a1
+a9637e4acde677c390901331db4d518272d12fb7ba8ea008ff056b8207ca2e7535020c69ce1ff0facf36ab91c3f1ad82
+b390df8517c01af92ee7d3c00efad0b57a21e3f115d53463cfe2d696cc060705353661bfd0588ea1a28a6f682aaf102c
+804786395fcae414a6d62bdd40cc701cfc8ef3b98cfa0276ad6ac6c5b6236496d9030d5763edf4c6abe229eb43c3d643
+937c3f83cf93c0f851e426af23227f8b88977217b167db7f50782cdd99a684209a7818dc34a7771aea3677e7569442f9
+93a1fdc055dcded7eaca555df493ec6520c84c49d1d2dcd8f66a10452e448b85df05244e5c3b083adbf20328c5d28b8c
+b7248a7caf56010a880c66b1deda34febb1ed35e9e8b1b02dcefadd1be661b0f815739bea33e268204d1376c3f7705fe
+8c2f1cf7282fdac6eddae749585a894b2a633b4813ceeb6f5d5010138cfe722bed578bc7821d2f91a1567fbff0872d62
+a0b3797287f446ee38aa1bcd13383ba083f1f4e0c1e534f278ead9c1365cc22a486a8fda556c151e9d2ef8838b69afcf
+84ac38e8e7c74477d34000551dec47196ef90d93e8dd3362812352c026f10828b9673f06d3ac6719656409be049bcda7
+ac07e4ead9dbca9e94215a4a9907d0016fc12a791fe34b71b3f61bd253244b7b74f4799fa566a1ec3106937bd50dd3cb
+a4a31552087fb463e972fdcba23f879875cc05d724ddab084c4946b44b41bc6fa83ebd469bc6acf5508437c180bb03de
+94349881aab3575679be6134ec8a2f3f0fbb55c45c6edaf0ce482f6e19bb272c4023cb2a5578a4dc28d6f625c2b185b3
+a18ed8b7e0511519cfa1ed6150c34b35fb3754f08e727b8d9153ba170baf8711afe4a8358d461324b983706a447df248
+90cadbb6dacf3ade03ab585b46662be64f32aaead9fc7e3415722ce502e761cff2bb66209df2a06a8005ee90ec8245b8
+a8f734753b031df5f2540cec56d82da33e41e8311e9df661c865a1a6fa50b1b5965b605b578e59b7fb40e85ffe70ba15
+97a507a1d76e0293907f9b9d74f0f867461ea3911e70232bf903478504720b79e1c6cbe802e1ff3161931cad922e9faa
+b00dae2339ad1af2635b0d6b90912a71908cec400ad87cb9515abd5b779c52584738e4e074bf5fcb4958c5a339d0442e
+b6cb944484080216ebab8c41eaac3af9b994e9faa13f4f09b131d1b5bc110116cd15b0f51fc535f412a02d605ef922b2
+af1c3f7a1b5e8e427d1599d47f87c59912e8e0a336df1b4a26367fcb8f47bfb701af2b31ec4f1176d5dec7aaae013637
+b797e2c1b97ba59719113f5a72f00cf42d12b0b82f509f017fa0dd4fa3a540d584e69709a7b3d41f3d388a6d4791365f
+a1fae3b1090518cc8712cfd06adcf54b8571e9cf1b31359f8e9216239b852c25b2a870009e259e10369fefd41cf08a09
+8810da66189d3b852bd3d34cb45f83332b8afb358df6db8fd9481867289bd5fad85d87270615cc96c95aab0626276008
+b270ac89215c5410e72dc0b28454a722a4e63dad803675a98f55f7c9fd964627040fb57e91c9e608f3f01e4e0d43b8ef
+b662bc5b83aff81474289041878190d1ddf33d5c24de3c1d2dbf042b7218bab9b3d9abc9d33ffe128b550145ecf3eeeb
+8bc2137ab0210d78442843d09d1b0c0e8282336b3540c84389b190647007fe92735879d9013f9642196415088f838a21
+a49a36aae11b2c55ae1771e9120f6154631de163edfd18ec3ac383402dab767a69d505c63a581218f426e0ac80aedf34
+ab9a926ee5037f0f560d921d419f45f8da37831f06dc807e4dbd5ef3f40ab1f87ade035caa0d7d56f42d0d11941139b0
+a251caef0c188d15431b29678117ea8069f63b876fa4c3809aad0ad01b42496d2834dddb14085fe66280bbcc974af68f
+a7d733e30057bf9156419ab6eaa73cbd3797323fb3f97bbc7832f77de17a448a0b3fe19e60e2f7cf27a95bd85cc87746
+92a883acc48cd19e113aa6251848e68803f2fd5048b183f70c202659347d82114d0c2b04135699886110bf25c32b96fd
+b3ab9dcb2b5102045ae492225b2d0f3adebadef82be8e7dd9c021e169d987e4e76332fa9c566696a189eb6f8a6382101
+955ab08b8aa4e510e940333c7a225dd03390bac40198f450aa47c6d760a62933af0463b54d89e8b98e1256dc80aabaa4
+9835e6d07d95dac2b06f17b77d5aa8bded9e98ea8bbf581c085de78f867311f42c36ed01e389adf7ef62e049131885d9
+ad92fc6fad987a760a5b2ec9e676af9b3606f9afa6de36a46b119b6b5898e2bee4ec08f453c8a712555ebef62b072815
+8998fd9861c2b82f6d550f0a033eacd6b336a5fc51dde60d6a5ad58aa2a6ca959bea5d3e9f0d8be3acd7ce594ede49bf
+8881713d58d693876db346f8d727232f44f83c07c45eba878237b873e6a9c54df66fe1faef0d2678e847cf9d259fc732
+8510cf978240de717de4cf36b6d27a207c2dd516661f6ca35cef866f9aba31ae72937bb20466087090a2426d1ecea2ac
+90f21365d17f291db128cd3e8e3c6e46ac5aef1c8b3e2d9f9ea0127ad28c5b21920a0e1be5215dc0a8643518a4aa3ba0
+978a3c998f1fade2dc5a000e85ad274b15aa849a1e406fa008bcf2eb283f3825dc142f9ef0efc61064807ec22c1cf6be
+aec7a21bc3e067d6109a023b02d60dd73592af2f1e261a90da751de402418c993072075ca1bef421baef1dbc4e3c0aa5
+b63ddaa6f973b59498304de82b43b32167298e1d425fc016123951a7c87fc3aa7f6d8cb18023c955977e1aed191262fa
+8cef35c8d0a93c7c56353a16f8aeb9fa93e1e6e74856d49c14220b918fd2d585724fdcb272d5e3611fcc97e46286707c
+8fcd05938df6a1fc4402e0e216f6533449dab276d629e5e88a8854ded29e32c6638e4dfb3488419bd593437b8de0db85
+906b28f5a067015cfac412d97182b7a3e04787962a599a2dbf30254dcd794932be0549551aab9dbc335d95731634d025
+b583cf76e80f3c2142ef5a3a4d1800d36689aae4fd80a2e13c41370e55f1d1b4e1716db8b04eddcdd3b1fe5ab64b6c3a
+8c08c57ef5ff82bd9b8791005b2009f0373861b62327523e5f70e8cb3dad639b3e2f5c21d35ae44157daac9d57d44059
+996a69ab504491e6219d9a495d9a6a07ebf86e86d9f9827e4811434a0df8a544d1027584d8f1142bc5edba2b324551be
+b61e34a3365eb80747532ee32cc3c73ec85b4ab65340b53735d8563f616b7914bd152a3ef071272b20efaa83859fcca7
+a769a16a3975d9840a678be73a994dcb76bf0b9283f83e2679d4ce193199539e7afa2fdb6769fc44b5e8eacb04f570f1
+ae23ae27b659ffbe723e074d4777ea9c7c54ad4ab7d7fd34e121ec791932254b64265f178c6a1b2fc5b7bbf128f0c773
+828fd051327553ebae4de830fdd18d0ba64b023c35208b45cd920d68ed7e757f96e2fc6b6024393efb72c69d125365f1
+8688596a2b212b215647b6aa4c15b5e2d9c9cbd3ae6e2464fd264b48639b8c2cc8accb27b85e76faf9edad62bdaa76dc
+8f576780e7e081e84b3cddf4e2290945993958d1267a53ca9ef0a7d6e356c3ff4db9e4cccfb799f7b6d53756c219b1ef
+a40e0db022e392ae771c68d5119d8c4bd9c2eb3b738d6ff0c1db841fa44c318bf4644cedcfedd8573fae19963673b81d
+9962e3a3cbf0b00d031f0e1bedb81ad58a6b16238ad3b99e5632cd38db9d913387ae03b07acdd9c4045d64b82fe2ea70
+8158cb612eeb14da499d2d42ec998650431a370a04cdc8e1df4872dce37375ac97629fa035f4ab38ce0b3f15c2d0d5d2
+92eb0ad4c8013b23bad28e12a74db1b98c2ede74395df0562826c37860459f1aa4ff6457079fab9e40cfaf0dced32e94
+af22899eddf1f274c840a6de80903fc5a550a3b958a68c3f7886f1a4154aab7d8e3c1bb794485f3740a4a269cd2df887
+9905e361f9fe64994ff36271b7d28672432e988bde670b3da0a483bda331958eb9edd5f57dc556f403500257b1784dab
+a8c4d74de26aa8ddd6d91296c3848bb75e0f68327e5d203f2affb2427ccc3f9cd1b8e430259bdae71cfb5119c37337b7
+8014a82c827ba6462dd158978a0cba89a1d0c882f109fd8e852db69f4ec1c8f515eddf2030d126315cf5368a6e0317ff
+a0721703b945acc72533663d5a3516588c87dbeabb2b00523d2e627f59d4bb6ce4f135f7422328145cac01403a9baf8c
+907d0ed2cf6985934d436b6515108af2ffb25d3da9ed7cfd19d096cb1c7ad5b2234f12796f10ef24b4c27cff59f5c72a
+935673b0336c8a5cd27e58452bf2e525b5869a82dfb0f0ec2c570a2a151a643975bfe8e15ec4337fdc6ca70017ba5d11
+b70b2547422c0191fa4d71a6a73075591cec5dcb6f672110a1fb19c5667e96a757a4a0b43021139d662a64f20791bb71
+a73b1a6768c05b4a56801f54f9b6226e13175111de0828aec8f34bd5d4cf5113e8d9d81a0f1c057b5593d1d358b2f97c
+87a06ff094bbe1926a7663cad0a00d28f8072149adba2de9935d9f42cfea5e9f316467f23d190b7fd07b37c0517f3797
+b7a238257f702f2fd652fa81b20d0090359c3c176d5c0a630f5455c8fc458051ba21a49a2ee2f05e5c8555343b596890
+b47d5d9ec737ebd4a5cee5079b5497ede2219386408cf786767f618729901f1fd4d9f82c0245370d379148c5ee7a1ad9
+8874de66f703d7dfa133bc521cd2d8aad9ef2b178a172c375a24ff75dc419013f9be46dc38a715217b660217be3cf114
+ab77e93cf0c12c64c1bc489643b5ca23d6e81a15d7bb962d9df0bfb050115d304dd33f98cebb6c1a4ef05d2cf9e09c34
+a6a4fe5e0b4f0bc8d6192c1c52faf178a248ba1228a9f8df7b20c8caa3fcbff81b7e32b2edbf98c224879c0b18a298a1
+aef2865260b507624dc8e12aff7bc8b46e0e7471df39c2b6892833838c18e7a64e57aeede556ba42225ea0b20c706acb
+af0c96673b290197e9fd493de9da77d08ef153ca4c77f3e33f3ae6f6e0a9e1da4f58726962a907d7bc09e65c2c4798ba
+8e7323326dd8079c6ff351a94b902778a9b02601fc09377789cf8aff7c91d957de3a6d8a4225173053cc0b75a1a4c270
+b08e8d36a3ad46dbfdfe56c7ba2eb777d75ebb886c08a00b364f0433dc1dbf34d252e54653abb626cd40e15d599f0608
+b19c07923e56238c358032fee76aeb0cc37c4e02ff65df26e609d131f8d7592c161b52f222a758b6b4baf4b0698edf9f
+980d1c0f8bf4fc2da9953ae5fb5a3a00b4ecfe8676ca305ab6972883de197b6bddb810053d19ce99c0e2d5914f5ac0fd
+aff45b58109672fa091458e819a659d8b2fa0a7844e707b78f945b7bb093410ae6e67f2f2f0f1a17f78957ff6317c5f5
+8a6dd21166bc224894ac5100ac8d7f77f66880b3532c0df9b35077fbfc938c730d7c36ce076d68bee60eb4fe8ae91cbd
+85fd4511d61ea0f78006b5d4c6cd8268f55eb7fea6709d2e85b14e5a03b9cea875eeec0c1ce238ac15a6c9393842f281
+a70b5ae308a5ed6253306250aa39dd6077748e4a18ba9b554d7503bd4ae493bad48606100c71e856be2c5420701dffed
+a515595eb24cbe324bc3f94ece730a23854700ad93bacc6120026d7dd5cd03212bc415e0a25e48a9206d99d90453e79e
+942b36ce768c511d65d12a1bf376287de5fd66bed4d9c6e3cf600989a39519a587f3613bbb00685b0e45c281e4a0c452
+83a5c6f179d8e86a5b68bef155720589509b8bbdfb78b2c76a9c83914b89904fb42a75b45418a528ed66099a9d173ecb
+83448accbc24fc52bfc27bf4601fecccdbd53eb5bcfe7a51cc006700499d37025fe4ed2c46161ae8d28d42dce5d9e2ea
+8a010850814a0c4db30acfc5a2c07468a446b9dae3f429efcd7a312b3f598c0952ca3a6ca749b7d5117180432f7981e4
+b228090f42a87322e6779888ecb8b4fd825c0dc79e7c00132150a4c593e16e38d37e838b6168bc23dee58e957da1b99d
+af16dbd5ad98a41d7ad725aff4cda4f7feee1063e3b2ef9a85812c88bcd1bc1e8c0f6aed171c1c5fbbaa14b9394fb1b2
+b176706487da733cc9116653c277b484fa84896d32b12e861783a0fec8eeebae9dbe0fa91d91ccee0b986adc4810d1a7
+b33dc169ce8d3d0c6a4e24682d1430fcc8c8c19de46dfe3614a3038c766c839f9f31ff9475633426c90fab0e1e3972c7
+a8e831183d1de7ee12916a3b449e2e9e41f069a2f51fb8035f9349006e82f5a22f63e8cbbaaef41efc4ca25c857ead76
+8dfff2fc0a9c853b1a3d99d3a39e8fc226251f188cfb684b44fb242b779243e83147a98800510f19537c12aab46e4327
+8d8e5feeec647f13a5186bc8c4d2c5141bbcebdf9d2f836435733d2efa75badffe57081211a6f2cf8e87929d1fc04fad
+af594e0e48ec2f88bab23204e02207d1144fc5eba69e7fb16311d1aa46b442f45ae8e8726448499bbd82eb4d523ac6aa
+a74c860f9d66e676a8a25c6f643644e484b0bd91574e1bf23486e979468249b8da1f4c52b5ccaf331f61ce3993b47ce4
+98767036d5f42c3d3d6e92bd1b176f165eaf1bfbdcc0f8b78a41bef23c68f6619d918e0b1236295662e02790fbe69b29
+a6c3bd7174522b4f70cd338968eaa526a072661de9cea2e0f689ccc707392f5239029441c25ed8082f4f920bdc90f6a4
+89c9270b00f3396bdf7e157bc72c1c6073fcda9a8fb74ca46cc61ce8c6080852e62c7c7cef0a12a36d62526eab47b2fb
+92a40c911deaa49d682d285e523c6c8e9d72326620e096399dc1fc0fc758811d9d1e4619529918cfbffd6ad249e09dce
+acef1169e9d7636125bbe7a4a2ae670407a14d8ade3281dc0701a0ffd3d474ae7f0c2ab7e5db1631319f52e3e278daca
+92b43ec4e3c5bb047d018683fb62f3c50d7f3cad409cf3992b9bee03a308c299b7b2b73ddbb0cb445c886392082d1b6d
+ac4b72ec840e593ef3f154a2896cba7530c7b245187275e6e68c65da0b58195580f112d51373e36cf7977ea8362b98b0
+a4cb8adaf311285056c2753795ddea6ec8775ff9c1eb635d39fefa59d0d630ccf68b2c92de2f063835923819aae4d1f3
+b28d62a46ded2e889f397f871508b64f82f9d19d7eb1d0c396aabfde3c21856a4c274bacb116c6d180a1b67e9dd4d6d2
+802309d1e92a9b56cb67eb81076c66255c48d6ab8fb683e8964a2a4e42156f5d1dda7489dce39be64cf69c6e11a62292
+88346b771b7575702da0479767009112ca9fcc119c55be73f573268a5f80c00988ca56da0e96c9aa035a9a70c29ac2d9
+9410ccdb67c9e9bd632529a6e32cd8763236118be74a7269182d491af2b4b050fafc29ccc5596c65425e97a7d62737a6
+8419da76f6ae86ad5473270edc831804902ddcb32e2bb5b91858a8d32fd90202ad1e7b83d02fb8ae870427200958ee9c
+98b4c81723ac7981f5457f5972d0764c52df4e7884f8f677b702c757dd202298a55d1b0c9c66c45461e58cb60fbb71c4
+a0db34ec3ba07a39688115fab56fe535e645550bf7cb80593087c1f271d1859df8cb6318b08d9a90ffb06eef1795b6a9
+b404cc7e0bc049f1852a6c41db65173f64d32964bd3d8b225d1902d61df9c47f0c4748c972212a60d94ec0ff378199c6
+81cf8324fb341549e0be456421b973ec7f0f7678d02fd688dca82c0c67dab27974ad926da4541b9ddda4293bca1714d4
+869eb17879af8be1b74f1eafc4a7d5efceed18a59493f09e49f0a54b976db20b86efc1f7469470991117545db2d5e0c2
+abd400cb31b79373e83febb51feccb04be54594ef339bff6b27060b1fd9cc4166204297ce6cfe7e35e10956d77821b63
+8934ae372546374b81874114e05e9a8f657519c9b5610c92a9fa7998308eec6590e3bbde6603ec5d6068e365cd6ba4a0
+a641fdb324d269e8e398fa1c4a995676e12b388e4aea04f9be059e53d9a592699a3f90b667733ab37e4af414c2672797
+8733c0e88d7872a23e1a19bb03cbbcbc21dc24d33629e06e26593faf80135aaf2ab152499d54c2fad61fe2a5623c6de4
+b0edcbdd024492c7b97031179b3a73b766a51d9b8e8ce74e7a50112575930370aca39b0120e777046ff73a1d3d98322b
+adcb9f33cac546f00631df518e956a5855523fe189dfb5f92c0122c2ae40996701215a5c0c182ccba036c2d205845285
+991f157e50291ba5a5ffaf57f9c1c4bd5a987548a9f7b19c3c8eedd414abb785c8ab6f51bc766d285c6f85b25db1a829
+81fe3ed83fbe3053ddf47561d12875cf4da0270155b50e8b6c5beab31e4a295f167df96427a6a9a638b209264e50d591
+933bf009a45e43fa3294e2252949fbd76337fd6201699a4648e464f84144e36d245e1215f51ea93fbba76ce4c36ab2c3
+8eb3759f364f49a65ccfba1adc0d12c564e31936a8c3b86b274a84fbc1d67919c87db5f58c92b2778094b9cd2e0ea0b0
+b46daa9261e739448268775ead25a2a907807a0653674ce416358302652485ce29026806a5c080f93584f9b63ef1b870
+8e265bd8eb701c8640db63ad8982d392c2f04acb572f8a7819e5d2811f276b658b2dfbcd9124bda8362198da4077cf57
+974a1ae8b109dd0e8bbc95decd68a2fd23c38d3ee3ea91b847d9f46dfd5175337e22c0fc81014281a929c22b8f6cd8bc
+8037a033791944866830d4e92ad026f62a948505d9dbee2812a3afa5d6284583784f36796e59cbd6f03485a4c9b6f8f2
+8b29ac555fa0f9e82629a7e37bdf2b23f5ec30a34b0fba0efe00a787336baa69107e4e6ea504af60c446b3e32038b08b
+92e46327da3cdc5ee89689cc5a8d51cbee604fb3545dea358fab77ade60c1cc52eef078590d40466539471300ba4cfad
+918ab27dcfda124766942542a0e666b2e708f67e5c9d2b26f277002d00cea7f2d76535fc1d2b66d86420d891720e6daa
+a3c4ce4898354f4c052c48ad269629186f1a8885d14adc2e17dec724dc0e6206cf5719cc2f926e1087fd755494d79b18
+a440d5731f64cc037e74f3938d1b2b28a0d203d058e7cd190528369fe23345817950afcd5ad21b3d982ae88ac72190f5
+8193c27e58c6cbcb16a97ef06e4ff69f7dc1c87e4743dd9254aed6a714e7b8e1e0ec768900e41dc3b39cfd407a1db3f1
+86f191157c8e85b5f0e7152f632346fca712dfdb1879d5deacde18dbf918194f3246a6c46e8e9d7d71b0ab429a059b37
+84ae83021192215245d26aa84295d02c15051570758e100c1d7ab82f78161cd772ffad2112620ef0d8680477832c4031
+a4c81b0002e40ecc379e0a2c2ad3ae80ca4ee0b1030a89ce58e28061ae7c8c455fb6e5b58dcdb02c749f7fea72fcfc1f
+b8371a720c83686be25c8e63a37127e1b1b612f2652df965fe215d044df070cce156e3e5a062f0159c495c66d05efc04
+a621a637dbe143f099ce34dac177c9c4384d27b431230b6fc17ea4478913dc9efa1029eee0b8b04c07e31ebb07e0c397
+a7022d1eddb9deef129a62e4e9e04e37011cd200cda8248126689d8ab41eeb1516267afea53e0e681c59e5bf9d307199
+91d41d3f25575ebc036148cddbb6bb956f316eec09d881f75bee17f315ca0b2dce519b6da1a53365605c99e9ea21267a
+ab63040dc84060885f4bfcccaa85fa45073141329c3b02b500d52e8e501f4ea651d1920ba635a2b79eb0244a6be5b68b
+ab20bdf8969207c69d38bf297aca90a2a5069c652b158a9e6c3053e844d87f2b95148dae5bde68fd2e0e42503451a00b
+827a020a26e824ab606f287d517e315dd992d6ed2c8c982e3bb7de3d54210791516cbbeeace31f42a09f076db98ec686
+843a815d2ec52f80dd8caf22f6d7998cf61c06ffebc37c63d1b990655f50223d1e0cfd795f8d6574ba8ebd82d9832b2d
+a595fface5650664e51c603d76c8d7476f4657fe49ce883e8726c3e6146214e870e6d1ed8d63a3d765de23ce72e19e08
+ae48c329586ba4d025854abd156d5b2545805ee775c6ab095c254e3754fed65359327a0cbe32cbfbf1cdb0f97b352a75
+a69e783c8f3cca9a52ae30c954ff75131174aff108de903d3c16aeb77a481dd0ba632cb78ace088accd77e53c0b2b0a8
+b18c69d7c7b52072b125ce78a19b2dfe47c0c1a7d8e9c2152591e8853c004760db4ee6120bd6a1d5466b2141af490a25
+ada5ec5285afd44751dd1ba4a3cc9a9910711be18229d7b622933db4c10523cbebaeb6e4f4fc556c79a0bd1d045f9bba
+94a051724e5ae356d4c5c0861da835a196f7c4289d088217b92e7067a12d2335d98bc0ad4fe591a494ba9e9f6469c963
+ac40df154abaab6427f8e2f335023afa05be0e12884ae8d5932eb1a81e0386b6e68c4632d1c0f6c11def67b0b4c79b25
+92c335770ebac3ac14f1c56beb617dd1dd134aa7a691b8883dcef104d80a5f04229e0bf9346cce0e6ef85e028c97e4bf
+84c52736ec2731d82ad82eed79e1686d88146e6db561674549981a73801f93e91fe1b79eeafdd521cfae29f2fcf7e5aa
+9965e135c7f44c2fa497edaf5b3a3540fb08ac902be0a075e6e130f93668dcdd6b2a8624996f81f76968f49309dc0314
+912c059c8131e73dcbca17517f35e0767792337e02c86de289c04202ed69ef9c7a57774649df8ba169eec8c0eb49f4e8
+8977256599f48d1c28b883988285daf42a53a15cbcb11d87c3a2d69bf20001c38c0d72719dc1af43a438fc2da77ee78e
+974701aecb6c0ebe278be8297afa491e0d8232796d4ce4e5c3ce8a57043e22eed36517cc6a184b6af811447ae28bf846
+9769a3b8b931e07fec9c02cfd4c51f15b5cb37bacf5e47bafa32c0fd937963b0e0010fc1f963802dc24d89d37018358b
+979ff8cf0f472fb2621f7bcff40f76739bc8eefd83d3a673d7bfea6f0c563365d9c8083ce71ed9107a330191cce6b07d
+96c20d0db06f4948a19de606a42a84a0cac850dbfe05280f11f62a9832d7d2cec4f7a40c16face069c78736e6cdcfd61
+ae4782233342c02901ab2ee6f49b43a3f8dec4d50e83251ab3956ec29c6f67ed934dccec52f0a5a5b068a267c32d8f89
+86dfe7862de9fec66666dcf00fadfebd81a24cf82ccc900451cfef04c06b0d203f10a621695f53c25c22ab7540c8d532
+8778132b6fadb3b8186219ec03a457b21a365ca20f0ccdb6b2174c0fc396dcebe66e363cf8859315b2423a9ad188a040
+ad6ac25dc4c04777a54b13a15df68ecb97037b3b6148b8d593ed8712993b3de5154d09e4ea22e1ef6b63643189e1cc71
+ac7ac4a7b30d18ee1b79017b6a3169289fd72721cf274fe9b8373375c163f6a5226a38acbaeb2aab67d9128a0f247f88
+b56eb67b31ec85c73536cd664cddd2e9890557a917ac589cb1f05e5ecc27690608ee4ed2a7d234c45af11a5f0f97ad53
+b3aeef6101227197104ce802c87621c6d09808388f4feb364cb9c0630cd71ddbc4a1bfb5e891b1aad5888b26482431e5
+93f565fa505833d5cb76b23d5928a7ec955dd754fdf7300fa4f01fdee752e30adef8f91c3ba94411a58fbf5018ba62b3
+a699045ab8b898f4ee265d1f4548788cecb5861de8697cb35193744fa8917b34d2817b8ee67ced2c90aa9661a3dde43d
+933ee92a18863b164efa9dd6e813fcada50edca408776f0e27f3f6633b1ad30a85763c9daa9a7204db8350f627d4b235
+83b8eaf9c5524fd8534f6f66a14102b0183e0d37463556ebc777301b4298c97eed7b454041a25c723493da925fcdc8b3
+9405f4fd069ba5fe18acf22af977ed09004135273665eb5441652afba9475ab2de549331503ee2b7322857a1f139d613
+b3f55b8afdae1bfde6bf840c7e30da0a161e8a0a9e27e09070688720e0518e71b2b3a87365371463a81221ddde23774b
+af0c120fa403fc0dae19e51e6ce3152c56d71a73b4e237a64732739527ec1ecb8721cda69ba96ecfa78091195220af10
+952a66436ae24f5a73bab30301a347580a7b14c759a6f7ece69522cfb3f5a325635bb018dc1f277ccbf80151f85463a6
+90e604dfe68e58ff9a3405742bc04163d920811caef3a49491412663bea36bef33350adc5f656555a8473016f9bf2417
+af3acf7ceb9bb60bb3f0c827bfb1a872714f172a57bf13a00deff4c5821a6ea3dc131b1fc56c91e12da328d433a50086
+a0c941013249af9410b5e48c4ea19ab5792468530190237406519e5907dd490b790581a5ba07910a3c3de530c5f1289d
+884b448dcd6331440bd4f50da31772c943184e00cf246600b5cd923a79928c5d87492602a9f62c8cc3c5a76ef534a67d
+a275c9cf5498772748743d55e99d5fa54d3ef495202f46bb439c0e07728eb0b58ee5f59b3fd1b4233e2266aeda829c11
+aa9f78222ced7796588d848c7d2964b4a0e229a702d16bd6cd2020e34138ddfdd24faf01c77f9d1a6fb1bc9ba8c2f820
+b7b34e56b94aa15f83b71b757a3465ea47ac4e5a39095bbe683fc6c6713c87631a15b81b9994d56846d153f1cc51b103
+ae54faa7aeb046ec0e77db95f35ee5e1f1274ec2346dc1f1734d70e86bcce54feb9fc52e94879791f16e691c2da67374
+b6f0c9eaa7a32d8811b597680b5acd16faf2394ab6772b8621bec7cdaa3a249d1674a5b45f312f92ec81514aec551052
+a88ff68063f30795884333dd033bccb397c7866af6922d6b09b968729a49d13c33fd66cafccf00579d88f23668b2a9f6
+8a897fe4e6165a62f3605d33235e91b5a999762d0f822655d44bbeb7a006dc7c08300f48e19d299723ee22f23f884742
+b67a42d41ffc93f8004d6d72f29077f8e26620ca510ee35d9f0b5bbf34e26e5c2353552b9f57776e55d5b0cd095aa311
+a27689f0949df64cceda7ad2beaa4ca9bbc4ed85da9b2fbea96c604445a2284faf8078dfbfa5a1e1514bb1b7156e2fde
+b6064f305165fa52ee7efd5846b9871338f42ef06400e642882270659917c71e8e6f8bdd84e0b07b5305883c26d6832e
+b5d4e50a19ade548c1e71d4252bd078d8e729e3c88cc0888969620db31930ff42712784090ecb456c60a0368620dcbf7
+a26f4fa8d75f350b9c1f4d989fc6af06e0c61be7220589438d4d4ef6f2f4d1a0ded7901a46edcabad234260c7fdcbb89
+9737ddf44d1ae3fcd9a4d6e095fde2e761ff0169f2df2783562ade0880d531191266b460c3924b007a97eda482c0c15a
+a1e50e270d2629a01c5f90afd59bd5cff365de8af44e2ea572200cc444c7b7cc10d4d843df6d34fa9b783fb0b6b12326
+b274fbbc10628736c5c2c1b3ffbfe7ef2fe8e33ff5d3424b4e685c44964d576e8cfb7b9fc491c4293031b2dd4a00ced0
+a0fe81040c264126d9163da6694580c5b7203f4c69f8dfdfd842326f0ae724239a232019379357e4f12a5ba22447a06e
+87fe3ee98cb358f6e26e7647b6910bd2286d5864f8544d7f34cf5949464c5854c58e35fae79b43e0edec8ed0bb189c06
+82c28a86c0cd0380ef0c14337c38e09e07a5b671d304b8f60b315dff470211350d930138bba3602ec9ea8b4d5f9db52c
+96a86ac8736f8155c1d661cdf537125750c66f3bbeaff54388944c46e3b482f7b25c8f7101c9dada2f63841534979184
+89c92e713a0795caaa711ef9bc7cc23cc0314a3b4290209f57df3d8c74cbe943f495711f0c28064ef1b6540cbd0ce036
+800e9eb3ad2a7e11deccf92708f3649e37009e1851f9bc5686524e4fd47e9d799275ca3e95fa0a51c9424a659a546aca
+914abd539869ee464aafd6bf78cd63e0ea88fc21be5d1a8bf81bce4473ddb333728ce631618a2f23e2afbc4ec0dc660d
+b652c3453d34a7b9b45ae3bc2542bbc32023571ba377bc5416e9989113e96eab94d57ffa31a0c73c5d1a71b51b9659a5
+ace4559844a367e30a9dcd0047ee21693d6232d9c6557e1b92805a0c2a2eca9b970b6104be0d3e360ad8f4a9ce2779c2
+843ddbee50b9715f067285772f9a04c48b41d9a957727e1e04899d9ec0372355a708e61d39c32956e119cc77e9abb0fb
+ae3b4f57050968d1b3dcbd9b5bb5f3e2aacaddb39aa84229e4718b9cc03736467ea6e35606136f60e3b72b35eecca5dd
+96ad4da2c505b7da33c724893a403197d4a5a393092d04a0b62151f99c8e04ad944ceeb031c9362481cc83d99ee50996
+b4973acd731be9ef200b505ce72e77fa781afa269290c8160b545aa14e4a0ce0d704f0ba8117b6c2dc8bc144ace6ed40
+9159f84f8fe9b85e749007e63d36317a3336a1b1a7e440fb084ae6fb4a3a6d2afac0b0cdd6b382bce3779159e0b814b0
+98654b7af82e7e1b643ffdd09e125fa916e0b39588908596fb802aab82c3bd8f379f4593fe8c1fc7c533d8518af42e39
+b47e4d79ccd82c4a1ba3df20dc809662320fb775cc2b5010f58572e1c2051a52c013dea507a3e3b681dfd9b98bd5ada6
+98ea992f0ed02bb12c305017126dc0e3709bb7a1c5257fecd94f54699303ca8cd3f568c7bddd8ed5bc30dab458dec9e0
+8d7bf1317239e3c21b8778848d479795a9098033731544654bffe13f8be88671561c4c65f45e71a7b7e21adc9a76bef9
+b56ec8f5484d1d6b0730960652eab5974e88fedb5642500933c9382e922fb473186319f4a534bf799a925335fa69cb2f
+8e7a801d1e39b8dafa84a1bb9be4da78da41df793e2757b80b435f24d4f4fbadc436ee265c2de53de5e81ef02973669b
+b74a9840cc4f59aec04947a389fad3d7811c4c60eecf7d4f1ba9de6d3d04b7f760d7d3332b97f40ced1fbaff52b7b89c
+a8cbad1896bb20a5329ae4d4ebc4e04b0ee8e763e006050f7bb2e18994f11c65f7cd57355964f1d03b98fbca500a64e6
+83a9fe1753eefb84aea64339c416e5bf6bbb67b877ae4834c388fdbb1bb4791a22af59bd8172f0400253a1f7405071fa
+b9cb49a7a2fa5904f850989fccf089900fd9488bf6024199dd7d5d797d35a5513e32bb85d78ed91349b93bff0f313cd9
+aa507796d3cc78b8732bba85e4fd8dfc790e8ce6711a5ca75a27c6b9f6c3ae5afbfce696daa7e2ccb31a0b722c996b28
+a4fb761dab54ead40dad4a34d19fb6912337eef0463a6ecc0ff816a8394f2e540f78faba7ac9358bf013e406c23418b6
+a3943c1926c5ef891f3e76b3116b2cfbc05bf048f4e5c99712194b5601e830635c90584b535ab1ad47c6c8a494c811d0
+b0f166d2c5fb07b1c96043b0a7e71ceeb243122330043978331fe8392796df3cc420cbd59f89a9c0f2e950dcf843b428
+8030e3ec511eac9d90e81eb1f219c14c23eaeb82d101a1cf88ce5674d41191ed18f773472f222b5c7071d2319b12d875
+91f0478cb91f3d0bcaea82df36cbca937c38a393b28b3b6d2af28c6d653fcf42912a7a5c7ae0f890685df6d7e3f1ab8b
+8b888613c52c0b4e91845d7175aaf7f2de756a11aa7e82cd26e1dd489b04ad62aa585fcd0f92748d8b45257eacf8fdc5
+8a13d62dc07ed4ae220f8f339b3fdedcde68cd1720988c6f2409ab81ec4663b8ffcbe63e110b89b6311e1380a8dfc93f
+a3ca0100c7da9a1976d948d9ffaa1e12e90adaddaa8a741978e367b2308b8d7272506030605dc7a759da4d1d56253b5b
+878a79b06334b14cd23b801dfc4769a2a6c6adc97758b180ba6ba81be729de7a2e2d914ab86642563a83c6c18a3e684f
+a9f5bdda8edd8c1fb9b5bb9e08940c0577688e8785ab6b9c87516027ca0409361e647b47a59fa97bb11307272de58a22
+b6ef00890eba760a3cb765a8cbc00643bfac23290c5eea5f9afd0235df42054c15a79f578642d721f7064f1071a200a3
+b0cef537eafea359e62ffc453d937935089fdee23cb4b691bf43f8e64698c59f2d81bb02e9994345ea26f78417470b16
+b5426a7a581d7dcc4e6136901e3551c27dc4dd442b2849786ca61453ee8082f15d41d0ae23c2a8cec4160b7c4da4ea22
+8432e93e19fc24961201dd750f7d14c9fca69a457fe9e97a9cc9b618927896d1a523d2cd9418243025d9978c3f781528
+a11cec4c9c707c51ac9583b4ecd1fc80d3b848b539f9429edd532d50d8a93f3219dc98100922af3d45d2ac8ec0315723
+a5a0fa3e3d8bf1316422aef9d449c63d63ecb4fb294b4987e1ce768135a3ad7aa9cb81a3dfb0e51d5d0ecc5b6b2e6c29
+b3a1cb977dbcf38487f94ceb72ac3d4111b55a3e5ee71b14860a975ec8f08001e3a129675527194b808dc2cc2fec69da
+8df5a9e743cf36cdad2e2a425c332daf317d418ad0c4e6676cccce659e57af12a35b059ae11ccb08c80d41f7d3aee472
+b5b25b3d7063f13f8f634cdc7be4f2b619c9b948cf28a5c2d189ceec3752b55f99cda9a2d65d2ebf96ce895d0348a79e
+a4a5d32d74d5b1077d1dcba527ec40a8669ddeea9796d51568cd44c3f481a9cf870cf66354fbdd262ddfa9e189d41b10
+95196a2873b5bed8c4cab84250bf874572828697d4beca9fbc16048053ddf913063b001678c9e8c99992e057b5644402
+a77930043de6d3231cbf6d66f82a8a746e4f77775c5c1e35fd19d43b70399c94d30ea9895c82c865a6c4ee60f206a9ed
+99de8f9dab554fc07e061e9fd411ef916f46139a4461607f5d601d6930194d3433882f6427ac8a346cf867cbbd08097c
+b76809b153f611ab9d16bc49cdf9774343f82d6fc1939f13a49b20f8e8dc0ef679f07f534bd5acd5404ffdf3fc18f04e
+8c6d45c1cab2759209e0ffaca93d0f7602122e883b5ae71c79087abd781585f33b4b89c3f5505da82897fb2c6379ddb5
+984279d4c9ee8f51eaee7a146ed665094bfc1bc97a50bcf1a77e18b6304fc71fd2a6ef58daf3abf1160d744d9813c035
+83529d6085fa4142ed5c7e950cbe25d87f1a16955c2a7b963478daa4940f0cf8f31571589d537cdc02a7eb39df019872
+8f4c88ed9d4f0ae38f5b3c014414cd50bd2387393996f35a91491fad83fe0ea9a112c48369ef2e901eae345c72be7690
+b1ef0a88686b4d48455ea06d5e9bedc92c13789774df37e2f0868da3b55d06aaf58a41fcce391f5cc0861f35441877a8
+82b92a1ea191176167375b5c1374b27ba710c768d81cee06cde787790db098d9f12415711400747fd54612ef9af0ea6e
+93e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb8
+ab54d7c9a3ec7da862f55ac9ffb4c959c60481ef5142df42c1aae63a40fe999ef89c020ce9b97ead5ea155a31ad9dc951253ff1703be99ed05fa6fca6b22850a5bc2ee8d6b5bd7ffc1242c2199309112d240d18039e8036509565c19dc099d11
+8a653e72f96f4553bdfecb4d7ee0802e8bf086edbf06d07a64ec4902d961f9c4655f3ad9472e48a1ec66fb30aabf1fe00ff5f8abe82276df35cbb14ddb6047a28f792fea1ad009b9dff0e5e34e6fbc8d054a9f62432d0d98d4f0974ef6298d64
+89ab5abfa1424db4981ec60bb0d96005dda380506c4ac4358e8c464a4e50c1cee2e8aaf5f2d4b0b5e43dc907fcaff3ed006ab5292b6014c816a06af573d94cfce800dbe306ca3b0342bb570afb0575ae013f55ab5a0c018dfe222793c582bb50
+b11fbb2ea855632e0c164ad83c5a9a230b15dbdb74ccd5fedda7d5e162243ca182435abe98b3b99952672e802ee3a7e001c7909571a6782988055b1ce529aae79c7c5706141ec42bb455ff6224343e272e1457c207372c632b7fbd5123d353f9
+a0ac685c627e5b7ab90cfe24a9987d5a59b354e49fec06af0ec5b287710aa4549d49fbe04e5359e755ff5e6745d190a200326ff548f948866e317970ab13bc01a5a38059a9d49df21300036a69cbeeaead3992b5384496776216aa49e703adbf
+b2876c27e287955196e8bbf5866d7799297c5facc41866992fead253d1dde7a91c937272b1cc56735f26ae78df2cac00006bd67347ce3d3a48d459106e566a7b04acea0bb5932fc80906e51c5ff92c16c18a0b55febe7e06ef80df9a4904953b
+81fe59b70ff34adf0bab40e1ff6f8d6c6b3066307b3b11bed978b3bb687116c60fdd9ae4ab423771139cecf7b428232500cceace9dcee8c35ca1718af838a6c6318747513a26553b8e1bc356d965f7303c74e20ede959121aca4dda825239244
+b2c50fbb6695225b8f492a24b7ecb0bbc6761f824a61332ddd4fb113a43647527dfdb0bfd9055f6be1d3b7c2e858828116b1cdb8c4c9d0874e417f4b5c524e83ebe131980e7ca3f0d6f4c2720e9dc5f187adf0653a458355724a7d9288ee090c
+8383c9a4d40c69e34780d5a3996a7d28c320ff829aab31508dca6e1aa71bea9bc6cb155e15f054249c719d9851d6270d10c868dbc3907f58e099d4544e19486e995bc107c9604df3451af0dd2e949967a0fdbbe361f43eb60ea088600994a8ca
+b83a55c54e92080190c4dfe70a67c38b391191f0351f557bd329ee4a8096b10ea5f5becaeba7e86f9411ebac0c226e7f12b97baca8fd905f3e0e941c2a4fee39c490a361b30e6b7ecdc0b09fea3a5799d9f6c6ed753e02ad2baaa98af5375a58
+841e674d1c79edb849aaff2cbe0585c9dc2953e322aa9bdd6f8db7c625a4b6042574ea619ba945f4cf31d5f2b31d21cb0d1119c43ff9e587d296ca22e1cff8c5ea872421caf7eee2b2b2475abd79f9ef84d9adf822fc3379ae001d58e5046b8b
+8f5498b0198365787c19d7b1789b6145dd0e05330ddda91bf9bb9d70a7c2b46d5444492e315e1cfb0de7bebc8661bd190167de053fb75c62bedc28c624915b10afc0cf699cc4f2c0ed2a8a90a0f41d4f1140d7acd46d3ff49e3f9357792e6322
+861a9dab0bfdc3ef2d589f8bd5b1a4b478a81a6455872744f885e6e8f436f73a3d7dcc65922369468c5a3310f65d98f312426571ef1ef266ad52d83d3b89ca7ab31dc942e4bdfd4440d9e847fdd04c19bfd8410a9a531568cba45e8d2aa3d246
+ac46a8c7349e2c051f6f0ec3fc396eb2fc419bc15ba9985e7a8464ae38e0311ed8af9a0c68c4578645a9f0d8038056e609a048a0580ed1c3ab5c4d3e7e5ce145dc26599a2d80bde5e2770cd928545747179d23b1f514ecc59a66f59ecb9f66ee
+99c914aefffae6b7749a242356c88e00dd29593b243059faf2060ba338241d890c57e1cfadc52a03069be8b7f18abf4b19efb4cf7c41dd8c52b845e6de265f06c92db560680d6a2acdce60bce9be5b9a8e1f2625ceabb3701a14fd30c6ef4d05
+b5dcf9b83c24fd1fb2be97f703dac64659ae7ff80f7e4c21ea36c1aee3df257ef51d0d1dcdd956c98b3cb11fabdec4e809952a27dfbcebe2393f3c2762e160d78a151b26cb4ba0d49617802f9baef51d8c6eaf5a6b2da20c1f5c208b494f3de1
+a8a37f4dd5f16199de8454685158549e09cbd9e81a561955995429d04dcab25fa71d41973ed181e815e64266da2520cf19be6a5aba3508917ffc48fd4446daff2ea68d723ae3eb6f46e6a59c17abc1d3aaf40613cc4c043de018280d48ce0efd
+84077ec9f2de368d0f711aaf0620f00713769e412e55c7988acc061b2ea51b233a53cbda551b09e6306d1c4615b866c91420b16e77b8f2f8d911fda6dde4c6e099601f6212efd3b90042cc3226a91097981ccd51302c1fba72efea1cfaed9de1
+88b74d8ecafec474022e41f48a66c5ad71422cb2706680c01c970fcdeaea8a6e4418f1545c7353cceaa78b168ae4a2b70a30a2c51549574ac53126c588f5f1e72053f5811b1fad709607254fa4f87b6f7d6e89938a6761e27d37c9b803770f54
+a65d3c4adfd929d531bf86ac0ba7ff140cc1181f693f5ca440b4438a641b332fd369a2df230dd7e2e6b1df5f54017b011605815a7325ce3d45935f96d3012661eef5839c2e0c31d2f8d0551ebdde6e36b712acf97d41be5d28339f70adb57707
+9476a90c417eafb01659638a98d235ef2433ac97470ee78879a0eaf93941751b3e0dbd9f6500bfbe40adf015223a89100b6b533c28e98c9aa4addfd27c520cbb6b16b231acacadaeedefdad5c8734b57edb9540c2b1e514054f15a6b3a6d5f2c
+ac290f34fa6b516e3899628448ab9e60a74d38bf3a9ca36f2f186c119aaacab914fd5efeb41c4af372037d324938db4d0d5a66dd636b097108dafdce046a37b79e6b0acb09c9775bce5e859e4c4246bf3d8c753ed6058242391767baec91f0d4
+affd61eb4bc24483d6daa055cb0cb6ad7e4785f4a13a3fd919ecb0605382b35ff96055e2b991156fafcb8fd85807f7660d84f02913fa0f2a5961c9dea3452fe532349357ddd79d24d23396c41447163079fe69a8a065f7b5d3230edc713c7600
+994d275b27dd228cbbb0326a1ac03e3d6ab4dc8f6cfb70afe97f722d6a256a84e5dc86e3677dccc5b8e7aa54ff5f03f20b2aba4c31cfa86d8484b61f24d2baf9e5a4a0bd74c88baef9c6b707fe18da94191f3fa7fc008758a0ffb46a9480619e
+818850921ae0a3cd4e07e3c3c7231c4ab325188df7f679215a41c983ecd85e538699ad5226063f38263433838b5efe800c37029a59cbd1d379de7d61b3b36dc76a599e541d0f489fec3be704902dcbb5c03184a62a20e28b46143c97868c083e
+9628d869c63f03f1844cae49caa5e4740ee72a3177375679ea5c5cad4a96d64dbdfc9f82321d41fda33069cbff1e27fb0c97ee422b558d975df023c19f6a599d7a958ec416536249a16f92c4a7241c2d14eb94b2bc717f6ac11fc866f47a35f2
+af8e9cf99bd6ebea38dfb0aaf56cf2bdff5251f770962cb44cc336aa0a8b5d757df79aafc51becb51190120d4bc673b40a27a9ae1c99726f5d597800b197802e65a63e1f6a2f28b457b891e708fca0aec375f9089fabb82f3c92a66439a8083b
+b777f84357ef01797b362fc5db838ddbff82010095e91daa6949561786f661b2fd829bf0b4e656f29fc6196042cca0b50212da28d1ecb84b72311f03dab329d701aaefcb926e38be40e3504973c07f96242ad89b2aa716ba508f27eb30e92674
+b01b9e63a0793ea1789da96201ad17381a158576abf399c6926c54b585c1a9a7771598d395036dde3ef1d6f3e512b0d5172c34cc4624a19e6466f3e8befd162c24c794590d6548c591a535c674d80e29c25048e8784d998bb21ad99ad3bf10f4
+a8a899c7d601b46204b8eb5391d638fdbc7af8d26e57e77cdf879e990edddeac969b6c016c7abcd7ee218cde65284cc61461cbd54fed218f3efac5e060f260c1bb0421a1da7129d41c2bcad5e96ed0d6a5e9c40cbf21530abb25dae61dc3b128
+b55fa53216c831161ea290e030cbb7dd7838f480bd0737643f765195d77ec592979556ca59d0dafdcb559ff03ff7b1b90fd6368c5c205e3d7f5e2ad27b5383a19a62067190494d1c6b3d5d660ce9a8a86456f3de33c2908951503af10f7831be
+91892b185022682a326310fa2e2e03a15ec46adb1892f1d8cb6a62abfaedd24ab33fa8e69ecc4f7e516f24bfd1c061580d9bb96cf6605512652d56070594ba35479c8d6e47d92343b9719898ff620067f38d5dd53e60c136a7231e81fa37348f
+909abb17a009e1060cdef285a571451205a67d370430fe19fab5d495670a8824098693c054e70b6f595668629d58a1140d06dfaea317aa7c51618651aaba82157d542ab590109abc8ac36f44c720c11e05dd9faa64b96819b09ff8c761de4453
+8c91c0c8b1db4005ed3702110ffd75230b00bad6c969b95af6282378e4fe2520302b13bb9acfea47573498ae10a395ff0de9cb7714a29c48762482239492cbad0d6a2dbc33a4dc2267d620f346619260d4ea07967dd62ee565bb871e3755eb3d
+977f426c94b291a9b398448974494487303d7157cc414bfb35ca8c37a8e5a18cd717254f4aae29f74695a813cea40f0301b52ef41257acdbba37bb9c021b0ec187b7a3784bc12ed376311fb2fd1a105748c9d143a408888c9d6426758591dfec
+866ffb2ce1ed33593f9aec6d0e7195e0f4513372230e4ea7a851d028d99d00d4a2412877e3735b7d47027ae900ccbbfa0ee918bfb52ef8ae0f964ba891820b559bcd46ca9844efe1f4045f4d3ccf611cb8545a375484ada1a30c606cd64cbddc
+863446f32a18aca3874c7a15289030870bba05fcb839fce789cda3da3377ba7ecb1a977c84faf2667b4144f322268e5c0eb7de69911ec46ec8bc017f19ec14c7666046bd2bb338ec531062e46d53794146cf9f5c613bb144f1b1f8442a7cce43
+870a2e8743b845f056230fc62b8f5149335242b71578bdf66bc14fa6d7527fd5bf85d0ef516e6f2246dd601413b67357138b794aeffe9ceccbccdd3900dc9fbdbb35dd3adc4a0221493e594ce575816aed8af0fb53d8df3502ad51bf5c9da124
+84eecd70ce4bafd7d6e0b7ea685267812ec23f6e2178f5fc569487e4969e36c03856ccb56674e65d49d4b3150cc4ec7d0e936a0bf8a9ae558f838ce0b5b5989ddbe26ebb9c0224a2f820bcdc76124a45071146cb5e89ab8656ffa27eb25c8fbd
+ac6b775771419cd38e7cd37e9f594a89a66e7cfeaf5b9cf21c6b44b41a765ed54ad2888c6fbd77a23285037efc883fde05ef82ed9fc49afbbf4f35e8401c7df4ef88f6a9a1417a29ef534e365b58da5bc6c98d486f2bfd839424f0a709d7e8d8
+9954ecf7e25e1b8e67d8771449e7c00bc2ca4e48e604b92fe291e3ef8fe5608412de8acf7fd500f62115d9e10a0271bf0b02caeaad3f1ee939ee8a03af9f37ca50915189b54715a934ef01df0e96b91d0452a0b27254f46f94660c1ebc287be3
+831abdd3d7a5bfcbf39f38fac455e5e113297e17bc4dc8c49bdd938dfc332bfdae6af6c06cc8228224940ea4d0316549152214e732fe2032b16d0517acc90f9e9e0f496645a49b3864eebe19b1e4b55c5a5d86533697f00cd9ddfde38ea2af70
+82f11302ec5c2842184939b9d43868e03cc90120e6bd5554f2c051cbff458d0046e74652ee001deb081b8aea0c37c48707081ad9f82453973fb358ada46d2dd5c6b7ebb9e5799d23dbae4ac90fde75701f921ebf244b73b0f04db659454af562
+a11414895fa706e76387b79f47e814bacd9e437b7aca346b101d66d962021a4f96b67a30b4436e305bb3317eb82d0c080e657be2c0bf247e534c6e31f85f1d9bafe4455a2ae22a0192e53a1e9582e66b460180cd0cb90300b4cabd2c36bc4d21
+b55043990ddf27bd285e9221319a1d918060a315e92d8304afe887e9af0879e17da53871865882d96ea2b8daf20bea2215e9a2b2b94dafcad3612c9fbadeb7c9f6a4e2adb4b8e3ecf024737ada651b784a76831c2c7b6971143c4f9f352c97dc
+89873bcf8754282b6547a7a0e1787531d0fa2779c5062e7de81afbe132df403d70fc2ea87be4712c7a58514250fc62d418f38264a2b29a0d10d27483a9574387557914b7a178a982c22160d0c4c1c29aeadfe3250fb682745e4f19f76adfaadc
+a00fb88c700529f3bded83be19527c82f6df1a40bfce42faa1bdfc2a5729e9d2766daa8f6a65885d0c0f3cfebe3166a619a8aaaa135907dd85694e26eee0e7062b7e9ec3b9db463703028c8ff9515f9b6e190b1fa8f04aab30c6471158e56ebc
+ae77f46684ff49e2436fe636ab74c5a244376fd6e34f6c207de277438cf075bffd1d37c47b5beadf997418145e4038e20eef9391a390b5bacae18fa203ce287f6622eca30b86c8637dc76db81a77e3796b58fc88e3b61accc8f7989a086ec543
+837c575f3a129520019420647875d082900b506afcb89e4894dddd49a3ebcdb114eaacc432f33119ace647291ae759a81273bd920e4031e9760e8ed4b744aab9b44dd6cf5f251e75f5404d0cfca3e15d8ae457aee8afdee56e794491259bb454
+a010bc4d0787706e474286e18d786e4d779a3434db592b7e6398b3de129af9f16251f4b929eae78509e3c0cd06caf82813fda1cc561cef36c1ca5ffe5521f29647e80b2ac0bb5ac953cbd83096627ad4c6d19c15249a7583ffa681a5b8203af9
+8ba5e82ae9c88152a4e6ca6b54e18f693c94ef2ef732470e1ed4547488a0a752ff1bb2f6da9c9d25b875f962070bfe0d020285e031327544ad9523f9beb3463ad4d22a470cc86e91b6d5f83251f7b39e020726776eec14de815f8a428081e89f
+a5ccf8af69bd593dabf9e729bec46b8d4333236ef2fec9b3a5e5be580c34faa056e83de2f0613712122a9f4f531692d0052255c3822aae87c04d238311b51c6727f8a20d56e7e221aa7bbf4430fbab74058d390e2cf50f426ab5db18f18818a2
+a36885e433a3c6a7db407194cc6307b3568a1d000e4f6cebc6731abaf8652322f6f8a9d9e589421e436afce02257e9b0195610a1fb5e0a067401cfa3e64fc0f558dc58d15b5ae676d3d4761e11c34757493f1d78fd5c58f0ed56b841479761da
+8e719fc50682758ac95fb5547457ded3df801de84f6f9883d567120d0097ae8e2eb634a70cf93b072b93aa436f2d50dd09b905a9415f6effbeaa0515195ad3b4b5bdfe6397e68094c2918c44dad248953b66eb6846d8b0aac41664326239e9d3
+877241b94fba746c0c9ea95c294604e5c6dfeab9e0ad7f31fc4bbb9e2610ffdaba310e5ea82404ce3b3e5618b2b336cc194eb0620c969dad9f9a681aefdaa4370bc1051c71719e551d1f1c51f4b1735bf5c706cff6612fc3c918ddb0061a208d
+8d9a0776b02b26b7e41bec72b65f6f693e4f0c8fdd6252a9457e3a0ac315844759c3ecb46f1793c6397932f801c8b4d5147c77408b4edfeb5b19912733a15fe82b7c17138a5f2f0f17933eef986b12bc6ca35d90e5f7c0395234c62f131daf2f
+839f21c9feb77867e256ee4165059276b6288f02c5fb580a22d2e3815c375d39bad16d76683d03b70900a416a66963d608fea8d566c8035cb965449c8d8014a38ab7c17d057ba802643a08bd4bfbbb675ec3df330dd6c8df1cf454a917e530ae
+87cbc4749fc46227127f484de3f0cd72ba401ed8550249dfc0e3abca082485a39eabf7e58be310b26a5bf52d8ff98b32001239f2d38ba6202393251f7a6c71ed8668e017e25e78639b7d1f4aa1c99026ac98da899286135642649016f54ab494
+b23b59cc019cc068b0db66b2b90a3a0df4c0d65896220d6c1a4866635b7813ca0e01c8a4211a79296c0d74ed4287a8a815118db3f924820a1ead25fedb7384a71480d594106c81887f57bb5cc86bd9789b2eda2a2765a923bd3e6832df4812e1
+a509cceb4138c0e2b57e00caf96ccbe3942e410e6fdf1c0ebcbdf7b14d26ead2713128457cee482bb0de9c29668a2fcc16e4183b7c7131c2aed2378d30b45db311ff4ebed23aa2983fe6be54b6bba0b9ffe7add59f28f1925ac5cc67aa3a495b
+a43e95552243a3915f698505c0b8e2469d6f28f431772279f7731923a323b4a96ab644e75b2cb9fd7534c6e441237f921194a230d81d7e1409810eff348edec6a614cfd8cd48ecfd956eca82669ebde2fa48fc9090d0643f71250fd7caacad4a
+8fea8707e0f15584a51a93094a5a517f5d46dfb5243c24b977b89bac5fb75791b38703bdbb62820058c5743be12bd6cf0b0d578ff7877ed1aed0f723dda1e75510988dc41be225d07ee8b0698d0641a91008488516fc3194a36985e342632551
+9804a5bf830c8d66d2bb07c3ced70560aa5738b3b8af5427ed5aa119f7110dbf224106a03a42ebae2b5db06c2f5e5d99008451c52a29711e7ea1133723a860df497b2750208b4a430ea2e62c42db91247cf2640eb92ed834e6a63e8829cd068f
+945e3136e24d0c72ea9a13de7027e038c53d384d40e3b191eee05d06b0df16acb7264acfb4802fce61116e442510493b00d0c2a31f72bcf3b2f4642f9bb6789935adfb9c05dffe2e0bbc77c4dc008d768a49fa0b74e480370ef63e0225c025e1
\ No newline at end of file
diff --git a/config/src/main/resources/mainnet.json b/config/src/main/resources/mainnet.json
index e2f9b1b9645..645ddb09d47 100644
--- a/config/src/main/resources/mainnet.json
+++ b/config/src/main/resources/mainnet.json
@@ -1,19 +1,35 @@
 {
   "config": {
     "chainId": 1,
-    "daoForkBlock": 1920000,
     "homesteadBlock": 1150000,
-    "daoForkSupport": true,
+    "daoForkBlock": 1920000,
     "eip150Block": 2463000,
-    "eip150Hash": "0x2086799aeebeae135c246c65021c82b4e15a2c451340993aacfd2751886514f0",
-    "eip155Block": 2675000,
     "eip158Block": 2675000,
     "byzantiumBlock": 4370000,
-    "constantinopleBlock": 7280000,
     "petersburgBlock": 7280000,
     "istanbulBlock": 9069000,
     "muirGlacierBlock": 9200000,
+    "berlinBlock": 12244000,
+    "londonBlock": 12965000,
+    "arrowGlacierBlock": 13773000,
+    "grayGlacierBlock": 15050000,
+    "terminalTotalDifficulty": 58750000000000000000000,
+    "shanghaiTime": 1681338455,
     "ethash": {
+    },
+    "discovery": {
+      "dns": "enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@all.mainnet.ethdisco.net",
+      "bootnodes": [
+        "enode://d860a01f9722d78051619d1e2351aba3f43f943f6f00718d1b9baa4101932a1f5011f16bb2b1bb35db20d6fe28fa0bf09636d26a87d31de9ec6203eeedb1f666@18.138.108.67:30303",
+        "enode://22a8232c3abc76a16ae9d6c3b164f98775fe226f0917b0ca871128a74a8e9630b458460865bab457221f1d448dd9791d24c4e5d88786180ac185df813a68d4de@3.209.45.79:30303",
+        "enode://2b252ab6a1d0f971d9722cb839a42cb81db019ba44c08754628ab4a823487071b5695317c8ccd085219c3a03af063495b2f1da8d18218da2d6a82981b45e6ffc@65.108.70.101:30303",
+        "enode://4aeb4ab6c14b23e2c4cfdce879c04b0748a20d8e9b59e25ded2a08143e265c6c25936e74cbc8e641e3312ca288673d91f2f93f8e277de3cfa444ecdaaf982052@157.90.35.166:30303"
+      ]
+    },
+    "checkpoint": {
+      "hash": "0x44bca881b07a6a09f83b130798072441705d9a665c5ac8bdf2f39a3cdf3bee29",
+      "number": 11052984,
+      "totalDifficulty": "0x3D103014E5C74E5E196"
     }
   },
   "nonce": "0x42",
diff --git a/config/src/main/resources/mordor.json b/config/src/main/resources/mordor.json
index fe0a1e64f1f..5db1e4ce0ca 100644
--- a/config/src/main/resources/mordor.json
+++ b/config/src/main/resources/mordor.json
@@ -6,7 +6,41 @@
     "phoenixBlock": 999983,
     "ecip1017EraRounds": 2000000,
     "thanosBlock": 2520000,
-    "ethash": {}
+    "magnetoBlock": 3985893,
+    "mystiqueBlock": 5520000,
+    "ethash": {},
+    "discovery": {
+      "bootnodes": [
+        "enode://642cf9650dd8869d42525dbf6858012e3b4d64f475e733847ab6f7742341a4397414865d953874e8f5ed91b0e4e1c533dee14ad1d6bb276a5459b2471460ff0d@157.230.152.87:30303",
+        "enode://651b484b652c07c72adebfaaf8bc2bd95b420b16952ef3de76a9c00ef63f07cca02a20bd2363426f9e6fe372cef96a42b0fec3c747d118f79fd5e02f2a4ebd4e@51.158.190.99:45678",
+        "enode://859ed8c19ea04eaea41f1cf17c8d2710e2e0affb97328c8392a79f1764118edf2344f1941299f0d676772fa6054447e6f9b3af96444e350b417442bfd7cc832b@34.68.243.226:30303",
+        "enode://9b1bf9613d859ac2071d88509ab40a111b75c1cfc51f4ad78a1fdbb429ff2405de0dc5ea8ae75e6ac88e03e51a465f0b27b517e78517f7220ae163a2e0692991@51.158.190.99:30426",
+        "enode://534d18fd46c5cd5ba48a68250c47cea27a1376869755ed631c94b91386328039eb607cf10dd8d0aa173f5ec21e3fb45c5d7a7aa904f97bc2557e9cb4ccc703f1@51.158.190.99:30303",
+        "enode://0d70715514674189792de4ad294b658c96d0ec40fe517fbe9cb7949d3792f25f82357ec77d1bd8bed6ec719ca0c1d608bb34cc702bf3d4bb4507f7280f835452@154.5.137.161:61410",
+        "enode://f50f52b5fe18fd281748905bf5dad5439471f32cc02d99fecf960a983c1f4eba701ffca96afd2f2a68dcf6f97c5d02b566bafce1f361b51717e1a03c1dd9a836@157.230.42.102:30303",
+        "enode://111bd28d5b2c1378d748383fd83ff59572967c317c3063a9f475a26ad3f1517642a164338fb5268d4e32ea1cc48e663bd627dec572f1d201c7198518e5a506b1@88.99.216.30:45834",
+        "enode://07fa944c83597d5e935a2abe6194ed40fc7239e86111c971a43537a33d0184d1cd1b3f1291b8dd3bcfaebfbb802de77c843465a00065b39120c338fdd877ca4a@35.238.126.60:51240",
+        "enode://4ca79bbff7491fed82221259e3f27492e27b95b600594e2f8d5f1fa011123ea267e71873a0db3993e5109845d519d8b849ba2c7e4b48b09bedebb99e1c2ce304@35.238.132.8:30303",
+        "enode://06fdbeb591d26f53b2e7250025fe955ca013431ded930920cf1e3cd1f0c920e9a5e727949d209bc25a07288327b525279b11c5551315c50ff0db483e69fc159b@34.218.225.178:32000",
+        "enode://03b133f731049e3f7be827339c3759be92778c05e54a1847d178c0fdb56fa168aa1e7e61fc77791a7afdd0328a00318f73c01212eb3f3bbe919f5ce8f5b4a314@192.227.105.4:32000",
+        "enode://2592745efd35b4be443b8ee25fd2099de132e037951f9f6d3e8805e0a78f213537f71264b973f1a83a57372f57bbe6acac8d6ae678f39393221c045ccbe3b18c@51.15.116.226:30304",
+        "enode://c0afb552bfe932c72598caa245aef82d55c23555622c5ab946d4e49bb0ab694e46086dcff6793a606527f323ef94d0eb499d01ceb26aefb6fa3f8977105d7dd8@157.230.152.87:52138",
+        "enode://5a1399e6ba3268721dd7656530cd81230dbeb950570c6e3ec2a45effc50c032f66633c5eaaa1a49c51ba1849db37a7bef6e402779ad12dc9943f117e058d7760@35.225.124.17:39306",
+        "enode://15b6ae4e9e18772f297c90d83645b0fbdb56667ce2d747d6d575b21d7b60c2d3cd52b11dec24e418438caf80ddc433232b3685320ed5d0e768e3972596385bfc@51.158.191.43:41235",
+        "enode://5a1399e6ba3268721dd7656530cd81230dbeb950570c6e3ec2a45effc50c032f66633c5eaaa1a49c51ba1849db37a7bef6e402779ad12dc9943f117e058d7760@34.69.121.227:30303",
+        "enode://f840b007500f50c98ea6f9c9e56dabf4690bbbbb7036d43682c531204341aff8315013547e5bee54117eb22bd3603585ae6bf713d9fa710659533fcab65d5b84@34.69.50.155:42078",
+        "enode://b45f008ab8ad73966d0c8c0c923c50f47c0ae50c37a9ea05cc28b00cb94802145a4158412a526fdadd7e539db5eaab72f06a9046a34576ecf5a68efc41ba9d01@34.68.40.145:30303",
+        "enode://1f378945c9b2eeb292d910f461911fd99520a23beda1bc5c8aea12be09e249f8d92615aa3d4d75c938004db5281dabad4a9cf7a0f07ec7c1fc8e7721addc7c85@34.205.41.164:40218",
+        "enode://2b69a3926f36a7748c9021c34050be5e0b64346225e477fe7377070f6289bd363b2be73a06010fd516e6ea3ee90778dd0399bc007bb1281923a79374f842675a@51.15.116.226:30303",
+        "enode://a59e33ccd2b3e52d578f1fbd70c6f9babda2650f0760d6ff3b37742fdcdfdb3defba5d56d315b40c46b70198c7621e63ffa3f987389c7118634b0fefbbdfa7fd@51.158.191.43:38556",
+        "enode://f840b007500f50c98ea6f9c9e56dabf4690bbbbb7036d43682c531204341aff8315013547e5bee54117eb22bd3603585ae6bf713d9fa710659533fcab65d5b84@35.238.101.58:30303",
+        "enode://07fa944c83597d5e935a2abe6194ed40fc7239e86111c971a43537a33d0184d1cd1b3f1291b8dd3bcfaebfbb802de77c843465a00065b39120c338fdd877ca4a@35.238.126.60:30000",
+        "enode://617a2009783a09085ed0d5d5e7250e2e3c142f73448bf28200284bf4825c5926a80f3e9fb481edf38b89ade2aa0ad5a2f14cc935f3150e36e648eddda674fd70@35.225.5.185:51320",
+        "enode://64897cb66fb209548b333467d701e5d205188023d3779411eb2032fd74315723d9bd6e002a7121214fdb68b09173d383d24f92134380fa6f1d2a193030acba1d@91.203.110.229:30303",
+        "enode://8fa15f5012ac3c47619147220b7772fcc5db0cb7fd132b5d196e7ccacb166ac1fcf83be1dace6cd288e288a85e032423b6e7e9e57f479fe7373edea045caa56b@176.9.51.216:31355",
+        "enode://34c14141b79652afc334dcd2ba4d8047946246b2310dc8e45737ebe3e6f15f9279ca4702b90bc5be12929f6194e2c3ce19a837b7fec7ebffcee9e9fe4693b504@176.9.51.216:31365"
+      ]
+    }
   },
   "nonce": "0x0000000000000000",
   "timestamp": "0x5d9676db",
diff --git a/config/src/main/resources/rinkeby.json b/config/src/main/resources/rinkeby.json
deleted file mode 100644
index 7332f8dfc55..00000000000
--- a/config/src/main/resources/rinkeby.json
+++ /dev/null
@@ -1,798 +0,0 @@
-{
-  "config": {
-    "chainId": 4,
-    "homesteadBlock": 1,
-    "eip150Block": 2,
-    "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-    "eip155Block": 3,
-    "eip158Block": 3,
-    "byzantiumBlock": 1035301,
-    "constantinopleBlock": 3660663,
-    "petersburgBlock": 4321234,
-    "istanbulBlock":  5435345,
-    "clique": {
-      "blockperiodseconds": 15,
-      "epochlength": 30000
-    }
-  },
-  "nonce": "0x0",
-  "timestamp": "0x58ee40ba",
-  "extraData": "0x52657370656374206d7920617574686f7269746168207e452e436172746d616e42eb768f2244c8811c63729a21a3569731535f067ffc57839b00206d1ad20c69a1981b489f772031b279182d99e65703f0076e4812653aab85fca0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-  "gasLimit": "0x47b760",
-  "difficulty": "0x1",
-  "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "coinbase": "0x0000000000000000000000000000000000000000",
-  "alloc": {
-    "0000000000000000000000000000000000000000": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000001": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000002": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000003": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000004": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000005": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000006": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000007": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000008": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000009": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000000a": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000000b": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000000c": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000000d": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000000e": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000000f": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000010": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000011": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000012": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000013": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000014": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000015": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000016": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000017": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000018": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000019": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000001a": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000001b": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000001c": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000001d": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000001e": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000001f": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000020": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000021": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000022": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000023": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000024": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000025": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000026": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000027": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000028": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000029": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000002a": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000002b": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000002c": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000002d": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000002e": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000002f": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000030": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000031": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000032": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000033": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000034": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000035": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000036": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000037": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000038": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000039": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000003a": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000003b": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000003c": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000003d": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000003e": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000003f": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000040": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000041": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000042": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000043": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000044": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000045": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000046": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000047": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000048": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000049": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000004a": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000004b": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000004c": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000004d": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000004e": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000004f": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000050": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000051": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000052": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000053": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000054": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000055": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000056": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000057": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000058": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000059": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000005a": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000005b": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000005c": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000005d": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000005e": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000005f": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000060": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000061": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000062": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000063": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000064": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000065": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000066": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000067": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000068": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000069": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000006a": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000006b": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000006c": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000006d": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000006e": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000006f": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000070": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000071": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000072": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000073": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000074": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000075": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000076": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000077": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000078": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000079": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000007a": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000007b": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000007c": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000007d": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000007e": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000007f": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000080": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000081": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000082": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000083": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000084": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000085": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000086": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000087": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000088": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000089": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000008a": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000008b": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000008c": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000008d": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000008e": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000008f": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000090": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000091": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000092": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000093": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000094": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000095": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000096": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000097": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000098": {
-      "balance": "0x1"
-    },
-    "0000000000000000000000000000000000000099": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000009a": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000009b": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000009c": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000009d": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000009e": {
-      "balance": "0x1"
-    },
-    "000000000000000000000000000000000000009f": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000a0": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000a1": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000a2": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000a3": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000a4": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000a5": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000a6": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000a7": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000a8": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000a9": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000aa": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000ab": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000ac": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000ad": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000ae": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000af": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000b0": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000b1": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000b2": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000b3": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000b4": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000b5": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000b6": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000b7": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000b8": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000b9": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000ba": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000bb": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000bc": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000bd": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000be": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000bf": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000c0": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000c1": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000c2": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000c3": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000c4": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000c5": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000c6": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000c7": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000c8": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000c9": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000ca": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000cb": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000cc": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000cd": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000ce": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000cf": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000d0": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000d1": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000d2": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000d3": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000d4": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000d5": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000d6": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000d7": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000d8": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000d9": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000da": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000db": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000dc": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000dd": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000de": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000df": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000e0": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000e1": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000e2": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000e3": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000e4": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000e5": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000e6": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000e7": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000e8": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000e9": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000ea": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000eb": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000ec": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000ed": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000ee": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000ef": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000f0": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000f1": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000f2": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000f3": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000f4": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000f5": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000f6": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000f7": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000f8": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000f9": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000fa": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000fb": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000fc": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000fd": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000fe": {
-      "balance": "0x1"
-    },
-    "00000000000000000000000000000000000000ff": {
-      "balance": "0x1"
-    },
-    "31b98d14007bdee637298086988a0bbd31184523": {
-      "balance": "0x200000000000000000000000000000000000000000000000000000000000000"
-    }
-  }
-}
diff --git a/config/src/main/resources/ropsten.json b/config/src/main/resources/ropsten.json
deleted file mode 100644
index 3f518203be5..00000000000
--- a/config/src/main/resources/ropsten.json
+++ /dev/null
@@ -1,879 +0,0 @@
-{
-  "config": {
-    "chainId": 3,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip158Block": 10,
-    "byzantiumBlock": 1700000,
-    "constantinopleBlock": 4230000,
-    "petersburgBlock": 4939394,
-    "istanbulBlock": 6485846,
-    "muirGlacierBlock": 7117117,
-    "ethash": {
-    }
-  },
-  "nonce": "0x0000000000000042",
-  "timestamp": "0x00",
-  "extraData": "0x3535353535353535353535353535353535353535353535353535353535353535",
-  "gasLimit": "0x1000000",
-  "difficulty": "0x100000",
-  "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "coinbase": "0x0000000000000000000000000000000000000000",
-  "alloc": {
-    "0000000000000000000000000000000000000000": {
-      "balance": "1"
-    },
-    "0000000000000000000000000000000000000001": {
-      "balance": "1",
-      "nonce": "0",
-      "builtin": {
-        "name": "ecrecover",
-        "pricing": {
-          "linear": {
-            "base": 3000,
-            "word": 0
-          }
-        }
-      }
-    },
-    "0000000000000000000000000000000000000002": {
-      "balance": "1",
-      "nonce": "0",
-      "builtin": {
-        "name": "sha256",
-        "pricing": {
-          "linear": {
-            "base": 60,
-            "word": 12
-          }
-        }
-      }
-    },
-    "0000000000000000000000000000000000000003": {
-      "balance": "1",
-      "nonce": "0",
-      "builtin": {
-        "name": "ripemd160",
-        "pricing": {
-          "linear": {
-            "base": 600,
-            "word": 120
-          }
-        }
-      }
-    },
-    "0000000000000000000000000000000000000004": {
-      "balance": "1",
-      "nonce": "0",
-      "builtin": {
-        "name": "identity",
-        "pricing": {
-          "linear": {
-            "base": 15,
-            "word": 3
-          }
-        }
-      }
-    },
-    "0000000000000000000000000000000000000005": {
-      "balance": "1",
-      "nonce": "0",
-      "builtin": {
-        "name": "modexp",
-        "activate_at": 1700000,
-        "pricing": {
-          "modexp": {
-            "divisor": 20
-          }
-        }
-      }
-    },
-    "0000000000000000000000000000000000000006": {
-      "balance": "1",
-      "nonce": "0",
-      "builtin": {
-        "name": "alt_bn128_add",
-        "activate_at": 1700000,
-        "pricing": {
-          "linear": {
-            "base": 500,
-            "word": 0
-          }
-        }
-      }
-    },
-    "0000000000000000000000000000000000000007": {
-      "balance": "1",
-      "nonce": "0",
-      "builtin": {
-        "name": "alt_bn128_mul",
-        "activate_at": 1700000,
-        "pricing": {
-          "linear": {
-            "base": 40000,
-            "word": 0
-          }
-        }
-      }
-    },
-    "0000000000000000000000000000000000000008": {
-      "balance": "1",
-      "nonce": "0",
-      "builtin": {
-        "name": "alt_bn128_pairing",
-        "activate_at": 1700000,
-        "pricing": {
-          "alt_bn128_pairing": {
-            "base": 100000,
-            "pair": 80000
-          }
-        }
-      }
-    },
-    "0000000000000000000000000000000000000009": {
-      "balance": "1"
-    },
-    "000000000000000000000000000000000000000a": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000000b": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000000c": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000000d": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000000e": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000000f": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000010": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000011": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000012": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000013": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000014": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000015": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000016": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000017": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000018": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000019": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000001a": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000001b": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000001c": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000001d": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000001e": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000001f": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000020": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000021": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000022": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000023": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000024": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000025": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000026": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000027": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000028": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000029": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000002a": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000002b": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000002c": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000002d": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000002e": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000002f": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000030": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000031": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000032": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000033": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000034": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000035": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000036": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000037": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000038": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000039": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000003a": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000003b": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000003c": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000003d": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000003e": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000003f": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000040": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000041": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000042": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000043": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000044": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000045": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000046": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000047": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000048": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000049": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000004a": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000004b": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000004c": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000004d": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000004e": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000004f": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000050": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000051": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000052": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000053": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000054": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000055": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000056": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000057": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000058": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000059": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000005a": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000005b": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000005c": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000005d": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000005e": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000005f": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000060": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000061": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000062": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000063": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000064": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000065": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000066": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000067": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000068": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000069": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000006a": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000006b": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000006c": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000006d": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000006e": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000006f": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000070": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000071": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000072": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000073": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000074": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000075": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000076": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000077": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000078": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000079": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000007a": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000007b": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000007c": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000007d": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000007e": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000007f": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000080": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000081": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000082": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000083": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000084": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000085": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000086": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000087": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000088": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000089": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000008a": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000008b": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000008c": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000008d": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000008e": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000008f": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000090": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000091": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000092": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000093": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000094": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000095": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000096": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000097": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000098": {
-      "balance": "0"
-    },
-    "0000000000000000000000000000000000000099": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000009a": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000009b": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000009c": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000009d": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000009e": {
-      "balance": "0"
-    },
-    "000000000000000000000000000000000000009f": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000a0": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000a1": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000a2": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000a3": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000a4": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000a5": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000a6": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000a7": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000a8": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000a9": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000aa": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000ab": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000ac": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000ad": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000ae": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000af": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000b0": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000b1": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000b2": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000b3": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000b4": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000b5": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000b6": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000b7": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000b8": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000b9": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000ba": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000bb": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000bc": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000bd": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000be": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000bf": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000c0": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000c1": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000c2": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000c3": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000c4": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000c5": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000c6": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000c7": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000c8": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000c9": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000ca": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000cb": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000cc": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000cd": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000ce": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000cf": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000d0": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000d1": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000d2": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000d3": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000d4": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000d5": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000d6": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000d7": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000d8": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000d9": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000da": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000db": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000dc": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000dd": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000de": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000df": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000e0": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000e1": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000e2": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000e3": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000e4": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000e5": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000e6": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000e7": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000e8": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000e9": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000ea": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000eb": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000ec": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000ed": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000ee": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000ef": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000f0": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000f1": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000f2": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000f3": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000f4": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000f5": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000f6": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000f7": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000f8": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000f9": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000fa": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000fb": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000fc": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000fd": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000fe": {
-      "balance": "0"
-    },
-    "00000000000000000000000000000000000000ff": {
-      "balance": "0"
-    },
-    "874b54a8bd152966d63f706bae1ffeb0411921e5": {
-      "balance": "1000000000000000000000000000000"
-    }
-  }
-}
\ No newline at end of file
diff --git a/config/src/main/resources/sepolia.json b/config/src/main/resources/sepolia.json
new file mode 100644
index 00000000000..8a0799ce0cc
--- /dev/null
+++ b/config/src/main/resources/sepolia.json
@@ -0,0 +1,59 @@
+{
+  "config":{
+    "chainId":11155111,
+    "homesteadBlock":0,
+    "eip150Block":0,
+    "eip155Block":0,
+    "eip158Block":0,
+    "byzantiumBlock":0,
+    "constantinopleBlock":0,
+    "petersburgBlock":0,
+    "istanbulBlock":0,
+    "berlinBlock":0,
+    "londonBlock":0,
+    "mergeNetSplitBlock": 1735371,
+    "terminalTotalDifficulty": 17000000000000000,
+    "shanghaiTime": 1677557088,
+    "ethash":{},
+    "discovery": {
+      "dns": "enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@all.sepolia.ethdisco.net",
+      "bootnodes": [
+        "enode://4e5e92199ee224a01932a377160aa432f31d0b351f84ab413a8e0a42f4f36476f8fb1cbe914af0d9aef0d51665c214cf653c651c4bbd9d5550a934f241f1682b@138.197.51.181:30303",
+        "enode://143e11fb766781d22d92a2e33f8f104cddae4411a122295ed1fdb6638de96a6ce65f5b7c964ba3763bba27961738fef7d3ecc739268f3e5e771fb4c87b6234ba@146.190.1.103:30303",
+        "enode://8b61dc2d06c3f96fddcbebb0efb29d60d3598650275dc469c22229d3e5620369b0d3dedafd929835fe7f489618f19f456fe7c0df572bf2d914a9f4e006f783a9@170.64.250.88:30303",
+        "enode://10d62eff032205fcef19497f35ca8477bea0eadfff6d769a147e895d8b2b8f8ae6341630c645c30f5df6e67547c03494ced3d9c5764e8622a26587b083b028e8@139.59.49.206:30303",
+        "enode://9e9492e2e8836114cc75f5b929784f4f46c324ad01daf87d956f98b3b6c5fcba95524d6e5cf9861dc96a2c8a171ea7105bb554a197455058de185fa870970c7c@138.68.123.152:30303"
+      ]
+    },
+    "checkpoint": {
+      "hash": "0x491ebac1b7f9c0eb426047a495dc577140cb3e09036cd3f7266eda86b635d9fa",
+      "number": 1273020,
+      "totalDifficulty": "0x13DE1653E7D280"
+    }
+  },
+  "alloc":{
+    "0xa2A6d93439144FFE4D27c9E088dCD8b783946263": {"balance": "0xD3C21BCECCEDA1000000"},
+    "0xBc11295936Aa79d594139de1B2e12629414F3BDB": {"balance": "0xD3C21BCECCEDA1000000"},
+    "0x7cF5b79bfe291A67AB02b393E456cCc4c266F753": {"balance": "0xD3C21BCECCEDA1000000"},
+    "0xaaec86394441f915bce3e6ab399977e9906f3b69": {"balance": "0xD3C21BCECCEDA1000000"},
+    "0xF47CaE1CF79ca6758Bfc787dbD21E6bdBe7112B8": {"balance": "0xD3C21BCECCEDA1000000"},
+    "0xd7eDDB78ED295B3C9629240E8924fb8D8874ddD8": {"balance": "0xD3C21BCECCEDA1000000"},
+    "0x8b7F0977Bb4f0fBE7076FA22bC24acA043583F5e": {"balance": "0xD3C21BCECCEDA1000000"},
+    "0xe2e2659028143784d557bcec6ff3a0721048880a": {"balance": "0xD3C21BCECCEDA1000000"},
+    "0xd9a5179f091d85051d3c982785efd1455cec8699": {"balance": "0xD3C21BCECCEDA1000000"},
+    "0xbeef32ca5b9a198d27B4e02F4c70439fE60356Cf": {"balance": "0xD3C21BCECCEDA1000000"},
+    "0x0000006916a87b82333f4245046623b23794c65c": {"balance": "0x84595161401484A000000"},
+    "0xb21c33de1fab3fa15499c62b59fe0cc3250020d1": {"balance": "0x52B7D2DCC80CD2E4000000"},
+    "0x10F5d45854e038071485AC9e402308cF80D2d2fE": {"balance": "0x52B7D2DCC80CD2E4000000"},
+    "0xd7d76c58b3a519e9fA6Cc4D22dC017259BC49F1E": {"balance": "0x52B7D2DCC80CD2E4000000"},
+    "0x799D329e5f583419167cD722962485926E338F4a": {"balance": "0xDE0B6B3A7640000"}
+  },
+  "coinbase":"0x0000000000000000000000000000000000000000",
+  "difficulty":"0x20000",
+  "extraData":"0x5365706f6c69612c20417468656e732c204174746963612c2047726565636521",
+  "gasLimit":"0x1c9c380",
+  "nonce":"0x000000000000000",
+  "mixhash":"0x0000000000000000000000000000000000000000000000000000000000000000",
+  "parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
+  "timestamp":"0x6159af19"
+}
diff --git a/config/src/main/resources/yolo.json b/config/src/main/resources/yolo.json
deleted file mode 100644
index de6038aed38..00000000000
--- a/config/src/main/resources/yolo.json
+++ /dev/null
@@ -1,802 +0,0 @@
-{
-  "config":{
-    "chainId":133519467574834,
-    "homesteadBlock":0,
-    "eip150Block":0,
-    "eip150Hash":"0x0000000000000000000000000000000000000000000000000000000000000000",
-    "eip155Block":0,
-    "eip158Block":0,
-    "byzantiumBlock":0,
-    "constantinopleBlock":0,
-    "petersburgBlock":0,
-    "istanbulBlock":0,
-    "yoloV2Block":0,
-    "clique":{
-      "period":15,
-      "epoch":30000
-    }
-  },
-  "nonce":"0x0",
-  "timestamp":"0x5f91b932",
-  "extraData":"0x00000000000000000000000000000000000000000000000000000000000000008a37866fd3627c9205a37c8685666f32ec07bb1b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-  "gasLimit":"0x47b760",
-  "difficulty":"0x1",
-  "mixHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
-  "coinbase":"0x0000000000000000000000000000000000000000",
-  "alloc":{
-    "0000000000000000000000000000000000000000":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000001":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000002":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000003":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000004":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000005":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000006":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000007":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000008":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000009":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000000a":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000000b":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000000c":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000000d":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000000e":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000000f":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000010":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000011":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000012":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000013":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000014":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000015":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000016":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000017":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000018":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000019":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000001a":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000001b":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000001c":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000001d":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000001e":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000001f":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000020":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000021":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000022":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000023":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000024":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000025":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000026":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000027":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000028":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000029":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000002a":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000002b":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000002c":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000002d":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000002e":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000002f":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000030":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000031":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000032":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000033":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000034":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000035":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000036":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000037":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000038":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000039":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000003a":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000003b":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000003c":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000003d":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000003e":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000003f":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000040":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000041":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000042":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000043":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000044":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000045":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000046":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000047":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000048":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000049":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000004a":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000004b":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000004c":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000004d":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000004e":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000004f":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000050":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000051":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000052":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000053":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000054":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000055":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000056":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000057":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000058":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000059":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000005a":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000005b":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000005c":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000005d":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000005e":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000005f":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000060":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000061":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000062":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000063":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000064":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000065":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000066":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000067":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000068":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000069":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000006a":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000006b":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000006c":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000006d":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000006e":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000006f":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000070":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000071":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000072":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000073":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000074":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000075":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000076":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000077":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000078":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000079":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000007a":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000007b":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000007c":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000007d":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000007e":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000007f":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000080":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000081":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000082":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000083":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000084":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000085":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000086":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000087":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000088":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000089":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000008a":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000008b":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000008c":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000008d":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000008e":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000008f":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000090":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000091":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000092":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000093":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000094":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000095":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000096":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000097":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000098":{
-      "balance":"0x1"
-    },
-    "0000000000000000000000000000000000000099":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000009a":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000009b":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000009c":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000009d":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000009e":{
-      "balance":"0x1"
-    },
-    "000000000000000000000000000000000000009f":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000a0":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000a1":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000a2":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000a3":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000a4":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000a5":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000a6":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000a7":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000a8":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000a9":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000aa":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000ab":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000ac":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000ad":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000ae":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000af":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000b0":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000b1":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000b2":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000b3":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000b4":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000b5":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000b6":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000b7":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000b8":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000b9":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000ba":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000bb":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000bc":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000bd":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000be":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000bf":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000c0":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000c1":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000c2":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000c3":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000c4":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000c5":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000c6":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000c7":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000c8":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000c9":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000ca":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000cb":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000cc":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000cd":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000ce":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000cf":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000d0":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000d1":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000d2":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000d3":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000d4":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000d5":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000d6":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000d7":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000d8":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000d9":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000da":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000db":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000dc":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000dd":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000de":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000df":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000e0":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000e1":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000e2":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000e3":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000e4":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000e5":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000e6":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000e7":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000e8":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000e9":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000ea":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000eb":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000ec":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000ed":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000ee":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000ef":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000f0":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000f1":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000f2":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000f3":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000f4":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000f5":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000f6":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000f7":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000f8":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000f9":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000fa":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000fb":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000fc":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000fd":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000fe":{
-      "balance":"0x1"
-    },
-    "00000000000000000000000000000000000000ff":{
-      "balance":"0x1"
-    },
-    "8a37866fd3627c9205a37c8685666f32ec07bb1b":{
-      "balance":"0x200000000000000000000000000000000000000000000000000000000000000"
-    }
-  },
-  "number":"0x0",
-  "gasUsed":"0x0",
-  "parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000"
-}
\ No newline at end of file
diff --git a/config/src/test/java/org/hyperledger/besu/config/BFTForkTest.java b/config/src/test/java/org/hyperledger/besu/config/BFTForkTest.java
new file mode 100644
index 00000000000..2c3499601f1
--- /dev/null
+++ b/config/src/test/java/org/hyperledger/besu/config/BFTForkTest.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.config;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.hyperledger.besu.datatypes.Address;
+
+import java.util.Collections;
+import java.util.Map;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.junit.jupiter.api.Test;
+
+public class BFTForkTest {
+  private final String BENEFICIARY = "0x1111111111111111111111111111111111111111";
+  private final String TRUNCATED_BENEFICIARY = BENEFICIARY.substring(0, BENEFICIARY.length() - 2);
+
+  @Test
+  public void getMiningBeneficiary_fromEmptyConfig() {
+    ObjectNode config = JsonUtil.objectNodeFromMap(Collections.emptyMap());
+
+    final BftFork bftFork = new BftFork(config);
+    assertThat(bftFork.getMiningBeneficiary()).isEmpty();
+  }
+
+  @Test
+  public void getMiningBeneficiary_withValidAddress() {
+    ObjectNode config =
+        JsonUtil.objectNodeFromMap(Map.of(BftFork.MINING_BENEFICIARY_KEY, BENEFICIARY));
+
+    final BftFork bftFork = new BftFork(config);
+    assertThat(bftFork.getMiningBeneficiary().map(Address::toHexString)).contains(BENEFICIARY);
+  }
+
+  @Test
+  public void getMiningBeneficiary_withValidAddressMissingPrefix() {
+    ObjectNode config =
+        JsonUtil.objectNodeFromMap(
+            Map.of(BftFork.MINING_BENEFICIARY_KEY, BENEFICIARY.substring(2)));
+
+    final BftFork bftFork = new BftFork(config);
+    assertThat(bftFork.getMiningBeneficiary().map(Address::toHexString)).contains(BENEFICIARY);
+  }
+
+  @Test
+  public void getMiningBeneficiary_withValidAddressAndEmptySpace() {
+    ObjectNode config =
+        JsonUtil.objectNodeFromMap(
+            Map.of(BftFork.MINING_BENEFICIARY_KEY, "\t" + BENEFICIARY + "  "));
+
+    final BftFork bftFork = new BftFork(config);
+    assertThat(bftFork.getMiningBeneficiary().map(Address::toHexString)).contains(BENEFICIARY);
+  }
+
+  @Test
+  public void getMiningBeneficiary_withInvalidValue() {
+    final String beneficiary = "random";
+    testGetMiningBeneficiaryWithInvalidAddress(beneficiary);
+  }
+
+  @Test
+  public void getMiningBeneficiary_withInvalidAddress() {
+    testGetMiningBeneficiaryWithInvalidAddress(TRUNCATED_BENEFICIARY);
+  }
+
+  @Test
+  public void getMiningBeneficiary_withInvalidAddressAndWhitespace() {
+    final String beneficiary = TRUNCATED_BENEFICIARY + "  ";
+    testGetMiningBeneficiaryWithInvalidAddress(beneficiary);
+  }
+
+  private void testGetMiningBeneficiaryWithInvalidAddress(final String miningBeneficiary) {
+    ObjectNode config =
+        JsonUtil.objectNodeFromMap(Map.of(BftFork.MINING_BENEFICIARY_KEY, miningBeneficiary));
+
+    final BftFork bftFork = new BftFork(config);
+    assertThatThrownBy(bftFork::getMiningBeneficiary)
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining(
+            "Mining beneficiary in transition config is not a valid ethereum address");
+  }
+
+  @Test
+  public void getMiningBeneficiary_whenEmptyValueIsProvided() {
+    ObjectNode config = JsonUtil.objectNodeFromMap(Map.of(BftFork.MINING_BENEFICIARY_KEY, "    "));
+
+    final BftFork bftFork = new BftFork(config);
+    assertThat(bftFork.getMiningBeneficiary()).isEmpty();
+  }
+
+  @Test
+  public void isMiningBeneficiaryConfigured_noKeySet() {
+    final String jsonStr = "{}";
+    final ObjectNode config = JsonUtil.objectNodeFromString(jsonStr);
+    final BftFork bftFork = new BftFork(config);
+
+    assertThat(bftFork.isMiningBeneficiaryConfigured()).isFalse();
+  }
+
+  @Test
+  public void isMiningBeneficiaryConfigured_whenEmptyValueIsProvided() {
+    ObjectNode config = JsonUtil.objectNodeFromMap(Map.of(BftFork.MINING_BENEFICIARY_KEY, ""));
+
+    final BftFork bftFork = new BftFork(config);
+    assertThat(bftFork.isMiningBeneficiaryConfigured()).isTrue();
+  }
+
+  @Test
+  public void isMiningBeneficiaryConfigured_whenNonEmptyValueIsProvided() {
+    ObjectNode config =
+        JsonUtil.objectNodeFromMap(Map.of(BftFork.MINING_BENEFICIARY_KEY, BENEFICIARY));
+
+    final BftFork bftFork = new BftFork(config);
+    assertThat(bftFork.isMiningBeneficiaryConfigured()).isTrue();
+  }
+}
diff --git a/config/src/test/java/org/hyperledger/besu/config/CliqueConfigOptionsTest.java b/config/src/test/java/org/hyperledger/besu/config/CliqueConfigOptionsTest.java
index c8c1938e91a..355dc8f8aa0 100644
--- a/config/src/test/java/org/hyperledger/besu/config/CliqueConfigOptionsTest.java
+++ b/config/src/test/java/org/hyperledger/besu/config/CliqueConfigOptionsTest.java
@@ -17,11 +17,12 @@
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.singletonMap;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.util.Map;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CliqueConfigOptionsTest {
 
@@ -30,7 +31,7 @@ public class CliqueConfigOptionsTest {
 
   @Test
   public void shouldGetEpochLengthFromConfig() {
-    final CliqueConfigOptions config = fromConfigOptions(singletonMap("EpochLength", 10_000));
+    final CliqueConfigOptions config = fromConfigOptions(singletonMap("epochlength", 10_000));
     assertThat(config.getEpochLength()).isEqualTo(10_000);
   }
 
@@ -48,7 +49,7 @@ public void shouldGetDefaultEpochLengthFromDefaultConfig() {
 
   @Test
   public void shouldGetBlockPeriodFromConfig() {
-    final CliqueConfigOptions config = fromConfigOptions(singletonMap("BlockPeriodSeconds", 5));
+    final CliqueConfigOptions config = fromConfigOptions(singletonMap("blockperiodseconds", 5));
     assertThat(config.getBlockPeriodSeconds()).isEqualTo(5);
   }
 
@@ -64,6 +65,13 @@ public void shouldGetDefaultBlockPeriodFromDefaultConfig() {
         .isEqualTo(EXPECTED_DEFAULT_BLOCK_PERIOD);
   }
 
+  @Test
+  public void shouldThrowOnNonPositiveBlockPeriod() {
+    final CliqueConfigOptions config = fromConfigOptions(singletonMap("blockperiodseconds", -1));
+    assertThatThrownBy(() -> config.getBlockPeriodSeconds())
+        .isInstanceOf(IllegalArgumentException.class);
+  }
+
   private CliqueConfigOptions fromConfigOptions(final Map<String, Object> cliqueConfigOptions) {
     final ObjectNode rootNode = JsonUtil.createEmptyObjectNode();
     final ObjectNode configNode = JsonUtil.createEmptyObjectNode();
diff --git a/config/src/test/java/org/hyperledger/besu/config/GenesisConfigFileTest.java b/config/src/test/java/org/hyperledger/besu/config/GenesisConfigFileTest.java
index c70ef408aa9..c61e97bf0b8 100644
--- a/config/src/test/java/org/hyperledger/besu/config/GenesisConfigFileTest.java
+++ b/config/src/test/java/org/hyperledger/besu/config/GenesisConfigFileTest.java
@@ -19,6 +19,8 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.hyperledger.besu.config.GenesisConfigFile.fromConfig;
 
+import org.hyperledger.besu.datatypes.Wei;
+
 import java.io.IOException;
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
@@ -32,13 +34,14 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.io.Resources;
+import org.apache.tuweni.units.bigints.UInt256;
 import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class GenesisConfigFileTest {
 
   private static final BigInteger MAINNET_CHAIN_ID = BigInteger.ONE;
-  private static final BigInteger DEVELOPMENT_CHAIN_ID = BigInteger.valueOf(2018);
+  private static final BigInteger DEVELOPMENT_CHAIN_ID = BigInteger.valueOf(1337);
   private static final GenesisConfigFile EMPTY_CONFIG = fromConfig("{}");
 
   @Test
@@ -142,6 +145,115 @@ public void shouldGetTimestamp() {
     assertThat(configWithProperty("timestamp", "0x10").getTimestamp()).isEqualTo(16L);
   }
 
+  @Test
+  public void shouldGetBaseFeeAtGenesis() {
+    GenesisConfigFile withBaseFeeAtGenesis =
+        GenesisConfigFile.fromConfig("{\"config\":{\"londonBlock\":0},\"baseFeePerGas\":\"0xa\"}");
+    assertThat(withBaseFeeAtGenesis.getBaseFeePerGas()).isPresent();
+    assertThat(withBaseFeeAtGenesis.getBaseFeePerGas().get().toLong()).isEqualTo(10L);
+  }
+
+  @Test
+  public void shouldGetDefaultBaseFeeAtGenesis() {
+    GenesisConfigFile withBaseFeeAtGenesis =
+        GenesisConfigFile.fromConfig("{\"config\":{\"londonBlock\":0}}");
+    // no specified baseFeePerGas:
+    assertThat(withBaseFeeAtGenesis.getBaseFeePerGas()).isNotPresent();
+    // supply a default genesis baseFeePerGas when london-at-genesis:
+    assertThat(withBaseFeeAtGenesis.getGenesisBaseFeePerGas())
+        .contains(GenesisConfigFile.BASEFEE_AT_GENESIS_DEFAULT_VALUE);
+  }
+
+  @Test
+  public void shouldGetBaseFeeExplicitlyAtGenesis() {
+    GenesisConfigFile withBaseFeeNotAtGenesis =
+        GenesisConfigFile.fromConfig("{\"config\":{\"londonBlock\":10},\"baseFeePerGas\":\"0xa\"}");
+    // specified baseFeePerGas:
+    Wei expectedBaseFee = Wei.of(0xa);
+    assertThat(withBaseFeeNotAtGenesis.getBaseFeePerGas()).contains(expectedBaseFee);
+    // but no baseFeePerGas since london block is not at genesis:
+    assertThat(withBaseFeeNotAtGenesis.getGenesisBaseFeePerGas()).contains(expectedBaseFee);
+  }
+
+  @Test
+  public void shouldOverrideConfigOptionsBaseFeeWhenSpecified() {
+    GenesisConfigOptions withOverrides =
+        EMPTY_CONFIG.getConfigOptions(Map.of("baseFeePerGas", Wei.of(8).toString()));
+    assertThat(withOverrides.getBaseFeePerGas()).contains(Wei.of(8L));
+  }
+
+  @Test
+  public void shouldGetTerminalTotalDifficultyAtGenesis() {
+    GenesisConfigFile withTerminalTotalDifficultyAtGenesis =
+        fromConfig("{\"config\":{\"terminalTotalDifficulty\":1000}}");
+    assertThat(withTerminalTotalDifficultyAtGenesis.getConfigOptions().getTerminalTotalDifficulty())
+        .contains(UInt256.valueOf(1000L));
+  }
+
+  @Test
+  public void shouldGetEmptyTerminalTotalDifficultyAtGenesis() {
+    assertThat(EMPTY_CONFIG.getConfigOptions().getTerminalTotalDifficulty()).isNotPresent();
+  }
+
+  @Test
+  public void assertSepoliaTerminalTotalDifficulty() {
+    GenesisConfigOptions sepoliaOptions =
+        GenesisConfigFile.genesisFileFromResources("/sepolia.json").getConfigOptions();
+
+    assertThat(sepoliaOptions.getTerminalTotalDifficulty()).isPresent();
+    assertThat(sepoliaOptions.getTerminalTotalDifficulty())
+        .contains(UInt256.valueOf(new BigInteger("17000000000000000")));
+  }
+
+  @Test
+  public void assertGoerliTerminalTotalDifficulty() {
+    GenesisConfigOptions goerliOptions =
+        GenesisConfigFile.genesisFileFromResources("/goerli.json").getConfigOptions();
+
+    assertThat(goerliOptions.getTerminalTotalDifficulty()).isPresent();
+    assertThat(goerliOptions.getTerminalTotalDifficulty())
+        .contains(UInt256.valueOf(new BigInteger("10790000")));
+  }
+
+  @Test
+  public void assertMainnetTerminalTotalDifficulty() {
+    GenesisConfigOptions mainnetOptions =
+        GenesisConfigFile.genesisFileFromResources("/mainnet.json").getConfigOptions();
+
+    assertThat(mainnetOptions.getTerminalTotalDifficulty()).isPresent();
+    // tentative as of 2022-08-11:
+    assertThat(mainnetOptions.getTerminalTotalDifficulty())
+        .contains(UInt256.valueOf(new BigInteger("58750000000000000000000")));
+  }
+
+  @Test
+  public void assertTerminalTotalDifficultyOverride() {
+    GenesisConfigOptions sepoliaOverrideOptions =
+        GenesisConfigFile.genesisFileFromResources("/sepolia.json")
+            .getConfigOptions(Map.of("terminalTotalDifficulty", String.valueOf(Long.MAX_VALUE)));
+
+    assertThat(sepoliaOverrideOptions.getTerminalTotalDifficulty()).isPresent();
+    assertThat(sepoliaOverrideOptions.getTerminalTotalDifficulty())
+        .contains(UInt256.valueOf(Long.MAX_VALUE));
+  }
+
+  @Test
+  public void shouldFindMergeNetSplitForkAndAlias() {
+    GenesisConfigFile mergeNetSplitGenesis =
+        GenesisConfigFile.fromConfig(
+            "{\"config\":{\"mergeNetsplitBlock\":11},\"baseFeePerGas\":\"0xa\"}");
+    assertThat(mergeNetSplitGenesis.getForkBlockNumbers()).hasSize(1);
+    assertThat(mergeNetSplitGenesis.getConfigOptions().getMergeNetSplitBlockNumber()).isPresent();
+    assertThat(mergeNetSplitGenesis.getConfigOptions().getMergeNetSplitBlockNumber().getAsLong())
+        .isEqualTo(11L);
+
+    // assert empty if not present:
+    GenesisConfigFile londonGenesis =
+        GenesisConfigFile.fromConfig("{\"config\":{\"londonBlock\":11},\"baseFeePerGas\":\"0xa\"}");
+    assertThat(londonGenesis.getForkBlockNumbers()).hasSize(1);
+    assertThat(londonGenesis.getConfigOptions().getMergeNetSplitBlockNumber()).isEmpty();
+  }
+
   @Test
   public void shouldDefaultTimestampToZero() {
     assertThat(EMPTY_CONFIG.getTimestamp()).isZero();
@@ -173,8 +285,8 @@ public void shouldGetAllocations() {
         config
             .streamAllocations()
             .collect(Collectors.toMap(GenesisAllocation::getAddress, Function.identity()));
-    assertThat(allocations.keySet())
-        .containsOnly(
+    assertThat(allocations)
+        .containsOnlyKeys(
             "fe3b557e8fb62b89f4916b721be55ceb828dbd73",
             "627306090abab3a6e1400e9345bc60c78a8bef57",
             "f17f52151ebef6c7334fad080c5704d77216b732");
@@ -185,17 +297,15 @@ public void shouldGetAllocations() {
     assertThat(alloc1.getBalance()).isEqualTo("0xad78ebc5ac6200000");
     assertThat(alloc2.getBalance()).isEqualTo("1000");
     assertThat(alloc3.getBalance()).isEqualTo("90000000000000000000000");
-    assertThat(alloc3.getStorage().size()).isEqualTo(2);
-    assertThat(
-            alloc3
-                .getStorage()
-                .get("0xc4c3a3f99b26e5e534b71d6f33ca6ea5c174decfb16dd7237c60eff9774ef4a4"))
-        .isEqualTo("0x937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0");
-    assertThat(
-            alloc3
-                .getStorage()
-                .get("0xc4c3a3f99b26e5e534b71d6f33ca6ea5c174decfb16dd7237c60eff9774ef4a3"))
-        .isEqualTo("0x6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012");
+    assertThat(alloc3.getStorage()).hasSize(2);
+    assertThat(alloc3.getStorage())
+        .containsEntry(
+            "0xc4c3a3f99b26e5e534b71d6f33ca6ea5c174decfb16dd7237c60eff9774ef4a4",
+            "0x937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0");
+    assertThat(alloc3.getStorage())
+        .containsEntry(
+            "0xc4c3a3f99b26e5e534b71d6f33ca6ea5c174decfb16dd7237c60eff9774ef4a3",
+            "0x6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012");
   }
 
   @Test
@@ -235,7 +345,7 @@ public void testOverridePresent() {
     override.put("chainId", bigBlockString);
     override.put("contractSizeLimit", bigBlockString);
 
-    assertThat(config.getForks()).isNotEmpty();
+    assertThat(config.getForkBlockNumbers()).isNotEmpty();
     assertThat(config.getConfigOptions(override).getIstanbulBlockNumber()).hasValue(bigBlock);
     assertThat(config.getConfigOptions(override).getChainId())
         .hasValue(BigInteger.valueOf(bigBlock));
@@ -250,7 +360,7 @@ public void testOverrideNull() {
     override.put("chainId", null);
     override.put("contractSizeLimit", null);
 
-    assertThat(config.getForks()).isNotEmpty();
+    assertThat(config.getForkBlockNumbers()).isNotEmpty();
     assertThat(config.getConfigOptions(override).getIstanbulBlockNumber()).isNotPresent();
     assertThat(config.getConfigOptions(override).getChainId()).isNotPresent();
     assertThat(config.getConfigOptions(override).getContractSizeLimit()).isNotPresent();
@@ -262,7 +372,7 @@ public void testOverrideCaseInsensitivity() {
     final int bigBlock = 999_999_999;
     final String bigBlockString = Integer.toString(bigBlock);
     final Map<String, String> override = new HashMap<>();
-    // as speicified
+    // as specified
     override.put("istanbulBlock", bigBlockString);
     // ALL CAPS
     override.put("CHAINID", bigBlockString);
@@ -292,9 +402,9 @@ public void testOverrideEmptyString() {
   public void testNoOverride() {
     final GenesisConfigFile config = GenesisConfigFile.development();
 
-    assertThat(config.getConfigOptions().getConstantinopleFixBlockNumber()).hasValue(0);
+    assertThat(config.getConfigOptions().getLondonBlockNumber()).hasValue(0);
     assertThat(config.getConfigOptions().getIstanbulBlockNumber()).isNotPresent();
-    assertThat(config.getConfigOptions().getChainId()).hasValue(BigInteger.valueOf(2018));
+    assertThat(config.getConfigOptions().getChainId()).hasValue(BigInteger.valueOf(1337));
     assertThat(config.getConfigOptions().getContractSizeLimit()).hasValue(2147483647);
     assertThat(config.getConfigOptions().getEvmStackSize()).isNotPresent();
     assertThat(config.getConfigOptions().getEcip1017EraRounds()).isNotPresent();
@@ -303,19 +413,18 @@ public void testNoOverride() {
   @Test
   public void testConstantinopleFixShouldNotBeSupportedAlongPetersburg() {
     // petersburg node
-    final GenesisConfigFile config = GenesisConfigFile.development();
+    final GenesisConfigFile config = GenesisConfigFile.genesisFileFromResources("/all_forks.json");
 
-    assertThat(config.getConfigOptions().getConstantinopleFixBlockNumber()).hasValue(0);
+    assertThat(config.getConfigOptions().getPetersburgBlockNumber()).hasValue(7);
 
     // constantinopleFix node
     final Map<String, String> override = new HashMap<>();
     override.put("constantinopleFixBlock", "1000");
 
     assertThatExceptionOfType(RuntimeException.class)
-        .isThrownBy(() -> config.getConfigOptions(override).getConstantinopleFixBlockNumber())
+        .isThrownBy(() -> config.getConfigOptions(override).getPetersburgBlockNumber())
         .withMessage(
             "Genesis files cannot specify both petersburgBlock and constantinopleFixBlock.");
-    ;
   }
 
   @Test
@@ -335,7 +444,7 @@ public void shouldLoadForksInSortedOrder() throws IOException {
 
     final GenesisConfigFile config = fromConfig(configNode);
 
-    assertThat(config.getForks()).containsExactly(1L, 2L, 3L, 1035301L);
+    assertThat(config.getForkBlockNumbers()).containsExactly(1L, 2L, 3L, 1035301L, 2222222L);
     assertThat(config.getConfigOptions().getChainId()).hasValue(BigInteger.valueOf(4));
   }
 
@@ -355,7 +464,7 @@ public void shouldLoadForksIgnoreClassicForkBlock() throws IOException {
                         StandardCharsets.UTF_8)));
     final GenesisConfigFile config = fromConfig(configNode);
 
-    assertThat(config.getForks()).containsExactly(1L, 2L, 3L, 1035301L);
+    assertThat(config.getForkBlockNumbers()).containsExactly(1L, 2L, 3L, 1035301L);
     assertThat(config.getConfigOptions().getChainId()).hasValue(BigInteger.valueOf(61));
   }
 
@@ -403,14 +512,40 @@ public void shouldLoadForksIgnoreUnexpectedValues() throws IOException {
     final GenesisConfigFile configFileMultipleUnexpectedForks =
         fromConfig(configMultipleUnexpectedForks);
 
-    assertThat(configFileNoUnexpectedForks.getForks()).containsExactly(1L, 2L, 3L, 1035301L);
-    assertThat(configFileNoUnexpectedForks.getForks()).isEqualTo(configFileClassicFork.getForks());
-    assertThat(configFileNoUnexpectedForks.getForks())
-        .isEqualTo(configFileMultipleUnexpectedForks.getForks());
+    assertThat(configFileNoUnexpectedForks.getForkBlockNumbers())
+        .containsExactly(1L, 2L, 3L, 1035301L);
+    assertThat(configFileNoUnexpectedForks.getForkBlockNumbers())
+        .isEqualTo(configFileClassicFork.getForkBlockNumbers());
+    assertThat(configFileNoUnexpectedForks.getForkBlockNumbers())
+        .isEqualTo(configFileMultipleUnexpectedForks.getForkBlockNumbers());
     assertThat(configFileNoUnexpectedForks.getConfigOptions().getChainId())
         .hasValue(BigInteger.valueOf(61));
   }
 
+  /**
+   * The intent of this test is to catch encoding errors when a new hard fork is being added and the
+   * config is being inserted in all the places the prior fork was. The intent is that
+   * all_forks.json will also be updated.
+   *
+   * <p>This catches a common error in JsonGenesisConfigOptions where internally the names are all
+   * lower ase but 'canonically' they are mixed case, as well as being mixed case almost everywhere
+   * else in the code. Case differences are common in custom genesis files, so historically we have
+   * been case agnostic.
+   */
+  @Test
+  public void roundTripForkIdBlocks() throws IOException {
+    final String configText =
+        Resources.toString(Resources.getResource("all_forks.json"), StandardCharsets.UTF_8);
+    final ObjectNode genesisNode = JsonUtil.objectNodeFromString(configText);
+
+    final GenesisConfigFile genesisConfig = fromConfig(genesisNode);
+
+    final ObjectNode output = JsonUtil.objectNodeFromMap(genesisConfig.getConfigOptions().asMap());
+
+    assertThat(JsonUtil.getJson(output, true))
+        .isEqualTo(JsonUtil.getJson(genesisNode.get("config"), true));
+  }
+
   private GenesisConfigFile configWithProperty(final String key, final String value) {
     return fromConfig("{\"" + key + "\":\"" + value + "\"}");
   }
diff --git a/config/src/test/java/org/hyperledger/besu/config/GenesisConfigOptionsTest.java b/config/src/test/java/org/hyperledger/besu/config/GenesisConfigOptionsTest.java
index b930d54f511..158d9734a4e 100644
--- a/config/src/test/java/org/hyperledger/besu/config/GenesisConfigOptionsTest.java
+++ b/config/src/test/java/org/hyperledger/besu/config/GenesisConfigOptionsTest.java
@@ -19,14 +19,15 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
+import org.hyperledger.besu.datatypes.Address;
 
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.util.Map;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.junit.Test;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.jupiter.api.Test;
 
 public class GenesisConfigOptionsTest {
 
@@ -43,25 +44,9 @@ public void shouldNotUseEthHashIfEthHashNotPresent() {
     assertThat(config.isEthHash()).isFalse();
   }
 
-  @Test
-  public void shouldUseIbftLegacyWhenIbftInConfig() {
-    final GenesisConfigOptions config = fromConfigOptions(singletonMap("ibft", emptyMap()));
-    assertThat(config.isIbftLegacy()).isTrue();
-    assertThat(config.getIbftLegacyConfigOptions()).isNotSameAs(IbftConfigOptions.DEFAULT);
-    assertThat(config.getConsensusEngine()).isEqualTo("ibft");
-  }
-
-  @Test
-  public void shouldNotUseIbftLegacyIfIbftNotPresent() {
-    final GenesisConfigOptions config = fromConfigOptions(emptyMap());
-    assertThat(config.isIbftLegacy()).isFalse();
-    assertThat(config.getIbftLegacyConfigOptions()).isSameAs(IbftConfigOptions.DEFAULT);
-  }
-
   @Test
   public void shouldUseIbft2WhenIbft2InConfig() {
     final GenesisConfigOptions config = fromConfigOptions(singletonMap("ibft2", emptyMap()));
-    assertThat(config.isIbftLegacy()).isFalse();
     assertThat(config.isIbft2()).isTrue();
     assertThat(config.getConsensusEngine()).isEqualTo("ibft2");
   }
@@ -128,13 +113,13 @@ public void shouldGetConstantinopleBlockNumber() {
   public void shouldGetConstantinopleFixBlockNumber() {
     final GenesisConfigOptions config =
         fromConfigOptions(singletonMap("constantinopleFixBlock", 1000));
-    assertThat(config.getConstantinopleFixBlockNumber()).hasValue(1000);
+    assertThat(config.getPetersburgBlockNumber()).hasValue(1000);
   }
 
   @Test
   public void shouldGetPetersburgBlockNumber() {
     final GenesisConfigOptions config = fromConfigOptions(singletonMap("petersburgBlock", 1000));
-    assertThat(config.getConstantinopleFixBlockNumber()).hasValue(1000);
+    assertThat(config.getPetersburgBlockNumber()).hasValue(1000);
   }
 
   @Test
@@ -144,7 +129,7 @@ public void shouldFailWithBothPetersburgAndConstantinopleFixBlockNumber() {
     configMap.put("petersburgBlock", 1000);
     final GenesisConfigOptions config = fromConfigOptions(configMap);
     assertThatExceptionOfType(RuntimeException.class)
-        .isThrownBy(config::getConstantinopleFixBlockNumber)
+        .isThrownBy(config::getPetersburgBlockNumber)
         .withMessage(
             "Genesis files cannot specify both petersburgBlock and constantinopleFixBlock.");
   }
@@ -163,36 +148,51 @@ public void shouldGetMuirGlacierBlockNumber() {
 
   @Test
   public void shouldGetBerlinBlockNumber() {
-    try {
-      ExperimentalEIPs.berlinEnabled = true;
-      final GenesisConfigOptions config = fromConfigOptions(singletonMap("berlinBlock", 1000));
-      assertThat(config.getBerlinBlockNumber()).hasValue(1000);
-    } finally {
-      ExperimentalEIPs.berlinEnabled = ExperimentalEIPs.BERLIN_ENABLED_DEFAULT_VALUE;
-    }
+    final GenesisConfigOptions config = fromConfigOptions(singletonMap("berlinBlock", 1000));
+    assertThat(config.getBerlinBlockNumber()).hasValue(1000);
+  }
+
+  @Test
+  public void shouldGetLondonBlockNumber() {
+    final GenesisConfigOptions config = fromConfigOptions(singletonMap("londonblock", 1000));
+    assertThat(config.getLondonBlockNumber()).hasValue(1000);
+  }
+
+  @Test
+  public void shouldGetArrowGlacierBlockNumber() {
+    final GenesisConfigOptions config = fromConfigOptions(singletonMap("arrowGlacierBlock", 1000));
+    assertThat(config.getArrowGlacierBlockNumber()).hasValue(1000);
+  }
+
+  @Test
+  public void shouldGetGrayGlacierBlockNumber() {
+    final GenesisConfigOptions config = fromConfigOptions(singletonMap("grayGlacierBlock", 4242));
+    assertThat(config.getGrayGlacierBlockNumber()).hasValue(4242);
+  }
+
+  @Test
+  public void shouldGetShanghaiTime() {
+    final GenesisConfigOptions config = fromConfigOptions(singletonMap("shanghaiTime", 1670470141));
+    assertThat(config.getShanghaiTime()).hasValue(1670470141);
+  }
+
+  @Test
+  public void shouldGetCancunTime() {
+    final GenesisConfigOptions config = fromConfigOptions(singletonMap("cancunTime", 1670470142));
+    assertThat(config.getCancunTime()).hasValue(1670470142);
   }
 
   @Test
-  public void shouldGetYoloV2BlockNumber() {
-    try {
-      ExperimentalEIPs.berlinEnabled = true;
-      final GenesisConfigOptions config = fromConfigOptions(singletonMap("yoloV2Block", 1000));
-      assertThat(config.getBerlinBlockNumber()).hasValue(1000);
-    } finally {
-      ExperimentalEIPs.berlinEnabled = ExperimentalEIPs.BERLIN_ENABLED_DEFAULT_VALUE;
-    }
+  public void shouldGetFutureEipsTime() {
+    final GenesisConfigOptions config = fromConfigOptions(singletonMap("futureEipsTime", 1337));
+    assertThat(config.getFutureEipsTime()).hasValue(1337);
   }
 
   @Test
-  // TODO EIP-1559 change for the actual fork name when known
-  public void shouldGetEIP1559BlockNumber() {
-    try {
-      ExperimentalEIPs.eip1559Enabled = true;
-      final GenesisConfigOptions config = fromConfigOptions(singletonMap("eip1559block", 1000));
-      assertThat(config.getEIP1559BlockNumber()).hasValue(1000);
-    } finally {
-      ExperimentalEIPs.eip1559Enabled = ExperimentalEIPs.EIP1559_ENABLED_DEFAULT_VALUE;
-    }
+  public void shouldGetExperimentalEipsTime() {
+    final GenesisConfigOptions config =
+        fromConfigOptions(singletonMap("experimentalEipsTime", 1337));
+    assertThat(config.getExperimentalEipsTime()).hasValue(1337);
   }
 
   @Test
@@ -204,10 +204,18 @@ public void shouldNotReturnEmptyOptionalWhenBlockNumberNotSpecified() {
     assertThat(config.getSpuriousDragonBlockNumber()).isEmpty();
     assertThat(config.getByzantiumBlockNumber()).isEmpty();
     assertThat(config.getConstantinopleBlockNumber()).isEmpty();
-    assertThat(config.getConstantinopleFixBlockNumber()).isEmpty();
+    assertThat(config.getPetersburgBlockNumber()).isEmpty();
     assertThat(config.getIstanbulBlockNumber()).isEmpty();
     assertThat(config.getMuirGlacierBlockNumber()).isEmpty();
     assertThat(config.getBerlinBlockNumber()).isEmpty();
+    assertThat(config.getLondonBlockNumber()).isEmpty();
+    assertThat(config.getArrowGlacierBlockNumber()).isEmpty();
+    assertThat(config.getGrayGlacierBlockNumber()).isEmpty();
+    assertThat(config.getMergeNetSplitBlockNumber()).isEmpty();
+    assertThat(config.getShanghaiTime()).isEmpty();
+    assertThat(config.getCancunTime()).isEmpty();
+    assertThat(config.getFutureEipsTime()).isEmpty();
+    assertThat(config.getExperimentalEipsTime()).isEmpty();
   }
 
   @Test
@@ -221,11 +229,32 @@ public void shouldGetChainIdWhenSpecified() {
   public void shouldSupportEmptyGenesisConfig() {
     final GenesisConfigOptions config = GenesisConfigFile.fromConfig("{}").getConfigOptions();
     assertThat(config.isEthHash()).isFalse();
-    assertThat(config.isIbftLegacy()).isFalse();
     assertThat(config.isClique()).isFalse();
     assertThat(config.getHomesteadBlockNumber()).isEmpty();
   }
 
+  @Test
+  public void shouldGetTerminalTotalDifficultyWhenSpecified() {
+    final GenesisConfigOptions config =
+        fromConfigOptions(singletonMap("terminalTotalDifficulty", BigInteger.valueOf(1000)));
+    assertThat(config.getTerminalTotalDifficulty()).isPresent();
+    assertThat(config.getTerminalTotalDifficulty()).contains(UInt256.valueOf(1000));
+
+    // stubJsonGenesis
+    final GenesisConfigOptions stub =
+        new StubGenesisConfigOptions().terminalTotalDifficulty(UInt256.valueOf(500));
+    assertThat(stub.getTerminalTotalDifficulty()).isPresent();
+    assertThat(stub.getTerminalTotalDifficulty()).contains(UInt256.valueOf(500));
+  }
+
+  @Test
+  public void shouldNotReturnTerminalTotalDifficultyWhenNotSpecified() {
+    final GenesisConfigOptions config = fromConfigOptions(emptyMap());
+    assertThat(config.getTerminalTotalDifficulty()).isNotPresent();
+    // stubJsonGenesis
+    assertThat(new StubGenesisConfigOptions().getTerminalTotalDifficulty()).isNotPresent();
+  }
+
   @Test
   public void isQuorumShouldDefaultToFalse() {
     final GenesisConfigOptions config = GenesisConfigFile.fromConfig("{}").getConfigOptions();
@@ -243,6 +272,51 @@ public void isQuorumConfigParsedCorrectly() {
     assertThat(config.getQip714BlockNumber()).hasValue(99999L);
   }
 
+  @Test
+  public void isZeroBaseFeeShouldDefaultToFalse() {
+    final GenesisConfigOptions config = GenesisConfigFile.fromConfig("{}").getConfigOptions();
+
+    assertThat(config.isZeroBaseFee()).isFalse();
+  }
+
+  @Test
+  public void isZeroBaseFeeParsedCorrectly() {
+    final GenesisConfigOptions config = fromConfigOptions(Map.of("zerobasefee", true));
+
+    assertThat(config.isZeroBaseFee()).isTrue();
+  }
+
+  @Test
+  public void asMapIncludesZeroBaseFee() {
+    final GenesisConfigOptions config = fromConfigOptions(Map.of("zerobasefee", true));
+
+    assertThat(config.asMap()).containsOnlyKeys("zeroBaseFee").containsValue(true);
+  }
+
+  @Test
+  public void shouldGetDepositContractAddress() {
+    final GenesisConfigOptions config =
+        fromConfigOptions(
+            singletonMap("depositContractAddress", "0x00000000219ab540356cbb839cbe05303d7705fa"));
+    assertThat(config.getDepositContractAddress())
+        .hasValue(Address.fromHexString("0x00000000219ab540356cbb839cbe05303d7705fa"));
+  }
+
+  @Test
+  public void shouldNotHaveDepositContractAddressWhenEmpty() {
+    final GenesisConfigOptions config = fromConfigOptions(emptyMap());
+    assertThat(config.getDepositContractAddress()).isEmpty();
+  }
+
+  @Test
+  public void asMapIncludesDepositContractAddress() {
+    final GenesisConfigOptions config = fromConfigOptions(Map.of("depositContractAddress", "0x0"));
+
+    assertThat(config.asMap())
+        .containsOnlyKeys("depositContractAddress")
+        .containsValue(Address.ZERO);
+  }
+
   private GenesisConfigOptions fromConfigOptions(final Map<String, Object> configOptions) {
     final ObjectNode rootNode = JsonUtil.createEmptyObjectNode();
     final ObjectNode options = JsonUtil.objectNodeFromMap(configOptions);
diff --git a/config/src/test/java/org/hyperledger/besu/config/IbftConfigOptionsTest.java b/config/src/test/java/org/hyperledger/besu/config/IbftConfigOptionsTest.java
deleted file mode 100644
index c0403d1c54e..00000000000
--- a/config/src/test/java/org/hyperledger/besu/config/IbftConfigOptionsTest.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.config;
-
-import static java.util.Collections.emptyMap;
-import static java.util.Collections.singletonMap;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.Map;
-
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.junit.Test;
-
-public class IbftConfigOptionsTest {
-
-  private static final int EXPECTED_DEFAULT_EPOCH_LENGTH = 30_000;
-  private static final int EXPECTED_DEFAULT_BLOCK_PERIOD = 1;
-  private static final int EXPECTED_DEFAULT_REQUEST_TIMEOUT = 1;
-  private static final int EXPECTED_DEFAULT_GOSSIPED_HISTORY_LIMIT = 1000;
-  private static final int EXPECTED_DEFAULT_MESSAGE_QUEUE_LIMIT = 1000;
-  private static final int EXPECTED_DEFAULT_DUPLICATE_MESSAGE_LIMIT = 100;
-  private static final int EXPECTED_DEFAULT_FUTURE_MESSAGES_LIMIT = 1000;
-  private static final int EXPECTED_DEFAULT_FUTURE_MESSAGES_MAX_DISTANCE = 10;
-
-  @Test
-  public void shouldGetEpochLengthFromConfig() {
-    final IbftConfigOptions config = fromConfigOptions(singletonMap("EpochLength", 10_000));
-    assertThat(config.getEpochLength()).isEqualTo(10_000);
-  }
-
-  @Test
-  public void shouldFallbackToDefaultEpochLength() {
-    final IbftConfigOptions config = fromConfigOptions(emptyMap());
-    assertThat(config.getEpochLength()).isEqualTo(EXPECTED_DEFAULT_EPOCH_LENGTH);
-  }
-
-  @Test
-  public void shouldGetDefaultEpochLengthFromDefaultConfig() {
-    assertThat(IbftConfigOptions.DEFAULT.getEpochLength()).isEqualTo(EXPECTED_DEFAULT_EPOCH_LENGTH);
-  }
-
-  @Test
-  public void shouldGetBlockPeriodFromConfig() {
-    final IbftConfigOptions config = fromConfigOptions(singletonMap("BlockPeriodSeconds", 5));
-    assertThat(config.getBlockPeriodSeconds()).isEqualTo(5);
-  }
-
-  @Test
-  public void shouldFallbackToDefaultBlockPeriod() {
-    final IbftConfigOptions config = fromConfigOptions(emptyMap());
-    assertThat(config.getBlockPeriodSeconds()).isEqualTo(EXPECTED_DEFAULT_BLOCK_PERIOD);
-  }
-
-  @Test
-  public void shouldGetDefaultBlockPeriodFromDefaultConfig() {
-    assertThat(IbftConfigOptions.DEFAULT.getBlockPeriodSeconds())
-        .isEqualTo(EXPECTED_DEFAULT_BLOCK_PERIOD);
-  }
-
-  @Test
-  public void shouldGetRequestTimeoutFromConfig() {
-    final IbftConfigOptions config = fromConfigOptions(singletonMap("RequestTimeoutSeconds", 5));
-    assertThat(config.getRequestTimeoutSeconds()).isEqualTo(5);
-  }
-
-  @Test
-  public void shouldFallbackToDefaultRequestTimeout() {
-    final IbftConfigOptions config = fromConfigOptions(emptyMap());
-    assertThat(config.getRequestTimeoutSeconds()).isEqualTo(EXPECTED_DEFAULT_REQUEST_TIMEOUT);
-  }
-
-  @Test
-  public void shouldGetDefaultRequestTimeoutFromDefaultConfig() {
-    assertThat(IbftConfigOptions.DEFAULT.getRequestTimeoutSeconds())
-        .isEqualTo(EXPECTED_DEFAULT_REQUEST_TIMEOUT);
-  }
-
-  @Test
-  public void shouldGetGossipedHistoryLimitFromConfig() {
-    final IbftConfigOptions config = fromConfigOptions(singletonMap("GossipedHistoryLimit", 100));
-    assertThat(config.getGossipedHistoryLimit()).isEqualTo(100);
-  }
-
-  @Test
-  public void shouldFallbackToDefaultGossipedHistoryLimit() {
-    final IbftConfigOptions config = fromConfigOptions(emptyMap());
-    assertThat(config.getGossipedHistoryLimit()).isEqualTo(EXPECTED_DEFAULT_GOSSIPED_HISTORY_LIMIT);
-  }
-
-  @Test
-  public void shouldGetDefaultGossipedHistoryLimitFromDefaultConfig() {
-    assertThat(IbftConfigOptions.DEFAULT.getGossipedHistoryLimit())
-        .isEqualTo(EXPECTED_DEFAULT_GOSSIPED_HISTORY_LIMIT);
-  }
-
-  @Test
-  public void shouldGetMessageQueueLimitFromConfig() {
-    final IbftConfigOptions config = fromConfigOptions(singletonMap("MessageQueueLimit", 100));
-    assertThat(config.getMessageQueueLimit()).isEqualTo(100);
-  }
-
-  @Test
-  public void shouldFallbackToDefaultMessageQueueLimit() {
-    final IbftConfigOptions config = fromConfigOptions(emptyMap());
-    assertThat(config.getMessageQueueLimit()).isEqualTo(EXPECTED_DEFAULT_MESSAGE_QUEUE_LIMIT);
-  }
-
-  @Test
-  public void shouldGetDefaultMessageQueueLimitFromDefaultConfig() {
-    assertThat(IbftConfigOptions.DEFAULT.getMessageQueueLimit())
-        .isEqualTo(EXPECTED_DEFAULT_MESSAGE_QUEUE_LIMIT);
-  }
-
-  @Test
-  public void shouldGetDuplicateMessageLimitFromConfig() {
-    final IbftConfigOptions config = fromConfigOptions(singletonMap("DuplicateMessageLimit", 50));
-    assertThat(config.getDuplicateMessageLimit()).isEqualTo(50);
-  }
-
-  @Test
-  public void shouldFallbackToDefaultDuplicateMessageLimit() {
-    final IbftConfigOptions config = fromConfigOptions(emptyMap());
-    assertThat(config.getDuplicateMessageLimit())
-        .isEqualTo(EXPECTED_DEFAULT_DUPLICATE_MESSAGE_LIMIT);
-  }
-
-  @Test
-  public void shouldGetDefaultDuplicateMessageLimitFromDefaultConfig() {
-    assertThat(IbftConfigOptions.DEFAULT.getDuplicateMessageLimit())
-        .isEqualTo(EXPECTED_DEFAULT_DUPLICATE_MESSAGE_LIMIT);
-  }
-
-  @Test
-  public void shouldGetFutureMessagesLimitFromConfig() {
-    final IbftConfigOptions config = fromConfigOptions(singletonMap("FutureMessagesLimit", 50));
-    assertThat(config.getFutureMessagesLimit()).isEqualTo(50);
-  }
-
-  @Test
-  public void shouldFallbackToDefaultFutureMessagesLimit() {
-    final IbftConfigOptions config = fromConfigOptions(emptyMap());
-    assertThat(config.getFutureMessagesLimit()).isEqualTo(EXPECTED_DEFAULT_FUTURE_MESSAGES_LIMIT);
-  }
-
-  @Test
-  public void shouldGetDefaultFutureMessagesLimitsFromDefaultConfig() {
-    assertThat(IbftConfigOptions.DEFAULT.getFutureMessagesLimit())
-        .isEqualTo(EXPECTED_DEFAULT_FUTURE_MESSAGES_LIMIT);
-  }
-
-  @Test
-  public void shouldGetFutureMessagesMaxDistanceFromConfig() {
-    final IbftConfigOptions config =
-        fromConfigOptions(singletonMap("FutureMessagesMaxDistance", 50));
-    assertThat(config.getFutureMessagesMaxDistance()).isEqualTo(50);
-  }
-
-  @Test
-  public void shouldFallbackToDefaultFutureMessagesMaxDistance() {
-    final IbftConfigOptions config = fromConfigOptions(emptyMap());
-    assertThat(config.getFutureMessagesMaxDistance())
-        .isEqualTo(EXPECTED_DEFAULT_FUTURE_MESSAGES_MAX_DISTANCE);
-  }
-
-  @Test
-  public void shouldGetDefaultFutureMessagesMaxDistanceFromDefaultConfig() {
-    assertThat(IbftConfigOptions.DEFAULT.getFutureMessagesMaxDistance())
-        .isEqualTo(EXPECTED_DEFAULT_FUTURE_MESSAGES_MAX_DISTANCE);
-  }
-
-  private IbftConfigOptions fromConfigOptions(final Map<String, Object> ibftConfigOptions) {
-    final ObjectNode rootNode = JsonUtil.createEmptyObjectNode();
-    final ObjectNode configNode = JsonUtil.createEmptyObjectNode();
-    final ObjectNode options = JsonUtil.objectNodeFromMap(ibftConfigOptions);
-    configNode.set("ibft", options);
-    rootNode.set("config", configNode);
-    return GenesisConfigFile.fromConfig(rootNode).getConfigOptions().getIbftLegacyConfigOptions();
-  }
-}
diff --git a/config/src/test/java/org/hyperledger/besu/config/JsonBftConfigOptionsTest.java b/config/src/test/java/org/hyperledger/besu/config/JsonBftConfigOptionsTest.java
new file mode 100644
index 00000000000..5f530cebb5b
--- /dev/null
+++ b/config/src/test/java/org/hyperledger/besu/config/JsonBftConfigOptionsTest.java
@@ -0,0 +1,231 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.config;
+
+import static java.util.Collections.emptyMap;
+import static java.util.Collections.singletonMap;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.hyperledger.besu.datatypes.Address;
+
+import java.util.Map;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.junit.jupiter.api.Test;
+
+public class JsonBftConfigOptionsTest {
+
+  private static final int EXPECTED_DEFAULT_EPOCH_LENGTH = 30_000;
+  private static final int EXPECTED_DEFAULT_BLOCK_PERIOD = 1;
+  private static final int EXPECTED_DEFAULT_REQUEST_TIMEOUT = 1;
+  private static final int EXPECTED_DEFAULT_GOSSIPED_HISTORY_LIMIT = 1000;
+  private static final int EXPECTED_DEFAULT_MESSAGE_QUEUE_LIMIT = 1000;
+  private static final int EXPECTED_DEFAULT_DUPLICATE_MESSAGE_LIMIT = 100;
+  private static final int EXPECTED_DEFAULT_FUTURE_MESSAGES_LIMIT = 1000;
+  private static final int EXPECTED_DEFAULT_FUTURE_MESSAGES_MAX_DISTANCE = 10;
+
+  @Test
+  public void shouldGetEpochLengthFromConfig() {
+    final BftConfigOptions config = fromConfigOptions(singletonMap("epochlength", 10_000));
+    assertThat(config.getEpochLength()).isEqualTo(10_000);
+  }
+
+  @Test
+  public void shouldFallbackToDefaultEpochLength() {
+    final BftConfigOptions config = fromConfigOptions(emptyMap());
+    assertThat(config.getEpochLength()).isEqualTo(EXPECTED_DEFAULT_EPOCH_LENGTH);
+  }
+
+  @Test
+  public void shouldGetDefaultEpochLengthFromDefaultConfig() {
+    assertThat(JsonBftConfigOptions.DEFAULT.getEpochLength())
+        .isEqualTo(EXPECTED_DEFAULT_EPOCH_LENGTH);
+  }
+
+  @Test
+  public void shouldGetBlockPeriodFromConfig() {
+    final BftConfigOptions config = fromConfigOptions(singletonMap("blockperiodseconds", 5));
+    assertThat(config.getBlockPeriodSeconds()).isEqualTo(5);
+  }
+
+  @Test
+  public void shouldFallbackToDefaultBlockPeriod() {
+    final BftConfigOptions config = fromConfigOptions(emptyMap());
+    assertThat(config.getBlockPeriodSeconds()).isEqualTo(EXPECTED_DEFAULT_BLOCK_PERIOD);
+  }
+
+  @Test
+  public void shouldGetDefaultBlockPeriodFromDefaultConfig() {
+    assertThat(JsonBftConfigOptions.DEFAULT.getBlockPeriodSeconds())
+        .isEqualTo(EXPECTED_DEFAULT_BLOCK_PERIOD);
+  }
+
+  @Test
+  public void shouldThrowOnNonPositiveBlockPeriod() {
+    final BftConfigOptions config = fromConfigOptions(singletonMap("blockperiodseconds", -1));
+    assertThatThrownBy(() -> config.getBlockPeriodSeconds())
+        .isInstanceOf(IllegalArgumentException.class);
+  }
+
+  @Test
+  public void shouldGetRequestTimeoutFromConfig() {
+    final BftConfigOptions config = fromConfigOptions(singletonMap("requesttimeoutseconds", 5));
+    assertThat(config.getRequestTimeoutSeconds()).isEqualTo(5);
+  }
+
+  @Test
+  public void shouldFallbackToDefaultRequestTimeout() {
+    final BftConfigOptions config = fromConfigOptions(emptyMap());
+    assertThat(config.getRequestTimeoutSeconds()).isEqualTo(EXPECTED_DEFAULT_REQUEST_TIMEOUT);
+  }
+
+  @Test
+  public void shouldGetDefaultRequestTimeoutFromDefaultConfig() {
+    assertThat(JsonBftConfigOptions.DEFAULT.getRequestTimeoutSeconds())
+        .isEqualTo(EXPECTED_DEFAULT_REQUEST_TIMEOUT);
+  }
+
+  @Test
+  public void shouldGetGossipedHistoryLimitFromConfig() {
+    final BftConfigOptions config = fromConfigOptions(singletonMap("gossipedhistorylimit", 100));
+    assertThat(config.getGossipedHistoryLimit()).isEqualTo(100);
+  }
+
+  @Test
+  public void shouldFallbackToDefaultGossipedHistoryLimit() {
+    final BftConfigOptions config = fromConfigOptions(emptyMap());
+    assertThat(config.getGossipedHistoryLimit()).isEqualTo(EXPECTED_DEFAULT_GOSSIPED_HISTORY_LIMIT);
+  }
+
+  @Test
+  public void shouldGetDefaultGossipedHistoryLimitFromDefaultConfig() {
+    assertThat(JsonBftConfigOptions.DEFAULT.getGossipedHistoryLimit())
+        .isEqualTo(EXPECTED_DEFAULT_GOSSIPED_HISTORY_LIMIT);
+  }
+
+  @Test
+  public void shouldGetMessageQueueLimitFromConfig() {
+    final BftConfigOptions config = fromConfigOptions(singletonMap("messagequeuelimit", 100));
+    assertThat(config.getMessageQueueLimit()).isEqualTo(100);
+  }
+
+  @Test
+  public void shouldFallbackToDefaultMessageQueueLimit() {
+    final BftConfigOptions config = fromConfigOptions(emptyMap());
+    assertThat(config.getMessageQueueLimit()).isEqualTo(EXPECTED_DEFAULT_MESSAGE_QUEUE_LIMIT);
+  }
+
+  @Test
+  public void shouldGetDefaultMessageQueueLimitFromDefaultConfig() {
+    assertThat(JsonBftConfigOptions.DEFAULT.getMessageQueueLimit())
+        .isEqualTo(EXPECTED_DEFAULT_MESSAGE_QUEUE_LIMIT);
+  }
+
+  @Test
+  public void shouldGetDuplicateMessageLimitFromConfig() {
+    final BftConfigOptions config = fromConfigOptions(singletonMap("duplicatemessagelimit", 50));
+    assertThat(config.getDuplicateMessageLimit()).isEqualTo(50);
+  }
+
+  @Test
+  public void shouldFallbackToDefaultDuplicateMessageLimit() {
+    final BftConfigOptions config = fromConfigOptions(emptyMap());
+    assertThat(config.getDuplicateMessageLimit())
+        .isEqualTo(EXPECTED_DEFAULT_DUPLICATE_MESSAGE_LIMIT);
+  }
+
+  @Test
+  public void shouldGetDefaultDuplicateMessageLimitFromDefaultConfig() {
+    assertThat(JsonBftConfigOptions.DEFAULT.getDuplicateMessageLimit())
+        .isEqualTo(EXPECTED_DEFAULT_DUPLICATE_MESSAGE_LIMIT);
+  }
+
+  @Test
+  public void shouldGetFutureMessagesLimitFromConfig() {
+    final BftConfigOptions config = fromConfigOptions(singletonMap("futuremessageslimit", 50));
+    assertThat(config.getFutureMessagesLimit()).isEqualTo(50);
+  }
+
+  @Test
+  public void shouldFallbackToDefaultFutureMessagesLimit() {
+    final BftConfigOptions config = fromConfigOptions(emptyMap());
+    assertThat(config.getFutureMessagesLimit()).isEqualTo(EXPECTED_DEFAULT_FUTURE_MESSAGES_LIMIT);
+  }
+
+  @Test
+  public void shouldGetDefaultFutureMessagesLimitsFromDefaultConfig() {
+    assertThat(JsonBftConfigOptions.DEFAULT.getFutureMessagesLimit())
+        .isEqualTo(EXPECTED_DEFAULT_FUTURE_MESSAGES_LIMIT);
+  }
+
+  @Test
+  public void shouldGetFutureMessagesMaxDistanceFromConfig() {
+    final BftConfigOptions config =
+        fromConfigOptions(singletonMap("futuremessagesmaxdistance", 50));
+    assertThat(config.getFutureMessagesMaxDistance()).isEqualTo(50);
+  }
+
+  @Test
+  public void shouldFallbackToDefaultFutureMessagesMaxDistance() {
+    final BftConfigOptions config = fromConfigOptions(emptyMap());
+    assertThat(config.getFutureMessagesMaxDistance())
+        .isEqualTo(EXPECTED_DEFAULT_FUTURE_MESSAGES_MAX_DISTANCE);
+  }
+
+  @Test
+  public void shouldGetDefaultFutureMessagesMaxDistanceFromDefaultConfig() {
+    assertThat(JsonBftConfigOptions.DEFAULT.getFutureMessagesMaxDistance())
+        .isEqualTo(EXPECTED_DEFAULT_FUTURE_MESSAGES_MAX_DISTANCE);
+  }
+
+  @Test
+  public void shouldGetMiningBeneficiaryFromConfig() {
+    final Address miningBeneficiary =
+        Address.fromHexString("0xfe3b557e8fb62b89f4916b721be55ceb828dbd73");
+    final BftConfigOptions config =
+        fromConfigOptions(singletonMap("miningbeneficiary", miningBeneficiary.toString()));
+    assertThat(config.getMiningBeneficiary()).contains(miningBeneficiary);
+  }
+
+  @Test
+  public void shouldGetEmptyMiningBeneficiaryFromConfig() {
+    final BftConfigOptions config = fromConfigOptions(singletonMap("miningbeneficiary", " "));
+    assertThat(config.getMiningBeneficiary()).isEmpty();
+  }
+
+  @Test
+  public void shouldFallbackToDefaultEmptyMiningBeneficiary() {
+    final BftConfigOptions config = fromConfigOptions(emptyMap());
+    assertThat(config.getMiningBeneficiary()).isEmpty();
+  }
+
+  @Test
+  public void shouldThrowOnInvalidMiningBeneficiary() {
+    final BftConfigOptions config = fromConfigOptions(singletonMap("miningbeneficiary", "bla"));
+    assertThatThrownBy(config::getMiningBeneficiary)
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Mining beneficiary in config is not a valid ethereum address");
+  }
+
+  private BftConfigOptions fromConfigOptions(final Map<String, Object> ibftConfigOptions) {
+    final ObjectNode rootNode = JsonUtil.createEmptyObjectNode();
+    final ObjectNode configNode = JsonUtil.createEmptyObjectNode();
+    final ObjectNode options = JsonUtil.objectNodeFromMap(ibftConfigOptions);
+    configNode.set("ibft2", options);
+    rootNode.set("config", configNode);
+    return GenesisConfigFile.fromConfig(rootNode).getConfigOptions().getBftConfigOptions();
+  }
+}
diff --git a/config/src/test/java/org/hyperledger/besu/config/JsonGenesisConfigOptionsTest.java b/config/src/test/java/org/hyperledger/besu/config/JsonGenesisConfigOptionsTest.java
index da96485923a..60c919ae7be 100644
--- a/config/src/test/java/org/hyperledger/besu/config/JsonGenesisConfigOptionsTest.java
+++ b/config/src/test/java/org/hyperledger/besu/config/JsonGenesisConfigOptionsTest.java
@@ -16,13 +16,16 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.hyperledger.besu.datatypes.Address;
+
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.io.Resources;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class JsonGenesisConfigOptionsTest {
 
@@ -37,6 +40,15 @@ private ObjectNode loadCompleteDataSet() {
     }
   }
 
+  private ObjectNode loadConfigWithQbftTransitions() {
+    final ObjectNode configNode = loadCompleteDataSet();
+    final ObjectNode transitionsNode = JsonUtil.getObjectNode(configNode, "transitions").get();
+    final JsonNode transitions = transitionsNode.get("ibft2");
+    transitionsNode.remove("ibft2");
+    transitionsNode.set("qbft", transitions);
+    return configNode;
+  }
+
   private ObjectNode loadConfigWithNoTransitions() {
     final ObjectNode configNode = loadCompleteDataSet();
     configNode.remove("transitions");
@@ -61,7 +73,7 @@ private ObjectNode loadConfigWithAnIbft2ForkWithMissingValidators() {
   }
 
   @Test
-  public void transitionsDecodesCorrectlyFromFile() {
+  public void ibftTransitionsDecodesCorrectlyFromFile() {
     final ObjectNode configNode = loadCompleteDataSet();
 
     final JsonGenesisConfigOptions configOptions =
@@ -82,6 +94,28 @@ public void transitionsDecodesCorrectlyFromFile() {
         .containsExactly("0x1234567890123456789012345678901234567890");
   }
 
+  @Test
+  public void qbftTransitionsDecodesCorrectlyFromFile() {
+    final ObjectNode configNode = loadConfigWithQbftTransitions();
+
+    final JsonGenesisConfigOptions configOptions =
+        JsonGenesisConfigOptions.fromJsonObject(configNode);
+
+    assertThat(configOptions.getTransitions()).isNotNull();
+    assertThat(configOptions.getTransitions().getQbftForks().size()).isEqualTo(2);
+    assertThat(configOptions.getTransitions().getQbftForks().get(0).getForkBlock()).isEqualTo(20);
+    assertThat(configOptions.getTransitions().getQbftForks().get(0).getValidators()).isNotEmpty();
+    assertThat(configOptions.getTransitions().getQbftForks().get(0).getValidators().get())
+        .containsExactly(
+            "0x1234567890123456789012345678901234567890",
+            "0x9876543210987654321098765432109876543210");
+
+    assertThat(configOptions.getTransitions().getQbftForks().get(1).getForkBlock()).isEqualTo(25);
+    assertThat(configOptions.getTransitions().getQbftForks().get(1).getValidators()).isNotEmpty();
+    assertThat(configOptions.getTransitions().getQbftForks().get(1).getValidators().get())
+        .containsExactly("0x1234567890123456789012345678901234567890");
+  }
+
   @Test
   public void configWithMissingTransitionsIsValid() {
     final ObjectNode configNode = loadConfigWithNoTransitions();
@@ -91,6 +125,7 @@ public void configWithMissingTransitionsIsValid() {
 
     assertThat(configOptions.getTransitions()).isNotNull();
     assertThat(configOptions.getTransitions().getIbftForks().size()).isZero();
+    assertThat(configOptions.getTransitions().getQbftForks().size()).isZero();
   }
 
   @Test
@@ -123,10 +158,9 @@ public void configWithValidIbftBlockRewardIsParsable() {
 
     final JsonGenesisConfigOptions configOptions =
         JsonGenesisConfigOptions.fromJsonObject(configNode);
-    assertThat(configOptions.getIbft2ConfigOptions().getMiningBeneficiary()).isNotEmpty();
-    assertThat(configOptions.getIbft2ConfigOptions().getMiningBeneficiary().get())
-        .isEqualTo("0x1234567890123456789012345678901234567890");
-    assertThat(configOptions.getIbft2ConfigOptions().getBlockRewardWei()).isEqualTo(21);
+    assertThat(configOptions.getBftConfigOptions().getMiningBeneficiary().map(Address::toHexString))
+        .contains("0x1234567890123456789012345678901234567890");
+    assertThat(configOptions.getBftConfigOptions().getBlockRewardWei()).isEqualTo(21);
   }
 
   @Test
@@ -138,7 +172,7 @@ public void ibftConfigWithoutMiningBeneficiaryDefaultsToEmpty() {
     final JsonGenesisConfigOptions configOptions =
         JsonGenesisConfigOptions.fromJsonObject(configNode);
 
-    assertThat(configOptions.getIbft2ConfigOptions().getMiningBeneficiary()).isEmpty();
+    assertThat(configOptions.getBftConfigOptions().getMiningBeneficiary()).isEmpty();
   }
 
   @Test
@@ -150,7 +184,7 @@ public void ibftConfigWithoutBlockRewardsDefaultsToZero() {
     final JsonGenesisConfigOptions configOptions =
         JsonGenesisConfigOptions.fromJsonObject(configNode);
 
-    assertThat(configOptions.getIbft2ConfigOptions().getBlockRewardWei()).isEqualTo(0);
+    assertThat(configOptions.getBftConfigOptions().getBlockRewardWei()).isEqualTo(0);
   }
 
   @Test
@@ -162,6 +196,52 @@ public void ibftBlockRewardAsDecimalNumberCorrectlyDecodes() {
     final JsonGenesisConfigOptions configOptions =
         JsonGenesisConfigOptions.fromJsonObject(configNode);
 
-    assertThat(configOptions.getIbft2ConfigOptions().getBlockRewardWei()).isEqualTo(12);
+    assertThat(configOptions.getBftConfigOptions().getBlockRewardWei()).isEqualTo(12);
+  }
+
+  @Test
+  public void configWithoutEcCurveReturnsEmptyOptional() {
+    final ObjectNode configNode = loadCompleteDataSet();
+
+    final JsonGenesisConfigOptions configOptions =
+        JsonGenesisConfigOptions.fromJsonObject(configNode);
+
+    assertThat(configOptions.getEcCurve().isEmpty()).isTrue();
+  }
+
+  @Test
+  public void configWithEcCurveIsCorrectlySet() {
+    final ObjectNode configNode = loadCompleteDataSet();
+    configNode.put("eccurve", "secp256k1");
+
+    final JsonGenesisConfigOptions configOptions =
+        JsonGenesisConfigOptions.fromJsonObject(configNode);
+
+    assertThat(configOptions.getEcCurve().isPresent()).isTrue();
+    assertThat(configOptions.getEcCurve().get()).isEqualTo("secp256k1");
+  }
+
+  @Test
+  public void configWithMigrationFromIbft2ToQbft() {
+    final ObjectNode configNode = loadConfigWithMigrationFromIbft2ToQbft();
+
+    final JsonGenesisConfigOptions configOptions =
+        JsonGenesisConfigOptions.fromJsonObject(configNode);
+
+    assertThat(configOptions.isIbft2()).isTrue();
+    assertThat(configOptions.isQbft()).isTrue();
+    assertThat(configOptions.isConsensusMigration()).isTrue();
+  }
+
+  private ObjectNode loadConfigWithMigrationFromIbft2ToQbft() {
+    try {
+      final String configText =
+          Resources.toString(
+              Resources.getResource("valid_config_with_migration_to_qbft.json"),
+              StandardCharsets.UTF_8);
+      return JsonUtil.objectNodeFromString(configText);
+    } catch (final IOException e) {
+      throw new RuntimeException("Failed to load resource", e);
+    }
   }
 }
diff --git a/config/src/test/java/org/hyperledger/besu/config/JsonQbftConfigOptionsTest.java b/config/src/test/java/org/hyperledger/besu/config/JsonQbftConfigOptionsTest.java
new file mode 100644
index 00000000000..448a5c18adc
--- /dev/null
+++ b/config/src/test/java/org/hyperledger/besu/config/JsonQbftConfigOptionsTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ *  the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.config;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.config.JsonQbftConfigOptions.VALIDATOR_CONTRACT_ADDRESS;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.junit.jupiter.api.Test;
+
+public class JsonQbftConfigOptionsTest {
+
+  final ObjectMapper objectMapper = new ObjectMapper();
+
+  @Test
+  public void getValidatorContractAddressNormalization() {
+    final ObjectNode objectNode =
+        objectMapper.createObjectNode().put(VALIDATOR_CONTRACT_ADDRESS, "0xABC");
+
+    final JsonQbftConfigOptions configOptions = new JsonQbftConfigOptions(objectNode);
+
+    assertThat(configOptions.getValidatorContractAddress()).hasValue("0xabc");
+  }
+
+  @Test
+  public void asMapDoesNotIncludeEmptyOptionalFields() {
+    final ObjectNode objectNode = objectMapper.createObjectNode();
+    final JsonQbftConfigOptions configOptions = new JsonQbftConfigOptions(objectNode);
+
+    assertThat(configOptions.asMap()).isEmpty();
+  }
+}
diff --git a/config/src/test/java/org/hyperledger/besu/config/JsonUtilTest.java b/config/src/test/java/org/hyperledger/besu/config/JsonUtilTest.java
index b96fd4408af..962bb42f055 100644
--- a/config/src/test/java/org/hyperledger/besu/config/JsonUtilTest.java
+++ b/config/src/test/java/org/hyperledger/besu/config/JsonUtilTest.java
@@ -30,7 +30,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class JsonUtilTest {
   private final ObjectMapper mapper = new ObjectMapper();
@@ -68,6 +68,81 @@ public void normalizeKeys_depth() {
         .isEqualTo(normalized.get("deep").get("deeper").get("deeperer").asText());
   }
 
+  @Test
+  public void normalizeKeys_arrayNode() {
+    final ObjectNode originalObj =
+        mapper
+            .createObjectNode()
+            .set(
+                "ArrAy",
+                mapper
+                    .createArrayNode()
+                    .add(mapper.createObjectNode().put("lower", "foo"))
+                    .add(mapper.createObjectNode().put("UPPER", "BAR"))
+                    .add(mapper.createObjectNode().put("Camel", "Ziz"))
+                    .add(mapper.createObjectNode().put("MiXeD", "LoL")));
+
+    final ObjectNode expectedObj =
+        mapper
+            .createObjectNode()
+            .set(
+                "array",
+                mapper
+                    .createArrayNode()
+                    .add(mapper.createObjectNode().put("lower", "foo"))
+                    .add(mapper.createObjectNode().put("upper", "BAR"))
+                    .add(mapper.createObjectNode().put("camel", "Ziz"))
+                    .add(mapper.createObjectNode().put("mixed", "LoL")));
+
+    final ObjectNode normalizedObj = JsonUtil.normalizeKeys(originalObj);
+
+    assertThat(normalizedObj).isEqualTo(expectedObj);
+  }
+
+  @Test
+  public void normalizeKeys_arrayNode_depth() {
+    final ObjectNode originalObj =
+        mapper
+            .createObjectNode()
+            .set(
+                "ArrAy",
+                mapper
+                    .createArrayNode()
+                    .add(
+                        mapper
+                            .createArrayNode()
+                            .add(mapper.createObjectNode().put("dEpTh", "Foo"))));
+
+    final ObjectNode expectedObj =
+        mapper
+            .createObjectNode()
+            .set(
+                "array",
+                mapper
+                    .createArrayNode()
+                    .add(
+                        mapper
+                            .createArrayNode()
+                            .add(mapper.createObjectNode().put("depth", "Foo"))));
+
+    final ObjectNode normalizedObj = JsonUtil.normalizeKeys(originalObj);
+
+    assertThat(normalizedObj).isEqualTo(expectedObj);
+  }
+
+  @Test
+  public void normalizeKeys_arrayNode_withString() {
+    final ObjectNode originalObj =
+        mapper.createObjectNode().set("ArrAy", mapper.createArrayNode().add("StrIng"));
+
+    final ObjectNode expectedObj =
+        mapper.createObjectNode().set("array", mapper.createArrayNode().add("StrIng"));
+
+    final ObjectNode normalizedObj = JsonUtil.normalizeKeys(originalObj);
+
+    assertThat(normalizedObj).isEqualTo(expectedObj);
+  }
+
   @Test
   public void getLong_nonExistentKey() {
     final ObjectNode node = mapper.createObjectNode();
@@ -439,6 +514,101 @@ public void getBoolean_wrongType_withDefault() {
         .hasMessageContaining("Expected boolean value but got number");
   }
 
+  @Test
+  public void getPositiveInt_validValue() {
+    final ObjectNode node = mapper.createObjectNode();
+    final int validValue = 2;
+    node.put("test", validValue);
+    final OptionalInt result = JsonUtil.getPositiveInt(node, "test");
+    assertThat(result).hasValue(validValue);
+  }
+
+  @Test
+  public void getPositiveInt_nonExistentKey() {
+    final ObjectNode node = mapper.createObjectNode();
+    final OptionalInt result = JsonUtil.getPositiveInt(node, "test");
+    assertThat(result).isEmpty();
+  }
+
+  @Test
+  public void getPositiveInt_decimalValue() {
+    final ObjectNode node = mapper.createObjectNode();
+    final float decimalValue = Float.MAX_VALUE;
+    node.put("test", decimalValue);
+    assertThatThrownBy(() -> JsonUtil.getPositiveInt(node, "test"))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage("Invalid property value, test should be a positive integer: " + decimalValue);
+  }
+
+  @Test
+  public void getPositiveInt_nonPositiveValue() {
+    final ObjectNode node = mapper.createObjectNode();
+    final int nonPositiveValue = 0;
+    node.put("test", nonPositiveValue);
+    assertThatThrownBy(() -> JsonUtil.getPositiveInt(node, "test"))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage(
+            "Invalid property value, test should be a positive integer: " + nonPositiveValue);
+  }
+
+  @Test
+  public void getPositiveInt_negativeValue() {
+    final ObjectNode node = mapper.createObjectNode();
+    final int negativeValue = Integer.MIN_VALUE;
+    node.put("test", negativeValue);
+    assertThatThrownBy(() -> JsonUtil.getPositiveInt(node, "test"))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage("Invalid property value, test should be a positive integer: " + negativeValue);
+  }
+
+  @Test
+  public void getPositiveInt_validValue_withDefault() {
+    final ObjectNode node = mapper.createObjectNode();
+    final int validValue = 2;
+    node.put("test", validValue);
+    final int result = JsonUtil.getPositiveInt(node, "test", 1);
+    assertThat(result).isEqualTo(validValue);
+  }
+
+  @Test
+  public void getPositiveInt_nonExistentKey_withDefault() {
+    final ObjectNode node = mapper.createObjectNode();
+    final int defaultValue = 1;
+    final int result = JsonUtil.getPositiveInt(node, "test", defaultValue);
+    assertThat(result).isEqualTo(defaultValue);
+  }
+
+  @Test
+  public void getPositiveInt_decimalValue_withDefault() {
+    final ObjectNode node = mapper.createObjectNode();
+    final float decimalValue = Float.MAX_VALUE;
+    node.put("test", decimalValue);
+    assertThatThrownBy(() -> JsonUtil.getPositiveInt(node, "test", 1))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage("Invalid property value, test should be a positive integer: " + decimalValue);
+  }
+
+  @Test
+  public void getPositiveInt_nonPositiveValue_withDefault() {
+    final ObjectNode node = mapper.createObjectNode();
+    final int nonPositiveValue = 0;
+    node.put("test", nonPositiveValue);
+    assertThatThrownBy(() -> JsonUtil.getPositiveInt(node, "test", 1))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage(
+            "Invalid property value, test should be a positive integer: " + nonPositiveValue);
+  }
+
+  @Test
+  public void getPositiveInt_negativeValue_withDefault() {
+    final ObjectNode node = mapper.createObjectNode();
+    final int negativeValue = Integer.MIN_VALUE;
+    node.put("test", negativeValue);
+    assertThatThrownBy(() -> JsonUtil.getPositiveInt(node, "test", 1))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage("Invalid property value, test should be a positive integer: " + negativeValue);
+  }
+
   @Test
   public void objectNodeFromMap() {
     final Map<String, Object> map = new TreeMap<>();
@@ -579,4 +749,36 @@ public void getArrayNode_wrongNodeType() {
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessageContaining("Expected array value but got string");
   }
+
+  @Test
+  public void hasKey_noMatchingKey() {
+    final String jsonStr = "{\"test\": \"bla\" }";
+    final ObjectNode rootNode = JsonUtil.objectNodeFromString(jsonStr);
+
+    assertThat(JsonUtil.hasKey(rootNode, "target")).isFalse();
+  }
+
+  @Test
+  public void hasKey_nullMatchingKey() {
+    final String jsonStr = "{\"target\": null }";
+    final ObjectNode rootNode = JsonUtil.objectNodeFromString(jsonStr);
+
+    assertThat(JsonUtil.hasKey(rootNode, "target")).isTrue();
+  }
+
+  @Test
+  public void hasKey_emptyStringMatchingKey() {
+    final String jsonStr = "{\"target\": \"\" }";
+    final ObjectNode rootNode = JsonUtil.objectNodeFromString(jsonStr);
+
+    assertThat(JsonUtil.hasKey(rootNode, "target")).isTrue();
+  }
+
+  @Test
+  public void hasKey_nonEmptyMatchingKey() {
+    final String jsonStr = "{\"target\": \"bla\" }";
+    final ObjectNode rootNode = JsonUtil.objectNodeFromString(jsonStr);
+
+    assertThat(JsonUtil.hasKey(rootNode, "target")).isTrue();
+  }
 }
diff --git a/config/src/test/resources/all_forks.json b/config/src/test/resources/all_forks.json
new file mode 100644
index 00000000000..8b255820a5c
--- /dev/null
+++ b/config/src/test/resources/all_forks.json
@@ -0,0 +1,32 @@
+{
+  "config": {
+    "homesteadBlock": 1,
+    "daoForkBlock": 2,
+    "eip150Block": 3,
+    "eip158Block": 4,
+    "byzantiumBlock": 5,
+    "constantinopleBlock": 6,
+    "petersburgBlock": 7,
+    "istanbulBlock": 8,
+    "muirGlacierBlock": 9,
+    "berlinBlock": 10,
+    "londonBlock": 11,
+    "arrowGlacierBlock": 12,
+    "grayGlacierBlock": 13,
+    "mergeNetSplitBlock": 14,
+    "shanghaiTime": 15,
+    "cancunTime": 16,
+    "futureEipsTime": 98,
+    "experimentalEipsTime": 99,
+    "ecip1015Block": 102,
+    "dieHardBlock": 103,
+    "gothamBlock": 104,
+    "ecip1041Block": 105,
+    "atlantisBlock": 106,
+    "aghartaBlock": 107,
+    "phoenixBlock": 108,
+    "thanosBlock": 109,
+    "magnetoBlock": 110,
+    "mystiqueBlock": 111
+  }
+}
\ No newline at end of file
diff --git a/config/src/test/resources/preMerge.json b/config/src/test/resources/preMerge.json
new file mode 100644
index 00000000000..904905bd1c6
--- /dev/null
+++ b/config/src/test/resources/preMerge.json
@@ -0,0 +1,36 @@
+{
+  "config": {
+    "chainId": 1337,
+    "londonBlock": 0,
+    "phillyBlock": 5,
+    "parisBlock": 10,
+    "contractSizeLimit": 2147483647,
+    "ethash": {
+      "fixeddifficulty": 100
+    }
+  },
+  "nonce": "0x42",
+  "timestamp": "0x0",
+  "extraData": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
+  "gasLimit": "0x1fffffffffffff",
+  "difficulty": "0x10000",
+  "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "coinbase": "0x0000000000000000000000000000000000000000",
+  "alloc": {
+    "fe3b557e8fb62b89f4916b721be55ceb828dbd73": {
+      "privateKey": "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "0xad78ebc5ac6200000"
+    },
+    "627306090abaB3A6e1400e9345bC60c78a8BEf57": {
+      "privateKey": "c87509a1c067bbde78beb793e6fa76530b6382a4c0241e5e4a9ec0a0f44dc0d3",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "90000000000000000000000"
+    },
+    "f17f52151EbEF6C7334FAD080c5704D77216b732": {
+      "privateKey": "ae6ae8e5ccbfb04590405997ee2d52d2b330726137b875053c36d94e974d162f",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "90000000000000000000000"
+    }
+  }
+}
diff --git a/config/src/test/resources/valid_config.json b/config/src/test/resources/valid_config.json
index 609e88cf957..c098a6c84bb 100644
--- a/config/src/test/resources/valid_config.json
+++ b/config/src/test/resources/valid_config.json
@@ -1,9 +1,7 @@
 {
   "chainId": 61,
-  "eip150Block": 2,
   "homesteadBlock": 1,
-  "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "eip155Block": 3,
+  "eip150Block": 2,
   "eip158Block": 3,
   "byzantiumBlock": 1035301,
   "ibft2": {
diff --git a/config/src/test/resources/valid_config_with_custom_forks.json b/config/src/test/resources/valid_config_with_custom_forks.json
index fa082c82769..b3853086c6f 100644
--- a/config/src/test/resources/valid_config_with_custom_forks.json
+++ b/config/src/test/resources/valid_config_with_custom_forks.json
@@ -1,11 +1,12 @@
 {
   "chainId": 4,
-  "eip150Block": 2,
   "homesteadBlock": 1,
-  "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "eip155Block": 3,
+  "eip150Block": 2,
   "eip158Block": 3,
   "byzantiumBlock": 1035301,
+  "londonBlock": 2222222,
+  "zeroBaseFee": true,
+  "depositContractAddress": "0x00000000219ab540356cbb839cbe05303d7705fa",
   "ibft2": {
     "blockperiodseconds": 2,
     "epochlength": 30000,
diff --git a/config/src/test/resources/valid_config_with_etc_forks.json b/config/src/test/resources/valid_config_with_etc_forks.json
index aa3e067406d..a7e546568de 100644
--- a/config/src/test/resources/valid_config_with_etc_forks.json
+++ b/config/src/test/resources/valid_config_with_etc_forks.json
@@ -1,9 +1,7 @@
 {
   "chainId": 61,
-  "eip150Block": 2,
   "homesteadBlock": 1,
-  "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "eip155Block": 3,
+  "eip150Block": 2,
   "eip158Block": 3,
   "classicForkBlock": 1920000,
   "byzantiumBlock": 1035301,
diff --git a/config/src/test/resources/valid_config_with_migration_to_qbft.json b/config/src/test/resources/valid_config_with_migration_to_qbft.json
new file mode 100644
index 00000000000..ad678eccab9
--- /dev/null
+++ b/config/src/test/resources/valid_config_with_migration_to_qbft.json
@@ -0,0 +1,18 @@
+{
+  "chainId": 61,
+  "homesteadBlock": 1,
+  "eip150Block": 2,
+  "eip158Block": 3,
+  "byzantiumBlock": 1035301,
+  "ibft2": {
+    "blockperiodseconds": 2,
+    "epochlength": 30000,
+    "requesttimeoutseconds": 10
+  },
+  "qbft": {
+    "blockperiodseconds": 2,
+    "epochlength": 30000,
+    "requesttimeoutseconds": 10,
+    "startBlock": 123
+  }
+}
\ No newline at end of file
diff --git a/config/src/test/resources/valid_config_with_quorum_config.json b/config/src/test/resources/valid_config_with_quorum_config.json
index 55a2f19de8c..2c1db33dfc6 100644
--- a/config/src/test/resources/valid_config_with_quorum_config.json
+++ b/config/src/test/resources/valid_config_with_quorum_config.json
@@ -1,9 +1,7 @@
 {
   "chainId": 4,
-  "eip150Block": 2,
   "homesteadBlock": 1,
-  "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "eip155Block": 3,
+  "eip150Block": 2,
   "eip158Block": 3,
   "byzantiumBlock": 1035301,
   "isQuorum": true,
diff --git a/config/src/test/resources/valid_config_with_unexpected_forks.json b/config/src/test/resources/valid_config_with_unexpected_forks.json
index 41146106bed..49c107adc70 100644
--- a/config/src/test/resources/valid_config_with_unexpected_forks.json
+++ b/config/src/test/resources/valid_config_with_unexpected_forks.json
@@ -1,15 +1,13 @@
 {
   "chainId": 61,
+  "homesteadBlock": 1,
   "eip150Block": 2,
+  "eip158Block": 3,
   "unexpectedFork1Block": 7,
-  "homesteadBlock": 1,
-  "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-  "eip155Block": 3,
   "unexpectedFork2Block": 9,
-  "eip158Block": 3,
+  "unexpectedFork3Block": 150000,
   "classicForkBlock": 1920000,
   "byzantiumBlock": 1035301,
-  "unexpectedFork3Block": 150000,
   "ibft2": {
     "blockperiodseconds": 2,
     "epochlength": 30000,
diff --git a/consensus/clique/build.gradle b/consensus/clique/build.gradle
index 69ebf9042a8..b6c39a703ae 100644
--- a/consensus/clique/build.gradle
+++ b/consensus/clique/build.gradle
@@ -32,28 +32,34 @@ repositories { mavenCentral() }
 dependencies {
   implementation project(':config')
   implementation project(':consensus:common')
-  implementation project(':crypto')
+  implementation project(':crypto:services')
+  implementation project(':datatypes')
   implementation project(':ethereum:api')
   implementation project(':ethereum:blockcreation')
   implementation project(':ethereum:core')
   implementation project(':ethereum:eth')
   implementation project(':ethereum:p2p')
   implementation project(':ethereum:rlp')
+  implementation project(':evm')
   implementation project(':services:kvstore')
   implementation project(':util')
 
   implementation 'com.google.guava:guava'
   implementation 'io.vertx:vertx-core'
-  implementation 'org.apache.tuweni:bytes'
-  implementation 'org.apache.tuweni:units'
+  implementation 'com.fasterxml.jackson.core:jackson-databind'
+  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-units'
 
   testImplementation project(path: ':consensus:common', configuration: 'testArtifacts')
-  testImplementation project(path: ':crypto', configuration: 'testSupportArtifacts')
+  testImplementation project(path: ':crypto:services', configuration: 'testSupportArtifacts')
   testImplementation project(':metrics:core')
   testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
   testImplementation project(':testutil')
 
-  testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.mockito:mockito-core'
+  testImplementation 'org.mockito:mockito-junit-jupiter'
+
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 }
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/BlockHeaderValidationRulesetFactory.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/BlockHeaderValidationRulesetFactory.java
index 9ff3080e5c6..271f6ea3e2f 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/BlockHeaderValidationRulesetFactory.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/BlockHeaderValidationRulesetFactory.java
@@ -14,20 +14,24 @@
  */
 package org.hyperledger.besu.consensus.clique;
 
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
+import static org.hyperledger.besu.ethereum.mainnet.AbstractGasLimitSpecification.DEFAULT_MAX_GAS_LIMIT;
+import static org.hyperledger.besu.ethereum.mainnet.AbstractGasLimitSpecification.DEFAULT_MIN_GAS_LIMIT;
+
+import org.hyperledger.besu.config.MergeConfigOptions;
 import org.hyperledger.besu.consensus.clique.headervalidationrules.CliqueDifficultyValidationRule;
 import org.hyperledger.besu.consensus.clique.headervalidationrules.CliqueExtraDataValidationRule;
 import org.hyperledger.besu.consensus.clique.headervalidationrules.CoinbaseHeaderValidationRule;
 import org.hyperledger.besu.consensus.clique.headervalidationrules.SignerRateLimitValidationRule;
 import org.hyperledger.besu.consensus.clique.headervalidationrules.VoteValidationRule;
 import org.hyperledger.besu.consensus.common.EpochManager;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.fees.EIP1559;
 import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
 import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.AncestryValidationRule;
+import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.AttachedComposedFromDetachedRule;
+import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.BaseFeeMarketBlockHeaderGasPriceValidationRule;
 import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.ConstantFieldValidationRule;
-import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.EIP1559BlockHeaderGasPriceValidationRule;
 import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.GasLimitRangeAndDeltaValidationRule;
 import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.GasUsageValidationRule;
 import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.TimestampBoundedByFutureParameter;
@@ -35,6 +39,9 @@
 
 import java.util.Optional;
 
+import com.google.common.annotations.VisibleForTesting;
+
+/** The Block header validation ruleset factory. */
 public class BlockHeaderValidationRulesetFactory {
 
   /**
@@ -45,37 +52,67 @@ public class BlockHeaderValidationRulesetFactory {
    *
    * @param secondsBetweenBlocks the minimum number of seconds which must elapse between blocks.
    * @param epochManager an object which determines if a given block is an epoch block.
-   * @param eip1559 an {@link Optional} wrapping {@link EIP1559} manager class if appropriate.
+   * @param baseFeeMarket an {@link Optional} wrapping {@link BaseFeeMarket} class if appropriate.
    * @return the header validator.
    */
   public static BlockHeaderValidator.Builder cliqueBlockHeaderValidator(
       final long secondsBetweenBlocks,
       final EpochManager epochManager,
-      final Optional<EIP1559> eip1559) {
+      final Optional<BaseFeeMarket> baseFeeMarket) {
+    return cliqueBlockHeaderValidator(
+        secondsBetweenBlocks, epochManager, baseFeeMarket, MergeConfigOptions.isMergeEnabled());
+  }
+
+  /**
+   * Clique block header validator. Visible for testing.
+   *
+   * @param secondsBetweenBlocks the seconds between blocks
+   * @param epochManager the epoch manager
+   * @param baseFeeMarket the base fee market
+   * @param isMergeEnabled the is merge enabled
+   * @return the block header validator . builder
+   */
+  @VisibleForTesting
+  public static BlockHeaderValidator.Builder cliqueBlockHeaderValidator(
+      final long secondsBetweenBlocks,
+      final EpochManager epochManager,
+      final Optional<BaseFeeMarket> baseFeeMarket,
+      final boolean isMergeEnabled) {
 
     final BlockHeaderValidator.Builder builder =
         new BlockHeaderValidator.Builder()
             .addRule(new AncestryValidationRule())
-            .addRule(new GasLimitRangeAndDeltaValidationRule(5000, 0x7fffffffffffffffL))
             .addRule(new TimestampBoundedByFutureParameter(10))
-            .addRule(new TimestampMoreRecentThanParent(secondsBetweenBlocks))
             .addRule(
-                new ConstantFieldValidationRule<>("MixHash", BlockHeader::getMixHash, Hash.ZERO))
+                new GasLimitRangeAndDeltaValidationRule(
+                    DEFAULT_MIN_GAS_LIMIT, DEFAULT_MAX_GAS_LIMIT, baseFeeMarket))
             .addRule(
                 new ConstantFieldValidationRule<>(
                     "OmmersHash", BlockHeader::getOmmersHash, Hash.EMPTY_LIST_HASH))
             .addRule(new CliqueExtraDataValidationRule(epochManager))
-            .addRule(new VoteValidationRule())
             .addRule(new CliqueDifficultyValidationRule())
             .addRule(new SignerRateLimitValidationRule())
-            .addRule(new CoinbaseHeaderValidationRule(epochManager));
-    if (ExperimentalEIPs.eip1559Enabled && eip1559.isPresent()) {
+            .addRule(new CoinbaseHeaderValidationRule(epochManager))
+            .addRule(new GasUsageValidationRule());
+
+    if (baseFeeMarket.isPresent()) {
+      builder.addRule(new BaseFeeMarketBlockHeaderGasPriceValidationRule(baseFeeMarket.get()));
+    }
+
+    var mixHashRule =
+        new ConstantFieldValidationRule<>("MixHash", BlockHeader::getMixHash, Hash.ZERO);
+    var voteValidationRule = new VoteValidationRule();
+    var cliqueTimestampRule = new TimestampMoreRecentThanParent(secondsBetweenBlocks);
+
+    if (isMergeEnabled) {
       builder
-          .addRule((new EIP1559BlockHeaderGasPriceValidationRule(eip1559.get())))
-          .addRule(new GasUsageValidationRule(eip1559));
+          .addRule(new AttachedComposedFromDetachedRule(mixHashRule))
+          .addRule(new AttachedComposedFromDetachedRule(voteValidationRule))
+          .addRule(new AttachedComposedFromDetachedRule(cliqueTimestampRule));
     } else {
-      builder.addRule(new GasUsageValidationRule());
+      builder.addRule(mixHashRule).addRule(voteValidationRule).addRule(cliqueTimestampRule);
     }
+
     return builder;
   }
 }
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueBlockHashing.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueBlockHashing.java
index e9071ef76da..a8ebacba2b7 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueBlockHashing.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueBlockHashing.java
@@ -14,10 +14,10 @@
  */
 package org.hyperledger.besu.consensus.clique;
 
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Util;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 
@@ -25,6 +25,7 @@
 
 import org.apache.tuweni.bytes.Bytes;
 
+/** The Clique block hashing. */
 public class CliqueBlockHashing {
   /**
    * Constructs a hash of the block header, suitable for use when creating the proposer seal. The
@@ -69,7 +70,7 @@ private static Bytes serializeHeaderWithoutProposerSeal(
   private static Bytes encodeExtraDataWithoutProposerSeal(final CliqueExtraData cliqueExtraData) {
     final Bytes extraDataBytes = cliqueExtraData.encode();
     // Always trim off final 65 bytes (which maybe zeros)
-    return extraDataBytes.slice(0, extraDataBytes.size() - Signature.BYTES_REQUIRED);
+    return extraDataBytes.slice(0, extraDataBytes.size() - SECPSignature.BYTES_REQUIRED);
   }
 
   private static Bytes serializeHeader(
@@ -92,7 +93,7 @@ private static Bytes serializeHeader(
     out.writeBytes(extraDataSerializer.get());
     out.writeBytes(header.getMixHash());
     out.writeLong(header.getNonce());
-    header.getBaseFee().ifPresent(out::writeLongScalar);
+    header.getBaseFee().ifPresent(out::writeUInt256Scalar);
     out.endList();
     return out.encoded();
   }
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueBlockHeaderFunctions.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueBlockHeaderFunctions.java
index fdff179f6ff..3f70cbec6f3 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueBlockHeaderFunctions.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueBlockHeaderFunctions.java
@@ -14,11 +14,12 @@
  */
 package org.hyperledger.besu.consensus.clique;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
 
+/** The Clique block header functions. */
 public class CliqueBlockHeaderFunctions implements BlockHeaderFunctions {
 
   @Override
@@ -30,4 +31,9 @@ public Hash hash(final BlockHeader header) {
   public CliqueExtraData parseExtraData(final BlockHeader header) {
     return CliqueExtraData.decodeRaw(header);
   }
+
+  @Override
+  public int getCheckPointWindowSize(final BlockHeader blockHeader) {
+    return CliqueExtraData.decode(blockHeader).getValidators().size();
+  }
 }
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueBlockInterface.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueBlockInterface.java
index eeb35d09e2e..75c5998c8ab 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueBlockInterface.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueBlockInterface.java
@@ -15,9 +15,9 @@
 package org.hyperledger.besu.consensus.clique;
 
 import org.hyperledger.besu.consensus.common.BlockInterface;
-import org.hyperledger.besu.consensus.common.ValidatorVote;
-import org.hyperledger.besu.consensus.common.VoteType;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.consensus.common.validator.ValidatorVote;
+import org.hyperledger.besu.consensus.common.validator.VoteType;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
 
@@ -27,11 +27,15 @@
 import com.google.common.collect.ImmutableBiMap;
 import org.apache.tuweni.bytes.Bytes;
 
+/** The Clique block interface. */
 public class CliqueBlockInterface implements BlockInterface {
 
+  /** The constant NO_VOTE_SUBJECT. */
   public static final Address NO_VOTE_SUBJECT = Address.wrap(Bytes.wrap(new byte[Address.SIZE]));
 
+  /** The constant ADD_NONCE. */
   public static final long ADD_NONCE = 0xFFFFFFFFFFFFFFFFL;
+  /** The constant DROP_NONCE. */
   public static final long DROP_NONCE = 0x0L;
 
   private static final ImmutableBiMap<VoteType, Long> voteToValue =
@@ -63,6 +67,13 @@ public Optional<ValidatorVote> extractVoteFromHeader(final BlockHeader header) {
     return Optional.empty();
   }
 
+  /**
+   * Create header builder with vote headers.
+   *
+   * @param builder the builder
+   * @param vote the vote
+   * @return the block header builder
+   */
   public static BlockHeaderBuilder createHeaderBuilderWithVoteHeaders(
       final BlockHeaderBuilder builder, final Optional<ValidatorVote> vote) {
     final BlockHeaderBuilder voteHeaderBuilder = BlockHeaderBuilder.fromBuilder(builder);
@@ -82,6 +93,12 @@ public Collection<Address> validatorsInBlock(final BlockHeader header) {
     return CliqueExtraData.decode(header).getValidators();
   }
 
+  /**
+   * Is valid vote value.
+   *
+   * @param value the value
+   * @return the boolean
+   */
   public static boolean isValidVoteValue(final long value) {
     return voteToValue.values().contains(value);
   }
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueContext.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueContext.java
index a849f0657ff..bccc0c05cd4 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueContext.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueContext.java
@@ -17,8 +17,8 @@
 import org.hyperledger.besu.consensus.common.BlockInterface;
 import org.hyperledger.besu.consensus.common.EpochManager;
 import org.hyperledger.besu.consensus.common.PoaContext;
-import org.hyperledger.besu.consensus.common.VoteProposer;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.ethereum.ConsensusContext;
 
 /**
  * Holds the data which lives "in parallel" with the importation of blocks etc. when using the
@@ -26,30 +26,40 @@
  */
 public class CliqueContext implements PoaContext {
 
-  private final VoteTallyCache voteTallyCache;
-  private final VoteProposer voteProposer;
+  private final ValidatorProvider validatorProvider;
   private final EpochManager epochManager;
   private final BlockInterface blockInterface;
 
+  /**
+   * Instantiates a new Clique context.
+   *
+   * @param validatorProvider the validator provider
+   * @param epochManager the epoch manager
+   * @param blockInterface the block interface
+   */
   public CliqueContext(
-      final VoteTallyCache voteTallyCache,
-      final VoteProposer voteProposer,
+      final ValidatorProvider validatorProvider,
       final EpochManager epochManager,
       final BlockInterface blockInterface) {
-    this.voteTallyCache = voteTallyCache;
-    this.voteProposer = voteProposer;
+    this.validatorProvider = validatorProvider;
     this.epochManager = epochManager;
     this.blockInterface = blockInterface;
   }
 
-  public VoteTallyCache getVoteTallyCache() {
-    return voteTallyCache;
-  }
-
-  public VoteProposer getVoteProposer() {
-    return voteProposer;
+  /**
+   * Gets validator provider.
+   *
+   * @return the validator provider
+   */
+  public ValidatorProvider getValidatorProvider() {
+    return validatorProvider;
   }
 
+  /**
+   * Gets epoch manager.
+   *
+   * @return the epoch manager
+   */
   public EpochManager getEpochManager() {
     return epochManager;
   }
@@ -58,4 +68,9 @@ public EpochManager getEpochManager() {
   public BlockInterface getBlockInterface() {
     return blockInterface;
   }
+
+  @Override
+  public <C extends ConsensusContext> C as(final Class<C> klass) {
+    return klass.cast(this);
+  }
 }
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueDifficultyCalculator.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueDifficultyCalculator.java
index 0be97feb536..a5771238d2a 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueDifficultyCalculator.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueDifficultyCalculator.java
@@ -14,13 +14,14 @@
  */
 package org.hyperledger.besu.consensus.clique;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.mainnet.DifficultyCalculator;
 
 import java.math.BigInteger;
 
+/** The Clique difficulty calculator. */
 public class CliqueDifficultyCalculator implements DifficultyCalculator {
 
   private final Address localAddress;
@@ -28,6 +29,11 @@ public class CliqueDifficultyCalculator implements DifficultyCalculator {
   private final BigInteger IN_TURN_DIFFICULTY = BigInteger.valueOf(2);
   private final BigInteger OUT_OF_TURN_DIFFICULTY = BigInteger.ONE;
 
+  /**
+   * Instantiates a new Clique difficulty calculator.
+   *
+   * @param localAddress the local address
+   */
   public CliqueDifficultyCalculator(final Address localAddress) {
     this.localAddress = localAddress;
   }
@@ -38,7 +44,7 @@ public BigInteger nextDifficulty(
 
     final Address nextProposer =
         CliqueHelpers.getProposerForBlockAfter(
-            parent, context.getConsensusState(CliqueContext.class).getVoteTallyCache());
+            parent, context.getConsensusContext(CliqueContext.class).getValidatorProvider());
     return nextProposer.equals(localAddress) ? IN_TURN_DIFFICULTY : OUT_OF_TURN_DIFFICULTY;
   }
 }
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueExtraData.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueExtraData.java
index 4d0423cff73..bc8d096cf8f 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueExtraData.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueExtraData.java
@@ -17,8 +17,9 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.ParsedExtraData;
 
@@ -28,26 +29,35 @@
 
 import com.google.common.base.Suppliers;
 import com.google.common.collect.Lists;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Represents the data structure stored in the extraData field of the BlockHeader used when
  * operating under an Clique consensus mechanism.
  */
 public class CliqueExtraData implements ParsedExtraData {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(CliqueExtraData.class);
+  /** The constant EXTRA_VANITY_LENGTH. */
   public static final int EXTRA_VANITY_LENGTH = 32;
 
   private final Bytes vanityData;
   private final List<Address> validators;
-  private final Optional<Signature> proposerSeal;
+  private final Optional<SECPSignature> proposerSeal;
   private final Supplier<Address> proposerAddress;
 
+  /**
+   * Instantiates a new Clique extra data.
+   *
+   * @param vanityData the vanity data
+   * @param proposerSeal the proposer seal
+   * @param validators the validators
+   * @param header the header
+   */
   public CliqueExtraData(
       final Bytes vanityData,
-      final Signature proposerSeal,
+      final SECPSignature proposerSeal,
       final List<Address> validators,
       final BlockHeader header) {
 
@@ -63,11 +73,24 @@ public CliqueExtraData(
         Suppliers.memoize(() -> CliqueBlockHashing.recoverProposerAddress(header, this));
   }
 
+  /**
+   * Create without proposer seal.
+   *
+   * @param vanityData the vanity data
+   * @param validators the validators
+   * @return the bytes
+   */
   public static Bytes createWithoutProposerSeal(
       final Bytes vanityData, final List<Address> validators) {
     return CliqueExtraData.encodeUnsealed(vanityData, validators);
   }
 
+  /**
+   * Decode header to get clique extra data.
+   *
+   * @param header the header
+   * @return the clique extra data
+   */
   public static CliqueExtraData decode(final BlockHeader header) {
     final Object inputExtraData = header.getParsedExtraData();
     if (inputExtraData instanceof CliqueExtraData) {
@@ -79,14 +102,21 @@ public static CliqueExtraData decode(final BlockHeader header) {
     return decodeRaw(header);
   }
 
+  /**
+   * Decode raw to get clique extra data.
+   *
+   * @param header the header
+   * @return the clique extra data
+   */
   static CliqueExtraData decodeRaw(final BlockHeader header) {
     final Bytes input = header.getExtraData();
-    if (input.size() < EXTRA_VANITY_LENGTH + Signature.BYTES_REQUIRED) {
+    if (input.size() < EXTRA_VANITY_LENGTH + SECPSignature.BYTES_REQUIRED) {
       throw new IllegalArgumentException(
           "Invalid Bytes supplied - too short to produce a valid Clique Extra Data object.");
     }
 
-    final int validatorByteCount = input.size() - EXTRA_VANITY_LENGTH - Signature.BYTES_REQUIRED;
+    final int validatorByteCount =
+        input.size() - EXTRA_VANITY_LENGTH - SECPSignature.BYTES_REQUIRED;
     if ((validatorByteCount % Address.SIZE) != 0) {
       throw new IllegalArgumentException("Bytes is of invalid size - i.e. contains unused bytes.");
     }
@@ -95,18 +125,25 @@ static CliqueExtraData decodeRaw(final BlockHeader header) {
     final List<Address> validators =
         extractValidators(input.slice(EXTRA_VANITY_LENGTH, validatorByteCount));
 
-    final int proposerSealStartIndex = input.size() - Signature.BYTES_REQUIRED;
-    final Signature proposerSeal = parseProposerSeal(input.slice(proposerSealStartIndex));
+    final int proposerSealStartIndex = input.size() - SECPSignature.BYTES_REQUIRED;
+    final SECPSignature proposerSeal = parseProposerSeal(input.slice(proposerSealStartIndex));
 
     return new CliqueExtraData(vanityData, proposerSeal, validators, header);
   }
 
+  /**
+   * Gets proposer address.
+   *
+   * @return the proposer address
+   */
   public synchronized Address getProposerAddress() {
     return proposerAddress.get();
   }
 
-  private static Signature parseProposerSeal(final Bytes proposerSealRaw) {
-    return proposerSealRaw.isZero() ? null : Signature.decode(proposerSealRaw);
+  private static SECPSignature parseProposerSeal(final Bytes proposerSealRaw) {
+    return proposerSealRaw.isZero()
+        ? null
+        : SignatureAlgorithmFactory.getInstance().decodeSignature(proposerSealRaw);
   }
 
   private static List<Address> extractValidators(final Bytes validatorsRaw) {
@@ -119,10 +156,22 @@ private static List<Address> extractValidators(final Bytes validatorsRaw) {
     return result;
   }
 
+  /**
+   * Encode to bytes.
+   *
+   * @return the bytes
+   */
   public Bytes encode() {
     return encode(vanityData, validators, proposerSeal);
   }
 
+  /**
+   * Encode unsealed to bytes.
+   *
+   * @param vanityData the vanity data
+   * @param validators the validators
+   * @return the bytes
+   */
   public static Bytes encodeUnsealed(final Bytes vanityData, final List<Address> validators) {
     return encode(vanityData, validators, Optional.empty());
   }
@@ -130,28 +179,49 @@ public static Bytes encodeUnsealed(final Bytes vanityData, final List<Address> v
   private static Bytes encode(
       final Bytes vanityData,
       final List<Address> validators,
-      final Optional<Signature> proposerSeal) {
+      final Optional<SECPSignature> proposerSeal) {
     final Bytes validatorData = Bytes.concatenate(validators.toArray(new Bytes[0]));
     return Bytes.concatenate(
         vanityData,
         validatorData,
         proposerSeal
-            .map(Signature::encodedBytes)
-            .orElse(Bytes.wrap(new byte[Signature.BYTES_REQUIRED])));
+            .map(SECPSignature::encodedBytes)
+            .orElse(Bytes.wrap(new byte[SECPSignature.BYTES_REQUIRED])));
   }
 
+  /**
+   * Gets vanity data.
+   *
+   * @return the vanity data
+   */
   public Bytes getVanityData() {
     return vanityData;
   }
 
-  public Optional<Signature> getProposerSeal() {
+  /**
+   * Gets proposer seal.
+   *
+   * @return the proposer seal
+   */
+  public Optional<SECPSignature> getProposerSeal() {
     return proposerSeal;
   }
 
+  /**
+   * Gets validators.
+   *
+   * @return the validators
+   */
   public List<Address> getValidators() {
     return validators;
   }
 
+  /**
+   * Create genesis extra data string.
+   *
+   * @param validators the validators
+   * @return the string
+   */
   public static String createGenesisExtraDataString(final List<Address> validators) {
     return CliqueExtraData.createWithoutProposerSeal(Bytes.wrap(new byte[32]), validators)
         .toString();
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueHelpers.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueHelpers.java
index 26606a2b1e1..73d98792db5 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueHelpers.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueHelpers.java
@@ -15,50 +15,80 @@
 package org.hyperledger.besu.consensus.clique;
 
 import org.hyperledger.besu.consensus.clique.blockcreation.CliqueProposerSelector;
-import org.hyperledger.besu.consensus.common.ValidatorProvider;
-import org.hyperledger.besu.consensus.common.VoteTally;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
 
+import java.util.Collection;
+import java.util.Comparator;
+
+/** The Clique helpers. */
 public class CliqueHelpers {
 
+  /**
+   * Gets proposer of block.
+   *
+   * @param header the header
+   * @return the proposer of block address
+   */
   public static Address getProposerOfBlock(final BlockHeader header) {
     final CliqueExtraData extraData = CliqueExtraData.decode(header);
     return extraData.getProposerAddress();
   }
 
-  public static Address getProposerForBlockAfter(
-      final BlockHeader parent, final VoteTallyCache voteTallyCache) {
-    final CliqueProposerSelector proposerSelector = new CliqueProposerSelector(voteTallyCache);
+  /**
+   * Gets proposer for block after.
+   *
+   * @param parent the parent
+   * @param validatorProvider the validator provider
+   * @return the proposer for block after
+   */
+  static Address getProposerForBlockAfter(
+      final BlockHeader parent, final ValidatorProvider validatorProvider) {
+    final CliqueProposerSelector proposerSelector = new CliqueProposerSelector(validatorProvider);
     return proposerSelector.selectProposerForNextBlock(parent);
   }
 
-  public static boolean isSigner(
+  /**
+   * Is signer.
+   *
+   * @param candidate the candidate
+   * @param protocolContext the protocol context
+   * @param parent the parent
+   * @return the boolean
+   */
+  static boolean isSigner(
       final Address candidate, final ProtocolContext protocolContext, final BlockHeader parent) {
-    final VoteTally validatorProvider =
+    final Collection<Address> validators =
         protocolContext
-            .getConsensusState(CliqueContext.class)
-            .getVoteTallyCache()
-            .getVoteTallyAfterBlock(parent);
-    return validatorProvider.getValidators().contains(candidate);
+            .getConsensusContext(CliqueContext.class)
+            .getValidatorProvider()
+            .getValidatorsAfterBlock(parent);
+    return validators.contains(candidate);
   }
 
+  /**
+   * Address is allowed to produce next block.
+   *
+   * @param candidate the candidate
+   * @param protocolContext the protocol context
+   * @param parent the parent
+   * @return the boolean
+   */
   public static boolean addressIsAllowedToProduceNextBlock(
       final Address candidate, final ProtocolContext protocolContext, final BlockHeader parent) {
-    final VoteTally validatorProvider =
-        protocolContext
-            .getConsensusState(CliqueContext.class)
-            .getVoteTallyCache()
-            .getVoteTallyAfterBlock(parent);
+    final ValidatorProvider validatorProvider =
+        protocolContext.getConsensusContext(CliqueContext.class).getValidatorProvider();
 
     if (!isSigner(candidate, protocolContext, parent)) {
       return false;
     }
 
-    final int minimumUnsignedPastBlocks = minimumBlocksSincePreviousSigning(validatorProvider);
+    final int minimumUnsignedPastBlocks =
+        minimumBlocksSincePreviousSigning(parent, validatorProvider);
 
     final Blockchain blockchain = protocolContext.getBlockchain();
     int unsignedBlockCount = 0;
@@ -85,10 +115,60 @@ public static boolean addressIsAllowedToProduceNextBlock(
     return true;
   }
 
-  private static int minimumBlocksSincePreviousSigning(final ValidatorProvider validatorProvider) {
-    final int validatorCount = validatorProvider.getValidators().size();
+  private static int minimumBlocksSincePreviousSigning(
+      final BlockHeader parent, final ValidatorProvider validatorProvider) {
+    final int validatorCount = validatorProvider.getValidatorsAfterBlock(parent).size();
     // The number of contiguous blocks in which a signer may only sign 1 (as taken from clique spec)
     final int signerLimit = (validatorCount / 2) + 1;
     return signerLimit - 1;
   }
+
+  /**
+   * Install clique block choice rule.
+   *
+   * @param blockchain the blockchain
+   * @param cliqueContext the clique context
+   */
+  public static void installCliqueBlockChoiceRule(
+      final Blockchain blockchain, final CliqueContext cliqueContext) {
+    blockchain.setBlockChoiceRule(
+        // EIP-3436 - https://eips.ethereum.org/EIPS/eip-3436
+        blockchain
+            // 1. Choose the block with the most total difficulty.
+            .getBlockChoiceRule()
+            // 2. Then choose the block with the lowest block number.
+            .thenComparing(Comparator.comparing(ProcessableBlockHeader::getNumber).reversed())
+            // 3. Then choose the block whose validator had the least recent in-turn block
+            // assignment.
+            .thenComparing((BlockHeader header) -> -distanceFromInTurn(header, cliqueContext))
+            // 4. Then choose the block with the lowest hash.
+            .thenComparing(Comparator.comparing(BlockHeader::getHash).reversed()));
+  }
+
+  /**
+   * Distance calculation from step 3 of the forck choice rule in EIP-3436
+   *
+   * <p>` (header_number - validator_index) % validator_count `
+   *
+   * @param header The block header to calculate distance
+   * @param context The clique context, holding validators last validaion
+   * @return the number of blocks from when the validator in that block was most recently "in turn"
+   */
+  static int distanceFromInTurn(final BlockHeader header, final CliqueContext context) {
+    final Address proposer = CliqueHelpers.getProposerOfBlock(header);
+    final Collection<Address> validators =
+        context.getValidatorProvider().getValidatorsAfterBlock(header);
+
+    // validators is an ordered collection, but as it is a tree set the only way to get an "index"
+    // is to walk the tree.
+    int index = 0;
+    for (final Address validator : validators) {
+      if (validator.equals(proposer)) {
+        break;
+      }
+      index++;
+    }
+
+    return (int) (header.getNumber() - index) % validators.size();
+  }
 }
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueMiningTracker.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueMiningTracker.java
index ce54940bc54..d6362122835 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueMiningTracker.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueMiningTracker.java
@@ -14,35 +14,67 @@
  */
 package org.hyperledger.besu.consensus.clique;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 
+/** The Clique mining tracker. */
 public class CliqueMiningTracker {
 
   private final Address localAddress;
   private final ProtocolContext protocolContext;
 
+  /**
+   * Instantiates a new Clique mining tracker.
+   *
+   * @param localAddress the local address
+   * @param protocolContext the protocol context
+   */
   public CliqueMiningTracker(final Address localAddress, final ProtocolContext protocolContext) {
     this.localAddress = localAddress;
     this.protocolContext = protocolContext;
   }
 
+  /**
+   * Is next proposer.
+   *
+   * @param header the header
+   * @return the boolean
+   */
   public boolean isProposerAfter(final BlockHeader header) {
     final Address nextProposer =
         CliqueHelpers.getProposerForBlockAfter(
-            header, protocolContext.getConsensusState(CliqueContext.class).getVoteTallyCache());
+            header,
+            protocolContext.getConsensusContext(CliqueContext.class).getValidatorProvider());
     return localAddress.equals(nextProposer);
   }
 
+  /**
+   * Is signer.
+   *
+   * @param header the header
+   * @return the boolean
+   */
   public boolean isSigner(final BlockHeader header) {
     return CliqueHelpers.isSigner(localAddress, protocolContext, header);
   }
 
+  /**
+   * Can make block next round.
+   *
+   * @param header the header
+   * @return the boolean
+   */
   public boolean canMakeBlockNextRound(final BlockHeader header) {
     return CliqueHelpers.addressIsAllowedToProduceNextBlock(localAddress, protocolContext, header);
   }
 
+  /**
+   * Block created locally.
+   *
+   * @param header the header
+   * @return the boolean
+   */
   public boolean blockCreatedLocally(final BlockHeader header) {
     return CliqueHelpers.getProposerOfBlock(header).equals(localAddress);
   }
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueProtocolSchedule.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueProtocolSchedule.java
index 28b745a9754..64bca913546 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueProtocolSchedule.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/CliqueProtocolSchedule.java
@@ -16,21 +16,23 @@
 
 import org.hyperledger.besu.config.CliqueConfigOptions;
 import org.hyperledger.besu.config.GenesisConfigOptions;
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
 import org.hyperledger.besu.consensus.common.EpochManager;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.ethereum.MainnetBlockValidator;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.Util;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.fees.EIP1559;
 import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockBodyValidator;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockImporter;
+import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSpecs;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpecAdapters;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpecBuilder;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 
 import java.math.BigInteger;
 import java.util.Optional;
@@ -40,11 +42,22 @@ public class CliqueProtocolSchedule {
 
   private static final BigInteger DEFAULT_CHAIN_ID = BigInteger.valueOf(4);
 
+  /**
+   * Create protocol schedule.
+   *
+   * @param config the config
+   * @param nodeKey the node key
+   * @param privacyParameters the privacy parameters
+   * @param isRevertReasonEnabled the is revert reason enabled
+   * @param evmConfiguration the evm configuration
+   * @return the protocol schedule
+   */
   public static ProtocolSchedule create(
       final GenesisConfigOptions config,
       final NodeKey nodeKey,
       final PrivacyParameters privacyParameters,
-      final boolean isRevertReasonEnabled) {
+      final boolean isRevertReasonEnabled,
+      final EvmConfiguration evmConfiguration) {
 
     final CliqueConfigOptions cliqueConfig = config.getCliqueConfigOptions();
 
@@ -56,48 +69,56 @@ public static ProtocolSchedule create(
 
     final EpochManager epochManager = new EpochManager(cliqueConfig.getEpochLength());
 
-    final Optional<EIP1559> eip1559 =
-        ExperimentalEIPs.eip1559Enabled
-            ? Optional.of(new EIP1559(config.getEIP1559BlockNumber().orElse(0)))
-            : Optional.empty();
-
     return new ProtocolScheduleBuilder(
             config,
             DEFAULT_CHAIN_ID,
-            builder ->
-                applyCliqueSpecificModifications(
-                    epochManager,
-                    cliqueConfig.getBlockPeriodSeconds(),
-                    localNodeAddress,
-                    builder,
-                    eip1559),
+            ProtocolSpecAdapters.create(
+                0,
+                builder ->
+                    applyCliqueSpecificModifications(
+                        epochManager,
+                        cliqueConfig.getBlockPeriodSeconds(),
+                        localNodeAddress,
+                        builder)),
             privacyParameters,
             isRevertReasonEnabled,
-            config.isQuorum())
+            evmConfiguration)
         .createProtocolSchedule();
   }
 
+  /**
+   * Create protocol schedule.
+   *
+   * @param config the config
+   * @param nodeKey the node key
+   * @param isRevertReasonEnabled the is revert reason enabled
+   * @param evmConfiguration the evm configuration
+   * @return the protocol schedule
+   */
   public static ProtocolSchedule create(
       final GenesisConfigOptions config,
       final NodeKey nodeKey,
-      final boolean isRevertReasonEnabled) {
-    return create(config, nodeKey, PrivacyParameters.DEFAULT, isRevertReasonEnabled);
+      final boolean isRevertReasonEnabled,
+      final EvmConfiguration evmConfiguration) {
+    return create(
+        config, nodeKey, PrivacyParameters.DEFAULT, isRevertReasonEnabled, evmConfiguration);
   }
 
   private static ProtocolSpecBuilder applyCliqueSpecificModifications(
       final EpochManager epochManager,
       final long secondsBetweenBlocks,
       final Address localNodeAddress,
-      final ProtocolSpecBuilder specBuilder,
-      final Optional<EIP1559> eip1559) {
+      final ProtocolSpecBuilder specBuilder) {
 
     return specBuilder
         .blockHeaderValidatorBuilder(
-            getBlockHeaderValidator(epochManager, secondsBetweenBlocks, eip1559))
+            baseFeeMarket ->
+                getBlockHeaderValidator(epochManager, secondsBetweenBlocks, baseFeeMarket))
         .ommerHeaderValidatorBuilder(
-            getBlockHeaderValidator(epochManager, secondsBetweenBlocks, eip1559))
+            baseFeeMarket ->
+                getBlockHeaderValidator(epochManager, secondsBetweenBlocks, baseFeeMarket))
         .blockBodyValidatorBuilder(MainnetBlockBodyValidator::new)
-        .blockValidatorBuilder(MainnetBlockValidator::new)
+        .blockValidatorBuilder(MainnetProtocolSpecs.blockValidatorBuilder())
         .blockImporterBuilder(MainnetBlockImporter::new)
         .difficultyCalculator(new CliqueDifficultyCalculator(localNodeAddress))
         .blockReward(Wei.ZERO)
@@ -107,10 +128,11 @@ private static ProtocolSpecBuilder applyCliqueSpecificModifications(
   }
 
   private static BlockHeaderValidator.Builder getBlockHeaderValidator(
-      final EpochManager epochManager,
-      final long secondsBetweenBlocks,
-      final Optional<EIP1559> eip1559) {
+      final EpochManager epochManager, final long secondsBetweenBlocks, final FeeMarket feeMarket) {
+    Optional<BaseFeeMarket> baseFeeMarket =
+        Optional.of(feeMarket).filter(FeeMarket::implementsBaseFee).map(BaseFeeMarket.class::cast);
+
     return BlockHeaderValidationRulesetFactory.cliqueBlockHeaderValidator(
-        secondsBetweenBlocks, epochManager, eip1559);
+        secondsBetweenBlocks, epochManager, baseFeeMarket);
   }
 }
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockCreator.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockCreator.java
index de6bafd7991..97bc962e6b7 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockCreator.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockCreator.java
@@ -14,43 +14,60 @@
  */
 package org.hyperledger.besu.consensus.clique.blockcreation;
 
+import static com.google.common.base.Preconditions.checkState;
+
 import org.hyperledger.besu.consensus.clique.CliqueBlockHashing;
 import org.hyperledger.besu.consensus.clique.CliqueBlockInterface;
 import org.hyperledger.besu.consensus.clique.CliqueContext;
 import org.hyperledger.besu.consensus.clique.CliqueExtraData;
 import org.hyperledger.besu.consensus.common.EpochManager;
-import org.hyperledger.besu.consensus.common.ValidatorVote;
-import org.hyperledger.besu.consensus.common.VoteTally;
-import org.hyperledger.besu.crypto.NodeKey;
+import org.hyperledger.besu.consensus.common.validator.ValidatorVote;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.blockcreation.AbstractBlockCreator;
-import org.hyperledger.besu.ethereum.blockcreation.GasLimitCalculator;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
 import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.SealableBlockHeader;
 import org.hyperledger.besu.ethereum.core.Util;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
 
 import java.util.Optional;
+import java.util.function.Supplier;
 
+/** The Clique block creator. */
 public class CliqueBlockCreator extends AbstractBlockCreator {
 
   private final NodeKey nodeKey;
   private final EpochManager epochManager;
 
+  /**
+   * Instantiates a new Clique block creator.
+   *
+   * @param coinbase the coinbase
+   * @param targetGasLimitSupplier the target gas limit supplier
+   * @param extraDataCalculator the extra data calculator
+   * @param pendingTransactions the pending transactions
+   * @param protocolContext the protocol context
+   * @param protocolSchedule the protocol schedule
+   * @param nodeKey the node key
+   * @param minTransactionGasPrice the min transaction gas price
+   * @param minBlockOccupancyRatio the min block occupancy ratio
+   * @param parentHeader the parent header
+   * @param epochManager the epoch manager
+   */
   public CliqueBlockCreator(
       final Address coinbase,
+      final Supplier<Optional<Long>> targetGasLimitSupplier,
       final ExtraDataCalculator extraDataCalculator,
       final PendingTransactions pendingTransactions,
       final ProtocolContext protocolContext,
       final ProtocolSchedule protocolSchedule,
-      final GasLimitCalculator gasLimitCalculator,
       final NodeKey nodeKey,
       final Wei minTransactionGasPrice,
       final Double minBlockOccupancyRatio,
@@ -58,15 +75,16 @@ public CliqueBlockCreator(
       final EpochManager epochManager) {
     super(
         coinbase,
+        __ -> Util.publicKeyToAddress(nodeKey.getPublicKey()),
+        targetGasLimitSupplier,
         extraDataCalculator,
         pendingTransactions,
         protocolContext,
         protocolSchedule,
-        gasLimitCalculator,
         minTransactionGasPrice,
-        Util.publicKeyToAddress(nodeKey.getPublicKey()),
         minBlockOccupancyRatio,
-        parentHeader);
+        parentHeader,
+        Optional.empty());
     this.nodeKey = nodeKey;
     this.epochManager = epochManager;
   }
@@ -105,12 +123,15 @@ private Optional<ValidatorVote> determineCliqueVote(
     if (epochManager.isEpochBlock(sealableBlockHeader.getNumber())) {
       return Optional.empty();
     } else {
-      final CliqueContext cliqueContext = protocolContext.getConsensusState(CliqueContext.class);
-      final VoteTally voteTally =
-          cliqueContext.getVoteTallyCache().getVoteTallyAfterBlock(parentHeader);
+      final CliqueContext cliqueContext = protocolContext.getConsensusContext(CliqueContext.class);
+      checkState(
+          cliqueContext.getValidatorProvider().getVoteProviderAtHead().isPresent(),
+          "Clique requires a vote provider");
       return cliqueContext
-          .getVoteProposer()
-          .getVote(Util.publicKeyToAddress(nodeKey.getPublicKey()), voteTally);
+          .getValidatorProvider()
+          .getVoteProviderAtHead()
+          .get()
+          .getVoteAfterBlock(parentHeader, Util.publicKeyToAddress(nodeKey.getPublicKey()));
     }
   }
 
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockMiner.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockMiner.java
index b794524a164..d9e4c6f38f1 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockMiner.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockMiner.java
@@ -15,21 +15,33 @@
 package org.hyperledger.besu.consensus.clique.blockcreation;
 
 import org.hyperledger.besu.consensus.clique.CliqueHelpers;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.blockcreation.AbstractBlockScheduler;
 import org.hyperledger.besu.ethereum.blockcreation.BlockMiner;
 import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.util.Subscribers;
 
 import java.util.function.Function;
 
+/** The Clique block miner. */
 public class CliqueBlockMiner extends BlockMiner<CliqueBlockCreator> {
 
   private final Address localAddress;
 
+  /**
+   * Instantiates a new Clique block miner.
+   *
+   * @param blockCreator the block creator
+   * @param protocolSchedule the protocol schedule
+   * @param protocolContext the protocol context
+   * @param observers the observers
+   * @param scheduler the scheduler
+   * @param parentHeader the parent header
+   * @param localAddress the local address
+   */
   public CliqueBlockMiner(
       final Function<BlockHeader, CliqueBlockCreator> blockCreator,
       final ProtocolSchedule protocolSchedule,
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockScheduler.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockScheduler.java
index c90913f67a1..aa28226a515 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockScheduler.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockScheduler.java
@@ -14,32 +14,41 @@
  */
 package org.hyperledger.besu.consensus.clique.blockcreation;
 
-import org.hyperledger.besu.consensus.common.ValidatorProvider;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.blockcreation.DefaultBlockScheduler;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 
 import java.time.Clock;
+import java.util.Collection;
 import java.util.Random;
 
 import com.google.common.annotations.VisibleForTesting;
 
+/** The Clique block scheduler. */
 public class CliqueBlockScheduler extends DefaultBlockScheduler {
 
   private final int OUT_OF_TURN_DELAY_MULTIPLIER_MILLIS = 500;
 
-  private final VoteTallyCache voteTallyCache;
+  private final ValidatorProvider validatorProvider;
   private final Address localNodeAddress;
   private final Random r = new Random();
 
+  /**
+   * Instantiates a new Clique block scheduler.
+   *
+   * @param clock the clock
+   * @param validatorProvider the validator provider
+   * @param localNodeAddress the local node address
+   * @param secondsBetweenBlocks the seconds between blocks
+   */
   public CliqueBlockScheduler(
       final Clock clock,
-      final VoteTallyCache voteTallyCache,
+      final ValidatorProvider validatorProvider,
       final Address localNodeAddress,
       final long secondsBetweenBlocks) {
     super(secondsBetweenBlocks, 0L, clock);
-    this.voteTallyCache = voteTallyCache;
+    this.validatorProvider = validatorProvider;
     this.localNodeAddress = localNodeAddress;
   }
 
@@ -56,17 +65,17 @@ public BlockCreationTimeResult getNextTimestamp(final BlockHeader parentHeader)
   }
 
   private int calculateTurnBasedDelay(final BlockHeader parentHeader) {
-    final CliqueProposerSelector proposerSelector = new CliqueProposerSelector(voteTallyCache);
+    final CliqueProposerSelector proposerSelector = new CliqueProposerSelector(validatorProvider);
     final Address nextProposer = proposerSelector.selectProposerForNextBlock(parentHeader);
 
     if (nextProposer.equals(localNodeAddress)) {
       return 0;
     }
-    return calculatorOutOfTurnDelay(voteTallyCache.getVoteTallyAfterBlock(parentHeader));
+    return calculatorOutOfTurnDelay(validatorProvider.getValidatorsAfterBlock(parentHeader));
   }
 
-  private int calculatorOutOfTurnDelay(final ValidatorProvider validators) {
-    final int countSigners = validators.getValidators().size();
+  private int calculatorOutOfTurnDelay(final Collection<Address> validators) {
+    final int countSigners = validators.size();
     final double multiplier = (countSigners / 2d) + 1;
     final int maxDelay = (int) (multiplier * OUT_OF_TURN_DELAY_MULTIPLIER_MILLIS);
     return r.nextInt(maxDelay) + 1;
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMinerExecutor.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMinerExecutor.java
index 2cedf79747d..d9b7ed0e29b 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMinerExecutor.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMinerExecutor.java
@@ -18,15 +18,13 @@
 import org.hyperledger.besu.consensus.clique.CliqueExtraData;
 import org.hyperledger.besu.consensus.common.ConsensusHelpers;
 import org.hyperledger.besu.consensus.common.EpochManager;
-import org.hyperledger.besu.consensus.common.VoteTally;
-import org.hyperledger.besu.crypto.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.blockcreation.AbstractBlockScheduler;
 import org.hyperledger.besu.ethereum.blockcreation.AbstractMinerExecutor;
-import org.hyperledger.besu.ethereum.blockcreation.GasLimitCalculator;
-import org.hyperledger.besu.ethereum.chain.EthHashObserver;
 import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.ethereum.chain.PoWObserver;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.Util;
@@ -34,20 +32,34 @@
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.util.Subscribers;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import org.apache.tuweni.bytes.Bytes;
 
+/** The Clique miner executor. */
 public class CliqueMinerExecutor extends AbstractMinerExecutor<CliqueBlockMiner> {
 
   private final Address localAddress;
   private final NodeKey nodeKey;
   private final EpochManager epochManager;
 
+  /**
+   * Instantiates a new Clique miner executor.
+   *
+   * @param protocolContext the protocol context
+   * @param protocolSchedule the protocol schedule
+   * @param pendingTransactions the pending transactions
+   * @param nodeKey the node key
+   * @param miningParams the mining params
+   * @param blockScheduler the block scheduler
+   * @param epochManager the epoch manager
+   */
   public CliqueMinerExecutor(
       final ProtocolContext protocolContext,
       final ProtocolSchedule protocolSchedule,
@@ -55,15 +67,8 @@ public CliqueMinerExecutor(
       final NodeKey nodeKey,
       final MiningParameters miningParams,
       final AbstractBlockScheduler blockScheduler,
-      final EpochManager epochManager,
-      final GasLimitCalculator gasLimitCalculator) {
-    super(
-        protocolContext,
-        protocolSchedule,
-        pendingTransactions,
-        miningParams,
-        blockScheduler,
-        gasLimitCalculator);
+      final EpochManager epochManager) {
+    super(protocolContext, protocolSchedule, pendingTransactions, miningParams, blockScheduler);
     this.nodeKey = nodeKey;
     this.localAddress = Util.publicKeyToAddress(nodeKey.getPublicKey());
     this.epochManager = epochManager;
@@ -72,17 +77,17 @@ public CliqueMinerExecutor(
   @Override
   public CliqueBlockMiner createMiner(
       final Subscribers<MinedBlockObserver> observers,
-      final Subscribers<EthHashObserver> ethHashObservers,
+      final Subscribers<PoWObserver> ethHashObservers,
       final BlockHeader parentHeader) {
     final Function<BlockHeader, CliqueBlockCreator> blockCreator =
         (header) ->
             new CliqueBlockCreator(
                 localAddress, // TOOD(tmm): This can be removed (used for voting not coinbase).
+                () -> targetGasLimit.map(AtomicLong::longValue),
                 this::calculateExtraData,
                 pendingTransactions,
                 protocolContext,
                 protocolSchedule,
-                gasLimitCalculator,
                 nodeKey,
                 minTransactionGasPrice,
                 minBlockOccupancyRatio,
@@ -104,6 +109,12 @@ public Optional<Address> getCoinbase() {
     return Optional.of(localAddress);
   }
 
+  /**
+   * Calculate extra data bytes.
+   *
+   * @param parentHeader the parent header
+   * @return the bytes
+   */
   @VisibleForTesting
   Bytes calculateExtraData(final BlockHeader parentHeader) {
     final List<Address> validators = Lists.newArrayList();
@@ -112,12 +123,13 @@ Bytes calculateExtraData(final BlockHeader parentHeader) {
         ConsensusHelpers.zeroLeftPad(extraData, CliqueExtraData.EXTRA_VANITY_LENGTH);
     // Building ON TOP of canonical head, if the next block is epoch, include validators.
     if (epochManager.isEpochBlock(parentHeader.getNumber() + 1)) {
-      final VoteTally voteTally =
+
+      final Collection<Address> storedValidators =
           protocolContext
-              .getConsensusState(CliqueContext.class)
-              .getVoteTallyCache()
-              .getVoteTallyAfterBlock(parentHeader);
-      validators.addAll(voteTally.getValidators());
+              .getConsensusContext(CliqueContext.class)
+              .getValidatorProvider()
+              .getValidatorsAfterBlock(parentHeader);
+      validators.addAll(storedValidators);
     }
 
     return CliqueExtraData.encodeUnsealed(vanityDataToInsert, validators);
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMiningCoordinator.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMiningCoordinator.java
index de37855eeb5..8320cb242ad 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMiningCoordinator.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMiningCoordinator.java
@@ -14,22 +14,30 @@
  */
 package org.hyperledger.besu.consensus.clique.blockcreation;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
-
 import org.hyperledger.besu.consensus.clique.CliqueMiningTracker;
 import org.hyperledger.besu.ethereum.blockcreation.AbstractMiningCoordinator;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
 
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The type Clique mining coordinator. */
 public class CliqueMiningCoordinator extends AbstractMiningCoordinator<CliqueBlockMiner> {
 
-  private static final Logger LOG = getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(CliqueMiningCoordinator.class);
 
   private final CliqueMiningTracker miningTracker;
 
+  /**
+   * Instantiates a new Clique mining coordinator.
+   *
+   * @param blockchain the blockchain
+   * @param executor the executor
+   * @param syncState the sync state
+   * @param miningTracker the mining tracker
+   */
   public CliqueMiningCoordinator(
       final Blockchain blockchain,
       final CliqueMinerExecutor executor,
@@ -53,6 +61,11 @@ public void onPauseMining() {
     }
   }
 
+  /**
+   * Is signer.
+   *
+   * @return the boolean
+   */
   public boolean isSigner() {
     return miningTracker.isSigner(blockchain.getChainHeadHeader());
   }
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueProposerSelector.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueProposerSelector.java
index 583a8d3f34b..a6ba67c46d6 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueProposerSelector.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueProposerSelector.java
@@ -16,9 +16,8 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.hyperledger.besu.consensus.common.VoteTally;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 
 import java.util.ArrayList;
@@ -32,11 +31,16 @@
  */
 public class CliqueProposerSelector {
 
-  private final VoteTallyCache voteTallyCache;
+  private final ValidatorProvider validatorProvider;
 
-  public CliqueProposerSelector(final VoteTallyCache voteTallyCache) {
-    checkNotNull(voteTallyCache);
-    this.voteTallyCache = voteTallyCache;
+  /**
+   * Instantiates a new Clique proposer selector.
+   *
+   * @param validatorProvider the validator provider
+   */
+  public CliqueProposerSelector(final ValidatorProvider validatorProvider) {
+    checkNotNull(validatorProvider);
+    this.validatorProvider = validatorProvider;
   }
 
   /**
@@ -46,9 +50,8 @@ public CliqueProposerSelector(final VoteTallyCache voteTallyCache) {
    * @return The address of the node which is to propose a block for the provided Round.
    */
   public Address selectProposerForNextBlock(final BlockHeader parentHeader) {
-
-    final VoteTally parentVoteTally = voteTallyCache.getVoteTallyAfterBlock(parentHeader);
-    final List<Address> validatorSet = new ArrayList<>(parentVoteTally.getValidators());
+    final List<Address> validatorSet =
+        new ArrayList<>(validatorProvider.getValidatorsAfterBlock(parentHeader));
 
     final long nextBlockNumber = parentHeader.getNumber() + 1L;
     final int indexIntoValidators = (int) (nextBlockNumber % validatorSet.size());
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueDifficultyValidationRule.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueDifficultyValidationRule.java
index 3473c3e48a3..d4ff394e520 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueDifficultyValidationRule.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueDifficultyValidationRule.java
@@ -16,19 +16,20 @@
 
 import org.hyperledger.besu.consensus.clique.CliqueDifficultyCalculator;
 import org.hyperledger.besu.consensus.clique.CliqueHelpers;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule;
 
 import java.math.BigInteger;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Clique difficulty validation rule. */
 public class CliqueDifficultyValidationRule implements AttachedBlockHeaderValidationRule {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(CliqueDifficultyValidationRule.class);
 
   @Override
   public boolean validate(
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueExtraDataValidationRule.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueExtraDataValidationRule.java
index 1dde4df723e..e92daa395d5 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueExtraDataValidationRule.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueExtraDataValidationRule.java
@@ -17,9 +17,8 @@
 import org.hyperledger.besu.consensus.clique.CliqueContext;
 import org.hyperledger.besu.consensus.clique.CliqueExtraData;
 import org.hyperledger.besu.consensus.common.EpochManager;
-import org.hyperledger.besu.consensus.common.VoteTally;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule;
 import org.hyperledger.besu.ethereum.rlp.RLPException;
@@ -27,15 +26,21 @@
 import java.util.Collection;
 
 import com.google.common.collect.Iterables;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Clique extra data validation rule. */
 public class CliqueExtraDataValidationRule implements AttachedBlockHeaderValidationRule {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(CliqueExtraDataValidationRule.class);
 
   private final EpochManager epochManager;
 
+  /**
+   * Instantiates a new Clique extra data validation rule.
+   *
+   * @param epochManager the epoch manager
+   */
   public CliqueExtraDataValidationRule(final EpochManager epochManager) {
     this.epochManager = epochManager;
   }
@@ -56,13 +61,12 @@ public CliqueExtraDataValidationRule(final EpochManager epochManager) {
   public boolean validate(
       final BlockHeader header, final BlockHeader parent, final ProtocolContext protocolContext) {
     try {
-      final VoteTally validatorProvider =
+      final Collection<Address> storedValidators =
           protocolContext
-              .getConsensusState(CliqueContext.class)
-              .getVoteTallyCache()
-              .getVoteTallyAfterBlock(parent);
+              .getConsensusContext(CliqueContext.class)
+              .getValidatorProvider()
+              .getValidatorsAfterBlock(parent);
 
-      final Collection<Address> storedValidators = validatorProvider.getValidators();
       return extraDataIsValid(storedValidators, header);
 
     } catch (final RLPException ex) {
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CoinbaseHeaderValidationRule.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CoinbaseHeaderValidationRule.java
index e85d45e78e1..da77532fd68 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CoinbaseHeaderValidationRule.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CoinbaseHeaderValidationRule.java
@@ -19,15 +19,21 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Coinbase header validation rule. */
 public class CoinbaseHeaderValidationRule implements DetachedBlockHeaderValidationRule {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(CoinbaseHeaderValidationRule.class);
 
   private final EpochManager epochManager;
 
+  /**
+   * Instantiates a new Coinbase header validation rule.
+   *
+   * @param epochManager the epoch manager
+   */
   public CoinbaseHeaderValidationRule(final EpochManager epochManager) {
     this.epochManager = epochManager;
   }
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/SignerRateLimitValidationRule.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/SignerRateLimitValidationRule.java
index 48ebc42cd37..1d2d53d7e1b 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/SignerRateLimitValidationRule.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/SignerRateLimitValidationRule.java
@@ -15,17 +15,18 @@
 package org.hyperledger.besu.consensus.clique.headervalidationrules;
 
 import org.hyperledger.besu.consensus.clique.CliqueHelpers;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Signer rate limit validation rule. */
 public class SignerRateLimitValidationRule implements AttachedBlockHeaderValidationRule {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(SignerRateLimitValidationRule.class);
 
   @Override
   public boolean validate(
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/VoteValidationRule.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/VoteValidationRule.java
index 2f8362edaa0..4293e5dcf9e 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/VoteValidationRule.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/headervalidationrules/VoteValidationRule.java
@@ -18,12 +18,13 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Vote validation rule. */
 public class VoteValidationRule implements DetachedBlockHeaderValidationRule {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(VoteValidationRule.class);
 
   /**
    * Responsible for ensuring the nonce is either auth or drop.
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/CliqueJsonRpcMethods.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/CliqueJsonRpcMethods.java
index ba5fa3fc0c6..1f929e77e7c 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/CliqueJsonRpcMethods.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/CliqueJsonRpcMethods.java
@@ -23,11 +23,10 @@
 import org.hyperledger.besu.consensus.clique.jsonrpc.methods.Discard;
 import org.hyperledger.besu.consensus.clique.jsonrpc.methods.Propose;
 import org.hyperledger.besu.consensus.common.EpochManager;
-import org.hyperledger.besu.consensus.common.VoteProposer;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
-import org.hyperledger.besu.consensus.common.VoteTallyUpdater;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.common.validator.blockbased.BlockValidatorProvider;
 import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.methods.ApiGroupJsonRpcMethods;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
@@ -36,16 +35,22 @@
 
 import java.util.Map;
 
+/** The Clique json rpc methods. */
 public class CliqueJsonRpcMethods extends ApiGroupJsonRpcMethods {
   private final ProtocolContext context;
 
+  /**
+   * Instantiates a new Clique json rpc methods.
+   *
+   * @param context the context
+   */
   public CliqueJsonRpcMethods(final ProtocolContext context) {
     this.context = context;
   }
 
   @Override
-  protected RpcApi getApiGroup() {
-    return CliqueRpcApis.CLIQUE;
+  protected String getApiGroup() {
+    return RpcApis.CLIQUE.name();
   }
 
   @Override
@@ -54,28 +59,29 @@ protected Map<String, JsonRpcMethod> create() {
     final WorldStateArchive worldStateArchive = context.getWorldStateArchive();
     final BlockchainQueries blockchainQueries =
         new BlockchainQueries(blockchain, worldStateArchive);
-    final VoteProposer voteProposer =
-        context.getConsensusState(CliqueContext.class).getVoteProposer();
+    final ValidatorProvider validatorProvider =
+        context.getConsensusContext(CliqueContext.class).getValidatorProvider();
 
     // Must create our own voteTallyCache as using this would pollute the main voteTallyCache
-    final VoteTallyCache voteTallyCache = createVoteTallyCache(context, blockchain);
+    final ValidatorProvider readOnlyValidatorProvider =
+        createValidatorProvider(context, blockchain);
 
     return mapOf(
-        new CliqueGetSigners(blockchainQueries, voteTallyCache),
-        new CliqueGetSignersAtHash(blockchainQueries, voteTallyCache),
-        new Propose(voteProposer),
-        new Discard(voteProposer),
-        new CliqueProposals(voteProposer),
-        new CliqueGetSignerMetrics(voteTallyCache, new CliqueBlockInterface(), blockchainQueries));
+        new CliqueGetSigners(blockchainQueries, readOnlyValidatorProvider),
+        new CliqueGetSignersAtHash(blockchainQueries, readOnlyValidatorProvider),
+        new Propose(validatorProvider),
+        new Discard(validatorProvider),
+        new CliqueProposals(validatorProvider),
+        new CliqueGetSignerMetrics(
+            readOnlyValidatorProvider, new CliqueBlockInterface(), blockchainQueries));
   }
 
-  private VoteTallyCache createVoteTallyCache(
+  private ValidatorProvider createValidatorProvider(
       final ProtocolContext context, final MutableBlockchain blockchain) {
     final EpochManager epochManager =
-        context.getConsensusState(CliqueContext.class).getEpochManager();
+        context.getConsensusContext(CliqueContext.class).getEpochManager();
     final CliqueBlockInterface cliqueBlockInterface = new CliqueBlockInterface();
-    final VoteTallyUpdater voteTallyUpdater =
-        new VoteTallyUpdater(epochManager, cliqueBlockInterface);
-    return new VoteTallyCache(blockchain, voteTallyUpdater, epochManager, cliqueBlockInterface);
+    return BlockValidatorProvider.nonForkingValidatorProvider(
+        blockchain, epochManager, cliqueBlockInterface);
   }
 }
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/CliqueRpcApis.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/CliqueRpcApis.java
deleted file mode 100644
index e9b58bf9331..00000000000
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/CliqueRpcApis.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.clique.jsonrpc;
-
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
-
-import java.util.Optional;
-
-public class CliqueRpcApis {
-  public static final RpcApi CLIQUE = new RpcApi("CLIQUE");
-
-  public static final Optional<RpcApi> valueOf(final String name) {
-    if (name.equals(CLIQUE.getCliValue())) {
-      return Optional.of(CLIQUE);
-    } else {
-      return Optional.empty();
-    }
-  }
-}
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignerMetrics.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignerMetrics.java
index 2cc51ba0027..514ab0a4e60 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignerMetrics.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignerMetrics.java
@@ -15,20 +15,28 @@
 package org.hyperledger.besu.consensus.clique.jsonrpc.methods;
 
 import org.hyperledger.besu.consensus.common.BlockInterface;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
 import org.hyperledger.besu.consensus.common.jsonrpc.AbstractGetSignerMetricsMethod;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 
+/** The Clique get signer metrics. */
 public class CliqueGetSignerMetrics extends AbstractGetSignerMetricsMethod
     implements JsonRpcMethod {
 
+  /**
+   * Instantiates a new Clique get signer metrics.
+   *
+   * @param validatorProvider the validator provider
+   * @param blockInterface the block interface
+   * @param blockchainQueries the blockchain queries
+   */
   public CliqueGetSignerMetrics(
-      final VoteTallyCache voteTallyCache,
+      final ValidatorProvider validatorProvider,
       final BlockInterface blockInterface,
       final BlockchainQueries blockchainQueries) {
-    super(voteTallyCache, blockInterface, blockchainQueries);
+    super(validatorProvider, blockInterface, blockchainQueries);
   }
 
   @Override
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSigners.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSigners.java
index 1fbf4d8dedd..507fe760c16 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSigners.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSigners.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.consensus.clique.jsonrpc.methods;
 
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
@@ -31,14 +31,21 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+/** The Clique get signers. */
 public class CliqueGetSigners implements JsonRpcMethod {
   private final BlockchainQueries blockchainQueries;
-  private final VoteTallyCache voteTallyCache;
+  private final ValidatorProvider validatorProvider;
 
+  /**
+   * Instantiates a new Clique get signers.
+   *
+   * @param blockchainQueries the blockchain queries
+   * @param validatorProvider the validator provider
+   */
   public CliqueGetSigners(
-      final BlockchainQueries blockchainQueries, final VoteTallyCache voteTallyCache) {
+      final BlockchainQueries blockchainQueries, final ValidatorProvider validatorProvider) {
     this.blockchainQueries = blockchainQueries;
-    this.voteTallyCache = voteTallyCache;
+    this.validatorProvider = validatorProvider;
   }
 
   @Override
@@ -50,7 +57,7 @@ public String getName() {
   public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     final Optional<BlockHeader> blockHeader = determineBlockHeader(requestContext);
     return blockHeader
-        .map(bh -> voteTallyCache.getVoteTallyAfterBlock(bh).getValidators())
+        .map(validatorProvider::getValidatorsAfterBlock)
         .map(addresses -> addresses.stream().map(Objects::toString).collect(Collectors.toList()))
         .<JsonRpcResponse>map(
             addresses -> new JsonRpcSuccessResponse(requestContext.getRequest().getId(), addresses))
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHash.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHash.java
index e45daa69177..3d02f4213bc 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHash.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHash.java
@@ -14,7 +14,8 @@
  */
 package org.hyperledger.besu.consensus.clique.jsonrpc.methods;
 
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
@@ -25,20 +26,26 @@
 import org.hyperledger.besu.ethereum.api.query.BlockWithMetadata;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+/** The Clique get signers at hash. */
 public class CliqueGetSignersAtHash implements JsonRpcMethod {
   private final BlockchainQueries blockchainQueries;
-  private final VoteTallyCache voteTallyCache;
+  private final ValidatorProvider validatorProvider;
 
+  /**
+   * Instantiates a new Clique get signers at hash.
+   *
+   * @param blockchainQueries the blockchain queries
+   * @param validatorProvider the validator provider
+   */
   public CliqueGetSignersAtHash(
-      final BlockchainQueries blockchainQueries, final VoteTallyCache voteTallyCache) {
+      final BlockchainQueries blockchainQueries, final ValidatorProvider validatorProvider) {
     this.blockchainQueries = blockchainQueries;
-    this.voteTallyCache = voteTallyCache;
+    this.validatorProvider = validatorProvider;
   }
 
   @Override
@@ -50,7 +57,7 @@ public String getName() {
   public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     final Optional<BlockHeader> blockHeader = determineBlockHeader(requestContext);
     return blockHeader
-        .map(bh -> voteTallyCache.getVoteTallyAfterBlock(bh).getValidators())
+        .map(validatorProvider::getValidatorsAfterBlock)
         .map(addresses -> addresses.stream().map(Objects::toString).collect(Collectors.toList()))
         .<JsonRpcResponse>map(
             addresses -> new JsonRpcSuccessResponse(requestContext.getRequest().getId(), addresses))
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueProposals.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueProposals.java
index 8661c4dff46..02a266c4364 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueProposals.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueProposals.java
@@ -14,15 +14,21 @@
  */
 package org.hyperledger.besu.consensus.clique.jsonrpc.methods;
 
-import org.hyperledger.besu.consensus.common.VoteProposer;
 import org.hyperledger.besu.consensus.common.jsonrpc.AbstractVoteProposerMethod;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 
+/** The Clique proposals. */
 public class CliqueProposals extends AbstractVoteProposerMethod implements JsonRpcMethod {
 
-  public CliqueProposals(final VoteProposer voteProposer) {
-    super(voteProposer);
+  /**
+   * Instantiates a new Clique proposals.
+   *
+   * @param validatorProvider the validator provider
+   */
+  public CliqueProposals(final ValidatorProvider validatorProvider) {
+    super(validatorProvider);
   }
 
   @Override
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/Discard.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/Discard.java
index cb5d7db63b1..4fb3af6cd46 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/Discard.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/Discard.java
@@ -14,19 +14,27 @@
  */
 package org.hyperledger.besu.consensus.clique.jsonrpc.methods;
 
-import org.hyperledger.besu.consensus.common.VoteProposer;
+import static com.google.common.base.Preconditions.checkState;
+
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.core.Address;
 
+/** The Discard Json RPC method. */
 public class Discard implements JsonRpcMethod {
-  private final VoteProposer proposer;
+  private final ValidatorProvider validatorProvider;
 
-  public Discard(final VoteProposer proposer) {
-    this.proposer = proposer;
+  /**
+   * Instantiates a new Discard.
+   *
+   * @param validatorProvider the validator provider
+   */
+  public Discard(final ValidatorProvider validatorProvider) {
+    this.validatorProvider = validatorProvider;
   }
 
   @Override
@@ -36,8 +44,10 @@ public String getName() {
 
   @Override
   public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
+    checkState(
+        validatorProvider.getVoteProviderAtHead().isPresent(), "Clique requires a vote provider");
     final Address address = requestContext.getRequiredParameter(0, Address.class);
-    proposer.discard(address);
+    validatorProvider.getVoteProviderAtHead().get().discardVote(address);
     return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), true);
   }
 }
diff --git a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/Propose.java b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/Propose.java
index d8fa7ee7d89..2d68dd9c6e1 100644
--- a/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/Propose.java
+++ b/consensus/clique/src/main/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/Propose.java
@@ -14,8 +14,11 @@
  */
 package org.hyperledger.besu.consensus.clique.jsonrpc.methods;
 
+import static com.google.common.base.Preconditions.checkState;
+
 import org.hyperledger.besu.consensus.clique.CliqueBlockInterface;
-import org.hyperledger.besu.consensus.common.VoteProposer;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
@@ -23,13 +26,18 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.core.Address;
 
+/** The Propose Json Rpc method. */
 public class Propose implements JsonRpcMethod {
-  private final VoteProposer proposer;
+  private final ValidatorProvider validatorProvider;
 
-  public Propose(final VoteProposer proposer) {
-    this.proposer = proposer;
+  /**
+   * Instantiates a new Propose.
+   *
+   * @param validatorProvider the validator provider
+   */
+  public Propose(final ValidatorProvider validatorProvider) {
+    this.validatorProvider = validatorProvider;
   }
 
   @Override
@@ -39,6 +47,8 @@ public String getName() {
 
   @Override
   public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
+    checkState(
+        validatorProvider.getVoteProviderAtHead().isPresent(), "Clique requires a vote provider");
     final Address address = requestContext.getRequiredParameter(0, Address.class);
     final Boolean auth = requestContext.getRequiredParameter(1, Boolean.class);
     if (address.equals(CliqueBlockInterface.NO_VOTE_SUBJECT)) {
@@ -47,9 +57,9 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     }
 
     if (auth) {
-      proposer.auth(address);
+      validatorProvider.getVoteProviderAtHead().get().authVote(address);
     } else {
-      proposer.drop(address);
+      validatorProvider.getVoteProviderAtHead().get().dropVote(address);
     }
     // Return true regardless, the vote is always recorded
     return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), true);
diff --git a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueBlockChoiceTests.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueBlockChoiceTests.java
new file mode 100644
index 00000000000..3b8a7e15379
--- /dev/null
+++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueBlockChoiceTests.java
@@ -0,0 +1,211 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.consensus.clique;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.consensus.clique.CliqueHelpers.distanceFromInTurn;
+import static org.hyperledger.besu.consensus.clique.CliqueHelpers.installCliqueBlockChoiceRule;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.hyperledger.besu.ethereum.core.Util.publicKeyToAddress;
+
+import org.hyperledger.besu.consensus.common.BlockInterface;
+import org.hyperledger.besu.consensus.common.EpochManager;
+import org.hyperledger.besu.consensus.common.validator.blockbased.BlockValidatorProvider;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import com.google.common.collect.Lists;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class CliqueBlockChoiceTests {
+  private List<KeyPair> keyPairs;
+  private List<Address> addresses;
+  private BlockHeaderTestFixture headerBuilder;
+  private MutableBlockchain blockchain;
+  private CliqueContext cliqueContext;
+
+  private Block createEmptyBlock(final KeyPair blockSigner) {
+    final BlockHeader header =
+        TestHelpers.createCliqueSignedBlockHeader(headerBuilder, blockSigner, addresses);
+    return new Block(header, new BlockBody(Lists.newArrayList(), Lists.newArrayList()));
+  }
+
+  @BeforeEach
+  public void setup() {
+    keyPairs =
+        IntStream.range(0, 8)
+            .mapToObj(i -> SignatureAlgorithmFactory.getInstance().generateKeyPair())
+            .sorted(Comparator.comparing(kp -> publicKeyToAddress(kp.getPublicKey())))
+            .collect(Collectors.toList());
+    addresses =
+        keyPairs.stream()
+            .map(kp -> publicKeyToAddress(kp.getPublicKey()))
+            .collect(Collectors.toList());
+    headerBuilder = new BlockHeaderTestFixture();
+    final Block genesisBlock = createEmptyBlock(keyPairs.get(0));
+    blockchain = createInMemoryBlockchain(genesisBlock, new CliqueBlockHeaderFunctions());
+    final EpochManager epochManager = new EpochManager(30_000);
+    final BlockInterface blockInterface = new CliqueBlockInterface();
+
+    cliqueContext =
+        new CliqueContext(
+            BlockValidatorProvider.nonForkingValidatorProvider(
+                blockchain, epochManager, blockInterface),
+            epochManager,
+            blockInterface);
+
+    installCliqueBlockChoiceRule(blockchain, cliqueContext);
+    for (int i = 1; i < keyPairs.size(); i++) {
+      headerBuilder.number(i);
+      headerBuilder.parentHash(blockchain.getChainHeadHash());
+      blockchain.appendBlock(createEmptyBlock(keyPairs.get(i)), List.of());
+    }
+  }
+
+  @Test
+  public void highestDifficultyPreferred() {
+    headerBuilder.number(8);
+
+    headerBuilder.difficulty(Difficulty.of(2));
+    final Block betterBlock = createEmptyBlock(keyPairs.get(0));
+    final BlockHeader betterHeader = betterBlock.getHeader();
+
+    headerBuilder.difficulty(Difficulty.of(1));
+    final Block worseBlock = createEmptyBlock(keyPairs.get(1));
+    final BlockHeader worseHeader = worseBlock.getHeader();
+
+    // No prior fork choices to verify are equal
+
+    final Comparator<BlockHeader> blockChoiceRule = blockchain.getBlockChoiceRule();
+    assertThat(blockChoiceRule.compare(worseHeader, betterHeader)).isNegative();
+    assertThat(blockChoiceRule.compare(betterHeader, worseHeader)).isPositive();
+  }
+
+  @Test
+  public void shorterChainIsPreferred() {
+    headerBuilder.number(8);
+
+    headerBuilder.difficulty(Difficulty.of(2));
+    final Block betterBlock = createEmptyBlock(keyPairs.get(0));
+    final BlockHeader betterHeader = betterBlock.getHeader();
+
+    headerBuilder.difficulty(Difficulty.of(1));
+    final Block hiddenBlock = createEmptyBlock(keyPairs.get(1));
+    blockchain.appendBlock(hiddenBlock, List.of());
+
+    headerBuilder.number(9);
+    headerBuilder.difficulty(Difficulty.of(1));
+    headerBuilder.parentHash(hiddenBlock.getHash());
+    final Block worseBlock = createEmptyBlock(keyPairs.get(2));
+    final BlockHeader worseHeader = worseBlock.getHeader();
+
+    final Comparator<BlockHeader> blockChoiceRule = blockchain.getBlockChoiceRule();
+
+    // verify total difficulty is equal
+    assertThat(blockchain.getTotalDifficultyByHash(worseHeader.getHash()))
+        .isEqualTo(blockchain.getTotalDifficultyByHash(betterHeader.getHash()));
+
+    assertThat(blockChoiceRule.compare(worseHeader, betterHeader)).isNegative();
+    assertThat(blockChoiceRule.compare(betterHeader, worseHeader)).isPositive();
+  }
+
+  @Test
+  public void leastRecentInTurnIsPreferred() {
+    headerBuilder.number(8);
+
+    headerBuilder.difficulty(Difficulty.of(1));
+    final Block betterBlock = createEmptyBlock(keyPairs.get(3));
+    final BlockHeader betterHeader = betterBlock.getHeader();
+
+    headerBuilder.difficulty(Difficulty.of(1));
+    final Block worseBlock = createEmptyBlock(keyPairs.get(2));
+    final BlockHeader worseHeader = worseBlock.getHeader();
+
+    // verify total difficulty is equal
+    assertThat(blockchain.getTotalDifficultyByHash(worseHeader.getHash()))
+        .isEqualTo(blockchain.getTotalDifficultyByHash(betterHeader.getHash()));
+    // verify chains are same length
+    assertThat(worseHeader.getNumber()).isEqualTo(betterHeader.getNumber());
+
+    final Comparator<BlockHeader> blockChoiceRule = blockchain.getBlockChoiceRule();
+    assertThat(blockChoiceRule.compare(worseHeader, betterHeader)).isNegative();
+    assertThat(blockChoiceRule.compare(betterHeader, worseHeader)).isPositive();
+  }
+
+  @Test
+  public void lowestHashIsPreferred() {
+    headerBuilder.number(8);
+
+    headerBuilder.difficulty(Difficulty.of(1));
+    headerBuilder.timestamp(System.currentTimeMillis() / 1000);
+    final Block firstBlock = createEmptyBlock(keyPairs.get(1));
+
+    headerBuilder.difficulty(Difficulty.of(1));
+    headerBuilder.timestamp(firstBlock.getHeader().getTimestamp() + 1);
+    final Block secondBlock = createEmptyBlock(keyPairs.get(1));
+
+    final BlockHeader betterHeader;
+    final BlockHeader worseHeader;
+    if (firstBlock.getHash().compareTo(secondBlock.getHash()) > 0) {
+      worseHeader = firstBlock.getHeader();
+      betterHeader = secondBlock.getHeader();
+    } else {
+      worseHeader = secondBlock.getHeader();
+      betterHeader = firstBlock.getHeader();
+    }
+
+    // verify total difficulty is equal
+    assertThat(blockchain.getTotalDifficultyByHash(worseHeader.getHash()))
+        .isEqualTo(blockchain.getTotalDifficultyByHash(betterHeader.getHash()));
+    // verify chains are the same length
+    assertThat(worseHeader.getNumber()).isEqualTo(betterHeader.getNumber());
+    // verify signer is the same distance to in-turn
+    assertThat(distanceFromInTurn(worseHeader, cliqueContext))
+        .isEqualTo(distanceFromInTurn(betterHeader, cliqueContext));
+
+    final Comparator<BlockHeader> blockChoiceRule = blockchain.getBlockChoiceRule();
+    assertThat(blockChoiceRule.compare(worseHeader, betterHeader)).isNegative();
+    assertThat(blockChoiceRule.compare(betterHeader, worseHeader)).isPositive();
+  }
+
+  @Test
+  public void identicalHeadersTie() {
+    headerBuilder.number(8);
+
+    headerBuilder.difficulty(Difficulty.of(1));
+    final Block block = createEmptyBlock(keyPairs.get(1));
+
+    final Comparator<BlockHeader> blockChoiceRule = blockchain.getBlockChoiceRule();
+
+    // the only way to get a tie is to test the same block header
+    //noinspection EqualsWithItself
+    assertThat(blockChoiceRule.compare(block.getHeader(), block.getHeader())).isZero();
+  }
+}
diff --git a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueBlockHashingTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueBlockHashingTest.java
index 3676e0c8207..750d767b5a5 100644
--- a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueBlockHashingTest.java
+++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueBlockHashingTest.java
@@ -16,19 +16,19 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.LogsBloomFilter;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
 
 import java.util.Arrays;
 import java.util.List;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class CliqueBlockHashingTest {
 
@@ -43,7 +43,7 @@ public class CliqueBlockHashingTest {
   private static final Hash KNOWN_BLOCK_HASH =
       Hash.fromHexString("0x8b27a29300811af926039b90288d3d384dcb55931049c17c4f762e45c116776e");
 
-  @Before
+  @BeforeEach
   public void setup() {
     expectedHeader = createKnownHeaderFromCapturedData();
   }
diff --git a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueBlockInterfaceTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueBlockInterfaceTest.java
index 7d510f78310..5a781612803 100644
--- a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueBlockInterfaceTest.java
+++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueBlockInterfaceTest.java
@@ -16,12 +16,13 @@
 
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.consensus.common.VoteType.ADD;
-import static org.hyperledger.besu.consensus.common.VoteType.DROP;
+import static org.hyperledger.besu.consensus.common.validator.VoteType.ADD;
+import static org.hyperledger.besu.consensus.common.validator.VoteType.DROP;
 
-import org.hyperledger.besu.consensus.common.ValidatorVote;
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.consensus.common.validator.ValidatorVote;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
@@ -32,11 +33,12 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CliqueBlockInterfaceTest {
 
-  private static final KeyPair proposerKeys = KeyPair.generate();
+  private static final KeyPair proposerKeys =
+      SignatureAlgorithmFactory.getInstance().generateKeyPair();
   private static final Address proposerAddress =
       Util.publicKeyToAddress(proposerKeys.getPublicKey());
   private static final List<Address> validatorList = singletonList(proposerAddress);
diff --git a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueDifficultyCalculatorTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueDifficultyCalculatorTest.java
index edbc7d22b27..6f9c5c53e0e 100644
--- a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueDifficultyCalculatorTest.java
+++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueDifficultyCalculatorTest.java
@@ -19,12 +19,11 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.consensus.common.VoteProposer;
-import org.hyperledger.besu.consensus.common.VoteTally;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
@@ -32,14 +31,15 @@
 
 import java.math.BigInteger;
 import java.util.List;
+import java.util.Optional;
 
 import com.google.common.collect.Lists;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class CliqueDifficultyCalculatorTest {
 
-  private final KeyPair proposerKeyPair = KeyPair.generate();
+  private final KeyPair proposerKeyPair = SignatureAlgorithmFactory.getInstance().generateKeyPair();
   private Address localAddr;
 
   private final List<Address> validatorList = Lists.newArrayList();
@@ -47,20 +47,18 @@ public class CliqueDifficultyCalculatorTest {
   private BlockHeaderTestFixture blockHeaderBuilder;
   private final CliqueBlockInterface blockInterface = new CliqueBlockInterface();
 
-  @Before
+  @BeforeEach
   public void setup() {
     localAddr = Util.publicKeyToAddress(proposerKeyPair.getPublicKey());
 
     validatorList.add(localAddr);
     validatorList.add(AddressHelpers.calculateAddressWithRespectTo(localAddr, 1));
 
-    final VoteTallyCache voteTallyCache = mock(VoteTallyCache.class);
-    when(voteTallyCache.getVoteTallyAfterBlock(any())).thenReturn(new VoteTally(validatorList));
-    final VoteProposer voteProposer = new VoteProposer();
+    final ValidatorProvider validatorProvider = mock(ValidatorProvider.class);
+    when(validatorProvider.getValidatorsAfterBlock(any())).thenReturn(validatorList);
 
-    final CliqueContext cliqueContext =
-        new CliqueContext(voteTallyCache, voteProposer, null, blockInterface);
-    cliqueProtocolContext = new ProtocolContext(null, null, cliqueContext);
+    final CliqueContext cliqueContext = new CliqueContext(validatorProvider, null, blockInterface);
+    cliqueProtocolContext = new ProtocolContext(null, null, cliqueContext, Optional.empty());
     blockHeaderBuilder = new BlockHeaderTestFixture();
   }
 
diff --git a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueExtraDataTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueExtraDataTest.java
index 2d99304fe39..a03fe07a4a5 100644
--- a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueExtraDataTest.java
+++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueExtraDataTest.java
@@ -17,9 +17,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
@@ -30,16 +32,21 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import com.google.common.collect.Lists;
 import org.apache.tuweni.bytes.Bytes;
-import org.bouncycastle.util.encoders.Hex;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CliqueExtraDataTest {
 
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+
   @Test
   public void encodeAndDecodingDoNotAlterData() {
-    final Signature proposerSeal = Signature.create(BigInteger.ONE, BigInteger.ONE, (byte) 0);
+    final SECPSignature proposerSeal =
+        SIGNATURE_ALGORITHM.get().createSignature(BigInteger.ONE, BigInteger.ONE, (byte) 0);
     final List<Address> validators =
         Arrays.asList(
             AddressHelpers.ofValue(1), AddressHelpers.ofValue(2), AddressHelpers.ofValue(3));
@@ -59,30 +66,11 @@ public void encodeAndDecodingDoNotAlterData() {
     assertThat(decodedExtraData.getVanityData()).isEqualTo(vanityData);
   }
 
-  @Test
-  public void parseRinkebyGenesisBlockExtraData() {
-    // Rinkeby genesis block extra data text found @ rinkeby.io
-    final byte[] genesisBlockExtraData =
-        Hex.decode(
-            "52657370656374206d7920617574686f7269746168207e452e436172746d616e42eb768f2244c8811c63729a21a3569731535f067ffc57839b00206d1ad20c69a1981b489f772031b279182d99e65703f0076e4812653aab85fca0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
-
-    final Bytes bufferToInject = Bytes.wrap(genesisBlockExtraData);
-
-    final CliqueExtraData extraData =
-        CliqueExtraData.decodeRaw(
-            new BlockHeaderTestFixture()
-                .number(BlockHeader.GENESIS_BLOCK_NUMBER)
-                .blockHeaderFunctions(new CliqueBlockHeaderFunctions())
-                .extraData(bufferToInject)
-                .buildHeader());
-    assertThat(extraData.getProposerSeal()).isEmpty();
-    assertThat(extraData.getValidators().size()).isEqualTo(3);
-  }
-
   @Test
   public void insufficientDataResultsInAnIllegalArgumentException() {
     final Bytes illegalData =
-        Bytes.wrap(new byte[Signature.BYTES_REQUIRED + CliqueExtraData.EXTRA_VANITY_LENGTH - 1]);
+        Bytes.wrap(
+            new byte[SECPSignature.BYTES_REQUIRED + CliqueExtraData.EXTRA_VANITY_LENGTH - 1]);
 
     assertThatThrownBy(() -> CliqueExtraData.decodeRaw(createHeaderWithExtraData(illegalData)))
         .isInstanceOf(IllegalArgumentException.class)
@@ -95,7 +83,7 @@ public void sufficientlyLargeButIllegallySizedInputThrowsException() {
     final Bytes illegalData =
         Bytes.wrap(
             new byte
-                [Signature.BYTES_REQUIRED
+                [SECPSignature.BYTES_REQUIRED
                     + CliqueExtraData.EXTRA_VANITY_LENGTH
                     + Address.SIZE
                     - 1]);
@@ -109,7 +97,7 @@ public void sufficientlyLargeButIllegallySizedInputThrowsException() {
   public void addressToExtraDataString() {
     final List<KeyPair> nodeKeys = Lists.newArrayList();
     for (int i = 0; i < 4; i++) {
-      nodeKeys.add(KeyPair.generate());
+      nodeKeys.add(SIGNATURE_ALGORITHM.get().generateKeyPair());
     }
 
     final List<Address> addresses =
diff --git a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueProtocolScheduleTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueProtocolScheduleTest.java
index aa76a7fa3b3..ee9e610f36e 100644
--- a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueProtocolScheduleTest.java
+++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/CliqueProtocolScheduleTest.java
@@ -22,13 +22,20 @@
 import org.hyperledger.besu.config.CliqueConfigOptions;
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.config.GenesisConfigOptions;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 
-import org.junit.Test;
+import java.time.Instant;
+
+import org.junit.jupiter.api.Test;
 
 public class CliqueProtocolScheduleTest {
 
@@ -42,19 +49,18 @@ public void protocolSpecsAreCreatedAtBlockDefinedInJson() {
             + "{\"chainId\": 4,\n"
             + "\"homesteadBlock\": 1,\n"
             + "\"eip150Block\": 2,\n"
-            + "\"eip155Block\": 3,\n"
             + "\"eip158Block\": 3,\n"
             + "\"byzantiumBlock\": 1035301}"
             + "}";
 
     final GenesisConfigOptions config = GenesisConfigFile.fromConfig(jsonInput).getConfigOptions();
     final ProtocolSchedule protocolSchedule =
-        CliqueProtocolSchedule.create(config, NODE_KEY, false);
+        CliqueProtocolSchedule.create(config, NODE_KEY, false, EvmConfiguration.DEFAULT);
 
-    final ProtocolSpec homesteadSpec = protocolSchedule.getByBlockNumber(1);
-    final ProtocolSpec tangerineWhistleSpec = protocolSchedule.getByBlockNumber(2);
-    final ProtocolSpec spuriousDragonSpec = protocolSchedule.getByBlockNumber(3);
-    final ProtocolSpec byzantiumSpec = protocolSchedule.getByBlockNumber(1035301);
+    final ProtocolSpec homesteadSpec = protocolSchedule.getByBlockHeader(blockHeader(1));
+    final ProtocolSpec tangerineWhistleSpec = protocolSchedule.getByBlockHeader(blockHeader(2));
+    final ProtocolSpec spuriousDragonSpec = protocolSchedule.getByBlockHeader(blockHeader(3));
+    final ProtocolSpec byzantiumSpec = protocolSchedule.getByBlockHeader(blockHeader(1035301));
 
     assertThat(homesteadSpec.equals(tangerineWhistleSpec)).isFalse();
     assertThat(tangerineWhistleSpec.equals(spuriousDragonSpec)).isFalse();
@@ -64,8 +70,12 @@ public void protocolSpecsAreCreatedAtBlockDefinedInJson() {
   @Test
   public void parametersAlignWithMainnetWithAdjustments() {
     final ProtocolSpec homestead =
-        CliqueProtocolSchedule.create(GenesisConfigFile.DEFAULT.getConfigOptions(), NODE_KEY, false)
-            .getByBlockNumber(0);
+        CliqueProtocolSchedule.create(
+                GenesisConfigFile.DEFAULT.getConfigOptions(),
+                NODE_KEY,
+                false,
+                EvmConfiguration.DEFAULT)
+            .getByBlockHeader(blockHeader(0));
 
     assertThat(homestead.getName()).isEqualTo("Frontier");
     assertThat(homestead.getBlockReward()).isEqualTo(Wei.ZERO);
@@ -79,7 +89,10 @@ public void zeroEpochLengthThrowsException() {
     when(cliqueOptions.getEpochLength()).thenReturn(0L);
     when(genesisConfig.getCliqueConfigOptions()).thenReturn(cliqueOptions);
 
-    assertThatThrownBy(() -> CliqueProtocolSchedule.create(genesisConfig, NODE_KEY, false))
+    assertThatThrownBy(
+            () ->
+                CliqueProtocolSchedule.create(
+                    genesisConfig, NODE_KEY, false, EvmConfiguration.DEFAULT))
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessage("Epoch length in config must be greater than zero");
   }
@@ -90,8 +103,85 @@ public void negativeEpochLengthThrowsException() {
     when(cliqueOptions.getEpochLength()).thenReturn(-3000L);
     when(genesisConfig.getCliqueConfigOptions()).thenReturn(cliqueOptions);
 
-    assertThatThrownBy(() -> CliqueProtocolSchedule.create(genesisConfig, NODE_KEY, false))
+    assertThatThrownBy(
+            () ->
+                CliqueProtocolSchedule.create(
+                    genesisConfig, NODE_KEY, false, EvmConfiguration.DEFAULT))
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessage("Epoch length in config must be greater than zero");
   }
+
+  @Test
+  public void shouldValidateBaseFeeMarketTransition() {
+
+    final BlockHeaderTestFixture headerBuilder = new BlockHeaderTestFixture();
+
+    final String jsonInput =
+        "{\"config\": " + "\t{\"chainId\": 1337,\n" + "\t\"londonBlock\": 2}\n" + "}";
+
+    final GenesisConfigOptions config = GenesisConfigFile.fromConfig(jsonInput).getConfigOptions();
+    final ProtocolSchedule protocolSchedule =
+        CliqueProtocolSchedule.create(config, NODE_KEY, false, EvmConfiguration.DEFAULT);
+
+    BlockHeader emptyFrontierParent =
+        headerBuilder
+            .number(0)
+            .mixHash(Hash.fromHexStringLenient("0x0"))
+            .gasLimit(5000L)
+            .timestamp(Instant.now().getEpochSecond() - 30L)
+            .buildHeader();
+
+    // legacy FeeMarket block
+    BlockHeader emptyFrontierBlock1 =
+        headerBuilder
+            .number(1)
+            .timestamp(Instant.now().getEpochSecond() - 15L)
+            .parentHash(emptyFrontierParent.getHash())
+            .buildHeader();
+
+    // premature BaseFeeMarket block
+    BlockHeader emptyLondonBlock1 =
+        headerBuilder.baseFeePerGas(Wei.of(1000000000L)).gasLimit(10000L).buildHeader();
+
+    // first BaseFeeMarket block
+    BlockHeader emptyLondonBlock2 =
+        headerBuilder
+            .number(2)
+            .timestamp(Instant.now().getEpochSecond())
+            .parentHash(emptyFrontierBlock1.getHash())
+            .buildHeader();
+
+    // assert block 1 validates (no fee market)
+    assertThat(
+            validateHeaderByProtocolSchedule(
+                protocolSchedule, emptyFrontierBlock1, emptyFrontierParent))
+        .isTrue();
+
+    // assert block 1 with a base fee fails
+    assertThat(
+            validateHeaderByProtocolSchedule(
+                protocolSchedule, emptyLondonBlock1, emptyFrontierParent))
+        .isFalse();
+
+    // assert block 2 with a base fee validates (has fee market)
+    assertThat(
+            validateHeaderByProtocolSchedule(
+                protocolSchedule, emptyLondonBlock2, emptyFrontierBlock1))
+        .isTrue();
+  }
+
+  private boolean validateHeaderByProtocolSchedule(
+      final ProtocolSchedule schedule,
+      final BlockHeader blockHeader,
+      final BlockHeader parentBlockHeader) {
+
+    return schedule
+        .getByBlockHeader(blockHeader)
+        .getBlockHeaderValidator()
+        .validateHeader(blockHeader, parentBlockHeader, null, HeaderValidationMode.LIGHT);
+  }
+
+  private BlockHeader blockHeader(final long number) {
+    return new BlockHeaderTestFixture().number(number).buildHeader();
+  }
 }
diff --git a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/NodeCanProduceNextBlockTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/NodeCanProduceNextBlockTest.java
index 8dcdf8d3461..486c1840fc9 100644
--- a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/NodeCanProduceNextBlockTest.java
+++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/NodeCanProduceNextBlockTest.java
@@ -16,38 +16,39 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.consensus.clique.headervalidationrules.SignerRateLimitValidationRule;
-import org.hyperledger.besu.consensus.common.VoteProposer;
-import org.hyperledger.besu.consensus.common.VoteTally;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Util;
 
 import java.util.List;
+import java.util.Optional;
 
 import com.google.common.collect.Lists;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class NodeCanProduceNextBlockTest {
 
-  private final KeyPair proposerKeyPair = KeyPair.generate();
+  private final KeyPair proposerKeyPair = SignatureAlgorithmFactory.getInstance().generateKeyPair();
   private Address localAddress;
-  private final KeyPair otherNodeKeyPair = KeyPair.generate();
+  private final KeyPair otherNodeKeyPair =
+      SignatureAlgorithmFactory.getInstance().generateKeyPair();
   private final List<Address> validatorList = Lists.newArrayList();
   private final BlockHeaderTestFixture headerBuilder = new BlockHeaderTestFixture();
   private ProtocolContext cliqueProtocolContext;
@@ -62,7 +63,7 @@ private Block createEmptyBlock(final KeyPair blockSigner) {
     return new Block(header, new BlockBody(Lists.newArrayList(), Lists.newArrayList()));
   }
 
-  @Before
+  @BeforeEach
   public void setup() {
     localAddress = Util.publicKeyToAddress(proposerKeyPair.getPublicKey());
     validatorList.add(localAddress);
@@ -76,12 +77,10 @@ public void networkWithOneValidatorIsAllowedToCreateConsecutiveBlocks() {
 
     blockChain = createInMemoryBlockchain(genesisBlock);
 
-    final VoteTallyCache voteTallyCache = mock(VoteTallyCache.class);
-    when(voteTallyCache.getVoteTallyAfterBlock(any())).thenReturn(new VoteTally(validatorList));
-    final VoteProposer voteProposer = new VoteProposer();
-    final CliqueContext cliqueContext =
-        new CliqueContext(voteTallyCache, voteProposer, null, blockInterface);
-    cliqueProtocolContext = new ProtocolContext(blockChain, null, cliqueContext);
+    final ValidatorProvider validatorProvider = mock(ValidatorProvider.class);
+    when(validatorProvider.getValidatorsAfterBlock(any())).thenReturn(validatorList);
+    final CliqueContext cliqueContext = new CliqueContext(validatorProvider, null, blockInterface);
+    cliqueProtocolContext = new ProtocolContext(blockChain, null, cliqueContext, Optional.empty());
 
     headerBuilder.number(1).parentHash(genesisBlock.getHash());
     final Block block_1 = createEmptyBlock(proposerKeyPair);
@@ -102,12 +101,10 @@ public void networkWithTwoValidatorsIsAllowedToProduceBlockIfNotPreviousBlockPro
 
     blockChain = createInMemoryBlockchain(genesisBlock);
 
-    final VoteTallyCache voteTallyCache = mock(VoteTallyCache.class);
-    when(voteTallyCache.getVoteTallyAfterBlock(any())).thenReturn(new VoteTally(validatorList));
-    final VoteProposer voteProposer = new VoteProposer();
-    final CliqueContext cliqueContext =
-        new CliqueContext(voteTallyCache, voteProposer, null, blockInterface);
-    cliqueProtocolContext = new ProtocolContext(blockChain, null, cliqueContext);
+    final ValidatorProvider validatorProvider = mock(ValidatorProvider.class);
+    when(validatorProvider.getValidatorsAfterBlock(any())).thenReturn(validatorList);
+    final CliqueContext cliqueContext = new CliqueContext(validatorProvider, null, blockInterface);
+    cliqueProtocolContext = new ProtocolContext(blockChain, null, cliqueContext, Optional.empty());
 
     headerBuilder.number(1).parentHash(genesisBlock.getHash());
     final Block block_1 = createEmptyBlock(proposerKeyPair);
@@ -137,12 +134,10 @@ public void networkWithTwoValidatorsIsNotAllowedToProduceBlockIfIsPreviousBlockP
 
     blockChain = createInMemoryBlockchain(genesisBlock);
 
-    final VoteTallyCache voteTallyCache = mock(VoteTallyCache.class);
-    when(voteTallyCache.getVoteTallyAfterBlock(any())).thenReturn(new VoteTally(validatorList));
-    final VoteProposer voteProposer = new VoteProposer();
-    final CliqueContext cliqueContext =
-        new CliqueContext(voteTallyCache, voteProposer, null, blockInterface);
-    cliqueProtocolContext = new ProtocolContext(blockChain, null, cliqueContext);
+    final ValidatorProvider validatorProvider = mock(ValidatorProvider.class);
+    when(validatorProvider.getValidatorsAfterBlock(any())).thenReturn(validatorList);
+    final CliqueContext cliqueContext = new CliqueContext(validatorProvider, null, blockInterface);
+    cliqueProtocolContext = new ProtocolContext(blockChain, null, cliqueContext, Optional.empty());
 
     headerBuilder.parentHash(genesisBlock.getHash()).number(1);
     final Block block_1 = createEmptyBlock(proposerKeyPair);
@@ -168,12 +163,10 @@ public void withThreeValidatorsMustHaveOneBlockBetweenSignings() {
 
     blockChain = createInMemoryBlockchain(genesisBlock);
 
-    final VoteTallyCache voteTallyCache = mock(VoteTallyCache.class);
-    when(voteTallyCache.getVoteTallyAfterBlock(any())).thenReturn(new VoteTally(validatorList));
-    final VoteProposer voteProposer = new VoteProposer();
-    final CliqueContext cliqueContext =
-        new CliqueContext(voteTallyCache, voteProposer, null, blockInterface);
-    cliqueProtocolContext = new ProtocolContext(blockChain, null, cliqueContext);
+    final ValidatorProvider validatorProvider = mock(ValidatorProvider.class);
+    when(validatorProvider.getValidatorsAfterBlock(any())).thenReturn(validatorList);
+    final CliqueContext cliqueContext = new CliqueContext(validatorProvider, null, blockInterface);
+    cliqueProtocolContext = new ProtocolContext(blockChain, null, cliqueContext, Optional.empty());
 
     headerBuilder.parentHash(genesisBlock.getHash()).number(1);
     final Block block_1 = createEmptyBlock(proposerKeyPair);
@@ -214,12 +207,10 @@ public void signerIsValidIfInsufficientBlocksExistInHistory() {
 
     blockChain = createInMemoryBlockchain(genesisBlock);
 
-    final VoteTallyCache voteTallyCache = mock(VoteTallyCache.class);
-    when(voteTallyCache.getVoteTallyAfterBlock(any())).thenReturn(new VoteTally(validatorList));
-    final VoteProposer voteProposer = new VoteProposer();
-    final CliqueContext cliqueContext =
-        new CliqueContext(voteTallyCache, voteProposer, null, blockInterface);
-    cliqueProtocolContext = new ProtocolContext(blockChain, null, cliqueContext);
+    final ValidatorProvider validatorProvider = mock(ValidatorProvider.class);
+    when(validatorProvider.getValidatorsAfterBlock(any())).thenReturn(validatorList);
+    final CliqueContext cliqueContext = new CliqueContext(validatorProvider, null, blockInterface);
+    cliqueProtocolContext = new ProtocolContext(blockChain, null, cliqueContext, Optional.empty());
 
     headerBuilder.parentHash(genesisBlock.getHash()).number(1);
     final Block block_1 = createEmptyBlock(otherNodeKeyPair);
@@ -244,12 +235,10 @@ public void exceptionIsThrownIfOnAnOrphanedChain() {
 
     blockChain = createInMemoryBlockchain(genesisBlock);
 
-    final VoteTallyCache voteTallyCache = mock(VoteTallyCache.class);
-    when(voteTallyCache.getVoteTallyAfterBlock(any())).thenReturn(new VoteTally(validatorList));
-    final VoteProposer voteProposer = new VoteProposer();
-    final CliqueContext cliqueContext =
-        new CliqueContext(voteTallyCache, voteProposer, null, blockInterface);
-    cliqueProtocolContext = new ProtocolContext(blockChain, null, cliqueContext);
+    final ValidatorProvider validatorProvider = mock(ValidatorProvider.class);
+    when(validatorProvider.getValidatorsAfterBlock(any())).thenReturn(validatorList);
+    final CliqueContext cliqueContext = new CliqueContext(validatorProvider, null, blockInterface);
+    cliqueProtocolContext = new ProtocolContext(blockChain, null, cliqueContext, Optional.empty());
 
     headerBuilder.parentHash(Hash.ZERO).number(3);
     final BlockHeader parentHeader =
@@ -269,12 +258,10 @@ public void nonValidatorIsNotAllowedToCreateABlock() {
 
     blockChain = createInMemoryBlockchain(genesisBlock);
 
-    final VoteTallyCache voteTallyCache = mock(VoteTallyCache.class);
-    when(voteTallyCache.getVoteTallyAfterBlock(any())).thenReturn(new VoteTally(validatorList));
-    final VoteProposer voteProposer = new VoteProposer();
-    final CliqueContext cliqueContext =
-        new CliqueContext(voteTallyCache, voteProposer, null, blockInterface);
-    cliqueProtocolContext = new ProtocolContext(blockChain, null, cliqueContext);
+    final ValidatorProvider validatorProvider = mock(ValidatorProvider.class);
+    when(validatorProvider.getValidatorsAfterBlock(any())).thenReturn(validatorList);
+    final CliqueContext cliqueContext = new CliqueContext(validatorProvider, null, blockInterface);
+    cliqueProtocolContext = new ProtocolContext(blockChain, null, cliqueContext, Optional.empty());
 
     headerBuilder.parentHash(Hash.ZERO).number(3);
     final BlockHeader parentHeader = headerBuilder.buildHeader();
diff --git a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/TestHelpers.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/TestHelpers.java
index 5b409387719..d7a63e9a51e 100644
--- a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/TestHelpers.java
+++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/TestHelpers.java
@@ -14,13 +14,13 @@
  */
 package org.hyperledger.besu.consensus.clique;
 
-import org.hyperledger.besu.crypto.SECP256K1;
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 import java.util.List;
 
@@ -43,7 +43,8 @@ public static BlockHeader createCliqueSignedBlockHeader(
     final Hash signingHash =
         CliqueBlockHashing.calculateDataHashForProposerSeal(unsealedHeader, unsignedExtraData);
 
-    final Signature proposerSignature = SECP256K1.sign(signingHash, signer);
+    final SECPSignature proposerSignature =
+        SignatureAlgorithmFactory.getInstance().sign(signingHash, signer);
 
     final Bytes signedExtraData =
         new CliqueExtraData(
diff --git a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockCreatorTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockCreatorTest.java
index b78a39145ce..76741501dc2 100644
--- a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockCreatorTest.java
+++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockCreatorTest.java
@@ -15,8 +15,8 @@
 package org.hyperledger.besu.consensus.clique.blockcreation;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -29,43 +29,48 @@
 import org.hyperledger.besu.consensus.clique.CliqueProtocolSchedule;
 import org.hyperledger.besu.consensus.clique.TestHelpers;
 import org.hyperledger.besu.consensus.common.EpochManager;
-import org.hyperledger.besu.consensus.common.VoteProposer;
-import org.hyperledger.besu.consensus.common.VoteTally;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.common.validator.ValidatorVote;
+import org.hyperledger.besu.consensus.common.validator.VoteProvider;
+import org.hyperledger.besu.consensus.common.validator.VoteType;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.GenesisState;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.Util;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.sorter.GasPricePendingTransactionsSorter;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.testutil.TestClock;
 
+import java.time.ZoneId;
 import java.util.List;
+import java.util.Optional;
 
 import com.google.common.collect.Lists;
 import org.apache.tuweni.bytes.Bytes;
 import org.assertj.core.api.Java6Assertions;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class CliqueBlockCreatorTest {
 
   private final NodeKey proposerNodeKey = NodeKeyUtils.generate();
   private final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
-  private final KeyPair otherKeyPair = KeyPair.generate();
+  private final KeyPair otherKeyPair = SignatureAlgorithmFactory.getInstance().generateKeyPair();
   private final List<Address> validatorList = Lists.newArrayList();
   private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
   private final CliqueBlockInterface blockInterface = new CliqueBlockInterface();
@@ -75,28 +80,33 @@ public class CliqueBlockCreatorTest {
 
   private MutableBlockchain blockchain;
   private ProtocolContext protocolContext;
-  private VoteProposer voteProposer;
   private EpochManager epochManager;
+  private ValidatorProvider validatorProvider;
+  private VoteProvider voteProvider;
 
-  @Before
+  @BeforeEach
   public void setup() {
     protocolSchedule =
         CliqueProtocolSchedule.create(
-            GenesisConfigFile.DEFAULT.getConfigOptions(), proposerNodeKey, false);
+            GenesisConfigFile.DEFAULT.getConfigOptions(),
+            proposerNodeKey,
+            false,
+            EvmConfiguration.DEFAULT);
 
     final Address otherAddress = Util.publicKeyToAddress(otherKeyPair.getPublicKey());
     validatorList.add(otherAddress);
 
-    final VoteTallyCache voteTallyCache = mock(VoteTallyCache.class);
-    when(voteTallyCache.getVoteTallyAfterBlock(any())).thenReturn(new VoteTally(validatorList));
-    voteProposer = new VoteProposer();
-    final CliqueContext cliqueContext =
-        new CliqueContext(voteTallyCache, voteProposer, null, blockInterface);
+    validatorProvider = mock(ValidatorProvider.class);
+    voteProvider = mock(VoteProvider.class);
+    when(validatorProvider.getVoteProviderAtHead()).thenReturn(Optional.of(voteProvider));
+    when(validatorProvider.getValidatorsAfterBlock(any())).thenReturn(validatorList);
+    final CliqueContext cliqueContext = new CliqueContext(validatorProvider, null, blockInterface);
 
     final Block genesis =
         GenesisState.fromConfig(GenesisConfigFile.mainnet(), protocolSchedule).getBlock();
     blockchain = createInMemoryBlockchain(genesis);
-    protocolContext = new ProtocolContext(blockchain, stateArchive, cliqueContext);
+    protocolContext =
+        new ProtocolContext(blockchain, stateArchive, cliqueContext, Optional.empty());
     epochManager = new EpochManager(10);
 
     // Add a block above the genesis
@@ -120,25 +130,22 @@ public void proposerAddressCanBeExtractFromAConstructedBlock() {
     final CliqueBlockCreator blockCreator =
         new CliqueBlockCreator(
             coinbase,
+            () -> Optional.of(10_000_000L),
             parent -> extraData,
-            new PendingTransactions(
-                TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
-                5,
-                5,
-                TestClock.fixed(),
+            new GasPricePendingTransactionsSorter(
+                ImmutableTransactionPoolConfiguration.builder().txPoolMaxSize(5).build(),
+                TestClock.system(ZoneId.systemDefault()),
                 metricsSystem,
-                blockchain::getChainHeadHeader,
-                TransactionPoolConfiguration.DEFAULT_PRICE_BUMP),
+                blockchain::getChainHeadHeader),
             protocolContext,
             protocolSchedule,
-            gasLimit -> gasLimit,
             proposerNodeKey,
             Wei.ZERO,
             0.8,
             blockchain.getChainHeadHeader(),
             epochManager);
 
-    final Block createdBlock = blockCreator.createBlock(5L);
+    final Block createdBlock = blockCreator.createBlock(5L).getBlock();
 
     Java6Assertions.assertThat(CliqueHelpers.getProposerOfBlock(createdBlock.getHeader()))
         .isEqualTo(proposerAddress);
@@ -149,69 +156,33 @@ public void insertsValidVoteIntoConstructedBlock() {
     final Bytes extraData =
         CliqueExtraData.createWithoutProposerSeal(Bytes.wrap(new byte[32]), validatorList);
     final Address a1 = Address.fromHexString("5");
-    voteProposer.auth(a1);
     final Address coinbase = AddressHelpers.ofValue(1);
+    when(voteProvider.getVoteAfterBlock(any(), any()))
+        .thenReturn(Optional.of(new ValidatorVote(VoteType.ADD, coinbase, a1)));
 
     final CliqueBlockCreator blockCreator =
         new CliqueBlockCreator(
             coinbase,
+            () -> Optional.of(10_000_000L),
             parent -> extraData,
-            new PendingTransactions(
-                TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
-                5,
-                5,
-                TestClock.fixed(),
+            new GasPricePendingTransactionsSorter(
+                ImmutableTransactionPoolConfiguration.builder().txPoolMaxSize(5).build(),
+                TestClock.system(ZoneId.systemDefault()),
                 metricsSystem,
-                blockchain::getChainHeadHeader,
-                TransactionPoolConfiguration.DEFAULT_PRICE_BUMP),
+                blockchain::getChainHeadHeader),
             protocolContext,
             protocolSchedule,
-            gasLimit -> gasLimit,
             proposerNodeKey,
             Wei.ZERO,
             0.8,
             blockchain.getChainHeadHeader(),
             epochManager);
 
-    final Block createdBlock = blockCreator.createBlock(0L);
+    final Block createdBlock = blockCreator.createBlock(0L).getBlock();
     assertThat(createdBlock.getHeader().getNonce()).isEqualTo(CliqueBlockInterface.ADD_NONCE);
     assertThat(createdBlock.getHeader().getCoinbase()).isEqualTo(a1);
   }
 
-  @Test
-  public void insertsNoVoteWhenAuthInValidators() {
-    final Bytes extraData =
-        CliqueExtraData.createWithoutProposerSeal(Bytes.wrap(new byte[32]), validatorList);
-    final Address a1 = Util.publicKeyToAddress(otherKeyPair.getPublicKey());
-    voteProposer.auth(a1);
-    final Address coinbase = AddressHelpers.ofValue(1);
-
-    final CliqueBlockCreator blockCreator =
-        new CliqueBlockCreator(
-            coinbase,
-            parent -> extraData,
-            new PendingTransactions(
-                TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
-                5,
-                5,
-                TestClock.fixed(),
-                metricsSystem,
-                blockchain::getChainHeadHeader,
-                TransactionPoolConfiguration.DEFAULT_PRICE_BUMP),
-            protocolContext,
-            protocolSchedule,
-            gasLimit -> gasLimit,
-            proposerNodeKey,
-            Wei.ZERO,
-            0.8,
-            blockchain.getChainHeadHeader(),
-            epochManager);
-
-    final Block createdBlock = blockCreator.createBlock(0L);
-    assertThat(createdBlock.getHeader().getNonce()).isEqualTo(CliqueBlockInterface.DROP_NONCE);
-    assertThat(createdBlock.getHeader().getCoinbase()).isEqualTo(Address.fromHexString("0"));
-  }
-
   @Test
   public void insertsNoVoteWhenAtEpoch() {
     // ensure that the next block is epoch
@@ -220,31 +191,32 @@ public void insertsNoVoteWhenAtEpoch() {
     final Bytes extraData =
         CliqueExtraData.createWithoutProposerSeal(Bytes.wrap(new byte[32]), validatorList);
     final Address a1 = Address.fromHexString("5");
-    voteProposer.auth(a1);
     final Address coinbase = AddressHelpers.ofValue(1);
 
+    final VoteProvider mockVoteProvider = mock(VoteProvider.class);
+    when(validatorProvider.getVoteProviderAtHead()).thenReturn(Optional.of(mockVoteProvider));
+    when(mockVoteProvider.getVoteAfterBlock(any(), any()))
+        .thenReturn(Optional.of(new ValidatorVote(VoteType.ADD, coinbase, a1)));
+
     final CliqueBlockCreator blockCreator =
         new CliqueBlockCreator(
             coinbase,
+            () -> Optional.of(10_000_000L),
             parent -> extraData,
-            new PendingTransactions(
-                TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
-                5,
-                5,
-                TestClock.fixed(),
+            new GasPricePendingTransactionsSorter(
+                ImmutableTransactionPoolConfiguration.builder().txPoolMaxSize(5).build(),
+                TestClock.system(ZoneId.systemDefault()),
                 metricsSystem,
-                blockchain::getChainHeadHeader,
-                TransactionPoolConfiguration.DEFAULT_PRICE_BUMP),
+                blockchain::getChainHeadHeader),
             protocolContext,
             protocolSchedule,
-            gasLimit -> gasLimit,
             proposerNodeKey,
             Wei.ZERO,
             0.8,
             blockchain.getChainHeadHeader(),
             epochManager);
 
-    final Block createdBlock = blockCreator.createBlock(0L);
+    final Block createdBlock = blockCreator.createBlock(0L).getBlock();
     assertThat(createdBlock.getHeader().getNonce()).isEqualTo(CliqueBlockInterface.DROP_NONCE);
     assertThat(createdBlock.getHeader().getCoinbase()).isEqualTo(Address.fromHexString("0"));
   }
diff --git a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockSchedulerTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockSchedulerTest.java
index cc97b8a5946..87aeb9d6694 100644
--- a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockSchedulerTest.java
+++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueBlockSchedulerTest.java
@@ -19,11 +19,11 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.consensus.common.VoteTally;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.blockcreation.AbstractBlockScheduler.BlockCreationTimeResult;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
@@ -33,27 +33,27 @@
 import java.util.List;
 
 import com.google.common.collect.Lists;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class CliqueBlockSchedulerTest {
 
-  private final KeyPair proposerKeyPair = KeyPair.generate();
+  private final KeyPair proposerKeyPair = SignatureAlgorithmFactory.getInstance().generateKeyPair();
   private Address localAddr;
 
   private final List<Address> validatorList = Lists.newArrayList();
-  private VoteTallyCache voteTallyCache;
+  private ValidatorProvider validatorProvider;
   private BlockHeaderTestFixture blockHeaderBuilder;
 
-  @Before
+  @BeforeEach
   public void setup() {
     localAddr = Util.publicKeyToAddress(proposerKeyPair.getPublicKey());
 
     validatorList.add(localAddr);
     validatorList.add(AddressHelpers.calculateAddressWithRespectTo(localAddr, 1));
 
-    voteTallyCache = mock(VoteTallyCache.class);
-    when(voteTallyCache.getVoteTallyAfterBlock(any())).thenReturn(new VoteTally(validatorList));
+    validatorProvider = mock(ValidatorProvider.class);
+    when(validatorProvider.getValidatorsAfterBlock(any())).thenReturn(validatorList);
 
     blockHeaderBuilder = new BlockHeaderTestFixture();
   }
@@ -65,7 +65,7 @@ public void inturnValidatorWaitsExactlyBlockInterval() {
     final long secondsBetweenBlocks = 5L;
     when(clock.millis()).thenReturn(currentSecondsSinceEpoch * 1000);
     final CliqueBlockScheduler scheduler =
-        new CliqueBlockScheduler(clock, voteTallyCache, localAddr, secondsBetweenBlocks);
+        new CliqueBlockScheduler(clock, validatorProvider, localAddr, secondsBetweenBlocks);
 
     // There are 2 validators, therefore block 2 will put localAddr as the in-turn voter, therefore
     // parent block should be number 1.
@@ -86,7 +86,7 @@ public void outOfturnValidatorWaitsLongerThanBlockInterval() {
     final long secondsBetweenBlocks = 5L;
     when(clock.millis()).thenReturn(currentSecondsSinceEpoch * 1000);
     final CliqueBlockScheduler scheduler =
-        new CliqueBlockScheduler(clock, voteTallyCache, localAddr, secondsBetweenBlocks);
+        new CliqueBlockScheduler(clock, validatorProvider, localAddr, secondsBetweenBlocks);
 
     // There are 2 validators, therefore block 3 will put localAddr as the out-turn voter, therefore
     // parent block should be number 2.
@@ -107,7 +107,7 @@ public void inTurnValidatorCreatesBlockNowIFParentTimestampSufficientlyBehindNow
     final long secondsBetweenBlocks = 5L;
     when(clock.millis()).thenReturn(currentSecondsSinceEpoch * 1000);
     final CliqueBlockScheduler scheduler =
-        new CliqueBlockScheduler(clock, voteTallyCache, localAddr, secondsBetweenBlocks);
+        new CliqueBlockScheduler(clock, validatorProvider, localAddr, secondsBetweenBlocks);
 
     // There are 2 validators, therefore block 2 will put localAddr as the in-turn voter, therefore
     // parent block should be number 1.
diff --git a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMinerExecutorTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMinerExecutorTest.java
index e2823229dfb..ab3e45abc59 100644
--- a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMinerExecutorTest.java
+++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMinerExecutorTest.java
@@ -27,33 +27,33 @@
 import org.hyperledger.besu.consensus.clique.CliqueExtraData;
 import org.hyperledger.besu.consensus.clique.CliqueProtocolSchedule;
 import org.hyperledger.besu.consensus.common.EpochManager;
-import org.hyperledger.besu.consensus.common.VoteProposer;
-import org.hyperledger.besu.consensus.common.VoteTally;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.blockcreation.GasLimitCalculator;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.Util;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.sorter.GasPricePendingTransactionsSorter;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.testutil.TestClock;
 
+import java.time.ZoneId;
 import java.util.List;
+import java.util.Optional;
 import java.util.Random;
 
 import com.google.common.collect.Lists;
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class CliqueMinerExecutorTest {
 
@@ -69,7 +69,7 @@ public class CliqueMinerExecutorTest {
   private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
   private final CliqueBlockInterface blockInterface = new CliqueBlockInterface();
 
-  @Before
+  @BeforeEach
   public void setup() {
     localAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
     validatorList.add(localAddress);
@@ -77,13 +77,11 @@ public void setup() {
     validatorList.add(AddressHelpers.calculateAddressWithRespectTo(localAddress, 2));
     validatorList.add(AddressHelpers.calculateAddressWithRespectTo(localAddress, 3));
 
-    final VoteTallyCache voteTallyCache = mock(VoteTallyCache.class);
-    when(voteTallyCache.getVoteTallyAfterBlock(any())).thenReturn(new VoteTally(validatorList));
-    final VoteProposer voteProposer = new VoteProposer();
+    final ValidatorProvider validatorProvider = mock(ValidatorProvider.class);
+    when(validatorProvider.getValidatorsAfterBlock(any())).thenReturn(validatorList);
 
-    final CliqueContext cliqueContext =
-        new CliqueContext(voteTallyCache, voteProposer, null, blockInterface);
-    cliqueProtocolContext = new ProtocolContext(null, null, cliqueContext);
+    final CliqueContext cliqueContext = new CliqueContext(validatorProvider, null, blockInterface);
+    cliqueProtocolContext = new ProtocolContext(null, null, cliqueContext, Optional.empty());
     blockHeaderBuilder = new BlockHeaderTestFixture();
   }
 
@@ -94,20 +92,22 @@ public void extraDataCreatedOnEpochBlocksContainsValidators() {
     final CliqueMinerExecutor executor =
         new CliqueMinerExecutor(
             cliqueProtocolContext,
-            CliqueProtocolSchedule.create(GENESIS_CONFIG_OPTIONS, proposerNodeKey, false),
-            new PendingTransactions(
-                TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
-                1,
-                5,
-                TestClock.fixed(),
+            CliqueProtocolSchedule.create(
+                GENESIS_CONFIG_OPTIONS, proposerNodeKey, false, EvmConfiguration.DEFAULT),
+            new GasPricePendingTransactionsSorter(
+                ImmutableTransactionPoolConfiguration.builder().txPoolMaxSize(1).build(),
+                TestClock.system(ZoneId.systemDefault()),
                 metricsSystem,
-                () -> null,
-                TransactionPoolConfiguration.DEFAULT_PRICE_BUMP),
+                CliqueMinerExecutorTest::mockBlockHeader),
             proposerNodeKey,
-            new MiningParameters(AddressHelpers.ofValue(1), Wei.ZERO, vanityData, false),
+            new MiningParameters.Builder()
+                .coinbase(AddressHelpers.ofValue(1))
+                .minTransactionGasPrice(Wei.ZERO)
+                .extraData(vanityData)
+                .miningEnabled(false)
+                .build(),
             mock(CliqueBlockScheduler.class),
-            new EpochManager(EPOCH_LENGTH),
-            GasLimitCalculator.constant());
+            new EpochManager(EPOCH_LENGTH));
 
     // NOTE: Passing in the *parent* block, so must be 1 less than EPOCH
     final BlockHeader header = blockHeaderBuilder.number(EPOCH_LENGTH - 1).buildHeader();
@@ -134,20 +134,22 @@ public void extraDataForNonEpochBlocksDoesNotContainValidaors() {
     final CliqueMinerExecutor executor =
         new CliqueMinerExecutor(
             cliqueProtocolContext,
-            CliqueProtocolSchedule.create(GENESIS_CONFIG_OPTIONS, proposerNodeKey, false),
-            new PendingTransactions(
-                TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
-                1,
-                5,
-                TestClock.fixed(),
+            CliqueProtocolSchedule.create(
+                GENESIS_CONFIG_OPTIONS, proposerNodeKey, false, EvmConfiguration.DEFAULT),
+            new GasPricePendingTransactionsSorter(
+                ImmutableTransactionPoolConfiguration.builder().txPoolMaxSize(1).build(),
+                TestClock.system(ZoneId.systemDefault()),
                 metricsSystem,
-                () -> null,
-                TransactionPoolConfiguration.DEFAULT_PRICE_BUMP),
+                CliqueMinerExecutorTest::mockBlockHeader),
             proposerNodeKey,
-            new MiningParameters(AddressHelpers.ofValue(1), Wei.ZERO, vanityData, false),
+            new MiningParameters.Builder()
+                .coinbase(AddressHelpers.ofValue(1))
+                .minTransactionGasPrice(Wei.ZERO)
+                .extraData(vanityData)
+                .miningEnabled(false)
+                .build(),
             mock(CliqueBlockScheduler.class),
-            new EpochManager(EPOCH_LENGTH),
-            GasLimitCalculator.constant());
+            new EpochManager(EPOCH_LENGTH));
 
     // Parent block was epoch, so the next block should contain no validators.
     final BlockHeader header = blockHeaderBuilder.number(EPOCH_LENGTH).buildHeader();
@@ -174,20 +176,22 @@ public void shouldUseLatestVanityData() {
     final CliqueMinerExecutor executor =
         new CliqueMinerExecutor(
             cliqueProtocolContext,
-            CliqueProtocolSchedule.create(GENESIS_CONFIG_OPTIONS, proposerNodeKey, false),
-            new PendingTransactions(
-                TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
-                1,
-                5,
-                TestClock.fixed(),
+            CliqueProtocolSchedule.create(
+                GENESIS_CONFIG_OPTIONS, proposerNodeKey, false, EvmConfiguration.DEFAULT),
+            new GasPricePendingTransactionsSorter(
+                ImmutableTransactionPoolConfiguration.builder().txPoolMaxSize(1).build(),
+                TestClock.system(ZoneId.systemDefault()),
                 metricsSystem,
-                () -> null,
-                TransactionPoolConfiguration.DEFAULT_PRICE_BUMP),
+                CliqueMinerExecutorTest::mockBlockHeader),
             proposerNodeKey,
-            new MiningParameters(AddressHelpers.ofValue(1), Wei.ZERO, initialVanityData, false),
+            new MiningParameters.Builder()
+                .coinbase(AddressHelpers.ofValue(1))
+                .minTransactionGasPrice(Wei.ZERO)
+                .extraData(initialVanityData)
+                .miningEnabled(false)
+                .build(),
             mock(CliqueBlockScheduler.class),
-            new EpochManager(EPOCH_LENGTH),
-            GasLimitCalculator.constant());
+            new EpochManager(EPOCH_LENGTH));
 
     executor.setExtraData(modifiedVanityData);
     final Bytes extraDataBytes = executor.calculateExtraData(blockHeaderBuilder.buildHeader());
@@ -202,6 +206,12 @@ public void shouldUseLatestVanityData() {
     assertThat(cliqueExtraData.getVanityData()).isEqualTo(modifiedVanityData);
   }
 
+  private static BlockHeader mockBlockHeader() {
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getBaseFee()).thenReturn(Optional.empty());
+    return blockHeader;
+  }
+
   private Bytes generateRandomVanityData() {
     final byte[] vanityData = new byte[32];
     random.nextBytes(vanityData);
diff --git a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMiningCoordinatorTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMiningCoordinatorTest.java
index fb2fa53b069..543d110ef45 100644
--- a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMiningCoordinatorTest.java
+++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueMiningCoordinatorTest.java
@@ -15,9 +15,8 @@
 package org.hyperledger.besu.consensus.clique.blockcreation;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.times;
@@ -28,36 +27,44 @@
 import org.hyperledger.besu.consensus.clique.CliqueContext;
 import org.hyperledger.besu.consensus.clique.CliqueMiningTracker;
 import org.hyperledger.besu.consensus.clique.TestHelpers;
-import org.hyperledger.besu.consensus.common.VoteTally;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Util;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import org.assertj.core.util.Lists;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@SuppressWarnings("DirectInvocationOnMock")
 public class CliqueMiningCoordinatorTest {
 
-  private final KeyPair proposerKeys = KeyPair.generate();
-  private final KeyPair validatorKeys = KeyPair.generate();
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+
+  private final KeyPair proposerKeys = SIGNATURE_ALGORITHM.get().generateKeyPair();
+  private final KeyPair validatorKeys = SIGNATURE_ALGORITHM.get().generateKeyPair();
   private final Address proposerAddress = Util.publicKeyToAddress(proposerKeys.getPublicKey());
   private final Address validatorAddress = Util.publicKeyToAddress(validatorKeys.getPublicKey());
 
@@ -73,23 +80,15 @@ public class CliqueMiningCoordinatorTest {
   @Mock private CliqueMinerExecutor minerExecutor;
   @Mock private CliqueBlockMiner blockMiner;
   @Mock private SyncState syncState;
-  @Mock private VoteTallyCache voteTallyCache;
+  @Mock private ValidatorProvider validatorProvider;
+  @Mock private BlockHeader blockHeader;
 
-  @Before
+  @BeforeEach
   public void setup() {
-
     headerTestFixture.number(1);
     Block genesisBlock = createEmptyBlock(0, Hash.ZERO, proposerKeys); // not normally signed but ok
     blockChain = createInMemoryBlockchain(genesisBlock);
 
-    final VoteTally voteTally = mock(VoteTally.class);
-    when(voteTally.getValidators()).thenReturn(validators);
-    when(voteTallyCache.getVoteTallyAfterBlock(any())).thenReturn(voteTally);
-    final CliqueContext cliqueContext =
-        new CliqueContext(voteTallyCache, null, null, blockInterface);
-
-    when(protocolContext.getConsensusState(CliqueContext.class)).thenReturn(cliqueContext);
-    when(protocolContext.getBlockchain()).thenReturn(blockChain);
     when(minerExecutor.startAsyncMining(any(), any(), any())).thenReturn(Optional.of(blockMiner));
     when(syncState.isInSync()).thenReturn(true);
 
@@ -98,10 +97,12 @@ public void setup() {
 
   @Test
   public void outOfTurnBlockImportedDoesNotInterruptInTurnMiningOperation() {
+    setupCliqueContextAndBlockchain();
+
     // As the head of the blockChain is 0 (which effectively doesn't have a signer, all validators
     // are able to propose.
 
-    when(blockMiner.getParentHeader()).thenReturn(blockChain.getChainHeadHeader());
+    when(blockMiner.getParentHeader()).thenReturn(blockHeader);
 
     // Note also - validators is an hard-ordered LIST, thus in-turn will follow said list - block_1
     // should be created by proposer.
@@ -117,7 +118,7 @@ public void outOfTurnBlockImportedDoesNotInterruptInTurnMiningOperation() {
 
     final Block importedBlock = createEmptyBlock(1, blockChain.getChainHeadHash(), validatorKeys);
 
-    blockChain.appendBlock(importedBlock, Lists.emptyList());
+    blockChain.appendBlock(importedBlock, Collections.emptyList());
 
     // The minerExecutor should not be invoked as the mining operation was conducted by an in-turn
     // validator, and the created block came from an out-turn validator.
@@ -145,7 +146,7 @@ public void outOfTurnBlockImportedAtHigherLevelInterruptsMiningOperation() {
 
     final Block importedBlock = createEmptyBlock(2, blockChain.getChainHeadHash(), validatorKeys);
 
-    blockChain.appendBlock(importedBlock, Lists.emptyList());
+    blockChain.appendBlock(importedBlock, Collections.emptyList());
 
     // The minerExecutor should not be invoked as the mining operation was conducted by an in-turn
     // validator, and the created block came from an out-turn validator.
@@ -156,8 +157,10 @@ public void outOfTurnBlockImportedAtHigherLevelInterruptsMiningOperation() {
 
   @Test
   public void outOfTurnBlockImportedInterruptsOutOfTurnMiningOperation() {
+    setupCliqueContextAndBlockchain();
+
     blockChain.appendBlock(
-        createEmptyBlock(1, blockChain.getChainHeadHash(), validatorKeys), Lists.emptyList());
+        createEmptyBlock(1, blockChain.getChainHeadHash(), validatorKeys), Collections.emptyList());
 
     when(blockMiner.getParentHeader()).thenReturn(blockChain.getChainHeadHeader());
 
@@ -176,7 +179,7 @@ public void outOfTurnBlockImportedInterruptsOutOfTurnMiningOperation() {
 
     final Block importedBlock = createEmptyBlock(2, blockChain.getChainHeadHash(), validatorKeys);
 
-    blockChain.appendBlock(importedBlock, Lists.emptyList());
+    blockChain.appendBlock(importedBlock, Collections.emptyList());
 
     // The minerExecutor should not be invoked as the mining operation was conducted by an in-turn
     // validator, and the created block came from an out-turn validator.
@@ -187,8 +190,10 @@ public void outOfTurnBlockImportedInterruptsOutOfTurnMiningOperation() {
 
   @Test
   public void outOfTurnBlockImportedInterruptsNonRunningMiner() {
+    setupCliqueContextAndBlockchain();
+
     blockChain.appendBlock(
-        createEmptyBlock(1, blockChain.getChainHeadHash(), proposerKeys), Lists.emptyList());
+        createEmptyBlock(1, blockChain.getChainHeadHash(), proposerKeys), Collections.emptyList());
 
     when(blockMiner.getParentHeader()).thenReturn(blockChain.getChainHeadHeader());
 
@@ -207,7 +212,7 @@ public void outOfTurnBlockImportedInterruptsNonRunningMiner() {
 
     final Block importedBlock = createEmptyBlock(2, blockChain.getChainHeadHash(), validatorKeys);
 
-    blockChain.appendBlock(importedBlock, Lists.emptyList());
+    blockChain.appendBlock(importedBlock, Collections.emptyList());
 
     // The minerExecutor should not be invoked as the mining operation was conducted by an in-turn
     // validator, and the created block came from an out-turn validator.
@@ -232,7 +237,7 @@ public void locallyGeneratedBlockInvalidatesMiningEvenIfInTurn() {
     when(minerExecutor.startAsyncMining(any(), any(), any())).thenReturn(Optional.of(blockMiner));
 
     final Block importedBlock = createEmptyBlock(1, blockChain.getChainHeadHash(), proposerKeys);
-    blockChain.appendBlock(importedBlock, Lists.emptyList());
+    blockChain.appendBlock(importedBlock, Collections.emptyList());
 
     // The minerExecutor should not be invoked as the mining operation was conducted by an in-turn
     // validator, and the created block came from an out-turn validator.
@@ -246,6 +251,15 @@ private Block createEmptyBlock(
     headerTestFixture.number(blockNumber).parentHash(parentHash);
     final BlockHeader header =
         TestHelpers.createCliqueSignedBlockHeader(headerTestFixture, signer, validators);
-    return new Block(header, new BlockBody(Lists.emptyList(), Lists.emptyList()));
+    return new Block(header, new BlockBody(Collections.emptyList(), Collections.emptyList()));
+  }
+
+  private void setupCliqueContextAndBlockchain() {
+    when(validatorProvider.getValidatorsAfterBlock(any())).thenReturn(validators);
+
+    final CliqueContext cliqueContext = new CliqueContext(validatorProvider, null, blockInterface);
+    when(protocolContext.getConsensusContext(CliqueContext.class)).thenReturn(cliqueContext);
+
+    when(protocolContext.getBlockchain()).thenReturn(blockChain);
   }
 }
diff --git a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueProposerSelectorTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueProposerSelectorTest.java
index f9a1fb05d6d..18c2b8bca18 100644
--- a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueProposerSelectorTest.java
+++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/blockcreation/CliqueProposerSelectorTest.java
@@ -19,17 +19,16 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.consensus.common.VoteTally;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class CliqueProposerSelectorTest {
 
@@ -39,13 +38,12 @@ public class CliqueProposerSelectorTest {
           AddressHelpers.ofValue(2),
           AddressHelpers.ofValue(3),
           AddressHelpers.ofValue(4));
-  private final VoteTally voteTally = new VoteTally(validatorList);
-  private VoteTallyCache voteTallyCache;
+  private ValidatorProvider validatorProvider;
 
-  @Before
+  @BeforeEach
   public void setup() {
-    voteTallyCache = mock(VoteTallyCache.class);
-    when(voteTallyCache.getVoteTallyAfterBlock(any())).thenReturn(voteTally);
+    validatorProvider = mock(ValidatorProvider.class);
+    when(validatorProvider.getValidatorsAfterBlock(any())).thenReturn(validatorList);
   }
 
   @Test
@@ -54,7 +52,7 @@ public void proposerForABlockIsBasedOnModBlockNumber() {
 
     for (int prevBlockNumber = 0; prevBlockNumber < 10; prevBlockNumber++) {
       headerBuilderFixture.number(prevBlockNumber);
-      final CliqueProposerSelector selector = new CliqueProposerSelector(voteTallyCache);
+      final CliqueProposerSelector selector = new CliqueProposerSelector(validatorProvider);
       final Address nextProposer =
           selector.selectProposerForNextBlock(headerBuilderFixture.buildHeader());
       assertThat(nextProposer)
diff --git a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueDifficultyValidationRuleTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueDifficultyValidationRuleTest.java
index 0c3cc41d1b2..7f7daf4eeab 100644
--- a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueDifficultyValidationRuleTest.java
+++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueDifficultyValidationRuleTest.java
@@ -22,12 +22,11 @@
 import org.hyperledger.besu.consensus.clique.CliqueBlockInterface;
 import org.hyperledger.besu.consensus.clique.CliqueContext;
 import org.hyperledger.besu.consensus.clique.TestHelpers;
-import org.hyperledger.besu.consensus.common.VoteProposer;
-import org.hyperledger.besu.consensus.common.VoteTally;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
@@ -35,32 +34,31 @@
 import org.hyperledger.besu.ethereum.core.Util;
 
 import java.util.List;
+import java.util.Optional;
 
 import com.google.common.collect.Lists;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class CliqueDifficultyValidationRuleTest {
 
-  private final KeyPair proposerKeyPair = KeyPair.generate();
+  private final KeyPair proposerKeyPair = SignatureAlgorithmFactory.getInstance().generateKeyPair();
   private final List<Address> validatorList = Lists.newArrayList();
   private ProtocolContext cliqueProtocolContext;
   private BlockHeaderTestFixture blockHeaderBuilder;
   private final CliqueBlockInterface blockInterface = new CliqueBlockInterface();
 
-  @Before
+  @BeforeEach
   public void setup() {
     final Address localAddress = Util.publicKeyToAddress(proposerKeyPair.getPublicKey());
     validatorList.add(localAddress);
     validatorList.add(AddressHelpers.calculateAddressWithRespectTo(localAddress, 1));
 
-    final VoteTallyCache voteTallyCache = mock(VoteTallyCache.class);
-    when(voteTallyCache.getVoteTallyAfterBlock(any())).thenReturn(new VoteTally(validatorList));
-    final VoteProposer voteProposer = new VoteProposer();
+    final ValidatorProvider validatorProvider = mock(ValidatorProvider.class);
+    when(validatorProvider.getValidatorsAfterBlock(any())).thenReturn(validatorList);
 
-    final CliqueContext cliqueContext =
-        new CliqueContext(voteTallyCache, voteProposer, null, blockInterface);
-    cliqueProtocolContext = new ProtocolContext(null, null, cliqueContext);
+    final CliqueContext cliqueContext = new CliqueContext(validatorProvider, null, blockInterface);
+    cliqueProtocolContext = new ProtocolContext(null, null, cliqueContext, Optional.empty());
     blockHeaderBuilder = new BlockHeaderTestFixture();
   }
 
diff --git a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueExtraDataValidationRuleTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueExtraDataValidationRuleTest.java
index c3362953668..72043c9cb9a 100644
--- a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueExtraDataValidationRuleTest.java
+++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/headervalidationrules/CliqueExtraDataValidationRuleTest.java
@@ -24,45 +24,45 @@
 import org.hyperledger.besu.consensus.clique.CliqueExtraData;
 import org.hyperledger.besu.consensus.clique.TestHelpers;
 import org.hyperledger.besu.consensus.common.EpochManager;
-import org.hyperledger.besu.consensus.common.VoteTally;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.Util;
 
 import java.util.List;
+import java.util.Optional;
 
 import com.google.common.collect.Lists;
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class CliqueExtraDataValidationRuleTest {
 
-  private final KeyPair proposerKeyPair = KeyPair.generate();
+  private final KeyPair proposerKeyPair = SignatureAlgorithmFactory.getInstance().generateKeyPair();
   private Address localAddr;
   private final CliqueBlockInterface blockInterface = new CliqueBlockInterface();
 
   private final List<Address> validatorList = Lists.newArrayList();
   private ProtocolContext cliqueProtocolContext;
 
-  @Before
+  @BeforeEach
   public void setup() {
     localAddr = Util.publicKeyToAddress(proposerKeyPair.getPublicKey());
 
     validatorList.add(localAddr);
     validatorList.add(AddressHelpers.calculateAddressWithRespectTo(localAddr, 1));
 
-    final VoteTallyCache voteTallyCache = mock(VoteTallyCache.class);
-    when(voteTallyCache.getVoteTallyAfterBlock(any())).thenReturn(new VoteTally(validatorList));
+    final ValidatorProvider validatorProvider = mock(ValidatorProvider.class);
+    when(validatorProvider.getValidatorsAfterBlock(any())).thenReturn(validatorList);
 
-    final CliqueContext cliqueContext =
-        new CliqueContext(voteTallyCache, null, null, blockInterface);
-    cliqueProtocolContext = new ProtocolContext(null, null, cliqueContext);
+    final CliqueContext cliqueContext = new CliqueContext(validatorProvider, null, blockInterface);
+    cliqueProtocolContext = new ProtocolContext(null, null, cliqueContext, Optional.empty());
   }
 
   @Test
@@ -82,7 +82,7 @@ public void missingSignerFailsValidation() {
 
   @Test
   public void signerNotInExpectedValidatorsFailsValidation() {
-    final KeyPair otherSigner = KeyPair.generate();
+    final KeyPair otherSigner = SignatureAlgorithmFactory.getInstance().generateKeyPair();
 
     final BlockHeaderTestFixture headerBuilder = new BlockHeaderTestFixture();
     final BlockHeader parent = headerBuilder.number(1).buildHeader();
diff --git a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/headervalidationrules/VoteValidationRuleTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/headervalidationrules/VoteValidationRuleTest.java
index 1650a6f3860..fdb68859577 100644
--- a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/headervalidationrules/VoteValidationRuleTest.java
+++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/headervalidationrules/VoteValidationRuleTest.java
@@ -20,39 +20,33 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 
-import java.util.Arrays;
-import java.util.Collection;
+import java.util.stream.Stream;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.ArgumentsProvider;
+import org.junit.jupiter.params.provider.ArgumentsSource;
 
-@RunWith(Parameterized.class)
 public class VoteValidationRuleTest {
 
-  @Parameters
-  public static Collection<Object[]> data() {
-    return Arrays.asList(
-        new Object[][] {
-          {CliqueBlockInterface.DROP_NONCE, true},
-          {CliqueBlockInterface.ADD_NONCE, true},
-          {0x01L, false},
-          {0xFFFFFFFFFFFFFFFEL, false}
-        });
+  static class CliqueVoteValidationArgumentsProvider implements ArgumentsProvider {
+    @Override
+    public Stream<? extends Arguments> provideArguments(final ExtensionContext context) {
+      return Stream.of(
+          Arguments.of(CliqueBlockInterface.DROP_NONCE, true),
+          Arguments.of(CliqueBlockInterface.ADD_NONCE, true),
+          Arguments.of(0x01L, false),
+          Arguments.of(0xFFFFFFFFFFFFFFFEL, false));
+    }
   }
 
-  @Parameter public long actualVote;
-
-  @Parameter(1)
-  public boolean expectedResult;
-
-  @Test
-  public void test() {
+  @ParameterizedTest
+  @ArgumentsSource(CliqueVoteValidationArgumentsProvider.class)
+  public void test(final long input, final boolean expectedResult) {
     final VoteValidationRule uut = new VoteValidationRule();
     final BlockHeaderTestFixture blockBuilder = new BlockHeaderTestFixture();
-    blockBuilder.nonce(actualVote);
+    blockBuilder.nonce(input);
 
     final BlockHeader header = blockBuilder.buildHeader();
 
diff --git a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignerMetricsTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignerMetricsTest.java
index 8b68508131c..89c48fb978b 100644
--- a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignerMetricsTest.java
+++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignerMetricsTest.java
@@ -15,6 +15,7 @@
 package org.hyperledger.besu.consensus.clique.jsonrpc.methods;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.AdditionalMatchers.lt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -22,15 +23,14 @@
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.consensus.common.BlockInterface;
-import org.hyperledger.besu.consensus.common.VoteTally;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.SignerMetricResult;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 
@@ -41,10 +41,8 @@
 import java.util.Optional;
 import java.util.stream.LongStream;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class CliqueGetSignerMetricsTest {
 
@@ -56,18 +54,16 @@ public class CliqueGetSignerMetricsTest {
   private final String JSON_RPC_VERSION = "2.0";
   private CliqueGetSignerMetrics method;
 
-  private VoteTallyCache voteTallyCache;
+  private ValidatorProvider validatorProvider;
   private BlockchainQueries blockchainQueries;
   private BlockInterface blockInterface;
 
-  @Rule public ExpectedException expectedException = ExpectedException.none();
-
-  @Before
+  @BeforeEach
   public void setup() {
-    voteTallyCache = mock(VoteTallyCache.class);
+    validatorProvider = mock(ValidatorProvider.class);
     blockchainQueries = mock(BlockchainQueries.class);
     blockInterface = mock(BlockInterface.class);
-    method = new CliqueGetSignerMetrics(voteTallyCache, blockInterface, blockchainQueries);
+    method = new CliqueGetSignerMetrics(validatorProvider, blockInterface, blockchainQueries);
   }
 
   @Test
@@ -77,22 +73,16 @@ public void returnsCorrectMethodName() {
 
   @Test
   public void exceptionWhenInvalidStartBlockSupplied() {
-    final JsonRpcRequestContext request = requestWithParams("INVALID");
-
-    expectedException.expect(InvalidJsonRpcParameters.class);
-    expectedException.expectMessage("Invalid json rpc parameter at index 0");
-
-    method.response(request);
+    assertThatThrownBy(() -> method.response(requestWithParams("INVALID")))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessageContaining("Invalid json rpc parameter at index 0");
   }
 
   @Test
   public void exceptionWhenInvalidEndBlockSupplied() {
-    final JsonRpcRequestContext request = requestWithParams("1", "INVALID");
-
-    expectedException.expect(InvalidJsonRpcParameters.class);
-    expectedException.expectMessage("Invalid json rpc parameter at index 1");
-
-    method.response(request);
+    assertThatThrownBy(() -> method.response(requestWithParams("1", "INVALID")))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessageContaining("Invalid json rpc parameter at index 1");
   }
 
   @Test
@@ -261,8 +251,7 @@ private SignerMetricResult generateBlock(final long number) {
     when(blockchainQueries.getBlockHeaderByNumber(number)).thenReturn(Optional.of(header));
     when(blockInterface.getProposerOfBlock(header)).thenReturn(proposerAddressBlock);
 
-    when(voteTallyCache.getVoteTallyAfterBlock(header))
-        .thenReturn(new VoteTally(Arrays.asList(VALIDATORS)));
+    when(validatorProvider.getValidatorsAfterBlock(header)).thenReturn((Arrays.asList(VALIDATORS)));
 
     final SignerMetricResult signerMetricResult = new SignerMetricResult(proposerAddressBlock);
     signerMetricResult.incrementeNbBlock();
diff --git a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHashTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHashTest.java
index 76b9fbd017e..9629b38c128 100644
--- a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHashTest.java
+++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignersAtHashTest.java
@@ -17,12 +17,13 @@
 import static java.util.Arrays.asList;
 import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.core.Address.fromHexString;
+import static org.hyperledger.besu.datatypes.Address.fromHexString;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.consensus.clique.CliqueBlockHeaderFunctions;
-import org.hyperledger.besu.consensus.common.VoteTally;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
@@ -32,10 +33,8 @@
 import org.hyperledger.besu.ethereum.api.query.BlockWithMetadata;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 import java.util.List;
 import java.util.Optional;
@@ -43,13 +42,13 @@
 import org.apache.tuweni.bytes.Bytes;
 import org.assertj.core.api.AssertionsForClassTypes;
 import org.bouncycastle.util.encoders.Hex;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class CliqueGetSignersAtHashTest {
 
   private CliqueGetSignersAtHash method;
@@ -58,16 +57,15 @@ public class CliqueGetSignersAtHashTest {
   private List<String> validatorsAsStrings;
 
   @Mock private BlockchainQueries blockchainQueries;
-  @Mock private VoteTallyCache voteTallyCache;
   @Mock private BlockWithMetadata<TransactionWithMetadata, Hash> blockWithMetadata;
-  @Mock private VoteTally voteTally;
+  @Mock private ValidatorProvider validatorProvider;
 
   public static final String BLOCK_HASH =
       "0xe36a3edf0d8664002a72ef7c5f8e271485e7ce5c66455a07cb679d855818415f";
 
-  @Before
+  @BeforeEach
   public void setup() {
-    method = new CliqueGetSignersAtHash(blockchainQueries, voteTallyCache);
+    method = new CliqueGetSignersAtHash(blockchainQueries, validatorProvider);
 
     final byte[] genesisBlockExtraData =
         Hex.decode(
@@ -116,8 +114,7 @@ public void returnsValidatorsForBlockHash() {
     when(blockchainQueries.blockByHash(Hash.fromHexString(BLOCK_HASH)))
         .thenReturn(Optional.of(blockWithMetadata));
     when(blockWithMetadata.getHeader()).thenReturn(blockHeader);
-    when(voteTallyCache.getVoteTallyAfterBlock(blockHeader)).thenReturn(voteTally);
-    when(voteTally.getValidators()).thenReturn(validators);
+    when(validatorProvider.getValidatorsAfterBlock(blockHeader)).thenReturn(validators);
 
     final JsonRpcSuccessResponse response = (JsonRpcSuccessResponse) method.response(request);
     assertThat(response.getResult()).isEqualTo(validatorsAsStrings);
diff --git a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignersTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignersTest.java
index 5780408882b..cd7decd1075 100644
--- a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignersTest.java
+++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueGetSignersTest.java
@@ -17,11 +17,12 @@
 import static java.util.Arrays.asList;
 import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.core.Address.fromHexString;
+import static org.hyperledger.besu.datatypes.Address.fromHexString;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.consensus.common.VoteTally;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
@@ -30,22 +31,20 @@
 import org.hyperledger.besu.ethereum.api.query.BlockWithMetadata;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 import java.util.List;
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class CliqueGetSignersTest {
   private CliqueGetSigners method;
   private BlockHeader blockHeader;
@@ -53,13 +52,12 @@ public class CliqueGetSignersTest {
   private List<String> validatorAsStrings;
 
   @Mock private BlockchainQueries blockchainQueries;
-  @Mock private VoteTallyCache voteTallyCache;
+  @Mock private ValidatorProvider validatorProvider;
   @Mock private BlockWithMetadata<TransactionWithMetadata, Hash> blockWithMetadata;
-  @Mock private VoteTally voteTally;
 
-  @Before
+  @BeforeEach
   public void setup() {
-    method = new CliqueGetSigners(blockchainQueries, voteTallyCache);
+    method = new CliqueGetSigners(blockchainQueries, validatorProvider);
 
     final String genesisBlockExtraData =
         "52657370656374206d7920617574686f7269746168207e452e436172746d616e42eb768f2244c8811c63729a21a3569731535f067ffc57839b00206d1ad20c69a1981b489f772031b279182d99e65703f0076e4812653aab85fca0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
@@ -89,8 +87,7 @@ public void returnsValidatorsWhenNoParam() {
     when(blockchainQueries.headBlockNumber()).thenReturn(3065995L);
     when(blockchainQueries.blockByNumber(3065995L)).thenReturn(Optional.of(blockWithMetadata));
     when(blockWithMetadata.getHeader()).thenReturn(blockHeader);
-    when(voteTallyCache.getVoteTallyAfterBlock(blockHeader)).thenReturn(voteTally);
-    when(voteTally.getValidators()).thenReturn(validators);
+    when(validatorProvider.getValidatorsAfterBlock(blockHeader)).thenReturn(validators);
 
     final JsonRpcSuccessResponse response = (JsonRpcSuccessResponse) method.response(request);
     assertThat(response.getResult()).isEqualTo(validatorAsStrings);
@@ -105,8 +102,7 @@ public void returnsValidatorsForBlockNumber() {
 
     when(blockchainQueries.blockByNumber(3065995L)).thenReturn(Optional.of(blockWithMetadata));
     when(blockWithMetadata.getHeader()).thenReturn(blockHeader);
-    when(voteTallyCache.getVoteTallyAfterBlock(blockHeader)).thenReturn(voteTally);
-    when(voteTally.getValidators()).thenReturn(validators);
+    when(validatorProvider.getValidatorsAfterBlock(blockHeader)).thenReturn(validators);
 
     final JsonRpcSuccessResponse response = (JsonRpcSuccessResponse) method.response(request);
     assertThat(response.getResult()).isEqualTo(validatorAsStrings);
diff --git a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueProposalsTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueProposalsTest.java
index 70d65d67169..50dc379b576 100644
--- a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueProposalsTest.java
+++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/CliqueProposalsTest.java
@@ -19,8 +19,8 @@
 import org.hyperledger.besu.consensus.common.jsonrpc.AbstractVoteProposerMethod;
 import org.hyperledger.besu.consensus.common.jsonrpc.AbstractVoteProposerMethodTest;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class CliqueProposalsTest extends AbstractVoteProposerMethodTest {
 
@@ -36,9 +36,9 @@ protected String getMethodName() {
     return "clique_proposals";
   }
 
-  @Before
+  @BeforeEach
   public void setup() {
-    method = new CliqueProposals(getVoteProposer());
+    method = new CliqueProposals(getValidatorProvider());
   }
 
   @Test
diff --git a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/DiscardTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/DiscardTest.java
index c6912034bcd..f5810520fc7 100644
--- a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/DiscardTest.java
+++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/DiscardTest.java
@@ -16,50 +16,67 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-import org.hyperledger.besu.consensus.common.VoteProposer;
-import org.hyperledger.besu.consensus.common.VoteType;
+import static org.mockito.Mockito.mock;
+
+import org.hyperledger.besu.consensus.common.BlockInterface;
+import org.hyperledger.besu.consensus.common.EpochManager;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.common.validator.VoteType;
+import org.hyperledger.besu.consensus.common.validator.blockbased.BlockValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.core.Address;
-
-import java.util.Optional;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
 
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
+@ExtendWith(MockitoExtension.class)
 public class DiscardTest {
   private final String JSON_RPC_VERSION = "2.0";
   private final String METHOD = "clique_discard";
 
+  private ValidatorProvider validatorProvider;
+
+  @BeforeEach
+  public void setup() {
+    final Blockchain blockchain = mock(Blockchain.class);
+    final EpochManager epochManager = mock(EpochManager.class);
+    final BlockInterface blockInterface = mock(BlockInterface.class);
+    validatorProvider =
+        BlockValidatorProvider.nonForkingValidatorProvider(
+            blockchain, epochManager, blockInterface);
+  }
+
   @Test
   public void discardEmpty() {
-    final VoteProposer proposer = new VoteProposer();
-    final Discard discard = new Discard(proposer);
+    final Discard discard = new Discard(validatorProvider);
     final Address a0 = Address.fromHexString("0");
 
     final JsonRpcResponse response = discard.response(requestWithParams(a0));
 
-    assertThat(proposer.get(a0)).isEqualTo(Optional.empty());
     assertThat(response.getType()).isEqualTo(JsonRpcResponseType.SUCCESS);
     final JsonRpcSuccessResponse successResponse = (JsonRpcSuccessResponse) response;
     assertThat(successResponse.getResult()).isEqualTo(true);
+    assertThat(validatorProvider.getVoteProviderAtHead().get().getProposals().get(a0)).isNull();
   }
 
   @Test
   public void discardAuth() {
-    final VoteProposer proposer = new VoteProposer();
-    final Discard discard = new Discard(proposer);
+    final Discard discard = new Discard(validatorProvider);
     final Address a0 = Address.fromHexString("0");
 
-    proposer.auth(a0);
+    validatorProvider.getVoteProviderAtHead().get().authVote(a0);
 
     final JsonRpcResponse response = discard.response(requestWithParams(a0));
 
-    assertThat(proposer.get(a0)).isEqualTo(Optional.empty());
+    assertThat(validatorProvider.getVoteProviderAtHead().get().getProposals().get(a0)).isNull();
     assertThat(response.getType()).isEqualTo(JsonRpcResponseType.SUCCESS);
     final JsonRpcSuccessResponse successResponse = (JsonRpcSuccessResponse) response;
     assertThat(successResponse.getResult()).isEqualTo(true);
@@ -67,15 +84,14 @@ public void discardAuth() {
 
   @Test
   public void discardDrop() {
-    final VoteProposer proposer = new VoteProposer();
-    final Discard discard = new Discard(proposer);
+    final Discard discard = new Discard(validatorProvider);
     final Address a0 = Address.fromHexString("0");
 
-    proposer.drop(a0);
+    validatorProvider.getVoteProviderAtHead().get().dropVote(a0);
 
     final JsonRpcResponse response = discard.response(requestWithParams(a0));
 
-    assertThat(proposer.get(a0)).isEqualTo(Optional.empty());
+    assertThat(validatorProvider.getVoteProviderAtHead().get().getProposals().get(a0)).isNull();
     assertThat(response.getType()).isEqualTo(JsonRpcResponseType.SUCCESS);
     final JsonRpcSuccessResponse successResponse = (JsonRpcSuccessResponse) response;
     assertThat(successResponse.getResult()).isEqualTo(true);
@@ -83,18 +99,18 @@ public void discardDrop() {
 
   @Test
   public void discardIsolation() {
-    final VoteProposer proposer = new VoteProposer();
-    final Discard discard = new Discard(proposer);
+    final Discard discard = new Discard(validatorProvider);
     final Address a0 = Address.fromHexString("0");
     final Address a1 = Address.fromHexString("1");
 
-    proposer.auth(a0);
-    proposer.auth(a1);
+    validatorProvider.getVoteProviderAtHead().get().authVote(a0);
+    validatorProvider.getVoteProviderAtHead().get().authVote(a1);
 
     final JsonRpcResponse response = discard.response(requestWithParams(a0));
 
-    assertThat(proposer.get(a0)).isEqualTo(Optional.empty());
-    assertThat(proposer.get(a1)).isEqualTo(Optional.of(VoteType.ADD));
+    assertThat(validatorProvider.getVoteProviderAtHead().get().getProposals().get(a0)).isNull();
+    assertThat(validatorProvider.getVoteProviderAtHead().get().getProposals().get(a1))
+        .isEqualTo(VoteType.ADD);
     assertThat(response.getType()).isEqualTo(JsonRpcResponseType.SUCCESS);
     final JsonRpcSuccessResponse successResponse = (JsonRpcSuccessResponse) response;
     assertThat(successResponse.getResult()).isEqualTo(true);
@@ -102,8 +118,7 @@ public void discardIsolation() {
 
   @Test
   public void discardWithoutAddress() {
-    final VoteProposer proposer = new VoteProposer();
-    final Discard discard = new Discard(proposer);
+    final Discard discard = new Discard(validatorProvider);
 
     assertThatThrownBy(() -> discard.response(requestWithParams()))
         .hasMessage("Missing required json rpc parameter at index 0")
diff --git a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/ProposeTest.java b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/ProposeTest.java
index 09169c9798b..c04cb98c2ec 100644
--- a/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/ProposeTest.java
+++ b/consensus/clique/src/test/java/org/hyperledger/besu/consensus/clique/jsonrpc/methods/ProposeTest.java
@@ -15,9 +15,14 @@
 package org.hyperledger.besu.consensus.clique.jsonrpc.methods;
 
 import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.consensus.common.VoteProposer;
-import org.hyperledger.besu.consensus.common.VoteType;
+import static org.mockito.Mockito.mock;
+
+import org.hyperledger.besu.consensus.common.BlockInterface;
+import org.hyperledger.besu.consensus.common.EpochManager;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.common.validator.VoteType;
+import org.hyperledger.besu.consensus.common.validator.blockbased.BlockValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
@@ -25,25 +30,35 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.core.Address;
-
-import java.util.Optional;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
 
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ProposeTest {
   private final String JSON_RPC_VERSION = "2.0";
   private final String METHOD = "clique_propose";
+  private ValidatorProvider validatorProvider;
+
+  @BeforeEach
+  public void setup() {
+    final Blockchain blockchain = mock(Blockchain.class);
+    final EpochManager epochManager = mock(EpochManager.class);
+    final BlockInterface blockInterface = mock(BlockInterface.class);
+    validatorProvider =
+        BlockValidatorProvider.nonForkingValidatorProvider(
+            blockchain, epochManager, blockInterface);
+  }
 
   @Test
   public void testAuth() {
-    final VoteProposer proposer = new VoteProposer();
-    final Propose propose = new Propose(proposer);
+    final Propose propose = new Propose(validatorProvider);
     final Address a1 = Address.fromHexString("1");
 
     final JsonRpcResponse response = propose.response(requestWithParams(a1, true));
 
-    assertThat(proposer.get(a1)).isEqualTo(Optional.of(VoteType.ADD));
+    assertThat(validatorProvider.getVoteProviderAtHead().get().getProposals().get(a1))
+        .isEqualTo(VoteType.ADD);
     assertThat(response.getType()).isEqualTo(JsonRpcResponseType.SUCCESS);
     final JsonRpcSuccessResponse successResponse = (JsonRpcSuccessResponse) response;
     assertThat(successResponse.getResult()).isEqualTo(true);
@@ -51,13 +66,12 @@ public void testAuth() {
 
   @Test
   public void testAuthWithAddressZeroResultsInError() {
-    final VoteProposer proposer = new VoteProposer();
-    final Propose propose = new Propose(proposer);
+    final Propose propose = new Propose(validatorProvider);
     final Address a0 = Address.fromHexString("0");
 
     final JsonRpcResponse response = propose.response(requestWithParams(a0, true));
 
-    assertThat(proposer.get(a0)).isEqualTo(Optional.empty());
+    assertThat(validatorProvider.getVoteProviderAtHead().get().getProposals().get(a0)).isNull();
     assertThat(response.getType()).isEqualTo(JsonRpcResponseType.ERROR);
     final JsonRpcErrorResponse errorResponse = (JsonRpcErrorResponse) response;
     assertThat(errorResponse.getError()).isEqualTo(JsonRpcError.INVALID_REQUEST);
@@ -65,13 +79,13 @@ public void testAuthWithAddressZeroResultsInError() {
 
   @Test
   public void testDrop() {
-    final VoteProposer proposer = new VoteProposer();
-    final Propose propose = new Propose(proposer);
+    final Propose propose = new Propose(validatorProvider);
     final Address a1 = Address.fromHexString("1");
 
     final JsonRpcResponse response = propose.response(requestWithParams(a1, false));
 
-    assertThat(proposer.get(a1)).isEqualTo(Optional.of(VoteType.DROP));
+    assertThat(validatorProvider.getVoteProviderAtHead().get().getProposals().get(a1))
+        .isEqualTo(VoteType.DROP);
     assertThat(response.getType()).isEqualTo(JsonRpcResponseType.SUCCESS);
     final JsonRpcSuccessResponse successResponse = (JsonRpcSuccessResponse) response;
     assertThat(successResponse.getResult()).isEqualTo(true);
@@ -79,13 +93,12 @@ public void testDrop() {
 
   @Test
   public void testDropWithAddressZeroResultsInError() {
-    final VoteProposer proposer = new VoteProposer();
-    final Propose propose = new Propose(proposer);
+    final Propose propose = new Propose(validatorProvider);
     final Address a0 = Address.fromHexString("0");
 
     final JsonRpcResponse response = propose.response(requestWithParams(a0, false));
 
-    assertThat(proposer.get(a0)).isEqualTo(Optional.empty());
+    assertThat(validatorProvider.getVoteProviderAtHead().get().getProposals().get(a0)).isNull();
     assertThat(response.getType()).isEqualTo(JsonRpcResponseType.ERROR);
     final JsonRpcErrorResponse errorResponse = (JsonRpcErrorResponse) response;
     assertThat(errorResponse.getError()).isEqualTo(JsonRpcError.INVALID_REQUEST);
@@ -93,14 +106,14 @@ public void testDropWithAddressZeroResultsInError() {
 
   @Test
   public void testRepeatAuth() {
-    final VoteProposer proposer = new VoteProposer();
-    final Propose propose = new Propose(proposer);
+    final Propose propose = new Propose(validatorProvider);
     final Address a1 = Address.fromHexString("1");
 
-    proposer.auth(a1);
+    validatorProvider.getVoteProviderAtHead().get().authVote(a1);
     final JsonRpcResponse response = propose.response(requestWithParams(a1, true));
 
-    assertThat(proposer.get(a1)).isEqualTo(Optional.of(VoteType.ADD));
+    assertThat(validatorProvider.getVoteProviderAtHead().get().getProposals().get(a1))
+        .isEqualTo(VoteType.ADD);
     assertThat(response.getType()).isEqualTo(JsonRpcResponseType.SUCCESS);
     final JsonRpcSuccessResponse successResponse = (JsonRpcSuccessResponse) response;
     assertThat(successResponse.getResult()).isEqualTo(true);
@@ -108,14 +121,14 @@ public void testRepeatAuth() {
 
   @Test
   public void testRepeatDrop() {
-    final VoteProposer proposer = new VoteProposer();
-    final Propose propose = new Propose(proposer);
+    final Propose propose = new Propose(validatorProvider);
     final Address a1 = Address.fromHexString("1");
 
-    proposer.drop(a1);
+    validatorProvider.getVoteProviderAtHead().get().dropVote(a1);
     final JsonRpcResponse response = propose.response(requestWithParams(a1, false));
 
-    assertThat(proposer.get(a1)).isEqualTo(Optional.of(VoteType.DROP));
+    assertThat(validatorProvider.getVoteProviderAtHead().get().getProposals().get(a1))
+        .isEqualTo(VoteType.DROP);
     assertThat(response.getType()).isEqualTo(JsonRpcResponseType.SUCCESS);
     final JsonRpcSuccessResponse successResponse = (JsonRpcSuccessResponse) response;
     assertThat(successResponse.getResult()).isEqualTo(true);
@@ -123,14 +136,14 @@ public void testRepeatDrop() {
 
   @Test
   public void testChangeToAuth() {
-    final VoteProposer proposer = new VoteProposer();
-    final Propose propose = new Propose(proposer);
+    final Propose propose = new Propose(validatorProvider);
     final Address a1 = Address.fromHexString("1");
 
-    proposer.drop(a1);
+    validatorProvider.getVoteProviderAtHead().get().dropVote(a1);
     final JsonRpcResponse response = propose.response(requestWithParams(a1, true));
 
-    assertThat(proposer.get(a1)).isEqualTo(Optional.of(VoteType.ADD));
+    assertThat(validatorProvider.getVoteProviderAtHead().get().getProposals().get(a1))
+        .isEqualTo(VoteType.ADD);
     assertThat(response.getType()).isEqualTo(JsonRpcResponseType.SUCCESS);
     final JsonRpcSuccessResponse successResponse = (JsonRpcSuccessResponse) response;
     assertThat(successResponse.getResult()).isEqualTo(true);
@@ -138,14 +151,14 @@ public void testChangeToAuth() {
 
   @Test
   public void testChangeToDrop() {
-    final VoteProposer proposer = new VoteProposer();
-    final Propose propose = new Propose(proposer);
+    final Propose propose = new Propose(validatorProvider);
     final Address a0 = Address.fromHexString("1");
 
-    proposer.auth(a0);
+    validatorProvider.getVoteProviderAtHead().get().authVote(a0);
     final JsonRpcResponse response = propose.response(requestWithParams(a0, false));
 
-    assertThat(proposer.get(a0)).isEqualTo(Optional.of(VoteType.DROP));
+    assertThat(validatorProvider.getVoteProviderAtHead().get().getProposals().get(a0))
+        .isEqualTo(VoteType.DROP);
     assertThat(response.getType()).isEqualTo(JsonRpcResponseType.SUCCESS);
     final JsonRpcSuccessResponse successResponse = (JsonRpcSuccessResponse) response;
     assertThat(successResponse.getResult()).isEqualTo(true);
diff --git a/consensus/common/build.gradle b/consensus/common/build.gradle
index 4e60eb7e9ab..540cd788315 100644
--- a/consensus/common/build.gradle
+++ b/consensus/common/build.gradle
@@ -30,26 +30,43 @@ jar {
 dependencies {
   api project(':plugin-api')
 
-  implementation project(':crypto')
+  implementation project(':config')
+  implementation project(':crypto:services')
+  implementation project(':datatypes')
   implementation project(':ethereum:api')
+  implementation project(':ethereum:blockcreation')
   implementation project(':ethereum:core')
   implementation project(':ethereum:eth')
   implementation project(':ethereum:p2p')
   implementation project(':ethereum:rlp')
+  implementation project(':evm')
   implementation project(':util')
 
   implementation 'com.fasterxml.jackson.core:jackson-databind'
   implementation 'com.google.guava:guava'
-  implementation 'org.apache.tuweni:bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
 
-  testImplementation project(':crypto')
+  testImplementation project(':config')
+  testImplementation project(':crypto:algorithms')
+  testImplementation project(':testutil')
   testImplementation project( path: ':ethereum:core', configuration: 'testSupportArtifacts')
+  testImplementation project( path: ':crypto:services', configuration: 'testSupportArtifacts')
+  testImplementation project(':metrics:core')
 
   testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
-  testImplementation 'org.mockito:mockito-core'
   testImplementation 'org.awaitility:awaitility'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
+  testImplementation 'org.mockito:mockito-core'
+
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
+
+  testSupportImplementation project( path: ':crypto:services', configuration: 'testSupportArtifacts')
+  testSupportImplementation project( path: ':ethereum:core', configuration: 'testSupportArtifacts')
+  testSupportImplementation 'org.mockito:mockito-core'
+  testSupportImplementation 'org.assertj:assertj-core'
 }
+
 configurations { testArtifacts }
 task testJar (type: Jar) {
   archiveBaseName = "${project.name}-test"
@@ -58,4 +75,5 @@ task testJar (type: Jar) {
 
 artifacts {
   testArtifacts testJar
+  testSupportArtifacts testSupportJar
 }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/BftValidatorOverrides.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/BftValidatorOverrides.java
index bf473dce47f..c2eefc6b45a 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/BftValidatorOverrides.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/BftValidatorOverrides.java
@@ -14,21 +14,33 @@
  */
 package org.hyperledger.besu.consensus.common;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+/** The Bft validator overrides. */
 public class BftValidatorOverrides {
 
   private final Map<Long, List<Address>> overriddenValidators;
 
+  /**
+   * Instantiates a new Bft validator overrides.
+   *
+   * @param overriddenValidators the overridden validators
+   */
   public BftValidatorOverrides(final Map<Long, List<Address>> overriddenValidators) {
     this.overriddenValidators = overriddenValidators;
   }
 
+  /**
+   * Gets for block.
+   *
+   * @param blockNumber the block number
+   * @return validators address
+   */
   public Optional<Collection<Address>> getForBlock(final long blockNumber) {
     return Optional.ofNullable(overriddenValidators.get(blockNumber));
   }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/BlockInterface.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/BlockInterface.java
index ee9af867eff..254bfb03cf3 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/BlockInterface.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/BlockInterface.java
@@ -14,19 +14,45 @@
  */
 package org.hyperledger.besu.consensus.common;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.consensus.common.validator.ValidatorVote;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 
 import java.util.Collection;
 import java.util.Optional;
 
+/** The interface Block interface. */
 public interface BlockInterface {
 
+  /**
+   * Gets proposer of block.
+   *
+   * @param header the header
+   * @return the proposer of block
+   */
   Address getProposerOfBlock(final org.hyperledger.besu.ethereum.core.BlockHeader header);
 
+  /**
+   * Gets proposer of block.
+   *
+   * @param header the header
+   * @return the proposer of block
+   */
   Address getProposerOfBlock(final org.hyperledger.besu.plugin.data.BlockHeader header);
 
+  /**
+   * Extract vote from header optional.
+   *
+   * @param header the header
+   * @return the optional
+   */
   Optional<ValidatorVote> extractVoteFromHeader(final BlockHeader header);
 
+  /**
+   * Validators in block collection.
+   *
+   * @param header the header
+   * @return the collection
+   */
   Collection<Address> validatorsInBlock(final BlockHeader header);
 }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/CombinedProtocolScheduleFactory.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/CombinedProtocolScheduleFactory.java
new file mode 100644
index 00000000000..9e9a8f90f9e
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/CombinedProtocolScheduleFactory.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common;
+
+import static com.google.common.base.Preconditions.checkState;
+
+import org.hyperledger.besu.consensus.common.bft.BftProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.DefaultProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ScheduledProtocolSpec;
+
+import java.math.BigInteger;
+import java.util.NavigableSet;
+import java.util.Optional;
+import java.util.function.Predicate;
+
+/** The Combined protocol schedule factory. */
+public class CombinedProtocolScheduleFactory {
+
+  /**
+   * Create protocol schedule.
+   *
+   * @param forkSpecs the fork specs
+   * @param chainId the chain id
+   * @return the protocol schedule
+   */
+  public BftProtocolSchedule create(
+      final NavigableSet<ForkSpec<ProtocolSchedule>> forkSpecs,
+      final Optional<BigInteger> chainId) {
+    final BftProtocolSchedule combinedProtocolSchedule =
+        new BftProtocolSchedule(new DefaultProtocolSchedule(chainId));
+    for (ForkSpec<ProtocolSchedule> spec : forkSpecs) {
+      checkState(
+          spec.getValue() instanceof DefaultProtocolSchedule,
+          "Consensus migration requires a DefaultProtocolSchedule");
+      final BftProtocolSchedule protocolSchedule =
+          new BftProtocolSchedule((DefaultProtocolSchedule) spec.getValue());
+
+      final Optional<Long> endBlock =
+          Optional.ofNullable(forkSpecs.higher(spec)).map(ForkSpec::getBlock);
+      protocolSchedule.getScheduledProtocolSpecs().stream()
+          .filter(protocolSpecMatchesConsensusBlockRange(spec.getBlock(), endBlock))
+          .forEach(s -> combinedProtocolSchedule.putBlockNumberMilestone(s.milestone(), s.spec()));
+
+      // When moving to a new consensus mechanism we want to use the last milestone but created by
+      // our consensus mechanism's BesuControllerBuilder so any additional rules are applied
+      if (spec.getBlock() > 0) {
+        combinedProtocolSchedule.putBlockNumberMilestone(
+            spec.getBlock(), protocolSchedule.getByBlockNumber(spec.getBlock()));
+      }
+    }
+    return combinedProtocolSchedule;
+  }
+
+  private Predicate<ScheduledProtocolSpec> protocolSpecMatchesConsensusBlockRange(
+      final long startBlock, final Optional<Long> endBlock) {
+    return scheduledProtocolSpec ->
+        scheduledProtocolSpec.milestone() >= startBlock
+            && endBlock.map(b -> scheduledProtocolSpec.milestone() < b).orElse(true);
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ConsensusHelpers.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ConsensusHelpers.java
index df3b5fcfe32..fad1160e48a 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ConsensusHelpers.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ConsensusHelpers.java
@@ -16,8 +16,16 @@
 
 import org.apache.tuweni.bytes.Bytes;
 
+/** The Consensus helpers. */
 public class ConsensusHelpers {
 
+  /**
+   * Zero left pad bytes.
+   *
+   * @param input the input
+   * @param requiredLength the required length
+   * @return the bytes
+   */
   public static Bytes zeroLeftPad(final Bytes input, final int requiredLength) {
     final int paddingByteCount = Math.max(0, requiredLength - input.size());
     return Bytes.concatenate(Bytes.wrap(new byte[paddingByteCount]), input)
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/EpochManager.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/EpochManager.java
index f8b74bccdec..47bbb3e446f 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/EpochManager.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/EpochManager.java
@@ -14,18 +14,36 @@
  */
 package org.hyperledger.besu.consensus.common;
 
+/** The Epoch manager. */
 public class EpochManager {
 
   private final long epochLengthInBlocks;
 
+  /**
+   * Instantiates a new Epoch manager.
+   *
+   * @param epochLengthInBlocks the epoch length in blocks
+   */
   public EpochManager(final long epochLengthInBlocks) {
     this.epochLengthInBlocks = epochLengthInBlocks;
   }
 
+  /**
+   * Is epoch block.
+   *
+   * @param blockNumber the block number
+   * @return the boolean
+   */
   public boolean isEpochBlock(final long blockNumber) {
     return (blockNumber % epochLengthInBlocks) == 0;
   }
 
+  /**
+   * Gets last epoch block.
+   *
+   * @param blockNumber the block number
+   * @return the last epoch block
+   */
   public long getLastEpochBlock(final long blockNumber) {
     return blockNumber - (blockNumber % epochLengthInBlocks);
   }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ForkSpec.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ForkSpec.java
new file mode 100644
index 00000000000..f52bbc982b3
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ForkSpec.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common;
+
+import java.util.Comparator;
+import java.util.Objects;
+
+/**
+ * The Fork spec.
+ *
+ * @param <C> the type parameter
+ */
+public class ForkSpec<C> {
+
+  /** The constant COMPARATOR. */
+  public static final Comparator<ForkSpec<?>> COMPARATOR = Comparator.comparing(ForkSpec::getBlock);
+
+  private final long block;
+  private final C value;
+
+  /**
+   * Instantiates a new Fork spec.
+   *
+   * @param block the block
+   * @param value the value
+   */
+  public ForkSpec(final long block, final C value) {
+    this.block = block;
+    this.value = value;
+  }
+
+  /**
+   * Gets block.
+   *
+   * @return the block
+   */
+  public long getBlock() {
+    return block;
+  }
+
+  /**
+   * Gets value.
+   *
+   * @return the value
+   */
+  public C getValue() {
+    return value;
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    final ForkSpec<?> that = (ForkSpec<?>) o;
+    return block == that.block && Objects.equals(value, that.value);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(block, value);
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ForksSchedule.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ForksSchedule.java
new file mode 100644
index 00000000000..1e8d724b439
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ForksSchedule.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright Hyperledger Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.NavigableSet;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.function.Function;
+
+/**
+ * The Forks schedule.
+ *
+ * @param <C> the type parameter
+ */
+public class ForksSchedule<C> {
+
+  private final NavigableSet<ForkSpec<C>> forks =
+      new TreeSet<>(
+          Comparator.comparing((Function<ForkSpec<C>, Long>) ForkSpec::getBlock).reversed());
+
+  /**
+   * Instantiates a new Forks schedule.
+   *
+   * @param forks the forks
+   */
+  public ForksSchedule(final Collection<ForkSpec<C>> forks) {
+    this.forks.addAll(forks);
+  }
+
+  /**
+   * Gets fork.
+   *
+   * @param blockNumber the block number
+   * @return the fork
+   */
+  public ForkSpec<C> getFork(final long blockNumber) {
+    for (final ForkSpec<C> f : forks) {
+      if (blockNumber >= f.getBlock()) {
+        return f;
+      }
+    }
+
+    return forks.first();
+  }
+
+  /**
+   * Gets forks.
+   *
+   * @return the forks
+   */
+  public Set<ForkSpec<C>> getForks() {
+    return Collections.unmodifiableSet(forks);
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/MigratingContext.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/MigratingContext.java
new file mode 100644
index 00000000000..4011e40c723
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/MigratingContext.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common;
+
+import org.hyperledger.besu.ethereum.ConsensusContext;
+
+/** The Migrating context. */
+public class MigratingContext implements ConsensusContext {
+
+  private final ForksSchedule<ConsensusContext> consensusContextSchedule;
+
+  /**
+   * Instantiates a new Migrating context.
+   *
+   * @param consensusContextSchedule the consensus context schedule
+   */
+  public MigratingContext(final ForksSchedule<ConsensusContext> consensusContextSchedule) {
+    this.consensusContextSchedule = consensusContextSchedule;
+  }
+
+  /**
+   * Gets consensus context schedule.
+   *
+   * @return the consensus context schedule
+   */
+  public ForksSchedule<ConsensusContext> getConsensusContextSchedule() {
+    return consensusContextSchedule;
+  }
+
+  @Override
+  public <C extends ConsensusContext> C as(final Class<C> klass) {
+    return klass.cast(this);
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/MigratingMiningCoordinator.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/MigratingMiningCoordinator.java
new file mode 100644
index 00000000000..84fbac198a5
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/MigratingMiningCoordinator.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright Hyperledger Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
+import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
+import org.hyperledger.besu.ethereum.chain.BlockAddedObserver;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Migrating mining coordinator. */
+public class MigratingMiningCoordinator implements MiningCoordinator, BlockAddedObserver {
+
+  private static final Logger LOG = LoggerFactory.getLogger(MigratingMiningCoordinator.class);
+
+  private final ForksSchedule<MiningCoordinator> miningCoordinatorSchedule;
+  private final Blockchain blockchain;
+  private MiningCoordinator activeMiningCoordinator;
+  private long blockAddedObserverId;
+
+  /**
+   * Instantiates a new Migrating mining coordinator.
+   *
+   * @param miningCoordinatorSchedule the mining coordinator schedule
+   * @param blockchain the blockchain
+   */
+  public MigratingMiningCoordinator(
+      final ForksSchedule<MiningCoordinator> miningCoordinatorSchedule,
+      final Blockchain blockchain) {
+    this.miningCoordinatorSchedule = miningCoordinatorSchedule;
+    this.blockchain = blockchain;
+    this.activeMiningCoordinator =
+        this.miningCoordinatorSchedule.getFork(blockchain.getChainHeadBlockNumber()).getValue();
+  }
+
+  @Override
+  public void start() {
+    blockAddedObserverId = blockchain.observeBlockAdded(this);
+    startActiveMiningCoordinator();
+  }
+
+  private void startActiveMiningCoordinator() {
+    activeMiningCoordinator.start();
+    if (activeMiningCoordinator instanceof BlockAddedObserver) {
+      ((BlockAddedObserver) activeMiningCoordinator).removeObserver();
+    }
+  }
+
+  @Override
+  public void stop() {
+    blockchain.removeObserver(blockAddedObserverId);
+    activeMiningCoordinator.stop();
+  }
+
+  @Override
+  public void awaitStop() throws InterruptedException {
+    activeMiningCoordinator.awaitStop();
+  }
+
+  @Override
+  public boolean enable() {
+    return activeMiningCoordinator.enable();
+  }
+
+  @Override
+  public boolean disable() {
+    return activeMiningCoordinator.disable();
+  }
+
+  @Override
+  public boolean isMining() {
+    return activeMiningCoordinator.isMining();
+  }
+
+  @Override
+  public Wei getMinTransactionGasPrice() {
+    return activeMiningCoordinator.getMinTransactionGasPrice();
+  }
+
+  @Override
+  public void setExtraData(final Bytes extraData) {
+    activeMiningCoordinator.setExtraData(extraData);
+  }
+
+  @Override
+  public Optional<Address> getCoinbase() {
+    return activeMiningCoordinator.getCoinbase();
+  }
+
+  @Override
+  public Optional<Block> createBlock(
+      final BlockHeader parentHeader,
+      final List<Transaction> transactions,
+      final List<BlockHeader> ommers) {
+    return activeMiningCoordinator.createBlock(parentHeader, transactions, ommers);
+  }
+
+  @Override
+  public Optional<Block> createBlock(final BlockHeader parentHeader, final long timestamp) {
+    return Optional.empty();
+  }
+
+  @Override
+  public void changeTargetGasLimit(final Long targetGasLimit) {
+    activeMiningCoordinator.changeTargetGasLimit(targetGasLimit);
+  }
+
+  @Override
+  public void onBlockAdded(final BlockAddedEvent event) {
+    final long currentBlock = event.getBlock().getHeader().getNumber();
+    final MiningCoordinator nextMiningCoordinator =
+        miningCoordinatorSchedule.getFork(currentBlock + 1).getValue();
+
+    if (activeMiningCoordinator != nextMiningCoordinator) {
+      LOG.trace(
+          "Migrating mining coordinator at block {} from {} to {}",
+          currentBlock,
+          activeMiningCoordinator.getClass().getSimpleName(),
+          nextMiningCoordinator.getClass().getSimpleName());
+
+      final Runnable stopActiveCoordinatorTask = () -> activeMiningCoordinator.stop();
+      final Runnable startNextCoordinatorTask =
+          () -> {
+            activeMiningCoordinator = nextMiningCoordinator;
+            startActiveMiningCoordinator();
+            if (activeMiningCoordinator instanceof BlockAddedObserver) {
+              ((BlockAddedObserver) activeMiningCoordinator).onBlockAdded(event);
+            }
+          };
+
+      CompletableFuture.runAsync(stopActiveCoordinatorTask).thenRun(startNextCoordinatorTask);
+
+    } else if (activeMiningCoordinator instanceof BlockAddedObserver) {
+      ((BlockAddedObserver) activeMiningCoordinator).onBlockAdded(event);
+    }
+  }
+
+  /**
+   * Gets mining coordinator schedule.
+   *
+   * @return the mining coordinator schedule
+   */
+  @VisibleForTesting
+  public ForksSchedule<MiningCoordinator> getMiningCoordinatorSchedule() {
+    return this.miningCoordinatorSchedule;
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/MigratingProtocolContext.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/MigratingProtocolContext.java
new file mode 100644
index 00000000000..e4304a3dbd0
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/MigratingProtocolContext.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common;
+
+import org.hyperledger.besu.ethereum.ConsensusContext;
+import org.hyperledger.besu.ethereum.ConsensusContextFactory;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.plugin.services.txselection.TransactionSelectorFactory;
+
+import java.util.Optional;
+
+/** The Migrating protocol context. */
+public class MigratingProtocolContext extends ProtocolContext {
+
+  private final ForksSchedule<ConsensusContext> consensusContextSchedule;
+
+  /**
+   * Instantiates a new Migrating protocol context.
+   *
+   * @param blockchain the blockchain
+   * @param worldStateArchive the world state archive
+   * @param consensusContextSchedule the consensus context schedule
+   * @param transactionSelectorFactory the optional transaction selector factory
+   */
+  public MigratingProtocolContext(
+      final MutableBlockchain blockchain,
+      final WorldStateArchive worldStateArchive,
+      final ForksSchedule<ConsensusContext> consensusContextSchedule,
+      final Optional<TransactionSelectorFactory> transactionSelectorFactory) {
+    super(blockchain, worldStateArchive, null, transactionSelectorFactory);
+    this.consensusContextSchedule = consensusContextSchedule;
+  }
+
+  /**
+   * Init protocol context.
+   *
+   * @param blockchain the blockchain
+   * @param worldStateArchive the world state archive
+   * @param protocolSchedule the protocol schedule
+   * @param consensusContextFactory the consensus context factory
+   * @param transactionSelectorFactory the optional transaction selector factory
+   * @return the protocol context
+   */
+  public static ProtocolContext init(
+      final MutableBlockchain blockchain,
+      final WorldStateArchive worldStateArchive,
+      final ProtocolSchedule protocolSchedule,
+      final ConsensusContextFactory consensusContextFactory,
+      final Optional<TransactionSelectorFactory> transactionSelectorFactory) {
+    final ConsensusContext consensusContext =
+        consensusContextFactory.create(blockchain, worldStateArchive, protocolSchedule);
+    final MigratingContext migratingContext = consensusContext.as(MigratingContext.class);
+    return new MigratingProtocolContext(
+        blockchain,
+        worldStateArchive,
+        migratingContext.getConsensusContextSchedule(),
+        transactionSelectorFactory);
+  }
+
+  @Override
+  public <C extends ConsensusContext> C getConsensusContext(final Class<C> klass) {
+    final long chainHeadBlockNumber = getBlockchain().getChainHeadBlockNumber();
+    return consensusContextSchedule.getFork(chainHeadBlockNumber).getValue().as(klass);
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/PoaContext.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/PoaContext.java
index b10bf63c357..47d96cefc3b 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/PoaContext.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/PoaContext.java
@@ -14,6 +14,14 @@
  */
 package org.hyperledger.besu.consensus.common;
 
-public interface PoaContext {
+import org.hyperledger.besu.ethereum.ConsensusContext;
+
+/** The interface Poa context. */
+public interface PoaContext extends ConsensusContext {
+  /**
+   * Gets block interface.
+   *
+   * @return the block interface
+   */
   BlockInterface getBlockInterface();
 }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/PoaQueryServiceImpl.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/PoaQueryServiceImpl.java
index 930eb93c045..71d8871ef2b 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/PoaQueryServiceImpl.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/PoaQueryServiceImpl.java
@@ -14,9 +14,9 @@
  */
 package org.hyperledger.besu.consensus.common;
 
-import org.hyperledger.besu.crypto.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.plugin.data.Address;
 import org.hyperledger.besu.plugin.data.BlockHeader;
 import org.hyperledger.besu.plugin.services.metrics.PoAMetricsService;
 import org.hyperledger.besu.plugin.services.query.PoaQueryService;
@@ -24,12 +24,20 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
+/** The Poa query service. */
 public class PoaQueryServiceImpl implements PoaQueryService, PoAMetricsService {
 
   private final BlockInterface blockInterface;
   private final Blockchain blockchain;
   private final NodeKey nodeKey;
 
+  /**
+   * Instantiates a new Poa query service.
+   *
+   * @param blockInterface the block interface
+   * @param blockchain the blockchain
+   * @param nodeKey the node key
+   */
   public PoaQueryServiceImpl(
       final BlockInterface blockInterface, final Blockchain blockchain, final NodeKey nodeKey) {
     this.blockInterface = blockInterface;
@@ -47,12 +55,17 @@ public Address getProposerOfBlock(final BlockHeader header) {
     return this.blockInterface.getProposerOfBlock(header);
   }
 
+  /**
+   * Gets blockchain.
+   *
+   * @return the blockchain
+   */
   protected Blockchain getBlockchain() {
     return blockchain;
   }
 
   @Override
   public Address getLocalSignerAddress() {
-    return org.hyperledger.besu.ethereum.core.Address.extract(nodeKey.getPublicKey());
+    return org.hyperledger.besu.datatypes.Address.extract(nodeKey.getPublicKey());
   }
 }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ValidatorProvider.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ValidatorProvider.java
deleted file mode 100644
index 3ae90fad2e0..00000000000
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ValidatorProvider.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.common;
-
-import org.hyperledger.besu.ethereum.core.Address;
-
-import java.util.Collection;
-
-public interface ValidatorProvider {
-
-  // Returns the current list of validators
-  Collection<Address> getValidators();
-}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BaseBftProtocolScheduleBuilder.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BaseBftProtocolScheduleBuilder.java
new file mode 100644
index 00000000000..c17652f4a43
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BaseBftProtocolScheduleBuilder.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft;
+
+import org.hyperledger.besu.config.BftConfigOptions;
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
+import org.hyperledger.besu.ethereum.mainnet.DefaultProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockBodyValidator;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockImporter;
+import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSpecs;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpecAdapters;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpecBuilder;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+
+/** Defines the protocol behaviours for a blockchain using a BFT consensus mechanism. */
+public abstract class BaseBftProtocolScheduleBuilder {
+
+  private static final BigInteger DEFAULT_CHAIN_ID = BigInteger.ONE;
+
+  /**
+   * Create protocol schedule.
+   *
+   * @param config the config
+   * @param forksSchedule the forks schedule
+   * @param privacyParameters the privacy parameters
+   * @param isRevertReasonEnabled the is revert reason enabled
+   * @param bftExtraDataCodec the bft extra data codec
+   * @param evmConfiguration the evm configuration
+   * @return the protocol schedule
+   */
+  public BftProtocolSchedule createProtocolSchedule(
+      final GenesisConfigOptions config,
+      final ForksSchedule<? extends BftConfigOptions> forksSchedule,
+      final PrivacyParameters privacyParameters,
+      final boolean isRevertReasonEnabled,
+      final BftExtraDataCodec bftExtraDataCodec,
+      final EvmConfiguration evmConfiguration) {
+    final Map<Long, Function<ProtocolSpecBuilder, ProtocolSpecBuilder>> specMap = new HashMap<>();
+
+    forksSchedule
+        .getForks()
+        .forEach(
+            forkSpec ->
+                specMap.put(
+                    forkSpec.getBlock(),
+                    builder -> applyBftChanges(builder, forkSpec.getValue(), bftExtraDataCodec)));
+
+    final ProtocolSpecAdapters specAdapters = new ProtocolSpecAdapters(specMap);
+
+    final ProtocolSchedule protocolSchedule =
+        new ProtocolScheduleBuilder(
+                config,
+                DEFAULT_CHAIN_ID,
+                specAdapters,
+                privacyParameters,
+                isRevertReasonEnabled,
+                evmConfiguration)
+            .createProtocolSchedule();
+    return new BftProtocolSchedule((DefaultProtocolSchedule) protocolSchedule);
+  }
+
+  /**
+   * Create block header ruleset.
+   *
+   * @param config the config
+   * @param feeMarket the fee market
+   * @return the block header validator . builder
+   */
+  protected abstract BlockHeaderValidator.Builder createBlockHeaderRuleset(
+      final BftConfigOptions config, final FeeMarket feeMarket);
+
+  private ProtocolSpecBuilder applyBftChanges(
+      final ProtocolSpecBuilder builder,
+      final BftConfigOptions configOptions,
+      final BftExtraDataCodec bftExtraDataCodec) {
+    if (configOptions.getEpochLength() <= 0) {
+      throw new IllegalArgumentException("Epoch length in config must be greater than zero");
+    }
+    if (configOptions.getBlockRewardWei().signum() < 0) {
+      throw new IllegalArgumentException("Bft Block reward in config cannot be negative");
+    }
+
+    return builder
+        .blockHeaderValidatorBuilder(
+            feeMarket -> createBlockHeaderRuleset(configOptions, feeMarket))
+        .ommerHeaderValidatorBuilder(
+            feeMarket -> createBlockHeaderRuleset(configOptions, feeMarket))
+        .blockBodyValidatorBuilder(MainnetBlockBodyValidator::new)
+        .blockValidatorBuilder(MainnetProtocolSpecs.blockValidatorBuilder())
+        .blockImporterBuilder(MainnetBlockImporter::new)
+        .difficultyCalculator((time, parent, protocolContext) -> BigInteger.ONE)
+        .skipZeroBlockRewards(true)
+        .blockHeaderFunctions(BftBlockHeaderFunctions.forOnchainBlock(bftExtraDataCodec))
+        .blockReward(Wei.of(configOptions.getBlockRewardWei()))
+        .miningBeneficiaryCalculator(
+            header -> configOptions.getMiningBeneficiary().orElseGet(header::getCoinbase));
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftBlockHashing.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftBlockHashing.java
new file mode 100644
index 00000000000..94dc41b3544
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftBlockHashing.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
+import org.hyperledger.besu.ethereum.core.Util;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+
+import java.util.List;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Bft block hashing. */
+public class BftBlockHashing {
+  private final BftExtraDataCodec bftExtraDataCodec;
+
+  /**
+   * Instantiates a new Bft block hashing.
+   *
+   * @param bftExtraDataCodec the bft extra data codec
+   */
+  public BftBlockHashing(final BftExtraDataCodec bftExtraDataCodec) {
+    this.bftExtraDataCodec = bftExtraDataCodec;
+  }
+
+  /**
+   * Constructs a hash of the block header suitable for signing as a committed seal. The extra data
+   * in the hash uses an empty list for the committed seals.
+   *
+   * @param header The header for which a proposer seal is to be calculated (with or without extra
+   *     data)
+   * @param bftExtraData The extra data block which is to be inserted to the header once seal is
+   *     calculated
+   * @return the hash of the header including the validator and proposer seal in the extra data
+   */
+  public Hash calculateDataHashForCommittedSeal(
+      final BlockHeader header, final BftExtraData bftExtraData) {
+    return Hash.hash(
+        serializeHeader(
+            header,
+            () -> bftExtraDataCodec.encodeWithoutCommitSeals(bftExtraData),
+            bftExtraDataCodec));
+  }
+
+  /**
+   * Calculate data hash for committed seal hash.
+   *
+   * @param header the header
+   * @return the hash
+   */
+  public Hash calculateDataHashForCommittedSeal(final BlockHeader header) {
+    final BftExtraData bftExtraData = bftExtraDataCodec.decode(header);
+    return Hash.hash(
+        serializeHeader(
+            header,
+            () -> bftExtraDataCodec.encodeWithoutCommitSeals(bftExtraData),
+            bftExtraDataCodec));
+  }
+
+  /**
+   * Constructs a hash of the block header, but omits the committerSeals and sets round number to 0
+   * (as these change on each of the potentially circulated blocks at the current chain height).
+   *
+   * @param header The header for which a block hash is to be calculated
+   * @return the hash of the header to be used when referencing the header on the blockchain
+   */
+  public Hash calculateHashOfBftBlockOnchain(final BlockHeader header) {
+    final BftExtraData bftExtraData = bftExtraDataCodec.decode(header);
+    return Hash.hash(
+        serializeHeader(
+            header,
+            () -> bftExtraDataCodec.encodeWithoutCommitSealsAndRoundNumber(bftExtraData),
+            bftExtraDataCodec));
+  }
+
+  /**
+   * Recovers the {@link Address} for each validator that contributed a committed seal to the block.
+   *
+   * @param header the block header that was signed by the committed seals
+   * @param bftExtraData the parsed {@link BftExtraData} from the header
+   * @return the addresses of validators that provided a committed seal
+   */
+  public List<Address> recoverCommitterAddresses(
+      final BlockHeader header, final BftExtraData bftExtraData) {
+    final Hash committerHash = calculateDataHashForCommittedSeal(header, bftExtraData);
+
+    return bftExtraData.getSeals().stream()
+        .map(p -> Util.signatureToAddress(p, committerHash))
+        .collect(Collectors.toList());
+  }
+
+  /**
+   * Serialize header bytes.
+   *
+   * @param header the header
+   * @param extraDataSerializer the extra data serializer
+   * @param bftExtraDataCodec the bft extra data codec
+   * @return the bytes
+   */
+  public static Bytes serializeHeader(
+      final BlockHeader header,
+      final Supplier<Bytes> extraDataSerializer,
+      final BftExtraDataCodec bftExtraDataCodec) {
+
+    // create a block header which is a copy of the header supplied as parameter except of the
+    // extraData field
+    final BlockHeaderBuilder builder = BlockHeaderBuilder.fromHeader(header);
+    builder.blockHeaderFunctions(BftBlockHeaderFunctions.forOnchainBlock(bftExtraDataCodec));
+
+    // set the extraData field using the supplied extraDataSerializer if the block height is not 0
+    if (header.getNumber() == BlockHeader.GENESIS_BLOCK_NUMBER) {
+      builder.extraData(header.getExtraData());
+    } else {
+      builder.extraData(extraDataSerializer.get());
+    }
+
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    builder.buildBlockHeader().writeTo(out);
+    return out.encoded();
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftBlockHeaderFunctions.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftBlockHeaderFunctions.java
new file mode 100644
index 00000000000..94970d0fdb3
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftBlockHeaderFunctions.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
+
+import java.util.function.Function;
+
+/** The Bft block header functions. */
+public class BftBlockHeaderFunctions implements BlockHeaderFunctions {
+
+  private final Function<BlockHeader, Hash> hashFunction;
+  private final BftExtraDataCodec bftExtraDataCodec;
+
+  /**
+   * Instantiates a new Bft block header functions.
+   *
+   * @param hashFunction the hash function
+   * @param bftExtraDataCodec the bft extra data codec
+   */
+  public BftBlockHeaderFunctions(
+      final Function<BlockHeader, Hash> hashFunction, final BftExtraDataCodec bftExtraDataCodec) {
+    this.hashFunction = hashFunction;
+    this.bftExtraDataCodec = bftExtraDataCodec;
+  }
+
+  /**
+   * Instantiate Block Header Functions for onchain block.
+   *
+   * @param bftExtraDataCodec the bft extra data codec
+   * @return the block header functions
+   */
+  public static BlockHeaderFunctions forOnchainBlock(final BftExtraDataCodec bftExtraDataCodec) {
+    return new BftBlockHeaderFunctions(
+        h -> new BftBlockHashing(bftExtraDataCodec).calculateHashOfBftBlockOnchain(h),
+        bftExtraDataCodec);
+  }
+
+  /**
+   * Instantiate Block Header Functions for committed seal.
+   *
+   * @param bftExtraDataCodec the bft extra data codec
+   * @return the block header functions
+   */
+  public static BlockHeaderFunctions forCommittedSeal(final BftExtraDataCodec bftExtraDataCodec) {
+    return new BftBlockHeaderFunctions(
+        h -> new BftBlockHashing(bftExtraDataCodec).calculateDataHashForCommittedSeal(h),
+        bftExtraDataCodec);
+  }
+
+  @Override
+  public Hash hash(final BlockHeader header) {
+    return hashFunction.apply(header);
+  }
+
+  @Override
+  public BftExtraData parseExtraData(final BlockHeader header) {
+    return bftExtraDataCodec.decodeRaw(header.getExtraData());
+  }
+
+  @Override
+  public int getCheckPointWindowSize(final BlockHeader header) {
+    return bftExtraDataCodec.decodeRaw(header.getExtraData()).getValidators().size();
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftBlockInterface.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftBlockInterface.java
new file mode 100644
index 00000000000..f097cb56791
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftBlockInterface.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft;
+
+import org.hyperledger.besu.consensus.common.BlockInterface;
+import org.hyperledger.besu.consensus.common.validator.ValidatorVote;
+import org.hyperledger.besu.consensus.common.validator.VoteType;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
+import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.core.Util;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/** The Bft block interface. */
+public class BftBlockInterface implements BlockInterface {
+
+  private final BftExtraDataCodec bftExtraDataCodec;
+
+  /**
+   * Instantiates a new Bft block interface.
+   *
+   * @param bftExtraDataCodec the bft extra data codec
+   */
+  public BftBlockInterface(final BftExtraDataCodec bftExtraDataCodec) {
+    this.bftExtraDataCodec = bftExtraDataCodec;
+  }
+
+  @Override
+  public Address getProposerOfBlock(final BlockHeader header) {
+    return header.getCoinbase();
+  }
+
+  @Override
+  public Address getProposerOfBlock(final org.hyperledger.besu.plugin.data.BlockHeader header) {
+    return Address.fromHexString(header.getCoinbase().toHexString());
+  }
+
+  @Override
+  public Optional<ValidatorVote> extractVoteFromHeader(final BlockHeader header) {
+    final BftExtraData bftExtraData = bftExtraDataCodec.decode(header);
+
+    if (bftExtraData.getVote().isPresent()) {
+      final Vote headerVote = bftExtraData.getVote().get();
+      final ValidatorVote vote =
+          new ValidatorVote(
+              headerVote.isAuth() ? VoteType.ADD : VoteType.DROP,
+              getProposerOfBlock(header),
+              headerVote.getRecipient());
+      return Optional.of(vote);
+    }
+    return Optional.empty();
+  }
+
+  @Override
+  public Collection<Address> validatorsInBlock(final BlockHeader header) {
+    final BftExtraData bftExtraData = bftExtraDataCodec.decode(header);
+    return bftExtraData.getValidators();
+  }
+
+  /**
+   * Replace round in block.
+   *
+   * @param block the block
+   * @param round the round
+   * @param blockHeaderFunctions the block header functions
+   * @return the block
+   */
+  public Block replaceRoundInBlock(
+      final Block block, final int round, final BlockHeaderFunctions blockHeaderFunctions) {
+    final BftExtraData prevExtraData = bftExtraDataCodec.decode(block.getHeader());
+    final BftExtraData substituteExtraData =
+        new BftExtraData(
+            prevExtraData.getVanityData(),
+            prevExtraData.getSeals(),
+            prevExtraData.getVote(),
+            round,
+            prevExtraData.getValidators());
+
+    final BlockHeaderBuilder headerBuilder = BlockHeaderBuilder.fromHeader(block.getHeader());
+    headerBuilder
+        .extraData(bftExtraDataCodec.encode(substituteExtraData))
+        .blockHeaderFunctions(blockHeaderFunctions);
+
+    final BlockHeader newHeader = headerBuilder.buildBlockHeader();
+
+    return new Block(newHeader, block.getBody());
+  }
+
+  /**
+   * Gets extra data.
+   *
+   * @param header the header
+   * @return the extra data
+   */
+  public BftExtraData getExtraData(final BlockHeader header) {
+    return bftExtraDataCodec.decode(header);
+  }
+
+  /**
+   * Gets committers.
+   *
+   * @param header the header
+   * @return the committers
+   */
+  public List<Address> getCommitters(final BlockHeader header) {
+    final BftExtraData bftExtraData = bftExtraDataCodec.decode(header);
+
+    final Hash committerHash =
+        Hash.hash(
+            BftBlockHashing.serializeHeader(
+                header,
+                () -> bftExtraDataCodec.encodeWithoutCommitSeals(bftExtraData),
+                bftExtraDataCodec));
+
+    return bftExtraData.getSeals().stream()
+        .map(p -> Util.signatureToAddress(p, committerHash))
+        .collect(Collectors.toList());
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftContext.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftContext.java
new file mode 100644
index 00000000000..4107703b10f
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftContext.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft;
+
+import org.hyperledger.besu.consensus.common.EpochManager;
+import org.hyperledger.besu.consensus.common.PoaContext;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.ethereum.ConsensusContext;
+
+/** Holds the BFT specific mutable state. */
+public class BftContext implements PoaContext {
+
+  private final ValidatorProvider validatorProvider;
+  private final EpochManager epochManager;
+  private final BftBlockInterface blockInterface;
+
+  /**
+   * Instantiates a new Bft context.
+   *
+   * @param validatorProvider the validator provider
+   * @param epochManager the epoch manager
+   * @param blockInterface the block interface
+   */
+  public BftContext(
+      final ValidatorProvider validatorProvider,
+      final EpochManager epochManager,
+      final BftBlockInterface blockInterface) {
+    this.validatorProvider = validatorProvider;
+    this.epochManager = epochManager;
+    this.blockInterface = blockInterface;
+  }
+
+  /**
+   * Gets validator provider.
+   *
+   * @return the validator provider
+   */
+  public ValidatorProvider getValidatorProvider() {
+    return validatorProvider;
+  }
+
+  /**
+   * Gets epoch manager.
+   *
+   * @return the epoch manager
+   */
+  public EpochManager getEpochManager() {
+    return epochManager;
+  }
+
+  @Override
+  public BftBlockInterface getBlockInterface() {
+    return blockInterface;
+  }
+
+  @Override
+  public <C extends ConsensusContext> C as(final Class<C> klass) {
+    return klass.cast(this);
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftEventQueue.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftEventQueue.java
index c212bf8bc8a..a4f2faff788 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftEventQueue.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftEventQueue.java
@@ -21,16 +21,21 @@
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nullable;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Threadsafe queue that lets parts of the system inform the Bft infrastructure about events */
 public class BftEventQueue {
   private final BlockingQueue<BftEvent> queue = new LinkedBlockingQueue<>();
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(BftEventQueue.class);
   private final int messageQueueLimit;
 
+  /**
+   * Instantiates a new Bft event queue.
+   *
+   * @param messageQueueLimit the message queue limit
+   */
   public BftEventQueue(final int messageQueueLimit) {
     this.messageQueueLimit = messageQueueLimit;
   }
@@ -48,10 +53,20 @@ public void add(final BftEvent event) {
     }
   }
 
+  /**
+   * Size of queue.
+   *
+   * @return the int
+   */
   public int size() {
     return queue.size();
   }
 
+  /**
+   * Is empty.
+   *
+   * @return the boolean
+   */
   public boolean isEmpty() {
     return queue.isEmpty();
   }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftExecutors.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftExecutors.java
index 27db69eb914..fc06275f61e 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftExecutors.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftExecutors.java
@@ -23,46 +23,78 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Bft executors. */
 public class BftExecutors {
 
   private enum State {
+    /** Idle state. */
     IDLE,
+    /** Running state. */
     RUNNING,
+    /** Stopped state. */
     STOPPED
   }
 
-  private static final Logger LOG = LogManager.getLogger();
+  /** The enum Consensus type. */
+  public enum ConsensusType {
+    /** Ibft consensus type. */
+    IBFT,
+    /** Qbft consensus type. */
+    QBFT
+  }
+
+  private static final Logger LOG = LoggerFactory.getLogger(BftExecutors.class);
 
   private final Duration shutdownTimeout = Duration.ofSeconds(30);
   private final MetricsSystem metricsSystem;
+  private final ConsensusType consensusType;
 
   private volatile ScheduledExecutorService timerExecutor;
   private volatile ExecutorService bftProcessorExecutor;
   private volatile State state = State.IDLE;
 
-  private BftExecutors(final MetricsSystem metricsSystem) {
+  private BftExecutors(final MetricsSystem metricsSystem, final ConsensusType consensusType) {
     this.metricsSystem = metricsSystem;
+    this.consensusType = consensusType;
   }
 
-  public static BftExecutors create(final MetricsSystem metricsSystem) {
-    return new BftExecutors(metricsSystem);
+  /**
+   * Create bft executors.
+   *
+   * @param metricsSystem the metrics system
+   * @param consensusType the consensus type
+   * @return the bft executors
+   */
+  public static BftExecutors create(
+      final MetricsSystem metricsSystem, final ConsensusType consensusType) {
+    return new BftExecutors(metricsSystem, consensusType);
   }
 
+  /** Start. */
   public synchronized void start() {
     if (state != State.IDLE) {
       // Nothing to do
       return;
     }
     state = State.RUNNING;
-    bftProcessorExecutor = Executors.newSingleThreadExecutor();
-    timerExecutor = MonitoredExecutors.newScheduledThreadPool("BftTimerExecutor", 1, metricsSystem);
+    final ThreadFactory namedThreadFactory =
+        new ThreadFactoryBuilder()
+            .setNameFormat("BftProcessorExecutor-" + consensusType.name() + "-%d")
+            .build();
+    bftProcessorExecutor = Executors.newSingleThreadExecutor(namedThreadFactory);
+    timerExecutor =
+        MonitoredExecutors.newScheduledThreadPool(
+            "BftTimerExecutor-" + consensusType.name(), 1, metricsSystem);
   }
 
+  /** Stop. */
   public void stop() {
     synchronized (this) {
       if (state != State.RUNNING) {
@@ -70,11 +102,15 @@ public void stop() {
       }
       state = State.STOPPED;
     }
-
     timerExecutor.shutdownNow();
     bftProcessorExecutor.shutdownNow();
   }
 
+  /**
+   * Await stop.
+   *
+   * @throws InterruptedException the interrupted exception
+   */
   public void awaitStop() throws InterruptedException {
     if (!timerExecutor.awaitTermination(shutdownTimeout.getSeconds(), TimeUnit.SECONDS)) {
       LOG.error("{} timer executor did not shutdown cleanly.", getClass().getSimpleName());
@@ -84,11 +120,24 @@ public void awaitStop() throws InterruptedException {
     }
   }
 
+  /**
+   * Execute bft processor.
+   *
+   * @param bftProcessor the bft processor
+   */
   public synchronized void executeBftProcessor(final BftProcessor bftProcessor) {
     assertRunning();
     bftProcessorExecutor.execute(bftProcessor);
   }
 
+  /**
+   * Schedule task.
+   *
+   * @param command the command
+   * @param delay the delay
+   * @param unit the unit
+   * @return the scheduled future
+   */
   public synchronized ScheduledFuture<?> scheduleTask(
       final Runnable command, final long delay, final TimeUnit unit) {
     assertRunning();
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftExtraData.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftExtraData.java
new file mode 100644
index 00000000000..a24c33a93d9
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftExtraData.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.core.ParsedExtraData;
+
+import java.util.Collection;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Bft extra data. */
+public class BftExtraData implements ParsedExtraData {
+  private final Bytes vanityData;
+  private final Collection<SECPSignature> seals;
+  private final Collection<Address> validators;
+  private final Optional<Vote> vote;
+  private final int round;
+
+  /**
+   * Instantiates a new Bft extra data.
+   *
+   * @param vanityData the vanity data
+   * @param seals the seals
+   * @param vote the vote
+   * @param round the round
+   * @param validators the validators
+   */
+  public BftExtraData(
+      final Bytes vanityData,
+      final Collection<SECPSignature> seals,
+      final Optional<Vote> vote,
+      final int round,
+      final Collection<Address> validators) {
+    checkNotNull(vanityData);
+    checkNotNull(seals);
+    checkNotNull(validators);
+    this.vanityData = vanityData;
+    this.seals = seals;
+    this.validators = validators;
+    this.vote = vote;
+    this.round = round;
+  }
+
+  /**
+   * Gets vanity data.
+   *
+   * @return the vanity data
+   */
+  public Bytes getVanityData() {
+    return vanityData;
+  }
+
+  /**
+   * Gets seals.
+   *
+   * @return the seals
+   */
+  public Collection<SECPSignature> getSeals() {
+    return seals;
+  }
+
+  /**
+   * Gets validators.
+   *
+   * @return the validators
+   */
+  public Collection<Address> getValidators() {
+    return validators;
+  }
+
+  /**
+   * Gets vote.
+   *
+   * @return the vote
+   */
+  public Optional<Vote> getVote() {
+    return vote;
+  }
+
+  /**
+   * Gets round.
+   *
+   * @return the round
+   */
+  public int getRound() {
+    return round;
+  }
+
+  @Override
+  public String toString() {
+    return "BftExtraData{"
+        + "vanityData="
+        + vanityData
+        + ", seals="
+        + seals
+        + ", validators="
+        + validators
+        + ", vote="
+        + vote
+        + ", round="
+        + round
+        + '}';
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftExtraDataCodec.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftExtraDataCodec.java
new file mode 100644
index 00000000000..87f107e994c
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftExtraDataCodec.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Bft extra data codec. */
+public abstract class BftExtraDataCodec {
+
+  /** The enum Encoding type. */
+  protected enum EncodingType {
+    /** All encoding type. */
+    ALL,
+    /** Exclude commit seals encoding type. */
+    EXCLUDE_COMMIT_SEALS,
+    /** Exclude commit seals and round number encoding type. */
+    EXCLUDE_COMMIT_SEALS_AND_ROUND_NUMBER
+  }
+
+  private static final Logger LOG = LoggerFactory.getLogger(BftExtraDataCodec.class);
+
+  /** The constant EXTRA_VANITY_LENGTH. */
+  public static int EXTRA_VANITY_LENGTH = 32;
+
+  /**
+   * Encode.
+   *
+   * @param bftExtraData the bft extra data
+   * @return the bytes
+   */
+  public Bytes encode(final BftExtraData bftExtraData) {
+    return encode(bftExtraData, EncodingType.ALL);
+  }
+
+  /**
+   * Encode without commit seals.
+   *
+   * @param bftExtraData the bft extra data
+   * @return the bytes
+   */
+  public Bytes encodeWithoutCommitSeals(final BftExtraData bftExtraData) {
+    return encode(bftExtraData, EncodingType.EXCLUDE_COMMIT_SEALS);
+  }
+
+  /**
+   * Encode without commit seals and round number.
+   *
+   * @param bftExtraData the bft extra data
+   * @return the bytes
+   */
+  public Bytes encodeWithoutCommitSealsAndRoundNumber(final BftExtraData bftExtraData) {
+    return encode(bftExtraData, EncodingType.EXCLUDE_COMMIT_SEALS_AND_ROUND_NUMBER);
+  }
+
+  /**
+   * Encode.
+   *
+   * @param bftExtraData the bft extra data
+   * @param encodingType the encoding type
+   * @return the bytes
+   */
+  protected abstract Bytes encode(final BftExtraData bftExtraData, final EncodingType encodingType);
+
+  /**
+   * Decode.
+   *
+   * @param blockHeader the block header
+   * @return the bft extra data
+   */
+  public BftExtraData decode(final BlockHeader blockHeader) {
+    final Object inputExtraData = blockHeader.getParsedExtraData();
+    if (inputExtraData instanceof BftExtraData) {
+      return (BftExtraData) inputExtraData;
+    }
+    LOG.warn(
+        "Expected a BftExtraData instance but got {}. Reparsing required.",
+        inputExtraData != null ? inputExtraData.getClass().getName() : "null");
+    return decodeRaw(blockHeader.getExtraData());
+  }
+
+  /**
+   * Decode raw.
+   *
+   * @param bytes the bytes
+   * @return the bft extra data
+   */
+  public abstract BftExtraData decodeRaw(Bytes bytes);
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftForksScheduleFactory.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftForksScheduleFactory.java
new file mode 100644
index 00000000000..ca14c94ac34
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftForksScheduleFactory.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright Hyperledger Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import org.hyperledger.besu.config.BftConfigOptions;
+import org.hyperledger.besu.config.BftFork;
+import org.hyperledger.besu.consensus.common.ForkSpec;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.NavigableSet;
+import java.util.TreeSet;
+
+/** The Bft forks schedule factory. */
+public class BftForksScheduleFactory {
+
+  /**
+   * The interface Bft spec creator.
+   *
+   * @param <T> the type parameter
+   * @param <U> the type parameter
+   */
+  public interface BftSpecCreator<T extends BftConfigOptions, U extends BftFork> {
+    /**
+     * Create type of BftConfigOptions.
+     *
+     * @param lastSpec the last spec
+     * @param fork the fork
+     * @return the type of BftConfigOptions
+     */
+    T create(ForkSpec<T> lastSpec, U fork);
+  }
+
+  /**
+   * Create forks schedule.
+   *
+   * @param <T> the type parameter BftConfigOptions
+   * @param <U> the type parameter BftFork
+   * @param initial the initial
+   * @param forks the forks
+   * @param specCreator the spec creator
+   * @return the forks schedule
+   */
+  public static <T extends BftConfigOptions, U extends BftFork> ForksSchedule<T> create(
+      final T initial, final List<U> forks, final BftSpecCreator<T, U> specCreator) {
+    checkArgument(
+        forks.stream().allMatch(f -> f.getForkBlock() > 0),
+        "Transition cannot be created for genesis block");
+    checkArgument(
+        forks.stream().map(BftFork::getForkBlock).distinct().count() == forks.size(),
+        "Duplicate transitions cannot be created for the same block");
+
+    final NavigableSet<ForkSpec<T>> specs = new TreeSet<>(Comparator.comparing(ForkSpec::getBlock));
+    final ForkSpec<T> initialForkSpec = new ForkSpec<>(0, initial);
+    specs.add(initialForkSpec);
+
+    forks.stream()
+        .sorted(Comparator.comparing(BftFork::getForkBlock))
+        .forEachOrdered(
+            f -> {
+              final T spec = specCreator.create(specs.last(), f);
+              specs.add(new ForkSpec<>(f.getForkBlock(), spec));
+            });
+
+    return new ForksSchedule<>(specs);
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftHelpers.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftHelpers.java
new file mode 100644
index 00000000000..ea14a5dce50
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftHelpers.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft;
+
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
+import org.hyperledger.besu.ethereum.core.Util;
+
+import java.util.Collection;
+
+/** The Bft helpers. */
+public class BftHelpers {
+
+  /** The constant EXPECTED_MIX_HASH. */
+  public static final Hash EXPECTED_MIX_HASH =
+      Hash.fromHexString("0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365");
+
+  /**
+   * Calculate required validator quorum int.
+   *
+   * @param validatorCount the validator count
+   * @return the int
+   */
+  public static int calculateRequiredValidatorQuorum(final int validatorCount) {
+    return Util.fastDivCeiling(2 * validatorCount, 3);
+  }
+
+  /**
+   * Prepare message count for quorum.
+   *
+   * @param quorum the quorum
+   * @return the long
+   */
+  public static long prepareMessageCountForQuorum(final long quorum) {
+    return quorum - 1;
+  }
+
+  /**
+   * Create sealed block.
+   *
+   * @param bftExtraDataCodec the bft extra data codec
+   * @param block the block
+   * @param roundNumber the round number
+   * @param commitSeals the commit seals
+   * @return the block
+   */
+  public static Block createSealedBlock(
+      final BftExtraDataCodec bftExtraDataCodec,
+      final Block block,
+      final int roundNumber,
+      final Collection<SECPSignature> commitSeals) {
+    final BlockHeader initialHeader = block.getHeader();
+    final BftExtraData initialExtraData = bftExtraDataCodec.decode(initialHeader);
+
+    final BftExtraData sealedExtraData =
+        new BftExtraData(
+            initialExtraData.getVanityData(),
+            commitSeals,
+            initialExtraData.getVote(),
+            roundNumber,
+            initialExtraData.getValidators());
+
+    final BlockHeader sealedHeader =
+        BlockHeaderBuilder.fromHeader(initialHeader)
+            .extraData(bftExtraDataCodec.encode(sealedExtraData))
+            .blockHeaderFunctions(BftBlockHeaderFunctions.forOnchainBlock(bftExtraDataCodec))
+            .buildBlockHeader();
+
+    return new Block(sealedHeader, block.getBody());
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftProcessor.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftProcessor.java
index 877314a9518..efd75532f94 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftProcessor.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftProcessor.java
@@ -20,13 +20,13 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Execution context for draining queued bft events and applying them to a maintained state */
 public class BftProcessor implements Runnable {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(BftProcessor.class);
 
   private final BftEventQueue incomingQueue;
   private volatile boolean shutdown = false;
@@ -49,6 +49,11 @@ public void stop() {
     shutdown = true;
   }
 
+  /**
+   * Await stop.
+   *
+   * @throws InterruptedException the interrupted exception
+   */
   public void awaitStop() throws InterruptedException {
     shutdownLatch.await();
   }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftProtocolSchedule.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftProtocolSchedule.java
new file mode 100644
index 00000000000..15530b66840
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftProtocolSchedule.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.common.bft;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import org.hyperledger.besu.ethereum.mainnet.DefaultProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.mainnet.ScheduledProtocolSpec;
+
+import java.util.List;
+
+/**
+ * A Bft-specific wrapper around a ProtocolSchedule that is allowed to look up ProtocolSpecs by
+ * block number. Extending DefaultProtocolSchedule gives this class access to the protocolSpecs
+ */
+public class BftProtocolSchedule extends DefaultProtocolSchedule {
+
+  /**
+   * Construct from an existing DefaultProtocolSchedule
+   *
+   * @param protocolSchedule a blockNumber-supporting ProtocolSchedule
+   */
+  public BftProtocolSchedule(final DefaultProtocolSchedule protocolSchedule) {
+    super(protocolSchedule);
+  }
+
+  /**
+   * Look up ProtocolSpec by block number
+   *
+   * @param number block number
+   * @return the protocol spec for that block number
+   */
+  public ProtocolSpec getByBlockNumber(final long number) {
+    checkArgument(number >= 0, "number must be non-negative");
+    checkArgument(
+        !protocolSpecs.isEmpty(), "At least 1 milestone must be provided to the protocol schedule");
+    checkArgument(
+        protocolSpecs.last().milestone() == 0, "There must be a milestone starting from block 0");
+    // protocolSpecs is sorted in descending block order, so the first one we find that's lower than
+    // the requested level will be the most appropriate spec
+    for (final ScheduledProtocolSpec s : protocolSpecs) {
+      if (number >= s.milestone()) {
+        return s.spec();
+      }
+    }
+    return null;
+  }
+
+  /**
+   * return the ordered list of scheduled protocol specs
+   *
+   * @return the scheduled protocol specs
+   */
+  public List<ScheduledProtocolSpec> getScheduledProtocolSpecs() {
+    return protocolSpecs.stream().toList();
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BlockTimer.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BlockTimer.java
index 90ed23e9d9e..5649b69e8f1 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BlockTimer.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BlockTimer.java
@@ -14,6 +14,8 @@
  */
 package org.hyperledger.besu.consensus.common.bft;
 
+import org.hyperledger.besu.config.BftConfigOptions;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
 import org.hyperledger.besu.consensus.common.bft.events.BlockTimerExpiry;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 
@@ -24,29 +26,30 @@
 
 /** Class for starting and keeping organised block timers */
 public class BlockTimer {
+
+  private final ForksSchedule<? extends BftConfigOptions> forksSchedule;
   private final BftExecutors bftExecutors;
   private Optional<ScheduledFuture<?>> currentTimerTask;
   private final BftEventQueue queue;
-  private final long minimumTimeBetweenBlocksMillis;
   private final Clock clock;
 
   /**
    * Construct a BlockTimer with primed executor service ready to start timers
    *
    * @param queue The queue in which to put block expiry events
-   * @param minimumTimeBetweenBlocksSeconds Minimum timestamp difference between blocks
+   * @param forksSchedule Bft fork schedule that contains block period seconds
    * @param bftExecutors Executor services that timers can be scheduled with
    * @param clock System clock
    */
   public BlockTimer(
       final BftEventQueue queue,
-      final long minimumTimeBetweenBlocksSeconds,
+      final ForksSchedule<? extends BftConfigOptions> forksSchedule,
       final BftExecutors bftExecutors,
       final Clock clock) {
     this.queue = queue;
+    this.forksSchedule = forksSchedule;
     this.bftExecutors = bftExecutors;
     this.currentTimerTask = Optional.empty();
-    this.minimumTimeBetweenBlocksMillis = minimumTimeBetweenBlocksSeconds * 1000;
     this.clock = clock;
   }
 
@@ -78,6 +81,9 @@ public synchronized void startTimer(
     final long now = clock.millis();
 
     // absolute time when the timer is supposed to expire
+    final int blockPeriodSeconds =
+        forksSchedule.getFork(round.getSequenceNumber()).getValue().getBlockPeriodSeconds();
+    final long minimumTimeBetweenBlocksMillis = blockPeriodSeconds * 1000L;
     final long expiryTime = chainHeadHeader.getTimestamp() * 1_000 + minimumTimeBetweenBlocksMillis;
 
     if (expiryTime > now) {
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/ConsensusRoundIdentifier.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/ConsensusRoundIdentifier.java
index 436f3fa9209..3b20244ed5d 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/ConsensusRoundIdentifier.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/ConsensusRoundIdentifier.java
@@ -61,10 +61,20 @@ public void writeTo(final RLPOutput out) {
     out.writeInt(round);
   }
 
+  /**
+   * Gets round number.
+   *
+   * @return the round number
+   */
   public int getRoundNumber() {
     return this.round;
   }
 
+  /**
+   * Gets sequence number.
+   *
+   * @return the sequence number
+   */
   public long getSequenceNumber() {
     return this.sequence;
   }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/EthSynchronizerUpdater.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/EthSynchronizerUpdater.java
index b29d670ab67..a5c1f84cb17 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/EthSynchronizerUpdater.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/EthSynchronizerUpdater.java
@@ -14,19 +14,24 @@
  */
 package org.hyperledger.besu.consensus.common.bft;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
-
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Eth synchronizer updater. */
 public class EthSynchronizerUpdater implements SynchronizerUpdater {
 
-  private static final Logger LOG = getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(EthSynchronizerUpdater.class);
   private final EthPeers ethPeers;
 
+  /**
+   * Instantiates a new Eth synchronizer updater.
+   *
+   * @param ethPeers the eth peers
+   */
   public EthSynchronizerUpdater(final EthPeers ethPeers) {
     this.ethPeers = ethPeers;
   }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/EventMultiplexer.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/EventMultiplexer.java
index d916538076d..9ec78c16b31 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/EventMultiplexer.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/EventMultiplexer.java
@@ -21,19 +21,30 @@
 import org.hyperledger.besu.consensus.common.bft.events.RoundExpiry;
 import org.hyperledger.besu.consensus.common.bft.statemachine.BftEventHandler;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Event multiplexer. */
 public class EventMultiplexer {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(EventMultiplexer.class);
 
   private final BftEventHandler eventHandler;
 
+  /**
+   * Instantiates a new Event multiplexer.
+   *
+   * @param eventHandler the event handler
+   */
   public EventMultiplexer(final BftEventHandler eventHandler) {
     this.eventHandler = eventHandler;
   }
 
+  /**
+   * Handle bft event.
+   *
+   * @param bftEvent the bft event
+   */
   public void handleBftEvent(final BftEvent bftEvent) {
     try {
       switch (bftEvent.getType()) {
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/Gossiper.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/Gossiper.java
index 7004a45df65..6ddf1217343 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/Gossiper.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/Gossiper.java
@@ -16,7 +16,13 @@
 
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message;
 
+/** The interface Gossiper. */
 public interface Gossiper {
 
+  /**
+   * Send.
+   *
+   * @param message the message
+   */
   void send(Message message);
 }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/MessageTracker.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/MessageTracker.java
index 3a42c2e146a..d895e27c9f0 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/MessageTracker.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/MessageTracker.java
@@ -16,23 +16,40 @@
 
 import static java.util.Collections.newSetFromMap;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 
 import java.util.Set;
 
+/** The Message tracker. */
 public class MessageTracker {
   private final Set<Hash> seenMessages;
 
+  /**
+   * Instantiates a new Message tracker.
+   *
+   * @param messageTrackingLimit the message tracking limit
+   */
   public MessageTracker(final int messageTrackingLimit) {
     this.seenMessages = newSetFromMap(new SizeLimitedMap<>(messageTrackingLimit));
   }
 
+  /**
+   * Add seen message.
+   *
+   * @param message the message
+   */
   public void addSeenMessage(final MessageData message) {
     final Hash uniqueID = Hash.hash(message.getData());
     seenMessages.add(uniqueID);
   }
 
+  /**
+   * Has seen message.
+   *
+   * @param message the message
+   * @return the boolean
+   */
   public boolean hasSeenMessage(final MessageData message) {
     final Hash uniqueID = Hash.hash(message.getData());
     return seenMessages.contains(uniqueID);
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/MutableBftConfigOptions.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/MutableBftConfigOptions.java
new file mode 100644
index 00000000000..ee8f546bd77
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/MutableBftConfigOptions.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import org.hyperledger.besu.config.BftConfigOptions;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.datatypes.Address;
+
+import java.math.BigInteger;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * A mutable {@link BftConfigOptions} that is used for building config for transitions in the {@link
+ * ForksSchedule}*.
+ */
+public class MutableBftConfigOptions implements BftConfigOptions {
+  private long epochLength;
+  private int blockPeriodSeconds;
+  private int requestTimeoutSeconds;
+  private int gossipedHistoryLimit;
+  private int messageQueueLimit;
+  private int duplicateMessageLimit;
+  private int futureMessagesLimit;
+  private int futureMessageMaxDistance;
+  private Optional<Address> miningBeneficiary;
+  private BigInteger blockRewardWei;
+
+  /**
+   * Instantiates a new Mutable bft config options.
+   *
+   * @param bftConfigOptions the bft config options
+   */
+  public MutableBftConfigOptions(final BftConfigOptions bftConfigOptions) {
+    this.epochLength = bftConfigOptions.getEpochLength();
+    this.blockPeriodSeconds = bftConfigOptions.getBlockPeriodSeconds();
+    this.requestTimeoutSeconds = bftConfigOptions.getRequestTimeoutSeconds();
+    this.gossipedHistoryLimit = bftConfigOptions.getGossipedHistoryLimit();
+    this.messageQueueLimit = bftConfigOptions.getMessageQueueLimit();
+    this.duplicateMessageLimit = bftConfigOptions.getMessageQueueLimit();
+    this.futureMessagesLimit = bftConfigOptions.getFutureMessagesLimit();
+    this.futureMessageMaxDistance = bftConfigOptions.getFutureMessagesMaxDistance();
+    this.miningBeneficiary = bftConfigOptions.getMiningBeneficiary();
+    this.blockRewardWei = bftConfigOptions.getBlockRewardWei();
+  }
+
+  @Override
+  public long getEpochLength() {
+    return epochLength;
+  }
+
+  @Override
+  public int getBlockPeriodSeconds() {
+    return blockPeriodSeconds;
+  }
+
+  @Override
+  public int getRequestTimeoutSeconds() {
+    return requestTimeoutSeconds;
+  }
+
+  @Override
+  public int getGossipedHistoryLimit() {
+    return gossipedHistoryLimit;
+  }
+
+  @Override
+  public int getMessageQueueLimit() {
+    return messageQueueLimit;
+  }
+
+  @Override
+  public int getDuplicateMessageLimit() {
+    return duplicateMessageLimit;
+  }
+
+  @Override
+  public int getFutureMessagesLimit() {
+    return futureMessagesLimit;
+  }
+
+  @Override
+  public int getFutureMessagesMaxDistance() {
+    return futureMessageMaxDistance;
+  }
+
+  @Override
+  public Optional<Address> getMiningBeneficiary() {
+    return miningBeneficiary;
+  }
+
+  @Override
+  public BigInteger getBlockRewardWei() {
+    return blockRewardWei;
+  }
+
+  @Override
+  public Map<String, Object> asMap() {
+    return Map.of();
+  }
+
+  /**
+   * Sets epoch length.
+   *
+   * @param epochLength the epoch length
+   */
+  public void setEpochLength(final long epochLength) {
+    this.epochLength = epochLength;
+  }
+
+  /**
+   * Sets block period seconds.
+   *
+   * @param blockPeriodSeconds the block period seconds
+   */
+  public void setBlockPeriodSeconds(final int blockPeriodSeconds) {
+    this.blockPeriodSeconds = blockPeriodSeconds;
+  }
+
+  /**
+   * Sets request timeout seconds.
+   *
+   * @param requestTimeoutSeconds the request timeout seconds
+   */
+  public void setRequestTimeoutSeconds(final int requestTimeoutSeconds) {
+    this.requestTimeoutSeconds = requestTimeoutSeconds;
+  }
+
+  /**
+   * Sets gossiped history limit.
+   *
+   * @param gossipedHistoryLimit the gossiped history limit
+   */
+  public void setGossipedHistoryLimit(final int gossipedHistoryLimit) {
+    this.gossipedHistoryLimit = gossipedHistoryLimit;
+  }
+
+  /**
+   * Sets message queue limit.
+   *
+   * @param messageQueueLimit the message queue limit
+   */
+  public void setMessageQueueLimit(final int messageQueueLimit) {
+    this.messageQueueLimit = messageQueueLimit;
+  }
+
+  /**
+   * Sets duplicate message limit.
+   *
+   * @param duplicateMessageLimit the duplicate message limit
+   */
+  public void setDuplicateMessageLimit(final int duplicateMessageLimit) {
+    this.duplicateMessageLimit = duplicateMessageLimit;
+  }
+
+  /**
+   * Sets future messages limit.
+   *
+   * @param futureMessagesLimit the future messages limit
+   */
+  public void setFutureMessagesLimit(final int futureMessagesLimit) {
+    this.futureMessagesLimit = futureMessagesLimit;
+  }
+
+  /**
+   * Sets future message max distance.
+   *
+   * @param futureMessageMaxDistance the future message max distance
+   */
+  public void setFutureMessageMaxDistance(final int futureMessageMaxDistance) {
+    this.futureMessageMaxDistance = futureMessageMaxDistance;
+  }
+
+  /**
+   * Sets mining beneficiary.
+   *
+   * @param miningBeneficiary the mining beneficiary
+   */
+  public void setMiningBeneficiary(final Optional<Address> miningBeneficiary) {
+    checkNotNull(miningBeneficiary);
+    this.miningBeneficiary = miningBeneficiary;
+  }
+
+  /**
+   * Sets block reward wei.
+   *
+   * @param blockRewardWei the block reward wei
+   */
+  public void setBlockRewardWei(final BigInteger blockRewardWei) {
+    this.blockRewardWei = blockRewardWei;
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/SizeLimitedMap.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/SizeLimitedMap.java
index 20cdae8f944..6b4842608cf 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/SizeLimitedMap.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/SizeLimitedMap.java
@@ -20,10 +20,19 @@
 /**
  * Map that is limited to a specified size and will evict oldest entries when the size limit is
  * reached.
+ *
+ * @param <K> the type parameter
+ * @param <V> the type parameter
  */
 public class SizeLimitedMap<K, V> extends LinkedHashMap<K, V> {
+  /** Maximum size of map */
   private final int maxEntries;
 
+  /**
+   * Instantiates a new Size limited map.
+   *
+   * @param maxEntries the max entries
+   */
   public SizeLimitedMap(final int maxEntries) {
     this.maxEntries = maxEntries;
   }
@@ -32,4 +41,9 @@ public SizeLimitedMap(final int maxEntries) {
   protected boolean removeEldestEntry(final Map.Entry<K, V> ignored) {
     return size() > maxEntries;
   }
+
+  @Override
+  public Object clone() {
+    return super.clone();
+  }
 }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/SynchronizerUpdater.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/SynchronizerUpdater.java
index 448135024ad..569c1efd86f 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/SynchronizerUpdater.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/SynchronizerUpdater.java
@@ -16,7 +16,14 @@
 
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 
+/** The interface Synchronizer updater. */
 public interface SynchronizerUpdater {
 
+  /**
+   * Update peer chain state.
+   *
+   * @param knownBlockNumber the known block number
+   * @param peerConnection the peer connection
+   */
   void updatePeerChainState(long knownBlockNumber, PeerConnection peerConnection);
 }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/UniqueMessageMulticaster.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/UniqueMessageMulticaster.java
similarity index 84%
rename from consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/UniqueMessageMulticaster.java
rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/UniqueMessageMulticaster.java
index 7d3125d11fe..aefc4da2690 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/UniqueMessageMulticaster.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/UniqueMessageMulticaster.java
@@ -12,11 +12,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.ibft;
+package org.hyperledger.besu.consensus.common.bft;
 
-import org.hyperledger.besu.consensus.common.bft.MessageTracker;
-import org.hyperledger.besu.consensus.ibft.network.ValidatorMulticaster;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.consensus.common.bft.network.ValidatorMulticaster;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 
 import java.util.Collection;
@@ -24,6 +23,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 
+/** The Unique message multicaster. */
 public class UniqueMessageMulticaster implements ValidatorMulticaster {
   private final ValidatorMulticaster multicaster;
   private final MessageTracker gossipedMessageTracker;
@@ -40,6 +40,12 @@ public UniqueMessageMulticaster(
     this.gossipedMessageTracker = new MessageTracker(gossipHistoryLimit);
   }
 
+  /**
+   * Instantiates a new Unique message multicaster.
+   *
+   * @param multicaster the multicaster
+   * @param gossipedMessageTracker the gossiped message tracker
+   */
   @VisibleForTesting
   public UniqueMessageMulticaster(
       final ValidatorMulticaster multicaster, final MessageTracker gossipedMessageTracker) {
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/Vote.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/Vote.java
new file mode 100644
index 00000000000..7b9bbc2f1ec
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/Vote.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft;
+
+import org.hyperledger.besu.consensus.common.validator.VoteType;
+import org.hyperledger.besu.datatypes.Address;
+
+import java.util.Objects;
+
+/**
+ * This class is only used to serialise/deserialise BlockHeaders and should not appear in business
+ * logic.
+ */
+public class Vote {
+  private final Address recipient;
+  private final VoteType voteType;
+
+  /** The constant ADD_BYTE_VALUE. */
+  public static final byte ADD_BYTE_VALUE = (byte) 0xFF;
+  /** The constant DROP_BYTE_VALUE. */
+  public static final byte DROP_BYTE_VALUE = (byte) 0x0L;
+
+  /**
+   * Instantiates a new Vote.
+   *
+   * @param recipient the recipient
+   * @param voteType the vote type
+   */
+  public Vote(final Address recipient, final VoteType voteType) {
+    this.recipient = recipient;
+    this.voteType = voteType;
+  }
+
+  /**
+   * Auth vote.
+   *
+   * @param address the address
+   * @return the vote
+   */
+  public static Vote authVote(final Address address) {
+    return new Vote(address, VoteType.ADD);
+  }
+
+  /**
+   * Drop vote.
+   *
+   * @param address the address
+   * @return the vote
+   */
+  public static Vote dropVote(final Address address) {
+    return new Vote(address, VoteType.DROP);
+  }
+
+  /**
+   * Gets recipient.
+   *
+   * @return the recipient
+   */
+  public Address getRecipient() {
+    return recipient;
+  }
+
+  /**
+   * Is auth.
+   *
+   * @return the boolean
+   */
+  public boolean isAuth() {
+    return voteType.equals(VoteType.ADD);
+  }
+
+  /**
+   * Is drop.
+   *
+   * @return the boolean
+   */
+  public boolean isDrop() {
+    return voteType.equals(VoteType.DROP);
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    final Vote vote1 = (Vote) o;
+    return recipient.equals(vote1.recipient) && voteType.equals(vote1.voteType);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(recipient, voteType);
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/blockcreation/BftBlockCreator.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/blockcreation/BftBlockCreator.java
new file mode 100644
index 00000000000..b1b374b69ff
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/blockcreation/BftBlockCreator.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft.blockcreation;
+
+import org.hyperledger.besu.config.BftConfigOptions;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.blockcreation.AbstractBlockCreator;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
+import org.hyperledger.besu.ethereum.core.SealableBlockHeader;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+
+import java.util.Optional;
+import java.util.function.Supplier;
+
+/** The Bft block creator. */
+// This class is responsible for creating a block without committer seals (basically it was just
+// too hard to coordinate with the state machine).
+public class BftBlockCreator extends AbstractBlockCreator {
+
+  private final BftExtraDataCodec bftExtraDataCodec;
+
+  /**
+   * Instantiates a new Bft block creator.
+   *
+   * @param forksSchedule the forks schedule
+   * @param localAddress the local address
+   * @param targetGasLimitSupplier the target gas limit supplier
+   * @param extraDataCalculator the extra data calculator
+   * @param pendingTransactions the pending transactions
+   * @param protocolContext the protocol context
+   * @param protocolSchedule the protocol schedule
+   * @param minTransactionGasPrice the min transaction gas price
+   * @param minBlockOccupancyRatio the min block occupancy ratio
+   * @param parentHeader the parent header
+   * @param bftExtraDataCodec the bft extra data codec
+   */
+  public BftBlockCreator(
+      final ForksSchedule<? extends BftConfigOptions> forksSchedule,
+      final Address localAddress,
+      final Supplier<Optional<Long>> targetGasLimitSupplier,
+      final ExtraDataCalculator extraDataCalculator,
+      final PendingTransactions pendingTransactions,
+      final ProtocolContext protocolContext,
+      final ProtocolSchedule protocolSchedule,
+      final Wei minTransactionGasPrice,
+      final Double minBlockOccupancyRatio,
+      final BlockHeader parentHeader,
+      final BftExtraDataCodec bftExtraDataCodec) {
+    super(
+        localAddress,
+        miningBeneficiaryCalculator(localAddress, forksSchedule),
+        targetGasLimitSupplier,
+        extraDataCalculator,
+        pendingTransactions,
+        protocolContext,
+        protocolSchedule,
+        minTransactionGasPrice,
+        minBlockOccupancyRatio,
+        parentHeader,
+        Optional.empty());
+    this.bftExtraDataCodec = bftExtraDataCodec;
+  }
+
+  private static MiningBeneficiaryCalculator miningBeneficiaryCalculator(
+      final Address localAddress, final ForksSchedule<? extends BftConfigOptions> forksSchedule) {
+    return blockNum ->
+        forksSchedule.getFork(blockNum).getValue().getMiningBeneficiary().orElse(localAddress);
+  }
+
+  @Override
+  protected BlockHeader createFinalBlockHeader(final SealableBlockHeader sealableBlockHeader) {
+    final BlockHeaderBuilder builder =
+        BlockHeaderBuilder.create()
+            .populateFrom(sealableBlockHeader)
+            .mixHash(BftHelpers.EXPECTED_MIX_HASH)
+            .nonce(0L)
+            .blockHeaderFunctions(BftBlockHeaderFunctions.forCommittedSeal(bftExtraDataCodec));
+
+    return builder.buildBlockHeader();
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/blockcreation/BftBlockCreatorFactory.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/blockcreation/BftBlockCreatorFactory.java
new file mode 100644
index 00000000000..a7c6a1bbebe
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/blockcreation/BftBlockCreatorFactory.java
@@ -0,0 +1,212 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft.blockcreation;
+
+import static com.google.common.base.Preconditions.checkState;
+
+import org.hyperledger.besu.config.BftConfigOptions;
+import org.hyperledger.besu.consensus.common.ConsensusHelpers;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.bft.BftContext;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.Vote;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.common.validator.ValidatorVote;
+import org.hyperledger.besu.consensus.common.validator.VoteProvider;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.blockcreation.BlockCreator;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.mainnet.AbstractGasLimitSpecification;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/**
+ * The Bft block creator factory.
+ *
+ * @param <T> the type parameter
+ */
+public class BftBlockCreatorFactory<T extends BftConfigOptions> {
+  /** The Forks schedule. */
+  protected final ForksSchedule<T> forksSchedule;
+
+  private final PendingTransactions pendingTransactions;
+  /** The Protocol context. */
+  protected final ProtocolContext protocolContext;
+  /** The Protocol schedule. */
+  protected final ProtocolSchedule protocolSchedule;
+  /** The Bft extra data codec. */
+  protected final BftExtraDataCodec bftExtraDataCodec;
+
+  private final Address localAddress;
+
+  /** The Vanity data. */
+  protected volatile Bytes vanityData;
+
+  private volatile Wei minTransactionGasPrice;
+  private volatile Double minBlockOccupancyRatio;
+  private volatile Optional<AtomicLong> targetGasLimit;
+
+  /**
+   * Instantiates a new Bft block creator factory.
+   *
+   * @param pendingTransactions the pending transactions
+   * @param protocolContext the protocol context
+   * @param protocolSchedule the protocol schedule
+   * @param forksSchedule the forks schedule
+   * @param miningParams the mining params
+   * @param localAddress the local address
+   * @param bftExtraDataCodec the bft extra data codec
+   */
+  public BftBlockCreatorFactory(
+      final PendingTransactions pendingTransactions,
+      final ProtocolContext protocolContext,
+      final ProtocolSchedule protocolSchedule,
+      final ForksSchedule<T> forksSchedule,
+      final MiningParameters miningParams,
+      final Address localAddress,
+      final BftExtraDataCodec bftExtraDataCodec) {
+    this.pendingTransactions = pendingTransactions;
+    this.protocolContext = protocolContext;
+    this.protocolSchedule = protocolSchedule;
+    this.forksSchedule = forksSchedule;
+    this.localAddress = localAddress;
+    this.minTransactionGasPrice = miningParams.getMinTransactionGasPrice();
+    this.minBlockOccupancyRatio = miningParams.getMinBlockOccupancyRatio();
+    this.vanityData = miningParams.getExtraData();
+    this.bftExtraDataCodec = bftExtraDataCodec;
+    this.targetGasLimit = miningParams.getTargetGasLimit();
+  }
+
+  /**
+   * Create block creator.
+   *
+   * @param parentHeader the parent header
+   * @param round the round
+   * @return the block creator
+   */
+  public BlockCreator create(final BlockHeader parentHeader, final int round) {
+    return new BftBlockCreator(
+        forksSchedule,
+        localAddress,
+        () -> targetGasLimit.map(AtomicLong::longValue),
+        ph -> createExtraData(round, ph),
+        pendingTransactions,
+        protocolContext,
+        protocolSchedule,
+        minTransactionGasPrice,
+        minBlockOccupancyRatio,
+        parentHeader,
+        bftExtraDataCodec);
+  }
+
+  /**
+   * Sets extra data.
+   *
+   * @param extraData the extra data
+   */
+  public void setExtraData(final Bytes extraData) {
+    this.vanityData = extraData.copy();
+  }
+
+  /**
+   * Sets min transaction gas price.
+   *
+   * @param minTransactionGasPrice the min transaction gas price
+   */
+  public void setMinTransactionGasPrice(final Wei minTransactionGasPrice) {
+    this.minTransactionGasPrice = minTransactionGasPrice;
+  }
+
+  /**
+   * Gets min transaction gas price.
+   *
+   * @return the min transaction gas price
+   */
+  public Wei getMinTransactionGasPrice() {
+    return minTransactionGasPrice;
+  }
+
+  /**
+   * Create extra data bytes.
+   *
+   * @param round the round
+   * @param parentHeader the parent header
+   * @return the bytes
+   */
+  public Bytes createExtraData(final int round, final BlockHeader parentHeader) {
+    final BftContext bftContext = protocolContext.getConsensusContext(BftContext.class);
+    final ValidatorProvider validatorProvider = bftContext.getValidatorProvider();
+    Optional<VoteProvider> voteProviderAfterBlock =
+        validatorProvider.getVoteProviderAfterBlock(parentHeader);
+    checkState(voteProviderAfterBlock.isPresent(), "Bft requires a vote provider");
+    final Optional<ValidatorVote> proposal =
+        voteProviderAfterBlock.get().getVoteAfterBlock(parentHeader, localAddress);
+
+    final List<Address> validators =
+        new ArrayList<>(validatorProvider.getValidatorsAfterBlock(parentHeader));
+
+    final BftExtraData extraData =
+        new BftExtraData(
+            ConsensusHelpers.zeroLeftPad(vanityData, BftExtraDataCodec.EXTRA_VANITY_LENGTH),
+            Collections.emptyList(),
+            toVote(proposal),
+            round,
+            validators);
+
+    return bftExtraDataCodec.encode(extraData);
+  }
+
+  /**
+   * Change target gas limit.
+   *
+   * @param newTargetGasLimit the new target gas limit
+   */
+  public void changeTargetGasLimit(final Long newTargetGasLimit) {
+    if (AbstractGasLimitSpecification.isValidTargetGasLimit(newTargetGasLimit)) {
+      this.targetGasLimit.ifPresentOrElse(
+          existing -> existing.set(newTargetGasLimit),
+          () -> this.targetGasLimit = Optional.of(new AtomicLong(newTargetGasLimit)));
+    } else {
+      throw new UnsupportedOperationException("Specified target gas limit is invalid");
+    }
+  }
+
+  /**
+   * Gets local address.
+   *
+   * @return the local address
+   */
+  public Address getLocalAddress() {
+    return localAddress;
+  }
+
+  private static Optional<Vote> toVote(final Optional<ValidatorVote> input) {
+    return input
+        .map(v -> Optional.of(new Vote(v.getRecipient(), v.getVotePolarity())))
+        .orElse(Optional.empty());
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/blockcreation/BftMiningCoordinator.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/blockcreation/BftMiningCoordinator.java
new file mode 100644
index 00000000000..6158bda8ba3
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/blockcreation/BftMiningCoordinator.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft.blockcreation;
+
+import org.hyperledger.besu.consensus.common.bft.BftEventQueue;
+import org.hyperledger.besu.consensus.common.bft.BftExecutors;
+import org.hyperledger.besu.consensus.common.bft.BftProcessor;
+import org.hyperledger.besu.consensus.common.bft.events.NewChainHead;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftEventHandler;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
+import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
+import org.hyperledger.besu.ethereum.chain.BlockAddedObserver;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Bft mining coordinator. */
+public class BftMiningCoordinator implements MiningCoordinator, BlockAddedObserver {
+
+  private enum State {
+    /** Idle state. */
+    IDLE,
+    /** Running state. */
+    RUNNING,
+    /** Stopped state. */
+    STOPPED
+  }
+
+  private static final Logger LOG = LoggerFactory.getLogger(BftMiningCoordinator.class);
+
+  private final BftEventHandler eventHandler;
+  private final BftProcessor bftProcessor;
+  private final BftBlockCreatorFactory<?> blockCreatorFactory;
+  /** The Blockchain. */
+  protected final Blockchain blockchain;
+
+  private final BftEventQueue eventQueue;
+  private final BftExecutors bftExecutors;
+
+  private long blockAddedObserverId;
+  private final AtomicReference<State> state = new AtomicReference<>(State.IDLE);
+
+  /**
+   * Instantiates a new Bft mining coordinator.
+   *
+   * @param bftExecutors the bft executors
+   * @param eventHandler the event handler
+   * @param bftProcessor the bft processor
+   * @param blockCreatorFactory the block creator factory
+   * @param blockchain the blockchain
+   * @param eventQueue the event queue
+   */
+  public BftMiningCoordinator(
+      final BftExecutors bftExecutors,
+      final BftEventHandler eventHandler,
+      final BftProcessor bftProcessor,
+      final BftBlockCreatorFactory<?> blockCreatorFactory,
+      final Blockchain blockchain,
+      final BftEventQueue eventQueue) {
+    this.bftExecutors = bftExecutors;
+    this.eventHandler = eventHandler;
+    this.bftProcessor = bftProcessor;
+    this.blockCreatorFactory = blockCreatorFactory;
+    this.eventQueue = eventQueue;
+
+    this.blockchain = blockchain;
+  }
+
+  @Override
+  public void start() {
+    if (state.compareAndSet(State.IDLE, State.RUNNING)) {
+      bftExecutors.start();
+      blockAddedObserverId = blockchain.observeBlockAdded(this);
+      eventHandler.start();
+      bftExecutors.executeBftProcessor(bftProcessor);
+    }
+  }
+
+  @Override
+  public void stop() {
+    if (state.compareAndSet(State.RUNNING, State.STOPPED)) {
+      blockchain.removeObserver(blockAddedObserverId);
+      bftProcessor.stop();
+      // Make sure the processor has stopped before shutting down the executors
+      try {
+        bftProcessor.awaitStop();
+      } catch (final InterruptedException e) {
+        LOG.debug("Interrupted while waiting for IbftProcessor to stop.", e);
+        Thread.currentThread().interrupt();
+      }
+      bftExecutors.stop();
+    }
+  }
+
+  @Override
+  public void awaitStop() throws InterruptedException {
+    bftExecutors.awaitStop();
+  }
+
+  @Override
+  public boolean enable() {
+    return true;
+  }
+
+  @Override
+  public boolean disable() {
+    return false;
+  }
+
+  @Override
+  public boolean isMining() {
+    return true;
+  }
+
+  @Override
+  public Wei getMinTransactionGasPrice() {
+    return blockCreatorFactory.getMinTransactionGasPrice();
+  }
+
+  @Override
+  public void setExtraData(final Bytes extraData) {
+    blockCreatorFactory.setExtraData(extraData);
+  }
+
+  @Override
+  public Optional<Address> getCoinbase() {
+    return Optional.of(blockCreatorFactory.getLocalAddress());
+  }
+
+  @Override
+  public Optional<Block> createBlock(
+      final BlockHeader parentHeader,
+      final List<Transaction> transactions,
+      final List<BlockHeader> ommers) {
+    // One-off block creation has not been implemented
+    return Optional.empty();
+  }
+
+  @Override
+  public Optional<Block> createBlock(final BlockHeader parentHeader, final long timestamp) {
+    // One-off block creation has not been implemented
+    return Optional.empty();
+  }
+
+  @Override
+  public void changeTargetGasLimit(final Long targetGasLimit) {
+    blockCreatorFactory.changeTargetGasLimit(targetGasLimit);
+  }
+
+  @Override
+  public void onBlockAdded(final BlockAddedEvent event) {
+    if (event.isNewCanonicalHead()) {
+      LOG.trace("New canonical head detected");
+      eventQueue.add(new NewChainHead(event.getBlock().getHeader()));
+    }
+  }
+
+  @Override
+  public void removeObserver() {
+    blockchain.removeObserver(blockAddedObserverId);
+  }
+}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/ProposerSelector.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/blockcreation/ProposerSelector.java
similarity index 86%
rename from consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/ProposerSelector.java
rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/blockcreation/ProposerSelector.java
index eaeb2490589..15155b63b6c 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/ProposerSelector.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/blockcreation/ProposerSelector.java
@@ -12,16 +12,15 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.ibft.blockcreation;
+package org.hyperledger.besu.consensus.common.bft.blockcreation;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
 import org.hyperledger.besu.consensus.common.BlockInterface;
-import org.hyperledger.besu.consensus.common.ValidatorProvider;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 
 import java.util.ArrayList;
@@ -31,8 +30,8 @@
 import java.util.Optional;
 import java.util.TreeSet;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Responsible for determining which member of the validator pool should propose the next block
@@ -40,12 +39,12 @@
  *
  * <p>It does this by extracting the previous block's proposer from the ProposerSeal (stored in the
  * Blocks ExtraData) then iterating through the validator list (stored in {@link
- * ValidatorProvider}), such that each new round for the given height is serviced by a different
+ * ValidatorProvider}*), such that each new round for the given height is serviced by a different
  * validator.
  */
 public class ProposerSelector {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(ProposerSelector.class);
 
   private final Blockchain blockchain;
 
@@ -55,19 +54,27 @@ public class ProposerSelector {
    */
   private final Boolean changeEachBlock;
 
-  private final VoteTallyCache voteTallyCache;
+  private final ValidatorProvider validatorProvider;
 
   private final BlockInterface blockInterface;
 
+  /**
+   * Instantiates a new Proposer selector.
+   *
+   * @param blockchain the blockchain
+   * @param blockInterface the block interface
+   * @param changeEachBlock the change each block
+   * @param validatorProvider the validator provider
+   */
   public ProposerSelector(
       final Blockchain blockchain,
       final BlockInterface blockInterface,
       final boolean changeEachBlock,
-      final VoteTallyCache voteTallyCache) {
+      final ValidatorProvider validatorProvider) {
     this.blockchain = blockchain;
     this.blockInterface = blockInterface;
     this.changeEachBlock = changeEachBlock;
-    this.voteTallyCache = voteTallyCache;
+    this.validatorProvider = validatorProvider;
   }
 
   /**
@@ -90,7 +97,7 @@ public Address selectProposerForRound(final ConsensusRoundIdentifier roundIdenti
     final BlockHeader blockHeader = maybeParentHeader.get();
     final Address prevBlockProposer = blockInterface.getProposerOfBlock(blockHeader);
     final Collection<Address> validatorsForRound =
-        voteTallyCache.getVoteTallyAfterBlock(blockHeader).getValidators();
+        validatorProvider.getValidatorsAfterBlock(blockHeader);
 
     if (!validatorsForRound.contains(prevBlockProposer)) {
       return handleMissingProposer(prevBlockProposer, validatorsForRound, roundIdentifier);
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/BftEvent.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/BftEvent.java
index db122e40653..dadf7f55470 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/BftEvent.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/BftEvent.java
@@ -16,5 +16,10 @@
 
 /** Category of events that will effect and are interpretable by the Bft processing mechanism */
 public interface BftEvent {
+  /**
+   * Gets type.
+   *
+   * @return the type
+   */
   BftEvents.Type getType();
 }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/BftEvents.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/BftEvents.java
index f63fdbbdb33..40672dd8ae5 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/BftEvents.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/BftEvents.java
@@ -18,14 +18,25 @@
 
 /** Static helper functions for producing and working with BftEvent objects */
 public class BftEvents {
+  /**
+   * Instantiate BftEvent From message.
+   *
+   * @param message the message
+   * @return the bft event
+   */
   public static BftEvent fromMessage(final Message message) {
     return new BftReceivedMessageEvent(message);
   }
 
+  /** The enum Type. */
   public enum Type {
+    /** Round expiry type. */
     ROUND_EXPIRY,
+    /** New chain head type. */
     NEW_CHAIN_HEAD,
+    /** Block timer expiry type. */
     BLOCK_TIMER_EXPIRY,
+    /** Message type. */
     MESSAGE
   }
 }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/BftReceivedMessageEvent.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/BftReceivedMessageEvent.java
index 81b764dbd41..ed276a6fa27 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/BftReceivedMessageEvent.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/BftReceivedMessageEvent.java
@@ -16,14 +16,25 @@
 
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message;
 
+/** The Bft received message event. */
 public class BftReceivedMessageEvent implements BftEvent {
 
   private final Message message;
 
+  /**
+   * Instantiates a new Bft received message event.
+   *
+   * @param message the message
+   */
   public BftReceivedMessageEvent(final Message message) {
     this.message = message;
   }
 
+  /**
+   * Gets message.
+   *
+   * @return the message
+   */
   public Message getMessage() {
     return message;
   }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/BlockTimerExpiry.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/BlockTimerExpiry.java
index a750bf96fd9..3027e0dca5d 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/BlockTimerExpiry.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/BlockTimerExpiry.java
@@ -38,6 +38,11 @@ public BftEvents.Type getType() {
     return BftEvents.Type.BLOCK_TIMER_EXPIRY;
   }
 
+  /**
+   * Gets round identifier.
+   *
+   * @return the round indentifier
+   */
   public ConsensusRoundIdentifier getRoundIndentifier() {
     return roundIdentifier;
   }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/NewChainHead.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/NewChainHead.java
index a6963aa32ae..4acfeac4f3f 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/NewChainHead.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/NewChainHead.java
@@ -62,6 +62,11 @@ public int hashCode() {
     return Objects.hash(newChainHeadHeader);
   }
 
+  /**
+   * Gets new chain head header.
+   *
+   * @return the new chain head header
+   */
   public BlockHeader getNewChainHeadHeader() {
     return newChainHeadHeader;
   }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/RoundExpiry.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/RoundExpiry.java
index f6310c2bdc4..ba721ffc8c6 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/RoundExpiry.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/events/RoundExpiry.java
@@ -38,6 +38,11 @@ public BftEvents.Type getType() {
     return BftEvents.Type.ROUND_EXPIRY;
   }
 
+  /**
+   * Gets view.
+   *
+   * @return the view
+   */
   public ConsensusRoundIdentifier getView() {
     return round;
   }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftCoinbaseValidationRule.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftCoinbaseValidationRule.java
new file mode 100644
index 00000000000..36a222275ca
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftCoinbaseValidationRule.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft.headervalidationrules;
+
+import org.hyperledger.besu.consensus.common.bft.BftContext;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule;
+
+import java.util.Collection;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Ensures that the coinbase (which corresponds to the block proposer) is included in the list of
+ * validators
+ */
+public class BftCoinbaseValidationRule implements AttachedBlockHeaderValidationRule {
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(BftCoinbaseValidationRule.class);
+
+  @Override
+  public boolean validate(
+      final BlockHeader header, final BlockHeader parent, final ProtocolContext context) {
+
+    final Collection<Address> storedValidators =
+        context
+            .getConsensusContext(BftContext.class)
+            .getValidatorProvider()
+            .getValidatorsAfterBlock(parent);
+    final Address proposer = header.getCoinbase();
+
+    if (!storedValidators.contains(proposer)) {
+      LOGGER.info(
+          "Invalid block header: Block proposer is not a member of the validators. proposer={}, validators={}",
+          proposer,
+          storedValidators);
+      return false;
+    }
+
+    return true;
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftCommitSealsValidationRule.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftCommitSealsValidationRule.java
new file mode 100644
index 00000000000..78e4c8fe98e
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftCommitSealsValidationRule.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft.headervalidationrules;
+
+import static org.hyperledger.besu.consensus.common.bft.BftHelpers.calculateRequiredValidatorQuorum;
+
+import org.hyperledger.besu.consensus.common.bft.BftContext;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Ensures the commit seals in the block header were created by known validators (as determined by
+ * tracking votes and validator state on the blockchain).
+ *
+ * <p>This also ensures sufficient commit seals exist in the block to make it valid.
+ */
+public class BftCommitSealsValidationRule implements AttachedBlockHeaderValidationRule {
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(BftCommitSealsValidationRule.class);
+
+  @Override
+  public boolean validate(
+      final BlockHeader header, final BlockHeader parent, final ProtocolContext protocolContext) {
+    final BftContext bftContext = protocolContext.getConsensusContext(BftContext.class);
+    final Collection<Address> storedValidators =
+        bftContext.getValidatorProvider().getValidatorsAfterBlock(parent);
+
+    final List<Address> committers = bftContext.getBlockInterface().getCommitters(header);
+    final List<Address> committersWithoutDuplicates = new ArrayList<>(new HashSet<>(committers));
+
+    if (committers.size() != committersWithoutDuplicates.size()) {
+      LOGGER.info("Invalid block header: Duplicated seals found in header.");
+      return false;
+    }
+
+    return validateCommitters(committersWithoutDuplicates, storedValidators);
+  }
+
+  private boolean validateCommitters(
+      final Collection<Address> committers, final Collection<Address> storedValidators) {
+
+    final int minimumSealsRequired = calculateRequiredValidatorQuorum(storedValidators.size());
+    if (committers.size() < minimumSealsRequired) {
+      LOGGER.info(
+          "Invalid block header: Insufficient committers to seal block. (Required {}, received {})",
+          minimumSealsRequired,
+          committers.size());
+      return false;
+    }
+
+    if (!storedValidators.containsAll(committers)) {
+      LOGGER.info(
+          "Invalid block header: Not all committers are in the locally maintained validator list. validators={} committers={}",
+          storedValidators,
+          committers);
+      return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public boolean includeInLightValidation() {
+    return false;
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftValidatorsValidationRule.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftValidatorsValidationRule.java
new file mode 100644
index 00000000000..1e0e57d5550
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftValidatorsValidationRule.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft.headervalidationrules;
+
+import org.hyperledger.besu.consensus.common.bft.BftContext;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule;
+import org.hyperledger.besu.ethereum.rlp.RLPException;
+
+import java.util.Collection;
+import java.util.NavigableSet;
+import java.util.TreeSet;
+
+import com.google.common.collect.Iterables;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Ensures the Validators listed in the block header match that tracked in memory (which was in-turn
+ * created by tracking votes included on the block chain).
+ */
+public class BftValidatorsValidationRule implements AttachedBlockHeaderValidationRule {
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(BftValidatorsValidationRule.class);
+
+  @Override
+  public boolean validate(
+      final BlockHeader header, final BlockHeader parent, final ProtocolContext context) {
+    try {
+      final BftContext bftContext = context.getConsensusContext(BftContext.class);
+      final BftExtraData bftExtraData = bftContext.getBlockInterface().getExtraData(header);
+
+      final NavigableSet<Address> sortedReportedValidators =
+          new TreeSet<>(bftExtraData.getValidators());
+
+      if (!Iterables.elementsEqual(bftExtraData.getValidators(), sortedReportedValidators)) {
+        LOGGER.info(
+            "Invalid block header: Validators are not sorted in ascending order. Expected {} but got {}.",
+            sortedReportedValidators,
+            bftExtraData.getValidators());
+        return false;
+      }
+
+      final Collection<Address> storedValidators =
+          bftContext.getValidatorProvider().getValidatorsAfterBlock(parent);
+      if (!Iterables.elementsEqual(bftExtraData.getValidators(), storedValidators)) {
+        LOGGER.info(
+            "Invalid block header: Incorrect validators. Expected {} but got {}.",
+            storedValidators,
+            bftExtraData.getValidators());
+        return false;
+      }
+
+    } catch (final RLPException ex) {
+      LOGGER.info(
+          "Invalid block header: ExtraData field was unable to be deserialized into an BFT Struct.",
+          ex);
+      return false;
+    } catch (final IllegalArgumentException ex) {
+      LOGGER.info("Invalid block header: Failed to verify extra data", ex);
+      return false;
+    }
+
+    return true;
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftVanityDataValidationRule.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftVanityDataValidationRule.java
new file mode 100644
index 00000000000..6bbca4c6e3c
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftVanityDataValidationRule.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft.headervalidationrules;
+
+import org.hyperledger.besu.consensus.common.bft.BftContext;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Bft vanity data validation rule. */
+public class BftVanityDataValidationRule implements AttachedBlockHeaderValidationRule {
+
+  private static final Logger LOG = LoggerFactory.getLogger(BftVanityDataValidationRule.class);
+
+  @Override
+  public boolean validate(
+      final BlockHeader header, final BlockHeader parent, final ProtocolContext protocolContext) {
+    final BftContext bftContext = protocolContext.getConsensusContext(BftContext.class);
+    final BftExtraData bftExtraData = bftContext.getBlockInterface().getExtraData(header);
+
+    if (bftExtraData.getVanityData().size() != BftExtraDataCodec.EXTRA_VANITY_LENGTH) {
+      LOG.info("Invalid block header: Bft Extra Data does not contain 32 bytes of vanity data.");
+      return false;
+    }
+    return true;
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/messagedata/AbstractBftMessageData.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/messagedata/AbstractBftMessageData.java
index 1936f05f00f..6fba11df3a7 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/messagedata/AbstractBftMessageData.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/messagedata/AbstractBftMessageData.java
@@ -21,11 +21,27 @@
 
 import org.apache.tuweni.bytes.Bytes;
 
+/** The Abstract bft message data. */
 public abstract class AbstractBftMessageData extends AbstractMessageData {
+  /**
+   * Instantiates a new Abstract bft message data.
+   *
+   * @param data the data
+   */
   protected AbstractBftMessageData(final Bytes data) {
     super(data);
   }
 
+  /**
+   * From message data to type of AbstractBftMessageData.
+   *
+   * @param <T> the type parameter AbstractBftMessageData
+   * @param messageData the message data
+   * @param messageCode the message code
+   * @param clazz the clazz
+   * @param constructor the constructor
+   * @return the type of AbstractBftMessageData
+   */
   protected static <T extends AbstractBftMessageData> T fromMessageData(
       final MessageData messageData,
       final int messageCode,
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/messagewrappers/BftMessage.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/messagewrappers/BftMessage.java
index 3d99624dc88..0a88b579fd8 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/messagewrappers/BftMessage.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/messagewrappers/BftMessage.java
@@ -19,17 +19,32 @@
 import org.hyperledger.besu.consensus.common.bft.payload.Payload;
 import org.hyperledger.besu.consensus.common.bft.payload.RoundSpecific;
 import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
 
+import java.util.Objects;
 import java.util.StringJoiner;
+import java.util.function.Function;
 
 import org.apache.tuweni.bytes.Bytes;
 
+/**
+ * The Bft message.
+ *
+ * @param <P> the type of Payload
+ */
 public class BftMessage<P extends Payload> implements Authored, RoundSpecific {
 
   private final SignedData<P> payload;
 
+  /**
+   * Instantiates a new Bft message.
+   *
+   * @param payload the payload
+   */
   public BftMessage(final SignedData<P> payload) {
     this.payload = payload;
   }
@@ -44,28 +59,84 @@ public ConsensusRoundIdentifier getRoundIdentifier() {
     return payload.getPayload().getRoundIdentifier();
   }
 
+  /**
+   * Encode.
+   *
+   * @return the bytes
+   */
   public Bytes encode() {
     final BytesValueRLPOutput rlpOut = new BytesValueRLPOutput();
     payload.writeTo(rlpOut);
     return rlpOut.encoded();
   }
 
+  /**
+   * Gets signed payload.
+   *
+   * @return the signed payload
+   */
   public SignedData<P> getSignedPayload() {
     return payload;
   }
 
+  /**
+   * Gets message type.
+   *
+   * @return the message type
+   */
   public int getMessageType() {
     return payload.getPayload().getMessageType();
   }
 
+  /**
+   * Gets payload.
+   *
+   * @return the payload
+   */
   protected P getPayload() {
     return payload.getPayload();
   }
 
+  /**
+   * Read payload.
+   *
+   * @param <T> the type parameter of Payload
+   * @param rlpInput the rlp input
+   * @param decoder the decoder
+   * @return the signed data
+   */
+  protected static <T extends Payload> SignedData<T> readPayload(
+      final RLPInput rlpInput, final Function<RLPInput, T> decoder) {
+    rlpInput.enterList();
+    final T unsignedMessageData = decoder.apply(rlpInput);
+    final SECPSignature signature =
+        rlpInput.readBytes((SignatureAlgorithmFactory.getInstance()::decodeSignature));
+    rlpInput.leaveList();
+
+    return SignedData.create(unsignedMessageData, signature);
+  }
+
   @Override
   public String toString() {
     return new StringJoiner(", ", BftMessage.class.getSimpleName() + "[", "]")
         .add("payload=" + payload)
         .toString();
   }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    final BftMessage<?> that = (BftMessage<?>) o;
+    return Objects.equals(payload, that.payload);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(payload);
+  }
 }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/PeerConnectionTracker.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/network/PeerConnectionTracker.java
similarity index 76%
rename from consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/PeerConnectionTracker.java
rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/network/PeerConnectionTracker.java
index 45ed6975536..215180f3a2c 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/PeerConnectionTracker.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/network/PeerConnectionTracker.java
@@ -12,13 +12,24 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.ibft.network;
+package org.hyperledger.besu.consensus.common.bft.network;
 
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 
+/** The interface Peer connection tracker. */
 public interface PeerConnectionTracker {
 
+  /**
+   * Add.
+   *
+   * @param newConnection the new connection
+   */
   void add(final PeerConnection newConnection);
 
+  /**
+   * Remove.
+   *
+   * @param removedConnection the removed connection
+   */
   void remove(final PeerConnection removedConnection);
 }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/network/ValidatorMulticaster.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/network/ValidatorMulticaster.java
new file mode 100644
index 00000000000..ec7dbefb962
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/network/ValidatorMulticaster.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft.network;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+
+import java.util.Collection;
+
+/** The interface Validator multicaster. */
+public interface ValidatorMulticaster {
+
+  /**
+   * Send.
+   *
+   * @param message the message
+   */
+  void send(final MessageData message);
+
+  /**
+   * Send.
+   *
+   * @param message the message
+   * @param denylist the denylist
+   */
+  void send(final MessageData message, final Collection<Address> denylist);
+}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/ValidatorPeers.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/network/ValidatorPeers.java
similarity index 80%
rename from consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/ValidatorPeers.java
rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/network/ValidatorPeers.java
index 8f024818261..f4fccecf3c2 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/ValidatorPeers.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/network/ValidatorPeers.java
@@ -12,10 +12,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.ibft.network;
+package org.hyperledger.besu.consensus.common.bft.network;
 
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
@@ -28,8 +28,8 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Responsible for tracking the network peers which have a connection to this node, then
@@ -37,17 +37,23 @@
  */
 public class ValidatorPeers implements ValidatorMulticaster, PeerConnectionTracker {
 
-  private static final Logger LOG = LogManager.getLogger();
-
-  private static final String PROTOCOL_NAME = "IBF";
+  private static final Logger LOG = LoggerFactory.getLogger(ValidatorPeers.class);
 
   // It's possible for multiple connections between peers to exist for brief periods, so map each
   // address to a set of connections
   private final Map<Address, Set<PeerConnection>> connectionsByAddress = new ConcurrentHashMap<>();
-  private final VoteTallyCache voteTallyCache;
+  private final ValidatorProvider validatorProvider;
+  private final String protocolName;
 
-  public ValidatorPeers(final VoteTallyCache voteTallyCache) {
-    this.voteTallyCache = voteTallyCache;
+  /**
+   * Instantiates a new Validator peers.
+   *
+   * @param validatorProvider the validator provider
+   * @param protocolName the protocol name
+   */
+  public ValidatorPeers(final ValidatorProvider validatorProvider, final String protocolName) {
+    this.validatorProvider = validatorProvider;
+    this.protocolName = protocolName;
   }
 
   @Override
@@ -94,7 +100,7 @@ private void sendMessageToSpecificAddresses(
         .forEach(
             connection -> {
               try {
-                connection.sendForProtocol(PROTOCOL_NAME, message);
+                connection.sendForProtocol(protocolName, message);
               } catch (final PeerNotConnected peerNotConnected) {
                 LOG.trace(
                     "Lost connection to a validator. remoteAddress={} peerInfo={}",
@@ -105,6 +111,6 @@ private void sendMessageToSpecificAddresses(
   }
 
   private Collection<Address> getLatestValidators() {
-    return voteTallyCache.getVoteTallyAtHead().getValidators();
+    return validatorProvider.getValidatorsAtHead();
   }
 }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/Authored.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/Authored.java
index deab5a051f2..a082783dcba 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/Authored.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/Authored.java
@@ -14,9 +14,15 @@
  */
 package org.hyperledger.besu.consensus.common.bft.payload;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 
+/** The interface Authored. */
 public interface Authored {
 
+  /**
+   * Gets author.
+   *
+   * @return the author
+   */
   Address getAuthor();
 }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/Payload.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/Payload.java
index dfa6f23ea09..960d9c648a8 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/Payload.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/Payload.java
@@ -14,17 +14,28 @@
  */
 package org.hyperledger.besu.consensus.common.bft.payload;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
 
 import org.apache.tuweni.bytes.Bytes;
 
+/** The interface Payload. */
 public interface Payload extends RoundSpecific {
 
+  /**
+   * Write to.
+   *
+   * @param rlpOutput the rlp output
+   */
   void writeTo(final RLPOutput rlpOutput);
 
+  /**
+   * Encoded.
+   *
+   * @return the bytes
+   */
   default Bytes encoded() {
     BytesValueRLPOutput rlpOutput = new BytesValueRLPOutput();
     writeTo(rlpOutput);
@@ -32,9 +43,27 @@ default Bytes encoded() {
     return rlpOutput.encoded();
   }
 
+  /**
+   * Gets message type.
+   *
+   * @return the message type
+   */
   int getMessageType();
 
+  /**
+   * Read digest.
+   *
+   * @param messageData the message data
+   * @return the hash
+   */
   static Hash readDigest(final RLPInput messageData) {
     return Hash.wrap(messageData.readBytes32());
   }
+
+  /**
+   * Hash for signature.
+   *
+   * @return the hash
+   */
+  Hash hashForSignature();
 }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/RoundSpecific.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/RoundSpecific.java
index 4243c81256a..01dec5672b9 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/RoundSpecific.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/RoundSpecific.java
@@ -16,7 +16,13 @@
 
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
 
+/** The interface Round specific. */
 public interface RoundSpecific {
 
+  /**
+   * Gets round identifier.
+   *
+   * @return the round identifier
+   */
   ConsensusRoundIdentifier getRoundIdentifier();
 }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/SignedData.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/SignedData.java
index 4887190d87d..31d5d68345b 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/SignedData.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/payload/SignedData.java
@@ -14,8 +14,10 @@
  */
 package org.hyperledger.besu.consensus.common.bft.payload;
 
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Util;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
 
@@ -24,13 +26,32 @@
 
 import org.apache.tuweni.bytes.Bytes;
 
+/**
+ * The type Signed data.
+ *
+ * @param <M> the type parameter of Payload
+ */
 public class SignedData<M extends Payload> implements Authored {
 
   private final Address sender;
-  private final Signature signature;
+  private final SECPSignature signature;
   private final M unsignedPayload;
 
-  public SignedData(final M unsignedPayload, final Address sender, final Signature signature) {
+  /**
+   * Create signed data.
+   *
+   * @param <T> the type parameter
+   * @param payload the payload
+   * @param signature the signature
+   * @return the signed data
+   */
+  public static <T extends Payload> SignedData<T> create(
+      final T payload, final SECPSignature signature) {
+    final Hash msgHash = payload.hashForSignature();
+    return new SignedData<>(payload, Util.signatureToAddress(signature, msgHash), signature);
+  }
+
+  private SignedData(final M unsignedPayload, final Address sender, final SECPSignature signature) {
     this.unsignedPayload = unsignedPayload;
     this.sender = sender;
     this.signature = signature;
@@ -41,18 +62,32 @@ public Address getAuthor() {
     return sender;
   }
 
+  /**
+   * Gets payload.
+   *
+   * @return the payload
+   */
   public M getPayload() {
     return unsignedPayload;
   }
 
+  /**
+   * Write to.
+   *
+   * @param output the output
+   */
   public void writeTo(final RLPOutput output) {
-
     output.startList();
     unsignedPayload.writeTo(output);
     output.writeBytes(signature.encodedBytes());
     output.endList();
   }
 
+  /**
+   * Encode.
+   *
+   * @return the bytes
+   */
   public Bytes encode() {
     final BytesValueRLPOutput rlpEncode = new BytesValueRLPOutput();
     writeTo(rlpEncode);
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/protocol/BftProtocolManager.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/protocol/BftProtocolManager.java
new file mode 100644
index 00000000000..0ef72f95edf
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/protocol/BftProtocolManager.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft.protocol;
+
+import org.hyperledger.besu.consensus.common.bft.BftEventQueue;
+import org.hyperledger.besu.consensus.common.bft.events.BftEvent;
+import org.hyperledger.besu.consensus.common.bft.events.BftEvents;
+import org.hyperledger.besu.consensus.common.bft.network.PeerConnectionTracker;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.p2p.network.ProtocolManager;
+import org.hyperledger.besu.ethereum.p2p.peers.Peer;
+import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Bft protocol manager. */
+public class BftProtocolManager implements ProtocolManager {
+  private static final Logger LOG = LoggerFactory.getLogger(BftProtocolManager.class);
+
+  private final BftEventQueue bftEventQueue;
+  private final PeerConnectionTracker peers;
+  private final Capability supportedCapability;
+  private final String subProtocolName;
+
+  /**
+   * Constructor for the ibft protocol manager
+   *
+   * @param bftEventQueue Entry point into the ibft event processor
+   * @param peers Used to track all connected IBFT peers.
+   * @param supportedCapability The capability offered by this protocol manager
+   * @param subProtocolName The name of the protocol being supported
+   */
+  public BftProtocolManager(
+      final BftEventQueue bftEventQueue,
+      final PeerConnectionTracker peers,
+      final Capability supportedCapability,
+      final String subProtocolName) {
+    this.bftEventQueue = bftEventQueue;
+    this.peers = peers;
+    this.supportedCapability = supportedCapability;
+    this.subProtocolName = subProtocolName;
+  }
+
+  @Override
+  public String getSupportedProtocol() {
+    return subProtocolName;
+  }
+
+  @Override
+  public List<Capability> getSupportedCapabilities() {
+    return Arrays.asList(supportedCapability);
+  }
+
+  @Override
+  public void stop() {}
+
+  @Override
+  public void awaitStop() throws InterruptedException {}
+
+  /**
+   * This function is called by the P2P framework when an "IBF" message has been received. This
+   * function is responsible for:
+   *
+   * <ul>
+   *   <li>Determining if the message was from a current validator (discard if not)
+   *   <li>Determining if the message received was for the 'current round', discarding if old and
+   *       buffering for the future if ahead of current state.
+   *   <li>If the received message is otherwise valid, it is sent to the state machine which is
+   *       responsible for determining how to handle the message given its internal state.
+   * </ul>
+   *
+   * @param cap The capability under which the message was transmitted.
+   * @param message The message to be decoded.
+   */
+  @Override
+  public void processMessage(final Capability cap, final Message message) {
+    final MessageData messageData = message.getData();
+    final int code = messageData.getCode();
+    final Address address = message.getConnection().getPeerInfo().getAddress();
+    LOG.trace("Process message {}, {}, from = {}", cap, code, address);
+
+    final BftEvent messageEvent = BftEvents.fromMessage(message);
+    bftEventQueue.add(messageEvent);
+  }
+
+  @Override
+  public void handleNewConnection(final PeerConnection peerConnection) {
+    peers.add(peerConnection);
+  }
+
+  @Override
+  public boolean shouldConnect(final Peer peer, final boolean incoming) {
+    return false; // for now the EthProtocolManager takes care of this
+  }
+
+  @Override
+  public void handleDisconnect(
+      final PeerConnection peerConnection,
+      final DisconnectReason disconnectReason,
+      final boolean initiatedByPeer) {
+    peers.remove(peerConnection);
+  }
+
+  @Override
+  public int getHighestProtocolVersion() {
+    return supportedCapability.getVersion();
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/queries/BftQueryServiceImpl.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/queries/BftQueryServiceImpl.java
new file mode 100644
index 00000000000..55337cb5c2c
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/queries/BftQueryServiceImpl.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft.queries;
+
+import org.hyperledger.besu.consensus.common.PoaQueryServiceImpl;
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.plugin.services.query.BftQueryService;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import org.apache.tuweni.bytes.Bytes32;
+
+/** The Bft query service. */
+public class BftQueryServiceImpl extends PoaQueryServiceImpl implements BftQueryService {
+
+  private final ValidatorProvider validatorProvider;
+  private final String consensusMechanismName;
+  private final BftBlockInterface bftBlockInterface;
+
+  /**
+   * Instantiates a new Bft query service.
+   *
+   * @param blockInterface the block interface
+   * @param blockchain the blockchain
+   * @param validatorProvider the validator provider
+   * @param nodeKey the node key
+   * @param consensusMechanismName the consensus mechanism name
+   */
+  public BftQueryServiceImpl(
+      final BftBlockInterface blockInterface,
+      final Blockchain blockchain,
+      final ValidatorProvider validatorProvider,
+      final NodeKey nodeKey,
+      final String consensusMechanismName) {
+    super(blockInterface, blockchain, nodeKey);
+    this.bftBlockInterface = blockInterface;
+    this.validatorProvider = validatorProvider;
+    this.consensusMechanismName = consensusMechanismName;
+  }
+
+  @Override
+  public int getRoundNumberFrom(final org.hyperledger.besu.plugin.data.BlockHeader header) {
+    final BlockHeader headerFromChain = getHeaderFromChain(header);
+    final BftExtraData extraData = bftBlockInterface.getExtraData(headerFromChain);
+    return extraData.getRound();
+  }
+
+  @Override
+  public Collection<Address> getSignersFrom(
+      final org.hyperledger.besu.plugin.data.BlockHeader header) {
+    final BlockHeader headerFromChain = getHeaderFromChain(header);
+    return Collections.unmodifiableList(bftBlockInterface.getCommitters(headerFromChain));
+  }
+
+  @Override
+  public Collection<Address> getValidatorsForLatestBlock() {
+    return Collections.unmodifiableCollection(validatorProvider.getValidatorsAtHead());
+  }
+
+  @Override
+  public String getConsensusMechanismName() {
+    return consensusMechanismName;
+  }
+
+  private BlockHeader getHeaderFromChain(
+      final org.hyperledger.besu.plugin.data.BlockHeader header) {
+    if (header instanceof BlockHeader) {
+      return (BlockHeader) header;
+    }
+
+    final Hash blockHash = Hash.wrap(Bytes32.wrap(header.getBlockHash().toArray()));
+    return getBlockchain().getBlockHeader(blockHash).orElseThrow();
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/statemachine/BaseBftController.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/statemachine/BaseBftController.java
new file mode 100644
index 00000000000..e35af1af646
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/statemachine/BaseBftController.java
@@ -0,0 +1,247 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft.statemachine;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.Gossiper;
+import org.hyperledger.besu.consensus.common.bft.MessageTracker;
+import org.hyperledger.besu.consensus.common.bft.SynchronizerUpdater;
+import org.hyperledger.besu.consensus.common.bft.events.BftReceivedMessageEvent;
+import org.hyperledger.besu.consensus.common.bft.events.BlockTimerExpiry;
+import org.hyperledger.besu.consensus.common.bft.events.NewChainHead;
+import org.hyperledger.besu.consensus.common.bft.events.RoundExpiry;
+import org.hyperledger.besu.consensus.common.bft.messagewrappers.BftMessage;
+import org.hyperledger.besu.consensus.common.bft.payload.Authored;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Consumer;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Base bft controller. */
+public abstract class BaseBftController implements BftEventHandler {
+
+  private static final Logger LOG = LoggerFactory.getLogger(BaseBftController.class);
+  private final Blockchain blockchain;
+  private final BftFinalState bftFinalState;
+  private final FutureMessageBuffer futureMessageBuffer;
+  private final Gossiper gossiper;
+  private final MessageTracker duplicateMessageTracker;
+  private final SynchronizerUpdater sychronizerUpdater;
+
+  private final AtomicBoolean started = new AtomicBoolean(false);
+
+  /**
+   * Instantiates a new Base bft controller.
+   *
+   * @param blockchain the blockchain
+   * @param bftFinalState the bft final state
+   * @param gossiper the gossiper
+   * @param duplicateMessageTracker the duplicate message tracker
+   * @param futureMessageBuffer the future message buffer
+   * @param sychronizerUpdater the synchronizer updater
+   */
+  protected BaseBftController(
+      final Blockchain blockchain,
+      final BftFinalState bftFinalState,
+      final Gossiper gossiper,
+      final MessageTracker duplicateMessageTracker,
+      final FutureMessageBuffer futureMessageBuffer,
+      final SynchronizerUpdater sychronizerUpdater) {
+    this.blockchain = blockchain;
+    this.bftFinalState = bftFinalState;
+    this.futureMessageBuffer = futureMessageBuffer;
+    this.gossiper = gossiper;
+    this.duplicateMessageTracker = duplicateMessageTracker;
+    this.sychronizerUpdater = sychronizerUpdater;
+  }
+
+  @Override
+  public void start() {
+    if (started.compareAndSet(false, true)) {
+      startNewHeightManager(blockchain.getChainHeadHeader());
+    }
+  }
+
+  @Override
+  public void handleMessageEvent(final BftReceivedMessageEvent msg) {
+    final MessageData data = msg.getMessage().getData();
+    if (!duplicateMessageTracker.hasSeenMessage(data)) {
+      duplicateMessageTracker.addSeenMessage(data);
+      handleMessage(msg.getMessage());
+    } else {
+      LOG.trace("Discarded duplicate message");
+    }
+  }
+
+  /**
+   * Handle message.
+   *
+   * @param message the message
+   */
+  protected abstract void handleMessage(final Message message);
+
+  /**
+   * Consume message.
+   *
+   * @param <P> the type parameter of BftMessage
+   * @param message the message
+   * @param bftMessage the bft message
+   * @param handleMessage the handle message
+   */
+  protected <P extends BftMessage<?>> void consumeMessage(
+      final Message message, final P bftMessage, final Consumer<P> handleMessage) {
+    LOG.trace("Received BFT {} message", bftMessage.getClass().getSimpleName());
+
+    // Discard all messages which target the BLOCKCHAIN height (which SHOULD be 1 less than
+    // the currentHeightManager, but CAN be the same directly following import).
+    if (bftMessage.getRoundIdentifier().getSequenceNumber()
+        <= blockchain.getChainHeadBlockNumber()) {
+      LOG.debug(
+          "Discarding a message which targets a height {} not above current chain height {}.",
+          bftMessage.getRoundIdentifier().getSequenceNumber(),
+          blockchain.getChainHeadBlockNumber());
+      return;
+    }
+
+    if (processMessage(bftMessage, message)) {
+      gossiper.send(message);
+      handleMessage.accept(bftMessage);
+    }
+  }
+
+  @Override
+  public void handleNewBlockEvent(final NewChainHead newChainHead) {
+    final BlockHeader newBlockHeader = newChainHead.getNewChainHeadHeader();
+    final BlockHeader currentMiningParent = getCurrentHeightManager().getParentBlockHeader();
+    LOG.debug(
+        "New chain head detected (block number={})," + " currently mining on top of {}.",
+        newBlockHeader.getNumber(),
+        currentMiningParent.getNumber());
+    if (newBlockHeader.getNumber() < currentMiningParent.getNumber()) {
+      LOG.trace(
+          "Discarding NewChainHead event, was for previous block height. chainHeight={} eventHeight={}",
+          currentMiningParent.getNumber(),
+          newBlockHeader.getNumber());
+      return;
+    }
+
+    if (newBlockHeader.getNumber() == currentMiningParent.getNumber()) {
+      if (newBlockHeader.getHash().equals(currentMiningParent.getHash())) {
+        LOG.trace(
+            "Discarding duplicate NewChainHead event. chainHeight={} newBlockHash={} parentBlockHash={}",
+            newBlockHeader.getNumber(),
+            newBlockHeader.getHash(),
+            currentMiningParent.getHash());
+      } else {
+        LOG.error(
+            "Subsequent NewChainHead event at same block height indicates chain fork. chainHeight={}",
+            currentMiningParent.getNumber());
+      }
+      return;
+    }
+    startNewHeightManager(newBlockHeader);
+  }
+
+  @Override
+  public void handleBlockTimerExpiry(final BlockTimerExpiry blockTimerExpiry) {
+    final ConsensusRoundIdentifier roundIndentifier = blockTimerExpiry.getRoundIndentifier();
+    if (isMsgForCurrentHeight(roundIndentifier)) {
+      getCurrentHeightManager().handleBlockTimerExpiry(roundIndentifier);
+    } else {
+      LOG.trace(
+          "Block timer event discarded as it is not for current block height chainHeight={} eventHeight={}",
+          getCurrentHeightManager().getChainHeight(),
+          roundIndentifier.getSequenceNumber());
+    }
+  }
+
+  @Override
+  public void handleRoundExpiry(final RoundExpiry roundExpiry) {
+    // Discard all messages which target the BLOCKCHAIN height (which SHOULD be 1 less than
+    // the currentHeightManager, but CAN be the same directly following import).
+    if (roundExpiry.getView().getSequenceNumber() <= blockchain.getChainHeadBlockNumber()) {
+      LOG.debug("Discarding a round-expiry which targets a height not above current chain height.");
+      return;
+    }
+
+    if (isMsgForCurrentHeight(roundExpiry.getView())) {
+      getCurrentHeightManager().roundExpired(roundExpiry);
+    } else {
+      LOG.trace(
+          "Round expiry event discarded as it is not for current block height chainHeight={} eventHeight={}",
+          getCurrentHeightManager().getChainHeight(),
+          roundExpiry.getView().getSequenceNumber());
+    }
+  }
+
+  /**
+   * Create new height manager.
+   *
+   * @param parentHeader the parent header
+   */
+  protected abstract void createNewHeightManager(final BlockHeader parentHeader);
+
+  /**
+   * Gets current height manager.
+   *
+   * @return the current height manager
+   */
+  protected abstract BaseBlockHeightManager getCurrentHeightManager();
+
+  private void startNewHeightManager(final BlockHeader parentHeader) {
+    createNewHeightManager(parentHeader);
+    final long newChainHeight = getCurrentHeightManager().getChainHeight();
+    futureMessageBuffer.retrieveMessagesForHeight(newChainHeight).forEach(this::handleMessage);
+  }
+
+  private boolean processMessage(final BftMessage<?> msg, final Message rawMsg) {
+    final ConsensusRoundIdentifier msgRoundIdentifier = msg.getRoundIdentifier();
+    if (isMsgForCurrentHeight(msgRoundIdentifier)) {
+      return isMsgFromKnownValidator(msg) && bftFinalState.isLocalNodeValidator();
+    } else if (isMsgForFutureChainHeight(msgRoundIdentifier)) {
+      LOG.trace("Received message for future block height round={}", msgRoundIdentifier);
+      futureMessageBuffer.addMessage(msgRoundIdentifier.getSequenceNumber(), rawMsg);
+      // Notify the synchronizer the transmitting peer must have the parent block to the received
+      // message's target height.
+      sychronizerUpdater.updatePeerChainState(
+          msgRoundIdentifier.getSequenceNumber() - 1L, rawMsg.getConnection());
+    } else {
+      LOG.trace(
+          "BFT message discarded as it is from a previous block height messageType={} chainHeight={} eventHeight={}",
+          msg.getMessageType(),
+          getCurrentHeightManager().getChainHeight(),
+          msgRoundIdentifier.getSequenceNumber());
+    }
+    return false;
+  }
+
+  private boolean isMsgFromKnownValidator(final Authored msg) {
+    return bftFinalState.getValidators().contains(msg.getAuthor());
+  }
+
+  private boolean isMsgForCurrentHeight(final ConsensusRoundIdentifier roundIdentifier) {
+    return roundIdentifier.getSequenceNumber() == getCurrentHeightManager().getChainHeight();
+  }
+
+  private boolean isMsgForFutureChainHeight(final ConsensusRoundIdentifier roundIdentifier) {
+    return roundIdentifier.getSequenceNumber() > getCurrentHeightManager().getChainHeight();
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/statemachine/BaseBlockHeightManager.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/statemachine/BaseBlockHeightManager.java
new file mode 100644
index 00000000000..291b2589ece
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/statemachine/BaseBlockHeightManager.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft.statemachine;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.events.RoundExpiry;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+/** The interface Base block height manager. */
+public interface BaseBlockHeightManager {
+
+  /**
+   * Handle block timer expiry.
+   *
+   * @param roundIdentifier the round identifier
+   */
+  void handleBlockTimerExpiry(ConsensusRoundIdentifier roundIdentifier);
+
+  /**
+   * Round expired.
+   *
+   * @param expire the expiry
+   */
+  void roundExpired(RoundExpiry expire);
+
+  /**
+   * Gets chain height.
+   *
+   * @return the chain height
+   */
+  long getChainHeight();
+
+  /**
+   * Gets parent block header.
+   *
+   * @return the parent block header
+   */
+  BlockHeader getParentBlockHeader();
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/statemachine/BftEventHandler.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/statemachine/BftEventHandler.java
index adaccd1020e..223a17ed060 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/statemachine/BftEventHandler.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/statemachine/BftEventHandler.java
@@ -19,15 +19,37 @@
 import org.hyperledger.besu.consensus.common.bft.events.NewChainHead;
 import org.hyperledger.besu.consensus.common.bft.events.RoundExpiry;
 
+/** The interface Bft event handler. */
 public interface BftEventHandler {
 
+  /** Start. */
   void start();
 
+  /**
+   * Handle message event.
+   *
+   * @param msg the msg
+   */
   void handleMessageEvent(BftReceivedMessageEvent msg);
 
+  /**
+   * Handle new block event.
+   *
+   * @param newChainHead the new chain head
+   */
   void handleNewBlockEvent(NewChainHead newChainHead);
 
+  /**
+   * Handle block timer expiry.
+   *
+   * @param blockTimerExpiry the block timer expiry
+   */
   void handleBlockTimerExpiry(BlockTimerExpiry blockTimerExpiry);
 
+  /**
+   * Handle round expiry.
+   *
+   * @param roundExpiry the round expiry
+   */
   void handleRoundExpiry(RoundExpiry roundExpiry);
 }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/statemachine/BftFinalState.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/statemachine/BftFinalState.java
new file mode 100644
index 00000000000..13f6959779b
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/statemachine/BftFinalState.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft.statemachine;
+
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
+import org.hyperledger.besu.consensus.common.bft.BlockTimer;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.RoundTimer;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.BftBlockCreatorFactory;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.ProposerSelector;
+import org.hyperledger.besu.consensus.common.bft.network.ValidatorMulticaster;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.datatypes.Address;
+
+import java.time.Clock;
+import java.util.Collection;
+
+/** This is the full data set, or context, required for many of the aspects of BFT workflows. */
+public class BftFinalState {
+  private final ValidatorProvider validatorProvider;
+  private final NodeKey nodeKey;
+  private final Address localAddress;
+  private final ProposerSelector proposerSelector;
+  private final RoundTimer roundTimer;
+  private final BlockTimer blockTimer;
+  private final BftBlockCreatorFactory<?> blockCreatorFactory;
+  private final Clock clock;
+  private final ValidatorMulticaster validatorMulticaster;
+
+  /**
+   * Instantiates a new Bft final state.
+   *
+   * @param validatorProvider the validator provider
+   * @param nodeKey the node key
+   * @param localAddress the local address
+   * @param proposerSelector the proposer selector
+   * @param validatorMulticaster the validator multicaster
+   * @param roundTimer the round timer
+   * @param blockTimer the block timer
+   * @param blockCreatorFactory the block creator factory
+   * @param clock the clock
+   */
+  public BftFinalState(
+      final ValidatorProvider validatorProvider,
+      final NodeKey nodeKey,
+      final Address localAddress,
+      final ProposerSelector proposerSelector,
+      final ValidatorMulticaster validatorMulticaster,
+      final RoundTimer roundTimer,
+      final BlockTimer blockTimer,
+      final BftBlockCreatorFactory<?> blockCreatorFactory,
+      final Clock clock) {
+    this.validatorProvider = validatorProvider;
+    this.nodeKey = nodeKey;
+    this.localAddress = localAddress;
+    this.proposerSelector = proposerSelector;
+    this.roundTimer = roundTimer;
+    this.blockTimer = blockTimer;
+    this.blockCreatorFactory = blockCreatorFactory;
+    this.clock = clock;
+    this.validatorMulticaster = validatorMulticaster;
+  }
+
+  /**
+   * Gets quorum.
+   *
+   * @return the quorum
+   */
+  public int getQuorum() {
+    return BftHelpers.calculateRequiredValidatorQuorum(getValidators().size());
+  }
+
+  /**
+   * Gets validators.
+   *
+   * @return the validators
+   */
+  public Collection<Address> getValidators() {
+    return validatorProvider.getValidatorsAtHead();
+  }
+
+  /**
+   * Gets node key.
+   *
+   * @return the node key
+   */
+  public NodeKey getNodeKey() {
+    return nodeKey;
+  }
+
+  /**
+   * Gets local address.
+   *
+   * @return the local address
+   */
+  public Address getLocalAddress() {
+    return localAddress;
+  }
+
+  /**
+   * Is local node proposer for round.
+   *
+   * @param roundIdentifier the round identifier
+   * @return the boolean
+   */
+  public boolean isLocalNodeProposerForRound(final ConsensusRoundIdentifier roundIdentifier) {
+    return getProposerForRound(roundIdentifier).equals(localAddress);
+  }
+
+  /**
+   * Is local node validator.
+   *
+   * @return the boolean
+   */
+  public boolean isLocalNodeValidator() {
+    return getValidators().contains(localAddress);
+  }
+
+  /**
+   * Gets round timer.
+   *
+   * @return the round timer
+   */
+  public RoundTimer getRoundTimer() {
+    return roundTimer;
+  }
+
+  /**
+   * Gets block timer.
+   *
+   * @return the block timer
+   */
+  public BlockTimer getBlockTimer() {
+    return blockTimer;
+  }
+
+  /**
+   * Gets block creator factory.
+   *
+   * @return the block creator factory
+   */
+  public BftBlockCreatorFactory<?> getBlockCreatorFactory() {
+    return blockCreatorFactory;
+  }
+
+  /**
+   * Gets proposer for round.
+   *
+   * @param roundIdentifier the round identifier
+   * @return the proposer for round
+   */
+  public Address getProposerForRound(final ConsensusRoundIdentifier roundIdentifier) {
+    return proposerSelector.selectProposerForRound(roundIdentifier);
+  }
+
+  /**
+   * Gets validator multicaster.
+   *
+   * @return the validator multicaster
+   */
+  public ValidatorMulticaster getValidatorMulticaster() {
+    return validatorMulticaster;
+  }
+
+  /**
+   * Gets clock.
+   *
+   * @return the clock
+   */
+  public Clock getClock() {
+    return clock;
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/statemachine/BlockHeightManagerFactory.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/statemachine/BlockHeightManagerFactory.java
new file mode 100644
index 00000000000..12cec773cb6
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/statemachine/BlockHeightManagerFactory.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft.statemachine;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+/**
+ * The interface Block height manager factory.
+ *
+ * @param <T> the type parameter of BaseBlockHeightManager
+ */
+public interface BlockHeightManagerFactory<T extends BaseBlockHeightManager> {
+
+  /**
+   * Create type of BaseBlockHeightManager.
+   *
+   * @param parentHeader the parent header
+   * @return the type of BaseBlockHeightManager
+   */
+  public T create(final BlockHeader parentHeader);
+}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/FutureMessageBuffer.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/statemachine/FutureMessageBuffer.java
similarity index 86%
rename from consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/FutureMessageBuffer.java
rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/statemachine/FutureMessageBuffer.java
index 23ca9d1e40e..9674e6f9367 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/FutureMessageBuffer.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/statemachine/FutureMessageBuffer.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.ibft.statemachine;
+package org.hyperledger.besu.consensus.common.bft.statemachine;
 
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message;
 
@@ -41,6 +41,13 @@ public class FutureMessageBuffer {
   private final long futureMessagesLimit;
   private long chainHeight;
 
+  /**
+   * Instantiates a new Future message buffer.
+   *
+   * @param futureMessagesMaxDistance the future messages max distance
+   * @param futureMessagesLimit the future messages limit
+   * @param chainHeight the chain height
+   */
   public FutureMessageBuffer(
       final long futureMessagesMaxDistance,
       final long futureMessagesLimit,
@@ -50,6 +57,12 @@ public FutureMessageBuffer(
     this.chainHeight = chainHeight;
   }
 
+  /**
+   * Add message.
+   *
+   * @param msgChainHeight the msg chain height
+   * @param rawMsg the raw msg
+   */
   public void addMessage(final long msgChainHeight, final Message rawMsg) {
     if (futureMessagesLimit == 0 || !validMessageHeight(msgChainHeight, chainHeight)) {
       return;
@@ -83,6 +96,12 @@ private void evictMessages() {
     }
   }
 
+  /**
+   * Retrieve messages for height.
+   *
+   * @param height the height
+   * @return the list
+   */
   public List<Message> retrieveMessagesForHeight(final long height) {
     chainHeight = height;
     final List<Message> messages = buffer.getOrDefault(height, Collections.emptyList());
@@ -98,6 +117,11 @@ private void discardPreviousHeightMessages() {
     }
   }
 
+  /**
+   * Total messages size.
+   *
+   * @return the long
+   */
   @VisibleForTesting
   long totalMessagesSize() {
     return buffer.values().stream().map(List::size).reduce(0, Integer::sum).longValue();
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/validation/ValidationHelpers.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/validation/ValidationHelpers.java
new file mode 100644
index 00000000000..22a3bfff270
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/validation/ValidationHelpers.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft.validation;
+
+import org.hyperledger.besu.consensus.common.bft.payload.Authored;
+import org.hyperledger.besu.consensus.common.bft.payload.Payload;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+
+import java.util.Collection;
+
+/** The type Validation helpers. */
+public class ValidationHelpers {
+
+  /**
+   * Has duplicate authors.
+   *
+   * @param <T> the type parameter
+   * @param msgs the msgs
+   * @return the boolean
+   */
+  public static <T extends Payload> boolean hasDuplicateAuthors(
+      final Collection<SignedData<T>> msgs) {
+    final long distinctAuthorCount = msgs.stream().map(Authored::getAuthor).distinct().count();
+    return distinctAuthorCount != msgs.size();
+  }
+
+  /**
+   * Has sufficient entries.
+   *
+   * @param <T> the type parameter
+   * @param msgs the msgs
+   * @param requiredMsgCount the required msg count
+   * @return the boolean
+   */
+  public static <T extends Payload> boolean hasSufficientEntries(
+      final Collection<SignedData<T>> msgs, final long requiredMsgCount) {
+    return msgs.size() >= requiredMsgCount;
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractGetSignerMetricsMethod.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractGetSignerMetricsMethod.java
index 541d8c026a7..8e14e94108d 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractGetSignerMetricsMethod.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractGetSignerMetricsMethod.java
@@ -15,7 +15,8 @@
 package org.hyperledger.besu.consensus.common.jsonrpc;
 
 import org.hyperledger.besu.consensus.common.BlockInterface;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
@@ -24,7 +25,6 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.SignerMetricResult;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 
 import java.util.ArrayList;
@@ -33,23 +33,37 @@
 import java.util.Optional;
 import java.util.stream.LongStream;
 
+/** The Abstract get signer metrics method. */
 public abstract class AbstractGetSignerMetricsMethod {
 
   private static final long DEFAULT_RANGE_BLOCK = 100;
 
-  private final VoteTallyCache voteTallyCache;
+  private final ValidatorProvider validatorProvider;
   private final BlockInterface blockInterface;
   private final BlockchainQueries blockchainQueries;
 
+  /**
+   * Instantiates a new Abstract get signer metrics method.
+   *
+   * @param validatorProvider the validator provider
+   * @param blockInterface the block interface
+   * @param blockchainQueries the blockchain queries
+   */
   protected AbstractGetSignerMetricsMethod(
-      final VoteTallyCache voteTallyCache,
+      final ValidatorProvider validatorProvider,
       final BlockInterface blockInterface,
       final BlockchainQueries blockchainQueries) {
-    this.voteTallyCache = voteTallyCache;
+    this.validatorProvider = validatorProvider;
     this.blockInterface = blockInterface;
     this.blockchainQueries = blockchainQueries;
   }
 
+  /**
+   * Response.
+   *
+   * @param requestContext the request context
+   * @return the json rpc response
+   */
   public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
 
     final Optional<BlockParameter> startBlockParameter =
@@ -88,9 +102,8 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
                     // Get All validators present in the last block of the range even
                     // if they didn't propose a block
                     if (currentIndex == lastBlockIndex) {
-                      voteTallyCache
-                          .getVoteTallyAfterBlock(header)
-                          .getValidators()
+                      validatorProvider
+                          .getValidatorsAfterBlock(header)
                           .forEach(
                               address ->
                                   proposersMap.computeIfAbsent(address, SignerMetricResult::new));
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractVoteProposerMethod.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractVoteProposerMethod.java
index fb5d08b5c1f..b0983797eeb 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractVoteProposerMethod.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractVoteProposerMethod.java
@@ -14,31 +14,50 @@
  */
 package org.hyperledger.besu.consensus.common.jsonrpc;
 
-import org.hyperledger.besu.consensus.common.VoteProposer;
-import org.hyperledger.besu.consensus.common.VoteType;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.common.validator.VoteType;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 
 import java.util.Map;
 import java.util.stream.Collectors;
 
+/** The Abstract vote proposer method. */
 public class AbstractVoteProposerMethod {
 
-  private final VoteProposer voteProposer;
+  private final ValidatorProvider validatorProvider;
 
-  public AbstractVoteProposerMethod(final VoteProposer voteProposer) {
-    this.voteProposer = voteProposer;
+  /**
+   * Instantiates a new Abstract vote proposer method.
+   *
+   * @param validatorProvider the validator provider
+   */
+  public AbstractVoteProposerMethod(final ValidatorProvider validatorProvider) {
+    this.validatorProvider = validatorProvider;
   }
 
+  /**
+   * Response.
+   *
+   * @param requestContext the request context
+   * @return the json rpc response
+   */
   public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
-    final Map<String, Boolean> proposals =
-        voteProposer.getProposals().entrySet().stream()
-            .collect(
-                Collectors.toMap(
-                    proposal -> proposal.getKey().toString(),
-                    proposal -> proposal.getValue() == VoteType.ADD));
+    if (validatorProvider.getVoteProviderAtHead().isPresent()) {
+      final Map<String, Boolean> proposals =
+          validatorProvider.getVoteProviderAtHead().get().getProposals().entrySet().stream()
+              .collect(
+                  Collectors.toMap(
+                      proposal -> proposal.getKey().toString(),
+                      proposal -> proposal.getValue() == VoteType.ADD));
 
-    return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), proposals);
+      return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), proposals);
+    } else {
+      return new JsonRpcErrorResponse(
+          requestContext.getRequest().getId(), JsonRpcError.METHOD_NOT_ENABLED);
+    }
   }
 }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/ValidatorProvider.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/ValidatorProvider.java
new file mode 100644
index 00000000000..f11902baef8
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/ValidatorProvider.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.validator;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.Collection;
+import java.util.Optional;
+
+/** The interface Validator provider. */
+public interface ValidatorProvider {
+
+  /**
+   * Gets validators at head.
+   *
+   * @return the validators at head
+   */
+  Collection<Address> getValidatorsAtHead();
+
+  /**
+   * Gets validators after block.
+   *
+   * @param header the header
+   * @return the validators after block
+   */
+  Collection<Address> getValidatorsAfterBlock(BlockHeader header);
+
+  /**
+   * Gets validators for block.
+   *
+   * @param header the header
+   * @return the validators for block
+   */
+  Collection<Address> getValidatorsForBlock(BlockHeader header);
+
+  /**
+   * Gets vote provider at head.
+   *
+   * @return the vote provider at head
+   */
+  Optional<VoteProvider> getVoteProviderAtHead();
+
+  /**
+   * Gets vote provider after block.
+   *
+   * @param header the header
+   * @return the vote provider after block
+   */
+  /*
+   * ForkingValidatorProvider has a specific implementation but we don't want the client code to
+   * know it's using a ForkingValidatorProvider. ForkingValidatorProvider's voteProvider can be
+   * different per block. Other ValidatorProviders yield the same voteProvider at every block.
+   */
+  default Optional<VoteProvider> getVoteProviderAfterBlock(final BlockHeader header) {
+    return getVoteProviderAtHead();
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ValidatorVote.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/ValidatorVote.java
similarity index 75%
rename from consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ValidatorVote.java
rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/ValidatorVote.java
index d10a7e2c611..1192a1a0c40 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ValidatorVote.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/ValidatorVote.java
@@ -12,21 +12,29 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.common;
+package org.hyperledger.besu.consensus.common.validator;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static org.hyperledger.besu.consensus.common.VoteType.ADD;
+import static org.hyperledger.besu.consensus.common.validator.VoteType.ADD;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 
 import java.util.Objects;
 
+/** The Validator vote. */
 public class ValidatorVote {
 
   private final VoteType votePolarity;
   private final Address proposer;
   private final Address recipient;
 
+  /**
+   * Instantiates a new Validator vote.
+   *
+   * @param votePolarity the vote polarity
+   * @param proposer the proposer
+   * @param recipient the recipient
+   */
   public ValidatorVote(
       final VoteType votePolarity, final Address proposer, final Address recipient) {
     checkNotNull(votePolarity);
@@ -37,18 +45,38 @@ public ValidatorVote(
     this.recipient = recipient;
   }
 
+  /**
+   * Gets vote polarity.
+   *
+   * @return the vote polarity
+   */
   public VoteType getVotePolarity() {
     return votePolarity;
   }
 
+  /**
+   * Gets proposer.
+   *
+   * @return the proposer
+   */
   public Address getProposer() {
     return proposer;
   }
 
+  /**
+   * Gets recipient.
+   *
+   * @return the recipient
+   */
   public Address getRecipient() {
     return recipient;
   }
 
+  /**
+   * Is auth vote.
+   *
+   * @return the boolean
+   */
   public boolean isAuthVote() {
     return votePolarity.equals(ADD);
   }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/VoteProvider.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/VoteProvider.java
new file mode 100644
index 00000000000..454140679fc
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/VoteProvider.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.validator;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.Map;
+import java.util.Optional;
+
+/** The interface Vote provider. */
+public interface VoteProvider {
+
+  /**
+   * Gets vote after block.
+   *
+   * @param header the header
+   * @param localAddress the local address
+   * @return the vote after block
+   */
+  Optional<ValidatorVote> getVoteAfterBlock(final BlockHeader header, final Address localAddress);
+
+  /**
+   * Auth vote.
+   *
+   * @param address the address
+   */
+  void authVote(final Address address);
+
+  /**
+   * Drop vote.
+   *
+   * @param address the address
+   */
+  void dropVote(final Address address);
+
+  /**
+   * Discard vote.
+   *
+   * @param address the address
+   */
+  void discardVote(final Address address);
+
+  /**
+   * Gets proposals.
+   *
+   * @return the proposals
+   */
+  Map<Address, VoteType> getProposals();
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteType.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/VoteType.java
similarity index 88%
rename from consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteType.java
rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/VoteType.java
index 3b43ef1303b..bf2f4573d08 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteType.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/VoteType.java
@@ -12,13 +12,15 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.common;
+package org.hyperledger.besu.consensus.common.validator;
 
 /**
  * Determines if a validator vote is indicating that they should be added, or removed. This does not
  * attempt to determine how said vote should be serialised/deserialised.
  */
 public enum VoteType {
+  /** Add vote type. */
   ADD,
+  /** Drop vote type. */
   DROP;
 }
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/blockbased/BlockValidatorProvider.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/blockbased/BlockValidatorProvider.java
new file mode 100644
index 00000000000..7b6e1181ce3
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/blockbased/BlockValidatorProvider.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.validator.blockbased;
+
+import org.hyperledger.besu.consensus.common.BftValidatorOverrides;
+import org.hyperledger.besu.consensus.common.BlockInterface;
+import org.hyperledger.besu.consensus.common.EpochManager;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.common.validator.VoteProvider;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.Collection;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/** The Block validator provider. */
+public class BlockValidatorProvider implements ValidatorProvider {
+
+  private final VoteTallyCache voteTallyCache;
+  private final VoteProvider voteProvider;
+  private final BlockInterface blockInterface;
+
+  /**
+   * Forking validator provider block validator provider.
+   *
+   * @param blockchain the blockchain
+   * @param epochManager the epoch manager
+   * @param blockInterface the block interface
+   * @param bftValidatorOverrides the bft validator overrides
+   * @return the block validator provider
+   */
+  public static BlockValidatorProvider forkingValidatorProvider(
+      final Blockchain blockchain,
+      final EpochManager epochManager,
+      final BlockInterface blockInterface,
+      final BftValidatorOverrides bftValidatorOverrides) {
+    return new BlockValidatorProvider(
+        blockchain, epochManager, blockInterface, Optional.of(bftValidatorOverrides));
+  }
+
+  /**
+   * Non forking validator provider block validator provider.
+   *
+   * @param blockchain the blockchain
+   * @param epochManager the epoch manager
+   * @param blockInterface the block interface
+   * @return the block validator provider
+   */
+  public static BlockValidatorProvider nonForkingValidatorProvider(
+      final Blockchain blockchain,
+      final EpochManager epochManager,
+      final BlockInterface blockInterface) {
+    return new BlockValidatorProvider(blockchain, epochManager, blockInterface, Optional.empty());
+  }
+
+  private BlockValidatorProvider(
+      final Blockchain blockchain,
+      final EpochManager epochManager,
+      final BlockInterface blockInterface,
+      final Optional<BftValidatorOverrides> bftValidatorOverrides) {
+    final VoteTallyUpdater voteTallyUpdater = new VoteTallyUpdater(epochManager, blockInterface);
+    final VoteProposer voteProposer = new VoteProposer();
+    this.voteTallyCache =
+        bftValidatorOverrides.isPresent()
+            ? new ForkingVoteTallyCache(
+                blockchain,
+                voteTallyUpdater,
+                epochManager,
+                blockInterface,
+                bftValidatorOverrides.get())
+            : new VoteTallyCache(blockchain, voteTallyUpdater, epochManager, blockInterface);
+    this.voteProvider = new BlockVoteProvider(voteTallyCache, voteProposer);
+    this.blockInterface = blockInterface;
+  }
+
+  @Override
+  public Collection<Address> getValidatorsAtHead() {
+    return voteTallyCache.getVoteTallyAtHead().getValidators();
+  }
+
+  @Override
+  public Collection<Address> getValidatorsAfterBlock(final BlockHeader header) {
+    return voteTallyCache.getVoteTallyAfterBlock(header).getValidators();
+  }
+
+  @Override
+  public Collection<Address> getValidatorsForBlock(final BlockHeader header) {
+    return blockInterface.validatorsInBlock(header).stream().sorted().collect(Collectors.toList());
+  }
+
+  @Override
+  public Optional<VoteProvider> getVoteProviderAtHead() {
+    return Optional.of(voteProvider);
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/blockbased/BlockVoteProvider.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/blockbased/BlockVoteProvider.java
new file mode 100644
index 00000000000..82dc336a851
--- /dev/null
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/blockbased/BlockVoteProvider.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.validator.blockbased;
+
+import org.hyperledger.besu.consensus.common.validator.ValidatorVote;
+import org.hyperledger.besu.consensus.common.validator.VoteProvider;
+import org.hyperledger.besu.consensus.common.validator.VoteType;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.Map;
+import java.util.Optional;
+
+/** The Block vote provider. */
+public class BlockVoteProvider implements VoteProvider {
+
+  private final VoteTallyCache voteTallyCache;
+  private final VoteProposer voteProposer;
+
+  /**
+   * Instantiates a new Block vote provider.
+   *
+   * @param voteTallyCache the vote tally cache
+   * @param voteProposer the vote proposer
+   */
+  public BlockVoteProvider(final VoteTallyCache voteTallyCache, final VoteProposer voteProposer) {
+    this.voteTallyCache = voteTallyCache;
+    this.voteProposer = voteProposer;
+  }
+
+  @Override
+  public Optional<ValidatorVote> getVoteAfterBlock(
+      final BlockHeader header, final Address localAddress) {
+    final VoteTally voteTally = voteTallyCache.getVoteTallyAfterBlock(header);
+    return voteProposer.getVote(localAddress, voteTally);
+  }
+
+  @Override
+  public void authVote(final Address address) {
+    voteProposer.auth(address);
+  }
+
+  @Override
+  public void dropVote(final Address address) {
+    voteProposer.drop(address);
+  }
+
+  @Override
+  public void discardVote(final Address address) {
+    voteProposer.discard(address);
+  }
+
+  @Override
+  public Map<Address, VoteType> getProposals() {
+    return voteProposer.getProposals();
+  }
+}
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ForkingVoteTallyCache.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/blockbased/ForkingVoteTallyCache.java
similarity index 83%
rename from consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ForkingVoteTallyCache.java
rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/blockbased/ForkingVoteTallyCache.java
index 8a4afffeac7..3d4d7e34847 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/ForkingVoteTallyCache.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/blockbased/ForkingVoteTallyCache.java
@@ -12,14 +12,17 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.common;
+package org.hyperledger.besu.consensus.common.validator.blockbased;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import org.hyperledger.besu.consensus.common.BftValidatorOverrides;
+import org.hyperledger.besu.consensus.common.BlockInterface;
+import org.hyperledger.besu.consensus.common.EpochManager;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 
-public class ForkingVoteTallyCache extends VoteTallyCache {
+class ForkingVoteTallyCache extends VoteTallyCache {
 
   private final BftValidatorOverrides validatorOverrides;
 
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteProposer.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteProposer.java
similarity index 94%
rename from consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteProposer.java
rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteProposer.java
index 7a1e8592cc4..42bdc4a0b10 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteProposer.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteProposer.java
@@ -12,9 +12,11 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.common;
+package org.hyperledger.besu.consensus.common.validator.blockbased;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.consensus.common.validator.ValidatorVote;
+import org.hyperledger.besu.consensus.common.validator.VoteType;
+import org.hyperledger.besu.datatypes.Address;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -25,7 +27,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 /** Container for pending votes and selecting a vote for new blocks */
-public class VoteProposer {
+class VoteProposer {
 
   private final Map<Address, VoteType> proposals = new ConcurrentHashMap<>();
   private final AtomicInteger votePosition = new AtomicInteger(0);
@@ -61,10 +63,6 @@ public Map<Address, VoteType> getProposals() {
     return proposals;
   }
 
-  public Optional<VoteType> get(final Address address) {
-    return Optional.ofNullable(proposals.get(address));
-  }
-
   private boolean voteNotYetCast(
       final Address localAddress,
       final Address voteAddress,
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteTally.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteTally.java
similarity index 88%
rename from consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteTally.java
rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteTally.java
index 05b4d41dc8c..6af918787c6 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteTally.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteTally.java
@@ -12,9 +12,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.common;
+package org.hyperledger.besu.consensus.common.validator.blockbased;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.consensus.common.validator.ValidatorVote;
+import org.hyperledger.besu.datatypes.Address;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -29,14 +30,14 @@
 import com.google.common.collect.Maps;
 
 /** Tracks the current list of validators and votes to add or drop validators. */
-public class VoteTally implements ValidatorProvider {
+class VoteTally {
 
   private final NavigableSet<Address> currentValidators;
 
   private final Map<Address, Set<Address>> addVotesBySubject;
   private final Map<Address, Set<Address>> removeVotesBySubject;
 
-  public VoteTally(final Collection<Address> initialValidators) {
+  VoteTally(final Collection<Address> initialValidators) {
     this(new TreeSet<>(initialValidators), new HashMap<>(), new HashMap<>());
   }
 
@@ -55,7 +56,7 @@ private VoteTally(
    *
    * @param validatorVote The vote which was cast in a block header.
    */
-  public void addVote(final ValidatorVote validatorVote) {
+  void addVote(final ValidatorVote validatorVote) {
     final Set<Address> addVotesForSubject =
         addVotesBySubject.computeIfAbsent(validatorVote.getRecipient(), target -> new HashSet<>());
     final Set<Address> removeVotesForSubject =
@@ -88,11 +89,11 @@ private void discardOutstandingVotesFor(final Address subject) {
     removeVotesBySubject.remove(subject);
   }
 
-  public Set<Address> getOutstandingAddVotesFor(final Address subject) {
+  Set<Address> getOutstandingAddVotesFor(final Address subject) {
     return Optional.ofNullable(addVotesBySubject.get(subject)).orElse(Collections.emptySet());
   }
 
-  public Set<Address> getOutstandingRemoveVotesFor(final Address subject) {
+  Set<Address> getOutstandingRemoveVotesFor(final Address subject) {
     return Optional.ofNullable(removeVotesBySubject.get(subject)).orElse(Collections.emptySet());
   }
 
@@ -104,20 +105,21 @@ private int validatorLimit() {
    * Reset the outstanding vote tallies as required at each epoch. The current validator list is
    * unaffected.
    */
-  public void discardOutstandingVotes() {
+  void discardOutstandingVotes() {
     addVotesBySubject.clear();
   }
 
   /**
+   * The validator addresses
+   *
    * @return The collection of validators after the voting at the most recent block has been
    *     finalised.
    */
-  @Override
-  public Collection<Address> getValidators() {
+  Collection<Address> getValidators() {
     return currentValidators;
   }
 
-  public VoteTally copy() {
+  VoteTally copy() {
     final Map<Address, Set<Address>> addVotesBySubject = Maps.newHashMap();
     final Map<Address, Set<Address>> removeVotesBySubject = Maps.newHashMap();
 
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteTallyCache.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteTallyCache.java
similarity index 92%
rename from consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteTallyCache.java
rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteTallyCache.java
index f1c4ad955e7..2201df13891 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteTallyCache.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteTallyCache.java
@@ -12,13 +12,15 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.common;
+package org.hyperledger.besu.consensus.common.validator.blockbased;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import org.hyperledger.besu.consensus.common.BlockInterface;
+import org.hyperledger.besu.consensus.common.EpochManager;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
@@ -28,7 +30,7 @@
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 
-public class VoteTallyCache {
+class VoteTallyCache {
 
   private final Blockchain blockchain;
   private final EpochManager epochManager;
@@ -38,7 +40,7 @@ public class VoteTallyCache {
       CacheBuilder.newBuilder().maximumSize(100).build();
   private final BlockInterface blockInterface;
 
-  public VoteTallyCache(
+  VoteTallyCache(
       final Blockchain blockchain,
       final VoteTallyUpdater voteTallyUpdater,
       final EpochManager epochManager,
@@ -54,7 +56,7 @@ public VoteTallyCache(
     this.blockInterface = blockInterface;
   }
 
-  public VoteTally getVoteTallyAtHead() {
+  VoteTally getVoteTallyAtHead() {
     return getVoteTallyAfterBlock(blockchain.getChainHeadHeader());
   }
 
@@ -69,7 +71,7 @@ public VoteTally getVoteTallyAtHead() {
    * @return The Vote Tally (and therefore validators) following the application of all votes upto
    *     and including the requested header.
    */
-  public VoteTally getVoteTallyAfterBlock(final BlockHeader header) {
+  VoteTally getVoteTallyAfterBlock(final BlockHeader header) {
     try {
       return voteTallyCache.get(header.getHash(), () -> populateCacheUptoAndIncluding(header));
     } catch (final ExecutionException ex) {
diff --git a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteTallyUpdater.java b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteTallyUpdater.java
similarity index 77%
rename from consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteTallyUpdater.java
rename to consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteTallyUpdater.java
index cd08704464b..bae5540aad0 100644
--- a/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/VoteTallyUpdater.java
+++ b/consensus/common/src/main/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteTallyUpdater.java
@@ -12,30 +12,33 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.common;
+package org.hyperledger.besu.consensus.common.validator.blockbased;
 
+import org.hyperledger.besu.consensus.common.BlockInterface;
+import org.hyperledger.besu.consensus.common.EpochManager;
+import org.hyperledger.besu.consensus.common.validator.ValidatorVote;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 
 import java.util.Collection;
 import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Provides the logic to extract vote tally state from the blockchain and update it as blocks are
  * added.
  */
-public class VoteTallyUpdater {
+class VoteTallyUpdater {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(VoteTallyUpdater.class);
 
   private final EpochManager epochManager;
   private final BlockInterface blockInterface;
 
-  public VoteTallyUpdater(final EpochManager epochManager, final BlockInterface blockInterface) {
+  VoteTallyUpdater(final EpochManager epochManager, final BlockInterface blockInterface) {
     this.epochManager = epochManager;
     this.blockInterface = blockInterface;
   }
@@ -46,7 +49,7 @@ public VoteTallyUpdater(final EpochManager epochManager, final BlockInterface bl
    * @param blockchain the blockchain to load the current state from
    * @return a VoteTally reflecting the state of the blockchain head
    */
-  public VoteTally buildVoteTallyFromBlockchain(final Blockchain blockchain) {
+  VoteTally buildVoteTallyFromBlockchain(final Blockchain blockchain) {
     final long chainHeadBlockNumber = blockchain.getChainHeadBlockNumber();
     final long epochBlockNumber = epochManager.getLastEpochBlock(chainHeadBlockNumber);
     LOG.info("Loading validator voting state starting from block {}", epochBlockNumber);
@@ -67,7 +70,7 @@ public VoteTally buildVoteTallyFromBlockchain(final Blockchain blockchain) {
    * @param header the header of the block being added
    * @param voteTally the vote tally to update
    */
-  public void updateForBlock(final BlockHeader header, final VoteTally voteTally) {
+  void updateForBlock(final BlockHeader header, final VoteTally voteTally) {
     if (epochManager.isEpochBlock(header.getNumber())) {
       voteTally.discardOutstandingVotes();
       return;
diff --git a/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/BftContextBuilder.java b/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/BftContextBuilder.java
new file mode 100644
index 00000000000..4b8367d06fc
--- /dev/null
+++ b/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/BftContextBuilder.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.withSettings;
+
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
+
+import java.util.Collection;
+
+public class BftContextBuilder {
+
+  public static BftContext setupContextWithValidators(final Collection<Address> validators) {
+    final BftContext bftContext = mock(BftContext.class, withSettings().lenient());
+    final ValidatorProvider mockValidatorProvider =
+        mock(ValidatorProvider.class, withSettings().lenient());
+    final BftBlockInterface mockBftBlockInterface =
+        mock(BftBlockInterface.class, withSettings().lenient());
+    when(bftContext.getValidatorProvider()).thenReturn(mockValidatorProvider);
+    when(mockValidatorProvider.getValidatorsAfterBlock(any())).thenReturn(validators);
+    when(bftContext.getBlockInterface()).thenReturn(mockBftBlockInterface);
+    when(bftContext.as(any())).thenReturn(bftContext);
+    return bftContext;
+  }
+
+  public static BftContext setupContextWithBftExtraData(
+      final Collection<Address> validators, final BftExtraData bftExtraData) {
+    return setupContextWithBftExtraData(BftContext.class, validators, bftExtraData);
+  }
+
+  public static <T extends BftContext> T setupContextWithBftExtraData(
+      final Class<T> contextClazz,
+      final Collection<Address> validators,
+      final BftExtraData bftExtraData) {
+    final T bftContext = mock(contextClazz, withSettings().lenient());
+    final ValidatorProvider mockValidatorProvider =
+        mock(ValidatorProvider.class, withSettings().lenient());
+    final BftBlockInterface mockBftBlockInterface =
+        mock(BftBlockInterface.class, withSettings().lenient());
+    when(bftContext.getValidatorProvider()).thenReturn(mockValidatorProvider);
+    when(mockValidatorProvider.getValidatorsAfterBlock(any())).thenReturn(validators);
+    when(bftContext.getBlockInterface()).thenReturn(mockBftBlockInterface);
+    when(mockBftBlockInterface.getExtraData(any())).thenReturn(bftExtraData);
+    when(bftContext.as(any())).thenReturn(bftContext);
+    return bftContext;
+  }
+
+  public static BftContext setupContextWithBftExtraDataEncoder(
+      final Collection<Address> validators, final BftExtraDataCodec bftExtraDataCodec) {
+    return setupContextWithBftExtraDataEncoder(BftContext.class, validators, bftExtraDataCodec);
+  }
+
+  public static <T extends BftContext> T setupContextWithBftExtraDataEncoder(
+      final Class<T> contextClazz,
+      final Collection<Address> validators,
+      final BftExtraDataCodec bftExtraDataCodec) {
+    final T bftContext = mock(contextClazz, withSettings().lenient());
+    final ValidatorProvider mockValidatorProvider =
+        mock(ValidatorProvider.class, withSettings().lenient());
+    when(bftContext.getValidatorProvider()).thenReturn(mockValidatorProvider);
+    when(mockValidatorProvider.getValidatorsAfterBlock(any())).thenReturn(validators);
+    when(bftContext.getBlockInterface()).thenReturn(new BftBlockInterface(bftExtraDataCodec));
+    when(bftContext.as(any())).thenReturn(bftContext);
+
+    return bftContext;
+  }
+}
diff --git a/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/ConsensusRoundHelpers.java b/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/ConsensusRoundHelpers.java
new file mode 100644
index 00000000000..4eb3eab3d89
--- /dev/null
+++ b/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/ConsensusRoundHelpers.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft;
+
+public class ConsensusRoundHelpers {
+
+  public static ConsensusRoundIdentifier createFrom(
+      final ConsensusRoundIdentifier initial, final int offSetSequence, final int offSetRound) {
+    return new ConsensusRoundIdentifier(
+        initial.getSequenceNumber() + offSetSequence, initial.getRoundNumber() + offSetRound);
+  }
+}
diff --git a/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/ProposedBlockHelpers.java b/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/ProposedBlockHelpers.java
new file mode 100644
index 00000000000..be39f7a6d25
--- /dev/null
+++ b/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/ProposedBlockHelpers.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class ProposedBlockHelpers {
+
+  public static Block createProposalBlock(
+      final List<Address> validators, final ConsensusRoundIdentifier roundId) {
+    final BlockOptions blockOptions =
+        BlockOptions.create()
+            .setBlockNumber(roundId.getSequenceNumber())
+            .hasOmmers(false)
+            .hasTransactions(false);
+
+    if (validators.size() > 0) {
+      blockOptions.setCoinbase(validators.get(0));
+    }
+    return new BlockDataGenerator().block(blockOptions);
+  }
+
+  public static Block createProposalBlock(
+      final List<Address> validators,
+      final ConsensusRoundIdentifier roundId,
+      final BftExtraDataCodec bftExtraDataCodec) {
+    final Bytes extraData =
+        bftExtraDataCodec.encode(
+            new BftExtraData(
+                Bytes.wrap(new byte[32]),
+                Collections.emptyList(),
+                Optional.empty(),
+                roundId.getRoundNumber(),
+                validators));
+    final BlockOptions blockOptions =
+        BlockOptions.create()
+            .setExtraData(extraData)
+            .setBlockNumber(roundId.getSequenceNumber())
+            .setBlockHeaderFunctions(BftBlockHeaderFunctions.forCommittedSeal(bftExtraDataCodec))
+            .hasOmmers(false)
+            .hasTransactions(false);
+
+    if (validators.size() > 0) {
+      blockOptions.setCoinbase(validators.get(0));
+    }
+    return new BlockDataGenerator().block(blockOptions);
+  }
+}
diff --git a/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/inttest/DefaultValidatorPeer.java b/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/inttest/DefaultValidatorPeer.java
new file mode 100644
index 00000000000..aaa4b4a3395
--- /dev/null
+++ b/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/inttest/DefaultValidatorPeer.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft.inttest;
+
+import org.hyperledger.besu.consensus.common.bft.EventMultiplexer;
+import org.hyperledger.besu.consensus.common.bft.events.BftEvents;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.DefaultMessage;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+
+import java.util.Collections;
+import java.util.List;
+
+import com.google.common.collect.Lists;
+import org.apache.tuweni.bytes.Bytes;
+import org.assertj.core.api.Assertions;
+
+public abstract class DefaultValidatorPeer {
+
+  protected final Address nodeAddress;
+  protected final NodeKey nodeKey;
+  private final PeerConnection peerConnection;
+  protected final List<MessageData> receivedMessages = Lists.newArrayList();
+
+  private final EventMultiplexer localEventMultiplexer;
+  private long estimatedChainHeight = 0;
+
+  protected DefaultValidatorPeer(
+      final NodeParams nodeParams, final EventMultiplexer localEventMultiplexer) {
+    this.nodeKey = nodeParams.getNodeKey();
+    this.nodeAddress = nodeParams.getAddress();
+    final Bytes nodeId = nodeKey.getPublicKey().getEncodedBytes();
+    this.peerConnection = StubbedPeerConnection.create(nodeId);
+    this.localEventMultiplexer = localEventMultiplexer;
+  }
+
+  public Address getNodeAddress() {
+    return nodeAddress;
+  }
+
+  public NodeKey getnodeKey() {
+    return nodeKey;
+  }
+
+  public PeerConnection getPeerConnection() {
+    return peerConnection;
+  }
+
+  public SECPSignature getBlockSignature(final Hash digest) {
+    return nodeKey.sign(digest);
+  }
+
+  public void handleReceivedMessage(final MessageData message) {
+    receivedMessages.add(message);
+  }
+
+  public List<MessageData> getReceivedMessages() {
+    return Collections.unmodifiableList(receivedMessages);
+  }
+
+  public void clearReceivedMessages() {
+    receivedMessages.clear();
+  }
+
+  public void injectMessage(final MessageData msgData) {
+    final DefaultMessage message = new DefaultMessage(peerConnection, msgData);
+    localEventMultiplexer.handleBftEvent(BftEvents.fromMessage(message));
+  }
+
+  public void updateEstimatedChainHeight(final long estimatedChainHeight) {
+    this.estimatedChainHeight = estimatedChainHeight;
+  }
+
+  public void verifyEstimatedChainHeightEquals(final long expectedChainHeight) {
+    Assertions.assertThat(estimatedChainHeight).isEqualTo(expectedChainHeight);
+  }
+}
diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/NetworkLayout.java b/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/inttest/NetworkLayout.java
similarity index 91%
rename from consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/NetworkLayout.java
rename to consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/inttest/NetworkLayout.java
index ddf96aad3e7..4fbeefcc86c 100644
--- a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/NetworkLayout.java
+++ b/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/inttest/NetworkLayout.java
@@ -12,11 +12,11 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.ibft.support;
+package org.hyperledger.besu.consensus.common.bft.inttest;
 
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.core.Util;
 
 import java.util.ArrayList;
diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/NodeParams.java b/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/inttest/NodeParams.java
similarity index 85%
rename from consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/NodeParams.java
rename to consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/inttest/NodeParams.java
index 2706f051218..e384623cce2 100644
--- a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/NodeParams.java
+++ b/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/inttest/NodeParams.java
@@ -12,10 +12,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.ibft.support;
+package org.hyperledger.besu.consensus.common.bft.inttest;
 
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.datatypes.Address;
 
 public class NodeParams {
   private final Address address;
diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/StubValidatorMulticaster.java b/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/inttest/StubValidatorMulticaster.java
similarity index 79%
rename from consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/StubValidatorMulticaster.java
rename to consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/inttest/StubValidatorMulticaster.java
index 30b58b9a35f..fcbebf4b37f 100644
--- a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/StubValidatorMulticaster.java
+++ b/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/inttest/StubValidatorMulticaster.java
@@ -12,10 +12,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.ibft.support;
+package org.hyperledger.besu.consensus.common.bft.inttest;
 
-import org.hyperledger.besu.consensus.ibft.network.ValidatorMulticaster;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.consensus.common.bft.network.ValidatorMulticaster;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 
 import java.util.Collection;
@@ -25,11 +25,11 @@
 
 public class StubValidatorMulticaster implements ValidatorMulticaster {
 
-  private final List<ValidatorPeer> validatorNodes = Lists.newArrayList();
+  private final List<DefaultValidatorPeer> validatorNodes = Lists.newArrayList();
 
   public StubValidatorMulticaster() {}
 
-  public void addNetworkPeers(final Collection<ValidatorPeer> nodes) {
+  public void addNetworkPeers(final Collection<DefaultValidatorPeer> nodes) {
     validatorNodes.addAll(nodes);
   }
 
diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/StubbedPeerConnection.java b/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/inttest/StubbedPeerConnection.java
similarity index 95%
rename from consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/StubbedPeerConnection.java
rename to consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/inttest/StubbedPeerConnection.java
index f331d9a6199..28c4780bfd0 100644
--- a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/StubbedPeerConnection.java
+++ b/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/inttest/StubbedPeerConnection.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.ibft.support;
+package org.hyperledger.besu.consensus.common.bft.inttest;
 
 import static java.util.Collections.emptyList;
 import static org.mockito.Mockito.mock;
diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/StubbedSynchronizerUpdater.java b/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/inttest/StubbedSynchronizerUpdater.java
similarity index 78%
rename from consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/StubbedSynchronizerUpdater.java
rename to consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/inttest/StubbedSynchronizerUpdater.java
index cf33b2f3d04..44c6d9f6ebb 100644
--- a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/StubbedSynchronizerUpdater.java
+++ b/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/inttest/StubbedSynchronizerUpdater.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.ibft.support;
+package org.hyperledger.besu.consensus.common.bft.inttest;
 
 import static java.util.function.Function.identity;
 
@@ -26,7 +26,7 @@
 
 public class StubbedSynchronizerUpdater implements SynchronizerUpdater {
 
-  private final Map<PeerConnection, ValidatorPeer> validatorNodes = new HashMap<>();
+  private final Map<PeerConnection, DefaultValidatorPeer> validatorNodes = new HashMap<>();
 
   @Override
   public void updatePeerChainState(
@@ -34,8 +34,9 @@ public void updatePeerChainState(
     validatorNodes.get(peerConnection).updateEstimatedChainHeight(knownBlockNumber);
   }
 
-  public void addNetworkPeers(final Collection<ValidatorPeer> nodes) {
+  public void addNetworkPeers(final Collection<DefaultValidatorPeer> nodes) {
     validatorNodes.putAll(
-        nodes.stream().collect(Collectors.toMap(ValidatorPeer::getPeerConnection, identity())));
+        nodes.stream()
+            .collect(Collectors.toMap(DefaultValidatorPeer::getPeerConnection, identity())));
   }
 }
diff --git a/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/inttest/TestTransitions.java b/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/inttest/TestTransitions.java
new file mode 100644
index 00000000000..14d8a95a988
--- /dev/null
+++ b/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/inttest/TestTransitions.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft.inttest;
+
+import org.hyperledger.besu.config.BftFork;
+import org.hyperledger.besu.config.JsonUtil;
+import org.hyperledger.besu.config.QbftFork;
+import org.hyperledger.besu.config.TransitionsConfigOptions;
+
+import java.util.Collections;
+import java.util.List;
+
+public class TestTransitions extends TransitionsConfigOptions {
+
+  private final List<QbftFork> qbftForks;
+  private final List<BftFork> ibftForks;
+
+  public static TestTransitions createQbftTestTransitions(final List<QbftFork> qbftForks) {
+    return new TestTransitions(Collections.emptyList(), qbftForks);
+  }
+
+  public static TestTransitions createIbftTestTransitions(final List<BftFork> bftForks) {
+    return new TestTransitions(bftForks, Collections.emptyList());
+  }
+
+  public TestTransitions(final List<BftFork> ibftForks, final List<QbftFork> qbftForks) {
+    super(JsonUtil.createEmptyObjectNode());
+    this.ibftForks = ibftForks;
+    this.qbftForks = qbftForks;
+  }
+
+  @Override
+  public List<QbftFork> getQbftForks() {
+    return qbftForks;
+  }
+
+  @Override
+  public List<BftFork> getIbftForks() {
+    return ibftForks;
+  }
+}
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/network/MockPeerFactory.java b/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/network/MockPeerFactory.java
similarity index 92%
rename from consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/network/MockPeerFactory.java
rename to consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/network/MockPeerFactory.java
index dd5b4eaed18..1f8a614a055 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/network/MockPeerFactory.java
+++ b/consensus/common/src/test-support/java/org/hyperledger/besu/consensus/common/bft/network/MockPeerFactory.java
@@ -12,12 +12,12 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.ibft.network;
+package org.hyperledger.besu.consensus.common.bft.network;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo;
 
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/CombinedProtocolScheduleFactoryTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/CombinedProtocolScheduleFactoryTest.java
new file mode 100644
index 00000000000..29b197b9ece
--- /dev/null
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/CombinedProtocolScheduleFactoryTest.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.config.StubGenesisConfigOptions;
+import org.hyperledger.besu.consensus.common.bft.BftProtocolSchedule;
+import org.hyperledger.besu.ethereum.core.MilestoneStreamingProtocolSchedule;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.mainnet.DefaultProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpecAdapters;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+
+import java.math.BigInteger;
+import java.util.List;
+import java.util.NavigableSet;
+import java.util.Optional;
+import java.util.TreeSet;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class CombinedProtocolScheduleFactoryTest {
+
+  private final CombinedProtocolScheduleFactory combinedProtocolScheduleFactory =
+      new CombinedProtocolScheduleFactory();
+
+  @Test
+  public void createsCombinedProtocolScheduleWithMilestonesFromSingleProtocolSchedule() {
+    final StubGenesisConfigOptions genesisConfigOptions = new StubGenesisConfigOptions();
+    genesisConfigOptions.homesteadBlock(5L);
+    genesisConfigOptions.constantinopleBlock(10L);
+    genesisConfigOptions.chainId(BigInteger.TEN);
+    final BftProtocolSchedule protocolSchedule = createProtocolSchedule(genesisConfigOptions);
+
+    final NavigableSet<ForkSpec<ProtocolSchedule>> consensusSchedule =
+        new TreeSet<>(ForkSpec.COMPARATOR);
+    consensusSchedule.add(new ForkSpec<>(0, protocolSchedule));
+
+    final BftProtocolSchedule combinedProtocolSchedule =
+        combinedProtocolScheduleFactory.create(consensusSchedule, Optional.of(BigInteger.TEN));
+
+    assertThat(combinedProtocolSchedule.getByBlockNumber(0L).getName()).isEqualTo("Frontier");
+    assertThat(combinedProtocolSchedule.getByBlockNumber(0L))
+        .isSameAs(protocolSchedule.getByBlockNumber(0L));
+
+    assertThat(combinedProtocolSchedule.getByBlockNumber(5L).getName()).isEqualTo("Homestead");
+    assertThat(combinedProtocolSchedule.getByBlockNumber(5L))
+        .isSameAs(protocolSchedule.getByBlockNumber(5L));
+
+    assertThat(combinedProtocolSchedule.getByBlockNumber(10L).getName())
+        .isEqualTo("Constantinople");
+    assertThat(combinedProtocolSchedule.getByBlockNumber(10L))
+        .isSameAs(protocolSchedule.getByBlockNumber(10L));
+
+    assertThat(
+            new MilestoneStreamingProtocolSchedule(combinedProtocolSchedule)
+                .streamMilestoneBlocks()
+                .collect(Collectors.toList()))
+        .isEqualTo(List.of(0L, 5L, 10L));
+  }
+
+  @Test
+  public void createsCombinedProtocolScheduleWithMilestonesFromMultipleSchedules() {
+    final StubGenesisConfigOptions genesisConfigOptions = new StubGenesisConfigOptions();
+    genesisConfigOptions.homesteadBlock(5L);
+    genesisConfigOptions.constantinopleBlock(10L);
+    genesisConfigOptions.byzantiumBlock(105L);
+    genesisConfigOptions.berlinBlock(110L);
+    genesisConfigOptions.londonBlock(220L);
+    genesisConfigOptions.chainId(BigInteger.TEN);
+
+    final BftProtocolSchedule protocolSchedule1 = createProtocolSchedule(genesisConfigOptions);
+    final BftProtocolSchedule protocolSchedule2 = createProtocolSchedule(genesisConfigOptions);
+    final BftProtocolSchedule protocolSchedule3 = createProtocolSchedule(genesisConfigOptions);
+
+    final NavigableSet<ForkSpec<ProtocolSchedule>> consensusSchedule =
+        new TreeSet<>(ForkSpec.COMPARATOR);
+    consensusSchedule.add(new ForkSpec<>(0, protocolSchedule1));
+    consensusSchedule.add(new ForkSpec<>(100L, protocolSchedule2));
+    consensusSchedule.add(new ForkSpec<>(200L, protocolSchedule3));
+
+    final BftProtocolSchedule combinedProtocolSchedule =
+        combinedProtocolScheduleFactory.create(consensusSchedule, Optional.of(BigInteger.TEN));
+
+    // consensus schedule 1
+    assertThat(combinedProtocolSchedule.getByBlockNumber(0L).getName()).isEqualTo("Frontier");
+    assertThat(combinedProtocolSchedule.getByBlockNumber(0L))
+        .isSameAs(protocolSchedule1.getByBlockNumber(0L));
+
+    assertThat(combinedProtocolSchedule.getByBlockNumber(5L).getName()).isEqualTo("Homestead");
+    assertThat(combinedProtocolSchedule.getByBlockNumber(5L))
+        .isSameAs(protocolSchedule1.getByBlockNumber(5L));
+    assertThat(combinedProtocolSchedule.getByBlockNumber(10L).getName())
+        .isEqualTo("Constantinople");
+    assertThat(combinedProtocolSchedule.getByBlockNumber(10L))
+        .isSameAs(protocolSchedule1.getByBlockNumber(10L));
+
+    // consensus schedule 2 migration block
+    assertThat(combinedProtocolSchedule.getByBlockNumber(100L).getName())
+        .isEqualTo("Constantinople");
+    assertThat(combinedProtocolSchedule.getByBlockNumber(100L))
+        .isSameAs(protocolSchedule2.getByBlockNumber(10L));
+
+    // consensus schedule 2
+    assertThat(combinedProtocolSchedule.getByBlockNumber(105L).getName()).isEqualTo("Byzantium");
+    assertThat(combinedProtocolSchedule.getByBlockNumber(105L))
+        .isSameAs(protocolSchedule2.getByBlockNumber(105L));
+    assertThat(combinedProtocolSchedule.getByBlockNumber(110L).getName()).isEqualTo("Berlin");
+    assertThat(combinedProtocolSchedule.getByBlockNumber(110L))
+        .isSameAs(protocolSchedule2.getByBlockNumber(110L));
+
+    // consensus schedule 3 migration block
+    assertThat(combinedProtocolSchedule.getByBlockNumber(200L).getName()).isEqualTo("Berlin");
+    assertThat(combinedProtocolSchedule.getByBlockNumber(200L))
+        .isSameAs(protocolSchedule3.getByBlockNumber(110L));
+
+    // consensus schedule 3
+    assertThat(combinedProtocolSchedule.getByBlockNumber(220L).getName()).isEqualTo("London");
+    assertThat(combinedProtocolSchedule.getByBlockNumber(220L))
+        .isSameAs(protocolSchedule3.getByBlockNumber(220L));
+
+    assertThat(
+            new MilestoneStreamingProtocolSchedule(combinedProtocolSchedule)
+                .streamMilestoneBlocks()
+                .collect(Collectors.toList()))
+        .isEqualTo(List.of(0L, 5L, 10L, 100L, 105L, 110L, 200L, 220L));
+  }
+
+  private BftProtocolSchedule createProtocolSchedule(
+      final GenesisConfigOptions genesisConfigOptions) {
+    final ProtocolScheduleBuilder protocolScheduleBuilder =
+        new ProtocolScheduleBuilder(
+            genesisConfigOptions,
+            BigInteger.ONE,
+            ProtocolSpecAdapters.create(0, Function.identity()),
+            new PrivacyParameters(),
+            false,
+            EvmConfiguration.DEFAULT);
+
+    return new BftProtocolSchedule(
+        (DefaultProtocolSchedule) protocolScheduleBuilder.createProtocolSchedule());
+  }
+}
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/ForksScheduleTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/ForksScheduleTest.java
new file mode 100644
index 00000000000..bf6d32f4694
--- /dev/null
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/ForksScheduleTest.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright Hyperledger Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.config.BftConfigOptions;
+import org.hyperledger.besu.config.JsonBftConfigOptions;
+import org.hyperledger.besu.consensus.common.bft.MutableBftConfigOptions;
+import org.hyperledger.besu.datatypes.Address;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.junit.Test;
+
+public class ForksScheduleTest {
+
+  @Test
+  public void retrievesGenesisFork() {
+    final ForkSpec<BftConfigOptions> genesisForkSpec =
+        new ForkSpec<>(0, JsonBftConfigOptions.DEFAULT);
+    final ForkSpec<BftConfigOptions> forkSpec1 = createForkSpec(10, 10);
+
+    final ForksSchedule<BftConfigOptions> schedule =
+        new ForksSchedule<>(List.of(forkSpec1, genesisForkSpec));
+    assertThat(schedule.getFork(0)).isEqualTo(genesisForkSpec);
+    assertThat(schedule.getFork(1)).isEqualTo(genesisForkSpec);
+  }
+
+  @Test
+  public void retrievesLatestFork() {
+    final ForkSpec<BftConfigOptions> genesisForkSpec =
+        new ForkSpec<>(0, JsonBftConfigOptions.DEFAULT);
+    final ForkSpec<BftConfigOptions> forkSpec1 = createForkSpec(1, 10);
+    final ForkSpec<BftConfigOptions> forkSpec2 = createForkSpec(2, 20);
+    final Optional<Address> miningBeneficiary3 =
+        Optional.of(Address.fromHexString("0xdee0519f7c7cb0f9843fa1e93b99255c89507a9c"));
+    final ForkSpec<BftConfigOptions> forkSpec3 =
+        createForkSpecWithMiningBeneficiary(3, miningBeneficiary3);
+    final ForkSpec<BftConfigOptions> forkSpec4 =
+        createForkSpecWithMiningBeneficiary(4, Optional.empty());
+
+    final ForksSchedule<BftConfigOptions> schedule =
+        new ForksSchedule<>(List.of(genesisForkSpec, forkSpec1, forkSpec2, forkSpec3, forkSpec4));
+
+    assertThat(schedule.getFork(0)).isEqualTo(genesisForkSpec);
+    assertThat(schedule.getFork(1)).isEqualTo(forkSpec1);
+    assertThat(schedule.getFork(2)).isEqualTo(forkSpec2);
+    assertThat(schedule.getFork(3)).isEqualTo(forkSpec3);
+    assertThat(schedule.getFork(3).getValue().getMiningBeneficiary()).isEqualTo(miningBeneficiary3);
+    assertThat(schedule.getFork(4)).isEqualTo(forkSpec4);
+    assertThat(schedule.getFork(4).getValue().getMiningBeneficiary()).isEmpty();
+  }
+
+  private ForkSpec<BftConfigOptions> createForkSpecWithMiningBeneficiary(
+      final long block, final Optional<Address> beneficiary) {
+    final MutableBftConfigOptions bftConfigOptions =
+        new MutableBftConfigOptions(JsonBftConfigOptions.DEFAULT);
+    bftConfigOptions.setMiningBeneficiary(beneficiary);
+    return new ForkSpec<>(block, bftConfigOptions);
+  }
+
+  private ForkSpec<BftConfigOptions> createForkSpec(
+      final long block, final int blockPeriodSeconds) {
+    final MutableBftConfigOptions bftConfigOptions = createBftConfigOptions(blockPeriodSeconds);
+    return new ForkSpec<>(block, bftConfigOptions);
+  }
+
+  private MutableBftConfigOptions createBftConfigOptions(final int blockPeriodSeconds) {
+    final MutableBftConfigOptions bftConfigOptions =
+        new MutableBftConfigOptions(JsonBftConfigOptions.DEFAULT);
+    bftConfigOptions.setBlockPeriodSeconds(blockPeriodSeconds);
+    return bftConfigOptions;
+  }
+}
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/MigratingMiningCoordinatorTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/MigratingMiningCoordinatorTest.java
new file mode 100644
index 00000000000..31eabf22aaf
--- /dev/null
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/MigratingMiningCoordinatorTest.java
@@ -0,0 +1,250 @@
+/*
+ * Copyright Hyperledger Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common;
+
+import static java.util.Collections.emptyList;
+import static org.hyperledger.besu.ethereum.core.BlockHeader.GENESIS_BLOCK_NUMBER;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.common.bft.BftEventQueue;
+import org.hyperledger.besu.consensus.common.bft.BftExecutors;
+import org.hyperledger.besu.consensus.common.bft.BftProcessor;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.BftBlockCreatorFactory;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.BftMiningCoordinator;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftEventHandler;
+import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
+import org.hyperledger.besu.ethereum.blockcreation.NoopMiningCoordinator;
+import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.List;
+import java.util.function.Consumer;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class MigratingMiningCoordinatorTest {
+
+  @Mock private BftMiningCoordinator coordinator1;
+  @Mock private BftMiningCoordinator coordinator2;
+  @Mock private Blockchain blockchain;
+  @Mock private BlockHeader blockHeader;
+  @Mock private BlockBody blockBody;
+  private BlockAddedEvent blockEvent;
+  private ForksSchedule<MiningCoordinator> coordinatorSchedule;
+  private static final long MIGRATION_BLOCK_NUMBER = 5L;
+
+  @Before
+  public void setup() {
+    coordinatorSchedule = createCoordinatorSchedule(coordinator1, coordinator2);
+    final Block block = new Block(blockHeader, blockBody);
+    blockEvent = BlockAddedEvent.createForHeadAdvancement(block, emptyList(), emptyList());
+  }
+
+  private ForksSchedule<MiningCoordinator> createCoordinatorSchedule(
+      final MiningCoordinator genesisCoordinator, final MiningCoordinator migrateToCoordinator) {
+    final ForkSpec<MiningCoordinator> genesisFork =
+        new ForkSpec<>(GENESIS_BLOCK_NUMBER, genesisCoordinator);
+    final ForkSpec<MiningCoordinator> migrationFork =
+        new ForkSpec<>(MIGRATION_BLOCK_NUMBER, migrateToCoordinator);
+    return new ForksSchedule<>(List.of(genesisFork, migrationFork));
+  }
+
+  @Test
+  public void startShouldRegisterThisCoordinatorAsObserver() {
+    final MigratingMiningCoordinator coordinator =
+        new MigratingMiningCoordinator(coordinatorSchedule, blockchain);
+
+    coordinator.start();
+
+    verify(blockchain).observeBlockAdded(coordinator);
+  }
+
+  @Test
+  public void startShouldUnregisterDelegateCoordinatorAsObserver() {
+    final BftMiningCoordinator delegateCoordinator = createDelegateCoordinator();
+    when(blockchain.observeBlockAdded(delegateCoordinator)).thenReturn(1L);
+    final MigratingMiningCoordinator coordinator =
+        new MigratingMiningCoordinator(
+            createCoordinatorSchedule(delegateCoordinator, coordinator2), blockchain);
+
+    coordinator.start();
+
+    verify(blockchain).observeBlockAdded(coordinator);
+    verify(blockchain).observeBlockAdded(delegateCoordinator);
+    verify(blockchain).removeObserver(1L);
+  }
+
+  private BftMiningCoordinator createDelegateCoordinator() {
+    return new BftMiningCoordinator(
+        mock(BftExecutors.class),
+        mock(BftEventHandler.class),
+        mock(BftProcessor.class),
+        mock(BftBlockCreatorFactory.class),
+        blockchain,
+        mock(BftEventQueue.class));
+  }
+
+  @Test
+  public void stopShouldUnregisterThisCoordinatorAsObserver() {
+    final MigratingMiningCoordinator coordinator =
+        new MigratingMiningCoordinator(coordinatorSchedule, blockchain);
+    when(blockchain.observeBlockAdded(coordinator)).thenReturn(1L);
+
+    coordinator.start();
+    coordinator.stop();
+
+    verify(blockchain).removeObserver(1L);
+  }
+
+  @Test
+  public void onBlockAddedShouldNotDelegateWhenDelegateIsNoop() {
+    NoopMiningCoordinator mockNoopCoordinator = mock(NoopMiningCoordinator.class);
+    coordinatorSchedule = createCoordinatorSchedule(mockNoopCoordinator, coordinator2);
+    when(blockHeader.getNumber()).thenReturn(GENESIS_BLOCK_NUMBER);
+
+    new MigratingMiningCoordinator(coordinatorSchedule, blockchain).onBlockAdded(blockEvent);
+
+    verifyNoInteractions(mockNoopCoordinator);
+  }
+
+  @Test
+  public void delegatesToActiveMiningCoordinator() {
+    verifyDelegation(MiningCoordinator::start, GENESIS_BLOCK_NUMBER, coordinator1, coordinator2);
+    verifyDelegation(MiningCoordinator::start, MIGRATION_BLOCK_NUMBER, coordinator2, coordinator1);
+
+    verifyDelegation(MiningCoordinator::stop, GENESIS_BLOCK_NUMBER, coordinator1, coordinator2);
+    verifyDelegation(MiningCoordinator::stop, MIGRATION_BLOCK_NUMBER, coordinator2, coordinator1);
+
+    verifyDelegation(MiningCoordinator::enable, GENESIS_BLOCK_NUMBER, coordinator1, coordinator2);
+    verifyDelegation(MiningCoordinator::enable, MIGRATION_BLOCK_NUMBER, coordinator2, coordinator1);
+
+    verifyDelegation(MiningCoordinator::disable, GENESIS_BLOCK_NUMBER, coordinator1, coordinator2);
+    verifyDelegation(
+        MiningCoordinator::disable, MIGRATION_BLOCK_NUMBER, coordinator2, coordinator1);
+
+    verifyDelegation(MiningCoordinator::isMining, GENESIS_BLOCK_NUMBER, coordinator1, coordinator2);
+    verifyDelegation(
+        MiningCoordinator::isMining, MIGRATION_BLOCK_NUMBER, coordinator2, coordinator1);
+
+    verifyDelegation(
+        MiningCoordinator::getMinTransactionGasPrice,
+        GENESIS_BLOCK_NUMBER,
+        coordinator1,
+        coordinator2);
+    verifyDelegation(
+        MiningCoordinator::getMinTransactionGasPrice,
+        MIGRATION_BLOCK_NUMBER,
+        coordinator2,
+        coordinator1);
+
+    verifyDelegation(
+        c -> c.setExtraData(Bytes.EMPTY), GENESIS_BLOCK_NUMBER, coordinator1, coordinator2);
+    verifyDelegation(
+        c -> c.setExtraData(Bytes.EMPTY), MIGRATION_BLOCK_NUMBER, coordinator2, coordinator1);
+
+    verifyDelegation(
+        MiningCoordinator::getCoinbase, GENESIS_BLOCK_NUMBER, coordinator1, coordinator2);
+    verifyDelegation(
+        MiningCoordinator::getCoinbase, MIGRATION_BLOCK_NUMBER, coordinator2, coordinator1);
+
+    verifyDelegation(
+        c -> c.createBlock(blockHeader, emptyList(), emptyList()),
+        GENESIS_BLOCK_NUMBER,
+        coordinator1,
+        coordinator2);
+    verifyDelegation(
+        c -> c.createBlock(blockHeader, emptyList(), emptyList()),
+        MIGRATION_BLOCK_NUMBER,
+        coordinator2,
+        coordinator1);
+
+    verifyDelegation(
+        c -> c.changeTargetGasLimit(1L), GENESIS_BLOCK_NUMBER, coordinator1, coordinator2);
+    verifyDelegation(
+        c -> c.changeTargetGasLimit(1L), MIGRATION_BLOCK_NUMBER, coordinator2, coordinator1);
+
+    verifyDelegation(
+        c -> c.changeTargetGasLimit(1L), GENESIS_BLOCK_NUMBER, coordinator1, coordinator2);
+    verifyDelegation(
+        c -> c.changeTargetGasLimit(1L), MIGRATION_BLOCK_NUMBER, coordinator2, coordinator1);
+  }
+
+  private void verifyDelegation(
+      final Consumer<MiningCoordinator> methodUnderTest,
+      final long blockHeight,
+      final MiningCoordinator expectedActiveCoordinator,
+      final MiningCoordinator expectedInactiveCoordinator) {
+    when(blockchain.getChainHeadBlockNumber()).thenReturn(blockHeight);
+
+    methodUnderTest.accept(new MigratingMiningCoordinator(coordinatorSchedule, blockchain));
+
+    methodUnderTest.accept(verify(expectedActiveCoordinator));
+    verifyNoInteractions(expectedInactiveCoordinator);
+    reset(coordinator1, coordinator2);
+  }
+
+  @Test
+  public void verifyDelegationForAwaitStop() throws InterruptedException {
+    verifyDelegationForAwaitStop(GENESIS_BLOCK_NUMBER, coordinator1, coordinator2);
+    verifyDelegationForAwaitStop(MIGRATION_BLOCK_NUMBER, coordinator2, coordinator1);
+  }
+
+  private void verifyDelegationForAwaitStop(
+      final long blockHeight,
+      final MiningCoordinator expectedActiveCoordinator,
+      final MiningCoordinator expectedInactiveCoordinator)
+      throws InterruptedException {
+    when(blockchain.getChainHeadBlockNumber()).thenReturn(blockHeight);
+
+    new MigratingMiningCoordinator(coordinatorSchedule, blockchain).awaitStop();
+
+    verify(expectedActiveCoordinator).awaitStop();
+    verifyNoInteractions(expectedInactiveCoordinator);
+    reset(coordinator1, coordinator2);
+  }
+
+  @Test
+  public void verifyDelegationForOnBlockAdded() {
+    verifyDelegationForOnBlockAdded(GENESIS_BLOCK_NUMBER, coordinator1, coordinator2);
+    verifyDelegationForOnBlockAdded(MIGRATION_BLOCK_NUMBER, coordinator2, coordinator1);
+  }
+
+  private void verifyDelegationForOnBlockAdded(
+      final long blockHeight,
+      final BftMiningCoordinator expectedActiveCoordinator,
+      final BftMiningCoordinator expectedInactiveCoordinator) {
+    when(blockchain.getChainHeadBlockNumber()).thenReturn(blockHeight);
+    when(blockHeader.getNumber()).thenReturn(blockHeight);
+
+    new MigratingMiningCoordinator(coordinatorSchedule, blockchain).onBlockAdded(blockEvent);
+
+    verify(expectedActiveCoordinator).onBlockAdded(blockEvent);
+    verifyNoInteractions(expectedInactiveCoordinator);
+    reset(coordinator1, coordinator2);
+  }
+}
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/MigratingProtocolContextTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/MigratingProtocolContextTest.java
new file mode 100644
index 00000000000..21ba7638c40
--- /dev/null
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/MigratingProtocolContextTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.ethereum.ConsensusContext;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class MigratingProtocolContextTest {
+
+  @Test
+  public void returnsContextForSpecificChainHeight() {
+    final MutableBlockchain blockchain = Mockito.mock(MutableBlockchain.class);
+    final WorldStateArchive worldStateArchive = Mockito.mock(WorldStateArchive.class);
+
+    final ConsensusContext context1 = Mockito.mock(ConsensusContext.class);
+    when(context1.as(any())).thenReturn(context1);
+
+    final ConsensusContext context2 = Mockito.mock(ConsensusContext.class);
+    when(context2.as(any())).thenReturn(context2);
+
+    final ForksSchedule<ConsensusContext> contextSchedule =
+        new ForksSchedule<>(List.of(new ForkSpec<>(0L, context1), new ForkSpec<>(10L, context2)));
+    final MigratingProtocolContext migratingProtocolContext =
+        new MigratingProtocolContext(
+            blockchain, worldStateArchive, contextSchedule, Optional.empty());
+
+    assertThat(migratingProtocolContext.getConsensusContext(ConsensusContext.class))
+        .isSameAs(context1);
+
+    when(blockchain.getChainHeadBlockNumber()).thenReturn(2L);
+    assertThat(migratingProtocolContext.getConsensusContext(ConsensusContext.class))
+        .isSameAs(context1);
+
+    when(blockchain.getChainHeadBlockNumber()).thenReturn(10L);
+    assertThat(migratingProtocolContext.getConsensusContext(ConsensusContext.class))
+        .isSameAs(context2);
+  }
+}
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BaseBftProtocolScheduleBuilderTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BaseBftProtocolScheduleBuilderTest.java
new file mode 100644
index 00000000000..d704cddce85
--- /dev/null
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BaseBftProtocolScheduleBuilderTest.java
@@ -0,0 +1,264 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.BftConfigOptions;
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.config.JsonBftConfigOptions;
+import org.hyperledger.besu.config.TransitionsConfigOptions;
+import org.hyperledger.besu.consensus.common.ForkSpec;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.MilestoneStreamingProtocolSchedule;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
+import org.hyperledger.besu.ethereum.mainnet.DefaultProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Optional;
+
+import org.junit.Test;
+
+public class BaseBftProtocolScheduleBuilderTest {
+
+  private final GenesisConfigOptions genesisConfig = mock(GenesisConfigOptions.class);
+  private final BftExtraDataCodec bftExtraDataCodec = mock(BftExtraDataCodec.class);
+
+  @Test
+  public void ensureBlockRewardAndMiningBeneficiaryInProtocolSpecMatchConfig() {
+    final BigInteger arbitraryBlockReward = BigInteger.valueOf(5);
+    final Address miningBeneficiary = Address.fromHexString("0x1");
+    final BftConfigOptions configOptions =
+        createBftConfig(arbitraryBlockReward, Optional.of(miningBeneficiary));
+    when(genesisConfig.getTransitions()).thenReturn(TransitionsConfigOptions.DEFAULT);
+
+    when(genesisConfig.getBftConfigOptions()).thenReturn(configOptions);
+
+    final ProtocolSchedule schedule =
+        createProtocolSchedule(List.of(new ForkSpec<>(0, configOptions)));
+    final ProtocolSpec spec = schedule.getByBlockHeader(blockHeader(1));
+
+    assertThat(spec.getBlockReward()).isEqualTo(Wei.of(arbitraryBlockReward));
+    assertThat(spec.getMiningBeneficiaryCalculator().calculateBeneficiary(mock(BlockHeader.class)))
+        .isEqualTo(miningBeneficiary);
+  }
+
+  @Test
+  public void missingMiningBeneficiaryInConfigWillPayCoinbaseInHeader() {
+    final BigInteger arbitraryBlockReward = BigInteger.valueOf(3);
+    final BftConfigOptions configOptions = createBftConfig(arbitraryBlockReward);
+    when(genesisConfig.getBftConfigOptions()).thenReturn(configOptions);
+    when(genesisConfig.getTransitions()).thenReturn(TransitionsConfigOptions.DEFAULT);
+
+    final ProtocolSchedule schedule =
+        createProtocolSchedule(List.of(new ForkSpec<>(0, configOptions)));
+    final ProtocolSpec spec = schedule.getByBlockHeader(blockHeader(1));
+
+    final Address headerCoinbase = Address.fromHexString("0x123");
+    final BlockHeader header = mock(BlockHeader.class);
+    when(header.getCoinbase()).thenReturn(headerCoinbase);
+
+    assertThat(spec.getBlockReward()).isEqualTo(Wei.of(arbitraryBlockReward));
+    assertThat(spec.getMiningBeneficiaryCalculator().calculateBeneficiary(header))
+        .isEqualTo(headerCoinbase);
+  }
+
+  @Test
+  public void ensureForksAreRespected_beginWithNonEmptyMiningBeneficiary() {
+    ensureForksAreRespected(false);
+  }
+
+  @Test
+  public void ensureForksAreRespected_beginWithEmptyMiningBeneficiary() {
+    ensureForksAreRespected(true);
+  }
+
+  private void ensureForksAreRespected(final boolean initialBeneficiaryIsEmpty) {
+    final Address headerCoinbase = Address.fromHexString("0x123");
+    final Address beneficiary1 = Address.fromHexString("0x01");
+    final Address beneficiary2 = Address.fromHexString("0x02");
+    final Address beneficiary3 = Address.fromHexString("0x03");
+    final BlockHeader header = mock(BlockHeader.class);
+    when(header.getCoinbase()).thenReturn(headerCoinbase);
+
+    // Alternate empty and non-empty mining beneficiary config
+    final BftConfigOptions initialConfig =
+        createBftConfig(
+            BigInteger.valueOf(3),
+            Optional.of(beneficiary1).filter(__ -> !initialBeneficiaryIsEmpty));
+    final BftConfigOptions fork1 =
+        createBftConfig(
+            BigInteger.valueOf(2),
+            Optional.of(beneficiary2).filter(__ -> initialBeneficiaryIsEmpty));
+    final BftConfigOptions fork2 =
+        createBftConfig(
+            BigInteger.valueOf(1),
+            Optional.of(beneficiary3).filter(__ -> !initialBeneficiaryIsEmpty));
+
+    when(genesisConfig.getBftConfigOptions()).thenReturn(initialConfig);
+    when(genesisConfig.getTransitions()).thenReturn(TransitionsConfigOptions.DEFAULT);
+
+    final ProtocolSchedule schedule =
+        createProtocolSchedule(
+            List.of(
+                new ForkSpec<>(0, initialConfig),
+                new ForkSpec<>(2, fork1),
+                new ForkSpec<>(5, fork2)));
+
+    // Check initial config
+    for (int i = 0; i < 2; i++) {
+      final ProtocolSpec spec = schedule.getByBlockHeader(blockHeader(i));
+      final Address expectedBeneficiary = initialBeneficiaryIsEmpty ? headerCoinbase : beneficiary1;
+      assertThat(spec.getBlockReward()).isEqualTo(Wei.of(BigInteger.valueOf(3)));
+      assertThat(spec.getMiningBeneficiaryCalculator().calculateBeneficiary(header))
+          .isEqualTo(expectedBeneficiary);
+    }
+
+    // Check fork1
+    for (int i = 2; i < 5; i++) {
+      final ProtocolSpec spec = schedule.getByBlockHeader(blockHeader(i));
+      final Address expectedBeneficiary = initialBeneficiaryIsEmpty ? beneficiary2 : headerCoinbase;
+      assertThat(spec.getBlockReward()).isEqualTo(Wei.of(BigInteger.valueOf(2)));
+      assertThat(spec.getMiningBeneficiaryCalculator().calculateBeneficiary(header))
+          .isEqualTo(expectedBeneficiary);
+    }
+
+    // Check fork2
+    for (int i = 5; i < 8; i++) {
+      final ProtocolSpec spec = schedule.getByBlockHeader(blockHeader(i));
+      final Address expectedBeneficiary = initialBeneficiaryIsEmpty ? headerCoinbase : beneficiary3;
+      assertThat(spec.getBlockReward()).isEqualTo(Wei.of(BigInteger.valueOf(1)));
+      assertThat(spec.getMiningBeneficiaryCalculator().calculateBeneficiary(header))
+          .isEqualTo(expectedBeneficiary);
+    }
+  }
+
+  @Test
+  public void negativeBlockRewardThrowsException() {
+    final BigInteger arbitraryBlockReward = BigInteger.valueOf(-3);
+    final BftConfigOptions configOptions = createBftConfig(arbitraryBlockReward);
+    when(genesisConfig.getBftConfigOptions()).thenReturn(configOptions);
+    when(genesisConfig.getTransitions()).thenReturn(TransitionsConfigOptions.DEFAULT);
+
+    assertThatThrownBy(() -> createProtocolSchedule(List.of(new ForkSpec<>(0, configOptions))))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage("Bft Block reward in config cannot be negative");
+  }
+
+  @Test
+  public void zeroEpochLengthThrowsException() {
+    final BigInteger arbitraryBlockReward = BigInteger.valueOf(3);
+    final BftConfigOptions configOptions = createBftConfig(arbitraryBlockReward);
+    when(configOptions.getEpochLength()).thenReturn(0L);
+    when(genesisConfig.getBftConfigOptions()).thenReturn(configOptions);
+    when(genesisConfig.getTransitions()).thenReturn(TransitionsConfigOptions.DEFAULT);
+
+    assertThatThrownBy(() -> createProtocolSchedule(List.of(new ForkSpec<>(0, configOptions))))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage("Epoch length in config must be greater than zero");
+  }
+
+  @Test
+  public void negativeEpochLengthThrowsException() {
+    final BigInteger arbitraryBlockReward = BigInteger.valueOf(3);
+    final BftConfigOptions configOptions = createBftConfig(arbitraryBlockReward);
+    when(configOptions.getEpochLength()).thenReturn(-3000L);
+    when(genesisConfig.getBftConfigOptions()).thenReturn(configOptions);
+    when(genesisConfig.getTransitions()).thenReturn(TransitionsConfigOptions.DEFAULT);
+
+    assertThatThrownBy(() -> createProtocolSchedule(List.of(new ForkSpec<>(0, configOptions))))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage("Epoch length in config must be greater than zero");
+  }
+
+  @Test
+  public void blockRewardSpecifiedInTransitionCreatesNewMilestone() {
+    final BigInteger arbitraryBlockReward = BigInteger.valueOf(5);
+    final Address miningBeneficiary = Address.fromHexString("0x1");
+    final BftConfigOptions configOptions =
+        createBftConfig(arbitraryBlockReward, Optional.of(miningBeneficiary));
+    when(genesisConfig.getBftConfigOptions()).thenReturn(configOptions);
+    when(genesisConfig.isIbft2()).thenReturn(true);
+
+    final long transitionBlock = 5L;
+    final BigInteger forkBlockReward = arbitraryBlockReward.multiply(BigInteger.valueOf(2));
+    final MutableBftConfigOptions blockRewardTransition =
+        new MutableBftConfigOptions(JsonBftConfigOptions.DEFAULT);
+    blockRewardTransition.setBlockRewardWei(forkBlockReward);
+
+    final MilestoneStreamingProtocolSchedule schedule =
+        new MilestoneStreamingProtocolSchedule(
+            (DefaultProtocolSchedule)
+                createProtocolSchedule(
+                    List.of(
+                        new ForkSpec<>(0, configOptions),
+                        new ForkSpec<>(transitionBlock, blockRewardTransition))));
+
+    assertThat(schedule.streamMilestoneBlocks().count()).isEqualTo(2);
+    assertThat(schedule.getByBlockHeader(blockHeader(0)).getBlockReward())
+        .isEqualTo(Wei.of(arbitraryBlockReward));
+    assertThat(schedule.getByBlockHeader(blockHeader(transitionBlock)).getBlockReward())
+        .isEqualTo(Wei.of(forkBlockReward));
+  }
+
+  private ProtocolSchedule createProtocolSchedule(final List<ForkSpec<BftConfigOptions>> forks) {
+    final BaseBftProtocolScheduleBuilder bftProtocolSchedule =
+        new BaseBftProtocolScheduleBuilder() {
+          @Override
+          protected BlockHeaderValidator.Builder createBlockHeaderRuleset(
+              final BftConfigOptions config, final FeeMarket feeMarket) {
+            return new BlockHeaderValidator.Builder();
+          }
+        };
+    return bftProtocolSchedule.createProtocolSchedule(
+        genesisConfig,
+        new ForksSchedule<>(forks),
+        PrivacyParameters.DEFAULT,
+        false,
+        bftExtraDataCodec,
+        EvmConfiguration.DEFAULT);
+  }
+
+  private BftConfigOptions createBftConfig(final BigInteger blockReward) {
+    return createBftConfig(blockReward, Optional.empty());
+  }
+
+  private BftConfigOptions createBftConfig(
+      final BigInteger blockReward, final Optional<Address> miningBeneficiary) {
+    final BftConfigOptions bftConfig = mock(JsonBftConfigOptions.class);
+    when(bftConfig.getMiningBeneficiary()).thenReturn(miningBeneficiary);
+    when(bftConfig.getBlockRewardWei()).thenReturn(blockReward);
+    when(bftConfig.getEpochLength()).thenReturn(3000L);
+
+    return bftConfig;
+  }
+
+  private BlockHeader blockHeader(final long number) {
+    return new BlockHeaderTestFixture().number(number).buildHeader();
+  }
+}
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BaseForksSchedulesFactoryTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BaseForksSchedulesFactoryTest.java
new file mode 100644
index 00000000000..5102276f8e8
--- /dev/null
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BaseForksSchedulesFactoryTest.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+
+import org.hyperledger.besu.config.BftConfigOptions;
+import org.hyperledger.besu.config.BftFork;
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.config.JsonUtil;
+import org.hyperledger.besu.consensus.common.ForkSpec;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.datatypes.Address;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Consumer;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.junit.Test;
+
+public abstract class BaseForksSchedulesFactoryTest<
+    C extends BftConfigOptions, M extends MutableBftConfigOptions> {
+
+  @Test
+  public void createsScheduleForJustGenesisConfig() {
+    final C configOptions = createBftOptions();
+    final ForkSpec<C> expectedForkSpec = new ForkSpec<>(0, createBftOptions());
+    final GenesisConfigOptions genesisConfigOptions = createGenesisConfig(configOptions);
+
+    final ForksSchedule<C> forksSchedule = createForkSchedule(genesisConfigOptions);
+    assertThat(forksSchedule.getFork(0)).usingRecursiveComparison().isEqualTo(expectedForkSpec);
+    assertThat(forksSchedule.getFork(1)).usingRecursiveComparison().isEqualTo(expectedForkSpec);
+    assertThat(forksSchedule.getFork(2)).usingRecursiveComparison().isEqualTo(expectedForkSpec);
+  }
+
+  @Test
+  public void createsScheduleThatChangesMiningBeneficiary_beneficiaryInitiallyEmpty() {
+    final Address beneficiaryAddress =
+        Address.fromHexString("0x1111111111111111111111111111111111111111");
+    final C qbftConfigOptions = createBftOptions();
+
+    final ObjectNode forkWithBeneficiary =
+        JsonUtil.objectNodeFromMap(
+            Map.of(
+                BftFork.FORK_BLOCK_KEY,
+                1,
+                BftFork.MINING_BENEFICIARY_KEY,
+                beneficiaryAddress.toHexString()));
+    final ObjectNode forkWithNoBeneficiary =
+        JsonUtil.objectNodeFromMap(
+            Map.of(BftFork.FORK_BLOCK_KEY, 2, BftFork.MINING_BENEFICIARY_KEY, ""));
+
+    final GenesisConfigOptions genesisConfigOptions =
+        createGenesisConfig(qbftConfigOptions, forkWithBeneficiary, forkWithNoBeneficiary);
+    final ForksSchedule<C> forksSchedule = createForkSchedule(genesisConfigOptions);
+
+    assertThat(forksSchedule.getFork(0).getValue().getMiningBeneficiary()).isEmpty();
+    assertThat(forksSchedule.getFork(1).getValue().getMiningBeneficiary())
+        .contains(beneficiaryAddress);
+    assertThat(forksSchedule.getFork(2).getValue().getMiningBeneficiary()).isEmpty();
+  }
+
+  @Test
+  public void createsScheduleThatChangesMiningBeneficiary_beneficiaryInitiallyNonEmpty() {
+    final Address beneficiaryAddress =
+        Address.fromHexString("0x1111111111111111111111111111111111111111");
+    final Address beneficiaryAddress2 = Address.fromHexString("0x02");
+    final C qbftConfigOptions =
+        createBftOptions(o -> o.setMiningBeneficiary(Optional.of(beneficiaryAddress)));
+
+    final ObjectNode forkWithBeneficiary =
+        JsonUtil.objectNodeFromMap(
+            Map.of(BftFork.FORK_BLOCK_KEY, 1, BftFork.MINING_BENEFICIARY_KEY, ""));
+    final ObjectNode forkWithNoBeneficiary =
+        JsonUtil.objectNodeFromMap(
+            Map.of(
+                BftFork.FORK_BLOCK_KEY,
+                2,
+                BftFork.MINING_BENEFICIARY_KEY,
+                beneficiaryAddress2.toUnprefixedHexString()));
+
+    final GenesisConfigOptions genesisConfigOptions =
+        createGenesisConfig(qbftConfigOptions, forkWithBeneficiary, forkWithNoBeneficiary);
+    final ForksSchedule<C> forksSchedule = createForkSchedule(genesisConfigOptions);
+
+    assertThat(forksSchedule.getFork(0).getValue().getMiningBeneficiary())
+        .contains(beneficiaryAddress);
+    assertThat(forksSchedule.getFork(1).getValue().getMiningBeneficiary()).isEmpty();
+    assertThat(forksSchedule.getFork(2).getValue().getMiningBeneficiary())
+        .contains(beneficiaryAddress2);
+  }
+
+  @Test
+  public void
+      createsScheduleThatChangesMiningBeneficiary_shouldNotModifyBeneficiaryUnlessExplicitlyConfigured() {
+    final Address initialBeneficiaryAddress =
+        Address.fromHexString("0x1111111111111111111111111111111111111111");
+    final Address beneficiaryAddress2 = Address.fromHexString("0x02");
+    final C qbftConfigOptions =
+        createBftOptions(o -> o.setMiningBeneficiary(Optional.of(initialBeneficiaryAddress)));
+
+    ObjectNode[] forks = {
+      // No change to beneficiary
+      JsonUtil.objectNodeFromMap(
+          Map.of(BftFork.FORK_BLOCK_KEY, 1, BftFork.BLOCK_PERIOD_SECONDS_KEY, 2)),
+      // Clear beneficiary
+      JsonUtil.objectNodeFromMap(
+          Map.of(BftFork.FORK_BLOCK_KEY, 3, BftFork.MINING_BENEFICIARY_KEY, "")),
+      // No change to beneficiary
+      JsonUtil.objectNodeFromMap(
+          Map.of(BftFork.FORK_BLOCK_KEY, 5, BftFork.BLOCK_PERIOD_SECONDS_KEY, 4)),
+      // Set beneficiary
+      JsonUtil.objectNodeFromMap(
+          Map.of(
+              BftFork.FORK_BLOCK_KEY,
+              7,
+              BftFork.MINING_BENEFICIARY_KEY,
+              beneficiaryAddress2.toUnprefixedHexString()))
+    };
+
+    final GenesisConfigOptions genesisConfigOptions = createGenesisConfig(qbftConfigOptions, forks);
+    final ForksSchedule<C> forksSchedule = createForkSchedule(genesisConfigOptions);
+
+    assertThat(forksSchedule.getFork(0).getValue().getMiningBeneficiary())
+        .contains(initialBeneficiaryAddress);
+    assertThat(forksSchedule.getFork(1).getValue().getMiningBeneficiary())
+        .contains(initialBeneficiaryAddress);
+    assertThat(forksSchedule.getFork(2).getValue().getMiningBeneficiary())
+        .contains(initialBeneficiaryAddress);
+    assertThat(forksSchedule.getFork(3).getValue().getMiningBeneficiary()).isEmpty();
+    assertThat(forksSchedule.getFork(4).getValue().getMiningBeneficiary()).isEmpty();
+    assertThat(forksSchedule.getFork(5).getValue().getMiningBeneficiary()).isEmpty();
+    assertThat(forksSchedule.getFork(6).getValue().getMiningBeneficiary()).isEmpty();
+    assertThat(forksSchedule.getFork(7).getValue().getMiningBeneficiary())
+        .contains(beneficiaryAddress2);
+    assertThat(forksSchedule.getFork(8).getValue().getMiningBeneficiary())
+        .contains(beneficiaryAddress2);
+  }
+
+  @Test
+  public void createsScheduleWithInvalidMiningBeneficiary_shouldThrow() {
+    final C qbftConfigOptions = createBftOptions();
+
+    final ObjectNode invalidFork =
+        JsonUtil.objectNodeFromMap(
+            Map.of(BftFork.FORK_BLOCK_KEY, 1, BftFork.MINING_BENEFICIARY_KEY, "bla"));
+
+    final GenesisConfigOptions genesisConfigOptions =
+        createGenesisConfig(qbftConfigOptions, invalidFork);
+
+    assertThatThrownBy(() -> createForkSchedule(genesisConfigOptions))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining(
+            "Mining beneficiary in transition config is not a valid ethereum address");
+  }
+
+  protected abstract C createBftOptions(final Consumer<M> optionModifier);
+
+  protected C createBftOptions() {
+    return createBftOptions(__ -> {});
+  }
+
+  protected abstract GenesisConfigOptions createGenesisConfig(
+      final C configOptions, final ObjectNode... forks);
+
+  protected abstract ForksSchedule<C> createForkSchedule(
+      final GenesisConfigOptions genesisConfigOptions);
+}
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BftExtraDataFixture.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BftExtraDataFixture.java
new file mode 100644
index 00000000000..31bb7f17f70
--- /dev/null
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BftExtraDataFixture.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Util;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class BftExtraDataFixture {
+
+  public static BftExtraData createExtraData(
+      final BlockHeader header, final BftExtraDataCodec bftExtraDataCodec) {
+    final NodeKey proposerNodeKey = NodeKeyUtils.generate();
+    final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
+    final List<Address> validators = singletonList(proposerAddress);
+
+    return createExtraData(
+        header,
+        Bytes.wrap(new byte[BftExtraDataCodec.EXTRA_VANITY_LENGTH]),
+        Optional.of(Vote.authVote(Address.fromHexString("1"))),
+        validators,
+        singletonList(proposerNodeKey),
+        0x2A,
+        bftExtraDataCodec);
+  }
+
+  public static BftExtraData createExtraData(
+      final BlockHeader header,
+      final Bytes vanityData,
+      final Optional<Vote> vote,
+      final List<Address> validators,
+      final List<NodeKey> committerNodeKeys,
+      final BftExtraDataCodec bftExtraDataCodec) {
+
+    return createExtraData(
+        header, vanityData, vote, validators, committerNodeKeys, 0, bftExtraDataCodec);
+  }
+
+  public static BftExtraData createExtraData(
+      final BlockHeader header,
+      final Bytes vanityData,
+      final Optional<Vote> vote,
+      final List<Address> validators,
+      final List<NodeKey> committerNodeKeys,
+      final int roundNumber,
+      final BftExtraDataCodec bftExtraDataCodec) {
+
+    return createExtraData(
+        header,
+        vanityData,
+        vote,
+        validators,
+        committerNodeKeys,
+        roundNumber,
+        false,
+        bftExtraDataCodec);
+  }
+
+  public static BftExtraData createExtraData(
+      final BlockHeader header,
+      final Bytes vanityData,
+      final Optional<Vote> vote,
+      final List<Address> validators,
+      final List<NodeKey> committerNodeKeys,
+      final int baseRoundNumber,
+      final boolean useDifferentRoundNumbersForCommittedSeals,
+      final BftExtraDataCodec bftExtraDataCodec) {
+
+    final BftExtraData bftExtraDataNoCommittedSeals =
+        new BftExtraData(vanityData, emptyList(), vote, baseRoundNumber, validators);
+
+    // if useDifferentRoundNumbersForCommittedSeals is true then each committed seal will be
+    // calculated for an extraData field with a different round number
+    List<SECPSignature> commitSeals =
+        IntStream.range(0, committerNodeKeys.size())
+            .mapToObj(
+                i -> {
+                  final int round =
+                      useDifferentRoundNumbersForCommittedSeals
+                          ? bftExtraDataNoCommittedSeals.getRound() + i
+                          : bftExtraDataNoCommittedSeals.getRound();
+
+                  BftExtraData extraDataForCommittedSealCalculation =
+                      new BftExtraData(
+                          bftExtraDataNoCommittedSeals.getVanityData(),
+                          emptyList(),
+                          bftExtraDataNoCommittedSeals.getVote(),
+                          round,
+                          bftExtraDataNoCommittedSeals.getValidators());
+
+                  final Hash headerHashForCommitters =
+                      new BftBlockHashing(bftExtraDataCodec)
+                          .calculateDataHashForCommittedSeal(
+                              header, extraDataForCommittedSealCalculation);
+
+                  return committerNodeKeys.get(i).sign(headerHashForCommitters);
+                })
+            .collect(Collectors.toList());
+
+    return new BftExtraData(
+        bftExtraDataNoCommittedSeals.getVanityData(),
+        commitSeals,
+        bftExtraDataNoCommittedSeals.getVote(),
+        bftExtraDataNoCommittedSeals.getRound(),
+        bftExtraDataNoCommittedSeals.getValidators());
+  }
+}
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BftForksScheduleFactoryTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BftForksScheduleFactoryTest.java
new file mode 100644
index 00000000000..dbfc16da29e
--- /dev/null
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BftForksScheduleFactoryTest.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright Hyperledger Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.BftConfigOptions;
+import org.hyperledger.besu.config.BftFork;
+import org.hyperledger.besu.config.JsonBftConfigOptions;
+import org.hyperledger.besu.config.JsonUtil;
+import org.hyperledger.besu.consensus.common.ForkSpec;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.bft.BftForksScheduleFactory.BftSpecCreator;
+
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class BftForksScheduleFactoryTest {
+
+  @Test
+  @SuppressWarnings("unchecked")
+  public void throwsErrorIfHasForkForGenesisBlock() {
+    final BftConfigOptions genesisConfigOptions = JsonBftConfigOptions.DEFAULT;
+    final BftFork fork = createFork(0, 10);
+    final BftSpecCreator<BftConfigOptions, BftFork> specCreator =
+        Mockito.mock(BftSpecCreator.class);
+
+    assertThatThrownBy(
+            () -> BftForksScheduleFactory.create(genesisConfigOptions, List.of(fork), specCreator))
+        .hasMessage("Transition cannot be created for genesis block");
+  }
+
+  @Test
+  @SuppressWarnings("unchecked")
+  public void throwsErrorIfHasForksWithDuplicateBlock() {
+    final BftConfigOptions genesisConfigOptions = JsonBftConfigOptions.DEFAULT;
+    final BftFork fork1 = createFork(1, 10);
+    final BftFork fork2 = createFork(1, 20);
+    final BftFork fork3 = createFork(2, 30);
+    final BftSpecCreator<BftConfigOptions, BftFork> specCreator =
+        Mockito.mock(BftSpecCreator.class);
+
+    assertThatThrownBy(
+            () ->
+                BftForksScheduleFactory.create(
+                    genesisConfigOptions, List.of(fork1, fork2, fork3), specCreator))
+        .hasMessage("Duplicate transitions cannot be created for the same block");
+  }
+
+  @SuppressWarnings("unchecked")
+  @Test
+  public void createsScheduleUsingSpecCreator() {
+    final BftConfigOptions genesisConfigOptions = JsonBftConfigOptions.DEFAULT;
+    final ForkSpec<BftConfigOptions> genesisForkSpec = new ForkSpec<>(0, genesisConfigOptions);
+    final BftFork fork1 = createFork(1, 10);
+    final BftFork fork2 = createFork(2, 20);
+    final BftSpecCreator<BftConfigOptions, BftFork> specCreator =
+        Mockito.mock(BftSpecCreator.class);
+
+    final BftConfigOptions configOptions1 = createBftConfigOptions(10);
+    final BftConfigOptions configOptions2 = createBftConfigOptions(20);
+    when(specCreator.create(genesisForkSpec, fork1)).thenReturn(configOptions1);
+    when(specCreator.create(new ForkSpec<>(1, configOptions1), fork2)).thenReturn(configOptions2);
+
+    final ForksSchedule<BftConfigOptions> schedule =
+        BftForksScheduleFactory.create(genesisConfigOptions, List.of(fork1, fork2), specCreator);
+    assertThat(schedule.getFork(0)).isEqualTo(genesisForkSpec);
+    assertThat(schedule.getFork(1)).isEqualTo(new ForkSpec<>(1, configOptions1));
+    assertThat(schedule.getFork(2)).isEqualTo(new ForkSpec<>(2, configOptions2));
+  }
+
+  private MutableBftConfigOptions createBftConfigOptions(final int blockPeriodSeconds) {
+    final MutableBftConfigOptions bftConfigOptions =
+        new MutableBftConfigOptions(JsonBftConfigOptions.DEFAULT);
+    bftConfigOptions.setBlockPeriodSeconds(blockPeriodSeconds);
+    return bftConfigOptions;
+  }
+
+  private BftFork createFork(final long block, final long blockPeriodSeconds) {
+    return new BftFork(
+        JsonUtil.objectNodeFromMap(
+            Map.of(
+                BftFork.FORK_BLOCK_KEY, block,
+                BftFork.BLOCK_PERIOD_SECONDS_KEY, blockPeriodSeconds)));
+  }
+}
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BftHelpersTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BftHelpersTest.java
new file mode 100644
index 00000000000..6daadc0fd41
--- /dev/null
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BftHelpersTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+public class BftHelpersTest {
+
+  @Test
+  public void calculateRequiredValidatorQuorum1Validator() {
+    Assertions.assertThat(BftHelpers.calculateRequiredValidatorQuorum(1)).isEqualTo(1);
+  }
+
+  @Test
+  public void calculateRequiredValidatorQuorum2Validator() {
+    Assertions.assertThat(BftHelpers.calculateRequiredValidatorQuorum(2)).isEqualTo(2);
+  }
+
+  @Test
+  public void calculateRequiredValidatorQuorum3Validator() {
+    Assertions.assertThat(BftHelpers.calculateRequiredValidatorQuorum(3)).isEqualTo(2);
+  }
+
+  @Test
+  public void calculateRequiredValidatorQuorum4Validator() {
+    Assertions.assertThat(BftHelpers.calculateRequiredValidatorQuorum(4)).isEqualTo(3);
+  }
+
+  @Test
+  public void calculateRequiredValidatorQuorum5Validator() {
+    Assertions.assertThat(BftHelpers.calculateRequiredValidatorQuorum(5)).isEqualTo(4);
+  }
+
+  @Test
+  public void calculateRequiredValidatorQuorum7Validator() {
+    Assertions.assertThat(BftHelpers.calculateRequiredValidatorQuorum(7)).isEqualTo(5);
+  }
+
+  @Test
+  public void calculateRequiredValidatorQuorum10Validator() {
+    Assertions.assertThat(BftHelpers.calculateRequiredValidatorQuorum(10)).isEqualTo(7);
+  }
+
+  @Test
+  public void calculateRequiredValidatorQuorum15Validator() {
+    Assertions.assertThat(BftHelpers.calculateRequiredValidatorQuorum(15)).isEqualTo(10);
+  }
+
+  @Test
+  public void calculateRequiredValidatorQuorum20Validator() {
+    Assertions.assertThat(BftHelpers.calculateRequiredValidatorQuorum(20)).isEqualTo(14);
+  }
+}
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BlockTimerTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BlockTimerTest.java
index 05dedc82952..ec0783f6a3e 100644
--- a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BlockTimerTest.java
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/BlockTimerTest.java
@@ -24,6 +24,10 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.config.BftConfigOptions;
+import org.hyperledger.besu.config.JsonBftConfigOptions;
+import org.hyperledger.besu.consensus.common.ForkSpec;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
 import org.hyperledger.besu.consensus.common.bft.events.BftEvent;
 import org.hyperledger.besu.consensus.common.bft.events.BlockTimerExpiry;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
@@ -46,17 +50,20 @@ public class BlockTimerTest {
   private BftExecutors bftExecutors;
   private BftEventQueue mockQueue;
   private Clock mockClock;
+  private ForksSchedule<BftConfigOptions> mockForksSchedule;
 
   @Before
+  @SuppressWarnings("unchecked")
   public void initialise() {
     bftExecutors = mock(BftExecutors.class);
     mockQueue = mock(BftEventQueue.class);
     mockClock = mock(Clock.class);
+    mockForksSchedule = mock(ForksSchedule.class);
   }
 
   @Test
   public void cancelTimerCancelsWhenNoTimer() {
-    final BlockTimer timer = new BlockTimer(mockQueue, 15, bftExecutors, mockClock);
+    final BlockTimer timer = new BlockTimer(mockQueue, mockForksSchedule, bftExecutors, mockClock);
     // Starts with nothing running
     assertThat(timer.isRunning()).isFalse();
     // cancel shouldn't die if there's nothing running
@@ -67,13 +74,15 @@ public void cancelTimerCancelsWhenNoTimer() {
 
   @Test
   public void startTimerSchedulesCorrectlyWhenExpiryIsInTheFuture() {
-    final long MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS = 15;
+    final int MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS = 15;
     final long NOW_MILLIS = 505_000L;
     final long BLOCK_TIME_STAMP = 500L;
     final long EXPECTED_DELAY = 10_000L;
 
-    final BlockTimer timer =
-        new BlockTimer(mockQueue, MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS, bftExecutors, mockClock);
+    when(mockForksSchedule.getFork(anyLong()))
+        .thenReturn(new ForkSpec<>(0, createBftFork(MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS)));
+
+    final BlockTimer timer = new BlockTimer(mockQueue, mockForksSchedule, bftExecutors, mockClock);
 
     when(mockClock.millis()).thenReturn(NOW_MILLIS);
 
@@ -94,11 +103,13 @@ public void startTimerSchedulesCorrectlyWhenExpiryIsInTheFuture() {
 
   @Test
   public void aBlockTimerExpiryEventIsAddedToTheQueueOnExpiry() throws InterruptedException {
-    final long MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS = 1;
+    final int MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS = 1;
     final long NOW_MILLIS = 300_500L;
     final long BLOCK_TIME_STAMP = 300;
     final long EXPECTED_DELAY = 500;
 
+    when(mockForksSchedule.getFork(anyLong()))
+        .thenReturn(new ForkSpec<>(0, createBftFork(MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS)));
     when(mockClock.millis()).thenReturn(NOW_MILLIS);
 
     final BlockHeader header =
@@ -112,8 +123,7 @@ public void aBlockTimerExpiryEventIsAddedToTheQueueOnExpiry() throws Interrupted
         .thenReturn(mockedFuture);
 
     final BftEventQueue eventQueue = new BftEventQueue(1000);
-    final BlockTimer timer =
-        new BlockTimer(eventQueue, MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS, bftExecutors, mockClock);
+    final BlockTimer timer = new BlockTimer(eventQueue, mockForksSchedule, bftExecutors, mockClock);
     timer.startTimer(round, header);
 
     // Verify that the event will not be added to the queue immediately
@@ -132,17 +142,20 @@ public void aBlockTimerExpiryEventIsAddedToTheQueueOnExpiry() throws Interrupted
     final BftEvent queuedEvent = eventQueue.poll(0, TimeUnit.SECONDS);
     assertThat(queuedEvent).isInstanceOf(BlockTimerExpiry.class);
     assertThat(((BlockTimerExpiry) queuedEvent).getRoundIndentifier())
-        .isEqualToComparingFieldByField(round);
+        .usingRecursiveComparison()
+        .isEqualTo(round);
   }
 
   @Test
   public void eventIsImmediatelyAddedToTheQueueIfAbsoluteExpiryIsEqualToNow() {
-    final long MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS = 15;
+    final int MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS = 15;
     final long NOW_MILLIS = 515_000L;
     final long BLOCK_TIME_STAMP = 500;
 
-    final BlockTimer timer =
-        new BlockTimer(mockQueue, MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS, bftExecutors, mockClock);
+    when(mockForksSchedule.getFork(anyLong()))
+        .thenReturn(new ForkSpec<>(0, createBftFork(MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS)));
+
+    final BlockTimer timer = new BlockTimer(mockQueue, mockForksSchedule, bftExecutors, mockClock);
 
     when(mockClock.millis()).thenReturn(NOW_MILLIS);
 
@@ -159,17 +172,20 @@ public void eventIsImmediatelyAddedToTheQueueIfAbsoluteExpiryIsEqualToNow() {
 
     assertThat(bftEventCaptor.getValue() instanceof BlockTimerExpiry).isTrue();
     assertThat(((BlockTimerExpiry) bftEventCaptor.getValue()).getRoundIndentifier())
-        .isEqualToComparingFieldByField(round);
+        .usingRecursiveComparison()
+        .isEqualTo(round);
   }
 
   @Test
   public void eventIsImmediatelyAddedToTheQueueIfAbsoluteExpiryIsInThePast() {
-    final long MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS = 15;
+    final int MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS = 15;
     final long NOW_MILLIS = 520_000L;
     final long BLOCK_TIME_STAMP = 500L;
 
-    final BlockTimer timer =
-        new BlockTimer(mockQueue, MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS, bftExecutors, mockClock);
+    when(mockForksSchedule.getFork(anyLong()))
+        .thenReturn(new ForkSpec<>(0, createBftFork(MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS)));
+
+    final BlockTimer timer = new BlockTimer(mockQueue, mockForksSchedule, bftExecutors, mockClock);
 
     when(mockClock.millis()).thenReturn(NOW_MILLIS);
 
@@ -186,17 +202,20 @@ public void eventIsImmediatelyAddedToTheQueueIfAbsoluteExpiryIsInThePast() {
 
     assertThat(bftEventCaptor.getValue() instanceof BlockTimerExpiry).isTrue();
     assertThat(((BlockTimerExpiry) bftEventCaptor.getValue()).getRoundIndentifier())
-        .isEqualToComparingFieldByField(round);
+        .usingRecursiveComparison()
+        .isEqualTo(round);
   }
 
   @Test
   public void startTimerCancelsExistingTimer() {
-    final long MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS = 15;
+    final int MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS = 15;
     final long NOW_MILLIS = 500_000L;
     final long BLOCK_TIME_STAMP = 500L;
 
-    final BlockTimer timer =
-        new BlockTimer(mockQueue, MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS, bftExecutors, mockClock);
+    when(mockForksSchedule.getFork(anyLong()))
+        .thenReturn(new ForkSpec<>(0, createBftFork(MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS)));
+
+    final BlockTimer timer = new BlockTimer(mockQueue, mockForksSchedule, bftExecutors, mockClock);
 
     when(mockClock.millis()).thenReturn(NOW_MILLIS);
 
@@ -217,12 +236,14 @@ public void startTimerCancelsExistingTimer() {
 
   @Test
   public void runningFollowsTheStateOfTheTimer() {
-    final long MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS = 15;
+    final int MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS = 15;
     final long NOW_MILLIS = 500_000L;
     final long BLOCK_TIME_STAMP = 500L;
 
-    final BlockTimer timer =
-        new BlockTimer(mockQueue, MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS, bftExecutors, mockClock);
+    when(mockForksSchedule.getFork(anyLong()))
+        .thenReturn(new ForkSpec<>(0, createBftFork(MINIMAL_TIME_BETWEEN_BLOCKS_SECONDS)));
+
+    final BlockTimer timer = new BlockTimer(mockQueue, mockForksSchedule, bftExecutors, mockClock);
 
     when(mockClock.millis()).thenReturn(NOW_MILLIS);
 
@@ -241,4 +262,11 @@ public void runningFollowsTheStateOfTheTimer() {
     when(mockedFuture.isDone()).thenReturn(true);
     assertThat(timer.isRunning()).isFalse();
   }
+
+  private BftConfigOptions createBftFork(final int blockPeriodSeconds) {
+    final MutableBftConfigOptions bftConfigOptions =
+        new MutableBftConfigOptions(JsonBftConfigOptions.DEFAULT);
+    bftConfigOptions.setBlockPeriodSeconds(blockPeriodSeconds);
+    return bftConfigOptions;
+  }
 }
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/EthSynchronizerUpdaterTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/EthSynchronizerUpdaterTest.java
index 6f1d711eae1..7d01ebe059e 100644
--- a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/EthSynchronizerUpdaterTest.java
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/EthSynchronizerUpdaterTest.java
@@ -19,7 +19,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.ethereum.eth.manager.ChainState;
@@ -42,18 +42,18 @@ public class EthSynchronizerUpdaterTest {
 
   @Test
   public void ethPeerIsMissingResultInNoUpdate() {
-    when(ethPeers.peer(any())).thenReturn(null);
+    when(ethPeers.peer(any(PeerConnection.class))).thenReturn(null);
 
     final EthSynchronizerUpdater updater = new EthSynchronizerUpdater(ethPeers);
 
     updater.updatePeerChainState(1, mock(PeerConnection.class));
 
-    verifyZeroInteractions(ethPeer);
+    verifyNoInteractions(ethPeer);
   }
 
   @Test
   public void chainStateUpdateIsAttemptedIfEthPeerExists() {
-    when(ethPeers.peer(any())).thenReturn(ethPeer);
+    when(ethPeers.peer(any(PeerConnection.class))).thenReturn(ethPeer);
     when(ethPeer.chainState()).thenReturn(chainState);
 
     final EthSynchronizerUpdater updater = new EthSynchronizerUpdater(ethPeers);
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/UniqueMessageMulticasterTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/UniqueMessageMulticasterTest.java
similarity index 88%
rename from consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/UniqueMessageMulticasterTest.java
rename to consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/UniqueMessageMulticasterTest.java
index 56c00fc3a35..70c18c52303 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/UniqueMessageMulticasterTest.java
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/UniqueMessageMulticasterTest.java
@@ -12,19 +12,18 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.ibft;
+package org.hyperledger.besu.consensus.common.bft;
 
 import static java.util.Collections.emptyList;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.consensus.common.bft.MessageTracker;
-import org.hyperledger.besu.consensus.ibft.network.ValidatorMulticaster;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.consensus.common.bft.network.ValidatorMulticaster;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage;
 
@@ -55,7 +54,7 @@ public void previouslySentMessageIsNotSentAgain() {
     when(messageTracker.hasSeenMessage(messageSent)).thenReturn(true);
     uniqueMessageMulticaster.send(messageSent);
     uniqueMessageMulticaster.send(messageSent, emptyList());
-    verifyZeroInteractions(multicaster);
+    verifyNoInteractions(multicaster);
   }
 
   @Test
@@ -68,7 +67,7 @@ public void messagesSentWithADenylistAreNotRetransmitted() {
     when(messageTracker.hasSeenMessage(messageSent)).thenReturn(true);
     uniqueMessageMulticaster.send(messageSent, emptyList());
     uniqueMessageMulticaster.send(messageSent);
-    verifyZeroInteractions(multicaster);
+    verifyNoInteractions(multicaster);
   }
 
   @Test
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/VoteTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/VoteTest.java
similarity index 92%
rename from consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/VoteTest.java
rename to consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/VoteTest.java
index 9e6d8340de9..cb96b9d4f71 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/VoteTest.java
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/VoteTest.java
@@ -12,11 +12,11 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.ibft;
+package org.hyperledger.besu.consensus.common.bft;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 
 import org.junit.Test;
 
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/blockcreation/BftMiningCoordinatorTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/blockcreation/BftMiningCoordinatorTest.java
new file mode 100644
index 00000000000..5af20546941
--- /dev/null
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/blockcreation/BftMiningCoordinatorTest.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft.blockcreation;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.common.bft.BftEventQueue;
+import org.hyperledger.besu.consensus.common.bft.BftExecutors;
+import org.hyperledger.besu.consensus.common.bft.BftProcessor;
+import org.hyperledger.besu.consensus.common.bft.events.NewChainHead;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftEventHandler;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.Collections;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class BftMiningCoordinatorTest {
+  @Mock private BftEventHandler controller;
+  @Mock private BftExecutors bftExecutors;
+  @Mock private BftProcessor bftProcessor;
+  @Mock private BftBlockCreatorFactory<?> bftBlockCreatorFactory;
+  @Mock private Blockchain blockChain;
+  @Mock private Block block;
+  @Mock private BlockBody blockBody;
+  @Mock private BlockHeader blockHeader;
+  private final BftEventQueue eventQueue = new BftEventQueue(1000);
+  private BftMiningCoordinator bftMiningCoordinator;
+
+  @Before
+  public void setup() {
+    bftMiningCoordinator =
+        new BftMiningCoordinator(
+            bftExecutors, controller, bftProcessor, bftBlockCreatorFactory, blockChain, eventQueue);
+    when(block.getBody()).thenReturn(blockBody);
+    when(block.getHeader()).thenReturn(blockHeader);
+    when(blockBody.getTransactions()).thenReturn(Collections.emptyList());
+  }
+
+  @Test
+  public void startsMining() {
+    bftMiningCoordinator.start();
+  }
+
+  @Test
+  public void stopsMining() {
+    // Shouldn't stop without first starting
+    bftMiningCoordinator.stop();
+    verify(bftProcessor, never()).stop();
+
+    bftMiningCoordinator.start();
+    bftMiningCoordinator.stop();
+    verify(bftProcessor).stop();
+  }
+
+  @Test
+  public void getsMinTransactionGasPrice() {
+    final Wei minGasPrice = Wei.of(10);
+    when(bftBlockCreatorFactory.getMinTransactionGasPrice()).thenReturn(minGasPrice);
+    assertThat(bftMiningCoordinator.getMinTransactionGasPrice()).isEqualTo(minGasPrice);
+  }
+
+  @Test
+  public void setsTheExtraData() {
+    final Bytes extraData = Bytes.fromHexStringLenient("0x1234");
+    bftMiningCoordinator.setExtraData(extraData);
+    verify(bftBlockCreatorFactory).setExtraData(extraData);
+  }
+
+  @Test
+  public void addsNewChainHeadEventWhenNewCanonicalHeadBlockEventReceived() throws Exception {
+    BlockAddedEvent headAdvancement =
+        BlockAddedEvent.createForHeadAdvancement(
+            block, Collections.emptyList(), Collections.emptyList());
+    bftMiningCoordinator.onBlockAdded(headAdvancement);
+
+    assertThat(eventQueue.size()).isEqualTo(1);
+    final NewChainHead ibftEvent = (NewChainHead) eventQueue.poll(1, TimeUnit.SECONDS);
+    assertThat(ibftEvent.getNewChainHeadHeader()).isEqualTo(blockHeader);
+  }
+
+  @Test
+  public void doesntAddNewChainHeadEventWhenNotACanonicalHeadBlockEvent() {
+    final BlockAddedEvent fork = BlockAddedEvent.createForFork(block);
+    bftMiningCoordinator.onBlockAdded(fork);
+    assertThat(eventQueue.isEmpty()).isTrue();
+  }
+}
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/blockcreation/ProposerSelectorTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/blockcreation/ProposerSelectorTest.java
similarity index 94%
rename from consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/blockcreation/ProposerSelectorTest.java
rename to consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/blockcreation/ProposerSelectorTest.java
index 34e972b7809..80737668027 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/blockcreation/ProposerSelectorTest.java
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/blockcreation/ProposerSelectorTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.ibft.blockcreation;
+package org.hyperledger.besu.consensus.common.bft.blockcreation;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
@@ -21,12 +21,11 @@
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.consensus.common.BlockInterface;
-import org.hyperledger.besu.consensus.common.VoteTally;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
@@ -41,13 +40,13 @@
 public class ProposerSelectorTest {
 
   private final BlockInterface blockInterface = mock(BlockInterface.class);
-  private final VoteTallyCache voteTallyCache = mock(VoteTallyCache.class);
+  private final ValidatorProvider validatorProvider = mock(ValidatorProvider.class);
 
   private Blockchain createMockedBlockChainWithHeadOf(
       final long blockNumber, final Address proposer, final Collection<Address> validators) {
 
     when(blockInterface.getProposerOfBlock(any())).thenReturn(proposer);
-    when(voteTallyCache.getVoteTallyAfterBlock(any())).thenReturn(new VoteTally(validators));
+    when(validatorProvider.getValidatorsAfterBlock(any())).thenReturn(validators);
 
     final BlockHeaderTestFixture headerBuilderFixture = new BlockHeaderTestFixture();
     headerBuilderFixture.number(blockNumber);
@@ -98,7 +97,7 @@ public void roundRobinChangesProposerOnRoundZeroOfNextBlock() {
         createMockedBlockChainWithHeadOf(PREV_BLOCK_NUMBER, localAddr, validatorList);
 
     final ProposerSelector uut =
-        new ProposerSelector(blockchain, blockInterface, true, voteTallyCache);
+        new ProposerSelector(blockchain, blockInterface, true, validatorProvider);
 
     final ConsensusRoundIdentifier roundId = new ConsensusRoundIdentifier(PREV_BLOCK_NUMBER + 1, 0);
 
@@ -117,7 +116,7 @@ public void lastValidatorInListValidatedPreviousBlockSoFirstIsNextProposer() {
         createMockedBlockChainWithHeadOf(PREV_BLOCK_NUMBER, localAddr, validatorList);
 
     final ProposerSelector uut =
-        new ProposerSelector(blockchain, blockInterface, true, voteTallyCache);
+        new ProposerSelector(blockchain, blockInterface, true, validatorProvider);
 
     final ConsensusRoundIdentifier roundId = new ConsensusRoundIdentifier(PREV_BLOCK_NUMBER + 1, 0);
 
@@ -137,7 +136,7 @@ public void stickyProposerDoesNotChangeOnRoundZeroOfNextBlock() {
         createMockedBlockChainWithHeadOf(PREV_BLOCK_NUMBER, localAddr, validatorList);
 
     final ProposerSelector uut =
-        new ProposerSelector(blockchain, blockInterface, false, voteTallyCache);
+        new ProposerSelector(blockchain, blockInterface, false, validatorProvider);
     final Address nextProposer = uut.selectProposerForRound(roundId);
 
     assertThat(nextProposer).isEqualTo(localAddr);
@@ -155,7 +154,7 @@ public void stickyProposerChangesOnSubsequentRoundsAtSameBlockHeight() {
         createMockedBlockChainWithHeadOf(PREV_BLOCK_NUMBER, localAddr, validatorList);
 
     final ProposerSelector uut =
-        new ProposerSelector(blockchain, blockInterface, false, voteTallyCache);
+        new ProposerSelector(blockchain, blockInterface, false, validatorProvider);
     assertThat(uut.selectProposerForRound(roundId)).isEqualTo(localAddr);
 
     roundId = new ConsensusRoundIdentifier(PREV_BLOCK_NUMBER + 1, 1);
@@ -182,7 +181,7 @@ public void whenProposerSelfRemovesSelectsNextProposerInLineEvenWhenSticky() {
         createMockedBlockChainWithHeadOf(PREV_BLOCK_NUMBER, localAddr, validatorList);
 
     final ProposerSelector uut =
-        new ProposerSelector(blockchain, blockInterface, false, voteTallyCache);
+        new ProposerSelector(blockchain, blockInterface, false, validatorProvider);
 
     assertThat(uut.selectProposerForRound(roundId)).isEqualTo(validatorList.get(2));
   }
@@ -203,7 +202,7 @@ public void whenProposerSelfRemovesSelectsNextProposerInLineEvenWhenRoundRobin()
         createMockedBlockChainWithHeadOf(PREV_BLOCK_NUMBER, localAddr, validatorList);
 
     final ProposerSelector uut =
-        new ProposerSelector(blockchain, blockInterface, true, voteTallyCache);
+        new ProposerSelector(blockchain, blockInterface, true, validatorProvider);
 
     assertThat(uut.selectProposerForRound(roundId)).isEqualTo(validatorList.get(2));
   }
@@ -225,7 +224,7 @@ public void proposerSelfRemovesAndHasHighestAddressNewProposerIsFirstInList() {
         createMockedBlockChainWithHeadOf(PREV_BLOCK_NUMBER, localAddr, validatorList);
 
     final ProposerSelector uut =
-        new ProposerSelector(blockchain, blockInterface, false, voteTallyCache);
+        new ProposerSelector(blockchain, blockInterface, false, validatorProvider);
 
     assertThat(uut.selectProposerForRound(roundId)).isEqualTo(validatorList.get(0));
   }
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftCoinbaseValidationRuleTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftCoinbaseValidationRuleTest.java
new file mode 100644
index 00000000000..fcbea4954d8
--- /dev/null
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftCoinbaseValidationRuleTest.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft.headervalidationrules;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.consensus.common.bft.BftContextBuilder.setupContextWithValidators;
+
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.Util;
+
+import java.util.List;
+import java.util.Optional;
+
+import com.google.common.collect.Lists;
+import org.junit.Test;
+
+public class BftCoinbaseValidationRuleTest {
+
+  public static BlockHeader createProposedBlockHeader(final NodeKey proposerNodeKey) {
+
+    final BlockHeaderTestFixture builder = new BlockHeaderTestFixture();
+    builder.number(1); // must NOT be block 0, as that should not contain seals at all
+    builder.coinbase(Util.publicKeyToAddress(proposerNodeKey.getPublicKey()));
+    return builder.buildHeader();
+  }
+
+  @Test
+  public void proposerInValidatorListPassesValidation() {
+    final NodeKey proposerNodeKey = NodeKeyUtils.generate();
+    final Address proposerAddress =
+        Address.extract(Hash.hash(proposerNodeKey.getPublicKey().getEncodedBytes()));
+
+    final List<Address> validators = Lists.newArrayList(proposerAddress);
+
+    final ProtocolContext context =
+        new ProtocolContext(null, null, setupContextWithValidators(validators), Optional.empty());
+
+    final BftCoinbaseValidationRule coinbaseValidationRule = new BftCoinbaseValidationRule();
+
+    final BlockHeader header = createProposedBlockHeader(proposerNodeKey);
+
+    assertThat(coinbaseValidationRule.validate(header, null, context)).isTrue();
+  }
+
+  @Test
+  public void proposerNotInValidatorListFailsValidation() {
+    final NodeKey proposerNodeKey = NodeKeyUtils.generate();
+
+    final NodeKey otherValidatorNodeKey = NodeKeyUtils.generate();
+    final Address otherValidatorNodeAddress =
+        Address.extract(Hash.hash(otherValidatorNodeKey.getPublicKey().getEncodedBytes()));
+
+    final List<Address> validators = Lists.newArrayList(otherValidatorNodeAddress);
+
+    final ProtocolContext context =
+        new ProtocolContext(null, null, setupContextWithValidators(validators), Optional.empty());
+
+    final BftCoinbaseValidationRule coinbaseValidationRule = new BftCoinbaseValidationRule();
+
+    final BlockHeader header = createProposedBlockHeader(proposerNodeKey);
+
+    assertThat(coinbaseValidationRule.validate(header, null, context)).isFalse();
+  }
+}
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftCommitSealsValidationRuleTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftCommitSealsValidationRuleTest.java
new file mode 100644
index 00000000000..453b28a601c
--- /dev/null
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftCommitSealsValidationRuleTest.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft.headervalidationrules;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.consensus.common.bft.BftContextBuilder.setupContextWithValidators;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.common.bft.BftContext;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Util;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import com.google.common.collect.Lists;
+import org.junit.Test;
+
+public class BftCommitSealsValidationRuleTest {
+
+  private final BlockHeader blockHeader = mock(BlockHeader.class);
+  private final BftCommitSealsValidationRule commitSealsValidationRule =
+      new BftCommitSealsValidationRule();
+
+  @Test
+  public void correctlyConstructedHeaderPassesValidation() {
+    final List<NodeKey> committerNodeKeys =
+        IntStream.range(0, 2).mapToObj(i -> NodeKeyUtils.generate()).collect(Collectors.toList());
+
+    final List<Address> committerAddresses =
+        committerNodeKeys.stream()
+            .map(nodeKey -> Util.publicKeyToAddress(nodeKey.getPublicKey()))
+            .sorted()
+            .collect(Collectors.toList());
+
+    final BftContext bftContext = setupContextWithValidators(committerAddresses);
+    final ProtocolContext context = new ProtocolContext(null, null, bftContext, Optional.empty());
+    when(bftContext.getBlockInterface().getCommitters(any())).thenReturn(committerAddresses);
+
+    assertThat(commitSealsValidationRule.validate(blockHeader, null, context)).isTrue();
+  }
+
+  @Test
+  public void insufficientCommitSealsFailsValidation() {
+    final NodeKey committerNodeKey = NodeKeyUtils.generate();
+    final Address committerAddress =
+        Address.extract(Hash.hash(committerNodeKey.getPublicKey().getEncodedBytes()));
+
+    final List<Address> validators = singletonList(committerAddress);
+    final BftContext bftContext = setupContextWithValidators(validators);
+    final ProtocolContext context = new ProtocolContext(null, null, bftContext, Optional.empty());
+    when(bftContext.getBlockInterface().getCommitters(any())).thenReturn(emptyList());
+
+    assertThat(commitSealsValidationRule.validate(blockHeader, null, context)).isFalse();
+  }
+
+  @Test
+  public void committerNotInValidatorListFailsValidation() {
+    final NodeKey committerNodeKey = NodeKeyUtils.generate();
+    final Address committerAddress = Util.publicKeyToAddress(committerNodeKey.getPublicKey());
+
+    final List<Address> validators = singletonList(committerAddress);
+
+    // Insert an extraData block with committer seals.
+    final NodeKey nonValidatorNodeKey = NodeKeyUtils.generate();
+
+    final BftContext bftContext = setupContextWithValidators(validators);
+    final ProtocolContext context = new ProtocolContext(null, null, bftContext, Optional.empty());
+    when(bftContext.getBlockInterface().getCommitters(any()))
+        .thenReturn(singletonList(Util.publicKeyToAddress(nonValidatorNodeKey.getPublicKey())));
+
+    assertThat(commitSealsValidationRule.validate(blockHeader, null, context)).isFalse();
+  }
+
+  @Test
+  public void ratioOfCommittersToValidatorsAffectValidation() {
+    assertThat(subExecution(4, 4)).isEqualTo(true);
+    assertThat(subExecution(4, 3)).isEqualTo(true);
+    assertThat(subExecution(4, 2)).isEqualTo(false);
+
+    assertThat(subExecution(5, 4)).isEqualTo(true);
+    assertThat(subExecution(5, 3)).isEqualTo(false);
+    assertThat(subExecution(5, 2)).isEqualTo(false);
+
+    assertThat(subExecution(6, 4)).isEqualTo(true);
+    assertThat(subExecution(6, 3)).isEqualTo(false);
+    assertThat(subExecution(6, 2)).isEqualTo(false);
+
+    assertThat(subExecution(7, 5)).isEqualTo(true);
+    assertThat(subExecution(7, 4)).isEqualTo(false);
+
+    assertThat(subExecution(8, 6)).isEqualTo(true);
+    assertThat(subExecution(8, 5)).isEqualTo(false);
+    assertThat(subExecution(8, 4)).isEqualTo(false);
+
+    assertThat(subExecution(9, 6)).isEqualTo(true);
+    assertThat(subExecution(9, 5)).isEqualTo(false);
+    assertThat(subExecution(9, 4)).isEqualTo(false);
+
+    assertThat(subExecution(10, 7)).isEqualTo(true);
+    assertThat(subExecution(10, 6)).isEqualTo(false);
+
+    assertThat(subExecution(12, 8)).isEqualTo(true);
+    assertThat(subExecution(12, 7)).isEqualTo(false);
+    assertThat(subExecution(12, 6)).isEqualTo(false);
+  }
+
+  @Test
+  public void headerContainsDuplicateSealsFailsValidation() {
+    final NodeKey committerNodeKey = NodeKeyUtils.generate();
+    final Address committerAddress = Util.publicKeyToAddress(committerNodeKey.getPublicKey());
+    final List<Address> validators = singletonList(committerAddress);
+
+    final BftContext bftContext = setupContextWithValidators(validators);
+    final ProtocolContext context = new ProtocolContext(null, null, bftContext, Optional.empty());
+    when(bftContext.getBlockInterface().getCommitters(any()))
+        .thenReturn(List.of(committerAddress, committerAddress));
+
+    assertThat(commitSealsValidationRule.validate(blockHeader, null, context)).isFalse();
+  }
+
+  private boolean subExecution(final int validatorCount, final int committerCount) {
+
+    final List<Address> validators = Lists.newArrayList();
+
+    for (int i = 0; i < validatorCount; i++) { // need -1 to account for proposer
+      final NodeKey committerNodeKey = NodeKeyUtils.generate();
+      validators.add(Address.extract(Hash.hash(committerNodeKey.getPublicKey().getEncodedBytes())));
+    }
+
+    Collections.sort(validators);
+
+    final BftContext bftContext = setupContextWithValidators(validators);
+    final ProtocolContext context = new ProtocolContext(null, null, bftContext, Optional.empty());
+    when(bftContext.getBlockInterface().getCommitters(any()))
+        .thenReturn(validators.subList(0, committerCount));
+
+    return commitSealsValidationRule.validate(blockHeader, null, context);
+  }
+}
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftValidatorsValidationRuleTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftValidatorsValidationRuleTest.java
new file mode 100644
index 00000000000..00b994295ca
--- /dev/null
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftValidatorsValidationRuleTest.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft.headervalidationrules;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.consensus.common.bft.BftContextBuilder.setupContextWithBftExtraData;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.AddressHelpers;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.List;
+import java.util.Optional;
+
+import com.google.common.collect.Lists;
+import org.junit.Test;
+
+public class BftValidatorsValidationRuleTest {
+
+  private final BftValidatorsValidationRule validatorsValidationRule =
+      new BftValidatorsValidationRule();
+  private final BftExtraData bftExtraData = mock(BftExtraData.class);
+  private final BlockHeader blockHeader = mock(BlockHeader.class);
+
+  @Test
+  public void correctlyConstructedHeaderPassesValidation() {
+    final List<Address> validators =
+        Lists.newArrayList(
+            AddressHelpers.ofValue(1), AddressHelpers.ofValue(2), AddressHelpers.ofValue(3));
+
+    final ProtocolContext context =
+        new ProtocolContext(
+            null, null, setupContextWithBftExtraData(validators, bftExtraData), Optional.empty());
+    when(bftExtraData.getValidators()).thenReturn(validators);
+
+    assertThat(validatorsValidationRule.validate(blockHeader, null, context)).isTrue();
+  }
+
+  @Test
+  public void validatorsInNonAscendingOrderFailValidation() {
+
+    final List<Address> validators =
+        Lists.newArrayList(
+            AddressHelpers.ofValue(1), AddressHelpers.ofValue(2), AddressHelpers.ofValue(3));
+
+    final ProtocolContext context =
+        new ProtocolContext(
+            null, null, setupContextWithBftExtraData(validators, bftExtraData), Optional.empty());
+    when(bftExtraData.getValidators()).thenReturn(Lists.reverse(validators));
+
+    assertThat(validatorsValidationRule.validate(blockHeader, null, context)).isFalse();
+  }
+
+  @Test
+  public void mismatchingReportedValidatorsVsLocallyStoredListFailsValidation() {
+    final List<Address> storedValidators =
+        Lists.newArrayList(
+            AddressHelpers.ofValue(1), AddressHelpers.ofValue(2), AddressHelpers.ofValue(3));
+
+    final List<Address> reportedValidators =
+        Lists.newArrayList(
+            AddressHelpers.ofValue(2), AddressHelpers.ofValue(3), AddressHelpers.ofValue(4));
+
+    final ProtocolContext context =
+        new ProtocolContext(
+            null,
+            null,
+            setupContextWithBftExtraData(storedValidators, bftExtraData),
+            Optional.empty());
+    when(bftExtraData.getValidators()).thenReturn(Lists.reverse(reportedValidators));
+
+    assertThat(validatorsValidationRule.validate(blockHeader, null, context)).isFalse();
+  }
+}
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftVanityDataValidationRuleTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftVanityDataValidationRuleTest.java
new file mode 100644
index 00000000000..cd148f8787a
--- /dev/null
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/headervalidationrules/BftVanityDataValidationRuleTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft.headervalidationrules;
+
+import static java.util.Collections.emptyList;
+import static java.util.Optional.empty;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.consensus.common.bft.BftContextBuilder.setupContextWithBftExtraData;
+import static org.mockito.Mockito.mock;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Test;
+
+public class BftVanityDataValidationRuleTest {
+  private final BftVanityDataValidationRule validationRule = new BftVanityDataValidationRule();
+  private final BlockHeader blockHeader = mock(BlockHeader.class);
+
+  @Test
+  public void testCases() {
+    assertThat(headerWithVanityDataOfSize(0)).isFalse();
+    assertThat(headerWithVanityDataOfSize(31)).isFalse();
+    assertThat(headerWithVanityDataOfSize(32)).isTrue();
+    assertThat(headerWithVanityDataOfSize(33)).isFalse();
+  }
+
+  public boolean headerWithVanityDataOfSize(final int extraDataSize) {
+    final BftExtraData extraData =
+        new BftExtraData(Bytes.wrap(new byte[extraDataSize]), emptyList(), empty(), 0, emptyList());
+
+    final ProtocolContext context =
+        new ProtocolContext(
+            null, null, setupContextWithBftExtraData(emptyList(), extraData), Optional.empty());
+    return validationRule.validate(blockHeader, null, context);
+  }
+}
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/network/ValidatorPeersTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/network/ValidatorPeersTest.java
similarity index 81%
rename from consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/network/ValidatorPeersTest.java
rename to consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/network/ValidatorPeersTest.java
index 7d57d10b485..38ad26c658b 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/network/ValidatorPeersTest.java
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/network/ValidatorPeersTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.ibft.network;
+package org.hyperledger.besu.consensus.common.bft.network;
 
 import static com.google.common.collect.Lists.newArrayList;
 import static org.mockito.ArgumentMatchers.any;
@@ -22,10 +22,10 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.consensus.common.VoteTally;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
-import org.hyperledger.besu.crypto.SECP256K1.PublicKey;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.crypto.SECPPublicKey;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.core.Util;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected;
@@ -46,16 +46,18 @@
 @RunWith(MockitoJUnitRunner.class)
 public class ValidatorPeersTest {
 
+  public static final String PROTOCOL_NAME = "BFT";
   private final List<Address> validators = newArrayList();
-  private final List<PublicKey> publicKeys = newArrayList();
+  private final List<SECPPublicKey> publicKeys = newArrayList();
 
   private final List<PeerConnection> peerConnections = newArrayList();
-  @Mock private VoteTallyCache voteTallyCache;
+  @Mock ValidatorProvider validatorProvider;
 
   @Before
   public void setup() {
     for (int i = 0; i < 4; i++) {
-      final PublicKey pubKey = PublicKey.create(BigInteger.valueOf(i));
+      final SECPPublicKey pubKey =
+          SignatureAlgorithmFactory.getInstance().createPublicKey(BigInteger.valueOf(i));
       publicKeys.add(pubKey);
       final Address address = Util.publicKeyToAddress(pubKey);
 
@@ -63,9 +65,7 @@ public void setup() {
       peerConnections.add(peerConnection);
     }
 
-    final VoteTally validatorProvider = mock(VoteTally.class);
-    when(voteTallyCache.getVoteTallyAtHead()).thenReturn(validatorProvider);
-    when(validatorProvider.getValidators()).thenReturn(validators);
+    when(validatorProvider.getValidatorsAtHead()).thenReturn(validators);
   }
 
   private PeerConnection mockPeerConnection(final Address address) {
@@ -81,7 +81,7 @@ public void onlyValidatorsAreSentAMessage() throws PeerNotConnected {
     // Only add the first Peer's address to the validators.
     validators.add(Util.publicKeyToAddress(publicKeys.get(0)));
 
-    final ValidatorPeers peers = new ValidatorPeers(voteTallyCache);
+    final ValidatorPeers peers = new ValidatorPeers(validatorProvider, PROTOCOL_NAME);
     for (final PeerConnection peer : peerConnections) {
       peers.add(peer);
     }
@@ -89,7 +89,7 @@ public void onlyValidatorsAreSentAMessage() throws PeerNotConnected {
     final MessageData messageToSend = new RawMessage(1, Bytes.EMPTY);
     peers.send(messageToSend);
 
-    verify(peerConnections.get(0), times(1)).sendForProtocol("IBF", messageToSend);
+    verify(peerConnections.get(0), times(1)).sendForProtocol(PROTOCOL_NAME, messageToSend);
     verify(peerConnections.get(1), never()).sendForProtocol(any(), any());
     verify(peerConnections.get(2), never()).sendForProtocol(any(), any());
     verify(peerConnections.get(3), never()).sendForProtocol(any(), any());
@@ -101,7 +101,7 @@ public void handlesDuplicateConnection() throws PeerNotConnected {
     validators.add(peer0Address);
     final PeerConnection duplicatePeer = mockPeerConnection(peer0Address);
 
-    final ValidatorPeers peers = new ValidatorPeers(voteTallyCache);
+    final ValidatorPeers peers = new ValidatorPeers(validatorProvider, PROTOCOL_NAME);
     for (final PeerConnection peer : peerConnections) {
       peers.add(peer);
     }
@@ -110,8 +110,8 @@ public void handlesDuplicateConnection() throws PeerNotConnected {
     final MessageData messageToSend = new RawMessage(1, Bytes.EMPTY);
     peers.send(messageToSend);
 
-    verify(peerConnections.get(0), times(1)).sendForProtocol("IBF", messageToSend);
-    verify(duplicatePeer, times(1)).sendForProtocol("IBF", messageToSend);
+    verify(peerConnections.get(0), times(1)).sendForProtocol(PROTOCOL_NAME, messageToSend);
+    verify(duplicatePeer, times(1)).sendForProtocol(PROTOCOL_NAME, messageToSend);
     verify(peerConnections.get(1), never()).sendForProtocol(any(), any());
     verify(peerConnections.get(2), never()).sendForProtocol(any(), any());
     verify(peerConnections.get(3), never()).sendForProtocol(any(), any());
@@ -123,7 +123,7 @@ public void handlesTransientDuplicateConnection() throws PeerNotConnected {
     validators.add(peer0Address);
     final PeerConnection duplicatePeer = mockPeerConnection(peer0Address);
 
-    final ValidatorPeers peers = new ValidatorPeers(voteTallyCache);
+    final ValidatorPeers peers = new ValidatorPeers(validatorProvider, PROTOCOL_NAME);
     for (final PeerConnection peer : peerConnections) {
       peers.add(peer);
     }
@@ -133,7 +133,7 @@ public void handlesTransientDuplicateConnection() throws PeerNotConnected {
     final MessageData messageToSend = new RawMessage(1, Bytes.EMPTY);
     peers.send(messageToSend);
 
-    verify(peerConnections.get(0), times(1)).sendForProtocol("IBF", messageToSend);
+    verify(peerConnections.get(0), times(1)).sendForProtocol(PROTOCOL_NAME, messageToSend);
     verify(duplicatePeer, never()).sendForProtocol("IBF", messageToSend);
     verify(peerConnections.get(1), never()).sendForProtocol(any(), any());
     verify(peerConnections.get(2), never()).sendForProtocol(any(), any());
@@ -144,7 +144,7 @@ public void handlesTransientDuplicateConnection() throws PeerNotConnected {
   public void doesntSendToValidatorsWhichAreNotDirectlyConnected() throws PeerNotConnected {
     validators.add(Util.publicKeyToAddress(publicKeys.get(0)));
 
-    final ValidatorPeers peers = new ValidatorPeers(voteTallyCache);
+    final ValidatorPeers peers = new ValidatorPeers(validatorProvider, PROTOCOL_NAME);
 
     // only add peer connections 1, 2 & 3, none of which should be invoked.
     newArrayList(1, 2, 3).forEach(i -> peers.add(peerConnections.get(i)));
@@ -165,7 +165,7 @@ public void onlyValidatorsAreSentAMessageNotInExcludes() throws PeerNotConnected
     validators.add(validatorAddress);
     validators.add(Util.publicKeyToAddress(publicKeys.get(1)));
 
-    final ValidatorPeers peers = new ValidatorPeers(voteTallyCache);
+    final ValidatorPeers peers = new ValidatorPeers(validatorProvider, PROTOCOL_NAME);
     for (final PeerConnection peer : peerConnections) {
       peers.add(peer);
     }
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/queries/BftQueryServiceImplTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/queries/BftQueryServiceImplTest.java
new file mode 100644
index 00000000000..ab161c2c401
--- /dev/null
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/queries/BftQueryServiceImplTest.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.common.bft.queries;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.NonBesuBlockHeader;
+import org.hyperledger.besu.ethereum.core.Util;
+import org.hyperledger.besu.plugin.services.query.BftQueryService;
+
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import com.google.common.collect.Lists;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class BftQueryServiceImplTest {
+
+  @Mock private Blockchain blockchain;
+
+  @Mock private BftExtraDataCodec bftExtraDataCodec;
+
+  @Mock private BftBlockInterface bftBlockInterface;
+
+  @Mock private ValidatorProvider validatorProvider;
+
+  private final List<NodeKey> validatorKeys =
+      Lists.newArrayList(NodeKeyUtils.generate(), NodeKeyUtils.generate());
+
+  private final List<NodeKey> signingKeys = Lists.newArrayList(validatorKeys.get(0));
+
+  private BlockHeader blockHeader;
+
+  @Before
+  public void setup() {
+    final BlockHeaderTestFixture blockHeaderTestFixture = new BlockHeaderTestFixture();
+    blockHeaderTestFixture.number(1); // can't be genesis block (due to extradata serialisation)
+    blockHeaderTestFixture.blockHeaderFunctions(
+        BftBlockHeaderFunctions.forOnchainBlock(bftExtraDataCodec));
+
+    blockHeader = blockHeaderTestFixture.buildHeader();
+  }
+
+  @Test
+  public void roundNumberFromBlockIsReturned() {
+    final BftQueryService service =
+        new BftQueryServiceImpl(bftBlockInterface, blockchain, validatorProvider, null, null);
+    final int roundNumberInBlock = 5;
+    final BftExtraData extraData =
+        new BftExtraData(Bytes.EMPTY, List.of(), Optional.empty(), roundNumberInBlock, List.of());
+    when(bftBlockInterface.getExtraData(blockHeader)).thenReturn(extraData);
+
+    assertThat(service.getRoundNumberFrom(blockHeader)).isEqualTo(roundNumberInBlock);
+  }
+
+  @Test
+  public void getRoundNumberThrowsIfBlockIsNotOnTheChain() {
+    final NonBesuBlockHeader header = new NonBesuBlockHeader(Hash.EMPTY, Bytes.EMPTY);
+
+    final BftQueryService service =
+        new BftQueryServiceImpl(
+            new BftBlockInterface(bftExtraDataCodec), blockchain, validatorProvider, null, null);
+    assertThatExceptionOfType(NoSuchElementException.class)
+        .isThrownBy(() -> service.getRoundNumberFrom(header));
+  }
+
+  @Test
+  public void getSignersReturnsAddressesOfSignersInBlock() {
+    final BftQueryService service =
+        new BftQueryServiceImpl(bftBlockInterface, blockchain, validatorProvider, null, null);
+
+    final List<Address> signers =
+        signingKeys.stream()
+            .map(nodeKey -> Util.publicKeyToAddress(nodeKey.getPublicKey()))
+            .collect(Collectors.toList());
+    when(bftBlockInterface.getCommitters(any())).thenReturn(signers);
+
+    assertThat(service.getSignersFrom(blockHeader)).containsExactlyElementsOf(signers);
+  }
+
+  @Test
+  public void getSignersThrowsIfBlockIsNotOnTheChain() {
+    final NonBesuBlockHeader header = new NonBesuBlockHeader(Hash.EMPTY, Bytes.EMPTY);
+
+    final BftQueryService service =
+        new BftQueryServiceImpl(bftBlockInterface, blockchain, validatorProvider, null, null);
+    assertThatExceptionOfType(NoSuchElementException.class)
+        .isThrownBy(() -> service.getSignersFrom(header));
+  }
+
+  @Test
+  public void consensusMechanismNameReturnedIsSameAsThatPassedDuringCreation() {
+    final BftQueryService service =
+        new BftQueryServiceImpl(
+            new BftBlockInterface(bftExtraDataCodec),
+            blockchain,
+            validatorProvider,
+            null,
+            "consensusMechanism");
+    assertThat(service.getConsensusMechanismName()).isEqualTo("consensusMechanism");
+  }
+
+  @Test
+  public void getValidatorsReturnsAddresses() {
+    final BftQueryService service =
+        new BftQueryServiceImpl(bftBlockInterface, blockchain, validatorProvider, null, null);
+
+    final List<Address> validators =
+        signingKeys.stream()
+            .map(nodeKey -> Util.publicKeyToAddress(nodeKey.getPublicKey()))
+            .collect(Collectors.toList());
+    when(validatorProvider.getValidatorsAtHead()).thenReturn(validators);
+
+    assertThat(service.getValidatorsForLatestBlock()).containsExactlyElementsOf(validators);
+  }
+}
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/FutureMessageBufferTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/statemachine/FutureMessageBufferTest.java
similarity index 98%
rename from consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/FutureMessageBufferTest.java
rename to consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/statemachine/FutureMessageBufferTest.java
index e082c27670d..1267d5794b6 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/FutureMessageBufferTest.java
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/bft/statemachine/FutureMessageBufferTest.java
@@ -12,12 +12,12 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.ibft.statemachine;
+package org.hyperledger.besu.consensus.common.bft.statemachine;
 
 import static java.util.Arrays.copyOfRange;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.consensus.ibft.network.MockPeerFactory;
+import org.hyperledger.besu.consensus.common.bft.network.MockPeerFactory;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.DefaultMessage;
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractVoteProposerMethodTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractVoteProposerMethodTest.java
index fc35e9960c1..8f7c66d5bed 100644
--- a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractVoteProposerMethodTest.java
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/jsonrpc/AbstractVoteProposerMethodTest.java
@@ -18,28 +18,35 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.consensus.common.VoteProposer;
-import org.hyperledger.besu.consensus.common.VoteType;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.common.validator.VoteProvider;
+import org.hyperledger.besu.consensus.common.validator.VoteType;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.core.Address;
+
+import java.util.Optional;
 
 import com.google.common.collect.ImmutableMap;
-import org.junit.Test;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 public abstract class AbstractVoteProposerMethodTest {
 
-  private final VoteProposer voteProposer = mock(VoteProposer.class);
+  private final ValidatorProvider validatorProvider = mock(ValidatorProvider.class);
+  private final VoteProvider voteProvider = mock(VoteProvider.class);
   private final String JSON_RPC_VERSION = "2.0";
 
   protected abstract AbstractVoteProposerMethod getMethod();
 
   protected abstract String getMethodName();
 
-  protected VoteProposer getVoteProposer() {
-    return voteProposer;
+  protected ValidatorProvider getValidatorProvider() {
+    return validatorProvider;
   }
 
   @Test
@@ -48,7 +55,8 @@ public void testConversionFromVoteTypeToBoolean() {
         new JsonRpcRequestContext(
             new JsonRpcRequest(JSON_RPC_VERSION, getMethodName(), new Object[] {}));
 
-    when(voteProposer.getProposals())
+    when(validatorProvider.getVoteProviderAtHead()).thenReturn(Optional.of(voteProvider));
+    when(voteProvider.getProposals())
         .thenReturn(
             ImmutableMap.of(
                 Address.fromHexString("1"),
@@ -67,6 +75,20 @@ public void testConversionFromVoteTypeToBoolean() {
 
     final JsonRpcResponse response = getMethod().response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void methodNotEnabledWhenNoVoteProvider() {
+    final JsonRpcRequestContext request =
+        new JsonRpcRequestContext(
+            new JsonRpcRequest(JSON_RPC_VERSION, getMethodName(), new Object[] {}));
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.METHOD_NOT_ENABLED);
+    when(validatorProvider.getVoteProviderAtHead()).thenReturn(Optional.empty());
+
+    final JsonRpcResponse response = getMethod().response(request);
+
+    Assertions.assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 }
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/ForkingVoteTallyCacheTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/validator/blockbased/ForkingVoteTallyCacheTest.java
similarity index 94%
rename from consensus/common/src/test/java/org/hyperledger/besu/consensus/common/ForkingVoteTallyCacheTest.java
rename to consensus/common/src/test/java/org/hyperledger/besu/consensus/common/validator/blockbased/ForkingVoteTallyCacheTest.java
index 1e4cbba4737..f1692201cec 100644
--- a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/ForkingVoteTallyCacheTest.java
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/validator/blockbased/ForkingVoteTallyCacheTest.java
@@ -12,12 +12,14 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.common;
+package org.hyperledger.besu.consensus.common.validator.blockbased;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.consensus.common.BftValidatorOverrides;
+import org.hyperledger.besu.consensus.common.EpochManager;
+import org.hyperledger.besu.datatypes.Address;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteProposerTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteProposerTest.java
similarity index 97%
rename from consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteProposerTest.java
rename to consensus/common/src/test/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteProposerTest.java
index f5a41c1b317..d486a41979a 100644
--- a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteProposerTest.java
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteProposerTest.java
@@ -12,11 +12,13 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.common;
+package org.hyperledger.besu.consensus.common.validator.blockbased;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.consensus.common.validator.ValidatorVote;
+import org.hyperledger.besu.consensus.common.validator.VoteType;
+import org.hyperledger.besu.datatypes.Address;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteTallyCacheTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteTallyCacheTest.java
similarity index 92%
rename from consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteTallyCacheTest.java
rename to consensus/common/src/test/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteTallyCacheTest.java
index 28ebbc9b6a9..c69f2bb7697 100644
--- a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteTallyCacheTest.java
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteTallyCacheTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.common;
+package org.hyperledger.besu.consensus.common.validator.blockbased;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -21,12 +21,15 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.consensus.common.EpochManager;
+import org.hyperledger.besu.consensus.common.validator.ValidatorVote;
+import org.hyperledger.besu.consensus.common.validator.VoteType;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 import java.util.Arrays;
 import java.util.Optional;
@@ -57,10 +60,10 @@ public void parentBlockVoteTallysAreCachedWhenChildVoteTallyRequested() {
     // Requesting the vote tally to the parent block should not invoke the voteTallyUpdater as the
     // vote tally was cached from previous operation.
     cache.getVoteTallyAfterBlock(block_1.getHeader());
-    verifyZeroInteractions(tallyUpdater);
+    verifyNoInteractions(tallyUpdater);
 
     cache.getVoteTallyAfterBlock(block_2.getHeader());
-    verifyZeroInteractions(tallyUpdater);
+    verifyNoInteractions(tallyUpdater);
   }
 
   @Test
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteTallyCacheTestBase.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteTallyCacheTestBase.java
similarity index 79%
rename from consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteTallyCacheTestBase.java
rename to consensus/common/src/test/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteTallyCacheTestBase.java
index 53aef54cf50..1a3dba12b1d 100644
--- a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteTallyCacheTestBase.java
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteTallyCacheTestBase.java
@@ -12,21 +12,23 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.common;
+package org.hyperledger.besu.consensus.common.validator.blockbased;
 
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.consensus.common.BlockInterface;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
 
+import java.util.Collections;
 import java.util.List;
 
 import org.apache.tuweni.bytes.Bytes;
@@ -40,7 +42,8 @@ public class VoteTallyCacheTestBase {
   protected Block createEmptyBlock(final long blockNumber, final Hash parentHash) {
     headerBuilder.number(blockNumber).parentHash(parentHash).coinbase(AddressHelpers.ofValue(0));
     return new Block(
-        headerBuilder.buildHeader(), new BlockBody(Lists.emptyList(), Lists.emptyList()));
+        headerBuilder.buildHeader(),
+        new BlockBody(Collections.emptyList(), Collections.emptyList()));
   }
 
   protected MutableBlockchain blockChain;
@@ -66,8 +69,8 @@ public void constructThreeBlockChain() {
     block_1 = createEmptyBlock(1, genesisBlock.getHeader().getHash());
     block_2 = createEmptyBlock(2, block_1.getHeader().getHash());
 
-    blockChain.appendBlock(block_1, Lists.emptyList());
-    blockChain.appendBlock(block_2, Lists.emptyList());
+    blockChain.appendBlock(block_1, Collections.emptyList());
+    blockChain.appendBlock(block_2, Collections.emptyList());
 
     when(blockInterface.validatorsInBlock(any())).thenReturn(validators);
   }
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteTallyTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteTallyTest.java
similarity index 98%
rename from consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteTallyTest.java
rename to consensus/common/src/test/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteTallyTest.java
index 515497be20c..96671716cae 100644
--- a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteTallyTest.java
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteTallyTest.java
@@ -12,13 +12,15 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.common;
+package org.hyperledger.besu.consensus.common.validator.blockbased;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.consensus.common.validator.ValidatorVote;
+import org.hyperledger.besu.consensus.common.validator.VoteType;
+import org.hyperledger.besu.datatypes.Address;
 
 import org.junit.Test;
 
diff --git a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteTallyUpdaterTest.java b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteTallyUpdaterTest.java
similarity index 88%
rename from consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteTallyUpdaterTest.java
rename to consensus/common/src/test/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteTallyUpdaterTest.java
index d339b379e9e..6d7590edf9a 100644
--- a/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/VoteTallyUpdaterTest.java
+++ b/consensus/common/src/test/java/org/hyperledger/besu/consensus/common/validator/blockbased/VoteTallyUpdaterTest.java
@@ -12,23 +12,28 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.consensus.common;
+package org.hyperledger.besu.consensus.common.validator.blockbased;
 
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
+import org.hyperledger.besu.consensus.common.BlockInterface;
+import org.hyperledger.besu.consensus.common.EpochManager;
+import org.hyperledger.besu.consensus.common.validator.ValidatorVote;
+import org.hyperledger.besu.consensus.common.validator.VoteType;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 import java.util.Optional;
 
@@ -39,7 +44,7 @@ public class VoteTallyUpdaterTest {
   private static final long EPOCH_LENGTH = 30_000;
   private final VoteTally voteTally = mock(VoteTally.class);
   private final MutableBlockchain blockchain = mock(MutableBlockchain.class);
-  private final KeyPair proposerKeyPair = KeyPair.generate();
+  private final KeyPair proposerKeyPair = SignatureAlgorithmFactory.getInstance().generateKeyPair();
   private final Address proposerAddress =
       Address.extract(Hash.hash(proposerKeyPair.getPublicKey().getEncodedBytes()));
   private final Address subject = Address.fromHexString("007f4a23ca00cd043d25c2888c1aa5688f81a344");
@@ -75,7 +80,7 @@ public void voteTallyNotUpdatedWhenBlockHasNoVoteSubject() {
 
     updater.updateForBlock(header, voteTally);
 
-    verifyZeroInteractions(voteTally);
+    verifyNoInteractions(voteTally);
   }
 
   @Test
diff --git a/consensus/ibft/build.gradle b/consensus/ibft/build.gradle
index 33e40d7e15e..023d70c1626 100644
--- a/consensus/ibft/build.gradle
+++ b/consensus/ibft/build.gradle
@@ -28,47 +28,51 @@ jar {
 }
 
 dependencies {
-  implementation project(':config')
   implementation project(':consensus:common')
-  implementation project(':crypto')
+  implementation project(':config')
+  implementation project(':crypto:services')
+  implementation project(':datatypes')
   implementation project(':ethereum:api')
   implementation project(':ethereum:blockcreation')
   implementation project(':ethereum:core')
   implementation project(':ethereum:eth')
   implementation project(':ethereum:p2p')
   implementation project(':ethereum:rlp')
+  implementation project(':evm')
   implementation project(':services:kvstore')
 
   implementation 'com.google.guava:guava'
   implementation 'io.vertx:vertx-core'
-  implementation 'org.apache.tuweni:bytes'
-  implementation 'org.apache.tuweni:units'
+  implementation 'com.fasterxml.jackson.core:jackson-databind'
+  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-units'
 
   integrationTestImplementation project(path: ':config', configuration: 'testSupportArtifacts')
   integrationTestImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
 
-  testImplementation project(path: ':crypto', configuration: 'testSupportArtifacts')
+  testImplementation project(path: ':crypto:services', configuration: 'testSupportArtifacts')
   testImplementation project(path: ':config', configuration: 'testSupportArtifacts')
   testImplementation project(path: ':consensus:common', configuration: 'testArtifacts')
+  testImplementation project(path: ':consensus:common', configuration: 'testSupportArtifacts')
+  testImplementation project(':evm')
   testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
   testImplementation project(':metrics:core')
   testImplementation project(':testutil')
 
-  integrationTestImplementation project(path: ':crypto', configuration: 'testSupportArtifacts')
+  integrationTestImplementation project(path: ':consensus:common', configuration: 'testSupportArtifacts')
+  integrationTestImplementation project(path: ':crypto:services', configuration: 'testSupportArtifacts')
   integrationTestImplementation project(':metrics:core')
   integrationTestImplementation project(':testutil')
 
-  integrationTestImplementation 'junit:junit'
   integrationTestImplementation 'org.assertj:assertj-core'
+  integrationTestImplementation 'org.junit.jupiter:junit-jupiter-api'
   integrationTestImplementation 'org.mockito:mockito-core'
+  integrationTestImplementation 'org.mockito:mockito-junit-jupiter'
+
+  integrationTestRuntimeOnly 'org.junit.jupiter:junit-jupiter'
 
-  testImplementation 'junit:junit'
-  testImplementation 'org.awaitility:awaitility'
   testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.mockito:mockito-core'
-
-  testSupportImplementation 'org.mockito:mockito-core'
+  testImplementation 'org.mockito:mockito-junit-jupiter'
 }
-
-
-artifacts { testSupportArtifacts testSupportJar }
diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/IntegrationTestHelpers.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/IntegrationTestHelpers.java
index 208555da953..2586b7ad406 100644
--- a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/IntegrationTestHelpers.java
+++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/IntegrationTestHelpers.java
@@ -14,16 +14,17 @@
  */
 package org.hyperledger.besu.consensus.ibft.support;
 
+import org.hyperledger.besu.consensus.common.bft.BftBlockHashing;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
 import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
-import org.hyperledger.besu.consensus.ibft.IbftBlockHashing;
-import org.hyperledger.besu.consensus.ibft.IbftExtraData;
+import org.hyperledger.besu.consensus.ibft.IbftExtraDataCodec;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare;
 import org.hyperledger.besu.consensus.ibft.payload.CommitPayload;
 import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
 import org.hyperledger.besu.consensus.ibft.statemachine.PreparedRoundArtifacts;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.cryptoservices.NodeKey;
 import org.hyperledger.besu.ethereum.core.Block;
 
 import java.util.Optional;
@@ -34,11 +35,13 @@ public class IntegrationTestHelpers {
   public static SignedData<CommitPayload> createSignedCommitPayload(
       final ConsensusRoundIdentifier roundId, final Block block, final NodeKey nodeKey) {
 
-    final IbftExtraData extraData = IbftExtraData.decode(block.getHeader());
+    final IbftExtraDataCodec ibftExtraDataEncoder = new IbftExtraDataCodec();
+    final BftExtraData extraData = ibftExtraDataEncoder.decode(block.getHeader());
 
-    final Signature commitSeal =
+    final SECPSignature commitSeal =
         nodeKey.sign(
-            IbftBlockHashing.calculateDataHashForCommittedSeal(block.getHeader(), extraData));
+            new BftBlockHashing(ibftExtraDataEncoder)
+                .calculateDataHashForCommittedSeal(block.getHeader(), extraData));
 
     final MessageFactory messageFactory = new MessageFactory(nodeKey);
 
diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/RoundSpecificPeers.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/RoundSpecificPeers.java
index 2ab9c02692a..8aa5b312c67 100644
--- a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/RoundSpecificPeers.java
+++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/RoundSpecificPeers.java
@@ -31,8 +31,8 @@
 import org.hyperledger.besu.consensus.ibft.payload.PreparePayload;
 import org.hyperledger.besu.consensus.ibft.payload.RoundChangePayload;
 import org.hyperledger.besu.consensus.ibft.statemachine.PreparedRoundArtifacts;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 
 import java.util.Arrays;
@@ -72,7 +72,7 @@ public void clearReceivedMessages() {
     peers.forEach(ValidatorPeer::clearReceivedMessages);
   }
 
-  public List<Signature> sign(final Hash digest) {
+  public List<SECPSignature> sign(final Hash digest) {
     return peers.stream().map(peer -> peer.getBlockSignature(digest)).collect(Collectors.toList());
   }
 
diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/TestContext.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/TestContext.java
index 329fe5afbfa..fdd229c13ee 100644
--- a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/TestContext.java
+++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/TestContext.java
@@ -17,11 +17,12 @@
 import org.hyperledger.besu.consensus.common.bft.BftExecutors;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
 import org.hyperledger.besu.consensus.common.bft.EventMultiplexer;
+import org.hyperledger.besu.consensus.common.bft.inttest.NodeParams;
 import org.hyperledger.besu.consensus.common.bft.statemachine.BftEventHandler;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftFinalState;
 import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
-import org.hyperledger.besu.consensus.ibft.statemachine.IbftFinalState;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 
@@ -43,22 +44,25 @@ public class TestContext {
   private final MutableBlockchain blockchain;
   private final BftExecutors bftExecutors;
   private final BftEventHandler controller;
-  private final IbftFinalState finalState;
+  private final BftFinalState finalState;
   private final EventMultiplexer eventMultiplexer;
+  private final MessageFactory messageFactory;
 
   public TestContext(
       final Map<Address, ValidatorPeer> remotePeers,
       final MutableBlockchain blockchain,
       final BftExecutors bftExecutors,
       final BftEventHandler controller,
-      final IbftFinalState finalState,
-      final EventMultiplexer eventMultiplexer) {
+      final BftFinalState finalState,
+      final EventMultiplexer eventMultiplexer,
+      final MessageFactory messageFactory) {
     this.remotePeers = remotePeers;
     this.blockchain = blockchain;
     this.bftExecutors = bftExecutors;
     this.controller = controller;
     this.finalState = finalState;
     this.eventMultiplexer = eventMultiplexer;
+    this.messageFactory = messageFactory;
   }
 
   public void start() {
@@ -79,12 +83,16 @@ public EventMultiplexer getEventMultiplexer() {
   }
 
   public MessageFactory getLocalNodeMessageFactory() {
-    return finalState.getMessageFactory();
+    return messageFactory;
   }
 
   public Block createBlockForProposal(
       final BlockHeader parent, final int round, final long timestamp) {
-    return finalState.getBlockCreatorFactory().create(parent, round).createBlock(timestamp);
+    return finalState
+        .getBlockCreatorFactory()
+        .create(parent, round)
+        .createBlock(timestamp)
+        .getBlock();
   }
 
   public Block createBlockForProposalFromChainHead(final int round, final long timestamp) {
diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/TestContextBuilder.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/TestContextBuilder.java
index 7abed47cb65..7d7778410cb 100644
--- a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/TestContextBuilder.java
+++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/TestContextBuilder.java
@@ -15,61 +15,71 @@
 package org.hyperledger.besu.consensus.ibft.support;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
 import static org.mockito.Mockito.mock;
 
+import org.hyperledger.besu.config.BftConfigOptions;
+import org.hyperledger.besu.config.BftFork;
 import org.hyperledger.besu.config.StubGenesisConfigOptions;
-import org.hyperledger.besu.consensus.common.BlockInterface;
 import org.hyperledger.besu.consensus.common.EpochManager;
-import org.hyperledger.besu.consensus.common.VoteProposer;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
-import org.hyperledger.besu.consensus.common.VoteTallyUpdater;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftContext;
 import org.hyperledger.besu.consensus.common.bft.BftEventQueue;
 import org.hyperledger.besu.consensus.common.bft.BftExecutors;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
+import org.hyperledger.besu.consensus.common.bft.BftProtocolSchedule;
 import org.hyperledger.besu.consensus.common.bft.BlockTimer;
 import org.hyperledger.besu.consensus.common.bft.EventMultiplexer;
 import org.hyperledger.besu.consensus.common.bft.Gossiper;
 import org.hyperledger.besu.consensus.common.bft.MessageTracker;
 import org.hyperledger.besu.consensus.common.bft.RoundTimer;
 import org.hyperledger.besu.consensus.common.bft.SynchronizerUpdater;
+import org.hyperledger.besu.consensus.common.bft.UniqueMessageMulticaster;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.BftBlockCreatorFactory;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.ProposerSelector;
+import org.hyperledger.besu.consensus.common.bft.inttest.DefaultValidatorPeer;
+import org.hyperledger.besu.consensus.common.bft.inttest.NetworkLayout;
+import org.hyperledger.besu.consensus.common.bft.inttest.NodeParams;
+import org.hyperledger.besu.consensus.common.bft.inttest.StubValidatorMulticaster;
+import org.hyperledger.besu.consensus.common.bft.inttest.StubbedSynchronizerUpdater;
+import org.hyperledger.besu.consensus.common.bft.inttest.TestTransitions;
 import org.hyperledger.besu.consensus.common.bft.statemachine.BftEventHandler;
-import org.hyperledger.besu.consensus.ibft.IbftBlockHeaderFunctions;
-import org.hyperledger.besu.consensus.ibft.IbftBlockInterface;
-import org.hyperledger.besu.consensus.ibft.IbftContext;
-import org.hyperledger.besu.consensus.ibft.IbftExtraData;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftFinalState;
+import org.hyperledger.besu.consensus.common.bft.statemachine.FutureMessageBuffer;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.common.validator.blockbased.BlockValidatorProvider;
+import org.hyperledger.besu.consensus.ibft.IbftExtraDataCodec;
+import org.hyperledger.besu.consensus.ibft.IbftForksSchedulesFactory;
 import org.hyperledger.besu.consensus.ibft.IbftGossip;
-import org.hyperledger.besu.consensus.ibft.IbftHelpers;
-import org.hyperledger.besu.consensus.ibft.IbftProtocolSchedule;
-import org.hyperledger.besu.consensus.ibft.UniqueMessageMulticaster;
-import org.hyperledger.besu.consensus.ibft.blockcreation.IbftBlockCreatorFactory;
-import org.hyperledger.besu.consensus.ibft.blockcreation.ProposerSelector;
+import org.hyperledger.besu.consensus.ibft.IbftProtocolScheduleBuilder;
 import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
-import org.hyperledger.besu.consensus.ibft.statemachine.FutureMessageBuffer;
 import org.hyperledger.besu.consensus.ibft.statemachine.IbftBlockHeightManagerFactory;
 import org.hyperledger.besu.consensus.ibft.statemachine.IbftController;
-import org.hyperledger.besu.consensus.ibft.statemachine.IbftFinalState;
 import org.hyperledger.besu.consensus.ibft.statemachine.IbftRoundFactory;
 import org.hyperledger.besu.consensus.ibft.validation.MessageValidatorFactory;
-import org.hyperledger.besu.crypto.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.Util;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.sorter.GasPricePendingTransactionsSorter;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.testutil.TestClock;
@@ -78,8 +88,10 @@
 import java.time.Clock;
 import java.time.Instant;
 import java.time.ZoneId;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -96,18 +108,21 @@ private static class ControllerAndState {
 
     private final BftExecutors bftExecutors;
     private final BftEventHandler eventHandler;
-    private final IbftFinalState finalState;
+    private final BftFinalState finalState;
     private final EventMultiplexer eventMultiplexer;
+    private final MessageFactory messageFactory;
 
     public ControllerAndState(
         final BftExecutors bftExecutors,
         final BftEventHandler eventHandler,
-        final IbftFinalState finalState,
-        final EventMultiplexer eventMultiplexer) {
+        final BftFinalState finalState,
+        final EventMultiplexer eventMultiplexer,
+        final MessageFactory messageFactory) {
       this.bftExecutors = bftExecutors;
       this.eventHandler = eventHandler;
       this.finalState = finalState;
       this.eventMultiplexer = eventMultiplexer;
+      this.messageFactory = messageFactory;
     }
 
     public BftExecutors getIbftExecutors() {
@@ -118,13 +133,17 @@ public BftEventHandler getEventHandler() {
       return eventHandler;
     }
 
-    public IbftFinalState getFinalState() {
+    public BftFinalState getFinalState() {
       return finalState;
     }
 
     public EventMultiplexer getEventMultiplexer() {
       return eventMultiplexer;
     }
+
+    public MessageFactory getMessageFactory() {
+      return messageFactory;
+    }
   }
 
   public static final int EPOCH_LENGTH = 10_000;
@@ -141,13 +160,15 @@ public EventMultiplexer getEventMultiplexer() {
   private int validatorCount = 4;
   private int indexOfFirstLocallyProposedBlock = 0; // Meaning first block is from remote peer.
   private boolean useGossip = false;
+  private List<BftFork> bftForks = Collections.emptyList();
+  private static final IbftExtraDataCodec IBFT_EXTRA_DATA_ENCODER = new IbftExtraDataCodec();
 
   public TestContextBuilder clock(final Clock clock) {
     this.clock = clock;
     return this;
   }
 
-  public TestContextBuilder ibftEventQueue(final BftEventQueue bftEventQueue) {
+  public TestContextBuilder eventQueue(final BftEventQueue bftEventQueue) {
     this.bftEventQueue = bftEventQueue;
     return this;
   }
@@ -168,13 +189,20 @@ public TestContextBuilder useGossip(final boolean useGossip) {
     return this;
   }
 
+  public TestContextBuilder bftForks(final List<BftFork> bftForks) {
+    this.bftForks = bftForks;
+    return this;
+  }
+
   public TestContext build() {
     final NetworkLayout networkNodes =
         NetworkLayout.createNetworkLayout(validatorCount, indexOfFirstLocallyProposedBlock);
 
     final Block genesisBlock = createGenesisBlock(networkNodes.getValidatorAddresses());
+
     final MutableBlockchain blockChain =
-        createInMemoryBlockchain(genesisBlock, IbftBlockHeaderFunctions.forOnChainBlock());
+        createInMemoryBlockchain(
+            genesisBlock, BftBlockHeaderFunctions.forOnchainBlock(IBFT_EXTRA_DATA_ENCODER));
 
     // Use a stubbed version of the multicaster, to prevent creating PeerConnections etc.
     final StubValidatorMulticaster multicaster = new StubValidatorMulticaster();
@@ -193,7 +221,8 @@ public TestContext build() {
             clock,
             bftEventQueue,
             gossiper,
-            synchronizerUpdater);
+            synchronizerUpdater,
+            bftForks);
 
     // Add each networkNode to the Multicaster (such that each can receive msgs from local node).
     // NOTE: the remotePeers needs to be ordered based on Address (as this is used to determine
@@ -213,8 +242,9 @@ public TestContext build() {
                     },
                     LinkedHashMap::new));
 
-    multicaster.addNetworkPeers(remotePeers.values());
-    synchronizerUpdater.addNetworkPeers(remotePeers.values());
+    final List<DefaultValidatorPeer> peerCollection = new ArrayList<>(remotePeers.values());
+    multicaster.addNetworkPeers(peerCollection);
+    synchronizerUpdater.addNetworkPeers(peerCollection);
 
     return new TestContext(
         remotePeers,
@@ -222,7 +252,8 @@ public TestContext build() {
         controllerAndState.getIbftExecutors(),
         controllerAndState.getEventHandler(),
         controllerAndState.getFinalState(),
-        controllerAndState.getEventMultiplexer());
+        controllerAndState.getEventMultiplexer(),
+        controllerAndState.getMessageFactory());
   }
 
   public TestContext buildAndStart() {
@@ -234,11 +265,11 @@ public TestContext buildAndStart() {
   private static Block createGenesisBlock(final Set<Address> validators) {
     final Address coinbase = Iterables.get(validators, 0);
     final BlockHeaderTestFixture headerTestFixture = new BlockHeaderTestFixture();
-    final IbftExtraData extraData =
-        new IbftExtraData(
+    final BftExtraData extraData =
+        new BftExtraData(
             Bytes.wrap(new byte[32]), Collections.emptyList(), Optional.empty(), 0, validators);
-    headerTestFixture.extraData(extraData.encode());
-    headerTestFixture.mixHash(IbftHelpers.EXPECTED_MIX_HASH);
+    headerTestFixture.extraData(IBFT_EXTRA_DATA_ENCODER.encode(extraData));
+    headerTestFixture.mixHash(BftHelpers.EXPECTED_MIX_HASH);
     headerTestFixture.difficulty(Difficulty.ONE);
     headerTestFixture.ommersHash(Hash.EMPTY_LIST_HASH);
     headerTestFixture.nonce(0);
@@ -259,83 +290,87 @@ private static ControllerAndState createControllerAndFinalState(
       final Clock clock,
       final BftEventQueue bftEventQueue,
       final Gossiper gossiper,
-      final SynchronizerUpdater synchronizerUpdater) {
+      final SynchronizerUpdater synchronizerUpdater,
+      final List<BftFork> bftForks) {
 
     final WorldStateArchive worldStateArchive = createInMemoryWorldStateArchive();
 
     final MiningParameters miningParams =
-        new MiningParameters(
-            AddressHelpers.ofValue(1),
-            Wei.ZERO,
-            Bytes.wrap("Ibft Int tests".getBytes(UTF_8)),
-            true);
+        new MiningParameters.Builder()
+            .coinbase(AddressHelpers.ofValue(1))
+            .minTransactionGasPrice(Wei.ZERO)
+            .extraData(Bytes.wrap("Ibft Int tests".getBytes(UTF_8)))
+            .miningEnabled(true)
+            .build();
 
     final StubGenesisConfigOptions genesisConfigOptions = new StubGenesisConfigOptions();
     genesisConfigOptions.byzantiumBlock(0);
+    genesisConfigOptions.transitions(TestTransitions.createIbftTestTransitions(bftForks));
+
+    final ForksSchedule<BftConfigOptions> forksSchedule =
+        IbftForksSchedulesFactory.create(genesisConfigOptions);
 
-    final ProtocolSchedule protocolSchedule = IbftProtocolSchedule.create(genesisConfigOptions);
+    final BftProtocolSchedule protocolSchedule =
+        IbftProtocolScheduleBuilder.create(
+            genesisConfigOptions, forksSchedule, IBFT_EXTRA_DATA_ENCODER, EvmConfiguration.DEFAULT);
 
     /////////////////////////////////////////////////////////////////////////////////////
     // From here down is BASICALLY taken from IbftBesuController
     final EpochManager epochManager = new EpochManager(EPOCH_LENGTH);
 
-    final BlockInterface blockInterface = new IbftBlockInterface();
+    final BftBlockInterface blockInterface = new BftBlockInterface(IBFT_EXTRA_DATA_ENCODER);
 
-    final VoteTallyCache voteTallyCache =
-        new VoteTallyCache(
-            blockChain,
-            new VoteTallyUpdater(epochManager, blockInterface),
-            epochManager,
-            new IbftBlockInterface());
-
-    final VoteProposer voteProposer = new VoteProposer();
+    final ValidatorProvider validatorProvider =
+        BlockValidatorProvider.nonForkingValidatorProvider(
+            blockChain, epochManager, blockInterface);
 
     final ProtocolContext protocolContext =
         new ProtocolContext(
             blockChain,
             worldStateArchive,
-            new IbftContext(voteTallyCache, voteProposer, epochManager, blockInterface));
+            new BftContext(validatorProvider, epochManager, blockInterface),
+            Optional.empty());
 
-    final PendingTransactions pendingTransactions =
-        new PendingTransactions(
-            TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
-            1,
-            1,
+    final GasPricePendingTransactionsSorter pendingTransactions =
+        new GasPricePendingTransactionsSorter(
+            ImmutableTransactionPoolConfiguration.builder().txPoolMaxSize(1).build(),
             clock,
             metricsSystem,
-            blockChain::getChainHeadHeader,
-            TransactionPoolConfiguration.DEFAULT_PRICE_BUMP);
+            blockChain::getChainHeadHeader);
 
     final Address localAddress = Util.publicKeyToAddress(nodeKey.getPublicKey());
-    final IbftBlockCreatorFactory blockCreatorFactory =
-        new IbftBlockCreatorFactory(
-            (gasLimit) -> gasLimit,
+    final BftBlockCreatorFactory<?> blockCreatorFactory =
+        new BftBlockCreatorFactory<>(
             pendingTransactions, // changed from IbftBesuController
             protocolContext,
             protocolSchedule,
+            forksSchedule,
             miningParams,
             localAddress,
-            localAddress);
+            IBFT_EXTRA_DATA_ENCODER);
 
     final ProposerSelector proposerSelector =
-        new ProposerSelector(blockChain, blockInterface, true, voteTallyCache);
+        new ProposerSelector(blockChain, blockInterface, true, validatorProvider);
 
-    final BftExecutors bftExecutors = BftExecutors.create(new NoOpMetricsSystem());
-    final IbftFinalState finalState =
-        new IbftFinalState(
-            protocolContext.getConsensusState(IbftContext.class).getVoteTallyCache(),
+    final BftExecutors bftExecutors =
+        BftExecutors.create(new NoOpMetricsSystem(), BftExecutors.ConsensusType.IBFT);
+    final BftFinalState finalState =
+        new BftFinalState(
+            protocolContext.getConsensusContext(BftContext.class).getValidatorProvider(),
             nodeKey,
             Util.publicKeyToAddress(nodeKey.getPublicKey()),
             proposerSelector,
             multicaster,
-            new RoundTimer(bftEventQueue, ROUND_TIMER_SEC * 1000, bftExecutors),
-            new BlockTimer(bftEventQueue, BLOCK_TIMER_SEC * 1000, bftExecutors, TestClock.fixed()),
+            new RoundTimer(bftEventQueue, ROUND_TIMER_SEC, bftExecutors),
+            new BlockTimer(bftEventQueue, forksSchedule, bftExecutors, TestClock.fixed()),
             blockCreatorFactory,
-            new MessageFactory(nodeKey),
             clock);
 
+    final MessageFactory messageFactory = new MessageFactory(nodeKey);
+
     final MessageValidatorFactory messageValidatorFactory =
-        new MessageValidatorFactory(proposerSelector, protocolSchedule, protocolContext);
+        new MessageValidatorFactory(
+            proposerSelector, protocolSchedule, protocolContext, IBFT_EXTRA_DATA_ENCODER);
 
     final Subscribers<MinedBlockObserver> minedBlockObservers = Subscribers.create();
 
@@ -357,8 +392,11 @@ private static ControllerAndState createControllerAndFinalState(
                     protocolContext,
                     protocolSchedule,
                     minedBlockObservers,
-                    messageValidatorFactory),
-                messageValidatorFactory),
+                    messageValidatorFactory,
+                    messageFactory,
+                    IBFT_EXTRA_DATA_ENCODER),
+                messageValidatorFactory,
+                messageFactory),
             gossiper,
             duplicateMessageTracker,
             futureMessageBuffer,
@@ -367,6 +405,7 @@ private static ControllerAndState createControllerAndFinalState(
     final EventMultiplexer eventMultiplexer = new EventMultiplexer(ibftController);
     //////////////////////////// END IBFT BesuController ////////////////////////////
 
-    return new ControllerAndState(bftExecutors, ibftController, finalState, eventMultiplexer);
+    return new ControllerAndState(
+        bftExecutors, ibftController, finalState, eventMultiplexer, messageFactory);
   }
 }
diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/ValidatorPeer.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/ValidatorPeer.java
index 267e76004e7..5431558b280 100644
--- a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/ValidatorPeer.java
+++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/support/ValidatorPeer.java
@@ -14,11 +14,10 @@
  */
 package org.hyperledger.besu.consensus.ibft.support;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
 import org.hyperledger.besu.consensus.common.bft.EventMultiplexer;
-import org.hyperledger.besu.consensus.common.bft.events.BftEvents;
+import org.hyperledger.besu.consensus.common.bft.inttest.DefaultValidatorPeer;
+import org.hyperledger.besu.consensus.common.bft.inttest.NodeParams;
 import org.hyperledger.besu.consensus.ibft.messagedata.CommitMessageData;
 import org.hyperledger.besu.consensus.ibft.messagedata.PrepareMessageData;
 import org.hyperledger.besu.consensus.ibft.messagedata.ProposalMessageData;
@@ -30,56 +29,23 @@
 import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
 import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate;
 import org.hyperledger.besu.consensus.ibft.statemachine.PreparedRoundArtifacts;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
-import org.hyperledger.besu.ethereum.p2p.rlpx.wire.DefaultMessage;
-import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.Optional;
 
-import com.google.common.collect.Lists;
-import org.apache.tuweni.bytes.Bytes;
-
 // Each "inject" function returns the SignedPayload representation of the transmitted message.
-public class ValidatorPeer {
+public class ValidatorPeer extends DefaultValidatorPeer {
 
-  private final Address nodeAddress;
-  private final NodeKey nodeKey;
   private final MessageFactory messageFactory;
-  private final PeerConnection peerConnection;
-  private final List<MessageData> receivedMessages = Lists.newArrayList();
-
-  private final EventMultiplexer localEventMultiplexer;
-  private long estimatedChainHeight = 0;
 
   public ValidatorPeer(
       final NodeParams nodeParams,
       final MessageFactory messageFactory,
       final EventMultiplexer localEventMultiplexer) {
-    this.nodeKey = nodeParams.getNodeKey();
-    this.nodeAddress = nodeParams.getAddress();
+    super(nodeParams, localEventMultiplexer);
     this.messageFactory = messageFactory;
-    final Bytes nodeId = nodeKey.getPublicKey().getEncodedBytes();
-    this.peerConnection = StubbedPeerConnection.create(nodeId);
-    this.localEventMultiplexer = localEventMultiplexer;
-  }
-
-  public Address getNodeAddress() {
-    return nodeAddress;
-  }
-
-  public NodeKey getnodeKey() {
-    return nodeKey;
-  }
-
-  public PeerConnection getPeerConnection() {
-    return peerConnection;
   }
 
   public Proposal injectProposal(final ConsensusRoundIdentifier rId, final Block block) {
@@ -95,18 +61,14 @@ public Prepare injectPrepare(final ConsensusRoundIdentifier rId, final Hash dige
     return payload;
   }
 
-  public Signature getBlockSignature(final Hash digest) {
-    return nodeKey.sign(digest);
-  }
-
   public Commit injectCommit(final ConsensusRoundIdentifier rId, final Hash digest) {
-    final Signature commitSeal = nodeKey.sign(digest);
+    final SECPSignature commitSeal = nodeKey.sign(digest);
 
     return injectCommit(rId, digest, commitSeal);
   }
 
   public Commit injectCommit(
-      final ConsensusRoundIdentifier rId, final Hash digest, final Signature commitSeal) {
+      final ConsensusRoundIdentifier rId, final Hash digest, final SECPSignature commitSeal) {
     final Commit payload = messageFactory.createCommit(rId, digest, commitSeal);
     injectMessage(CommitMessageData.create(payload));
     return payload;
@@ -131,32 +93,7 @@ public RoundChange injectRoundChange(
     return payload;
   }
 
-  public void handleReceivedMessage(final MessageData message) {
-    receivedMessages.add(message);
-  }
-
-  public List<MessageData> getReceivedMessages() {
-    return Collections.unmodifiableList(receivedMessages);
-  }
-
-  public void clearReceivedMessages() {
-    receivedMessages.clear();
-  }
-
-  public void injectMessage(final MessageData msgData) {
-    final DefaultMessage message = new DefaultMessage(peerConnection, msgData);
-    localEventMultiplexer.handleBftEvent(BftEvents.fromMessage(message));
-  }
-
   public MessageFactory getMessageFactory() {
     return messageFactory;
   }
-
-  public void updateEstimatedChainHeight(final long estimatedChainHeight) {
-    this.estimatedChainHeight = estimatedChainHeight;
-  }
-
-  public void verifyEstimatedChainHeightEquals(final long expectedChainHeight) {
-    assertThat(estimatedChainHeight).isEqualTo(expectedChainHeight);
-  }
 }
diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/FutureHeightTest.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/FutureHeightTest.java
index 57277c99dd2..2857deecb48 100644
--- a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/FutureHeightTest.java
+++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/FutureHeightTest.java
@@ -18,9 +18,11 @@
 import static org.assertj.core.util.Lists.emptyList;
 import static org.hyperledger.besu.consensus.ibft.support.IntegrationTestHelpers.createSignedCommitPayload;
 
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
 import org.hyperledger.besu.consensus.common.bft.events.NewChainHead;
-import org.hyperledger.besu.consensus.ibft.IbftHelpers;
+import org.hyperledger.besu.consensus.ibft.IbftExtraDataCodec;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare;
 import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
@@ -33,7 +35,7 @@
 import java.time.Instant;
 import java.time.ZoneId;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class FutureHeightTest {
 
@@ -57,12 +59,14 @@ public class FutureHeightTest {
   private final ConsensusRoundIdentifier futureHeightRoundId = new ConsensusRoundIdentifier(2, 0);
 
   private final MessageFactory localNodeMessageFactory = context.getLocalNodeMessageFactory();
+  private final BftExtraDataCodec bftExtraDataCodec = new IbftExtraDataCodec();
 
   @Test
   public void messagesForFutureHeightAreBufferedUntilChainHeightCatchesUp() {
     final Block currentHeightBlock = context.createBlockForProposalFromChainHead(0, 30);
     final Block signedCurrentHeightBlock =
-        IbftHelpers.createSealedBlock(currentHeightBlock, peers.sign(currentHeightBlock.getHash()));
+        BftHelpers.createSealedBlock(
+            bftExtraDataCodec, currentHeightBlock, 0, peers.sign(currentHeightBlock.getHash()));
 
     final Block futureHeightBlock =
         context.createBlockForProposal(signedCurrentHeightBlock.getHeader(), 0, 60);
@@ -109,7 +113,8 @@ public void messagesForFutureHeightAreBufferedUntilChainHeightCatchesUp() {
   public void messagesFromPreviousHeightAreDiscarded() {
     final Block currentHeightBlock = context.createBlockForProposalFromChainHead(0, 30);
     final Block signedCurrentHeightBlock =
-        IbftHelpers.createSealedBlock(currentHeightBlock, peers.sign(currentHeightBlock.getHash()));
+        BftHelpers.createSealedBlock(
+            bftExtraDataCodec, currentHeightBlock, 0, peers.sign(currentHeightBlock.getHash()));
 
     peers.getProposer().injectProposal(roundId, currentHeightBlock);
     peers.getNonProposing(0).injectPrepare(roundId, currentHeightBlock.getHash());
@@ -163,12 +168,14 @@ public void multipleNewChainHeadEventsDoesNotRestartCurrentHeightManager() {
   public void correctMessagesAreExtractedFromFutureHeightBuffer() {
     final Block currentHeightBlock = context.createBlockForProposalFromChainHead(0, 30);
     final Block signedCurrentHeightBlock =
-        IbftHelpers.createSealedBlock(currentHeightBlock, peers.sign(currentHeightBlock.getHash()));
+        BftHelpers.createSealedBlock(
+            bftExtraDataCodec, currentHeightBlock, 0, peers.sign(currentHeightBlock.getHash()));
 
     final Block nextHeightBlock =
         context.createBlockForProposal(signedCurrentHeightBlock.getHeader(), 0, 60);
     final Block signedNextHeightBlock =
-        IbftHelpers.createSealedBlock(nextHeightBlock, peers.sign(nextHeightBlock.getHash()));
+        BftHelpers.createSealedBlock(
+            bftExtraDataCodec, nextHeightBlock, 0, peers.sign(nextHeightBlock.getHash()));
 
     final Block futureHeightBlock =
         context.createBlockForProposal(signedNextHeightBlock.getHeader(), 0, 90);
diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/FutureRoundTest.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/FutureRoundTest.java
index 8965dac1001..d0a8e4302eb 100644
--- a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/FutureRoundTest.java
+++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/FutureRoundTest.java
@@ -16,8 +16,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
-import org.hyperledger.besu.consensus.ibft.IbftHelpers;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare;
 import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
@@ -31,7 +31,7 @@
 import java.time.Instant;
 import java.time.ZoneId;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class FutureRoundTest {
 
@@ -61,7 +61,7 @@ public class FutureRoundTest {
   public void messagesForFutureRoundAreNotActionedUntilRoundIsActive() {
     final Block futureBlock =
         context.createBlockForProposalFromChainHead(futureRoundId.getRoundNumber(), 60);
-    final int quorum = IbftHelpers.calculateRequiredValidatorQuorum(NETWORK_SIZE);
+    final int quorum = BftHelpers.calculateRequiredValidatorQuorum(NETWORK_SIZE);
     final ConsensusRoundIdentifier subsequentRoundId = new ConsensusRoundIdentifier(1, 6);
     final RoundSpecificPeers subsequentRoles = context.roundSpecificPeers(subsequentRoundId);
 
diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/GossipTest.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/GossipTest.java
index 65c5309b8da..d2658e4d647 100644
--- a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/GossipTest.java
+++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/GossipTest.java
@@ -17,9 +17,10 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
 import org.hyperledger.besu.consensus.common.bft.events.NewChainHead;
-import org.hyperledger.besu.consensus.ibft.IbftHelpers;
+import org.hyperledger.besu.consensus.ibft.IbftExtraDataCodec;
 import org.hyperledger.besu.consensus.ibft.messagedata.ProposalMessageData;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare;
@@ -31,7 +32,7 @@
 import org.hyperledger.besu.consensus.ibft.support.TestContext;
 import org.hyperledger.besu.consensus.ibft.support.TestContextBuilder;
 import org.hyperledger.besu.consensus.ibft.support.ValidatorPeer;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
 import org.hyperledger.besu.ethereum.core.Block;
 
 import java.time.Clock;
@@ -39,8 +40,8 @@
 import java.time.ZoneId;
 import java.util.Optional;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class GossipTest {
 
@@ -64,7 +65,7 @@ public class GossipTest {
   private ValidatorPeer sender;
   private MessageFactory msgFactory;
 
-  @Before
+  @BeforeEach
   public void setup() {
     block = context.createBlockForProposalFromChainHead(roundId.getRoundNumber(), 30);
     sender = peers.getProposer();
@@ -158,7 +159,8 @@ public void previousHeightMessageIsNotGossiped() {
   @Test
   public void futureMessageGetGossipedLater() {
     final Block signedCurrentHeightBlock =
-        IbftHelpers.createSealedBlock(block, peers.sign(block.getHash()));
+        BftHelpers.createSealedBlock(
+            new IbftExtraDataCodec(), block, 0, peers.sign(block.getHash()));
 
     ConsensusRoundIdentifier futureRoundId = new ConsensusRoundIdentifier(2, 0);
     Prepare futurePrepare = sender.injectPrepare(futureRoundId, block.getHash());
diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/LocalNodeIsProposerTest.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/LocalNodeIsProposerTest.java
index f172d1b1ba1..2dd935789a3 100644
--- a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/LocalNodeIsProposerTest.java
+++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/LocalNodeIsProposerTest.java
@@ -34,8 +34,8 @@
 import java.time.ZoneId;
 import java.util.Optional;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * These tests assume the basic function of the Ibft Round State Machine has been proven via the
@@ -65,7 +65,7 @@ public class LocalNodeIsProposerTest {
   private Proposal expectedTxProposal;
   private Commit expectedTxCommit;
 
-  @Before
+  @BeforeEach
   public void setup() {
     expectedProposedBlock = context.createBlockForProposalFromChainHead(0, blockTimeStamp);
     expectedTxProposal =
diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/LocalNodeNotProposerTest.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/LocalNodeNotProposerTest.java
index aa18d24965f..2b95eb5f082 100644
--- a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/LocalNodeNotProposerTest.java
+++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/LocalNodeNotProposerTest.java
@@ -26,8 +26,8 @@
 import org.hyperledger.besu.consensus.ibft.support.TestContextBuilder;
 import org.hyperledger.besu.ethereum.core.Block;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class LocalNodeNotProposerTest {
 
@@ -50,7 +50,7 @@ public class LocalNodeNotProposerTest {
   private Prepare expectedTxPrepare;
   private Commit expectedTxCommit;
 
-  @Before
+  @BeforeEach
   public void setup() {
     expectedTxPrepare = localNodeMessageFactory.createPrepare(roundId, blockToPropose.getHash());
 
diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/ReceivedFutureProposalTest.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/ReceivedFutureProposalTest.java
index 95db51b71f1..c2dbfaaeac8 100644
--- a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/ReceivedFutureProposalTest.java
+++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/ReceivedFutureProposalTest.java
@@ -33,7 +33,7 @@
 
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Ensure the Ibft component responds appropriately when a future round Proposal message is
diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/RoundChangeTest.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/RoundChangeTest.java
index 0217e10b207..9dcc8f7b216 100644
--- a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/RoundChangeTest.java
+++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/RoundChangeTest.java
@@ -18,10 +18,10 @@
 import static java.util.Optional.empty;
 import static org.hyperledger.besu.consensus.ibft.support.IntegrationTestHelpers.createValidPreparedRoundArtifacts;
 
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
 import org.hyperledger.besu.consensus.common.bft.events.RoundExpiry;
 import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
-import org.hyperledger.besu.consensus.ibft.IbftHelpers;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange;
@@ -42,7 +42,7 @@
 import java.util.Optional;
 
 import com.google.common.collect.Lists;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class RoundChangeTest {
 
@@ -241,7 +241,7 @@ public void multipleRoundChangeMessagesFromSamePeerDoesNotTriggerRoundChange() {
 
     final ValidatorPeer transmitter = peers.getNonProposing(0);
 
-    for (int i = 0; i < IbftHelpers.calculateRequiredValidatorQuorum(NETWORK_SIZE); i++) {
+    for (int i = 0; i < BftHelpers.calculateRequiredValidatorQuorum(NETWORK_SIZE); i++) {
       transmitter.injectRoundChange(targetRound, empty());
     }
 
@@ -326,9 +326,7 @@ public void illegallyConstructedRoundChangeMessageIsDiscarded() {
                 .createProposal(roundId, blockToPropose, Optional.empty()),
             emptyList());
 
-    peers
-        .getNonProposing(2)
-        .injectRoundChange(targetRound, Optional.of(illegalPreparedRoundArtifacts));
+    peers.getProposer().injectRoundChange(targetRound, Optional.of(illegalPreparedRoundArtifacts));
 
     // Ensure no Proposal message is sent.
     peers.verifyNoMessagesReceived();
diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/SpuriousBehaviourTest.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/SpuriousBehaviourTest.java
index 80e8f86cb39..5b65d642906 100644
--- a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/SpuriousBehaviourTest.java
+++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/SpuriousBehaviourTest.java
@@ -18,20 +18,20 @@
 import static org.hyperledger.besu.consensus.ibft.support.IntegrationTestHelpers.createSignedCommitPayload;
 
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.inttest.NodeParams;
 import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare;
 import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
-import org.hyperledger.besu.consensus.ibft.support.NodeParams;
 import org.hyperledger.besu.consensus.ibft.support.RoundSpecificPeers;
 import org.hyperledger.besu.consensus.ibft.support.TestContext;
 import org.hyperledger.besu.consensus.ibft.support.TestContextBuilder;
 import org.hyperledger.besu.consensus.ibft.support.ValidatorPeer;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Util;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage;
@@ -41,8 +41,8 @@
 import java.time.ZoneId;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class SpuriousBehaviourTest {
 
@@ -67,7 +67,7 @@ public class SpuriousBehaviourTest {
   private Prepare expectedPrepare;
   private Commit expectedCommit;
 
-  @Before
+  @BeforeEach
   public void setup() {
 
     expectedPrepare =
@@ -145,7 +145,7 @@ public void oneCommitSealIsIllegalPreventsImport() {
 
     // nonProposer-2 will generate an invalid seal
     final ValidatorPeer badSealPeer = peers.getNonProposing(2);
-    final Signature illegalSeal = badSealPeer.getnodeKey().sign(Hash.ZERO);
+    final SECPSignature illegalSeal = badSealPeer.getnodeKey().sign(Hash.ZERO);
 
     badSealPeer.injectCommit(roundId, proposedBlock.getHash(), illegalSeal);
     assertThat(context.getCurrentChainHeight()).isEqualTo(0);
diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/TransitionsTest.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/TransitionsTest.java
new file mode 100644
index 00000000000..9b4b03f6564
--- /dev/null
+++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/TransitionsTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.ibft.tests;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.config.BftFork;
+import org.hyperledger.besu.config.JsonUtil;
+import org.hyperledger.besu.consensus.common.bft.BftEventQueue;
+import org.hyperledger.besu.consensus.common.bft.events.NewChainHead;
+import org.hyperledger.besu.consensus.ibft.support.TestContext;
+import org.hyperledger.besu.consensus.ibft.support.TestContextBuilder;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.testutil.TestClock;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.Test;
+
+public class TransitionsTest {
+
+  @Test
+  public void transitionsBlockPeriod() throws InterruptedException {
+    final TestClock clock = new TestClock(Instant.EPOCH);
+
+    final List<BftFork> bftForks =
+        List.of(
+            new BftFork(
+                JsonUtil.objectNodeFromMap(
+                    Map.of(BftFork.FORK_BLOCK_KEY, 1, BftFork.BLOCK_PERIOD_SECONDS_KEY, 10))),
+            new BftFork(
+                JsonUtil.objectNodeFromMap(
+                    Map.of(BftFork.FORK_BLOCK_KEY, 2, BftFork.BLOCK_PERIOD_SECONDS_KEY, 20))));
+
+    final BftEventQueue bftEventQueue = new BftEventQueue(TestContextBuilder.MESSAGE_QUEUE_LIMIT);
+    final TestContext context =
+        new TestContextBuilder()
+            .indexOfFirstLocallyProposedBlock(0)
+            .validatorCount(1)
+            .clock(clock)
+            .bftForks(bftForks)
+            .eventQueue(bftEventQueue)
+            .buildAndStart();
+
+    clock.stepMillis(10_000);
+    context.getEventMultiplexer().handleBftEvent(bftEventQueue.poll(1, TimeUnit.SECONDS));
+
+    context
+        .getController()
+        .handleNewBlockEvent(new NewChainHead(context.getBlockchain().getChainHeadHeader()));
+    clock.stepMillis(20_000);
+    context.getEventMultiplexer().handleBftEvent(bftEventQueue.poll(1, TimeUnit.SECONDS));
+
+    final BlockHeader genesisBlock = context.getBlockchain().getBlockHeader(0).get();
+    final BlockHeader blockHeader1 = context.getBlockchain().getBlockHeader(1).get();
+    final BlockHeader blockHeader2 = context.getBlockchain().getBlockHeader(2).get();
+
+    assertThat(blockHeader1.getTimestamp()).isEqualTo(genesisBlock.getTimestamp() + 10);
+    assertThat(blockHeader2.getTimestamp()).isEqualTo(blockHeader1.getTimestamp() + 20);
+  }
+}
diff --git a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/round/IbftRoundIntegrationTest.java b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/round/IbftRoundIntegrationTest.java
index c1c641bba1d..ff9c47ab38c 100644
--- a/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/round/IbftRoundIntegrationTest.java
+++ b/consensus/ibft/src/integration-test/java/org/hyperledger/besu/consensus/ibft/tests/round/IbftRoundIntegrationTest.java
@@ -17,25 +17,28 @@
 import static java.util.Collections.emptyList;
 import static java.util.Optional.empty;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.consensus.ibft.IbftContextBuilder.setupContextWithValidators;
+import static org.hyperledger.besu.consensus.common.bft.BftContextBuilder.setupContextWithBftExtraDataEncoder;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
 import org.hyperledger.besu.consensus.common.bft.RoundTimer;
-import org.hyperledger.besu.consensus.ibft.IbftExtraData;
-import org.hyperledger.besu.consensus.ibft.blockcreation.IbftBlockCreator;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.BftBlockCreator;
+import org.hyperledger.besu.consensus.common.bft.inttest.StubValidatorMulticaster;
+import org.hyperledger.besu.consensus.ibft.IbftExtraDataCodec;
 import org.hyperledger.besu.consensus.ibft.network.IbftMessageTransmitter;
 import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
 import org.hyperledger.besu.consensus.ibft.statemachine.IbftRound;
 import org.hyperledger.besu.consensus.ibft.statemachine.RoundState;
-import org.hyperledger.besu.consensus.ibft.support.StubValidatorMulticaster;
 import org.hyperledger.besu.consensus.ibft.validation.MessageValidator;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
@@ -44,7 +47,7 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.BlockImporter;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.mainnet.BlockImportResult;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 import org.hyperledger.besu.plugin.services.securitymodule.SecurityModuleException;
 import org.hyperledger.besu.util.Subscribers;
@@ -53,16 +56,20 @@
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class IbftRoundIntegrationTest {
 
   private final MessageFactory peerMessageFactory = new MessageFactory(NodeKeyUtils.generate());
+  private final MessageFactory peerMessageFactory2 = new MessageFactory(NodeKeyUtils.generate());
   private final ConsensusRoundIdentifier roundIdentifier = new ConsensusRoundIdentifier(1, 0);
   private final Subscribers<MinedBlockObserver> subscribers = Subscribers.create();
   private ProtocolContext protocolContext;
@@ -71,7 +78,7 @@ public class IbftRoundIntegrationTest {
   @Mock private WorldStateArchive worldStateArchive;
   @Mock private BlockImporter blockImporter;
 
-  @Mock private IbftBlockCreator blockCreator;
+  @Mock private BftBlockCreator blockCreator;
   @Mock private MessageValidator messageValidator;
   @Mock private RoundTimer roundTimer;
   @Mock private NodeKey nodeKey;
@@ -81,14 +88,13 @@ public class IbftRoundIntegrationTest {
 
   private Block proposedBlock;
 
-  private final Signature remoteCommitSeal =
-      Signature.create(BigInteger.ONE, BigInteger.ONE, (byte) 1);
+  private final SECPSignature remoteCommitSeal =
+      SignatureAlgorithmFactory.getInstance()
+          .createSignature(BigInteger.ONE, BigInteger.ONE, (byte) 1);
+  private final IbftExtraDataCodec bftExtraDataEncoder = new IbftExtraDataCodec();
 
-  @Before
+  @BeforeEach
   public void setup() {
-    protocolContext =
-        new ProtocolContext(blockChain, worldStateArchive, setupContextWithValidators(emptyList()));
-
     when(messageValidator.validateProposal(any())).thenReturn(true);
     when(messageValidator.validatePrepare(any())).thenReturn(true);
     when(messageValidator.validateCommit(any())).thenReturn(true);
@@ -98,15 +104,22 @@ public void setup() {
     throwingMessageFactory = new MessageFactory(nodeKey);
     transmitter = new IbftMessageTransmitter(throwingMessageFactory, multicaster);
 
-    IbftExtraData proposedExtraData =
-        new IbftExtraData(Bytes.wrap(new byte[32]), emptyList(), empty(), 0, emptyList());
+    final BftExtraData proposedExtraData =
+        new BftExtraData(Bytes.wrap(new byte[32]), emptyList(), empty(), 0, emptyList());
     final BlockHeaderTestFixture headerTestFixture = new BlockHeaderTestFixture();
-    headerTestFixture.extraData(proposedExtraData.encode());
+    headerTestFixture.extraData(bftExtraDataEncoder.encode(proposedExtraData));
     headerTestFixture.number(1);
     final BlockHeader header = headerTestFixture.buildHeader();
     proposedBlock = new Block(header, new BlockBody(emptyList(), emptyList()));
 
-    when(blockImporter.importBlock(any(), any(), any())).thenReturn(true);
+    when(blockImporter.importBlock(any(), any(), any())).thenReturn(new BlockImportResult(true));
+
+    protocolContext =
+        new ProtocolContext(
+            blockChain,
+            worldStateArchive,
+            setupContextWithBftExtraDataEncoder(emptyList(), bftExtraDataEncoder),
+            Optional.empty());
   }
 
   @Test
@@ -123,7 +136,8 @@ public void signingFailsOnReceiptOfProposalUpdatesRoundButTransmitsNothing() {
             nodeKey,
             throwingMessageFactory,
             transmitter,
-            roundTimer);
+            roundTimer,
+            bftExtraDataEncoder);
 
     round.handleProposalMessage(
         peerMessageFactory.createProposal(roundIdentifier, proposedBlock, Optional.empty()));
@@ -149,7 +163,8 @@ public void failuresToSignStillAllowBlockToBeImported() {
             nodeKey,
             throwingMessageFactory,
             transmitter,
-            roundTimer);
+            roundTimer,
+            bftExtraDataEncoder);
 
     // inject a block first, then a prepare on it.
     round.handleProposalMessage(
@@ -172,7 +187,7 @@ public void failuresToSignStillAllowBlockToBeImported() {
     verifyNoInteractions(multicaster);
 
     round.handleCommitMessage(
-        peerMessageFactory.createCommit(roundIdentifier, Hash.EMPTY, remoteCommitSeal));
+        peerMessageFactory2.createCommit(roundIdentifier, Hash.EMPTY, remoteCommitSeal));
     assertThat(roundState.isCommitted()).isTrue();
     verifyNoInteractions(multicaster);
 
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockHashing.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockHashing.java
deleted file mode 100644
index 372ebc3a8d6..00000000000
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockHashing.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Util;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
-
-import java.util.List;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public class IbftBlockHashing {
-
-  /**
-   * Constructs a hash of the block header suitable for signing as a committed seal. The extra data
-   * in the hash uses an empty list for the committed seals.
-   *
-   * @param header The header for which a proposer seal is to be calculated (with or without extra
-   *     data)
-   * @param ibftExtraData The extra data block which is to be inserted to the header once seal is
-   *     calculated
-   * @return the hash of the header including the validator and proposer seal in the extra data
-   */
-  public static Hash calculateDataHashForCommittedSeal(
-      final BlockHeader header, final IbftExtraData ibftExtraData) {
-    return Hash.hash(serializeHeader(header, ibftExtraData::encodeWithoutCommitSeals));
-  }
-
-  public static Hash calculateDataHashForCommittedSeal(final BlockHeader header) {
-    final IbftExtraData ibftExtraData = IbftExtraData.decode(header);
-    return Hash.hash(serializeHeader(header, ibftExtraData::encodeWithoutCommitSeals));
-  }
-
-  /**
-   * Constructs a hash of the block header, but omits the committerSeals and sets round number to 0
-   * (as these change on each of the potentially circulated blocks at the current chain height).
-   *
-   * @param header The header for which a block hash is to be calculated
-   * @return the hash of the header to be used when referencing the header on the blockchain
-   */
-  public static Hash calculateHashOfIbftBlockOnChain(final BlockHeader header) {
-    final IbftExtraData ibftExtraData = IbftExtraData.decode(header);
-    return Hash.hash(
-        serializeHeader(header, ibftExtraData::encodeWithoutCommitSealsAndRoundNumber));
-  }
-
-  /**
-   * Recovers the {@link Address} for each validator that contributed a committed seal to the block.
-   *
-   * @param header the block header that was signed by the committed seals
-   * @param ibftExtraData the parsed {@link IbftExtraData} from the header
-   * @return the addresses of validators that provided a committed seal
-   */
-  public static List<Address> recoverCommitterAddresses(
-      final BlockHeader header, final IbftExtraData ibftExtraData) {
-    final Hash committerHash =
-        IbftBlockHashing.calculateDataHashForCommittedSeal(header, ibftExtraData);
-
-    return ibftExtraData.getSeals().stream()
-        .map(p -> Util.signatureToAddress(p, committerHash))
-        .collect(Collectors.toList());
-  }
-
-  private static Bytes serializeHeader(
-      final BlockHeader header, final Supplier<Bytes> extraDataSerializer) {
-
-    // create a block header which is a copy of the header supplied as parameter except of the
-    // extraData field
-    final BlockHeaderBuilder builder = BlockHeaderBuilder.fromHeader(header);
-    builder.blockHeaderFunctions(IbftBlockHeaderFunctions.forOnChainBlock());
-
-    // set the extraData field using the supplied extraDataSerializer if the block height is not 0
-    if (header.getNumber() == BlockHeader.GENESIS_BLOCK_NUMBER) {
-      builder.extraData(header.getExtraData());
-    } else {
-      builder.extraData(extraDataSerializer.get());
-    }
-
-    final BytesValueRLPOutput out = new BytesValueRLPOutput();
-    builder.buildBlockHeader().writeTo(out);
-    return out.encoded();
-  }
-}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockHeaderFunctions.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockHeaderFunctions.java
deleted file mode 100644
index c147f4ae0c1..00000000000
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockHeaderFunctions.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft;
-
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
-import org.hyperledger.besu.ethereum.core.Hash;
-
-import java.util.function.Function;
-
-public class IbftBlockHeaderFunctions implements BlockHeaderFunctions {
-
-  private static final IbftBlockHeaderFunctions COMMITTED_SEAL =
-      new IbftBlockHeaderFunctions(IbftBlockHashing::calculateDataHashForCommittedSeal);
-  private static final IbftBlockHeaderFunctions ON_CHAIN =
-      new IbftBlockHeaderFunctions(IbftBlockHashing::calculateHashOfIbftBlockOnChain);
-
-  private final Function<BlockHeader, Hash> hashFunction;
-
-  private IbftBlockHeaderFunctions(final Function<BlockHeader, Hash> hashFunction) {
-    this.hashFunction = hashFunction;
-  }
-
-  public static BlockHeaderFunctions forOnChainBlock() {
-    return ON_CHAIN;
-  }
-
-  public static BlockHeaderFunctions forCommittedSeal() {
-    return COMMITTED_SEAL;
-  }
-
-  @Override
-  public Hash hash(final BlockHeader header) {
-    return hashFunction.apply(header);
-  }
-
-  @Override
-  public IbftExtraData parseExtraData(final BlockHeader header) {
-    return IbftExtraData.decodeRaw(header.getExtraData());
-  }
-}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockHeaderValidationRulesetFactory.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockHeaderValidationRulesetFactory.java
index bad86b26d59..398e1b518ff 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockHeaderValidationRulesetFactory.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockHeaderValidationRulesetFactory.java
@@ -14,12 +14,17 @@
  */
 package org.hyperledger.besu.consensus.ibft;
 
-import org.hyperledger.besu.consensus.ibft.headervalidationrules.IbftCoinbaseValidationRule;
-import org.hyperledger.besu.consensus.ibft.headervalidationrules.IbftCommitSealsValidationRule;
-import org.hyperledger.besu.consensus.ibft.headervalidationrules.IbftValidatorsValidationRule;
+import static org.hyperledger.besu.ethereum.mainnet.AbstractGasLimitSpecification.DEFAULT_MAX_GAS_LIMIT;
+import static org.hyperledger.besu.ethereum.mainnet.AbstractGasLimitSpecification.DEFAULT_MIN_GAS_LIMIT;
+
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
+import org.hyperledger.besu.consensus.common.bft.headervalidationrules.BftCoinbaseValidationRule;
+import org.hyperledger.besu.consensus.common.bft.headervalidationrules.BftCommitSealsValidationRule;
+import org.hyperledger.besu.consensus.common.bft.headervalidationrules.BftValidatorsValidationRule;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
 import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.AncestryValidationRule;
 import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.ConstantFieldValidationRule;
 import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.GasLimitRangeAndDeltaValidationRule;
@@ -27,28 +32,34 @@
 import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.TimestampBoundedByFutureParameter;
 import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.TimestampMoreRecentThanParent;
 
+import java.util.Optional;
+
 import org.apache.tuweni.units.bigints.UInt256;
 
+/** The Ibft block header validation ruleset factory. */
 public class IbftBlockHeaderValidationRulesetFactory {
 
   /**
-   * Produces a BlockHeaderValidator configured for assessing ibft block headers which are to form
+   * Produces a BlockHeaderValidator configured for assessing bft block headers which are to form
    * part of the BlockChain (i.e. not proposed blocks, which do not contain commit seals)
    *
    * @param secondsBetweenBlocks the minimum number of seconds which must elapse between blocks.
-   * @return BlockHeaderValidator configured for assessing ibft block headers
+   * @param baseFeeMarket an {@link Optional} wrapping {@link BaseFeeMarket} class if appropriate.
+   * @return BlockHeaderValidator configured for assessing bft block headers
    */
-  public static BlockHeaderValidator.Builder ibftBlockHeaderValidator(
-      final long secondsBetweenBlocks) {
+  public static BlockHeaderValidator.Builder blockHeaderValidator(
+      final long secondsBetweenBlocks, final Optional<BaseFeeMarket> baseFeeMarket) {
     return new BlockHeaderValidator.Builder()
         .addRule(new AncestryValidationRule())
         .addRule(new GasUsageValidationRule())
-        .addRule(new GasLimitRangeAndDeltaValidationRule(5000, 0x7fffffffffffffffL))
+        .addRule(
+            new GasLimitRangeAndDeltaValidationRule(
+                DEFAULT_MIN_GAS_LIMIT, DEFAULT_MAX_GAS_LIMIT, baseFeeMarket))
         .addRule(new TimestampBoundedByFutureParameter(1))
         .addRule(new TimestampMoreRecentThanParent(secondsBetweenBlocks))
         .addRule(
             new ConstantFieldValidationRule<>(
-                "MixHash", BlockHeader::getMixHash, IbftHelpers.EXPECTED_MIX_HASH))
+                "MixHash", BlockHeader::getMixHash, BftHelpers.EXPECTED_MIX_HASH))
         .addRule(
             new ConstantFieldValidationRule<>(
                 "OmmersHash", BlockHeader::getOmmersHash, Hash.EMPTY_LIST_HASH))
@@ -56,8 +67,8 @@ public static BlockHeaderValidator.Builder ibftBlockHeaderValidator(
             new ConstantFieldValidationRule<>(
                 "Difficulty", BlockHeader::getDifficulty, UInt256.ONE))
         .addRule(new ConstantFieldValidationRule<>("Nonce", BlockHeader::getNonce, 0L))
-        .addRule(new IbftValidatorsValidationRule())
-        .addRule(new IbftCoinbaseValidationRule())
-        .addRule(new IbftCommitSealsValidationRule());
+        .addRule(new BftValidatorsValidationRule())
+        .addRule(new BftCoinbaseValidationRule())
+        .addRule(new BftCommitSealsValidationRule());
   }
 }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockInterface.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockInterface.java
deleted file mode 100644
index 33e51d56b04..00000000000
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftBlockInterface.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft;
-
-import org.hyperledger.besu.consensus.common.BlockInterface;
-import org.hyperledger.besu.consensus.common.ValidatorVote;
-import org.hyperledger.besu.consensus.common.VoteType;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
-import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
-
-import java.util.Collection;
-import java.util.Optional;
-
-public class IbftBlockInterface implements BlockInterface {
-
-  @Override
-  public Address getProposerOfBlock(final BlockHeader header) {
-    return header.getCoinbase();
-  }
-
-  @Override
-  public Address getProposerOfBlock(final org.hyperledger.besu.plugin.data.BlockHeader header) {
-    return Address.fromHexString(header.getCoinbase().toHexString());
-  }
-
-  @Override
-  public Optional<ValidatorVote> extractVoteFromHeader(final BlockHeader header) {
-    final IbftExtraData ibftExtraData = IbftExtraData.decode(header);
-
-    if (ibftExtraData.getVote().isPresent()) {
-      final Vote headerVote = ibftExtraData.getVote().get();
-      final ValidatorVote vote =
-          new ValidatorVote(
-              headerVote.isAuth() ? VoteType.ADD : VoteType.DROP,
-              getProposerOfBlock(header),
-              headerVote.getRecipient());
-      return Optional.of(vote);
-    }
-    return Optional.empty();
-  }
-
-  @Override
-  public Collection<Address> validatorsInBlock(final BlockHeader header) {
-    final IbftExtraData ibftExtraData = IbftExtraData.decode(header);
-    return ibftExtraData.getValidators();
-  }
-
-  public static Block replaceRoundInBlock(
-      final Block block, final int round, final BlockHeaderFunctions blockHeaderFunctions) {
-    final IbftExtraData prevExtraData = IbftExtraData.decode(block.getHeader());
-    final IbftExtraData substituteExtraData =
-        new IbftExtraData(
-            prevExtraData.getVanityData(),
-            prevExtraData.getSeals(),
-            prevExtraData.getVote(),
-            round,
-            prevExtraData.getValidators());
-
-    final BlockHeaderBuilder headerBuilder = BlockHeaderBuilder.fromHeader(block.getHeader());
-    headerBuilder
-        .extraData(substituteExtraData.encode())
-        .blockHeaderFunctions(blockHeaderFunctions);
-
-    final BlockHeader newHeader = headerBuilder.buildBlockHeader();
-
-    return new Block(newHeader, block.getBody());
-  }
-}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftContext.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftContext.java
deleted file mode 100644
index 879d5b286e0..00000000000
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftContext.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft;
-
-import org.hyperledger.besu.consensus.common.BlockInterface;
-import org.hyperledger.besu.consensus.common.EpochManager;
-import org.hyperledger.besu.consensus.common.PoaContext;
-import org.hyperledger.besu.consensus.common.VoteProposer;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
-
-/** Holds the IBFT specific mutable state. */
-public class IbftContext implements PoaContext {
-
-  private final VoteTallyCache voteTallyCache;
-  private final VoteProposer voteProposer;
-  private final EpochManager epochManager;
-  private final BlockInterface blockInterface;
-
-  public IbftContext(
-      final VoteTallyCache voteTallyCache,
-      final VoteProposer voteProposer,
-      final EpochManager epochManager,
-      final BlockInterface blockInterface) {
-    this.voteTallyCache = voteTallyCache;
-    this.voteProposer = voteProposer;
-    this.epochManager = epochManager;
-    this.blockInterface = blockInterface;
-  }
-
-  public VoteTallyCache getVoteTallyCache() {
-    return voteTallyCache;
-  }
-
-  public VoteProposer getVoteProposer() {
-    return voteProposer;
-  }
-
-  public EpochManager getEpochManager() {
-    return epochManager;
-  }
-
-  @Override
-  public BlockInterface getBlockInterface() {
-    return blockInterface;
-  }
-}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftExtraData.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftExtraData.java
deleted file mode 100644
index 4db53d3e499..00000000000
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftExtraData.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.ParsedExtraData;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
-import org.hyperledger.besu.ethereum.rlp.RLPInput;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.StringJoiner;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-
-/**
- * Represents the data structure stored in the extraData field of the BlockHeader used when
- * operating under an IBFT 2.0 consensus mechanism.
- */
-public class IbftExtraData implements ParsedExtraData {
-  private static final Logger LOG = LogManager.getLogger();
-
-  public static final int EXTRA_VANITY_LENGTH = 32;
-
-  private final Bytes vanityData;
-  private final Collection<Signature> seals;
-  private final Optional<Vote> vote;
-  private final int round;
-  private final Collection<Address> validators;
-
-  public IbftExtraData(
-      final Bytes vanityData,
-      final Collection<Signature> seals,
-      final Optional<Vote> vote,
-      final int round,
-      final Collection<Address> validators) {
-
-    checkNotNull(vanityData);
-    checkNotNull(seals);
-    checkNotNull(validators);
-
-    this.vanityData = vanityData;
-    this.seals = seals;
-    this.round = round;
-    this.validators = validators;
-    this.vote = vote;
-  }
-
-  public static IbftExtraData fromAddresses(final Collection<Address> addresses) {
-    return new IbftExtraData(
-        Bytes.wrap(new byte[32]), Collections.emptyList(), Optional.empty(), 0, addresses);
-  }
-
-  public static IbftExtraData decode(final BlockHeader blockHeader) {
-    final Object inputExtraData = blockHeader.getParsedExtraData();
-    if (inputExtraData instanceof IbftExtraData) {
-      return (IbftExtraData) inputExtraData;
-    }
-    LOG.warn(
-        "Expected a IbftExtraData instance but got {}. Reparsing required.",
-        inputExtraData != null ? inputExtraData.getClass().getName() : "null");
-    return decodeRaw(blockHeader.getExtraData());
-  }
-
-  static IbftExtraData decodeRaw(final Bytes input) {
-    if (input.isEmpty()) {
-      throw new IllegalArgumentException("Invalid Bytes supplied - Ibft Extra Data required.");
-    }
-
-    final RLPInput rlpInput = new BytesValueRLPInput(input, false);
-
-    rlpInput.enterList(); // This accounts for the "root node" which contains IBFT data items.
-    final Bytes vanityData = rlpInput.readBytes();
-    final List<Address> validators = rlpInput.readList(Address::readFrom);
-    final Optional<Vote> vote;
-    if (rlpInput.nextIsNull()) {
-      vote = Optional.empty();
-      rlpInput.skipNext();
-    } else {
-      vote = Optional.of(Vote.readFrom(rlpInput));
-    }
-    final int round = rlpInput.readInt();
-    final List<Signature> seals = rlpInput.readList(rlp -> Signature.decode(rlp.readBytes()));
-    rlpInput.leaveList();
-
-    return new IbftExtraData(vanityData, seals, vote, round, validators);
-  }
-
-  public Bytes encode() {
-    return encode(EncodingType.ALL);
-  }
-
-  public Bytes encodeWithoutCommitSeals() {
-    return encode(EncodingType.EXCLUDE_COMMIT_SEALS);
-  }
-
-  public Bytes encodeWithoutCommitSealsAndRoundNumber() {
-    return encode(EncodingType.EXCLUDE_COMMIT_SEALS_AND_ROUND_NUMBER);
-  }
-
-  private enum EncodingType {
-    ALL,
-    EXCLUDE_COMMIT_SEALS,
-    EXCLUDE_COMMIT_SEALS_AND_ROUND_NUMBER
-  }
-
-  private Bytes encode(final EncodingType encodingType) {
-
-    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
-    encoder.startList();
-    encoder.writeBytes(vanityData);
-    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
-    if (vote.isPresent()) {
-      vote.get().writeTo(encoder);
-    } else {
-      encoder.writeNull();
-    }
-
-    if (encodingType != EncodingType.EXCLUDE_COMMIT_SEALS_AND_ROUND_NUMBER) {
-      encoder.writeInt(round);
-      if (encodingType != EncodingType.EXCLUDE_COMMIT_SEALS) {
-        encoder.writeList(seals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
-      }
-    }
-    encoder.endList();
-
-    return encoder.encoded();
-  }
-
-  public static String createGenesisExtraDataString(final List<Address> validators) {
-    final IbftExtraData extraData =
-        new IbftExtraData(
-            Bytes.wrap(new byte[32]), Collections.emptyList(), Optional.empty(), 0, validators);
-    return extraData.encode().toString();
-  }
-
-  // Accessors
-  public Bytes getVanityData() {
-    return vanityData;
-  }
-
-  public Collection<Signature> getSeals() {
-    return seals;
-  }
-
-  public Collection<Address> getValidators() {
-    return validators;
-  }
-
-  public Optional<Vote> getVote() {
-    return vote;
-  }
-
-  public int getRound() {
-    return round;
-  }
-
-  @Override
-  public String toString() {
-    return new StringJoiner(", ", IbftExtraData.class.getSimpleName() + "[", "]")
-        .add("vanityData=" + vanityData)
-        .add("seals=" + seals)
-        .add("vote=" + vote)
-        .add("round=" + round)
-        .add("validators=" + validators)
-        .toString();
-  }
-}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataCodec.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataCodec.java
new file mode 100644
index 00000000000..5272e514b6f
--- /dev/null
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataCodec.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.ibft;
+
+import static org.hyperledger.besu.consensus.common.bft.Vote.ADD_BYTE_VALUE;
+import static org.hyperledger.besu.consensus.common.bft.Vote.DROP_BYTE_VALUE;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.Vote;
+import org.hyperledger.besu.consensus.common.validator.VoteType;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLPException;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import com.google.common.collect.ImmutableBiMap;
+import org.apache.tuweni.bytes.Bytes;
+
+/**
+ * Represents the data structure stored in the extraData field of the BlockHeader used when
+ * operating under an BFT consensus mechanism.
+ */
+public class IbftExtraDataCodec extends BftExtraDataCodec {
+  private static final ImmutableBiMap<VoteType, Byte> voteToValue =
+      ImmutableBiMap.of(
+          VoteType.ADD, ADD_BYTE_VALUE,
+          VoteType.DROP, DROP_BYTE_VALUE);
+
+  /**
+   * Encode from addresses.
+   *
+   * @param addresses the addresses
+   * @return the bytes
+   */
+  public static Bytes encodeFromAddresses(final Collection<Address> addresses) {
+    return new IbftExtraDataCodec()
+        .encode(
+            new BftExtraData(
+                Bytes.wrap(new byte[EXTRA_VANITY_LENGTH]),
+                Collections.emptyList(),
+                Optional.empty(),
+                0,
+                addresses));
+  }
+
+  /**
+   * Create genesis extra data string.
+   *
+   * @param validators the validators
+   * @return the string
+   */
+  public static String createGenesisExtraDataString(final List<Address> validators) {
+    return encodeFromAddresses(validators).toString();
+  }
+
+  @Override
+  public BftExtraData decodeRaw(final Bytes input) {
+    if (input.isEmpty()) {
+      throw new IllegalArgumentException("Invalid Bytes supplied - Bft Extra Data required.");
+    }
+
+    final RLPInput rlpInput = new BytesValueRLPInput(input, false);
+
+    rlpInput.enterList(); // This accounts for the "root node" which contains BFT data items.
+    final Bytes vanityData = rlpInput.readBytes();
+    final List<Address> validators = rlpInput.readList(Address::readFrom);
+    final Optional<Vote> vote;
+    if (rlpInput.nextIsNull()) {
+      vote = Optional.empty();
+      rlpInput.skipNext();
+    } else {
+      vote = Optional.of(decodeVote(rlpInput));
+    }
+    final int round = rlpInput.readInt();
+    final List<SECPSignature> seals =
+        rlpInput.readList(
+            rlp -> SignatureAlgorithmFactory.getInstance().decodeSignature(rlp.readBytes()));
+    rlpInput.leaveList();
+
+    return new BftExtraData(vanityData, seals, vote, round, validators);
+  }
+
+  @Override
+  protected Bytes encode(final BftExtraData bftExtraData, final EncodingType encodingType) {
+    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
+    encoder.startList();
+    encoder.writeBytes(bftExtraData.getVanityData());
+    encoder.writeList(bftExtraData.getValidators(), (validator, rlp) -> rlp.writeBytes(validator));
+    if (bftExtraData.getVote().isPresent()) {
+      encodeVote(encoder, bftExtraData.getVote().get());
+    } else {
+      encoder.writeNull();
+    }
+
+    if (encodingType != EncodingType.EXCLUDE_COMMIT_SEALS_AND_ROUND_NUMBER) {
+      encoder.writeInt(bftExtraData.getRound());
+      if (encodingType != EncodingType.EXCLUDE_COMMIT_SEALS) {
+        encoder.writeList(
+            bftExtraData.getSeals(), (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
+      }
+    }
+    encoder.endList();
+
+    return encoder.encoded();
+  }
+
+  private void encodeVote(final RLPOutput rlpOutput, final Vote vote) {
+    final VoteType voteType = vote.isAuth() ? VoteType.ADD : VoteType.DROP;
+    rlpOutput.startList();
+    rlpOutput.writeBytes(vote.getRecipient());
+    rlpOutput.writeByte(voteToValue.get(voteType));
+    rlpOutput.endList();
+  }
+
+  private Vote decodeVote(final RLPInput rlpInput) {
+    rlpInput.enterList();
+    final Address recipient = Address.readFrom(rlpInput);
+    final VoteType vote = voteToValue.inverse().get(rlpInput.readByte());
+    if (vote == null) {
+      throw new RLPException("Vote field was of an incorrect binary value.");
+    }
+    rlpInput.leaveList();
+
+    return new Vote(recipient, vote);
+  }
+}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftForksSchedulesFactory.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftForksSchedulesFactory.java
new file mode 100644
index 00000000000..f41adff34a2
--- /dev/null
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftForksSchedulesFactory.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.ibft;
+
+import org.hyperledger.besu.config.BftConfigOptions;
+import org.hyperledger.besu.config.BftFork;
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.consensus.common.ForkSpec;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.bft.BftForksScheduleFactory;
+import org.hyperledger.besu.consensus.common.bft.MutableBftConfigOptions;
+
+/** The Ibft forks schedules factory. */
+public class IbftForksSchedulesFactory {
+
+  /**
+   * Create forks schedule.
+   *
+   * @param genesisConfig the genesis config
+   * @return the forks schedule
+   */
+  public static ForksSchedule<BftConfigOptions> create(final GenesisConfigOptions genesisConfig) {
+    return BftForksScheduleFactory.create(
+        genesisConfig.getBftConfigOptions(),
+        genesisConfig.getTransitions().getIbftForks(),
+        IbftForksSchedulesFactory::createBftConfigOptions);
+  }
+
+  private static BftConfigOptions createBftConfigOptions(
+      final ForkSpec<BftConfigOptions> lastSpec, final BftFork fork) {
+    final MutableBftConfigOptions bftConfigOptions =
+        new MutableBftConfigOptions(lastSpec.getValue());
+
+    fork.getBlockPeriodSeconds().ifPresent(bftConfigOptions::setBlockPeriodSeconds);
+    fork.getBlockRewardWei().ifPresent(bftConfigOptions::setBlockRewardWei);
+
+    if (fork.isMiningBeneficiaryConfigured()) {
+      // Only override if mining beneficiary is explicitly configured
+      bftConfigOptions.setMiningBeneficiary(fork.getMiningBeneficiary());
+    }
+
+    return bftConfigOptions;
+  }
+}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftGossip.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftGossip.java
index 753c2bf3ce8..c19f51bf6b9 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftGossip.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftGossip.java
@@ -15,14 +15,14 @@
 package org.hyperledger.besu.consensus.ibft;
 
 import org.hyperledger.besu.consensus.common.bft.Gossiper;
+import org.hyperledger.besu.consensus.common.bft.network.ValidatorMulticaster;
 import org.hyperledger.besu.consensus.common.bft.payload.Authored;
 import org.hyperledger.besu.consensus.ibft.messagedata.CommitMessageData;
 import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2;
 import org.hyperledger.besu.consensus.ibft.messagedata.PrepareMessageData;
 import org.hyperledger.besu.consensus.ibft.messagedata.ProposalMessageData;
 import org.hyperledger.besu.consensus.ibft.messagedata.RoundChangeMessageData;
-import org.hyperledger.besu.consensus.ibft.network.ValidatorMulticaster;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftHelpers.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftHelpers.java
deleted file mode 100644
index 20c37ed41d5..00000000000
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftHelpers.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft;
-
-import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
-import org.hyperledger.besu.consensus.ibft.payload.PreparedCertificate;
-import org.hyperledger.besu.consensus.ibft.payload.RoundChangePayload;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Util;
-
-import java.util.Collection;
-import java.util.Optional;
-
-public class IbftHelpers {
-
-  public static final Hash EXPECTED_MIX_HASH =
-      Hash.fromHexString("0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365");
-
-  public static int calculateRequiredValidatorQuorum(final int validatorCount) {
-    return Util.fastDivCeiling(2 * validatorCount, 3);
-  }
-
-  public static long prepareMessageCountForQuorum(final long quorum) {
-    return quorum - 1;
-  }
-
-  public static Block createSealedBlock(
-      final Block block, final Collection<Signature> commitSeals) {
-    final BlockHeader initialHeader = block.getHeader();
-    final IbftExtraData initialExtraData = IbftExtraData.decode(initialHeader);
-
-    final IbftExtraData sealedExtraData =
-        new IbftExtraData(
-            initialExtraData.getVanityData(),
-            commitSeals,
-            initialExtraData.getVote(),
-            initialExtraData.getRound(),
-            initialExtraData.getValidators());
-
-    final BlockHeader sealedHeader =
-        BlockHeaderBuilder.fromHeader(initialHeader)
-            .extraData(sealedExtraData.encode())
-            .blockHeaderFunctions(IbftBlockHeaderFunctions.forOnChainBlock())
-            .buildBlockHeader();
-
-    return new Block(sealedHeader, block.getBody());
-  }
-
-  public static Optional<PreparedCertificate> findLatestPreparedCertificate(
-      final Collection<SignedData<RoundChangePayload>> msgs) {
-
-    Optional<PreparedCertificate> result = Optional.empty();
-
-    for (SignedData<RoundChangePayload> roundChangeMsg : msgs) {
-      final RoundChangePayload payload = roundChangeMsg.getPayload();
-      if (payload.getPreparedCertificate().isPresent()) {
-        if (!result.isPresent()) {
-          result = payload.getPreparedCertificate();
-        } else {
-          final PreparedCertificate currentLatest = result.get();
-          final PreparedCertificate nextCert = payload.getPreparedCertificate().get();
-
-          if (currentLatest.getProposalPayload().getPayload().getRoundIdentifier().getRoundNumber()
-              < nextCert.getProposalPayload().getPayload().getRoundIdentifier().getRoundNumber()) {
-            result = Optional.of(nextCert);
-          }
-        }
-      }
-    }
-    return result;
-  }
-}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftProtocolSchedule.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftProtocolSchedule.java
deleted file mode 100644
index 199d18c53f0..00000000000
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftProtocolSchedule.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft;
-
-import static org.hyperledger.besu.consensus.ibft.IbftBlockHeaderValidationRulesetFactory.ibftBlockHeaderValidator;
-
-import org.hyperledger.besu.config.GenesisConfigOptions;
-import org.hyperledger.besu.config.IbftConfigOptions;
-import org.hyperledger.besu.ethereum.MainnetBlockValidator;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.mainnet.MainnetBlockBodyValidator;
-import org.hyperledger.besu.ethereum.mainnet.MainnetBlockImporter;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSpecBuilder;
-
-import java.math.BigInteger;
-
-/** Defines the protocol behaviours for a blockchain using IBFT. */
-public class IbftProtocolSchedule {
-
-  private static final BigInteger DEFAULT_CHAIN_ID = BigInteger.ONE;
-
-  public static ProtocolSchedule create(
-      final GenesisConfigOptions config,
-      final PrivacyParameters privacyParameters,
-      final boolean isRevertReasonEnabled) {
-
-    return new ProtocolScheduleBuilder(
-            config,
-            DEFAULT_CHAIN_ID,
-            builder -> applyIbftChanges(config.getIbft2ConfigOptions(), builder),
-            privacyParameters,
-            isRevertReasonEnabled,
-            config.isQuorum())
-        .createProtocolSchedule();
-  }
-
-  public static ProtocolSchedule create(
-      final GenesisConfigOptions config, final boolean isRevertReasonEnabled) {
-    return create(config, PrivacyParameters.DEFAULT, isRevertReasonEnabled);
-  }
-
-  public static ProtocolSchedule create(final GenesisConfigOptions config) {
-    return create(config, PrivacyParameters.DEFAULT, false);
-  }
-
-  private static ProtocolSpecBuilder applyIbftChanges(
-      final IbftConfigOptions ibftConfig, final ProtocolSpecBuilder builder) {
-
-    if (ibftConfig.getEpochLength() <= 0) {
-      throw new IllegalArgumentException("Epoch length in config must be greater than zero");
-    }
-
-    if (ibftConfig.getBlockRewardWei().signum() < 0) {
-      throw new IllegalArgumentException("Ibft2 Block reward in config cannot be negative");
-    }
-
-    builder
-        .blockHeaderValidatorBuilder(ibftBlockHeaderValidator(ibftConfig.getBlockPeriodSeconds()))
-        .ommerHeaderValidatorBuilder(ibftBlockHeaderValidator(ibftConfig.getBlockPeriodSeconds()))
-        .blockBodyValidatorBuilder(MainnetBlockBodyValidator::new)
-        .blockValidatorBuilder(MainnetBlockValidator::new)
-        .blockImporterBuilder(MainnetBlockImporter::new)
-        .difficultyCalculator((time, parent, protocolContext) -> BigInteger.ONE)
-        .blockReward(Wei.of(ibftConfig.getBlockRewardWei()))
-        .skipZeroBlockRewards(true)
-        .blockHeaderFunctions(IbftBlockHeaderFunctions.forOnChainBlock());
-
-    if (ibftConfig.getMiningBeneficiary().isPresent()) {
-      final Address miningBeneficiary;
-      try {
-        // Precalculate beneficiary to ensure string is valid now, rather than on lambda execution.
-        miningBeneficiary = Address.fromHexString(ibftConfig.getMiningBeneficiary().get());
-      } catch (final IllegalArgumentException e) {
-        throw new IllegalArgumentException(
-            "Mining beneficiary in config is not a valid ethereum address", e);
-      }
-      builder.miningBeneficiaryCalculator(header -> miningBeneficiary);
-    }
-
-    return builder;
-  }
-}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftProtocolScheduleBuilder.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftProtocolScheduleBuilder.java
new file mode 100644
index 00000000000..80a5c77bbb2
--- /dev/null
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/IbftProtocolScheduleBuilder.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.ibft;
+
+import org.hyperledger.besu.config.BftConfigOptions;
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.bft.BaseBftProtocolScheduleBuilder;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.BftProtocolSchedule;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+
+import java.util.Optional;
+
+/** Defines the protocol behaviours for a blockchain using a BFT consensus mechanism. */
+public class IbftProtocolScheduleBuilder extends BaseBftProtocolScheduleBuilder {
+
+  /**
+   * Create protocol schedule.
+   *
+   * @param config the config
+   * @param forksSchedule the forks schedule
+   * @param privacyParameters the privacy parameters
+   * @param isRevertReasonEnabled the is revert reason enabled
+   * @param bftExtraDataCodec the bft extra data codec
+   * @param evmConfiguration the evm configuration
+   * @return the protocol schedule
+   */
+  public static BftProtocolSchedule create(
+      final GenesisConfigOptions config,
+      final ForksSchedule<BftConfigOptions> forksSchedule,
+      final PrivacyParameters privacyParameters,
+      final boolean isRevertReasonEnabled,
+      final BftExtraDataCodec bftExtraDataCodec,
+      final EvmConfiguration evmConfiguration) {
+    return new IbftProtocolScheduleBuilder()
+        .createProtocolSchedule(
+            config,
+            forksSchedule,
+            privacyParameters,
+            isRevertReasonEnabled,
+            bftExtraDataCodec,
+            evmConfiguration);
+  }
+
+  /**
+   * Create protocol schedule.
+   *
+   * @param config the config
+   * @param forksSchedule the forks schedule
+   * @param bftExtraDataCodec the bft extra data codec
+   * @param evmConfiguration the evm configuration
+   * @return the protocol schedule
+   */
+  public static BftProtocolSchedule create(
+      final GenesisConfigOptions config,
+      final ForksSchedule<BftConfigOptions> forksSchedule,
+      final BftExtraDataCodec bftExtraDataCodec,
+      final EvmConfiguration evmConfiguration) {
+    return create(
+        config,
+        forksSchedule,
+        PrivacyParameters.DEFAULT,
+        false,
+        bftExtraDataCodec,
+        evmConfiguration);
+  }
+
+  @Override
+  protected BlockHeaderValidator.Builder createBlockHeaderRuleset(
+      final BftConfigOptions config, final FeeMarket feeMarket) {
+    final Optional<BaseFeeMarket> baseFeeMarket =
+        Optional.of(feeMarket).filter(FeeMarket::implementsBaseFee).map(BaseFeeMarket.class::cast);
+
+    return IbftBlockHeaderValidationRulesetFactory.blockHeaderValidator(
+        config.getBlockPeriodSeconds(), baseFeeMarket);
+  }
+}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/Vote.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/Vote.java
deleted file mode 100644
index 98749ec1199..00000000000
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/Vote.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft;
-
-import org.hyperledger.besu.consensus.common.VoteType;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.rlp.RLPException;
-import org.hyperledger.besu.ethereum.rlp.RLPInput;
-import org.hyperledger.besu.ethereum.rlp.RLPOutput;
-
-import java.util.Objects;
-
-import com.google.common.collect.ImmutableBiMap;
-
-/**
- * This class is only used to serialise/deserialise BlockHeaders and should not appear in business
- * logic.
- */
-public class Vote {
-  private final Address recipient;
-  private final VoteType voteType;
-
-  public static final byte ADD_BYTE_VALUE = (byte) 0xFF;
-  public static final byte DROP_BYTE_VALUE = (byte) 0x0L;
-
-  private static final ImmutableBiMap<VoteType, Byte> voteToValue =
-      ImmutableBiMap.of(
-          VoteType.ADD, ADD_BYTE_VALUE,
-          VoteType.DROP, DROP_BYTE_VALUE);
-
-  public Vote(final Address recipient, final VoteType voteType) {
-    this.recipient = recipient;
-    this.voteType = voteType;
-  }
-
-  public static Vote authVote(final Address address) {
-    return new Vote(address, VoteType.ADD);
-  }
-
-  public static Vote dropVote(final Address address) {
-    return new Vote(address, VoteType.DROP);
-  }
-
-  public Address getRecipient() {
-    return recipient;
-  }
-
-  public boolean isAuth() {
-    return voteType.equals(VoteType.ADD);
-  }
-
-  public boolean isDrop() {
-    return voteType.equals(VoteType.DROP);
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    final Vote vote1 = (Vote) o;
-    return recipient.equals(vote1.recipient) && voteType.equals(vote1.voteType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(recipient, voteType);
-  }
-
-  public void writeTo(final RLPOutput rlpOutput) {
-    rlpOutput.startList();
-    rlpOutput.writeBytes(recipient);
-    rlpOutput.writeByte(voteToValue.get(voteType));
-    rlpOutput.endList();
-  }
-
-  public static Vote readFrom(final RLPInput rlpInput) {
-
-    rlpInput.enterList();
-    final Address recipient = Address.readFrom(rlpInput);
-    final VoteType vote = voteToValue.inverse().get(rlpInput.readByte());
-    if (vote == null) {
-      throw new RLPException("Vote field was of an incorrect binary value.");
-    }
-    rlpInput.leaveList();
-
-    return new Vote(recipient, vote);
-  }
-}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftBlockCreator.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftBlockCreator.java
deleted file mode 100644
index f86d565faa2..00000000000
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftBlockCreator.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft.blockcreation;
-
-import org.hyperledger.besu.consensus.ibft.IbftBlockHeaderFunctions;
-import org.hyperledger.besu.consensus.ibft.IbftHelpers;
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.blockcreation.AbstractBlockCreator;
-import org.hyperledger.besu.ethereum.blockcreation.GasLimitCalculator;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
-import org.hyperledger.besu.ethereum.core.SealableBlockHeader;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-
-// This class is responsible for creating a block without committer seals (basically it was just
-// too hard to coordinate with the state machine).
-public class IbftBlockCreator extends AbstractBlockCreator {
-
-  public IbftBlockCreator(
-      final Address localAddress,
-      final ExtraDataCalculator extraDataCalculator,
-      final PendingTransactions pendingTransactions,
-      final ProtocolContext protocolContext,
-      final ProtocolSchedule protocolSchedule,
-      final GasLimitCalculator gasLimitCalculator,
-      final Wei minTransactionGasPrice,
-      final Double minBlockOccupancyRatio,
-      final BlockHeader parentHeader,
-      final Address miningBeneficiary) {
-    super(
-        localAddress,
-        extraDataCalculator,
-        pendingTransactions,
-        protocolContext,
-        protocolSchedule,
-        gasLimitCalculator,
-        minTransactionGasPrice,
-        miningBeneficiary,
-        minBlockOccupancyRatio,
-        parentHeader);
-  }
-
-  @Override
-  protected BlockHeader createFinalBlockHeader(final SealableBlockHeader sealableBlockHeader) {
-    final BlockHeaderBuilder builder =
-        BlockHeaderBuilder.create()
-            .populateFrom(sealableBlockHeader)
-            .mixHash(IbftHelpers.EXPECTED_MIX_HASH)
-            .nonce(0L)
-            .blockHeaderFunctions(IbftBlockHeaderFunctions.forCommittedSeal());
-
-    return builder.buildBlockHeader();
-  }
-}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftBlockCreatorFactory.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftBlockCreatorFactory.java
deleted file mode 100644
index e2bd589a08a..00000000000
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftBlockCreatorFactory.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft.blockcreation;
-
-import org.hyperledger.besu.consensus.common.ConsensusHelpers;
-import org.hyperledger.besu.consensus.common.ValidatorVote;
-import org.hyperledger.besu.consensus.common.VoteTally;
-import org.hyperledger.besu.consensus.ibft.IbftContext;
-import org.hyperledger.besu.consensus.ibft.IbftExtraData;
-import org.hyperledger.besu.consensus.ibft.Vote;
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.blockcreation.GasLimitCalculator;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.MiningParameters;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public class IbftBlockCreatorFactory {
-
-  private final GasLimitCalculator gasLimitCalculator;
-  private final PendingTransactions pendingTransactions;
-  protected final ProtocolContext protocolContext;
-  protected final ProtocolSchedule protocolSchedule;
-  private final Address localAddress;
-  final Address miningBeneficiary;
-
-  private volatile Bytes vanityData;
-  private volatile Wei minTransactionGasPrice;
-  private volatile Double minBlockOccupancyRatio;
-
-  public IbftBlockCreatorFactory(
-      final GasLimitCalculator gasLimitCalculator,
-      final PendingTransactions pendingTransactions,
-      final ProtocolContext protocolContext,
-      final ProtocolSchedule protocolSchedule,
-      final MiningParameters miningParams,
-      final Address localAddress,
-      final Address miningBeneficiary) {
-    this.gasLimitCalculator = gasLimitCalculator;
-    this.pendingTransactions = pendingTransactions;
-    this.protocolContext = protocolContext;
-    this.protocolSchedule = protocolSchedule;
-    this.localAddress = localAddress;
-    this.minTransactionGasPrice = miningParams.getMinTransactionGasPrice();
-    this.minBlockOccupancyRatio = miningParams.getMinBlockOccupancyRatio();
-    this.vanityData = miningParams.getExtraData();
-    this.miningBeneficiary = miningBeneficiary;
-  }
-
-  public IbftBlockCreator create(final BlockHeader parentHeader, final int round) {
-    return new IbftBlockCreator(
-        localAddress,
-        ph -> createExtraData(round, ph),
-        pendingTransactions,
-        protocolContext,
-        protocolSchedule,
-        gasLimitCalculator,
-        minTransactionGasPrice,
-        minBlockOccupancyRatio,
-        parentHeader,
-        miningBeneficiary);
-  }
-
-  public void setExtraData(final Bytes extraData) {
-    this.vanityData = extraData.copy();
-  }
-
-  public void setMinTransactionGasPrice(final Wei minTransactionGasPrice) {
-    this.minTransactionGasPrice = minTransactionGasPrice;
-  }
-
-  public Wei getMinTransactionGasPrice() {
-    return minTransactionGasPrice;
-  }
-
-  public Bytes createExtraData(final int round, final BlockHeader parentHeader) {
-    final VoteTally voteTally =
-        protocolContext
-            .getConsensusState(IbftContext.class)
-            .getVoteTallyCache()
-            .getVoteTallyAfterBlock(parentHeader);
-
-    final Optional<ValidatorVote> proposal =
-        protocolContext
-            .getConsensusState(IbftContext.class)
-            .getVoteProposer()
-            .getVote(localAddress, voteTally);
-
-    final List<Address> validators = new ArrayList<>(voteTally.getValidators());
-
-    final IbftExtraData extraData =
-        new IbftExtraData(
-            ConsensusHelpers.zeroLeftPad(vanityData, IbftExtraData.EXTRA_VANITY_LENGTH),
-            Collections.emptyList(),
-            toVote(proposal),
-            round,
-            validators);
-
-    return extraData.encode();
-  }
-
-  void changeTargetGasLimit(final Long targetGasLimit) {
-    gasLimitCalculator.changeTargetGasLimit(targetGasLimit);
-  }
-
-  public Address getLocalAddress() {
-    return localAddress;
-  }
-
-  private static Optional<Vote> toVote(final Optional<ValidatorVote> input) {
-    return input
-        .map(v -> Optional.of(new Vote(v.getRecipient(), v.getVotePolarity())))
-        .orElse(Optional.empty());
-  }
-}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftMiningCoordinator.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftMiningCoordinator.java
deleted file mode 100644
index 0f75784cd63..00000000000
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftMiningCoordinator.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft.blockcreation;
-
-import static org.apache.logging.log4j.LogManager.getLogger;
-
-import org.hyperledger.besu.consensus.common.bft.BftEventQueue;
-import org.hyperledger.besu.consensus.common.bft.BftExecutors;
-import org.hyperledger.besu.consensus.common.bft.BftProcessor;
-import org.hyperledger.besu.consensus.common.bft.events.NewChainHead;
-import org.hyperledger.besu.consensus.common.bft.statemachine.BftEventHandler;
-import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
-import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
-import org.hyperledger.besu.ethereum.chain.BlockAddedObserver;
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-
-public class IbftMiningCoordinator implements MiningCoordinator, BlockAddedObserver {
-
-  private enum State {
-    IDLE,
-    RUNNING,
-    STOPPED
-  }
-
-  private static final Logger LOG = getLogger();
-
-  private final BftEventHandler eventHandler;
-  private final BftProcessor bftProcessor;
-  private final IbftBlockCreatorFactory blockCreatorFactory;
-  protected final Blockchain blockchain;
-  private final BftEventQueue eventQueue;
-  private final BftExecutors bftExecutors;
-
-  private long blockAddedObserverId;
-  private final AtomicReference<State> state = new AtomicReference<>(State.IDLE);
-
-  public IbftMiningCoordinator(
-      final BftExecutors bftExecutors,
-      final BftEventHandler eventHandler,
-      final BftProcessor bftProcessor,
-      final IbftBlockCreatorFactory blockCreatorFactory,
-      final Blockchain blockchain,
-      final BftEventQueue eventQueue) {
-    this.bftExecutors = bftExecutors;
-    this.eventHandler = eventHandler;
-    this.bftProcessor = bftProcessor;
-    this.blockCreatorFactory = blockCreatorFactory;
-    this.eventQueue = eventQueue;
-
-    this.blockchain = blockchain;
-  }
-
-  @Override
-  public void start() {
-    if (state.compareAndSet(State.IDLE, State.RUNNING)) {
-      bftExecutors.start();
-      blockAddedObserverId = blockchain.observeBlockAdded(this);
-      eventHandler.start();
-      bftExecutors.executeBftProcessor(bftProcessor);
-    }
-  }
-
-  @Override
-  public void stop() {
-    if (state.compareAndSet(State.RUNNING, State.STOPPED)) {
-      blockchain.removeObserver(blockAddedObserverId);
-      bftProcessor.stop();
-      // Make sure the processor has stopped before shutting down the executors
-      try {
-        bftProcessor.awaitStop();
-      } catch (final InterruptedException e) {
-        LOG.debug("Interrupted while waiting for IbftProcessor to stop.", e);
-        Thread.currentThread().interrupt();
-      }
-      bftExecutors.stop();
-    }
-  }
-
-  @Override
-  public void awaitStop() throws InterruptedException {
-    bftExecutors.awaitStop();
-  }
-
-  @Override
-  public boolean enable() {
-    return true;
-  }
-
-  @Override
-  public boolean disable() {
-    return false;
-  }
-
-  @Override
-  public boolean isMining() {
-    return true;
-  }
-
-  @Override
-  public Wei getMinTransactionGasPrice() {
-    return blockCreatorFactory.getMinTransactionGasPrice();
-  }
-
-  @Override
-  public void setExtraData(final Bytes extraData) {
-    blockCreatorFactory.setExtraData(extraData);
-  }
-
-  @Override
-  public Optional<Address> getCoinbase() {
-    return Optional.of(blockCreatorFactory.getLocalAddress());
-  }
-
-  @Override
-  public Optional<Block> createBlock(
-      final BlockHeader parentHeader,
-      final List<Transaction> transactions,
-      final List<BlockHeader> ommers) {
-    // One-off block creation has not been implemented
-    return Optional.empty();
-  }
-
-  @Override
-  public void changeTargetGasLimit(final Long targetGasLimit) {
-    blockCreatorFactory.changeTargetGasLimit(targetGasLimit);
-  }
-
-  @Override
-  public void onBlockAdded(final BlockAddedEvent event) {
-    if (event.isNewCanonicalHead()) {
-      LOG.trace("New canonical head detected");
-      eventQueue.add(new NewChainHead(event.getBlock().getHeader()));
-    }
-  }
-}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCoinbaseValidationRule.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCoinbaseValidationRule.java
deleted file mode 100644
index 3c29d2f06c8..00000000000
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCoinbaseValidationRule.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft.headervalidationrules;
-
-import org.hyperledger.besu.consensus.common.ValidatorProvider;
-import org.hyperledger.besu.consensus.ibft.IbftContext;
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule;
-
-import java.util.Collection;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-/**
- * Ensures that the coinbase (which corresponds to the block proposer) is included in the list of
- * validators
- */
-public class IbftCoinbaseValidationRule implements AttachedBlockHeaderValidationRule {
-
-  private static final Logger LOGGER = LogManager.getLogger(IbftCoinbaseValidationRule.class);
-
-  @Override
-  public boolean validate(
-      final BlockHeader header, final BlockHeader parent, final ProtocolContext context) {
-
-    final ValidatorProvider validatorProvider =
-        context
-            .getConsensusState(IbftContext.class)
-            .getVoteTallyCache()
-            .getVoteTallyAfterBlock(parent);
-    final Address proposer = header.getCoinbase();
-
-    final Collection<Address> storedValidators = validatorProvider.getValidators();
-
-    if (!storedValidators.contains(proposer)) {
-      LOGGER.info(
-          "Invalid block header: Block proposer is not a member of the validators. proposer={}, validators={}",
-          proposer,
-          storedValidators);
-      return false;
-    }
-
-    return true;
-  }
-}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCommitSealsValidationRule.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCommitSealsValidationRule.java
deleted file mode 100644
index 81c009d1d96..00000000000
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCommitSealsValidationRule.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft.headervalidationrules;
-
-import static org.hyperledger.besu.consensus.ibft.IbftHelpers.calculateRequiredValidatorQuorum;
-
-import org.hyperledger.besu.consensus.common.ValidatorProvider;
-import org.hyperledger.besu.consensus.ibft.IbftBlockHashing;
-import org.hyperledger.besu.consensus.ibft.IbftContext;
-import org.hyperledger.besu.consensus.ibft.IbftExtraData;
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-/**
- * Ensures the commit seals in the block header were created by known validators (as determined by
- * tracking votes and validator state on the blockchain).
- *
- * <p>This also ensures sufficient commit seals exist in the block to make it valid.
- */
-public class IbftCommitSealsValidationRule implements AttachedBlockHeaderValidationRule {
-
-  private static final Logger LOGGER = LogManager.getLogger();
-
-  @Override
-  public boolean validate(
-      final BlockHeader header, final BlockHeader parent, final ProtocolContext protocolContext) {
-    final ValidatorProvider validatorProvider =
-        protocolContext
-            .getConsensusState(IbftContext.class)
-            .getVoteTallyCache()
-            .getVoteTallyAfterBlock(parent);
-    final IbftExtraData ibftExtraData = IbftExtraData.decode(header);
-
-    final List<Address> committers =
-        IbftBlockHashing.recoverCommitterAddresses(header, ibftExtraData);
-    final List<Address> committersWithoutDuplicates = new ArrayList<>(new HashSet<>(committers));
-
-    if (committers.size() != committersWithoutDuplicates.size()) {
-      LOGGER.info("Invalid block header: Duplicated seals found in header.");
-      return false;
-    }
-
-    return validateCommitters(committersWithoutDuplicates, validatorProvider.getValidators());
-  }
-
-  private boolean validateCommitters(
-      final Collection<Address> committers, final Collection<Address> storedValidators) {
-
-    final int minimumSealsRequired = calculateRequiredValidatorQuorum(storedValidators.size());
-    if (committers.size() < minimumSealsRequired) {
-      LOGGER.info(
-          "Invalid block header: Insufficient committers to seal block. (Required {}, received {})",
-          minimumSealsRequired,
-          committers.size());
-      return false;
-    }
-
-    if (!storedValidators.containsAll(committers)) {
-      LOGGER.info(
-          "Invalid block header: Not all committers are in the locally maintained validator list. validators={} committers={}",
-          storedValidators,
-          committers);
-      return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public boolean includeInLightValidation() {
-    return false;
-  }
-}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftValidatorsValidationRule.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftValidatorsValidationRule.java
deleted file mode 100644
index abaff656be5..00000000000
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftValidatorsValidationRule.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft.headervalidationrules;
-
-import org.hyperledger.besu.consensus.common.ValidatorProvider;
-import org.hyperledger.besu.consensus.ibft.IbftContext;
-import org.hyperledger.besu.consensus.ibft.IbftExtraData;
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule;
-import org.hyperledger.besu.ethereum.rlp.RLPException;
-
-import java.util.Collection;
-import java.util.NavigableSet;
-import java.util.TreeSet;
-
-import com.google.common.collect.Iterables;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-/**
- * Ensures the Validators listed in the block header match that tracked in memory (which was in-turn
- * created by tracking votes included on the block chain).
- */
-public class IbftValidatorsValidationRule implements AttachedBlockHeaderValidationRule {
-
-  private static final Logger LOGGER = LogManager.getLogger();
-
-  @Override
-  public boolean validate(
-      final BlockHeader header, final BlockHeader parent, final ProtocolContext context) {
-    try {
-      final ValidatorProvider validatorProvider =
-          context
-              .getConsensusState(IbftContext.class)
-              .getVoteTallyCache()
-              .getVoteTallyAfterBlock(parent);
-      final IbftExtraData ibftExtraData = IbftExtraData.decode(header);
-
-      final NavigableSet<Address> sortedReportedValidators =
-          new TreeSet<>(ibftExtraData.getValidators());
-
-      if (!Iterables.elementsEqual(ibftExtraData.getValidators(), sortedReportedValidators)) {
-        LOGGER.info(
-            "Invalid block header: Validators are not sorted in ascending order. Expected {} but got {}.",
-            sortedReportedValidators,
-            ibftExtraData.getValidators());
-        return false;
-      }
-
-      final Collection<Address> storedValidators = validatorProvider.getValidators();
-      if (!Iterables.elementsEqual(ibftExtraData.getValidators(), storedValidators)) {
-        LOGGER.info(
-            "Invalid block header: Incorrect validators. Expected {} but got {}.",
-            storedValidators,
-            ibftExtraData.getValidators());
-        return false;
-      }
-
-    } catch (final RLPException ex) {
-      LOGGER.info(
-          "Invalid block header: ExtraData field was unable to be deserialised into an IBFT Struct.",
-          ex);
-      return false;
-    } catch (final IllegalArgumentException ex) {
-      LOGGER.info("Invalid block header: Failed to verify extra data", ex);
-      return false;
-    }
-
-    return true;
-  }
-}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftVanityDataValidationRule.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftVanityDataValidationRule.java
deleted file mode 100644
index 38cb20dd9e1..00000000000
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftVanityDataValidationRule.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft.headervalidationrules;
-
-import org.hyperledger.besu.consensus.ibft.IbftExtraData;
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-public class IbftVanityDataValidationRule implements AttachedBlockHeaderValidationRule {
-
-  private static final Logger LOG = LogManager.getLogger();
-
-  @Override
-  public boolean validate(
-      final BlockHeader header, final BlockHeader parent, final ProtocolContext protocolContext) {
-    final IbftExtraData extraData = IbftExtraData.decode(header);
-
-    if (extraData.getVanityData().size() != IbftExtraData.EXTRA_VANITY_LENGTH) {
-      LOG.info("Invalid block header: Ibft Extra Data does not contain 32 bytes of vanity data.");
-      return false;
-    }
-    return true;
-  }
-}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/IbftJsonRpcMethods.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/IbftJsonRpcMethods.java
index 8af9045d819..13ccf4214a4 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/IbftJsonRpcMethods.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/IbftJsonRpcMethods.java
@@ -16,11 +16,10 @@
 
 import org.hyperledger.besu.consensus.common.BlockInterface;
 import org.hyperledger.besu.consensus.common.EpochManager;
-import org.hyperledger.besu.consensus.common.VoteProposer;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
-import org.hyperledger.besu.consensus.common.VoteTallyUpdater;
-import org.hyperledger.besu.consensus.ibft.IbftBlockInterface;
-import org.hyperledger.besu.consensus.ibft.IbftContext;
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftContext;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.common.validator.blockbased.BlockValidatorProvider;
 import org.hyperledger.besu.consensus.ibft.jsonrpc.methods.IbftDiscardValidatorVote;
 import org.hyperledger.besu.consensus.ibft.jsonrpc.methods.IbftGetPendingVotes;
 import org.hyperledger.besu.consensus.ibft.jsonrpc.methods.IbftGetSignerMetrics;
@@ -28,7 +27,7 @@
 import org.hyperledger.besu.consensus.ibft.jsonrpc.methods.IbftGetValidatorsByBlockNumber;
 import org.hyperledger.besu.consensus.ibft.jsonrpc.methods.IbftProposeValidatorVote;
 import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.methods.ApiGroupJsonRpcMethods;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
@@ -36,46 +35,54 @@
 
 import java.util.Map;
 
+/** The Ibft json rpc methods. */
 public class IbftJsonRpcMethods extends ApiGroupJsonRpcMethods {
 
   private final ProtocolContext context;
 
+  /**
+   * Instantiates a new Ibft json rpc methods.
+   *
+   * @param context the context
+   */
   public IbftJsonRpcMethods(final ProtocolContext context) {
     this.context = context;
   }
 
   @Override
-  protected RpcApi getApiGroup() {
-    return IbftRpcApis.IBFT;
+  protected String getApiGroup() {
+    return RpcApis.IBFT.name();
   }
 
   @Override
   protected Map<String, JsonRpcMethod> create() {
-    final MutableBlockchain mutableBlockchain = context.getBlockchain();
+    final MutableBlockchain blockchain = context.getBlockchain();
     final BlockchainQueries blockchainQueries =
-        new BlockchainQueries(context.getBlockchain(), context.getWorldStateArchive());
-    final VoteProposer voteProposer =
-        context.getConsensusState(IbftContext.class).getVoteProposer();
-    final BlockInterface blockInterface = new IbftBlockInterface();
+        new BlockchainQueries(blockchain, context.getWorldStateArchive());
+    final BftContext bftContext = context.getConsensusContext(BftContext.class);
+    final BlockInterface blockInterface = bftContext.getBlockInterface();
+    final ValidatorProvider validatorProvider =
+        context.getConsensusContext(BftContext.class).getValidatorProvider();
 
-    final VoteTallyCache voteTallyCache = createVoteTallyCache(context, mutableBlockchain);
+    // Must create our own voteTallyCache as using this would pollute the main voteTallyCache
+    final ValidatorProvider readOnlyValidatorProvider =
+        createValidatorProvider(context, blockchain);
 
     return mapOf(
-        new IbftProposeValidatorVote(voteProposer),
+        new IbftProposeValidatorVote(validatorProvider),
         new IbftGetValidatorsByBlockNumber(blockchainQueries, blockInterface),
-        new IbftDiscardValidatorVote(voteProposer),
-        new IbftGetValidatorsByBlockHash(context.getBlockchain(), blockInterface),
-        new IbftGetSignerMetrics(voteTallyCache, blockInterface, blockchainQueries),
-        new IbftGetPendingVotes(voteProposer));
+        new IbftDiscardValidatorVote(validatorProvider),
+        new IbftGetValidatorsByBlockHash(blockchain, blockInterface),
+        new IbftGetSignerMetrics(readOnlyValidatorProvider, blockInterface, blockchainQueries),
+        new IbftGetPendingVotes(validatorProvider));
   }
 
-  private VoteTallyCache createVoteTallyCache(
+  private ValidatorProvider createValidatorProvider(
       final ProtocolContext context, final MutableBlockchain blockchain) {
-    final EpochManager epochManager =
-        context.getConsensusState(IbftContext.class).getEpochManager();
-    final IbftBlockInterface ibftBlockInterface = new IbftBlockInterface();
-    final VoteTallyUpdater voteTallyUpdater =
-        new VoteTallyUpdater(epochManager, ibftBlockInterface);
-    return new VoteTallyCache(blockchain, voteTallyUpdater, epochManager, ibftBlockInterface);
+    final BftContext bftContext = context.getConsensusContext(BftContext.class);
+    final EpochManager epochManager = bftContext.getEpochManager();
+    final BftBlockInterface bftBlockInterface = bftContext.getBlockInterface();
+    return BlockValidatorProvider.nonForkingValidatorProvider(
+        blockchain, epochManager, bftBlockInterface);
   }
 }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/IbftRpcApis.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/IbftRpcApis.java
deleted file mode 100644
index e5840ca8803..00000000000
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/IbftRpcApis.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft.jsonrpc;
-
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
-
-import java.util.Optional;
-
-public class IbftRpcApis {
-  public static final RpcApi IBFT = new RpcApi("IBFT");
-
-  public static final Optional<RpcApi> valueOf(final String name) {
-    if (name.equals(IBFT.getCliValue())) {
-      return Optional.of(IBFT);
-    } else {
-      return Optional.empty();
-    }
-  }
-}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftDiscardValidatorVote.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftDiscardValidatorVote.java
index 4afe6579b5a..2fdc60c1298 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftDiscardValidatorVote.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftDiscardValidatorVote.java
@@ -14,23 +14,31 @@
  */
 package org.hyperledger.besu.consensus.ibft.jsonrpc.methods;
 
-import org.hyperledger.besu.consensus.common.VoteProposer;
+import static com.google.common.base.Preconditions.checkState;
+
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.core.Address;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Ibft discard validator vote. */
 public class IbftDiscardValidatorVote implements JsonRpcMethod {
-  private static final Logger LOG = LogManager.getLogger();
-  private final VoteProposer voteProposer;
+  private static final Logger LOG = LoggerFactory.getLogger(IbftDiscardValidatorVote.class);
+  private final ValidatorProvider validatorProvider;
 
-  public IbftDiscardValidatorVote(final VoteProposer voteProposer) {
-    this.voteProposer = voteProposer;
+  /**
+   * Instantiates a new Ibft discard validator vote.
+   *
+   * @param validatorProvider the validator provider
+   */
+  public IbftDiscardValidatorVote(final ValidatorProvider validatorProvider) {
+    this.validatorProvider = validatorProvider;
   }
 
   @Override
@@ -40,9 +48,11 @@ public String getName() {
 
   @Override
   public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
+    checkState(
+        validatorProvider.getVoteProviderAtHead().isPresent(), "Ibft requires a vote provider");
     final Address validatorAddress = requestContext.getRequiredParameter(0, Address.class);
     LOG.trace("Received RPC rpcName={} address={}", getName(), validatorAddress);
-    voteProposer.discard(validatorAddress);
+    validatorProvider.getVoteProviderAtHead().get().discardVote(validatorAddress);
 
     return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), true);
   }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetPendingVotes.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetPendingVotes.java
index bdd3a13a1bb..b172dae100b 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetPendingVotes.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetPendingVotes.java
@@ -14,15 +14,21 @@
  */
 package org.hyperledger.besu.consensus.ibft.jsonrpc.methods;
 
-import org.hyperledger.besu.consensus.common.VoteProposer;
 import org.hyperledger.besu.consensus.common.jsonrpc.AbstractVoteProposerMethod;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 
+/** The Ibft get pending votes. */
 public class IbftGetPendingVotes extends AbstractVoteProposerMethod implements JsonRpcMethod {
 
-  public IbftGetPendingVotes(final VoteProposer voteProposer) {
-    super(voteProposer);
+  /**
+   * Instantiates a new Ibft get pending votes.
+   *
+   * @param validatorProvider the validator provider
+   */
+  public IbftGetPendingVotes(final ValidatorProvider validatorProvider) {
+    super(validatorProvider);
   }
 
   @Override
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetSignerMetrics.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetSignerMetrics.java
index 19d42737061..e9ed169a74d 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetSignerMetrics.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetSignerMetrics.java
@@ -15,19 +15,27 @@
 package org.hyperledger.besu.consensus.ibft.jsonrpc.methods;
 
 import org.hyperledger.besu.consensus.common.BlockInterface;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
 import org.hyperledger.besu.consensus.common.jsonrpc.AbstractGetSignerMetricsMethod;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 
+/** The Ibft get signer metrics. */
 public class IbftGetSignerMetrics extends AbstractGetSignerMetricsMethod implements JsonRpcMethod {
 
+  /**
+   * Instantiates a new Ibft get signer metrics.
+   *
+   * @param validatorProvider the validator provider
+   * @param blockInterface the block interface
+   * @param blockchainQueries the blockchain queries
+   */
   public IbftGetSignerMetrics(
-      final VoteTallyCache voteTallyCache,
+      final ValidatorProvider validatorProvider,
       final BlockInterface blockInterface,
       final BlockchainQueries blockchainQueries) {
-    super(voteTallyCache, blockInterface, blockchainQueries);
+    super(validatorProvider, blockInterface, blockchainQueries);
   }
 
   @Override
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockHash.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockHash.java
index 4073030b9bc..a14eb49e876 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockHash.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockHash.java
@@ -15,6 +15,7 @@
 package org.hyperledger.besu.consensus.ibft.jsonrpc.methods;
 
 import org.hyperledger.besu.consensus.common.BlockInterface;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
@@ -22,20 +23,26 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Ibft get validators by block hash. */
 public class IbftGetValidatorsByBlockHash implements JsonRpcMethod {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(IbftGetValidatorsByBlockHash.class);
 
   private final Blockchain blockchain;
   private final BlockInterface blockInterface;
 
+  /**
+   * Instantiates a new Ibft get validators by block hash.
+   *
+   * @param blockchain the blockchain
+   * @param blockInterface the block interface
+   */
   public IbftGetValidatorsByBlockHash(
       final Blockchain blockchain, final BlockInterface blockInterface) {
     this.blockchain = blockchain;
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockNumber.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockNumber.java
index ab04a5bc2e0..5e36ca2070c 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockNumber.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockNumber.java
@@ -26,15 +26,22 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Ibft get validators by block number. */
 public class IbftGetValidatorsByBlockNumber extends AbstractBlockParameterMethod
     implements JsonRpcMethod {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(IbftGetValidatorsByBlockNumber.class);
 
   private final BlockInterface blockInterface;
 
+  /**
+   * Instantiates a new Ibft get validators by block number.
+   *
+   * @param blockchainQueries the blockchain queries
+   * @param blockInterface the block interface
+   */
   public IbftGetValidatorsByBlockNumber(
       final BlockchainQueries blockchainQueries, final BlockInterface blockInterface) {
     super(blockchainQueries);
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVote.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVote.java
index a8eed3c8b00..fe89961410e 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVote.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVote.java
@@ -14,24 +14,32 @@
  */
 package org.hyperledger.besu.consensus.ibft.jsonrpc.methods;
 
-import org.hyperledger.besu.consensus.common.VoteProposer;
-import org.hyperledger.besu.consensus.common.VoteType;
+import static com.google.common.base.Preconditions.checkState;
+
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.common.validator.VoteType;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.core.Address;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Ibft propose validator vote. */
 public class IbftProposeValidatorVote implements JsonRpcMethod {
-  private static final Logger LOG = LogManager.getLogger();
-  private final VoteProposer voteProposer;
+  private static final Logger LOG = LoggerFactory.getLogger(IbftProposeValidatorVote.class);
+  private final ValidatorProvider validatorProvider;
 
-  public IbftProposeValidatorVote(final VoteProposer voteProposer) {
-    this.voteProposer = voteProposer;
+  /**
+   * Instantiates a new Ibft propose validator vote.
+   *
+   * @param validatorProvider the validator provider
+   */
+  public IbftProposeValidatorVote(final ValidatorProvider validatorProvider) {
+    this.validatorProvider = validatorProvider;
   }
 
   @Override
@@ -41,7 +49,8 @@ public String getName() {
 
   @Override
   public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
-
+    checkState(
+        validatorProvider.getVoteProviderAtHead().isPresent(), "Ibft requires a vote provider");
     final Address validatorAddress = requestContext.getRequiredParameter(0, Address.class);
     final Boolean add = requestContext.getRequiredParameter(1, Boolean.class);
     LOG.trace(
@@ -51,9 +60,9 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
         validatorAddress);
 
     if (add) {
-      voteProposer.auth(validatorAddress);
+      validatorProvider.getVoteProviderAtHead().get().authVote(validatorAddress);
     } else {
-      voteProposer.drop(validatorAddress);
+      validatorProvider.getVoteProviderAtHead().get().dropVote(validatorAddress);
     }
 
     return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), true);
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/CommitMessageData.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/CommitMessageData.java
index 4dba20a9c7f..c46873a3ab5 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/CommitMessageData.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/CommitMessageData.java
@@ -20,6 +20,7 @@
 
 import org.apache.tuweni.bytes.Bytes;
 
+/** The Commit message data. */
 public class CommitMessageData extends AbstractBftMessageData {
 
   private static final int MESSAGE_CODE = IbftV2.COMMIT;
@@ -28,15 +29,32 @@ private CommitMessageData(final Bytes data) {
     super(data);
   }
 
+  /**
+   * Instantiate CommitMessageData from message data.
+   *
+   * @param messageData the message data
+   * @return the commit message data
+   */
   public static CommitMessageData fromMessageData(final MessageData messageData) {
     return fromMessageData(
         messageData, MESSAGE_CODE, CommitMessageData.class, CommitMessageData::new);
   }
 
+  /**
+   * Decode.
+   *
+   * @return the commit
+   */
   public Commit decode() {
     return Commit.decode(data);
   }
 
+  /**
+   * Create commit message data.
+   *
+   * @param commit the commit
+   * @return the commit message data
+   */
   public static CommitMessageData create(final Commit commit) {
     return new CommitMessageData(commit.encode());
   }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/IbftV2.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/IbftV2.java
index 87c7b87d027..c8b44c1adb7 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/IbftV2.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/IbftV2.java
@@ -16,10 +16,15 @@
 
 /** Message codes for iBFT v2 messages */
 public class IbftV2 {
+  /** The constant PROPOSAL. */
   public static final int PROPOSAL = 0;
+  /** The constant PREPARE. */
   public static final int PREPARE = 1;
+  /** The constant COMMIT. */
   public static final int COMMIT = 2;
+  /** The constant ROUND_CHANGE. */
   public static final int ROUND_CHANGE = 3;
 
+  /** The constant MESSAGE_SPACE. */
   public static final int MESSAGE_SPACE = 4;
 }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/PrepareMessageData.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/PrepareMessageData.java
index 596060074a9..88e51a583d4 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/PrepareMessageData.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/PrepareMessageData.java
@@ -20,6 +20,7 @@
 
 import org.apache.tuweni.bytes.Bytes;
 
+/** The Prepare message data. */
 public class PrepareMessageData extends AbstractBftMessageData {
 
   private static final int MESSAGE_CODE = IbftV2.PREPARE;
@@ -28,15 +29,32 @@ private PrepareMessageData(final Bytes data) {
     super(data);
   }
 
+  /**
+   * Gets prepare message data from message data.
+   *
+   * @param messageData the message data
+   * @return the prepare message data
+   */
   public static PrepareMessageData fromMessageData(final MessageData messageData) {
     return fromMessageData(
         messageData, MESSAGE_CODE, PrepareMessageData.class, PrepareMessageData::new);
   }
 
+  /**
+   * Decode.
+   *
+   * @return the prepare
+   */
   public Prepare decode() {
     return Prepare.decode(data);
   }
 
+  /**
+   * Create prepare message data.
+   *
+   * @param preapare the Prepare
+   * @return the prepare message data
+   */
   public static PrepareMessageData create(final Prepare preapare) {
     return new PrepareMessageData(preapare.encode());
   }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/ProposalMessageData.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/ProposalMessageData.java
index f2bde92b01a..6416f0746aa 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/ProposalMessageData.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/ProposalMessageData.java
@@ -20,6 +20,7 @@
 
 import org.apache.tuweni.bytes.Bytes;
 
+/** The Proposal message data. */
 public class ProposalMessageData extends AbstractBftMessageData {
 
   private static final int MESSAGE_CODE = IbftV2.PROPOSAL;
@@ -28,15 +29,32 @@ private ProposalMessageData(final Bytes data) {
     super(data);
   }
 
+  /**
+   * From message data create proposal message data.
+   *
+   * @param messageData the message data
+   * @return the proposal message data
+   */
   public static ProposalMessageData fromMessageData(final MessageData messageData) {
     return fromMessageData(
         messageData, MESSAGE_CODE, ProposalMessageData.class, ProposalMessageData::new);
   }
 
+  /**
+   * Decode.
+   *
+   * @return the proposal
+   */
   public Proposal decode() {
     return Proposal.decode(data);
   }
 
+  /**
+   * Create proposal message data from proposal.
+   *
+   * @param proposal the proposal
+   * @return the proposal message data
+   */
   public static ProposalMessageData create(final Proposal proposal) {
     return new ProposalMessageData(proposal.encode());
   }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/RoundChangeMessageData.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/RoundChangeMessageData.java
index b9ae7fa2397..be98e3fa0a1 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/RoundChangeMessageData.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagedata/RoundChangeMessageData.java
@@ -20,6 +20,7 @@
 
 import org.apache.tuweni.bytes.Bytes;
 
+/** The Round change message data. */
 public class RoundChangeMessageData extends AbstractBftMessageData {
 
   private static final int MESSAGE_CODE = IbftV2.ROUND_CHANGE;
@@ -28,15 +29,32 @@ private RoundChangeMessageData(final Bytes data) {
     super(data);
   }
 
+  /**
+   * From message data to round change message data.
+   *
+   * @param messageData the message data
+   * @return the round change message data
+   */
   public static RoundChangeMessageData fromMessageData(final MessageData messageData) {
     return fromMessageData(
         messageData, MESSAGE_CODE, RoundChangeMessageData.class, RoundChangeMessageData::new);
   }
 
+  /**
+   * Decode to round change.
+   *
+   * @return the round change
+   */
   public RoundChange decode() {
     return RoundChange.decode(data);
   }
 
+  /**
+   * Create round change message data.
+   *
+   * @param signedPayload the signed payload
+   * @return the round change message data
+   */
   public static RoundChangeMessageData create(final RoundChange signedPayload) {
 
     return new RoundChangeMessageData(signedPayload.encode());
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Commit.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Commit.java
index 3d0255a87bc..41549fec4f9 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Commit.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Commit.java
@@ -18,26 +18,48 @@
 import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
 import org.hyperledger.besu.consensus.ibft.payload.CommitPayload;
 import org.hyperledger.besu.consensus.ibft.payload.PayloadDeserializers;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 
 import org.apache.tuweni.bytes.Bytes;
 
+/** The Commit. */
 public class Commit extends BftMessage<CommitPayload> {
 
+  /**
+   * Instantiates a new Commit.
+   *
+   * @param payload the payload
+   */
   public Commit(final SignedData<CommitPayload> payload) {
     super(payload);
   }
 
-  public Signature getCommitSeal() {
+  /**
+   * Gets commit seal.
+   *
+   * @return the commit seal
+   */
+  public SECPSignature getCommitSeal() {
     return getPayload().getCommitSeal();
   }
 
+  /**
+   * Gets digest.
+   *
+   * @return the digest
+   */
   public Hash getDigest() {
     return getPayload().getDigest();
   }
 
+  /**
+   * Decode data to Commit.
+   *
+   * @param data the data
+   * @return the commit
+   */
   public static Commit decode(final Bytes data) {
     return new Commit(PayloadDeserializers.readSignedCommitPayloadFrom(RLP.input(data)));
   }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Prepare.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Prepare.java
index 60bc7d0dfe1..f089094624d 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Prepare.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Prepare.java
@@ -18,21 +18,38 @@
 import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
 import org.hyperledger.besu.consensus.ibft.payload.PayloadDeserializers;
 import org.hyperledger.besu.consensus.ibft.payload.PreparePayload;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 
 import org.apache.tuweni.bytes.Bytes;
 
+/** The Prepare message. */
 public class Prepare extends BftMessage<PreparePayload> {
 
+  /**
+   * Instantiates a new Prepare.
+   *
+   * @param payload the payload
+   */
   public Prepare(final SignedData<PreparePayload> payload) {
     super(payload);
   }
 
+  /**
+   * Gets digest.
+   *
+   * @return the digest
+   */
   public Hash getDigest() {
     return getPayload().getDigest();
   }
 
+  /**
+   * Decode data.
+   *
+   * @param data the data
+   * @return the Prepare payload
+   */
   public static Prepare decode(final Bytes data) {
     return new Prepare(PayloadDeserializers.readSignedPreparePayloadFrom(RLP.input(data)));
   }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Proposal.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Proposal.java
index 86f3ea4c829..0c0231857f1 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Proposal.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/Proposal.java
@@ -14,14 +14,15 @@
  */
 package org.hyperledger.besu.consensus.ibft.messagewrappers;
 
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
 import org.hyperledger.besu.consensus.common.bft.messagewrappers.BftMessage;
 import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
-import org.hyperledger.besu.consensus.ibft.IbftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.ibft.IbftExtraDataCodec;
 import org.hyperledger.besu.consensus.ibft.payload.PayloadDeserializers;
 import org.hyperledger.besu.consensus.ibft.payload.ProposalPayload;
 import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
@@ -30,12 +31,21 @@
 
 import org.apache.tuweni.bytes.Bytes;
 
+/** The Proposal. */
 public class Proposal extends BftMessage<ProposalPayload> {
 
+  private static final IbftExtraDataCodec BFT_EXTRA_DATA_ENCODER = new IbftExtraDataCodec();
   private final Block proposedBlock;
 
   private final Optional<RoundChangeCertificate> roundChangeCertificate;
 
+  /**
+   * Instantiates a new Proposal.
+   *
+   * @param payload the payload
+   * @param proposedBlock the proposed block
+   * @param certificate the certificate
+   */
   public Proposal(
       final SignedData<ProposalPayload> payload,
       final Block proposedBlock,
@@ -45,14 +55,29 @@ public Proposal(
     this.roundChangeCertificate = certificate;
   }
 
+  /**
+   * Gets block.
+   *
+   * @return the block
+   */
   public Block getBlock() {
     return proposedBlock;
   }
 
+  /**
+   * Gets digest.
+   *
+   * @return the digest
+   */
   public Hash getDigest() {
     return getPayload().getDigest();
   }
 
+  /**
+   * Gets round change certificate.
+   *
+   * @return the round change certificate
+   */
   public Optional<RoundChangeCertificate> getRoundChangeCertificate() {
     return roundChangeCertificate;
   }
@@ -72,12 +97,19 @@ public Bytes encode() {
     return rlpOut.encoded();
   }
 
+  /**
+   * Decode.
+   *
+   * @param data the data
+   * @return the proposal
+   */
   public static Proposal decode(final Bytes data) {
     final RLPInput rlpIn = RLP.input(data);
     rlpIn.enterList();
     final SignedData<ProposalPayload> payload =
         PayloadDeserializers.readSignedProposalPayloadFrom(rlpIn);
-    final Block proposedBlock = Block.readFrom(rlpIn, IbftBlockHeaderFunctions.forCommittedSeal());
+    final Block proposedBlock =
+        Block.readFrom(rlpIn, BftBlockHeaderFunctions.forCommittedSeal(BFT_EXTRA_DATA_ENCODER));
 
     final Optional<RoundChangeCertificate> roundChangeCertificate =
         readRoundChangeCertificate(rlpIn);
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/RoundChange.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/RoundChange.java
index 04ae87e9abf..11755368071 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/RoundChange.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/messagewrappers/RoundChange.java
@@ -14,10 +14,11 @@
  */
 package org.hyperledger.besu.consensus.ibft.messagewrappers;
 
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
 import org.hyperledger.besu.consensus.common.bft.messagewrappers.BftMessage;
 import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
-import org.hyperledger.besu.consensus.ibft.IbftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.ibft.IbftExtraDataCodec;
 import org.hyperledger.besu.consensus.ibft.payload.PayloadDeserializers;
 import org.hyperledger.besu.consensus.ibft.payload.PreparedCertificate;
 import org.hyperledger.besu.consensus.ibft.payload.RoundChangePayload;
@@ -30,24 +31,47 @@
 
 import org.apache.tuweni.bytes.Bytes;
 
+/** The Round change. */
 public class RoundChange extends BftMessage<RoundChangePayload> {
 
+  private static final IbftExtraDataCodec BFT_EXTRA_DATA_ENCODER = new IbftExtraDataCodec();
   private final Optional<Block> proposedBlock;
 
+  /**
+   * Instantiates a new Round change.
+   *
+   * @param payload the payload
+   * @param proposedBlock the proposed block
+   */
   public RoundChange(
       final SignedData<RoundChangePayload> payload, final Optional<Block> proposedBlock) {
     super(payload);
     this.proposedBlock = proposedBlock;
   }
 
+  /**
+   * Gets proposed block.
+   *
+   * @return the proposed block
+   */
   public Optional<Block> getProposedBlock() {
     return proposedBlock;
   }
 
+  /**
+   * Gets prepared certificate.
+   *
+   * @return the prepared certificate
+   */
   public Optional<PreparedCertificate> getPreparedCertificate() {
     return getPayload().getPreparedCertificate();
   }
 
+  /**
+   * Gets prepared certificate round.
+   *
+   * @return the prepared certificate round
+   */
   public Optional<ConsensusRoundIdentifier> getPreparedCertificateRound() {
     return getPreparedCertificate()
         .map(prepCert -> prepCert.getProposalPayload().getPayload().getRoundIdentifier());
@@ -67,6 +91,12 @@ public Bytes encode() {
     return rlpOut.encoded();
   }
 
+  /**
+   * Decode data to round change.
+   *
+   * @param data the data
+   * @return the round change
+   */
   public static RoundChange decode(final Bytes data) {
 
     final RLPInput rlpIn = RLP.input(data);
@@ -75,7 +105,10 @@ public static RoundChange decode(final Bytes data) {
         PayloadDeserializers.readSignedRoundChangePayloadFrom(rlpIn);
     Optional<Block> block = Optional.empty();
     if (!rlpIn.nextIsNull()) {
-      block = Optional.of(Block.readFrom(rlpIn, IbftBlockHeaderFunctions.forCommittedSeal()));
+      block =
+          Optional.of(
+              Block.readFrom(
+                  rlpIn, BftBlockHeaderFunctions.forCommittedSeal(BFT_EXTRA_DATA_ENCODER)));
     } else {
       rlpIn.skipNext();
     }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/IbftMessageTransmitter.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/IbftMessageTransmitter.java
index a820b3f19db..bcb7cdb211b 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/IbftMessageTransmitter.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/IbftMessageTransmitter.java
@@ -15,6 +15,7 @@
 package org.hyperledger.besu.consensus.ibft.network;
 
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.network.ValidatorMulticaster;
 import org.hyperledger.besu.consensus.ibft.messagedata.CommitMessageData;
 import org.hyperledger.besu.consensus.ibft.messagedata.PrepareMessageData;
 import org.hyperledger.besu.consensus.ibft.messagedata.ProposalMessageData;
@@ -26,29 +27,43 @@
 import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
 import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate;
 import org.hyperledger.besu.consensus.ibft.statemachine.PreparedRoundArtifacts;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.plugin.services.securitymodule.SecurityModuleException;
 
 import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Ibft message transmitter. */
 public class IbftMessageTransmitter {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(IbftMessageTransmitter.class);
 
   private final MessageFactory messageFactory;
   private final ValidatorMulticaster multicaster;
 
+  /**
+   * Instantiates a new Ibft message transmitter.
+   *
+   * @param messageFactory the message factory
+   * @param multicaster the multicaster
+   */
   public IbftMessageTransmitter(
       final MessageFactory messageFactory, final ValidatorMulticaster multicaster) {
     this.messageFactory = messageFactory;
     this.multicaster = multicaster;
   }
 
+  /**
+   * Multicast proposal.
+   *
+   * @param roundIdentifier the round identifier
+   * @param block the block
+   * @param roundChangeCertificate the round change certificate
+   */
   public void multicastProposal(
       final ConsensusRoundIdentifier roundIdentifier,
       final Block block,
@@ -65,6 +80,12 @@ public void multicastProposal(
     }
   }
 
+  /**
+   * Multicast prepare.
+   *
+   * @param roundIdentifier the round identifier
+   * @param digest the digest
+   */
   public void multicastPrepare(final ConsensusRoundIdentifier roundIdentifier, final Hash digest) {
     try {
       final Prepare data = messageFactory.createPrepare(roundIdentifier, digest);
@@ -77,10 +98,17 @@ public void multicastPrepare(final ConsensusRoundIdentifier roundIdentifier, fin
     }
   }
 
+  /**
+   * Multicast commit.
+   *
+   * @param roundIdentifier the round identifier
+   * @param digest the digest
+   * @param commitSeal the commit seal
+   */
   public void multicastCommit(
       final ConsensusRoundIdentifier roundIdentifier,
       final Hash digest,
-      final Signature commitSeal) {
+      final SECPSignature commitSeal) {
     try {
       final Commit data = messageFactory.createCommit(roundIdentifier, digest, commitSeal);
 
@@ -92,6 +120,12 @@ public void multicastCommit(
     }
   }
 
+  /**
+   * Multicast round change.
+   *
+   * @param roundIdentifier the round identifier
+   * @param preparedRoundArtifacts the prepared round artifacts
+   */
   public void multicastRoundChange(
       final ConsensusRoundIdentifier roundIdentifier,
       final Optional<PreparedRoundArtifacts> preparedRoundArtifacts) {
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/ValidatorMulticaster.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/ValidatorMulticaster.java
deleted file mode 100644
index 6ff1c376d9b..00000000000
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/network/ValidatorMulticaster.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft.network;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
-
-import java.util.Collection;
-
-public interface ValidatorMulticaster {
-
-  void send(final MessageData message);
-
-  void send(final MessageData message, final Collection<Address> denylist);
-}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/CommitPayload.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/CommitPayload.java
index cd069073d13..a9586b0cbc5 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/CommitPayload.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/CommitPayload.java
@@ -17,34 +17,50 @@
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
 import org.hyperledger.besu.consensus.common.bft.payload.Payload;
 import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
 
 import java.util.Objects;
 import java.util.StringJoiner;
 
-public class CommitPayload implements Payload {
+/** The Commit payload. */
+public class CommitPayload extends IbftPayload {
   private static final int TYPE = IbftV2.COMMIT;
   private final ConsensusRoundIdentifier roundIdentifier;
   private final Hash digest;
-  private final Signature commitSeal;
+  private final SECPSignature commitSeal;
 
+  /**
+   * Instantiates a new Commit payload.
+   *
+   * @param roundIdentifier the round identifier
+   * @param digest the digest
+   * @param commitSeal the commit seal
+   */
   public CommitPayload(
       final ConsensusRoundIdentifier roundIdentifier,
       final Hash digest,
-      final Signature commitSeal) {
+      final SECPSignature commitSeal) {
     this.roundIdentifier = roundIdentifier;
     this.digest = digest;
     this.commitSeal = commitSeal;
   }
 
+  /**
+   * Read from rlp input and return commit payload.
+   *
+   * @param rlpInput the rlp input
+   * @return the commit payload
+   */
   public static CommitPayload readFrom(final RLPInput rlpInput) {
     rlpInput.enterList();
     final ConsensusRoundIdentifier roundIdentifier = ConsensusRoundIdentifier.readFrom(rlpInput);
     final Hash digest = Payload.readDigest(rlpInput);
-    final Signature commitSeal = rlpInput.readBytes(Signature::decode);
+    final SECPSignature commitSeal =
+        rlpInput.readBytes(SignatureAlgorithmFactory.getInstance()::decodeSignature);
     rlpInput.leaveList();
 
     return new CommitPayload(roundIdentifier, digest, commitSeal);
@@ -64,11 +80,21 @@ public int getMessageType() {
     return TYPE;
   }
 
+  /**
+   * Gets digest.
+   *
+   * @return the digest
+   */
   public Hash getDigest() {
     return digest;
   }
 
-  public Signature getCommitSeal() {
+  /**
+   * Gets commit seal.
+   *
+   * @return the commit seal
+   */
+  public SECPSignature getCommitSeal() {
     return commitSeal;
   }
 
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/IbftPayload.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/IbftPayload.java
new file mode 100644
index 00000000000..280b1eaa5d2
--- /dev/null
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/IbftPayload.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.ibft.payload;
+
+import org.hyperledger.besu.consensus.common.bft.payload.Payload;
+import org.hyperledger.besu.datatypes.Hash;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Ibft payload. */
+public abstract class IbftPayload implements Payload {
+
+  @Override
+  public Hash hashForSignature() {
+    return Hash.hash(Bytes.concatenate(Bytes.of(getMessageType()), encoded()));
+  }
+}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/MessageFactory.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/MessageFactory.java
index bf5bcb5d354..5e52dfcc5d2 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/MessageFactory.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/MessageFactory.java
@@ -22,24 +22,35 @@
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange;
 import org.hyperledger.besu.consensus.ibft.statemachine.PreparedRoundArtifacts;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Util;
 
 import java.util.Optional;
 
-import org.apache.tuweni.bytes.Bytes;
-
+/** The Message factory. */
 public class MessageFactory {
 
   private final NodeKey nodeKey;
 
+  /**
+   * Instantiates a new Message factory.
+   *
+   * @param nodeKey the node key
+   */
   public MessageFactory(final NodeKey nodeKey) {
     this.nodeKey = nodeKey;
   }
 
+  /**
+   * Create proposal.
+   *
+   * @param roundIdentifier the round identifier
+   * @param block the block
+   * @param roundChangeCertificate the round change certificate
+   * @return the proposal
+   */
   public Proposal createProposal(
       final ConsensusRoundIdentifier roundIdentifier,
       final Block block,
@@ -50,6 +61,13 @@ public Proposal createProposal(
     return new Proposal(createSignedMessage(payload), block, roundChangeCertificate);
   }
 
+  /**
+   * Create prepare.
+   *
+   * @param roundIdentifier the round identifier
+   * @param digest the digest
+   * @return the prepare
+   */
   public Prepare createPrepare(final ConsensusRoundIdentifier roundIdentifier, final Hash digest) {
 
     final PreparePayload payload = new PreparePayload(roundIdentifier, digest);
@@ -57,16 +75,31 @@ public Prepare createPrepare(final ConsensusRoundIdentifier roundIdentifier, fin
     return new Prepare(createSignedMessage(payload));
   }
 
+  /**
+   * Create commit.
+   *
+   * @param roundIdentifier the round identifier
+   * @param digest the digest
+   * @param commitSeal the commit seal
+   * @return the commit
+   */
   public Commit createCommit(
       final ConsensusRoundIdentifier roundIdentifier,
       final Hash digest,
-      final Signature commitSeal) {
+      final SECPSignature commitSeal) {
 
     final CommitPayload payload = new CommitPayload(roundIdentifier, digest, commitSeal);
 
     return new Commit(createSignedMessage(payload));
   }
 
+  /**
+   * Create round change.
+   *
+   * @param roundIdentifier the round identifier
+   * @param preparedRoundArtifacts the prepared round artifacts
+   * @return the round change
+   */
   public RoundChange createRoundChange(
       final ConsensusRoundIdentifier roundIdentifier,
       final Optional<PreparedRoundArtifacts> preparedRoundArtifacts) {
@@ -80,13 +113,7 @@ public RoundChange createRoundChange(
   }
 
   private <M extends Payload> SignedData<M> createSignedMessage(final M payload) {
-    final Signature signature = nodeKey.sign(hashForSignature(payload));
-    return new SignedData<>(payload, Util.publicKeyToAddress(nodeKey.getPublicKey()), signature);
-  }
-
-  public static Hash hashForSignature(final Payload unsignedMessageData) {
-    return Hash.hash(
-        Bytes.concatenate(
-            Bytes.of(unsignedMessageData.getMessageType()), unsignedMessageData.encoded()));
+    final SECPSignature signature = nodeKey.sign(payload.hashForSignature());
+    return SignedData.create(payload, signature);
   }
 }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PayloadDeserializers.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PayloadDeserializers.java
index b6839918a2c..cb68290251d 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PayloadDeserializers.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PayloadDeserializers.java
@@ -16,69 +16,98 @@
 
 import org.hyperledger.besu.consensus.common.bft.payload.Payload;
 import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Util;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 
+/** The Payload deserializers. */
 public class PayloadDeserializers {
 
+  /**
+   * Read signed proposal payload from rlp input.
+   *
+   * @param rlpInput the rlp input
+   * @return the signed data
+   */
   public static SignedData<ProposalPayload> readSignedProposalPayloadFrom(final RLPInput rlpInput) {
 
     rlpInput.enterList();
     final ProposalPayload unsignedMessageData = ProposalPayload.readFrom(rlpInput);
-    final Signature signature = readSignature(rlpInput);
+    final SECPSignature signature = readSignature(rlpInput);
     rlpInput.leaveList();
 
     return from(unsignedMessageData, signature);
   }
 
+  /**
+   * Read signed prepare payload from rlp input.
+   *
+   * @param rlpInput the rlp input
+   * @return the signed data
+   */
   public static SignedData<PreparePayload> readSignedPreparePayloadFrom(final RLPInput rlpInput) {
 
     rlpInput.enterList();
     final PreparePayload unsignedMessageData = PreparePayload.readFrom(rlpInput);
-    final Signature signature = readSignature(rlpInput);
+    final SECPSignature signature = readSignature(rlpInput);
     rlpInput.leaveList();
 
     return from(unsignedMessageData, signature);
   }
 
+  /**
+   * Read signed commit payload from rlp input.
+   *
+   * @param rlpInput the rlp input
+   * @return the signed data
+   */
   public static SignedData<CommitPayload> readSignedCommitPayloadFrom(final RLPInput rlpInput) {
 
     rlpInput.enterList();
     final CommitPayload unsignedMessageData = CommitPayload.readFrom(rlpInput);
-    final Signature signature = readSignature(rlpInput);
+    final SECPSignature signature = readSignature(rlpInput);
     rlpInput.leaveList();
 
     return from(unsignedMessageData, signature);
   }
 
+  /**
+   * Read signed round change payload from rlp input.
+   *
+   * @param rlpInput the rlp input
+   * @return the signed data
+   */
   public static SignedData<RoundChangePayload> readSignedRoundChangePayloadFrom(
       final RLPInput rlpInput) {
 
     rlpInput.enterList();
     final RoundChangePayload unsignedMessageData = RoundChangePayload.readFrom(rlpInput);
-    final Signature signature = readSignature(rlpInput);
+    final SECPSignature signature = readSignature(rlpInput);
     rlpInput.leaveList();
 
     return from(unsignedMessageData, signature);
   }
 
+  /**
+   * Create signed payload data from unsigned message data.
+   *
+   * @param <M> the type parameter
+   * @param unsignedMessageData the unsigned message data
+   * @param signature the signature
+   * @return the signed data
+   */
   protected static <M extends Payload> SignedData<M> from(
-      final M unsignedMessageData, final Signature signature) {
-
-    final Address sender = recoverSender(unsignedMessageData, signature);
-
-    return new SignedData<>(unsignedMessageData, sender, signature);
+      final M unsignedMessageData, final SECPSignature signature) {
+    return SignedData.create(unsignedMessageData, signature);
   }
 
-  protected static Signature readSignature(final RLPInput signedMessage) {
-    return signedMessage.readBytes(Signature::decode);
-  }
-
-  protected static Address recoverSender(
-      final Payload unsignedMessageData, final Signature signature) {
-
-    return Util.signatureToAddress(signature, MessageFactory.hashForSignature(unsignedMessageData));
+  /**
+   * Read signature from signed message.
+   *
+   * @param signedMessage the signed message
+   * @return the secp signature
+   */
+  protected static SECPSignature readSignature(final RLPInput signedMessage) {
+    return signedMessage.readBytes(SignatureAlgorithmFactory.getInstance()::decodeSignature);
   }
 }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PreparePayload.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PreparePayload.java
index 52188d19b45..0768a14454f 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PreparePayload.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PreparePayload.java
@@ -17,23 +17,36 @@
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
 import org.hyperledger.besu.consensus.common.bft.payload.Payload;
 import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
 
 import java.util.Objects;
 import java.util.StringJoiner;
 
-public class PreparePayload implements Payload {
+/** The Prepare payload. */
+public class PreparePayload extends IbftPayload {
   private static final int TYPE = IbftV2.PREPARE;
   private final ConsensusRoundIdentifier roundIdentifier;
   private final Hash digest;
 
+  /**
+   * Instantiates a new Prepare payload.
+   *
+   * @param roundIdentifier the round identifier
+   * @param digest the digest
+   */
   public PreparePayload(final ConsensusRoundIdentifier roundIdentifier, final Hash digest) {
     this.roundIdentifier = roundIdentifier;
     this.digest = digest;
   }
 
+  /**
+   * Read from rlp input.
+   *
+   * @param rlpInput the rlp input
+   * @return the prepare payload
+   */
   public static PreparePayload readFrom(final RLPInput rlpInput) {
     rlpInput.enterList();
     final ConsensusRoundIdentifier roundIdentifier = ConsensusRoundIdentifier.readFrom(rlpInput);
@@ -55,6 +68,11 @@ public int getMessageType() {
     return TYPE;
   }
 
+  /**
+   * Gets digest.
+   *
+   * @return the digest
+   */
   public Hash getDigest() {
     return digest;
   }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PreparedCertificate.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PreparedCertificate.java
index 536101cb8a6..71a31f2f09d 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PreparedCertificate.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/PreparedCertificate.java
@@ -23,10 +23,17 @@
 import java.util.Objects;
 import java.util.StringJoiner;
 
+/** The Prepared certificate. */
 public class PreparedCertificate {
   private final SignedData<ProposalPayload> proposalPayload;
   private final List<SignedData<PreparePayload>> preparePayloads;
 
+  /**
+   * Instantiates a new Prepared certificate.
+   *
+   * @param proposalPayload the proposal payload
+   * @param preparePayloads the prepare payloads
+   */
   public PreparedCertificate(
       final SignedData<ProposalPayload> proposalPayload,
       final List<SignedData<PreparePayload>> preparePayloads) {
@@ -34,6 +41,12 @@ public PreparedCertificate(
     this.preparePayloads = preparePayloads;
   }
 
+  /**
+   * Read from rlp input.
+   *
+   * @param rlpInput the rlp input
+   * @return the prepared certificate
+   */
   public static PreparedCertificate readFrom(final RLPInput rlpInput) {
     final SignedData<ProposalPayload> proposalMessage;
     final List<SignedData<PreparePayload>> prepareMessages;
@@ -46,6 +59,11 @@ public static PreparedCertificate readFrom(final RLPInput rlpInput) {
     return new PreparedCertificate(proposalMessage, prepareMessages);
   }
 
+  /**
+   * Write to rlp output.
+   *
+   * @param rlpOutput the rlp output
+   */
   public void writeTo(final RLPOutput rlpOutput) {
     rlpOutput.startList();
     proposalPayload.writeTo(rlpOutput);
@@ -53,10 +71,20 @@ public void writeTo(final RLPOutput rlpOutput) {
     rlpOutput.endList();
   }
 
+  /**
+   * Gets proposal payload.
+   *
+   * @return the proposal payload
+   */
   public SignedData<ProposalPayload> getProposalPayload() {
     return proposalPayload;
   }
 
+  /**
+   * Gets prepare payloads.
+   *
+   * @return the prepare payloads
+   */
   public Collection<SignedData<PreparePayload>> getPreparePayloads() {
     return preparePayloads;
   }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/ProposalPayload.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/ProposalPayload.java
index 15a4574b0da..6ae93b173b1 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/ProposalPayload.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/ProposalPayload.java
@@ -15,25 +15,37 @@
 package org.hyperledger.besu.consensus.ibft.payload;
 
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
-import org.hyperledger.besu.consensus.common.bft.payload.Payload;
 import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
 
 import java.util.Objects;
 import java.util.StringJoiner;
 
-public class ProposalPayload implements Payload {
+/** The Proposal payload. */
+public class ProposalPayload extends IbftPayload {
   private static final int TYPE = IbftV2.PROPOSAL;
   private final ConsensusRoundIdentifier roundIdentifier;
   private final Hash digest;
 
+  /**
+   * Instantiates a new Proposal payload.
+   *
+   * @param roundIdentifier the round identifier
+   * @param digest the digest
+   */
   public ProposalPayload(final ConsensusRoundIdentifier roundIdentifier, final Hash digest) {
     this.roundIdentifier = roundIdentifier;
     this.digest = digest;
   }
 
+  /**
+   * Read from rlp input and return proposal payload.
+   *
+   * @param rlpInput the rlp input
+   * @return the proposal payload
+   */
   public static ProposalPayload readFrom(final RLPInput rlpInput) {
     rlpInput.enterList();
     final ConsensusRoundIdentifier roundIdentifier = ConsensusRoundIdentifier.readFrom(rlpInput);
@@ -51,6 +63,11 @@ public void writeTo(final RLPOutput rlpOutput) {
     rlpOutput.endList();
   }
 
+  /**
+   * Gets digest.
+   *
+   * @return the digest
+   */
   public Hash getDigest() {
     return digest;
   }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangeCertificate.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangeCertificate.java
index 8542a00f797..afa35a3d147 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangeCertificate.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangeCertificate.java
@@ -27,14 +27,26 @@
 
 import com.google.common.collect.Lists;
 
+/** The Round change certificate. */
 public class RoundChangeCertificate {
 
   private final List<SignedData<RoundChangePayload>> roundChangePayloads;
 
+  /**
+   * Instantiates a new Round change certificate.
+   *
+   * @param roundChangePayloads the round change payloads
+   */
   public RoundChangeCertificate(final List<SignedData<RoundChangePayload>> roundChangePayloads) {
     this.roundChangePayloads = roundChangePayloads;
   }
 
+  /**
+   * Read from rlp input and return round change certificate.
+   *
+   * @param rlpInput the rlp input
+   * @return the round change certificate
+   */
   public static RoundChangeCertificate readFrom(final RLPInput rlpInput) {
     final List<SignedData<RoundChangePayload>> roundChangePayloads;
 
@@ -45,26 +57,48 @@ public static RoundChangeCertificate readFrom(final RLPInput rlpInput) {
     return new RoundChangeCertificate(roundChangePayloads);
   }
 
+  /**
+   * Write to rlp output.
+   *
+   * @param rlpOutput the rlp output
+   */
   public void writeTo(final RLPOutput rlpOutput) {
     rlpOutput.startList();
     rlpOutput.writeList(roundChangePayloads, SignedData::writeTo);
     rlpOutput.endList();
   }
 
+  /**
+   * Gets round change payloads.
+   *
+   * @return the round change payloads
+   */
   public Collection<SignedData<RoundChangePayload>> getRoundChangePayloads() {
     return roundChangePayloads;
   }
 
+  /** The Builder. */
   public static class Builder {
 
     private final List<RoundChange> roundChangePayloads = Lists.newArrayList();
 
+    /** Instantiates a new Builder. */
     public Builder() {}
 
+    /**
+     * Append round change message.
+     *
+     * @param msg the msg
+     */
     public void appendRoundChangeMessage(final RoundChange msg) {
       roundChangePayloads.add(msg);
     }
 
+    /**
+     * Build round change certificate.
+     *
+     * @return the round change certificate
+     */
     public RoundChangeCertificate buildCertificate() {
       return new RoundChangeCertificate(
           roundChangePayloads.stream()
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangePayload.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangePayload.java
index 92b5bf061fe..4b4d213a8ab 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangePayload.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangePayload.java
@@ -15,7 +15,6 @@
 package org.hyperledger.besu.consensus.ibft.payload;
 
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
-import org.hyperledger.besu.consensus.common.bft.payload.Payload;
 import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
@@ -24,13 +23,20 @@
 import java.util.Optional;
 import java.util.StringJoiner;
 
-public class RoundChangePayload implements Payload {
+/** The Round change payload. */
+public class RoundChangePayload extends IbftPayload {
   private static final int TYPE = IbftV2.ROUND_CHANGE;
   private final ConsensusRoundIdentifier roundChangeIdentifier;
 
   // The validator may not hae any prepared certificate
   private final Optional<PreparedCertificate> preparedCertificate;
 
+  /**
+   * Instantiates a new Round change payload.
+   *
+   * @param roundIdentifier the round identifier
+   * @param preparedCertificate the prepared certificate
+   */
   public RoundChangePayload(
       final ConsensusRoundIdentifier roundIdentifier,
       final Optional<PreparedCertificate> preparedCertificate) {
@@ -43,6 +49,11 @@ public ConsensusRoundIdentifier getRoundIdentifier() {
     return roundChangeIdentifier;
   }
 
+  /**
+   * Gets prepared certificate.
+   *
+   * @return the prepared certificate
+   */
   public Optional<PreparedCertificate> getPreparedCertificate() {
     return preparedCertificate;
   }
@@ -61,6 +72,12 @@ public void writeTo(final RLPOutput rlpOutput) {
     rlpOutput.endList();
   }
 
+  /**
+   * Read from rlp input and return round change payload.
+   *
+   * @param rlpInput the rlp input
+   * @return the round change payload
+   */
   public static RoundChangePayload readFrom(final RLPInput rlpInput) {
     rlpInput.enterList();
     final ConsensusRoundIdentifier roundIdentifier = ConsensusRoundIdentifier.readFrom(rlpInput);
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/protocol/IbftProtocolManager.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/protocol/IbftProtocolManager.java
deleted file mode 100644
index 0006e3b8fb7..00000000000
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/protocol/IbftProtocolManager.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft.protocol;
-
-import org.hyperledger.besu.consensus.common.bft.BftEventQueue;
-import org.hyperledger.besu.consensus.common.bft.events.BftEvent;
-import org.hyperledger.besu.consensus.common.bft.events.BftEvents;
-import org.hyperledger.besu.consensus.ibft.network.PeerConnectionTracker;
-import org.hyperledger.besu.ethereum.p2p.network.ProtocolManager;
-import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
-import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
-import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message;
-import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class IbftProtocolManager implements ProtocolManager {
-  private final BftEventQueue bftEventQueue;
-
-  private final PeerConnectionTracker peers;
-
-  /**
-   * Constructor for the ibft protocol manager
-   *
-   * @param bftEventQueue Entry point into the ibft event processor
-   * @param peers Used to track all connected IBFT peers.
-   */
-  public IbftProtocolManager(final BftEventQueue bftEventQueue, final PeerConnectionTracker peers) {
-    this.bftEventQueue = bftEventQueue;
-    this.peers = peers;
-  }
-
-  @Override
-  public String getSupportedProtocol() {
-    return IbftSubProtocol.get().getName();
-  }
-
-  @Override
-  public List<Capability> getSupportedCapabilities() {
-    return Arrays.asList(IbftSubProtocol.IBFV1);
-  }
-
-  @Override
-  public void stop() {}
-
-  @Override
-  public void awaitStop() throws InterruptedException {}
-
-  /**
-   * This function is called by the P2P framework when an "IBF" message has been received. This
-   * function is responsible for:
-   *
-   * <ul>
-   *   <li>Determining if the message was from a current validator (discard if not)
-   *   <li>Determining if the message received was for the 'current round', discarding if old and
-   *       buffering for the future if ahead of current state.
-   *   <li>If the received message is otherwise valid, it is sent to the state machine which is
-   *       responsible for determining how to handle the message given its internal state.
-   * </ul>
-   *
-   * @param cap The capability under which the message was transmitted.
-   * @param message The message to be decoded.
-   */
-  @Override
-  public void processMessage(final Capability cap, final Message message) {
-    final BftEvent messageEvent = BftEvents.fromMessage(message);
-    bftEventQueue.add(messageEvent);
-  }
-
-  @Override
-  public void handleNewConnection(final PeerConnection peerConnection) {
-    peers.add(peerConnection);
-  }
-
-  @Override
-  public void handleDisconnect(
-      final PeerConnection peerConnection,
-      final DisconnectReason disconnectReason,
-      final boolean initiatedByPeer) {
-    peers.remove(peerConnection);
-  }
-}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/protocol/IbftSubProtocol.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/protocol/IbftSubProtocol.java
index 82d06a86c42..d21f269b1bb 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/protocol/IbftSubProtocol.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/protocol/IbftSubProtocol.java
@@ -18,13 +18,21 @@
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol;
 
+/** The Ibft sub protocol. */
 public class IbftSubProtocol implements SubProtocol {
 
+  /** The constant NAME. */
   public static String NAME = "IBF";
+  /** The constant IBFV1. */
   public static final Capability IBFV1 = Capability.create(NAME, 1);
 
   private static final IbftSubProtocol INSTANCE = new IbftSubProtocol();
 
+  /**
+   * Get ibft sub protocol.
+   *
+   * @return the ibft sub protocol
+   */
   public static IbftSubProtocol get() {
     return INSTANCE;
   }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/queries/IbftQueryServiceImpl.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/queries/IbftQueryServiceImpl.java
index 719809fae17..3683c6015d4 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/queries/IbftQueryServiceImpl.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/queries/IbftQueryServiceImpl.java
@@ -14,15 +14,14 @@
  */
 package org.hyperledger.besu.consensus.ibft.queries;
 
-import org.hyperledger.besu.consensus.common.BlockInterface;
 import org.hyperledger.besu.consensus.common.PoaQueryServiceImpl;
-import org.hyperledger.besu.consensus.ibft.IbftBlockHashing;
-import org.hyperledger.besu.consensus.ibft.IbftExtraData;
-import org.hyperledger.besu.crypto.NodeKey;
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.plugin.data.Address;
 import org.hyperledger.besu.plugin.services.query.IbftQueryService;
 
 import java.util.Collection;
@@ -30,17 +29,28 @@
 
 import org.apache.tuweni.bytes.Bytes32;
 
+/** The Ibft query service. */
 public class IbftQueryServiceImpl extends PoaQueryServiceImpl implements IbftQueryService {
 
+  private final BftBlockInterface blockInterface;
+
+  /**
+   * Instantiates a new Ibft query service.
+   *
+   * @param blockInterface the block interface
+   * @param blockchain the blockchain
+   * @param nodeKey the node key
+   */
   public IbftQueryServiceImpl(
-      final BlockInterface blockInterface, final Blockchain blockchain, final NodeKey nodeKey) {
+      final BftBlockInterface blockInterface, final Blockchain blockchain, final NodeKey nodeKey) {
     super(blockInterface, blockchain, nodeKey);
+    this.blockInterface = blockInterface;
   }
 
   @Override
   public int getRoundNumberFrom(final org.hyperledger.besu.plugin.data.BlockHeader header) {
     final BlockHeader headerFromChain = getHeaderFromChain(header);
-    final IbftExtraData extraData = IbftExtraData.decode(headerFromChain);
+    final BftExtraData extraData = blockInterface.getExtraData(headerFromChain);
     return extraData.getRound();
   }
 
@@ -48,10 +58,7 @@ public int getRoundNumberFrom(final org.hyperledger.besu.plugin.data.BlockHeader
   public Collection<Address> getSignersFrom(
       final org.hyperledger.besu.plugin.data.BlockHeader header) {
     final BlockHeader headerFromChain = getHeaderFromChain(header);
-    final IbftExtraData extraData = IbftExtraData.decode(headerFromChain);
-
-    return Collections.unmodifiableList(
-        IbftBlockHashing.recoverCommitterAddresses(headerFromChain, extraData));
+    return Collections.unmodifiableList(blockInterface.getCommitters(headerFromChain));
   }
 
   private BlockHeader getHeaderFromChain(
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/BaseIbftBlockHeightManager.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/BaseIbftBlockHeightManager.java
new file mode 100644
index 00000000000..500aa95dae9
--- /dev/null
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/BaseIbftBlockHeightManager.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.ibft.statemachine;
+
+import org.hyperledger.besu.consensus.common.bft.statemachine.BaseBlockHeightManager;
+import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit;
+import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal;
+import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange;
+
+/** The interface Base ibft block height manager. */
+public interface BaseIbftBlockHeightManager extends BaseBlockHeightManager {
+
+  /**
+   * Handle proposal payload.
+   *
+   * @param proposal the proposal
+   */
+  void handleProposalPayload(Proposal proposal);
+
+  /**
+   * Handle prepare payload.
+   *
+   * @param prepare the prepare
+   */
+  void handlePreparePayload(Prepare prepare);
+
+  /**
+   * Handle commit payload.
+   *
+   * @param commit the commit
+   */
+  void handleCommitPayload(Commit commit);
+
+  /**
+   * Handle round change payload.
+   *
+   * @param roundChange the round change
+   */
+  void handleRoundChangePayload(RoundChange roundChange);
+}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/BlockHeightManager.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/BlockHeightManager.java
deleted file mode 100644
index 5facdda17e3..00000000000
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/BlockHeightManager.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft.statemachine;
-
-import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
-import org.hyperledger.besu.consensus.common.bft.events.RoundExpiry;
-import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit;
-import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare;
-import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal;
-import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-
-public interface BlockHeightManager {
-
-  void handleBlockTimerExpiry(ConsensusRoundIdentifier roundIdentifier);
-
-  void roundExpired(RoundExpiry expire);
-
-  void handleProposalPayload(Proposal proposal);
-
-  void handlePreparePayload(Prepare prepare);
-
-  void handleCommitPayload(Commit commit);
-
-  void handleRoundChangePayload(RoundChange roundChange);
-
-  long getChainHeight();
-
-  BlockHeader getParentBlockHeader();
-}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManager.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManager.java
index 2d36fc6a35b..371cdb61f77 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManager.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManager.java
@@ -23,6 +23,7 @@
 import org.hyperledger.besu.consensus.common.bft.events.RoundExpiry;
 import org.hyperledger.besu.consensus.common.bft.messagewrappers.BftMessage;
 import org.hyperledger.besu.consensus.common.bft.payload.Payload;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftFinalState;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal;
@@ -44,8 +45,8 @@
 import java.util.function.Function;
 
 import com.google.common.collect.Maps;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Responsible for starting/clearing Consensus rounds at a given block height. One of these is
@@ -53,9 +54,9 @@
  * and sends a Proposal message. If the round times out prior to importing a block, this class is
  * responsible for creating a RoundChange message and transmitting it.
  */
-public class IbftBlockHeightManager implements BlockHeightManager {
+public class IbftBlockHeightManager implements BaseIbftBlockHeightManager {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(IbftBlockHeightManager.class);
 
   private final IbftRoundFactory roundFactory;
   private final RoundChangeManager roundChangeManager;
@@ -67,24 +68,37 @@ public class IbftBlockHeightManager implements BlockHeightManager {
   private final FutureRoundProposalMessageValidator futureRoundProposalMessageValidator;
   private final Clock clock;
   private final Function<ConsensusRoundIdentifier, RoundState> roundStateCreator;
-  private final IbftFinalState finalState;
+  private final BftFinalState finalState;
 
   private Optional<PreparedRoundArtifacts> latestPreparedRoundArtifacts = Optional.empty();
 
   private IbftRound currentRound;
 
+  /**
+   * Instantiates a new Ibft block height manager.
+   *
+   * @param parentHeader the parent header
+   * @param finalState the final state
+   * @param roundChangeManager the round change manager
+   * @param ibftRoundFactory the ibft round factory
+   * @param clock the clock
+   * @param messageValidatorFactory the message validator factory
+   * @param messageFactory the message factory
+   */
   public IbftBlockHeightManager(
       final BlockHeader parentHeader,
-      final IbftFinalState finalState,
+      final BftFinalState finalState,
       final RoundChangeManager roundChangeManager,
       final IbftRoundFactory ibftRoundFactory,
       final Clock clock,
-      final MessageValidatorFactory messageValidatorFactory) {
+      final MessageValidatorFactory messageValidatorFactory,
+      final MessageFactory messageFactory) {
     this.parentHeader = parentHeader;
     this.roundFactory = ibftRoundFactory;
     this.blockTimer = finalState.getBlockTimer();
-    this.transmitter = finalState.getTransmitter();
-    this.messageFactory = finalState.getMessageFactory();
+    this.transmitter =
+        new IbftMessageTransmitter(messageFactory, finalState.getValidatorMulticaster());
+    this.messageFactory = messageFactory;
     this.clock = clock;
     this.roundChangeManager = roundChangeManager;
     this.finalState = finalState;
@@ -109,7 +123,8 @@ public IbftBlockHeightManager(
   @Override
   public void handleBlockTimerExpiry(final ConsensusRoundIdentifier roundIdentifier) {
     if (roundIdentifier.equals(currentRound.getRoundIdentifier())) {
-      currentRound.createAndSendProposalMessage(clock.millis() / 1000);
+      final long headerTimeStampSeconds = Math.round(clock.millis() / 1000D);
+      currentRound.createAndSendProposalMessage(headerTimeStampSeconds);
     } else {
       LOG.trace(
           "Block timer expired for a round ({}) other than current ({})",
@@ -271,9 +286,13 @@ private MessageAge determineAgeOfPayload(final int messageRoundNumber) {
     return PRIOR_ROUND;
   }
 
+  /** The enum Message age. */
   public enum MessageAge {
+    /** Prior round message age. */
     PRIOR_ROUND,
+    /** Current round message age. */
     CURRENT_ROUND,
+    /** Future round message age. */
     FUTURE_ROUND
   }
 }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManagerFactory.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManagerFactory.java
index 8de179fb593..e3e2e0c4354 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManagerFactory.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManagerFactory.java
@@ -14,26 +14,46 @@
  */
 package org.hyperledger.besu.consensus.ibft.statemachine;
 
-import org.hyperledger.besu.consensus.ibft.IbftHelpers;
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftFinalState;
+import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
 import org.hyperledger.besu.consensus.ibft.validation.MessageValidatorFactory;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 
+/** The Ibft block height manager factory. */
 public class IbftBlockHeightManagerFactory {
 
   private final IbftRoundFactory roundFactory;
-  private final IbftFinalState finalState;
+  private final BftFinalState finalState;
   private final MessageValidatorFactory messageValidatorFactory;
+  private final MessageFactory messageFactory;
 
+  /**
+   * Instantiates a new Ibft block height manager factory.
+   *
+   * @param finalState the final state
+   * @param roundFactory the round factory
+   * @param messageValidatorFactory the message validator factory
+   * @param messageFactory the message factory
+   */
   public IbftBlockHeightManagerFactory(
-      final IbftFinalState finalState,
+      final BftFinalState finalState,
       final IbftRoundFactory roundFactory,
-      final MessageValidatorFactory messageValidatorFactory) {
+      final MessageValidatorFactory messageValidatorFactory,
+      final MessageFactory messageFactory) {
     this.roundFactory = roundFactory;
     this.finalState = finalState;
     this.messageValidatorFactory = messageValidatorFactory;
+    this.messageFactory = messageFactory;
   }
 
-  public BlockHeightManager create(final BlockHeader parentHeader) {
+  /**
+   * Create base ibft block height manager.
+   *
+   * @param parentHeader the parent header
+   * @return the base ibft block height manager
+   */
+  public BaseIbftBlockHeightManager create(final BlockHeader parentHeader) {
     if (finalState.isLocalNodeValidator()) {
       return createFullBlockHeightManager(parentHeader);
     } else {
@@ -41,20 +61,21 @@ public BlockHeightManager create(final BlockHeader parentHeader) {
     }
   }
 
-  private BlockHeightManager createNoOpBlockHeightManager(final BlockHeader parentHeader) {
+  private BaseIbftBlockHeightManager createNoOpBlockHeightManager(final BlockHeader parentHeader) {
     return new NoOpBlockHeightManager(parentHeader);
   }
 
-  private BlockHeightManager createFullBlockHeightManager(final BlockHeader parentHeader) {
+  private BaseIbftBlockHeightManager createFullBlockHeightManager(final BlockHeader parentHeader) {
     return new IbftBlockHeightManager(
         parentHeader,
         finalState,
         new RoundChangeManager(
-            IbftHelpers.calculateRequiredValidatorQuorum(finalState.getValidators().size()),
+            BftHelpers.calculateRequiredValidatorQuorum(finalState.getValidators().size()),
             messageValidatorFactory.createRoundChangeMessageValidator(
                 parentHeader.getNumber() + 1L, parentHeader)),
         roundFactory,
         finalState.getClock(),
-        messageValidatorFactory);
+        messageValidatorFactory,
+        messageFactory);
   }
 }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftController.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftController.java
index 550fac78056..2e3c879b76c 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftController.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftController.java
@@ -14,17 +14,13 @@
  */
 package org.hyperledger.besu.consensus.ibft.statemachine;
 
-import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
 import org.hyperledger.besu.consensus.common.bft.Gossiper;
 import org.hyperledger.besu.consensus.common.bft.MessageTracker;
 import org.hyperledger.besu.consensus.common.bft.SynchronizerUpdater;
-import org.hyperledger.besu.consensus.common.bft.events.BftReceivedMessageEvent;
-import org.hyperledger.besu.consensus.common.bft.events.BlockTimerExpiry;
-import org.hyperledger.besu.consensus.common.bft.events.NewChainHead;
-import org.hyperledger.besu.consensus.common.bft.events.RoundExpiry;
-import org.hyperledger.besu.consensus.common.bft.messagewrappers.BftMessage;
-import org.hyperledger.besu.consensus.common.bft.payload.Authored;
-import org.hyperledger.besu.consensus.common.bft.statemachine.BftEventHandler;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BaseBftController;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BaseBlockHeightManager;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftFinalState;
+import org.hyperledger.besu.consensus.common.bft.statemachine.FutureMessageBuffer;
 import org.hyperledger.besu.consensus.ibft.messagedata.CommitMessageData;
 import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2;
 import org.hyperledger.besu.consensus.ibft.messagedata.PrepareMessageData;
@@ -35,62 +31,44 @@
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Consumer;
+/** The Ibft controller. */
+public class IbftController extends BaseBftController {
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-public class IbftController implements BftEventHandler {
-
-  private static final Logger LOG = LogManager.getLogger();
-  private final Blockchain blockchain;
-  private final IbftFinalState ibftFinalState;
+  private BaseIbftBlockHeightManager currentHeightManager;
   private final IbftBlockHeightManagerFactory ibftBlockHeightManagerFactory;
-  private final FutureMessageBuffer futureMessageBuffer;
-  private BlockHeightManager currentHeightManager;
-  private final Gossiper gossiper;
-  private final MessageTracker duplicateMessageTracker;
-  private final SynchronizerUpdater sychronizerUpdater;
-
-  private final AtomicBoolean started = new AtomicBoolean(false);
 
+  /**
+   * Instantiates a new Ibft controller.
+   *
+   * @param blockchain the blockchain
+   * @param bftFinalState the bft final state
+   * @param ibftBlockHeightManagerFactory the ibft block height manager factory
+   * @param gossiper the gossiper
+   * @param duplicateMessageTracker the duplicate message tracker
+   * @param futureMessageBuffer the future message buffer
+   * @param sychronizerUpdater the sychronizer updater
+   */
   public IbftController(
       final Blockchain blockchain,
-      final IbftFinalState ibftFinalState,
+      final BftFinalState bftFinalState,
       final IbftBlockHeightManagerFactory ibftBlockHeightManagerFactory,
       final Gossiper gossiper,
       final MessageTracker duplicateMessageTracker,
       final FutureMessageBuffer futureMessageBuffer,
       final SynchronizerUpdater sychronizerUpdater) {
-    this.blockchain = blockchain;
-    this.ibftFinalState = ibftFinalState;
-    this.ibftBlockHeightManagerFactory = ibftBlockHeightManagerFactory;
-    this.futureMessageBuffer = futureMessageBuffer;
-    this.gossiper = gossiper;
-    this.duplicateMessageTracker = duplicateMessageTracker;
-    this.sychronizerUpdater = sychronizerUpdater;
-  }
 
-  @Override
-  public void start() {
-    if (started.compareAndSet(false, true)) {
-      startNewHeightManager(blockchain.getChainHeadHeader());
-    }
+    super(
+        blockchain,
+        bftFinalState,
+        gossiper,
+        duplicateMessageTracker,
+        futureMessageBuffer,
+        sychronizerUpdater);
+    this.ibftBlockHeightManagerFactory = ibftBlockHeightManagerFactory;
   }
 
   @Override
-  public void handleMessageEvent(final BftReceivedMessageEvent msg) {
-    final MessageData data = msg.getMessage().getData();
-    if (!duplicateMessageTracker.hasSeenMessage(data)) {
-      duplicateMessageTracker.addSeenMessage(data);
-      handleMessage(msg.getMessage());
-    } else {
-      LOG.trace("Discarded duplicate message");
-    }
-  }
-
-  private void handleMessage(final Message message) {
+  protected void handleMessage(final Message message) {
     final MessageData messageData = message.getData();
 
     switch (messageData.getCode()) {
@@ -130,125 +108,13 @@ private void handleMessage(final Message message) {
     }
   }
 
-  private <P extends BftMessage<?>> void consumeMessage(
-      final Message message, final P ibftMessage, final Consumer<P> handleMessage) {
-    LOG.trace("Received IBFT {} message", ibftMessage.getClass().getSimpleName());
-
-    // Discard all messages which target the BLOCKCHAIN height (which SHOULD be 1 less than
-    // the currentHeightManager, but CAN be the same directly following import).
-    if (ibftMessage.getRoundIdentifier().getSequenceNumber()
-        <= blockchain.getChainHeadBlockNumber()) {
-      LOG.debug("Discarding a message which targets a height not above current chain height.");
-      return;
-    }
-
-    if (processMessage(ibftMessage, message)) {
-      gossiper.send(message);
-      handleMessage.accept(ibftMessage);
-    }
-  }
-
-  @Override
-  public void handleNewBlockEvent(final NewChainHead newChainHead) {
-    final BlockHeader newBlockHeader = newChainHead.getNewChainHeadHeader();
-    final BlockHeader currentMiningParent = currentHeightManager.getParentBlockHeader();
-    LOG.debug(
-        "New chain head detected (block number={})," + " currently mining on top of {}.",
-        newBlockHeader.getNumber(),
-        currentMiningParent.getNumber());
-    if (newBlockHeader.getNumber() < currentMiningParent.getNumber()) {
-      LOG.trace(
-          "Discarding NewChainHead event, was for previous block height. chainHeight={} eventHeight={}",
-          currentMiningParent.getNumber(),
-          newBlockHeader.getNumber());
-      return;
-    }
-
-    if (newBlockHeader.getNumber() == currentMiningParent.getNumber()) {
-      if (newBlockHeader.getHash().equals(currentMiningParent.getHash())) {
-        LOG.trace(
-            "Discarding duplicate NewChainHead event. chainHeight={} newBlockHash={} parentBlockHash={}",
-            newBlockHeader.getNumber(),
-            newBlockHeader.getHash(),
-            currentMiningParent.getHash());
-      } else {
-        LOG.error(
-            "Subsequent NewChainHead event at same block height indicates chain fork. chainHeight={}",
-            currentMiningParent.getNumber());
-      }
-      return;
-    }
-    startNewHeightManager(newBlockHeader);
-  }
-
-  @Override
-  public void handleBlockTimerExpiry(final BlockTimerExpiry blockTimerExpiry) {
-    final ConsensusRoundIdentifier roundIndentifier = blockTimerExpiry.getRoundIndentifier();
-    if (isMsgForCurrentHeight(roundIndentifier)) {
-      currentHeightManager.handleBlockTimerExpiry(roundIndentifier);
-    } else {
-      LOG.trace(
-          "Block timer event discarded as it is not for current block height chainHeight={} eventHeight={}",
-          currentHeightManager.getChainHeight(),
-          roundIndentifier.getSequenceNumber());
-    }
-  }
-
   @Override
-  public void handleRoundExpiry(final RoundExpiry roundExpiry) {
-    // Discard all messages which target the BLOCKCHAIN height (which SHOULD be 1 less than
-    // the currentHeightManager, but CAN be the same directly following import).
-    if (roundExpiry.getView().getSequenceNumber() <= blockchain.getChainHeadBlockNumber()) {
-      LOG.debug("Discarding a round-expiry which targets a height not above current chain height.");
-      return;
-    }
-
-    if (isMsgForCurrentHeight(roundExpiry.getView())) {
-      currentHeightManager.roundExpired(roundExpiry);
-    } else {
-      LOG.trace(
-          "Round expiry event discarded as it is not for current block height chainHeight={} eventHeight={}",
-          currentHeightManager.getChainHeight(),
-          roundExpiry.getView().getSequenceNumber());
-    }
-  }
-
-  private void startNewHeightManager(final BlockHeader parentHeader) {
+  protected void createNewHeightManager(final BlockHeader parentHeader) {
     currentHeightManager = ibftBlockHeightManagerFactory.create(parentHeader);
-    final long newChainHeight = currentHeightManager.getChainHeight();
-    futureMessageBuffer.retrieveMessagesForHeight(newChainHeight).forEach(this::handleMessage);
-  }
-
-  private boolean processMessage(final BftMessage<?> msg, final Message rawMsg) {
-    final ConsensusRoundIdentifier msgRoundIdentifier = msg.getRoundIdentifier();
-    if (isMsgForCurrentHeight(msgRoundIdentifier)) {
-      return isMsgFromKnownValidator(msg) && ibftFinalState.isLocalNodeValidator();
-    } else if (isMsgForFutureChainHeight(msgRoundIdentifier)) {
-      LOG.trace("Received message for future block height round={}", msgRoundIdentifier);
-      futureMessageBuffer.addMessage(msgRoundIdentifier.getSequenceNumber(), rawMsg);
-      // Notify the synchronizer the transmitting peer must have the parent block to the received
-      // message's target height.
-      sychronizerUpdater.updatePeerChainState(
-          msgRoundIdentifier.getSequenceNumber() - 1L, rawMsg.getConnection());
-    } else {
-      LOG.trace(
-          "IBFT message discarded as it is from a previous block height messageType={} chainHeight={} eventHeight={}",
-          msg.getMessageType(),
-          currentHeightManager.getChainHeight(),
-          msgRoundIdentifier.getSequenceNumber());
-    }
-    return false;
   }
 
-  private boolean isMsgFromKnownValidator(final Authored msg) {
-    return ibftFinalState.getValidators().contains(msg.getAuthor());
-  }
-
-  private boolean isMsgForCurrentHeight(final ConsensusRoundIdentifier roundIdentifier) {
-    return roundIdentifier.getSequenceNumber() == currentHeightManager.getChainHeight();
-  }
-
-  private boolean isMsgForFutureChainHeight(final ConsensusRoundIdentifier roundIdentifier) {
-    return roundIdentifier.getSequenceNumber() > currentHeightManager.getChainHeight();
+  @Override
+  protected BaseBlockHeightManager getCurrentHeightManager() {
+    return currentHeightManager;
   }
 }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftFinalState.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftFinalState.java
deleted file mode 100644
index fbc47873eb2..00000000000
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftFinalState.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft.statemachine;
-
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
-import org.hyperledger.besu.consensus.common.bft.BlockTimer;
-import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
-import org.hyperledger.besu.consensus.common.bft.RoundTimer;
-import org.hyperledger.besu.consensus.ibft.IbftHelpers;
-import org.hyperledger.besu.consensus.ibft.blockcreation.IbftBlockCreatorFactory;
-import org.hyperledger.besu.consensus.ibft.blockcreation.ProposerSelector;
-import org.hyperledger.besu.consensus.ibft.network.IbftMessageTransmitter;
-import org.hyperledger.besu.consensus.ibft.network.ValidatorMulticaster;
-import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.ethereum.core.Address;
-
-import java.time.Clock;
-import java.util.Collection;
-
-/** This is the full data set, or context, required for many of the aspects of the IBFT workflow. */
-public class IbftFinalState {
-  private final VoteTallyCache voteTallyCache;
-  private final NodeKey nodeKey;
-  private final Address localAddress;
-  private final ProposerSelector proposerSelector;
-  private final RoundTimer roundTimer;
-  private final BlockTimer blockTimer;
-  private final IbftBlockCreatorFactory blockCreatorFactory;
-  private final MessageFactory messageFactory;
-  private final IbftMessageTransmitter messageTransmitter;
-  private final Clock clock;
-
-  public IbftFinalState(
-      final VoteTallyCache voteTallyCache,
-      final NodeKey nodeKey,
-      final Address localAddress,
-      final ProposerSelector proposerSelector,
-      final ValidatorMulticaster validatorMulticaster,
-      final RoundTimer roundTimer,
-      final BlockTimer blockTimer,
-      final IbftBlockCreatorFactory blockCreatorFactory,
-      final MessageFactory messageFactory,
-      final Clock clock) {
-    this.voteTallyCache = voteTallyCache;
-    this.nodeKey = nodeKey;
-    this.localAddress = localAddress;
-    this.proposerSelector = proposerSelector;
-    this.roundTimer = roundTimer;
-    this.blockTimer = blockTimer;
-    this.blockCreatorFactory = blockCreatorFactory;
-    this.messageFactory = messageFactory;
-    this.clock = clock;
-    this.messageTransmitter = new IbftMessageTransmitter(messageFactory, validatorMulticaster);
-  }
-
-  public int getQuorum() {
-    return IbftHelpers.calculateRequiredValidatorQuorum(getValidators().size());
-  }
-
-  public Collection<Address> getValidators() {
-    return voteTallyCache.getVoteTallyAtHead().getValidators();
-  }
-
-  public NodeKey getNodeKey() {
-    return nodeKey;
-  }
-
-  public Address getLocalAddress() {
-    return localAddress;
-  }
-
-  public boolean isLocalNodeProposerForRound(final ConsensusRoundIdentifier roundIdentifier) {
-    return getProposerForRound(roundIdentifier).equals(localAddress);
-  }
-
-  public boolean isLocalNodeValidator() {
-    return getValidators().contains(localAddress);
-  }
-
-  public RoundTimer getRoundTimer() {
-    return roundTimer;
-  }
-
-  public BlockTimer getBlockTimer() {
-    return blockTimer;
-  }
-
-  public IbftBlockCreatorFactory getBlockCreatorFactory() {
-    return blockCreatorFactory;
-  }
-
-  public MessageFactory getMessageFactory() {
-    return messageFactory;
-  }
-
-  public Address getProposerForRound(final ConsensusRoundIdentifier roundIdentifier) {
-    return proposerSelector.selectProposerForRound(roundIdentifier);
-  }
-
-  public IbftMessageTransmitter getTransmitter() {
-    return messageTransmitter;
-  }
-
-  public Clock getClock() {
-    return clock;
-  }
-}
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftRound.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftRound.java
index 1567fd62432..3b40e563e48 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftRound.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftRound.java
@@ -14,61 +14,80 @@
  */
 package org.hyperledger.besu.consensus.ibft.statemachine;
 
+import org.hyperledger.besu.consensus.common.bft.BftBlockHashing;
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftContext;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
 import org.hyperledger.besu.consensus.common.bft.RoundTimer;
-import org.hyperledger.besu.consensus.ibft.IbftBlockHashing;
-import org.hyperledger.besu.consensus.ibft.IbftBlockHeaderFunctions;
-import org.hyperledger.besu.consensus.ibft.IbftBlockInterface;
-import org.hyperledger.besu.consensus.ibft.IbftExtraData;
-import org.hyperledger.besu.consensus.ibft.IbftHelpers;
-import org.hyperledger.besu.consensus.ibft.blockcreation.IbftBlockCreator;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal;
 import org.hyperledger.besu.consensus.ibft.network.IbftMessageTransmitter;
 import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
 import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.blockcreation.BlockCreator;
 import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockImporter;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.mainnet.BlockImportResult;
 import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
 import org.hyperledger.besu.plugin.services.securitymodule.SecurityModuleException;
 import org.hyperledger.besu.util.Subscribers;
 
 import java.util.Optional;
 
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Ibft round. */
 public class IbftRound {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(IbftRound.class);
 
   private final Subscribers<MinedBlockObserver> observers;
   private final RoundState roundState;
-  private final IbftBlockCreator blockCreator;
+  private final BlockCreator blockCreator;
   private final ProtocolContext protocolContext;
   private final BlockImporter blockImporter;
   private final NodeKey nodeKey;
   private final MessageFactory messageFactory; // used only to create stored local msgs
   private final IbftMessageTransmitter transmitter;
-
+  private final BftExtraDataCodec bftExtraDataCodec;
+
+  /**
+   * Instantiates a new Ibft round.
+   *
+   * @param roundState the round state
+   * @param blockCreator the block creator
+   * @param protocolContext the protocol context
+   * @param blockImporter the block importer
+   * @param observers the observers
+   * @param nodeKey the node key
+   * @param messageFactory the message factory
+   * @param transmitter the transmitter
+   * @param roundTimer the round timer
+   * @param bftExtraDataCodec the bft extra data codec
+   */
   public IbftRound(
       final RoundState roundState,
-      final IbftBlockCreator blockCreator,
+      final BlockCreator blockCreator,
       final ProtocolContext protocolContext,
       final BlockImporter blockImporter,
       final Subscribers<MinedBlockObserver> observers,
       final NodeKey nodeKey,
       final MessageFactory messageFactory,
       final IbftMessageTransmitter transmitter,
-      final RoundTimer roundTimer) {
+      final RoundTimer roundTimer,
+      final BftExtraDataCodec bftExtraDataCodec) {
     this.roundState = roundState;
     this.blockCreator = blockCreator;
     this.protocolContext = protocolContext;
@@ -77,41 +96,60 @@ public IbftRound(
     this.nodeKey = nodeKey;
     this.messageFactory = messageFactory;
     this.transmitter = transmitter;
-
+    this.bftExtraDataCodec = bftExtraDataCodec;
     roundTimer.startTimer(getRoundIdentifier());
   }
 
+  /**
+   * Gets round identifier.
+   *
+   * @return the round identifier
+   */
   public ConsensusRoundIdentifier getRoundIdentifier() {
     return roundState.getRoundIdentifier();
   }
 
+  /**
+   * Create and send proposal message.
+   *
+   * @param headerTimeStampSeconds the header time stamp seconds
+   */
   public void createAndSendProposalMessage(final long headerTimeStampSeconds) {
-    final Block block = blockCreator.createBlock(headerTimeStampSeconds);
-    final IbftExtraData extraData = IbftExtraData.decode(block.getHeader());
+    final Block block = blockCreator.createBlock(headerTimeStampSeconds).getBlock();
+    final BftExtraData extraData = bftExtraDataCodec.decode(block.getHeader());
     LOG.debug("Creating proposed block. round={}", roundState.getRoundIdentifier());
     LOG.trace(
         "Creating proposed block with extraData={} blockHeader={}", extraData, block.getHeader());
     updateStateWithProposalAndTransmit(block, Optional.empty());
   }
 
+  /**
+   * Start round with.
+   *
+   * @param roundChangeArtifacts the round change artifacts
+   * @param headerTimestamp the header timestamp
+   */
   public void startRoundWith(
       final RoundChangeArtifacts roundChangeArtifacts, final long headerTimestamp) {
     final Optional<Block> bestBlockFromRoundChange = roundChangeArtifacts.getBlock();
 
     final RoundChangeCertificate roundChangeCertificate =
         roundChangeArtifacts.getRoundChangeCertificate();
-    Block blockToPublish;
+    final Block blockToPublish;
     if (!bestBlockFromRoundChange.isPresent()) {
       LOG.debug("Sending proposal with new block. round={}", roundState.getRoundIdentifier());
-      blockToPublish = blockCreator.createBlock(headerTimestamp);
+      blockToPublish = blockCreator.createBlock(headerTimestamp).getBlock();
     } else {
       LOG.debug(
           "Sending proposal from PreparedCertificate. round={}", roundState.getRoundIdentifier());
+
+      final BftBlockInterface bftBlockInterface =
+          protocolContext.getConsensusContext(BftContext.class).getBlockInterface();
       blockToPublish =
-          IbftBlockInterface.replaceRoundInBlock(
+          bftBlockInterface.replaceRoundInBlock(
               bestBlockFromRoundChange.get(),
               getRoundIdentifier().getRoundNumber(),
-              IbftBlockHeaderFunctions.forCommittedSeal());
+              BftBlockHeaderFunctions.forCommittedSeal(bftExtraDataCodec));
     }
 
     updateStateWithProposalAndTransmit(blockToPublish, Optional.of(roundChangeCertificate));
@@ -132,6 +170,11 @@ private void updateStateWithProposalAndTransmit(
     updateStateWithProposedBlock(proposal);
   }
 
+  /**
+   * Handle proposal message.
+   *
+   * @param msg the msg
+   */
   public void handleProposalMessage(final Proposal msg) {
     LOG.debug("Received a proposal message. round={}", roundState.getRoundIdentifier());
     final Block block = msg.getBlock();
@@ -150,16 +193,31 @@ public void handleProposalMessage(final Proposal msg) {
     }
   }
 
+  /**
+   * Handle prepare message.
+   *
+   * @param msg the msg
+   */
   public void handlePrepareMessage(final Prepare msg) {
     LOG.debug("Received a prepare message. round={}", roundState.getRoundIdentifier());
     peerIsPrepared(msg);
   }
 
+  /**
+   * Handle commit message.
+   *
+   * @param msg the msg
+   */
   public void handleCommitMessage(final Commit msg) {
     LOG.debug("Received a commit message. round={}", roundState.getRoundIdentifier());
     peerIsCommitted(msg);
   }
 
+  /**
+   * Construct prepared round artifacts.
+   *
+   * @return the optional prepared round artifacts
+   */
   public Optional<PreparedRoundArtifacts> constructPreparedRoundArtifacts() {
     return roundState.constructPreparedRoundArtifacts();
   }
@@ -172,12 +230,12 @@ private boolean updateStateWithProposedBlock(final Proposal msg) {
     if (blockAccepted) {
       final Block block = roundState.getProposedBlock().get();
 
-      final Signature commitSeal;
+      final SECPSignature commitSeal;
       try {
         commitSeal = createCommitSeal(block);
       } catch (final SecurityModuleException e) {
         LOG.warn("Failed to construct commit seal; {}", e.getMessage());
-        return blockAccepted;
+        return true;
       }
 
       // There are times handling a proposed block is enough to enter prepared.
@@ -196,7 +254,7 @@ private boolean updateStateWithProposedBlock(final Proposal msg) {
         roundState.addCommitMessage(localCommitMessage);
       } catch (final SecurityModuleException e) {
         LOG.warn("Failed to create signed Commit message; {}", e.getMessage());
-        return blockAccepted;
+        return true;
       }
 
       // It is possible sufficient commit seals are now available and the block should be imported
@@ -234,20 +292,29 @@ private void peerIsCommitted(final Commit msg) {
 
   private void importBlockToChain() {
     final Block blockToImport =
-        IbftHelpers.createSealedBlock(
-            roundState.getProposedBlock().get(), roundState.getCommitSeals());
+        BftHelpers.createSealedBlock(
+            bftExtraDataCodec,
+            roundState.getProposedBlock().get(),
+            roundState.getRoundIdentifier().getRoundNumber(),
+            roundState.getCommitSeals());
 
     final long blockNumber = blockToImport.getHeader().getNumber();
-    final IbftExtraData extraData = IbftExtraData.decode(blockToImport.getHeader());
-    LOG.log(
-        getRoundIdentifier().getRoundNumber() > 0 ? Level.INFO : Level.DEBUG,
-        "Importing block to chain. round={}, hash={}",
-        getRoundIdentifier(),
-        blockToImport.getHash());
+    final BftExtraData extraData = bftExtraDataCodec.decode(blockToImport.getHeader());
+    if (getRoundIdentifier().getRoundNumber() > 0) {
+      LOG.info(
+          "Importing block to chain. round={}, hash={}",
+          getRoundIdentifier(),
+          blockToImport.getHash());
+    } else {
+      LOG.debug(
+          "Importing block to chain. round={}, hash={}",
+          getRoundIdentifier(),
+          blockToImport.getHash());
+    }
     LOG.trace("Importing block with extraData={}", extraData);
-    final boolean result =
+    final BlockImportResult result =
         blockImporter.importBlock(protocolContext, blockToImport, HeaderValidationMode.FULL);
-    if (!result) {
+    if (!result.isImported()) {
       LOG.error(
           "Failed to import block to chain. block={} extraData={} blockHeader={}",
           blockNumber,
@@ -258,11 +325,12 @@ private void importBlockToChain() {
     }
   }
 
-  private Signature createCommitSeal(final Block block) {
+  private SECPSignature createCommitSeal(final Block block) {
     final BlockHeader proposedHeader = block.getHeader();
-    final IbftExtraData extraData = IbftExtraData.decode(proposedHeader);
+    final BftExtraData extraData = bftExtraDataCodec.decode(proposedHeader);
     final Hash commitHash =
-        IbftBlockHashing.calculateDataHashForCommittedSeal(proposedHeader, extraData);
+        new BftBlockHashing(bftExtraDataCodec)
+            .calculateDataHashForCommittedSeal(proposedHeader, extraData);
     return nodeKey.sign(commitHash);
   }
 
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftRoundFactory.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftRoundFactory.java
index c4c0f67aef2..ea416ba7bb0 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftRoundFactory.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftRoundFactory.java
@@ -14,38 +14,68 @@
  */
 package org.hyperledger.besu.consensus.ibft.statemachine;
 
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.BftProtocolSchedule;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
-import org.hyperledger.besu.consensus.ibft.blockcreation.IbftBlockCreator;
-import org.hyperledger.besu.consensus.ibft.blockcreation.IbftBlockCreatorFactory;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.BftBlockCreatorFactory;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftFinalState;
+import org.hyperledger.besu.consensus.ibft.network.IbftMessageTransmitter;
+import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
 import org.hyperledger.besu.consensus.ibft.validation.MessageValidatorFactory;
 import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.blockcreation.BlockCreator;
 import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.util.Subscribers;
 
+/** The Ibft round factory. */
 public class IbftRoundFactory {
-  private final IbftFinalState finalState;
-  private final IbftBlockCreatorFactory blockCreatorFactory;
+
+  private final BftFinalState finalState;
+  private final BftBlockCreatorFactory<?> blockCreatorFactory;
   private final ProtocolContext protocolContext;
-  private final ProtocolSchedule protocolSchedule;
+  private final BftProtocolSchedule protocolSchedule;
   private final Subscribers<MinedBlockObserver> minedBlockObservers;
   private final MessageValidatorFactory messageValidatorFactory;
+  private final MessageFactory messageFactory;
+  private final BftExtraDataCodec bftExtraDataCodec;
 
+  /**
+   * Instantiates a new Ibft round factory.
+   *
+   * @param finalState the final state
+   * @param protocolContext the protocol context
+   * @param protocolSchedule the protocol schedule
+   * @param minedBlockObservers the mined block observers
+   * @param messageValidatorFactory the message validator factory
+   * @param messageFactory the message factory
+   * @param bftExtraDataCodec the bft extra data codec
+   */
   public IbftRoundFactory(
-      final IbftFinalState finalState,
+      final BftFinalState finalState,
       final ProtocolContext protocolContext,
-      final ProtocolSchedule protocolSchedule,
+      final BftProtocolSchedule protocolSchedule,
       final Subscribers<MinedBlockObserver> minedBlockObservers,
-      final MessageValidatorFactory messageValidatorFactory) {
+      final MessageValidatorFactory messageValidatorFactory,
+      final MessageFactory messageFactory,
+      final BftExtraDataCodec bftExtraDataCodec) {
     this.finalState = finalState;
     this.blockCreatorFactory = finalState.getBlockCreatorFactory();
     this.protocolContext = protocolContext;
     this.protocolSchedule = protocolSchedule;
     this.minedBlockObservers = minedBlockObservers;
     this.messageValidatorFactory = messageValidatorFactory;
+    this.messageFactory = messageFactory;
+    this.bftExtraDataCodec = bftExtraDataCodec;
   }
 
+  /**
+   * Create new ibft round.
+   *
+   * @param parentHeader the parent header
+   * @param round the round
+   * @return the ibft round
+   */
   public IbftRound createNewRound(final BlockHeader parentHeader, final int round) {
     long nextBlockHeight = parentHeader.getNumber() + 1;
     final ConsensusRoundIdentifier roundIdentifier =
@@ -60,12 +90,22 @@ public IbftRound createNewRound(final BlockHeader parentHeader, final int round)
     return createNewRoundWithState(parentHeader, roundState);
   }
 
+  /**
+   * Create new Ibft round with state.
+   *
+   * @param parentHeader the parent header
+   * @param roundState the round state
+   * @return the ibft round
+   */
   public IbftRound createNewRoundWithState(
       final BlockHeader parentHeader, final RoundState roundState) {
     final ConsensusRoundIdentifier roundIdentifier = roundState.getRoundIdentifier();
-    final IbftBlockCreator blockCreator =
+    final BlockCreator blockCreator =
         blockCreatorFactory.create(parentHeader, roundIdentifier.getRoundNumber());
 
+    final IbftMessageTransmitter messageTransmitter =
+        new IbftMessageTransmitter(messageFactory, finalState.getValidatorMulticaster());
+
     return new IbftRound(
         roundState,
         blockCreator,
@@ -73,8 +113,9 @@ public IbftRound createNewRoundWithState(
         protocolSchedule.getByBlockNumber(roundIdentifier.getSequenceNumber()).getBlockImporter(),
         minedBlockObservers,
         finalState.getNodeKey(),
-        finalState.getMessageFactory(),
-        finalState.getTransmitter(),
-        finalState.getRoundTimer());
+        messageFactory,
+        messageTransmitter,
+        finalState.getRoundTimer(),
+        bftExtraDataCodec);
   }
 }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/NoOpBlockHeightManager.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/NoOpBlockHeightManager.java
index c2acb4f6894..0f2d2d55e90 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/NoOpBlockHeightManager.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/NoOpBlockHeightManager.java
@@ -22,10 +22,16 @@
 import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 
-public class NoOpBlockHeightManager implements BlockHeightManager {
+/** The NoOp block height manager. */
+public class NoOpBlockHeightManager implements BaseIbftBlockHeightManager {
 
   private final BlockHeader parentHeader;
 
+  /**
+   * Instantiates a new NoOp block height manager.
+   *
+   * @param parentHeader the parent header
+   */
   public NoOpBlockHeightManager(final BlockHeader parentHeader) {
     this.parentHeader = parentHeader;
   }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/PreparedRoundArtifacts.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/PreparedRoundArtifacts.java
index 95891879039..de9bfc4865d 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/PreparedRoundArtifacts.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/PreparedRoundArtifacts.java
@@ -22,20 +22,37 @@
 import java.util.Collection;
 import java.util.stream.Collectors;
 
+/** The Prepared round artifacts. */
 public class PreparedRoundArtifacts {
 
   private final Proposal proposal;
   private final Collection<Prepare> prepares;
 
+  /**
+   * Instantiates a new Prepared round artifacts.
+   *
+   * @param proposal the proposal
+   * @param prepares the prepares
+   */
   public PreparedRoundArtifacts(final Proposal proposal, final Collection<Prepare> prepares) {
     this.proposal = proposal;
     this.prepares = prepares;
   }
 
+  /**
+   * Gets block.
+   *
+   * @return the block
+   */
   public Block getBlock() {
     return proposal.getBlock();
   }
 
+  /**
+   * Gets prepared certificate.
+   *
+   * @return the prepared certificate
+   */
   public PreparedCertificate getPreparedCertificate() {
     return new PreparedCertificate(
         proposal.getSignedPayload(),
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeArtifacts.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeArtifacts.java
index c9ada7dda98..77b4e9de090 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeArtifacts.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeArtifacts.java
@@ -26,25 +26,48 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+/** The Round change artifacts. */
 public class RoundChangeArtifacts {
 
   private final Optional<Block> block;
   private final List<SignedData<RoundChangePayload>> roundChangePayloads;
 
+  /**
+   * Instantiates a new Round change artifacts.
+   *
+   * @param block the block
+   * @param roundChangePayloads the round change payloads
+   */
   public RoundChangeArtifacts(
       final Optional<Block> block, final List<SignedData<RoundChangePayload>> roundChangePayloads) {
     this.block = block;
     this.roundChangePayloads = roundChangePayloads;
   }
 
+  /**
+   * Gets block.
+   *
+   * @return the block
+   */
   public Optional<Block> getBlock() {
     return block;
   }
 
+  /**
+   * Gets round change certificate.
+   *
+   * @return the round change certificate
+   */
   public RoundChangeCertificate getRoundChangeCertificate() {
     return new RoundChangeCertificate(roundChangePayloads);
   }
 
+  /**
+   * Create round change artifacts.
+   *
+   * @param roundChanges the round changes
+   * @return the round change artifacts
+   */
   public static RoundChangeArtifacts create(final Collection<RoundChange> roundChanges) {
 
     final Comparator<RoundChange> preparedRoundComparator =
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeManager.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeManager.java
index cdc818ca414..f5243bb3c7c 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeManager.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeManager.java
@@ -17,7 +17,7 @@
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange;
 import org.hyperledger.besu.consensus.ibft.validation.RoundChangeMessageValidator;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 
 import java.util.Collection;
 import java.util.Map;
@@ -25,12 +25,12 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Maps;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Responsible for handling all RoundChange messages received for a given block height
- * (theoretically, RoundChange messages for a older height should have been previously discarded,
+ * (theoretically, RoundChange messages for an older height should have been previously discarded,
  * and messages for a future round should have been buffered).
  *
  * <p>If enough RoundChange messages all targeting a given round are received (and this node is the
@@ -39,29 +39,51 @@
  */
 public class RoundChangeManager {
 
+  /** The Round change status. */
   public static class RoundChangeStatus {
 
     private final long quorum;
 
+    /** The Received messages. */
     // Store only 1 round change per round per validator
     @VisibleForTesting final Map<Address, RoundChange> receivedMessages = Maps.newLinkedHashMap();
 
     private boolean actioned = false;
 
+    /**
+     * Instantiates a new Round change status.
+     *
+     * @param quorum the quorum
+     */
     public RoundChangeStatus(final long quorum) {
       this.quorum = quorum;
     }
 
+    /**
+     * Add message.
+     *
+     * @param msg the msg
+     */
     public void addMessage(final RoundChange msg) {
       if (!actioned) {
         receivedMessages.putIfAbsent(msg.getAuthor(), msg);
       }
     }
 
+    /**
+     * Is Round change ready.
+     *
+     * @return the boolean
+     */
     public boolean roundChangeReady() {
       return receivedMessages.size() >= quorum && !actioned;
     }
 
+    /**
+     * Create round change certificate collection.
+     *
+     * @return the collection
+     */
     public Collection<RoundChange> createRoundChangeCertificate() {
       if (roundChangeReady()) {
         actioned = true;
@@ -72,14 +94,21 @@ public Collection<RoundChange> createRoundChangeCertificate() {
     }
   }
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(RoundChangeManager.class);
 
+  /** The Round change cache. */
   @VisibleForTesting
   final Map<ConsensusRoundIdentifier, RoundChangeStatus> roundChangeCache = Maps.newHashMap();
 
   private final long quorum;
   private final RoundChangeMessageValidator roundChangeMessageValidator;
 
+  /**
+   * Instantiates a new Round change manager.
+   *
+   * @param quorum the quorum
+   * @param roundChangeMessageValidator the round change message validator
+   */
   public RoundChangeManager(
       final long quorum, final RoundChangeMessageValidator roundChangeMessageValidator) {
     this.quorum = quorum;
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundState.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundState.java
index 15829d74213..fad6def7baf 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundState.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundState.java
@@ -14,13 +14,13 @@
  */
 package org.hyperledger.besu.consensus.ibft.statemachine;
 
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
-import org.hyperledger.besu.consensus.ibft.IbftHelpers;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal;
 import org.hyperledger.besu.consensus.ibft.validation.MessageValidator;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
+import org.hyperledger.besu.crypto.SECPSignature;
 import org.hyperledger.besu.ethereum.core.Block;
 
 import java.util.Collection;
@@ -29,12 +29,13 @@
 import java.util.stream.Collectors;
 
 import com.google.common.collect.Sets;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Round state defines how a round will operate. */
 // Data items used to define how a round will operate
 public class RoundState {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(RoundState.class);
 
   private final ConsensusRoundIdentifier roundIdentifier;
   private final MessageValidator validator;
@@ -50,6 +51,13 @@ public class RoundState {
   private boolean prepared = false;
   private boolean committed = false;
 
+  /**
+   * Instantiates a new Round state.
+   *
+   * @param roundIdentifier the round identifier
+   * @param quorum the quorum
+   * @param validator the validator
+   */
   public RoundState(
       final ConsensusRoundIdentifier roundIdentifier,
       final int quorum,
@@ -59,10 +67,21 @@ public RoundState(
     this.validator = validator;
   }
 
+  /**
+   * Gets round identifier.
+   *
+   * @return the round identifier
+   */
   public ConsensusRoundIdentifier getRoundIdentifier() {
     return roundIdentifier;
   }
 
+  /**
+   * Sets proposed block.
+   *
+   * @param msg the msg
+   * @return the proposed block
+   */
   public boolean setProposedBlock(final Proposal msg) {
 
     if (!proposalMessage.isPresent()) {
@@ -78,6 +97,11 @@ public boolean setProposedBlock(final Proposal msg) {
     return false;
   }
 
+  /**
+   * Add prepare message.
+   *
+   * @param msg the msg
+   */
   public void addPrepareMessage(final Prepare msg) {
     if (!proposalMessage.isPresent() || validator.validatePrepare(msg)) {
       prepareMessages.add(msg);
@@ -86,6 +110,11 @@ public void addPrepareMessage(final Prepare msg) {
     updateState();
   }
 
+  /**
+   * Add commit message.
+   *
+   * @param msg the msg
+   */
   public void addCommitMessage(final Commit msg) {
     if (!proposalMessage.isPresent() || validator.validateCommit(msg)) {
       commitMessages.add(msg);
@@ -98,7 +127,7 @@ public void addCommitMessage(final Commit msg) {
   private void updateState() {
     // NOTE: The quorum for Prepare messages is 1 less than the quorum size as the proposer
     // does not supply a prepare message
-    final long prepareQuorum = IbftHelpers.prepareMessageCountForQuorum(quorum);
+    final long prepareQuorum = BftHelpers.prepareMessageCountForQuorum(quorum);
     prepared = (prepareMessages.size() >= prepareQuorum) && proposalMessage.isPresent();
     committed = (commitMessages.size() >= quorum) && proposalMessage.isPresent();
     LOG.trace(
@@ -111,24 +140,49 @@ private void updateState() {
         quorum);
   }
 
+  /**
+   * Gets proposed block.
+   *
+   * @return the proposed block
+   */
   public Optional<Block> getProposedBlock() {
     return proposalMessage.map(Proposal::getBlock);
   }
 
+  /**
+   * Is prepared.
+   *
+   * @return the boolean
+   */
   public boolean isPrepared() {
     return prepared;
   }
 
+  /**
+   * Is committed.
+   *
+   * @return the boolean
+   */
   public boolean isCommitted() {
     return committed;
   }
 
-  public Collection<Signature> getCommitSeals() {
+  /**
+   * Gets commit seals.
+   *
+   * @return the commit seals
+   */
+  public Collection<SECPSignature> getCommitSeals() {
     return commitMessages.stream()
         .map(cp -> cp.getSignedPayload().getPayload().getCommitSeal())
         .collect(Collectors.toList());
   }
 
+  /**
+   * Construct prepared round artifacts.
+   *
+   * @return the optional Prepared Round Artifacts
+   */
   public Optional<PreparedRoundArtifacts> constructPreparedRoundArtifacts() {
     if (isPrepared()) {
       return Optional.of(new PreparedRoundArtifacts(proposalMessage.get(), prepareMessages));
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/FutureRoundProposalMessageValidator.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/FutureRoundProposalMessageValidator.java
index acc62c021cb..697175c88ea 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/FutureRoundProposalMessageValidator.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/FutureRoundProposalMessageValidator.java
@@ -17,20 +17,29 @@
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Future round proposal message validator. */
 /* One of these will be created by the IbftBlockHeightManager and will exist for the life of the
 chainheight, and used to ensure supplied Proposals are suitable for starting a new round.
  */
 public class FutureRoundProposalMessageValidator {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG =
+      LoggerFactory.getLogger(FutureRoundProposalMessageValidator.class);
 
   private final MessageValidatorFactory messageValidatorFactory;
   private final long chainHeight;
   private final BlockHeader parentHeader;
 
+  /**
+   * Instantiates a new Future round proposal message validator.
+   *
+   * @param messageValidatorFactory the message validator factory
+   * @param chainHeight the chain height
+   * @param parentHeader the parent header
+   */
   public FutureRoundProposalMessageValidator(
       final MessageValidatorFactory messageValidatorFactory,
       final long chainHeight,
@@ -40,6 +49,12 @@ public FutureRoundProposalMessageValidator(
     this.parentHeader = parentHeader;
   }
 
+  /**
+   * Validate proposal message.
+   *
+   * @param msg the msg
+   * @return the boolean
+   */
   public boolean validateProposalMessage(final Proposal msg) {
 
     if (msg.getRoundIdentifier().getSequenceNumber() != chainHeight) {
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidator.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidator.java
index e2ff679186d..72fab927090 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidator.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidator.java
@@ -14,25 +14,27 @@
  */
 package org.hyperledger.besu.consensus.ibft.validation;
 
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftContext;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal;
 import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate;
 import org.hyperledger.besu.ethereum.BlockValidator;
-import org.hyperledger.besu.ethereum.BlockValidator.BlockProcessingOutputs;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
 
 import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Message validator. */
 public class MessageValidator {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(MessageValidator.class);
 
   private final SignedDataValidator signedDataValidator;
   private final ProposalBlockConsistencyValidator proposalConsistencyValidator;
@@ -40,6 +42,15 @@ public class MessageValidator {
   private final ProtocolContext protocolContext;
   private final RoundChangeCertificateValidator roundChangeCertificateValidator;
 
+  /**
+   * Instantiates a new Message validator.
+   *
+   * @param signedDataValidator the signed data validator
+   * @param proposalConsistencyValidator the proposal consistency validator
+   * @param blockValidator the block validator
+   * @param protocolContext the protocol context
+   * @param roundChangeCertificateValidator the round change certificate validator
+   */
   public MessageValidator(
       final SignedDataValidator signedDataValidator,
       final ProposalBlockConsistencyValidator proposalConsistencyValidator,
@@ -53,6 +64,12 @@ public MessageValidator(
     this.roundChangeCertificateValidator = roundChangeCertificateValidator;
   }
 
+  /**
+   * Validate proposal.
+   *
+   * @param msg the msg
+   * @return the boolean
+   */
   public boolean validateProposal(final Proposal msg) {
 
     if (!signedDataValidator.validateProposal(msg.getSignedPayload())) {
@@ -69,17 +86,21 @@ public boolean validateProposal(final Proposal msg) {
       return false;
     }
 
+    final BftBlockInterface blockInterface =
+        protocolContext.getConsensusContext(BftContext.class).getBlockInterface();
     return proposalConsistencyValidator.validateProposalMatchesBlock(
-        msg.getSignedPayload(), msg.getBlock());
+        msg.getSignedPayload(), msg.getBlock(), blockInterface);
   }
 
   private boolean validateBlock(final Block block) {
-    final Optional<BlockProcessingOutputs> validationResult =
+    final var validationResult =
         blockValidator.validateAndProcessBlock(
             protocolContext, block, HeaderValidationMode.LIGHT, HeaderValidationMode.FULL);
 
-    if (!validationResult.isPresent()) {
-      LOG.info("Invalid Proposal message, block did not pass validation.");
+    if (validationResult.isFailed()) {
+      LOG.info(
+          "Invalid Proposal message, block did not pass validation. Reason {}",
+          validationResult.errorMessage);
       return false;
     }
 
@@ -135,10 +156,22 @@ private boolean validateRoundChangeCertificateIsValidAndMatchesProposedBlock(
     return true;
   }
 
+  /**
+   * Validate prepare.
+   *
+   * @param msg the msg
+   * @return the boolean
+   */
   public boolean validatePrepare(final Prepare msg) {
     return signedDataValidator.validatePrepare(msg.getSignedPayload());
   }
 
+  /**
+   * Validate commit.
+   *
+   * @param msg the msg
+   * @return the boolean
+   */
   public boolean validateCommit(final Commit msg) {
     return signedDataValidator.validateCommit(msg.getSignedPayload());
   }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidatorFactory.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidatorFactory.java
index 5bd687334bc..75aa52540f9 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidatorFactory.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidatorFactory.java
@@ -14,39 +14,52 @@
  */
 package org.hyperledger.besu.consensus.ibft.validation;
 
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftContext;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
+import org.hyperledger.besu.consensus.common.bft.BftProtocolSchedule;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
-import org.hyperledger.besu.consensus.ibft.IbftContext;
-import org.hyperledger.besu.consensus.ibft.IbftHelpers;
-import org.hyperledger.besu.consensus.ibft.blockcreation.ProposerSelector;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.ProposerSelector;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.BlockValidator;
 import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 
 import java.util.Collection;
 
+/** The Message validator factory. */
 public class MessageValidatorFactory {
 
   private final ProposerSelector proposerSelector;
   private final ProtocolContext protocolContext;
-  private final ProtocolSchedule protocolSchedule;
+  private final BftProtocolSchedule protocolSchedule;
+  private final BftExtraDataCodec bftExtraDataCodec;
 
+  /**
+   * Instantiates a new Message validator factory.
+   *
+   * @param proposerSelector the proposer selector
+   * @param protocolSchedule the protocol schedule
+   * @param protocolContext the protocol context
+   * @param bftExtraDataCodec the bft extra data codec
+   */
   public MessageValidatorFactory(
       final ProposerSelector proposerSelector,
-      final ProtocolSchedule protocolSchedule,
-      final ProtocolContext protocolContext) {
+      final BftProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final BftExtraDataCodec bftExtraDataCodec) {
     this.proposerSelector = proposerSelector;
     this.protocolSchedule = protocolSchedule;
     this.protocolContext = protocolContext;
+    this.bftExtraDataCodec = bftExtraDataCodec;
   }
 
   private Collection<Address> getValidatorsAfterBlock(final BlockHeader parentHeader) {
     return protocolContext
-        .getConsensusState(IbftContext.class)
-        .getVoteTallyCache()
-        .getVoteTallyAfterBlock(parentHeader)
-        .getValidators();
+        .getConsensusContext(BftContext.class)
+        .getValidatorProvider()
+        .getValidatorsAfterBlock(parentHeader);
   }
 
   private SignedDataValidator createSignedDataValidator(
@@ -58,12 +71,22 @@ private SignedDataValidator createSignedDataValidator(
         roundIdentifier);
   }
 
+  /**
+   * Create message validator.
+   *
+   * @param roundIdentifier the round identifier
+   * @param parentHeader the parent header
+   * @return the message validator
+   */
   public MessageValidator createMessageValidator(
       final ConsensusRoundIdentifier roundIdentifier, final BlockHeader parentHeader) {
     final BlockValidator blockValidator =
         protocolSchedule.getByBlockNumber(roundIdentifier.getSequenceNumber()).getBlockValidator();
     final Collection<Address> validators = getValidatorsAfterBlock(parentHeader);
 
+    final BftBlockInterface bftBlockInterface =
+        protocolContext.getConsensusContext(BftContext.class).getBlockInterface();
+
     return new MessageValidator(
         createSignedDataValidator(roundIdentifier, parentHeader),
         new ProposalBlockConsistencyValidator(),
@@ -72,23 +95,42 @@ public MessageValidator createMessageValidator(
         new RoundChangeCertificateValidator(
             validators,
             (ri) -> createSignedDataValidator(ri, parentHeader),
-            roundIdentifier.getSequenceNumber()));
+            roundIdentifier.getSequenceNumber(),
+            bftExtraDataCodec,
+            bftBlockInterface));
   }
 
+  /**
+   * Create round change message validator.
+   *
+   * @param chainHeight the chain height
+   * @param parentHeader the parent header
+   * @return the round change message validator
+   */
   public RoundChangeMessageValidator createRoundChangeMessageValidator(
       final long chainHeight, final BlockHeader parentHeader) {
     final Collection<Address> validators = getValidatorsAfterBlock(parentHeader);
 
+    final BftBlockInterface bftBlockInterface =
+        protocolContext.getConsensusContext(BftContext.class).getBlockInterface();
     return new RoundChangeMessageValidator(
         new RoundChangePayloadValidator(
             (roundIdentifier) -> createSignedDataValidator(roundIdentifier, parentHeader),
             validators,
-            IbftHelpers.prepareMessageCountForQuorum(
-                IbftHelpers.calculateRequiredValidatorQuorum(validators.size())),
+            BftHelpers.prepareMessageCountForQuorum(
+                BftHelpers.calculateRequiredValidatorQuorum(validators.size())),
             chainHeight),
-        new ProposalBlockConsistencyValidator());
+        new ProposalBlockConsistencyValidator(),
+        bftBlockInterface);
   }
 
+  /**
+   * Create future round proposal message validator.
+   *
+   * @param chainHeight the chain height
+   * @param parentHeader the parent header
+   * @return the future round proposal message validator
+   */
   public FutureRoundProposalMessageValidator createFutureRoundProposalMessageValidator(
       final long chainHeight, final BlockHeader parentHeader) {
 
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/ProposalBlockConsistencyValidator.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/ProposalBlockConsistencyValidator.java
index 07d81c0e2f0..845b509117d 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/ProposalBlockConsistencyValidator.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/ProposalBlockConsistencyValidator.java
@@ -14,21 +14,34 @@
  */
 package org.hyperledger.besu.consensus.ibft.validation;
 
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
 import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
-import org.hyperledger.besu.consensus.ibft.IbftExtraData;
 import org.hyperledger.besu.consensus.ibft.payload.ProposalPayload;
 import org.hyperledger.besu.ethereum.core.Block;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Proposal block consistency validator. */
 public class ProposalBlockConsistencyValidator {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ProposalBlockConsistencyValidator.class);
 
+  /**
+   * Validate proposal matches block.
+   *
+   * @param signedPayload the signed payload
+   * @param proposedBlock the proposed block
+   * @param bftBlockInterface the bft block interface
+   * @return the boolean
+   */
   public boolean validateProposalMatchesBlock(
-      final SignedData<ProposalPayload> signedPayload, final Block proposedBlock) {
+      final SignedData<ProposalPayload> signedPayload,
+      final Block proposedBlock,
+      final BftBlockInterface bftBlockInterface) {
 
     if (!signedPayload.getPayload().getDigest().equals(proposedBlock.getHash())) {
       LOG.info("Invalid Proposal, embedded digest does not match block's hash.");
@@ -41,7 +54,8 @@ public boolean validateProposalMatchesBlock(
       return false;
     }
 
-    if (!validateBlockMatchesProposalRound(signedPayload.getPayload(), proposedBlock)) {
+    if (!validateBlockMatchesProposalRound(
+        signedPayload.getPayload(), proposedBlock, bftBlockInterface)) {
       return false;
     }
 
@@ -49,9 +63,9 @@ public boolean validateProposalMatchesBlock(
   }
 
   private boolean validateBlockMatchesProposalRound(
-      final ProposalPayload payload, final Block block) {
+      final ProposalPayload payload, final Block block, final BftBlockInterface bftBlockInterface) {
     final ConsensusRoundIdentifier msgRound = payload.getRoundIdentifier();
-    final IbftExtraData extraData = IbftExtraData.decode(block.getHeader());
+    final BftExtraData extraData = bftBlockInterface.getExtraData(block.getHeader());
     if (extraData.getRound() != msgRound.getRoundNumber()) {
       LOG.info("Invalid Proposal message, round number in block does not match that in message.");
       return false;
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeCertificateValidator.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeCertificateValidator.java
index 8d07f568346..35bc30f1de9 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeCertificateValidator.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeCertificateValidator.java
@@ -14,55 +14,79 @@
  */
 package org.hyperledger.besu.consensus.ibft.validation;
 
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
 import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
-import org.hyperledger.besu.consensus.ibft.IbftBlockHeaderFunctions;
-import org.hyperledger.besu.consensus.ibft.IbftBlockInterface;
-import org.hyperledger.besu.consensus.ibft.IbftHelpers;
 import org.hyperledger.besu.consensus.ibft.payload.PreparedCertificate;
 import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate;
 import org.hyperledger.besu.consensus.ibft.payload.RoundChangePayload;
 import org.hyperledger.besu.consensus.ibft.validation.RoundChangePayloadValidator.MessageValidatorForHeightFactory;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.core.Block;
 
 import java.util.Collection;
 import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Round change certificate validator. */
 public class RoundChangeCertificateValidator {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(RoundChangeCertificateValidator.class);
 
   private final Collection<Address> validators;
   private final MessageValidatorForHeightFactory messageValidatorFactory;
+  private final BftExtraDataCodec bftExtraDataCodec;
+  private final BftBlockInterface bftBlockInterface;
   private final long quorum;
   private final long chainHeight;
 
+  /**
+   * Instantiates a new Round change certificate validator.
+   *
+   * @param validators the validators
+   * @param messageValidatorFactory the message validator factory
+   * @param chainHeight the chain height
+   * @param bftExtraDataCodec the bft extra data codec
+   * @param bftBlockInterface the bft block interface
+   */
   public RoundChangeCertificateValidator(
       final Collection<Address> validators,
       final MessageValidatorForHeightFactory messageValidatorFactory,
-      final long chainHeight) {
+      final long chainHeight,
+      final BftExtraDataCodec bftExtraDataCodec,
+      final BftBlockInterface bftBlockInterface) {
     this.validators = validators;
     this.messageValidatorFactory = messageValidatorFactory;
-    this.quorum = IbftHelpers.calculateRequiredValidatorQuorum(validators.size());
+    this.quorum = BftHelpers.calculateRequiredValidatorQuorum(validators.size());
     this.chainHeight = chainHeight;
+    this.bftExtraDataCodec = bftExtraDataCodec;
+    this.bftBlockInterface = bftBlockInterface;
   }
 
+  /**
+   * Validate round change messages and ensure target round matches root boolean.
+   *
+   * @param expectedRound the expected round
+   * @param roundChangeCert the round change cert
+   * @return the boolean
+   */
   public boolean validateRoundChangeMessagesAndEnsureTargetRoundMatchesRoot(
       final ConsensusRoundIdentifier expectedRound, final RoundChangeCertificate roundChangeCert) {
 
     final Collection<SignedData<RoundChangePayload>> roundChangeMsgs =
         roundChangeCert.getRoundChangePayloads();
 
-    if (hasDuplicateAuthors(roundChangeMsgs)) {
+    if (roundChangeMsgs.size() < quorum) {
+      LOG.info("Invalid RoundChangeCertificate, insufficient RoundChange messages.");
       return false;
     }
 
-    if (roundChangeMsgs.size() < quorum) {
-      LOG.info("Invalid RoundChangeCertificate, insufficient RoundChange messages.");
+    if (hasDuplicateAuthors(roundChangeMsgs)) {
       return false;
     }
 
@@ -78,7 +102,7 @@ public boolean validateRoundChangeMessagesAndEnsureTargetRoundMatchesRoot(
         new RoundChangePayloadValidator(
             messageValidatorFactory,
             validators,
-            IbftHelpers.prepareMessageCountForQuorum(quorum),
+            BftHelpers.prepareMessageCountForQuorum(quorum),
             chainHeight);
 
     if (!roundChangeCert.getRoundChangePayloads().stream()
@@ -102,6 +126,13 @@ private boolean hasDuplicateAuthors(
     return false;
   }
 
+  /**
+   * Validate proposal message matches latest prepare certificate.
+   *
+   * @param roundChangeCert the round change cert
+   * @param proposedBlock the proposed block
+   * @return the boolean
+   */
   public boolean validateProposalMessageMatchesLatestPrepareCertificate(
       final RoundChangeCertificate roundChangeCert, final Block proposedBlock) {
 
@@ -109,7 +140,7 @@ public boolean validateProposalMessageMatchesLatestPrepareCertificate(
         roundChangeCert.getRoundChangePayloads();
 
     final Optional<PreparedCertificate> latestPreparedCertificate =
-        IbftHelpers.findLatestPreparedCertificate(roundChangePayloads);
+        findLatestPreparedCertificate(roundChangePayloads);
 
     if (!latestPreparedCertificate.isPresent()) {
       LOG.debug(
@@ -120,7 +151,7 @@ public boolean validateProposalMessageMatchesLatestPrepareCertificate(
     // Need to check that if we substitute the LatestPrepareCert round number into the supplied
     // block that we get the SAME hash as PreparedCert.
     final Block currentBlockWithOldRound =
-        IbftBlockInterface.replaceRoundInBlock(
+        bftBlockInterface.replaceRoundInBlock(
             proposedBlock,
             latestPreparedCertificate
                 .get()
@@ -128,7 +159,7 @@ public boolean validateProposalMessageMatchesLatestPrepareCertificate(
                 .getPayload()
                 .getRoundIdentifier()
                 .getRoundNumber(),
-            IbftBlockHeaderFunctions.forCommittedSeal());
+            BftBlockHeaderFunctions.forCommittedSeal(bftExtraDataCodec));
 
     if (!currentBlockWithOldRound
         .getHash()
@@ -140,4 +171,34 @@ public boolean validateProposalMessageMatchesLatestPrepareCertificate(
 
     return true;
   }
+
+  /**
+   * Find latest prepared certificate.
+   *
+   * @param msgs the msgs
+   * @return the optional
+   */
+  public static Optional<PreparedCertificate> findLatestPreparedCertificate(
+      final Collection<SignedData<RoundChangePayload>> msgs) {
+
+    Optional<PreparedCertificate> result = Optional.empty();
+
+    for (SignedData<RoundChangePayload> roundChangeMsg : msgs) {
+      final RoundChangePayload payload = roundChangeMsg.getPayload();
+      if (payload.getPreparedCertificate().isPresent()) {
+        if (!result.isPresent()) {
+          result = payload.getPreparedCertificate();
+        } else {
+          final PreparedCertificate currentLatest = result.get();
+          final PreparedCertificate nextCert = payload.getPreparedCertificate().get();
+
+          if (currentLatest.getProposalPayload().getPayload().getRoundIdentifier().getRoundNumber()
+              < nextCert.getProposalPayload().getPayload().getRoundIdentifier().getRoundNumber()) {
+            result = Optional.of(nextCert);
+          }
+        }
+      }
+    }
+    return result;
+  }
 }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeMessageValidator.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeMessageValidator.java
index 17bc87093b5..95eb4660a6e 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeMessageValidator.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeMessageValidator.java
@@ -14,25 +14,43 @@
  */
 package org.hyperledger.besu.consensus.ibft.validation;
 
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Round change message validator. */
 public class RoundChangeMessageValidator {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(RoundChangeMessageValidator.class);
 
   private final RoundChangePayloadValidator roundChangePayloadValidator;
   private final ProposalBlockConsistencyValidator proposalBlockConsistencyValidator;
+  private final BftBlockInterface bftBlockInterface;
 
+  /**
+   * Instantiates a new Round change message validator.
+   *
+   * @param roundChangePayloadValidator the round change payload validator
+   * @param proposalBlockConsistencyValidator the proposal block consistency validator
+   * @param bftBlockInterface the bft block interface
+   */
   public RoundChangeMessageValidator(
       final RoundChangePayloadValidator roundChangePayloadValidator,
-      final ProposalBlockConsistencyValidator proposalBlockConsistencyValidator) {
+      final ProposalBlockConsistencyValidator proposalBlockConsistencyValidator,
+      final BftBlockInterface bftBlockInterface) {
     this.proposalBlockConsistencyValidator = proposalBlockConsistencyValidator;
     this.roundChangePayloadValidator = roundChangePayloadValidator;
+    this.bftBlockInterface = bftBlockInterface;
   }
 
+  /**
+   * Validate round change.
+   *
+   * @param msg the msg
+   * @return the boolean
+   */
   public boolean validateRoundChange(final RoundChange msg) {
 
     if (!roundChangePayloadValidator.validateRoundChange(msg.getSignedPayload())) {
@@ -48,7 +66,9 @@ public boolean validateRoundChange(final RoundChange msg) {
 
     if (msg.getPreparedCertificate().isPresent()) {
       if (!proposalBlockConsistencyValidator.validateProposalMatchesBlock(
-          msg.getPreparedCertificate().get().getProposalPayload(), msg.getProposedBlock().get())) {
+          msg.getPreparedCertificate().get().getProposalPayload(),
+          msg.getProposedBlock().get(),
+          bftBlockInterface)) {
         LOG.info("Invalid RoundChange message, proposal did not align with supplied block.");
         return false;
       }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangePayloadValidator.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangePayloadValidator.java
index e01ed98b93a..f56b2696ed1 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangePayloadValidator.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangePayloadValidator.java
@@ -20,22 +20,31 @@
 import org.hyperledger.besu.consensus.ibft.payload.PreparedCertificate;
 import org.hyperledger.besu.consensus.ibft.payload.ProposalPayload;
 import org.hyperledger.besu.consensus.ibft.payload.RoundChangePayload;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 
 import java.util.Collection;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Round change payload validator. */
 public class RoundChangePayloadValidator {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(RoundChangePayloadValidator.class);
 
   private final MessageValidatorForHeightFactory messageValidatorFactory;
   private final Collection<Address> validators;
   private final long minimumPrepareMessages;
   private final long chainHeight;
 
+  /**
+   * Instantiates a new Round change payload validator.
+   *
+   * @param messageValidatorFactory the message validator factory
+   * @param validators the validators
+   * @param minimumPrepareMessages the minimum prepare messages
+   * @param chainHeight the chain height
+   */
   public RoundChangePayloadValidator(
       final MessageValidatorForHeightFactory messageValidatorFactory,
       final Collection<Address> validators,
@@ -47,6 +56,12 @@ public RoundChangePayloadValidator(
     this.chainHeight = chainHeight;
   }
 
+  /**
+   * Validate round change.
+   *
+   * @param msg the msg
+   * @return the boolean
+   */
   public boolean validateRoundChange(final SignedData<RoundChangePayload> msg) {
 
     if (!validators.contains(msg.getAuthor())) {
@@ -96,6 +111,10 @@ private boolean validateConsistencyOfPrepareCertificateMessages(
       return false;
     }
 
+    if (hasDuplicateAuthors(certificate.getPreparePayloads())) {
+      return false;
+    }
+
     if (certificate.getPreparePayloads().size() < minimumPrepareMessages) {
       LOG.info(
           "Invalid RoundChange message, insufficient Prepare messages exist to justify "
@@ -113,6 +132,18 @@ private boolean validateConsistencyOfPrepareCertificateMessages(
     return true;
   }
 
+  private boolean hasDuplicateAuthors(
+      final Collection<SignedData<PreparePayload>> preparePayloads) {
+    final long distinctAuthorCount =
+        preparePayloads.stream().map(SignedData::getAuthor).distinct().count();
+
+    if (distinctAuthorCount != preparePayloads.size()) {
+      LOG.info("Invalid PreparePayloads list, multiple payloads from the same author.");
+      return true;
+    }
+    return false;
+  }
+
   private boolean validatePreparedCertificateRound(
       final ConsensusRoundIdentifier prepareCertRound,
       final ConsensusRoundIdentifier roundChangeTarget) {
@@ -130,8 +161,15 @@ private boolean validatePreparedCertificateRound(
     return true;
   }
 
+  /** The interface Message validator for height factory. */
   @FunctionalInterface
   public interface MessageValidatorForHeightFactory {
+    /**
+     * Create at round identifier and return signed data validator.
+     *
+     * @param roundIdentifier the round identifier
+     * @return the signed data validator
+     */
     SignedDataValidator createAt(final ConsensusRoundIdentifier roundIdentifier);
   }
 }
diff --git a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/SignedDataValidator.java b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/SignedDataValidator.java
index 85b5089daa5..6139a68d1eb 100644
--- a/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/SignedDataValidator.java
+++ b/consensus/ibft/src/main/java/org/hyperledger/besu/consensus/ibft/validation/SignedDataValidator.java
@@ -20,19 +20,20 @@
 import org.hyperledger.besu.consensus.ibft.payload.CommitPayload;
 import org.hyperledger.besu.consensus.ibft.payload.PreparePayload;
 import org.hyperledger.besu.consensus.ibft.payload.ProposalPayload;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Util;
 
 import java.util.Collection;
 import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Signed data validator. */
 public class SignedDataValidator {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(SignedDataValidator.class);
 
   private final Collection<Address> validators;
   private final Address expectedProposer;
@@ -40,6 +41,13 @@ public class SignedDataValidator {
 
   private Optional<SignedData<ProposalPayload>> proposal = Optional.empty();
 
+  /**
+   * Instantiates a new Signed data validator.
+   *
+   * @param validators the validators
+   * @param expectedProposer the expected proposer
+   * @param roundIdentifier the round identifier
+   */
   public SignedDataValidator(
       final Collection<Address> validators,
       final Address expectedProposer,
@@ -49,6 +57,12 @@ public SignedDataValidator(
     this.roundIdentifier = roundIdentifier;
   }
 
+  /**
+   * Validate proposal.
+   *
+   * @param msg the msg
+   * @return the boolean
+   */
   public boolean validateProposal(final SignedData<ProposalPayload> msg) {
 
     if (proposal.isPresent()) {
@@ -98,6 +112,12 @@ private boolean handleSubsequentProposal(
     return true;
   }
 
+  /**
+   * Validate prepare.
+   *
+   * @param msg the msg
+   * @return the boolean
+   */
   public boolean validatePrepare(final SignedData<PreparePayload> msg) {
     final String msgType = "Prepare";
 
@@ -113,6 +133,12 @@ public boolean validatePrepare(final SignedData<PreparePayload> msg) {
     return validateDigestMatchesProposal(msg.getPayload().getDigest(), msgType);
   }
 
+  /**
+   * Validate commit.
+   *
+   * @param msg the msg
+   * @return the boolean
+   */
   public boolean validateCommit(final SignedData<CommitPayload> msg) {
     final String msgType = "Commit";
 
diff --git a/consensus/ibft/src/test-support/java/org/hyperledger/besu/consensus/ibft/IbftContextBuilder.java b/consensus/ibft/src/test-support/java/org/hyperledger/besu/consensus/ibft/IbftContextBuilder.java
deleted file mode 100644
index 4d107a7587a..00000000000
--- a/consensus/ibft/src/test-support/java/org/hyperledger/besu/consensus/ibft/IbftContextBuilder.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.withSettings;
-
-import org.hyperledger.besu.consensus.common.VoteProposer;
-import org.hyperledger.besu.consensus.common.VoteTally;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
-import org.hyperledger.besu.ethereum.core.Address;
-
-import java.util.Collection;
-
-public class IbftContextBuilder {
-
-  public static IbftContext setupContextWithValidators(final Collection<Address> validators) {
-    final IbftContext ibftContext = mock(IbftContext.class, withSettings().lenient());
-    final VoteTallyCache mockCache = mock(VoteTallyCache.class, withSettings().lenient());
-    final VoteTally mockVoteTally = mock(VoteTally.class, withSettings().lenient());
-    when(ibftContext.getVoteTallyCache()).thenReturn(mockCache);
-    when(mockCache.getVoteTallyAfterBlock(any())).thenReturn(mockVoteTally);
-    when(mockVoteTally.getValidators()).thenReturn(validators);
-    when(ibftContext.getVoteProposer()).thenReturn(new VoteProposer());
-
-    return ibftContext;
-  }
-}
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/BftBlockHashingTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/BftBlockHashingTest.java
new file mode 100644
index 00000000000..7d5362ff7c6
--- /dev/null
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/BftBlockHashingTest.java
@@ -0,0 +1,191 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.ibft;
+
+import static java.util.Collections.emptyList;
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+import org.hyperledger.besu.consensus.common.bft.BftBlockHashing;
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.Vote;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.Util;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.jupiter.api.Test;
+
+public class BftBlockHashingTest {
+
+  private static final List<NodeKey> COMMITTERS_NODE_KEYS = committersNodeKeys();
+  private static final List<Address> VALIDATORS =
+      Arrays.asList(Address.fromHexString("1"), Address.fromHexString("2"));
+  private static final Optional<Vote> VOTE = Optional.of(Vote.authVote(Address.fromHexString("3")));
+  private static final int ROUND = 0x00FEDCBA;
+  private static final Bytes VANITY_DATA = vanityBytes();
+
+  private final IbftExtraDataCodec bftExtraDataEncoder = new IbftExtraDataCodec();
+  private final BftBlockHashing bftBlockHashing = new BftBlockHashing(bftExtraDataEncoder);
+  private final BlockHeader headerToBeHashed = headerToBeHashed();
+  private final Hash EXPECTED_HEADER_HASH = expectedHeaderHash();
+
+  @Test
+  public void testCalculateHashOfIbft2BlockOnchain() {
+    Hash actualHeaderHash = bftBlockHashing.calculateHashOfBftBlockOnchain(headerToBeHashed);
+    assertThat(actualHeaderHash).isEqualTo(EXPECTED_HEADER_HASH);
+  }
+
+  @Test
+  public void testRecoverCommitterAddresses() {
+    List<Address> actualCommitterAddresses =
+        bftBlockHashing.recoverCommitterAddresses(
+            headerToBeHashed, bftExtraDataEncoder.decode(headerToBeHashed));
+
+    List<Address> expectedCommitterAddresses =
+        COMMITTERS_NODE_KEYS.stream()
+            .map(nodeKey -> Util.publicKeyToAddress(nodeKey.getPublicKey()))
+            .collect(Collectors.toList());
+
+    assertThat(actualCommitterAddresses).isEqualTo(expectedCommitterAddresses);
+  }
+
+  @Test
+  public void testCalculateDataHashForCommittedSeal() {
+    Hash dataHahsForCommittedSeal =
+        bftBlockHashing.calculateDataHashForCommittedSeal(
+            headerToBeHashed, bftExtraDataEncoder.decode(headerToBeHashed));
+
+    BlockHeaderBuilder builder = setHeaderFieldsExceptForExtraData();
+
+    List<SECPSignature> commitSeals =
+        COMMITTERS_NODE_KEYS.stream()
+            .map(nodeKey -> nodeKey.sign(dataHahsForCommittedSeal))
+            .collect(Collectors.toList());
+
+    final BftExtraData extraDataWithCommitSeals =
+        new BftExtraData(VANITY_DATA, commitSeals, VOTE, ROUND, VALIDATORS);
+
+    builder.extraData(bftExtraDataEncoder.encode(extraDataWithCommitSeals));
+    BlockHeader actualHeader = builder.buildBlockHeader();
+    assertThat(actualHeader).isEqualTo(headerToBeHashed);
+  }
+
+  private static List<NodeKey> committersNodeKeys() {
+    final SignatureAlgorithm signatureAlgorithm = SignatureAlgorithmFactory.getInstance();
+
+    return IntStream.rangeClosed(1, 4)
+        .mapToObj(
+            i ->
+                NodeKeyUtils.createFrom(
+                    (signatureAlgorithm.createKeyPair(
+                        signatureAlgorithm.createPrivateKey(UInt256.valueOf(i))))))
+        .collect(Collectors.toList());
+  }
+
+  private static BlockHeaderBuilder setHeaderFieldsExceptForExtraData() {
+    final BlockHeaderBuilder builder = new BlockHeaderBuilder();
+    builder.parentHash(
+        Hash.fromHexString("0xa7762d3307dbf2ae6a1ae1b09cf61c7603722b2379731b6b90409cdb8c8288a0"));
+    builder.ommersHash(
+        Hash.fromHexString("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"));
+    builder.coinbase(Address.fromHexString("0x0000000000000000000000000000000000000000"));
+    builder.stateRoot(
+        Hash.fromHexString("0xca07595b82f908822971b7e848398e3395e59ee52565c7ef3603df1a1fa7bc80"));
+    builder.transactionsRoot(
+        Hash.fromHexString("0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"));
+    builder.receiptsRoot(
+        Hash.fromHexString("0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"));
+    builder.logsBloom(
+        LogsBloomFilter.fromHexString(
+            "0x000000000000000000000000000000000000000000000000"
+                + "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+                + "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+                + "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+                + "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+                + "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+                + "0000"));
+    builder.difficulty(Difficulty.ONE);
+    builder.number(1);
+    builder.gasLimit(4704588);
+    builder.gasUsed(0);
+    builder.timestamp(1530674616);
+    builder.mixHash(
+        Hash.fromHexString("0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365"));
+    builder.nonce(0);
+    builder.blockHeaderFunctions(BftBlockHeaderFunctions.forOnchainBlock(new IbftExtraDataCodec()));
+    return builder;
+  }
+
+  private static Bytes vanityBytes() {
+    final byte[] vanity_bytes = new byte[32];
+    for (int i = 0; i < vanity_bytes.length; i++) {
+      vanity_bytes[i] = (byte) i;
+    }
+    return Bytes.wrap(vanity_bytes);
+  }
+
+  private BlockHeader headerToBeHashed() {
+    BlockHeaderBuilder builder = setHeaderFieldsExceptForExtraData();
+
+    builder.extraData(
+        bftExtraDataEncoder.encodeWithoutCommitSeals(
+            new BftExtraData(VANITY_DATA, emptyList(), VOTE, ROUND, VALIDATORS)));
+
+    BytesValueRLPOutput rlpForHeaderFroCommittersSigning = new BytesValueRLPOutput();
+    builder.buildBlockHeader().writeTo(rlpForHeaderFroCommittersSigning);
+
+    List<SECPSignature> commitSeals =
+        COMMITTERS_NODE_KEYS.stream()
+            .map(nodeKey -> nodeKey.sign(Hash.hash(rlpForHeaderFroCommittersSigning.encoded())))
+            .collect(Collectors.toList());
+
+    BftExtraData extraDataWithCommitSeals =
+        new BftExtraData(VANITY_DATA, commitSeals, VOTE, ROUND, VALIDATORS);
+
+    builder.extraData(bftExtraDataEncoder.encode(extraDataWithCommitSeals));
+    return builder.buildBlockHeader();
+  }
+
+  private Hash expectedHeaderHash() {
+    BlockHeaderBuilder builder = setHeaderFieldsExceptForExtraData();
+
+    builder.extraData(
+        bftExtraDataEncoder.encodeWithoutCommitSealsAndRoundNumber(
+            new BftExtraData(VANITY_DATA, emptyList(), VOTE, 0, VALIDATORS)));
+
+    BytesValueRLPOutput rlpOutput = new BytesValueRLPOutput();
+    builder.buildBlockHeader().writeTo(rlpOutput);
+
+    return Hash.hash(rlpOutput.encoded());
+  }
+}
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftBlockHashingTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftBlockHashingTest.java
deleted file mode 100644
index f81fea4d392..00000000000
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftBlockHashingTest.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft;
-
-import static java.util.Collections.emptyList;
-import static org.assertj.core.api.Java6Assertions.assertThat;
-
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.crypto.SECP256K1.PrivateKey;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
-import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.LogsBloomFilter;
-import org.hyperledger.besu.ethereum.core.Util;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt256;
-import org.junit.Test;
-
-public class IbftBlockHashingTest {
-
-  private static final List<NodeKey> COMMITTERS_NODE_KEYS = committersNodeKeys();
-  private static final List<Address> VALIDATORS =
-      Arrays.asList(Address.fromHexString("1"), Address.fromHexString("2"));
-  private static final Optional<Vote> VOTE = Optional.of(Vote.authVote(Address.fromHexString("3")));
-  private static final int ROUND = 0x00FEDCBA;
-  private static final Bytes VANITY_DATA = vanityBytes();
-
-  private static final BlockHeader HEADER_TO_BE_HASHED = headerToBeHashed();
-  private static final Hash EXPECTED_HEADER_HASH = expectedHeaderHash();
-
-  @Test
-  public void testCalculateHashOfIbft2BlockOnChain() {
-    Hash actualHeaderHash = IbftBlockHashing.calculateHashOfIbftBlockOnChain(HEADER_TO_BE_HASHED);
-    assertThat(actualHeaderHash).isEqualTo(EXPECTED_HEADER_HASH);
-  }
-
-  @Test
-  public void testRecoverCommitterAddresses() {
-    List<Address> actualCommitterAddresses =
-        IbftBlockHashing.recoverCommitterAddresses(
-            HEADER_TO_BE_HASHED, IbftExtraData.decode(HEADER_TO_BE_HASHED));
-
-    List<Address> expectedCommitterAddresses =
-        COMMITTERS_NODE_KEYS.stream()
-            .map(nodeKey -> Util.publicKeyToAddress(nodeKey.getPublicKey()))
-            .collect(Collectors.toList());
-
-    assertThat(actualCommitterAddresses).isEqualTo(expectedCommitterAddresses);
-  }
-
-  @Test
-  public void testCalculateDataHashForCommittedSeal() {
-    Hash dataHahsForCommittedSeal =
-        IbftBlockHashing.calculateDataHashForCommittedSeal(
-            HEADER_TO_BE_HASHED, IbftExtraData.decode(HEADER_TO_BE_HASHED));
-
-    BlockHeaderBuilder builder = setHeaderFieldsExceptForExtraData();
-
-    List<Signature> commitSeals =
-        COMMITTERS_NODE_KEYS.stream()
-            .map(nodeKey -> nodeKey.sign(dataHahsForCommittedSeal))
-            .collect(Collectors.toList());
-
-    IbftExtraData extraDataWithCommitSeals =
-        new IbftExtraData(VANITY_DATA, commitSeals, VOTE, ROUND, VALIDATORS);
-
-    builder.extraData(extraDataWithCommitSeals.encode());
-    BlockHeader actualHeader = builder.buildBlockHeader();
-    assertThat(actualHeader).isEqualTo(HEADER_TO_BE_HASHED);
-  }
-
-  private static List<NodeKey> committersNodeKeys() {
-    return IntStream.rangeClosed(1, 4)
-        .mapToObj(
-            i ->
-                NodeKeyUtils.createFrom(
-                    (KeyPair.create(PrivateKey.create(UInt256.valueOf(i).toBytes())))))
-        .collect(Collectors.toList());
-  }
-
-  private static BlockHeaderBuilder setHeaderFieldsExceptForExtraData() {
-    final BlockHeaderBuilder builder = new BlockHeaderBuilder();
-    builder.parentHash(
-        Hash.fromHexString("0xa7762d3307dbf2ae6a1ae1b09cf61c7603722b2379731b6b90409cdb8c8288a0"));
-    builder.ommersHash(
-        Hash.fromHexString("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"));
-    builder.coinbase(Address.fromHexString("0x0000000000000000000000000000000000000000"));
-    builder.stateRoot(
-        Hash.fromHexString("0xca07595b82f908822971b7e848398e3395e59ee52565c7ef3603df1a1fa7bc80"));
-    builder.transactionsRoot(
-        Hash.fromHexString("0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"));
-    builder.receiptsRoot(
-        Hash.fromHexString("0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"));
-    builder.logsBloom(
-        LogsBloomFilter.fromHexString(
-            "0x000000000000000000000000000000000000000000000000"
-                + "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-                + "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-                + "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-                + "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-                + "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-                + "0000"));
-    builder.difficulty(Difficulty.ONE);
-    builder.number(1);
-    builder.gasLimit(4704588);
-    builder.gasUsed(0);
-    builder.timestamp(1530674616);
-    builder.mixHash(
-        Hash.fromHexString("0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365"));
-    builder.nonce(0);
-    builder.blockHeaderFunctions(IbftBlockHeaderFunctions.forOnChainBlock());
-    return builder;
-  }
-
-  private static Bytes vanityBytes() {
-    final byte[] vanity_bytes = new byte[32];
-    for (int i = 0; i < vanity_bytes.length; i++) {
-      vanity_bytes[i] = (byte) i;
-    }
-    return Bytes.wrap(vanity_bytes);
-  }
-
-  private static BlockHeader headerToBeHashed() {
-    BlockHeaderBuilder builder = setHeaderFieldsExceptForExtraData();
-
-    builder.extraData(
-        new IbftExtraData(VANITY_DATA, emptyList(), VOTE, ROUND, VALIDATORS)
-            .encodeWithoutCommitSeals());
-
-    BytesValueRLPOutput rlpForHeaderFroCommittersSigning = new BytesValueRLPOutput();
-    builder.buildBlockHeader().writeTo(rlpForHeaderFroCommittersSigning);
-
-    List<Signature> commitSeals =
-        COMMITTERS_NODE_KEYS.stream()
-            .map(nodeKey -> nodeKey.sign(Hash.hash(rlpForHeaderFroCommittersSigning.encoded())))
-            .collect(Collectors.toList());
-
-    IbftExtraData extraDataWithCommitSeals =
-        new IbftExtraData(VANITY_DATA, commitSeals, VOTE, ROUND, VALIDATORS);
-
-    builder.extraData(extraDataWithCommitSeals.encode());
-    return builder.buildBlockHeader();
-  }
-
-  private static Hash expectedHeaderHash() {
-    BlockHeaderBuilder builder = setHeaderFieldsExceptForExtraData();
-
-    builder.extraData(
-        new IbftExtraData(VANITY_DATA, emptyList(), VOTE, 0, VALIDATORS)
-            .encodeWithoutCommitSealsAndRoundNumber());
-
-    BytesValueRLPOutput rlpOutput = new BytesValueRLPOutput();
-    builder.buildBlockHeader().writeTo(rlpOutput);
-
-    return Hash.hash(rlpOutput.encoded());
-  }
-}
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftBlockHeaderUtils.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftBlockHeaderUtils.java
new file mode 100644
index 00000000000..dff11c1ffeb
--- /dev/null
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftBlockHeaderUtils.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.ibft;
+
+import static java.util.Collections.singletonList;
+
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataFixture;
+import org.hyperledger.besu.consensus.common.bft.Vote;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.Util;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class IbftBlockHeaderUtils {
+
+  private static final int ROUND_NUMBER = 0x2A;
+
+  @FunctionalInterface
+  public interface HeaderModifier {
+
+    void update(BlockHeaderTestFixture blockHeaderTestFixture);
+  }
+
+  public static BlockHeaderTestFixture createPresetHeaderBuilder(
+      final long number,
+      final NodeKey proposerNodeKey,
+      final List<Address> validators,
+      final BlockHeader parent) {
+    return createPresetHeaderBuilder(number, proposerNodeKey, validators, parent, null);
+  }
+
+  public static BlockHeaderTestFixture createPresetHeaderBuilder(
+      final long number,
+      final NodeKey proposerNodeKey,
+      final List<Address> validators,
+      final BlockHeader parent,
+      final HeaderModifier modifier) {
+    final BlockHeaderTestFixture builder = new BlockHeaderTestFixture();
+    final IbftExtraDataCodec ibftExtraDataEncoder = new IbftExtraDataCodec();
+    populateDefaultBlockHeader(
+        number, proposerNodeKey, parent, modifier, builder, ibftExtraDataEncoder);
+
+    final BftExtraData bftExtraData =
+        BftExtraDataFixture.createExtraData(
+            builder.buildHeader(),
+            Bytes.wrap(new byte[BftExtraDataCodec.EXTRA_VANITY_LENGTH]),
+            Optional.of(Vote.authVote(Address.fromHexString("1"))),
+            validators,
+            singletonList(proposerNodeKey),
+            ROUND_NUMBER,
+            ibftExtraDataEncoder);
+
+    builder.extraData(ibftExtraDataEncoder.encode(bftExtraData));
+    return builder;
+  }
+
+  private static void populateDefaultBlockHeader(
+      final long number,
+      final NodeKey proposerNodeKey,
+      final BlockHeader parent,
+      final HeaderModifier modifier,
+      final BlockHeaderTestFixture builder,
+      final IbftExtraDataCodec ibftExtraDataEncoder) {
+    if (parent != null) {
+      builder.parentHash(parent.getHash());
+    }
+    builder.number(number);
+    builder.gasLimit(5000);
+    builder.timestamp(6 * number);
+    builder.mixHash(
+        Hash.fromHexString("0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365"));
+    builder.difficulty(Difficulty.ONE);
+    builder.coinbase(Util.publicKeyToAddress(proposerNodeKey.getPublicKey()));
+    builder.blockHeaderFunctions(BftBlockHeaderFunctions.forCommittedSeal(ibftExtraDataEncoder));
+
+    if (modifier != null) {
+      modifier.update(builder);
+    }
+  }
+}
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftBlockHeaderValidationRulesetFactoryTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftBlockHeaderValidationRulesetFactoryTest.java
index fdd71e4e3ef..e02ad9236c8 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftBlockHeaderValidationRulesetFactoryTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftBlockHeaderValidationRulesetFactoryTest.java
@@ -17,47 +17,58 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.consensus.ibft.IbftContextBuilder.setupContextWithValidators;
-
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
+import static org.hyperledger.besu.consensus.common.bft.BftContextBuilder.setupContextWithBftExtraDataEncoder;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataFixture;
+import org.hyperledger.besu.consensus.common.bft.Vote;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Util;
 import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
 import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class IbftBlockHeaderValidationRulesetFactoryTest {
 
-  private final ProtocolContext protocolContext(final Collection<Address> validators) {
-    return new ProtocolContext(null, null, setupContextWithValidators(validators));
+  private ProtocolContext protocolContext(final Collection<Address> validators) {
+    return new ProtocolContext(
+        null,
+        null,
+        setupContextWithBftExtraDataEncoder(validators, new IbftExtraDataCodec()),
+        Optional.empty());
   }
 
   @Test
-  public void ibftValidateHeaderPasses() {
+  public void bftValidateHeaderPasses() {
     final NodeKey proposerNodeKey = NodeKeyUtils.generate();
     final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
 
     final List<Address> validators = singletonList(proposerAddress);
 
     final BlockHeader parentHeader =
-        getPresetHeaderBuilder(1, proposerNodeKey, validators, null).buildHeader();
+        getPresetHeaderBuilder(1, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
     final BlockHeader blockHeader =
-        getPresetHeaderBuilder(2, proposerNodeKey, validators, parentHeader).buildHeader();
+        getPresetHeaderBuilder(2, proposerNodeKey, validators, parentHeader, Optional.empty())
+            .buildHeader();
 
-    final BlockHeaderValidator validator =
-        IbftBlockHeaderValidationRulesetFactory.ibftBlockHeaderValidator(5).build();
+    final BlockHeaderValidator validator = getBlockHeaderValidator();
 
     assertThat(
             validator.validateHeader(
@@ -66,19 +77,45 @@ blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.FUL
   }
 
   @Test
-  public void ibftValidateHeaderFailsOnExtraData() {
+  public void bftValidateHeaderPassesWithBaseFee() {
     final NodeKey proposerNodeKey = NodeKeyUtils.generate();
     final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
 
     final List<Address> validators = singletonList(proposerAddress);
 
     final BlockHeader parentHeader =
-        getPresetHeaderBuilder(1, proposerNodeKey, validators, null).buildHeader();
+        getPresetHeaderBuilder(1, proposerNodeKey, validators, null, Optional.of(Wei.ONE))
+            .buildHeader();
     final BlockHeader blockHeader =
-        getPresetHeaderBuilder(2, proposerNodeKey, emptyList(), parentHeader).buildHeader();
+        getPresetHeaderBuilder(2, proposerNodeKey, validators, parentHeader, Optional.of(Wei.ONE))
+            .buildHeader();
 
     final BlockHeaderValidator validator =
-        IbftBlockHeaderValidationRulesetFactory.ibftBlockHeaderValidator(5).build();
+        IbftBlockHeaderValidationRulesetFactory.blockHeaderValidator(
+                5, Optional.of(FeeMarket.london(1)))
+            .build();
+
+    assertThat(
+            validator.validateHeader(
+                blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.FULL))
+        .isTrue();
+  }
+
+  @Test
+  public void bftValidateHeaderFailsOnExtraData() {
+    final NodeKey proposerNodeKey = NodeKeyUtils.generate();
+    final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
+
+    final List<Address> validators = singletonList(proposerAddress);
+
+    final BlockHeader parentHeader =
+        getPresetHeaderBuilder(1, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
+    final BlockHeader blockHeader =
+        getPresetHeaderBuilder(2, proposerNodeKey, emptyList(), parentHeader, Optional.empty())
+            .buildHeader();
+
+    final BlockHeaderValidator validator = getBlockHeaderValidator();
 
     assertThat(
             validator.validateHeader(
@@ -87,7 +124,7 @@ blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.FUL
   }
 
   @Test
-  public void ibftValidateHeaderFailsOnCoinbaseData() {
+  public void bftValidateHeaderFailsOnCoinbaseData() {
     final NodeKey proposerNodeKey = NodeKeyUtils.generate();
     final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
 
@@ -97,14 +134,14 @@ public void ibftValidateHeaderFailsOnCoinbaseData() {
     final List<Address> validators = singletonList(proposerAddress);
 
     final BlockHeader parentHeader =
-        getPresetHeaderBuilder(1, proposerNodeKey, validators, null).buildHeader();
+        getPresetHeaderBuilder(1, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
     final BlockHeader blockHeader =
-        getPresetHeaderBuilder(2, proposerNodeKey, validators, parentHeader)
+        getPresetHeaderBuilder(2, proposerNodeKey, validators, parentHeader, Optional.empty())
             .coinbase(nonProposerAddress)
             .buildHeader();
 
-    final BlockHeaderValidator validator =
-        IbftBlockHeaderValidationRulesetFactory.ibftBlockHeaderValidator(5).build();
+    final BlockHeaderValidator validator = getBlockHeaderValidator();
 
     assertThat(
             validator.validateHeader(
@@ -113,19 +150,21 @@ blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.FUL
   }
 
   @Test
-  public void ibftValidateHeaderFailsOnNonce() {
+  public void bftValidateHeaderFailsOnNonce() {
     final NodeKey proposerNodeKey = NodeKeyUtils.generate();
     final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
 
     final List<Address> validators = singletonList(proposerAddress);
 
     final BlockHeader parentHeader =
-        getPresetHeaderBuilder(1, proposerNodeKey, validators, null).buildHeader();
+        getPresetHeaderBuilder(1, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
     final BlockHeader blockHeader =
-        getPresetHeaderBuilder(2, proposerNodeKey, validators, parentHeader).nonce(3).buildHeader();
+        getPresetHeaderBuilder(2, proposerNodeKey, validators, parentHeader, Optional.empty())
+            .nonce(3)
+            .buildHeader();
 
-    final BlockHeaderValidator validator =
-        IbftBlockHeaderValidationRulesetFactory.ibftBlockHeaderValidator(5).build();
+    final BlockHeaderValidator validator = getBlockHeaderValidator();
 
     assertThat(
             validator.validateHeader(
@@ -134,21 +173,21 @@ blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.FUL
   }
 
   @Test
-  public void ibftValidateHeaderFailsOnTimestamp() {
+  public void bftValidateHeaderFailsOnTimestamp() {
     final NodeKey proposerNodeKey = NodeKeyUtils.generate();
     final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
 
     final List<Address> validators = singletonList(proposerAddress);
 
     final BlockHeader parentHeader =
-        getPresetHeaderBuilder(1, proposerNodeKey, validators, null).buildHeader();
+        getPresetHeaderBuilder(1, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
     final BlockHeader blockHeader =
-        getPresetHeaderBuilder(2, proposerNodeKey, validators, parentHeader)
+        getPresetHeaderBuilder(2, proposerNodeKey, validators, parentHeader, Optional.empty())
             .timestamp(100)
             .buildHeader();
 
-    final BlockHeaderValidator validator =
-        IbftBlockHeaderValidationRulesetFactory.ibftBlockHeaderValidator(5).build();
+    final BlockHeaderValidator validator = getBlockHeaderValidator();
 
     assertThat(
             validator.validateHeader(
@@ -157,21 +196,21 @@ blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.FUL
   }
 
   @Test
-  public void ibftValidateHeaderFailsOnMixHash() {
+  public void bftValidateHeaderFailsOnMixHash() {
     final NodeKey proposerNodeKey = NodeKeyUtils.generate();
     final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
 
     final List<Address> validators = singletonList(proposerAddress);
 
     final BlockHeader parentHeader =
-        getPresetHeaderBuilder(1, proposerNodeKey, validators, null).buildHeader();
+        getPresetHeaderBuilder(1, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
     final BlockHeader blockHeader =
-        getPresetHeaderBuilder(2, proposerNodeKey, validators, parentHeader)
+        getPresetHeaderBuilder(2, proposerNodeKey, validators, parentHeader, Optional.empty())
             .mixHash(Hash.EMPTY_TRIE_HASH)
             .buildHeader();
 
-    final BlockHeaderValidator validator =
-        IbftBlockHeaderValidationRulesetFactory.ibftBlockHeaderValidator(5).build();
+    final BlockHeaderValidator validator = getBlockHeaderValidator();
 
     assertThat(
             validator.validateHeader(
@@ -180,21 +219,21 @@ blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.FUL
   }
 
   @Test
-  public void ibftValidateHeaderFailsOnOmmers() {
+  public void bftValidateHeaderFailsOnOmmers() {
     final NodeKey proposerNodeKey = NodeKeyUtils.generate();
     final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
 
     final List<Address> validators = singletonList(proposerAddress);
 
     final BlockHeader parentHeader =
-        getPresetHeaderBuilder(1, proposerNodeKey, validators, null).buildHeader();
+        getPresetHeaderBuilder(1, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
     final BlockHeader blockHeader =
-        getPresetHeaderBuilder(2, proposerNodeKey, validators, parentHeader)
+        getPresetHeaderBuilder(2, proposerNodeKey, validators, parentHeader, Optional.empty())
             .ommersHash(Hash.EMPTY_TRIE_HASH)
             .buildHeader();
 
-    final BlockHeaderValidator validator =
-        IbftBlockHeaderValidationRulesetFactory.ibftBlockHeaderValidator(5).build();
+    final BlockHeaderValidator validator = getBlockHeaderValidator();
 
     assertThat(
             validator.validateHeader(
@@ -203,21 +242,21 @@ blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.FUL
   }
 
   @Test
-  public void ibftValidateHeaderFailsOnDifficulty() {
+  public void bftValidateHeaderFailsOnDifficulty() {
     final NodeKey proposerNodeKey = NodeKeyUtils.generate();
     final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
 
     final List<Address> validators = singletonList(proposerAddress);
 
     final BlockHeader parentHeader =
-        getPresetHeaderBuilder(1, proposerNodeKey, validators, null).buildHeader();
+        getPresetHeaderBuilder(1, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
     final BlockHeader blockHeader =
-        getPresetHeaderBuilder(2, proposerNodeKey, validators, parentHeader)
+        getPresetHeaderBuilder(2, proposerNodeKey, validators, parentHeader, Optional.empty())
             .difficulty(Difficulty.of(5))
             .buildHeader();
 
-    final BlockHeaderValidator validator =
-        IbftBlockHeaderValidationRulesetFactory.ibftBlockHeaderValidator(5).build();
+    final BlockHeaderValidator validator = getBlockHeaderValidator();
 
     assertThat(
             validator.validateHeader(
@@ -226,19 +265,20 @@ blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.FUL
   }
 
   @Test
-  public void ibftValidateHeaderFailsOnAncestor() {
+  public void bftValidateHeaderFailsOnAncestor() {
     final NodeKey proposerNodeKey = NodeKeyUtils.generate();
     final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
 
     final List<Address> validators = singletonList(proposerAddress);
 
     final BlockHeader parentHeader =
-        getPresetHeaderBuilder(1, proposerNodeKey, validators, null).buildHeader();
+        getPresetHeaderBuilder(1, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
     final BlockHeader blockHeader =
-        getPresetHeaderBuilder(2, proposerNodeKey, validators, null).buildHeader();
+        getPresetHeaderBuilder(2, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
 
-    final BlockHeaderValidator validator =
-        IbftBlockHeaderValidationRulesetFactory.ibftBlockHeaderValidator(5).build();
+    final BlockHeaderValidator validator = getBlockHeaderValidator();
 
     assertThat(
             validator.validateHeader(
@@ -247,22 +287,22 @@ blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.FUL
   }
 
   @Test
-  public void ibftValidateHeaderFailsOnGasUsage() {
+  public void bftValidateHeaderFailsOnGasUsage() {
     final NodeKey proposerNodeKey = NodeKeyUtils.generate();
     final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
 
     final List<Address> validators = singletonList(proposerAddress);
 
     final BlockHeader parentHeader =
-        getPresetHeaderBuilder(1, proposerNodeKey, validators, null).buildHeader();
+        getPresetHeaderBuilder(1, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
     final BlockHeader blockHeader =
-        getPresetHeaderBuilder(2, proposerNodeKey, validators, parentHeader)
+        getPresetHeaderBuilder(2, proposerNodeKey, validators, parentHeader, Optional.empty())
             .gasLimit(5_000)
             .gasUsed(6_000)
             .buildHeader();
 
-    final BlockHeaderValidator validator =
-        IbftBlockHeaderValidationRulesetFactory.ibftBlockHeaderValidator(5).build();
+    final BlockHeaderValidator validator = getBlockHeaderValidator();
 
     assertThat(
             validator.validateHeader(
@@ -271,21 +311,21 @@ blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.FUL
   }
 
   @Test
-  public void ibftValidateHeaderFailsOnGasLimitRange() {
+  public void bftValidateHeaderFailsOnGasLimitRange() {
     final NodeKey proposerNodeKey = NodeKeyUtils.generate();
     final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
 
     final List<Address> validators = singletonList(proposerAddress);
 
     final BlockHeader parentHeader =
-        getPresetHeaderBuilder(1, proposerNodeKey, validators, null).buildHeader();
+        getPresetHeaderBuilder(1, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
     final BlockHeader blockHeader =
-        getPresetHeaderBuilder(2, proposerNodeKey, validators, parentHeader)
+        getPresetHeaderBuilder(2, proposerNodeKey, validators, parentHeader, Optional.empty())
             .gasLimit(4999)
             .buildHeader();
 
-    final BlockHeaderValidator validator =
-        IbftBlockHeaderValidationRulesetFactory.ibftBlockHeaderValidator(5).build();
+    final BlockHeaderValidator validator = getBlockHeaderValidator();
 
     assertThat(
             validator.validateHeader(
@@ -297,7 +337,8 @@ private BlockHeaderTestFixture getPresetHeaderBuilder(
       final long number,
       final NodeKey proposerNodeKey,
       final List<Address> validators,
-      final BlockHeader parent) {
+      final BlockHeader parent,
+      final Optional<Wei> baseFee) {
     final BlockHeaderTestFixture builder = new BlockHeaderTestFixture();
 
     if (parent != null) {
@@ -312,17 +353,25 @@ private BlockHeaderTestFixture getPresetHeaderBuilder(
     builder.nonce(0);
     builder.difficulty(Difficulty.ONE);
     builder.coinbase(Util.publicKeyToAddress(proposerNodeKey.getPublicKey()));
+    baseFee.ifPresent(fee -> builder.baseFeePerGas(fee));
 
-    final IbftExtraData ibftExtraData =
-        IbftExtraDataFixture.createExtraData(
+    final IbftExtraDataCodec ibftExtraDataEncoder = new IbftExtraDataCodec();
+    final BftExtraData bftExtraData =
+        BftExtraDataFixture.createExtraData(
             builder.buildHeader(),
-            Bytes.wrap(new byte[IbftExtraData.EXTRA_VANITY_LENGTH]),
+            Bytes.wrap(new byte[BftExtraDataCodec.EXTRA_VANITY_LENGTH]),
             Optional.of(Vote.authVote(Address.fromHexString("1"))),
             validators,
             singletonList(proposerNodeKey),
-            0xDEADBEEF);
+            0xDEADBEEF,
+            ibftExtraDataEncoder);
 
-    builder.extraData(ibftExtraData.encode());
+    builder.extraData(ibftExtraDataEncoder.encode(bftExtraData));
     return builder;
   }
+
+  public BlockHeaderValidator getBlockHeaderValidator() {
+    return IbftBlockHeaderValidationRulesetFactory.blockHeaderValidator(5, Optional.empty())
+        .build();
+  }
 }
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataEncoderTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataEncoderTest.java
new file mode 100644
index 00000000000..fe37c8edb23
--- /dev/null
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataEncoderTest.java
@@ -0,0 +1,506 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.ibft;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.Vote;
+import org.hyperledger.besu.consensus.common.validator.VoteType;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLPException;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.Random;
+import java.util.function.Supplier;
+
+import com.google.common.base.Suppliers;
+import com.google.common.collect.Lists;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Test;
+
+public class IbftExtraDataEncoderTest {
+
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+
+  private final String RAW_HEX_ENCODING_STRING =
+      "f8f1a00102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20ea9400000000000000000000000000000000000"
+          + "00001940000000000000000000000000000000000000002d794000000000000000000000000000000000000000181ff8400fedc"
+          + "baf886b841000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000"
+          + "0000000000000000000000000000000000a00b84100000000000000000000000000000000000000000000000000000000000000"
+          + "0a000000000000000000000000000000000000000000000000000000000000000100";
+
+  private final BftExtraData DECODED_EXTRA_DATA_FOR_RAW_HEX_ENCODING_STRING =
+      getDecodedExtraDataForRawHexEncodingString();
+  private final IbftExtraDataCodec bftExtraDataEncoder = new IbftExtraDataCodec();
+
+  private static BftExtraData getDecodedExtraDataForRawHexEncodingString() {
+    final List<Address> validators =
+        Arrays.asList(Address.fromHexString("1"), Address.fromHexString("2"));
+    final Optional<Vote> vote = Optional.of(Vote.authVote(Address.fromHexString("1")));
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals =
+        Arrays.asList(
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 0),
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.TEN, BigInteger.ONE, (byte) 0));
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = createNonEmptyVanityData();
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    return new BftExtraData(vanity_data, committerSeals, vote, round, validators);
+  }
+
+  @Test
+  public void correctlyCodedRoundConstitutesValidContent() {
+    final List<Address> validators = Lists.newArrayList();
+    final int round = 0x00FEDCBA;
+    final byte[] roundAsByteArray = new byte[] {(byte) 0x00, (byte) 0xFE, (byte) 0xDC, (byte) 0xBA};
+    final List<SECPSignature> committerSeals = Lists.newArrayList();
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = new byte[32];
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
+    encoder.startList();
+    encoder.writeBytes(vanity_data);
+    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
+
+    // encoded vote
+    encoder.startList();
+    encoder.writeBytes(Address.fromHexString("1"));
+    encoder.writeByte(Vote.ADD_BYTE_VALUE);
+    encoder.endList();
+
+    // This is to verify that the decoding works correctly when the round is encoded as 4 bytes
+    encoder.writeBytes(Bytes.wrap(roundAsByteArray));
+    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
+    encoder.endList();
+
+    final Bytes bufferToInject = encoder.encoded();
+
+    final BftExtraData extraData = bftExtraDataEncoder.decodeRaw(bufferToInject);
+
+    assertThat(extraData.getVanityData()).isEqualTo(vanity_data);
+    assertThat(extraData.getRound()).isEqualTo(round);
+    assertThat(extraData.getSeals()).isEqualTo(committerSeals);
+    assertThat(extraData.getValidators()).isEqualTo(validators);
+  }
+
+  /**
+   * This test specifically verifies that {@link IbftExtraDataCodec#decode(BlockHeader)} uses {@link
+   * RLPInput#readInt()} rather than {@link RLPInput#readIntScalar()} to decode the round number
+   */
+  @Test
+  public void incorrectlyEncodedRoundThrowsRlpException() {
+    final List<Address> validators = Lists.newArrayList();
+    final byte[] roundAsByteArray = new byte[] {(byte) 0xFE, (byte) 0xDC, (byte) 0xBA};
+    final List<SECPSignature> committerSeals = Lists.newArrayList();
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = new byte[32];
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
+    encoder.startList();
+    encoder.writeBytes(vanity_data);
+    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
+
+    // encoded vote
+    encoder.startList();
+    encoder.writeBytes(Address.fromHexString("1"));
+    encoder.writeByte(Vote.ADD_BYTE_VALUE);
+    encoder.endList();
+
+    // This is to verify that the decoding throws an exception when the round number is not encoded
+    // in 4 byte format
+    encoder.writeBytes(Bytes.wrap(roundAsByteArray));
+    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
+    encoder.endList();
+
+    final Bytes bufferToInject = encoder.encoded();
+
+    assertThatThrownBy(() -> bftExtraDataEncoder.decodeRaw(bufferToInject))
+        .isInstanceOf(RLPException.class);
+  }
+
+  @Test
+  public void nullVoteAndListConstituteValidContent() {
+    final List<Address> validators = Lists.newArrayList();
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals = Lists.newArrayList();
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = new byte[32];
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
+    encoder.startList();
+    encoder.writeBytes(vanity_data);
+    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
+
+    // encode an empty vote
+    encoder.writeNull();
+
+    encoder.writeInt(round);
+    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
+    encoder.endList();
+
+    final Bytes bufferToInject = encoder.encoded();
+
+    final BftExtraData extraData = bftExtraDataEncoder.decodeRaw(bufferToInject);
+
+    assertThat(extraData.getVanityData()).isEqualTo(vanity_data);
+    assertThat(extraData.getVote().isPresent()).isEqualTo(false);
+    assertThat(extraData.getRound()).isEqualTo(round);
+    assertThat(extraData.getSeals()).isEqualTo(committerSeals);
+    assertThat(extraData.getValidators()).isEqualTo(validators);
+  }
+
+  @Test
+  public void emptyVoteAndListIsEncodedCorrectly() {
+    final List<Address> validators = Lists.newArrayList();
+    final Optional<Vote> vote = Optional.empty();
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals = Lists.newArrayList();
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = new byte[32];
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    BftExtraData expectedExtraData =
+        new BftExtraData(vanity_data, committerSeals, vote, round, validators);
+
+    final IbftExtraDataCodec ibftExtraDataEncoder = bftExtraDataEncoder;
+    BftExtraData actualExtraData =
+        ibftExtraDataEncoder.decodeRaw(ibftExtraDataEncoder.encode(expectedExtraData));
+
+    assertThat(actualExtraData).isEqualToComparingFieldByField(expectedExtraData);
+  }
+
+  @Test
+  public void emptyListConstituteValidContent() {
+    final List<Address> validators = Lists.newArrayList();
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals = Lists.newArrayList();
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = new byte[32];
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
+    encoder.startList();
+    encoder.writeBytes(vanity_data);
+    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
+
+    // encoded vote
+    encoder.startList();
+    encoder.writeBytes(Address.fromHexString("1"));
+    encoder.writeByte(Vote.DROP_BYTE_VALUE);
+    encoder.endList();
+
+    encoder.writeInt(round);
+    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
+    encoder.endList();
+
+    final Bytes bufferToInject = encoder.encoded();
+
+    final BftExtraData extraData = bftExtraDataEncoder.decodeRaw(bufferToInject);
+
+    assertThat(extraData.getVanityData()).isEqualTo(vanity_data);
+    assertThat(extraData.getRound()).isEqualTo(round);
+    assertThat(extraData.getSeals()).isEqualTo(committerSeals);
+    assertThat(extraData.getValidators()).isEqualTo(validators);
+  }
+
+  @Test
+  public void emptyListsAreEncodedAndDecodedCorrectly() {
+    final List<Address> validators = Lists.newArrayList();
+    final Optional<Vote> vote = Optional.of(Vote.authVote(Address.fromHexString("1")));
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals = Lists.newArrayList();
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = new byte[32];
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    BftExtraData expectedExtraData =
+        new BftExtraData(vanity_data, committerSeals, vote, round, validators);
+
+    final IbftExtraDataCodec ibftExtraDataEncoder = bftExtraDataEncoder;
+    BftExtraData actualExtraData =
+        ibftExtraDataEncoder.decodeRaw(ibftExtraDataEncoder.encode(expectedExtraData));
+
+    assertThat(actualExtraData).isEqualToComparingFieldByField(expectedExtraData);
+  }
+
+  @Test
+  public void fullyPopulatedDataProducesCorrectlyFormedExtraDataObject() {
+    final List<Address> validators =
+        Arrays.asList(Address.fromHexString("1"), Address.fromHexString("2"));
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals =
+        Arrays.asList(
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 0),
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.TEN, BigInteger.ONE, (byte) 0));
+
+    // Create randomised vanity data.
+    final byte[] vanity_bytes = createNonEmptyVanityData();
+    new Random().nextBytes(vanity_bytes);
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
+    encoder.startList(); // This is required to create a "root node" for all RLP'd data
+    encoder.writeBytes(vanity_data);
+    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
+
+    // encoded vote
+    encoder.startList();
+    encoder.writeBytes(Address.fromHexString("1"));
+    encoder.writeByte(Vote.ADD_BYTE_VALUE);
+    encoder.endList();
+
+    encoder.writeInt(round);
+    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
+    encoder.endList();
+
+    final Bytes bufferToInject = encoder.encoded();
+
+    final BftExtraData extraData = bftExtraDataEncoder.decodeRaw(bufferToInject);
+
+    assertThat(extraData.getVanityData()).isEqualTo(vanity_data);
+    assertThat(extraData.getVote())
+        .isEqualTo(Optional.of(new Vote(Address.fromHexString("1"), VoteType.ADD)));
+    assertThat(extraData.getRound()).isEqualTo(round);
+    assertThat(extraData.getSeals()).isEqualTo(committerSeals);
+    assertThat(extraData.getValidators()).isEqualTo(validators);
+  }
+
+  @Test
+  public void fullyPopulatedDataIsEncodedAndDecodedCorrectly() {
+    final List<Address> validators =
+        Arrays.asList(Address.fromHexString("1"), Address.fromHexString("2"));
+    final Optional<Vote> vote = Optional.of(Vote.authVote(Address.fromHexString("1")));
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals =
+        Arrays.asList(
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 0),
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.TEN, BigInteger.ONE, (byte) 0));
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = createNonEmptyVanityData();
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    BftExtraData expectedExtraData =
+        new BftExtraData(vanity_data, committerSeals, vote, round, validators);
+    final IbftExtraDataCodec ibftExtraDataEncoder = bftExtraDataEncoder;
+
+    final BftExtraData actualExtraData =
+        ibftExtraDataEncoder.decodeRaw(ibftExtraDataEncoder.encode(expectedExtraData));
+
+    assertThat(actualExtraData).isEqualToComparingFieldByField(expectedExtraData);
+  }
+
+  @Test
+  public void encodingMatchesKnownRawHexString() {
+    final Bytes expectedRawDecoding = Bytes.fromHexString(RAW_HEX_ENCODING_STRING);
+    assertThat(bftExtraDataEncoder.encode(DECODED_EXTRA_DATA_FOR_RAW_HEX_ENCODING_STRING))
+        .isEqualTo(expectedRawDecoding);
+  }
+
+  @Test
+  public void decodingOfKnownRawHexStringMatchesKnowExtraDataObject() {
+
+    final BftExtraData expectedExtraData = DECODED_EXTRA_DATA_FOR_RAW_HEX_ENCODING_STRING;
+
+    Bytes rawDecoding = Bytes.fromHexString(RAW_HEX_ENCODING_STRING);
+    BftExtraData actualExtraData = bftExtraDataEncoder.decodeRaw(rawDecoding);
+
+    assertThat(actualExtraData).isEqualToComparingFieldByField(expectedExtraData);
+  }
+
+  @Test
+  public void extraDataCanBeEncodedWithoutCommitSeals() {
+    final List<Address> validators =
+        Arrays.asList(Address.fromHexString("1"), Address.fromHexString("2"));
+    final Optional<Vote> vote = Optional.of(Vote.authVote(Address.fromHexString("1")));
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals =
+        Arrays.asList(
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 0),
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.TEN, BigInteger.ONE, (byte) 0));
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = createNonEmptyVanityData();
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
+    encoder.startList();
+    encoder.writeBytes(vanity_data);
+    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
+
+    // encoded vote
+    encoder.startList();
+    encoder.writeBytes(vote.get().getRecipient());
+    encoder.writeByte(Vote.ADD_BYTE_VALUE);
+    encoder.endList();
+
+    encoder.writeInt(round);
+    encoder.endList();
+
+    Bytes expectedEncoding = encoder.encoded();
+
+    Bytes actualEncoding =
+        bftExtraDataEncoder.encodeWithoutCommitSeals(
+            new BftExtraData(vanity_data, committerSeals, vote, round, validators));
+
+    assertThat(actualEncoding).isEqualTo(expectedEncoding);
+  }
+
+  @Test
+  public void extraDataCanBeEncodedwithoutCommitSealsOrRoundNumber() {
+    final List<Address> validators =
+        Arrays.asList(Address.fromHexString("1"), Address.fromHexString("2"));
+    final Optional<Vote> vote = Optional.of(Vote.authVote(Address.fromHexString("1")));
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals =
+        Arrays.asList(
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 0),
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.TEN, BigInteger.ONE, (byte) 0));
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = createNonEmptyVanityData();
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
+    encoder.startList();
+    encoder.writeBytes(vanity_data);
+    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
+
+    // encoded vote
+    encoder.startList();
+    encoder.writeBytes(vote.get().getRecipient());
+    encoder.writeByte(Vote.ADD_BYTE_VALUE);
+    encoder.endList();
+
+    encoder.endList();
+
+    Bytes expectedEncoding = encoder.encoded();
+
+    Bytes actualEncoding =
+        bftExtraDataEncoder.encodeWithoutCommitSealsAndRoundNumber(
+            new BftExtraData(vanity_data, committerSeals, vote, round, validators));
+
+    assertThat(actualEncoding).isEqualTo(expectedEncoding);
+  }
+
+  @Test
+  public void incorrectlyStructuredRlpThrowsException() {
+    final List<Address> validators = Lists.newArrayList();
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals = Lists.newArrayList();
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = new byte[32];
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
+    encoder.startList();
+    encoder.writeBytes(vanity_data);
+    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
+
+    // encoded vote
+    encoder.startList();
+    encoder.writeBytes(Address.fromHexString("1"));
+    encoder.writeByte(Vote.ADD_BYTE_VALUE);
+    encoder.endList();
+
+    encoder.writeInt(round);
+    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
+    encoder.writeLong(1);
+    encoder.endList();
+
+    final Bytes bufferToInject = encoder.encoded();
+
+    assertThatThrownBy(() -> bftExtraDataEncoder.decodeRaw(bufferToInject))
+        .isInstanceOf(RLPException.class);
+  }
+
+  @Test
+  public void incorrectVoteTypeThrowsException() {
+    final List<Address> validators =
+        Arrays.asList(Address.fromHexString("1"), Address.fromHexString("2"));
+    final Address voteRecipient = Address.fromHexString("1");
+    final byte voteType = (byte) 0xAA;
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals =
+        Arrays.asList(
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 0),
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.TEN, BigInteger.ONE, (byte) 0));
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = new byte[32];
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
+    encoder.startList();
+    encoder.writeBytes(vanity_data);
+    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
+
+    // encode vote
+    encoder.startList();
+    encoder.writeBytes(voteRecipient);
+    encoder.writeByte(voteType);
+    encoder.endList();
+
+    encoder.writeInt(round);
+    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
+    encoder.endList();
+
+    final Bytes bufferToInject = encoder.encoded();
+
+    assertThatThrownBy(() -> bftExtraDataEncoder.decodeRaw(bufferToInject))
+        .isInstanceOf(RLPException.class);
+  }
+
+  @Test
+  public void emptyExtraDataThrowsException() {
+    final Bytes bufferToInject = Bytes.EMPTY;
+
+    assertThatThrownBy(() -> bftExtraDataEncoder.decodeRaw(bufferToInject))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage("Invalid Bytes supplied - Bft Extra Data required.");
+  }
+
+  private static byte[] createNonEmptyVanityData() {
+    final byte[] vanity_bytes = new byte[32];
+    for (int i = 0; i < vanity_bytes.length; i++) {
+      vanity_bytes[i] = (byte) (i + 1);
+    }
+    return vanity_bytes;
+  }
+}
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataFixture.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataFixture.java
deleted file mode 100644
index 18432a23614..00000000000
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataFixture.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft;
-
-import static java.util.Collections.emptyList;
-
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public class IbftExtraDataFixture {
-
-  public static IbftExtraData createExtraData(
-      final BlockHeader header,
-      final Bytes vanityData,
-      final Optional<Vote> vote,
-      final List<Address> validators,
-      final List<NodeKey> committerNodeKeys) {
-
-    return createExtraData(header, vanityData, vote, validators, committerNodeKeys, 0);
-  }
-
-  public static IbftExtraData createExtraData(
-      final BlockHeader header,
-      final Bytes vanityData,
-      final Optional<Vote> vote,
-      final List<Address> validators,
-      final List<NodeKey> committerNodeKeys,
-      final int roundNumber) {
-
-    return createExtraData(
-        header, vanityData, vote, validators, committerNodeKeys, roundNumber, false);
-  }
-
-  public static IbftExtraData createExtraData(
-      final BlockHeader header,
-      final Bytes vanityData,
-      final Optional<Vote> vote,
-      final List<Address> validators,
-      final List<NodeKey> committerNodeKeys,
-      final int baseRoundNumber,
-      final boolean useDifferentRoundNumbersForCommittedSeals) {
-
-    final IbftExtraData ibftExtraDataNoCommittedSeals =
-        new IbftExtraData(vanityData, emptyList(), vote, baseRoundNumber, validators);
-
-    // if useDifferentRoundNumbersForCommittedSeals is true then each committed seal will be
-    // calculated for an extraData field with a different round number
-    List<Signature> commitSeals =
-        IntStream.range(0, committerNodeKeys.size())
-            .mapToObj(
-                i -> {
-                  final int round =
-                      useDifferentRoundNumbersForCommittedSeals
-                          ? ibftExtraDataNoCommittedSeals.getRound() + i
-                          : ibftExtraDataNoCommittedSeals.getRound();
-
-                  IbftExtraData extraDataForCommittedSealCalculation =
-                      new IbftExtraData(
-                          ibftExtraDataNoCommittedSeals.getVanityData(),
-                          emptyList(),
-                          ibftExtraDataNoCommittedSeals.getVote(),
-                          round,
-                          ibftExtraDataNoCommittedSeals.getValidators());
-
-                  final Hash headerHashForCommitters =
-                      IbftBlockHashing.calculateDataHashForCommittedSeal(
-                          header, extraDataForCommittedSealCalculation);
-
-                  return committerNodeKeys.get(i).sign(headerHashForCommitters);
-                })
-            .collect(Collectors.toList());
-
-    return new IbftExtraData(
-        ibftExtraDataNoCommittedSeals.getVanityData(),
-        commitSeals,
-        ibftExtraDataNoCommittedSeals.getVote(),
-        ibftExtraDataNoCommittedSeals.getRound(),
-        ibftExtraDataNoCommittedSeals.getValidators());
-  }
-}
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataTest.java
deleted file mode 100644
index d795f80c041..00000000000
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataTest.java
+++ /dev/null
@@ -1,476 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-import org.hyperledger.besu.consensus.common.VoteType;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
-import org.hyperledger.besu.ethereum.rlp.RLPException;
-import org.hyperledger.besu.ethereum.rlp.RLPInput;
-
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.Random;
-
-import com.google.common.collect.Lists;
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-
-public class IbftExtraDataTest {
-
-  private final String RAW_HEX_ENCODING_STRING =
-      "f8f1a00102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20ea9400000000000000000000000000000000000"
-          + "00001940000000000000000000000000000000000000002d794000000000000000000000000000000000000000181ff8400fedc"
-          + "baf886b841000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000"
-          + "0000000000000000000000000000000000a00b84100000000000000000000000000000000000000000000000000000000000000"
-          + "0a000000000000000000000000000000000000000000000000000000000000000100";
-
-  private final IbftExtraData DECODED_EXTRA_DATA_FOR_RAW_HEX_ENCODING_STRING =
-      getDecodedExtraDataForRawHexEncodingString();
-
-  private static IbftExtraData getDecodedExtraDataForRawHexEncodingString() {
-    final List<Address> validators =
-        Arrays.asList(Address.fromHexString("1"), Address.fromHexString("2"));
-    final Optional<Vote> vote = Optional.of(Vote.authVote(Address.fromHexString("1")));
-    final int round = 0x00FEDCBA;
-    final List<Signature> committerSeals =
-        Arrays.asList(
-            Signature.create(BigInteger.ONE, BigInteger.TEN, (byte) 0),
-            Signature.create(BigInteger.TEN, BigInteger.ONE, (byte) 0));
-
-    // Create a byte buffer with no data.
-    final byte[] vanity_bytes = createNonEmptyVanityData();
-    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
-
-    return new IbftExtraData(vanity_data, committerSeals, vote, round, validators);
-  }
-
-  @Test
-  public void correctlyCodedRoundConstitutesValidContent() {
-    final List<Address> validators = Lists.newArrayList();
-    final Optional<Vote> vote = Optional.of(Vote.authVote(Address.fromHexString("1")));
-    final int round = 0x00FEDCBA;
-    final byte[] roundAsByteArray = new byte[] {(byte) 0x00, (byte) 0xFE, (byte) 0xDC, (byte) 0xBA};
-    final List<Signature> committerSeals = Lists.newArrayList();
-
-    // Create a byte buffer with no data.
-    final byte[] vanity_bytes = new byte[32];
-    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
-
-    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
-    encoder.startList();
-    encoder.writeBytes(vanity_data);
-    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
-
-    // encoded vote
-    vote.get().writeTo(encoder);
-
-    // This is to verify that the decoding works correctly when the round is encoded as 4 bytes
-    encoder.writeBytes(Bytes.wrap(roundAsByteArray));
-    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
-    encoder.endList();
-
-    final Bytes bufferToInject = encoder.encoded();
-
-    final IbftExtraData extraData = IbftExtraData.decodeRaw(bufferToInject);
-
-    assertThat(extraData.getVanityData()).isEqualTo(vanity_data);
-    assertThat(extraData.getRound()).isEqualTo(round);
-    assertThat(extraData.getSeals()).isEqualTo(committerSeals);
-    assertThat(extraData.getValidators()).isEqualTo(validators);
-  }
-
-  /**
-   * This test specifically verifies that {@link IbftExtraData#decode(BlockHeader)} uses {@link
-   * RLPInput#readInt()} rather than {@link RLPInput#readIntScalar()} to decode the round number
-   */
-  @Test
-  public void incorrectlyEncodedRoundThrowsRlpException() {
-    final List<Address> validators = Lists.newArrayList();
-    final Optional<Vote> vote = Optional.of(Vote.authVote(Address.fromHexString("1")));
-    final byte[] roundAsByteArray = new byte[] {(byte) 0xFE, (byte) 0xDC, (byte) 0xBA};
-    final List<Signature> committerSeals = Lists.newArrayList();
-
-    // Create a byte buffer with no data.
-    final byte[] vanity_bytes = new byte[32];
-    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
-
-    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
-    encoder.startList();
-    encoder.writeBytes(vanity_data);
-    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
-
-    // encoded vote
-    vote.get().writeTo(encoder);
-
-    // This is to verify that the decoding throws an exception when the round number is not encoded
-    // in 4 byte format
-    encoder.writeBytes(Bytes.wrap(roundAsByteArray));
-    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
-    encoder.endList();
-
-    final Bytes bufferToInject = encoder.encoded();
-
-    assertThatThrownBy(() -> IbftExtraData.decodeRaw(bufferToInject))
-        .isInstanceOf(RLPException.class);
-  }
-
-  @Test
-  public void nullVoteAndListConstituteValidContent() {
-    final List<Address> validators = Lists.newArrayList();
-    final int round = 0x00FEDCBA;
-    final List<Signature> committerSeals = Lists.newArrayList();
-
-    // Create a byte buffer with no data.
-    final byte[] vanity_bytes = new byte[32];
-    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
-
-    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
-    encoder.startList();
-    encoder.writeBytes(vanity_data);
-    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
-
-    // encode an empty vote
-    encoder.writeNull();
-
-    encoder.writeInt(round);
-    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
-    encoder.endList();
-
-    final Bytes bufferToInject = encoder.encoded();
-
-    final IbftExtraData extraData = IbftExtraData.decodeRaw(bufferToInject);
-
-    assertThat(extraData.getVanityData()).isEqualTo(vanity_data);
-    assertThat(extraData.getVote().isPresent()).isEqualTo(false);
-    assertThat(extraData.getRound()).isEqualTo(round);
-    assertThat(extraData.getSeals()).isEqualTo(committerSeals);
-    assertThat(extraData.getValidators()).isEqualTo(validators);
-  }
-
-  @Test
-  public void emptyVoteAndListIsEncodedCorrectly() {
-    final List<Address> validators = Lists.newArrayList();
-    final Optional<Vote> vote = Optional.empty();
-    final int round = 0x00FEDCBA;
-    final List<Signature> committerSeals = Lists.newArrayList();
-
-    // Create a byte buffer with no data.
-    final byte[] vanity_bytes = new byte[32];
-    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
-
-    IbftExtraData expectedExtraData =
-        new IbftExtraData(vanity_data, committerSeals, vote, round, validators);
-
-    IbftExtraData actualExtraData = IbftExtraData.decodeRaw(expectedExtraData.encode());
-
-    assertThat(actualExtraData).isEqualToComparingFieldByField(expectedExtraData);
-  }
-
-  @Test
-  public void emptyListConstituteValidContent() {
-    final List<Address> validators = Lists.newArrayList();
-    final Optional<Vote> vote = Optional.of(Vote.dropVote(Address.fromHexString("1")));
-    final int round = 0x00FEDCBA;
-    final List<Signature> committerSeals = Lists.newArrayList();
-
-    // Create a byte buffer with no data.
-    final byte[] vanity_bytes = new byte[32];
-    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
-
-    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
-    encoder.startList();
-    encoder.writeBytes(vanity_data);
-    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
-
-    // encoded vote
-    vote.get().writeTo(encoder);
-
-    encoder.writeInt(round);
-    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
-    encoder.endList();
-
-    final Bytes bufferToInject = encoder.encoded();
-
-    final IbftExtraData extraData = IbftExtraData.decodeRaw(bufferToInject);
-
-    assertThat(extraData.getVanityData()).isEqualTo(vanity_data);
-    assertThat(extraData.getRound()).isEqualTo(round);
-    assertThat(extraData.getSeals()).isEqualTo(committerSeals);
-    assertThat(extraData.getValidators()).isEqualTo(validators);
-  }
-
-  @Test
-  public void emptyListsAreEncodedAndDecodedCorrectly() {
-    final List<Address> validators = Lists.newArrayList();
-    final Optional<Vote> vote = Optional.of(Vote.authVote(Address.fromHexString("1")));
-    final int round = 0x00FEDCBA;
-    final List<Signature> committerSeals = Lists.newArrayList();
-
-    // Create a byte buffer with no data.
-    final byte[] vanity_bytes = new byte[32];
-    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
-
-    IbftExtraData expectedExtraData =
-        new IbftExtraData(vanity_data, committerSeals, vote, round, validators);
-
-    IbftExtraData actualExtraData = IbftExtraData.decodeRaw(expectedExtraData.encode());
-
-    assertThat(actualExtraData).isEqualToComparingFieldByField(expectedExtraData);
-  }
-
-  @Test
-  public void fullyPopulatedDataProducesCorrectlyFormedExtraDataObject() {
-    final List<Address> validators =
-        Arrays.asList(Address.fromHexString("1"), Address.fromHexString("2"));
-    final int round = 0x00FEDCBA;
-    final List<Signature> committerSeals =
-        Arrays.asList(
-            Signature.create(BigInteger.ONE, BigInteger.TEN, (byte) 0),
-            Signature.create(BigInteger.TEN, BigInteger.ONE, (byte) 0));
-
-    // Create randomised vanity data.
-    final byte[] vanity_bytes = createNonEmptyVanityData();
-    new Random().nextBytes(vanity_bytes);
-    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
-
-    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
-    encoder.startList(); // This is required to create a "root node" for all RLP'd data
-    encoder.writeBytes(vanity_data);
-    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
-
-    // encoded vote
-    encoder.startList();
-    encoder.writeBytes(Address.fromHexString("1"));
-    encoder.writeByte(Vote.ADD_BYTE_VALUE);
-    encoder.endList();
-
-    encoder.writeInt(round);
-    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
-    encoder.endList();
-
-    final Bytes bufferToInject = encoder.encoded();
-
-    final IbftExtraData extraData = IbftExtraData.decodeRaw(bufferToInject);
-
-    assertThat(extraData.getVanityData()).isEqualTo(vanity_data);
-    assertThat(extraData.getVote())
-        .isEqualTo(Optional.of(new Vote(Address.fromHexString("1"), VoteType.ADD)));
-    assertThat(extraData.getRound()).isEqualTo(round);
-    assertThat(extraData.getSeals()).isEqualTo(committerSeals);
-    assertThat(extraData.getValidators()).isEqualTo(validators);
-  }
-
-  @Test
-  public void fullyPopulatedDataIsEncodedAndDecodedCorrectly() {
-    final List<Address> validators =
-        Arrays.asList(Address.fromHexString("1"), Address.fromHexString("2"));
-    final Optional<Vote> vote = Optional.of(Vote.authVote(Address.fromHexString("1")));
-    final int round = 0x00FEDCBA;
-    final List<Signature> committerSeals =
-        Arrays.asList(
-            Signature.create(BigInteger.ONE, BigInteger.TEN, (byte) 0),
-            Signature.create(BigInteger.TEN, BigInteger.ONE, (byte) 0));
-
-    // Create a byte buffer with no data.
-    final byte[] vanity_bytes = createNonEmptyVanityData();
-    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
-
-    IbftExtraData expectedExtraData =
-        new IbftExtraData(vanity_data, committerSeals, vote, round, validators);
-
-    IbftExtraData actualExtraData = IbftExtraData.decodeRaw(expectedExtraData.encode());
-
-    assertThat(actualExtraData).isEqualToComparingFieldByField(expectedExtraData);
-  }
-
-  @Test
-  public void encodingMatchesKnownRawHexString() {
-    final Bytes expectedRawDecoding = Bytes.fromHexString(RAW_HEX_ENCODING_STRING);
-    assertThat(DECODED_EXTRA_DATA_FOR_RAW_HEX_ENCODING_STRING.encode())
-        .isEqualTo(expectedRawDecoding);
-  }
-
-  @Test
-  public void decodingOfKnownRawHexStringMatchesKnowExtraDataObject() {
-
-    final IbftExtraData expectedExtraData = DECODED_EXTRA_DATA_FOR_RAW_HEX_ENCODING_STRING;
-
-    Bytes rawDecoding = Bytes.fromHexString(RAW_HEX_ENCODING_STRING);
-    IbftExtraData actualExtraData = IbftExtraData.decodeRaw(rawDecoding);
-
-    assertThat(actualExtraData).isEqualToComparingFieldByField(expectedExtraData);
-  }
-
-  @Test
-  public void extraDataCanBeEncodedWithoutCommitSeals() {
-    final List<Address> validators =
-        Arrays.asList(Address.fromHexString("1"), Address.fromHexString("2"));
-    final Optional<Vote> vote = Optional.of(Vote.authVote(Address.fromHexString("1")));
-    final int round = 0x00FEDCBA;
-    final List<Signature> committerSeals =
-        Arrays.asList(
-            Signature.create(BigInteger.ONE, BigInteger.TEN, (byte) 0),
-            Signature.create(BigInteger.TEN, BigInteger.ONE, (byte) 0));
-
-    // Create a byte buffer with no data.
-    final byte[] vanity_bytes = createNonEmptyVanityData();
-    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
-
-    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
-    encoder.startList();
-    encoder.writeBytes(vanity_data);
-    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
-
-    // encoded vote
-    vote.get().writeTo(encoder);
-
-    encoder.writeInt(round);
-    encoder.endList();
-
-    Bytes expectedEncoding = encoder.encoded();
-
-    Bytes actualEncoding =
-        new IbftExtraData(vanity_data, committerSeals, vote, round, validators)
-            .encodeWithoutCommitSeals();
-
-    assertThat(actualEncoding).isEqualTo(expectedEncoding);
-  }
-
-  @Test
-  public void extraDataCanBeEncodedwithoutCommitSealsOrRoundNumber() {
-    final List<Address> validators =
-        Arrays.asList(Address.fromHexString("1"), Address.fromHexString("2"));
-    final Optional<Vote> vote = Optional.of(Vote.authVote(Address.fromHexString("1")));
-    final int round = 0x00FEDCBA;
-    final List<Signature> committerSeals =
-        Arrays.asList(
-            Signature.create(BigInteger.ONE, BigInteger.TEN, (byte) 0),
-            Signature.create(BigInteger.TEN, BigInteger.ONE, (byte) 0));
-
-    // Create a byte buffer with no data.
-    final byte[] vanity_bytes = createNonEmptyVanityData();
-    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
-
-    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
-    encoder.startList();
-    encoder.writeBytes(vanity_data);
-    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
-
-    // encoded vote
-    vote.get().writeTo(encoder);
-
-    encoder.endList();
-
-    Bytes expectedEncoding = encoder.encoded();
-
-    Bytes actualEncoding =
-        new IbftExtraData(vanity_data, committerSeals, vote, round, validators)
-            .encodeWithoutCommitSealsAndRoundNumber();
-
-    assertThat(actualEncoding).isEqualTo(expectedEncoding);
-  }
-
-  @Test
-  public void incorrectlyStructuredRlpThrowsException() {
-    final List<Address> validators = Lists.newArrayList();
-    final Optional<Vote> vote = Optional.of(Vote.authVote(Address.fromHexString("1")));
-    final int round = 0x00FEDCBA;
-    final List<Signature> committerSeals = Lists.newArrayList();
-
-    // Create a byte buffer with no data.
-    final byte[] vanity_bytes = new byte[32];
-    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
-
-    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
-    encoder.startList();
-    encoder.writeBytes(vanity_data);
-    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
-
-    // encoded vote
-    vote.get().writeTo(encoder);
-
-    encoder.writeInt(round);
-    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
-    encoder.writeLong(1);
-    encoder.endList();
-
-    final Bytes bufferToInject = encoder.encoded();
-
-    assertThatThrownBy(() -> IbftExtraData.decodeRaw(bufferToInject))
-        .isInstanceOf(RLPException.class);
-  }
-
-  @Test
-  public void incorrectVoteTypeThrowsException() {
-    final List<Address> validators =
-        Arrays.asList(Address.fromHexString("1"), Address.fromHexString("2"));
-    final Address voteRecipient = Address.fromHexString("1");
-    final byte voteType = (byte) 0xAA;
-    final int round = 0x00FEDCBA;
-    final List<Signature> committerSeals =
-        Arrays.asList(
-            Signature.create(BigInteger.ONE, BigInteger.TEN, (byte) 0),
-            Signature.create(BigInteger.TEN, BigInteger.ONE, (byte) 0));
-
-    // Create a byte buffer with no data.
-    final byte[] vanity_bytes = new byte[32];
-    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
-
-    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
-    encoder.startList();
-    encoder.writeBytes(vanity_data);
-    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
-
-    // encode vote
-    encoder.startList();
-    encoder.writeBytes(voteRecipient);
-    encoder.writeByte(voteType);
-    encoder.endList();
-
-    encoder.writeInt(round);
-    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
-    encoder.endList();
-
-    final Bytes bufferToInject = encoder.encoded();
-
-    assertThatThrownBy(() -> IbftExtraData.decodeRaw(bufferToInject))
-        .isInstanceOf(RLPException.class);
-  }
-
-  @Test
-  public void emptyExtraDataThrowsException() {
-    final Bytes bufferToInject = Bytes.EMPTY;
-
-    assertThatThrownBy(() -> IbftExtraData.decodeRaw(bufferToInject))
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessage("Invalid Bytes supplied - Ibft Extra Data required.");
-  }
-
-  private static byte[] createNonEmptyVanityData() {
-    final byte[] vanity_bytes = new byte[32];
-    for (int i = 0; i < vanity_bytes.length; i++) {
-      vanity_bytes[i] = (byte) (i + 1);
-    }
-    return vanity_bytes;
-  }
-}
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftForksSchedulesFactoryTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftForksSchedulesFactoryTest.java
new file mode 100644
index 00000000000..f18c5b29d3e
--- /dev/null
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftForksSchedulesFactoryTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.ibft;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+import org.hyperledger.besu.config.BftConfigOptions;
+import org.hyperledger.besu.config.BftFork;
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.config.JsonBftConfigOptions;
+import org.hyperledger.besu.config.JsonUtil;
+import org.hyperledger.besu.config.StubGenesisConfigOptions;
+import org.hyperledger.besu.config.TransitionsConfigOptions;
+import org.hyperledger.besu.consensus.common.ForkSpec;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.bft.BaseForksSchedulesFactoryTest;
+import org.hyperledger.besu.consensus.common.bft.MutableBftConfigOptions;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Consumer;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.junit.jupiter.api.Test;
+
+public class IbftForksSchedulesFactoryTest
+    extends BaseForksSchedulesFactoryTest<BftConfigOptions, MutableBftConfigOptions> {
+
+  @Test
+  public void createsScheduleWithForkThatOverridesGenesisValues() {
+    final MutableBftConfigOptions configOptions =
+        new MutableBftConfigOptions(JsonBftConfigOptions.DEFAULT);
+
+    final ObjectNode fork =
+        JsonUtil.objectNodeFromMap(
+            Map.of(
+                BftFork.FORK_BLOCK_KEY,
+                1,
+                BftFork.BLOCK_PERIOD_SECONDS_KEY,
+                10,
+                BftFork.BLOCK_REWARD_KEY,
+                "5"));
+
+    final ForksSchedule<BftConfigOptions> forksSchedule =
+        IbftForksSchedulesFactory.create(createGenesisConfig(configOptions, fork));
+    assertThat(forksSchedule.getFork(0))
+        .usingRecursiveComparison()
+        .isEqualTo(new ForkSpec<>(0, configOptions));
+
+    final Map<String, Object> forkOptions = new HashMap<>(configOptions.asMap());
+    forkOptions.put(BftFork.BLOCK_PERIOD_SECONDS_KEY, 10);
+    forkOptions.put(BftFork.BLOCK_REWARD_KEY, "5");
+
+    final BftConfigOptions expectedForkConfig =
+        new MutableBftConfigOptions(
+            new JsonBftConfigOptions(JsonUtil.objectNodeFromMap(forkOptions)));
+
+    final ForkSpec<BftConfigOptions> expectedFork = new ForkSpec<>(1, expectedForkConfig);
+    assertThat(forksSchedule.getFork(1)).usingRecursiveComparison().isEqualTo(expectedFork);
+    assertThat(forksSchedule.getFork(2)).usingRecursiveComparison().isEqualTo(expectedFork);
+  }
+
+  @Override
+  protected GenesisConfigOptions createGenesisConfig(
+      final BftConfigOptions configOptions, final ObjectNode... fork) {
+    final StubGenesisConfigOptions genesisConfigOptions = new StubGenesisConfigOptions();
+    genesisConfigOptions.bftConfigOptions(configOptions);
+    genesisConfigOptions.transitions(
+        new TransitionsConfigOptions(
+            JsonUtil.objectNodeFromMap(Map.of("ibft2", Arrays.asList(fork)))));
+    return genesisConfigOptions;
+  }
+
+  @Override
+  protected ForksSchedule<BftConfigOptions> createForkSchedule(
+      final GenesisConfigOptions genesisConfigOptions) {
+    return IbftForksSchedulesFactory.create(genesisConfigOptions);
+  }
+
+  @Override
+  protected BftConfigOptions createBftOptions(
+      final Consumer<MutableBftConfigOptions> optionModifier) {
+    final MutableBftConfigOptions options =
+        new MutableBftConfigOptions(JsonBftConfigOptions.DEFAULT);
+    optionModifier.accept(options);
+    return options;
+  }
+}
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftGossipTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftGossipTest.java
index 4732fba0d87..79847b980b3 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftGossipTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftGossipTest.java
@@ -18,13 +18,13 @@
 import static org.mockito.Mockito.verify;
 
 import org.hyperledger.besu.consensus.common.bft.messagewrappers.BftMessage;
+import org.hyperledger.besu.consensus.common.bft.network.MockPeerFactory;
+import org.hyperledger.besu.consensus.common.bft.network.ValidatorMulticaster;
 import org.hyperledger.besu.consensus.ibft.messagedata.ProposalMessageData;
 import org.hyperledger.besu.consensus.ibft.messagedata.RoundChangeMessageData;
-import org.hyperledger.besu.consensus.ibft.network.MockPeerFactory;
-import org.hyperledger.besu.consensus.ibft.network.ValidatorMulticaster;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.DefaultMessage;
@@ -33,20 +33,20 @@
 
 import java.util.function.Function;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class IbftGossipTest {
   private IbftGossip ibftGossip;
   @Mock private ValidatorMulticaster validatorMulticaster;
   private PeerConnection peerConnection;
   private static final Address senderAddress = AddressHelpers.ofValue(9);
 
-  @Before
+  @BeforeEach
   public void setup() {
     ibftGossip = new IbftGossip(validatorMulticaster);
     peerConnection = MockPeerFactory.create(senderAddress);
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftHelpersTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftHelpersTest.java
deleted file mode 100644
index d67e367f822..00000000000
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftHelpersTest.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
-import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal;
-import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
-import org.hyperledger.besu.consensus.ibft.payload.PreparedCertificate;
-import org.hyperledger.besu.consensus.ibft.statemachine.PreparedRoundArtifacts;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
-
-import java.util.Optional;
-
-import com.google.common.collect.Lists;
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
-
-public class IbftHelpersTest {
-
-  @Test
-  public void calculateRequiredValidatorQuorum1Validator() {
-    Assertions.assertThat(IbftHelpers.calculateRequiredValidatorQuorum(1)).isEqualTo(1);
-  }
-
-  @Test
-  public void calculateRequiredValidatorQuorum2Validator() {
-    Assertions.assertThat(IbftHelpers.calculateRequiredValidatorQuorum(2)).isEqualTo(2);
-  }
-
-  @Test
-  public void calculateRequiredValidatorQuorum3Validator() {
-    Assertions.assertThat(IbftHelpers.calculateRequiredValidatorQuorum(3)).isEqualTo(2);
-  }
-
-  @Test
-  public void calculateRequiredValidatorQuorum4Validator() {
-    Assertions.assertThat(IbftHelpers.calculateRequiredValidatorQuorum(4)).isEqualTo(3);
-  }
-
-  @Test
-  public void calculateRequiredValidatorQuorum5Validator() {
-    Assertions.assertThat(IbftHelpers.calculateRequiredValidatorQuorum(5)).isEqualTo(4);
-  }
-
-  @Test
-  public void calculateRequiredValidatorQuorum7Validator() {
-    Assertions.assertThat(IbftHelpers.calculateRequiredValidatorQuorum(7)).isEqualTo(5);
-  }
-
-  @Test
-  public void calculateRequiredValidatorQuorum10Validator() {
-    Assertions.assertThat(IbftHelpers.calculateRequiredValidatorQuorum(10)).isEqualTo(7);
-  }
-
-  @Test
-  public void calculateRequiredValidatorQuorum15Validator() {
-    Assertions.assertThat(IbftHelpers.calculateRequiredValidatorQuorum(15)).isEqualTo(10);
-  }
-
-  @Test
-  public void calculateRequiredValidatorQuorum20Validator() {
-    Assertions.assertThat(IbftHelpers.calculateRequiredValidatorQuorum(20)).isEqualTo(14);
-  }
-
-  @Test
-  public void latestPreparedCertificateIsExtractedFromRoundChangeCertificate() {
-    // NOTE: This function does not validate that all RoundCHanges/Prepares etc. come from valid
-    // sources, it is only responsible for determine which of the list or RoundChange messages
-    // contains the newest
-    // NOTE: This capability is tested as part of the NewRoundMessageValidationTests.
-    final NodeKey proposerKey = NodeKeyUtils.generate();
-    final MessageFactory proposerMessageFactory = new MessageFactory(proposerKey);
-    final Block proposedBlock = mock(Block.class);
-    when(proposedBlock.getHash()).thenReturn(Hash.fromHexStringLenient("1"));
-    final ConsensusRoundIdentifier roundIdentifier = new ConsensusRoundIdentifier(1, 4);
-
-    final ConsensusRoundIdentifier preparedRound = TestHelpers.createFrom(roundIdentifier, 0, -1);
-    final Proposal differentProposal =
-        proposerMessageFactory.createProposal(preparedRound, proposedBlock, Optional.empty());
-
-    final Optional<PreparedRoundArtifacts> latterPreparedRoundArtifacts =
-        Optional.of(
-            new PreparedRoundArtifacts(
-                differentProposal,
-                Lists.newArrayList(
-                    proposerMessageFactory.createPrepare(roundIdentifier, proposedBlock.getHash()),
-                    proposerMessageFactory.createPrepare(
-                        roundIdentifier, proposedBlock.getHash()))));
-
-    // An earlier PrepareCert is added to ensure the path to find the latest PrepareCert
-    // is correctly followed.
-    final ConsensusRoundIdentifier earlierPreparedRound =
-        TestHelpers.createFrom(roundIdentifier, 0, -2);
-    final Proposal earlierProposal =
-        proposerMessageFactory.createProposal(
-            earlierPreparedRound, proposedBlock, Optional.empty());
-    final Optional<PreparedRoundArtifacts> earlierPreparedRoundArtifacts =
-        Optional.of(
-            new PreparedRoundArtifacts(
-                earlierProposal,
-                Lists.newArrayList(
-                    proposerMessageFactory.createPrepare(
-                        earlierPreparedRound, proposedBlock.getHash()),
-                    proposerMessageFactory.createPrepare(
-                        earlierPreparedRound, proposedBlock.getHash()))));
-
-    final Optional<PreparedCertificate> newestCert =
-        IbftHelpers.findLatestPreparedCertificate(
-            Lists.newArrayList(
-                proposerMessageFactory
-                    .createRoundChange(roundIdentifier, earlierPreparedRoundArtifacts)
-                    .getSignedPayload(),
-                proposerMessageFactory
-                    .createRoundChange(roundIdentifier, latterPreparedRoundArtifacts)
-                    .getSignedPayload()));
-
-    assertThat(newestCert.get())
-        .isEqualTo(latterPreparedRoundArtifacts.get().getPreparedCertificate());
-  }
-
-  @Test
-  public void allRoundChangeHaveNoPreparedReturnsEmptyOptional() {
-    final NodeKey proposerKey = NodeKeyUtils.generate();
-    final MessageFactory proposerMessageFactory = new MessageFactory(proposerKey);
-    final ConsensusRoundIdentifier roundIdentifier = new ConsensusRoundIdentifier(1, 4);
-
-    final Optional<PreparedCertificate> newestCert =
-        IbftHelpers.findLatestPreparedCertificate(
-            Lists.newArrayList(
-                proposerMessageFactory
-                    .createRoundChange(roundIdentifier, Optional.empty())
-                    .getSignedPayload(),
-                proposerMessageFactory
-                    .createRoundChange(roundIdentifier, Optional.empty())
-                    .getSignedPayload()));
-
-    assertThat(newestCert).isEmpty();
-  }
-}
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftProtocolScheduleTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftProtocolScheduleTest.java
index 7768b6bbebe..d2125d0e1a0 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftProtocolScheduleTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftProtocolScheduleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -12,126 +12,115 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-
 package org.hyperledger.besu.consensus.ibft;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.hyperledger.besu.consensus.common.bft.BftContextBuilder.setupContextWithBftExtraDataEncoder;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.config.BftConfigOptions;
 import org.hyperledger.besu.config.GenesisConfigOptions;
-import org.hyperledger.besu.config.IbftConfigOptions;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.config.JsonGenesisConfigOptions;
+import org.hyperledger.besu.config.JsonQbftConfigOptions;
+import org.hyperledger.besu.config.JsonUtil;
+import org.hyperledger.besu.consensus.common.ForkSpec;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.bft.BftContext;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.BftProtocolSchedule;
+import org.hyperledger.besu.consensus.common.bft.MutableBftConfigOptions;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.core.MilestoneStreamingProtocolSchedule;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.core.Util;
+import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 
 import java.math.BigInteger;
+import java.util.Collection;
+import java.util.List;
 import java.util.Optional;
 
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class IbftProtocolScheduleTest {
-
-  private final GenesisConfigOptions genesisConfig = mock(GenesisConfigOptions.class);
-
-  @Test
-  public void ensureBlockRewardAndMiningBeneficiaryInProtocolSpecMatchConfig() {
-    final BigInteger arbitraryBlockReward = BigInteger.valueOf(5);
-    final String miningBeneficiary = Address.fromHexString("0x1").toString();
-    final IbftConfigOptions ibftConfig = mock(IbftConfigOptions.class);
-    when(ibftConfig.getMiningBeneficiary()).thenReturn(Optional.of(miningBeneficiary));
-    when(ibftConfig.getBlockRewardWei()).thenReturn(arbitraryBlockReward);
-    when(ibftConfig.getEpochLength()).thenReturn(3000L);
-
-    when(genesisConfig.getIbft2ConfigOptions()).thenReturn(ibftConfig);
-
-    final ProtocolSchedule schedule = IbftProtocolSchedule.create(genesisConfig);
-    final ProtocolSpec spec = schedule.getByBlockNumber(1);
-
-    spec.getBlockReward();
-
-    assertThat(spec.getBlockReward()).isEqualTo(Wei.of(arbitraryBlockReward));
-    assertThat(spec.getMiningBeneficiaryCalculator().calculateBeneficiary(null))
-        .isEqualTo(Address.fromHexString(miningBeneficiary));
+  private final BftExtraDataCodec bftExtraDataCodec = mock(BftExtraDataCodec.class);
+  private final BftExtraData bftExtraData = mock(BftExtraData.class);
+  private final NodeKey proposerNodeKey = NodeKeyUtils.generate();
+  private final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
+  private final List<Address> validators = singletonList(proposerAddress);
+
+  @BeforeEach
+  public void setup() {
+    when(bftExtraDataCodec.decode(any())).thenReturn(bftExtraData);
+    when(bftExtraData.getValidators()).thenReturn(validators);
   }
 
   @Test
-  public void illegalMiningBeneficiaryStringThrowsException() {
-    final String miningBeneficiary = "notHexStringOfTwentyBytes";
-    final IbftConfigOptions ibftConfig = mock(IbftConfigOptions.class);
-    when(ibftConfig.getMiningBeneficiary()).thenReturn(Optional.of(miningBeneficiary));
-    when(genesisConfig.getIbft2ConfigOptions()).thenReturn(ibftConfig);
-    when(ibftConfig.getEpochLength()).thenReturn(3000L);
-    when(ibftConfig.getBlockRewardWei()).thenReturn(BigInteger.ZERO);
-
-    assertThatThrownBy(() -> IbftProtocolSchedule.create(genesisConfig))
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessage("Mining beneficiary in config is not a valid ethereum address");
+  public void blockModeTransitionsCreatesBlockModeHeaderValidators() {
+    final MutableBftConfigOptions arbitraryTransition =
+        new MutableBftConfigOptions(JsonQbftConfigOptions.DEFAULT);
+    arbitraryTransition.setBlockRewardWei(BigInteger.ONE);
+
+    final BlockHeader parentHeader =
+        IbftBlockHeaderUtils.createPresetHeaderBuilder(1, proposerNodeKey, validators, null)
+            .buildHeader();
+    final BlockHeader blockHeader =
+        IbftBlockHeaderUtils.createPresetHeaderBuilder(2, proposerNodeKey, validators, parentHeader)
+            .buildHeader();
+
+    final BftProtocolSchedule schedule =
+        createProtocolSchedule(
+            JsonGenesisConfigOptions.fromJsonObject(JsonUtil.createEmptyObjectNode()),
+            List.of(
+                new ForkSpec<>(0, JsonQbftConfigOptions.DEFAULT),
+                new ForkSpec<>(1, arbitraryTransition),
+                new ForkSpec<>(2, JsonQbftConfigOptions.DEFAULT)));
+    assertThat(new MilestoneStreamingProtocolSchedule(schedule).streamMilestoneBlocks().count())
+        .isEqualTo(3);
+    assertThat(validateHeader(schedule, validators, parentHeader, blockHeader, 0)).isTrue();
+    assertThat(validateHeader(schedule, validators, parentHeader, blockHeader, 1)).isTrue();
+    assertThat(validateHeader(schedule, validators, parentHeader, blockHeader, 2)).isTrue();
   }
 
-  @Test
-  public void missingMiningBeneficiaryInConfigWillPayCoinbaseInHeader() {
-    final BigInteger arbitraryBlockReward = BigInteger.valueOf(3);
-    final IbftConfigOptions ibftConfig = mock(IbftConfigOptions.class);
-    when(ibftConfig.getMiningBeneficiary()).thenReturn(Optional.empty());
-    when(ibftConfig.getBlockRewardWei()).thenReturn(arbitraryBlockReward);
-    when(ibftConfig.getEpochLength()).thenReturn(3000L);
-    when(genesisConfig.getIbft2ConfigOptions()).thenReturn(ibftConfig);
-
-    final ProtocolSchedule schedule = IbftProtocolSchedule.create(genesisConfig);
-    final ProtocolSpec spec = schedule.getByBlockNumber(1);
-
-    final Address headerCoinbase = Address.fromHexString("0x123");
-    final BlockHeader header = mock(BlockHeader.class);
-    when(header.getCoinbase()).thenReturn(headerCoinbase);
-
-    assertThat(spec.getBlockReward()).isEqualTo(Wei.of(arbitraryBlockReward));
-    assertThat(spec.getMiningBeneficiaryCalculator().calculateBeneficiary(header))
-        .isEqualTo(headerCoinbase);
-  }
-
-  @Test
-  public void negativeBlockRewardThrowsException() {
-    final BigInteger arbitraryBlockReward = BigInteger.valueOf(-3);
-    final IbftConfigOptions ibftConfig = mock(IbftConfigOptions.class);
-    when(ibftConfig.getMiningBeneficiary()).thenReturn(Optional.empty());
-    when(ibftConfig.getBlockRewardWei()).thenReturn(arbitraryBlockReward);
-    when(ibftConfig.getEpochLength()).thenReturn(3000L);
-    when(genesisConfig.getIbft2ConfigOptions()).thenReturn(ibftConfig);
-
-    assertThatThrownBy(() -> IbftProtocolSchedule.create(genesisConfig))
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessage("Ibft2 Block reward in config cannot be negative");
+  private BftProtocolSchedule createProtocolSchedule(
+      final GenesisConfigOptions genesisConfig, final List<ForkSpec<BftConfigOptions>> forks) {
+    return IbftProtocolScheduleBuilder.create(
+        genesisConfig,
+        new ForksSchedule<>(forks),
+        PrivacyParameters.DEFAULT,
+        false,
+        bftExtraDataCodec,
+        EvmConfiguration.DEFAULT);
   }
 
-  @Test
-  public void zeroEpochLengthThrowsException() {
-    final BigInteger arbitraryBlockReward = BigInteger.valueOf(3);
-    final IbftConfigOptions ibftConfig = mock(IbftConfigOptions.class);
-    when(ibftConfig.getMiningBeneficiary()).thenReturn(Optional.empty());
-    when(ibftConfig.getEpochLength()).thenReturn(0L);
-    when(ibftConfig.getBlockRewardWei()).thenReturn(arbitraryBlockReward);
-    when(genesisConfig.getIbft2ConfigOptions()).thenReturn(ibftConfig);
-
-    assertThatThrownBy(() -> IbftProtocolSchedule.create(genesisConfig))
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessage("Epoch length in config must be greater than zero");
+  private boolean validateHeader(
+      final BftProtocolSchedule schedule,
+      final List<Address> validators,
+      final BlockHeader parentHeader,
+      final BlockHeader blockHeader,
+      final int block) {
+    return schedule
+        .getByBlockNumber(block)
+        .getBlockHeaderValidator()
+        .validateHeader(
+            blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.LIGHT);
   }
 
-  @Test
-  public void negativeEpochLengthThrowsException() {
-    final BigInteger arbitraryBlockReward = BigInteger.valueOf(3);
-    final IbftConfigOptions ibftConfig = mock(IbftConfigOptions.class);
-    when(ibftConfig.getMiningBeneficiary()).thenReturn(Optional.empty());
-    when(ibftConfig.getEpochLength()).thenReturn(-3000L);
-    when(ibftConfig.getBlockRewardWei()).thenReturn(arbitraryBlockReward);
-    when(genesisConfig.getIbft2ConfigOptions()).thenReturn(ibftConfig);
-
-    assertThatThrownBy(() -> IbftProtocolSchedule.create(genesisConfig))
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessage("Epoch length in config must be greater than zero");
+  private ProtocolContext protocolContext(final Collection<Address> validators) {
+    return new ProtocolContext(
+        null,
+        null,
+        setupContextWithBftExtraDataEncoder(BftContext.class, validators, bftExtraDataCodec),
+        Optional.empty());
   }
 }
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/TestHelpers.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/TestHelpers.java
index 88ca18d41a6..ca1dfcbb2b8 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/TestHelpers.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/TestHelpers.java
@@ -17,53 +17,18 @@
 import static java.util.Collections.singletonList;
 
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
-import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit;
-import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.common.bft.ProposedBlockHelpers;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange;
 import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.cryptoservices.NodeKey;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions;
-import org.hyperledger.besu.ethereum.core.Hash;
 
-import java.math.BigInteger;
-import java.util.Collections;
-import java.util.List;
 import java.util.Optional;
 
-import org.apache.tuweni.bytes.Bytes;
-
 public class TestHelpers {
 
-  public static ConsensusRoundIdentifier createFrom(
-      final ConsensusRoundIdentifier initial, final int offSetSequence, final int offSetRound) {
-    return new ConsensusRoundIdentifier(
-        initial.getSequenceNumber() + offSetSequence, initial.getRoundNumber() + offSetRound);
-  }
-
-  public static Block createProposalBlock(
-      final List<Address> validators, final ConsensusRoundIdentifier roundId) {
-    final Bytes extraData =
-        new IbftExtraData(
-                Bytes.wrap(new byte[32]),
-                Collections.emptyList(),
-                Optional.empty(),
-                roundId.getRoundNumber(),
-                validators)
-            .encode();
-    final BlockOptions blockOptions =
-        BlockOptions.create()
-            .setExtraData(extraData)
-            .setBlockNumber(roundId.getSequenceNumber())
-            .setBlockHeaderFunctions(IbftBlockHeaderFunctions.forCommittedSeal());
-    return new BlockDataGenerator().block(blockOptions);
-  }
-
   public static Proposal createSignedProposalPayload(final NodeKey signerNodeKey) {
     return createSignedProposalPayloadWithRound(signerNodeKey, 0xFEDCBA98);
   }
@@ -74,27 +39,11 @@ public static Proposal createSignedProposalPayloadWithRound(
     final ConsensusRoundIdentifier roundIdentifier =
         new ConsensusRoundIdentifier(0x1234567890ABCDEFL, round);
     final Block block =
-        TestHelpers.createProposalBlock(singletonList(AddressHelpers.ofValue(1)), roundIdentifier);
+        ProposedBlockHelpers.createProposalBlock(
+            singletonList(AddressHelpers.ofValue(1)), roundIdentifier);
     return messageFactory.createProposal(roundIdentifier, block, Optional.empty());
   }
 
-  public static Prepare createSignedPreparePayload(final NodeKey signerKeys) {
-    final MessageFactory messageFactory = new MessageFactory(signerKeys);
-    final ConsensusRoundIdentifier roundIdentifier =
-        new ConsensusRoundIdentifier(0x1234567890ABCDEFL, 0xFEDCBA98);
-    return messageFactory.createPrepare(roundIdentifier, Hash.fromHexStringLenient("0"));
-  }
-
-  public static Commit createSignedCommitPayload(final NodeKey signerKeys) {
-    final MessageFactory messageFactory = new MessageFactory(signerKeys);
-    final ConsensusRoundIdentifier roundIdentifier =
-        new ConsensusRoundIdentifier(0x1234567890ABCDEFL, 0xFEDCBA98);
-    return messageFactory.createCommit(
-        roundIdentifier,
-        Hash.fromHexStringLenient("0"),
-        Signature.create(BigInteger.ONE, BigInteger.TEN, (byte) 0));
-  }
-
   public static RoundChange createSignedRoundChangePayload(final NodeKey signerKeys) {
     final MessageFactory messageFactory = new MessageFactory(signerKeys);
     final ConsensusRoundIdentifier roundIdentifier =
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/blockcreation/BftBlockCreatorTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/blockcreation/BftBlockCreatorTest.java
new file mode 100644
index 00000000000..8620b5cfb9f
--- /dev/null
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/blockcreation/BftBlockCreatorTest.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.ibft.blockcreation;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.consensus.common.bft.BftContextBuilder.setupContextWithBftExtraDataEncoder;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.BftConfigOptions;
+import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.consensus.common.ForkSpec;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.bft.BaseBftProtocolScheduleBuilder;
+import org.hyperledger.besu.consensus.common.bft.BftBlockHashing;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.BftBlockCreator;
+import org.hyperledger.besu.consensus.ibft.IbftBlockHeaderValidationRulesetFactory;
+import org.hyperledger.besu.consensus.ibft.IbftExtraDataCodec;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.AddressHelpers;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.sorter.GasPricePendingTransactionsSorter;
+import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
+import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.testutil.TestClock;
+
+import java.time.ZoneId;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import com.google.common.collect.Lists;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Test;
+
+public class BftBlockCreatorTest {
+  private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
+
+  @Test
+  public void createdBlockPassesValidationRulesAndHasAppropriateHashAndMixHash() {
+    // Construct a parent block.
+    final BlockHeaderTestFixture blockHeaderBuilder = new BlockHeaderTestFixture();
+    blockHeaderBuilder.gasLimit(5000); // required to pass validation rule checks.
+    final BlockHeader parentHeader = blockHeaderBuilder.buildHeader();
+    final Optional<BlockHeader> optionalHeader = Optional.of(parentHeader);
+
+    // Construct a blockchain and world state
+    final MutableBlockchain blockchain = mock(MutableBlockchain.class);
+    when(blockchain.getChainHeadHash()).thenReturn(parentHeader.getHash());
+    when(blockchain.getBlockHeader(any())).thenReturn(optionalHeader);
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getBaseFee()).thenReturn(Optional.empty());
+    when(blockchain.getChainHeadHeader()).thenReturn(blockHeader);
+
+    final List<Address> initialValidatorList = Lists.newArrayList();
+    for (int i = 0; i < 4; i++) {
+      initialValidatorList.add(AddressHelpers.ofValue(i));
+    }
+
+    final IbftExtraDataCodec bftExtraDataEncoder = new IbftExtraDataCodec();
+
+    final BaseBftProtocolScheduleBuilder bftProtocolSchedule =
+        new BaseBftProtocolScheduleBuilder() {
+          @Override
+          public BlockHeaderValidator.Builder createBlockHeaderRuleset(
+              final BftConfigOptions config, final FeeMarket feeMarket) {
+            return IbftBlockHeaderValidationRulesetFactory.blockHeaderValidator(
+                5, Optional.empty());
+          }
+        };
+    final GenesisConfigOptions configOptions =
+        GenesisConfigFile.fromConfig("{\"config\": {\"spuriousDragonBlock\":0}}")
+            .getConfigOptions();
+    final ForksSchedule<BftConfigOptions> forksSchedule =
+        new ForksSchedule<>(List.of(new ForkSpec<>(0, configOptions.getBftConfigOptions())));
+    final ProtocolSchedule protocolSchedule =
+        bftProtocolSchedule.createProtocolSchedule(
+            configOptions,
+            forksSchedule,
+            PrivacyParameters.DEFAULT,
+            false,
+            bftExtraDataEncoder,
+            EvmConfiguration.DEFAULT);
+    final ProtocolContext protContext =
+        new ProtocolContext(
+            blockchain,
+            createInMemoryWorldStateArchive(),
+            setupContextWithBftExtraDataEncoder(initialValidatorList, bftExtraDataEncoder),
+            Optional.empty());
+
+    final GasPricePendingTransactionsSorter pendingTransactions =
+        new GasPricePendingTransactionsSorter(
+            ImmutableTransactionPoolConfiguration.builder().txPoolMaxSize(1).build(),
+            TestClock.system(ZoneId.systemDefault()),
+            metricsSystem,
+            blockchain::getChainHeadHeader);
+
+    final BftBlockCreator blockCreator =
+        new BftBlockCreator(
+            forksSchedule,
+            initialValidatorList.get(0),
+            () -> Optional.of(10_000_000L),
+            parent ->
+                bftExtraDataEncoder.encode(
+                    new BftExtraData(
+                        Bytes.wrap(new byte[32]),
+                        Collections.emptyList(),
+                        Optional.empty(),
+                        0,
+                        initialValidatorList)),
+            pendingTransactions,
+            protContext,
+            protocolSchedule,
+            Wei.ZERO,
+            0.8,
+            parentHeader,
+            bftExtraDataEncoder);
+
+    final int secondsBetweenBlocks = 1;
+    final Block block = blockCreator.createBlock(parentHeader.getTimestamp() + 1).getBlock();
+
+    final BlockHeaderValidator rules =
+        IbftBlockHeaderValidationRulesetFactory.blockHeaderValidator(
+                secondsBetweenBlocks, Optional.empty())
+            .build();
+
+    // NOTE: The header will not contain commit seals, so can only do light validation on header.
+    final boolean validationResult =
+        rules.validateHeader(
+            block.getHeader(), parentHeader, protContext, HeaderValidationMode.LIGHT);
+
+    assertThat(validationResult).isTrue();
+
+    final BlockHeader header = block.getHeader();
+    final BftExtraData extraData = bftExtraDataEncoder.decode(header);
+    assertThat(block.getHash())
+        .isEqualTo(
+            new BftBlockHashing(bftExtraDataEncoder)
+                .calculateDataHashForCommittedSeal(header, extraData));
+  }
+}
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftBlockCreatorTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftBlockCreatorTest.java
deleted file mode 100644
index 5ca0382bf43..00000000000
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftBlockCreatorTest.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft.blockcreation;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.consensus.ibft.IbftContextBuilder.setupContextWithValidators;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.config.GenesisConfigFile;
-import org.hyperledger.besu.consensus.ibft.IbftBlockHashing;
-import org.hyperledger.besu.consensus.ibft.IbftBlockHeaderValidationRulesetFactory;
-import org.hyperledger.besu.consensus.ibft.IbftExtraData;
-import org.hyperledger.besu.consensus.ibft.IbftProtocolSchedule;
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.AddressHelpers;
-import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
-import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
-import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
-import org.hyperledger.besu.testutil.TestClock;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
-import com.google.common.collect.Lists;
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-
-public class IbftBlockCreatorTest {
-  private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
-
-  @Test
-  public void createdBlockPassesValidationRulesAndHasAppropriateHashAndMixHash() {
-    // Construct a parent block.
-    final BlockHeaderTestFixture blockHeaderBuilder = new BlockHeaderTestFixture();
-    blockHeaderBuilder.gasLimit(5000); // required to pass validation rule checks.
-    final BlockHeader parentHeader = blockHeaderBuilder.buildHeader();
-    final Optional<BlockHeader> optionalHeader = Optional.of(parentHeader);
-
-    // Construct a block chain and world state
-    final MutableBlockchain blockchain = mock(MutableBlockchain.class);
-    when(blockchain.getChainHeadHash()).thenReturn(parentHeader.getHash());
-    when(blockchain.getBlockHeader(any())).thenReturn(optionalHeader);
-
-    final List<Address> initialValidatorList = Lists.newArrayList();
-    for (int i = 0; i < 4; i++) {
-      initialValidatorList.add(AddressHelpers.ofValue(i));
-    }
-
-    final ProtocolSchedule protocolSchedule =
-        IbftProtocolSchedule.create(
-            GenesisConfigFile.fromConfig("{\"config\": {\"spuriousDragonBlock\":0}}")
-                .getConfigOptions());
-    final ProtocolContext protContext =
-        new ProtocolContext(
-            blockchain,
-            createInMemoryWorldStateArchive(),
-            setupContextWithValidators(initialValidatorList));
-
-    final PendingTransactions pendingTransactions =
-        new PendingTransactions(
-            TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
-            1,
-            5,
-            TestClock.fixed(),
-            metricsSystem,
-            blockchain::getChainHeadHeader,
-            TransactionPoolConfiguration.DEFAULT_PRICE_BUMP);
-
-    final IbftBlockCreator blockCreator =
-        new IbftBlockCreator(
-            initialValidatorList.get(0),
-            parent ->
-                new IbftExtraData(
-                        Bytes.wrap(new byte[32]),
-                        Collections.emptyList(),
-                        Optional.empty(),
-                        0,
-                        initialValidatorList)
-                    .encode(),
-            pendingTransactions,
-            protContext,
-            protocolSchedule,
-            parentGasLimit -> parentGasLimit,
-            Wei.ZERO,
-            0.8,
-            parentHeader,
-            initialValidatorList.get(0));
-
-    final int secondsBetweenBlocks = 1;
-    final Block block = blockCreator.createBlock(parentHeader.getTimestamp() + 1);
-
-    final BlockHeaderValidator rules =
-        IbftBlockHeaderValidationRulesetFactory.ibftBlockHeaderValidator(secondsBetweenBlocks)
-            .build();
-
-    // NOTE: The header will not contain commit seals, so can only do light validation on header.
-    final boolean validationResult =
-        rules.validateHeader(
-            block.getHeader(), parentHeader, protContext, HeaderValidationMode.LIGHT);
-
-    assertThat(validationResult).isTrue();
-
-    final BlockHeader header = block.getHeader();
-    final IbftExtraData extraData = IbftExtraData.decode(header);
-    assertThat(block.getHash())
-        .isEqualTo(IbftBlockHashing.calculateDataHashForCommittedSeal(header, extraData));
-  }
-}
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftMiningCoordinatorTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftMiningCoordinatorTest.java
deleted file mode 100644
index 950740d8e2e..00000000000
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/blockcreation/IbftMiningCoordinatorTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft.blockcreation;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.consensus.common.bft.BftEventQueue;
-import org.hyperledger.besu.consensus.common.bft.BftExecutors;
-import org.hyperledger.besu.consensus.common.bft.BftProcessor;
-import org.hyperledger.besu.consensus.common.bft.events.NewChainHead;
-import org.hyperledger.besu.consensus.common.bft.statemachine.BftEventHandler;
-import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.BlockBody;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Wei;
-
-import java.util.Collections;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.assertj.core.util.Lists;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-@RunWith(MockitoJUnitRunner.class)
-public class IbftMiningCoordinatorTest {
-  @Mock private BftEventHandler controller;
-  @Mock private BftExecutors bftExecutors;
-  @Mock private BftProcessor bftProcessor;
-  @Mock private IbftBlockCreatorFactory ibftBlockCreatorFactory;
-  @Mock private Blockchain blockChain;
-  @Mock private Block block;
-  @Mock private BlockBody blockBody;
-  @Mock private BlockHeader blockHeader;
-  private final BftEventQueue eventQueue = new BftEventQueue(1000);
-  private IbftMiningCoordinator ibftMiningCoordinator;
-
-  @Before
-  public void setup() {
-    ibftMiningCoordinator =
-        new IbftMiningCoordinator(
-            bftExecutors,
-            controller,
-            bftProcessor,
-            ibftBlockCreatorFactory,
-            blockChain,
-            eventQueue);
-    when(block.getBody()).thenReturn(blockBody);
-    when(block.getHeader()).thenReturn(blockHeader);
-    when(blockBody.getTransactions()).thenReturn(Lists.emptyList());
-  }
-
-  @Test
-  public void startsMining() {
-    ibftMiningCoordinator.start();
-  }
-
-  @Test
-  public void stopsMining() {
-    // Shouldn't stop without first starting
-    ibftMiningCoordinator.stop();
-    verify(bftProcessor, never()).stop();
-
-    ibftMiningCoordinator.start();
-    ibftMiningCoordinator.stop();
-    verify(bftProcessor).stop();
-  }
-
-  @Test
-  public void getsMinTransactionGasPrice() {
-    final Wei minGasPrice = Wei.of(10);
-    when(ibftBlockCreatorFactory.getMinTransactionGasPrice()).thenReturn(minGasPrice);
-    assertThat(ibftMiningCoordinator.getMinTransactionGasPrice()).isEqualTo(minGasPrice);
-  }
-
-  @Test
-  public void setsTheExtraData() {
-    final Bytes extraData = Bytes.fromHexStringLenient("0x1234");
-    ibftMiningCoordinator.setExtraData(extraData);
-    verify(ibftBlockCreatorFactory).setExtraData(extraData);
-  }
-
-  @Test
-  public void addsNewChainHeadEventWhenNewCanonicalHeadBlockEventReceived() throws Exception {
-    BlockAddedEvent headAdvancement =
-        BlockAddedEvent.createForHeadAdvancement(
-            block, Collections.emptyList(), Collections.emptyList());
-    ibftMiningCoordinator.onBlockAdded(headAdvancement);
-
-    assertThat(eventQueue.size()).isEqualTo(1);
-    final NewChainHead ibftEvent = (NewChainHead) eventQueue.poll(1, TimeUnit.SECONDS);
-    assertThat(ibftEvent.getNewChainHeadHeader()).isEqualTo(blockHeader);
-  }
-
-  @Test
-  public void doesntAddNewChainHeadEventWhenNotACanonicalHeadBlockEvent() {
-    final BlockAddedEvent fork = BlockAddedEvent.createForFork(block);
-    ibftMiningCoordinator.onBlockAdded(fork);
-    assertThat(eventQueue.isEmpty()).isTrue();
-  }
-}
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/HeaderValidationTestHelpers.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/HeaderValidationTestHelpers.java
deleted file mode 100644
index 9ffd68cb866..00000000000
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/HeaderValidationTestHelpers.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft.headervalidationrules;
-
-import org.hyperledger.besu.consensus.ibft.IbftExtraData;
-import org.hyperledger.besu.consensus.ibft.IbftExtraDataFixture;
-import org.hyperledger.besu.consensus.ibft.Vote;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-
-import java.util.List;
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public class HeaderValidationTestHelpers {
-
-  public static BlockHeader createProposedBlockHeader(
-      final List<Address> validators,
-      final List<NodeKey> committerNodeKeys,
-      final boolean useDifferentRoundNumbersForCommittedSeals) {
-    final int BASE_ROUND_NUMBER = 5;
-    final BlockHeaderTestFixture builder = new BlockHeaderTestFixture();
-    builder.number(1); // must NOT be block 0, as that should not contain seals at all
-
-    final BlockHeader header = builder.buildHeader();
-
-    final IbftExtraData ibftExtraData =
-        IbftExtraDataFixture.createExtraData(
-            header,
-            Bytes.wrap(new byte[IbftExtraData.EXTRA_VANITY_LENGTH]),
-            Optional.of(Vote.authVote(Address.fromHexString("1"))),
-            validators,
-            committerNodeKeys,
-            BASE_ROUND_NUMBER,
-            useDifferentRoundNumbersForCommittedSeals);
-
-    builder.extraData(ibftExtraData.encode());
-    return builder.buildHeader();
-  }
-}
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCoinbaseValidationRuleTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCoinbaseValidationRuleTest.java
deleted file mode 100644
index 9e09219797b..00000000000
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCoinbaseValidationRuleTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft.headervalidationrules;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.consensus.ibft.IbftContextBuilder.setupContextWithValidators;
-
-import org.hyperledger.besu.consensus.ibft.IbftExtraData;
-import org.hyperledger.besu.consensus.ibft.IbftExtraDataFixture;
-import org.hyperledger.besu.consensus.ibft.Vote;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Util;
-
-import java.util.List;
-import java.util.Optional;
-
-import com.google.common.collect.Lists;
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-
-public class IbftCoinbaseValidationRuleTest {
-
-  public static BlockHeader createProposedBlockHeader(
-      final NodeKey proposerNodeKey,
-      final List<Address> validators,
-      final List<NodeKey> committerNodeKeys) {
-
-    final BlockHeaderTestFixture builder = new BlockHeaderTestFixture();
-    builder.number(1); // must NOT be block 0, as that should not contain seals at all
-    builder.coinbase(Util.publicKeyToAddress(proposerNodeKey.getPublicKey()));
-    final BlockHeader header = builder.buildHeader();
-
-    final IbftExtraData ibftExtraData =
-        IbftExtraDataFixture.createExtraData(
-            header,
-            Bytes.wrap(new byte[IbftExtraData.EXTRA_VANITY_LENGTH]),
-            Optional.of(Vote.authVote(Address.fromHexString("1"))),
-            validators,
-            committerNodeKeys);
-
-    builder.extraData(ibftExtraData.encode());
-    return builder.buildHeader();
-  }
-
-  @Test
-  public void proposerInValidatorListPassesValidation() {
-    final NodeKey proposerNodeKey = NodeKeyUtils.generate();
-    final Address proposerAddress =
-        Address.extract(Hash.hash(proposerNodeKey.getPublicKey().getEncodedBytes()));
-
-    final List<Address> validators = Lists.newArrayList(proposerAddress);
-
-    final List<NodeKey> committers = Lists.newArrayList(proposerNodeKey);
-
-    final ProtocolContext context =
-        new ProtocolContext(null, null, setupContextWithValidators(validators));
-
-    final IbftCoinbaseValidationRule coinbaseValidationRule = new IbftCoinbaseValidationRule();
-
-    BlockHeader header = createProposedBlockHeader(proposerNodeKey, validators, committers);
-
-    assertThat(coinbaseValidationRule.validate(header, null, context)).isTrue();
-  }
-
-  @Test
-  public void proposerNotInValidatorListFailsValidation() {
-    final NodeKey proposerNodeKey = NodeKeyUtils.generate();
-
-    final NodeKey otherValidatorNodeKey = NodeKeyUtils.generate();
-    final Address otherValidatorNodeAddress =
-        Address.extract(Hash.hash(otherValidatorNodeKey.getPublicKey().getEncodedBytes()));
-
-    final List<Address> validators = Lists.newArrayList(otherValidatorNodeAddress);
-
-    final List<NodeKey> committers = Lists.newArrayList(otherValidatorNodeKey);
-
-    final ProtocolContext context =
-        new ProtocolContext(null, null, setupContextWithValidators(validators));
-
-    final IbftCoinbaseValidationRule coinbaseValidationRule = new IbftCoinbaseValidationRule();
-
-    BlockHeader header = createProposedBlockHeader(proposerNodeKey, validators, committers);
-
-    assertThat(coinbaseValidationRule.validate(header, null, context)).isFalse();
-  }
-}
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCommitSealsValidationRuleTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCommitSealsValidationRuleTest.java
deleted file mode 100644
index 2bb502c7efe..00000000000
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftCommitSealsValidationRuleTest.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft.headervalidationrules;
-
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.consensus.ibft.IbftContextBuilder.setupContextWithValidators;
-import static org.hyperledger.besu.consensus.ibft.headervalidationrules.HeaderValidationTestHelpers.createProposedBlockHeader;
-
-import org.hyperledger.besu.consensus.ibft.IbftExtraData;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Util;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import com.google.common.collect.Lists;
-import org.junit.Test;
-
-public class IbftCommitSealsValidationRuleTest {
-
-  private final IbftCommitSealsValidationRule commitSealsValidationRule =
-      new IbftCommitSealsValidationRule();
-
-  @Test
-  public void correctlyConstructedHeaderPassesValidation() {
-    final List<NodeKey> committerNodeKeys =
-        IntStream.range(0, 2).mapToObj(i -> NodeKeyUtils.generate()).collect(Collectors.toList());
-
-    final List<Address> committerAddresses =
-        committerNodeKeys.stream()
-            .map(nodeKey -> Util.publicKeyToAddress(nodeKey.getPublicKey()))
-            .sorted()
-            .collect(Collectors.toList());
-
-    final ProtocolContext context =
-        new ProtocolContext(null, null, setupContextWithValidators(committerAddresses));
-
-    BlockHeader header = createProposedBlockHeader(committerAddresses, committerNodeKeys, false);
-
-    assertThat(commitSealsValidationRule.validate(header, null, context)).isTrue();
-  }
-
-  @Test
-  public void insufficientCommitSealsFailsValidation() {
-    final NodeKey committerNodeKey = NodeKeyUtils.generate();
-    final Address committerAddress =
-        Address.extract(Hash.hash(committerNodeKey.getPublicKey().getEncodedBytes()));
-
-    final List<Address> validators = singletonList(committerAddress);
-    final ProtocolContext context =
-        new ProtocolContext(null, null, setupContextWithValidators(validators));
-
-    final BlockHeader header = createProposedBlockHeader(validators, emptyList(), false);
-
-    // Note that no committer seals are in the header's IBFT extra data.
-    final IbftExtraData headerExtraData = IbftExtraData.decode(header);
-    assertThat(headerExtraData.getSeals().size()).isEqualTo(0);
-
-    assertThat(commitSealsValidationRule.validate(header, null, context)).isFalse();
-  }
-
-  @Test
-  public void committerNotInValidatorListFailsValidation() {
-    final NodeKey committerNodeKey = NodeKeyUtils.generate();
-    final Address committerAddress = Util.publicKeyToAddress(committerNodeKey.getPublicKey());
-
-    final List<Address> validators = singletonList(committerAddress);
-
-    // Insert an extraData block with committer seals.
-    final NodeKey nonValidatorNodeKey = NodeKeyUtils.generate();
-
-    final BlockHeader header =
-        createProposedBlockHeader(validators, singletonList(nonValidatorNodeKey), false);
-
-    final ProtocolContext context =
-        new ProtocolContext(null, null, setupContextWithValidators(validators));
-
-    assertThat(commitSealsValidationRule.validate(header, null, context)).isFalse();
-  }
-
-  @Test
-  public void ratioOfCommittersToValidatorsAffectValidation() {
-    assertThat(subExecution(4, 4, false)).isEqualTo(true);
-    assertThat(subExecution(4, 3, false)).isEqualTo(true);
-    assertThat(subExecution(4, 2, false)).isEqualTo(false);
-
-    assertThat(subExecution(5, 4, false)).isEqualTo(true);
-    assertThat(subExecution(5, 3, false)).isEqualTo(false);
-    assertThat(subExecution(5, 2, false)).isEqualTo(false);
-
-    assertThat(subExecution(6, 4, false)).isEqualTo(true);
-    assertThat(subExecution(6, 3, false)).isEqualTo(false);
-    assertThat(subExecution(6, 2, false)).isEqualTo(false);
-
-    assertThat(subExecution(7, 5, false)).isEqualTo(true);
-    assertThat(subExecution(7, 4, false)).isEqualTo(false);
-
-    assertThat(subExecution(8, 6, false)).isEqualTo(true);
-    assertThat(subExecution(8, 5, false)).isEqualTo(false);
-    assertThat(subExecution(8, 4, false)).isEqualTo(false);
-
-    assertThat(subExecution(9, 6, false)).isEqualTo(true);
-    assertThat(subExecution(9, 5, false)).isEqualTo(false);
-    assertThat(subExecution(9, 4, false)).isEqualTo(false);
-
-    assertThat(subExecution(10, 7, false)).isEqualTo(true);
-    assertThat(subExecution(10, 6, false)).isEqualTo(false);
-
-    assertThat(subExecution(12, 8, false)).isEqualTo(true);
-    assertThat(subExecution(12, 7, false)).isEqualTo(false);
-    assertThat(subExecution(12, 6, false)).isEqualTo(false);
-  }
-
-  @Test
-  public void validationFailsIfCommittedSealsAreForDifferentRounds() {
-    assertThat(subExecution(2, 2, true)).isEqualTo(false);
-    assertThat(subExecution(4, 4, true)).isEqualTo(false);
-  }
-
-  @Test
-  public void headerContainsDuplicateSealsFailsValidation() {
-    final NodeKey committerNodeKey = NodeKeyUtils.generate();
-    final List<Address> validators =
-        singletonList(Util.publicKeyToAddress(committerNodeKey.getPublicKey()));
-    final BlockHeader header =
-        createProposedBlockHeader(
-            validators, Lists.newArrayList(committerNodeKey, committerNodeKey), false);
-
-    final ProtocolContext context =
-        new ProtocolContext(null, null, setupContextWithValidators(validators));
-
-    assertThat(commitSealsValidationRule.validate(header, null, context)).isFalse();
-  }
-
-  private boolean subExecution(
-      final int validatorCount,
-      final int committerCount,
-      final boolean useDifferentRoundNumbersForCommittedSeals) {
-
-    final List<Address> validators = Lists.newArrayList();
-    final List<NodeKey> committerKeys = Lists.newArrayList();
-
-    for (int i = 0; i < validatorCount; i++) { // need -1 to account for proposer
-      final NodeKey committerNodeKey = NodeKeyUtils.generate();
-      committerKeys.add(committerNodeKey);
-      validators.add(Address.extract(Hash.hash(committerNodeKey.getPublicKey().getEncodedBytes())));
-    }
-
-    Collections.sort(validators);
-    final BlockHeader header =
-        createProposedBlockHeader(
-            validators,
-            committerKeys.subList(0, committerCount),
-            useDifferentRoundNumbersForCommittedSeals);
-
-    final ProtocolContext context =
-        new ProtocolContext(null, null, setupContextWithValidators(validators));
-
-    return commitSealsValidationRule.validate(header, null, context);
-  }
-}
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftValidatorsValidationRuleTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftValidatorsValidationRuleTest.java
deleted file mode 100644
index 6f23c117761..00000000000
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftValidatorsValidationRuleTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft.headervalidationrules;
-
-import static java.util.Collections.emptyList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.consensus.ibft.IbftContextBuilder.setupContextWithValidators;
-
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.AddressHelpers;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-
-import java.util.List;
-
-import com.google.common.collect.Lists;
-import org.junit.Test;
-
-public class IbftValidatorsValidationRuleTest {
-
-  private final IbftValidatorsValidationRule validatorsValidationRule =
-      new IbftValidatorsValidationRule();
-
-  @Test
-  public void correctlyConstructedHeaderPassesValidation() {
-    final List<Address> validators =
-        Lists.newArrayList(
-            AddressHelpers.ofValue(1), AddressHelpers.ofValue(2), AddressHelpers.ofValue(3));
-
-    final ProtocolContext context =
-        new ProtocolContext(null, null, setupContextWithValidators(validators));
-
-    final BlockHeader header =
-        HeaderValidationTestHelpers.createProposedBlockHeader(validators, emptyList(), false);
-
-    assertThat(validatorsValidationRule.validate(header, null, context)).isTrue();
-  }
-
-  @Test
-  public void validatorsInNonAscendingOrderFailValidation() {
-
-    final List<Address> validators =
-        Lists.newArrayList(
-            AddressHelpers.ofValue(1), AddressHelpers.ofValue(2), AddressHelpers.ofValue(3));
-
-    final ProtocolContext context =
-        new ProtocolContext(null, null, setupContextWithValidators(validators));
-
-    final BlockHeader header =
-        HeaderValidationTestHelpers.createProposedBlockHeader(
-            Lists.reverse(validators), emptyList(), false);
-
-    assertThat(validatorsValidationRule.validate(header, null, context)).isFalse();
-  }
-
-  @Test
-  public void mismatchingReportedValidatorsVsLocallyStoredListFailsValidation() {
-    final List<Address> storedValidators =
-        Lists.newArrayList(
-            AddressHelpers.ofValue(1), AddressHelpers.ofValue(2), AddressHelpers.ofValue(3));
-
-    final List<Address> reportedValidators =
-        Lists.newArrayList(
-            AddressHelpers.ofValue(2), AddressHelpers.ofValue(3), AddressHelpers.ofValue(4));
-
-    final ProtocolContext context =
-        new ProtocolContext(null, null, setupContextWithValidators(storedValidators));
-
-    final BlockHeader header =
-        HeaderValidationTestHelpers.createProposedBlockHeader(
-            reportedValidators, emptyList(), false);
-
-    assertThat(validatorsValidationRule.validate(header, null, context)).isFalse();
-  }
-}
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftVanityDataValidationRuleTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftVanityDataValidationRuleTest.java
deleted file mode 100644
index 310ad46fe97..00000000000
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/headervalidationrules/IbftVanityDataValidationRuleTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft.headervalidationrules;
-
-import static java.util.Collections.emptyList;
-import static java.util.Optional.empty;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.consensus.ibft.IbftExtraData;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-
-public class IbftVanityDataValidationRuleTest {
-
-  private final IbftVanityDataValidationRule validationRule = new IbftVanityDataValidationRule();
-
-  @Test
-  public void testCases() {
-    assertThat(headerWithVanityDataOfSize(0)).isFalse();
-    assertThat(headerWithVanityDataOfSize(31)).isFalse();
-    assertThat(headerWithVanityDataOfSize(32)).isTrue();
-    assertThat(headerWithVanityDataOfSize(33)).isFalse();
-  }
-
-  public boolean headerWithVanityDataOfSize(final int extraDataSize) {
-    final IbftExtraData extraData =
-        new IbftExtraData(
-            Bytes.wrap(new byte[extraDataSize]), emptyList(), empty(), 0, emptyList());
-    final BlockHeader header =
-        new BlockHeaderTestFixture().extraData(extraData.encode()).buildHeader();
-
-    return validationRule.validate(header, null, null);
-  }
-}
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftDiscardValidatorVoteTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftDiscardValidatorVoteTest.java
index eb860e2b640..da0a35ab2fe 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftDiscardValidatorVoteTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftDiscardValidatorVoteTest.java
@@ -15,33 +15,36 @@
 package org.hyperledger.besu.consensus.ibft.jsonrpc.methods;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.consensus.common.VoteProposer;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.common.validator.VoteProvider;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.core.Address;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import java.util.Optional;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class IbftDiscardValidatorVoteTest {
-  private final VoteProposer voteProposer = mock(VoteProposer.class);
+  private final ValidatorProvider validatorProvider = mock(ValidatorProvider.class);
+  private final VoteProvider voteProvider = mock(VoteProvider.class);
   private final String IBFT_METHOD = "ibft_discardValidatorVote";
   private final String JSON_RPC_VERSION = "2.0";
   private IbftDiscardValidatorVote method;
 
-  @Rule public ExpectedException expectedException = ExpectedException.none();
-
-  @Before
+  @BeforeEach
   public void setup() {
-    method = new IbftDiscardValidatorVote(voteProposer);
+    method = new IbftDiscardValidatorVote(validatorProvider);
+    when(validatorProvider.getVoteProviderAtHead()).thenReturn(Optional.of(voteProvider));
   }
 
   @Test
@@ -51,22 +54,16 @@ public void returnsCorrectMethodName() {
 
   @Test
   public void exceptionWhenNoParamsSupplied() {
-    final JsonRpcRequestContext request = requestWithParams();
-
-    expectedException.expect(InvalidJsonRpcParameters.class);
-    expectedException.expectMessage("Missing required json rpc parameter at index 0");
-
-    method.response(request);
+    assertThatThrownBy(() -> method.response(requestWithParams()))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessage("Missing required json rpc parameter at index 0");
   }
 
   @Test
   public void exceptionWhenInvalidAddressParameterSupplied() {
-    final JsonRpcRequestContext request = requestWithParams("InvalidAddress");
-
-    expectedException.expect(InvalidJsonRpcParameters.class);
-    expectedException.expectMessage("Invalid json rpc parameter at index 0");
-
-    method.response(request);
+    assertThatThrownBy(() -> method.response(requestWithParams("InvalidAddress")))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessageContaining("Invalid json rpc parameter at index 0");
   }
 
   @Test
@@ -81,7 +78,7 @@ public void discardValidator() {
 
     assertThat(response).isEqualToComparingFieldByField(expectedResponse);
 
-    verify(voteProposer).discard(parameterAddress);
+    verify(voteProvider).discardVote(parameterAddress);
   }
 
   private JsonRpcRequestContext requestWithParams(final Object... params) {
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetPendingVotesTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetPendingVotesTest.java
index 363785df111..ddede6aefe4 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetPendingVotesTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetPendingVotesTest.java
@@ -19,8 +19,8 @@
 import org.hyperledger.besu.consensus.common.jsonrpc.AbstractVoteProposerMethod;
 import org.hyperledger.besu.consensus.common.jsonrpc.AbstractVoteProposerMethodTest;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class IbftGetPendingVotesTest extends AbstractVoteProposerMethodTest {
 
@@ -36,9 +36,9 @@ protected String getMethodName() {
     return "ibft_getPendingVotes";
   }
 
-  @Before
+  @BeforeEach
   public void setup() {
-    method = new IbftGetPendingVotes(getVoteProposer());
+    method = new IbftGetPendingVotes(getValidatorProvider());
   }
 
   @Test
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetSignerMetricsTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetSignerMetricsTest.java
index b36a3ce1bb7..bb6d44aca60 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetSignerMetricsTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetSignerMetricsTest.java
@@ -15,6 +15,7 @@
 package org.hyperledger.besu.consensus.ibft.jsonrpc.methods;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.AdditionalMatchers.lt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -22,15 +23,14 @@
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.consensus.common.BlockInterface;
-import org.hyperledger.besu.consensus.common.VoteTally;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.SignerMetricResult;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 
@@ -41,10 +41,8 @@
 import java.util.Optional;
 import java.util.stream.LongStream;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class IbftGetSignerMetricsTest {
 
@@ -56,18 +54,16 @@ public class IbftGetSignerMetricsTest {
   private final String JSON_RPC_VERSION = "2.0";
   private IbftGetSignerMetrics method;
 
-  private VoteTallyCache voteTallyCache;
+  private ValidatorProvider validatorProvider;
   private BlockchainQueries blockchainQueries;
   private BlockInterface blockInterface;
 
-  @Rule public ExpectedException expectedException = ExpectedException.none();
-
-  @Before
+  @BeforeEach
   public void setup() {
-    voteTallyCache = mock(VoteTallyCache.class);
+    validatorProvider = mock(ValidatorProvider.class);
     blockchainQueries = mock(BlockchainQueries.class);
     blockInterface = mock(BlockInterface.class);
-    method = new IbftGetSignerMetrics(voteTallyCache, blockInterface, blockchainQueries);
+    method = new IbftGetSignerMetrics(validatorProvider, blockInterface, blockchainQueries);
   }
 
   @Test
@@ -77,22 +73,16 @@ public void returnsCorrectMethodName() {
 
   @Test
   public void exceptionWhenInvalidStartBlockSupplied() {
-    final JsonRpcRequestContext request = requestWithParams("INVALID");
-
-    expectedException.expect(InvalidJsonRpcParameters.class);
-    expectedException.expectMessage("Invalid json rpc parameter at index 0");
-
-    method.response(request);
+    assertThatThrownBy(() -> method.response(requestWithParams("INVALID")))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessageContaining("Invalid json rpc parameter at index 0");
   }
 
   @Test
   public void exceptionWhenInvalidEndBlockSupplied() {
-    final JsonRpcRequestContext request = requestWithParams("1", "INVALID");
-
-    expectedException.expect(InvalidJsonRpcParameters.class);
-    expectedException.expectMessage("Invalid json rpc parameter at index 1");
-
-    method.response(request);
+    assertThatThrownBy(() -> method.response(requestWithParams("1", "INVALID")))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessageContaining("Invalid json rpc parameter at index 1");
   }
 
   @Test
@@ -259,8 +249,7 @@ private SignerMetricResult generateBlock(final long number) {
 
     when(blockchainQueries.getBlockHeaderByNumber(number)).thenReturn(Optional.of(header));
     when(blockInterface.getProposerOfBlock(header)).thenReturn(proposerAddressBlock);
-    when(voteTallyCache.getVoteTallyAfterBlock(header))
-        .thenReturn(new VoteTally(Arrays.asList(VALIDATORS)));
+    when(validatorProvider.getValidatorsAfterBlock(header)).thenReturn(Arrays.asList(VALIDATORS));
 
     final SignerMetricResult signerMetricResult = new SignerMetricResult(proposerAddressBlock);
     signerMetricResult.incrementeNbBlock();
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockHashTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockHashTest.java
index 6c1da23a5bc..1e60ee44569 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockHashTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockHashTest.java
@@ -16,27 +16,27 @@
 
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.consensus.ibft.IbftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
 import org.assertj.core.api.Assertions;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class IbftGetValidatorsByBlockHashTest {
 
   private static final String ETH_METHOD = "ibft_getValidatorsByBlockHash";
@@ -45,14 +45,14 @@ public class IbftGetValidatorsByBlockHashTest {
 
   @Mock private Blockchain blockchain;
   @Mock private BlockHeader blockHeader;
-  @Mock private IbftBlockInterface ibftBlockInterface;
+  @Mock private BftBlockInterface bftBlockInterface;
   @Mock private JsonRpcRequestContext request;
 
   private IbftGetValidatorsByBlockHash method;
 
-  @Before
+  @BeforeEach
   public void setUp() {
-    method = new IbftGetValidatorsByBlockHash(blockchain, ibftBlockInterface);
+    method = new IbftGetValidatorsByBlockHash(blockchain, bftBlockInterface);
   }
 
   @Test
@@ -65,7 +65,7 @@ public void shouldReturnListOfValidatorsFromBlock() {
     when(blockchain.getBlockHeader(Hash.ZERO)).thenReturn(Optional.of(blockHeader));
     final List<Address> addresses = Collections.singletonList(Address.ID);
     final List<String> expectedOutput = Collections.singletonList(Address.ID.toString());
-    when(ibftBlockInterface.validatorsInBlock(blockHeader)).thenReturn(addresses);
+    when(bftBlockInterface.validatorsInBlock(blockHeader)).thenReturn(addresses);
     request = requestWithParams(ZERO_HASH);
     JsonRpcSuccessResponse response = (JsonRpcSuccessResponse) method.response(request);
     Assertions.assertThat(response.getResult()).isEqualTo(expectedOutput);
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockNumberTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockNumberTest.java
index 091f3b65f83..260b87c2fee 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockNumberTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftGetValidatorsByBlockNumberTest.java
@@ -17,37 +17,37 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.consensus.ibft.IbftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class IbftGetValidatorsByBlockNumberTest {
 
   @Mock private BlockchainQueries blockchainQueries;
   @Mock private BlockHeader blockHeader;
-  @Mock private IbftBlockInterface ibftBlockInterface;
+  @Mock private BftBlockInterface bftBlockInterface;
   @Mock private JsonRpcRequestContext request;
 
   private IbftGetValidatorsByBlockNumber method;
 
-  @Before
+  @BeforeEach
   public void setUp() {
-    method = new IbftGetValidatorsByBlockNumber(blockchainQueries, ibftBlockInterface);
+    method = new IbftGetValidatorsByBlockNumber(blockchainQueries, bftBlockInterface);
   }
 
   @Test
@@ -68,7 +68,7 @@ public void shouldReturnListOfValidatorsFromBlock() {
     when(blockchainQueries.getBlockHeaderByNumber(12)).thenReturn(Optional.of(blockHeader));
     final List<Address> addresses = Collections.singletonList(Address.ID);
     final List<String> expectedOutput = Collections.singletonList(Address.ID.toString());
-    when(ibftBlockInterface.validatorsInBlock(blockHeader)).thenReturn(addresses);
+    when(bftBlockInterface.validatorsInBlock(blockHeader)).thenReturn(addresses);
     Object result = method.resultByBlockNumber(request, 12);
     assertThat(result).isEqualTo(expectedOutput);
   }
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVoteTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVoteTest.java
index 5e56fe99fa0..d667bb173b4 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVoteTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/jsonrpc/methods/IbftProposeValidatorVoteTest.java
@@ -15,33 +15,36 @@
 package org.hyperledger.besu.consensus.ibft.jsonrpc.methods;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.consensus.common.VoteProposer;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.common.validator.VoteProvider;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.core.Address;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import java.util.Optional;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class IbftProposeValidatorVoteTest {
-  private final VoteProposer voteProposer = mock(VoteProposer.class);
+  private final ValidatorProvider validatorProvider = mock(ValidatorProvider.class);
+  private final VoteProvider voteProvider = mock(VoteProvider.class);
   private final String IBFT_METHOD = "ibft_proposeValidatorVote";
   private final String JSON_RPC_VERSION = "2.0";
   private IbftProposeValidatorVote method;
 
-  @Rule public ExpectedException expectedException = ExpectedException.none();
-
-  @Before
+  @BeforeEach
   public void setup() {
-    method = new IbftProposeValidatorVote(voteProposer);
+    method = new IbftProposeValidatorVote(validatorProvider);
+    when(validatorProvider.getVoteProviderAtHead()).thenReturn(Optional.of(voteProvider));
   }
 
   @Test
@@ -51,42 +54,30 @@ public void returnsCorrectMethodName() {
 
   @Test
   public void exceptionWhenNoParamsSupplied() {
-    final JsonRpcRequestContext request = requestWithParams();
-
-    expectedException.expect(InvalidJsonRpcParameters.class);
-    expectedException.expectMessage("Missing required json rpc parameter at index 0");
-
-    method.response(request);
+    assertThatThrownBy(() -> method.response(requestWithParams()))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessage("Missing required json rpc parameter at index 0");
   }
 
   @Test
   public void exceptionWhenNoAuthSupplied() {
-    final JsonRpcRequestContext request = requestWithParams(Address.fromHexString("1"));
-
-    expectedException.expect(InvalidJsonRpcParameters.class);
-    expectedException.expectMessage("Missing required json rpc parameter at index 1");
-
-    method.response(request);
+    assertThatThrownBy(() -> method.response(requestWithParams(Address.fromHexString("1"))))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessage("Missing required json rpc parameter at index 1");
   }
 
   @Test
   public void exceptionWhenNoAddressSupplied() {
-    final JsonRpcRequestContext request = requestWithParams("true");
-
-    expectedException.expect(InvalidJsonRpcParameters.class);
-    expectedException.expectMessage("Invalid json rpc parameter at index 0");
-
-    method.response(request);
+    assertThatThrownBy(() -> method.response(requestWithParams("true")))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessageContaining("Invalid json rpc parameter at index 0");
   }
 
   @Test
   public void exceptionWhenInvalidBoolParameterSupplied() {
-    final JsonRpcRequestContext request = requestWithParams(Address.fromHexString("1"), "c");
-
-    expectedException.expect(InvalidJsonRpcParameters.class);
-    expectedException.expectMessage("Invalid json rpc parameter at index 1");
-
-    method.response(request);
+    assertThatThrownBy(() -> method.response(requestWithParams(Address.fromHexString("1"), "c")))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessageContaining("Invalid json rpc parameter at index 1");
   }
 
   @Test
@@ -100,7 +91,7 @@ public void addValidator() {
 
     assertThat(response).isEqualToComparingFieldByField(expectedResponse);
 
-    verify(voteProposer).auth(parameterAddress);
+    verify(voteProvider).authVote(parameterAddress);
   }
 
   @Test
@@ -114,7 +105,7 @@ public void removeValidator() {
 
     assertThat(response).isEqualToComparingFieldByField(expectedResponse);
 
-    verify(voteProposer).drop(parameterAddress);
+    verify(voteProvider).dropVote(parameterAddress);
   }
 
   private JsonRpcRequestContext requestWithParams(final Object... params) {
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/CommitMessageTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/CommitMessageTest.java
index f01ca919d1d..6748d5c6211 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/CommitMessageTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/CommitMessageTest.java
@@ -23,12 +23,12 @@
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class CommitMessageTest {
   @Mock private Commit commitPayload;
   @Mock private Bytes messageBytes;
@@ -57,7 +57,7 @@ public void createMessageFromGenericMessageData() {
     when(messageData.getCode()).thenReturn(IbftV2.COMMIT);
     CommitMessageData commitMessage = CommitMessageData.fromMessageData(messageData);
 
-    assertThat(commitMessage.getData()).isEqualTo(messageData.getData());
+    assertThat(commitMessage.getData()).isEqualTo(messageBytes);
     assertThat(commitMessage.getCode()).isEqualTo(IbftV2.COMMIT);
   }
 
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/PrepareMessageTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/PrepareMessageTest.java
index d8b732a708c..bf17635ccad 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/PrepareMessageTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/PrepareMessageTest.java
@@ -23,12 +23,12 @@
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class PrepareMessageTest {
   @Mock private Prepare preparePayload;
   @Mock private Bytes messageBytes;
@@ -57,7 +57,7 @@ public void createMessageFromGenericMessageData() {
     when(messageData.getCode()).thenReturn(IbftV2.PREPARE);
     PrepareMessageData prepareMessage = PrepareMessageData.fromMessageData(messageData);
 
-    assertThat(prepareMessage.getData()).isEqualTo(messageData.getData());
+    assertThat(prepareMessage.getData()).isEqualTo(messageBytes);
     assertThat(prepareMessage.getCode()).isEqualTo(IbftV2.PREPARE);
   }
 
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/ProposalMessageTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/ProposalMessageTest.java
index b8bb1f949c0..1f24e06e992 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/ProposalMessageTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/ProposalMessageTest.java
@@ -23,12 +23,12 @@
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class ProposalMessageTest {
   @Mock private Proposal proposalMessageData;
   @Mock private Bytes messageBytes;
@@ -57,7 +57,7 @@ public void createMessageFromGenericMessageData() {
     when(messageData.getData()).thenReturn(messageBytes);
     final ProposalMessageData proposalMessage = ProposalMessageData.fromMessageData(messageData);
 
-    assertThat(proposalMessage.getData()).isEqualTo(messageData.getData());
+    assertThat(proposalMessage.getData()).isEqualTo(messageBytes);
     assertThat(proposalMessage.getCode()).isEqualTo(IbftV2.PROPOSAL);
   }
 
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/RoundChangeMessageTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/RoundChangeMessageTest.java
index ed0b36f02e6..1c85dce8fc8 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/RoundChangeMessageTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/messagedata/RoundChangeMessageTest.java
@@ -23,12 +23,12 @@
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class RoundChangeMessageTest {
   @Mock private RoundChange roundChangePayload;
   @Mock private Bytes messageBytes;
@@ -57,7 +57,7 @@ public void createMessageFromGenericMessageData() {
     when(messageData.getCode()).thenReturn(IbftV2.ROUND_CHANGE);
     RoundChangeMessageData roundChangeMessage = RoundChangeMessageData.fromMessageData(messageData);
 
-    assertThat(roundChangeMessage.getData()).isEqualTo(messageData.getData());
+    assertThat(roundChangeMessage.getData()).isEqualTo(messageBytes);
     assertThat(roundChangeMessage.getCode()).isEqualTo(IbftV2.ROUND_CHANGE);
   }
 
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/CommitPayloadTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/CommitPayloadTest.java
index 67774650bb2..4b97518196d 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/CommitPayloadTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/CommitPayloadTest.java
@@ -18,15 +18,16 @@
 
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
 import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 
 import java.math.BigInteger;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CommitPayloadTest {
   private static final ConsensusRoundIdentifier ROUND_IDENTIFIER =
@@ -34,7 +35,9 @@ public class CommitPayloadTest {
 
   @Test
   public void roundTripRlp() {
-    final Signature signature = Signature.create(BigInteger.ONE, BigInteger.TEN, (byte) 0);
+    final SECPSignature signature =
+        SignatureAlgorithmFactory.getInstance()
+            .createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 0);
     final Hash hash = Hash.fromHexStringLenient("0x8523ba6e7c5f59ae87");
 
     final CommitPayload expectedCommitPayload =
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/PreparePayloadTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/PreparePayloadTest.java
index 051fd27d322..a09b4b63b3f 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/PreparePayloadTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/PreparePayloadTest.java
@@ -18,13 +18,13 @@
 
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
 import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PreparePayloadTest {
 
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/PreparedCertificateTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/PreparedCertificateTest.java
index 513d6d79edd..9204b679795 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/PreparedCertificateTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/PreparedCertificateTest.java
@@ -18,12 +18,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.ProposedBlockHelpers;
 import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
-import org.hyperledger.besu.consensus.ibft.TestHelpers;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
@@ -32,14 +34,19 @@
 import java.util.Collections;
 import java.util.List;
 
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import org.assertj.core.util.Lists;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PreparedCertificateTest {
 
   private static final ConsensusRoundIdentifier ROUND_IDENTIFIER =
       new ConsensusRoundIdentifier(0x1234567890ABCDEFL, 0xFEDCBA98);
 
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+
   @Test
   public void roundTripRlpWithNoPreparePayloads() {
     final SignedData<ProposalPayload> signedProposalPayload = signedProposal();
@@ -63,7 +70,8 @@ public void roundTripRlpWithPreparePayload() {
     final SignedData<ProposalPayload> signedProposalPayload = signedProposal();
     final PreparePayload preparePayload =
         new PreparePayload(ROUND_IDENTIFIER, Hash.fromHexStringLenient("0x8523ba6e7c5f59ae87"));
-    final Signature signature = Signature.create(BigInteger.ONE, BigInteger.TEN, (byte) 0);
+    final SECPSignature signature =
+        SIGNATURE_ALGORITHM.get().createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 0);
     final SignedData<PreparePayload> signedPrepare =
         PayloadDeserializers.from(preparePayload, signature);
 
@@ -82,9 +90,11 @@ public void roundTripRlpWithPreparePayload() {
 
   private SignedData<ProposalPayload> signedProposal() {
     final Block block =
-        TestHelpers.createProposalBlock(singletonList(AddressHelpers.ofValue(1)), ROUND_IDENTIFIER);
+        ProposedBlockHelpers.createProposalBlock(
+            singletonList(AddressHelpers.ofValue(1)), ROUND_IDENTIFIER);
     final ProposalPayload proposalPayload = new ProposalPayload(ROUND_IDENTIFIER, block.getHash());
-    final Signature signature = Signature.create(BigInteger.ONE, BigInteger.TEN, (byte) 0);
+    final SECPSignature signature =
+        SIGNATURE_ALGORITHM.get().createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 0);
     return PayloadDeserializers.from(proposalPayload, signature);
   }
 }
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/ProposalPayloadTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/ProposalPayloadTest.java
index 0083bd517e0..31c8957fc2e 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/ProposalPayloadTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/ProposalPayloadTest.java
@@ -18,7 +18,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
-import org.hyperledger.besu.consensus.ibft.TestHelpers;
+import org.hyperledger.besu.consensus.common.bft.ProposedBlockHelpers;
 import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.core.Block;
@@ -26,7 +26,7 @@
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ProposalPayloadTest {
 
@@ -36,7 +36,8 @@ public class ProposalPayloadTest {
   @Test
   public void roundTripRlp() {
     final Block block =
-        TestHelpers.createProposalBlock(singletonList(AddressHelpers.ofValue(1)), ROUND_IDENTIFIER);
+        ProposedBlockHelpers.createProposalBlock(
+            singletonList(AddressHelpers.ofValue(1)), ROUND_IDENTIFIER);
     final ProposalPayload expectedProposalPayload =
         new ProposalPayload(ROUND_IDENTIFIER, block.getHash());
     final BytesValueRLPOutput rlpOut = new BytesValueRLPOutput();
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangeCertificateTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangeCertificateTest.java
index 23a957325ff..e6b4d0e592d 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangeCertificateTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangeCertificateTest.java
@@ -18,13 +18,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.ProposedBlockHelpers;
 import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
-import org.hyperledger.besu.consensus.ibft.TestHelpers;
 import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
@@ -33,7 +34,7 @@
 import java.util.Optional;
 
 import org.assertj.core.util.Lists;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class RoundChangeCertificateTest {
   private static final ConsensusRoundIdentifier ROUND_IDENTIFIER =
@@ -57,9 +58,12 @@ public void rlpRoundTripWithNoPreparedCertificate() {
   @Test
   public void rlpRoundTripWithPreparedCertificate() {
     final Block block =
-        TestHelpers.createProposalBlock(singletonList(AddressHelpers.ofValue(1)), ROUND_IDENTIFIER);
+        ProposedBlockHelpers.createProposalBlock(
+            singletonList(AddressHelpers.ofValue(1)), ROUND_IDENTIFIER);
     final ProposalPayload proposalPayload = new ProposalPayload(ROUND_IDENTIFIER, block.getHash());
-    final Signature signature = Signature.create(BigInteger.ONE, BigInteger.TEN, (byte) 0);
+    final SECPSignature signature =
+        SignatureAlgorithmFactory.getInstance()
+            .createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 0);
     SignedData<ProposalPayload> signedProposal =
         PayloadDeserializers.from(proposalPayload, signature);
 
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangePayloadTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangePayloadTest.java
index 06b68f43cd9..39e070cf456 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangePayloadTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/payload/RoundChangePayloadTest.java
@@ -19,13 +19,15 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.ProposedBlockHelpers;
 import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
-import org.hyperledger.besu.consensus.ibft.TestHelpers;
 import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
@@ -34,15 +36,19 @@
 import java.util.Collections;
 import java.util.Optional;
 
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import org.assertj.core.util.Lists;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class RoundChangePayloadTest {
 
   private static final ConsensusRoundIdentifier ROUND_IDENTIFIER =
       new ConsensusRoundIdentifier(0x1234567890ABCDEFL, 0xFEDCBA98);
-  private static final Signature SIGNATURE =
-      Signature.create(BigInteger.ONE, BigInteger.TEN, (byte) 0);
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+  private static final SECPSignature SIGNATURE =
+      SIGNATURE_ALGORITHM.get().createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 0);
 
   @Test
   public void roundTripRlpWithNoPreparedCertificate() {
@@ -103,9 +109,11 @@ public void roundTripRlpWithPreparedCertificate() {
 
   private SignedData<ProposalPayload> signedProposal() {
     final Block block =
-        TestHelpers.createProposalBlock(singletonList(AddressHelpers.ofValue(1)), ROUND_IDENTIFIER);
+        ProposedBlockHelpers.createProposalBlock(
+            singletonList(AddressHelpers.ofValue(1)), ROUND_IDENTIFIER);
     final ProposalPayload proposalPayload = new ProposalPayload(ROUND_IDENTIFIER, block.getHash());
-    final Signature signature = Signature.create(BigInteger.ONE, BigInteger.TEN, (byte) 0);
+    final SECPSignature signature =
+        SIGNATURE_ALGORITHM.get().createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 0);
     return PayloadDeserializers.from(proposalPayload, signature);
   }
 }
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/protocol/IbftSubProtocolTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/protocol/IbftSubProtocolTest.java
index f77ceb0d283..105d2a8d156 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/protocol/IbftSubProtocolTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/protocol/IbftSubProtocolTest.java
@@ -16,7 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class IbftSubProtocolTest {
 
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/queries/IbftQueryServiceImplTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/queries/IbftQueryServiceImplTest.java
deleted file mode 100644
index 552755860cd..00000000000
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/queries/IbftQueryServiceImplTest.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibft.queries;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.consensus.ibft.IbftBlockHashing;
-import org.hyperledger.besu.consensus.ibft.IbftBlockHeaderFunctions;
-import org.hyperledger.besu.consensus.ibft.IbftBlockInterface;
-import org.hyperledger.besu.consensus.ibft.IbftExtraData;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.NonBesuBlockHeader;
-import org.hyperledger.besu.ethereum.core.Util;
-import org.hyperledger.besu.plugin.services.query.IbftQueryService;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import com.google.common.collect.Lists;
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-@RunWith(MockitoJUnitRunner.class)
-public class IbftQueryServiceImplTest {
-
-  @Mock private Blockchain blockchain;
-
-  private final List<NodeKey> validatorKeys =
-      Lists.newArrayList(NodeKeyUtils.generate(), NodeKeyUtils.generate());
-
-  private final List<NodeKey> signingKeys = Lists.newArrayList(validatorKeys.get(0));
-  private final int ROUND_NUMBER_IN_BLOCK = 5;
-
-  private IbftExtraData signedExtraData;
-  private BlockHeader blockHeader;
-
-  @Before
-  public void setup() {
-
-    final Collection<Address> validators =
-        validatorKeys.stream()
-            .map(validatorKeys -> Util.publicKeyToAddress(validatorKeys.getPublicKey()))
-            .collect(Collectors.toList());
-
-    final IbftExtraData unsignedExtraData =
-        new IbftExtraData(
-            Bytes.wrap(new byte[32]),
-            Collections.emptyList(),
-            Optional.empty(),
-            ROUND_NUMBER_IN_BLOCK,
-            validators);
-
-    final BlockHeaderTestFixture blockHeaderTestFixture = new BlockHeaderTestFixture();
-    blockHeaderTestFixture.number(1); // can't be genesis block (due to extradata serialisation)
-    blockHeaderTestFixture.blockHeaderFunctions(IbftBlockHeaderFunctions.forOnChainBlock());
-    blockHeaderTestFixture.extraData(unsignedExtraData.encode());
-
-    final BlockHeader unsignedBlockHeader = blockHeaderTestFixture.buildHeader();
-
-    final Collection<Signature> validatorSignatures =
-        signingKeys.stream()
-            .map(
-                nodeKey ->
-                    nodeKey.sign(
-                        IbftBlockHashing.calculateDataHashForCommittedSeal(unsignedBlockHeader)))
-            .collect(Collectors.toList());
-
-    signedExtraData =
-        new IbftExtraData(
-            Bytes.wrap(new byte[32]),
-            validatorSignatures,
-            Optional.empty(),
-            ROUND_NUMBER_IN_BLOCK,
-            validators);
-
-    blockHeaderTestFixture.extraData(signedExtraData.encode());
-    blockHeader = blockHeaderTestFixture.buildHeader();
-  }
-
-  @Test
-  public void roundNumberFromBlockIsReturned() {
-    final IbftQueryService service =
-        new IbftQueryServiceImpl(new IbftBlockInterface(), blockchain, null);
-
-    assertThat(service.getRoundNumberFrom(blockHeader)).isEqualTo(ROUND_NUMBER_IN_BLOCK);
-  }
-
-  @Test
-  public void getRoundNumberThrowsIfBlockIsNotOnTheChain() {
-    final NonBesuBlockHeader header =
-        new NonBesuBlockHeader(blockHeader.getHash(), blockHeader.getExtraData());
-    when(blockchain.getBlockHeader(blockHeader.getHash())).thenReturn(Optional.empty());
-
-    final IbftQueryService service =
-        new IbftQueryServiceImpl(new IbftBlockInterface(), blockchain, null);
-    assertThatExceptionOfType(RuntimeException.class)
-        .isThrownBy(() -> service.getRoundNumberFrom(header));
-  }
-
-  @Test
-  public void getSignersReturnsAddressesOfSignersInBlock() {
-    final IbftQueryService service =
-        new IbftQueryServiceImpl(new IbftBlockInterface(), blockchain, null);
-
-    final List<Address> signers =
-        signingKeys.stream()
-            .map(nodeKey -> Util.publicKeyToAddress(nodeKey.getPublicKey()))
-            .collect(Collectors.toList());
-
-    assertThat(service.getSignersFrom(blockHeader)).containsExactlyElementsOf(signers);
-  }
-
-  @Test
-  public void getSignersThrowsIfBlockIsNotOnTheChain() {
-    final NonBesuBlockHeader header =
-        new NonBesuBlockHeader(blockHeader.getHash(), blockHeader.getExtraData());
-    when(blockchain.getBlockHeader(blockHeader.getHash())).thenReturn(Optional.empty());
-
-    final IbftQueryService service =
-        new IbftQueryServiceImpl(new IbftBlockInterface(), blockchain, null);
-    assertThatExceptionOfType(RuntimeException.class)
-        .isThrownBy(() -> service.getSignersFrom(header));
-  }
-}
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManagerTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManagerTest.java
index 4200b64003c..6b53fcef3e3 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManagerTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftBlockHeightManagerTest.java
@@ -17,12 +17,13 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.consensus.ibft.IbftContextBuilder.setupContextWithValidators;
-import static org.hyperledger.besu.consensus.ibft.TestHelpers.createFrom;
+import static org.hyperledger.besu.consensus.common.bft.BftContextBuilder.setupContextWithValidators;
+import static org.hyperledger.besu.consensus.common.bft.ConsensusRoundHelpers.createFrom;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
@@ -30,34 +31,43 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
 import org.hyperledger.besu.consensus.common.bft.BlockTimer;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
 import org.hyperledger.besu.consensus.common.bft.RoundTimer;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.BftBlockCreator;
 import org.hyperledger.besu.consensus.common.bft.events.RoundExpiry;
-import org.hyperledger.besu.consensus.ibft.IbftExtraData;
-import org.hyperledger.besu.consensus.ibft.blockcreation.IbftBlockCreator;
+import org.hyperledger.besu.consensus.common.bft.network.ValidatorMulticaster;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftFinalState;
+import org.hyperledger.besu.consensus.ibft.IbftExtraDataCodec;
+import org.hyperledger.besu.consensus.ibft.messagedata.RoundChangeMessageData;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange;
 import org.hyperledger.besu.consensus.ibft.network.IbftMessageTransmitter;
 import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.ibft.payload.PreparedCertificate;
 import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate;
 import org.hyperledger.besu.consensus.ibft.validation.FutureRoundProposalMessageValidator;
 import org.hyperledger.besu.consensus.ibft.validation.MessageValidator;
 import org.hyperledger.besu.consensus.ibft.validation.MessageValidatorFactory;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.ethereum.blockcreation.BlockCreator.BlockCreationResult;
+import org.hyperledger.besu.ethereum.blockcreation.BlockTransactionSelector.TransactionSelectionResults;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.BlockImporter;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Util;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 import org.hyperledger.besu.util.Subscribers;
 
 import java.math.BigInteger;
@@ -69,37 +79,39 @@
 import com.google.common.collect.Lists;
 import org.apache.tuweni.bytes.Bytes;
 import org.assertj.core.api.Assertions;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class IbftBlockHeightManagerTest {
 
   private final NodeKey nodeKey = NodeKeyUtils.generate();
   private final MessageFactory messageFactory = new MessageFactory(nodeKey);
   private final BlockHeaderTestFixture headerTestFixture = new BlockHeaderTestFixture();
 
-  @Mock private IbftFinalState finalState;
+  @Mock private BftFinalState finalState;
   @Mock private IbftMessageTransmitter messageTransmitter;
   @Mock private RoundChangeManager roundChangeManager;
   @Mock private IbftRoundFactory roundFactory;
   @Mock private Clock clock;
   @Mock private MessageValidatorFactory messageValidatorFactory;
-  @Mock private IbftBlockCreator blockCreator;
+  @Mock private BftBlockCreator blockCreator;
   @Mock private BlockImporter blockImporter;
   @Mock private BlockTimer blockTimer;
   @Mock private RoundTimer roundTimer;
   @Mock private FutureRoundProposalMessageValidator futureRoundProposalMessageValidator;
+  @Mock private ValidatorMulticaster validatorMulticaster;
 
-  @Captor private ArgumentCaptor<Optional<PreparedRoundArtifacts>> preparedRoundArtifactsCaptor;
+  @Captor private ArgumentCaptor<MessageData> sentMessageArgCaptor;
 
   private final List<Address> validators = Lists.newArrayList();
   private final List<MessageFactory> validatorMessageFactory = Lists.newArrayList();
+  private final BftExtraDataCodec bftExtraDataCodec = new IbftExtraDataCodec();
 
   private ProtocolContext protocolContext;
   private final ConsensusRoundIdentifier roundIdentifier = new ConsensusRoundIdentifier(1, 0);
@@ -107,15 +119,15 @@ public class IbftBlockHeightManagerTest {
 
   private void buildCreatedBlock() {
 
-    final IbftExtraData extraData =
-        new IbftExtraData(Bytes.wrap(new byte[32]), emptyList(), Optional.empty(), 0, validators);
+    final BftExtraData extraData =
+        new BftExtraData(Bytes.wrap(new byte[32]), emptyList(), Optional.empty(), 0, validators);
 
-    headerTestFixture.extraData(extraData.encode());
+    headerTestFixture.extraData(new IbftExtraDataCodec().encode(extraData));
     final BlockHeader header = headerTestFixture.buildHeader();
     createdBlock = new Block(header, new BlockBody(emptyList(), emptyList()));
   }
 
-  @Before
+  @BeforeEach
   public void setup() {
     for (int i = 0; i < 3; i++) {
       final NodeKey nodeKey = NodeKeyUtils.generate();
@@ -126,21 +138,27 @@ public void setup() {
     buildCreatedBlock();
 
     final MessageValidator messageValidator = mock(MessageValidator.class);
-    when(messageValidator.validateProposal(any())).thenReturn(true);
-    when(messageValidator.validateCommit(any())).thenReturn(true);
-    when(messageValidator.validatePrepare(any())).thenReturn(true);
-    when(finalState.getTransmitter()).thenReturn(messageTransmitter);
+    lenient().when(messageValidator.validateProposal(any())).thenReturn(true);
+    lenient().when(messageValidator.validateCommit(any())).thenReturn(true);
+    lenient().when(messageValidator.validatePrepare(any())).thenReturn(true);
     when(finalState.getBlockTimer()).thenReturn(blockTimer);
-    when(finalState.getQuorum()).thenReturn(3);
-    when(finalState.getMessageFactory()).thenReturn(messageFactory);
-    when(blockCreator.createBlock(anyLong())).thenReturn(createdBlock);
-
-    when(futureRoundProposalMessageValidator.validateProposalMessage(any())).thenReturn(true);
+    lenient().when(finalState.getQuorum()).thenReturn(3);
+    when(finalState.getValidatorMulticaster()).thenReturn(validatorMulticaster);
+    lenient()
+        .when(blockCreator.createBlock(anyLong()))
+        .thenReturn(new BlockCreationResult(createdBlock, new TransactionSelectionResults()));
+
+    lenient()
+        .when(futureRoundProposalMessageValidator.validateProposalMessage(any()))
+        .thenReturn(true);
     when(messageValidatorFactory.createFutureRoundProposalMessageValidator(anyLong(), any()))
         .thenReturn(futureRoundProposalMessageValidator);
-    when(messageValidatorFactory.createMessageValidator(any(), any())).thenReturn(messageValidator);
+    lenient()
+        .when(messageValidatorFactory.createMessageValidator(any(), any()))
+        .thenReturn(messageValidator);
 
-    protocolContext = new ProtocolContext(null, null, setupContextWithValidators(validators));
+    protocolContext =
+        new ProtocolContext(null, null, setupContextWithValidators(validators), Optional.empty());
 
     // Ensure the created IbftRound has the valid ConsensusRoundIdentifier;
     when(roundFactory.createNewRound(any(), anyInt()))
@@ -148,8 +166,7 @@ public void setup() {
             invocation -> {
               final int round = invocation.getArgument(1);
               final ConsensusRoundIdentifier roundId = new ConsensusRoundIdentifier(1, round);
-              final RoundState createdRoundState =
-                  new RoundState(roundId, finalState.getQuorum(), messageValidator);
+              final RoundState createdRoundState = new RoundState(roundId, 3, messageValidator);
               return new IbftRound(
                   createdRoundState,
                   blockCreator,
@@ -159,10 +176,12 @@ public void setup() {
                   nodeKey,
                   messageFactory,
                   messageTransmitter,
-                  roundTimer);
+                  roundTimer,
+                  bftExtraDataCodec);
             });
 
-    when(roundFactory.createNewRoundWithState(any(), any()))
+    lenient()
+        .when(roundFactory.createNewRoundWithState(any(), any()))
         .thenAnswer(
             invocation -> {
               final RoundState providedRoundState = invocation.getArgument(1);
@@ -175,7 +194,8 @@ public void setup() {
                   nodeKey,
                   messageFactory,
                   messageTransmitter,
-                  roundTimer);
+                  roundTimer,
+                  bftExtraDataCodec);
             });
   }
 
@@ -189,7 +209,8 @@ public void startsABlockTimerOnStartIfLocalNodeIsTheProoserForRound() {
         roundChangeManager,
         roundFactory,
         clock,
-        messageValidatorFactory);
+        messageValidatorFactory,
+        messageFactory);
 
     verify(blockTimer, times(1)).startTimer(any(), any());
   }
@@ -203,7 +224,8 @@ public void onBlockTimerExpiryProposalMessageIsTransmitted() {
             roundChangeManager,
             roundFactory,
             clock,
-            messageValidatorFactory);
+            messageValidatorFactory,
+            messageFactory);
 
     manager.handleBlockTimerExpiry(roundIdentifier);
     verify(messageTransmitter, times(1)).multicastProposal(eq(roundIdentifier), any(), any());
@@ -227,7 +249,8 @@ public void onRoundChangeReceptionRoundChangeManagerIsInvokedAndNewRoundStarted(
             roundChangeManager,
             roundFactory,
             clock,
-            messageValidatorFactory);
+            messageValidatorFactory,
+            messageFactory);
     verify(roundFactory).createNewRound(any(), eq(0));
 
     manager.handleRoundChangePayload(roundChange);
@@ -246,7 +269,8 @@ public void onRoundTimerExpiryANewRoundIsCreatedWithAnIncrementedRoundNumber() {
             roundChangeManager,
             roundFactory,
             clock,
-            messageValidatorFactory);
+            messageValidatorFactory,
+            messageFactory);
     verify(roundFactory).createNewRound(any(), eq(0));
 
     manager.roundExpired(new RoundExpiry(roundIdentifier));
@@ -272,7 +296,8 @@ public void whenSufficientRoundChangesAreReceivedAProposalMessageIsTransmitted()
             roundChangeManager,
             roundFactory,
             clock,
-            messageValidatorFactory);
+            messageValidatorFactory,
+            messageFactory);
     reset(messageTransmitter);
 
     manager.handleRoundChangePayload(roundChange);
@@ -292,7 +317,8 @@ public void messagesForFutureRoundsAreBufferedAndUsedToPreloadNewRoundWhenItIsSt
             roundChangeManager,
             roundFactory,
             clock,
-            messageValidatorFactory);
+            messageValidatorFactory,
+            messageFactory);
 
     final Prepare prepare =
         validatorMessageFactory
@@ -304,7 +330,8 @@ public void messagesForFutureRoundsAreBufferedAndUsedToPreloadNewRoundWhenItIsSt
             .createCommit(
                 futureRoundIdentifier,
                 Hash.fromHexStringLenient("0"),
-                Signature.create(BigInteger.ONE, BigInteger.ONE, (byte) 1));
+                SignatureAlgorithmFactory.getInstance()
+                    .createSignature(BigInteger.ONE, BigInteger.ONE, (byte) 1));
 
     manager.handlePreparePayload(prepare);
     manager.handleCommitPayload(commit);
@@ -332,7 +359,9 @@ public void preparedCertificateIncludedInRoundChangeMessageOnRoundTimeoutExpired
             roundChangeManager,
             roundFactory,
             clock,
-            messageValidatorFactory);
+            messageValidatorFactory,
+            messageFactory);
+
     manager.handleBlockTimerExpiry(roundIdentifier); // Trigger a Proposal creation.
 
     final Prepare firstPrepare =
@@ -348,15 +377,16 @@ public void preparedCertificateIncludedInRoundChangeMessageOnRoundTimeoutExpired
 
     manager.roundExpired(new RoundExpiry(roundIdentifier));
 
-    final ConsensusRoundIdentifier nextRound = createFrom(roundIdentifier, 0, +1);
+    verify(validatorMulticaster, times(1)).send(sentMessageArgCaptor.capture());
+    final MessageData capturedMessageData = sentMessageArgCaptor.getValue();
 
-    verify(messageTransmitter, times(1))
-        .multicastRoundChange(eq(nextRound), preparedRoundArtifactsCaptor.capture());
-    final Optional<PreparedRoundArtifacts> preparedCert = preparedRoundArtifactsCaptor.getValue();
+    assertThat(capturedMessageData).isInstanceOf(RoundChangeMessageData.class);
+    final RoundChangeMessageData roundChange = (RoundChangeMessageData) capturedMessageData;
 
+    Optional<PreparedCertificate> preparedCert = roundChange.decode().getPreparedCertificate();
     Assertions.assertThat(preparedCert).isNotEmpty();
 
-    assertThat(preparedCert.get().getPreparedCertificate().getPreparePayloads())
+    assertThat(preparedCert.get().getPreparePayloads())
         .containsOnly(firstPrepare.getSignedPayload(), secondPrepare.getSignedPayload());
   }
 
@@ -373,7 +403,8 @@ public void illegalFutureRoundProposalDoesNotTriggerNewRound() {
             roundChangeManager,
             roundFactory,
             clock,
-            messageValidatorFactory);
+            messageValidatorFactory,
+            messageFactory);
 
     // Force a new round to be started at new round number.
     final Proposal futureRoundProposal =
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftControllerTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftControllerTest.java
index ff17f744c28..6999ae398a8 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftControllerTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftControllerTest.java
@@ -14,11 +14,11 @@
  */
 package org.hyperledger.besu.consensus.ibft.statemachine;
 
-import static org.assertj.core.util.Lists.emptyList;
 import static org.assertj.core.util.Lists.newArrayList;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
@@ -33,6 +33,8 @@
 import org.hyperledger.besu.consensus.common.bft.events.BlockTimerExpiry;
 import org.hyperledger.besu.consensus.common.bft.events.NewChainHead;
 import org.hyperledger.besu.consensus.common.bft.events.RoundExpiry;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftFinalState;
+import org.hyperledger.besu.consensus.common.bft.statemachine.FutureMessageBuffer;
 import org.hyperledger.besu.consensus.ibft.IbftGossip;
 import org.hyperledger.besu.consensus.ibft.messagedata.CommitMessageData;
 import org.hyperledger.besu.consensus.ibft.messagedata.IbftV2;
@@ -43,30 +45,31 @@
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.DefaultMessage;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message;
 
+import java.util.Collections;
 import java.util.List;
 
 import com.google.common.collect.ImmutableList;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class IbftControllerTest {
   @Mock private Blockchain blockChain;
-  @Mock private IbftFinalState ibftFinalState;
+  @Mock private BftFinalState bftFinalState;
   @Mock private IbftBlockHeightManagerFactory blockHeightManagerFactory;
   @Mock private BlockHeader chainHeadBlockHeader;
   @Mock private BlockHeader nextBlock;
-  @Mock private BlockHeightManager blockHeightManager;
+  @Mock private BaseIbftBlockHeightManager blockHeightManager;
 
   @Mock private Proposal proposal;
   private Message proposalMessage;
@@ -94,30 +97,30 @@ public class IbftControllerTest {
   @Mock private FutureMessageBuffer futureMessageBuffer;
   private IbftController ibftController;
 
-  @Before
+  @BeforeEach
   public void setup() {
     when(blockChain.getChainHeadHeader()).thenReturn(chainHeadBlockHeader);
-    when(blockChain.getChainHeadBlockNumber()).thenReturn(3L);
-    when(blockHeightManagerFactory.create(any())).thenReturn(blockHeightManager);
-    when(ibftFinalState.getValidators()).thenReturn(ImmutableList.of(validator));
+    lenient().when(blockChain.getChainHeadBlockNumber()).thenReturn(3L);
+    lenient().when(blockHeightManagerFactory.create(any())).thenReturn(blockHeightManager);
+    lenient().when(bftFinalState.getValidators()).thenReturn(ImmutableList.of(validator));
 
-    when(chainHeadBlockHeader.getNumber()).thenReturn(3L);
-    when(chainHeadBlockHeader.getHash()).thenReturn(Hash.ZERO);
+    lenient().when(chainHeadBlockHeader.getNumber()).thenReturn(3L);
+    lenient().when(chainHeadBlockHeader.getHash()).thenReturn(Hash.ZERO);
 
-    when(blockHeightManager.getParentBlockHeader()).thenReturn(chainHeadBlockHeader);
-    when(blockHeightManager.getChainHeight()).thenReturn(4L); // one great than blockchain
+    lenient().when(blockHeightManager.getParentBlockHeader()).thenReturn(chainHeadBlockHeader);
+    when(blockHeightManager.getChainHeight()).thenReturn(4L); // one greater than blockchain
 
-    when(nextBlock.getNumber()).thenReturn(5L);
+    lenient().when(nextBlock.getNumber()).thenReturn(5L);
 
-    when(ibftFinalState.isLocalNodeValidator()).thenReturn(true);
-    when(messageTracker.hasSeenMessage(any())).thenReturn(false);
+    lenient().when(bftFinalState.isLocalNodeValidator()).thenReturn(true);
+    lenient().when(messageTracker.hasSeenMessage(any())).thenReturn(false);
   }
 
   private void constructIbftController() {
     ibftController =
         new IbftController(
             blockChain,
-            ibftFinalState,
+            bftFinalState,
             blockHeightManagerFactory,
             ibftGossip,
             messageTracker,
@@ -137,9 +140,7 @@ public void createsNewBlockHeightManagerWhenStarted() {
 
   @Test
   public void startsNewBlockHeightManagerAndReplaysFutureMessages() {
-    final ConsensusRoundIdentifier roundIdentifierHeight6 = new ConsensusRoundIdentifier(6, 0);
     setupPrepare(futureRoundIdentifier, validator);
-    setupProposal(roundIdentifierHeight6, validator);
     setupCommit(futureRoundIdentifier, validator);
     setupRoundChange(futureRoundIdentifier, validator);
 
@@ -174,7 +175,7 @@ public void createsNewBlockHeightManagerAndReplaysFutureMessagesOnNewChainHeadEv
     when(futureMessageBuffer.retrieveMessagesForHeight(5L))
         .thenReturn(
             ImmutableList.of(prepareMessage, proposalMessage, commitMessage, roundChangeMessage))
-        .thenReturn(emptyList());
+        .thenReturn(Collections.emptyList());
     when(blockHeightManager.getChainHeight()).thenReturn(5L);
 
     constructIbftController();
@@ -199,7 +200,7 @@ public void createsNewBlockHeightManagerAndReplaysFutureMessagesOnNewChainHeadEv
   public void newBlockForCurrentOrPreviousHeightTriggersNoChange() {
     constructIbftController();
     ibftController.start();
-    long chainHeadHeight = chainHeadBlockHeader.getNumber();
+    long chainHeadHeight = 3;
     when(nextBlock.getNumber()).thenReturn(chainHeadHeight);
     when(nextBlock.getHash()).thenReturn(Hash.ZERO);
     final NewChainHead sameHeightBlock = new NewChainHead(nextBlock);
@@ -444,16 +445,16 @@ private void verifyHasFutureMessages(final long msgHeight, final Message message
 
   private void setupProposal(
       final ConsensusRoundIdentifier roundIdentifier, final Address validator) {
-    when(proposal.getAuthor()).thenReturn(validator);
-    when(proposal.getRoundIdentifier()).thenReturn(roundIdentifier);
-    when(proposalMessageData.getCode()).thenReturn(IbftV2.PROPOSAL);
-    when(proposalMessageData.decode()).thenReturn(proposal);
+    lenient().when(proposal.getAuthor()).thenReturn(validator);
+    lenient().when(proposal.getRoundIdentifier()).thenReturn(roundIdentifier);
+    lenient().when(proposalMessageData.getCode()).thenReturn(IbftV2.PROPOSAL);
+    lenient().when(proposalMessageData.decode()).thenReturn(proposal);
     proposalMessage = new DefaultMessage(null, proposalMessageData);
   }
 
   private void setupPrepare(
       final ConsensusRoundIdentifier roundIdentifier, final Address validator) {
-    when(prepare.getAuthor()).thenReturn(validator);
+    lenient().when(prepare.getAuthor()).thenReturn(validator);
     when(prepare.getRoundIdentifier()).thenReturn(roundIdentifier);
     when(prepareMessageData.getCode()).thenReturn(IbftV2.PREPARE);
     when(prepareMessageData.decode()).thenReturn(prepare);
@@ -462,7 +463,7 @@ private void setupPrepare(
 
   private void setupCommit(
       final ConsensusRoundIdentifier roundIdentifier, final Address validator) {
-    when(commit.getAuthor()).thenReturn(validator);
+    lenient().when(commit.getAuthor()).thenReturn(validator);
     when(commit.getRoundIdentifier()).thenReturn(roundIdentifier);
     when(commitMessageData.getCode()).thenReturn(IbftV2.COMMIT);
     when(commitMessageData.decode()).thenReturn(commit);
@@ -471,7 +472,7 @@ private void setupCommit(
 
   private void setupRoundChange(
       final ConsensusRoundIdentifier roundIdentifier, final Address validator) {
-    when(roundChange.getAuthor()).thenReturn(validator);
+    lenient().when(roundChange.getAuthor()).thenReturn(validator);
     when(roundChange.getRoundIdentifier()).thenReturn(roundIdentifier);
     when(roundChangeMessageData.getCode()).thenReturn(IbftV2.ROUND_CHANGE);
     when(roundChangeMessageData.decode()).thenReturn(roundChange);
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftRoundTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftRoundTest.java
index af2d94ec4e5..986b1f7da5f 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftRoundTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/IbftRoundTest.java
@@ -17,10 +17,11 @@
 import static java.util.Collections.emptyList;
 import static java.util.Optional.empty;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.consensus.ibft.IbftContextBuilder.setupContextWithValidators;
+import static org.hyperledger.besu.consensus.common.bft.BftContextBuilder.setupContextWithBftExtraDataEncoder;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
@@ -28,19 +29,25 @@
 import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.consensus.common.bft.BftBlockHashing;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
 import org.hyperledger.besu.consensus.common.bft.RoundTimer;
-import org.hyperledger.besu.consensus.ibft.IbftBlockHashing;
-import org.hyperledger.besu.consensus.ibft.IbftExtraData;
-import org.hyperledger.besu.consensus.ibft.blockcreation.IbftBlockCreator;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.BftBlockCreator;
+import org.hyperledger.besu.consensus.ibft.IbftExtraDataCodec;
 import org.hyperledger.besu.consensus.ibft.network.IbftMessageTransmitter;
 import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
 import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate;
 import org.hyperledger.besu.consensus.ibft.validation.MessageValidator;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.blockcreation.BlockCreator.BlockCreationResult;
+import org.hyperledger.besu.ethereum.blockcreation.BlockTransactionSelector.TransactionSelectionResults;
 import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.Block;
@@ -48,7 +55,7 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.BlockImporter;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.mainnet.BlockImportResult;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 import org.hyperledger.besu.plugin.services.securitymodule.SecurityModuleException;
 import org.hyperledger.besu.util.Subscribers;
@@ -58,21 +65,22 @@
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class IbftRoundTest {
 
   private final NodeKey nodeKey = NodeKeyUtils.generate();
   private final ConsensusRoundIdentifier roundIdentifier = new ConsensusRoundIdentifier(1, 0);
   private final MessageFactory messageFactory = new MessageFactory(nodeKey);
   private final Subscribers<MinedBlockObserver> subscribers = Subscribers.create();
+  private final BftExtraDataCodec bftExtraDataCodec = new IbftExtraDataCodec();
   private ProtocolContext protocolContext;
 
   @Mock private MutableBlockchain blockChain;
@@ -80,39 +88,48 @@ public class IbftRoundTest {
   @Mock private BlockImporter blockImporter;
   @Mock private IbftMessageTransmitter transmitter;
   @Mock private MinedBlockObserver minedBlockObserver;
-  @Mock private IbftBlockCreator blockCreator;
+  @Mock private BftBlockCreator blockCreator;
   @Mock private MessageValidator messageValidator;
   @Mock private RoundTimer roundTimer;
 
   @Captor private ArgumentCaptor<Block> blockCaptor;
 
   private Block proposedBlock;
-  private IbftExtraData proposedExtraData;
+  private BftExtraData proposedExtraData;
 
-  private final Signature remoteCommitSeal =
-      Signature.create(BigInteger.ONE, BigInteger.ONE, (byte) 1);
+  private final SECPSignature remoteCommitSeal =
+      SignatureAlgorithmFactory.getInstance()
+          .createSignature(BigInteger.ONE, BigInteger.ONE, (byte) 1);
 
-  @Before
+  @BeforeEach
   public void setup() {
     protocolContext =
-        new ProtocolContext(blockChain, worldStateArchive, setupContextWithValidators(emptyList()));
+        new ProtocolContext(
+            blockChain,
+            worldStateArchive,
+            setupContextWithBftExtraDataEncoder(emptyList(), new IbftExtraDataCodec()),
+            Optional.empty());
 
-    when(messageValidator.validateProposal(any())).thenReturn(true);
-    when(messageValidator.validatePrepare(any())).thenReturn(true);
-    when(messageValidator.validateCommit(any())).thenReturn(true);
+    lenient().when(messageValidator.validateProposal(any())).thenReturn(true);
+    lenient().when(messageValidator.validatePrepare(any())).thenReturn(true);
+    lenient().when(messageValidator.validateCommit(any())).thenReturn(true);
 
     proposedExtraData =
-        new IbftExtraData(Bytes.wrap(new byte[32]), emptyList(), empty(), 0, emptyList());
+        new BftExtraData(Bytes.wrap(new byte[32]), emptyList(), empty(), 0, emptyList());
     final BlockHeaderTestFixture headerTestFixture = new BlockHeaderTestFixture();
-    headerTestFixture.extraData(proposedExtraData.encode());
+    headerTestFixture.extraData(new IbftExtraDataCodec().encode(proposedExtraData));
     headerTestFixture.number(1);
 
     final BlockHeader header = headerTestFixture.buildHeader();
     proposedBlock = new Block(header, new BlockBody(emptyList(), emptyList()));
 
-    when(blockCreator.createBlock(anyLong())).thenReturn(proposedBlock);
+    lenient()
+        .when(blockCreator.createBlock(anyLong()))
+        .thenReturn(new BlockCreationResult(proposedBlock, new TransactionSelectionResults()));
 
-    when(blockImporter.importBlock(any(), any(), any())).thenReturn(true);
+    lenient()
+        .when(blockImporter.importBlock(any(), any(), any()))
+        .thenReturn(new BlockImportResult(true));
 
     subscribers.subscribe(minedBlockObserver);
   }
@@ -129,7 +146,8 @@ public void onConstructionRoundTimerIsStarted() {
         nodeKey,
         messageFactory,
         transmitter,
-        roundTimer);
+        roundTimer,
+        bftExtraDataCodec);
     verify(roundTimer, times(1)).startTimer(roundIdentifier);
   }
 
@@ -146,7 +164,8 @@ public void onReceptionOfValidProposalSendsAPrepareToNetworkPeers() {
             nodeKey,
             messageFactory,
             transmitter,
-            roundTimer);
+            roundTimer,
+            bftExtraDataCodec);
 
     round.handleProposalMessage(
         messageFactory.createProposal(roundIdentifier, proposedBlock, Optional.empty()));
@@ -167,7 +186,8 @@ public void sendsAProposalWhenRequested() {
             nodeKey,
             messageFactory,
             transmitter,
-            roundTimer);
+            roundTimer,
+            bftExtraDataCodec);
 
     round.createAndSendProposalMessage(15);
     verify(transmitter, times(1))
@@ -189,7 +209,8 @@ public void singleValidatorImportBlocksImmediatelyOnProposalCreation() {
             nodeKey,
             messageFactory,
             transmitter,
-            roundTimer);
+            roundTimer,
+            bftExtraDataCodec);
     round.createAndSendProposalMessage(15);
     verify(transmitter, times(1))
         .multicastProposal(roundIdentifier, proposedBlock, Optional.empty());
@@ -211,12 +232,13 @@ public void twoValidatorNetworkSendsPrepareOnProposalReceptionThenSendsCommitOnC
             nodeKey,
             messageFactory,
             transmitter,
-            roundTimer);
+            roundTimer,
+            bftExtraDataCodec);
 
     final Hash commitSealHash =
-        IbftBlockHashing.calculateDataHashForCommittedSeal(
-            proposedBlock.getHeader(), proposedExtraData);
-    final Signature localCommitSeal = nodeKey.sign(commitSealHash);
+        new BftBlockHashing(new IbftExtraDataCodec())
+            .calculateDataHashForCommittedSeal(proposedBlock.getHeader(), proposedExtraData);
+    final SECPSignature localCommitSeal = nodeKey.sign(commitSealHash);
 
     // Receive Proposal Message
     round.handleProposalMessage(
@@ -236,8 +258,8 @@ public void twoValidatorNetworkSendsPrepareOnProposalReceptionThenSendsCommitOnC
     verify(blockImporter, times(1)).importBlock(any(), capturedBlock.capture(), any());
 
     // Ensure imported block contains both commit seals.
-    final IbftExtraData importedExtraData =
-        IbftExtraData.decode(capturedBlock.getValue().getHeader());
+    final BftExtraData importedExtraData =
+        new IbftExtraDataCodec().decode(capturedBlock.getValue().getHeader());
     assertThat(importedExtraData.getSeals()).containsOnly(remoteCommitSeal, localCommitSeal);
   }
 
@@ -254,12 +276,13 @@ public void localNodeProposesToNetworkOfTwoValidatorsImportsOnReceptionOfCommitF
             nodeKey,
             messageFactory,
             transmitter,
-            roundTimer);
+            roundTimer,
+            bftExtraDataCodec);
 
     final Hash commitSealHash =
-        IbftBlockHashing.calculateDataHashForCommittedSeal(
-            proposedBlock.getHeader(), proposedExtraData);
-    final Signature localCommitSeal = nodeKey.sign(commitSealHash);
+        new BftBlockHashing(new IbftExtraDataCodec())
+            .calculateDataHashForCommittedSeal(proposedBlock.getHeader(), proposedExtraData);
+    final SECPSignature localCommitSeal = nodeKey.sign(commitSealHash);
 
     round.createAndSendProposalMessage(15);
     verify(transmitter, never()).multicastCommit(any(), any(), any());
@@ -290,7 +313,8 @@ public void aProposalWithAnewBlockIsSentUponReceptionOfARoundChangeWithNoCertifi
             nodeKey,
             messageFactory,
             transmitter,
-            roundTimer);
+            roundTimer,
+            bftExtraDataCodec);
 
     final RoundChangeCertificate roundChangeCertificate = new RoundChangeCertificate(emptyList());
 
@@ -313,7 +337,8 @@ public void aProposalMessageWithTheSameBlockIsSentUponReceptionOfARoundChangeWit
             nodeKey,
             messageFactory,
             transmitter,
-            roundTimer);
+            roundTimer,
+            bftExtraDataCodec);
 
     final RoundChangeArtifacts roundChangeArtifacts =
         RoundChangeArtifacts.create(
@@ -335,8 +360,8 @@ public void aProposalMessageWithTheSameBlockIsSentUponReceptionOfARoundChangeWit
             blockCaptor.capture(),
             eq(Optional.of(roundChangeArtifacts.getRoundChangeCertificate())));
 
-    final IbftExtraData proposedExtraData =
-        IbftExtraData.decode(blockCaptor.getValue().getHeader());
+    final BftExtraData proposedExtraData =
+        new IbftExtraDataCodec().decode(blockCaptor.getValue().getHeader());
     assertThat(proposedExtraData.getRound()).isEqualTo(roundIdentifier.getRoundNumber());
 
     // Inject a single Prepare message, and confirm the roundState has gone to Prepared (which
@@ -359,7 +384,8 @@ public void creatingNewBlockFromEmptyPreparedCertificateUpdatesInternalState() {
             nodeKey,
             messageFactory,
             transmitter,
-            roundTimer);
+            roundTimer,
+            bftExtraDataCodec);
 
     final RoundChangeArtifacts roundChangeArtifacts =
         RoundChangeArtifacts.create(
@@ -392,7 +418,8 @@ public void creatingNewBlockNotifiesBlockMiningObservers() {
             nodeKey,
             messageFactory,
             transmitter,
-            roundTimer);
+            roundTimer,
+            bftExtraDataCodec);
     round.createAndSendProposalMessage(15);
     verify(minedBlockObserver).blockMined(any());
   }
@@ -412,7 +439,8 @@ public void blockIsOnlyImportedOnceWhenCommitsAreReceivedBeforeProposal() {
             nodeKey,
             messageFactory,
             transmitter,
-            roundTimer);
+            roundTimer,
+            bftExtraDataCodec);
 
     round.handleCommitMessage(
         messageFactory.createCommit(roundIdentifier, proposedBlock.getHash(), remoteCommitSeal));
@@ -437,7 +465,8 @@ public void blockIsImportedOnlyOnceIfQuorumCommitsAreReceivedPriorToProposal() {
             nodeKey,
             messageFactory,
             transmitter,
-            roundTimer);
+            roundTimer,
+            bftExtraDataCodec);
 
     round.handleCommitMessage(
         messageFactory.createCommit(roundIdentifier, proposedBlock.getHash(), remoteCommitSeal));
@@ -466,7 +495,8 @@ public void exceptionDuringNodeKeySigningDoesNotEscape() {
             throwingNodeKey,
             throwingMessageFactory,
             transmitter,
-            roundTimer);
+            roundTimer,
+            bftExtraDataCodec);
 
     round.handleProposalMessage(
         messageFactory.createProposal(roundIdentifier, proposedBlock, Optional.empty()));
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeArtifactsTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeArtifactsTest.java
index 3159c8f2b01..ab824748a8e 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeArtifactsTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeArtifactsTest.java
@@ -19,11 +19,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
-import org.hyperledger.besu.consensus.ibft.TestHelpers;
+import org.hyperledger.besu.consensus.common.bft.ProposedBlockHelpers;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange;
 import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
 import org.hyperledger.besu.ethereum.core.Block;
 
 import java.util.List;
@@ -31,8 +31,8 @@
 import java.util.stream.Collectors;
 
 import com.google.common.collect.Lists;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class RoundChangeArtifactsTest {
 
@@ -41,7 +41,7 @@ public class RoundChangeArtifactsTest {
   private final long chainHeight = 5;
   private final ConsensusRoundIdentifier targetRound = new ConsensusRoundIdentifier(chainHeight, 5);
 
-  @Before
+  @BeforeEach
   public void setup() {
     for (int i = 0; i < 4; i++) {
       final NodeKey nodeKey = NodeKeyUtils.generate();
@@ -54,7 +54,7 @@ private PreparedRoundArtifacts createPreparedRoundArtefacts(final int fromRound)
 
     final ConsensusRoundIdentifier preparedRound =
         new ConsensusRoundIdentifier(chainHeight, fromRound);
-    final Block block = TestHelpers.createProposalBlock(emptyList(), preparedRound);
+    final Block block = ProposedBlockHelpers.createProposalBlock(emptyList(), preparedRound);
 
     return new PreparedRoundArtifacts(
         messageFactories.get(0).createProposal(preparedRound, block, Optional.empty()),
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeManagerTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeManagerTest.java
index ae90c35b29d..86c2a5c74a7 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeManagerTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundChangeManagerTest.java
@@ -19,9 +19,12 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundHelpers;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
-import org.hyperledger.besu.consensus.ibft.IbftHelpers;
-import org.hyperledger.besu.consensus.ibft.TestHelpers;
+import org.hyperledger.besu.consensus.common.bft.ProposedBlockHelpers;
+import org.hyperledger.besu.consensus.ibft.IbftExtraDataCodec;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange;
@@ -30,11 +33,9 @@
 import org.hyperledger.besu.consensus.ibft.validation.RoundChangeMessageValidator;
 import org.hyperledger.besu.consensus.ibft.validation.RoundChangePayloadValidator;
 import org.hyperledger.besu.consensus.ibft.validation.SignedDataValidator;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.ethereum.BlockValidator;
-import org.hyperledger.besu.ethereum.BlockValidator.BlockProcessingOutputs;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.Util;
 
@@ -45,8 +46,8 @@
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class RoundChangeManagerTest {
 
@@ -63,18 +64,16 @@ public class RoundChangeManagerTest {
   private final List<Address> validators = Lists.newArrayList();
   private final ProposalBlockConsistencyValidator proposalConsistencyValidator =
       mock(ProposalBlockConsistencyValidator.class);
+  private final BftBlockInterface bftBlockInterface =
+      new BftBlockInterface(new IbftExtraDataCodec());
 
-  @Before
+  @BeforeEach
   public void setup() {
 
     validators.add(Util.publicKeyToAddress(proposerKey.getPublicKey()));
     validators.add(Util.publicKeyToAddress(validator1Key.getPublicKey()));
     validators.add(Util.publicKeyToAddress(validator2Key.getPublicKey()));
 
-    final BlockValidator blockValidator = mock(BlockValidator.class);
-    when(blockValidator.validateAndProcessBlock(any(), any(), any(), any()))
-        .thenReturn(Optional.of(new BlockProcessingOutputs(null, null)));
-
     final RoundChangePayloadValidator.MessageValidatorForHeightFactory messageValidatorFactory =
         mock(RoundChangePayloadValidator.MessageValidatorForHeightFactory.class);
 
@@ -99,13 +98,15 @@ public void setup() {
             new RoundChangePayloadValidator(
                 messageValidatorFactory,
                 validators,
-                IbftHelpers.calculateRequiredValidatorQuorum(
-                    IbftHelpers.calculateRequiredValidatorQuorum(validators.size())),
+                BftHelpers.calculateRequiredValidatorQuorum(
+                    BftHelpers.calculateRequiredValidatorQuorum(validators.size())),
                 2),
-            proposalConsistencyValidator);
+            proposalConsistencyValidator,
+            bftBlockInterface);
     manager = new RoundChangeManager(2, roundChangeMessageValidator);
 
-    when(proposalConsistencyValidator.validateProposalMatchesBlock(any(), any())).thenReturn(true);
+    when(proposalConsistencyValidator.validateProposalMatchesBlock(any(), any(), any()))
+        .thenReturn(true);
   }
 
   private RoundChange makeRoundChangeMessage(
@@ -122,8 +123,8 @@ private RoundChange makeRoundChangeMessageWithPreparedCert(
 
     final MessageFactory messageFactory = new MessageFactory(key);
 
-    final ConsensusRoundIdentifier proposalRound = TestHelpers.createFrom(round, 0, -1);
-    final Block block = TestHelpers.createProposalBlock(validators, proposalRound);
+    final ConsensusRoundIdentifier proposalRound = ConsensusRoundHelpers.createFrom(round, 0, -1);
+    final Block block = ProposedBlockHelpers.createProposalBlock(validators, proposalRound);
     // Proposal must come from an earlier round.
     final Proposal proposal = messageFactory.createProposal(proposalRound, block, Optional.empty());
 
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundStateTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundStateTest.java
index a530c090d2c..938edfa4970 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundStateTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/statemachine/RoundStateTest.java
@@ -16,36 +16,42 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.messagewrappers.BftMessage;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal;
 import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.ibft.payload.PreparePayload;
 import org.hyperledger.besu.consensus.ibft.validation.MessageValidator;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Util;
 
 import java.math.BigInteger;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import com.google.common.collect.Lists;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class RoundStateTest {
 
   private final List<NodeKey> validatorKeys = Lists.newArrayList();
@@ -54,11 +60,13 @@ public class RoundStateTest {
 
   private final List<Address> validators = Lists.newArrayList();
 
+  private final Hash blockHash = Hash.fromHexStringLenient("1");
+
   @Mock private MessageValidator messageValidator;
 
   @Mock private Block block;
 
-  @Before
+  @BeforeEach
   public void setup() {
     for (int i = 0; i < 3; i++) {
       final NodeKey newNodeKey = NodeKeyUtils.generate();
@@ -66,7 +74,7 @@ public void setup() {
       validators.add(Util.publicKeyToAddress(newNodeKey.getPublicKey()));
       validatorMessageFactories.add(new MessageFactory(newNodeKey));
     }
-    when(block.getHash()).thenReturn(Hash.fromHexStringLenient("1"));
+    lenient().when(block.getHash()).thenReturn(blockHash);
   }
 
   @Test
@@ -131,8 +139,9 @@ public void singleValidatorRequiresCommitMessageToBeCommitted() {
             .get(0)
             .createCommit(
                 roundIdentifier,
-                block.getHash(),
-                Signature.create(BigInteger.ONE, BigInteger.ONE, (byte) 1));
+                blockHash,
+                SignatureAlgorithmFactory.getInstance()
+                    .createSignature(BigInteger.ONE, BigInteger.ONE, (byte) 1));
 
     roundState.addCommitMessage(commit);
     assertThat(roundState.isPrepared()).isTrue();
@@ -148,10 +157,10 @@ public void prepareMessagesCanBeReceivedPriorToProposal() {
     final RoundState roundState = new RoundState(roundIdentifier, 3, messageValidator);
 
     final Prepare firstPrepare =
-        validatorMessageFactories.get(1).createPrepare(roundIdentifier, block.getHash());
+        validatorMessageFactories.get(1).createPrepare(roundIdentifier, blockHash);
 
     final Prepare secondPrepare =
-        validatorMessageFactories.get(2).createPrepare(roundIdentifier, block.getHash());
+        validatorMessageFactories.get(2).createPrepare(roundIdentifier, blockHash);
 
     roundState.addPrepareMessage(firstPrepare);
     assertThat(roundState.isPrepared()).isFalse();
@@ -174,10 +183,10 @@ public void prepareMessagesCanBeReceivedPriorToProposal() {
   @Test
   public void invalidPriorPrepareMessagesAreDiscardedUponSubsequentProposal() {
     final Prepare firstPrepare =
-        validatorMessageFactories.get(1).createPrepare(roundIdentifier, block.getHash());
+        validatorMessageFactories.get(1).createPrepare(roundIdentifier, blockHash);
 
     final Prepare secondPrepare =
-        validatorMessageFactories.get(2).createPrepare(roundIdentifier, block.getHash());
+        validatorMessageFactories.get(2).createPrepare(roundIdentifier, blockHash);
 
     // RoundState has a quorum size of 3, meaning 1 proposal and 2 prepare are required to be
     // 'prepared'.
@@ -205,10 +214,10 @@ public void prepareMessageIsValidatedAgainstExitingProposal() {
     final RoundState roundState = new RoundState(roundIdentifier, 2, messageValidator);
 
     final Prepare firstPrepare =
-        validatorMessageFactories.get(1).createPrepare(roundIdentifier, block.getHash());
+        validatorMessageFactories.get(1).createPrepare(roundIdentifier, blockHash);
 
     final Prepare secondPrepare =
-        validatorMessageFactories.get(2).createPrepare(roundIdentifier, block.getHash());
+        validatorMessageFactories.get(2).createPrepare(roundIdentifier, blockHash);
 
     final Proposal proposal =
         validatorMessageFactories.get(0).createProposal(roundIdentifier, block, Optional.empty());
@@ -233,22 +242,23 @@ public void commitSealsAreExtractedFromReceivedMessages() {
     when(messageValidator.validateCommit(any())).thenReturn(true);
 
     final RoundState roundState = new RoundState(roundIdentifier, 2, messageValidator);
+    final SignatureAlgorithm signatureAlgorithm = SignatureAlgorithmFactory.getInstance();
 
     final Commit firstCommit =
         validatorMessageFactories
             .get(1)
             .createCommit(
                 roundIdentifier,
-                block.getHash(),
-                Signature.create(BigInteger.ONE, BigInteger.TEN, (byte) 1));
+                blockHash,
+                signatureAlgorithm.createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 1));
 
     final Commit secondCommit =
         validatorMessageFactories
             .get(2)
             .createCommit(
                 roundIdentifier,
-                block.getHash(),
-                Signature.create(BigInteger.TEN, BigInteger.TEN, (byte) 1));
+                blockHash,
+                signatureAlgorithm.createSignature(BigInteger.TEN, BigInteger.TEN, (byte) 1));
 
     final Proposal proposal =
         validatorMessageFactories.get(0).createProposal(roundIdentifier, block, Optional.empty());
@@ -262,4 +272,44 @@ public void commitSealsAreExtractedFromReceivedMessages() {
     assertThat(roundState.getCommitSeals())
         .containsOnly(firstCommit.getCommitSeal(), secondCommit.getCommitSeal());
   }
+
+  @Test
+  public void duplicatePreparesAreNotIncludedInRoundChangeMessage() {
+    final RoundState roundState = new RoundState(roundIdentifier, 2, messageValidator);
+
+    final Prepare firstPrepare =
+        validatorMessageFactories.get(1).createPrepare(roundIdentifier, blockHash);
+
+    final Prepare secondPrepare =
+        validatorMessageFactories.get(2).createPrepare(roundIdentifier, blockHash);
+
+    final Prepare duplicatePrepare =
+        validatorMessageFactories.get(2).createPrepare(roundIdentifier, blockHash);
+
+    final Proposal proposal =
+        validatorMessageFactories.get(0).createProposal(roundIdentifier, block, Optional.empty());
+
+    when(messageValidator.validateProposal(any())).thenReturn(true);
+    when(messageValidator.validatePrepare(any())).thenReturn(true);
+
+    roundState.setProposedBlock(proposal);
+    roundState.addPrepareMessage(firstPrepare);
+    roundState.addPrepareMessage(secondPrepare);
+    roundState.addPrepareMessage(duplicatePrepare);
+
+    assertThat(roundState.isPrepared()).isTrue();
+    assertThat(roundState.isCommitted()).isFalse();
+
+    final Optional<PreparedRoundArtifacts> preparedRoundArtifacts =
+        roundState.constructPreparedRoundArtifacts();
+    assertThat(preparedRoundArtifacts).isNotEmpty();
+    assertThat(preparedRoundArtifacts.get().getBlock()).isEqualTo(block);
+
+    final List<SignedData<PreparePayload>> expectedPrepares =
+        List.of(firstPrepare, secondPrepare).stream()
+            .map(BftMessage::getSignedPayload)
+            .collect(Collectors.toList());
+    assertThat(preparedRoundArtifacts.get().getPreparedCertificate().getPreparePayloads())
+        .isEqualTo(expectedPrepares);
+  }
 }
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/FutureRoundProposalMessageValidatorTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/FutureRoundProposalMessageValidatorTest.java
index 8470f030d91..58caa384d69 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/FutureRoundProposalMessageValidatorTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/FutureRoundProposalMessageValidatorTest.java
@@ -20,27 +20,29 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundHelpers;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
-import org.hyperledger.besu.consensus.ibft.TestHelpers;
+import org.hyperledger.besu.consensus.common.bft.ProposedBlockHelpers;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal;
 import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 
 import java.util.Optional;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class FutureRoundProposalMessageValidatorTest {
 
   private final MessageFactory messageFactoy = new MessageFactory(NodeKeyUtils.generate());
   private final ConsensusRoundIdentifier roundIdentifier = new ConsensusRoundIdentifier(1, 1);
-  private final Block proposedBlock = TestHelpers.createProposalBlock(emptyList(), roundIdentifier);
+  private final Block proposedBlock =
+      ProposedBlockHelpers.createProposalBlock(emptyList(), roundIdentifier);
 
   private FutureRoundProposalMessageValidator validator;
 
@@ -48,7 +50,7 @@ public class FutureRoundProposalMessageValidatorTest {
       mock(MessageValidatorFactory.class);
   private final MessageValidator messageValidator = mock(MessageValidator.class);
 
-  @Before
+  @BeforeEach
   public void setup() {
 
     when(messageValidatorFactory.createMessageValidator(any(), any())).thenReturn(messageValidator);
@@ -72,7 +74,7 @@ public void validProposalMatchingCurrentChainHeightPassesValidation() {
   @Test
   public void proposalTargettingDifferentChainHeightFailsValidation() {
     final ConsensusRoundIdentifier futureChainIdentifier =
-        TestHelpers.createFrom(roundIdentifier, 1, 0);
+        ConsensusRoundHelpers.createFrom(roundIdentifier, 1, 0);
     final Proposal proposal =
         messageFactoy.createProposal(futureChainIdentifier, proposedBlock, Optional.empty());
 
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidatorTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidatorTest.java
index 80f6b47a10b..ad4ce392797 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidatorTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/MessageValidatorTest.java
@@ -17,27 +17,29 @@
 import static java.util.Collections.emptyList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.consensus.common.bft.BftContext;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
-import org.hyperledger.besu.consensus.ibft.IbftContext;
-import org.hyperledger.besu.consensus.ibft.TestHelpers;
+import org.hyperledger.besu.consensus.common.bft.ProposedBlockHelpers;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal;
 import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
 import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.BlockProcessingResult;
 import org.hyperledger.besu.ethereum.BlockValidator;
-import org.hyperledger.besu.ethereum.BlockValidator.BlockProcessingOutputs;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.AddressHelpers;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
@@ -46,13 +48,14 @@
 import java.util.Optional;
 
 import org.assertj.core.util.Lists;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class MessageValidatorTest {
 
   private final NodeKey nodeKey = NodeKeyUtils.generate();
@@ -77,23 +80,29 @@ public class MessageValidatorTest {
           AddressHelpers.ofValue(2),
           AddressHelpers.ofValue(3));
 
-  private final Block block = TestHelpers.createProposalBlock(validators, roundIdentifier);
+  private final Block block = ProposedBlockHelpers.createProposalBlock(validators, roundIdentifier);
 
-  @Before
+  @BeforeEach
   public void setup() {
     when(signedDataValidator.validateProposal(any())).thenReturn(true);
     when(signedDataValidator.validatePrepare(any())).thenReturn(true);
     when(signedDataValidator.validateCommit(any())).thenReturn(true);
 
-    when(proposalBlockConsistencyValidator.validateProposalMatchesBlock(any(), any()))
+    when(proposalBlockConsistencyValidator.validateProposalMatchesBlock(any(), any(), any()))
         .thenReturn(true);
 
+    BftContext mockBftCtx = mock(BftContext.class);
+    lenient().when(mockBftCtx.as(Mockito.any())).thenReturn(mockBftCtx);
+
     protocolContext =
         new ProtocolContext(
-            mock(MutableBlockchain.class), mock(WorldStateArchive.class), mock(IbftContext.class));
+            mock(MutableBlockchain.class),
+            mock(WorldStateArchive.class),
+            mockBftCtx,
+            Optional.empty());
 
     when(blockValidator.validateAndProcessBlock(any(), any(), any(), any()))
-        .thenReturn(Optional.of(new BlockProcessingOutputs(null, null)));
+        .thenReturn(new BlockProcessingResult(Optional.empty()));
 
     when(roundChangeCertificateValidator.validateProposalMessageMatchesLatestPrepareCertificate(
             any(), any()))
@@ -136,18 +145,19 @@ public void messageValidatorDefersToUnderlyingSignedDataValidator() {
   public void ifProposalConsistencyChecksFailProposalIsIllegal() {
     final Proposal proposal =
         messageFactory.createProposal(roundIdentifier, block, Optional.empty());
-    when(proposalBlockConsistencyValidator.validateProposalMatchesBlock(any(), any()))
+    when(proposalBlockConsistencyValidator.validateProposalMatchesBlock(any(), any(), any()))
         .thenReturn(false);
 
     assertThat(messageValidator.validateProposal(proposal)).isFalse();
     verify(proposalBlockConsistencyValidator, times(1))
-        .validateProposalMatchesBlock(proposal.getSignedPayload(), proposal.getBlock());
+        .validateProposalMatchesBlock(
+            eq(proposal.getSignedPayload()), eq(proposal.getBlock()), any());
   }
 
   @Test
   public void blockValidationFailureFailsValidation() {
     when(blockValidator.validateAndProcessBlock(any(), any(), any(), any()))
-        .thenReturn(Optional.empty());
+        .thenReturn(new BlockProcessingResult("Failed"));
 
     final Proposal proposalMsg =
         messageFactory.createProposal(roundIdentifier, block, Optional.empty());
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/ProposalBlockConsistencyValidatorTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/ProposalBlockConsistencyValidatorTest.java
index cbfc2d5666b..a91763aa02c 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/ProposalBlockConsistencyValidatorTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/ProposalBlockConsistencyValidatorTest.java
@@ -16,24 +16,27 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundHelpers;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
-import org.hyperledger.besu.consensus.ibft.IbftBlockHeaderFunctions;
-import org.hyperledger.besu.consensus.ibft.IbftBlockInterface;
-import org.hyperledger.besu.consensus.ibft.TestHelpers;
+import org.hyperledger.besu.consensus.common.bft.ProposedBlockHelpers;
+import org.hyperledger.besu.consensus.ibft.IbftExtraDataCodec;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal;
 import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
 import org.hyperledger.besu.ethereum.core.Block;
 
 import java.util.Collections;
 import java.util.Optional;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class ProposalBlockConsistencyValidatorTest {
 
   private final MessageFactory proposerMessageFactory = new MessageFactory(NodeKeyUtils.generate());
@@ -41,11 +44,14 @@ public class ProposalBlockConsistencyValidatorTest {
   private final ConsensusRoundIdentifier roundIdentifier =
       new ConsensusRoundIdentifier(chainHeight, 4);
 
+  private final BftExtraDataCodec bftExtraDataCodec = new IbftExtraDataCodec();
+  private final BftBlockInterface bftBlockInterface = new BftBlockInterface(bftExtraDataCodec);
   private final Block block =
-      TestHelpers.createProposalBlock(Collections.emptyList(), roundIdentifier);
+      ProposedBlockHelpers.createProposalBlock(
+          Collections.emptyList(), roundIdentifier, bftExtraDataCodec);
   private ProposalBlockConsistencyValidator consistencyChecker;
 
-  @Before
+  @BeforeEach
   public void setup() {
 
     consistencyChecker = new ProposalBlockConsistencyValidator();
@@ -56,37 +62,42 @@ public void blockDigestMisMatchWithMessageRoundFails() {
     final Proposal proposalMsg =
         proposerMessageFactory.createProposal(roundIdentifier, block, Optional.empty());
 
+    final IbftExtraDataCodec bftExtraDataEncoder = new IbftExtraDataCodec();
     final Block misMatchedBlock =
-        IbftBlockInterface.replaceRoundInBlock(
+        bftBlockInterface.replaceRoundInBlock(
             block,
             roundIdentifier.getRoundNumber() + 1,
-            IbftBlockHeaderFunctions.forCommittedSeal());
+            BftBlockHeaderFunctions.forCommittedSeal(bftExtraDataEncoder));
 
     assertThat(
             consistencyChecker.validateProposalMatchesBlock(
-                proposalMsg.getSignedPayload(), misMatchedBlock))
+                proposalMsg.getSignedPayload(), misMatchedBlock, bftBlockInterface))
         .isFalse();
   }
 
   @Test
   public void blockDigestMatchesButRoundDiffersFails() {
-    final ConsensusRoundIdentifier futureRound = TestHelpers.createFrom(roundIdentifier, 0, +1);
+    final ConsensusRoundIdentifier futureRound =
+        ConsensusRoundHelpers.createFrom(roundIdentifier, 0, +1);
     final Proposal proposalMsg =
         proposerMessageFactory.createProposal(futureRound, block, Optional.empty());
 
     assertThat(
-            consistencyChecker.validateProposalMatchesBlock(proposalMsg.getSignedPayload(), block))
+            consistencyChecker.validateProposalMatchesBlock(
+                proposalMsg.getSignedPayload(), block, bftBlockInterface))
         .isFalse();
   }
 
   @Test
   public void blockWithMismatchedNumberFails() {
-    final ConsensusRoundIdentifier futureHeight = TestHelpers.createFrom(roundIdentifier, +1, 0);
+    final ConsensusRoundIdentifier futureHeight =
+        ConsensusRoundHelpers.createFrom(roundIdentifier, +1, 0);
     final Proposal proposalMsg =
         proposerMessageFactory.createProposal(futureHeight, block, Optional.empty());
 
     assertThat(
-            consistencyChecker.validateProposalMatchesBlock(proposalMsg.getSignedPayload(), block))
+            consistencyChecker.validateProposalMatchesBlock(
+                proposalMsg.getSignedPayload(), block, bftBlockInterface))
         .isFalse();
   }
 }
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeCertificateValidatorTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeCertificateValidatorTest.java
index 0b54ba1de63..88fe2317ccb 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeCertificateValidatorTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeCertificateValidatorTest.java
@@ -17,20 +17,24 @@
 import static java.util.Collections.singletonList;
 import static java.util.Optional.empty;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundHelpers;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
-import org.hyperledger.besu.consensus.ibft.TestHelpers;
+import org.hyperledger.besu.consensus.common.bft.ProposedBlockHelpers;
+import org.hyperledger.besu.consensus.ibft.IbftExtraDataCodec;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal;
 import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.ibft.payload.PreparedCertificate;
 import org.hyperledger.besu.consensus.ibft.payload.RoundChangeCertificate;
 import org.hyperledger.besu.consensus.ibft.statemachine.PreparedRoundArtifacts;
 import org.hyperledger.besu.consensus.ibft.validation.RoundChangePayloadValidator.MessageValidatorForHeightFactory;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.Util;
 
@@ -39,9 +43,10 @@
 import java.util.Optional;
 
 import com.google.common.collect.Lists;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
+@SuppressWarnings("DirectInvocationOnMock")
 public class RoundChangeCertificateValidatorTest {
 
   private final NodeKey proposerKey = NodeKeyUtils.generate();
@@ -57,19 +62,23 @@ public class RoundChangeCertificateValidatorTest {
 
   private final MessageValidatorForHeightFactory validatorFactory =
       mock(MessageValidatorForHeightFactory.class);
-  private final SignedDataValidator signedDataValidator = mock(SignedDataValidator.class);
+  final IbftExtraDataCodec bftExtraDataEncoder = new IbftExtraDataCodec();
+  final BftBlockInterface bftBlockInterface = new BftBlockInterface(bftExtraDataEncoder);
 
   private Block proposedBlock;
 
-  @Before
+  @BeforeEach
   public void setup() {
     validators.add(Util.publicKeyToAddress(proposerKey.getPublicKey()));
     validators.add(Util.publicKeyToAddress(validatorKey.getPublicKey()));
     validators.add(Util.publicKeyToAddress(otherValidatorKey.getPublicKey()));
 
-    proposedBlock = TestHelpers.createProposalBlock(validators, roundIdentifier);
+    proposedBlock =
+        ProposedBlockHelpers.createProposalBlock(validators, roundIdentifier, bftExtraDataEncoder);
 
-    validator = new RoundChangeCertificateValidator(validators, validatorFactory, 5);
+    validator =
+        new RoundChangeCertificateValidator(
+            validators, validatorFactory, 5, bftExtraDataEncoder, bftBlockInterface);
   }
 
   @Test
@@ -84,7 +93,8 @@ public void proposalWithEmptyRoundChangeCertificateFails() {
 
   @Test
   public void roundChangeMessagesDoNotAllTargetRoundFails() {
-    final ConsensusRoundIdentifier prevRound = TestHelpers.createFrom(roundIdentifier, 0, -1);
+    final ConsensusRoundIdentifier prevRound =
+        ConsensusRoundHelpers.createFrom(roundIdentifier, 0, -1);
 
     final RoundChangeCertificate.Builder roundChangeBuilder = new RoundChangeCertificate.Builder();
     roundChangeBuilder.appendRoundChangeMessage(
@@ -100,7 +110,8 @@ public void roundChangeMessagesDoNotAllTargetRoundFails() {
 
   @Test
   public void invalidPrepareMessageInOnePrepareCertificateFails() {
-    final ConsensusRoundIdentifier prevRound = TestHelpers.createFrom(roundIdentifier, 0, -1);
+    final ConsensusRoundIdentifier prevRound =
+        ConsensusRoundHelpers.createFrom(roundIdentifier, 0, -1);
 
     final RoundChangeCertificate.Builder roundChangeBuilder = new RoundChangeCertificate.Builder();
     roundChangeBuilder.appendRoundChangeMessage(
@@ -113,9 +124,6 @@ public void invalidPrepareMessageInOnePrepareCertificateFails() {
                         validatorMessageFactory.createPrepare(
                             prevRound, proposedBlock.getHash()))))));
 
-    // The prepare Message in the RoundChange Cert will be deemed illegal.
-    when(signedDataValidator.validatePrepare(any())).thenReturn(false);
-
     assertThat(
             validator.validateRoundChangeMessagesAndEnsureTargetRoundMatchesRoot(
                 roundIdentifier, roundChangeBuilder.buildCertificate()))
@@ -124,12 +132,14 @@ public void invalidPrepareMessageInOnePrepareCertificateFails() {
 
   @Test
   public void detectsTheSuppliedBlockIsNotInLatestPrepareCertificate() {
-    final ConsensusRoundIdentifier preparedRound = TestHelpers.createFrom(roundIdentifier, 0, -1);
+    final ConsensusRoundIdentifier preparedRound =
+        ConsensusRoundHelpers.createFrom(roundIdentifier, 0, -1);
     // The previous proposedBlock has been constructed with less validators, so is thus not
     // identical
     // to the proposedBlock in the new proposal (so should fail).
     final Block prevProposedBlock =
-        TestHelpers.createProposalBlock(validators.subList(0, 1), preparedRound);
+        ProposedBlockHelpers.createProposalBlock(
+            validators.subList(0, 1), preparedRound, bftExtraDataEncoder);
 
     final PreparedRoundArtifacts mismatchedRoundArtefacts =
         new PreparedRoundArtifacts(
@@ -153,8 +163,10 @@ public void detectsTheSuppliedBlockIsNotInLatestPrepareCertificate() {
   @Test
   public void correctlyMatchesBlockAgainstLatestInRoundChangeCertificate() {
     final ConsensusRoundIdentifier latterPrepareRound =
-        TestHelpers.createFrom(roundIdentifier, 0, -1);
-    final Block latterBlock = TestHelpers.createProposalBlock(validators, latterPrepareRound);
+        ConsensusRoundHelpers.createFrom(roundIdentifier, 0, -1);
+    final Block latterBlock =
+        ProposedBlockHelpers.createProposalBlock(
+            validators, latterPrepareRound, bftExtraDataEncoder);
     final Proposal latterProposal =
         proposerMessageFactory.createProposal(latterPrepareRound, latterBlock, empty());
     final Optional<PreparedRoundArtifacts> latterTerminatedRoundArtefacts =
@@ -171,7 +183,8 @@ public void correctlyMatchesBlockAgainstLatestInRoundChangeCertificate() {
         new ConsensusRoundIdentifier(
             roundIdentifier.getSequenceNumber(), roundIdentifier.getRoundNumber() - 2);
     final Block earlierBlock =
-        TestHelpers.createProposalBlock(validators.subList(0, 1), earlierPreparedRound);
+        ProposedBlockHelpers.createProposalBlock(
+            validators.subList(0, 1), earlierPreparedRound, bftExtraDataEncoder);
     final Proposal earlierProposal =
         proposerMessageFactory.createProposal(earlierPreparedRound, earlierBlock, empty());
     final Optional<PreparedRoundArtifacts> earlierTerminatedRoundArtefacts =
@@ -221,4 +234,80 @@ public void roundChangeCertificateWithTwoRoundChangesFromTheSameAuthorFailsValid
                 roundIdentifier, roundChangeCert))
         .isFalse();
   }
+
+  @Test
+  public void latestPreparedCertificateIsExtractedFromRoundChangeCertificate() {
+    // NOTE: This function does not validate that all RoundCHanges/Prepares etc. come from valid
+    // sources, it is only responsible for determine which of the list or RoundChange messages
+    // contains the newest
+    // NOTE: This capability is tested as part of the NewRoundMessageValidationTests.
+    final NodeKey proposerKey = NodeKeyUtils.generate();
+    final MessageFactory proposerMessageFactory = new MessageFactory(proposerKey);
+    final Block proposedBlock = mock(Block.class);
+    when(proposedBlock.getHash()).thenReturn(Hash.fromHexStringLenient("1"));
+    final ConsensusRoundIdentifier roundIdentifier = new ConsensusRoundIdentifier(1, 4);
+
+    final ConsensusRoundIdentifier preparedRound =
+        ConsensusRoundHelpers.createFrom(roundIdentifier, 0, -1);
+    final Proposal differentProposal =
+        proposerMessageFactory.createProposal(preparedRound, proposedBlock, Optional.empty());
+
+    final Optional<PreparedRoundArtifacts> latterPreparedRoundArtifacts =
+        Optional.of(
+            new PreparedRoundArtifacts(
+                differentProposal,
+                Lists.newArrayList(
+                    proposerMessageFactory.createPrepare(roundIdentifier, proposedBlock.getHash()),
+                    proposerMessageFactory.createPrepare(
+                        roundIdentifier, proposedBlock.getHash()))));
+
+    // An earlier PrepareCert is added to ensure the path to find the latest PrepareCert
+    // is correctly followed.
+    final ConsensusRoundIdentifier earlierPreparedRound =
+        ConsensusRoundHelpers.createFrom(roundIdentifier, 0, -2);
+    final Proposal earlierProposal =
+        proposerMessageFactory.createProposal(
+            earlierPreparedRound, proposedBlock, Optional.empty());
+    final Optional<PreparedRoundArtifacts> earlierPreparedRoundArtifacts =
+        Optional.of(
+            new PreparedRoundArtifacts(
+                earlierProposal,
+                Lists.newArrayList(
+                    proposerMessageFactory.createPrepare(
+                        earlierPreparedRound, proposedBlock.getHash()),
+                    proposerMessageFactory.createPrepare(
+                        earlierPreparedRound, proposedBlock.getHash()))));
+
+    final Optional<PreparedCertificate> newestCert =
+        RoundChangeCertificateValidator.findLatestPreparedCertificate(
+            Lists.newArrayList(
+                proposerMessageFactory
+                    .createRoundChange(roundIdentifier, earlierPreparedRoundArtifacts)
+                    .getSignedPayload(),
+                proposerMessageFactory
+                    .createRoundChange(roundIdentifier, latterPreparedRoundArtifacts)
+                    .getSignedPayload()));
+
+    assertThat(newestCert.get())
+        .isEqualTo(latterPreparedRoundArtifacts.get().getPreparedCertificate());
+  }
+
+  @Test
+  public void allRoundChangeHaveNoPreparedReturnsEmptyOptional() {
+    final NodeKey proposerKey = NodeKeyUtils.generate();
+    final MessageFactory proposerMessageFactory = new MessageFactory(proposerKey);
+    final ConsensusRoundIdentifier roundIdentifier = new ConsensusRoundIdentifier(1, 4);
+
+    final Optional<PreparedCertificate> newestCert =
+        RoundChangeCertificateValidator.findLatestPreparedCertificate(
+            Lists.newArrayList(
+                proposerMessageFactory
+                    .createRoundChange(roundIdentifier, Optional.empty())
+                    .getSignedPayload(),
+                proposerMessageFactory
+                    .createRoundChange(roundIdentifier, Optional.empty())
+                    .getSignedPayload()));
+
+    assertThat(newestCert).isEmpty();
+  }
 }
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeMessageValidatorTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeMessageValidatorTest.java
index 680324fc7ac..d65c14239cb 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeMessageValidatorTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeMessageValidatorTest.java
@@ -19,12 +19,14 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.ibft.IbftExtraDataCodec;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.RoundChange;
 import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class RoundChangeMessageValidatorTest {
 
@@ -35,9 +37,12 @@ public class RoundChangeMessageValidatorTest {
 
   private final ProposalBlockConsistencyValidator proposalBlockConsistencyValidator =
       mock(ProposalBlockConsistencyValidator.class);
+  private final BftBlockInterface bftBlockInterface =
+      new BftBlockInterface(new IbftExtraDataCodec());
 
   private final RoundChangeMessageValidator validator =
-      new RoundChangeMessageValidator(payloadValidator, proposalBlockConsistencyValidator);
+      new RoundChangeMessageValidator(
+          payloadValidator, proposalBlockConsistencyValidator, bftBlockInterface);
 
   @Test
   public void underlyingPayloadValidatorIsInvokedWithCorrectParameters() {
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeSignedDataValidatorTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeSignedDataValidatorTest.java
index 34b49e01b9c..5daebc472cb 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeSignedDataValidatorTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/RoundChangeSignedDataValidatorTest.java
@@ -29,11 +29,11 @@
 import org.hyperledger.besu.consensus.ibft.payload.PreparedCertificate;
 import org.hyperledger.besu.consensus.ibft.statemachine.PreparedRoundArtifacts;
 import org.hyperledger.besu.consensus.ibft.validation.RoundChangePayloadValidator.MessageValidatorForHeightFactory;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Util;
 
 import java.util.Collections;
@@ -41,9 +41,10 @@
 import java.util.Optional;
 
 import com.google.common.collect.Lists;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
+@SuppressWarnings("DirectInvocationOnMock")
 public class RoundChangeSignedDataValidatorTest {
 
   private final NodeKey proposerKey = NodeKeyUtils.generate();
@@ -68,7 +69,7 @@ public class RoundChangeSignedDataValidatorTest {
   private final RoundChangePayloadValidator validator =
       new RoundChangePayloadValidator(validatorFactory, validators, 1, chainHeight);
 
-  @Before
+  @BeforeEach
   public void setup() {
     validators.add(Util.publicKeyToAddress(proposerKey.getPublicKey()));
     validators.add(Util.publicKeyToAddress(validatorKey.getPublicKey()));
@@ -207,4 +208,24 @@ public void roundChangeWithPastProposalForCurrentHeightIsSuccessful() {
     verify(basicValidator, times(1)).validateProposal(prepareCertificate.getProposalPayload());
     verify(basicValidator, times(1)).validatePrepare(prepareMsg.getSignedPayload());
   }
+
+  @Test
+  public void roundChangeWithDuplicatedPreparesFails() {
+    final RoundChangePayloadValidator validatorRequiringTwoPrepares =
+        new RoundChangePayloadValidator(validatorFactory, validators, 2, chainHeight);
+
+    final Prepare prepareMsg = validatorMessageFactory.createPrepare(currentRound, block.getHash());
+    final PreparedRoundArtifacts preparedRoundArtifacts =
+        new PreparedRoundArtifacts(
+            proposerMessageFactory.createProposal(currentRound, block, Optional.empty()),
+            Lists.newArrayList(prepareMsg, prepareMsg));
+    final PreparedCertificate prepareCertificate = preparedRoundArtifacts.getPreparedCertificate();
+    final RoundChange msg =
+        proposerMessageFactory.createRoundChange(targetRound, Optional.of(preparedRoundArtifacts));
+
+    when(basicValidator.validateProposal(prepareCertificate.getProposalPayload())).thenReturn(true);
+    when(basicValidator.validatePrepare(prepareMsg.getSignedPayload())).thenReturn(true);
+
+    assertThat(validatorRequiringTwoPrepares.validateRoundChange(msg.getSignedPayload())).isFalse();
+  }
 }
diff --git a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/SignedDataValidatorTest.java b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/SignedDataValidatorTest.java
index f36c20ce89e..c4fa27a6aab 100644
--- a/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/SignedDataValidatorTest.java
+++ b/consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/validation/SignedDataValidatorTest.java
@@ -20,28 +20,29 @@
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
-import org.hyperledger.besu.consensus.ibft.TestHelpers;
+import org.hyperledger.besu.consensus.common.bft.ProposedBlockHelpers;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Commit;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Prepare;
 import org.hyperledger.besu.consensus.ibft.messagewrappers.Proposal;
 import org.hyperledger.besu.consensus.ibft.payload.MessageFactory;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Util;
 
 import java.util.List;
 import java.util.Optional;
 
 import com.google.common.collect.Lists;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@SuppressWarnings("DirectInvocationOnMock")
 public class SignedDataValidatorTest {
 
   private final NodeKey proposerKey = NodeKeyUtils.generate();
@@ -58,7 +59,7 @@ public class SignedDataValidatorTest {
 
   private final Block block = mock(Block.class);
 
-  @Before
+  @BeforeEach
   public void setup() {
     validators.add(Util.publicKeyToAddress(proposerKey.getPublicKey()));
     validators.add(Util.publicKeyToAddress(validatorKey.getPublicKey()));
@@ -88,7 +89,7 @@ public void receivingACommitMessageBeforeProposalFails() {
 
   @Test
   public void receivingProposalMessageFromNonProposerFails() {
-    final Block block = TestHelpers.createProposalBlock(emptyList(), roundIdentifier);
+    final Block block = ProposedBlockHelpers.createProposalBlock(emptyList(), roundIdentifier);
     final Proposal proposalMsg =
         validatorMessageFactory.createProposal(roundIdentifier, block, Optional.empty());
 
diff --git a/consensus/ibftlegacy/build.gradle b/consensus/ibftlegacy/build.gradle
deleted file mode 100644
index d1055d0625b..00000000000
--- a/consensus/ibftlegacy/build.gradle
+++ /dev/null
@@ -1,43 +0,0 @@
-apply plugin: 'java-library'
-
-jar {
-  archiveBaseName = 'besu-ibftlegacy'
-  manifest {
-    attributes(
-      'Specification-Title': archiveBaseName,
-      'Specification-Version': project.version,
-      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
-      )
-  }
-}
-
-dependencies {
-  implementation project(':config')
-  implementation project(':consensus:common')
-  implementation project(':consensus:ibft')
-  implementation project(':crypto')
-  implementation project(':ethereum:api')
-  implementation project(':ethereum:blockcreation')
-  implementation project(':ethereum:core')
-  implementation project(':ethereum:eth')
-  implementation project(':ethereum:p2p')
-  implementation project(':ethereum:rlp')
-  implementation project(':metrics:core')
-  implementation project(':services:kvstore')
-
-  implementation 'com.google.guava:guava'
-  implementation 'io.vertx:vertx-core'
-  implementation 'org.apache.tuweni:bytes'
-  implementation 'org.apache.tuweni:units'
-
-  testImplementation project(path: ':consensus:ibft', configuration: 'testSupportArtifacts')
-  testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
-  testImplementation project(':metrics:core')
-  testImplementation project(':testutil')
-
-  testImplementation 'junit:junit'
-  testImplementation 'org.assertj:assertj-core'
-  testImplementation 'org.awaitility:awaitility'
-  testImplementation 'org.mockito:mockito-core'
-}
diff --git a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHashing.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHashing.java
deleted file mode 100644
index 679310d8c0e..00000000000
--- a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHashing.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibftlegacy;
-
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Util;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
-
-import java.util.List;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public class IbftBlockHashing {
-
-  private static final Bytes COMMIT_MSG_CODE = Bytes.wrap(new byte[] {2});
-
-  /**
-   * Constructs a hash of the block header, suitable for use when creating the proposer seal. The
-   * extra data is modified to have a null proposer seal and empty list of committed seals.
-   *
-   * @param header The header for which a proposer seal is to be calculated
-   * @param ibftExtraData The extra data block which is to be inserted to the header once seal is
-   *     calculated
-   * @return the hash of the header suitable for signing as the proposer seal
-   */
-  public static Hash calculateDataHashForProposerSeal(
-      final BlockHeader header, final IbftExtraData ibftExtraData) {
-    final Bytes headerRlp =
-        serializeHeader(header, () -> encodeExtraDataWithoutCommittedSeals(ibftExtraData, null));
-
-    // Proposer hash is the hash of the hash
-    return Hash.hash(Hash.hash(headerRlp));
-  }
-
-  /**
-   * Constructs a hash of the block header suitable for signing as a committed seal. The extra data
-   * in the hash uses an empty list for the committed seals.
-   *
-   * @param header The header for which a proposer seal is to be calculated (without extra data)
-   * @param ibftExtraData The extra data block which is to be inserted to the header once seal is
-   *     calculated
-   * @return the hash of the header including the validator and proposer seal in the extra data
-   */
-  public static Hash calculateDataHashForCommittedSeal(
-      final BlockHeader header, final IbftExtraData ibftExtraData) {
-    // The data signed by a committer is an array of [Hash, COMMIT_MSG_CODE]
-    final Hash dataHash = Hash.hash(serializeHeaderWithoutCommittedSeals(header, ibftExtraData));
-    final Bytes seal = Bytes.wrap(dataHash, COMMIT_MSG_CODE);
-    return Hash.hash(seal);
-  }
-
-  /**
-   * Constructs a hash of the block header, but omits the committerSeals (as this changes on each of
-   * the potentially circulated blocks at the current chain height).
-   *
-   * @param header The header for which a block hash is to be calculated
-   * @return the hash of the header including the validator and proposer seal in the extra data
-   */
-  public static Hash calculateHashOfIbftBlockOnChain(final BlockHeader header) {
-    final IbftExtraData ibftExtraData = IbftExtraData.decode(header);
-    return Hash.hash(serializeHeaderWithoutCommittedSeals(header, ibftExtraData));
-  }
-
-  private static Bytes serializeHeaderWithoutCommittedSeals(
-      final BlockHeader header, final IbftExtraData ibftExtraData) {
-    return serializeHeader(
-        header,
-        () -> encodeExtraDataWithoutCommittedSeals(ibftExtraData, ibftExtraData.getProposerSeal()));
-  }
-
-  /**
-   * Recovers the proposer's {@link Address} from the proposer seal.
-   *
-   * @param header the block header that was signed by the proposer seal
-   * @param ibftExtraData the parsed IBftExtraData from the header
-   * @return the proposer address
-   */
-  public static Address recoverProposerAddress(
-      final BlockHeader header, final IbftExtraData ibftExtraData) {
-    final Hash proposerHash = calculateDataHashForProposerSeal(header, ibftExtraData);
-    return Util.signatureToAddress(ibftExtraData.getProposerSeal(), proposerHash);
-  }
-
-  /**
-   * Recovers the {@link Address} for each validator that contributed a committed seal to the block.
-   *
-   * @param header the block header that was signed by the committed seals
-   * @param ibftExtraData the parsed IBftExtraData from the header
-   * @return the addresses of validators that provided a committed seal
-   */
-  public static List<Address> recoverCommitterAddresses(
-      final BlockHeader header, final IbftExtraData ibftExtraData) {
-    final Hash committerHash =
-        IbftBlockHashing.calculateDataHashForCommittedSeal(header, ibftExtraData);
-
-    return ibftExtraData.getSeals().stream()
-        .map(p -> Util.signatureToAddress(p, committerHash))
-        .collect(Collectors.toList());
-  }
-
-  private static Bytes encodeExtraDataWithoutCommittedSeals(
-      final IbftExtraData ibftExtraData, final Signature proposerSeal) {
-    final BytesValueRLPOutput extraDataEncoding = new BytesValueRLPOutput();
-    extraDataEncoding.startList();
-    extraDataEncoding.writeList(
-        ibftExtraData.getValidators(), (validator, rlp) -> rlp.writeBytes(validator));
-
-    if (proposerSeal != null) {
-      extraDataEncoding.writeBytes(proposerSeal.encodedBytes());
-    } else {
-      extraDataEncoding.writeNull();
-    }
-
-    // Represents an empty committer list (i.e this is not included in the hashing of the block)
-    extraDataEncoding.startList();
-    extraDataEncoding.endList();
-
-    extraDataEncoding.endList();
-
-    return Bytes.wrap(ibftExtraData.getVanityData(), extraDataEncoding.encoded());
-  }
-
-  private static Bytes serializeHeader(
-      final BlockHeader header, final Supplier<Bytes> extraDataSerializer) {
-    final BytesValueRLPOutput out = new BytesValueRLPOutput();
-    out.startList();
-
-    out.writeBytes(header.getParentHash());
-    out.writeBytes(header.getOmmersHash());
-    out.writeBytes(header.getCoinbase());
-    out.writeBytes(header.getStateRoot());
-    out.writeBytes(header.getTransactionsRoot());
-    out.writeBytes(header.getReceiptsRoot());
-    out.writeBytes(header.getLogsBloom());
-    out.writeBytes(header.getDifficulty().toMinimalBytes());
-    out.writeLongScalar(header.getNumber());
-    out.writeLongScalar(header.getGasLimit());
-    out.writeLongScalar(header.getGasUsed());
-    out.writeLongScalar(header.getTimestamp());
-    // Cannot decode an IbftExtraData on block 0 due to missing/illegal signatures
-    if (header.getNumber() == 0) {
-      out.writeBytes(header.getExtraData());
-    } else {
-      out.writeBytes(extraDataSerializer.get());
-    }
-    out.writeBytes(header.getMixHash());
-    out.writeLong(header.getNonce());
-    out.endList();
-    return out.encoded();
-  }
-}
diff --git a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHeaderValidationRulesetFactory.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHeaderValidationRulesetFactory.java
deleted file mode 100644
index 4d1594485db..00000000000
--- a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHeaderValidationRulesetFactory.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibftlegacy;
-
-import org.hyperledger.besu.consensus.ibftlegacy.headervalidationrules.IbftExtraDataValidationRule;
-import org.hyperledger.besu.consensus.ibftlegacy.headervalidationrules.VoteValidationRule;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
-import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.AncestryValidationRule;
-import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.ConstantFieldValidationRule;
-import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.GasLimitRangeAndDeltaValidationRule;
-import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.GasUsageValidationRule;
-import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.TimestampBoundedByFutureParameter;
-import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.TimestampMoreRecentThanParent;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class IbftBlockHeaderValidationRulesetFactory {
-
-  /**
-   * Produces a BlockHeaderValidator configured for assessing ibft block headers which are to form
-   * part of the BlockChain (i.e. not proposed blocks, which do not contain commit seals)
-   *
-   * @param secondsBetweenBlocks the minimum number of seconds which must elapse between blocks.
-   * @return BlockHeaderValidator configured for assessing ibft block headers
-   */
-  public static BlockHeaderValidator.Builder ibftBlockHeaderValidator(
-      final long secondsBetweenBlocks) {
-    return createValidator(secondsBetweenBlocks, true);
-  }
-
-  /**
-   * Produces a BlockHeaderValidator configured for assessing IBFT proposed blocks (i.e. blocks
-   * which need to be vetted by the validators, and do not contain commit seals).
-   *
-   * @param secondsBetweenBlocks the minimum number of seconds which must elapse between blocks.
-   * @return BlockHeaderValidator configured for assessing ibft block headers
-   */
-  public static BlockHeaderValidator.Builder ibftProposedBlockValidator(
-      final long secondsBetweenBlocks) {
-    return createValidator(secondsBetweenBlocks, false);
-  }
-
-  private static BlockHeaderValidator.Builder createValidator(
-      final long secondsBetweenBlocks, final boolean validateCommitSeals) {
-    return new BlockHeaderValidator.Builder()
-        .addRule(new AncestryValidationRule())
-        .addRule(new GasUsageValidationRule())
-        .addRule(new GasLimitRangeAndDeltaValidationRule(5000, 0x7fffffffffffffffL))
-        .addRule(new TimestampBoundedByFutureParameter(1))
-        .addRule(new TimestampMoreRecentThanParent(secondsBetweenBlocks))
-        .addRule(
-            new ConstantFieldValidationRule<>(
-                "MixHash", BlockHeader::getMixHash, IbftHelpers.EXPECTED_MIX_HASH))
-        .addRule(
-            new ConstantFieldValidationRule<>(
-                "OmmersHash", BlockHeader::getOmmersHash, Hash.EMPTY_LIST_HASH))
-        .addRule(
-            new ConstantFieldValidationRule<>(
-                "Difficulty", BlockHeader::getDifficulty, UInt256.ONE))
-        .addRule(new VoteValidationRule())
-        .addRule(new IbftExtraDataValidationRule(validateCommitSeals));
-  }
-}
diff --git a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftExtraData.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftExtraData.java
deleted file mode 100644
index 54d98c97970..00000000000
--- a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftExtraData.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibftlegacy;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.ParsedExtraData;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
-import org.hyperledger.besu.ethereum.rlp.RLPInput;
-
-import java.util.Collection;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-
-/**
- * Represents the data structure stored in the extraData field of the BlockHeader used when
- * operating under an IBFT consensus mechanism.
- */
-public class IbftExtraData implements ParsedExtraData {
-  private static final Logger LOG = LogManager.getLogger();
-
-  public static final int EXTRA_VANITY_LENGTH = 32;
-
-  private final Bytes vanityData;
-  private final Collection<Signature> seals;
-  private final Signature proposerSeal;
-  private final Collection<Address> validators;
-
-  public IbftExtraData(
-      final Bytes vanityData,
-      final Collection<Signature> seals,
-      final Signature proposerSeal,
-      final Collection<Address> validators) {
-
-    checkNotNull(vanityData);
-    checkNotNull(seals);
-    checkNotNull(validators);
-
-    this.vanityData = vanityData;
-    this.seals = seals;
-    this.proposerSeal = proposerSeal;
-    this.validators = validators;
-  }
-
-  public static IbftExtraData decode(final BlockHeader header) {
-    final Object inputExtraData = header.getParsedExtraData();
-    if (inputExtraData instanceof IbftExtraData) {
-      return (IbftExtraData) inputExtraData;
-    }
-    LOG.warn(
-        "Expected a IbftExtraData instance but got {}. Reparsing required.",
-        inputExtraData != null ? inputExtraData.getClass().getName() : "null");
-    return decodeRaw(header.getExtraData());
-  }
-
-  static IbftExtraData decodeRaw(final Bytes input) {
-    checkArgument(
-        input.size() > EXTRA_VANITY_LENGTH,
-        "Invalid Bytes supplied - too short to produce a valid IBFT Extra Data object.");
-
-    final Bytes vanityData = input.slice(0, EXTRA_VANITY_LENGTH);
-
-    final Bytes rlpData = input.slice(EXTRA_VANITY_LENGTH);
-    final RLPInput rlpInput = new BytesValueRLPInput(rlpData, false);
-
-    rlpInput.enterList(); // This accounts for the "root node" which contains IBFT data items.
-    final Collection<Address> validators = rlpInput.readList(Address::readFrom);
-    final Signature proposerSeal = parseProposerSeal(rlpInput);
-    final Collection<Signature> seals = rlpInput.readList(rlp -> Signature.decode(rlp.readBytes()));
-    rlpInput.leaveList();
-
-    return new IbftExtraData(vanityData, seals, proposerSeal, validators);
-  }
-
-  private static Signature parseProposerSeal(final RLPInput rlpInput) {
-    final Bytes data = rlpInput.readBytes();
-    return data.isZero() ? null : Signature.decode(data);
-  }
-
-  public Bytes encode() {
-    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
-    encoder.startList();
-    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
-    if (proposerSeal != null) {
-      encoder.writeBytes(proposerSeal.encodedBytes());
-    } else {
-      encoder.writeNull();
-    }
-    encoder.writeList(seals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
-    encoder.endList();
-
-    return Bytes.wrap(vanityData, encoder.encoded());
-  }
-
-  // Accessors
-  public Bytes getVanityData() {
-    return vanityData;
-  }
-
-  public Collection<Signature> getSeals() {
-    return seals;
-  }
-
-  public Signature getProposerSeal() {
-    return proposerSeal;
-  }
-
-  public Collection<Address> getValidators() {
-    return validators;
-  }
-}
diff --git a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftHelpers.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftHelpers.java
deleted file mode 100644
index 8a0345ebfd4..00000000000
--- a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftHelpers.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibftlegacy;
-
-import org.hyperledger.besu.ethereum.core.Hash;
-
-public class IbftHelpers {
-
-  public static final Hash EXPECTED_MIX_HASH =
-      Hash.fromHexString("0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365");
-
-  public static int calculateRequiredValidatorQuorum(final int validatorCount) {
-    final int F = (validatorCount - 1) / 3;
-    return (2 * F) + 1;
-  }
-}
diff --git a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftLegacyBlockInterface.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftLegacyBlockInterface.java
deleted file mode 100644
index c2eb45d2e8c..00000000000
--- a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftLegacyBlockInterface.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibftlegacy;
-
-import org.hyperledger.besu.consensus.common.BlockInterface;
-import org.hyperledger.besu.consensus.common.ValidatorVote;
-import org.hyperledger.besu.consensus.common.VoteType;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
-
-import java.util.Collection;
-import java.util.Optional;
-
-import com.google.common.collect.ImmutableBiMap;
-import org.apache.tuweni.bytes.Bytes;
-
-public class IbftLegacyBlockInterface implements BlockInterface {
-
-  public static final Address NO_VOTE_SUBJECT = Address.wrap(Bytes.wrap(new byte[Address.SIZE]));
-
-  public static final long ADD_NONCE = 0xFFFFFFFFFFFFFFFFL;
-  public static final long DROP_NONCE = 0x0L;
-
-  private static final ImmutableBiMap<VoteType, Long> voteToValue =
-      ImmutableBiMap.of(
-          VoteType.ADD, ADD_NONCE,
-          VoteType.DROP, DROP_NONCE);
-
-  @Override
-  public Address getProposerOfBlock(final BlockHeader header) {
-    final IbftExtraData ibftExtraData = IbftExtraData.decode(header);
-    return IbftBlockHashing.recoverProposerAddress(header, ibftExtraData);
-  }
-
-  @Override
-  public Address getProposerOfBlock(final org.hyperledger.besu.plugin.data.BlockHeader header) {
-    return getProposerOfBlock(
-        BlockHeader.convertPluginBlockHeader(header, new LegacyIbftBlockHeaderFunctions()));
-  }
-
-  @Override
-  public Optional<ValidatorVote> extractVoteFromHeader(final BlockHeader header) {
-    final Address candidate = header.getCoinbase();
-    if (!candidate.equals(NO_VOTE_SUBJECT)) {
-      final Address proposer = getProposerOfBlock(header);
-      final VoteType votePolarity = voteToValue.inverse().get(header.getNonce());
-      final Address recipient = header.getCoinbase();
-
-      return Optional.of(new ValidatorVote(votePolarity, proposer, recipient));
-    }
-    return Optional.empty();
-  }
-
-  public static BlockHeaderBuilder insertVoteToHeaderBuilder(
-      final BlockHeaderBuilder builder, final Optional<ValidatorVote> vote) {
-    if (vote.isPresent()) {
-      final ValidatorVote voteToCast = vote.get();
-      builder.nonce(voteToValue.get(voteToCast.getVotePolarity()));
-      builder.coinbase(voteToCast.getRecipient());
-    } else {
-      builder.nonce(voteToValue.get(VoteType.DROP));
-      builder.coinbase(NO_VOTE_SUBJECT);
-    }
-    return builder;
-  }
-
-  @Override
-  public Collection<Address> validatorsInBlock(final BlockHeader header) {
-    return IbftExtraData.decode(header).getValidators();
-  }
-
-  public static boolean isValidVoteValue(final long value) {
-    return voteToValue.values().contains(value);
-  }
-}
diff --git a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftProtocolSchedule.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftProtocolSchedule.java
deleted file mode 100644
index 042f63ecf84..00000000000
--- a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/IbftProtocolSchedule.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibftlegacy;
-
-import static org.hyperledger.besu.consensus.ibftlegacy.IbftBlockHeaderValidationRulesetFactory.ibftBlockHeaderValidator;
-
-import org.hyperledger.besu.config.GenesisConfigOptions;
-import org.hyperledger.besu.config.IbftConfigOptions;
-import org.hyperledger.besu.ethereum.MainnetBlockValidator;
-import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.mainnet.MainnetBlockBodyValidator;
-import org.hyperledger.besu.ethereum.mainnet.MainnetBlockImporter;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSpecBuilder;
-
-import java.math.BigInteger;
-
-/** Defines the protocol behaviours for a blockchain using IBFT. */
-public class IbftProtocolSchedule {
-
-  private static final BigInteger DEFAULT_CHAIN_ID = BigInteger.ONE;
-
-  public static ProtocolSchedule create(
-      final GenesisConfigOptions config,
-      final PrivacyParameters privacyParameters,
-      final boolean isRevertReasonEnabled) {
-    final IbftConfigOptions ibftConfig = config.getIbftLegacyConfigOptions();
-    final long blockPeriod = ibftConfig.getBlockPeriodSeconds();
-
-    return new ProtocolScheduleBuilder(
-            config,
-            DEFAULT_CHAIN_ID,
-            builder -> applyIbftChanges(blockPeriod, builder),
-            privacyParameters,
-            isRevertReasonEnabled,
-            config.isQuorum())
-        .createProtocolSchedule();
-  }
-
-  public static ProtocolSchedule create(
-      final GenesisConfigOptions config, final boolean isRevertReasonEnabled) {
-    return create(config, PrivacyParameters.DEFAULT, isRevertReasonEnabled);
-  }
-
-  private static ProtocolSpecBuilder applyIbftChanges(
-      final long secondsBetweenBlocks, final ProtocolSpecBuilder builder) {
-    return builder
-        .blockHeaderValidatorBuilder(ibftBlockHeaderValidator(secondsBetweenBlocks))
-        .ommerHeaderValidatorBuilder(ibftBlockHeaderValidator(secondsBetweenBlocks))
-        .blockBodyValidatorBuilder(MainnetBlockBodyValidator::new)
-        .blockValidatorBuilder(MainnetBlockValidator::new)
-        .blockImporterBuilder(MainnetBlockImporter::new)
-        .difficultyCalculator((time, parent, protocolContext) -> BigInteger.ONE)
-        .blockReward(Wei.ZERO)
-        .skipZeroBlockRewards(true)
-        .blockHeaderFunctions(new LegacyIbftBlockHeaderFunctions());
-  }
-}
diff --git a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/LegacyIbftBlockHeaderFunctions.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/LegacyIbftBlockHeaderFunctions.java
deleted file mode 100644
index a34fa2ed797..00000000000
--- a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/LegacyIbftBlockHeaderFunctions.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibftlegacy;
-
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
-import org.hyperledger.besu.ethereum.core.Hash;
-
-public class LegacyIbftBlockHeaderFunctions implements BlockHeaderFunctions {
-
-  @Override
-  public Hash hash(final BlockHeader header) {
-    return IbftBlockHashing.calculateHashOfIbftBlockOnChain(header);
-  }
-
-  @Override
-  public IbftExtraData parseExtraData(final BlockHeader header) {
-    return IbftExtraData.decodeRaw(header.getExtraData());
-  }
-}
diff --git a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/blockcreation/IbftBlockCreator.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/blockcreation/IbftBlockCreator.java
deleted file mode 100644
index c6b39410a6b..00000000000
--- a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/blockcreation/IbftBlockCreator.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibftlegacy.blockcreation;
-
-import org.hyperledger.besu.consensus.ibftlegacy.IbftBlockHashing;
-import org.hyperledger.besu.consensus.ibftlegacy.IbftExtraData;
-import org.hyperledger.besu.consensus.ibftlegacy.IbftHelpers;
-import org.hyperledger.besu.crypto.SECP256K1;
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.blockcreation.AbstractBlockCreator;
-import org.hyperledger.besu.ethereum.blockcreation.GasLimitCalculator;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
-import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.SealableBlockHeader;
-import org.hyperledger.besu.ethereum.core.Util;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
-
-/**
- * Responsible for producing a Block which conforms to IBFT validation rules (other than missing
- * commit seals). Transactions and associated Hashes (stateroot, receipts etc.) are loaded into the
- * Block in the base class as part of the transaction selection process.
- */
-public class IbftBlockCreator extends AbstractBlockCreator {
-
-  private final KeyPair nodeKeys;
-
-  public IbftBlockCreator(
-      final Address coinbase,
-      final ExtraDataCalculator extraDataCalculator,
-      final PendingTransactions pendingTransactions,
-      final ProtocolContext protocolContext,
-      final ProtocolSchedule protocolSchedule,
-      final GasLimitCalculator gasLimitCalculator,
-      final KeyPair nodeKeys,
-      final Wei minTransactionGasPrice,
-      final Double minBlockOccupancyRatio,
-      final BlockHeader parentHeader) {
-    super(
-        coinbase,
-        extraDataCalculator,
-        pendingTransactions,
-        protocolContext,
-        protocolSchedule,
-        gasLimitCalculator,
-        minTransactionGasPrice,
-        Util.publicKeyToAddress(nodeKeys.getPublicKey()),
-        minBlockOccupancyRatio,
-        parentHeader);
-    this.nodeKeys = nodeKeys;
-  }
-
-  /**
-   * Responsible for signing (hash of) the block (including MixHash and Nonce), and then injecting
-   * the seal into the extraData. This is called after a suitable set of transactions have been
-   * identified, and all resulting hashes have been inserted into the passed-in SealableBlockHeader.
-   *
-   * @param sealableBlockHeader A block header containing StateRoots, TransactionHashes etc.
-   * @return The blockhead which is to be added to the block being proposed.
-   */
-  @Override
-  protected BlockHeader createFinalBlockHeader(final SealableBlockHeader sealableBlockHeader) {
-
-    final BlockHeaderFunctions blockHeaderFunctions =
-        ScheduleBasedBlockHeaderFunctions.create(protocolSchedule);
-
-    final BlockHeaderBuilder builder =
-        BlockHeaderBuilder.create()
-            .populateFrom(sealableBlockHeader)
-            .mixHash(IbftHelpers.EXPECTED_MIX_HASH)
-            .nonce(0)
-            .blockHeaderFunctions(blockHeaderFunctions);
-
-    final IbftExtraData sealedExtraData = constructSignedExtraData(builder.buildBlockHeader());
-
-    // Replace the extraData in the BlockHeaderBuilder, and return header.
-    return builder.extraData(sealedExtraData.encode()).buildBlockHeader();
-  }
-
-  /**
-   * Produces an IbftExtraData object with a populated proposerSeal. The signature in the block is
-   * generated from the Hash of the header (minus proposer and committer seals) and the nodeKeys.
-   *
-   * @param headerToSign An almost fully populated header (proposer and committer seals are empty)
-   * @return Extra data containing the same vanity data and validators as extraData, however
-   *     proposerSeal will also be populated.
-   */
-  private IbftExtraData constructSignedExtraData(final BlockHeader headerToSign) {
-    final IbftExtraData extraData = IbftExtraData.decode(headerToSign);
-    final Hash hashToSign =
-        IbftBlockHashing.calculateDataHashForProposerSeal(headerToSign, extraData);
-    return new IbftExtraData(
-        extraData.getVanityData(),
-        extraData.getSeals(),
-        SECP256K1.sign(hashToSign, nodeKeys),
-        extraData.getValidators());
-  }
-}
diff --git a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/headervalidationrules/IbftExtraDataValidationRule.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/headervalidationrules/IbftExtraDataValidationRule.java
deleted file mode 100644
index 4f02c2969c3..00000000000
--- a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/headervalidationrules/IbftExtraDataValidationRule.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibftlegacy.headervalidationrules;
-
-import org.hyperledger.besu.consensus.common.ValidatorProvider;
-import org.hyperledger.besu.consensus.ibft.IbftContext;
-import org.hyperledger.besu.consensus.ibftlegacy.IbftBlockHashing;
-import org.hyperledger.besu.consensus.ibftlegacy.IbftExtraData;
-import org.hyperledger.besu.consensus.ibftlegacy.IbftHelpers;
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule;
-import org.hyperledger.besu.ethereum.rlp.RLPException;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.NavigableSet;
-import java.util.TreeSet;
-
-import com.google.common.collect.Iterables;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-/**
- * Ensures the byte content of the extraData field can be deserialised into an appropriate
- * structure, and that the structure created contains data matching expectations from preceding
- * blocks.
- */
-public class IbftExtraDataValidationRule implements AttachedBlockHeaderValidationRule {
-
-  private static final Logger LOG = LogManager.getLogger();
-
-  private final boolean validateCommitSeals;
-
-  public IbftExtraDataValidationRule(final boolean validateCommitSeals) {
-    this.validateCommitSeals = validateCommitSeals;
-  }
-
-  @Override
-  public boolean validate(
-      final BlockHeader header, final BlockHeader parent, final ProtocolContext context) {
-    try {
-      final ValidatorProvider validatorProvider =
-          context
-              .getConsensusState(IbftContext.class)
-              .getVoteTallyCache()
-              .getVoteTallyAfterBlock(parent);
-      final IbftExtraData ibftExtraData = IbftExtraData.decode(header);
-
-      final Address proposer = IbftBlockHashing.recoverProposerAddress(header, ibftExtraData);
-
-      final Collection<Address> storedValidators = validatorProvider.getValidators();
-
-      if (!storedValidators.contains(proposer)) {
-        LOG.info("Invalid block header: Proposer sealing block is not a member of the validators.");
-        return false;
-      }
-
-      if (validateCommitSeals) {
-        final List<Address> committers =
-            IbftBlockHashing.recoverCommitterAddresses(header, ibftExtraData);
-        if (!validateCommitters(committers, storedValidators)) {
-          return false;
-        }
-      }
-
-      final NavigableSet<Address> sortedReportedValidators =
-          new TreeSet<>(ibftExtraData.getValidators());
-
-      if (!Iterables.elementsEqual(ibftExtraData.getValidators(), sortedReportedValidators)) {
-        LOG.info(
-            "Invalid block header: Validators are not sorted in ascending order. Expected {} but got {}.",
-            sortedReportedValidators,
-            ibftExtraData.getValidators());
-        return false;
-      }
-
-      if (!Iterables.elementsEqual(ibftExtraData.getValidators(), storedValidators)) {
-        LOG.info(
-            "Invalid block header: Incorrect validators. Expected {} but got {}.",
-            storedValidators,
-            ibftExtraData.getValidators());
-        return false;
-      }
-
-    } catch (final RLPException ex) {
-      LOG.info(
-          "Invalid block header: ExtraData field was unable to be deserialised into an IBFT Struct.",
-          ex);
-      return false;
-    } catch (final IllegalArgumentException ex) {
-      LOG.info("Invalid block header: Failed to verify extra data", ex);
-      return false;
-    } catch (final RuntimeException ex) {
-      LOG.info("Invalid block header: Failed to find validators at parent");
-      return false;
-    }
-
-    return true;
-  }
-
-  private boolean validateCommitters(
-      final Collection<Address> committers, final Collection<Address> storedValidators) {
-
-    final int minimumSealsRequired =
-        IbftHelpers.calculateRequiredValidatorQuorum(storedValidators.size());
-    if (committers.size() < minimumSealsRequired) {
-      LOG.info(
-          "Invalid block header: Insufficient committers to seal block. (Required {}, received {})",
-          minimumSealsRequired,
-          committers.size());
-      return false;
-    }
-
-    if (!storedValidators.containsAll(committers)) {
-      LOG.info(
-          "Invalid block header: Not all committers are in the locally maintained validator list.");
-      return false;
-    }
-
-    return true;
-  }
-}
diff --git a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/headervalidationrules/VoteValidationRule.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/headervalidationrules/VoteValidationRule.java
deleted file mode 100644
index 0929968df86..00000000000
--- a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/headervalidationrules/VoteValidationRule.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibftlegacy.headervalidationrules;
-
-import org.hyperledger.besu.consensus.ibftlegacy.IbftLegacyBlockInterface;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-public class VoteValidationRule implements DetachedBlockHeaderValidationRule {
-
-  private static final Logger LOG = LogManager.getLogger();
-
-  /**
-   * Responsible for ensuring the nonce is either auth or drop.
-   *
-   * @param header the block header to validate
-   * @param parent the block header corresponding to the parent of the header being validated.
-   * @return true if the nonce in the header is a valid validator vote value.
-   */
-  @Override
-  public boolean validate(final BlockHeader header, final BlockHeader parent) {
-    final long nonce = header.getNonce();
-    if (!IbftLegacyBlockInterface.isValidVoteValue(nonce)) {
-      LOG.info("Invalid block header: Nonce value ({}) is neither auth or drop.", nonce);
-      return false;
-    }
-    return true;
-  }
-}
diff --git a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/protocol/Istanbul64Protocol.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/protocol/Istanbul64Protocol.java
deleted file mode 100644
index 2924b8fa517..00000000000
--- a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/protocol/Istanbul64Protocol.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibftlegacy.protocol;
-
-import org.hyperledger.besu.ethereum.eth.messages.EthPV62;
-import org.hyperledger.besu.ethereum.eth.messages.EthPV63;
-import org.hyperledger.besu.ethereum.eth.messages.EthPV65;
-import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
-import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Represents the istanbul/64 protocol as used by Quorum (effectively an extension of eth/63, which
- * adds a single message type (0x11) to encapsulate all communications required for IBFT block
- * mining.
- */
-public class Istanbul64Protocol implements SubProtocol {
-
-  private static final String NAME = "istanbul";
-  private static final int VERSION = 64;
-
-  static final Capability ISTANBUL64 = Capability.create(NAME, 64);
-  static final int INSTANBUL_MSG = 0x11;
-
-  private static final Istanbul64Protocol INSTANCE = new Istanbul64Protocol();
-
-  private static final List<Integer> istanbul64Messages =
-      Arrays.asList(
-          EthPV62.STATUS,
-          EthPV62.NEW_BLOCK_HASHES,
-          EthPV62.TRANSACTIONS,
-          EthPV62.GET_BLOCK_HEADERS,
-          EthPV62.BLOCK_HEADERS,
-          EthPV62.GET_BLOCK_BODIES,
-          EthPV62.BLOCK_BODIES,
-          EthPV62.NEW_BLOCK,
-          EthPV65.NEW_POOLED_TRANSACTION_HASHES,
-          EthPV65.GET_POOLED_TRANSACTIONS,
-          EthPV65.POOLED_TRANSACTIONS,
-          EthPV63.GET_NODE_DATA,
-          EthPV63.NODE_DATA,
-          EthPV63.GET_RECEIPTS,
-          EthPV63.RECEIPTS,
-          INSTANBUL_MSG);
-
-  @Override
-  public String getName() {
-    return NAME;
-  }
-
-  @Override
-  public int messageSpace(final int protocolVersion) {
-    return INSTANBUL_MSG + 1;
-  }
-
-  @Override
-  public boolean isValidMessageCode(final int protocolVersion, final int code) {
-    if (protocolVersion == VERSION) {
-      return istanbul64Messages.contains(code);
-    }
-    return false;
-  }
-
-  @Override
-  public String messageName(final int protocolVersion, final int code) {
-    switch (code) {
-      case EthPV62.STATUS:
-        return "Status";
-      case EthPV62.NEW_BLOCK_HASHES:
-        return "NewBlockHashes";
-      case EthPV62.TRANSACTIONS:
-        return "Transactions";
-      case EthPV62.GET_BLOCK_HEADERS:
-        return "GetBlockHeaders";
-      case EthPV62.BLOCK_HEADERS:
-        return "BlockHeaders";
-      case EthPV62.GET_BLOCK_BODIES:
-        return "GetBlockBodies";
-      case EthPV62.BLOCK_BODIES:
-        return "BlockBodies";
-      case EthPV62.NEW_BLOCK:
-        return "NewBlock";
-      case EthPV65.NEW_POOLED_TRANSACTION_HASHES:
-        return "NewPooledTransactionHashes";
-      case EthPV65.GET_POOLED_TRANSACTIONS:
-        return "GetPooledTransactions";
-      case EthPV65.POOLED_TRANSACTIONS:
-        return "PooledTransactions";
-      case EthPV63.GET_NODE_DATA:
-        return "GetNodeData";
-      case EthPV63.NODE_DATA:
-        return "NodeData";
-      case EthPV63.GET_RECEIPTS:
-        return "GetReceipts";
-      case EthPV63.RECEIPTS:
-        return "Receipts";
-      case INSTANBUL_MSG:
-        return "InstanbulMsg";
-      default:
-        return INVALID_MESSAGE_NAME;
-    }
-  }
-
-  public static Istanbul64Protocol get() {
-    return INSTANCE;
-  }
-}
diff --git a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/protocol/Istanbul64ProtocolManager.java b/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/protocol/Istanbul64ProtocolManager.java
deleted file mode 100644
index 369563d3d9c..00000000000
--- a/consensus/ibftlegacy/src/main/java/org/hyperledger/besu/consensus/ibftlegacy/protocol/Istanbul64ProtocolManager.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibftlegacy.protocol;
-
-import static java.util.Collections.singletonList;
-
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
-import org.hyperledger.besu.ethereum.eth.manager.EthContext;
-import org.hyperledger.besu.ethereum.eth.manager.EthMessages;
-import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
-import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
-import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
-import org.hyperledger.besu.ethereum.eth.peervalidation.PeerValidator;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
-import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
-
-import java.math.BigInteger;
-import java.util.List;
-
-/** This allows for interoperability with Quorum, but shouldn't be used otherwise. */
-public class Istanbul64ProtocolManager extends EthProtocolManager {
-
-  public Istanbul64ProtocolManager(
-      final Blockchain blockchain,
-      final BigInteger networkId,
-      final WorldStateArchive worldStateArchive,
-      final TransactionPool transactionPool,
-      final EthProtocolConfiguration ethereumWireProtocolConfiguration,
-      final EthPeers ethPeers,
-      final EthMessages ethMessages,
-      final EthContext ethContext,
-      final List<PeerValidator> peerValidators,
-      final boolean fastSyncEnabled,
-      final EthScheduler scheduler) {
-    super(
-        blockchain,
-        networkId,
-        worldStateArchive,
-        transactionPool,
-        ethereumWireProtocolConfiguration,
-        ethPeers,
-        ethMessages,
-        ethContext,
-        peerValidators,
-        fastSyncEnabled,
-        scheduler);
-  }
-
-  @Override
-  public List<Capability> getSupportedCapabilities() {
-    return singletonList(Istanbul64Protocol.ISTANBUL64);
-  }
-
-  @Override
-  public String getSupportedProtocol() {
-    return Istanbul64Protocol.get().getName();
-  }
-}
diff --git a/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHashingTest.java b/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHashingTest.java
deleted file mode 100644
index a0e41e12204..00000000000
--- a/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHashingTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibftlegacy;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
-import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.LogsBloomFilter;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
-
-public class IbftBlockHashingTest {
-
-  private static final Address PROPOSER_IN_HEADER =
-      Address.fromHexString("0x24defc2d149861d3d245749b81fe0e6b28e04f31");
-  private static final List<Address> VALIDATORS_IN_HEADER =
-      Arrays.asList(
-          PROPOSER_IN_HEADER,
-          Address.fromHexString("0x2a813d7db3de19b07f92268b6d4125ed295cbe00"),
-          Address.fromHexString("0x3814f17bd4b7ce47ab8146684b3443c0a4b2fc2c"),
-          Address.fromHexString("0xc332d0db1704d18f89a590e7586811e36d37ce04"));
-  private static final List<Address> COMMITTERS_IN_HEADER =
-      Arrays.asList(
-          Address.fromHexString("0x3814f17bd4b7ce47ab8146684b3443c0a4b2fc2c"),
-          PROPOSER_IN_HEADER,
-          Address.fromHexString("0x2a813d7db3de19b07f92268b6d4125ed295cbe00"));
-  private static final Hash KNOWN_BLOCK_HASH =
-      Hash.fromHexString("0x0d60351c129af309fc8597c81358652d3d0f0e3141b5432888c4aae405ee0184");
-
-  private final BlockHeader header = createKnownHeaderFromCapturedData();
-
-  @Test
-  public void recoverProposerAddressFromSeal() {
-    final IbftExtraData ibftExtraData = IbftExtraData.decode(header);
-    final Address proposerAddress = IbftBlockHashing.recoverProposerAddress(header, ibftExtraData);
-
-    assertThat(proposerAddress).isEqualTo(PROPOSER_IN_HEADER);
-  }
-
-  @Test
-  public void readValidatorListFromExtraData() {
-    final IbftExtraData ibftExtraData = IbftExtraData.decode(header);
-    Assertions.assertThat(ibftExtraData.getValidators()).isEqualTo(VALIDATORS_IN_HEADER);
-  }
-
-  @Test
-  public void recoverCommitterAddresses() {
-    final IbftExtraData ibftExtraData = IbftExtraData.decode(header);
-    final List<Address> committers =
-        IbftBlockHashing.recoverCommitterAddresses(header, ibftExtraData);
-
-    assertThat(committers).isEqualTo(COMMITTERS_IN_HEADER);
-  }
-
-  @Test
-  public void calculateBlockHash() {
-    assertThat(header.getHash()).isEqualTo(KNOWN_BLOCK_HASH);
-  }
-
-  /*
-  Header information was extracted from a chain export (RLP) from a Quorum IBFT network.
-  The hash was determined by looking at the parentHash of the subsequent block (i.e. not calculated
-  by internal calculations, but rather by Quorum).
-   */
-  private BlockHeader createKnownHeaderFromCapturedData() {
-    final BlockHeaderBuilder builder = new BlockHeaderBuilder();
-
-    final String extraDataHexString =
-        "0xd783010800846765746887676f312e392e32856c696e757800000"
-            + "00000000000f90164f8549424defc2d149861d3d245749b81fe0e6b28e04f31942a813d7db3de19b07f92268b6d4"
-            + "125ed295cbe00943814f17bd4b7ce47ab8146684b3443c0a4b2fc2c94c332d0db1704d18f89a590e7586811e36d3"
-            + "7ce04b8417480a32e81936a40da3b8b730c28963a80011fdddb70470573675a11c7871873165e213b80b1ed5bf5a"
-            + "59a31874baf1d6e83d55141f719ada73815c8712c4c6501f8c9b8417ba97752c9a3d14ae8c5f6f864c2808b816a0"
-            + "d3ebef9a3b03c3cf9e31311baeb2e32609ccc99f13488e9e8ea192debf1c26f8c70c2332dfbb8456292fd9366110"
-            + "0b841bbf2d1710a41bee7895dadbbbc92713ba9e74129bb665984f349950d7b5275303db99b12ea3483430079dd5"
-            + "d90bcc3962f72217863725f6cd72ab5c10c8c540001b8415df74d9bf9687a3da10a4660cfd6fd6739df59db5535f"
-            + "a3a7c58382ec587f4fe581089a9e3cd4b8c3b77eeabdd756f1f34ffb990cfd47e81bb205bd10be619d001";
-
-    builder.parentHash(
-        Hash.fromHexString("0xa7762d3307dbf2ae6a1ae1b09cf61c7603722b2379731b6b90409cdb8c8288a0"));
-    builder.ommersHash(
-        Hash.fromHexString("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"));
-    builder.coinbase(Address.fromHexString("0x0000000000000000000000000000000000000000"));
-    builder.stateRoot(
-        Hash.fromHexString("0xca07595b82f908822971b7e848398e3395e59ee52565c7ef3603df1a1fa7bc80"));
-    builder.transactionsRoot(
-        Hash.fromHexString("0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"));
-    builder.receiptsRoot(
-        Hash.fromHexString("0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"));
-    builder.logsBloom(
-        LogsBloomFilter.fromHexString(
-            "0x000000000000000000000000000000000000000000000000"
-                + "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-                + "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-                + "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-                + "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-                + "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-                + "0000"));
-    builder.difficulty(Difficulty.ONE);
-    builder.number(1);
-    builder.gasLimit(4704588);
-    builder.gasUsed(0);
-    builder.timestamp(1530674616);
-    builder.extraData(Bytes.fromHexString(extraDataHexString));
-    builder.mixHash(
-        Hash.fromHexString("0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365"));
-    builder.nonce(0);
-    builder.blockHeaderFunctions(new LegacyIbftBlockHeaderFunctions());
-
-    return builder.buildBlockHeader();
-  }
-}
diff --git a/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHeaderValidationRulesetFactoryTest.java b/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHeaderValidationRulesetFactoryTest.java
deleted file mode 100644
index fa57eafd7b2..00000000000
--- a/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftBlockHeaderValidationRulesetFactoryTest.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibftlegacy;
-
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.consensus.common.VoteTally;
-import org.hyperledger.besu.consensus.common.VoteTallyCache;
-import org.hyperledger.besu.consensus.ibft.IbftContext;
-import org.hyperledger.besu.crypto.SECP256K1;
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
-import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
-
-import java.math.BigInteger;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-
-public class IbftBlockHeaderValidationRulesetFactoryTest {
-
-  private ProtocolContext setupContextWithValidators(final Collection<Address> validators) {
-    final IbftContext ibftContext = mock(IbftContext.class);
-    final VoteTallyCache mockCache = mock(VoteTallyCache.class);
-    final VoteTally mockVoteTally = mock(VoteTally.class);
-    when(ibftContext.getVoteTallyCache()).thenReturn(mockCache);
-    when(mockCache.getVoteTallyAfterBlock(any())).thenReturn(mockVoteTally);
-    when(mockVoteTally.getValidators()).thenReturn(validators);
-
-    return new ProtocolContext(null, null, ibftContext);
-  }
-
-  @Test
-  public void ibftValidateHeaderPasses() {
-    final KeyPair proposerKeyPair = KeyPair.generate();
-    final Address proposerAddress =
-        Address.extract(Hash.hash(proposerKeyPair.getPublicKey().getEncodedBytes()));
-
-    final List<Address> validators = singletonList(proposerAddress);
-
-    final BlockHeader parentHeader = buildBlockHeader(1, proposerKeyPair, validators, null);
-    final BlockHeader blockHeader = buildBlockHeader(2, proposerKeyPair, validators, parentHeader);
-
-    final BlockHeaderValidator validator =
-        IbftBlockHeaderValidationRulesetFactory.ibftBlockHeaderValidator(5).build();
-
-    assertThat(
-            validator.validateHeader(
-                blockHeader,
-                parentHeader,
-                setupContextWithValidators(validators),
-                HeaderValidationMode.FULL))
-        .isTrue();
-  }
-
-  @Test
-  public void ibftValidateHeaderFails() {
-    final KeyPair proposerKeyPair = KeyPair.generate();
-    final Address proposerAddress =
-        Address.extract(Hash.hash(proposerKeyPair.getPublicKey().getEncodedBytes()));
-
-    final List<Address> validators = singletonList(proposerAddress);
-
-    final BlockHeader parentHeader = buildBlockHeader(1, proposerKeyPair, validators, null);
-    final BlockHeader blockHeader = buildBlockHeader(2, proposerKeyPair, validators, null);
-
-    final BlockHeaderValidator validator =
-        IbftBlockHeaderValidationRulesetFactory.ibftBlockHeaderValidator(5).build();
-
-    assertThat(
-            validator.validateHeader(
-                blockHeader,
-                parentHeader,
-                setupContextWithValidators(validators),
-                HeaderValidationMode.FULL))
-        .isFalse();
-  }
-
-  private BlockHeader buildBlockHeader(
-      final long number,
-      final KeyPair proposerKeyPair,
-      final List<Address> validators,
-      final BlockHeader parent) {
-    final BlockHeaderTestFixture builder = new BlockHeaderTestFixture();
-
-    if (parent != null) {
-      builder.parentHash(parent.getHash());
-    }
-    builder.number(number);
-    builder.gasLimit(5000);
-    builder.timestamp(6000 * number);
-    builder.mixHash(
-        Hash.fromHexString("0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365"));
-    builder.ommersHash(Hash.EMPTY_LIST_HASH);
-    builder.nonce(IbftLegacyBlockInterface.DROP_NONCE);
-    builder.difficulty(Difficulty.ONE);
-
-    // Construct an extraData block
-    final IbftExtraData initialIbftExtraData =
-        new IbftExtraData(
-            Bytes.wrap(new byte[IbftExtraData.EXTRA_VANITY_LENGTH]),
-            emptyList(),
-            Signature.create(BigInteger.ONE, BigInteger.ONE, (byte) 0),
-            validators);
-
-    builder.extraData(initialIbftExtraData.encode());
-    final BlockHeader parentHeader = builder.buildHeader();
-    final Hash proposerSealHash =
-        IbftBlockHashing.calculateDataHashForProposerSeal(parentHeader, initialIbftExtraData);
-
-    final Signature proposerSignature = SECP256K1.sign(proposerSealHash, proposerKeyPair);
-
-    final IbftExtraData proposedData =
-        new IbftExtraData(
-            Bytes.wrap(new byte[IbftExtraData.EXTRA_VANITY_LENGTH]),
-            singletonList(proposerSignature),
-            proposerSignature,
-            validators);
-
-    final Hash headerHashForCommitters =
-        IbftBlockHashing.calculateDataHashForCommittedSeal(parentHeader, proposedData);
-    final Signature proposerAsCommitterSignature =
-        SECP256K1.sign(headerHashForCommitters, proposerKeyPair);
-
-    final IbftExtraData sealedData =
-        new IbftExtraData(
-            Bytes.wrap(new byte[IbftExtraData.EXTRA_VANITY_LENGTH]),
-            singletonList(proposerAsCommitterSignature),
-            proposerSignature,
-            validators);
-
-    builder.extraData(sealedData.encode());
-    return builder.buildHeader();
-  }
-}
diff --git a/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftExtraDataTest.java b/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftExtraDataTest.java
deleted file mode 100644
index 25d5bd554b6..00000000000
--- a/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftExtraDataTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibftlegacy;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
-import org.hyperledger.besu.ethereum.rlp.RLPException;
-
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
-
-import com.google.common.collect.Lists;
-import org.apache.tuweni.bytes.Bytes;
-import org.bouncycastle.util.encoders.Hex;
-import org.junit.Test;
-
-public class IbftExtraDataTest {
-
-  @Test
-  public void emptyListsConstituteValidContent() {
-    final Signature proposerSeal = Signature.create(BigInteger.ONE, BigInteger.ONE, (byte) 0);
-    final List<Address> validators = Lists.newArrayList();
-    final List<Signature> committerSeals = Lists.newArrayList();
-
-    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
-    encoder.startList();
-    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
-    encoder.writeBytes(proposerSeal.encodedBytes());
-    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
-    encoder.endList();
-
-    // Create a byte buffer with no data.
-    final byte[] vanity_bytes = new byte[32];
-    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
-    final Bytes bufferToInject = Bytes.wrap(vanity_data, encoder.encoded());
-
-    final IbftExtraData extraData = IbftExtraData.decodeRaw(bufferToInject);
-
-    assertThat(extraData.getVanityData()).isEqualTo(vanity_data);
-    assertThat(extraData.getProposerSeal()).isEqualTo(proposerSeal);
-    assertThat(extraData.getSeals()).isEqualTo(committerSeals);
-    assertThat(extraData.getValidators()).isEqualTo(validators);
-  }
-
-  @Test
-  public void fullyPopulatedDataProducesCorrectlyFormedExtraDataObject() {
-    final List<Address> validators = Arrays.asList(Address.ECREC, Address.SHA256);
-    final Signature proposerSeal = Signature.create(BigInteger.ONE, BigInteger.ONE, (byte) 0);
-    final List<Signature> committerSeals =
-        Arrays.asList(
-            Signature.create(BigInteger.ONE, BigInteger.TEN, (byte) 0),
-            Signature.create(BigInteger.TEN, BigInteger.ONE, (byte) 0));
-
-    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
-    encoder.startList(); // This is required to create a "root node" for all RLP'd data
-    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
-    encoder.writeBytes(proposerSeal.encodedBytes());
-    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
-    encoder.endList();
-
-    // Create randomised vanity data.
-    final byte[] vanity_bytes = new byte[32];
-    new Random().nextBytes(vanity_bytes);
-    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
-    final Bytes bufferToInject = Bytes.wrap(vanity_data, encoder.encoded());
-
-    final IbftExtraData extraData = IbftExtraData.decodeRaw(bufferToInject);
-
-    assertThat(extraData.getVanityData()).isEqualTo(vanity_data);
-    assertThat(extraData.getProposerSeal()).isEqualTo(proposerSeal);
-    assertThat(extraData.getSeals()).isEqualTo(committerSeals);
-    assertThat(extraData.getValidators()).isEqualTo(validators);
-  }
-
-  @Test(expected = RLPException.class)
-  public void incorrectlyStructuredRlpThrowsException() {
-    final Signature proposerSeal = Signature.create(BigInteger.ONE, BigInteger.ONE, (byte) 0);
-    final List<Address> validators = Lists.newArrayList();
-    final List<Signature> committerSeals = Lists.newArrayList();
-
-    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
-    encoder.startList();
-    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
-    encoder.writeBytes(proposerSeal.encodedBytes());
-    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
-    encoder.writeLong(1);
-    encoder.endList();
-
-    final Bytes bufferToInject = Bytes.wrap(Bytes.wrap(new byte[32]), encoder.encoded());
-
-    IbftExtraData.decodeRaw(bufferToInject);
-  }
-
-  @Test(expected = RLPException.class)
-  public void incorrectlySizedVanityDataThrowsException() {
-    final List<Address> validators = Arrays.asList(Address.ECREC, Address.SHA256);
-    final Signature proposerSeal = Signature.create(BigInteger.ONE, BigInteger.ONE, (byte) 0);
-    final List<Signature> committerSeals =
-        Arrays.asList(
-            Signature.create(BigInteger.ONE, BigInteger.TEN, (byte) 0),
-            Signature.create(BigInteger.TEN, BigInteger.ONE, (byte) 0));
-
-    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
-    encoder.startList();
-    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
-    encoder.writeBytes(proposerSeal.encodedBytes());
-    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
-    encoder.endList();
-
-    final Bytes bufferToInject = Bytes.wrap(Bytes.wrap(new byte[31]), encoder.encoded());
-
-    IbftExtraData.decodeRaw(bufferToInject);
-  }
-
-  @Test
-  public void parseGenesisBlockWithZeroProposerSeal() {
-    final byte[] genesisBlockExtraData =
-        Hex.decode(
-            "0000000000000000000000000000000000000000000000000000000000000000f89af85494c332d0db1704d18f89a590e7586811e36d37ce049424defc2d149861d3d245749b81fe0e6b28e04f31943814f17bd4b7ce47ab8146684b3443c0a4b2fc2c942a813d7db3de19b07f92268b6d4125ed295cbe00b8410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0");
-
-    final Bytes bufferToInject = Bytes.wrap(genesisBlockExtraData);
-
-    final IbftExtraData extraData = IbftExtraData.decodeRaw(bufferToInject);
-    assertThat(extraData.getProposerSeal()).isNull();
-  }
-}
diff --git a/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftLegacyBlockInterfaceTest.java b/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftLegacyBlockInterfaceTest.java
deleted file mode 100644
index 4a42d9ac542..00000000000
--- a/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/IbftLegacyBlockInterfaceTest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibftlegacy;
-
-import static java.util.Collections.singletonList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.consensus.common.VoteType.ADD;
-import static org.hyperledger.besu.consensus.common.VoteType.DROP;
-
-import org.hyperledger.besu.consensus.common.ValidatorVote;
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.AddressHelpers;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Util;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class IbftLegacyBlockInterfaceTest {
-
-  private static final KeyPair proposerKeys = KeyPair.generate();
-  private static final Address proposerAddress =
-      Util.publicKeyToAddress(proposerKeys.getPublicKey());
-  private static final List<Address> validatorList = singletonList(proposerAddress);
-
-  private final BlockHeaderTestFixture headerBuilder = new BlockHeaderTestFixture();
-  private final IbftLegacyBlockInterface blockInterface = new IbftLegacyBlockInterface();
-  private final BlockHeaderBuilder builder =
-      BlockHeaderBuilder.fromHeader(headerBuilder.buildHeader())
-          .blockHeaderFunctions(new LegacyIbftBlockHeaderFunctions());
-
-  @Before
-  public void setup() {
-    // must set "number" to ensure extradata is correctly deserialised during hashing.
-    headerBuilder.coinbase(AddressHelpers.ofValue(0)).number(1);
-  }
-
-  @Test
-  public void headerWithZeroCoinbaseReturnsAnEmptyVote() {
-    assertThat(blockInterface.extractVoteFromHeader(headerBuilder.buildHeader())).isEmpty();
-  }
-
-  @Test
-  public void headerWithNonceOfZeroReportsDropVote() {
-    headerBuilder.nonce(0x0L).coinbase(AddressHelpers.ofValue(2));
-    final BlockHeader header =
-        TestHelpers.createIbftSignedBlockHeader(headerBuilder, proposerKeys, validatorList);
-    final Optional<ValidatorVote> extractedVote = blockInterface.extractVoteFromHeader(header);
-
-    assertThat(extractedVote)
-        .contains(new ValidatorVote(DROP, proposerAddress, header.getCoinbase()));
-  }
-
-  @Test
-  public void headerWithNonceOfMaxLongReportsAddVote() {
-    headerBuilder.nonce(0xFFFFFFFFFFFFFFFFL).coinbase(AddressHelpers.ofValue(2));
-
-    final BlockHeader header =
-        TestHelpers.createIbftSignedBlockHeader(headerBuilder, proposerKeys, validatorList);
-    final Optional<ValidatorVote> extractedVote = blockInterface.extractVoteFromHeader(header);
-
-    assertThat(extractedVote)
-        .contains(new ValidatorVote(ADD, proposerAddress, header.getCoinbase()));
-  }
-
-  @Test
-  public void blendingAddVoteToHeaderResultsInHeaderWithNonceOfMaxLong() {
-    final ValidatorVote vote =
-        new ValidatorVote(ADD, AddressHelpers.ofValue(1), AddressHelpers.ofValue(2));
-    final BlockHeaderBuilder builderWithVote =
-        IbftLegacyBlockInterface.insertVoteToHeaderBuilder(builder, Optional.of(vote));
-
-    final BlockHeader header = builderWithVote.buildBlockHeader();
-
-    assertThat(header.getCoinbase()).isEqualTo(vote.getRecipient());
-    assertThat(header.getNonce()).isEqualTo(0xFFFFFFFFFFFFFFFFL);
-  }
-
-  @Test
-  public void blendingDropVoteToHeaderResultsInHeaderWithNonceOfZero() {
-    final ValidatorVote vote =
-        new ValidatorVote(DROP, AddressHelpers.ofValue(1), AddressHelpers.ofValue(2));
-    final BlockHeaderBuilder builderWithVote =
-        IbftLegacyBlockInterface.insertVoteToHeaderBuilder(builder, Optional.of(vote));
-
-    final BlockHeader header = builderWithVote.buildBlockHeader();
-
-    assertThat(header.getCoinbase()).isEqualTo(vote.getRecipient());
-    assertThat(header.getNonce()).isEqualTo(0x0L);
-  }
-
-  @Test
-  public void nonVoteBlendedIntoHeaderResultsInACoinbaseOfZero() {
-    final BlockHeaderBuilder builderWithVote =
-        IbftLegacyBlockInterface.insertVoteToHeaderBuilder(builder, Optional.empty());
-
-    final BlockHeader header = builderWithVote.buildBlockHeader();
-
-    assertThat(header.getCoinbase()).isEqualTo(AddressHelpers.ofValue(0));
-    assertThat(header.getNonce()).isEqualTo(0x0L);
-  }
-
-  @Test
-  public void extractsValidatorsFromHeader() {
-    final BlockHeader header =
-        TestHelpers.createIbftSignedBlockHeader(headerBuilder, proposerKeys, validatorList);
-
-    final Collection<Address> extractedValidators = blockInterface.validatorsInBlock(header);
-
-    assertThat(extractedValidators).isEqualTo(validatorList);
-  }
-}
diff --git a/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/TestHelpers.java b/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/TestHelpers.java
deleted file mode 100644
index f16e52db320..00000000000
--- a/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/TestHelpers.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibftlegacy;
-
-import org.hyperledger.besu.crypto.SECP256K1;
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public class TestHelpers {
-
-  public static BlockHeader createIbftSignedBlockHeader(
-      final BlockHeaderTestFixture blockHeaderBuilder,
-      final KeyPair signer,
-      final List<Address> validators) {
-
-    final IbftExtraData unsignedExtraData =
-        new IbftExtraData(Bytes.wrap(new byte[32]), Collections.emptyList(), null, validators);
-    blockHeaderBuilder.extraData(unsignedExtraData.encode());
-
-    final Hash signingHash =
-        IbftBlockHashing.calculateDataHashForProposerSeal(
-            blockHeaderBuilder.buildHeader(), unsignedExtraData);
-
-    final Signature proposerSignature = SECP256K1.sign(signingHash, signer);
-
-    final IbftExtraData signedExtraData =
-        new IbftExtraData(
-            unsignedExtraData.getVanityData(),
-            unsignedExtraData.getSeals(),
-            proposerSignature,
-            unsignedExtraData.getValidators());
-
-    blockHeaderBuilder.extraData(signedExtraData.encode());
-
-    return blockHeaderBuilder.buildHeader();
-  }
-}
diff --git a/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/blockcreation/IbftBlockCreatorTest.java b/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/blockcreation/IbftBlockCreatorTest.java
deleted file mode 100644
index 0a7994eb67c..00000000000
--- a/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/blockcreation/IbftBlockCreatorTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibftlegacy.blockcreation;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.consensus.ibft.IbftContextBuilder.setupContextWithValidators;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.config.GenesisConfigFile;
-import org.hyperledger.besu.consensus.ibftlegacy.IbftBlockHeaderValidationRulesetFactory;
-import org.hyperledger.besu.consensus.ibftlegacy.IbftExtraData;
-import org.hyperledger.besu.consensus.ibftlegacy.IbftProtocolSchedule;
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
-import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
-import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
-import org.hyperledger.besu.testutil.TestClock;
-
-import java.time.Instant;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-
-import com.google.common.collect.Lists;
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-
-public class IbftBlockCreatorTest {
-  private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
-
-  @Test
-  public void headerProducedPassesValidationRules() {
-    // Construct a parent block.
-    final BlockHeaderTestFixture blockHeaderBuilder = new BlockHeaderTestFixture();
-    blockHeaderBuilder.gasLimit(5000); // required to pass validation rule checks.
-    final BlockHeader parentHeader = blockHeaderBuilder.buildHeader();
-    final Optional<BlockHeader> optionalHeader = Optional.of(parentHeader);
-
-    // Construct a block chain and world state
-    final MutableBlockchain blockchain = mock(MutableBlockchain.class);
-    when(blockchain.getChainHeadHash()).thenReturn(parentHeader.getHash());
-    when(blockchain.getBlockHeader(any())).thenReturn(optionalHeader);
-
-    final KeyPair nodeKeys = KeyPair.generate();
-    // Add the local node as a validator (can't propose a block if node is not a validator).
-    final Address localAddr = Address.extract(Hash.hash(nodeKeys.getPublicKey().getEncodedBytes()));
-    final List<Address> initialValidatorList =
-        Arrays.asList(
-            Address.fromHexString(String.format("%020d", 1)),
-            Address.fromHexString(String.format("%020d", 2)),
-            Address.fromHexString(String.format("%020d", 3)),
-            Address.fromHexString(String.format("%020d", 4)),
-            localAddr);
-
-    final ProtocolSchedule protocolSchedule =
-        IbftProtocolSchedule.create(
-            GenesisConfigFile.fromConfig("{\"config\": {\"spuriousDragonBlock\":0}}")
-                .getConfigOptions(),
-            false);
-    final ProtocolContext protContext =
-        new ProtocolContext(
-            blockchain,
-            createInMemoryWorldStateArchive(),
-            setupContextWithValidators(initialValidatorList));
-
-    final IbftBlockCreator blockCreator =
-        new IbftBlockCreator(
-            Address.fromHexString(String.format("%020d", 0)),
-            parent ->
-                new IbftExtraData(
-                        Bytes.wrap(new byte[32]), Lists.newArrayList(), null, initialValidatorList)
-                    .encode(),
-            new PendingTransactions(
-                TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
-                1,
-                5,
-                TestClock.fixed(),
-                metricsSystem,
-                blockchain::getChainHeadHeader,
-                TransactionPoolConfiguration.DEFAULT_PRICE_BUMP),
-            protContext,
-            protocolSchedule,
-            parentGasLimit -> parentGasLimit,
-            nodeKeys,
-            Wei.ZERO,
-            0.8,
-            parentHeader);
-
-    final Block block = blockCreator.createBlock(Instant.now().getEpochSecond());
-
-    final BlockHeaderValidator rules =
-        IbftBlockHeaderValidationRulesetFactory.ibftProposedBlockValidator(0).build();
-
-    final boolean validationResult =
-        rules.validateHeader(
-            block.getHeader(), parentHeader, protContext, HeaderValidationMode.FULL);
-
-    assertThat(validationResult).isTrue();
-  }
-}
diff --git a/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/headervalidationrules/IbftExtraDataValidationRuleTest.java b/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/headervalidationrules/IbftExtraDataValidationRuleTest.java
deleted file mode 100644
index 836d72cff7e..00000000000
--- a/consensus/ibftlegacy/src/test/java/org/hyperledger/besu/consensus/ibftlegacy/headervalidationrules/IbftExtraDataValidationRuleTest.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.consensus.ibftlegacy.headervalidationrules;
-
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.consensus.ibft.IbftContextBuilder.setupContextWithValidators;
-
-import org.hyperledger.besu.consensus.ibftlegacy.IbftBlockHashing;
-import org.hyperledger.besu.consensus.ibftlegacy.IbftExtraData;
-import org.hyperledger.besu.crypto.SECP256K1;
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.AddressHelpers;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import com.google.common.collect.Lists;
-import org.apache.tuweni.bytes.Bytes;
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
-
-public class IbftExtraDataValidationRuleTest {
-
-  private BlockHeader createProposedBlockHeader(
-      final KeyPair proposerKeyPair, final List<Address> validators) {
-    final BlockHeaderTestFixture builder = new BlockHeaderTestFixture();
-    builder.number(1); // must NOT be block 0, as that should not contain seals at all
-
-    // Construct an extraData block and add to a header
-    final IbftExtraData initialIbftExtraData =
-        new IbftExtraData(
-            Bytes.wrap(new byte[IbftExtraData.EXTRA_VANITY_LENGTH]), emptyList(), null, validators);
-    builder.extraData(initialIbftExtraData.encode());
-    final BlockHeader header = builder.buildHeader();
-
-    // Hash the header (ignoring committer and proposer seals), and create signature
-    final Hash proposerSealHash =
-        IbftBlockHashing.calculateDataHashForProposerSeal(header, initialIbftExtraData);
-    final Signature proposerSignature = SECP256K1.sign(proposerSealHash, proposerKeyPair);
-
-    // Construct a new extraData block, containing the constructed proposer signature
-    final IbftExtraData proposedData =
-        new IbftExtraData(
-            Bytes.wrap(new byte[IbftExtraData.EXTRA_VANITY_LENGTH]),
-            emptyList(),
-            proposerSignature,
-            validators);
-
-    // insert the signed ExtraData into the block
-    builder.extraData(proposedData.encode());
-    return builder.buildHeader();
-  }
-
-  private IbftExtraData createExtraDataWithCommitSeals(
-      final BlockHeader header, final Collection<KeyPair> committerKeyPairs) {
-    final IbftExtraData extraDataInHeader = IbftExtraData.decode(header);
-
-    final Hash headerHashForCommitters =
-        IbftBlockHashing.calculateDataHashForCommittedSeal(header, extraDataInHeader);
-
-    final List<Signature> commitSeals =
-        committerKeyPairs.stream()
-            .map(keys -> SECP256K1.sign(headerHashForCommitters, keys))
-            .collect(Collectors.toList());
-
-    return new IbftExtraData(
-        extraDataInHeader.getVanityData(),
-        commitSeals,
-        extraDataInHeader.getProposerSeal(),
-        extraDataInHeader.getValidators());
-  }
-
-  @Test
-  public void correctlyConstructedHeaderPassesValidation() {
-    final BlockHeaderTestFixture builder = new BlockHeaderTestFixture();
-    builder.number(1); // must NOT be block 0, as that should not contain seals at all
-    final KeyPair proposerKeyPair = KeyPair.generate();
-    final Address proposerAddress =
-        Address.extract(Hash.hash(proposerKeyPair.getPublicKey().getEncodedBytes()));
-
-    final List<Address> validators = singletonList(proposerAddress);
-    final ProtocolContext context =
-        new ProtocolContext(null, null, setupContextWithValidators(validators));
-
-    final IbftExtraDataValidationRule extraDataValidationRule =
-        new IbftExtraDataValidationRule(true);
-
-    BlockHeader header = createProposedBlockHeader(proposerKeyPair, validators);
-
-    // Insert an extraData block with committer seals.
-    final IbftExtraData commitedExtraData =
-        createExtraDataWithCommitSeals(header, singletonList(proposerKeyPair));
-    builder.extraData(commitedExtraData.encode());
-    header = builder.buildHeader();
-
-    assertThat(extraDataValidationRule.validate(header, null, context)).isTrue();
-  }
-
-  @Test
-  public void insufficientCommitSealsFailsValidation() {
-    final BlockHeaderTestFixture builder = new BlockHeaderTestFixture();
-    builder.number(1); // must NOT be block 0, as that should not contain seals at all
-    final KeyPair proposerKeyPair = KeyPair.generate();
-    final Address proposerAddress =
-        Address.extract(Hash.hash(proposerKeyPair.getPublicKey().getEncodedBytes()));
-
-    final List<Address> validators = singletonList(proposerAddress);
-    final ProtocolContext context =
-        new ProtocolContext(null, null, setupContextWithValidators(validators));
-
-    final IbftExtraDataValidationRule extraDataValidationRule =
-        new IbftExtraDataValidationRule(true);
-
-    final BlockHeader header = createProposedBlockHeader(proposerKeyPair, validators);
-
-    // Note that no committer seals are in the header's IBFT extra data.
-    final IbftExtraData headerExtraData = IbftExtraData.decode(header);
-    Assertions.assertThat(headerExtraData.getSeals().size()).isEqualTo(0);
-
-    assertThat(extraDataValidationRule.validate(header, null, context)).isFalse();
-  }
-
-  @Test
-  public void outOfOrderValidatorListFailsValidation() {
-    final BlockHeaderTestFixture builder = new BlockHeaderTestFixture();
-    builder.number(1); // must NOT be block 0, as that should not contain seals at all
-    final KeyPair proposerKeyPair = KeyPair.generate();
-    final Address proposerAddress =
-        Address.extract(Hash.hash(proposerKeyPair.getPublicKey().getEncodedBytes()));
-
-    final List<Address> validators =
-        Lists.newArrayList(
-            AddressHelpers.calculateAddressWithRespectTo(proposerAddress, 1), proposerAddress);
-
-    final ProtocolContext context =
-        new ProtocolContext(null, null, setupContextWithValidators(validators));
-
-    final IbftExtraDataValidationRule extraDataValidationRule =
-        new IbftExtraDataValidationRule(true);
-
-    BlockHeader header = createProposedBlockHeader(proposerKeyPair, validators);
-
-    // Insert an extraData block with committer seals.
-    final IbftExtraData commitedExtraData =
-        createExtraDataWithCommitSeals(header, singletonList(proposerKeyPair));
-    builder.extraData(commitedExtraData.encode());
-    header = builder.buildHeader();
-
-    assertThat(extraDataValidationRule.validate(header, null, context)).isFalse();
-  }
-
-  @Test
-  public void proposerNotInValidatorListFailsValidation() {
-    final BlockHeaderTestFixture builder = new BlockHeaderTestFixture();
-    builder.number(1); // must NOT be block 0, as that should not contain seals at all
-    final KeyPair proposerKeyPair = KeyPair.generate();
-    final Address proposerAddress =
-        Address.extract(Hash.hash(proposerKeyPair.getPublicKey().getEncodedBytes()));
-
-    final List<Address> validators =
-        Lists.newArrayList(
-            AddressHelpers.calculateAddressWithRespectTo(proposerAddress, 1), proposerAddress);
-
-    final ProtocolContext context =
-        new ProtocolContext(null, null, setupContextWithValidators(validators));
-
-    final IbftExtraDataValidationRule extraDataValidationRule =
-        new IbftExtraDataValidationRule(true);
-
-    BlockHeader header = createProposedBlockHeader(proposerKeyPair, validators);
-
-    // Insert an extraData block with committer seals.
-    final IbftExtraData commitedExtraData =
-        createExtraDataWithCommitSeals(header, singletonList(proposerKeyPair));
-    builder.extraData(commitedExtraData.encode());
-    header = builder.buildHeader();
-
-    assertThat(extraDataValidationRule.validate(header, null, context)).isFalse();
-  }
-
-  @Test
-  public void mismatchingReportedValidatorsVsLocallyStoredListFailsValidation() {
-    final BlockHeaderTestFixture builder = new BlockHeaderTestFixture();
-    builder.number(1); // must NOT be block 0, as that should not contain seals at all
-    final KeyPair proposerKeyPair = KeyPair.generate();
-    final Address proposerAddress =
-        Address.extract(Hash.hash(proposerKeyPair.getPublicKey().getEncodedBytes()));
-
-    final List<Address> validators = Lists.newArrayList(proposerAddress);
-
-    final ProtocolContext context =
-        new ProtocolContext(null, null, setupContextWithValidators(validators));
-
-    final IbftExtraDataValidationRule extraDataValidationRule =
-        new IbftExtraDataValidationRule(true);
-
-    // Add another validator to the list reported in the IbftExtraData (note, as the
-    final List<Address> extraDataValidators =
-        Lists.newArrayList(
-            proposerAddress, AddressHelpers.calculateAddressWithRespectTo(proposerAddress, 1));
-    BlockHeader header = createProposedBlockHeader(proposerKeyPair, extraDataValidators);
-
-    // Insert an extraData block with committer seals.
-    final IbftExtraData commitedExtraData =
-        createExtraDataWithCommitSeals(header, singletonList(proposerKeyPair));
-    builder.extraData(commitedExtraData.encode());
-    header = builder.buildHeader();
-
-    assertThat(extraDataValidationRule.validate(header, null, context)).isFalse();
-  }
-
-  @Test
-  public void committerNotInValidatorListFailsValidation() {
-    final BlockHeaderTestFixture builder = new BlockHeaderTestFixture();
-    builder.number(1); // must NOT be block 0, as that should not contain seals at all
-    final KeyPair proposerKeyPair = KeyPair.generate();
-    final Address proposerAddress =
-        Address.extract(Hash.hash(proposerKeyPair.getPublicKey().getEncodedBytes()));
-
-    final List<Address> validators = singletonList(proposerAddress);
-
-    BlockHeader header = createProposedBlockHeader(proposerKeyPair, validators);
-
-    // Insert an extraData block with committer seals.
-    final KeyPair nonValidatorKeyPair = KeyPair.generate();
-    final IbftExtraData commitedExtraData =
-        createExtraDataWithCommitSeals(header, singletonList(nonValidatorKeyPair));
-    builder.extraData(commitedExtraData.encode());
-    header = builder.buildHeader();
-
-    final ProtocolContext context =
-        new ProtocolContext(null, null, setupContextWithValidators(validators));
-    final IbftExtraDataValidationRule extraDataValidationRule =
-        new IbftExtraDataValidationRule(true);
-
-    assertThat(extraDataValidationRule.validate(header, null, context)).isFalse();
-  }
-
-  @Test
-  public void ratioOfCommittersToValidatorsAffectValidation() {
-    assertThat(subExecution(4, 4)).isEqualTo(true);
-    assertThat(subExecution(4, 3)).isEqualTo(true);
-    assertThat(subExecution(4, 2)).isEqualTo(false);
-
-    assertThat(subExecution(5, 3)).isEqualTo(true);
-    assertThat(subExecution(5, 2)).isEqualTo(false);
-
-    assertThat(subExecution(6, 4)).isEqualTo(true);
-    assertThat(subExecution(6, 3)).isEqualTo(true);
-    assertThat(subExecution(6, 2)).isEqualTo(false);
-
-    assertThat(subExecution(7, 5)).isEqualTo(true);
-    assertThat(subExecution(7, 4)).isEqualTo(false);
-
-    assertThat(subExecution(9, 5)).isEqualTo(true);
-    assertThat(subExecution(9, 4)).isEqualTo(false);
-
-    assertThat(subExecution(10, 7)).isEqualTo(true);
-    assertThat(subExecution(10, 6)).isEqualTo(false);
-
-    assertThat(subExecution(12, 7)).isEqualTo(true);
-    assertThat(subExecution(12, 6)).isEqualTo(false);
-
-    // The concern in the above is that when using 6 validators, only 1/2 the validators are
-    // required to seal a block. All other combinations appear to be safe they always have >50%
-    // validators sealing the block.
-
-  }
-
-  private boolean subExecution(final int validatorCount, final int committerCount) {
-    final BlockHeaderTestFixture builder = new BlockHeaderTestFixture();
-    builder.number(1); // must NOT be block 0, as that should not contain seals at all
-    final KeyPair proposerKeyPair = KeyPair.generate();
-
-    final Address proposerAddress =
-        Address.extract(Hash.hash(proposerKeyPair.getPublicKey().getEncodedBytes()));
-
-    final List<Address> validators = Lists.newArrayList();
-    final List<KeyPair> committerKeys = Lists.newArrayList();
-    validators.add(proposerAddress);
-    committerKeys.add(proposerKeyPair);
-    for (int i = 0; i < validatorCount - 1; i++) { // need -1 to account for proposer
-      final KeyPair committerKeyPair = KeyPair.generate();
-      committerKeys.add(committerKeyPair);
-      validators.add(Address.extract(Hash.hash(committerKeyPair.getPublicKey().getEncodedBytes())));
-    }
-
-    Collections.sort(validators);
-    BlockHeader header = createProposedBlockHeader(proposerKeyPair, validators);
-    final IbftExtraData commitedExtraData =
-        createExtraDataWithCommitSeals(header, committerKeys.subList(0, committerCount));
-
-    builder.extraData(commitedExtraData.encode());
-    header = builder.buildHeader();
-
-    final ProtocolContext context =
-        new ProtocolContext(null, null, setupContextWithValidators(validators));
-    final IbftExtraDataValidationRule extraDataValidationRule =
-        new IbftExtraDataValidationRule(true);
-
-    return extraDataValidationRule.validate(header, null, context);
-  }
-}
diff --git a/consensus/merge/build.gradle b/consensus/merge/build.gradle
new file mode 100644
index 00000000000..50bf258ab9f
--- /dev/null
+++ b/consensus/merge/build.gradle
@@ -0,0 +1,65 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+apply plugin: 'java-library'
+
+jar {
+  archiveBaseName = 'besu-merge'
+  manifest {
+    attributes(
+      'Specification-Title': archiveBaseName,
+      'Specification-Version': project.version,
+      'Implementation-Title': archiveBaseName,
+      'Implementation-Version': calculateVersion()
+      )
+  }
+}
+
+repositories { mavenCentral() }
+
+dependencies {
+  api 'org.slf4j:slf4j-api'
+
+  implementation project(':config')
+  implementation project(':datatypes')
+  implementation project(':ethereum:blockcreation')
+  implementation project(':ethereum:core')
+  implementation project(':ethereum:eth')
+  implementation project(':ethereum:p2p')
+  implementation project(':ethereum:trie')
+  implementation project(':evm')
+  implementation project(':plugin-api')
+  implementation project(':util')
+
+  implementation 'com.fasterxml.jackson.core:jackson-databind'
+  implementation 'com.google.guava:guava'
+  implementation 'io.vertx:vertx-core'
+  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-units'
+
+  testImplementation project(path: ':consensus:common', configuration: 'testArtifacts')
+  testImplementation project(':crypto:algorithms')
+  testImplementation project(path: ':crypto:services', configuration: 'testSupportArtifacts')
+  testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
+  testImplementation project(':metrics:core')
+  testImplementation project(path: ':metrics:core', configuration: 'testSupportArtifacts')
+  testImplementation project(':testutil')
+
+  testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
+  testImplementation 'org.mockito:mockito-core'
+  testImplementation 'org.mockito:mockito-junit-jupiter'
+  testImplementation project(':ethereum:core')
+}
diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/MergeContext.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/MergeContext.java
new file mode 100644
index 00000000000..d23fff04414
--- /dev/null
+++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/MergeContext.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge;
+
+import org.hyperledger.besu.consensus.merge.blockcreation.PayloadIdentifier;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ConsensusContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+
+import java.util.Optional;
+
+/** The interface Merge context. */
+public interface MergeContext extends ConsensusContext {
+
+  /**
+   * Sets sync state.
+   *
+   * @param syncState the sync state
+   * @return the sync state
+   */
+  MergeContext setSyncState(SyncState syncState);
+
+  /**
+   * Sets terminal total difficulty.
+   *
+   * @param newTerminalTotalDifficulty the new terminal total difficulty
+   * @return the terminal total difficulty
+   */
+  MergeContext setTerminalTotalDifficulty(final Difficulty newTerminalTotalDifficulty);
+
+  /**
+   * Sets is post merge.
+   *
+   * @param totalDifficulty the total difficulty
+   */
+  void setIsPostMerge(final Difficulty totalDifficulty);
+
+  /**
+   * Is post merge.
+   *
+   * @return the boolean
+   */
+  boolean isPostMerge();
+
+  /**
+   * Is syncing.
+   *
+   * @return the boolean
+   */
+  boolean isSyncing();
+
+  /**
+   * Observe new is post merge state.
+   *
+   * @param mergeStateHandler the merge state handler
+   */
+  void observeNewIsPostMergeState(final MergeStateHandler mergeStateHandler);
+
+  /**
+   * Add new unverified forkchoice listener.
+   *
+   * @param unverifiedForkchoiceListener the unverified forkchoice listener
+   * @return the long
+   */
+  long addNewUnverifiedForkchoiceListener(
+      final UnverifiedForkchoiceListener unverifiedForkchoiceListener);
+
+  /**
+   * Remove new unverified forkchoice listener.
+   *
+   * @param subscriberId the subscriber id
+   */
+  void removeNewUnverifiedForkchoiceListener(final long subscriberId);
+
+  /**
+   * Fire new unverified forkchoice event.
+   *
+   * @param headBlockHash the head block hash
+   * @param safeBlockHash the safe block hash
+   * @param finalizedBlockHash the finalized block hash
+   */
+  void fireNewUnverifiedForkchoiceEvent(
+      final Hash headBlockHash, final Hash safeBlockHash, final Hash finalizedBlockHash);
+
+  /**
+   * Gets terminal total difficulty.
+   *
+   * @return the terminal total difficulty
+   */
+  Difficulty getTerminalTotalDifficulty();
+
+  /**
+   * Sets finalized.
+   *
+   * @param blockHeader the block header
+   */
+  void setFinalized(final BlockHeader blockHeader);
+
+  /**
+   * Gets finalized.
+   *
+   * @return the finalized
+   */
+  Optional<BlockHeader> getFinalized();
+
+  /**
+   * Sets safe block.
+   *
+   * @param blockHeader the block header
+   */
+  void setSafeBlock(final BlockHeader blockHeader);
+
+  /**
+   * Gets safe block.
+   *
+   * @return the safe block
+   */
+  Optional<BlockHeader> getSafeBlock();
+
+  /**
+   * Gets terminal PoW block.
+   *
+   * @return the terminal po w block
+   */
+  Optional<BlockHeader> getTerminalPoWBlock();
+
+  /**
+   * Sets terminal PoW block.
+   *
+   * @param hashAndNumber the hash and number
+   */
+  void setTerminalPoWBlock(Optional<BlockHeader> hashAndNumber);
+
+  /**
+   * Validate candidate head.
+   *
+   * @param candidateHeader the candidate header
+   * @return the boolean
+   */
+  boolean validateCandidateHead(final BlockHeader candidateHeader);
+
+  /**
+   * Put payload by Identifier.
+   *
+   * @param payloadId the payload identifier
+   * @param blockWithReceipts the block with receipts
+   */
+  void putPayloadById(final PayloadIdentifier payloadId, final BlockWithReceipts blockWithReceipts);
+
+  /**
+   * Retrieve block by id.
+   *
+   * @param payloadId the payload identifier
+   * @return the optional block with receipts
+   */
+  Optional<BlockWithReceipts> retrieveBlockById(final PayloadIdentifier payloadId);
+
+  /**
+   * Sets is chain pruning enabled.
+   *
+   * @param isChainPruningEnabled the is chain pruning enabled
+   */
+  default void setIsChainPruningEnabled(final boolean isChainPruningEnabled) {}
+
+  /**
+   * Is chain pruning enabled.
+   *
+   * @return the boolean
+   */
+  default boolean isChainPruningEnabled() {
+    return false;
+  }
+
+  /**
+   * Is checkpoint post merge sync.
+   *
+   * @return the boolean
+   */
+  boolean isCheckpointPostMergeSync();
+
+  /**
+   * Is configured for a post-merge from genesis.
+   *
+   * @return the boolean
+   */
+  boolean isPostMergeAtGenesis();
+}
diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/MergeProtocolSchedule.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/MergeProtocolSchedule.java
new file mode 100644
index 00000000000..d037590dac2
--- /dev/null
+++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/MergeProtocolSchedule.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge;
+
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpecAdapters;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpecBuilder;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.evm.MainnetEVMs;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+
+/** The Merge protocol schedule. */
+public class MergeProtocolSchedule {
+
+  private static final BigInteger DEFAULT_CHAIN_ID = BigInteger.valueOf(1);
+
+  /**
+   * Create protocol schedule.
+   *
+   * @param config the config
+   * @param isRevertReasonEnabled the is revert reason enabled
+   * @return the protocol schedule
+   */
+  public static ProtocolSchedule create(
+      final GenesisConfigOptions config, final boolean isRevertReasonEnabled) {
+    return create(config, PrivacyParameters.DEFAULT, isRevertReasonEnabled);
+  }
+
+  /**
+   * Create protocol schedule.
+   *
+   * @param config the config
+   * @param privacyParameters the privacy parameters
+   * @param isRevertReasonEnabled the is revert reason enabled
+   * @return the protocol schedule
+   */
+  public static ProtocolSchedule create(
+      final GenesisConfigOptions config,
+      final PrivacyParameters privacyParameters,
+      final boolean isRevertReasonEnabled) {
+
+    Map<Long, Function<ProtocolSpecBuilder, ProtocolSpecBuilder>> postMergeModifications =
+        new HashMap<>();
+    postMergeModifications.put(
+        0L,
+        (specBuilder) ->
+            MergeProtocolSchedule.applyParisSpecificModifications(
+                specBuilder, config.getChainId()));
+    unapplyModificationsFromShanghaiOnwards(config, postMergeModifications);
+
+    return new ProtocolScheduleBuilder(
+            config,
+            DEFAULT_CHAIN_ID,
+            new ProtocolSpecAdapters(postMergeModifications),
+            privacyParameters,
+            isRevertReasonEnabled,
+            EvmConfiguration.DEFAULT)
+        .createProtocolSchedule();
+  }
+
+  /**
+   * Apply Paris specific modifications because the Merge Transition code does not utilise {@link
+   * org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSpecFactory.parisDefinition} until the
+   * shanghaiDefinition is utilised. This is due to the way the Transition works via TTD rather than
+   * via a blockNumber so it can't be looked up in the schedule.
+   */
+  private static ProtocolSpecBuilder applyParisSpecificModifications(
+      final ProtocolSpecBuilder specBuilder, final Optional<BigInteger> chainId) {
+
+    return specBuilder
+        .evmBuilder(
+            (gasCalculator, jdCacheConfig) ->
+                MainnetEVMs.paris(
+                    gasCalculator, chainId.orElse(BigInteger.ZERO), EvmConfiguration.DEFAULT))
+        .blockHeaderValidatorBuilder(MergeProtocolSchedule::getBlockHeaderValidator)
+        .blockReward(Wei.ZERO)
+        .difficultyCalculator((a, b, c) -> BigInteger.ZERO)
+        .skipZeroBlockRewards(true)
+        .isPoS(true)
+        .name("Paris");
+  }
+
+  private static BlockHeaderValidator.Builder getBlockHeaderValidator(final FeeMarket feeMarket) {
+    return MergeValidationRulesetFactory.mergeBlockHeaderValidator(feeMarket);
+  }
+
+  private static void unapplyModificationsFromShanghaiOnwards(
+      final GenesisConfigOptions config,
+      final Map<Long, Function<ProtocolSpecBuilder, ProtocolSpecBuilder>> postMergeModifications) {
+    // Any post-Paris fork can rely on the MainnetProtocolSpec definitions again
+    // Must allow for config to skip Shanghai and go straight to a later fork.
+    if (config.getForkBlockTimestamps().size() > 0) {
+      postMergeModifications.put(config.getForkBlockTimestamps().get(0), Function.identity());
+    }
+  }
+}
diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/MergeValidationRulesetFactory.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/MergeValidationRulesetFactory.java
new file mode 100644
index 00000000000..08dc99f2d63
--- /dev/null
+++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/MergeValidationRulesetFactory.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge;
+
+import static org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderValidator.MIN_GAS_LIMIT;
+import static org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderValidator.TIMESTAMP_TOLERANCE_S;
+
+import org.hyperledger.besu.consensus.merge.headervalidationrules.ConstantOmmersHashRule;
+import org.hyperledger.besu.consensus.merge.headervalidationrules.IncrementalTimestampRule;
+import org.hyperledger.besu.consensus.merge.headervalidationrules.NoDifficultyRule;
+import org.hyperledger.besu.consensus.merge.headervalidationrules.NoNonceRule;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
+import org.hyperledger.besu.ethereum.mainnet.EpochCalculator;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderValidator;
+import org.hyperledger.besu.ethereum.mainnet.PoWHasher;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.AncestryValidationRule;
+import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.BaseFeeMarketBlockHeaderGasPriceValidationRule;
+import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.ExtraDataMaxLengthValidationRule;
+import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.GasLimitRangeAndDeltaValidationRule;
+import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.GasUsageValidationRule;
+import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.TimestampBoundedByFutureParameter;
+
+import java.util.Optional;
+
+/** The Merge validation ruleset factory. */
+public class MergeValidationRulesetFactory {
+
+  private static final EpochCalculator preMergeCalculator =
+      new EpochCalculator.DefaultEpochCalculator();
+
+  /**
+   * Creates a set of rules which when executed will determine if a given block header is valid with
+   * respect to its parent (or chain).
+   *
+   * <p>Specifically the set of rules provided by this function are to be used for a Mainnet Merge
+   * chain.
+   *
+   * @param feeMarket the applicable {@link FeeMarket}
+   * @return the header validator.
+   */
+  public static BlockHeaderValidator.Builder mergeBlockHeaderValidator(final FeeMarket feeMarket) {
+
+    if (!feeMarket.implementsBaseFee()) {
+      return MainnetBlockHeaderValidator.createPgaBlockHeaderValidator(
+          preMergeCalculator, PoWHasher.ETHASH_LIGHT);
+    } else {
+      var baseFeeMarket = (BaseFeeMarket) feeMarket;
+
+      return new BlockHeaderValidator.Builder()
+          .addRule(new AncestryValidationRule())
+          .addRule(new GasUsageValidationRule())
+          .addRule(
+              new GasLimitRangeAndDeltaValidationRule(
+                  MIN_GAS_LIMIT, Long.MAX_VALUE, Optional.of(baseFeeMarket)))
+          .addRule(new TimestampBoundedByFutureParameter(TIMESTAMP_TOLERANCE_S))
+          .addRule(new ExtraDataMaxLengthValidationRule(BlockHeader.MAX_EXTRA_DATA_BYTES))
+          .addRule((new BaseFeeMarketBlockHeaderGasPriceValidationRule(baseFeeMarket)))
+          .addRule(new ConstantOmmersHashRule())
+          .addRule(new NoNonceRule())
+          .addRule(new NoDifficultyRule())
+          .addRule(new IncrementalTimestampRule());
+    }
+  }
+}
diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/PostMergeContext.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/PostMergeContext.java
new file mode 100644
index 00000000000..e1cbd9e8579
--- /dev/null
+++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/PostMergeContext.java
@@ -0,0 +1,359 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge;
+
+import org.hyperledger.besu.consensus.merge.blockcreation.PayloadIdentifier;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.ConsensusContext;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockValueCalculator;
+import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.util.Subscribers;
+
+import java.util.Comparator;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.EvictingQueue;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Post merge context. */
+public class PostMergeContext implements MergeContext {
+  private static final Logger LOG = LoggerFactory.getLogger(PostMergeContext.class);
+  /** The Max blocks in progress. */
+  static final int MAX_BLOCKS_IN_PROGRESS = 12;
+
+  private static final AtomicReference<PostMergeContext> singleton = new AtomicReference<>();
+
+  private static final Comparator<BlockWithReceipts> compareByGasUsedDesc =
+      Comparator.comparingLong(
+              (BlockWithReceipts blockWithReceipts) ->
+                  blockWithReceipts.getBlock().getHeader().getGasUsed())
+          .reversed();
+
+  private final AtomicReference<SyncState> syncState;
+  private final AtomicReference<Difficulty> terminalTotalDifficulty;
+  // initial postMerge state is indeterminate until it is set:
+  private final AtomicReference<Optional<Boolean>> isPostMerge =
+      new AtomicReference<>(Optional.empty());
+  private final Subscribers<MergeStateHandler> newMergeStateCallbackSubscribers =
+      Subscribers.create();
+  private final Subscribers<UnverifiedForkchoiceListener>
+      newUnverifiedForkchoiceCallbackSubscribers = Subscribers.create();
+
+  private final EvictingQueue<PayloadTuple> blocksInProgress =
+      EvictingQueue.create(MAX_BLOCKS_IN_PROGRESS);
+
+  // latest finalized block
+  private final AtomicReference<BlockHeader> lastFinalized = new AtomicReference<>();
+  private final AtomicReference<BlockHeader> lastSafeBlock = new AtomicReference<>();
+  private final AtomicReference<Optional<BlockHeader>> terminalPoWBlock =
+      new AtomicReference<>(Optional.empty());
+  private final BlockValueCalculator blockValueCalculator = new BlockValueCalculator();
+  private boolean isCheckpointPostMergeSync;
+  private boolean isPostMergeAtGenesis;
+
+  // TODO: cleanup - isChainPruningEnabled will not be required after
+  // https://github.com/hyperledger/besu/pull/4703 is merged.
+  private boolean isChainPruningEnabled = false;
+
+  /** Instantiates a new Post merge context. */
+  @VisibleForTesting
+  PostMergeContext() {
+    this(Difficulty.ZERO);
+  }
+
+  /**
+   * Instantiates a new Post merge context.
+   *
+   * @param difficulty the difficulty
+   */
+  @VisibleForTesting
+  PostMergeContext(final Difficulty difficulty) {
+    this.terminalTotalDifficulty = new AtomicReference<>(difficulty);
+    this.syncState = new AtomicReference<>();
+    this.isCheckpointPostMergeSync = false;
+  }
+
+  /**
+   * Get post merge context.
+   *
+   * @return the post merge context
+   */
+  public static PostMergeContext get() {
+    if (singleton.get() == null) {
+      singleton.compareAndSet(null, new PostMergeContext());
+    }
+    return singleton.get();
+  }
+
+  @Override
+  public <C extends ConsensusContext> C as(final Class<C> klass) {
+    return klass.cast(this);
+  }
+
+  @Override
+  public PostMergeContext setTerminalTotalDifficulty(final Difficulty newTerminalTotalDifficulty) {
+    if (newTerminalTotalDifficulty == null) {
+      throw new IllegalStateException("cannot set null terminal total difficulty");
+    }
+    terminalTotalDifficulty.set(newTerminalTotalDifficulty);
+    return this;
+  }
+
+  @Override
+  public void setIsPostMerge(final Difficulty totalDifficulty) {
+    if (isPostMerge.get().orElse(Boolean.FALSE)) {
+      // if we have finalized, we never switch back to a pre-merge once we have transitioned
+      // post-TTD.
+      return;
+    }
+    final boolean newState = terminalTotalDifficulty.get().lessOrEqualThan(totalDifficulty);
+    final Optional<Boolean> oldState = isPostMerge.getAndSet(Optional.of(newState));
+
+    // if we are past TTD, set it:
+    if (newState)
+      Optional.ofNullable(syncState.get())
+          .ifPresent(ss -> ss.setReachedTerminalDifficulty(newState));
+
+    if (oldState.isEmpty() || oldState.get() != newState) {
+      newMergeStateCallbackSubscribers.forEach(
+          newMergeStateCallback ->
+              newMergeStateCallback.mergeStateChanged(
+                  newState, oldState, Optional.of(totalDifficulty)));
+    }
+  }
+
+  @Override
+  public boolean isPostMerge() {
+    return isPostMerge.get().orElse(Boolean.FALSE);
+  }
+
+  @Override
+  public PostMergeContext setSyncState(final SyncState syncState) {
+    this.syncState.set(syncState);
+    return this;
+  }
+
+  @Override
+  public boolean isSyncing() {
+    return Optional.ofNullable(syncState.get()).map(s -> !s.isInSync()).orElse(Boolean.TRUE)
+        // this is necessary for when we do not have a sync target yet, like at startup.
+        // not being stopped at ttd implies we are syncing.
+        && Optional.ofNullable(syncState.get())
+            .map(s -> !(s.hasReachedTerminalDifficulty().orElse(Boolean.FALSE)))
+            .orElse(Boolean.TRUE);
+  }
+
+  @Override
+  public void observeNewIsPostMergeState(final MergeStateHandler mergeStateHandler) {
+    newMergeStateCallbackSubscribers.subscribe(mergeStateHandler);
+  }
+
+  @Override
+  public long addNewUnverifiedForkchoiceListener(
+      final UnverifiedForkchoiceListener unverifiedForkchoiceListener) {
+    return newUnverifiedForkchoiceCallbackSubscribers.subscribe(unverifiedForkchoiceListener);
+  }
+
+  @Override
+  public void removeNewUnverifiedForkchoiceListener(final long subscriberId) {
+    newUnverifiedForkchoiceCallbackSubscribers.unsubscribe(subscriberId);
+  }
+
+  @Override
+  public void fireNewUnverifiedForkchoiceEvent(
+      final Hash headBlockHash, final Hash safeBlockHash, final Hash finalizedBlockHash) {
+    final ForkchoiceEvent event =
+        new ForkchoiceEvent(headBlockHash, safeBlockHash, finalizedBlockHash);
+    newUnverifiedForkchoiceCallbackSubscribers.forEach(cb -> cb.onNewUnverifiedForkchoice(event));
+  }
+
+  @Override
+  public Difficulty getTerminalTotalDifficulty() {
+    return terminalTotalDifficulty.get();
+  }
+
+  @Override
+  public void setFinalized(final BlockHeader blockHeader) {
+    lastFinalized.set(blockHeader);
+  }
+
+  @Override
+  public Optional<BlockHeader> getFinalized() {
+    return Optional.ofNullable(lastFinalized.get());
+  }
+
+  @Override
+  public void setSafeBlock(final BlockHeader blockHeader) {
+    lastSafeBlock.set(blockHeader);
+  }
+
+  @Override
+  public Optional<BlockHeader> getSafeBlock() {
+    return Optional.ofNullable(lastSafeBlock.get());
+  }
+
+  @Override
+  public Optional<BlockHeader> getTerminalPoWBlock() {
+    return terminalPoWBlock.get();
+  }
+
+  @Override
+  public void setTerminalPoWBlock(final Optional<BlockHeader> hashAndNumber) {
+    terminalPoWBlock.set(hashAndNumber);
+  }
+
+  @Override
+  public boolean validateCandidateHead(final BlockHeader candidateHeader) {
+    return Optional.ofNullable(lastFinalized.get())
+        .map(finalized -> candidateHeader.getNumber() >= finalized.getNumber())
+        .orElse(Boolean.TRUE);
+  }
+
+  @Override
+  public void putPayloadById(
+      final PayloadIdentifier payloadId, final BlockWithReceipts newBlockWithReceipts) {
+    synchronized (blocksInProgress) {
+      final Optional<BlockWithReceipts> maybeCurrBestBlock = retrieveBlockById(payloadId);
+
+      maybeCurrBestBlock.ifPresentOrElse(
+          currBestBlock -> {
+            if (compareByGasUsedDesc.compare(newBlockWithReceipts, currBestBlock) < 0) {
+              LOG.atDebug()
+                  .setMessage("New proposal for payloadId {} {} is better than the previous one {}")
+                  .addArgument(payloadId)
+                  .addArgument(() -> logBlockProposal(newBlockWithReceipts.getBlock()))
+                  .addArgument(() -> logBlockProposal(currBestBlock.getBlock()))
+                  .log();
+              blocksInProgress.removeAll(
+                  retrieveTuplesById(payloadId).collect(Collectors.toUnmodifiableList()));
+              blocksInProgress.add(new PayloadTuple(payloadId, newBlockWithReceipts));
+              logCurrentBestBlock(newBlockWithReceipts);
+            }
+          },
+          () -> blocksInProgress.add(new PayloadTuple(payloadId, newBlockWithReceipts)));
+    }
+  }
+
+  private void logCurrentBestBlock(final BlockWithReceipts blockWithReceipts) {
+    if (LOG.isDebugEnabled()) {
+      final Block block = blockWithReceipts.getBlock();
+      final float gasUsedPerc =
+          100.0f * block.getHeader().getGasUsed() / block.getHeader().getGasLimit();
+      final int txsNum = block.getBody().getTransactions().size();
+      final Wei reward = blockValueCalculator.calculateBlockValue(blockWithReceipts);
+
+      LOG.debug(
+          "Current best proposal for block {}: txs {}, gas used {}%, reward {}",
+          blockWithReceipts.getNumber(),
+          txsNum,
+          String.format("%1.2f", gasUsedPerc),
+          reward.toHumanReadableString());
+    }
+  }
+
+  @Override
+  public Optional<BlockWithReceipts> retrieveBlockById(final PayloadIdentifier payloadId) {
+    synchronized (blocksInProgress) {
+      return retrieveTuplesById(payloadId)
+          .map(tuple -> tuple.blockWithReceipts)
+          .sorted(compareByGasUsedDesc)
+          .findFirst();
+    }
+  }
+
+  private Stream<PayloadTuple> retrieveTuplesById(final PayloadIdentifier payloadId) {
+    return blocksInProgress.stream().filter(z -> z.payloadIdentifier.equals(payloadId));
+  }
+
+  private String logBlockProposal(final Block block) {
+    return "block "
+        + block.toLogString()
+        + " gas used "
+        + block.getHeader().getGasUsed()
+        + " transactions "
+        + block.getBody().getTransactions().size();
+  }
+
+  private static class PayloadTuple {
+    /** The Payload identifier. */
+    final PayloadIdentifier payloadIdentifier;
+    /** The Block with receipts. */
+    final BlockWithReceipts blockWithReceipts;
+
+    /**
+     * Instantiates a new Payload tuple.
+     *
+     * @param payloadIdentifier the payload identifier
+     * @param blockWithReceipts the block with receipts
+     */
+    PayloadTuple(
+        final PayloadIdentifier payloadIdentifier, final BlockWithReceipts blockWithReceipts) {
+      this.payloadIdentifier = payloadIdentifier;
+      this.blockWithReceipts = blockWithReceipts;
+    }
+  }
+
+  @Override
+  public void setIsChainPruningEnabled(final boolean isChainPruningEnabled) {
+    this.isChainPruningEnabled = isChainPruningEnabled;
+  }
+
+  @Override
+  public boolean isChainPruningEnabled() {
+    return isChainPruningEnabled;
+  }
+
+  /**
+   * Sets checkpoint post merge sync.
+   *
+   * @param isCheckpointPostMergeSync the is checkpoint post merge sync
+   * @return the checkpoint post merge sync
+   */
+  public PostMergeContext setCheckpointPostMergeSync(final boolean isCheckpointPostMergeSync) {
+    this.isCheckpointPostMergeSync = isCheckpointPostMergeSync;
+    return this;
+  }
+
+  @Override
+  public boolean isCheckpointPostMergeSync() {
+    return this.isCheckpointPostMergeSync;
+  }
+
+  @Override
+  public boolean isPostMergeAtGenesis() {
+    return this.isPostMergeAtGenesis;
+  }
+
+  /**
+   * Sets whether it is post merge at genesis
+   *
+   * @param isPostMergeAtGenesis the is post merge at genesis state
+   * @return the post merge context
+   */
+  public PostMergeContext setPostMergeAtGenesis(final boolean isPostMergeAtGenesis) {
+    this.isPostMergeAtGenesis = isPostMergeAtGenesis;
+    return this;
+  }
+}
diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionBackwardSyncContext.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionBackwardSyncContext.java
new file mode 100644
index 00000000000..9af4d8d6b95
--- /dev/null
+++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionBackwardSyncContext.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge;
+
+import org.hyperledger.besu.ethereum.BlockValidator;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.sync.backwardsync.BackwardChain;
+import org.hyperledger.besu.ethereum.eth.sync.backwardsync.BackwardSyncContext;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.storage.StorageProvider;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+/** The Transition backward sync context. */
+public class TransitionBackwardSyncContext extends BackwardSyncContext {
+
+  private final TransitionProtocolSchedule transitionProtocolSchedule;
+
+  /**
+   * Instantiates a new Transition backward sync context.
+   *
+   * @param protocolContext the protocol context
+   * @param transitionProtocolSchedule the transition protocol schedule
+   * @param metricsSystem the metrics system
+   * @param ethContext the eth context
+   * @param syncState the sync state
+   * @param storageProvider the storage provider
+   */
+  public TransitionBackwardSyncContext(
+      final ProtocolContext protocolContext,
+      final TransitionProtocolSchedule transitionProtocolSchedule,
+      final MetricsSystem metricsSystem,
+      final EthContext ethContext,
+      final SyncState syncState,
+      final StorageProvider storageProvider) {
+    super(
+        protocolContext,
+        transitionProtocolSchedule,
+        metricsSystem,
+        ethContext,
+        syncState,
+        BackwardChain.from(
+            storageProvider, ScheduleBasedBlockHeaderFunctions.create(transitionProtocolSchedule)));
+    this.transitionProtocolSchedule = transitionProtocolSchedule;
+  }
+
+  /**
+   * Choose the correct protocolSchedule and blockvalidator by block rather than number. This should
+   * be used in the merge transition, specifically when the chain has not yet finalized.
+   */
+  @Override
+  public BlockValidator getBlockValidatorForBlock(final Block block) {
+    return transitionProtocolSchedule
+        .getByBlockHeaderWithTransitionReorgHandling(block.getHeader())
+        .getBlockValidator();
+  }
+}
diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionBestPeerComparator.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionBestPeerComparator.java
new file mode 100644
index 00000000000..4cc4fbafba8
--- /dev/null
+++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionBestPeerComparator.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge;
+
+import static org.hyperledger.besu.ethereum.eth.manager.EthPeers.CHAIN_HEIGHT;
+
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+
+import java.math.BigInteger;
+import java.util.Comparator;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiFunction;
+
+/** The Transition best peer comparator. */
+public class TransitionBestPeerComparator implements Comparator<EthPeer>, MergeStateHandler {
+
+  private static final AtomicReference<Difficulty> terminalTotalDifficulty =
+      new AtomicReference<>();
+
+  /** The Distance from ttd. */
+  static final BiFunction<EthPeer, Difficulty, BigInteger> distanceFromTTD =
+      (a, ttd) ->
+          a.chainState()
+              .getEstimatedTotalDifficulty()
+              .getAsBigInteger()
+              .subtract(ttd.getAsBigInteger())
+              .abs()
+              .negate();
+
+  /** The constant EXACT_DIFFICULTY. */
+  public static final Comparator<EthPeer> EXACT_DIFFICULTY =
+      (a, b) -> {
+        var ttd = terminalTotalDifficulty.get();
+        var aDelta = distanceFromTTD.apply(a, ttd);
+        var bDelta = distanceFromTTD.apply(b, ttd);
+        return aDelta.compareTo(bDelta);
+      };
+
+  /** The constant BEST_MERGE_CHAIN. */
+  public static final Comparator<EthPeer> BEST_MERGE_CHAIN =
+      EXACT_DIFFICULTY.thenComparing(CHAIN_HEIGHT);
+
+  /**
+   * Instantiates a new Transition best peer comparator.
+   *
+   * @param configuredTerminalTotalDifficulty the configured terminal total difficulty
+   */
+  public TransitionBestPeerComparator(final Difficulty configuredTerminalTotalDifficulty) {
+    terminalTotalDifficulty.set(configuredTerminalTotalDifficulty);
+  }
+
+  @Override
+  public void mergeStateChanged(
+      final boolean isPoS,
+      final Optional<Boolean> oldState,
+      final Optional<Difficulty> difficultyStoppedAt) {
+    if (isPoS && difficultyStoppedAt.isPresent()) {
+      terminalTotalDifficulty.set(difficultyStoppedAt.get());
+    }
+  }
+
+  @Override
+  public int compare(final EthPeer o1, final EthPeer o2) {
+    return BEST_MERGE_CHAIN.compare(o1, o2);
+  }
+}
diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionContext.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionContext.java
new file mode 100644
index 00000000000..69183cb0c53
--- /dev/null
+++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionContext.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge;
+
+import org.hyperledger.besu.consensus.merge.blockcreation.PayloadIdentifier;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ConsensusContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+
+import java.util.Optional;
+
+/** The Transition context. */
+public class TransitionContext implements MergeContext {
+  /** The Pre merge context. */
+  final ConsensusContext preMergeContext;
+  /** The Post merge context. */
+  final MergeContext postMergeContext;
+
+  /**
+   * Instantiates a new Transition context.
+   *
+   * @param preMergeContext the pre merge context
+   * @param postMergeContext the post merge context
+   */
+  public TransitionContext(
+      final ConsensusContext preMergeContext, final MergeContext postMergeContext) {
+    this.preMergeContext = preMergeContext;
+    this.postMergeContext = postMergeContext;
+  }
+
+  @Override
+  public <C extends ConsensusContext> C as(final Class<C> klass) {
+    if (klass.isInstance(postMergeContext)) {
+      return klass.cast(postMergeContext);
+    }
+    return klass.cast(preMergeContext);
+  }
+
+  @Override
+  public MergeContext setSyncState(final SyncState syncState) {
+    return postMergeContext.setSyncState(syncState);
+  }
+
+  @Override
+  public MergeContext setTerminalTotalDifficulty(final Difficulty newTerminalTotalDifficulty) {
+    return postMergeContext.setTerminalTotalDifficulty(newTerminalTotalDifficulty);
+  }
+
+  @Override
+  public void setIsPostMerge(final Difficulty totalDifficulty) {
+    postMergeContext.setIsPostMerge(totalDifficulty);
+  }
+
+  @Override
+  public boolean isPostMerge() {
+    return postMergeContext.isPostMerge();
+  }
+
+  @Override
+  public boolean isSyncing() {
+    return postMergeContext.isSyncing();
+  }
+
+  @Override
+  public void observeNewIsPostMergeState(final MergeStateHandler mergeStateHandler) {
+    postMergeContext.observeNewIsPostMergeState(mergeStateHandler);
+  }
+
+  @Override
+  public long addNewUnverifiedForkchoiceListener(
+      final UnverifiedForkchoiceListener unverifiedForkchoiceListener) {
+    return postMergeContext.addNewUnverifiedForkchoiceListener(unverifiedForkchoiceListener);
+  }
+
+  @Override
+  public void removeNewUnverifiedForkchoiceListener(final long subscriberId) {
+    postMergeContext.removeNewUnverifiedForkchoiceListener(subscriberId);
+  }
+
+  @Override
+  public void fireNewUnverifiedForkchoiceEvent(
+      final Hash headBlockHash, final Hash safeBlockHash, final Hash finalizedBlockHash) {
+    postMergeContext.fireNewUnverifiedForkchoiceEvent(
+        headBlockHash, safeBlockHash, finalizedBlockHash);
+  }
+
+  @Override
+  public Difficulty getTerminalTotalDifficulty() {
+    return postMergeContext.getTerminalTotalDifficulty();
+  }
+
+  @Override
+  public void setFinalized(final BlockHeader blockHeader) {
+    postMergeContext.setFinalized(blockHeader);
+  }
+
+  @Override
+  public Optional<BlockHeader> getFinalized() {
+    return postMergeContext.getFinalized();
+  }
+
+  @Override
+  public void setSafeBlock(final BlockHeader blockHeader) {
+    postMergeContext.setSafeBlock(blockHeader);
+  }
+
+  @Override
+  public Optional<BlockHeader> getSafeBlock() {
+    return postMergeContext.getSafeBlock();
+  }
+
+  @Override
+  public Optional<BlockHeader> getTerminalPoWBlock() {
+    return this.postMergeContext.getTerminalPoWBlock();
+  }
+
+  @Override
+  public void setTerminalPoWBlock(final Optional<BlockHeader> hashAndNumber) {
+    this.postMergeContext.setTerminalPoWBlock(hashAndNumber);
+  }
+
+  @Override
+  public boolean validateCandidateHead(final BlockHeader candidateHeader) {
+    return postMergeContext.validateCandidateHead(candidateHeader);
+  }
+
+  @Override
+  public void putPayloadById(
+      final PayloadIdentifier payloadId, final BlockWithReceipts blockWithReceipts) {
+    postMergeContext.putPayloadById(payloadId, blockWithReceipts);
+  }
+
+  @Override
+  public Optional<BlockWithReceipts> retrieveBlockById(final PayloadIdentifier payloadId) {
+    return postMergeContext.retrieveBlockById(payloadId);
+  }
+
+  @Override
+  public boolean isCheckpointPostMergeSync() {
+    return false;
+  }
+
+  @Override
+  public boolean isPostMergeAtGenesis() {
+    return postMergeContext.isPostMergeAtGenesis();
+  }
+}
diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionProtocolSchedule.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionProtocolSchedule.java
new file mode 100644
index 00000000000..f934e4cd30d
--- /dev/null
+++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionProtocolSchedule.java
@@ -0,0 +1,249 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge;
+
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
+import org.hyperledger.besu.ethereum.core.TransactionFilter;
+import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.mainnet.ScheduledProtocolSpec;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+
+import java.math.BigInteger;
+import java.util.Optional;
+import java.util.function.Predicate;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Transition protocol schedule. */
+public class TransitionProtocolSchedule implements ProtocolSchedule {
+  private final TransitionUtils<ProtocolSchedule> transitionUtils;
+  private static final Logger LOG = LoggerFactory.getLogger(TransitionProtocolSchedule.class);
+  private final MergeContext mergeContext;
+  private ProtocolContext protocolContext;
+
+  /**
+   * Instantiates a new Transition protocol schedule.
+   *
+   * @param preMergeProtocolSchedule the pre merge protocol schedule
+   * @param postMergeProtocolSchedule the post merge protocol schedule
+   * @param mergeContext the merge context
+   */
+  public TransitionProtocolSchedule(
+      final ProtocolSchedule preMergeProtocolSchedule,
+      final ProtocolSchedule postMergeProtocolSchedule,
+      final MergeContext mergeContext) {
+    this.mergeContext = mergeContext;
+    transitionUtils =
+        new TransitionUtils<>(preMergeProtocolSchedule, postMergeProtocolSchedule, mergeContext);
+  }
+
+  /**
+   * Create a Proof-of-Stake protocol schedule from a config object
+   *
+   * @param genesisConfigOptions {@link GenesisConfigOptions} containing the config options for the
+   *     milestone starting points
+   * @return an initialised TransitionProtocolSchedule using post-merge defaults
+   */
+  public static TransitionProtocolSchedule fromConfig(
+      final GenesisConfigOptions genesisConfigOptions) {
+    ProtocolSchedule preMergeProtocolSchedule =
+        MainnetProtocolSchedule.fromConfig(genesisConfigOptions);
+    ProtocolSchedule postMergeProtocolSchedule =
+        MergeProtocolSchedule.create(genesisConfigOptions, false);
+    return new TransitionProtocolSchedule(
+        preMergeProtocolSchedule, postMergeProtocolSchedule, PostMergeContext.get());
+  }
+
+  /**
+   * Gets pre merge schedule.
+   *
+   * @return the pre merge schedule
+   */
+  public ProtocolSchedule getPreMergeSchedule() {
+    return transitionUtils.getPreMergeObject();
+  }
+
+  /**
+   * Gets post merge schedule.
+   *
+   * @return the post merge schedule
+   */
+  public ProtocolSchedule getPostMergeSchedule() {
+    return transitionUtils.getPostMergeObject();
+  }
+
+  /**
+   * Gets protocol spec by block header.
+   *
+   * @param blockHeader the block header
+   * @return the ProtocolSpec to be used by the provided block
+   */
+  @Override
+  public ProtocolSpec getByBlockHeader(final ProcessableBlockHeader blockHeader) {
+    return this.transitionUtils.dispatchFunctionAccordingToMergeState(
+        protocolSchedule -> protocolSchedule.getByBlockHeader(blockHeader));
+  }
+
+  /**
+   * Gets the protocol spec by block header, with some additional logic used by backwards sync (BWS)
+   *
+   * @param blockHeader the block header
+   * @return the ProtocolSpec to be used by the provided block
+   */
+  public ProtocolSpec getByBlockHeaderWithTransitionReorgHandling(
+      final ProcessableBlockHeader blockHeader) {
+    // if we do not have a finalized block we might return pre or post merge protocol schedule:
+    if (mergeContext.getFinalized().isEmpty()) {
+
+      // if head is not post-merge, return pre-merge schedule:
+      if (!mergeContext.isPostMerge()) {
+        LOG.atDebug()
+            .setMessage("for {} returning a pre-merge schedule because we are not post-merge")
+            .addArgument(blockHeader::toLogString)
+            .log();
+        return getPreMergeSchedule().getByBlockHeader(blockHeader);
+      }
+
+      // otherwise check to see if this block represents a re-org TTD block:
+      Difficulty parentDifficulty =
+          protocolContext
+              .getBlockchain()
+              .getTotalDifficultyByHash(blockHeader.getParentHash())
+              .orElse(Difficulty.ZERO);
+      Difficulty thisDifficulty = parentDifficulty.add(blockHeader.getDifficulty());
+      Difficulty terminalDifficulty = mergeContext.getTerminalTotalDifficulty();
+      LOG.atDebug()
+          .setMessage(" block {} ttd is: {}, parent total diff is: {}, this total diff is: {}")
+          .addArgument(blockHeader::toLogString)
+          .addArgument(terminalDifficulty)
+          .addArgument(parentDifficulty)
+          .addArgument(thisDifficulty)
+          .log();
+
+      // if this block is pre-merge or a TTD block
+      if (thisDifficulty.lessThan(terminalDifficulty)
+          || TransitionUtils.isTerminalProofOfWorkBlock(blockHeader, protocolContext)) {
+        LOG.atDebug()
+            .setMessage("returning a pre-merge schedule because block {} is pre-merge or TTD")
+            .addArgument(blockHeader::toLogString)
+            .log();
+        return getPreMergeSchedule().getByBlockHeader(blockHeader);
+      }
+    }
+    // else return post-merge schedule
+    LOG.atDebug()
+        .setMessage(" for {} returning a post-merge schedule")
+        .addArgument(blockHeader::toLogString)
+        .log();
+    return getPostMergeSchedule().getByBlockHeader(blockHeader);
+  }
+
+  @Override
+  public boolean anyMatch(final Predicate<ScheduledProtocolSpec> predicate) {
+    return transitionUtils.dispatchFunctionAccordingToMergeState(
+        schedule -> schedule.anyMatch(predicate));
+  }
+
+  @Override
+  public boolean isOnMilestoneBoundary(final BlockHeader blockHeader) {
+    return transitionUtils.dispatchFunctionAccordingToMergeState(
+        schedule -> schedule.isOnMilestoneBoundary(blockHeader));
+  }
+
+  /**
+   * Gets chain id.
+   *
+   * @return the chain id
+   */
+  @Override
+  public Optional<BigInteger> getChainId() {
+    return transitionUtils.dispatchFunctionAccordingToMergeState(ProtocolSchedule::getChainId);
+  }
+
+  /**
+   * Put blockNumber milestone.
+   *
+   * @param blockNumber the block or timestamp
+   * @param protocolSpec the protocol spec
+   */
+  @Override
+  public void putBlockNumberMilestone(final long blockNumber, final ProtocolSpec protocolSpec) {
+    throw new UnsupportedOperationException(
+        "Should not use TransitionProtocolSchedule wrapper class to create milestones");
+  }
+
+  /**
+   * Put timestamp milestone.
+   *
+   * @param timestamp the block or timestamp
+   * @param protocolSpec the protocol spec
+   */
+  @Override
+  public void putTimestampMilestone(final long timestamp, final ProtocolSpec protocolSpec) {
+    throw new UnsupportedOperationException(
+        "Should not use TransitionProtocolSchedule wrapper class to create milestones");
+  }
+
+  /**
+   * List milestones.
+   *
+   * @return the string
+   */
+  @Override
+  public String listMilestones() {
+    return transitionUtils.dispatchFunctionAccordingToMergeState(ProtocolSchedule::listMilestones);
+  }
+
+  /**
+   * Sets transaction filter.
+   *
+   * @param transactionFilter the transaction filter
+   */
+  @Override
+  public void setTransactionFilter(final TransactionFilter transactionFilter) {
+    transitionUtils.dispatchConsumerAccordingToMergeState(
+        protocolSchedule -> protocolSchedule.setTransactionFilter(transactionFilter));
+  }
+
+  /**
+   * Sets public world state archive for privacy block processor.
+   *
+   * @param publicWorldStateArchive the public world state archive
+   */
+  @Override
+  public void setPublicWorldStateArchiveForPrivacyBlockProcessor(
+      final WorldStateArchive publicWorldStateArchive) {
+    transitionUtils.dispatchConsumerAccordingToMergeState(
+        protocolSchedule ->
+            protocolSchedule.setPublicWorldStateArchiveForPrivacyBlockProcessor(
+                publicWorldStateArchive));
+  }
+
+  /**
+   * Sets protocol context.
+   *
+   * @param protocolContext the protocol context
+   */
+  public void setProtocolContext(final ProtocolContext protocolContext) {
+    this.protocolContext = protocolContext;
+  }
+}
diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionUtils.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionUtils.java
new file mode 100644
index 00000000000..d851317a94c
--- /dev/null
+++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionUtils.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
+
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * The Transition utils.
+ *
+ * @param <SwitchingObject> the type parameter
+ */
+public class TransitionUtils<SwitchingObject> {
+  private static final Logger LOG = LoggerFactory.getLogger(TransitionUtils.class);
+
+  /** The Merge context. */
+  protected final MergeContext mergeContext;
+
+  private final SwitchingObject preMergeObject;
+  private final SwitchingObject postMergeObject;
+
+  /**
+   * Instantiates a new Transition utils.
+   *
+   * @param preMergeObject the pre merge object
+   * @param postMergeObject the post merge object
+   * @param mergeContext the merge context
+   */
+  public TransitionUtils(
+      final SwitchingObject preMergeObject,
+      final SwitchingObject postMergeObject,
+      final MergeContext mergeContext) {
+    this.preMergeObject = preMergeObject;
+    this.postMergeObject = postMergeObject;
+    this.mergeContext = mergeContext;
+  }
+
+  /**
+   * Dispatch consumer according to merge state.
+   *
+   * @param consumer the consumer
+   */
+  void dispatchConsumerAccordingToMergeState(final Consumer<SwitchingObject> consumer) {
+    consumer.accept(mergeContext.isPostMerge() ? postMergeObject : preMergeObject);
+  }
+
+  /**
+   * Dispatch function according to merge state t.
+   *
+   * @param <T> the type parameter
+   * @param function the function
+   * @return the t
+   */
+  public <T> T dispatchFunctionAccordingToMergeState(final Function<SwitchingObject, T> function) {
+    return function.apply(mergeContext.isPostMerge() ? postMergeObject : preMergeObject);
+  }
+
+  /**
+   * Gets pre merge object.
+   *
+   * @return the pre merge object
+   */
+  public SwitchingObject getPreMergeObject() {
+    return preMergeObject;
+  }
+
+  /**
+   * Gets post merge object.
+   *
+   * @return the post merge object
+   */
+  SwitchingObject getPostMergeObject() {
+    return postMergeObject;
+  }
+
+  /**
+   * Is terminal proof of work block boolean.
+   *
+   * @param header the header
+   * @param context the context
+   * @return the boolean
+   */
+  public static boolean isTerminalProofOfWorkBlock(
+      final ProcessableBlockHeader header, final ProtocolContext context) {
+
+    Difficulty headerDifficulty =
+        Optional.ofNullable(header.getDifficulty()).orElse(Difficulty.ZERO);
+
+    Difficulty currentChainTotalDifficulty =
+        context
+            .getBlockchain()
+            .getTotalDifficultyByHash(header.getParentHash())
+            // if we cannot find difficulty or are merge-at-genesis
+            .orElse(Difficulty.ZERO);
+
+    final MergeContext consensusContext = context.getConsensusContext(MergeContext.class);
+
+    // Genesis is configured for post-merge we will never have a terminal pow block
+    if (consensusContext.isPostMergeAtGenesis()) {
+      return false;
+    }
+
+    if (currentChainTotalDifficulty.isZero()) {
+      LOG.atWarn()
+          .setMessage("unable to get total difficulty for {}, parent hash {} difficulty not found")
+          .addArgument(header::toLogString)
+          .addArgument(header::getParentHash)
+          .log();
+    }
+    Difficulty configuredTotalTerminalDifficulty = consensusContext.getTerminalTotalDifficulty();
+
+    if (currentChainTotalDifficulty
+            .add(headerDifficulty)
+            .greaterOrEqualThan(
+                configuredTotalTerminalDifficulty) // adding would equal or go over limit
+        && currentChainTotalDifficulty.lessThan(
+            configuredTotalTerminalDifficulty) // parent was under
+    ) {
+      return true;
+    }
+
+    // return true for genesis block when merge-at-genesis, otherwise false
+    return header.getNumber() == 0L
+        && header.getDifficulty().greaterOrEqualThan(configuredTotalTerminalDifficulty);
+  }
+}
diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/UnverifiedForkchoiceSupplier.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/UnverifiedForkchoiceSupplier.java
new file mode 100644
index 00000000000..e42956fae77
--- /dev/null
+++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/UnverifiedForkchoiceSupplier.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge;
+
+import java.util.Optional;
+import java.util.function.Supplier;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Unverified forkchoice supplier. */
+public class UnverifiedForkchoiceSupplier
+    implements Supplier<Optional<ForkchoiceEvent>>, UnverifiedForkchoiceListener {
+  private static final Logger LOG = LoggerFactory.getLogger(UnverifiedForkchoiceSupplier.class);
+
+  private volatile Optional<ForkchoiceEvent> maybeLastForkchoiceUpdate = Optional.empty();
+
+  @Override
+  public void onNewUnverifiedForkchoice(final ForkchoiceEvent event) {
+    maybeLastForkchoiceUpdate = Optional.of(event);
+    LOG.debug("New forkchoice announced {}", maybeLastForkchoiceUpdate);
+  }
+
+  @Override
+  public Optional<ForkchoiceEvent> get() {
+    return maybeLastForkchoiceUpdate;
+  }
+}
diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeBlockCreator.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeBlockCreator.java
new file mode 100644
index 00000000000..21922727788
--- /dev/null
+++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeBlockCreator.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge.blockcreation;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.blockcreation.AbstractBlockCreator;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.SealableBlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Supplier;
+
+import org.apache.tuweni.bytes.Bytes32;
+
+/** The Merge block creator. */
+class MergeBlockCreator extends AbstractBlockCreator {
+  /**
+   * On PoS you do not need to compete with other nodes for block production, since you have an
+   * allocated slot for that, so in this case make sense to always try to fill the block, if there
+   * are enough pending transactions, until the remaining gas is less than the minimum needed for
+   * the smaller transaction. So for PoS the min-block-occupancy-ratio option is set to always try
+   * to fill 100% of the block.
+   */
+  private static final double TRY_FILL_BLOCK = 1.0;
+
+  /**
+   * Instantiates a new Merge block creator.
+   *
+   * @param coinbase the coinbase
+   * @param targetGasLimitSupplier the target gas limit supplier
+   * @param extraDataCalculator the extra data calculator
+   * @param pendingTransactions the pending transactions
+   * @param protocolContext the protocol context
+   * @param protocolSchedule the protocol schedule
+   * @param minTransactionGasPrice the min transaction gas price
+   * @param miningBeneficiary the mining beneficiary
+   * @param parentHeader the parent header
+   */
+  public MergeBlockCreator(
+      final Address coinbase,
+      final Supplier<Optional<Long>> targetGasLimitSupplier,
+      final ExtraDataCalculator extraDataCalculator,
+      final PendingTransactions pendingTransactions,
+      final ProtocolContext protocolContext,
+      final ProtocolSchedule protocolSchedule,
+      final Wei minTransactionGasPrice,
+      final Address miningBeneficiary,
+      final BlockHeader parentHeader,
+      final Optional<Address> depositContractAddress) {
+    super(
+        miningBeneficiary,
+        __ -> miningBeneficiary,
+        targetGasLimitSupplier,
+        extraDataCalculator,
+        pendingTransactions,
+        protocolContext,
+        protocolSchedule,
+        minTransactionGasPrice,
+        TRY_FILL_BLOCK,
+        parentHeader,
+        depositContractAddress);
+  }
+
+  /**
+   * Create block and return block creation result.
+   *
+   * @param maybeTransactions the maybe transactions
+   * @param random the random
+   * @param timestamp the timestamp
+   * @param withdrawals optional list of withdrawals
+   * @return the block creation result
+   */
+  public BlockCreationResult createBlock(
+      final Optional<List<Transaction>> maybeTransactions,
+      final Bytes32 random,
+      final long timestamp,
+      final Optional<List<Withdrawal>> withdrawals) {
+
+    return createBlock(
+        maybeTransactions,
+        Optional.of(Collections.emptyList()),
+        withdrawals,
+        Optional.of(random),
+        timestamp,
+        false);
+  }
+
+  @Override
+  public BlockCreationResult createBlock(
+      final Optional<List<Transaction>> maybeTransactions,
+      final Optional<List<BlockHeader>> maybeOmmers,
+      final long timestamp) {
+    throw new UnsupportedOperationException("random is required");
+  }
+
+  @Override
+  protected BlockHeader createFinalBlockHeader(final SealableBlockHeader sealableBlockHeader) {
+    return BlockHeaderBuilder.create()
+        .difficulty(Difficulty.ZERO)
+        .populateFrom(sealableBlockHeader)
+        .nonce(0L)
+        .blockHeaderFunctions(blockHeaderFunctions)
+        .buildBlockHeader();
+  }
+}
diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinator.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinator.java
new file mode 100644
index 00000000000..c1069fc6ce9
--- /dev/null
+++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinator.java
@@ -0,0 +1,975 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge.blockcreation;
+
+import static java.util.stream.Collectors.joining;
+import static org.hyperledger.besu.consensus.merge.TransitionUtils.isTerminalProofOfWorkBlock;
+import static org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator.ForkchoiceResult.Status.INVALID;
+
+import org.hyperledger.besu.consensus.merge.MergeContext;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.BlockProcessingResult;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.blockcreation.BlockCreator.BlockCreationResult;
+import org.hyperledger.besu.ethereum.chain.BadBlockManager;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+import org.hyperledger.besu.ethereum.eth.sync.backwardsync.BackwardSyncContext;
+import org.hyperledger.besu.ethereum.eth.sync.backwardsync.BadChainListener;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.mainnet.AbstractGasLimitSpecification;
+import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.trie.MerkleTrieException;
+import org.hyperledger.besu.plugin.services.exception.StorageException;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Merge coordinator. */
+public class MergeCoordinator implements MergeMiningCoordinator, BadChainListener {
+  private static final Logger LOG = LoggerFactory.getLogger(MergeCoordinator.class);
+
+  /** The Target gas limit. */
+  protected final AtomicLong targetGasLimit;
+  /** The Mining parameters. */
+  protected final MiningParameters miningParameters;
+  /** The Merge block creator factory. */
+  protected final MergeBlockCreatorFactory mergeBlockCreatorFactory;
+  /** The Extra data. */
+  protected final AtomicReference<Bytes> extraData =
+      new AtomicReference<>(Bytes.fromHexString("0x"));
+  /** The Latest descends from terminal. */
+  protected final AtomicReference<BlockHeader> latestDescendsFromTerminal = new AtomicReference<>();
+  /** The Merge context. */
+  protected final MergeContext mergeContext;
+  /** The Protocol context. */
+  protected final ProtocolContext protocolContext;
+  /** The Block builder executor. */
+  protected final ProposalBuilderExecutor blockBuilderExecutor;
+  /** The Backward sync context. */
+  protected final BackwardSyncContext backwardSyncContext;
+  /** The Protocol schedule. */
+  protected final ProtocolSchedule protocolSchedule;
+
+  private final Map<PayloadIdentifier, BlockCreationTask> blockCreationTasks =
+      new ConcurrentHashMap<>();
+
+  /**
+   * Instantiates a new Merge coordinator.
+   *
+   * @param protocolContext the protocol context
+   * @param protocolSchedule the protocol schedule
+   * @param blockBuilderExecutor the block builder executor
+   * @param pendingTransactions the pending transactions
+   * @param miningParams the mining params
+   * @param backwardSyncContext the backward sync context
+   * @param depositContractAddress the address of the deposit contract
+   */
+  public MergeCoordinator(
+      final ProtocolContext protocolContext,
+      final ProtocolSchedule protocolSchedule,
+      final ProposalBuilderExecutor blockBuilderExecutor,
+      final PendingTransactions pendingTransactions,
+      final MiningParameters miningParams,
+      final BackwardSyncContext backwardSyncContext,
+      final Optional<Address> depositContractAddress) {
+    this.protocolContext = protocolContext;
+    this.protocolSchedule = protocolSchedule;
+    this.blockBuilderExecutor = blockBuilderExecutor;
+    this.mergeContext = protocolContext.getConsensusContext(MergeContext.class);
+    this.miningParameters = miningParams;
+    this.backwardSyncContext = backwardSyncContext;
+    this.targetGasLimit =
+        miningParameters
+            .getTargetGasLimit()
+            // TODO: revisit default target gas limit
+            .orElse(new AtomicLong(30000000L));
+    this.extraData.set(miningParams.getExtraData());
+
+    this.mergeBlockCreatorFactory =
+        (parentHeader, address) ->
+            new MergeBlockCreator(
+                address.or(miningParameters::getCoinbase).orElse(Address.ZERO),
+                () -> Optional.of(targetGasLimit.longValue()),
+                parent -> extraData.get(),
+                pendingTransactions,
+                protocolContext,
+                protocolSchedule,
+                this.miningParameters.getMinTransactionGasPrice(),
+                address.or(miningParameters::getCoinbase).orElse(Address.ZERO),
+                parentHeader,
+                depositContractAddress);
+
+    this.backwardSyncContext.subscribeBadChainListener(this);
+  }
+
+  /**
+   * Instantiates a new Merge coordinator.
+   *
+   * @param protocolContext the protocol context
+   * @param protocolSchedule the protocol schedule
+   * @param blockBuilderExecutor the block builder executor
+   * @param miningParams the mining params
+   * @param backwardSyncContext the backward sync context
+   * @param mergeBlockCreatorFactory the merge block creator factory
+   */
+  public MergeCoordinator(
+      final ProtocolContext protocolContext,
+      final ProtocolSchedule protocolSchedule,
+      final ProposalBuilderExecutor blockBuilderExecutor,
+      final MiningParameters miningParams,
+      final BackwardSyncContext backwardSyncContext,
+      final MergeBlockCreatorFactory mergeBlockCreatorFactory) {
+
+    this.protocolContext = protocolContext;
+    this.protocolSchedule = protocolSchedule;
+    this.blockBuilderExecutor = blockBuilderExecutor;
+    this.mergeContext = protocolContext.getConsensusContext(MergeContext.class);
+    this.miningParameters = miningParams;
+    this.backwardSyncContext = backwardSyncContext;
+    this.targetGasLimit =
+        miningParameters
+            .getTargetGasLimit()
+            // TODO: revisit default target gas limit
+            .orElse(new AtomicLong(30000000L));
+
+    this.mergeBlockCreatorFactory = mergeBlockCreatorFactory;
+
+    this.backwardSyncContext.subscribeBadChainListener(this);
+  }
+
+  @Override
+  public void start() {}
+
+  @Override
+  public void stop() {}
+
+  @Override
+  public void awaitStop() throws InterruptedException {}
+
+  @Override
+  public boolean enable() {
+    return false;
+  }
+
+  @Override
+  public boolean disable() {
+    return true;
+  }
+
+  @Override
+  public boolean isMining() {
+    return true;
+  }
+
+  @Override
+  public Wei getMinTransactionGasPrice() {
+    return miningParameters.getMinTransactionGasPrice();
+  }
+
+  @Override
+  public void setExtraData(final Bytes extraData) {
+    this.extraData.set(extraData);
+  }
+
+  @Override
+  public Optional<Address> getCoinbase() {
+    return miningParameters.getCoinbase();
+  }
+
+  @Override
+  public Optional<Block> createBlock(
+      final BlockHeader parentHeader,
+      final List<Transaction> transactions,
+      final List<BlockHeader> ommers) {
+    throw new UnsupportedOperationException("random is required");
+  }
+
+  @Override
+  public Optional<Block> createBlock(final BlockHeader parentHeader, final long timestamp) {
+    throw new UnsupportedOperationException("random is required");
+  }
+
+  @Override
+  public void changeTargetGasLimit(final Long newTargetGasLimit) {
+    if (AbstractGasLimitSpecification.isValidTargetGasLimit(newTargetGasLimit)) {
+      this.targetGasLimit.set(newTargetGasLimit);
+    } else {
+      throw new IllegalArgumentException("Specified target gas limit is invalid");
+    }
+  }
+
+  @Override
+  public PayloadIdentifier preparePayload(
+      final BlockHeader parentHeader,
+      final Long timestamp,
+      final Bytes32 prevRandao,
+      final Address feeRecipient,
+      final Optional<List<Withdrawal>> withdrawals) {
+
+    // we assume that preparePayload is always called sequentially, since the RPC Engine calls
+    // are sequential, if this assumption changes then more synchronization should be added to
+    // shared data structures
+
+    final PayloadIdentifier payloadIdentifier =
+        PayloadIdentifier.forPayloadParams(
+            parentHeader.getBlockHash(), timestamp, prevRandao, feeRecipient, withdrawals);
+
+    if (blockCreationTasks.containsKey(payloadIdentifier)) {
+      LOG.debug(
+          "Block proposal for the same payload id {} already present, nothing to do",
+          payloadIdentifier);
+      return payloadIdentifier;
+    }
+    // it's a new payloadId so...
+    cancelAnyExistingBlockCreationTasks(payloadIdentifier);
+
+    final MergeBlockCreator mergeBlockCreator =
+        this.mergeBlockCreatorFactory.forParams(parentHeader, Optional.ofNullable(feeRecipient));
+
+    blockCreationTasks.put(payloadIdentifier, new BlockCreationTask(mergeBlockCreator));
+
+    // put the empty block in first
+    final Block emptyBlock =
+        mergeBlockCreator
+            .createBlock(Optional.of(Collections.emptyList()), prevRandao, timestamp, withdrawals)
+            .getBlock();
+
+    BlockProcessingResult result = validateProposedBlock(emptyBlock);
+    if (result.isSuccessful()) {
+      mergeContext.putPayloadById(
+          payloadIdentifier, new BlockWithReceipts(emptyBlock, result.getReceipts()));
+      LOG.info(
+          "Start building proposals for block {} identified by {}",
+          emptyBlock.getHeader().getNumber(),
+          payloadIdentifier);
+    } else {
+      LOG.warn(
+          "failed to validate empty block proposal {}, reason {}",
+          emptyBlock.getHash(),
+          result.errorMessage);
+      if (result.causedBy().isPresent()) {
+        LOG.warn("caused by", result.causedBy().get());
+      }
+    }
+
+    tryToBuildBetterBlock(timestamp, prevRandao, payloadIdentifier, mergeBlockCreator, withdrawals);
+
+    return payloadIdentifier;
+  }
+
+  private void cancelAnyExistingBlockCreationTasks(final PayloadIdentifier payloadIdentifier) {
+    if (blockCreationTasks.size() > 0) {
+      String existingPayloadIdsBeingBuilt =
+          blockCreationTasks.keySet().stream()
+              .map(PayloadIdentifier::toHexString)
+              .collect(joining(","));
+      LOG.warn(
+          "New payloadId {} received so cancelling block creation tasks for the following payloadIds: {}",
+          payloadIdentifier,
+          existingPayloadIdsBeingBuilt);
+
+      blockCreationTasks.keySet().forEach(this::cleanupBlockCreationTask);
+    }
+  }
+
+  private void cleanupBlockCreationTask(final PayloadIdentifier payloadIdentifier) {
+    blockCreationTasks.computeIfPresent(
+        payloadIdentifier,
+        (pid, blockCreationTask) -> {
+          blockCreationTask.cancel();
+          return null;
+        });
+  }
+
+  @Override
+  public void finalizeProposalById(final PayloadIdentifier payloadId) {
+    LOG.debug("Finalizing block proposal for payload id {}", payloadId);
+    cleanupBlockCreationTask(payloadId);
+  }
+
+  private void tryToBuildBetterBlock(
+      final Long timestamp,
+      final Bytes32 random,
+      final PayloadIdentifier payloadIdentifier,
+      final MergeBlockCreator mergeBlockCreator,
+      final Optional<List<Withdrawal>> withdrawals) {
+
+    final Supplier<BlockCreationResult> blockCreator =
+        () -> mergeBlockCreator.createBlock(Optional.empty(), random, timestamp, withdrawals);
+
+    LOG.debug(
+        "Block creation started for payload id {}, remaining time is {}ms",
+        payloadIdentifier,
+        miningParameters.getPosBlockCreationMaxTime());
+
+    blockBuilderExecutor
+        .buildProposal(() -> retryBlockCreationUntilUseful(payloadIdentifier, blockCreator))
+        .orTimeout(miningParameters.getPosBlockCreationMaxTime(), TimeUnit.MILLISECONDS)
+        .whenComplete(
+            (unused, throwable) -> {
+              if (throwable != null) {
+                LOG.atDebug()
+                    .setMessage("Exception building block for payload id {}, reason {}")
+                    .addArgument(payloadIdentifier)
+                    .addArgument(() -> logException(throwable))
+                    .log();
+              }
+              cleanupBlockCreationTask(payloadIdentifier);
+            });
+  }
+
+  private Void retryBlockCreationUntilUseful(
+      final PayloadIdentifier payloadIdentifier, final Supplier<BlockCreationResult> blockCreator) {
+
+    long lastStartAt;
+
+    while (!isBlockCreationCancelled(payloadIdentifier)) {
+      try {
+        lastStartAt = System.currentTimeMillis();
+        recoverableBlockCreation(payloadIdentifier, blockCreator, lastStartAt);
+        final long lastDuration = System.currentTimeMillis() - lastStartAt;
+        final long waitBeforeRepetition =
+            Math.max(
+                100, miningParameters.getPosBlockCreationRepetitionMinDuration() - lastDuration);
+        LOG.debug("Waiting {}ms before repeating block creation", waitBeforeRepetition);
+        Thread.sleep(waitBeforeRepetition);
+      } catch (final CancellationException | InterruptedException ce) {
+        LOG.atDebug()
+            .setMessage("Block creation for payload id {} has been cancelled, reason {}")
+            .addArgument(payloadIdentifier)
+            .addArgument(() -> logException(ce))
+            .log();
+        return null;
+      } catch (final Throwable e) {
+        LOG.warn(
+            "Something went wrong creating block for payload id {}, error {}",
+            payloadIdentifier,
+            logException(e));
+        return null;
+      }
+    }
+    return null;
+  }
+
+  private void recoverableBlockCreation(
+      final PayloadIdentifier payloadIdentifier,
+      final Supplier<BlockCreationResult> blockCreator,
+      final long startedAt) {
+
+    try {
+      evaluateNewBlock(blockCreator.get().getBlock(), payloadIdentifier, startedAt);
+    } catch (final Throwable throwable) {
+      if (canRetryBlockCreation(throwable) && !isBlockCreationCancelled(payloadIdentifier)) {
+        LOG.atDebug()
+            .setMessage("Retrying block creation for payload id {} after recoverable error {}")
+            .addArgument(payloadIdentifier)
+            .addArgument(() -> logException(throwable))
+            .log();
+        recoverableBlockCreation(payloadIdentifier, blockCreator, startedAt);
+      } else {
+        throw throwable;
+      }
+    }
+  }
+
+  private void evaluateNewBlock(
+      final Block bestBlock, final PayloadIdentifier payloadIdentifier, final long startedAt) {
+
+    if (isBlockCreationCancelled(payloadIdentifier)) return;
+
+    final var resultBest = validateProposedBlock(bestBlock);
+    if (resultBest.isSuccessful()) {
+
+      if (isBlockCreationCancelled(payloadIdentifier)) return;
+
+      mergeContext.putPayloadById(
+          payloadIdentifier, new BlockWithReceipts(bestBlock, resultBest.getReceipts()));
+      LOG.atDebug()
+          .setMessage(
+              "Successfully built block {} for proposal identified by {}, with {} transactions, in {}ms")
+          .addArgument(bestBlock::toLogString)
+          .addArgument(payloadIdentifier)
+          .addArgument(bestBlock.getBody().getTransactions()::size)
+          .addArgument(() -> System.currentTimeMillis() - startedAt)
+          .log();
+    } else {
+      LOG.warn(
+          "Block {} built for proposal identified by {}, is not valid reason {}",
+          bestBlock.getHash(),
+          payloadIdentifier.toString(),
+          resultBest.errorMessage);
+      if (resultBest.causedBy().isPresent()) {
+        LOG.warn("caused by", resultBest.cause.get());
+      }
+    }
+  }
+
+  private boolean canRetryBlockCreation(final Throwable throwable) {
+    if (throwable instanceof StorageException) {
+      return true;
+    } else if (throwable instanceof MerkleTrieException) {
+      return true;
+    }
+    return false;
+  }
+
+  @Override
+  public Optional<BlockHeader> getOrSyncHeadByHash(final Hash headHash, final Hash finalizedHash) {
+    final var chain = protocolContext.getBlockchain();
+    final var maybeHeadHeader = chain.getBlockHeader(headHash);
+
+    if (maybeHeadHeader.isPresent()) {
+      LOG.atDebug()
+          .setMessage("BlockHeader {} is already present")
+          .addArgument(maybeHeadHeader.get()::toLogString)
+          .log();
+    } else {
+      LOG.atDebug()
+          .setMessage("Appending new head block hash {} to backward sync")
+          .addArgument(headHash::toHexString)
+          .log();
+      backwardSyncContext.maybeUpdateTargetHeight(headHash);
+      backwardSyncContext
+          .syncBackwardsUntil(headHash)
+          .thenRun(() -> updateFinalized(finalizedHash));
+    }
+    return maybeHeadHeader;
+  }
+
+  private void updateFinalized(final Hash finalizedHash) {
+    if (mergeContext
+        .getFinalized()
+        .map(BlockHeader::getHash)
+        .map(finalizedHash::equals)
+        .orElse(Boolean.FALSE)) {
+      LOG.atDebug()
+          .setMessage("Finalized block already set to {}, nothing to do")
+          .addArgument(finalizedHash)
+          .log();
+      return;
+    }
+
+    protocolContext
+        .getBlockchain()
+        .getBlockHeader(finalizedHash)
+        .ifPresentOrElse(
+            finalizedHeader -> {
+              LOG.atDebug()
+                  .setMessage("Setting finalized block header to {}")
+                  .addArgument(finalizedHeader::toLogString)
+                  .log();
+              mergeContext.setFinalized(finalizedHeader);
+            },
+            () ->
+                LOG.warn(
+                    "Internal error, backward sync completed but failed to import finalized block {}",
+                    finalizedHash));
+  }
+
+  @Override
+  public BlockProcessingResult validateBlock(final Block block) {
+    final var validationResult =
+        protocolSchedule
+            .getByBlockHeader(block.getHeader())
+            .getBlockValidator()
+            .validateAndProcessBlock(
+                protocolContext,
+                block,
+                HeaderValidationMode.FULL,
+                HeaderValidationMode.NONE,
+                false);
+
+    return validationResult;
+  }
+
+  private BlockProcessingResult validateProposedBlock(final Block block) {
+    final var validationResult =
+        protocolSchedule
+            .getByBlockHeader(block.getHeader())
+            .getBlockValidator()
+            .validateAndProcessBlock(
+                protocolContext,
+                block,
+                HeaderValidationMode.FULL,
+                HeaderValidationMode.NONE,
+                false,
+                false);
+
+    return validationResult;
+  }
+
+  @Override
+  public BlockProcessingResult rememberBlock(final Block block) {
+    LOG.atDebug().setMessage("Remember block {}").addArgument(block::toLogString).log();
+    final var chain = protocolContext.getBlockchain();
+    final var validationResult = validateBlock(block);
+    validationResult
+        .getYield()
+        .ifPresentOrElse(
+            result -> chain.storeBlock(block, result.getReceipts()),
+            () -> LOG.debug("empty yield in blockProcessingResult"));
+    return validationResult;
+  }
+
+  @Override
+  public ForkchoiceResult updateForkChoice(
+      final BlockHeader newHead, final Hash finalizedBlockHash, final Hash safeBlockHash) {
+    MutableBlockchain blockchain = protocolContext.getBlockchain();
+    final Optional<BlockHeader> newFinalized = blockchain.getBlockHeader(finalizedBlockHash);
+
+    if (newHead.getNumber() < blockchain.getChainHeadBlockNumber()
+        && isDescendantOf(newHead, blockchain.getChainHeadHeader())) {
+      LOG.atDebug()
+          .setMessage("Ignoring update to old head {}")
+          .addArgument(newHead::toLogString)
+          .log();
+      return ForkchoiceResult.withIgnoreUpdateToOldHead(newHead);
+    }
+
+    final Optional<Hash> latestValid = getLatestValidAncestor(newHead);
+
+    Optional<BlockHeader> parentOfNewHead = blockchain.getBlockHeader(newHead.getParentHash());
+    if (parentOfNewHead.isPresent()
+        && parentOfNewHead.get().getTimestamp() >= newHead.getTimestamp()) {
+      return ForkchoiceResult.withFailure(
+          INVALID, "new head timestamp not greater than parent", latestValid);
+    }
+
+    setNewHead(blockchain, newHead);
+
+    // set and persist the new finalized block if it is present
+    newFinalized.ifPresent(
+        blockHeader -> {
+          blockchain.setFinalized(blockHeader.getHash());
+          mergeContext.setFinalized(blockHeader);
+        });
+
+    blockchain
+        .getBlockHeader(safeBlockHash)
+        .ifPresent(
+            newSafeBlock -> {
+              blockchain.setSafeBlock(safeBlockHash);
+              mergeContext.setSafeBlock(newSafeBlock);
+            });
+
+    return ForkchoiceResult.withResult(newFinalized, Optional.of(newHead));
+  }
+
+  private boolean setNewHead(final MutableBlockchain blockchain, final BlockHeader newHead) {
+
+    if (newHead.getHash().equals(blockchain.getChainHeadHash())) {
+      LOG.atDebug()
+          .setMessage("Nothing to do new head {} is already chain head")
+          .addArgument(newHead::toLogString)
+          .log();
+      return true;
+    }
+
+    if (newHead.getParentHash().equals(blockchain.getChainHeadHash())) {
+      LOG.atDebug()
+          .setMessage(
+              "Forwarding chain head to the block {} saved from a previous newPayload invocation")
+          .addArgument(newHead::toLogString)
+          .log();
+
+      if (forwardWorldStateTo(newHead)) {
+        // move chain head forward:
+        return blockchain.forwardToBlock(newHead);
+      } else {
+        LOG.atDebug()
+            .setMessage("Failed to move the worldstate forward to hash {}, not moving chain head")
+            .addArgument(newHead::toLogString)
+            .log();
+        return false;
+      }
+    }
+
+    LOG.atDebug()
+        .setMessage("New head {} is a chain reorg, rewind chain head to it")
+        .addArgument(newHead::toLogString)
+        .log();
+    return blockchain.rewindToBlock(newHead.getHash());
+  }
+
+  private boolean forwardWorldStateTo(final BlockHeader newHead) {
+    Optional<MutableWorldState> newWorldState =
+        protocolContext
+            .getWorldStateArchive()
+            .getMutable(newHead.getStateRoot(), newHead.getHash());
+
+    newWorldState.ifPresentOrElse(
+        mutableWorldState ->
+            LOG.atDebug()
+                .setMessage(
+                    "World state for state root hash {} and block hash {} persisted successfully")
+                .addArgument(mutableWorldState::rootHash)
+                .addArgument(newHead::getHash)
+                .log(),
+        () ->
+            LOG.error(
+                "Could not persist world for root hash {} and block hash {}",
+                newHead.getStateRoot(),
+                newHead.getHash()));
+    return newWorldState.isPresent();
+  }
+
+  @Override
+  public boolean latestValidAncestorDescendsFromTerminal(final BlockHeader blockHeader) {
+    if (blockHeader.getNumber() <= 1L) {
+      // parent is a genesis block, check for merge-at-genesis
+      var blockchain = protocolContext.getBlockchain();
+
+      return blockchain
+          .getTotalDifficultyByHash(blockHeader.getBlockHash())
+          .map(Optional::of)
+          .orElse(blockchain.getTotalDifficultyByHash(blockHeader.getParentHash()))
+          .filter(
+              currDiff -> currDiff.greaterOrEqualThan(mergeContext.getTerminalTotalDifficulty()))
+          .isPresent();
+    }
+
+    Optional<Hash> validAncestorHash = this.getLatestValidAncestor(blockHeader);
+    if (validAncestorHash.isPresent()) {
+      final Optional<BlockHeader> maybeFinalized = mergeContext.getFinalized();
+      if (maybeFinalized.isPresent()) {
+        return isDescendantOf(maybeFinalized.get(), blockHeader);
+      } else {
+        Optional<BlockHeader> terminalBlockHeader = mergeContext.getTerminalPoWBlock();
+        if (terminalBlockHeader.isPresent()) {
+          return isDescendantOf(terminalBlockHeader.get(), blockHeader);
+        } else {
+          if (isTerminalProofOfWorkBlock(blockHeader, protocolContext)
+              || ancestorIsValidTerminalProofOfWork(blockHeader)) {
+            return true;
+          } else {
+            LOG.warn("Couldn't find terminal block, no blocks will be valid");
+            return false;
+          }
+        }
+      }
+    } else {
+      return false;
+    }
+  }
+
+  /**
+   * Ancestor is valid terminal proof of work boolean.
+   *
+   * @param blockheader the blockheader
+   * @return the boolean
+   */
+  // package visibility for testing
+  boolean ancestorIsValidTerminalProofOfWork(final BlockHeader blockheader) {
+    // this should only happen very close to the transition from PoW to PoS, prior to a finalized
+    // block.  For example, after a full sync of an already-merged chain which does not have
+    // terminal block info in the genesis config.
+
+    // check a 'cached' block which was determined to descend from terminal to short circuit
+    // in the case of a long period of non-finality
+    if (Optional.ofNullable(latestDescendsFromTerminal.get())
+        .map(latestDescendant -> isDescendantOf(latestDescendant, blockheader))
+        .orElse(Boolean.FALSE)) {
+      latestDescendsFromTerminal.set(blockheader);
+      return true;
+    }
+
+    var blockchain = protocolContext.getBlockchain();
+    Optional<BlockHeader> parent = blockchain.getBlockHeader(blockheader.getParentHash());
+    do {
+      LOG.debug(
+          "checking ancestor {} is valid terminal PoW for {}",
+          parent.map(BlockHeader::toLogString).orElse("empty"),
+          blockheader.toLogString());
+
+      if (parent.isPresent()) {
+        if (!parent.get().getDifficulty().equals(Difficulty.ZERO)) {
+          break;
+        }
+        parent = blockchain.getBlockHeader(parent.get().getParentHash());
+      }
+
+    } while (parent.isPresent());
+
+    boolean resp =
+        parent.filter(header -> isTerminalProofOfWorkBlock(header, protocolContext)).isPresent();
+    LOG.debug(
+        "checking ancestor {} is valid terminal PoW for {}\n {}",
+        parent.map(BlockHeader::toLogString).orElse("empty"),
+        blockheader.toLogString(),
+        resp);
+    if (resp) {
+      latestDescendsFromTerminal.set(blockheader);
+    }
+    return resp;
+  }
+
+  @Override
+  public Optional<Hash> getLatestValidAncestor(final Hash blockHash) {
+    final var chain = protocolContext.getBlockchain();
+    final var chainHeadHeader = chain.getChainHeadHeader();
+    return findValidAncestor(
+        chain, blockHash, protocolSchedule.getByBlockHeader(chainHeadHeader).getBadBlocksManager());
+  }
+
+  @Override
+  public Optional<Hash> getLatestValidAncestor(final BlockHeader blockHeader) {
+    final var chain = protocolContext.getBlockchain();
+    final var self = chain.getBlockHeader(blockHeader.getHash());
+
+    if (self.isEmpty()) {
+      final var badBlocks = protocolSchedule.getByBlockHeader(blockHeader).getBadBlocksManager();
+      return findValidAncestor(chain, blockHeader.getParentHash(), badBlocks);
+    }
+    return self.map(BlockHeader::getHash);
+  }
+
+  @Override
+  public boolean isBackwardSyncing() {
+    return backwardSyncContext.isSyncing();
+  }
+
+  @Override
+  public CompletableFuture<Void> appendNewPayloadToSync(final Block newPayload) {
+    return backwardSyncContext.syncBackwardsUntil(newPayload);
+  }
+
+  @Override
+  public boolean isMiningBeforeMerge() {
+    return miningParameters.isMiningEnabled();
+  }
+
+  private Optional<Hash> findValidAncestor(
+      final Blockchain chain, final Hash parentHash, final BadBlockManager badBlocks) {
+
+    // check chain first
+    return chain
+        .getBlockHeader(parentHash)
+        .map(
+            header -> {
+              // if block is PoW, return ZERO hash
+              if (header.getDifficulty().greaterThan(Difficulty.ZERO)) {
+                return Hash.ZERO;
+              } else {
+                return header.getHash();
+              }
+            })
+        .map(Optional::of)
+        .orElseGet(
+            () ->
+                badBlocks
+                    .getBadBlock(parentHash)
+                    .map(
+                        badParent ->
+                            findValidAncestor(
+                                chain, badParent.getHeader().getParentHash(), badBlocks))
+                    .orElse(Optional.empty()));
+  }
+
+  @Override
+  public boolean isDescendantOf(final BlockHeader ancestorBlock, final BlockHeader newBlock) {
+    LOG.atDebug()
+        .setMessage("checking if block {} is ancestor of {}")
+        .addArgument(ancestorBlock::toLogString)
+        .addArgument(newBlock::toLogString)
+        .log();
+
+    // start with self, because descending from yourself is valid
+    Optional<BlockHeader> parentOf = Optional.of(newBlock);
+
+    while (parentOf.isPresent()
+        && !parentOf.get().getBlockHash().equals(ancestorBlock.getBlockHash())
+        && parentOf.get().getNumber()
+            >= ancestorBlock.getNumber()) { // if on a fork, don't go further back than ancestor
+      parentOf = protocolContext.getBlockchain().getBlockHeader(parentOf.get().getParentHash());
+    }
+
+    if (parentOf.isPresent()
+        && ancestorBlock.getBlockHash().equals(parentOf.get().getBlockHash())) {
+      return true;
+    } else {
+      LOG.atDebug()
+          .setMessage("looped all the way back, did not find ancestor {} of child {}")
+          .addArgument(ancestorBlock::toLogString)
+          .addArgument(newBlock::toLogString)
+          .log();
+      return false;
+    }
+  }
+
+  @Override
+  public void onBadChain(
+      final Block badBlock,
+      final List<Block> badBlockDescendants,
+      final List<BlockHeader> badBlockHeaderDescendants) {
+    LOG.trace("Adding bad block {} and all its descendants", badBlock.getHash());
+    final BadBlockManager badBlockManager = getBadBlockManager();
+
+    final Optional<BlockHeader> parentHeader =
+        protocolContext.getBlockchain().getBlockHeader(badBlock.getHeader().getParentHash());
+    final Optional<Hash> maybeLatestValidHash =
+        parentHeader.isPresent() && isPoSHeader(parentHeader.get())
+            ? Optional.of(parentHeader.get().getHash())
+            : Optional.empty();
+
+    badBlockManager.addBadBlock(badBlock, Optional.empty());
+
+    badBlockDescendants.forEach(
+        block -> {
+          LOG.trace("Add descendant block {} to bad blocks", block.getHash());
+          badBlockManager.addBadBlock(block, Optional.empty());
+          maybeLatestValidHash.ifPresent(
+              latestValidHash ->
+                  badBlockManager.addLatestValidHash(block.getHash(), latestValidHash));
+        });
+
+    badBlockHeaderDescendants.forEach(
+        header -> {
+          LOG.trace("Add descendant header {} to bad blocks", header.getHash());
+          badBlockManager.addBadHeader(header);
+          maybeLatestValidHash.ifPresent(
+              latestValidHash ->
+                  badBlockManager.addLatestValidHash(header.getHash(), latestValidHash));
+        });
+  }
+
+  /** The interface Merge block creator factory. */
+  @FunctionalInterface
+  protected interface MergeBlockCreatorFactory {
+    /**
+     * Create merge block creator for block header and fee recipient.
+     *
+     * @param header the header
+     * @param feeRecipient the fee recipient
+     * @return the merge block creator
+     */
+    MergeBlockCreator forParams(BlockHeader header, Optional<Address> feeRecipient);
+  }
+
+  @Override
+  public void addBadBlock(final Block block, final Optional<Throwable> maybeCause) {
+    protocolSchedule
+        .getByBlockHeader(protocolContext.getBlockchain().getChainHeadHeader())
+        .getBadBlocksManager()
+        .addBadBlock(block, maybeCause);
+  }
+
+  @Override
+  public boolean isBadBlock(final Hash blockHash) {
+    final BadBlockManager badBlocksManager = getBadBlockManager();
+    return badBlocksManager.getBadBlock(blockHash).isPresent()
+        || badBlocksManager.getBadHash(blockHash).isPresent();
+  }
+
+  private BadBlockManager getBadBlockManager() {
+    final BadBlockManager badBlocksManager =
+        protocolSchedule
+            .getByBlockHeader(protocolContext.getBlockchain().getChainHeadHeader())
+            .getBadBlocksManager();
+    return badBlocksManager;
+  }
+
+  @Override
+  public Optional<Hash> getLatestValidHashOfBadBlock(Hash blockHash) {
+    return protocolSchedule
+        .getByBlockHeader(protocolContext.getBlockchain().getChainHeadHeader())
+        .getBadBlocksManager()
+        .getLatestValidHash(blockHash);
+  }
+
+  private boolean isPoSHeader(final BlockHeader header) {
+    return header.getDifficulty().equals(Difficulty.ZERO);
+  }
+
+  private String logException(final Throwable throwable) {
+    final StringWriter sw = new StringWriter();
+    final PrintWriter pw = new PrintWriter(sw);
+    throwable.printStackTrace(pw);
+    pw.flush();
+    return sw.toString();
+  }
+
+  @VisibleForTesting
+  boolean isBlockCreationCancelled(final PayloadIdentifier payloadId) {
+    final BlockCreationTask job = blockCreationTasks.get(payloadId);
+    if (job == null) {
+      return true;
+    }
+    return job.cancelled.get();
+  }
+
+  private static class BlockCreationTask {
+    /** The Block creator. */
+    final MergeBlockCreator blockCreator;
+    /** The Cancelled. */
+    final AtomicBoolean cancelled;
+
+    /**
+     * Instantiates a new Block creation task.
+     *
+     * @param blockCreator the block creator
+     */
+    public BlockCreationTask(final MergeBlockCreator blockCreator) {
+      this.blockCreator = blockCreator;
+      this.cancelled = new AtomicBoolean(false);
+    }
+
+    /** Cancel. */
+    public void cancel() {
+      cancelled.set(true);
+      blockCreator.cancel();
+    }
+  }
+
+  /** The interface Proposal builder executor. */
+  public interface ProposalBuilderExecutor {
+    /**
+     * Build proposal and return completable future.
+     *
+     * @param task the task
+     * @return the completable future
+     */
+    CompletableFuture<Void> buildProposal(final Runnable task);
+  }
+}
diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeMiningCoordinator.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeMiningCoordinator.java
new file mode 100644
index 00000000000..303a32752b9
--- /dev/null
+++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeMiningCoordinator.java
@@ -0,0 +1,312 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge.blockcreation;
+
+import static org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator.ForkchoiceResult.Status.IGNORE_UPDATE_TO_OLD_HEAD;
+import static org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator.ForkchoiceResult.Status.VALID;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.BlockProcessingResult;
+import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import org.apache.tuweni.bytes.Bytes32;
+
+/** The interface Merge mining coordinator. */
+public interface MergeMiningCoordinator extends MiningCoordinator {
+  /**
+   * Prepare payload identifier.
+   *
+   * @param parentHeader the parent header
+   * @param timestamp the timestamp
+   * @param prevRandao the prev randao
+   * @param feeRecipient the fee recipient
+   * @param withdrawals the optional list of withdrawals
+   * @return the payload identifier
+   */
+  PayloadIdentifier preparePayload(
+      final BlockHeader parentHeader,
+      final Long timestamp,
+      final Bytes32 prevRandao,
+      final Address feeRecipient,
+      final Optional<List<Withdrawal>> withdrawals);
+
+  @Override
+  default boolean isCompatibleWithEngineApi() {
+    return true;
+  }
+
+  /**
+   * Remember block.
+   *
+   * @param block the block
+   * @return the block processing result
+   */
+  BlockProcessingResult rememberBlock(final Block block);
+
+  /**
+   * Validate block.
+   *
+   * @param block the block
+   * @return the block processing result
+   */
+  BlockProcessingResult validateBlock(final Block block);
+
+  /**
+   * Update fork choice.
+   *
+   * @param newHead the new head
+   * @param finalizedBlockHash the finalized block hash
+   * @param safeBlockHash the safe block hash
+   * @return the forkchoice result
+   */
+  ForkchoiceResult updateForkChoice(
+      final BlockHeader newHead, final Hash finalizedBlockHash, final Hash safeBlockHash);
+
+  /**
+   * Gets latest valid ancestor.
+   *
+   * @param blockHash the block hash
+   * @return the latest valid ancestor
+   */
+  Optional<Hash> getLatestValidAncestor(Hash blockHash);
+
+  /**
+   * Gets latest valid ancestor.
+   *
+   * @param blockheader the blockheader
+   * @return the latest valid ancestor
+   */
+  Optional<Hash> getLatestValidAncestor(BlockHeader blockheader);
+
+  /**
+   * Check if latest valid ancestor descends from terminal.
+   *
+   * @param blockHeader the block header
+   * @return the boolean
+   */
+  boolean latestValidAncestorDescendsFromTerminal(final BlockHeader blockHeader);
+
+  /**
+   * Is descendant of.
+   *
+   * @param ancestorBlock the ancestor block
+   * @param newBlock the new block
+   * @return the boolean
+   */
+  boolean isDescendantOf(final BlockHeader ancestorBlock, final BlockHeader newBlock);
+
+  /**
+   * Is backward syncing.
+   *
+   * @return the boolean
+   */
+  boolean isBackwardSyncing();
+
+  /**
+   * Append new payload to sync.
+   *
+   * @param newPayload the new payload
+   * @return the completable future
+   */
+  CompletableFuture<Void> appendNewPayloadToSync(Block newPayload);
+
+  /**
+   * Gets or sync head by hash.
+   *
+   * @param headHash the head hash
+   * @param finalizedHash the finalized hash
+   * @return the or sync head by hash
+   */
+  Optional<BlockHeader> getOrSyncHeadByHash(Hash headHash, Hash finalizedHash);
+
+  /**
+   * Is mining before merge enabled.
+   *
+   * @return the boolean
+   */
+  boolean isMiningBeforeMerge();
+
+  /**
+   * Add bad block.
+   *
+   * @param block the block
+   * @param maybeCause the maybe cause
+   */
+  void addBadBlock(final Block block, Optional<Throwable> maybeCause);
+
+  /**
+   * Is bad block.
+   *
+   * @param blockHash the block hash
+   * @return the boolean
+   */
+  boolean isBadBlock(Hash blockHash);
+
+  /**
+   * Gets latest valid hash of bad block.
+   *
+   * @param blockHash the block hash
+   * @return the latest valid hash of bad block
+   */
+  Optional<Hash> getLatestValidHashOfBadBlock(final Hash blockHash);
+
+  /**
+   * Finalize proposal by id.
+   *
+   * @param payloadId the payload id
+   */
+  void finalizeProposalById(final PayloadIdentifier payloadId);
+
+  /** The type Forkchoice result. */
+  class ForkchoiceResult {
+    /** The enum Status. */
+    public enum Status {
+      /** Valid status. */
+      VALID,
+      /** Invalid status. */
+      INVALID,
+      /** Invalid payload attributes status. */
+      INVALID_PAYLOAD_ATTRIBUTES,
+      /** Ignore update to old head status. */
+      IGNORE_UPDATE_TO_OLD_HEAD
+    }
+
+    private final Status status;
+    private final Optional<String> errorMessage;
+    private final Optional<BlockHeader> newFinalized;
+    private final Optional<BlockHeader> newHead;
+    private final Optional<Hash> latestValid;
+
+    private ForkchoiceResult(
+        final Status status,
+        final Optional<String> errorMessage,
+        final Optional<BlockHeader> newFinalized,
+        final Optional<BlockHeader> newHead,
+        final Optional<Hash> latestValid) {
+      this.status = status;
+      this.errorMessage = errorMessage;
+      this.newFinalized = newFinalized;
+      this.newHead = newHead;
+      this.latestValid = latestValid;
+    }
+
+    /**
+     * Create forkchoice result with failure.
+     *
+     * @param status the status
+     * @param errorMessage the error message
+     * @param latestValid the latest valid
+     * @return the forkchoice result
+     */
+    public static ForkchoiceResult withFailure(
+        final Status status, final String errorMessage, final Optional<Hash> latestValid) {
+      return new ForkchoiceResult(
+          status,
+          Optional.ofNullable(errorMessage),
+          Optional.empty(),
+          Optional.empty(),
+          latestValid);
+    }
+
+    /**
+     * Create forkchoice result with ignore update to old head.
+     *
+     * @param oldHead the old head
+     * @return the forkchoice result
+     */
+    public static ForkchoiceResult withIgnoreUpdateToOldHead(final BlockHeader oldHead) {
+      return new ForkchoiceResult(
+          IGNORE_UPDATE_TO_OLD_HEAD,
+          Optional.empty(),
+          Optional.empty(),
+          Optional.empty(),
+          Optional.of(oldHead.getHash()));
+    }
+
+    /**
+     * Create forkchoice result with result.
+     *
+     * @param newFinalized the new finalized
+     * @param newHead the new head
+     * @return the forkchoice result
+     */
+    public static ForkchoiceResult withResult(
+        final Optional<BlockHeader> newFinalized, final Optional<BlockHeader> newHead) {
+      return new ForkchoiceResult(VALID, Optional.empty(), newFinalized, newHead, Optional.empty());
+    }
+
+    /**
+     * Gets status.
+     *
+     * @return the status
+     */
+    public Status getStatus() {
+      return status;
+    }
+
+    /**
+     * Gets error message.
+     *
+     * @return the error message
+     */
+    public Optional<String> getErrorMessage() {
+      return errorMessage;
+    }
+
+    /**
+     * Gets new finalized.
+     *
+     * @return the new finalized
+     */
+    public Optional<BlockHeader> getNewFinalized() {
+      return newFinalized;
+    }
+
+    /**
+     * Gets new head.
+     *
+     * @return the new head
+     */
+    public Optional<BlockHeader> getNewHead() {
+      return newHead;
+    }
+
+    /**
+     * Gets latest valid.
+     *
+     * @return the latest valid
+     */
+    public Optional<Hash> getLatestValid() {
+      return latestValid;
+    }
+
+    /**
+     * Is valid.
+     *
+     * @return the boolean
+     */
+    public boolean shouldNotProceedToPayloadBuildProcess() {
+      return status != VALID;
+    }
+  }
+}
diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/PayloadIdentifier.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/PayloadIdentifier.java
new file mode 100644
index 00000000000..6c946ba2ee2
--- /dev/null
+++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/PayloadIdentifier.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge.blockcreation;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Quantity;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+
+import java.math.BigInteger;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt64;
+
+/** The Payload identifier. */
+public class PayloadIdentifier implements Quantity {
+
+  private final UInt64 val;
+
+  /**
+   * Instantiates a new Payload identifier.
+   *
+   * @param payloadId the payload id
+   */
+  @JsonCreator
+  public PayloadIdentifier(final String payloadId) {
+    this(Long.decode(payloadId));
+  }
+
+  /**
+   * Instantiates a new Payload identifier.
+   *
+   * @param payloadId the payload id
+   */
+  public PayloadIdentifier(final Long payloadId) {
+    this.val = UInt64.valueOf(Math.abs(payloadId));
+  }
+
+  /**
+   * Create payload identifier for payload params. This is a deterministic hash of all payload
+   * parameters that aims to avoid collisions
+   *
+   * @param parentHash the parent hash
+   * @param timestamp the timestamp
+   * @param prevRandao the prev randao
+   * @param feeRecipient the fee recipient
+   * @param withdrawals the withdrawals
+   * @return the payload identifier
+   */
+  public static PayloadIdentifier forPayloadParams(
+      final Hash parentHash,
+      final Long timestamp,
+      final Bytes32 prevRandao,
+      final Address feeRecipient,
+      final Optional<List<Withdrawal>> withdrawals) {
+
+    return new PayloadIdentifier(
+        timestamp
+            ^ ((long) parentHash.toHexString().hashCode()) << 8
+            ^ ((long) prevRandao.toHexString().hashCode()) << 16
+            ^ ((long) feeRecipient.toHexString().hashCode()) << 24
+            ^ (long)
+                withdrawals
+                    .map(
+                        ws ->
+                            ws.stream()
+                                .sorted(Comparator.comparing(Withdrawal::getIndex))
+                                .map(Withdrawal::hashCode)
+                                .reduce(1, (a, b) -> a ^ (b * 31)))
+                    .orElse(0));
+  }
+
+  @Override
+  public Number getValue() {
+    return getAsBigInteger();
+  }
+
+  @Override
+  public BigInteger getAsBigInteger() {
+    return val.toBigInteger();
+  }
+
+  @Override
+  public String toHexString() {
+    return val.toHexString();
+  }
+
+  @Override
+  public String toShortHexString() {
+    var shortHex = val.toShortHexString();
+    if (shortHex.length() % 2 != 0) {
+      shortHex = "0x0" + shortHex.substring(2);
+    }
+    return shortHex;
+  }
+
+  /**
+   * Serialize to hex string.
+   *
+   * @return the string
+   */
+  @JsonValue
+  public String serialize() {
+    return toShortHexString();
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (o instanceof PayloadIdentifier) {
+      return getAsBigInteger().equals(((PayloadIdentifier) o).getAsBigInteger());
+    }
+    return false;
+  }
+
+  @Override
+  public int hashCode() {
+    return val.hashCode();
+  }
+
+  @Override
+  public String toString() {
+    return toHexString();
+  }
+}
diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/TransitionCoordinator.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/TransitionCoordinator.java
new file mode 100644
index 00000000000..fe5bdfbe9ac
--- /dev/null
+++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/TransitionCoordinator.java
@@ -0,0 +1,231 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge.blockcreation;
+
+import org.hyperledger.besu.consensus.merge.PostMergeContext;
+import org.hyperledger.besu.consensus.merge.TransitionUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.BlockProcessingResult;
+import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
+import org.hyperledger.besu.ethereum.chain.PoWObserver;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+/** The Transition coordinator. */
+public class TransitionCoordinator extends TransitionUtils<MiningCoordinator>
+    implements MergeMiningCoordinator {
+
+  private final MiningCoordinator miningCoordinator;
+  private final MergeMiningCoordinator mergeCoordinator;
+
+  /**
+   * Instantiates a new Transition coordinator.
+   *
+   * @param miningCoordinator the mining coordinator
+   * @param mergeCoordinator the merge coordinator
+   */
+  public TransitionCoordinator(
+      final MiningCoordinator miningCoordinator, final MiningCoordinator mergeCoordinator) {
+    super(miningCoordinator, mergeCoordinator, PostMergeContext.get());
+    this.miningCoordinator = miningCoordinator;
+    this.mergeCoordinator = (MergeMiningCoordinator) mergeCoordinator;
+  }
+
+  /**
+   * Gets merge coordinator.
+   *
+   * @return the merge coordinator
+   */
+  public MergeMiningCoordinator getMergeCoordinator() {
+    return mergeCoordinator;
+  }
+
+  @Override
+  public void start() {
+    if (isMiningBeforeMerge()) {
+      miningCoordinator.start();
+    }
+  }
+
+  @Override
+  public void stop() {
+    miningCoordinator.stop();
+  }
+
+  @Override
+  public void awaitStop() throws InterruptedException {
+    miningCoordinator.awaitStop();
+  }
+
+  @Override
+  public boolean enable() {
+    return dispatchFunctionAccordingToMergeState(MiningCoordinator::enable);
+  }
+
+  @Override
+  public boolean disable() {
+    return dispatchFunctionAccordingToMergeState(MiningCoordinator::disable);
+  }
+
+  @Override
+  public boolean isMining() {
+    return dispatchFunctionAccordingToMergeState(MiningCoordinator::isMining);
+  }
+
+  @Override
+  public Wei getMinTransactionGasPrice() {
+    return dispatchFunctionAccordingToMergeState(MiningCoordinator::getMinTransactionGasPrice);
+  }
+
+  @Override
+  public void setExtraData(final Bytes extraData) {
+    miningCoordinator.setExtraData(extraData);
+    mergeCoordinator.setExtraData(extraData);
+  }
+
+  @Override
+  public Optional<Address> getCoinbase() {
+    return dispatchFunctionAccordingToMergeState(MiningCoordinator::getCoinbase);
+  }
+
+  @Override
+  public Optional<Block> createBlock(
+      final BlockHeader parentHeader,
+      final List<Transaction> transactions,
+      final List<BlockHeader> ommers) {
+    return dispatchFunctionAccordingToMergeState(
+        (MiningCoordinator coordinator) ->
+            miningCoordinator.createBlock(parentHeader, transactions, ommers));
+  }
+
+  @Override
+  public Optional<Block> createBlock(final BlockHeader parentHeader, final long timestamp) {
+    return dispatchFunctionAccordingToMergeState(
+        (MiningCoordinator coordinator) -> coordinator.createBlock(parentHeader, timestamp));
+  }
+
+  @Override
+  public void addEthHashObserver(final PoWObserver observer) {
+    if (this.miningCoordinator instanceof PoWMiningCoordinator) {
+      miningCoordinator.addEthHashObserver(observer);
+    }
+  }
+
+  @Override
+  public void changeTargetGasLimit(final Long targetGasLimit) {
+    miningCoordinator.changeTargetGasLimit(targetGasLimit);
+    mergeCoordinator.changeTargetGasLimit(targetGasLimit);
+  }
+
+  @Override
+  public PayloadIdentifier preparePayload(
+      final BlockHeader parentHeader,
+      final Long timestamp,
+      final Bytes32 prevRandao,
+      final Address feeRecipient,
+      final Optional<List<Withdrawal>> withdrawals) {
+    return mergeCoordinator.preparePayload(
+        parentHeader, timestamp, prevRandao, feeRecipient, withdrawals);
+  }
+
+  @Override
+  public BlockProcessingResult rememberBlock(final Block block) {
+    return mergeCoordinator.rememberBlock(block);
+  }
+
+  @Override
+  public BlockProcessingResult validateBlock(final Block block) {
+    return mergeCoordinator.validateBlock(block);
+  }
+
+  @Override
+  public ForkchoiceResult updateForkChoice(
+      final BlockHeader newHead, final Hash finalizedBlockHash, final Hash safeBlockHash) {
+    return mergeCoordinator.updateForkChoice(newHead, finalizedBlockHash, safeBlockHash);
+  }
+
+  @Override
+  public Optional<Hash> getLatestValidAncestor(final Hash blockHash) {
+    return mergeCoordinator.getLatestValidAncestor(blockHash);
+  }
+
+  @Override
+  public Optional<Hash> getLatestValidAncestor(final BlockHeader blockHeader) {
+    return mergeCoordinator.getLatestValidAncestor(blockHeader);
+  }
+
+  @Override
+  public boolean latestValidAncestorDescendsFromTerminal(final BlockHeader blockHeader) {
+    // this is nonsensical pre-merge, but should be fine to delegate
+    return mergeCoordinator.latestValidAncestorDescendsFromTerminal(blockHeader);
+  }
+
+  @Override
+  public boolean isBackwardSyncing() {
+    return mergeCoordinator.isBackwardSyncing();
+  }
+
+  @Override
+  public CompletableFuture<Void> appendNewPayloadToSync(final Block newPayload) {
+    return mergeCoordinator.appendNewPayloadToSync(newPayload);
+  }
+
+  @Override
+  public Optional<BlockHeader> getOrSyncHeadByHash(final Hash headHash, final Hash finalizedHash) {
+    return mergeCoordinator.getOrSyncHeadByHash(headHash, finalizedHash);
+  }
+
+  @Override
+  public boolean isMiningBeforeMerge() {
+    return mergeCoordinator.isMiningBeforeMerge();
+  }
+
+  @Override
+  public boolean isDescendantOf(final BlockHeader ancestorBlock, final BlockHeader newBlock) {
+    return mergeCoordinator.isDescendantOf(ancestorBlock, newBlock);
+  }
+
+  @Override
+  public void addBadBlock(final Block block, final Optional<Throwable> maybeCause) {
+    mergeCoordinator.addBadBlock(block, maybeCause);
+  }
+
+  @Override
+  public boolean isBadBlock(final Hash blockHash) {
+    return mergeCoordinator.isBadBlock(blockHash);
+  }
+
+  @Override
+  public Optional<Hash> getLatestValidHashOfBadBlock(final Hash blockHash) {
+    return mergeCoordinator.getLatestValidHashOfBadBlock(blockHash);
+  }
+
+  @Override
+  public void finalizeProposalById(final PayloadIdentifier payloadId) {
+    mergeCoordinator.finalizeProposalById(payloadId);
+  }
+}
diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/headervalidationrules/ConstantOmmersHashRule.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/headervalidationrules/ConstantOmmersHashRule.java
new file mode 100644
index 00000000000..5656c8b3624
--- /dev/null
+++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/headervalidationrules/ConstantOmmersHashRule.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.merge.headervalidationrules;
+
+import org.hyperledger.besu.consensus.merge.MergeContext;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule;
+
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Constant ommers hash rule. */
+public class ConstantOmmersHashRule implements AttachedBlockHeaderValidationRule {
+
+  private static final Hash mergeConstant = Hash.EMPTY_LIST_HASH;
+
+  private static final Logger LOG = LoggerFactory.getLogger(ConstantOmmersHashRule.class);
+
+  @Override
+  public boolean validate(
+      final BlockHeader header, final BlockHeader parent, final ProtocolContext protocolContext) {
+    Optional<Difficulty> totalDifficulty =
+        protocolContext.getBlockchain().getTotalDifficultyByHash(header.getParentHash());
+    if (totalDifficulty.isEmpty()) {
+      LOG.warn("unable to get total difficulty, parent {} not found", header.getParentHash());
+      return false;
+    }
+    if (totalDifficulty
+        .get()
+        .greaterOrEqualThan(
+            protocolContext.getConsensusContext(MergeContext.class).getTerminalTotalDifficulty())) {
+      return header.getOmmersHash().equals(mergeConstant);
+    } else {
+      return true;
+    }
+  }
+
+  @Override
+  public boolean includeInLightValidation() {
+    return AttachedBlockHeaderValidationRule.super.includeInLightValidation();
+  }
+}
diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/headervalidationrules/IncrementalTimestampRule.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/headervalidationrules/IncrementalTimestampRule.java
new file mode 100644
index 00000000000..fb80cae4fd5
--- /dev/null
+++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/headervalidationrules/IncrementalTimestampRule.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.merge.headervalidationrules;
+
+import static org.hyperledger.besu.consensus.merge.TransitionUtils.isTerminalProofOfWorkBlock;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Incremental timestamp rule. */
+public class IncrementalTimestampRule extends MergeConsensusRule {
+
+  private static final Logger LOG = LoggerFactory.getLogger(IncrementalTimestampRule.class);
+
+  @Override
+  public boolean validate(
+      final BlockHeader header, final BlockHeader parent, final ProtocolContext protocolContext) {
+
+    if (super.shouldUsePostMergeRules(header, protocolContext)
+        && !isTerminalProofOfWorkBlock(header, protocolContext)) {
+      final long blockTimestamp = header.getTimestamp();
+      final long parentTimestamp = parent.getTimestamp();
+      final boolean isMoreRecent = blockTimestamp > parentTimestamp;
+
+      LOG.trace(
+          "Is block timestamp more recent that its parent? {}, [block timestamp {}, parent timestamp {}]",
+          isMoreRecent,
+          blockTimestamp,
+          parentTimestamp);
+
+      return isMoreRecent;
+    } else {
+      return true;
+    }
+  }
+}
diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/headervalidationrules/MergeConsensusRule.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/headervalidationrules/MergeConsensusRule.java
new file mode 100644
index 00000000000..3f968c46185
--- /dev/null
+++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/headervalidationrules/MergeConsensusRule.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge.headervalidationrules;
+
+import static org.hyperledger.besu.consensus.merge.TransitionUtils.isTerminalProofOfWorkBlock;
+
+import org.hyperledger.besu.consensus.merge.MergeContext;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule;
+
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Merge consensus rule. */
+public abstract class MergeConsensusRule implements AttachedBlockHeaderValidationRule {
+  private static final Logger LOG = LoggerFactory.getLogger(MergeConsensusRule.class);
+
+  /**
+   * Should use post merge rules.
+   *
+   * @param header the header
+   * @param context the context
+   * @return the boolean
+   */
+  // TODO: post-merge cleanup
+  protected boolean shouldUsePostMergeRules(
+      final BlockHeader header, final ProtocolContext context) {
+    if (context.getConsensusContext(MergeContext.class).getFinalized().isPresent()) {
+      // if anything has been finalized, we are now using PoS block validation rules forevermore
+      return true;
+    }
+
+    Optional<Difficulty> parentChainTotalDifficulty =
+        context.getBlockchain().getTotalDifficultyByHash(header.getParentHash());
+    Difficulty configuredTotalTerminalDifficulty =
+        context.getConsensusContext(MergeContext.class).getTerminalTotalDifficulty();
+
+    if (parentChainTotalDifficulty.isEmpty()) {
+      LOG.warn("unable to get total difficulty, parent {} not found", header.getParentHash());
+      return false;
+    }
+
+    if (isTerminalProofOfWorkBlock(header, context)) {
+      // ttd block looks like proof of stake, but is the last proof of work
+      return false;
+    }
+
+    if (parentChainTotalDifficulty
+        .get()
+        .add(header.getDifficulty() == null ? Difficulty.ZERO : header.getDifficulty())
+        .greaterOrEqualThan(configuredTotalTerminalDifficulty)) {
+      return true;
+    } else { // still PoWing
+      return false;
+    }
+  }
+}
diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/headervalidationrules/NoDifficultyRule.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/headervalidationrules/NoDifficultyRule.java
new file mode 100644
index 00000000000..7318472e39c
--- /dev/null
+++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/headervalidationrules/NoDifficultyRule.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.merge.headervalidationrules;
+
+import static org.hyperledger.besu.consensus.merge.TransitionUtils.isTerminalProofOfWorkBlock;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The No difficulty rule. */
+public class NoDifficultyRule extends MergeConsensusRule {
+
+  private static final Logger LOG = LoggerFactory.getLogger(NoDifficultyRule.class);
+
+  @Override
+  public boolean validate(
+      final BlockHeader header, final BlockHeader parent, final ProtocolContext protocolContext) {
+    Optional<Difficulty> totalDifficulty =
+        protocolContext.getBlockchain().getTotalDifficultyByHash(header.getParentHash());
+    if (totalDifficulty.isEmpty()) {
+      LOG.warn("unable to get total difficulty, parent {} not found", header.getParentHash());
+      return false;
+    }
+    if (super.shouldUsePostMergeRules(header, protocolContext)
+        && !isTerminalProofOfWorkBlock(header, protocolContext)) {
+      return (header.getDifficulty() == null || header.getDifficulty().equals(Difficulty.ZERO));
+    } else {
+      return true;
+    }
+  }
+}
diff --git a/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/headervalidationrules/NoNonceRule.java b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/headervalidationrules/NoNonceRule.java
new file mode 100644
index 00000000000..bfe7fffb0b5
--- /dev/null
+++ b/consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/headervalidationrules/NoNonceRule.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.merge.headervalidationrules;
+
+import static org.hyperledger.besu.consensus.merge.TransitionUtils.isTerminalProofOfWorkBlock;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The No nonce rule. */
+public class NoNonceRule extends MergeConsensusRule {
+
+  private static final Logger LOG = LoggerFactory.getLogger(NoNonceRule.class);
+
+  @Override
+  public boolean validate(
+      final BlockHeader header, final BlockHeader parent, final ProtocolContext protocolContext) {
+    Optional<Difficulty> totalDifficulty =
+        protocolContext.getBlockchain().getTotalDifficultyByHash(header.getParentHash());
+    if (totalDifficulty.isEmpty()) {
+      LOG.warn("unable to get total difficulty, parent {} not found", header.getParentHash());
+      return false;
+    }
+    if (super.shouldUsePostMergeRules(header, protocolContext)
+        && !isTerminalProofOfWorkBlock(header, protocolContext)) { // past TDD, invalid if has nonce
+      return header.getNonce() == 0L;
+    } else {
+      return true;
+    }
+  }
+}
diff --git a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/MergeProtocolScheduleTest.java b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/MergeProtocolScheduleTest.java
new file mode 100644
index 00000000000..e81f13ba1b4
--- /dev/null
+++ b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/MergeProtocolScheduleTest.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockProcessor;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.evm.operation.InvalidOperation;
+import org.hyperledger.besu.evm.operation.PrevRanDaoOperation;
+import org.hyperledger.besu.evm.operation.Push0Operation;
+
+import java.math.BigInteger;
+
+import org.junit.jupiter.api.Test;
+
+public class MergeProtocolScheduleTest {
+
+  @Test
+  public void protocolSpecsAreCreatedAtBlockDefinedInJson() {
+    final String jsonInput =
+        "{\"config\": "
+            + "{\"chainId\": 1,\n"
+            + "\"homesteadBlock\": 1,\n"
+            + "\"LondonBlock\": 1559}"
+            + "}";
+
+    final GenesisConfigOptions config = GenesisConfigFile.fromConfig(jsonInput).getConfigOptions();
+    final ProtocolSchedule protocolSchedule = MergeProtocolSchedule.create(config, false);
+
+    final ProtocolSpec homesteadSpec = protocolSchedule.getByBlockHeader(blockHeader(1));
+    final ProtocolSpec londonSpec = protocolSchedule.getByBlockHeader(blockHeader(1559));
+
+    assertThat(homesteadSpec).isNotEqualTo(londonSpec);
+    assertThat(homesteadSpec.getFeeMarket().implementsBaseFee()).isFalse();
+    assertThat(londonSpec.getFeeMarket().implementsBaseFee()).isTrue();
+  }
+
+  @Test
+  public void mergeSpecificModificationsAreUnappliedForShanghai() {
+
+    final GenesisConfigOptions config = GenesisConfigFile.mainnet().getConfigOptions();
+    final ProtocolSchedule protocolSchedule = MergeProtocolSchedule.create(config, false);
+
+    final long lastParisBlockNumber = 17034869L;
+    final ProtocolSpec parisSpec =
+        protocolSchedule.getByBlockHeader(blockHeader(lastParisBlockNumber));
+    final ProtocolSpec shanghaiSpec =
+        protocolSchedule.getByBlockHeader(
+            new BlockHeaderTestFixture().timestamp(1681338455).buildHeader());
+
+    assertThat(parisSpec.getName()).isEqualTo("Paris");
+    assertThat(shanghaiSpec.getName()).isEqualTo("Shanghai");
+
+    // ensure PUSH0 is enabled in Shanghai
+    final int PUSH0 = 0x5f;
+    assertThat(parisSpec.getEvm().getOperationsUnsafe()[PUSH0])
+        .isInstanceOf(InvalidOperation.class);
+    assertThat(shanghaiSpec.getEvm().getOperationsUnsafe()[PUSH0])
+        .isInstanceOf(Push0Operation.class);
+
+    assertProofOfStakeConfigIsEnabled(parisSpec);
+    assertProofOfStakeConfigIsEnabled(shanghaiSpec);
+  }
+
+  @Test
+  public void mergeSpecificModificationsAreUnappliedForCancun_whenShanghaiNotConfigured() {
+
+    final String jsonInput =
+        "{\"config\": "
+            + "{\"chainId\": 1,\n"
+            + "\"parisBlock\": 0,\n"
+            + "\"cancunTime\": 1000}"
+            + "}";
+
+    final GenesisConfigOptions config = GenesisConfigFile.fromConfig(jsonInput).getConfigOptions();
+    final ProtocolSchedule protocolSchedule = MergeProtocolSchedule.create(config, false);
+
+    final ProtocolSpec parisSpec =
+        protocolSchedule.getByBlockHeader(
+            new BlockHeaderTestFixture().number(9).timestamp(999).buildHeader());
+    final ProtocolSpec cancunSpec =
+        protocolSchedule.getByBlockHeader(
+            new BlockHeaderTestFixture().number(10).timestamp(1000).buildHeader());
+
+    assertThat(parisSpec.getName()).isEqualTo("Paris");
+    assertThat(cancunSpec.getName()).isEqualTo("Cancun");
+
+    // ensure PUSH0 is enabled in Cancun (i.e. it has picked up the Shanghai change rather than been
+    // reverted to Paris)
+    final int PUSH0 = 0x5f;
+    assertThat(parisSpec.getEvm().getOperationsUnsafe()[PUSH0])
+        .isInstanceOf(InvalidOperation.class);
+    assertThat(cancunSpec.getEvm().getOperationsUnsafe()[PUSH0]).isInstanceOf(Push0Operation.class);
+
+    assertProofOfStakeConfigIsEnabled(parisSpec);
+    assertProofOfStakeConfigIsEnabled(cancunSpec);
+  }
+
+  @Test
+  public void mergeSpecificModificationsAreUnappliedForAllMainnetForksAfterParis() {
+    final GenesisConfigOptions config = GenesisConfigFile.mainnet().getConfigOptions();
+    final ProtocolSchedule protocolSchedule = MergeProtocolSchedule.create(config, false);
+
+    final long lastParisBlockNumber = 17034869L;
+    final ProtocolSpec parisSpec =
+        protocolSchedule.getByBlockHeader(blockHeader(lastParisBlockNumber));
+    assertThat(parisSpec.getName()).isEqualTo("Paris");
+
+    for (long forkTimestamp : config.getForkBlockTimestamps()) {
+      final ProtocolSpec postParisSpec =
+          protocolSchedule.getByBlockHeader(
+              new BlockHeaderTestFixture().timestamp(forkTimestamp).buildHeader());
+
+      assertThat(postParisSpec.getName()).isNotEqualTo("Paris");
+      // ensure PUSH0 is enabled from Shanghai onwards
+      final int PUSH0 = 0x5f;
+      assertThat(parisSpec.getEvm().getOperationsUnsafe()[PUSH0])
+          .isInstanceOf(InvalidOperation.class);
+      assertThat(postParisSpec.getEvm().getOperationsUnsafe()[PUSH0])
+          .isInstanceOf(Push0Operation.class);
+
+      assertProofOfStakeConfigIsEnabled(parisSpec);
+      assertProofOfStakeConfigIsEnabled(postParisSpec);
+    }
+  }
+
+  @Test
+  public void parametersAlignWithMainnetWithAdjustments() {
+    final ProtocolSpec london =
+        MergeProtocolSchedule.create(GenesisConfigFile.DEFAULT.getConfigOptions(), false)
+            .getByBlockHeader(blockHeader(0));
+
+    assertThat(london.getName()).isEqualTo("Paris");
+    assertProofOfStakeConfigIsEnabled(london);
+  }
+
+  private static void assertProofOfStakeConfigIsEnabled(final ProtocolSpec spec) {
+    assertThat(spec.isPoS()).isTrue();
+    assertThat(spec.getEvm().getOperationsUnsafe()[0x44]).isInstanceOf(PrevRanDaoOperation.class);
+    assertThat(spec.getDifficultyCalculator().nextDifficulty(-1, null, null))
+        .isEqualTo(BigInteger.ZERO);
+    assertThat(spec.getBlockReward()).isEqualTo(Wei.ZERO);
+    assertThat(spec.isSkipZeroBlockRewards()).isTrue();
+    assertThat(spec.getBlockProcessor()).isInstanceOf(MainnetBlockProcessor.class);
+  }
+
+  private BlockHeader blockHeader(final long number) {
+    return new BlockHeaderTestFixture().number(number).buildHeader();
+  }
+}
diff --git a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/PostMergeContextTest.java b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/PostMergeContextTest.java
new file mode 100644
index 00000000000..0e5f246a273
--- /dev/null
+++ b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/PostMergeContextTest.java
@@ -0,0 +1,241 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.merge.blockcreation.PayloadIdentifier;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class PostMergeContextTest {
+
+  @Mock private SyncState mockSyncState;
+
+  private PostMergeContext postMergeContext;
+
+  private MergeStateChangeCollector mergeStateChangeCollector;
+
+  @BeforeEach
+  public void setUp() {
+    mergeStateChangeCollector = new MergeStateChangeCollector();
+    postMergeContext = new PostMergeContext();
+    postMergeContext.observeNewIsPostMergeState(mergeStateChangeCollector);
+    postMergeContext.setSyncState(mockSyncState);
+    postMergeContext.setTerminalTotalDifficulty(Difficulty.of(10L));
+  }
+
+  @Test
+  public void switchFromPoWToPoSStopSyncAndCallsSubscribers() {
+    when(mockSyncState.hasReachedTerminalDifficulty()).thenReturn(Optional.of(Boolean.TRUE));
+
+    postMergeContext.setIsPostMerge(Difficulty.of(10L));
+
+    verify(mockSyncState).setReachedTerminalDifficulty(true);
+    assertThat(postMergeContext.isPostMerge()).isTrue();
+    assertThat(postMergeContext.isSyncing()).isFalse();
+    assertThat(mergeStateChangeCollector.stateChanges).containsExactly(true);
+  }
+
+  @Test
+  public void setPrePoSStateNotStopSync() {
+    when(mockSyncState.hasReachedTerminalDifficulty()).thenReturn(Optional.of(Boolean.FALSE));
+
+    postMergeContext.setIsPostMerge(Difficulty.of(9L));
+
+    verify(mockSyncState, never()).setReachedTerminalDifficulty(false);
+    assertThat(postMergeContext.isPostMerge()).isFalse();
+    assertThat(postMergeContext.isSyncing()).isTrue();
+    assertThat(mergeStateChangeCollector.stateChanges).containsExactly(false);
+  }
+
+  @Test
+  public void setPostPoWDifficultyAfterFinalizedBlockDoesNothing() {
+    // first simulate a switch to PoS, and reset mocks and collectors
+    postMergeContext.setIsPostMerge(Difficulty.of(11L));
+    reset(mockSyncState);
+    mergeStateChangeCollector.reset();
+
+    // then perform the actual test
+    BlockHeader mockFinalizedHeader = mock(BlockHeader.class);
+    postMergeContext.setFinalized(mockFinalizedHeader);
+
+    postMergeContext.setIsPostMerge(Difficulty.of(19L));
+
+    verifyNoInteractions(mockSyncState);
+    assertThat(postMergeContext.isPostMerge()).isTrue();
+    assertThat(mergeStateChangeCollector.stateChanges).isEmpty();
+  }
+
+  @Test
+  public void candidateHeadIsValidBeforeAnyFinalizedBlock() {
+    assertThat(postMergeContext.getFinalized()).isEmpty();
+
+    BlockHeader mockHeader = mock(BlockHeader.class);
+    assertThat(postMergeContext.validateCandidateHead(mockHeader)).isTrue();
+  }
+
+  @Test
+  public void candidateHeadIsValidIfAfterFinalizedBlock() {
+    BlockHeader mockFinalizedHeader = mock(BlockHeader.class);
+    when(mockFinalizedHeader.getNumber()).thenReturn(2L);
+    postMergeContext.setFinalized(mockFinalizedHeader);
+
+    BlockHeader mockHeader = mock(BlockHeader.class);
+    when(mockHeader.getNumber()).thenReturn(3L);
+    assertThat(postMergeContext.validateCandidateHead(mockHeader)).isTrue();
+  }
+
+  @Test
+  public void candidateHeadIsInvalidIfBeforeFinalizedBlock() {
+    BlockHeader mockFinalizedHeader = mock(BlockHeader.class);
+    when(mockFinalizedHeader.getNumber()).thenReturn(3L);
+    postMergeContext.setFinalized(mockFinalizedHeader);
+
+    BlockHeader mockHeader = mock(BlockHeader.class);
+    when(mockHeader.getNumber()).thenReturn(2L);
+    assertThat(postMergeContext.validateCandidateHead(mockHeader)).isFalse();
+  }
+
+  @Test
+  public void putAndRetrieveFirstPayload() {
+    BlockWithReceipts mockBlockWithReceipts = createBlockWithReceipts(1, 21000, 1);
+
+    PayloadIdentifier firstPayloadId = new PayloadIdentifier(1L);
+    postMergeContext.putPayloadById(firstPayloadId, mockBlockWithReceipts);
+
+    assertThat(postMergeContext.retrieveBlockById(firstPayloadId)).contains(mockBlockWithReceipts);
+  }
+
+  @Test
+  public void puttingTwoBlocksWithTheSamePayloadIdWeRetrieveTheBest() {
+    BlockWithReceipts zeroTxBlockWithReceipts = createBlockWithReceipts(1, 0, 0);
+    BlockWithReceipts betterBlockWithReceipts = createBlockWithReceipts(2, 11, 1);
+
+    PayloadIdentifier payloadId = new PayloadIdentifier(1L);
+    postMergeContext.putPayloadById(payloadId, zeroTxBlockWithReceipts);
+    postMergeContext.putPayloadById(payloadId, betterBlockWithReceipts);
+
+    assertThat(postMergeContext.retrieveBlockById(payloadId)).contains(betterBlockWithReceipts);
+  }
+
+  @Test
+  public void puttingABlockWithTheSamePayloadIdSmallerThanAnExistingOneWeRetrieveTheBest() {
+    BlockWithReceipts zeroTxBlockWithReceipts = createBlockWithReceipts(1, 0, 0);
+    BlockWithReceipts betterBlockWithReceipts = createBlockWithReceipts(2, 11, 1);
+    BlockWithReceipts smallBlockWithReceipts = createBlockWithReceipts(3, 5, 1);
+
+    PayloadIdentifier payloadId = new PayloadIdentifier(1L);
+    postMergeContext.putPayloadById(payloadId, zeroTxBlockWithReceipts);
+    postMergeContext.putPayloadById(payloadId, betterBlockWithReceipts);
+    postMergeContext.putPayloadById(payloadId, smallBlockWithReceipts);
+
+    assertThat(postMergeContext.retrieveBlockById(payloadId)).contains(betterBlockWithReceipts);
+  }
+
+  @Test
+  public void tryingToRetrieveANotYetPutPayloadIdReturnsEmpty() {
+    PayloadIdentifier payloadId = new PayloadIdentifier(1L);
+
+    assertThat(postMergeContext.retrieveBlockById(payloadId)).isEmpty();
+  }
+
+  @Test
+  public void tryingToRetrieveABlockPutButEvictedReturnsEmpty() {
+    PayloadIdentifier evictedPayloadId = new PayloadIdentifier(0L);
+
+    assertThat(postMergeContext.retrieveBlockById(evictedPayloadId)).isEmpty();
+  }
+
+  @Test
+  public void syncStateNullShouldNotThrowWhenIsSyncingIsCalled() {
+    // simulate a possible syncState null when we still have got a syncState set yet.
+    postMergeContext.setSyncState(null);
+    assertThat(postMergeContext.isSyncing()).isTrue();
+
+    // after setting a syncState things should progress as expected.
+    postMergeContext.setSyncState(mockSyncState);
+
+    // Assuming we're not in sync
+    when(mockSyncState.isInSync()).thenReturn(Boolean.FALSE);
+
+    when(mockSyncState.hasReachedTerminalDifficulty()).thenReturn(Optional.empty());
+    assertThat(postMergeContext.isSyncing()).isTrue();
+
+    when(mockSyncState.hasReachedTerminalDifficulty()).thenReturn(Optional.of(Boolean.FALSE));
+    assertThat(postMergeContext.isSyncing()).isTrue();
+
+    when(mockSyncState.hasReachedTerminalDifficulty()).thenReturn(Optional.of(Boolean.TRUE));
+    assertThat(postMergeContext.isSyncing()).isFalse();
+
+    // if we're in sync reached ttd does not matter anymore
+    when(mockSyncState.isInSync()).thenReturn(Boolean.TRUE);
+    assertThat(postMergeContext.isSyncing()).isFalse();
+  }
+
+  private static BlockWithReceipts createBlockWithReceipts(
+      final int number, final long gasUsed, final int txCount) {
+    Block mockBlock = mock(Block.class, RETURNS_DEEP_STUBS);
+    // using lenient here, since some code is only executed when debug log is enabled
+    lenient()
+        .when(mockBlock.toLogString())
+        .thenReturn(number + " (" + Hash.wrap(Bytes32.random()) + ")");
+    lenient().when(mockBlock.getHeader().getGasUsed()).thenReturn(gasUsed);
+    lenient().when(mockBlock.getBody().getTransactions().size()).thenReturn(txCount);
+    BlockWithReceipts mockBlockWithReceipts = mock(BlockWithReceipts.class);
+    lenient().when(mockBlockWithReceipts.getBlock()).thenReturn(mockBlock);
+    return mockBlockWithReceipts;
+  }
+
+  private static class MergeStateChangeCollector implements MergeStateHandler {
+    final List<Boolean> stateChanges = new ArrayList<>();
+
+    @Override
+    public void mergeStateChanged(
+        final boolean isPoS,
+        final Optional<Boolean> oldState,
+        final Optional<Difficulty> difficultyStoppedAt) {
+      stateChanges.add(isPoS);
+    }
+
+    public void reset() {
+      stateChanges.clear();
+    }
+  }
+}
diff --git a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/TransitionBestPeerComparatorTest.java b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/TransitionBestPeerComparatorTest.java
new file mode 100644
index 00000000000..ce3ef0088c3
--- /dev/null
+++ b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/TransitionBestPeerComparatorTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+
+import java.util.Optional;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class TransitionBestPeerComparatorTest {
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  EthPeer a;
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  EthPeer b;
+
+  @Test
+  public void assertDistanceFromTTDPrecedence() {
+    var comparator = new TransitionBestPeerComparator(Difficulty.of(5000));
+    when(a.chainState().getEstimatedTotalDifficulty()).thenReturn(Difficulty.of(5002));
+    when(b.chainState().getEstimatedTotalDifficulty()).thenReturn(Difficulty.of(4995));
+    // a has less distance from TTD:
+    assertThat(comparator.compare(a, b)).isEqualTo(1);
+    when(b.chainState().getEstimatedTotalDifficulty()).thenReturn(Difficulty.of(5001));
+    // b has less distance from TTD:
+    assertThat(comparator.compare(a, b)).isEqualTo(-1);
+    when(b.chainState().getEstimatedTotalDifficulty()).thenReturn(Difficulty.of(5002));
+    // a and b are equi-distant
+    assertThat(comparator.compare(a, b)).isEqualTo(0);
+  }
+
+  @Test
+  public void assertHandlesNewTTD() {
+    var comparator = new TransitionBestPeerComparator(Difficulty.of(5000));
+    when(a.chainState().getEstimatedTotalDifficulty()).thenReturn(Difficulty.of(5002));
+    when(b.chainState().getEstimatedTotalDifficulty()).thenReturn(Difficulty.of(4999));
+    assertThat(comparator.compare(a, b)).isEqualTo(-1);
+
+    // update TTD with actual value
+    comparator.mergeStateChanged(true, Optional.empty(), Optional.of(Difficulty.of(5002)));
+    assertThat(comparator.compare(a, b)).isEqualTo(1);
+  }
+}
diff --git a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/TransitionProtocolScheduleTest.java b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/TransitionProtocolScheduleTest.java
new file mode 100644
index 00000000000..b55686a24be
--- /dev/null
+++ b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/TransitionProtocolScheduleTest.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+
+import java.util.Optional;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class TransitionProtocolScheduleTest {
+
+  @Mock ProtocolContext protocolContext;
+  @Mock MutableBlockchain blockchain;
+  @Mock MergeContext mergeContext;
+  @Mock ProtocolSchedule preMergeProtocolSchedule;
+  @Mock ProtocolSchedule postMergeProtocolSchedule;
+  @Mock BlockHeader blockHeader;
+  private static final Difficulty TTD = Difficulty.of(100L);
+  private static final long BLOCK_NUMBER = 29L;
+  private TransitionProtocolSchedule transitionProtocolSchedule;
+
+  @BeforeEach
+  public void setUp() {
+
+    transitionProtocolSchedule =
+        new TransitionProtocolSchedule(
+            preMergeProtocolSchedule, postMergeProtocolSchedule, mergeContext);
+    transitionProtocolSchedule.setProtocolContext(protocolContext);
+  }
+
+  @Test
+  public void returnPostMergeIfFinalizedExists() {
+    when(mergeContext.getFinalized()).thenReturn(Optional.of(mock(BlockHeader.class)));
+
+    transitionProtocolSchedule.getByBlockHeaderWithTransitionReorgHandling(blockHeader);
+
+    verifyPostMergeProtocolScheduleReturnedUsingBlockHeader();
+  }
+
+  @Test
+  public void returnPreMergeIfBeforeMerge() {
+    when(mergeContext.getFinalized()).thenReturn(Optional.empty());
+    when(mergeContext.isPostMerge()).thenReturn(false);
+
+    transitionProtocolSchedule.getByBlockHeaderWithTransitionReorgHandling(blockHeader);
+
+    verifyPreMergeProtocolScheduleReturnedUsingBlockHeader();
+  }
+
+  @Test
+  public void returnPreMergeIfTerminalPoWBlock() {
+
+    when(protocolContext.getBlockchain()).thenReturn(blockchain);
+    when(protocolContext.getConsensusContext(MergeContext.class)).thenReturn(mergeContext);
+    when(mergeContext.getTerminalTotalDifficulty()).thenReturn(TTD);
+    when(mergeContext.getFinalized()).thenReturn(Optional.empty());
+    when(mergeContext.isPostMerge()).thenReturn(true);
+
+    final Hash parentHash = Hash.fromHexStringLenient("0xabc123");
+
+    when(blockHeader.getParentHash()).thenReturn(parentHash);
+    when(blockHeader.getDifficulty()).thenReturn(Difficulty.of(10L));
+    when(blockchain.getTotalDifficultyByHash(parentHash))
+        .thenReturn(Optional.of(Difficulty.of(95L)));
+
+    transitionProtocolSchedule.getByBlockHeaderWithTransitionReorgHandling(blockHeader);
+
+    verifyPreMergeProtocolScheduleReturnedUsingBlockHeader();
+  }
+
+  @Test
+  public void returnPreMergeIfAfterMergeButReorgPreTTD() {
+    when(protocolContext.getBlockchain()).thenReturn(blockchain);
+    when(mergeContext.getTerminalTotalDifficulty()).thenReturn(TTD);
+
+    when(mergeContext.getFinalized()).thenReturn(Optional.empty());
+    when(mergeContext.isPostMerge()).thenReturn(true);
+
+    final Hash parentHash = Hash.fromHexStringLenient("0xabc123");
+
+    when(blockHeader.getParentHash()).thenReturn(parentHash);
+    when(blockHeader.getDifficulty()).thenReturn(Difficulty.of(2L));
+    when(blockchain.getTotalDifficultyByHash(parentHash))
+        .thenReturn(Optional.of(Difficulty.of(95L)));
+
+    transitionProtocolSchedule.getByBlockHeaderWithTransitionReorgHandling(blockHeader);
+
+    verifyPreMergeProtocolScheduleReturnedUsingBlockHeader();
+  }
+
+  @Test
+  public void returnPostMergeIfAfterMergeButReorgPostTTD() {
+
+    when(protocolContext.getBlockchain()).thenReturn(blockchain);
+    when(protocolContext.getConsensusContext(MergeContext.class)).thenReturn(mergeContext);
+    when(mergeContext.getTerminalTotalDifficulty()).thenReturn(TTD);
+    when(mergeContext.getFinalized()).thenReturn(Optional.empty());
+    when(mergeContext.isPostMerge()).thenReturn(true);
+
+    final Hash parentHash = Hash.fromHexStringLenient("0xabc123");
+
+    when(blockHeader.getNumber()).thenReturn(BLOCK_NUMBER);
+    when(blockHeader.getParentHash()).thenReturn(parentHash);
+    when(blockHeader.getDifficulty()).thenReturn(Difficulty.ZERO);
+    when(blockchain.getTotalDifficultyByHash(parentHash))
+        .thenReturn(Optional.of(Difficulty.of(105L)));
+
+    transitionProtocolSchedule.getByBlockHeaderWithTransitionReorgHandling(blockHeader);
+
+    verifyPostMergeProtocolScheduleReturnedUsingBlockHeader();
+  }
+
+  @Test
+  public void getByBlockHeader_delegatesToPreMergeSchedule() {
+    when(mergeContext.isPostMerge()).thenReturn(false);
+
+    transitionProtocolSchedule.getByBlockHeader(blockHeader);
+
+    verifyPreMergeProtocolScheduleReturnedUsingBlockHeader();
+  }
+
+  @Test
+  public void getByBlockHeader_delegatesToPostMergeSchedule() {
+    when(mergeContext.isPostMerge()).thenReturn(true);
+
+    transitionProtocolSchedule.getByBlockHeader(blockHeader);
+
+    verifyPostMergeProtocolScheduleReturnedUsingBlockHeader();
+  }
+
+  @Test
+  public void anyMatch_delegatesToPreMergeSchedule() {
+    when(mergeContext.isPostMerge()).thenReturn(false);
+
+    when(preMergeProtocolSchedule.anyMatch(any())).thenReturn(true);
+
+    assertThat(transitionProtocolSchedule.anyMatch(__ -> true)).isTrue();
+    verifyNoInteractions(postMergeProtocolSchedule);
+  }
+
+  @Test
+  public void anyMatch_delegatesToPostMergeSchedule() {
+    when(mergeContext.isPostMerge()).thenReturn(true);
+
+    when(postMergeProtocolSchedule.anyMatch(any())).thenReturn(true);
+
+    assertThat(transitionProtocolSchedule.anyMatch(__ -> true)).isTrue();
+    verifyNoInteractions(preMergeProtocolSchedule);
+  }
+
+  @Test
+  public void isOnMilestoneBoundary_delegatesToPreMergeSchedule() {
+    when(mergeContext.isPostMerge()).thenReturn(false);
+
+    when(preMergeProtocolSchedule.isOnMilestoneBoundary(any(BlockHeader.class))).thenReturn(true);
+
+    assertThat(transitionProtocolSchedule.isOnMilestoneBoundary(blockHeader)).isTrue();
+    verifyNoInteractions(postMergeProtocolSchedule);
+  }
+
+  @Test
+  public void isOnMilestoneBoundary_delegatesToPostMergeSchedule() {
+    when(mergeContext.isPostMerge()).thenReturn(true);
+
+    when(postMergeProtocolSchedule.isOnMilestoneBoundary(any(BlockHeader.class))).thenReturn(true);
+
+    assertThat(transitionProtocolSchedule.isOnMilestoneBoundary(blockHeader)).isTrue();
+    verifyNoInteractions(preMergeProtocolSchedule);
+  }
+
+  private void verifyPreMergeProtocolScheduleReturnedUsingBlockHeader() {
+    verify(preMergeProtocolSchedule).getByBlockHeader(any());
+    verifyNoInteractions(postMergeProtocolSchedule);
+  }
+
+  private void verifyPostMergeProtocolScheduleReturnedUsingBlockHeader() {
+    verify(postMergeProtocolSchedule).getByBlockHeader(any());
+    verifyNoInteractions(preMergeProtocolSchedule);
+  }
+}
diff --git a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java
new file mode 100644
index 00000000000..d4820dff70b
--- /dev/null
+++ b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java
@@ -0,0 +1,1185 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge.blockcreation;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doCallRealMethod;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.MergeConfigOptions;
+import org.hyperledger.besu.consensus.merge.MergeContext;
+import org.hyperledger.besu.consensus.merge.blockcreation.MergeCoordinator.ProposalBuilderExecutor;
+import org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator.ForkchoiceResult;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SECPPrivateKey;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.BadBlockManager;
+import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
+import org.hyperledger.besu.ethereum.chain.BlockAddedEvent.EventType;
+import org.hyperledger.besu.ethereum.chain.BlockAddedObserver;
+import org.hyperledger.besu.ethereum.chain.GenesisState;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+import org.hyperledger.besu.ethereum.eth.sync.backwardsync.BackwardSyncContext;
+import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.sorter.BaseFeePendingTransactionsSorter;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.LondonFeeMarket;
+import org.hyperledger.besu.ethereum.trie.MerkleTrieException;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.metrics.StubMetricsSystem;
+import org.hyperledger.besu.testutil.TestClock;
+
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+
+import com.google.common.base.Suppliers;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+public class MergeCoordinatorTest implements MergeGenesisConfigHelper {
+
+  private static final com.google.common.base.Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+
+  private static final Logger LOG = LoggerFactory.getLogger(MergeCoordinatorTest.class);
+  private static final SECPPrivateKey PRIVATE_KEY1 =
+      SIGNATURE_ALGORITHM
+          .get()
+          .createPrivateKey(
+              Bytes32.fromHexString(
+                  "ae6ae8e5ccbfb04590405997ee2d52d2b330726137b875053c36d94e974d162f"));
+  private static final KeyPair KEYS1 =
+      new KeyPair(PRIVATE_KEY1, SIGNATURE_ALGORITHM.get().createPublicKey(PRIVATE_KEY1));
+  private static final Optional<List<Withdrawal>> EMPTY_WITHDRAWALS = Optional.empty();
+
+  private static final long REPETITION_MIN_DURATION = 100;
+  @Mock MergeContext mergeContext;
+  @Mock BackwardSyncContext backwardSyncContext;
+
+  @Mock ProposalBuilderExecutor proposalBuilderExecutor;
+  private final Address coinbase = genesisAllocations(getPosGenesisConfigFile()).findFirst().get();
+
+  @Spy
+  MiningParameters miningParameters =
+      new MiningParameters.Builder()
+          .coinbase(coinbase)
+          .posBlockCreationRepetitionMinDuration(REPETITION_MIN_DURATION)
+          .build();
+
+  private MergeCoordinator coordinator;
+  private ProtocolContext protocolContext;
+
+  private final ProtocolSchedule protocolSchedule = spy(getMergeProtocolSchedule());
+  private final GenesisState genesisState =
+      GenesisState.fromConfig(getPosGenesisConfigFile(), protocolSchedule);
+
+  private final WorldStateArchive worldStateArchive = createInMemoryWorldStateArchive();
+
+  private final MutableBlockchain blockchain =
+      spy(createInMemoryBlockchain(genesisState.getBlock()));
+
+  private final Address suggestedFeeRecipient = Address.ZERO;
+  private final BlockHeaderTestFixture headerGenerator = new BlockHeaderTestFixture();
+  private final BaseFeeMarket feeMarket =
+      new LondonFeeMarket(0, genesisState.getBlock().getHeader().getBaseFee());
+
+  private final org.hyperledger.besu.metrics.StubMetricsSystem metricsSystem =
+      new StubMetricsSystem();
+
+  private final BaseFeePendingTransactionsSorter transactions =
+      new BaseFeePendingTransactionsSorter(
+          ImmutableTransactionPoolConfiguration.builder()
+              .txPoolMaxSize(10)
+              .txPoolLimitByAccountPercentage(100.0f)
+              .build(),
+          TestClock.system(ZoneId.systemDefault()),
+          metricsSystem,
+          MergeCoordinatorTest::mockBlockHeader);
+
+  CompletableFuture<Void> blockCreationTask = CompletableFuture.completedFuture(null);
+
+  private final BadBlockManager badBlockManager = spy(new BadBlockManager());
+
+  @BeforeEach
+  public void setUp() {
+    when(mergeContext.as(MergeContext.class)).thenReturn(mergeContext);
+    when(mergeContext.getTerminalTotalDifficulty())
+        .thenReturn(genesisState.getBlock().getHeader().getDifficulty().plus(1L));
+    when(mergeContext.getTerminalPoWBlock()).thenReturn(Optional.of(terminalPowBlock()));
+    doAnswer(
+            getSpecInvocation -> {
+              ProtocolSpec spec = (ProtocolSpec) spy(getSpecInvocation.callRealMethod());
+              doAnswer(
+                      getBadBlockInvocation -> {
+                        return badBlockManager;
+                      })
+                  .when(spec)
+                  .getBadBlocksManager();
+              return spec;
+            })
+        .when(protocolSchedule)
+        .getByBlockHeader(any(BlockHeader.class));
+
+    protocolContext =
+        new ProtocolContext(blockchain, worldStateArchive, mergeContext, Optional.empty());
+    var mutable = worldStateArchive.getMutable();
+    genesisState.writeStateTo(mutable);
+    mutable.persist(null);
+
+    when(proposalBuilderExecutor.buildProposal(any()))
+        .thenAnswer(
+            invocation -> {
+              final Runnable runnable = invocation.getArgument(0);
+              blockCreationTask = CompletableFuture.runAsync(runnable);
+              return blockCreationTask;
+            });
+
+    MergeConfigOptions.setMergeEnabled(true);
+
+    this.coordinator =
+        new MergeCoordinator(
+            protocolContext,
+            protocolSchedule,
+            proposalBuilderExecutor,
+            transactions,
+            miningParameters,
+            backwardSyncContext,
+            Optional.empty());
+  }
+
+  @Test
+  public void coinbaseShouldMatchSuggestedFeeRecipient() {
+    doAnswer(
+            invocation -> {
+              coordinator.finalizeProposalById(invocation.getArgument(0, PayloadIdentifier.class));
+              return null;
+            })
+        .when(mergeContext)
+        .putPayloadById(any(), any());
+
+    var payloadId =
+        coordinator.preparePayload(
+            genesisState.getBlock().getHeader(),
+            System.currentTimeMillis() / 1000,
+            Bytes32.ZERO,
+            suggestedFeeRecipient,
+            EMPTY_WITHDRAWALS);
+
+    ArgumentCaptor<BlockWithReceipts> blockWithReceipts =
+        ArgumentCaptor.forClass(BlockWithReceipts.class);
+
+    verify(mergeContext, atLeastOnce()).putPayloadById(eq(payloadId), blockWithReceipts.capture());
+
+    assertThat(blockWithReceipts.getValue().getHeader().getCoinbase())
+        .isEqualTo(suggestedFeeRecipient);
+  }
+
+  @Test
+  public void exceptionDuringBuildingBlockShouldNotBeInvalid()
+      throws ExecutionException, InterruptedException {
+
+    final int txPerBlock = 7;
+
+    MergeCoordinator.MergeBlockCreatorFactory mergeBlockCreatorFactory =
+        (parentHeader, address) -> {
+          MergeBlockCreator beingSpiedOn =
+              spy(
+                  new MergeBlockCreator(
+                      address.or(miningParameters::getCoinbase).orElse(Address.ZERO),
+                      () -> Optional.of(30000000L),
+                      parent -> Bytes.EMPTY,
+                      transactions,
+                      protocolContext,
+                      protocolSchedule,
+                      this.miningParameters.getMinTransactionGasPrice(),
+                      address.or(miningParameters::getCoinbase).orElse(Address.ZERO),
+                      parentHeader,
+                      Optional.empty()));
+
+          doCallRealMethod()
+              .doCallRealMethod()
+              .doThrow(new MerkleTrieException("missing leaf"))
+              .doCallRealMethod()
+              .when(beingSpiedOn)
+              .createBlock(any(), any(Bytes32.class), anyLong(), eq(Optional.empty()));
+          return beingSpiedOn;
+        };
+
+    MergeCoordinator willThrow =
+        spy(
+            new MergeCoordinator(
+                protocolContext,
+                protocolSchedule,
+                proposalBuilderExecutor,
+                miningParameters,
+                backwardSyncContext,
+                mergeBlockCreatorFactory));
+
+    final AtomicLong retries = new AtomicLong(0);
+    doAnswer(
+            invocation -> {
+              if (retries.getAndIncrement() < txPerBlock) {
+                // a new transaction every time a block is built
+                transactions.addLocalTransaction(
+                    createTransaction(retries.get() - 1), Optional.empty());
+              } else {
+                // when we have 5 transactions finalize block creation
+                willThrow.finalizeProposalById(invocation.getArgument(0, PayloadIdentifier.class));
+              }
+              return null;
+            })
+        .when(mergeContext)
+        .putPayloadById(any(), any());
+
+    var payloadId =
+        willThrow.preparePayload(
+            genesisState.getBlock().getHeader(),
+            System.currentTimeMillis() / 1000,
+            Bytes32.random(),
+            suggestedFeeRecipient,
+            Optional.empty());
+
+    verify(willThrow, never()).addBadBlock(any(), any());
+    blockCreationTask.get();
+
+    ArgumentCaptor<BlockWithReceipts> blockWithReceipts =
+        ArgumentCaptor.forClass(BlockWithReceipts.class);
+
+    verify(mergeContext, times(txPerBlock + 1))
+        .putPayloadById(eq(payloadId), blockWithReceipts.capture()); // +1 for the empty
+    assertThat(blockWithReceipts.getValue().getBlock().getBody().getTransactions().size())
+        .isEqualTo(txPerBlock);
+    // this only verifies that adding the bad block didn't happen through the mergeCoordinator, it
+    // still may be called directly.
+    verify(badBlockManager, never()).addBadBlock(any(), any());
+    verify(willThrow, never()).addBadBlock(any(), any());
+  }
+
+  @Test
+  public void shouldNotRecordProposedBadBlockToBadBlockManager()
+      throws ExecutionException, InterruptedException {
+    // set up invalid parent to simulate one of the many conditions that can cause a block
+    // validation to fail
+    final BlockHeader invalidParentHeader = new BlockHeaderTestFixture().buildHeader();
+
+    blockCreationTask.get();
+
+    coordinator.preparePayload(
+        invalidParentHeader,
+        System.currentTimeMillis() / 1000,
+        Bytes32.ZERO,
+        suggestedFeeRecipient,
+        Optional.empty());
+
+    verify(badBlockManager, never()).addBadBlock(any(), any());
+    assertThat(badBlockManager.getBadBlocks().size()).isEqualTo(0);
+  }
+
+  @Test
+  public void shouldContinueBuildingBlocksUntilFinalizeIsCalled()
+      throws InterruptedException, ExecutionException {
+    final AtomicLong retries = new AtomicLong(0);
+    doAnswer(
+            invocation -> {
+              if (retries.getAndIncrement() < 5) {
+                // a new transaction every time a block is built
+                transactions.addLocalTransaction(
+                    createTransaction(retries.get() - 1), Optional.empty());
+              } else {
+                // when we have 5 transactions finalize block creation
+                coordinator.finalizeProposalById(
+                    invocation.getArgument(0, PayloadIdentifier.class));
+              }
+              return null;
+            })
+        .when(mergeContext)
+        .putPayloadById(any(), any());
+
+    var payloadId =
+        coordinator.preparePayload(
+            genesisState.getBlock().getHeader(),
+            System.currentTimeMillis() / 1000,
+            Bytes32.ZERO,
+            suggestedFeeRecipient,
+            Optional.empty());
+
+    blockCreationTask.get();
+
+    ArgumentCaptor<BlockWithReceipts> blockWithReceipts =
+        ArgumentCaptor.forClass(BlockWithReceipts.class);
+
+    verify(mergeContext, times(retries.intValue()))
+        .putPayloadById(eq(payloadId), blockWithReceipts.capture());
+
+    assertThat(blockWithReceipts.getAllValues().size()).isEqualTo(retries.intValue());
+    for (int i = 0; i < retries.intValue(); i++) {
+      assertThat(blockWithReceipts.getAllValues().get(i).getBlock().getBody().getTransactions())
+          .hasSize(i);
+    }
+  }
+
+  @Test
+  public void blockCreationRepetitionShouldTakeNotLessThanRepetitionMinDuration()
+      throws InterruptedException, ExecutionException {
+    final AtomicLong retries = new AtomicLong(0);
+    final AtomicLong lastPutAt = new AtomicLong();
+    final List<Long> repetitionDurations = new ArrayList<>();
+
+    doAnswer(
+            invocation -> {
+              final long r = retries.getAndIncrement();
+              if (r == 0) {
+                // ignore first one, that is the empty block
+              } else if (r < 5) {
+                if (lastPutAt.get() > 0) {
+                  // each repetition should take >= REPETITION_MIN_DURATION
+                  repetitionDurations.add(System.currentTimeMillis() - lastPutAt.get());
+                }
+                lastPutAt.set(System.currentTimeMillis());
+              } else {
+                // finalize after 5 repetitions
+                coordinator.finalizeProposalById(
+                    invocation.getArgument(0, PayloadIdentifier.class));
+              }
+              return null;
+            })
+        .when(mergeContext)
+        .putPayloadById(any(), any());
+
+    var payloadId =
+        coordinator.preparePayload(
+            genesisState.getBlock().getHeader(),
+            System.currentTimeMillis() / 1000,
+            Bytes32.ZERO,
+            suggestedFeeRecipient,
+            Optional.empty());
+
+    blockCreationTask.get();
+
+    verify(mergeContext, times(retries.intValue())).putPayloadById(eq(payloadId), any());
+
+    // check with a tolerance
+    assertThat(repetitionDurations)
+        .allSatisfy(d -> assertThat(d).isGreaterThanOrEqualTo(REPETITION_MIN_DURATION - 10));
+  }
+
+  @Test
+  public void shouldRetryBlockCreationOnRecoverableError()
+      throws InterruptedException, ExecutionException {
+    doAnswer(
+            invocation -> {
+              if (invocation
+                  .getArgument(1, BlockWithReceipts.class)
+                  .getBlock()
+                  .getBody()
+                  .getTransactions()
+                  .isEmpty()) {
+                // this is called by the first empty block
+                doCallRealMethod() // first work
+                    .doThrow(new MerkleTrieException("lock")) // second fail
+                    .doCallRealMethod() // then work
+                    .when(blockchain)
+                    .getBlockHeader(any());
+              } else {
+                // stop block creation loop when we see a not empty block
+                coordinator.finalizeProposalById(
+                    invocation.getArgument(0, PayloadIdentifier.class));
+              }
+              return null;
+            })
+        .when(mergeContext)
+        .putPayloadById(any(), any());
+
+    transactions.addLocalTransaction(createTransaction(0), Optional.empty());
+
+    var payloadId =
+        coordinator.preparePayload(
+            genesisState.getBlock().getHeader(),
+            System.currentTimeMillis() / 1000,
+            Bytes32.ZERO,
+            suggestedFeeRecipient,
+            Optional.empty());
+
+    blockCreationTask.get();
+
+    ArgumentCaptor<BlockWithReceipts> blockWithReceipts =
+        ArgumentCaptor.forClass(BlockWithReceipts.class);
+
+    verify(mergeContext, times(2)).putPayloadById(eq(payloadId), blockWithReceipts.capture());
+
+    assertThat(blockWithReceipts.getAllValues().size()).isEqualTo(2);
+    assertThat(blockWithReceipts.getAllValues().get(0).getBlock().getBody().getTransactions())
+        .hasSize(0);
+    assertThat(blockWithReceipts.getAllValues().get(1).getBlock().getBody().getTransactions())
+        .hasSize(1);
+  }
+
+  @Test
+  public void shouldStopRetryBlockCreationIfTimeExpired() throws InterruptedException {
+    final AtomicLong retries = new AtomicLong(0);
+    doReturn(100L).when(miningParameters).getPosBlockCreationMaxTime();
+    doAnswer(
+            invocation -> {
+              retries.incrementAndGet();
+              return null;
+            })
+        .when(mergeContext)
+        .putPayloadById(any(), any());
+
+    var payloadId =
+        coordinator.preparePayload(
+            genesisState.getBlock().getHeader(),
+            System.currentTimeMillis() / 1000,
+            Bytes32.ZERO,
+            suggestedFeeRecipient,
+            Optional.empty());
+
+    try {
+      blockCreationTask.get();
+      fail("Timeout expected");
+    } catch (ExecutionException e) {
+      assertThat(e).hasCauseInstanceOf(TimeoutException.class);
+    }
+
+    verify(mergeContext, atLeast(retries.intValue())).putPayloadById(eq(payloadId), any());
+  }
+
+  @Test
+  public void shouldStopInProgressBlockCreationIfFinalizedIsCalled()
+      throws InterruptedException, ExecutionException {
+    final CountDownLatch waitForBlockCreationInProgress = new CountDownLatch(1);
+
+    doAnswer(
+            invocation ->
+                // this is called by the first empty block
+                doAnswer(
+                        i -> {
+                          waitForBlockCreationInProgress.countDown();
+                          // simulate a long running task
+                          try {
+                            Thread.sleep(1000);
+                          } catch (Exception e) {
+                            throw new RuntimeException(e);
+                          }
+                          return i.callRealMethod();
+                        })
+                    .when(blockchain)
+                    .getBlockHeader(any()))
+        .when(mergeContext)
+        .putPayloadById(any(), any());
+
+    var payloadId =
+        coordinator.preparePayload(
+            genesisState.getBlock().getHeader(),
+            System.currentTimeMillis() / 1000,
+            Bytes32.ZERO,
+            suggestedFeeRecipient,
+            Optional.empty());
+
+    waitForBlockCreationInProgress.await();
+    coordinator.finalizeProposalById(payloadId);
+
+    blockCreationTask.get();
+
+    // check that we only the empty block has been built
+    ArgumentCaptor<BlockWithReceipts> blockWithReceipts =
+        ArgumentCaptor.forClass(BlockWithReceipts.class);
+
+    verify(mergeContext, times(1)).putPayloadById(eq(payloadId), blockWithReceipts.capture());
+
+    assertThat(blockWithReceipts.getAllValues().size()).isEqualTo(1);
+    assertThat(blockWithReceipts.getAllValues().get(0).getBlock().getBody().getTransactions())
+        .hasSize(0);
+  }
+
+  @Test
+  public void shouldNotStartAnotherBlockCreationJobIfCalledAgainWithTheSamePayloadId()
+      throws ExecutionException, InterruptedException {
+    final AtomicLong retries = new AtomicLong(0);
+    doAnswer(
+            invocation -> {
+              if (retries.getAndIncrement() < 5) {
+                // a new transaction every time a block is built
+                transactions.addLocalTransaction(
+                    createTransaction(retries.get() - 1), Optional.empty());
+              } else {
+                // when we have 5 transactions finalize block creation
+                coordinator.finalizeProposalById(
+                    invocation.getArgument(0, PayloadIdentifier.class));
+              }
+              return null;
+            })
+        .when(mergeContext)
+        .putPayloadById(any(), any());
+
+    final long timestamp = System.currentTimeMillis() / 1000;
+
+    var payloadId1 =
+        coordinator.preparePayload(
+            genesisState.getBlock().getHeader(),
+            timestamp,
+            Bytes32.ZERO,
+            suggestedFeeRecipient,
+            Optional.empty());
+
+    final CompletableFuture<Void> task1 = blockCreationTask;
+
+    var payloadId2 =
+        coordinator.preparePayload(
+            genesisState.getBlock().getHeader(),
+            timestamp,
+            Bytes32.ZERO,
+            suggestedFeeRecipient,
+            Optional.empty());
+
+    assertThat(payloadId1).isEqualTo(payloadId2);
+
+    final CompletableFuture<Void> task2 = blockCreationTask;
+
+    assertThat(task1).isSameAs(task2);
+
+    blockCreationTask.get();
+
+    ArgumentCaptor<BlockWithReceipts> blockWithReceipts =
+        ArgumentCaptor.forClass(BlockWithReceipts.class);
+
+    verify(mergeContext, times(retries.intValue()))
+        .putPayloadById(eq(payloadId1), blockWithReceipts.capture());
+
+    assertThat(blockWithReceipts.getAllValues().size()).isEqualTo(retries.intValue());
+    for (int i = 0; i < retries.intValue(); i++) {
+      assertThat(blockWithReceipts.getAllValues().get(i).getBlock().getBody().getTransactions())
+          .hasSize(i);
+      assertThat(blockWithReceipts.getAllValues().get(i).getReceipts()).hasSize(i);
+    }
+  }
+
+  @Test
+  public void shouldCancelPreviousBlockCreationJobIfCalledAgainWithNewPayloadId() {
+
+    final long timestamp = System.currentTimeMillis() / 1000;
+
+    var payloadId1 =
+        coordinator.preparePayload(
+            genesisState.getBlock().getHeader(),
+            timestamp,
+            Bytes32.ZERO,
+            suggestedFeeRecipient,
+            Optional.empty());
+
+    assertThat(coordinator.isBlockCreationCancelled(payloadId1)).isFalse();
+
+    var payloadId2 =
+        coordinator.preparePayload(
+            genesisState.getBlock().getHeader(),
+            timestamp + 1,
+            Bytes32.ZERO,
+            suggestedFeeRecipient,
+            Optional.empty());
+
+    assertThat(payloadId1).isNotEqualTo(payloadId2);
+    assertThat(coordinator.isBlockCreationCancelled(payloadId1)).isTrue();
+    assertThat(coordinator.isBlockCreationCancelled(payloadId2)).isFalse();
+  }
+
+  @Test
+  public void shouldUseExtraDataFromMiningParameters() {
+    final Bytes extraData = Bytes.fromHexString("0x1234");
+
+    miningParameters = new MiningParameters.Builder().extraData(extraData).build();
+
+    this.coordinator =
+        new MergeCoordinator(
+            protocolContext,
+            protocolSchedule,
+            proposalBuilderExecutor,
+            transactions,
+            miningParameters,
+            backwardSyncContext,
+            Optional.empty());
+
+    final PayloadIdentifier payloadId =
+        this.coordinator.preparePayload(
+            genesisState.getBlock().getHeader(),
+            1L,
+            Bytes32.ZERO,
+            suggestedFeeRecipient,
+            Optional.empty());
+
+    ArgumentCaptor<BlockWithReceipts> blockWithReceipts =
+        ArgumentCaptor.forClass(BlockWithReceipts.class);
+
+    verify(mergeContext, atLeastOnce()).putPayloadById(eq(payloadId), blockWithReceipts.capture());
+
+    assertThat(blockWithReceipts.getValue().getHeader().getExtraData()).isEqualTo(extraData);
+  }
+
+  @Test
+  public void childTimestampExceedsParentsFails() {
+    BlockHeader terminalHeader = terminalPowBlock();
+    sendNewPayloadAndForkchoiceUpdate(
+        new Block(terminalHeader, BlockBody.empty()), Optional.empty(), Hash.ZERO);
+
+    BlockHeader parentHeader = nextBlockHeader(terminalHeader);
+    Block parent = new Block(parentHeader, BlockBody.empty());
+    sendNewPayloadAndForkchoiceUpdate(parent, Optional.empty(), terminalHeader.getHash());
+
+    BlockHeader childHeader = nextBlockHeader(parentHeader, parentHeader.getTimestamp());
+    Block child = new Block(childHeader, BlockBody.empty());
+    coordinator.rememberBlock(child);
+
+    ForkchoiceResult result =
+        coordinator.updateForkChoice(
+            childHeader, terminalHeader.getHash(), terminalHeader.getHash());
+
+    assertThat(result.shouldNotProceedToPayloadBuildProcess()).isTrue();
+    assertThat(result.getErrorMessage()).isPresent();
+    assertThat(result.getErrorMessage().get())
+        .isEqualTo("new head timestamp not greater than parent");
+
+    verify(blockchain, never()).setFinalized(childHeader.getHash());
+    verify(mergeContext, never()).setFinalized(childHeader);
+    verify(blockchain, never()).setSafeBlock(childHeader.getHash());
+    verify(mergeContext, never()).setSafeBlock(childHeader);
+
+    assertThat(this.coordinator.latestValidAncestorDescendsFromTerminal(child.getHeader()))
+        .isTrue();
+  }
+
+  @Test
+  public void latestValidAncestorDescendsFromTerminal() {
+    BlockHeader terminalHeader = terminalPowBlock();
+    sendNewPayloadAndForkchoiceUpdate(
+        new Block(terminalHeader, BlockBody.empty()), Optional.empty(), Hash.ZERO);
+
+    BlockHeader parentHeader = nextBlockHeader(terminalHeader);
+    Block parent = new Block(parentHeader, BlockBody.empty());
+
+    // if latest valid ancestor is PoW, then latest valid hash should be Hash.ZERO
+    var lvh = this.coordinator.getLatestValidAncestor(parentHeader);
+    assertThat(lvh).isPresent();
+    assertThat(lvh.get()).isEqualTo(Hash.ZERO);
+
+    sendNewPayloadAndForkchoiceUpdate(parent, Optional.empty(), terminalHeader.getHash());
+    BlockHeader childHeader = nextBlockHeader(parentHeader);
+    Block child = new Block(childHeader, BlockBody.empty());
+    coordinator.validateBlock(child);
+    assertThat(this.coordinator.latestValidAncestorDescendsFromTerminal(child.getHeader()))
+        .isTrue();
+    var nextLvh = this.coordinator.getLatestValidAncestor(childHeader);
+    assertThat(nextLvh).isPresent();
+    assertThat(nextLvh.get()).isEqualTo(parentHeader.getHash());
+  }
+
+  @Test
+  public void latestValidAncestorDescendsFromFinalizedBlock() {
+    BlockHeader terminalHeader = terminalPowBlock();
+    sendNewPayloadAndForkchoiceUpdate(
+        new Block(terminalHeader, BlockBody.empty()), Optional.empty(), Hash.ZERO);
+
+    BlockHeader grandParentHeader = nextBlockHeader(terminalHeader);
+    Block grandParent = new Block(grandParentHeader, BlockBody.empty());
+
+    // if latest valid ancestor is PoW, then latest valid hash should be Hash.ZERO
+    var lvh = this.coordinator.getLatestValidAncestor(grandParentHeader);
+    assertThat(lvh).isPresent();
+    assertThat(lvh.get()).isEqualTo(Hash.ZERO);
+
+    sendNewPayloadAndForkchoiceUpdate(grandParent, Optional.empty(), terminalHeader.getHash());
+    BlockHeader parentHeader = nextBlockHeader(grandParentHeader);
+    Block parent = new Block(parentHeader, BlockBody.empty());
+    sendNewPayloadAndForkchoiceUpdate(
+        parent, Optional.of(grandParentHeader), grandParentHeader.getHash());
+
+    BlockHeader childHeader = nextBlockHeader(parentHeader);
+    Block child = new Block(childHeader, BlockBody.empty());
+    coordinator.validateBlock(child);
+
+    assertThat(this.coordinator.latestValidAncestorDescendsFromTerminal(child.getHeader()))
+        .isTrue();
+
+    var nextLvh = this.coordinator.getLatestValidAncestor(childHeader);
+    assertThat(nextLvh).isPresent();
+    assertThat(nextLvh.get()).isEqualTo(parentHeader.getHash());
+
+    verify(mergeContext, never()).getTerminalPoWBlock();
+  }
+
+  @Test
+  public void updateForkChoiceShouldPersistFirstFinalizedBlockHash() {
+    BlockHeader terminalHeader = terminalPowBlock();
+    sendNewPayloadAndForkchoiceUpdate(
+        new Block(terminalHeader, BlockBody.empty()), Optional.empty(), Hash.ZERO);
+
+    BlockHeader firstFinalizedHeader = nextBlockHeader(terminalHeader);
+    Block firstFinalizedBlock = new Block(firstFinalizedHeader, BlockBody.empty());
+    sendNewPayloadAndForkchoiceUpdate(
+        firstFinalizedBlock, Optional.empty(), terminalHeader.getHash());
+
+    BlockHeader headBlockHeader = nextBlockHeader(firstFinalizedHeader);
+    Block headBlock = new Block(headBlockHeader, BlockBody.empty());
+    sendNewPayloadAndForkchoiceUpdate(
+        headBlock, Optional.of(firstFinalizedHeader), firstFinalizedHeader.getHash());
+
+    verify(blockchain).setFinalized(firstFinalizedBlock.getHash());
+    verify(mergeContext).setFinalized(firstFinalizedHeader);
+    verify(blockchain).setSafeBlock(firstFinalizedBlock.getHash());
+    verify(mergeContext).setSafeBlock(firstFinalizedHeader);
+  }
+
+  @Test
+  public void reorgAroundLogBloomCacheUpdate() {
+    // generate 5 blocks, remember them in order, all need to be parented correctly.
+    BlockHeader prevParent = genesisState.getBlock().getHeader();
+
+    AtomicReference<BlockAddedEvent> lastBlockAddedEvent = new AtomicReference<>();
+    blockchain.observeBlockAdded(
+        new BlockAddedObserver() {
+          @Override
+          public void onBlockAdded(final BlockAddedEvent event) {
+            LOG.info(event.toString());
+            lastBlockAddedEvent.set(event);
+          }
+        });
+    for (int i = 0; i <= 5; i++) {
+      BlockHeader nextBlock =
+          nextBlockHeader(
+              prevParent, genesisState.getBlock().getHeader().getTimestamp() + i * 1000);
+      coordinator.rememberBlock(new Block(nextBlock, BlockBody.empty()));
+      prevParent = nextBlock;
+    }
+
+    coordinator.updateForkChoice(
+        prevParent, genesisState.getBlock().getHash(), genesisState.getBlock().getHash());
+    Hash expectedCommonAncestor = blockchain.getBlockHeader(2).get().getBlockHash();
+
+    // generate from 3' down to some other head. Remember those.
+    BlockHeader forkPoint = blockchain.getBlockHeader(2).get();
+    prevParent = forkPoint;
+    for (int i = 3; i <= 5; i++) {
+      BlockHeader nextPrime =
+          nextBlockHeader(
+              prevParent, genesisState.getBlock().getHeader().getTimestamp() + i * 1001);
+      coordinator.rememberBlock(new Block(nextPrime, BlockBody.empty()));
+      prevParent = nextPrime;
+    }
+    coordinator.updateForkChoice(
+        prevParent, genesisState.getBlock().getHash(), genesisState.getBlock().getHash());
+    assertThat(lastBlockAddedEvent.get().getCommonAncestorHash()).isEqualTo(expectedCommonAncestor);
+    assertThat(lastBlockAddedEvent.get().getEventType()).isEqualTo(EventType.CHAIN_REORG);
+    assertThat(lastBlockAddedEvent.get().getBlock().getHash()).isEqualTo(prevParent.getBlockHash());
+  }
+
+  @Test
+  public void updateForkChoiceShouldPersistLastFinalizedBlockHash() {
+    BlockHeader terminalHeader = terminalPowBlock();
+    sendNewPayloadAndForkchoiceUpdate(
+        new Block(terminalHeader, BlockBody.empty()), Optional.empty(), Hash.ZERO);
+
+    BlockHeader prevFinalizedHeader = nextBlockHeader(terminalHeader);
+    Block prevFinalizedBlock = new Block(prevFinalizedHeader, BlockBody.empty());
+    sendNewPayloadAndForkchoiceUpdate(
+        prevFinalizedBlock, Optional.empty(), terminalHeader.getHash());
+
+    BlockHeader lastFinalizedHeader = nextBlockHeader(prevFinalizedHeader);
+    Block lastFinalizedBlock = new Block(lastFinalizedHeader, BlockBody.empty());
+    sendNewPayloadAndForkchoiceUpdate(
+        lastFinalizedBlock, Optional.of(prevFinalizedHeader), prevFinalizedHeader.getHash());
+
+    BlockHeader headBlockHeader = nextBlockHeader(lastFinalizedHeader);
+    Block headBlock = new Block(headBlockHeader, BlockBody.empty());
+    sendNewPayloadAndForkchoiceUpdate(
+        headBlock, Optional.of(lastFinalizedHeader), lastFinalizedHeader.getHash());
+
+    verify(blockchain).setFinalized(lastFinalizedBlock.getHash());
+    verify(mergeContext).setFinalized(lastFinalizedHeader);
+    verify(blockchain).setSafeBlock(lastFinalizedBlock.getHash());
+    verify(mergeContext).setSafeBlock(lastFinalizedHeader);
+  }
+
+  @Test
+  public void assertGetOrSyncForBlockAlreadyPresent() {
+    BlockHeader mockHeader =
+        headerGenerator.parentHash(Hash.fromHexStringLenient("0xdead")).buildHeader();
+    when(blockchain.getBlockHeader(mockHeader.getHash())).thenReturn(Optional.of(mockHeader));
+    var res = coordinator.getOrSyncHeadByHash(mockHeader.getHash(), Hash.ZERO);
+
+    assertThat(res).isPresent();
+  }
+
+  @Test
+  public void assertGetOrSyncForBlockNotPresent() {
+    BlockHeader mockHeader =
+        headerGenerator.parentHash(Hash.fromHexStringLenient("0xbeef")).buildHeader();
+    when(backwardSyncContext.syncBackwardsUntil(mockHeader.getBlockHash()))
+        .thenReturn(CompletableFuture.completedFuture(null));
+
+    var res = coordinator.getOrSyncHeadByHash(mockHeader.getHash(), Hash.ZERO);
+
+    assertThat(res).isNotPresent();
+  }
+
+  @Test
+  public void ancestorIsValidTerminalProofOfWork() {
+    final long howDeep = 100L;
+    assertThat(
+            terminalAncestorMock(howDeep, true)
+                .ancestorIsValidTerminalProofOfWork(
+                    new BlockHeaderTestFixture().number(howDeep).buildHeader()))
+        .isTrue();
+  }
+
+  @Test
+  public void assertCachedUnfinalizedAncestorDescendsFromTTD() {
+    final long howDeep = 10;
+    var mockBlockHeader = new BlockHeaderTestFixture().number(howDeep).buildHeader();
+    var mockCoordinator = terminalAncestorMock(howDeep, true);
+    assertThat(
+            mockCoordinator.ancestorIsValidTerminalProofOfWork(
+                new BlockHeaderTestFixture().number(howDeep).buildHeader()))
+        .isTrue();
+
+    // assert that parent block was cached as descending from TTD
+    assertThat(
+            mockCoordinator.ancestorIsValidTerminalProofOfWork(
+                new BlockHeaderTestFixture()
+                    .number(howDeep + 1)
+                    .parentHash(mockBlockHeader.getHash())
+                    .buildHeader()))
+        .isTrue();
+  }
+
+  @Test
+  public void ancestorNotFoundValidTerminalProofOfWork() {
+    final long howDeep = 10L;
+    assertThat(
+            terminalAncestorMock(howDeep, false)
+                .ancestorIsValidTerminalProofOfWork(
+                    new BlockHeaderTestFixture().number(howDeep).buildHeader()))
+        .isFalse();
+  }
+
+  @Test
+  public void assertNonGenesisTerminalBlockSatisfiesDescendsFromTerminal() {
+
+    var mockConsensusContext = mock(MergeContext.class);
+    when(mockConsensusContext.getTerminalTotalDifficulty()).thenReturn(Difficulty.of(1337L));
+    var mockBlockchain = mock(MutableBlockchain.class);
+    var mockProtocolContext = mock(ProtocolContext.class);
+    when(mockProtocolContext.getBlockchain()).thenReturn(mockBlockchain);
+    when(mockProtocolContext.getConsensusContext(MergeContext.class))
+        .thenReturn(mockConsensusContext);
+
+    var mockHeaderBuilder = new BlockHeaderTestFixture();
+
+    MergeCoordinator mockCoordinator =
+        new MergeCoordinator(
+            mockProtocolContext,
+            protocolSchedule,
+            CompletableFuture::runAsync,
+            transactions,
+            new MiningParameters.Builder().coinbase(coinbase).build(),
+            mock(BackwardSyncContext.class),
+            Optional.empty());
+
+    var blockZero = mockHeaderBuilder.number(0L).difficulty(Difficulty.of(1336L)).buildHeader();
+    var blockOne =
+        mockHeaderBuilder
+            .number(1L)
+            .difficulty(Difficulty.ONE)
+            .parentHash(blockZero.getHash())
+            .buildHeader();
+    var blockTwo =
+        mockHeaderBuilder
+            .number(2L)
+            .difficulty(Difficulty.ZERO)
+            .parentHash(blockOne.getHash())
+            .buildHeader();
+    var blockThree = mockHeaderBuilder.number(3L).parentHash(blockTwo.getHash()).buildHeader();
+
+    when(mockBlockchain.getTotalDifficultyByHash(any()))
+        .thenReturn(Optional.of(Difficulty.of(1337L)));
+    when(mockBlockchain.getTotalDifficultyByHash(blockZero.getHash()))
+        .thenReturn(Optional.of(Difficulty.of(1336L)));
+
+    when(mockBlockchain.getBlockHeader(blockOne.getHash())).thenReturn(Optional.of(blockOne));
+    when(mockBlockchain.getBlockHeader(blockTwo.getHash())).thenReturn(Optional.of(blockTwo));
+    when(mockBlockchain.getBlockHeader(blockThree.getHash())).thenReturn(Optional.of(blockThree));
+
+    // assert pre-merge genesis block does not descend from terminal
+    assertThat(mockCoordinator.latestValidAncestorDescendsFromTerminal(blockZero)).isFalse();
+    assertThat(mockCoordinator.latestDescendsFromTerminal.get()).isNull();
+    // assert TTD merge block (1) descends from terminal returns true
+    assertThat(mockCoordinator.latestValidAncestorDescendsFromTerminal(blockOne)).isTrue();
+    assertThat(mockCoordinator.latestDescendsFromTerminal.get()).isNull();
+    // assert post-merge block (2) descends from terminal returns true
+    assertThat(mockCoordinator.latestValidAncestorDescendsFromTerminal(blockTwo)).isTrue();
+    assertThat(mockCoordinator.latestDescendsFromTerminal.get()).isEqualTo(blockTwo);
+    // assert post-merge block (3) descends from terminal returns true
+    assertThat(mockCoordinator.latestValidAncestorDescendsFromTerminal(blockThree)).isTrue();
+    assertThat(mockCoordinator.latestDescendsFromTerminal.get()).isEqualTo(blockThree);
+  }
+
+  @Test
+  public void assertMergeAtGenesisSatisifiesTerminalPoW() {
+    var mockConsensusContext = mock(MergeContext.class);
+    when(mockConsensusContext.getTerminalTotalDifficulty()).thenReturn(Difficulty.of(1337L));
+    var mockBlockchain = mock(MutableBlockchain.class);
+    when(mockBlockchain.getTotalDifficultyByHash(any(Hash.class)))
+        .thenReturn(Optional.of(Difficulty.of(1337L)));
+    var mockProtocolContext = mock(ProtocolContext.class);
+    when(mockProtocolContext.getBlockchain()).thenReturn(mockBlockchain);
+    when(mockProtocolContext.getConsensusContext(MergeContext.class))
+        .thenReturn(mockConsensusContext);
+
+    var mockHeaderBuilder = new BlockHeaderTestFixture();
+
+    MergeCoordinator mockCoordinator =
+        new MergeCoordinator(
+            mockProtocolContext,
+            protocolSchedule,
+            CompletableFuture::runAsync,
+            transactions,
+            new MiningParameters.Builder().coinbase(coinbase).build(),
+            mock(BackwardSyncContext.class),
+            Optional.empty());
+
+    var blockZero = mockHeaderBuilder.number(0L).buildHeader();
+    var blockOne = mockHeaderBuilder.number(1L).parentHash(blockZero.getHash()).buildHeader();
+
+    // assert total difficulty found for block 1 return true if post-merge
+    assertThat(mockCoordinator.latestValidAncestorDescendsFromTerminal(blockOne)).isTrue();
+    // change mock behavior to not find TTD for block 1 and defer to parent
+    when(mockBlockchain.getTotalDifficultyByHash(blockOne.getBlockHash()))
+        .thenReturn(Optional.empty());
+    // assert total difficulty NOT found for block 1 returns true if parent is post-merge
+    assertThat(mockCoordinator.latestValidAncestorDescendsFromTerminal(blockOne)).isTrue();
+    // assert true if we send in a merge-at-genesis block
+    assertThat(mockCoordinator.latestValidAncestorDescendsFromTerminal(blockZero)).isTrue();
+
+    // change mock TTD so that neither block satisfies TTD condition:
+    when(mockConsensusContext.getTerminalTotalDifficulty())
+        .thenReturn(Difficulty.of(UInt256.fromHexString("0xdeadbeef")));
+    assertThat(mockCoordinator.latestValidAncestorDescendsFromTerminal(blockOne)).isFalse();
+    // assert true if we send in a merge-at-genesis block
+    assertThat(mockCoordinator.latestValidAncestorDescendsFromTerminal(blockZero)).isFalse();
+  }
+
+  @Test
+  public void forkchoiceUpdateShouldIgnoreAncestorOfChainHead() {
+    BlockHeader terminalHeader = terminalPowBlock();
+    sendNewPayloadAndForkchoiceUpdate(
+        new Block(terminalHeader, BlockBody.empty()), Optional.empty(), Hash.ZERO);
+
+    BlockHeader parentHeader = nextBlockHeader(terminalHeader);
+    Block parent = new Block(parentHeader, BlockBody.empty());
+    sendNewPayloadAndForkchoiceUpdate(parent, Optional.empty(), terminalHeader.getHash());
+
+    BlockHeader childHeader = nextBlockHeader(parentHeader);
+    Block child = new Block(childHeader, BlockBody.empty());
+    sendNewPayloadAndForkchoiceUpdate(child, Optional.empty(), parent.getHash());
+
+    ForkchoiceResult res =
+        coordinator.updateForkChoice(parentHeader, Hash.ZERO, terminalHeader.getHash());
+
+    assertThat(res.getStatus()).isEqualTo(ForkchoiceResult.Status.IGNORE_UPDATE_TO_OLD_HEAD);
+    assertThat(res.shouldNotProceedToPayloadBuildProcess()).isTrue();
+    assertThat(res.getNewHead().isEmpty()).isTrue();
+    assertThat(res.getLatestValid().isPresent()).isTrue();
+    assertThat(res.getLatestValid().get()).isEqualTo(parentHeader.getHash());
+    assertThat(res.getErrorMessage().isEmpty()).isTrue();
+
+    verify(blockchain, never()).rewindToBlock(any());
+  }
+
+  private void sendNewPayloadAndForkchoiceUpdate(
+      final Block block, final Optional<BlockHeader> finalizedHeader, final Hash safeHash) {
+
+    assertThat(coordinator.rememberBlock(block).getYield()).isPresent();
+    assertThat(
+            coordinator
+                .updateForkChoice(
+                    block.getHeader(),
+                    finalizedHeader.map(BlockHeader::getHash).orElse(Hash.ZERO),
+                    safeHash)
+                .shouldNotProceedToPayloadBuildProcess())
+        .isFalse();
+
+    when(mergeContext.getFinalized()).thenReturn(finalizedHeader);
+  }
+
+  private BlockHeader terminalPowBlock() {
+    return headerGenerator
+        .difficulty(Difficulty.MAX_VALUE)
+        .parentHash(genesisState.getBlock().getHash())
+        .number(genesisState.getBlock().getHeader().getNumber() + 1)
+        .baseFeePerGas(
+            feeMarket.computeBaseFee(
+                genesisState.getBlock().getHeader().getNumber() + 1,
+                genesisState.getBlock().getHeader().getBaseFee().orElse(Wei.of(0x3b9aca00)),
+                0,
+                15000000l))
+        .timestamp(1)
+        .gasLimit(genesisState.getBlock().getHeader().getGasLimit())
+        .stateRoot(genesisState.getBlock().getHeader().getStateRoot())
+        .buildHeader();
+  }
+
+  private BlockHeader nextBlockHeader(
+      final BlockHeader parentHeader, final long... optionalTimestamp) {
+
+    return headerGenerator
+        .difficulty(Difficulty.ZERO)
+        .parentHash(parentHeader.getHash())
+        .gasLimit(genesisState.getBlock().getHeader().getGasLimit())
+        .number(parentHeader.getNumber() + 1)
+        .stateRoot(genesisState.getBlock().getHeader().getStateRoot())
+        .timestamp(
+            optionalTimestamp.length > 0 ? optionalTimestamp[0] : parentHeader.getTimestamp() + 12)
+        .baseFeePerGas(
+            feeMarket.computeBaseFee(
+                genesisState.getBlock().getHeader().getNumber() + 1,
+                parentHeader.getBaseFee().orElse(Wei.of(0x3b9aca00)),
+                0,
+                15000000l))
+        .buildHeader();
+  }
+
+  MergeCoordinator terminalAncestorMock(final long chainDepth, final boolean hasTerminalPoW) {
+    final Difficulty mockTTD = Difficulty.of(1000);
+    BlockHeaderTestFixture builder = new BlockHeaderTestFixture().baseFeePerGas(Wei.ONE);
+    MutableBlockchain mockBlockchain = mock(MutableBlockchain.class);
+
+    BlockHeader terminal =
+        spy(
+            builder
+                .number(0L)
+                .difficulty(hasTerminalPoW ? mockTTD : Difficulty.ZERO)
+                .buildHeader());
+    when(terminal.getParentHash()).thenReturn(Hash.ZERO);
+
+    // return decreasing numbered blocks:
+    final var invocations = new AtomicLong(chainDepth);
+    when(mockBlockchain.getBlockHeader(any()))
+        .thenAnswer(
+            z ->
+                Optional.of(
+                    (invocations.decrementAndGet() < 1)
+                        ? terminal
+                        : builder
+                            .difficulty(Difficulty.ZERO)
+                            .number(invocations.get())
+                            .buildHeader()));
+
+    // mock total difficulty for isTerminalProofOfWorkBlock invocation:
+    when(mockBlockchain.getTotalDifficultyByHash(any())).thenReturn(Optional.of(Difficulty.ZERO));
+    when(mockBlockchain.getBlockHeader(Hash.ZERO)).thenReturn(Optional.empty());
+
+    var mockContext = mock(MergeContext.class);
+    when(mockContext.getTerminalTotalDifficulty()).thenReturn(mockTTD);
+    ProtocolContext mockProtocolContext = mock(ProtocolContext.class);
+    when(mockProtocolContext.getBlockchain()).thenReturn(mockBlockchain);
+    when(mockProtocolContext.getConsensusContext(any())).thenReturn(mockContext);
+
+    MergeCoordinator mockCoordinator =
+        spy(
+            new MergeCoordinator(
+                mockProtocolContext,
+                protocolSchedule,
+                CompletableFuture::runAsync,
+                transactions,
+                new MiningParameters.Builder().coinbase(coinbase).build(),
+                mock(BackwardSyncContext.class),
+                Optional.empty()));
+
+    return mockCoordinator;
+  }
+
+  private Transaction createTransaction(final long transactionNumber) {
+    return new TransactionTestFixture()
+        .value(Wei.of(transactionNumber + 1))
+        .to(Optional.of(Address.ZERO))
+        .gasLimit(53000L)
+        .gasPrice(
+            Wei.fromHexString("0x00000000000000000000000000000000000000000000000000000013b9aca00"))
+        .maxFeePerGas(
+            Optional.of(
+                Wei.fromHexString(
+                    "0x00000000000000000000000000000000000000000000000000000013b9aca00")))
+        .maxPriorityFeePerGas(Optional.of(Wei.of(100_000)))
+        .nonce(transactionNumber)
+        .createTransaction(KEYS1);
+  }
+
+  private static BlockHeader mockBlockHeader() {
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getBaseFee()).thenReturn(Optional.of(Wei.ONE));
+    return blockHeader;
+  }
+}
diff --git a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeGenesisConfigHelper.java b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeGenesisConfigHelper.java
new file mode 100644
index 00000000000..a1c8eaf1c3a
--- /dev/null
+++ b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeGenesisConfigHelper.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge.blockcreation;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import org.hyperledger.besu.config.GenesisAllocation;
+import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.consensus.merge.MergeProtocolSchedule;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.stream.Stream;
+
+import com.google.common.io.Resources;
+
+public interface MergeGenesisConfigHelper {
+
+  default GenesisConfigFile getPosGenesisConfigFile() {
+    try {
+      final URI uri = MergeGenesisConfigHelper.class.getResource("/posAtGenesis.json").toURI();
+      return GenesisConfigFile.fromConfig(Resources.toString(uri.toURL(), UTF_8));
+    } catch (final URISyntaxException | IOException e) {
+      throw new IllegalStateException(e);
+    }
+  }
+
+  default GenesisConfigFile getPowGenesisConfigFile() {
+    try {
+      final URI uri = MergeGenesisConfigHelper.class.getResource("/powAtGenesis.json").toURI();
+      return GenesisConfigFile.fromConfig(Resources.toString(uri.toURL(), UTF_8));
+    } catch (final URISyntaxException | IOException e) {
+      throw new IllegalStateException(e);
+    }
+  }
+
+  default Stream<Address> genesisAllocations(final GenesisConfigFile configFile) {
+    return configFile
+        .streamAllocations()
+        .map(GenesisAllocation::getAddress)
+        .map(Address::fromHexString);
+  }
+
+  default ProtocolSchedule getMergeProtocolSchedule() {
+    return MergeProtocolSchedule.create(getPosGenesisConfigFile().getConfigOptions(), false);
+  }
+}
diff --git a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeReorgTest.java b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeReorgTest.java
new file mode 100644
index 00000000000..bd18caa9ea1
--- /dev/null
+++ b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeReorgTest.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge.blockcreation;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
+import static org.mockito.Mockito.mock;
+
+import org.hyperledger.besu.config.MergeConfigOptions;
+import org.hyperledger.besu.consensus.merge.MergeContext;
+import org.hyperledger.besu.consensus.merge.PostMergeContext;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.BlockProcessingResult;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.GenesisState;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.eth.sync.backwardsync.BackwardSyncContext;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.LondonFeeMarket;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.util.LogConfigurator;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+public class MergeReorgTest implements MergeGenesisConfigHelper {
+
+  @Mock PendingTransactions mockPendingTransactions;
+
+  private MergeCoordinator coordinator;
+
+  private final MergeContext mergeContext = PostMergeContext.get();
+  private final ProtocolSchedule mockProtocolSchedule = getMergeProtocolSchedule();
+  private final GenesisState genesisState =
+      GenesisState.fromConfig(getPowGenesisConfigFile(), mockProtocolSchedule);
+
+  private final WorldStateArchive worldStateArchive = createInMemoryWorldStateArchive();
+  private final MutableBlockchain blockchain = createInMemoryBlockchain(genesisState.getBlock());
+
+  private final ProtocolContext protocolContext =
+      new ProtocolContext(blockchain, worldStateArchive, mergeContext, Optional.empty());
+
+  private final Address coinbase = genesisAllocations(getPowGenesisConfigFile()).findFirst().get();
+  private final BlockHeaderTestFixture headerGenerator = new BlockHeaderTestFixture();
+  private final BaseFeeMarket feeMarket =
+      new LondonFeeMarket(0, genesisState.getBlock().getHeader().getBaseFee());
+
+  @BeforeEach
+  public void setUp() {
+    var mutable = worldStateArchive.getMutable();
+    genesisState.writeStateTo(mutable);
+    mutable.persist(null);
+    mergeContext.setTerminalTotalDifficulty(Difficulty.of(1001));
+    MergeConfigOptions.setMergeEnabled(true);
+    this.coordinator =
+        new MergeCoordinator(
+            protocolContext,
+            mockProtocolSchedule,
+            CompletableFuture::runAsync,
+            mockPendingTransactions,
+            new MiningParameters.Builder().coinbase(coinbase).build(),
+            mock(BackwardSyncContext.class),
+            Optional.empty());
+    mergeContext.setIsPostMerge(genesisState.getBlock().getHeader().getDifficulty());
+    blockchain.observeBlockAdded(
+        blockAddedEvent ->
+            blockchain
+                .getTotalDifficultyByHash(blockAddedEvent.getBlock().getHeader().getHash())
+                .ifPresent(mergeContext::setIsPostMerge));
+  }
+
+  /* Validation scenario as described over Discord:
+  as long as a post-merge PoS block has not been finalized,
+  then you can and should be able to re-org to a different pre-TTD block
+  say there is viable TTD block A and B, then we can have a PoS chain build on A for a while
+      and then see another PoS chain build on B that has a higher fork choice weight and causes a re-org
+  once any post-merge PoS chain is finalized though, you'd never re-org any PoW blocks in the tree ever again */
+
+  @Test
+  public void reorgsAcrossTDDToDifferentTargetsWhenNotFinal() {
+    // Add N blocks to chain from genesis, where total diff is < TTD
+    LogConfigurator.setLevel(BlockHeaderValidator.class.getName(), "DEBUG");
+    List<Block> endOfWork = subChain(genesisState.getBlock().getHeader(), 10, Difficulty.of(100L));
+    endOfWork.stream().forEach(this::appendBlock);
+    assertThat(blockchain.getChainHead().getHeight()).isEqualTo(10L);
+    BlockHeader tddPenultimate = this.blockchain.getChainHeadHeader();
+    // Add TTD block A to chain as child of N.
+    Block ttdA = new Block(terminalPowBlock(tddPenultimate, Difficulty.ONE), BlockBody.empty());
+    appendBlock(ttdA);
+    assertThat(blockchain.getChainHead().getHeight()).isEqualTo(11L);
+    assertThat(blockchain.getTotalDifficultyByHash(ttdA.getHash())).isPresent();
+    Difficulty tdd = blockchain.getTotalDifficultyByHash(ttdA.getHash()).get();
+    assertThat(tdd.getAsBigInteger())
+        .isGreaterThan(
+            getPosGenesisConfigFile()
+                .getConfigOptions()
+                .getTerminalTotalDifficulty()
+                .get()
+                .toBigInteger());
+    assertThat(mergeContext.isPostMerge()).isTrue();
+    List<Block> builtOnTTDA = subChain(ttdA.getHeader(), 5, Difficulty.of(0L));
+    builtOnTTDA.stream().forEach(this::appendBlock);
+    assertThat(blockchain.getChainHead().getHeight()).isEqualTo(16);
+    assertThat(blockchain.getChainHead().getHash())
+        .isEqualTo(builtOnTTDA.get(builtOnTTDA.size() - 1).getHash());
+
+    Block ttdB = new Block(terminalPowBlock(tddPenultimate, Difficulty.of(2L)), BlockBody.empty());
+    appendBlock(ttdB);
+    List<Block> builtOnTTDB = subChain(ttdB.getHeader(), 10, Difficulty.of(0L));
+    builtOnTTDB.stream().forEach(this::appendBlock);
+    assertThat(blockchain.getChainHead().getHeight()).isEqualTo(21);
+    assertThat(blockchain.getChainHead().getHash())
+        .isEqualTo(builtOnTTDB.get(builtOnTTDB.size() - 1).getHash());
+    // don't finalize
+    // Create a new chain back to A which has
+
+  }
+
+  private void appendBlock(final Block block) {
+    final BlockProcessingResult result = coordinator.validateBlock(block);
+
+    if (result.isSuccessful()) {
+      result
+          .getYield()
+          .ifPresentOrElse(
+              outputs -> blockchain.appendBlock(block, outputs.getReceipts()),
+              () -> {
+                if (result.causedBy().isPresent()) {
+                  throw new RuntimeException(result.errorMessage.get(), result.causedBy().get());
+                }
+                throw new RuntimeException(result.errorMessage.get());
+              });
+    } else {
+      if (result.causedBy().isPresent()) {
+        throw new RuntimeException(result.errorMessage.get(), result.causedBy().get());
+      }
+      throw new RuntimeException(result.errorMessage.get());
+    }
+  }
+
+  private List<Block> subChain(
+      final BlockHeader parentHeader, final long length, final Difficulty each) {
+    BlockHeader newParent = parentHeader;
+    List<Block> retval = new ArrayList<>();
+    for (long i = 1; i <= length; i++) {
+      headerGenerator
+          .parentHash(newParent.getHash())
+          .number(newParent.getNumber() + 1)
+          .baseFeePerGas(
+              feeMarket.computeBaseFee(
+                  genesisState.getBlock().getHeader().getNumber() + 1,
+                  newParent.getBaseFee().orElse(Wei.of(0x3b9aca00)),
+                  0,
+                  15000000))
+          .gasLimit(newParent.getGasLimit())
+          .timestamp(newParent.getTimestamp() + 1)
+          .stateRoot(newParent.getStateRoot());
+      if (each.greaterOrEqualThan(Difficulty.ZERO)) {
+        headerGenerator.difficulty(each);
+      }
+      BlockHeader h = headerGenerator.buildHeader();
+      retval.add(new Block(h, BlockBody.empty()));
+      newParent = h;
+    }
+    return retval;
+  }
+
+  private BlockHeader terminalPowBlock(final BlockHeader parent, final Difficulty diff) {
+
+    BlockHeader terminal =
+        headerGenerator
+            .difficulty(diff)
+            .parentHash(parent.getHash())
+            .number(parent.getNumber() + 1)
+            .baseFeePerGas(
+                feeMarket.computeBaseFee(
+                    genesisState.getBlock().getHeader().getNumber() + 1,
+                    parent.getBaseFee().orElse(Wei.of(0x3b9aca00)),
+                    0,
+                    15000000l))
+            .gasLimit(parent.getGasLimit())
+            .timestamp(parent.getTimestamp() + 1)
+            .stateRoot(parent.getStateRoot())
+            .buildHeader();
+    return terminal;
+  }
+}
diff --git a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/PayloadIdentifierTest.java b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/PayloadIdentifierTest.java
new file mode 100644
index 00000000000..39597f9aabe
--- /dev/null
+++ b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/PayloadIdentifierTest.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge.blockcreation;
+
+import static java.util.Collections.emptyList;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.GWei;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt64;
+import org.junit.jupiter.api.Test;
+
+public class PayloadIdentifierTest {
+
+  @Test
+  public void serializesToEvenHexRepresentation() {
+
+    List.of("0x150dd", "0xdeadbeef", Long.valueOf(Long.MAX_VALUE).toString(), "0").stream()
+        .forEach(
+            id -> {
+              PayloadIdentifier idTest = new PayloadIdentifier(id);
+              assertThat(idTest.toHexString().length() % 2).isEqualTo(0);
+              assertThat(idTest.toShortHexString().length() % 2).isEqualTo(0);
+              assertThat(idTest.serialize().length() % 2).isEqualTo(0);
+            });
+  }
+
+  @Test
+  public void conversionCoverage() {
+    var idTest =
+        PayloadIdentifier.forPayloadParams(
+            Hash.ZERO, 1337L, Bytes32.random(), Address.fromHexString("0x42"), Optional.empty());
+    assertThat(new PayloadIdentifier(idTest.getAsBigInteger().longValue())).isEqualTo(idTest);
+    assertThat(new PayloadIdentifier(idTest.getAsBigInteger().longValue())).isEqualTo(idTest);
+  }
+
+  @Test
+  public void differentWithdrawalAmountsYieldDifferentHash() {
+    final List<Withdrawal> withdrawals1 =
+        List.of(
+            new Withdrawal(
+                UInt64.valueOf(100),
+                UInt64.valueOf(1000),
+                Address.fromHexString("0x1"),
+                GWei.of(1)),
+            new Withdrawal(
+                UInt64.valueOf(200),
+                UInt64.valueOf(2000),
+                Address.fromHexString("0x2"),
+                GWei.of(2)));
+    final List<Withdrawal> withdrawals2 =
+        List.of(
+            new Withdrawal(
+                UInt64.valueOf(100),
+                UInt64.valueOf(1000),
+                Address.fromHexString("0x1"),
+                GWei.of(3)),
+            new Withdrawal(
+                UInt64.valueOf(200),
+                UInt64.valueOf(2000),
+                Address.fromHexString("0x2"),
+                GWei.of(4)));
+    final Bytes32 prevRandao = Bytes32.random();
+    var idForWithdrawals1 =
+        PayloadIdentifier.forPayloadParams(
+            Hash.ZERO, 1337L, prevRandao, Address.fromHexString("0x42"), Optional.of(withdrawals1));
+    var idForWithdrawals2 =
+        PayloadIdentifier.forPayloadParams(
+            Hash.ZERO, 1337L, prevRandao, Address.fromHexString("0x42"), Optional.of(withdrawals2));
+    assertThat(idForWithdrawals1).isNotEqualTo(idForWithdrawals2);
+  }
+
+  @Test
+  public void differentOrderedWithdrawalsYieldSameHash() {
+    final List<Withdrawal> withdrawals1 =
+        List.of(
+            new Withdrawal(
+                UInt64.valueOf(100),
+                UInt64.valueOf(1000),
+                Address.fromHexString("0x1"),
+                GWei.of(1)),
+            new Withdrawal(
+                UInt64.valueOf(200),
+                UInt64.valueOf(2000),
+                Address.fromHexString("0x2"),
+                GWei.of(2)));
+    final List<Withdrawal> withdrawals2 =
+        List.of(
+            new Withdrawal(
+                UInt64.valueOf(200),
+                UInt64.valueOf(2000),
+                Address.fromHexString("0x2"),
+                GWei.of(2)),
+            new Withdrawal(
+                UInt64.valueOf(100),
+                UInt64.valueOf(1000),
+                Address.fromHexString("0x1"),
+                GWei.of(1)));
+    final Bytes32 prevRandao = Bytes32.random();
+    var idForWithdrawals1 =
+        PayloadIdentifier.forPayloadParams(
+            Hash.ZERO, 1337L, prevRandao, Address.fromHexString("0x42"), Optional.of(withdrawals1));
+    var idForWithdrawals2 =
+        PayloadIdentifier.forPayloadParams(
+            Hash.ZERO, 1337L, prevRandao, Address.fromHexString("0x42"), Optional.of(withdrawals2));
+    assertThat(idForWithdrawals1).isEqualTo(idForWithdrawals2);
+  }
+
+  @Test
+  public void emptyOptionalAndEmptyListWithdrawalsYieldDifferentHash() {
+    final Bytes32 prevRandao = Bytes32.random();
+    var idForWithdrawals1 =
+        PayloadIdentifier.forPayloadParams(
+            Hash.ZERO, 1337L, prevRandao, Address.fromHexString("0x42"), Optional.empty());
+    var idForWithdrawals2 =
+        PayloadIdentifier.forPayloadParams(
+            Hash.ZERO, 1337L, prevRandao, Address.fromHexString("0x42"), Optional.of(emptyList()));
+    assertThat(idForWithdrawals1).isNotEqualTo(idForWithdrawals2);
+  }
+}
diff --git a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/headervalidationrules/ConstantOmmersHashValidationTest.java b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/headervalidationrules/ConstantOmmersHashValidationTest.java
new file mode 100644
index 00000000000..9207871cd2d
--- /dev/null
+++ b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/headervalidationrules/ConstantOmmersHashValidationTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.merge.headervalidationrules;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.merge.MergeContext;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+
+import java.util.Optional;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class ConstantOmmersHashValidationTest {
+
+  @Mock private ProtocolContext protocolContext;
+  @Mock private MutableBlockchain blockchain;
+  @Mock private MergeContext mergeContext;
+
+  @BeforeEach
+  public void setUp() {
+    when(blockchain.getTotalDifficultyByHash(any())).thenReturn(Optional.of(Difficulty.ONE));
+    when(protocolContext.getBlockchain()).thenReturn(blockchain);
+    when(mergeContext.getTerminalTotalDifficulty()).thenReturn(Difficulty.ONE);
+    when(protocolContext.getConsensusContext(MergeContext.class)).thenReturn(mergeContext);
+  }
+
+  @Test
+  public void checksAndConfirmsOmmerHashValue() {
+    final ConstantOmmersHashRule rule = new ConstantOmmersHashRule();
+    final BlockHeader parentHeader = mock(BlockHeader.class);
+
+    final BlockHeader invalidHeader = mock(BlockHeader.class);
+    when(invalidHeader.getOmmersHash())
+        .thenReturn(
+            Hash.fromHexString(
+                "0xb0b0faceb0b0faceb0b0faceb0b0faceb0b0faceb0b0faceb0b0faceb0b0face"));
+    assertThat(rule.validate(invalidHeader, parentHeader, protocolContext)).isFalse();
+
+    final BlockHeader validHeader = mock(BlockHeader.class);
+    when(validHeader.getOmmersHash())
+        .thenReturn(
+            Hash.fromHexString(
+                "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"));
+
+    assertThat(rule.validate(validHeader, parentHeader, protocolContext)).isTrue();
+  }
+}
diff --git a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/headervalidationrules/IncrementalTimestampValidationTest.java b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/headervalidationrules/IncrementalTimestampValidationTest.java
new file mode 100644
index 00000000000..8fd28cee88d
--- /dev/null
+++ b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/headervalidationrules/IncrementalTimestampValidationTest.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.merge.headervalidationrules;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.merge.MergeContext;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+
+import java.util.Optional;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class IncrementalTimestampValidationTest {
+
+  @Mock private ProtocolContext protocolContext;
+  @Mock private MutableBlockchain blockchain;
+  @Mock private MergeContext mergeContext;
+
+  @BeforeEach
+  public void setUp() {
+    when(blockchain.getTotalDifficultyByHash(any())).thenReturn(Optional.of(Difficulty.ONE));
+    when(protocolContext.getBlockchain()).thenReturn(blockchain);
+    when(mergeContext.getTerminalTotalDifficulty()).thenReturn(Difficulty.ZERO);
+    when(protocolContext.getConsensusContext(MergeContext.class)).thenReturn(mergeContext);
+  }
+
+  @Test
+  public void validWhenTimestampMoreRecentThanParent() {
+    final IncrementalTimestampRule rule = new IncrementalTimestampRule();
+    final long now = System.currentTimeMillis();
+    final BlockHeader parentHeader = mock(BlockHeader.class);
+    when(parentHeader.getTimestamp()).thenReturn(now);
+    final BlockHeader validHeader = mock(BlockHeader.class);
+    when(validHeader.getNumber()).thenReturn(1337L);
+    when(validHeader.getTimestamp()).thenReturn(now + 1);
+
+    assertThat(rule.validate(validHeader, parentHeader, protocolContext)).isTrue();
+  }
+
+  @Test
+  public void invalidWhenTimestampNotMoreRecentThanParent() {
+    final IncrementalTimestampRule rule = new IncrementalTimestampRule();
+    final long now = System.currentTimeMillis();
+    final BlockHeader parentHeader = mock(BlockHeader.class);
+    when(parentHeader.getTimestamp()).thenReturn(now);
+    final BlockHeader validHeader = mock(BlockHeader.class);
+    when(validHeader.getNumber()).thenReturn(1337L);
+    when(validHeader.getTimestamp()).thenReturn(now);
+
+    assertThat(rule.validate(validHeader, parentHeader, protocolContext)).isFalse();
+  }
+
+  @Test
+  public void alwaysValidWhenTTDNotReached() {
+    when(mergeContext.getTerminalTotalDifficulty()).thenReturn(Difficulty.of(2L));
+
+    final IncrementalTimestampRule rule = new IncrementalTimestampRule();
+    final BlockHeader parentHeader = mock(BlockHeader.class);
+    final BlockHeader validHeader = mock(BlockHeader.class);
+    when(validHeader.getNumber()).thenReturn(1337L);
+
+    assertThat(rule.validate(validHeader, parentHeader, protocolContext)).isTrue();
+  }
+}
diff --git a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/headervalidationrules/NoDifficultyValidationTest.java b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/headervalidationrules/NoDifficultyValidationTest.java
new file mode 100644
index 00000000000..02cc597b1be
--- /dev/null
+++ b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/headervalidationrules/NoDifficultyValidationTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.merge.headervalidationrules;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.merge.MergeContext;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+
+import java.util.Optional;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class NoDifficultyValidationTest {
+
+  @Mock private ProtocolContext protocolContext;
+  @Mock private MutableBlockchain blockchain;
+  @Mock private MergeContext mergeContext;
+
+  @BeforeEach
+  public void setUp() {
+    when(blockchain.getTotalDifficultyByHash(any())).thenReturn(Optional.of(Difficulty.ONE));
+    when(protocolContext.getBlockchain()).thenReturn(blockchain);
+    when(mergeContext.getTerminalTotalDifficulty()).thenReturn(Difficulty.ONE);
+    when(protocolContext.getConsensusContext(MergeContext.class)).thenReturn(mergeContext);
+  }
+
+  @Test
+  public void difficultyMustBeZero() {
+    final NoDifficultyRule rule = new NoDifficultyRule();
+    final BlockHeader parentHeader = mock(BlockHeader.class);
+
+    final BlockHeader invalidHeader = mock(BlockHeader.class);
+    when(invalidHeader.getDifficulty()).thenReturn(Difficulty.of(10));
+    when(invalidHeader.getNumber()).thenReturn(1337L);
+    assertThat(rule.validate(invalidHeader, parentHeader, protocolContext)).isFalse();
+
+    final BlockHeader validHeader = mock(BlockHeader.class);
+    when(validHeader.getDifficulty()).thenReturn(Difficulty.ZERO);
+
+    assertThat(rule.validate(validHeader, parentHeader, protocolContext)).isTrue();
+  }
+}
diff --git a/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/headervalidationrules/NoNonceValidationTest.java b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/headervalidationrules/NoNonceValidationTest.java
new file mode 100644
index 00000000000..ad1b84b6783
--- /dev/null
+++ b/consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/headervalidationrules/NoNonceValidationTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.merge.headervalidationrules;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.merge.MergeContext;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+
+import java.util.Optional;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class NoNonceValidationTest {
+
+  @Mock private ProtocolContext protocolContext;
+  @Mock private MutableBlockchain blockchain;
+  @Mock private MergeContext mergeContext;
+
+  @BeforeEach
+  public void setUp() {
+    when(blockchain.getTotalDifficultyByHash(any())).thenReturn(Optional.of(Difficulty.ONE));
+    when(protocolContext.getBlockchain()).thenReturn(blockchain);
+    when(mergeContext.getTerminalTotalDifficulty()).thenReturn(Difficulty.ZERO);
+    when(protocolContext.getConsensusContext(MergeContext.class)).thenReturn(mergeContext);
+  }
+
+  @Test
+  public void nonceMustBeZero() {
+    final NoNonceRule rule = new NoNonceRule();
+    final BlockHeader parentHeader = mock(BlockHeader.class);
+
+    final BlockHeader invalidHeader = mock(BlockHeader.class);
+    when(invalidHeader.getNonce()).thenReturn(42L);
+    when(invalidHeader.getNumber()).thenReturn(1337L);
+    assertThat(rule.validate(invalidHeader, parentHeader, protocolContext)).isFalse();
+
+    final BlockHeader validHeader = mock(BlockHeader.class);
+    when(validHeader.getNonce()).thenReturn(0L);
+    when(validHeader.getNumber()).thenReturn(1337L);
+
+    assertThat(rule.validate(validHeader, parentHeader, protocolContext)).isTrue();
+  }
+}
diff --git a/consensus/merge/src/test/resources/posAtGenesis.json b/consensus/merge/src/test/resources/posAtGenesis.json
new file mode 100644
index 00000000000..0c83dfddb2d
--- /dev/null
+++ b/consensus/merge/src/test/resources/posAtGenesis.json
@@ -0,0 +1,36 @@
+{
+  "config": {
+    "chainId": 1337,
+    "londonBlock": 0,
+    "parisBlock": 0,
+    "terminalTotalDifficulty": 1000,
+    "contractSizeLimit": 2147483647,
+    "ethash": {
+      "fixeddifficulty": 100
+    }
+  },
+  "nonce": "0x42",
+  "timestamp": "0x0",
+  "extraData": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
+  "gasLimit": "0x1fffffffffffff",
+  "difficulty": "0x10000",
+  "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "coinbase": "0x0000000000000000000000000000000000000000",
+  "alloc": {
+    "fe3b557e8fb62b89f4916b721be55ceb828dbd73": {
+      "privateKey": "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "0xad78ebc5ac6200000"
+    },
+    "627306090abaB3A6e1400e9345bC60c78a8BEf57": {
+      "privateKey": "c87509a1c067bbde78beb793e6fa76530b6382a4c0241e5e4a9ec0a0f44dc0d3",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "90000000000000000000000"
+    },
+    "f17f52151EbEF6C7334FAD080c5704D77216b732": {
+      "privateKey": "ae6ae8e5ccbfb04590405997ee2d52d2b330726137b875053c36d94e974d162f",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "90000000000000000000000"
+    }
+  }
+}
diff --git a/consensus/merge/src/test/resources/powAtGenesis.json b/consensus/merge/src/test/resources/powAtGenesis.json
new file mode 100644
index 00000000000..946284ad637
--- /dev/null
+++ b/consensus/merge/src/test/resources/powAtGenesis.json
@@ -0,0 +1,36 @@
+{
+  "config": {
+    "chainId": 1337,
+    "londonBlock": 0,
+    "parisBlock": 0,
+    "terminalTotalDifficulty": 1001,
+    "contractSizeLimit": 2147483647,
+    "ethash": {
+      "fixeddifficulty": 100
+    }
+  },
+  "nonce": "0x42",
+  "timestamp": "0x0",
+  "extraData": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
+  "gasLimit": "0x1fffffffffffff",
+  "difficulty": "0x0",
+  "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+  "coinbase": "0x0000000000000000000000000000000000000000",
+  "alloc": {
+    "fe3b557e8fb62b89f4916b721be55ceb828dbd73": {
+      "privateKey": "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "0xad78ebc5ac6200000"
+    },
+    "627306090abaB3A6e1400e9345bC60c78a8BEf57": {
+      "privateKey": "c87509a1c067bbde78beb793e6fa76530b6382a4c0241e5e4a9ec0a0f44dc0d3",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "90000000000000000000000"
+    },
+    "f17f52151EbEF6C7334FAD080c5704D77216b732": {
+      "privateKey": "ae6ae8e5ccbfb04590405997ee2d52d2b330726137b875053c36d94e974d162f",
+      "comment": "private key and this comment are ignored.  In a real chain, the private key should NOT be stored",
+      "balance": "90000000000000000000000"
+    }
+  }
+}
diff --git a/consensus/qbft/build.gradle b/consensus/qbft/build.gradle
new file mode 100644
index 00000000000..54647ef51db
--- /dev/null
+++ b/consensus/qbft/build.gradle
@@ -0,0 +1,87 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+apply plugin: 'java-library'
+
+jar {
+  archiveBaseName = 'besu-qbft'
+  manifest {
+    attributes(
+      'Specification-Title': archiveBaseName,
+      'Specification-Version': project.version,
+      'Implementation-Title': archiveBaseName,
+      'Implementation-Version': calculateVersion()
+      )
+  }
+}
+
+dependencies {
+  implementation project(':config')
+  implementation project(':consensus:common')
+  implementation project(':crypto:services')
+  implementation project(':datatypes')
+  implementation project(':ethereum:api')
+  implementation project(':ethereum:blockcreation')
+  implementation project(':ethereum:core')
+  implementation project(':ethereum:eth')
+  implementation project(':ethereum:p2p')
+  implementation project(':ethereum:rlp')
+  implementation project(':evm')
+  implementation project(':pki')
+  implementation project(':services:kvstore')
+
+  implementation 'com.google.guava:guava'
+  implementation 'io.vertx:vertx-core'
+  implementation 'com.fasterxml.jackson.core:jackson-databind'
+  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-units'
+  implementation 'org.web3j:abi'
+
+  integrationTestImplementation project(path: ':config', configuration: 'testSupportArtifacts')
+  integrationTestImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
+
+  testImplementation project(path: ':crypto:services', configuration: 'testSupportArtifacts')
+  testImplementation project(path: ':config', configuration: 'testSupportArtifacts')
+  testImplementation project(path: ':consensus:common', configuration: 'testArtifacts')
+  testImplementation project(path: ':consensus:common', configuration: 'testSupportArtifacts')
+  testImplementation project(':ethereum:core')
+  testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
+  testImplementation project(':crypto:algorithms')
+  testImplementation project(':evm')
+  testImplementation project(':metrics:core')
+  testImplementation project(':testutil')
+
+  testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.awaitility:awaitility'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
+  testImplementation 'org.mockito:mockito-core'
+  testImplementation 'org.mockito:mockito-junit-jupiter'
+
+  integrationTestImplementation project(':crypto:algorithms')
+  integrationTestImplementation project(path: ':crypto:services', configuration: 'testSupportArtifacts')
+  integrationTestImplementation project(path: ':consensus:common', configuration: 'testSupportArtifacts')
+  integrationTestImplementation project(':evm')
+  integrationTestImplementation project(':metrics:core')
+  integrationTestImplementation project(':testutil')
+
+  integrationTestImplementation 'org.assertj:assertj-core'
+  integrationTestImplementation 'org.junit.jupiter:junit-jupiter-api'
+  integrationTestImplementation 'org.mockito:mockito-core'
+  integrationTestImplementation 'org.mockito:mockito-junit-jupiter'
+
+  integrationTestRuntimeOnly 'org.junit.jupiter:junit-jupiter'
+
+  testSupportImplementation 'org.mockito:mockito-core'
+}
diff --git a/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/support/IntegrationTestHelpers.java b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/support/IntegrationTestHelpers.java
new file mode 100644
index 00000000000..4a9f8e7057a
--- /dev/null
+++ b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/support/IntegrationTestHelpers.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.support;
+
+import org.hyperledger.besu.consensus.common.bft.BftBlockHashing;
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
+import org.hyperledger.besu.consensus.qbft.payload.CommitPayload;
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.qbft.statemachine.PreparedCertificate;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.ethereum.core.Block;
+
+public class IntegrationTestHelpers {
+
+  public static SignedData<CommitPayload> createSignedCommitPayload(
+      final ConsensusRoundIdentifier roundId, final Block block, final NodeKey nodeKey) {
+
+    final QbftExtraDataCodec qbftExtraDataEncoder = new QbftExtraDataCodec();
+
+    final Block commitBlock = createCommitBlockFromProposalBlock(block, roundId.getRoundNumber());
+    final SECPSignature commitSeal =
+        nodeKey.sign(
+            new BftBlockHashing(qbftExtraDataEncoder)
+                .calculateDataHashForCommittedSeal(commitBlock.getHeader()));
+
+    final MessageFactory messageFactory = new MessageFactory(nodeKey);
+
+    return messageFactory.createCommit(roundId, block.getHash(), commitSeal).getSignedPayload();
+  }
+
+  public static PreparedCertificate createValidPreparedCertificate(
+      final TestContext context, final ConsensusRoundIdentifier preparedRound, final Block block) {
+    final RoundSpecificPeers peers = context.roundSpecificPeers(preparedRound);
+
+    return new PreparedCertificate(
+        block,
+        peers.createSignedPreparePayloadOfAllPeers(preparedRound, block.getHash()),
+        preparedRound.getRoundNumber());
+  }
+
+  public static Block createCommitBlockFromProposalBlock(
+      final Block proposalBlock, final int round) {
+    final QbftExtraDataCodec bftExtraDataCodec = new QbftExtraDataCodec();
+    final BftBlockInterface bftBlockInterface = new BftBlockInterface(bftExtraDataCodec);
+    return bftBlockInterface.replaceRoundInBlock(
+        proposalBlock, round, BftBlockHeaderFunctions.forCommittedSeal(bftExtraDataCodec));
+  }
+}
diff --git a/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/support/RoundSpecificPeers.java b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/support/RoundSpecificPeers.java
new file mode 100644
index 00000000000..dc35796d0dc
--- /dev/null
+++ b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/support/RoundSpecificPeers.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.support;
+
+import static java.util.Optional.empty;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Fail.fail;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.messagewrappers.BftMessage;
+import org.hyperledger.besu.consensus.common.bft.payload.Payload;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.messagedata.CommitMessageData;
+import org.hyperledger.besu.consensus.qbft.messagedata.PrepareMessageData;
+import org.hyperledger.besu.consensus.qbft.messagedata.ProposalMessageData;
+import org.hyperledger.besu.consensus.qbft.messagedata.QbftV1;
+import org.hyperledger.besu.consensus.qbft.messagedata.RoundChangeMessageData;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.RoundChange;
+import org.hyperledger.besu.consensus.qbft.payload.PreparePayload;
+import org.hyperledger.besu.consensus.qbft.payload.RoundChangePayload;
+import org.hyperledger.besu.consensus.qbft.statemachine.PreparedCertificate;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+
+public class RoundSpecificPeers {
+
+  private final ValidatorPeer proposer;
+  private final Collection<ValidatorPeer> peers;
+  private final List<ValidatorPeer> nonProposingPeers;
+  private final BftExtraDataCodec bftExtraDataCodec;
+
+  public RoundSpecificPeers(
+      final ValidatorPeer proposer,
+      final Collection<ValidatorPeer> peers,
+      final List<ValidatorPeer> nonProposingPeers,
+      final BftExtraDataCodec bftExtraDataCodec) {
+    this.proposer = proposer;
+    this.peers = peers;
+    this.nonProposingPeers = nonProposingPeers;
+    this.bftExtraDataCodec = bftExtraDataCodec;
+  }
+
+  public ValidatorPeer getProposer() {
+    return proposer;
+  }
+
+  public ValidatorPeer getFirstNonProposer() {
+    return nonProposingPeers.get(0);
+  }
+
+  public void clearReceivedMessages() {
+    peers.forEach(ValidatorPeer::clearReceivedMessages);
+  }
+
+  public List<SECPSignature> sign(final Hash digest) {
+    return peers.stream().map(peer -> peer.getBlockSignature(digest)).collect(Collectors.toList());
+  }
+
+  public ValidatorPeer getNonProposing(final int index) {
+    return nonProposingPeers.get(index);
+  }
+
+  public List<SignedData<RoundChangePayload>> roundChangeForNonProposing(
+      final ConsensusRoundIdentifier targetRound) {
+    return nonProposingPeers.stream()
+        .map(peer -> peer.injectRoundChange(targetRound, empty()).getSignedPayload())
+        .collect(Collectors.toList());
+  }
+
+  public void commit(final ConsensusRoundIdentifier roundId, final Block block) {
+    peers.forEach(peer -> peer.injectCommit(roundId, block));
+  }
+
+  public List<SignedData<RoundChangePayload>> roundChange(final ConsensusRoundIdentifier roundId) {
+    final List<RoundChange> changes = Lists.newArrayList();
+
+    for (final ValidatorPeer peer : peers) {
+      changes.add(peer.injectRoundChange(roundId, empty()));
+    }
+
+    return changes.stream().map(RoundChange::getSignedPayload).collect(Collectors.toList());
+  }
+
+  public List<SignedData<RoundChangePayload>> createSignedRoundChangePayload(
+      final ConsensusRoundIdentifier roundId) {
+    return peers.stream()
+        .map(p -> p.getMessageFactory().createRoundChange(roundId, empty()).getSignedPayload())
+        .collect(Collectors.toList());
+  }
+
+  public List<SignedData<RoundChangePayload>> createSignedRoundChangePayload(
+      final ConsensusRoundIdentifier roundId, final PreparedCertificate preparedCertificate) {
+    return peers.stream()
+        .map(
+            p ->
+                p.getMessageFactory()
+                    .createRoundChange(roundId, Optional.of(preparedCertificate))
+                    .getSignedPayload())
+        .collect(Collectors.toList());
+  }
+
+  public void prepareForNonProposing(final ConsensusRoundIdentifier roundId, final Hash hash) {
+    nonProposingPeers.forEach(peer -> peer.injectPrepare(roundId, hash));
+  }
+
+  public void commitForNonProposing(final ConsensusRoundIdentifier roundId, final Block block) {
+    nonProposingPeers.forEach(peer -> peer.injectCommit(roundId, block));
+  }
+
+  public void forNonProposing(final Consumer<ValidatorPeer> assertion) {
+    nonProposingPeers.forEach(assertion);
+  }
+
+  public List<SignedData<PreparePayload>> createSignedPreparePayloadOfAllPeers(
+      final ConsensusRoundIdentifier preparedRound, final Hash hash) {
+    return peers.stream()
+        .map(role -> role.getMessageFactory().createPrepare(preparedRound, hash).getSignedPayload())
+        .collect(Collectors.toList());
+  }
+
+  public void verifyNoMessagesReceived() {
+    peers.forEach(n -> assertThat(n.getReceivedMessages()).isEmpty());
+  }
+
+  public void verifyNoMessagesReceivedNonProposing() {
+    nonProposingPeers.forEach(n -> assertThat(n.getReceivedMessages()).isEmpty());
+  }
+
+  public void verifyNoMessagesReceivedProposer() {
+    assertThat(proposer.getReceivedMessages()).isEmpty();
+  }
+
+  @SafeVarargs
+  public final void verifyMessagesReceivedProposer(final BftMessage<? extends Payload>... msgs) {
+    verifyMessagesReceived(ImmutableList.of(proposer), msgs);
+  }
+
+  @SafeVarargs
+  public final void verifyMessagesReceivedNonProposingExcluding(
+      final ValidatorPeer exclude, final BftMessage<? extends Payload>... msgs) {
+    final Collection<ValidatorPeer> candidates = Lists.newArrayList(nonProposingPeers);
+    candidates.remove(exclude);
+    verifyMessagesReceived(candidates, msgs);
+  }
+
+  public final void verifyMessagesReceivedNonProposing(final BftMessage<?>... msgs) {
+    verifyMessagesReceived(nonProposingPeers, msgs);
+  }
+
+  public final void verifyMessagesReceived(final BftMessage<?>... msgs) {
+    verifyMessagesReceived(peers, msgs);
+  }
+
+  private void verifyMessagesReceived(
+      final Collection<ValidatorPeer> candidates, final BftMessage<?>... msgs) {
+    candidates.forEach(n -> assertThat(n.getReceivedMessages().size()).isEqualTo(msgs.length));
+
+    List<BftMessage<? extends Payload>> msgList = Arrays.asList(msgs);
+
+    for (int i = 0; i < msgList.size(); i++) {
+      final int index = i;
+      final BftMessage<? extends Payload> msg = msgList.get(index);
+      candidates.forEach(
+          n -> {
+            final List<MessageData> rxMsgs = n.getReceivedMessages();
+            final MessageData rxMsgData = rxMsgs.get(index);
+            verifyMessage(rxMsgData, msg);
+          });
+    }
+    candidates.forEach(ValidatorPeer::clearReceivedMessages);
+  }
+
+  private void verifyMessage(final MessageData actual, final BftMessage<?> expectedMessage) {
+    BftMessage<?> actualSignedPayload = null;
+
+    switch (expectedMessage.getMessageType()) {
+      case QbftV1.PROPOSAL:
+        actualSignedPayload = ProposalMessageData.fromMessageData(actual).decode(bftExtraDataCodec);
+        break;
+      case QbftV1.PREPARE:
+        actualSignedPayload = PrepareMessageData.fromMessageData(actual).decode();
+        break;
+      case QbftV1.COMMIT:
+        actualSignedPayload = CommitMessageData.fromMessageData(actual).decode();
+        break;
+      case QbftV1.ROUND_CHANGE:
+        actualSignedPayload =
+            RoundChangeMessageData.fromMessageData(actual).decode(bftExtraDataCodec);
+        break;
+      default:
+        fail("Illegal QBFTV1 message type.");
+        break;
+    }
+    assertThat(expectedMessage).isEqualToComparingFieldByFieldRecursively(actualSignedPayload);
+  }
+}
diff --git a/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/support/TestContext.java b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/support/TestContext.java
new file mode 100644
index 00000000000..cbce344efcc
--- /dev/null
+++ b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/support/TestContext.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.support;
+
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.common.bft.BftExecutors;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.EventMultiplexer;
+import org.hyperledger.besu.consensus.common.bft.inttest.NodeParams;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftEventHandler;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftFinalState;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/*
+Responsible for creating an environment in which integration testing can be conducted.
+
+The test setup is an 'n' node network, one of which is the local node (i.e. the Unit Under Test).
+
+There is some complexity with determining the which node is the proposer etc. THus necessitating
+NetworkLayout and RoundSpecificNodeRoles concepts.
+ */
+public class TestContext {
+
+  private final Map<Address, ValidatorPeer> remotePeers;
+  private final MutableBlockchain blockchain;
+  private final BftExecutors bftExecutors;
+  private final BftEventHandler controller;
+  private final BftFinalState finalState;
+  private final EventMultiplexer eventMultiplexer;
+  private final MessageFactory messageFactory;
+  private final ValidatorProvider validatorProvider;
+  private final BftExtraDataCodec bftExtraDataCodec;
+
+  public TestContext(
+      final Map<Address, ValidatorPeer> remotePeers,
+      final MutableBlockchain blockchain,
+      final BftExecutors bftExecutors,
+      final BftEventHandler controller,
+      final BftFinalState finalState,
+      final EventMultiplexer eventMultiplexer,
+      final MessageFactory messageFactory,
+      final ValidatorProvider validatorProvider,
+      final BftExtraDataCodec bftExtraDataCodec) {
+    this.remotePeers = remotePeers;
+    this.blockchain = blockchain;
+    this.bftExecutors = bftExecutors;
+    this.controller = controller;
+    this.finalState = finalState;
+    this.eventMultiplexer = eventMultiplexer;
+    this.messageFactory = messageFactory;
+    this.validatorProvider = validatorProvider;
+    this.bftExtraDataCodec = bftExtraDataCodec;
+  }
+
+  public void start() {
+    bftExecutors.start();
+    controller.start();
+  }
+
+  public MutableBlockchain getBlockchain() {
+    return blockchain;
+  }
+
+  public BftEventHandler getController() {
+    return controller;
+  }
+
+  public EventMultiplexer getEventMultiplexer() {
+    return eventMultiplexer;
+  }
+
+  public MessageFactory getLocalNodeMessageFactory() {
+    return messageFactory;
+  }
+
+  public Block createBlockForProposalFromChainHead(final long timestamp) {
+    return createBlockForProposalFromChainHead(timestamp, finalState.getLocalAddress());
+  }
+
+  public Block createBlockForProposal(
+      final BlockHeader parent, final long timestamp, final Address proposer) {
+    final Block block =
+        finalState.getBlockCreatorFactory().create(parent, 0).createBlock(timestamp).getBlock();
+
+    final BlockHeaderBuilder headerBuilder = BlockHeaderBuilder.fromHeader(block.getHeader());
+    headerBuilder
+        .coinbase(proposer)
+        .blockHeaderFunctions(BftBlockHeaderFunctions.forCommittedSeal(bftExtraDataCodec));
+    final BlockHeader newHeader = headerBuilder.buildBlockHeader();
+
+    return new Block(newHeader, block.getBody());
+  }
+
+  public Block createBlockForProposalFromChainHead(final long timestamp, final Address proposer) {
+    // this implies that EVERY block will have this node as the proposer :/
+    return createBlockForProposal(blockchain.getChainHeadHeader(), timestamp, proposer);
+  }
+
+  public RoundSpecificPeers roundSpecificPeers(final ConsensusRoundIdentifier roundId) {
+    // This will return NULL if the LOCAL node is the proposer for the specified round
+    final Address proposerAddress = finalState.getProposerForRound(roundId);
+    final ValidatorPeer proposer = remotePeers.getOrDefault(proposerAddress, null);
+
+    final List<ValidatorPeer> nonProposers = new ArrayList<>(remotePeers.values());
+    nonProposers.remove(proposer);
+
+    return new RoundSpecificPeers(proposer, remotePeers.values(), nonProposers, bftExtraDataCodec);
+  }
+
+  public NodeParams getLocalNodeParams() {
+    return new NodeParams(finalState.getLocalAddress(), finalState.getNodeKey());
+  }
+
+  public long getCurrentChainHeight() {
+    return blockchain.getChainHeadBlockNumber();
+  }
+
+  public ValidatorProvider getValidatorProvider() {
+    return validatorProvider;
+  }
+}
diff --git a/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/support/TestContextBuilder.java b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/support/TestContextBuilder.java
new file mode 100644
index 00000000000..76c429d2124
--- /dev/null
+++ b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/support/TestContextBuilder.java
@@ -0,0 +1,574 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.support;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
+import static org.mockito.Mockito.mock;
+
+import org.hyperledger.besu.config.BftFork;
+import org.hyperledger.besu.config.JsonQbftConfigOptions;
+import org.hyperledger.besu.config.JsonUtil;
+import org.hyperledger.besu.config.QbftConfigOptions;
+import org.hyperledger.besu.config.QbftFork;
+import org.hyperledger.besu.config.StubGenesisConfigOptions;
+import org.hyperledger.besu.consensus.common.BftValidatorOverrides;
+import org.hyperledger.besu.consensus.common.EpochManager;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftContext;
+import org.hyperledger.besu.consensus.common.bft.BftEventQueue;
+import org.hyperledger.besu.consensus.common.bft.BftExecutors;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
+import org.hyperledger.besu.consensus.common.bft.BftProtocolSchedule;
+import org.hyperledger.besu.consensus.common.bft.BlockTimer;
+import org.hyperledger.besu.consensus.common.bft.EventMultiplexer;
+import org.hyperledger.besu.consensus.common.bft.Gossiper;
+import org.hyperledger.besu.consensus.common.bft.MessageTracker;
+import org.hyperledger.besu.consensus.common.bft.RoundTimer;
+import org.hyperledger.besu.consensus.common.bft.SynchronizerUpdater;
+import org.hyperledger.besu.consensus.common.bft.UniqueMessageMulticaster;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.BftBlockCreatorFactory;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.ProposerSelector;
+import org.hyperledger.besu.consensus.common.bft.inttest.DefaultValidatorPeer;
+import org.hyperledger.besu.consensus.common.bft.inttest.NetworkLayout;
+import org.hyperledger.besu.consensus.common.bft.inttest.NodeParams;
+import org.hyperledger.besu.consensus.common.bft.inttest.StubValidatorMulticaster;
+import org.hyperledger.besu.consensus.common.bft.inttest.StubbedSynchronizerUpdater;
+import org.hyperledger.besu.consensus.common.bft.inttest.TestTransitions;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftEventHandler;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftFinalState;
+import org.hyperledger.besu.consensus.common.bft.statemachine.FutureMessageBuffer;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.common.validator.blockbased.BlockValidatorProvider;
+import org.hyperledger.besu.consensus.qbft.MutableQbftConfigOptions;
+import org.hyperledger.besu.consensus.qbft.QbftContext;
+import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
+import org.hyperledger.besu.consensus.qbft.QbftForksSchedulesFactory;
+import org.hyperledger.besu.consensus.qbft.QbftGossip;
+import org.hyperledger.besu.consensus.qbft.QbftProtocolScheduleBuilder;
+import org.hyperledger.besu.consensus.qbft.blockcreation.QbftBlockCreatorFactory;
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.qbft.statemachine.QbftBlockHeightManagerFactory;
+import org.hyperledger.besu.consensus.qbft.statemachine.QbftController;
+import org.hyperledger.besu.consensus.qbft.statemachine.QbftRoundFactory;
+import org.hyperledger.besu.consensus.qbft.validation.MessageValidatorFactory;
+import org.hyperledger.besu.consensus.qbft.validator.ForkingValidatorProvider;
+import org.hyperledger.besu.consensus.qbft.validator.TransactionValidatorProvider;
+import org.hyperledger.besu.consensus.qbft.validator.ValidatorContractController;
+import org.hyperledger.besu.consensus.qbft.validator.ValidatorModeTransitionLogger;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.GenesisState;
+import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.AddressHelpers;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.core.ProtocolScheduleFixture;
+import org.hyperledger.besu.ethereum.core.Util;
+import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.sorter.GasPricePendingTransactionsSorter;
+import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
+import org.hyperledger.besu.ethereum.worldstate.DefaultWorldStateArchive;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.testutil.TestClock;
+import org.hyperledger.besu.util.Subscribers;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.Clock;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
+
+import com.google.common.collect.Iterables;
+import org.apache.tuweni.bytes.Bytes;
+
+public class TestContextBuilder {
+
+  private static final MetricsSystem metricsSystem = new NoOpMetricsSystem();
+  private boolean useValidatorContract;
+  private boolean useLondonMilestone = false;
+  private boolean useZeroBaseFee = false;
+
+  private static class ControllerAndState {
+
+    private final BftExecutors bftExecutors;
+    private final BftEventHandler eventHandler;
+    private final BftFinalState finalState;
+    private final EventMultiplexer eventMultiplexer;
+    private final MessageFactory messageFactory;
+    private final ValidatorProvider validatorProvider;
+
+    public ControllerAndState(
+        final BftExecutors bftExecutors,
+        final BftEventHandler eventHandler,
+        final BftFinalState finalState,
+        final EventMultiplexer eventMultiplexer,
+        final MessageFactory messageFactory,
+        final ValidatorProvider validatorProvider) {
+      this.bftExecutors = bftExecutors;
+      this.eventHandler = eventHandler;
+      this.finalState = finalState;
+      this.eventMultiplexer = eventMultiplexer;
+      this.messageFactory = messageFactory;
+      this.validatorProvider = validatorProvider;
+    }
+
+    public BftExecutors getBftExecutors() {
+      return bftExecutors;
+    }
+
+    public BftEventHandler getEventHandler() {
+      return eventHandler;
+    }
+
+    public BftFinalState getFinalState() {
+      return finalState;
+    }
+
+    public EventMultiplexer getEventMultiplexer() {
+      return eventMultiplexer;
+    }
+
+    public MessageFactory getMessageFactory() {
+      return messageFactory;
+    }
+
+    public ValidatorProvider getValidatorProvider() {
+      return validatorProvider;
+    }
+  }
+
+  public static final int EPOCH_LENGTH = 10_000;
+  public static final int BLOCK_TIMER_SEC = 3;
+  public static final int ROUND_TIMER_SEC = 12;
+  public static final int MESSAGE_QUEUE_LIMIT = 1000;
+  public static final int GOSSIPED_HISTORY_LIMIT = 100;
+  public static final int DUPLICATE_MESSAGE_LIMIT = 100;
+  public static final int FUTURE_MESSAGES_MAX_DISTANCE = 10;
+  public static final int FUTURE_MESSAGES_LIMIT = 1000;
+  public static final Address VALIDATOR_CONTRACT_ADDRESS =
+      Address.fromHexString("0x0000000000000000000000000000000000008888");
+  private static final BftExtraDataCodec BFT_EXTRA_DATA_ENCODER = new QbftExtraDataCodec();
+
+  private Clock clock = Clock.fixed(Instant.MIN, ZoneId.of("UTC"));
+  private BftEventQueue bftEventQueue = new BftEventQueue(MESSAGE_QUEUE_LIMIT);
+  private int validatorCount = 4;
+  private int indexOfFirstLocallyProposedBlock = 0; // Meaning first block is from remote peer.
+  private boolean useGossip = false;
+  private Optional<String> genesisFile = Optional.empty();
+  private List<NodeParams> nodeParams = Collections.emptyList();
+  private List<QbftFork> qbftForks = Collections.emptyList();
+
+  public TestContextBuilder clock(final Clock clock) {
+    this.clock = clock;
+    return this;
+  }
+
+  public TestContextBuilder eventQueue(final BftEventQueue bftEventQueue) {
+    this.bftEventQueue = bftEventQueue;
+    return this;
+  }
+
+  public TestContextBuilder validatorCount(final int validatorCount) {
+    this.validatorCount = validatorCount;
+    return this;
+  }
+
+  public TestContextBuilder indexOfFirstLocallyProposedBlock(
+      final int indexOfFirstLocallyProposedBlock) {
+    this.indexOfFirstLocallyProposedBlock = indexOfFirstLocallyProposedBlock;
+    return this;
+  }
+
+  public TestContextBuilder nodeParams(final List<NodeParams> nodeParams) {
+    this.nodeParams = nodeParams;
+    return this;
+  }
+
+  public TestContextBuilder useGossip(final boolean useGossip) {
+    this.useGossip = useGossip;
+    return this;
+  }
+
+  public TestContextBuilder genesisFile(final String genesisFile) {
+    this.genesisFile = Optional.of(genesisFile);
+    return this;
+  }
+
+  public TestContextBuilder useValidatorContract(final boolean useValidatorContract) {
+    this.useValidatorContract = useValidatorContract;
+    return this;
+  }
+
+  public TestContextBuilder useLondonMilestone(final boolean useLondonMilestone) {
+    this.useLondonMilestone = useLondonMilestone;
+    return this;
+  }
+
+  public TestContextBuilder useZeroBaseFee(final boolean useZeroBaseFee) {
+    this.useZeroBaseFee = useZeroBaseFee;
+    return this;
+  }
+
+  public TestContextBuilder qbftForks(final List<QbftFork> qbftForks) {
+    this.qbftForks = qbftForks;
+    return this;
+  }
+
+  public TestContext build() {
+    final NetworkLayout networkNodes;
+    if (nodeParams.isEmpty()) {
+      networkNodes =
+          NetworkLayout.createNetworkLayout(validatorCount, indexOfFirstLocallyProposedBlock);
+    } else {
+      final TreeMap<Address, NodeParams> addressKeyMap = new TreeMap<>();
+      for (NodeParams params : nodeParams) {
+        addressKeyMap.put(params.getAddress(), params);
+      }
+      final NodeParams localNode =
+          Iterables.get(addressKeyMap.values(), indexOfFirstLocallyProposedBlock);
+      networkNodes = new NetworkLayout(localNode, addressKeyMap);
+    }
+
+    final MutableBlockchain blockChain;
+    final DefaultWorldStateArchive worldStateArchive = createInMemoryWorldStateArchive();
+
+    if (genesisFile.isPresent()) {
+      try {
+        final GenesisState genesisState = createGenesisBlock(genesisFile.get());
+        blockChain =
+            createInMemoryBlockchain(
+                genesisState.getBlock(),
+                BftBlockHeaderFunctions.forOnchainBlock(BFT_EXTRA_DATA_ENCODER));
+        genesisState.writeStateTo(worldStateArchive.getMutable());
+      } catch (IOException e) {
+        throw new IllegalStateException(e);
+      }
+    } else {
+      final Block genesisBlock = createGenesisBlock(networkNodes.getValidatorAddresses());
+      blockChain =
+          createInMemoryBlockchain(
+              genesisBlock, BftBlockHeaderFunctions.forOnchainBlock(BFT_EXTRA_DATA_ENCODER));
+    }
+
+    // Use a stubbed version of the multicaster, to prevent creating PeerConnections etc.
+    final StubValidatorMulticaster multicaster = new StubValidatorMulticaster();
+    final UniqueMessageMulticaster uniqueMulticaster =
+        new UniqueMessageMulticaster(multicaster, GOSSIPED_HISTORY_LIMIT);
+
+    final Gossiper gossiper =
+        useGossip
+            ? new QbftGossip(uniqueMulticaster, BFT_EXTRA_DATA_ENCODER)
+            : mock(Gossiper.class);
+
+    final StubbedSynchronizerUpdater synchronizerUpdater = new StubbedSynchronizerUpdater();
+
+    final ControllerAndState controllerAndState =
+        createControllerAndFinalState(
+            blockChain,
+            worldStateArchive,
+            multicaster,
+            networkNodes.getLocalNode().getNodeKey(),
+            clock,
+            bftEventQueue,
+            gossiper,
+            synchronizerUpdater,
+            useValidatorContract,
+            useLondonMilestone,
+            useZeroBaseFee,
+            qbftForks);
+
+    // Add each networkNode to the Multicaster (such that each can receive msgs from local node).
+    // NOTE: the remotePeers needs to be ordered based on Address (as this is used to determine
+    // the proposer order which must be managed in test).
+    final Map<Address, ValidatorPeer> remotePeers =
+        networkNodes.getRemotePeers().stream()
+            .collect(
+                Collectors.toMap(
+                    NodeParams::getAddress,
+                    nodeParams ->
+                        new ValidatorPeer(
+                            nodeParams,
+                            new MessageFactory(nodeParams.getNodeKey()),
+                            controllerAndState.getEventMultiplexer()),
+                    (u, v) -> {
+                      throw new IllegalStateException(String.format("Duplicate key %s", u));
+                    },
+                    LinkedHashMap::new));
+
+    final List<DefaultValidatorPeer> peerCollection = new ArrayList<>(remotePeers.values());
+    multicaster.addNetworkPeers(peerCollection);
+    synchronizerUpdater.addNetworkPeers(peerCollection);
+
+    return new TestContext(
+        remotePeers,
+        blockChain,
+        controllerAndState.getBftExecutors(),
+        controllerAndState.getEventHandler(),
+        controllerAndState.getFinalState(),
+        controllerAndState.getEventMultiplexer(),
+        controllerAndState.getMessageFactory(),
+        controllerAndState.getValidatorProvider(),
+        BFT_EXTRA_DATA_ENCODER);
+  }
+
+  public TestContext buildAndStart() {
+    TestContext testContext = build();
+    testContext.start();
+    return testContext;
+  }
+
+  private static Block createGenesisBlock(final Set<Address> validators) {
+    final Address coinbase = Iterables.get(validators, 0);
+    final BlockHeaderTestFixture headerTestFixture = new BlockHeaderTestFixture();
+    final BftExtraData extraData =
+        new BftExtraData(
+            Bytes.wrap(new byte[32]), Collections.emptyList(), Optional.empty(), 0, validators);
+    headerTestFixture.extraData(BFT_EXTRA_DATA_ENCODER.encode(extraData));
+    headerTestFixture.mixHash(BftHelpers.EXPECTED_MIX_HASH);
+    headerTestFixture.difficulty(Difficulty.ONE);
+    headerTestFixture.ommersHash(Hash.EMPTY_LIST_HASH);
+    headerTestFixture.nonce(0);
+    headerTestFixture.timestamp(0);
+    headerTestFixture.parentHash(Hash.ZERO);
+    headerTestFixture.gasLimit(5000);
+    headerTestFixture.coinbase(coinbase);
+
+    final BlockHeader genesisHeader = headerTestFixture.buildHeader();
+    return new Block(
+        genesisHeader, new BlockBody(Collections.emptyList(), Collections.emptyList()));
+  }
+
+  private GenesisState createGenesisBlock(final String genesisFile) throws IOException {
+    final String json = Files.readString(Path.of(genesisFile));
+    return GenesisState.fromJson(json, ProtocolScheduleFixture.MAINNET);
+  }
+
+  private static ControllerAndState createControllerAndFinalState(
+      final MutableBlockchain blockChain,
+      final WorldStateArchive worldStateArchive,
+      final StubValidatorMulticaster multicaster,
+      final NodeKey nodeKey,
+      final Clock clock,
+      final BftEventQueue bftEventQueue,
+      final Gossiper gossiper,
+      final SynchronizerUpdater synchronizerUpdater,
+      final boolean useValidatorContract,
+      final boolean useLondonMilestone,
+      final boolean useZeroBaseFee,
+      final List<QbftFork> qbftForks) {
+
+    final MiningParameters miningParams =
+        new MiningParameters.Builder()
+            .coinbase(AddressHelpers.ofValue(1))
+            .minTransactionGasPrice(Wei.ZERO)
+            .extraData(Bytes.wrap("Qbft Int tests".getBytes(UTF_8)))
+            .miningEnabled(true)
+            .build();
+
+    final StubGenesisConfigOptions genesisConfigOptions = new StubGenesisConfigOptions();
+    final Map<String, Object> qbftConfigValues =
+        useValidatorContract
+            ? Map.of(
+                JsonQbftConfigOptions.VALIDATOR_CONTRACT_ADDRESS,
+                VALIDATOR_CONTRACT_ADDRESS.toHexString())
+            : Collections.emptyMap();
+    final QbftConfigOptions qbftConfigOptions = createGenesisConfig(useValidatorContract);
+
+    if (useLondonMilestone) {
+      genesisConfigOptions.londonBlock(0);
+    } else {
+      genesisConfigOptions.berlinBlock(0);
+    }
+    if (useZeroBaseFee) {
+      genesisConfigOptions.zeroBaseFee(true);
+    }
+    genesisConfigOptions.qbftConfigOptions(
+        new JsonQbftConfigOptions(JsonUtil.objectNodeFromMap(qbftConfigValues)));
+    genesisConfigOptions.transitions(TestTransitions.createQbftTestTransitions(qbftForks));
+    genesisConfigOptions.qbftConfigOptions(qbftConfigOptions);
+
+    final EpochManager epochManager = new EpochManager(EPOCH_LENGTH);
+
+    final BftBlockInterface blockInterface = new BftBlockInterface(BFT_EXTRA_DATA_ENCODER);
+
+    final ForksSchedule<QbftConfigOptions> forksSchedule =
+        QbftForksSchedulesFactory.create(genesisConfigOptions);
+
+    final BftProtocolSchedule protocolSchedule =
+        QbftProtocolScheduleBuilder.create(
+            genesisConfigOptions, forksSchedule, BFT_EXTRA_DATA_ENCODER, EvmConfiguration.DEFAULT);
+
+    final BftValidatorOverrides validatorOverrides = convertBftForks(qbftForks);
+    final TransactionSimulator transactionSimulator =
+        new TransactionSimulator(blockChain, worldStateArchive, protocolSchedule);
+
+    final BlockValidatorProvider blockValidatorProvider =
+        BlockValidatorProvider.forkingValidatorProvider(
+            blockChain, epochManager, blockInterface, validatorOverrides);
+    final TransactionValidatorProvider transactionValidatorProvider =
+        new TransactionValidatorProvider(
+            blockChain, new ValidatorContractController(transactionSimulator), forksSchedule);
+    final ValidatorProvider validatorProvider =
+        new ForkingValidatorProvider(
+            blockChain, forksSchedule, blockValidatorProvider, transactionValidatorProvider);
+
+    final ProtocolContext protocolContext =
+        new ProtocolContext(
+            blockChain,
+            worldStateArchive,
+            new QbftContext(validatorProvider, epochManager, blockInterface, Optional.empty()),
+            Optional.empty());
+
+    final GasPricePendingTransactionsSorter pendingTransactions =
+        new GasPricePendingTransactionsSorter(
+            ImmutableTransactionPoolConfiguration.builder().txPoolMaxSize(1).build(),
+            clock,
+            metricsSystem,
+            blockChain::getChainHeadHeader);
+
+    final Address localAddress = Util.publicKeyToAddress(nodeKey.getPublicKey());
+    final BftBlockCreatorFactory<?> blockCreatorFactory =
+        new QbftBlockCreatorFactory(
+            pendingTransactions, // changed from QbftBesuController
+            protocolContext,
+            protocolSchedule,
+            forksSchedule,
+            miningParams,
+            localAddress,
+            BFT_EXTRA_DATA_ENCODER);
+
+    final ProposerSelector proposerSelector =
+        new ProposerSelector(blockChain, blockInterface, true, validatorProvider);
+
+    final BftExecutors bftExecutors =
+        BftExecutors.create(new NoOpMetricsSystem(), BftExecutors.ConsensusType.QBFT);
+    final BftFinalState finalState =
+        new BftFinalState(
+            protocolContext.getConsensusContext(BftContext.class).getValidatorProvider(),
+            nodeKey,
+            Util.publicKeyToAddress(nodeKey.getPublicKey()),
+            proposerSelector,
+            multicaster,
+            new RoundTimer(bftEventQueue, ROUND_TIMER_SEC, bftExecutors),
+            new BlockTimer(bftEventQueue, forksSchedule, bftExecutors, TestClock.fixed()),
+            blockCreatorFactory,
+            clock);
+
+    final MessageFactory messageFactory = new MessageFactory(nodeKey);
+
+    final MessageValidatorFactory messageValidatorFactory =
+        new MessageValidatorFactory(
+            proposerSelector, protocolSchedule, protocolContext, BFT_EXTRA_DATA_ENCODER);
+
+    final Subscribers<MinedBlockObserver> minedBlockObservers = Subscribers.create();
+
+    final MessageTracker duplicateMessageTracker = new MessageTracker(DUPLICATE_MESSAGE_LIMIT);
+    final FutureMessageBuffer futureMessageBuffer =
+        new FutureMessageBuffer(
+            FUTURE_MESSAGES_MAX_DISTANCE,
+            FUTURE_MESSAGES_LIMIT,
+            blockChain.getChainHeadBlockNumber());
+
+    final BftEventHandler qbftController =
+        new QbftController(
+            blockChain,
+            finalState,
+            new QbftBlockHeightManagerFactory(
+                finalState,
+                new QbftRoundFactory(
+                    finalState,
+                    protocolContext,
+                    protocolSchedule,
+                    minedBlockObservers,
+                    messageValidatorFactory,
+                    messageFactory,
+                    BFT_EXTRA_DATA_ENCODER),
+                messageValidatorFactory,
+                messageFactory,
+                new ValidatorModeTransitionLogger(forksSchedule)),
+            gossiper,
+            duplicateMessageTracker,
+            futureMessageBuffer,
+            synchronizerUpdater,
+            BFT_EXTRA_DATA_ENCODER);
+
+    final EventMultiplexer eventMultiplexer = new EventMultiplexer(qbftController);
+    //////////////////////////// END QBFT BesuController ////////////////////////////
+
+    return new ControllerAndState(
+        bftExecutors,
+        qbftController,
+        finalState,
+        eventMultiplexer,
+        messageFactory,
+        validatorProvider);
+  }
+
+  private static QbftConfigOptions createGenesisConfig(final boolean useValidatorContract) {
+    final MutableQbftConfigOptions qbftConfigOptions =
+        new MutableQbftConfigOptions(JsonQbftConfigOptions.DEFAULT);
+    qbftConfigOptions.setBlockPeriodSeconds(BLOCK_TIMER_SEC);
+    if (useValidatorContract) {
+      qbftConfigOptions.setValidatorContractAddress(
+          Optional.of(VALIDATOR_CONTRACT_ADDRESS.toHexString()));
+    }
+    return qbftConfigOptions;
+  }
+
+  private static BftValidatorOverrides convertBftForks(final List<QbftFork> bftForks) {
+    final Map<Long, List<Address>> result = new HashMap<>();
+
+    for (final BftFork fork : bftForks) {
+      fork.getValidators()
+          .ifPresent(
+              validators ->
+                  result.put(
+                      fork.getForkBlock(),
+                      validators.stream()
+                          .map(Address::fromHexString)
+                          .collect(Collectors.toList())));
+    }
+
+    return new BftValidatorOverrides(result);
+  }
+}
diff --git a/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/support/ValidatorPeer.java b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/support/ValidatorPeer.java
new file mode 100644
index 00000000000..af764bfed72
--- /dev/null
+++ b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/support/ValidatorPeer.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.support;
+
+import static org.hyperledger.besu.consensus.qbft.support.IntegrationTestHelpers.createCommitBlockFromProposalBlock;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.EventMultiplexer;
+import org.hyperledger.besu.consensus.common.bft.inttest.DefaultValidatorPeer;
+import org.hyperledger.besu.consensus.common.bft.inttest.NodeParams;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.messagedata.CommitMessageData;
+import org.hyperledger.besu.consensus.qbft.messagedata.PrepareMessageData;
+import org.hyperledger.besu.consensus.qbft.messagedata.ProposalMessageData;
+import org.hyperledger.besu.consensus.qbft.messagedata.RoundChangeMessageData;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Commit;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Proposal;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.RoundChange;
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.qbft.payload.PreparePayload;
+import org.hyperledger.besu.consensus.qbft.payload.RoundChangePayload;
+import org.hyperledger.besu.consensus.qbft.statemachine.PreparedCertificate;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Block;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+// Each "inject" function returns the SignedPayload representation of the transmitted message.
+public class ValidatorPeer extends DefaultValidatorPeer {
+
+  private final MessageFactory messageFactory;
+
+  public ValidatorPeer(
+      final NodeParams nodeParams,
+      final MessageFactory messageFactory,
+      final EventMultiplexer localEventMultiplexer) {
+    super(nodeParams, localEventMultiplexer);
+    this.messageFactory = messageFactory;
+  }
+
+  public Proposal injectProposal(final ConsensusRoundIdentifier rId, final Block block) {
+    return injectProposalForFutureRound(
+        rId, Collections.emptyList(), Collections.emptyList(), block);
+  }
+
+  public Prepare injectPrepare(final ConsensusRoundIdentifier rId, final Hash digest) {
+    final Prepare payload = messageFactory.createPrepare(rId, digest);
+    injectMessage(PrepareMessageData.create(payload));
+    return payload;
+  }
+
+  public Commit injectCommit(final ConsensusRoundIdentifier rId, final Block block) {
+    final Block commitBlock = createCommitBlockFromProposalBlock(block, rId.getRoundNumber());
+    final SECPSignature commitSeal = nodeKey.sign(commitBlock.getHash());
+    return injectCommit(rId, block.getHash(), commitSeal);
+  }
+
+  public Commit injectCommit(
+      final ConsensusRoundIdentifier rId, final Hash digest, final SECPSignature commitSeal) {
+    final Commit payload = messageFactory.createCommit(rId, digest, commitSeal);
+    injectMessage(CommitMessageData.create(payload));
+    return payload;
+  }
+
+  public Proposal injectProposalForFutureRound(
+      final ConsensusRoundIdentifier rId,
+      final List<SignedData<RoundChangePayload>> roundChanges,
+      final List<SignedData<PreparePayload>> prepares,
+      final Block blockToPropose) {
+
+    final Proposal payload =
+        messageFactory.createProposal(rId, blockToPropose, roundChanges, prepares);
+    injectMessage(ProposalMessageData.create(payload));
+    return payload;
+  }
+
+  public RoundChange injectRoundChange(
+      final ConsensusRoundIdentifier rId,
+      final Optional<PreparedCertificate> preparedRoundArtifacts) {
+    final RoundChange payload = messageFactory.createRoundChange(rId, preparedRoundArtifacts);
+    injectMessage(RoundChangeMessageData.create(payload));
+    return payload;
+  }
+
+  public MessageFactory getMessageFactory() {
+    return messageFactory;
+  }
+}
diff --git a/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/FutureHeightTest.java b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/FutureHeightTest.java
new file mode 100644
index 00000000000..811899bc7f5
--- /dev/null
+++ b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/FutureHeightTest.java
@@ -0,0 +1,234 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.util.Lists.emptyList;
+import static org.hyperledger.besu.consensus.qbft.support.IntegrationTestHelpers.createSignedCommitPayload;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.events.NewChainHead;
+import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Commit;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.qbft.support.RoundSpecificPeers;
+import org.hyperledger.besu.consensus.qbft.support.TestContext;
+import org.hyperledger.besu.consensus.qbft.support.TestContextBuilder;
+import org.hyperledger.besu.ethereum.core.Block;
+
+import java.time.Clock;
+import java.time.Instant;
+import java.time.ZoneId;
+
+import org.junit.jupiter.api.Test;
+
+public class FutureHeightTest {
+
+  private final long blockTimeStamp = 100;
+  private final Clock fixedClock =
+      Clock.fixed(Instant.ofEpochSecond(blockTimeStamp), ZoneId.systemDefault());
+
+  private final int NETWORK_SIZE = 5;
+
+  // Configuration ensures remote peer will provide proposal for first block
+  private final TestContext context =
+      new TestContextBuilder()
+          .validatorCount(NETWORK_SIZE)
+          .indexOfFirstLocallyProposedBlock(0)
+          .clock(fixedClock)
+          .buildAndStart();
+
+  private final ConsensusRoundIdentifier roundId = new ConsensusRoundIdentifier(1, 0);
+  private final RoundSpecificPeers peers = context.roundSpecificPeers(roundId);
+
+  private final ConsensusRoundIdentifier futureHeightRoundId = new ConsensusRoundIdentifier(2, 0);
+
+  private final MessageFactory localNodeMessageFactory = context.getLocalNodeMessageFactory();
+  private final BftExtraDataCodec bftExtraDataCodec = new QbftExtraDataCodec();
+
+  @Test
+  public void messagesForFutureHeightAreBufferedUntilChainHeightCatchesUp() {
+    final Block currentHeightBlock = context.createBlockForProposalFromChainHead(30);
+    final Block signedCurrentHeightBlock =
+        BftHelpers.createSealedBlock(
+            bftExtraDataCodec, currentHeightBlock, 0, peers.sign(currentHeightBlock.getHash()));
+
+    final Block futureHeightBlock =
+        context.createBlockForProposal(
+            signedCurrentHeightBlock.getHeader(), 60, peers.getProposer().getNodeAddress());
+
+    peers.getProposer().injectProposal(futureHeightRoundId, futureHeightBlock);
+    peers.verifyNoMessagesReceived();
+
+    // verify that we have incremented the estimated height of the proposer.
+    peers
+        .getProposer()
+        .verifyEstimatedChainHeightEquals(futureHeightBlock.getHeader().getNumber() - 1);
+
+    // Inject prepares and commits from all peers
+    peers.prepareForNonProposing(futureHeightRoundId, futureHeightBlock.getHash());
+    peers.forNonProposing(
+        peer ->
+            peer.verifyEstimatedChainHeightEquals(futureHeightBlock.getHeader().getNumber() - 1));
+
+    peers.commitForNonProposing(futureHeightRoundId, futureHeightBlock);
+
+    peers.verifyNoMessagesReceived();
+    assertThat(context.getCurrentChainHeight()).isEqualTo(0);
+
+    // Add block to chain, and notify system of its arrival.
+    context.getBlockchain().appendBlock(signedCurrentHeightBlock, emptyList());
+    assertThat(context.getCurrentChainHeight()).isEqualTo(1);
+    context
+        .getController()
+        .handleNewBlockEvent(new NewChainHead(signedCurrentHeightBlock.getHeader()));
+
+    final Prepare expectedPrepareMessage =
+        localNodeMessageFactory.createPrepare(futureHeightRoundId, futureHeightBlock.getHash());
+
+    final Commit expectedCommitMessage =
+        new Commit(
+            createSignedCommitPayload(
+                futureHeightRoundId, futureHeightBlock, context.getLocalNodeParams().getNodeKey()));
+
+    peers.verifyMessagesReceived(expectedPrepareMessage, expectedCommitMessage);
+    assertThat(context.getCurrentChainHeight()).isEqualTo(2);
+  }
+
+  @Test
+  public void messagesFromPreviousHeightAreDiscarded() {
+    final Block currentHeightBlock =
+        context.createBlockForProposalFromChainHead(30, peers.getProposer().getNodeAddress());
+    final Block signedCurrentHeightBlock =
+        BftHelpers.createSealedBlock(
+            bftExtraDataCodec, currentHeightBlock, 0, peers.sign(currentHeightBlock.getHash()));
+
+    peers.getProposer().injectProposal(roundId, currentHeightBlock);
+    peers.getNonProposing(0).injectPrepare(roundId, currentHeightBlock.getHash());
+
+    final Prepare expectedPrepareMessage =
+        localNodeMessageFactory.createPrepare(roundId, currentHeightBlock.getHash());
+
+    peers.verifyMessagesReceived(expectedPrepareMessage);
+
+    // Add block to chain, and notify system of its arrival.
+    context.getBlockchain().appendBlock(signedCurrentHeightBlock, emptyList());
+    assertThat(context.getCurrentChainHeight()).isEqualTo(1);
+    context
+        .getController()
+        .handleNewBlockEvent(new NewChainHead(signedCurrentHeightBlock.getHeader()));
+
+    // Inject prepares and commits from all peers for the 'previous' round (i.e. the height
+    // from before the block arrived).
+    peers.prepareForNonProposing(roundId, currentHeightBlock.getHash());
+    peers.commitForNonProposing(roundId, currentHeightBlock);
+
+    peers.verifyNoMessagesReceived();
+    assertThat(context.getCurrentChainHeight()).isEqualTo(1);
+  }
+
+  @Test
+  public void multipleNewChainHeadEventsDoesNotRestartCurrentHeightManager() {
+    final Block currentHeightBlock =
+        context.createBlockForProposalFromChainHead(30, peers.getProposer().getNodeAddress());
+
+    peers.getProposer().injectProposal(roundId, currentHeightBlock);
+    peers.getProposer().injectPrepare(roundId, currentHeightBlock.getHash());
+    peers.getNonProposing(0).injectPrepare(roundId, currentHeightBlock.getHash());
+
+    peers.clearReceivedMessages();
+
+    context
+        .getController()
+        .handleNewBlockEvent(new NewChainHead(context.getBlockchain().getChainHeadHeader()));
+
+    // Should only require 1 more prepare to close it out
+    peers.getNonProposing(1).injectPrepare(roundId, currentHeightBlock.getHash());
+
+    final Commit expectedCommitMessage =
+        new Commit(
+            createSignedCommitPayload(
+                roundId, currentHeightBlock, context.getLocalNodeParams().getNodeKey()));
+    peers.verifyMessagesReceived(expectedCommitMessage);
+  }
+
+  @Test
+  public void correctMessagesAreExtractedFromFutureHeightBuffer() {
+    final Block currentHeightBlock = context.createBlockForProposalFromChainHead(30);
+    final Block signedCurrentHeightBlock =
+        BftHelpers.createSealedBlock(
+            bftExtraDataCodec, currentHeightBlock, 0, peers.sign(currentHeightBlock.getHash()));
+
+    final Block nextHeightBlock =
+        context.createBlockForProposal(
+            signedCurrentHeightBlock.getHeader(), 60, peers.getProposer().getNodeAddress());
+    final Block signedNextHeightBlock =
+        BftHelpers.createSealedBlock(
+            bftExtraDataCodec, nextHeightBlock, 0, peers.sign(nextHeightBlock.getHash()));
+
+    final Block futureHeightBlock =
+        context.createBlockForProposal(
+            signedNextHeightBlock.getHeader(), 90, peers.getNonProposing(0).getNodeAddress());
+
+    final ConsensusRoundIdentifier nextHeightRoundId = new ConsensusRoundIdentifier(2, 0);
+    final ConsensusRoundIdentifier futureHeightRoundId = new ConsensusRoundIdentifier(3, 0);
+
+    // Inject prepares and commits from all peers into FutureHeight (2 height time)
+    peers.prepareForNonProposing(futureHeightRoundId, futureHeightBlock.getHash());
+    peers.commitForNonProposing(futureHeightRoundId, futureHeightBlock);
+
+    // Add the "interim" block to chain, and notify system of its arrival.
+    context.getBlockchain().appendBlock(signedCurrentHeightBlock, emptyList());
+    assertThat(context.getCurrentChainHeight()).isEqualTo(1);
+    context
+        .getController()
+        .handleNewBlockEvent(new NewChainHead(signedCurrentHeightBlock.getHeader()));
+
+    peers.verifyNoMessagesReceived();
+    peers.getProposer().injectProposal(nextHeightRoundId, nextHeightBlock);
+
+    final Prepare expectedPrepareMessage =
+        localNodeMessageFactory.createPrepare(nextHeightRoundId, nextHeightBlock.getHash());
+
+    // Assert ONLY a prepare message was received, not any commits (i.e. futureHeightRoundId
+    // messages have not been used.
+    peers.verifyMessagesReceived(expectedPrepareMessage);
+
+    // Future height proposal needs to come from the NEXT nonProposer.
+    peers.getNonProposing(0).injectProposal(futureHeightRoundId, futureHeightBlock);
+
+    // Change to the FutureRound, and confirm prepare and commit msgs are sent
+    context.getBlockchain().appendBlock(signedNextHeightBlock, emptyList());
+    assertThat(context.getCurrentChainHeight()).isEqualTo(2);
+    context
+        .getController()
+        .handleNewBlockEvent(new NewChainHead(signedNextHeightBlock.getHeader()));
+
+    final Prepare expectedFuturePrepareMessage =
+        localNodeMessageFactory.createPrepare(futureHeightRoundId, futureHeightBlock.getHash());
+
+    final Commit expectedCommitMessage =
+        new Commit(
+            createSignedCommitPayload(
+                futureHeightRoundId, futureHeightBlock, context.getLocalNodeParams().getNodeKey()));
+
+    // Assert ONLY a prepare message was received, not any commits (i.e. futureHeightRoundId
+    // messages have not been used.
+    peers.verifyMessagesReceived(expectedCommitMessage, expectedFuturePrepareMessage);
+  }
+}
diff --git a/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/FutureRoundTest.java b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/FutureRoundTest.java
new file mode 100644
index 00000000000..9681ca4f7d6
--- /dev/null
+++ b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/FutureRoundTest.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.test;
+
+import static java.util.Collections.emptyList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.consensus.qbft.support.IntegrationTestHelpers.createCommitBlockFromProposalBlock;
+
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Commit;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.qbft.payload.RoundChangePayload;
+import org.hyperledger.besu.consensus.qbft.support.RoundSpecificPeers;
+import org.hyperledger.besu.consensus.qbft.support.TestContext;
+import org.hyperledger.besu.consensus.qbft.support.TestContextBuilder;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.ethereum.core.Block;
+
+import java.time.Clock;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+public class FutureRoundTest {
+
+  private final long blockTimeStamp = 100;
+  private final Clock fixedClock =
+      Clock.fixed(Instant.ofEpochSecond(blockTimeStamp), ZoneId.systemDefault());
+
+  private final int NETWORK_SIZE = 5;
+
+  // Configuration ensures remote peer will provide proposal for first block
+  private final TestContext context =
+      new TestContextBuilder()
+          .validatorCount(NETWORK_SIZE)
+          .indexOfFirstLocallyProposedBlock(0)
+          .clock(fixedClock)
+          .buildAndStart();
+
+  private final ConsensusRoundIdentifier roundId = new ConsensusRoundIdentifier(1, 0);
+  private final RoundSpecificPeers peers = context.roundSpecificPeers(roundId);
+
+  private final ConsensusRoundIdentifier futureRoundId = new ConsensusRoundIdentifier(1, 5);
+  private final RoundSpecificPeers futurePeers = context.roundSpecificPeers(futureRoundId);
+
+  private final MessageFactory localNodeMessageFactory = context.getLocalNodeMessageFactory();
+
+  @Test
+  public void messagesForFutureRoundAreNotActionedUntilRoundIsActive() {
+    final Block futureBlock =
+        context.createBlockForProposalFromChainHead(60, peers.getProposer().getNodeAddress());
+    final int quorum = BftHelpers.calculateRequiredValidatorQuorum(NETWORK_SIZE);
+    final ConsensusRoundIdentifier subsequentRoundId = new ConsensusRoundIdentifier(1, 6);
+    final RoundSpecificPeers subsequentRoles = context.roundSpecificPeers(subsequentRoundId);
+
+    for (int i = 0; i < quorum - 2; i++) {
+      futurePeers.getNonProposing(i).injectPrepare(futureRoundId, futureBlock.getHash());
+    }
+
+    for (int i = 0; i < quorum - 2; i++) {
+      futurePeers.getNonProposing(i).injectCommit(futureRoundId, futureBlock);
+    }
+
+    // inject a prepare and a commit from a subsequent round, and ensure no transmissions are
+    // created
+
+    subsequentRoles.getNonProposing(1).injectPrepare(subsequentRoundId, futureBlock.getHash());
+    subsequentRoles.getNonProposing(1).injectCommit(subsequentRoundId, futureBlock);
+
+    peers.verifyNoMessagesReceived();
+    assertThat(context.getBlockchain().getChainHeadBlockNumber()).isEqualTo(0);
+
+    // inject a newRound to move to 'futureRoundId', and ensure localnode sends prepare, commit
+    // and updates blockchain
+    final List<SignedData<RoundChangePayload>> signedRoundChangePayload =
+        futurePeers.createSignedRoundChangePayload(futureRoundId);
+    futurePeers
+        .getProposer()
+        .injectProposalForFutureRound(
+            futureRoundId, signedRoundChangePayload, emptyList(), futureBlock);
+
+    final Prepare expectedPrepare =
+        localNodeMessageFactory.createPrepare(futureRoundId, futureBlock.getHash());
+
+    peers.verifyMessagesReceived(expectedPrepare);
+
+    // following 1 more prepare, a commit msg will be sent
+    futurePeers.getNonProposing(quorum - 2).injectPrepare(futureRoundId, futureBlock.getHash());
+
+    final Block commitBlock =
+        createCommitBlockFromProposalBlock(futureBlock, futureRoundId.getRoundNumber());
+    final SECPSignature commitSeal =
+        context.getLocalNodeParams().getNodeKey().sign(commitBlock.getHash());
+    final Commit expectedCommit =
+        localNodeMessageFactory.createCommit(futureRoundId, futureBlock.getHash(), commitSeal);
+    peers.verifyMessagesReceived(expectedCommit);
+
+    // requires 1 more commit and the blockchain will progress
+    futurePeers.getNonProposing(quorum - 2).injectCommit(futureRoundId, futureBlock);
+
+    assertThat(context.getBlockchain().getChainHeadBlockNumber()).isEqualTo(1);
+  }
+
+  @Test
+  public void priorRoundsCannotBeCompletedAfterReceptionOfNewRound() {
+    final Block initialBlock =
+        context.createBlockForProposalFromChainHead(30, peers.getProposer().getNodeAddress());
+    final Block futureBlock =
+        context.createBlockForProposalFromChainHead(60, peers.getProposer().getNodeAddress());
+
+    peers.getProposer().injectProposal(roundId, initialBlock);
+
+    peers.prepareForNonProposing(roundId, initialBlock.getHash());
+
+    peers.getProposer().injectCommit(roundId, initialBlock);
+    // At this stage, the local node has 2 commit msgs (proposer and local) so has not committed
+    assertThat(context.getBlockchain().getChainHeadBlockNumber()).isEqualTo(0);
+
+    peers.clearReceivedMessages();
+
+    final List<SignedData<RoundChangePayload>> signedRoundChangePayload =
+        futurePeers.createSignedRoundChangePayload(futureRoundId);
+    futurePeers
+        .getProposer()
+        .injectProposalForFutureRound(
+            futureRoundId, signedRoundChangePayload, emptyList(), futureBlock);
+
+    final Prepare expectedFuturePrepare =
+        localNodeMessageFactory.createPrepare(futureRoundId, futureBlock.getHash());
+    peers.verifyMessagesReceived(expectedFuturePrepare);
+
+    // attempt to complete the previous round
+    peers.getNonProposing(0).injectCommit(roundId, initialBlock);
+    peers.verifyNoMessagesReceived();
+    assertThat(context.getBlockchain().getChainHeadBlockNumber()).isEqualTo(0);
+  }
+}
diff --git a/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/GossipTest.java b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/GossipTest.java
new file mode 100644
index 00000000000..fbe98de6b79
--- /dev/null
+++ b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/GossipTest.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.test;
+
+import static java.util.Collections.emptyList;
+
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.events.NewChainHead;
+import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
+import org.hyperledger.besu.consensus.qbft.messagedata.ProposalMessageData;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Commit;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Proposal;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.RoundChange;
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.qbft.support.RoundSpecificPeers;
+import org.hyperledger.besu.consensus.qbft.support.TestContext;
+import org.hyperledger.besu.consensus.qbft.support.TestContextBuilder;
+import org.hyperledger.besu.consensus.qbft.support.ValidatorPeer;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.ethereum.core.Block;
+
+import java.time.Clock;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.util.Collections;
+import java.util.Optional;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class GossipTest {
+
+  private final long blockTimeStamp = 100;
+  private final Clock fixedClock =
+      Clock.fixed(Instant.ofEpochSecond(blockTimeStamp), ZoneId.systemDefault());
+
+  private final int NETWORK_SIZE = 5;
+
+  private final TestContext context =
+      new TestContextBuilder()
+          .validatorCount(NETWORK_SIZE)
+          .indexOfFirstLocallyProposedBlock(0)
+          .clock(fixedClock)
+          .useGossip(true)
+          .buildAndStart();
+
+  private final ConsensusRoundIdentifier roundId = new ConsensusRoundIdentifier(1, 0);
+  private final RoundSpecificPeers peers = context.roundSpecificPeers(roundId);
+  private Block block;
+  private ValidatorPeer sender;
+  private MessageFactory msgFactory;
+
+  @BeforeEach
+  public void setup() {
+    block = context.createBlockForProposalFromChainHead(30, peers.getProposer().getNodeAddress());
+    sender = peers.getProposer();
+    msgFactory = sender.getMessageFactory();
+  }
+
+  @Test
+  public void gossipMessagesToPeers() {
+    final Prepare localPrepare =
+        context.getLocalNodeMessageFactory().createPrepare(roundId, block.getHash());
+    peers.verifyNoMessagesReceivedNonProposing();
+
+    final Proposal proposal = sender.injectProposal(roundId, block);
+    // sender node will have a prepare message as an effect of the proposal being sent
+    peers.verifyMessagesReceivedNonProposing(proposal, localPrepare);
+    peers.verifyMessagesReceivedProposer(localPrepare);
+
+    final Prepare prepare = sender.injectPrepare(roundId, block.getHash());
+    peers.verifyMessagesReceivedNonProposing(prepare);
+    peers.verifyNoMessagesReceivedProposer();
+
+    final Commit commit = sender.injectCommit(roundId, block);
+    peers.verifyMessagesReceivedNonProposing(commit);
+    peers.verifyNoMessagesReceivedProposer();
+
+    final RoundChange roundChange = msgFactory.createRoundChange(roundId, Optional.empty());
+
+    final Proposal nextRoundProposal =
+        sender.injectProposalForFutureRound(
+            roundId,
+            Collections.singletonList(roundChange.getSignedPayload()),
+            roundChange.getPrepares(),
+            block);
+    peers.verifyMessagesReceivedNonProposing(nextRoundProposal);
+    peers.verifyNoMessagesReceivedProposer();
+
+    sender.injectRoundChange(roundId, Optional.empty());
+    peers.verifyMessagesReceivedNonProposing(roundChange);
+    peers.verifyNoMessagesReceivedProposer();
+  }
+
+  @Test
+  public void onlyGossipOnce() {
+    final Prepare prepare = sender.injectPrepare(roundId, block.getHash());
+    peers.verifyMessagesReceivedNonProposing(prepare);
+
+    sender.injectPrepare(roundId, block.getHash());
+    peers.verifyNoMessagesReceivedNonProposing();
+
+    sender.injectPrepare(roundId, block.getHash());
+    peers.verifyNoMessagesReceivedNonProposing();
+  }
+
+  @Test
+  public void messageWithUnknownValidatorIsNotGossiped() {
+    final MessageFactory unknownMsgFactory = new MessageFactory(NodeKeyUtils.generate());
+    final Proposal unknownProposal =
+        unknownMsgFactory.createProposal(roundId, block, emptyList(), emptyList());
+
+    sender.injectMessage(ProposalMessageData.create(unknownProposal));
+    peers.verifyNoMessagesReceived();
+  }
+
+  @Test
+  public void messageIsNotGossipedToSenderOrCreator() {
+    final ValidatorPeer msgCreator = peers.getFirstNonProposer();
+    final MessageFactory peerMsgFactory = msgCreator.getMessageFactory();
+    final Proposal proposalFromPeer =
+        peerMsgFactory.createProposal(roundId, block, emptyList(), emptyList());
+
+    sender.injectMessage(ProposalMessageData.create(proposalFromPeer));
+
+    peers.verifyMessagesReceivedNonProposingExcluding(msgCreator, proposalFromPeer);
+    peers.verifyNoMessagesReceivedProposer();
+  }
+
+  @Test
+  public void futureMessageIsNotGossipedImmediately() {
+    ConsensusRoundIdentifier futureRoundId = new ConsensusRoundIdentifier(2, 0);
+    msgFactory.createProposal(futureRoundId, block, emptyList(), emptyList());
+
+    sender.injectProposal(futureRoundId, block);
+    peers.verifyNoMessagesReceived();
+  }
+
+  @Test
+  public void previousHeightMessageIsNotGossiped() {
+    final ConsensusRoundIdentifier futureRoundId = new ConsensusRoundIdentifier(0, 0);
+    sender.injectProposal(futureRoundId, block);
+    peers.verifyNoMessagesReceived();
+  }
+
+  @Test
+  public void futureMessageGetGossipedLater() {
+    final Block signedCurrentHeightBlock =
+        BftHelpers.createSealedBlock(
+            new QbftExtraDataCodec(), block, 0, peers.sign(block.getHash()));
+
+    final ConsensusRoundIdentifier futureRoundId = new ConsensusRoundIdentifier(2, 0);
+    final Prepare futurePrepare = sender.injectPrepare(futureRoundId, block.getHash());
+    peers.verifyNoMessagesReceivedNonProposing();
+
+    // add block to chain so we can move to next block height
+    context.getBlockchain().appendBlock(signedCurrentHeightBlock, emptyList());
+    context
+        .getController()
+        .handleNewBlockEvent(new NewChainHead(signedCurrentHeightBlock.getHeader()));
+
+    peers.verifyMessagesReceivedNonProposing(futurePrepare);
+  }
+}
diff --git a/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/LocalNodeIsProposerTest.java b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/LocalNodeIsProposerTest.java
new file mode 100644
index 00000000000..e5885d96a4f
--- /dev/null
+++ b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/LocalNodeIsProposerTest.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.consensus.qbft.support.IntegrationTestHelpers.createSignedCommitPayload;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.events.BlockTimerExpiry;
+import org.hyperledger.besu.consensus.common.bft.events.NewChainHead;
+import org.hyperledger.besu.consensus.common.bft.events.RoundExpiry;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Commit;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Proposal;
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.qbft.support.RoundSpecificPeers;
+import org.hyperledger.besu.consensus.qbft.support.TestContext;
+import org.hyperledger.besu.consensus.qbft.support.TestContextBuilder;
+import org.hyperledger.besu.ethereum.core.Block;
+
+import java.time.Clock;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.util.Collections;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/**
+ * These tests assume the basic function of the Qbft Round State Machine has been proven via the
+ * LocalNodeIsNotProposerTest.
+ */
+public class LocalNodeIsProposerTest {
+
+  private final long blockTimeStamp = 100;
+  private final Clock fixedClock =
+      Clock.fixed(Instant.ofEpochSecond(blockTimeStamp), ZoneId.systemDefault());
+
+  private final int NETWORK_SIZE = 4;
+
+  // Configuration ensures unit under test will be responsible for sending first proposal
+  private final TestContext context =
+      new TestContextBuilder()
+          .validatorCount(NETWORK_SIZE)
+          .indexOfFirstLocallyProposedBlock(1)
+          .clock(fixedClock)
+          .buildAndStart();
+  private final ConsensusRoundIdentifier roundId = new ConsensusRoundIdentifier(1, 0);
+  private final RoundSpecificPeers peers = context.roundSpecificPeers(roundId);
+
+  private final MessageFactory localNodeMessageFactory = context.getLocalNodeMessageFactory();
+
+  private Block expectedProposedBlock;
+  private Proposal expectedTxProposal;
+  private Commit expectedTxCommit;
+  private Prepare expectedTxPrepare;
+
+  @BeforeEach
+  public void setup() {
+    expectedProposedBlock = context.createBlockForProposalFromChainHead(blockTimeStamp);
+    expectedTxProposal =
+        localNodeMessageFactory.createProposal(
+            roundId, expectedProposedBlock, Collections.emptyList(), Collections.emptyList());
+
+    expectedTxPrepare =
+        localNodeMessageFactory.createPrepare(roundId, expectedProposedBlock.getHash());
+
+    expectedTxCommit =
+        new Commit(
+            createSignedCommitPayload(
+                roundId, expectedProposedBlock, context.getLocalNodeParams().getNodeKey()));
+
+    // Trigger "block timer" to send proposal.
+    context.getController().handleBlockTimerExpiry(new BlockTimerExpiry(roundId));
+  }
+
+  @Test
+  public void basicCase() {
+    peers.verifyMessagesReceived(expectedTxProposal, expectedTxPrepare);
+
+    // NOTE: In these test roles.getProposer() will return NULL.
+    peers.getNonProposing(0).injectPrepare(roundId, expectedProposedBlock.getHash());
+    peers.verifyNoMessagesReceived();
+
+    peers.getNonProposing(1).injectPrepare(roundId, expectedProposedBlock.getHash());
+    peers.verifyMessagesReceived(expectedTxCommit);
+
+    peers.getNonProposing(1).injectCommit(roundId, expectedProposedBlock);
+    assertThat(context.getBlockchain().getChainHeadBlockNumber()).isEqualTo(0);
+    peers.verifyNoMessagesReceived();
+
+    peers.getNonProposing(2).injectCommit(roundId, expectedProposedBlock);
+    assertThat(context.getBlockchain().getChainHeadBlockNumber()).isEqualTo(1);
+    peers.verifyNoMessagesReceived();
+  }
+
+  @Test
+  public void importsToChainWithoutReceivingPrepareMessages() {
+    peers.verifyMessagesReceived(expectedTxProposal, expectedTxPrepare);
+
+    peers.getNonProposing(1).injectCommit(roundId, expectedProposedBlock);
+    assertThat(context.getBlockchain().getChainHeadBlockNumber()).isEqualTo(0);
+    peers.verifyNoMessagesReceived();
+
+    peers.getNonProposing(2).injectCommit(roundId, expectedProposedBlock);
+    assertThat(context.getBlockchain().getChainHeadBlockNumber()).isEqualTo(1);
+    peers.verifyNoMessagesReceived();
+  }
+
+  @Test
+  public void nodeDoesNotSendRoundChangeIfRoundTimesOutAfterBlockImportButBeforeNewBlock() {
+    peers.verifyMessagesReceived(expectedTxProposal, expectedTxPrepare);
+    peers.getNonProposing(0).injectCommit(roundId, expectedProposedBlock);
+    assertThat(context.getBlockchain().getChainHeadBlockNumber()).isEqualTo(0);
+    peers.verifyNoMessagesReceived();
+
+    peers.getNonProposing(1).injectCommit(roundId, expectedProposedBlock);
+    assertThat(context.getBlockchain().getChainHeadBlockNumber()).isEqualTo(1);
+    peers.verifyNoMessagesReceived();
+
+    context.getController().handleRoundExpiry(new RoundExpiry(roundId));
+    peers.verifyNoMessagesReceived();
+
+    context
+        .getController()
+        .handleNewBlockEvent(new NewChainHead(expectedProposedBlock.getHeader()));
+    peers.verifyNoMessagesReceived();
+  }
+
+  @Test
+  public void nodeDoesNotSendCommitMessageAfterBlockIsImportedAndBeforeNewBlockEvent() {
+    peers.verifyMessagesReceived(expectedTxProposal, expectedTxPrepare);
+    peers.getNonProposing(0).injectCommit(roundId, expectedProposedBlock);
+    assertThat(context.getBlockchain().getChainHeadBlockNumber()).isEqualTo(0);
+    peers.verifyNoMessagesReceived();
+
+    peers.getNonProposing(1).injectCommit(roundId, expectedProposedBlock);
+    assertThat(context.getBlockchain().getChainHeadBlockNumber()).isEqualTo(1);
+    peers.verifyNoMessagesReceived();
+
+    peers.getNonProposing(0).injectPrepare(roundId, expectedProposedBlock.getHash());
+    peers.verifyNoMessagesReceived();
+    peers.getNonProposing(1).injectPrepare(roundId, expectedProposedBlock.getHash());
+    peers.verifyNoMessagesReceived();
+    peers.getNonProposing(2).injectPrepare(roundId, expectedProposedBlock.getHash());
+    peers.verifyNoMessagesReceived();
+  }
+}
diff --git a/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/LocalNodeNotProposerTest.java b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/LocalNodeNotProposerTest.java
new file mode 100644
index 00000000000..9d386178686
--- /dev/null
+++ b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/LocalNodeNotProposerTest.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.consensus.qbft.support.IntegrationTestHelpers.createSignedCommitPayload;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Commit;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.qbft.support.RoundSpecificPeers;
+import org.hyperledger.besu.consensus.qbft.support.TestContext;
+import org.hyperledger.besu.consensus.qbft.support.TestContextBuilder;
+import org.hyperledger.besu.ethereum.core.Block;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class LocalNodeNotProposerTest {
+
+  private final int NETWORK_SIZE = 4;
+  // By setting the indexOfFirstLocallyProposedBlock to 0 (and that the blockchain has only the
+  // genesis block) guarantees the local node is not responsible for proposing the first block).
+
+  private final TestContext context =
+      new TestContextBuilder()
+          .validatorCount(NETWORK_SIZE)
+          .indexOfFirstLocallyProposedBlock(0)
+          .buildAndStart();
+  private final ConsensusRoundIdentifier roundId = new ConsensusRoundIdentifier(1, 0);
+  private final RoundSpecificPeers peers = context.roundSpecificPeers(roundId);
+
+  private final MessageFactory localNodeMessageFactory = context.getLocalNodeMessageFactory();
+
+  private final Block blockToPropose =
+      context.createBlockForProposalFromChainHead(15, peers.getProposer().getNodeAddress());
+
+  private Prepare expectedTxPrepare;
+  private Commit expectedTxCommit;
+
+  @BeforeEach
+  public void setup() {
+    expectedTxPrepare = localNodeMessageFactory.createPrepare(roundId, blockToPropose.getHash());
+
+    expectedTxCommit =
+        new Commit(
+            createSignedCommitPayload(
+                roundId, blockToPropose, context.getLocalNodeParams().getNodeKey()));
+  }
+
+  @Test
+  public void preparesReceivedFromNonProposerIsValid() {
+    peers.getProposer().injectProposal(roundId, blockToPropose);
+
+    peers.verifyMessagesReceived(expectedTxPrepare);
+
+    peers.getNonProposing(0).injectPrepare(roundId, blockToPropose.getHash());
+    peers.verifyNoMessagesReceived();
+
+    peers.getNonProposing(1).injectPrepare(roundId, blockToPropose.getHash());
+    peers.verifyMessagesReceived(expectedTxCommit);
+
+    // Ensure the local blockchain has NOT incremented yet.
+    assertThat(context.getCurrentChainHeight()).isEqualTo(0);
+
+    // NO further messages should be transmitted when another Prepare is received.
+    peers.getNonProposing(1).injectPrepare(roundId, blockToPropose.getHash());
+    peers.verifyNoMessagesReceived();
+
+    // Inject a commit, ensure blockChain is not updated, and no message are sent (not quorum yet)
+    peers.getNonProposing(0).injectCommit(roundId, blockToPropose);
+    peers.verifyNoMessagesReceived();
+    assertThat(context.getCurrentChainHeight()).isEqualTo(0);
+
+    // A second commit message means quorum is reached, and blockchain should be updated.
+    peers.getNonProposing(1).injectCommit(roundId, blockToPropose);
+    peers.verifyNoMessagesReceived();
+    assertThat(context.getCurrentChainHeight()).isEqualTo(1);
+
+    // ensure any further commit messages do not affect the system
+    peers.getProposer().injectCommit(roundId, blockToPropose);
+    peers.verifyNoMessagesReceived();
+    assertThat(context.getCurrentChainHeight()).isEqualTo(1);
+  }
+
+  @Test
+  public void commitMessagesReceivedBeforePrepareCorrectlyImports() {
+    // All peers send a commit, then all non-proposing peers send a prepare, when then Proposal
+    // arrives last, the chain is updated, and a prepare and commit message are transmitted.
+    peers.clearReceivedMessages();
+    peers.commit(roundId, blockToPropose);
+    peers.verifyNoMessagesReceived();
+    assertThat(context.getCurrentChainHeight()).isEqualTo(0);
+
+    peers.prepareForNonProposing(roundId, blockToPropose.getHash());
+    peers.verifyNoMessagesReceived();
+    assertThat(context.getCurrentChainHeight()).isEqualTo(0);
+
+    peers.getProposer().injectProposal(roundId, blockToPropose);
+    // TODO(tmm): Unfortunately, there are times that the Commit will go out BEFORE the prepare
+    // This is one of them :( Maybe fix the testing to be ignorant of ordering?
+    peers.verifyMessagesReceived(expectedTxCommit, expectedTxPrepare);
+    assertThat(context.getCurrentChainHeight()).isEqualTo(1);
+  }
+
+  @Test
+  public void
+      canImportABlockIfSufficientCommitsReceivedWithoutPreparesAndThatNoPacketsSentAfterImport() {
+    peers.commit(roundId, blockToPropose);
+    peers.verifyNoMessagesReceived();
+    assertThat(context.getCurrentChainHeight()).isEqualTo(0);
+
+    peers.getProposer().injectProposal(roundId, blockToPropose);
+    peers.verifyMessagesReceived(expectedTxPrepare);
+    assertThat(context.getCurrentChainHeight()).isEqualTo(1);
+
+    peers.getNonProposing(0).injectPrepare(roundId, blockToPropose.getHash());
+    peers.verifyNoMessagesReceived();
+  }
+}
diff --git a/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/ReceivedFutureProposalTest.java b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/ReceivedFutureProposalTest.java
new file mode 100644
index 00000000000..77b33ad2adc
--- /dev/null
+++ b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/ReceivedFutureProposalTest.java
@@ -0,0 +1,245 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.test;
+
+import static org.hyperledger.besu.consensus.qbft.support.IntegrationTestHelpers.createValidPreparedCertificate;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Commit;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.qbft.payload.PreparePayload;
+import org.hyperledger.besu.consensus.qbft.payload.RoundChangePayload;
+import org.hyperledger.besu.consensus.qbft.statemachine.PreparedCertificate;
+import org.hyperledger.besu.consensus.qbft.support.IntegrationTestHelpers;
+import org.hyperledger.besu.consensus.qbft.support.RoundSpecificPeers;
+import org.hyperledger.besu.consensus.qbft.support.TestContext;
+import org.hyperledger.besu.consensus.qbft.support.TestContextBuilder;
+import org.hyperledger.besu.consensus.qbft.support.ValidatorPeer;
+import org.hyperledger.besu.ethereum.core.Block;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * Ensure the Qbft component responds appropriately when a future round Proposal message is
+ * received.
+ */
+public class ReceivedFutureProposalTest {
+
+  private final int NETWORK_SIZE = 5;
+
+  // Configuration ensures remote peer will provide proposal for first block
+  private final TestContext context =
+      new TestContextBuilder()
+          .validatorCount(NETWORK_SIZE)
+          .indexOfFirstLocallyProposedBlock(0)
+          .buildAndStart();
+  private final ConsensusRoundIdentifier roundId = new ConsensusRoundIdentifier(1, 0);
+  private final RoundSpecificPeers peers = context.roundSpecificPeers(roundId);
+
+  private final MessageFactory localNodeMessageFactory = context.getLocalNodeMessageFactory();
+
+  @Test
+  public void proposalWithEmptyPrepareCertificatesOfferNewBlock() {
+    final ConsensusRoundIdentifier targetRound = new ConsensusRoundIdentifier(1, 1);
+
+    final List<SignedData<RoundChangePayload>> roundChanges =
+        peers.createSignedRoundChangePayload(targetRound);
+
+    final ValidatorPeer nextProposer = context.roundSpecificPeers(targetRound).getProposer();
+    final Block blockToPropose =
+        context.createBlockForProposalFromChainHead(15, nextProposer.getNodeAddress());
+
+    nextProposer.injectProposalForFutureRound(
+        targetRound, roundChanges, Collections.emptyList(), blockToPropose);
+
+    final Prepare expectedPrepare =
+        localNodeMessageFactory.createPrepare(targetRound, blockToPropose.getHash());
+
+    peers.verifyMessagesReceived(expectedPrepare);
+  }
+
+  @Test
+  public void proposalFromIllegalSenderIsDiscardedAndNoPrepareForNewRoundIsSent() {
+    final ConsensusRoundIdentifier nextRoundId = new ConsensusRoundIdentifier(1, 1);
+    final Block blockToPropose =
+        context.createBlockForProposalFromChainHead(15, peers.getProposer().getNodeAddress());
+
+    final List<SignedData<RoundChangePayload>> roundChanges =
+        peers.createSignedRoundChangePayload(nextRoundId);
+
+    final ValidatorPeer illegalProposer =
+        context.roundSpecificPeers(nextRoundId).getNonProposing(0);
+
+    illegalProposer.injectProposalForFutureRound(
+        nextRoundId, roundChanges, Collections.emptyList(), blockToPropose);
+
+    peers.verifyNoMessagesReceived();
+  }
+
+  @Test
+  public void proposalWithPrepareCertificateResultsInNewRoundStartingWithExpectedBlock() {
+    final Block initialBlock =
+        context.createBlockForProposalFromChainHead(15, peers.getProposer().getNodeAddress());
+    final Block reproposedBlock =
+        context.createBlockForProposalFromChainHead(15, peers.getProposer().getNodeAddress());
+    final ConsensusRoundIdentifier nextRoundId = new ConsensusRoundIdentifier(1, 1);
+
+    final PreparedCertificate preparedRoundArtifacts =
+        createValidPreparedCertificate(context, roundId, initialBlock);
+
+    final List<SignedData<RoundChangePayload>> roundChanges =
+        peers.createSignedRoundChangePayload(nextRoundId, preparedRoundArtifacts);
+
+    final List<SignedData<PreparePayload>> prepares =
+        peers.createSignedPreparePayloadOfAllPeers(roundId, initialBlock.getHash());
+
+    final ValidatorPeer nextProposer = context.roundSpecificPeers(nextRoundId).getProposer();
+
+    nextProposer.injectProposalForFutureRound(nextRoundId, roundChanges, prepares, reproposedBlock);
+
+    peers.verifyMessagesReceived(
+        localNodeMessageFactory.createPrepare(nextRoundId, reproposedBlock.getHash()));
+  }
+
+  @Test
+  public void futureProposalWithInsufficientPreparesDoesNotTriggerNextRound() {
+    final Block initialBlock =
+        context.createBlockForProposalFromChainHead(15, peers.getProposer().getNodeAddress());
+    final Block reproposedBlock =
+        context.createBlockForProposalFromChainHead(15, peers.getProposer().getNodeAddress());
+    final ConsensusRoundIdentifier nextRoundId = new ConsensusRoundIdentifier(1, 1);
+
+    final PreparedCertificate preparedRoundArtifacts =
+        createValidPreparedCertificate(context, roundId, initialBlock);
+
+    final List<SignedData<RoundChangePayload>> roundChanges =
+        peers.createSignedRoundChangePayload(nextRoundId, preparedRoundArtifacts);
+
+    final List<SignedData<PreparePayload>> prepares =
+        peers.createSignedPreparePayloadOfAllPeers(roundId, initialBlock.getHash());
+
+    final ValidatorPeer nextProposer = context.roundSpecificPeers(nextRoundId).getProposer();
+
+    nextProposer.injectProposalForFutureRound(
+        nextRoundId, roundChanges, prepares.subList(0, 2), reproposedBlock);
+
+    peers.verifyNoMessagesReceived();
+  }
+
+  @Test
+  public void futureProposalWithInvalidPrepareDoesNotTriggerNextRound() {
+    final Block initialBlock =
+        context.createBlockForProposalFromChainHead(15, peers.getProposer().getNodeAddress());
+    final Block reproposedBlock = context.createBlockForProposalFromChainHead(15);
+    final ConsensusRoundIdentifier nextRoundId = new ConsensusRoundIdentifier(1, 1);
+
+    final PreparedCertificate preparedRoundArtifacts =
+        createValidPreparedCertificate(context, roundId, initialBlock);
+
+    final List<SignedData<RoundChangePayload>> roundChanges =
+        peers.createSignedRoundChangePayload(nextRoundId, preparedRoundArtifacts);
+
+    List<SignedData<PreparePayload>> prepares =
+        peers.createSignedPreparePayloadOfAllPeers(roundId, initialBlock.getHash());
+    prepares =
+        prepares.stream()
+            .filter(p -> !p.getAuthor().equals(peers.getFirstNonProposer().getNodeAddress()))
+            .collect(Collectors.toList());
+
+    final SignedData<PreparePayload> invalidPrepare =
+        peers
+            .getFirstNonProposer()
+            .getMessageFactory()
+            .createPrepare(nextRoundId, initialBlock.getHash())
+            .getSignedPayload();
+
+    prepares.add(invalidPrepare);
+
+    final ValidatorPeer nextProposer = context.roundSpecificPeers(nextRoundId).getProposer();
+
+    nextProposer.injectProposalForFutureRound(nextRoundId, roundChanges, prepares, reproposedBlock);
+
+    peers.verifyNoMessagesReceived();
+  }
+
+  @Test
+  public void proposalMessageForPriorRoundIsNotActioned() {
+    // first move to a future round, then inject a proposal for a prior round, local node
+    // should send no messages.
+    final ConsensusRoundIdentifier futureRound = new ConsensusRoundIdentifier(1, 2);
+    peers.roundChange(futureRound);
+
+    final ConsensusRoundIdentifier interimRound = new ConsensusRoundIdentifier(1, 1);
+    final List<SignedData<RoundChangePayload>> roundChangePayloads =
+        peers.createSignedRoundChangePayload(interimRound);
+
+    final ValidatorPeer interimRoundProposer =
+        context.roundSpecificPeers(interimRound).getProposer();
+
+    interimRoundProposer.injectProposalForFutureRound(
+        interimRound,
+        roundChangePayloads,
+        Collections.emptyList(),
+        context.createBlockForProposalFromChainHead(30));
+
+    peers.verifyNoMessagesReceived();
+  }
+
+  @Test
+  public void receiveRoundStateIsNotLostIfASecondProposalMessageIsReceivedForCurrentRound() {
+    final Block block =
+        context.createBlockForProposalFromChainHead(15, peers.getProposer().getNodeAddress());
+    final ConsensusRoundIdentifier nextRoundId = new ConsensusRoundIdentifier(1, 1);
+
+    final PreparedCertificate preparedRoundArtifacts =
+        createValidPreparedCertificate(context, roundId, block);
+
+    final List<SignedData<RoundChangePayload>> roundChanges =
+        peers.createSignedRoundChangePayload(nextRoundId, preparedRoundArtifacts);
+
+    final RoundSpecificPeers nextRoles = context.roundSpecificPeers(nextRoundId);
+    final ValidatorPeer nextProposer = nextRoles.getProposer();
+
+    nextProposer.injectProposalForFutureRound(
+        nextRoundId, roundChanges, preparedRoundArtifacts.getPrepares(), block);
+
+    peers.verifyMessagesReceived(
+        localNodeMessageFactory.createPrepare(nextRoundId, block.getHash()));
+
+    // Inject a prepare, then re-inject the proposal - then ensure only a single prepare is enough
+    // to trigger a Commit transmission from the local node
+    nextRoles.getNonProposing(0).injectPrepare(nextRoundId, block.getHash());
+
+    nextProposer.injectProposalForFutureRound(
+        nextRoundId, roundChanges, preparedRoundArtifacts.getPrepares(), block);
+    nextProposer.injectPrepare(nextRoundId, block.getHash());
+    peers.verifyNoMessagesReceived();
+
+    nextRoles.getNonProposing(1).injectPrepare(nextRoundId, block.getHash());
+
+    final Commit expectedCommit =
+        new Commit(
+            IntegrationTestHelpers.createSignedCommitPayload(
+                nextRoundId, block, context.getLocalNodeParams().getNodeKey()));
+
+    peers.verifyMessagesReceived(expectedCommit);
+  }
+}
diff --git a/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/RoundChangeTest.java b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/RoundChangeTest.java
new file mode 100644
index 00000000000..be439e4c1ec
--- /dev/null
+++ b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/RoundChangeTest.java
@@ -0,0 +1,350 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.test;
+
+import static java.util.Collections.emptyList;
+import static java.util.Optional.empty;
+import static org.hyperledger.besu.consensus.qbft.support.IntegrationTestHelpers.createValidPreparedCertificate;
+
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.events.BlockTimerExpiry;
+import org.hyperledger.besu.consensus.common.bft.events.RoundExpiry;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Proposal;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.RoundChange;
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.qbft.payload.RoundChangePayload;
+import org.hyperledger.besu.consensus.qbft.statemachine.PreparedCertificate;
+import org.hyperledger.besu.consensus.qbft.support.RoundSpecificPeers;
+import org.hyperledger.besu.consensus.qbft.support.TestContext;
+import org.hyperledger.besu.consensus.qbft.support.TestContextBuilder;
+import org.hyperledger.besu.consensus.qbft.support.ValidatorPeer;
+import org.hyperledger.besu.ethereum.core.Block;
+
+import java.time.Clock;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import com.google.common.collect.Lists;
+import org.junit.jupiter.api.Test;
+
+public class RoundChangeTest {
+
+  private final long blockTimeStamp = 100;
+  private final Clock fixedClock =
+      Clock.fixed(Instant.ofEpochSecond(blockTimeStamp), ZoneId.systemDefault());
+
+  private final int NETWORK_SIZE = 5;
+
+  // Configuration ensures remote peer will provide proposal for first block
+  private final TestContext context =
+      new TestContextBuilder()
+          .validatorCount(NETWORK_SIZE)
+          .indexOfFirstLocallyProposedBlock(0)
+          .clock(fixedClock)
+          .buildAndStart();
+  private final ConsensusRoundIdentifier roundId = new ConsensusRoundIdentifier(1, 0);
+  private final RoundSpecificPeers peers = context.roundSpecificPeers(roundId);
+
+  private final MessageFactory localNodeMessageFactory = context.getLocalNodeMessageFactory();
+
+  private final Block blockToPropose =
+      context.createBlockForProposalFromChainHead(15, peers.getProposer().getNodeAddress());
+
+  @Test
+  public void onRoundChangeTimerExpiryEventRoundChangeMessageIsSent() {
+
+    // NOTE: The prepare certificate will be empty as insufficient Prepare msgs have been received.
+    final ConsensusRoundIdentifier targetRound = new ConsensusRoundIdentifier(1, 1);
+    final RoundChange expectedTxRoundChange =
+        localNodeMessageFactory.createRoundChange(targetRound, empty());
+    context.getController().handleBlockTimerExpiry(new BlockTimerExpiry(roundId));
+    context.getController().handleRoundExpiry(new RoundExpiry(roundId));
+    peers.verifyMessagesReceived(expectedTxRoundChange);
+  }
+
+  @Test
+  public void roundChangeHasEmptyCertificateIfNoPrepareMessagesReceived() {
+    final ConsensusRoundIdentifier targetRound = new ConsensusRoundIdentifier(1, 1);
+    final RoundChange expectedTxRoundChange =
+        localNodeMessageFactory.createRoundChange(targetRound, empty());
+
+    peers.getProposer().injectProposal(roundId, blockToPropose);
+    peers.clearReceivedMessages();
+
+    context.getController().handleRoundExpiry(new RoundExpiry(roundId));
+    peers.verifyMessagesReceived(expectedTxRoundChange);
+  }
+
+  @Test
+  public void roundChangeHasEmptyCertificateIfInsufficientPreparesAreReceived() {
+    // Note: There are 4 validators, thus Quorum is 3 and Prepare Msgs are 2 - thus
+    // receiving only a single Prepare msg will result in no PreparedCert.
+    final ConsensusRoundIdentifier targetRound = new ConsensusRoundIdentifier(1, 1);
+    final RoundChange expectedTxRoundChange =
+        localNodeMessageFactory.createRoundChange(targetRound, empty());
+
+    peers.getProposer().injectProposal(roundId, blockToPropose);
+    peers.getNonProposing(1).injectPrepare(roundId, blockToPropose.getHash());
+    peers.clearReceivedMessages();
+
+    context.getController().handleRoundExpiry(new RoundExpiry(roundId));
+    peers.verifyMessagesReceived(expectedTxRoundChange);
+  }
+
+  @Test
+  public void roundChangeHasPopulatedCertificateIfQuorumPrepareMessagesAndProposalAreReceived() {
+    final ConsensusRoundIdentifier targetRound = new ConsensusRoundIdentifier(1, 1);
+    final Prepare localPrepareMessage =
+        localNodeMessageFactory.createPrepare(roundId, blockToPropose.getHash());
+
+    peers.getProposer().injectProposal(roundId, blockToPropose);
+    final Prepare p0 = peers.getProposer().injectPrepare(roundId, blockToPropose.getHash());
+    peers.clearReceivedMessages();
+
+    final Prepare p1 = peers.getNonProposing(0).injectPrepare(roundId, blockToPropose.getHash());
+    peers.clearReceivedMessages();
+
+    final Prepare p2 = peers.getNonProposing(1).injectPrepare(roundId, blockToPropose.getHash());
+    peers.clearReceivedMessages();
+
+    final RoundChange expectedTxRoundChange =
+        localNodeMessageFactory.createRoundChange(
+            targetRound,
+            Optional.of(
+                new PreparedCertificate(
+                    blockToPropose,
+                    List.of(localPrepareMessage, p0, p1, p2).stream()
+                        .map(Prepare::getSignedPayload)
+                        .collect(Collectors.toList()),
+                    roundId.getRoundNumber())));
+
+    context.getController().handleRoundExpiry(new RoundExpiry(roundId));
+    peers.verifyMessagesReceived(expectedTxRoundChange);
+  }
+
+  @Test
+  public void whenSufficientRoundChangeMessagesAreReceivedForNewRoundLocalNodeCreatesProposalMsg() {
+    // Note: Round-4 is the next round for which the local node is Proposer
+    final ConsensusRoundIdentifier targetRound = new ConsensusRoundIdentifier(1, 4);
+    final Block locallyProposedBlock = context.createBlockForProposalFromChainHead(blockTimeStamp);
+
+    final RoundChange rc1 = peers.getNonProposing(0).injectRoundChange(targetRound, empty());
+    final RoundChange rc2 = peers.getNonProposing(1).injectRoundChange(targetRound, empty());
+    final RoundChange rc3 = peers.getNonProposing(2).injectRoundChange(targetRound, empty());
+    final RoundChange rc4 = peers.getProposer().injectRoundChange(targetRound, empty());
+
+    final Proposal expectedProposal =
+        localNodeMessageFactory.createProposal(
+            targetRound,
+            locallyProposedBlock,
+            Lists.newArrayList(
+                rc1.getSignedPayload(),
+                rc2.getSignedPayload(),
+                rc3.getSignedPayload(),
+                rc4.getSignedPayload()),
+            emptyList());
+
+    final Prepare expectedPrepare =
+        localNodeMessageFactory.createPrepare(targetRound, locallyProposedBlock.getHash());
+
+    peers.verifyMessagesReceived(expectedProposal, expectedPrepare);
+  }
+
+  @Test
+  public void proposalMessageContainsBlockOnWhichPeerPrepared() {
+    final long ARBITRARY_BLOCKTIME = 1500;
+
+    final PreparedCertificate earlierPrepCert =
+        createValidPreparedCertificate(
+            context,
+            new ConsensusRoundIdentifier(1, 1),
+            context.createBlockForProposalFromChainHead(
+                ARBITRARY_BLOCKTIME / 2, peers.getProposer().getNodeAddress()));
+
+    final PreparedCertificate bestPrepCert =
+        createValidPreparedCertificate(
+            context,
+            new ConsensusRoundIdentifier(1, 2),
+            context.createBlockForProposalFromChainHead(
+                ARBITRARY_BLOCKTIME, peers.getProposer().getNodeAddress()));
+
+    final ConsensusRoundIdentifier targetRound = new ConsensusRoundIdentifier(1, 4);
+
+    final RoundChange rc1 = peers.getNonProposing(0).injectRoundChange(targetRound, empty());
+
+    // Create a roundChange with a PreparedCertificate from an earlier Round (should not be used
+    final RoundChange rc2 =
+        peers.getNonProposing(1).injectRoundChange(targetRound, Optional.of(earlierPrepCert));
+
+    // Create a roundChange with a PreparedCertificate from an earlier Round (should not be used
+    final RoundChange rc3 =
+        peers.getNonProposing(2).injectRoundChange(targetRound, Optional.of(earlierPrepCert));
+
+    // Create a roundChange containing a PreparedCertificate
+    final RoundChange rc4 =
+        peers.getProposer().injectRoundChange(targetRound, Optional.of(bestPrepCert));
+
+    // Expected to use the block with "ARBITRARY_BLOCKTIME" (i.e. latter block) but with the target
+    // round number.
+    final Block expectedBlockToPropose =
+        context.createBlockForProposalFromChainHead(
+            ARBITRARY_BLOCKTIME, peers.getProposer().getNodeAddress());
+
+    final Proposal expectedProposal =
+        localNodeMessageFactory.createProposal(
+            targetRound,
+            expectedBlockToPropose,
+            Lists.newArrayList(
+                rc1.getSignedPayload(),
+                rc2.getSignedPayload(),
+                rc3.getSignedPayload(),
+                rc4.getSignedPayload()),
+            bestPrepCert.getPrepares());
+
+    final Prepare expectedPrepare =
+        localNodeMessageFactory.createPrepare(targetRound, expectedBlockToPropose.getHash());
+
+    peers.verifyMessagesReceived(expectedProposal, expectedPrepare);
+  }
+
+  @Test
+  public void cannotRoundChangeToAnEarlierRound() {
+    // Controller always starts at 1:0. This test moves to 1:9, then attempts to move back to 1:4.
+    final ConsensusRoundIdentifier futureRound = new ConsensusRoundIdentifier(1, 9);
+    final List<SignedData<RoundChangePayload>> roundChangeMessages = peers.roundChange(futureRound);
+
+    final ConsensusRoundIdentifier priorRound = new ConsensusRoundIdentifier(1, 4);
+    peers.roundChange(priorRound);
+
+    final Block locallyProposedBlock = context.createBlockForProposalFromChainHead(blockTimeStamp);
+
+    final Proposal expectedProposal =
+        localNodeMessageFactory.createProposal(
+            futureRound, locallyProposedBlock, roundChangeMessages, emptyList());
+
+    final Prepare expectedPrepare =
+        localNodeMessageFactory.createPrepare(futureRound, locallyProposedBlock.getHash());
+
+    peers.verifyMessagesReceived(expectedProposal, expectedPrepare);
+  }
+
+  @Test
+  public void multipleRoundChangeMessagesFromSamePeerDoesNotTriggerRoundChange() {
+    // Note: Round-3 is the next round for which the local node is Proposer
+    final ConsensusRoundIdentifier targetRound = new ConsensusRoundIdentifier(1, 4);
+
+    final ValidatorPeer transmitter = peers.getNonProposing(0);
+
+    for (int i = 0; i < BftHelpers.calculateRequiredValidatorQuorum(NETWORK_SIZE); i++) {
+      transmitter.injectRoundChange(targetRound, empty());
+    }
+
+    peers.verifyNoMessagesReceived();
+  }
+
+  @Test
+  public void subsequentRoundChangeMessagesFromPeerDoNotOverwritePriorMessage() {
+    final long ARBITRARY_BLOCKTIME = 1500;
+
+    final ConsensusRoundIdentifier targetRound = new ConsensusRoundIdentifier(1, 4);
+
+    final PreparedCertificate prepCert =
+        createValidPreparedCertificate(
+            context,
+            new ConsensusRoundIdentifier(1, 2),
+            context.createBlockForProposalFromChainHead(
+                ARBITRARY_BLOCKTIME, peers.getProposer().getNodeAddress()));
+
+    final List<SignedData<RoundChangePayload>> roundChangeMessages = Lists.newArrayList();
+    // Create a roundChange containing a PreparedCertificate
+    roundChangeMessages.add(
+        peers
+            .getProposer()
+            .injectRoundChange(targetRound, Optional.of(prepCert))
+            .getSignedPayload());
+
+    // Attempt to override the previously received RoundChange (but now without a payload).
+    peers.getProposer().injectRoundChange(targetRound, empty());
+
+    roundChangeMessages.addAll(peers.roundChangeForNonProposing(targetRound));
+
+    final Block expectedBlockToPropose =
+        context.createBlockForProposalFromChainHead(
+            ARBITRARY_BLOCKTIME, peers.getProposer().getNodeAddress());
+
+    final Proposal expectedProposal =
+        localNodeMessageFactory.createProposal(
+            targetRound,
+            expectedBlockToPropose,
+            Lists.newArrayList(roundChangeMessages),
+            prepCert.getPrepares());
+
+    final Prepare expectedPrepare =
+        localNodeMessageFactory.createPrepare(targetRound, expectedBlockToPropose.getHash());
+
+    peers.verifyMessagesReceived(expectedProposal, expectedPrepare);
+  }
+
+  @Test
+  public void messagesFromPreviousRoundAreDiscardedOnTransitionToFutureRound() {
+    peers.getProposer().injectProposal(roundId, blockToPropose);
+
+    // timeout into next round
+    context.getController().handleRoundExpiry(new RoundExpiry(roundId));
+
+    // Clear prior Prepare msg and RoundChange message
+    peers.clearReceivedMessages();
+
+    // inject enough prepares from prior round to trigger a commit
+    peers.prepareForNonProposing(roundId, blockToPropose.getHash());
+
+    peers.verifyNoMessagesReceived();
+  }
+
+  @Test
+  public void roundChangeExpiryForNonCurrentRoundIsDiscarded() {
+    // Manually timeout a future round, and ensure no messages are sent
+    context.getController().handleRoundExpiry(new RoundExpiry(new ConsensusRoundIdentifier(1, 1)));
+    peers.verifyNoMessagesReceived();
+  }
+
+  @Test
+  public void illegallyConstructedRoundChangeMessageIsDiscarded() {
+    final ConsensusRoundIdentifier targetRound = new ConsensusRoundIdentifier(1, 4);
+
+    peers.getNonProposing(0).injectRoundChange(targetRound, empty());
+    peers.getNonProposing(1).injectRoundChange(targetRound, empty());
+    peers.getNonProposing(2).injectRoundChange(targetRound, empty());
+
+    // create illegal RoundChangeMessage
+    peers
+        .getNonProposing(0)
+        .getMessageFactory()
+        .createProposal(roundId, blockToPropose, emptyList(), emptyList());
+    final PreparedCertificate illegalPreparedRoundArtifacts =
+        new PreparedCertificate(blockToPropose, emptyList(), 1);
+
+    peers.getProposer().injectRoundChange(targetRound, Optional.of(illegalPreparedRoundArtifacts));
+
+    // Ensure no Proposal message is sent.
+    peers.verifyNoMessagesReceived();
+  }
+}
diff --git a/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/SpuriousBehaviourTest.java b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/SpuriousBehaviourTest.java
new file mode 100644
index 00000000000..8f1bfb9a7fd
--- /dev/null
+++ b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/SpuriousBehaviourTest.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.consensus.qbft.support.IntegrationTestHelpers.createSignedCommitPayload;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.inttest.NodeParams;
+import org.hyperledger.besu.consensus.qbft.messagedata.QbftV1;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Commit;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.qbft.support.RoundSpecificPeers;
+import org.hyperledger.besu.consensus.qbft.support.TestContext;
+import org.hyperledger.besu.consensus.qbft.support.TestContextBuilder;
+import org.hyperledger.besu.consensus.qbft.support.ValidatorPeer;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.Util;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage;
+
+import java.time.Clock;
+import java.time.Instant;
+import java.time.ZoneId;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class SpuriousBehaviourTest {
+
+  private final long blockTimeStamp = 100;
+  private final Clock fixedClock =
+      Clock.fixed(Instant.ofEpochSecond(blockTimeStamp), ZoneId.systemDefault());
+
+  // Test is configured such that a remote peer is responsible for proposing a block
+  private final int NETWORK_SIZE = 5;
+
+  // Configuration ensures remote peer will provide proposal for first block
+  private final TestContext context =
+      new TestContextBuilder()
+          .validatorCount(NETWORK_SIZE)
+          .indexOfFirstLocallyProposedBlock(0)
+          .clock(fixedClock)
+          .buildAndStart();
+  private final ConsensusRoundIdentifier roundId = new ConsensusRoundIdentifier(1, 0);
+  private final RoundSpecificPeers peers = context.roundSpecificPeers(roundId);
+
+  private final Block proposedBlock =
+      context.createBlockForProposalFromChainHead(30, peers.getProposer().getNodeAddress());
+  private Prepare expectedPrepare;
+  private Commit expectedCommit;
+
+  @BeforeEach
+  public void setup() {
+
+    expectedPrepare =
+        context.getLocalNodeMessageFactory().createPrepare(roundId, proposedBlock.getHash());
+    expectedCommit =
+        new Commit(
+            createSignedCommitPayload(
+                roundId, proposedBlock, context.getLocalNodeParams().getNodeKey()));
+  }
+
+  @Test
+  public void badlyFormedRlpDoesNotPreventOngoingBftOperation() {
+    final MessageData illegalCommitMsg = new RawMessage(QbftV1.PREPARE, Bytes.EMPTY);
+    peers.getNonProposing(0).injectMessage(illegalCommitMsg);
+
+    peers.getProposer().injectProposal(roundId, proposedBlock);
+    peers.verifyMessagesReceived(expectedPrepare);
+  }
+
+  @Test
+  public void messageWithIllegalMessageCodeAreDiscardedAndDoNotPreventOngoingBftOperation() {
+    final MessageData illegalCommitMsg = new RawMessage(QbftV1.MESSAGE_SPACE, Bytes.EMPTY);
+    peers.getNonProposing(0).injectMessage(illegalCommitMsg);
+
+    peers.getProposer().injectProposal(roundId, proposedBlock);
+    peers.verifyMessagesReceived(expectedPrepare);
+  }
+
+  @Test
+  public void nonValidatorsCannotTriggerResponses() {
+    final NodeKey nonValidatorNodeKey = NodeKeyUtils.generate();
+    final NodeParams nonValidatorParams =
+        new NodeParams(
+            Util.publicKeyToAddress(nonValidatorNodeKey.getPublicKey()), nonValidatorNodeKey);
+
+    final ValidatorPeer nonvalidator =
+        new ValidatorPeer(
+            nonValidatorParams,
+            new MessageFactory(nonValidatorParams.getNodeKey()),
+            context.getEventMultiplexer());
+
+    nonvalidator.injectProposal(new ConsensusRoundIdentifier(1, 0), proposedBlock);
+
+    peers.verifyNoMessagesReceived();
+  }
+
+  @Test
+  public void preparesWithMisMatchedDigestAreNotRespondedTo() {
+    peers.getProposer().injectProposal(roundId, proposedBlock);
+    peers.verifyMessagesReceived(expectedPrepare);
+
+    peers.prepareForNonProposing(roundId, Hash.ZERO);
+    peers.verifyNoMessagesReceived();
+
+    peers.prepareForNonProposing(roundId, proposedBlock.getHash());
+    peers.verifyMessagesReceived(expectedCommit);
+
+    peers.prepareForNonProposing(roundId, Hash.ZERO);
+    assertThat(context.getCurrentChainHeight()).isEqualTo(0);
+
+    peers.commitForNonProposing(roundId, proposedBlock);
+    assertThat(context.getCurrentChainHeight()).isEqualTo(1);
+  }
+
+  @Test
+  public void oneCommitSealIsIllegalPreventsImport() {
+    peers.getProposer().injectProposal(roundId, proposedBlock);
+    peers.verifyMessagesReceived(expectedPrepare);
+
+    peers.prepareForNonProposing(roundId, proposedBlock.getHash());
+
+    // for a network of 5, 4 seals are required (local + 3 remote)
+    peers.getNonProposing(0).injectCommit(roundId, proposedBlock);
+    peers.getNonProposing(1).injectCommit(roundId, proposedBlock);
+
+    // nonProposer-2 will generate an invalid seal
+    final ValidatorPeer badSealPeer = peers.getNonProposing(2);
+    final SECPSignature illegalSeal = badSealPeer.getnodeKey().sign(Hash.ZERO);
+
+    badSealPeer.injectCommit(roundId, proposedBlock.getHash(), illegalSeal);
+    assertThat(context.getCurrentChainHeight()).isEqualTo(0);
+
+    // Now inject the REAL commit message
+    badSealPeer.injectCommit(roundId, proposedBlock);
+    assertThat(context.getCurrentChainHeight()).isEqualTo(1);
+  }
+}
diff --git a/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/TransitionsTest.java b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/TransitionsTest.java
new file mode 100644
index 00000000000..8f22549dc1b
--- /dev/null
+++ b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/TransitionsTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.config.BftFork;
+import org.hyperledger.besu.config.JsonUtil;
+import org.hyperledger.besu.config.QbftFork;
+import org.hyperledger.besu.consensus.common.bft.BftEventQueue;
+import org.hyperledger.besu.consensus.common.bft.events.NewChainHead;
+import org.hyperledger.besu.consensus.qbft.support.TestContext;
+import org.hyperledger.besu.consensus.qbft.support.TestContextBuilder;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.testutil.TestClock;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.Test;
+
+public class TransitionsTest {
+
+  @Test
+  public void transitionsBlockPeriod() throws InterruptedException {
+    final TestClock clock = new TestClock(Instant.EPOCH);
+
+    final List<QbftFork> qbftForks =
+        List.of(
+            new QbftFork(
+                JsonUtil.objectNodeFromMap(
+                    Map.of(BftFork.FORK_BLOCK_KEY, 1, BftFork.BLOCK_PERIOD_SECONDS_KEY, 10))),
+            new QbftFork(
+                JsonUtil.objectNodeFromMap(
+                    Map.of(BftFork.FORK_BLOCK_KEY, 2, BftFork.BLOCK_PERIOD_SECONDS_KEY, 20))));
+
+    final BftEventQueue bftEventQueue = new BftEventQueue(TestContextBuilder.MESSAGE_QUEUE_LIMIT);
+    final TestContext context =
+        new TestContextBuilder()
+            .indexOfFirstLocallyProposedBlock(0)
+            .validatorCount(1)
+            .clock(clock)
+            .qbftForks(qbftForks)
+            .eventQueue(bftEventQueue)
+            .buildAndStart();
+
+    clock.stepMillis(10_000);
+    context.getEventMultiplexer().handleBftEvent(bftEventQueue.poll(1, TimeUnit.SECONDS));
+
+    context
+        .getController()
+        .handleNewBlockEvent(new NewChainHead(context.getBlockchain().getChainHeadHeader()));
+    clock.stepMillis(20_000);
+    context.getEventMultiplexer().handleBftEvent(bftEventQueue.poll(1, TimeUnit.SECONDS));
+
+    final BlockHeader genesisBlock = context.getBlockchain().getBlockHeader(0).get();
+    final BlockHeader blockHeader1 = context.getBlockchain().getBlockHeader(1).get();
+    final BlockHeader blockHeader2 = context.getBlockchain().getBlockHeader(2).get();
+
+    assertThat(blockHeader1.getTimestamp()).isEqualTo(genesisBlock.getTimestamp() + 10);
+    assertThat(blockHeader2.getTimestamp()).isEqualTo(blockHeader1.getTimestamp() + 20);
+  }
+}
diff --git a/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/ValidatorContractTest.java b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/ValidatorContractTest.java
new file mode 100644
index 00000000000..a91ff3acbbf
--- /dev/null
+++ b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/ValidatorContractTest.java
@@ -0,0 +1,446 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.test;
+
+import static java.time.temporal.ChronoUnit.SECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.config.BftFork;
+import org.hyperledger.besu.config.JsonUtil;
+import org.hyperledger.besu.config.QbftFork;
+import org.hyperledger.besu.config.QbftFork.VALIDATOR_SELECTION_MODE;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.events.BlockTimerExpiry;
+import org.hyperledger.besu.consensus.common.bft.events.NewChainHead;
+import org.hyperledger.besu.consensus.common.bft.inttest.NodeParams;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
+import org.hyperledger.besu.consensus.qbft.support.RoundSpecificPeers;
+import org.hyperledger.besu.consensus.qbft.support.TestContext;
+import org.hyperledger.besu.consensus.qbft.support.TestContextBuilder;
+import org.hyperledger.besu.consensus.qbft.support.ValidatorPeer;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.testutil.TestClock;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import com.fasterxml.jackson.databind.node.TextNode;
+import com.google.common.io.Resources;
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class ValidatorContractTest {
+
+  public static final Address NODE_ADDRESS =
+      Address.fromHexString("0xeac51e3fe1afc9894f0dfeab8ceb471899b932df");
+  public static final Bytes32 NODE_PRIVATE_KEY =
+      Bytes32.fromHexString("0xa3bdf521b0f286a80918c4b67000dfd2a2bdef97e94d268016ef9ec86648eac3");
+
+  private static final Address NODE_2_ADDRESS =
+      Address.fromHexString("0xe98d92560fac3069ccff53ef348ded26a51d4b68");
+  private static final Bytes32 NODE_2_PRIVATE_KEY =
+      Bytes32.fromHexString("0xa3bdf521b0f286a80918c4b67000dfd2a2bdef97e94d268016ef9ec86648eac4");
+
+  final Address NEW_VALIDATOR_CONTRACT_ADDRESS =
+      Address.fromHexString("0x0000000000000000000000000000000000009999");
+
+  private TestClock clock;
+
+  private final QbftExtraDataCodec extraDataCodec = new QbftExtraDataCodec();
+
+  @BeforeEach
+  public void setup() {
+    clock = new TestClock(Instant.EPOCH.plus(TestContextBuilder.BLOCK_TIMER_SEC, SECONDS));
+  }
+
+  @Test
+  public void retrievesValidatorsFromValidatorContract() {
+    final TestContext context =
+        new TestContextBuilder()
+            .indexOfFirstLocallyProposedBlock(0)
+            .nodeParams(
+                List.of(new NodeParams(NODE_ADDRESS, NodeKeyUtils.createFrom(NODE_PRIVATE_KEY))))
+            .clock(TestClock.fixed())
+            .genesisFile(Resources.getResource("genesis_validator_contract.json").getFile())
+            .useValidatorContract(true)
+            .buildAndStart();
+
+    createNewBlockAsProposer(context, 1);
+
+    final ValidatorProvider validatorProvider = context.getValidatorProvider();
+    final BlockHeader genesisBlock = context.getBlockchain().getBlockHeader(0).get();
+    final BlockHeader block1 = context.getBlockchain().getBlockHeader(1).get();
+    assertThat(validatorProvider.getValidatorsForBlock(genesisBlock)).containsExactly(NODE_ADDRESS);
+    assertThat(validatorProvider.getValidatorsForBlock(block1)).containsExactly(NODE_ADDRESS);
+  }
+
+  @Test
+  public void retrievesValidatorsFromValidatorContract_LondonFork() {
+    final TestContext context =
+        new TestContextBuilder()
+            .indexOfFirstLocallyProposedBlock(0)
+            .nodeParams(
+                List.of(new NodeParams(NODE_ADDRESS, NodeKeyUtils.createFrom(NODE_PRIVATE_KEY))))
+            .clock(TestClock.fixed())
+            .genesisFile(Resources.getResource("genesis_validator_contract_london.json").getFile())
+            .useValidatorContract(true)
+            .useLondonMilestone(true)
+            .buildAndStart();
+
+    createNewBlockAsProposer(context, 1);
+
+    final ValidatorProvider validatorProvider = context.getValidatorProvider();
+    final BlockHeader genesisBlock = context.getBlockchain().getBlockHeader(0).get();
+    final BlockHeader block1 = context.getBlockchain().getBlockHeader(1).get();
+    assertThat(validatorProvider.getValidatorsForBlock(genesisBlock)).containsExactly(NODE_ADDRESS);
+    assertThat(validatorProvider.getValidatorsForBlock(block1)).containsExactly(NODE_ADDRESS);
+  }
+
+  @Test
+  public void retrievesValidatorsFromValidatorContract_LondonFork_ZeroBaseFee() {
+    // Using London on a free gas network
+    final TestContext context =
+        new TestContextBuilder()
+            .indexOfFirstLocallyProposedBlock(0)
+            .nodeParams(
+                List.of(new NodeParams(NODE_ADDRESS, NodeKeyUtils.createFrom(NODE_PRIVATE_KEY))))
+            .clock(TestClock.fixed())
+            .genesisFile(Resources.getResource("genesis_validator_contract_london.json").getFile())
+            .useValidatorContract(true)
+            .useLondonMilestone(true)
+            .useZeroBaseFee(true)
+            .buildAndStart();
+
+    createNewBlockAsProposer(context, 1);
+
+    final ValidatorProvider validatorProvider = context.getValidatorProvider();
+    final BlockHeader genesisBlock = context.getBlockchain().getBlockHeader(0).get();
+    final BlockHeader block1 = context.getBlockchain().getBlockHeader(1).get();
+    assertThat(validatorProvider.getValidatorsForBlock(genesisBlock)).containsExactly(NODE_ADDRESS);
+    assertThat(validatorProvider.getValidatorsForBlock(block1)).containsExactly(NODE_ADDRESS);
+  }
+
+  @Test
+  public void transitionsFromBlockHeaderModeToValidatorContractMode() {
+    final List<QbftFork> qbftForks =
+        List.of(createContractFork(1, TestContextBuilder.VALIDATOR_CONTRACT_ADDRESS));
+    final TestContext context =
+        new TestContextBuilder()
+            .indexOfFirstLocallyProposedBlock(1)
+            .nodeParams(
+                List.of(
+                    new NodeParams(NODE_ADDRESS, NodeKeyUtils.createFrom(NODE_PRIVATE_KEY)),
+                    new NodeParams(NODE_2_ADDRESS, NodeKeyUtils.createFrom(NODE_2_PRIVATE_KEY))))
+            .clock(TestClock.fixed())
+            .genesisFile(
+                Resources.getResource("genesis_migrating_validator_contract.json").getFile())
+            .useValidatorContract(false)
+            .qbftForks(qbftForks)
+            .buildAndStart();
+
+    // block 0 uses block header voting with 1 validator
+    // block 1 onwards uses validator contract with 2 validators
+    final List<Address> block0Addresses = List.of(NODE_ADDRESS);
+    final List<Address> block1Addresses =
+        Stream.of(NODE_ADDRESS, NODE_2_ADDRESS).sorted().collect(Collectors.toList());
+
+    remotePeerProposesNewBlock(context, 1L);
+
+    final ValidatorProvider validatorProvider = context.getValidatorProvider();
+    final BlockHeader genesisBlock = context.getBlockchain().getBlockHeader(0).get();
+    final BlockHeader block1 = context.getBlockchain().getBlockHeader(1).get();
+
+    assertThat(validatorProvider.getValidatorsForBlock(genesisBlock)).isEqualTo(block0Addresses);
+    assertThat(extraDataCodec.decode(genesisBlock).getValidators()).containsExactly(NODE_ADDRESS);
+
+    // contract block extra data cannot contain validators or vote
+    assertThat(validatorProvider.getValidatorsForBlock(block1)).isEqualTo(block1Addresses);
+    assertThat(extraDataCodec.decode(block1).getValidators()).isEmpty();
+    assertThat(extraDataCodec.decode(block1).getVote()).isEmpty();
+  }
+
+  @Test
+  public void transitionsFromValidatorContractModeToValidatorContractMode() {
+    final List<QbftFork> qbftForks = List.of(createContractFork(1, NEW_VALIDATOR_CONTRACT_ADDRESS));
+
+    final TestContext context =
+        new TestContextBuilder()
+            .indexOfFirstLocallyProposedBlock(1)
+            .nodeParams(
+                List.of(
+                    new NodeParams(NODE_ADDRESS, NodeKeyUtils.createFrom(NODE_PRIVATE_KEY)),
+                    new NodeParams(NODE_2_ADDRESS, NodeKeyUtils.createFrom(NODE_2_PRIVATE_KEY))))
+            .clock(clock)
+            .genesisFile(Resources.getResource("genesis_validator_contract.json").getFile())
+            .useValidatorContract(true)
+            .qbftForks(qbftForks)
+            .buildAndStart();
+
+    // block 0 uses validator contract with 1 validator
+    // block 1 uses validator contract with 2 validators
+    final List<Address> block0Addresses = List.of(NODE_ADDRESS);
+    final List<Address> block1Addresses =
+        Stream.of(NODE_ADDRESS, NODE_2_ADDRESS).sorted().collect(Collectors.toList());
+
+    remotePeerProposesNewBlock(context, 1L);
+
+    final ValidatorProvider validatorProvider = context.getValidatorProvider();
+    final BlockHeader genesisBlock = context.getBlockchain().getBlockHeader(0).get();
+    final BlockHeader block1 = context.getBlockchain().getBlockHeader(1).get();
+
+    // contract block extra data cannot contain validators or vote
+    assertThat(validatorProvider.getValidatorsForBlock(genesisBlock)).isEqualTo(block0Addresses);
+    assertThat(extraDataCodec.decode(genesisBlock).getValidators()).isEmpty();
+    assertThat(extraDataCodec.decode(genesisBlock).getVote()).isEmpty();
+
+    // contract block extra data cannot contain validators or vote
+    assertThat(validatorProvider.getValidatorsForBlock(block1)).isEqualTo(block1Addresses);
+    assertThat(extraDataCodec.decode(block1).getValidators()).isEmpty();
+    assertThat(extraDataCodec.decode(block1).getVote()).isEmpty();
+  }
+
+  @Test
+  public void transitionsFromValidatorContractModeToBlockHeaderMode() {
+    final List<QbftFork> qbftForks =
+        List.of(createBlockHeaderFork(1, List.of(NODE_ADDRESS, NODE_2_ADDRESS)));
+    final TestContext context =
+        new TestContextBuilder()
+            .indexOfFirstLocallyProposedBlock(0)
+            .nodeParams(
+                List.of(
+                    new NodeParams(NODE_ADDRESS, NodeKeyUtils.createFrom(NODE_PRIVATE_KEY)),
+                    new NodeParams(NODE_2_ADDRESS, NodeKeyUtils.createFrom(NODE_2_PRIVATE_KEY))))
+            .clock(clock)
+            .genesisFile(Resources.getResource("genesis_validator_contract.json").getFile())
+            .useValidatorContract(true)
+            .qbftForks(qbftForks)
+            .buildAndStart();
+
+    // block 0 uses validator contract with 1 validator
+    // block 1 onwards uses block header voting with 2 overridden validators
+    // block 2 uses block header voting with the cached validators
+    final List<Address> block0Addresses = Stream.of(NODE_ADDRESS).collect(Collectors.toList());
+    final List<Address> block1Addresses =
+        Stream.of(NODE_ADDRESS, NODE_2_ADDRESS).sorted().collect(Collectors.toList());
+
+    createNewBlockAsProposer(context, 1);
+    clock.step(TestContextBuilder.BLOCK_TIMER_SEC, SECONDS);
+    remotePeerProposesNewBlock(context, 2L);
+
+    final ValidatorProvider validatorProvider = context.getValidatorProvider();
+    final BlockHeader genesisBlock = context.getBlockchain().getBlockHeader(0).get();
+    final BlockHeader block1 = context.getBlockchain().getBlockHeader(1).get();
+    final BlockHeader block2 = context.getBlockchain().getBlockHeader(2).get();
+
+    // contract block extra data cannot contain validators or vote
+    assertThat(validatorProvider.getValidatorsForBlock(genesisBlock)).isEqualTo(block0Addresses);
+    assertThat(extraDataCodec.decode(genesisBlock).getValidators()).isEmpty();
+    assertThat(extraDataCodec.decode(genesisBlock).getVote()).isEmpty();
+
+    // uses overridden validators
+    assertThat(validatorProvider.getValidatorsForBlock(block1)).isEqualTo(block1Addresses);
+    assertThat(extraDataCodec.decode(block1).getValidators())
+        .containsExactly(NODE_2_ADDRESS, NODE_ADDRESS);
+
+    // uses cached validators
+    assertThat(validatorProvider.getValidatorsForBlock(block2)).isEqualTo(block1Addresses);
+    assertThat(extraDataCodec.decode(block2).getValidators())
+        .containsExactly(NODE_2_ADDRESS, NODE_ADDRESS);
+  }
+
+  @Test
+  public void transitionsFromBlockHeaderModeToValidatorContractModeThenBack() {
+    final List<QbftFork> qbftForks =
+        List.of(
+            createContractFork(1, TestContextBuilder.VALIDATOR_CONTRACT_ADDRESS),
+            createBlockHeaderFork(2, List.of(NODE_ADDRESS, NODE_2_ADDRESS)));
+
+    final TestContext context =
+        new TestContextBuilder()
+            .indexOfFirstLocallyProposedBlock(1)
+            .nodeParams(
+                List.of(
+                    new NodeParams(NODE_ADDRESS, NodeKeyUtils.createFrom(NODE_PRIVATE_KEY)),
+                    new NodeParams(NODE_2_ADDRESS, NodeKeyUtils.createFrom(NODE_2_PRIVATE_KEY))))
+            .clock(clock)
+            .genesisFile(
+                Resources.getResource("genesis_migrating_validator_contract.json").getFile())
+            .useValidatorContract(false)
+            .qbftForks(qbftForks)
+            .buildAndStart();
+
+    // block 0 uses block header voting with 1 validator
+    // block 1 uses validator contract with 2 validators
+    // block 2 uses block header voting with 2 overridden validators
+    // block 3 uses block header voting with cached validators
+    final List<Address> block0Addresses = List.of(NODE_ADDRESS);
+    final List<Address> block1Addresses =
+        Stream.of(NODE_ADDRESS, NODE_2_ADDRESS).sorted().collect(Collectors.toList());
+
+    remotePeerProposesNewBlock(context, 1L);
+    clock.step(TestContextBuilder.BLOCK_TIMER_SEC, SECONDS);
+    createNewBlockAsProposer(context, 2L);
+    clock.step(TestContextBuilder.BLOCK_TIMER_SEC, SECONDS);
+    remotePeerProposesNewBlock(context, 3L);
+
+    final ValidatorProvider validatorProvider = context.getValidatorProvider();
+    final BlockHeader genesisBlock = context.getBlockchain().getBlockHeader(0).get();
+    final BlockHeader block1 = context.getBlockchain().getBlockHeader(1).get();
+    final BlockHeader block2 = context.getBlockchain().getBlockHeader(2).get();
+    final BlockHeader block3 = context.getBlockchain().getBlockHeader(3).get();
+
+    assertThat(validatorProvider.getValidatorsForBlock(genesisBlock)).isEqualTo(block0Addresses);
+    assertThat(extraDataCodec.decode(genesisBlock).getValidators()).containsExactly(NODE_ADDRESS);
+
+    // contract block extra data cannot contain validators or vote
+    assertThat(validatorProvider.getValidatorsForBlock(block1)).isEqualTo(block1Addresses);
+    assertThat(extraDataCodec.decode(block1).getValidators()).isEmpty();
+    assertThat(extraDataCodec.decode(block1).getVote()).isEmpty();
+
+    // uses overridden validators
+    assertThat(validatorProvider.getValidatorsForBlock(block2)).isEqualTo(block1Addresses);
+    assertThat(extraDataCodec.decode(block2).getValidators())
+        .containsExactly(NODE_2_ADDRESS, NODE_ADDRESS);
+
+    // uses cached validators
+    assertThat(validatorProvider.getValidatorsForBlock(block3)).isEqualTo(block1Addresses);
+    assertThat(extraDataCodec.decode(block3).getValidators())
+        .containsExactly(NODE_2_ADDRESS, NODE_ADDRESS);
+  }
+
+  @Test
+  public void transitionsFromValidatorContractModeToBlockHeaderModeThenBackToNewContract() {
+    final List<QbftFork> qbftForks =
+        List.of(
+            createBlockHeaderFork(1, List.of(NODE_2_ADDRESS)),
+            createContractFork(2, NEW_VALIDATOR_CONTRACT_ADDRESS));
+
+    final TestContext context =
+        new TestContextBuilder()
+            .indexOfFirstLocallyProposedBlock(0)
+            .nodeParams(
+                List.of(
+                    new NodeParams(NODE_ADDRESS, NodeKeyUtils.createFrom(NODE_PRIVATE_KEY)),
+                    new NodeParams(NODE_2_ADDRESS, NodeKeyUtils.createFrom(NODE_2_PRIVATE_KEY))))
+            .clock(clock)
+            .genesisFile(Resources.getResource("genesis_validator_contract.json").getFile())
+            .useValidatorContract(true)
+            .qbftForks(qbftForks)
+            .buildAndStart();
+
+    // block 0 uses validator contract with 1 validator
+    // block 1 uses block header voting with 1 overridden validator
+    // block 2 uses validator contract with 2 validators
+    final List<Address> block0Addresses = List.of(NODE_ADDRESS);
+    final List<Address> block1Addresses = List.of(NODE_2_ADDRESS);
+    final List<Address> block2Addresses =
+        Stream.of(NODE_ADDRESS, NODE_2_ADDRESS).sorted().collect(Collectors.toList());
+
+    createNewBlockAsProposer(context, 1L);
+    clock.step(TestContextBuilder.BLOCK_TIMER_SEC, SECONDS);
+    remotePeerProposesNewBlock(context, 2L);
+
+    final ValidatorProvider validatorProvider = context.getValidatorProvider();
+    final BlockHeader genesisBlock = context.getBlockchain().getBlockHeader(0).get();
+    final BlockHeader block1 = context.getBlockchain().getBlockHeader(1).get();
+    final BlockHeader block2 = context.getBlockchain().getBlockHeader(2).get();
+
+    // contract block extra data cannot contain validators or vote
+    assertThat(validatorProvider.getValidatorsForBlock(genesisBlock)).isEqualTo(block0Addresses);
+    assertThat(extraDataCodec.decode(genesisBlock).getValidators()).isEmpty();
+    assertThat(extraDataCodec.decode(genesisBlock).getVote()).isEmpty();
+
+    assertThat(validatorProvider.getValidatorsForBlock(block1)).isEqualTo(block1Addresses);
+    assertThat(extraDataCodec.decode(block1).getValidators()).containsExactly(NODE_2_ADDRESS);
+
+    // contract block extra data cannot contain validators or vote
+    assertThat(validatorProvider.getValidatorsForBlock(block2)).isEqualTo(block2Addresses);
+    assertThat(extraDataCodec.decode(block2).getValidators()).isEmpty();
+    assertThat(extraDataCodec.decode(block2).getVote()).isEmpty();
+  }
+
+  private void createNewBlockAsProposer(final TestContext context, final long blockNumber) {
+    ConsensusRoundIdentifier roundId = new ConsensusRoundIdentifier(blockNumber, 0);
+
+    // trigger proposal
+    context.getController().handleBlockTimerExpiry(new BlockTimerExpiry(roundId));
+
+    // peers commit proposed block
+    Block proposedBlock =
+        context.createBlockForProposalFromChainHead(clock.instant().getEpochSecond());
+    RoundSpecificPeers peers = context.roundSpecificPeers(roundId);
+    peers.commitForNonProposing(roundId, proposedBlock);
+
+    assertThat(context.getCurrentChainHeight()).isEqualTo(blockNumber);
+    context
+        .getController()
+        .handleNewBlockEvent(new NewChainHead(context.getBlockchain().getChainHeadHeader()));
+  }
+
+  private void remotePeerProposesNewBlock(final TestContext context, final long blockNumber) {
+    ConsensusRoundIdentifier roundId = new ConsensusRoundIdentifier(blockNumber, 0);
+
+    RoundSpecificPeers peers = context.roundSpecificPeers(roundId);
+    ValidatorPeer remoteProposer = peers.getProposer();
+    final Block blockToPropose =
+        context.createBlockForProposalFromChainHead(
+            clock.instant().getEpochSecond(), remoteProposer.getNodeAddress());
+    remoteProposer.injectProposal(roundId, blockToPropose);
+    remoteProposer.injectCommit(roundId, blockToPropose);
+    assertThat(context.getCurrentChainHeight()).isEqualTo(blockNumber);
+
+    context
+        .getController()
+        .handleNewBlockEvent(new NewChainHead(context.getBlockchain().getChainHeadHeader()));
+  }
+
+  private QbftFork createContractFork(final long block, final Address contractAddress) {
+    return new QbftFork(
+        JsonUtil.objectNodeFromMap(
+            Map.of(
+                BftFork.FORK_BLOCK_KEY,
+                block,
+                QbftFork.VALIDATOR_SELECTION_MODE_KEY,
+                VALIDATOR_SELECTION_MODE.CONTRACT,
+                QbftFork.VALIDATOR_CONTRACT_ADDRESS_KEY,
+                contractAddress.toHexString())));
+  }
+
+  private QbftFork createBlockHeaderFork(final long block, final List<Address> validators) {
+
+    final List<TextNode> jsonValidators =
+        validators.stream()
+            .map(v -> TextNode.valueOf(v.toHexString()))
+            .collect(Collectors.toList());
+
+    return new QbftFork(
+        JsonUtil.objectNodeFromMap(
+            Map.of(
+                BftFork.FORK_BLOCK_KEY,
+                block,
+                QbftFork.VALIDATOR_SELECTION_MODE_KEY,
+                VALIDATOR_SELECTION_MODE.BLOCKHEADER,
+                BftFork.VALIDATORS_KEY,
+                JsonUtil.getObjectMapper().createArrayNode().addAll(jsonValidators))));
+  }
+}
diff --git a/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/round/QbftRoundIntegrationTest.java b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/round/QbftRoundIntegrationTest.java
new file mode 100644
index 00000000000..cd3af6ac15b
--- /dev/null
+++ b/consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/test/round/QbftRoundIntegrationTest.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.test.round;
+
+import static java.util.Collections.emptyList;
+import static java.util.Optional.empty;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.consensus.common.bft.BftContextBuilder.setupContextWithBftExtraDataEncoder;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.RoundTimer;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.BftBlockCreator;
+import org.hyperledger.besu.consensus.common.bft.inttest.StubValidatorMulticaster;
+import org.hyperledger.besu.consensus.qbft.QbftContext;
+import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
+import org.hyperledger.besu.consensus.qbft.network.QbftMessageTransmitter;
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.qbft.statemachine.QbftRound;
+import org.hyperledger.besu.consensus.qbft.statemachine.RoundState;
+import org.hyperledger.besu.consensus.qbft.validation.MessageValidator;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.BlockImporter;
+import org.hyperledger.besu.ethereum.mainnet.BlockImportResult;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.plugin.services.securitymodule.SecurityModuleException;
+import org.hyperledger.besu.util.Subscribers;
+
+import java.math.BigInteger;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+public class QbftRoundIntegrationTest {
+
+  private final MessageFactory peerMessageFactory = new MessageFactory(NodeKeyUtils.generate());
+  private final MessageFactory peerMessageFactory2 = new MessageFactory(NodeKeyUtils.generate());
+  private final ConsensusRoundIdentifier roundIdentifier = new ConsensusRoundIdentifier(1, 0);
+  private final Subscribers<MinedBlockObserver> subscribers = Subscribers.create();
+  private final BftExtraDataCodec bftExtraDataCodec = new QbftExtraDataCodec();
+  private ProtocolContext protocolContext;
+
+  @Mock private MutableBlockchain blockChain;
+  @Mock private WorldStateArchive worldStateArchive;
+  @Mock private BlockImporter blockImporter;
+
+  @Mock private BftBlockCreator blockCreator;
+  @Mock private MessageValidator messageValidator;
+  @Mock private RoundTimer roundTimer;
+  @Mock private NodeKey nodeKey;
+  private MessageFactory throwingMessageFactory;
+  private QbftMessageTransmitter transmitter;
+  @Mock private StubValidatorMulticaster multicaster;
+
+  private Block proposedBlock;
+
+  private final SECPSignature remoteCommitSeal =
+      SignatureAlgorithmFactory.getInstance()
+          .createSignature(BigInteger.ONE, BigInteger.ONE, (byte) 1);
+
+  @BeforeEach
+  public void setup() {
+    when(messageValidator.validateProposal(any())).thenReturn(true);
+    when(messageValidator.validatePrepare(any())).thenReturn(true);
+    when(messageValidator.validateCommit(any())).thenReturn(true);
+
+    when(nodeKey.sign(any())).thenThrow(new SecurityModuleException("Hsm Is Down"));
+
+    final QbftExtraDataCodec qbftExtraDataEncoder = new QbftExtraDataCodec();
+    throwingMessageFactory = new MessageFactory(nodeKey);
+    transmitter = new QbftMessageTransmitter(throwingMessageFactory, multicaster);
+
+    final BftExtraData proposedExtraData =
+        new BftExtraData(Bytes.wrap(new byte[32]), emptyList(), empty(), 0, emptyList());
+    final BlockHeaderTestFixture headerTestFixture = new BlockHeaderTestFixture();
+    headerTestFixture.extraData(qbftExtraDataEncoder.encode(proposedExtraData));
+    headerTestFixture.number(1);
+    final BlockHeader header = headerTestFixture.buildHeader();
+    proposedBlock = new Block(header, new BlockBody(emptyList(), emptyList()));
+
+    when(blockImporter.importBlock(any(), any(), any())).thenReturn(new BlockImportResult(true));
+
+    protocolContext =
+        new ProtocolContext(
+            blockChain,
+            worldStateArchive,
+            setupContextWithBftExtraDataEncoder(
+                QbftContext.class, emptyList(), qbftExtraDataEncoder),
+            Optional.empty());
+  }
+
+  @Test
+  public void signingFailsOnReceiptOfProposalUpdatesRoundButTransmitsNothing() {
+    final int QUORUM_SIZE = 1;
+    final RoundState roundState = new RoundState(roundIdentifier, QUORUM_SIZE, messageValidator);
+    final QbftRound round =
+        new QbftRound(
+            roundState,
+            blockCreator,
+            protocolContext,
+            blockImporter,
+            subscribers,
+            nodeKey,
+            throwingMessageFactory,
+            transmitter,
+            roundTimer,
+            bftExtraDataCodec);
+
+    round.handleProposalMessage(
+        peerMessageFactory.createProposal(
+            roundIdentifier, proposedBlock, emptyList(), emptyList()));
+
+    assertThat(roundState.getProposedBlock()).isNotEmpty();
+    assertThat(roundState.isPrepared()).isFalse();
+    assertThat(roundState.isCommitted()).isFalse();
+
+    verifyNoInteractions(multicaster);
+  }
+
+  @Test
+  public void failuresToSignStillAllowBlockToBeImported() {
+    final int QUORUM_SIZE = 2;
+    final RoundState roundState = new RoundState(roundIdentifier, QUORUM_SIZE, messageValidator);
+    final QbftRound round =
+        new QbftRound(
+            roundState,
+            blockCreator,
+            protocolContext,
+            blockImporter,
+            subscribers,
+            nodeKey,
+            throwingMessageFactory,
+            transmitter,
+            roundTimer,
+            bftExtraDataCodec);
+
+    // inject a block first, then a prepare on it.
+    round.handleProposalMessage(
+        peerMessageFactory.createProposal(
+            roundIdentifier, proposedBlock, emptyList(), emptyList()));
+
+    assertThat(roundState.getProposedBlock()).isNotEmpty();
+    assertThat(roundState.isPrepared()).isFalse();
+    assertThat(roundState.isCommitted()).isFalse();
+
+    round.handlePrepareMessage(peerMessageFactory.createPrepare(roundIdentifier, Hash.EMPTY));
+
+    assertThat(roundState.getProposedBlock()).isNotEmpty();
+    assertThat(roundState.isPrepared()).isFalse();
+    assertThat(roundState.isCommitted()).isFalse();
+    verifyNoInteractions(multicaster);
+
+    round.handleCommitMessage(
+        peerMessageFactory.createCommit(roundIdentifier, Hash.EMPTY, remoteCommitSeal));
+    assertThat(roundState.isCommitted()).isFalse();
+    verifyNoInteractions(multicaster);
+
+    round.handleCommitMessage(
+        peerMessageFactory2.createCommit(roundIdentifier, Hash.EMPTY, remoteCommitSeal));
+    assertThat(roundState.isCommitted()).isTrue();
+    verifyNoInteractions(multicaster);
+
+    verify(blockImporter).importBlock(any(), any(), any());
+  }
+}
diff --git a/consensus/qbft/src/integration-test/resources/genesis_migrating_validator_contract.json b/consensus/qbft/src/integration-test/resources/genesis_migrating_validator_contract.json
new file mode 100644
index 00000000000..a9e47a5baf7
--- /dev/null
+++ b/consensus/qbft/src/integration-test/resources/genesis_migrating_validator_contract.json
@@ -0,0 +1,36 @@
+{
+	"nonce": "0x0",
+	"timestamp": "0x0",
+	"extraData": "0xf83aa00000000000000000000000000000000000000000000000000000000000000000d594eac51e3fe1afc9894f0dfeab8ceb471899b932dfc080c0",
+	"gasLimit": "0x29b92700",
+	"difficulty": "0x1",
+	"mixHash": "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365",
+	"coinbase": "0x0000000000000000000000000000000000000000",
+	"alloc": {
+		"64d9be4177f418bcf4e56adad85f33e3a64efe22": {
+			"balance": "0x446c3b15f9926687d2c40534fdb564000000000000"
+		},
+		"9f66f8a0f0a6537e4a36aa1799673ea7ae97a166": {
+			"balance": "0x446c3b15f9926687d2c40534fdb564000000000000"
+		},
+		"a7f25969fb6f3d5ac09a88862c90b5ff664557a7": {
+			"balance": "0x446c3b15f9926687d2c40534fdb564000000000000"
+		},
+		"f4bbfd32c11c9d63e9b4c77bb225810f840342df": {
+			"balance": "0x446c3b15f9926687d2c40534fdb564000000000000"
+		},
+		"0x0000000000000000000000000000000000008888": {
+			"comment": "validator smart contract. This is compiled from validator_contract.sol using solc --evm-version byzantium --bin-runtime validator_contract.sol",
+			"balance": "0",
+			"code": "608060405234801561001057600080fd5b5060043610610048576000357c010000000000000000000000000000000000000000000000000000000090048063b7ab4db51461004d575b600080fd5b61005561006b565b604051610062919061017e565b60405180910390f35b606060008054806020026020016040519081016040528092919081815260200182805480156100ef57602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190600101908083116100a5575b5050505050905090565b60006101058383610111565b60208301905092915050565b61011a816101d9565b82525050565b600061012b826101b0565b61013581856101c8565b9350610140836101a0565b8060005b8381101561017157815161015888826100f9565b9750610163836101bb565b925050600181019050610144565b5085935050505092915050565b600060208201905081810360008301526101988184610120565b905092915050565b6000819050602082019050919050565b600081519050919050565b6000602082019050919050565b600082825260208201905092915050565b60006101e4826101eb565b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff8216905091905056fea26469706673582212206d880cf012c1677c691bf6f2f0a0e4eadf57866ffe5cd2d9833d3cfdf27b15f664736f6c63430008060033",
+			"storage": {
+				"0000000000000000000000000000000000000000000000000000000000000000": "0000000000000000000000000000000000000000000000000000000000000002",
+				"290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563": "000000000000000000000000e98d92560fac3069ccff53ef348ded26a51d4b68",
+				"290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e564": "000000000000000000000000eac51e3fe1afc9894f0dfeab8ceb471899b932df"
+			}
+		}
+	},
+	"number": "0x0",
+	"gasUsed": "0x0",
+	"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+}
diff --git a/consensus/qbft/src/integration-test/resources/genesis_validator_contract.json b/consensus/qbft/src/integration-test/resources/genesis_validator_contract.json
new file mode 100644
index 00000000000..a7efa67fa17
--- /dev/null
+++ b/consensus/qbft/src/integration-test/resources/genesis_validator_contract.json
@@ -0,0 +1,45 @@
+{
+	"nonce": "0x0",
+	"timestamp": "0x0",
+	"extraData": "0xe5a00000000000000000000000000000000000000000000000000000000000000000c0c080c0",
+	"gasLimit": "0x29b92700",
+	"difficulty": "0x1",
+	"mixHash": "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365",
+	"coinbase": "0x0000000000000000000000000000000000000000",
+	"alloc": {
+		"64d9be4177f418bcf4e56adad85f33e3a64efe22": {
+			"balance": "0x446c3b15f9926687d2c40534fdb564000000000000"
+		},
+		"9f66f8a0f0a6537e4a36aa1799673ea7ae97a166": {
+			"balance": "0x446c3b15f9926687d2c40534fdb564000000000000"
+		},
+		"a7f25969fb6f3d5ac09a88862c90b5ff664557a7": {
+			"balance": "0x446c3b15f9926687d2c40534fdb564000000000000"
+		},
+		"f4bbfd32c11c9d63e9b4c77bb225810f840342df": {
+			"balance": "0x446c3b15f9926687d2c40534fdb564000000000000"
+		},
+		"0x0000000000000000000000000000000000008888": {
+			"comment": "validator smart contract. This is compiled from validator_contract.sol using solc --evm-version byzantium --bin-runtime validator_contract.sol",
+			"balance": "0",
+			"code": "608060405234801561001057600080fd5b5060043610610048576000357c010000000000000000000000000000000000000000000000000000000090048063b7ab4db51461004d575b600080fd5b61005561006b565b604051610062919061017e565b60405180910390f35b606060008054806020026020016040519081016040528092919081815260200182805480156100ef57602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190600101908083116100a5575b5050505050905090565b60006101058383610111565b60208301905092915050565b61011a816101d9565b82525050565b600061012b826101b0565b61013581856101c8565b9350610140836101a0565b8060005b8381101561017157815161015888826100f9565b9750610163836101bb565b925050600181019050610144565b5085935050505092915050565b600060208201905081810360008301526101988184610120565b905092915050565b6000819050602082019050919050565b600081519050919050565b6000602082019050919050565b600082825260208201905092915050565b60006101e4826101eb565b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff8216905091905056fea26469706673582212206d880cf012c1677c691bf6f2f0a0e4eadf57866ffe5cd2d9833d3cfdf27b15f664736f6c63430008060033",
+			"storage": {
+				"0000000000000000000000000000000000000000000000000000000000000000": "0000000000000000000000000000000000000000000000000000000000000001",
+				"290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563": "000000000000000000000000eac51e3fe1afc9894f0dfeab8ceb471899b932df"
+			}
+		},
+		"0x0000000000000000000000000000000000009999": {
+			"comment": "validator smart contract. This is compiled from validator_contract.sol using solc --evm-version byzantium --bin-runtime validator_contract.sol",
+			"balance": "0",
+			"code": "608060405234801561001057600080fd5b5060043610610048576000357c010000000000000000000000000000000000000000000000000000000090048063b7ab4db51461004d575b600080fd5b61005561006b565b604051610062919061017e565b60405180910390f35b606060008054806020026020016040519081016040528092919081815260200182805480156100ef57602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190600101908083116100a5575b5050505050905090565b60006101058383610111565b60208301905092915050565b61011a816101d9565b82525050565b600061012b826101b0565b61013581856101c8565b9350610140836101a0565b8060005b8381101561017157815161015888826100f9565b9750610163836101bb565b925050600181019050610144565b5085935050505092915050565b600060208201905081810360008301526101988184610120565b905092915050565b6000819050602082019050919050565b600081519050919050565b6000602082019050919050565b600082825260208201905092915050565b60006101e4826101eb565b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff8216905091905056fea26469706673582212206d880cf012c1677c691bf6f2f0a0e4eadf57866ffe5cd2d9833d3cfdf27b15f664736f6c63430008060033",
+			"storage": {
+				"0000000000000000000000000000000000000000000000000000000000000000": "0000000000000000000000000000000000000000000000000000000000000002",
+				"290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563": "000000000000000000000000e98d92560fac3069ccff53ef348ded26a51d4b68",
+				"290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e564": "000000000000000000000000eac51e3fe1afc9894f0dfeab8ceb471899b932df"
+			}
+		}
+	},
+	"number": "0x0",
+	"gasUsed": "0x0",
+	"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+}
diff --git a/consensus/qbft/src/integration-test/resources/genesis_validator_contract_london.json b/consensus/qbft/src/integration-test/resources/genesis_validator_contract_london.json
new file mode 100644
index 00000000000..e5b178f3a03
--- /dev/null
+++ b/consensus/qbft/src/integration-test/resources/genesis_validator_contract_london.json
@@ -0,0 +1,46 @@
+{
+	"nonce": "0x0",
+	"timestamp": "0x0",
+	"extraData": "0xe5a00000000000000000000000000000000000000000000000000000000000000000c0c080c0",
+	"gasLimit": "0x29b92700",
+	"difficulty": "0x1",
+	"mixHash": "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365",
+	"coinbase": "0x0000000000000000000000000000000000000000",
+	"alloc": {
+		"64d9be4177f418bcf4e56adad85f33e3a64efe22": {
+			"balance": "0x446c3b15f9926687d2c40534fdb564000000000000"
+		},
+		"9f66f8a0f0a6537e4a36aa1799673ea7ae97a166": {
+			"balance": "0x446c3b15f9926687d2c40534fdb564000000000000"
+		},
+		"a7f25969fb6f3d5ac09a88862c90b5ff664557a7": {
+			"balance": "0x446c3b15f9926687d2c40534fdb564000000000000"
+		},
+		"f4bbfd32c11c9d63e9b4c77bb225810f840342df": {
+			"balance": "0x446c3b15f9926687d2c40534fdb564000000000000"
+		},
+		"0x0000000000000000000000000000000000008888": {
+			"comment": "validator smart contract. This is compiled from validator_contract.sol using solc --evm-version byzantium --bin-runtime validator_contract.sol",
+			"balance": "0",
+			"code": "608060405234801561001057600080fd5b5060043610610048576000357c010000000000000000000000000000000000000000000000000000000090048063b7ab4db51461004d575b600080fd5b61005561006b565b604051610062919061017e565b60405180910390f35b606060008054806020026020016040519081016040528092919081815260200182805480156100ef57602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190600101908083116100a5575b5050505050905090565b60006101058383610111565b60208301905092915050565b61011a816101d9565b82525050565b600061012b826101b0565b61013581856101c8565b9350610140836101a0565b8060005b8381101561017157815161015888826100f9565b9750610163836101bb565b925050600181019050610144565b5085935050505092915050565b600060208201905081810360008301526101988184610120565b905092915050565b6000819050602082019050919050565b600081519050919050565b6000602082019050919050565b600082825260208201905092915050565b60006101e4826101eb565b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff8216905091905056fea26469706673582212206d880cf012c1677c691bf6f2f0a0e4eadf57866ffe5cd2d9833d3cfdf27b15f664736f6c63430008060033",
+			"storage": {
+				"0000000000000000000000000000000000000000000000000000000000000000": "0000000000000000000000000000000000000000000000000000000000000001",
+				"290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563": "000000000000000000000000eac51e3fe1afc9894f0dfeab8ceb471899b932df"
+			}
+		},
+		"0x0000000000000000000000000000000000009999": {
+			"comment": "validator smart contract. This is compiled from validator_contract.sol using solc --evm-version byzantium --bin-runtime validator_contract.sol",
+			"balance": "0",
+			"code": "608060405234801561001057600080fd5b5060043610610048576000357c010000000000000000000000000000000000000000000000000000000090048063b7ab4db51461004d575b600080fd5b61005561006b565b604051610062919061017e565b60405180910390f35b606060008054806020026020016040519081016040528092919081815260200182805480156100ef57602002820191906000526020600020905b8160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190600101908083116100a5575b5050505050905090565b60006101058383610111565b60208301905092915050565b61011a816101d9565b82525050565b600061012b826101b0565b61013581856101c8565b9350610140836101a0565b8060005b8381101561017157815161015888826100f9565b9750610163836101bb565b925050600181019050610144565b5085935050505092915050565b600060208201905081810360008301526101988184610120565b905092915050565b6000819050602082019050919050565b600081519050919050565b6000602082019050919050565b600082825260208201905092915050565b60006101e4826101eb565b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff8216905091905056fea26469706673582212206d880cf012c1677c691bf6f2f0a0e4eadf57866ffe5cd2d9833d3cfdf27b15f664736f6c63430008060033",
+			"storage": {
+				"0000000000000000000000000000000000000000000000000000000000000000": "0000000000000000000000000000000000000000000000000000000000000002",
+				"290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563": "000000000000000000000000e98d92560fac3069ccff53ef348ded26a51d4b68",
+				"290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e564": "000000000000000000000000eac51e3fe1afc9894f0dfeab8ceb471899b932df"
+			}
+		}
+	},
+	"number": "0x0",
+	"gasUsed": "0x0",
+	"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+	"baseFeePerGas": "0x7"
+}
diff --git a/consensus/qbft/src/integration-test/resources/log4j2.xml b/consensus/qbft/src/integration-test/resources/log4j2.xml
new file mode 100644
index 00000000000..17267895af5
--- /dev/null
+++ b/consensus/qbft/src/integration-test/resources/log4j2.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+  <Properties>
+    <Property name="root.log.level">DEBUG</Property>
+  </Properties>
+
+  <Appenders>
+    <Console name="Console" target="SYSTEM_OUT">
+      <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSSZZZ} | %t | %-5level | %c{1} | %msg%n" />    </Console>
+  </Appenders>
+  <Loggers>
+    <Root level="${sys:root.log.level}">
+      <AppenderRef ref="Console" />
+    </Root>
+    <Logger name="org.hyperledger.besu.consensus" level="TRACE">
+    </Logger>
+  </Loggers>
+</Configuration>
diff --git a/consensus/qbft/src/integration-test/resources/validator_contract.sol b/consensus/qbft/src/integration-test/resources/validator_contract.sol
new file mode 100644
index 00000000000..977c2aac22c
--- /dev/null
+++ b/consensus/qbft/src/integration-test/resources/validator_contract.sol
@@ -0,0 +1,26 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+pragma solidity >= 0.5.3;
+
+contract Validators {
+    address[] validators;
+
+    constructor() {}
+
+    function getValidators() public view returns (address[] memory) {
+        return validators;
+    }
+
+}
\ No newline at end of file
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/MutableQbftConfigOptions.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/MutableQbftConfigOptions.java
new file mode 100644
index 00000000000..c89b78d32f5
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/MutableQbftConfigOptions.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft;
+
+import org.hyperledger.besu.config.QbftConfigOptions;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.bft.MutableBftConfigOptions;
+
+import java.util.Optional;
+import java.util.OptionalLong;
+
+/**
+ * A mutable {@link QbftConfigOptions} that is used for building config for transitions in the
+ * {@link ForksSchedule}.
+ */
+public class MutableQbftConfigOptions extends MutableBftConfigOptions implements QbftConfigOptions {
+  private Optional<String> validatorContractAddress;
+
+  /**
+   * Instantiates a new Mutable qbft config options.
+   *
+   * @param qbftConfigOptions the qbft config options
+   */
+  public MutableQbftConfigOptions(final QbftConfigOptions qbftConfigOptions) {
+    super(qbftConfigOptions);
+    this.validatorContractAddress =
+        qbftConfigOptions.getValidatorContractAddress().map(String::toLowerCase);
+  }
+
+  @Override
+  public Optional<String> getValidatorContractAddress() {
+    return validatorContractAddress;
+  }
+
+  /**
+   * Sets validator contract address.
+   *
+   * @param validatorContractAddress the validator contract address
+   */
+  public void setValidatorContractAddress(final Optional<String> validatorContractAddress) {
+    this.validatorContractAddress = validatorContractAddress;
+  }
+
+  @Override
+  public OptionalLong getStartBlock() {
+    return OptionalLong.empty();
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/QbftBlockHeaderValidationRulesetFactory.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/QbftBlockHeaderValidationRulesetFactory.java
new file mode 100644
index 00000000000..028f939d32c
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/QbftBlockHeaderValidationRulesetFactory.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft;
+
+import static org.hyperledger.besu.ethereum.mainnet.AbstractGasLimitSpecification.DEFAULT_MAX_GAS_LIMIT;
+import static org.hyperledger.besu.ethereum.mainnet.AbstractGasLimitSpecification.DEFAULT_MIN_GAS_LIMIT;
+
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
+import org.hyperledger.besu.consensus.common.bft.headervalidationrules.BftCoinbaseValidationRule;
+import org.hyperledger.besu.consensus.common.bft.headervalidationrules.BftCommitSealsValidationRule;
+import org.hyperledger.besu.consensus.qbft.headervalidationrules.QbftValidatorsValidationRule;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.AncestryValidationRule;
+import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.ConstantFieldValidationRule;
+import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.GasLimitRangeAndDeltaValidationRule;
+import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.GasUsageValidationRule;
+import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.TimestampBoundedByFutureParameter;
+import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.TimestampMoreRecentThanParent;
+
+import java.util.Optional;
+
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** The Qbft block header validation ruleset factory. */
+public class QbftBlockHeaderValidationRulesetFactory {
+
+  /**
+   * Produces a BlockHeaderValidator configured for assessing bft block headers which are to form
+   * part of the BlockChain (i.e. not proposed blocks, which do not contain commit seals)
+   *
+   * @param secondsBetweenBlocks the minimum number of seconds which must elapse between blocks.
+   * @param useValidatorContract whether validator selection is using a validator contract
+   * @param baseFeeMarket an {@link Optional} wrapping {@link BaseFeeMarket} class if appropriate.
+   * @return BlockHeaderValidator configured for assessing bft block headers
+   */
+  public static BlockHeaderValidator.Builder blockHeaderValidator(
+      final long secondsBetweenBlocks,
+      final boolean useValidatorContract,
+      final Optional<BaseFeeMarket> baseFeeMarket) {
+    return new BlockHeaderValidator.Builder()
+        .addRule(new AncestryValidationRule())
+        .addRule(new GasUsageValidationRule())
+        .addRule(
+            new GasLimitRangeAndDeltaValidationRule(
+                DEFAULT_MIN_GAS_LIMIT, DEFAULT_MAX_GAS_LIMIT, baseFeeMarket))
+        .addRule(new TimestampBoundedByFutureParameter(1))
+        .addRule(new TimestampMoreRecentThanParent(secondsBetweenBlocks))
+        .addRule(
+            new ConstantFieldValidationRule<>(
+                "MixHash", BlockHeader::getMixHash, BftHelpers.EXPECTED_MIX_HASH))
+        .addRule(
+            new ConstantFieldValidationRule<>(
+                "Difficulty", BlockHeader::getDifficulty, UInt256.ONE))
+        .addRule(new QbftValidatorsValidationRule(useValidatorContract))
+        .addRule(new BftCoinbaseValidationRule())
+        .addRule(new BftCommitSealsValidationRule());
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/QbftContext.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/QbftContext.java
new file mode 100644
index 00000000000..f89f4990be8
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/QbftContext.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft;
+
+import org.hyperledger.besu.consensus.common.EpochManager;
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftContext;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.qbft.pki.PkiBlockCreationConfiguration;
+
+import java.util.Optional;
+
+/** The Qbft context. */
+public class QbftContext extends BftContext {
+
+  private final Optional<PkiBlockCreationConfiguration> pkiBlockCreationConfiguration;
+
+  /**
+   * Instantiates a new Qbft context.
+   *
+   * @param validatorProvider the validator provider
+   * @param epochManager the epoch manager
+   * @param blockInterface the block interface
+   * @param pkiBlockCreationConfiguration the pki block creation configuration
+   */
+  public QbftContext(
+      final ValidatorProvider validatorProvider,
+      final EpochManager epochManager,
+      final BftBlockInterface blockInterface,
+      final Optional<PkiBlockCreationConfiguration> pkiBlockCreationConfiguration) {
+    super(validatorProvider, epochManager, blockInterface);
+    this.pkiBlockCreationConfiguration = pkiBlockCreationConfiguration;
+  }
+
+  /**
+   * Gets pki block creation configuration.
+   *
+   * @return the pki block creation configuration
+   */
+  public Optional<PkiBlockCreationConfiguration> getPkiBlockCreationConfiguration() {
+    return pkiBlockCreationConfiguration;
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/QbftExtraDataCodec.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/QbftExtraDataCodec.java
new file mode 100644
index 00000000000..065fd9575b2
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/QbftExtraDataCodec.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft;
+
+import static org.hyperledger.besu.consensus.common.bft.Vote.ADD_BYTE_VALUE;
+import static org.hyperledger.besu.consensus.common.bft.Vote.DROP_BYTE_VALUE;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.Vote;
+import org.hyperledger.besu.consensus.common.validator.VoteType;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLPException;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import com.google.common.collect.ImmutableBiMap;
+import org.apache.tuweni.bytes.Bytes;
+
+/**
+ * Represents the data structure stored in the extraData field of the BlockHeader used when
+ * operating under an BFT consensus mechanism.
+ */
+public class QbftExtraDataCodec extends BftExtraDataCodec {
+  private static final ImmutableBiMap<VoteType, Byte> voteToValue =
+      ImmutableBiMap.of(
+          VoteType.ADD, ADD_BYTE_VALUE,
+          VoteType.DROP, DROP_BYTE_VALUE);
+
+  /**
+   * Encode from addresses.
+   *
+   * @param addresses the addresses
+   * @return the bytes
+   */
+  public static Bytes encodeFromAddresses(final Collection<Address> addresses) {
+    return new QbftExtraDataCodec()
+        .encode(
+            new BftExtraData(
+                Bytes.wrap(new byte[EXTRA_VANITY_LENGTH]),
+                Collections.emptyList(),
+                Optional.empty(),
+                0,
+                addresses));
+  }
+
+  /**
+   * Create genesis extra data string.
+   *
+   * @param validators the validators
+   * @return the string
+   */
+  public static String createGenesisExtraDataString(final List<Address> validators) {
+    return encodeFromAddresses(validators).toString();
+  }
+
+  @Override
+  public BftExtraData decodeRaw(final Bytes input) {
+    if (input.isEmpty()) {
+      throw new IllegalArgumentException("Invalid Bytes supplied - Bft Extra Data required.");
+    }
+
+    final RLPInput rlpInput = new BytesValueRLPInput(input, false);
+
+    rlpInput.enterList(); // This accounts for the "root node" which contains BFT data items.
+    final Bytes vanityData = rlpInput.readBytes();
+    final List<Address> validators = rlpInput.readList(Address::readFrom);
+
+    final Optional<Vote> vote;
+    if (rlpInput.nextIsList() && rlpInput.nextSize() == 0) {
+      vote = Optional.empty();
+      rlpInput.skipNext();
+    } else {
+      vote = Optional.of(decodeVote(rlpInput));
+    }
+
+    final int round = rlpInput.readIntScalar();
+    final List<SECPSignature> seals =
+        rlpInput.readList(
+            rlp -> SignatureAlgorithmFactory.getInstance().decodeSignature(rlp.readBytes()));
+    rlpInput.leaveListLenient();
+
+    return new BftExtraData(vanityData, seals, vote, round, validators);
+  }
+
+  @Override
+  protected Bytes encode(final BftExtraData bftExtraData, final EncodingType encodingType) {
+    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
+    encoder.startList();
+    encoder.writeBytes(bftExtraData.getVanityData());
+    encoder.writeList(bftExtraData.getValidators(), (validator, rlp) -> rlp.writeBytes(validator));
+
+    if (bftExtraData.getVote().isPresent()) {
+      encodeVote(encoder, bftExtraData.getVote().get());
+    } else {
+      encoder.writeList(Collections.emptyList(), (o, rlpOutput) -> {});
+    }
+
+    if (encodingType != EncodingType.EXCLUDE_COMMIT_SEALS_AND_ROUND_NUMBER) {
+      encoder.writeIntScalar(bftExtraData.getRound());
+      if (encodingType != EncodingType.EXCLUDE_COMMIT_SEALS) {
+        encoder.writeList(
+            bftExtraData.getSeals(), (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
+      } else {
+        encoder.writeEmptyList();
+      }
+    } else {
+      encoder.writeIntScalar(0);
+      encoder.writeEmptyList();
+    }
+    encoder.endList();
+
+    return encoder.encoded();
+  }
+
+  /**
+   * Encode vote.
+   *
+   * @param rlpOutput the rlp output
+   * @param vote the vote
+   */
+  protected void encodeVote(final RLPOutput rlpOutput, final Vote vote) {
+    final VoteType voteType = vote.isAuth() ? VoteType.ADD : VoteType.DROP;
+    rlpOutput.startList();
+    rlpOutput.writeBytes(vote.getRecipient());
+    if (voteType == VoteType.ADD) {
+      rlpOutput.writeByte(ADD_BYTE_VALUE);
+    } else {
+      rlpOutput.writeNull();
+    }
+    rlpOutput.endList();
+  }
+
+  /**
+   * Decode vote.
+   *
+   * @param rlpInput the rlp input
+   * @return the vote
+   */
+  protected Vote decodeVote(final RLPInput rlpInput) {
+    rlpInput.enterList();
+    final Address recipient = Address.readFrom(rlpInput);
+
+    final VoteType vote;
+    if (rlpInput.nextSize() == 0) {
+      rlpInput.skipNext();
+      vote = VoteType.DROP;
+    } else {
+      vote = voteToValue.inverse().get(rlpInput.readByte());
+    }
+
+    if (vote == null) {
+      throw new RLPException("Vote field was of an incorrect binary value.");
+    }
+    rlpInput.leaveList();
+
+    return new Vote(recipient, vote);
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/QbftForksSchedulesFactory.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/QbftForksSchedulesFactory.java
new file mode 100644
index 00000000000..cf87938cb4a
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/QbftForksSchedulesFactory.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft;
+
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.config.QbftConfigOptions;
+import org.hyperledger.besu.config.QbftFork;
+import org.hyperledger.besu.config.QbftFork.VALIDATOR_SELECTION_MODE;
+import org.hyperledger.besu.consensus.common.ForkSpec;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.bft.BftForksScheduleFactory;
+
+import java.util.List;
+import java.util.Optional;
+
+/** The Qbft forks schedules factory. */
+public class QbftForksSchedulesFactory {
+
+  /**
+   * Create forks schedule.
+   *
+   * @param genesisConfig the genesis config
+   * @return the forks schedule
+   */
+  public static ForksSchedule<QbftConfigOptions> create(final GenesisConfigOptions genesisConfig) {
+    return BftForksScheduleFactory.create(
+        genesisConfig.getQbftConfigOptions(),
+        genesisConfig.getTransitions().getQbftForks(),
+        QbftForksSchedulesFactory::createQbftConfigOptions);
+  }
+
+  private static QbftConfigOptions createQbftConfigOptions(
+      final ForkSpec<QbftConfigOptions> lastSpec, final QbftFork fork) {
+    final MutableQbftConfigOptions bftConfigOptions =
+        new MutableQbftConfigOptions(lastSpec.getValue());
+
+    fork.getBlockPeriodSeconds().ifPresent(bftConfigOptions::setBlockPeriodSeconds);
+    fork.getBlockRewardWei().ifPresent(bftConfigOptions::setBlockRewardWei);
+
+    if (fork.isMiningBeneficiaryConfigured()) {
+      // Only override if mining beneficiary is explicitly configured
+      bftConfigOptions.setMiningBeneficiary(fork.getMiningBeneficiary());
+    }
+
+    if (fork.getValidatorSelectionMode().isPresent()) {
+      final VALIDATOR_SELECTION_MODE mode = fork.getValidatorSelectionMode().get();
+      if (mode == VALIDATOR_SELECTION_MODE.BLOCKHEADER) {
+        final Optional<List<String>> optionalValidators = fork.getValidators();
+        if (optionalValidators.isEmpty() || optionalValidators.get().isEmpty()) {
+          throw new IllegalStateException(
+              "QBFT transition to blockheader mode requires a validators list containing at least one validator");
+        }
+        bftConfigOptions.setValidatorContractAddress(Optional.empty());
+      } else if (mode == VALIDATOR_SELECTION_MODE.CONTRACT
+          && fork.getValidatorContractAddress().isPresent()) {
+        bftConfigOptions.setValidatorContractAddress(fork.getValidatorContractAddress());
+      } else if (fork.getValidatorContractAddress().isEmpty()) {
+        throw new IllegalStateException(
+            "QBFT transition has config with contract mode but no contract address");
+      }
+    }
+
+    return bftConfigOptions;
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/QbftGossip.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/QbftGossip.java
new file mode 100644
index 00000000000..d0965e11620
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/QbftGossip.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.Gossiper;
+import org.hyperledger.besu.consensus.common.bft.network.ValidatorMulticaster;
+import org.hyperledger.besu.consensus.common.bft.payload.Authored;
+import org.hyperledger.besu.consensus.qbft.messagedata.CommitMessageData;
+import org.hyperledger.besu.consensus.qbft.messagedata.PrepareMessageData;
+import org.hyperledger.besu.consensus.qbft.messagedata.ProposalMessageData;
+import org.hyperledger.besu.consensus.qbft.messagedata.QbftV1;
+import org.hyperledger.besu.consensus.qbft.messagedata.RoundChangeMessageData;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+
+import java.util.List;
+
+import com.google.common.collect.Lists;
+
+/** Class responsible for rebroadcasting QBFT messages to known validators */
+public class QbftGossip implements Gossiper {
+
+  private final ValidatorMulticaster multicaster;
+  private final BftExtraDataCodec bftExtraDataCodec;
+
+  /**
+   * Constructor that attaches gossip logic to a set of multicaster
+   *
+   * @param multicaster Network connections to the remote validators
+   * @param bftExtraDataCodec Codec used when decoding MessageData
+   */
+  public QbftGossip(
+      final ValidatorMulticaster multicaster, final BftExtraDataCodec bftExtraDataCodec) {
+    this.multicaster = multicaster;
+    this.bftExtraDataCodec = bftExtraDataCodec;
+  }
+
+  /**
+   * Retransmit a given QBFT message to other known validators nodes
+   *
+   * @param message The raw message to be gossiped
+   */
+  @Override
+  public void send(final Message message) {
+    final MessageData messageData = message.getData();
+    final Authored decodedMessage;
+    switch (messageData.getCode()) {
+      case QbftV1.PROPOSAL:
+        decodedMessage = ProposalMessageData.fromMessageData(messageData).decode(bftExtraDataCodec);
+        break;
+      case QbftV1.PREPARE:
+        decodedMessage = PrepareMessageData.fromMessageData(messageData).decode();
+        break;
+      case QbftV1.COMMIT:
+        decodedMessage = CommitMessageData.fromMessageData(messageData).decode();
+        break;
+      case QbftV1.ROUND_CHANGE:
+        decodedMessage =
+            RoundChangeMessageData.fromMessageData(messageData).decode(bftExtraDataCodec);
+        break;
+      default:
+        throw new IllegalArgumentException(
+            "Received message does not conform to any recognised QBFT message structure.");
+    }
+    final List<Address> excludeAddressesList =
+        Lists.newArrayList(
+            message.getConnection().getPeerInfo().getAddress(), decodedMessage.getAuthor());
+
+    multicaster.send(messageData, excludeAddressesList);
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/QbftProtocolScheduleBuilder.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/QbftProtocolScheduleBuilder.java
new file mode 100644
index 00000000000..29d4d657ac6
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/QbftProtocolScheduleBuilder.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import org.hyperledger.besu.config.BftConfigOptions;
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.config.QbftConfigOptions;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.bft.BaseBftProtocolScheduleBuilder;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.BftProtocolSchedule;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+
+import java.util.Optional;
+
+/** Defines the protocol behaviours for a blockchain using a QBFT consensus mechanism. */
+public class QbftProtocolScheduleBuilder extends BaseBftProtocolScheduleBuilder {
+
+  /**
+   * Create protocol schedule.
+   *
+   * @param config the config
+   * @param qbftForksSchedule the qbft forks schedule
+   * @param privacyParameters the privacy parameters
+   * @param isRevertReasonEnabled the is revert reason enabled
+   * @param bftExtraDataCodec the bft extra data codec
+   * @param evmConfiguration the evm configuration
+   * @return the protocol schedule
+   */
+  public static BftProtocolSchedule create(
+      final GenesisConfigOptions config,
+      final ForksSchedule<QbftConfigOptions> qbftForksSchedule,
+      final PrivacyParameters privacyParameters,
+      final boolean isRevertReasonEnabled,
+      final BftExtraDataCodec bftExtraDataCodec,
+      final EvmConfiguration evmConfiguration) {
+    return new QbftProtocolScheduleBuilder()
+        .createProtocolSchedule(
+            config,
+            qbftForksSchedule,
+            privacyParameters,
+            isRevertReasonEnabled,
+            bftExtraDataCodec,
+            evmConfiguration);
+  }
+
+  /**
+   * Create protocol schedule.
+   *
+   * @param config the config
+   * @param qbftForksSchedule the qbft forks schedule
+   * @param bftExtraDataCodec the bft extra data codec
+   * @param evmConfiguration the evm configuration
+   * @return the protocol schedule
+   */
+  public static BftProtocolSchedule create(
+      final GenesisConfigOptions config,
+      final ForksSchedule<QbftConfigOptions> qbftForksSchedule,
+      final BftExtraDataCodec bftExtraDataCodec,
+      final EvmConfiguration evmConfiguration) {
+    return create(
+        config,
+        qbftForksSchedule,
+        PrivacyParameters.DEFAULT,
+        false,
+        bftExtraDataCodec,
+        evmConfiguration);
+  }
+
+  /**
+   * Create protocol schedule.
+   *
+   * @param config the config
+   * @param qbftForksSchedule the qbft forks schedule
+   * @param isRevertReasonEnabled the is revert reason enabled
+   * @param bftExtraDataCodec the bft extra data codec
+   * @return the protocol schedule
+   */
+  public static ProtocolSchedule create(
+      final GenesisConfigOptions config,
+      final ForksSchedule<QbftConfigOptions> qbftForksSchedule,
+      final boolean isRevertReasonEnabled,
+      final BftExtraDataCodec bftExtraDataCodec) {
+    return create(
+        config,
+        qbftForksSchedule,
+        PrivacyParameters.DEFAULT,
+        isRevertReasonEnabled,
+        bftExtraDataCodec,
+        EvmConfiguration.DEFAULT);
+  }
+
+  @Override
+  protected BlockHeaderValidator.Builder createBlockHeaderRuleset(
+      final BftConfigOptions config, final FeeMarket feeMarket) {
+    checkArgument(
+        config instanceof QbftConfigOptions,
+        "QbftProtocolScheduleBuilder must use QbftConfigOptions");
+    final QbftConfigOptions qbftConfigOptions = (QbftConfigOptions) config;
+    final Optional<BaseFeeMarket> baseFeeMarket =
+        Optional.of(feeMarket).filter(FeeMarket::implementsBaseFee).map(BaseFeeMarket.class::cast);
+
+    return QbftBlockHeaderValidationRulesetFactory.blockHeaderValidator(
+        qbftConfigOptions.getBlockPeriodSeconds(),
+        qbftConfigOptions.isValidatorContractMode(),
+        baseFeeMarket);
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/blockcreation/PkiQbftBlockCreator.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/blockcreation/PkiQbftBlockCreator.java
new file mode 100644
index 00000000000..4ec6ea9f8aa
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/blockcreation/PkiQbftBlockCreator.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.blockcreation;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.qbft.pki.PkiBlockCreationConfiguration;
+import org.hyperledger.besu.consensus.qbft.pki.PkiQbftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.qbft.pki.PkiQbftExtraData;
+import org.hyperledger.besu.consensus.qbft.pki.PkiQbftExtraDataCodec;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.blockcreation.BlockCreator;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.pki.cms.CmsCreator;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Pki qbft block creator. */
+public class PkiQbftBlockCreator implements BlockCreator {
+
+  private static final Logger LOG = LoggerFactory.getLogger(PkiQbftBlockCreator.class);
+
+  private final BlockCreator blockCreator;
+  private final PkiQbftExtraDataCodec pkiQbftExtraDataCodec;
+  private final CmsCreator cmsCreator;
+
+  /**
+   * Instantiates a new Pki qbft block creator.
+   *
+   * @param blockCreator the block creator
+   * @param pkiBlockCreationConfiguration the pki block creation configuration
+   * @param pkiQbftExtraDataCodec the pki qbft extra data codec
+   */
+  public PkiQbftBlockCreator(
+      final BlockCreator blockCreator,
+      final PkiBlockCreationConfiguration pkiBlockCreationConfiguration,
+      final BftExtraDataCodec pkiQbftExtraDataCodec) {
+    this(
+        blockCreator,
+        new CmsCreator(
+            pkiBlockCreationConfiguration.getKeyStore(),
+            pkiBlockCreationConfiguration.getCertificateAlias()),
+        pkiQbftExtraDataCodec);
+  }
+
+  /**
+   * Instantiates a new Pki qbft block creator.
+   *
+   * @param blockCreator the block creator
+   * @param cmsCreator the cms creator
+   * @param bftExtraDataCodec the bft extra data codec
+   */
+  @VisibleForTesting
+  public PkiQbftBlockCreator(
+      final BlockCreator blockCreator,
+      final CmsCreator cmsCreator,
+      final BftExtraDataCodec bftExtraDataCodec) {
+    this.blockCreator = blockCreator;
+    this.cmsCreator = cmsCreator;
+
+    checkArgument(
+        bftExtraDataCodec instanceof PkiQbftExtraDataCodec,
+        "PkiQbftBlockCreator must use PkiQbftExtraDataCodec");
+    this.pkiQbftExtraDataCodec = (PkiQbftExtraDataCodec) bftExtraDataCodec;
+  }
+
+  @Override
+  public BlockCreationResult createBlock(final long timestamp) {
+    final BlockCreationResult blockCreationResult = blockCreator.createBlock(timestamp);
+    return replaceCmsInBlock(blockCreationResult);
+  }
+
+  @Override
+  public BlockCreationResult createBlock(
+      final List<Transaction> transactions, final List<BlockHeader> ommers, final long timestamp) {
+    final BlockCreationResult blockCreationResult =
+        blockCreator.createBlock(transactions, ommers, timestamp);
+    return replaceCmsInBlock(blockCreationResult);
+  }
+
+  @Override
+  public BlockCreationResult createBlock(
+      final Optional<List<Transaction>> maybeTransactions,
+      final Optional<List<BlockHeader>> maybeOmmers,
+      final long timestamp) {
+    return createBlock(
+        maybeTransactions.orElse(Collections.emptyList()),
+        maybeOmmers.orElse(Collections.emptyList()),
+        timestamp);
+  }
+
+  private BlockCreationResult replaceCmsInBlock(final BlockCreationResult blockCreationResult) {
+    final Block block = blockCreationResult.getBlock();
+    final BlockHeader blockHeader = block.getHeader();
+    final Hash hashWithoutCms =
+        PkiQbftBlockHeaderFunctions.forCmsSignature(pkiQbftExtraDataCodec).hash(block.getHeader());
+
+    final Bytes cms = cmsCreator.create(hashWithoutCms);
+
+    final BftExtraData previousExtraData = pkiQbftExtraDataCodec.decode(blockHeader);
+    final BftExtraData substituteExtraData = new PkiQbftExtraData(previousExtraData, cms);
+    final Bytes substituteExtraDataBytes = pkiQbftExtraDataCodec.encode(substituteExtraData);
+
+    final BlockHeaderBuilder headerBuilder = BlockHeaderBuilder.fromHeader(blockHeader);
+    headerBuilder
+        .extraData(substituteExtraDataBytes)
+        .blockHeaderFunctions(BftBlockHeaderFunctions.forCommittedSeal(pkiQbftExtraDataCodec));
+    final BlockHeader newHeader = headerBuilder.buildBlockHeader();
+
+    LOG.debug("Created CMS with signed hash {} for block {}", hashWithoutCms, newHeader.getHash());
+
+    return new BlockCreationResult(
+        new Block(newHeader, block.getBody()),
+        blockCreationResult.getTransactionSelectionResults());
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/blockcreation/QbftBlockCreatorFactory.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/blockcreation/QbftBlockCreatorFactory.java
new file mode 100644
index 00000000000..47c3a466211
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/blockcreation/QbftBlockCreatorFactory.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.blockcreation;
+
+import org.hyperledger.besu.config.QbftConfigOptions;
+import org.hyperledger.besu.consensus.common.ConsensusHelpers;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.BftBlockCreatorFactory;
+import org.hyperledger.besu.consensus.qbft.QbftContext;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.blockcreation.BlockCreator;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+
+import java.util.Collections;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** Supports contract based voters and validators in extra data */
+public class QbftBlockCreatorFactory extends BftBlockCreatorFactory<QbftConfigOptions> {
+  /**
+   * Instantiates a new Qbft block creator factory.
+   *
+   * @param pendingTransactions the pending transactions
+   * @param protocolContext the protocol context
+   * @param protocolSchedule the protocol schedule
+   * @param forksSchedule the forks schedule
+   * @param miningParams the mining params
+   * @param localAddress the local address
+   * @param bftExtraDataCodec the bft extra data codec
+   */
+  public QbftBlockCreatorFactory(
+      final PendingTransactions pendingTransactions,
+      final ProtocolContext protocolContext,
+      final ProtocolSchedule protocolSchedule,
+      final ForksSchedule<QbftConfigOptions> forksSchedule,
+      final MiningParameters miningParams,
+      final Address localAddress,
+      final BftExtraDataCodec bftExtraDataCodec) {
+    super(
+        pendingTransactions,
+        protocolContext,
+        protocolSchedule,
+        forksSchedule,
+        miningParams,
+        localAddress,
+        bftExtraDataCodec);
+  }
+
+  @Override
+  public BlockCreator create(final BlockHeader parentHeader, final int round) {
+    final BlockCreator blockCreator = super.create(parentHeader, round);
+    final QbftContext qbftContext = protocolContext.getConsensusContext(QbftContext.class);
+    if (qbftContext.getPkiBlockCreationConfiguration().isEmpty()) {
+      return blockCreator;
+    } else {
+      return new PkiQbftBlockCreator(
+          blockCreator, qbftContext.getPkiBlockCreationConfiguration().get(), bftExtraDataCodec);
+    }
+  }
+
+  @Override
+  public Bytes createExtraData(final int round, final BlockHeader parentHeader) {
+    if (forksSchedule.getFork(parentHeader.getNumber() + 1L).getValue().isValidatorContractMode()) {
+      // vote and validators will come from contract instead of block
+      final BftExtraData extraData =
+          new BftExtraData(
+              ConsensusHelpers.zeroLeftPad(vanityData, BftExtraDataCodec.EXTRA_VANITY_LENGTH),
+              Collections.emptyList(),
+              Optional.empty(),
+              round,
+              Collections.emptyList());
+      return bftExtraDataCodec.encode(extraData);
+    }
+
+    return super.createExtraData(round, parentHeader);
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/headervalidationrules/QbftValidatorsValidationRule.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/headervalidationrules/QbftValidatorsValidationRule.java
new file mode 100644
index 00000000000..ee6830e5ac6
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/headervalidationrules/QbftValidatorsValidationRule.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.headervalidationrules;
+
+import org.hyperledger.besu.consensus.common.bft.BftContext;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.headervalidationrules.BftValidatorsValidationRule;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule;
+import org.hyperledger.besu.ethereum.rlp.RLPException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Ensures the Validators listed in the block header match that tracked in memory (which was in-turn
+ * created by tracking votes included on the block chain).
+ */
+public class QbftValidatorsValidationRule implements AttachedBlockHeaderValidationRule {
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(QbftValidatorsValidationRule.class);
+  private final boolean extraDataValidatorsAndVoteMustBeEmpty;
+  private final BftValidatorsValidationRule bftValidatorsValidationRule =
+      new BftValidatorsValidationRule();
+
+  /**
+   * Instantiates a new Qbft validators validation rule.
+   *
+   * @param extraDataValidatorsAndVoteMustBeEmpty the extra data validators and vote must be empty
+   */
+  public QbftValidatorsValidationRule(final boolean extraDataValidatorsAndVoteMustBeEmpty) {
+    this.extraDataValidatorsAndVoteMustBeEmpty = extraDataValidatorsAndVoteMustBeEmpty;
+  }
+
+  @Override
+  public boolean validate(
+      final BlockHeader header, final BlockHeader parent, final ProtocolContext context) {
+    if (!extraDataValidatorsAndVoteMustBeEmpty) {
+      // delegate to common BftValidatorsValidationRule
+      return bftValidatorsValidationRule.validate(header, parent, context);
+    }
+
+    // validators and votes must be empty if they are supplied by a contract.
+    try {
+      final BftContext bftContext = context.getConsensusContext(BftContext.class);
+      final BftExtraData bftExtraData = bftContext.getBlockInterface().getExtraData(header);
+
+      if (!bftExtraData.getValidators().isEmpty()) {
+        LOGGER.info(
+            "Invalid block header: Validators in extra data expected to be empty but got {}",
+            bftExtraData.getValidators());
+        return false;
+      }
+
+      if (bftExtraData.getVote().isPresent()) {
+        LOGGER.info(
+            "Invalid block header: Vote in extra data expected to be empty but got {}",
+            bftExtraData.getVote().get());
+        return false;
+      }
+    } catch (final RLPException ex) {
+      LOGGER.info(
+          "Invalid block header: ExtraData field was unable to be deserialized into an BFT Struct.",
+          ex);
+      return false;
+    } catch (final IllegalArgumentException ex) {
+      LOGGER.info("Invalid block header: Failed to verify extra data", ex);
+      return false;
+    }
+
+    return true;
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/jsonrpc/QbftJsonRpcMethods.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/jsonrpc/QbftJsonRpcMethods.java
new file mode 100644
index 00000000000..47b10bc3ed4
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/jsonrpc/QbftJsonRpcMethods.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.jsonrpc;
+
+import org.hyperledger.besu.consensus.common.BlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftContext;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.qbft.jsonrpc.methods.QbftDiscardValidatorVote;
+import org.hyperledger.besu.consensus.qbft.jsonrpc.methods.QbftGetPendingVotes;
+import org.hyperledger.besu.consensus.qbft.jsonrpc.methods.QbftGetSignerMetrics;
+import org.hyperledger.besu.consensus.qbft.jsonrpc.methods.QbftGetValidatorsByBlockHash;
+import org.hyperledger.besu.consensus.qbft.jsonrpc.methods.QbftGetValidatorsByBlockNumber;
+import org.hyperledger.besu.consensus.qbft.jsonrpc.methods.QbftProposeValidatorVote;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.methods.ApiGroupJsonRpcMethods;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+
+import java.util.Map;
+
+/** The Qbft json rpc methods. */
+public class QbftJsonRpcMethods extends ApiGroupJsonRpcMethods {
+
+  private final ProtocolContext context;
+  private final ValidatorProvider readOnlyValidatorProvider;
+
+  /**
+   * Instantiates a new Qbft json rpc methods.
+   *
+   * @param context the context
+   * @param readOnlyValidatorProvider the read only validator provider
+   */
+  public QbftJsonRpcMethods(
+      final ProtocolContext context, final ValidatorProvider readOnlyValidatorProvider) {
+    this.context = context;
+    this.readOnlyValidatorProvider = readOnlyValidatorProvider;
+  }
+
+  @Override
+  protected String getApiGroup() {
+    return RpcApis.QBFT.name();
+  }
+
+  @Override
+  protected Map<String, JsonRpcMethod> create() {
+    final BlockchainQueries blockchainQueries =
+        new BlockchainQueries(context.getBlockchain(), context.getWorldStateArchive());
+    final BftContext bftContext = context.getConsensusContext(BftContext.class);
+    final BlockInterface blockInterface = bftContext.getBlockInterface();
+    final ValidatorProvider validatorProvider = bftContext.getValidatorProvider();
+
+    return mapOf(
+        new QbftProposeValidatorVote(validatorProvider),
+        new QbftGetValidatorsByBlockNumber(blockchainQueries, readOnlyValidatorProvider),
+        new QbftDiscardValidatorVote(validatorProvider),
+        new QbftGetValidatorsByBlockHash(context.getBlockchain(), readOnlyValidatorProvider),
+        new QbftGetSignerMetrics(readOnlyValidatorProvider, blockInterface, blockchainQueries),
+        new QbftGetPendingVotes(validatorProvider));
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftDiscardValidatorVote.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftDiscardValidatorVote.java
new file mode 100644
index 00000000000..76f95c9f53f
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftDiscardValidatorVote.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.jsonrpc.methods;
+
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Qbft discard validator vote. */
+public class QbftDiscardValidatorVote implements JsonRpcMethod {
+  private static final Logger LOG = LoggerFactory.getLogger(QbftDiscardValidatorVote.class);
+  private final ValidatorProvider validatorProvider;
+
+  /**
+   * Instantiates a new Qbft discard validator vote.
+   *
+   * @param validatorProvider the validator provider
+   */
+  public QbftDiscardValidatorVote(final ValidatorProvider validatorProvider) {
+    this.validatorProvider = validatorProvider;
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.QBFT_DISCARD_VALIDATOR_VOTE.getMethodName();
+  }
+
+  @Override
+  public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
+    if (validatorProvider.getVoteProviderAtHead().isPresent()) {
+      final Address validatorAddress = requestContext.getRequiredParameter(0, Address.class);
+      LOG.trace("Received RPC rpcName={} address={}", getName(), validatorAddress);
+      validatorProvider.getVoteProviderAtHead().get().discardVote(validatorAddress);
+
+      return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), true);
+    } else {
+      return new JsonRpcErrorResponse(
+          requestContext.getRequest().getId(), JsonRpcError.METHOD_NOT_ENABLED);
+    }
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetPendingVotes.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetPendingVotes.java
new file mode 100644
index 00000000000..a8756e5fb8c
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetPendingVotes.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.jsonrpc.methods;
+
+import org.hyperledger.besu.consensus.common.jsonrpc.AbstractVoteProposerMethod;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+
+/** The Qbft get pending votes. */
+public class QbftGetPendingVotes extends AbstractVoteProposerMethod implements JsonRpcMethod {
+
+  /**
+   * Instantiates a new Qbft get pending votes.
+   *
+   * @param validatorProvider the validator provider
+   */
+  public QbftGetPendingVotes(final ValidatorProvider validatorProvider) {
+    super(validatorProvider);
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.QBFT_GET_PENDING_VOTES.getMethodName();
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetSignerMetrics.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetSignerMetrics.java
new file mode 100644
index 00000000000..1d13ce80633
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetSignerMetrics.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.jsonrpc.methods;
+
+import org.hyperledger.besu.consensus.common.BlockInterface;
+import org.hyperledger.besu.consensus.common.jsonrpc.AbstractGetSignerMetricsMethod;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+
+/** The Qbft get signer metrics. */
+public class QbftGetSignerMetrics extends AbstractGetSignerMetricsMethod implements JsonRpcMethod {
+
+  /**
+   * Instantiates a new Qbft get signer metrics.
+   *
+   * @param validatorProvider the validator provider
+   * @param blockInterface the block interface
+   * @param blockchainQueries the blockchain queries
+   */
+  public QbftGetSignerMetrics(
+      final ValidatorProvider validatorProvider,
+      final BlockInterface blockInterface,
+      final BlockchainQueries blockchainQueries) {
+    super(validatorProvider, blockInterface, blockchainQueries);
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.QBFT_GET_SIGNER_METRICS.getMethodName();
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetValidatorsByBlockHash.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetValidatorsByBlockHash.java
new file mode 100644
index 00000000000..4726e81bd33
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetValidatorsByBlockHash.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.jsonrpc.methods;
+
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Qbft get validators by block hash. */
+public class QbftGetValidatorsByBlockHash implements JsonRpcMethod {
+  private static final Logger LOG = LoggerFactory.getLogger(QbftGetValidatorsByBlockHash.class);
+
+  private final Blockchain blockchain;
+  private final ValidatorProvider validatorProvider;
+
+  /**
+   * Instantiates a new Qbft get validators by block hash.
+   *
+   * @param blockchain the blockchain
+   * @param validatorProvider the validator provider
+   */
+  public QbftGetValidatorsByBlockHash(
+      final Blockchain blockchain, final ValidatorProvider validatorProvider) {
+    this.blockchain = blockchain;
+    this.validatorProvider = validatorProvider;
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.QBFT_GET_VALIDATORS_BY_BLOCK_HASH.getMethodName();
+  }
+
+  @Override
+  public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
+    return new JsonRpcSuccessResponse(
+        requestContext.getRequest().getId(), blockResult(requestContext));
+  }
+
+  private Object blockResult(final JsonRpcRequestContext request) {
+    final Hash hash = request.getRequiredParameter(0, Hash.class);
+    LOG.trace("Received RPC rpcName={} blockHash={}", getName(), hash);
+    final Optional<BlockHeader> blockHeader = blockchain.getBlockHeader(hash);
+    return blockHeader
+        .map(
+            header ->
+                validatorProvider.getValidatorsForBlock(header).stream()
+                    .map(Address::toString)
+                    .collect(Collectors.toList()))
+        .orElse(null);
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetValidatorsByBlockNumber.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetValidatorsByBlockNumber.java
new file mode 100644
index 00000000000..6210d97bbbe
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetValidatorsByBlockNumber.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.jsonrpc.methods;
+
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.AbstractBlockParameterMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Qbft get validators by block number. */
+public class QbftGetValidatorsByBlockNumber extends AbstractBlockParameterMethod
+    implements JsonRpcMethod {
+  private static final Logger LOG = LoggerFactory.getLogger(QbftGetValidatorsByBlockNumber.class);
+  private final ValidatorProvider validatorProvider;
+
+  /**
+   * Instantiates a new Qbft get validators by block number.
+   *
+   * @param blockchainQueries the blockchain queries
+   * @param validatorProvider the validator provider
+   */
+  public QbftGetValidatorsByBlockNumber(
+      final BlockchainQueries blockchainQueries, final ValidatorProvider validatorProvider) {
+    super(blockchainQueries);
+    this.validatorProvider = validatorProvider;
+  }
+
+  @Override
+  protected BlockParameter blockParameter(final JsonRpcRequestContext request) {
+    return request.getRequiredParameter(0, BlockParameter.class);
+  }
+
+  @Override
+  protected Object resultByBlockNumber(
+      final JsonRpcRequestContext request, final long blockNumber) {
+    final Optional<BlockHeader> blockHeader =
+        getBlockchainQueries().getBlockHeaderByNumber(blockNumber);
+    LOG.trace("Received RPC rpcName={} block={}", getName(), blockNumber);
+    return blockHeader
+        .map(
+            header ->
+                validatorProvider.getValidatorsForBlock(header).stream()
+                    .map(Address::toString)
+                    .collect(Collectors.toList()))
+        .orElse(null);
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.QBFT_GET_VALIDATORS_BY_BLOCK_NUMBER.getMethodName();
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftProposeValidatorVote.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftProposeValidatorVote.java
new file mode 100644
index 00000000000..98033ca2f6c
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftProposeValidatorVote.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.jsonrpc.methods;
+
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.common.validator.VoteType;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Qbft propose validator vote. */
+public class QbftProposeValidatorVote implements JsonRpcMethod {
+  private static final Logger LOG = LoggerFactory.getLogger(QbftProposeValidatorVote.class);
+  private final ValidatorProvider validatorProvider;
+
+  /**
+   * Instantiates a new Qbft propose validator vote.
+   *
+   * @param validatorProvider the validator provider
+   */
+  public QbftProposeValidatorVote(final ValidatorProvider validatorProvider) {
+    this.validatorProvider = validatorProvider;
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.QBFT_PROPOSE_VALIDATOR_VOTE.getMethodName();
+  }
+
+  @Override
+  public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
+    if (validatorProvider.getVoteProviderAtHead().isPresent()) {
+      final Address validatorAddress = requestContext.getRequiredParameter(0, Address.class);
+      final Boolean add = requestContext.getRequiredParameter(1, Boolean.class);
+      LOG.trace(
+          "Received RPC rpcName={} voteType={} address={}",
+          getName(),
+          add ? VoteType.ADD : VoteType.DROP,
+          validatorAddress);
+
+      if (add) {
+        validatorProvider.getVoteProviderAtHead().get().authVote(validatorAddress);
+      } else {
+        validatorProvider.getVoteProviderAtHead().get().dropVote(validatorAddress);
+      }
+      return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), true);
+    } else {
+      return new JsonRpcErrorResponse(
+          requestContext.getRequest().getId(), JsonRpcError.METHOD_NOT_ENABLED);
+    }
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagedata/CommitMessageData.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagedata/CommitMessageData.java
new file mode 100644
index 00000000000..c0e8c537cd6
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagedata/CommitMessageData.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.messagedata;
+
+import org.hyperledger.besu.consensus.common.bft.messagedata.AbstractBftMessageData;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Commit;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Commit message data. */
+public class CommitMessageData extends AbstractBftMessageData {
+
+  private static final int MESSAGE_CODE = QbftV1.COMMIT;
+
+  private CommitMessageData(final Bytes data) {
+    super(data);
+  }
+
+  /**
+   * Create commit message data from message data.
+   *
+   * @param messageData the message data
+   * @return the commit message data
+   */
+  public static CommitMessageData fromMessageData(final MessageData messageData) {
+    return fromMessageData(
+        messageData, MESSAGE_CODE, CommitMessageData.class, CommitMessageData::new);
+  }
+
+  /**
+   * Decode.
+   *
+   * @return the commit
+   */
+  public Commit decode() {
+    return Commit.decode(data);
+  }
+
+  /**
+   * Create commit message data.
+   *
+   * @param commit the commit
+   * @return the commit message data
+   */
+  public static CommitMessageData create(final Commit commit) {
+    return new CommitMessageData(commit.encode());
+  }
+
+  @Override
+  public int getCode() {
+    return MESSAGE_CODE;
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagedata/PrepareMessageData.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagedata/PrepareMessageData.java
new file mode 100644
index 00000000000..30ed2e33dac
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagedata/PrepareMessageData.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.messagedata;
+
+import org.hyperledger.besu.consensus.common.bft.messagedata.AbstractBftMessageData;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Prepare message data. */
+public class PrepareMessageData extends AbstractBftMessageData {
+
+  private static final int MESSAGE_CODE = QbftV1.PREPARE;
+
+  private PrepareMessageData(final Bytes data) {
+    super(data);
+  }
+
+  /**
+   * Create prepare message data from message data.
+   *
+   * @param messageData the message data
+   * @return the Prepare message data
+   */
+  public static PrepareMessageData fromMessageData(final MessageData messageData) {
+    return fromMessageData(
+        messageData, MESSAGE_CODE, PrepareMessageData.class, PrepareMessageData::new);
+  }
+
+  /**
+   * Decode.
+   *
+   * @return the Prepare payload message
+   */
+  public Prepare decode() {
+    return Prepare.decode(data);
+  }
+
+  /**
+   * Create prepare message data.
+   *
+   * @param preapare the Prepare payload message
+   * @return the Prepare message data
+   */
+  public static PrepareMessageData create(final Prepare preapare) {
+    return new PrepareMessageData(preapare.encode());
+  }
+
+  @Override
+  public int getCode() {
+    return MESSAGE_CODE;
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagedata/ProposalMessageData.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagedata/ProposalMessageData.java
new file mode 100644
index 00000000000..28d8c8d82e9
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagedata/ProposalMessageData.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.messagedata;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.messagedata.AbstractBftMessageData;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Proposal;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Proposal message data. */
+public class ProposalMessageData extends AbstractBftMessageData {
+
+  private static final int MESSAGE_CODE = QbftV1.PROPOSAL;
+
+  private ProposalMessageData(final Bytes data) {
+    super(data);
+  }
+
+  /**
+   * Create proposal message data from message data.
+   *
+   * @param messageData the message data
+   * @return the proposal message data
+   */
+  public static ProposalMessageData fromMessageData(final MessageData messageData) {
+    return fromMessageData(
+        messageData, MESSAGE_CODE, ProposalMessageData.class, ProposalMessageData::new);
+  }
+
+  /**
+   * Decode.
+   *
+   * @param bftExtraDataCodec the bft extra data codec
+   * @return the proposal
+   */
+  public Proposal decode(final BftExtraDataCodec bftExtraDataCodec) {
+    return Proposal.decode(data, bftExtraDataCodec);
+  }
+
+  /**
+   * Create proposal message data.
+   *
+   * @param proposal the proposal
+   * @return the proposal message data
+   */
+  public static ProposalMessageData create(final Proposal proposal) {
+    return new ProposalMessageData(proposal.encode());
+  }
+
+  @Override
+  public int getCode() {
+    return MESSAGE_CODE;
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagedata/QbftV1.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagedata/QbftV1.java
new file mode 100644
index 00000000000..d4ad566c939
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagedata/QbftV1.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.messagedata;
+
+/** Message codes for QBFT v1 messages */
+public class QbftV1 {
+  /** The constant PROPOSAL. */
+  public static final int PROPOSAL = 0x12;
+  /** The constant PREPARE. */
+  public static final int PREPARE = 0x13;
+  /** The constant COMMIT. */
+  public static final int COMMIT = 0x14;
+  /** The constant ROUND_CHANGE. */
+  public static final int ROUND_CHANGE = 0x15;
+
+  /** The constant MESSAGE_SPACE. */
+  public static final int MESSAGE_SPACE = 0x16;
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagedata/RoundChangeMessageData.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagedata/RoundChangeMessageData.java
new file mode 100644
index 00000000000..6b017b0a1a2
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagedata/RoundChangeMessageData.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.messagedata;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.messagedata.AbstractBftMessageData;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.RoundChange;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Round change message data. */
+public class RoundChangeMessageData extends AbstractBftMessageData {
+
+  private static final int MESSAGE_CODE = QbftV1.ROUND_CHANGE;
+
+  private RoundChangeMessageData(final Bytes data) {
+    super(data);
+  }
+
+  /**
+   * Create round change message data from message data.
+   *
+   * @param messageData the message data
+   * @return the round change message data
+   */
+  public static RoundChangeMessageData fromMessageData(final MessageData messageData) {
+    return fromMessageData(
+        messageData, MESSAGE_CODE, RoundChangeMessageData.class, RoundChangeMessageData::new);
+  }
+
+  /**
+   * Decode.
+   *
+   * @param bftExtraDataCodec the bft extra data codec
+   * @return the round change
+   */
+  public RoundChange decode(final BftExtraDataCodec bftExtraDataCodec) {
+    return RoundChange.decode(data, bftExtraDataCodec);
+  }
+
+  /**
+   * Create round change message data.
+   *
+   * @param signedPayload the signed payload
+   * @return the round change message data
+   */
+  public static RoundChangeMessageData create(final RoundChange signedPayload) {
+
+    return new RoundChangeMessageData(signedPayload.encode());
+  }
+
+  @Override
+  public int getCode() {
+    return MESSAGE_CODE;
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagewrappers/Commit.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagewrappers/Commit.java
new file mode 100644
index 00000000000..5745f7af9de
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagewrappers/Commit.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.messagewrappers;
+
+import org.hyperledger.besu.consensus.common.bft.messagewrappers.BftMessage;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.payload.CommitPayload;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Commit payload message. */
+public class Commit extends BftMessage<CommitPayload> {
+
+  /**
+   * Instantiates a new Commit.
+   *
+   * @param payload the payload
+   */
+  public Commit(final SignedData<CommitPayload> payload) {
+    super(payload);
+  }
+
+  /**
+   * Gets commit seal.
+   *
+   * @return the commit seal
+   */
+  public SECPSignature getCommitSeal() {
+    return getPayload().getCommitSeal();
+  }
+
+  /**
+   * Gets digest.
+   *
+   * @return the digest
+   */
+  public Hash getDigest() {
+    return getPayload().getDigest();
+  }
+
+  /**
+   * Decode.
+   *
+   * @param data the data
+   * @return the commit
+   */
+  public static Commit decode(final Bytes data) {
+    final RLPInput rlpIn = RLP.input(data);
+
+    return new Commit(readPayload(rlpIn, CommitPayload::readFrom));
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagewrappers/Prepare.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagewrappers/Prepare.java
new file mode 100644
index 00000000000..2ffd0bf180f
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagewrappers/Prepare.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.messagewrappers;
+
+import org.hyperledger.besu.consensus.common.bft.messagewrappers.BftMessage;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.payload.PreparePayload;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Prepare payload message. */
+public class Prepare extends BftMessage<PreparePayload> {
+
+  /**
+   * Instantiates a new Prepare.
+   *
+   * @param payload the payload
+   */
+  public Prepare(final SignedData<PreparePayload> payload) {
+    super(payload);
+  }
+
+  /**
+   * Gets digest.
+   *
+   * @return the digest
+   */
+  public Hash getDigest() {
+    return getPayload().getDigest();
+  }
+
+  /**
+   * Decode.
+   *
+   * @param data the data
+   * @return the Prepare payload message
+   */
+  public static Prepare decode(final Bytes data) {
+    final RLPInput rlpIn = RLP.input(data);
+    return new Prepare(readPayload(rlpIn, PreparePayload::readFrom));
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagewrappers/Proposal.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagewrappers/Proposal.java
new file mode 100644
index 00000000000..8650a9c6b66
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagewrappers/Proposal.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.messagewrappers;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.messagewrappers.BftMessage;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.payload.PreparePayload;
+import org.hyperledger.besu.consensus.qbft.payload.ProposalPayload;
+import org.hyperledger.besu.consensus.qbft.payload.RoundChangePayload;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Proposal. */
+public class Proposal extends BftMessage<ProposalPayload> {
+
+  private final List<SignedData<RoundChangePayload>> roundChanges;
+  private final List<SignedData<PreparePayload>> prepares;
+
+  /**
+   * Instantiates a new Proposal.
+   *
+   * @param payload the payload
+   * @param roundChanges the round changes
+   * @param prepares the prepares
+   */
+  public Proposal(
+      final SignedData<ProposalPayload> payload,
+      final List<SignedData<RoundChangePayload>> roundChanges,
+      final List<SignedData<PreparePayload>> prepares) {
+    super(payload);
+    this.roundChanges = roundChanges;
+    this.prepares = prepares;
+  }
+
+  /**
+   * Gets round changes.
+   *
+   * @return the round changes
+   */
+  public List<SignedData<RoundChangePayload>> getRoundChanges() {
+    return roundChanges;
+  }
+
+  /**
+   * Gets list of Prepare payload.
+   *
+   * @return the list of Prepare payload
+   */
+  public List<SignedData<PreparePayload>> getPrepares() {
+    return prepares;
+  }
+
+  /**
+   * Gets block.
+   *
+   * @return the block
+   */
+  public Block getBlock() {
+    return getPayload().getProposedBlock();
+  }
+
+  @Override
+  public Bytes encode() {
+    final BytesValueRLPOutput rlpOut = new BytesValueRLPOutput();
+    rlpOut.startList();
+    getSignedPayload().writeTo(rlpOut);
+
+    rlpOut.startList();
+    rlpOut.writeList(roundChanges, SignedData::writeTo);
+    rlpOut.writeList(prepares, SignedData::writeTo);
+    rlpOut.endList();
+
+    rlpOut.endList();
+    return rlpOut.encoded();
+  }
+
+  /**
+   * Decode.
+   *
+   * @param data the data
+   * @param bftExtraDataCodec the bft extra data codec
+   * @return the proposal
+   */
+  public static Proposal decode(final Bytes data, final BftExtraDataCodec bftExtraDataCodec) {
+    final RLPInput rlpIn = RLP.input(data);
+    rlpIn.enterList();
+    final SignedData<ProposalPayload> payload =
+        readPayload(rlpIn, rlpInput -> ProposalPayload.readFrom(rlpInput, bftExtraDataCodec));
+
+    rlpIn.enterList();
+    final List<SignedData<RoundChangePayload>> roundChanges =
+        rlpIn.readList(r -> readPayload(r, RoundChangePayload::readFrom));
+    final List<SignedData<PreparePayload>> prepares =
+        rlpIn.readList(r -> readPayload(r, PreparePayload::readFrom));
+    rlpIn.leaveList();
+
+    rlpIn.leaveList();
+    return new Proposal(payload, roundChanges, prepares);
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagewrappers/RoundChange.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagewrappers/RoundChange.java
new file mode 100644
index 00000000000..cbebdf7debd
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/messagewrappers/RoundChange.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.messagewrappers;
+
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.messagewrappers.BftMessage;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.payload.PreparePayload;
+import org.hyperledger.besu.consensus.qbft.payload.PreparedRoundMetadata;
+import org.hyperledger.besu.consensus.qbft.payload.RoundChangePayload;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Round change payload message. */
+public class RoundChange extends BftMessage<RoundChangePayload> {
+
+  private final Optional<Block> proposedBlock;
+  private final List<SignedData<PreparePayload>> prepares;
+
+  /**
+   * Instantiates a new Round change.
+   *
+   * @param payload the payload
+   * @param proposedBlock the proposed block
+   * @param prepares the prepares
+   */
+  public RoundChange(
+      final SignedData<RoundChangePayload> payload,
+      final Optional<Block> proposedBlock,
+      final List<SignedData<PreparePayload>> prepares) {
+    super(payload);
+    this.proposedBlock = proposedBlock;
+    this.prepares = prepares;
+  }
+
+  /**
+   * Gets proposed block.
+   *
+   * @return the proposed block
+   */
+  public Optional<Block> getProposedBlock() {
+    return proposedBlock;
+  }
+
+  /**
+   * Gets list of Prepare payload signed data.
+   *
+   * @return the prepares
+   */
+  public List<SignedData<PreparePayload>> getPrepares() {
+    return prepares;
+  }
+
+  /**
+   * Gets prepared round metadata.
+   *
+   * @return the prepared round metadata
+   */
+  public Optional<PreparedRoundMetadata> getPreparedRoundMetadata() {
+    return getPayload().getPreparedRoundMetadata();
+  }
+
+  /**
+   * Gets prepared round.
+   *
+   * @return the prepared round
+   */
+  public Optional<Integer> getPreparedRound() {
+    return getPayload().getPreparedRoundMetadata().map(PreparedRoundMetadata::getPreparedRound);
+  }
+
+  @Override
+  public Bytes encode() {
+    final BytesValueRLPOutput rlpOut = new BytesValueRLPOutput();
+    rlpOut.startList();
+    getSignedPayload().writeTo(rlpOut);
+    proposedBlock.ifPresentOrElse(pb -> pb.writeTo(rlpOut), rlpOut::writeEmptyList);
+    rlpOut.writeList(prepares, SignedData::writeTo);
+    rlpOut.endList();
+    return rlpOut.encoded();
+  }
+
+  /**
+   * Decode.
+   *
+   * @param data the data
+   * @param bftExtraDataCodec the bft extra data codec
+   * @return the round change
+   */
+  public static RoundChange decode(final Bytes data, final BftExtraDataCodec bftExtraDataCodec) {
+
+    final RLPInput rlpIn = RLP.input(data);
+    rlpIn.enterList();
+    final SignedData<RoundChangePayload> payload = readPayload(rlpIn, RoundChangePayload::readFrom);
+
+    final Optional<Block> block;
+    if (rlpIn.nextIsList() && rlpIn.nextSize() == 0) {
+      rlpIn.skipNext();
+      block = Optional.empty();
+    } else {
+      block =
+          Optional.of(
+              Block.readFrom(rlpIn, BftBlockHeaderFunctions.forCommittedSeal(bftExtraDataCodec)));
+    }
+
+    final List<SignedData<PreparePayload>> prepares =
+        rlpIn.readList(r -> readPayload(r, PreparePayload::readFrom));
+    rlpIn.leaveList();
+
+    return new RoundChange(payload, block, prepares);
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/network/QbftMessageTransmitter.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/network/QbftMessageTransmitter.java
new file mode 100644
index 00000000000..7c5b93c24a7
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/network/QbftMessageTransmitter.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.network;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.network.ValidatorMulticaster;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.messagedata.CommitMessageData;
+import org.hyperledger.besu.consensus.qbft.messagedata.PrepareMessageData;
+import org.hyperledger.besu.consensus.qbft.messagedata.ProposalMessageData;
+import org.hyperledger.besu.consensus.qbft.messagedata.RoundChangeMessageData;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Commit;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Proposal;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.RoundChange;
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.qbft.payload.PreparePayload;
+import org.hyperledger.besu.consensus.qbft.payload.RoundChangePayload;
+import org.hyperledger.besu.consensus.qbft.statemachine.PreparedCertificate;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.plugin.services.securitymodule.SecurityModuleException;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Qbft message transmitter. */
+public class QbftMessageTransmitter {
+
+  private static final Logger LOG = LoggerFactory.getLogger(QbftMessageTransmitter.class);
+
+  private final MessageFactory messageFactory;
+  private final ValidatorMulticaster multicaster;
+
+  /**
+   * Instantiates a new Qbft message transmitter.
+   *
+   * @param messageFactory the message factory
+   * @param multicaster the multicaster
+   */
+  public QbftMessageTransmitter(
+      final MessageFactory messageFactory, final ValidatorMulticaster multicaster) {
+    this.messageFactory = messageFactory;
+    this.multicaster = multicaster;
+  }
+
+  /**
+   * Multicast proposal.
+   *
+   * @param roundIdentifier the round identifier
+   * @param block the block
+   * @param roundChanges the round changes
+   * @param prepares the prepares
+   */
+  public void multicastProposal(
+      final ConsensusRoundIdentifier roundIdentifier,
+      final Block block,
+      final List<SignedData<RoundChangePayload>> roundChanges,
+      final List<SignedData<PreparePayload>> prepares) {
+    try {
+      final Proposal data =
+          messageFactory.createProposal(roundIdentifier, block, roundChanges, prepares);
+
+      final ProposalMessageData message = ProposalMessageData.create(data);
+
+      multicaster.send(message);
+    } catch (final SecurityModuleException e) {
+      LOG.warn("Failed to generate signature for Proposal (not sent): {} ", e.getMessage());
+    }
+  }
+
+  /**
+   * Multicast prepare.
+   *
+   * @param roundIdentifier the round identifier
+   * @param digest the digest
+   */
+  public void multicastPrepare(final ConsensusRoundIdentifier roundIdentifier, final Hash digest) {
+    try {
+      final Prepare data = messageFactory.createPrepare(roundIdentifier, digest);
+
+      final PrepareMessageData message = PrepareMessageData.create(data);
+
+      multicaster.send(message);
+    } catch (final SecurityModuleException e) {
+      LOG.warn("Failed to generate signature for Prepare (not sent): {} ", e.getMessage());
+    }
+  }
+
+  /**
+   * Multicast commit.
+   *
+   * @param roundIdentifier the round identifier
+   * @param digest the digest
+   * @param commitSeal the commit seal
+   */
+  public void multicastCommit(
+      final ConsensusRoundIdentifier roundIdentifier,
+      final Hash digest,
+      final SECPSignature commitSeal) {
+    try {
+      final Commit data = messageFactory.createCommit(roundIdentifier, digest, commitSeal);
+
+      final CommitMessageData message = CommitMessageData.create(data);
+
+      multicaster.send(message);
+    } catch (final SecurityModuleException e) {
+      LOG.warn("Failed to generate signature for Commit (not sent): {} ", e.getMessage());
+    }
+  }
+
+  /**
+   * Multicast round change.
+   *
+   * @param roundIdentifier the round identifier
+   * @param preparedRoundCertificate the prepared round certificate
+   */
+  public void multicastRoundChange(
+      final ConsensusRoundIdentifier roundIdentifier,
+      final Optional<PreparedCertificate> preparedRoundCertificate) {
+    try {
+      final RoundChange data =
+          messageFactory.createRoundChange(roundIdentifier, preparedRoundCertificate);
+
+      final RoundChangeMessageData message = RoundChangeMessageData.create(data);
+
+      multicaster.send(message);
+    } catch (final SecurityModuleException e) {
+      LOG.warn("Failed to generate signature for RoundChange (not sent): {} ", e.getMessage());
+    }
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/payload/CommitPayload.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/payload/CommitPayload.java
new file mode 100644
index 00000000000..716417922c4
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/payload/CommitPayload.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.payload;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.payload.Payload;
+import org.hyperledger.besu.consensus.qbft.messagedata.QbftV1;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+
+import java.util.Objects;
+import java.util.StringJoiner;
+
+/** The Commit payload. */
+public class CommitPayload extends QbftPayload {
+  private static final int TYPE = QbftV1.COMMIT;
+  private final ConsensusRoundIdentifier roundIdentifier;
+  private final Hash digest;
+  private final SECPSignature commitSeal;
+
+  /**
+   * Instantiates a new Commit payload.
+   *
+   * @param roundIdentifier the round identifier
+   * @param digest the digest
+   * @param commitSeal the commit seal
+   */
+  public CommitPayload(
+      final ConsensusRoundIdentifier roundIdentifier,
+      final Hash digest,
+      final SECPSignature commitSeal) {
+    this.roundIdentifier = roundIdentifier;
+    this.digest = digest;
+    this.commitSeal = commitSeal;
+  }
+
+  /**
+   * Read from rlp input and return commit payload.
+   *
+   * @param rlpInput the rlp input
+   * @return the commit payload
+   */
+  public static CommitPayload readFrom(final RLPInput rlpInput) {
+    rlpInput.enterList();
+    final ConsensusRoundIdentifier roundIdentifier = readConsensusRound(rlpInput);
+    final Hash digest = Payload.readDigest(rlpInput);
+    final SECPSignature commitSeal =
+        rlpInput.readBytes(SignatureAlgorithmFactory.getInstance()::decodeSignature);
+    rlpInput.leaveList();
+
+    return new CommitPayload(roundIdentifier, digest, commitSeal);
+  }
+
+  @Override
+  public void writeTo(final RLPOutput rlpOutput) {
+    rlpOutput.startList();
+    writeConsensusRound(rlpOutput);
+    rlpOutput.writeBytes(digest);
+    rlpOutput.writeBytes(commitSeal.encodedBytes());
+    rlpOutput.endList();
+  }
+
+  @Override
+  public int getMessageType() {
+    return TYPE;
+  }
+
+  /**
+   * Gets digest.
+   *
+   * @return the digest
+   */
+  public Hash getDigest() {
+    return digest;
+  }
+
+  /**
+   * Gets commit seal.
+   *
+   * @return the commit seal
+   */
+  public SECPSignature getCommitSeal() {
+    return commitSeal;
+  }
+
+  @Override
+  public ConsensusRoundIdentifier getRoundIdentifier() {
+    return roundIdentifier;
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    final CommitPayload that = (CommitPayload) o;
+    return Objects.equals(roundIdentifier, that.roundIdentifier)
+        && Objects.equals(digest, that.digest)
+        && Objects.equals(commitSeal, that.commitSeal);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(roundIdentifier, digest, commitSeal);
+  }
+
+  @Override
+  public String toString() {
+    return new StringJoiner(", ", CommitPayload.class.getSimpleName() + "[", "]")
+        .add("roundIdentifier=" + roundIdentifier)
+        .add("digest=" + digest)
+        .add("commitSeal=" + commitSeal)
+        .toString();
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/payload/MessageFactory.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/payload/MessageFactory.java
new file mode 100644
index 00000000000..860a4c9c418
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/payload/MessageFactory.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.payload;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.payload.Payload;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Commit;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Proposal;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.RoundChange;
+import org.hyperledger.besu.consensus.qbft.statemachine.PreparedCertificate;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Block;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+/** The Message factory. */
+public class MessageFactory {
+
+  private final NodeKey nodeKey;
+
+  /**
+   * Instantiates a new Message factory.
+   *
+   * @param nodeKey the node key
+   */
+  public MessageFactory(final NodeKey nodeKey) {
+    this.nodeKey = nodeKey;
+  }
+
+  /**
+   * Create proposal.
+   *
+   * @param roundIdentifier the round identifier
+   * @param block the block
+   * @param roundChanges the round changes
+   * @param prepares the prepares
+   * @return the proposal
+   */
+  public Proposal createProposal(
+      final ConsensusRoundIdentifier roundIdentifier,
+      final Block block,
+      final List<SignedData<RoundChangePayload>> roundChanges,
+      final List<SignedData<PreparePayload>> prepares) {
+
+    final ProposalPayload payload = new ProposalPayload(roundIdentifier, block);
+
+    return new Proposal(createSignedMessage(payload), roundChanges, prepares);
+  }
+
+  /**
+   * Create Prepare payload.
+   *
+   * @param roundIdentifier the round identifier
+   * @param digest the digest
+   * @return the prepare
+   */
+  public Prepare createPrepare(final ConsensusRoundIdentifier roundIdentifier, final Hash digest) {
+    final PreparePayload payload = new PreparePayload(roundIdentifier, digest);
+    return new Prepare(createSignedMessage(payload));
+  }
+
+  /**
+   * Create commit payload.
+   *
+   * @param roundIdentifier the round identifier
+   * @param digest the digest
+   * @param commitSeal the commit seal
+   * @return the commit
+   */
+  public Commit createCommit(
+      final ConsensusRoundIdentifier roundIdentifier,
+      final Hash digest,
+      final SECPSignature commitSeal) {
+    final CommitPayload payload = new CommitPayload(roundIdentifier, digest, commitSeal);
+    return new Commit(createSignedMessage(payload));
+  }
+
+  /**
+   * Create round change payload.
+   *
+   * @param roundIdentifier the round identifier
+   * @param preparedRoundData the prepared round data
+   * @return the round change
+   */
+  public RoundChange createRoundChange(
+      final ConsensusRoundIdentifier roundIdentifier,
+      final Optional<PreparedCertificate> preparedRoundData) {
+
+    final RoundChangePayload payload;
+    if (preparedRoundData.isPresent()) {
+
+      final Block preparedBlock = preparedRoundData.get().getBlock();
+      payload =
+          new RoundChangePayload(
+              roundIdentifier,
+              Optional.of(
+                  new PreparedRoundMetadata(
+                      preparedBlock.getHash(), preparedRoundData.get().getRound())));
+
+      return new RoundChange(
+          createSignedMessage(payload),
+          Optional.of(preparedBlock),
+          preparedRoundData.get().getPrepares());
+
+    } else {
+      payload = new RoundChangePayload(roundIdentifier, Optional.empty());
+      return new RoundChange(
+          createSignedMessage(payload), Optional.empty(), Collections.emptyList());
+    }
+  }
+
+  private <M extends Payload> SignedData<M> createSignedMessage(final M payload) {
+    final SECPSignature signature = nodeKey.sign(payload.hashForSignature());
+    return SignedData.create(payload, signature);
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/payload/PreparePayload.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/payload/PreparePayload.java
new file mode 100644
index 00000000000..b0198058e45
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/payload/PreparePayload.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.payload;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.payload.Payload;
+import org.hyperledger.besu.consensus.qbft.messagedata.QbftV1;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+
+import java.util.Objects;
+import java.util.StringJoiner;
+
+/** The Prepare payload. */
+public class PreparePayload extends QbftPayload {
+  private static final int TYPE = QbftV1.PREPARE;
+  private final ConsensusRoundIdentifier roundIdentifier;
+  private final Hash digest;
+
+  /**
+   * Instantiates a new Prepare payload.
+   *
+   * @param roundIdentifier the round identifier
+   * @param digest the digest
+   */
+  public PreparePayload(final ConsensusRoundIdentifier roundIdentifier, final Hash digest) {
+    this.roundIdentifier = roundIdentifier;
+    this.digest = digest;
+  }
+
+  /**
+   * Read from rlp input and return prepare payload.
+   *
+   * @param rlpInput the rlp input
+   * @return the prepare payload
+   */
+  public static PreparePayload readFrom(final RLPInput rlpInput) {
+    rlpInput.enterList();
+    final ConsensusRoundIdentifier roundIdentifier = readConsensusRound(rlpInput);
+    final Hash digest = Payload.readDigest(rlpInput);
+    rlpInput.leaveList();
+    return new PreparePayload(roundIdentifier, digest);
+  }
+
+  @Override
+  public void writeTo(final RLPOutput rlpOutput) {
+    rlpOutput.startList();
+    writeConsensusRound(rlpOutput);
+    rlpOutput.writeBytes(digest);
+    rlpOutput.endList();
+  }
+
+  @Override
+  public int getMessageType() {
+    return TYPE;
+  }
+
+  /**
+   * Gets digest.
+   *
+   * @return the digest
+   */
+  public Hash getDigest() {
+    return digest;
+  }
+
+  @Override
+  public ConsensusRoundIdentifier getRoundIdentifier() {
+    return roundIdentifier;
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    final PreparePayload that = (PreparePayload) o;
+    return Objects.equals(roundIdentifier, that.roundIdentifier)
+        && Objects.equals(digest, that.digest);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(roundIdentifier, digest);
+  }
+
+  @Override
+  public String toString() {
+    return new StringJoiner(", ", PreparePayload.class.getSimpleName() + "[", "]")
+        .add("roundIdentifier=" + roundIdentifier)
+        .add("digest=" + digest)
+        .toString();
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/payload/PreparedRoundMetadata.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/payload/PreparedRoundMetadata.java
new file mode 100644
index 00000000000..5e534a7178c
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/payload/PreparedRoundMetadata.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.payload;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+
+import java.util.Objects;
+
+import com.google.common.base.MoreObjects;
+
+/** The Prepared round metadata. */
+public class PreparedRoundMetadata {
+  private final Hash preparedBlockHash;
+  private final int preparedRound;
+
+  /**
+   * Instantiates a new Prepared round metadata.
+   *
+   * @param preparedBlockHash the prepared block hash
+   * @param preparedRound the prepared round
+   */
+  public PreparedRoundMetadata(final Hash preparedBlockHash, final int preparedRound) {
+    this.preparedBlockHash = preparedBlockHash;
+    this.preparedRound = preparedRound;
+  }
+
+  /**
+   * Gets prepared block hash.
+   *
+   * @return the prepared block hash
+   */
+  public Hash getPreparedBlockHash() {
+    return preparedBlockHash;
+  }
+
+  /**
+   * Gets prepared round.
+   *
+   * @return the prepared round
+   */
+  public int getPreparedRound() {
+    return preparedRound;
+  }
+
+  /**
+   * Constructor that derives the sequence and round information from an RLP encoded message
+   *
+   * @param in The RLP body of the message to check
+   * @return A PreparedRoundMetadata as extracted from the supplied RLP input
+   */
+  public static PreparedRoundMetadata readFrom(final RLPInput in) {
+    final int preparedRound = in.readIntScalar();
+    final Hash preparedBlockHash = Hash.wrap(in.readBytes32());
+    return new PreparedRoundMetadata(preparedBlockHash, preparedRound);
+  }
+
+  /**
+   * Adds this rounds information to a given RLP buffer
+   *
+   * @param out The RLP buffer to add to
+   */
+  public void writeTo(final RLPOutput out) {
+    out.writeIntScalar(preparedRound);
+    out.writeBytes(preparedBlockHash);
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    PreparedRoundMetadata that = (PreparedRoundMetadata) o;
+    return preparedRound == that.preparedRound
+        && Objects.equals(preparedBlockHash, that.preparedBlockHash);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(preparedBlockHash, preparedRound);
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("preparedBlockHash", preparedBlockHash)
+        .add("preparedRound", preparedRound)
+        .toString();
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/payload/ProposalPayload.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/payload/ProposalPayload.java
new file mode 100644
index 00000000000..3bbe48dec0f
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/payload/ProposalPayload.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.payload;
+
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.qbft.messagedata.QbftV1;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+
+import java.util.Objects;
+
+import com.google.common.base.MoreObjects;
+
+/** The Proposal payload. */
+public class ProposalPayload extends QbftPayload {
+
+  private static final int TYPE = QbftV1.PROPOSAL;
+  private final ConsensusRoundIdentifier roundIdentifier;
+  private final Block proposedBlock;
+
+  /**
+   * Instantiates a new Proposal payload.
+   *
+   * @param roundIdentifier the round identifier
+   * @param proposedBlock the proposed block
+   */
+  public ProposalPayload(
+      final ConsensusRoundIdentifier roundIdentifier, final Block proposedBlock) {
+    this.roundIdentifier = roundIdentifier;
+    this.proposedBlock = proposedBlock;
+  }
+
+  /**
+   * Read from rlp input and return proposal payload.
+   *
+   * @param rlpInput the rlp input
+   * @param bftExtraDataCodec the bft extra data codec
+   * @return the proposal payload
+   */
+  public static ProposalPayload readFrom(
+      final RLPInput rlpInput, final BftExtraDataCodec bftExtraDataCodec) {
+    rlpInput.enterList();
+    final ConsensusRoundIdentifier roundIdentifier = readConsensusRound(rlpInput);
+    final Block proposedBlock =
+        Block.readFrom(rlpInput, BftBlockHeaderFunctions.forCommittedSeal(bftExtraDataCodec));
+    rlpInput.leaveList();
+
+    return new ProposalPayload(roundIdentifier, proposedBlock);
+  }
+
+  @Override
+  public void writeTo(final RLPOutput rlpOutput) {
+    rlpOutput.startList();
+    writeConsensusRound(rlpOutput);
+    proposedBlock.writeTo(rlpOutput);
+    rlpOutput.endList();
+  }
+
+  /**
+   * Gets proposed block.
+   *
+   * @return the proposed block
+   */
+  public Block getProposedBlock() {
+    return proposedBlock;
+  }
+
+  @Override
+  public int getMessageType() {
+    return TYPE;
+  }
+
+  @Override
+  public ConsensusRoundIdentifier getRoundIdentifier() {
+    return roundIdentifier;
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ProposalPayload that = (ProposalPayload) o;
+    return Objects.equals(roundIdentifier, that.roundIdentifier)
+        && Objects.equals(proposedBlock, that.proposedBlock);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(roundIdentifier, proposedBlock);
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("roundIdentifier", roundIdentifier)
+        .add("proposedBlock", proposedBlock)
+        .toString();
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/payload/QbftPayload.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/payload/QbftPayload.java
new file mode 100644
index 00000000000..c90a12cad04
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/payload/QbftPayload.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.payload;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.payload.Payload;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+
+/** The Qbft payload. */
+public abstract class QbftPayload implements Payload {
+
+  /**
+   * Write consensus round.
+   *
+   * @param out the out
+   */
+  protected void writeConsensusRound(final RLPOutput out) {
+    out.writeLongScalar(getRoundIdentifier().getSequenceNumber());
+    out.writeIntScalar(getRoundIdentifier().getRoundNumber());
+  }
+
+  /**
+   * Read consensus round.
+   *
+   * @param in the rlp input
+   * @return the consensus round identifier
+   */
+  protected static ConsensusRoundIdentifier readConsensusRound(final RLPInput in) {
+    return new ConsensusRoundIdentifier(in.readLongScalar(), in.readIntScalar());
+  }
+
+  @Override
+  public Hash hashForSignature() {
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    out.startList();
+    out.writeIntScalar(getMessageType());
+    out.writeRaw(this.encoded());
+    out.endList();
+    return Hash.hash(out.encoded());
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/payload/RoundChangePayload.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/payload/RoundChangePayload.java
new file mode 100644
index 00000000000..f40e0464c32
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/payload/RoundChangePayload.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.payload;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.qbft.messagedata.QbftV1;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+
+import java.util.Objects;
+import java.util.Optional;
+
+import com.google.common.base.MoreObjects;
+
+/** The Round change payload. */
+public class RoundChangePayload extends QbftPayload {
+  private static final int TYPE = QbftV1.ROUND_CHANGE;
+  private final ConsensusRoundIdentifier roundChangeIdentifier;
+  private final Optional<PreparedRoundMetadata> preparedRoundMetadata;
+
+  /**
+   * Instantiates a new Round change payload.
+   *
+   * @param roundChangeIdentifier the round change identifier
+   * @param preparedRoundMetadata the prepared round metadata
+   */
+  public RoundChangePayload(
+      final ConsensusRoundIdentifier roundChangeIdentifier,
+      final Optional<PreparedRoundMetadata> preparedRoundMetadata) {
+    this.roundChangeIdentifier = roundChangeIdentifier;
+    this.preparedRoundMetadata = preparedRoundMetadata;
+  }
+
+  @Override
+  public ConsensusRoundIdentifier getRoundIdentifier() {
+    return roundChangeIdentifier;
+  }
+
+  /**
+   * Gets prepared round metadata.
+   *
+   * @return the prepared round metadata
+   */
+  public Optional<PreparedRoundMetadata> getPreparedRoundMetadata() {
+    return preparedRoundMetadata;
+  }
+
+  @Override
+  public void writeTo(final RLPOutput rlpOutput) {
+    // RLP encode of the message data content (round identifier and prepared certificate)
+    rlpOutput.startList();
+    writeConsensusRound(rlpOutput);
+
+    rlpOutput.startList();
+    preparedRoundMetadata.ifPresent(prm -> prm.writeTo(rlpOutput));
+    rlpOutput.endList();
+
+    rlpOutput.endList();
+  }
+
+  /**
+   * Read from rlp input and return round change payload.
+   *
+   * @param rlpInput the rlp input
+   * @return the round change payload
+   */
+  public static RoundChangePayload readFrom(final RLPInput rlpInput) {
+    rlpInput.enterList();
+    final ConsensusRoundIdentifier roundIdentifier = readConsensusRound(rlpInput);
+    final Optional<PreparedRoundMetadata> preparedRoundMetadata;
+
+    rlpInput.enterList();
+    if (rlpInput.isEndOfCurrentList()) {
+      preparedRoundMetadata = Optional.empty();
+    } else {
+      preparedRoundMetadata = Optional.of(PreparedRoundMetadata.readFrom(rlpInput));
+    }
+    rlpInput.leaveList();
+
+    rlpInput.leaveList();
+    return new RoundChangePayload(roundIdentifier, preparedRoundMetadata);
+  }
+
+  @Override
+  public int getMessageType() {
+    return TYPE;
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    RoundChangePayload that = (RoundChangePayload) o;
+    return Objects.equals(roundChangeIdentifier, that.roundChangeIdentifier)
+        && Objects.equals(preparedRoundMetadata, that.preparedRoundMetadata);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(roundChangeIdentifier, preparedRoundMetadata);
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("roundChangeIdentifier", roundChangeIdentifier)
+        .add("preparedRoundMetadata", preparedRoundMetadata)
+        .toString();
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/DefaultKeyStoreWrapperProvider.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/DefaultKeyStoreWrapperProvider.java
new file mode 100644
index 00000000000..b40edc09526
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/DefaultKeyStoreWrapperProvider.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ *  the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.qbft.pki;
+
+import org.hyperledger.besu.pki.keystore.HardwareKeyStoreWrapper;
+import org.hyperledger.besu.pki.keystore.KeyStoreWrapper;
+import org.hyperledger.besu.pki.keystore.SoftwareKeyStoreWrapper;
+
+import java.nio.file.Path;
+
+import com.google.common.annotations.VisibleForTesting;
+
+/** The Default key store wrapper provider. */
+public class DefaultKeyStoreWrapperProvider implements KeyStoreWrapperProvider {
+
+  private final HardwareKeyStoreWrapperProvider hardwareKeyStoreWrapperProvider;
+  private final SoftwareKeyStoreWrapperProvider softwareKeyStoreWrapperProvider;
+
+  /** Instantiates a new Default key store wrapper provider. */
+  DefaultKeyStoreWrapperProvider() {
+    this(HardwareKeyStoreWrapper::new, SoftwareKeyStoreWrapper::new);
+  }
+
+  /**
+   * Instantiates a new Default key store wrapper provider.
+   *
+   * @param hardwareKeyStoreWrapperProvider the hardware key store wrapper provider
+   * @param softwareKeyStoreWrapperProvider the software key store wrapper provider
+   */
+  @VisibleForTesting
+  DefaultKeyStoreWrapperProvider(
+      final HardwareKeyStoreWrapperProvider hardwareKeyStoreWrapperProvider,
+      final SoftwareKeyStoreWrapperProvider softwareKeyStoreWrapperProvider) {
+    this.hardwareKeyStoreWrapperProvider = hardwareKeyStoreWrapperProvider;
+    this.softwareKeyStoreWrapperProvider = softwareKeyStoreWrapperProvider;
+  }
+
+  @Override
+  public KeyStoreWrapper apply(
+      final String keyStoreType,
+      final Path keyStorePath,
+      final String keyStorePassword,
+      final Path crl) {
+    if (KeyStoreWrapper.KEYSTORE_TYPE_PKCS11.equalsIgnoreCase(keyStoreType)) {
+      return hardwareKeyStoreWrapperProvider.get(keyStorePassword, keyStorePath, crl);
+    } else {
+      return softwareKeyStoreWrapperProvider.get(keyStoreType, keyStorePath, keyStorePassword, crl);
+    }
+  }
+
+  /** The interface Hardware key store wrapper provider. */
+  interface HardwareKeyStoreWrapperProvider {
+
+    /**
+     * Get hardware key store wrapper.
+     *
+     * @param keystorePassword the keystore password
+     * @param config the config
+     * @param crlLocation the crl location
+     * @return the hardware key store wrapper
+     */
+    HardwareKeyStoreWrapper get(
+        final String keystorePassword, final Path config, final Path crlLocation);
+  }
+
+  /** The interface Software key store wrapper provider. */
+  interface SoftwareKeyStoreWrapperProvider {
+
+    /**
+     * Get software key store wrapper.
+     *
+     * @param keystoreType the keystore type
+     * @param keystoreLocation the keystore location
+     * @param keystorePassword the keystore password
+     * @param crlLocation the crl location
+     * @return the software key store wrapper
+     */
+    SoftwareKeyStoreWrapper get(
+        final String keystoreType,
+        final Path keystoreLocation,
+        final String keystorePassword,
+        final Path crlLocation);
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/KeyStoreWrapperProvider.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/KeyStoreWrapperProvider.java
new file mode 100644
index 00000000000..9fd7adde0c5
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/KeyStoreWrapperProvider.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.qbft.pki;
+
+import org.hyperledger.besu.pki.keystore.KeyStoreWrapper;
+
+import java.nio.file.Path;
+
+@FunctionalInterface
+interface KeyStoreWrapperProvider {
+
+  KeyStoreWrapper apply(
+      final String keyStoreType,
+      final Path keyStorePath,
+      final String keyStorePassword,
+      final Path crl);
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/PkiBlockCreationConfiguration.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/PkiBlockCreationConfiguration.java
new file mode 100644
index 00000000000..399886119bf
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/PkiBlockCreationConfiguration.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.qbft.pki;
+
+import org.hyperledger.besu.pki.keystore.KeyStoreWrapper;
+
+/** The Pki block creation configuration. */
+public class PkiBlockCreationConfiguration {
+
+  private final KeyStoreWrapper keyStore;
+  private final KeyStoreWrapper trustStore;
+  private final String certificateAlias;
+
+  /**
+   * Instantiates a new Pki block creation configuration.
+   *
+   * @param keyStore the key store
+   * @param trustStore the trust store
+   * @param certificateAlias the certificate alias
+   */
+  public PkiBlockCreationConfiguration(
+      final KeyStoreWrapper keyStore,
+      final KeyStoreWrapper trustStore,
+      final String certificateAlias) {
+    this.keyStore = keyStore;
+    this.trustStore = trustStore;
+    this.certificateAlias = certificateAlias;
+  }
+
+  /**
+   * Gets key store.
+   *
+   * @return the key store
+   */
+  public KeyStoreWrapper getKeyStore() {
+    return keyStore;
+  }
+
+  /**
+   * Gets trust store.
+   *
+   * @return the trust store
+   */
+  public KeyStoreWrapper getTrustStore() {
+    return trustStore;
+  }
+
+  /**
+   * Gets certificate alias.
+   *
+   * @return the certificate alias
+   */
+  public String getCertificateAlias() {
+    return certificateAlias;
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/PkiBlockCreationConfigurationProvider.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/PkiBlockCreationConfigurationProvider.java
new file mode 100644
index 00000000000..8dfb6048a1a
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/PkiBlockCreationConfigurationProvider.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.qbft.pki;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import org.hyperledger.besu.pki.config.PkiKeyStoreConfiguration;
+import org.hyperledger.besu.pki.keystore.KeyStoreWrapper;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Pki block creation configuration provider. */
+public class PkiBlockCreationConfigurationProvider {
+
+  private static final Logger LOG =
+      LoggerFactory.getLogger(PkiBlockCreationConfigurationProvider.class);
+
+  private final KeyStoreWrapperProvider keyStoreWrapperProvider;
+
+  /** Instantiates a new Pki block creation configuration provider. */
+  public PkiBlockCreationConfigurationProvider() {
+    this(new DefaultKeyStoreWrapperProvider());
+  }
+
+  /**
+   * Instantiates a new Pki block creation configuration provider.
+   *
+   * @param keyStoreWrapperProvider the key store wrapper provider
+   */
+  @VisibleForTesting
+  PkiBlockCreationConfigurationProvider(final KeyStoreWrapperProvider keyStoreWrapperProvider) {
+    this.keyStoreWrapperProvider = checkNotNull(keyStoreWrapperProvider);
+  }
+
+  /**
+   * Load pki block creation configuration.
+   *
+   * @param pkiKeyStoreConfiguration the pki key store configuration
+   * @return the pki block creation configuration
+   */
+  public PkiBlockCreationConfiguration load(
+      final PkiKeyStoreConfiguration pkiKeyStoreConfiguration) {
+    KeyStoreWrapper keyStore;
+    try {
+      keyStore =
+          keyStoreWrapperProvider.apply(
+              pkiKeyStoreConfiguration.getKeyStoreType(),
+              pkiKeyStoreConfiguration.getKeyStorePath(),
+              pkiKeyStoreConfiguration.getKeyStorePassword(),
+              null);
+      LOG.info("Loaded PKI Block Creation KeyStore {}", pkiKeyStoreConfiguration.getKeyStorePath());
+    } catch (Exception e) {
+      throw new IllegalStateException("Error loading PKI Block Creation KeyStore", e);
+    }
+
+    KeyStoreWrapper trustStore;
+    try {
+      trustStore =
+          keyStoreWrapperProvider.apply(
+              pkiKeyStoreConfiguration.getTrustStoreType(),
+              pkiKeyStoreConfiguration.getTrustStorePath(),
+              pkiKeyStoreConfiguration.getTrustStorePassword(),
+              pkiKeyStoreConfiguration.getCrlFilePath().orElse(null));
+      LOG.info(
+          "Loaded PKI Block Creation TrustStore {}", pkiKeyStoreConfiguration.getTrustStorePath());
+    } catch (Exception e) {
+      throw new IllegalStateException("Error loading PKI Block Creation TrustStore", e);
+    }
+
+    return new PkiBlockCreationConfiguration(
+        keyStore, trustStore, pkiKeyStoreConfiguration.getCertificateAlias());
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/PkiQbftBlockHashing.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/PkiQbftBlockHashing.java
new file mode 100644
index 00000000000..f3640d4d508
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/PkiQbftBlockHashing.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.qbft.pki;
+
+import org.hyperledger.besu.consensus.common.bft.BftBlockHashing;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+/** The Pki qbft block hashing. */
+public class PkiQbftBlockHashing {
+
+  private final PkiQbftExtraDataCodec extraDataCodec;
+
+  /**
+   * Instantiates a new Pki qbft block hashing.
+   *
+   * @param extraDataCodec the extra data codec
+   */
+  public PkiQbftBlockHashing(final PkiQbftExtraDataCodec extraDataCodec) {
+    this.extraDataCodec = extraDataCodec;
+  }
+
+  /**
+   * Calculate hash of bft block for cms signature.
+   *
+   * @param header the header
+   * @return the hash
+   */
+  public Hash calculateHashOfBftBlockForCmsSignature(final BlockHeader header) {
+    final BftExtraData bftExtraData = extraDataCodec.decode(header);
+    return Hash.hash(
+        BftBlockHashing.serializeHeader(
+            header, () -> extraDataCodec.encodeWithoutCms(bftExtraData), extraDataCodec));
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/PkiQbftBlockHeaderFunctions.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/PkiQbftBlockHeaderFunctions.java
new file mode 100644
index 00000000000..9dbc1f032b5
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/PkiQbftBlockHeaderFunctions.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.qbft.pki;
+
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
+
+/** The Pki qbft block header functions. */
+public class PkiQbftBlockHeaderFunctions {
+
+  /**
+   * Create block header functions for cms signature.
+   *
+   * @param bftExtraDataCodec the bft extra data codec
+   * @return the block header functions
+   */
+  public static BlockHeaderFunctions forCmsSignature(
+      final PkiQbftExtraDataCodec bftExtraDataCodec) {
+    return new BftBlockHeaderFunctions(
+        h -> new PkiQbftBlockHashing(bftExtraDataCodec).calculateHashOfBftBlockForCmsSignature(h),
+        bftExtraDataCodec);
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/PkiQbftExtraData.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/PkiQbftExtraData.java
new file mode 100644
index 00000000000..9de2247c2f7
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/PkiQbftExtraData.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.qbft.pki;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.Vote;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.datatypes.Address;
+
+import java.util.Collection;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Pki Qbft extra data. */
+public class PkiQbftExtraData extends BftExtraData {
+
+  private final Bytes cms;
+
+  /**
+   * Instantiates a new Pki Qbft extra data.
+   *
+   * @param vanityData the vanity data
+   * @param seals the seals
+   * @param vote the vote
+   * @param round the round
+   * @param validators the validators
+   * @param cms the cms
+   */
+  public PkiQbftExtraData(
+      final Bytes vanityData,
+      final Collection<SECPSignature> seals,
+      final Optional<Vote> vote,
+      final int round,
+      final Collection<Address> validators,
+      final Bytes cms) {
+    super(vanityData, seals, vote, round, validators);
+    this.cms = cms;
+  }
+
+  /**
+   * Instantiates a new Pki Qbft extra data.
+   *
+   * @param bftExtraData the bft extra data
+   * @param cms the cms
+   */
+  public PkiQbftExtraData(final BftExtraData bftExtraData, final Bytes cms) {
+    this(
+        bftExtraData.getVanityData(),
+        bftExtraData.getSeals(),
+        bftExtraData.getVote(),
+        bftExtraData.getRound(),
+        bftExtraData.getValidators(),
+        cms);
+  }
+
+  /**
+   * Gets cms.
+   *
+   * @return the cms
+   */
+  public Bytes getCms() {
+    return cms;
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/PkiQbftExtraDataCodec.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/PkiQbftExtraDataCodec.java
new file mode 100644
index 00000000000..1493f1d0a2a
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/pki/PkiQbftExtraDataCodec.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ *  the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.pki;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/**
+ * The PkiQbftExtraData encoding format is different from the "regular" QbftExtraData encoding. We
+ * have an extra bytes element in the end of the list.
+ */
+public class PkiQbftExtraDataCodec extends QbftExtraDataCodec {
+
+  /** The constant QBFT_EXTRA_DATA_LIST_SIZE. */
+  public static final int QBFT_EXTRA_DATA_LIST_SIZE = 5;
+
+  @Override
+  public BftExtraData decodeRaw(final Bytes input) {
+    if (input.isEmpty()) {
+      throw new IllegalArgumentException("Invalid Bytes supplied - Bft Extra Data required.");
+    }
+
+    final BftExtraData bftExtraData = super.decodeRaw(input);
+
+    final RLPInput rlpInput = new BytesValueRLPInput(input, false);
+
+    final Bytes cms;
+    final List<RLPInput> elements = rlpInput.readList(RLPInput::readAsRlp);
+    if (elements.size() > QBFT_EXTRA_DATA_LIST_SIZE) {
+      final RLPInput cmsElement = elements.get(elements.size() - 1);
+      cms = cmsElement.readBytes();
+    } else {
+      cms = Bytes.EMPTY;
+    }
+
+    return new PkiQbftExtraData(bftExtraData, cms);
+  }
+
+  @Override
+  protected Bytes encode(final BftExtraData bftExtraData, final EncodingType encodingType) {
+    return encode(bftExtraData, encodingType, true);
+  }
+
+  private Bytes encode(
+      final BftExtraData bftExtraData, final EncodingType encodingType, final boolean includeCms) {
+    final Bytes encoded = super.encode(bftExtraData, encodingType);
+    if (!(bftExtraData instanceof PkiQbftExtraData) || !includeCms) {
+      return encoded;
+    }
+
+    final BytesValueRLPOutput rlpOutput = new BytesValueRLPOutput();
+    rlpOutput.startList();
+    // Read through extraData RLP list elements and write them to the new RLP output
+    new BytesValueRLPInput(encoded, false)
+        .readList(RLPInput::readAsRlp).stream()
+            .map(RLPInput::raw)
+            .forEach(rlpOutput::writeRLPBytes);
+    rlpOutput.writeBytes(((PkiQbftExtraData) bftExtraData).getCms());
+    rlpOutput.endList();
+
+    return rlpOutput.encoded();
+  }
+
+  /**
+   * Encode without cms.
+   *
+   * @param bftExtraData the bft extra data
+   * @return the bytes
+   */
+  public Bytes encodeWithoutCms(final BftExtraData bftExtraData) {
+    return encode(bftExtraData, EncodingType.ALL, false);
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/protocol/Istanbul100SubProtocol.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/protocol/Istanbul100SubProtocol.java
new file mode 100644
index 00000000000..bbf242e29ea
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/protocol/Istanbul100SubProtocol.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.protocol;
+
+import org.hyperledger.besu.consensus.qbft.messagedata.QbftV1;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol;
+
+/** The Istanbul100 sub protocol. */
+public class Istanbul100SubProtocol implements SubProtocol {
+
+  /** The constant NAME. */
+  public static String NAME = "istanbul";
+  /** The constant ISTANBUL_100. */
+  public static final Capability ISTANBUL_100 = Capability.create(NAME, 100);
+
+  private static final Istanbul100SubProtocol INSTANCE = new Istanbul100SubProtocol();
+
+  /**
+   * Get istanbul100 sub protocol.
+   *
+   * @return the istanbul100 sub protocol
+   */
+  public static Istanbul100SubProtocol get() {
+    return INSTANCE;
+  }
+
+  @Override
+  public String getName() {
+    return NAME;
+  }
+
+  @Override
+  public int messageSpace(final int protocolVersion) {
+    return QbftV1.MESSAGE_SPACE;
+  }
+
+  @Override
+  public boolean isValidMessageCode(final int protocolVersion, final int code) {
+    switch (code) {
+      case QbftV1.PROPOSAL:
+      case QbftV1.PREPARE:
+      case QbftV1.COMMIT:
+      case QbftV1.ROUND_CHANGE:
+        return true;
+
+      default:
+        return false;
+    }
+  }
+
+  @Override
+  public String messageName(final int protocolVersion, final int code) {
+    switch (code) {
+      case QbftV1.PROPOSAL:
+        return "Proposal";
+      case QbftV1.PREPARE:
+        return "Prepare";
+      case QbftV1.COMMIT:
+        return "Commit";
+      case QbftV1.ROUND_CHANGE:
+        return "RoundChange";
+      default:
+        return INVALID_MESSAGE_NAME;
+    }
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/BaseQbftBlockHeightManager.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/BaseQbftBlockHeightManager.java
new file mode 100644
index 00000000000..6f1cca0d350
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/BaseQbftBlockHeightManager.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.statemachine;
+
+import org.hyperledger.besu.consensus.common.bft.statemachine.BaseBlockHeightManager;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Commit;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Proposal;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.RoundChange;
+
+/** The interface Base qbft block height manager. */
+public interface BaseQbftBlockHeightManager extends BaseBlockHeightManager {
+
+  /**
+   * Handle proposal payload.
+   *
+   * @param proposal the proposal
+   */
+  void handleProposalPayload(Proposal proposal);
+
+  /**
+   * Handle prepare payload.
+   *
+   * @param prepare the Prepare payload
+   */
+  void handlePreparePayload(Prepare prepare);
+
+  /**
+   * Handle commit payload.
+   *
+   * @param commit the commit payload
+   */
+  void handleCommitPayload(Commit commit);
+
+  /**
+   * Handle round change payload.
+   *
+   * @param roundChange the round change payload
+   */
+  void handleRoundChangePayload(RoundChange roundChange);
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/CreateBlockForProposalBehaviour.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/CreateBlockForProposalBehaviour.java
new file mode 100644
index 00000000000..806c3bcdfd7
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/CreateBlockForProposalBehaviour.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.qbft.statemachine;
+
+import org.hyperledger.besu.ethereum.core.Block;
+
+/** The functional interface Create block for proposal behaviour. */
+@FunctionalInterface
+public interface CreateBlockForProposalBehaviour {
+
+  /**
+   * Create block.
+   *
+   * @param headerTimeStampSeconds the header time stamp seconds
+   * @return the block
+   */
+  Block create(long headerTimeStampSeconds);
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/NoOpBlockHeightManager.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/NoOpBlockHeightManager.java
new file mode 100644
index 00000000000..ae5bde0e9a2
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/NoOpBlockHeightManager.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.statemachine;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.events.RoundExpiry;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Commit;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Proposal;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.RoundChange;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+/** The type NoOp block height manager. */
+public class NoOpBlockHeightManager implements BaseQbftBlockHeightManager {
+
+  private final BlockHeader parentHeader;
+
+  /**
+   * Instantiates a new NoOp block height manager.
+   *
+   * @param parentHeader the parent header
+   */
+  public NoOpBlockHeightManager(final BlockHeader parentHeader) {
+    this.parentHeader = parentHeader;
+  }
+
+  @Override
+  public void handleBlockTimerExpiry(final ConsensusRoundIdentifier roundIdentifier) {}
+
+  @Override
+  public void roundExpired(final RoundExpiry expire) {}
+
+  @Override
+  public void handleProposalPayload(final Proposal proposal) {}
+
+  @Override
+  public void handlePreparePayload(final Prepare prepare) {}
+
+  @Override
+  public void handleCommitPayload(final Commit commit) {}
+
+  @Override
+  public void handleRoundChangePayload(final RoundChange roundChange) {}
+
+  @Override
+  public long getChainHeight() {
+    return parentHeader.getNumber() + 1;
+  }
+
+  @Override
+  public BlockHeader getParentBlockHeader() {
+    return parentHeader;
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/PreparedCertificate.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/PreparedCertificate.java
new file mode 100644
index 00000000000..3b5a8df848a
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/PreparedCertificate.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.statemachine;
+
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.payload.PreparePayload;
+import org.hyperledger.besu.ethereum.core.Block;
+
+import java.util.List;
+
+/** The Prepared certificate. */
+public class PreparedCertificate {
+
+  private final Block block;
+  private final List<SignedData<PreparePayload>> prepares;
+  private final int round;
+
+  /**
+   * Instantiates a new Prepared certificate.
+   *
+   * @param block the block
+   * @param prepares the prepares
+   * @param round the round
+   */
+  public PreparedCertificate(
+      final Block block, final List<SignedData<PreparePayload>> prepares, final int round) {
+    this.block = block;
+    this.prepares = prepares;
+    this.round = round;
+  }
+
+  /**
+   * Gets round.
+   *
+   * @return the round
+   */
+  public int getRound() {
+    return round;
+  }
+
+  /**
+   * Gets block.
+   *
+   * @return the block
+   */
+  public Block getBlock() {
+    return block;
+  }
+
+  /**
+   * Gets list of Prepare payload messages.
+   *
+   * @return the prepares
+   */
+  public List<SignedData<PreparePayload>> getPrepares() {
+    return prepares;
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftBlockHeightManager.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftBlockHeightManager.java
new file mode 100644
index 00000000000..45e97ed6795
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftBlockHeightManager.java
@@ -0,0 +1,327 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.statemachine;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.events.RoundExpiry;
+import org.hyperledger.besu.consensus.common.bft.messagewrappers.BftMessage;
+import org.hyperledger.besu.consensus.common.bft.payload.Payload;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftFinalState;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Commit;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Proposal;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.RoundChange;
+import org.hyperledger.besu.consensus.qbft.network.QbftMessageTransmitter;
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.qbft.validation.FutureRoundProposalMessageValidator;
+import org.hyperledger.besu.consensus.qbft.validation.MessageValidatorFactory;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.plugin.services.securitymodule.SecurityModuleException;
+
+import java.time.Clock;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import com.google.common.collect.Maps;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Responsible for starting/clearing Consensus rounds at a given block height. One of these is
+ * created when a new block is imported to the chain. It immediately then creates a Round-0 object,
+ * and sends a Proposal message. If the round times out prior to importing a block, this class is
+ * responsible for creating a RoundChange message and transmitting it.
+ */
+public class QbftBlockHeightManager implements BaseQbftBlockHeightManager {
+
+  private static final Logger LOG = LoggerFactory.getLogger(QbftBlockHeightManager.class);
+
+  private final QbftRoundFactory roundFactory;
+  private final RoundChangeManager roundChangeManager;
+  private final BlockHeader parentHeader;
+  private final QbftMessageTransmitter transmitter;
+  private final MessageFactory messageFactory;
+  private final Map<Integer, RoundState> futureRoundStateBuffer = Maps.newHashMap();
+  private final FutureRoundProposalMessageValidator futureRoundProposalMessageValidator;
+  private final Clock clock;
+  private final Function<ConsensusRoundIdentifier, RoundState> roundStateCreator;
+  private final BftFinalState finalState;
+
+  private Optional<PreparedCertificate> latestPreparedCertificate = Optional.empty();
+  private Optional<QbftRound> currentRound = Optional.empty();
+
+  /**
+   * Instantiates a new Qbft block height manager.
+   *
+   * @param parentHeader the parent header
+   * @param finalState the final state
+   * @param roundChangeManager the round change manager
+   * @param qbftRoundFactory the qbft round factory
+   * @param clock the clock
+   * @param messageValidatorFactory the message validator factory
+   * @param messageFactory the message factory
+   */
+  public QbftBlockHeightManager(
+      final BlockHeader parentHeader,
+      final BftFinalState finalState,
+      final RoundChangeManager roundChangeManager,
+      final QbftRoundFactory qbftRoundFactory,
+      final Clock clock,
+      final MessageValidatorFactory messageValidatorFactory,
+      final MessageFactory messageFactory) {
+    this.parentHeader = parentHeader;
+    this.roundFactory = qbftRoundFactory;
+    this.transmitter =
+        new QbftMessageTransmitter(messageFactory, finalState.getValidatorMulticaster());
+    this.messageFactory = messageFactory;
+    this.clock = clock;
+    this.roundChangeManager = roundChangeManager;
+    this.finalState = finalState;
+
+    futureRoundProposalMessageValidator =
+        messageValidatorFactory.createFutureRoundProposalMessageValidator(
+            getChainHeight(), parentHeader);
+
+    roundStateCreator =
+        (roundIdentifier) ->
+            new RoundState(
+                roundIdentifier,
+                finalState.getQuorum(),
+                messageValidatorFactory.createMessageValidator(roundIdentifier, parentHeader));
+
+    final long nextBlockHeight = parentHeader.getNumber() + 1;
+    final ConsensusRoundIdentifier roundIdentifier =
+        new ConsensusRoundIdentifier(nextBlockHeight, 0);
+
+    finalState.getBlockTimer().startTimer(roundIdentifier, parentHeader);
+  }
+
+  @Override
+  public void handleBlockTimerExpiry(final ConsensusRoundIdentifier roundIdentifier) {
+    if (currentRound.isPresent()) {
+      // It is possible for the block timer to take longer than it should due to the precision of
+      // the timer in Java and the OS. This means occasionally the proposal can arrive before the
+      // block timer expiry and hence the round has already been set. There is no negative impact
+      // on the protocol in this case.
+      return;
+    }
+
+    startNewRound(0);
+
+    final QbftRound qbftRound = currentRound.get();
+    // mining will be checked against round 0 as the current round is initialised to 0 above
+    final boolean isProposer =
+        finalState.isLocalNodeProposerForRound(qbftRound.getRoundIdentifier());
+
+    if (isProposer) {
+      if (roundIdentifier.equals(qbftRound.getRoundIdentifier())) {
+        final long headerTimeStampSeconds = Math.round(clock.millis() / 1000D);
+        qbftRound.createAndSendProposalMessage(headerTimeStampSeconds);
+      } else {
+        LOG.trace(
+            "Block timer expired for a round ({}) other than current ({})",
+            roundIdentifier,
+            qbftRound.getRoundIdentifier());
+      }
+    }
+  }
+
+  @Override
+  public void roundExpired(final RoundExpiry expire) {
+    if (currentRound.isEmpty()) {
+      LOG.error(
+          "Received Round timer expiry before round is created timerRound={}", expire.getView());
+      return;
+    }
+
+    QbftRound qbftRound = currentRound.get();
+    if (!expire.getView().equals(qbftRound.getRoundIdentifier())) {
+      LOG.trace(
+          "Ignoring Round timer expired which does not match current round. round={}, timerRound={}",
+          qbftRound.getRoundIdentifier(),
+          expire.getView());
+      return;
+    }
+
+    LOG.debug(
+        "Round has expired, creating PreparedCertificate and notifying peers. round={}",
+        qbftRound.getRoundIdentifier());
+    final Optional<PreparedCertificate> preparedCertificate =
+        qbftRound.constructPreparedCertificate();
+
+    if (preparedCertificate.isPresent()) {
+      latestPreparedCertificate = preparedCertificate;
+    }
+
+    startNewRound(qbftRound.getRoundIdentifier().getRoundNumber() + 1);
+    qbftRound = currentRound.get();
+
+    try {
+      final RoundChange localRoundChange =
+          messageFactory.createRoundChange(
+              qbftRound.getRoundIdentifier(), latestPreparedCertificate);
+
+      // Its possible the locally created RoundChange triggers the transmission of a NewRound
+      // message - so it must be handled accordingly.
+      handleRoundChangePayload(localRoundChange);
+    } catch (final SecurityModuleException e) {
+      LOG.warn("Failed to create signed RoundChange message.", e);
+    }
+
+    transmitter.multicastRoundChange(qbftRound.getRoundIdentifier(), latestPreparedCertificate);
+  }
+
+  @Override
+  public void handleProposalPayload(final Proposal proposal) {
+    LOG.trace("Received a Proposal Payload.");
+    final MessageAge messageAge =
+        determineAgeOfPayload(proposal.getRoundIdentifier().getRoundNumber());
+
+    if (messageAge == MessageAge.PRIOR_ROUND) {
+      LOG.trace("Received Proposal Payload for a prior round={}", proposal.getRoundIdentifier());
+    } else {
+      if (messageAge == MessageAge.FUTURE_ROUND) {
+        if (!futureRoundProposalMessageValidator.validateProposalMessage(proposal)) {
+          LOG.info("Received future Proposal which is illegal, no round change triggered.");
+          return;
+        }
+        startNewRound(proposal.getRoundIdentifier().getRoundNumber());
+      }
+      currentRound.ifPresent(r -> r.handleProposalMessage(proposal));
+    }
+  }
+
+  @Override
+  public void handlePreparePayload(final Prepare prepare) {
+    LOG.trace("Received a Prepare Payload.");
+    actionOrBufferMessage(
+        prepare,
+        currentRound.isPresent() ? currentRound.get()::handlePrepareMessage : (ignore) -> {},
+        RoundState::addPrepareMessage);
+  }
+
+  @Override
+  public void handleCommitPayload(final Commit commit) {
+    LOG.trace("Received a Commit Payload.");
+    actionOrBufferMessage(
+        commit,
+        currentRound.isPresent() ? currentRound.get()::handleCommitMessage : (ignore) -> {},
+        RoundState::addCommitMessage);
+  }
+
+  private <P extends Payload, M extends BftMessage<P>> void actionOrBufferMessage(
+      final M qbftMessage,
+      final Consumer<M> inRoundHandler,
+      final BiConsumer<RoundState, M> buffer) {
+    final MessageAge messageAge =
+        determineAgeOfPayload(qbftMessage.getRoundIdentifier().getRoundNumber());
+    if (messageAge == MessageAge.CURRENT_ROUND) {
+      inRoundHandler.accept(qbftMessage);
+    } else if (messageAge == MessageAge.FUTURE_ROUND) {
+      final ConsensusRoundIdentifier msgRoundId = qbftMessage.getRoundIdentifier();
+      final RoundState roundstate =
+          futureRoundStateBuffer.computeIfAbsent(
+              msgRoundId.getRoundNumber(), k -> roundStateCreator.apply(msgRoundId));
+      buffer.accept(roundstate, qbftMessage);
+    }
+  }
+
+  @Override
+  public void handleRoundChangePayload(final RoundChange message) {
+    final ConsensusRoundIdentifier targetRound = message.getRoundIdentifier();
+    LOG.trace("Received a RoundChange Payload for {}", targetRound);
+
+    final MessageAge messageAge =
+        determineAgeOfPayload(message.getRoundIdentifier().getRoundNumber());
+    if (messageAge == MessageAge.PRIOR_ROUND) {
+      LOG.trace("Received RoundChange Payload for a prior round. targetRound={}", targetRound);
+      return;
+    }
+
+    final Optional<Collection<RoundChange>> result =
+        roundChangeManager.appendRoundChangeMessage(message);
+    if (result.isPresent()) {
+      LOG.debug(
+          "Received sufficient RoundChange messages to change round to targetRound={}",
+          targetRound);
+      if (messageAge == MessageAge.FUTURE_ROUND) {
+        startNewRound(targetRound.getRoundNumber());
+      }
+
+      final RoundChangeArtifacts roundChangeMetadata = RoundChangeArtifacts.create(result.get());
+
+      if (finalState.isLocalNodeProposerForRound(targetRound)) {
+        if (currentRound.isEmpty()) {
+          startNewRound(0);
+        }
+        currentRound
+            .get()
+            .startRoundWith(roundChangeMetadata, TimeUnit.MILLISECONDS.toSeconds(clock.millis()));
+      }
+    }
+  }
+
+  private void startNewRound(final int roundNumber) {
+    LOG.debug("Starting new round {}", roundNumber);
+    // validate the current round
+    if (futureRoundStateBuffer.containsKey(roundNumber)) {
+      currentRound =
+          Optional.of(
+              roundFactory.createNewRoundWithState(
+                  parentHeader, futureRoundStateBuffer.get(roundNumber)));
+      futureRoundStateBuffer.keySet().removeIf(k -> k <= roundNumber);
+    } else {
+      currentRound = Optional.of(roundFactory.createNewRound(parentHeader, roundNumber));
+    }
+    // discard roundChange messages from the current and previous rounds
+    roundChangeManager.discardRoundsPriorTo(currentRound.get().getRoundIdentifier());
+  }
+
+  @Override
+  public long getChainHeight() {
+    return parentHeader.getNumber() + 1;
+  }
+
+  @Override
+  public BlockHeader getParentBlockHeader() {
+    return parentHeader;
+  }
+
+  private MessageAge determineAgeOfPayload(final int messageRoundNumber) {
+    final int currentRoundNumber =
+        currentRound.map(r -> r.getRoundIdentifier().getRoundNumber()).orElse(-1);
+    if (messageRoundNumber > currentRoundNumber) {
+      return MessageAge.FUTURE_ROUND;
+    } else if (messageRoundNumber == currentRoundNumber) {
+      return MessageAge.CURRENT_ROUND;
+    }
+    return MessageAge.PRIOR_ROUND;
+  }
+
+  /** The enum Message age. */
+  public enum MessageAge {
+    /** Prior round message age. */
+    PRIOR_ROUND,
+    /** Current round message age. */
+    CURRENT_ROUND,
+    /** Future round message age. */
+    FUTURE_ROUND
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftBlockHeightManagerFactory.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftBlockHeightManagerFactory.java
new file mode 100644
index 00000000000..d4b463e5261
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftBlockHeightManagerFactory.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.statemachine;
+
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftFinalState;
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.qbft.validation.MessageValidatorFactory;
+import org.hyperledger.besu.consensus.qbft.validator.ValidatorModeTransitionLogger;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+/** The Qbft block height manager factory. */
+public class QbftBlockHeightManagerFactory {
+
+  private final QbftRoundFactory roundFactory;
+  private final BftFinalState finalState;
+  private final MessageValidatorFactory messageValidatorFactory;
+  private final MessageFactory messageFactory;
+  private final ValidatorModeTransitionLogger validatorModeTransitionLogger;
+
+  /**
+   * Instantiates a new Qbft block height manager factory.
+   *
+   * @param finalState the final state
+   * @param roundFactory the round factory
+   * @param messageValidatorFactory the message validator factory
+   * @param messageFactory the message factory
+   * @param validatorModeTransitionLogger the validator mode transition logger
+   */
+  public QbftBlockHeightManagerFactory(
+      final BftFinalState finalState,
+      final QbftRoundFactory roundFactory,
+      final MessageValidatorFactory messageValidatorFactory,
+      final MessageFactory messageFactory,
+      final ValidatorModeTransitionLogger validatorModeTransitionLogger) {
+    this.roundFactory = roundFactory;
+    this.finalState = finalState;
+    this.messageValidatorFactory = messageValidatorFactory;
+    this.messageFactory = messageFactory;
+    this.validatorModeTransitionLogger = validatorModeTransitionLogger;
+  }
+
+  /**
+   * Create base qbft block height manager.
+   *
+   * @param parentHeader the parent header
+   * @return the base qbft block height manager
+   */
+  public BaseQbftBlockHeightManager create(final BlockHeader parentHeader) {
+    validatorModeTransitionLogger.logTransitionChange(parentHeader);
+
+    if (finalState.isLocalNodeValidator()) {
+      return createFullBlockHeightManager(parentHeader);
+    } else {
+      return createNoOpBlockHeightManager(parentHeader);
+    }
+  }
+
+  private BaseQbftBlockHeightManager createNoOpBlockHeightManager(final BlockHeader parentHeader) {
+    return new NoOpBlockHeightManager(parentHeader);
+  }
+
+  private BaseQbftBlockHeightManager createFullBlockHeightManager(final BlockHeader parentHeader) {
+    return new QbftBlockHeightManager(
+        parentHeader,
+        finalState,
+        new RoundChangeManager(
+            BftHelpers.calculateRequiredValidatorQuorum(finalState.getValidators().size()),
+            messageValidatorFactory.createRoundChangeMessageValidator(
+                parentHeader.getNumber() + 1L, parentHeader)),
+        roundFactory,
+        finalState.getClock(),
+        messageValidatorFactory,
+        messageFactory);
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftController.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftController.java
new file mode 100644
index 00000000000..c639a0f2057
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftController.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.statemachine;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.Gossiper;
+import org.hyperledger.besu.consensus.common.bft.MessageTracker;
+import org.hyperledger.besu.consensus.common.bft.SynchronizerUpdater;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BaseBftController;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BaseBlockHeightManager;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftFinalState;
+import org.hyperledger.besu.consensus.common.bft.statemachine.FutureMessageBuffer;
+import org.hyperledger.besu.consensus.qbft.messagedata.CommitMessageData;
+import org.hyperledger.besu.consensus.qbft.messagedata.PrepareMessageData;
+import org.hyperledger.besu.consensus.qbft.messagedata.ProposalMessageData;
+import org.hyperledger.besu.consensus.qbft.messagedata.QbftV1;
+import org.hyperledger.besu.consensus.qbft.messagedata.RoundChangeMessageData;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+
+/** The Qbft controller. */
+public class QbftController extends BaseBftController {
+
+  private BaseQbftBlockHeightManager currentHeightManager;
+  private final QbftBlockHeightManagerFactory qbftBlockHeightManagerFactory;
+  private final BftExtraDataCodec bftExtraDataCodec;
+
+  /**
+   * Instantiates a new Qbft controller.
+   *
+   * @param blockchain the blockchain
+   * @param bftFinalState the bft final state
+   * @param qbftBlockHeightManagerFactory the qbft block height manager factory
+   * @param gossiper the gossiper
+   * @param duplicateMessageTracker the duplicate message tracker
+   * @param futureMessageBuffer the future message buffer
+   * @param sychronizerUpdater the sychronizer updater
+   * @param bftExtraDataCodec the bft extra data codec
+   */
+  public QbftController(
+      final Blockchain blockchain,
+      final BftFinalState bftFinalState,
+      final QbftBlockHeightManagerFactory qbftBlockHeightManagerFactory,
+      final Gossiper gossiper,
+      final MessageTracker duplicateMessageTracker,
+      final FutureMessageBuffer futureMessageBuffer,
+      final SynchronizerUpdater sychronizerUpdater,
+      final BftExtraDataCodec bftExtraDataCodec) {
+
+    super(
+        blockchain,
+        bftFinalState,
+        gossiper,
+        duplicateMessageTracker,
+        futureMessageBuffer,
+        sychronizerUpdater);
+    this.qbftBlockHeightManagerFactory = qbftBlockHeightManagerFactory;
+    this.bftExtraDataCodec = bftExtraDataCodec;
+  }
+
+  @Override
+  protected void handleMessage(final Message message) {
+    final MessageData messageData = message.getData();
+
+    switch (messageData.getCode()) {
+      case QbftV1.PROPOSAL:
+        consumeMessage(
+            message,
+            ProposalMessageData.fromMessageData(messageData).decode(bftExtraDataCodec),
+            currentHeightManager::handleProposalPayload);
+        break;
+
+      case QbftV1.PREPARE:
+        consumeMessage(
+            message,
+            PrepareMessageData.fromMessageData(messageData).decode(),
+            currentHeightManager::handlePreparePayload);
+        break;
+
+      case QbftV1.COMMIT:
+        consumeMessage(
+            message,
+            CommitMessageData.fromMessageData(messageData).decode(),
+            currentHeightManager::handleCommitPayload);
+        break;
+
+      case QbftV1.ROUND_CHANGE:
+        consumeMessage(
+            message,
+            RoundChangeMessageData.fromMessageData(messageData).decode(bftExtraDataCodec),
+            currentHeightManager::handleRoundChangePayload);
+        break;
+
+      default:
+        throw new IllegalArgumentException(
+            String.format(
+                "Received message with messageCode=%d does not conform to any recognised QBFT message structure",
+                message.getData().getCode()));
+    }
+  }
+
+  @Override
+  protected void createNewHeightManager(final BlockHeader parentHeader) {
+    currentHeightManager = qbftBlockHeightManagerFactory.create(parentHeader);
+  }
+
+  @Override
+  protected BaseBlockHeightManager getCurrentHeightManager() {
+    return currentHeightManager;
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftRound.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftRound.java
new file mode 100644
index 00000000000..c31ee8be7d6
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftRound.java
@@ -0,0 +1,380 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.statemachine;
+
+import static java.util.Collections.emptyList;
+
+import org.hyperledger.besu.consensus.common.bft.BftBlockHashing;
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftContext;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.RoundTimer;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Commit;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Proposal;
+import org.hyperledger.besu.consensus.qbft.network.QbftMessageTransmitter;
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.qbft.payload.PreparePayload;
+import org.hyperledger.besu.consensus.qbft.payload.RoundChangePayload;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.blockcreation.BlockCreator;
+import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockImporter;
+import org.hyperledger.besu.ethereum.mainnet.BlockImportResult;
+import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
+import org.hyperledger.besu.plugin.services.securitymodule.SecurityModuleException;
+import org.hyperledger.besu.util.Subscribers;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Qbft round. */
+public class QbftRound {
+
+  private static final Logger LOG = LoggerFactory.getLogger(QbftRound.class);
+
+  private final Subscribers<MinedBlockObserver> observers;
+  /** The Round state. */
+  protected final RoundState roundState;
+  /** The Block creator. */
+  protected final BlockCreator blockCreator;
+  /** The Protocol context. */
+  protected final ProtocolContext protocolContext;
+
+  private final BlockImporter blockImporter;
+  private final NodeKey nodeKey;
+  private final MessageFactory messageFactory; // used only to create stored local msgs
+  private final QbftMessageTransmitter transmitter;
+  /** The Bft extra data codec. */
+  protected final BftExtraDataCodec bftExtraDataCodec;
+
+  /**
+   * Instantiates a new Qbft round.
+   *
+   * @param roundState the round state
+   * @param blockCreator the block creator
+   * @param protocolContext the protocol context
+   * @param blockImporter the block importer
+   * @param observers the observers
+   * @param nodeKey the node key
+   * @param messageFactory the message factory
+   * @param transmitter the transmitter
+   * @param roundTimer the round timer
+   * @param bftExtraDataCodec the bft extra data codec
+   */
+  public QbftRound(
+      final RoundState roundState,
+      final BlockCreator blockCreator,
+      final ProtocolContext protocolContext,
+      final BlockImporter blockImporter,
+      final Subscribers<MinedBlockObserver> observers,
+      final NodeKey nodeKey,
+      final MessageFactory messageFactory,
+      final QbftMessageTransmitter transmitter,
+      final RoundTimer roundTimer,
+      final BftExtraDataCodec bftExtraDataCodec) {
+    this.roundState = roundState;
+    this.blockCreator = blockCreator;
+    this.protocolContext = protocolContext;
+    this.blockImporter = blockImporter;
+    this.observers = observers;
+    this.nodeKey = nodeKey;
+    this.messageFactory = messageFactory;
+    this.transmitter = transmitter;
+    this.bftExtraDataCodec = bftExtraDataCodec;
+
+    roundTimer.startTimer(getRoundIdentifier());
+  }
+
+  /**
+   * Gets round identifier.
+   *
+   * @return the round identifier
+   */
+  public ConsensusRoundIdentifier getRoundIdentifier() {
+    return roundState.getRoundIdentifier();
+  }
+
+  /**
+   * Create and send proposal message.
+   *
+   * @param headerTimeStampSeconds the header time stamp seconds
+   */
+  public void createAndSendProposalMessage(final long headerTimeStampSeconds) {
+    LOG.debug("Creating proposed block. round={}", roundState.getRoundIdentifier());
+    final Block block = blockCreator.createBlock(headerTimeStampSeconds).getBlock();
+
+    LOG.trace("Creating proposed block blockHeader={}", block.getHeader());
+    updateStateWithProposalAndTransmit(block, emptyList(), emptyList());
+  }
+
+  /**
+   * Start round with.
+   *
+   * @param roundChangeArtifacts the round change artifacts
+   * @param headerTimestamp the header timestamp
+   */
+  public void startRoundWith(
+      final RoundChangeArtifacts roundChangeArtifacts, final long headerTimestamp) {
+    final Optional<PreparedCertificate> bestPreparedCertificate =
+        roundChangeArtifacts.getBestPreparedPeer();
+
+    final Block blockToPublish;
+    if (bestPreparedCertificate.isEmpty()) {
+      LOG.debug("Sending proposal with new block. round={}", roundState.getRoundIdentifier());
+      blockToPublish = blockCreator.createBlock(headerTimestamp).getBlock();
+    } else {
+      LOG.debug(
+          "Sending proposal from PreparedCertificate. round={}", roundState.getRoundIdentifier());
+      blockToPublish = bestPreparedCertificate.get().getBlock();
+    }
+
+    updateStateWithProposalAndTransmit(
+        blockToPublish,
+        roundChangeArtifacts.getRoundChanges(),
+        bestPreparedCertificate.map(PreparedCertificate::getPrepares).orElse(emptyList()));
+  }
+
+  /**
+   * Update state with proposal and transmit.
+   *
+   * @param block the block
+   * @param roundChanges the round changes
+   * @param prepares the prepares
+   */
+  protected void updateStateWithProposalAndTransmit(
+      final Block block,
+      final List<SignedData<RoundChangePayload>> roundChanges,
+      final List<SignedData<PreparePayload>> prepares) {
+    final Proposal proposal;
+    try {
+      proposal = messageFactory.createProposal(getRoundIdentifier(), block, roundChanges, prepares);
+    } catch (final SecurityModuleException e) {
+      LOG.warn("Failed to create a signed Proposal, waiting for next round.", e);
+      return;
+    }
+
+    transmitter.multicastProposal(
+        proposal.getRoundIdentifier(),
+        proposal.getSignedPayload().getPayload().getProposedBlock(),
+        roundChanges,
+        prepares);
+    updateStateWithProposedBlock(proposal);
+    sendPrepare(block);
+  }
+
+  /**
+   * Handle proposal message.
+   *
+   * @param msg the msg
+   */
+  public void handleProposalMessage(final Proposal msg) {
+    LOG.debug(
+        "Received a proposal message. round={}. author={}",
+        roundState.getRoundIdentifier(),
+        msg.getAuthor());
+    final Block block = msg.getSignedPayload().getPayload().getProposedBlock();
+    if (updateStateWithProposedBlock(msg)) {
+      sendPrepare(block);
+    }
+  }
+
+  private void sendPrepare(final Block block) {
+    LOG.debug("Sending prepare message. round={}", roundState.getRoundIdentifier());
+    try {
+      final Prepare localPrepareMessage =
+          messageFactory.createPrepare(getRoundIdentifier(), block.getHash());
+      peerIsPrepared(localPrepareMessage);
+      transmitter.multicastPrepare(
+          localPrepareMessage.getRoundIdentifier(), localPrepareMessage.getDigest());
+    } catch (final SecurityModuleException e) {
+      LOG.warn("Failed to create a signed Prepare; {}", e.getMessage());
+    }
+  }
+
+  /**
+   * Handle prepare message.
+   *
+   * @param msg the msg
+   */
+  public void handlePrepareMessage(final Prepare msg) {
+    LOG.debug(
+        "Received a prepare message. round={}. author={}",
+        roundState.getRoundIdentifier(),
+        msg.getAuthor());
+    peerIsPrepared(msg);
+  }
+
+  /**
+   * Handle commit message.
+   *
+   * @param msg the msg
+   */
+  public void handleCommitMessage(final Commit msg) {
+    LOG.debug(
+        "Received a commit message. round={}. author={}",
+        roundState.getRoundIdentifier(),
+        msg.getAuthor());
+    peerIsCommitted(msg);
+  }
+
+  /**
+   * Construct prepared certificate.
+   *
+   * @return the optional PreparedCertificate
+   */
+  public Optional<PreparedCertificate> constructPreparedCertificate() {
+    return roundState.constructPreparedCertificate();
+  }
+
+  private boolean updateStateWithProposedBlock(final Proposal msg) {
+    final boolean wasPrepared = roundState.isPrepared();
+    final boolean wasCommitted = roundState.isCommitted();
+    final boolean blockAccepted = roundState.setProposedBlock(msg);
+
+    if (blockAccepted) {
+      final Block block = roundState.getProposedBlock().get();
+      final SECPSignature commitSeal;
+      try {
+        commitSeal = createCommitSeal(block);
+      } catch (final SecurityModuleException e) {
+        LOG.warn("Failed to construct commit seal; {}", e.getMessage());
+        return true;
+      }
+
+      // There are times handling a proposed block is enough to enter prepared.
+      if (wasPrepared != roundState.isPrepared()) {
+        LOG.debug("Sending commit message. round={}", roundState.getRoundIdentifier());
+        transmitter.multicastCommit(getRoundIdentifier(), block.getHash(), commitSeal);
+      }
+
+      // can automatically add _our_ commit message to the roundState
+      // cannot create a prepare message here, as it may be _our_ proposal, and thus we cannot also
+      // prepare
+      try {
+        final Commit localCommitMessage =
+            messageFactory.createCommit(
+                roundState.getRoundIdentifier(), msg.getBlock().getHash(), commitSeal);
+        roundState.addCommitMessage(localCommitMessage);
+      } catch (final SecurityModuleException e) {
+        LOG.warn("Failed to create signed Commit message; {}", e.getMessage());
+        return true;
+      }
+
+      // It is possible sufficient commit seals are now available and the block should be imported
+      if (wasCommitted != roundState.isCommitted()) {
+        importBlockToChain();
+      }
+    }
+
+    return blockAccepted;
+  }
+
+  private void peerIsPrepared(final Prepare msg) {
+    final boolean wasPrepared = roundState.isPrepared();
+    roundState.addPrepareMessage(msg);
+    if (wasPrepared != roundState.isPrepared()) {
+      LOG.debug("Sending commit message. round={}", roundState.getRoundIdentifier());
+      final Block block = roundState.getProposedBlock().get();
+      try {
+        transmitter.multicastCommit(getRoundIdentifier(), block.getHash(), createCommitSeal(block));
+        // Note: the local-node's commit message was added to RoundState on block acceptance
+        // and thus does not need to be done again here.
+      } catch (final SecurityModuleException e) {
+        LOG.warn("Failed to construct a commit seal: {}", e.getMessage());
+      }
+    }
+  }
+
+  private void peerIsCommitted(final Commit msg) {
+    final boolean wasCommitted = roundState.isCommitted();
+    roundState.addCommitMessage(msg);
+    if (wasCommitted != roundState.isCommitted()) {
+      importBlockToChain();
+    }
+  }
+
+  private void importBlockToChain() {
+
+    final Block blockToImport =
+        BftHelpers.createSealedBlock(
+            bftExtraDataCodec,
+            roundState.getProposedBlock().get(),
+            roundState.getRoundIdentifier().getRoundNumber(),
+            roundState.getCommitSeals());
+
+    final long blockNumber = blockToImport.getHeader().getNumber();
+    final BftExtraData extraData = bftExtraDataCodec.decode(blockToImport.getHeader());
+    if (getRoundIdentifier().getRoundNumber() > 0) {
+      LOG.info(
+          "Importing proposed block to chain. round={}, hash={}",
+          getRoundIdentifier(),
+          blockToImport.getHash());
+    } else {
+      LOG.debug(
+          "Importing proposed block to chain. round={}, hash={}",
+          getRoundIdentifier(),
+          blockToImport.getHash());
+    }
+    LOG.trace("Importing proposed block with extraData={}", extraData);
+    final BlockImportResult result =
+        blockImporter.importBlock(protocolContext, blockToImport, HeaderValidationMode.FULL);
+    if (!result.isImported()) {
+      LOG.error(
+          "Failed to import proposed block to chain. block={} extraData={} blockHeader={}",
+          blockNumber,
+          extraData,
+          blockToImport.getHeader());
+    } else {
+      notifyNewBlockListeners(blockToImport);
+    }
+  }
+
+  private SECPSignature createCommitSeal(final Block block) {
+    final Block commitBlock = createCommitBlock(block);
+    final BlockHeader proposedHeader = commitBlock.getHeader();
+    final BftExtraData extraData = bftExtraDataCodec.decode(proposedHeader);
+    final Hash commitHash =
+        new BftBlockHashing(bftExtraDataCodec)
+            .calculateDataHashForCommittedSeal(proposedHeader, extraData);
+    return nodeKey.sign(commitHash);
+  }
+
+  private Block createCommitBlock(final Block block) {
+    final BftBlockInterface bftBlockInterface =
+        protocolContext.getConsensusContext(BftContext.class).getBlockInterface();
+    return bftBlockInterface.replaceRoundInBlock(
+        block,
+        getRoundIdentifier().getRoundNumber(),
+        BftBlockHeaderFunctions.forCommittedSeal(bftExtraDataCodec));
+  }
+
+  private void notifyNewBlockListeners(final Block block) {
+    observers.forEach(obs -> obs.blockMined(block));
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftRoundFactory.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftRoundFactory.java
new file mode 100644
index 00000000000..7f93a73d3b5
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftRoundFactory.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.statemachine;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.BftProtocolSchedule;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.BftBlockCreatorFactory;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftFinalState;
+import org.hyperledger.besu.consensus.qbft.network.QbftMessageTransmitter;
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.qbft.validation.MessageValidatorFactory;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.blockcreation.BlockCreator;
+import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.util.Subscribers;
+
+/** The Qbft round factory. */
+public class QbftRoundFactory {
+
+  private final BftFinalState finalState;
+  private final BftBlockCreatorFactory<?> blockCreatorFactory;
+  private final ProtocolContext protocolContext;
+  private final BftProtocolSchedule protocolSchedule;
+  private final Subscribers<MinedBlockObserver> minedBlockObservers;
+  private final MessageValidatorFactory messageValidatorFactory;
+  private final MessageFactory messageFactory;
+  private final BftExtraDataCodec bftExtraDataCodec;
+
+  /**
+   * Instantiates a new Qbft round factory.
+   *
+   * @param finalState the final state
+   * @param protocolContext the protocol context
+   * @param protocolSchedule the protocol schedule
+   * @param minedBlockObservers the mined block observers
+   * @param messageValidatorFactory the message validator factory
+   * @param messageFactory the message factory
+   * @param bftExtraDataCodec the bft extra data codec
+   */
+  public QbftRoundFactory(
+      final BftFinalState finalState,
+      final ProtocolContext protocolContext,
+      final BftProtocolSchedule protocolSchedule,
+      final Subscribers<MinedBlockObserver> minedBlockObservers,
+      final MessageValidatorFactory messageValidatorFactory,
+      final MessageFactory messageFactory,
+      final BftExtraDataCodec bftExtraDataCodec) {
+    this.finalState = finalState;
+    this.blockCreatorFactory = finalState.getBlockCreatorFactory();
+    this.protocolContext = protocolContext;
+    this.protocolSchedule = protocolSchedule;
+    this.minedBlockObservers = minedBlockObservers;
+    this.messageValidatorFactory = messageValidatorFactory;
+    this.messageFactory = messageFactory;
+    this.bftExtraDataCodec = bftExtraDataCodec;
+  }
+
+  /**
+   * Create new round qbft round.
+   *
+   * @param parentHeader the parent header
+   * @param round the round
+   * @return the qbft round
+   */
+  public QbftRound createNewRound(final BlockHeader parentHeader, final int round) {
+    long nextBlockHeight = parentHeader.getNumber() + 1;
+    final ConsensusRoundIdentifier roundIdentifier =
+        new ConsensusRoundIdentifier(nextBlockHeight, round);
+
+    final RoundState roundState =
+        new RoundState(
+            roundIdentifier,
+            finalState.getQuorum(),
+            messageValidatorFactory.createMessageValidator(roundIdentifier, parentHeader));
+
+    return createNewRoundWithState(parentHeader, roundState);
+  }
+
+  /**
+   * Create new Qbft round with state.
+   *
+   * @param parentHeader the parent header
+   * @param roundState the round state
+   * @return the qbft round
+   */
+  public QbftRound createNewRoundWithState(
+      final BlockHeader parentHeader, final RoundState roundState) {
+    final ConsensusRoundIdentifier roundIdentifier = roundState.getRoundIdentifier();
+    final BlockCreator blockCreator = blockCreatorFactory.create(parentHeader, 0);
+
+    // TODO(tmm): Why is this created everytime?!
+    final QbftMessageTransmitter messageTransmitter =
+        new QbftMessageTransmitter(messageFactory, finalState.getValidatorMulticaster());
+
+    return new QbftRound(
+        roundState,
+        blockCreator,
+        protocolContext,
+        protocolSchedule.getByBlockNumber(roundIdentifier.getSequenceNumber()).getBlockImporter(),
+        minedBlockObservers,
+        finalState.getNodeKey(),
+        messageFactory,
+        messageTransmitter,
+        finalState.getRoundTimer(),
+        bftExtraDataCodec);
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/RoundChangeArtifacts.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/RoundChangeArtifacts.java
new file mode 100644
index 00000000000..322d6990ac4
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/RoundChangeArtifacts.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.statemachine;
+
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.RoundChange;
+import org.hyperledger.besu.consensus.qbft.payload.RoundChangePayload;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/** The Round change artifacts. */
+public class RoundChangeArtifacts {
+
+  private final List<SignedData<RoundChangePayload>> roundChanges;
+  private final Optional<PreparedCertificate> bestPreparedPeer;
+
+  /**
+   * Instantiates a new Round change artifacts.
+   *
+   * @param roundChanges the round changes
+   * @param bestPreparedPeer the best prepared peer
+   */
+  public RoundChangeArtifacts(
+      final List<SignedData<RoundChangePayload>> roundChanges,
+      final Optional<PreparedCertificate> bestPreparedPeer) {
+    this.roundChanges = roundChanges;
+    this.bestPreparedPeer = bestPreparedPeer;
+  }
+
+  /**
+   * Gets best prepared peer certificate.
+   *
+   * @return the best prepared peer
+   */
+  public Optional<PreparedCertificate> getBestPreparedPeer() {
+    return bestPreparedPeer;
+  }
+
+  /**
+   * Gets round changes.
+   *
+   * @return the round changes
+   */
+  public List<SignedData<RoundChangePayload>> getRoundChanges() {
+    return roundChanges;
+  }
+
+  /**
+   * Create round change artifacts.
+   *
+   * @param roundChanges the round changes
+   * @return the round change artifacts
+   */
+  public static RoundChangeArtifacts create(final Collection<RoundChange> roundChanges) {
+
+    final Comparator<RoundChange> preparedRoundComparator =
+        (o1, o2) -> {
+          if (o1.getPreparedRoundMetadata().isEmpty()) {
+            return -1;
+          }
+          if (o2.getPreparedRoundMetadata().isEmpty()) {
+            return 1;
+          }
+
+          int o1Round = o1.getPreparedRoundMetadata().get().getPreparedRound();
+          int o2Round = o2.getPreparedRoundMetadata().get().getPreparedRound();
+
+          return Integer.compare(o1Round, o2Round);
+        };
+
+    final Optional<RoundChange> roundChangeWithNewestPrepare =
+        roundChanges.stream()
+            .max(preparedRoundComparator)
+            .flatMap(rc -> rc.getProposedBlock().map(pb -> rc));
+
+    final Optional<PreparedCertificate> prepCert =
+        roundChangeWithNewestPrepare.map(
+            roundChange ->
+                new PreparedCertificate(
+                    roundChange.getProposedBlock().get(),
+                    roundChange.getPrepares(),
+                    roundChange.getPreparedRound().get()));
+
+    return new RoundChangeArtifacts(
+        roundChanges.stream().map(RoundChange::getSignedPayload).collect(Collectors.toList()),
+        prepCert);
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/RoundChangeManager.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/RoundChangeManager.java
new file mode 100644
index 00000000000..ca671a6f527
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/RoundChangeManager.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.statemachine;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.RoundChange;
+import org.hyperledger.besu.consensus.qbft.validation.RoundChangeMessageValidator;
+import org.hyperledger.besu.datatypes.Address;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Optional;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.Maps;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Responsible for handling all RoundChange messages received for a given block height
+ * (theoretically, RoundChange messages for a older height should have been previously discarded,
+ * and messages for a future round should have been buffered).
+ *
+ * <p>If enough RoundChange messages all targeting a given round are received (and this node is the
+ * proposer for said round) - a proposal message is sent, and a new round should be started by the
+ * controlling class.
+ */
+public class RoundChangeManager {
+
+  /** The type Round change status. */
+  public static class RoundChangeStatus {
+
+    private final long quorum;
+
+    /** The Received messages. */
+    // Store only 1 round change per round per validator
+    @VisibleForTesting final Map<Address, RoundChange> receivedMessages = Maps.newLinkedHashMap();
+
+    private boolean actioned = false;
+
+    /**
+     * Instantiates a new Round change status.
+     *
+     * @param quorum the quorum
+     */
+    public RoundChangeStatus(final long quorum) {
+      this.quorum = quorum;
+    }
+
+    /**
+     * Add message.
+     *
+     * @param msg the msg
+     */
+    public void addMessage(final RoundChange msg) {
+      if (!actioned) {
+        receivedMessages.putIfAbsent(msg.getAuthor(), msg);
+      }
+    }
+
+    /**
+     * Is Round change ready.
+     *
+     * @return the boolean
+     */
+    public boolean roundChangeReady() {
+      return receivedMessages.size() >= quorum && !actioned;
+    }
+
+    /**
+     * Create round change certificate collection.
+     *
+     * @return the collection
+     */
+    public Collection<RoundChange> createRoundChangeCertificate() {
+      if (roundChangeReady()) {
+        actioned = true;
+        return receivedMessages.values();
+      } else {
+        throw new IllegalStateException("Unable to create RoundChangeCertificate at this time.");
+      }
+    }
+  }
+
+  private static final Logger LOG = LoggerFactory.getLogger(RoundChangeManager.class);
+
+  /** The Round change cache. */
+  @VisibleForTesting
+  final Map<ConsensusRoundIdentifier, RoundChangeStatus> roundChangeCache = Maps.newHashMap();
+
+  private final long quorum;
+  private final RoundChangeMessageValidator roundChangeMessageValidator;
+
+  /**
+   * Instantiates a new Round change manager.
+   *
+   * @param quorum the quorum
+   * @param roundChangeMessageValidator the round change message validator
+   */
+  public RoundChangeManager(
+      final long quorum, final RoundChangeMessageValidator roundChangeMessageValidator) {
+    this.quorum = quorum;
+    this.roundChangeMessageValidator = roundChangeMessageValidator;
+  }
+
+  /**
+   * Adds the round message to this manager and return a certificate if it passes the threshold
+   *
+   * @param msg The signed round change message to add
+   * @return Empty if the round change threshold hasn't been hit, otherwise a round change
+   *     certificate
+   */
+  public Optional<Collection<RoundChange>> appendRoundChangeMessage(final RoundChange msg) {
+
+    if (!isMessageValid(msg)) {
+      LOG.info("RoundChange message was invalid.");
+      return Optional.empty();
+    }
+
+    final RoundChangeStatus roundChangeStatus = storeRoundChangeMessage(msg);
+
+    if (roundChangeStatus.roundChangeReady()) {
+      return Optional.of(roundChangeStatus.createRoundChangeCertificate());
+    }
+
+    return Optional.empty();
+  }
+
+  private boolean isMessageValid(final RoundChange msg) {
+    return roundChangeMessageValidator.validate(msg);
+  }
+
+  private RoundChangeStatus storeRoundChangeMessage(final RoundChange msg) {
+    final ConsensusRoundIdentifier msgTargetRound = msg.getRoundIdentifier();
+
+    final RoundChangeStatus roundChangeStatus =
+        roundChangeCache.computeIfAbsent(msgTargetRound, ignored -> new RoundChangeStatus(quorum));
+
+    roundChangeStatus.addMessage(msg);
+
+    return roundChangeStatus;
+  }
+
+  /**
+   * Clears old rounds from storage that have been superseded by a given round
+   *
+   * @param completedRoundIdentifier round identifier that has been identified as superseded
+   */
+  public void discardRoundsPriorTo(final ConsensusRoundIdentifier completedRoundIdentifier) {
+    roundChangeCache.keySet().removeIf(k -> isAnEarlierRound(k, completedRoundIdentifier));
+  }
+
+  private boolean isAnEarlierRound(
+      final ConsensusRoundIdentifier left, final ConsensusRoundIdentifier right) {
+    return left.getRoundNumber() < right.getRoundNumber();
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/RoundState.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/RoundState.java
new file mode 100644
index 00000000000..6acbae56558
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/statemachine/RoundState.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.statemachine;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Commit;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Proposal;
+import org.hyperledger.besu.consensus.qbft.validation.MessageValidator;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.ethereum.core.Block;
+
+import java.util.Collection;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.google.common.collect.Sets;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Round state defines how a round will operate. */
+// Data items used to define how a round will operate
+public class RoundState {
+  private static final Logger LOG = LoggerFactory.getLogger(RoundState.class);
+
+  private final ConsensusRoundIdentifier roundIdentifier;
+  private final MessageValidator validator;
+  private final long quorum;
+
+  private Optional<Proposal> proposalMessage = Optional.empty();
+
+  // Must track the actual Prepare message, not just the sender, as these may need to be reused
+  // to send out in a PrepareCertificate.
+  private final Set<Prepare> prepareMessages = Sets.newLinkedHashSet();
+  private final Set<Commit> commitMessages = Sets.newLinkedHashSet();
+
+  private boolean prepared = false;
+  private boolean committed = false;
+
+  /**
+   * Instantiates a new Round state.
+   *
+   * @param roundIdentifier the round identifier
+   * @param quorum the quorum
+   * @param validator the validator
+   */
+  public RoundState(
+      final ConsensusRoundIdentifier roundIdentifier,
+      final int quorum,
+      final MessageValidator validator) {
+    this.roundIdentifier = roundIdentifier;
+    this.quorum = quorum;
+    this.validator = validator;
+  }
+
+  /**
+   * Gets round identifier.
+   *
+   * @return the round identifier
+   */
+  public ConsensusRoundIdentifier getRoundIdentifier() {
+    return roundIdentifier;
+  }
+
+  /**
+   * Sets proposed block.
+   *
+   * @param msg the Proposal payload msg
+   * @return the proposed block
+   */
+  public boolean setProposedBlock(final Proposal msg) {
+
+    if (!proposalMessage.isPresent()) {
+      if (validator.validateProposal(msg)) {
+        proposalMessage = Optional.of(msg);
+        prepareMessages.removeIf(p -> !validator.validatePrepare(p));
+        commitMessages.removeIf(p -> !validator.validateCommit(p));
+        updateState();
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  /**
+   * Add prepare message.
+   *
+   * @param msg the msg
+   */
+  public void addPrepareMessage(final Prepare msg) {
+    if (!proposalMessage.isPresent() || validator.validatePrepare(msg)) {
+      prepareMessages.add(msg);
+      LOG.trace("Round state added prepare message prepare={}", msg);
+    }
+    updateState();
+  }
+
+  /**
+   * Add commit message.
+   *
+   * @param msg the msg
+   */
+  public void addCommitMessage(final Commit msg) {
+    if (!proposalMessage.isPresent() || validator.validateCommit(msg)) {
+      commitMessages.add(msg);
+      LOG.trace("Round state added commit message commit={}", msg);
+    }
+
+    updateState();
+  }
+
+  private void updateState() {
+    prepared = (prepareMessages.size() >= quorum) && proposalMessage.isPresent();
+    committed = (commitMessages.size() >= quorum) && proposalMessage.isPresent();
+    LOG.trace(
+        "Round state updated prepared={} committed={} preparedQuorum={}/{} committedQuorum={}/{}",
+        prepared,
+        committed,
+        prepareMessages.size(),
+        quorum,
+        commitMessages.size(),
+        quorum);
+  }
+
+  /**
+   * Gets proposed block.
+   *
+   * @return the proposed block
+   */
+  public Optional<Block> getProposedBlock() {
+    return proposalMessage.map(p -> p.getSignedPayload().getPayload().getProposedBlock());
+  }
+
+  /**
+   * Is prepared.
+   *
+   * @return the boolean
+   */
+  public boolean isPrepared() {
+    return prepared;
+  }
+
+  /**
+   * Is committed.
+   *
+   * @return the boolean
+   */
+  public boolean isCommitted() {
+    return committed;
+  }
+
+  /**
+   * Gets commit seals.
+   *
+   * @return the commit seals
+   */
+  public Collection<SECPSignature> getCommitSeals() {
+    return commitMessages.stream()
+        .map(cp -> cp.getSignedPayload().getPayload().getCommitSeal())
+        .collect(Collectors.toList());
+  }
+
+  /**
+   * Construct prepared certificate.
+   *
+   * @return the optional prepared certificate
+   */
+  public Optional<PreparedCertificate> constructPreparedCertificate() {
+    if (isPrepared()) {
+      return Optional.of(
+          new PreparedCertificate(
+              proposalMessage.get().getSignedPayload().getPayload().getProposedBlock(),
+              prepareMessages.stream().map(Prepare::getSignedPayload).collect(Collectors.toList()),
+              roundIdentifier.getRoundNumber()));
+    }
+    return Optional.empty();
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/CommitValidator.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/CommitValidator.java
new file mode 100644
index 00000000000..35e49dbb171
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/CommitValidator.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validation;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Commit;
+import org.hyperledger.besu.consensus.qbft.payload.CommitPayload;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Util;
+
+import java.util.Collection;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Commit validator. */
+public class CommitValidator {
+
+  private static final String ERROR_PREFIX = "Invalid Commit Message";
+
+  private static final Logger LOG = LoggerFactory.getLogger(CommitValidator.class);
+
+  private final Collection<Address> validators;
+  private final ConsensusRoundIdentifier targetRound;
+  private final Hash expectedDigest;
+  private final Hash expectedCommitDigest;
+
+  /**
+   * Instantiates a new Commit validator.
+   *
+   * @param validators the validators
+   * @param targetRound the target round
+   * @param expectedDigest the expected digest
+   * @param expectedCommitDigest the expected commit digest
+   */
+  public CommitValidator(
+      final Collection<Address> validators,
+      final ConsensusRoundIdentifier targetRound,
+      final Hash expectedDigest,
+      final Hash expectedCommitDigest) {
+    this.validators = validators;
+    this.targetRound = targetRound;
+    this.expectedDigest = expectedDigest;
+    this.expectedCommitDigest = expectedCommitDigest;
+  }
+
+  /**
+   * Validate.
+   *
+   * @param msg the msg
+   * @return the boolean
+   */
+  public boolean validate(final Commit msg) {
+    return validate(msg.getSignedPayload());
+  }
+
+  /**
+   * Validate.
+   *
+   * @param signedPayload the signed payload
+   * @return the boolean
+   */
+  public boolean validate(final SignedData<CommitPayload> signedPayload) {
+    if (!validators.contains(signedPayload.getAuthor())) {
+      LOG.info("{}: did not originate from a recognized validator.", ERROR_PREFIX);
+      return false;
+    }
+
+    final CommitPayload payload = signedPayload.getPayload();
+
+    if (!payload.getRoundIdentifier().equals(targetRound)) {
+      LOG.info(
+          "{}: did not target expected round {} was {}",
+          ERROR_PREFIX,
+          targetRound,
+          payload.getRoundIdentifier());
+      return false;
+    }
+
+    if (!payload.getDigest().equals(expectedDigest)) {
+      LOG.info(
+          "{}: did not contain expected digest {} was {}",
+          ERROR_PREFIX,
+          expectedDigest,
+          payload.getDigest());
+      return false;
+    }
+
+    final Address commitSealCreator =
+        Util.signatureToAddress(payload.getCommitSeal(), expectedCommitDigest);
+
+    if (!commitSealCreator.equals(signedPayload.getAuthor())) {
+      LOG.info(
+          "{}: Seal was not created by the message transmitter {} was {}",
+          ERROR_PREFIX,
+          commitSealCreator,
+          signedPayload.getAuthor());
+      return false;
+    }
+
+    return true;
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/FutureRoundProposalMessageValidator.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/FutureRoundProposalMessageValidator.java
new file mode 100644
index 00000000000..3c401bb203c
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/FutureRoundProposalMessageValidator.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validation;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Proposal;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+/** The Future round proposal message validator. */
+public class FutureRoundProposalMessageValidator {
+
+  private final MessageValidatorFactory messageValidatorFactory;
+  private final long chainHeight;
+  private final BlockHeader parentHeader;
+
+  /**
+   * Instantiates a new Future round proposal message validator.
+   *
+   * @param messageValidatorFactory the message validator factory
+   * @param chainHeight the chain height
+   * @param parentHeader the parent header
+   */
+  public FutureRoundProposalMessageValidator(
+      final MessageValidatorFactory messageValidatorFactory,
+      final long chainHeight,
+      final BlockHeader parentHeader) {
+    this.messageValidatorFactory = messageValidatorFactory;
+    this.chainHeight = chainHeight;
+    this.parentHeader = parentHeader;
+  }
+
+  /**
+   * Validate proposal message.
+   *
+   * @param msg the msg
+   * @return the boolean
+   */
+  public boolean validateProposalMessage(final Proposal msg) {
+    final ConsensusRoundIdentifier roundIdentifier =
+        new ConsensusRoundIdentifier(chainHeight, msg.getRoundIdentifier().getRoundNumber());
+
+    final MessageValidator messageValidator =
+        messageValidatorFactory.createMessageValidator(roundIdentifier, parentHeader);
+
+    return messageValidator.validateProposal(msg);
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/MessageValidator.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/MessageValidator.java
new file mode 100644
index 00000000000..ac112baa051
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/MessageValidator.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validation;
+
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Commit;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Proposal;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.core.Block;
+
+import java.util.Collection;
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Message validator. */
+public class MessageValidator {
+
+  private static final Logger LOG = LoggerFactory.getLogger(MessageValidator.class);
+
+  /** The Subsequent message validator. */
+  public static class SubsequentMessageValidator {
+
+    private final PrepareValidator prepareValidator;
+    private final CommitValidator commitValidator;
+
+    /**
+     * Instantiates a new Subsequent message validator.
+     *
+     * @param validators the validators
+     * @param targetRound the target round
+     * @param proposalBlock the proposal block
+     * @param blockInterface the block interface
+     * @param bftExtraDataCodec the bft extra data codec
+     */
+    public SubsequentMessageValidator(
+        final Collection<Address> validators,
+        final ConsensusRoundIdentifier targetRound,
+        final Block proposalBlock,
+        final BftBlockInterface blockInterface,
+        final BftExtraDataCodec bftExtraDataCodec) {
+      final Block commitBlock =
+          blockInterface.replaceRoundInBlock(
+              proposalBlock,
+              targetRound.getRoundNumber(),
+              BftBlockHeaderFunctions.forCommittedSeal(bftExtraDataCodec));
+      prepareValidator = new PrepareValidator(validators, targetRound, proposalBlock.getHash());
+      commitValidator =
+          new CommitValidator(
+              validators, targetRound, proposalBlock.getHash(), commitBlock.getHash());
+    }
+
+    /**
+     * Validate.
+     *
+     * @param msg the Prepare payload msg
+     * @return the boolean
+     */
+    public boolean validate(final Prepare msg) {
+      return prepareValidator.validate(msg);
+    }
+
+    /**
+     * Validate.
+     *
+     * @param msg the Commit payload msg
+     * @return the boolean
+     */
+    public boolean validate(final Commit msg) {
+      return commitValidator.validate(msg);
+    }
+  }
+
+  /** The interface Subsequent message validator factory. */
+  @FunctionalInterface
+  public interface SubsequentMessageValidatorFactory {
+    /**
+     * Create subsequent message validator.
+     *
+     * @param proposalBlock the proposal block
+     * @return the subsequent message validator
+     */
+    SubsequentMessageValidator create(Block proposalBlock);
+  }
+
+  private final SubsequentMessageValidatorFactory subsequentMessageValidatorFactory;
+  private final ProposalValidator proposalValidator;
+
+  private Optional<SubsequentMessageValidator> subsequentMessageValidator = Optional.empty();
+
+  /**
+   * Instantiates a new Message validator.
+   *
+   * @param subsequentMessageValidatorFactory the subsequent message validator factory
+   * @param proposalValidator the proposal validator
+   */
+  public MessageValidator(
+      final SubsequentMessageValidatorFactory subsequentMessageValidatorFactory,
+      final ProposalValidator proposalValidator) {
+    this.subsequentMessageValidatorFactory = subsequentMessageValidatorFactory;
+    this.proposalValidator = proposalValidator;
+  }
+
+  /**
+   * Validate proposal payload.
+   *
+   * @param msg the Proposal payload msg
+   * @return the boolean
+   */
+  public boolean validateProposal(final Proposal msg) {
+    if (subsequentMessageValidator.isPresent()) {
+      LOG.info("Received subsequent Proposal for current round, discarding.");
+      return false;
+    }
+
+    final boolean result = proposalValidator.validate(msg);
+    if (result) {
+      subsequentMessageValidator =
+          Optional.of(subsequentMessageValidatorFactory.create(msg.getBlock()));
+    }
+
+    return result;
+  }
+
+  /**
+   * Validate Prepare payload.
+   *
+   * @param msg the Prepare msg
+   * @return the boolean
+   */
+  public boolean validatePrepare(final Prepare msg) {
+    return subsequentMessageValidator.map(pv -> pv.validate(msg)).orElse(false);
+  }
+
+  /**
+   * Validate commit payload.
+   *
+   * @param msg the Commit payload
+   * @return the boolean
+   */
+  public boolean validateCommit(final Commit msg) {
+    return subsequentMessageValidator.map(cv -> cv.validate(msg)).orElse(false);
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/MessageValidatorFactory.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/MessageValidatorFactory.java
new file mode 100644
index 00000000000..2875d36ab3c
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/MessageValidatorFactory.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validation;
+
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftContext;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
+import org.hyperledger.besu.consensus.common.bft.BftProtocolSchedule;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.ProposerSelector;
+import org.hyperledger.besu.consensus.qbft.validation.MessageValidator.SubsequentMessageValidator;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.BlockValidator;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.Collection;
+
+/** The Message validator factory. */
+public class MessageValidatorFactory {
+
+  private final ProposerSelector proposerSelector;
+  private final BftProtocolSchedule protocolSchedule;
+  private final ProtocolContext protocolContext;
+  private final BftExtraDataCodec bftExtraDataCodec;
+
+  /**
+   * Instantiates a new Message validator factory.
+   *
+   * @param proposerSelector the proposer selector
+   * @param protocolSchedule the protocol schedule
+   * @param protocolContext the protocol context
+   * @param bftExtraDataCodec the bft extra data codec
+   */
+  public MessageValidatorFactory(
+      final ProposerSelector proposerSelector,
+      final BftProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final BftExtraDataCodec bftExtraDataCodec) {
+    this.proposerSelector = proposerSelector;
+    this.protocolSchedule = protocolSchedule;
+    this.protocolContext = protocolContext;
+    this.bftExtraDataCodec = bftExtraDataCodec;
+  }
+
+  private Collection<Address> getValidatorsAfterBlock(final BlockHeader parentHeader) {
+    return protocolContext
+        .getConsensusContext(BftContext.class)
+        .getValidatorProvider()
+        .getValidatorsAfterBlock(parentHeader);
+  }
+
+  /**
+   * Create round change message validator.
+   *
+   * @param chainHeight the chain height
+   * @param parentHeader the parent header
+   * @return the round change message validator
+   */
+  public RoundChangeMessageValidator createRoundChangeMessageValidator(
+      final long chainHeight, final BlockHeader parentHeader) {
+
+    final Collection<Address> validatorsForHeight = getValidatorsAfterBlock(parentHeader);
+
+    final RoundChangePayloadValidator roundChangePayloadValidator =
+        new RoundChangePayloadValidator(validatorsForHeight, chainHeight);
+
+    final BlockValidator blockValidator =
+        protocolSchedule.getByBlockNumber(chainHeight).getBlockValidator();
+
+    return new RoundChangeMessageValidator(
+        roundChangePayloadValidator,
+        BftHelpers.calculateRequiredValidatorQuorum(validatorsForHeight.size()),
+        chainHeight,
+        validatorsForHeight,
+        blockValidator,
+        protocolContext);
+  }
+
+  /**
+   * Create message validator.
+   *
+   * @param roundIdentifier the round identifier
+   * @param parentHeader the parent header
+   * @return the message validator
+   */
+  public MessageValidator createMessageValidator(
+      final ConsensusRoundIdentifier roundIdentifier, final BlockHeader parentHeader) {
+
+    final Collection<Address> validatorsForHeight = getValidatorsAfterBlock(parentHeader);
+    final BlockValidator blockValidator =
+        protocolSchedule.getByBlockNumber(roundIdentifier.getSequenceNumber()).getBlockValidator();
+
+    final ProposalValidator proposalValidator =
+        new ProposalValidator(
+            blockValidator,
+            protocolContext,
+            BftHelpers.calculateRequiredValidatorQuorum(validatorsForHeight.size()),
+            validatorsForHeight,
+            roundIdentifier,
+            proposerSelector.selectProposerForRound(roundIdentifier),
+            bftExtraDataCodec);
+
+    final BftBlockInterface blockInterface =
+        protocolContext.getConsensusContext(BftContext.class).getBlockInterface();
+    return new MessageValidator(
+        block ->
+            new SubsequentMessageValidator(
+                validatorsForHeight, roundIdentifier, block, blockInterface, bftExtraDataCodec),
+        proposalValidator);
+  }
+
+  /**
+   * Create future round proposal message validator.
+   *
+   * @param chainHeight the chain height
+   * @param parentHeader the parent header
+   * @return the future round proposal message validator
+   */
+  public FutureRoundProposalMessageValidator createFutureRoundProposalMessageValidator(
+      final long chainHeight, final BlockHeader parentHeader) {
+    return new FutureRoundProposalMessageValidator(this, chainHeight, parentHeader);
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/PrepareValidator.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/PrepareValidator.java
new file mode 100644
index 00000000000..54fbaef855f
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/PrepareValidator.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validation;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.qbft.payload.PreparePayload;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+
+import java.util.Collection;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Prepare validator. */
+public class PrepareValidator {
+
+  private static final String ERROR_PREFIX = "Invalid Prepare Message";
+
+  private static final Logger LOG = LoggerFactory.getLogger(PrepareValidator.class);
+
+  private final Collection<Address> validators;
+  private final ConsensusRoundIdentifier targetRound;
+  private final Hash expectedDigest;
+
+  /**
+   * Instantiates a new Prepare validator.
+   *
+   * @param validators the validators
+   * @param targetRound the target round
+   * @param expectedDigest the expected digest
+   */
+  public PrepareValidator(
+      final Collection<Address> validators,
+      final ConsensusRoundIdentifier targetRound,
+      final Hash expectedDigest) {
+    this.validators = validators;
+    this.targetRound = targetRound;
+    this.expectedDigest = expectedDigest;
+  }
+
+  /**
+   * Validate.
+   *
+   * @param msg the msg
+   * @return the boolean
+   */
+  public boolean validate(final Prepare msg) {
+    return validate(msg.getSignedPayload());
+  }
+
+  /**
+   * Validate.
+   *
+   * @param signedPayload the signed payload
+   * @return the boolean
+   */
+  public boolean validate(final SignedData<PreparePayload> signedPayload) {
+    if (!validators.contains(signedPayload.getAuthor())) {
+      LOG.info("{}: did not originate from a recognized validator.", ERROR_PREFIX);
+      return false;
+    }
+
+    final PreparePayload payload = signedPayload.getPayload();
+
+    if (!payload.getRoundIdentifier().equals(targetRound)) {
+      LOG.info("{}: did not target expected round/height", ERROR_PREFIX);
+      return false;
+    }
+
+    if (!payload.getDigest().equals(expectedDigest)) {
+      LOG.info("{}: did not contain expected digest", ERROR_PREFIX);
+      return false;
+    }
+
+    return true;
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/ProposalPayloadValidator.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/ProposalPayloadValidator.java
new file mode 100644
index 00000000000..f0df7aa6fa5
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/ProposalPayloadValidator.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validation;
+
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.QbftContext;
+import org.hyperledger.besu.consensus.qbft.payload.ProposalPayload;
+import org.hyperledger.besu.consensus.qbft.pki.PkiQbftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.qbft.pki.PkiQbftExtraData;
+import org.hyperledger.besu.consensus.qbft.pki.PkiQbftExtraDataCodec;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.BlockValidator;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
+import org.hyperledger.besu.pki.cms.CmsValidator;
+
+import java.util.Optional;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Proposal payload validator. */
+public class ProposalPayloadValidator {
+
+  private static final String ERROR_PREFIX = "Invalid Proposal Payload";
+
+  private static final Logger LOG = LoggerFactory.getLogger(ProposalPayloadValidator.class);
+  private final Address expectedProposer;
+  private final ConsensusRoundIdentifier targetRound;
+  private final BlockValidator blockValidator;
+  private final ProtocolContext protocolContext;
+  private final BftExtraDataCodec bftExtraDataCodec;
+  private final Optional<CmsValidator> cmsValidator;
+
+  /**
+   * Instantiates a new Proposal payload validator.
+   *
+   * @param expectedProposer the expected proposer
+   * @param targetRound the target round
+   * @param blockValidator the block validator
+   * @param protocolContext the protocol context
+   * @param bftExtraDataCodec the bft extra data codec
+   */
+  public ProposalPayloadValidator(
+      final Address expectedProposer,
+      final ConsensusRoundIdentifier targetRound,
+      final BlockValidator blockValidator,
+      final ProtocolContext protocolContext,
+      final BftExtraDataCodec bftExtraDataCodec) {
+    this(
+        expectedProposer,
+        targetRound,
+        blockValidator,
+        protocolContext,
+        bftExtraDataCodec,
+        protocolContext
+            .getConsensusContext(QbftContext.class)
+            .getPkiBlockCreationConfiguration()
+            .map(config -> new CmsValidator(config.getTrustStore())));
+  }
+
+  /**
+   * Instantiates a new Proposal payload validator.
+   *
+   * @param expectedProposer the expected proposer
+   * @param targetRound the target round
+   * @param blockValidator the block validator
+   * @param protocolContext the protocol context
+   * @param bftExtraDataCodec the bft extra data codec
+   * @param cmsValidator the cms validator
+   */
+  @VisibleForTesting
+  public ProposalPayloadValidator(
+      final Address expectedProposer,
+      final ConsensusRoundIdentifier targetRound,
+      final BlockValidator blockValidator,
+      final ProtocolContext protocolContext,
+      final BftExtraDataCodec bftExtraDataCodec,
+      final Optional<CmsValidator> cmsValidator) {
+    this.expectedProposer = expectedProposer;
+    this.targetRound = targetRound;
+    this.blockValidator = blockValidator;
+    this.protocolContext = protocolContext;
+    this.bftExtraDataCodec = bftExtraDataCodec;
+    this.cmsValidator = cmsValidator;
+  }
+
+  /**
+   * Validate.
+   *
+   * @param signedPayload the signed Proposal payload
+   * @return the boolean
+   */
+  public boolean validate(final SignedData<ProposalPayload> signedPayload) {
+
+    if (!signedPayload.getAuthor().equals(expectedProposer)) {
+      LOG.info("{}: proposal created by non-proposer", ERROR_PREFIX);
+      return false;
+    }
+
+    final ProposalPayload payload = signedPayload.getPayload();
+
+    if (!payload.getRoundIdentifier().equals(targetRound)) {
+      LOG.info("{}: proposal is not for expected round", ERROR_PREFIX);
+      return false;
+    }
+
+    final Block block = payload.getProposedBlock();
+    if (!validateBlock(block)) {
+      return false;
+    }
+
+    if (block.getHeader().getNumber() != payload.getRoundIdentifier().getSequenceNumber()) {
+      LOG.info("{}: block number does not match sequence number", ERROR_PREFIX);
+      return false;
+    }
+
+    if (cmsValidator.isPresent()) {
+      return validateCms(
+          block,
+          protocolContext.getConsensusContext(QbftContext.class).getBlockInterface(),
+          cmsValidator.get());
+    }
+
+    return true;
+  }
+
+  private boolean validateBlock(final Block block) {
+    final var validationResult =
+        blockValidator.validateAndProcessBlock(
+            protocolContext, block, HeaderValidationMode.LIGHT, HeaderValidationMode.FULL);
+
+    if (!validationResult.isSuccessful()) {
+      LOG.info(
+          "{}: block did not pass validation. Reason {}",
+          ERROR_PREFIX,
+          validationResult.errorMessage);
+      return false;
+    }
+
+    return true;
+  }
+
+  private boolean validateCms(
+      final Block block,
+      final BftBlockInterface bftBlockInterface,
+      final CmsValidator cmsValidator) {
+    final PkiQbftExtraData pkiExtraData =
+        (PkiQbftExtraData) bftBlockInterface.getExtraData(block.getHeader());
+
+    final Hash hashWithoutCms =
+        PkiQbftBlockHeaderFunctions.forCmsSignature((PkiQbftExtraDataCodec) bftExtraDataCodec)
+            .hash(block.getHeader());
+
+    LOG.debug("Validating CMS with signed hash {} in block {}", hashWithoutCms, block.getHash());
+
+    if (!cmsValidator.validate(pkiExtraData.getCms(), hashWithoutCms)) {
+      LOG.info("{}: invalid CMS in block {}", ERROR_PREFIX, block.getHash());
+      return false;
+    } else {
+      LOG.trace("Valid CMS in block {}", block.getHash());
+      return true;
+    }
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/ProposalValidator.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/ProposalValidator.java
new file mode 100644
index 00000000000..f63bf35d6d0
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/ProposalValidator.java
@@ -0,0 +1,321 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validation;
+
+import static org.hyperledger.besu.consensus.common.bft.validation.ValidationHelpers.hasDuplicateAuthors;
+import static org.hyperledger.besu.consensus.common.bft.validation.ValidationHelpers.hasSufficientEntries;
+
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.common.bft.BftBlockInterface;
+import org.hyperledger.besu.consensus.common.bft.BftContext;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.payload.Payload;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Proposal;
+import org.hyperledger.besu.consensus.qbft.payload.PreparePayload;
+import org.hyperledger.besu.consensus.qbft.payload.PreparedRoundMetadata;
+import org.hyperledger.besu.consensus.qbft.payload.RoundChangePayload;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.BlockValidator;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.Block;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Proposal validator. */
+public class ProposalValidator {
+
+  private static final Logger LOG = LoggerFactory.getLogger(ProposalValidator.class);
+  private static final String ERROR_PREFIX = "Invalid Proposal Payload";
+
+  private final BlockValidator blockValidator;
+  private final ProtocolContext protocolContext;
+  private final int quorumMessageCount;
+  private final Collection<Address> validators;
+  private final ConsensusRoundIdentifier roundIdentifier;
+  private final Address expectedProposer;
+  private final BftExtraDataCodec bftExtraDataCodec;
+
+  /**
+   * Instantiates a new Proposal validator.
+   *
+   * @param blockValidator the block validator
+   * @param protocolContext the protocol context
+   * @param quorumMessageCount the quorum message count
+   * @param validators the validators
+   * @param roundIdentifier the round identifier
+   * @param expectedProposer the expected proposer
+   * @param bftExtraDataCodec the bft extra data codec
+   */
+  public ProposalValidator(
+      final BlockValidator blockValidator,
+      final ProtocolContext protocolContext,
+      final int quorumMessageCount,
+      final Collection<Address> validators,
+      final ConsensusRoundIdentifier roundIdentifier,
+      final Address expectedProposer,
+      final BftExtraDataCodec bftExtraDataCodec) {
+    this.blockValidator = blockValidator;
+    this.protocolContext = protocolContext;
+    this.quorumMessageCount = quorumMessageCount;
+    this.validators = validators;
+    this.roundIdentifier = roundIdentifier;
+    this.expectedProposer = expectedProposer;
+    this.bftExtraDataCodec = bftExtraDataCodec;
+  }
+
+  /**
+   * Validate.
+   *
+   * @param msg the Proposal msg
+   * @return the boolean
+   */
+  public boolean validate(final Proposal msg) {
+
+    final ProposalPayloadValidator payloadValidator =
+        new ProposalPayloadValidator(
+            expectedProposer, roundIdentifier, blockValidator, protocolContext, bftExtraDataCodec);
+
+    if (!payloadValidator.validate(msg.getSignedPayload())) {
+      LOG.info("{}: invalid proposal payload in proposal message", ERROR_PREFIX);
+      return false;
+    }
+
+    if (!validateProposalAndRoundChangeAreConsistent(msg)) {
+      return false;
+    }
+
+    return true;
+  }
+
+  private boolean validateProposalAndRoundChangeAreConsistent(final Proposal proposal) {
+    final ConsensusRoundIdentifier proposalRoundIdentifier = proposal.getRoundIdentifier();
+
+    if (proposalRoundIdentifier.getRoundNumber() == 0) {
+      if (!validateRoundZeroProposalHasNoRoundChangesOrPrepares(proposal)) {
+        return false;
+      }
+
+      return validateBlockCoinbaseMatchesMsgAuthor(proposal);
+    } else {
+
+      if (!validateRoundChanges(proposal, proposal.getRoundChanges())) {
+        LOG.info("{}: failed to validate piggy-backed round change payloads", ERROR_PREFIX);
+        return false;
+      }
+
+      // The RoundChangePayloadValidator ensures the PreparedRound is less than targetRound
+      // therefore, no need to validate that here.
+      final Optional<SignedData<RoundChangePayload>> roundChangeWithLatestPreparedRound =
+          getRoundChangeWithLatestPreparedRound(proposal.getRoundChanges());
+
+      if (roundChangeWithLatestPreparedRound.isPresent()) {
+        final PreparedRoundMetadata metadata =
+            roundChangeWithLatestPreparedRound.get().getPayload().getPreparedRoundMetadata().get();
+
+        // The Hash in the roundchange/proposals is NOT the same as the value in the
+        // prepares/roundchanges
+        // as said payloads reference the block with an OLD round number in it - therefore, need
+        // to create a block with the old round in it, then re-calc expected hash
+        // Need to check that if we substitute the LatestPrepareCert round number into the supplied
+        // block that we get the SAME hash as PreparedCert.
+        final BftBlockInterface bftBlockInterface =
+            protocolContext.getConsensusContext(BftContext.class).getBlockInterface();
+        final Block currentBlockWithOldRound =
+            bftBlockInterface.replaceRoundInBlock(
+                proposal.getBlock(),
+                metadata.getPreparedRound(),
+                BftBlockHeaderFunctions.forCommittedSeal(bftExtraDataCodec));
+
+        final Hash expectedPriorBlockHash = currentBlockWithOldRound.getHash();
+
+        if (!metadata.getPreparedBlockHash().equals(expectedPriorBlockHash)) {
+          LOG.info(
+              "{}: Latest Prepared Metadata blockhash does not align with proposed block",
+              ERROR_PREFIX);
+          return false;
+        }
+
+        // validate the prepares
+        if (!validatePrepares(
+            metadata, proposal.getRoundIdentifier().getSequenceNumber(), proposal.getPrepares())) {
+          LOG.info("{}: Piggy-backed prepares failed validation", ERROR_PREFIX);
+          return false;
+        }
+      } else {
+        // no one prepared, so prepares should be empty
+        if (!proposal.getPrepares().isEmpty()) {
+          LOG.info("{}: No PreparedMetadata exists, so prepare list must be empty", ERROR_PREFIX);
+          return false;
+        }
+
+        return validateBlockCoinbaseMatchesMsgAuthor(proposal);
+      }
+
+      return true;
+    }
+  }
+
+  private boolean validateRoundZeroProposalHasNoRoundChangesOrPrepares(final Proposal proposal) {
+    if ((proposal.getRoundChanges().size() != 0) || proposal.getPrepares().size() != 0) {
+      LOG.info("{}: round-0 proposal must not contain any prepares or roundchanges", ERROR_PREFIX);
+      return false;
+    }
+
+    return true;
+  }
+
+  private boolean validateRoundChanges(
+      final Proposal proposal, final List<SignedData<RoundChangePayload>> roundChanges) {
+
+    if (hasDuplicateAuthors(roundChanges)) {
+      LOG.info("{}: multiple round changes from the same author.", ERROR_PREFIX);
+      return false;
+    }
+
+    if (!hasSufficientEntries(roundChanges, quorumMessageCount)) {
+      LOG.info("{}: Insufficient round changes for proposal", ERROR_PREFIX);
+      return false;
+    }
+
+    if (!metadataIsConsistentAcrossRoundChanges(roundChanges)) {
+      return false;
+    }
+
+    final RoundChangePayloadValidator roundChangePayloadValidator =
+        new RoundChangePayloadValidator(validators, roundIdentifier.getSequenceNumber());
+
+    if (!roundChanges.stream().allMatch(roundChangePayloadValidator::validate)) {
+      LOG.info("{}: invalid proposal, round changes did not pass validation", ERROR_PREFIX);
+      return false;
+    }
+
+    // This is required as the RoundChangePayloadValidator only checks height, not round.
+    if (!allMessagesTargetRound(roundChanges, proposal.getRoundIdentifier())) {
+      LOG.info("{}: not all roundChange payloads target the proposal round.", ERROR_PREFIX);
+      return false;
+    }
+
+    return true;
+  }
+
+  private boolean validatePrepares(
+      final PreparedRoundMetadata metaData,
+      final long currentHeight,
+      final List<SignedData<PreparePayload>> prepares) {
+
+    if (hasDuplicateAuthors(prepares)) {
+      LOG.info("{}}: multiple prepares from the same author.", ERROR_PREFIX);
+      return false;
+    }
+
+    if (!hasSufficientEntries(prepares, quorumMessageCount)) {
+      LOG.info("{}: Insufficient prepares for proposal", ERROR_PREFIX);
+      return false;
+    }
+
+    final ConsensusRoundIdentifier preparedRoundIdentifier =
+        new ConsensusRoundIdentifier(currentHeight, metaData.getPreparedRound());
+
+    final PrepareValidator prepareValidator =
+        new PrepareValidator(validators, preparedRoundIdentifier, metaData.getPreparedBlockHash());
+
+    if (!prepares.stream().allMatch(prepareValidator::validate)) {
+      LOG.info("{}: Prepare failed validation", ERROR_PREFIX);
+      return false;
+    }
+
+    return true;
+  }
+
+  private Optional<SignedData<RoundChangePayload>> getRoundChangeWithLatestPreparedRound(
+      final List<SignedData<RoundChangePayload>> roundChanges) {
+
+    final Comparator<SignedData<RoundChangePayload>> preparedRoundComparator =
+        (o1, o2) -> {
+          if (o1.getPayload().getPreparedRoundMetadata().isEmpty()) {
+            return -1;
+          }
+          if (o2.getPayload().getPreparedRoundMetadata().isEmpty()) {
+            return 1;
+          }
+
+          int o1Round = o1.getPayload().getPreparedRoundMetadata().get().getPreparedRound();
+          int o2Round = o2.getPayload().getPreparedRoundMetadata().get().getPreparedRound();
+
+          return Integer.compare(o1Round, o2Round);
+        };
+
+    return roundChanges.stream()
+        .max(preparedRoundComparator)
+        .flatMap(rc -> rc.getPayload().getPreparedRoundMetadata().map(metadata -> rc));
+  }
+
+  private boolean metadataIsConsistentAcrossRoundChanges(
+      final List<SignedData<RoundChangePayload>> roundChanges) {
+    final List<PreparedRoundMetadata> distinctMetadatas =
+        roundChanges.stream()
+            .map(rc -> rc.getPayload().getPreparedRoundMetadata())
+            .filter(Optional::isPresent)
+            .map(Optional::get)
+            .distinct()
+            .collect(Collectors.toList());
+
+    final List<Integer> preparedRounds =
+        distinctMetadatas.stream()
+            .map(PreparedRoundMetadata::getPreparedRound)
+            .collect(Collectors.toList());
+
+    for (final Integer preparedRound : preparedRounds) {
+      if (distinctMetadatas.stream().filter(dm -> dm.getPreparedRound() == preparedRound).count()
+          > 1) {
+        LOG.info("{}: Roundchanges have different prepared metadata for same round", ERROR_PREFIX);
+        return false;
+      }
+    }
+    return true;
+  }
+
+  private boolean validateBlockCoinbaseMatchesMsgAuthor(final Proposal msg) {
+    if (!msg.getBlock().getHeader().getCoinbase().equals(msg.getAuthor())) {
+      LOG.info("{}: block coinbase does not match the proposer's address", ERROR_PREFIX);
+      return false;
+    }
+    return true;
+  }
+
+  /**
+   * All messages target round boolean.
+   *
+   * @param <T> the type parameter
+   * @param payloads the payloads
+   * @param requiredRound the required round
+   * @return the boolean
+   */
+  public static <T extends Payload> boolean allMessagesTargetRound(
+      final Collection<SignedData<T>> payloads, final ConsensusRoundIdentifier requiredRound) {
+    return payloads.stream()
+        .allMatch(payload -> payload.getPayload().getRoundIdentifier().equals(requiredRound));
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/RoundChangeMessageValidator.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/RoundChangeMessageValidator.java
new file mode 100644
index 00000000000..61b20343b31
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/RoundChangeMessageValidator.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validation;
+
+import static org.hyperledger.besu.consensus.common.bft.validation.ValidationHelpers.hasDuplicateAuthors;
+import static org.hyperledger.besu.consensus.common.bft.validation.ValidationHelpers.hasSufficientEntries;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.RoundChange;
+import org.hyperledger.besu.consensus.qbft.payload.PreparePayload;
+import org.hyperledger.besu.consensus.qbft.payload.PreparedRoundMetadata;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.BlockValidator;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Round change message validator. */
+public class RoundChangeMessageValidator {
+
+  private static final String ERROR_PREFIX = "Invalid RoundChange Message";
+
+  private static final Logger LOG = LoggerFactory.getLogger(RoundChangeMessageValidator.class);
+
+  private final RoundChangePayloadValidator roundChangePayloadValidator;
+  private final long quorumMessageCount;
+  private final long chainHeight;
+  private final Collection<Address> validators;
+  private final BlockValidator blockValidator;
+  private final ProtocolContext protocolContext;
+
+  /**
+   * Instantiates a new Round change message validator.
+   *
+   * @param roundChangePayloadValidator the round change payload validator
+   * @param quorumMessageCount the quorum message count
+   * @param chainHeight the chain height
+   * @param validators the validators
+   * @param blockValidator the block validator
+   * @param protocolContext the protocol context
+   */
+  public RoundChangeMessageValidator(
+      final RoundChangePayloadValidator roundChangePayloadValidator,
+      final long quorumMessageCount,
+      final long chainHeight,
+      final Collection<Address> validators,
+      final BlockValidator blockValidator,
+      final ProtocolContext protocolContext) {
+    this.roundChangePayloadValidator = roundChangePayloadValidator;
+    this.quorumMessageCount = quorumMessageCount;
+    this.chainHeight = chainHeight;
+    this.validators = validators;
+    this.blockValidator = blockValidator;
+    this.protocolContext = protocolContext;
+  }
+
+  /**
+   * Validate.
+   *
+   * @param msg the Round Change msg
+   * @return the boolean
+   */
+  public boolean validate(final RoundChange msg) {
+
+    if (!roundChangePayloadValidator.validate(msg.getSignedPayload())) {
+      LOG.info("{}: embedded payload was invalid", ERROR_PREFIX);
+      return false;
+    }
+
+    if (msg.getProposedBlock().isPresent()) {
+      return validateWithBlock(msg);
+    }
+
+    return msg.getPreparedRoundMetadata().isEmpty();
+  }
+
+  private boolean validateBlock(final Block block) {
+    final var validationResult =
+        blockValidator.validateAndProcessBlock(
+            protocolContext, block, HeaderValidationMode.LIGHT, HeaderValidationMode.FULL);
+
+    if (!validationResult.isSuccessful()) {
+      LOG.info(
+          "{}: block did not pass validation. Reason {}",
+          ERROR_PREFIX,
+          validationResult.errorMessage);
+      return false;
+    }
+
+    return true;
+  }
+
+  private boolean validateWithBlock(final RoundChange msg) {
+    final Block block = msg.getProposedBlock().get();
+
+    if (!validateBlock(block)) {
+      return false;
+    }
+
+    if (msg.getPreparedRoundMetadata().isEmpty()) {
+      LOG.info("{}: Prepared block specified, but prepared metadata absent", ERROR_PREFIX);
+      return false;
+    }
+
+    final PreparedRoundMetadata metadata = msg.getPreparedRoundMetadata().get();
+
+    if (!metadata.getPreparedBlockHash().equals(block.getHash())) {
+      LOG.info("{}: Prepared metadata hash does not match supplied block", ERROR_PREFIX);
+      return false;
+    }
+
+    return validatePrepares(metadata, msg.getPrepares());
+  }
+
+  private boolean validatePrepares(
+      final PreparedRoundMetadata metaData, final List<SignedData<PreparePayload>> prepares) {
+
+    final ConsensusRoundIdentifier preparedRoundIdentifier =
+        new ConsensusRoundIdentifier(chainHeight, metaData.getPreparedRound());
+
+    final PrepareValidator validator =
+        new PrepareValidator(validators, preparedRoundIdentifier, metaData.getPreparedBlockHash());
+
+    if (hasDuplicateAuthors(prepares)) {
+      LOG.info("{}: multiple prepares from the same author.", ERROR_PREFIX);
+      return false;
+    }
+
+    if (!hasSufficientEntries(prepares, quorumMessageCount)) {
+      LOG.info("{}: insufficient Prepare messages piggybacked.", ERROR_PREFIX);
+      return false;
+    }
+
+    return prepares.stream().allMatch(validator::validate);
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/RoundChangePayloadValidator.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/RoundChangePayloadValidator.java
new file mode 100644
index 00000000000..18977bf2902
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validation/RoundChangePayloadValidator.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validation;
+
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.payload.PreparedRoundMetadata;
+import org.hyperledger.besu.consensus.qbft.payload.RoundChangePayload;
+import org.hyperledger.besu.datatypes.Address;
+
+import java.util.Collection;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Note: This does not validate that the received payload is for a future round, only that it was
+ * signed by a known validator, and is for the current chain height. Future-round check must be
+ * performed elsewhere (eg. the BlockHeightManager)
+ */
+public class RoundChangePayloadValidator {
+
+  private static final String ERROR_PREFIX = "Invalid RoundChange Payload";
+  private static final Logger LOG = LoggerFactory.getLogger(RoundChangePayloadValidator.class);
+
+  private final Collection<Address> validators;
+  private final long chainHeight;
+
+  /**
+   * Instantiates a new Round change payload validator.
+   *
+   * @param validators the validators
+   * @param chainHeight the chain height
+   */
+  public RoundChangePayloadValidator(final Collection<Address> validators, final long chainHeight) {
+    this.validators = validators;
+    this.chainHeight = chainHeight;
+  }
+
+  /**
+   * Validate.
+   *
+   * @param signedPayload the signed payload
+   * @return the boolean
+   */
+  public boolean validate(final SignedData<RoundChangePayload> signedPayload) {
+
+    if (!validators.contains(signedPayload.getAuthor())) {
+      LOG.info("{}: did not originate from a recognized validator.", ERROR_PREFIX);
+      return false;
+    }
+
+    final RoundChangePayload payload = signedPayload.getPayload();
+
+    if (payload.getRoundIdentifier().getSequenceNumber() != chainHeight) {
+      LOG.info("{}: did not target expected height", ERROR_PREFIX);
+      return false;
+    }
+
+    final int targetRound = payload.getRoundIdentifier().getRoundNumber();
+    if (targetRound <= 0) {
+      LOG.info("{}: must contain a positive target round number", ERROR_PREFIX);
+      return false;
+    }
+
+    if (payload.getPreparedRoundMetadata().isPresent()) {
+      final PreparedRoundMetadata metadata = payload.getPreparedRoundMetadata().get();
+      if (metadata.getPreparedRound() >= targetRound) {
+        LOG.info("{}: prepared metadata is from a round ahead of target round", ERROR_PREFIX);
+        return false;
+      }
+
+      if (metadata.getPreparedRound() < 0) {
+        LOG.info("{}: prepared metadata is from a negative round number", ERROR_PREFIX);
+        return false;
+      }
+    }
+    return true;
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validator/ForkingValidatorProvider.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validator/ForkingValidatorProvider.java
new file mode 100644
index 00000000000..d24e61d75da
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validator/ForkingValidatorProvider.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.qbft.validator;
+
+import org.hyperledger.besu.config.QbftConfigOptions;
+import org.hyperledger.besu.consensus.common.ForkSpec;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.common.validator.VoteProvider;
+import org.hyperledger.besu.consensus.common.validator.blockbased.BlockValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.Collection;
+import java.util.Optional;
+
+/** The Forking validator provider. */
+public class ForkingValidatorProvider implements ValidatorProvider {
+
+  private final Blockchain blockchain;
+  private final ForksSchedule<QbftConfigOptions> forksSchedule;
+  private final BlockValidatorProvider blockValidatorProvider;
+  private final TransactionValidatorProvider transactionValidatorProvider;
+
+  /**
+   * Instantiates a new Forking validator provider.
+   *
+   * @param blockchain the blockchain
+   * @param forksSchedule the forks schedule
+   * @param blockValidatorProvider the block validator provider
+   * @param transactionValidatorProvider the transaction validator provider
+   */
+  public ForkingValidatorProvider(
+      final Blockchain blockchain,
+      final ForksSchedule<QbftConfigOptions> forksSchedule,
+      final BlockValidatorProvider blockValidatorProvider,
+      final TransactionValidatorProvider transactionValidatorProvider) {
+    this.blockchain = blockchain;
+    this.forksSchedule = forksSchedule;
+    this.blockValidatorProvider = blockValidatorProvider;
+    this.transactionValidatorProvider = transactionValidatorProvider;
+  }
+
+  @Override
+  public Collection<Address> getValidatorsAtHead() {
+    final BlockHeader chainHead = blockchain.getChainHeadHeader();
+    return getValidatorsAfterBlock(chainHead);
+  }
+
+  @Override
+  public Collection<Address> getValidatorsAfterBlock(final BlockHeader parentHeader) {
+    final long nextBlock = parentHeader.getNumber() + 1;
+    return resolveValidatorProvider(nextBlock).getValidatorsAfterBlock(parentHeader);
+  }
+
+  @Override
+  public Collection<Address> getValidatorsForBlock(final BlockHeader header) {
+    return resolveValidatorProvider(header.getNumber()).getValidatorsForBlock(header);
+  }
+
+  @Override
+  public Optional<VoteProvider> getVoteProviderAtHead() {
+    return resolveValidatorProvider(blockchain.getChainHeadHeader().getNumber())
+        .getVoteProviderAtHead();
+  }
+
+  @Override
+  public Optional<VoteProvider> getVoteProviderAfterBlock(final BlockHeader header) {
+    return resolveValidatorProvider(header.getNumber() + 1).getVoteProviderAtHead();
+  }
+
+  private ValidatorProvider resolveValidatorProvider(final long block) {
+    final ForkSpec<QbftConfigOptions> fork = forksSchedule.getFork(block);
+    return fork.getValue().isValidatorContractMode()
+        ? transactionValidatorProvider
+        : blockValidatorProvider;
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validator/TransactionValidatorProvider.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validator/TransactionValidatorProvider.java
new file mode 100644
index 00000000000..569461a8647
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validator/TransactionValidatorProvider.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validator;
+
+import org.hyperledger.besu.config.QbftConfigOptions;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.common.validator.VoteProvider;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.Collection;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
+
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+
+/** The Transaction validator provider. */
+public class TransactionValidatorProvider implements ValidatorProvider {
+
+  private final Blockchain blockchain;
+  private final ValidatorContractController validatorContractController;
+  private final ForksSchedule<QbftConfigOptions> forksSchedule;
+  private final Cache<Long, Collection<Address>> afterBlockValidatorCache =
+      CacheBuilder.newBuilder().maximumSize(100).build();
+  private final Cache<Long, Collection<Address>> forBlockValidatorCache =
+      CacheBuilder.newBuilder().maximumSize(100).build();
+
+  /**
+   * Instantiates a new Transaction validator provider.
+   *
+   * @param blockchain the blockchain
+   * @param validatorContractController the validator contract controller
+   * @param forksSchedule the forks schedule
+   */
+  public TransactionValidatorProvider(
+      final Blockchain blockchain,
+      final ValidatorContractController validatorContractController,
+      final ForksSchedule<QbftConfigOptions> forksSchedule) {
+    this.blockchain = blockchain;
+    this.validatorContractController = validatorContractController;
+    this.forksSchedule = forksSchedule;
+  }
+
+  @Override
+  public Collection<Address> getValidatorsAtHead() {
+    return getValidatorsAfterBlock(blockchain.getChainHeadHeader());
+  }
+
+  @Override
+  public Collection<Address> getValidatorsAfterBlock(final BlockHeader parentHeader) {
+    // For the validator contract we determine the validators from the previous block but the
+    // address from block about to be created
+    final long nextBlock = parentHeader.getNumber() + 1;
+    final Address contractAddress = resolveContractAddress(nextBlock);
+    return getValidatorsFromContract(afterBlockValidatorCache, parentHeader, contractAddress);
+  }
+
+  @Override
+  public Collection<Address> getValidatorsForBlock(final BlockHeader header) {
+    final Address contractAddress = resolveContractAddress(header.getNumber());
+    return getValidatorsFromContract(forBlockValidatorCache, header, contractAddress);
+  }
+
+  private Collection<Address> getValidatorsFromContract(
+      final Cache<Long, Collection<Address>> validatorCache,
+      final BlockHeader header,
+      final Address contractAddress) {
+    final long blockNumber = header.getNumber();
+    try {
+      return validatorCache.get(
+          blockNumber,
+          () ->
+              validatorContractController.getValidators(blockNumber, contractAddress).stream()
+                  .sorted()
+                  .collect(Collectors.toList()));
+    } catch (final ExecutionException e) {
+      throw new RuntimeException("Unable to determine a validators for the requested block.");
+    }
+  }
+
+  @Override
+  public Optional<VoteProvider> getVoteProviderAtHead() {
+    return Optional.empty();
+  }
+
+  private Address resolveContractAddress(final long blockNumber) {
+    return forksSchedule
+        .getFork(blockNumber)
+        .getValue()
+        .getValidatorContractAddress()
+        .map(Address::fromHexString)
+        .orElseThrow(
+            () ->
+                new RuntimeException(
+                    "Error resolving smart contract address unable to make validator contract call"));
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validator/ValidatorContractController.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validator/ValidatorContractController.java
new file mode 100644
index 00000000000..a7b705e4a9d
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validator/ValidatorContractController.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validator;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.mainnet.ImmutableTransactionValidationParams;
+import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
+import org.hyperledger.besu.ethereum.transaction.CallParameter;
+import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
+import org.hyperledger.besu.ethereum.transaction.TransactionSimulatorResult;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.web3j.abi.FunctionEncoder;
+import org.web3j.abi.FunctionReturnDecoder;
+import org.web3j.abi.TypeReference;
+import org.web3j.abi.datatypes.DynamicArray;
+import org.web3j.abi.datatypes.Function;
+import org.web3j.abi.datatypes.Type;
+
+/** The Validator contract controller. */
+public class ValidatorContractController {
+  /** The constant GET_VALIDATORS. */
+  public static final String GET_VALIDATORS = "getValidators";
+  /** The constant CONTRACT_ERROR_MSG. */
+  public static final String CONTRACT_ERROR_MSG = "Failed validator smart contract call";
+
+  private final TransactionSimulator transactionSimulator;
+  private final Function getValidatorsFunction;
+
+  /**
+   * Instantiates a new Validator contract controller.
+   *
+   * @param transactionSimulator the transaction simulator
+   */
+  public ValidatorContractController(final TransactionSimulator transactionSimulator) {
+    this.transactionSimulator = transactionSimulator;
+
+    try {
+      this.getValidatorsFunction =
+          new Function(
+              GET_VALIDATORS,
+              List.of(),
+              List.of(new TypeReference<DynamicArray<org.web3j.abi.datatypes.Address>>() {}));
+    } catch (final Exception e) {
+      throw new RuntimeException("Error creating smart contract function", e);
+    }
+  }
+
+  /**
+   * Gets validators.
+   *
+   * @param blockNumber the block number
+   * @param contractAddress the contract address
+   * @return the validators
+   */
+  public Collection<Address> getValidators(final long blockNumber, final Address contractAddress) {
+    return callFunction(blockNumber, getValidatorsFunction, contractAddress)
+        .map(this::parseGetValidatorsResult)
+        .orElseThrow(() -> new IllegalStateException(CONTRACT_ERROR_MSG));
+  }
+
+  @SuppressWarnings({"rawtypes", "unchecked"})
+  private Collection<Address> parseGetValidatorsResult(final TransactionSimulatorResult result) {
+    final List<Type> resultDecoding = decodeResult(result, getValidatorsFunction);
+    final List<org.web3j.abi.datatypes.Address> addresses =
+        (List<org.web3j.abi.datatypes.Address>) resultDecoding.get(0).getValue();
+    return addresses.stream()
+        .map(a -> Address.fromHexString(a.getValue()))
+        .collect(Collectors.toList());
+  }
+
+  private Optional<TransactionSimulatorResult> callFunction(
+      final long blockNumber, final Function function, final Address contractAddress) {
+    final Bytes payload = Bytes.fromHexString(FunctionEncoder.encode(function));
+    final CallParameter callParams =
+        new CallParameter(null, contractAddress, -1, null, null, payload);
+    final TransactionValidationParams transactionValidationParams =
+        ImmutableTransactionValidationParams.builder()
+            .from(TransactionValidationParams.transactionSimulator())
+            .isAllowExceedingBalance(true)
+            .build();
+    return transactionSimulator.process(
+        callParams, transactionValidationParams, OperationTracer.NO_TRACING, blockNumber);
+  }
+
+  @SuppressWarnings("rawtypes")
+  private List<Type> decodeResult(
+      final TransactionSimulatorResult result, final Function function) {
+    if (result.isSuccessful()) {
+      final List<Type> decodedList =
+          FunctionReturnDecoder.decode(
+              result.getResult().getOutput().toHexString(), function.getOutputParameters());
+
+      if (decodedList.isEmpty()) {
+        throw new IllegalStateException(
+            "Unexpected empty result from validator smart contract call");
+      }
+
+      return decodedList;
+    } else {
+      throw new IllegalStateException(
+          "Failed validator smart contract call: " + result.getValidationResult());
+    }
+  }
+}
diff --git a/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validator/ValidatorModeTransitionLogger.java b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validator/ValidatorModeTransitionLogger.java
new file mode 100644
index 00000000000..a25a32458a2
--- /dev/null
+++ b/consensus/qbft/src/main/java/org/hyperledger/besu/consensus/qbft/validator/ValidatorModeTransitionLogger.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.qbft.validator;
+
+import org.hyperledger.besu.config.QbftConfigOptions;
+import org.hyperledger.besu.consensus.common.ForkSpec;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.function.Consumer;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Validator mode transition logger. */
+public class ValidatorModeTransitionLogger {
+
+  private static final Logger LOG = LoggerFactory.getLogger(ValidatorModeTransitionLogger.class);
+
+  private final ForksSchedule<QbftConfigOptions> forksSchedule;
+  private final Consumer<String> msgConsumer;
+
+  /**
+   * Instantiates a new Validator mode transition logger.
+   *
+   * @param forksSchedule the forks schedule
+   */
+  public ValidatorModeTransitionLogger(final ForksSchedule<QbftConfigOptions> forksSchedule) {
+    this.forksSchedule = forksSchedule;
+    this.msgConsumer = LOG::info;
+  }
+
+  /**
+   * Instantiates a new Validator mode transition logger.
+   *
+   * @param forksSchedule the forks schedule
+   * @param msgConsumer the msg consumer
+   */
+  @VisibleForTesting
+  ValidatorModeTransitionLogger(
+      final ForksSchedule<QbftConfigOptions> forksSchedule, final Consumer<String> msgConsumer) {
+    this.forksSchedule = forksSchedule;
+    this.msgConsumer = msgConsumer;
+  }
+
+  /**
+   * Log transition change.
+   *
+   * @param parentHeader the parent header
+   */
+  public void logTransitionChange(final BlockHeader parentHeader) {
+    final ForkSpec<QbftConfigOptions> currentForkSpec =
+        forksSchedule.getFork(parentHeader.getNumber());
+    final ForkSpec<QbftConfigOptions> nextForkSpec =
+        forksSchedule.getFork(parentHeader.getNumber() + 1L);
+
+    final QbftConfigOptions currentConfigOptions = currentForkSpec.getValue();
+    final QbftConfigOptions nextConfigOptions = nextForkSpec.getValue();
+
+    if (hasChangedConfig(currentConfigOptions, nextConfigOptions)) {
+      msgConsumer.accept(
+          String.format(
+              "Transitioning validator selection mode from %s to %s",
+              parseConfigToLog(currentConfigOptions), parseConfigToLog(nextConfigOptions)));
+    }
+  }
+
+  private boolean hasChangedConfig(
+      final QbftConfigOptions currentConfig, final QbftConfigOptions nextConfig) {
+    return !currentConfig
+        .getValidatorContractAddress()
+        .equals(nextConfig.getValidatorContractAddress());
+  }
+
+  private String parseConfigToLog(final QbftConfigOptions configOptions) {
+    if (configOptions.getValidatorContractAddress().isPresent()) {
+      return String.format(
+          "contract (address: %s)", configOptions.getValidatorContractAddress().get());
+    } else {
+      return "blockheader";
+    }
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/MutableQbftConfigOptionsTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/MutableQbftConfigOptionsTest.java
new file mode 100644
index 00000000000..d41996d11db
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/MutableQbftConfigOptionsTest.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ *  the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.qbft;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.QbftConfigOptions;
+
+import java.util.Optional;
+
+import org.junit.jupiter.api.Test;
+
+public class MutableQbftConfigOptionsTest {
+
+  private final QbftConfigOptions qbftConfigOptions = mock(QbftConfigOptions.class);
+
+  @Test
+  public void getValidatorContractAddressNormalization() {
+    when(qbftConfigOptions.getValidatorContractAddress()).thenReturn(Optional.of("0xABC"));
+
+    final MutableQbftConfigOptions mutableQbftConfigOptions =
+        new MutableQbftConfigOptions(qbftConfigOptions);
+
+    assertThat(mutableQbftConfigOptions.getValidatorContractAddress()).hasValue("0xabc");
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/QbftBlockHeaderUtils.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/QbftBlockHeaderUtils.java
new file mode 100644
index 00000000000..1daed4c1d46
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/QbftBlockHeaderUtils.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft;
+
+import static java.util.Collections.singletonList;
+
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataFixture;
+import org.hyperledger.besu.consensus.common.bft.Vote;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.Util;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class QbftBlockHeaderUtils {
+
+  private static final int ROUND_NUMBER = 0x2A;
+
+  @FunctionalInterface
+  public interface HeaderModifier {
+
+    void update(BlockHeaderTestFixture blockHeaderTestFixture);
+  }
+
+  public static BlockHeaderTestFixture createPresetHeaderBuilder(
+      final long number,
+      final NodeKey proposerNodeKey,
+      final List<Address> validators,
+      final BlockHeader parent,
+      final Optional<Wei> baseFee) {
+    return createPresetHeaderBuilder(number, proposerNodeKey, validators, parent, null, baseFee);
+  }
+
+  public static BlockHeaderTestFixture createPresetHeaderBuilderForContractMode(
+      final long number,
+      final NodeKey proposerNodeKey,
+      final BlockHeader parent,
+      final HeaderModifier modifier,
+      final Optional<Wei> baseFee) {
+    final BlockHeaderTestFixture builder = new BlockHeaderTestFixture();
+    final QbftExtraDataCodec qbftExtraDataEncoder = new QbftExtraDataCodec();
+    populateDefaultBlockHeader(
+        number, proposerNodeKey, parent, modifier, builder, qbftExtraDataEncoder, baseFee);
+
+    final BftExtraData bftExtraData =
+        BftExtraDataFixture.createExtraData(
+            builder.buildHeader(),
+            Bytes.wrap(new byte[BftExtraDataCodec.EXTRA_VANITY_LENGTH]),
+            Optional.empty(),
+            Collections.emptyList(),
+            singletonList(proposerNodeKey),
+            ROUND_NUMBER,
+            qbftExtraDataEncoder);
+
+    builder.extraData(qbftExtraDataEncoder.encode(bftExtraData));
+    return builder;
+  }
+
+  public static BlockHeaderTestFixture createPresetHeaderBuilder(
+      final long number,
+      final NodeKey proposerNodeKey,
+      final List<Address> validators,
+      final BlockHeader parent,
+      final HeaderModifier modifier,
+      final Optional<Wei> baseFee) {
+    final BlockHeaderTestFixture builder = new BlockHeaderTestFixture();
+    final QbftExtraDataCodec qbftExtraDataEncoder = new QbftExtraDataCodec();
+    populateDefaultBlockHeader(
+        number, proposerNodeKey, parent, modifier, builder, qbftExtraDataEncoder, baseFee);
+
+    final BftExtraData bftExtraData =
+        BftExtraDataFixture.createExtraData(
+            builder.buildHeader(),
+            Bytes.wrap(new byte[BftExtraDataCodec.EXTRA_VANITY_LENGTH]),
+            Optional.of(Vote.authVote(Address.fromHexString("1"))),
+            validators,
+            singletonList(proposerNodeKey),
+            ROUND_NUMBER,
+            qbftExtraDataEncoder);
+
+    builder.extraData(qbftExtraDataEncoder.encode(bftExtraData));
+    return builder;
+  }
+
+  private static void populateDefaultBlockHeader(
+      final long number,
+      final NodeKey proposerNodeKey,
+      final BlockHeader parent,
+      final HeaderModifier modifier,
+      final BlockHeaderTestFixture builder,
+      final QbftExtraDataCodec qbftExtraDataEncoder,
+      final Optional<Wei> baseFee) {
+    if (parent != null) {
+      builder.parentHash(parent.getHash());
+    }
+    builder.number(number);
+    builder.gasLimit(5000);
+    builder.timestamp(6 * number);
+    builder.mixHash(
+        Hash.fromHexString("0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365"));
+    builder.difficulty(Difficulty.ONE);
+    builder.coinbase(Util.publicKeyToAddress(proposerNodeKey.getPublicKey()));
+    builder.blockHeaderFunctions(BftBlockHeaderFunctions.forCommittedSeal(qbftExtraDataEncoder));
+    baseFee.ifPresent(fee -> builder.baseFeePerGas(fee));
+
+    if (modifier != null) {
+      modifier.update(builder);
+    }
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/QbftBlockHeaderValidationRulesetFactoryTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/QbftBlockHeaderValidationRulesetFactoryTest.java
new file mode 100644
index 00000000000..641e23db6fa
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/QbftBlockHeaderValidationRulesetFactoryTest.java
@@ -0,0 +1,371 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.consensus.common.bft.BftContextBuilder.setupContextWithBftExtraDataEncoder;
+
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.Util;
+import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
+import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+
+import org.junit.jupiter.api.Test;
+
+public class QbftBlockHeaderValidationRulesetFactoryTest {
+
+  private ProtocolContext protocolContext(final Collection<Address> validators) {
+    return new ProtocolContext(
+        null,
+        null,
+        setupContextWithBftExtraDataEncoder(
+            QbftContext.class, validators, new QbftExtraDataCodec()),
+        Optional.empty());
+  }
+
+  @Test
+  public void bftValidateHeaderPasses() {
+    final NodeKey proposerNodeKey = NodeKeyUtils.generate();
+    final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
+
+    final List<Address> validators = singletonList(proposerAddress);
+
+    final BlockHeader parentHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                1, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
+    final BlockHeader blockHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                2, proposerNodeKey, validators, parentHeader, Optional.empty())
+            .buildHeader();
+
+    final BlockHeaderValidator validator = getBlockHeaderValidator();
+
+    assertThat(
+            validator.validateHeader(
+                blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.FULL))
+        .isTrue();
+  }
+
+  @Test
+  public void bftValidateHeaderPassesWithBaseFee() {
+    final NodeKey proposerNodeKey = NodeKeyUtils.generate();
+    final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
+
+    final List<Address> validators = singletonList(proposerAddress);
+
+    final BlockHeader parentHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                1, proposerNodeKey, validators, null, Optional.of(Wei.ONE))
+            .buildHeader();
+    final BlockHeader blockHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                2, proposerNodeKey, validators, parentHeader, Optional.of(Wei.ONE))
+            .buildHeader();
+
+    final BlockHeaderValidator validator =
+        QbftBlockHeaderValidationRulesetFactory.blockHeaderValidator(
+                5, false, Optional.of(FeeMarket.london(1)))
+            .build();
+
+    assertThat(
+            validator.validateHeader(
+                blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.FULL))
+        .isTrue();
+  }
+
+  @Test
+  public void bftValidateHeaderFailsWhenExtraDataDoesntContainValidatorList() {
+    final NodeKey proposerNodeKey = NodeKeyUtils.generate();
+    final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
+
+    final List<Address> validators = singletonList(proposerAddress);
+
+    final BlockHeader parentHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                1, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
+    final BlockHeader blockHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                2, proposerNodeKey, emptyList(), parentHeader, Optional.empty())
+            .buildHeader();
+
+    final BlockHeaderValidator validator = getBlockHeaderValidator();
+
+    assertThat(
+            validator.validateHeader(
+                blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.FULL))
+        .isFalse();
+  }
+
+  @Test
+  public void bftValidateHeaderFailsOnCoinbaseData() {
+    final NodeKey proposerNodeKey = NodeKeyUtils.generate();
+    final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
+
+    final Address nonProposerAddress =
+        Util.publicKeyToAddress(NodeKeyUtils.generate().getPublicKey());
+
+    final List<Address> validators = singletonList(proposerAddress);
+
+    final BlockHeader parentHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                1, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
+    final BlockHeader blockHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                2, proposerNodeKey, validators, parentHeader, Optional.empty())
+            .coinbase(nonProposerAddress)
+            .buildHeader();
+
+    final BlockHeaderValidator validator = getBlockHeaderValidator();
+
+    assertThat(
+            validator.validateHeader(
+                blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.FULL))
+        .isFalse();
+  }
+
+  @Test
+  public void bftValidateHeaderIgnoresNonceValue() {
+    final NodeKey proposerNodeKey = NodeKeyUtils.generate();
+    final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
+
+    final List<Address> validators = singletonList(proposerAddress);
+
+    final BlockHeader parentHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                1, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
+    final BlockHeader blockHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                2,
+                proposerNodeKey,
+                validators,
+                parentHeader,
+                builder -> builder.nonce(3),
+                Optional.empty())
+            .buildHeader();
+
+    final BlockHeaderValidator validator = getBlockHeaderValidator();
+
+    assertThat(
+            validator.validateHeader(
+                blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.FULL))
+        .isTrue();
+  }
+
+  @Test
+  public void bftValidateHeaderFailsOnTimestamp() {
+    final NodeKey proposerNodeKey = NodeKeyUtils.generate();
+    final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
+
+    final List<Address> validators = singletonList(proposerAddress);
+
+    final BlockHeader parentHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                1, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
+    final BlockHeader blockHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                2, proposerNodeKey, validators, parentHeader, Optional.empty())
+            .timestamp(100)
+            .buildHeader();
+
+    final BlockHeaderValidator validator = getBlockHeaderValidator();
+
+    assertThat(
+            validator.validateHeader(
+                blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.FULL))
+        .isFalse();
+  }
+
+  @Test
+  public void bftValidateHeaderFailsOnMixHash() {
+    final NodeKey proposerNodeKey = NodeKeyUtils.generate();
+    final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
+
+    final List<Address> validators = singletonList(proposerAddress);
+
+    final BlockHeader parentHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                1, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
+    final BlockHeader blockHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                2,
+                proposerNodeKey,
+                validators,
+                parentHeader,
+                builder -> builder.mixHash(Hash.EMPTY_TRIE_HASH),
+                Optional.empty())
+            .buildHeader();
+
+    final BlockHeaderValidator validator = getBlockHeaderValidator();
+
+    assertThat(
+            validator.validateHeader(
+                blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.FULL))
+        .isFalse();
+  }
+
+  @Test
+  public void bftValidateHeaderIgnoresOmmersValue() {
+    final NodeKey proposerNodeKey = NodeKeyUtils.generate();
+    final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
+
+    final List<Address> validators = singletonList(proposerAddress);
+
+    final BlockHeader parentHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                1, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
+    final BlockHeader blockHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                2,
+                proposerNodeKey,
+                validators,
+                parentHeader,
+                builder -> builder.ommersHash(Hash.EMPTY_TRIE_HASH),
+                Optional.empty())
+            .buildHeader();
+
+    final BlockHeaderValidator validator = getBlockHeaderValidator();
+
+    assertThat(
+            validator.validateHeader(
+                blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.FULL))
+        .isTrue();
+  }
+
+  @Test
+  public void bftValidateHeaderFailsOnDifficulty() {
+    final NodeKey proposerNodeKey = NodeKeyUtils.generate();
+    final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
+
+    final List<Address> validators = singletonList(proposerAddress);
+
+    final BlockHeader parentHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                1, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
+    final BlockHeader blockHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                2, proposerNodeKey, validators, parentHeader, Optional.empty())
+            .difficulty(Difficulty.of(5))
+            .buildHeader();
+
+    final BlockHeaderValidator validator = getBlockHeaderValidator();
+
+    assertThat(
+            validator.validateHeader(
+                blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.FULL))
+        .isFalse();
+  }
+
+  @Test
+  public void bftValidateHeaderFailsOnAncestor() {
+    final NodeKey proposerNodeKey = NodeKeyUtils.generate();
+    final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
+
+    final List<Address> validators = singletonList(proposerAddress);
+
+    final BlockHeader parentHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                1, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
+    final BlockHeader blockHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                2, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
+
+    final BlockHeaderValidator validator = getBlockHeaderValidator();
+
+    assertThat(
+            validator.validateHeader(
+                blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.FULL))
+        .isFalse();
+  }
+
+  @Test
+  public void bftValidateHeaderFailsOnGasUsage() {
+    final NodeKey proposerNodeKey = NodeKeyUtils.generate();
+    final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
+
+    final List<Address> validators = singletonList(proposerAddress);
+
+    final BlockHeader parentHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                1, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
+    final BlockHeader blockHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                2, proposerNodeKey, validators, parentHeader, Optional.empty())
+            .gasLimit(5_000)
+            .gasUsed(6_000)
+            .buildHeader();
+
+    final BlockHeaderValidator validator = getBlockHeaderValidator();
+
+    assertThat(
+            validator.validateHeader(
+                blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.FULL))
+        .isFalse();
+  }
+
+  @Test
+  public void bftValidateHeaderFailsOnGasLimitRange() {
+    final NodeKey proposerNodeKey = NodeKeyUtils.generate();
+    final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
+
+    final List<Address> validators = singletonList(proposerAddress);
+
+    final BlockHeader parentHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                1, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
+    final BlockHeader blockHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                2, proposerNodeKey, validators, parentHeader, Optional.empty())
+            .gasLimit(4999)
+            .buildHeader();
+
+    final BlockHeaderValidator validator = getBlockHeaderValidator();
+
+    assertThat(
+            validator.validateHeader(
+                blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.FULL))
+        .isFalse();
+  }
+
+  public BlockHeaderValidator getBlockHeaderValidator() {
+    return QbftBlockHeaderValidationRulesetFactory.blockHeaderValidator(5, false, Optional.empty())
+        .build();
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/QbftExtraDataCodecTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/QbftExtraDataCodecTest.java
new file mode 100644
index 00000000000..018f0f9113d
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/QbftExtraDataCodecTest.java
@@ -0,0 +1,502 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hyperledger.besu.consensus.qbft.QbftExtraDataCodecTestUtils.createNonEmptyVanityData;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.Vote;
+import org.hyperledger.besu.consensus.common.validator.VoteType;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLPException;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.Random;
+import java.util.function.Supplier;
+
+import com.google.common.base.Suppliers;
+import com.google.common.collect.Lists;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Test;
+
+public class QbftExtraDataCodecTest {
+
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+
+  private final String RAW_HEX_ENCODING_STRING =
+      "0xf8f0a00102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20ea940000000000000000"
+          + "000000000000000000000001940000000000000000000000000000000000000002d7940000000000000000"
+          + "00000000000000000000000181ff83fedcbaf886b841000000000000000000000000000000000000000000"
+          + "0000000000000000000001000000000000000000000000000000000000000000000000000000000000000a"
+          + "00b841000000000000000000000000000000000000000000000000000000000000000a0000000000000000"
+          + "00000000000000000000000000000000000000000000000100";
+
+  private final BftExtraData DECODED_EXTRA_DATA_FOR_RAW_HEX_ENCODING_STRING =
+      getDecodedExtraDataForRawHexEncodingString();
+  private final QbftExtraDataCodec bftExtraDataCodec = new QbftExtraDataCodec();
+
+  private static BftExtraData getDecodedExtraDataForRawHexEncodingString() {
+    final List<Address> validators =
+        Arrays.asList(Address.fromHexString("1"), Address.fromHexString("2"));
+    final Optional<Vote> vote = Optional.of(Vote.authVote(Address.fromHexString("1")));
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals =
+        Arrays.asList(
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 0),
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.TEN, BigInteger.ONE, (byte) 0));
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = createNonEmptyVanityData();
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    return new BftExtraData(vanity_data, committerSeals, vote, round, validators);
+  }
+
+  @Test
+  public void correctlyCodedRoundConstitutesValidContent() {
+    final List<Address> validators = Lists.newArrayList();
+    final Optional<Vote> vote = Optional.of(Vote.authVote(Address.fromHexString("1")));
+    final int round = 0xDCBA;
+    final byte[] roundAsByteArray = new byte[] {(byte) 0xDC, (byte) 0xBA};
+    final List<SECPSignature> committerSeals = Lists.newArrayList();
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = new byte[32];
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
+    encoder.startList();
+    encoder.writeBytes(vanity_data);
+    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
+
+    encoder.startList();
+    encoder.writeBytes(vote.get().getRecipient());
+    encoder.writeByte(Vote.ADD_BYTE_VALUE);
+    encoder.endList();
+
+    // This is to verify that the decoding works correctly when the round is encoded as non-fixed
+    // length bytes
+    encoder.writeBytes(Bytes.wrap(roundAsByteArray));
+    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
+    encoder.endList();
+
+    final Bytes bufferToInject = encoder.encoded();
+
+    final BftExtraData extraData = bftExtraDataCodec.decodeRaw(bufferToInject);
+
+    assertThat(extraData.getVanityData()).isEqualTo(vanity_data);
+    assertThat(extraData.getRound()).isEqualTo(round);
+    assertThat(extraData.getSeals()).isEqualTo(committerSeals);
+    assertThat(extraData.getValidators()).isEqualTo(validators);
+  }
+
+  /**
+   * This test specifically verifies that {@link QbftExtraDataCodec#decode(BlockHeader)} uses {@link
+   * RLPInput#readIntScalar()} rather than {@link RLPInput#readInt()} to decode the round number
+   */
+  @Test
+  public void incorrectlyEncodedRoundThrowsRlpException() {
+    final List<Address> validators = Lists.newArrayList();
+    final Optional<Vote> vote = Optional.of(Vote.authVote(Address.fromHexString("1")));
+    final byte[] roundAsByteArray = new byte[] {(byte) 0x00, (byte) 0xDC, (byte) 0xBA};
+    final List<SECPSignature> committerSeals = Lists.newArrayList();
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = new byte[32];
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
+    encoder.startList();
+    encoder.writeBytes(vanity_data);
+    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
+
+    encoder.writeBytes(vote.get().getRecipient());
+    encoder.writeByte(Vote.ADD_BYTE_VALUE);
+
+    // This is to verify that the decoding throws an exception when the round number is encoded in
+    // 4 byte format
+    encoder.writeBytes(Bytes.wrap(roundAsByteArray));
+    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
+    encoder.endList();
+
+    final Bytes bufferToInject = encoder.encoded();
+
+    assertThatThrownBy(() -> bftExtraDataCodec.decodeRaw(bufferToInject))
+        .isInstanceOf(RLPException.class);
+  }
+
+  @Test
+  public void nullVoteAndListConstituteValidContent() {
+    final List<Address> validators = Lists.newArrayList();
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals = Lists.newArrayList();
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = new byte[32];
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
+    encoder.startList();
+    encoder.writeBytes(vanity_data);
+    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
+
+    // encode an empty vote
+    encoder.writeEmptyList();
+
+    encoder.writeIntScalar(round);
+    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
+    encoder.endList();
+
+    final Bytes bufferToInject = encoder.encoded();
+
+    final BftExtraData extraData = bftExtraDataCodec.decodeRaw(bufferToInject);
+
+    assertThat(extraData.getVanityData()).isEqualTo(vanity_data);
+    assertThat(extraData.getVote().isPresent()).isEqualTo(false);
+    assertThat(extraData.getRound()).isEqualTo(round);
+    assertThat(extraData.getSeals()).isEqualTo(committerSeals);
+    assertThat(extraData.getValidators()).isEqualTo(validators);
+  }
+
+  @Test
+  public void emptyVoteAndListIsEncodedCorrectly() {
+    final List<Address> validators = Lists.newArrayList();
+    final Optional<Vote> vote = Optional.empty();
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals = Lists.newArrayList();
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = new byte[32];
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    BftExtraData expectedExtraData =
+        new BftExtraData(vanity_data, committerSeals, vote, round, validators);
+
+    BftExtraData actualExtraData =
+        bftExtraDataCodec.decodeRaw(bftExtraDataCodec.encode(expectedExtraData));
+
+    assertThat(actualExtraData).isEqualToComparingFieldByField(expectedExtraData);
+  }
+
+  @Test
+  public void emptyListConstituteValidContent() {
+    final List<Address> validators = Lists.newArrayList();
+    final Optional<Vote> vote = Optional.of(Vote.dropVote(Address.fromHexString("1")));
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals = Lists.newArrayList();
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = new byte[32];
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
+    encoder.startList();
+    encoder.writeBytes(vanity_data);
+    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
+
+    // encoded vote
+    encoder.startList();
+    encoder.writeBytes(vote.get().getRecipient());
+    encoder.writeNull();
+    encoder.endList();
+
+    encoder.writeIntScalar(round);
+    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
+    encoder.endList();
+
+    final Bytes bufferToInject = encoder.encoded();
+
+    final BftExtraData extraData = bftExtraDataCodec.decodeRaw(bufferToInject);
+
+    assertThat(extraData.getVanityData()).isEqualTo(vanity_data);
+    assertThat(extraData.getRound()).isEqualTo(round);
+    assertThat(extraData.getSeals()).isEqualTo(committerSeals);
+    assertThat(extraData.getValidators()).isEqualTo(validators);
+  }
+
+  @Test
+  public void emptyListsAreEncodedAndDecodedCorrectly() {
+    final List<Address> validators = Lists.newArrayList();
+    final Optional<Vote> vote = Optional.of(Vote.authVote(Address.fromHexString("1")));
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals = Lists.newArrayList();
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = new byte[32];
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    BftExtraData expectedExtraData =
+        new BftExtraData(vanity_data, committerSeals, vote, round, validators);
+
+    BftExtraData actualExtraData =
+        bftExtraDataCodec.decodeRaw(bftExtraDataCodec.encode(expectedExtraData));
+
+    assertThat(actualExtraData).isEqualToComparingFieldByField(expectedExtraData);
+  }
+
+  @Test
+  public void fullyPopulatedDataProducesCorrectlyFormedExtraDataObject() {
+    final List<Address> validators =
+        Arrays.asList(Address.fromHexString("1"), Address.fromHexString("2"));
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals =
+        Arrays.asList(
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 0),
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.TEN, BigInteger.ONE, (byte) 0));
+
+    // Create randomised vanity data.
+    final byte[] vanity_bytes = createNonEmptyVanityData();
+    new Random().nextBytes(vanity_bytes);
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
+    encoder.startList(); // This is required to create a "root node" for all RLP'd data
+    encoder.writeBytes(vanity_data);
+    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
+
+    // encoded vote
+    encoder.startList();
+    encoder.writeBytes(Address.fromHexString("1"));
+    encoder.writeByte(Vote.ADD_BYTE_VALUE);
+    encoder.endList();
+
+    encoder.writeIntScalar(round);
+    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
+    encoder.endList();
+
+    final Bytes bufferToInject = encoder.encoded();
+
+    final BftExtraData extraData = bftExtraDataCodec.decodeRaw(bufferToInject);
+
+    assertThat(extraData.getVanityData()).isEqualTo(vanity_data);
+    assertThat(extraData.getVote())
+        .isEqualTo(Optional.of(new Vote(Address.fromHexString("1"), VoteType.ADD)));
+    assertThat(extraData.getRound()).isEqualTo(round);
+    assertThat(extraData.getSeals()).isEqualTo(committerSeals);
+    assertThat(extraData.getValidators()).isEqualTo(validators);
+  }
+
+  @Test
+  public void fullyPopulatedDataIsEncodedAndDecodedCorrectly() {
+    final List<Address> validators =
+        Arrays.asList(Address.fromHexString("1"), Address.fromHexString("2"));
+    final Optional<Vote> vote = Optional.of(Vote.authVote(Address.fromHexString("1")));
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals =
+        Arrays.asList(
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 0),
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.TEN, BigInteger.ONE, (byte) 0));
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = createNonEmptyVanityData();
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    BftExtraData expectedExtraData =
+        new BftExtraData(vanity_data, committerSeals, vote, round, validators);
+
+    BftExtraData actualExtraData =
+        bftExtraDataCodec.decodeRaw(bftExtraDataCodec.encode(expectedExtraData));
+
+    assertThat(actualExtraData).isEqualToComparingFieldByField(expectedExtraData);
+  }
+
+  @Test
+  public void encodingMatchesKnownRawHexString() {
+    final Bytes expectedRawDecoding = Bytes.fromHexString(RAW_HEX_ENCODING_STRING);
+    assertThat(bftExtraDataCodec.encode(DECODED_EXTRA_DATA_FOR_RAW_HEX_ENCODING_STRING))
+        .isEqualTo(expectedRawDecoding);
+  }
+
+  @Test
+  public void decodingOfKnownRawHexStringMatchesKnowExtraDataObject() {
+    final BftExtraData expectedExtraData = DECODED_EXTRA_DATA_FOR_RAW_HEX_ENCODING_STRING;
+
+    Bytes rawDecoding = Bytes.fromHexString(RAW_HEX_ENCODING_STRING);
+    BftExtraData actualExtraData = bftExtraDataCodec.decodeRaw(rawDecoding);
+
+    assertThat(actualExtraData).isEqualToComparingFieldByField(expectedExtraData);
+  }
+
+  @Test
+  public void extraDataCanBeEncodedWithoutCommitSeals() {
+    final List<Address> validators =
+        Arrays.asList(Address.fromHexString("1"), Address.fromHexString("2"));
+    final Optional<Vote> vote = Optional.of(Vote.authVote(Address.fromHexString("1")));
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals =
+        Arrays.asList(
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 0),
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.TEN, BigInteger.ONE, (byte) 0));
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = createNonEmptyVanityData();
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
+    encoder.startList();
+    encoder.writeBytes(vanity_data);
+    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
+
+    // encoded vote
+    encoder.startList();
+    encoder.writeBytes(Address.fromHexString("1"));
+    encoder.writeByte(Vote.ADD_BYTE_VALUE);
+    encoder.endList();
+
+    encoder.writeIntScalar(round);
+    encoder.writeEmptyList();
+    encoder.endList();
+
+    Bytes expectedEncoding = encoder.encoded();
+
+    Bytes actualEncoding =
+        bftExtraDataCodec.encodeWithoutCommitSeals(
+            new BftExtraData(vanity_data, committerSeals, vote, round, validators));
+
+    System.out.println("actualEncoding = " + actualEncoding);
+
+    assertThat(actualEncoding).isEqualTo(expectedEncoding);
+  }
+
+  @Test
+  public void extraDataCanBeEncodedWithoutCommitSealsOrRoundNumber() {
+    final List<Address> validators =
+        Arrays.asList(Address.fromHexString("1"), Address.fromHexString("2"));
+    final Optional<Vote> vote = Optional.of(Vote.authVote(Address.fromHexString("1")));
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals =
+        Arrays.asList(
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 0),
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.TEN, BigInteger.ONE, (byte) 0));
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = createNonEmptyVanityData();
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
+    encoder.startList();
+    encoder.writeBytes(vanity_data);
+    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
+
+    // encoded vote
+    encoder.startList();
+    encoder.writeBytes(Address.fromHexString("1"));
+    encoder.writeByte(Vote.ADD_BYTE_VALUE);
+    encoder.endList();
+
+    encoder.writeNull();
+    encoder.writeEmptyList();
+
+    encoder.endList();
+
+    Bytes expectedEncoding = encoder.encoded();
+
+    Bytes actualEncoding =
+        bftExtraDataCodec.encodeWithoutCommitSealsAndRoundNumber(
+            new BftExtraData(vanity_data, committerSeals, vote, round, validators));
+
+    assertThat(actualEncoding).isEqualTo(expectedEncoding);
+  }
+
+  @Test
+  public void incorrectlyStructuredRlpThrowsException() {
+    final List<Address> validators = Lists.newArrayList();
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals = Lists.newArrayList();
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = new byte[32];
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
+    encoder.startList();
+    encoder.writeBytes(vanity_data);
+    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
+
+    // encoded vote
+    encoder.startList();
+    encoder.writeBytes(Address.fromHexString("1"));
+    encoder.writeByte(Vote.ADD_BYTE_VALUE);
+    encoder.endList();
+
+    encoder.writeInt(round);
+    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
+    encoder.writeLong(1);
+    encoder.endList();
+
+    final Bytes bufferToInject = encoder.encoded();
+
+    assertThatThrownBy(() -> bftExtraDataCodec.decodeRaw(bufferToInject))
+        .isInstanceOf(RLPException.class);
+  }
+
+  @Test
+  public void incorrectVoteTypeThrowsException() {
+    final List<Address> validators =
+        Arrays.asList(Address.fromHexString("1"), Address.fromHexString("2"));
+    final Address voteRecipient = Address.fromHexString("1");
+    final byte voteType = (byte) 0xAA;
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals =
+        Arrays.asList(
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 0),
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.TEN, BigInteger.ONE, (byte) 0));
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = new byte[32];
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
+    encoder.startList();
+    encoder.writeBytes(vanity_data);
+    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
+
+    // encode vote
+    encoder.startList();
+    encoder.writeBytes(voteRecipient);
+    encoder.writeByte(voteType);
+    encoder.endList();
+
+    encoder.writeInt(round);
+    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
+    encoder.endList();
+
+    final Bytes bufferToInject = encoder.encoded();
+
+    assertThatThrownBy(() -> bftExtraDataCodec.decodeRaw(bufferToInject))
+        .isInstanceOf(RLPException.class);
+  }
+
+  @Test
+  public void emptyExtraDataThrowsException() {
+    final Bytes bufferToInject = Bytes.EMPTY;
+
+    assertThatThrownBy(() -> bftExtraDataCodec.decodeRaw(bufferToInject))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage("Invalid Bytes supplied - Bft Extra Data required.");
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/QbftExtraDataCodecTestUtils.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/QbftExtraDataCodecTestUtils.java
new file mode 100644
index 00000000000..29903385111
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/QbftExtraDataCodecTestUtils.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.qbft;
+
+public class QbftExtraDataCodecTestUtils {
+
+  public static byte[] createNonEmptyVanityData() {
+    final byte[] vanity_bytes = new byte[32];
+    for (int i = 0; i < vanity_bytes.length; i++) {
+      vanity_bytes[i] = (byte) (i + 1);
+    }
+    return vanity_bytes;
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/QbftProtocolScheduleTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/QbftProtocolScheduleTest.java
new file mode 100644
index 00000000000..b0fe45ed562
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/QbftProtocolScheduleTest.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft;
+
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.hyperledger.besu.consensus.common.bft.BftContextBuilder.setupContextWithBftExtraDataEncoder;
+import static org.mockito.Mockito.mock;
+
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.config.JsonGenesisConfigOptions;
+import org.hyperledger.besu.config.JsonQbftConfigOptions;
+import org.hyperledger.besu.config.JsonUtil;
+import org.hyperledger.besu.config.QbftConfigOptions;
+import org.hyperledger.besu.consensus.common.ForkSpec;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.BftProtocolSchedule;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.MilestoneStreamingProtocolSchedule;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.core.Util;
+import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+
+import java.math.BigInteger;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+
+import org.junit.jupiter.api.Test;
+
+public class QbftProtocolScheduleTest {
+  private final BftExtraDataCodec bftExtraDataCodec = mock(BftExtraDataCodec.class);
+  private final NodeKey proposerNodeKey = NodeKeyUtils.generate();
+  private final Address proposerAddress = Util.publicKeyToAddress(proposerNodeKey.getPublicKey());
+  private final List<Address> validators = singletonList(proposerAddress);
+
+  private ProtocolContext protocolContext(final Collection<Address> validators) {
+    return new ProtocolContext(
+        null,
+        null,
+        setupContextWithBftExtraDataEncoder(
+            QbftContext.class, validators, new QbftExtraDataCodec()),
+        Optional.empty());
+  }
+
+  @Test
+  public void contractModeTransitionsCreatesContractModeHeaderValidators() {
+    final MutableQbftConfigOptions arbitraryTransition =
+        new MutableQbftConfigOptions(JsonQbftConfigOptions.DEFAULT);
+    arbitraryTransition.setBlockRewardWei(BigInteger.ONE);
+    arbitraryTransition.setValidatorContractAddress(Optional.of("0x2"));
+    final MutableQbftConfigOptions contractTransition =
+        new MutableQbftConfigOptions(JsonQbftConfigOptions.DEFAULT);
+    contractTransition.setValidatorContractAddress(Optional.of("0x2"));
+    final MutableQbftConfigOptions qbftConfigOptions =
+        new MutableQbftConfigOptions(JsonQbftConfigOptions.DEFAULT);
+    qbftConfigOptions.setValidatorContractAddress(Optional.of("0x1"));
+
+    final BlockHeader parentHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilderForContractMode(
+                1, proposerNodeKey, null, null, Optional.empty())
+            .buildHeader();
+    final BlockHeader blockHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilderForContractMode(
+                2, proposerNodeKey, parentHeader, null, Optional.empty())
+            .buildHeader();
+
+    final BftProtocolSchedule schedule =
+        createProtocolSchedule(
+            JsonGenesisConfigOptions.fromJsonObject(JsonUtil.createEmptyObjectNode()),
+            List.of(
+                new ForkSpec<>(0, qbftConfigOptions),
+                new ForkSpec<>(1, arbitraryTransition),
+                new ForkSpec<>(2, contractTransition)));
+    assertThat(new MilestoneStreamingProtocolSchedule(schedule).streamMilestoneBlocks().count())
+        .isEqualTo(3);
+    assertThat(validateHeader(schedule, validators, parentHeader, blockHeader, 0)).isTrue();
+    assertThat(validateHeader(schedule, validators, parentHeader, blockHeader, 1)).isTrue();
+    assertThat(validateHeader(schedule, validators, parentHeader, blockHeader, 2)).isTrue();
+  }
+
+  @Test
+  public void blockModeTransitionsCreatesBlockModeHeaderValidators() {
+    final MutableQbftConfigOptions arbitraryTransition =
+        new MutableQbftConfigOptions(JsonQbftConfigOptions.DEFAULT);
+    arbitraryTransition.setBlockRewardWei(BigInteger.ONE);
+
+    final BlockHeader parentHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                1, proposerNodeKey, validators, null, Optional.empty())
+            .buildHeader();
+    final BlockHeader blockHeader =
+        QbftBlockHeaderUtils.createPresetHeaderBuilder(
+                2, proposerNodeKey, validators, parentHeader, Optional.empty())
+            .buildHeader();
+
+    final BftProtocolSchedule schedule =
+        createProtocolSchedule(
+            JsonGenesisConfigOptions.fromJsonObject(JsonUtil.createEmptyObjectNode()),
+            List.of(
+                new ForkSpec<>(0, JsonQbftConfigOptions.DEFAULT),
+                new ForkSpec<>(1, arbitraryTransition),
+                new ForkSpec<>(2, JsonQbftConfigOptions.DEFAULT)));
+    assertThat(new MilestoneStreamingProtocolSchedule(schedule).streamMilestoneBlocks().count())
+        .isEqualTo(3);
+    assertThat(validateHeader(schedule, validators, parentHeader, blockHeader, 0)).isTrue();
+    assertThat(validateHeader(schedule, validators, parentHeader, blockHeader, 1)).isTrue();
+    assertThat(validateHeader(schedule, validators, parentHeader, blockHeader, 2)).isTrue();
+  }
+
+  private BftProtocolSchedule createProtocolSchedule(
+      final GenesisConfigOptions genesisConfig, final List<ForkSpec<QbftConfigOptions>> forks) {
+    return QbftProtocolScheduleBuilder.create(
+        genesisConfig,
+        new ForksSchedule<>(forks),
+        PrivacyParameters.DEFAULT,
+        false,
+        bftExtraDataCodec,
+        EvmConfiguration.DEFAULT);
+  }
+
+  private boolean validateHeader(
+      final BftProtocolSchedule schedule,
+      final List<Address> validators,
+      final BlockHeader parentHeader,
+      final BlockHeader blockHeader,
+      final int block) {
+    return schedule
+        .getByBlockNumber(block)
+        .getBlockHeaderValidator()
+        .validateHeader(
+            blockHeader, parentHeader, protocolContext(validators), HeaderValidationMode.LIGHT);
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/blockcreation/PkiQbftBlockCreatorTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/blockcreation/PkiQbftBlockCreatorTest.java
new file mode 100644
index 00000000000..32d55e7f22e
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/blockcreation/PkiQbftBlockCreatorTest.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.blockcreation;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hyperledger.besu.consensus.common.bft.BftExtraDataFixture.createExtraData;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
+import org.hyperledger.besu.consensus.qbft.pki.PkiQbftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.qbft.pki.PkiQbftExtraData;
+import org.hyperledger.besu.consensus.qbft.pki.PkiQbftExtraDataCodec;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.blockcreation.BlockCreator;
+import org.hyperledger.besu.ethereum.blockcreation.BlockCreator.BlockCreationResult;
+import org.hyperledger.besu.ethereum.blockcreation.BlockTransactionSelector.TransactionSelectionResults;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.pki.cms.CmsCreator;
+
+import java.util.Collections;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class PkiQbftBlockCreatorTest {
+
+  private final PkiQbftExtraDataCodec extraDataCodec = new PkiQbftExtraDataCodec();
+
+  private BlockCreator blockCreator;
+  private CmsCreator cmsCreator;
+  private PkiQbftBlockCreator pkiQbftBlockCreator;
+  private BlockHeaderTestFixture blockHeaderBuilder;
+
+  @BeforeEach
+  public void before() {
+    blockCreator = mock(BlockCreator.class);
+    cmsCreator = mock(CmsCreator.class);
+
+    pkiQbftBlockCreator = new PkiQbftBlockCreator(blockCreator, cmsCreator, extraDataCodec);
+
+    blockHeaderBuilder = new BlockHeaderTestFixture();
+  }
+
+  @Test
+  public void createProposalBehaviourWithNonPkiCodecFails() {
+    assertThatThrownBy(
+            () -> new PkiQbftBlockCreator(blockCreator, cmsCreator, new QbftExtraDataCodec()))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("PkiQbftBlockCreator must use PkiQbftExtraDataCodec");
+  }
+
+  @Test
+  public void cmsInProposedBlockHasValueCreatedByCmsCreator() {
+    createBlockBeingProposed();
+
+    final Bytes cms = Bytes.random(32);
+    when(cmsCreator.create(any(Bytes.class))).thenReturn(cms);
+
+    final Block proposedBlock = pkiQbftBlockCreator.createBlock(1L).getBlock();
+
+    final PkiQbftExtraData proposedBlockExtraData =
+        (PkiQbftExtraData) extraDataCodec.decodeRaw(proposedBlock.getHeader().getExtraData());
+    assertThat(proposedBlockExtraData).isInstanceOf(PkiQbftExtraData.class);
+    assertThat(proposedBlockExtraData.getCms()).isEqualTo(cms);
+  }
+
+  @Test
+  public void cmsIsCreatedWithCorrectHashingFunction() {
+    final Block block = createBlockBeingProposed();
+    final Hash expectedHashForCmsCreation =
+        PkiQbftBlockHeaderFunctions.forCmsSignature(extraDataCodec).hash(block.getHeader());
+
+    when(cmsCreator.create(any(Bytes.class))).thenReturn(Bytes.random(32));
+
+    pkiQbftBlockCreator.createBlock(1L);
+
+    verify(cmsCreator).create(eq(expectedHashForCmsCreation));
+  }
+
+  @Test
+  public void proposedBlockHashUsesCommittedSealHeaderFunction() {
+    createBlockBeingProposed();
+    when(cmsCreator.create(any(Bytes.class))).thenReturn(Bytes.random(32));
+
+    final Block blockWithCms = pkiQbftBlockCreator.createBlock(1L).getBlock();
+
+    final Hash expectedBlockHash =
+        BftBlockHeaderFunctions.forCommittedSeal(extraDataCodec).hash(blockWithCms.getHeader());
+
+    assertThat(blockWithCms.getHash()).isEqualTo(expectedBlockHash);
+  }
+
+  private Block createBlockBeingProposed() {
+    final BftExtraData originalExtraData =
+        createExtraData(blockHeaderBuilder.buildHeader(), extraDataCodec);
+    final BlockHeader blockHeaderWithExtraData =
+        blockHeaderBuilder.extraData(extraDataCodec.encode(originalExtraData)).buildHeader();
+    final Block block =
+        new Block(
+            blockHeaderWithExtraData,
+            new BlockBody(Collections.emptyList(), Collections.emptyList()));
+    when(blockCreator.createBlock(eq(1L)))
+        .thenReturn(new BlockCreationResult(block, new TransactionSelectionResults()));
+
+    return block;
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/blockcreation/QbftBlockCreatorFactoryTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/blockcreation/QbftBlockCreatorFactoryTest.java
new file mode 100644
index 00000000000..e9345606963
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/blockcreation/QbftBlockCreatorFactoryTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.blockcreation;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.JsonQbftConfigOptions;
+import org.hyperledger.besu.config.QbftConfigOptions;
+import org.hyperledger.besu.consensus.common.ForkSpec;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.qbft.MutableQbftConfigOptions;
+import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class QbftBlockCreatorFactoryTest {
+  private final QbftExtraDataCodec extraDataCodec = new QbftExtraDataCodec();
+  private QbftBlockCreatorFactory qbftBlockCreatorFactory;
+
+  @BeforeEach
+  @SuppressWarnings("unchecked")
+  public void setUp() throws Exception {
+    final MiningParameters miningParams = mock(MiningParameters.class);
+    when(miningParams.getExtraData()).thenReturn(Bytes.wrap("Qbft tests".getBytes(UTF_8)));
+
+    final MutableQbftConfigOptions qbftConfigOptions =
+        new MutableQbftConfigOptions(JsonQbftConfigOptions.DEFAULT);
+    qbftConfigOptions.setValidatorContractAddress(Optional.of("1"));
+    final ForkSpec<QbftConfigOptions> spec = new ForkSpec<>(0, qbftConfigOptions);
+    final ForksSchedule<QbftConfigOptions> forksSchedule = mock(ForksSchedule.class);
+    when(forksSchedule.getFork(anyLong())).thenReturn(spec);
+
+    qbftBlockCreatorFactory =
+        new QbftBlockCreatorFactory(
+            mock(PendingTransactions.class),
+            mock(ProtocolContext.class),
+            mock(ProtocolSchedule.class),
+            forksSchedule,
+            miningParams,
+            mock(Address.class),
+            extraDataCodec);
+  }
+
+  @Test
+  public void contractValidatorModeCreatesExtraDataWithoutValidatorsAndVote() {
+    final BlockHeader parentHeader = mock(BlockHeader.class);
+    when(parentHeader.getNumber()).thenReturn(1L);
+
+    final Bytes encodedExtraData = qbftBlockCreatorFactory.createExtraData(3, parentHeader);
+    final BftExtraData bftExtraData = extraDataCodec.decodeRaw(encodedExtraData);
+
+    assertThat(bftExtraData.getValidators()).isEmpty();
+    assertThat(bftExtraData.getVote()).isEmpty();
+    assertThat(bftExtraData.getRound()).isEqualTo(3);
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/headervalidationrules/QbftValidatorsValidationRuleTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/headervalidationrules/QbftValidatorsValidationRuleTest.java
new file mode 100644
index 00000000000..b006ccd3be0
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/headervalidationrules/QbftValidatorsValidationRuleTest.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.headervalidationrules;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.consensus.common.bft.BftContextBuilder.setupContextWithBftExtraData;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.Vote;
+import org.hyperledger.besu.consensus.qbft.QbftContext;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.AddressHelpers;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import com.google.common.collect.Lists;
+import org.junit.jupiter.api.Test;
+
+public class QbftValidatorsValidationRuleTest {
+  private final BftExtraData bftExtraData = mock(BftExtraData.class);
+  private final BlockHeader blockHeader = mock(BlockHeader.class);
+
+  @Test
+  public void validationPassesIfValidatorsAndVoteAreEmpty() {
+    final QbftValidatorsValidationRule qbftValidatorsValidationRule =
+        new QbftValidatorsValidationRule(true);
+    final ProtocolContext context =
+        new ProtocolContext(
+            null,
+            null,
+            setupContextWithBftExtraData(QbftContext.class, Collections.emptyList(), bftExtraData),
+            Optional.empty());
+    when(bftExtraData.getValidators()).thenReturn(Collections.emptyList());
+    when(bftExtraData.getVote()).thenReturn(Optional.empty());
+    assertThat(qbftValidatorsValidationRule.validate(blockHeader, null, context)).isTrue();
+  }
+
+  @Test
+  public void validationIsDelegatedWhenConstructorFlagIsFalse() {
+    final QbftValidatorsValidationRule qbftValidatorsValidationRule =
+        new QbftValidatorsValidationRule(false);
+    final List<Address> validators =
+        Lists.newArrayList(
+            AddressHelpers.ofValue(1), AddressHelpers.ofValue(2), AddressHelpers.ofValue(3));
+
+    final ProtocolContext context =
+        new ProtocolContext(
+            null,
+            null,
+            setupContextWithBftExtraData(QbftContext.class, validators, bftExtraData),
+            Optional.empty());
+    when(bftExtraData.getValidators()).thenReturn(validators);
+    assertThat(qbftValidatorsValidationRule.validate(blockHeader, null, context)).isTrue();
+  }
+
+  @Test
+  public void validationFailsIfValidatorsAreNotEmpty() {
+    final QbftValidatorsValidationRule qbftValidatorsValidationRule =
+        new QbftValidatorsValidationRule(true);
+    final List<Address> validators =
+        Lists.newArrayList(
+            AddressHelpers.ofValue(1), AddressHelpers.ofValue(2), AddressHelpers.ofValue(3));
+
+    final ProtocolContext context =
+        new ProtocolContext(
+            null,
+            null,
+            setupContextWithBftExtraData(QbftContext.class, validators, bftExtraData),
+            Optional.empty());
+    when(bftExtraData.getValidators()).thenReturn(validators);
+    assertThat(qbftValidatorsValidationRule.validate(blockHeader, null, context)).isFalse();
+  }
+
+  @Test
+  public void validationFailsIfVoteIsPresent() {
+    final QbftValidatorsValidationRule qbftValidatorsValidationRule =
+        new QbftValidatorsValidationRule(true);
+    final ProtocolContext context =
+        new ProtocolContext(
+            null,
+            null,
+            setupContextWithBftExtraData(QbftContext.class, Collections.emptyList(), bftExtraData),
+            Optional.empty());
+    when(bftExtraData.getValidators()).thenReturn(Collections.emptyList());
+    when(bftExtraData.getVote()).thenReturn(Optional.of(mock(Vote.class)));
+    assertThat(qbftValidatorsValidationRule.validate(blockHeader, null, context)).isFalse();
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftDiscardValidatorVoteTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftDiscardValidatorVoteTest.java
new file mode 100644
index 00000000000..4e0c30dea7b
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftDiscardValidatorVoteTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.jsonrpc.methods;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.common.validator.VoteProvider;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+
+import java.util.Optional;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class QbftDiscardValidatorVoteTest {
+  private final ValidatorProvider validatorProvider = mock(ValidatorProvider.class);
+  private final VoteProvider voteProvider = mock(VoteProvider.class);
+  private final String QBFT_METHOD = "qbft_discardValidatorVote";
+  private final String JSON_RPC_VERSION = "2.0";
+  private QbftDiscardValidatorVote method;
+
+  @BeforeEach
+  public void setup() {
+    method = new QbftDiscardValidatorVote(validatorProvider);
+    when(validatorProvider.getVoteProviderAtHead()).thenReturn(Optional.of(voteProvider));
+  }
+
+  @Test
+  public void returnsCorrectMethodName() {
+    assertThat(method.getName()).isEqualTo(QBFT_METHOD);
+  }
+
+  @Test
+  public void exceptionWhenNoParamsSupplied() {
+    assertThatThrownBy(() -> method.response(requestWithParams()))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessage("Missing required json rpc parameter at index 0");
+  }
+
+  @Test
+  public void exceptionWhenInvalidAddressParameterSupplied() {
+    assertThatThrownBy(() -> method.response(requestWithParams("InvalidAddress")))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessageContaining("Invalid json rpc parameter at index 0");
+  }
+
+  @Test
+  public void methodNotEnabledWhenNoVoteProvider() {
+    final JsonRpcRequestContext request = requestWithParams(Address.fromHexString("1"));
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.METHOD_NOT_ENABLED);
+    when(validatorProvider.getVoteProviderAtHead()).thenReturn(Optional.empty());
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void discardValidator() {
+    final Address parameterAddress = Address.fromHexString("1");
+    final JsonRpcRequestContext request = requestWithParams(parameterAddress);
+
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(request.getRequest().getId(), true);
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+
+    verify(voteProvider).discardVote(parameterAddress);
+  }
+
+  private JsonRpcRequestContext requestWithParams(final Object... params) {
+    return new JsonRpcRequestContext(new JsonRpcRequest(JSON_RPC_VERSION, QBFT_METHOD, params));
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetPendingVotesTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetPendingVotesTest.java
new file mode 100644
index 00000000000..57fd4e9b70a
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetPendingVotesTest.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.jsonrpc.methods;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.consensus.common.jsonrpc.AbstractVoteProposerMethod;
+import org.hyperledger.besu.consensus.common.jsonrpc.AbstractVoteProposerMethodTest;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class QbftGetPendingVotesTest extends AbstractVoteProposerMethodTest {
+
+  private QbftGetPendingVotes method;
+
+  @Override
+  protected AbstractVoteProposerMethod getMethod() {
+    return method;
+  }
+
+  @Override
+  protected String getMethodName() {
+    return "qbft_getPendingVotes";
+  }
+
+  @BeforeEach
+  public void setup() {
+    method = new QbftGetPendingVotes(getValidatorProvider());
+  }
+
+  @Test
+  public void returnsCorrectMethodName() {
+    assertThat(method.getName()).isEqualTo(getMethodName());
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetSignerMetricsTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetSignerMetricsTest.java
new file mode 100644
index 00000000000..d070ba47cc3
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetSignerMetricsTest.java
@@ -0,0 +1,260 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.jsonrpc.methods;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.AdditionalMatchers.lt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.common.BlockInterface;
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.SignerMetricResult;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.LongStream;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class QbftGetSignerMetricsTest {
+
+  private static final Address[] VALIDATORS = {
+    Address.fromHexString("0x1"), Address.fromHexString("0x2"), Address.fromHexString("0x3"),
+  };
+
+  private final String QBFT_METHOD = "qbft_getSignerMetrics";
+  private final String JSON_RPC_VERSION = "2.0";
+  private QbftGetSignerMetrics method;
+
+  private ValidatorProvider validatorProvider;
+  private BlockchainQueries blockchainQueries;
+  private BlockInterface blockInterface;
+
+  @BeforeEach
+  public void setup() {
+    validatorProvider = mock(ValidatorProvider.class);
+    blockchainQueries = mock(BlockchainQueries.class);
+    blockInterface = mock(BlockInterface.class);
+    method = new QbftGetSignerMetrics(validatorProvider, blockInterface, blockchainQueries);
+  }
+
+  @Test
+  public void returnsCorrectMethodName() {
+    assertThat(method.getName()).isEqualTo(QBFT_METHOD);
+  }
+
+  @Test
+  public void exceptionWhenInvalidStartBlockSupplied() {
+    assertThatThrownBy(() -> method.response(requestWithParams("INVALID")))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessageContaining("Invalid json rpc parameter at index 0");
+  }
+
+  @Test
+  public void exceptionWhenInvalidEndBlockSupplied() {
+    assertThatThrownBy(() -> method.response(requestWithParams("1", "INVALID")))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessageContaining("Invalid json rpc parameter at index 1");
+  }
+
+  @Test
+  @SuppressWarnings("unchecked")
+  public void getSignerMetricsWhenNoParams() {
+
+    final long startBlock = 1L;
+    final long endBlock = 3L;
+
+    when(blockchainQueries.headBlockNumber()).thenReturn(endBlock);
+
+    final List<SignerMetricResult> signerMetricResultList = new ArrayList<>();
+
+    LongStream.range(startBlock, endBlock)
+        .forEach(value -> signerMetricResultList.add(generateBlock(value)));
+
+    signerMetricResultList.add(new SignerMetricResult(VALIDATORS[0])); // missing validator
+
+    final JsonRpcRequestContext request = requestWithParams();
+
+    final JsonRpcSuccessResponse response = (JsonRpcSuccessResponse) method.response(request);
+
+    assertThat((Collection<SignerMetricResult>) response.getResult())
+        .containsExactlyInAnyOrderElementsOf(signerMetricResultList);
+  }
+
+  @Test
+  @SuppressWarnings("unchecked")
+  public void getSignerMetrics() {
+
+    final long startBlock = 1L;
+    final long endBlock = 5L;
+
+    when(blockchainQueries.headBlockNumber()).thenReturn(endBlock);
+
+    final List<SignerMetricResult> signerMetricResultList = new ArrayList<>();
+
+    // sign a first block with nodekey number 1
+    final SignerMetricResult signerMetricResultFirstNodeKeys = generateBlock(startBlock);
+    signerMetricResultList.add(signerMetricResultFirstNodeKeys);
+    // sign a second block with nodekey number 2
+    final SignerMetricResult signerMetricResultSecondNodeKeys = generateBlock(startBlock + 1);
+    signerMetricResultList.add(signerMetricResultSecondNodeKeys);
+    // sign a third block with nodekey number 3
+    final SignerMetricResult signerMetricResultThirdNodeKeys = generateBlock(startBlock + 2);
+    signerMetricResultList.add(signerMetricResultThirdNodeKeys);
+    // sign the last block with the nodekey number 1
+    generateBlock(startBlock + 3);
+    signerMetricResultFirstNodeKeys.setLastProposedBlockNumber(startBlock + 3);
+    signerMetricResultFirstNodeKeys.incrementeNbBlock();
+
+    final JsonRpcRequestContext request = requestWithParams();
+
+    final JsonRpcSuccessResponse response = (JsonRpcSuccessResponse) method.response(request);
+
+    assertThat((Collection<SignerMetricResult>) response.getResult())
+        .containsExactlyInAnyOrderElementsOf(signerMetricResultList);
+  }
+
+  @Test
+  @SuppressWarnings("unchecked")
+  public void getSignerMetricsWhenThereAreFewerBlocksThanTheDefaultRange() {
+    final long startBlock = 0L;
+    final long headBlock = 2L;
+
+    final List<SignerMetricResult> signerMetricResultList = new ArrayList<>();
+
+    when(blockchainQueries.headBlockNumber()).thenReturn(headBlock);
+
+    LongStream.range(startBlock, headBlock)
+        .forEach(value -> signerMetricResultList.add(generateBlock(value)));
+
+    signerMetricResultList.add(new SignerMetricResult(VALIDATORS[2])); // missing validator
+
+    final JsonRpcRequestContext request = requestWithParams();
+
+    final JsonRpcSuccessResponse response = (JsonRpcSuccessResponse) method.response(request);
+
+    // verify getBlockHeaderByNumber is not called with negative values
+    verify(blockchainQueries, never()).getBlockHeaderByNumber(lt(0L));
+
+    assertThat((Collection<SignerMetricResult>) response.getResult())
+        .containsExactlyInAnyOrderElementsOf(signerMetricResultList);
+  }
+
+  @Test
+  @SuppressWarnings("unchecked")
+  public void getSignerMetricsWithLatest() {
+
+    final long startBlock = 1L;
+    final long endBlock = 3L;
+
+    final List<SignerMetricResult> signerMetricResultList = new ArrayList<>();
+
+    when(blockchainQueries.headBlockNumber()).thenReturn(endBlock);
+
+    LongStream.range(startBlock, endBlock)
+        .forEach(value -> signerMetricResultList.add(generateBlock(value)));
+
+    signerMetricResultList.add(new SignerMetricResult(VALIDATORS[0])); // missing validator
+
+    final JsonRpcRequestContext request = requestWithParams(String.valueOf(startBlock), "latest");
+
+    final JsonRpcSuccessResponse response = (JsonRpcSuccessResponse) method.response(request);
+
+    assertThat((Collection<SignerMetricResult>) response.getResult())
+        .containsExactlyInAnyOrderElementsOf(signerMetricResultList);
+  }
+
+  @Test
+  @SuppressWarnings("unchecked")
+  public void getSignerMetricsWithPending() {
+
+    final long startBlock = 1L;
+    final long endBlock = 3L;
+
+    final List<SignerMetricResult> signerMetricResultList = new ArrayList<>();
+
+    when(blockchainQueries.headBlockNumber()).thenReturn(endBlock);
+
+    LongStream.range(startBlock, endBlock)
+        .forEach(value -> signerMetricResultList.add(generateBlock(value)));
+
+    signerMetricResultList.add(new SignerMetricResult(VALIDATORS[0])); // missing validator
+
+    final JsonRpcRequestContext request = requestWithParams(String.valueOf(startBlock), "pending");
+
+    final JsonRpcSuccessResponse response = (JsonRpcSuccessResponse) method.response(request);
+
+    assertThat((Collection<SignerMetricResult>) response.getResult())
+        .containsExactlyInAnyOrderElementsOf(signerMetricResultList);
+  }
+
+  @Test
+  @SuppressWarnings("unchecked")
+  public void getSignerMetricsWithEarliest() {
+
+    final long startBlock = 0L;
+    final long endBlock = 3L;
+
+    final List<SignerMetricResult> signerMetricResultList = new ArrayList<>();
+
+    when(blockchainQueries.headBlockNumber()).thenReturn(endBlock);
+
+    LongStream.range(startBlock, endBlock)
+        .forEach(value -> signerMetricResultList.add(generateBlock(value)));
+
+    final JsonRpcRequestContext request = requestWithParams("earliest", String.valueOf(endBlock));
+
+    final JsonRpcSuccessResponse response = (JsonRpcSuccessResponse) method.response(request);
+
+    assertThat((Collection<SignerMetricResult>) response.getResult())
+        .containsExactlyInAnyOrderElementsOf(signerMetricResultList);
+  }
+
+  private JsonRpcRequestContext requestWithParams(final Object... params) {
+    return new JsonRpcRequestContext(new JsonRpcRequest(JSON_RPC_VERSION, QBFT_METHOD, params));
+  }
+
+  private SignerMetricResult generateBlock(final long number) {
+    final Address proposerAddressBlock = VALIDATORS[(int) (number % VALIDATORS.length)];
+
+    final BlockHeader header = new BlockHeaderTestFixture().number(number).buildHeader();
+
+    when(blockchainQueries.getBlockHeaderByNumber(number)).thenReturn(Optional.of(header));
+    when(blockInterface.getProposerOfBlock(header)).thenReturn(proposerAddressBlock);
+    when(validatorProvider.getValidatorsAfterBlock(header)).thenReturn(Arrays.asList(VALIDATORS));
+
+    final SignerMetricResult signerMetricResult = new SignerMetricResult(proposerAddressBlock);
+    signerMetricResult.incrementeNbBlock();
+    signerMetricResult.setLastProposedBlockNumber(number);
+
+    return signerMetricResult;
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetValidatorsByBlockHashTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetValidatorsByBlockHashTest.java
new file mode 100644
index 00000000000..0eb8eb823a1
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetValidatorsByBlockHashTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.jsonrpc.methods;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class QbftGetValidatorsByBlockHashTest {
+
+  private static final String ETH_METHOD = "qbft_getValidatorsByBlockHash";
+  private static final String JSON_RPC_VERSION = "2.0";
+  private static final String ZERO_HASH = String.valueOf(Hash.ZERO);
+
+  @Mock private Blockchain blockchain;
+  @Mock private BlockHeader blockHeader;
+  @Mock private JsonRpcRequestContext request;
+  @Mock private ValidatorProvider validatorProvider;
+
+  private QbftGetValidatorsByBlockHash method;
+
+  @BeforeEach
+  public void setUp() {
+    method = new QbftGetValidatorsByBlockHash(blockchain, validatorProvider);
+  }
+
+  @Test
+  public void nameShouldBeCorrect() {
+    Assertions.assertThat(method.getName()).isEqualTo(ETH_METHOD);
+  }
+
+  @Test
+  public void shouldReturnListOfValidatorsFromBlock() {
+    when(blockchain.getBlockHeader(Hash.ZERO)).thenReturn(Optional.of(blockHeader));
+    final List<Address> addresses = Collections.singletonList(Address.ID);
+    final List<String> expectedOutput = Collections.singletonList(Address.ID.toString());
+    when(validatorProvider.getValidatorsForBlock(any())).thenReturn(addresses);
+    request = requestWithParams(ZERO_HASH);
+    JsonRpcSuccessResponse response = (JsonRpcSuccessResponse) method.response(request);
+    Assertions.assertThat(response.getResult()).isEqualTo(expectedOutput);
+  }
+
+  private JsonRpcRequestContext requestWithParams(final Object... params) {
+    return new JsonRpcRequestContext(new JsonRpcRequest(JSON_RPC_VERSION, ETH_METHOD, params));
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetValidatorsByBlockNumberTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetValidatorsByBlockNumberTest.java
new file mode 100644
index 00000000000..b2e1c2b3d4d
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftGetValidatorsByBlockNumberTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.jsonrpc.methods;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class QbftGetValidatorsByBlockNumberTest {
+
+  @Mock private BlockchainQueries blockchainQueries;
+  @Mock private BlockHeader blockHeader;
+  @Mock private JsonRpcRequestContext request;
+  @Mock private ValidatorProvider validatorProvider;
+
+  private QbftGetValidatorsByBlockNumber method;
+
+  @BeforeEach
+  public void setUp() {
+    method = new QbftGetValidatorsByBlockNumber(blockchainQueries, validatorProvider);
+  }
+
+  @Test
+  public void blockParameterIsParameter0() {
+    request = new JsonRpcRequestContext(new JsonRpcRequest("?", "ignore", new String[] {"0x1245"}));
+    BlockParameter blockParameter = method.blockParameter(request);
+    assertThat(blockParameter.getNumber()).isPresent();
+    assertThat(blockParameter.getNumber().get()).isEqualTo(0x1245);
+  }
+
+  @Test
+  public void nameShouldBeCorrect() {
+    assertThat(method.getName()).isEqualTo("qbft_getValidatorsByBlockNumber");
+  }
+
+  @Test
+  public void shouldReturnListOfValidatorsFromBlock() {
+    when(blockchainQueries.getBlockHeaderByNumber(12)).thenReturn(Optional.of(blockHeader));
+    final List<Address> addresses = Collections.singletonList(Address.ID);
+    final List<String> expectedOutput = Collections.singletonList(Address.ID.toString());
+    when(validatorProvider.getValidatorsForBlock(any())).thenReturn(addresses);
+    Object result = method.resultByBlockNumber(request, 12);
+    assertThat(result).isEqualTo(expectedOutput);
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftProposeValidatorVoteTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftProposeValidatorVoteTest.java
new file mode 100644
index 00000000000..b9f2f9c2660
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/jsonrpc/methods/QbftProposeValidatorVoteTest.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.jsonrpc.methods;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.common.validator.ValidatorProvider;
+import org.hyperledger.besu.consensus.common.validator.VoteProvider;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+
+import java.util.Optional;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class QbftProposeValidatorVoteTest {
+  private final ValidatorProvider validatorProvider = mock(ValidatorProvider.class);
+  private final VoteProvider voteProvider = mock(VoteProvider.class);
+  private final String QBFT_METHOD = "qbft_proposeValidatorVote";
+  private final String JSON_RPC_VERSION = "2.0";
+  private QbftProposeValidatorVote method;
+
+  @BeforeEach
+  public void setup() {
+    method = new QbftProposeValidatorVote(validatorProvider);
+    when(validatorProvider.getVoteProviderAtHead()).thenReturn(Optional.of(voteProvider));
+  }
+
+  @Test
+  public void returnsCorrectMethodName() {
+    assertThat(method.getName()).isEqualTo(QBFT_METHOD);
+  }
+
+  @Test
+  public void exceptionWhenNoParamsSupplied() {
+    assertThatThrownBy(() -> method.response(requestWithParams()))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessage("Missing required json rpc parameter at index 0");
+  }
+
+  @Test
+  public void exceptionWhenNoAuthSupplied() {
+    assertThatThrownBy(() -> method.response(requestWithParams(Address.fromHexString("1"))))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessage("Missing required json rpc parameter at index 1");
+  }
+
+  @Test
+  public void exceptionWhenNoAddressSupplied() {
+    assertThatThrownBy(() -> method.response(requestWithParams("true")))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessageContaining("Invalid json rpc parameter at index 0");
+  }
+
+  @Test
+  public void exceptionWhenInvalidBoolParameterSupplied() {
+    assertThatThrownBy(() -> method.response(requestWithParams(Address.fromHexString("1"), "c")))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessageContaining("Invalid json rpc parameter at index 1");
+  }
+
+  @Test
+  public void methodNotEnabledWhenNoVoteProvider() {
+    final JsonRpcRequestContext request = requestWithParams(Address.fromHexString("1"));
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.METHOD_NOT_ENABLED);
+    when(validatorProvider.getVoteProviderAtHead()).thenReturn(Optional.empty());
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void addValidator() {
+    final Address parameterAddress = Address.fromHexString("1");
+    final JsonRpcRequestContext request = requestWithParams(parameterAddress, "true");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(request.getRequest().getId(), true);
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+
+    verify(voteProvider).authVote(parameterAddress);
+  }
+
+  @Test
+  public void removeValidator() {
+    final Address parameterAddress = Address.fromHexString("1");
+    final JsonRpcRequestContext request = requestWithParams(parameterAddress, "false");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(request.getRequest().getId(), true);
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+
+    verify(voteProvider).dropVote(parameterAddress);
+  }
+
+  private JsonRpcRequestContext requestWithParams(final Object... params) {
+    return new JsonRpcRequestContext(new JsonRpcRequest(JSON_RPC_VERSION, QBFT_METHOD, params));
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/messagewrappers/CommitTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/messagewrappers/CommitTest.java
new file mode 100644
index 00000000000..87d3a46abe5
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/messagewrappers/CommitTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.messagewrappers;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.messagedata.QbftV1;
+import org.hyperledger.besu.consensus.qbft.payload.CommitPayload;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Util;
+
+import java.math.BigInteger;
+
+import org.junit.jupiter.api.Test;
+
+public class CommitTest {
+
+  @Test
+  public void canRoundTripACommitMessage() {
+    final NodeKey nodeKey = NodeKeyUtils.generate();
+    final Address addr = Util.publicKeyToAddress(nodeKey.getPublicKey());
+
+    final CommitPayload commitPayload =
+        new CommitPayload(
+            new ConsensusRoundIdentifier(1, 1),
+            Hash.ZERO,
+            SignatureAlgorithmFactory.getInstance()
+                .createSignature(BigInteger.ONE, BigInteger.ONE, (byte) 0));
+
+    final SignedData<CommitPayload> signedCommitPayload =
+        SignedData.create(commitPayload, nodeKey.sign(commitPayload.hashForSignature()));
+
+    final Commit commitMsg = new Commit(signedCommitPayload);
+
+    final Commit decodedPrepare = Commit.decode(commitMsg.encode());
+
+    assertThat(decodedPrepare.getMessageType()).isEqualTo(QbftV1.COMMIT);
+    assertThat(decodedPrepare.getAuthor()).isEqualTo(addr);
+    assertThat(decodedPrepare.getSignedPayload())
+        .isEqualToComparingFieldByField(signedCommitPayload);
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/messagewrappers/PrepareTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/messagewrappers/PrepareTest.java
new file mode 100644
index 00000000000..0aed7ed554e
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/messagewrappers/PrepareTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.messagewrappers;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.messagedata.QbftV1;
+import org.hyperledger.besu.consensus.qbft.payload.PreparePayload;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Util;
+
+import org.junit.jupiter.api.Test;
+
+public class PrepareTest {
+
+  @Test
+  public void canRoundTripAPrepareMessage() {
+    final NodeKey nodeKey = NodeKeyUtils.generate();
+    final Address addr = Util.publicKeyToAddress(nodeKey.getPublicKey());
+
+    final PreparePayload preparePayload =
+        new PreparePayload(new ConsensusRoundIdentifier(1, 1), Hash.ZERO);
+
+    final SignedData<PreparePayload> signedPreparePayload =
+        SignedData.create(preparePayload, nodeKey.sign(preparePayload.hashForSignature()));
+
+    final Prepare prepareMsg = new Prepare(signedPreparePayload);
+
+    final Prepare decodedPrepare = Prepare.decode(prepareMsg.encode());
+
+    assertThat(decodedPrepare.getMessageType()).isEqualTo(QbftV1.PREPARE);
+    assertThat(decodedPrepare.getAuthor()).isEqualTo(addr);
+    assertThat(decodedPrepare.getSignedPayload())
+        .isEqualToComparingFieldByField(signedPreparePayload);
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/messagewrappers/ProposalTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/messagewrappers/ProposalTest.java
new file mode 100644
index 00000000000..46a079ef00a
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/messagewrappers/ProposalTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.messagewrappers;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
+import org.hyperledger.besu.consensus.qbft.messagedata.QbftV1;
+import org.hyperledger.besu.consensus.qbft.payload.PreparePayload;
+import org.hyperledger.besu.consensus.qbft.payload.PreparedRoundMetadata;
+import org.hyperledger.besu.consensus.qbft.payload.ProposalPayload;
+import org.hyperledger.besu.consensus.qbft.payload.RoundChangePayload;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.Util;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.jupiter.api.Test;
+
+public class ProposalTest {
+  private static final BftExtraDataCodec bftExtraDataCodec = new QbftExtraDataCodec();
+
+  private static final BftExtraData extraData =
+      new BftExtraData(
+          Bytes32.ZERO, Collections.emptyList(), Optional.empty(), 1, Collections.emptyList());
+
+  private static final Block BLOCK =
+      new Block(
+          new BlockHeaderTestFixture().extraData(bftExtraDataCodec.encode(extraData)).buildHeader(),
+          new BlockBody(Collections.emptyList(), Collections.emptyList()));
+
+  @Test
+  public void canRoundTripProposalMessage() {
+    final NodeKey nodeKey = NodeKeyUtils.generate();
+    final Address addr = Util.publicKeyToAddress(nodeKey.getPublicKey());
+
+    final ProposalPayload payload = new ProposalPayload(new ConsensusRoundIdentifier(1, 1), BLOCK);
+
+    final SignedData<ProposalPayload> signedPayload =
+        SignedData.create(payload, nodeKey.sign(payload.hashForSignature()));
+
+    final PreparePayload preparePayload =
+        new PreparePayload(new ConsensusRoundIdentifier(1, 0), BLOCK.getHash());
+    final SignedData<PreparePayload> prepare =
+        SignedData.create(preparePayload, nodeKey.sign(preparePayload.hashForSignature()));
+
+    final RoundChangePayload roundChangePayload =
+        new RoundChangePayload(
+            new ConsensusRoundIdentifier(1, 0),
+            Optional.of(new PreparedRoundMetadata(BLOCK.getHash(), 0)));
+
+    final SignedData<RoundChangePayload> roundChange =
+        SignedData.create(roundChangePayload, nodeKey.sign(roundChangePayload.hashForSignature()));
+
+    final Proposal proposal = new Proposal(signedPayload, List.of(roundChange), List.of(prepare));
+
+    final Proposal decodedProposal = Proposal.decode(proposal.encode(), bftExtraDataCodec);
+
+    assertThat(decodedProposal.getAuthor()).isEqualTo(addr);
+    assertThat(decodedProposal.getMessageType()).isEqualTo(QbftV1.PROPOSAL);
+    assertThat(decodedProposal.getPrepares()).hasSize(1);
+    assertThat(decodedProposal.getPrepares().get(0)).isEqualToComparingFieldByField(prepare);
+    assertThat(decodedProposal.getRoundChanges()).hasSize(1);
+    assertThat(decodedProposal.getRoundChanges().get(0))
+        .isEqualToComparingFieldByField(roundChange);
+    assertThat(decodedProposal.getSignedPayload().getPayload().getProposedBlock()).isEqualTo(BLOCK);
+    assertThat(decodedProposal.getSignedPayload().getPayload().getRoundIdentifier())
+        .isEqualTo(payload.getRoundIdentifier());
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/messagewrappers/RoundChangeTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/messagewrappers/RoundChangeTest.java
new file mode 100644
index 00000000000..23de31417c6
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/messagewrappers/RoundChangeTest.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.messagewrappers;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
+import org.hyperledger.besu.consensus.qbft.messagedata.QbftV1;
+import org.hyperledger.besu.consensus.qbft.payload.PreparePayload;
+import org.hyperledger.besu.consensus.qbft.payload.PreparedRoundMetadata;
+import org.hyperledger.besu.consensus.qbft.payload.RoundChangePayload;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.Util;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.jupiter.api.Test;
+
+public class RoundChangeTest {
+  private static final BftExtraDataCodec bftExtraDataCodec = new QbftExtraDataCodec();
+  private static final BftExtraData extraData =
+      new BftExtraData(
+          Bytes32.ZERO, Collections.emptyList(), Optional.empty(), 1, Collections.emptyList());
+
+  private static final Block BLOCK =
+      new Block(
+          new BlockHeaderTestFixture()
+              .extraData(new QbftExtraDataCodec().encode(extraData))
+              .buildHeader(),
+          new BlockBody(Collections.emptyList(), Collections.emptyList()));
+
+  @Test
+  public void canRoundTripARoundChangeMessage() {
+    final NodeKey nodeKey = NodeKeyUtils.generate();
+    final Address addr = Util.publicKeyToAddress(nodeKey.getPublicKey());
+
+    final RoundChangePayload payload =
+        new RoundChangePayload(
+            new ConsensusRoundIdentifier(1, 1),
+            Optional.of(new PreparedRoundMetadata(BLOCK.getHash(), 0)));
+
+    final SignedData<RoundChangePayload> signedRoundChangePayload =
+        SignedData.create(payload, nodeKey.sign(payload.hashForSignature()));
+
+    final PreparePayload preparePayload =
+        new PreparePayload(new ConsensusRoundIdentifier(1, 0), BLOCK.getHash());
+    final SignedData<PreparePayload> signedPreparePayload =
+        SignedData.create(preparePayload, nodeKey.sign(preparePayload.hashForSignature()));
+
+    final RoundChange roundChange =
+        new RoundChange(
+            signedRoundChangePayload, Optional.of(BLOCK), List.of(signedPreparePayload));
+
+    final RoundChange decodedRoundChange =
+        RoundChange.decode(roundChange.encode(), bftExtraDataCodec);
+
+    assertThat(decodedRoundChange.getMessageType()).isEqualTo(QbftV1.ROUND_CHANGE);
+    assertThat(decodedRoundChange.getAuthor()).isEqualTo(addr);
+    assertThat(decodedRoundChange.getSignedPayload())
+        .isEqualToComparingFieldByField(signedRoundChangePayload);
+    assertThat(decodedRoundChange.getProposedBlock()).isNotEmpty();
+    assertThat(decodedRoundChange.getProposedBlock().get()).isEqualToComparingFieldByField(BLOCK);
+    assertThat(decodedRoundChange.getPrepares()).hasSize(1);
+    assertThat(decodedRoundChange.getPrepares().get(0))
+        .isEqualToComparingFieldByField(signedPreparePayload);
+  }
+
+  @Test
+  public void canRoundTripEmptyPreparedRoundAndPreparedList() {
+    final NodeKey nodeKey = NodeKeyUtils.generate();
+    final Address addr = Util.publicKeyToAddress(nodeKey.getPublicKey());
+
+    final RoundChangePayload payload =
+        new RoundChangePayload(new ConsensusRoundIdentifier(1, 1), Optional.empty());
+
+    final SignedData<RoundChangePayload> signedRoundChangePayload =
+        SignedData.create(payload, nodeKey.sign(payload.hashForSignature()));
+
+    final RoundChange roundChange =
+        new RoundChange(signedRoundChangePayload, Optional.empty(), Collections.emptyList());
+
+    final RoundChange decodedRoundChange =
+        RoundChange.decode(roundChange.encode(), bftExtraDataCodec);
+
+    assertThat(decodedRoundChange.getMessageType()).isEqualTo(QbftV1.ROUND_CHANGE);
+    assertThat(decodedRoundChange.getAuthor()).isEqualTo(addr);
+    assertThat(decodedRoundChange.getSignedPayload())
+        .isEqualToComparingFieldByField(signedRoundChangePayload);
+    assertThat(decodedRoundChange.getProposedBlock()).isEmpty();
+    assertThat(decodedRoundChange.getPrepares()).isEmpty();
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/payload/QbftPayloadTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/payload/QbftPayloadTest.java
new file mode 100644
index 00000000000..820b0f976f9
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/payload/QbftPayloadTest.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.payload;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+
+import org.junit.jupiter.api.Test;
+
+public class QbftPayloadTest {
+
+  private final QbftPayload payload =
+      new QbftPayload() {
+        @Override
+        public void writeTo(final RLPOutput rlpOutput) {
+          writeConsensusRound(rlpOutput);
+        }
+
+        @Override
+        public int getMessageType() {
+          return 0;
+        }
+
+        @Override
+        public ConsensusRoundIdentifier getRoundIdentifier() {
+          return new ConsensusRoundIdentifier(5, 10);
+        }
+      };
+
+  @Test
+  public void roundAndSequenceAreEncodedAsScalars() {
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    out.startList();
+    payload.writeTo(out);
+    out.endList();
+    final RLPInput rlpIn = RLP.input(out.encoded());
+
+    rlpIn.enterList();
+    assertThat(rlpIn.readLongScalar()).isEqualTo(payload.getRoundIdentifier().getSequenceNumber());
+    assertThat(rlpIn.readIntScalar()).isEqualTo(payload.getRoundIdentifier().getRoundNumber());
+    rlpIn.leaveList();
+  }
+
+  @Test
+  public void readingConsensusRoundExpectsScalarValues() {
+    final long sequence = 100;
+    final int round = 8;
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    out.startList();
+    out.writeLongScalar(sequence);
+    out.writeIntScalar(round);
+    out.endList();
+
+    final RLPInput rlpIn = RLP.input(out.encoded());
+    rlpIn.enterList();
+    final ConsensusRoundIdentifier roundIdentifier = QbftPayload.readConsensusRound(rlpIn);
+    rlpIn.leaveList();
+
+    assertThat(roundIdentifier.getSequenceNumber()).isEqualTo(sequence);
+    assertThat(roundIdentifier.getRoundNumber()).isEqualTo(round);
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/pki/DefaultKeyStoreWrapperProviderTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/pki/DefaultKeyStoreWrapperProviderTest.java
new file mode 100644
index 00000000000..f5c91305cda
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/pki/DefaultKeyStoreWrapperProviderTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ *  the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.qbft.pki;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+
+import org.hyperledger.besu.consensus.qbft.pki.DefaultKeyStoreWrapperProvider.HardwareKeyStoreWrapperProvider;
+import org.hyperledger.besu.consensus.qbft.pki.DefaultKeyStoreWrapperProvider.SoftwareKeyStoreWrapperProvider;
+import org.hyperledger.besu.pki.keystore.KeyStoreWrapper;
+
+import java.nio.file.Path;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class DefaultKeyStoreWrapperProviderTest {
+
+  @Mock private HardwareKeyStoreWrapperProvider hardwareKeyStoreWrapperProvider;
+  @Mock private SoftwareKeyStoreWrapperProvider softwareKeyStoreWrapperProvider;
+  @InjectMocks private DefaultKeyStoreWrapperProvider keyStoreWrapperProvider;
+
+  private final Path keystorePath = Path.of("/keystore");
+  private final String keystorePassword = "pwd";
+  private final Path crlPath = Path.of("/crl");
+
+  @Test
+  public void configWithTypePKCS11UsesHardwareKeyStoreProvider() {
+    keyStoreWrapperProvider.apply(
+        KeyStoreWrapper.KEYSTORE_TYPE_PKCS11, keystorePath, keystorePassword, crlPath);
+
+    verify(hardwareKeyStoreWrapperProvider)
+        .get(eq(keystorePassword), eq(keystorePath), eq(crlPath));
+    verifyNoInteractions(softwareKeyStoreWrapperProvider);
+  }
+
+  @Test
+  public void configWithTypePKCS12UsesSoftwareKeyStoreProvider() {
+    keyStoreWrapperProvider.apply(
+        KeyStoreWrapper.KEYSTORE_TYPE_PKCS12, keystorePath, keystorePassword, crlPath);
+
+    verify(softwareKeyStoreWrapperProvider)
+        .get(
+            eq(KeyStoreWrapper.KEYSTORE_TYPE_PKCS12),
+            eq(keystorePath),
+            eq(keystorePassword),
+            eq(crlPath));
+    verifyNoInteractions(hardwareKeyStoreWrapperProvider);
+  }
+
+  @Test
+  public void configWithTypeJKSUsesSoftwareKeyStoreProvider() {
+    keyStoreWrapperProvider.apply(
+        KeyStoreWrapper.KEYSTORE_TYPE_JKS, keystorePath, keystorePassword, crlPath);
+
+    verify(softwareKeyStoreWrapperProvider)
+        .get(
+            eq(KeyStoreWrapper.KEYSTORE_TYPE_JKS),
+            eq(keystorePath),
+            eq(keystorePassword),
+            eq(crlPath));
+    verifyNoInteractions(hardwareKeyStoreWrapperProvider);
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/pki/PkiBlockCreationConfigurationProviderTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/pki/PkiBlockCreationConfigurationProviderTest.java
new file mode 100644
index 00000000000..27ccfe1bcfe
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/pki/PkiBlockCreationConfigurationProviderTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.qbft.pki;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.pki.config.PkiKeyStoreConfiguration;
+import org.hyperledger.besu.pki.keystore.KeyStoreWrapper;
+
+import java.nio.file.Path;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class PkiBlockCreationConfigurationProviderTest {
+
+  @Mock KeyStoreWrapperProvider keyStoreWrapperProvider;
+  @Mock KeyStoreWrapper keyStoreWrapper;
+  @Mock KeyStoreWrapper trustStoreWrapper;
+
+  @Test
+  public void pkiBlockCreationConfigurationIsLoadedCorrectly() {
+    when(keyStoreWrapperProvider.apply(any(), eq(Path.of("/tmp/keystore")), eq("pwd"), isNull()))
+        .thenReturn(keyStoreWrapper);
+    when(keyStoreWrapperProvider.apply(
+            any(), eq(Path.of("/tmp/truststore")), eq("pwd"), eq(Path.of("/tmp/crl"))))
+        .thenReturn(trustStoreWrapper);
+
+    final PkiKeyStoreConfiguration pkiKeyStoreConfiguration =
+        spy(
+            new PkiKeyStoreConfiguration.Builder()
+                .withKeyStorePath(Path.of("/tmp/keystore"))
+                .withKeyStorePasswordPath(Path.of("/tmp/password"))
+                .withTrustStorePath(Path.of("/tmp/truststore"))
+                .withTrustStorePasswordPath(Path.of("/tmp/password"))
+                .withCertificateAlias("anAlias")
+                .withCrlFilePath(Path.of("/tmp/crl"))
+                .build());
+    doReturn("pwd").when(pkiKeyStoreConfiguration).getKeyStorePassword();
+    doReturn("pwd").when(pkiKeyStoreConfiguration).getTrustStorePassword();
+
+    final PkiBlockCreationConfigurationProvider pkiBlockCreationConfigProvider =
+        new PkiBlockCreationConfigurationProvider(keyStoreWrapperProvider);
+
+    final PkiBlockCreationConfiguration pkiBlockCreationConfiguration =
+        pkiBlockCreationConfigProvider.load(pkiKeyStoreConfiguration);
+
+    assertThat(pkiBlockCreationConfiguration).isNotNull();
+    assertThat(pkiBlockCreationConfiguration.getKeyStore()).isNotNull();
+    assertThat(pkiBlockCreationConfiguration.getTrustStore()).isNotNull();
+    assertThat(pkiBlockCreationConfiguration.getCertificateAlias()).isEqualTo("anAlias");
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/pki/PkiQbftBlockHashingTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/pki/PkiQbftBlockHashingTest.java
new file mode 100644
index 00000000000..45ec1a780df
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/pki/PkiQbftBlockHashingTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ *  the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.qbft.pki;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.hyperledger.besu.consensus.common.bft.BftBlockHashing;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataFixture;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class PkiQbftBlockHashingTest {
+
+  private PkiQbftExtraDataCodec pkiExtraDataCodec = new PkiQbftExtraDataCodec();
+  private PkiQbftBlockHashing pkiQbftBlockHashing;
+
+  @BeforeEach
+  public void before() {
+    pkiExtraDataCodec = spy(new PkiQbftExtraDataCodec());
+    pkiQbftBlockHashing = new PkiQbftBlockHashing(pkiExtraDataCodec);
+  }
+
+  @Test
+  public void blockHashingUsesCorrectEncodingWithoutCmsMethodInCodec() {
+    final PkiQbftExtraData pkiQbftExtraData = createPkiQbftExtraData();
+    final BlockHeader headerWithExtraData =
+        new BlockHeaderTestFixture()
+            .number(1L)
+            .extraData(pkiExtraDataCodec.encode(pkiQbftExtraData))
+            .buildHeader();
+
+    // Expected hash using the extraData encoded by the encodeWithoutCms method of the codec
+    final Hash expectedHash =
+        Hash.hash(
+            BftBlockHashing.serializeHeader(
+                headerWithExtraData,
+                () -> pkiExtraDataCodec.encodeWithoutCms(pkiQbftExtraData),
+                pkiExtraDataCodec));
+
+    final Hash hash =
+        pkiQbftBlockHashing.calculateHashOfBftBlockForCmsSignature(headerWithExtraData);
+
+    assertThat(hash).isEqualTo(expectedHash);
+
+    /*
+     Verify that the encodeWithoutCms method was called twice, once when calculating the
+     expected hash and a second time as part of the hash calculation on
+     calculateHashOfBftBlockForCmsSignature
+    */
+    verify(pkiExtraDataCodec, times(2)).encodeWithoutCms(any(PkiQbftExtraData.class));
+  }
+
+  private PkiQbftExtraData createPkiQbftExtraData() {
+    final BlockHeader blockHeader = new BlockHeaderTestFixture().buildHeader();
+    final BftExtraData extraData =
+        BftExtraDataFixture.createExtraData(blockHeader, pkiExtraDataCodec);
+    return new PkiQbftExtraData(extraData, Bytes.random(32));
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/pki/PkiQbftExtraDataCodecTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/pki/PkiQbftExtraDataCodecTest.java
new file mode 100644
index 00000000000..32fc034b8e8
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/pki/PkiQbftExtraDataCodecTest.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.qbft.pki;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.consensus.qbft.QbftExtraDataCodecTestUtils.createNonEmptyVanityData;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.Vote;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.Random;
+import java.util.function.Supplier;
+
+import com.google.common.base.Suppliers;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Test;
+
+public class PkiQbftExtraDataCodecTest {
+
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+
+  // Arbitrary bytes representing a non-empty CMS
+  private final Bytes cms = Bytes.fromHexString("0x01");
+
+  private final String RAW_EXCLUDE_COMMIT_SEALS_AND_ROUND_NUMBER_ENCODED_STRING =
+      "0xf867a00102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20ea940000000000000000"
+          + "000000000000000000000001940000000000000000000000000000000000000002d7940000000000000000"
+          + "00000000000000000000000181ff80c001";
+
+  private final String RAW_EXCLUDE_COMMIT_SEALS_ENCODED_STRING =
+      "0xf86aa00102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20ea940000000000000000"
+          + "000000000000000000000001940000000000000000000000000000000000000002d7940000000000000000"
+          + "00000000000000000000000181ff83fedcbac001";
+
+  private final String RAW_ALL_ENCODED_STRING =
+      "0xf8f1a00102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20ea940000000000000000"
+          + "000000000000000000000001940000000000000000000000000000000000000002d7940000000000000000"
+          + "00000000000000000000000181ff83fedcbaf886b841000000000000000000000000000000000000000000"
+          + "0000000000000000000001000000000000000000000000000000000000000000000000000000000000000a"
+          + "00b841000000000000000000000000000000000000000000000000000000000000000a0000000000000000"
+          + "0000000000000000000000000000000000000000000000010001";
+
+  private final String RAW_QBFT_EXTRA_DATA =
+      "0xf8f0a00102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20ea940000000000000000"
+          + "000000000000000000000001940000000000000000000000000000000000000002d7940000000000000000"
+          + "00000000000000000000000181ff83fedcbaf886b841000000000000000000000000000000000000000000"
+          + "0000000000000000000001000000000000000000000000000000000000000000000000000000000000000a"
+          + "00b841000000000000000000000000000000000000000000000000000000000000000a0000000000000000"
+          + "00000000000000000000000000000000000000000000000100";
+
+  private final PkiQbftExtraDataCodec bftExtraDataCodec = new PkiQbftExtraDataCodec();
+
+  @Test
+  public void fullyPopulatedDataProducesCorrectlyFormedExtraDataObject() {
+    final List<Address> validators =
+        Arrays.asList(Address.fromHexString("1"), Address.fromHexString("2"));
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals =
+        Arrays.asList(
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 0),
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.TEN, BigInteger.ONE, (byte) 0));
+
+    // Create randomised vanity data.
+    final byte[] vanity_bytes = createNonEmptyVanityData();
+    new Random().nextBytes(vanity_bytes);
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
+    encoder.startList(); // start extra data list
+    // vanity data
+    encoder.writeBytes(vanity_data);
+    // validators
+    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
+    // votes
+    encoder.startList();
+    encoder.writeBytes(Address.fromHexString("1"));
+    encoder.writeByte(Vote.ADD_BYTE_VALUE);
+    encoder.endList();
+    // rounds
+    encoder.writeIntScalar(round);
+    // committer seals
+    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
+    // cms
+    encoder.writeBytes(cms);
+    encoder.endList(); // end extra data list
+
+    final Bytes bufferToInject = encoder.encoded();
+
+    final PkiQbftExtraData extraData =
+        (PkiQbftExtraData) bftExtraDataCodec.decodeRaw(bufferToInject);
+
+    assertThat(extraData.getVanityData()).isEqualTo(vanity_data);
+    assertThat(extraData.getRound()).isEqualTo(round);
+    assertThat(extraData.getSeals()).isEqualTo(committerSeals);
+    assertThat(extraData.getValidators()).isEqualTo(validators);
+    assertThat(extraData.getCms()).isEqualTo(cms);
+  }
+
+  @Test
+  public void decodingQbftExtraDataDelegatesToQbftCodec() {
+    final List<Address> validators =
+        Arrays.asList(Address.fromHexString("1"), Address.fromHexString("2"));
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals =
+        Arrays.asList(
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 0),
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.TEN, BigInteger.ONE, (byte) 0));
+
+    // Create randomised vanity data.
+    final byte[] vanity_bytes = createNonEmptyVanityData();
+    new Random().nextBytes(vanity_bytes);
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    final BytesValueRLPOutput encoder = new BytesValueRLPOutput();
+    encoder.startList(); // start extra data list
+    // vanity data
+    encoder.writeBytes(vanity_data);
+    // validators
+    encoder.writeList(validators, (validator, rlp) -> rlp.writeBytes(validator));
+    // votes
+    encoder.startList();
+    encoder.writeBytes(Address.fromHexString("1"));
+    encoder.writeByte(Vote.ADD_BYTE_VALUE);
+    encoder.endList();
+    // rounds
+    encoder.writeIntScalar(round);
+    // committer seals
+    encoder.writeList(committerSeals, (committer, rlp) -> rlp.writeBytes(committer.encodedBytes()));
+    // Not including the CMS in the list (to generate a non-pki QBFT extra data)
+    encoder.endList(); // end extra data list
+
+    final Bytes bufferToInject = encoder.encoded();
+
+    final PkiQbftExtraData extraData =
+        (PkiQbftExtraData) bftExtraDataCodec.decodeRaw(bufferToInject);
+
+    assertThat(extraData.getVanityData()).isEqualTo(vanity_data);
+    assertThat(extraData.getRound()).isEqualTo(round);
+    assertThat(extraData.getSeals()).isEqualTo(committerSeals);
+    assertThat(extraData.getValidators()).isEqualTo(validators);
+    assertThat(extraData.getCms()).isEqualTo(Bytes.EMPTY);
+  }
+
+  /*
+   When encoding for blockchain, we ignore commit seals and round number, but we include the CMS
+  */
+  @Test
+  public void encodingForBlockchainShouldIncludeCms() {
+    final Bytes expectedRawDecoding =
+        Bytes.fromHexString(RAW_EXCLUDE_COMMIT_SEALS_AND_ROUND_NUMBER_ENCODED_STRING);
+    final Bytes encoded =
+        bftExtraDataCodec.encodeWithoutCommitSealsAndRoundNumber(getDecodedExtraData(cms));
+
+    assertThat(encoded).isEqualTo(expectedRawDecoding);
+  }
+
+  @Test
+  public void encodingWithoutCommitSealsShouldIncludeCms() {
+    final Bytes expectedRawDecoding = Bytes.fromHexString(RAW_EXCLUDE_COMMIT_SEALS_ENCODED_STRING);
+    final Bytes encoded = bftExtraDataCodec.encodeWithoutCommitSeals(getDecodedExtraData(cms));
+
+    assertThat(encoded).isEqualTo(expectedRawDecoding);
+  }
+
+  @Test
+  public void encodingWithAllShouldIncludeCms() {
+    final Bytes expectedRawDecoding = Bytes.fromHexString(RAW_ALL_ENCODED_STRING);
+    final Bytes encoded = bftExtraDataCodec.encode(getDecodedExtraData(cms));
+
+    assertThat(encoded).isEqualTo(expectedRawDecoding);
+  }
+
+  /*
+   When encoding for proposal, we include commit seals and round number, but we ignore the CMS
+  */
+  @Test
+  public void encodingForCreatingCmsProposal() {
+    final Bytes expectedRawDecoding = Bytes.fromHexString(RAW_QBFT_EXTRA_DATA);
+    final Bytes encoded = bftExtraDataCodec.encodeWithoutCms(getDecodedExtraData(cms));
+
+    assertThat(encoded).isEqualTo(expectedRawDecoding);
+  }
+
+  /*
+   When encoding non-pki extra data, we delegate to the regular QBFT encoder
+  */
+  @Test
+  public void encodingQbftExtraData() {
+    final Bytes expectedRawDecoding = Bytes.fromHexString(RAW_QBFT_EXTRA_DATA);
+    final PkiQbftExtraData pkiBftExtraData = getDecodedExtraData(cms);
+    final BftExtraData bftExtraData =
+        new BftExtraData(
+            pkiBftExtraData.getVanityData(),
+            pkiBftExtraData.getSeals(),
+            pkiBftExtraData.getVote(),
+            pkiBftExtraData.getRound(),
+            pkiBftExtraData.getValidators());
+
+    final Bytes encoded = bftExtraDataCodec.encode(bftExtraData);
+
+    assertThat(encoded).isEqualTo(expectedRawDecoding);
+  }
+
+  private static PkiQbftExtraData getDecodedExtraData(final Bytes cms) {
+    final List<Address> validators =
+        Arrays.asList(Address.fromHexString("1"), Address.fromHexString("2"));
+    final Optional<Vote> vote = Optional.of(Vote.authVote(Address.fromHexString("1")));
+    final int round = 0x00FEDCBA;
+    final List<SECPSignature> committerSeals =
+        Arrays.asList(
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 0),
+            SIGNATURE_ALGORITHM.get().createSignature(BigInteger.TEN, BigInteger.ONE, (byte) 0));
+
+    // Create a byte buffer with no data.
+    final byte[] vanity_bytes = createNonEmptyVanityData();
+    final Bytes vanity_data = Bytes.wrap(vanity_bytes);
+
+    return new PkiQbftExtraData(vanity_data, committerSeals, vote, round, validators, cms);
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/protocol/Istanbul100SubProtocolTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/protocol/Istanbul100SubProtocolTest.java
new file mode 100644
index 00000000000..f3de01b77e9
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/protocol/Istanbul100SubProtocolTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.protocol;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+public class Istanbul100SubProtocolTest {
+
+  @Test
+  public void messageSpaceReportsCorrectly() {
+    final Istanbul100SubProtocol subProt = new Istanbul100SubProtocol();
+
+    assertThat(subProt.messageSpace(1)).isEqualTo(0x16);
+  }
+
+  @Test
+  public void allIbftMessageTypesAreRecognisedAsValidByTheSubProtocol() {
+    final Istanbul100SubProtocol subProt = new Istanbul100SubProtocol();
+
+    assertThat(subProt.isValidMessageCode(1, 0x12)).isTrue();
+    assertThat(subProt.isValidMessageCode(1, 0x13)).isTrue();
+    assertThat(subProt.isValidMessageCode(1, 0x14)).isTrue();
+    assertThat(subProt.isValidMessageCode(1, 0x15)).isTrue();
+  }
+
+  @Test
+  public void invalidMessageTypesAreNotAcceptedByTheSubprotocol() {
+    final Istanbul100SubProtocol subProt = new Istanbul100SubProtocol();
+
+    assertThat(subProt.isValidMessageCode(1, 0x16)).isFalse();
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftBlockHeightManagerTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftBlockHeightManagerTest.java
new file mode 100644
index 00000000000..669ed154e97
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftBlockHeightManagerTest.java
@@ -0,0 +1,547 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.statemachine;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.consensus.common.bft.BftContextBuilder.setupContextWithBftExtraDataEncoder;
+import static org.hyperledger.besu.consensus.common.bft.ConsensusRoundHelpers.createFrom;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.BlockTimer;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.RoundTimer;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.BftBlockCreator;
+import org.hyperledger.besu.consensus.common.bft.events.RoundExpiry;
+import org.hyperledger.besu.consensus.common.bft.network.ValidatorMulticaster;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftFinalState;
+import org.hyperledger.besu.consensus.qbft.QbftContext;
+import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
+import org.hyperledger.besu.consensus.qbft.messagedata.RoundChangeMessageData;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Commit;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Proposal;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.RoundChange;
+import org.hyperledger.besu.consensus.qbft.network.QbftMessageTransmitter;
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.qbft.validation.FutureRoundProposalMessageValidator;
+import org.hyperledger.besu.consensus.qbft.validation.MessageValidator;
+import org.hyperledger.besu.consensus.qbft.validation.MessageValidatorFactory;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.blockcreation.BlockCreator.BlockCreationResult;
+import org.hyperledger.besu.ethereum.blockcreation.BlockTransactionSelector.TransactionSelectionResults;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.BlockImporter;
+import org.hyperledger.besu.ethereum.core.Util;
+import org.hyperledger.besu.ethereum.mainnet.BlockImportResult;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.util.Subscribers;
+
+import java.math.BigInteger;
+import java.time.Clock;
+import java.util.List;
+import java.util.Optional;
+
+import com.google.common.collect.Lists;
+import org.apache.tuweni.bytes.Bytes;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+public class QbftBlockHeightManagerTest {
+
+  private final NodeKey nodeKey = NodeKeyUtils.generate();
+  private final MessageFactory messageFactory = new MessageFactory(nodeKey);
+  private final BlockHeaderTestFixture headerTestFixture = new BlockHeaderTestFixture();
+  private final BftExtraDataCodec bftExtraDataCodec = new QbftExtraDataCodec();
+
+  @Mock private BftFinalState finalState;
+  @Mock private QbftMessageTransmitter messageTransmitter;
+  @Mock private RoundChangeManager roundChangeManager;
+  @Mock private QbftRoundFactory roundFactory;
+  @Mock private Clock clock;
+  @Mock private MessageValidatorFactory messageValidatorFactory;
+  @Mock private BftBlockCreator blockCreator;
+  @Mock private BlockImporter blockImporter;
+  @Mock private BlockTimer blockTimer;
+  @Mock private RoundTimer roundTimer;
+  @Mock private FutureRoundProposalMessageValidator futureRoundProposalMessageValidator;
+  @Mock private ValidatorMulticaster validatorMulticaster;
+
+  @Captor private ArgumentCaptor<MessageData> sentMessageArgCaptor;
+
+  private final List<Address> validators = Lists.newArrayList();
+  private final List<MessageFactory> validatorMessageFactory = Lists.newArrayList();
+
+  private ProtocolContext protocolContext;
+  private final ConsensusRoundIdentifier roundIdentifier = new ConsensusRoundIdentifier(1, 0);
+  private Block createdBlock;
+
+  private void buildCreatedBlock() {
+
+    final BftExtraData extraData =
+        new BftExtraData(Bytes.wrap(new byte[32]), emptyList(), Optional.empty(), 0, validators);
+
+    headerTestFixture.extraData(bftExtraDataCodec.encode(extraData));
+    final BlockHeader header = headerTestFixture.buildHeader();
+    createdBlock = new Block(header, new BlockBody(emptyList(), emptyList()));
+  }
+
+  @BeforeEach
+  public void setup() {
+    for (int i = 0; i < 3; i++) {
+      final NodeKey nodeKey = NodeKeyUtils.generate();
+      validators.add(Util.publicKeyToAddress(nodeKey.getPublicKey()));
+      validatorMessageFactory.add(new MessageFactory(nodeKey));
+    }
+
+    buildCreatedBlock();
+
+    final MessageValidator messageValidator = mock(MessageValidator.class);
+    when(messageValidator.validateProposal(any())).thenReturn(true);
+    when(messageValidator.validateCommit(any())).thenReturn(true);
+    when(messageValidator.validatePrepare(any())).thenReturn(true);
+    when(finalState.getBlockTimer()).thenReturn(blockTimer);
+    when(finalState.getQuorum()).thenReturn(3);
+    when(finalState.getValidatorMulticaster()).thenReturn(validatorMulticaster);
+    when(blockCreator.createBlock(anyLong()))
+        .thenReturn(new BlockCreationResult(createdBlock, new TransactionSelectionResults()));
+
+    when(futureRoundProposalMessageValidator.validateProposalMessage(any())).thenReturn(true);
+    when(messageValidatorFactory.createFutureRoundProposalMessageValidator(anyLong(), any()))
+        .thenReturn(futureRoundProposalMessageValidator);
+    when(messageValidatorFactory.createMessageValidator(any(), any())).thenReturn(messageValidator);
+    when(blockImporter.importBlock(any(), any(), any())).thenReturn(new BlockImportResult(false));
+
+    protocolContext =
+        new ProtocolContext(
+            null,
+            null,
+            setupContextWithBftExtraDataEncoder(
+                QbftContext.class, validators, new QbftExtraDataCodec()),
+            Optional.empty());
+
+    // Ensure the created QbftRound has the valid ConsensusRoundIdentifier;
+    when(roundFactory.createNewRound(any(), anyInt()))
+        .thenAnswer(
+            invocation -> {
+              final int round = invocation.getArgument(1);
+              final ConsensusRoundIdentifier roundId = new ConsensusRoundIdentifier(1, round);
+              final RoundState createdRoundState = new RoundState(roundId, 3, messageValidator);
+              return new QbftRound(
+                  createdRoundState,
+                  blockCreator,
+                  protocolContext,
+                  blockImporter,
+                  Subscribers.create(),
+                  nodeKey,
+                  messageFactory,
+                  messageTransmitter,
+                  roundTimer,
+                  bftExtraDataCodec);
+            });
+
+    when(roundFactory.createNewRoundWithState(any(), any()))
+        .thenAnswer(
+            invocation -> {
+              final RoundState providedRoundState = invocation.getArgument(1);
+              return new QbftRound(
+                  providedRoundState,
+                  blockCreator,
+                  protocolContext,
+                  blockImporter,
+                  Subscribers.create(),
+                  nodeKey,
+                  messageFactory,
+                  messageTransmitter,
+                  roundTimer,
+                  bftExtraDataCodec);
+            });
+  }
+
+  @Test
+  public void startsABlockTimerOnStart() {
+    new QbftBlockHeightManager(
+        headerTestFixture.buildHeader(),
+        finalState,
+        roundChangeManager,
+        roundFactory,
+        clock,
+        messageValidatorFactory,
+        messageFactory);
+
+    verify(blockTimer, times(1)).startTimer(any(), any());
+    verify(finalState, never()).isLocalNodeProposerForRound(any());
+  }
+
+  @Test
+  public void doesNotStartRoundTimerOnStart() {
+    new QbftBlockHeightManager(
+        headerTestFixture.buildHeader(),
+        finalState,
+        roundChangeManager,
+        roundFactory,
+        clock,
+        messageValidatorFactory,
+        messageFactory);
+
+    verify(roundTimer, never()).startTimer(any());
+    verify(finalState, never()).isLocalNodeProposerForRound(any());
+  }
+
+  @Test
+  public void onBlockTimerExpiryRoundTimerIsStartedAndProposalMessageIsTransmitted() {
+    when(finalState.isLocalNodeProposerForRound(roundIdentifier)).thenReturn(true);
+
+    final QbftBlockHeightManager manager =
+        new QbftBlockHeightManager(
+            headerTestFixture.buildHeader(),
+            finalState,
+            roundChangeManager,
+            roundFactory,
+            clock,
+            messageValidatorFactory,
+            messageFactory);
+
+    manager.handleBlockTimerExpiry(roundIdentifier);
+    verify(messageTransmitter, atLeastOnce())
+        .multicastProposal(eq(roundIdentifier), any(), any(), any());
+    verify(messageTransmitter, atLeastOnce()).multicastPrepare(eq(roundIdentifier), any());
+    verify(roundTimer, times(1)).startTimer(roundIdentifier);
+    verify(finalState).isLocalNodeProposerForRound(eq(new ConsensusRoundIdentifier(1, 0)));
+  }
+
+  @Test
+  public void
+      onBlockTimerExpiryForNonProposerRoundTimerIsStartedAndNoProposalMessageIsTransmitted() {
+    when(finalState.isLocalNodeProposerForRound(roundIdentifier)).thenReturn(false);
+
+    final QbftBlockHeightManager manager =
+        new QbftBlockHeightManager(
+            headerTestFixture.buildHeader(),
+            finalState,
+            roundChangeManager,
+            roundFactory,
+            clock,
+            messageValidatorFactory,
+            messageFactory);
+
+    manager.handleBlockTimerExpiry(roundIdentifier);
+    verify(messageTransmitter, never()).multicastProposal(eq(roundIdentifier), any(), any(), any());
+    verify(messageTransmitter, never()).multicastPrepare(eq(roundIdentifier), any());
+    verify(roundTimer, times(1)).startTimer(roundIdentifier);
+    verify(finalState).isLocalNodeProposerForRound(eq(new ConsensusRoundIdentifier(1, 0)));
+  }
+
+  @Test
+  public void onBlockTimerExpiryDoNothingIfExistingRoundAlreadyStarted() {
+    final QbftBlockHeightManager manager =
+        new QbftBlockHeightManager(
+            headerTestFixture.buildHeader(),
+            finalState,
+            roundChangeManager,
+            roundFactory,
+            clock,
+            messageValidatorFactory,
+            messageFactory);
+
+    // Force a new round to be started at new round number.
+    final ConsensusRoundIdentifier futureRoundIdentifier = createFrom(roundIdentifier, 0, +2);
+    final Proposal futureRoundProposal =
+        messageFactory.createProposal(
+            futureRoundIdentifier, createdBlock, emptyList(), emptyList());
+    manager.handleProposalPayload(futureRoundProposal);
+    verify(roundTimer, times(1)).startTimer(futureRoundIdentifier);
+
+    // Nothing should happen for the block timer expiry as we have already created a new round due
+    // to the proposal
+    manager.handleBlockTimerExpiry(roundIdentifier);
+
+    verify(messageTransmitter, never()).multicastProposal(eq(roundIdentifier), any(), any(), any());
+    verify(messageTransmitter, never()).multicastPrepare(eq(roundIdentifier), any());
+    verify(finalState, never()).isLocalNodeProposerForRound(any());
+  }
+
+  @Test
+  public void onRoundChangeReceptionRoundChangeManagerIsInvokedAndNewRoundStarted() {
+    final ConsensusRoundIdentifier futureRoundIdentifier = createFrom(roundIdentifier, 0, +2);
+    final RoundChange roundChange =
+        messageFactory.createRoundChange(futureRoundIdentifier, Optional.empty());
+    when(roundChangeManager.appendRoundChangeMessage(any()))
+        .thenReturn(Optional.of(singletonList(roundChange)));
+    when(finalState.isLocalNodeProposerForRound(any())).thenReturn(false);
+
+    final QbftBlockHeightManager manager =
+        new QbftBlockHeightManager(
+            headerTestFixture.buildHeader(),
+            finalState,
+            roundChangeManager,
+            roundFactory,
+            clock,
+            messageValidatorFactory,
+            messageFactory);
+    manager.handleBlockTimerExpiry(roundIdentifier);
+    verify(roundFactory).createNewRound(any(), eq(0));
+
+    manager.handleRoundChangePayload(roundChange);
+
+    verify(roundChangeManager, times(1)).appendRoundChangeMessage(roundChange);
+    verify(roundFactory, times(1))
+        .createNewRound(any(), eq(futureRoundIdentifier.getRoundNumber()));
+  }
+
+  @Test
+  public void onRoundTimerExpiryANewRoundIsCreatedWithAnIncrementedRoundNumber() {
+    final QbftBlockHeightManager manager =
+        new QbftBlockHeightManager(
+            headerTestFixture.buildHeader(),
+            finalState,
+            roundChangeManager,
+            roundFactory,
+            clock,
+            messageValidatorFactory,
+            messageFactory);
+    manager.handleBlockTimerExpiry(roundIdentifier);
+    verify(roundFactory).createNewRound(any(), eq(0));
+
+    manager.roundExpired(new RoundExpiry(roundIdentifier));
+    verify(roundFactory).createNewRound(any(), eq(1));
+  }
+
+  @Test
+  public void whenSufficientRoundChangesAreReceivedAProposalMessageIsTransmitted() {
+    final ConsensusRoundIdentifier futureRoundIdentifier = createFrom(roundIdentifier, 0, +2);
+    final RoundChange roundChange =
+        messageFactory.createRoundChange(futureRoundIdentifier, Optional.empty());
+    final RoundChangeArtifacts roundChangArtifacts =
+        RoundChangeArtifacts.create(singletonList(roundChange));
+
+    when(roundChangeManager.appendRoundChangeMessage(any()))
+        .thenReturn(Optional.of(singletonList(roundChange)));
+    when(finalState.isLocalNodeProposerForRound(any())).thenReturn(true);
+
+    final QbftBlockHeightManager manager =
+        new QbftBlockHeightManager(
+            headerTestFixture.buildHeader(),
+            finalState,
+            roundChangeManager,
+            roundFactory,
+            clock,
+            messageValidatorFactory,
+            messageFactory);
+    reset(messageTransmitter);
+
+    manager.handleRoundChangePayload(roundChange);
+
+    verify(messageTransmitter, times(1))
+        .multicastProposal(
+            eq(futureRoundIdentifier),
+            any(),
+            eq(roundChangArtifacts.getRoundChanges()),
+            eq(emptyList()));
+  }
+
+  @Test
+  public void messagesForFutureRoundsAreBufferedAndUsedToPreloadNewRoundWhenItIsStarted() {
+    when(finalState.getQuorum()).thenReturn(1);
+
+    final ConsensusRoundIdentifier futureRoundIdentifier = createFrom(roundIdentifier, 0, +2);
+
+    final QbftBlockHeightManager manager =
+        new QbftBlockHeightManager(
+            headerTestFixture.buildHeader(),
+            finalState,
+            roundChangeManager,
+            roundFactory,
+            clock,
+            messageValidatorFactory,
+            messageFactory);
+
+    final Prepare prepare =
+        validatorMessageFactory
+            .get(0)
+            .createPrepare(futureRoundIdentifier, Hash.fromHexStringLenient("0"));
+    final Commit commit =
+        validatorMessageFactory
+            .get(1)
+            .createCommit(
+                futureRoundIdentifier,
+                Hash.fromHexStringLenient("0"),
+                SignatureAlgorithmFactory.getInstance()
+                    .createSignature(BigInteger.ONE, BigInteger.ONE, (byte) 1));
+
+    manager.handlePreparePayload(prepare);
+    manager.handleCommitPayload(commit);
+
+    // Force a new round to be started at new round number.
+    final Proposal futureRoundProposal =
+        messageFactory.createProposal(
+            futureRoundIdentifier, createdBlock, emptyList(), emptyList());
+
+    manager.handleProposalPayload(futureRoundProposal);
+
+    verify(messageTransmitter, times(1)).multicastPrepare(eq(futureRoundIdentifier), any());
+    verify(messageTransmitter, times(1)).multicastCommit(eq(futureRoundIdentifier), any(), any());
+  }
+
+  @Test
+  public void messagesForCurrentRoundAreBufferedAndUsedToPreloadRoundWhenItIsStarted() {
+    when(finalState.getQuorum()).thenReturn(1);
+    when(finalState.isLocalNodeProposerForRound(roundIdentifier)).thenReturn(true);
+
+    final QbftBlockHeightManager manager =
+        new QbftBlockHeightManager(
+            headerTestFixture.buildHeader(),
+            finalState,
+            roundChangeManager,
+            roundFactory,
+            clock,
+            messageValidatorFactory,
+            messageFactory);
+
+    final Prepare prepare =
+        validatorMessageFactory
+            .get(0)
+            .createPrepare(roundIdentifier, Hash.fromHexStringLenient("0"));
+    final Commit commit =
+        validatorMessageFactory
+            .get(1)
+            .createCommit(
+                roundIdentifier,
+                Hash.fromHexStringLenient("0"),
+                SignatureAlgorithmFactory.getInstance()
+                    .createSignature(BigInteger.ONE, BigInteger.ONE, (byte) 1));
+
+    manager.handlePreparePayload(prepare);
+    manager.handleCommitPayload(commit);
+
+    // Since we are also a proposer this will also send a proposal
+    manager.handleBlockTimerExpiry(roundIdentifier);
+
+    verify(messageTransmitter, times(1)).multicastPrepare(eq(roundIdentifier), any());
+    verify(messageTransmitter, times(1)).multicastCommit(eq(roundIdentifier), any(), any());
+  }
+
+  @Test
+  public void preparedCertificateIncludedInRoundChangeMessageOnRoundTimeoutExpired() {
+    when(finalState.isLocalNodeProposerForRound(any())).thenReturn(true);
+
+    final QbftBlockHeightManager manager =
+        new QbftBlockHeightManager(
+            headerTestFixture.buildHeader(),
+            finalState,
+            roundChangeManager,
+            roundFactory,
+            clock,
+            messageValidatorFactory,
+            messageFactory);
+
+    manager.handleBlockTimerExpiry(roundIdentifier); // Trigger a Proposal creation.
+
+    final Prepare localPrepare =
+        messageFactory.createPrepare(roundIdentifier, createdBlock.getHash());
+
+    final Prepare firstPrepare =
+        validatorMessageFactory
+            .get(0)
+            .createPrepare(roundIdentifier, Hash.fromHexStringLenient("0"));
+    final Prepare secondPrepare =
+        validatorMessageFactory
+            .get(1)
+            .createPrepare(roundIdentifier, Hash.fromHexStringLenient("0"));
+    final Prepare thirdPrepare =
+        validatorMessageFactory
+            .get(2)
+            .createPrepare(roundIdentifier, Hash.fromHexStringLenient("0"));
+    manager.handlePreparePayload(firstPrepare);
+    manager.handlePreparePayload(secondPrepare);
+    manager.handlePreparePayload(thirdPrepare);
+
+    manager.roundExpired(new RoundExpiry(roundIdentifier));
+
+    verify(validatorMulticaster, times(1)).send(sentMessageArgCaptor.capture());
+    final MessageData capturedMessageData = sentMessageArgCaptor.getValue();
+
+    assertThat(capturedMessageData).isInstanceOf(RoundChangeMessageData.class);
+    final RoundChangeMessageData roundChange = (RoundChangeMessageData) capturedMessageData;
+
+    final RoundChange receivedRoundChange = roundChange.decode(bftExtraDataCodec);
+
+    Assertions.assertThat(receivedRoundChange.getPreparedRoundMetadata()).isNotEmpty();
+
+    assertThat(receivedRoundChange.getPrepares())
+        .containsOnly(
+            localPrepare.getSignedPayload(),
+            firstPrepare.getSignedPayload(),
+            secondPrepare.getSignedPayload(),
+            thirdPrepare.getSignedPayload());
+  }
+
+  @Test
+  public void illegalFutureRoundProposalDoesNotTriggerNewRound() {
+    when(futureRoundProposalMessageValidator.validateProposalMessage(any())).thenReturn(false);
+
+    final ConsensusRoundIdentifier futureRoundIdentifier = createFrom(roundIdentifier, 0, +2);
+
+    final QbftBlockHeightManager manager =
+        new QbftBlockHeightManager(
+            headerTestFixture.buildHeader(),
+            finalState,
+            roundChangeManager,
+            roundFactory,
+            clock,
+            messageValidatorFactory,
+            messageFactory);
+
+    // Force a new round to be started at new round number.
+    final Proposal futureRoundProposal =
+        messageFactory.createProposal(
+            futureRoundIdentifier, createdBlock, emptyList(), emptyList());
+    reset(roundFactory); // Discard the existing createNewRound invocation.
+
+    manager.handleProposalPayload(futureRoundProposal);
+    verify(roundFactory, never()).createNewRound(any(), anyInt());
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftControllerTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftControllerTest.java
new file mode 100644
index 00000000000..3e3a38af824
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftControllerTest.java
@@ -0,0 +1,489 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.statemachine;
+
+import static org.assertj.core.util.Lists.newArrayList;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.EthSynchronizerUpdater;
+import org.hyperledger.besu.consensus.common.bft.MessageTracker;
+import org.hyperledger.besu.consensus.common.bft.events.BftReceivedMessageEvent;
+import org.hyperledger.besu.consensus.common.bft.events.BlockTimerExpiry;
+import org.hyperledger.besu.consensus.common.bft.events.NewChainHead;
+import org.hyperledger.besu.consensus.common.bft.events.RoundExpiry;
+import org.hyperledger.besu.consensus.common.bft.statemachine.BftFinalState;
+import org.hyperledger.besu.consensus.common.bft.statemachine.FutureMessageBuffer;
+import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
+import org.hyperledger.besu.consensus.qbft.QbftGossip;
+import org.hyperledger.besu.consensus.qbft.messagedata.CommitMessageData;
+import org.hyperledger.besu.consensus.qbft.messagedata.PrepareMessageData;
+import org.hyperledger.besu.consensus.qbft.messagedata.ProposalMessageData;
+import org.hyperledger.besu.consensus.qbft.messagedata.QbftV1;
+import org.hyperledger.besu.consensus.qbft.messagedata.RoundChangeMessageData;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Commit;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Proposal;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.RoundChange;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.DefaultMessage;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message;
+
+import java.util.Collections;
+import java.util.List;
+
+import com.google.common.collect.ImmutableList;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+public class QbftControllerTest {
+  private static final BftExtraDataCodec bftExtraDataCodec = new QbftExtraDataCodec();
+
+  @Mock private Blockchain blockChain;
+  @Mock private BftFinalState bftFinalState;
+  @Mock private QbftBlockHeightManagerFactory blockHeightManagerFactory;
+  @Mock private BlockHeader chainHeadBlockHeader;
+  @Mock private BlockHeader nextBlock;
+  @Mock private BaseQbftBlockHeightManager blockHeightManager;
+
+  @Mock private Proposal proposal;
+  private Message proposalMessage;
+  @Mock private ProposalMessageData proposalMessageData;
+
+  @Mock private Prepare prepare;
+  private Message prepareMessage;
+  @Mock private PrepareMessageData prepareMessageData;
+
+  @Mock private Commit commit;
+  private Message commitMessage;
+  @Mock private CommitMessageData commitMessageData;
+
+  @Mock private RoundChange roundChange;
+  private Message roundChangeMessage;
+  @Mock private RoundChangeMessageData roundChangeMessageData;
+
+  @Mock private MessageTracker messageTracker;
+  private final Address validator = Address.fromHexString("0x0");
+  private final Address unknownValidator = Address.fromHexString("0x2");
+  private final ConsensusRoundIdentifier futureRoundIdentifier = new ConsensusRoundIdentifier(5, 0);
+  private final ConsensusRoundIdentifier roundIdentifier = new ConsensusRoundIdentifier(4, 0);
+  private final ConsensusRoundIdentifier pastRoundIdentifier = new ConsensusRoundIdentifier(3, 0);
+  @Mock private QbftGossip qbftGossip;
+  @Mock private FutureMessageBuffer futureMessageBuffer;
+  private QbftController qbftController;
+
+  @BeforeEach
+  public void setup() {
+    when(blockChain.getChainHeadHeader()).thenReturn(chainHeadBlockHeader);
+    when(blockChain.getChainHeadBlockNumber()).thenReturn(3L);
+    when(blockHeightManagerFactory.create(any())).thenReturn(blockHeightManager);
+    when(bftFinalState.getValidators()).thenReturn(ImmutableList.of(validator));
+
+    when(chainHeadBlockHeader.getNumber()).thenReturn(3L);
+    when(chainHeadBlockHeader.getHash()).thenReturn(Hash.ZERO);
+
+    when(blockHeightManager.getParentBlockHeader()).thenReturn(chainHeadBlockHeader);
+    when(blockHeightManager.getChainHeight()).thenReturn(4L); // one greater than blockchain
+
+    when(nextBlock.getNumber()).thenReturn(5L);
+
+    when(bftFinalState.isLocalNodeValidator()).thenReturn(true);
+    when(messageTracker.hasSeenMessage(any())).thenReturn(false);
+  }
+
+  private void constructQbftController() {
+    qbftController =
+        new QbftController(
+            blockChain,
+            bftFinalState,
+            blockHeightManagerFactory,
+            qbftGossip,
+            messageTracker,
+            futureMessageBuffer,
+            mock(EthSynchronizerUpdater.class),
+            bftExtraDataCodec);
+  }
+
+  @Test
+  public void createsNewBlockHeightManagerWhenStarted() {
+    constructQbftController();
+    verify(blockHeightManagerFactory, never()).create(chainHeadBlockHeader);
+    qbftController.start();
+
+    verify(futureMessageBuffer, never()).addMessage(anyLong(), any());
+    verify(blockHeightManagerFactory).create(chainHeadBlockHeader);
+  }
+
+  @Test
+  public void startsNewBlockHeightManagerAndReplaysFutureMessages() {
+    final ConsensusRoundIdentifier roundIdentifierHeight6 = new ConsensusRoundIdentifier(6, 0);
+    setupPrepare(futureRoundIdentifier, validator);
+    setupProposal(roundIdentifierHeight6, validator);
+    setupCommit(futureRoundIdentifier, validator);
+    setupRoundChange(futureRoundIdentifier, validator);
+
+    final List<Message> height2Msgs =
+        newArrayList(prepareMessage, commitMessage, roundChangeMessage);
+    when(blockHeightManager.getChainHeight()).thenReturn(5L);
+    when(futureMessageBuffer.retrieveMessagesForHeight(5L)).thenReturn(height2Msgs);
+
+    constructQbftController();
+    qbftController.start();
+
+    verify(futureMessageBuffer).retrieveMessagesForHeight(5L);
+    verify(futureMessageBuffer, never()).retrieveMessagesForHeight(6L);
+    verify(blockHeightManagerFactory).create(chainHeadBlockHeader);
+    verify(blockHeightManager, atLeastOnce()).getChainHeight();
+    verify(blockHeightManager, never()).handleProposalPayload(proposal);
+    verify(blockHeightManager).handlePreparePayload(prepare);
+    verify(qbftGossip).send(prepareMessage);
+    verify(blockHeightManager).handleCommitPayload(commit);
+    verify(qbftGossip).send(commitMessage);
+    verify(blockHeightManager).handleRoundChangePayload(roundChange);
+    verify(qbftGossip).send(roundChangeMessage);
+  }
+
+  @Test
+  public void createsNewBlockHeightManagerAndReplaysFutureMessagesOnNewChainHeadEvent() {
+    setupPrepare(futureRoundIdentifier, validator);
+    setupProposal(futureRoundIdentifier, validator);
+    setupCommit(futureRoundIdentifier, validator);
+    setupRoundChange(futureRoundIdentifier, validator);
+
+    when(futureMessageBuffer.retrieveMessagesForHeight(5L))
+        .thenReturn(
+            ImmutableList.of(prepareMessage, proposalMessage, commitMessage, roundChangeMessage))
+        .thenReturn(Collections.emptyList());
+    when(blockHeightManager.getChainHeight()).thenReturn(5L);
+
+    constructQbftController();
+    qbftController.start();
+    final NewChainHead newChainHead = new NewChainHead(nextBlock);
+    qbftController.handleNewBlockEvent(newChainHead);
+
+    verify(blockHeightManagerFactory).create(nextBlock);
+    verify(blockHeightManager, atLeastOnce()).getChainHeight();
+    verify(futureMessageBuffer, times(2)).retrieveMessagesForHeight(5L);
+    verify(blockHeightManager).handleProposalPayload(proposal);
+    verify(qbftGossip).send(proposalMessage);
+    verify(blockHeightManager).handlePreparePayload(prepare);
+    verify(qbftGossip).send(prepareMessage);
+    verify(blockHeightManager).handleCommitPayload(commit);
+    verify(qbftGossip).send(commitMessage);
+    verify(blockHeightManager).handleRoundChangePayload(roundChange);
+    verify(qbftGossip).send(roundChangeMessage);
+  }
+
+  @Test
+  public void newBlockForCurrentOrPreviousHeightTriggersNoChange() {
+    constructQbftController();
+    qbftController.start();
+    long chainHeadHeight = 4;
+    when(nextBlock.getNumber()).thenReturn(chainHeadHeight);
+    when(nextBlock.getHash()).thenReturn(Hash.ZERO);
+    final NewChainHead sameHeightBlock = new NewChainHead(nextBlock);
+    qbftController.handleNewBlockEvent(sameHeightBlock);
+
+    when(nextBlock.getNumber()).thenReturn(chainHeadHeight - 1);
+    final NewChainHead priorBlock = new NewChainHead(nextBlock);
+    qbftController.handleNewBlockEvent(priorBlock);
+    verify(blockHeightManagerFactory, times(2)).create(any()); // 2 blocks created
+  }
+
+  @Test
+  public void handlesRoundExpiry() {
+    final RoundExpiry roundExpiry = new RoundExpiry(roundIdentifier);
+
+    constructQbftController();
+    qbftController.start();
+    qbftController.handleRoundExpiry(roundExpiry);
+
+    verify(blockHeightManager).roundExpired(roundExpiry);
+  }
+
+  @Test
+  public void handlesBlockTimerExpiry() {
+    final BlockTimerExpiry blockTimerExpiry = new BlockTimerExpiry(roundIdentifier);
+
+    constructQbftController();
+    qbftController.start();
+    qbftController.handleBlockTimerExpiry(blockTimerExpiry);
+
+    verify(blockHeightManager).handleBlockTimerExpiry(roundIdentifier);
+  }
+
+  @Test
+  public void proposalForCurrentHeightIsPassedToBlockHeightManager() {
+    setupProposal(roundIdentifier, validator);
+    constructQbftController();
+    qbftController.start();
+    qbftController.handleMessageEvent(new BftReceivedMessageEvent(proposalMessage));
+
+    verify(futureMessageBuffer, never()).addMessage(anyLong(), any());
+    verify(blockHeightManager).handleProposalPayload(proposal);
+    verify(qbftGossip).send(proposalMessage);
+    verify(blockHeightManager, atLeastOnce()).getChainHeight();
+    verifyNoMoreInteractions(blockHeightManager);
+  }
+
+  @Test
+  public void prepareForCurrentHeightIsPassedToBlockHeightManager() {
+    setupPrepare(roundIdentifier, validator);
+    constructQbftController();
+    qbftController.start();
+    qbftController.handleMessageEvent(new BftReceivedMessageEvent(prepareMessage));
+
+    verify(futureMessageBuffer, never()).addMessage(anyLong(), any());
+    verify(blockHeightManager).handlePreparePayload(prepare);
+    verify(qbftGossip).send(prepareMessage);
+    verify(blockHeightManager, atLeastOnce()).getChainHeight();
+    verifyNoMoreInteractions(blockHeightManager);
+  }
+
+  @Test
+  public void commitForCurrentHeightIsPassedToBlockHeightManager() {
+    setupCommit(roundIdentifier, validator);
+    constructQbftController();
+    qbftController.start();
+    qbftController.handleMessageEvent(new BftReceivedMessageEvent(commitMessage));
+
+    verify(futureMessageBuffer, never()).addMessage(anyLong(), any());
+    verify(blockHeightManager).handleCommitPayload(commit);
+    verify(qbftGossip).send(commitMessage);
+    verify(blockHeightManager, atLeastOnce()).getChainHeight();
+    verifyNoMoreInteractions(blockHeightManager);
+  }
+
+  @Test
+  public void roundChangeForCurrentHeightIsPassedToBlockHeightManager() {
+    setupRoundChange(roundIdentifier, validator);
+    constructQbftController();
+    qbftController.start();
+    qbftController.handleMessageEvent(new BftReceivedMessageEvent(roundChangeMessage));
+
+    verify(futureMessageBuffer, never()).addMessage(anyLong(), any());
+    verify(blockHeightManager).handleRoundChangePayload(roundChange);
+    verify(qbftGossip).send(roundChangeMessage);
+    verify(blockHeightManager, atLeastOnce()).getChainHeight();
+    verifyNoMoreInteractions(blockHeightManager);
+  }
+
+  @Test
+  public void proposalForPastHeightIsDiscarded() {
+    setupProposal(pastRoundIdentifier, validator);
+    verifyNotHandledAndNoFutureMsgs(new BftReceivedMessageEvent(proposalMessage));
+  }
+
+  @Test
+  public void prepareForPastHeightIsDiscarded() {
+    setupPrepare(pastRoundIdentifier, validator);
+    verifyNotHandledAndNoFutureMsgs(new BftReceivedMessageEvent(prepareMessage));
+  }
+
+  @Test
+  public void commitForPastHeightIsDiscarded() {
+    setupCommit(pastRoundIdentifier, validator);
+    verifyNotHandledAndNoFutureMsgs(new BftReceivedMessageEvent(commitMessage));
+  }
+
+  @Test
+  public void roundChangeForPastHeightIsDiscarded() {
+    setupRoundChange(pastRoundIdentifier, validator);
+    verifyNotHandledAndNoFutureMsgs(new BftReceivedMessageEvent(roundChangeMessage));
+  }
+
+  @Test
+  public void roundExpiryForPastHeightIsDiscarded() {
+    final RoundExpiry roundExpiry = new RoundExpiry(pastRoundIdentifier);
+    constructQbftController();
+    qbftController.start();
+    qbftController.handleRoundExpiry(roundExpiry);
+    verify(futureMessageBuffer, never()).addMessage(anyLong(), any());
+    verify(blockHeightManager, never()).roundExpired(any());
+  }
+
+  @Test
+  public void blockTimerForPastHeightIsDiscarded() {
+    final BlockTimerExpiry blockTimerExpiry = new BlockTimerExpiry(pastRoundIdentifier);
+    constructQbftController();
+    qbftController.start();
+    qbftController.handleBlockTimerExpiry(blockTimerExpiry);
+    verify(futureMessageBuffer, never()).addMessage(anyLong(), any());
+    verify(blockHeightManager, never()).handleBlockTimerExpiry(any());
+  }
+
+  @Test
+  public void proposalForUnknownValidatorIsDiscarded() {
+    setupProposal(roundIdentifier, unknownValidator);
+    verifyNotHandledAndNoFutureMsgs(new BftReceivedMessageEvent(proposalMessage));
+  }
+
+  @Test
+  public void prepareForUnknownValidatorIsDiscarded() {
+    setupPrepare(roundIdentifier, unknownValidator);
+    verifyNotHandledAndNoFutureMsgs(new BftReceivedMessageEvent(prepareMessage));
+  }
+
+  @Test
+  public void commitForUnknownValidatorIsDiscarded() {
+    setupCommit(roundIdentifier, unknownValidator);
+    verifyNotHandledAndNoFutureMsgs(new BftReceivedMessageEvent(commitMessage));
+  }
+
+  @Test
+  public void roundChangeForUnknownValidatorIsDiscarded() {
+    setupRoundChange(roundIdentifier, unknownValidator);
+    verifyNotHandledAndNoFutureMsgs(new BftReceivedMessageEvent(roundChangeMessage));
+  }
+
+  @Test
+  public void proposalForFutureHeightIsBuffered() {
+    setupProposal(futureRoundIdentifier, validator);
+    verifyHasFutureMessages(futureRoundIdentifier.getSequenceNumber(), proposalMessage);
+  }
+
+  @Test
+  public void prepareForFutureHeightIsBuffered() {
+    setupPrepare(futureRoundIdentifier, validator);
+    verifyHasFutureMessages(futureRoundIdentifier.getSequenceNumber(), prepareMessage);
+  }
+
+  @Test
+  public void commitForFutureHeightIsBuffered() {
+    setupCommit(futureRoundIdentifier, validator);
+    verifyHasFutureMessages(futureRoundIdentifier.getSequenceNumber(), commitMessage);
+  }
+
+  @Test
+  public void roundChangeForFutureHeightIsBuffered() {
+    setupRoundChange(futureRoundIdentifier, validator);
+    verifyHasFutureMessages(futureRoundIdentifier.getSequenceNumber(), roundChangeMessage);
+  }
+
+  @Test
+  public void duplicatedMessagesAreNotProcessed() {
+    when(messageTracker.hasSeenMessage(proposalMessageData)).thenReturn(true);
+    setupProposal(roundIdentifier, validator);
+    verifyNotHandledAndNoFutureMsgs(new BftReceivedMessageEvent(proposalMessage));
+    verify(messageTracker, never()).addSeenMessage(proposalMessageData);
+  }
+
+  @Test
+  public void uniqueMessagesAreAddedAsSeen() {
+    when(messageTracker.hasSeenMessage(proposalMessageData)).thenReturn(false);
+    setupProposal(roundIdentifier, validator);
+    constructQbftController();
+    qbftController.start();
+    qbftController.handleMessageEvent(new BftReceivedMessageEvent(proposalMessage));
+
+    verify(messageTracker).addSeenMessage(proposalMessageData);
+  }
+
+  @Test
+  public void messagesWhichAreAboveHeightManagerButBelowBlockChainLengthAreDiscarded() {
+    // NOTE: for this to occur, the system would need to be synchronising - i.e. blockchain is
+    // moving up faster than qbft loop is handling NewBlock messages
+    final long blockchainLength = 10L;
+    final long blockHeightManagerTargettingBlock = 6L;
+    final long messageHeight = 8L;
+    setupProposal(new ConsensusRoundIdentifier(messageHeight, 0), validator);
+
+    when(blockChain.getChainHeadHeader()).thenReturn(chainHeadBlockHeader);
+    when(blockChain.getChainHeadBlockNumber()).thenReturn(blockchainLength);
+    when(blockHeightManagerFactory.create(any())).thenReturn(blockHeightManager);
+    when(blockHeightManager.getChainHeight()).thenReturn(blockHeightManagerTargettingBlock);
+
+    constructQbftController();
+    qbftController.start();
+    qbftController.handleMessageEvent(new BftReceivedMessageEvent(proposalMessage));
+    verify(futureMessageBuffer, never()).addMessage(anyLong(), any());
+    verify(blockHeightManager, never()).handleProposalPayload(any());
+  }
+
+  private void verifyNotHandledAndNoFutureMsgs(final BftReceivedMessageEvent msg) {
+    constructQbftController();
+    qbftController.start();
+    qbftController.handleMessageEvent(msg);
+
+    verify(futureMessageBuffer, never()).addMessage(anyLong(), any());
+    verify(blockHeightManager, atLeastOnce()).getChainHeight();
+    verifyNoMoreInteractions(blockHeightManager);
+  }
+
+  private void verifyHasFutureMessages(final long msgHeight, final Message message) {
+    constructQbftController();
+    qbftController.start();
+    qbftController.handleMessageEvent(new BftReceivedMessageEvent(message));
+
+    verify(futureMessageBuffer).addMessage(msgHeight, message);
+    verify(blockHeightManager, atLeastOnce()).getChainHeight();
+    verifyNoMoreInteractions(blockHeightManager);
+  }
+
+  private void setupProposal(
+      final ConsensusRoundIdentifier roundIdentifier, final Address validator) {
+    when(proposal.getAuthor()).thenReturn(validator);
+    when(proposal.getRoundIdentifier()).thenReturn(roundIdentifier);
+    when(proposalMessageData.getCode()).thenReturn(QbftV1.PROPOSAL);
+    when(proposalMessageData.decode(bftExtraDataCodec)).thenReturn(proposal);
+    proposalMessage = new DefaultMessage(null, proposalMessageData);
+  }
+
+  private void setupPrepare(
+      final ConsensusRoundIdentifier roundIdentifier, final Address validator) {
+    when(prepare.getAuthor()).thenReturn(validator);
+    when(prepare.getRoundIdentifier()).thenReturn(roundIdentifier);
+    when(prepareMessageData.getCode()).thenReturn(QbftV1.PREPARE);
+    when(prepareMessageData.decode()).thenReturn(prepare);
+    prepareMessage = new DefaultMessage(null, prepareMessageData);
+  }
+
+  private void setupCommit(
+      final ConsensusRoundIdentifier roundIdentifier, final Address validator) {
+    when(commit.getAuthor()).thenReturn(validator);
+    when(commit.getRoundIdentifier()).thenReturn(roundIdentifier);
+    when(commitMessageData.getCode()).thenReturn(QbftV1.COMMIT);
+    when(commitMessageData.decode()).thenReturn(commit);
+    commitMessage = new DefaultMessage(null, commitMessageData);
+  }
+
+  private void setupRoundChange(
+      final ConsensusRoundIdentifier roundIdentifier, final Address validator) {
+    when(roundChange.getAuthor()).thenReturn(validator);
+    when(roundChange.getRoundIdentifier()).thenReturn(roundIdentifier);
+    when(roundChangeMessageData.getCode()).thenReturn(QbftV1.ROUND_CHANGE);
+    when(roundChangeMessageData.decode(bftExtraDataCodec)).thenReturn(roundChange);
+    roundChangeMessage = new DefaultMessage(null, roundChangeMessageData);
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftRoundTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftRoundTest.java
new file mode 100644
index 00000000000..2ac14e79b55
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/statemachine/QbftRoundTest.java
@@ -0,0 +1,483 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.statemachine;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static java.util.Optional.empty;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.consensus.common.bft.BftContextBuilder.setupContextWithBftExtraDataEncoder;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.common.bft.BftBlockHashing;
+import org.hyperledger.besu.consensus.common.bft.BftExtraData;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.RoundTimer;
+import org.hyperledger.besu.consensus.common.bft.blockcreation.BftBlockCreator;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.QbftContext;
+import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.RoundChange;
+import org.hyperledger.besu.consensus.qbft.network.QbftMessageTransmitter;
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.qbft.payload.PreparePayload;
+import org.hyperledger.besu.consensus.qbft.validation.MessageValidator;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.blockcreation.BlockCreator.BlockCreationResult;
+import org.hyperledger.besu.ethereum.blockcreation.BlockTransactionSelector.TransactionSelectionResults;
+import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.BlockImporter;
+import org.hyperledger.besu.ethereum.mainnet.BlockImportResult;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.plugin.services.securitymodule.SecurityModuleException;
+import org.hyperledger.besu.util.Subscribers;
+
+import java.math.BigInteger;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+public class QbftRoundTest {
+
+  private final NodeKey nodeKey = NodeKeyUtils.generate();
+  private final NodeKey nodeKey2 = NodeKeyUtils.generate();
+  private final ConsensusRoundIdentifier roundIdentifier = new ConsensusRoundIdentifier(1, 0);
+  private final MessageFactory messageFactory = new MessageFactory(nodeKey);
+  private final MessageFactory messageFactory2 = new MessageFactory(nodeKey2);
+  private final Subscribers<MinedBlockObserver> subscribers = Subscribers.create();
+  private final BftExtraDataCodec bftExtraDataCodec = new QbftExtraDataCodec();
+  private ProtocolContext protocolContext;
+
+  @Mock private MutableBlockchain blockChain;
+  @Mock private WorldStateArchive worldStateArchive;
+  @Mock private BlockImporter blockImporter;
+  @Mock private QbftMessageTransmitter transmitter;
+  @Mock private MinedBlockObserver minedBlockObserver;
+  @Mock private BftBlockCreator blockCreator;
+  @Mock private MessageValidator messageValidator;
+  @Mock private RoundTimer roundTimer;
+
+  @Captor private ArgumentCaptor<Block> blockCaptor;
+
+  private Block proposedBlock;
+  private BftExtraData proposedExtraData;
+
+  private final SECPSignature remoteCommitSeal =
+      SignatureAlgorithmFactory.getInstance()
+          .createSignature(BigInteger.ONE, BigInteger.ONE, (byte) 1);
+
+  @BeforeEach
+  public void setup() {
+    protocolContext =
+        new ProtocolContext(
+            blockChain,
+            worldStateArchive,
+            setupContextWithBftExtraDataEncoder(
+                QbftContext.class, emptyList(), new QbftExtraDataCodec()),
+            Optional.empty());
+
+    when(messageValidator.validateProposal(any())).thenReturn(true);
+    when(messageValidator.validatePrepare(any())).thenReturn(true);
+    when(messageValidator.validateCommit(any())).thenReturn(true);
+
+    proposedExtraData =
+        new BftExtraData(Bytes.wrap(new byte[32]), emptyList(), empty(), 0, emptyList());
+    final BlockHeaderTestFixture headerTestFixture = new BlockHeaderTestFixture();
+    headerTestFixture.extraData(new QbftExtraDataCodec().encode(proposedExtraData));
+    headerTestFixture.number(1);
+
+    final BlockHeader header = headerTestFixture.buildHeader();
+    proposedBlock = new Block(header, new BlockBody(emptyList(), emptyList()));
+
+    when(blockCreator.createBlock(anyLong()))
+        .thenReturn(new BlockCreationResult(proposedBlock, new TransactionSelectionResults()));
+
+    when(blockImporter.importBlock(any(), any(), any())).thenReturn(new BlockImportResult(true));
+
+    subscribers.subscribe(minedBlockObserver);
+  }
+
+  @Test
+  public void onConstructionRoundTimerIsStarted() {
+    final RoundState roundState = new RoundState(roundIdentifier, 3, messageValidator);
+    new QbftRound(
+        roundState,
+        blockCreator,
+        protocolContext,
+        blockImporter,
+        subscribers,
+        nodeKey,
+        messageFactory,
+        transmitter,
+        roundTimer,
+        bftExtraDataCodec);
+    verify(roundTimer, times(1)).startTimer(roundIdentifier);
+  }
+
+  @Test
+  public void onReceptionOfValidProposalSendsAPrepareToNetworkPeers() {
+    final RoundState roundState = new RoundState(roundIdentifier, 3, messageValidator);
+    final QbftRound round =
+        new QbftRound(
+            roundState,
+            blockCreator,
+            protocolContext,
+            blockImporter,
+            subscribers,
+            nodeKey,
+            messageFactory,
+            transmitter,
+            roundTimer,
+            bftExtraDataCodec);
+
+    round.handleProposalMessage(
+        messageFactory.createProposal(
+            roundIdentifier, proposedBlock, Collections.emptyList(), Collections.emptyList()));
+    verify(transmitter, times(1)).multicastPrepare(roundIdentifier, proposedBlock.getHash());
+    verify(transmitter, never()).multicastCommit(any(), any(), any());
+  }
+
+  @Test
+  public void sendsAProposalAndPrepareWhenSendProposalRequested() {
+    final RoundState roundState = new RoundState(roundIdentifier, 3, messageValidator);
+    final QbftRound round =
+        new QbftRound(
+            roundState,
+            blockCreator,
+            protocolContext,
+            blockImporter,
+            subscribers,
+            nodeKey,
+            messageFactory,
+            transmitter,
+            roundTimer,
+            bftExtraDataCodec);
+
+    round.createAndSendProposalMessage(15);
+    verify(transmitter, times(1))
+        .multicastProposal(
+            roundIdentifier, proposedBlock, Collections.emptyList(), Collections.emptyList());
+    verify(transmitter, times(1)).multicastPrepare(roundIdentifier, proposedBlock.getHash());
+    verify(transmitter, never()).multicastCommit(any(), any(), any());
+  }
+
+  @Test
+  public void singleValidatorImportBlocksImmediatelyOnProposalCreation() {
+    final RoundState roundState = new RoundState(roundIdentifier, 1, messageValidator);
+    final QbftRound round =
+        new QbftRound(
+            roundState,
+            blockCreator,
+            protocolContext,
+            blockImporter,
+            subscribers,
+            nodeKey,
+            messageFactory,
+            transmitter,
+            roundTimer,
+            bftExtraDataCodec);
+    round.createAndSendProposalMessage(15);
+    verify(transmitter, times(1))
+        .multicastProposal(
+            roundIdentifier, proposedBlock, Collections.emptyList(), Collections.emptyList());
+    verify(transmitter, times(1)).multicastPrepare(roundIdentifier, proposedBlock.getHash());
+    verify(transmitter, times(1)).multicastCommit(any(), any(), any());
+    verify(blockImporter, times(1)).importBlock(any(), any(), any());
+  }
+
+  @Test
+  public void localNodeProposesToNetworkOfTwoValidatorsImportsOnReceptionOfCommitFromPeer() {
+    final RoundState roundState = new RoundState(roundIdentifier, 2, messageValidator);
+    final QbftRound round =
+        new QbftRound(
+            roundState,
+            blockCreator,
+            protocolContext,
+            blockImporter,
+            subscribers,
+            nodeKey,
+            messageFactory,
+            transmitter,
+            roundTimer,
+            bftExtraDataCodec);
+
+    final Hash commitSealHash =
+        new BftBlockHashing(new QbftExtraDataCodec())
+            .calculateDataHashForCommittedSeal(proposedBlock.getHeader(), proposedExtraData);
+    final SECPSignature localCommitSeal = nodeKey.sign(commitSealHash);
+
+    round.createAndSendProposalMessage(15);
+    verify(transmitter, never()).multicastCommit(any(), any(), any());
+    verify(blockImporter, never()).importBlock(any(), any(), any());
+
+    round.handlePrepareMessage(
+        messageFactory2.createPrepare(roundIdentifier, proposedBlock.getHash()));
+
+    verify(transmitter, times(1))
+        .multicastCommit(roundIdentifier, proposedBlock.getHash(), localCommitSeal);
+    verify(blockImporter, never()).importBlock(any(), any(), any());
+
+    round.handleCommitMessage(
+        messageFactory.createCommit(roundIdentifier, proposedBlock.getHash(), remoteCommitSeal));
+    verify(blockImporter, times(1)).importBlock(any(), any(), any());
+  }
+
+  @Test
+  public void aProposalWithAnewBlockIsSentUponReceptionOfARoundChangeWithNoCertificate() {
+    final RoundState roundState = new RoundState(roundIdentifier, 2, messageValidator);
+    final QbftRound round =
+        new QbftRound(
+            roundState,
+            blockCreator,
+            protocolContext,
+            blockImporter,
+            subscribers,
+            nodeKey,
+            messageFactory,
+            transmitter,
+            roundTimer,
+            bftExtraDataCodec);
+
+    round.startRoundWith(new RoundChangeArtifacts(emptyList(), Optional.empty()), 15);
+    verify(transmitter, times(1))
+        .multicastProposal(eq(roundIdentifier), any(), eq(emptyList()), eq(emptyList()));
+    verify(transmitter, times(1)).multicastPrepare(eq(roundIdentifier), any());
+  }
+
+  @Test
+  public void aProposalMessageWithTheSameBlockIsSentUponReceptionOfARoundChangeWithCertificate() {
+    final ConsensusRoundIdentifier priorRoundChange = new ConsensusRoundIdentifier(1, 0);
+    final RoundState roundState = new RoundState(roundIdentifier, 2, messageValidator);
+    final QbftRound round =
+        new QbftRound(
+            roundState,
+            blockCreator,
+            protocolContext,
+            blockImporter,
+            subscribers,
+            nodeKey,
+            messageFactory,
+            transmitter,
+            roundTimer,
+            bftExtraDataCodec);
+
+    final SignedData<PreparePayload> preparedPayload =
+        messageFactory.createPrepare(priorRoundChange, proposedBlock.getHash()).getSignedPayload();
+
+    final RoundChange roundChange =
+        messageFactory.createRoundChange(
+            roundIdentifier,
+            Optional.of(new PreparedCertificate(proposedBlock, singletonList(preparedPayload), 2)));
+
+    final RoundChangeArtifacts roundChangeArtifacts =
+        RoundChangeArtifacts.create(singletonList(roundChange));
+
+    round.startRoundWith(roundChangeArtifacts, 15);
+    verify(transmitter, times(1))
+        .multicastProposal(
+            eq(roundIdentifier),
+            blockCaptor.capture(),
+            eq(singletonList(roundChange.getSignedPayload())),
+            eq(singletonList(preparedPayload)));
+    verify(transmitter, times(1))
+        .multicastPrepare(eq(roundIdentifier), eq(blockCaptor.getValue().getHash()));
+
+    final BftExtraData proposedExtraData =
+        new QbftExtraDataCodec().decode(blockCaptor.getValue().getHeader());
+    assertThat(proposedExtraData.getRound()).isEqualTo(roundIdentifier.getRoundNumber());
+
+    // Inject a single Prepare message, and confirm the roundState has gone to Prepared (which
+    // indicates the block has entered the roundState (note: all msgs are deemed valid due to mocks)
+    round.handlePrepareMessage(
+        messageFactory2.createPrepare(roundIdentifier, proposedBlock.getHash()));
+    assertThat(roundState.isPrepared()).isTrue();
+  }
+
+  @Test
+  public void creatingNewBlockFromEmptyPreparedCertificateUpdatesInternalState() {
+    final RoundState roundState = new RoundState(roundIdentifier, 2, messageValidator);
+    final QbftRound round =
+        new QbftRound(
+            roundState,
+            blockCreator,
+            protocolContext,
+            blockImporter,
+            subscribers,
+            nodeKey,
+            messageFactory,
+            transmitter,
+            roundTimer,
+            bftExtraDataCodec);
+
+    final RoundChange roundChange =
+        messageFactory.createRoundChange(roundIdentifier, Optional.empty());
+
+    final RoundChangeArtifacts roundChangeArtifacts =
+        RoundChangeArtifacts.create(List.of(roundChange));
+
+    round.startRoundWith(roundChangeArtifacts, 15);
+    verify(transmitter, times(1))
+        .multicastProposal(
+            eq(roundIdentifier),
+            blockCaptor.capture(),
+            eq(List.of(roundChange.getSignedPayload())),
+            eq(Collections.emptyList()));
+    verify(transmitter, times(1))
+        .multicastPrepare(eq(roundIdentifier), eq(blockCaptor.getValue().getHash()));
+
+    // Inject a single Prepare message, and confirm the roundState has gone to Prepared (which
+    // indicates the block has entered the roundState (note: all msgs are deemed valid due to mocks)
+    round.handlePrepareMessage(
+        messageFactory2.createPrepare(roundIdentifier, proposedBlock.getHash()));
+    assertThat(roundState.isPrepared()).isTrue();
+  }
+
+  @Test
+  public void creatingNewBlockNotifiesBlockMiningObservers() {
+    final RoundState roundState = new RoundState(roundIdentifier, 1, messageValidator);
+    final QbftRound round =
+        new QbftRound(
+            roundState,
+            blockCreator,
+            protocolContext,
+            blockImporter,
+            subscribers,
+            nodeKey,
+            messageFactory,
+            transmitter,
+            roundTimer,
+            bftExtraDataCodec);
+    round.createAndSendProposalMessage(15);
+    verify(minedBlockObserver).blockMined(any());
+  }
+
+  @Test
+  public void blockIsOnlyImportedOnceWhenCommitsAreReceivedBeforeProposal() {
+    final ConsensusRoundIdentifier roundIdentifier = new ConsensusRoundIdentifier(1, 0);
+    final int QUORUM_SIZE = 2;
+    final RoundState roundState = new RoundState(roundIdentifier, QUORUM_SIZE, messageValidator);
+    final QbftRound round =
+        new QbftRound(
+            roundState,
+            blockCreator,
+            protocolContext,
+            blockImporter,
+            subscribers,
+            nodeKey,
+            messageFactory,
+            transmitter,
+            roundTimer,
+            bftExtraDataCodec);
+
+    round.handleCommitMessage(
+        messageFactory.createCommit(roundIdentifier, proposedBlock.getHash(), remoteCommitSeal));
+
+    round.handleProposalMessage(
+        messageFactory.createProposal(
+            roundIdentifier, proposedBlock, Collections.emptyList(), Collections.emptyList()));
+
+    verify(blockImporter, times(1)).importBlock(any(), any(), any());
+  }
+
+  @Test
+  public void blockIsImportedOnlyOnceIfQuorumCommitsAreReceivedPriorToProposal() {
+    final int QUORUM_SIZE = 1;
+    final RoundState roundState = new RoundState(roundIdentifier, QUORUM_SIZE, messageValidator);
+    final QbftRound round =
+        new QbftRound(
+            roundState,
+            blockCreator,
+            protocolContext,
+            blockImporter,
+            subscribers,
+            nodeKey,
+            messageFactory,
+            transmitter,
+            roundTimer,
+            bftExtraDataCodec);
+
+    round.handleCommitMessage(
+        messageFactory.createCommit(roundIdentifier, proposedBlock.getHash(), remoteCommitSeal));
+
+    round.handleProposalMessage(
+        messageFactory.createProposal(
+            roundIdentifier, proposedBlock, Collections.emptyList(), Collections.emptyList()));
+
+    verify(blockImporter, times(1)).importBlock(any(), any(), any());
+  }
+
+  @Test
+  public void exceptionDuringNodeKeySigningDoesNotEscape() {
+    final int QUORUM_SIZE = 1;
+    final RoundState roundState = new RoundState(roundIdentifier, QUORUM_SIZE, messageValidator);
+    final NodeKey throwingNodeKey = mock(NodeKey.class);
+    final MessageFactory throwingMessageFactory = new MessageFactory(throwingNodeKey);
+    when(throwingNodeKey.sign(any())).thenThrow(new SecurityModuleException("Hsm is Offline"));
+
+    final QbftRound round =
+        new QbftRound(
+            roundState,
+            blockCreator,
+            protocolContext,
+            blockImporter,
+            subscribers,
+            throwingNodeKey,
+            throwingMessageFactory,
+            transmitter,
+            roundTimer,
+            bftExtraDataCodec);
+
+    round.handleProposalMessage(
+        messageFactory.createProposal(
+            roundIdentifier, proposedBlock, Collections.emptyList(), Collections.emptyList()));
+
+    // Verify that no prepare message was constructed by the QbftRound
+    assertThat(roundState.constructPreparedCertificate()).isEmpty();
+
+    verifyNoInteractions(transmitter);
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/statemachine/RoundStateTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/statemachine/RoundStateTest.java
new file mode 100644
index 00000000000..ff76a19b8ad
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/statemachine/RoundStateTest.java
@@ -0,0 +1,338 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.statemachine;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.messagewrappers.BftMessage;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Commit;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Proposal;
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.qbft.payload.PreparePayload;
+import org.hyperledger.besu.consensus.qbft.validation.MessageValidator;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.Util;
+
+import java.math.BigInteger;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
+import com.google.common.collect.Lists;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class RoundStateTest {
+
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+
+  private final List<NodeKey> validatorKeys = Lists.newArrayList();
+  private final List<MessageFactory> validatorMessageFactories = Lists.newArrayList();
+  private final ConsensusRoundIdentifier roundIdentifier = new ConsensusRoundIdentifier(1, 1);
+
+  private final List<Address> validators = Lists.newArrayList();
+  private final Hash blockHash = Hash.fromHexStringLenient("1");
+
+  @Mock private MessageValidator messageValidator;
+
+  @Mock private Block block;
+
+  @BeforeEach
+  public void setup() {
+    for (int i = 0; i < 3; i++) {
+      final NodeKey newNodeKey = NodeKeyUtils.generate();
+      validatorKeys.add(newNodeKey);
+      validators.add(Util.publicKeyToAddress(newNodeKey.getPublicKey()));
+      validatorMessageFactories.add(new MessageFactory(newNodeKey));
+    }
+  }
+
+  @Test
+  public void defaultRoundIsNotPreparedOrCommittedAndHasNoPreparedCertificate() {
+    final RoundState roundState = new RoundState(roundIdentifier, 1, messageValidator);
+
+    assertThat(roundState.isPrepared()).isFalse();
+    assertThat(roundState.isCommitted()).isFalse();
+    assertThat(roundState.constructPreparedCertificate()).isEmpty();
+  }
+
+  @Test
+  public void ifProposalMessageFailsValidationMethodReturnsFalse() {
+    when(messageValidator.validateProposal(any())).thenReturn(false);
+    final RoundState roundState = new RoundState(roundIdentifier, 1, messageValidator);
+
+    final Proposal proposal =
+        validatorMessageFactories
+            .get(0)
+            .createProposal(
+                roundIdentifier, block, Collections.emptyList(), Collections.emptyList());
+
+    assertThat(roundState.setProposedBlock(proposal)).isFalse();
+    assertThat(roundState.isPrepared()).isFalse();
+    assertThat(roundState.isCommitted()).isFalse();
+    assertThat(roundState.constructPreparedCertificate()).isEmpty();
+  }
+
+  @Test
+  public void singleValidatorRequiresCommitMessageToBeCommitted() {
+    when(messageValidator.validateProposal(any())).thenReturn(true);
+    when(messageValidator.validateCommit(any())).thenReturn(true);
+
+    final RoundState roundState = new RoundState(roundIdentifier, 1, messageValidator);
+
+    final Proposal proposal =
+        validatorMessageFactories
+            .get(0)
+            .createProposal(
+                roundIdentifier, block, Collections.emptyList(), Collections.emptyList());
+
+    assertThat(roundState.setProposedBlock(proposal)).isTrue();
+    assertThat(roundState.isPrepared()).isFalse();
+    assertThat(roundState.isCommitted()).isFalse();
+
+    final Commit commit =
+        validatorMessageFactories
+            .get(0)
+            .createCommit(
+                roundIdentifier,
+                blockHash,
+                SIGNATURE_ALGORITHM
+                    .get()
+                    .createSignature(BigInteger.ONE, BigInteger.ONE, (byte) 1));
+
+    roundState.addCommitMessage(commit);
+    assertThat(roundState.isPrepared()).isFalse();
+    assertThat(roundState.isCommitted()).isTrue();
+    assertThat(roundState.constructPreparedCertificate()).isEmpty();
+  }
+
+  @Test
+  public void prepareMessagesCanBeReceivedPriorToProposal() {
+    when(messageValidator.validateProposal(any())).thenReturn(true);
+    when(messageValidator.validatePrepare(any())).thenReturn(true);
+
+    final RoundState roundState = new RoundState(roundIdentifier, 3, messageValidator);
+
+    final Prepare firstPrepare =
+        validatorMessageFactories.get(1).createPrepare(roundIdentifier, blockHash);
+
+    final Prepare secondPrepare =
+        validatorMessageFactories.get(2).createPrepare(roundIdentifier, blockHash);
+
+    final Prepare thirdPrepare =
+        validatorMessageFactories.get(0).createPrepare(roundIdentifier, blockHash);
+
+    roundState.addPrepareMessage(firstPrepare);
+    assertThat(roundState.isPrepared()).isFalse();
+    assertThat(roundState.isCommitted()).isFalse();
+    assertThat(roundState.constructPreparedCertificate()).isEmpty();
+
+    roundState.addPrepareMessage(secondPrepare);
+    assertThat(roundState.isPrepared()).isFalse();
+    assertThat(roundState.isCommitted()).isFalse();
+    assertThat(roundState.constructPreparedCertificate()).isEmpty();
+
+    roundState.addPrepareMessage(thirdPrepare);
+    assertThat(roundState.isPrepared()).isFalse();
+    assertThat(roundState.isCommitted()).isFalse();
+    assertThat(roundState.constructPreparedCertificate()).isEmpty();
+
+    final Proposal proposal =
+        validatorMessageFactories
+            .get(0)
+            .createProposal(
+                roundIdentifier, block, Collections.emptyList(), Collections.emptyList());
+    assertThat(roundState.setProposedBlock(proposal)).isTrue();
+    assertThat(roundState.isPrepared()).isTrue();
+    assertThat(roundState.isCommitted()).isFalse();
+    assertThat(roundState.constructPreparedCertificate()).isNotEmpty();
+  }
+
+  @Test
+  public void invalidPriorPrepareMessagesAreDiscardedUponSubsequentProposal() {
+    final Prepare firstPrepare =
+        validatorMessageFactories.get(1).createPrepare(roundIdentifier, blockHash);
+
+    final Prepare secondPrepare =
+        validatorMessageFactories.get(2).createPrepare(roundIdentifier, blockHash);
+
+    // RoundState has a quorum size of 3, meaning 1 proposal and 2 prepare are required to be
+    // 'prepared'.
+    final RoundState roundState = new RoundState(roundIdentifier, 3, messageValidator);
+
+    when(messageValidator.validateProposal(any())).thenReturn(true);
+    when(messageValidator.validatePrepare(firstPrepare)).thenReturn(true);
+    when(messageValidator.validatePrepare(secondPrepare)).thenReturn(false);
+
+    roundState.addPrepareMessage(firstPrepare);
+    roundState.addPrepareMessage(secondPrepare);
+    verify(messageValidator, never()).validatePrepare(any());
+
+    final Proposal proposal =
+        validatorMessageFactories
+            .get(0)
+            .createProposal(
+                roundIdentifier, block, Collections.emptyList(), Collections.emptyList());
+
+    assertThat(roundState.setProposedBlock(proposal)).isTrue();
+    assertThat(roundState.isPrepared()).isFalse();
+    assertThat(roundState.isCommitted()).isFalse();
+    assertThat(roundState.constructPreparedCertificate()).isEmpty();
+  }
+
+  @Test
+  public void prepareMessageIsValidatedAgainstExistingProposal() {
+    final RoundState roundState = new RoundState(roundIdentifier, 2, messageValidator);
+
+    final Prepare firstPrepare =
+        validatorMessageFactories.get(1).createPrepare(roundIdentifier, blockHash);
+
+    final Prepare secondPrepare =
+        validatorMessageFactories.get(2).createPrepare(roundIdentifier, blockHash);
+
+    final Prepare thirdPrepare =
+        validatorMessageFactories.get(0).createPrepare(roundIdentifier, blockHash);
+
+    final Proposal proposal =
+        validatorMessageFactories
+            .get(0)
+            .createProposal(
+                roundIdentifier, block, Collections.emptyList(), Collections.emptyList());
+
+    when(messageValidator.validateProposal(any())).thenReturn(true);
+    when(messageValidator.validatePrepare(firstPrepare)).thenReturn(false);
+    when(messageValidator.validatePrepare(secondPrepare)).thenReturn(true);
+    when(messageValidator.validatePrepare(thirdPrepare)).thenReturn(true);
+
+    roundState.setProposedBlock(proposal);
+    assertThat(roundState.isPrepared()).isFalse();
+
+    roundState.addPrepareMessage(firstPrepare);
+    assertThat(roundState.isPrepared()).isFalse();
+
+    roundState.addPrepareMessage(secondPrepare);
+    assertThat(roundState.isPrepared()).isFalse();
+
+    roundState.addPrepareMessage(thirdPrepare);
+    assertThat(roundState.isPrepared()).isTrue();
+  }
+
+  @Test
+  public void commitSealsAreExtractedFromReceivedMessages() {
+    when(messageValidator.validateProposal(any())).thenReturn(true);
+    when(messageValidator.validateCommit(any())).thenReturn(true);
+
+    final RoundState roundState = new RoundState(roundIdentifier, 2, messageValidator);
+
+    final Commit firstCommit =
+        validatorMessageFactories
+            .get(1)
+            .createCommit(
+                roundIdentifier,
+                blockHash,
+                SIGNATURE_ALGORITHM
+                    .get()
+                    .createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 1));
+
+    final Commit secondCommit =
+        validatorMessageFactories
+            .get(2)
+            .createCommit(
+                roundIdentifier,
+                blockHash,
+                SIGNATURE_ALGORITHM
+                    .get()
+                    .createSignature(BigInteger.TEN, BigInteger.TEN, (byte) 1));
+
+    final Proposal proposal =
+        validatorMessageFactories
+            .get(0)
+            .createProposal(
+                roundIdentifier, block, Collections.emptyList(), Collections.emptyList());
+
+    roundState.setProposedBlock(proposal);
+    roundState.addCommitMessage(firstCommit);
+    assertThat(roundState.isCommitted()).isFalse();
+    roundState.addCommitMessage(secondCommit);
+    assertThat(roundState.isCommitted()).isTrue();
+
+    assertThat(roundState.getCommitSeals())
+        .containsOnly(firstCommit.getCommitSeal(), secondCommit.getCommitSeal());
+  }
+
+  @Test
+  public void duplicatePreparesAreNotIncludedInRoundChangeMessage() {
+    final RoundState roundState = new RoundState(roundIdentifier, 2, messageValidator);
+
+    final Prepare firstPrepare =
+        validatorMessageFactories.get(1).createPrepare(roundIdentifier, blockHash);
+
+    final Prepare secondPrepare =
+        validatorMessageFactories.get(2).createPrepare(roundIdentifier, blockHash);
+
+    final Prepare duplicatePrepare =
+        validatorMessageFactories.get(2).createPrepare(roundIdentifier, blockHash);
+
+    final Proposal proposal =
+        validatorMessageFactories
+            .get(0)
+            .createProposal(
+                roundIdentifier, block, Collections.emptyList(), Collections.emptyList());
+
+    when(messageValidator.validateProposal(any())).thenReturn(true);
+    when(messageValidator.validatePrepare(any())).thenReturn(true);
+
+    roundState.setProposedBlock(proposal);
+    roundState.addPrepareMessage(firstPrepare);
+    roundState.addPrepareMessage(secondPrepare);
+    roundState.addPrepareMessage(duplicatePrepare);
+
+    assertThat(roundState.isPrepared()).isTrue();
+    assertThat(roundState.isCommitted()).isFalse();
+
+    final Optional<PreparedCertificate> preparedCertificate =
+        roundState.constructPreparedCertificate();
+    assertThat(preparedCertificate).isNotEmpty();
+    assertThat(preparedCertificate.get().getRound()).isEqualTo(roundIdentifier.getRoundNumber());
+    assertThat(preparedCertificate.get().getBlock()).isEqualTo(block);
+
+    final List<SignedData<PreparePayload>> expectedPrepares =
+        List.of(firstPrepare, secondPrepare).stream()
+            .map(BftMessage::getSignedPayload)
+            .collect(Collectors.toList());
+    assertThat(preparedCertificate.get().getPrepares()).isEqualTo(expectedPrepares);
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/CommitValidatorTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/CommitValidatorTest.java
new file mode 100644
index 00000000000..02ca653f2a3
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/CommitValidatorTest.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validation;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundHelpers;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Commit;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.datatypes.Hash;
+
+import org.junit.jupiter.api.Test;
+
+public class CommitValidatorTest {
+
+  private static final int VALIDATOR_COUNT = 4;
+
+  private final QbftNodeList validators = QbftNodeList.createNodes(VALIDATOR_COUNT);
+  final ConsensusRoundIdentifier round = new ConsensusRoundIdentifier(1, 0);
+  final Hash expectedHash = Hash.fromHexStringLenient("0x1");
+  final Hash expectedCommitHash = Hash.fromHexStringLenient("0x1");
+  final CommitValidator validator =
+      new CommitValidator(validators.getNodeAddresses(), round, expectedHash, expectedCommitHash);
+
+  @Test
+  public void commitIsValidIfItMatchesExpectedValues() {
+    for (int i = 0; i < VALIDATOR_COUNT; i++) {
+      final SECPSignature commitSeal = validators.getNode(i).getNodeKey().sign(expectedHash);
+      final Commit msg =
+          validators.getMessageFactory(i).createCommit(round, expectedHash, commitSeal);
+      assertThat(validator.validate(msg)).isTrue();
+    }
+  }
+
+  @Test
+  public void commitSignedByANonValidatorFails() {
+    final QbftNode nonValidator = QbftNode.create();
+    final SECPSignature commitSeal = nonValidator.getNodeKey().sign(expectedHash);
+    final Commit msg =
+        nonValidator.getMessageFactory().createCommit(round, expectedHash, commitSeal);
+    assertThat(validator.validate(msg)).isFalse();
+  }
+
+  @Test
+  public void commitForWrongRoundFails() {
+    final SECPSignature commitSeal = validators.getNode(0).getNodeKey().sign(expectedHash);
+    final Commit msg =
+        validators
+            .getMessageFactory(0)
+            .createCommit(ConsensusRoundHelpers.createFrom(round, 0, +1), expectedHash, commitSeal);
+    assertThat(validator.validate(msg)).isFalse();
+  }
+
+  @Test
+  public void commitForWrongSequenceFails() {
+    final SECPSignature commitSeal = validators.getNode(0).getNodeKey().sign(expectedHash);
+    final Commit msg =
+        validators
+            .getMessageFactory(0)
+            .createCommit(ConsensusRoundHelpers.createFrom(round, +1, 0), expectedHash, commitSeal);
+    assertThat(validator.validate(msg)).isFalse();
+  }
+
+  @Test
+  public void commitWithWrongDigestFails() {
+    final SECPSignature commitSeal = validators.getNode(0).getNodeKey().sign(expectedHash);
+    final Commit msg =
+        validators
+            .getMessageFactory(0)
+            .createCommit(round, Hash.fromHexStringLenient("0x2"), commitSeal);
+    assertThat(validator.validate(msg)).isFalse();
+  }
+
+  @Test
+  public void commitWithMismatchedSealFails() {
+    final SECPSignature commitSeal =
+        validators.getNode(0).getNodeKey().sign(Hash.fromHexStringLenient("0x2"));
+    final Commit msg =
+        validators.getMessageFactory(0).createCommit(round, expectedHash, commitSeal);
+
+    assertThat(validator.validate(msg)).isFalse();
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/PrepareValidatorTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/PrepareValidatorTest.java
new file mode 100644
index 00000000000..b6c63b5598b
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/PrepareValidatorTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validation;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundHelpers;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.datatypes.Hash;
+
+import org.junit.jupiter.api.Test;
+
+public class PrepareValidatorTest {
+
+  private static final int VALIDATOR_COUNT = 4;
+
+  private final QbftNodeList validators = QbftNodeList.createNodes(VALIDATOR_COUNT);
+  private final ConsensusRoundIdentifier round = new ConsensusRoundIdentifier(1, 0);
+  private final Hash expectedHash = Hash.fromHexStringLenient("0x1");
+  private final PrepareValidator validator =
+      new PrepareValidator(validators.getNodeAddresses(), round, expectedHash);
+
+  @Test
+  public void prepareIsValidIfItMatchesExpectedValues() {
+    for (int i = 0; i < VALIDATOR_COUNT; i++) {
+      final Prepare msg = validators.getMessageFactory(i).createPrepare(round, expectedHash);
+      assertThat(validator.validate(msg)).isTrue();
+    }
+  }
+
+  @Test
+  public void prepareSignedByANonValidatorFails() {
+    final QbftNode nonValidator = QbftNode.create();
+
+    final Prepare msg = nonValidator.getMessageFactory().createPrepare(round, expectedHash);
+    assertThat(validator.validate(msg)).isFalse();
+  }
+
+  @Test
+  public void prepareForWrongRoundFails() {
+    final Prepare msg =
+        validators
+            .getMessageFactory(0)
+            .createPrepare(ConsensusRoundHelpers.createFrom(round, 0, +1), expectedHash);
+    assertThat(validator.validate(msg)).isFalse();
+  }
+
+  @Test
+  public void prepareForWrongSequenceFails() {
+    final Prepare msg =
+        validators
+            .getMessageFactory(0)
+            .createPrepare(ConsensusRoundHelpers.createFrom(round, +1, 0), expectedHash);
+    assertThat(validator.validate(msg)).isFalse();
+  }
+
+  @Test
+  public void prepareWithWrongDigestFails() {
+    final Prepare msg =
+        validators.getMessageFactory(0).createPrepare(round, Hash.fromHexStringLenient("0x2"));
+    assertThat(validator.validate(msg)).isFalse();
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/ProposalPayloadValidatorTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/ProposalPayloadValidatorTest.java
new file mode 100644
index 00000000000..fb8b67393d6
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/ProposalPayloadValidatorTest.java
@@ -0,0 +1,333 @@
+/*
+ * Copyright 2022 Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validation;
+
+import static java.util.Collections.emptyList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.consensus.common.bft.BftContextBuilder.setupContextWithBftExtraDataEncoder;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundHelpers;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.ProposedBlockHelpers;
+import org.hyperledger.besu.consensus.qbft.QbftContext;
+import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Proposal;
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.consensus.qbft.pki.PkiQbftBlockHeaderFunctions;
+import org.hyperledger.besu.consensus.qbft.pki.PkiQbftExtraData;
+import org.hyperledger.besu.consensus.qbft.pki.PkiQbftExtraDataCodec;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.BlockProcessingResult;
+import org.hyperledger.besu.ethereum.BlockValidator;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions;
+import org.hyperledger.besu.ethereum.core.Util;
+import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.pki.cms.CmsValidator;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class ProposalPayloadValidatorTest {
+
+  @Mock private BlockValidator blockValidator;
+  @Mock private MutableBlockchain blockChain;
+  @Mock private WorldStateArchive worldStateArchive;
+  @Mock private CmsValidator cmsValidator;
+  private ProtocolContext protocolContext;
+
+  private static final int CHAIN_HEIGHT = 3;
+  private final ConsensusRoundIdentifier targetRound =
+      new ConsensusRoundIdentifier(CHAIN_HEIGHT, 3);
+
+  private final NodeKey nodeKey = NodeKeyUtils.generate();
+  private final Address expectedProposer = Util.publicKeyToAddress(nodeKey.getPublicKey());
+  private final MessageFactory messageFactory = new MessageFactory(nodeKey);
+  final ConsensusRoundIdentifier roundIdentifier =
+      ConsensusRoundHelpers.createFrom(targetRound, 1, 0);
+  final QbftExtraDataCodec bftExtraDataCodec = new QbftExtraDataCodec();
+
+  @BeforeEach
+  public void setup() {
+    protocolContext =
+        new ProtocolContext(
+            blockChain,
+            worldStateArchive,
+            setupContextWithBftExtraDataEncoder(QbftContext.class, emptyList(), bftExtraDataCodec),
+            Optional.empty());
+  }
+
+  @Test
+  public void validationPassesWhenProposerAndRoundMatchAndBlockIsValid() {
+    final ProposalPayloadValidator payloadValidator =
+        new ProposalPayloadValidator(
+            expectedProposer, roundIdentifier, blockValidator, protocolContext, bftExtraDataCodec);
+    final Block block =
+        ProposedBlockHelpers.createProposalBlock(emptyList(), roundIdentifier, bftExtraDataCodec);
+    final Proposal proposal =
+        messageFactory.createProposal(roundIdentifier, block, emptyList(), emptyList());
+
+    when(blockValidator.validateAndProcessBlock(
+            eq(protocolContext),
+            eq(block),
+            eq(HeaderValidationMode.LIGHT),
+            eq(HeaderValidationMode.FULL)))
+        .thenReturn(new BlockProcessingResult(Optional.empty()));
+
+    assertThat(payloadValidator.validate(proposal.getSignedPayload())).isTrue();
+  }
+
+  @Test
+  public void validationPassesWhenBlockRoundDoesNotMatchProposalRound() {
+    final ProposalPayloadValidator payloadValidator =
+        new ProposalPayloadValidator(
+            expectedProposer, roundIdentifier, blockValidator, protocolContext, bftExtraDataCodec);
+
+    final Block block =
+        ProposedBlockHelpers.createProposalBlock(
+            emptyList(),
+            ConsensusRoundHelpers.createFrom(roundIdentifier, 0, +1),
+            bftExtraDataCodec);
+    final Proposal proposal =
+        messageFactory.createProposal(roundIdentifier, block, emptyList(), emptyList());
+
+    when(blockValidator.validateAndProcessBlock(
+            eq(protocolContext),
+            eq(block),
+            eq(HeaderValidationMode.LIGHT),
+            eq(HeaderValidationMode.FULL)))
+        .thenReturn(new BlockProcessingResult(Optional.empty()));
+
+    assertThat(payloadValidator.validate(proposal.getSignedPayload())).isTrue();
+  }
+
+  @Test
+  public void validationFailsWhenBlockFailsValidation() {
+    final ConsensusRoundIdentifier roundIdentifier =
+        ConsensusRoundHelpers.createFrom(targetRound, 1, 0);
+
+    final ProposalPayloadValidator payloadValidator =
+        new ProposalPayloadValidator(
+            expectedProposer, roundIdentifier, blockValidator, protocolContext, bftExtraDataCodec);
+    final Block block =
+        ProposedBlockHelpers.createProposalBlock(emptyList(), roundIdentifier, bftExtraDataCodec);
+    final Proposal proposal =
+        messageFactory.createProposal(roundIdentifier, block, emptyList(), emptyList());
+
+    when(blockValidator.validateAndProcessBlock(
+            eq(protocolContext),
+            eq(block),
+            eq(HeaderValidationMode.LIGHT),
+            eq(HeaderValidationMode.FULL)))
+        .thenReturn(new BlockProcessingResult("Failed"));
+
+    assertThat(payloadValidator.validate(proposal.getSignedPayload())).isFalse();
+  }
+
+  @Test
+  public void validationFailsWhenExpectedProposerDoesNotMatchPayloadsAuthor() {
+    final ProposalPayloadValidator payloadValidator =
+        new ProposalPayloadValidator(
+            Address.fromHexString("0x1"),
+            roundIdentifier,
+            blockValidator,
+            protocolContext,
+            bftExtraDataCodec);
+    final Block block = ProposedBlockHelpers.createProposalBlock(emptyList(), roundIdentifier);
+    final Proposal proposal =
+        messageFactory.createProposal(roundIdentifier, block, emptyList(), emptyList());
+
+    assertThat(payloadValidator.validate(proposal.getSignedPayload())).isFalse();
+    verifyNoMoreInteractions(blockValidator);
+  }
+
+  @Test
+  public void validationFailsWhenMessageMismatchesExpectedRound() {
+    final ProposalPayloadValidator payloadValidator =
+        new ProposalPayloadValidator(
+            expectedProposer, roundIdentifier, blockValidator, protocolContext, bftExtraDataCodec);
+
+    final Block block = ProposedBlockHelpers.createProposalBlock(emptyList(), roundIdentifier);
+    final Proposal proposal =
+        messageFactory.createProposal(
+            ConsensusRoundHelpers.createFrom(roundIdentifier, 0, +1),
+            block,
+            emptyList(),
+            emptyList());
+
+    assertThat(payloadValidator.validate(proposal.getSignedPayload())).isFalse();
+    verifyNoMoreInteractions(blockValidator);
+  }
+
+  @Test
+  public void validationFailsWhenMessageMismatchesExpectedHeight() {
+    final ProposalPayloadValidator payloadValidator =
+        new ProposalPayloadValidator(
+            expectedProposer, roundIdentifier, blockValidator, protocolContext, bftExtraDataCodec);
+
+    final Block block = ProposedBlockHelpers.createProposalBlock(emptyList(), roundIdentifier);
+    final Proposal proposal =
+        messageFactory.createProposal(
+            ConsensusRoundHelpers.createFrom(roundIdentifier, +1, 0),
+            block,
+            emptyList(),
+            emptyList());
+
+    assertThat(payloadValidator.validate(proposal.getSignedPayload())).isFalse();
+    verifyNoMoreInteractions(blockValidator);
+  }
+
+  @Test
+  public void validationFailsForBlockWithIncorrectHeight() {
+    final ProposalPayloadValidator payloadValidator =
+        new ProposalPayloadValidator(
+            expectedProposer, roundIdentifier, blockValidator, protocolContext, bftExtraDataCodec);
+    final Block block =
+        ProposedBlockHelpers.createProposalBlock(
+            emptyList(),
+            ConsensusRoundHelpers.createFrom(roundIdentifier, +1, 0),
+            bftExtraDataCodec);
+    final Proposal proposal =
+        messageFactory.createProposal(roundIdentifier, block, emptyList(), emptyList());
+
+    when(blockValidator.validateAndProcessBlock(
+            eq(protocolContext),
+            eq(block),
+            eq(HeaderValidationMode.LIGHT),
+            eq(HeaderValidationMode.FULL)))
+        .thenReturn(new BlockProcessingResult(Optional.empty()));
+
+    assertThat(payloadValidator.validate(proposal.getSignedPayload())).isFalse();
+  }
+
+  @Test
+  public void validationForCmsFailsWhenCmsFailsValidation() {
+    final PkiQbftExtraDataCodec pkiQbftExtraDataCodec = new PkiQbftExtraDataCodec();
+    final QbftContext qbftContext =
+        setupContextWithBftExtraDataEncoder(QbftContext.class, emptyList(), pkiQbftExtraDataCodec);
+    final Bytes cms = Bytes.fromHexStringLenient("0x1");
+    final ProtocolContext protocolContext =
+        new ProtocolContext(blockChain, worldStateArchive, qbftContext, Optional.empty());
+
+    final ProposalPayloadValidator payloadValidator =
+        new ProposalPayloadValidator(
+            expectedProposer,
+            roundIdentifier,
+            blockValidator,
+            protocolContext,
+            pkiQbftExtraDataCodec,
+            Optional.of(cmsValidator));
+    final Block block =
+        createPkiProposalBlock(emptyList(), roundIdentifier, pkiQbftExtraDataCodec, cms);
+    final Proposal proposal =
+        messageFactory.createProposal(roundIdentifier, block, emptyList(), emptyList());
+    final Hash hashWithoutCms =
+        PkiQbftBlockHeaderFunctions.forCmsSignature(pkiQbftExtraDataCodec).hash(block.getHeader());
+
+    when(blockValidator.validateAndProcessBlock(
+            eq(protocolContext),
+            eq(block),
+            eq(HeaderValidationMode.LIGHT),
+            eq(HeaderValidationMode.FULL)))
+        .thenReturn(new BlockProcessingResult(Optional.empty()));
+    when(cmsValidator.validate(eq(cms), eq(hashWithoutCms))).thenReturn(false);
+
+    assertThat(payloadValidator.validate(proposal.getSignedPayload())).isFalse();
+  }
+
+  @Test
+  public void validationForCmsPassesWhenCmsIsValid() {
+    final PkiQbftExtraDataCodec pkiQbftExtraDataCodec = new PkiQbftExtraDataCodec();
+    final QbftContext qbftContext =
+        setupContextWithBftExtraDataEncoder(QbftContext.class, emptyList(), pkiQbftExtraDataCodec);
+    final Bytes cms = Bytes.fromHexStringLenient("0x1");
+    final ProtocolContext protocolContext =
+        new ProtocolContext(blockChain, worldStateArchive, qbftContext, Optional.empty());
+
+    final ProposalPayloadValidator payloadValidator =
+        new ProposalPayloadValidator(
+            expectedProposer,
+            roundIdentifier,
+            blockValidator,
+            protocolContext,
+            pkiQbftExtraDataCodec,
+            Optional.of(cmsValidator));
+    final Block block =
+        createPkiProposalBlock(emptyList(), roundIdentifier, pkiQbftExtraDataCodec, cms);
+    final Proposal proposal =
+        messageFactory.createProposal(roundIdentifier, block, emptyList(), emptyList());
+    final Hash hashWithoutCms =
+        PkiQbftBlockHeaderFunctions.forCmsSignature(pkiQbftExtraDataCodec).hash(block.getHeader());
+
+    when(blockValidator.validateAndProcessBlock(
+            eq(protocolContext),
+            eq(block),
+            eq(HeaderValidationMode.LIGHT),
+            eq(HeaderValidationMode.FULL)))
+        .thenReturn(new BlockProcessingResult(Optional.empty()));
+    when(cmsValidator.validate(eq(cms), eq(hashWithoutCms))).thenReturn(true);
+
+    assertThat(payloadValidator.validate(proposal.getSignedPayload())).isTrue();
+  }
+
+  public static Block createPkiProposalBlock(
+      final List<Address> validators,
+      final ConsensusRoundIdentifier roundId,
+      final BftExtraDataCodec bftExtraDataCodec,
+      final Bytes cms) {
+    final Bytes extraData =
+        bftExtraDataCodec.encode(
+            new PkiQbftExtraData(
+                Bytes.wrap(new byte[32]),
+                Collections.emptyList(),
+                Optional.empty(),
+                roundId.getRoundNumber(),
+                validators,
+                cms));
+    final BlockOptions blockOptions =
+        BlockOptions.create()
+            .setExtraData(extraData)
+            .setBlockNumber(roundId.getSequenceNumber())
+            .setBlockHeaderFunctions(BftBlockHeaderFunctions.forCommittedSeal(bftExtraDataCodec))
+            .hasOmmers(false)
+            .hasTransactions(false);
+
+    if (validators.size() > 0) {
+      blockOptions.setCoinbase(validators.get(0));
+    }
+    return new BlockDataGenerator().block(blockOptions);
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/ProposalValidatorTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/ProposalValidatorTest.java
new file mode 100644
index 00000000000..2c0b40c9d44
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/ProposalValidatorTest.java
@@ -0,0 +1,559 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validation;
+
+import static java.util.Collections.emptyList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.consensus.common.bft.BftContextBuilder.setupContextWithBftExtraDataEncoder;
+import static org.hyperledger.besu.consensus.qbft.validation.ValidationTestHelpers.createEmptyRoundChangePayloads;
+import static org.hyperledger.besu.consensus.qbft.validation.ValidationTestHelpers.createPreparePayloads;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundHelpers;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.ProposedBlockHelpers;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.QbftContext;
+import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Prepare;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.Proposal;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.RoundChange;
+import org.hyperledger.besu.consensus.qbft.payload.PreparePayload;
+import org.hyperledger.besu.consensus.qbft.payload.PreparedRoundMetadata;
+import org.hyperledger.besu.consensus.qbft.payload.RoundChangePayload;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.BlockProcessingResult;
+import org.hyperledger.besu.ethereum.BlockValidator;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class ProposalValidatorTest {
+
+  private enum ROUND_ID {
+    ZERO,
+    ONE
+  }
+
+  private static class RoundSpecificItems {
+
+    public final Block block;
+    public final ConsensusRoundIdentifier roundIdentifier;
+    public final ProposalValidator messageValidator;
+
+    public RoundSpecificItems(
+        final Block block,
+        final ConsensusRoundIdentifier roundIdentifier,
+        final ProposalValidator messageValidator) {
+      this.block = block;
+      this.roundIdentifier = roundIdentifier;
+      this.messageValidator = messageValidator;
+    }
+  }
+
+  private static final int VALIDATOR_COUNT = 4;
+  private static final QbftNodeList validators = QbftNodeList.createNodes(VALIDATOR_COUNT);
+  @Mock private BlockValidator blockValidator;
+  @Mock private MutableBlockchain blockChain;
+  @Mock private WorldStateArchive worldStateArchive;
+  private ProtocolContext protocolContext;
+
+  private final Map<ROUND_ID, RoundSpecificItems> roundItems = new HashMap<>();
+  final QbftExtraDataCodec bftExtraDataEncoder = new QbftExtraDataCodec();
+
+  @BeforeEach
+  public void setup() {
+    protocolContext =
+        new ProtocolContext(
+            blockChain,
+            worldStateArchive,
+            setupContextWithBftExtraDataEncoder(
+                QbftContext.class, emptyList(), bftExtraDataEncoder),
+            Optional.empty());
+
+    // typically tests require the blockValidation to be successful
+    when(blockValidator.validateAndProcessBlock(
+            eq(protocolContext),
+            any(),
+            eq(HeaderValidationMode.LIGHT),
+            eq(HeaderValidationMode.FULL)))
+        .thenReturn(new BlockProcessingResult(Optional.empty()));
+
+    roundItems.put(ROUND_ID.ZERO, createRoundSpecificItems(0));
+    roundItems.put(ROUND_ID.ONE, createRoundSpecificItems(1));
+  }
+
+  private RoundSpecificItems createRoundSpecificItems(final int roundNumber) {
+    final ConsensusRoundIdentifier roundIdentifier = new ConsensusRoundIdentifier(1, roundNumber);
+
+    return new RoundSpecificItems(
+        ProposedBlockHelpers.createProposalBlock(
+            validators.getNodeAddresses(), roundIdentifier, bftExtraDataEncoder),
+        roundIdentifier,
+        new ProposalValidator(
+            blockValidator,
+            protocolContext,
+            BftHelpers.calculateRequiredValidatorQuorum(VALIDATOR_COUNT),
+            validators.getNodeAddresses(),
+            roundIdentifier,
+            validators.getNode(0).getAddress(),
+            bftExtraDataEncoder));
+  }
+
+  // NOTE: tests herein assume the ProposalPayloadValidator works as expected, so other than
+  // a bad-block test (to ensure invocation) - no tests exist which fail based on payload data.
+
+  private Proposal createProposal(
+      final RoundSpecificItems roundItem,
+      final List<SignedData<RoundChangePayload>> roundChanges,
+      final List<SignedData<PreparePayload>> prepares) {
+    return validators
+        .getMessageFactory(0)
+        .createProposal(roundItem.roundIdentifier, roundItem.block, roundChanges, prepares);
+  }
+
+  @Test
+  public void validationPassesForRoundZeroWithNoPiggybackedPayloads() {
+    final Proposal proposal =
+        createProposal(roundItems.get(ROUND_ID.ZERO), emptyList(), emptyList());
+    assertThat(roundItems.get(ROUND_ID.ZERO).messageValidator.validate(proposal)).isTrue();
+  }
+
+  @Test
+  public void validationFailsIfBlockIsInvalid() {
+    final RoundSpecificItems roundItem = roundItems.get(ROUND_ID.ZERO);
+    final Proposal proposal = createProposal(roundItem, emptyList(), emptyList());
+
+    reset(blockValidator);
+    when(blockValidator.validateAndProcessBlock(
+            eq(protocolContext),
+            any(),
+            eq(HeaderValidationMode.LIGHT),
+            eq(HeaderValidationMode.FULL)))
+        .thenReturn(new BlockProcessingResult("Failed"));
+
+    assertThat(roundItem.messageValidator.validate(proposal)).isFalse();
+  }
+
+  @Test
+  public void validationFailsIfRoundZeroHasNonEmptyPrepares() {
+    final Prepare prepareMsg =
+        validators
+            .getMessageFactory(1)
+            .createPrepare(
+                roundItems.get(ROUND_ID.ZERO).roundIdentifier,
+                roundItems.get(ROUND_ID.ZERO).block.getHash());
+
+    final Proposal proposal =
+        validators
+            .getMessageFactory(0)
+            .createProposal(
+                roundItems.get(ROUND_ID.ZERO).roundIdentifier,
+                roundItems.get(ROUND_ID.ZERO).block,
+                emptyList(),
+                List.of(prepareMsg.getSignedPayload()));
+
+    assertThat(roundItems.get(ROUND_ID.ZERO).messageValidator.validate(proposal)).isFalse();
+  }
+
+  @Test
+  public void validationFailsIfRoundZeroHasNonEmptyRoundChanges() {
+    final RoundChange roundChange =
+        validators
+            .getMessageFactory(1)
+            .createRoundChange(roundItems.get(ROUND_ID.ZERO).roundIdentifier, Optional.empty());
+
+    final Proposal proposal =
+        validators
+            .getMessageFactory(0)
+            .createProposal(
+                roundItems.get(ROUND_ID.ZERO).roundIdentifier,
+                roundItems.get(ROUND_ID.ZERO).block,
+                List.of(roundChange.getSignedPayload()),
+                emptyList());
+
+    assertThat(roundItems.get(ROUND_ID.ZERO).messageValidator.validate(proposal)).isFalse();
+  }
+
+  @Test
+  public void validationPassesAtNonRoundZeroIfSufficientEmptyRoundChangesMatchTargetRound() {
+    final RoundSpecificItems roundItem = roundItems.get(ROUND_ID.ONE);
+
+    final List<SignedData<RoundChangePayload>> roundChanges =
+        createEmptyRoundChangePayloads(
+            roundItem.roundIdentifier,
+            validators.getNode(0),
+            validators.getNode(1),
+            validators.getNode(2));
+
+    final Proposal proposal =
+        validators
+            .getMessageFactory(0)
+            .createProposal(roundItem.roundIdentifier, roundItem.block, roundChanges, emptyList());
+
+    assertThat(roundItem.messageValidator.validate(proposal)).isTrue();
+  }
+
+  @Test
+  public void validationFailsAtNonRoundZeroIfInsufficientRoundChangesExist() {
+    final RoundSpecificItems roundItem = roundItems.get(ROUND_ID.ONE);
+
+    final List<SignedData<RoundChangePayload>> roundChanges =
+        createEmptyRoundChangePayloads(
+            roundItem.roundIdentifier, validators.getNode(0), validators.getNode(1));
+
+    final Proposal proposal =
+        validators
+            .getMessageFactory(0)
+            .createProposal(roundItem.roundIdentifier, roundItem.block, roundChanges, emptyList());
+
+    assertThat(roundItem.messageValidator.validate(proposal)).isFalse();
+  }
+
+  // Piggybacked RoundChange tests
+  @Test
+  public void validationFailsIfPiggybackedRoundChangePayloadIsFromNonValidation() {
+    final RoundSpecificItems roundItem = roundItems.get(ROUND_ID.ONE);
+    final QbftNode nonValidatorNode = QbftNode.create();
+
+    final List<SignedData<RoundChangePayload>> roundChanges =
+        createEmptyRoundChangePayloads(
+            roundItem.roundIdentifier,
+            validators.getNode(0),
+            validators.getNode(1),
+            nonValidatorNode);
+
+    final Proposal proposal =
+        validators
+            .getMessageFactory(0)
+            .createProposal(roundItem.roundIdentifier, roundItem.block, roundChanges, emptyList());
+
+    assertThat(roundItem.messageValidator.validate(proposal)).isFalse();
+  }
+
+  @Test
+  public void validationFailsIfPiggybackedRoundChangePayloadHasDuplicatedAuthors() {
+    final RoundSpecificItems roundItem = roundItems.get(ROUND_ID.ONE);
+
+    final List<SignedData<RoundChangePayload>> roundChanges =
+        createEmptyRoundChangePayloads(
+            roundItem.roundIdentifier,
+            validators.getNode(0),
+            validators.getNode(1),
+            validators.getNode(1));
+
+    final Proposal proposal =
+        validators
+            .getMessageFactory(0)
+            .createProposal(roundItem.roundIdentifier, roundItem.block, roundChanges, emptyList());
+
+    assertThat(roundItem.messageValidator.validate(proposal)).isFalse();
+  }
+
+  @Test
+  public void validationFailsIfRoundChangePayloadsTargetADifferentRoundToProposal() {
+    final RoundSpecificItems roundItem = roundItems.get(ROUND_ID.ONE);
+
+    final List<SignedData<RoundChangePayload>> roundChanges =
+        createEmptyRoundChangePayloads(
+            ConsensusRoundHelpers.createFrom(roundItem.roundIdentifier, 0, +1),
+            validators.getNode(0),
+            validators.getNode(1),
+            validators.getNode(2));
+
+    final Proposal proposal =
+        validators
+            .getMessageFactory(0)
+            .createProposal(roundItem.roundIdentifier, roundItem.block, roundChanges, emptyList());
+
+    assertThat(roundItem.messageValidator.validate(proposal)).isFalse();
+  }
+
+  @Test
+  public void validationFailsIfRoundChangePayloadsTargetADifferentHeightToProposal() {
+    final RoundSpecificItems roundItem = roundItems.get(ROUND_ID.ONE);
+
+    final List<SignedData<RoundChangePayload>> roundChanges =
+        createEmptyRoundChangePayloads(
+            ConsensusRoundHelpers.createFrom(roundItem.roundIdentifier, +1, 0),
+            validators.getNode(0),
+            validators.getNode(1),
+            validators.getNode(2));
+
+    final Proposal proposal =
+        validators
+            .getMessageFactory(0)
+            .createProposal(roundItem.roundIdentifier, roundItem.block, roundChanges, emptyList());
+
+    assertThat(roundItem.messageValidator.validate(proposal)).isFalse();
+  }
+
+  @Test
+  public void validationFailsIfBlockHashInLatestPreparedMetadataDoesNotMatchProposedBlock() {
+    final RoundSpecificItems roundItem = roundItems.get(ROUND_ID.ONE);
+    final List<SignedData<RoundChangePayload>> roundChanges =
+        createEmptyRoundChangePayloads(
+            roundItem.roundIdentifier, validators.getNode(0), validators.getNode(1));
+
+    final RoundChangePayload illegalPayload =
+        new RoundChangePayload(
+            roundItem.roundIdentifier,
+            Optional.of(
+                new PreparedRoundMetadata(
+                    Hash.fromHexStringLenient("0x1"),
+                    roundItems.get(ROUND_ID.ZERO).roundIdentifier.getRoundNumber())));
+
+    final SignedData<RoundChangePayload> preparedRoundChange =
+        SignedData.create(
+            illegalPayload,
+            validators.getNode(2).getNodeKey().sign(illegalPayload.hashForSignature()));
+
+    roundChanges.add(preparedRoundChange);
+
+    final Proposal proposal =
+        validators
+            .getMessageFactory(0)
+            .createProposal(
+                roundItem.roundIdentifier,
+                roundItem.block,
+                roundChanges,
+                createPreparePayloads(
+                    roundItems.get(ROUND_ID.ZERO).roundIdentifier,
+                    Hash.fromHexStringLenient("0x1"),
+                    validators.getNode(0),
+                    validators.getNode(1),
+                    validators.getNode(2)));
+
+    assertThat(roundItem.messageValidator.validate(proposal)).isFalse();
+  }
+
+  // Piggybacked RoundChange tests
+  @Test
+  public void validationFailsIfPreparesAreNonEmptyButNoRoundChangeHasPreparedMetadata() {
+    final RoundSpecificItems roundItem = roundItems.get(ROUND_ID.ONE);
+    final List<SignedData<RoundChangePayload>> roundChanges =
+        createEmptyRoundChangePayloads(
+            roundItem.roundIdentifier,
+            validators.getNode(0),
+            validators.getNode(1),
+            validators.getNode(2));
+
+    final Proposal proposal =
+        validators
+            .getMessageFactory(0)
+            .createProposal(
+                roundItem.roundIdentifier,
+                roundItem.block,
+                roundChanges,
+                createPreparePayloads(
+                    roundItems.get(ROUND_ID.ZERO).roundIdentifier,
+                    Hash.fromHexStringLenient("0x1"),
+                    validators.getNode(0)));
+
+    assertThat(roundItem.messageValidator.validate(proposal)).isFalse();
+  }
+
+  @Test
+  public void validationFailsIfPiggybackedPreparePayloadIsFromNonValidator() {
+    final RoundSpecificItems roundItem = roundItems.get(ROUND_ID.ONE);
+    final List<SignedData<RoundChangePayload>> roundChanges = createPreparedRoundZeroRoundChanges();
+
+    final QbftNode nonValidator = QbftNode.create();
+    final Proposal proposal =
+        validators
+            .getMessageFactory(0)
+            .createProposal(
+                roundItem.roundIdentifier,
+                roundItem.block,
+                roundChanges,
+                createPreparePayloads(
+                    roundItems.get(ROUND_ID.ZERO).roundIdentifier,
+                    roundItems.get(ROUND_ID.ZERO).block.getHash(),
+                    validators.getNode(0),
+                    validators.getNode(1),
+                    nonValidator));
+
+    assertThat(roundItem.messageValidator.validate(proposal)).isFalse();
+  }
+
+  @Test
+  public void validationFailsIfPiggybackedPreparePayloadHasDuplicatedAuthors() {
+    final RoundSpecificItems roundItem = roundItems.get(ROUND_ID.ONE);
+    final List<SignedData<RoundChangePayload>> roundChanges = createPreparedRoundZeroRoundChanges();
+
+    final Proposal proposal =
+        validators
+            .getMessageFactory(0)
+            .createProposal(
+                roundItem.roundIdentifier,
+                roundItem.block,
+                roundChanges,
+                createPreparePayloads(
+                    roundItems.get(ROUND_ID.ZERO).roundIdentifier,
+                    roundItems.get(ROUND_ID.ZERO).block.getHash(),
+                    validators.getNode(0),
+                    validators.getNode(1),
+                    validators.getNode(1)));
+
+    assertThat(roundItem.messageValidator.validate(proposal)).isFalse();
+  }
+
+  @Test
+  public void validationFailsIfInsufficientPiggybackedPreparePayloads() {
+    final RoundSpecificItems roundItem = roundItems.get(ROUND_ID.ONE);
+    final List<SignedData<RoundChangePayload>> roundChanges = createPreparedRoundZeroRoundChanges();
+
+    final Proposal proposal =
+        validators
+            .getMessageFactory(0)
+            .createProposal(
+                roundItem.roundIdentifier,
+                roundItem.block,
+                roundChanges,
+                createPreparePayloads(
+                    roundItems.get(ROUND_ID.ZERO).roundIdentifier,
+                    roundItems.get(ROUND_ID.ZERO).block.getHash(),
+                    validators.getNode(0),
+                    validators.getNode(1)));
+
+    assertThat(roundItem.messageValidator.validate(proposal)).isFalse();
+  }
+
+  @Test
+  public void validationFailsIfPreparePayloadsDoNotMatchMetadataInRoundChanges() {
+    final RoundSpecificItems roundItem = roundItems.get(ROUND_ID.ONE);
+    final List<SignedData<RoundChangePayload>> roundChanges = createPreparedRoundZeroRoundChanges();
+
+    final Proposal proposal =
+        validators
+            .getMessageFactory(0)
+            .createProposal(
+                roundItem.roundIdentifier,
+                roundItem.block,
+                roundChanges,
+                createPreparePayloads(
+                    roundItems.get(ROUND_ID.ONE).roundIdentifier,
+                    roundItems.get(ROUND_ID.ZERO).block.getHash(),
+                    validators.getNode(0),
+                    validators.getNode(1),
+                    validators.getNode(2)));
+
+    assertThat(roundItem.messageValidator.validate(proposal)).isFalse();
+  }
+
+  @Test
+  public void validationFailsIfPreparePayloadsDoNotMatchBlockHashInRoundChanges() {
+    final RoundSpecificItems roundItem = roundItems.get(ROUND_ID.ONE);
+    final List<SignedData<RoundChangePayload>> roundChanges = createPreparedRoundZeroRoundChanges();
+
+    final Proposal proposal =
+        validators
+            .getMessageFactory(0)
+            .createProposal(
+                roundItem.roundIdentifier,
+                roundItem.block,
+                roundChanges,
+                createPreparePayloads(
+                    roundItems.get(ROUND_ID.ZERO).roundIdentifier,
+                    Hash.fromHexStringLenient("0x1"),
+                    validators.getNode(0),
+                    validators.getNode(1),
+                    validators.getNode(2)));
+
+    assertThat(roundItem.messageValidator.validate(proposal)).isFalse();
+  }
+
+  @Test
+  public void validationFailsIfTwoRoundChangesArePreparedOnSameRoundDifferentBlock() {
+    final RoundSpecificItems roundItem = roundItems.get(ROUND_ID.ONE);
+    final List<SignedData<RoundChangePayload>> roundChanges = createPreparedRoundZeroRoundChanges();
+
+    final RoundChangePayload illegalPreparedRoundChangePayload =
+        new RoundChangePayload(
+            roundItem.roundIdentifier,
+            Optional.of(
+                new PreparedRoundMetadata(
+                    roundItems.get(ROUND_ID.ONE).block.getHash(),
+                    roundItems.get(ROUND_ID.ZERO).roundIdentifier.getRoundNumber())));
+
+    final SignedData<RoundChangePayload> preparedRoundChange =
+        SignedData.create(
+            illegalPreparedRoundChangePayload,
+            validators
+                .getNode(3)
+                .getNodeKey()
+                .sign(illegalPreparedRoundChangePayload.hashForSignature()));
+
+    roundChanges.add(preparedRoundChange);
+
+    final Proposal proposal =
+        validators
+            .getMessageFactory(0)
+            .createProposal(
+                roundItem.roundIdentifier,
+                roundItem.block,
+                roundChanges,
+                createPreparePayloads(
+                    roundItems.get(ROUND_ID.ZERO).roundIdentifier,
+                    Hash.fromHexStringLenient("0x1"),
+                    validators.getNode(0),
+                    validators.getNode(1),
+                    validators.getNode(2)));
+
+    assertThat(roundItem.messageValidator.validate(proposal)).isFalse();
+  }
+
+  private List<SignedData<RoundChangePayload>> createPreparedRoundZeroRoundChanges() {
+    final RoundSpecificItems roundItem = roundItems.get(ROUND_ID.ONE);
+    final List<SignedData<RoundChangePayload>> roundChanges =
+        createEmptyRoundChangePayloads(
+            roundItem.roundIdentifier, validators.getNode(0), validators.getNode(1));
+
+    final RoundChangePayload preparedRoundChangePayload =
+        new RoundChangePayload(
+            roundItem.roundIdentifier,
+            Optional.of(
+                new PreparedRoundMetadata(
+                    roundItems.get(ROUND_ID.ZERO).block.getHash(),
+                    roundItems.get(ROUND_ID.ZERO).roundIdentifier.getRoundNumber())));
+
+    final SignedData<RoundChangePayload> preparedRoundChange =
+        SignedData.create(
+            preparedRoundChangePayload,
+            validators.getNode(2).getNodeKey().sign(preparedRoundChangePayload.hashForSignature()));
+
+    roundChanges.add(preparedRoundChange);
+
+    return roundChanges;
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/QbftNode.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/QbftNode.java
new file mode 100644
index 00000000000..d66952b6960
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/QbftNode.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validation;
+
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.core.Util;
+
+public class QbftNode {
+
+  final NodeKey nodeKey;
+  final MessageFactory messageFactory;
+
+  private QbftNode(final NodeKey nodeKey, final MessageFactory messageFactory) {
+    this.nodeKey = nodeKey;
+    this.messageFactory = messageFactory;
+  }
+
+  public Address getAddress() {
+    return Util.publicKeyToAddress(nodeKey.getPublicKey());
+  }
+
+  public MessageFactory getMessageFactory() {
+    return messageFactory;
+  }
+
+  public NodeKey getNodeKey() {
+    return nodeKey;
+  }
+
+  public static QbftNode create() {
+    final NodeKey nodeKey = NodeKeyUtils.generate();
+    final MessageFactory factory = new MessageFactory(nodeKey);
+
+    return new QbftNode(nodeKey, factory);
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/QbftNodeList.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/QbftNodeList.java
new file mode 100644
index 00000000000..2f1ac09af12
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/QbftNodeList.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validation;
+
+import org.hyperledger.besu.consensus.qbft.payload.MessageFactory;
+import org.hyperledger.besu.datatypes.Address;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.google.common.collect.Lists;
+
+public class QbftNodeList {
+
+  public static QbftNodeList createNodes(final int count) {
+    final List<QbftNode> nodes = Lists.newArrayList();
+
+    for (int i = 0; i < count; i++) {
+      nodes.add(QbftNode.create());
+    }
+    return new QbftNodeList(nodes);
+  }
+
+  private final List<QbftNode> nodes;
+
+  public QbftNodeList(final List<QbftNode> nodes) {
+    this.nodes = nodes;
+  }
+
+  public List<Address> getNodeAddresses() {
+    return nodes.stream().map(QbftNode::getAddress).collect(Collectors.toList());
+  }
+
+  public MessageFactory getMessageFactory(final int index) {
+    return nodes.get(index).getMessageFactory();
+  }
+
+  public Collection<QbftNode> getNodes() {
+    return nodes;
+  }
+
+  public QbftNode getNode(final int index) {
+    return nodes.get(index);
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/RoundChangeMessageValidatorTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/RoundChangeMessageValidatorTest.java
new file mode 100644
index 00000000000..a604acc9026
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/RoundChangeMessageValidatorTest.java
@@ -0,0 +1,467 @@
+/*
+ * Copyright 2022 Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validation;
+
+import static com.google.common.collect.Iterables.toArray;
+import static java.util.Collections.emptyList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.consensus.common.bft.BftContextBuilder.setupContextWithBftExtraDataEncoder;
+import static org.hyperledger.besu.consensus.qbft.validation.ValidationTestHelpers.createPreparePayloads;
+import static org.hyperledger.besu.consensus.qbft.validation.ValidationTestHelpers.createPreparedCertificate;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.common.bft.BftHelpers;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundHelpers;
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.ProposedBlockHelpers;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.QbftContext;
+import org.hyperledger.besu.consensus.qbft.QbftExtraDataCodec;
+import org.hyperledger.besu.consensus.qbft.messagewrappers.RoundChange;
+import org.hyperledger.besu.consensus.qbft.payload.PreparedRoundMetadata;
+import org.hyperledger.besu.consensus.qbft.payload.RoundChangePayload;
+import org.hyperledger.besu.consensus.qbft.statemachine.PreparedCertificate;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.BlockProcessingResult;
+import org.hyperledger.besu.ethereum.BlockValidator;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+
+import java.util.Collections;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class RoundChangeMessageValidatorTest {
+
+  @Mock private RoundChangePayloadValidator payloadValidator;
+  @Mock private BlockValidator blockValidator;
+  @Mock private MutableBlockchain blockChain;
+  @Mock private WorldStateArchive worldStateArchive;
+  private ProtocolContext protocolContext;
+
+  private RoundChangeMessageValidator messageValidator;
+  private static final int VALIDATOR_COUNT = 4;
+  private final QbftNodeList validators = QbftNodeList.createNodes(VALIDATOR_COUNT);
+  private static final int CHAIN_HEIGHT = 3;
+  private final ConsensusRoundIdentifier targetRound =
+      new ConsensusRoundIdentifier(CHAIN_HEIGHT, 3);
+  private final ConsensusRoundIdentifier roundIdentifier =
+      ConsensusRoundHelpers.createFrom(targetRound, 0, -1);
+  private final QbftExtraDataCodec bftExtraDataEncoder = new QbftExtraDataCodec();
+
+  @BeforeEach
+  public void setup() {
+    protocolContext =
+        new ProtocolContext(
+            blockChain,
+            worldStateArchive,
+            setupContextWithBftExtraDataEncoder(
+                QbftContext.class, emptyList(), bftExtraDataEncoder),
+            Optional.empty());
+  }
+
+  @Test
+  public void roundChangeWithNoPiggyBackedDataIsValid() {
+    when(payloadValidator.validate(any())).thenReturn(true);
+    messageValidator =
+        new RoundChangeMessageValidator(
+            payloadValidator,
+            BftHelpers.calculateRequiredValidatorQuorum(VALIDATOR_COUNT),
+            CHAIN_HEIGHT,
+            validators.getNodeAddresses(),
+            blockValidator,
+            protocolContext);
+
+    for (int i = 0; i < VALIDATOR_COUNT; i++) {
+      final RoundChange message =
+          validators.getMessageFactory(i).createRoundChange(targetRound, Optional.empty());
+      assertThat(messageValidator.validate(message)).isTrue();
+    }
+  }
+
+  @Test
+  public void roundChangeWithValidPiggyBackDataIsValid() {
+    when(blockValidator.validateAndProcessBlock(
+            any(), any(), eq(HeaderValidationMode.LIGHT), eq(HeaderValidationMode.FULL)))
+        .thenReturn(new BlockProcessingResult(Optional.empty()));
+    when(payloadValidator.validate(any())).thenReturn(true);
+    messageValidator =
+        new RoundChangeMessageValidator(
+            payloadValidator,
+            BftHelpers.calculateRequiredValidatorQuorum(VALIDATOR_COUNT),
+            CHAIN_HEIGHT,
+            validators.getNodeAddresses(),
+            blockValidator,
+            protocolContext);
+
+    final Block block =
+        ProposedBlockHelpers.createProposalBlock(
+            Collections.emptyList(), roundIdentifier, bftExtraDataEncoder);
+    final PreparedCertificate prepCert =
+        createPreparedCertificate(
+            block, roundIdentifier, toArray(validators.getNodes(), QbftNode.class));
+
+    final RoundChange message =
+        validators.getMessageFactory(0).createRoundChange(targetRound, Optional.of(prepCert));
+    assertThat(messageValidator.validate(message)).isTrue();
+  }
+
+  @Test
+  public void roundChangeWithBlockRoundMismatchingPreparesIsValid() {
+    when(blockValidator.validateAndProcessBlock(
+            any(), any(), eq(HeaderValidationMode.LIGHT), eq(HeaderValidationMode.FULL)))
+        .thenReturn(new BlockProcessingResult(Optional.empty()));
+    when(payloadValidator.validate(any())).thenReturn(true);
+    messageValidator =
+        new RoundChangeMessageValidator(
+            payloadValidator,
+            BftHelpers.calculateRequiredValidatorQuorum(VALIDATOR_COUNT),
+            CHAIN_HEIGHT,
+            validators.getNodeAddresses(),
+            blockValidator,
+            protocolContext);
+
+    final Block block =
+        ProposedBlockHelpers.createProposalBlock(
+            Collections.emptyList(), roundIdentifier, bftExtraDataEncoder);
+    final PreparedCertificate prepCert =
+        createPreparedCertificate(
+            block,
+            ConsensusRoundHelpers.createFrom(roundIdentifier, 0, +1),
+            toArray(validators.getNodes(), QbftNode.class));
+
+    final RoundChange message =
+        validators.getMessageFactory(0).createRoundChange(targetRound, Optional.of(prepCert));
+    assertThat(messageValidator.validate(message)).isTrue();
+  }
+
+  @Test
+  public void blockIsInvalidFailsValidation() {
+    when(blockValidator.validateAndProcessBlock(
+            any(), any(), eq(HeaderValidationMode.LIGHT), eq(HeaderValidationMode.FULL)))
+        .thenReturn(new BlockProcessingResult("Failed"));
+    when(payloadValidator.validate(any())).thenReturn(true);
+    messageValidator =
+        new RoundChangeMessageValidator(
+            payloadValidator,
+            BftHelpers.calculateRequiredValidatorQuorum(VALIDATOR_COUNT),
+            CHAIN_HEIGHT,
+            validators.getNodeAddresses(),
+            blockValidator,
+            protocolContext);
+
+    final Block block =
+        ProposedBlockHelpers.createProposalBlock(Collections.emptyList(), roundIdentifier);
+    final PreparedCertificate prepCert =
+        createPreparedCertificate(
+            block, roundIdentifier, toArray(validators.getNodes(), QbftNode.class));
+
+    final RoundChange message =
+        validators.getMessageFactory(0).createRoundChange(targetRound, Optional.of(prepCert));
+    assertThat(messageValidator.validate(message)).isFalse();
+  }
+
+  @Test
+  public void invalidEmbeddedPayloadFailsValidation() {
+    when(payloadValidator.validate(any())).thenReturn(false);
+    messageValidator =
+        new RoundChangeMessageValidator(
+            payloadValidator,
+            BftHelpers.calculateRequiredValidatorQuorum(VALIDATOR_COUNT),
+            CHAIN_HEIGHT,
+            validators.getNodeAddresses(),
+            blockValidator,
+            protocolContext);
+
+    final RoundChange message =
+        validators.getMessageFactory(0).createRoundChange(targetRound, Optional.empty());
+    assertThat(messageValidator.validate(message)).isFalse();
+  }
+
+  @Test
+  public void insufficientPiggyBackedPrepareMessagesIsInvalid() {
+    when(blockValidator.validateAndProcessBlock(
+            any(), any(), eq(HeaderValidationMode.LIGHT), eq(HeaderValidationMode.FULL)))
+        .thenReturn(new BlockProcessingResult(Optional.empty()));
+    when(payloadValidator.validate(any())).thenReturn(true);
+    messageValidator =
+        new RoundChangeMessageValidator(
+            payloadValidator,
+            BftHelpers.calculateRequiredValidatorQuorum(VALIDATOR_COUNT),
+            CHAIN_HEIGHT,
+            validators.getNodeAddresses(),
+            blockValidator,
+            protocolContext);
+
+    final Block block =
+        ProposedBlockHelpers.createProposalBlock(
+            Collections.emptyList(), roundIdentifier, bftExtraDataEncoder);
+    final PreparedCertificate prepCert =
+        createPreparedCertificate(
+            block, roundIdentifier, validators.getNode(0), validators.getNode(1));
+
+    final RoundChange message =
+        validators.getMessageFactory(0).createRoundChange(targetRound, Optional.of(prepCert));
+    assertThat(messageValidator.validate(message)).isFalse();
+  }
+
+  @Test
+  public void prepareFromNonValidatorFails() {
+    when(blockValidator.validateAndProcessBlock(
+            any(), any(), eq(HeaderValidationMode.LIGHT), eq(HeaderValidationMode.FULL)))
+        .thenReturn(new BlockProcessingResult(Optional.empty()));
+    when(payloadValidator.validate(any())).thenReturn(true);
+    messageValidator =
+        new RoundChangeMessageValidator(
+            payloadValidator,
+            BftHelpers.calculateRequiredValidatorQuorum(VALIDATOR_COUNT),
+            CHAIN_HEIGHT,
+            validators.getNodeAddresses(),
+            blockValidator,
+            protocolContext);
+
+    final QbftNode nonValidator = QbftNode.create();
+
+    final Block block =
+        ProposedBlockHelpers.createProposalBlock(
+            Collections.emptyList(), roundIdentifier, bftExtraDataEncoder);
+    final PreparedCertificate prepCert =
+        createPreparedCertificate(
+            block, roundIdentifier, validators.getNode(0), validators.getNode(1), nonValidator);
+
+    final RoundChange message =
+        validators.getMessageFactory(0).createRoundChange(targetRound, Optional.of(prepCert));
+    assertThat(messageValidator.validate(message)).isFalse();
+  }
+
+  @Test
+  public void validationFailsIfPreparedMetadataContainsDifferentRoundToBlock() {
+    when(blockValidator.validateAndProcessBlock(
+            any(), any(), eq(HeaderValidationMode.LIGHT), eq(HeaderValidationMode.FULL)))
+        .thenReturn(new BlockProcessingResult(Optional.empty()));
+    when(payloadValidator.validate(any())).thenReturn(true);
+    messageValidator =
+        new RoundChangeMessageValidator(
+            payloadValidator,
+            BftHelpers.calculateRequiredValidatorQuorum(VALIDATOR_COUNT),
+            CHAIN_HEIGHT,
+            validators.getNodeAddresses(),
+            blockValidator,
+            protocolContext);
+
+    final Block block =
+        ProposedBlockHelpers.createProposalBlock(
+            Collections.emptyList(), roundIdentifier, bftExtraDataEncoder);
+    final PreparedCertificate prepCert =
+        new PreparedCertificate(
+            block,
+            validators.getNodes().stream()
+                .map(
+                    n ->
+                        n.getMessageFactory()
+                            .createPrepare(roundIdentifier, block.getHash())
+                            .getSignedPayload())
+                .collect(Collectors.toList()),
+            roundIdentifier.getRoundNumber() - 1);
+
+    final RoundChange message =
+        validators.getMessageFactory(0).createRoundChange(targetRound, Optional.of(prepCert));
+    assertThat(messageValidator.validate(message)).isFalse();
+  }
+
+  @Test
+  public void validationFailsIfPreparesContainsDifferentRoundToBlock() {
+    when(blockValidator.validateAndProcessBlock(
+            any(), any(), eq(HeaderValidationMode.LIGHT), eq(HeaderValidationMode.FULL)))
+        .thenReturn(new BlockProcessingResult(Optional.empty()));
+    when(payloadValidator.validate(any())).thenReturn(true);
+    messageValidator =
+        new RoundChangeMessageValidator(
+            payloadValidator,
+            BftHelpers.calculateRequiredValidatorQuorum(VALIDATOR_COUNT),
+            CHAIN_HEIGHT,
+            validators.getNodeAddresses(),
+            blockValidator,
+            protocolContext);
+
+    final Block block =
+        ProposedBlockHelpers.createProposalBlock(
+            Collections.emptyList(), roundIdentifier, bftExtraDataEncoder);
+    final PreparedCertificate prepCert =
+        new PreparedCertificate(
+            block,
+            validators.getNodes().stream()
+                .map(
+                    n ->
+                        n.getMessageFactory()
+                            .createPrepare(
+                                ConsensusRoundHelpers.createFrom(roundIdentifier, 0, -1),
+                                block.getHash())
+                            .getSignedPayload())
+                .collect(Collectors.toList()),
+            roundIdentifier.getRoundNumber());
+
+    final RoundChange message =
+        validators.getMessageFactory(0).createRoundChange(targetRound, Optional.of(prepCert));
+    assertThat(messageValidator.validate(message)).isFalse();
+  }
+
+  @Test
+  public void validationFailsIfPreparesContainsWrongHeight() {
+    when(blockValidator.validateAndProcessBlock(
+            any(), any(), eq(HeaderValidationMode.LIGHT), eq(HeaderValidationMode.FULL)))
+        .thenReturn(new BlockProcessingResult(Optional.empty()));
+    when(payloadValidator.validate(any())).thenReturn(true);
+    messageValidator =
+        new RoundChangeMessageValidator(
+            payloadValidator,
+            BftHelpers.calculateRequiredValidatorQuorum(VALIDATOR_COUNT),
+            CHAIN_HEIGHT,
+            validators.getNodeAddresses(),
+            blockValidator,
+            protocolContext);
+
+    final Block block =
+        ProposedBlockHelpers.createProposalBlock(
+            Collections.emptyList(), roundIdentifier, bftExtraDataEncoder);
+    final PreparedCertificate prepCert =
+        new PreparedCertificate(
+            block,
+            validators.getNodes().stream()
+                .map(
+                    n ->
+                        n.getMessageFactory()
+                            .createPrepare(
+                                ConsensusRoundHelpers.createFrom(roundIdentifier, +1, 0),
+                                block.getHash())
+                            .getSignedPayload())
+                .collect(Collectors.toList()),
+            roundIdentifier.getRoundNumber());
+
+    final RoundChange message =
+        validators.getMessageFactory(0).createRoundChange(targetRound, Optional.of(prepCert));
+    assertThat(messageValidator.validate(message)).isFalse();
+  }
+
+  @Test
+  public void validationFailsIfPreparesHaveDuplicateAuthors() {
+    when(blockValidator.validateAndProcessBlock(
+            any(), any(), eq(HeaderValidationMode.LIGHT), eq(HeaderValidationMode.FULL)))
+        .thenReturn(new BlockProcessingResult(Optional.empty()));
+    when(payloadValidator.validate(any())).thenReturn(true);
+    messageValidator =
+        new RoundChangeMessageValidator(
+            payloadValidator,
+            BftHelpers.calculateRequiredValidatorQuorum(VALIDATOR_COUNT),
+            CHAIN_HEIGHT,
+            validators.getNodeAddresses(),
+            blockValidator,
+            protocolContext);
+
+    final Block block =
+        ProposedBlockHelpers.createProposalBlock(
+            Collections.emptyList(), roundIdentifier, bftExtraDataEncoder);
+    final PreparedCertificate prepCert =
+        createPreparedCertificate(
+            block,
+            roundIdentifier,
+            validators.getNode(0),
+            validators.getNode(1),
+            validators.getNode(1));
+
+    final RoundChange message =
+        validators.getMessageFactory(0).createRoundChange(targetRound, Optional.of(prepCert));
+
+    assertThat(messageValidator.validate(message)).isFalse();
+  }
+
+  @Test
+  public void validationFailsIfBlockExistsButNotPreparedMetadata() {
+    when(blockValidator.validateAndProcessBlock(
+            any(), any(), eq(HeaderValidationMode.LIGHT), eq(HeaderValidationMode.FULL)))
+        .thenReturn(new BlockProcessingResult(Optional.empty()));
+    when(payloadValidator.validate(any())).thenReturn(true);
+    messageValidator =
+        new RoundChangeMessageValidator(
+            payloadValidator,
+            BftHelpers.calculateRequiredValidatorQuorum(VALIDATOR_COUNT),
+            CHAIN_HEIGHT,
+            validators.getNodeAddresses(),
+            blockValidator,
+            protocolContext);
+
+    final Block block =
+        ProposedBlockHelpers.createProposalBlock(Collections.emptyList(), roundIdentifier);
+
+    final RoundChangePayload payload = new RoundChangePayload(targetRound, Optional.empty());
+    final SECPSignature signature =
+        validators.getNode(0).getNodeKey().sign(payload.hashForSignature());
+
+    final RoundChange message =
+        new RoundChange(SignedData.create(payload, signature), Optional.of(block), emptyList());
+
+    assertThat(messageValidator.validate(message)).isFalse();
+  }
+
+  @Test
+  public void validationFailsIfBlockHashDoesNotMatchPreparedMetadata() {
+    when(blockValidator.validateAndProcessBlock(
+            any(), any(), eq(HeaderValidationMode.LIGHT), eq(HeaderValidationMode.FULL)))
+        .thenReturn(new BlockProcessingResult(Optional.empty()));
+    when(payloadValidator.validate(any())).thenReturn(true);
+    messageValidator =
+        new RoundChangeMessageValidator(
+            payloadValidator,
+            BftHelpers.calculateRequiredValidatorQuorum(VALIDATOR_COUNT),
+            CHAIN_HEIGHT,
+            validators.getNodeAddresses(),
+            blockValidator,
+            protocolContext);
+
+    final Block block =
+        ProposedBlockHelpers.createProposalBlock(Collections.emptyList(), roundIdentifier);
+
+    final RoundChangePayload payload =
+        new RoundChangePayload(
+            targetRound,
+            Optional.of(
+                new PreparedRoundMetadata(
+                    Hash.fromHexStringLenient("0x1"), roundIdentifier.getRoundNumber())));
+    final SECPSignature signature =
+        validators.getNode(0).getNodeKey().sign(payload.hashForSignature());
+
+    final RoundChange message =
+        new RoundChange(
+            SignedData.create(payload, signature),
+            Optional.of(block),
+            createPreparePayloads(
+                roundIdentifier, block.getHash(), toArray(validators.getNodes(), QbftNode.class)));
+
+    assertThat(messageValidator.validate(message)).isFalse();
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/RoundChangePayloadValidatorTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/RoundChangePayloadValidatorTest.java
new file mode 100644
index 00000000000..f4a91024b4a
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/RoundChangePayloadValidatorTest.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validation;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.payload.PreparedRoundMetadata;
+import org.hyperledger.besu.consensus.qbft.payload.RoundChangePayload;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Hash;
+
+import java.util.Optional;
+
+import org.junit.jupiter.api.Test;
+
+public class RoundChangePayloadValidatorTest {
+
+  private static final int VALIDATOR_COUNT = 4;
+
+  private final QbftNodeList validators = QbftNodeList.createNodes(VALIDATOR_COUNT);
+  private final long chainHeight = 5L;
+  private final Hash preparedBlockHash = Hash.fromHexStringLenient("0x1");
+  final RoundChangePayloadValidator messageValidator =
+      new RoundChangePayloadValidator(validators.getNodeAddresses(), chainHeight);
+
+  @Test
+  public void roundChangeIsValidIfItMatchesExpectedValues() {
+    final RoundChangePayload payload =
+        new RoundChangePayload(
+            new ConsensusRoundIdentifier(chainHeight, 1),
+            Optional.of(new PreparedRoundMetadata(preparedBlockHash, 0)));
+
+    for (int i = 0; i < VALIDATOR_COUNT; i++) {
+      final SignedData<RoundChangePayload> signedPayload =
+          createSignedPayload(payload, validators.getNode(i).getNodeKey());
+      assertThat(messageValidator.validate(signedPayload)).isTrue();
+    }
+  }
+
+  @Test
+  public void roundChangePayloadWithMissingPreparedMetadataIsValid() {
+    final RoundChangePayload payload =
+        new RoundChangePayload(new ConsensusRoundIdentifier(chainHeight, 1), Optional.empty());
+
+    for (int i = 0; i < VALIDATOR_COUNT; i++) {
+      final SignedData<RoundChangePayload> signedPayload =
+          createSignedPayload(payload, validators.getNode(i).getNodeKey());
+      assertThat(messageValidator.validate(signedPayload)).isTrue();
+    }
+  }
+
+  @Test
+  public void roundChangePayloadSignedByNonValidatorFails() {
+    final RoundChangePayload payload =
+        new RoundChangePayload(
+            new ConsensusRoundIdentifier(chainHeight, 1),
+            Optional.of(new PreparedRoundMetadata(preparedBlockHash, 0)));
+
+    final NodeKey nonValidatorKey = NodeKeyUtils.generate();
+    final SignedData<RoundChangePayload> signedPayload =
+        createSignedPayload(payload, nonValidatorKey);
+    assertThat(messageValidator.validate(signedPayload)).isFalse();
+  }
+
+  @Test
+  public void roundChangeForFutureHeightFails() {
+    final RoundChangePayload payload =
+        new RoundChangePayload(
+            new ConsensusRoundIdentifier(chainHeight + 1, 1),
+            Optional.of(new PreparedRoundMetadata(preparedBlockHash, 0)));
+
+    final SignedData<RoundChangePayload> signedPayload =
+        createSignedPayload(payload, validators.getNode(0).getNodeKey());
+    assertThat(messageValidator.validate(signedPayload)).isFalse();
+  }
+
+  @Test
+  public void roundChangeForPriorHeightFails() {
+    final RoundChangePayload payload =
+        new RoundChangePayload(
+            new ConsensusRoundIdentifier(chainHeight - 1, 1),
+            Optional.of(new PreparedRoundMetadata(preparedBlockHash, 0)));
+
+    final SignedData<RoundChangePayload> signedPayload =
+        createSignedPayload(payload, validators.getNode(0).getNodeKey());
+    assertThat(messageValidator.validate(signedPayload)).isFalse();
+  }
+
+  @Test
+  public void roundChangeWithMatchingTargetAndPrepareFails() {
+    final RoundChangePayload payload =
+        new RoundChangePayload(
+            new ConsensusRoundIdentifier(chainHeight, 1),
+            Optional.of(new PreparedRoundMetadata(preparedBlockHash, 1)));
+
+    final SignedData<RoundChangePayload> signedPayload =
+        createSignedPayload(payload, validators.getNode(0).getNodeKey());
+    assertThat(messageValidator.validate(signedPayload)).isFalse();
+  }
+
+  @Test
+  public void roundChangeWithPreparedRoundInTheFutureFails() {
+    final RoundChangePayload payload =
+        new RoundChangePayload(
+            new ConsensusRoundIdentifier(chainHeight, 1),
+            Optional.of(new PreparedRoundMetadata(preparedBlockHash, 2)));
+
+    final SignedData<RoundChangePayload> signedPayload =
+        createSignedPayload(payload, validators.getNode(0).getNodeKey());
+    assertThat(messageValidator.validate(signedPayload)).isFalse();
+  }
+
+  @Test
+  public void roundChangeWithZeroTargetRoundFails() {
+    final RoundChangePayload payload =
+        new RoundChangePayload(
+            new ConsensusRoundIdentifier(chainHeight, 0),
+            Optional.of(new PreparedRoundMetadata(preparedBlockHash, 0)));
+
+    final SignedData<RoundChangePayload> signedPayload =
+        createSignedPayload(payload, validators.getNode(0).getNodeKey());
+    assertThat(messageValidator.validate(signedPayload)).isFalse();
+  }
+
+  private SignedData<RoundChangePayload> createSignedPayload(
+      final RoundChangePayload payload, final NodeKey nodeKey) {
+    final SECPSignature signature = nodeKey.sign(payload.hashForSignature());
+    return SignedData.create(payload, signature);
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/ValidationTestHelpers.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/ValidationTestHelpers.java
new file mode 100644
index 00000000000..63a6e4e8e2d
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validation/ValidationTestHelpers.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validation;
+
+import org.hyperledger.besu.consensus.common.bft.ConsensusRoundIdentifier;
+import org.hyperledger.besu.consensus.common.bft.payload.SignedData;
+import org.hyperledger.besu.consensus.qbft.payload.PreparePayload;
+import org.hyperledger.besu.consensus.qbft.payload.RoundChangePayload;
+import org.hyperledger.besu.consensus.qbft.statemachine.PreparedCertificate;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Block;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class ValidationTestHelpers {
+
+  public static PreparedCertificate createPreparedCertificate(
+      final Block block,
+      final ConsensusRoundIdentifier reportedRound,
+      final QbftNode... preparedNodes) {
+
+    return new PreparedCertificate(
+        block,
+        createPreparePayloads(reportedRound, block.getHash(), preparedNodes),
+        reportedRound.getRoundNumber());
+  }
+
+  public static List<SignedData<PreparePayload>> createPreparePayloads(
+      final ConsensusRoundIdentifier reportedRound,
+      final Hash blockHash,
+      final QbftNode... preparedNodes) {
+    return Stream.of(preparedNodes)
+        .map(p -> p.getMessageFactory().createPrepare(reportedRound, blockHash).getSignedPayload())
+        .collect(Collectors.toList());
+  }
+
+  public static List<SignedData<RoundChangePayload>> createEmptyRoundChangePayloads(
+      final ConsensusRoundIdentifier targetRound, final QbftNode... roundChangingNodes) {
+    return Stream.of(roundChangingNodes)
+        .map(
+            r ->
+                r.getMessageFactory()
+                    .createRoundChange(targetRound, Optional.empty())
+                    .getSignedPayload())
+        .collect(Collectors.toList());
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validator/ForkingValidatorProviderTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validator/ForkingValidatorProviderTest.java
new file mode 100644
index 00000000000..023e195e350
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validator/ForkingValidatorProviderTest.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.qbft.validator;
+
+import static java.util.Collections.emptyList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.consensus.qbft.validator.ValidatorTestUtils.createBlockForkSpec;
+import static org.hyperledger.besu.consensus.qbft.validator.ValidatorTestUtils.createContractForkSpec;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.QbftConfigOptions;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.validator.VoteProvider;
+import org.hyperledger.besu.consensus.common.validator.blockbased.BlockValidatorProvider;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.AddressHelpers;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.assertj.core.api.SoftAssertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class ForkingValidatorProviderTest {
+
+  private static final Address CONTRACT_ADDRESS_1 = Address.fromHexString("0x888");
+  private static final Address CONTRACT_ADDRESS_2 = Address.fromHexString("0x999");
+  private static final List<Address> BLOCK_ADDRESSES =
+      List.of(Address.fromHexString("1"), Address.fromHexString("2"));
+  private static final List<Address> CONTRACT_ADDRESSES_1 =
+      List.of(Address.fromHexString("3"), Address.fromHexString("4"));
+  private static final List<Address> CONTRACT_ADDRESSES_2 =
+      List.of(Address.fromHexString("5"), Address.fromHexString("6"), Address.fromHexString("7"));
+
+  @Mock private BlockValidatorProvider blockValidatorProvider;
+  @Mock private TransactionValidatorProvider contractValidatorProvider;
+
+  private MutableBlockchain blockChain;
+  private BlockHeader genesisHeader;
+  private BlockHeader header1;
+  private BlockHeader header2;
+  private final BlockHeaderTestFixture headerBuilder = new BlockHeaderTestFixture();
+
+  @BeforeEach
+  public void setup() {
+    headerBuilder.extraData(Bytes.wrap(new byte[32]));
+    Block genesisBlock = createEmptyBlock(0, Hash.ZERO);
+    Block block_1 = createEmptyBlock(1, genesisBlock.getHeader().getHash());
+    Block block_2 = createEmptyBlock(2, block_1.getHeader().getHash());
+    genesisHeader = genesisBlock.getHeader();
+    header1 = block_1.getHeader();
+    header2 = block_2.getHeader();
+
+    blockChain = createInMemoryBlockchain(genesisBlock);
+    blockChain.appendBlock(block_1, emptyList());
+    blockChain.appendBlock(block_2, emptyList());
+  }
+
+  private Block createEmptyBlock(final long blockNumber, final Hash parentHash) {
+    headerBuilder.number(blockNumber).parentHash(parentHash).coinbase(AddressHelpers.ofValue(0));
+    return new Block(headerBuilder.buildHeader(), new BlockBody(emptyList(), emptyList()));
+  }
+
+  @Test
+  public void usesInitialValidatorProviderWhenNoForks() {
+    final ForksSchedule<QbftConfigOptions> forksSchedule =
+        new ForksSchedule<>(List.of(createBlockForkSpec(0)));
+
+    final ForkingValidatorProvider validatorProvider =
+        new ForkingValidatorProvider(
+            blockChain, forksSchedule, blockValidatorProvider, contractValidatorProvider);
+
+    when(blockValidatorProvider.getValidatorsAfterBlock(header2)).thenReturn(BLOCK_ADDRESSES);
+    when(blockValidatorProvider.getValidatorsAfterBlock(header1)).thenReturn(BLOCK_ADDRESSES);
+    when(blockValidatorProvider.getValidatorsForBlock(any())).thenReturn(BLOCK_ADDRESSES);
+
+    assertThat(validatorProvider.getValidatorsAtHead()).isEqualTo(BLOCK_ADDRESSES);
+    assertThat(validatorProvider.getValidatorsForBlock(header1)).isEqualTo(BLOCK_ADDRESSES);
+    assertThat(validatorProvider.getValidatorsAfterBlock(header1)).isEqualTo(BLOCK_ADDRESSES);
+  }
+
+  @Test
+  public void migratesFromBlockToContractValidatorProvider() {
+    when(blockValidatorProvider.getValidatorsForBlock(any())).thenReturn(BLOCK_ADDRESSES);
+    when(contractValidatorProvider.getValidatorsForBlock(header1)).thenReturn(CONTRACT_ADDRESSES_1);
+
+    final ForksSchedule<QbftConfigOptions> forksSchedule =
+        new ForksSchedule<>(
+            List.of(createBlockForkSpec(0), createContractForkSpec(1L, CONTRACT_ADDRESS_1)));
+    final ForkingValidatorProvider validatorProvider =
+        new ForkingValidatorProvider(
+            blockChain, forksSchedule, blockValidatorProvider, contractValidatorProvider);
+
+    assertThat(validatorProvider.getValidatorsForBlock(genesisHeader)).isEqualTo(BLOCK_ADDRESSES);
+    assertThat(validatorProvider.getValidatorsForBlock(header1)).isEqualTo(CONTRACT_ADDRESSES_1);
+  }
+
+  @Test
+  public void migratesFromContractToBlockValidatorProvider() {
+    when(blockValidatorProvider.getValidatorsForBlock(any())).thenReturn(BLOCK_ADDRESSES);
+
+    final ForksSchedule<QbftConfigOptions> forksSchedule =
+        new ForksSchedule<>(
+            List.of(createContractForkSpec(0, CONTRACT_ADDRESS_1), createBlockForkSpec(1)));
+    final ForkingValidatorProvider validatorProvider =
+        new ForkingValidatorProvider(
+            blockChain, forksSchedule, blockValidatorProvider, contractValidatorProvider);
+
+    when(contractValidatorProvider.getValidatorsForBlock(genesisHeader))
+        .thenReturn(CONTRACT_ADDRESSES_1);
+
+    assertThat(validatorProvider.getValidatorsForBlock(genesisHeader))
+        .isEqualTo(CONTRACT_ADDRESSES_1);
+    assertThat(validatorProvider.getValidatorsForBlock(header1)).isEqualTo(BLOCK_ADDRESSES);
+    assertThat(validatorProvider.getValidatorsForBlock(header2)).isEqualTo(BLOCK_ADDRESSES);
+  }
+
+  @Test
+  public void migratesFromContractToContractValidatorProvider() {
+    when(blockValidatorProvider.getValidatorsForBlock(any())).thenReturn(BLOCK_ADDRESSES);
+    when(contractValidatorProvider.getValidatorsForBlock(header1)).thenReturn(CONTRACT_ADDRESSES_1);
+    when(contractValidatorProvider.getValidatorsForBlock(header2)).thenReturn(CONTRACT_ADDRESSES_2);
+
+    final ForksSchedule<QbftConfigOptions> forksSchedule =
+        new ForksSchedule<>(
+            List.of(
+                createBlockForkSpec(0),
+                createContractForkSpec(1L, CONTRACT_ADDRESS_1),
+                createContractForkSpec(2L, CONTRACT_ADDRESS_2)));
+
+    final ForkingValidatorProvider validatorProvider =
+        new ForkingValidatorProvider(
+            blockChain, forksSchedule, blockValidatorProvider, contractValidatorProvider);
+
+    assertThat(validatorProvider.getValidatorsForBlock(genesisHeader)).isEqualTo(BLOCK_ADDRESSES);
+    assertThat(validatorProvider.getValidatorsForBlock(header1)).isEqualTo(CONTRACT_ADDRESSES_1);
+    assertThat(validatorProvider.getValidatorsForBlock(header2)).isEqualTo(CONTRACT_ADDRESSES_2);
+  }
+
+  @Test
+  public void voteProviderIsDelegatesToHeadFork_whenHeadIsContractFork() {
+    final ForksSchedule<QbftConfigOptions> forksSchedule =
+        new ForksSchedule<>(
+            List.of(
+                createBlockForkSpec(0),
+                createBlockForkSpec(1),
+                createContractForkSpec(2, CONTRACT_ADDRESS_1)));
+
+    final ForkingValidatorProvider validatorProvider =
+        new ForkingValidatorProvider(
+            blockChain, forksSchedule, blockValidatorProvider, contractValidatorProvider);
+
+    validatorProvider.getVoteProviderAtHead();
+
+    verify(contractValidatorProvider).getVoteProviderAtHead();
+    verifyNoInteractions(blockValidatorProvider);
+  }
+
+  @Test
+  public void voteProviderIsDelegatesToHeadFork_whenHeadIsBlockFork() {
+    final ForksSchedule<QbftConfigOptions> forksSchedule =
+        new ForksSchedule<>(List.of(createBlockForkSpec(0)));
+
+    final ForkingValidatorProvider validatorProvider =
+        new ForkingValidatorProvider(
+            blockChain, forksSchedule, blockValidatorProvider, contractValidatorProvider);
+
+    validatorProvider.getVoteProviderAtHead();
+
+    verify(blockValidatorProvider).getVoteProviderAtHead();
+    verifyNoInteractions(contractValidatorProvider);
+  }
+
+  @Test
+  public void getVoteProviderAfterBlock_correctVoteProviderIsResolved() {
+    final ForksSchedule<QbftConfigOptions> forksSchedule =
+        new ForksSchedule<>(
+            List.of(
+                createBlockForkSpec(0),
+                createBlockForkSpec(1),
+                createContractForkSpec(2, CONTRACT_ADDRESS_1)));
+    final ForkingValidatorProvider validatorProvider =
+        new ForkingValidatorProvider(
+            blockChain, forksSchedule, blockValidatorProvider, contractValidatorProvider);
+
+    final VoteProvider voteProviderForBlockValidator = Mockito.mock(VoteProvider.class);
+    when(blockValidatorProvider.getVoteProviderAtHead())
+        .thenReturn(Optional.of(voteProviderForBlockValidator));
+    when(contractValidatorProvider.getVoteProviderAtHead()).thenReturn(Optional.empty());
+
+    SoftAssertions.assertSoftly(
+        (softly) -> {
+          softly
+              .assertThat(validatorProvider.getVoteProviderAfterBlock(genesisHeader))
+              .contains(voteProviderForBlockValidator);
+          softly.assertThat(validatorProvider.getVoteProviderAfterBlock(header1)).isEmpty();
+          softly.assertThat(validatorProvider.getVoteProviderAfterBlock(header2)).isEmpty();
+        });
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validator/QbftForksSchedulesFactoryTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validator/QbftForksSchedulesFactoryTest.java
new file mode 100644
index 00000000000..abb75426d0a
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validator/QbftForksSchedulesFactoryTest.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validator;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+
+import org.hyperledger.besu.config.BftFork;
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.config.JsonQbftConfigOptions;
+import org.hyperledger.besu.config.JsonUtil;
+import org.hyperledger.besu.config.QbftConfigOptions;
+import org.hyperledger.besu.config.QbftFork;
+import org.hyperledger.besu.config.QbftFork.VALIDATOR_SELECTION_MODE;
+import org.hyperledger.besu.config.StubGenesisConfigOptions;
+import org.hyperledger.besu.config.TransitionsConfigOptions;
+import org.hyperledger.besu.consensus.common.ForkSpec;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.common.bft.BaseForksSchedulesFactoryTest;
+import org.hyperledger.besu.consensus.qbft.MutableQbftConfigOptions;
+import org.hyperledger.besu.consensus.qbft.QbftForksSchedulesFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.core.AddressHelpers;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.TextNode;
+import org.junit.jupiter.api.Test;
+
+public class QbftForksSchedulesFactoryTest
+    extends BaseForksSchedulesFactoryTest<QbftConfigOptions, MutableQbftConfigOptions> {
+
+  @Test
+  public void createsScheduleWithForkThatOverridesGenesisValues() {
+    final MutableQbftConfigOptions configOptions =
+        new MutableQbftConfigOptions(JsonQbftConfigOptions.DEFAULT);
+
+    final ObjectNode fork =
+        JsonUtil.objectNodeFromMap(
+            Map.of(
+                BftFork.FORK_BLOCK_KEY,
+                1,
+                BftFork.VALIDATORS_KEY,
+                List.of("1", "2", "3"),
+                BftFork.BLOCK_PERIOD_SECONDS_KEY,
+                10,
+                BftFork.BLOCK_REWARD_KEY,
+                "5",
+                QbftFork.VALIDATOR_SELECTION_MODE_KEY,
+                VALIDATOR_SELECTION_MODE.CONTRACT,
+                QbftFork.VALIDATOR_CONTRACT_ADDRESS_KEY,
+                "10"));
+
+    final ForksSchedule<QbftConfigOptions> forksSchedule =
+        QbftForksSchedulesFactory.create(createGenesisConfig(configOptions, fork));
+    assertThat(forksSchedule.getFork(0))
+        .usingRecursiveComparison()
+        .isEqualTo(new ForkSpec<>(0, configOptions));
+
+    final Map<String, Object> forkOptions = new HashMap<>(configOptions.asMap());
+    forkOptions.put(BftFork.BLOCK_PERIOD_SECONDS_KEY, 10);
+    forkOptions.put(BftFork.BLOCK_REWARD_KEY, "5");
+    forkOptions.put(QbftFork.VALIDATOR_SELECTION_MODE_KEY, "5");
+    forkOptions.put(QbftFork.VALIDATOR_CONTRACT_ADDRESS_KEY, "10");
+    final QbftConfigOptions expectedForkConfig =
+        new MutableQbftConfigOptions(
+            new JsonQbftConfigOptions(JsonUtil.objectNodeFromMap(forkOptions)));
+
+    final ForkSpec<QbftConfigOptions> expectedFork = new ForkSpec<>(1, expectedForkConfig);
+    assertThat(forksSchedule.getFork(1)).usingRecursiveComparison().isEqualTo(expectedFork);
+    assertThat(forksSchedule.getFork(2)).usingRecursiveComparison().isEqualTo(expectedFork);
+  }
+
+  @Test
+  public void creatingScheduleThrowsErrorForContractForkWithoutContractAddress() {
+    final MutableQbftConfigOptions configOptions =
+        new MutableQbftConfigOptions(JsonQbftConfigOptions.DEFAULT);
+
+    final ObjectNode fork =
+        JsonUtil.objectNodeFromMap(
+            Map.of(
+                BftFork.FORK_BLOCK_KEY,
+                1,
+                QbftFork.VALIDATOR_SELECTION_MODE_KEY,
+                VALIDATOR_SELECTION_MODE.CONTRACT));
+    createGenesisConfig(configOptions, fork);
+
+    assertThatThrownBy(
+            () -> QbftForksSchedulesFactory.create(createGenesisConfig(configOptions, fork)))
+        .hasMessage("QBFT transition has config with contract mode but no contract address");
+  }
+
+  @Test
+  public void switchingToBlockHeaderRemovesValidatorContractAddress() {
+    final MutableQbftConfigOptions configOptions =
+        new MutableQbftConfigOptions(JsonQbftConfigOptions.DEFAULT);
+    configOptions.setValidatorContractAddress(Optional.of("10"));
+    List<Address> validators = List.of(AddressHelpers.ofValue(1));
+    final List<TextNode> jsonValidators =
+        validators.stream()
+            .map(v -> TextNode.valueOf(v.toHexString()))
+            .collect(Collectors.toList());
+
+    final ObjectNode fork =
+        JsonUtil.objectNodeFromMap(
+            Map.of(
+                BftFork.FORK_BLOCK_KEY,
+                1,
+                QbftFork.VALIDATOR_SELECTION_MODE_KEY,
+                VALIDATOR_SELECTION_MODE.BLOCKHEADER,
+                BftFork.VALIDATORS_KEY,
+                JsonUtil.getObjectMapper().createArrayNode().addAll(jsonValidators)));
+
+    final ForksSchedule<QbftConfigOptions> forksSchedule =
+        QbftForksSchedulesFactory.create(createGenesisConfig(configOptions, fork));
+
+    assertThat(forksSchedule.getFork(1).getValue().getValidatorContractAddress()).isEmpty();
+  }
+
+  @Test
+  public void switchingToBlockHeaderRequiresValidators() {
+    final MutableQbftConfigOptions configOptions =
+        new MutableQbftConfigOptions(JsonQbftConfigOptions.DEFAULT);
+    configOptions.setValidatorContractAddress(Optional.of("10"));
+
+    final ObjectNode fork =
+        JsonUtil.objectNodeFromMap(
+            Map.of(
+                BftFork.FORK_BLOCK_KEY,
+                1,
+                QbftFork.VALIDATOR_SELECTION_MODE_KEY,
+                VALIDATOR_SELECTION_MODE.BLOCKHEADER));
+
+    assertThatThrownBy(
+            () -> QbftForksSchedulesFactory.create(createGenesisConfig(configOptions, fork)))
+        .hasMessage(
+            "QBFT transition to blockheader mode requires a validators list containing at least one validator");
+  }
+
+  @Test
+  public void switchingToBlockHeaderRequiresNonEmptyValidators() {
+    final MutableQbftConfigOptions configOptions =
+        new MutableQbftConfigOptions(JsonQbftConfigOptions.DEFAULT);
+    configOptions.setValidatorContractAddress(Optional.of("10"));
+
+    final ObjectNode fork =
+        JsonUtil.objectNodeFromMap(
+            Map.of(
+                BftFork.FORK_BLOCK_KEY,
+                1,
+                QbftFork.VALIDATOR_SELECTION_MODE_KEY,
+                VALIDATOR_SELECTION_MODE.BLOCKHEADER,
+                BftFork.VALIDATORS_KEY,
+                JsonUtil.getObjectMapper().createArrayNode()));
+
+    assertThatThrownBy(
+            () -> QbftForksSchedulesFactory.create(createGenesisConfig(configOptions, fork)))
+        .hasMessage(
+            "QBFT transition to blockheader mode requires a validators list containing at least one validator");
+  }
+
+  @Override
+  protected GenesisConfigOptions createGenesisConfig(
+      final QbftConfigOptions configOptions, final ObjectNode... forks) {
+    final StubGenesisConfigOptions genesisConfigOptions = new StubGenesisConfigOptions();
+    genesisConfigOptions.qbftConfigOptions(configOptions);
+    genesisConfigOptions.transitions(
+        new TransitionsConfigOptions(
+            JsonUtil.objectNodeFromMap(Map.of("qbft", Arrays.asList(forks)))));
+    return genesisConfigOptions;
+  }
+
+  @Override
+  protected ForksSchedule<QbftConfigOptions> createForkSchedule(
+      final GenesisConfigOptions genesisConfigOptions) {
+    return QbftForksSchedulesFactory.create(genesisConfigOptions);
+  }
+
+  @Override
+  protected QbftConfigOptions createBftOptions(
+      final Consumer<MutableQbftConfigOptions> optionModifier) {
+    final MutableQbftConfigOptions options =
+        new MutableQbftConfigOptions(JsonQbftConfigOptions.DEFAULT);
+    optionModifier.accept(options);
+    return options;
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validator/TransactionValidatorProviderTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validator/TransactionValidatorProviderTest.java
new file mode 100644
index 00000000000..516566417f6
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validator/TransactionValidatorProviderTest.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validator;
+
+import static java.util.Collections.emptyList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.consensus.qbft.validator.ValidatorTestUtils.createContractForkSpec;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.QbftConfigOptions;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.AddressHelpers;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.google.common.collect.Lists;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class TransactionValidatorProviderTest {
+  @Mock private ValidatorContractController validatorContractController;
+
+  protected MutableBlockchain blockChain;
+  protected Block genesisBlock;
+  protected Block block_1;
+  protected Block block_2;
+  private Block block_3;
+  private ForksSchedule<QbftConfigOptions> forksSchedule;
+
+  private final BlockHeaderTestFixture headerBuilder = new BlockHeaderTestFixture();
+  private static final Address CONTRACT_ADDRESS = Address.fromHexString("1");
+
+  @BeforeEach
+  public void setup() {
+    forksSchedule = new ForksSchedule<>(List.of(createContractForkSpec(0L, CONTRACT_ADDRESS)));
+    genesisBlock = createEmptyBlock(0, Hash.ZERO);
+    blockChain = createInMemoryBlockchain(genesisBlock);
+    headerBuilder.extraData(Bytes.wrap(new byte[32]));
+
+    block_1 = createEmptyBlock(1, genesisBlock.getHeader().getHash());
+    block_2 = createEmptyBlock(2, block_1.getHeader().getHash());
+    block_3 = createEmptyBlock(3, block_2.getHeader().getHash());
+
+    blockChain.appendBlock(block_1, emptyList());
+    blockChain.appendBlock(block_2, emptyList());
+    blockChain.appendBlock(block_3, emptyList());
+  }
+
+  private Block createEmptyBlock(final long blockNumber, final Hash parentHash) {
+    headerBuilder.number(blockNumber).parentHash(parentHash).coinbase(AddressHelpers.ofValue(0));
+    return new Block(headerBuilder.buildHeader(), new BlockBody(emptyList(), emptyList()));
+  }
+
+  @Test
+  public void validatorsAfterBlockAreRetrievedUsingContractController() {
+    final List<Address> validatorsAt2 =
+        Lists.newArrayList(Address.fromHexString("5"), Address.fromHexString("6"));
+    final List<Address> validatorsAt3 =
+        Lists.newArrayList(
+            Address.fromHexString("5"), Address.fromHexString("6"), Address.fromHexString("7"));
+    when(validatorContractController.getValidators(2, CONTRACT_ADDRESS)).thenReturn(validatorsAt2);
+    when(validatorContractController.getValidators(3, CONTRACT_ADDRESS)).thenReturn(validatorsAt3);
+
+    final TransactionValidatorProvider validatorProvider =
+        new TransactionValidatorProvider(blockChain, validatorContractController, forksSchedule);
+
+    assertThat(validatorProvider.getValidatorsAfterBlock(block_2.getHeader()))
+        .containsExactlyElementsOf(validatorsAt2);
+    assertThat(validatorProvider.getValidatorsAfterBlock(block_3.getHeader()))
+        .containsExactlyElementsOf(validatorProvider.getValidatorsAfterBlock(block_3.getHeader()));
+  }
+
+  @Test
+  public void validatorsForBlockAreRetrievedUsingContractController() {
+    final List<Address> validatorsAt2 =
+        Lists.newArrayList(Address.fromHexString("5"), Address.fromHexString("6"));
+    final List<Address> validatorsAt3 =
+        Lists.newArrayList(
+            Address.fromHexString("5"), Address.fromHexString("6"), Address.fromHexString("7"));
+    when(validatorContractController.getValidators(2, CONTRACT_ADDRESS)).thenReturn(validatorsAt2);
+    when(validatorContractController.getValidators(3, CONTRACT_ADDRESS)).thenReturn(validatorsAt3);
+
+    final TransactionValidatorProvider validatorProvider =
+        new TransactionValidatorProvider(blockChain, validatorContractController, forksSchedule);
+
+    assertThat(validatorProvider.getValidatorsForBlock(block_2.getHeader()))
+        .containsExactlyElementsOf(validatorsAt2);
+    assertThat(validatorProvider.getValidatorsForBlock(block_3.getHeader()))
+        .containsExactlyElementsOf(validatorProvider.getValidatorsForBlock(block_3.getHeader()));
+  }
+
+  @Test
+  public void validatorsAtHeadAreRetrievedUsingContractController() {
+    final List<Address> validators =
+        Lists.newArrayList(Address.fromHexString("5"), Address.fromHexString("6"));
+    when(validatorContractController.getValidators(3, CONTRACT_ADDRESS)).thenReturn(validators);
+
+    final TransactionValidatorProvider validatorProvider =
+        new TransactionValidatorProvider(blockChain, validatorContractController, forksSchedule);
+
+    assertThat(validatorProvider.getValidatorsAtHead()).containsExactlyElementsOf(validators);
+  }
+
+  @Test
+  public void validatorsAtHeadContractCallIsCached() {
+    final List<Address> validators =
+        Lists.newArrayList(Address.fromHexString("5"), Address.fromHexString("6"));
+    when(validatorContractController.getValidators(3, CONTRACT_ADDRESS)).thenReturn(validators);
+
+    final TransactionValidatorProvider validatorProvider =
+        new TransactionValidatorProvider(blockChain, validatorContractController, forksSchedule);
+
+    assertThat(validatorProvider.getValidatorsAtHead()).containsExactlyElementsOf(validators);
+    verify(validatorContractController).getValidators(3, CONTRACT_ADDRESS);
+
+    assertThat(validatorProvider.getValidatorsAtHead()).containsExactlyElementsOf(validators);
+    verifyNoMoreInteractions(validatorContractController);
+  }
+
+  @Test
+  public void validatorsAfterBlockContractCallIsCached() {
+    final List<Address> validators =
+        Lists.newArrayList(Address.fromHexString("5"), Address.fromHexString("6"));
+    when(validatorContractController.getValidators(2, CONTRACT_ADDRESS)).thenReturn(validators);
+
+    final TransactionValidatorProvider validatorProvider =
+        new TransactionValidatorProvider(blockChain, validatorContractController, forksSchedule);
+
+    final Collection<Address> result =
+        validatorProvider.getValidatorsAfterBlock(block_2.getHeader());
+    assertThat(result).containsExactlyElementsOf(validators);
+    verify(validatorContractController).getValidators(2, CONTRACT_ADDRESS);
+
+    final Collection<Address> resultCached =
+        validatorProvider.getValidatorsAfterBlock(block_2.getHeader());
+    assertThat(resultCached).containsExactlyElementsOf(validators);
+    verifyNoMoreInteractions(validatorContractController);
+  }
+
+  @Test
+  public void getValidatorsAfterBlock_and_getValidatorsForBlock_useDifferentCaches() {
+    final List<Address> validators =
+        Lists.newArrayList(Address.fromHexString("5"), Address.fromHexString("6"));
+    when(validatorContractController.getValidators(2, CONTRACT_ADDRESS)).thenReturn(validators);
+
+    final TransactionValidatorProvider validatorProvider =
+        new TransactionValidatorProvider(blockChain, validatorContractController, forksSchedule);
+
+    validatorProvider.getValidatorsAfterBlock(block_2.getHeader()); // cache miss
+    verify(validatorContractController, times(1)).getValidators(2, CONTRACT_ADDRESS);
+
+    validatorProvider.getValidatorsAfterBlock(block_2.getHeader()); // cache hit
+    verifyNoMoreInteractions(validatorContractController);
+
+    validatorProvider.getValidatorsForBlock(block_2.getHeader()); // cache miss
+    verify(validatorContractController, times(2)).getValidators(2, CONTRACT_ADDRESS);
+
+    validatorProvider.getValidatorsAfterBlock(block_2.getHeader()); // cache hit
+    verifyNoMoreInteractions(validatorContractController);
+  }
+
+  @Test
+  public void validatorsMustBeSorted() {
+    final List<Address> validators =
+        Lists.newArrayList(
+            Address.fromHexString("9"), Address.fromHexString("8"), Address.fromHexString("7"));
+    when(validatorContractController.getValidators(3, CONTRACT_ADDRESS)).thenReturn(validators);
+
+    final TransactionValidatorProvider validatorProvider =
+        new TransactionValidatorProvider(blockChain, validatorContractController, forksSchedule);
+
+    final Collection<Address> result = validatorProvider.getValidatorsAtHead();
+    final List<Address> expectedValidators =
+        validators.stream().sorted().collect(Collectors.toList());
+    assertThat(result).containsExactlyElementsOf(expectedValidators);
+  }
+
+  @Test
+  public void voteProviderIsEmpty() {
+    TransactionValidatorProvider transactionValidatorProvider =
+        new TransactionValidatorProvider(blockChain, validatorContractController, forksSchedule);
+
+    assertThat(transactionValidatorProvider.getVoteProviderAtHead()).isEmpty();
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validator/ValidatorContractControllerTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validator/ValidatorContractControllerTest.java
new file mode 100644
index 00000000000..6f4adf3a286
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validator/ValidatorContractControllerTest.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validator;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.consensus.qbft.validator.ValidatorContractController.GET_VALIDATORS;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.JsonQbftConfigOptions;
+import org.hyperledger.besu.consensus.qbft.MutableQbftConfigOptions;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.mainnet.ImmutableTransactionValidationParams;
+import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
+import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.ethereum.transaction.CallParameter;
+import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
+import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
+import org.hyperledger.besu.ethereum.transaction.TransactionSimulatorResult;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+import org.web3j.abi.FunctionEncoder;
+import org.web3j.abi.TypeReference;
+import org.web3j.abi.datatypes.DynamicArray;
+import org.web3j.abi.datatypes.Function;
+
+public class ValidatorContractControllerTest {
+  private static final String GET_VALIDATORS_FUNCTION_RESULT =
+      "00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000eac51e3fe1afc9894f0dfeab8ceb471899b932df";
+  private static final Address VALIDATOR_ADDRESS =
+      Address.fromHexString("0xeac51e3fe1afc9894f0dfeab8ceb471899b932df");
+  private static final Address CONTRACT_ADDRESS = Address.fromHexString("1");
+  private static final TransactionValidationParams ALLOW_EXCEEDING_BALANCE_VALIDATION_PARAMS =
+      ImmutableTransactionValidationParams.builder()
+          .from(TransactionValidationParams.transactionSimulator())
+          .isAllowExceedingBalance(true)
+          .build();
+
+  private final TransactionSimulator transactionSimulator =
+      Mockito.mock(TransactionSimulator.class);
+
+  private final Transaction transaction = Mockito.mock(Transaction.class);
+  private CallParameter callParameter;
+
+  @BeforeEach
+  public void setup() {
+    final Function getValidatorsFunction =
+        new Function(
+            GET_VALIDATORS,
+            List.of(),
+            List.of(new TypeReference<DynamicArray<org.web3j.abi.datatypes.Address>>() {}));
+    final Bytes payload = Bytes.fromHexString(FunctionEncoder.encode(getValidatorsFunction));
+    callParameter = new CallParameter(null, CONTRACT_ADDRESS, -1, null, null, payload);
+    final MutableQbftConfigOptions qbftConfigOptions =
+        new MutableQbftConfigOptions(JsonQbftConfigOptions.DEFAULT);
+    qbftConfigOptions.setValidatorContractAddress(Optional.of(CONTRACT_ADDRESS.toHexString()));
+  }
+
+  @Test
+  public void decodesGetValidatorsResultFromContractCall() {
+    final TransactionSimulatorResult result =
+        new TransactionSimulatorResult(
+            transaction,
+            TransactionProcessingResult.successful(
+                List.of(),
+                0,
+                0,
+                Bytes.fromHexString(GET_VALIDATORS_FUNCTION_RESULT),
+                ValidationResult.valid()));
+
+    when(transactionSimulator.process(
+            callParameter,
+            ALLOW_EXCEEDING_BALANCE_VALIDATION_PARAMS,
+            OperationTracer.NO_TRACING,
+            1))
+        .thenReturn(Optional.of(result));
+
+    final ValidatorContractController validatorContractController =
+        new ValidatorContractController(transactionSimulator);
+    final Collection<Address> validators =
+        validatorContractController.getValidators(1, CONTRACT_ADDRESS);
+    assertThat(validators).containsExactly(VALIDATOR_ADDRESS);
+  }
+
+  @Test
+  public void throwErrorIfInvalidSimulationResult() {
+    final TransactionSimulatorResult result =
+        new TransactionSimulatorResult(
+            transaction,
+            TransactionProcessingResult.invalid(
+                ValidationResult.invalid(TransactionInvalidReason.INTERNAL_ERROR)));
+
+    when(transactionSimulator.process(
+            callParameter,
+            ALLOW_EXCEEDING_BALANCE_VALIDATION_PARAMS,
+            OperationTracer.NO_TRACING,
+            1))
+        .thenReturn(Optional.of(result));
+
+    final ValidatorContractController validatorContractController =
+        new ValidatorContractController(transactionSimulator);
+    Assertions.assertThatThrownBy(
+            () -> validatorContractController.getValidators(1, CONTRACT_ADDRESS))
+        .hasMessageContaining("Failed validator smart contract call");
+  }
+
+  @Test
+  public void throwErrorIfFailedSimulationResult() {
+    final TransactionSimulatorResult result =
+        new TransactionSimulatorResult(
+            transaction,
+            TransactionProcessingResult.failed(
+                0,
+                0,
+                ValidationResult.invalid(TransactionInvalidReason.INTERNAL_ERROR),
+                Optional.empty()));
+
+    when(transactionSimulator.process(
+            callParameter,
+            ALLOW_EXCEEDING_BALANCE_VALIDATION_PARAMS,
+            OperationTracer.NO_TRACING,
+            1))
+        .thenReturn(Optional.of(result));
+
+    final ValidatorContractController validatorContractController =
+        new ValidatorContractController(transactionSimulator);
+    Assertions.assertThatThrownBy(
+            () -> validatorContractController.getValidators(1, CONTRACT_ADDRESS))
+        .hasMessageContaining("Failed validator smart contract call");
+  }
+
+  @Test
+  public void throwErrorIfUnexpectedSuccessfulEmptySimulationResult() {
+    final TransactionSimulatorResult result =
+        new TransactionSimulatorResult(
+            transaction,
+            TransactionProcessingResult.successful(
+                List.of(), 0, 0, Bytes.EMPTY, ValidationResult.valid()));
+
+    when(transactionSimulator.process(
+            callParameter,
+            ALLOW_EXCEEDING_BALANCE_VALIDATION_PARAMS,
+            OperationTracer.NO_TRACING,
+            1))
+        .thenReturn(Optional.of(result));
+
+    final ValidatorContractController validatorContractController =
+        new ValidatorContractController(transactionSimulator);
+
+    Assertions.assertThatThrownBy(
+            () -> validatorContractController.getValidators(1, CONTRACT_ADDRESS))
+        .hasMessage("Unexpected empty result from validator smart contract call");
+  }
+
+  @Test
+  public void throwErrorIfEmptySimulationResult() {
+    when(transactionSimulator.process(
+            callParameter,
+            ALLOW_EXCEEDING_BALANCE_VALIDATION_PARAMS,
+            OperationTracer.NO_TRACING,
+            1))
+        .thenReturn(Optional.empty());
+
+    final ValidatorContractController validatorContractController =
+        new ValidatorContractController(transactionSimulator);
+    Assertions.assertThatThrownBy(
+            () -> validatorContractController.getValidators(1, CONTRACT_ADDRESS))
+        .hasMessage("Failed validator smart contract call");
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validator/ValidatorModeTransitionLoggerTest.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validator/ValidatorModeTransitionLoggerTest.java
new file mode 100644
index 00000000000..d6219c6e754
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validator/ValidatorModeTransitionLoggerTest.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.consensus.qbft.validator;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.BftConfigOptions;
+import org.hyperledger.besu.config.JsonQbftConfigOptions;
+import org.hyperledger.besu.config.QbftConfigOptions;
+import org.hyperledger.besu.consensus.common.ForkSpec;
+import org.hyperledger.besu.consensus.common.ForksSchedule;
+import org.hyperledger.besu.consensus.qbft.MutableQbftConfigOptions;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+
+import java.util.Optional;
+import java.util.function.Consumer;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class ValidatorModeTransitionLoggerTest {
+
+  @Mock private ForksSchedule<BftConfigOptions> forksSchedule;
+
+  @Mock private Consumer<String> msgConsumer;
+
+  @InjectMocks private ValidatorModeTransitionLogger qbftTransitionNotifier;
+
+  @Test
+  public void doNotLogMessageWhenTransitioningFromBlockHeaderToBlockHeader() {
+    final ForkSpec<BftConfigOptions> forkSpecA =
+        new ForkSpec<>(0, createQbftConfigOptionsForBlockHeader());
+    final ForkSpec<BftConfigOptions> forkSpecB =
+        new ForkSpec<>(1, createQbftConfigOptionsForBlockHeader());
+
+    when(forksSchedule.getFork(0)).thenReturn(forkSpecA);
+    when(forksSchedule.getFork(1)).thenReturn(forkSpecB);
+
+    qbftTransitionNotifier.logTransitionChange(blockHeader(0));
+
+    verifyNoInteractions(msgConsumer);
+  }
+
+  @Test
+  public void doNotLogMessageWhenTransitioningFromContractToContractWithSameAddress() {
+    final ForkSpec<BftConfigOptions> contractForkSpecA =
+        new ForkSpec<>(0, createQbftConfigOptionsForContract("0x0"));
+    final ForkSpec<BftConfigOptions> contractForkSpecB =
+        new ForkSpec<>(1, createQbftConfigOptionsForContract("0x0"));
+
+    when(forksSchedule.getFork(0)).thenReturn(contractForkSpecA);
+    when(forksSchedule.getFork(1)).thenReturn(contractForkSpecB);
+
+    qbftTransitionNotifier.logTransitionChange(blockHeader(0));
+
+    verifyNoInteractions(msgConsumer);
+  }
+
+  @Test
+  public void logMessageWhenTransitioningFromContractToContractWithDifferentAddress() {
+    final ForkSpec<BftConfigOptions> contractForkSpecA =
+        new ForkSpec<>(0, createQbftConfigOptionsForContract("0x0"));
+    final ForkSpec<BftConfigOptions> contractForkSpecB =
+        new ForkSpec<>(1, createQbftConfigOptionsForContract("0x1"));
+
+    when(forksSchedule.getFork(0)).thenReturn(contractForkSpecA);
+    when(forksSchedule.getFork(1)).thenReturn(contractForkSpecB);
+
+    qbftTransitionNotifier.logTransitionChange(blockHeader(0));
+
+    String expectedLog =
+        "Transitioning validator selection mode from contract (address: 0x0) to contract (address: 0x1)";
+    verify(msgConsumer).accept(eq(expectedLog));
+  }
+
+  @Test
+  public void logMessageWhenTransitioningFromContractToBlockHeader() {
+    final ForkSpec<BftConfigOptions> contractForkSpec =
+        new ForkSpec<>(0, createQbftConfigOptionsForContract("0x0"));
+    final ForkSpec<BftConfigOptions> blockForkSpec =
+        new ForkSpec<>(1, createQbftConfigOptionsForBlockHeader());
+
+    when(forksSchedule.getFork(0)).thenReturn(contractForkSpec);
+    when(forksSchedule.getFork(1)).thenReturn(blockForkSpec);
+
+    qbftTransitionNotifier.logTransitionChange(blockHeader(0));
+
+    String expectedLog =
+        "Transitioning validator selection mode from contract (address: 0x0) to blockheader";
+    verify(msgConsumer).accept(eq(expectedLog));
+  }
+
+  @Test
+  public void logMessageWhenTransitioningFromBlockHeaderToContract() {
+    final ForkSpec<BftConfigOptions> blockForkSpec =
+        new ForkSpec<>(0, createQbftConfigOptionsForBlockHeader());
+    final ForkSpec<BftConfigOptions> contractForkSpec =
+        new ForkSpec<>(1, createQbftConfigOptionsForContract("0x0"));
+
+    when(forksSchedule.getFork(0)).thenReturn(blockForkSpec);
+    when(forksSchedule.getFork(1)).thenReturn(contractForkSpec);
+
+    qbftTransitionNotifier.logTransitionChange(blockHeader(0));
+
+    String expectedLog =
+        "Transitioning validator selection mode from blockheader to contract (address: 0x0)";
+    verify(msgConsumer).accept(eq(expectedLog));
+  }
+
+  private QbftConfigOptions createQbftConfigOptionsForContract(final String address) {
+    final MutableQbftConfigOptions qbftConfigOptions =
+        new MutableQbftConfigOptions(JsonQbftConfigOptions.DEFAULT);
+    qbftConfigOptions.setValidatorContractAddress(Optional.of(address));
+    return qbftConfigOptions;
+  }
+
+  private QbftConfigOptions createQbftConfigOptionsForBlockHeader() {
+    return new MutableQbftConfigOptions(JsonQbftConfigOptions.DEFAULT);
+  }
+
+  private BlockHeader blockHeader(final long blockNumber) {
+    return new BlockHeaderTestFixture().number(blockNumber).buildHeader();
+  }
+}
diff --git a/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validator/ValidatorTestUtils.java b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validator/ValidatorTestUtils.java
new file mode 100644
index 00000000000..341f9a46c5c
--- /dev/null
+++ b/consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/validator/ValidatorTestUtils.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright Hyperledger Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.qbft.validator;
+
+import org.hyperledger.besu.config.JsonQbftConfigOptions;
+import org.hyperledger.besu.config.QbftConfigOptions;
+import org.hyperledger.besu.consensus.common.ForkSpec;
+import org.hyperledger.besu.consensus.qbft.MutableQbftConfigOptions;
+import org.hyperledger.besu.datatypes.Address;
+
+import java.util.Optional;
+
+class ValidatorTestUtils {
+
+  static ForkSpec<QbftConfigOptions> createContractForkSpec(
+      final long block, final Address contractAddress) {
+    final MutableQbftConfigOptions qbftConfigOptions =
+        new MutableQbftConfigOptions(JsonQbftConfigOptions.DEFAULT);
+    qbftConfigOptions.setValidatorContractAddress(Optional.of(contractAddress.toHexString()));
+    return new ForkSpec<>(block, qbftConfigOptions);
+  }
+
+  static ForkSpec<QbftConfigOptions> createBlockForkSpec(final long block) {
+    final MutableQbftConfigOptions qbftConfigOptions =
+        new MutableQbftConfigOptions(JsonQbftConfigOptions.DEFAULT);
+    return new ForkSpec<>(block, qbftConfigOptions);
+  }
+}
diff --git a/crypto/algorithms/build.gradle b/crypto/algorithms/build.gradle
new file mode 100644
index 00000000000..3421c990bf3
--- /dev/null
+++ b/crypto/algorithms/build.gradle
@@ -0,0 +1,48 @@
+/*
+ * Copyright Hyperledger Besu Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+apply plugin: 'java-library'
+
+jar {
+  archiveBaseName = 'besu-crypto'
+  manifest {
+    attributes(
+      'Specification-Title': archiveBaseName,
+      'Specification-Version': project.version,
+      'Implementation-Title': archiveBaseName,
+      'Implementation-Version': calculateVersion(),
+      'Automatic-Module-Name': 'org.hyperledger.besu.internal.crypto'
+      )
+  }
+}
+
+dependencies {
+  api 'org.bouncycastle:bcprov-jdk15on'
+  api 'org.slf4j:slf4j-api'
+
+  implementation 'net.java.dev.jna:jna'
+  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-units'
+  implementation 'org.hyperledger.besu:secp256k1'
+  implementation 'org.hyperledger.besu:secp256r1'
+  implementation 'org.hyperledger.besu:blake2bf'
+  implementation 'com.google.guava:guava'
+
+  testImplementation 'junit:junit'
+  testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
+
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
+}
diff --git a/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/AbstractSECP256.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/AbstractSECP256.java
new file mode 100644
index 00000000000..0ed5b5a5f34
--- /dev/null
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/AbstractSECP256.java
@@ -0,0 +1,405 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import java.math.BigInteger;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.KeyPairGenerator;
+import java.security.Security;
+import java.security.spec.ECGenParameterSpec;
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.function.UnaryOperator;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.bouncycastle.asn1.sec.SECNamedCurves;
+import org.bouncycastle.asn1.x9.X9ECParameters;
+import org.bouncycastle.asn1.x9.X9IntegerConverter;
+import org.bouncycastle.crypto.agreement.ECDHBasicAgreement;
+import org.bouncycastle.crypto.params.ECDomainParameters;
+import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
+import org.bouncycastle.crypto.params.ECPublicKeyParameters;
+import org.bouncycastle.crypto.signers.DSAKCalculator;
+import org.bouncycastle.crypto.signers.ECDSASigner;
+import org.bouncycastle.jcajce.provider.asymmetric.ec.KeyPairGeneratorSpi;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.math.ec.ECAlgorithms;
+import org.bouncycastle.math.ec.ECPoint;
+
+/** The Abstract secp256. */
+public abstract class AbstractSECP256 implements SignatureAlgorithm {
+
+  /** The constant PROVIDER. */
+  public static final String PROVIDER = "BC";
+
+  /** The Curve. */
+  protected final ECDomainParameters curve;
+  /** The Half curve order. */
+  protected final BigInteger halfCurveOrder;
+
+  /** The Key pair generator. */
+  protected final KeyPairGenerator keyPairGenerator;
+  /** The Curve order. */
+  protected final BigInteger curveOrder;
+
+  /** The Prime. */
+  final BigInteger prime;
+
+  /**
+   * Instantiates a new Abstract secp 256.
+   *
+   * @param curveName the curve name
+   * @param prime the prime
+   */
+  protected AbstractSECP256(final String curveName, final BigInteger prime) {
+    this.prime = prime;
+    Security.addProvider(new BouncyCastleProvider());
+
+    final X9ECParameters params = SECNamedCurves.getByName(curveName);
+    curve = new ECDomainParameters(params.getCurve(), params.getG(), params.getN(), params.getH());
+    curveOrder = curve.getN();
+    halfCurveOrder = curveOrder.shiftRight(1);
+    try {
+      keyPairGenerator = new KeyPairGeneratorSpi.ECDSA();
+    } catch (final Exception e) {
+      throw new RuntimeException(e);
+    }
+    final ECGenParameterSpec ecGenParameterSpec = new ECGenParameterSpec(curveName);
+    try {
+      keyPairGenerator.initialize(ecGenParameterSpec, SecureRandomProvider.createSecureRandom());
+    } catch (final InvalidAlgorithmParameterException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @Override
+  public SECPSignature normaliseSignature(
+      final BigInteger nativeR,
+      final BigInteger nativeS,
+      final SECPPublicKey publicKey,
+      final Bytes32 dataHash) {
+
+    BigInteger s = nativeS;
+    // Automatically adjust the S component to be less than or equal to half the curve
+    // order, if necessary. This is required because for every signature (r,s) the signature
+    // (r, -s (mod N)) is a valid signature of the same message. However, we dislike the
+    // ability to modify the bits of a Bitcoin transaction after it's been signed, as that
+    // violates various assumed invariants. Thus in future only one of those forms will be
+    // considered legal and the other will be banned.
+    if (s.compareTo(halfCurveOrder) > 0) {
+      // The order of the curve is the number of valid points that exist on that curve.
+      // If S is in the upper half of the number of valid points, then bring it back to
+      // the lower half. Otherwise, imagine that
+      // N = 10
+      // s = 8, so (-8 % 10 == 2) thus both (r, 8) and (r, 2) are valid solutions.
+      // 10 - 8 == 2, giving us always the latter solution, which is canonical.
+      s = curve.getN().subtract(s);
+    }
+
+    // Now we have to work backwards to figure out the recId needed to recover the signature.
+    int recId = -1;
+    final BigInteger publicKeyBI = publicKey.getEncodedBytes().toUnsignedBigInteger();
+    for (int i = 0; i < 4; i++) {
+      final BigInteger k = recoverFromSignature(i, nativeR, s, dataHash);
+      if (k != null && k.equals(publicKeyBI)) {
+        recId = i;
+        break;
+      }
+    }
+    if (recId == -1) {
+      throw new RuntimeException(
+          "Could not construct a recoverable key. This should never happen.");
+    }
+
+    return new SECPSignature(nativeR, s, (byte) recId);
+  }
+
+  /**
+   * Calculates an ECDH key agreement between the private and the public key.
+   *
+   * @param privKey The private key.
+   * @param theirPubKey The public key.
+   * @return The agreed secret.
+   */
+  @Override
+  public Bytes32 calculateECDHKeyAgreement(
+      final SECPPrivateKey privKey, final SECPPublicKey theirPubKey) {
+    checkArgument(privKey != null, "missing private key");
+    checkArgument(theirPubKey != null, "missing remote public key");
+
+    final ECPrivateKeyParameters privKeyP = new ECPrivateKeyParameters(privKey.getD(), curve);
+    final ECPublicKeyParameters pubKeyP =
+        new ECPublicKeyParameters(theirPubKey.asEcPoint(curve), curve);
+
+    final ECDHBasicAgreement agreement = new ECDHBasicAgreement();
+    agreement.init(privKeyP);
+    final BigInteger agreed = agreement.calculateAgreement(pubKeyP);
+
+    return UInt256.valueOf(agreed);
+  }
+
+  @Override
+  public SECPPrivateKey createPrivateKey(final BigInteger key) {
+    return SECPPrivateKey.create(key, ALGORITHM);
+  }
+
+  @Override
+  public SECPPrivateKey createPrivateKey(final Bytes32 key) {
+    return SECPPrivateKey.create(key, ALGORITHM);
+  }
+
+  @Override
+  public SECPPublicKey createPublicKey(final SECPPrivateKey privateKey) {
+    return SECPPublicKey.create(privateKey, curve, ALGORITHM);
+  }
+
+  @Override
+  public SECPPublicKey createPublicKey(final BigInteger key) {
+    return SECPPublicKey.create(key, ALGORITHM);
+  }
+
+  @Override
+  public SECPPublicKey createPublicKey(final Bytes encoded) {
+    return SECPPublicKey.create(encoded, ALGORITHM);
+  }
+
+  @Override
+  public ECPoint publicKeyAsEcPoint(final SECPPublicKey publicKey) {
+    return publicKey.asEcPoint(curve);
+  }
+
+  @Override
+  public boolean isValidPublicKey(final SECPPublicKey publicKey) {
+    try {
+      publicKeyAsEcPoint(publicKey);
+    } catch (IllegalArgumentException e) {
+      return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public KeyPair createKeyPair(final SECPPrivateKey privateKey) {
+    return KeyPair.create(privateKey, curve, ALGORITHM);
+  }
+
+  @Override
+  public KeyPair generateKeyPair() {
+    return KeyPair.generate(keyPairGenerator, ALGORITHM);
+  }
+
+  @Override
+  public SECPSignature createSignature(final BigInteger r, final BigInteger s, final byte recId) {
+    return SECPSignature.create(r, s, recId, curveOrder);
+  }
+
+  @Override
+  public SECPSignature decodeSignature(final Bytes bytes) {
+    return SECPSignature.decode(bytes, curveOrder);
+  }
+
+  @Override
+  public BigInteger getHalfCurveOrder() {
+    return halfCurveOrder;
+  }
+
+  @Override
+  public String getProvider() {
+    return PROVIDER;
+  }
+
+  /**
+   * Gets K calculator.
+   *
+   * @return the K Calculator
+   */
+  public abstract DSAKCalculator getKCalculator();
+
+  /**
+   * Decompress key ec point.
+   *
+   * @param xBN the x bn
+   * @param yBit the y bit
+   * @return the ec point
+   */
+  // Decompress a compressed public key (x co-ord and low-bit of y-coord).
+  protected ECPoint decompressKey(final BigInteger xBN, final boolean yBit) {
+    final X9IntegerConverter x9 = new X9IntegerConverter();
+    final byte[] compEnc = x9.integerToBytes(xBN, 1 + x9.getByteLength(curve.getCurve()));
+    compEnc[0] = (byte) (yBit ? 0x03 : 0x02);
+    // TODO: Find a better way to handle an invalid point compression here.
+    // Currently ECCurve#decodePoint throws an IllegalArgumentException.
+    return curve.getCurve().decodePoint(compEnc);
+  }
+
+  /**
+   * Given the components of a signature and a selector value, recover and return the public key
+   * that generated the signature according to the algorithm in SEC1v2 section 4.1.6.
+   *
+   * <p>If this method returns null it means recovery was not possible and recId should be iterated.
+   *
+   * <p>Given the above two points, a correct usage of this method is inside a for loop from 0 to 3,
+   * and if the output is null OR a key that is not the one you expect, you try again with the next
+   * recId.
+   *
+   * @param recId Which possible key to recover.
+   * @param r The R component of the signature.
+   * @param s The S component of the signature.
+   * @param dataHash Hash of the data that was signed.
+   * @return An ECKey containing only the public part, or null if recovery wasn't possible.
+   */
+  protected BigInteger recoverFromSignature(
+      final int recId, final BigInteger r, final BigInteger s, final Bytes32 dataHash) {
+    assert (recId >= 0);
+    assert (r.signum() >= 0);
+    assert (s.signum() >= 0);
+    assert (dataHash != null);
+
+    // 1.0 For j from 0 to h (h == recId here and the loop is outside this function)
+    // 1.1 Let x = r + jn
+    final BigInteger n = curve.getN(); // Curve order.
+    final BigInteger i = BigInteger.valueOf((long) recId / 2);
+    final BigInteger x = r.add(i.multiply(n));
+    // 1.2. Convert the integer x to an octet string X of length mlen using the conversion
+    // routine specified in Section 2.3.7, where mlen = ⌈(log2 p)/8⌉ or mlen = ⌈m/8⌉.
+    // 1.3. Convert the octet string (16 set binary digits)||X to an elliptic curve point R
+    // using the conversion routine specified in Section 2.3.4. If this conversion
+    // routine outputs "invalid", then do another iteration of Step 1.
+    //
+    // More concisely, what these points mean is to use X as a compressed public key.
+    if (x.compareTo(prime) >= 0) {
+      // Cannot have point co-ordinates larger than this as everything takes place modulo Q.
+      return null;
+    }
+    // Compressed keys require you to know an extra bit of data about the y-coord as there are
+    // two possibilities. So it's encoded in the recId.
+    final ECPoint R = decompressKey(x, (recId & 1) == 1);
+    // 1.4. If nR != point at infinity, then do another iteration of Step 1 (callers
+    // responsibility).
+    if (!R.multiply(n).isInfinity()) {
+      return null;
+    }
+    // 1.5. Compute e from M using Steps 2 and 3 of ECDSA signature verification.
+    final BigInteger e = dataHash.toUnsignedBigInteger();
+    // 1.6. For k from 1 to 2 do the following. (loop is outside this function via
+    // iterating recId)
+    // 1.6.1. Compute a candidate public key as:
+    // Q = mi(r) * (sR - eG)
+    //
+    // Where mi(x) is the modular multiplicative inverse. We transform this into the following:
+    // Q = (mi(r) * s ** R) + (mi(r) * -e ** G)
+    // Where -e is the modular additive inverse of e, that is z such that z + e = 0 (mod n).
+    // In the above equation ** is point multiplication and + is point addition (the EC group
+    // operator).
+    //
+    // We can find the additive inverse by subtracting e from zero then taking the mod. For
+    // example the additive inverse of 3 modulo 11 is 8 because 3 + 8 mod 11 = 0, and
+    // -3 mod 11 = 8.
+    final BigInteger eInv = BigInteger.ZERO.subtract(e).mod(n);
+    final BigInteger rInv = r.modInverse(n);
+    final BigInteger srInv = rInv.multiply(s).mod(n);
+    final BigInteger eInvrInv = rInv.multiply(eInv).mod(n);
+    final ECPoint q = ECAlgorithms.sumOfTwoMultiplies(curve.getG(), eInvrInv, R, srInv);
+
+    if (q.isInfinity()) {
+      return null;
+    }
+
+    final byte[] qBytes = q.getEncoded(false);
+    // We remove the prefix
+    return new BigInteger(1, Arrays.copyOfRange(qBytes, 1, qBytes.length));
+  }
+
+  @Override
+  public SECPSignature sign(final Bytes32 dataHash, final KeyPair keyPair) {
+    final ECDSASigner signer = new ECDSASigner(getKCalculator());
+
+    final ECPrivateKeyParameters privKey =
+        new ECPrivateKeyParameters(
+            keyPair.getPrivateKey().getEncodedBytes().toUnsignedBigInteger(), curve);
+    signer.init(true, privKey);
+
+    final BigInteger[] components = signer.generateSignature(dataHash.toArrayUnsafe());
+
+    return normaliseSignature(components[0], components[1], keyPair.getPublicKey(), dataHash);
+  }
+
+  /**
+   * Verifies the given ECDSA signature against the message bytes using the public key bytes.
+   *
+   * <p>When using native ECDSA verification, data must be 32 bytes, and no element may be larger
+   * than 520 bytes.
+   *
+   * @param data Hash of the data to verify.
+   * @param signature ASN.1 encoded signature.
+   * @param pub The public key bytes to use.
+   * @return True if the verification is successful.
+   */
+  @Override
+  public boolean verify(final Bytes data, final SECPSignature signature, final SECPPublicKey pub) {
+    final ECDSASigner signer = new ECDSASigner();
+    final Bytes toDecode = Bytes.wrap(Bytes.of((byte) 4), pub.getEncodedBytes());
+    final ECPublicKeyParameters params =
+        new ECPublicKeyParameters(curve.getCurve().decodePoint(toDecode.toArrayUnsafe()), curve);
+    signer.init(false, params);
+    try {
+      return signer.verifySignature(data.toArrayUnsafe(), signature.getR(), signature.getS());
+    } catch (final NullPointerException e) {
+      // Bouncy Castle contains a bug that can cause NPEs given specially crafted signatures. Those
+      // signatures
+      // are inherently invalid/attack sigs so we just fail them here rather than crash the thread.
+      return false;
+    }
+  }
+
+  /**
+   * Verifies the given ECDSA signature using the public key bytes against the message bytes,
+   * previously passed through a preprocessor function, which is normally a hashing function.
+   *
+   * @param data The data to verify.
+   * @param signature ASN.1 encoded signature.
+   * @param pub The public key bytes to use.
+   * @param preprocessor The function to apply to the data before verifying the signature, normally
+   *     a hashing function.
+   * @return True if the verification is successful.
+   */
+  @Override
+  public boolean verify(
+      final Bytes data,
+      final SECPSignature signature,
+      final SECPPublicKey pub,
+      final UnaryOperator<Bytes> preprocessor) {
+    checkArgument(preprocessor != null, "preprocessor must not be null");
+    return verify(preprocessor.apply(data), signature, pub);
+  }
+
+  @Override
+  public Optional<SECPPublicKey> recoverPublicKeyFromSignature(
+      final Bytes32 dataHash, final SECPSignature signature) {
+    final BigInteger publicKeyBI =
+        recoverFromSignature(signature.getRecId(), signature.getR(), signature.getS(), dataHash);
+    return Optional.of(SECPPublicKey.create(publicKeyBI, ALGORITHM));
+  }
+
+  @Override
+  public Bytes compressPublicKey(final SECPPublicKey uncompressedPublicKey) {
+    return Bytes.wrap(publicKeyAsEcPoint(uncompressedPublicKey).getEncoded(true));
+  }
+}
diff --git a/crypto/src/main/java/org/hyperledger/besu/crypto/BesuProvider.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/BesuProvider.java
similarity index 88%
rename from crypto/src/main/java/org/hyperledger/besu/crypto/BesuProvider.java
rename to crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/BesuProvider.java
index 14a40163cf5..d7968852c82 100644
--- a/crypto/src/main/java/org/hyperledger/besu/crypto/BesuProvider.java
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/BesuProvider.java
@@ -18,13 +18,16 @@
 import java.security.PrivilegedAction;
 import java.security.Provider;
 
+/** The Besu Security provider. */
 public final class BesuProvider extends Provider {
 
   private static final String info = "Besu Security Provider v1.0";
 
+  /** The constant PROVIDER_NAME. */
   public static final String PROVIDER_NAME = "Besu";
 
-  @SuppressWarnings("unchecked")
+  /** Instantiates a new Besu provider. */
+  @SuppressWarnings({"unchecked", "removal"})
   public BesuProvider() {
     super(PROVIDER_NAME, "1.0", info);
     AccessController.doPrivileged(
diff --git a/crypto/src/main/java/org/hyperledger/besu/crypto/Blake2bfMessageDigest.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/Blake2bfMessageDigest.java
similarity index 80%
rename from crypto/src/main/java/org/hyperledger/besu/crypto/Blake2bfMessageDigest.java
rename to crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/Blake2bfMessageDigest.java
index cd89ab4d073..63449d74b50 100644
--- a/crypto/src/main/java/org/hyperledger/besu/crypto/Blake2bfMessageDigest.java
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/Blake2bfMessageDigest.java
@@ -16,13 +16,20 @@
 
 import static java.util.Arrays.copyOfRange;
 
+import org.hyperledger.besu.nativelib.blake2bf.LibBlake2bf;
+
 import org.bouncycastle.crypto.Digest;
 import org.bouncycastle.jcajce.provider.digest.BCMessageDigest;
 import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.Pack;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class Blake2bfMessageDigest extends BCMessageDigest {
+/** The type Blake2bf message digest. */
+public class Blake2bfMessageDigest extends BCMessageDigest implements Cloneable {
+  private static final Logger LOG = LoggerFactory.getLogger(Blake2bfMessageDigest.class);
 
+  /** Instantiates a new Blake2bf message digest. */
   public Blake2bfMessageDigest() {
     super(new Blake2bfDigest());
   }
@@ -37,7 +44,7 @@ public Blake2bfMessageDigest() {
    * <p>Optimized for 64-bit platforms
    */
   public static class Blake2bfDigest implements Digest {
-
+    /** The constant MESSAGE_LENGTH_BYTES. */
     public static final int MESSAGE_LENGTH_BYTES = 213;
 
     private static final long[] IV = {
@@ -76,8 +83,23 @@ public static class Blake2bfDigest implements Digest {
     private long rounds; // unsigned integer represented as long
 
     private final long[] v;
+    private static boolean useNative;
+
+    static {
+      try {
+        useNative = LibBlake2bf.ENABLED;
+      } catch (UnsatisfiedLinkError ule) {
+        LOG.info("blake2bf native precompile not available: {}", ule.getMessage());
+        useNative = false;
+      }
+    }
 
+    /** Instantiates a new Blake2bf digest. */
     Blake2bfDigest() {
+      if (!useNative) {
+        LOG.info("Native blake2bf not available");
+      }
+
       buffer = new byte[MESSAGE_LENGTH_BYTES];
       bufferPos = 0;
 
@@ -90,20 +112,18 @@ public static class Blake2bfDigest implements Digest {
       v = new long[16];
     }
 
-    // for tests
-    Blake2bfDigest(
-        final long[] h, final long[] m, final long[] t, final boolean f, final long rounds) {
-      assert rounds <= 4294967295L; // uint max value
-      buffer = new byte[MESSAGE_LENGTH_BYTES];
-      bufferPos = 0;
-
-      this.h = h;
-      this.m = m;
-      this.t = t;
-      this.f = f;
-      this.rounds = rounds;
+    /** Disable native. */
+    public static void disableNative() {
+      useNative = false;
+    }
 
-      v = new long[16];
+    /**
+     * Is native.
+     *
+     * @return the boolean
+     */
+    public static boolean isNative() {
+      return useNative;
     }
 
     @Override
@@ -123,16 +143,10 @@ public int getDigestSize() {
      */
     @Override
     public void update(final byte in) {
-
-      if (bufferPos == MESSAGE_LENGTH_BYTES) { // full buffer
-        throw new IllegalArgumentException();
-      } else {
-        buffer[bufferPos] = in;
-        bufferPos++;
-        if (bufferPos == MESSAGE_LENGTH_BYTES) {
-          initialize();
-        }
-      }
+      checkSize(1);
+      buffer[bufferPos] = in;
+      bufferPos++;
+      maybeInitialize();
     }
 
     /**
@@ -148,6 +162,15 @@ public void update(final byte[] in, final int offset, final int len) {
         return;
       }
 
+      checkSize(len);
+
+      System.arraycopy(in, offset, buffer, bufferPos, len);
+      bufferPos += len;
+
+      maybeInitialize();
+    }
+
+    private void checkSize(final int len) {
       if (len > MESSAGE_LENGTH_BYTES - bufferPos) {
         throw new IllegalArgumentException(
             "Attempting to update buffer with "
@@ -156,12 +179,10 @@ public void update(final byte[] in, final int offset, final int len) {
                 + (MESSAGE_LENGTH_BYTES - bufferPos)
                 + " byte(s) left to fill");
       }
+    }
 
-      System.arraycopy(in, offset, buffer, bufferPos, len);
-
-      bufferPos += len;
-
-      if (bufferPos == MESSAGE_LENGTH_BYTES) {
+    private void maybeInitialize() {
+      if (!useNative && bufferPos == MESSAGE_LENGTH_BYTES) {
         initialize();
       }
     }
@@ -178,10 +199,13 @@ public int doFinal(final byte[] out, final int offset) {
         throw new IllegalStateException("The buffer must be filled with 213 bytes");
       }
 
-      compress();
-
-      for (int i = 0; i < h.length; i++) {
-        System.arraycopy(Pack.longToLittleEndian(h[i]), 0, out, i * 8, 8);
+      if (useNative) {
+        LibBlake2bf.blake2bf_eip152(out, buffer);
+      } else {
+        compress();
+        for (int i = 0; i < h.length; i++) {
+          System.arraycopy(Pack.longToLittleEndian(h[i]), 0, out, i * 8, 8);
+        }
       }
 
       reset();
@@ -194,12 +218,14 @@ public int doFinal(final byte[] out, final int offset) {
     public void reset() {
       bufferPos = 0;
       Arrays.fill(buffer, (byte) 0);
-      Arrays.fill(h, 0);
-      Arrays.fill(m, (byte) 0);
-      Arrays.fill(t, 0);
-      f = false;
-      rounds = 12;
-      Arrays.fill(v, 0);
+      if (!useNative) {
+        Arrays.fill(h, 0);
+        Arrays.fill(m, (byte) 0);
+        Arrays.fill(t, 0);
+        f = false;
+        rounds = 12;
+        Arrays.fill(v, 0);
+      }
     }
 
     private void initialize() {
diff --git a/crypto/src/main/java/org/hyperledger/besu/crypto/ECPointUtil.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/ECPointUtil.java
similarity index 86%
rename from crypto/src/main/java/org/hyperledger/besu/crypto/ECPointUtil.java
rename to crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/ECPointUtil.java
index 65467c5b931..e000feb1f6e 100644
--- a/crypto/src/main/java/org/hyperledger/besu/crypto/ECPointUtil.java
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/ECPointUtil.java
@@ -22,7 +22,14 @@
 import org.bouncycastle.math.ec.ECFieldElement;
 import org.bouncycastle.util.BigIntegers;
 
+/** The Ec point util class. */
 public class ECPointUtil {
+  /**
+   * From bouncy castle ec point to ECPoint.
+   *
+   * @param bouncyCastleECPoint the bouncy castle ec point
+   * @return the ECPoint
+   */
   public static ECPoint fromBouncyCastleECPoint(
       final org.bouncycastle.math.ec.ECPoint bouncyCastleECPoint) {
     final ECFieldElement xCoord = bouncyCastleECPoint.getAffineXCoord();
@@ -37,6 +44,12 @@ public static ECPoint fromBouncyCastleECPoint(
     return new ECPoint(x, y);
   }
 
+  /**
+   * Gets encoded bytes.
+   *
+   * @param ecPoint the ec point
+   * @return the encoded bytes
+   */
   public static Bytes getEncodedBytes(final ECPoint ecPoint) {
     final Bytes xBytes = Bytes32.wrap(BigIntegers.asUnsignedByteArray(32, ecPoint.getAffineX()));
     final Bytes yBytes = Bytes32.wrap(BigIntegers.asUnsignedByteArray(32, ecPoint.getAffineY()));
diff --git a/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/Hash.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/Hash.java
new file mode 100644
index 00000000000..b1b66f0f961
--- /dev/null
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/Hash.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto;
+
+import static org.hyperledger.besu.crypto.MessageDigestFactory.BLAKE2BF_ALG;
+import static org.hyperledger.besu.crypto.MessageDigestFactory.KECCAK256_ALG;
+import static org.hyperledger.besu.crypto.MessageDigestFactory.RIPEMD160_ALG;
+import static org.hyperledger.besu.crypto.MessageDigestFactory.SHA256_ALG;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.function.Supplier;
+
+import com.google.common.base.Suppliers;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+/** Various utilities for providing hashes (digests) of arbitrary data. */
+public abstract class Hash {
+  private Hash() {}
+
+  private static final Supplier<MessageDigest> KECCAK256_SUPPLIER =
+      Suppliers.memoize(() -> messageDigest(KECCAK256_ALG));
+  private static final Supplier<MessageDigest> SHA256_SUPPLIER =
+      Suppliers.memoize(() -> messageDigest(SHA256_ALG));
+  private static final Supplier<MessageDigest> RIPEMD160_SUPPLIER =
+      Suppliers.memoize(() -> messageDigest(RIPEMD160_ALG));
+  private static final Supplier<MessageDigest> BLAKE2BF_SUPPLIER =
+      Suppliers.memoize(() -> messageDigest(BLAKE2BF_ALG));
+
+  private static MessageDigest messageDigest(final String algorithm) {
+    try {
+      return MessageDigestFactory.create(algorithm);
+    } catch (final NoSuchAlgorithmException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  /**
+   * Helper method to generate a digest using the provided algorithm.
+   *
+   * @param input The input bytes to produce the digest for.
+   * @param digestSupplier the digest supplier to use
+   * @return A digest.
+   */
+  private static byte[] digestUsingAlgorithm(
+      final Bytes input, final Supplier<MessageDigest> digestSupplier) {
+    try {
+      final MessageDigest digest = (MessageDigest) digestSupplier.get().clone();
+      input.update(digest);
+      return digest.digest();
+    } catch (final CloneNotSupportedException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  /**
+   * Digest using SHA2-256.
+   *
+   * @param input The input bytes to produce the digest for.
+   * @return A digest.
+   */
+  public static Bytes32 sha256(final Bytes input) {
+    return Bytes32.wrap(digestUsingAlgorithm(input, SHA256_SUPPLIER));
+  }
+
+  /**
+   * Digest using keccak-256.
+   *
+   * @param input The input bytes to produce the digest for.
+   * @return A digest.
+   */
+  public static Bytes32 keccak256(final Bytes input) {
+    return Bytes32.wrap(digestUsingAlgorithm(input, KECCAK256_SUPPLIER));
+  }
+
+  /**
+   * Digest using RIPEMD-160.
+   *
+   * @param input The input bytes to produce the digest for.
+   * @return A digest.
+   */
+  public static Bytes ripemd160(final Bytes input) {
+    return Bytes.wrap(digestUsingAlgorithm(input, RIPEMD160_SUPPLIER));
+  }
+
+  /**
+   * Digest using Blake2f compression function.
+   *
+   * @param input The input bytes to produce the digest for.
+   * @return A digest.
+   */
+  public static Bytes blake2bf(final Bytes input) {
+    return Bytes.wrap(digestUsingAlgorithm(input, BLAKE2BF_SUPPLIER));
+  }
+}
diff --git a/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/KeyPair.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/KeyPair.java
new file mode 100644
index 00000000000..f3cd85acbd1
--- /dev/null
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/KeyPair.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.math.BigInteger;
+import java.security.KeyPairGenerator;
+import java.util.Arrays;
+import java.util.Objects;
+
+import org.bouncycastle.crypto.params.ECDomainParameters;
+import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey;
+import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey;
+
+/** The Key pair class. */
+public class KeyPair {
+
+  private final SECPPrivateKey privateKey;
+  private final SECPPublicKey publicKey;
+
+  /**
+   * Instantiates a new Key pair.
+   *
+   * @param privateKey the private key
+   * @param publicKey the public key
+   */
+  public KeyPair(final SECPPrivateKey privateKey, final SECPPublicKey publicKey) {
+    checkNotNull(privateKey);
+    checkNotNull(publicKey);
+    this.privateKey = privateKey;
+    this.publicKey = publicKey;
+  }
+
+  /**
+   * Create key pair.
+   *
+   * @param privateKey the private key
+   * @param curve the curve
+   * @param algorithm the algorithm
+   * @return the key pair
+   */
+  public static KeyPair create(
+      final SECPPrivateKey privateKey, final ECDomainParameters curve, final String algorithm) {
+    return new KeyPair(privateKey, SECPPublicKey.create(privateKey, curve, algorithm));
+  }
+
+  /**
+   * Generate key pair.
+   *
+   * @param keyPairGenerator the key pair generator
+   * @param algorithm the algorithm
+   * @return the key pair
+   */
+  public static KeyPair generate(final KeyPairGenerator keyPairGenerator, final String algorithm) {
+    final java.security.KeyPair rawKeyPair = keyPairGenerator.generateKeyPair();
+    final BCECPrivateKey privateKey = (BCECPrivateKey) rawKeyPair.getPrivate();
+    final BCECPublicKey publicKey = (BCECPublicKey) rawKeyPair.getPublic();
+
+    final BigInteger privateKeyValue = privateKey.getD();
+
+    // Ethereum does not use encoded public keys like bitcoin - see
+    // https://en.bitcoin.it/wiki/Elliptic_Curve_Digital_Signature_Algorithm for details
+    // Additionally, as the first bit is a constant prefix (0x04) we ignore this value
+    final byte[] publicKeyBytes = publicKey.getQ().getEncoded(false);
+    final BigInteger publicKeyValue =
+        new BigInteger(1, Arrays.copyOfRange(publicKeyBytes, 1, publicKeyBytes.length));
+
+    return new KeyPair(
+        SECPPrivateKey.create(privateKeyValue, algorithm),
+        SECPPublicKey.create(publicKeyValue, algorithm));
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(privateKey, publicKey);
+  }
+
+  @Override
+  public boolean equals(final Object other) {
+    if (!(other instanceof KeyPair)) {
+      return false;
+    }
+
+    final KeyPair that = (KeyPair) other;
+    return this.privateKey.equals(that.privateKey) && this.publicKey.equals(that.publicKey);
+  }
+
+  @Override
+  public String toString() {
+    return ("KeyPair{privateKey: "
+        + this.privateKey.toString()
+        + ", publicKey: "
+        + this.publicKey.toString()
+        + "]");
+  }
+
+  /**
+   * Gets private key.
+   *
+   * @return the private key
+   */
+  public SECPPrivateKey getPrivateKey() {
+    return privateKey;
+  }
+
+  /**
+   * Gets public key.
+   *
+   * @return the public key
+   */
+  public SECPPublicKey getPublicKey() {
+    return publicKey;
+  }
+}
diff --git a/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/KeyPairUtil.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/KeyPairUtil.java
new file mode 100644
index 00000000000..f20b1b37103
--- /dev/null
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/KeyPairUtil.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto;
+
+import static java.nio.file.StandardCopyOption.ATOMIC_MOVE;
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
+import com.google.common.io.Resources;
+import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Key pair util. */
+public class KeyPairUtil {
+  private static final Logger LOG = LoggerFactory.getLogger(KeyPairUtil.class);
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+
+  /**
+   * Load resource file string.
+   *
+   * @param resourcePath the resource path
+   * @return the string
+   */
+  public static String loadResourceFile(final String resourcePath) {
+    try {
+      URL path = KeyPairUtil.class.getClassLoader().getResource(resourcePath);
+      return Resources.toString(path, StandardCharsets.UTF_8).trim();
+    } catch (Exception e) {
+      throw new RuntimeException("Unable to load resource: " + resourcePath, e);
+    }
+  }
+
+  /**
+   * Load key pair from resource.
+   *
+   * @param resourcePath the resource path
+   * @return the key pair
+   */
+  public static KeyPair loadKeyPairFromResource(final String resourcePath) {
+    final KeyPair keyPair;
+    String keyData = loadResourceFile(resourcePath);
+    if (keyData == null || keyData.isEmpty()) {
+      throw new IllegalArgumentException("Unable to load resource: " + resourcePath);
+    }
+    SECPPrivateKey privateKey =
+        SIGNATURE_ALGORITHM.get().createPrivateKey(Bytes32.fromHexString((keyData)));
+    keyPair = SIGNATURE_ALGORITHM.get().createKeyPair(privateKey);
+
+    LOG.info("Loaded keyPair {} from {}", keyPair.getPublicKey().toString(), resourcePath);
+    return keyPair;
+  }
+
+  /**
+   * Load key pair.
+   *
+   * @param keyFile the key file
+   * @return the key pair
+   */
+  public static KeyPair loadKeyPair(final File keyFile) {
+
+    final KeyPair key;
+    if (keyFile.exists()) {
+
+      key = load(keyFile);
+      LOG.info(
+          "Loaded public key {} from {}", key.getPublicKey().toString(), keyFile.getAbsolutePath());
+    } else {
+      final SignatureAlgorithm signatureAlgorithm = SIGNATURE_ALGORITHM.get();
+      key = signatureAlgorithm.generateKeyPair();
+      storeKeyFile(key, keyFile.getParentFile().toPath());
+
+      LOG.info(
+          "Generated new {} public key {} and stored it to {}",
+          signatureAlgorithm.getCurveName(),
+          key.getPublicKey().toString(),
+          keyFile.getAbsolutePath());
+    }
+    return key;
+  }
+
+  /**
+   * Load key pair.
+   *
+   * @param directory the directory
+   * @return the key pair
+   */
+  public static KeyPair loadKeyPair(final Path directory) {
+    return loadKeyPair(getDefaultKeyFile(directory));
+  }
+
+  /**
+   * Store key file.
+   *
+   * @param keyPair the key pair
+   * @param homeDirectory the home directory
+   */
+  public static void storeKeyFile(final KeyPair keyPair, final Path homeDirectory) {
+    try {
+      storeKeyPair(keyPair, getDefaultKeyFile(homeDirectory));
+    } catch (IOException e) {
+      throw new IllegalArgumentException("Cannot store generated private key.");
+    }
+  }
+
+  /**
+   * Gets default key file.
+   *
+   * @param directory the directory
+   * @return the default key file
+   */
+  public static File getDefaultKeyFile(final Path directory) {
+    return directory.resolve("key").toFile();
+  }
+
+  /**
+   * Load key pair.
+   *
+   * @param file the file
+   * @return the key pair
+   */
+  public static KeyPair load(final File file) {
+    return SIGNATURE_ALGORITHM.get().createKeyPair(loadPrivateKey(file));
+  }
+
+  /**
+   * Load secp private key.
+   *
+   * @param file the file
+   * @return the secp private key
+   */
+  static SECPPrivateKey loadPrivateKey(final File file) {
+    try {
+      final List<String> info = Files.readAllLines(file.toPath());
+      if (info.size() != 1) {
+        throw new IllegalArgumentException("Supplied file does not contain valid keyPair pair.");
+      }
+      return SIGNATURE_ALGORITHM.get().createPrivateKey(Bytes32.fromHexString((info.get(0))));
+    } catch (IOException ex) {
+      throw new IllegalArgumentException("Supplied file does not contain valid keyPair pair.");
+    }
+  }
+
+  /**
+   * Store key pair.
+   *
+   * @param keyPair the key pair
+   * @param file the file
+   * @throws IOException the io exception
+   */
+  static void storeKeyPair(final KeyPair keyPair, final File file) throws IOException {
+    final File privateKeyDir = file.getParentFile();
+    privateKeyDir.mkdirs();
+    final Path tempPath = Files.createTempFile(privateKeyDir.toPath(), ".tmp", "");
+    Files.write(
+        tempPath,
+        keyPair.getPrivateKey().getEncodedBytes().toString().getBytes(StandardCharsets.UTF_8));
+    Files.move(tempPath, file.toPath(), REPLACE_EXISTING, ATOMIC_MOVE);
+  }
+}
diff --git a/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/MessageDigestFactory.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/MessageDigestFactory.java
new file mode 100644
index 00000000000..9f482d5fc74
--- /dev/null
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/MessageDigestFactory.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.Security;
+
+import org.bouncycastle.jcajce.provider.digest.Keccak;
+import org.bouncycastle.jcajce.provider.digest.RIPEMD160;
+import org.bouncycastle.jcajce.provider.digest.SHA256;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+
+/** The Message digest factory. */
+public class MessageDigestFactory {
+
+  private MessageDigestFactory() {}
+
+  /** Keccak-256 */
+  public static final String KECCAK256_ALG = "KECCAK-256";
+  /** SHA-256 */
+  public static final String SHA256_ALG = "SHA-256";
+  /** RipeMD-160 */
+  public static final String RIPEMD160_ALG = "RIPEMD160";
+  /** Blake2b F Function */
+  public static final String BLAKE2BF_ALG = "BLAKE2BF";
+
+  static {
+    Security.addProvider(new BesuProvider());
+    Security.addProvider(new BouncyCastleProvider());
+  }
+
+  /**
+   * Create message digest.
+   *
+   * @param algorithm the algorithm
+   * @return the message digest
+   * @throws NoSuchAlgorithmException the no such algorithm exception
+   */
+  @SuppressWarnings("DoNotInvokeMessageDigestDirectly")
+  public static MessageDigest create(final String algorithm) throws NoSuchAlgorithmException {
+    return switch (algorithm) {
+      case KECCAK256_ALG -> new Keccak.Digest256();
+      case SHA256_ALG -> new SHA256.Digest();
+      case RIPEMD160_ALG -> new RIPEMD160.Digest();
+      case BLAKE2BF_ALG -> new Blake2bfMessageDigest();
+      default -> MessageDigest.getInstance(algorithm);
+    };
+  }
+}
diff --git a/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SECP256K1.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SECP256K1.java
new file mode 100644
index 00000000000..6221ef351b5
--- /dev/null
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SECP256K1.java
@@ -0,0 +1,241 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto;
+
+import static org.hyperledger.besu.nativelib.secp256k1.LibSecp256k1.SECP256K1_EC_UNCOMPRESSED;
+
+import org.hyperledger.besu.nativelib.secp256k1.LibSecp256k1;
+import org.hyperledger.besu.nativelib.secp256k1.LibSecp256k1.secp256k1_ecdsa_recoverable_signature;
+import org.hyperledger.besu.nativelib.secp256k1.LibSecp256k1.secp256k1_ecdsa_signature;
+import org.hyperledger.besu.nativelib.secp256k1.LibSecp256k1.secp256k1_pubkey;
+
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.util.Optional;
+
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.ptr.LongByReference;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.bouncycastle.crypto.digests.SHA256Digest;
+import org.bouncycastle.crypto.signers.DSAKCalculator;
+import org.bouncycastle.crypto.signers.HMacDSAKCalculator;
+import org.bouncycastle.math.ec.custom.sec.SecP256K1Curve;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The SECP256K1 implementation. */
+/*
+ * Adapted from the BitcoinJ ECKey (Apache 2 License) implementation:
+ * https://github.com/bitcoinj/bitcoinj/blob/master/core/src/main/java/org/bitcoinj/core/ECKey.java
+ *
+ *
+ * Adapted from the web3j (Apache 2 License) implementations:
+ * https://github.com/web3j/web3j/crypto/src/main/java/org/web3j/crypto/*.java
+ */
+public class SECP256K1 extends AbstractSECP256 {
+
+  private static final Logger LOG = LoggerFactory.getLogger(SECP256K1.class);
+
+  private boolean useNative;
+
+  /** The constant CURVE_NAME. */
+  public static final String CURVE_NAME = "secp256k1";
+
+  /** Instantiates a new SECP256K1. */
+  public SECP256K1() {
+    super(CURVE_NAME, SecP256K1Curve.q);
+
+    // use the native library implementation, if it is available
+    useNative = LibSecp256k1.CONTEXT != null;
+    if (!useNative) {
+      LOG.info("Native secp256k1 not available");
+    }
+  }
+
+  @Override
+  public void disableNative() {
+    useNative = false;
+  }
+
+  @Override
+  public boolean isNative() {
+    return useNative;
+  }
+
+  /**
+   * SECP256K1 is using the deterministic implementation of K calculation (defined on RFC 6979
+   * section 3.2)
+   *
+   * @return an instance of HMacDSAKCalculator
+   * @see <a href="https://datatracker.ietf.org/doc/html/rfc6979#section-3.2">RFC 6979 Section
+   *     3.2</a>
+   */
+  @Override
+  public DSAKCalculator getKCalculator() {
+    return new HMacDSAKCalculator(new SHA256Digest());
+  }
+
+  @Override
+  public SECPSignature sign(final Bytes32 dataHash, final KeyPair keyPair) {
+    if (useNative) {
+      return signNative(dataHash, keyPair);
+    } else {
+      return super.sign(dataHash, keyPair);
+    }
+  }
+
+  /**
+   * Verifies the given ECDSA signature against the message bytes using the public key bytes.
+   *
+   * <p>When using native ECDSA verification, data must be 32 bytes, and no element may be larger
+   * than 520 bytes.
+   *
+   * @param data Hash of the data to verify.
+   * @param signature ASN.1 encoded signature.
+   * @param pub The public key bytes to use.
+   * @return True if the verification is successful.
+   */
+  @Override
+  public boolean verify(final Bytes data, final SECPSignature signature, final SECPPublicKey pub) {
+    if (useNative) {
+      return verifyNative(data, signature, pub);
+    } else {
+      return super.verify(data, signature, pub);
+    }
+  }
+
+  @Override
+  public Optional<SECPPublicKey> recoverPublicKeyFromSignature(
+      final Bytes32 dataHash, final SECPSignature signature) {
+    if (useNative) {
+      Optional<SECPPublicKey> result = recoverFromSignatureNative(dataHash, signature);
+      if (result.isEmpty()) {
+        throw new IllegalArgumentException("Could not recover public key");
+      } else {
+        return result;
+      }
+    } else {
+      return super.recoverPublicKeyFromSignature(dataHash, signature);
+    }
+  }
+
+  @Override
+  public String getCurveName() {
+    return CURVE_NAME;
+  }
+
+  private SECPSignature signNative(final Bytes32 dataHash, final KeyPair keyPair) {
+    final LibSecp256k1.secp256k1_ecdsa_recoverable_signature signature =
+        new secp256k1_ecdsa_recoverable_signature();
+    // sign in internal form
+    if (LibSecp256k1.secp256k1_ecdsa_sign_recoverable(
+            LibSecp256k1.CONTEXT,
+            signature,
+            dataHash.toArrayUnsafe(),
+            keyPair.getPrivateKey().getEncoded(),
+            null,
+            null)
+        == 0) {
+      throw new RuntimeException(
+          "Could not natively sign. Private Key is invalid or default nonce generation failed.");
+    }
+
+    // encode to compact form
+    final ByteBuffer compactSig = ByteBuffer.allocate(64);
+    final IntByReference recId = new IntByReference(0);
+    LibSecp256k1.secp256k1_ecdsa_recoverable_signature_serialize_compact(
+        LibSecp256k1.CONTEXT, compactSig, recId, signature);
+    compactSig.flip();
+    final byte[] sig = compactSig.array();
+
+    // wrap in signature object
+    final Bytes32 r = Bytes32.wrap(sig, 0);
+    final Bytes32 s = Bytes32.wrap(sig, 32);
+    return SECPSignature.create(
+        r.toUnsignedBigInteger(), s.toUnsignedBigInteger(), (byte) recId.getValue(), curveOrder);
+  }
+
+  private boolean verifyNative(
+      final Bytes data, final SECPSignature signature, final SECPPublicKey pub) {
+
+    // translate signature
+    final LibSecp256k1.secp256k1_ecdsa_signature _signature = new secp256k1_ecdsa_signature();
+    if (LibSecp256k1.secp256k1_ecdsa_signature_parse_compact(
+            LibSecp256k1.CONTEXT, _signature, signature.encodedBytes().toArrayUnsafe())
+        == 0) {
+      throw new IllegalArgumentException("Could not parse signature");
+    }
+
+    // translate key
+    final LibSecp256k1.secp256k1_pubkey _pub = new secp256k1_pubkey();
+    final Bytes encodedPubKey = Bytes.concatenate(Bytes.of(0x04), pub.getEncodedBytes());
+    if (LibSecp256k1.secp256k1_ec_pubkey_parse(
+            LibSecp256k1.CONTEXT, _pub, encodedPubKey.toArrayUnsafe(), encodedPubKey.size())
+        == 0) {
+      throw new IllegalArgumentException("Could not parse public key");
+    }
+
+    return LibSecp256k1.secp256k1_ecdsa_verify(
+            LibSecp256k1.CONTEXT, _signature, data.toArrayUnsafe(), _pub)
+        != 0;
+  }
+
+  @Override
+  protected BigInteger recoverFromSignature(
+      final int recId, final BigInteger r, final BigInteger s, final Bytes32 dataHash) {
+    if (useNative) {
+      return recoverFromSignatureNative(dataHash, new SECPSignature(r, s, (byte) recId))
+          .map(key -> new BigInteger(1, key.getEncoded()))
+          .orElse(null);
+    } else {
+      return super.recoverFromSignature(recId, r, s, dataHash);
+    }
+  }
+
+  private Optional<SECPPublicKey> recoverFromSignatureNative(
+      final Bytes32 dataHash, final SECPSignature signature) {
+
+    // parse the sig
+    final LibSecp256k1.secp256k1_ecdsa_recoverable_signature parsedSignature =
+        new LibSecp256k1.secp256k1_ecdsa_recoverable_signature();
+    final Bytes encodedSig = signature.encodedBytes();
+    if (LibSecp256k1.secp256k1_ecdsa_recoverable_signature_parse_compact(
+            LibSecp256k1.CONTEXT,
+            parsedSignature,
+            encodedSig.slice(0, 64).toArrayUnsafe(),
+            encodedSig.get(64))
+        == 0) {
+      throw new IllegalArgumentException("Could not parse signature");
+    }
+
+    // recover the key
+    final LibSecp256k1.secp256k1_pubkey newPubKey = new LibSecp256k1.secp256k1_pubkey();
+    if (LibSecp256k1.secp256k1_ecdsa_recover(
+            LibSecp256k1.CONTEXT, newPubKey, parsedSignature, dataHash.toArrayUnsafe())
+        == 0) {
+      return Optional.empty();
+    }
+
+    // parse the key
+    final ByteBuffer recoveredKey = ByteBuffer.allocate(65);
+    final LongByReference keySize = new LongByReference(recoveredKey.limit());
+    LibSecp256k1.secp256k1_ec_pubkey_serialize(
+        LibSecp256k1.CONTEXT, recoveredKey, keySize, newPubKey, SECP256K1_EC_UNCOMPRESSED);
+
+    return Optional.of(
+        SECPPublicKey.create(Bytes.wrapByteBuffer(recoveredKey).slice(1), ALGORITHM));
+  }
+}
diff --git a/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SECP256R1.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SECP256R1.java
new file mode 100644
index 00000000000..384723a239d
--- /dev/null
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SECP256R1.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto;
+
+import org.hyperledger.besu.nativelib.secp256r1.LibSECP256R1;
+import org.hyperledger.besu.nativelib.secp256r1.Signature;
+import org.hyperledger.besu.nativelib.secp256r1.besuNativeEC.BesuNativeEC;
+
+import java.math.BigInteger;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.bouncycastle.crypto.signers.DSAKCalculator;
+import org.bouncycastle.crypto.signers.RandomDSAKCalculator;
+import org.bouncycastle.math.ec.custom.sec.SecP256R1Curve;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The SECP256R1 implementation. */
+public class SECP256R1 extends AbstractSECP256 {
+
+  private static final Logger LOG = LoggerFactory.getLogger(SECP256R1.class);
+
+  /** The constant CURVE_NAME. */
+  public static final String CURVE_NAME = "secp256r1";
+
+  private boolean useNative;
+  private final LibSECP256R1 libSECP256R1 = new LibSECP256R1();
+
+  /** Instantiates a new SECP256R1. */
+  public SECP256R1() {
+    super(CURVE_NAME, SecP256R1Curve.q);
+    try {
+      useNative = BesuNativeEC.INSTANCE != null;
+    } catch (UnsatisfiedLinkError ule) {
+      LOG.info("secp256r1 native precompile not available: {}", ule.getMessage());
+      useNative = false;
+    }
+  }
+
+  @Override
+  public void disableNative() {
+    useNative = false;
+  }
+
+  @Override
+  public boolean isNative() {
+    return useNative;
+  }
+
+  /**
+   * SECP256R1 is using the non-deterministic implementation of K calculation (standard)
+   *
+   * @return an instance of RandomDSAKCalculator
+   */
+  @Override
+  public DSAKCalculator getKCalculator() {
+    return new RandomDSAKCalculator();
+  }
+
+  @Override
+  public String getCurveName() {
+    return CURVE_NAME;
+  }
+
+  @Override
+  public SECPSignature sign(final Bytes32 dataHash, final KeyPair keyPair) {
+    if (useNative) {
+      return signNative(dataHash, keyPair);
+    } else {
+      return super.sign(dataHash, keyPair);
+    }
+  }
+
+  @Override
+  public boolean verify(final Bytes data, final SECPSignature signature, final SECPPublicKey pub) {
+    if (useNative) {
+      return verifyNative(data, signature, pub);
+    } else {
+      return super.verify(data, signature, pub);
+    }
+  }
+
+  @Override
+  public Optional<SECPPublicKey> recoverPublicKeyFromSignature(
+      final Bytes32 dataHash, final SECPSignature signature) {
+    if (useNative) {
+      return recoverPublicKeyFromSignatureNative(dataHash, signature);
+    } else {
+      return super.recoverPublicKeyFromSignature(dataHash, signature);
+    }
+  }
+
+  private SECPSignature signNative(final Bytes32 dataHash, final KeyPair keyPair) {
+    Signature nativeSignature =
+        libSECP256R1.sign(
+            dataHash.toArrayUnsafe(),
+            keyPair.getPrivateKey().getEncoded(),
+            keyPair.getPublicKey().getEncoded());
+
+    return new SECPSignature(
+        new BigInteger(nativeSignature.getR()),
+        new BigInteger(nativeSignature.getS()),
+        nativeSignature.getV());
+  }
+
+  @Override
+  protected BigInteger recoverFromSignature(
+      final int recId, final BigInteger r, final BigInteger s, final Bytes32 dataHash) {
+    if (useNative) {
+      return recoverPublicKeyFromSignatureNative(dataHash, new SECPSignature(r, s, (byte) recId))
+          .map(key -> new BigInteger(1, key.getEncoded()))
+          .orElse(null);
+    } else {
+      return super.recoverFromSignature(recId, r, s, dataHash);
+    }
+  }
+
+  private Optional<SECPPublicKey> recoverPublicKeyFromSignatureNative(
+      final Bytes32 dataHash, final SECPSignature signature) {
+    byte[] recoveredKey;
+
+    try {
+      recoveredKey =
+          libSECP256R1.keyRecovery(
+              dataHash.toArrayUnsafe(),
+              signature.getR().toByteArray(),
+              signature.getS().toByteArray(),
+              signature.getRecId());
+    } catch (IllegalArgumentException e) {
+      return Optional.empty();
+    }
+
+    return Optional.of(SECPPublicKey.create(Bytes.of(recoveredKey), ALGORITHM));
+  }
+
+  private boolean verifyNative(
+      final Bytes data, final SECPSignature signature, final SECPPublicKey pub) {
+
+    return libSECP256R1.verify(
+        data.toArrayUnsafe(),
+        signature.getR().toByteArray(),
+        signature.getS().toByteArray(),
+        pub.getEncoded());
+  }
+}
diff --git a/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SECPPrivateKey.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SECPPrivateKey.java
new file mode 100644
index 00000000000..528b569b728
--- /dev/null
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SECPPrivateKey.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.math.BigInteger;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** The Secp private key. */
+public class SECPPrivateKey implements java.security.PrivateKey {
+
+  /** Encoded Bytes */
+  private final Bytes32 encoded;
+  /** Algorithm */
+  private final String algorithm;
+
+  private SECPPrivateKey(final Bytes32 encoded, final String algorithm) {
+    checkNotNull(encoded);
+    checkNotNull(algorithm);
+    this.encoded = encoded;
+    this.algorithm = algorithm;
+  }
+
+  /**
+   * Create secp private key.
+   *
+   * @param key the key
+   * @param algorithm the algorithm
+   * @return the secp private key
+   */
+  public static SECPPrivateKey create(final BigInteger key, final String algorithm) {
+    checkNotNull(key);
+    return create(UInt256.valueOf(key), algorithm);
+  }
+
+  /**
+   * Create secp private key.
+   *
+   * @param key the key
+   * @param algorithm the algorithm
+   * @return the secp private key
+   */
+  public static SECPPrivateKey create(final Bytes32 key, final String algorithm) {
+    return new SECPPrivateKey(key, algorithm);
+  }
+
+  @Override
+  public boolean equals(final Object other) {
+    if (!(other instanceof SECPPrivateKey)) {
+      return false;
+    }
+
+    final SECPPrivateKey that = (SECPPrivateKey) other;
+    return this.encoded.equals(that.encoded) && this.algorithm.equals(that.algorithm);
+  }
+
+  @Override
+  public byte[] getEncoded() {
+    return encoded.toArrayUnsafe();
+  }
+
+  /**
+   * Gets encoded bytes.
+   *
+   * @return the encoded bytes
+   */
+  public Bytes32 getEncodedBytes() {
+    return encoded;
+  }
+
+  /**
+   * Gets d.
+   *
+   * @return the d
+   */
+  public BigInteger getD() {
+    return encoded.toUnsignedBigInteger();
+  }
+
+  @Override
+  public String getAlgorithm() {
+    return algorithm;
+  }
+
+  @Override
+  public String getFormat() {
+    return null;
+  }
+
+  @Override
+  public int hashCode() {
+    return encoded.hashCode();
+  }
+
+  @Override
+  public String toString() {
+    return encoded.toString();
+  }
+}
diff --git a/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SECPPublicKey.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SECPPublicKey.java
new file mode 100644
index 00000000000..94916f35853
--- /dev/null
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SECPPublicKey.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.math.BigInteger;
+import java.util.Arrays;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.MutableBytes;
+import org.bouncycastle.crypto.params.ECDomainParameters;
+import org.bouncycastle.math.ec.ECPoint;
+import org.bouncycastle.math.ec.FixedPointCombMultiplier;
+
+/** The Secp public key. */
+public class SECPPublicKey implements java.security.PublicKey {
+
+  /** The constant BYTE_LENGTH. */
+  public static final int BYTE_LENGTH = 64;
+
+  /** Encoded Bytes */
+  private final Bytes encoded;
+  /** Algorithm */
+  private final String algorithm;
+
+  /**
+   * Create secp public key.
+   *
+   * @param key the key
+   * @param algorithm the algorithm
+   * @return the secp public key
+   */
+  public static SECPPublicKey create(final BigInteger key, final String algorithm) {
+    checkNotNull(key);
+    return create(toBytes64(key.toByteArray()), algorithm);
+  }
+
+  /**
+   * Create secp public key.
+   *
+   * @param encoded the encoded
+   * @param algorithm the algorithm
+   * @return the secp public key
+   */
+  public static SECPPublicKey create(final Bytes encoded, final String algorithm) {
+    return new SECPPublicKey(encoded, algorithm);
+  }
+
+  /**
+   * Create secp public key.
+   *
+   * @param privateKey the private key
+   * @param curve the curve
+   * @param algorithm the algorithm
+   * @return the secp public key
+   */
+  public static SECPPublicKey create(
+      final SECPPrivateKey privateKey, final ECDomainParameters curve, final String algorithm) {
+    BigInteger privKey = privateKey.getEncodedBytes().toUnsignedBigInteger();
+
+    /*
+     * TODO: FixedPointCombMultiplier currently doesn't support scalars longer than the group
+     * order, but that could change in future versions.
+     */
+    if (privKey.bitLength() > curve.getN().bitLength()) {
+      privKey = privKey.mod(curve.getN());
+    }
+
+    final ECPoint point = new FixedPointCombMultiplier().multiply(curve.getG(), privKey);
+    return SECPPublicKey.create(
+        Bytes.wrap(Arrays.copyOfRange(point.getEncoded(false), 1, 65)), algorithm);
+  }
+
+  private static Bytes toBytes64(final byte[] backing) {
+    if (backing.length == BYTE_LENGTH) {
+      return Bytes.wrap(backing);
+    } else if (backing.length > BYTE_LENGTH) {
+      return Bytes.wrap(backing, backing.length - BYTE_LENGTH, BYTE_LENGTH);
+    } else {
+      final MutableBytes res = MutableBytes.create(BYTE_LENGTH);
+      Bytes.wrap(backing).copyTo(res, BYTE_LENGTH - backing.length);
+      return res;
+    }
+  }
+
+  private SECPPublicKey(final Bytes encoded, final String algorithm) {
+    checkNotNull(encoded);
+    checkNotNull(algorithm);
+    checkArgument(
+        encoded.size() == BYTE_LENGTH,
+        "Encoding must be %s bytes long, got %s",
+        BYTE_LENGTH,
+        encoded.size());
+    this.encoded = encoded;
+    this.algorithm = algorithm;
+  }
+
+  /**
+   * Returns this public key as an {@link ECPoint} of Bouncy Castle, to facilitate cryptographic
+   * operations.
+   *
+   * @param curve The elliptic curve (e.g. SECP256K1) represented as its domain parameters
+   * @return This public key represented as an Elliptic Curve point.
+   */
+  public ECPoint asEcPoint(final ECDomainParameters curve) {
+    // 0x04 is the prefix for uncompressed keys.
+    final Bytes val = Bytes.concatenate(Bytes.of(0x04), encoded);
+    return curve.getCurve().decodePoint(val.toArrayUnsafe());
+  }
+
+  @Override
+  public boolean equals(final Object other) {
+    if (!(other instanceof SECPPublicKey)) {
+      return false;
+    }
+
+    final SECPPublicKey that = (SECPPublicKey) other;
+    return this.encoded.equals(that.encoded) && this.algorithm.equals(that.algorithm);
+  }
+
+  @Override
+  public byte[] getEncoded() {
+    return encoded.toArrayUnsafe();
+  }
+
+  /**
+   * Gets encoded bytes.
+   *
+   * @return the encoded bytes
+   */
+  public Bytes getEncodedBytes() {
+    return encoded;
+  }
+
+  @Override
+  public String getAlgorithm() {
+    return algorithm;
+  }
+
+  @Override
+  public String getFormat() {
+    return null;
+  }
+
+  @Override
+  public int hashCode() {
+    return encoded.hashCode();
+  }
+
+  @Override
+  public String toString() {
+    return encoded.toString();
+  }
+}
diff --git a/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SECPSignature.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SECPSignature.java
new file mode 100644
index 00000000000..49fc8848fd5
--- /dev/null
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SECPSignature.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.math.BigInteger;
+import java.util.Objects;
+import java.util.function.Supplier;
+
+import com.google.common.base.Suppliers;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.MutableBytes;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** The Secp signature. */
+public class SECPSignature {
+
+  /** The constant BYTES_REQUIRED. */
+  public static final int BYTES_REQUIRED = 65;
+  /**
+   * The recovery id to reconstruct the public key used to create the signature.
+   *
+   * <p>The recId is an index from 0 to 3 which indicates which of the 4 possible keys is the
+   * correct one. Because the key recovery operation yields multiple potential keys, the correct key
+   * must either be stored alongside the signature, or you must be willing to try each recId in turn
+   * until you find one that outputs the key you are expecting.
+   */
+  private final byte recId;
+
+  private final BigInteger r;
+  private final BigInteger s;
+
+  private final Supplier<Bytes> encoded = Suppliers.memoize(this::_encodedBytes);
+
+  /**
+   * Instantiates a new SECPSignature.
+   *
+   * @param r the r
+   * @param s the s
+   * @param recId the rec id
+   */
+  SECPSignature(final BigInteger r, final BigInteger s, final byte recId) {
+    this.r = r;
+    this.s = s;
+    this.recId = recId;
+  }
+
+  /**
+   * Creates a new signature object given its parameters.
+   *
+   * @param r the 'r' part of the signature.
+   * @param s the 's' part of the signature.
+   * @param recId the recovery id part of the signature.
+   * @param curveOrder The order (n) of the used curve
+   * @return the created {@link SECPSignature} object.
+   * @throws NullPointerException if {@code r} or {@code s} are {@code null}.
+   * @throws IllegalArgumentException if any argument is invalid (for instance, {@code v} is neither
+   *     27 or 28).
+   */
+  public static SECPSignature create(
+      final BigInteger r, final BigInteger s, final byte recId, final BigInteger curveOrder) {
+    checkNotNull(r);
+    checkNotNull(s);
+    checkInBounds("r", r, curveOrder);
+    checkInBounds("s", s, curveOrder);
+    if (recId != 0 && recId != 1) {
+      throw new IllegalArgumentException(
+          "Invalid 'recId' value, should be 0 or 1 but got " + recId);
+    }
+    return new SECPSignature(r, s, recId);
+  }
+
+  private static void checkInBounds(
+      final String name, final BigInteger i, final BigInteger curveOrder) {
+    if (i.compareTo(BigInteger.ONE) < 0) {
+      throw new IllegalArgumentException(
+          String.format("Invalid '%s' value, should be >= 1 but got %s", name, i));
+    }
+
+    if (i.compareTo(curveOrder) >= 0) {
+      throw new IllegalArgumentException(
+          String.format("Invalid '%s' value, should be < %s but got %s", curveOrder, name, i));
+    }
+  }
+
+  /**
+   * Decode secp signature.
+   *
+   * @param bytes the bytes
+   * @param curveOrder the curve order
+   * @return the secp signature
+   */
+  public static SECPSignature decode(final Bytes bytes, final BigInteger curveOrder) {
+    checkArgument(
+        bytes.size() == BYTES_REQUIRED, "encoded SECP256K1 signature must be 65 bytes long");
+
+    final BigInteger r = bytes.slice(0, 32).toUnsignedBigInteger();
+    final BigInteger s = bytes.slice(32, 32).toUnsignedBigInteger();
+    final byte recId = bytes.get(64);
+    return SECPSignature.create(r, s, recId, curveOrder);
+  }
+
+  /**
+   * Encoded bytes.
+   *
+   * @return the bytes
+   */
+  public Bytes encodedBytes() {
+    return encoded.get();
+  }
+
+  private Bytes _encodedBytes() {
+    final MutableBytes bytes = MutableBytes.create(BYTES_REQUIRED);
+    UInt256.valueOf(r).copyTo(bytes, 0);
+    UInt256.valueOf(s).copyTo(bytes, 32);
+    bytes.set(64, recId);
+    return bytes;
+  }
+
+  @Override
+  public boolean equals(final Object other) {
+    if (!(other instanceof SECPSignature)) {
+      return false;
+    }
+
+    final SECPSignature that = (SECPSignature) other;
+    return this.r.equals(that.r) && this.s.equals(that.s) && this.recId == that.recId;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(r, s, recId);
+  }
+
+  /**
+   * Gets rec id.
+   *
+   * @return the rec id
+   */
+  public byte getRecId() {
+    return recId;
+  }
+
+  /**
+   * Gets r.
+   *
+   * @return the r
+   */
+  public BigInteger getR() {
+    return r;
+  }
+
+  /**
+   * Gets s.
+   *
+   * @return the s
+   */
+  public BigInteger getS() {
+    return s;
+  }
+
+  @Override
+  public String toString() {
+    final StringBuilder sb = new StringBuilder();
+    sb.append("Signature").append("{");
+    sb.append("r=").append(r).append(", ");
+    sb.append("s=").append(s).append(", ");
+    sb.append("recId=").append(recId);
+    return sb.append("}").toString();
+  }
+}
diff --git a/crypto/src/main/java/org/hyperledger/besu/crypto/SecureRandomProvider.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SecureRandomProvider.java
similarity index 77%
rename from crypto/src/main/java/org/hyperledger/besu/crypto/SecureRandomProvider.java
rename to crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SecureRandomProvider.java
index 8306d3ee888..a13ef8a0731 100644
--- a/crypto/src/main/java/org/hyperledger/besu/crypto/SecureRandomProvider.java
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SecureRandomProvider.java
@@ -16,14 +16,27 @@
 
 import java.security.SecureRandom;
 
+/**
+ * The Secure random provider. Errorprone checks are in place to enforce only this class is used
+ * wherever SecureRandom instance is required.
+ */
 public class SecureRandomProvider {
   private static final SecureRandom publicSecureRandom = secureRandom();
 
-  // Returns a shared instance of secure random intended to be used where the value is used publicly
+  /**
+   * Returns a shared instance of secure random intended to be used where the value is used publicly
+   *
+   * @return the secure random
+   */
   public static SecureRandom publicSecureRandom() {
     return publicSecureRandom;
   }
 
+  /**
+   * Create secure random.
+   *
+   * @return the secure random
+   */
   public static SecureRandom createSecureRandom() {
     return secureRandom();
   }
diff --git a/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SignatureAlgorithm.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SignatureAlgorithm.java
new file mode 100644
index 00000000000..408b1d423a9
--- /dev/null
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SignatureAlgorithm.java
@@ -0,0 +1,226 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto;
+
+import java.math.BigInteger;
+import java.util.Optional;
+import java.util.function.UnaryOperator;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.bouncycastle.math.ec.ECPoint;
+
+/** The interface Signature algorithm. */
+public interface SignatureAlgorithm {
+  /** The constant ALGORITHM. */
+  // needs to be known at compile time otherwise triggers InsecureCryptoUsage error
+  String ALGORITHM = "ECDSA";
+
+  /** Disable native. */
+  void disableNative();
+
+  /**
+   * Is native enabled.
+   *
+   * @return the boolean
+   */
+  boolean isNative();
+
+  /**
+   * Sign secp signature.
+   *
+   * @param dataHash the data hash
+   * @param keyPair the key pair
+   * @return the secp signature
+   */
+  SECPSignature sign(final Bytes32 dataHash, final KeyPair keyPair);
+
+  /**
+   * Verify given data.
+   *
+   * @param data the data
+   * @param signature the signature
+   * @param pub the pub
+   * @return the boolean
+   */
+  boolean verify(final Bytes data, final SECPSignature signature, final SECPPublicKey pub);
+
+  /**
+   * Verify given data.
+   *
+   * @param data the data
+   * @param signature the signature
+   * @param pub the pub
+   * @param preprocessor the preprocessor
+   * @return the boolean
+   */
+  boolean verify(
+      final Bytes data,
+      final SECPSignature signature,
+      final SECPPublicKey pub,
+      final UnaryOperator<Bytes> preprocessor);
+
+  /**
+   * Normalise secp signature.
+   *
+   * @param nativeR the native r
+   * @param nativeS the native s
+   * @param publicKey the public key
+   * @param dataHash the data hash
+   * @return the secp signature
+   */
+  SECPSignature normaliseSignature(
+      final BigInteger nativeR,
+      final BigInteger nativeS,
+      final SECPPublicKey publicKey,
+      final Bytes32 dataHash);
+
+  /**
+   * Calculate ecdh key agreement as bytes32.
+   *
+   * @param privKey the private key
+   * @param theirPubKey the public key
+   * @return the bytes 32
+   */
+  Bytes32 calculateECDHKeyAgreement(final SECPPrivateKey privKey, final SECPPublicKey theirPubKey);
+
+  /**
+   * Gets half curve order.
+   *
+   * @return the half curve order
+   */
+  BigInteger getHalfCurveOrder();
+
+  /**
+   * Gets provider.
+   *
+   * @return the provider
+   */
+  String getProvider();
+
+  /**
+   * Gets curve name.
+   *
+   * @return the curve name
+   */
+  String getCurveName();
+
+  /**
+   * Create secp private key.
+   *
+   * @param key the key
+   * @return the secp private key
+   */
+  SECPPrivateKey createPrivateKey(final BigInteger key);
+
+  /**
+   * Create secp private key.
+   *
+   * @param key the key
+   * @return the secp private key
+   */
+  SECPPrivateKey createPrivateKey(final Bytes32 key);
+
+  /**
+   * Create secp public key.
+   *
+   * @param privateKey the private key
+   * @return the secp public key
+   */
+  SECPPublicKey createPublicKey(final SECPPrivateKey privateKey);
+
+  /**
+   * Create secp public key.
+   *
+   * @param key the key
+   * @return the secp public key
+   */
+  SECPPublicKey createPublicKey(final BigInteger key);
+
+  /**
+   * Createsecp public key.
+   *
+   * @param encoded the encoded
+   * @return the secp public key
+   */
+  SECPPublicKey createPublicKey(final Bytes encoded);
+
+  /**
+   * Recover public key from signature optional.
+   *
+   * @param dataHash the data hash
+   * @param signature the signature
+   * @return the optional public key
+   */
+  Optional<SECPPublicKey> recoverPublicKeyFromSignature(
+      final Bytes32 dataHash, final SECPSignature signature);
+
+  /**
+   * Public key as EcPoint.
+   *
+   * @param publicKey the public key
+   * @return the ec point
+   */
+  ECPoint publicKeyAsEcPoint(final SECPPublicKey publicKey);
+
+  /**
+   * Is valid public key.
+   *
+   * @param publicKey the public key
+   * @return the boolean
+   */
+  boolean isValidPublicKey(SECPPublicKey publicKey);
+
+  /**
+   * Create key pair.
+   *
+   * @param privateKey the private key
+   * @return the key pair
+   */
+  KeyPair createKeyPair(final SECPPrivateKey privateKey);
+
+  /**
+   * Generate key pair.
+   *
+   * @return the key pair
+   */
+  KeyPair generateKeyPair();
+
+  /**
+   * Create secp signature.
+   *
+   * @param r the r
+   * @param s the s
+   * @param recId the rec id
+   * @return the secp signature
+   */
+  SECPSignature createSignature(final BigInteger r, final BigInteger s, final byte recId);
+
+  /**
+   * Decode secp signature.
+   *
+   * @param bytes the bytes
+   * @return the secp signature
+   */
+  SECPSignature decodeSignature(final Bytes bytes);
+
+  /**
+   * Compress public key bytes.
+   *
+   * @param uncompressedKey the uncompressed key
+   * @return the bytes
+   */
+  Bytes compressPublicKey(final SECPPublicKey uncompressedKey);
+}
diff --git a/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SignatureAlgorithmFactory.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SignatureAlgorithmFactory.java
new file mode 100644
index 00000000000..0aaf6d70f1b
--- /dev/null
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SignatureAlgorithmFactory.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Signature algorithm factory. */
+public class SignatureAlgorithmFactory {
+
+  private static final Logger LOG = LoggerFactory.getLogger(SignatureAlgorithmFactory.class);
+
+  private static SignatureAlgorithm instance = null;
+
+  private SignatureAlgorithmFactory() {}
+
+  /** Sets default instance. */
+  public static void setDefaultInstance() {
+    instance = SignatureAlgorithmType.createDefault().getInstance();
+  }
+
+  /**
+   * Sets instance.
+   *
+   * @param signatureAlgorithmType the signature algorithm type
+   * @throws IllegalStateException the illegal state exception
+   */
+  public static void setInstance(final SignatureAlgorithmType signatureAlgorithmType)
+      throws IllegalStateException {
+    if (instance != null) {
+      throw new IllegalStateException(
+          "Instance of SignatureAlgorithmFactory can only be set once.");
+    }
+
+    instance = signatureAlgorithmType.getInstance();
+
+    if (!SignatureAlgorithmType.isDefault(instance)) {
+      LOG.info(
+          new StringBuilder("The signature algorithm uses the elliptic curve ")
+              .append(instance.getCurveName())
+              .append(". The usage of alternative elliptic curves is still experimental.")
+              .toString());
+    }
+  }
+
+  /**
+   * getInstance will always return a valid SignatureAlgorithm and never null. This is necessary in
+   * the unit tests be able to use the factory without having to call setInstance first.
+   *
+   * @return SignatureAlgorithm instance
+   */
+  public static SignatureAlgorithm getInstance() {
+    return instance != null
+        ? instance
+        : SignatureAlgorithmType.DEFAULT_SIGNATURE_ALGORITHM_TYPE.get();
+  }
+
+  /**
+   * Is instance set boolean.
+   *
+   * @return the boolean
+   */
+  public static boolean isInstanceSet() {
+    return instance != null;
+  }
+
+  /** Reset instance. */
+  @VisibleForTesting
+  public static void resetInstance() {
+    instance = null;
+  }
+}
diff --git a/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SignatureAlgorithmType.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SignatureAlgorithmType.java
new file mode 100644
index 00000000000..26e877ab931
--- /dev/null
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SignatureAlgorithmType.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.function.Supplier;
+
+import com.google.common.collect.ImmutableMap;
+
+/** The Signature algorithm type. */
+public class SignatureAlgorithmType {
+
+  /** The constant DEFAULT_EC_CURVE_NAME. */
+  public static final String DEFAULT_EC_CURVE_NAME = "secp256k1";
+
+  private static final ImmutableMap<String, Supplier<SignatureAlgorithm>> SUPPORTED_ALGORITHMS =
+      ImmutableMap.of(DEFAULT_EC_CURVE_NAME, SECP256K1::new, "secp256r1", SECP256R1::new);
+
+  /** The constant DEFAULT_SIGNATURE_ALGORITHM_TYPE. */
+  public static final Supplier<SignatureAlgorithm> DEFAULT_SIGNATURE_ALGORITHM_TYPE =
+      SUPPORTED_ALGORITHMS.get(DEFAULT_EC_CURVE_NAME);
+
+  private final Supplier<SignatureAlgorithm> instantiator;
+
+  private SignatureAlgorithmType(final Supplier<SignatureAlgorithm> instantiator) {
+    this.instantiator = instantiator;
+  }
+
+  /**
+   * Create signature algorithm type.
+   *
+   * @param ecCurve the ec curve
+   * @return the signature algorithm type
+   * @throws IllegalArgumentException the illegal argument exception
+   */
+  public static SignatureAlgorithmType create(final String ecCurve)
+      throws IllegalArgumentException {
+    if (!isValidType(ecCurve)) {
+      throw new IllegalArgumentException(invalidTypeErrorMessage(ecCurve));
+    }
+
+    return new SignatureAlgorithmType(SUPPORTED_ALGORITHMS.get(ecCurve));
+  }
+
+  /**
+   * Create default signature algorithm type.
+   *
+   * @return the signature algorithm type
+   */
+  public static SignatureAlgorithmType createDefault() {
+    return new SignatureAlgorithmType(DEFAULT_SIGNATURE_ALGORITHM_TYPE);
+  }
+
+  /**
+   * Gets instance.
+   *
+   * @return the instance
+   */
+  public SignatureAlgorithm getInstance() {
+    return instantiator.get();
+  }
+
+  /**
+   * Is valid type boolean.
+   *
+   * @param ecCurve the ec curve
+   * @return the boolean
+   */
+  public static boolean isValidType(final String ecCurve) {
+    return SUPPORTED_ALGORITHMS.containsKey(ecCurve);
+  }
+
+  /**
+   * Is default signature algorithm.
+   *
+   * @param signatureAlgorithm the signature algorithm
+   * @return the boolean
+   */
+  public static boolean isDefault(final SignatureAlgorithm signatureAlgorithm) {
+    return signatureAlgorithm.getCurveName().equals(DEFAULT_EC_CURVE_NAME);
+  }
+
+  private static String invalidTypeErrorMessage(final String invalidEcCurve) {
+    return new StringBuilder()
+        .append(invalidEcCurve)
+        .append(" is not in the list of valid elliptic curves ")
+        .append(getEcCurvesListAsString())
+        .toString();
+  }
+
+  private static String getEcCurvesListAsString() {
+    Iterator<Map.Entry<String, Supplier<SignatureAlgorithm>>> it =
+        SUPPORTED_ALGORITHMS.entrySet().iterator();
+
+    StringBuilder ecCurveListBuilder = new StringBuilder();
+    ecCurveListBuilder.append("[");
+
+    while (it.hasNext()) {
+      ecCurveListBuilder.append(it.next().getKey());
+
+      if (it.hasNext()) {
+        ecCurveListBuilder.append(", ");
+      }
+    }
+    ecCurveListBuilder.append("]");
+
+    return ecCurveListBuilder.toString();
+  }
+}
diff --git a/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AbstractFieldPoint.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/AbstractFieldPoint.java
similarity index 92%
rename from crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AbstractFieldPoint.java
rename to crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/AbstractFieldPoint.java
index 7b00ab4575d..5ca6ded662a 100644
--- a/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AbstractFieldPoint.java
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/AbstractFieldPoint.java
@@ -22,26 +22,48 @@
 /**
  * Adapted from the pc_ecc (Apache 2 License) implementation:
  * https://github.com/ethereum/py_ecc/blob/master/py_ecc/bn128/bn128_field_elements.py
+ *
+ * @param <U> the type parameter
  */
 @SuppressWarnings("rawtypes")
 public abstract class AbstractFieldPoint<U extends AbstractFieldPoint> implements FieldPoint<U> {
 
   private static final BigInteger TWO = BigInteger.valueOf(2);
 
+  /** The X. */
   @SuppressWarnings("rawtypes")
   protected final FieldElement x;
 
+  /** The Y. */
   @SuppressWarnings("rawtypes")
   protected final FieldElement y;
 
+  /**
+   * Instantiates a new Abstract field point.
+   *
+   * @param x the x
+   * @param y the y
+   */
   @SuppressWarnings("rawtypes")
   AbstractFieldPoint(final FieldElement x, final FieldElement y) {
     this.x = x;
     this.y = y;
   }
 
+  /**
+   * Infinity u.
+   *
+   * @return the u
+   */
   protected abstract U infinity();
 
+  /**
+   * New instance of generic type U.
+   *
+   * @param x the x
+   * @param y the y
+   * @return the U
+   */
   @SuppressWarnings("rawtypes")
   protected abstract U newInstance(final FieldElement x, final FieldElement y);
 
diff --git a/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AbstractFqp.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/AbstractFqp.java
similarity index 93%
rename from crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AbstractFqp.java
rename to crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/AbstractFqp.java
index 2e8e07ab13d..739952cbdb8 100644
--- a/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AbstractFqp.java
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/AbstractFqp.java
@@ -23,15 +23,27 @@
 /**
  * Adapted from the pc_ecc (Apache 2 License) implementation:
  * https://github.com/ethereum/py_ecc/blob/master/py_ecc/bn128/bn128_field_elements.py
+ *
+ * @param <T> the type parameter
  */
 @SuppressWarnings("rawtypes")
 public abstract class AbstractFqp<T extends AbstractFqp> implements FieldElement<T> {
   private static final BigInteger BIGINT_2 = BigInteger.valueOf(2);
 
+  /** The Degree. */
   protected final int degree;
+  /** The Modulus coefficients. */
   protected final Fq[] modulusCoefficients;
+  /** The Coefficients. */
   protected final Fq[] coefficients;
 
+  /**
+   * Instantiates a new Abstract fqp.
+   *
+   * @param degree the degree
+   * @param modulusCoefficients the modulus coefficients
+   * @param coefficients the coefficients
+   */
   protected AbstractFqp(final int degree, final Fq[] modulusCoefficients, final Fq[] coefficients) {
     if (degree != coefficients.length) {
       throw new IllegalArgumentException(
@@ -47,8 +59,19 @@ protected AbstractFqp(final int degree, final Fq[] modulusCoefficients, final Fq
     this.coefficients = coefficients;
   }
 
+  /**
+   * New instance t.
+   *
+   * @param coefficients the coefficients
+   * @return the t
+   */
   protected abstract T newInstance(final Fq[] coefficients);
 
+  /**
+   * Get coefficients fq [ ].
+   *
+   * @return the fq [ ]
+   */
   public Fq[] getCoefficients() {
     return coefficients;
   }
@@ -173,6 +196,11 @@ public T power(final BigInteger n) {
     }
   }
 
+  /**
+   * Inverse fq [ ].
+   *
+   * @return the fq [ ]
+   */
   protected Fq[] inverse() {
     Fq[] lm = lm();
     Fq[] hm = hm();
diff --git a/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12Pairer.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12Pairer.java
similarity index 95%
rename from crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12Pairer.java
rename to crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12Pairer.java
index 483786dfe19..40e0073134e 100644
--- a/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12Pairer.java
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12Pairer.java
@@ -33,6 +33,13 @@ public class AltBn128Fq12Pairer {
       new BigInteger(
           "21888242871839275222246405745257275088548364400416034343698204186575808495617");
 
+  /**
+   * Pair fq 12.
+   *
+   * @param p the p
+   * @param q the q
+   * @return the fq 12
+   */
   public static Fq12 pair(final AltBn128Point p, final AltBn128Fq2Point q) {
     return millerLoop(cast(p), twist(q));
   }
@@ -78,6 +85,12 @@ private static Fq12 millerLoop(final AltBn128Fq12Point p, final AltBn128Fq12Poin
     return f;
   }
 
+  /**
+   * Finalize fq 12.
+   *
+   * @param f the f
+   * @return the fq 12
+   */
   public static Fq12 finalize(final Fq12 f) {
     return f.power(FieldElement.FIELD_MODULUS.pow(12).subtract(BigInteger.ONE).divide(CURVE_ORDER));
   }
diff --git a/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12Point.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12Point.java
similarity index 85%
rename from crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12Point.java
rename to crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12Point.java
index ef49c81b464..c873484850b 100644
--- a/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12Point.java
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12Point.java
@@ -22,10 +22,21 @@
  */
 public class AltBn128Fq12Point extends AbstractFieldPoint<AltBn128Fq12Point> {
 
+  /**
+   * G 12 alt bn 128 fq 12 point.
+   *
+   * @return the alt bn 128 fq 12 point
+   */
   public static AltBn128Fq12Point g12() {
     return twist(AltBn128Fq2Point.g2());
   }
 
+  /**
+   * Twist alt bn 128 fq 12 point.
+   *
+   * @param p the p
+   * @return the alt bn 128 fq 12 point
+   */
   public static AltBn128Fq12Point twist(final AltBn128Fq2Point p) {
     final Fq2 x = p.getX();
     final Fq2 y = p.getY();
@@ -52,14 +63,30 @@ private static Fq12 w() {
     return Fq12.create(0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
   }
 
+  /**
+   * Instantiates a new Alt bn 128 fq 12 point.
+   *
+   * @param x the x
+   * @param y the y
+   */
   public AltBn128Fq12Point(final Fq12 x, final Fq12 y) {
     super(x, y);
   }
 
+  /**
+   * Gets x.
+   *
+   * @return the x
+   */
   public Fq12 getX() {
     return (Fq12) x;
   }
 
+  /**
+   * Gets y.
+   *
+   * @return the y
+   */
   public Fq12 getY() {
     return (Fq12) y;
   }
diff --git a/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq2Point.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq2Point.java
similarity index 85%
rename from crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq2Point.java
rename to crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq2Point.java
index 2285ba8e0c2..e078556c14b 100644
--- a/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq2Point.java
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq2Point.java
@@ -25,6 +25,11 @@ public class AltBn128Fq2Point extends AbstractFieldPoint<AltBn128Fq2Point> {
       new BigInteger(
           "21888242871839275222246405745257275088548364400416034343698204186575808495617", 10);
 
+  /**
+   * G 2 alt bn 128 fq 2 point.
+   *
+   * @return the alt bn 128 fq 2 point
+   */
   public static AltBn128Fq2Point g2() {
     final Fq2 x =
         Fq2.create(
@@ -41,14 +46,30 @@ public static AltBn128Fq2Point g2() {
     return new AltBn128Fq2Point(x, y);
   }
 
+  /**
+   * Instantiates a new Alt bn 128 fq 2 point.
+   *
+   * @param x the x
+   * @param y the y
+   */
   public AltBn128Fq2Point(final Fq2 x, final Fq2 y) {
     super(x, y);
   }
 
+  /**
+   * Gets x.
+   *
+   * @return the x
+   */
   public Fq2 getX() {
     return (Fq2) x;
   }
 
+  /**
+   * Gets y.
+   *
+   * @return the y
+   */
   public Fq2 getY() {
     return (Fq2) y;
   }
@@ -58,6 +79,11 @@ protected AltBn128Fq2Point infinity() {
     return new AltBn128Fq2Point(Fq2.zero(), Fq2.zero());
   }
 
+  /**
+   * Is on curve boolean.
+   *
+   * @return the boolean
+   */
   public boolean isOnCurve() {
     if (!x.isValid() || !y.isValid()) {
       return false;
@@ -73,6 +99,11 @@ public boolean isOnCurve() {
     return y.power(2).subtract(x.power(3)).equals(Fq2.b2());
   }
 
+  /**
+   * Is in group boolean.
+   *
+   * @return the boolean
+   */
   public boolean isInGroup() {
     return multiply(CURVE_ORDER).isInfinity();
   }
diff --git a/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Point.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Point.java
similarity index 82%
rename from crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Point.java
rename to crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Point.java
index 430296c0958..77c94879726 100644
--- a/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Point.java
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/AltBn128Point.java
@@ -20,26 +20,54 @@
  */
 public class AltBn128Point extends AbstractFieldPoint<AltBn128Point> {
 
+  /** The B. */
   static final Fq B = Fq.create(3);
 
+  /**
+   * G 1 alt bn 128 point.
+   *
+   * @return the alt bn 128 point
+   */
   public static final AltBn128Point g1() {
     return new AltBn128Point(Fq.create(1), Fq.create(2));
   }
 
+  /** The Infinity. */
   static final AltBn128Point INFINITY = new AltBn128Point(Fq.zero(), Fq.zero());
 
+  /**
+   * Instantiates a new Alt bn 128 point.
+   *
+   * @param x the x
+   * @param y the y
+   */
   public AltBn128Point(final Fq x, final Fq y) {
     super(x, y);
   }
 
+  /**
+   * Gets x.
+   *
+   * @return the x
+   */
   public Fq getX() {
     return (Fq) x;
   }
 
+  /**
+   * Gets y.
+   *
+   * @return the y
+   */
   public Fq getY() {
     return (Fq) y;
   }
 
+  /**
+   * Is on curve boolean.
+   *
+   * @return the boolean
+   */
   @SuppressWarnings({"unchecked", "rawtypes"})
   public boolean isOnCurve() {
     if (!x.isValid() || !y.isValid()) {
diff --git a/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/FieldElement.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/FieldElement.java
new file mode 100644
index 00000000000..9710bd9ccae
--- /dev/null
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/FieldElement.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto.altbn128;
+
+import java.math.BigInteger;
+
+/**
+ * Adapted from the pc_ecc (Apache 2 License) implementation:
+ * https://github.com/ethereum/py_ecc/blob/master/py_ecc/bn128/bn128_field_elements.py
+ *
+ * @param <T> the type parameter
+ */
+@SuppressWarnings("rawtypes")
+public interface FieldElement<T extends FieldElement> {
+
+  /** The constant FIELD_MODULUS. */
+  BigInteger FIELD_MODULUS =
+      new BigInteger(
+          "21888242871839275222246405745257275088696311157297823662689037894645226208583");
+
+  /**
+   * Is valid boolean.
+   *
+   * @return the boolean
+   */
+  boolean isValid();
+
+  /**
+   * Is zero boolean.
+   *
+   * @return the boolean
+   */
+  boolean isZero();
+
+  /**
+   * Add t.
+   *
+   * @param other the other
+   * @return the t
+   */
+  T add(T other);
+
+  /**
+   * Subtract t.
+   *
+   * @param other the other
+   * @return the t
+   */
+  T subtract(T other);
+
+  /**
+   * Multiply t.
+   *
+   * @param val the val
+   * @return the t
+   */
+  T multiply(int val);
+
+  /**
+   * Multiply t.
+   *
+   * @param other the other
+   * @return the t
+   */
+  T multiply(T other);
+
+  /**
+   * Negate t.
+   *
+   * @return the t
+   */
+  T negate();
+
+  /**
+   * Divide t.
+   *
+   * @param other the other
+   * @return the t
+   */
+  T divide(T other);
+
+  /**
+   * Power t.
+   *
+   * @param n the n
+   * @return the t
+   */
+  T power(int n);
+
+  /**
+   * Power t.
+   *
+   * @param n the n
+   * @return the t
+   */
+  T power(BigInteger n);
+}
diff --git a/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/FieldPoint.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/FieldPoint.java
new file mode 100644
index 00000000000..b36dd5c07d1
--- /dev/null
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/FieldPoint.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto.altbn128;
+
+import java.math.BigInteger;
+
+/**
+ * Adapted from the pc_ecc (Apache 2 License) implementation:
+ * https://github.com/ethereum/py_ecc/blob/master/py_ecc/bn128/bn128_field_elements.py
+ *
+ * @param <T> the type parameter
+ */
+@SuppressWarnings("rawtypes")
+public interface FieldPoint<T extends FieldPoint> {
+
+  /**
+   * Is infinity boolean.
+   *
+   * @return the boolean
+   */
+  boolean isInfinity();
+
+  /**
+   * Add t.
+   *
+   * @param other the other
+   * @return the t
+   */
+  T add(T other);
+
+  /**
+   * Multiply t.
+   *
+   * @param other the other
+   * @return the t
+   */
+  T multiply(T other);
+
+  /**
+   * Multiply t.
+   *
+   * @param n the n
+   * @return the t
+   */
+  T multiply(BigInteger n);
+
+  /**
+   * Doub t.
+   *
+   * @return the t
+   */
+  T doub();
+
+  /**
+   * Negate t.
+   *
+   * @return the t
+   */
+  T negate();
+}
diff --git a/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq.java
similarity index 92%
rename from crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq.java
rename to crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq.java
index 9858f4f7b5d..1e8ddef5175 100644
--- a/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq.java
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq.java
@@ -28,20 +28,42 @@ public class Fq implements FieldElement<Fq> {
 
   private static final BigInteger TWO = BigInteger.valueOf(2);
 
+  /**
+   * fq that represents 0.
+   *
+   * @return the fq
+   */
   public static Fq zero() {
     return create(0);
   }
 
+  /**
+   * fq that represents 1.
+   *
+   * @return the fq
+   */
   public static Fq one() {
     return create(1);
   }
 
   private final BigInteger n;
 
+  /**
+   * Create fq.
+   *
+   * @param n the n
+   * @return the fq
+   */
   public static Fq create(final BigInteger n) {
     return new Fq(n);
   }
 
+  /**
+   * Create fq.
+   *
+   * @param n the n
+   * @return the fq
+   */
   static Fq create(final long n) {
     return create(BigInteger.valueOf(n));
   }
@@ -50,6 +72,11 @@ private Fq(final BigInteger n) {
     this.n = n;
   }
 
+  /**
+   * To bytes.
+   *
+   * @return the bytes
+   */
   public Bytes toBytes() {
     return Bytes.wrap(n.toByteArray()).trimLeadingZeros();
   }
diff --git a/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq12.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq12.java
similarity index 79%
rename from crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq12.java
rename to crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq12.java
index 2aaa2012d33..e36093581e9 100644
--- a/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq12.java
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq12.java
@@ -20,12 +20,23 @@
  */
 public class Fq12 extends AbstractFqp<Fq12> {
 
+  /** The constant DEGREE. */
   public static final int DEGREE = 12;
 
+  /**
+   * Zero fq 12.
+   *
+   * @return the fq 12
+   */
   static final Fq12 zero() {
     return create(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
   }
 
+  /**
+   * One fq 12.
+   *
+   * @return the fq 12
+   */
   public static final Fq12 one() {
     return create(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
   }
@@ -46,6 +57,23 @@ public static final Fq12 one() {
         Fq.create(0)
       };
 
+  /**
+   * Create fq 12.
+   *
+   * @param c0 the c 0
+   * @param c1 the c 1
+   * @param c2 the c 2
+   * @param c3 the c 3
+   * @param c4 the c 4
+   * @param c5 the c 5
+   * @param c6 the c 6
+   * @param c7 the c 7
+   * @param c8 the c 8
+   * @param c9 the c 9
+   * @param c10 the c 10
+   * @param c11 the c 11
+   * @return the fq 12
+   */
   public static Fq12 create(
       final long c0,
       final long c1,
@@ -74,6 +102,11 @@ public static Fq12 create(
         Fq.create(c11));
   }
 
+  /**
+   * Instantiates a new Fq 12.
+   *
+   * @param coefficients the coefficients
+   */
   protected Fq12(final Fq... coefficients) {
     super(DEGREE, MODULUS_COEFFICIENTS, coefficients);
   }
diff --git a/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq2.java b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq2.java
similarity index 83%
rename from crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq2.java
rename to crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq2.java
index 4244eb2e89c..e41502bdb76 100644
--- a/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq2.java
+++ b/crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/altbn128/Fq2.java
@@ -24,20 +24,44 @@ public class Fq2 extends AbstractFqp<Fq2> {
 
   private static final int DEGREE = 2;
 
+  /**
+   * Zero fq2.
+   *
+   * @return the fq2
+   */
   static final Fq2 zero() {
     return new Fq2(new Fq[] {Fq.zero(), Fq.zero()});
   }
 
+  /**
+   * One fq2.
+   *
+   * @return the fq2
+   */
   static final Fq2 one() {
     return new Fq2(new Fq[] {Fq.one(), Fq.zero()});
   }
 
   private static final Fq[] MODULUS_COEFFICIENTS = new Fq[] {Fq.create(1), Fq.create(0)};
 
+  /**
+   * Create fq2.
+   *
+   * @param c0 the c0
+   * @param c1 the c1
+   * @return the fq2
+   */
   public static final Fq2 create(final long c0, final long c1) {
     return create(BigInteger.valueOf(c0), BigInteger.valueOf((c1)));
   }
 
+  /**
+   * Create fq2.
+   *
+   * @param c0 the c0
+   * @param c1 the c1
+   * @return the fq2
+   */
   public static final Fq2 create(final BigInteger c0, final BigInteger c1) {
     return new Fq2(Fq.create(c0), Fq.create(c1));
   }
@@ -46,6 +70,11 @@ private Fq2(final Fq... coefficients) {
     super(DEGREE, MODULUS_COEFFICIENTS, coefficients);
   }
 
+  /**
+   * b2 Fq2.
+   *
+   * @return the Fq2
+   */
   public static Fq2 b2() {
     final Fq2 numerator = create(3, 0);
     final Fq2 denominator = create(9, 1);
diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/Blake2bfMessageDigestTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/Blake2bfMessageDigestTest.java
new file mode 100644
index 00000000000..bd00dc7dae1
--- /dev/null
+++ b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/Blake2bfMessageDigestTest.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.bouncycastle.util.Pack;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvFileSource;
+
+/**
+ * Test vectors adapted from
+ * https://github.com/keep-network/blake2b/blob/master/compression/f_test.go
+ */
+public class Blake2bfMessageDigestTest {
+
+  private Blake2bfMessageDigest messageDigest;
+
+  // output when input is all 0
+  private static final byte[] BLAKE2F_ALL_ZERO =
+      new byte[] {
+        8, -55, -68, -13, 103, -26, 9, 106, 59, -89, -54, -124, -123, -82, 103, -69, 43, -8, -108,
+        -2, 114, -13, 110, 60, -15, 54, 29, 95, 58, -11, 79, -91, -47, -126, -26, -83, 127, 82, 14,
+        81, 31, 108, 62, 43, -116, 104, 5, -101, 107, -67, 65, -5, -85, -39, -125, 31, 121, 33, 126,
+        19, 25, -51, -32, 91
+      };
+
+  // output when input is all 0 for 4294967295 rounds
+  private static final byte[] BLAKE2F_ALL_ZERO_NEGATIVE_ROUNDS =
+      new byte[] {
+        -111, -99, -124, 115, 29, 109, 127, 118, 18, 21, 75, -89, 60, 35, 112, 81, 110, 78, -8, 40,
+        -102, 19, -73, -97, 57, 69, 69, -89, 83, 66, 124, -43, -92, 78, 115, 115, 117, 123, -105,
+        -25, 25, -74, -1, -94, -127, 14, 87, 123, -26, 84, -75, -82, -78, 54, 48, -125, 38, -58, 7,
+        -61, 120, -93, -42, -38
+      };
+
+  @BeforeEach
+  public void setUp() {
+    messageDigest = new Blake2bfMessageDigest();
+  }
+
+  @Test
+  public void digestIfUpdatedCorrectlyWithBytes() {
+    for (int i = 0; i < 213; i++) {
+      messageDigest.update((byte) 0);
+    }
+    assertThat(messageDigest.digest()).isEqualTo(BLAKE2F_ALL_ZERO);
+  }
+
+  @Test
+  public void digestIfUpdatedCorrectlyWithByteArray() {
+    final byte[] update = new byte[213];
+    messageDigest.update(update, 0, 213);
+    assertThat(messageDigest.digest()).isEqualTo(BLAKE2F_ALL_ZERO);
+  }
+
+  @Test
+  public void digestIfUpdatedCorrectlyMixed() {
+    final byte[] update = new byte[213];
+    messageDigest.update((byte) 0);
+    messageDigest.update(update, 2, 211);
+    messageDigest.update((byte) 0);
+    assertThat(messageDigest.digest()).isEqualTo(BLAKE2F_ALL_ZERO);
+  }
+
+  @Test
+  public void digestWithMaxRounds() {
+    // equal to unsigned int max value (4294967295, or signed -1)
+    final byte[] rounds = Pack.intToBigEndian(Integer.MIN_VALUE);
+    messageDigest.update(rounds, 0, 4);
+    messageDigest.update(new byte[213], 0, 209);
+    assertThat(messageDigest.digest()).isEqualTo(BLAKE2F_ALL_ZERO_NEGATIVE_ROUNDS);
+  }
+
+  @Test
+  public void throwsIfBufferUpdatedWithLessThat213Bytes() {
+    for (int i = 0; i < 212; i++) {
+      messageDigest.update((byte) 0);
+    }
+    assertThatThrownBy(() -> messageDigest.digest()).isInstanceOf(IllegalStateException.class);
+  }
+
+  @Test
+  public void throwsIfBufferUpdatedWithMoreThat213Bytes() {
+    assertThatThrownBy(
+            () -> {
+              for (int i = 0; i < 214; i++) {
+                messageDigest.update((byte) 0);
+              }
+            })
+        .isInstanceOf(IllegalArgumentException.class);
+  }
+
+  @Test
+  public void throwsIfBufferUpdatedLargeByteArray() {
+    final byte[] update = new byte[213];
+    messageDigest.update((byte) 0);
+    assertThatThrownBy(() -> messageDigest.update(update, 0, 213))
+        .isInstanceOf(IllegalArgumentException.class);
+  }
+
+  @Test
+  public void throwsIfEmptyBufferUpdatedLargeByteArray() {
+    assertThatThrownBy(
+            () -> {
+              final byte[] update = new byte[214];
+              messageDigest.update(update, 0, 214);
+            })
+        .isInstanceOf(IllegalArgumentException.class);
+  }
+
+  @ParameterizedTest
+  @CsvFileSource(resources = "eip152TestCases.csv", numLinesToSkip = 1)
+  public void eip152TestCases(final String hexIn, final String hexExpected) {
+    System.out.println("in=" + hexIn);
+    byte[] in = hexStringToByteArray(hexIn);
+    byte[] expected = hexStringToByteArray(hexExpected);
+    messageDigest.update(in, 0, 213);
+    assertThat(messageDigest.digest()).isEqualTo(expected);
+  }
+
+  private static byte[] hexStringToByteArray(final String s) {
+    int len = s.length();
+    byte[] data = new byte[len / 2];
+    for (int i = 0; i < len; i += 2) {
+      data[i / 2] =
+          (byte) ((Character.digit(s.charAt(i), 16) << 4) + Character.digit(s.charAt(i + 1), 16));
+    }
+    return data;
+  }
+}
diff --git a/crypto/src/test/java/org/hyperledger/besu/crypto/ECPointUtilTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/ECPointUtilTest.java
similarity index 100%
rename from crypto/src/test/java/org/hyperledger/besu/crypto/ECPointUtilTest.java
rename to crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/ECPointUtilTest.java
diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/HashTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/HashTest.java
new file mode 100644
index 00000000000..a2d8318e120
--- /dev/null
+++ b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/HashTest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.bouncycastle.util.encoders.Hex;
+import org.junit.Test;
+
+public class HashTest {
+
+  private static final String cowKeccak256 =
+      "c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4";
+  private static final String horseKeccak256 =
+      "c87f65ff3f271bf5dc8643484f66b200109caffe4bf98c4cb393dc35740b28c0";
+
+  private static final String cowSha256 =
+      "beb134754910a4b4790c69ab17d3975221f4c534b70c8d6e82b30c165e8c0c09";
+  private static final String horseSha256 =
+      "fd62862b6dc213bee77c2badd6311528253c6cb3107e03c16051aa15584eca1c";
+
+  private static final String cowRipemd160 = "7e72ea7f1d397cca847d1393f744536b2ce99693";
+  private static final String horseRipemd160 = "79a19669bea55f3b2f67038155755fb0a68999ba";
+
+  private static final String inputBlake2bf =
+      "000000016a09e667f2bd8948bb67ae8584caa73b3c6ef372fe94f82ba54ff53a5f1d36f1510e527fade682d19b05688c2b3e6c1f1f83d9abfb41bd6b5be0cd19137e217907060504030201000f0e0d0c0b0a090817161514131211101f1e1d1c1b1a191827262524232221202f2e2d2c2b2a292837363534333231303f3e3d3c3b3a3938000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000001";
+
+  private static final String outputBlake2bf =
+      "bd45dd07a6eac13eec520b6aac885a1a89ea882978ae1a07472cc3e8cd358fd1a4d431c1a7d03f4a2bf746506779a970bfc5477026701076eda181e16acc24bc";
+
+  /** Validate keccak256 hash. */
+  @Test
+  public void keccak256Hash() {
+    final Bytes resultHorse = Hash.keccak256(Bytes.wrap("horse".getBytes(UTF_8)));
+    assertThat(resultHorse).isEqualTo(Bytes.fromHexString(horseKeccak256));
+
+    final Bytes resultCow = Hash.keccak256(Bytes.wrap("cow".getBytes(UTF_8)));
+    assertThat(resultCow).isEqualTo(Bytes.fromHexString(cowKeccak256));
+  }
+
+  /** Validate sha256 hash. */
+  @Test
+  public void sha256Hash() {
+    final Bytes resultHorse = Hash.sha256(Bytes.wrap("horse".getBytes(UTF_8)));
+    assertThat(resultHorse).isEqualTo(Bytes.fromHexString(horseSha256));
+
+    final Bytes resultCow = Hash.sha256(Bytes.wrap("cow".getBytes(UTF_8)));
+    assertThat(resultCow).isEqualTo(Bytes.fromHexString(cowSha256));
+  }
+
+  /** Validate ripemd160 hash. */
+  @Test
+  public void ripemd160Hash() {
+    final Bytes resultHorse = Hash.ripemd160(Bytes.wrap("horse".getBytes(UTF_8)));
+    assertThat(resultHorse).isEqualTo(Bytes.fromHexString(horseRipemd160));
+
+    final Bytes resultCow = Hash.ripemd160(Bytes.wrap("cow".getBytes(UTF_8)));
+    assertThat(resultCow).isEqualTo(Bytes.fromHexString(cowRipemd160));
+  }
+
+  /** Validate blake2f compression digest. */
+  @Test
+  public void blake2bfCompression() {
+    final Bytes result = Hash.blake2bf(Bytes.wrap(Hex.decode(inputBlake2bf)));
+    assertThat(result).isEqualTo(Bytes.fromHexString(outputBlake2bf));
+  }
+}
diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/KeyPairTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/KeyPairTest.java
new file mode 100644
index 00000000000..a8c1ac7e8f0
--- /dev/null
+++ b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/KeyPairTest.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto;
+
+import static org.apache.tuweni.bytes.Bytes.fromHexString;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.math.BigInteger;
+import java.security.KeyPairGenerator;
+import java.security.Security;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.bouncycastle.asn1.sec.SECNamedCurves;
+import org.bouncycastle.asn1.x9.X9ECParameters;
+import org.bouncycastle.crypto.params.ECDomainParameters;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class KeyPairTest {
+  public static final String ALGORITHM = SignatureAlgorithm.ALGORITHM;
+  public static final String PROVIDER = "BC";
+  public static final String CURVE_NAME = "secp256k1";
+
+  public static KeyPairGenerator keyPairGenerator;
+  public static ECDomainParameters curve;
+
+  @BeforeClass
+  public static void setUp() {
+    Security.addProvider(new BouncyCastleProvider());
+
+    try {
+      keyPairGenerator = KeyPairGenerator.getInstance(ALGORITHM, PROVIDER);
+    } catch (final Exception e) {
+      throw new RuntimeException(e);
+    }
+
+    final X9ECParameters params = SECNamedCurves.getByName(CURVE_NAME);
+    curve = new ECDomainParameters(params.getCurve(), params.getG(), params.getN(), params.getH());
+  }
+
+  @Test
+  public void createKeyPair_PublicKeyNull() {
+    final SECPPublicKey publicKey = SECPPublicKey.create(Bytes.wrap(new byte[64]), ALGORITHM);
+    assertThatThrownBy(() -> new KeyPair(null, publicKey)).isInstanceOf(NullPointerException.class);
+  }
+
+  @Test
+  public void createKeyPair_PrivateKeyNull() {
+    final SECPPrivateKey privateKey = SECPPrivateKey.create(Bytes32.wrap(new byte[32]), ALGORITHM);
+    assertThatThrownBy(() -> new KeyPair(privateKey, null))
+        .isInstanceOf(NullPointerException.class);
+  }
+
+  @Test
+  public void keyPairGeneration() {
+    final KeyPair keyPair = KeyPair.generate(keyPairGenerator, ALGORITHM);
+    assertThat(keyPair).isNotNull();
+    assertThat(keyPair.getPrivateKey()).isNotNull();
+    assertThat(keyPair.getPublicKey()).isNotNull();
+  }
+
+  @Test
+  public void keyPairEquals() {
+    final SECPPrivateKey privateKey1 = SECPPrivateKey.create(BigInteger.TEN, ALGORITHM);
+    final SECPPrivateKey privateKey2 = SECPPrivateKey.create(BigInteger.TEN, ALGORITHM);
+    final SECPPublicKey publicKey1 =
+        SECPPublicKey.create(
+            fromHexString(
+                "a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7893aba425419bc27a3b6c7e693a24c696f794c2ed877a1593cbee53b037368d7"),
+            ALGORITHM);
+    final SECPPublicKey publicKey2 =
+        SECPPublicKey.create(
+            fromHexString(
+                "a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7893aba425419bc27a3b6c7e693a24c696f794c2ed877a1593cbee53b037368d7"),
+            ALGORITHM);
+
+    final KeyPair keyPair1 = new KeyPair(privateKey1, publicKey1);
+    final KeyPair keyPair2 = new KeyPair(privateKey2, publicKey2);
+
+    assertThat(keyPair2).isEqualTo(keyPair1);
+  }
+
+  @Test
+  public void keyPairHashCode() {
+    final KeyPair keyPair = KeyPair.generate(keyPairGenerator, ALGORITHM);
+    assertThat(keyPair.hashCode()).isNotZero();
+  }
+}
diff --git a/crypto/src/test/java/org/hyperledger/besu/crypto/KeyPairUtilTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/KeyPairUtilTest.java
similarity index 79%
rename from crypto/src/test/java/org/hyperledger/besu/crypto/KeyPairUtilTest.java
rename to crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/KeyPairUtilTest.java
index 687ff1829c8..13c78d52bdc 100644
--- a/crypto/src/test/java/org/hyperledger/besu/crypto/KeyPairUtilTest.java
+++ b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/KeyPairUtilTest.java
@@ -15,6 +15,7 @@
 package org.hyperledger.besu.crypto;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.io.File;
 
@@ -30,9 +31,10 @@ public void shouldLoadValidKeyPair() throws Exception {
         .isNotNull();
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void shouldNotLoadInvalidKeyPair() throws Exception {
-    KeyPairUtil.loadKeyPair(
-        new File(this.getClass().getResource("/invalidPrivateKey.txt").toURI()));
+    final File keyFile = new File(this.getClass().getResource("/invalidPrivateKey.txt").toURI());
+    assertThatThrownBy(() -> KeyPairUtil.loadKeyPair(keyFile))
+        .isInstanceOf(IllegalArgumentException.class);
   }
 }
diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECP256K1Test.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECP256K1Test.java
new file mode 100644
index 00000000000..060bdad844b
--- /dev/null
+++ b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECP256K1Test.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hyperledger.besu.crypto.Hash.keccak256;
+
+import java.io.File;
+import java.math.BigInteger;
+import java.nio.file.Files;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class SECP256K1Test {
+
+  protected SECP256K1 secp256K1;
+
+  protected static String suiteStartTime = null;
+  protected static String suiteName = null;
+
+  @BeforeClass
+  public static void setTestSuiteStartTime() {
+    suiteStartTime =
+        LocalDateTime.now(ZoneId.systemDefault())
+            .format(DateTimeFormatter.ofPattern("yyyyMMdd-HHmmss"));
+    suiteName(SECP256K1Test.class);
+  }
+
+  @Before
+  public void setUp() {
+    secp256K1 = new SECP256K1();
+  }
+
+  public static void suiteName(final Class<?> clazz) {
+    suiteName = clazz.getSimpleName() + "-" + suiteStartTime;
+  }
+
+  public static String suiteName() {
+    return suiteName;
+  }
+
+  @Test
+  public void keyPairGeneration_PublicKeyRecovery() {
+    final KeyPair keyPair = secp256K1.generateKeyPair();
+    assertThat(secp256K1.createPublicKey(keyPair.getPrivateKey()))
+        .isEqualTo(keyPair.getPublicKey());
+  }
+
+  @Test
+  public void recoverPublicKeyFromSignature() {
+    final SECPPrivateKey privateKey =
+        secp256K1.createPrivateKey(
+            new BigInteger("c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4", 16));
+    final KeyPair keyPair = secp256K1.createKeyPair(privateKey);
+
+    final Bytes data = Bytes.wrap("This is an example of a signed message.".getBytes(UTF_8));
+    final Bytes32 dataHash = keccak256(data);
+    final SECPSignature signature = secp256K1.sign(dataHash, keyPair);
+
+    final SECPPublicKey recoveredPublicKey =
+        secp256K1.recoverPublicKeyFromSignature(dataHash, signature).get();
+    assertThat(recoveredPublicKey.toString()).isEqualTo(keyPair.getPublicKey().toString());
+  }
+
+  @Test
+  public void signatureGeneration() {
+    final SECPPrivateKey privateKey =
+        secp256K1.createPrivateKey(
+            new BigInteger("c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4", 16));
+    final KeyPair keyPair = secp256K1.createKeyPair(privateKey);
+
+    final Bytes data = Bytes.wrap("This is an example of a signed message.".getBytes(UTF_8));
+    final Bytes32 dataHash = keccak256(data);
+    final SECPSignature expectedSignature =
+        secp256K1.createSignature(
+            new BigInteger("d2ce488f4da29e68f22cb05cac1b19b75df170a12b4ad1bdd4531b8e9115c6fb", 16),
+            new BigInteger("75c1fe50a95e8ccffcbb5482a1e42fbbdd6324131dfe75c3b3b7f9a7c721eccb", 16),
+            (byte) 1);
+
+    final SECPSignature actualSignature = secp256K1.sign(dataHash, keyPair);
+    assertThat(actualSignature).isEqualTo(expectedSignature);
+  }
+
+  @Test
+  public void signatureVerification() {
+    final SECPPrivateKey privateKey =
+        secp256K1.createPrivateKey(
+            new BigInteger("c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4", 16));
+    final KeyPair keyPair = secp256K1.createKeyPair(privateKey);
+
+    final Bytes data = Bytes.wrap("This is an example of a signed message.".getBytes(UTF_8));
+    final Bytes32 dataHash = keccak256(data);
+
+    final SECPSignature signature = secp256K1.sign(dataHash, keyPair);
+    assertThat(secp256K1.verify(data, signature, keyPair.getPublicKey(), Hash::keccak256)).isTrue();
+  }
+
+  @Test
+  public void invalidFileThrowsInvalidKeyPairException() throws Exception {
+    final File tempFile = Files.createTempFile(suiteName(), ".keypair").toFile();
+    tempFile.deleteOnExit();
+    Files.write(tempFile.toPath(), "not valid".getBytes(UTF_8));
+    assertThatThrownBy(() -> KeyPairUtil.load(tempFile))
+        .isInstanceOf(IllegalArgumentException.class);
+  }
+
+  @Test
+  public void invalidMultiLineFileThrowsInvalidIdException() throws Exception {
+    final File tempFile = Files.createTempFile(suiteName(), ".keypair").toFile();
+    tempFile.deleteOnExit();
+    Files.write(tempFile.toPath(), "not\n\nvalid".getBytes(UTF_8));
+    assertThatThrownBy(() -> KeyPairUtil.load(tempFile))
+        .isInstanceOf(IllegalArgumentException.class);
+  }
+}
diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECP256R1Test.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECP256R1Test.java
new file mode 100644
index 00000000000..bd791ef9be3
--- /dev/null
+++ b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECP256R1Test.java
@@ -0,0 +1,208 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hyperledger.besu.crypto.Hash.keccak256;
+
+import java.io.File;
+import java.math.BigInteger;
+import java.nio.file.Files;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class SECP256R1Test {
+
+  private final List<SignTestVector> signTestVectors =
+      List.of(
+          new SignTestVector(
+              "519b423d715f8b581f4fa8ee59f4771a5b44c8130b4e3eacca54a56dda72b464",
+              "1ccbe91c075fc7f4f033bfa248db8fccd3565de94bbfb12f3c59ff46c271bf83ce4014c68811f9a21a1fdb2c0e6113e06db7ca93b7404e78dc7ccd5ca89a4ca9",
+              "5905238877c77421f73e43ee3da6f2d9e2ccad5fc942dcec0cbd25482935faaf416983fe165b1a045ee2bcd2e6dca3bdf46c4310a7461f9a37960ca672d3feb5473e253605fb1ddfd28065b53cb5858a8ad28175bf9bd386a5e471ea7a65c17cc934a9d791e91491eb3754d03799790fe2d308d16146d5c9b0d0debd97d79ce8"),
+          new SignTestVector(
+              "0f56db78ca460b055c500064824bed999a25aaf48ebb519ac201537b85479813",
+              "e266ddfdc12668db30d4ca3e8f7749432c416044f2d2b8c10bf3d4012aeffa8abfa86404a2e9ffe67d47c587ef7a97a7f456b863b4d02cfc6928973ab5b1cb39",
+              "c35e2f092553c55772926bdbe87c9796827d17024dbb9233a545366e2e5987dd344deb72df987144b8c6c43bc41b654b94cc856e16b96d7a821c8ec039b503e3d86728c494a967d83011a0e090b5d54cd47f4e366c0912bc808fbb2ea96efac88fb3ebec9342738e225f7c7c2b011ce375b56621a20642b4d36e060db4524af1"),
+          new SignTestVector(
+              "e283871239837e13b95f789e6e1af63bf61c918c992e62bca040d64cad1fc2ef",
+              "74ccd8a62fba0e667c50929a53f78c21b8ff0c3c737b0b40b1750b2302b0bde829074e21f3a0ef88b9efdf10d06aa4c295cc1671f758ca0e4cd108803d0f2614",
+              "3c054e333a94259c36af09ab5b4ff9beb3492f8d5b4282d16801daccb29f70fe61a0b37ffef5c04cd1b70e85b1f549a1c4dc672985e50f43ea037efa9964f096b5f62f7ffdf8d6bfb2cc859558f5a393cb949dbd48f269343b5263dcdb9c556eca074f2e98e6d94c2c29a677afaf806edf79b15a3fcd46e7067b7669f83188ee"),
+          new SignTestVector(
+              "a3d2d3b7596f6592ce98b4bfe10d41837f10027a90d7bb75349490018cf72d07",
+              "322f80371bf6e044bc49391d97c1714ab87f990b949bc178cb7c43b7c22d89e13c15d54a5cc6b9f09de8457e873eb3deb1fceb54b0b295da6050294fae7fd999",
+              "0989122410d522af64ceb07da2c865219046b4c3d9d99b01278c07ff63eaf1039cb787ae9e2dd46436cc0415f280c562bebb83a23e639e476a02ec8cff7ea06cd12c86dcc3adefbf1a9e9a9b6646c7599ec631b0da9a60debeb9b3e19324977f3b4f36892c8a38671c8e1cc8e50fcd50f9e51deaf98272f9266fc702e4e57c30"),
+          new SignTestVector(
+              "53a0e8a8fe93db01e7ae94e1a9882a102ebd079b3a535827d583626c272d280d",
+              "1bcec4570e1ec2436596b8ded58f60c3b1ebc6a403bc5543040ba829630572448af62a4c683f096b28558320737bf83b9959a46ad2521004ef74cf85e67494e1",
+              "dc66e39f9bbfd9865318531ffe9207f934fa615a5b285708a5e9c46b7775150e818d7f24d2a123df3672fff2094e3fd3df6fbe259e3989dd5edfcccbe7d45e26a775a5c4329a084f057c42c13f3248e3fd6f0c76678f890f513c32292dd306eaa84a59abe34b16cb5e38d0e885525d10336ca443e1682aa04a7af832b0eee4e7"),
+          new SignTestVector(
+              "4af107e8e2194c830ffb712a65511bc9186a133007855b49ab4b3833aefc4a1d",
+              "a32e50be3dae2c8ba3f5e4bdae14cf7645420d425ead94036c22dd6c4fc59e00d623bf641160c289d6742c6257ae6ba574446dd1d0e74db3aaa80900b78d4ae9",
+              "600974e7d8c5508e2c1aab0783ad0d7c4494ab2b4da265c2fe496421c4df238b0be25f25659157c8a225fb03953607f7df996acfd402f147e37aee2f1693e3bf1c35eab3ae360a2bd91d04622ea47f83d863d2dfecb618e8b8bdc39e17d15d672eee03bb4ce2cc5cf6b217e5faf3f336fdd87d972d3a8b8a593ba85955cc9d71"),
+          new SignTestVector(
+              "78dfaa09f1076850b3e206e477494cddcfb822aaa0128475053592c48ebaf4ab",
+              "8bcfe2a721ca6d753968f564ec4315be4857e28bef1908f61a366b1f03c974790f67576a30b8e20d4232d8530b52fb4c89cbc589ede291e499ddd15fe870ab96",
+              "dfa6cb9b39adda6c74cc8b2a8b53a12c499ab9dee01b4123642b4f11af336a91a5c9ce0520eb2395a6190ecbf6169c4cba81941de8e76c9c908eb843b98ce95e0da29c5d4388040264e05e07030a577cc5d176387154eabae2af52a83e85c61c7c61da930c9b19e45d7e34c8516dc3c238fddd6e450a77455d534c48a152010b"),
+          new SignTestVector(
+              "80e692e3eb9fcd8c7d44e7de9f7a5952686407f90025a1d87e52c7096a62618a",
+              "a88bc8430279c8c0400a77d751f26c0abc93e5de4ad9a4166357952fe041e7672d365a1eef25ead579cc9a069b6abc1b16b81c35f18785ce26a10ba6d1381185",
+              "51d2547cbff92431174aa7fc7302139519d98071c755ff1c92e4694b58587ea560f72f32fc6dd4dee7d22bb7387381d0256e2862d0644cdf2c277c5d740fa089830eb52bf79d1e75b8596ecf0ea58a0b9df61e0c9754bfcd62efab6ea1bd216bf181c5593da79f10135a9bc6e164f1854bc8859734341aad237ba29a81a3fc8b"),
+          new SignTestVector(
+              "5e666c0db0214c3b627a8e48541cc84a8b6fd15f300da4dff5d18aec6c55b881",
+              "1bc487570f040dc94196c9befe8ab2b6de77208b1f38bdaae28f9645c4d2bc3aec81602abd8345e71867c8210313737865b8aa186851e1b48eaca140320f5d8f",
+              "558c2ac13026402bad4a0a83ebc9468e50f7ffab06d6f981e5db1d082098065bcff6f21a7a74558b1e8612914b8b5a0aa28ed5b574c36ac4ea5868432a62bb8ef0695d27c1e3ceaf75c7b251c65ddb268696f07c16d2767973d85beb443f211e6445e7fe5d46f0dce70d58a4cd9fe70688c035688ea8c6baec65a5fc7e2c93e8"),
+          new SignTestVector(
+              "f73f455271c877c4d5334627e37c278f68d143014b0a05aa62f308b2101c5308",
+              "b8188bd68701fc396dab53125d4d28ea33a91daf6d21485f4770f6ea8c565dde423f058810f277f8fe076f6db56e9285a1bf2c2a1dae145095edd9c04970bc4a",
+              "4d55c99ef6bd54621662c3d110c3cb627c03d6311393b264ab97b90a4b15214a5593ba2510a53d63fb34be251facb697c973e11b665cb7920f1684b0031b4dd370cb927ca7168b0bf8ad285e05e9e31e34bc24024739fdc10b78586f29eff94412034e3b606ed850ec2c1900e8e68151fc4aee5adebb066eb6da4eaa5681378e"),
+          new SignTestVector(
+              "b20d705d9bd7c2b8dc60393a5357f632990e599a0975573ac67fd89b49187906",
+              "51f99d2d52d4a6e734484a018b7ca2f895c2929b6754a3a03224d07ae61166ce4737da963c6ef7247fb88d19f9b0c667cac7fe12837fdab88c66f10d3c14cad1",
+              "f8248ad47d97c18c984f1f5c10950dc1404713c56b6ea397e01e6dd925e903b4fadfe2c9e877169e71ce3c7fe5ce70ee4255d9cdc26f6943bf48687874de64f6cf30a012512e787b88059bbf561162bdcc23a3742c835ac144cc14167b1bd6727e940540a9c99f3cbb41fb1dcb00d76dda04995847c657f4c19d303eb09eb48a"),
+          new SignTestVector(
+              "d4234bebfbc821050341a37e1240efe5e33763cbbb2ef76a1c79e24724e5a5e7",
+              "8fb287f0202ad57ae841aea35f29b2e1d53e196d0ddd9aec24813d64c0922fb71f6daff1aa2dd2d6d3741623eecb5e7b612997a1039aab2e5cf2de969cfea573",
+              "3b6ee2425940b3d240d35b97b6dcd61ed3423d8e71a0ada35d47b322d17b35ea0472f35edd1d252f87b8b65ef4b716669fc9ac28b00d34a9d66ad118c9d94e7f46d0b4f6c2b2d339fd6bcd351241a387cc82609057048c12c4ec3d85c661975c45b300cb96930d89370a327c98b67defaa89497aa8ef994c77f1130f752f94a4"),
+          new SignTestVector(
+              "b58f5211dff440626bb56d0ad483193d606cf21f36d9830543327292f4d25d8c",
+              "68229b48c2fe19d3db034e4c15077eb7471a66031f28a980821873915298ba76303e8ee3742a893f78b810991da697083dd8f11128c47651c27a56740a80c24c",
+              "c5204b81ec0a4df5b7e9fda3dc245f98082ae7f4efe81998dcaa286bd4507ca840a53d21b01e904f55e38f78c3757d5a5a4a44b1d5d4e480be3afb5b394a5d2840af42b1b4083d40afbfe22d702f370d32dbfd392e128ea4724d66a3701da41ae2f03bb4d91bb946c7969404cb544f71eb7a49eb4c4ec55799bda1eb545143a7"),
+          new SignTestVector(
+              "54c066711cdb061eda07e5275f7e95a9962c6764b84f6f1f3ab5a588e0a2afb1",
+              "0a7dbb8bf50cb605eb2268b081f26d6b08e012f952c4b70a5a1e6e7d46af98bbf26dd7d799930062480849962ccf5004edcfd307c044f4e8f667c9baa834eeae",
+              "72e81fe221fb402148d8b7ab03549f1180bcc03d41ca59d7653801f0ba853add1f6d29edd7f9abc621b2d548f8dbf8979bd16608d2d8fc3260b4ebc0dd42482481d548c7075711b5759649c41f439fad69954956c9326841ea6492956829f9e0dc789f73633b40f6ac77bcae6dfc7930cfe89e526d1684365c5b0be2437fdb01"),
+          new SignTestVector(
+              "34fa4682bf6cb5b16783adcd18f0e6879b92185f76d7c920409f904f522db4b1",
+              "105d22d9c626520faca13e7ced382dcbe93498315f00cc0ac39c4821d0d737376c47f3cbbfa97dfcebe16270b8c7d5d3a5900b888c42520d751e8faf3b401ef4",
+              "21188c3edd5de088dacc1076b9e1bcecd79de1003c2414c3866173054dc82dde85169baa77993adb20c269f60a5226111828578bcc7c29e6e8d2dae81806152c8ba0c6ada1986a1983ebeec1473a73a04795b6319d48662d40881c1723a706f516fe75300f92408aa1dc6ae4288d2046f23c1aa2e54b7fb6448a0da922bd7f34"));
+
+  protected SECP256R1 secp256R1;
+
+  protected static String suiteStartTime = null;
+  protected static String suiteName = null;
+
+  @BeforeClass
+  public static void setTestSuiteStartTime() {
+    suiteStartTime =
+        LocalDateTime.now(ZoneId.systemDefault())
+            .format(DateTimeFormatter.ofPattern("yyyyMMdd-HHmmss"));
+    suiteName(SECP256R1Test.class);
+
+    SignatureAlgorithmFactory.setInstance(SignatureAlgorithmType.create("secp256r1"));
+  }
+
+  @Before
+  public void setUp() {
+    secp256R1 = new SECP256R1();
+  }
+
+  public static void suiteName(final Class<?> clazz) {
+    suiteName = clazz.getSimpleName() + "-" + suiteStartTime;
+  }
+
+  public static String suiteName() {
+    return suiteName;
+  }
+
+  @Test
+  public void recoverPublicKeyFromSignature() {
+    final SECPPrivateKey privateKey =
+        secp256R1.createPrivateKey(
+            new BigInteger("c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4", 16));
+    final KeyPair keyPair = secp256R1.createKeyPair(privateKey);
+
+    final Bytes data = Bytes.wrap("This is an example of a signed message.".getBytes(UTF_8));
+    final Bytes32 dataHash = keccak256(data);
+    final SECPSignature signature = secp256R1.sign(dataHash, keyPair);
+
+    final SECPPublicKey recoveredPublicKey =
+        secp256R1.recoverPublicKeyFromSignature(dataHash, signature).get();
+    assertThat(recoveredPublicKey.toString()).isEqualTo(keyPair.getPublicKey().toString());
+  }
+
+  @Test
+  public void signatureGenerationVerificationAndPubKeyRecovery() {
+    signTestVectors.forEach(
+        signTestVector -> {
+          final SECPPrivateKey privateKey =
+              secp256R1.createPrivateKey(new BigInteger(signTestVector.getPrivateKey(), 16));
+          final BigInteger publicKeyBigInt = new BigInteger(signTestVector.getPublicKey(), 16);
+          final SECPPublicKey publicKey = secp256R1.createPublicKey(publicKeyBigInt);
+          final KeyPair keyPair = secp256R1.createKeyPair(privateKey);
+
+          final Bytes32 dataHash = keccak256(Bytes.wrap(signTestVector.getData().getBytes(UTF_8)));
+
+          final SECPSignature signature = secp256R1.sign(dataHash, keyPair);
+          assertThat(secp256R1.verify(dataHash, signature, publicKey)).isTrue();
+
+          final BigInteger recoveredPubKeyBigInt =
+              secp256R1.recoverFromSignature(
+                  signature.getRecId(), signature.getR(), signature.getS(), dataHash);
+          assertThat(recoveredPubKeyBigInt).isEqualTo(recoveredPubKeyBigInt);
+        });
+  }
+
+  @Test
+  public void invalidFileThrowsInvalidKeyPairException() throws Exception {
+    final File tempFile = Files.createTempFile(suiteName(), ".keypair").toFile();
+    tempFile.deleteOnExit();
+    Files.write(tempFile.toPath(), "not valid".getBytes(UTF_8));
+    assertThatThrownBy(() -> KeyPairUtil.load(tempFile))
+        .isInstanceOf(IllegalArgumentException.class);
+  }
+
+  @Test
+  public void invalidMultiLineFileThrowsInvalidIdException() throws Exception {
+    final File tempFile = Files.createTempFile(suiteName(), ".keypair").toFile();
+    tempFile.deleteOnExit();
+    Files.write(tempFile.toPath(), "not\n\nvalid".getBytes(UTF_8));
+    assertThatThrownBy(() -> KeyPairUtil.load(tempFile))
+        .isInstanceOf(IllegalArgumentException.class);
+  }
+
+  private static class SignTestVector {
+    private final String privateKey;
+    private final String publicKey;
+    private final String data;
+
+    public SignTestVector(final String privateKey, final String publicKey, final String data) {
+      this.privateKey = privateKey;
+      this.publicKey = publicKey;
+      this.data = data;
+    }
+
+    public String getPrivateKey() {
+      return privateKey;
+    }
+
+    public String getPublicKey() {
+      return publicKey;
+    }
+
+    public String getData() {
+      return data;
+    }
+  }
+}
diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECPPrivateKeyTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECPPrivateKeyTest.java
new file mode 100644
index 00000000000..d99d4940915
--- /dev/null
+++ b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECPPrivateKeyTest.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.io.File;
+import java.math.BigInteger;
+import java.nio.file.Files;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.bouncycastle.asn1.sec.SECNamedCurves;
+import org.bouncycastle.asn1.x9.X9ECParameters;
+import org.bouncycastle.crypto.params.ECDomainParameters;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class SECPPrivateKeyTest {
+  public static final String ALGORITHM = SignatureAlgorithm.ALGORITHM;
+  public static final String CURVE_NAME = "secp256k1";
+
+  protected static String suiteStartTime = null;
+  protected static String suiteName = null;
+  public static ECDomainParameters curve;
+
+  @BeforeClass
+  public static void setUp() {
+    suiteStartTime =
+        LocalDateTime.now(ZoneId.systemDefault())
+            .format(DateTimeFormatter.ofPattern("yyyyMMdd-HHmmss"));
+    suiteName(SECP256K1Test.class);
+
+    final X9ECParameters params = SECNamedCurves.getByName(CURVE_NAME);
+    curve = new ECDomainParameters(params.getCurve(), params.getG(), params.getN(), params.getH());
+  }
+
+  public static void suiteName(final Class<?> clazz) {
+    suiteName = clazz.getSimpleName() + "-" + suiteStartTime;
+  }
+
+  @Test
+  public void createPrivateKey_NullEncoding() {
+    assertThatThrownBy(() -> SECPPrivateKey.create((Bytes32) null, ALGORITHM))
+        .isInstanceOf(NullPointerException.class);
+  }
+
+  @Test
+  public void privateKeyEquals() {
+    final SECPPrivateKey privateKey1 = SECPPrivateKey.create(BigInteger.TEN, ALGORITHM);
+    final SECPPrivateKey privateKey2 = SECPPrivateKey.create(BigInteger.TEN, ALGORITHM);
+
+    assertThat(privateKey2).isEqualTo(privateKey1);
+  }
+
+  @Test
+  public void privateHashCode() {
+    final SECPPrivateKey privateKey = SECPPrivateKey.create(BigInteger.TEN, ALGORITHM);
+
+    assertThat(privateKey.hashCode()).isNotZero();
+  }
+
+  @Test
+  public void fileContainsValidPrivateKey() throws Exception {
+    final File file =
+        new File(
+            this.getClass()
+                .getResource("/org/hyperledger/besu/crypto/validPrivateKey.txt")
+                .toURI());
+    final SECPPrivateKey privateKey = KeyPairUtil.loadPrivateKey(file);
+    assertThat(privateKey.getEncodedBytes())
+        .isEqualTo(
+            Bytes.fromHexString(
+                "000000000000000000000000000000000000000000000000000000000000000A"));
+  }
+
+  @Test
+  public void readWritePrivateKeyString() throws Exception {
+    final SECPPrivateKey privateKey = SECPPrivateKey.create(BigInteger.TEN, ALGORITHM);
+    final KeyPair keyPair1 = KeyPair.create(privateKey, curve, ALGORITHM);
+    final File tempFile = Files.createTempFile(suiteName, ".keypair").toFile();
+    tempFile.deleteOnExit();
+    KeyPairUtil.storeKeyPair(keyPair1, tempFile);
+    final KeyPair keyPair2 = KeyPairUtil.load(tempFile);
+    assertThat(keyPair2).isEqualTo(keyPair1);
+  }
+}
diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECPPublicKeyTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECPPublicKeyTest.java
new file mode 100644
index 00000000000..e5e9e6bb3a0
--- /dev/null
+++ b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECPPublicKeyTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto;
+
+import static org.apache.tuweni.bytes.Bytes.fromHexString;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.math.BigInteger;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.bouncycastle.asn1.sec.SECNamedCurves;
+import org.bouncycastle.asn1.x9.X9ECParameters;
+import org.bouncycastle.crypto.params.ECDomainParameters;
+import org.junit.Before;
+import org.junit.Test;
+
+public class SECPPublicKeyTest {
+  public static final String ALGORITHM = SignatureAlgorithm.ALGORITHM;
+  public static final String CURVE_NAME = "secp256k1";
+
+  public ECDomainParameters curve;
+
+  @Before
+  public void setUp() {
+    final X9ECParameters params = SECNamedCurves.getByName(CURVE_NAME);
+    curve = new ECDomainParameters(params.getCurve(), params.getG(), params.getN(), params.getH());
+  }
+
+  @Test
+  public void createPublicKey_NullEncoding() {
+    assertThatThrownBy(() -> SECPPublicKey.create((Bytes) null, ALGORITHM))
+        .isInstanceOf(NullPointerException.class);
+  }
+
+  @Test
+  public void createPublicKey_EncodingTooShort() {
+    final Bytes publicKey = Bytes.wrap(new byte[63]);
+    assertThatThrownBy(() -> SECPPublicKey.create(publicKey, ALGORITHM))
+        .isInstanceOf(IllegalArgumentException.class);
+  }
+
+  @Test
+  public void createPublicKey_EncodingTooLong() {
+    final Bytes publicKey = Bytes.wrap(new byte[65]);
+    assertThatThrownBy(() -> SECPPublicKey.create(publicKey, ALGORITHM))
+        .isInstanceOf(IllegalArgumentException.class);
+  }
+
+  @Test
+  public void publicKeyEquals() {
+    final SECPPublicKey publicKey1 =
+        SECPPublicKey.create(
+            fromHexString(
+                "a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7893aba425419bc27a3b6c7e693a24c696f794c2ed877a1593cbee53b037368d7"),
+            ALGORITHM);
+    final SECPPublicKey publicKey2 =
+        SECPPublicKey.create(
+            fromHexString(
+                "a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7893aba425419bc27a3b6c7e693a24c696f794c2ed877a1593cbee53b037368d7"),
+            ALGORITHM);
+
+    assertThat(publicKey2).isEqualTo(publicKey1);
+  }
+
+  @Test
+  public void publicHashCode() {
+    final SECPPublicKey publicKey =
+        SECPPublicKey.create(
+            fromHexString(
+                "a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7893aba425419bc27a3b6c7e693a24c696f794c2ed877a1593cbee53b037368d7"),
+            ALGORITHM);
+
+    assertThat(publicKey.hashCode()).isNotZero();
+  }
+
+  @Test
+  public void publicKeyRecovery() {
+    final SECPPrivateKey privateKey = SECPPrivateKey.create(BigInteger.TEN, ALGORITHM);
+    final SECPPublicKey expectedPublicKey =
+        SECPPublicKey.create(
+            fromHexString(
+                "a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7893aba425419bc27a3b6c7e693a24c696f794c2ed877a1593cbee53b037368d7"),
+            ALGORITHM);
+
+    final SECPPublicKey publicKey = SECPPublicKey.create(privateKey, curve, ALGORITHM);
+    assertThat(publicKey).isEqualTo(expectedPublicKey);
+  }
+}
diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECPSignatureTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECPSignatureTest.java
new file mode 100644
index 00000000000..a737a93f0b1
--- /dev/null
+++ b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SECPSignatureTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.math.BigInteger;
+
+import org.bouncycastle.asn1.sec.SECNamedCurves;
+import org.bouncycastle.asn1.x9.X9ECParameters;
+import org.bouncycastle.crypto.params.ECDomainParameters;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class SECPSignatureTest {
+  public static final String CURVE_NAME = "secp256k1";
+
+  public static BigInteger curveOrder;
+
+  @BeforeClass
+  public static void setUp() {
+    final X9ECParameters params = SECNamedCurves.getByName(CURVE_NAME);
+    final ECDomainParameters curve =
+        new ECDomainParameters(params.getCurve(), params.getG(), params.getN(), params.getH());
+    curveOrder = curve.getN();
+  }
+
+  @Test
+  public void createSignature() {
+    final SECPSignature signature =
+        SECPSignature.create(BigInteger.ONE, BigInteger.TEN, (byte) 0, curveOrder);
+    assertThat(signature.getR()).isEqualTo(BigInteger.ONE);
+    assertThat(signature.getS()).isEqualTo(BigInteger.TEN);
+    assertThat(signature.getRecId()).isEqualTo((byte) 0);
+  }
+
+  @Test
+  public void createSignature_NoR() {
+    assertThatThrownBy(() -> SECPSignature.create(null, BigInteger.ZERO, (byte) 27, curveOrder))
+        .isInstanceOf(NullPointerException.class);
+  }
+
+  @Test
+  public void createSignature_NoS() {
+    assertThatThrownBy(() -> SECPSignature.create(BigInteger.ZERO, null, (byte) 27, curveOrder))
+        .isInstanceOf(NullPointerException.class);
+  }
+}
diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SignatureAlgorithmFactoryTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SignatureAlgorithmFactoryTest.java
new file mode 100644
index 00000000000..38c71c99db8
--- /dev/null
+++ b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SignatureAlgorithmFactoryTest.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class SignatureAlgorithmFactoryTest {
+
+  @Before
+  public void setUp() {
+    SignatureAlgorithmFactory.resetInstance();
+  }
+
+  @Test
+  public void shouldReturnSECP256K1InstanceByDefault() {
+    SignatureAlgorithm signatureAlgorithm = SignatureAlgorithmFactory.getInstance();
+    assertThat(signatureAlgorithm.getClass().getSimpleName())
+        .isEqualTo(SECP256K1.class.getSimpleName());
+  }
+
+  @Test
+  public void shouldReturnSECP256K1InstanceWhenSet() {
+    SignatureAlgorithmFactory.setInstance(SignatureAlgorithmType.create("secp256k1"));
+
+    SignatureAlgorithm signatureAlgorithm = SignatureAlgorithmFactory.getInstance();
+    assertThat(signatureAlgorithm.getClass().getSimpleName())
+        .isEqualTo(SECP256K1.class.getSimpleName());
+  }
+
+  @Test
+  public void shouldThrowExceptionWhenSetMoreThanOnce() {
+    SignatureAlgorithmFactory.setInstance(SignatureAlgorithmType.create("secp256k1"));
+    assertThat(SignatureAlgorithmFactory.isInstanceSet()).isTrue();
+
+    assertThatThrownBy(
+            () -> SignatureAlgorithmFactory.setInstance(SignatureAlgorithmType.create("secp256k1")))
+        .isInstanceOf(RuntimeException.class);
+  }
+}
diff --git a/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SignatureAlgorithmTypeTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SignatureAlgorithmTypeTest.java
new file mode 100644
index 00000000000..faa0b5eeda7
--- /dev/null
+++ b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/SignatureAlgorithmTypeTest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.crypto;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+import org.junit.Test;
+
+public class SignatureAlgorithmTypeTest {
+  @Test
+  public void shouldReturnSECP256K1Instance() {
+    SignatureAlgorithmType signatureAlgorithmType = SignatureAlgorithmType.create("secp256k1");
+
+    assertThat(signatureAlgorithmType.getInstance().getClass().getSimpleName())
+        .isEqualTo(SECP256K1.class.getSimpleName());
+  }
+
+  @Test
+  public void shouldThrowExceptionWhenInvalidParameterIsGiven() {
+    assertThatThrownBy(() -> SignatureAlgorithmType.create("abcd"))
+        .hasMessage("abcd is not in the list of valid elliptic curves [secp256k1, secp256r1]");
+  }
+}
diff --git a/crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12PairerTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12PairerTest.java
similarity index 100%
rename from crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12PairerTest.java
rename to crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12PairerTest.java
diff --git a/crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12PointTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12PointTest.java
similarity index 100%
rename from crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12PointTest.java
rename to crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq12PointTest.java
diff --git a/crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq2PointTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq2PointTest.java
similarity index 100%
rename from crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq2PointTest.java
rename to crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128Fq2PointTest.java
diff --git a/crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128PointTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128PointTest.java
similarity index 100%
rename from crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128PointTest.java
rename to crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/AltBn128PointTest.java
diff --git a/crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/Fq12Test.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/Fq12Test.java
similarity index 100%
rename from crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/Fq12Test.java
rename to crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/Fq12Test.java
diff --git a/crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/Fq2Test.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/Fq2Test.java
similarity index 100%
rename from crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/Fq2Test.java
rename to crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/Fq2Test.java
diff --git a/crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/FqTest.java b/crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/FqTest.java
similarity index 100%
rename from crypto/src/test/java/org/hyperledger/besu/crypto/altbn128/FqTest.java
rename to crypto/algorithms/src/test/java/org/hyperledger/besu/crypto/altbn128/FqTest.java
diff --git a/crypto/src/test/resources/invalidPrivateKey.txt b/crypto/algorithms/src/test/resources/invalidPrivateKey.txt
similarity index 100%
rename from crypto/src/test/resources/invalidPrivateKey.txt
rename to crypto/algorithms/src/test/resources/invalidPrivateKey.txt
diff --git a/crypto/algorithms/src/test/resources/org/hyperledger/besu/crypto/eip152TestCases.csv b/crypto/algorithms/src/test/resources/org/hyperledger/besu/crypto/eip152TestCases.csv
new file mode 100644
index 00000000000..3591d53af8f
--- /dev/null
+++ b/crypto/algorithms/src/test/resources/org/hyperledger/besu/crypto/eip152TestCases.csv
@@ -0,0 +1,6 @@
+input,expected
+0000000048c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001,08c9bcf367e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d282e6ad7f520e511f6c3e2b8c68059b9442be0454267ce079217e1319cde05b
+0000000c48c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001,ba80a53f981c4d0d6a2797b69f12f6e94c212f14685ac4b74b12bb6fdbffa2d17d87c5392aab792dc252d5de4533cc9518d38aa8dbf1925ab92386edd4009923
+0000000c48c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000,75ab69d3190a562c51aef8d88f1c2775876944407270c42c9844252c26d2875298743e7f6d5ea2f2d3e8d226039cd31b4e426ac4f2d3d666a610c2116fde4735
+0000000148c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001,b63a380cb2897d521994a85234ee2c181b5f844d2c624c002677e9703449d2fba551b3a8333bcdf5f2f7e08993d53923de3d64fcc68c034e717b9293fed7a421
+ffffffff48c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001,fc59093aafa9ab43daae0e914c57635c5402d8e3d2130eb9b3cc181de7f0ecf9b22bf99a7815ce16419e200e01846e6b5df8cc7703041bbceb571de6631d2615
\ No newline at end of file
diff --git a/crypto/src/test/resources/org/hyperledger/besu/crypto/validPrivateKey.txt b/crypto/algorithms/src/test/resources/org/hyperledger/besu/crypto/validPrivateKey.txt
similarity index 100%
rename from crypto/src/test/resources/org/hyperledger/besu/crypto/validPrivateKey.txt
rename to crypto/algorithms/src/test/resources/org/hyperledger/besu/crypto/validPrivateKey.txt
diff --git a/crypto/src/test/resources/validPrivateKey.txt b/crypto/algorithms/src/test/resources/validPrivateKey.txt
similarity index 100%
rename from crypto/src/test/resources/validPrivateKey.txt
rename to crypto/algorithms/src/test/resources/validPrivateKey.txt
diff --git a/crypto/build.gradle b/crypto/build.gradle
index 15f6dcd54e2..0695c56e7f9 100644
--- a/crypto/build.gradle
+++ b/crypto/build.gradle
@@ -13,40 +13,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-apply plugin: 'java-library'
-
-jar {
-  archiveBaseName = 'besu-crypto'
-  manifest {
-    attributes(
-      'Specification-Title': archiveBaseName,
-      'Specification-Version': project.version,
-      'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
-      )
-  }
-}
-
-dependencies {
-  api project(':plugin-api')
-  api project(':util')
-
-  api 'org.bouncycastle:bcprov-jdk15on'
-
-  implementation 'com.google.guava:guava'
-  implementation 'net.java.dev.jna:jna'
-  implementation 'org.apache.logging.log4j:log4j-api'
-  implementation 'org.apache.tuweni:bytes'
-  implementation 'org.apache.tuweni:units'
-  implementation 'org.hyperledger.besu:secp256k1'
-
-  runtimeOnly 'org.apache.logging.log4j:log4j-core'
-
-  testImplementation 'junit:junit'
-  testImplementation 'org.assertj:assertj-core'
-  testImplementation 'org.mockito:mockito-core'
-}
-
-artifacts {
-  testSupportArtifacts testSupportJar
-}
+jar { enabled = false }
diff --git a/crypto/services/build.gradle b/crypto/services/build.gradle
new file mode 100644
index 00000000000..f6e082836c0
--- /dev/null
+++ b/crypto/services/build.gradle
@@ -0,0 +1,42 @@
+/*
+ * Copyright Hyperledger Besu Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+apply plugin: 'java-library'
+
+jar {
+  archiveBaseName = 'besu-crypto-services'
+  manifest {
+    attributes(
+      'Specification-Title': archiveBaseName,
+      'Specification-Version': project.version,
+      'Implementation-Title': archiveBaseName,
+      'Implementation-Version': calculateVersion(),
+      'Automatic-Module-Name': 'org.hyperledger.besu.internal.crypto'
+      )
+  }
+}
+
+dependencies {
+  api project(':crypto:algorithms')
+  api project(':plugin-api')
+
+  testImplementation 'junit:junit'
+  testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
+
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
+}
+
+artifacts { testSupportArtifacts testSupportJar }
diff --git a/crypto/services/src/main/java/org/hyperledger/besu/cryptoservices/KeyPairSecurityModule.java b/crypto/services/src/main/java/org/hyperledger/besu/cryptoservices/KeyPairSecurityModule.java
new file mode 100644
index 00000000000..97759b54c60
--- /dev/null
+++ b/crypto/services/src/main/java/org/hyperledger/besu/cryptoservices/KeyPairSecurityModule.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cryptoservices;
+
+import org.hyperledger.besu.crypto.ECPointUtil;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SECPPublicKey;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.plugin.services.securitymodule.SecurityModule;
+import org.hyperledger.besu.plugin.services.securitymodule.SecurityModuleException;
+import org.hyperledger.besu.plugin.services.securitymodule.data.PublicKey;
+import org.hyperledger.besu.plugin.services.securitymodule.data.Signature;
+
+import java.math.BigInteger;
+import java.security.spec.ECPoint;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+/**
+ * Implementation of SecurityModule wrapping SECP256K1.KeyPair and performing cryptographic
+ * operations via SECP256K1 class
+ */
+public class KeyPairSecurityModule implements SecurityModule {
+  private final KeyPair keyPair;
+  private final PublicKey publicKey;
+  private final SignatureAlgorithm signatureAlgorithm = SignatureAlgorithmFactory.getInstance();
+
+  /**
+   * Instantiates a new Key pair security module.
+   *
+   * @param keyPair the key pair
+   */
+  public KeyPairSecurityModule(final KeyPair keyPair) {
+    this.keyPair = keyPair;
+    this.publicKey = convertPublicKey(keyPair.getPublicKey());
+  }
+
+  private PublicKey convertPublicKey(final SECPPublicKey publicKey) {
+    try {
+      return new PublicKeyImpl(
+          ECPointUtil.fromBouncyCastleECPoint(signatureAlgorithm.publicKeyAsEcPoint(publicKey)));
+    } catch (final Exception e) {
+      throw new SecurityModuleException(
+          "Unexpected error while converting ECPoint: " + e.getMessage(), e);
+    }
+  }
+
+  @Override
+  public Signature sign(final Bytes32 dataHash) throws SecurityModuleException {
+    try {
+      final SECPSignature signature = signatureAlgorithm.sign(dataHash, keyPair);
+      return new SignatureImpl(signature);
+    } catch (final Exception e) {
+      throw new SecurityModuleException("Unexpected error while signing: " + e.getMessage(), e);
+    }
+  }
+
+  @Override
+  public PublicKey getPublicKey() throws SecurityModuleException {
+    return publicKey;
+  }
+
+  @Override
+  public Bytes32 calculateECDHKeyAgreement(final PublicKey partyKey)
+      throws SecurityModuleException {
+    try {
+      final Bytes encodedECPoint = ECPointUtil.getEncodedBytes(partyKey.getW());
+      final SECPPublicKey secp256KPartyKey = signatureAlgorithm.createPublicKey(encodedECPoint);
+      return signatureAlgorithm.calculateECDHKeyAgreement(
+          keyPair.getPrivateKey(), secp256KPartyKey);
+    } catch (final Exception e) {
+      throw new SecurityModuleException(
+          "Unexpected error while calculating ECDH Key Agreement: " + e.getMessage(), e);
+    }
+  }
+
+  private static class SignatureImpl implements Signature {
+
+    private final SECPSignature signature;
+
+    /**
+     * Instantiates a new Signature.
+     *
+     * @param signature the signature
+     */
+    SignatureImpl(final SECPSignature signature) {
+      this.signature = signature;
+    }
+
+    @Override
+    public BigInteger getR() {
+      return signature.getR();
+    }
+
+    @Override
+    public BigInteger getS() {
+      return signature.getS();
+    }
+  }
+
+  private static class PublicKeyImpl implements PublicKey {
+    private final ECPoint w;
+
+    /**
+     * Instantiates a new Public key.
+     *
+     * @param w the w ECPoint
+     */
+    PublicKeyImpl(final ECPoint w) {
+      this.w = w;
+    }
+
+    @Override
+    public ECPoint getW() {
+      return w;
+    }
+  }
+}
diff --git a/crypto/services/src/main/java/org/hyperledger/besu/cryptoservices/NodeKey.java b/crypto/services/src/main/java/org/hyperledger/besu/cryptoservices/NodeKey.java
new file mode 100644
index 00000000000..698336d3fe6
--- /dev/null
+++ b/crypto/services/src/main/java/org/hyperledger/besu/cryptoservices/NodeKey.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cryptoservices;
+
+import org.hyperledger.besu.crypto.ECPointUtil;
+import org.hyperledger.besu.crypto.SECPPublicKey;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.plugin.services.securitymodule.SecurityModule;
+import org.hyperledger.besu.plugin.services.securitymodule.data.Signature;
+
+import org.apache.tuweni.bytes.Bytes32;
+
+/** The Node key. */
+public class NodeKey {
+
+  private final SecurityModule securityModule;
+  private final SignatureAlgorithm signatureAlgorithm = SignatureAlgorithmFactory.getInstance();
+
+  /**
+   * Instantiates a new Node key.
+   *
+   * @param securityModule the security module
+   */
+  public NodeKey(final SecurityModule securityModule) {
+    this.securityModule = securityModule;
+  }
+
+  /**
+   * Sign hash and get secp signature.
+   *
+   * @param dataHash the data hash
+   * @return the secp signature
+   */
+  public SECPSignature sign(final Bytes32 dataHash) {
+    final Signature signature = securityModule.sign(dataHash);
+
+    return signatureAlgorithm.normaliseSignature(
+        signature.getR(), signature.getS(), getPublicKey(), dataHash);
+  }
+
+  /**
+   * Gets public key.
+   *
+   * @return the public key
+   */
+  public SECPPublicKey getPublicKey() {
+    return signatureAlgorithm.createPublicKey(
+        ECPointUtil.getEncodedBytes(securityModule.getPublicKey().getW()));
+  }
+
+  /**
+   * Calculate ecdh key agreement.
+   *
+   * @param partyKey the party key
+   * @return the bytes32
+   */
+  public Bytes32 calculateECDHKeyAgreement(final SECPPublicKey partyKey) {
+    return securityModule.calculateECDHKeyAgreement(
+        () -> ECPointUtil.fromBouncyCastleECPoint(signatureAlgorithm.publicKeyAsEcPoint(partyKey)));
+  }
+}
diff --git a/crypto/services/src/test-support/java/org/hyperledger/besu/cryptoservices/NodeKeyUtils.java b/crypto/services/src/test-support/java/org/hyperledger/besu/cryptoservices/NodeKeyUtils.java
new file mode 100644
index 00000000000..783bd35ac88
--- /dev/null
+++ b/crypto/services/src/test-support/java/org/hyperledger/besu/cryptoservices/NodeKeyUtils.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cryptoservices;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+
+import org.apache.tuweni.bytes.Bytes32;
+
+public class NodeKeyUtils {
+
+  public static NodeKey createFrom(final KeyPair keyPair) {
+    return new NodeKey(new KeyPairSecurityModule(keyPair));
+  }
+
+  public static NodeKey createFrom(final Bytes32 privateKey) {
+    final SignatureAlgorithm signatureAlgorithm = SignatureAlgorithmFactory.getInstance();
+    final KeyPair keyPair =
+        signatureAlgorithm.createKeyPair(signatureAlgorithm.createPrivateKey(privateKey));
+    return new NodeKey(new KeyPairSecurityModule(keyPair));
+  }
+
+  public static NodeKey generate() {
+    return new NodeKey(
+        new KeyPairSecurityModule(SignatureAlgorithmFactory.getInstance().generateKeyPair()));
+  }
+}
diff --git a/crypto/src/test/java/org/hyperledger/besu/crypto/KeyPairSecurityModuleTest.java b/crypto/services/src/test/java/org/hyperledger/besu/cryptoservices/KeyPairSecurityModuleTest.java
similarity index 76%
rename from crypto/src/test/java/org/hyperledger/besu/crypto/KeyPairSecurityModuleTest.java
rename to crypto/services/src/test/java/org/hyperledger/besu/cryptoservices/KeyPairSecurityModuleTest.java
index f61a8b2e8c6..68d369ae538 100644
--- a/crypto/src/test/java/org/hyperledger/besu/crypto/KeyPairSecurityModuleTest.java
+++ b/crypto/services/src/test/java/org/hyperledger/besu/cryptoservices/KeyPairSecurityModuleTest.java
@@ -12,7 +12,13 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.crypto;
+package org.hyperledger.besu.cryptoservices;
+
+import org.hyperledger.besu.crypto.ECPointUtil;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.KeyPairUtil;
+import org.hyperledger.besu.crypto.SECPPublicKey;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,12 +39,13 @@ public void validatePublicKeyFromECPointCanBeConstructed() throws IOException {
     final File keyDirectory = temp.newFolder();
     final File keyFile = new File(keyDirectory, "key");
 
-    final SECP256K1.KeyPair keyPair = KeyPairUtil.loadKeyPair(keyFile);
+    final KeyPair keyPair = KeyPairUtil.loadKeyPair(keyFile);
 
     final KeyPairSecurityModule keyPairSecurityModule = new KeyPairSecurityModule(keyPair);
     final ECPoint ecPoint = keyPairSecurityModule.getPublicKey().getW();
     final Bytes encodedBytes = ECPointUtil.getEncodedBytes(ecPoint);
-    final SECP256K1.PublicKey publicKey = SECP256K1.PublicKey.create(encodedBytes);
+    final SECPPublicKey publicKey =
+        SignatureAlgorithmFactory.getInstance().createPublicKey(encodedBytes);
 
     Assertions.assertThat(keyPair.getPublicKey().getEncodedBytes())
         .isEqualByComparingTo(publicKey.getEncodedBytes());
diff --git a/crypto/services/src/test/java/org/hyperledger/besu/cryptoservices/NodeKeyTest.java b/crypto/services/src/test/java/org/hyperledger/besu/cryptoservices/NodeKeyTest.java
new file mode 100644
index 00000000000..07008f06cbc
--- /dev/null
+++ b/crypto/services/src/test/java/org/hyperledger/besu/cryptoservices/NodeKeyTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.cryptoservices;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.assertj.core.api.Assertions;
+import org.junit.Before;
+import org.junit.Test;
+
+public class NodeKeyTest {
+
+  @Before
+  public void resetInstance() {
+    SignatureAlgorithmFactory.resetInstance();
+  }
+
+  @Test
+  public void publicKeyShouldMatch() {
+    final Bytes keyPairPubKey =
+        Bytes.fromHexString(
+            "0x35f48529f73c4172850ed18997d00d101a9aebc130103c23d41d46351c1b1d72ffc8b246af3a446d99a8218bd69e231b75932ea9a79173751dc7eb2eb0e301f2");
+    final Bytes32 keyPairPrvKey =
+        Bytes32.fromHexString("0xf7a58d5e755d51fa2f6206e91dd574597c73248aaf946ec1964b8c6268d6207b");
+
+    final SignatureAlgorithm signatureAlgorithm = SignatureAlgorithmFactory.getInstance();
+    final KeyPair keyPair =
+        signatureAlgorithm.createKeyPair(signatureAlgorithm.createPrivateKey(keyPairPrvKey));
+    final KeyPairSecurityModule keyPairSecurityModule = new KeyPairSecurityModule(keyPair);
+    final NodeKey nodeKey = new NodeKey(keyPairSecurityModule);
+
+    Assertions.assertThat(nodeKey.getPublicKey().getEncodedBytes())
+        .isEqualByComparingTo(keyPair.getPublicKey().getEncodedBytes());
+
+    Assertions.assertThat(nodeKey.getPublicKey().getEncodedBytes())
+        .isEqualByComparingTo(keyPairPubKey);
+  }
+}
diff --git a/crypto/src/main/java/org/hyperledger/besu/crypto/Hash.java b/crypto/src/main/java/org/hyperledger/besu/crypto/Hash.java
deleted file mode 100644
index 358a516b662..00000000000
--- a/crypto/src/main/java/org/hyperledger/besu/crypto/Hash.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.crypto;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-
-/** Various utilities for providing hashes (digests) of arbitrary data. */
-public abstract class Hash {
-  private Hash() {}
-
-  public static final String KECCAK256_ALG = "KECCAK-256";
-
-  private static final String SHA256_ALG = "SHA-256";
-  private static final String RIPEMD160 = "RIPEMD160";
-  private static final String BLAKE2BF_ALG = "BLAKE2BF";
-
-  /**
-   * Helper method to generate a digest using the provided algorithm.
-   *
-   * @param input The input bytes to produce the digest for.
-   * @param alg The name of the digest algorithm to use.
-   * @return A digest.
-   */
-  private static byte[] digestUsingAlgorithm(final Bytes input, final String alg) {
-    try {
-      final MessageDigest digest = MessageDigestFactory.create(alg);
-      input.update(digest);
-      return digest.digest();
-    } catch (final NoSuchAlgorithmException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  /**
-   * Digest using SHA2-256.
-   *
-   * @param input The input bytes to produce the digest for.
-   * @return A digest.
-   */
-  public static Bytes32 sha256(final Bytes input) {
-    return Bytes32.wrap(digestUsingAlgorithm(input, SHA256_ALG));
-  }
-
-  /**
-   * Digest using keccak-256.
-   *
-   * @param input The input bytes to produce the digest for.
-   * @return A digest.
-   */
-  public static Bytes32 keccak256(final Bytes input) {
-    return Bytes32.wrap(digestUsingAlgorithm(input, KECCAK256_ALG));
-  }
-
-  /**
-   * Digest using RIPEMD-160.
-   *
-   * @param input The input bytes to produce the digest for.
-   * @return A digest.
-   */
-  public static Bytes ripemd160(final Bytes input) {
-    return Bytes.wrap(digestUsingAlgorithm(input, RIPEMD160));
-  }
-
-  /**
-   * Digest using Blake2f compression function.
-   *
-   * @param input The input bytes to produce the digest for.
-   * @return A digest.
-   */
-  public static Bytes blake2bf(final Bytes input) {
-    return Bytes.wrap(digestUsingAlgorithm(input, BLAKE2BF_ALG));
-  }
-}
diff --git a/crypto/src/main/java/org/hyperledger/besu/crypto/KeyPairSecurityModule.java b/crypto/src/main/java/org/hyperledger/besu/crypto/KeyPairSecurityModule.java
deleted file mode 100644
index 312c787cd9f..00000000000
--- a/crypto/src/main/java/org/hyperledger/besu/crypto/KeyPairSecurityModule.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.crypto;
-
-import static org.hyperledger.besu.crypto.ECPointUtil.fromBouncyCastleECPoint;
-
-import org.hyperledger.besu.plugin.services.securitymodule.SecurityModule;
-import org.hyperledger.besu.plugin.services.securitymodule.SecurityModuleException;
-import org.hyperledger.besu.plugin.services.securitymodule.data.PublicKey;
-import org.hyperledger.besu.plugin.services.securitymodule.data.Signature;
-
-import java.math.BigInteger;
-import java.security.spec.ECPoint;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-
-/**
- * Implementation of SecurityModule wrapping SECP256K1.KeyPair and performing cryptographic
- * operations via SECP256K1 class
- */
-public class KeyPairSecurityModule implements SecurityModule {
-  private final SECP256K1.KeyPair keyPair;
-  private final PublicKey publicKey;
-
-  public KeyPairSecurityModule(final SECP256K1.KeyPair keyPair) {
-    this.keyPair = keyPair;
-    this.publicKey = convertPublicKey(keyPair.getPublicKey());
-  }
-
-  private PublicKey convertPublicKey(final SECP256K1.PublicKey publicKey) {
-    try {
-      return new PublicKeyImpl(fromBouncyCastleECPoint(publicKey.asEcPoint()));
-    } catch (final Exception e) {
-      throw new SecurityModuleException(
-          "Unexpected error while converting ECPoint: " + e.getMessage(), e);
-    }
-  }
-
-  @Override
-  public Signature sign(final Bytes32 dataHash) throws SecurityModuleException {
-    try {
-      final SECP256K1.Signature signature = SECP256K1.sign(dataHash, keyPair);
-      return new SignatureImpl(signature);
-    } catch (final Exception e) {
-      throw new SecurityModuleException("Unexpected error while signing: " + e.getMessage(), e);
-    }
-  }
-
-  @Override
-  public PublicKey getPublicKey() throws SecurityModuleException {
-    return publicKey;
-  }
-
-  @Override
-  public Bytes32 calculateECDHKeyAgreement(final PublicKey partyKey)
-      throws SecurityModuleException {
-    try {
-      final Bytes encodedECPoint = ECPointUtil.getEncodedBytes(partyKey.getW());
-      final SECP256K1.PublicKey secp256KPartyKey = SECP256K1.PublicKey.create(encodedECPoint);
-      return SECP256K1.calculateECDHKeyAgreement(keyPair.getPrivateKey(), secp256KPartyKey);
-    } catch (final Exception e) {
-      throw new SecurityModuleException(
-          "Unexpected error while calculating ECDH Key Agreement: " + e.getMessage(), e);
-    }
-  }
-
-  private static class SignatureImpl implements Signature {
-
-    private final SECP256K1.Signature signature;
-
-    SignatureImpl(final SECP256K1.Signature signature) {
-      this.signature = signature;
-    }
-
-    @Override
-    public BigInteger getR() {
-      return signature.getR();
-    }
-
-    @Override
-    public BigInteger getS() {
-      return signature.getS();
-    }
-  }
-
-  private static class PublicKeyImpl implements PublicKey {
-    private final ECPoint w;
-
-    PublicKeyImpl(final ECPoint w) {
-      this.w = w;
-    }
-
-    @Override
-    public ECPoint getW() {
-      return w;
-    }
-  }
-}
diff --git a/crypto/src/main/java/org/hyperledger/besu/crypto/KeyPairUtil.java b/crypto/src/main/java/org/hyperledger/besu/crypto/KeyPairUtil.java
deleted file mode 100644
index 11a316e6dfd..00000000000
--- a/crypto/src/main/java/org/hyperledger/besu/crypto/KeyPairUtil.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.crypto;
-
-import static java.nio.file.StandardCopyOption.ATOMIC_MOVE;
-import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-
-import com.google.common.io.Resources;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes32;
-
-public class KeyPairUtil {
-  private static final Logger LOG = LogManager.getLogger();
-
-  public static String loadResourceFile(final String resourcePath) {
-    try {
-      URL path = KeyPairUtil.class.getClassLoader().getResource(resourcePath);
-      return Resources.toString(path, StandardCharsets.UTF_8).trim();
-    } catch (Exception e) {
-      throw new RuntimeException("Unable to load resource: " + resourcePath, e);
-    }
-  }
-
-  public static SECP256K1.KeyPair loadKeyPairFromResource(final String resourcePath) {
-    final SECP256K1.KeyPair keyPair;
-    String keyData = loadResourceFile(resourcePath);
-    if (keyData == null || keyData.isEmpty()) {
-      throw new IllegalArgumentException("Unable to load resource: " + resourcePath);
-    }
-    SECP256K1.PrivateKey privateKey = SECP256K1.PrivateKey.create(Bytes32.fromHexString((keyData)));
-    keyPair = SECP256K1.KeyPair.create(privateKey);
-
-    LOG.info("Loaded keyPair {} from {}", keyPair.getPublicKey().toString(), resourcePath);
-    return keyPair;
-  }
-
-  public static SECP256K1.KeyPair loadKeyPair(final File keyFile) {
-
-    final SECP256K1.KeyPair key;
-    if (keyFile.exists()) {
-
-      key = load(keyFile);
-      LOG.info(
-          "Loaded public key {} from {}", key.getPublicKey().toString(), keyFile.getAbsolutePath());
-    } else {
-      key = SECP256K1.KeyPair.generate();
-      try {
-        storeKeyPair(key, keyFile);
-      } catch (IOException e) {
-        throw new IllegalArgumentException("Cannot store generated private key.");
-      }
-      LOG.info(
-          "Generated new public key {} and stored it to {}",
-          key.getPublicKey().toString(),
-          keyFile.getAbsolutePath());
-    }
-    return key;
-  }
-
-  public static SECP256K1.KeyPair loadKeyPair(final Path homeDirectory) {
-    return loadKeyPair(getDefaultKeyFile(homeDirectory));
-  }
-
-  public static File getDefaultKeyFile(final Path homeDirectory) {
-    return homeDirectory.resolve("key").toFile();
-  }
-
-  public static SECP256K1.KeyPair load(final File file) {
-    return SECP256K1.KeyPair.create(loadPrivateKey(file));
-  }
-
-  static SECP256K1.PrivateKey loadPrivateKey(final File file) {
-    try {
-      final List<String> info = Files.readAllLines(file.toPath());
-      if (info.size() != 1) {
-        throw new IllegalArgumentException("Supplied file does not contain valid keyPair pair.");
-      }
-      return SECP256K1.PrivateKey.create(Bytes32.fromHexString((info.get(0))));
-    } catch (IOException ex) {
-      throw new IllegalArgumentException("Supplied file does not contain valid keyPair pair.");
-    }
-  }
-
-  static void storeKeyPair(final SECP256K1.KeyPair keyKair, final File file) throws IOException {
-    final File privateKeyDir = file.getParentFile();
-    privateKeyDir.mkdirs();
-    final Path tempPath = Files.createTempFile(privateKeyDir.toPath(), ".tmp", "");
-    Files.write(
-        tempPath,
-        keyKair.getPrivateKey().getEncodedBytes().toString().getBytes(StandardCharsets.UTF_8));
-    Files.move(tempPath, file.toPath(), REPLACE_EXISTING, ATOMIC_MOVE);
-  }
-}
diff --git a/crypto/src/main/java/org/hyperledger/besu/crypto/MessageDigestFactory.java b/crypto/src/main/java/org/hyperledger/besu/crypto/MessageDigestFactory.java
deleted file mode 100644
index a6b5c4b8b17..00000000000
--- a/crypto/src/main/java/org/hyperledger/besu/crypto/MessageDigestFactory.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.crypto;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.Security;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-public class MessageDigestFactory {
-
-  static {
-    Security.addProvider(new BesuProvider());
-    Security.addProvider(new BouncyCastleProvider());
-  }
-
-  @SuppressWarnings("DoNotInvokeMessageDigestDirectly")
-  public static MessageDigest create(final String algorithm) throws NoSuchAlgorithmException {
-    return MessageDigest.getInstance(algorithm);
-  }
-}
diff --git a/crypto/src/main/java/org/hyperledger/besu/crypto/NodeKey.java b/crypto/src/main/java/org/hyperledger/besu/crypto/NodeKey.java
deleted file mode 100644
index 4757709a7ac..00000000000
--- a/crypto/src/main/java/org/hyperledger/besu/crypto/NodeKey.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.crypto;
-
-import org.hyperledger.besu.plugin.services.securitymodule.SecurityModule;
-import org.hyperledger.besu.plugin.services.securitymodule.data.Signature;
-
-import org.apache.tuweni.bytes.Bytes32;
-
-public class NodeKey {
-
-  private final SecurityModule securityModule;
-
-  public NodeKey(final SecurityModule securityModule) {
-    this.securityModule = securityModule;
-  }
-
-  public SECP256K1.Signature sign(final Bytes32 dataHash) {
-    final Signature signature = securityModule.sign(dataHash);
-
-    return SECP256K1.normaliseSignature(
-        signature.getR(), signature.getS(), getPublicKey(), dataHash);
-  }
-
-  public SECP256K1.PublicKey getPublicKey() {
-    return SECP256K1.PublicKey.create(
-        ECPointUtil.getEncodedBytes(securityModule.getPublicKey().getW()));
-  }
-
-  public Bytes32 calculateECDHKeyAgreement(final SECP256K1.PublicKey partyKey) {
-    return securityModule.calculateECDHKeyAgreement(
-        () -> ECPointUtil.fromBouncyCastleECPoint(partyKey.asEcPoint()));
-  }
-}
diff --git a/crypto/src/main/java/org/hyperledger/besu/crypto/SECP256K1.java b/crypto/src/main/java/org/hyperledger/besu/crypto/SECP256K1.java
deleted file mode 100644
index 2563fd95cbb..00000000000
--- a/crypto/src/main/java/org/hyperledger/besu/crypto/SECP256K1.java
+++ /dev/null
@@ -1,785 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.crypto;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.hyperledger.besu.nativelib.secp256k1.LibSecp256k1.SECP256K1_EC_UNCOMPRESSED;
-
-import org.hyperledger.besu.nativelib.secp256k1.LibSecp256k1;
-import org.hyperledger.besu.nativelib.secp256k1.LibSecp256k1.secp256k1_ecdsa_recoverable_signature;
-import org.hyperledger.besu.nativelib.secp256k1.LibSecp256k1.secp256k1_ecdsa_signature;
-import org.hyperledger.besu.nativelib.secp256k1.LibSecp256k1.secp256k1_pubkey;
-
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.KeyPairGenerator;
-import java.security.Security;
-import java.security.spec.ECGenParameterSpec;
-import java.util.Arrays;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.Supplier;
-import java.util.function.UnaryOperator;
-
-import com.google.common.base.Suppliers;
-import com.sun.jna.ptr.IntByReference;
-import com.sun.jna.ptr.LongByReference;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.bytes.MutableBytes;
-import org.apache.tuweni.units.bigints.UInt256;
-import org.bouncycastle.asn1.sec.SECNamedCurves;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.asn1.x9.X9IntegerConverter;
-import org.bouncycastle.crypto.agreement.ECDHBasicAgreement;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.signers.ECDSASigner;
-import org.bouncycastle.crypto.signers.HMacDSAKCalculator;
-import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey;
-import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPublicKey;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.math.ec.ECAlgorithms;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.math.ec.FixedPointCombMultiplier;
-import org.bouncycastle.math.ec.custom.sec.SecP256K1Curve;
-
-/*
- * Adapted from the BitcoinJ ECKey (Apache 2 License) implementation:
- * https://github.com/bitcoinj/bitcoinj/blob/master/core/src/main/java/org/bitcoinj/core/ECKey.java
- *
- *
- * Adapted from the web3j (Apache 2 License) implementations:
- * https://github.com/web3j/web3j/crypto/src/main/java/org/web3j/crypto/*.java
- */
-public class SECP256K1 {
-
-  private static final Logger LOG = LogManager.getLogger();
-
-  private static boolean useNative = true;
-
-  public static final String ALGORITHM = "ECDSA";
-  public static final String CURVE_NAME = "secp256k1";
-  public static final String PROVIDER = "BC";
-
-  public static final ECDomainParameters CURVE;
-  public static final BigInteger HALF_CURVE_ORDER;
-
-  private static final KeyPairGenerator KEY_PAIR_GENERATOR;
-  private static final BigInteger CURVE_ORDER;
-
-  static {
-    Security.addProvider(new BouncyCastleProvider());
-
-    final X9ECParameters params = SECNamedCurves.getByName(CURVE_NAME);
-    CURVE = new ECDomainParameters(params.getCurve(), params.getG(), params.getN(), params.getH());
-    CURVE_ORDER = CURVE.getN();
-    HALF_CURVE_ORDER = CURVE_ORDER.shiftRight(1);
-    try {
-      KEY_PAIR_GENERATOR = KeyPairGenerator.getInstance(ALGORITHM, PROVIDER);
-    } catch (final Exception e) {
-      throw new RuntimeException(e);
-    }
-    final ECGenParameterSpec ecGenParameterSpec = new ECGenParameterSpec(CURVE_NAME);
-    try {
-      KEY_PAIR_GENERATOR.initialize(ecGenParameterSpec, SecureRandomProvider.createSecureRandom());
-    } catch (final InvalidAlgorithmParameterException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  public static void enableNative() {
-    useNative = LibSecp256k1.CONTEXT != null;
-    LOG.info(useNative ? "Using native secp256k1" : "Native secp256k1 requested but not available");
-  }
-
-  public static Signature sign(final Bytes32 dataHash, final KeyPair keyPair) {
-    if (useNative) {
-      return signNative(dataHash, keyPair);
-    } else {
-      return signDefault(dataHash, keyPair);
-    }
-  }
-
-  /**
-   * Verifies the given ECDSA signature against the message bytes using the public key bytes.
-   *
-   * <p>When using native ECDSA verification, data must be 32 bytes, and no element may be larger
-   * than 520 bytes.
-   *
-   * @param data Hash of the data to verify.
-   * @param signature ASN.1 encoded signature.
-   * @param pub The public key bytes to use.
-   * @return True if the verification is successful.
-   */
-  public static boolean verify(final Bytes data, final Signature signature, final PublicKey pub) {
-    if (useNative) {
-      return verifyNative(data, signature, pub);
-    } else {
-      return verifyDefault(data, signature, pub);
-    }
-  }
-
-  /** Decompress a compressed public key (x co-ord and low-bit of y-coord). */
-  private static ECPoint decompressKey(final BigInteger xBN, final boolean yBit) {
-    final X9IntegerConverter x9 = new X9IntegerConverter();
-    final byte[] compEnc = x9.integerToBytes(xBN, 1 + x9.getByteLength(CURVE.getCurve()));
-    compEnc[0] = (byte) (yBit ? 0x03 : 0x02);
-    // TODO: Find a better way to handle an invalid point compression here.
-    // Currently ECCurve#decodePoint throws an IllegalArgumentException.
-    return CURVE.getCurve().decodePoint(compEnc);
-  }
-
-  /**
-   * Given the components of a signature and a selector value, recover and return the public key
-   * that generated the signature according to the algorithm in SEC1v2 section 4.1.6.
-   *
-   * <p>If this method returns null it means recovery was not possible and recId should be iterated.
-   *
-   * <p>Given the above two points, a correct usage of this method is inside a for loop from 0 to 3,
-   * and if the output is null OR a key that is not the one you expect, you try again with the next
-   * recId.
-   *
-   * @param recId Which possible key to recover.
-   * @param r The R component of the signature.
-   * @param s The S component of the signature.
-   * @param dataHash Hash of the data that was signed.
-   * @return An ECKey containing only the public part, or null if recovery wasn't possible.
-   */
-  private static BigInteger recoverFromSignature(
-      final int recId, final BigInteger r, final BigInteger s, final Bytes32 dataHash) {
-    assert (recId >= 0);
-    assert (r.signum() >= 0);
-    assert (s.signum() >= 0);
-    assert (dataHash != null);
-
-    // 1.0 For j from 0 to h (h == recId here and the loop is outside this function)
-    // 1.1 Let x = r + jn
-    final BigInteger n = CURVE.getN(); // Curve order.
-    final BigInteger i = BigInteger.valueOf((long) recId / 2);
-    final BigInteger x = r.add(i.multiply(n));
-    // 1.2. Convert the integer x to an octet string X of length mlen using the conversion
-    // routine specified in Section 2.3.7, where mlen = ⌈(log2 p)/8⌉ or mlen = ⌈m/8⌉.
-    // 1.3. Convert the octet string (16 set binary digits)||X to an elliptic curve point R
-    // using the conversion routine specified in Section 2.3.4. If this conversion
-    // routine outputs "invalid", then do another iteration of Step 1.
-    //
-    // More concisely, what these points mean is to use X as a compressed public key.
-    final BigInteger prime = SecP256K1Curve.q;
-    if (x.compareTo(prime) >= 0) {
-      // Cannot have point co-ordinates larger than this as everything takes place modulo Q.
-      return null;
-    }
-    // Compressed keys require you to know an extra bit of data about the y-coord as there are
-    // two possibilities. So it's encoded in the recId.
-    final ECPoint R = decompressKey(x, (recId & 1) == 1);
-    // 1.4. If nR != point at infinity, then do another iteration of Step 1 (callers
-    // responsibility).
-    if (!R.multiply(n).isInfinity()) {
-      return null;
-    }
-    // 1.5. Compute e from M using Steps 2 and 3 of ECDSA signature verification.
-    final BigInteger e = dataHash.toUnsignedBigInteger();
-    // 1.6. For k from 1 to 2 do the following. (loop is outside this function via
-    // iterating recId)
-    // 1.6.1. Compute a candidate public key as:
-    // Q = mi(r) * (sR - eG)
-    //
-    // Where mi(x) is the modular multiplicative inverse. We transform this into the following:
-    // Q = (mi(r) * s ** R) + (mi(r) * -e ** G)
-    // Where -e is the modular additive inverse of e, that is z such that z + e = 0 (mod n).
-    // In the above equation ** is point multiplication and + is point addition (the EC group
-    // operator).
-    //
-    // We can find the additive inverse by subtracting e from zero then taking the mod. For
-    // example the additive inverse of 3 modulo 11 is 8 because 3 + 8 mod 11 = 0, and
-    // -3 mod 11 = 8.
-    final BigInteger eInv = BigInteger.ZERO.subtract(e).mod(n);
-    final BigInteger rInv = r.modInverse(n);
-    final BigInteger srInv = rInv.multiply(s).mod(n);
-    final BigInteger eInvrInv = rInv.multiply(eInv).mod(n);
-    final ECPoint q = ECAlgorithms.sumOfTwoMultiplies(CURVE.getG(), eInvrInv, R, srInv);
-
-    if (q.isInfinity()) {
-      return null;
-    }
-
-    final byte[] qBytes = q.getEncoded(false);
-    // We remove the prefix
-    return new BigInteger(1, Arrays.copyOfRange(qBytes, 1, qBytes.length));
-  }
-
-  private static Signature signDefault(final Bytes32 dataHash, final KeyPair keyPair) {
-    final ECDSASigner signer = new ECDSASigner(new HMacDSAKCalculator(new SHA256Digest()));
-
-    final ECPrivateKeyParameters privKey =
-        new ECPrivateKeyParameters(
-            keyPair.getPrivateKey().getEncodedBytes().toUnsignedBigInteger(), CURVE);
-    signer.init(true, privKey);
-
-    final BigInteger[] components = signer.generateSignature(dataHash.toArrayUnsafe());
-
-    return normaliseSignature(components[0], components[1], keyPair.getPublicKey(), dataHash);
-  }
-
-  public static Signature normaliseSignature(
-      final BigInteger nativeR,
-      final BigInteger nativeS,
-      final PublicKey publicKey,
-      final Bytes32 dataHash) {
-
-    BigInteger s = nativeS;
-    // Automatically adjust the S component to be less than or equal to half the curve
-    // order, if necessary. This is required because for every signature (r,s) the signature
-    // (r, -s (mod N)) is a valid signature of the same message. However, we dislike the
-    // ability to modify the bits of a Bitcoin transaction after it's been signed, as that
-    // violates various assumed invariants. Thus in future only one of those forms will be
-    // considered legal and the other will be banned.
-    if (s.compareTo(HALF_CURVE_ORDER) > 0) {
-      // The order of the curve is the number of valid points that exist on that curve.
-      // If S is in the upper half of the number of valid points, then bring it back to
-      // the lower half. Otherwise, imagine that
-      // N = 10
-      // s = 8, so (-8 % 10 == 2) thus both (r, 8) and (r, 2) are valid solutions.
-      // 10 - 8 == 2, giving us always the latter solution, which is canonical.
-      s = CURVE.getN().subtract(s);
-    }
-
-    // Now we have to work backwards to figure out the recId needed to recover the signature.
-    int recId = -1;
-    final BigInteger publicKeyBI = publicKey.getEncodedBytes().toUnsignedBigInteger();
-    for (int i = 0; i < 4; i++) {
-      final BigInteger k = recoverFromSignature(i, nativeR, s, dataHash);
-      if (k != null && k.equals(publicKeyBI)) {
-        recId = i;
-        break;
-      }
-    }
-    if (recId == -1) {
-      throw new RuntimeException(
-          "Could not construct a recoverable key. This should never happen.");
-    }
-
-    return new Signature(nativeR, s, (byte) recId);
-  }
-
-  private static boolean verifyDefault(
-      final Bytes data, final Signature signature, final PublicKey pub) {
-    final ECDSASigner signer = new ECDSASigner();
-    final Bytes toDecode = Bytes.wrap(Bytes.of((byte) 4), pub.getEncodedBytes());
-    final ECPublicKeyParameters params =
-        new ECPublicKeyParameters(CURVE.getCurve().decodePoint(toDecode.toArrayUnsafe()), CURVE);
-    signer.init(false, params);
-    try {
-      return signer.verifySignature(data.toArrayUnsafe(), signature.r, signature.s);
-    } catch (final NullPointerException e) {
-      // Bouncy Castle contains a bug that can cause NPEs given specially crafted signatures. Those
-      // signatures
-      // are inherently invalid/attack sigs so we just fail them here rather than crash the thread.
-      return false;
-    }
-  }
-
-  /**
-   * Verifies the given ECDSA signature using the public key bytes against the message bytes,
-   * previously passed through a preprocessor function, which is normally a hashing function.
-   *
-   * @param data The data to verify.
-   * @param signature ASN.1 encoded signature.
-   * @param pub The public key bytes to use.
-   * @param preprocessor The function to apply to the data before verifying the signature, normally
-   *     a hashing function.
-   * @return True if the verification is successful.
-   */
-  public static boolean verify(
-      final Bytes data,
-      final Signature signature,
-      final PublicKey pub,
-      final UnaryOperator<Bytes> preprocessor) {
-    checkArgument(preprocessor != null, "preprocessor must not be null");
-    return verify(preprocessor.apply(data), signature, pub);
-  }
-
-  /**
-   * Calculates an ECDH key agreement between the private and the public key.
-   *
-   * @param privKey The private key.
-   * @param theirPubKey The public key.
-   * @return The agreed secret.
-   */
-  public static Bytes32 calculateECDHKeyAgreement(
-      final PrivateKey privKey, final PublicKey theirPubKey) {
-    checkArgument(privKey != null, "missing private key");
-    checkArgument(theirPubKey != null, "missing remote public key");
-
-    final ECPrivateKeyParameters privKeyP = new ECPrivateKeyParameters(privKey.getD(), CURVE);
-    final ECPublicKeyParameters pubKeyP = new ECPublicKeyParameters(theirPubKey.asEcPoint(), CURVE);
-
-    final ECDHBasicAgreement agreement = new ECDHBasicAgreement();
-    agreement.init(privKeyP);
-    final BigInteger agreed = agreement.calculateAgreement(pubKeyP);
-
-    return UInt256.valueOf(agreed).toBytes();
-  }
-
-  private static Signature signNative(final Bytes32 dataHash, final KeyPair keyPair) {
-    final LibSecp256k1.secp256k1_ecdsa_recoverable_signature signature =
-        new secp256k1_ecdsa_recoverable_signature();
-    // sign in internal form
-    if (LibSecp256k1.secp256k1_ecdsa_sign_recoverable(
-            LibSecp256k1.CONTEXT,
-            signature,
-            dataHash.toArrayUnsafe(),
-            keyPair.privateKey.getEncoded(),
-            null,
-            null)
-        == 0) {
-      throw new RuntimeException(
-          "Could not natively sign. Private Key is invalid or default nonce generation failed.");
-    }
-
-    // encode to compact form
-    final ByteBuffer compactSig = ByteBuffer.allocate(64);
-    final IntByReference recId = new IntByReference(0);
-    LibSecp256k1.secp256k1_ecdsa_recoverable_signature_serialize_compact(
-        LibSecp256k1.CONTEXT, compactSig, recId, signature);
-    compactSig.flip();
-    final byte[] sig = compactSig.array();
-
-    // wrap in signature object
-    final Bytes32 r = Bytes32.wrap(sig, 0);
-    final Bytes32 s = Bytes32.wrap(sig, 32);
-    return Signature.create(
-        r.toUnsignedBigInteger(), s.toUnsignedBigInteger(), (byte) recId.getValue());
-  }
-
-  private static boolean verifyNative(
-      final Bytes data, final Signature signature, final PublicKey pub) {
-
-    // translate signature
-    final LibSecp256k1.secp256k1_ecdsa_signature _signature = new secp256k1_ecdsa_signature();
-    if (LibSecp256k1.secp256k1_ecdsa_signature_parse_compact(
-            LibSecp256k1.CONTEXT, _signature, signature.encodedBytes().toArrayUnsafe())
-        == 0) {
-      throw new IllegalArgumentException("Could not parse signature");
-    }
-
-    // translate key
-    final LibSecp256k1.secp256k1_pubkey _pub = new secp256k1_pubkey();
-    final Bytes encodedPubKey = Bytes.concatenate(Bytes.of(0x04), pub.getEncodedBytes());
-    if (LibSecp256k1.secp256k1_ec_pubkey_parse(
-            LibSecp256k1.CONTEXT, _pub, encodedPubKey.toArrayUnsafe(), encodedPubKey.size())
-        == 0) {
-      throw new IllegalArgumentException("Could not parse public key");
-    }
-
-    return LibSecp256k1.secp256k1_ecdsa_verify(
-            LibSecp256k1.CONTEXT, _signature, data.toArrayUnsafe(), _pub)
-        != 0;
-  }
-
-  private static Optional<PublicKey> recoverFromSignatureNative(
-      final Bytes32 dataHash, final Signature signature) {
-
-    // parse the sig
-    final LibSecp256k1.secp256k1_ecdsa_recoverable_signature parsedSignature =
-        new LibSecp256k1.secp256k1_ecdsa_recoverable_signature();
-    final Bytes encodedSig = signature.encodedBytes();
-    if (LibSecp256k1.secp256k1_ecdsa_recoverable_signature_parse_compact(
-            LibSecp256k1.CONTEXT,
-            parsedSignature,
-            encodedSig.slice(0, 64).toArrayUnsafe(),
-            encodedSig.get(64))
-        == 0) {
-      throw new IllegalArgumentException("Could not parse signature");
-    }
-
-    // recover the key
-    final LibSecp256k1.secp256k1_pubkey newPubKey = new LibSecp256k1.secp256k1_pubkey();
-    if (LibSecp256k1.secp256k1_ecdsa_recover(
-            LibSecp256k1.CONTEXT, newPubKey, parsedSignature, dataHash.toArrayUnsafe())
-        == 0) {
-      throw new IllegalArgumentException("Could not recover public key");
-    }
-
-    // parse the key
-    final ByteBuffer recoveredKey = ByteBuffer.allocate(65);
-    final LongByReference keySize = new LongByReference(recoveredKey.limit());
-    LibSecp256k1.secp256k1_ec_pubkey_serialize(
-        LibSecp256k1.CONTEXT, recoveredKey, keySize, newPubKey, SECP256K1_EC_UNCOMPRESSED);
-
-    return Optional.of(PublicKey.create(Bytes.wrapByteBuffer(recoveredKey).slice(1)));
-  }
-
-  public static class PrivateKey implements java.security.PrivateKey {
-
-    private final Bytes32 encoded;
-
-    private PrivateKey(final Bytes32 encoded) {
-      checkNotNull(encoded);
-      this.encoded = encoded;
-    }
-
-    public static PrivateKey create(final BigInteger key) {
-      checkNotNull(key);
-      return create(UInt256.valueOf(key).toBytes());
-    }
-
-    public static PrivateKey create(final Bytes32 key) {
-      return new PrivateKey(key);
-    }
-
-    @Override
-    public boolean equals(final Object other) {
-      if (!(other instanceof PrivateKey)) {
-        return false;
-      }
-
-      final PrivateKey that = (PrivateKey) other;
-      return this.encoded.equals(that.encoded);
-    }
-
-    @Override
-    public byte[] getEncoded() {
-      return encoded.toArrayUnsafe();
-    }
-
-    public Bytes32 getEncodedBytes() {
-      return encoded;
-    }
-
-    public BigInteger getD() {
-      return encoded.toUnsignedBigInteger();
-    }
-
-    @Override
-    public String getAlgorithm() {
-      return ALGORITHM;
-    }
-
-    @Override
-    public String getFormat() {
-      return null;
-    }
-
-    @Override
-    public int hashCode() {
-      return encoded.hashCode();
-    }
-
-    @Override
-    public String toString() {
-      return encoded.toString();
-    }
-  }
-
-  public static class PublicKey implements java.security.PublicKey {
-
-    public static final int BYTE_LENGTH = 64;
-
-    private final Bytes encoded;
-
-    public static PublicKey create(final PrivateKey privateKey) {
-      BigInteger privKey = privateKey.getEncodedBytes().toUnsignedBigInteger();
-
-      /*
-       * TODO: FixedPointCombMultiplier currently doesn't support scalars longer than the group
-       * order, but that could change in future versions.
-       */
-      if (privKey.bitLength() > CURVE.getN().bitLength()) {
-        privKey = privKey.mod(CURVE.getN());
-      }
-
-      final ECPoint point = new FixedPointCombMultiplier().multiply(CURVE.getG(), privKey);
-      return PublicKey.create(Bytes.wrap(Arrays.copyOfRange(point.getEncoded(false), 1, 65)));
-    }
-
-    private static Bytes toBytes64(final byte[] backing) {
-      if (backing.length == BYTE_LENGTH) {
-        return Bytes.wrap(backing);
-      } else if (backing.length > BYTE_LENGTH) {
-        return Bytes.wrap(backing, backing.length - BYTE_LENGTH, BYTE_LENGTH);
-      } else {
-        final MutableBytes res = MutableBytes.create(BYTE_LENGTH);
-        Bytes.wrap(backing).copyTo(res, BYTE_LENGTH - backing.length);
-        return res;
-      }
-    }
-
-    public static PublicKey create(final BigInteger key) {
-      checkNotNull(key);
-      return create(toBytes64(key.toByteArray()));
-    }
-
-    public static PublicKey create(final Bytes encoded) {
-      return new PublicKey(encoded);
-    }
-
-    public static Optional<PublicKey> recoverFromSignature(
-        final Bytes32 dataHash, final Signature signature) {
-      if (useNative) {
-        return recoverFromSignatureNative(dataHash, signature);
-      } else {
-        final BigInteger publicKeyBI =
-            SECP256K1.recoverFromSignature(
-                signature.getRecId(), signature.getR(), signature.getS(), dataHash);
-        return Optional.ofNullable(publicKeyBI).map(PublicKey::create);
-      }
-    }
-
-    private PublicKey(final Bytes encoded) {
-      checkNotNull(encoded);
-      checkArgument(
-          encoded.size() == BYTE_LENGTH,
-          "Encoding must be %s bytes long, got %s",
-          BYTE_LENGTH,
-          encoded.size());
-      this.encoded = encoded;
-    }
-
-    /**
-     * Returns this public key as an {@link ECPoint} of Bouncy Castle, to facilitate cryptographic
-     * operations.
-     *
-     * @return This public key represented as an Elliptic Curve point.
-     */
-    public ECPoint asEcPoint() {
-      // 0x04 is the prefix for uncompressed keys.
-      final Bytes val = Bytes.concatenate(Bytes.of(0x04), encoded);
-      return CURVE.getCurve().decodePoint(val.toArrayUnsafe());
-    }
-
-    @Override
-    public boolean equals(final Object other) {
-      if (!(other instanceof PublicKey)) {
-        return false;
-      }
-
-      final PublicKey that = (PublicKey) other;
-      return this.encoded.equals(that.encoded);
-    }
-
-    @Override
-    public byte[] getEncoded() {
-      return encoded.toArrayUnsafe();
-    }
-
-    public Bytes getEncodedBytes() {
-      return encoded;
-    }
-
-    @Override
-    public String getAlgorithm() {
-      return ALGORITHM;
-    }
-
-    @Override
-    public String getFormat() {
-      return null;
-    }
-
-    @Override
-    public int hashCode() {
-      return encoded.hashCode();
-    }
-
-    @Override
-    public String toString() {
-      return encoded.toString();
-    }
-  }
-
-  public static class KeyPair {
-
-    private final PrivateKey privateKey;
-    private final PublicKey publicKey;
-
-    public KeyPair(final PrivateKey privateKey, final PublicKey publicKey) {
-      checkNotNull(privateKey);
-      checkNotNull(publicKey);
-      this.privateKey = privateKey;
-      this.publicKey = publicKey;
-    }
-
-    public static KeyPair create(final PrivateKey privateKey) {
-      return new KeyPair(privateKey, PublicKey.create(privateKey));
-    }
-
-    public static KeyPair generate() {
-      final java.security.KeyPair rawKeyPair = KEY_PAIR_GENERATOR.generateKeyPair();
-      final BCECPrivateKey privateKey = (BCECPrivateKey) rawKeyPair.getPrivate();
-      final BCECPublicKey publicKey = (BCECPublicKey) rawKeyPair.getPublic();
-
-      final BigInteger privateKeyValue = privateKey.getD();
-
-      // Ethereum does not use encoded public keys like bitcoin - see
-      // https://en.bitcoin.it/wiki/Elliptic_Curve_Digital_Signature_Algorithm for details
-      // Additionally, as the first bit is a constant prefix (0x04) we ignore this value
-      final byte[] publicKeyBytes = publicKey.getQ().getEncoded(false);
-      final BigInteger publicKeyValue =
-          new BigInteger(1, Arrays.copyOfRange(publicKeyBytes, 1, publicKeyBytes.length));
-
-      return new KeyPair(PrivateKey.create(privateKeyValue), PublicKey.create(publicKeyValue));
-    }
-
-    @Override
-    public int hashCode() {
-      return Objects.hash(privateKey, publicKey);
-    }
-
-    @Override
-    public boolean equals(final Object other) {
-      if (!(other instanceof KeyPair)) {
-        return false;
-      }
-
-      final KeyPair that = (KeyPair) other;
-      return this.privateKey.equals(that.privateKey) && this.publicKey.equals(that.publicKey);
-    }
-
-    public PrivateKey getPrivateKey() {
-      return privateKey;
-    }
-
-    public PublicKey getPublicKey() {
-      return publicKey;
-    }
-  }
-
-  public static class Signature {
-
-    public static final int BYTES_REQUIRED = 65;
-    /**
-     * The recovery id to reconstruct the public key used to create the signature.
-     *
-     * <p>The recId is an index from 0 to 3 which indicates which of the 4 possible keys is the
-     * correct one. Because the key recovery operation yields multiple potential keys, the correct
-     * key must either be stored alongside the signature, or you must be willing to try each recId
-     * in turn until you find one that outputs the key you are expecting.
-     */
-    private final byte recId;
-
-    private final BigInteger r;
-    private final BigInteger s;
-
-    private final Supplier<Bytes> encoded = Suppliers.memoize(this::_encodedBytes);
-
-    Signature(final BigInteger r, final BigInteger s, final byte recId) {
-      this.r = r;
-      this.s = s;
-      this.recId = recId;
-    }
-
-    /**
-     * Creates a new signature object given its parameters.
-     *
-     * @param r the 'r' part of the signature.
-     * @param s the 's' part of the signature.
-     * @param recId the recovery id part of the signature.
-     * @return the created {@link Signature} object.
-     * @throws NullPointerException if {@code r} or {@code s} are {@code null}.
-     * @throws IllegalArgumentException if any argument is invalid (for instance, {@code v} is
-     *     neither 27 or 28).
-     */
-    public static Signature create(final BigInteger r, final BigInteger s, final byte recId) {
-      checkNotNull(r);
-      checkNotNull(s);
-      checkInBounds("r", r);
-      checkInBounds("s", s);
-      if (recId != 0 && recId != 1) {
-        throw new IllegalArgumentException(
-            "Invalid 'recId' value, should be 0 or 1 but got " + recId);
-      }
-      return new Signature(r, s, recId);
-    }
-
-    private static void checkInBounds(final String name, final BigInteger i) {
-      if (i.compareTo(BigInteger.ONE) < 0) {
-        throw new IllegalArgumentException(
-            String.format("Invalid '%s' value, should be >= 1 but got %s", name, i));
-      }
-
-      if (i.compareTo(CURVE_ORDER) >= 0) {
-        throw new IllegalArgumentException(
-            String.format("Invalid '%s' value, should be < %s but got %s", CURVE_ORDER, name, i));
-      }
-    }
-
-    public static Signature decode(final Bytes bytes) {
-      checkArgument(
-          bytes.size() == BYTES_REQUIRED, "encoded SECP256K1 signature must be 65 bytes long");
-
-      final BigInteger r = bytes.slice(0, 32).toUnsignedBigInteger();
-      final BigInteger s = bytes.slice(32, 32).toUnsignedBigInteger();
-      final byte recId = bytes.get(64);
-      return SECP256K1.Signature.create(r, s, recId);
-    }
-
-    public Bytes encodedBytes() {
-      return encoded.get();
-    }
-
-    private Bytes _encodedBytes() {
-      final MutableBytes bytes = MutableBytes.create(BYTES_REQUIRED);
-      UInt256.valueOf(r).toBytes().copyTo(bytes, 0);
-      UInt256.valueOf(s).toBytes().copyTo(bytes, 32);
-      bytes.set(64, recId);
-      return bytes;
-    }
-
-    @Override
-    public boolean equals(final Object other) {
-      if (!(other instanceof Signature)) {
-        return false;
-      }
-
-      final Signature that = (Signature) other;
-      return this.r.equals(that.r) && this.s.equals(that.s) && this.recId == that.recId;
-    }
-
-    @Override
-    public int hashCode() {
-      return Objects.hash(r, s, recId);
-    }
-
-    public byte getRecId() {
-      return recId;
-    }
-
-    public BigInteger getR() {
-      return r;
-    }
-
-    public BigInteger getS() {
-      return s;
-    }
-
-    @Override
-    public String toString() {
-      final StringBuilder sb = new StringBuilder();
-      sb.append("SECP256K1.Signature").append("{");
-      sb.append("r=").append(r).append(", ");
-      sb.append("s=").append(s).append(", ");
-      sb.append("recId=").append(recId);
-      return sb.append("}").toString();
-    }
-  }
-}
diff --git a/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/FieldElement.java b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/FieldElement.java
deleted file mode 100644
index a9c8561960b..00000000000
--- a/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/FieldElement.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.crypto.altbn128;
-
-import java.math.BigInteger;
-
-/**
- * Adapted from the pc_ecc (Apache 2 License) implementation:
- * https://github.com/ethereum/py_ecc/blob/master/py_ecc/bn128/bn128_field_elements.py
- */
-@SuppressWarnings("rawtypes")
-public interface FieldElement<T extends FieldElement> {
-
-  BigInteger FIELD_MODULUS =
-      new BigInteger(
-          "21888242871839275222246405745257275088696311157297823662689037894645226208583");
-
-  boolean isValid();
-
-  boolean isZero();
-
-  T add(T other);
-
-  T subtract(T other);
-
-  T multiply(int val);
-
-  T multiply(T other);
-
-  T negate();
-
-  T divide(T other);
-
-  T power(int n);
-
-  T power(BigInteger n);
-}
diff --git a/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/FieldPoint.java b/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/FieldPoint.java
deleted file mode 100644
index 4648f2bcaf5..00000000000
--- a/crypto/src/main/java/org/hyperledger/besu/crypto/altbn128/FieldPoint.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.crypto.altbn128;
-
-import java.math.BigInteger;
-
-/**
- * Adapted from the pc_ecc (Apache 2 License) implementation:
- * https://github.com/ethereum/py_ecc/blob/master/py_ecc/bn128/bn128_field_elements.py
- */
-@SuppressWarnings("rawtypes")
-public interface FieldPoint<T extends FieldPoint> {
-
-  boolean isInfinity();
-
-  T add(T other);
-
-  T multiply(T other);
-
-  T multiply(BigInteger n);
-
-  T doub();
-
-  T negate();
-}
diff --git a/crypto/src/test-support/java/org/hyperledger/besu/crypto/NodeKeyUtils.java b/crypto/src/test-support/java/org/hyperledger/besu/crypto/NodeKeyUtils.java
deleted file mode 100644
index bc7b46fccb4..00000000000
--- a/crypto/src/test-support/java/org/hyperledger/besu/crypto/NodeKeyUtils.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.crypto;
-
-public class NodeKeyUtils {
-
-  public static NodeKey createFrom(final SECP256K1.KeyPair keyPair) {
-    return new NodeKey(new KeyPairSecurityModule(keyPair));
-  }
-
-  public static NodeKey generate() {
-    return new NodeKey(new KeyPairSecurityModule(SECP256K1.KeyPair.generate()));
-  }
-}
diff --git a/crypto/src/test/java/org/hyperledger/besu/crypto/Blake2bfMessageDigestTest.java b/crypto/src/test/java/org/hyperledger/besu/crypto/Blake2bfMessageDigestTest.java
deleted file mode 100644
index 0cb91527796..00000000000
--- a/crypto/src/test/java/org/hyperledger/besu/crypto/Blake2bfMessageDigestTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.crypto;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.bouncycastle.util.Pack;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Test vectors adapted from
- * https://github.com/keep-network/blake2b/blob/master/compression/f_test.go
- */
-public class Blake2bfMessageDigestTest {
-
-  private Blake2bfMessageDigest messageDigest;
-
-  // output when input is all 0
-  private static final byte[] BLAKE2F_ALL_ZERO =
-      new byte[] {
-        8, -55, -68, -13, 103, -26, 9, 106, 59, -89, -54, -124, -123, -82, 103, -69, 43, -8, -108,
-        -2, 114, -13, 110, 60, -15, 54, 29, 95, 58, -11, 79, -91, -47, -126, -26, -83, 127, 82, 14,
-        81, 31, 108, 62, 43, -116, 104, 5, -101, 107, -67, 65, -5, -85, -39, -125, 31, 121, 33, 126,
-        19, 25, -51, -32, 91
-      };
-
-  // output when input is all 0 for 4294967295 rounds
-  private static final byte[] BLAKE2F_ALL_ZERO_NEGATIVE_ROUNDS =
-      new byte[] {
-        -111, -99, -124, 115, 29, 109, 127, 118, 18, 21, 75, -89, 60, 35, 112, 81, 110, 78, -8, 40,
-        -102, 19, -73, -97, 57, 69, 69, -89, 83, 66, 124, -43, -92, 78, 115, 115, 117, 123, -105,
-        -25, 25, -74, -1, -94, -127, 14, 87, 123, -26, 84, -75, -82, -78, 54, 48, -125, 38, -58, 7,
-        -61, 120, -93, -42, -38
-      };
-
-  @Before
-  public void setUp() {
-    messageDigest = new Blake2bfMessageDigest();
-  }
-
-  @Test
-  public void digestIfUpdatedCorrectlyWithBytes() {
-    for (int i = 0; i < 213; i++) {
-      messageDigest.update((byte) 0);
-    }
-    assertThat(messageDigest.digest()).isEqualTo(BLAKE2F_ALL_ZERO);
-  }
-
-  @Test
-  public void digestIfUpdatedCorrectlyWithByteArray() {
-    final byte[] update = new byte[213];
-    messageDigest.update(update, 0, 213);
-    assertThat(messageDigest.digest()).isEqualTo(BLAKE2F_ALL_ZERO);
-  }
-
-  @Test
-  public void digestIfUpdatedCorrectlyMixed() {
-    final byte[] update = new byte[213];
-    messageDigest.update((byte) 0);
-    messageDigest.update(update, 2, 211);
-    messageDigest.update((byte) 0);
-    assertThat(messageDigest.digest()).isEqualTo(BLAKE2F_ALL_ZERO);
-  }
-
-  @Test
-  public void digestWithMaxRounds() {
-    // equal to unsigned int max value (4294967295, or signed -1)
-    final byte[] rounds = Pack.intToBigEndian(Integer.MIN_VALUE);
-    messageDigest.update(rounds, 0, 4);
-    messageDigest.update(new byte[213], 0, 209);
-    assertThat(messageDigest.digest()).isEqualTo(BLAKE2F_ALL_ZERO_NEGATIVE_ROUNDS);
-  }
-
-  @Test(expected = IllegalStateException.class)
-  public void throwsIfBufferUpdatedWithLessThat213Bytes() {
-    for (int i = 0; i < 212; i++) {
-      messageDigest.update((byte) 0);
-    }
-    messageDigest.digest();
-  }
-
-  @Test(expected = IllegalArgumentException.class)
-  public void throwsIfBufferUpdatedWithMoreThat213Bytes() {
-    for (int i = 0; i < 214; i++) {
-      messageDigest.update((byte) 0);
-    }
-  }
-
-  @Test(expected = IllegalArgumentException.class)
-  public void throwsIfBufferUpdatedLargeByteArray() {
-    final byte[] update = new byte[213];
-    messageDigest.update((byte) 0);
-    messageDigest.update(update, 0, 213);
-  }
-
-  @Test(expected = IllegalArgumentException.class)
-  public void throwsIfEmptyBufferUpdatedLargeByteArray() {
-    final byte[] update = new byte[214];
-    messageDigest.update(update, 0, 214);
-  }
-}
diff --git a/crypto/src/test/java/org/hyperledger/besu/crypto/HashTest.java b/crypto/src/test/java/org/hyperledger/besu/crypto/HashTest.java
deleted file mode 100644
index 117cd304c33..00000000000
--- a/crypto/src/test/java/org/hyperledger/besu/crypto/HashTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.crypto;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.bouncycastle.util.encoders.Hex;
-import org.junit.Test;
-
-public class HashTest {
-
-  private static final String cowKeccak256 =
-      "c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4";
-  private static final String horseKeccak256 =
-      "c87f65ff3f271bf5dc8643484f66b200109caffe4bf98c4cb393dc35740b28c0";
-
-  private static final String inputBlake2bf =
-      "000000016a09e667f2bd8948bb67ae8584caa73b3c6ef372fe94f82ba54ff53a5f1d36f1510e527fade682d19b05688c2b3e6c1f1f83d9abfb41bd6b5be0cd19137e217907060504030201000f0e0d0c0b0a090817161514131211101f1e1d1c1b1a191827262524232221202f2e2d2c2b2a292837363534333231303f3e3d3c3b3a3938000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000001";
-
-  private static final String outputBlake2bf =
-      "bd45dd07a6eac13eec520b6aac885a1a89ea882978ae1a07472cc3e8cd358fd1a4d431c1a7d03f4a2bf746506779a970bfc5477026701076eda181e16acc24bc";
-
-  /** Validate keccak256 hash. */
-  @Test
-  public void keccak256Hash() {
-    final Bytes resultHorse = Hash.keccak256(Bytes.wrap("horse".getBytes(UTF_8)));
-    assertThat(resultHorse).isEqualTo(Bytes.fromHexString(horseKeccak256));
-
-    final Bytes resultCow = Hash.keccak256(Bytes.wrap("cow".getBytes(UTF_8)));
-    assertThat(resultCow).isEqualTo(Bytes.fromHexString(cowKeccak256));
-  }
-
-  /** Validate blake2f compression digest. */
-  @Test
-  public void blake2bfCompression() {
-    final Bytes result = Hash.blake2bf(Bytes.wrap(Hex.decode(inputBlake2bf)));
-    assertThat(result).isEqualTo(Bytes.fromHexString(outputBlake2bf));
-  }
-}
diff --git a/crypto/src/test/java/org/hyperledger/besu/crypto/NodeKeyTest.java b/crypto/src/test/java/org/hyperledger/besu/crypto/NodeKeyTest.java
deleted file mode 100644
index 610e2d667d4..00000000000
--- a/crypto/src/test/java/org/hyperledger/besu/crypto/NodeKeyTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.crypto;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
-
-public class NodeKeyTest {
-
-  @Test
-  public void publicKeyShouldMatch() {
-    final Bytes keyPairPubKey =
-        Bytes.fromHexString(
-            "0x35f48529f73c4172850ed18997d00d101a9aebc130103c23d41d46351c1b1d72ffc8b246af3a446d99a8218bd69e231b75932ea9a79173751dc7eb2eb0e301f2");
-    final Bytes32 keyPairPrvKey =
-        Bytes32.fromHexString("0xf7a58d5e755d51fa2f6206e91dd574597c73248aaf946ec1964b8c6268d6207b");
-
-    final SECP256K1.KeyPair keyPair =
-        SECP256K1.KeyPair.create(SECP256K1.PrivateKey.create(keyPairPrvKey));
-    final KeyPairSecurityModule keyPairSecurityModule = new KeyPairSecurityModule(keyPair);
-    final NodeKey nodeKey = new NodeKey(keyPairSecurityModule);
-
-    Assertions.assertThat(nodeKey.getPublicKey().getEncodedBytes())
-        .isEqualByComparingTo(keyPair.getPublicKey().getEncodedBytes());
-
-    Assertions.assertThat(nodeKey.getPublicKey().getEncodedBytes())
-        .isEqualByComparingTo(keyPairPubKey);
-  }
-}
diff --git a/crypto/src/test/java/org/hyperledger/besu/crypto/SECP256K1Test.java b/crypto/src/test/java/org/hyperledger/besu/crypto/SECP256K1Test.java
deleted file mode 100644
index fea04321734..00000000000
--- a/crypto/src/test/java/org/hyperledger/besu/crypto/SECP256K1Test.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.crypto;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.tuweni.bytes.Bytes.fromHexString;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.crypto.Hash.keccak256;
-
-import java.io.File;
-import java.math.BigInteger;
-import java.nio.file.Files;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class SECP256K1Test {
-
-  protected static String suiteStartTime = null;
-  protected static String suiteName = null;
-
-  @BeforeClass
-  public static void setTestSuiteStartTime() {
-    suiteStartTime =
-        LocalDateTime.now(ZoneId.systemDefault())
-            .format(DateTimeFormatter.ofPattern("yyyyMMdd-HHmmss"));
-    suiteName(SECP256K1Test.class);
-  }
-
-  public static void suiteName(final Class<?> clazz) {
-    suiteName = clazz.getSimpleName() + "-" + suiteStartTime;
-  }
-
-  public static String suiteName() {
-    return suiteName;
-  }
-
-  @Test(expected = NullPointerException.class)
-  public void createPrivateKey_NullEncoding() {
-    SECP256K1.PrivateKey.create((Bytes32) null);
-  }
-
-  @Test
-  public void privateKeyEquals() {
-    final SECP256K1.PrivateKey privateKey1 = SECP256K1.PrivateKey.create(BigInteger.TEN);
-    final SECP256K1.PrivateKey privateKey2 = SECP256K1.PrivateKey.create(BigInteger.TEN);
-
-    assertThat(privateKey2).isEqualTo(privateKey1);
-  }
-
-  @Test
-  public void privateHashCode() {
-    final SECP256K1.PrivateKey privateKey = SECP256K1.PrivateKey.create(BigInteger.TEN);
-
-    assertThat(privateKey.hashCode()).isNotZero();
-  }
-
-  @Test(expected = NullPointerException.class)
-  public void createPublicKey_NullEncoding() {
-    SECP256K1.PublicKey.create((Bytes) null);
-  }
-
-  @Test(expected = IllegalArgumentException.class)
-  public void createPublicKey_EncodingTooShort() {
-    SECP256K1.PublicKey.create(Bytes.wrap(new byte[63]));
-  }
-
-  @Test(expected = IllegalArgumentException.class)
-  public void createPublicKey_EncodingTooLong() {
-    SECP256K1.PublicKey.create(Bytes.wrap(new byte[65]));
-  }
-
-  @Test
-  public void publicKeyEquals() {
-    final SECP256K1.PublicKey publicKey1 =
-        SECP256K1.PublicKey.create(
-            fromHexString(
-                "a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7893aba425419bc27a3b6c7e693a24c696f794c2ed877a1593cbee53b037368d7"));
-    final SECP256K1.PublicKey publicKey2 =
-        SECP256K1.PublicKey.create(
-            fromHexString(
-                "a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7893aba425419bc27a3b6c7e693a24c696f794c2ed877a1593cbee53b037368d7"));
-
-    assertThat(publicKey2).isEqualTo(publicKey1);
-  }
-
-  @Test
-  public void publicHashCode() {
-    final SECP256K1.PublicKey publicKey =
-        SECP256K1.PublicKey.create(
-            fromHexString(
-                "a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7893aba425419bc27a3b6c7e693a24c696f794c2ed877a1593cbee53b037368d7"));
-
-    assertThat(publicKey.hashCode()).isNotZero();
-  }
-
-  @Test(expected = NullPointerException.class)
-  public void createKeyPair_PublicKeyNull() {
-    new SECP256K1.KeyPair(null, SECP256K1.PublicKey.create(Bytes.wrap(new byte[64])));
-  }
-
-  @Test(expected = NullPointerException.class)
-  public void createKeyPair_PrivateKeyNull() {
-    new SECP256K1.KeyPair(SECP256K1.PrivateKey.create(Bytes32.wrap(new byte[32])), null);
-  }
-
-  @Test
-  public void keyPairGeneration() {
-    final SECP256K1.KeyPair keyPair = SECP256K1.KeyPair.generate();
-    assertThat(keyPair).isNotNull();
-    assertThat(keyPair.getPrivateKey()).isNotNull();
-    assertThat(keyPair.getPublicKey()).isNotNull();
-  }
-
-  @Test
-  public void keyPairEquals() {
-    final SECP256K1.PrivateKey privateKey1 = SECP256K1.PrivateKey.create(BigInteger.TEN);
-    final SECP256K1.PrivateKey privateKey2 = SECP256K1.PrivateKey.create(BigInteger.TEN);
-    final SECP256K1.PublicKey publicKey1 =
-        SECP256K1.PublicKey.create(
-            fromHexString(
-                "a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7893aba425419bc27a3b6c7e693a24c696f794c2ed877a1593cbee53b037368d7"));
-    final SECP256K1.PublicKey publicKey2 =
-        SECP256K1.PublicKey.create(
-            fromHexString(
-                "a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7893aba425419bc27a3b6c7e693a24c696f794c2ed877a1593cbee53b037368d7"));
-
-    final SECP256K1.KeyPair keyPair1 = new SECP256K1.KeyPair(privateKey1, publicKey1);
-    final SECP256K1.KeyPair keyPair2 = new SECP256K1.KeyPair(privateKey2, publicKey2);
-
-    assertThat(keyPair2).isEqualTo(keyPair1);
-  }
-
-  @Test
-  public void keyPairHashCode() {
-    final SECP256K1.KeyPair keyPair = SECP256K1.KeyPair.generate();
-    assertThat(keyPair.hashCode()).isNotZero();
-  }
-
-  @Test
-  public void keyPairGeneration_PublicKeyRecovery() {
-    final SECP256K1.KeyPair keyPair = SECP256K1.KeyPair.generate();
-    assertThat(SECP256K1.PublicKey.create(keyPair.getPrivateKey()))
-        .isEqualTo(keyPair.getPublicKey());
-  }
-
-  @Test
-  public void publicKeyRecovery() {
-    final SECP256K1.PrivateKey privateKey = SECP256K1.PrivateKey.create(BigInteger.TEN);
-    final SECP256K1.PublicKey expectedPublicKey =
-        SECP256K1.PublicKey.create(
-            fromHexString(
-                "a0434d9e47f3c86235477c7b1ae6ae5d3442d49b1943c2b752a68e2a47e247c7893aba425419bc27a3b6c7e693a24c696f794c2ed877a1593cbee53b037368d7"));
-
-    final SECP256K1.PublicKey publicKey = SECP256K1.PublicKey.create(privateKey);
-    assertThat(publicKey).isEqualTo(expectedPublicKey);
-  }
-
-  @Test
-  public void createSignature() {
-    final SECP256K1.Signature signature =
-        SECP256K1.Signature.create(BigInteger.ONE, BigInteger.TEN, (byte) 0);
-    assertThat(signature.getR()).isEqualTo(BigInteger.ONE);
-    assertThat(signature.getS()).isEqualTo(BigInteger.TEN);
-    assertThat(signature.getRecId()).isEqualTo((byte) 0);
-  }
-
-  @Test(expected = NullPointerException.class)
-  public void createSignature_NoR() {
-    SECP256K1.Signature.create(null, BigInteger.ZERO, (byte) 27);
-  }
-
-  @Test(expected = NullPointerException.class)
-  public void createSignature_NoS() {
-    SECP256K1.Signature.create(BigInteger.ZERO, null, (byte) 27);
-  }
-
-  @Test
-  public void recoverPublicKeyFromSignature() {
-    final SECP256K1.PrivateKey privateKey =
-        SECP256K1.PrivateKey.create(
-            new BigInteger("c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4", 16));
-    final SECP256K1.KeyPair keyPair = SECP256K1.KeyPair.create(privateKey);
-
-    final Bytes data = Bytes.wrap("This is an example of a signed message.".getBytes(UTF_8));
-    final Bytes32 dataHash = keccak256(data);
-    final SECP256K1.Signature signature = SECP256K1.sign(dataHash, keyPair);
-
-    final SECP256K1.PublicKey recoveredPublicKey =
-        SECP256K1.PublicKey.recoverFromSignature(dataHash, signature).get();
-    assertThat(recoveredPublicKey.toString()).isEqualTo(keyPair.getPublicKey().toString());
-  }
-
-  @Test
-  public void signatureGeneration() {
-    final SECP256K1.PrivateKey privateKey =
-        SECP256K1.PrivateKey.create(
-            new BigInteger("c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4", 16));
-    final SECP256K1.KeyPair keyPair = SECP256K1.KeyPair.create(privateKey);
-
-    final Bytes data = Bytes.wrap("This is an example of a signed message.".getBytes(UTF_8));
-    final Bytes32 dataHash = keccak256(data);
-    final SECP256K1.Signature expectedSignature =
-        SECP256K1.Signature.create(
-            new BigInteger("d2ce488f4da29e68f22cb05cac1b19b75df170a12b4ad1bdd4531b8e9115c6fb", 16),
-            new BigInteger("75c1fe50a95e8ccffcbb5482a1e42fbbdd6324131dfe75c3b3b7f9a7c721eccb", 16),
-            (byte) 1);
-
-    final SECP256K1.Signature actualSignature = SECP256K1.sign(dataHash, keyPair);
-    assertThat(actualSignature).isEqualTo(expectedSignature);
-  }
-
-  @Test
-  public void signatureVerification() {
-    final SECP256K1.PrivateKey privateKey =
-        SECP256K1.PrivateKey.create(
-            new BigInteger("c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4", 16));
-    final SECP256K1.KeyPair keyPair = SECP256K1.KeyPair.create(privateKey);
-
-    final Bytes data = Bytes.wrap("This is an example of a signed message.".getBytes(UTF_8));
-    final Bytes32 dataHash = keccak256(data);
-
-    final SECP256K1.Signature signature = SECP256K1.sign(dataHash, keyPair);
-    assertThat(SECP256K1.verify(data, signature, keyPair.getPublicKey(), Hash::keccak256)).isTrue();
-  }
-
-  @Test
-  public void fileContainsValidPrivateKey() throws Exception {
-    final File file =
-        new File(
-            this.getClass()
-                .getResource("/org/hyperledger/besu/crypto/validPrivateKey.txt")
-                .toURI());
-    final SECP256K1.PrivateKey privateKey = KeyPairUtil.loadPrivateKey(file);
-    assertThat(privateKey.getEncodedBytes())
-        .isEqualTo(
-            Bytes.fromHexString(
-                "000000000000000000000000000000000000000000000000000000000000000A"));
-  }
-
-  @Test
-  public void readWritePrivateKeyString() throws Exception {
-    final SECP256K1.PrivateKey privateKey = SECP256K1.PrivateKey.create(BigInteger.TEN);
-    final SECP256K1.KeyPair keyPair1 = SECP256K1.KeyPair.create(privateKey);
-    final File tempFile = Files.createTempFile(suiteName(), ".keypair").toFile();
-    tempFile.deleteOnExit();
-    KeyPairUtil.storeKeyPair(keyPair1, tempFile);
-    final SECP256K1.KeyPair keyPair2 = KeyPairUtil.load(tempFile);
-    assertThat(keyPair2).isEqualTo(keyPair1);
-  }
-
-  @Test(expected = IllegalArgumentException.class)
-  public void invalidFileThrowsInvalidKeyPairException() throws Exception {
-    final File tempFile = Files.createTempFile(suiteName(), ".keypair").toFile();
-    tempFile.deleteOnExit();
-    Files.write(tempFile.toPath(), "not valid".getBytes(UTF_8));
-    KeyPairUtil.load(tempFile);
-  }
-
-  @Test(expected = IllegalArgumentException.class)
-  public void invalidMultiLineFileThrowsInvalidIdException() throws Exception {
-    final File tempFile = Files.createTempFile(suiteName(), ".keypair").toFile();
-    tempFile.deleteOnExit();
-    Files.write(tempFile.toPath(), "not\n\nvalid".getBytes(UTF_8));
-    KeyPairUtil.load(tempFile);
-  }
-}
diff --git a/crypto/src/test/resources/log4j2.xml b/crypto/src/test/resources/log4j2.xml
deleted file mode 100644
index fbb27234e16..00000000000
--- a/crypto/src/test/resources/log4j2.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN" monitorInterval="30">
-    <Properties>
-        <Property name="root.log.level">INFO</Property>
-    </Properties>
-    <Appenders>
-        <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSSZZZ} [%t] %-5level %c{1.} %msg%n" />
-        </Console>
-    </Appenders>
-    <Loggers>
-        <Root level="${sys:root.log.level}">
-            <AppenderRef ref="Console" />
-        </Root>
-    </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/datatypes/build.gradle b/datatypes/build.gradle
new file mode 100644
index 00000000000..2f4a0e02065
--- /dev/null
+++ b/datatypes/build.gradle
@@ -0,0 +1,59 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+apply plugin: 'java-library'
+
+jar {
+  archiveBaseName = 'besu-datatypes'
+  manifest {
+    attributes(
+      'Specification-Title': archiveBaseName,
+      'Specification-Version': project.version,
+      'Implementation-Title': archiveBaseName,
+      'Implementation-Version': calculateVersion(),
+      'Automatic-Module-Name': 'org.hyperledger.besu.datatypes'
+      )
+  }
+}
+
+dependencies {
+  compileOnly 'com.fasterxml.jackson.core:jackson-databind'
+
+  implementation project(':crypto:algorithms')
+  implementation project(':ethereum:rlp')
+  implementation 'com.google.guava:guava'
+  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-units'
+
+  testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
+  testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
+}
+
+configurations { testArtifacts }
+
+publishing {
+  publications {
+    mavenJava(MavenPublication) {
+      groupId 'org.hyperledger.besu'
+      artifactId 'besu-datatypes'
+      pom {
+        name = 'Besu Datatypes'
+        description = 'Cross-module datatypes'
+      }
+    }
+  }
+}
diff --git a/datatypes/src/main/java/org/hyperledger/besu/datatypes/AccountValue.java b/datatypes/src/main/java/org/hyperledger/besu/datatypes/AccountValue.java
new file mode 100644
index 00000000000..b41d5b51e13
--- /dev/null
+++ b/datatypes/src/main/java/org/hyperledger/besu/datatypes/AccountValue.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.datatypes;
+
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+
+/** The values of an account in the world state trie. */
+public interface AccountValue {
+  /**
+   * The nonce of the account.
+   *
+   * @return the nonce of the account.
+   */
+  long getNonce();
+
+  /**
+   * The available balance of that account.
+   *
+   * @return the balance, in Wei, of the account.
+   */
+  Wei getBalance();
+
+  /**
+   * The hash of the root of the storage trie associated with this account.
+   *
+   * @return the hash of the root node of the storage trie.
+   */
+  Hash getStorageRoot();
+
+  /**
+   * The hash of the EVM bytecode associated with this account.
+   *
+   * @return the hash of the account code (which may be {@link Hash#EMPTY}).
+   */
+  Hash getCodeHash();
+
+  /**
+   * Writes the account value to the provided {@link RLPOutput}.
+   *
+   * @param out the {@link RLPOutput} to write to.
+   */
+  void writeTo(final RLPOutput out);
+}
diff --git a/datatypes/src/main/java/org/hyperledger/besu/datatypes/Address.java b/datatypes/src/main/java/org/hyperledger/besu/datatypes/Address.java
new file mode 100644
index 00000000000..8862d9461e2
--- /dev/null
+++ b/datatypes/src/main/java/org/hyperledger/besu/datatypes/Address.java
@@ -0,0 +1,240 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.datatypes;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static org.hyperledger.besu.crypto.Hash.keccak256;
+
+import org.hyperledger.besu.crypto.SECPPublicKey;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPException;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.bytes.DelegatingBytes;
+
+/** A 160-bits account address. */
+public class Address extends DelegatingBytes {
+
+  /** The constant SIZE. */
+  public static final int SIZE = 20;
+
+  /** Specific addresses of the "precompiled" contracts. */
+  public static final Address ECREC = Address.precompiled(0x01);
+
+  /** The constant SHA256. */
+  public static final Address SHA256 = Address.precompiled(0x02);
+  /** The constant RIPEMD160. */
+  public static final Address RIPEMD160 = Address.precompiled(0x03);
+  /** The constant ID. */
+  public static final Address ID = Address.precompiled(0x04);
+  /** The constant MODEXP. */
+  public static final Address MODEXP = Address.precompiled(0x05);
+  /** The constant ALTBN128_ADD. */
+  public static final Address ALTBN128_ADD = Address.precompiled(0x06);
+  /** The constant ALTBN128_MUL. */
+  public static final Address ALTBN128_MUL = Address.precompiled(0x07);
+  /** The constant ALTBN128_PAIRING. */
+  public static final Address ALTBN128_PAIRING = Address.precompiled(0x08);
+  /** The constant BLAKE2B_F_COMPRESSION. */
+  public static final Address BLAKE2B_F_COMPRESSION = Address.precompiled(0x09);
+  /** The constant BLS12_G1ADD. */
+  public static final Address BLS12_G1ADD = Address.precompiled(0xA);
+  /** The constant BLS12_G1MUL. */
+  public static final Address BLS12_G1MUL = Address.precompiled(0xB);
+  /** The constant BLS12_G1MULTIEXP. */
+  public static final Address BLS12_G1MULTIEXP = Address.precompiled(0xC);
+  /** The constant BLS12_G2ADD. */
+  public static final Address BLS12_G2ADD = Address.precompiled(0xD);
+  /** The constant BLS12_G2MUL. */
+  public static final Address BLS12_G2MUL = Address.precompiled(0xE);
+  /** The constant BLS12_G2MULTIEXP. */
+  public static final Address BLS12_G2MULTIEXP = Address.precompiled(0xF);
+  /** The constant BLS12_PAIRING. */
+  public static final Address BLS12_PAIRING = Address.precompiled(0x10);
+  /** The constant BLS12_MAP_FP_TO_G1. */
+  public static final Address BLS12_MAP_FP_TO_G1 = Address.precompiled(0x11);
+  /** The constant BLS12_MAP_FP2_TO_G2. */
+  public static final Address BLS12_MAP_FP2_TO_G2 = Address.precompiled(0x12);
+  /** The constant KZG_POINT_EVAL. */
+  public static final Address KZG_POINT_EVAL = Address.precompiled(0x14);
+  /** The constant ZERO. */
+  public static final Address ZERO = Address.fromHexString("0x0");
+
+  /**
+   * Instantiates a new Address.
+   *
+   * @param bytes the bytes
+   */
+  protected Address(final Bytes bytes) {
+    super(bytes);
+  }
+
+  /**
+   * Wrap address.
+   *
+   * @param value the value
+   * @return the address
+   */
+  public static Address wrap(final Bytes value) {
+    checkArgument(
+        value.size() == SIZE,
+        "An account address must be %s bytes long, got %s",
+        SIZE,
+        value.size());
+    return new Address(value);
+  }
+
+  /**
+   * Creates an address from the given RLP-encoded input.
+   *
+   * @param input The input to read from
+   * @return the input's corresponding address
+   */
+  public static Address readFrom(final RLPInput input) {
+    final Bytes bytes = input.readBytes();
+    if (bytes.size() != SIZE) {
+      throw new RLPException(
+          String.format("Address unexpected size of %s (needs %s)", bytes.size(), SIZE));
+    }
+    return Address.wrap(bytes);
+  }
+
+  /**
+   * Extracts an address from a ECDSARECOVER result hash.
+   *
+   * @param hash A hash that has been obtained through hashing the return of the <code>
+   *     ECDSARECOVER     </code> function from Appendix F (Signing Transactions) of the Ethereum
+   *     Yellow Paper.
+   * @return The ethereum address from the provided hash.
+   */
+  public static Address extract(final Bytes32 hash) {
+    return wrap(hash.slice(12, 20));
+  }
+
+  /**
+   * Extract address.
+   *
+   * @param publicKey the public key
+   * @return the address
+   */
+  public static Address extract(final SECPPublicKey publicKey) {
+    return Address.extract(keccak256(publicKey.getEncodedBytes()));
+  }
+
+  /**
+   * Parse a hexadecimal string representing an account address.
+   *
+   * @param str A hexadecimal string (with or without the leading '0x') representing a valid account
+   *     address.
+   * @return The parsed address: {@code null} if the provided string is {@code null}.
+   * @throws IllegalArgumentException if the string is either not hexadecimal, or not the valid
+   *     representation of an address.
+   */
+  @JsonCreator
+  public static Address fromHexString(final String str) {
+    if (str == null) return null;
+    return wrap(Bytes.fromHexStringLenient(str, SIZE));
+  }
+
+  /**
+   * Parse a hexadecimal string representing an account address.
+   *
+   * @param str A hexadecimal string representing a valid account address (strictly 20 bytes).
+   * @return The parsed address.
+   * @throws IllegalArgumentException if the provided string is {@code null}.
+   * @throws IllegalArgumentException if the string is either not hexadecimal, or not the valid
+   *     representation of a 20 byte address.
+   */
+  public static Address fromHexStringStrict(final String str) {
+    checkArgument(str != null);
+    final Bytes value = Bytes.fromHexString(str);
+    checkArgument(
+        value.size() == SIZE,
+        "An account address must be be %s bytes long, got %s",
+        SIZE,
+        value.size());
+    return new Address(value);
+  }
+
+  /**
+   * Precompiled address.
+   *
+   * @param value the value
+   * @return the address
+   */
+  public static Address precompiled(final int value) {
+    // Keep it simple while we don't need precompiled above 127.
+    checkArgument(value < Byte.MAX_VALUE);
+    final byte[] address = new byte[SIZE];
+    address[SIZE - 1] = (byte) value;
+    return new Address(Bytes.wrap(address));
+  }
+
+  /**
+   * Privacy precompiled address.
+   *
+   * @param value the value
+   * @return the address
+   */
+  public static Address privacyPrecompiled(final int value) {
+    return precompiled(value);
+  }
+
+  /**
+   * Address of the created contract.
+   *
+   * <p>This implement equation (86) in Section 7 of the Yellow Paper (rev. a91c29c).
+   *
+   * @param senderAddress the address of the transaction sender.
+   * @param nonce the nonce of this transaction.
+   * @return The generated address of the created contract.
+   */
+  public static Address contractAddress(final Address senderAddress, final long nonce) {
+    return Address.extract(
+        keccak256(
+            RLP.encode(
+                out -> {
+                  out.startList();
+                  out.writeBytes(senderAddress);
+                  out.writeLongScalar(nonce);
+                  out.endList();
+                })));
+  }
+
+  /**
+   * Address of the created private contract.
+   *
+   * @param senderAddress the address of the transaction sender.
+   * @param nonce the nonce of this transaction.
+   * @param privacyGroupId hash of participants list ordered from Enclave response.
+   * @return The generated address of the created private contract.
+   */
+  public static Address privateContractAddress(
+      final Address senderAddress, final long nonce, final Bytes privacyGroupId) {
+    return Address.extract(
+        keccak256(
+            RLP.encode(
+                out -> {
+                  out.startList();
+                  out.writeBytes(senderAddress);
+                  out.writeLongScalar(nonce);
+                  out.writeBytes(privacyGroupId);
+                  out.endList();
+                })));
+  }
+}
diff --git a/datatypes/src/main/java/org/hyperledger/besu/datatypes/BLSPublicKey.java b/datatypes/src/main/java/org/hyperledger/besu/datatypes/BLSPublicKey.java
new file mode 100644
index 00000000000..32e29cfdf71
--- /dev/null
+++ b/datatypes/src/main/java/org/hyperledger/besu/datatypes/BLSPublicKey.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.datatypes;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import org.hyperledger.besu.ethereum.rlp.RLPException;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.DelegatingBytes;
+
+/** A BLS public key. */
+public class BLSPublicKey extends DelegatingBytes implements PublicKey {
+
+  /** The constant SIZE. */
+  public static final int SIZE = 48;
+
+  /**
+   * Instantiates a new BLSPublicKey.
+   *
+   * @param bytes the bytes
+   */
+  protected BLSPublicKey(final Bytes bytes) {
+    super(bytes);
+  }
+
+  /**
+   * Wrap public key.
+   *
+   * @param value the value
+   * @return the BLS public key
+   */
+  public static BLSPublicKey wrap(final Bytes value) {
+    checkArgument(
+        value.size() == SIZE, "A BLS public key must be %s bytes long, got %s", SIZE, value.size());
+    return new BLSPublicKey(value);
+  }
+
+  /**
+   * Creates a bls public key from the given RLP-encoded input.
+   *
+   * @param input The input to read from
+   * @return the input's corresponding public key
+   */
+  public static BLSPublicKey readFrom(final RLPInput input) {
+    final Bytes bytes = input.readBytes();
+    if (bytes.size() != SIZE) {
+      throw new RLPException(
+          String.format("BLSPublicKey unexpected size of %s (needs %s)", bytes.size(), SIZE));
+    }
+    return BLSPublicKey.wrap(bytes);
+  }
+
+  /**
+   * Parse a hexadecimal string representing an public key.
+   *
+   * @param str A hexadecimal string (with or without the leading '0x') representing a valid bls
+   *     public key.
+   * @return The parsed bls public key: {@code null} if the provided string is {@code null}.
+   * @throws IllegalArgumentException if the string is either not hexadecimal, or not the valid
+   *     representation of a BLSPublicKey.
+   */
+  @JsonCreator
+  public static BLSPublicKey fromHexString(final String str) {
+    if (str == null) return null;
+    return wrap(Bytes.fromHexStringLenient(str, SIZE));
+  }
+}
diff --git a/datatypes/src/main/java/org/hyperledger/besu/datatypes/BLSSignature.java b/datatypes/src/main/java/org/hyperledger/besu/datatypes/BLSSignature.java
new file mode 100644
index 00000000000..050205c1738
--- /dev/null
+++ b/datatypes/src/main/java/org/hyperledger/besu/datatypes/BLSSignature.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.datatypes;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import org.hyperledger.besu.ethereum.rlp.RLPException;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.DelegatingBytes;
+
+/** A BLS Signature * */
+public class BLSSignature extends DelegatingBytes {
+
+  /** The constant SIZE. */
+  public static final int SIZE = 96;
+
+  /**
+   * Instantiates a new BLSSignature.
+   *
+   * @param bytes the bytes
+   */
+  protected BLSSignature(final Bytes bytes) {
+    super(bytes);
+  }
+
+  /**
+   * Wrap signature.
+   *
+   * @param value the value
+   * @return the signature
+   */
+  public static BLSSignature wrap(final Bytes value) {
+    checkArgument(
+        value.size() == SIZE, "A signature must be %s bytes long, got %s", SIZE, value.size());
+    return new BLSSignature(value);
+  }
+
+  /**
+   * Creates a signature from the given RLP-encoded input.
+   *
+   * @param input The input to read from
+   * @return the input's corresponding signature
+   */
+  public static BLSSignature readFrom(final RLPInput input) {
+    final Bytes bytes = input.readBytes();
+    if (bytes.size() != SIZE) {
+      throw new RLPException(
+          String.format("BLSSignature unexpected size of %s (needs %s)", bytes.size(), SIZE));
+    }
+    return BLSSignature.wrap(bytes);
+  }
+
+  /**
+   * Parse a hexadecimal string representing a signature.
+   *
+   * @param str A hexadecimal string (with or without the leading '0x') representing a valid bls
+   *     signature.
+   * @return The parsed signature: {@code null} if the provided string is {@code null}.
+   * @throws IllegalArgumentException if the string is either not hexadecimal, or not the valid
+   *     representation of a bls signature.
+   */
+  @JsonCreator
+  public static BLSSignature fromHexString(final String str) {
+    if (str == null) return null;
+    return wrap(Bytes.fromHexStringLenient(str, SIZE));
+  }
+}
diff --git a/datatypes/src/main/java/org/hyperledger/besu/datatypes/DataGas.java b/datatypes/src/main/java/org/hyperledger/besu/datatypes/DataGas.java
new file mode 100644
index 00000000000..6028403ed0e
--- /dev/null
+++ b/datatypes/src/main/java/org/hyperledger/besu/datatypes/DataGas.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.datatypes;
+
+import java.math.BigInteger;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.BaseUInt256Value;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** A particular quantity of DataGas */
+public final class DataGas extends BaseUInt256Value<DataGas> implements Quantity {
+
+  /** The constant ZERO. */
+  public static final DataGas ZERO = of(0);
+
+  /** The constant ONE. */
+  public static final DataGas ONE = of(1);
+
+  /** The constant MAX_DATA_GAS. */
+  public static final DataGas MAX_DATA_GAS = of(UInt256.MAX_VALUE);
+
+  /**
+   * Instantiates a new DataGas.
+   *
+   * @param value the value
+   */
+  DataGas(final UInt256 value) {
+    super(value, DataGas::new);
+  }
+
+  private DataGas(final long v) {
+    this(UInt256.valueOf(v));
+  }
+
+  private DataGas(final BigInteger v) {
+    this(UInt256.valueOf(v));
+  }
+
+  private DataGas(final String hexString) {
+    this(UInt256.fromHexString(hexString));
+  }
+
+  /**
+   * data gas of value.
+   *
+   * @param value the value
+   * @return the data gas
+   */
+  public static DataGas of(final long value) {
+    return new DataGas(value);
+  }
+
+  /**
+   * data gas of value.
+   *
+   * @param value the value
+   * @return the data gas
+   */
+  public static DataGas of(final BigInteger value) {
+    return new DataGas(value);
+  }
+
+  /**
+   * data gas of value.
+   *
+   * @param value the value
+   * @return the data gas
+   */
+  public static DataGas of(final UInt256 value) {
+    return new DataGas(value);
+  }
+
+  /**
+   * data gas of value.
+   *
+   * @param value the value
+   * @return the data gas
+   */
+  public static DataGas ofNumber(final Number value) {
+    return new DataGas((BigInteger) value);
+  }
+
+  /**
+   * Wrap data gas.
+   *
+   * @param value the value
+   * @return the data gas
+   */
+  public static DataGas wrap(final Bytes value) {
+    return new DataGas(UInt256.fromBytes(value));
+  }
+
+  /**
+   * From hex string to data gas.
+   *
+   * @param str the str
+   * @return the data gas
+   */
+  public static DataGas fromHexString(final String str) {
+    return new DataGas(str);
+  }
+
+  @Override
+  public Number getValue() {
+    return getAsBigInteger();
+  }
+
+  @Override
+  public BigInteger getAsBigInteger() {
+    return toBigInteger();
+  }
+
+  @Override
+  public String toHexString() {
+    return super.toHexString();
+  }
+
+  @Override
+  public String toShortHexString() {
+    return super.isZero() ? "0x0" : super.toShortHexString();
+  }
+
+  /**
+   * From quantity to data gas.
+   *
+   * @param quantity the quantity
+   * @return the data gas
+   */
+  public static DataGas fromQuantity(final Quantity quantity) {
+    return DataGas.wrap((Bytes) quantity);
+  }
+}
diff --git a/datatypes/src/main/java/org/hyperledger/besu/datatypes/GWei.java b/datatypes/src/main/java/org/hyperledger/besu/datatypes/GWei.java
new file mode 100644
index 00000000000..75bba998b04
--- /dev/null
+++ b/datatypes/src/main/java/org/hyperledger/besu/datatypes/GWei.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.datatypes;
+
+import java.math.BigInteger;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.BaseUInt64Value;
+import org.apache.tuweni.units.bigints.UInt64;
+
+/** A particular quantity of GWei, the Ethereum currency. */
+public final class GWei extends BaseUInt64Value<GWei> implements Quantity {
+
+  /** The constant ZERO. */
+  public static final GWei ZERO = of(0);
+
+  /** The constant ONE. */
+  public static final GWei ONE = of(1);
+
+  /** The constant MAX_GWEI. */
+  public static final GWei MAX_GWEI = of(UInt64.MAX_VALUE);
+
+  /** The constant GWEI_TO_WEI_MULTIPLIER. */
+  private static final BigInteger GWEI_TO_WEI_MULTIPLIER = BigInteger.valueOf(1_000_000_000L);
+
+  /**
+   * Instantiates a new GWei.
+   *
+   * @param value the value
+   */
+  GWei(final UInt64 value) {
+    super(value, GWei::new);
+  }
+
+  private GWei(final long v) {
+    this(UInt64.valueOf(v));
+  }
+
+  private GWei(final BigInteger v) {
+    this(UInt64.valueOf(v));
+  }
+
+  private GWei(final String hexString) {
+    this(UInt64.fromHexString(hexString));
+  }
+
+  /**
+   * Returns GWei of value.
+   *
+   * @param value the value
+   * @return the GWei
+   */
+  public static GWei of(final long value) {
+    return new GWei(value);
+  }
+
+  /**
+   * Returns GWei of BigInteger value.
+   *
+   * @param value the value
+   * @return the GWei
+   */
+  public static GWei of(final BigInteger value) {
+    return new GWei(value);
+  }
+
+  /**
+   * Returns GWei of UInt64 value.
+   *
+   * @param value the value
+   * @return the GWei
+   */
+  public static GWei of(final UInt64 value) {
+    return new GWei(value);
+  }
+
+  /**
+   * Wrap Bytes into GWei.
+   *
+   * @param value the value
+   * @return the g wei
+   */
+  public static GWei wrap(final Bytes value) {
+    return new GWei(UInt64.fromBytes(value));
+  }
+
+  /**
+   * From hex string to GWei.
+   *
+   * @param str the hex string
+   * @return the GWei
+   */
+  public static GWei fromHexString(final String str) {
+    return new GWei(str);
+  }
+
+  /**
+   * Convert GWei to Wei
+   *
+   * @return Wei
+   */
+  public Wei getAsWei() {
+    return Wei.of(getAsBigInteger().multiply(GWEI_TO_WEI_MULTIPLIER));
+  }
+
+  @Override
+  public Number getValue() {
+    return getAsBigInteger();
+  }
+
+  @Override
+  public BigInteger getAsBigInteger() {
+    return toBigInteger();
+  }
+
+  @Override
+  public String toHexString() {
+    return super.toHexString();
+  }
+
+  @Override
+  public String toShortHexString() {
+    return super.isZero() ? "0x0" : super.toShortHexString();
+  }
+}
diff --git a/datatypes/src/main/java/org/hyperledger/besu/datatypes/Hash.java b/datatypes/src/main/java/org/hyperledger/besu/datatypes/Hash.java
new file mode 100644
index 00000000000..cb14101acd9
--- /dev/null
+++ b/datatypes/src/main/java/org/hyperledger/besu/datatypes/Hash.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.datatypes;
+
+import static org.hyperledger.besu.crypto.Hash.keccak256;
+
+import org.hyperledger.besu.ethereum.rlp.RLP;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.bytes.DelegatingBytes32;
+
+/** A 32-bytes hash value as used in Ethereum blocks, usually the result of the KEC algorithm. */
+public class Hash extends DelegatingBytes32 {
+
+  /** The constant ZERO. */
+  public static final Hash ZERO = new Hash(Bytes32.ZERO);
+
+  /**
+   * Hash of an RLP encoded trie hash with no content, or
+   * "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
+   */
+  public static final Hash EMPTY_TRIE_HASH = Hash.hash(RLP.NULL);
+
+  /**
+   * Hash of a zero length RLP list, or
+   * "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+   */
+  public static final Hash EMPTY_LIST_HASH = Hash.hash(RLP.EMPTY_LIST);
+
+  /**
+   * Hash of an empty string, or
+   * "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
+   */
+  public static final Hash EMPTY = hash(Bytes.EMPTY);
+
+  private Hash(final Bytes32 bytes) {
+    super(bytes);
+  }
+
+  /**
+   * Convert value to keccak256 hash.
+   *
+   * @param value the value
+   * @return the hash
+   */
+  public static Hash hash(final Bytes value) {
+    return new Hash(keccak256(value));
+  }
+
+  /**
+   * Wrap bytes to hash.
+   *
+   * @param bytes the bytes
+   * @return the hash
+   */
+  public static Hash wrap(final Bytes32 bytes) {
+    if (bytes instanceof Hash) {
+      return (Hash) bytes;
+    }
+    return new Hash(bytes);
+  }
+
+  /**
+   * Parse an hexadecimal string representing a hash value.
+   *
+   * @param str An hexadecimal string (with or without the leading '0x') representing a valid hash
+   *     value.
+   * @return The parsed hash.
+   * @throws NullPointerException if the provided string is {@code null}.
+   * @throws IllegalArgumentException if the string is either not hexadecimal, or not the valid
+   *     representation of a hash (not 32 bytes).
+   */
+  @JsonCreator
+  public static Hash fromHexString(final String str) {
+    return new Hash(Bytes32.fromHexStringStrict(str));
+  }
+
+  /**
+   * From hex string lenient hash.
+   *
+   * @param str the str
+   * @return the hash
+   */
+  public static Hash fromHexStringLenient(final String str) {
+    return new Hash(Bytes32.fromHexStringLenient(str));
+  }
+}
diff --git a/datatypes/src/main/java/org/hyperledger/besu/datatypes/PublicKey.java b/datatypes/src/main/java/org/hyperledger/besu/datatypes/PublicKey.java
new file mode 100644
index 00000000000..9fce4c1c233
--- /dev/null
+++ b/datatypes/src/main/java/org/hyperledger/besu/datatypes/PublicKey.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.datatypes;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** An interface for {@link Bytes} that also represents a public key */
+public interface PublicKey extends Bytes {}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Quantity.java b/datatypes/src/main/java/org/hyperledger/besu/datatypes/Quantity.java
similarity index 75%
rename from plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Quantity.java
rename to datatypes/src/main/java/org/hyperledger/besu/datatypes/Quantity.java
index 52298a43458..38adce31654 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Quantity.java
+++ b/datatypes/src/main/java/org/hyperledger/besu/datatypes/Quantity.java
@@ -12,10 +12,12 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.plugin.data;
+package org.hyperledger.besu.datatypes;
+
+import java.math.BigInteger;
 
 /**
- * An interface to mark objects that also represents a disceete quantity, such as an unsigned
+ * An interface to mark objects that also represents a discrete quantity, such as an unsigned
  * integer value.
  */
 public interface Quantity {
@@ -30,12 +32,27 @@ public interface Quantity {
    *
    * @return The boxed or object based value of the quantity.
    */
+  @Deprecated
   Number getValue();
 
+  /**
+   * Gets Quantity as BigInteger.
+   *
+   * @return the Quantity as BigInteger
+   */
+  BigInteger getAsBigInteger();
+
   /**
    * The value as a hexadecimal string.
    *
    * @return This value represented as hexadecimal, starting with "0x".
    */
   String toHexString();
+
+  /**
+   * The value as a hexadecimal string with leading zeros truncated.
+   *
+   * @return This value represented as hexadecimal, starting with "0x".
+   */
+  String toShortHexString();
 }
diff --git a/datatypes/src/main/java/org/hyperledger/besu/datatypes/StorageSlotKey.java b/datatypes/src/main/java/org/hyperledger/besu/datatypes/StorageSlotKey.java
new file mode 100644
index 00000000000..eb2424dfcf4
--- /dev/null
+++ b/datatypes/src/main/java/org/hyperledger/besu/datatypes/StorageSlotKey.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.datatypes;
+
+import java.util.Objects;
+import java.util.Optional;
+
+import org.apache.tuweni.units.bigints.UInt256;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * StorageSlotKey represents a key used for storage slots in Ethereum. It contains the hash of the
+ * slot key and an optional representation of the key itself.
+ *
+ * <p>The class provides methods for accessing the hash and key, as well as methods for equality,
+ * hashcode, and comparison.
+ *
+ * <p>StorageSlotKey is used to uniquely identify storage slots within the Ethereum state.
+ */
+public class StorageSlotKey implements Comparable<StorageSlotKey> {
+
+  private final Hash slotHash;
+  private final Optional<UInt256> slotKey;
+
+  /**
+   * Creates a StorageSlotKey.
+   *
+   * @param slotHash Hashed storage slot key.
+   * @param slotKey Optional UInt256 storage slot key.
+   */
+  public StorageSlotKey(final Hash slotHash, final Optional<UInt256> slotKey) {
+    this.slotHash = slotHash;
+    this.slotKey = slotKey;
+  }
+
+  /**
+   * Creates a StorageSlotKey, hashing the slotKey.
+   *
+   * @param slotKey the UInt256 storage slot key.
+   */
+  public StorageSlotKey(final UInt256 slotKey) {
+    this(Hash.hash(slotKey), Optional.of(slotKey));
+  }
+
+  /**
+   * Gets the hash representation of the storage slot key.
+   *
+   * @return the hash of the storage slot key.
+   */
+  public Hash getSlotHash() {
+    return slotHash;
+  }
+
+  /**
+   * Gets the optional UInt256 representation of the storage slot key.
+   *
+   * @return an Optional containing the UInt256 storage slot key if present, otherwise an empty
+   *     Optional.
+   */
+  public Optional<UInt256> getSlotKey() {
+    return slotKey;
+  }
+
+  /**
+   * Indicates whether some other object is "equal to" this one. Two StorageSlotKey objects are
+   * considered equal if their slot hash values are equal.
+   *
+   * @param o the reference object with which to compare.
+   * @return true if this object is the same as the obj argument; false otherwise.
+   */
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    StorageSlotKey that = (StorageSlotKey) o;
+    return Objects.equals(slotHash, that.slotHash);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(slotHash.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    return String.format(
+        "StorageSlotKey{slotHash=%s, slotKey=%s}",
+        slotHash, slotKey.map(UInt256::toString).orElse("null"));
+  }
+
+  @Override
+  public int compareTo(@NotNull final StorageSlotKey other) {
+    return this.slotHash.compareTo(other.slotHash);
+  }
+}
diff --git a/datatypes/src/main/java/org/hyperledger/besu/datatypes/Wei.java b/datatypes/src/main/java/org/hyperledger/besu/datatypes/Wei.java
new file mode 100644
index 00000000000..2e2a8ac4f09
--- /dev/null
+++ b/datatypes/src/main/java/org/hyperledger/besu/datatypes/Wei.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.datatypes;
+
+import java.math.BigInteger;
+import java.util.Arrays;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.BaseUInt256Value;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** A particular quantity of Wei, the Ethereum currency. */
+public final class Wei extends BaseUInt256Value<Wei> implements Quantity {
+
+  /** The constant ZERO. */
+  public static final Wei ZERO = of(0);
+
+  /** The constant ONE. */
+  public static final Wei ONE = of(1);
+
+  /** The constant MAX_WEI. */
+  public static final Wei MAX_WEI = of(UInt256.MAX_VALUE);
+
+  /**
+   * Instantiates a new Wei.
+   *
+   * @param value the value
+   */
+  Wei(final UInt256 value) {
+    super(value, Wei::new);
+  }
+
+  private Wei(final long v) {
+    this(UInt256.valueOf(v));
+  }
+
+  private Wei(final BigInteger v) {
+    this(UInt256.valueOf(v));
+  }
+
+  private Wei(final String hexString) {
+    this(UInt256.fromHexString(hexString));
+  }
+
+  /**
+   * Wei of value.
+   *
+   * @param value the value
+   * @return the wei
+   */
+  public static Wei of(final long value) {
+    return new Wei(value);
+  }
+
+  /**
+   * Wei of value.
+   *
+   * @param value the value
+   * @return the wei
+   */
+  public static Wei of(final BigInteger value) {
+    return new Wei(value);
+  }
+
+  /**
+   * Wei of value.
+   *
+   * @param value the value
+   * @return the wei
+   */
+  public static Wei of(final UInt256 value) {
+    return new Wei(value);
+  }
+
+  /**
+   * Wei of value.
+   *
+   * @param value the value
+   * @return the wei
+   */
+  public static Wei ofNumber(final Number value) {
+    return new Wei((BigInteger) value);
+  }
+
+  /**
+   * Wrap wei.
+   *
+   * @param value the value
+   * @return the wei
+   */
+  public static Wei wrap(final Bytes value) {
+    return new Wei(UInt256.fromBytes(value));
+  }
+
+  /**
+   * From hex string to wei.
+   *
+   * @param str the str
+   * @return the wei
+   */
+  public static Wei fromHexString(final String str) {
+    return new Wei(str);
+  }
+
+  /**
+   * From eth to wei.
+   *
+   * @param eth the eth
+   * @return the wei
+   */
+  public static Wei fromEth(final long eth) {
+    return Wei.of(BigInteger.valueOf(eth).multiply(BigInteger.TEN.pow(18)));
+  }
+
+  @Override
+  public Number getValue() {
+    return getAsBigInteger();
+  }
+
+  @Override
+  public BigInteger getAsBigInteger() {
+    return toBigInteger();
+  }
+
+  @Override
+  public String toHexString() {
+    return super.toHexString();
+  }
+
+  @Override
+  public String toShortHexString() {
+    return super.isZero() ? "0x0" : super.toShortHexString();
+  }
+
+  /**
+   * From quantity to wei.
+   *
+   * @param quantity the quantity
+   * @return the wei
+   */
+  public static Wei fromQuantity(final Quantity quantity) {
+    return Wei.wrap((Bytes) quantity);
+  }
+
+  /**
+   * Wei to human-readable string.
+   *
+   * @return the string
+   */
+  public String toHumanReadableString() {
+    final BigInteger amount = toBigInteger();
+    final int numOfDigits = amount.toString().length();
+    final Unit preferredUnit = Unit.getPreferred(numOfDigits);
+    final double res = amount.doubleValue() / preferredUnit.divisor;
+    return String.format("%1." + preferredUnit.decimals + "f %s", res, preferredUnit);
+  }
+
+  /** The enum Unit. */
+  enum Unit {
+    /** Wei unit. */
+    Wei(0, 0),
+    /** K wei unit. */
+    KWei(3),
+    /** M wei unit. */
+    MWei(6),
+    /** G wei unit. */
+    GWei(9),
+    /** Szabo unit. */
+    Szabo(12),
+    /** Finney unit. */
+    Finney(15),
+    /** Ether unit. */
+    Ether(18),
+    /** K ether unit. */
+    KEther(21),
+    /** M ether unit. */
+    MEther(24),
+    /** G ether unit. */
+    GEther(27),
+    /** T ether unit. */
+    TEther(30);
+
+    /** The Pow. */
+    final int pow;
+    /** The Divisor. */
+    final double divisor;
+    /** The Decimals. */
+    final int decimals;
+
+    Unit(final int pow) {
+      this(pow, 2);
+    }
+
+    Unit(final int pow, final int decimals) {
+      this.pow = pow;
+      this.decimals = decimals;
+      this.divisor = Math.pow(10, pow);
+    }
+
+    /**
+     * Gets preferred.
+     *
+     * @param numOfDigits the num of digits
+     * @return the preferred
+     */
+    static Unit getPreferred(final int numOfDigits) {
+      return Arrays.stream(values())
+          .filter(u -> numOfDigits <= u.pow + 3)
+          .findFirst()
+          .orElse(TEther);
+    }
+
+    @Override
+    public String toString() {
+      return name().toLowerCase();
+    }
+  }
+}
diff --git a/datatypes/src/test/java/org/hyperledger/besu/datatypes/GWeiTest.java b/datatypes/src/test/java/org/hyperledger/besu/datatypes/GWeiTest.java
new file mode 100644
index 00000000000..a605da4d3b1
--- /dev/null
+++ b/datatypes/src/test/java/org/hyperledger/besu/datatypes/GWeiTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.datatypes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.math.BigInteger;
+
+import org.apache.tuweni.units.bigints.UInt64;
+import org.junit.jupiter.api.Test;
+
+class GWeiTest {
+
+  @Test
+  void getAsWei() {
+    final GWei gwei = GWei.of(1);
+    final Wei wei = gwei.getAsWei();
+    assertThat(wei.getAsBigInteger()).isEqualTo(1_000_000_000L);
+  }
+
+  @Test
+  void gWeiFromLongValue() {
+    final GWei gwei = GWei.of(1);
+    assertThat(gwei.getValue()).isEqualTo(BigInteger.ONE);
+  }
+
+  @Test
+  void gWeiFromBigIntegerValue() {
+    final GWei gwei = GWei.of(BigInteger.TWO);
+    assertThat(gwei.getValue()).isEqualTo(BigInteger.TWO);
+  }
+
+  @Test
+  void gWeiFromUInt64Value() {
+    final GWei gwei = GWei.of(UInt64.valueOf(2));
+    assertThat(gwei.getValue()).isEqualTo(BigInteger.TWO);
+  }
+
+  @Test
+  void gWeiFromHexStringValue() {
+    final GWei gwei = GWei.fromHexString("0x0000000000000002");
+    assertThat(gwei.getValue()).isEqualTo(BigInteger.TWO);
+  }
+
+  @Test
+  void gWeiToHexString() {
+    final GWei gwei = GWei.of(UInt64.valueOf(2));
+    assertThat(gwei.toHexString()).isEqualTo("0x0000000000000002");
+
+    final GWei gwei0 = GWei.ZERO;
+    assertThat(gwei0.toHexString()).isEqualTo("0x0000000000000000");
+    assertThat(gwei0.toShortHexString()).isEqualTo("0x0");
+  }
+}
diff --git a/datatypes/src/test/java/org/hyperledger/besu/datatypes/HashTest.java b/datatypes/src/test/java/org/hyperledger/besu/datatypes/HashTest.java
new file mode 100644
index 00000000000..1ae3b8c14e7
--- /dev/null
+++ b/datatypes/src/test/java/org/hyperledger/besu/datatypes/HashTest.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.datatypes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+public class HashTest {
+
+  @Test
+  public void shouldGetExpectedValueForEmptyHash() {
+    assertThat(Hash.EMPTY)
+        .isEqualTo(
+            Hash.fromHexString("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"));
+  }
+}
diff --git a/datatypes/src/test/java/org/hyperledger/besu/datatypes/WeiTest.java b/datatypes/src/test/java/org/hyperledger/besu/datatypes/WeiTest.java
new file mode 100644
index 00000000000..1d1b38819a7
--- /dev/null
+++ b/datatypes/src/test/java/org/hyperledger/besu/datatypes/WeiTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.datatypes;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.math.BigInteger;
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Test;
+
+public class WeiTest {
+
+  @Test
+  public void toHumanReadableString() {
+    assertThat(Wei.ZERO.toHumanReadableString()).isEqualTo("0 wei");
+    assertThat(Wei.ONE.toHumanReadableString()).isEqualTo("1 wei");
+
+    assertThat(Wei.of(999).toHumanReadableString()).isEqualTo("999 wei");
+    assertThat(Wei.of(1000).toHumanReadableString()).isEqualTo("1.00 kwei");
+
+    assertThat(Wei.of(1009).toHumanReadableString()).isEqualTo("1.01 kwei");
+    assertThat(Wei.of(1011).toHumanReadableString()).isEqualTo("1.01 kwei");
+
+    assertThat(Wei.of(new BigInteger("1000000000")).toHumanReadableString()).isEqualTo("1.00 gwei");
+
+    assertThat(Wei.of(new BigInteger("1000000000000000000")).toHumanReadableString())
+        .isEqualTo("1.00 ether");
+
+    final char[] manyZeros = new char[32];
+    Arrays.fill(manyZeros, '0');
+    assertThat(Wei.of(new BigInteger("1" + String.valueOf(manyZeros))).toHumanReadableString())
+        .isEqualTo("100.00 tether");
+  }
+}
diff --git a/docker/graalvm/Dockerfile b/docker/graalvm/Dockerfile
index 983e410adc2..d4009b9c929 100644
--- a/docker/graalvm/Dockerfile
+++ b/docker/graalvm/Dockerfile
@@ -1,41 +1,43 @@
 
-FROM oracle/graalvm-ce:20.1.0-java11
+FROM ghcr.io/graalvm/graalvm-ce:ol9-java17
+ARG VERSION="dev"
 
 RUN adduser --home /opt/besu besu && \
-    chown besu:besu /opt/besu
+    chown besu:besu /opt/besu && \
+    chmod 0755 /opt/besu
 
 USER besu
 WORKDIR /opt/besu
 
 COPY --chown=besu:besu besu /opt/besu/
+RUN chmod -R 755 /opt/besu
 
 # Expose services ports
 # 8545 HTTP JSON-RPC
 # 8546 WS JSON-RPC
 # 8547 HTTP GraphQL
+# 8550 HTTP ENGINE JSON-RPC
+# 8551 WS ENGINE JSON-RPC
 # 30303 P2P
-EXPOSE 8545 8546 8547 30303
+EXPOSE 8545 8546 8547 8550 8551 30303
 
 # defaults for host interfaces
 ENV BESU_RPC_HTTP_HOST 0.0.0.0
 ENV BESU_RPC_WS_HOST 0.0.0.0
 ENV BESU_GRAPHQL_HTTP_HOST 0.0.0.0
 ENV BESU_PID_PATH "/tmp/pid"
-# Tracing defaults
-# To enable tracing, uncomment next line
-#ENV TRACING=ENABLED
-ENV OTEL_EXPORTER=otlp
-ENV OTEL_OTLP_ENDPOINT="0.0.0.0:55680"
-ENV OTEL_RESOURCE_ATTRIBUTES="service.name=besu-$VERSION"
-
-ENV PATH="/opt/besu/bin:${PATH}"
+
+ENV OTEL_RESOURCE_ATTRIBUTES="service.name=besu,service.version=$VERSION"
+
+ENV OLDPATH="${PATH}"
+ENV PATH="/opt/besu/bin:${OLDPATH}"
+
 ENTRYPOINT ["besu"]
 HEALTHCHECK --start-period=5s --interval=5s --timeout=1s --retries=10 CMD bash -c "[ -f /tmp/pid ]"
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION
 LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.name="Besu" \
       org.label-schema.description="Enterprise Ethereum client" \
diff --git a/docker/openj9-jdk-17/Dockerfile b/docker/openj9-jdk-17/Dockerfile
new file mode 100644
index 00000000000..618b8b4e80d
--- /dev/null
+++ b/docker/openj9-jdk-17/Dockerfile
@@ -0,0 +1,72 @@
+FROM ubuntu:22.04
+
+ARG VERSION="dev"
+ARG TARGETPLATFORM
+
+RUN apt-get update && \
+ apt-get install --no-install-recommends -q --assume-yes curl=7* libjemalloc-dev=5.* && \
+ apt-get clean  && \
+ rm -rf /var/lib/apt/lists/*
+
+RUN ARCH=$(uname -m) && \
+    if [ "$ARCH" = "aarch64" ]; then \
+        curl -kL -o jdk-17.tar.gz https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.5%2B8_openj9-0.35.0/ibm-semeru-open-jdk_aarch64_linux_17.0.5_8_openj9-0.35.0.tar.gz ; \
+    elif [ "$(uname -s)" = "Darwin" ] && [ "$(uname -m)" = "arm64" ]; then \
+        curl -kL -o jdk-17.tar.gz https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.5%2B8_openj9-0.35.0/ibm-semeru-open-jdk_aarch64_linux_17.0.5_8_openj9-0.35.0.tar.gz ; \
+    elif [ "$ARCH" = "x86_64" ]; then \
+        curl -kL -o jdk-17.tar.gz https://github.com/ibmruntimes/semeru17-binaries/releases/download/jdk-17.0.5%2B8_openj9-0.35.0/ibm-semeru-open-jdk_x64_linux_17.0.5_8_openj9-0.35.0.tar.gz ; \
+    else \
+        echo "Unsupported platform: $ARCH"; exit 1; \
+    fi
+
+RUN tar -xzf jdk-17.tar.gz && \
+    rm jdk-17.tar.gz && \
+    mv jdk-17.0.5+8 /usr/bin/ && \
+    update-alternatives --install "/usr/bin/java" "java" "/usr/bin/jdk-17.0.5+8/bin/java" 1 && \
+    adduser --disabled-password --gecos "" --home /opt/besu besu && \
+    chown besu:besu /opt/besu && \
+    chmod 0755 /opt/besu
+
+ENV JAVA_HOME /usr/bin/jdk-17.0.5+8/
+RUN export JAVA_HOME
+
+USER besu
+WORKDIR /opt/besu
+
+COPY --chown=besu:besu besu /opt/besu/
+
+# Expose services ports
+# 8545 HTTP JSON-RPC
+# 8546 WS JSON-RPC
+# 8547 HTTP GraphQL
+# 8550 HTTP ENGINE JSON-RPC
+# 8551 WS ENGINE JSON-RPC
+# 30303 P2P
+EXPOSE 8545 8546 8547 8550 8551 30303
+
+# defaults for host interfaces
+ENV BESU_RPC_HTTP_HOST 0.0.0.0
+ENV BESU_RPC_WS_HOST 0.0.0.0
+ENV BESU_GRAPHQL_HTTP_HOST 0.0.0.0
+ENV BESU_PID_PATH "/tmp/pid"
+
+ENV OTEL_RESOURCE_ATTRIBUTES="service.name=besu,service.version=$VERSION"
+
+ENV OLDPATH="${PATH}"
+ENV PATH="/opt/besu/bin:${OLDPATH}"
+
+ENTRYPOINT ["besu"]
+HEALTHCHECK --start-period=5s --interval=5s --timeout=1s --retries=10 CMD bash -c "[ -f /tmp/pid ]"
+
+# Build-time metadata as defined at http://label-schema.org
+ARG BUILD_DATE
+ARG VCS_REF
+LABEL org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.name="Besu" \
+      org.label-schema.description="Enterprise Ethereum client" \
+      org.label-schema.url="https://besu.hyperledger.org/" \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vcs-url="https://github.com/hyperledger/besu.git" \
+      org.label-schema.vendor="Hyperledger" \
+      org.label-schema.version=$VERSION \
+      org.label-schema.schema-version="1.0"
diff --git a/docker/openjdk-17-debug/Dockerfile b/docker/openjdk-17-debug/Dockerfile
new file mode 100644
index 00000000000..60ee037bfee
--- /dev/null
+++ b/docker/openjdk-17-debug/Dockerfile
@@ -0,0 +1,65 @@
+
+FROM ubuntu:22.04
+
+ARG VERSION="dev"
+RUN apt-get update  && \
+ apt-get install --no-install-recommends -q --assume-yes ca-certificates-java=20190909 && \
+ apt-get install --no-install-recommends -q --assume-yes curl=7* wget=1.21* jq=1.6* net-tools=1.60* openjdk-17-jdk-headless=17* libjemalloc-dev=5.* && \
+ apt-get clean  && \
+ rm -rf /var/lib/apt/lists/*  && \
+ adduser --disabled-password --gecos "" --home /opt/besu besu && \
+    chown besu:besu /opt/besu && \
+    chmod 0755 /opt/besu
+
+USER besu
+WORKDIR /opt/besu
+
+COPY --chown=besu:besu besu /opt/besu/
+
+# Expose services ports
+# 5005 JDWP for attaching remote debuggers
+# 8545 HTTP JSON-RPC
+# 8546 WS JSON-RPC
+# 8547 HTTP GraphQL
+# 8550 HTTP ENGINE JSON-RPC
+# 8551 WS ENGINE JSON-RPC
+# 9545 Metrics
+# 1098 JMX / JMX-RMI
+# 30303 P2P
+EXPOSE 5005 8545 8546 8547 8550 8551 9545 1098 30303
+
+# defaults for host interfaces
+ENV BESU_RPC_HTTP_HOST 0.0.0.0
+ENV BESU_RPC_WS_HOST 0.0.0.0
+ENV BESU_GRAPHQL_HTTP_HOST 0.0.0.0
+ENV BESU_METRICS_HOST 0.0.0.0
+ENV BESU_JMX_HOST 0.0.0.0
+ENV BESU_PID_PATH "/tmp/pid"
+ENV BESU_HOST_ALLOWLIST "*"
+
+#debug options for maximum observability
+ENV BESU_LOGGING "INFO"
+ENV BESU_RPC_HTTP_API  "ETH,NET,TRACE,DEBUG,ADMIN,TXPOOL"
+ENV JDWP_OPTS "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005"
+ENV JAVA_OPTS "${JDWP_OPTS} "
+
+ENV OTEL_RESOURCE_ATTRIBUTES="service.name=besu,service.version=$VERSION"
+
+ENV OLDPATH="${PATH}"
+ENV PATH="/opt/besu/bin:${OLDPATH}"
+
+ENTRYPOINT ["besu"]
+HEALTHCHECK --start-period=5s --interval=5s --timeout=1s --retries=10 CMD bash -c "[ -f /tmp/pid ]"
+
+# Build-time metadata as defined at http://label-schema.org
+ARG BUILD_DATE
+ARG VCS_REF
+LABEL org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.name="Besu" \
+      org.label-schema.description="Enterprise Ethereum client" \
+      org.label-schema.url="https://besu.hyperledger.org/" \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vcs-url="https://github.com/hyperledger/besu.git" \
+      org.label-schema.vendor="Hyperledger" \
+      org.label-schema.version=$VERSION \
+      org.label-schema.schema-version="1.0"
diff --git a/docker/openjdk-17/Dockerfile b/docker/openjdk-17/Dockerfile
new file mode 100644
index 00000000000..ce1a534d607
--- /dev/null
+++ b/docker/openjdk-17/Dockerfile
@@ -0,0 +1,53 @@
+
+FROM ubuntu:22.04
+ARG VERSION="dev"
+
+RUN apt-get update && \
+ apt-get install --no-install-recommends -q --assume-yes ca-certificates-java=20190909 && \
+ apt-get install --no-install-recommends -q --assume-yes openjdk-17-jre-headless=17* libjemalloc-dev=5.* && \
+ apt-get clean  && \
+ rm -rf /var/lib/apt/lists/*  && \
+ adduser --disabled-password --gecos "" --home /opt/besu besu && \
+    chown besu:besu /opt/besu && \
+    chmod 0755 /opt/besu
+
+USER besu
+WORKDIR /opt/besu
+
+COPY --chown=besu:besu besu /opt/besu/
+
+# Expose services ports
+# 8545 HTTP JSON-RPC
+# 8546 WS JSON-RPC
+# 8547 HTTP GraphQL
+# 8550 HTTP ENGINE JSON-RPC
+# 8551 WS ENGINE JSON-RPC
+# 30303 P2P
+EXPOSE 8545 8546 8547 8550 8551 30303
+
+# defaults for host interfaces
+ENV BESU_RPC_HTTP_HOST 0.0.0.0
+ENV BESU_RPC_WS_HOST 0.0.0.0
+ENV BESU_GRAPHQL_HTTP_HOST 0.0.0.0
+ENV BESU_PID_PATH "/tmp/pid"
+
+ENV OTEL_RESOURCE_ATTRIBUTES="service.name=besu,service.version=$VERSION"
+
+ENV OLDPATH="${PATH}"
+ENV PATH="/opt/besu/bin:${OLDPATH}"
+
+ENTRYPOINT ["besu"]
+HEALTHCHECK --start-period=5s --interval=5s --timeout=1s --retries=10 CMD bash -c "[ -f /tmp/pid ]"
+
+# Build-time metadata as defined at http://label-schema.org
+ARG BUILD_DATE
+ARG VCS_REF
+LABEL org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.name="Besu" \
+      org.label-schema.description="Enterprise Ethereum client" \
+      org.label-schema.url="https://besu.hyperledger.org/" \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vcs-url="https://github.com/hyperledger/besu.git" \
+      org.label-schema.vendor="Hyperledger" \
+      org.label-schema.version=$VERSION \
+      org.label-schema.schema-version="1.0"
diff --git a/docker/openjdk-latest/Dockerfile b/docker/openjdk-latest/Dockerfile
index 74b65721f98..0736ab4a324 100644
--- a/docker/openjdk-latest/Dockerfile
+++ b/docker/openjdk-latest/Dockerfile
@@ -1,8 +1,14 @@
 
-FROM openjdk:slim-buster
+FROM ubuntu:22.04
+ARG VERSION="dev"
 
-RUN adduser --disabled-password --gecos "" --home /opt/besu besu && \
-    chown besu:besu /opt/besu
+RUN apt-get update && \
+ apt-get install --no-install-recommends -q --assume-yes openjdk-19-jre-headless=19* libjemalloc-dev=5.* && \
+ apt-get clean  && \
+ rm -rf /var/lib/apt/lists/*  && \
+ adduser --disabled-password --gecos "" --home /opt/besu besu && \
+    chown besu:besu /opt/besu && \
+    chmod 0755 /opt/besu
 
 USER besu
 WORKDIR /opt/besu
@@ -13,29 +19,28 @@ COPY --chown=besu:besu besu /opt/besu/
 # 8545 HTTP JSON-RPC
 # 8546 WS JSON-RPC
 # 8547 HTTP GraphQL
+# 8550 HTTP ENGINE JSON-RPC
+# 8551 WS ENGINE JSON-RPC
 # 30303 P2P
-EXPOSE 8545 8546 8547 30303
+EXPOSE 8545 8546 8547 8550 8551 30303
 
 # defaults for host interfaces
 ENV BESU_RPC_HTTP_HOST 0.0.0.0
 ENV BESU_RPC_WS_HOST 0.0.0.0
 ENV BESU_GRAPHQL_HTTP_HOST 0.0.0.0
 ENV BESU_PID_PATH "/tmp/pid"
-# Tracing defaults
-# To enable tracing, uncomment next line
-#ENV TRACING=ENABLED
-ENV OTEL_EXPORTER=otlp
-ENV OTEL_OTLP_ENDPOINT="0.0.0.0:55680"
-ENV OTEL_RESOURCE_ATTRIBUTES="service.name=besu-$VERSION"
-
-ENV PATH="/opt/besu/bin:${PATH}"
+
+ENV OTEL_RESOURCE_ATTRIBUTES="service.name=besu,service.version=$VERSION"
+
+ENV OLDPATH="${PATH}"
+ENV PATH="/opt/besu/bin:${OLDPATH}"
+
 ENTRYPOINT ["besu"]
 HEALTHCHECK --start-period=5s --interval=5s --timeout=1s --retries=10 CMD bash -c "[ -f /tmp/pid ]"
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION
 LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.name="Besu" \
       org.label-schema.description="Enterprise Ethereum client" \
diff --git a/docker/test.sh b/docker/test.sh
index 8058a0400a1..34ce7d3a64e 100755
--- a/docker/test.sh
+++ b/docker/test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export TEST_PATH=../tests
-export GOSS_PATH=$TEST_PATH/goss-linux-amd64
+export GOSS_PATH=$TEST_PATH/goss-linux-${architecture}
 export GOSS_OPTS="$GOSS_OPTS --format junit"
 export GOSS_FILES_STRATEGY=cp
 DOCKER_IMAGE=$1
diff --git a/docs/tracing/README.md b/docs/tracing/README.md
index bbf1249dc53..0acac729d4f 100644
--- a/docs/tracing/README.md
+++ b/docs/tracing/README.md
@@ -10,7 +10,7 @@ To try out this example, start the Open Telemetry Collector and the Zipkin servi
 
 Start besu with:
 
-`$> ./gradlew run --args="--network=dev --rpc-http-enabled"`
+`$> OTEL_RESOURCE_ATTRIBUTES="service.name=besu-dev" OTEL_EXPORTER_OTLP_METRIC_INSECURE=true OTEL_EXPORTER_OTLP_SPAN_INSECURE=true ./gradlew run --args="--network=dev --rpc-http-enabled --metrics-enabled --metrics-protocol=opentelemetry"`
 
 Try interacting with the JSON-RPC API. Here is a simple example using cURL:
 
@@ -19,3 +19,6 @@ Try interacting with the JSON-RPC API. Here is a simple example using cURL:
 Open the Zipkin UI by browsing to http://localhost:9411/
 
 You will be able to see the detail of your traces.
+
+References:
+* [OpenTelemetry Environment Variable Specification](https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/sdk-environment-variables.md)
diff --git a/docs/tracing/docker-compose.yml b/docs/tracing/docker-compose.yml
index 79e1ecf533a..7a351408447 100644
--- a/docs/tracing/docker-compose.yml
+++ b/docs/tracing/docker-compose.yml
@@ -1,7 +1,8 @@
 version: "3"
 services:
-  otel-collector:
-    image: otel/opentelemetry-collector-contrib:0.11.0
+  otelcollector:
+    image: otel/opentelemetry-collector-contrib:0.17.0
+    container_name: otelcollector
     command: ["--config=/etc/otel-collector-config.yml"]
     volumes:
       - ./otel-collector-config.yml:/etc/otel-collector-config.yml
@@ -10,13 +11,20 @@ services:
       - "8888:8888"   # Prometheus metrics exposed by the collector
       - "8889:8889"   # Prometheus exporter metrics
       - "13133:13133" # health_check extension
-      - "55680:55680" # zpages extension
+      - "4317:4317"   # OTLP GRPC receiver
     depends_on:
       - zipkin
+      - metricsviewer
 
-  #Zipkin
+  # Zipkin
   zipkin:
     image: openzipkin/zipkin
     container_name: zipkin
     ports:
       - 9411:9411
+
+  metricsviewer:
+    image: docker.io/tmio/metrics-ui
+    container_name: metricsviewer
+    ports:
+      - 8080:8080
diff --git a/docs/tracing/otel-collector-config.yml b/docs/tracing/otel-collector-config.yml
index 2d8f2d98390..86df95ea776 100644
--- a/docs/tracing/otel-collector-config.yml
+++ b/docs/tracing/otel-collector-config.yml
@@ -2,11 +2,17 @@ receivers:
   otlp:
     protocols:
       grpc:
-      http:
 
 exporters:
   zipkin:
     endpoint: "http://zipkin:9411/api/v2/spans"
+  otlp:
+    endpoint: "metricsviewer:4317"
+    insecure: true
+  logging:
+    loglevel: debug
+    sampling_initial: 5
+    sampling_thereafter: 200
 
 processors:
   batch:
@@ -23,3 +29,7 @@ service:
       receivers: [otlp]
       exporters: [zipkin]
       processors: [batch]
+    metrics:
+      receivers: [otlp]
+      exporters: [otlp, logging]
+      processors: [batch]
diff --git a/enclave/build.gradle b/enclave/build.gradle
index 91561ae5db0..302b2f246a4 100644
--- a/enclave/build.gradle
+++ b/enclave/build.gradle
@@ -1,28 +1,28 @@
 dependencies {
   api project(':util')
-  api project(':crypto')
+  api project(':crypto:algorithms')
+  api 'org.slf4j:slf4j-api'
 
   implementation 'com.fasterxml.jackson.core:jackson-databind'
   implementation 'com.google.guava:guava'
   implementation 'io.vertx:vertx-core'
-  implementation 'org.apache.tuweni:net'
-  implementation 'org.apache.logging.log4j:log4j-api'
+  implementation 'io.vertx:vertx-web'
+  implementation 'org.apache.tuweni:tuweni-net'
 
   runtimeOnly('org.bouncycastle:bcpkix-jdk15on')
 
   // test dependencies.
   testImplementation project(':testutil')
 
-  testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
 
   // integration test dependencies.
   integrationTestImplementation project(':testutil')
+  integrationTestImplementation 'org.assertj:assertj-core'
   integrationTestImplementation 'org.bouncycastle:bcpkix-jdk15on'
   integrationTestImplementation 'org.awaitility:awaitility'
+  integrationTestImplementation 'org.junit.jupiter:junit-jupiter-api'
   integrationTestImplementation 'org.mockito:mockito-core'
-
-  integrationTestImplementation 'junit:junit'
-  integrationTestImplementation 'net.consensys:orion'
-  integrationTestImplementation 'org.assertj:assertj-core'
+  integrationTestImplementation 'org.testcontainers:testcontainers'
 }
diff --git a/enclave/src/integration-test/java/org/hyperledger/besu/enclave/EnclaveTest.java b/enclave/src/integration-test/java/org/hyperledger/besu/enclave/EnclaveTest.java
index 26c61c55ee8..b9b657e6689 100644
--- a/enclave/src/integration-test/java/org/hyperledger/besu/enclave/EnclaveTest.java
+++ b/enclave/src/integration-test/java/org/hyperledger/besu/enclave/EnclaveTest.java
@@ -21,53 +21,60 @@
 import org.hyperledger.besu.enclave.types.PrivacyGroup;
 import org.hyperledger.besu.enclave.types.ReceiveResponse;
 import org.hyperledger.besu.enclave.types.SendResponse;
-import org.hyperledger.orion.testutil.OrionKeyConfiguration;
-import org.hyperledger.orion.testutil.OrionTestHarness;
-import org.hyperledger.orion.testutil.OrionTestHarnessFactory;
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+import org.hyperledger.enclave.testutil.EnclaveKeyConfiguration;
+import org.hyperledger.enclave.testutil.TesseraTestHarness;
+import org.hyperledger.enclave.testutil.TesseraTestHarnessFactory;
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
 import com.google.common.collect.Lists;
 import io.vertx.core.Vertx;
 import org.awaitility.Awaitility;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class EnclaveTest {
 
-  @ClassRule public static final TemporaryFolder folder = new TemporaryFolder();
+  @TempDir private static Path folder;
 
   private static final String PAYLOAD = "a wonderful transaction";
   private static final String MOCK_KEY = "iOCzoGo5kwtZU0J41Z9xnGXHN6ZNukIa9MspvHtu3Jk=";
-  private static Enclave enclave;
+  private Enclave enclave;
   private Vertx vertx;
   private EnclaveFactory factory;
 
-  private static OrionTestHarness testHarness;
+  private TesseraTestHarness testHarness;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     vertx = Vertx.vertx();
     factory = new EnclaveFactory(vertx);
-    folder.create();
 
     testHarness =
-        OrionTestHarnessFactory.create(
-            folder.newFolder().toPath(),
-            new OrionKeyConfiguration("orion_key_0.pub", "orion_key_0.key"));
+        TesseraTestHarnessFactory.create(
+            "enclave",
+            Files.createTempDirectory(folder, "enclave"),
+            new EnclaveKeyConfiguration(
+                new String[] {"enclave_key_0.pub"},
+                new String[] {"enclave_key_0.key"},
+                EnclaveEncryptorType.NOOP),
+            Optional.empty());
 
     testHarness.start();
 
     enclave = factory.createVertxEnclave(testHarness.clientUrl());
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     testHarness.close();
     vertx.close();
@@ -84,7 +91,7 @@ public void testReceiveThrowsWhenPayloadDoesNotExist() {
 
     final Throwable t = catchThrowable(() -> enclave.receive(MOCK_KEY, publicKey));
 
-    assertThat(t.getMessage()).isEqualTo("EnclavePayloadNotFound");
+    assertThat(t.getMessage()).isEqualTo("Message with hash was not found");
   }
 
   @Test
@@ -193,7 +200,7 @@ public void testCreateDeleteRetrievePrivacyGroup() {
     final PrivacyGroup retrievePrivacyGroup =
         enclave.retrievePrivacyGroup(privacyGroupResponse.getPrivacyGroupId());
 
-    assertThat(retrievePrivacyGroup).isEqualToComparingFieldByField(privacyGroupResponse);
+    assertThat(retrievePrivacyGroup).usingRecursiveComparison().isEqualTo(privacyGroupResponse);
 
     final String response =
         enclave.deletePrivacyGroup(privacyGroupResponse.getPrivacyGroupId(), publicKeys.get(0));
diff --git a/enclave/src/integration-test/java/org/hyperledger/besu/enclave/GoQuorumEnclaveTest.java b/enclave/src/integration-test/java/org/hyperledger/besu/enclave/GoQuorumEnclaveTest.java
deleted file mode 100644
index b07657a5516..00000000000
--- a/enclave/src/integration-test/java/org/hyperledger/besu/enclave/GoQuorumEnclaveTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.enclave;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.enclave.types.GoQuorumReceiveResponse;
-import org.hyperledger.besu.enclave.types.SendResponse;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Arrays;
-import java.util.Base64;
-import java.util.List;
-
-import io.vertx.core.Vertx;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.ArgumentMatchers;
-
-public class GoQuorumEnclaveTest {
-
-  private static final byte[] PAYLOAD = Base64.getDecoder().decode("EAAAAAAA");
-  private static final String MOCK_KEY = "iOCzoGo5kwtZU0J41Z9xnGXHN6ZNukIa9MspvHtu3Jk=";
-  private static final String KEY =
-      "tQEmN0d/xXJZs5OMgl8QVBIyYxu1XubAKehsSYbcOjbxai+QJQpEOs6ghrYAZizLtnM4EJdMyVeVrxO3cA9JJA==";
-  private static GoQuorumEnclave enclave;
-
-  private RequestTransmitter vertxTransmitter;
-
-  @Before
-  public void setUp() {
-    enclave = createGoQuorumEnclaveWithMockRequestTransmitter();
-  }
-
-  @Test
-  public void upCheck() {
-    when(vertxTransmitter.get(any(), any(), ArgumentMatchers.contains("/upcheck"), any()))
-        .thenReturn("I'm up!");
-
-    assertThat(enclave.upCheck()).isTrue();
-  }
-
-  @Test
-  public void receiveThrowsWhenPayloadDoesNotExist() {
-    when(vertxTransmitter.get(any(), any(), ArgumentMatchers.contains("/receive"), any()))
-        .thenThrow(
-            new EnclaveClientException(404, "Message with hash " + MOCK_KEY + " was not found"));
-
-    assertThatThrownBy(() -> enclave.receive(MOCK_KEY))
-        .isInstanceOf(EnclaveClientException.class)
-        .hasMessageContaining("Message with hash " + MOCK_KEY + " was not found");
-  }
-
-  @Test
-  public void sendAndReceive() {
-    when(vertxTransmitter.post(any(), any(), any(), any())).thenReturn(new SendResponse(KEY));
-    when(vertxTransmitter.get(any(), any(), ArgumentMatchers.contains("/receive"), any()))
-        .thenReturn(new GoQuorumReceiveResponse(PAYLOAD, 0, null, null));
-
-    final List<String> publicKeys = Arrays.asList("/+UuD63zItL1EbjxkKUljMgG8Z1w0AJ8pNOR4iq2yQc=");
-
-    final SendResponse sr = enclave.send(PAYLOAD, publicKeys.get(0), publicKeys);
-    assertThat(sr.getKey()).isEqualTo(KEY);
-
-    final GoQuorumReceiveResponse rr = enclave.receive(sr.getKey());
-    assertThat(rr).isNotNull();
-    assertThat(rr.getPayload()).isEqualTo(PAYLOAD);
-  }
-
-  @Test
-  public void sendSignedTransaction() {
-    when(vertxTransmitter.post(any(), any(), ArgumentMatchers.contains("/sendsignedtx"), any()))
-        .thenReturn(new SendResponse(KEY));
-
-    final List<String> publicKeys = Arrays.asList("/+UuD63zItL1EbjxkKUljMgG8Z1w0AJ8pNOR4iq2yQc=");
-
-    final SendResponse sr = enclave.sendSignedTransaction(PAYLOAD, publicKeys);
-    assertThat(sr.getKey()).isEqualTo(KEY);
-  }
-
-  @Test
-  public void upcheckReturnsFalseIfNoResponseReceived() throws URISyntaxException {
-    final Vertx vertx = Vertx.vertx();
-    final EnclaveFactory factory = new EnclaveFactory(vertx);
-    assertThat(factory.createGoQuorumEnclave(new URI("http://8.8.8.8:65535")).upCheck()).isFalse();
-  }
-
-  private GoQuorumEnclave createGoQuorumEnclaveWithMockRequestTransmitter() {
-    vertxTransmitter = mock(RequestTransmitter.class);
-
-    return new GoQuorumEnclave(vertxTransmitter);
-  }
-}
diff --git a/enclave/src/integration-test/java/org/hyperledger/besu/enclave/TlsEnabledEnclaveTest.java b/enclave/src/integration-test/java/org/hyperledger/besu/enclave/TlsEnabledEnclaveTest.java
index f1b1a639edb..fc99551577d 100644
--- a/enclave/src/integration-test/java/org/hyperledger/besu/enclave/TlsEnabledEnclaveTest.java
+++ b/enclave/src/integration-test/java/org/hyperledger/besu/enclave/TlsEnabledEnclaveTest.java
@@ -32,9 +32,9 @@
 
 import io.vertx.core.Vertx;
 import io.vertx.core.http.HttpServer;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TlsEnabledEnclaveTest {
 
@@ -50,13 +50,13 @@ public void shutdown() {
     vertx.close();
   }
 
-  @Before
+  @BeforeEach
   public void setup() {
     serverFactory = new TlsEnabledHttpServerFactory();
     this.vertx = Vertx.vertx();
   }
 
-  @After
+  @AfterEach
   public void cleanup() {
     serverFactory.shutdown();
     this.shutdown();
diff --git a/enclave/src/integration-test/java/org/hyperledger/besu/enclave/TlsEnabledHttpServerFactory.java b/enclave/src/integration-test/java/org/hyperledger/besu/enclave/TlsEnabledHttpServerFactory.java
index f7e434cf340..6538c4a4a91 100644
--- a/enclave/src/integration-test/java/org/hyperledger/besu/enclave/TlsEnabledHttpServerFactory.java
+++ b/enclave/src/integration-test/java/org/hyperledger/besu/enclave/TlsEnabledHttpServerFactory.java
@@ -70,7 +70,7 @@ HttpServer create(
         web3HttpServerOptions.setSsl(true);
         web3HttpServerOptions.setClientAuth(ClientAuth.REQUIRED);
         web3HttpServerOptions.setTrustOptions(
-            VertxTrustOptions.whitelistClients(serverFingerprintFile));
+            VertxTrustOptions.allowlistClients(serverFingerprintFile));
         web3HttpServerOptions.setPfxKeyCertOptions(
             new PfxOptions()
                 .setPath(serverCert.getPkcs12File().toString())
diff --git a/enclave/src/integration-test/java/org/hyperledger/besu/enclave/TlsHelpers.java b/enclave/src/integration-test/java/org/hyperledger/besu/enclave/TlsHelpers.java
index cdd76e5b940..7eec56153e4 100644
--- a/enclave/src/integration-test/java/org/hyperledger/besu/enclave/TlsHelpers.java
+++ b/enclave/src/integration-test/java/org/hyperledger/besu/enclave/TlsHelpers.java
@@ -39,6 +39,8 @@
 
 public class TlsHelpers {
 
+  private TlsHelpers() {}
+
   private static KeyStore loadP12KeyStore(final File pkcsFile, final String password)
       throws KeyStoreException, NoSuchAlgorithmException, CertificateException {
     final KeyStore store = KeyStore.getInstance("pkcs12");
@@ -82,7 +84,7 @@ public static List<X509Certificate> getCertsFromPkcs12(final TlsCertificateDefin
 
   private static String generateFingerprint(final X509Certificate cert)
       throws NoSuchAlgorithmException, CertificateEncodingException {
-    final MessageDigest md = MessageDigestFactory.create("SHA-256");
+    final MessageDigest md = MessageDigestFactory.create(MessageDigestFactory.SHA256_ALG);
     md.update(cert.getEncoded());
     final byte[] digest = md.digest();
 
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/Enclave.java b/enclave/src/main/java/org/hyperledger/besu/enclave/Enclave.java
index 262fd5aae85..f7ffdb10fef 100644
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/Enclave.java
+++ b/enclave/src/main/java/org/hyperledger/besu/enclave/Enclave.java
@@ -34,6 +34,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+/** The Enclave. */
 public class Enclave {
 
   private static final ObjectMapper objectMapper = new ObjectMapper();
@@ -42,20 +43,38 @@ public class Enclave {
 
   private final RequestTransmitter requestTransmitter;
 
+  /**
+   * Instantiates a new Enclave.
+   *
+   * @param requestTransmitter the request transmitter
+   */
   public Enclave(final RequestTransmitter requestTransmitter) {
     this.requestTransmitter = requestTransmitter;
   }
 
+  /**
+   * Up check.
+   *
+   * @return the boolean
+   */
   public boolean upCheck() {
     try {
       final String upcheckResponse =
-          requestTransmitter.get(null, null, "/upcheck", this::handleRawResponse);
+          requestTransmitter.get(null, null, "/upcheck", this::handleRawResponse, false);
       return upcheckResponse.equals("I'm up!");
     } catch (final Exception e) {
       return false;
     }
   }
 
+  /**
+   * Send payload.
+   *
+   * @param payload the payload
+   * @param privateFrom the private from
+   * @param privateFor the private for
+   * @return the send response
+   */
   public SendResponse send(
       final String payload, final String privateFrom, final List<String> privateFor) {
     final SendRequestLegacy request = new SendRequestLegacy(payload, privateFrom, privateFor);
@@ -66,6 +85,14 @@ public SendResponse send(
         (statusCode, body) -> handleJsonResponse(statusCode, body, SendResponse.class));
   }
 
+  /**
+   * Send payload.
+   *
+   * @param payload the payload
+   * @param privateFrom the private from
+   * @param privacyGroupId the privacy group id
+   * @return the send response
+   */
   public SendResponse send(
       final String payload, final String privateFrom, final String privacyGroupId) {
     final SendRequestBesu request = new SendRequestBesu(payload, privateFrom, privacyGroupId);
@@ -76,6 +103,12 @@ public SendResponse send(
         (statusCode, body) -> handleJsonResponse(statusCode, body, SendResponse.class));
   }
 
+  /**
+   * Receive response.
+   *
+   * @param payloadKey the payload key
+   * @return the receive response
+   */
   public ReceiveResponse receive(final String payloadKey) {
     final ReceiveRequest request = new ReceiveRequest(payloadKey);
     return post(
@@ -85,6 +118,13 @@ public ReceiveResponse receive(final String payloadKey) {
         (statusCode, body) -> handleJsonResponse(statusCode, body, ReceiveResponse.class));
   }
 
+  /**
+   * Receive response.
+   *
+   * @param payloadKey the payload key
+   * @param to the to
+   * @return the receive response
+   */
   public ReceiveResponse receive(final String payloadKey, final String to) {
     final ReceiveRequest request = new ReceiveRequest(payloadKey, to);
     return post(
@@ -94,6 +134,15 @@ public ReceiveResponse receive(final String payloadKey, final String to) {
         (statusCode, body) -> handleJsonResponse(statusCode, body, ReceiveResponse.class));
   }
 
+  /**
+   * Create privacy group.
+   *
+   * @param addresses the addresses
+   * @param from the from
+   * @param name the name
+   * @param description the description
+   * @return the privacy group
+   */
   public PrivacyGroup createPrivacyGroup(
       final List<String> addresses,
       final String from,
@@ -108,6 +157,13 @@ public PrivacyGroup createPrivacyGroup(
         (statusCode, body) -> handleJsonResponse(statusCode, body, PrivacyGroup.class));
   }
 
+  /**
+   * Delete privacy group.
+   *
+   * @param privacyGroupId the privacy group id
+   * @param from the from
+   * @return the result of POST operation
+   */
   public String deletePrivacyGroup(final String privacyGroupId, final String from) {
     final DeletePrivacyGroupRequest request = new DeletePrivacyGroupRequest(privacyGroupId, from);
     return post(
@@ -117,6 +173,12 @@ public String deletePrivacyGroup(final String privacyGroupId, final String from)
         (statusCode, body) -> handleJsonResponse(statusCode, body, String.class));
   }
 
+  /**
+   * Find privacy group.
+   *
+   * @param addresses the addresses
+   * @return Array of privacy group
+   */
   public PrivacyGroup[] findPrivacyGroup(final List<String> addresses) {
     final FindPrivacyGroupRequest request = new FindPrivacyGroupRequest(addresses);
     return post(
@@ -126,6 +188,12 @@ public PrivacyGroup[] findPrivacyGroup(final List<String> addresses) {
         (statusCode, body) -> handleJsonResponse(statusCode, body, PrivacyGroup[].class));
   }
 
+  /**
+   * Retrieve privacy group.
+   *
+   * @param privacyGroupId the privacy group id
+   * @return the privacy group
+   */
   public PrivacyGroup retrievePrivacyGroup(final String privacyGroupId) {
     final RetrievePrivacyGroupRequest request = new RetrievePrivacyGroupRequest(privacyGroupId);
     return post(
@@ -168,12 +236,53 @@ private <T> T parseResponse(
       final int statusCode, final byte[] body, final Class<T> responseType) {
     try {
       return objectMapper.readValue(body, responseType);
-    } catch (IOException e) {
+    } catch (final IOException e) {
       final String utf8EncodedBody = new String(body, StandardCharsets.UTF_8);
-      throw new EnclaveClientException(statusCode, utf8EncodedBody);
+      // Check if it's a Tessera error message
+      try {
+        return objectMapper.readValue(
+            processTesseraError(utf8EncodedBody, responseType), responseType);
+      } catch (final IOException ex) {
+        throw new EnclaveClientException(statusCode, utf8EncodedBody);
+      }
     }
   }
 
+  private <T> byte[] processTesseraError(final String errorMsg, final Class<T> responseType) {
+    if (responseType == SendResponse.class) {
+      final String base64Key =
+          errorMsg.substring(errorMsg.substring(0, errorMsg.indexOf('=')).lastIndexOf(' '));
+      return jsonByteArrayFromString("key", base64Key);
+    } else if (responseType == ErrorResponse.class) {
+      // Remove dynamic values
+      return jsonByteArrayFromString("error", removeBase64(errorMsg));
+    } else {
+      throw new RuntimeException("Unhandled response type.");
+    }
+  }
+
+  private String removeBase64(final String input) {
+    if (input.contains("=")) {
+      final String startInclBase64 = input.substring(0, input.lastIndexOf('='));
+      final String startTrimmed = startInclBase64.substring(0, startInclBase64.lastIndexOf(" "));
+      final String end = input.substring(input.lastIndexOf("="));
+      if (end.length() > 1) {
+        // Base64 in middle
+        return startTrimmed + end.substring(1);
+      } else {
+        // Base64 at end
+        return startTrimmed;
+      }
+    } else {
+      return input;
+    }
+  }
+
+  private byte[] jsonByteArrayFromString(final String key, final String value) {
+    String format = String.format("{\"%s\":\"%s\"}", key, value);
+    return format.getBytes(StandardCharsets.UTF_8);
+  }
+
   private boolean clientError(final int statusCode) {
     return statusCode >= 400 && statusCode < 500;
   }
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/EnclaveClientException.java b/enclave/src/main/java/org/hyperledger/besu/enclave/EnclaveClientException.java
index 18bb5cac3c0..ec0fd12c8a8 100644
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/EnclaveClientException.java
+++ b/enclave/src/main/java/org/hyperledger/besu/enclave/EnclaveClientException.java
@@ -14,18 +14,37 @@
  */
 package org.hyperledger.besu.enclave;
 
-public class EnclaveClientException extends IllegalArgumentException {
+/** The Enclave client custom exception. */
+public class EnclaveClientException extends RuntimeException {
+  /** Status Code */
   private int statusCode;
 
+  /**
+   * Instantiates a new Enclave client exception.
+   *
+   * @param statusCode the status code
+   * @param message the message
+   */
   public EnclaveClientException(final int statusCode, final String message) {
     super(message);
     this.statusCode = statusCode;
   }
 
+  /**
+   * Instantiates a new Enclave client exception.
+   *
+   * @param message the message
+   * @param cause the cause
+   */
   public EnclaveClientException(final String message, final Throwable cause) {
     super(message, cause);
   }
 
+  /**
+   * Gets status code.
+   *
+   * @return the status code
+   */
   public int getStatusCode() {
     return statusCode;
   }
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/EnclaveConfigurationException.java b/enclave/src/main/java/org/hyperledger/besu/enclave/EnclaveConfigurationException.java
index bfe02fb3c08..ed7f948c1ce 100644
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/EnclaveConfigurationException.java
+++ b/enclave/src/main/java/org/hyperledger/besu/enclave/EnclaveConfigurationException.java
@@ -14,8 +14,14 @@
  */
 package org.hyperledger.besu.enclave;
 
+/** The Enclave configuration custom exception. */
 public class EnclaveConfigurationException extends IllegalStateException {
 
+  /**
+   * Instantiates a new Enclave configuration exception.
+   *
+   * @param message the message
+   */
   public EnclaveConfigurationException(final String message) {
     super(message);
   }
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/EnclaveFactory.java b/enclave/src/main/java/org/hyperledger/besu/enclave/EnclaveFactory.java
index a316fb7c202..72da57ef8dd 100644
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/EnclaveFactory.java
+++ b/enclave/src/main/java/org/hyperledger/besu/enclave/EnclaveFactory.java
@@ -29,16 +29,28 @@
 import io.vertx.core.net.PfxOptions;
 import org.apache.tuweni.net.tls.VertxTrustOptions;
 
+/** The Enclave factory. */
 public class EnclaveFactory {
 
   private final Vertx vertx;
   private static final int CONNECT_TIMEOUT = 1000;
   private static final boolean TRUST_CA = false;
 
+  /**
+   * Instantiates a new Enclave factory.
+   *
+   * @param vertx the vertx
+   */
   public EnclaveFactory(final Vertx vertx) {
     this.vertx = vertx;
   }
 
+  /**
+   * Create enclave.
+   *
+   * @param enclaveUri the enclave uri
+   * @return the enclave
+   */
   public Enclave createVertxEnclave(final URI enclaveUri) {
     final HttpClientOptions clientOptions = createNonTlsClientOptions(enclaveUri);
 
@@ -48,16 +60,16 @@ public Enclave createVertxEnclave(final URI enclaveUri) {
     return new Enclave(vertxTransmitter);
   }
 
-  public GoQuorumEnclave createGoQuorumEnclave(final URI enclaveUri) {
-    final HttpClientOptions clientOptions = createNonTlsClientOptions(enclaveUri);
-
-    final RequestTransmitter vertxTransmitter =
-        new VertxRequestTransmitter(vertx.createHttpClient(clientOptions));
-
-    return new GoQuorumEnclave(vertxTransmitter);
-  }
-
-  public GoQuorumEnclave createGoQuorumEnclave(
+  /**
+   * Create enclave.
+   *
+   * @param enclaveUri the enclave uri
+   * @param privacyKeyStoreFile the privacy key store file
+   * @param privacyKeyStorePasswordFile the privacy key store password file
+   * @param privacyAllowlistFile the privacy allowlist file
+   * @return the enclave
+   */
+  public Enclave createVertxEnclave(
       final URI enclaveUri,
       final Path privacyKeyStoreFile,
       final Path privacyKeyStorePasswordFile,
@@ -70,7 +82,7 @@ public GoQuorumEnclave createGoQuorumEnclave(
     final RequestTransmitter vertxTransmitter =
         new VertxRequestTransmitter(vertx.createHttpClient(clientOptions));
 
-    return new GoQuorumEnclave(vertxTransmitter);
+    return new Enclave(vertxTransmitter);
   }
 
   private HttpClientOptions createNonTlsClientOptions(final URI enclaveUri) {
@@ -100,7 +112,7 @@ private HttpClientOptions createTlsClientOptions(
             convertFrom(privacyKeyStoreFile, privacyKeyStorePasswordFile));
       }
       clientOptions.setTrustOptions(
-          VertxTrustOptions.whitelistServers(privacyAllowlistFile, TRUST_CA));
+          VertxTrustOptions.allowlistServers(privacyAllowlistFile, TRUST_CA));
     } catch (final NoSuchFileException e) {
       throw new InvalidConfigurationException(
           "Requested file " + e.getMessage() + " does not exist at specified location.");
@@ -115,28 +127,19 @@ private HttpClientOptions createTlsClientOptions(
     return clientOptions;
   }
 
-  public Enclave createVertxEnclave(
-      final URI enclaveUri,
-      final Path privacyKeyStoreFile,
-      final Path privacyKeyStorePasswordFile,
-      final Path privacyAllowlistFile) {
-
-    final HttpClientOptions clientOptions =
-        createTlsClientOptions(
-            enclaveUri, privacyKeyStoreFile, privacyKeyStorePasswordFile, privacyAllowlistFile);
-
-    final RequestTransmitter vertxTransmitter =
-        new VertxRequestTransmitter(vertx.createHttpClient(clientOptions));
-
-    return new Enclave(vertxTransmitter);
-  }
-
   private static PfxOptions convertFrom(final Path keystoreFile, final Path keystorePasswordFile)
       throws IOException {
     final String password = readSecretFromFile(keystorePasswordFile);
     return new PfxOptions().setPassword(password).setPath(keystoreFile.toString());
   }
 
+  /**
+   * Read secret from file.
+   *
+   * @param path the path
+   * @return the string
+   * @throws IOException the io exception
+   */
   static String readSecretFromFile(final Path path) throws IOException {
     final String password =
         Files.asCharSource(path.toFile(), StandardCharsets.UTF_8).readFirstLine();
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/EnclaveIOException.java b/enclave/src/main/java/org/hyperledger/besu/enclave/EnclaveIOException.java
index e0fa9994f5a..80d42e50ce5 100644
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/EnclaveIOException.java
+++ b/enclave/src/main/java/org/hyperledger/besu/enclave/EnclaveIOException.java
@@ -14,11 +14,23 @@
  */
 package org.hyperledger.besu.enclave;
 
+/** The Enclave IO exception. */
 public class EnclaveIOException extends RuntimeException {
+  /**
+   * Instantiates a new Enclave IO exception.
+   *
+   * @param message the message
+   * @param cause the cause
+   */
   public EnclaveIOException(final String message, final Throwable cause) {
     super(message, cause);
   }
 
+  /**
+   * Instantiates a new Enclave IO exception.
+   *
+   * @param message the message
+   */
   public EnclaveIOException(final String message) {
     super(message);
   }
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/EnclaveServerException.java b/enclave/src/main/java/org/hyperledger/besu/enclave/EnclaveServerException.java
index 33bd1bb595b..538ae7478d4 100644
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/EnclaveServerException.java
+++ b/enclave/src/main/java/org/hyperledger/besu/enclave/EnclaveServerException.java
@@ -14,14 +14,27 @@
  */
 package org.hyperledger.besu.enclave;
 
+/** The Enclave server exception. */
 public class EnclaveServerException extends RuntimeException {
+  /** Status Code */
   private final int statusCode;
 
+  /**
+   * Instantiates a new Enclave server exception.
+   *
+   * @param statusCode the status code
+   * @param message the message
+   */
   public EnclaveServerException(final int statusCode, final String message) {
     super(message);
     this.statusCode = statusCode;
   }
 
+  /**
+   * Gets status code.
+   *
+   * @return the status code
+   */
   public int getStatusCode() {
     return statusCode;
   }
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/GoQuorumEnclave.java b/enclave/src/main/java/org/hyperledger/besu/enclave/GoQuorumEnclave.java
deleted file mode 100644
index 8705d445068..00000000000
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/GoQuorumEnclave.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.enclave;
-
-import org.hyperledger.besu.enclave.RequestTransmitter.ResponseBodyHandler;
-import org.hyperledger.besu.enclave.types.GoQuorumReceiveResponse;
-import org.hyperledger.besu.enclave.types.GoQuorumSendRequest;
-import org.hyperledger.besu.enclave.types.GoQuorumSendSignedRequest;
-import org.hyperledger.besu.enclave.types.ReceiveRequest;
-import org.hyperledger.besu.enclave.types.SendResponse;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-public class GoQuorumEnclave {
-
-  private static final ObjectMapper objectMapper = new ObjectMapper();
-  private static final String JSON = "application/json";
-
-  private final RequestTransmitter requestTransmitter;
-
-  public GoQuorumEnclave(final RequestTransmitter requestTransmitter) {
-    this.requestTransmitter = requestTransmitter;
-  }
-
-  public boolean upCheck() {
-    try {
-      final String upcheckResponse =
-          requestTransmitter.get(null, null, "/upcheck", this::handleRawResponse);
-      return upcheckResponse.equals("I'm up!");
-    } catch (final Exception e) {
-      return false;
-    }
-  }
-
-  public SendResponse send(
-      final byte[] payload, final String privateFrom, final List<String> privateFor) {
-    final GoQuorumSendRequest request = new GoQuorumSendRequest(payload, privateFrom, privateFor);
-    return post(
-        JSON,
-        request,
-        "/send",
-        (statusCode, body) -> handleJsonResponse(statusCode, body, SendResponse.class, 201));
-  }
-
-  public SendResponse sendSignedTransaction(
-      final byte[] txLookupId, final List<String> privateFor) {
-    final GoQuorumSendSignedRequest request = new GoQuorumSendSignedRequest(txLookupId, privateFor);
-    return post(
-        JSON,
-        request,
-        "/sendsignedtx",
-        (statusCode, body) -> handleJsonResponse(statusCode, body, SendResponse.class, 201));
-  }
-
-  public GoQuorumReceiveResponse receive(final String payloadKey) {
-    final ReceiveRequest request = new ReceiveRequest(payloadKey);
-    return get(
-        JSON,
-        request,
-        "/receive",
-        (statusCode, body) ->
-            handleJsonResponse(statusCode, body, GoQuorumReceiveResponse.class, 200));
-  }
-
-  private <T> T post(
-      final String mediaType,
-      final Object content,
-      final String endpoint,
-      final ResponseBodyHandler<T> responseBodyHandler) {
-    final String bodyText;
-    try {
-      bodyText = objectMapper.writeValueAsString(content);
-    } catch (final JsonProcessingException e) {
-      throw new EnclaveClientException(400, "Unable to serialize request.");
-    }
-
-    return requestTransmitter.post(mediaType, bodyText, endpoint, responseBodyHandler);
-  }
-
-  private <T> T get(
-      final String mediaType,
-      final Object content,
-      final String endpoint,
-      final ResponseBodyHandler<T> responseBodyHandler) {
-    final String bodyText;
-    try {
-      bodyText = objectMapper.writeValueAsString(content);
-    } catch (final JsonProcessingException e) {
-      throw new EnclaveClientException(400, "Unable to serialize request.");
-    }
-
-    final T t = requestTransmitter.get(mediaType, bodyText, endpoint, responseBodyHandler);
-    return t;
-  }
-
-  private <T> T handleJsonResponse(
-      final int statusCode,
-      final byte[] body,
-      final Class<T> responseType,
-      final int expectedStatusCode) {
-
-    if (isSuccess(statusCode, expectedStatusCode)) {
-      return parseResponse(statusCode, body, responseType);
-    } else if (clientError(statusCode)) {
-      final String utf8EncodedBody = new String(body, StandardCharsets.UTF_8);
-      throw new EnclaveClientException(statusCode, utf8EncodedBody);
-    } else {
-      final String utf8EncodedBody = new String(body, StandardCharsets.UTF_8);
-      throw new EnclaveServerException(statusCode, utf8EncodedBody);
-    }
-  }
-
-  private <T> T parseResponse(
-      final int statusCode, final byte[] body, final Class<T> responseType) {
-    try {
-      return objectMapper.readValue(body, responseType);
-    } catch (final IOException e) {
-      final String utf8EncodedBody = new String(body, StandardCharsets.UTF_8);
-      throw new EnclaveClientException(statusCode, utf8EncodedBody);
-    }
-  }
-
-  private boolean clientError(final int statusCode) {
-    return statusCode >= 400 && statusCode < 500;
-  }
-
-  private boolean isSuccess(final int statusCode, final int expectedStatusCode) {
-    return statusCode == expectedStatusCode;
-  }
-
-  private String handleRawResponse(final int statusCode, final byte[] body) {
-    final String bodyText = new String(body, StandardCharsets.UTF_8);
-    if (isSuccess(statusCode, 200)) {
-      return bodyText;
-    }
-    throw new EnclaveClientException(
-        statusCode, String.format("Request failed with %d; body={%s}", statusCode, bodyText));
-  }
-}
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/RequestTransmitter.java b/enclave/src/main/java/org/hyperledger/besu/enclave/RequestTransmitter.java
index 9ce6e8f0a7c..8e4693cffdf 100644
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/RequestTransmitter.java
+++ b/enclave/src/main/java/org/hyperledger/besu/enclave/RequestTransmitter.java
@@ -14,22 +14,57 @@
  */
 package org.hyperledger.besu.enclave;
 
+/** The interface Request transmitter. */
 public interface RequestTransmitter {
 
+  /**
+   * The interface Response body handler.
+   *
+   * @param <T> the type parameter
+   */
   @FunctionalInterface
   interface ResponseBodyHandler<T> {
+    /**
+     * Convert response.
+     *
+     * @param statusCode the status code
+     * @param body the body
+     * @return the t
+     */
     T convertResponse(final int statusCode, final byte[] body);
   }
 
+  /**
+   * Post operation.
+   *
+   * @param <T> the type parameter
+   * @param mediaType the media type
+   * @param content the content
+   * @param endpoint the endpoint
+   * @param responseBodyHandler the response body handler
+   * @return the t
+   */
   <T> T post(
       String mediaType,
       String content,
       String endpoint,
       ResponseBodyHandler<T> responseBodyHandler);
 
+  /**
+   * Get operation.
+   *
+   * @param <T> the type parameter
+   * @param mediaType the media type
+   * @param content the content
+   * @param endpoint the endpoint
+   * @param responseBodyHandler the response body handler
+   * @param withAcceptJsonHeader the with accept json header
+   * @return the t
+   */
   <T> T get(
       String mediaType,
       String content,
       String endpoint,
-      ResponseBodyHandler<T> responseBodyHandler);
+      ResponseBodyHandler<T> responseBodyHandler,
+      final boolean withAcceptJsonHeader);
 }
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/VertxRequestTransmitter.java b/enclave/src/main/java/org/hyperledger/besu/enclave/VertxRequestTransmitter.java
index 4c535504b90..309f7d82504 100644
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/VertxRequestTransmitter.java
+++ b/enclave/src/main/java/org/hyperledger/besu/enclave/VertxRequestTransmitter.java
@@ -18,17 +18,27 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.vertx.core.Future;
 import io.vertx.core.http.HttpClient;
 import io.vertx.core.http.HttpClientRequest;
 import io.vertx.core.http.HttpClientResponse;
 import io.vertx.core.http.HttpHeaders;
 import io.vertx.core.http.HttpMethod;
+import io.vertx.core.http.RequestOptions;
 
+/** The Vertx request transmitter. */
 public class VertxRequestTransmitter implements RequestTransmitter {
 
+  private static final String APPLICATION_JSON = "application/json";
   private final HttpClient client;
   private static final long REQUEST_TIMEOUT_MS = 5000L;
 
+  /**
+   * Instantiates a new Vertx request transmitter.
+   *
+   * @param httpClient the http client
+   */
   public VertxRequestTransmitter(final HttpClient httpClient) {
     this.client = httpClient;
   }
@@ -40,7 +50,12 @@ public <T> T post(
       final String endpoint,
       final ResponseBodyHandler<T> responseHandler) {
     return sendRequest(
-        HttpMethod.POST, Optional.of(contentType), Optional.of(content), endpoint, responseHandler);
+        HttpMethod.POST,
+        Optional.of(contentType),
+        Optional.of(content),
+        endpoint,
+        responseHandler,
+        false);
   }
 
   @Override
@@ -48,36 +63,71 @@ public <T> T get(
       final String contentType,
       final String content,
       final String endpoint,
-      final ResponseBodyHandler<T> responseHandler) {
+      final ResponseBodyHandler<T> responseHandler,
+      final boolean withAcceptJsonHeader) {
     return sendRequest(
         HttpMethod.GET,
         Optional.ofNullable(contentType),
         Optional.ofNullable(content),
         endpoint,
-        responseHandler);
+        responseHandler,
+        withAcceptJsonHeader);
   }
 
+  /**
+   * Send request operation.
+   *
+   * @param <T> the type parameter
+   * @param method the method
+   * @param contentType the content type
+   * @param content the content
+   * @param endpoint the endpoint
+   * @param responseHandler the response handler
+   * @param withAcceptJsonHeader the with accept json header
+   * @return the t
+   */
   protected <T> T sendRequest(
       final HttpMethod method,
       final Optional<String> contentType,
       final Optional<String> content,
       final String endpoint,
-      final ResponseBodyHandler<T> responseHandler) {
+      final ResponseBodyHandler<T> responseHandler,
+      final boolean withAcceptJsonHeader) {
     try {
       final CompletableFuture<T> result = new CompletableFuture<>();
-      final HttpClientRequest request =
-          client
-              .request(method, endpoint)
-              .handler(response -> handleResponse(response, responseHandler, result))
-              .setTimeout(REQUEST_TIMEOUT_MS)
-              .exceptionHandler(result::completeExceptionally)
-              .setChunked(false);
-      contentType.ifPresent(ct -> request.putHeader(HttpHeaders.CONTENT_TYPE, ct));
-      if (content.isPresent()) {
-        request.end(content.get());
-      } else {
-        request.end();
+      RequestOptions options = new RequestOptions();
+      options.setTimeout(REQUEST_TIMEOUT_MS);
+      options.setMethod(method);
+      options.setURI(endpoint);
+      if (withAcceptJsonHeader) {
+        // this is needed when using Tessera GET /transaction/{hash} to choose the right RPC
+        options.putHeader(HttpHeaderNames.ACCEPT, APPLICATION_JSON);
       }
+      contentType.ifPresent(ct -> options.putHeader(HttpHeaders.CONTENT_TYPE, ct));
+
+      final Future<HttpClientRequest> request = client.request(options);
+      request
+          .onComplete(
+              newRequest -> {
+                if (content.isPresent()) {
+                  request.result().end(content.get());
+                } else {
+                  request.result().end();
+                }
+                request
+                    .result()
+                    .send(
+                        h -> {
+                          if (h.succeeded()) {
+                            handleResponse(
+                                newRequest.result().response().result(), responseHandler, result);
+                          } else {
+                            result.completeExceptionally(h.cause());
+                          }
+                        });
+              })
+          .onFailure(result::completeExceptionally);
+
       return result.get();
     } catch (final ExecutionException | InterruptedException e) {
       if (e.getCause() instanceof EnclaveClientException) {
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/types/CreatePrivacyGroupRequest.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/CreatePrivacyGroupRequest.java
index 411d5ea91b6..c7f8e6811b8 100644
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/types/CreatePrivacyGroupRequest.java
+++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/CreatePrivacyGroupRequest.java
@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+/** The Create privacy group request. */
 public class CreatePrivacyGroupRequest {
 
   private final List<String> addresses;
@@ -26,6 +27,14 @@ public class CreatePrivacyGroupRequest {
   private final String name;
   private final String description;
 
+  /**
+   * Instantiates a new Create privacy group request.
+   *
+   * @param addresses the addresses
+   * @param from the from
+   * @param name the name
+   * @param description the description
+   */
   @JsonCreator
   public CreatePrivacyGroupRequest(
       @JsonProperty("addresses") final List<String> addresses,
@@ -38,21 +47,41 @@ public CreatePrivacyGroupRequest(
     this.description = description;
   }
 
+  /**
+   * Addresses list.
+   *
+   * @return the list
+   */
   @JsonProperty("addresses")
   public List<String> addresses() {
     return addresses;
   }
 
+  /**
+   * From.
+   *
+   * @return the string
+   */
   @JsonProperty("from")
   public String from() {
     return from;
   }
 
+  /**
+   * Name.
+   *
+   * @return the string
+   */
   @JsonProperty("name")
   public String name() {
     return name;
   }
 
+  /**
+   * Description.
+   *
+   * @return the string
+   */
   @JsonProperty("description")
   public String description() {
     return description;
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/types/DeletePrivacyGroupRequest.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/DeletePrivacyGroupRequest.java
index e07b7d8e163..6dfa1b39544 100644
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/types/DeletePrivacyGroupRequest.java
+++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/DeletePrivacyGroupRequest.java
@@ -17,11 +17,18 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+/** The Delete privacy group request. */
 public class DeletePrivacyGroupRequest {
 
   private final String privacyGroupId;
   private final String from;
 
+  /**
+   * Instantiates a new Delete privacy group request.
+   *
+   * @param privacyGroupId the privacy group id
+   * @param from the from
+   */
   @JsonCreator
   public DeletePrivacyGroupRequest(
       @JsonProperty("privacyGroupId") final String privacyGroupId,
@@ -30,11 +37,21 @@ public DeletePrivacyGroupRequest(
     this.from = from;
   }
 
+  /**
+   * Privacy group id.
+   *
+   * @return the string
+   */
   @JsonProperty("privacyGroupId")
   public String privacyGroupId() {
     return privacyGroupId;
   }
 
+  /**
+   * From string.
+   *
+   * @return the string
+   */
   @JsonProperty("from")
   public String from() {
     return from;
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/types/ErrorResponse.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/ErrorResponse.java
index 72d7deec1ab..785fcfdb7c3 100644
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/types/ErrorResponse.java
+++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/ErrorResponse.java
@@ -18,15 +18,27 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
+/** The Error response. */
 @JsonPropertyOrder({"error"})
 public class ErrorResponse {
+  /** The Error. */
   String error;
 
+  /**
+   * Instantiates a new Error response.
+   *
+   * @param error the error
+   */
   @JsonCreator
   public ErrorResponse(@JsonProperty("error") final String error) {
     this.error = error;
   }
 
+  /**
+   * Gets error.
+   *
+   * @return the error
+   */
   public String getError() {
     return error;
   }
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/types/FindPrivacyGroupRequest.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/FindPrivacyGroupRequest.java
index c42d8f4a465..2f142e52e6a 100644
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/types/FindPrivacyGroupRequest.java
+++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/FindPrivacyGroupRequest.java
@@ -19,15 +19,26 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+/** The Find privacy group request. */
 public class FindPrivacyGroupRequest {
 
   private final List<String> addresses;
 
+  /**
+   * Instantiates a new Find privacy group request.
+   *
+   * @param addresses the addresses
+   */
   @JsonCreator
   public FindPrivacyGroupRequest(@JsonProperty("addresses") final List<String> addresses) {
     this.addresses = addresses;
   }
 
+  /**
+   * Addresses list.
+   *
+   * @return the list
+   */
   @JsonProperty("addresses")
   public List<String> addresses() {
     return addresses;
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/types/GoQuorumReceiveResponse.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/GoQuorumReceiveResponse.java
deleted file mode 100644
index a72e469c723..00000000000
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/types/GoQuorumReceiveResponse.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.enclave.types;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class GoQuorumReceiveResponse {
-
-  private final byte[] payload;
-  private final int privacyFlag;
-  private final String affectedContractTransactions[];
-  private final String execHash;
-
-  @JsonCreator
-  public GoQuorumReceiveResponse(
-      @JsonProperty(value = "payload") final byte[] payload,
-      @JsonProperty(value = "privacyFlag") final int privacyFlag,
-      @JsonProperty(value = "affectedContractTransactions")
-          final String affectedContractTransactions[],
-      @JsonProperty(value = "execHash") final String execHash) {
-    this.payload = payload;
-    this.privacyFlag = privacyFlag;
-    this.affectedContractTransactions = affectedContractTransactions;
-    this.execHash = execHash;
-  }
-
-  public byte[] getPayload() {
-    return payload;
-  }
-
-  public int getPrivacyFlag() {
-    return privacyFlag;
-  }
-
-  public String[] getAffectedContractTransactions() {
-    return affectedContractTransactions;
-  }
-
-  public String getExecHash() {
-    return execHash;
-  }
-}
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/types/GoQuorumSendRequest.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/GoQuorumSendRequest.java
deleted file mode 100644
index 14b7bcb898d..00000000000
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/types/GoQuorumSendRequest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.enclave.types;
-
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonPropertyOrder({"payload", "from", "to"})
-public class GoQuorumSendRequest {
-  private final byte[] payload;
-  private final String from;
-  private final List<String> to;
-
-  public GoQuorumSendRequest(
-      @JsonProperty(value = "payload") final byte[] payload,
-      @JsonProperty(value = "from") final String from,
-      @JsonProperty(value = "to") final List<String> to) {
-    this.payload = payload;
-    this.from = from;
-    this.to = to;
-  }
-
-  public byte[] getPayload() {
-    return payload;
-  }
-
-  public String getFrom() {
-    return from;
-  }
-
-  public List<String> getTo() {
-    return to;
-  }
-}
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/types/GoQuorumSendSignedRequest.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/GoQuorumSendSignedRequest.java
deleted file mode 100644
index cbe38c3055b..00000000000
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/types/GoQuorumSendSignedRequest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.enclave.types;
-
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonPropertyOrder({"hash", "to"})
-public class GoQuorumSendSignedRequest {
-  private final byte[] hash;
-  private final List<String> to;
-
-  public GoQuorumSendSignedRequest(
-      @JsonProperty(value = "hash") final byte[] hash,
-      @JsonProperty(value = "to") final List<String> privateFor) {
-    this.hash = hash;
-    this.to = privateFor;
-  }
-
-  public byte[] getHash() {
-    return hash;
-  }
-
-  public List<String> getTo() {
-    return to;
-  }
-}
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/types/PrivacyGroup.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/PrivacyGroup.java
index aa6e41acab6..00cf2aab1ba 100644
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/types/PrivacyGroup.java
+++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/PrivacyGroup.java
@@ -17,56 +17,131 @@
 import java.io.Serializable;
 import java.util.List;
 
+/** The Privacy group. */
 public class PrivacyGroup implements Serializable {
 
+  /** Private Group Id */
   private String privacyGroupId;
+  /** Name */
   private String name;
+  /** Description */
   private String description;
+  /** Type */
   private Type type;
+  /** Members */
   private List<String> members;
 
+  /**
+   * Gets privacy group id.
+   *
+   * @return the privacy group id
+   */
   public String getPrivacyGroupId() {
     return privacyGroupId;
   }
 
+  /**
+   * Sets privacy group id.
+   *
+   * @param privacyGroupId the privacy group id
+   */
   public void setPrivacyGroupId(final String privacyGroupId) {
     this.privacyGroupId = privacyGroupId;
   }
 
+  /**
+   * Gets name.
+   *
+   * @return the name
+   */
   public String getName() {
     return name;
   }
 
+  /**
+   * Sets name.
+   *
+   * @param name the name
+   */
   public void setName(final String name) {
     this.name = name;
   }
 
+  /**
+   * Gets description.
+   *
+   * @return the description
+   */
   public String getDescription() {
     return description;
   }
 
+  /**
+   * Sets description.
+   *
+   * @param description the description
+   */
   public void setDescription(final String description) {
     this.description = description;
   }
 
+  /**
+   * Gets type.
+   *
+   * @return the type
+   */
   public Type getType() {
     return type;
   }
 
+  /**
+   * Sets type.
+   *
+   * @param type the type
+   */
   public void setType(final Type type) {
     this.type = type;
   }
 
+  /**
+   * Gets members.
+   *
+   * @return the members
+   */
   public List<String> getMembers() {
     return members;
   }
 
+  /**
+   * Sets members.
+   *
+   * @param members the members
+   */
   public void setMembers(final List<String> members) {
     this.members = members;
   }
 
+  /**
+   * Add members.
+   *
+   * @param participantsFromParameter the participants from parameter
+   */
+  public void addMembers(final List<String> participantsFromParameter) {
+    members.addAll(participantsFromParameter);
+  }
+
+  /** Instantiates a new Privacy group. */
   public PrivacyGroup() {}
 
+  /**
+   * Instantiates a new Privacy group.
+   *
+   * @param privacyGroupId the privacy group id
+   * @param type the type
+   * @param name the name
+   * @param description the description
+   * @param members the members
+   */
   public PrivacyGroup(
       final String privacyGroupId,
       final Type type,
@@ -80,9 +155,13 @@ public PrivacyGroup(
     this.members = members;
   }
 
+  /** The enum Type. */
   public enum Type {
+    /** Legacy type. */
     LEGACY,
-    ONCHAIN,
+    /** Flexible type. */
+    FLEXIBLE,
+    /** Pantheon type. */
     PANTHEON
   }
 }
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/types/ReceiveRequest.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/ReceiveRequest.java
index ee2e3cb0cde..fcb77f1e055 100644
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/types/ReceiveRequest.java
+++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/ReceiveRequest.java
@@ -17,25 +17,47 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
+/** The Receive request. */
 @JsonPropertyOrder({"key", "to"})
 public class ReceiveRequest {
   private final String key;
   private final String to;
 
+  /**
+   * Instantiates a new Receive request.
+   *
+   * @param key the key
+   * @param to the to
+   */
   public ReceiveRequest(
       @JsonProperty(value = "key") final String key, @JsonProperty(value = "to") final String to) {
     this.key = key;
     this.to = to;
   }
 
+  /**
+   * Instantiates a new Receive request.
+   *
+   * @param key the key
+   */
   public ReceiveRequest(final String key) {
     this(key, null);
   }
 
+  /**
+   * Gets key.
+   *
+   * @return the key
+   */
   public String getKey() {
     return key;
   }
 
+  /**
+   * Gets to.
+   *
+   * @return the to
+   */
   public String getTo() {
     return to;
   }
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/types/ReceiveResponse.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/ReceiveResponse.java
index b3ae493f865..7d6fe8635d5 100644
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/types/ReceiveResponse.java
+++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/ReceiveResponse.java
@@ -18,6 +18,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
+/** The Receive response. */
 @JsonPropertyOrder({"payload", "privacyGroupId", "senderKey"})
 public class ReceiveResponse {
 
@@ -25,6 +26,13 @@ public class ReceiveResponse {
   private final String privacyGroupId;
   private final String senderKey;
 
+  /**
+   * Instantiates a new Receive response.
+   *
+   * @param payload the payload
+   * @param privacyGroupId the privacy group id
+   * @param senderKey the sender key
+   */
   @JsonCreator
   public ReceiveResponse(
       @JsonProperty(value = "payload") final byte[] payload,
@@ -35,14 +43,29 @@ public ReceiveResponse(
     this.senderKey = senderKey;
   }
 
+  /**
+   * Get payload byte [ ].
+   *
+   * @return the byte [ ]
+   */
   public byte[] getPayload() {
     return payload;
   }
 
+  /**
+   * Gets privacy group id.
+   *
+   * @return the privacy group id
+   */
   public String getPrivacyGroupId() {
     return privacyGroupId;
   }
 
+  /**
+   * Gets sender key.
+   *
+   * @return the sender key
+   */
   public String getSenderKey() {
     return senderKey;
   }
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/types/RetrievePrivacyGroupRequest.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/RetrievePrivacyGroupRequest.java
index 1f495770936..3351e298153 100644
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/types/RetrievePrivacyGroupRequest.java
+++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/RetrievePrivacyGroupRequest.java
@@ -17,14 +17,25 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+/** The Retrieve privacy group request. */
 public class RetrievePrivacyGroupRequest {
   private final String privacyGroupId;
 
+  /**
+   * Instantiates a new Retrieve privacy group request.
+   *
+   * @param privacyGroupId the privacy group id
+   */
   @JsonCreator
   public RetrievePrivacyGroupRequest(@JsonProperty("privacyGroupId") final String privacyGroupId) {
     this.privacyGroupId = privacyGroupId;
   }
 
+  /**
+   * Privacy group id.
+   *
+   * @return the string
+   */
   @JsonProperty("privacyGroupId")
   public String privacyGroupId() {
     return privacyGroupId;
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendRequest.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendRequest.java
index 48fb75a1967..64cc8d736db 100644
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendRequest.java
+++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendRequest.java
@@ -16,19 +16,36 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
+/** The Send request. */
 public abstract class SendRequest {
   private final byte[] payload;
   private final String from;
 
+  /**
+   * Instantiates a new Send request.
+   *
+   * @param payload the payload
+   * @param from the from
+   */
   protected SendRequest(final String payload, final String from) {
     this.payload = payload.getBytes(UTF_8);
     this.from = from;
   }
 
+  /**
+   * Get payload byte [ ].
+   *
+   * @return the byte [ ]
+   */
   public byte[] getPayload() {
     return payload;
   }
 
+  /**
+   * Gets from.
+   *
+   * @return the from
+   */
   public String getFrom() {
     return from;
   }
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendRequestBesu.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendRequestBesu.java
index 40ea28dfe90..92696b8e884 100644
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendRequestBesu.java
+++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendRequestBesu.java
@@ -17,10 +17,18 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
+/** The Send request Besu. */
 @JsonPropertyOrder({"payload", "from", "privacyGroupId"})
 public class SendRequestBesu extends SendRequest {
   private final String privacyGroupId;
 
+  /**
+   * Instantiates a new Send request Besu.
+   *
+   * @param payload the payload
+   * @param from the from
+   * @param privacyGroupId the privacy group id
+   */
   public SendRequestBesu(
       @JsonProperty(value = "payload") final String payload,
       @JsonProperty(value = "from") final String from,
@@ -30,6 +38,11 @@ public SendRequestBesu(
     this.privacyGroupId = privacyGroupId;
   }
 
+  /**
+   * Gets privacy group id.
+   *
+   * @return the privacy group id
+   */
   public String getPrivacyGroupId() {
     return privacyGroupId;
   }
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendRequestLegacy.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendRequestLegacy.java
index 986b27f13fa..4600e2f7ee6 100644
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendRequestLegacy.java
+++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendRequestLegacy.java
@@ -19,10 +19,18 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
+/** The Send request Legacy. */
 @JsonPropertyOrder({"payload", "from", "to"})
 public class SendRequestLegacy extends SendRequest {
   private final List<String> to;
 
+  /**
+   * Instantiates a new Send request legacy.
+   *
+   * @param payload the payload
+   * @param from the from
+   * @param to the to
+   */
   public SendRequestLegacy(
       @JsonProperty(value = "payload") final String payload,
       @JsonProperty(value = "from") final String from,
@@ -31,6 +39,11 @@ public SendRequestLegacy(
     this.to = to;
   }
 
+  /**
+   * Gets to.
+   *
+   * @return the to
+   */
   public List<String> getTo() {
     return to;
   }
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendResponse.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendResponse.java
index 411fa50045d..6feb39a92fc 100644
--- a/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendResponse.java
+++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/SendResponse.java
@@ -18,15 +18,26 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
+/** The Send response. */
 @JsonPropertyOrder({"key"})
 public class SendResponse {
   private final String key;
 
+  /**
+   * Instantiates a new Send response.
+   *
+   * @param key the key
+   */
   @JsonCreator
   public SendResponse(@JsonProperty("key") final String key) {
     this.key = key;
   }
 
+  /**
+   * Gets key.
+   *
+   * @return the key
+   */
   public String getKey() {
     return key;
   }
diff --git a/enclave/src/main/java/org/hyperledger/besu/enclave/types/StoreRawResponse.java b/enclave/src/main/java/org/hyperledger/besu/enclave/types/StoreRawResponse.java
new file mode 100644
index 00000000000..3310c43ff88
--- /dev/null
+++ b/enclave/src/main/java/org/hyperledger/besu/enclave/types/StoreRawResponse.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.enclave.types;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/** The Store raw response. */
+public class StoreRawResponse {
+  private final String key;
+
+  /**
+   * Instantiates a new Store raw response.
+   *
+   * @param key the key
+   */
+  @JsonCreator
+  public StoreRawResponse(@JsonProperty("key") final String key) {
+    this.key = key;
+  }
+
+  /**
+   * Gets key.
+   *
+   * @return the key
+   */
+  public String getKey() {
+    return key;
+  }
+}
diff --git a/enclave/src/test/java/org/hyperledger/besu/enclave/EnclaveFactoryTest.java b/enclave/src/test/java/org/hyperledger/besu/enclave/EnclaveFactoryTest.java
index 1d37e21cd55..72239717197 100644
--- a/enclave/src/test/java/org/hyperledger/besu/enclave/EnclaveFactoryTest.java
+++ b/enclave/src/test/java/org/hyperledger/besu/enclave/EnclaveFactoryTest.java
@@ -23,24 +23,24 @@
 import java.io.IOException;
 import java.nio.file.Files;
 
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class EnclaveFactoryTest {
-  @ClassRule public static final TemporaryFolder temporaryFolder = new TemporaryFolder();
+  @TempDir File tempDir;
   private static final String EMPTY_FILE_ERROR_MSG = "Keystore password file is empty: %s";
 
   @Test
   public void passwordCanBeReadFromFile() throws IOException {
-    final File passwordFile = temporaryFolder.newFile();
+    File passwordFile = new File(tempDir, "password.txt");
     Files.writeString(passwordFile.toPath(), "test" + System.lineSeparator() + "test2");
     assertThat(EnclaveFactory.readSecretFromFile(passwordFile.toPath())).isEqualTo("test");
   }
 
   @Test
   public void emptyFileThrowsException() throws IOException {
-    final File passwordFile = temporaryFolder.newFile();
+    File passwordFile = new File(tempDir, "password.txt");
+    Files.createFile(passwordFile.toPath()); // Create an empty file
     assertThatExceptionOfType(InvalidConfigurationException.class)
         .isThrownBy(() -> EnclaveFactory.readSecretFromFile(passwordFile.toPath()))
         .withMessage(EMPTY_FILE_ERROR_MSG, passwordFile);
@@ -48,7 +48,7 @@ public void emptyFileThrowsException() throws IOException {
 
   @Test
   public void fileWithOnlyEoLThrowsException() throws IOException {
-    final File passwordFile = temporaryFolder.newFile();
+    File passwordFile = new File(tempDir, "password.txt");
     Files.writeString(passwordFile.toPath(), System.lineSeparator());
     assertThatExceptionOfType(InvalidConfigurationException.class)
         .isThrownBy(() -> EnclaveFactory.readSecretFromFile(passwordFile.toPath()))
diff --git a/errorprone-checks/build.gradle b/errorprone-checks/build.gradle
index a4279c3efda..1aff3a23b23 100644
--- a/errorprone-checks/build.gradle
+++ b/errorprone-checks/build.gradle
@@ -21,10 +21,12 @@ configurations.maybeCreate("epJavac")
 apply plugin: 'java'
 apply plugin: 'net.ltgt.errorprone'
 
-sourceCompatibility = 11
-targetCompatibility = 11
+sourceCompatibility = 17
+targetCompatibility = 17
 
 dependencies {
+  api 'org.slf4j:slf4j-api'
+
   annotationProcessor 'com.google.auto.service:auto-service'
 
   implementation 'com.google.auto.service:auto-service'
@@ -33,11 +35,36 @@ dependencies {
   implementation 'info.picocli:picocli'
 
   testImplementation 'com.google.errorprone:error_prone_test_helpers'
-  testImplementation 'junit:junit'
-  testImplementation 'org.apache.logging.log4j:log4j-api'
   testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
+
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 
   epJavac 'com.google.errorprone:error_prone_check_api'
 }
 
 test { testLogging { showStandardStreams = true } }
+
+
+tasks.withType(JavaCompile) {
+  options.compilerArgs += [
+    '--add-exports',
+    'jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED',
+    '--add-exports',
+    'jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED',
+    '--add-exports',
+    'jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED',
+    '--add-exports',
+    'jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED',
+    '--add-exports',
+    'jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED',
+    '--add-exports',
+    'jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED',
+    '--add-exports',
+    'jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED',
+    '--add-exports',
+    'jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED'
+  ]
+}
+
+javadoc { enabled = false }
diff --git a/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/BannedMethod.java b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/BannedMethod.java
index 34ac51baf66..8f71df921e4 100644
--- a/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/BannedMethod.java
+++ b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/BannedMethod.java
@@ -33,7 +33,6 @@
 
 @AutoService(BugChecker.class)
 @BugPattern(
-    name = "BannedMethod",
     summary = "Some methods should not be used, make sure that doesn't happen.",
     severity = WARNING,
     linkType = BugPattern.LinkType.NONE)
@@ -44,7 +43,9 @@ public class BannedMethod extends BugChecker implements MethodInvocationTreeMatc
           staticMethod().onClass("com.google.common.base.Objects").withAnyName(),
           "Do not use com.google.common.base.Objects methods, use java.util.Objects methods instead.",
           staticMethod().onClass("org.junit.Assert"),
-          "Do not use junit assertions. Use assertj assertions instead.");
+          "Do not use junit assertions. Use assertj assertions instead.",
+          staticMethod().onClass("org.apache.logging.log4j.LogManager"),
+          "Do not use org.apache.logging.log4j.LogManager, use org.slf4j.LoggerFactory methods instead.");
 
   @Override
   public Description matchMethodInvocation(
diff --git a/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectly.java b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectly.java
index 5af4645768d..95c7d18039c 100644
--- a/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectly.java
+++ b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectly.java
@@ -30,7 +30,6 @@
 
 @AutoService(BugChecker.class)
 @BugPattern(
-    name = "DoNotCreateSecureRandomDirectly",
     summary = "Do not create SecureRandom directly.",
     severity = WARNING,
     linkType = BugPattern.LinkType.NONE)
diff --git a/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectly.java b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectly.java
index 532a82fa461..7ce0c81f05c 100644
--- a/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectly.java
+++ b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectly.java
@@ -26,7 +26,6 @@
 
 @AutoService(BugChecker.class)
 @BugPattern(
-    name = "DoNotInvokeMessageDigestDirectly",
     summary = "Do not invoke MessageDigest.getInstance directly.",
     severity = WARNING,
     linkType = BugPattern.LinkType.NONE)
diff --git a/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/DoNotReturnNullOptionals.java b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/DoNotReturnNullOptionals.java
index 78354610691..7310058e5a7 100644
--- a/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/DoNotReturnNullOptionals.java
+++ b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/DoNotReturnNullOptionals.java
@@ -36,7 +36,6 @@
 
 @AutoService(BugChecker.class) // the service descriptor
 @BugPattern(
-    name = "DoNotReturnNullOptionals",
     summary = "Do not return null optionals.",
     severity = SUGGESTION,
     linkType = BugPattern.LinkType.NONE)
diff --git a/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/ExperimentalCliOptionMustBeCorrectlyDisplayed.java b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/ExperimentalCliOptionMustBeCorrectlyDisplayed.java
index d98c5adf56e..3cda884792c 100644
--- a/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/ExperimentalCliOptionMustBeCorrectlyDisplayed.java
+++ b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/ExperimentalCliOptionMustBeCorrectlyDisplayed.java
@@ -34,7 +34,6 @@
 
 @AutoService(BugChecker.class)
 @BugPattern(
-    name = "ExperimentalCliOptionMustBeCorrectlyDisplayed",
     summary = "Experimental options must be hidden and not present in the BesuCommand class.",
     severity = WARNING,
     linkType = BugPattern.LinkType.NONE)
diff --git a/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinal.java b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinal.java
index c2b31310c7f..abd6f3b58d0 100644
--- a/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinal.java
+++ b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinal.java
@@ -25,6 +25,7 @@
 import com.google.errorprone.bugpatterns.BugChecker.ClassTreeMatcher;
 import com.google.errorprone.bugpatterns.BugChecker.MethodTreeMatcher;
 import com.google.errorprone.matchers.Description;
+import com.google.errorprone.util.ASTHelpers;
 import com.sun.source.tree.ClassTree;
 import com.sun.source.tree.MethodTree;
 import com.sun.source.tree.ModifiersTree;
@@ -32,7 +33,6 @@
 
 @AutoService(BugChecker.class)
 @BugPattern(
-    name = "MethodInputParametersMustBeFinal",
     summary = "Method input parameters must be final.",
     severity = WARNING,
     linkType = BugPattern.LinkType.NONE)
@@ -40,6 +40,7 @@ public class MethodInputParametersMustBeFinal extends BugChecker
     implements MethodTreeMatcher, ClassTreeMatcher {
 
   private boolean isAbstraction = false;
+  private boolean isGenerated = false;
 
   @Override
   public Description matchClass(final ClassTree tree, final VisitorState state) {
@@ -47,11 +48,16 @@ public Description matchClass(final ClassTree tree, final VisitorState state) {
         isInterface(tree.getModifiers())
             || isAnonymousClassInAbstraction(tree)
             || isEnumInAbstraction(tree);
+    isGenerated = ASTHelpers.hasDirectAnnotationWithSimpleName(tree, "Generated");
     return Description.NO_MATCH;
   }
 
   @Override
   public Description matchMethod(final MethodTree tree, final VisitorState state) {
+    if (isGenerated) {
+      return Description.NO_MATCH;
+    }
+
     final ModifiersTree mods = tree.getModifiers();
 
     if (isAbstraction) {
@@ -108,4 +114,18 @@ private boolean isEnumInAbstraction(final ClassTree tree) {
   private boolean isEnum(final ClassTree tree) {
     return tree.toString().contains("enum");
   }
+
+  @Override
+  public boolean equals(Object o) {
+    // isAbstract and isGenerated are transient calculations, not relevant to equality checks
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    return super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    // isAbstract and isGenerated are transient calculations, not relevant to equality checks
+    return super.hashCode();
+  }
 }
diff --git a/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/PrivateStaticFinalLoggers.java b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/PrivateStaticFinalLoggers.java
index d4624785ed7..445f3226d80 100644
--- a/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/PrivateStaticFinalLoggers.java
+++ b/errorprone-checks/src/main/java/org/hyperledger/errorpronechecks/PrivateStaticFinalLoggers.java
@@ -21,6 +21,7 @@
 import static com.google.errorprone.util.ASTHelpers.isSubtype;
 
 import java.util.List;
+import java.util.Optional;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.Modifier;
 
@@ -29,19 +30,24 @@
 import com.google.errorprone.VisitorState;
 import com.google.errorprone.bugpatterns.BugChecker;
 import com.google.errorprone.bugpatterns.BugChecker.VariableTreeMatcher;
+import com.google.errorprone.fixes.SuggestedFix;
 import com.google.errorprone.matchers.Description;
+import com.google.errorprone.suppliers.Supplier;
+import com.google.errorprone.suppliers.Suppliers;
 import com.google.errorprone.util.ASTHelpers;
 import com.sun.source.tree.VariableTree;
 import com.sun.tools.javac.code.Symbol;
+import com.sun.tools.javac.code.Type;
 
 @AutoService(BugChecker.class)
 @BugPattern(
-    name = "PrivateStaticFinalLoggers",
     summary = "Logger classes should be private, static, and final.",
     severity = WARNING,
     linkType = BugPattern.LinkType.NONE)
 public class PrivateStaticFinalLoggers extends BugChecker implements VariableTreeMatcher {
 
+  static final Supplier<Type> ORG_SLF4J_LOGGER = Suppliers.typeFromString("org.slf4j.Logger");
+
   @Override
   public Description matchVariable(final VariableTree tree, final VisitorState state) {
     final Symbol.VarSymbol sym = ASTHelpers.getSymbol(tree);
@@ -52,12 +58,13 @@ public Description matchVariable(final VariableTree tree, final VisitorState sta
         .containsAll(List.of(Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL))) {
       return NO_MATCH;
     }
-    if (!isSubtype(
-        getType(tree), state.getTypeFromString("org.apache.logging.log4j.Logger"), state)) {
+    if (!isSubtype(getType(tree), ORG_SLF4J_LOGGER.get(state), state)) {
       return NO_MATCH;
     }
+    Optional<SuggestedFix> fixes =
+        addModifiers(tree, state, Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL);
     return buildDescription(tree)
-        .addFix(addModifiers(tree, state, Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL))
+        .addFix(fixes.isPresent() ? fixes.get() : SuggestedFix.emptyFix())
         .build();
   }
 }
diff --git a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/BannedMethodTest.java b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/BannedMethodTest.java
index 66e29f370dd..48f382946d8 100644
--- a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/BannedMethodTest.java
+++ b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/BannedMethodTest.java
@@ -15,14 +15,14 @@
 package org.hyperledger.errorpronechecks;
 
 import com.google.errorprone.CompilationTestHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class BannedMethodTest {
 
   private CompilationTestHelper compilationHelper;
 
-  @Before
+  @BeforeEach
   public void setup() {
     compilationHelper = CompilationTestHelper.newInstance(BannedMethod.class, getClass());
   }
diff --git a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectlyTest.java b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectlyTest.java
index 60e86751feb..525f5a8689a 100644
--- a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectlyTest.java
+++ b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectlyTest.java
@@ -15,14 +15,14 @@
 package org.hyperledger.errorpronechecks;
 
 import com.google.errorprone.CompilationTestHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class DoNotCreateSecureRandomDirectlyTest {
 
   private CompilationTestHelper compilationHelper;
 
-  @Before
+  @BeforeEach
   public void setup() {
     compilationHelper =
         CompilationTestHelper.newInstance(DoNotCreateSecureRandomDirectly.class, getClass());
diff --git a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectlyTest.java b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectlyTest.java
index 0b045bcd954..986aedb63c2 100644
--- a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectlyTest.java
+++ b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectlyTest.java
@@ -15,14 +15,14 @@
 package org.hyperledger.errorpronechecks;
 
 import com.google.errorprone.CompilationTestHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class DoNotInvokeMessageDigestDirectlyTest {
 
   private CompilationTestHelper compilationHelper;
 
-  @Before
+  @BeforeEach
   public void setup() {
     compilationHelper =
         CompilationTestHelper.newInstance(DoNotInvokeMessageDigestDirectly.class, getClass());
diff --git a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotReturnNullOptionalsTest.java b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotReturnNullOptionalsTest.java
index e8d6227061e..0055c9fc1ed 100644
--- a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotReturnNullOptionalsTest.java
+++ b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotReturnNullOptionalsTest.java
@@ -15,14 +15,14 @@
 package org.hyperledger.errorpronechecks;
 
 import com.google.errorprone.CompilationTestHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class DoNotReturnNullOptionalsTest {
 
   private CompilationTestHelper compilationHelper;
 
-  @Before
+  @BeforeEach
   public void setup() {
     compilationHelper =
         CompilationTestHelper.newInstance(DoNotReturnNullOptionals.class, getClass());
diff --git a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/ExperimentalCliOptionMustBeCorrectlyDisplayedTest.java b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/ExperimentalCliOptionMustBeCorrectlyDisplayedTest.java
index edfcded0d20..159c3905eab 100644
--- a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/ExperimentalCliOptionMustBeCorrectlyDisplayedTest.java
+++ b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/ExperimentalCliOptionMustBeCorrectlyDisplayedTest.java
@@ -15,14 +15,14 @@
 package org.hyperledger.errorpronechecks;
 
 import com.google.errorprone.CompilationTestHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ExperimentalCliOptionMustBeCorrectlyDisplayedTest {
 
   private CompilationTestHelper compilationHelper;
 
-  @Before
+  @BeforeEach
   public void setup() {
     compilationHelper =
         CompilationTestHelper.newInstance(
diff --git a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalTest.java b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalTest.java
index 2c1802d7dae..f94fa2d606c 100644
--- a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalTest.java
+++ b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalTest.java
@@ -15,14 +15,14 @@
 package org.hyperledger.errorpronechecks;
 
 import com.google.errorprone.CompilationTestHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class MethodInputParametersMustBeFinalTest {
 
   private CompilationTestHelper compilationHelper;
 
-  @Before
+  @BeforeEach
   public void setup() {
     compilationHelper =
         CompilationTestHelper.newInstance(MethodInputParametersMustBeFinal.class, getClass());
diff --git a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/PrivateStaticFinalLoggersTest.java b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/PrivateStaticFinalLoggersTest.java
index c8f246c38d9..f15dabca1d6 100644
--- a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/PrivateStaticFinalLoggersTest.java
+++ b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/PrivateStaticFinalLoggersTest.java
@@ -15,14 +15,14 @@
 package org.hyperledger.errorpronechecks;
 
 import com.google.errorprone.CompilationTestHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class PrivateStaticFinalLoggersTest {
 
   private CompilationTestHelper compilationHelper;
 
-  @Before
+  @BeforeEach
   public void setup() {
     compilationHelper =
         CompilationTestHelper.newInstance(PrivateStaticFinalLoggers.class, getClass());
diff --git a/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalNegativeCases.java b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalNegativeCases.java
index cd3a52b7463..a86056cf9f6 100644
--- a/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalNegativeCases.java
+++ b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalNegativeCases.java
@@ -14,6 +14,8 @@
  */
 package org.hyperledger.errorpronechecks;
 
+import javax.annotation.processing.Generated;
+
 public class MethodInputParametersMustBeFinalNegativeCases {
 
   public void noInputParameters() {}
@@ -28,3 +30,34 @@ public interface allInterfacesAreValid {
     void parameterCannotBeFinal(int value);
   }
 }
+
+@Generated(
+    value = "test",
+    comments = "Every method is buggy, but ignored because the class has been tagged generated")
+class MethodInputParametersMustBeFinalPositiveCasesBugGenerated1 {
+
+  public void primativeInputMethod(int value) {}
+
+  public void objectInputMethod(Object value) {}
+
+  public void mixedInputMethod(Object value, int anotherValue) {}
+
+  @Generated(
+      value = "test",
+      comments = "Every method is buggy, but ignored because the class has been tagged generated")
+  public abstract class abstractClassDefinition {
+    public void concreteMethodsAreIncluded(int value) {}
+  }
+
+  public void varArgsInputMethod(String... value) {}
+}
+
+@Generated(
+    value = "test",
+    comments = "Every method is buggy, but ignored because the class has been tagged generated")
+class MethodInputParametersMustBeFinalPositiveCasesBugGenerated2 {
+
+  public void mixedInputMethodFirstFinal(final Object value, int anotherValue) {}
+
+  public void mixedInputMethodSecondFinal(Object value, final int anotherValue) {}
+}
diff --git a/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/PrivateStaticFinalLoggersNegativeCases.java b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/PrivateStaticFinalLoggersNegativeCases.java
index 1b53c21209d..99d8986ac74 100644
--- a/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/PrivateStaticFinalLoggersNegativeCases.java
+++ b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/PrivateStaticFinalLoggersNegativeCases.java
@@ -15,10 +15,11 @@
 
 package org.hyperledger.errorpronechecks;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PrivateStaticFinalLoggersNegativeCases {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG =
+      LoggerFactory.getLogger(PrivateStaticFinalLoggersNegativeCases.class);
 }
diff --git a/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/PrivateStaticFinalLoggersPositiveCases.java b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/PrivateStaticFinalLoggersPositiveCases.java
index 8cd81689241..cbe6c772d7f 100644
--- a/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/PrivateStaticFinalLoggersPositiveCases.java
+++ b/errorprone-checks/src/test/resources/org/hyperledger/errorpronechecks/PrivateStaticFinalLoggersPositiveCases.java
@@ -15,11 +15,11 @@
 
 package org.hyperledger.errorpronechecks;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PrivateStaticFinalLoggersPositiveCases {
 
   // BUG: Diagnostic contains:  Logger classes should be private, static, and final.
-  private final Logger LOG = LogManager.getLogger();
+  private final Logger LOG = LoggerFactory.getLogger(PrivateStaticFinalLoggersPositiveCases.class);
 }
diff --git a/ethereum/api/build.gradle b/ethereum/api/build.gradle
index caee178bbea..68b53a3b76a 100644
--- a/ethereum/api/build.gradle
+++ b/ethereum/api/build.gradle
@@ -27,13 +27,16 @@ jar {
   }
 }
 
-configurations {
-  testResourceGeneration.extendsFrom testImplementation
-}
+configurations { testResourceGeneration.extendsFrom testImplementation }
 
 dependencies {
+  api 'org.slf4j:slf4j-api'
+  api 'org.apache.logging.log4j:log4j-api'
+
   implementation project(':config')
-  implementation project(':crypto')
+  implementation project(':consensus:merge')
+  implementation project(':crypto:services')
+  implementation project(':datatypes')
   implementation project(':enclave')
   implementation project(':ethereum:blockcreation')
   implementation project(':ethereum:core')
@@ -42,22 +45,30 @@ dependencies {
   implementation project(':ethereum:permissioning')
   implementation project(':ethereum:rlp')
   implementation project(':ethereum:trie')
+  implementation project(':evm')
   implementation project(':metrics:core')
   implementation project(':nat')
   implementation project(':plugin-api')
   implementation project(':util')
+  implementation project(':services:pipeline')
+  implementation project(':services:tasks')
 
   implementation 'com.google.guava:guava'
   implementation 'com.graphql-java:graphql-java'
+  implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8'
+  implementation 'io.opentelemetry:opentelemetry-api'
+  implementation 'io.opentelemetry:opentelemetry-extension-trace-propagators'
   implementation 'io.vertx:vertx-auth-jwt'
   implementation 'io.vertx:vertx-core'
   implementation 'io.vertx:vertx-unit'
   implementation 'io.vertx:vertx-web'
-  implementation 'org.apache.logging.log4j:log4j-core'
-  implementation 'org.apache.tuweni:bytes'
-  implementation 'org.apache.tuweni:net'
-  implementation 'org.apache.tuweni:toml'
-  implementation 'org.apache.tuweni:units'
+  implementation 'io.vertx:vertx-codegen'
+  implementation 'com.fasterxml.jackson.core:jackson-databind'
+  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-net'
+  implementation 'org.apache.tuweni:tuweni-toml'
+  implementation 'org.apache.tuweni:tuweni-units'
+  implementation 'org.antlr:antlr4-runtime'
   implementation 'org.bouncycastle:bcprov-jdk15on'
   implementation 'org.springframework.security:spring-security-crypto'
   implementation 'org.xerial.snappy:snappy-java'
@@ -66,10 +77,12 @@ dependencies {
   implementation "org.immutables:value-annotations"
 
   runtimeOnly 'org.bouncycastle:bcpkix-jdk15on'
+  runtimeOnly 'io.netty:netty-transport-native-epoll'
+  runtimeOnly 'io.netty:netty-transport-native-kqueue'
 
   testImplementation project(':config')
   testImplementation project(path: ':config', configuration: 'testSupportArtifacts')
-  testImplementation project(path: ':crypto', configuration: 'testSupportArtifacts')
+  testImplementation project(path: ':crypto:services', configuration: 'testSupportArtifacts')
   testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts')
   testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
   testImplementation project(':services:kvstore')
@@ -78,11 +91,20 @@ dependencies {
   testResourceGeneration project(':besu')
 
   testImplementation 'com.squareup.okhttp3:okhttp'
-  testImplementation 'io.vertx:vertx-codegen'
+  testImplementation 'io.vertx:vertx-auth-jwt'
+  testImplementation 'io.vertx:vertx-junit5'
   testImplementation 'io.vertx:vertx-unit'
+  testImplementation 'io.vertx:vertx-web-client'
   testImplementation 'junit:junit'
+  testImplementation 'org.apache.logging.log4j:log4j-core'
   testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
+  testImplementation 'org.junit.jupiter:junit-jupiter-params'
+  testImplementation 'org.junit.platform:junit-platform-runner'
   testImplementation 'org.mockito:mockito-core'
+  testImplementation 'org.mockito:mockito-junit-jupiter'
+
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 
   testSupportImplementation 'org.bouncycastle:bcpkix-jdk15on'
 
@@ -92,15 +114,17 @@ dependencies {
   integrationTestImplementation project(':services:kvstore')
   integrationTestImplementation project(':testutil')
 
-  integrationTestImplementation 'junit:junit'
   integrationTestImplementation 'org.assertj:assertj-core'
+  integrationTestImplementation 'org.junit.jupiter:junit-jupiter-api'
   integrationTestImplementation 'org.mockito:mockito-core'
-}
+  integrationTestImplementation 'org.mockito:mockito-junit-jupiter'
+  integrationTestImplementation 'org.testcontainers:testcontainers'
 
-artifacts {
-  testSupportArtifacts testSupportJar
+  integrationTestRuntimeOnly 'org.junit.jupiter:junit-jupiter'
 }
 
+artifacts { testSupportArtifacts testSupportJar }
+
 task generateTestBlockchain() {
   def srcFiles = 'src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data'
   def dataPath = "$buildDir/generated/data"
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/BlockchainImporter.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/BlockchainImporter.java
index b3f5f24d64a..22084fa3abd 100644
--- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/BlockchainImporter.java
+++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/BlockchainImporter.java
@@ -17,7 +17,7 @@
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.ethereum.chain.GenesisState;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
@@ -43,14 +43,11 @@ public BlockchainImporter(final URL blocksUrl, final String genesisJson) throws
     protocolSchedule =
         MainnetProtocolSchedule.fromConfig(
             GenesisConfigFile.fromConfig(genesisJson).getConfigOptions());
-
+    final BlockHeaderFunctions blockHeaderFunctions =
+        ScheduleBasedBlockHeaderFunctions.create(protocolSchedule);
     blocks = new ArrayList<>();
     try (final RawBlockIterator iterator =
-        new RawBlockIterator(
-            Paths.get(blocksUrl.toURI()),
-            rlp ->
-                BlockHeader.readFrom(
-                    rlp, ScheduleBasedBlockHeaderFunctions.create(protocolSchedule)))) {
+        new RawBlockIterator(Paths.get(blocksUrl.toURI()), blockHeaderFunctions)) {
       while (iterator.hasNext()) {
         blocks.add(iterator.next());
       }
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseKey.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseKey.java
index 278c6f1a5d7..a57cb990c81 100644
--- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseKey.java
+++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseKey.java
@@ -15,10 +15,12 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc;
 
 public enum JsonRpcResponseKey {
+  CHAIN_ID,
   COINBASE,
   DIFFICULTY,
   EXTRA_DATA,
   GAS_LIMIT,
+  GAS_PRICE,
   GAS_USED,
   LOGS_BLOOM,
   MIX_HASH,
@@ -26,11 +28,15 @@ public enum JsonRpcResponseKey {
   NUMBER,
   OMMERS_HASH,
   PARENT_HASH,
+  PUBLIC_KEY,
+  RAW,
   RECEIPTS_ROOT,
   SIZE,
   STATE_ROOT,
   TIMESTAMP,
   TOTAL_DIFFICULTY,
   TRANSACTION_ROOT,
-  BASEFEE
+  BASEFEE,
+  WITHDRAWALS_ROOT,
+  DEPOSITS_ROOT
 }
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseUtils.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseUtils.java
index 6257bcdfcca..bd70d2af19f 100644
--- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseUtils.java
+++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseUtils.java
@@ -16,6 +16,7 @@
 
 import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.BASEFEE;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.COINBASE;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.DEPOSITS_ROOT;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.DIFFICULTY;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.EXTRA_DATA;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.GAS_LIMIT;
@@ -32,9 +33,12 @@
 import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.TIMESTAMP;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.TOTAL_DIFFICULTY;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.TRANSACTION_ROOT;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey.WITHDRAWALS_ROOT;
 
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResult;
@@ -42,15 +46,13 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionHashResult;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionResult;
 import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.LogsBloomFilter;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
+import org.hyperledger.besu.plugin.data.TransactionType;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -67,12 +69,16 @@ public class JsonRpcResponseUtils {
   /** Hex is base 16 */
   private static final int HEX_RADIX = 16;
 
-  /** @param values hex encoded values. */
+  /**
+   * @param values hex encoded values.
+   */
   public JsonRpcResponse response(final Map<JsonRpcResponseKey, String> values) {
     return response(values, new ArrayList<>());
   }
 
-  /** @param values hex encoded values. */
+  /**
+   * @param values hex encoded values.
+   */
   public JsonRpcResponse response(
       final Map<JsonRpcResponseKey, String> values, final List<TransactionResult> transactions) {
 
@@ -92,10 +98,14 @@ public JsonRpcResponse response(
     final long gasUsed = unsignedLong(values.get(GAS_USED));
     final long timestamp = unsignedLong(values.get(TIMESTAMP));
     final long nonce = unsignedLong(values.get(NONCE));
-    final Long baseFee = values.containsKey(BASEFEE) ? unsignedLong(values.get(BASEFEE)) : null;
+    final Wei baseFee =
+        values.containsKey(BASEFEE) ? Wei.of(unsignedInt256(values.get(BASEFEE))) : null;
     final Difficulty totalDifficulty = Difficulty.of(unsignedInt256(values.get(TOTAL_DIFFICULTY)));
     final int size = unsignedInt(values.get(SIZE));
-
+    final Hash withdrawalsRoot =
+        values.containsKey(WITHDRAWALS_ROOT) ? hash(values.get(WITHDRAWALS_ROOT)) : null;
+    final Hash depositsRoot =
+        values.containsKey(DEPOSITS_ROOT) ? hash(values.get(DEPOSITS_ROOT)) : null;
     final List<JsonNode> ommers = new ArrayList<>();
 
     final BlockHeader header =
@@ -116,6 +126,9 @@ public JsonRpcResponse response(
             baseFee,
             mixHash,
             nonce,
+            withdrawalsRoot,
+            null, // ToDo 4844: set with the value of excess_data_gas field
+            depositsRoot,
             blockHeaderFunctions);
 
     return new JsonRpcSuccessResponse(
@@ -143,14 +156,18 @@ public List<TransactionResult> transactions(final TransactionResult... transacti
   }
 
   public TransactionResult transaction(
+      final TransactionType transactionType,
       final String blockHash,
       final String blockNumber,
+      final Wei baseFee,
       final String fromAddress,
       final String gas,
       final String gasPrice,
       final String hash,
       final String input,
       final String nonce,
+      final String publicKey,
+      final String raw,
       final String toAddress,
       final String transactionIndex,
       final String value,
@@ -158,23 +175,33 @@ public TransactionResult transaction(
       final String r,
       final String s) {
 
-    final Transaction transaction = mock(Transaction.class);
-    when(transaction.getGasPrice()).thenReturn(Wei.fromHexString(gasPrice));
-    when(transaction.getNonce()).thenReturn(unsignedLong(nonce));
-    when(transaction.getV()).thenReturn(bigInteger(v));
-    when(transaction.getR()).thenReturn(bigInteger(r));
-    when(transaction.getS()).thenReturn(bigInteger(s));
-    when(transaction.getHash()).thenReturn(hash(hash));
-    when(transaction.getTo()).thenReturn(Optional.ofNullable(address(toAddress)));
-    when(transaction.getSender()).thenReturn(address(fromAddress));
-    when(transaction.getPayload()).thenReturn(bytes(input));
-    when(transaction.getValue()).thenReturn(wei(value));
-    when(transaction.getGasLimit()).thenReturn(unsignedLong(gas));
+    final Transaction transaction =
+        Transaction.builder()
+            .type(transactionType)
+            .nonce(unsignedLong(nonce))
+            .gasPrice(Wei.fromHexString(gasPrice))
+            .gasLimit(unsignedLong(gas))
+            .to(address(toAddress))
+            .value(wei(value))
+            .signature(
+                SignatureAlgorithmFactory.getInstance()
+                    .createSignature(
+                        Bytes.fromHexString(r).toUnsignedBigInteger(),
+                        Bytes.fromHexString(s).toUnsignedBigInteger(),
+                        Bytes.fromHexString(v)
+                            .toUnsignedBigInteger()
+                            .subtract(Transaction.REPLAY_UNPROTECTED_V_BASE)
+                            .byteValueExact()))
+            .payload(bytes(input))
+            .sender(address(fromAddress))
+            .v(bigInteger(v))
+            .build();
 
     return new TransactionCompleteResult(
         new TransactionWithMetadata(
             transaction,
             unsignedLong(blockNumber),
+            Optional.ofNullable(baseFee),
             Hash.fromHexString(blockHash),
             unsignedInt(transactionIndex)));
   }
@@ -198,7 +225,7 @@ private String removeHexPrefix(final String prefixedHex) {
   }
 
   private BigInteger bigInteger(final String hex) {
-    return new BigInteger(removeHexPrefix(hex), HEX_RADIX);
+    return hex == null ? null : new BigInteger(removeHexPrefix(hex), HEX_RADIX);
   }
 
   private Wei wei(final String hex) {
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcTestMethodsFactory.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcTestMethodsFactory.java
index 439157a5e01..518d5b8c364 100644
--- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcTestMethodsFactory.java
+++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcTestMethodsFactory.java
@@ -14,8 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc;
 
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
 import static org.mockito.Mockito.mock;
 
 import org.hyperledger.besu.config.StubGenesisConfigOptions;
@@ -26,12 +26,11 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.methods.JsonRpcMethodsFactory;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockImporter;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-import org.hyperledger.besu.ethereum.core.ProtocolScheduleFixture;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
@@ -56,6 +55,9 @@
 import java.util.Map;
 import java.util.Optional;
 
+import io.vertx.core.Vertx;
+import io.vertx.core.VertxOptions;
+
 /** Provides a facade to construct the JSON-RPC component. */
 public class JsonRpcTestMethodsFactory {
 
@@ -63,34 +65,70 @@ public class JsonRpcTestMethodsFactory {
   private static final BigInteger NETWORK_ID = BigInteger.valueOf(123);
 
   private final BlockchainImporter importer;
+  private final MutableBlockchain blockchain;
+  private final WorldStateArchive stateArchive;
+  private final ProtocolContext context;
+  private final BlockchainQueries blockchainQueries;
+  private final Synchronizer synchronizer;
 
   public JsonRpcTestMethodsFactory(final BlockchainImporter importer) {
     this.importer = importer;
-  }
-
-  public Map<String, JsonRpcMethod> methods() {
-    final WorldStateArchive stateArchive = createInMemoryWorldStateArchive();
+    this.blockchain = createInMemoryBlockchain(importer.getGenesisBlock());
+    this.stateArchive = createInMemoryWorldStateArchive();
+    this.importer.getGenesisState().writeStateTo(stateArchive.getMutable());
+    this.context = new ProtocolContext(blockchain, stateArchive, null, Optional.empty());
 
-    importer.getGenesisState().writeStateTo(stateArchive.getMutable());
-
-    final MutableBlockchain blockchain = createInMemoryBlockchain(importer.getGenesisBlock());
-    final ProtocolContext context = new ProtocolContext(blockchain, stateArchive, null);
+    final ProtocolSchedule protocolSchedule = importer.getProtocolSchedule();
+    this.synchronizer = mock(Synchronizer.class);
 
     for (final Block block : importer.getBlocks()) {
-      final ProtocolSchedule protocolSchedule = importer.getProtocolSchedule();
-      final ProtocolSpec protocolSpec =
-          protocolSchedule.getByBlockNumber(block.getHeader().getNumber());
+      final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(block.getHeader());
       final BlockImporter blockImporter = protocolSpec.getBlockImporter();
       blockImporter.importBlock(context, block, HeaderValidationMode.FULL);
     }
+    this.blockchainQueries = new BlockchainQueries(blockchain, stateArchive);
+  }
+
+  public JsonRpcTestMethodsFactory(
+      final BlockchainImporter importer,
+      final MutableBlockchain blockchain,
+      final WorldStateArchive stateArchive,
+      final ProtocolContext context) {
+    this.importer = importer;
+    this.blockchain = blockchain;
+    this.stateArchive = stateArchive;
+    this.context = context;
+    this.blockchainQueries = new BlockchainQueries(blockchain, stateArchive);
+    this.synchronizer = mock(Synchronizer.class);
+  }
+
+  public JsonRpcTestMethodsFactory(
+      final BlockchainImporter importer,
+      final MutableBlockchain blockchain,
+      final WorldStateArchive stateArchive,
+      final ProtocolContext context,
+      final Synchronizer synchronizer) {
+    this.importer = importer;
+    this.blockchain = blockchain;
+    this.stateArchive = stateArchive;
+    this.context = context;
+    this.synchronizer = synchronizer;
+    this.blockchainQueries = new BlockchainQueries(blockchain, stateArchive);
+  }
 
-    final BlockchainQueries blockchainQueries = new BlockchainQueries(blockchain, stateArchive);
+  public BlockchainQueries getBlockchainQueries() {
+    return blockchainQueries;
+  }
+
+  public WorldStateArchive getStateArchive() {
+    return stateArchive;
+  }
 
-    final Synchronizer synchronizer = mock(Synchronizer.class);
+  public Map<String, JsonRpcMethod> methods() {
     final P2PNetwork peerDiscovery = mock(P2PNetwork.class);
     final EthPeers ethPeers = mock(EthPeers.class);
     final TransactionPool transactionPool = mock(TransactionPool.class);
-    final EthHashMiningCoordinator miningCoordinator = mock(EthHashMiningCoordinator.class);
+    final PoWMiningCoordinator miningCoordinator = mock(PoWMiningCoordinator.class);
     final ObservableMetricsSystem metricsSystem = new NoOpMetricsSystem();
     final Optional<AccountLocalConfigPermissioningController> accountWhitelistController =
         Optional.of(mock(AccountLocalConfigPermissioningController.class));
@@ -110,12 +148,12 @@ public Map<String, JsonRpcMethod> methods() {
     final MetricsConfiguration metricsConfiguration = mock(MetricsConfiguration.class);
     final NatService natService = new NatService(Optional.empty());
 
-    final List<RpcApi> apis = new ArrayList<>();
-    apis.add(RpcApis.ETH);
-    apis.add(RpcApis.NET);
-    apis.add(RpcApis.WEB3);
-    apis.add(RpcApis.PRIV);
-    apis.add(RpcApis.DEBUG);
+    final List<String> apis = new ArrayList<>();
+    apis.add(RpcApis.ETH.name());
+    apis.add(RpcApis.NET.name());
+    apis.add(RpcApis.WEB3.name());
+    apis.add(RpcApis.PRIV.name());
+    apis.add(RpcApis.DEBUG.name());
 
     final Path dataDir = mock(Path.class);
 
@@ -127,7 +165,8 @@ public Map<String, JsonRpcMethod> methods() {
             peerDiscovery,
             blockchainQueries,
             synchronizer,
-            ProtocolScheduleFixture.MAINNET,
+            importer.getProtocolSchedule(),
+            context,
             filterManager,
             transactionPool,
             miningCoordinator,
@@ -143,6 +182,9 @@ public Map<String, JsonRpcMethod> methods() {
             natService,
             new HashMap<>(),
             dataDir,
-            ethPeers);
+            ethPeers,
+            Vertx.vertx(new VertxOptions().setWorkerPoolSize(1)),
+            Optional.empty(),
+            Optional.empty());
   }
 }
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/DebugTraceTransactionIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/DebugTraceTransactionIntegrationTest.java
index d6bf10c09e7..d285ef3816d 100644
--- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/DebugTraceTransactionIntegrationTest.java
+++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/DebugTraceTransactionIntegrationTest.java
@@ -16,6 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.BlockchainImporter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcTestMethodsFactory;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
@@ -25,23 +26,22 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.DebugTraceTransactionResult;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.testutil.BlockTestUtil;
 
 import java.util.Map;
 
 import com.google.common.base.Charsets;
 import com.google.common.io.Resources;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class DebugTraceTransactionIntegrationTest {
   private static final String DEBUG_TRACE_TRANSACTION = "debug_traceTransaction";
   private static JsonRpcTestMethodsFactory blockchain;
   private JsonRpcMethod method;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUpOnce() throws Exception {
     final String genesisJson =
         Resources.toString(BlockTestUtil.getTestGenesisUrl(), Charsets.UTF_8);
@@ -51,7 +51,7 @@ public static void setUpOnce() throws Exception {
             new BlockchainImporter(BlockTestUtil.getTestBlockchainUrl(), genesisJson));
   }
 
-  @Before
+  @BeforeEach
   public void setUp() {
     final Map<String, JsonRpcMethod> methods = blockchain.methods();
     method = methods.get(DEBUG_TRACE_TRANSACTION);
@@ -91,6 +91,6 @@ public void debugTraceTransactionMissingTest() {
     final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, null);
 
     final JsonRpcResponse response = method.response(request);
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 }
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthCallIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthCallIntegrationTest.java
deleted file mode 100644
index 0e5a3ab2de8..00000000000
--- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthCallIntegrationTest.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.catchThrowable;
-
-import org.hyperledger.besu.ethereum.api.jsonrpc.BlockchainImporter;
-import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcTestMethodsFactory;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.testutil.BlockTestUtil;
-
-import java.util.Map;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.Resources;
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class EthCallIntegrationTest {
-
-  private static JsonRpcTestMethodsFactory BLOCKCHAIN;
-
-  private JsonRpcMethod method;
-
-  @BeforeClass
-  public static void setUpOnce() throws Exception {
-    final String genesisJson =
-        Resources.toString(BlockTestUtil.getTestGenesisUrl(), Charsets.UTF_8);
-
-    BLOCKCHAIN =
-        new JsonRpcTestMethodsFactory(
-            new BlockchainImporter(BlockTestUtil.getTestBlockchainUrl(), genesisJson));
-  }
-
-  @Before
-  public void setUp() {
-    final Map<String, JsonRpcMethod> methods = BLOCKCHAIN.methods();
-    method = methods.get("eth_call");
-  }
-
-  @Test
-  public void shouldReturnExpectedResultForCallAtLatestBlock() {
-    final JsonCallParameter callParameter =
-        new JsonCallParameter(
-            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
-            Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
-            null,
-            null,
-            null,
-            null,
-            null,
-            Bytes.fromHexString("0x12a7b914"),
-            null);
-    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
-    final JsonRpcResponse expectedResponse =
-        new JsonRpcSuccessResponse(
-            null, "0x0000000000000000000000000000000000000000000000000000000000000001");
-
-    final JsonRpcResponse response = method.response(request);
-
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
-  }
-
-  @Test
-  public void shouldReturnExpectedResultForCallAtSpecificBlock() {
-    final JsonCallParameter callParameter =
-        new JsonCallParameter(
-            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
-            Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
-            null,
-            null,
-            null,
-            null,
-            null,
-            Bytes.fromHexString("0x12a7b914"),
-            null);
-    final JsonRpcRequestContext request = requestWithParams(callParameter, "0x8");
-    final JsonRpcResponse expectedResponse =
-        new JsonRpcSuccessResponse(
-            null, "0x0000000000000000000000000000000000000000000000000000000000000000");
-
-    final JsonRpcResponse response = method.response(request);
-
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
-  }
-
-  @Test
-  public void shouldReturnInvalidRequestWhenMissingToField() {
-    final JsonCallParameter callParameter =
-        new JsonCallParameter(
-            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            Bytes.fromHexString("0x12a7b914"),
-            null);
-    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
-
-    final Throwable thrown = catchThrowable(() -> method.response(request));
-
-    assertThat(thrown)
-        .isInstanceOf(InvalidJsonRpcParameters.class)
-        .hasNoCause()
-        .hasMessage("Missing \"to\" field in call arguments");
-  }
-
-  @Test
-  public void shouldReturnErrorWithGasLimitTooLow() {
-    final JsonCallParameter callParameter =
-        new JsonCallParameter(
-            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
-            Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
-            Gas.ZERO,
-            null,
-            null,
-            null,
-            null,
-            Bytes.fromHexString("0x12a7b914"),
-            null);
-    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
-    final JsonRpcResponse expectedResponse =
-        new JsonRpcErrorResponse(null, JsonRpcError.INTRINSIC_GAS_EXCEEDS_LIMIT);
-
-    final JsonRpcResponse response = method.response(request);
-
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
-  }
-
-  @Test
-  public void shouldReturnErrorWithGasPriceTooHigh() {
-    final JsonCallParameter callParameter =
-        new JsonCallParameter(
-            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
-            Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
-            null,
-            Wei.fromHexString("0x10000000000000"),
-            null,
-            null,
-            null,
-            Bytes.fromHexString("0x12a7b914"),
-            null);
-    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
-    final JsonRpcResponse expectedResponse =
-        new JsonRpcErrorResponse(null, JsonRpcError.TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE);
-
-    final JsonRpcResponse response = method.response(request);
-
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
-  }
-
-  @Test
-  public void shouldReturnEmptyHashResultForCallWithOnlyToField() {
-    final JsonCallParameter callParameter =
-        new JsonCallParameter(
-            null,
-            Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null);
-    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
-    final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x");
-
-    final JsonRpcResponse response = method.response(request);
-
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
-  }
-
-  private JsonRpcRequestContext requestWithParams(final Object... params) {
-    return new JsonRpcRequestContext(new JsonRpcRequest("2.0", "eth_call", params));
-  }
-}
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthEstimateGasIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthEstimateGasIntegrationTest.java
deleted file mode 100644
index 4bdc376fbec..00000000000
--- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthEstimateGasIntegrationTest.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.ethereum.api.jsonrpc.BlockchainImporter;
-import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcTestMethodsFactory;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.testutil.BlockTestUtil;
-
-import java.util.Map;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.Resources;
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class EthEstimateGasIntegrationTest {
-
-  private static JsonRpcTestMethodsFactory BLOCKCHAIN;
-
-  private JsonRpcMethod method;
-
-  @BeforeClass
-  public static void setUpOnce() throws Exception {
-    final String genesisJson =
-        Resources.toString(BlockTestUtil.getTestGenesisUrl(), Charsets.UTF_8);
-
-    BLOCKCHAIN =
-        new JsonRpcTestMethodsFactory(
-            new BlockchainImporter(BlockTestUtil.getTestBlockchainUrl(), genesisJson));
-  }
-
-  @Before
-  public void setUp() {
-    final Map<String, JsonRpcMethod> methods = BLOCKCHAIN.methods();
-    method = methods.get("eth_estimateGas");
-  }
-
-  @Test
-  public void shouldReturnExpectedValueForEmptyCallParameter() {
-    final JsonCallParameter callParameter =
-        new JsonCallParameter(null, null, null, null, null, null, null, null, null);
-    final JsonRpcRequestContext request = requestWithParams(callParameter);
-    final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x5208");
-
-    final JsonRpcResponse response = method.response(request);
-
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
-  }
-
-  @Test
-  public void shouldReturnExpectedValueForTransfer() {
-    final JsonCallParameter callParameter =
-        new JsonCallParameter(
-            Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
-            Address.fromHexString("0x8888f1f195afa192cfee860698584c030f4c9db1"),
-            null,
-            null,
-            null,
-            null,
-            Wei.ONE,
-            null,
-            null);
-    final JsonRpcRequestContext request = requestWithParams(callParameter);
-    final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x5208");
-
-    final JsonRpcResponse response = method.response(request);
-
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
-  }
-
-  @Test
-  public void shouldReturnExpectedValueForContractDeploy() {
-    final JsonCallParameter callParameter =
-        new JsonCallParameter(
-            Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            Bytes.fromHexString(
-                "0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"),
-            null);
-    final JsonRpcRequestContext request = requestWithParams(callParameter);
-    final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x1b551");
-
-    final JsonRpcResponse response = method.response(request);
-
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
-  }
-
-  @Test
-  public void shouldIgnoreSenderBalanceAccountWhenStrictModeDisabledAndReturnExpectedValue() {
-    final JsonCallParameter callParameter =
-        new JsonCallParameter(
-            Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
-            null,
-            Gas.of(1),
-            Wei.fromHexString("0x9999999999"),
-            null,
-            null,
-            null,
-            Bytes.fromHexString(
-                "0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"),
-            false);
-    final JsonRpcRequestContext request = requestWithParams(callParameter);
-    final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x1b551");
-
-    final JsonRpcResponse response = method.response(request);
-
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
-  }
-
-  @Test
-  public void shouldNotIgnoreSenderBalanceAccountWhenStrictModeDisabledAndThrowError() {
-    final JsonCallParameter callParameter =
-        new JsonCallParameter(
-            Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
-            null,
-            Gas.of(1),
-            Wei.fromHexString("0x9999999999"),
-            null,
-            null,
-            null,
-            Bytes.fromHexString(
-                "0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"),
-            true);
-    final JsonRpcRequestContext request = requestWithParams(callParameter);
-    final JsonRpcResponse expectedResponse =
-        new JsonRpcErrorResponse(null, JsonRpcError.TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE);
-
-    final JsonRpcResponse response = method.response(request);
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
-  }
-
-  @Test
-  public void shouldReturnExpectedValueForInsufficientGas() {
-    final JsonCallParameter callParameter =
-        new JsonCallParameter(null, null, Gas.of(1), null, null, null, null, null, null);
-    final JsonRpcRequestContext request = requestWithParams(callParameter);
-    final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x5208");
-
-    final JsonRpcResponse response = method.response(request);
-
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
-  }
-
-  private JsonRpcRequestContext requestWithParams(final Object... params) {
-    return new JsonRpcRequestContext(new JsonRpcRequest("2.0", "eth_estimateGas", params));
-  }
-}
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetBlockByHashIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetBlockByHashIntegrationTest.java
deleted file mode 100644
index 4a867a620e8..00000000000
--- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetBlockByHashIntegrationTest.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.ethereum.api.jsonrpc.BlockchainImporter;
-import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey;
-import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseUtils;
-import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcTestMethodsFactory;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionResult;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.testutil.BlockTestUtil;
-
-import java.util.EnumMap;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.Resources;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class EthGetBlockByHashIntegrationTest {
-
-  private Map<String, JsonRpcMethod> methods;
-  private static JsonRpcTestMethodsFactory BLOCKCHAIN;
-  private final JsonRpcResponseUtils responseUtils = new JsonRpcResponseUtils();
-  private final String ETH_METHOD = "eth_getBlockByHash";
-  private final String JSON_RPC_VERSION = "2.0";
-  private final String ZERO_HASH = String.valueOf(Hash.ZERO);
-
-  @BeforeClass
-  public static void setUpOnce() throws Exception {
-    final String genesisJson =
-        Resources.toString(BlockTestUtil.getTestGenesisUrl(), Charsets.UTF_8);
-
-    BLOCKCHAIN =
-        new JsonRpcTestMethodsFactory(
-            new BlockchainImporter(BlockTestUtil.getTestBlockchainUrl(), genesisJson));
-  }
-
-  @Before
-  public void setUp() {
-    methods = BLOCKCHAIN.methods();
-  }
-
-  @Test
-  public void returnCorrectEthMethodName() {
-    assertThat(ethGetBlockByHash().getName()).isEqualTo(ETH_METHOD);
-  }
-
-  @Test
-  public void returnEmptyResponseIfBlockNotFound() {
-    final JsonRpcResponse expected = new JsonRpcSuccessResponse(null, null);
-
-    final JsonRpcMethod method = ethGetBlockByHash();
-    final JsonRpcResponse actual = method.response(requestWithParams(ZERO_HASH, true));
-
-    assertThat(actual).isEqualToComparingFieldByField(expected);
-  }
-
-  @Test
-  public void returnFullTransactionIfBlockFound() {
-    final Map<JsonRpcResponseKey, String> expectedResult = new EnumMap<>(JsonRpcResponseKey.class);
-    expectedResult.put(JsonRpcResponseKey.NUMBER, "0x1");
-    expectedResult.put(
-        JsonRpcResponseKey.MIX_HASH,
-        "0x552dd5ae3ccb7a278c6cedda27e48963101be56526a8ee8d70e8227f2c08edf0");
-    expectedResult.put(
-        JsonRpcResponseKey.PARENT_HASH,
-        "0xf8f01382f5636d02edac7fff679a6feb7a572d37a395daaab77938feb6fe217f");
-    expectedResult.put(JsonRpcResponseKey.NONCE, "0xbd2b1f0ebba7b989");
-    expectedResult.put(
-        JsonRpcResponseKey.OMMERS_HASH,
-        "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347");
-    expectedResult.put(
-        JsonRpcResponseKey.LOGS_BLOOM,
-        "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
-    expectedResult.put(
-        JsonRpcResponseKey.TRANSACTION_ROOT,
-        "0x3ccbb984a0a736604acae327d9b643f8e75c7931cb2c6ac10dab4226e2e4c5a3");
-    expectedResult.put(
-        JsonRpcResponseKey.STATE_ROOT,
-        "0xee57559895449b8dbd0a096b2999cf97b517b645ec8db33c7f5934778672263e");
-    expectedResult.put(
-        JsonRpcResponseKey.RECEIPTS_ROOT,
-        "0xa2bd925fcbb8b1ec39612553b17c9265ab198f5af25cc564655114bf5a28c75d");
-    expectedResult.put(JsonRpcResponseKey.COINBASE, "0x8888f1f195afa192cfee860698584c030f4c9db1");
-    expectedResult.put(JsonRpcResponseKey.DIFFICULTY, "0x20000");
-    expectedResult.put(JsonRpcResponseKey.TOTAL_DIFFICULTY, "0x40000");
-    expectedResult.put(JsonRpcResponseKey.EXTRA_DATA, "0x");
-    expectedResult.put(JsonRpcResponseKey.SIZE, "0x96a");
-    expectedResult.put(JsonRpcResponseKey.GAS_LIMIT, "0x2fefd8");
-    expectedResult.put(JsonRpcResponseKey.GAS_USED, "0x78674");
-    expectedResult.put(JsonRpcResponseKey.TIMESTAMP, "0x561bc2e0");
-    final List<TransactionResult> transactions =
-        responseUtils.transactions(
-            responseUtils.transaction(
-                "0x10aaf14a53caf27552325374429d3558398a36d3682ede6603c2c6511896e9f9",
-                "0x1",
-                "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                "0x2fefd8",
-                "0x1",
-                "0x812742182a79a8e67733edc58cfa3767aa2d7ad06439d156ddbbb33e3403b4ed",
-                "0x5b5b610705806100106000396000f3006000357c010000000000000000000000000000000000000000000000000000000090048063102accc11461012c57806312a7b9141461013a5780631774e6461461014c5780631e26fd331461015d5780631f9030371461016e578063343a875d1461018057806338cc4831146101955780634e7ad367146101bd57806357cb2fc4146101cb57806365538c73146101e057806368895979146101ee57806376bc21d9146102005780639a19a9531461020e5780639dc2c8f51461021f578063a53b1c1e1461022d578063a67808571461023e578063b61c05031461024c578063c2b12a731461025a578063d2282dc51461026b578063e30081a01461027c578063e8beef5b1461028d578063f38b06001461029b578063f5b53e17146102a9578063fd408767146102bb57005b6101346104d6565b60006000f35b61014261039b565b8060005260206000f35b610157600435610326565b60006000f35b6101686004356102c9565b60006000f35b610176610442565b8060005260206000f35b6101886103d3565b8060ff1660005260206000f35b61019d610413565b8073ffffffffffffffffffffffffffffffffffffffff1660005260206000f35b6101c56104c5565b60006000f35b6101d36103b7565b8060000b60005260206000f35b6101e8610454565b60006000f35b6101f6610401565b8060005260206000f35b61020861051f565b60006000f35b6102196004356102e5565b60006000f35b610227610693565b60006000f35b610238600435610342565b60006000f35b610246610484565b60006000f35b610254610493565b60006000f35b61026560043561038d565b60006000f35b610276600435610350565b60006000f35b61028760043561035e565b60006000f35b6102956105b4565b60006000f35b6102a3610547565b60006000f35b6102b16103ef565b8060005260206000f35b6102c3610600565b60006000f35b80600060006101000a81548160ff021916908302179055505b50565b80600060016101000a81548160ff02191690837f01000000000000000000000000000000000000000000000000000000000000009081020402179055505b50565b80600060026101000a81548160ff021916908302179055505b50565b806001600050819055505b50565b806002600050819055505b50565b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908302179055505b50565b806004600050819055505b50565b6000600060009054906101000a900460ff1690506103b4565b90565b6000600060019054906101000a900460000b90506103d0565b90565b6000600060029054906101000a900460ff1690506103ec565b90565b600060016000505490506103fe565b90565b60006002600050549050610410565b90565b6000600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905061043f565b90565b60006004600050549050610451565b90565b7f65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be5806000602a81526020016000a15b565b6000602a81526020016000a05b565b60017f81933b308056e7e85668661dcd102b1f22795b4431f9cf4625794f381c271c6b6000602a81526020016000a25b565b60016000602a81526020016000a15b565b3373ffffffffffffffffffffffffffffffffffffffff1660017f0e216b62efbb97e751a2ce09f607048751720397ecfb9eef1e48a6644948985b6000602a81526020016000a35b565b3373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a25b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017f317b31292193c2a4f561cc40a95ea0d97a2733f14af6d6d59522473e1f3ae65f6000602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a35b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017fd5f0a30e4be0c6be577a71eceb7464245a796a7e6a55c0d971837b250de05f4e60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff16600160007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a35b56",
-                "0x0",
-                null,
-                "0x0",
-                "0xa",
-                "0x1c",
-                "0xe439aa8812c1c0a751b0931ea20c5a30cd54fe15cae883c59fd8107e04557679",
-                "0x58d025af99b538b778a47da8115c43d5cee564c3cc8d58eb972aaf80ea2c406e"));
-
-    final JsonRpcResponse expected = responseUtils.response(expectedResult, transactions);
-    final JsonRpcResponse actual =
-        ethGetBlockByHash()
-            .response(
-                requestWithParams(
-                    "0x10aaf14a53caf27552325374429d3558398a36d3682ede6603c2c6511896e9f9", true));
-
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
-  }
-
-  @Test
-  public void returnTransactionHashOnlyIfBlockFound() {
-    final Map<JsonRpcResponseKey, String> expectedResult = new EnumMap<>(JsonRpcResponseKey.class);
-    expectedResult.put(JsonRpcResponseKey.NUMBER, "0x1");
-    expectedResult.put(
-        JsonRpcResponseKey.MIX_HASH,
-        "0x552dd5ae3ccb7a278c6cedda27e48963101be56526a8ee8d70e8227f2c08edf0");
-    expectedResult.put(
-        JsonRpcResponseKey.PARENT_HASH,
-        "0xf8f01382f5636d02edac7fff679a6feb7a572d37a395daaab77938feb6fe217f");
-    expectedResult.put(JsonRpcResponseKey.NONCE, "0xbd2b1f0ebba7b989");
-    expectedResult.put(
-        JsonRpcResponseKey.OMMERS_HASH,
-        "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347");
-    expectedResult.put(
-        JsonRpcResponseKey.LOGS_BLOOM,
-        "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
-    expectedResult.put(
-        JsonRpcResponseKey.TRANSACTION_ROOT,
-        "0x3ccbb984a0a736604acae327d9b643f8e75c7931cb2c6ac10dab4226e2e4c5a3");
-    expectedResult.put(
-        JsonRpcResponseKey.STATE_ROOT,
-        "0xee57559895449b8dbd0a096b2999cf97b517b645ec8db33c7f5934778672263e");
-    expectedResult.put(
-        JsonRpcResponseKey.RECEIPTS_ROOT,
-        "0xa2bd925fcbb8b1ec39612553b17c9265ab198f5af25cc564655114bf5a28c75d");
-    expectedResult.put(JsonRpcResponseKey.COINBASE, "0x8888f1f195afa192cfee860698584c030f4c9db1");
-    expectedResult.put(JsonRpcResponseKey.DIFFICULTY, "0x20000");
-    expectedResult.put(JsonRpcResponseKey.TOTAL_DIFFICULTY, "0x40000");
-    expectedResult.put(JsonRpcResponseKey.EXTRA_DATA, "0x");
-    expectedResult.put(JsonRpcResponseKey.SIZE, "0x96a");
-    expectedResult.put(JsonRpcResponseKey.GAS_LIMIT, "0x2fefd8");
-    expectedResult.put(JsonRpcResponseKey.GAS_USED, "0x78674");
-    expectedResult.put(JsonRpcResponseKey.TIMESTAMP, "0x561bc2e0");
-    final List<TransactionResult> transactions =
-        responseUtils.transactions(
-            "0x812742182a79a8e67733edc58cfa3767aa2d7ad06439d156ddbbb33e3403b4ed");
-
-    final JsonRpcResponse expected = responseUtils.response(expectedResult, transactions);
-    final JsonRpcRequestContext request =
-        requestWithParams(
-            "0x10aaf14a53caf27552325374429d3558398a36d3682ede6603c2c6511896e9f9", false);
-    final JsonRpcResponse actual = ethGetBlockByHash().response(request);
-
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
-  }
-
-  private JsonRpcRequestContext requestWithParams(final Object... params) {
-    return new JsonRpcRequestContext(new JsonRpcRequest(JSON_RPC_VERSION, ETH_METHOD, params));
-  }
-
-  private JsonRpcMethod ethGetBlockByHash() {
-    final JsonRpcMethod method = methods.get(ETH_METHOD);
-    assertThat(method).isNotNull();
-    return method;
-  }
-}
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetBlockByNumberLatestDesyncIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetBlockByNumberLatestDesyncIntegrationTest.java
new file mode 100644
index 00000000000..6d723844a2d
--- /dev/null
+++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetBlockByNumberLatestDesyncIntegrationTest.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.BlockchainImporter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcTestMethodsFactory;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResult;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockImporter;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.core.Synchronizer;
+import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.plugin.data.SyncStatus;
+import org.hyperledger.besu.testutil.BlockTestUtil;
+
+import java.util.Optional;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Resources;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+public class EthGetBlockByNumberLatestDesyncIntegrationTest {
+
+  private static JsonRpcTestMethodsFactory methodsFactorySynced;
+  private static JsonRpcTestMethodsFactory methodsFactoryDesynced;
+  private static JsonRpcTestMethodsFactory methodsFactoryMidDownload;
+  private static final long ARBITRARY_SYNC_BLOCK = 4L;
+
+  @BeforeAll
+  public static void setUpOnce() throws Exception {
+    final String genesisJson =
+        Resources.toString(BlockTestUtil.getTestGenesisUrl(), Charsets.UTF_8);
+    BlockchainImporter importer =
+        new BlockchainImporter(BlockTestUtil.getTestBlockchainUrl(), genesisJson);
+    MutableBlockchain chain =
+        InMemoryKeyValueStorageProvider.createInMemoryBlockchain(importer.getGenesisBlock());
+    WorldStateArchive state = InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive();
+    importer.getGenesisState().writeStateTo(state.getMutable());
+    ProtocolContext context = new ProtocolContext(chain, state, null, Optional.empty());
+
+    for (final Block block : importer.getBlocks()) {
+      final ProtocolSchedule protocolSchedule = importer.getProtocolSchedule();
+      final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(block.getHeader());
+      final BlockImporter blockImporter = protocolSpec.getBlockImporter();
+      blockImporter.importBlock(context, block, HeaderValidationMode.FULL);
+    }
+
+    methodsFactorySynced = new JsonRpcTestMethodsFactory(importer, chain, state, context);
+
+    WorldStateArchive unsynced = mock(WorldStateArchive.class);
+    when(unsynced.isWorldStateAvailable(any(Hash.class), any(Hash.class))).thenReturn(false);
+
+    methodsFactoryDesynced = new JsonRpcTestMethodsFactory(importer, chain, unsynced, context);
+
+    WorldStateArchive midSync = mock(WorldStateArchive.class);
+    when(midSync.isWorldStateAvailable(any(Hash.class), any(Hash.class))).thenReturn(true);
+
+    Synchronizer synchronizer = mock(Synchronizer.class);
+    SyncStatus status = mock(SyncStatus.class);
+    when(status.getCurrentBlock())
+        .thenReturn(ARBITRARY_SYNC_BLOCK); // random choice for current sync state.
+    when(synchronizer.getSyncStatus()).thenReturn(Optional.of(status));
+
+    methodsFactoryMidDownload =
+        new JsonRpcTestMethodsFactory(importer, chain, midSync, context, synchronizer);
+  }
+
+  @Test
+  public void shouldReturnHeadIfFullySynced() {
+    JsonRpcMethod ethGetBlockNumber = methodsFactorySynced.methods().get("eth_getBlockByNumber");
+    Object[] params = {"latest", false};
+    JsonRpcRequestContext ctx =
+        new JsonRpcRequestContext(new JsonRpcRequest("2.0", "eth_getBlockByNumber", params));
+    Assertions.assertThatNoException()
+        .isThrownBy(
+            () -> {
+              final JsonRpcResponse resp = ethGetBlockNumber.response(ctx);
+              assertThat(resp).isNotNull();
+              assertThat(resp).isInstanceOf(JsonRpcSuccessResponse.class);
+              Object r = ((JsonRpcSuccessResponse) resp).getResult();
+              assertThat(r).isInstanceOf(BlockResult.class);
+              BlockResult br = (BlockResult) r;
+              assertThat(br.getNumber()).isEqualTo("0x20");
+              // assert on the state existing?
+            });
+  }
+
+  @Test
+  public void shouldReturnGenesisIfNotSynced() {
+
+    JsonRpcMethod ethGetBlockNumber = methodsFactoryDesynced.methods().get("eth_getBlockByNumber");
+    Object[] params = {"latest", false};
+    JsonRpcRequestContext ctx =
+        new JsonRpcRequestContext(new JsonRpcRequest("2.0", "eth_getBlockByNumber", params));
+    Assertions.assertThatNoException()
+        .isThrownBy(
+            () -> {
+              final JsonRpcResponse resp = ethGetBlockNumber.response(ctx);
+              assertThat(resp).isNotNull();
+              assertThat(resp).isInstanceOf(JsonRpcSuccessResponse.class);
+              Object r = ((JsonRpcSuccessResponse) resp).getResult();
+              assertThat(r).isInstanceOf(BlockResult.class);
+              BlockResult br = (BlockResult) r;
+              assertThat(br.getNumber()).isEqualTo("0x0");
+            });
+  }
+
+  @Test
+  public void shouldReturnCurrentSyncedIfDownloadingWorldState() {
+    JsonRpcMethod ethGetBlockNumber =
+        methodsFactoryMidDownload.methods().get("eth_getBlockByNumber");
+    Object[] params = {"latest", false};
+    JsonRpcRequestContext ctx =
+        new JsonRpcRequestContext(new JsonRpcRequest("2.0", "eth_getBlockByNumber", params));
+    Assertions.assertThatNoException()
+        .isThrownBy(
+            () -> {
+              final JsonRpcResponse resp = ethGetBlockNumber.response(ctx);
+              assertThat(resp).isNotNull();
+              assertThat(resp).isInstanceOf(JsonRpcSuccessResponse.class);
+              Object r = ((JsonRpcSuccessResponse) resp).getResult();
+              assertThat(r).isInstanceOf(BlockResult.class);
+              BlockResult br = (BlockResult) r;
+              assertThat(br.getNumber()).isEqualTo("0x4");
+            });
+  }
+}
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetFilterChangesIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetFilterChangesIntegrationTest.java
deleted file mode 100644
index 7a1cb55d25f..00000000000
--- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetFilterChangesIntegrationTest.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
-
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptyList;
-import static java.util.stream.Collectors.toList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManagerBuilder;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetFilterChanges;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.BlockBody;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.ExecutionContextTestFixture;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.TransactionReceipt;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.eth.manager.EthContext;
-import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
-import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
-import org.hyperledger.besu.ethereum.eth.transactions.PeerPendingTransactionTracker;
-import org.hyperledger.besu.ethereum.eth.transactions.PeerTransactionTracker;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool.TransactionBatchAddedListener;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
-import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.plugin.data.TransactionType;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
-import org.hyperledger.besu.testutil.TestClock;
-
-import java.math.BigInteger;
-import java.util.List;
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.assertj.core.util.Lists;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-@RunWith(MockitoJUnitRunner.class)
-public class EthGetFilterChangesIntegrationTest {
-
-  @Mock private TransactionBatchAddedListener batchAddedListener;
-  @Mock private TransactionBatchAddedListener pendingBatchAddedListener;
-  private MutableBlockchain blockchain;
-  private final String ETH_METHOD = "eth_getFilterChanges";
-  private final String JSON_RPC_VERSION = "2.0";
-  private TransactionPool transactionPool;
-  private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
-
-  private PendingTransactions transactions;
-
-  private static final int MAX_TRANSACTIONS = 5;
-  private static final int MAX_HASHES = 5;
-  private static final KeyPair keyPair = KeyPair.generate();
-  private final Transaction transaction = createTransaction(1);
-  private FilterManager filterManager;
-  private EthGetFilterChanges method;
-  private final SyncState syncState = mock(SyncState.class);
-
-  @Before
-  public void setUp() {
-    final ExecutionContextTestFixture executionContext = ExecutionContextTestFixture.create();
-    blockchain = executionContext.getBlockchain();
-    transactions =
-        new PendingTransactions(
-            TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
-            MAX_TRANSACTIONS,
-            MAX_HASHES,
-            TestClock.fixed(),
-            metricsSystem,
-            blockchain::getChainHeadHeader,
-            TransactionPoolConfiguration.DEFAULT_PRICE_BUMP);
-    final ProtocolContext protocolContext = executionContext.getProtocolContext();
-
-    PeerTransactionTracker peerTransactionTracker = mock(PeerTransactionTracker.class);
-    PeerPendingTransactionTracker peerPendingTransactionTracker =
-        mock(PeerPendingTransactionTracker.class);
-    EthContext ethContext = mock(EthContext.class);
-    EthPeers ethPeers = mock(EthPeers.class);
-    when(ethContext.getEthPeers()).thenReturn(ethPeers);
-
-    transactionPool =
-        new TransactionPool(
-            transactions,
-            executionContext.getProtocolSchedule(),
-            protocolContext,
-            batchAddedListener,
-            Optional.of(pendingBatchAddedListener),
-            syncState,
-            ethContext,
-            peerTransactionTracker,
-            Optional.of(peerPendingTransactionTracker),
-            Wei.ZERO,
-            metricsSystem,
-            Optional.empty(),
-            TransactionPoolConfiguration.DEFAULT);
-    final BlockchainQueries blockchainQueries =
-        new BlockchainQueries(blockchain, protocolContext.getWorldStateArchive());
-    filterManager =
-        new FilterManagerBuilder()
-            .blockchainQueries(blockchainQueries)
-            .transactionPool(transactionPool)
-            .build();
-
-    method = new EthGetFilterChanges(filterManager);
-  }
-
-  @Test
-  public void shouldReturnErrorResponseIfFilterNotFound() {
-    final JsonRpcRequestContext request = requestWithParams("0");
-
-    final JsonRpcResponse expected = new JsonRpcErrorResponse(null, JsonRpcError.FILTER_NOT_FOUND);
-    final JsonRpcResponse actual = method.response(request);
-
-    assertThat(actual).isEqualToComparingFieldByField(expected);
-  }
-
-  @Test
-  public void shouldReturnEmptyArrayIfNoNewBlocks() {
-    final String filterId = filterManager.installBlockFilter();
-
-    assertThatFilterExists(filterId);
-
-    final JsonRpcRequestContext request = requestWithParams(String.valueOf(filterId));
-    final JsonRpcSuccessResponse expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
-    final JsonRpcResponse actual = method.response(request);
-
-    assertThat(actual).isEqualToComparingFieldByField(expected);
-
-    filterManager.uninstallFilter(filterId);
-
-    assertThatFilterDoesNotExist(filterId);
-  }
-
-  @Test
-  public void shouldReturnEmptyArrayIfNoAddedPendingTransactions() {
-    final String filterId = filterManager.installPendingTransactionFilter();
-
-    assertThatFilterExists(filterId);
-
-    final JsonRpcRequestContext request = requestWithParams(String.valueOf(filterId));
-
-    // We haven't added any transactions, so the list of pending transactions should be empty.
-    final JsonRpcSuccessResponse expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
-    final JsonRpcResponse actual = method.response(request);
-    assertThat(actual).isEqualToComparingFieldByField(expected);
-
-    filterManager.uninstallFilter(filterId);
-
-    assertThatFilterDoesNotExist(filterId);
-  }
-
-  @Test
-  public void shouldReturnHashesIfNewBlocks() {
-    final String filterId = filterManager.installBlockFilter();
-
-    assertThatFilterExists(filterId);
-
-    final JsonRpcRequestContext request = requestWithParams(String.valueOf(filterId));
-
-    // We haven't added any blocks, so the list of new blocks should be empty.
-    JsonRpcSuccessResponse expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
-    JsonRpcResponse actual = method.response(request);
-    assertThat(actual).isEqualToComparingFieldByField(expected);
-
-    final Block block = appendBlock(transaction);
-
-    // We've added one block, so there should be one new hash.
-    expected = new JsonRpcSuccessResponse(null, Lists.newArrayList(block.getHash().toString()));
-    actual = method.response(request);
-    assertThat(actual).isEqualToComparingFieldByField(expected);
-
-    // The queue should be flushed and return no results.
-    expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
-    actual = method.response(request);
-    assertThat(actual).isEqualToComparingFieldByField(expected);
-
-    filterManager.uninstallFilter(filterId);
-
-    assertThatFilterDoesNotExist(filterId);
-  }
-
-  @Test
-  public void shouldReturnHashesIfNewPendingTransactions() {
-    final String filterId = filterManager.installPendingTransactionFilter();
-
-    assertThatFilterExists(filterId);
-
-    final JsonRpcRequestContext request = requestWithParams(String.valueOf(filterId));
-
-    // We haven't added any transactions, so the list of pending transactions should be empty.
-    JsonRpcSuccessResponse expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
-    JsonRpcResponse actual = method.response(request);
-    assertThat(actual).isEqualToComparingFieldByField(expected);
-
-    transactions.addRemoteTransaction(transaction);
-
-    // We've added one transaction, so there should be one new hash.
-    expected =
-        new JsonRpcSuccessResponse(null, Lists.newArrayList(String.valueOf(transaction.getHash())));
-    actual = method.response(request);
-    assertThat(actual).isEqualToComparingFieldByField(expected);
-
-    // The queue should be flushed and return no results.
-    expected = new JsonRpcSuccessResponse(null, Lists.emptyList());
-    actual = method.response(request);
-    assertThat(actual).isEqualToComparingFieldByField(expected);
-
-    filterManager.uninstallFilter(filterId);
-
-    assertThatFilterDoesNotExist(filterId);
-  }
-
-  private void assertThatFilterExists(final String filterId) {
-    assertThat(filterExists(filterId)).isTrue();
-  }
-
-  private void assertThatFilterDoesNotExist(final String filterId) {
-    assertThat(filterExists(filterId)).isFalse();
-  }
-
-  /**
-   * Determines whether a specified filter exists.
-   *
-   * @param filterId The filter ID to check.
-   * @return A boolean - true if the filter exists, false if not.
-   */
-  private boolean filterExists(final String filterId) {
-    final JsonRpcResponse response = method.response(requestWithParams(String.valueOf(filterId)));
-    if (response instanceof JsonRpcSuccessResponse) {
-      return true;
-    } else {
-      assertThat(response).isInstanceOf(JsonRpcErrorResponse.class);
-      assertThat(((JsonRpcErrorResponse) response).getError())
-          .isEqualTo(JsonRpcError.FILTER_NOT_FOUND);
-      return false;
-    }
-  }
-
-  private Block appendBlock(final Transaction... transactionsToAdd) {
-    return appendBlock(Difficulty.ONE, getHeaderForCurrentChainHead(), transactionsToAdd);
-  }
-
-  private BlockHeader getHeaderForCurrentChainHead() {
-    return blockchain.getBlockHeader(blockchain.getChainHeadHash()).get();
-  }
-
-  private Block appendBlock(
-      final Difficulty difficulty,
-      final BlockHeader parentBlock,
-      final Transaction... transactionsToAdd) {
-    final List<Transaction> transactionList = asList(transactionsToAdd);
-    final Block block =
-        new Block(
-            new BlockHeaderTestFixture()
-                .difficulty(difficulty)
-                .parentHash(parentBlock.getHash())
-                .number(parentBlock.getNumber() + 1)
-                .buildHeader(),
-            new BlockBody(transactionList, emptyList()));
-    final List<TransactionReceipt> transactionReceipts =
-        transactionList.stream()
-            .map(transaction -> new TransactionReceipt(1, 1, emptyList(), Optional.empty()))
-            .collect(toList());
-    blockchain.appendBlock(block, transactionReceipts);
-    return block;
-  }
-
-  private Transaction createTransaction(final int transactionNumber) {
-    return Transaction.builder()
-        .type(TransactionType.FRONTIER)
-        .gasLimit(100)
-        .gasPrice(Wei.ZERO)
-        .nonce(1)
-        .payload(Bytes.EMPTY)
-        .to(Address.ID)
-        .value(Wei.of(transactionNumber))
-        .sender(Address.ID)
-        .chainId(BigInteger.ONE)
-        .signAndBuild(keyPair);
-  }
-
-  private JsonRpcRequestContext requestWithParams(final Object... params) {
-    return new JsonRpcRequestContext(new JsonRpcRequest(JSON_RPC_VERSION, ETH_METHOD, params));
-  }
-}
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCallIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCallIntegrationTest.java
new file mode 100644
index 00000000000..d6559ce893c
--- /dev/null
+++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCallIntegrationTest.java
@@ -0,0 +1,375 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.methods.fork.frontier;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.api.jsonrpc.BlockchainImporter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcTestMethodsFactory;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.testutil.BlockTestUtil;
+
+import java.util.Map;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Resources;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class EthCallIntegrationTest {
+
+  private static JsonRpcTestMethodsFactory BLOCKCHAIN;
+
+  private JsonRpcMethod method;
+
+  @BeforeAll
+  public static void setUpOnce() throws Exception {
+    final String genesisJson =
+        Resources.toString(BlockTestUtil.getTestGenesisUrl(), Charsets.UTF_8);
+
+    BLOCKCHAIN =
+        new JsonRpcTestMethodsFactory(
+            new BlockchainImporter(BlockTestUtil.getTestBlockchainUrl(), genesisJson));
+  }
+
+  @BeforeEach
+  public void setUp() {
+    final Map<String, JsonRpcMethod> methods = BLOCKCHAIN.methods();
+    method = methods.get("eth_call");
+  }
+
+  @Test
+  public void shouldReturnExpectedResultForCallAtLatestBlock() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+            Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
+            null,
+            null,
+            null,
+            null,
+            null,
+            Bytes.fromHexString("0x12a7b914"),
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(
+            null, "0x0000000000000000000000000000000000000000000000000000000000000001");
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnExpectedResultForCallAtSpecificBlock() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+            Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
+            null,
+            null,
+            null,
+            null,
+            null,
+            Bytes.fromHexString("0x12a7b914"),
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "0x8");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(
+            null, "0x0000000000000000000000000000000000000000000000000000000000000000");
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnSuccessWhenCreatingContract() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            Bytes.fromHexString(
+                "0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"),
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(
+            null,
+            "0x60806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029");
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnErrorWithGasLimitTooLow() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+            Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
+            0L,
+            null,
+            null,
+            null,
+            null,
+            Bytes.fromHexString("0x12a7b914"),
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(null, JsonRpcError.INTRINSIC_GAS_EXCEEDS_LIMIT);
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnErrorWithGasPriceTooHighAndStrict() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+            Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
+            null,
+            Wei.fromHexString("0x10000000000000"),
+            null,
+            null,
+            null,
+            Bytes.fromHexString("0x12a7b914"),
+            true,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(null, JsonRpcError.TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE);
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnSuccessWithGasPriceTooHighNotStrict() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+            Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
+            null,
+            Wei.fromHexString("0x10000000000000"),
+            null,
+            null,
+            null,
+            Bytes.fromHexString("0x12a7b914"),
+            false,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(
+            null, "0x0000000000000000000000000000000000000000000000000000000000000001");
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnErrorWithGasPriceTooHigh() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+            Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
+            null,
+            Wei.fromHexString("0x10000000000000"),
+            null,
+            null,
+            null,
+            Bytes.fromHexString("0x12a7b914"),
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(null, JsonRpcError.TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE);
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnSuccessWithValidGasPrice() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+            Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
+            null,
+            Wei.fromHexString("0x10"),
+            null,
+            null,
+            null,
+            Bytes.fromHexString("0x12a7b914"),
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(
+            null, "0x0000000000000000000000000000000000000000000000000000000000000001");
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnErrorWithGasPriceAndEmptyBalance() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xdeadbeef00000000000000000000000000000000"),
+            Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
+            null,
+            Wei.fromHexString("0x10"),
+            null,
+            null,
+            null,
+            Bytes.fromHexString("0x12a7b914"),
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(null, JsonRpcError.TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE);
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnSuccessWithZeroGasPriceAndEmptyBalance() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xdeadbeef00000000000000000000000000000000"),
+            Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
+            null,
+            Wei.fromHexString("0x0"),
+            null,
+            null,
+            null,
+            Bytes.fromHexString("0x12a7b914"),
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(
+            null, "0x0000000000000000000000000000000000000000000000000000000000000001");
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnSuccessWithoutGasPriceAndEmptyBalance() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xdeadbeef00000000000000000000000000000000"),
+            Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
+            null,
+            null,
+            null,
+            null,
+            null,
+            Bytes.fromHexString("0x12a7b914"),
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(
+            null, "0x0000000000000000000000000000000000000000000000000000000000000001");
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnSuccessWithInvalidGasPricingAndEmptyBalance() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xdeadbeef00000000000000000000000000000000"),
+            Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
+            null,
+            null,
+            Wei.fromHexString("0x0A"),
+            null,
+            null,
+            Bytes.fromHexString("0x12a7b914"),
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(
+            null, "0x0000000000000000000000000000000000000000000000000000000000000001");
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnEmptyHashResultForCallWithOnlyToField() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            null,
+            Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
+    final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x");
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  private JsonRpcRequestContext requestWithParams(final Object... params) {
+    return new JsonRpcRequestContext(new JsonRpcRequest("2.0", "eth_call", params));
+  }
+}
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCreateAccessListIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCreateAccessListIntegrationTest.java
new file mode 100644
index 00000000000..f1fe5e6b2ea
--- /dev/null
+++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCreateAccessListIntegrationTest.java
@@ -0,0 +1,267 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.methods.fork.frontier;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.api.jsonrpc.BlockchainImporter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcTestMethodsFactory;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.CreateAccessListResult;
+import org.hyperledger.besu.evm.AccessListEntry;
+import org.hyperledger.besu.testutil.BlockTestUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Resources;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class EthCreateAccessListIntegrationTest {
+
+  private static JsonRpcTestMethodsFactory BLOCKCHAIN;
+
+  private JsonRpcMethod method;
+
+  @BeforeAll
+  public static void setUpOnce() throws Exception {
+    final String genesisJson =
+        Resources.toString(BlockTestUtil.getEthRefTestResources().getGenesisURL(), Charsets.UTF_8);
+
+    BLOCKCHAIN =
+        new JsonRpcTestMethodsFactory(
+            new BlockchainImporter(
+                BlockTestUtil.getEthRefTestResources().getBlocksURL(), genesisJson));
+  }
+
+  @BeforeEach
+  public void setUp() {
+    final Map<String, JsonRpcMethod> methods = BLOCKCHAIN.methods();
+    method = methods.get("eth_createAccessList");
+  }
+
+  @Test
+  public void shouldSucceedWhenCreateAccessListMultipleReads() {
+    final long expectedGasUsed = 0x6b0e;
+    final List<AccessListEntry> expectedAccessListEntryList =
+        List.of(
+            new AccessListEntry(
+                Address.fromHexString("0xbb00000000000000000000000000000000000000"),
+                List.of(
+                    UInt256.fromHexString(
+                        "0x0000000000000000000000000000000000000000000000000000000000000001"),
+                    UInt256.fromHexString(
+                        "0x0000000000000000000000000000000000000000000000000000000000000003"))));
+
+    final JsonCallParameter callParameter =
+        createAccessListJsonCallParameters(
+            "0x658bdf435d810c91414ec09147daa6db62406379",
+            "0xbb00000000000000000000000000000000000000",
+            null);
+
+    assertAccessListExpectedResult(callParameter, expectedAccessListEntryList, expectedGasUsed);
+  }
+
+  @Test
+  public void shouldSucceedWhenCreateAccessListMultipleReads_withAccessListParam() {
+    final long expectedGasUsed = 0x6b0e;
+    final List<AccessListEntry> expectedAccessListEntryList =
+        List.of(
+            new AccessListEntry(
+                Address.fromHexString("0xbb00000000000000000000000000000000000000"),
+                List.of(
+                    UInt256.fromHexString(
+                        "0x0000000000000000000000000000000000000000000000000000000000000001"),
+                    UInt256.fromHexString(
+                        "0x0000000000000000000000000000000000000000000000000000000000000003"))));
+
+    final JsonCallParameter callParameter =
+        createAccessListJsonCallParameters(
+            "0x658bdf435d810c91414ec09147daa6db62406379",
+            "0xbb00000000000000000000000000000000000000",
+            expectedAccessListEntryList);
+
+    assertAccessListExpectedResult(callParameter, expectedAccessListEntryList, expectedGasUsed);
+  }
+
+  @Test
+  public void shouldSucceedWhenCreateAccessListSimpleTransfer() {
+    final long expectedGasUsed = 0x5208;
+    final List<AccessListEntry> expectedAccessListEntryList = new ArrayList<>();
+
+    final JsonCallParameter callParameter =
+        createAccessListJsonCallParameters(
+            "0x658bdf435d810c91414ec09147daa6db62406379",
+            "0x0100000000000000000000000000000000000000",
+            expectedAccessListEntryList);
+
+    assertAccessListExpectedResult(callParameter, expectedAccessListEntryList, expectedGasUsed);
+  }
+
+  @Test
+  public void shouldSucceedWhenCreateAccessListSimpleContract() {
+    final long expectedGasUsed = 0x520b;
+    final List<AccessListEntry> expectedAccessListEntryList = new ArrayList<>();
+
+    final JsonCallParameter callParameter =
+        createAccessListJsonCallParameters(
+            "0x658bdf435d810c91414ec09147daa6db62406379",
+            "0xaa00000000000000000000000000000000000000",
+            null);
+
+    assertAccessListExpectedResult(callParameter, expectedAccessListEntryList, expectedGasUsed);
+  }
+
+  @Test
+  public void shouldReturnExpectedValueForEmptyCallParameter() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(null, null, null, null, null, null, null, null, null, null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter);
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(null, new CreateAccessListResult(new ArrayList<>(), 0xcf08));
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnExpectedValueForTransfer() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+            Address.fromHexString("0x8888f1f195afa192cfee860698584c030f4c9db1"),
+            null,
+            null,
+            null,
+            null,
+            Wei.ZERO,
+            null,
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter);
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(null, new CreateAccessListResult(new ArrayList<>(), 0x5208));
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnExpectedValueForContractDeploy() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            Bytes.fromHexString(
+                "0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"),
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter);
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(null, new CreateAccessListResult(new ArrayList<>(), 0x1f081));
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldIgnoreSenderBalanceAccountWhenStrictModeDisabledAndReturnExpectedValue() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0x0000000000000000000000000000000000000000"),
+            null,
+            1L,
+            Wei.fromHexString("0x9999999999"),
+            null,
+            null,
+            null,
+            Bytes.fromHexString(
+                "0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"),
+            false,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter);
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(null, new CreateAccessListResult(new ArrayList<>(), 0x1f081));
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnExpectedValueForInsufficientGas() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(null, null, 1L, null, null, null, null, null, null, null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter);
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(null, new CreateAccessListResult(new ArrayList<>(), 0xcf08));
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  private void assertAccessListExpectedResult(
+      final JsonCallParameter callParameter,
+      final List<AccessListEntry> accessList,
+      final long gasUsed) {
+    final JsonRpcRequestContext request = requestWithParams(callParameter);
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(null, new CreateAccessListResult(accessList, gasUsed));
+
+    final JsonRpcResponse response = method.response(request);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  private JsonCallParameter createAccessListJsonCallParameters(
+      final String from, final String to, final List<AccessListEntry> accessList) {
+    return new JsonCallParameter(
+        Address.fromHexString(from),
+        Address.fromHexString(to),
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        accessList);
+  }
+
+  private JsonRpcRequestContext requestWithParams(final Object... params) {
+    return new JsonRpcRequestContext(new JsonRpcRequest("2.0", "eth_createAccessList", params));
+  }
+}
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthEstimateGasIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthEstimateGasIntegrationTest.java
new file mode 100644
index 00000000000..e4e86573bc6
--- /dev/null
+++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthEstimateGasIntegrationTest.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.methods.fork.frontier;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.api.jsonrpc.BlockchainImporter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcTestMethodsFactory;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.testutil.BlockTestUtil;
+
+import java.util.Map;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Resources;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class EthEstimateGasIntegrationTest {
+
+  private static JsonRpcTestMethodsFactory BLOCKCHAIN;
+
+  private JsonRpcMethod method;
+
+  @BeforeAll
+  public static void setUpOnce() throws Exception {
+    final String genesisJson =
+        Resources.toString(BlockTestUtil.getTestGenesisUrl(), Charsets.UTF_8);
+
+    BLOCKCHAIN =
+        new JsonRpcTestMethodsFactory(
+            new BlockchainImporter(BlockTestUtil.getTestBlockchainUrl(), genesisJson));
+  }
+
+  @BeforeEach
+  public void setUp() {
+    final Map<String, JsonRpcMethod> methods = BLOCKCHAIN.methods();
+    method = methods.get("eth_estimateGas");
+  }
+
+  @Test
+  public void shouldReturnExpectedValueForEmptyCallParameter() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(null, null, null, null, null, null, null, null, null, null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter);
+    final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x5208");
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnExpectedValueForTransfer() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+            Address.fromHexString("0x8888f1f195afa192cfee860698584c030f4c9db1"),
+            null,
+            null,
+            null,
+            null,
+            Wei.ONE,
+            null,
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter);
+    final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x5208");
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnExpectedValueForContractDeploy() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            Bytes.fromHexString(
+                "0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"),
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter);
+    final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x1b551");
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldIgnoreSenderBalanceAccountWhenStrictModeDisabledAndReturnExpectedValue() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0x0000000000000000000000000000000000000000"),
+            null,
+            1L,
+            Wei.fromHexString("0x9999999999"),
+            null,
+            null,
+            null,
+            Bytes.fromHexString(
+                "0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"),
+            false,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter);
+    final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x1b551");
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldNotIgnoreSenderBalanceAccountWhenStrictModeDisabledAndThrowError() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
+            null,
+            1L,
+            Wei.fromHexString("0x9999999999"),
+            null,
+            null,
+            null,
+            Bytes.fromHexString(
+                "0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"),
+            true,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter);
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(null, JsonRpcError.TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE);
+
+    final JsonRpcResponse response = method.response(request);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnExpectedValueForInsufficientGas() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(null, null, 1L, null, null, null, null, null, null, null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter);
+    final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x5208");
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  private JsonRpcRequestContext requestWithParams(final Object... params) {
+    return new JsonRpcRequestContext(new JsonRpcRequest("2.0", "eth_estimateGas", params));
+  }
+}
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetBlockByHashIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetBlockByHashIntegrationTest.java
new file mode 100644
index 00000000000..84c0983e4be
--- /dev/null
+++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetBlockByHashIntegrationTest.java
@@ -0,0 +1,211 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.methods.fork.frontier;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.api.jsonrpc.BlockchainImporter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseKey;
+import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcResponseUtils;
+import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcTestMethodsFactory;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionResult;
+import org.hyperledger.besu.plugin.data.TransactionType;
+import org.hyperledger.besu.testutil.BlockTestUtil;
+
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Resources;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class EthGetBlockByHashIntegrationTest {
+
+  private Map<String, JsonRpcMethod> methods;
+  private static JsonRpcTestMethodsFactory BLOCKCHAIN;
+  private final JsonRpcResponseUtils responseUtils = new JsonRpcResponseUtils();
+  private final String ETH_METHOD = "eth_getBlockByHash";
+  private final String JSON_RPC_VERSION = "2.0";
+  private final String ZERO_HASH = String.valueOf(Hash.ZERO);
+
+  @BeforeAll
+  public static void setUpOnce() throws Exception {
+    final String genesisJson =
+        Resources.toString(BlockTestUtil.getTestGenesisUrl(), Charsets.UTF_8);
+
+    BLOCKCHAIN =
+        new JsonRpcTestMethodsFactory(
+            new BlockchainImporter(BlockTestUtil.getTestBlockchainUrl(), genesisJson));
+  }
+
+  @BeforeEach
+  public void setUp() {
+    methods = BLOCKCHAIN.methods();
+  }
+
+  @Test
+  public void returnCorrectEthMethodName() {
+    assertThat(ethGetBlockByHash().getName()).isEqualTo(ETH_METHOD);
+  }
+
+  @Test
+  public void returnEmptyResponseIfBlockNotFound() {
+    final JsonRpcResponse expected = new JsonRpcSuccessResponse(null, null);
+
+    final JsonRpcMethod method = ethGetBlockByHash();
+    final JsonRpcResponse actual = method.response(requestWithParams(ZERO_HASH, true));
+
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
+  }
+
+  @Test
+  public void returnFullTransactionIfBlockFound() {
+    final Map<JsonRpcResponseKey, String> expectedResult = new EnumMap<>(JsonRpcResponseKey.class);
+    expectedResult.put(JsonRpcResponseKey.NUMBER, "0x1");
+    expectedResult.put(
+        JsonRpcResponseKey.MIX_HASH,
+        "0x552dd5ae3ccb7a278c6cedda27e48963101be56526a8ee8d70e8227f2c08edf0");
+    expectedResult.put(
+        JsonRpcResponseKey.PARENT_HASH,
+        "0xf8f01382f5636d02edac7fff679a6feb7a572d37a395daaab77938feb6fe217f");
+    expectedResult.put(JsonRpcResponseKey.NONCE, "0xbd2b1f0ebba7b989");
+    expectedResult.put(
+        JsonRpcResponseKey.OMMERS_HASH,
+        "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347");
+    expectedResult.put(
+        JsonRpcResponseKey.LOGS_BLOOM,
+        "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+    expectedResult.put(
+        JsonRpcResponseKey.TRANSACTION_ROOT,
+        "0x3ccbb984a0a736604acae327d9b643f8e75c7931cb2c6ac10dab4226e2e4c5a3");
+    expectedResult.put(
+        JsonRpcResponseKey.STATE_ROOT,
+        "0xee57559895449b8dbd0a096b2999cf97b517b645ec8db33c7f5934778672263e");
+    expectedResult.put(
+        JsonRpcResponseKey.RECEIPTS_ROOT,
+        "0xa2bd925fcbb8b1ec39612553b17c9265ab198f5af25cc564655114bf5a28c75d");
+    expectedResult.put(JsonRpcResponseKey.COINBASE, "0x8888f1f195afa192cfee860698584c030f4c9db1");
+    expectedResult.put(JsonRpcResponseKey.DIFFICULTY, "0x20000");
+    expectedResult.put(JsonRpcResponseKey.TOTAL_DIFFICULTY, "0x40000");
+    expectedResult.put(JsonRpcResponseKey.EXTRA_DATA, "0x");
+    expectedResult.put(JsonRpcResponseKey.SIZE, "0x96a");
+    expectedResult.put(JsonRpcResponseKey.GAS_LIMIT, "0x2fefd8");
+    expectedResult.put(JsonRpcResponseKey.GAS_PRICE, "0x1");
+    expectedResult.put(JsonRpcResponseKey.GAS_USED, "0x78674");
+    expectedResult.put(JsonRpcResponseKey.TIMESTAMP, "0x561bc2e0");
+    expectedResult.put(
+        JsonRpcResponseKey.PUBLIC_KEY,
+        "0x3a514176466fa815ed481ffad09110a2d344f6c9b78c1d14afc351c3a51be33d8072e77939dc03ba44790779b7a1025baf3003f6732430e20cd9b76d953391b3");
+    expectedResult.put(
+        JsonRpcResponseKey.RAW,
+        "0xf907638001832fefd8800ab907155b5b610705806100106000396000f3006000357c010000000000000000000000000000000000000000000000000000000090048063102accc11461012c57806312a7b9141461013a5780631774e6461461014c5780631e26fd331461015d5780631f9030371461016e578063343a875d1461018057806338cc4831146101955780634e7ad367146101bd57806357cb2fc4146101cb57806365538c73146101e057806368895979146101ee57806376bc21d9146102005780639a19a9531461020e5780639dc2c8f51461021f578063a53b1c1e1461022d578063a67808571461023e578063b61c05031461024c578063c2b12a731461025a578063d2282dc51461026b578063e30081a01461027c578063e8beef5b1461028d578063f38b06001461029b578063f5b53e17146102a9578063fd408767146102bb57005b6101346104d6565b60006000f35b61014261039b565b8060005260206000f35b610157600435610326565b60006000f35b6101686004356102c9565b60006000f35b610176610442565b8060005260206000f35b6101886103d3565b8060ff1660005260206000f35b61019d610413565b8073ffffffffffffffffffffffffffffffffffffffff1660005260206000f35b6101c56104c5565b60006000f35b6101d36103b7565b8060000b60005260206000f35b6101e8610454565b60006000f35b6101f6610401565b8060005260206000f35b61020861051f565b60006000f35b6102196004356102e5565b60006000f35b610227610693565b60006000f35b610238600435610342565b60006000f35b610246610484565b60006000f35b610254610493565b60006000f35b61026560043561038d565b60006000f35b610276600435610350565b60006000f35b61028760043561035e565b60006000f35b6102956105b4565b60006000f35b6102a3610547565b60006000f35b6102b16103ef565b8060005260206000f35b6102c3610600565b60006000f35b80600060006101000a81548160ff021916908302179055505b50565b80600060016101000a81548160ff02191690837f01000000000000000000000000000000000000000000000000000000000000009081020402179055505b50565b80600060026101000a81548160ff021916908302179055505b50565b806001600050819055505b50565b806002600050819055505b50565b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908302179055505b50565b806004600050819055505b50565b6000600060009054906101000a900460ff1690506103b4565b90565b6000600060019054906101000a900460000b90506103d0565b90565b6000600060029054906101000a900460ff1690506103ec565b90565b600060016000505490506103fe565b90565b60006002600050549050610410565b90565b6000600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905061043f565b90565b60006004600050549050610451565b90565b7f65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be5806000602a81526020016000a15b565b6000602a81526020016000a05b565b60017f81933b308056e7e85668661dcd102b1f22795b4431f9cf4625794f381c271c6b6000602a81526020016000a25b565b60016000602a81526020016000a15b565b3373ffffffffffffffffffffffffffffffffffffffff1660017f0e216b62efbb97e751a2ce09f607048751720397ecfb9eef1e48a6644948985b6000602a81526020016000a35b565b3373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a25b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017f317b31292193c2a4f561cc40a95ea0d97a2733f14af6d6d59522473e1f3ae65f6000602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a35b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017fd5f0a30e4be0c6be577a71eceb7464245a796a7e6a55c0d971837b250de05f4e60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff16600160007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a35b561ca0e439aa8812c1c0a751b0931ea20c5a30cd54fe15cae883c59fd8107e04557679a058d025af99b538b778a47da8115c43d5cee564c3cc8d58eb972aaf80ea2c406e");
+    final List<TransactionResult> transactions =
+        responseUtils.transactions(
+            responseUtils.transaction(
+                TransactionType.FRONTIER,
+                "0x10aaf14a53caf27552325374429d3558398a36d3682ede6603c2c6511896e9f9",
+                "0x1",
+                null,
+                "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                "0x2fefd8",
+                "0x1",
+                "0x812742182a79a8e67733edc58cfa3767aa2d7ad06439d156ddbbb33e3403b4ed",
+                "0x5b5b610705806100106000396000f3006000357c010000000000000000000000000000000000000000000000000000000090048063102accc11461012c57806312a7b9141461013a5780631774e6461461014c5780631e26fd331461015d5780631f9030371461016e578063343a875d1461018057806338cc4831146101955780634e7ad367146101bd57806357cb2fc4146101cb57806365538c73146101e057806368895979146101ee57806376bc21d9146102005780639a19a9531461020e5780639dc2c8f51461021f578063a53b1c1e1461022d578063a67808571461023e578063b61c05031461024c578063c2b12a731461025a578063d2282dc51461026b578063e30081a01461027c578063e8beef5b1461028d578063f38b06001461029b578063f5b53e17146102a9578063fd408767146102bb57005b6101346104d6565b60006000f35b61014261039b565b8060005260206000f35b610157600435610326565b60006000f35b6101686004356102c9565b60006000f35b610176610442565b8060005260206000f35b6101886103d3565b8060ff1660005260206000f35b61019d610413565b8073ffffffffffffffffffffffffffffffffffffffff1660005260206000f35b6101c56104c5565b60006000f35b6101d36103b7565b8060000b60005260206000f35b6101e8610454565b60006000f35b6101f6610401565b8060005260206000f35b61020861051f565b60006000f35b6102196004356102e5565b60006000f35b610227610693565b60006000f35b610238600435610342565b60006000f35b610246610484565b60006000f35b610254610493565b60006000f35b61026560043561038d565b60006000f35b610276600435610350565b60006000f35b61028760043561035e565b60006000f35b6102956105b4565b60006000f35b6102a3610547565b60006000f35b6102b16103ef565b8060005260206000f35b6102c3610600565b60006000f35b80600060006101000a81548160ff021916908302179055505b50565b80600060016101000a81548160ff02191690837f01000000000000000000000000000000000000000000000000000000000000009081020402179055505b50565b80600060026101000a81548160ff021916908302179055505b50565b806001600050819055505b50565b806002600050819055505b50565b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908302179055505b50565b806004600050819055505b50565b6000600060009054906101000a900460ff1690506103b4565b90565b6000600060019054906101000a900460000b90506103d0565b90565b6000600060029054906101000a900460ff1690506103ec565b90565b600060016000505490506103fe565b90565b60006002600050549050610410565b90565b6000600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905061043f565b90565b60006004600050549050610451565b90565b7f65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be5806000602a81526020016000a15b565b6000602a81526020016000a05b565b60017f81933b308056e7e85668661dcd102b1f22795b4431f9cf4625794f381c271c6b6000602a81526020016000a25b565b60016000602a81526020016000a15b565b3373ffffffffffffffffffffffffffffffffffffffff1660017f0e216b62efbb97e751a2ce09f607048751720397ecfb9eef1e48a6644948985b6000602a81526020016000a35b565b3373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a25b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017f317b31292193c2a4f561cc40a95ea0d97a2733f14af6d6d59522473e1f3ae65f6000602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a35b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017fd5f0a30e4be0c6be577a71eceb7464245a796a7e6a55c0d971837b250de05f4e60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff16600160007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a35b56",
+                "0x0",
+                "0x3a514176466fa815ed481ffad09110a2d344f6c9b78c1d14afc351c3a51be33d8072e77939dc03ba44790779b7a1025baf3003f6732430e20cd9b76d953391b3",
+                "0xf907638001832fefd8800ab907155b5b610705806100106000396000f3006000357c010000000000000000000000000000000000000000000000000000000090048063102accc11461012c57806312a7b9141461013a5780631774e6461461014c5780631e26fd331461015d5780631f9030371461016e578063343a875d1461018057806338cc4831146101955780634e7ad367146101bd57806357cb2fc4146101cb57806365538c73146101e057806368895979146101ee57806376bc21d9146102005780639a19a9531461020e5780639dc2c8f51461021f578063a53b1c1e1461022d578063a67808571461023e578063b61c05031461024c578063c2b12a731461025a578063d2282dc51461026b578063e30081a01461027c578063e8beef5b1461028d578063f38b06001461029b578063f5b53e17146102a9578063fd408767146102bb57005b6101346104d6565b60006000f35b61014261039b565b8060005260206000f35b610157600435610326565b60006000f35b6101686004356102c9565b60006000f35b610176610442565b8060005260206000f35b6101886103d3565b8060ff1660005260206000f35b61019d610413565b8073ffffffffffffffffffffffffffffffffffffffff1660005260206000f35b6101c56104c5565b60006000f35b6101d36103b7565b8060000b60005260206000f35b6101e8610454565b60006000f35b6101f6610401565b8060005260206000f35b61020861051f565b60006000f35b6102196004356102e5565b60006000f35b610227610693565b60006000f35b610238600435610342565b60006000f35b610246610484565b60006000f35b610254610493565b60006000f35b61026560043561038d565b60006000f35b610276600435610350565b60006000f35b61028760043561035e565b60006000f35b6102956105b4565b60006000f35b6102a3610547565b60006000f35b6102b16103ef565b8060005260206000f35b6102c3610600565b60006000f35b80600060006101000a81548160ff021916908302179055505b50565b80600060016101000a81548160ff02191690837f01000000000000000000000000000000000000000000000000000000000000009081020402179055505b50565b80600060026101000a81548160ff021916908302179055505b50565b806001600050819055505b50565b806002600050819055505b50565b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908302179055505b50565b806004600050819055505b50565b6000600060009054906101000a900460ff1690506103b4565b90565b6000600060019054906101000a900460000b90506103d0565b90565b6000600060029054906101000a900460ff1690506103ec565b90565b600060016000505490506103fe565b90565b60006002600050549050610410565b90565b6000600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905061043f565b90565b60006004600050549050610451565b90565b7f65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be5806000602a81526020016000a15b565b6000602a81526020016000a05b565b60017f81933b308056e7e85668661dcd102b1f22795b4431f9cf4625794f381c271c6b6000602a81526020016000a25b565b60016000602a81526020016000a15b565b3373ffffffffffffffffffffffffffffffffffffffff1660017f0e216b62efbb97e751a2ce09f607048751720397ecfb9eef1e48a6644948985b6000602a81526020016000a35b565b3373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a25b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017f317b31292193c2a4f561cc40a95ea0d97a2733f14af6d6d59522473e1f3ae65f6000602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a35b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017fd5f0a30e4be0c6be577a71eceb7464245a796a7e6a55c0d971837b250de05f4e60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff16600160007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a35b561ca0e439aa8812c1c0a751b0931ea20c5a30cd54fe15cae883c59fd8107e04557679a058d025af99b538b778a47da8115c43d5cee564c3cc8d58eb972aaf80ea2c406e",
+                null,
+                "0x0",
+                "0xa",
+                "0x1c",
+                "0xe439aa8812c1c0a751b0931ea20c5a30cd54fe15cae883c59fd8107e04557679",
+                "0x58d025af99b538b778a47da8115c43d5cee564c3cc8d58eb972aaf80ea2c406e"));
+
+    final JsonRpcResponse expected = responseUtils.response(expectedResult, transactions);
+    final JsonRpcResponse actual =
+        ethGetBlockByHash()
+            .response(
+                requestWithParams(
+                    "0x10aaf14a53caf27552325374429d3558398a36d3682ede6603c2c6511896e9f9", true));
+
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
+  }
+
+  @Test
+  public void returnTransactionHashOnlyIfBlockFound() {
+    final Map<JsonRpcResponseKey, String> expectedResult = new EnumMap<>(JsonRpcResponseKey.class);
+    expectedResult.put(JsonRpcResponseKey.NUMBER, "0x1");
+    expectedResult.put(
+        JsonRpcResponseKey.MIX_HASH,
+        "0x552dd5ae3ccb7a278c6cedda27e48963101be56526a8ee8d70e8227f2c08edf0");
+    expectedResult.put(
+        JsonRpcResponseKey.PARENT_HASH,
+        "0xf8f01382f5636d02edac7fff679a6feb7a572d37a395daaab77938feb6fe217f");
+    expectedResult.put(JsonRpcResponseKey.NONCE, "0xbd2b1f0ebba7b989");
+    expectedResult.put(
+        JsonRpcResponseKey.OMMERS_HASH,
+        "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347");
+    expectedResult.put(
+        JsonRpcResponseKey.LOGS_BLOOM,
+        "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+    expectedResult.put(
+        JsonRpcResponseKey.TRANSACTION_ROOT,
+        "0x3ccbb984a0a736604acae327d9b643f8e75c7931cb2c6ac10dab4226e2e4c5a3");
+    expectedResult.put(
+        JsonRpcResponseKey.STATE_ROOT,
+        "0xee57559895449b8dbd0a096b2999cf97b517b645ec8db33c7f5934778672263e");
+    expectedResult.put(
+        JsonRpcResponseKey.RECEIPTS_ROOT,
+        "0xa2bd925fcbb8b1ec39612553b17c9265ab198f5af25cc564655114bf5a28c75d");
+    expectedResult.put(JsonRpcResponseKey.COINBASE, "0x8888f1f195afa192cfee860698584c030f4c9db1");
+    expectedResult.put(JsonRpcResponseKey.DIFFICULTY, "0x20000");
+    expectedResult.put(JsonRpcResponseKey.TOTAL_DIFFICULTY, "0x40000");
+    expectedResult.put(JsonRpcResponseKey.EXTRA_DATA, "0x");
+    expectedResult.put(JsonRpcResponseKey.SIZE, "0x96a");
+    expectedResult.put(JsonRpcResponseKey.GAS_LIMIT, "0x2fefd8");
+    expectedResult.put(JsonRpcResponseKey.GAS_USED, "0x78674");
+    expectedResult.put(JsonRpcResponseKey.TIMESTAMP, "0x561bc2e0");
+    final List<TransactionResult> transactions =
+        responseUtils.transactions(
+            "0x812742182a79a8e67733edc58cfa3767aa2d7ad06439d156ddbbb33e3403b4ed");
+
+    final JsonRpcResponse expected = responseUtils.response(expectedResult, transactions);
+    final JsonRpcRequestContext request =
+        requestWithParams(
+            "0x10aaf14a53caf27552325374429d3558398a36d3682ede6603c2c6511896e9f9", false);
+    final JsonRpcResponse actual = ethGetBlockByHash().response(request);
+
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
+  }
+
+  private JsonRpcRequestContext requestWithParams(final Object... params) {
+    return new JsonRpcRequestContext(new JsonRpcRequest(JSON_RPC_VERSION, ETH_METHOD, params));
+  }
+
+  private JsonRpcMethod ethGetBlockByHash() {
+    final JsonRpcMethod method = methods.get(ETH_METHOD);
+    assertThat(method).isNotNull();
+    return method;
+  }
+}
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetBlockByNumberIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetBlockByNumberIntegrationTest.java
similarity index 91%
rename from ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetBlockByNumberIntegrationTest.java
rename to ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetBlockByNumberIntegrationTest.java
index 82a1778ce88..9943d0988f2 100644
--- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetBlockByNumberIntegrationTest.java
+++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetBlockByNumberIntegrationTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
+package org.hyperledger.besu.ethereum.api.jsonrpc.methods.fork.frontier;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
@@ -27,6 +27,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionResult;
+import org.hyperledger.besu.plugin.data.TransactionType;
 import org.hyperledger.besu.testutil.BlockTestUtil;
 
 import java.util.EnumMap;
@@ -35,13 +36,10 @@
 
 import com.google.common.base.Charsets;
 import com.google.common.io.Resources;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-@RunWith(MockitoJUnitRunner.class)
 public class EthGetBlockByNumberIntegrationTest {
 
   private static final String ETH_METHOD = "eth_getBlockByNumber";
@@ -51,7 +49,7 @@ public class EthGetBlockByNumberIntegrationTest {
   private final JsonRpcResponseUtils responseUtils = new JsonRpcResponseUtils();
   private Map<String, JsonRpcMethod> methods;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUpOnce() throws Exception {
     final String genesisJson =
         Resources.toString(BlockTestUtil.getTestGenesisUrl(), Charsets.UTF_8);
@@ -61,7 +59,7 @@ public static void setUpOnce() throws Exception {
             new BlockchainImporter(BlockTestUtil.getTestBlockchainUrl(), genesisJson));
   }
 
-  @Before
+  @BeforeEach
   public void setUp() {
     methods = BLOCKCHAIN.methods();
   }
@@ -112,7 +110,7 @@ public void earliestBlockHashes() {
 
     final JsonRpcResponse actual = ethGetBlockNumber().response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -154,7 +152,7 @@ public void earliestBlockTransactions() {
 
     final JsonRpcResponse actual = ethGetBlockNumber().response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   private JsonRpcResponse expectedLatestBlockHashes() {
@@ -203,7 +201,7 @@ public void latestBlockHashes() {
 
     final JsonRpcResponse actual = ethGetBlockNumber().response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   private JsonRpcResponse expectedLatestBlockTransactions() {
@@ -213,6 +211,7 @@ private JsonRpcResponse expectedLatestBlockTransactions() {
     out.put(JsonRpcResponseKey.EXTRA_DATA, "0x");
     out.put(JsonRpcResponseKey.GAS_LIMIT, "0x2fefd8");
     out.put(JsonRpcResponseKey.GAS_USED, "0x5c99");
+    out.put(JsonRpcResponseKey.GAS_PRICE, "0x1");
     out.put(
         JsonRpcResponseKey.LOGS_BLOOM,
         "0x00000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000080000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000400000000000000000200000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000800000000040000000000000000000000000000000000000000010000000000000000000000000");
@@ -242,14 +241,18 @@ private JsonRpcResponse expectedLatestBlockTransactions() {
     final List<TransactionResult> transactions =
         responseUtils.transactions(
             responseUtils.transaction(
+                TransactionType.FRONTIER,
                 "0x71d59849ddd98543bdfbe8548f5eed559b07b8aaf196369f39134500eab68e53",
                 "0x20",
+                null,
                 "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                 "0x4cb2f",
                 "0x1",
                 "0xcef53f2311d7c80e9086d661e69ac11a5f3d081e28e02a9ba9b66749407ac310",
                 "0x9dc2c8f5",
                 "0x1f",
+                "0x3a514176466fa815ed481ffad09110a2d344f6c9b78c1d14afc351c3a51be33d8072e77939dc03ba44790779b7a1025baf3003f6732430e20cd9b76d953391b3",
+                "0xf8641f018304cb2f946295ee1b4f6dd65047762f924ecd367c17eabf8f0a849dc2c8f51ba0705b002a7df60707d33812e0298411721be20ea5a2f533707295140d89263b79a078024390784f24160739533b3ceea2698289a02afd9cc768581b4aa3d5f4b105",
                 "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
                 "0x0",
                 "0xa",
@@ -266,7 +269,7 @@ public void latestBlockTransactions() {
 
     final JsonRpcResponse actual = ethGetBlockNumber().response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -276,7 +279,7 @@ public void pendingBlockHashes() {
 
     final JsonRpcResponse actual = ethGetBlockNumber().response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -286,7 +289,7 @@ public void pendingBlockTransactions() {
 
     final JsonRpcResponse actual = ethGetBlockNumber().response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -331,7 +334,7 @@ public void blockSixHashes() {
 
     final JsonRpcResponse actual = ethGetBlockNumber().response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -342,6 +345,7 @@ public void blockSixTransactions() {
     out.put(JsonRpcResponseKey.EXTRA_DATA, "0x");
     out.put(JsonRpcResponseKey.GAS_LIMIT, "0x2fefd8");
     out.put(JsonRpcResponseKey.GAS_USED, "0x559f");
+    out.put(JsonRpcResponseKey.GAS_PRICE, "0x1");
     out.put(
         JsonRpcResponseKey.LOGS_BLOOM,
         "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
@@ -371,14 +375,18 @@ public void blockSixTransactions() {
     final List<TransactionResult> transactions =
         responseUtils.transactions(
             responseUtils.transaction(
+                TransactionType.FRONTIER,
                 "0x609427ccfeae6d2a930927c9a29a0a3077cac7e4b5826159586b10e25770eef9",
                 "0x5",
+                null,
                 "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                 "0x4cb2f",
                 "0x1",
                 "0xec7e53d1b99ef586b3e43c1c7068311f6861d51ac3d6fbf257ac0b54ba3f2032",
                 "0xf5b53e17",
                 "0x4",
+                "0x3a514176466fa815ed481ffad09110a2d344f6c9b78c1d14afc351c3a51be33d8072e77939dc03ba44790779b7a1025baf3003f6732430e20cd9b76d953391b3",
+                "0xf86404018304cb2f946295ee1b4f6dd65047762f924ecd367c17eabf8f0a84f5b53e171ca01c07bd41fc821f95b9f543b080c520654727f9cf829800f789c3b03b8de8b326a0259c8aceea2d462192d95f9d6b7cb9e0bf2a6d549c3a4111194fdd22105728f5",
                 "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
                 "0x0",
                 "0xa",
@@ -390,7 +398,7 @@ public void blockSixTransactions() {
 
     final JsonRpcResponse actual = ethGetBlockNumber().response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   /** The Tag | Quantity is the first parameter, either a String or a number */
@@ -402,7 +410,7 @@ public void missingTagParameterBlockHashes() {
 
     assertThat(thrown)
         .isInstanceOf(InvalidJsonRpcParameters.class)
-        .hasMessage("Invalid json rpc parameter at index 0");
+        .hasMessageContaining("Invalid json rpc parameter at index 0");
   }
 
   /** The Tag | Quantity is the first parameter, either a String or a number */
@@ -414,7 +422,7 @@ public void missingTagParameterBlockTransactions() {
 
     assertThat(thrown)
         .isInstanceOf(InvalidJsonRpcParameters.class)
-        .hasMessage("Invalid json rpc parameter at index 0");
+        .hasMessageContaining("Invalid json rpc parameter at index 0");
   }
 
   /**
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetFilterChangesIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetFilterChangesIntegrationTest.java
new file mode 100644
index 00000000000..fbec4e7c6c6
--- /dev/null
+++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetFilterChangesIntegrationTest.java
@@ -0,0 +1,315 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.methods.fork.frontier;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManagerBuilder;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetFilterChanges;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.ExecutionContextTestFixture;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
+import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionBroadcaster;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
+import org.hyperledger.besu.ethereum.eth.transactions.sorter.GasPricePendingTransactionsSorter;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.data.TransactionType;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.testutil.TestClock;
+
+import java.math.BigInteger;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.assertj.core.util.Lists;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+public class EthGetFilterChangesIntegrationTest {
+
+  @Mock private TransactionBroadcaster batchAddedListener;
+  private MutableBlockchain blockchain;
+  private final String ETH_METHOD = "eth_getFilterChanges";
+  private final String JSON_RPC_VERSION = "2.0";
+  private TransactionPool transactionPool;
+  private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
+
+  private PendingTransactions transactions;
+
+  private static final int MAX_TRANSACTIONS = 5;
+  private static final KeyPair keyPair = SignatureAlgorithmFactory.getInstance().generateKeyPair();
+  private final Transaction transaction = createTransaction(1);
+  private FilterManager filterManager;
+  private EthGetFilterChanges method;
+
+  @BeforeEach
+  public void setUp() {
+    final ExecutionContextTestFixture executionContext = ExecutionContextTestFixture.create();
+    blockchain = executionContext.getBlockchain();
+    transactions =
+        new GasPricePendingTransactionsSorter(
+            ImmutableTransactionPoolConfiguration.builder().txPoolMaxSize(MAX_TRANSACTIONS).build(),
+            TestClock.fixed(),
+            metricsSystem,
+            blockchain::getChainHeadHeader);
+    final ProtocolContext protocolContext = executionContext.getProtocolContext();
+
+    EthContext ethContext = mock(EthContext.class);
+    EthPeers ethPeers = mock(EthPeers.class);
+    when(ethContext.getEthPeers()).thenReturn(ethPeers);
+
+    transactionPool =
+        new TransactionPool(
+            () -> transactions,
+            executionContext.getProtocolSchedule(),
+            protocolContext,
+            batchAddedListener,
+            ethContext,
+            new MiningParameters.Builder().minTransactionGasPrice(Wei.ZERO).build(),
+            new TransactionPoolMetrics(metricsSystem),
+            TransactionPoolConfiguration.DEFAULT);
+    transactionPool.setEnabled();
+    final BlockchainQueries blockchainQueries =
+        new BlockchainQueries(blockchain, protocolContext.getWorldStateArchive());
+    filterManager =
+        new FilterManagerBuilder()
+            .blockchainQueries(blockchainQueries)
+            .transactionPool(transactionPool)
+            .build();
+
+    method = new EthGetFilterChanges(filterManager);
+  }
+
+  @Test
+  public void shouldReturnErrorResponseIfFilterNotFound() {
+    final JsonRpcRequestContext request = requestWithParams("0");
+
+    final JsonRpcResponse expected = new JsonRpcErrorResponse(null, JsonRpcError.FILTER_NOT_FOUND);
+    final JsonRpcResponse actual = method.response(request);
+
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
+  }
+
+  @Test
+  public void shouldReturnEmptyArrayIfNoNewBlocks() {
+    final String filterId = filterManager.installBlockFilter();
+
+    assertThatFilterExists(filterId);
+
+    final JsonRpcRequestContext request = requestWithParams(String.valueOf(filterId));
+    final JsonRpcSuccessResponse expected =
+        new JsonRpcSuccessResponse(null, Collections.emptyList());
+    final JsonRpcResponse actual = method.response(request);
+
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
+
+    filterManager.uninstallFilter(filterId);
+
+    assertThatFilterDoesNotExist(filterId);
+  }
+
+  @Test
+  public void shouldReturnEmptyArrayIfNoAddedPendingTransactions() {
+    final String filterId = filterManager.installPendingTransactionFilter();
+
+    assertThatFilterExists(filterId);
+
+    final JsonRpcRequestContext request = requestWithParams(String.valueOf(filterId));
+
+    // We haven't added any transactions, so the list of pending transactions should be empty.
+    final JsonRpcSuccessResponse expected =
+        new JsonRpcSuccessResponse(null, Collections.emptyList());
+    final JsonRpcResponse actual = method.response(request);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
+
+    filterManager.uninstallFilter(filterId);
+
+    assertThatFilterDoesNotExist(filterId);
+  }
+
+  @Test
+  public void shouldReturnHashesIfNewBlocks() {
+    final String filterId = filterManager.installBlockFilter();
+
+    assertThatFilterExists(filterId);
+
+    final JsonRpcRequestContext request = requestWithParams(String.valueOf(filterId));
+
+    // We haven't added any blocks, so the list of new blocks should be empty.
+    JsonRpcSuccessResponse expected = new JsonRpcSuccessResponse(null, Collections.emptyList());
+    JsonRpcResponse actual = method.response(request);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
+
+    final Block block = appendBlock(transaction);
+
+    // We've added one block, so there should be one new hash.
+    expected = new JsonRpcSuccessResponse(null, Lists.newArrayList(block.getHash().toString()));
+    actual = method.response(request);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
+
+    // The queue should be flushed and return no results.
+    expected = new JsonRpcSuccessResponse(null, Collections.emptyList());
+    actual = method.response(request);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
+
+    filterManager.uninstallFilter(filterId);
+
+    assertThatFilterDoesNotExist(filterId);
+  }
+
+  @Test
+  public void shouldReturnHashesIfNewPendingTransactions() {
+    final String filterId = filterManager.installPendingTransactionFilter();
+
+    assertThatFilterExists(filterId);
+
+    final JsonRpcRequestContext request = requestWithParams(String.valueOf(filterId));
+
+    // We haven't added any transactions, so the list of pending transactions should be empty.
+    JsonRpcSuccessResponse expected = new JsonRpcSuccessResponse(null, Collections.emptyList());
+    JsonRpcResponse actual = method.response(request);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
+
+    transactions.addRemoteTransaction(transaction, Optional.empty());
+
+    // We've added one transaction, so there should be one new hash.
+    expected =
+        new JsonRpcSuccessResponse(null, Lists.newArrayList(String.valueOf(transaction.getHash())));
+    actual = method.response(request);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
+
+    // The queue should be flushed and return no results.
+    expected = new JsonRpcSuccessResponse(null, Collections.emptyList());
+    actual = method.response(request);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
+
+    filterManager.uninstallFilter(filterId);
+
+    assertThatFilterDoesNotExist(filterId);
+  }
+
+  private void assertThatFilterExists(final String filterId) {
+    assertThat(filterExists(filterId)).isTrue();
+  }
+
+  private void assertThatFilterDoesNotExist(final String filterId) {
+    assertThat(filterExists(filterId)).isFalse();
+  }
+
+  /**
+   * Determines whether a specified filter exists.
+   *
+   * @param filterId The filter ID to check.
+   * @return A boolean - true if the filter exists, false if not.
+   */
+  private boolean filterExists(final String filterId) {
+    final JsonRpcResponse response = method.response(requestWithParams(String.valueOf(filterId)));
+    if (response instanceof JsonRpcSuccessResponse) {
+      return true;
+    } else {
+      assertThat(response).isInstanceOf(JsonRpcErrorResponse.class);
+      assertThat(((JsonRpcErrorResponse) response).getError())
+          .isEqualTo(JsonRpcError.FILTER_NOT_FOUND);
+      return false;
+    }
+  }
+
+  private Block appendBlock(final Transaction... transactionsToAdd) {
+    return appendBlock(Difficulty.ONE, getHeaderForCurrentChainHead(), transactionsToAdd);
+  }
+
+  private BlockHeader getHeaderForCurrentChainHead() {
+    return blockchain.getBlockHeader(blockchain.getChainHeadHash()).get();
+  }
+
+  private Block appendBlock(
+      final Difficulty difficulty,
+      final BlockHeader parentBlock,
+      final Transaction... transactionsToAdd) {
+    final List<Transaction> transactionList = asList(transactionsToAdd);
+    final Block block =
+        new Block(
+            new BlockHeaderTestFixture()
+                .difficulty(difficulty)
+                .parentHash(parentBlock.getHash())
+                .number(parentBlock.getNumber() + 1)
+                .buildHeader(),
+            new BlockBody(transactionList, emptyList()));
+    final List<TransactionReceipt> transactionReceipts =
+        transactionList.stream()
+            .map(transaction -> new TransactionReceipt(1, 1, emptyList(), Optional.empty()))
+            .collect(toList());
+    blockchain.appendBlock(block, transactionReceipts);
+    return block;
+  }
+
+  private Transaction createTransaction(final int transactionNumber) {
+    return Transaction.builder()
+        .type(TransactionType.FRONTIER)
+        .gasLimit(100)
+        .gasPrice(Wei.ZERO)
+        .nonce(0)
+        .payload(Bytes.EMPTY)
+        .to(Address.ID)
+        .value(Wei.of(transactionNumber))
+        .sender(Address.ID)
+        .chainId(BigInteger.ONE)
+        .signAndBuild(keyPair);
+  }
+
+  private JsonRpcRequestContext requestWithParams(final Object... params) {
+    return new JsonRpcRequestContext(new JsonRpcRequest(JSON_RPC_VERSION, ETH_METHOD, params));
+  }
+}
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetUncleByBlockHashAndIndexIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetUncleByBlockHashAndIndexIntegrationTest.java
similarity index 94%
rename from ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetUncleByBlockHashAndIndexIntegrationTest.java
rename to ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetUncleByBlockHashAndIndexIntegrationTest.java
index 11b5b7ad555..ed235a2d651 100644
--- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetUncleByBlockHashAndIndexIntegrationTest.java
+++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetUncleByBlockHashAndIndexIntegrationTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
+package org.hyperledger.besu.ethereum.api.jsonrpc.methods.fork.frontier;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -32,9 +32,9 @@
 
 import com.google.common.base.Charsets;
 import com.google.common.io.Resources;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class EthGetUncleByBlockHashAndIndexIntegrationTest {
 
@@ -43,7 +43,7 @@ public class EthGetUncleByBlockHashAndIndexIntegrationTest {
   private final JsonRpcResponseUtils responseUtils = new JsonRpcResponseUtils();
   private JsonRpcMethod method;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUpOnce() throws Exception {
     final String genesisJson =
         Resources.toString(BlockTestUtil.getTestGenesisUrl(), Charsets.UTF_8);
@@ -53,7 +53,7 @@ public static void setUpOnce() throws Exception {
             new BlockchainImporter(BlockTestUtil.getTestBlockchainUrl(), genesisJson));
   }
 
-  @Before
+  @BeforeEach
   public void setUp() {
     method = BLOCKCHAIN.methods().get("eth_getUncleByBlockHashAndIndex");
   }
@@ -106,6 +106,6 @@ public void shouldGetExpectedBlockResult() {
     final JsonRpcResponse actual = method.response(request);
 
     assertThat(actual).isInstanceOf(JsonRpcSuccessResponse.class);
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 }
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetUncleByBlockNumberAndIndexIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetUncleByBlockNumberAndIndexIntegrationTest.java
similarity index 94%
rename from ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetUncleByBlockNumberAndIndexIntegrationTest.java
rename to ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetUncleByBlockNumberAndIndexIntegrationTest.java
index a9df9d765a0..4ab0d283857 100644
--- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthGetUncleByBlockNumberAndIndexIntegrationTest.java
+++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthGetUncleByBlockNumberAndIndexIntegrationTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
+package org.hyperledger.besu.ethereum.api.jsonrpc.methods.fork.frontier;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -32,9 +32,9 @@
 
 import com.google.common.base.Charsets;
 import com.google.common.io.Resources;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class EthGetUncleByBlockNumberAndIndexIntegrationTest {
 
@@ -43,7 +43,7 @@ public class EthGetUncleByBlockNumberAndIndexIntegrationTest {
   private final JsonRpcResponseUtils responseUtils = new JsonRpcResponseUtils();
   private JsonRpcMethod method;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUpOnce() throws Exception {
     final String genesisJson =
         Resources.toString(BlockTestUtil.getTestGenesisUrl(), Charsets.UTF_8);
@@ -53,7 +53,7 @@ public static void setUpOnce() throws Exception {
             new BlockchainImporter(BlockTestUtil.getTestBlockchainUrl(), genesisJson));
   }
 
-  @Before
+  @BeforeEach
   public void setUp() {
     method = BLOCKCHAIN.methods().get("eth_getUncleByBlockNumberAndIndex");
   }
@@ -97,7 +97,7 @@ public void shouldGetExpectedBlockResult() {
 
     final JsonRpcSuccessResponse actual = (JsonRpcSuccessResponse) method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   private JsonRpcRequestContext getUncleByBlockNumberAndIndex() {
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivGetPrivateTransactionIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/PrivGetPrivateTransactionIntegrationTest.java
similarity index 75%
rename from ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivGetPrivateTransactionIntegrationTest.java
rename to ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/PrivGetPrivateTransactionIntegrationTest.java
index 71f02614e9e..9bb10629f31 100644
--- a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivGetPrivateTransactionIntegrationTest.java
+++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/PrivGetPrivateTransactionIntegrationTest.java
@@ -12,44 +12,49 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
+package org.hyperledger.besu.ethereum.api.jsonrpc.methods.fork.frontier;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.core.PrivateTransactionDataFixture.privacyMarkerTransaction;
+import static org.hyperledger.besu.ethereum.core.PrivateTransactionDataFixture.privateMarkerTransaction;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.enclave.Enclave;
 import org.hyperledger.besu.enclave.EnclaveFactory;
 import org.hyperledger.besu.enclave.types.SendResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivGetPrivateTransaction;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionLegacyResult;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.chain.TransactionLocation;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.privacy.DefaultPrivacyController;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
-import org.hyperledger.besu.ethereum.privacy.Restriction;
+import org.hyperledger.besu.ethereum.privacy.RestrictedDefaultPrivacyController;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateStateStorage;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
-import org.hyperledger.orion.testutil.OrionKeyConfiguration;
-import org.hyperledger.orion.testutil.OrionTestHarness;
-import org.hyperledger.orion.testutil.OrionTestHarnessFactory;
+import org.hyperledger.besu.plugin.data.Restriction;
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+import org.hyperledger.enclave.testutil.EnclaveKeyConfiguration;
+import org.hyperledger.enclave.testutil.TesseraTestHarness;
+import org.hyperledger.enclave.testutil.TesseraTestHarnessFactory;
 
 import java.math.BigInteger;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Optional;
@@ -57,27 +62,28 @@
 import com.google.common.collect.Lists;
 import io.vertx.core.Vertx;
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class PrivGetPrivateTransactionIntegrationTest {
 
-  @ClassRule public static final TemporaryFolder folder = new TemporaryFolder();
+  @TempDir private static Path folder;
   private static final String ENCLAVE_PUBLIC_KEY = "A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
 
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider = (user) -> ENCLAVE_PUBLIC_KEY;
+  private final PrivacyIdProvider privacyIdProvider = (user) -> ENCLAVE_PUBLIC_KEY;
   private final PrivateStateStorage privateStateStorage = mock(PrivateStateStorage.class);
   private final Blockchain blockchain = mock(Blockchain.class);
 
   private final Address sender =
       Address.fromHexString("0x0000000000000000000000000000000000000003");
 
-  private final SECP256K1.KeyPair KEY_PAIR =
-      SECP256K1.KeyPair.create(
-          SECP256K1.PrivateKey.create(
+  private final SignatureAlgorithm signatureAlgorithm = SignatureAlgorithmFactory.getInstance();
+
+  private final KeyPair KEY_PAIR =
+      signatureAlgorithm.createKeyPair(
+          signatureAlgorithm.createPrivateKey(
               new BigInteger(
                   "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63", 16)));
 
@@ -110,20 +116,23 @@ public class PrivGetPrivateTransactionIntegrationTest {
           .signAndBuild(KEY_PAIR);
 
   private Vertx vertx = Vertx.vertx();
-  private OrionTestHarness testHarness;
+  private TesseraTestHarness testHarness;
   private Enclave enclave;
   private PrivacyController privacyController;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
-    folder.create();
-
     vertx = Vertx.vertx();
 
     testHarness =
-        OrionTestHarnessFactory.create(
-            folder.newFolder().toPath(),
-            new OrionKeyConfiguration("orion_key_0.pub", "orion_key_0.key"));
+        TesseraTestHarnessFactory.create(
+            "enclave",
+            Files.createTempDirectory(folder, "enclave"),
+            new EnclaveKeyConfiguration(
+                new String[] {"enclave_key_0.pub"},
+                new String[] {"enclave_key_0.key"},
+                EnclaveEncryptorType.NOOP),
+            Optional.empty());
 
     testHarness.start();
 
@@ -131,11 +140,11 @@ public void setUp() throws Exception {
     enclave = factory.createVertxEnclave(testHarness.clientUrl());
 
     privacyController =
-        new DefaultPrivacyController(
-            blockchain, privateStateStorage, enclave, null, null, null, null, null, null);
+        new RestrictedDefaultPrivacyController(
+            blockchain, privateStateStorage, enclave, null, null, null, null, null);
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     testHarness.close();
     vertx.close();
@@ -144,10 +153,10 @@ public void tearDown() {
   @Test
   public void returnsStoredPrivateTransaction() {
     final PrivGetPrivateTransaction privGetPrivateTransaction =
-        new PrivGetPrivateTransaction(privacyController, enclavePublicKeyProvider);
+        new PrivGetPrivateTransaction(privacyController, privacyIdProvider);
 
     final Hash blockHash = Hash.ZERO;
-    final Transaction pmt = spy(privacyMarkerTransaction());
+    final Transaction pmt = spy(privateMarkerTransaction());
     when(blockchain.getTransactionByHash(eq(pmt.getHash()))).thenReturn(Optional.of(pmt));
     when(blockchain.getTransactionLocation(eq(pmt.getHash())))
         .thenReturn(Optional.of(new TransactionLocation(blockHash, 0)));
@@ -177,6 +186,7 @@ public void returnsStoredPrivateTransaction() {
         (PrivateTransactionLegacyResult) response.getResult();
 
     assertThat(new PrivateTransactionLegacyResult(this.privateTransaction))
-        .isEqualToComparingFieldByField(result);
+        .usingRecursiveComparison()
+        .isEqualTo(result);
   }
 }
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthCallIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthCallIntegrationTest.java
new file mode 100644
index 00000000000..05698c199f6
--- /dev/null
+++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthCallIntegrationTest.java
@@ -0,0 +1,279 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.methods.fork.london;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.api.jsonrpc.BlockchainImporter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcTestMethodsFactory;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.testutil.BlockTestUtil;
+
+import java.util.Map;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Resources;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class EthCallIntegrationTest {
+
+  private static JsonRpcTestMethodsFactory BLOCKCHAIN;
+
+  private JsonRpcMethod method;
+
+  @BeforeAll
+  public static void setUpOnce() throws Exception {
+    final String genesisJson =
+        Resources.toString(BlockTestUtil.getTestLondonGenesisUrl(), Charsets.UTF_8);
+
+    BLOCKCHAIN =
+        new JsonRpcTestMethodsFactory(
+            new BlockchainImporter(BlockTestUtil.getTestLondonBlockchainUrl(), genesisJson));
+  }
+
+  @BeforeEach
+  public void setUp() {
+    final Map<String, JsonRpcMethod> methods = BLOCKCHAIN.methods();
+    method = methods.get("eth_call");
+  }
+
+  @Test
+  public void shouldReturnSuccessWithoutGasPriceAndEmptyBalance() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xdeadbeef00000000000000000000000000000000"),
+            Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"),
+            null,
+            null,
+            null,
+            null,
+            null,
+            Bytes.fromHexString("0x2e64cec1"),
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(
+            null, "0x0000000000000000000000000000000000000000000000000000000000000001");
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnErrorWithGasPriceTooHigh() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+            Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"),
+            null,
+            Wei.fromHexString("0x10000000000000"),
+            null,
+            null,
+            null,
+            Bytes.fromHexString("0x2e64cec1"),
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(null, JsonRpcError.TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE);
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnSuccessWithValidGasPrice() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+            Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"),
+            null,
+            Wei.fromHexString("0x3B9ACA01"),
+            null,
+            null,
+            null,
+            Bytes.fromHexString("0x2e64cec1"),
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(
+            null, "0x0000000000000000000000000000000000000000000000000000000000000001");
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnErrorWithGasPriceLessThanCurrentBaseFee() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+            Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"),
+            null,
+            Wei.fromHexString("0x0A"),
+            null,
+            null,
+            null,
+            Bytes.fromHexString("0x2e64cec1"),
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(null, JsonRpcError.GAS_PRICE_BELOW_CURRENT_BASE_FEE);
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnSuccessWithValidMaxFeePerGas() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+            Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"),
+            null,
+            null,
+            null,
+            Wei.fromHexString("0x3B9ACA01"),
+            null,
+            Bytes.fromHexString("0x2e64cec1"),
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(
+            null, "0x0000000000000000000000000000000000000000000000000000000000000001");
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnSuccessWithValidMaxFeePerGasAndMaxPriorityFeePerGas() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+            Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"),
+            null,
+            null,
+            Wei.fromHexString("0x3B9ACA00"),
+            Wei.fromHexString("0x3B9ACA01"),
+            null,
+            Bytes.fromHexString("0x2e64cec1"),
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(
+            null, "0x0000000000000000000000000000000000000000000000000000000000000001");
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnErrorWithValidMaxFeePerGasLessThanCurrentBaseFee() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+            Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"),
+            null,
+            null,
+            null,
+            Wei.fromHexString("0x0A"),
+            null,
+            Bytes.fromHexString("0x2e64cec1"),
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(null, JsonRpcError.GAS_PRICE_BELOW_CURRENT_BASE_FEE);
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnErrorWithValidMaxFeePerGasLessThanMaxPriorityFeePerGas() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+            Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"),
+            null,
+            null,
+            Wei.fromHexString("0x3B9ACA02"),
+            Wei.fromHexString("0x3B9ACA01"),
+            null,
+            Bytes.fromHexString("0x2e64cec1"),
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(
+            null, JsonRpcError.MAX_PRIORITY_FEE_PER_GAS_EXCEEDS_MAX_FEE_PER_GAS);
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnErrorWithMaxFeePerGasAndEmptyBalance() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xdeadbeef00000000000000000000000000000000"),
+            Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"),
+            null,
+            null,
+            null,
+            Wei.fromHexString("0x3B9ACA01"),
+            null,
+            Bytes.fromHexString("0x2e64cec1"),
+            null,
+            null);
+    final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(null, JsonRpcError.TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE);
+
+    final JsonRpcResponse response = method.response(request);
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  private JsonRpcRequestContext requestWithParams(final Object... params) {
+    return new JsonRpcRequestContext(new JsonRpcRequest("2.0", "eth_call", params));
+  }
+}
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthEstimateGasIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthEstimateGasIntegrationTest.java
new file mode 100644
index 00000000000..19998344a99
--- /dev/null
+++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthEstimateGasIntegrationTest.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.methods.fork.london;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.api.jsonrpc.BlockchainImporter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcTestMethodsFactory;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.evm.AccessListEntry;
+import org.hyperledger.besu.testutil.BlockTestUtil;
+
+import java.util.List;
+import java.util.Map;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Resources;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class EthEstimateGasIntegrationTest {
+
+  private final String METHOD_NAME = "eth_estimateGas";
+
+  private static JsonRpcTestMethodsFactory BLOCKCHAIN;
+
+  private JsonRpcMethod method;
+
+  @BeforeAll
+  public static void setUpOnce() throws Exception {
+    final String genesisJson =
+        Resources.toString(BlockTestUtil.getTestLondonGenesisUrl(), Charsets.UTF_8);
+
+    BLOCKCHAIN =
+        new JsonRpcTestMethodsFactory(
+            new BlockchainImporter(BlockTestUtil.getTestLondonBlockchainUrl(), genesisJson));
+  }
+
+  @BeforeEach
+  public void setUp() {
+    final Map<String, JsonRpcMethod> methods = BLOCKCHAIN.methods();
+    method = methods.get(METHOD_NAME);
+  }
+
+  @Test
+  public void shouldReturnExpectedValueForTransfer() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+            Address.fromHexString("0x8888f1f195afa192cfee860698584c030f4c9db1"),
+            null,
+            null,
+            null,
+            null,
+            Wei.ONE,
+            null,
+            null,
+            null);
+
+    final JsonRpcResponse response = method.response(requestWithParams(callParameter));
+    final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x5208");
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnExpectedValueForTransfer_WithAccessList() {
+
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+            Address.fromHexString("0x8888f1f195afa192cfee860698584c030f4c9db1"),
+            null,
+            null,
+            null,
+            null,
+            Wei.ONE,
+            null,
+            null,
+            createAccessList());
+
+    final JsonRpcResponse response = method.response(requestWithParams(callParameter));
+    final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x62d4");
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnExpectedValueForContractDeploy() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            Bytes.fromHexString(
+                "0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"),
+            null,
+            null);
+    final JsonRpcResponse response = method.response(requestWithParams(callParameter));
+    final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x1f081");
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnExpectedValueForContractDeploy_WithAccessList() {
+    final JsonCallParameter callParameter =
+        new JsonCallParameter(
+            Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            Bytes.fromHexString(
+                "0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"),
+            null,
+            createAccessList());
+
+    final JsonRpcResponse response = method.response(requestWithParams(callParameter));
+    final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x2014d");
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  private List<AccessListEntry> createAccessList() {
+    return List.of(
+        new AccessListEntry(
+            Address.fromHexString("0x8888f1f195afa192cfee860698584c030f4c9db1"),
+            List.of(Bytes32.ZERO)));
+  }
+
+  private JsonRpcRequestContext requestWithParams(final Object... params) {
+    return new JsonRpcRequestContext(new JsonRpcRequest("2.0", METHOD_NAME, params));
+  }
+}
diff --git a/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthGetFilterChangesIntegrationTest.java b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthGetFilterChangesIntegrationTest.java
new file mode 100644
index 00000000000..7e7db55e02b
--- /dev/null
+++ b/ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthGetFilterChangesIntegrationTest.java
@@ -0,0 +1,315 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.methods.fork.london;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManagerBuilder;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetFilterChanges;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.ExecutionContextTestFixture;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
+import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionBroadcaster;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
+import org.hyperledger.besu.ethereum.eth.transactions.sorter.BaseFeePendingTransactionsSorter;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.data.TransactionType;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.testutil.TestClock;
+
+import java.math.BigInteger;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.assertj.core.util.Lists;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+public class EthGetFilterChangesIntegrationTest {
+
+  @Mock private TransactionBroadcaster batchAddedListener;
+  private MutableBlockchain blockchain;
+  private final String ETH_METHOD = "eth_getFilterChanges";
+  private final String JSON_RPC_VERSION = "2.0";
+  private TransactionPool transactionPool;
+  private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
+
+  private PendingTransactions transactions;
+
+  private static final int MAX_TRANSACTIONS = 5;
+  private static final KeyPair keyPair = SignatureAlgorithmFactory.getInstance().generateKeyPair();
+  private final Transaction transaction = createTransaction(1);
+  private FilterManager filterManager;
+  private EthGetFilterChanges method;
+
+  @BeforeEach
+  public void setUp() {
+    final ExecutionContextTestFixture executionContext = ExecutionContextTestFixture.create();
+    blockchain = executionContext.getBlockchain();
+    transactions =
+        new BaseFeePendingTransactionsSorter(
+            ImmutableTransactionPoolConfiguration.builder().txPoolMaxSize(MAX_TRANSACTIONS).build(),
+            TestClock.fixed(),
+            metricsSystem,
+            blockchain::getChainHeadHeader);
+    final ProtocolContext protocolContext = executionContext.getProtocolContext();
+
+    EthContext ethContext = mock(EthContext.class);
+    EthPeers ethPeers = mock(EthPeers.class);
+    when(ethContext.getEthPeers()).thenReturn(ethPeers);
+
+    transactionPool =
+        new TransactionPool(
+            () -> transactions,
+            executionContext.getProtocolSchedule(),
+            protocolContext,
+            batchAddedListener,
+            ethContext,
+            new MiningParameters.Builder().minTransactionGasPrice(Wei.ZERO).build(),
+            new TransactionPoolMetrics(metricsSystem),
+            TransactionPoolConfiguration.DEFAULT);
+    transactionPool.setEnabled();
+    final BlockchainQueries blockchainQueries =
+        new BlockchainQueries(blockchain, protocolContext.getWorldStateArchive());
+    filterManager =
+        new FilterManagerBuilder()
+            .blockchainQueries(blockchainQueries)
+            .transactionPool(transactionPool)
+            .build();
+
+    method = new EthGetFilterChanges(filterManager);
+  }
+
+  @Test
+  public void shouldReturnErrorResponseIfFilterNotFound() {
+    final JsonRpcRequestContext request = requestWithParams("0");
+
+    final JsonRpcResponse expected = new JsonRpcErrorResponse(null, JsonRpcError.FILTER_NOT_FOUND);
+    final JsonRpcResponse actual = method.response(request);
+
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
+  }
+
+  @Test
+  public void shouldReturnEmptyArrayIfNoNewBlocks() {
+    final String filterId = filterManager.installBlockFilter();
+
+    assertThatFilterExists(filterId);
+
+    final JsonRpcRequestContext request = requestWithParams(String.valueOf(filterId));
+    final JsonRpcSuccessResponse expected =
+        new JsonRpcSuccessResponse(null, Collections.emptyList());
+    final JsonRpcResponse actual = method.response(request);
+
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
+
+    filterManager.uninstallFilter(filterId);
+
+    assertThatFilterDoesNotExist(filterId);
+  }
+
+  @Test
+  public void shouldReturnEmptyArrayIfNoAddedPendingTransactions() {
+    final String filterId = filterManager.installPendingTransactionFilter();
+
+    assertThatFilterExists(filterId);
+
+    final JsonRpcRequestContext request = requestWithParams(String.valueOf(filterId));
+
+    // We haven't added any transactions, so the list of pending transactions should be empty.
+    final JsonRpcSuccessResponse expected =
+        new JsonRpcSuccessResponse(null, Collections.emptyList());
+    final JsonRpcResponse actual = method.response(request);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
+
+    filterManager.uninstallFilter(filterId);
+
+    assertThatFilterDoesNotExist(filterId);
+  }
+
+  @Test
+  public void shouldReturnHashesIfNewBlocks() {
+    final String filterId = filterManager.installBlockFilter();
+
+    assertThatFilterExists(filterId);
+
+    final JsonRpcRequestContext request = requestWithParams(String.valueOf(filterId));
+
+    // We haven't added any blocks, so the list of new blocks should be empty.
+    JsonRpcSuccessResponse expected = new JsonRpcSuccessResponse(null, Collections.emptyList());
+    JsonRpcResponse actual = method.response(request);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
+
+    final Block block = appendBlock(transaction);
+
+    // We've added one block, so there should be one new hash.
+    expected = new JsonRpcSuccessResponse(null, Lists.newArrayList(block.getHash().toString()));
+    actual = method.response(request);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
+
+    // The queue should be flushed and return no results.
+    expected = new JsonRpcSuccessResponse(null, Collections.emptyList());
+    actual = method.response(request);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
+
+    filterManager.uninstallFilter(filterId);
+
+    assertThatFilterDoesNotExist(filterId);
+  }
+
+  @Test
+  public void shouldReturnHashesIfNewPendingTransactions() {
+    final String filterId = filterManager.installPendingTransactionFilter();
+
+    assertThatFilterExists(filterId);
+
+    final JsonRpcRequestContext request = requestWithParams(String.valueOf(filterId));
+
+    // We haven't added any transactions, so the list of pending transactions should be empty.
+    JsonRpcSuccessResponse expected = new JsonRpcSuccessResponse(null, Collections.emptyList());
+    JsonRpcResponse actual = method.response(request);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
+
+    transactions.addRemoteTransaction(transaction, Optional.empty());
+
+    // We've added one transaction, so there should be one new hash.
+    expected =
+        new JsonRpcSuccessResponse(null, Lists.newArrayList(String.valueOf(transaction.getHash())));
+    actual = method.response(request);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
+
+    // The queue should be flushed and return no results.
+    expected = new JsonRpcSuccessResponse(null, Collections.emptyList());
+    actual = method.response(request);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
+
+    filterManager.uninstallFilter(filterId);
+
+    assertThatFilterDoesNotExist(filterId);
+  }
+
+  private void assertThatFilterExists(final String filterId) {
+    assertThat(filterExists(filterId)).isTrue();
+  }
+
+  private void assertThatFilterDoesNotExist(final String filterId) {
+    assertThat(filterExists(filterId)).isFalse();
+  }
+
+  /**
+   * Determines whether a specified filter exists.
+   *
+   * @param filterId The filter ID to check.
+   * @return A boolean - true if the filter exists, false if not.
+   */
+  private boolean filterExists(final String filterId) {
+    final JsonRpcResponse response = method.response(requestWithParams(String.valueOf(filterId)));
+    if (response instanceof JsonRpcSuccessResponse) {
+      return true;
+    } else {
+      assertThat(response).isInstanceOf(JsonRpcErrorResponse.class);
+      assertThat(((JsonRpcErrorResponse) response).getError())
+          .isEqualTo(JsonRpcError.FILTER_NOT_FOUND);
+      return false;
+    }
+  }
+
+  private Block appendBlock(final Transaction... transactionsToAdd) {
+    return appendBlock(Difficulty.ONE, getHeaderForCurrentChainHead(), transactionsToAdd);
+  }
+
+  private BlockHeader getHeaderForCurrentChainHead() {
+    return blockchain.getBlockHeader(blockchain.getChainHeadHash()).get();
+  }
+
+  private Block appendBlock(
+      final Difficulty difficulty,
+      final BlockHeader parentBlock,
+      final Transaction... transactionsToAdd) {
+    final List<Transaction> transactionList = asList(transactionsToAdd);
+    final Block block =
+        new Block(
+            new BlockHeaderTestFixture()
+                .difficulty(difficulty)
+                .parentHash(parentBlock.getHash())
+                .number(parentBlock.getNumber() + 1)
+                .buildHeader(),
+            new BlockBody(transactionList, emptyList()));
+    final List<TransactionReceipt> transactionReceipts =
+        transactionList.stream()
+            .map(transaction -> new TransactionReceipt(1, 1, emptyList(), Optional.empty()))
+            .collect(toList());
+    blockchain.appendBlock(block, transactionReceipts);
+    return block;
+  }
+
+  private Transaction createTransaction(final int transactionNumber) {
+    return Transaction.builder()
+        .type(TransactionType.FRONTIER)
+        .gasLimit(100)
+        .gasPrice(Wei.ZERO)
+        .nonce(0)
+        .payload(Bytes.EMPTY)
+        .to(Address.ID)
+        .value(Wei.of(transactionNumber))
+        .sender(Address.ID)
+        .chainId(BigInteger.ONE)
+        .signAndBuild(keyPair);
+  }
+
+  private JsonRpcRequestContext requestWithParams(final Object... params) {
+    return new JsonRpcRequestContext(new JsonRpcRequest(JSON_RPC_VERSION, ETH_METHOD, params));
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/ApiConfiguration.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/ApiConfiguration.java
index 8aabbe1bf8e..f8b52054d57 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/ApiConfiguration.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/ApiConfiguration.java
@@ -45,5 +45,5 @@ public long getGasPriceMax() {
   @Value.Derived
   public double getGasPriceFraction() {
     return getGasPricePercentile() / 100.0;
-  };
+  }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLContextType.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLContextType.java
new file mode 100644
index 00000000000..f4a693eaa43
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLContextType.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright Hyperledger Besu Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.graphql;
+
+/** Internal GraphQL Context */
+public enum GraphQLContextType {
+  BLOCKCHAIN_QUERIES,
+  PROTOCOL_SCHEDULE,
+  TRANSACTION_POOL,
+  MINING_COORDINATOR,
+  SYNCHRONIZER,
+  IS_ALIVE_HANDLER,
+  CHAIN_ID
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLDataFetchers.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLDataFetchers.java
index fd9e24d6f8b..6009b4bf21d 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLDataFetchers.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLDataFetchers.java
@@ -16,7 +16,11 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter.AccountAdapter;
+import org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter.EmptyAccountAdapter;
 import org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter.LogAdapter;
 import org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter.NormalBlockAdapter;
 import org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter.PendingStateAdapter;
@@ -27,15 +31,10 @@
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.query.LogsQuery;
 import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.LogTopic;
+import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
-import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.eth.EthProtocol;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
@@ -43,9 +42,13 @@
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPException;
 import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.log.LogTopic;
 import org.hyperledger.besu.plugin.data.SyncStatus;
 
+import java.math.BigInteger;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -54,11 +57,15 @@
 import java.util.stream.Collectors;
 
 import com.google.common.base.Preconditions;
+import graphql.GraphQLContext;
 import graphql.schema.DataFetcher;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 
 public class GraphQLDataFetchers {
+
+  private final Integer highestEthVersion;
+
   public GraphQLDataFetchers(final Set<Capability> supportedCapabilities) {
     final OptionalInt version =
         supportedCapabilities.stream()
@@ -68,8 +75,6 @@ public GraphQLDataFetchers(final Set<Capability> supportedCapabilities) {
     highestEthVersion = version.isPresent() ? version.getAsInt() : null;
   }
 
-  private final Integer highestEthVersion;
-
   DataFetcher<Optional<Integer>> getProtocolVersionDataFetcher() {
     return dataFetchingEnvironment -> Optional.of(highestEthVersion);
   }
@@ -78,12 +83,12 @@ DataFetcher<Optional<Bytes32>> getSendRawTransactionDataFetcher() {
     return dataFetchingEnvironment -> {
       try {
         final TransactionPool transactionPool =
-            ((GraphQLDataFetcherContext) dataFetchingEnvironment.getContext()).getTransactionPool();
+            dataFetchingEnvironment.getGraphQlContext().get(GraphQLContextType.TRANSACTION_POOL);
         final Bytes rawTran = dataFetchingEnvironment.getArgument("data");
 
         final Transaction transaction = Transaction.readFrom(RLP.input(rawTran));
         final ValidationResult<TransactionInvalidReason> validationResult =
-            transactionPool.addLocalTransaction(transaction);
+            transactionPool.addTransactionViaApi(transaction);
         if (validationResult.isValid()) {
           return Optional.of(transaction.getHash());
         } else {
@@ -98,7 +103,7 @@ DataFetcher<Optional<Bytes32>> getSendRawTransactionDataFetcher() {
   DataFetcher<Optional<SyncStateAdapter>> getSyncingDataFetcher() {
     return dataFetchingEnvironment -> {
       final Synchronizer synchronizer =
-          ((GraphQLDataFetcherContext) dataFetchingEnvironment.getContext()).getSynchronizer();
+          dataFetchingEnvironment.getGraphQlContext().get(GraphQLContextType.SYNCHRONIZER);
       final Optional<SyncStatus> syncStatus = synchronizer.getSyncStatus();
       return syncStatus.map(SyncStateAdapter::new);
     };
@@ -107,20 +112,37 @@ DataFetcher<Optional<SyncStateAdapter>> getSyncingDataFetcher() {
   DataFetcher<Optional<PendingStateAdapter>> getPendingStateDataFetcher() {
     return dataFetchingEnvironment -> {
       final TransactionPool txPool =
-          ((GraphQLDataFetcherContext) dataFetchingEnvironment.getContext()).getTransactionPool();
+          dataFetchingEnvironment.getGraphQlContext().get(GraphQLContextType.TRANSACTION_POOL);
       return Optional.of(new PendingStateAdapter(txPool.getPendingTransactions()));
     };
   }
 
   DataFetcher<Optional<Wei>> getGasPriceDataFetcher() {
     return dataFetchingEnvironment -> {
-      final GraphQLDataFetcherContext context =
-          (GraphQLDataFetcherContext) dataFetchingEnvironment.getContext();
-      return (context)
-          .getBlockchainQueries()
+      final GraphQLContext graphQLContext = dataFetchingEnvironment.getGraphQlContext();
+      final BlockchainQueries blockchainQueries =
+          graphQLContext.get(GraphQLContextType.BLOCKCHAIN_QUERIES);
+      final MiningCoordinator miningCoordinator =
+          graphQLContext.get(GraphQLContextType.MINING_COORDINATOR);
+      return blockchainQueries
           .gasPrice()
           .map(Wei::of)
-          .or(() -> Optional.of(context.getMiningCoordinator().getMinTransactionGasPrice()));
+          .or(() -> Optional.of(miningCoordinator.getMinTransactionGasPrice()));
+    };
+  }
+
+  public DataFetcher<Optional<BigInteger>> getChainIdDataFetcher() {
+    return dataFetchingEnvironment -> {
+      final GraphQLContext graphQLContext = dataFetchingEnvironment.getGraphQlContext();
+      return graphQLContext.get(GraphQLContextType.CHAIN_ID);
+    };
+  }
+
+  public DataFetcher<Wei> getMaxPriorityFeePerGasDataFetcher() {
+    return dataFetchingEnvironment -> {
+      final BlockchainQueries blockchainQuery =
+          dataFetchingEnvironment.getGraphQlContext().get(GraphQLContextType.BLOCKCHAIN_QUERIES);
+      return blockchainQuery.gasPriorityFee().orElse(Wei.ZERO);
     };
   }
 
@@ -128,7 +150,7 @@ DataFetcher<List<NormalBlockAdapter>> getRangeBlockDataFetcher() {
 
     return dataFetchingEnvironment -> {
       final BlockchainQueries blockchainQuery =
-          ((GraphQLDataFetcherContext) dataFetchingEnvironment.getContext()).getBlockchainQueries();
+          dataFetchingEnvironment.getGraphQlContext().get(GraphQLContextType.BLOCKCHAIN_QUERIES);
 
       final long from = dataFetchingEnvironment.getArgument("from");
       final long to;
@@ -155,7 +177,7 @@ public DataFetcher<Optional<NormalBlockAdapter>> getBlockDataFetcher() {
 
     return dataFetchingEnvironment -> {
       final BlockchainQueries blockchain =
-          ((GraphQLDataFetcherContext) dataFetchingEnvironment.getContext()).getBlockchainQueries();
+          dataFetchingEnvironment.getGraphQlContext().get(GraphQLContextType.BLOCKCHAIN_QUERIES);
       final Long number = dataFetchingEnvironment.getArgument("number");
       final Bytes32 hash = dataFetchingEnvironment.getArgument("hash");
       if ((number != null) && (hash != null)) {
@@ -179,43 +201,50 @@ public DataFetcher<Optional<NormalBlockAdapter>> getBlockDataFetcher() {
   DataFetcher<Optional<AccountAdapter>> getAccountDataFetcher() {
     return dataFetchingEnvironment -> {
       final BlockchainQueries blockchainQuery =
-          ((GraphQLDataFetcherContext) dataFetchingEnvironment.getContext()).getBlockchainQueries();
+          dataFetchingEnvironment.getGraphQlContext().get(GraphQLContextType.BLOCKCHAIN_QUERIES);
       final Address addr = dataFetchingEnvironment.getArgument("address");
       final Long bn = dataFetchingEnvironment.getArgument("blockNumber");
       if (bn != null) {
-        final Optional<MutableWorldState> ws = blockchainQuery.getWorldState(bn);
-        if (ws.isPresent()) {
-          final Account account = ws.get().get(addr);
-          Preconditions.checkArgument(
-              account != null, "Account with address %s does not exist", addr);
-          return Optional.of(new AccountAdapter(account));
-        } else if (bn > blockchainQuery.getBlockchain().getChainHeadBlockNumber()) {
-          // block is past chainhead
-          throw new GraphQLException(GraphQLError.INVALID_PARAMS);
-        } else {
-          // we don't have that block
-          throw new GraphQLException(GraphQLError.CHAIN_HEAD_WORLD_STATE_NOT_AVAILABLE);
-        }
+        return blockchainQuery
+            .getAndMapWorldState(
+                bn,
+                ws -> {
+                  final Account account = ws.get(addr);
+                  if (account == null) {
+                    return Optional.of(new EmptyAccountAdapter(addr));
+                  }
+                  return Optional.of(new AccountAdapter(account));
+                })
+            .or(
+                () -> {
+                  if (bn > blockchainQuery.getBlockchain().getChainHeadBlockNumber()) {
+                    // block is past chainhead
+                    throw new GraphQLException(GraphQLError.INVALID_PARAMS);
+                  } else {
+                    // we don't have that block
+                    throw new GraphQLException(GraphQLError.CHAIN_HEAD_WORLD_STATE_NOT_AVAILABLE);
+                  }
+                });
       } else {
         // return account on latest block
         final long latestBn = blockchainQuery.latestBlock().get().getHeader().getNumber();
-        final Optional<MutableWorldState> ows = blockchainQuery.getWorldState(latestBn);
-        return ows.flatMap(
-                ws -> {
-                  Account account = ws.get(addr);
-                  Preconditions.checkArgument(
-                      account != null, "Account with address %s does not exist", addr);
-                  return Optional.ofNullable(account);
-                })
-            .map(AccountAdapter::new);
+        return blockchainQuery.getAndMapWorldState(
+            latestBn,
+            ws -> {
+              final Account account = ws.get(addr);
+              if (account == null) {
+                return Optional.of(new EmptyAccountAdapter(addr));
+              }
+              return Optional.of(new AccountAdapter(account));
+            });
       }
     };
   }
 
   DataFetcher<Optional<List<LogAdapter>>> getLogsDataFetcher() {
     return dataFetchingEnvironment -> {
-      final GraphQLDataFetcherContext dataFetcherContext = dataFetchingEnvironment.getContext();
-      final BlockchainQueries blockchainQuery = dataFetcherContext.getBlockchainQueries();
+      final BlockchainQueries blockchainQuery =
+          dataFetchingEnvironment.getGraphQlContext().get(GraphQLContextType.BLOCKCHAIN_QUERIES);
 
       final Map<String, Object> filter = dataFetchingEnvironment.getArgument("filter");
 
@@ -234,7 +263,11 @@ DataFetcher<Optional<List<LogAdapter>>> getLogsDataFetcher() {
 
       final List<List<LogTopic>> transformedTopics = new ArrayList<>();
       for (final List<Bytes32> topic : topics) {
-        transformedTopics.add(topic.stream().map(LogTopic::of).collect(Collectors.toList()));
+        if (topic.isEmpty()) {
+          transformedTopics.add(Collections.singletonList(null));
+        } else {
+          transformedTopics.add(topic.stream().map(LogTopic::of).collect(Collectors.toList()));
+        }
       }
 
       final LogsQuery query =
@@ -242,7 +275,10 @@ DataFetcher<Optional<List<LogAdapter>>> getLogsDataFetcher() {
 
       final List<LogWithMetadata> logs =
           blockchainQuery.matchingLogs(
-              fromBlock, toBlock, query, dataFetcherContext.getIsAliveHandler());
+              fromBlock,
+              toBlock,
+              query,
+              dataFetchingEnvironment.getGraphQlContext().get(GraphQLContextType.IS_ALIVE_HANDLER));
       final List<LogAdapter> results = new ArrayList<>();
       for (final LogWithMetadata log : logs) {
         results.add(new LogAdapter(log));
@@ -254,10 +290,15 @@ DataFetcher<Optional<List<LogAdapter>>> getLogsDataFetcher() {
   DataFetcher<Optional<TransactionAdapter>> getTransactionDataFetcher() {
     return dataFetchingEnvironment -> {
       final BlockchainQueries blockchain =
-          ((GraphQLDataFetcherContext) dataFetchingEnvironment.getContext()).getBlockchainQueries();
+          dataFetchingEnvironment.getGraphQlContext().get(GraphQLContextType.BLOCKCHAIN_QUERIES);
       final Bytes32 hash = dataFetchingEnvironment.getArgument("hash");
       final Optional<TransactionWithMetadata> tran = blockchain.transactionByHash(Hash.wrap(hash));
-      return tran.map(TransactionAdapter::new);
+      return tran.map(this::getTransactionAdapter);
     };
   }
+
+  private TransactionAdapter getTransactionAdapter(
+      final TransactionWithMetadata transactionWithMetadata) {
+    return new TransactionAdapter(transactionWithMetadata);
+  }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpService.java
index a06aa401a28..03cf1cb7a31 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpService.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpService.java
@@ -25,7 +25,6 @@
 import org.hyperledger.besu.ethereum.api.graphql.internal.response.GraphQLResponseType;
 import org.hyperledger.besu.ethereum.api.graphql.internal.response.GraphQLSuccessResponse;
 import org.hyperledger.besu.ethereum.api.handlers.IsAliveHandler;
-import org.hyperledger.besu.ethereum.api.handlers.TimeoutHandler;
 import org.hyperledger.besu.ethereum.api.handlers.TimeoutOptions;
 import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
 import org.hyperledger.besu.util.NetworkUtility;
@@ -40,6 +39,8 @@
 import java.util.Optional;
 import java.util.StringJoiner;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.annotations.VisibleForTesting;
@@ -60,16 +61,18 @@
 import io.vertx.core.http.HttpServerResponse;
 import io.vertx.core.json.DecodeException;
 import io.vertx.core.json.Json;
+import io.vertx.core.json.jackson.JacksonCodec;
 import io.vertx.ext.web.Router;
 import io.vertx.ext.web.RoutingContext;
 import io.vertx.ext.web.handler.BodyHandler;
 import io.vertx.ext.web.handler.CorsHandler;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import io.vertx.ext.web.handler.TimeoutHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class GraphQLHttpService {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(GraphQLHttpService.class);
 
   private static final InetSocketAddress EMPTY_SOCKET_ADDRESS = new InetSocketAddress("0.0.0.0", 0);
   private static final String APPLICATION_JSON = "application/json";
@@ -87,7 +90,8 @@ public class GraphQLHttpService {
 
   private final GraphQL graphQL;
 
-  private final GraphQLDataFetcherContext dataFetcherContext;
+  private final Map<GraphQLContextType, Object> graphQlContextMap;
+
   private final EthScheduler scheduler;
 
   /**
@@ -97,7 +101,7 @@ public class GraphQLHttpService {
    * @param dataDir The data directory where requests can be buffered
    * @param config Configuration for the rpc methods being loaded
    * @param graphQL GraphQL engine
-   * @param dataFetcherContext DataFetcherContext required by GraphQL to finish it's job
+   * @param graphQlContextMap GraphQlContext Map
    * @param scheduler {@link EthScheduler} used to trigger timeout on backend queries
    */
   public GraphQLHttpService(
@@ -105,7 +109,7 @@ public GraphQLHttpService(
       final Path dataDir,
       final GraphQLConfiguration config,
       final GraphQL graphQL,
-      final GraphQLDataFetcherContextImpl dataFetcherContext,
+      final Map<GraphQLContextType, Object> graphQlContextMap,
       final EthScheduler scheduler) {
     this.dataDir = dataDir;
 
@@ -113,7 +117,7 @@ public GraphQLHttpService(
     this.config = config;
     this.vertx = vertx;
     this.graphQL = graphQL;
-    this.dataFetcherContext = dataFetcherContext;
+    this.graphQlContextMap = graphQlContextMap;
     this.scheduler = scheduler;
   }
 
@@ -129,7 +133,11 @@ public CompletableFuture<?> start() {
     // Create the HTTP server and a router object.
     httpServer =
         vertx.createHttpServer(
-            new HttpServerOptions().setHost(config.getHost()).setPort(config.getPort()));
+            new HttpServerOptions()
+                .setHost(config.getHost())
+                .setPort(config.getPort())
+                .setHandle100ContinueAutomatically(true)
+                .setCompressionSupported(true));
 
     // Handle graphql http requests
     final Router router = Router.router(vertx);
@@ -148,7 +156,8 @@ public CompletableFuture<?> start() {
         .handler(
             BodyHandler.create()
                 .setUploadsDirectory(dataDir.resolve("uploads").toString())
-                .setDeleteUploadedFilesOnEnd(true));
+                .setDeleteUploadedFilesOnEnd(true)
+                .setPreallocateBodyBuffer(true));
     router.route("/").method(GET).method(POST).handler(this::handleEmptyRequestAndRedirect);
     router
         .route(GRAPH_QL_ROUTE)
@@ -156,8 +165,9 @@ public CompletableFuture<?> start() {
         .method(POST)
         .produces(APPLICATION_JSON)
         .handler(
-            TimeoutHandler.handler(
-                Optional.of(new TimeoutOptions(config.getHttpTimeoutSec())), false))
+            TimeoutHandler.create(
+                TimeUnit.SECONDS.toMillis(config.getHttpTimeoutSec()),
+                TimeoutOptions.DEFAULT_ERROR_CODE))
         .handler(this::handleGraphQLRequest);
 
     final CompletableFuture<?> resultFuture = new CompletableFuture<>();
@@ -208,7 +218,11 @@ private Handler<RoutingContext> checkWhitelistHostHeader() {
   }
 
   private Optional<String> getAndValidateHostHeader(final RoutingContext event) {
-    final Iterable<String> splitHostHeader = Splitter.on(':').split(event.request().host());
+    String hostname =
+        event.request().getHeader(HttpHeaders.HOST) != null
+            ? event.request().getHeader(HttpHeaders.HOST)
+            : event.request().host();
+    final Iterable<String> splitHostHeader = Splitter.on(':').split(hostname);
     final long hostPieces = stream(splitHostHeader).count();
     if (hostPieces > 1) {
       // If the host contains a colon, verify the host is correctly formed - host [ ":" port ]
@@ -281,19 +295,19 @@ private void handleGraphQLRequest(final RoutingContext routingContext) {
       final Map<String, Object> variables;
       final HttpServerRequest request = routingContext.request();
 
-      switch (request.method()) {
-        case GET:
+      switch (request.method().name()) {
+        case "GET":
           final String queryString = request.getParam("query");
           query = Objects.requireNonNullElse(queryString, "");
           operationName = request.getParam("operationName");
           final String variableString = request.getParam("variables");
           if (variableString != null) {
-            variables = Json.decodeValue(variableString, MAP_TYPE);
+            variables = JacksonCodec.decodeValue(variableString, MAP_TYPE);
           } else {
             variables = Collections.emptyMap();
           }
           break;
-        case POST:
+        case "POST":
           final String contentType = request.getHeader(HttpHeaders.CONTENT_TYPE);
           if (contentType != null && MediaType.parse(contentType).is(MEDIA_TYPE_JUST_JSON)) {
             final String requestBody = routingContext.getBodyAsString().trim();
@@ -383,14 +397,17 @@ private String serialise(final GraphQLResponse response) {
 
   private GraphQLResponse process(
       final String requestJson, final String operationName, final Map<String, Object> variables) {
+    Map<GraphQLContextType, Object> contextMap = new ConcurrentHashMap<>();
+    contextMap.putAll(graphQlContextMap);
+    contextMap.put(
+        GraphQLContextType.IS_ALIVE_HANDLER,
+        new IsAliveHandler(scheduler, config.getHttpTimeoutSec()));
     final ExecutionInput executionInput =
         ExecutionInput.newExecutionInput()
             .query(requestJson)
             .operationName(operationName)
             .variables(variables)
-            .context(
-                new GraphQLDataFetcherContextImpl(
-                    dataFetcherContext, new IsAliveHandler(scheduler, config.getHttpTimeoutSec())))
+            .graphQLContext(contextMap)
             .build();
     final ExecutionResult result = graphQL.execute(executionInput);
     final Map<String, Object> toSpecificationResult = result.toSpecification();
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLProvider.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLProvider.java
index d66a071b96f..7e62e39c057 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLProvider.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLProvider.java
@@ -74,8 +74,11 @@ private static RuntimeWiring buildWiring(final GraphQLDataFetchers graphQLDataFe
                 .dataFetcher("gasPrice", graphQLDataFetchers.getGasPriceDataFetcher())
                 .dataFetcher("syncing", graphQLDataFetchers.getSyncingDataFetcher())
                 .dataFetcher("pending", graphQLDataFetchers.getPendingStateDataFetcher())
+                .dataFetcher("protocolVersion", graphQLDataFetchers.getProtocolVersionDataFetcher())
+                .dataFetcher("chainID", graphQLDataFetchers.getChainIdDataFetcher())
                 .dataFetcher(
-                    "protocolVersion", graphQLDataFetchers.getProtocolVersionDataFetcher()))
+                    "maxPriorityFeePerGas",
+                    graphQLDataFetchers.getMaxPriorityFeePerGasDataFetcher()))
         .type(
             TypeRuntimeWiring.newTypeWiring("Mutation")
                 .dataFetcher(
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/Scalars.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/Scalars.java
index e47d32b0e8e..45f9ffb6fce 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/Scalars.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/Scalars.java
@@ -14,12 +14,16 @@
  */
 package org.hyperledger.besu.ethereum.api.graphql.internal;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
 
+import java.util.Locale;
+
+import graphql.GraphQLContext;
+import graphql.execution.CoercedVariables;
 import graphql.language.IntValue;
 import graphql.language.StringValue;
+import graphql.language.Value;
 import graphql.schema.Coercing;
 import graphql.schema.CoercingParseLiteralException;
 import graphql.schema.CoercingParseValueException;
@@ -28,177 +32,299 @@
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.units.bigints.UInt256;
-import org.apache.tuweni.units.bigints.UInt256Value;
 
 public class Scalars {
 
-  private static final Coercing<Object, Object> ADDRESS_COERCING =
-      new Coercing<Object, Object>() {
-        @Override
-        public String serialize(final Object input) throws CoercingSerializeException {
-          if (input instanceof Address) {
-            return input.toString();
+  private Scalars() {}
+
+  private static final Coercing<Address, String> ADDRESS_COERCING =
+      new Coercing<Address, String>() {
+        Address convertImpl(final Object input) {
+          if (input instanceof Address address) {
+            return address;
+          } else if (input instanceof Bytes bytes) {
+            if (((Bytes) input).size() <= 20) {
+              return Address.wrap(bytes);
+            } else {
+              return null;
+            }
+          } else if (input instanceof StringValue stringValue) {
+            return convertImpl(stringValue.getValue());
+          } else if (input instanceof String string) {
+            try {
+              return Address.fromHexStringStrict(string);
+            } catch (IllegalArgumentException iae) {
+              return null;
+            }
+          } else {
+            return null;
           }
-          throw new CoercingSerializeException("Unable to serialize " + input + " as an Address");
         }
 
         @Override
-        public String parseValue(final Object input) throws CoercingParseValueException {
-          if (input instanceof Address) {
-            return input.toString();
+        public String serialize(
+            final Object input, final GraphQLContext graphQLContext, final Locale locale)
+            throws CoercingSerializeException {
+          Address result = convertImpl(input);
+          if (result != null) {
+            return result.toHexString();
+          } else {
+            throw new CoercingSerializeException("Unable to serialize " + input + " as an Address");
           }
-          throw new CoercingParseValueException(
-              "Unable to parse variable value " + input + " as an Address");
         }
 
         @Override
-        public Address parseLiteral(final Object input) throws CoercingParseLiteralException {
-          if (!(input instanceof StringValue)) {
-            throw new CoercingParseLiteralException("Value is not any Address : '" + input + "'");
+        public Address parseValue(
+            final Object input, final GraphQLContext graphQLContext, final Locale locale)
+            throws CoercingParseValueException {
+          Address result = convertImpl(input);
+          if (result != null) {
+            return result;
+          } else {
+            throw new CoercingParseValueException(
+                "Unable to parse variable value " + input + " as an Address");
           }
-          String inputValue = ((StringValue) input).getValue();
-          try {
-            return Address.fromHexStringStrict(inputValue);
-          } catch (final IllegalArgumentException e) {
+        }
+
+        @Override
+        public Address parseLiteral(
+            final Value<?> input,
+            final CoercedVariables variables,
+            final GraphQLContext graphQLContext,
+            final Locale locale)
+            throws CoercingParseLiteralException {
+          Address result = convertImpl(input);
+          if (result != null) {
+            return result;
+          } else {
             throw new CoercingParseLiteralException("Value is not any Address : '" + input + "'");
           }
         }
       };
 
-  private static final Coercing<Object, Object> BIG_INT_COERCING =
-      new Coercing<Object, Object>() {
+  private static final Coercing<String, String> BIG_INT_COERCING =
+      new Coercing<String, String>() {
+
+        String convertImpl(final Object input) {
+          if (input instanceof String string) {
+            try {
+              return Bytes.fromHexStringLenient(string).toShortHexString();
+            } catch (IllegalArgumentException iae) {
+              return null;
+            }
+          } else if (input instanceof Bytes bytes) {
+            return bytes.toShortHexString();
+          } else if (input instanceof StringValue stringValue) {
+            return convertImpl(stringValue.getValue());
+          } else if (input instanceof IntValue intValue) {
+            return UInt256.valueOf(intValue.getValue()).toShortHexString();
+          } else {
+            return null;
+          }
+        }
+
         @Override
-        public String serialize(final Object input) throws CoercingSerializeException {
-          if (input instanceof UInt256Value) {
-            return ((UInt256Value) input).toShortHexString();
+        public String serialize(
+            final Object input, final GraphQLContext graphQLContext, final Locale locale)
+            throws CoercingSerializeException {
+          var result = convertImpl(input);
+          if (result != null) {
+            return result;
+          } else {
+            throw new CoercingSerializeException("Unable to serialize " + input + " as an BigInt");
           }
-          throw new CoercingSerializeException("Unable to serialize " + input + " as an BigInt");
         }
 
         @Override
-        public String parseValue(final Object input) throws CoercingParseValueException {
-          if (input instanceof UInt256Value) {
-            return ((UInt256Value) input).toShortHexString();
+        public String parseValue(
+            final Object input, final GraphQLContext graphQLContext, final Locale locale)
+            throws CoercingParseValueException {
+          var result = convertImpl(input);
+          if (result != null) {
+            return result;
+          } else {
+            throw new CoercingParseValueException(
+                "Unable to parse variable value " + input + " as an BigInt");
           }
-          throw new CoercingParseValueException(
-              "Unable to parse variable value " + input + " as an BigInt");
         }
 
         @Override
-        public UInt256 parseLiteral(final Object input) throws CoercingParseLiteralException {
-          try {
-            if (input instanceof StringValue) {
-              return UInt256.fromHexString(((StringValue) input).getValue());
-            } else if (input instanceof IntValue) {
-              return UInt256.valueOf(((IntValue) input).getValue());
-            }
-          } catch (final IllegalArgumentException e) {
-            // fall through
+        public String parseLiteral(
+            final Value<?> input,
+            final CoercedVariables variables,
+            final GraphQLContext graphQLContext,
+            final Locale locale)
+            throws CoercingParseLiteralException {
+          var result = convertImpl(input);
+          if (result != null) {
+            return result;
+          } else {
+            throw new CoercingParseLiteralException("Value is not any BigInt : '" + input + "'");
           }
-          throw new CoercingParseLiteralException("Value is not any BigInt : '" + input + "'");
         }
       };
 
-  private static final Coercing<Object, Object> BYTES_COERCING =
-      new Coercing<Object, Object>() {
-        @Override
-        public String serialize(final Object input) throws CoercingSerializeException {
-          if (input instanceof Bytes) {
-            return input.toString();
+  private static final Coercing<Bytes, String> BYTES_COERCING =
+      new Coercing<Bytes, String>() {
+
+        Bytes convertImpl(final Object input) {
+          if (input instanceof Bytes bytes) {
+            return bytes;
+          } else if (input instanceof StringValue stringValue) {
+            return convertImpl(stringValue.getValue());
+          } else if (input instanceof String string) {
+            if (!Quantity.isValid(string)) {
+              throw new CoercingParseLiteralException(
+                  "Bytes value '" + input + "' is not prefixed with 0x");
+            }
+            try {
+              return Bytes.fromHexStringLenient((String) input);
+            } catch (IllegalArgumentException iae) {
+              return null;
+            }
+          } else {
+            return null;
           }
-          throw new CoercingSerializeException("Unable to serialize " + input + " as an Bytes");
         }
 
         @Override
-        public String parseValue(final Object input) throws CoercingParseValueException {
-          if (input instanceof Bytes) {
-            return input.toString();
+        public String serialize(
+            final Object input, final GraphQLContext graphQLContext, final Locale locale)
+            throws CoercingSerializeException {
+          var result = convertImpl(input);
+          if (result != null) {
+            return result.toHexString();
+          } else {
+            throw new CoercingSerializeException("Unable to serialize " + input + " as an Bytes");
           }
-          throw new CoercingParseValueException(
-              "Unable to parse variable value " + input + " as an Bytes");
         }
 
         @Override
-        public Bytes parseLiteral(final Object input) throws CoercingParseLiteralException {
-          if (!(input instanceof StringValue)) {
-            throw new CoercingParseLiteralException("Value is not any Bytes : '" + input + "'");
+        public Bytes parseValue(
+            final Object input, final GraphQLContext graphQLContext, final Locale locale)
+            throws CoercingParseValueException {
+          var result = convertImpl(input);
+          if (result != null) {
+            return result;
+          } else {
+            throw new CoercingParseValueException(
+                "Unable to parse variable value " + input + " as an Bytes");
           }
-          String inputValue = ((StringValue) input).getValue();
-          if (!Quantity.isValid(inputValue)) {
-            throw new CoercingParseLiteralException(
-                "Bytes value '" + inputValue + "' is not prefixed with 0x");
-          }
-          try {
-            return Bytes.fromHexStringLenient(inputValue);
-          } catch (final IllegalArgumentException e) {
+        }
+
+        @Override
+        public Bytes parseLiteral(
+            final Value<?> input,
+            final CoercedVariables variables,
+            final GraphQLContext graphQLContext,
+            final Locale locale)
+            throws CoercingParseLiteralException {
+          var result = convertImpl(input);
+          if (result != null) {
+            return result;
+          } else {
             throw new CoercingParseLiteralException("Value is not any Bytes : '" + input + "'");
           }
         }
       };
 
-  private static final Coercing<Object, Object> BYTES32_COERCING =
-      new Coercing<Object, Object>() {
-        @Override
-        public String serialize(final Object input) throws CoercingSerializeException {
-          if (input instanceof Hash) {
-            return ((Hash) input).toString();
-          }
-          if (input instanceof Bytes32) {
-            return input.toString();
+  private static final Coercing<Bytes32, String> BYTES32_COERCING =
+      new Coercing<Bytes32, String>() {
+
+        Bytes32 convertImpl(final Object input) {
+          if (input instanceof Bytes32 bytes32) {
+            return bytes32;
+          } else if (input instanceof Bytes bytes) {
+            if (bytes.size() <= 32) {
+              return Bytes32.leftPad((Bytes) input);
+            } else {
+              return null;
+            }
+          } else if (input instanceof StringValue stringValue) {
+            return convertImpl(stringValue.getValue());
+          } else if (input instanceof String string) {
+            if (!Quantity.isValid(string)) {
+              throw new CoercingParseLiteralException(
+                  "Bytes32 value '" + input + "' is not prefixed with 0x");
+            } else {
+              try {
+                return Bytes32.fromHexStringLenient((String) input);
+              } catch (IllegalArgumentException iae) {
+                return null;
+              }
+            }
+          } else {
+            return null;
           }
-          throw new CoercingSerializeException("Unable to serialize " + input + " as an Bytes32");
         }
 
         @Override
-        public String parseValue(final Object input) throws CoercingParseValueException {
-          if (input instanceof Bytes32) {
-            return input.toString();
+        public String serialize(
+            final Object input, final GraphQLContext graphQLContext, final Locale locale)
+            throws CoercingSerializeException {
+          var result = convertImpl(input);
+          if (result == null) {
+            throw new CoercingSerializeException("Unable to serialize " + input + " as an Bytes32");
+          } else {
+            return result.toHexString();
           }
-          throw new CoercingParseValueException(
-              "Unable to parse variable value " + input + " as an Bytes32");
         }
 
         @Override
-        public Bytes32 parseLiteral(final Object input) throws CoercingParseLiteralException {
-          if (!(input instanceof StringValue)) {
-            throw new CoercingParseLiteralException("Value is not any Bytes32 : '" + input + "'");
-          }
-          String inputValue = ((StringValue) input).getValue();
-          if (!Quantity.isValid(inputValue)) {
-            throw new CoercingParseLiteralException(
-                "Bytes32 value '" + inputValue + "' is not prefixed with 0x");
+        public Bytes32 parseValue(
+            final Object input, final GraphQLContext graphQLContext, final Locale locale)
+            throws CoercingParseValueException {
+          var result = convertImpl(input);
+          if (result == null) {
+            throw new CoercingParseValueException(
+                "Unable to parse variable value " + input + " as an Bytes32");
+          } else {
+            return result;
           }
-          try {
-            return Bytes32.fromHexStringLenient(inputValue);
-          } catch (final IllegalArgumentException e) {
+        }
+
+        @Override
+        public Bytes32 parseLiteral(
+            final Value<?> input,
+            final CoercedVariables variables,
+            final GraphQLContext graphQLContext,
+            final Locale locale)
+            throws CoercingParseLiteralException {
+          var result = convertImpl(input);
+          if (result == null) {
             throw new CoercingParseLiteralException("Value is not any Bytes32 : '" + input + "'");
+          } else {
+            return result;
           }
         }
       };
 
-  private static final Coercing<Object, Object> LONG_COERCING =
-      new Coercing<Object, Object>() {
+  private static final Coercing<Number, String> LONG_COERCING =
+      new Coercing<>() {
         @Override
-        public Number serialize(final Object input) throws CoercingSerializeException {
-          if (input instanceof Number) {
-            return (Number) input;
-          } else if (input instanceof String) {
-            final String value = ((String) input).toLowerCase();
-            if (value.startsWith("0x")) {
-              return Bytes.fromHexStringLenient(value).toLong();
+        public String serialize(
+            final Object input, final GraphQLContext graphQLContext, final Locale locale)
+            throws CoercingSerializeException {
+          if (input instanceof Number number) {
+            return Bytes.ofUnsignedLong(number.longValue()).toQuantityHexString();
+          } else if (input instanceof String string) {
+            if (string.startsWith("0x")) {
+              return string;
             } else {
-              return Long.parseLong(value);
+              return "0x" + string;
             }
           }
           throw new CoercingSerializeException("Unable to serialize " + input + " as an Long");
         }
 
         @Override
-        public Number parseValue(final Object input) throws CoercingParseValueException {
-          if (input instanceof Number) {
-            return (Number) input;
-          } else if (input instanceof String) {
-            final String value = ((String) input).toLowerCase();
+        public Number parseValue(
+            final Object input, final GraphQLContext graphQLContext, final Locale locale)
+            throws CoercingParseValueException {
+          if (input instanceof Number number) {
+            return number;
+          } else if (input instanceof String string) {
+            final String value = string.toLowerCase();
             if (value.startsWith("0x")) {
               return Bytes.fromHexStringLenient(value).toLong();
             } else {
@@ -210,12 +336,17 @@ public Number parseValue(final Object input) throws CoercingParseValueException
         }
 
         @Override
-        public Object parseLiteral(final Object input) throws CoercingParseLiteralException {
+        public Number parseLiteral(
+            final Value<?> input,
+            final CoercedVariables variables,
+            final GraphQLContext graphQLContext,
+            final Locale locale)
+            throws CoercingParseLiteralException {
           try {
-            if (input instanceof IntValue) {
-              return ((IntValue) input).getValue().longValue();
-            } else if (input instanceof StringValue) {
-              final String value = ((StringValue) input).getValue().toLowerCase();
+            if (input instanceof IntValue intValue) {
+              return intValue.getValue().longValue();
+            } else if (input instanceof StringValue stringValue) {
+              final String value = stringValue.getValue().toLowerCase();
               if (value.startsWith("0x")) {
                 return Bytes.fromHexStringLenient(value).toLong();
               } else {
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/AccessListEntryAdapter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/AccessListEntryAdapter.java
new file mode 100644
index 00000000000..585658ed826
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/AccessListEntryAdapter.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.evm.AccessListEntry;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes32;
+
+@SuppressWarnings("unused") // reflected by GraphQL
+public class AccessListEntryAdapter extends AdapterBase {
+  private final AccessListEntry accessListEntry;
+
+  public AccessListEntryAdapter(final AccessListEntry accessListEntry) {
+    this.accessListEntry = accessListEntry;
+  }
+
+  public List<Bytes32> getStorageKeys() {
+    final var storage = accessListEntry.getStorageKeys();
+    return new ArrayList<>(storage);
+  }
+
+  public Optional<Address> getAddress() {
+    return Optional.of(accessListEntry.getAddress());
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/AccountAdapter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/AccountAdapter.java
index ec1e0937404..f9098089e42 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/AccountAdapter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/AccountAdapter.java
@@ -14,9 +14,12 @@
  */
 package org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter;
 
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.bonsai.BonsaiAccount;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.account.AccountState;
 
 import java.util.Optional;
 
@@ -27,30 +30,70 @@
 
 @SuppressWarnings("unused") // reflected by GraphQL
 public class AccountAdapter extends AdapterBase {
-  private final Account account;
+
+  private final Optional<Account> account;
+  private final Address address;
+  private final Optional<Long> blockNumber;
 
   public AccountAdapter(final Account account) {
-    this.account = account;
+    this(account == null ? null : account.getAddress(), account, Optional.empty());
+  }
+
+  public AccountAdapter(final Account account, final Optional<Long> blockNumber) {
+    this(account == null ? null : account.getAddress(), account, blockNumber);
+  }
+
+  public AccountAdapter(final Address address, final Account account) {
+    this(address, account, Optional.empty());
   }
 
-  public Optional<Address> getAddress() {
-    return Optional.of(account.getAddress());
+  public AccountAdapter(
+      final Address address, final Account account, final Optional<Long> blockNumber) {
+    this.account = Optional.ofNullable(account);
+    this.address = address;
+    this.blockNumber = blockNumber;
   }
 
-  public Optional<Wei> getBalance() {
-    return Optional.of(account.getBalance());
+  public Address getAddress() {
+    return address;
   }
 
-  public Optional<Long> getTransactionCount() {
-    return Optional.of(account.getNonce());
+  public Wei getBalance() {
+    return account.map(AccountState::getBalance).orElse(Wei.ZERO);
   }
 
-  public Optional<Bytes> getCode() {
-    return Optional.of(account.getCode());
+  public Long getTransactionCount() {
+    return account.map(AccountState::getNonce).orElse(0L);
   }
 
-  public Optional<Bytes32> getStorage(final DataFetchingEnvironment environment) {
+  public Bytes getCode(final DataFetchingEnvironment environment) {
+
+    if (account.get() instanceof BonsaiAccount) {
+      final BlockchainQueries query = getBlockchainQueries(environment);
+      return query
+          .getAndMapWorldState(
+              blockNumber.orElse(query.headBlockNumber()),
+              ws -> Optional.of(ws.get(account.get().getAddress()).getCode()))
+          .get();
+    } else {
+      return account.map(AccountState::getCode).orElse(Bytes.EMPTY);
+    }
+  }
+
+  public Bytes32 getStorage(final DataFetchingEnvironment environment) {
+    final BlockchainQueries query = getBlockchainQueries(environment);
     final Bytes32 slot = environment.getArgument("slot");
-    return Optional.of(account.getStorageValue(UInt256.fromBytes(slot)).toBytes());
+
+    if (account.get() instanceof BonsaiAccount) {
+      return query
+          .getAndMapWorldState(
+              blockNumber.orElse(query.headBlockNumber()),
+              ws -> Optional.of((Bytes32) ws.get(address).getStorageValue(UInt256.fromBytes(slot))))
+          .get();
+    } else {
+      return account
+          .map(a -> (Bytes32) a.getStorageValue(UInt256.fromBytes(slot)))
+          .orElse(Bytes32.ZERO);
+    }
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/AdapterBase.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/AdapterBase.java
index 6d256d62b37..d658f2a1bac 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/AdapterBase.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/AdapterBase.java
@@ -14,13 +14,13 @@
  */
 package org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter;
 
-import org.hyperledger.besu.ethereum.api.graphql.GraphQLDataFetcherContext;
+import org.hyperledger.besu.ethereum.api.graphql.GraphQLContextType;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 
 import graphql.schema.DataFetchingEnvironment;
 
 abstract class AdapterBase {
   BlockchainQueries getBlockchainQueries(final DataFetchingEnvironment environment) {
-    return ((GraphQLDataFetcherContext) environment.getContext()).getBlockchainQueries();
+    return environment.getGraphQlContext().get(GraphQLContextType.BLOCKCHAIN_QUERIES);
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/BlockAdapterBase.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/BlockAdapterBase.java
index 35cb29fad2c..4d10aa53a8c 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/BlockAdapterBase.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/BlockAdapterBase.java
@@ -14,31 +14,32 @@
  */
 package org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter;
 
-import org.hyperledger.besu.ethereum.api.graphql.GraphQLDataFetcherContext;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.api.graphql.GraphQLContextType;
 import org.hyperledger.besu.ethereum.api.query.BlockWithMetadata;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.query.LogsQuery;
 import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.LogTopic;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldState;
+import org.hyperledger.besu.ethereum.mainnet.ImmutableTransactionValidationParams;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.transaction.CallParameter;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
-import org.hyperledger.besu.ethereum.transaction.TransactionSimulatorResult;
-import org.hyperledger.besu.ethereum.vm.OperationTracer;
+import org.hyperledger.besu.evm.log.LogTopic;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.stream.Collectors;
+import java.util.function.Function;
 
 import com.google.common.primitives.Longs;
 import graphql.schema.DataFetchingEnvironment;
@@ -63,29 +64,29 @@ public Optional<NormalBlockAdapter> getParent(final DataFetchingEnvironment envi
     return block.map(NormalBlockAdapter::new);
   }
 
-  public Optional<Bytes32> getHash() {
-    return Optional.of(header.getHash());
+  public Bytes32 getHash() {
+    return header.getHash();
   }
 
-  public Optional<Bytes> getNonce() {
+  public Bytes getNonce() {
     final long nonce = header.getNonce();
     final byte[] bytes = Longs.toByteArray(nonce);
-    return Optional.of(Bytes.wrap(bytes));
+    return Bytes.wrap(bytes);
   }
 
-  public Optional<Bytes32> getTransactionsRoot() {
-    return Optional.of(header.getTransactionsRoot());
+  public Bytes32 getTransactionsRoot() {
+    return header.getTransactionsRoot();
   }
 
-  public Optional<Bytes32> getStateRoot() {
-    return Optional.of(header.getStateRoot());
+  public Bytes32 getStateRoot() {
+    return header.getStateRoot();
   }
 
-  public Optional<Bytes32> getReceiptsRoot() {
-    return Optional.of(header.getReceiptsRoot());
+  public Bytes32 getReceiptsRoot() {
+    return header.getReceiptsRoot();
   }
 
-  public Optional<AdapterBase> getMiner(final DataFetchingEnvironment environment) {
+  public AdapterBase getMiner(final DataFetchingEnvironment environment) {
 
     final BlockchainQueries query = getBlockchainQueries(environment);
     long blockNumber = header.getNumber();
@@ -94,59 +95,60 @@ public Optional<AdapterBase> getMiner(final DataFetchingEnvironment environment)
       blockNumber = bn;
     }
 
-    return Optional.ofNullable(query.getWorldState(blockNumber).get().get(header.getCoinbase()))
+    return query
+        .getAndMapWorldState(blockNumber, ws -> Optional.ofNullable(ws.get(header.getCoinbase())))
         .map(account -> (AdapterBase) new AccountAdapter(account))
-        .or(() -> Optional.of(new EmptyAccountAdapter(header.getCoinbase())));
+        .orElseGet(() -> new EmptyAccountAdapter(header.getCoinbase()));
   }
 
-  public Optional<Bytes> getExtraData() {
-    return Optional.of(header.getExtraData());
+  public Bytes getExtraData() {
+    return header.getExtraData();
   }
 
-  public Optional<Long> getGasLimit() {
-    return Optional.of(header.getGasLimit());
+  public Optional<Wei> getBaseFeePerGas() {
+    return header.getBaseFee();
   }
 
-  public Optional<Long> getGasUsed() {
-    return Optional.of(header.getGasUsed());
+  public Long getGasLimit() {
+    return header.getGasLimit();
   }
 
-  public Optional<UInt256> getTimestamp() {
-    return Optional.of(UInt256.valueOf(header.getTimestamp()));
+  public Long getGasUsed() {
+    return header.getGasUsed();
   }
 
-  public Optional<Bytes> getLogsBloom() {
-    return Optional.of(header.getLogsBloom());
+  public Long getTimestamp() {
+    return header.getTimestamp();
   }
 
-  public Optional<Bytes32> getMixHash() {
-    return Optional.of(header.getMixHash());
+  public Bytes getLogsBloom() {
+    return header.getLogsBloom();
   }
 
-  public Optional<Difficulty> getDifficulty() {
-    return Optional.of(header.getDifficulty());
+  public Bytes32 getMixHash() {
+    return header.getMixHash();
   }
 
-  public Optional<Bytes32> getOmmerHash() {
-    return Optional.of(header.getOmmersHash());
+  public Difficulty getDifficulty() {
+    return header.getDifficulty();
   }
 
-  public Optional<Long> getNumber() {
-    final long bn = header.getNumber();
-    return Optional.of(bn);
+  public Bytes32 getOmmerHash() {
+    return header.getOmmersHash();
   }
 
-  public Optional<AccountAdapter> getAccount(final DataFetchingEnvironment environment) {
+  public Long getNumber() {
+    return header.getNumber();
+  }
 
+  public AccountAdapter getAccount(final DataFetchingEnvironment environment) {
     final BlockchainQueries query = getBlockchainQueries(environment);
     final long bn = header.getNumber();
-    final WorldState ws = query.getWorldState(bn).get();
-
-    if (ws != null) {
-      final Address addr = environment.getArgument("address");
-      return Optional.of(new AccountAdapter(ws.get(addr)));
-    }
-    return Optional.empty();
+    final Address address = environment.getArgument("address");
+    return query
+        .getAndMapWorldState(
+            bn, ws -> Optional.of(new AccountAdapter(ws.get(address), Optional.of(bn))))
+        .get();
   }
 
   public List<LogAdapter> getLogs(final DataFetchingEnvironment environment) {
@@ -154,16 +156,20 @@ public List<LogAdapter> getLogs(final DataFetchingEnvironment environment) {
     final Map<String, Object> filter = environment.getArgument("filter");
 
     @SuppressWarnings("unchecked")
-    final List<Address> addrs = (List<Address>) filter.get("addresses");
+    final List<Address> addresses = (List<Address>) filter.get("addresses");
     @SuppressWarnings("unchecked")
     final List<List<Bytes32>> topics = (List<List<Bytes32>>) filter.get("topics");
 
     final List<List<LogTopic>> transformedTopics = new ArrayList<>();
     for (final List<Bytes32> topic : topics) {
-      transformedTopics.add(topic.stream().map(LogTopic::of).collect(Collectors.toList()));
+      if (topic.isEmpty()) {
+        transformedTopics.add(Collections.singletonList(null));
+      } else {
+        transformedTopics.add(topic.stream().map(LogTopic::of).toList());
+      }
     }
     final LogsQuery query =
-        new LogsQuery.Builder().addresses(addrs).topics(transformedTopics).build();
+        new LogsQuery.Builder().addresses(addresses).topics(transformedTopics).build();
 
     final BlockchainQueries blockchain = getBlockchainQueries(environment);
 
@@ -176,9 +182,9 @@ public List<LogAdapter> getLogs(final DataFetchingEnvironment environment) {
     return results;
   }
 
-  public Optional<Long> getEstimateGas(final DataFetchingEnvironment environment) {
+  public Long getEstimateGas(final DataFetchingEnvironment environment) {
     final Optional<CallResult> result = executeCall(environment);
-    return result.map(CallResult::getGasUsed);
+    return result.map(CallResult::getGasUsed).orElse(0L);
   }
 
   public Optional<CallResult> getCall(final DataFetchingEnvironment environment) {
@@ -193,10 +199,14 @@ private Optional<CallResult> executeCall(final DataFetchingEnvironment environme
     final UInt256 gasPrice = (UInt256) callData.get("gasPrice");
     final UInt256 value = (UInt256) callData.get("value");
     final Bytes data = (Bytes) callData.get("data");
+    final Optional<Wei> maxFeePerGas =
+        Optional.ofNullable((UInt256) callData.get("maxFeePerGas")).map(Wei::of);
+    final Optional<Wei> maxPriorityFeePerGas =
+        Optional.ofNullable((UInt256) callData.get("maxPriorityFeePerGas")).map(Wei::of);
 
     final BlockchainQueries query = getBlockchainQueries(environment);
     final ProtocolSchedule protocolSchedule =
-        ((GraphQLDataFetcherContext) environment.getContext()).getProtocolSchedule();
+        environment.getGraphQlContext().get(GraphQLContextType.PROTOCOL_SCHEDULE);
     final long bn = header.getNumber();
 
     final TransactionSimulator transactionSimulator =
@@ -216,24 +226,71 @@ private Optional<CallResult> executeCall(final DataFetchingEnvironment environme
       valueParam = Wei.of(value);
     }
     final CallParameter param =
-        new CallParameter(from, to, gasParam, gasPriceParam, valueParam, data);
-
-    final Optional<TransactionSimulatorResult> opt =
-        transactionSimulator.process(
-            param,
-            TransactionValidationParams.transactionSimulator(),
-            OperationTracer.NO_TRACING,
-            bn);
-    if (opt.isPresent()) {
-      final TransactionSimulatorResult result = opt.get();
-      long status = 0;
-      if (result.isSuccessful()) {
-        status = 1;
-      }
-      final CallResult callResult =
-          new CallResult(status, result.getGasEstimate(), result.getOutput());
-      return Optional.of(callResult);
-    }
-    return Optional.empty();
+        new CallParameter(
+            from,
+            to,
+            gasParam,
+            gasPriceParam,
+            maxPriorityFeePerGas,
+            maxFeePerGas,
+            valueParam,
+            data,
+            Optional.empty());
+
+    ImmutableTransactionValidationParams.Builder transactionValidationParams =
+        ImmutableTransactionValidationParams.builder()
+            .from(TransactionValidationParams.transactionSimulator());
+    transactionValidationParams.isAllowExceedingBalance(true);
+
+    return transactionSimulator.process(
+        param,
+        transactionValidationParams.build(),
+        OperationTracer.NO_TRACING,
+        (mutableWorldState, transactionSimulatorResult) ->
+            transactionSimulatorResult.map(
+                result -> {
+                  long status = 0;
+                  if (result.isSuccessful()) {
+                    status = 1;
+                  }
+                  return new CallResult(status, result.getGasEstimate(), result.getOutput());
+                }),
+        header);
+  }
+
+  Bytes getRawHeader() {
+    final BytesValueRLPOutput rlpOutput = new BytesValueRLPOutput();
+    header.writeTo(rlpOutput);
+    return rlpOutput.encoded();
+  }
+
+  Bytes getRaw(final DataFetchingEnvironment environment) {
+    final BlockchainQueries query = getBlockchainQueries(environment);
+    return query
+        .getBlockchain()
+        .getBlockBody(header.getBlockHash())
+        .map(
+            blockBody -> {
+              final BytesValueRLPOutput rlpOutput = new BytesValueRLPOutput();
+              blockBody.writeWrappedBodyTo(rlpOutput);
+              return rlpOutput.encoded();
+            })
+        .orElse(Bytes.EMPTY);
+  }
+
+  Optional<Bytes32> getWithdrawalsRoot() {
+    return header.getWithdrawalsRoot().map(Function.identity());
+  }
+
+  Optional<List<WithdrawalAdapter>> getWithdrawals(final DataFetchingEnvironment environment) {
+    final BlockchainQueries query = getBlockchainQueries(environment);
+    return query
+        .getBlockchain()
+        .getBlockBody(header.getBlockHash())
+        .flatMap(
+            blockBody ->
+                blockBody
+                    .getWithdrawals()
+                    .map(wl -> wl.stream().map(WithdrawalAdapter::new).toList()));
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/EmptyAccountAdapter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/EmptyAccountAdapter.java
index 92e31efae34..4c19b997b6e 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/EmptyAccountAdapter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/EmptyAccountAdapter.java
@@ -14,40 +14,43 @@
  */
 package org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Wei;
-
-import java.util.Optional;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 
 import graphql.schema.DataFetchingEnvironment;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 
-@SuppressWarnings("unused") // reflected by GraphQL
-public class EmptyAccountAdapter extends AdapterBase {
+public class EmptyAccountAdapter extends AccountAdapter {
   private final Address address;
 
   public EmptyAccountAdapter(final Address address) {
+    super(null);
     this.address = address;
   }
 
-  public Optional<Address> getAddress() {
-    return Optional.of(address);
+  @Override
+  public Address getAddress() {
+    return address;
   }
 
-  public Optional<Wei> getBalance() {
-    return Optional.of(Wei.ZERO);
+  @Override
+  public Wei getBalance() {
+    return Wei.ZERO;
   }
 
-  public Optional<Long> getTransactionCount() {
-    return Optional.of(0L);
+  @Override
+  public Long getTransactionCount() {
+    return 0L;
   }
 
-  public Optional<Bytes> getCode() {
-    return Optional.of(Bytes.EMPTY);
+  @Override
+  public Bytes getCode(final DataFetchingEnvironment environment) {
+    return Bytes.EMPTY;
   }
 
-  public Optional<Bytes32> getStorage(final DataFetchingEnvironment environment) {
-    return Optional.of(Bytes32.ZERO);
+  @Override
+  public Bytes32 getStorage(final DataFetchingEnvironment environment) {
+    return Bytes32.ZERO;
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/LogAdapter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/LogAdapter.java
index d6283c0442d..10357de0cca 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/LogAdapter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/LogAdapter.java
@@ -14,11 +14,11 @@
  */
 package org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.LogTopic;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
+import org.hyperledger.besu.evm.log.LogTopic;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35,8 +35,8 @@ public LogAdapter(final LogWithMetadata logWithMetadata) {
     this.logWithMetadata = logWithMetadata;
   }
 
-  public Optional<Integer> getIndex() {
-    return Optional.of(logWithMetadata.getLogIndex());
+  public Integer getIndex() {
+    return logWithMetadata.getLogIndex();
   }
 
   public List<LogTopic> getTopics() {
@@ -44,18 +44,18 @@ public List<LogTopic> getTopics() {
     return new ArrayList<>(topics);
   }
 
-  public Optional<Bytes> getData() {
-    return Optional.of(logWithMetadata.getData());
+  public Bytes getData() {
+    return logWithMetadata.getData();
   }
 
-  public Optional<TransactionAdapter> getTransaction(final DataFetchingEnvironment environment) {
+  public TransactionAdapter getTransaction(final DataFetchingEnvironment environment) {
     final BlockchainQueries query = getBlockchainQueries(environment);
     final Hash hash = logWithMetadata.getTransactionHash();
     final Optional<TransactionWithMetadata> tran = query.transactionByHash(hash);
-    return tran.map(TransactionAdapter::new);
+    return tran.map(TransactionAdapter::new).orElseThrow();
   }
 
-  public Optional<AccountAdapter> getAccount(final DataFetchingEnvironment environment) {
+  public AccountAdapter getAccount(final DataFetchingEnvironment environment) {
     final BlockchainQueries query = getBlockchainQueries(environment);
     long blockNumber = logWithMetadata.getBlockNumber();
     final Long bn = environment.getArgument("block");
@@ -64,7 +64,8 @@ public Optional<AccountAdapter> getAccount(final DataFetchingEnvironment environ
     }
 
     return query
-        .getWorldState(blockNumber)
-        .map(ws -> new AccountAdapter(ws.get(logWithMetadata.getLogger())));
+        .getAndMapWorldState(
+            blockNumber, ws -> Optional.of(new AccountAdapter(ws.get(logWithMetadata.getLogger()))))
+        .get();
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/NormalBlockAdapter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/NormalBlockAdapter.java
index 42e00a6cfc6..f54b3f0da04 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/NormalBlockAdapter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/NormalBlockAdapter.java
@@ -14,12 +14,12 @@
  */
 package org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.query.BlockWithMetadata;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,8 +42,8 @@ public Optional<Integer> getTransactionCount() {
     return Optional.of(blockWithMetaData.getTransactions().size());
   }
 
-  public Optional<Difficulty> getTotalDifficulty() {
-    return Optional.of(blockWithMetaData.getTotalDifficulty());
+  public Difficulty getTotalDifficulty() {
+    return blockWithMetaData.getTotalDifficulty();
   }
 
   public Optional<Integer> getOmmerCount() {
@@ -65,7 +65,7 @@ public List<UncleBlockAdapter> getOmmers(final DataFetchingEnvironment environme
 
   public Optional<UncleBlockAdapter> getOmmerAt(final DataFetchingEnvironment environment) {
     final BlockchainQueries query = getBlockchainQueries(environment);
-    final int index = environment.getArgument("index");
+    final int index = ((Number) environment.getArgument("index")).intValue();
     final List<Hash> ommers = blockWithMetaData.getOmmers();
     if (ommers.size() > index) {
       final Hash hash = blockWithMetaData.getHeader().getHash();
@@ -85,7 +85,7 @@ public List<TransactionAdapter> getTransactions() {
   }
 
   public Optional<TransactionAdapter> getTransactionAt(final DataFetchingEnvironment environment) {
-    final int index = environment.getArgument("index");
+    final int index = ((Number) environment.getArgument("index")).intValue();
     final List<TransactionWithMetadata> trans = blockWithMetaData.getTransactions();
 
     if (trans.size() > index) {
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/PendingStateAdapter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/PendingStateAdapter.java
index 18513e8d3e9..d6eb3ae64d6 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/PendingStateAdapter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/PendingStateAdapter.java
@@ -14,22 +14,23 @@
  */
 package org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter;
 
-import org.hyperledger.besu.ethereum.api.graphql.GraphQLDataFetcherContext;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.api.graphql.GraphQLContextType;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.mainnet.ImmutableTransactionValidationParams;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
 import org.hyperledger.besu.ethereum.transaction.CallParameter;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
-import org.hyperledger.besu.ethereum.transaction.TransactionSimulatorResult;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import graphql.schema.DataFetchingEnvironment;
 import org.apache.tuweni.bytes.Bytes;
@@ -49,27 +50,25 @@ public Integer getTransactionCount() {
   }
 
   public List<TransactionAdapter> getTransactions() {
-    return pendingTransactions.getTransactionInfo().stream()
-        .map(PendingTransactions.TransactionInfo::getTransaction)
+    return pendingTransactions.getPendingTransactions().stream()
+        .map(PendingTransaction::getTransaction)
         .map(TransactionWithMetadata::new)
         .map(TransactionAdapter::new)
-        .collect(Collectors.toList());
+        .toList();
   }
 
   // until the miner can expose the current "proposed block" we have no
   // speculative environment, so estimate against latest.
-  public Optional<AccountAdapter> getAccount(
-      final DataFetchingEnvironment dataFetchingEnvironment) {
+  public AccountAdapter getAccount(final DataFetchingEnvironment dataFetchingEnvironment) {
     final BlockchainQueries blockchainQuery =
-        ((GraphQLDataFetcherContext) dataFetchingEnvironment.getContext()).getBlockchainQueries();
+        dataFetchingEnvironment.getGraphQlContext().get(GraphQLContextType.BLOCKCHAIN_QUERIES);
     final Address addr = dataFetchingEnvironment.getArgument("address");
     final Long blockNumber = dataFetchingEnvironment.getArgument("blockNumber");
     final long latestBlockNumber = blockchainQuery.latestBlock().get().getHeader().getNumber();
-    final Optional<MutableWorldState> optionalWorldState =
-        blockchainQuery.getWorldState(latestBlockNumber);
-    return optionalWorldState
-        .flatMap(worldState -> Optional.ofNullable(worldState.get(addr)))
-        .map(AccountAdapter::new);
+    return blockchainQuery
+        .getAndMapWorldState(latestBlockNumber, ws -> Optional.ofNullable(ws.get(addr)))
+        .map(AccountAdapter::new)
+        .orElseGet(() -> new AccountAdapter(null));
   }
 
   // until the miner can expose the current "proposed block" we have no
@@ -92,7 +91,7 @@ public Optional<CallResult> getCall(final DataFetchingEnvironment environment) {
 
     final BlockchainQueries query = getBlockchainQueries(environment);
     final ProtocolSchedule protocolSchedule =
-        ((GraphQLDataFetcherContext) environment.getContext()).getProtocolSchedule();
+        environment.getGraphQlContext().get(GraphQLContextType.PROTOCOL_SCHEDULE);
 
     final TransactionSimulator transactionSimulator =
         new TransactionSimulator(
@@ -113,17 +112,24 @@ public Optional<CallResult> getCall(final DataFetchingEnvironment environment) {
     final CallParameter param =
         new CallParameter(from, to, gasParam, gasPriceParam, valueParam, data);
 
-    final Optional<TransactionSimulatorResult> opt = transactionSimulator.processAtHead(param);
-    if (opt.isPresent()) {
-      final TransactionSimulatorResult result = opt.get();
-      long status = 0;
-      if (result.isSuccessful()) {
-        status = 1;
-      }
-      final CallResult callResult =
-          new CallResult(status, result.getGasEstimate(), result.getOutput());
-      return Optional.of(callResult);
-    }
-    return Optional.empty();
+    ImmutableTransactionValidationParams.Builder transactionValidationParams =
+        ImmutableTransactionValidationParams.builder()
+            .from(TransactionValidationParams.transactionSimulator());
+    transactionValidationParams.isAllowExceedingBalance(true);
+
+    return transactionSimulator.process(
+        param,
+        transactionValidationParams.build(),
+        OperationTracer.NO_TRACING,
+        (mutableWorldState, transactionSimulatorResult) ->
+            transactionSimulatorResult.map(
+                result -> {
+                  long status = 0;
+                  if (result.isSuccessful()) {
+                    status = 1;
+                  }
+                  return new CallResult(status, result.getGasEstimate(), result.getOutput());
+                }),
+        query.getBlockchain().getChainHeadHeader());
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/SyncStateAdapter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/SyncStateAdapter.java
index 3768d62c869..0a8dcbbf97e 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/SyncStateAdapter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/SyncStateAdapter.java
@@ -16,8 +16,6 @@
 
 import org.hyperledger.besu.plugin.data.SyncStatus;
 
-import java.util.Optional;
-
 @SuppressWarnings("unused") // reflected by GraphQL
 public class SyncStateAdapter {
   private final SyncStatus syncStatus;
@@ -26,23 +24,15 @@ public SyncStateAdapter(final SyncStatus syncStatus) {
     this.syncStatus = syncStatus;
   }
 
-  public Optional<Long> getStartingBlock() {
-    return Optional.of(syncStatus.getStartingBlock());
-  }
-
-  public Optional<Long> getCurrentBlock() {
-    return Optional.of(syncStatus.getCurrentBlock());
-  }
-
-  public Optional<Long> getHighestBlock() {
-    return Optional.of(syncStatus.getHighestBlock());
+  public Long getStartingBlock() {
+    return syncStatus.getStartingBlock();
   }
 
-  public Optional<Long> getPulledStates() {
-    return syncStatus.getPulledStates();
+  public Long getCurrentBlock() {
+    return syncStatus.getCurrentBlock();
   }
 
-  public Optional<Long> getKnownStates() {
-    return syncStatus.getKnownStates();
+  public Long getHighestBlock() {
+    return syncStatus.getHighestBlock();
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/TransactionAdapter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/TransactionAdapter.java
index cd731d93269..49c1da5da65 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/TransactionAdapter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/TransactionAdapter.java
@@ -14,20 +14,21 @@
  */
 package org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.query.TransactionReceiptWithMetadata;
 import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
-import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.TransactionReceipt;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import javax.annotation.Nonnull;
 
 import graphql.schema.DataFetchingEnvironment;
 import org.apache.tuweni.bytes.Bytes;
@@ -35,71 +36,108 @@
 @SuppressWarnings("unused") // reflected by GraphQL
 public class TransactionAdapter extends AdapterBase {
   private final TransactionWithMetadata transactionWithMetadata;
+  private Optional<TransactionReceiptWithMetadata> transactionReceiptWithMetadata;
 
-  public TransactionAdapter(final TransactionWithMetadata transactionWithMetadata) {
+  public TransactionAdapter(final @Nonnull TransactionWithMetadata transactionWithMetadata) {
     this.transactionWithMetadata = transactionWithMetadata;
   }
 
-  public Optional<Hash> getHash() {
-    return Optional.of(transactionWithMetadata.getTransaction().getHash());
+  private Optional<TransactionReceiptWithMetadata> getReceipt(
+      final DataFetchingEnvironment environment) {
+    if (transactionReceiptWithMetadata == null) {
+      final BlockchainQueries query = getBlockchainQueries(environment);
+      final Transaction transaction = transactionWithMetadata.getTransaction();
+      if (transaction == null) {
+        transactionReceiptWithMetadata = Optional.empty();
+      } else {
+        transactionReceiptWithMetadata =
+            query.transactionReceiptByTransactionHash(transaction.getHash());
+      }
+    }
+    return transactionReceiptWithMetadata;
   }
 
-  public Optional<Long> getNonce() {
-    final long nonce = transactionWithMetadata.getTransaction().getNonce();
-    return Optional.of(nonce);
+  public Hash getHash() {
+    return transactionWithMetadata.getTransaction().getHash();
+  }
+
+  public Optional<Integer> getType() {
+    return Optional.of(transactionWithMetadata.getTransaction().getType().ordinal());
+  }
+
+  public Long getNonce() {
+    return transactionWithMetadata.getTransaction().getNonce();
   }
 
   public Optional<Integer> getIndex() {
     return transactionWithMetadata.getTransactionIndex();
   }
 
-  public Optional<AccountAdapter> getFrom(final DataFetchingEnvironment environment) {
+  public AccountAdapter getFrom(final DataFetchingEnvironment environment) {
     final BlockchainQueries query = getBlockchainQueries(environment);
-    final Optional<Long> txBlockNumber = transactionWithMetadata.getBlockNumber();
-    final Optional<Long> bn = Optional.ofNullable(environment.getArgument("block"));
-    if (!txBlockNumber.isPresent() && !bn.isPresent()) {
-      return Optional.empty();
+    Long blockNumber = environment.getArgument("block");
+    if (blockNumber == null) {
+      blockNumber = transactionWithMetadata.getBlockNumber().orElseGet(query::headBlockNumber);
     }
     return query
-        .getWorldState(bn.orElseGet(txBlockNumber::get))
-        .map(
+        .getAndMapWorldState(
+            blockNumber,
             mutableWorldState ->
-                new AccountAdapter(
-                    mutableWorldState.get(transactionWithMetadata.getTransaction().getSender())));
+                Optional.of(
+                    new AccountAdapter(
+                        mutableWorldState.get(
+                            transactionWithMetadata.getTransaction().getSender()))))
+        .get();
   }
 
   public Optional<AccountAdapter> getTo(final DataFetchingEnvironment environment) {
     final BlockchainQueries query = getBlockchainQueries(environment);
-    final Optional<Long> txBlockNumber = transactionWithMetadata.getBlockNumber();
-    final Optional<Long> bn = Optional.ofNullable(environment.getArgument("block"));
-    if (!txBlockNumber.isPresent() && !bn.isPresent()) {
-      return Optional.empty();
+    Long blockNumber = environment.getArgument("block");
+    if (blockNumber == null) {
+      blockNumber = transactionWithMetadata.getBlockNumber().orElseGet(query::headBlockNumber);
     }
 
-    return query
-        .getWorldState(bn.orElseGet(txBlockNumber::get))
-        .flatMap(
-            ws ->
-                transactionWithMetadata
-                    .getTransaction()
-                    .getTo()
-                    .map(addr -> new AccountAdapter(ws.get(addr))));
+    return query.getAndMapWorldState(
+        blockNumber,
+        ws ->
+            transactionWithMetadata
+                .getTransaction()
+                .getTo()
+                .map(address -> new AccountAdapter(address, ws.get(address))));
   }
 
-  public Optional<Wei> getValue() {
-    return Optional.of(transactionWithMetadata.getTransaction().getValue());
+  public Wei getValue() {
+    return transactionWithMetadata.getTransaction().getValue();
   }
 
-  public Optional<Wei> getGasPrice() {
-    return Optional.of(transactionWithMetadata.getTransaction().getGasPrice());
+  public Wei getGasPrice() {
+    return transactionWithMetadata.getTransaction().getGasPrice().orElse(Wei.ZERO);
   }
 
-  public Optional<Long> getGas() {
-    return Optional.of(transactionWithMetadata.getTransaction().getGasLimit());
+  public Optional<Wei> getMaxPriorityFeePerGas() {
+    return transactionWithMetadata.getTransaction().getMaxPriorityFeePerGas();
   }
 
-  public Optional<Bytes> getInputData() {
-    return Optional.of(transactionWithMetadata.getTransaction().getPayload());
+  public Optional<Wei> getMaxFeePerGas() {
+    return transactionWithMetadata.getTransaction().getMaxFeePerGas();
+  }
+
+  public Optional<Wei> getEffectiveGasPrice(final DataFetchingEnvironment environment) {
+    return getReceipt(environment)
+        .map(rwm -> rwm.getTransaction().getEffectiveGasPrice(rwm.getBaseFee()));
+  }
+
+  public Optional<Wei> getEffectiveTip(final DataFetchingEnvironment environment) {
+    return getReceipt(environment)
+        .map(rwm -> rwm.getTransaction().getEffectivePriorityFeePerGas(rwm.getBaseFee()));
+  }
+
+  public Long getGas() {
+    return transactionWithMetadata.getTransaction().getGasLimit();
+  }
+
+  public Bytes getInputData() {
+    return transactionWithMetadata.getTransaction().getPayload();
   }
 
   public Optional<NormalBlockAdapter> getBlock(final DataFetchingEnvironment environment) {
@@ -110,9 +148,7 @@ public Optional<NormalBlockAdapter> getBlock(final DataFetchingEnvironment envir
   }
 
   public Optional<Long> getStatus(final DataFetchingEnvironment environment) {
-    return Optional.ofNullable(transactionWithMetadata.getTransaction())
-        .map(Transaction::getHash)
-        .flatMap(rpt -> getBlockchainQueries(environment).transactionReceiptByTransactionHash(rpt))
+    return getReceipt(environment)
         .map(TransactionReceiptWithMetadata::getReceipt)
         .flatMap(
             receipt ->
@@ -122,43 +158,28 @@ public Optional<Long> getStatus(final DataFetchingEnvironment environment) {
   }
 
   public Optional<Long> getGasUsed(final DataFetchingEnvironment environment) {
-    final BlockchainQueries query = getBlockchainQueries(environment);
-    final Optional<TransactionReceiptWithMetadata> rpt =
-        query.transactionReceiptByTransactionHash(
-            transactionWithMetadata.getTransaction().getHash());
-    return rpt.map(TransactionReceiptWithMetadata::getGasUsed);
+    return getReceipt(environment).map(TransactionReceiptWithMetadata::getGasUsed);
   }
 
   public Optional<Long> getCumulativeGasUsed(final DataFetchingEnvironment environment) {
-    final BlockchainQueries query = getBlockchainQueries(environment);
-    final Optional<TransactionReceiptWithMetadata> rpt =
-        query.transactionReceiptByTransactionHash(
-            transactionWithMetadata.getTransaction().getHash());
-    if (rpt.isPresent()) {
-      final TransactionReceipt receipt = rpt.get().getReceipt();
-      return Optional.of(receipt.getCumulativeGasUsed());
-    }
-    return Optional.empty();
+    return getReceipt(environment).map(rpt -> rpt.getReceipt().getCumulativeGasUsed());
   }
 
   public Optional<AccountAdapter> getCreatedContract(final DataFetchingEnvironment environment) {
     final boolean contractCreated = transactionWithMetadata.getTransaction().isContractCreation();
     if (contractCreated) {
-      final Optional<Address> addr = transactionWithMetadata.getTransaction().getTo();
+      final Optional<Address> addr = transactionWithMetadata.getTransaction().contractAddress();
 
       if (addr.isPresent()) {
         final BlockchainQueries query = getBlockchainQueries(environment);
         final Optional<Long> txBlockNumber = transactionWithMetadata.getBlockNumber();
         final Optional<Long> bn = Optional.ofNullable(environment.getArgument("block"));
-        if (!txBlockNumber.isPresent() && !bn.isPresent()) {
+        if (txBlockNumber.isEmpty() && bn.isEmpty()) {
           return Optional.empty();
         }
         final long blockNumber = bn.orElseGet(txBlockNumber::get);
-
-        final Optional<MutableWorldState> ws = query.getWorldState(blockNumber);
-        if (ws.isPresent()) {
-          return Optional.of(new AccountAdapter(ws.get().get(addr.get())));
-        }
+        return query.getAndMapWorldState(
+            blockNumber, ws -> Optional.of(new AccountAdapter(ws.get(addr.get()))));
       }
     }
     return Optional.empty();
@@ -167,22 +188,53 @@ public Optional<AccountAdapter> getCreatedContract(final DataFetchingEnvironment
   public List<LogAdapter> getLogs(final DataFetchingEnvironment environment) {
     final BlockchainQueries query = getBlockchainQueries(environment);
     final Hash hash = transactionWithMetadata.getTransaction().getHash();
+
+    final Optional<BlockHeader> maybeBlockHeader =
+        transactionWithMetadata.getBlockNumber().flatMap(query::getBlockHeaderByNumber);
+
+    if (maybeBlockHeader.isEmpty()) {
+      throw new RuntimeException(
+          "Cannot get block ("
+              + transactionWithMetadata.getBlockNumber()
+              + ") for transaction "
+              + transactionWithMetadata.getTransaction().getHash());
+    }
+
     final Optional<TransactionReceiptWithMetadata> maybeTransactionReceiptWithMetadata =
         query.transactionReceiptByTransactionHash(hash);
     final List<LogAdapter> results = new ArrayList<>();
     if (maybeTransactionReceiptWithMetadata.isPresent()) {
       final List<LogWithMetadata> logs =
-          LogWithMetadata.generate(
-              maybeTransactionReceiptWithMetadata.get().getReceipt(),
-              transactionWithMetadata.getBlockNumber().get(),
-              transactionWithMetadata.getBlockHash().get(),
-              hash,
-              transactionWithMetadata.getTransactionIndex().get(),
-              false);
+          query.matchingLogs(
+              maybeBlockHeader.get().getBlockHash(), transactionWithMetadata, () -> true);
       for (final LogWithMetadata log : logs) {
         results.add(new LogAdapter(log));
       }
     }
     return results;
   }
+
+  public List<AccessListEntryAdapter> getAccessList() {
+    return transactionWithMetadata
+        .getTransaction()
+        .getAccessList()
+        .map(l -> l.stream().map(AccessListEntryAdapter::new).toList())
+        .orElse(List.of());
+  }
+
+  public Optional<Bytes> getRaw() {
+    final BytesValueRLPOutput rlpOutput = new BytesValueRLPOutput();
+    transactionWithMetadata.getTransaction().writeTo(rlpOutput);
+    return Optional.of(rlpOutput.encoded());
+  }
+
+  public Optional<Bytes> getRawReceipt(final DataFetchingEnvironment environment) {
+    return getReceipt(environment)
+        .map(
+            receipt -> {
+              final BytesValueRLPOutput rlpOutput = new BytesValueRLPOutput();
+              receipt.getReceipt().writeTo(rlpOutput);
+              return rlpOutput.encoded();
+            });
+  }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/UncleBlockAdapter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/UncleBlockAdapter.java
index c0e2736820e..8d9e947ee2d 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/UncleBlockAdapter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/UncleBlockAdapter.java
@@ -33,8 +33,8 @@ public Optional<Integer> getTransactionCount() {
     return Optional.of(0);
   }
 
-  public Optional<UInt256> getTotalDifficulty() {
-    return Optional.of(UInt256.ZERO);
+  public UInt256 getTotalDifficulty() {
+    return UInt256.ZERO;
   }
 
   public Optional<Integer> getOmmerCount() {
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/WithdrawalAdapter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/WithdrawalAdapter.java
new file mode 100644
index 00000000000..86782b6afcb
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/pojoadapter/WithdrawalAdapter.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.plugin.data.Withdrawal;
+
+public class WithdrawalAdapter {
+
+  Withdrawal withdrawal;
+
+  public WithdrawalAdapter(final Withdrawal withdrawal) {
+    this.withdrawal = withdrawal;
+  }
+
+  public Long getIndex() {
+    return withdrawal.getIndex().toLong();
+  }
+
+  public Long getValidator() {
+    return withdrawal.getValidatorIndex().toLong();
+  }
+
+  public Address getAddress() {
+    return withdrawal.getAddress();
+  }
+
+  public Long getAmount() {
+    return withdrawal.getAmount().getAsBigInteger().longValue();
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLError.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLError.java
index 0c31321aecd..e4aeacd92fd 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLError.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/graphql/internal/response/GraphQLError.java
@@ -31,7 +31,7 @@ public enum GraphQLError {
   INTRINSIC_GAS_EXCEEDS_LIMIT(-32003, "Intrinsic gas exceeds gas limit"),
   TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE(-32004, "Upfront cost exceeds account balance"),
   EXCEEDS_BLOCK_GAS_LIMIT(-32005, "Transaction gas limit exceeds block gas limit"),
-  INCORRECT_NONCE(-32006, "Incorrect nonce"),
+  INCORRECT_NONCE(-32006, "Nonce too high"),
   TX_SENDER_NOT_AUTHORIZED(-32007, "Sender account not authorized to send transactions"),
   CHAIN_HEAD_WORLD_STATE_NOT_AVAILABLE(-32008, "Initial sync is still in progress"),
   GAS_PRICE_TOO_LOW(-32009, "Gas price below configured minimum gas price"),
@@ -76,8 +76,8 @@ public static GraphQLError of(final TransactionInvalidReason transactionInvalidR
       case NONCE_TOO_LOW:
       case PRIVATE_NONCE_TOO_LOW:
         return NONCE_TOO_LOW;
-      case INCORRECT_NONCE:
-      case INCORRECT_PRIVATE_NONCE:
+      case NONCE_TOO_HIGH:
+      case PRIVATE_NONCE_TOO_HIGH:
         return INCORRECT_NONCE;
       case INTRINSIC_GAS_EXCEEDS_GAS_LIMIT:
         return INTRINSIC_GAS_EXCEEDS_LIMIT;
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/AbstractJsonRpcExecutor.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/AbstractJsonRpcExecutor.java
new file mode 100644
index 00000000000..3967c5250fe
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/AbstractJsonRpcExecutor.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.handlers;
+
+import static io.netty.handler.codec.http.HttpHeaderValues.APPLICATION_JSON;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
+import org.hyperledger.besu.ethereum.api.jsonrpc.context.ContextKey;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.JsonRpcExecutor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+
+import java.io.IOException;
+import java.util.Optional;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Context;
+import io.vertx.core.http.HttpServerResponse;
+import io.vertx.core.json.Json;
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.auth.User;
+import io.vertx.ext.web.RoutingContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public abstract class AbstractJsonRpcExecutor {
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractJsonRpcExecutor.class);
+
+  private static final String SPAN_CONTEXT = "span_context";
+  final JsonRpcExecutor jsonRpcExecutor;
+  final Tracer tracer;
+  final RoutingContext ctx;
+  final JsonRpcConfiguration jsonRpcConfiguration;
+
+  private static final ObjectMapper jsonObjectMapper =
+      new ObjectMapper()
+          .registerModule(new Jdk8Module()); // Handle JDK8 Optionals (de)serialization
+
+  /**
+   * Creates a new AbstractJsonRpcExecutor.
+   *
+   * @param jsonRpcExecutor The executor used to process the JSON RPC requests.
+   * @param tracer The tracer used for monitoring and debugging purposes.
+   * @param ctx The context of the routing, containing information about the HTTP request and
+   *     response.
+   * @param jsonRpcConfiguration The configuration for JSON RPC operations
+   */
+  public AbstractJsonRpcExecutor(
+      final JsonRpcExecutor jsonRpcExecutor,
+      final Tracer tracer,
+      final RoutingContext ctx,
+      final JsonRpcConfiguration jsonRpcConfiguration) {
+    this.jsonRpcExecutor = jsonRpcExecutor;
+    this.tracer = tracer;
+    this.ctx = ctx;
+    this.jsonRpcConfiguration = jsonRpcConfiguration;
+  }
+
+  abstract void execute() throws IOException;
+
+  abstract String getRpcMethodName(final RoutingContext ctx);
+
+  protected static JsonRpcResponse executeRequest(
+      final JsonRpcExecutor jsonRpcExecutor,
+      final Tracer tracer,
+      final JsonObject jsonRequest,
+      final RoutingContext ctx) {
+    final Optional<User> user = ContextKey.AUTHENTICATED_USER.extractFrom(ctx, Optional::empty);
+    final Context spanContext = ctx.get(SPAN_CONTEXT);
+    return jsonRpcExecutor.execute(
+        user,
+        tracer,
+        spanContext,
+        () -> !ctx.response().closed(),
+        jsonRequest,
+        req -> req.mapTo(JsonRpcRequest.class));
+  }
+
+  protected static void handleJsonRpcError(
+      final RoutingContext routingContext, final Object id, final JsonRpcError error) {
+    final HttpServerResponse response = routingContext.response();
+    if (!response.closed()) {
+      response
+          .setStatusCode(statusCodeFromError(error).code())
+          .end(Json.encode(new JsonRpcErrorResponse(id, error)));
+    }
+  }
+
+  private static HttpResponseStatus statusCodeFromError(final JsonRpcError error) {
+    return switch (error) {
+      case INVALID_REQUEST, PARSE_ERROR -> HttpResponseStatus.BAD_REQUEST;
+      default -> HttpResponseStatus.OK;
+    };
+  }
+
+  protected HttpServerResponse prepareHttpResponse(final RoutingContext ctx) {
+    HttpServerResponse response = ctx.response();
+    response = response.putHeader("Content-Type", APPLICATION_JSON);
+    return response;
+  }
+
+  protected static ObjectMapper getJsonObjectMapper() {
+    return jsonObjectMapper;
+  }
+
+  @FunctionalInterface
+  protected interface ExceptionThrowingSupplier<T> {
+    T get() throws Exception;
+  }
+
+  protected static void lazyTraceLogger(
+      final ExceptionThrowingSupplier<String> logMessageSupplier) {
+    if (LOG.isTraceEnabled()) {
+      try {
+        LOG.trace(logMessageSupplier.get());
+      } catch (Exception e) {
+        throw new RuntimeException(e);
+      }
+    }
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/AuthenticationHandler.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/AuthenticationHandler.java
new file mode 100644
index 00000000000..fe2b7ebb084
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/AuthenticationHandler.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.handlers;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationService;
+import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationUtils;
+import org.hyperledger.besu.ethereum.api.jsonrpc.context.ContextKey;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+
+import java.util.Collection;
+
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.vertx.core.Handler;
+import io.vertx.core.http.HttpServerResponse;
+import io.vertx.core.json.Json;
+import io.vertx.ext.web.RoutingContext;
+
+public class AuthenticationHandler {
+
+  private AuthenticationHandler() {}
+
+  public static Handler<RoutingContext> handler(
+      final AuthenticationService authenticationService, final Collection<String> noAuthRpcApis) {
+    return ctx -> {
+      // first check token if authentication is required
+      final String token = getAuthToken(ctx);
+      if (token == null && noAuthRpcApis.isEmpty()) {
+        // no auth token when auth required
+        handleJsonRpcUnauthorizedError(ctx);
+      } else {
+        authenticationService.authenticate(
+            token, user -> ctx.put(ContextKey.AUTHENTICATED_USER.name(), user));
+        ctx.next();
+      }
+    };
+  }
+
+  private static String getAuthToken(final RoutingContext routingContext) {
+    return AuthenticationUtils.getJwtTokenFromAuthorizationHeaderValue(
+        routingContext.request().getHeader("Authorization"));
+  }
+
+  private static void handleJsonRpcUnauthorizedError(final RoutingContext routingContext) {
+    final HttpServerResponse response = routingContext.response();
+    if (!response.closed()) {
+      response
+          .setStatusCode(HttpResponseStatus.UNAUTHORIZED.code())
+          .end(Json.encode(new JsonRpcErrorResponse(null, JsonRpcError.UNAUTHORIZED)));
+    }
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/HandlerFactory.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/HandlerFactory.java
index 2d51fb2098c..2d3639d52f6 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/HandlerFactory.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/HandlerFactory.java
@@ -14,32 +14,43 @@
  */
 package org.hyperledger.besu.ethereum.api.handlers;
 
+import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
+import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationService;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.JsonRpcExecutor;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 
+import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
+import io.opentelemetry.api.trace.Tracer;
 import io.vertx.core.Handler;
 import io.vertx.ext.web.RoutingContext;
 
 public class HandlerFactory {
-  private static final Map<HandlerName, Handler<RoutingContext>> HANDLERS =
-      new ConcurrentHashMap<>();
 
   public static Handler<RoutingContext> timeout(
-      final TimeoutOptions globalOptions,
-      final Map<String, JsonRpcMethod> methods,
-      final boolean decodeJSON) {
+      final TimeoutOptions globalOptions, final Map<String, JsonRpcMethod> methods) {
     assert methods != null && globalOptions != null;
-    return HANDLERS.computeIfAbsent(
-        HandlerName.TIMEOUT,
-        handlerName ->
-            TimeoutHandler.handler(
-                Optional.of(globalOptions),
-                methods.keySet().stream()
-                    .collect(Collectors.toMap(String::new, ignored -> globalOptions)),
-                decodeJSON));
+    return TimeoutHandler.handler(
+        Optional.of(globalOptions),
+        methods.keySet().stream().collect(Collectors.toMap(String::new, ignored -> globalOptions)));
+  }
+
+  public static Handler<RoutingContext> authentication(
+      final AuthenticationService authenticationService, final Collection<String> noAuthRpcApis) {
+    return AuthenticationHandler.handler(authenticationService, noAuthRpcApis);
+  }
+
+  public static Handler<RoutingContext> jsonRpcParser() {
+    return JsonRpcParserHandler.handler();
+  }
+
+  public static Handler<RoutingContext> jsonRpcExecutor(
+      final JsonRpcExecutor jsonRpcExecutor,
+      final Tracer tracer,
+      final JsonRpcConfiguration jsonRpcConfiguration) {
+    return JsonRpcExecutorHandler.handler(jsonRpcExecutor, tracer, jsonRpcConfiguration);
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/HandlerName.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/HandlerName.java
deleted file mode 100644
index f700c63db85..00000000000
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/HandlerName.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.api.handlers;
-
-public enum HandlerName {
-  TIMEOUT
-}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/JsonRpcArrayExecutor.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/JsonRpcArrayExecutor.java
new file mode 100644
index 00000000000..a45ad2a3dc3
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/JsonRpcArrayExecutor.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.handlers;
+
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.INVALID_REQUEST;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.JsonResponseStreamer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
+import org.hyperledger.besu.ethereum.api.jsonrpc.context.ContextKey;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.JsonRpcExecutor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import io.opentelemetry.api.trace.Tracer;
+import io.vertx.core.http.HttpServerResponse;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.web.RoutingContext;
+
+public class JsonRpcArrayExecutor extends AbstractJsonRpcExecutor {
+  public JsonRpcArrayExecutor(
+      final JsonRpcExecutor jsonRpcExecutor,
+      final Tracer tracer,
+      final RoutingContext ctx,
+      final JsonRpcConfiguration jsonRpcConfiguration) {
+    super(jsonRpcExecutor, tracer, ctx, jsonRpcConfiguration);
+  }
+
+  /**
+   * Executes the JSON-RPC request(s) associated with the current routing context.
+   *
+   * @throws IOException if there is an error writing the response to the client
+   */
+  @Override
+  void execute() throws IOException {
+    HttpServerResponse response = prepareHttpResponse(ctx);
+    final JsonArray batchJsonRequest = getRequestBodyAsJsonArray(ctx);
+    if (isBatchSizeValid(batchJsonRequest)) {
+      try (final JsonResponseStreamer streamer =
+          new JsonResponseStreamer(response, ctx.request().remoteAddress())) {
+        executeRpcRequestBatch(batchJsonRequest, streamer);
+      }
+    } else {
+      handleJsonRpcError(ctx, null, JsonRpcError.EXCEEDS_RPC_MAX_BATCH_SIZE);
+    }
+  }
+
+  /**
+   * Executes a batch of RPC requests.
+   *
+   * @param rpcRequestBatch the batch of RPC requests.
+   * @param streamer the JsonResponseStreamer to use.
+   */
+  public void executeRpcRequestBatch(
+      final JsonArray rpcRequestBatch, final JsonResponseStreamer streamer) throws IOException {
+    try (JsonGenerator generator = getJsonObjectMapper().getFactory().createGenerator(streamer)) {
+      generator.writeStartArray();
+      for (int i = 0; i < rpcRequestBatch.size(); i++) {
+        JsonRpcResponse response = processMaybeRequest(rpcRequestBatch.getValue(i));
+        if (response.getType() != JsonRpcResponseType.NONE) {
+          generator.writeObject(response);
+        }
+      }
+      generator.writeEndArray();
+    }
+  }
+
+  /**
+   * Processes a single RPC request.
+   *
+   * @param maybeRequest the object that might be a request.
+   * @return the response from executing the request, or an error response if it wasn't a valid
+   *     request.
+   */
+  private JsonRpcResponse processMaybeRequest(final Object maybeRequest) {
+    if (maybeRequest instanceof JsonObject) {
+      return executeRequest((JsonObject) maybeRequest);
+    } else {
+      return createErrorResponse();
+    }
+  }
+
+  /**
+   * Executes a single RPC request.
+   *
+   * @param request the request to execute.
+   * @return the response from executing the request.
+   */
+  private JsonRpcResponse executeRequest(final JsonObject request) {
+    return executeRequest(jsonRpcExecutor, tracer, request, ctx);
+  }
+
+  /**
+   * Creates an error response for an invalid request.
+   *
+   * @return an error response.
+   */
+  private JsonRpcResponse createErrorResponse() {
+    return new JsonRpcErrorResponse(null, INVALID_REQUEST);
+  }
+
+  @Override
+  String getRpcMethodName(final RoutingContext ctx) {
+    return "JsonArray";
+  }
+
+  private boolean isBatchSizeValid(final JsonArray batchJsonRequest) {
+    return !(jsonRpcConfiguration.getMaxBatchSize() > 0
+        && batchJsonRequest.size() > jsonRpcConfiguration.getMaxBatchSize());
+  }
+
+  private JsonArray getRequestBodyAsJsonArray(final RoutingContext ctx) {
+    final JsonArray batchJsonRequest = ctx.get(ContextKey.REQUEST_BODY_AS_JSON_ARRAY.name());
+    lazyTraceLogger(batchJsonRequest::toString);
+    return batchJsonRequest;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/JsonRpcExecutorHandler.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/JsonRpcExecutorHandler.java
new file mode 100644
index 00000000000..3d95f15245a
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/JsonRpcExecutorHandler.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.handlers;
+
+import static org.hyperledger.besu.ethereum.api.handlers.AbstractJsonRpcExecutor.handleJsonRpcError;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
+import org.hyperledger.besu.ethereum.api.jsonrpc.context.ContextKey;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.JsonRpcExecutor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+
+import java.io.IOException;
+import java.util.Optional;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.opentelemetry.api.trace.Tracer;
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class JsonRpcExecutorHandler {
+  private static final Logger LOG = LoggerFactory.getLogger(JsonRpcExecutorHandler.class);
+
+  private JsonRpcExecutorHandler() {}
+
+  public static Handler<RoutingContext> handler(
+      final ObjectMapper jsonObjectMapper,
+      final JsonRpcExecutor jsonRpcExecutor,
+      final Tracer tracer,
+      final JsonRpcConfiguration jsonRpcConfiguration) {
+    return handler(jsonRpcExecutor, tracer, jsonRpcConfiguration);
+  }
+
+  public static Handler<RoutingContext> handler(
+      final JsonRpcExecutor jsonRpcExecutor,
+      final Tracer tracer,
+      final JsonRpcConfiguration jsonRpcConfiguration) {
+    return ctx -> {
+      try {
+        createExecutor(jsonRpcExecutor, tracer, ctx, jsonRpcConfiguration)
+            .ifPresentOrElse(
+                executor -> {
+                  try {
+                    executor.execute();
+                  } catch (IOException e) {
+                    final String method = executor.getRpcMethodName(ctx);
+                    LOG.error("{} - Error streaming JSON-RPC response", method, e);
+                    throw new RuntimeException(e);
+                  }
+                },
+                () -> handleJsonRpcError(ctx, null, JsonRpcError.PARSE_ERROR));
+      } catch (final RuntimeException e) {
+        handleJsonRpcError(ctx, null, JsonRpcError.INTERNAL_ERROR);
+      }
+    };
+  }
+
+  private static Optional<AbstractJsonRpcExecutor> createExecutor(
+      final JsonRpcExecutor jsonRpcExecutor,
+      final Tracer tracer,
+      final RoutingContext ctx,
+      final JsonRpcConfiguration jsonRpcConfiguration) {
+    if (isJsonObjectRequest(ctx)) {
+      return Optional.of(
+          new JsonRpcObjectExecutor(jsonRpcExecutor, tracer, ctx, jsonRpcConfiguration));
+    }
+    if (isJsonArrayRequest(ctx)) {
+      return Optional.of(
+          new JsonRpcArrayExecutor(jsonRpcExecutor, tracer, ctx, jsonRpcConfiguration));
+    }
+    return Optional.empty();
+  }
+
+  private static boolean isJsonObjectRequest(final RoutingContext ctx) {
+    return ctx.data().containsKey(ContextKey.REQUEST_BODY_AS_JSON_OBJECT.name());
+  }
+
+  private static boolean isJsonArrayRequest(final RoutingContext ctx) {
+    return ctx.data().containsKey(ContextKey.REQUEST_BODY_AS_JSON_ARRAY.name());
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/JsonRpcObjectExecutor.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/JsonRpcObjectExecutor.java
new file mode 100644
index 00000000000..2380dcca3bd
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/JsonRpcObjectExecutor.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.handlers;
+
+import static io.netty.handler.codec.http.HttpHeaderValues.APPLICATION_JSON;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.JsonResponseStreamer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
+import org.hyperledger.besu.ethereum.api.jsonrpc.context.ContextKey;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.JsonRpcExecutor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.ObjectWriter;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.opentelemetry.api.trace.Tracer;
+import io.vertx.core.http.HttpServerResponse;
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.web.RoutingContext;
+
+public class JsonRpcObjectExecutor extends AbstractJsonRpcExecutor {
+  private static final ObjectWriter jsonObjectWriter = createObjectWriter();
+
+  public JsonRpcObjectExecutor(
+      final JsonRpcExecutor jsonRpcExecutor,
+      final Tracer tracer,
+      final RoutingContext ctx,
+      final JsonRpcConfiguration jsonRpcConfiguration) {
+    super(jsonRpcExecutor, tracer, ctx, jsonRpcConfiguration);
+  }
+
+  @Override
+  void execute() throws IOException {
+    HttpServerResponse response = ctx.response();
+    response = response.putHeader("Content-Type", APPLICATION_JSON);
+
+    final JsonObject jsonRequest = ctx.get(ContextKey.REQUEST_BODY_AS_JSON_OBJECT.name());
+    lazyTraceLogger(jsonRequest::toString);
+    final JsonRpcResponse jsonRpcResponse =
+        executeRequest(jsonRpcExecutor, tracer, jsonRequest, ctx);
+    handleJsonObjectResponse(response, jsonRpcResponse, ctx);
+  }
+
+  @Override
+  String getRpcMethodName(final RoutingContext ctx) {
+    final JsonObject jsonObject = ctx.get(ContextKey.REQUEST_BODY_AS_JSON_OBJECT.name());
+    return jsonObject.getString("method");
+  }
+
+  private static void handleJsonObjectResponse(
+      final HttpServerResponse response,
+      final JsonRpcResponse jsonRpcResponse,
+      final RoutingContext ctx)
+      throws IOException {
+    response.setStatusCode(status(jsonRpcResponse).code());
+    if (jsonRpcResponse.getType() == JsonRpcResponseType.NONE) {
+      response.end();
+    } else {
+      try (final JsonResponseStreamer streamer =
+          new JsonResponseStreamer(response, ctx.request().remoteAddress())) {
+        // underlying output stream lifecycle is managed by the json object writer
+        lazyTraceLogger(() -> getJsonObjectMapper().writeValueAsString(jsonRpcResponse));
+        jsonObjectWriter.writeValue(streamer, jsonRpcResponse);
+      }
+    }
+  }
+
+  private static HttpResponseStatus status(final JsonRpcResponse response) {
+    return switch (response.getType()) {
+      case UNAUTHORIZED -> HttpResponseStatus.UNAUTHORIZED;
+      case ERROR -> statusCodeFromError(((JsonRpcErrorResponse) response).getError());
+      default -> HttpResponseStatus.OK;
+    };
+  }
+
+  private static ObjectWriter createObjectWriter() {
+    return getJsonObjectMapper()
+        .writerWithDefaultPrettyPrinter()
+        .without(JsonGenerator.Feature.FLUSH_PASSED_TO_STREAM)
+        .with(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
+  }
+
+  private static HttpResponseStatus statusCodeFromError(final JsonRpcError error) {
+    return switch (error) {
+      case INVALID_REQUEST, PARSE_ERROR -> HttpResponseStatus.BAD_REQUEST;
+      default -> HttpResponseStatus.OK;
+    };
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/JsonRpcParserHandler.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/JsonRpcParserHandler.java
new file mode 100644
index 00000000000..6a3cef11ca2
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/JsonRpcParserHandler.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.handlers;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.context.ContextKey;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.vertx.core.Handler;
+import io.vertx.core.http.HttpServerResponse;
+import io.vertx.core.json.DecodeException;
+import io.vertx.core.json.Json;
+import io.vertx.core.json.JsonArray;
+import io.vertx.ext.web.RoutingContext;
+
+public class JsonRpcParserHandler {
+
+  private JsonRpcParserHandler() {}
+
+  public static Handler<RoutingContext> handler() {
+    return ctx -> {
+      final HttpServerResponse response = ctx.response();
+      if (ctx.getBody() == null) {
+        errorResponse(response, JsonRpcError.PARSE_ERROR);
+      } else {
+        try {
+          ctx.put(ContextKey.REQUEST_BODY_AS_JSON_OBJECT.name(), ctx.getBodyAsJson());
+        } catch (DecodeException | ClassCastException jsonObjectDecodeException) {
+          try {
+            final JsonArray batchRequest = ctx.getBodyAsJsonArray();
+            if (batchRequest.isEmpty()) {
+              errorResponse(response, JsonRpcError.INVALID_REQUEST);
+              return;
+            } else {
+              ctx.put(ContextKey.REQUEST_BODY_AS_JSON_ARRAY.name(), batchRequest);
+            }
+          } catch (DecodeException | ClassCastException jsonArrayDecodeException) {
+            errorResponse(response, JsonRpcError.PARSE_ERROR);
+            return;
+          }
+        }
+        ctx.next();
+      }
+    };
+  }
+
+  private static void errorResponse(
+      final HttpServerResponse response, final JsonRpcError rpcError) {
+    if (!response.closed()) {
+      response
+          .setStatusCode(HttpResponseStatus.BAD_REQUEST.code())
+          .end(Json.encode(new JsonRpcErrorResponse(null, rpcError)));
+    }
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/TimeoutHandler.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/TimeoutHandler.java
index 8ae4ab88b49..97fa1aa3891 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/TimeoutHandler.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/TimeoutHandler.java
@@ -14,8 +14,6 @@
  */
 package org.hyperledger.besu.ethereum.api.handlers;
 
-import static java.util.Collections.emptyMap;
-
 import org.hyperledger.besu.ethereum.api.jsonrpc.context.ContextKey;
 
 import java.util.Map;
@@ -27,50 +25,39 @@
 
 public class TimeoutHandler {
 
-  public static Handler<RoutingContext> handler(
-      final Optional<TimeoutOptions> globalOptions, final boolean decodeJSON) {
-    return handler(globalOptions, emptyMap(), decodeJSON);
-  }
-
   public static Handler<RoutingContext> handler(
       final Optional<TimeoutOptions> globalOptions,
-      final Map<String, TimeoutOptions> timeoutOptionsByMethod,
-      final boolean decodeJSON) {
+      final Map<String, TimeoutOptions> timeoutOptionsByMethod) {
     assert timeoutOptionsByMethod != null;
-    return ctx -> processHandler(ctx, globalOptions, timeoutOptionsByMethod, decodeJSON);
+    return ctx -> processHandler(ctx, globalOptions, timeoutOptionsByMethod);
   }
 
   private static void processHandler(
       final RoutingContext ctx,
       final Optional<TimeoutOptions> globalOptions,
-      final Map<String, TimeoutOptions> timeoutOptionsByMethod,
-      final boolean decodeJSON) {
+      final Map<String, TimeoutOptions> timeoutOptionsByMethod) {
     try {
-      final String bodyAsString = ctx.getBodyAsString();
-      if (bodyAsString != null) {
-        final String json = ctx.getBodyAsString().trim();
-        Optional<TimeoutOptions> methodTimeoutOptions = Optional.empty();
-        if (decodeJSON && !json.isEmpty() && json.charAt(0) == '{') {
-          final JsonObject requestBodyJsonObject = new JsonObject(json);
-          ctx.put(ContextKey.REQUEST_BODY_AS_JSON_OBJECT.name(), requestBodyJsonObject);
-          final String method = requestBodyJsonObject.getString("method");
-          methodTimeoutOptions = Optional.ofNullable(timeoutOptionsByMethod.get(method));
-        }
-        methodTimeoutOptions
-            .or(() -> globalOptions)
-            .ifPresent(
-                timeoutOptions -> {
-                  long tid =
-                      ctx.vertx()
-                          .setTimer(
-                              timeoutOptions.getTimeoutMillis(),
-                              t -> {
-                                ctx.fail(timeoutOptions.getErrorCode());
-                                ctx.response().close();
-                              });
-                  ctx.addBodyEndHandler(v -> ctx.vertx().cancelTimer(tid));
-                });
+      Optional<TimeoutOptions> methodTimeoutOptions = Optional.empty();
+      if (ctx.data().containsKey(ContextKey.REQUEST_BODY_AS_JSON_OBJECT.name())) {
+        final JsonObject requestBodyJsonObject =
+            ctx.get(ContextKey.REQUEST_BODY_AS_JSON_OBJECT.name());
+        final String method = requestBodyJsonObject.getString("method");
+        methodTimeoutOptions = Optional.ofNullable(timeoutOptionsByMethod.get(method));
       }
+      methodTimeoutOptions
+          .or(() -> globalOptions)
+          .ifPresent(
+              timeoutOptions -> {
+                long tid =
+                    ctx.vertx()
+                        .setTimer(
+                            timeoutOptions.getTimeoutMillis(),
+                            t -> {
+                              ctx.fail(timeoutOptions.getErrorCode());
+                              ctx.response().close();
+                            });
+                ctx.addBodyEndHandler(v -> ctx.vertx().cancelTimer(tid));
+              });
     } finally {
       ctx.next();
     }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/TimeoutOptions.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/TimeoutOptions.java
index 8dbad46c1ed..8bd1dd17837 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/TimeoutOptions.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/handlers/TimeoutOptions.java
@@ -18,8 +18,10 @@
 import java.util.concurrent.TimeUnit;
 
 public class TimeoutOptions {
+
+  public static final int DEFAULT_ERROR_CODE = 504;
+
   private static final long DEFAULT_TIMEOUT_SECONDS = Duration.ofMinutes(5).toSeconds();
-  private static final int DEFAULT_ERROR_CODE = 504;
   private final long timeoutSec;
 
   private final int errorCode;
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/EngineJsonRpcService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/EngineJsonRpcService.java
new file mode 100644
index 00000000000..42cd1d7c80a
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/EngineJsonRpcService.java
@@ -0,0 +1,684 @@
+/*
+ * Copyright Hyperledger Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.collect.Streams.stream;
+import static org.apache.tuweni.net.tls.VertxTrustOptions.allowlistClients;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationUtils.truncToken;
+
+import org.hyperledger.besu.ethereum.api.handlers.HandlerFactory;
+import org.hyperledger.besu.ethereum.api.handlers.TimeoutOptions;
+import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationService;
+import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationUtils;
+import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.DefaultAuthenticationService;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.AuthenticatedJsonRpcProcessor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.BaseJsonRpcProcessor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.JsonRpcExecutor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.JsonRpcProcessor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.TimedJsonRpcProcessor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.TracedJsonRpcProcessor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.Logging403ErrorHandler;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
+import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketMessageHandler;
+import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager;
+import org.hyperledger.besu.ethereum.api.tls.TlsClientAuthConfiguration;
+import org.hyperledger.besu.ethereum.api.tls.TlsConfiguration;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.metrics.opentelemetry.OpenTelemetrySystem;
+import org.hyperledger.besu.nat.NatMethod;
+import org.hyperledger.besu.nat.NatService;
+import org.hyperledger.besu.nat.core.domain.NatServiceType;
+import org.hyperledger.besu.nat.core.domain.NetworkProtocol;
+import org.hyperledger.besu.nat.upnp.UpnpNatManager;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
+import org.hyperledger.besu.plugin.services.metrics.OperationTimer;
+import org.hyperledger.besu.util.ExceptionUtils;
+import org.hyperledger.besu.util.NetworkUtility;
+
+import java.net.InetSocketAddress;
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.Optional;
+import java.util.StringJoiner;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.annotation.Nullable;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Iterables;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.baggage.propagation.W3CBaggagePropagator;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.api.trace.StatusCode;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.api.trace.TracerProvider;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.context.propagation.TextMapGetter;
+import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.extension.trace.propagation.B3Propagator;
+import io.opentelemetry.extension.trace.propagation.JaegerPropagator;
+import io.vertx.core.Handler;
+import io.vertx.core.Vertx;
+import io.vertx.core.VertxException;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.ClientAuth;
+import io.vertx.core.http.HttpConnection;
+import io.vertx.core.http.HttpHeaders;
+import io.vertx.core.http.HttpMethod;
+import io.vertx.core.http.HttpServer;
+import io.vertx.core.http.HttpServerOptions;
+import io.vertx.core.http.HttpServerRequest;
+import io.vertx.core.http.HttpServerResponse;
+import io.vertx.core.http.ServerWebSocket;
+import io.vertx.core.net.PfxOptions;
+import io.vertx.core.net.SocketAddress;
+import io.vertx.ext.auth.User;
+import io.vertx.ext.web.Route;
+import io.vertx.ext.web.Router;
+import io.vertx.ext.web.RoutingContext;
+import io.vertx.ext.web.handler.BodyHandler;
+import io.vertx.ext.web.handler.CorsHandler;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class EngineJsonRpcService {
+
+  private static final Logger LOG = LoggerFactory.getLogger(EngineJsonRpcService.class);
+
+  private static final String SPAN_CONTEXT = "span_context";
+  private static final InetSocketAddress EMPTY_SOCKET_ADDRESS = new InetSocketAddress("0.0.0.0", 0);
+  private static final String APPLICATION_JSON = "application/json";
+
+  private static final TextMapPropagator traceFormats =
+      TextMapPropagator.composite(
+          JaegerPropagator.getInstance(),
+          B3Propagator.injectingSingleHeader(),
+          W3CBaggagePropagator.getInstance());
+
+  private static final TextMapGetter<HttpServerRequest> requestAttributesGetter =
+      new TextMapGetter<>() {
+        @Override
+        public Iterable<String> keys(final HttpServerRequest carrier) {
+          return carrier.headers().names();
+        }
+
+        @Nullable
+        @Override
+        public String get(final @Nullable HttpServerRequest carrier, final String key) {
+          if (carrier == null) {
+            return null;
+          }
+          return carrier.headers().get(key);
+        }
+      };
+
+  private final Vertx vertx;
+  private final JsonRpcConfiguration config;
+  private final Map<String, JsonRpcMethod> rpcMethods;
+  private final NatService natService;
+  private final Path dataDir;
+  private final LabelledMetric<OperationTimer> requestTimer;
+  private TracerProvider tracerProvider;
+  private Tracer tracer;
+  private final int maxActiveConnections;
+  private final AtomicInteger activeConnectionsCount = new AtomicInteger();
+
+  private final WebSocketConfiguration socketConfiguration;
+  private final Optional<WebSocketMessageHandler> webSocketMessageHandler;
+
+  @VisibleForTesting public final Optional<AuthenticationService> authenticationService;
+
+  private HttpServer httpServer;
+  private final HealthService livenessService;
+  private final HealthService readinessService;
+
+  /**
+   * Construct a EngineJsonRpcService to handle either http or websocket clients
+   *
+   * @param vertx The vertx process that will be running this service
+   * @param dataDir The data directory where requests can be buffered
+   * @param config Configuration for the rpc methods being loaded
+   * @param metricsSystem The metrics service that activities should be reported to
+   * @param natService The NAT environment manager.
+   * @param methods The json rpc methods that should be enabled
+   * @param maybeSockets websocket configuration to use
+   * @param scheduler for managing ETH tasks
+   * @param authenticationService used to grant or deny access to methods served
+   * @param livenessService A service responsible for reporting whether this node is live
+   * @param readinessService A service responsible for reporting whether this node has fully started
+   */
+  public EngineJsonRpcService(
+      final Vertx vertx,
+      final Path dataDir,
+      final JsonRpcConfiguration config,
+      final MetricsSystem metricsSystem,
+      final NatService natService,
+      final Map<String, JsonRpcMethod> methods,
+      final Optional<WebSocketConfiguration> maybeSockets,
+      final EthScheduler scheduler,
+      final Optional<AuthenticationService> authenticationService,
+      final HealthService livenessService,
+      final HealthService readinessService) {
+    this.dataDir = dataDir;
+    this.requestTimer =
+        metricsSystem.createLabelledTimer(
+            BesuMetricCategory.RPC,
+            "request_time",
+            "Time taken to process a JSON-RPC request",
+            "methodName");
+    JsonRpcProcessor jsonRpcProcessor = new BaseJsonRpcProcessor();
+    if (metricsSystem instanceof OpenTelemetrySystem) {
+      this.tracerProvider = ((OpenTelemetrySystem) metricsSystem).getTracerProvider();
+    }
+
+    this.socketConfiguration =
+        maybeSockets.isPresent() ? maybeSockets.get() : WebSocketConfiguration.createDefault();
+
+    if (authenticationService.isPresent()) {
+      jsonRpcProcessor =
+          new AuthenticatedJsonRpcProcessor(
+              jsonRpcProcessor,
+              authenticationService.get(),
+              this.socketConfiguration.getRpcApisNoAuth());
+    }
+
+    final JsonRpcExecutor jsonRpcExecutor = new JsonRpcExecutor(jsonRpcProcessor, methods);
+    this.webSocketMessageHandler =
+        Optional.of(
+            new WebSocketMessageHandler(
+                vertx, jsonRpcExecutor, scheduler, this.socketConfiguration.getTimeoutSec()));
+
+    validateConfig(config);
+    this.config = config;
+    this.vertx = vertx;
+    this.natService = natService;
+    this.rpcMethods = methods;
+    this.authenticationService = authenticationService;
+    this.livenessService = livenessService;
+    this.readinessService = readinessService;
+    this.maxActiveConnections = config.getMaxActiveConnections();
+  }
+
+  public CompletableFuture<Void> start() {
+    LOG.info("Starting JSON-RPC service on {}:{}", config.getHost(), config.getPort());
+    LOG.debug("max number of active connections {}", maxActiveConnections);
+    if (this.tracerProvider != null) {
+      this.tracer = tracerProvider.get("org.hyperledger.besu.jsonrpc", "1.0.0");
+    } else {
+      this.tracer = OpenTelemetry.noop().getTracer("org.hyperledger.besu.jsonrpc", "1.0.0");
+    }
+    final CompletableFuture<Void> resultFuture = new CompletableFuture<>();
+    try {
+      // Create the HTTP server and a router object.
+      httpServer = vertx.createHttpServer(getHttpServerOptions());
+      httpServer.webSocketHandler(webSocketHandler());
+      httpServer.connectionHandler(connectionHandler());
+
+      httpServer
+          .requestHandler(buildRouter())
+          .listen(
+              res -> {
+                if (!res.failed()) {
+                  resultFuture.complete(null);
+                  config.setPort(httpServer.actualPort());
+                  LOG.info(
+                      "JSON-RPC service started and listening on {}:{}{}",
+                      config.getHost(),
+                      config.getPort(),
+                      tlsLogMessage());
+
+                  natService.ifNatEnvironment(
+                      NatMethod.UPNP,
+                      natManager ->
+                          ((UpnpNatManager) natManager)
+                              .requestPortForward(
+                                  config.getPort(), NetworkProtocol.TCP, NatServiceType.JSON_RPC));
+
+                  return;
+                }
+
+                httpServer = null;
+                resultFuture.completeExceptionally(getFailureException(res.cause()));
+              });
+    } catch (final JsonRpcServiceException tlsException) {
+      httpServer = null;
+      resultFuture.completeExceptionally(tlsException);
+    } catch (final VertxException listenException) {
+      httpServer = null;
+      resultFuture.completeExceptionally(
+          new JsonRpcServiceException(
+              String.format(
+                  "Ethereum JSON-RPC listener failed to start: %s",
+                  ExceptionUtils.rootCause(listenException).getMessage())));
+    }
+
+    return resultFuture;
+  }
+
+  public CompletableFuture<Void> stop() {
+    if (httpServer == null) {
+      return CompletableFuture.completedFuture(null);
+    }
+
+    final CompletableFuture<Void> resultFuture = new CompletableFuture<>();
+    httpServer.close(
+        res -> {
+          if (res.failed()) {
+            resultFuture.completeExceptionally(res.cause());
+          } else {
+            httpServer = null;
+            resultFuture.complete(null);
+          }
+        });
+    return resultFuture;
+  }
+
+  private Handler<HttpConnection> connectionHandler() {
+
+    return connection -> {
+      if (activeConnectionsCount.get() >= maxActiveConnections) {
+        // disallow new connections to prevent DoS
+        LOG.warn(
+            "Rejecting new connection from {}. Max {} active connections limit reached.",
+            connection.remoteAddress(),
+            activeConnectionsCount.getAndIncrement());
+        connection.close();
+      } else {
+        LOG.debug(
+            "Opened connection from {}. Total of active connections: {}/{}",
+            connection.remoteAddress(),
+            activeConnectionsCount.incrementAndGet(),
+            maxActiveConnections);
+      }
+      connection.closeHandler(
+          c ->
+              LOG.debug(
+                  "Connection closed from {}. Total of active connections: {}/{}",
+                  connection.remoteAddress(),
+                  activeConnectionsCount.decrementAndGet(),
+                  maxActiveConnections));
+    };
+  }
+
+  private Handler<ServerWebSocket> webSocketHandler() {
+    return websocket -> {
+      final SocketAddress socketAddress = websocket.remoteAddress();
+      final String connectionId = websocket.textHandlerID();
+      final String token =
+          AuthenticationUtils.getJwtTokenFromAuthorizationHeaderValue(
+              websocket.headers().get("Authorization"));
+      if (token != null) {
+        LOG.atTrace()
+            .setMessage("JWT authentication token {}")
+            .addArgument(() -> truncToken(token))
+            .log();
+      }
+
+      if (!hostIsInAllowlist(
+          Optional.ofNullable(websocket.headers().get("Host")).orElse("NOHOST"))) {
+        websocket.reject(403);
+      }
+
+      if (authenticationService.isPresent()) {
+        authenticationService
+            .get()
+            .authenticate(
+                token,
+                user -> {
+                  if (user.isEmpty()) {
+                    websocket.reject(403);
+                  } else {
+                    final Handler<Buffer> socketHandler =
+                        handlerForUser(socketAddress, websocket, user);
+                    websocket.textMessageHandler(text -> socketHandler.handle(Buffer.buffer(text)));
+                    websocket.binaryMessageHandler(socketHandler);
+                  }
+                });
+      } else {
+        final Handler<Buffer> socketHandler =
+            handlerForUser(socketAddress, websocket, Optional.empty());
+        websocket.textMessageHandler(text -> socketHandler.handle(Buffer.buffer(text)));
+        websocket.binaryMessageHandler(socketHandler);
+      }
+      String addr = socketAddressAsString(socketAddress);
+      LOG.debug("Websocket Connected ({})", addr);
+
+      websocket.closeHandler(
+          v -> {
+            LOG.debug("Websocket Disconnected ({})", socketAddressAsString(socketAddress));
+            vertx
+                .eventBus()
+                .publish(SubscriptionManager.EVENTBUS_REMOVE_SUBSCRIPTIONS_ADDRESS, connectionId);
+          });
+
+      websocket.exceptionHandler(
+          t -> {
+            LOG.debug(
+                "Unrecoverable error on Websocket: {} ({})",
+                t.getMessage(),
+                socketAddressAsString(socketAddress));
+            websocket.close();
+          });
+    };
+  }
+
+  @NotNull
+  private Handler<Buffer> handlerForUser(
+      final SocketAddress socketAddress,
+      final ServerWebSocket websocket,
+      final Optional<User> user) {
+    return buffer -> {
+      String addr = socketAddressAsString(socketAddress);
+      LOG.debug("Received Websocket request (binary frame) {} ({})", buffer, addr);
+
+      if (webSocketMessageHandler.isPresent()) {
+        // if auth enabled and user empty will always 401
+        webSocketMessageHandler.get().handle(websocket, buffer, user);
+      } else {
+        LOG.error("No socket request handler configured");
+      }
+    };
+  }
+
+  private void validateConfig(final JsonRpcConfiguration config) {
+    checkArgument(
+        config.getPort() == 0 || NetworkUtility.isValidPort(config.getPort()),
+        "Invalid port configuration.");
+    checkArgument(config.getHost() != null, "Required host is not configured.");
+    checkArgument(
+        config.getMaxActiveConnections() > 0, "Invalid max active connections configuration.");
+  }
+
+  private Router buildRouter() {
+    // Handle json rpc requests
+    final Router router = Router.router(vertx);
+    router.route().handler(this::createSpan);
+
+    // Verify Host header to avoid rebind attack.
+    router.route().handler(denyRouteToBlockedHost());
+    router.errorHandler(403, new Logging403ErrorHandler());
+    router
+        .route()
+        .handler(
+            CorsHandler.create(buildCorsRegexFromConfig())
+                .allowedHeader("*")
+                .allowedHeader("content-type"));
+    router
+        .route()
+        .handler(
+            BodyHandler.create()
+                .setUploadsDirectory(dataDir.resolve("uploads").toString())
+                .setDeleteUploadedFilesOnEnd(true));
+    router.route("/").method(HttpMethod.GET).handler(this::handleEmptyRequest);
+    router
+        .route(HealthService.LIVENESS_PATH)
+        .method(HttpMethod.GET)
+        .handler(livenessService::handleRequest);
+    router
+        .route(HealthService.READINESS_PATH)
+        .method(HttpMethod.GET)
+        .handler(readinessService::handleRequest);
+    Route mainRoute = router.route("/").method(HttpMethod.POST).produces(APPLICATION_JSON);
+    if (authenticationService.isPresent()) {
+      mainRoute.handler(
+          HandlerFactory.authentication(authenticationService.get(), config.getNoAuthRpcApis()));
+    }
+    mainRoute
+        .handler(HandlerFactory.jsonRpcParser())
+        .handler(
+            HandlerFactory.timeout(new TimeoutOptions(config.getHttpTimeoutSec()), rpcMethods));
+    if (authenticationService.isPresent()) {
+      mainRoute.blockingHandler(
+          HandlerFactory.jsonRpcExecutor(
+              new JsonRpcExecutor(
+                  new AuthenticatedJsonRpcProcessor(
+                      new TimedJsonRpcProcessor(
+                          new TracedJsonRpcProcessor(new BaseJsonRpcProcessor()), requestTimer),
+                      authenticationService.get(),
+                      config.getNoAuthRpcApis()),
+                  rpcMethods),
+              tracer,
+              config),
+          false);
+    } else {
+      mainRoute.blockingHandler(
+          HandlerFactory.jsonRpcExecutor(
+              new JsonRpcExecutor(
+                  new TimedJsonRpcProcessor(
+                      new TracedJsonRpcProcessor(new BaseJsonRpcProcessor()), requestTimer),
+                  rpcMethods),
+              tracer,
+              config),
+          false);
+    }
+
+    if (authenticationService.isPresent()) {
+      router
+          .route("/login")
+          .method(HttpMethod.POST)
+          .produces(APPLICATION_JSON)
+          .handler(authenticationService.get()::handleLogin);
+    } else {
+      router
+          .route("/login")
+          .method(HttpMethod.POST)
+          .produces(APPLICATION_JSON)
+          .handler(DefaultAuthenticationService::handleDisabledLogin);
+    }
+    return router;
+  }
+
+  private void createSpan(final RoutingContext routingContext) {
+    final SocketAddress address = routingContext.request().connection().remoteAddress();
+
+    Context parent =
+        traceFormats.extract(Context.current(), routingContext.request(), requestAttributesGetter);
+    final Span serverSpan =
+        tracer
+            .spanBuilder(address.host() + ":" + address.port())
+            .setParent(parent)
+            .setSpanKind(SpanKind.SERVER)
+            .startSpan();
+    routingContext.put(SPAN_CONTEXT, Context.current().with(serverSpan));
+
+    routingContext.addEndHandler(
+        event -> {
+          if (event.failed()) {
+            serverSpan.recordException(event.cause());
+            serverSpan.setStatus(StatusCode.ERROR);
+          }
+          serverSpan.end();
+        });
+    routingContext.next();
+  }
+
+  private HttpServerOptions getHttpServerOptions() {
+    final HttpServerOptions httpServerOptions =
+        new HttpServerOptions()
+            .setHost(config.getHost())
+            .setPort(config.getPort())
+            .setHandle100ContinueAutomatically(true)
+            .setCompressionSupported(true);
+
+    httpServerOptions.setMaxWebSocketFrameSize(socketConfiguration.getMaxFrameSize());
+    httpServerOptions.setMaxWebSocketMessageSize(socketConfiguration.getMaxFrameSize() * 4);
+
+    applyTlsConfig(httpServerOptions);
+    return httpServerOptions;
+  }
+
+  private void applyTlsConfig(final HttpServerOptions httpServerOptions) {
+    final Optional<TlsConfiguration> maybeTlsConfig = config.getTlsConfiguration();
+    if (maybeTlsConfig.isPresent()) {
+      final TlsConfiguration tlsConfiguration = maybeTlsConfig.get();
+      try {
+        httpServerOptions
+            .setSsl(true)
+            .setPfxKeyCertOptions(
+                new PfxOptions()
+                    .setPath(tlsConfiguration.getKeyStorePath().toString())
+                    .setPassword(tlsConfiguration.getKeyStorePassword()))
+            .setUseAlpn(true);
+
+        tlsConfiguration
+            .getSecureTransportProtocols()
+            .ifPresent(httpServerOptions::setEnabledSecureTransportProtocols);
+
+        tlsConfiguration
+            .getCipherSuites()
+            .ifPresent(
+                cipherSuites -> {
+                  for (String cs : cipherSuites) {
+                    httpServerOptions.addEnabledCipherSuite(cs);
+                  }
+                });
+
+        tlsConfiguration
+            .getClientAuthConfiguration()
+            .ifPresent(
+                clientAuthConfiguration ->
+                    applyTlsClientAuth(clientAuthConfiguration, httpServerOptions));
+      } catch (final RuntimeException re) {
+        throw new JsonRpcServiceException(
+            String.format(
+                "TLS options failed to initialize for Ethereum JSON-RPC listener: %s",
+                re.getMessage()));
+      }
+    }
+  }
+
+  private void applyTlsClientAuth(
+      final TlsClientAuthConfiguration clientAuthConfiguration,
+      final HttpServerOptions httpServerOptions) {
+    httpServerOptions.setClientAuth(ClientAuth.REQUIRED);
+    clientAuthConfiguration
+        .getKnownClientsFile()
+        .ifPresent(
+            knownClientsFile ->
+                httpServerOptions.setTrustOptions(
+                    allowlistClients(
+                        knownClientsFile, clientAuthConfiguration.isCaClientsEnabled())));
+  }
+
+  private String tlsLogMessage() {
+    return config.getTlsConfiguration().isPresent() ? " with TLS enabled." : "";
+  }
+
+  private Throwable getFailureException(final Throwable listenFailure) {
+
+    JsonRpcServiceException servFail =
+        new JsonRpcServiceException(
+            String.format(
+                "Failed to bind Ethereum JSON-RPC listener to %s:%s: %s",
+                config.getHost(), config.getPort(), listenFailure.getMessage()));
+    servFail.initCause(listenFailure);
+
+    return servFail;
+  }
+
+  private Handler<RoutingContext> denyRouteToBlockedHost() {
+    return event -> {
+      final Optional<String> hostHeader = getAndValidateHostHeader(event);
+      if (config.getHostsAllowlist().contains("*")
+          || (hostHeader.isPresent() && hostIsInAllowlist(hostHeader.get()))) {
+        event.next();
+      } else {
+        final HttpServerResponse response = event.response();
+        if (!response.closed()) {
+          response
+              .setStatusCode(403)
+              .putHeader("Content-Type", "application/json; charset=utf-8")
+              .end("{\"message\":\"Host not authorized.\"}");
+        }
+      }
+    };
+  }
+
+  private Optional<String> getAndValidateHostHeader(final RoutingContext event) {
+    String hostname =
+        event.request().getHeader(HttpHeaders.HOST) != null
+            ? event.request().getHeader(HttpHeaders.HOST)
+            : event.request().host();
+    final Iterable<String> splitHostHeader = Splitter.on(':').split(hostname);
+    final long hostPieces = stream(splitHostHeader).count();
+    // If the host contains a colon, verify the host is correctly formed - host [ ":" port ]
+    if (hostPieces > 1) {
+      if (hostPieces > 2 || !Iterables.get(splitHostHeader, 1).matches("\\d{1,5}+")) {
+        return Optional.empty();
+      }
+    }
+    return Optional.ofNullable(Iterables.get(splitHostHeader, 0));
+  }
+
+  private boolean hostIsInAllowlist(final String hostHeader) {
+    if (config.getHostsAllowlist().contains("*")
+        || config.getHostsAllowlist().stream()
+            .anyMatch(allowlistEntry -> allowlistEntry.equalsIgnoreCase(hostHeader))) {
+      return true;
+    } else {
+      LOG.trace("Host not in allowlist: '{}'", hostHeader);
+      return false;
+    }
+  }
+
+  public InetSocketAddress socketAddress() {
+    if (httpServer == null) {
+      return EMPTY_SOCKET_ADDRESS;
+    }
+    return new InetSocketAddress(config.getHost(), httpServer.actualPort());
+  }
+
+  private String socketAddressAsString(final SocketAddress socketAddress) {
+    return String.format("host=%s, port=%d", socketAddress.host(), socketAddress.port());
+  }
+
+  @VisibleForTesting
+  public String url() {
+    if (httpServer == null) {
+      return "";
+    }
+    return NetworkUtility.urlForSocketAddress(getScheme(), socketAddress());
+  }
+
+  private String getScheme() {
+    return config.getTlsConfiguration().isPresent() ? "https" : "http";
+  }
+
+  // Facilitate remote health-checks in AWS, inter alia.
+  private void handleEmptyRequest(final RoutingContext routingContext) {
+    routingContext.response().setStatusCode(201).end();
+  }
+
+  private String buildCorsRegexFromConfig() {
+    if (config.getCorsAllowedDomains().isEmpty()) {
+      return "";
+    }
+    if (config.getCorsAllowedDomains().contains("*")) {
+      return ".*";
+    } else {
+      final StringJoiner stringJoiner = new StringJoiner("|");
+      config.getCorsAllowedDomains().stream().filter(s -> !s.isEmpty()).forEach(stringJoiner::add);
+      return stringJoiner.toString();
+    }
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonResponseStreamer.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonResponseStreamer.java
new file mode 100644
index 00000000000..563538d22fa
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonResponseStreamer.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright Hyperledger Besu contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.concurrent.atomic.AtomicReference;
+
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.HttpServerResponse;
+import io.vertx.core.net.SocketAddress;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class JsonResponseStreamer extends OutputStream {
+
+  private static final Logger LOG = LoggerFactory.getLogger(JsonResponseStreamer.class);
+
+  private final HttpServerResponse response;
+  private final SocketAddress remoteAddress;
+  private final byte[] singleByteBuf = new byte[1];
+  private boolean chunked = false;
+  private boolean closed = false;
+  private final AtomicReference<Throwable> failure = new AtomicReference<>();
+
+  public JsonResponseStreamer(
+      final HttpServerResponse response, final SocketAddress socketAddress) {
+    this.response = response;
+    this.remoteAddress = socketAddress;
+    this.response.exceptionHandler(
+        event -> {
+          LOG.debug("Write to remote address {} failed", remoteAddress, event);
+          failure.set(event);
+        });
+  }
+
+  @Override
+  public void write(final int b) throws IOException {
+    singleByteBuf[0] = (byte) b;
+    write(singleByteBuf, 0, 1);
+  }
+
+  @Override
+  public void write(final byte[] bbuf, final int off, final int len) throws IOException {
+    stopOnFailureOrClosed();
+
+    if (!chunked) {
+      response.setChunked(true);
+      chunked = true;
+    }
+
+    Buffer buf = Buffer.buffer(len);
+    buf.appendBytes(bbuf, off, len);
+    response.write(buf).onFailure(this::handleFailure);
+  }
+
+  @Override
+  public void close() throws IOException {
+    if (!closed) {
+      response.end();
+      closed = true;
+    }
+  }
+
+  private void stopOnFailureOrClosed() throws IOException {
+    if (closed) {
+      throw new IOException("Stream closed");
+    }
+
+    Throwable t = failure.get();
+    if (t != null) {
+      LOG.debug("Stop writing to remote address {} due to a failure", remoteAddress, t);
+      throw (t instanceof IOException) ? (IOException) t : new IOException(t);
+    }
+  }
+
+  private void handleFailure(final Throwable t) {
+    LOG.debug("Write to remote address {} failed", remoteAddress, t);
+    failure.set(t);
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcConfiguration.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcConfiguration.java
index 7afc35a0ba7..cb77d9ce818 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcConfiguration.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcConfiguration.java
@@ -14,7 +14,10 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc;
 
+import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.DEFAULT_RPC_APIS;
+
 import org.hyperledger.besu.ethereum.api.handlers.TimeoutOptions;
+import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.JwtAlgorithm;
 import org.hyperledger.besu.ethereum.api.tls.TlsConfiguration;
 
 import java.io.File;
@@ -31,26 +34,52 @@
 public class JsonRpcConfiguration {
   private static final String DEFAULT_JSON_RPC_HOST = "127.0.0.1";
   public static final int DEFAULT_JSON_RPC_PORT = 8545;
+  public static final int DEFAULT_ENGINE_JSON_RPC_PORT = 8551;
+  public static final int DEFAULT_MAX_ACTIVE_CONNECTIONS = 80;
+  public static final int DEFAULT_MAX_BATCH_SIZE = 1024;
+  public static final long DEFAULT_MAX_REQUEST_CONTENT_LENGTH = 5 * 1024 * 1024; // 5MB
 
   private boolean enabled;
   private int port;
   private String host;
   private List<String> corsAllowedDomains = Collections.emptyList();
-  private List<RpcApi> rpcApis;
+  private List<String> rpcApis;
+  private List<String> noAuthRpcApis = Collections.emptyList();
   private List<String> hostsAllowlist = Arrays.asList("localhost", "127.0.0.1");
   private boolean authenticationEnabled = false;
   private String authenticationCredentialsFile;
+  private JwtAlgorithm authenticationAlgorithm = JwtAlgorithm.RS256;
   private File authenticationPublicKeyFile;
   private Optional<TlsConfiguration> tlsConfiguration = Optional.empty();
   private long httpTimeoutSec = TimeoutOptions.defaultOptions().getTimeoutSeconds();
+  private int maxActiveConnections;
+  private int maxBatchSize;
+  private long maxRequestContentLength;
 
   public static JsonRpcConfiguration createDefault() {
     final JsonRpcConfiguration config = new JsonRpcConfiguration();
     config.setEnabled(false);
     config.setPort(DEFAULT_JSON_RPC_PORT);
     config.setHost(DEFAULT_JSON_RPC_HOST);
-    config.rpcApis = RpcApis.DEFAULT_JSON_RPC_APIS;
+    config.setRpcApis(DEFAULT_RPC_APIS);
     config.httpTimeoutSec = TimeoutOptions.defaultOptions().getTimeoutSeconds();
+    config.setMaxActiveConnections(DEFAULT_MAX_ACTIVE_CONNECTIONS);
+    config.setMaxBatchSize(DEFAULT_MAX_BATCH_SIZE);
+    config.setMaxRequestContentLength(DEFAULT_MAX_REQUEST_CONTENT_LENGTH);
+    return config;
+  }
+
+  public static JsonRpcConfiguration createEngineDefault() {
+    final JsonRpcConfiguration config = createDefault();
+    config.setEnabled(false);
+    config.setPort(DEFAULT_ENGINE_JSON_RPC_PORT);
+    List<String> engineMethodGroup = new ArrayList<>(2);
+    engineMethodGroup.add(RpcApis.ENGINE.name());
+    engineMethodGroup.add(RpcApis.ETH.name());
+    config.setRpcApis(engineMethodGroup);
+    config.setAuthenticationEnabled(true);
+    config.setAuthenticationAlgorithm(JwtAlgorithm.HS256);
+    config.setAuthenticationPublicKeyFile(null); // ephemeral key will be generated on startup.
     return config;
   }
 
@@ -90,15 +119,23 @@ public void setCorsAllowedDomains(final List<String> corsAllowedDomains) {
     }
   }
 
-  public Collection<RpcApi> getRpcApis() {
+  public Collection<String> getRpcApis() {
     return rpcApis;
   }
 
-  public void setRpcApis(final List<RpcApi> rpcApis) {
+  public void setRpcApis(final List<String> rpcApis) {
     this.rpcApis = rpcApis;
   }
 
-  public void addRpcApi(final RpcApi rpcApi) {
+  public Collection<String> getNoAuthRpcApis() {
+    return this.noAuthRpcApis;
+  }
+
+  public void setNoAuthRpcApis(final List<String> rpcApis) {
+    this.noAuthRpcApis = rpcApis;
+  }
+
+  public void addRpcApi(final String rpcApi) {
     this.rpcApis = new ArrayList<>(rpcApis);
     rpcApis.add(rpcApi);
   }
@@ -107,8 +144,8 @@ public Collection<String> getHostsAllowlist() {
     return Collections.unmodifiableCollection(this.hostsAllowlist);
   }
 
-  public void setHostsAllowlist(final List<String> hostsWhitelist) {
-    this.hostsAllowlist = hostsWhitelist;
+  public void setHostsAllowlist(final List<String> hostsAllowlist) {
+    this.hostsAllowlist = hostsAllowlist;
   }
 
   public boolean isAuthenticationEnabled() {
@@ -135,6 +172,14 @@ public void setAuthenticationPublicKeyFile(final File authenticationPublicKeyFil
     this.authenticationPublicKeyFile = authenticationPublicKeyFile;
   }
 
+  public JwtAlgorithm getAuthenticationAlgorithm() {
+    return authenticationAlgorithm;
+  }
+
+  public void setAuthenticationAlgorithm(final JwtAlgorithm authenticationAlgorithm) {
+    this.authenticationAlgorithm = authenticationAlgorithm;
+  }
+
   public Optional<TlsConfiguration> getTlsConfiguration() {
     return tlsConfiguration;
   }
@@ -165,6 +210,8 @@ public String toString() {
         .add("authenticationPublicKeyFile", authenticationPublicKeyFile)
         .add("tlsConfiguration", tlsConfiguration)
         .add("httpTimeoutSec", httpTimeoutSec)
+        .add("maxActiveConnections", maxActiveConnections)
+        .add("maxBatchSize", maxBatchSize)
         .toString();
   }
 
@@ -185,7 +232,8 @@ public boolean equals(final Object o) {
         && Objects.equals(rpcApis, that.rpcApis)
         && Objects.equals(hostsAllowlist, that.hostsAllowlist)
         && Objects.equals(authenticationCredentialsFile, that.authenticationCredentialsFile)
-        && Objects.equals(authenticationPublicKeyFile, that.authenticationPublicKeyFile);
+        && Objects.equals(authenticationPublicKeyFile, that.authenticationPublicKeyFile)
+        && maxBatchSize == that.maxBatchSize;
   }
 
   @Override
@@ -199,6 +247,31 @@ public int hashCode() {
         hostsAllowlist,
         authenticationEnabled,
         authenticationCredentialsFile,
-        authenticationPublicKeyFile);
+        authenticationPublicKeyFile,
+        maxBatchSize);
+  }
+
+  public int getMaxActiveConnections() {
+    return maxActiveConnections;
+  }
+
+  public void setMaxActiveConnections(final int maxActiveConnections) {
+    this.maxActiveConnections = maxActiveConnections;
+  }
+
+  public int getMaxBatchSize() {
+    return maxBatchSize;
+  }
+
+  public void setMaxBatchSize(final int maxBatchSize) {
+    this.maxBatchSize = maxBatchSize;
+  }
+
+  public long getMaxRequestContentLength() {
+    return maxRequestContentLength;
+  }
+
+  public void setMaxRequestContentLength(final long maxRequestContentLength) {
+    this.maxRequestContentLength = maxRequestContentLength;
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcErrorConverter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcErrorConverter.java
index 360794cae0e..eae1ca83763 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcErrorConverter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcErrorConverter.java
@@ -25,9 +25,9 @@ public static JsonRpcError convertTransactionInvalidReason(
       case NONCE_TOO_LOW:
       case PRIVATE_NONCE_TOO_LOW:
         return JsonRpcError.NONCE_TOO_LOW;
-      case INCORRECT_NONCE:
-      case INCORRECT_PRIVATE_NONCE:
-        return JsonRpcError.INCORRECT_NONCE;
+      case NONCE_TOO_HIGH:
+      case PRIVATE_NONCE_TOO_HIGH:
+        return JsonRpcError.NONCE_TOO_HIGH;
       case INVALID_SIGNATURE:
         return JsonRpcError.INVALID_TRANSACTION_SIGNATURE;
       case INTRINSIC_GAS_EXCEEDS_GAS_LIMIT:
@@ -40,25 +40,45 @@ public static JsonRpcError convertTransactionInvalidReason(
         return JsonRpcError.WRONG_CHAIN_ID;
       case REPLAY_PROTECTED_SIGNATURES_NOT_SUPPORTED:
         return JsonRpcError.REPLAY_PROTECTED_SIGNATURES_NOT_SUPPORTED;
+      case REPLAY_PROTECTED_SIGNATURE_REQUIRED:
+        return JsonRpcError.REPLAY_PROTECTED_SIGNATURE_REQUIRED;
       case TX_SENDER_NOT_AUTHORIZED:
         return JsonRpcError.TX_SENDER_NOT_AUTHORIZED;
         // Private Transaction Invalid Reasons
+      case PRIVATE_TRANSACTION_INVALID:
+        return JsonRpcError.PRIVATE_TRANSACTION_INVALID;
+      case PRIVATE_TRANSACTION_FAILED:
+        return JsonRpcError.PRIVATE_TRANSACTION_FAILED;
+      case PRIVATE_UNIMPLEMENTED_TRANSACTION_TYPE:
+        return JsonRpcError.UNSUPPORTED_PRIVATE_TRANSACTION_TYPE;
       case CHAIN_HEAD_WORLD_STATE_NOT_AVAILABLE:
         return JsonRpcError.CHAIN_HEAD_WORLD_STATE_NOT_AVAILABLE;
       case GAS_PRICE_TOO_LOW:
         return JsonRpcError.GAS_PRICE_TOO_LOW;
+      case GAS_PRICE_BELOW_CURRENT_BASE_FEE:
+        return JsonRpcError.GAS_PRICE_BELOW_CURRENT_BASE_FEE;
       case TX_FEECAP_EXCEEDED:
         return JsonRpcError.TX_FEECAP_EXCEEDED;
+      case MAX_PRIORITY_FEE_PER_GAS_EXCEEDS_MAX_FEE_PER_GAS:
+        return JsonRpcError.MAX_PRIORITY_FEE_PER_GAS_EXCEEDS_MAX_FEE_PER_GAS;
       case OFFCHAIN_PRIVACY_GROUP_DOES_NOT_EXIST:
         return JsonRpcError.OFFCHAIN_PRIVACY_GROUP_DOES_NOT_EXIST;
+      case INVALID_TRANSACTION_FORMAT:
+        return JsonRpcError.INVALID_TRANSACTION_TYPE;
       case TRANSACTION_ALREADY_KNOWN:
         return JsonRpcError.ETH_SEND_TX_ALREADY_KNOWN;
       case TRANSACTION_REPLACEMENT_UNDERPRICED:
         return JsonRpcError.ETH_SEND_TX_REPLACEMENT_UNDERPRICED;
-      case GAS_PRICE_MUST_BE_ZERO:
-        return JsonRpcError.GAS_PRICE_MUST_BE_ZERO;
+      case NONCE_TOO_FAR_IN_FUTURE_FOR_SENDER:
+        return JsonRpcError.NONCE_TOO_FAR_IN_FUTURE_FOR_SENDER;
+      case LOWER_NONCE_INVALID_TRANSACTION_EXISTS:
+        return JsonRpcError.LOWER_NONCE_INVALID_TRANSACTION_EXISTS;
+      case TOTAL_DATA_GAS_TOO_HIGH:
+        return JsonRpcError.TOTAL_DATA_GAS_TOO_HIGH;
+      case TX_POOL_DISABLED:
+        return JsonRpcError.TX_POOL_DISABLED;
       default:
-        return JsonRpcError.INVALID_PARAMS;
+        return JsonRpcError.INTERNAL_ERROR;
     }
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpService.java
index 1a099d329a0..12d623bdacb 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpService.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpService.java
@@ -16,32 +16,24 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.Streams.stream;
-import static java.util.stream.Collectors.toList;
-import static org.apache.tuweni.net.tls.VertxTrustOptions.whitelistClients;
-import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.INVALID_PARAMS;
-import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.INVALID_REQUEST;
+import static org.apache.tuweni.net.tls.VertxTrustOptions.allowlistClients;
 
 import org.hyperledger.besu.ethereum.api.handlers.HandlerFactory;
 import org.hyperledger.besu.ethereum.api.handlers.TimeoutOptions;
 import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationService;
-import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationUtils;
-import org.hyperledger.besu.ethereum.api.jsonrpc.context.ContextKey;
+import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.DefaultAuthenticationService;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.AuthenticatedJsonRpcProcessor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.BaseJsonRpcProcessor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.JsonRpcExecutor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.TimedJsonRpcProcessor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.TracedJsonRpcProcessor;
 import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestId;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.Logging403ErrorHandler;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcNoResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcUnauthorizedResponse;
 import org.hyperledger.besu.ethereum.api.tls.TlsClientAuthConfiguration;
 import org.hyperledger.besu.ethereum.api.tls.TlsConfiguration;
-import org.hyperledger.besu.ethereum.privacy.MultiTenancyValidationException;
 import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.metrics.opentelemetry.OpenTelemetrySystem;
 import org.hyperledger.besu.nat.NatMethod;
 import org.hyperledger.besu.nat.NatService;
 import org.hyperledger.besu.nat.core.domain.NatServiceType;
@@ -54,49 +46,80 @@
 import org.hyperledger.besu.util.NetworkUtility;
 
 import java.net.InetSocketAddress;
-import java.net.SocketException;
 import java.nio.file.Path;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.StringJoiner;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.annotation.Nullable;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Iterables;
-import io.netty.handler.codec.http.HttpResponseStatus;
-import io.vertx.core.CompositeFuture;
-import io.vertx.core.Future;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.baggage.propagation.W3CBaggagePropagator;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.api.trace.StatusCode;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.api.trace.TracerProvider;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.context.propagation.TextMapGetter;
+import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.extension.trace.propagation.B3Propagator;
+import io.opentelemetry.extension.trace.propagation.JaegerPropagator;
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
 import io.vertx.core.VertxException;
 import io.vertx.core.http.ClientAuth;
+import io.vertx.core.http.HttpConnection;
+import io.vertx.core.http.HttpHeaders;
 import io.vertx.core.http.HttpMethod;
 import io.vertx.core.http.HttpServer;
 import io.vertx.core.http.HttpServerOptions;
+import io.vertx.core.http.HttpServerRequest;
 import io.vertx.core.http.HttpServerResponse;
-import io.vertx.core.json.DecodeException;
-import io.vertx.core.json.Json;
-import io.vertx.core.json.JsonArray;
-import io.vertx.core.json.JsonObject;
 import io.vertx.core.net.PfxOptions;
-import io.vertx.ext.auth.User;
+import io.vertx.core.net.SocketAddress;
+import io.vertx.ext.web.Route;
 import io.vertx.ext.web.Router;
 import io.vertx.ext.web.RoutingContext;
 import io.vertx.ext.web.handler.BodyHandler;
 import io.vertx.ext.web.handler.CorsHandler;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JsonRpcHttpService {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(JsonRpcHttpService.class);
 
+  private static final String SPAN_CONTEXT = "span_context";
   private static final InetSocketAddress EMPTY_SOCKET_ADDRESS = new InetSocketAddress("0.0.0.0", 0);
   private static final String APPLICATION_JSON = "application/json";
-  private static final JsonRpcResponse NO_RESPONSE = new JsonRpcNoResponse();
-  private static final String EMPTY_RESPONSE = "";
+
+  private static final TextMapPropagator traceFormats =
+      TextMapPropagator.composite(
+          JaegerPropagator.getInstance(),
+          B3Propagator.injectingSingleHeader(),
+          W3CBaggagePropagator.getInstance());
+
+  private static final TextMapGetter<HttpServerRequest> requestAttributesGetter =
+      new TextMapGetter<>() {
+        @Override
+        public Iterable<String> keys(final HttpServerRequest carrier) {
+          return carrier.headers().names();
+        }
+
+        @Nullable
+        @Override
+        public String get(final @Nullable HttpServerRequest carrier, final String key) {
+          if (carrier == null) {
+            return null;
+          }
+          return carrier.headers().get(key);
+        }
+      };
 
   private final Vertx vertx;
   private final JsonRpcConfiguration config;
@@ -104,6 +127,10 @@ public class JsonRpcHttpService {
   private final NatService natService;
   private final Path dataDir;
   private final LabelledMetric<OperationTimer> requestTimer;
+  private TracerProvider tracerProvider;
+  private Tracer tracer;
+  private final int maxActiveConnections;
+  private final AtomicInteger activeConnectionsCount = new AtomicInteger();
 
   @VisibleForTesting public final Optional<AuthenticationService> authenticationService;
 
@@ -139,12 +166,12 @@ public JsonRpcHttpService(
         metricsSystem,
         natService,
         methods,
-        AuthenticationService.create(vertx, config),
+        DefaultAuthenticationService.create(vertx, config),
         livenessService,
         readinessService);
   }
 
-  private JsonRpcHttpService(
+  public JsonRpcHttpService(
       final Vertx vertx,
       final Path dataDir,
       final JsonRpcConfiguration config,
@@ -161,6 +188,13 @@ private JsonRpcHttpService(
             "request_time",
             "Time taken to process a JSON-RPC request",
             "methodName");
+
+    metricsSystem.createIntegerGauge(
+        BesuMetricCategory.RPC,
+        "active_http_connection_count",
+        "Total no of active rpc http connections",
+        activeConnectionsCount::intValue);
+
     validateConfig(config);
     this.config = config;
     this.vertx = vertx;
@@ -169,6 +203,10 @@ private JsonRpcHttpService(
     this.authenticationService = authenticationService;
     this.livenessService = livenessService;
     this.readinessService = readinessService;
+    this.maxActiveConnections = config.getMaxActiveConnections();
+    if (metricsSystem instanceof OpenTelemetrySystem) {
+      this.tracerProvider = ((OpenTelemetrySystem) metricsSystem).getTracerProvider();
+    }
   }
 
   private void validateConfig(final JsonRpcConfiguration config) {
@@ -176,15 +214,26 @@ private void validateConfig(final JsonRpcConfiguration config) {
         config.getPort() == 0 || NetworkUtility.isValidPort(config.getPort()),
         "Invalid port configuration.");
     checkArgument(config.getHost() != null, "Required host is not configured.");
+    checkArgument(
+        config.getMaxActiveConnections() > 0, "Invalid max active connections configuration.");
   }
 
   public CompletableFuture<?> start() {
     LOG.info("Starting JSON-RPC service on {}:{}", config.getHost(), config.getPort());
-
+    LOG.debug("max number of active connections {}", maxActiveConnections);
+    if (this.tracerProvider != null) {
+      this.tracer = tracerProvider.get("org.hyperledger.besu.jsonrpc", "1.0.0");
+    } else {
+      this.tracer = OpenTelemetry.noop().getTracer("org.hyperledger.besu.jsonrpc", "1.0.0");
+    }
     final CompletableFuture<?> resultFuture = new CompletableFuture<>();
     try {
+
       // Create the HTTP server and a router object.
       httpServer = vertx.createHttpServer(getHttpServerOptions());
+
+      httpServer.connectionHandler(connectionHandler());
+
       httpServer
           .requestHandler(buildRouter())
           .listen(
@@ -226,13 +275,41 @@ public CompletableFuture<?> start() {
     return resultFuture;
   }
 
+  private Handler<HttpConnection> connectionHandler() {
+
+    return connection -> {
+      if (activeConnectionsCount.get() >= maxActiveConnections) {
+        // disallow new connections to prevent DoS
+        LOG.warn(
+            "Rejecting new connection from {}. Max {} active connections limit reached.",
+            connection.remoteAddress(),
+            activeConnectionsCount.getAndIncrement());
+        connection.close();
+      } else {
+        LOG.debug(
+            "Opened connection from {}. Total of active connections: {}/{}",
+            connection.remoteAddress(),
+            activeConnectionsCount.incrementAndGet(),
+            maxActiveConnections);
+      }
+      connection.closeHandler(
+          c ->
+              LOG.debug(
+                  "Connection closed from {}. Total of active connections: {}/{}",
+                  connection.remoteAddress(),
+                  activeConnectionsCount.decrementAndGet(),
+                  maxActiveConnections));
+    };
+  }
+
   private Router buildRouter() {
     // Handle json rpc requests
     final Router router = Router.router(vertx);
+    router.route().handler(this::createSpan);
 
     // Verify Host header to avoid rebind attack.
     router.route().handler(checkAllowlistHostHeader());
-
+    router.errorHandler(403, new Logging403ErrorHandler());
     router
         .route()
         .handler(
@@ -243,6 +320,7 @@ private Router buildRouter() {
         .route()
         .handler(
             BodyHandler.create()
+                .setBodyLimit(config.getMaxRequestContentLength())
                 .setUploadsDirectory(dataDir.resolve("uploads").toString())
                 .setDeleteUploadedFilesOnEnd(true));
     router.route("/").method(HttpMethod.GET).handler(this::handleEmptyRequest);
@@ -254,14 +332,39 @@ private Router buildRouter() {
         .route(HealthService.READINESS_PATH)
         .method(HttpMethod.GET)
         .handler(readinessService::handleRequest);
-    router
-        .route("/")
-        .method(HttpMethod.POST)
-        .produces(APPLICATION_JSON)
+    Route mainRoute = router.route("/").method(HttpMethod.POST).produces(APPLICATION_JSON);
+    if (authenticationService.isPresent()) {
+      mainRoute.handler(
+          HandlerFactory.authentication(authenticationService.get(), config.getNoAuthRpcApis()));
+    }
+    mainRoute
+        .handler(HandlerFactory.jsonRpcParser())
         .handler(
-            HandlerFactory.timeout(
-                new TimeoutOptions(config.getHttpTimeoutSec()), rpcMethods, true))
-        .handler(this::handleJsonRPCRequest);
+            HandlerFactory.timeout(new TimeoutOptions(config.getHttpTimeoutSec()), rpcMethods));
+    if (authenticationService.isPresent()) {
+      mainRoute.blockingHandler(
+          HandlerFactory.jsonRpcExecutor(
+              new JsonRpcExecutor(
+                  new AuthenticatedJsonRpcProcessor(
+                      new TimedJsonRpcProcessor(
+                          new TracedJsonRpcProcessor(new BaseJsonRpcProcessor()), requestTimer),
+                      authenticationService.get(),
+                      config.getNoAuthRpcApis()),
+                  rpcMethods),
+              tracer,
+              config),
+          false);
+    } else {
+      mainRoute.blockingHandler(
+          HandlerFactory.jsonRpcExecutor(
+              new JsonRpcExecutor(
+                  new TimedJsonRpcProcessor(
+                      new TracedJsonRpcProcessor(new BaseJsonRpcProcessor()), requestTimer),
+                  rpcMethods),
+              tracer,
+              config),
+          false);
+    }
 
     if (authenticationService.isPresent()) {
       router
@@ -274,17 +377,42 @@ private Router buildRouter() {
           .route("/login")
           .method(HttpMethod.POST)
           .produces(APPLICATION_JSON)
-          .handler(AuthenticationService::handleDisabledLogin);
+          .handler(DefaultAuthenticationService::handleDisabledLogin);
     }
     return router;
   }
 
+  private void createSpan(final RoutingContext routingContext) {
+    final SocketAddress address = routingContext.request().connection().remoteAddress();
+
+    Context parent =
+        traceFormats.extract(Context.current(), routingContext.request(), requestAttributesGetter);
+    final Span serverSpan =
+        tracer
+            .spanBuilder(address.host() + ":" + address.port())
+            .setParent(parent)
+            .setSpanKind(SpanKind.SERVER)
+            .startSpan();
+    routingContext.put(SPAN_CONTEXT, Context.current().with(serverSpan));
+
+    routingContext.addEndHandler(
+        event -> {
+          if (event.failed()) {
+            serverSpan.recordException(event.cause());
+            serverSpan.setStatus(StatusCode.ERROR);
+          }
+          serverSpan.end();
+        });
+    routingContext.next();
+  }
+
   private HttpServerOptions getHttpServerOptions() {
     final HttpServerOptions httpServerOptions =
         new HttpServerOptions()
             .setHost(config.getHost())
             .setPort(config.getPort())
-            .setHandle100ContinueAutomatically(true);
+            .setHandle100ContinueAutomatically(true)
+            .setCompressionSupported(true);
 
     applyTlsConfig(httpServerOptions);
     return httpServerOptions;
@@ -305,6 +433,19 @@ private void applyTlsConfig(final HttpServerOptions httpServerOptions) {
                   .setPassword(tlsConfiguration.getKeyStorePassword()))
           .setUseAlpn(true);
 
+      tlsConfiguration
+          .getSecureTransportProtocols()
+          .ifPresent(httpServerOptions::setEnabledSecureTransportProtocols);
+
+      tlsConfiguration
+          .getCipherSuites()
+          .ifPresent(
+              cipherSuites -> {
+                for (String cs : cipherSuites) {
+                  httpServerOptions.addEnabledCipherSuite(cs);
+                }
+              });
+
       tlsConfiguration
           .getClientAuthConfiguration()
           .ifPresent(
@@ -327,7 +468,7 @@ private void applyTlsClientAuth(
         .ifPresent(
             knownClientsFile ->
                 httpServerOptions.setTrustOptions(
-                    whitelistClients(
+                    allowlistClients(
                         knownClientsFile, clientAuthConfiguration.isCaClientsEnabled())));
   }
 
@@ -336,13 +477,15 @@ private String tlsLogMessage() {
   }
 
   private Throwable getFailureException(final Throwable listenFailure) {
-    if (listenFailure instanceof SocketException) {
-      return new JsonRpcServiceException(
-          String.format(
-              "Failed to bind Ethereum JSON-RPC listener to %s:%s: %s",
-              config.getHost(), config.getPort(), listenFailure.getMessage()));
-    }
-    return listenFailure;
+
+    JsonRpcServiceException servFail =
+        new JsonRpcServiceException(
+            String.format(
+                "Failed to bind Ethereum JSON-RPC listener to %s:%s: %s",
+                config.getHost(), config.getPort(), listenFailure.getMessage()));
+    servFail.initCause(listenFailure);
+
+    return servFail;
   }
 
   private Handler<RoutingContext> checkAllowlistHostHeader() {
@@ -363,13 +506,12 @@ private Handler<RoutingContext> checkAllowlistHostHeader() {
     };
   }
 
-  private String getAuthToken(final RoutingContext routingContext) {
-    return AuthenticationUtils.getJwtTokenFromAuthorizationHeaderValue(
-        routingContext.request().getHeader("Authorization"));
-  }
-
   private Optional<String> getAndValidateHostHeader(final RoutingContext event) {
-    final Iterable<String> splitHostHeader = Splitter.on(':').split(event.request().host());
+    String hostname =
+        event.request().getHeader(HttpHeaders.HOST) != null
+            ? event.request().getHeader(HttpHeaders.HOST)
+            : event.request().host();
+    final Iterable<String> splitHostHeader = Splitter.on(':').split(hostname);
     final long hostPieces = stream(splitHostHeader).count();
     if (hostPieces > 1) {
       // If the host contains a colon, verify the host is correctly formed - host [ ":" port ]
@@ -428,257 +570,17 @@ private String getScheme() {
     return config.getTlsConfiguration().isPresent() ? "https" : "http";
   }
 
-  private void handleJsonRPCRequest(final RoutingContext routingContext) {
-    // first check token if authentication is required
-    final String token = getAuthToken(routingContext);
-    if (authenticationService.isPresent() && token == null) {
-      // no auth token when auth required
-      handleJsonRpcUnauthorizedError(routingContext, null, JsonRpcError.UNAUTHORIZED);
-    } else {
-      // Parse json
-      try {
-        final String json = routingContext.getBodyAsString().trim();
-        if (!json.isEmpty() && json.charAt(0) == '{') {
-          final JsonObject requestBodyJsonObject =
-              ContextKey.REQUEST_BODY_AS_JSON_OBJECT.extractFrom(
-                  routingContext, () -> new JsonObject(json));
-          AuthenticationUtils.getUser(
-              authenticationService,
-              token,
-              user -> handleJsonSingleRequest(routingContext, requestBodyJsonObject, user));
-        } else {
-          final JsonArray array = new JsonArray(json);
-          if (array.size() < 1) {
-            handleJsonRpcError(routingContext, null, INVALID_REQUEST);
-            return;
-          }
-          AuthenticationUtils.getUser(
-              authenticationService,
-              token,
-              user -> handleJsonBatchRequest(routingContext, array, user));
-        }
-      } catch (final DecodeException ex) {
-        handleJsonRpcError(routingContext, null, JsonRpcError.PARSE_ERROR);
-      }
-    }
-  }
-
   // Facilitate remote health-checks in AWS, inter alia.
   private void handleEmptyRequest(final RoutingContext routingContext) {
     routingContext.response().setStatusCode(201).end();
   }
 
-  private void handleJsonSingleRequest(
-      final RoutingContext routingContext, final JsonObject request, final Optional<User> user) {
-    final HttpServerResponse response = routingContext.response();
-    vertx.executeBlocking(
-        future -> {
-          final JsonRpcResponse jsonRpcResponse = process(routingContext, request, user);
-          future.complete(jsonRpcResponse);
-        },
-        false,
-        (res) -> {
-          if (!response.closed() && !response.headWritten()) {
-            if (res.failed()) {
-              response.setStatusCode(HttpResponseStatus.INTERNAL_SERVER_ERROR.code()).end();
-              return;
-            }
-
-            final JsonRpcResponse jsonRpcResponse = (JsonRpcResponse) res.result();
-
-            response
-                .setStatusCode(status(jsonRpcResponse).code())
-                .putHeader("Content-Type", APPLICATION_JSON)
-                .end(serialize(jsonRpcResponse));
-          }
-        });
-  }
-
-  private HttpResponseStatus status(final JsonRpcResponse response) {
-    switch (response.getType()) {
-      case UNAUTHORIZED:
-        return HttpResponseStatus.UNAUTHORIZED;
-      case ERROR:
-        return statusCodeFromError(((JsonRpcErrorResponse) response).getError());
-      case SUCCESS:
-      case NONE:
-      default:
-        return HttpResponseStatus.OK;
-    }
-  }
-
-  private HttpResponseStatus statusCodeFromError(final JsonRpcError error) {
-    switch (error) {
-      case INVALID_REQUEST:
-      case INVALID_PARAMS:
-      case PARSE_ERROR:
-        return HttpResponseStatus.BAD_REQUEST;
-      default:
-        return HttpResponseStatus.OK;
-    }
-  }
-
-  private String serialize(final JsonRpcResponse response) {
-
-    if (response.getType() == JsonRpcResponseType.NONE) {
-      return EMPTY_RESPONSE;
-    }
-
-    return Json.encodePrettily(response);
-  }
-
-  @SuppressWarnings("rawtypes")
-  private void handleJsonBatchRequest(
-      final RoutingContext routingContext, final JsonArray jsonArray, final Optional<User> user) {
-    // Interpret json as rpc request
-    final List<Future> responses =
-        jsonArray.stream()
-            .map(
-                obj -> {
-                  if (!(obj instanceof JsonObject)) {
-                    return Future.succeededFuture(errorResponse(null, INVALID_REQUEST));
-                  }
-
-                  final JsonObject req = (JsonObject) obj;
-                  final Future<JsonRpcResponse> fut = Future.future();
-                  vertx.executeBlocking(
-                      future -> future.complete(process(routingContext, req, user)),
-                      false,
-                      ar -> {
-                        if (ar.failed()) {
-                          fut.fail(ar.cause());
-                        } else {
-                          fut.complete((JsonRpcResponse) ar.result());
-                        }
-                      });
-                  return fut;
-                })
-            .collect(toList());
-
-    CompositeFuture.all(responses)
-        .setHandler(
-            (res) -> {
-              final HttpServerResponse response = routingContext.response();
-              if (response.closed() || response.headWritten()) {
-                return;
-              }
-              if (res.failed()) {
-                response.setStatusCode(HttpResponseStatus.BAD_REQUEST.code()).end();
-                return;
-              }
-              final JsonRpcResponse[] completed =
-                  res.result().list().stream()
-                      .map(JsonRpcResponse.class::cast)
-                      .filter(this::isNonEmptyResponses)
-                      .toArray(JsonRpcResponse[]::new);
-
-              response.end(Json.encode(completed));
-            });
-  }
-
-  private boolean isNonEmptyResponses(final JsonRpcResponse result) {
-    return result.getType() != JsonRpcResponseType.NONE;
-  }
-
-  private JsonRpcResponse process(
-      final RoutingContext ctx, final JsonObject requestJson, final Optional<User> user) {
-    final JsonRpcRequest requestBody;
-    Object id = null;
-    try {
-      id = new JsonRpcRequestId(requestJson.getValue("id")).getValue();
-      requestBody = requestJson.mapTo(JsonRpcRequest.class);
-    } catch (final IllegalArgumentException exception) {
-      return errorResponse(id, INVALID_REQUEST);
-    }
-    // Handle notifications
-    if (requestBody.isNotification()) {
-      // Notifications aren't handled so create empty result for now.
-      return NO_RESPONSE;
-    }
-
-    final Optional<JsonRpcError> unavailableMethod = validateMethodAvailability(requestBody);
-    if (unavailableMethod.isPresent()) {
-      return errorResponse(id, unavailableMethod.get());
-    }
-
-    final JsonRpcMethod method = rpcMethods.get(requestBody.getMethod());
-
-    if (AuthenticationUtils.isPermitted(authenticationService, user, method)) {
-      // Generate response
-      try (final OperationTimer.TimingContext ignored =
-          requestTimer.labels(requestBody.getMethod()).startTimer()) {
-        if (user.isPresent()) {
-          return method.response(
-              new JsonRpcRequestContext(requestBody, user.get(), () -> !ctx.response().closed()));
-        }
-        return method.response(
-            new JsonRpcRequestContext(requestBody, () -> !ctx.response().closed()));
-      } catch (final InvalidJsonRpcParameters e) {
-        LOG.debug("Invalid Params", e);
-        return errorResponse(id, JsonRpcError.INVALID_PARAMS);
-      } catch (final MultiTenancyValidationException e) {
-        return unauthorizedResponse(id, JsonRpcError.UNAUTHORIZED);
-      } catch (final RuntimeException e) {
-        LOG.error("Error processing JSON-RPC requestBody", e);
-        return errorResponse(id, JsonRpcError.INTERNAL_ERROR);
-      }
-    } else {
-      return unauthorizedResponse(id, JsonRpcError.UNAUTHORIZED);
-    }
-  }
-
-  private Optional<JsonRpcError> validateMethodAvailability(final JsonRpcRequest request) {
-    final String name = request.getMethod();
-    LOG.debug("JSON-RPC request -> {}", name);
-
-    final JsonRpcMethod method = rpcMethods.get(name);
-
-    if (method == null) {
-      if (!RpcMethod.rpcMethodExists(name)) {
-        return Optional.of(JsonRpcError.METHOD_NOT_FOUND);
-      }
-      if (!rpcMethods.containsKey(name)) {
-        return Optional.of(JsonRpcError.METHOD_NOT_ENABLED);
-      }
-    }
-
-    return Optional.empty();
-  }
-
-  private void handleJsonRpcError(
-      final RoutingContext routingContext, final Object id, final JsonRpcError error) {
-    final HttpServerResponse response = routingContext.response();
-    if (!response.closed()) {
-      response
-          .setStatusCode(statusCodeFromError(error).code())
-          .end(Json.encode(new JsonRpcErrorResponse(id, error)));
-    }
-  }
-
-  private void handleJsonRpcUnauthorizedError(
-      final RoutingContext routingContext, final Object id, final JsonRpcError error) {
-    final HttpServerResponse response = routingContext.response();
-    if (!response.closed()) {
-      response
-          .setStatusCode(HttpResponseStatus.UNAUTHORIZED.code())
-          .end(Json.encode(new JsonRpcErrorResponse(id, error)));
-    }
-  }
-
-  private JsonRpcResponse errorResponse(final Object id, final JsonRpcError error) {
-    return new JsonRpcErrorResponse(id, error);
-  }
-
-  private JsonRpcResponse unauthorizedResponse(final Object id, final JsonRpcError error) {
-    return new JsonRpcUnauthorizedResponse(id, error);
-  }
-
   private String buildCorsRegexFromConfig() {
     if (config.getCorsAllowedDomains().isEmpty()) {
       return "";
     }
     if (config.getCorsAllowedDomains().contains("*")) {
-      return "*";
+      return ".*";
     } else {
       final StringJoiner stringJoiner = new StringJoiner("|");
       config.getCorsAllowedDomains().stream().filter(s -> !s.isEmpty()).forEach(stringJoiner::add);
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/LatestNonceProvider.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/LatestNonceProvider.java
index 90020802b67..dae8662caa0 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/LatestNonceProvider.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/LatestNonceProvider.java
@@ -14,8 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
 import org.hyperledger.besu.ethereum.util.NonceProvider;
 
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcApi.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcApi.java
deleted file mode 100644
index 476c6c138bf..00000000000
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcApi.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.api.jsonrpc;
-
-import java.util.Objects;
-
-public class RpcApi {
-  private final String cliValue;
-
-  public RpcApi(final String cliValue) {
-    this.cliValue = cliValue;
-  }
-
-  public String getCliValue() {
-    return cliValue;
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    final RpcApi rpcApi = (RpcApi) o;
-    return Objects.equals(cliValue, rpcApi.cliValue);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hashCode(cliValue);
-  }
-
-  @Override
-  public String toString() {
-    return cliValue;
-  }
-}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcApis.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcApis.java
index dcbebc653ad..7f147f5f8ba 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcApis.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcApis.java
@@ -16,56 +16,33 @@
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
-public class RpcApis {
+public enum RpcApis {
+  ETH,
+  DEBUG,
+  MINER,
+  NET,
+  PERM,
+  WEB3,
+  ADMIN,
+  EEA,
+  PRIV,
+  TXPOOL,
+  TRACE,
+  PLUGINS,
+  CLIQUE,
+  IBFT,
+  ENGINE,
+  QBFT;
 
-  public static final RpcApi ETH = new RpcApi("ETH");
-  public static final RpcApi DEBUG = new RpcApi("DEBUG");
-  public static final RpcApi MINER = new RpcApi("MINER");
-  public static final RpcApi NET = new RpcApi("NET");
-  public static final RpcApi PERM = new RpcApi("PERM");
-  public static final RpcApi WEB3 = new RpcApi("WEB3");
-  public static final RpcApi ADMIN = new RpcApi("ADMIN");
-  public static final RpcApi EEA = new RpcApi("EEA");
-  public static final RpcApi PRIV = new RpcApi("PRIV");
-  public static final RpcApi TX_POOL = new RpcApi("TXPOOL");
-  public static final RpcApi TRACE = new RpcApi("TRACE");
-  public static final RpcApi PLUGINS = new RpcApi("PLUGINS");
+  public static final List<String> DEFAULT_RPC_APIS = Arrays.asList("ETH", "NET", "WEB3");
 
-  public static final List<RpcApi> DEFAULT_JSON_RPC_APIS = Arrays.asList(ETH, NET, WEB3);
+  @SuppressWarnings("unused")
+  public static final List<RpcApis> ALL_JSON_RPC_APIS =
+      Arrays.asList(ETH, DEBUG, MINER, NET, PERM, WEB3, ADMIN, EEA, PRIV, TXPOOL, TRACE, PLUGINS);
 
-  public static Optional<RpcApi> valueOf(final String name) {
-    if (name.equals(ETH.getCliValue())) {
-      return Optional.of(ETH);
-    } else if (name.equals(DEBUG.getCliValue())) {
-      return Optional.of(DEBUG);
-    } else if (name.equals(MINER.getCliValue())) {
-      return Optional.of(MINER);
-    } else if (name.equals(NET.getCliValue())) {
-      return Optional.of(NET);
-    } else if (name.equals(PERM.getCliValue())) {
-      return Optional.of(PERM);
-    } else if (name.equals(WEB3.getCliValue())) {
-      return Optional.of(WEB3);
-    } else if (name.equals(ADMIN.getCliValue())) {
-      return Optional.of(ADMIN);
-    } else if (name.equals(EEA.getCliValue())) {
-      return Optional.of(EEA);
-    } else if (name.equals(PRIV.getCliValue())) {
-      return Optional.of(PRIV);
-    } else if (name.equals(TX_POOL.getCliValue())) {
-      return Optional.of(TX_POOL);
-    } else if (name.equals(TRACE.getCliValue())) {
-      return Optional.of(TRACE);
-    } else if (name.equals(PLUGINS.getCliValue())) {
-      return Optional.of(PLUGINS);
-    } else {
-      return Optional.empty();
-    }
-  }
-
-  public static String getValue(final RpcApi rpcapi) {
-    return rpcapi.getCliValue();
-  }
+  public static final List<String> VALID_APIS =
+      Stream.of(RpcApis.values()).map(RpcApis::name).collect(Collectors.toList());
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcMethod.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcMethod.java
index 723feff1db3..9c7871b6a27 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcMethod.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcMethod.java
@@ -32,7 +32,11 @@ public enum RpcMethod {
   CLIQUE_GET_PROPOSALS("clique_proposals"),
   CLIQUE_PROPOSE("clique_propose"),
   CLIQUE_GET_SIGNER_METRICS("clique_getSignerMetrics"),
+  DEBUG_ACCOUNT_AT("debug_accountAt"),
   DEBUG_METRICS("debug_metrics"),
+  DEBUG_RESYNC_WORLDSTATE("debug_resyncWorldState"),
+  DEBUG_SET_HEAD("debug_setHead"),
+  DEBUG_REPLAY_BLOCK("debug_replayBlock"),
   DEBUG_STORAGE_RANGE_AT("debug_storageRangeAt"),
   DEBUG_TRACE_BLOCK("debug_traceBlock"),
   DEBUG_TRACE_BLOCK_BY_HASH("debug_traceBlockByHash"),
@@ -42,6 +46,21 @@ public enum RpcMethod {
   DEBUG_TRACE_TRANSACTION("debug_traceTransaction"),
   DEBUG_BATCH_RAW_TRANSACTION("debug_batchSendRawTransaction"),
   DEBUG_GET_BAD_BLOCKS("debug_getBadBlocks"),
+  DEBUG_GET_RAW_HEADER("debug_getRawHeader"),
+  DEBUG_GET_RAW_BLOCK("debug_getRawBlock"),
+  DEBUG_GET_RAW_RECEIPTS("debug_getRawReceipts"),
+  DEBUG_GET_RAW_TRANSACTION("debug_getRawTransaction"),
+  ENGINE_GET_PAYLOAD_V1("engine_getPayloadV1"),
+  ENGINE_GET_PAYLOAD_V2("engine_getPayloadV2"),
+  ENGINE_NEW_PAYLOAD_V1("engine_newPayloadV1"),
+  ENGINE_NEW_PAYLOAD_V2("engine_newPayloadV2"),
+  ENGINE_FORKCHOICE_UPDATED_V1("engine_forkchoiceUpdatedV1"),
+  ENGINE_FORKCHOICE_UPDATED_V2("engine_forkchoiceUpdatedV2"),
+  ENGINE_EXCHANGE_TRANSITION_CONFIGURATION("engine_exchangeTransitionConfigurationV1"),
+  ENGINE_GET_PAYLOAD_BODIES_BY_HASH_V1("engine_getPayloadBodiesByHashV1"),
+  ENGINE_GET_PAYLOAD_BODIES_BY_RANGE_V1("engine_getPayloadBodiesByRangeV1"),
+  ENGINE_EXCHANGE_CAPABILITIES("engine_exchangeCapabilities"),
+  ENGINE_PREPARE_PAYLOAD_DEBUG("engine_preparePayload_debug"),
   PRIV_CALL("priv_call"),
   PRIV_GET_PRIVATE_TRANSACTION("priv_getPrivateTransaction"),
   PRIV_GET_TRANSACTION_COUNT("priv_getTransactionCount"),
@@ -61,7 +80,8 @@ public enum RpcMethod {
   PRIV_GET_FILTER_LOGS("priv_getFilterLogs"),
   PRIV_SUBSCRIBE("priv_subscribe"),
   PRIV_UNSUBSCRIBE("priv_unsubscribe"),
-  PRIVX_FIND_PRIVACY_GROUP("privx_findOnChainPrivacyGroup"),
+  PRIVX_FIND_PRIVACY_GROUP_OLD("privx_findOnchainPrivacyGroup"),
+  PRIVX_FIND_PRIVACY_GROUP("privx_findFlexiblePrivacyGroup"),
   EEA_SEND_RAW_TRANSACTION("eea_sendRawTransaction"),
   ETH_ACCOUNTS("eth_accounts"),
   ETH_BLOCK_NUMBER("eth_blockNumber"),
@@ -69,6 +89,8 @@ public enum RpcMethod {
   ETH_CHAIN_ID("eth_chainId"),
   ETH_COINBASE("eth_coinbase"),
   ETH_ESTIMATE_GAS("eth_estimateGas"),
+  ETH_CREATE_ACCESS_LIST("eth_createAccessList"),
+  ETH_FEE_HISTORY("eth_feeHistory"),
   ETH_GAS_PRICE("eth_gasPrice"),
   ETH_GET_BALANCE("eth_getBalance"),
   ETH_GET_BLOCK_BY_HASH("eth_getBlockByHash"),
@@ -94,14 +116,15 @@ public enum RpcMethod {
   ETH_GET_UNCLE_COUNT_BY_BLOCK_NUMBER("eth_getUncleCountByBlockNumber"),
   ETH_GET_WORK("eth_getWork"),
   ETH_HASHRATE("eth_hashrate"),
-  ETH_SUBMIT_HASHRATE("eth_submitHashrate"),
   ETH_MINING("eth_mining"),
   ETH_NEW_BLOCK_FILTER("eth_newBlockFilter"),
   ETH_NEW_FILTER("eth_newFilter"),
   ETH_NEW_PENDING_TRANSACTION_FILTER("eth_newPendingTransactionFilter"),
   ETH_PROTOCOL_VERSION("eth_protocolVersion"),
+  ETH_SEND_RAW_PRIVATE_TRANSACTION("eth_sendRawPrivateTransaction"),
   ETH_SEND_RAW_TRANSACTION("eth_sendRawTransaction"),
   ETH_SEND_TRANSACTION("eth_sendTransaction"),
+  ETH_SUBMIT_HASHRATE("eth_submitHashrate"),
   ETH_SUBMIT_WORK("eth_submitWork"),
   ETH_SUBSCRIBE("eth_subscribe"),
   ETH_SYNCING("eth_syncing"),
@@ -113,6 +136,12 @@ public enum RpcMethod {
   IBFT_GET_VALIDATORS_BY_BLOCK_NUMBER("ibft_getValidatorsByBlockNumber"),
   IBFT_PROPOSE_VALIDATOR_VOTE("ibft_proposeValidatorVote"),
   IBFT_GET_SIGNER_METRICS("ibft_getSignerMetrics"),
+  QBFT_DISCARD_VALIDATOR_VOTE("qbft_discardValidatorVote"),
+  QBFT_GET_PENDING_VOTES("qbft_getPendingVotes"),
+  QBFT_GET_VALIDATORS_BY_BLOCK_HASH("qbft_getValidatorsByBlockHash"),
+  QBFT_GET_VALIDATORS_BY_BLOCK_NUMBER("qbft_getValidatorsByBlockNumber"),
+  QBFT_PROPOSE_VALIDATOR_VOTE("qbft_proposeValidatorVote"),
+  QBFT_GET_SIGNER_METRICS("qbft_getSignerMetrics"),
   MINER_CHANGE_TARGET_GAS_LIMIT("miner_changeTargetGasLimit"),
   MINER_SET_COINBASE("miner_setCoinbase"),
   MINER_SET_ETHERBASE("miner_setEtherbase"),
@@ -137,8 +166,13 @@ public enum RpcMethod {
   PERM_REMOVE_NODES_FROM_WHITELIST("perm_removeNodesFromWhitelist"),
   PERM_REMOVE_NODES_FROM_ALLOWLIST("perm_removeNodesFromAllowlist"),
   RPC_MODULES("rpc_modules"),
-  TRACE_REPLAY_BLOCK_TRANSACTIONS("trace_replayBlockTransactions"),
   TRACE_BLOCK("trace_block"),
+  TRACE_CALL("trace_call"),
+  TRACE_CALL_MANY("trace_callMany"),
+  TRACE_GET("trace_get"),
+  TRACE_FILTER("trace_filter"),
+  TRACE_RAW_TRANSACTION("trace_rawTransaction"),
+  TRACE_REPLAY_BLOCK_TRANSACTIONS("trace_replayBlockTransactions"),
   TRACE_TRANSACTION("trace_transaction"),
   TX_POOL_BESU_STATISTICS("txpool_besuStatistics"),
   TX_POOL_BESU_TRANSACTIONS("txpool_besuTransactions"),
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationService.java
index 4ef58e63eb1..ae8fd605dec 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationService.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationService.java
@@ -1,8 +1,8 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ *  the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -11,198 +11,30 @@
  * specific language governing permissions and limitations under the License.
  *
  * SPDX-License-Identifier: Apache-2.0
+ *
  */
+
 package org.hyperledger.besu.ethereum.api.jsonrpc.authentication;
 
-import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
-import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 
-import java.io.File;
+import java.util.Collection;
 import java.util.Optional;
-import javax.annotation.Nullable;
 
-import com.google.common.annotations.VisibleForTesting;
-import io.netty.handler.codec.http.HttpResponseStatus;
-import io.vertx.core.Vertx;
-import io.vertx.core.http.HttpServerResponse;
-import io.vertx.core.json.JsonObject;
-import io.vertx.ext.auth.AuthProvider;
+import io.vertx.core.Handler;
 import io.vertx.ext.auth.User;
 import io.vertx.ext.auth.jwt.JWTAuth;
-import io.vertx.ext.auth.jwt.JWTAuthOptions;
-import io.vertx.ext.jwt.JWTOptions;
 import io.vertx.ext.web.RoutingContext;
 
-/** Provides authentication handlers for use in the http and websocket services */
-public class AuthenticationService {
-
-  private final JWTAuth jwtAuthProvider;
-  @VisibleForTesting public final JWTAuthOptions jwtAuthOptions;
-  private final Optional<AuthProvider> credentialAuthProvider;
-  private static final JWTAuthOptionsFactory jwtAuthOptionsFactory = new JWTAuthOptionsFactory();
-
-  private AuthenticationService(
-      final JWTAuth jwtAuthProvider,
-      final JWTAuthOptions jwtAuthOptions,
-      final Optional<AuthProvider> credentialAuthProvider) {
-    this.jwtAuthProvider = jwtAuthProvider;
-    this.jwtAuthOptions = jwtAuthOptions;
-    this.credentialAuthProvider = credentialAuthProvider;
-  }
-
-  /**
-   * Creates a ready for use set of authentication providers if authentication is configured to be
-   * on
-   *
-   * @param vertx The vertx instance that will be providing requests that this set of authentication
-   *     providers will be handling
-   * @param config The {{@link JsonRpcConfiguration}} that describes this rpc setup
-   * @return Optionally an authentication service. If empty then authentication isn't to be enabled
-   *     on this service
-   */
-  public static Optional<AuthenticationService> create(
-      final Vertx vertx, final JsonRpcConfiguration config) {
-    return create(
-        vertx,
-        config.isAuthenticationEnabled(),
-        config.getAuthenticationCredentialsFile(),
-        config.getAuthenticationPublicKeyFile());
-  }
-
-  /**
-   * Creates a ready for use set of authentication providers if authentication is configured to be
-   * on
-   *
-   * @param vertx The vertx instance that will be providing requests that this set of authentication
-   *     providers will be handling
-   * @param config The {{@link JsonRpcConfiguration}} that describes this rpc setup
-   * @return Optionally an authentication service. If empty then authentication isn't to be enabled
-   *     on this service
-   */
-  public static Optional<AuthenticationService> create(
-      final Vertx vertx, final WebSocketConfiguration config) {
-    return create(
-        vertx,
-        config.isAuthenticationEnabled(),
-        config.getAuthenticationCredentialsFile(),
-        config.getAuthenticationPublicKeyFile());
-  }
-
-  private static Optional<AuthenticationService> create(
-      final Vertx vertx,
-      final boolean authenticationEnabled,
-      final String authenticationCredentialsFile,
-      final File authenticationPublicKeyFile) {
-    if (!authenticationEnabled) {
-      return Optional.empty();
-    }
-
-    final JWTAuthOptions jwtAuthOptions =
-        authenticationPublicKeyFile == null
-            ? jwtAuthOptionsFactory.createWithGeneratedKeyPair()
-            : jwtAuthOptionsFactory.createForExternalPublicKey(authenticationPublicKeyFile);
-
-    final Optional<AuthProvider> credentialAuthProvider =
-        makeCredentialAuthProvider(vertx, authenticationEnabled, authenticationCredentialsFile);
-
-    return Optional.of(
-        new AuthenticationService(
-            JWTAuth.create(vertx, jwtAuthOptions), jwtAuthOptions, credentialAuthProvider));
-  }
-
-  private static Optional<AuthProvider> makeCredentialAuthProvider(
-      final Vertx vertx,
-      final boolean authenticationEnabled,
-      @Nullable final String authenticationCredentialsFile) {
-    if (authenticationEnabled && authenticationCredentialsFile != null) {
-      return Optional.of(
-          new TomlAuthOptions().setTomlPath(authenticationCredentialsFile).createProvider(vertx));
-    } else {
-      return Optional.empty();
-    }
-  }
-
-  /**
-   * Static route for terminating login requests when Authentication is disabled
-   *
-   * @param routingContext The vertx routing context for this request
-   */
-  public static void handleDisabledLogin(final RoutingContext routingContext) {
-    routingContext
-        .response()
-        .setStatusCode(HttpResponseStatus.BAD_REQUEST.code())
-        .setStatusMessage("Authentication not enabled")
-        .end();
-  }
-
-  /**
-   * Handles a login request and checks the provided credentials against our credential auth
-   * provider
-   *
-   * @param routingContext Routing context associated with this request
-   */
-  public void handleLogin(final RoutingContext routingContext) {
-    if (credentialAuthProvider.isPresent()) {
-      login(routingContext, credentialAuthProvider.get());
-    } else {
-      handleDisabledLogin(routingContext);
-    }
-  }
-
-  private void login(
-      final RoutingContext routingContext, final AuthProvider credentialAuthProvider) {
-    final JsonObject requestBody = routingContext.getBodyAsJson();
-
-    if (requestBody == null) {
-      routingContext
-          .response()
-          .setStatusCode(HttpResponseStatus.BAD_REQUEST.code())
-          .setStatusMessage(HttpResponseStatus.BAD_REQUEST.reasonPhrase())
-          .end();
-      return;
-    }
-
-    // Check user
-    final JsonObject authParams = new JsonObject();
-    authParams.put("username", requestBody.getValue("username"));
-    authParams.put("password", requestBody.getValue("password"));
-    credentialAuthProvider.authenticate(
-        authParams,
-        (r) -> {
-          if (r.failed()) {
-            routingContext
-                .response()
-                .setStatusCode(HttpResponseStatus.UNAUTHORIZED.code())
-                .setStatusMessage(HttpResponseStatus.UNAUTHORIZED.reasonPhrase())
-                .end();
-          } else {
-            final User user = r.result();
-
-            final JWTOptions options =
-                new JWTOptions().setExpiresInMinutes(5).setAlgorithm("RS256");
-            final JsonObject jwtContents =
-                new JsonObject()
-                    .put("permissions", user.principal().getValue("permissions"))
-                    .put("username", user.principal().getValue("username"));
-            final String privacyPublicKey = user.principal().getString("privacyPublicKey");
-            if (privacyPublicKey != null) {
-              jwtContents.put("privacyPublicKey", privacyPublicKey);
-            }
+public interface AuthenticationService {
+  void handleLogin(RoutingContext routingContext);
 
-            final String token = jwtAuthProvider.generateToken(jwtContents, options);
+  JWTAuth getJwtAuthProvider();
 
-            final JsonObject responseBody = new JsonObject().put("token", token);
-            final HttpServerResponse response = routingContext.response();
-            if (!response.closed()) {
-              response.setStatusCode(200);
-              response.putHeader("Content-Type", "application/json");
-              response.end(responseBody.encode());
-            }
-          }
-        });
-  }
+  void authenticate(String token, Handler<Optional<User>> handler);
 
-  public JWTAuth getJwtAuthProvider() {
-    return jwtAuthProvider;
-  }
+  boolean isPermitted(
+      final Optional<User> optionalUser,
+      final JsonRpcMethod jsonRpcMethod,
+      final Collection<String> noAuthMethods);
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationUtils.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationUtils.java
index 92303aa90c7..9a14b6bf2f1 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationUtils.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,96 +14,9 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.authentication;
 
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-
 import java.util.Optional;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import com.google.common.annotations.VisibleForTesting;
-import io.vertx.core.Handler;
-import io.vertx.core.json.JsonObject;
-import io.vertx.ext.auth.User;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 public class AuthenticationUtils {
-  private static final Logger LOG = LogManager.getLogger();
-
-  @VisibleForTesting
-  public static boolean isPermitted(
-      final Optional<AuthenticationService> authenticationService,
-      final Optional<User> optionalUser,
-      final JsonRpcMethod jsonRpcMethod) {
-
-    AtomicBoolean foundMatchingPermission = new AtomicBoolean();
-
-    if (authenticationService.isEmpty()) {
-      // no auth provider configured thus anything is permitted
-      return true;
-    }
-
-    if (optionalUser.isPresent()) {
-      User user = optionalUser.get();
-      for (String perm : jsonRpcMethod.getPermissions()) {
-        user.isAuthorized(
-            perm,
-            (authed) -> {
-              if (authed.result()) {
-                LOG.trace(
-                    "user {} authorized : {} via permission {}",
-                    user,
-                    jsonRpcMethod.getName(),
-                    perm);
-                foundMatchingPermission.set(true);
-              }
-            });
-        // exit if a matching permission was found, no need to keep checking
-        if (foundMatchingPermission.get()) {
-          return foundMatchingPermission.get();
-        }
-      }
-    }
-
-    if (!foundMatchingPermission.get()) {
-      LOG.trace("user NOT authorized : {}", jsonRpcMethod.getName());
-    }
-    return foundMatchingPermission.get();
-  }
-
-  public static void getUser(
-      final Optional<AuthenticationService> authenticationService,
-      final String token,
-      final Handler<Optional<User>> handler) {
-    try {
-      if (authenticationService.isEmpty()) {
-        handler.handle(Optional.empty());
-      } else {
-        authenticationService
-            .get()
-            .getJwtAuthProvider()
-            .authenticate(
-                new JsonObject().put("jwt", token),
-                (r) -> {
-                  if (r.succeeded()) {
-                    final Optional<User> user = Optional.ofNullable(r.result());
-                    validateExpiryExists(user);
-                    handler.handle(user);
-                  } else {
-                    LOG.debug("Invalid JWT token", r.cause());
-                    handler.handle(Optional.empty());
-                  }
-                });
-      }
-    } catch (Exception e) {
-      handler.handle(Optional.empty());
-    }
-  }
-
-  private static void validateExpiryExists(final Optional<User> user) {
-    if (!user.map(User::principal).map(p -> p.containsKey("exp")).orElse(false)) {
-      throw new IllegalStateException("Invalid JWT doesn't have expiry");
-    }
-  }
 
   public static String getJwtTokenFromAuthorizationHeaderValue(final String value) {
     if (value != null) {
@@ -114,4 +27,15 @@ public static String getJwtTokenFromAuthorizationHeaderValue(final String value)
     }
     return null;
   }
+
+  public static String truncToken(final String jwtToken) {
+    return Optional.ofNullable(jwtToken)
+        .map(
+            token ->
+                token
+                    .substring(0, 8)
+                    .concat("...")
+                    .concat(token.substring(token.length() - 8, token.length())))
+        .orElse("Invalid JWT");
+  }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/DefaultAuthenticationService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/DefaultAuthenticationService.java
new file mode 100644
index 00000000000..4cdc96e14af
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/DefaultAuthenticationService.java
@@ -0,0 +1,292 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.authentication;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.annotation.Nullable;
+
+import com.google.common.annotations.VisibleForTesting;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.vertx.core.Handler;
+import io.vertx.core.Vertx;
+import io.vertx.core.http.HttpServerResponse;
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.auth.JWTOptions;
+import io.vertx.ext.auth.User;
+import io.vertx.ext.auth.authentication.AuthenticationProvider;
+import io.vertx.ext.auth.jwt.JWTAuth;
+import io.vertx.ext.auth.jwt.JWTAuthOptions;
+import io.vertx.ext.web.RoutingContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** Provides authentication handlers for use in the http and websocket services */
+public class DefaultAuthenticationService implements AuthenticationService {
+
+  public static final String USERNAME = "username";
+  private final JWTAuth jwtAuthProvider;
+  @VisibleForTesting public final JWTAuthOptions jwtAuthOptions;
+  private final Optional<AuthenticationProvider> credentialAuthProvider;
+  private static final JWTAuthOptionsFactory jwtAuthOptionsFactory = new JWTAuthOptionsFactory();
+  private static final Logger LOG = LoggerFactory.getLogger(DefaultAuthenticationService.class);
+
+  public DefaultAuthenticationService(
+      final JWTAuth jwtAuthProvider,
+      final JWTAuthOptions jwtAuthOptions,
+      final Optional<AuthenticationProvider> credentialAuthProvider) {
+    this.jwtAuthProvider = jwtAuthProvider;
+    this.jwtAuthOptions = jwtAuthOptions;
+    this.credentialAuthProvider = credentialAuthProvider;
+  }
+
+  /**
+   * Creates a ready for use set of authentication providers if authentication is enabled
+   *
+   * @param vertx The vertx instance that will be providing requests that this set of authentication
+   *     providers will be handling
+   * @param config The {{@link JsonRpcConfiguration}} that describes this rpc setup
+   * @return Optionally an authentication service. If empty then authentication isn't to be enabled
+   *     on this service
+   */
+  public static Optional<AuthenticationService> create(
+      final Vertx vertx, final JsonRpcConfiguration config) {
+    return create(
+        vertx,
+        config.isAuthenticationEnabled(),
+        config.getAuthenticationCredentialsFile(),
+        config.getAuthenticationPublicKeyFile(),
+        config.getAuthenticationAlgorithm());
+  }
+
+  /**
+   * Creates a ready for use set of authentication providers if authentication is enabled
+   *
+   * @param vertx The vertx instance that will be providing requests that this set of authentication
+   *     providers will be handling
+   * @param config The {{@link WebSocketConfiguration}} that describes this rpc setup
+   * @return Optionally an authentication service. If empty then authentication isn't to be enabled
+   *     on this service
+   */
+  public static Optional<AuthenticationService> create(
+      final Vertx vertx, final WebSocketConfiguration config) {
+    return create(
+        vertx,
+        config.isAuthenticationEnabled(),
+        config.getAuthenticationCredentialsFile(),
+        config.getAuthenticationPublicKeyFile(),
+        config.getAuthenticationAlgorithm());
+  }
+
+  private static Optional<AuthenticationService> create(
+      final Vertx vertx,
+      final boolean authenticationEnabled,
+      final String authenticationCredentialsFile,
+      final File authenticationPublicKeyFile,
+      final JwtAlgorithm authenticationAlgorithm) {
+    if (!authenticationEnabled) {
+      return Optional.empty();
+    }
+
+    final JWTAuthOptions jwtAuthOptions;
+    if (authenticationPublicKeyFile == null) {
+      jwtAuthOptions = jwtAuthOptionsFactory.createWithGeneratedKeyPair();
+    } else {
+      jwtAuthOptions =
+          authenticationAlgorithm == null
+              ? jwtAuthOptionsFactory.createForExternalPublicKey(authenticationPublicKeyFile)
+              : jwtAuthOptionsFactory.createForExternalPublicKeyWithAlgorithm(
+                  authenticationPublicKeyFile, authenticationAlgorithm);
+    }
+    final Optional<AuthenticationProvider> credentialAuthProvider =
+        makeCredentialAuthProvider(vertx, authenticationEnabled, authenticationCredentialsFile);
+
+    return Optional.of(
+        new DefaultAuthenticationService(
+            JWTAuth.create(vertx, jwtAuthOptions), jwtAuthOptions, credentialAuthProvider));
+  }
+
+  private static Optional<AuthenticationProvider> makeCredentialAuthProvider(
+      final Vertx vertx,
+      final boolean authenticationEnabled,
+      @Nullable final String authenticationCredentialsFile) {
+    if (authenticationEnabled && authenticationCredentialsFile != null) {
+      return Optional.of(
+          new TomlAuthOptions().setTomlPath(authenticationCredentialsFile).createProvider(vertx));
+    } else {
+      return Optional.empty();
+    }
+  }
+
+  /**
+   * Static route for terminating login requests when Authentication is disabled
+   *
+   * @param routingContext The vertx routing context for this request
+   */
+  public static void handleDisabledLogin(final RoutingContext routingContext) {
+    routingContext
+        .response()
+        .setStatusCode(HttpResponseStatus.BAD_REQUEST.code())
+        .setStatusMessage("Authentication not enabled")
+        .end();
+  }
+
+  /**
+   * Handles a login request and checks the provided credentials against our credential auth
+   * provider
+   *
+   * @param routingContext Routing context associated with this request
+   */
+  @Override
+  public void handleLogin(final RoutingContext routingContext) {
+    if (credentialAuthProvider.isPresent()) {
+      login(routingContext, credentialAuthProvider.get());
+    } else {
+      handleDisabledLogin(routingContext);
+    }
+  }
+
+  private void login(
+      final RoutingContext routingContext, final AuthenticationProvider credentialAuthProvider) {
+    final JsonObject requestBody = routingContext.getBodyAsJson();
+
+    if (requestBody == null) {
+      routingContext
+          .response()
+          .setStatusCode(HttpResponseStatus.BAD_REQUEST.code())
+          .setStatusMessage(HttpResponseStatus.BAD_REQUEST.reasonPhrase())
+          .end();
+      return;
+    }
+
+    // Check user
+    final JsonObject authParams = new JsonObject();
+    authParams.put(USERNAME, requestBody.getValue(USERNAME));
+    authParams.put("password", requestBody.getValue("password"));
+    credentialAuthProvider.authenticate(
+        authParams,
+        r -> {
+          if (r.failed()) {
+            routingContext
+                .response()
+                .setStatusCode(HttpResponseStatus.UNAUTHORIZED.code())
+                .setStatusMessage(HttpResponseStatus.UNAUTHORIZED.reasonPhrase())
+                .end();
+          } else {
+            final User user = r.result();
+
+            final JWTOptions options =
+                new JWTOptions().setExpiresInMinutes(5).setAlgorithm("RS256");
+            final JsonObject jwtContents =
+                new JsonObject()
+                    .put("permissions", user.principal().getValue("permissions"))
+                    .put(USERNAME, user.principal().getValue(USERNAME));
+            final String privacyPublicKey = user.principal().getString("privacyPublicKey");
+            if (privacyPublicKey != null) {
+              jwtContents.put("privacyPublicKey", privacyPublicKey);
+            }
+
+            final String token = jwtAuthProvider.generateToken(jwtContents, options);
+
+            final JsonObject responseBody = new JsonObject().put("token", token);
+            final HttpServerResponse response = routingContext.response();
+            if (!response.closed()) {
+              response.setStatusCode(200);
+              response.putHeader("Content-Type", "application/json");
+              response.end(responseBody.encode());
+            }
+          }
+        });
+  }
+
+  @Override
+  public JWTAuth getJwtAuthProvider() {
+    return jwtAuthProvider;
+  }
+
+  @Override
+  public void authenticate(final String token, final Handler<Optional<User>> handler) {
+    try {
+      getJwtAuthProvider()
+          .authenticate(
+              new JsonObject().put("token", token),
+              r -> {
+                if (r.succeeded()) {
+                  final Optional<User> user = Optional.ofNullable(r.result());
+                  validateExpiryExists(user);
+                  handler.handle(user);
+                } else {
+                  LOG.debug("Invalid JWT token {}", r.cause().toString());
+                  handler.handle(Optional.empty());
+                }
+              });
+
+    } catch (Exception e) {
+      LOG.debug("exception validating JWT ", e);
+      handler.handle(Optional.empty());
+    }
+  }
+
+  @Override
+  public boolean isPermitted(
+      final Optional<User> optionalUser,
+      final JsonRpcMethod jsonRpcMethod,
+      final Collection<String> noAuthMethods) {
+    AtomicBoolean foundMatchingPermission = new AtomicBoolean();
+    // if the method is configured as a no auth method we skip permission check
+    if (noAuthMethods.stream().anyMatch(m -> m.equals(jsonRpcMethod.getName()))) {
+      return true;
+    }
+
+    if (optionalUser.isPresent()) {
+      User user = optionalUser.get();
+      for (String perm : jsonRpcMethod.getPermissions()) {
+        user.isAuthorized(
+            perm,
+            (authed) -> {
+              if (authed.result()) {
+                LOG.trace(
+                    "user {} authorized : {} via permission {}",
+                    user,
+                    jsonRpcMethod.getName(),
+                    perm);
+                foundMatchingPermission.set(true);
+              }
+            });
+        // exit if a matching permission was found, no need to keep checking
+        if (foundMatchingPermission.get()) {
+          return foundMatchingPermission.get();
+        }
+      }
+    }
+
+    if (!foundMatchingPermission.get()) {
+      LOG.trace("user NOT authorized : {}", jsonRpcMethod.getName());
+    }
+    return foundMatchingPermission.get();
+  }
+
+  private void validateExpiryExists(final Optional<User> user) {
+    if (!user.map(User::attributes).map(a -> a.containsKey("exp")).orElse(false)) {
+      throw new IllegalStateException("Invalid JWT doesn't have expiry");
+    }
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/EngineAuthService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/EngineAuthService.java
new file mode 100644
index 00000000000..db388567c2d
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/EngineAuthService.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ *  the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.api.jsonrpc.authentication;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.Optional;
+
+import io.vertx.core.Handler;
+import io.vertx.core.Vertx;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.auth.JWTOptions;
+import io.vertx.ext.auth.PubSecKeyOptions;
+import io.vertx.ext.auth.User;
+import io.vertx.ext.auth.impl.Codec;
+import io.vertx.ext.auth.jwt.JWTAuth;
+import io.vertx.ext.auth.jwt.JWTAuthOptions;
+import io.vertx.ext.web.RoutingContext;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class EngineAuthService implements AuthenticationService {
+
+  private static final Logger LOG = LoggerFactory.getLogger(EngineAuthService.class);
+  private static final int JWT_EXPIRATION_TIME_IN_SECONDS = 60;
+
+  public static final String EPHEMERAL_JWT_FILE = "jwt.hex";
+
+  private final JWTAuth jwtAuthProvider;
+
+  public EngineAuthService(final Vertx vertx, final Optional<File> signingKey, final Path datadir) {
+    final JWTAuthOptions jwtAuthOptions =
+        engineApiJWTOptions(JwtAlgorithm.HS256, signingKey, datadir);
+    this.jwtAuthProvider = JWTAuth.create(vertx, jwtAuthOptions);
+  }
+
+  public String createToken() {
+    JsonObject claims = new JsonObject();
+    claims.put("iat", System.currentTimeMillis() / 1000);
+    return this.jwtAuthProvider.generateToken(claims);
+  }
+
+  private JWTAuthOptions engineApiJWTOptions(
+      final JwtAlgorithm jwtAlgorithm, final Optional<File> keyFile, final Path datadir) {
+    byte[] signingKey = null;
+    if (!keyFile.isPresent()) {
+      final File jwtFile = new File(datadir.toFile(), EPHEMERAL_JWT_FILE);
+      jwtFile.deleteOnExit();
+      final byte[] ephemeralKey = Bytes32.random().toArray();
+      try {
+        Files.writeString(jwtFile.toPath(), Codec.base16Encode(ephemeralKey));
+      } catch (IOException ioe) {
+        LOG.warn("Unable to write ephemeral jwt key file to {}", jwtFile.toPath().toString());
+        LOG.info("JWT KEY: {}", Codec.base16Encode(ephemeralKey));
+      }
+      signingKey = ephemeralKey;
+    } else { // user configured option to use a specified file
+      if (keyFile.get().exists()) {
+        try {
+          final String keyHex = Files.readAllLines(keyFile.get().toPath()).get(0);
+          if (keyHex.length() >= 64) {
+            signingKey = Bytes.fromHexString(keyHex).toArray();
+          } else {
+            UnsecurableEngineApiException e =
+                new UnsecurableEngineApiException("signing key too short, 256 bits required");
+            e.fillInStackTrace();
+            throw e;
+          }
+        } catch (IOException ioe) {
+          UnsecurableEngineApiException e =
+              new UnsecurableEngineApiException(
+                  "Could not read key from " + keyFile.get().toString());
+          e.fillInStackTrace();
+          e.initCause(ioe);
+          throw e;
+        }
+      } else {
+        UnsecurableEngineApiException e =
+            new UnsecurableEngineApiException(
+                "Could not read key from " + keyFile.get().toString());
+        e.fillInStackTrace();
+        throw e;
+      }
+    }
+    if (signingKey == null || signingKey.length < 32) {
+      UnsecurableEngineApiException e =
+          new UnsecurableEngineApiException(
+              "Could not read at least 256 bits of key from "
+                  + (keyFile.isPresent() ? keyFile.get().toString() : "undefined"));
+      e.fillInStackTrace();
+      throw e;
+    }
+
+    return new JWTAuthOptions()
+        .setJWTOptions(new JWTOptions().setIgnoreExpiration(true).setLeeway(5))
+        .addPubSecKey(
+            new PubSecKeyOptions()
+                .setAlgorithm(jwtAlgorithm.toString())
+                .setBuffer(Buffer.buffer(signingKey)));
+  }
+
+  @Override
+  public void handleLogin(final RoutingContext routingContext) {
+    LOG.warn("Engine Auth does not support logins, no login handled");
+  }
+
+  @Override
+  public JWTAuth getJwtAuthProvider() {
+    return this.jwtAuthProvider;
+  }
+
+  @Override
+  public void authenticate(final String token, final Handler<Optional<User>> handler) {
+    try {
+      JsonObject jwt = new JsonObject().put("token", token);
+      getJwtAuthProvider()
+          .authenticate(
+              jwt,
+              r -> {
+                if (r.succeeded()) {
+                  if (issuedRecently(r.result().attributes().getLong("iat"))) {
+                    final Optional<User> user = Optional.ofNullable(r.result());
+                    handler.handle(user);
+                  } else {
+                    LOG.warn("Client sent stale token: {}", r.result().attributes());
+                    handler.handle(Optional.empty());
+                  }
+
+                } else {
+                  LOG.debug("Authentication failed: {}", r.cause().toString());
+                  handler.handle(Optional.empty());
+                }
+              });
+
+    } catch (Exception e) {
+      LOG.debug("exception validating JWT ", e);
+      handler.handle(Optional.empty());
+    }
+  }
+
+  @Override
+  public boolean isPermitted(
+      final Optional<User> optionalUser,
+      final JsonRpcMethod jsonRpcMethod,
+      final Collection<String> noAuthMethods) {
+    return noAuthMethods.contains(jsonRpcMethod.getName()) || optionalUser.isPresent();
+  }
+
+  private boolean issuedRecently(final long iat) {
+    long iatSecondsSinceEpoch = iat;
+    long nowSecondsSinceEpoch = System.currentTimeMillis() / 1000;
+    return (Math.abs((nowSecondsSinceEpoch - iatSecondsSinceEpoch))
+        <= JWT_EXPIRATION_TIME_IN_SECONDS);
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/JWTAuthOptionsFactory.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/JWTAuthOptionsFactory.java
index 2be5695dc88..071fc2920ab 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/JWTAuthOptionsFactory.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/JWTAuthOptionsFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -23,37 +23,63 @@
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
 import java.security.NoSuchAlgorithmException;
-import java.util.Base64;
 
+import io.vertx.core.buffer.Buffer;
+import io.vertx.ext.auth.JWTOptions;
 import io.vertx.ext.auth.PubSecKeyOptions;
+import io.vertx.ext.auth.impl.Codec;
 import io.vertx.ext.auth.jwt.JWTAuthOptions;
+import org.apache.tuweni.bytes.Bytes32;
 import org.bouncycastle.util.io.pem.PemObject;
 import org.bouncycastle.util.io.pem.PemReader;
 
 public class JWTAuthOptionsFactory {
 
-  private static final String ALGORITHM = "RS256";
-  private static final String PERMISSIONS = "permissions";
+  private static final JwtAlgorithm DEFAULT = JwtAlgorithm.RS256;
 
   public JWTAuthOptions createForExternalPublicKey(final File externalPublicKeyFile) {
+    return createForExternalPublicKeyWithAlgorithm(externalPublicKeyFile, DEFAULT);
+  }
+
+  public JWTAuthOptions createForExternalPublicKeyWithAlgorithm(
+      final File externalPublicKeyFile, final JwtAlgorithm algorithm) {
     final byte[] externalJwtPublicKey = readPublicKey(externalPublicKeyFile);
-    final String base64EncodedPublicKey = Base64.getEncoder().encodeToString(externalJwtPublicKey);
     return new JWTAuthOptions()
-        .setPermissionsClaimKey(PERMISSIONS)
         .addPubSecKey(
-            new PubSecKeyOptions().setAlgorithm(ALGORITHM).setPublicKey(base64EncodedPublicKey));
+            new PubSecKeyOptions()
+                .setAlgorithm(algorithm.toString())
+                .setBuffer(keyPairToPublicPemString(externalJwtPublicKey)));
   }
 
-  public JWTAuthOptions createWithGeneratedKeyPair() {
-    final KeyPair keypair = generateJwtKeyPair();
+  public JWTAuthOptions createWithGeneratedKeyPair(final JwtAlgorithm jwtAlgorithm) {
+    if (jwtAlgorithm.toString().startsWith("H")) {
+      throw new IllegalArgumentException(
+          "Cannot use keypairs with HMAC tokens, please call createWithGeneratedKey");
+    }
+    final KeyPair keypair = generateRsaKeyPair();
     return new JWTAuthOptions()
-        .setPermissionsClaimKey(PERMISSIONS)
         .addPubSecKey(
             new PubSecKeyOptions()
-                .setAlgorithm(ALGORITHM)
-                .setPublicKey(Base64.getEncoder().encodeToString(keypair.getPublic().getEncoded()))
-                .setSecretKey(
-                    Base64.getEncoder().encodeToString(keypair.getPrivate().getEncoded())));
+                .setAlgorithm(jwtAlgorithm.toString())
+                .setBuffer(keyPairToPublicPemString(keypair.getPublic().getEncoded())))
+        .addPubSecKey(
+            new PubSecKeyOptions()
+                .setAlgorithm(jwtAlgorithm.toString())
+                .setBuffer(keyPairToPrivatePemString(keypair)));
+  }
+
+  public JWTAuthOptions engineApiJWTOptions(final JwtAlgorithm jwtAlgorithm) {
+    byte[] ephemeralKey = Bytes32.random().toArray();
+    return new JWTAuthOptions()
+        .setJWTOptions(new JWTOptions().setIgnoreExpiration(true).setLeeway(5))
+        .addPubSecKey(
+            new PubSecKeyOptions()
+                .setAlgorithm(jwtAlgorithm.toString())
+                .setBuffer(Buffer.buffer(ephemeralKey)));
+  }
+
+  public JWTAuthOptions createWithGeneratedKeyPair() {
+    return createWithGeneratedKeyPair(JwtAlgorithm.RS256);
   }
 
   private byte[] readPublicKey(final File publicKeyFile) {
@@ -69,7 +95,7 @@ private byte[] readPublicKey(final File publicKeyFile) {
     }
   }
 
-  private KeyPair generateJwtKeyPair() {
+  private KeyPair generateRsaKeyPair() {
     final KeyPairGenerator keyGenerator;
     try {
       keyGenerator = KeyPairGenerator.getInstance("RSA");
@@ -80,4 +106,22 @@ private KeyPair generateJwtKeyPair() {
 
     return keyGenerator.generateKeyPair();
   }
+
+  private String keyPairToPublicPemString(final byte[] publicKey) {
+    StringBuilder pemBuffer = new StringBuilder();
+    pemBuffer.append("-----BEGIN PUBLIC KEY-----\r\n");
+    pemBuffer.append(Codec.base64MimeEncode(publicKey));
+    pemBuffer.append("\r\n");
+    pemBuffer.append("-----END PUBLIC KEY-----\r\n");
+    return pemBuffer.toString();
+  }
+
+  private String keyPairToPrivatePemString(final KeyPair kp) {
+    StringBuilder pemBuffer = new StringBuilder();
+    pemBuffer.append("-----BEGIN PRIVATE KEY-----\r\n");
+    pemBuffer.append(Codec.base64MimeEncode(kp.getPrivate().getEncoded()));
+    pemBuffer.append("\r\n");
+    pemBuffer.append("-----END PRIVATE KEY-----\r\n");
+    return pemBuffer.toString();
+  }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/JwtAlgorithm.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/JwtAlgorithm.java
new file mode 100644
index 00000000000..4e5341a28e6
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/JwtAlgorithm.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.authentication;
+
+public enum JwtAlgorithm {
+  RS256,
+  RS384,
+  RS512,
+  ES256,
+  ES384,
+  HS256,
+  ES512;
+
+  public static JwtAlgorithm fromString(final String str) {
+    for (final JwtAlgorithm alg : JwtAlgorithm.values()) {
+      if (alg.name().equalsIgnoreCase(str)) {
+        return alg;
+      }
+    }
+    return null;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlAuth.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlAuth.java
index afacf002596..35fd777ae4b 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlAuth.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlAuth.java
@@ -24,14 +24,14 @@
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
 import io.vertx.core.json.JsonObject;
-import io.vertx.ext.auth.AuthProvider;
 import io.vertx.ext.auth.User;
+import io.vertx.ext.auth.authentication.AuthenticationProvider;
 import org.apache.tuweni.toml.Toml;
 import org.apache.tuweni.toml.TomlParseResult;
 import org.apache.tuweni.toml.TomlTable;
 import org.springframework.security.crypto.bcrypt.BCrypt;
 
-public class TomlAuth implements AuthProvider {
+public class TomlAuth implements AuthenticationProvider {
 
   public static final String PRIVACY_PUBLIC_KEY = "privacyPublicKey";
   private final Vertx vertx;
@@ -93,7 +93,7 @@ public void authenticate(
         false,
         res -> {
           if (res.succeeded()) {
-            resultHandler.handle(Future.succeededFuture((TomlUser) res.result()));
+            resultHandler.handle(Future.succeededFuture((User) res.result()));
           } else {
             resultHandler.handle(Future.failedFuture(res.cause()));
           }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlAuthOptions.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlAuthOptions.java
index 9c6951f0e1b..b7cc1405642 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlAuthOptions.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlAuthOptions.java
@@ -18,10 +18,8 @@
 import java.nio.file.Paths;
 
 import io.vertx.core.Vertx;
-import io.vertx.ext.auth.AuthOptions;
-import io.vertx.ext.auth.AuthProvider;
 
-public class TomlAuthOptions implements AuthOptions {
+public class TomlAuthOptions {
 
   private Path tomlPath;
 
@@ -31,16 +29,10 @@ public TomlAuthOptions(final TomlAuthOptions that) {
     tomlPath = that.tomlPath;
   }
 
-  @Override
-  public AuthProvider createProvider(final Vertx vertx) {
+  public TomlAuth createProvider(final Vertx vertx) {
     return new TomlAuth(vertx, this);
   }
 
-  @Override
-  public AuthOptions clone() {
-    return new TomlAuthOptions(this);
-  }
-
   public TomlAuthOptions setTomlPath(final String tomlPath) {
     this.tomlPath = Paths.get(tomlPath);
     return this;
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlUser.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlUser.java
index 79a2d288072..899548da392 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlUser.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/TomlUser.java
@@ -20,10 +20,12 @@
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Handler;
 import io.vertx.core.json.JsonObject;
-import io.vertx.ext.auth.AbstractUser;
 import io.vertx.ext.auth.AuthProvider;
+import io.vertx.ext.auth.User;
+import io.vertx.ext.auth.authorization.Authorization;
+import io.vertx.ext.auth.authorization.Authorizations;
 
-public class TomlUser extends AbstractUser {
+public class TomlUser implements User {
 
   private final String username;
   private final String password;
@@ -47,6 +49,37 @@ public class TomlUser extends AbstractUser {
     this.privacyPublicKey = privacyPublicKey;
   }
 
+  @Override
+  public JsonObject attributes() {
+    throw new UnsupportedOperationException("Not implemented");
+  }
+
+  @Override
+  public boolean expired() {
+    return false;
+  }
+
+  @Override
+  public boolean expired(final int leeway) {
+    return false;
+  }
+
+  @Override
+  public boolean containsKey(final String key) {
+    throw new UnsupportedOperationException("Not implemented");
+  }
+
+  @Override
+  public Authorizations authorizations() {
+    throw new UnsupportedOperationException("Not implemented");
+  }
+
+  @Override
+  public User isAuthorized(
+      final Authorization authority, final Handler<AsyncResult<Boolean>> resultHandler) {
+    throw new UnsupportedOperationException("Not implemented");
+  }
+
   @Override
   public JsonObject principal() {
     final JsonObject principle =
@@ -67,6 +100,10 @@ public void setAuthProvider(final AuthProvider authProvider) {
   }
 
   @Override
+  public User merge(final User other) {
+    throw new UnsupportedOperationException("Not implemented");
+  }
+
   protected void doIsPermitted(
       final String permission, final Handler<AsyncResult<Boolean>> resultHandler) {
     // we only use Toml for authentication
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/UnsecurableEngineApiException.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/UnsecurableEngineApiException.java
new file mode 100644
index 00000000000..3dfc371f78b
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/UnsecurableEngineApiException.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ *  the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.api.jsonrpc.authentication;
+
+/*
+ * Thrown when config options are insufficient to secure the Engine API
+ */
+public class UnsecurableEngineApiException extends RuntimeException {
+  public UnsecurableEngineApiException(final String reason) {
+    super(reason);
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/context/ContextKey.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/context/ContextKey.java
index 580e0f5213d..1316fbff0a7 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/context/ContextKey.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/context/ContextKey.java
@@ -19,7 +19,9 @@
 import io.vertx.ext.web.RoutingContext;
 
 public enum ContextKey {
-  REQUEST_BODY_AS_JSON_OBJECT;
+  REQUEST_BODY_AS_JSON_OBJECT,
+  REQUEST_BODY_AS_JSON_ARRAY,
+  AUTHENTICATED_USER;
 
   public <T> T extractFrom(final RoutingContext ctx, final Supplier<T> defaultSupplier) {
     final T value = ctx.get(this.name());
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/execution/AuthenticatedJsonRpcProcessor.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/execution/AuthenticatedJsonRpcProcessor.java
new file mode 100644
index 00000000000..306d9d4552b
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/execution/AuthenticatedJsonRpcProcessor.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.execution;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationService;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestId;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcUnauthorizedResponse;
+
+import java.util.Collection;
+
+import io.opentelemetry.api.trace.Span;
+
+public class AuthenticatedJsonRpcProcessor implements JsonRpcProcessor {
+
+  private final JsonRpcProcessor rpcProcessor;
+  private final AuthenticationService authenticationService;
+  private final Collection<String> noAuthRpcApis;
+
+  public AuthenticatedJsonRpcProcessor(
+      final JsonRpcProcessor rpcProcessor,
+      final AuthenticationService authenticationService,
+      final Collection<String> noAuthRpcApis) {
+    this.rpcProcessor = rpcProcessor;
+    this.authenticationService = authenticationService;
+    this.noAuthRpcApis = noAuthRpcApis;
+  }
+
+  @Override
+  public JsonRpcResponse process(
+      final JsonRpcRequestId id,
+      final JsonRpcMethod method,
+      final Span metricSpan,
+      final JsonRpcRequestContext request) {
+    if (authenticationService.isPermitted(request.getUser(), method, noAuthRpcApis)) {
+      return rpcProcessor.process(id, method, metricSpan, request);
+    }
+    return new JsonRpcUnauthorizedResponse(id, JsonRpcError.UNAUTHORIZED);
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/execution/BaseJsonRpcProcessor.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/execution/BaseJsonRpcProcessor.java
new file mode 100644
index 00000000000..25423f016fc
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/execution/BaseJsonRpcProcessor.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.execution;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestId;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcUnauthorizedResponse;
+import org.hyperledger.besu.ethereum.privacy.MultiTenancyValidationException;
+
+import io.opentelemetry.api.trace.Span;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class BaseJsonRpcProcessor implements JsonRpcProcessor {
+
+  private static final Logger LOG = LoggerFactory.getLogger(BaseJsonRpcProcessor.class);
+
+  @Override
+  public JsonRpcResponse process(
+      final JsonRpcRequestId id,
+      final JsonRpcMethod method,
+      final Span metricSpan,
+      final JsonRpcRequestContext request) {
+    try {
+      return method.response(request);
+    } catch (final InvalidJsonRpcParameters e) {
+      LOG.debug("Invalid Params for method: {}", method.getName(), e);
+      return new JsonRpcErrorResponse(id, JsonRpcError.INVALID_PARAMS);
+    } catch (final MultiTenancyValidationException e) {
+      return new JsonRpcUnauthorizedResponse(id, JsonRpcError.UNAUTHORIZED);
+    } catch (final RuntimeException e) {
+      final JsonArray params = JsonObject.mapFrom(request.getRequest()).getJsonArray("params");
+      LOG.error(String.format("Error processing method: %s %s", method.getName(), params), e);
+      return new JsonRpcErrorResponse(id, JsonRpcError.INTERNAL_ERROR);
+    }
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/execution/JsonRpcExecutor.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/execution/JsonRpcExecutor.java
new file mode 100644
index 00000000000..8d088caec29
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/execution/JsonRpcExecutor.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.execution;
+
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.INVALID_REQUEST;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestId;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcNoResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.api.trace.StatusCode;
+import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Context;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.auth.User;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class JsonRpcExecutor {
+
+  private static final Logger LOG = LoggerFactory.getLogger(JsonRpcExecutor.class);
+
+  private final JsonRpcProcessor rpcProcessor;
+  private final Map<String, JsonRpcMethod> rpcMethods;
+
+  public JsonRpcExecutor(
+      final JsonRpcProcessor rpcProcessor, final Map<String, JsonRpcMethod> rpcMethods) {
+    this.rpcProcessor = rpcProcessor;
+    this.rpcMethods = rpcMethods;
+  }
+
+  public JsonRpcResponse execute(
+      final Optional<User> optionalUser,
+      final Tracer tracer,
+      final Context spanContext,
+      final Supplier<Boolean> alive,
+      final JsonObject jsonRpcRequest,
+      final Function<JsonObject, JsonRpcRequest> requestBodyProvider) {
+    try {
+      final JsonRpcRequest requestBody = requestBodyProvider.apply(jsonRpcRequest);
+      final JsonRpcRequestId id = new JsonRpcRequestId(requestBody.getId());
+      // Handle notifications
+      if (requestBody.isNotification()) {
+        // Notifications aren't handled so create empty result for now.
+        return new JsonRpcNoResponse();
+      }
+      final Span span;
+      if (tracer != null) {
+        span =
+            tracer
+                .spanBuilder(requestBody.getMethod())
+                .setSpanKind(SpanKind.INTERNAL)
+                .setParent(spanContext)
+                .startSpan();
+      } else {
+        span = Span.getInvalid();
+      }
+      final Optional<JsonRpcError> unavailableMethod = validateMethodAvailability(requestBody);
+      if (unavailableMethod.isPresent()) {
+        span.setStatus(StatusCode.ERROR, "method unavailable");
+        return new JsonRpcErrorResponse(id, unavailableMethod.get());
+      }
+
+      final JsonRpcMethod method = rpcMethods.get(requestBody.getMethod());
+
+      return rpcProcessor.process(
+          id, method, span, new JsonRpcRequestContext(requestBody, optionalUser, alive));
+    } catch (final IllegalArgumentException e) {
+      try {
+        final Integer id = jsonRpcRequest.getInteger("id", null);
+        return new JsonRpcErrorResponse(id, INVALID_REQUEST);
+      } catch (final ClassCastException idNotIntegerException) {
+        return new JsonRpcErrorResponse(null, INVALID_REQUEST);
+      }
+    }
+  }
+
+  private Optional<JsonRpcError> validateMethodAvailability(final JsonRpcRequest request) {
+    final String name = request.getMethod();
+
+    if (LOG.isDebugEnabled()) {
+      final JsonArray params = JsonObject.mapFrom(request).getJsonArray("params");
+      LOG.debug("JSON-RPC request -> {} {}", name, params);
+    }
+
+    final JsonRpcMethod method = rpcMethods.get(name);
+
+    if (method == null) {
+      if (!RpcMethod.rpcMethodExists(name)) {
+        return Optional.of(JsonRpcError.METHOD_NOT_FOUND);
+      }
+      if (!rpcMethods.containsKey(name)) {
+        return Optional.of(JsonRpcError.METHOD_NOT_ENABLED);
+      }
+    }
+
+    return Optional.empty();
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/execution/JsonRpcProcessor.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/execution/JsonRpcProcessor.java
new file mode 100644
index 00000000000..e9168577e31
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/execution/JsonRpcProcessor.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.execution;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestId;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+
+import io.opentelemetry.api.trace.Span;
+
+public interface JsonRpcProcessor {
+  JsonRpcResponse process(
+      final JsonRpcRequestId id,
+      final JsonRpcMethod method,
+      final Span metricSpan,
+      final JsonRpcRequestContext request);
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/execution/TimedJsonRpcProcessor.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/execution/TimedJsonRpcProcessor.java
new file mode 100644
index 00000000000..cdc35fc64df
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/execution/TimedJsonRpcProcessor.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.execution;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestId;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
+import org.hyperledger.besu.plugin.services.metrics.OperationTimer;
+
+import io.opentelemetry.api.trace.Span;
+
+public class TimedJsonRpcProcessor implements JsonRpcProcessor {
+
+  private final JsonRpcProcessor rpcProcessor;
+  private final LabelledMetric<OperationTimer> requestTimer;
+
+  public TimedJsonRpcProcessor(
+      final JsonRpcProcessor rpcProcessor, final LabelledMetric<OperationTimer> requestTimer) {
+    this.rpcProcessor = rpcProcessor;
+    this.requestTimer = requestTimer;
+  }
+
+  @Override
+  public JsonRpcResponse process(
+      final JsonRpcRequestId id,
+      final JsonRpcMethod method,
+      final Span metricSpan,
+      final JsonRpcRequestContext request) {
+    try (final OperationTimer.TimingContext ignored =
+        requestTimer.labels(request.getRequest().getMethod()).startTimer()) {
+      return rpcProcessor.process(id, method, metricSpan, request);
+    }
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/execution/TracedJsonRpcProcessor.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/execution/TracedJsonRpcProcessor.java
new file mode 100644
index 00000000000..5ef2181e248
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/execution/TracedJsonRpcProcessor.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.execution;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestId;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType;
+
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.StatusCode;
+
+public class TracedJsonRpcProcessor implements JsonRpcProcessor {
+
+  private final JsonRpcProcessor rpcProcessor;
+
+  public TracedJsonRpcProcessor(final JsonRpcProcessor rpcProcessor) {
+    this.rpcProcessor = rpcProcessor;
+  }
+
+  @Override
+  public JsonRpcResponse process(
+      final JsonRpcRequestId id,
+      final JsonRpcMethod method,
+      final Span metricSpan,
+      final JsonRpcRequestContext request) {
+    JsonRpcResponse jsonRpcResponse = rpcProcessor.process(id, method, metricSpan, request);
+    if (JsonRpcResponseType.ERROR == jsonRpcResponse.getType()) {
+      JsonRpcErrorResponse errorResponse = (JsonRpcErrorResponse) jsonRpcResponse;
+      switch (errorResponse.getError()) {
+        case INVALID_PARAMS:
+          metricSpan.setStatus(StatusCode.ERROR, "Invalid Params");
+          break;
+        case UNAUTHORIZED:
+          metricSpan.setStatus(StatusCode.ERROR, "Unauthorized");
+          break;
+        case INTERNAL_ERROR:
+          metricSpan.setStatus(StatusCode.ERROR, "Error processing JSON-RPC requestBody");
+          break;
+        default:
+          metricSpan.setStatus(StatusCode.ERROR, "Unexpected error");
+      }
+    }
+    metricSpan.end();
+    return jsonRpcResponse;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/health/LivenessCheck.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/health/LivenessCheck.java
index 9786790d50a..13cf7242c5a 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/health/LivenessCheck.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/health/LivenessCheck.java
@@ -14,11 +14,11 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.health;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class LivenessCheck implements HealthService.HealthCheck {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(LivenessCheck.class);
 
   @Override
   public boolean isHealthy(final HealthService.ParamSource params) {
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/health/ReadinessCheck.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/health/ReadinessCheck.java
index 9e7a807a2f1..38952a44081 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/health/ReadinessCheck.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/health/ReadinessCheck.java
@@ -18,11 +18,11 @@
 import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
 import org.hyperledger.besu.plugin.data.SyncStatus;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ReadinessCheck implements HealthService.HealthCheck {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(ReadinessCheck.class);
   private static final int DEFAULT_MINIMUM_PEERS = 1;
   private static final int DEFAULT_MAX_BLOCKS_BEHIND = 2;
   private final P2PNetwork p2pNetwork;
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/DebugReplayBlock.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/DebugReplayBlock.java
new file mode 100644
index 00000000000..ab14cb9412c
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/DebugReplayBlock.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal;
+
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.INTERNAL_ERROR;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.UNKNOWN_BLOCK;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.AbstractBlockParameterMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DebugReplayBlock extends AbstractBlockParameterMethod {
+  private static final Logger LOG = LoggerFactory.getLogger(DebugReplayBlock.class);
+
+  private final ProtocolContext protocolContext;
+  private final ProtocolSchedule protocolSchedule;
+
+  public DebugReplayBlock(
+      final BlockchainQueries blockchain,
+      final ProtocolContext protocolContext,
+      final ProtocolSchedule protocolSchedule) {
+    super(blockchain);
+
+    this.protocolContext = protocolContext;
+    this.protocolSchedule = protocolSchedule;
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.DEBUG_REPLAY_BLOCK.getMethodName();
+  }
+
+  @Override
+  protected BlockParameter blockParameter(final JsonRpcRequestContext request) {
+    return request.getRequiredParameter(0, BlockParameter.class);
+  }
+
+  @Override
+  protected Object resultByBlockNumber(
+      final JsonRpcRequestContext request, final long blockNumber) {
+    final Optional<Block> maybeBlock =
+        getBlockchainQueries().getBlockchain().getBlockByNumber(blockNumber);
+
+    if (maybeBlock.isEmpty()) {
+      return new JsonRpcErrorResponse(request.getRequest().getId(), UNKNOWN_BLOCK);
+    }
+
+    final Block block = maybeBlock.get();
+
+    // rewind to the block before the one we want to replay
+    protocolContext.getBlockchain().rewindToBlock(blockNumber - 1);
+
+    try {
+      // replay block and persist it
+      protocolSchedule
+          .getByBlockHeader(block.getHeader())
+          .getBlockValidator()
+          .validateAndProcessBlock(
+              protocolContext, block, HeaderValidationMode.FULL, HeaderValidationMode.NONE, true);
+    } catch (Exception e) {
+      LOG.error(e.getMessage());
+      return new JsonRpcErrorResponse(request.getRequest().getId(), INTERNAL_ERROR);
+    }
+
+    // set head to newly imported block
+    protocolContext.getBlockchain().forwardToBlock(maybeBlock.get().getHeader());
+
+    return JsonRpcSuccessResponse.SUCCESS_RESULT;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/JsonRpcRequest.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/JsonRpcRequest.java
index e3aed1291f4..a8d161f8992 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/JsonRpcRequest.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/JsonRpcRequest.java
@@ -136,4 +136,22 @@ public <T> T getRequiredParameter(final int index, final Class<T> paramClass) {
   public <T> Optional<T> getOptionalParameter(final int index, final Class<T> paramClass) {
     return parameterAccessor.optional(params, index, paramClass);
   }
+
+  @Override
+  public String toString() {
+    return "JsonRpcRequest{"
+        + "id="
+        + id
+        + ", method='"
+        + method
+        + '\''
+        + ", params="
+        + Arrays.toString(params)
+        + ", version='"
+        + version
+        + '\''
+        + ", isNotification="
+        + isNotification
+        + '}';
+  }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/QosTimer.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/QosTimer.java
new file mode 100644
index 00000000000..dfaf55472d6
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/QosTimer.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal;
+
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Consumer;
+
+import io.vertx.core.Handler;
+import io.vertx.core.Vertx;
+
+public class QosTimer {
+
+  private final Vertx timerVertx;
+  private final AtomicLong timerId = new AtomicLong(Long.MAX_VALUE);
+  private final AtomicLong lastReset = new AtomicLong(System.currentTimeMillis());
+
+  private final long periodMillis;
+  private final Consumer<Long> consumerTask;
+
+  public QosTimer(
+      final Vertx timerVertx, final long periodMillis, final Consumer<Long> consumerTask) {
+    this.timerVertx = timerVertx;
+    this.periodMillis = periodMillis;
+    this.consumerTask = consumerTask;
+    resetTimer();
+  }
+
+  public void resetTimer() {
+    lastReset.set(System.currentTimeMillis());
+    resetTimerHandler(timerHandler());
+  }
+
+  void resetTimerHandler(final Handler<Long> timerHandler) {
+    timerVertx.cancelTimer(timerId.get());
+    timerId.set(timerVertx.setTimer(periodMillis, timerHandler));
+  }
+
+  Handler<Long> timerHandler() {
+    return z -> {
+      var lastCall = getLastCallMillis();
+      var now = System.currentTimeMillis();
+      if (lastCall + periodMillis < now) {
+        consumerTask.accept(lastCall);
+      }
+      resetTimerHandler(timerHandler());
+    };
+  }
+
+  long getLastCallMillis() {
+    return lastReset.get();
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/exception/Logging403ErrorHandler.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/exception/Logging403ErrorHandler.java
new file mode 100644
index 00000000000..dcd6d8873df
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/exception/Logging403ErrorHandler.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ *  the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception;
+
+import io.vertx.core.Handler;
+import io.vertx.core.http.HttpServerResponse;
+import io.vertx.ext.web.RoutingContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class Logging403ErrorHandler implements Handler<RoutingContext> {
+
+  private static final Logger LOG = LoggerFactory.getLogger(Logging403ErrorHandler.class);
+
+  @Override
+  public void handle(final RoutingContext event) {
+    LOG.error(event.failure().getMessage());
+    LOG.debug(event.failure().getMessage(), event.failure());
+    int statusCode = event.statusCode();
+
+    HttpServerResponse response = event.response();
+    response.setStatusCode(statusCode).end("Exception thrown handling RPC");
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/BlockFilter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/BlockFilter.java
index c32cb7452c5..0367667feb9 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/BlockFilter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/BlockFilter.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManager.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManager.java
index 1bd766f7574..242340bd6d0 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManager.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManager.java
@@ -18,12 +18,12 @@
 import static java.util.Collections.emptyList;
 import static java.util.stream.Collectors.toUnmodifiableList;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.query.LogsQuery;
 import org.hyperledger.besu.ethereum.api.query.PrivacyQueries;
 import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
@@ -124,7 +124,7 @@ public String installLogFilter(
    * Installs a new private log filter
    *
    * @param privacyGroupId String privacyGroupId
-   * @param enclavePublicKey String enclavePublicKey of user creating the filter
+   * @param privacyUserId String privacyUserId of user creating the filter
    * @param fromBlock {@link BlockParameter} Integer block number, or latest/pending/earliest.
    * @param toBlock {@link BlockParameter} Integer block number, or latest/pending/earliest.
    * @param logsQuery {@link LogsQuery} Addresses and/or topics to filter by
@@ -132,14 +132,14 @@ public String installLogFilter(
    */
   public String installPrivateLogFilter(
       final String privacyGroupId,
-      final String enclavePublicKey,
+      final String privacyUserId,
       final BlockParameter fromBlock,
       final BlockParameter toBlock,
       final LogsQuery logsQuery) {
     final String filterId = filterIdGenerator.nextId();
     filterRepository.save(
         new PrivateLogFilter(
-            filterId, privacyGroupId, enclavePublicKey, fromBlock, toBlock, logsQuery));
+            filterId, privacyGroupId, privacyUserId, fromBlock, toBlock, logsQuery));
     return filterId;
   }
 
@@ -231,7 +231,7 @@ void processRemovalEvent(final PrivateTransactionEvent event) {
         .filter(
             privateLogFilter ->
                 privateLogFilter.getPrivacyGroupId().equals(event.getPrivacyGroupId())
-                    && privateLogFilter.getEnclavePublicKey().equals(event.getEnclavePublicKey()))
+                    && privateLogFilter.getPrivacyUserId().equals(event.getPrivacyUserId()))
         .forEach(
             privateLogFilter -> {
               uninstallFilter(privateLogFilter.getId());
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/PendingTransactionFilter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/PendingTransactionFilter.java
index 5092919be74..958607e05dc 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/PendingTransactionFilter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/PendingTransactionFilter.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/PrivateLogFilter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/PrivateLogFilter.java
index 87836b5ff0d..320bf2ead1f 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/PrivateLogFilter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/PrivateLogFilter.java
@@ -20,25 +20,25 @@
 public class PrivateLogFilter extends LogFilter {
 
   private final String privacyGroupId;
-  private final String enclavePublicKey;
+  private final String privacyUserId;
 
   PrivateLogFilter(
       final String id,
       final String privacyGroupId,
-      final String enclavePublicKey,
+      final String privacyUserId,
       final BlockParameter fromBlock,
       final BlockParameter toBlock,
       final LogsQuery logsQuery) {
     super(id, fromBlock, toBlock, logsQuery);
     this.privacyGroupId = privacyGroupId;
-    this.enclavePublicKey = enclavePublicKey;
+    this.privacyUserId = privacyUserId;
   }
 
   public String getPrivacyGroupId() {
     return privacyGroupId;
   }
 
-  public String getEnclavePublicKey() {
-    return enclavePublicKey;
+  public String getPrivacyUserId() {
+    return privacyUserId;
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractBlockParameterMethod.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractBlockParameterMethod.java
index 4da6a5d861a..e5340d5bf62 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractBlockParameterMethod.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractBlockParameterMethod.java
@@ -16,26 +16,30 @@
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
 
 import java.util.Optional;
+import java.util.function.Function;
 import java.util.function.Supplier;
 
 import com.google.common.base.Suppliers;
 
 public abstract class AbstractBlockParameterMethod implements JsonRpcMethod {
 
-  protected final Supplier<BlockchainQueries> blockchainQueries;
+  protected final Supplier<BlockchainQueries> blockchainQueriesSupplier;
 
   protected AbstractBlockParameterMethod(final BlockchainQueries blockchainQueries) {
     this(Suppliers.ofInstance(blockchainQueries));
   }
 
-  protected AbstractBlockParameterMethod(final Supplier<BlockchainQueries> blockchainQueries) {
-    this.blockchainQueries = blockchainQueries;
+  protected AbstractBlockParameterMethod(
+      final Supplier<BlockchainQueries> blockchainQueriesSupplier) {
+    this.blockchainQueriesSupplier = blockchainQueriesSupplier;
   }
 
   protected abstract BlockParameter blockParameter(JsonRpcRequestContext request);
@@ -43,7 +47,7 @@ protected AbstractBlockParameterMethod(final Supplier<BlockchainQueries> blockch
   protected abstract Object resultByBlockNumber(JsonRpcRequestContext request, long blockNumber);
 
   protected BlockchainQueries getBlockchainQueries() {
-    return blockchainQueries.get();
+    return blockchainQueriesSupplier.get();
   }
 
   protected Object pendingResult(final JsonRpcRequestContext request) {
@@ -53,24 +57,44 @@ protected Object pendingResult(final JsonRpcRequestContext request) {
   }
 
   protected Object latestResult(final JsonRpcRequestContext request) {
-    return resultByBlockNumber(request, blockchainQueries.get().headBlockNumber());
+    return resultByBlockNumber(request, blockchainQueriesSupplier.get().headBlockNumber());
+  }
+
+  protected Object finalizedResult(final JsonRpcRequestContext request) {
+    return posRelatedResult(request, BlockchainQueries::finalizedBlockHeader);
+  }
+
+  protected Object safeResult(final JsonRpcRequestContext request) {
+    return posRelatedResult(request, BlockchainQueries::safeBlockHeader);
+  }
+
+  private Object posRelatedResult(
+      final JsonRpcRequestContext request,
+      final Function<BlockchainQueries, Optional<BlockHeader>> blockHeaderSupplier) {
+
+    return blockHeaderSupplier
+        .apply(blockchainQueriesSupplier.get())
+        .map(header -> resultByBlockNumber(request, header.getNumber()))
+        .orElseGet(
+            () ->
+                new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.UNKNOWN_BLOCK));
   }
 
   protected Object findResultByParamType(final JsonRpcRequestContext request) {
     final BlockParameter blockParam = blockParameter(request);
-
-    final Object result;
     final Optional<Long> blockNumber = blockParam.getNumber();
+
     if (blockNumber.isPresent()) {
-      result = resultByBlockNumber(request, blockNumber.get());
+      return resultByBlockNumber(request, blockNumber.get());
     } else if (blockParam.isLatest()) {
-      result = latestResult(request);
+      return latestResult(request);
+    } else if (blockParam.isFinalized()) {
+      return finalizedResult(request);
+    } else if (blockParam.isSafe()) {
+      return safeResult(request);
     } else {
-      // If block parameter is not numeric or latest, it is pending.
-      result = pendingResult(request);
+      return pendingResult(request);
     }
-
-    return result;
   }
 
   @Override
@@ -82,7 +106,6 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
           requestContext.getRequest().getId(), ((JsonRpcErrorResponse) response).getError());
     }
 
-    return new JsonRpcSuccessResponse(
-        requestContext.getRequest().getId(), findResultByParamType(requestContext));
+    return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), response);
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractBlockParameterOrBlockHashMethod.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractBlockParameterOrBlockHashMethod.java
new file mode 100644
index 00000000000..ebb3cd2af61
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractBlockParameterOrBlockHashMethod.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameterOrBlockHash;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import com.google.common.base.Suppliers;
+
+public abstract class AbstractBlockParameterOrBlockHashMethod implements JsonRpcMethod {
+
+  protected final Supplier<BlockchainQueries> blockchainQueries;
+
+  protected AbstractBlockParameterOrBlockHashMethod(final BlockchainQueries blockchainQueries) {
+    this(Suppliers.ofInstance(blockchainQueries));
+  }
+
+  protected AbstractBlockParameterOrBlockHashMethod(
+      final Supplier<BlockchainQueries> blockchainQueries) {
+    this.blockchainQueries = blockchainQueries;
+  }
+
+  protected abstract BlockParameterOrBlockHash blockParameterOrBlockHash(
+      JsonRpcRequestContext request);
+
+  protected abstract Object resultByBlockHash(JsonRpcRequestContext request, Hash blockHash);
+
+  protected Object resultByBlockHeader(
+      final JsonRpcRequestContext request, final BlockHeader blockHeader) {
+    return resultByBlockHash(request, blockHeader.getBlockHash());
+  }
+
+  protected BlockchainQueries getBlockchainQueries() {
+    return blockchainQueries.get();
+  }
+
+  protected Object pendingResult(final JsonRpcRequestContext request) {
+    // TODO: Update once we mine and better understand pending semantics.
+    // For now act like we are not mining and just return latest.
+    return latestResult(request);
+  }
+
+  protected Object latestResult(final JsonRpcRequestContext request) {
+    return resultByBlockHeader(
+        request, getBlockchainQueries().getBlockchain().getChainHead().getBlockHeader());
+  }
+
+  protected Object finalizedResult(final JsonRpcRequestContext request) {
+    return posRelatedResult(request, BlockchainQueries::finalizedBlockHeader);
+  }
+
+  protected Object safeResult(final JsonRpcRequestContext request) {
+    return posRelatedResult(request, BlockchainQueries::safeBlockHeader);
+  }
+
+  private Object posRelatedResult(
+      final JsonRpcRequestContext request,
+      final Function<BlockchainQueries, Optional<BlockHeader>> blockHeaderSupplier) {
+
+    return blockHeaderSupplier
+        .apply(blockchainQueries.get())
+        .map(header -> resultByBlockHash(request, header.getBlockHash()))
+        .orElseGet(
+            () ->
+                new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.UNKNOWN_BLOCK));
+  }
+
+  protected Object handleParamTypes(final JsonRpcRequestContext requestContext) {
+    final BlockParameterOrBlockHash blockParameterOrBlockHash =
+        blockParameterOrBlockHash(requestContext);
+
+    final Object result;
+    if (blockParameterOrBlockHash.isLatest()) {
+      result = latestResult(requestContext);
+    } else if (blockParameterOrBlockHash.isPending()) {
+      result = pendingResult(requestContext);
+    } else if (blockParameterOrBlockHash.isSafe()) {
+      result = safeResult(requestContext);
+    } else if (blockParameterOrBlockHash.isFinalized()) {
+      result = finalizedResult(requestContext);
+    } else if (blockParameterOrBlockHash.isNumeric() || blockParameterOrBlockHash.isEarliest()) {
+      final OptionalLong blockNumber = blockParameterOrBlockHash.getNumber();
+      if (blockNumber.isEmpty() || blockNumber.getAsLong() < 0) {
+        return new JsonRpcErrorResponse(
+            requestContext.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
+      } else if (blockNumber.getAsLong() > getBlockchainQueries().headBlockNumber()) {
+        return new JsonRpcErrorResponse(
+            requestContext.getRequest().getId(), JsonRpcError.BLOCK_NOT_FOUND);
+      }
+
+      result =
+          resultByBlockHash(
+              requestContext,
+              blockchainQueries
+                  .get()
+                  .getBlockHashByNumber(blockNumber.getAsLong())
+                  .orElse(Hash.EMPTY));
+    } else {
+      Optional<Hash> blockHash = blockParameterOrBlockHash.getHash();
+      if (blockHash.isEmpty()) {
+        return new JsonRpcErrorResponse(
+            requestContext.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
+      }
+
+      // return error if block hash does not find a block
+      Optional<BlockHeader> maybeBlockHeader =
+          getBlockchainQueries().getBlockHeaderByHash(blockHash.get());
+      if (maybeBlockHeader.isEmpty()) {
+        return new JsonRpcErrorResponse(
+            requestContext.getRequest().getId(), JsonRpcError.BLOCK_NOT_FOUND);
+      }
+
+      if (Boolean.TRUE.equals(blockParameterOrBlockHash.getRequireCanonical())
+          && !getBlockchainQueries().blockIsOnCanonicalChain(blockHash.get())) {
+        return new JsonRpcErrorResponse(
+            requestContext.getRequest().getId(), JsonRpcError.JSON_RPC_NOT_CANONICAL_ERROR);
+      }
+
+      result = resultByBlockHash(requestContext, blockHash.get());
+    }
+
+    return result;
+  }
+
+  @Override
+  public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
+    Object response = handleParamTypes(requestContext);
+
+    if (response instanceof JsonRpcErrorResponse) {
+      return (JsonRpcResponse) response;
+    }
+
+    return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), response);
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractEstimateGas.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractEstimateGas.java
new file mode 100644
index 00000000000..c8308061e90
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractEstimateGas.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcErrorConverter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.ethereum.transaction.CallParameter;
+import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
+import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
+import org.hyperledger.besu.ethereum.transaction.TransactionSimulatorResult;
+import org.hyperledger.besu.evm.tracing.EstimateGasOperationTracer;
+
+import java.util.Optional;
+
+public abstract class AbstractEstimateGas implements JsonRpcMethod {
+
+  private static final double SUB_CALL_REMAINING_GAS_RATIO = 65D / 64D;
+
+  protected final BlockchainQueries blockchainQueries;
+  protected final TransactionSimulator transactionSimulator;
+
+  public AbstractEstimateGas(
+      final BlockchainQueries blockchainQueries, final TransactionSimulator transactionSimulator) {
+    this.blockchainQueries = blockchainQueries;
+    this.transactionSimulator = transactionSimulator;
+  }
+
+  protected BlockHeader blockHeader() {
+    final long headBlockNumber = blockchainQueries.headBlockNumber();
+    return blockchainQueries.getBlockchain().getBlockHeader(headBlockNumber).orElse(null);
+  }
+
+  protected CallParameter overrideGasLimitAndPrice(
+      final JsonCallParameter callParams, final long gasLimit) {
+    return new CallParameter(
+        callParams.getFrom(),
+        callParams.getTo(),
+        gasLimit,
+        Optional.ofNullable(callParams.getGasPrice()).orElse(Wei.ZERO),
+        callParams.getMaxPriorityFeePerGas(),
+        callParams.getMaxFeePerGas(),
+        callParams.getValue(),
+        callParams.getPayload(),
+        callParams.getAccessList());
+  }
+
+  /**
+   * Estimate gas by adding minimum gas remaining for some operation and the necessary gas for sub
+   * calls
+   *
+   * @param result transaction simulator result
+   * @param operationTracer estimate gas operation tracer
+   * @return estimate gas
+   */
+  protected long processEstimateGas(
+      final TransactionSimulatorResult result, final EstimateGasOperationTracer operationTracer) {
+    // no more than 63/64s of the remaining gas can be passed to the sub calls
+    final double subCallMultiplier =
+        Math.pow(SUB_CALL_REMAINING_GAS_RATIO, operationTracer.getMaxDepth());
+    // and minimum gas remaining is necessary for some operation (additionalStipend)
+    final long gasStipend = operationTracer.getStipendNeeded();
+    final long gasUsedByTransaction = result.getResult().getEstimateGasUsedByTransaction();
+    return ((long) ((gasUsedByTransaction + gasStipend) * subCallMultiplier));
+  }
+
+  protected JsonCallParameter validateAndGetCallParams(final JsonRpcRequestContext request) {
+    final JsonCallParameter callParams = request.getRequiredParameter(0, JsonCallParameter.class);
+    if (callParams.getGasPrice() != null
+        && (callParams.getMaxFeePerGas().isPresent()
+            || callParams.getMaxPriorityFeePerGas().isPresent())) {
+      throw new InvalidJsonRpcParameters("gasPrice cannot be used with baseFee or maxFeePerGas");
+    }
+    return callParams;
+  }
+
+  protected JsonRpcErrorResponse errorResponse(
+      final JsonRpcRequestContext request, final TransactionSimulatorResult result) {
+    final JsonRpcError jsonRpcError;
+
+    final ValidationResult<TransactionInvalidReason> validationResult =
+        result.getValidationResult();
+    if (validationResult != null && !validationResult.isValid()) {
+      jsonRpcError =
+          JsonRpcErrorConverter.convertTransactionInvalidReason(
+              validationResult.getInvalidReason());
+    } else {
+      final TransactionProcessingResult resultTrx = result.getResult();
+      if (resultTrx != null && resultTrx.getRevertReason().isPresent()) {
+        jsonRpcError = JsonRpcError.REVERT_ERROR;
+        jsonRpcError.setData(resultTrx.getRevertReason().get().toHexString());
+      } else {
+        jsonRpcError = JsonRpcError.INTERNAL_ERROR;
+      }
+    }
+    return errorResponse(request, jsonRpcError);
+  }
+
+  protected JsonRpcErrorResponse errorResponse(
+      final JsonRpcRequestContext request, final JsonRpcError jsonRpcError) {
+    return new JsonRpcErrorResponse(request.getRequest().getId(), jsonRpcError);
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractTraceByBlock.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractTraceByBlock.java
new file mode 100644
index 00000000000..92bfa099c9c
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractTraceByBlock.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TraceTypeParameter.TraceType;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TraceTypeParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TraceCallResult;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.diff.StateDiffGenerator;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.diff.StateDiffTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.flat.FlatTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.flat.FlatTraceGenerator;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.vm.VmTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.vm.VmTraceGenerator;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.debug.TraceOptions;
+import org.hyperledger.besu.ethereum.mainnet.ImmutableTransactionValidationParams;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
+import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
+import org.hyperledger.besu.ethereum.transaction.TransactionSimulatorResult;
+
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public abstract class AbstractTraceByBlock extends AbstractBlockParameterMethod
+    implements JsonRpcMethod {
+  protected final ProtocolSchedule protocolSchedule;
+  protected final TransactionSimulator transactionSimulator;
+
+  protected static final ObjectMapper mapper = new ObjectMapper();
+
+  protected AbstractTraceByBlock(
+      final BlockchainQueries blockchainQueries,
+      final ProtocolSchedule protocolSchedule,
+      final TransactionSimulator transactionSimulator) {
+    super(blockchainQueries);
+
+    this.protocolSchedule = protocolSchedule;
+    this.transactionSimulator = transactionSimulator;
+  }
+
+  @Override
+  protected BlockParameter blockParameter(final JsonRpcRequestContext request) {
+    final Optional<BlockParameter> maybeBlockParameter =
+        request.getOptionalParameter(2, BlockParameter.class);
+
+    if (maybeBlockParameter.isPresent()) {
+      return maybeBlockParameter.get();
+    }
+
+    return BlockParameter.LATEST;
+  }
+
+  protected JsonNode getTraceCallResult(
+      final ProtocolSchedule protocolSchedule,
+      final Set<TraceTypeParameter.TraceType> traceTypes,
+      final TransactionSimulatorResult simulatorResult,
+      final TransactionTrace transactionTrace,
+      final Block block) {
+    final TraceCallResult.Builder builder = TraceCallResult.builder();
+
+    transactionTrace
+        .getResult()
+        .getRevertReason()
+        .ifPresentOrElse(
+            revertReason -> builder.output(revertReason.toHexString()),
+            () -> builder.output(simulatorResult.getOutput().toString()));
+
+    if (traceTypes.contains(TraceType.STATE_DIFF)) {
+      new StateDiffGenerator()
+          .generateStateDiff(transactionTrace)
+          .forEachOrdered(stateDiff -> builder.stateDiff((StateDiffTrace) stateDiff));
+    }
+
+    if (traceTypes.contains(TraceType.TRACE)) {
+      FlatTraceGenerator.generateFromTransactionTrace(
+              protocolSchedule, transactionTrace, block, new AtomicInteger(), false)
+          .forEachOrdered(trace -> builder.addTrace((FlatTrace) trace));
+    }
+
+    if (traceTypes.contains(TraceType.VM_TRACE)) {
+      new VmTraceGenerator(transactionTrace)
+          .generateTraceStream()
+          .forEachOrdered(vmTrace -> builder.vmTrace((VmTrace) vmTrace));
+    }
+
+    return mapper.valueToTree(builder.build());
+  }
+
+  protected TransactionValidationParams buildTransactionValidationParams() {
+    return ImmutableTransactionValidationParams.builder()
+        .from(TransactionValidationParams.transactionSimulator())
+        .build();
+  }
+
+  protected TraceOptions buildTraceOptions(final Set<TraceTypeParameter.TraceType> traceTypes) {
+    return new TraceOptions(
+        traceTypes.contains(TraceType.STATE_DIFF),
+        false,
+        traceTypes.contains(TraceType.TRACE) || traceTypes.contains(TraceType.VM_TRACE));
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractTraceByHash.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractTraceByHash.java
new file mode 100644
index 00000000000..281d7248108
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractTraceByHash.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.Tracer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.flat.FlatTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.flat.FlatTraceGenerator;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.debug.TraceOptions;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.vm.DebugOperationTracer;
+
+import java.util.Collections;
+import java.util.Optional;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+
+public abstract class AbstractTraceByHash implements JsonRpcMethod {
+  protected final Supplier<BlockTracer> blockTracerSupplier;
+  protected final BlockchainQueries blockchainQueries;
+  protected final ProtocolSchedule protocolSchedule;
+
+  protected AbstractTraceByHash(
+      final Supplier<BlockTracer> blockTracerSupplier,
+      final BlockchainQueries blockchainQueries,
+      final ProtocolSchedule protocolSchedule) {
+    this.blockTracerSupplier = blockTracerSupplier;
+    this.blockchainQueries = blockchainQueries;
+    this.protocolSchedule = protocolSchedule;
+  }
+
+  public Stream<FlatTrace> resultByTransactionHash(final Hash transactionHash) {
+    return blockchainQueries
+        .transactionByHash(transactionHash)
+        .flatMap(TransactionWithMetadata::getBlockNumber)
+        .flatMap(blockNumber -> blockchainQueries.getBlockchain().getBlockByNumber(blockNumber))
+        .map(block -> getTraceBlock(block, transactionHash))
+        .orElse(Stream.empty());
+  }
+
+  private Stream<FlatTrace> getTraceBlock(final Block block, final Hash transactionHash) {
+    if (block == null || block.getBody().getTransactions().isEmpty()) {
+      return Stream.empty();
+    }
+    return Tracer.processTracing(
+            blockchainQueries,
+            Optional.of(block.getHeader()),
+            mutableWorldState -> {
+              final TransactionTrace transactionTrace = getTransactionTrace(block, transactionHash);
+              return Optional.ofNullable(getTraceStream(transactionTrace, block));
+            })
+        .orElse(Stream.empty());
+  }
+
+  private TransactionTrace getTransactionTrace(final Block block, final Hash transactionHash) {
+    return Tracer.processTracing(
+            blockchainQueries,
+            Optional.of(block.getHeader()),
+            mutableWorldState -> {
+              return blockTracerSupplier
+                  .get()
+                  .trace(
+                      mutableWorldState,
+                      block,
+                      new DebugOperationTracer(new TraceOptions(false, false, true)))
+                  .map(BlockTrace::getTransactionTraces)
+                  .orElse(Collections.emptyList())
+                  .stream()
+                  .filter(trxTrace -> trxTrace.getTransaction().getHash().equals(transactionHash))
+                  .findFirst();
+            })
+        .orElseThrow();
+  }
+
+  private Stream<FlatTrace> getTraceStream(
+      final TransactionTrace transactionTrace, final Block block) {
+    return FlatTraceGenerator.generateFromTransactionTraceAndBlock(
+            this.protocolSchedule, transactionTrace, block)
+        .map(FlatTrace.class::cast);
+  }
+
+  protected JsonNode arrayNodeFromTraceStream(final Stream<FlatTrace> traceStream) {
+    final ObjectMapper mapper = new ObjectMapper();
+    final ArrayNode resultArrayNode = mapper.createArrayNode();
+    traceStream.forEachOrdered(resultArrayNode::addPOJO);
+    return resultArrayNode;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminAddPeer.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminAddPeer.java
index be88b1030f9..4bd352aaa26 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminAddPeer.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminAddPeer.java
@@ -19,18 +19,23 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
 import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeDnsConfiguration;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AdminAddPeer extends AdminModifyPeer {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(AdminAddPeer.class);
 
-  public AdminAddPeer(final P2PNetwork peerNetwork) {
-    super(peerNetwork);
+  public AdminAddPeer(
+      final P2PNetwork peerNetwork, final Optional<EnodeDnsConfiguration> enodeDnsConfiguration) {
+    super(peerNetwork, enodeDnsConfiguration);
   }
 
   @Override
@@ -41,9 +46,12 @@ public String getName() {
   @Override
   protected JsonRpcResponse performOperation(final Object id, final String enode) {
     LOG.debug("Adding ({}) to peers", enode);
-    final EnodeURL enodeURL = EnodeURL.fromString(enode);
+    final EnodeURL enodeURL =
+        this.enodeDnsConfiguration.isEmpty()
+            ? EnodeURLImpl.fromString(enode)
+            : EnodeURLImpl.fromString(enode, enodeDnsConfiguration.get());
     final Peer peer = DefaultPeer.fromEnodeURL(enodeURL);
-    final boolean addedToNetwork = peerNetwork.addMaintainConnectionPeer(peer);
+    final boolean addedToNetwork = peerNetwork.addMaintainedConnectionPeer(peer);
     return new JsonRpcSuccessResponse(id, addedToNetwork);
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevel.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevel.java
index b8492656ed6..8a6dc7168f4 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevel.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevel.java
@@ -21,18 +21,20 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.util.LogConfigurator;
 
 import java.util.Arrays;
 import java.util.Optional;
+import java.util.Set;
 
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.config.Configurator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AdminChangeLogLevel implements JsonRpcMethod {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(AdminChangeLogLevel.class);
+  private static final Set<String> VALID_PARAMS =
+      Set.of("OFF", "ERROR", "WARN", "INFO", "DEBUG", "TRACE", "ALL");
 
   @Override
   public String getName() {
@@ -42,7 +44,11 @@ public String getName() {
   @Override
   public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     try {
-      final Level logLevel = requestContext.getRequiredParameter(0, Level.class);
+      final String logLevel = requestContext.getRequiredParameter(0, String.class);
+      if (!VALID_PARAMS.contains(logLevel)) {
+        return new JsonRpcErrorResponse(
+            requestContext.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
+      }
       final Optional<String[]> optionalLogFilters =
           requestContext.getOptionalParameter(1, String[].class);
       optionalLogFilters.ifPresentOrElse(
@@ -56,8 +62,8 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     }
   }
 
-  private void setLogLevel(final String logFilter, final Level logLevel) {
-    LOG.log(Level.OFF, "Setting {} logging level to {} ", logFilter, logLevel.name());
-    Configurator.setAllLevels(logFilter, logLevel);
+  private void setLogLevel(final String logFilter, final String logLevel) {
+    LOG.debug("Setting {} logging level to {} ", logFilter, logLevel);
+    LogConfigurator.setLevel(logFilter, logLevel);
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRemoveCache.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRemoveCache.java
index ce65d5fd825..70a4c1db0f0 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRemoveCache.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRemoveCache.java
@@ -52,10 +52,9 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
       startBlock = BlockHeader.GENESIS_BLOCK_NUMBER;
     } else if (startBlockParameter.get().getNumber().isPresent()) {
       startBlock = startBlockParameter.get().getNumber().get();
-      blockchainQueries
-          .getBlockchain()
-          .getBlockByNumber(startBlock)
-          .orElseThrow(() -> new IllegalStateException("Block not found, " + startBlock));
+      if (blockchainQueries.getBlockchain().getBlockByNumber(startBlock).isEmpty()) {
+        throw new IllegalStateException("Block not found, " + startBlock);
+      }
     } else {
       // latest, pending
       startBlock = blockchainQueries.headBlockNumber();
@@ -72,10 +71,9 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
       stopBlock = BlockHeader.GENESIS_BLOCK_NUMBER;
     } else if (stopBlockParameter.get().getNumber().isPresent()) {
       stopBlock = stopBlockParameter.get().getNumber().get();
-      blockchainQueries
-          .getBlockchain()
-          .getBlockByNumber(stopBlock)
-          .orElseThrow(() -> new IllegalStateException("Block not found, " + stopBlock));
+      if (blockchainQueries.getBlockchain().getBlockByNumber(stopBlock).isEmpty()) {
+        throw new IllegalStateException("Block not found, " + stopBlock);
+      }
     } else {
       // latest, pending
       stopBlock = blockchainQueries.headBlockNumber();
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRepairCache.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRepairCache.java
index 4e8542fc7f7..757ac2756bb 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRepairCache.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRepairCache.java
@@ -40,12 +40,10 @@ public String getName() {
   public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     final Optional<Long> blockNumber = requestContext.getOptionalParameter(0, Long.class);
 
-    blockNumber.ifPresent(
-        bn ->
-            blockchainQueries
-                .getBlockchain()
-                .getBlockByNumber(bn)
-                .orElseThrow(() -> new IllegalStateException("Block not found, " + bn)));
+    if (blockNumber.isPresent()
+        && blockchainQueries.getBlockchain().getBlockByNumber(blockNumber.get()).isEmpty()) {
+      throw new IllegalStateException("Block not found, " + blockNumber.get());
+    }
 
     final TransactionLogBloomCacher transactionLogBloomCacher =
         blockchainQueries
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminModifyPeer.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminModifyPeer.java
index ca0fc91b748..8cb11b9dcb5 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminModifyPeer.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminModifyPeer.java
@@ -21,13 +21,19 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
 import org.hyperledger.besu.ethereum.p2p.network.exceptions.P2PDisabledException;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeDnsConfiguration;
+
+import java.util.Optional;
 
 public abstract class AdminModifyPeer implements JsonRpcMethod {
 
   protected final P2PNetwork peerNetwork;
+  protected final Optional<EnodeDnsConfiguration> enodeDnsConfiguration;
 
-  protected AdminModifyPeer(final P2PNetwork peerNetwork) {
+  protected AdminModifyPeer(
+      final P2PNetwork peerNetwork, final Optional<EnodeDnsConfiguration> enodeDnsConfiguration) {
     this.peerNetwork = peerNetwork;
+    this.enodeDnsConfiguration = enodeDnsConfiguration;
   }
 
   @Override
@@ -49,8 +55,16 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
         return new JsonRpcErrorResponse(
             requestContext.getRequest().getId(), JsonRpcError.ENODE_ID_INVALID);
       } else {
-        return new JsonRpcErrorResponse(
-            requestContext.getRequest().getId(), JsonRpcError.PARSE_ERROR);
+        if (e.getMessage().endsWith("Invalid ip address.")) {
+          return new JsonRpcErrorResponse(
+              requestContext.getRequest().getId(), JsonRpcError.DNS_NOT_ENABLED);
+        } else if (e.getMessage().endsWith("dns-update-enabled flag is false.")) {
+          return new JsonRpcErrorResponse(
+              requestContext.getRequest().getId(), JsonRpcError.CANT_RESOLVE_PEER_ENODE_DNS);
+        } else {
+          return new JsonRpcErrorResponse(
+              requestContext.getRequest().getId(), JsonRpcError.PARSE_ERROR);
+        }
       }
     } catch (final P2PDisabledException e) {
       return new JsonRpcErrorResponse(
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminNodeInfo.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminNodeInfo.java
index b5f9ab86333..21ffd34e1d1 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminNodeInfo.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminNodeInfo.java
@@ -24,11 +24,11 @@
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.chain.ChainHead;
 import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
 import org.hyperledger.besu.nat.NatService;
 import org.hyperledger.besu.nat.core.domain.NatPortMapping;
 import org.hyperledger.besu.nat.core.domain.NatServiceType;
 import org.hyperledger.besu.nat.core.domain.NetworkProtocol;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.math.BigInteger;
 import java.net.URI;
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminRemovePeer.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminRemovePeer.java
index 46fa6cef0e1..0cb654bb129 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminRemovePeer.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminRemovePeer.java
@@ -19,17 +19,22 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
 import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeDnsConfiguration;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AdminRemovePeer extends AdminModifyPeer {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(AdminRemovePeer.class);
 
-  public AdminRemovePeer(final P2PNetwork peerNetwork) {
-    super(peerNetwork);
+  public AdminRemovePeer(
+      final P2PNetwork peerNetwork, final Optional<EnodeDnsConfiguration> enodeDnsConfiguration) {
+    super(peerNetwork, enodeDnsConfiguration);
   }
 
   @Override
@@ -40,7 +45,10 @@ public String getName() {
   @Override
   protected JsonRpcResponse performOperation(final Object id, final String enode) {
     LOG.debug("Remove ({}) from peer cache", enode);
-    final EnodeURL enodeURL = EnodeURL.fromString(enode);
+    final EnodeURL enodeURL =
+        this.enodeDnsConfiguration.isEmpty()
+            ? EnodeURLImpl.fromString(enode)
+            : EnodeURLImpl.fromString(enode, enodeDnsConfiguration.get());
     final boolean result =
         peerNetwork.removeMaintainedConnectionPeer(DefaultPeer.fromEnodeURL(enodeURL));
     return new JsonRpcSuccessResponse(id, result);
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/BuildArrayNodeCompleterStep.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/BuildArrayNodeCompleterStep.java
new file mode 100644
index 00000000000..6c308e13acb
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/BuildArrayNodeCompleterStep.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import org.hyperledger.besu.ethereum.api.util.ArrayNodeWrapper;
+
+import java.util.function.Consumer;
+
+public class BuildArrayNodeCompleterStep implements Consumer<Object> {
+
+  private final ArrayNodeWrapper resultArrayNode;
+
+  public BuildArrayNodeCompleterStep(final ArrayNodeWrapper resultArrayNode) {
+    this.resultArrayNode = resultArrayNode;
+  }
+
+  @Override
+  public void accept(final Object object) {
+    resultArrayNode.addPOJO(object);
+  }
+
+  public ArrayNodeWrapper getResultArrayNode() {
+    return this.resultArrayNode;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugAccountAt.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugAccountAt.java
new file mode 100644
index 00000000000..a6cde35bb4a
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugAccountAt.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameterOrBlockHash;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.Tracer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.ImmutableDebugAccountAtResult;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
+import org.hyperledger.besu.ethereum.api.query.BlockWithMetadata;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
+import org.hyperledger.besu.ethereum.debug.TraceOptions;
+import org.hyperledger.besu.ethereum.vm.DebugOperationTracer;
+import org.hyperledger.besu.evm.account.Account;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Supplier;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class DebugAccountAt extends AbstractBlockParameterOrBlockHashMethod {
+  private final Supplier<BlockTracer> blockTracerSupplier;
+
+  public DebugAccountAt(
+      final BlockchainQueries blockchainQueries, final Supplier<BlockTracer> blockTracerSupplier) {
+    super(blockchainQueries);
+    this.blockTracerSupplier = blockTracerSupplier;
+  }
+
+  public DebugAccountAt(
+      final Supplier<BlockchainQueries> blockchainQueries,
+      final Supplier<BlockTracer> blockTracerSupplier) {
+    super(blockchainQueries);
+    this.blockTracerSupplier = blockTracerSupplier;
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.DEBUG_ACCOUNT_AT.getMethodName();
+  }
+
+  @Override
+  protected BlockParameterOrBlockHash blockParameterOrBlockHash(
+      final JsonRpcRequestContext requestContext) {
+    return requestContext.getRequiredParameter(0, BlockParameterOrBlockHash.class);
+  }
+
+  @Override
+  protected Object resultByBlockHash(
+      final JsonRpcRequestContext requestContext, final Hash blockHash) {
+    final Integer txIndex = requestContext.getRequiredParameter(1, Integer.class);
+    final Address address = requestContext.getRequiredParameter(2, Address.class);
+
+    Optional<BlockWithMetadata<TransactionWithMetadata, Hash>> block =
+        blockchainQueries.get().blockByHash(blockHash);
+    if (block.isEmpty()) {
+      return new JsonRpcErrorResponse(
+          requestContext.getRequest().getId(), JsonRpcError.BLOCK_NOT_FOUND);
+    }
+
+    List<TransactionWithMetadata> transactions = block.get().getTransactions();
+    if (transactions.isEmpty() || txIndex < 0 || txIndex > block.get().getTransactions().size()) {
+      return new JsonRpcErrorResponse(
+          requestContext.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
+    }
+
+    return Tracer.processTracing(
+            blockchainQueries.get(),
+            Optional.of(block.get().getHeader()),
+            mutableWorldState -> {
+              final Optional<TransactionTrace> transactionTrace =
+                  blockTracerSupplier
+                      .get()
+                      .trace(
+                          mutableWorldState,
+                          blockHash,
+                          new DebugOperationTracer(new TraceOptions(false, true, true)))
+                      .map(BlockTrace::getTransactionTraces)
+                      .orElse(Collections.emptyList())
+                      .stream()
+                      .filter(
+                          trxTrace ->
+                              trxTrace
+                                  .getTransaction()
+                                  .getHash()
+                                  .equals(transactions.get(txIndex).getTransaction().getHash()))
+                      .findFirst();
+
+              if (transactionTrace.isEmpty()) {
+                return Optional.of(
+                    new JsonRpcErrorResponse(
+                        requestContext.getRequest().getId(), JsonRpcError.TRANSACTION_NOT_FOUND));
+              }
+
+              Optional<Account> account =
+                  transactionTrace.get().getTraceFrames().stream()
+                      .map(traceFrame -> traceFrame.getWorldUpdater().get(address))
+                      .filter(Objects::nonNull)
+                      .filter(a -> a.getAddress().equals(address))
+                      .findFirst();
+              if (account.isEmpty()) {
+                return Optional.of(
+                    new JsonRpcErrorResponse(
+                        requestContext.getRequest().getId(), JsonRpcError.NO_ACCOUNT_FOUND));
+              }
+
+              return Optional.of(
+                  debugAccountAtResult(
+                      account.get().getCode(),
+                      Quantity.create(account.get().getNonce()),
+                      Quantity.create(account.get().getBalance()),
+                      Quantity.create(account.get().getCodeHash())));
+            })
+        .orElse(
+            new JsonRpcErrorResponse(
+                requestContext.getRequest().getId(), JsonRpcError.WORLD_STATE_UNAVAILABLE));
+  }
+
+  protected ImmutableDebugAccountAtResult debugAccountAtResult(
+      final Bytes code, final String nonce, final String balance, final String codeHash) {
+    return ImmutableDebugAccountAtResult.builder()
+        .code(code.isEmpty() ? "0x0" : code.toHexString())
+        .nonce(nonce)
+        .balance(balance)
+        .codehash(codeHash)
+        .build();
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugAccountRange.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugAccountRange.java
index 4780a3df24d..4ca5cb0685f 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugAccountRange.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugAccountRange.java
@@ -14,6 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameterOrBlockHash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
@@ -21,11 +23,8 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.DebugAccountRangeAtResult;
 import org.hyperledger.besu.ethereum.api.query.BlockWithMetadata;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.WorldState.StreamableAccount;
+import org.hyperledger.besu.evm.worldstate.WorldState.StreamableAccount;
 
 import java.util.Collections;
 import java.util.List;
@@ -74,34 +73,34 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     }
 
     // TODO deal with mid-block locations
-
-    final Optional<MutableWorldState> state =
-        blockchainQueries.get().getWorldState(blockHeaderOptional.get().getNumber());
-
-    if (state.isEmpty()) {
-      return emptyResponse(requestContext);
-    } else {
-      final List<StreamableAccount> accounts =
-          state
-              .get()
-              .streamAccounts(Bytes32.fromHexStringLenient(addressHash), maxResults + 1)
-              .collect(Collectors.toList());
-      Bytes32 nextKey = Bytes32.ZERO;
-      if (accounts.size() == maxResults + 1) {
-        nextKey = accounts.get(maxResults).getAddressHash();
-        accounts.remove(maxResults);
-      }
-
-      return new JsonRpcSuccessResponse(
-          requestContext.getRequest().getId(),
-          new DebugAccountRangeAtResult(
-              accounts.stream()
-                  .collect(
-                      Collectors.toMap(
-                          account -> account.getAddressHash().toString(),
-                          account -> account.getAddress().orElse(Address.ZERO).toString())),
-              nextKey.toString()));
-    }
+    return blockchainQueries
+        .get()
+        .getAndMapWorldState(
+            blockHeaderOptional.get().getNumber(),
+            state -> {
+              final List<StreamableAccount> accounts =
+                  state
+                      .streamAccounts(Bytes32.fromHexStringLenient(addressHash), maxResults + 1)
+                      .collect(Collectors.toList());
+              Bytes32 nextKey = Bytes32.ZERO;
+              if (accounts.size() == maxResults + 1) {
+                nextKey = accounts.get(maxResults).getAddressHash();
+                accounts.remove(maxResults);
+              }
+
+              return Optional.of(
+                  new JsonRpcSuccessResponse(
+                      requestContext.getRequest().getId(),
+                      new DebugAccountRangeAtResult(
+                          accounts.stream()
+                              .collect(
+                                  Collectors.toMap(
+                                      account -> account.getAddressHash().toString(),
+                                      account ->
+                                          account.getAddress().orElse(Address.ZERO).toString())),
+                          nextKey.toString())));
+            })
+        .orElse(emptyResponse(requestContext));
   }
 
   private Optional<Hash> hashFromParameter(final BlockParameterOrBlockHash blockParameter) {
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugBatchSendRawTransaction.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugBatchSendRawTransaction.java
index 34b1f06f47e..83553dc8745 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugBatchSendRawTransaction.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugBatchSendRawTransaction.java
@@ -68,7 +68,7 @@ private ExecutionStatus process(final int index, final String rawTransaction) {
       final ValidationResult<TransactionInvalidReason> validationResult =
           transactionPool
               .get()
-              .addLocalTransaction(DomainObjectDecodeUtils.decodeRawTransaction(rawTransaction));
+              .addTransactionViaApi(DomainObjectDecodeUtils.decodeRawTransaction(rawTransaction));
       return validationResult.either(
           () -> new ExecutionStatus(index),
           errorReason -> new ExecutionStatus(index, false, errorReason.name()));
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugGetBadBlocks.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugGetBadBlocks.java
index aac609bc6d3..6f049d485e9 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugGetBadBlocks.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugGetBadBlocks.java
@@ -49,8 +49,11 @@ public String getName() {
   @Override
   public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     final List<BadBlockResult> response =
-        protocolSchedule.getByBlockNumber(blockchain.headBlockNumber()).getBadBlocksManager()
-            .getBadBlocks().stream()
+        protocolSchedule
+            .getByBlockHeader(blockchain.headBlockHeader())
+            .getBadBlocksManager()
+            .getBadBlocks()
+            .stream()
             .map(block -> BadBlockResult.from(blockResultFactory.transactionComplete(block), block))
             .collect(Collectors.toList());
     return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), response);
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugGetRawBlock.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugGetRawBlock.java
new file mode 100644
index 00000000000..8af0812a299
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugGetRawBlock.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+
+import com.google.common.base.Suppliers;
+
+public class DebugGetRawBlock extends AbstractBlockParameterMethod {
+
+  public DebugGetRawBlock(final BlockchainQueries blockchain) {
+    super(Suppliers.ofInstance(blockchain));
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.DEBUG_GET_RAW_BLOCK.getMethodName();
+  }
+
+  @Override
+  protected BlockParameter blockParameter(final JsonRpcRequestContext request) {
+    return request.getRequiredParameter(0, BlockParameter.class);
+  }
+
+  @Override
+  protected Object resultByBlockNumber(
+      final JsonRpcRequestContext request, final long blockNumber) {
+
+    return getBlockchainQueries()
+        .getBlockchain()
+        .getBlockByNumber(blockNumber)
+        .<Object>map(block -> RLP.encode(block::writeTo).toString())
+        .orElseGet(
+            () ->
+                new JsonRpcErrorResponse(
+                    request.getRequest().getId(), JsonRpcError.BLOCK_NOT_FOUND));
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugGetRawHeader.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugGetRawHeader.java
new file mode 100644
index 00000000000..9fd1fe83bfe
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugGetRawHeader.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+
+import com.google.common.base.Suppliers;
+
+public class DebugGetRawHeader extends AbstractBlockParameterMethod {
+
+  public DebugGetRawHeader(final BlockchainQueries blockchain) {
+    super(Suppliers.ofInstance(blockchain));
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.DEBUG_GET_RAW_HEADER.getMethodName();
+  }
+
+  @Override
+  protected BlockParameter blockParameter(final JsonRpcRequestContext request) {
+    return request.getRequiredParameter(0, BlockParameter.class);
+  }
+
+  @Override
+  protected Object resultByBlockNumber(
+      final JsonRpcRequestContext request, final long blockNumber) {
+
+    return getBlockchainQueries()
+        .blockByNumber(blockNumber)
+        .<Object>map(block -> RLP.encode(block.getHeader()::writeTo).toString())
+        .orElseGet(
+            () ->
+                new JsonRpcErrorResponse(
+                    request.getRequest().getId(), JsonRpcError.BLOCK_NOT_FOUND));
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugGetRawReceipts.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugGetRawReceipts.java
new file mode 100644
index 00000000000..9e879de5170
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugGetRawReceipts.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameterOrBlockHash;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+
+import java.util.List;
+
+import com.google.common.base.Suppliers;
+
+public class DebugGetRawReceipts extends AbstractBlockParameterOrBlockHashMethod {
+
+  public DebugGetRawReceipts(final BlockchainQueries blockchain) {
+    super(Suppliers.ofInstance(blockchain));
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.DEBUG_GET_RAW_RECEIPTS.getMethodName();
+  }
+
+  @Override
+  protected BlockParameterOrBlockHash blockParameterOrBlockHash(
+      final JsonRpcRequestContext request) {
+    return request.getRequiredParameter(0, BlockParameterOrBlockHash.class);
+  }
+
+  @Override
+  protected Object resultByBlockHash(final JsonRpcRequestContext request, final Hash blockHash) {
+    return blockchainQueries
+        .get()
+        .getBlockchain()
+        .getTxReceipts(blockHash)
+        .map(this::toRLP)
+        .orElseGet(() -> new String[0]);
+  }
+
+  private String[] toRLP(final List<TransactionReceipt> receipts) {
+    return receipts.stream()
+        .map(receipt -> RLP.encode(receipt::writeTo).toHexString())
+        .toArray(String[]::new);
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugGetRawTransaction.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugGetRawTransaction.java
new file mode 100644
index 00000000000..c4c40ffcc22
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugGetRawTransaction.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+
+public class DebugGetRawTransaction implements JsonRpcMethod {
+
+  protected final BlockchainQueries blockchainQueries;
+
+  public DebugGetRawTransaction(final BlockchainQueries blockchainQueries) {
+    this.blockchainQueries = blockchainQueries;
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.DEBUG_GET_RAW_TRANSACTION.getMethodName();
+  }
+
+  @Override
+  public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
+    final Hash txHash = requestContext.getRequiredParameter(0, Hash.class);
+
+    return blockchainQueries
+        .transactionByHash(txHash)
+        .map(
+            tx ->
+                new JsonRpcSuccessResponse(
+                    requestContext.getRequest().getId(), toRawString(tx.getTransaction())))
+        .orElse(new JsonRpcSuccessResponse(requestContext.getRequest().getId(), null));
+  }
+
+  private String toRawString(final Transaction transaction) {
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    transaction.writeTo(out);
+    return out.encoded().toHexString();
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugResyncWorldstate.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugResyncWorldstate.java
new file mode 100644
index 00000000000..c7befa050f1
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugResyncWorldstate.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.Synchronizer;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+
+public class DebugResyncWorldstate implements JsonRpcMethod {
+  private final Synchronizer synchronizer;
+  private final ProtocolSchedule protocolSchedule;
+  private final Blockchain blockchain;
+
+  public DebugResyncWorldstate(
+      final ProtocolSchedule protocolSchedule,
+      final Blockchain blockchain,
+      final Synchronizer synchronizer) {
+    this.synchronizer = synchronizer;
+    this.protocolSchedule = protocolSchedule;
+    this.blockchain = blockchain;
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.DEBUG_RESYNC_WORLDSTATE.getMethodName();
+  }
+
+  @Override
+  public JsonRpcResponse response(final JsonRpcRequestContext request) {
+    protocolSchedule
+        .getByBlockHeader(blockchain.getChainHeadHeader())
+        .getBadBlocksManager()
+        .reset();
+    return new JsonRpcSuccessResponse(
+        request.getRequest().getId(), synchronizer.resyncWorldState());
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugSetHead.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugSetHead.java
new file mode 100644
index 00000000000..7cf9526775f
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugSetHead.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.UNKNOWN_BLOCK;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+
+import java.util.Optional;
+
+public class DebugSetHead extends AbstractBlockParameterMethod {
+  private final ProtocolContext protocolContext;
+
+  public DebugSetHead(final BlockchainQueries blockchain, final ProtocolContext protocolContext) {
+    super(blockchain);
+
+    this.protocolContext = protocolContext;
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.DEBUG_SET_HEAD.getMethodName();
+  }
+
+  @Override
+  protected BlockParameter blockParameter(final JsonRpcRequestContext request) {
+    return request.getRequiredParameter(0, BlockParameter.class);
+  }
+
+  @Override
+  protected Object resultByBlockNumber(
+      final JsonRpcRequestContext request, final long blockNumber) {
+    final Optional<Hash> maybeBlockHash = getBlockchainQueries().getBlockHashByNumber(blockNumber);
+
+    if (maybeBlockHash.isEmpty()) {
+      return new JsonRpcErrorResponse(request.getRequest().getId(), UNKNOWN_BLOCK);
+    }
+
+    protocolContext.getBlockchain().rewindToBlock(maybeBlockHash.get());
+
+    return JsonRpcSuccessResponse.SUCCESS_RESULT;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStandardTraceBadBlockToFile.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStandardTraceBadBlockToFile.java
index cff97dc99de..65e486a9ca3 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStandardTraceBadBlockToFile.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStandardTraceBadBlockToFile.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TransactionTraceParams;
@@ -25,7 +26,6 @@
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.chain.BadBlockManager;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 
@@ -60,7 +60,7 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
 
     final Blockchain blockchain = blockchainQueries.get().getBlockchain();
     final ProtocolSpec protocolSpec =
-        protocolSchedule.getByBlockNumber(blockchain.getChainHeadHeader().getNumber());
+        protocolSchedule.getByBlockHeader(blockchain.getChainHeadHeader());
     final BadBlockManager badBlockManager = protocolSpec.getBadBlocksManager();
 
     return badBlockManager
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStandardTraceBlockToFile.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStandardTraceBlockToFile.java
index 49683bce586..d9cab6769e4 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStandardTraceBlockToFile.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStandardTraceBlockToFile.java
@@ -16,9 +16,11 @@
 
 import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTracer.TRACE_PATH;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TransactionTraceParams;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.Tracer;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTracer;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
@@ -26,14 +28,13 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Supplier;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Suppliers;
 
 public class DebugStandardTraceBlockToFile implements JsonRpcMethod {
@@ -79,14 +80,18 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
 
   protected List<String> traceBlock(
       final Block block, final Optional<TransactionTraceParams> transactionTraceParams) {
-    return transactionTracerSupplier
-        .get()
-        .traceTransactionToFile(
-            block.getHash(), transactionTraceParams, dataDir.resolve(TRACE_PATH));
-  }
-
-  protected Object emptyResult() {
-    final ObjectMapper mapper = new ObjectMapper();
-    return mapper.createArrayNode();
+    return Tracer.processTracing(
+            blockchainQueries.get(),
+            Optional.of(block.getHeader()),
+            mutableWorldState ->
+                Optional.of(
+                    transactionTracerSupplier
+                        .get()
+                        .traceTransactionToFile(
+                            mutableWorldState,
+                            block.getHash(),
+                            transactionTraceParams,
+                            dataDir.resolve(TRACE_PATH))))
+        .orElse(new ArrayList<>());
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStorageRangeAt.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStorageRangeAt.java
index d193168fe96..0ea50b41aca 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStorageRangeAt.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStorageRangeAt.java
@@ -14,22 +14,23 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameterOrBlockHash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockReplay;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.Tracer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.Tracer.TraceableState;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.DebugStorageRangeAtResult;
 import org.hyperledger.besu.ethereum.api.query.BlockWithMetadata;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.AccountStorageEntry;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.account.AccountStorageEntry;
 
 import java.util.Collections;
 import java.util.NavigableMap;
@@ -85,31 +86,38 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
       return emptyResponse(requestContext);
     }
 
-    final Optional<TransactionWithMetadata> optional =
+    final Optional<TransactionWithMetadata> maybeTransactionIndex =
         blockchainQueries.get().transactionByBlockHashAndIndex(blockHash, transactionIndex);
 
-    return optional
-        .map(
-            transactionWithMetadata ->
-                (blockReplay
+    return Tracer.processTracing(
+            blockchainQueries.get(),
+            Optional.of(blockHeaderOptional.get()),
+            mutableWorldState -> {
+              if (maybeTransactionIndex.isEmpty()) {
+                return Optional.of(
+                    extractStorageAt(
+                        requestContext, accountAddress, startKey, limit, mutableWorldState));
+              } else {
+                return blockReplay
                     .get()
                     .afterTransactionInBlock(
+                        mutableWorldState,
                         blockHash,
-                        transactionWithMetadata.getTransaction().getHash(),
-                        (transaction, blockHeader, blockchain, worldState, transactionProcessor) ->
+                        maybeTransactionIndex.get().getTransaction().getHash(),
+                        (transaction,
+                            blockHeader,
+                            blockchain,
+                            transactionProcessor,
+                            protocolSpec) ->
                             extractStorageAt(
-                                requestContext, accountAddress, startKey, limit, worldState))
-                    .orElseGet(() -> emptyResponse(requestContext))))
-        .orElseGet(
-            () ->
-                blockchainQueries
-                    .get()
-                    .getWorldState(blockHeaderOptional.get().getNumber())
-                    .map(
-                        worldState ->
-                            extractStorageAt(
-                                requestContext, accountAddress, startKey, limit, worldState))
-                    .orElseGet(() -> emptyResponse(requestContext)));
+                                requestContext,
+                                accountAddress,
+                                startKey,
+                                limit,
+                                mutableWorldState));
+              }
+            })
+        .orElse(emptyResponse(requestContext));
   }
 
   private Optional<Hash> hashFromParameter(final BlockParameterOrBlockHash blockParameter) {
@@ -132,7 +140,7 @@ private JsonRpcSuccessResponse extractStorageAt(
       final Address accountAddress,
       final Hash startKey,
       final int limit,
-      final MutableWorldState worldState) {
+      final TraceableState worldState) {
     final Account account = worldState.get(accountAddress);
     final NavigableMap<Bytes32, AccountStorageEntry> entries =
         account.storageEntriesFrom(startKey, limit + 1);
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlock.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlock.java
index fa7c9566b93..762728edbe4 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlock.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlock.java
@@ -19,6 +19,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TransactionTraceParams;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTrace;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.Tracer;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
@@ -33,15 +34,16 @@
 import org.hyperledger.besu.ethereum.vm.DebugOperationTracer;
 
 import java.util.Collection;
+import java.util.Optional;
 import java.util.function.Supplier;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DebugTraceBlock implements JsonRpcMethod {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(DebugTraceBlock.class);
   private final Supplier<BlockTracer> blockTracerSupplier;
   private final BlockHeaderFunctions blockHeaderFunctions;
   private final BlockchainQueries blockchain;
@@ -79,11 +81,16 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
 
     if (this.blockchain.blockByHash(block.getHeader().getParentHash()).isPresent()) {
       final Collection<DebugTraceTransactionResult> results =
-          blockTracerSupplier
-              .get()
-              .trace(block, new DebugOperationTracer(traceOptions))
-              .map(BlockTrace::getTransactionTraces)
-              .map(DebugTraceTransactionResult::of)
+          Tracer.processTracing(
+                  blockchain,
+                  Optional.of(block.getHeader()),
+                  mutableWorldState -> {
+                    return blockTracerSupplier
+                        .get()
+                        .trace(mutableWorldState, block, new DebugOperationTracer(traceOptions))
+                        .map(BlockTrace::getTransactionTraces)
+                        .map(DebugTraceTransactionResult::of);
+                  })
               .orElse(null);
       return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), results);
     } else {
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByHash.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByHash.java
index 38f13c5521d..3b5f5e734f7 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByHash.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByHash.java
@@ -14,15 +14,17 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TransactionTraceParams;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTrace;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.Tracer;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.DebugTraceTransactionResult;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.debug.TraceOptions;
 import org.hyperledger.besu.ethereum.vm.DebugOperationTracer;
 
@@ -32,9 +34,13 @@
 public class DebugTraceBlockByHash implements JsonRpcMethod {
 
   private final Supplier<BlockTracer> blockTracerSupplier;
+  private final Supplier<BlockchainQueries> blockchainQueries;
 
-  public DebugTraceBlockByHash(final Supplier<BlockTracer> blockTracerSupplier) {
+  public DebugTraceBlockByHash(
+      final Supplier<BlockTracer> blockTracerSupplier,
+      final Supplier<BlockchainQueries> blockchainQueriesSupplier) {
     this.blockTracerSupplier = blockTracerSupplier;
+    this.blockchainQueries = blockchainQueriesSupplier;
   }
 
   @Override
@@ -52,11 +58,15 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
             .orElse(TraceOptions.DEFAULT);
 
     final Collection<DebugTraceTransactionResult> results =
-        blockTracerSupplier
-            .get()
-            .trace(blockHash, new DebugOperationTracer(traceOptions))
-            .map(BlockTrace::getTransactionTraces)
-            .map(DebugTraceTransactionResult::of)
+        Tracer.processTracing(
+                blockchainQueries.get(),
+                blockHash,
+                mutableWorldState ->
+                    blockTracerSupplier
+                        .get()
+                        .trace(mutableWorldState, blockHash, new DebugOperationTracer(traceOptions))
+                        .map(BlockTrace::getTransactionTraces)
+                        .map(DebugTraceTransactionResult::of))
             .orElse(null);
     return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), results);
   }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByNumber.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByNumber.java
index abb1d840ce7..977a1d87936 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByNumber.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByNumber.java
@@ -14,15 +14,16 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TransactionTraceParams;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTrace;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.Tracer;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.DebugTraceTransactionResult;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.debug.TraceOptions;
 import org.hyperledger.besu.ethereum.vm.DebugOperationTracer;
 
@@ -62,11 +63,16 @@ protected Object resultByBlockNumber(
     return blockHash
         .flatMap(
             hash ->
-                blockTracerSupplier
-                    .get()
-                    .trace(hash, new DebugOperationTracer(traceOptions))
-                    .map(BlockTrace::getTransactionTraces)
-                    .map(DebugTraceTransactionResult::of))
+                Tracer.processTracing(
+                    blockchainQueriesSupplier.get(),
+                    hash,
+                    mutableWorldState -> {
+                      return blockTracerSupplier
+                          .get()
+                          .trace(mutableWorldState, hash, new DebugOperationTracer(traceOptions))
+                          .map(BlockTrace::getTransactionTraces)
+                          .map(DebugTraceTransactionResult::of);
+                    }))
         .orElse(null);
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceTransaction.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceTransaction.java
index 54a9a9906dd..1ce30e243e5 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceTransaction.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceTransaction.java
@@ -14,16 +14,17 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TransactionTraceParams;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.Tracer;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTracer;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.DebugTraceTransactionResult;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.debug.TraceOptions;
 import org.hyperledger.besu.ethereum.vm.DebugOperationTracer;
 
@@ -74,9 +75,13 @@ private DebugTraceTransactionResult debugTraceTransactionResult(
 
     final DebugOperationTracer execTracer = new DebugOperationTracer(traceOptions);
 
-    return transactionTracer
-        .traceTransaction(blockHash, hash, execTracer)
-        .map(DebugTraceTransactionResult::new)
+    return Tracer.processTracing(
+            blockchain,
+            blockHash,
+            mutableWorldState ->
+                transactionTracer
+                    .traceTransaction(mutableWorldState, blockHash, hash, execTracer)
+                    .map(DebugTraceTransactionResult::new))
         .orElse(null);
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCall.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCall.java
index 2cd19c268ed..71737fbab9e 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCall.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCall.java
@@ -14,22 +14,32 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.BLOCK_NOT_FOUND;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.INTERNAL_ERROR;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcErrorConverter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameterOrBlockHash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.mainnet.ImmutableTransactionValidationParams;
 import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
+import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
-import org.hyperledger.besu.ethereum.vm.OperationTracer;
-
-public class EthCall extends AbstractBlockParameterMethod {
+import org.hyperledger.besu.ethereum.transaction.TransactionSimulatorResult;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
 
+public class EthCall extends AbstractBlockParameterOrBlockHashMethod {
   private final TransactionSimulator transactionSimulator;
 
   public EthCall(
@@ -44,54 +54,124 @@ public String getName() {
   }
 
   @Override
-  protected BlockParameter blockParameter(final JsonRpcRequestContext request) {
-    return request.getRequiredParameter(1, BlockParameter.class);
+  protected BlockParameterOrBlockHash blockParameterOrBlockHash(
+      final JsonRpcRequestContext request) {
+    return request.getRequiredParameter(1, BlockParameterOrBlockHash.class);
   }
 
   @Override
-  protected Object resultByBlockNumber(
-      final JsonRpcRequestContext request, final long blockNumber) {
-    final JsonCallParameter callParams = validateAndGetCallParams(request);
+  protected Object resultByBlockHash(final JsonRpcRequestContext request, final Hash blockHash) {
+    final BlockHeader header = blockchainQueries.get().getBlockHeaderByHash(blockHash).orElse(null);
+
+    if (header == null) {
+      return errorResponse(request, BLOCK_NOT_FOUND);
+    }
+    return resultByBlockHeader(request, header);
+  }
+
+  @Override
+  protected Object resultByBlockHeader(
+      final JsonRpcRequestContext request, final BlockHeader header) {
+    JsonCallParameter callParams = JsonCallParameterUtil.validateAndGetCallParams(request);
 
     return transactionSimulator
         .process(
             callParams,
-            TransactionValidationParams.transactionSimulator(),
+            buildTransactionValidationParams(header, callParams),
             OperationTracer.NO_TRACING,
-            blockNumber)
-        .map(
-            result ->
-                result
-                    .getValidationResult()
-                    .either(
-                        (() ->
-                            new JsonRpcSuccessResponse(
-                                request.getRequest().getId(), result.getOutput().toString())),
-                        reason ->
-                            new JsonRpcErrorResponse(
-                                request.getRequest().getId(),
-                                JsonRpcErrorConverter.convertTransactionInvalidReason(reason))))
-        .orElse(validRequestBlockNotFound(request));
-  }
-
-  private JsonRpcSuccessResponse validRequestBlockNotFound(final JsonRpcRequestContext request) {
-    return new JsonRpcSuccessResponse(request.getRequest().getId(), null);
+            (mutableWorldState, transactionSimulatorResult) ->
+                transactionSimulatorResult.map(
+                    result ->
+                        result
+                            .getValidationResult()
+                            .either(
+                                (() ->
+                                    result.isSuccessful()
+                                        ? new JsonRpcSuccessResponse(
+                                            request.getRequest().getId(),
+                                            result.getOutput().toString())
+                                        : errorResponse(request, result)),
+                                reason ->
+                                    new JsonRpcErrorResponse(
+                                        request.getRequest().getId(),
+                                        JsonRpcErrorConverter.convertTransactionInvalidReason(
+                                            reason)))),
+            header)
+        .orElse(errorResponse(request, INTERNAL_ERROR));
   }
 
   @Override
   public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
-    return (JsonRpcResponse) findResultByParamType(requestContext);
+    return (JsonRpcResponse) handleParamTypes(requestContext);
   }
 
-  private JsonCallParameter validateAndGetCallParams(final JsonRpcRequestContext request) {
-    final JsonCallParameter callParams = request.getRequiredParameter(0, JsonCallParameter.class);
-    if (callParams.getTo() == null) {
-      throw new InvalidJsonRpcParameters("Missing \"to\" field in call arguments");
+  private JsonRpcErrorResponse errorResponse(
+      final JsonRpcRequestContext request, final TransactionSimulatorResult result) {
+    final JsonRpcError jsonRpcError;
+
+    final ValidationResult<TransactionInvalidReason> validationResult =
+        result.getValidationResult();
+    if (validationResult != null && !validationResult.isValid()) {
+      jsonRpcError =
+          JsonRpcErrorConverter.convertTransactionInvalidReason(
+              validationResult.getInvalidReason());
+    } else {
+      final TransactionProcessingResult resultTrx = result.getResult();
+      if (resultTrx != null && resultTrx.getRevertReason().isPresent()) {
+        jsonRpcError = JsonRpcError.REVERT_ERROR;
+        jsonRpcError.setData(resultTrx.getRevertReason().get().toHexString());
+      } else {
+        jsonRpcError = JsonRpcError.INTERNAL_ERROR;
+      }
     }
-    if (callParams.getGasPrice() != null
-        && (callParams.getFeeCap().isPresent() || callParams.getGasPremium().isPresent())) {
-      throw new InvalidJsonRpcParameters("gasPrice cannot be used with baseFee or feeCap");
+    return errorResponse(request, jsonRpcError);
+  }
+
+  private JsonRpcErrorResponse errorResponse(
+      final JsonRpcRequestContext request, final JsonRpcError jsonRpcError) {
+    return new JsonRpcErrorResponse(request.getRequest().getId(), jsonRpcError);
+  }
+
+  private TransactionValidationParams buildTransactionValidationParams(
+      final BlockHeader header, final JsonCallParameter callParams) {
+
+    ImmutableTransactionValidationParams.Builder transactionValidationParams =
+        ImmutableTransactionValidationParams.builder()
+            .from(TransactionValidationParams.transactionSimulator());
+
+    // if it is not set explicitly whether we want a strict check of the balance or not. this will
+    // be decided according to the provided parameters
+    if (callParams.isMaybeStrict().isEmpty()) {
+      transactionValidationParams.isAllowExceedingBalance(
+          isAllowExceedingBalanceAutoSelection(header, callParams));
+    } else {
+      transactionValidationParams.isAllowExceedingBalance(
+          !callParams.isMaybeStrict().orElse(Boolean.FALSE));
+    }
+    return transactionValidationParams.build();
+  }
+
+  private boolean isAllowExceedingBalanceAutoSelection(
+      final BlockHeader header, final JsonCallParameter callParams) {
+
+    boolean isZeroGasPrice =
+        callParams.getGasPrice() == null || Wei.ZERO.equals(callParams.getGasPrice());
+
+    if (header.getBaseFee().isPresent()) {
+      boolean isZeroMaxFeePerGas = callParams.getMaxFeePerGas().orElse(Wei.ZERO).equals(Wei.ZERO);
+      boolean isZeroMaxPriorityFeePerGas =
+          callParams.getMaxPriorityFeePerGas().orElse(Wei.ZERO).equals(Wei.ZERO);
+      if (isZeroGasPrice && isZeroMaxFeePerGas && isZeroMaxPriorityFeePerGas) {
+        // After 1559, when gas pricing is not provided, 0 is used and the balance is not
+        // checked
+        return true;
+      } else {
+        // After 1559, when gas price is provided, it is interpreted as both the max and
+        // priority fee and the balance is checked
+        return false;
+      }
     }
-    return callParams;
+    // Prior 1559, when gas price == 0 or is not provided the balance is not checked
+    return isZeroGasPrice;
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCoinbase.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCoinbase.java
index 6c54bd22484..3a2544e8c9a 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCoinbase.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCoinbase.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
@@ -21,7 +22,6 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
-import org.hyperledger.besu.ethereum.core.Address;
 
 import java.util.Optional;
 
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCreateAccessList.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCreateAccessList.java
new file mode 100644
index 00000000000..8877d08653d
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCreateAccessList.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.CreateAccessListResult;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.mainnet.ImmutableTransactionValidationParams;
+import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
+import org.hyperledger.besu.ethereum.transaction.CallParameter;
+import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
+import org.hyperledger.besu.ethereum.transaction.TransactionSimulatorResult;
+import org.hyperledger.besu.evm.AccessListEntry;
+import org.hyperledger.besu.evm.tracing.AccessListOperationTracer;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Function;
+
+public class EthCreateAccessList extends AbstractEstimateGas {
+
+  public EthCreateAccessList(
+      final BlockchainQueries blockchainQueries, final TransactionSimulator transactionSimulator) {
+    super(blockchainQueries, transactionSimulator);
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.ETH_CREATE_ACCESS_LIST.getMethodName();
+  }
+
+  @Override
+  public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
+    final JsonCallParameter jsonCallParameter = validateAndGetCallParams(requestContext);
+    final BlockHeader blockHeader = blockHeader();
+    final Optional<JsonRpcError> jsonRpcError = validateBlockHeader(blockHeader);
+    if (jsonRpcError.isPresent()) {
+      return errorResponse(requestContext, jsonRpcError.get());
+    }
+    final AccessListSimulatorResult maybeResult =
+        processTransaction(jsonCallParameter, blockHeader);
+    // if the call accessList is different from the simulation result, calculate gas and return
+    if (shouldProcessWithAccessListOverride(jsonCallParameter, maybeResult.getTracer())) {
+      final AccessListSimulatorResult result =
+          processTransactionWithAccessListOverride(
+              jsonCallParameter, blockHeader, maybeResult.getTracer().getAccessList());
+      return createResponse(requestContext, result);
+    } else {
+      return createResponse(requestContext, maybeResult);
+    }
+  }
+
+  private Optional<JsonRpcError> validateBlockHeader(final BlockHeader blockHeader) {
+    if (blockHeader == null) {
+      return Optional.of(JsonRpcError.INTERNAL_ERROR);
+    }
+    if (!blockchainQueries
+        .getWorldStateArchive()
+        .isWorldStateAvailable(blockHeader.getStateRoot(), blockHeader.getHash())) {
+      return Optional.of(JsonRpcError.WORLD_STATE_UNAVAILABLE);
+    }
+    return Optional.empty();
+  }
+
+  private JsonRpcResponse createResponse(
+      final JsonRpcRequestContext requestContext, final AccessListSimulatorResult result) {
+    return result
+        .getResult()
+        .map(createResponse(requestContext, result.getTracer()))
+        .orElse(errorResponse(requestContext, JsonRpcError.INTERNAL_ERROR));
+  }
+
+  private TransactionValidationParams transactionValidationParams(
+      final boolean isAllowExceedingBalance) {
+    return ImmutableTransactionValidationParams.builder()
+        .from(TransactionValidationParams.transactionSimulator())
+        .isAllowExceedingBalance(isAllowExceedingBalance)
+        .build();
+  }
+
+  private boolean shouldProcessWithAccessListOverride(
+      final JsonCallParameter parameters, final AccessListOperationTracer tracer) {
+
+    // if empty, transaction did not access any storage, does not need to reprocess
+    if (tracer.getAccessList().isEmpty()) {
+      return false;
+    }
+
+    // if empty, call did not include accessList, should reprocess
+    if (parameters.getAccessList().isEmpty()) {
+      return true;
+    }
+
+    // If call included access list, compare it with tracer result and return true if different
+    return !Objects.equals(tracer.getAccessList(), parameters.getAccessList().get());
+  }
+
+  private Function<TransactionSimulatorResult, JsonRpcResponse> createResponse(
+      final JsonRpcRequestContext request, final AccessListOperationTracer operationTracer) {
+    return result ->
+        result.isSuccessful()
+            ? new JsonRpcSuccessResponse(
+                request.getRequest().getId(),
+                new CreateAccessListResult(
+                    operationTracer.getAccessList(), processEstimateGas(result, operationTracer)))
+            : errorResponse(request, result);
+  }
+
+  private AccessListSimulatorResult processTransaction(
+      final JsonCallParameter jsonCallParameter, final BlockHeader blockHeader) {
+    final TransactionValidationParams transactionValidationParams =
+        transactionValidationParams(!jsonCallParameter.isMaybeStrict().orElse(Boolean.FALSE));
+
+    final CallParameter callParams =
+        overrideGasLimitAndPrice(jsonCallParameter, blockHeader.getGasLimit());
+
+    final AccessListOperationTracer tracer = AccessListOperationTracer.create();
+    final Optional<TransactionSimulatorResult> result =
+        transactionSimulator.process(
+            callParams, transactionValidationParams, tracer, blockHeader.getNumber());
+    return new AccessListSimulatorResult(result, tracer);
+  }
+
+  private AccessListSimulatorResult processTransactionWithAccessListOverride(
+      final JsonCallParameter jsonCallParameter,
+      final BlockHeader blockHeader,
+      final List<AccessListEntry> accessList) {
+    final TransactionValidationParams transactionValidationParams =
+        transactionValidationParams(!jsonCallParameter.isMaybeStrict().orElse(Boolean.FALSE));
+
+    final AccessListOperationTracer tracer = AccessListOperationTracer.create();
+    final CallParameter callParameter =
+        overrideAccessList(jsonCallParameter, blockHeader.getGasLimit(), accessList);
+
+    final Optional<TransactionSimulatorResult> result =
+        transactionSimulator.process(
+            callParameter, transactionValidationParams, tracer, blockHeader.getNumber());
+    return new AccessListSimulatorResult(result, tracer);
+  }
+
+  protected CallParameter overrideAccessList(
+      final JsonCallParameter callParams,
+      final long gasLimit,
+      final List<AccessListEntry> accessListEntries) {
+    return new CallParameter(
+        callParams.getFrom(),
+        callParams.getTo(),
+        gasLimit,
+        Optional.ofNullable(callParams.getGasPrice()).orElse(Wei.ZERO),
+        callParams.getMaxPriorityFeePerGas(),
+        callParams.getMaxFeePerGas(),
+        callParams.getValue(),
+        callParams.getPayload(),
+        Optional.ofNullable(accessListEntries));
+  }
+
+  private static class AccessListSimulatorResult {
+    final Optional<TransactionSimulatorResult> result;
+    final AccessListOperationTracer tracer;
+
+    public AccessListSimulatorResult(
+        final Optional<TransactionSimulatorResult> result, final AccessListOperationTracer tracer) {
+      this.result = result;
+      this.tracer = tracer;
+    }
+
+    public Optional<TransactionSimulatorResult> getResult() {
+      return result;
+    }
+
+    public AccessListOperationTracer getTracer() {
+      return tracer;
+    }
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGas.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGas.java
index e8b34fb5506..b4b13dbf932 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGas.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGas.java
@@ -14,43 +14,29 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
-import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcErrorConverter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.mainnet.ImmutableTransactionValidationParams;
 import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
-import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
-import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.transaction.CallParameter;
-import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulatorResult;
-import org.hyperledger.besu.ethereum.vm.EstimateGasOperationTracer;
+import org.hyperledger.besu.evm.tracing.EstimateGasOperationTracer;
 
 import java.util.Optional;
-import java.util.function.Function;
 
-public class EthEstimateGas implements JsonRpcMethod {
-
-  private static final double SUB_CALL_REMAINING_GAS_RATIO = 65D / 64D;
-
-  private final BlockchainQueries blockchainQueries;
-  private final TransactionSimulator transactionSimulator;
+public class EthEstimateGas extends AbstractEstimateGas {
 
   public EthEstimateGas(
       final BlockchainQueries blockchainQueries, final TransactionSimulator transactionSimulator) {
-    this.blockchainQueries = blockchainQueries;
-    this.transactionSimulator = transactionSimulator;
+    super(blockchainQueries, transactionSimulator);
   }
 
   @Override
@@ -68,107 +54,75 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     }
     if (!blockchainQueries
         .getWorldStateArchive()
-        .isWorldStateAvailable(blockHeader.getStateRoot())) {
+        .isWorldStateAvailable(blockHeader.getStateRoot(), blockHeader.getHash())) {
       return errorResponse(requestContext, JsonRpcError.WORLD_STATE_UNAVAILABLE);
     }
 
     final CallParameter modifiedCallParams =
         overrideGasLimitAndPrice(callParams, blockHeader.getGasLimit());
 
+    final boolean isAllowExceedingBalance = !callParams.isMaybeStrict().orElse(Boolean.FALSE);
+
     final EstimateGasOperationTracer operationTracer = new EstimateGasOperationTracer();
 
-    return transactionSimulator
-        .process(
-            modifiedCallParams,
-            ImmutableTransactionValidationParams.builder()
-                .from(TransactionValidationParams.transactionSimulator())
-                .isAllowExceedingBalance(!callParams.isStrict())
-                .build(),
-            operationTracer,
-            blockHeader.getNumber())
-        .map(gasEstimateResponse(requestContext, operationTracer))
-        .orElse(errorResponse(requestContext, JsonRpcError.INTERNAL_ERROR));
-  }
+    var gasUsed =
+        executeSimulation(
+            blockHeader, modifiedCallParams, operationTracer, isAllowExceedingBalance);
 
-  private BlockHeader blockHeader() {
-    final long headBlockNumber = blockchainQueries.headBlockNumber();
-    return blockchainQueries.getBlockchain().getBlockHeader(headBlockNumber).orElse(null);
-  }
+    if (gasUsed.isEmpty()) {
+      return errorResponse(requestContext, JsonRpcError.INTERNAL_ERROR);
+    }
 
-  private CallParameter overrideGasLimitAndPrice(
-      final JsonCallParameter callParams, final long gasLimit) {
-    return new CallParameter(
-        callParams.getFrom(),
-        callParams.getTo(),
-        gasLimit,
-        Optional.ofNullable(callParams.getGasPrice()).orElse(Wei.ZERO),
-        callParams.getGasPremium(),
-        callParams.getFeeCap(),
-        callParams.getValue(),
-        callParams.getPayload());
-  }
+    // if the transaction is invalid or doesn't have enough gas with the max it never will!
+    if (gasUsed.get().isInvalid() || !gasUsed.get().isSuccessful()) {
+      return errorResponse(requestContext, gasUsed.get());
+    }
 
-  private Function<TransactionSimulatorResult, JsonRpcResponse> gasEstimateResponse(
-      final JsonRpcRequestContext request, final EstimateGasOperationTracer operationTracer) {
-    return result ->
-        result.isSuccessful()
-            ? new JsonRpcSuccessResponse(
-                request.getRequest().getId(),
-                Quantity.create(processEstimateGas(result, operationTracer)))
-            : errorResponse(request, result);
-  }
+    var low = gasUsed.get().getResult().getEstimateGasUsedByTransaction();
+    var lowResult =
+        executeSimulation(
+            blockHeader,
+            overrideGasLimitAndPrice(callParams, low),
+            operationTracer,
+            isAllowExceedingBalance);
 
-  /**
-   * Estimate gas by adding minimum gas remaining for some operation and the necessary gas for sub
-   * calls
-   *
-   * @param result transaction simulator result
-   * @param operationTracer estimate gas operation tracer
-   * @return estimate gas
-   */
-  private long processEstimateGas(
-      final TransactionSimulatorResult result, final EstimateGasOperationTracer operationTracer) {
-    // no more than 63/64s of the remaining gas can be passed to the sub calls
-    final double subCallMultiplier =
-        Math.pow(SUB_CALL_REMAINING_GAS_RATIO, operationTracer.getMaxDepth());
-    // and minimum gas remaining is necessary for some operation (additionalStipend)
-    final long gasStipend = operationTracer.getStipendNeeded().toLong();
-    final long gasUsedByTransaction = result.getResult().getEstimateGasUsedByTransaction();
-    return ((long) ((gasUsedByTransaction + gasStipend) * subCallMultiplier));
-  }
+    if (lowResult.isPresent() && lowResult.get().isSuccessful()) {
+      return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), Quantity.create(low));
+    }
 
-  private JsonRpcErrorResponse errorResponse(
-      final JsonRpcRequestContext request, final TransactionSimulatorResult result) {
-    final JsonRpcError jsonRpcError;
-
-    final ValidationResult<TransactionInvalidReason> validationResult =
-        result.getValidationResult();
-    if (validationResult != null && !validationResult.isValid()) {
-      jsonRpcError =
-          JsonRpcErrorConverter.convertTransactionInvalidReason(
-              validationResult.getInvalidReason());
-    } else {
-      final TransactionProcessingResult resultTrx = result.getResult();
-      if (resultTrx != null && resultTrx.getRevertReason().isPresent()) {
-        jsonRpcError = JsonRpcError.REVERT_ERROR;
+    var high = processEstimateGas(gasUsed.get(), operationTracer);
+    var mid = high;
+    while (low + 1 < high) {
+      mid = (high + low) / 2;
+
+      var binarySearchResult =
+          executeSimulation(
+              blockHeader,
+              overrideGasLimitAndPrice(callParams, mid),
+              operationTracer,
+              isAllowExceedingBalance);
+      if (binarySearchResult.isEmpty() || !binarySearchResult.get().isSuccessful()) {
+        low = mid;
       } else {
-        jsonRpcError = JsonRpcError.INTERNAL_ERROR;
+        high = mid;
       }
     }
-    return errorResponse(request, jsonRpcError);
-  }
 
-  private JsonRpcErrorResponse errorResponse(
-      final JsonRpcRequestContext request, final JsonRpcError jsonRpcError) {
-    return new JsonRpcErrorResponse(request.getRequest().getId(), jsonRpcError);
+    return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), Quantity.create(high));
   }
 
-  private JsonCallParameter validateAndGetCallParams(final JsonRpcRequestContext request) {
-    final JsonCallParameter callParams = request.getRequiredParameter(0, JsonCallParameter.class);
-    if (callParams.getGasPrice() != null
-        && (callParams.getFeeCap().isPresent() || callParams.getGasPremium().isPresent())) {
-      throw new InvalidJsonRpcParameters("gasPrice cannot be used with baseFee or feeCap");
-    }
-    return callParams;
+  private Optional<TransactionSimulatorResult> executeSimulation(
+      final BlockHeader blockHeader,
+      final CallParameter modifiedCallParams,
+      final EstimateGasOperationTracer operationTracer,
+      final boolean allowExceedingBalance) {
+    return transactionSimulator.process(
+        modifiedCallParams,
+        ImmutableTransactionValidationParams.builder()
+            .from(TransactionValidationParams.transactionSimulator())
+            .isAllowExceedingBalance(allowExceedingBalance)
+            .build(),
+        operationTracer,
+        blockHeader.getNumber());
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthFeeHistory.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthFeeHistory.java
new file mode 100644
index 00000000000..45df084c74e
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthFeeHistory.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import static java.util.stream.Collectors.toUnmodifiableList;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.UnsignedIntParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.FeeHistory;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.ImmutableFeeHistory;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.LongStream;
+import java.util.stream.Stream;
+
+import com.google.common.collect.Streams;
+
+public class EthFeeHistory implements JsonRpcMethod {
+  private final ProtocolSchedule protocolSchedule;
+  private final Blockchain blockchain;
+
+  public EthFeeHistory(final ProtocolSchedule protocolSchedule, final Blockchain blockchain) {
+    this.protocolSchedule = protocolSchedule;
+    this.blockchain = blockchain;
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.ETH_FEE_HISTORY.getMethodName();
+  }
+
+  @Override
+  public JsonRpcResponse response(final JsonRpcRequestContext request) {
+    final Object requestId = request.getRequest().getId();
+
+    final int blockCount = request.getRequiredParameter(0, UnsignedIntParameter.class).getValue();
+
+    if (blockCount < 1 || blockCount > 1024) {
+      return new JsonRpcErrorResponse(requestId, JsonRpcError.INVALID_PARAMS);
+    }
+    final BlockParameter highestBlock = request.getRequiredParameter(1, BlockParameter.class);
+    final Optional<List<Double>> maybeRewardPercentiles =
+        request.getOptionalParameter(2, Double[].class).map(Arrays::asList);
+
+    final BlockHeader chainHeadHeader = blockchain.getChainHeadHeader();
+    final long chainHeadBlockNumber = chainHeadHeader.getNumber();
+    final long resolvedHighestBlockNumber =
+        highestBlock
+            .getNumber()
+            .orElse(
+                chainHeadBlockNumber /* both latest and pending use the head block until we have pending block support */);
+
+    if (resolvedHighestBlockNumber > chainHeadBlockNumber) {
+      return new JsonRpcErrorResponse(requestId, JsonRpcError.INVALID_PARAMS);
+    }
+
+    final long oldestBlock = Math.max(0, resolvedHighestBlockNumber - (blockCount - 1));
+
+    final long lastBlock =
+        blockCount > resolvedHighestBlockNumber
+            ? (resolvedHighestBlockNumber + 1)
+            : (oldestBlock + blockCount);
+
+    final List<BlockHeader> blockHeaders =
+        LongStream.range(oldestBlock, lastBlock)
+            .mapToObj(blockchain::getBlockHeader)
+            .flatMap(Optional::stream)
+            .collect(toUnmodifiableList());
+
+    // we return the base fees for the blocks requested and 1 more because we can always compute it
+    final List<Wei> explicitlyRequestedBaseFees =
+        blockHeaders.stream()
+            .map(blockHeader -> blockHeader.getBaseFee().orElse(Wei.ZERO))
+            .collect(toUnmodifiableList());
+    final long nextBlockNumber = resolvedHighestBlockNumber + 1;
+    final Wei nextBaseFee =
+        blockchain
+            .getBlockHeader(nextBlockNumber)
+            .map(blockHeader -> blockHeader.getBaseFee().orElse(Wei.ZERO))
+            .orElseGet(
+                () ->
+                    Optional.of(
+                            // We are able to use the chain head timestamp for next block header as
+                            // the base fee market can only be pre or post London. If another fee
+                            // market is added will need to reconsider this.
+                            protocolSchedule
+                                .getForNextBlockHeader(
+                                    chainHeadHeader, chainHeadHeader.getTimestamp())
+                                .getFeeMarket())
+                        .filter(FeeMarket::implementsBaseFee)
+                        .map(BaseFeeMarket.class::cast)
+                        .map(
+                            feeMarket -> {
+                              final BlockHeader lastBlockHeader =
+                                  blockHeaders.get(blockHeaders.size() - 1);
+                              return feeMarket.computeBaseFee(
+                                  nextBlockNumber,
+                                  explicitlyRequestedBaseFees.get(
+                                      explicitlyRequestedBaseFees.size() - 1),
+                                  lastBlockHeader.getGasUsed(),
+                                  feeMarket.targetGasUsed(lastBlockHeader));
+                            })
+                        .orElse(Wei.ZERO));
+
+    final List<Double> gasUsedRatios =
+        blockHeaders.stream()
+            .map(blockHeader -> blockHeader.getGasUsed() / (double) blockHeader.getGasLimit())
+            .collect(toUnmodifiableList());
+
+    final Optional<List<List<Wei>>> maybeRewards =
+        maybeRewardPercentiles.map(
+            rewardPercentiles ->
+                LongStream.range(oldestBlock, lastBlock)
+                    .mapToObj(blockchain::getBlockByNumber)
+                    .flatMap(Optional::stream)
+                    .map(
+                        block ->
+                            computeRewards(
+                                rewardPercentiles.stream().sorted().collect(toUnmodifiableList()),
+                                block))
+                    .collect(toUnmodifiableList()));
+
+    return new JsonRpcSuccessResponse(
+        requestId,
+        FeeHistory.FeeHistoryResult.from(
+            ImmutableFeeHistory.builder()
+                .oldestBlock(oldestBlock)
+                .baseFeePerGas(
+                    Stream.concat(explicitlyRequestedBaseFees.stream(), Stream.of(nextBaseFee))
+                        .collect(toUnmodifiableList()))
+                .gasUsedRatio(gasUsedRatios)
+                .reward(maybeRewards)
+                .build()));
+  }
+
+  private List<Wei> computeRewards(final List<Double> rewardPercentiles, final Block block) {
+    final List<Transaction> transactions = block.getBody().getTransactions();
+    if (transactions.isEmpty()) {
+      // all 0's for empty block
+      return Stream.generate(() -> Wei.ZERO)
+          .limit(rewardPercentiles.size())
+          .collect(toUnmodifiableList());
+    }
+
+    final Optional<Wei> baseFee = block.getHeader().getBaseFee();
+
+    // we need to get the gas used for the individual transactions and can't use the cumulative gas
+    // used because we're going to be reordering the transactions
+    final List<Long> transactionsGasUsed = new ArrayList<>();
+    for (final TransactionReceipt transactionReceipt :
+        blockchain.getTxReceipts(block.getHash()).get()) {
+      transactionsGasUsed.add(
+          transactionsGasUsed.isEmpty()
+              ? transactionReceipt.getCumulativeGasUsed()
+              : transactionReceipt.getCumulativeGasUsed()
+                  - transactionsGasUsed.get(transactionsGasUsed.size() - 1));
+    }
+    final List<Map.Entry<Transaction, Long>> transactionsAndGasUsedAscendingEffectiveGasFee =
+        Streams.zip(
+                transactions.stream(), transactionsGasUsed.stream(), AbstractMap.SimpleEntry::new)
+            .sorted(
+                Comparator.comparing(
+                    transactionAndGasUsed ->
+                        transactionAndGasUsed.getKey().getEffectivePriorityFeePerGas(baseFee)))
+            .collect(toUnmodifiableList());
+
+    // We need to weight the percentile of rewards by the gas used in the transaction.
+    // That's why we're keeping track of the cumulative gas used and checking to see which
+    // percentile markers we've passed
+    final ArrayList<Wei> rewards = new ArrayList<>();
+    int rewardPercentileIndex = 0;
+    long gasUsed = 0;
+    for (final Map.Entry<Transaction, Long> transactionAndGasUsed :
+        transactionsAndGasUsedAscendingEffectiveGasFee) {
+
+      gasUsed += transactionAndGasUsed.getValue();
+
+      while (rewardPercentileIndex < rewardPercentiles.size()
+          && 100.0 * gasUsed / block.getHeader().getGasUsed()
+              >= rewardPercentiles.get(rewardPercentileIndex)) {
+        rewards.add(transactionAndGasUsed.getKey().getEffectivePriorityFeePerGas(baseFee));
+        rewardPercentileIndex++;
+      }
+    }
+    return rewards;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBalance.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBalance.java
index cada22c0e95..8b658d27530 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBalance.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBalance.java
@@ -14,25 +14,23 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameterOrBlockHash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Address;
 
 import java.util.function.Supplier;
 
-import com.google.common.base.Suppliers;
-
-public class EthGetBalance extends AbstractBlockParameterMethod {
-
-  public EthGetBalance(final BlockchainQueries blockchain) {
-    this(Suppliers.ofInstance(blockchain));
+public class EthGetBalance extends AbstractBlockParameterOrBlockHashMethod {
+  public EthGetBalance(final BlockchainQueries blockchainQueries) {
+    super(blockchainQueries);
   }
 
-  public EthGetBalance(final Supplier<BlockchainQueries> blockchain) {
-    super(blockchain);
+  public EthGetBalance(final Supplier<BlockchainQueries> blockchainQueries) {
+    super(blockchainQueries);
   }
 
   @Override
@@ -41,16 +39,17 @@ public String getName() {
   }
 
   @Override
-  protected BlockParameter blockParameter(final JsonRpcRequestContext request) {
-    return request.getRequiredParameter(1, BlockParameter.class);
+  protected BlockParameterOrBlockHash blockParameterOrBlockHash(
+      final JsonRpcRequestContext request) {
+    return request.getRequiredParameter(1, BlockParameterOrBlockHash.class);
   }
 
   @Override
-  protected String resultByBlockNumber(
-      final JsonRpcRequestContext request, final long blockNumber) {
+  protected String resultByBlockHash(final JsonRpcRequestContext request, final Hash blockHash) {
     final Address address = request.getRequiredParameter(0, Address.class);
-    return getBlockchainQueries()
-        .accountBalance(address, blockNumber)
+    return blockchainQueries
+        .get()
+        .accountBalance(address, blockHash)
         .map(Quantity::create)
         .orElse(null);
   }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHash.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHash.java
index e9cda334176..04cad96291e 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHash.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHash.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
@@ -21,7 +22,6 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResult;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 import java.util.function.Supplier;
 
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByNumber.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByNumber.java
index 8c8b522447c..c1bdcc37dd2 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByNumber.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByNumber.java
@@ -14,33 +14,44 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResult;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Synchronizer;
 
 import java.util.function.Supplier;
 
 import com.google.common.base.Suppliers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class EthGetBlockByNumber extends AbstractBlockParameterMethod {
 
   private final BlockResultFactory blockResult;
   private final boolean includeCoinbase;
+  private static final Logger LOGGER = LoggerFactory.getLogger(EthGetBlockByNumber.class);
+  private final Synchronizer synchronizer;
 
   public EthGetBlockByNumber(
-      final BlockchainQueries blockchain, final BlockResultFactory blockResult) {
-    this(Suppliers.ofInstance(blockchain), blockResult, false);
+      final BlockchainQueries blockchain,
+      final BlockResultFactory blockResult,
+      final Synchronizer synchronizer) {
+    this(Suppliers.ofInstance(blockchain), blockResult, synchronizer, false);
   }
 
   public EthGetBlockByNumber(
       final Supplier<BlockchainQueries> blockchain,
       final BlockResultFactory blockResult,
+      final Synchronizer synchronizer,
       final boolean includeCoinbase) {
     super(blockchain);
     this.blockResult = blockResult;
+    this.synchronizer = synchronizer;
     this.includeCoinbase = includeCoinbase;
   }
 
@@ -64,6 +75,33 @@ protected Object resultByBlockNumber(
     return transactionHash(blockNumber);
   }
 
+  @Override
+  protected Object latestResult(final JsonRpcRequestContext request) {
+
+    final long headBlockNumber = blockchainQueriesSupplier.get().headBlockNumber();
+    BlockHeader headHeader = blockchainQueriesSupplier.get().headBlockHeader();
+
+    Hash block = headHeader.getHash();
+    Hash stateRoot = headHeader.getStateRoot();
+
+    if (blockchainQueriesSupplier
+        .get()
+        .getWorldStateArchive()
+        .isWorldStateAvailable(stateRoot, block)) {
+      if (this.synchronizer.getSyncStatus().isEmpty()) { // we are already in sync
+        return resultByBlockNumber(request, headBlockNumber);
+      } else { // out of sync, return highest pulled block
+        long headishBlock = this.synchronizer.getSyncStatus().get().getCurrentBlock();
+        return resultByBlockNumber(request, headishBlock);
+      }
+    }
+
+    LOGGER.trace("no world state available for block {} returning genesis", headBlockNumber);
+    return resultByBlockNumber(
+        request,
+        blockchainQueriesSupplier.get().getBlockchain().getGenesisBlock().getHeader().getNumber());
+  }
+
   private BlockResult transactionComplete(final long blockNumber) {
     return getBlockchainQueries()
         .blockByNumber(blockNumber)
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockTransactionCountByHash.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockTransactionCountByHash.java
index 08a36cfb6f6..a9654555953 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockTransactionCountByHash.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockTransactionCountByHash.java
@@ -14,13 +14,13 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 public class EthGetBlockTransactionCountByHash implements JsonRpcMethod {
 
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetCode.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetCode.java
index 663f573417f..2417b422fa2 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetCode.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetCode.java
@@ -14,21 +14,21 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameterOrBlockHash;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Address;
 
 import java.util.function.Supplier;
 
-import com.google.common.base.Suppliers;
 import org.apache.tuweni.bytes.Bytes;
 
-public class EthGetCode extends AbstractBlockParameterMethod {
+public class EthGetCode extends AbstractBlockParameterOrBlockHashMethod {
 
   public EthGetCode(final BlockchainQueries blockchainQueries) {
-    super(Suppliers.ofInstance(blockchainQueries));
+    super(blockchainQueries);
   }
 
   public EthGetCode(final Supplier<BlockchainQueries> blockchainQueries) {
@@ -41,14 +41,14 @@ public String getName() {
   }
 
   @Override
-  protected BlockParameter blockParameter(final JsonRpcRequestContext request) {
-    return request.getRequiredParameter(1, BlockParameter.class);
+  protected BlockParameterOrBlockHash blockParameterOrBlockHash(
+      final JsonRpcRequestContext request) {
+    return request.getRequiredParameter(1, BlockParameterOrBlockHash.class);
   }
 
   @Override
-  protected String resultByBlockNumber(
-      final JsonRpcRequestContext request, final long blockNumber) {
+  protected String resultByBlockHash(final JsonRpcRequestContext request, final Hash blockHash) {
     final Address address = request.getRequiredParameter(0, Address.class);
-    return getBlockchainQueries().getCode(address, blockNumber).map(Bytes::toString).orElse(null);
+    return getBlockchainQueries().getCode(address, blockHash).map(Bytes::toString).orElse(null);
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterChanges.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterChanges.java
index 6925879be29..74a0fc91fa9 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterChanges.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterChanges.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
@@ -22,7 +23,6 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.LogsResult;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
 
 import java.util.List;
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetLogs.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetLogs.java
index 3430d6f4b9f..506aa7549e7 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetLogs.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetLogs.java
@@ -25,14 +25,24 @@
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class EthGetLogs implements JsonRpcMethod {
 
+  private static final Logger LOG = LoggerFactory.getLogger(EthGetLogs.class);
+
   private final BlockchainQueries blockchain;
+  private final Optional<Long> maxLogRange;
 
-  public EthGetLogs(final BlockchainQueries blockchain) {
+  public EthGetLogs(final BlockchainQueries blockchain, final Optional<Long> maxLogRange) {
     this.blockchain = blockchain;
+    this.maxLogRange = maxLogRange;
   }
 
   @Override
@@ -43,12 +53,14 @@ public String getName() {
   @Override
   public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     final FilterParameter filter = requestContext.getRequiredParameter(0, FilterParameter.class);
+    LOG.atTrace().setMessage("eth_getLogs FilterParameter: {}").addArgument(filter).log();
 
     if (!filter.isValid()) {
       return new JsonRpcErrorResponse(
           requestContext.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
     }
 
+    final AtomicReference<Exception> ex = new AtomicReference<>();
     final List<LogWithMetadata> matchingLogs =
         filter
             .getBlockHash()
@@ -58,9 +70,32 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
                         blockHash, filter.getLogsQuery(), requestContext::isAlive))
             .orElseGet(
                 () -> {
-                  final long fromBlockNumber = filter.getFromBlock().getNumber().orElse(0L);
-                  final long toBlockNumber =
-                      filter.getToBlock().getNumber().orElse(blockchain.headBlockNumber());
+                  final long fromBlockNumber;
+                  final long toBlockNumber;
+                  try {
+                    fromBlockNumber =
+                        filter
+                            .getFromBlock()
+                            .getBlockNumber(blockchain)
+                            .orElseThrow(
+                                () ->
+                                    new Exception("fromBlock not found: " + filter.getFromBlock()));
+                    toBlockNumber =
+                        filter
+                            .getToBlock()
+                            .getBlockNumber(blockchain)
+                            .orElseThrow(
+                                () -> new Exception("toBlock not found: " + filter.getToBlock()));
+                    if (maxLogRange.isPresent()
+                        && (toBlockNumber - fromBlockNumber) > maxLogRange.get()) {
+                      throw new IllegalArgumentException(
+                          "Requested range exceeds maximum range limit");
+                    }
+                  } catch (final Exception e) {
+                    ex.set(e);
+                    return Collections.emptyList();
+                  }
+
                   return blockchain.matchingLogs(
                       fromBlockNumber,
                       toBlockNumber,
@@ -68,6 +103,20 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
                       requestContext::isAlive);
                 });
 
+    if (ex.get() != null) {
+      LOG.atDebug()
+          .setMessage("eth_getLogs request {} failed:")
+          .addArgument(requestContext.getRequest())
+          .setCause(ex.get())
+          .log();
+      if (ex.get() instanceof IllegalArgumentException) {
+        return new JsonRpcErrorResponse(
+            requestContext.getRequest().getId(), JsonRpcError.EXCEEDS_RPC_MAX_BLOCK_RANGE);
+      }
+      return new JsonRpcErrorResponse(
+          requestContext.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
+    }
+
     return new JsonRpcSuccessResponse(
         requestContext.getRequest().getId(), new LogsResult(matchingLogs));
   }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetMinerDataByBlockHash.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetMinerDataByBlockHash.java
index 046371721ce..424f0f772ee 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetMinerDataByBlockHash.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetMinerDataByBlockHash.java
@@ -15,6 +15,8 @@
 
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
@@ -25,17 +27,13 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.MinerDataResult.UncleRewardResult;
 import org.hyperledger.besu.ethereum.api.query.BlockWithMetadata;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.api.query.TransactionReceiptWithMetadata;
 import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.function.Supplier;
 
 import com.google.common.base.Suppliers;
@@ -81,22 +79,21 @@ public static MinerDataResult createMinerDataResult(
       final ProtocolSchedule protocolSchedule,
       final BlockchainQueries blockchainQueries) {
     final BlockHeader blockHeader = block.getHeader();
-    final ProtocolSpec protocolSpec = protocolSchedule.getByBlockNumber(blockHeader.getNumber());
+    final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(blockHeader);
     final Wei staticBlockReward = protocolSpec.getBlockReward();
     final Wei transactionFee =
         block.getTransactions().stream()
             .map(
-                t -> {
-                  Optional<TransactionReceiptWithMetadata> transactionReceiptWithMetadata =
-                      blockchainQueries.transactionReceiptByTransactionHash(
-                          t.getTransaction().getHash());
-                  return t.getTransaction()
-                      .getGasPrice()
-                      .multiply(
-                          transactionReceiptWithMetadata
-                              .map(TransactionReceiptWithMetadata::getGasUsed)
-                              .orElse(0L));
-                })
+                t ->
+                    blockchainQueries
+                        .transactionReceiptByTransactionHash(t.getTransaction().getHash())
+                        .map(
+                            receipt ->
+                                receipt
+                                    .getTransaction()
+                                    .getEffectiveGasPrice(receipt.getBaseFee())
+                                    .multiply(receipt.getGasUsed()))
+                        .orElse(Wei.ZERO))
             .reduce(Wei.ZERO, BaseUInt256Value::add);
     final Wei uncleInclusionReward =
         staticBlockReward.multiply(block.getOmmers().size()).divide(32);
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetMinerDataByBlockNumber.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetMinerDataByBlockNumber.java
index d44125bb7b3..64a89c89194 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetMinerDataByBlockNumber.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetMinerDataByBlockNumber.java
@@ -15,6 +15,7 @@
 
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
@@ -22,7 +23,6 @@
 import org.hyperledger.besu.ethereum.api.query.BlockWithMetadata;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 
 public class EthGetMinerDataByBlockNumber extends AbstractBlockParameterMethod {
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetProof.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetProof.java
index 73b2aaddf4d..6075f2be28b 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetProof.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetProof.java
@@ -14,17 +14,17 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameterOrBlockHash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.proof.GetProofResult;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.proof.WorldStateProof;
 
 import java.util.Arrays;
@@ -34,67 +34,64 @@
 
 import org.apache.tuweni.units.bigints.UInt256;
 
-public class EthGetProof extends AbstractBlockParameterMethod {
-
-  private final BlockchainQueries blockchain;
-
+public class EthGetProof extends AbstractBlockParameterOrBlockHashMethod {
   public EthGetProof(final BlockchainQueries blockchain) {
     super(blockchain);
-    this.blockchain = blockchain;
   }
 
-  private Address getAddress(final JsonRpcRequestContext request) {
-    return request.getRequiredParameter(0, Address.class);
-  }
-
-  private List<UInt256> getStorageKeys(final JsonRpcRequestContext request) {
-    return Arrays.stream(request.getRequiredParameter(1, String[].class))
-        .map(UInt256::fromHexString)
-        .collect(Collectors.toList());
+  @Override
+  public String getName() {
+    return RpcMethod.ETH_GET_PROOF.getMethodName();
   }
 
   @Override
-  protected BlockParameter blockParameter(final JsonRpcRequestContext request) {
-    return request.getRequiredParameter(2, BlockParameter.class);
+  protected BlockParameterOrBlockHash blockParameterOrBlockHash(
+      final JsonRpcRequestContext request) {
+    return request.getRequiredParameter(2, BlockParameterOrBlockHash.class);
   }
 
   @Override
-  protected Object resultByBlockNumber(
-      final JsonRpcRequestContext requestContext, final long blockNumber) {
+  protected Object resultByBlockHash(
+      final JsonRpcRequestContext requestContext, final Hash blockHash) {
 
-    final Address address = getAddress(requestContext);
+    final Address address = requestContext.getRequiredParameter(0, Address.class);
     final List<UInt256> storageKeys = getStorageKeys(requestContext);
 
-    final Optional<MutableWorldState> worldState = blockchain.getWorldState(blockNumber);
-
-    if (worldState.isPresent()) {
-      Optional<WorldStateProof> proofOptional =
-          blockchain
-              .getWorldStateArchive()
-              .getAccountProof(worldState.get().rootHash(), address, storageKeys);
-      return proofOptional
-          .map(
-              proof ->
-                  (JsonRpcResponse)
-                      new JsonRpcSuccessResponse(
-                          requestContext.getRequest().getId(),
-                          GetProofResult.buildGetProofResult(address, proof)))
-          .orElse(
-              new JsonRpcErrorResponse(
-                  requestContext.getRequest().getId(), JsonRpcError.NO_ACCOUNT_FOUND));
-    }
-
-    return new JsonRpcErrorResponse(
-        requestContext.getRequest().getId(), JsonRpcError.WORLD_STATE_UNAVAILABLE);
+    return getBlockchainQueries()
+        .getAndMapWorldState(
+            blockHash,
+            worldState -> {
+              Optional<WorldStateProof> proofOptional =
+                  getBlockchainQueries()
+                      .getWorldStateArchive()
+                      .getAccountProof(worldState.rootHash(), address, storageKeys);
+              return proofOptional
+                  .map(
+                      proof ->
+                          (JsonRpcResponse)
+                              new JsonRpcSuccessResponse(
+                                  requestContext.getRequest().getId(),
+                                  GetProofResult.buildGetProofResult(address, proof)))
+                  .or(
+                      () ->
+                          Optional.of(
+                              new JsonRpcErrorResponse(
+                                  requestContext.getRequest().getId(),
+                                  JsonRpcError.NO_ACCOUNT_FOUND)));
+            })
+        .orElse(
+            new JsonRpcErrorResponse(
+                requestContext.getRequest().getId(), JsonRpcError.WORLD_STATE_UNAVAILABLE));
   }
 
   @Override
   public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
-    return (JsonRpcResponse) findResultByParamType(requestContext);
+    return (JsonRpcResponse) handleParamTypes(requestContext);
   }
 
-  @Override
-  public String getName() {
-    return RpcMethod.ETH_GET_PROOF.getMethodName();
+  private List<UInt256> getStorageKeys(final JsonRpcRequestContext request) {
+    return Arrays.stream(request.getRequiredParameter(1, String[].class))
+        .map(UInt256::fromHexString)
+        .collect(Collectors.toList());
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetStorageAt.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetStorageAt.java
index 936cacb7d4f..e2741233f61 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetStorageAt.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetStorageAt.java
@@ -14,19 +14,19 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameterOrBlockHash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.UInt256Parameter;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Address;
 
 import org.apache.tuweni.units.bigints.UInt256;
 
-public class EthGetStorageAt extends AbstractBlockParameterMethod {
-
-  public EthGetStorageAt(final BlockchainQueries blockchain) {
-    super(blockchain);
+public class EthGetStorageAt extends AbstractBlockParameterOrBlockHashMethod {
+  public EthGetStorageAt(final BlockchainQueries blockchainQueries) {
+    super(blockchainQueries);
   }
 
   @Override
@@ -35,17 +35,18 @@ public String getName() {
   }
 
   @Override
-  protected BlockParameter blockParameter(final JsonRpcRequestContext request) {
-    return request.getRequiredParameter(2, BlockParameter.class);
+  protected BlockParameterOrBlockHash blockParameterOrBlockHash(
+      final JsonRpcRequestContext request) {
+    return request.getRequiredParameter(2, BlockParameterOrBlockHash.class);
   }
 
   @Override
-  protected String resultByBlockNumber(
-      final JsonRpcRequestContext request, final long blockNumber) {
+  protected String resultByBlockHash(final JsonRpcRequestContext request, final Hash blockHash) {
     final Address address = request.getRequiredParameter(0, Address.class);
     final UInt256 position = request.getRequiredParameter(1, UInt256Parameter.class).getValue();
-    return getBlockchainQueries()
-        .storageAt(address, position, blockNumber)
+    return blockchainQueries
+        .get()
+        .storageAt(address, position, blockHash)
         .map(UInt256::toHexString)
         .orElse(null);
   }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndex.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndex.java
index fe39b5766a1..44fb91689d0 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndex.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndex.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.UnsignedIntParameter;
@@ -23,7 +24,6 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionResult;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 import java.util.Optional;
 
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByHash.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByHash.java
index 79aac42c2e8..49346f187b4 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByHash.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByHash.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
@@ -23,7 +24,6 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionCompleteResult;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionPendingResult;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
 
 import java.util.Optional;
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionCount.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionCount.java
index 739bbd93dbe..51a551f49b3 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionCount.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionCount.java
@@ -14,36 +14,32 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameterOrBlockHash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
 
-import java.util.OptionalLong;
 import java.util.function.Supplier;
 
 import com.google.common.base.Suppliers;
 
-public class EthGetTransactionCount extends AbstractBlockParameterMethod {
-
+public class EthGetTransactionCount extends AbstractBlockParameterOrBlockHashMethod {
   private final Supplier<PendingTransactions> pendingTransactions;
-  private final boolean resultAsDecimal;
 
   public EthGetTransactionCount(
       final BlockchainQueries blockchain, final PendingTransactions pendingTransactions) {
-    this(Suppliers.ofInstance(blockchain), Suppliers.ofInstance(pendingTransactions), false);
+    this(Suppliers.ofInstance(blockchain), Suppliers.ofInstance(pendingTransactions));
   }
 
   public EthGetTransactionCount(
       final Supplier<BlockchainQueries> blockchain,
-      final Supplier<PendingTransactions> pendingTransactions,
-      final boolean resultAsDecimal) {
+      final Supplier<PendingTransactions> pendingTransactions) {
     super(blockchain);
     this.pendingTransactions = pendingTransactions;
-    this.resultAsDecimal = resultAsDecimal;
   }
 
   @Override
@@ -52,29 +48,32 @@ public String getName() {
   }
 
   @Override
-  protected BlockParameter blockParameter(final JsonRpcRequestContext request) {
-    return request.getRequiredParameter(1, BlockParameter.class);
+  protected BlockParameterOrBlockHash blockParameterOrBlockHash(
+      final JsonRpcRequestContext request) {
+    return request.getRequiredParameter(1, BlockParameterOrBlockHash.class);
   }
 
   @Override
   protected Object pendingResult(final JsonRpcRequestContext request) {
     final Address address = request.getRequiredParameter(0, Address.class);
-    final OptionalLong pendingNonce = pendingTransactions.get().getNextNonceForSender(address);
-    if (pendingNonce.isPresent()) {
-      return Quantity.create(pendingNonce.getAsLong());
-    } else {
-      return latestResult(request);
+    final long pendingNonce = pendingTransactions.get().getNextNonceForSender(address).orElse(0);
+    final long latestNonce =
+        getBlockchainQueries()
+            .getTransactionCount(
+                address, getBlockchainQueries().getBlockchain().getChainHead().getHash());
+
+    if (Long.compareUnsigned(pendingNonce, latestNonce) > 0) {
+      return Quantity.create(pendingNonce);
     }
+
+    return Quantity.create(latestNonce);
   }
 
   @Override
-  protected String resultByBlockNumber(
-      final JsonRpcRequestContext request, final long blockNumber) {
+  protected String resultByBlockHash(final JsonRpcRequestContext request, final Hash blockHash) {
     final Address address = request.getRequiredParameter(0, Address.class);
-    if (blockNumber > getBlockchainQueries().headBlockNumber()) {
-      return null;
-    }
-    final long transactionCount = getBlockchainQueries().getTransactionCount(address, blockNumber);
-    return resultAsDecimal ? Long.toString(transactionCount) : Quantity.create(transactionCount);
+    final long transactionCount = getBlockchainQueries().getTransactionCount(address, blockHash);
+
+    return Quantity.create(transactionCount);
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceipt.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceipt.java
index 620febbfb4e..d85abb1a96a 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceipt.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceipt.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
@@ -23,15 +24,14 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionReceiptStatusResult;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.query.TransactionReceiptWithMetadata;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.mainnet.TransactionReceiptType;
 
 public class EthGetTransactionReceipt implements JsonRpcMethod {
 
-  private final BlockchainQueries blockchain;
+  private final BlockchainQueries blockchainQueries;
 
-  public EthGetTransactionReceipt(final BlockchainQueries blockchain) {
-    this.blockchain = blockchain;
+  public EthGetTransactionReceipt(final BlockchainQueries blockchainQueries) {
+    this.blockchainQueries = blockchainQueries;
   }
 
   @Override
@@ -43,9 +43,9 @@ public String getName() {
   public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     final Hash hash = requestContext.getRequiredParameter(0, Hash.class);
     final TransactionReceiptResult result =
-        blockchain
+        blockchainQueries
             .transactionReceiptByTransactionHash(hash)
-            .map(receipt -> getResult(receipt))
+            .map(this::getResult)
             .orElse(null);
     return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), result);
   }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndex.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndex.java
index 1b1443d4d27..311da6b45f4 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndex.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndex.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.UnsignedIntParameter;
@@ -22,7 +23,6 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResult;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.UncleBlockResult;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 public class EthGetUncleByBlockHashAndIndex implements JsonRpcMethod {
 
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleCountByBlockHash.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleCountByBlockHash.java
index c679cb2dc37..c8efa19f309 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleCountByBlockHash.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleCountByBlockHash.java
@@ -14,13 +14,13 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 public class EthGetUncleCountByBlockHash implements JsonRpcMethod {
 
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetWork.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetWork.java
index dce139c5314..165779a806a 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetWork.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetWork.java
@@ -14,8 +14,6 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
-
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
@@ -23,27 +21,30 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
 import org.hyperledger.besu.ethereum.mainnet.DirectAcyclicGraphSeed;
 import org.hyperledger.besu.ethereum.mainnet.EpochCalculator;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolverInputs;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolverInputs;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 
 import com.google.common.io.BaseEncoding;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class EthGetWork implements JsonRpcMethod {
 
   private final MiningCoordinator miner;
-  private static final Logger LOG = getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(EthGetWork.class);
   private final EpochCalculator epochCalculator;
 
   public EthGetWork(final MiningCoordinator miner) {
     this.miner = miner;
-    if (miner instanceof EthHashMiningCoordinator) {
-      this.epochCalculator = ((EthHashMiningCoordinator) miner).getEpochCalculator();
+    if (miner instanceof PoWMiningCoordinator) {
+      this.epochCalculator = ((PoWMiningCoordinator) miner).getEpochCalculator();
     } else {
       this.epochCalculator = new EpochCalculator.DefaultEpochCalculator();
     }
@@ -56,22 +57,25 @@ public String getName() {
 
   @Override
   public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
-    final Optional<EthHashSolverInputs> solver = miner.getWorkDefinition();
+    final Optional<PoWSolverInputs> solver = miner.getWorkDefinition();
+    final Object requestId = requestContext.getRequest().getId();
     if (solver.isPresent()) {
-      final EthHashSolverInputs rawResult = solver.get();
-      final byte[] dagSeed =
-          DirectAcyclicGraphSeed.dagSeed(rawResult.getBlockNumber(), epochCalculator);
-      final String[] result = {
-        "0x" + BaseEncoding.base16().lowerCase().encode(rawResult.getPrePowHash()),
-        "0x" + BaseEncoding.base16().lowerCase().encode(dagSeed),
-        rawResult.getTarget().toHexString(),
-        Quantity.create(rawResult.getBlockNumber())
-      };
-      return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), result);
+      final PoWSolverInputs rawResult = solver.get();
+      final List<String> response = new ArrayList<>(rawResponse(rawResult));
+      response.add(Quantity.create(rawResult.getBlockNumber()));
+      return new JsonRpcSuccessResponse(requestId, response);
     } else {
       LOG.trace("Mining is not operational, eth_getWork request cannot be processed");
-      return new JsonRpcErrorResponse(
-          requestContext.getRequest().getId(), JsonRpcError.NO_MINING_WORK_FOUND);
+      return new JsonRpcErrorResponse(requestId, JsonRpcError.NO_MINING_WORK_FOUND);
     }
   }
+
+  public List<String> rawResponse(final PoWSolverInputs rawResult) {
+    final byte[] dagSeed =
+        DirectAcyclicGraphSeed.dagSeed(rawResult.getBlockNumber(), epochCalculator);
+    return List.of(
+        rawResult.getPrePowHash().toHexString(),
+        "0x" + BaseEncoding.base16().lowerCase().encode(dagSeed),
+        rawResult.getTarget().toHexString());
+  }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendRawTransaction.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendRawTransaction.java
index fb06e816601..3a7113001c6 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendRawTransaction.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendRawTransaction.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcErrorConverter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
@@ -23,17 +24,20 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.util.DomainObjectDecodeUtils;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+import org.hyperledger.besu.ethereum.rlp.RLPException;
 import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
 
 import java.util.function.Supplier;
 
 import com.google.common.base.Suppliers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class EthSendRawTransaction implements JsonRpcMethod {
+  private static final Logger LOG = LoggerFactory.getLogger(EthSendRawTransaction.class);
 
   private final boolean sendEmptyHashOnInvalidBlock;
 
@@ -65,13 +69,23 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     final Transaction transaction;
     try {
       transaction = DomainObjectDecodeUtils.decodeRawTransaction(rawTransaction);
-    } catch (final InvalidJsonRpcRequestException e) {
+      LOG.trace("Received local transaction {}", transaction);
+    } catch (final RLPException e) {
+      LOG.debug("RLPException: {} caused by {}", e.getMessage(), e.getCause());
+      return new JsonRpcErrorResponse(
+          requestContext.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
+    } catch (final InvalidJsonRpcRequestException i) {
+      LOG.debug("InvalidJsonRpcRequestException: {} caused by {}", i.getMessage(), i.getCause());
+      return new JsonRpcErrorResponse(
+          requestContext.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
+    } catch (final IllegalArgumentException ill) {
+      LOG.debug("IllegalArgumentException: {} caused by {}", ill.getMessage(), ill.getCause());
       return new JsonRpcErrorResponse(
           requestContext.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
     }
 
     final ValidationResult<TransactionInvalidReason> validationResult =
-        transactionPool.get().addLocalTransaction(transaction);
+        transactionPool.get().addTransactionViaApi(transaction);
     return validationResult.either(
         () ->
             new JsonRpcSuccessResponse(
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSubmitHashRate.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSubmitHashRate.java
index 11946d9e139..c2e792b23f0 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSubmitHashRate.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSubmitHashRate.java
@@ -42,6 +42,6 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     return new JsonRpcSuccessResponse(
         requestContext.getRequest().getId(),
         miningCoordinator.submitHashRate(
-            id, Bytes.fromHexString(hashRate).toBigInteger().longValue()));
+            id, Bytes.fromHexStringLenient(hashRate).toBigInteger().longValue()));
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSubmitWork.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSubmitWork.java
index 63295c171af..95e4de2b640 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSubmitWork.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSubmitWork.java
@@ -14,8 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
-
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
@@ -23,19 +22,19 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolution;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolverInputs;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolution;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolverInputs;
 
 import java.util.Optional;
 
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class EthSubmitWork implements JsonRpcMethod {
 
   private final MiningCoordinator miner;
-  private static final Logger LOG = getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(EthSubmitWork.class);
 
   public EthSubmitWork(final MiningCoordinator miner) {
     this.miner = miner;
@@ -48,14 +47,14 @@ public String getName() {
 
   @Override
   public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
-    final Optional<EthHashSolverInputs> solver = miner.getWorkDefinition();
+    final Optional<PoWSolverInputs> solver = miner.getWorkDefinition();
     if (solver.isPresent()) {
-      final EthHashSolution solution =
-          new EthHashSolution(
+      final PoWSolution solution =
+          new PoWSolution(
               Bytes.fromHexString(requestContext.getRequiredParameter(0, String.class)).getLong(0),
               requestContext.getRequiredParameter(2, Hash.class),
-              Bytes.fromHexString(requestContext.getRequiredParameter(1, String.class))
-                  .toArrayUnsafe());
+              null,
+              Bytes.fromHexString(requestContext.getRequiredParameter(1, String.class)));
       final boolean result = miner.submitWork(solution);
       return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), result);
     } else {
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/ExecuteTransactionStep.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/ExecuteTransactionStep.java
new file mode 100644
index 00000000000..e88f0e85b9f
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/ExecuteTransactionStep.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright contributors to Hyperledger Besu..
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import org.hyperledger.besu.datatypes.DataGas;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.debug.TraceFrame;
+import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
+import org.hyperledger.besu.ethereum.vm.CachingBlockHashLookup;
+import org.hyperledger.besu.ethereum.vm.DebugOperationTracer;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
+
+public class ExecuteTransactionStep implements Function<TransactionTrace, TransactionTrace> {
+
+  private final TraceBlock.ChainUpdater chainUpdater;
+  private final DebugOperationTracer tracer;
+  private final MainnetTransactionProcessor transactionProcessor;
+  private final Blockchain blockchain;
+  private final ProtocolSpec protocolSpec;
+  private final Block block;
+
+  public ExecuteTransactionStep(
+      final TraceBlock.ChainUpdater chainUpdater,
+      final MainnetTransactionProcessor transactionProcessor,
+      final Blockchain blockchain,
+      final DebugOperationTracer tracer,
+      final ProtocolSpec protocolSpec,
+      final Block block) {
+    this.chainUpdater = chainUpdater;
+    this.transactionProcessor = transactionProcessor;
+    this.blockchain = blockchain;
+    this.tracer = tracer;
+    this.protocolSpec = protocolSpec;
+    this.block = block;
+  }
+
+  public ExecuteTransactionStep(
+      final TraceBlock.ChainUpdater chainUpdater,
+      final MainnetTransactionProcessor transactionProcessor,
+      final Blockchain blockchain,
+      final DebugOperationTracer tracer,
+      final ProtocolSpec protocolSpec) {
+    this(chainUpdater, transactionProcessor, blockchain, tracer, protocolSpec, null);
+  }
+
+  @Override
+  public TransactionTrace apply(final TransactionTrace transactionTrace) {
+    Block block = this.block;
+    // case where transactionTrace is created only to trace a block reward
+    if (block == null) {
+      block =
+          transactionTrace
+              .getBlock()
+              .orElseThrow(
+                  () ->
+                      new RuntimeException(
+                          "Expecting reward block to be in transactionTrace but was empty"));
+    }
+
+    List<TraceFrame> traceFrames = null;
+    TransactionProcessingResult result = null;
+    // If it is not a reward Block trace
+    if (transactionTrace.getTransaction() != null) {
+      BlockHeader header = block.getHeader();
+      final Optional<BlockHeader> maybeParentHeader =
+          blockchain.getBlockHeader(header.getParentHash());
+      final Wei dataGasPrice =
+          protocolSpec
+              .getFeeMarket()
+              .dataPrice(
+                  maybeParentHeader.flatMap(BlockHeader::getExcessDataGas).orElse(DataGas.ZERO));
+      final BlockHashLookup blockHashLookup = new CachingBlockHashLookup(header, blockchain);
+      result =
+          transactionProcessor.processTransaction(
+              blockchain,
+              chainUpdater.getNextUpdater(),
+              header,
+              transactionTrace.getTransaction(),
+              header.getCoinbase(),
+              tracer,
+              blockHashLookup,
+              false,
+              dataGasPrice);
+
+      traceFrames = tracer.copyTraceFrames();
+      tracer.reset();
+    }
+    return new TransactionTrace(
+        transactionTrace.getTransaction(), result, traceFrames, transactionTrace.getBlock());
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/ExecutionEngineJsonRpcMethod.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/ExecutionEngineJsonRpcMethod.java
new file mode 100644
index 00000000000..9e22bc1b999
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/ExecutionEngineJsonRpcMethod.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import org.hyperledger.besu.consensus.merge.MergeContext;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.EngineCallListener;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Supplier;
+
+import io.vertx.core.Vertx;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public abstract class ExecutionEngineJsonRpcMethod implements JsonRpcMethod {
+  public enum EngineStatus {
+    VALID,
+    INVALID,
+    SYNCING,
+    ACCEPTED,
+    INVALID_BLOCK_HASH;
+  }
+
+  public static final long ENGINE_API_LOGGING_THRESHOLD = 60000L;
+  private final Vertx syncVertx;
+  private static final Logger LOG = LoggerFactory.getLogger(ExecutionEngineJsonRpcMethod.class);
+  protected final Optional<MergeContext> mergeContextOptional;
+  protected final Supplier<MergeContext> mergeContext;
+  protected final ProtocolContext protocolContext;
+  protected final EngineCallListener engineCallListener;
+
+  protected ExecutionEngineJsonRpcMethod(
+      final Vertx vertx,
+      final ProtocolContext protocolContext,
+      final EngineCallListener engineCallListener) {
+    this.syncVertx = vertx;
+    this.protocolContext = protocolContext;
+    this.mergeContextOptional = protocolContext.safeConsensusContext(MergeContext.class);
+    this.mergeContext = mergeContextOptional::orElseThrow;
+    this.engineCallListener = engineCallListener;
+  }
+
+  @Override
+  public final JsonRpcResponse response(final JsonRpcRequestContext request) {
+
+    final CompletableFuture<JsonRpcResponse> cf = new CompletableFuture<>();
+
+    syncVertx.<JsonRpcResponse>executeBlocking(
+        z -> {
+          LOG.trace(
+              "execution engine JSON-RPC request {} {}",
+              this.getName(),
+              request.getRequest().getParams());
+          z.tryComplete(syncResponse(request));
+        },
+        true,
+        resp ->
+            cf.complete(
+                resp.otherwise(
+                        t -> {
+                          if (LOG.isDebugEnabled()) {
+                            LOG.atDebug()
+                                .setMessage("failed to exec consensus method {}")
+                                .addArgument(this.getName())
+                                .setCause(t)
+                                .log();
+                          } else {
+                            LOG.atError()
+                                .setMessage("failed to exec consensus method {}, error: {}")
+                                .addArgument(this.getName())
+                                .addArgument(t.getMessage())
+                                .log();
+                          }
+                          return new JsonRpcErrorResponse(
+                              request.getRequest().getId(), JsonRpcError.INVALID_REQUEST);
+                        })
+                    .result()));
+    try {
+      return cf.get();
+    } catch (InterruptedException e) {
+      LOG.error("Failed to get execution engine response", e);
+      return new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.TIMEOUT_ERROR);
+    } catch (ExecutionException e) {
+      LOG.error("Failed to get execution engine response", e);
+      return new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INTERNAL_ERROR);
+    }
+  }
+
+  public abstract JsonRpcResponse syncResponse(final JsonRpcRequestContext request);
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/JsonCallParameterUtil.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/JsonCallParameterUtil.java
new file mode 100644
index 00000000000..4af10b63fdf
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/JsonCallParameterUtil.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;
+
+public class JsonCallParameterUtil {
+
+  private JsonCallParameterUtil() {}
+
+  public static JsonCallParameter validateAndGetCallParams(final JsonRpcRequestContext request) {
+    final JsonCallParameter callParams = request.getRequiredParameter(0, JsonCallParameter.class);
+
+    if (callParams.getGasPrice() != null
+        && (callParams.getMaxFeePerGas().isPresent()
+            || callParams.getMaxPriorityFeePerGas().isPresent())) {
+      throw new InvalidJsonRpcParameters(
+          "gasPrice cannot be used with maxFeePerGas or maxPriorityFeePerGas");
+    }
+    return callParams;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/JsonRpcMethod.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/JsonRpcMethod.java
index 20e3a521d1b..c0b1783ce79 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/JsonRpcMethod.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/JsonRpcMethod.java
@@ -50,5 +50,5 @@ default List<String> getPermissions() {
     permissions.add(this.getName().substring(0, this.getName().indexOf('_')) + ":*");
     permissions.add(this.getName().replace('_', ':'));
     return permissions;
-  };
+  }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetEnode.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetEnode.java
index ba59729e272..f1c5665d249 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetEnode.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetEnode.java
@@ -21,7 +21,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.util.Optional;
 
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetServices.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetServices.java
index 728c348ecb9..335a74846f2 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetServices.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetServices.java
@@ -21,8 +21,8 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
 import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import com.google.common.collect.ImmutableMap;
 
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/PluginJsonRpcMethod.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/PluginJsonRpcMethod.java
new file mode 100644
index 00000000000..0366e078d68
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/PluginJsonRpcMethod.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.INTERNAL_ERROR;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.PLUGIN_INTERNAL_ERROR;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.plugin.services.exception.PluginRpcEndpointException;
+import org.hyperledger.besu.plugin.services.rpc.PluginRpcRequest;
+
+import java.util.function.Function;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PluginJsonRpcMethod implements JsonRpcMethod {
+
+  private static final Logger LOG = LoggerFactory.getLogger(PluginJsonRpcMethod.class);
+
+  private final String name;
+  private final Function<PluginRpcRequest, ?> function;
+
+  public PluginJsonRpcMethod(final String name, final Function<PluginRpcRequest, ?> function) {
+    this.name = name;
+    this.function = function;
+  }
+
+  @Override
+  public String getName() {
+    return name;
+  }
+
+  @Override
+  public JsonRpcResponse response(final JsonRpcRequestContext request) {
+    try {
+      final Object result = function.apply(() -> request.getRequest().getParams());
+      return new JsonRpcSuccessResponse(request.getRequest().getId(), result);
+    } catch (final PluginRpcEndpointException ex) {
+      final JsonRpcError error = PLUGIN_INTERNAL_ERROR;
+      error.setData(ex.getMessage());
+      LOG.error("Error calling plugin JSON-RPC endpoint", ex);
+      return new JsonRpcErrorResponse(request.getRequest().getId(), error);
+    } catch (final Exception ex) {
+      LOG.error("Error calling plugin JSON-RPC endpoint", ex);
+      return new JsonRpcErrorResponse(request.getRequest().getId(), INTERNAL_ERROR);
+    }
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/PluginsReloadConfiguration.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/PluginsReloadConfiguration.java
index 8905def5787..15f3b63074e 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/PluginsReloadConfiguration.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/PluginsReloadConfiguration.java
@@ -26,12 +26,12 @@
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PluginsReloadConfiguration implements JsonRpcMethod {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PluginsReloadConfiguration.class);
   private final Map<String, BesuPlugin> namedPlugins;
 
   public PluginsReloadConfiguration(final Map<String, BesuPlugin> namedPlugins) {
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/RpcModules.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/RpcModules.java
index c177fbe5c29..fc145d719fa 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/RpcModules.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/RpcModules.java
@@ -14,7 +14,6 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
@@ -29,10 +28,9 @@ public class RpcModules implements JsonRpcMethod {
 
   private final Map<String, String> moduleVersions;
 
-  public RpcModules(final Collection<RpcApi> modulesList) {
+  public RpcModules(final Collection<String> modulesList) {
     this.moduleVersions =
         modulesList.stream()
-            .map(RpcApi::getCliValue)
             .map(String::toLowerCase)
             .collect(Collectors.toMap(Function.identity(), s -> "1.0"));
   }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceBlock.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceBlock.java
index da300dcbe64..a6125f393aa 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceBlock.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceBlock.java
@@ -14,38 +14,51 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import static org.hyperledger.besu.services.pipeline.PipelineBuilder.createPipelineFrom;
+
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.FilterParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.Tracer;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.flat.FlatTraceGenerator;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.flat.RewardTraceGenerator;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.api.util.ArrayNodeWrapper;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.debug.TraceOptions;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 import org.hyperledger.besu.ethereum.vm.DebugOperationTracer;
+import org.hyperledger.besu.evm.worldstate.StackedUpdater;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.metrics.prometheus.PrometheusMetricsSystem;
+import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
+import org.hyperledger.besu.services.pipeline.Pipeline;
 
 import java.util.List;
-import java.util.function.Supplier;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TraceBlock extends AbstractBlockParameterMethod {
-
+  private static final Logger LOG = LoggerFactory.getLogger(TraceBlock.class);
   private static final ObjectMapper MAPPER = new ObjectMapper();
-  private final Supplier<BlockTracer> blockTracerSupplier;
-  private final ProtocolSchedule protocolSchedule;
+  protected final ProtocolSchedule protocolSchedule;
 
-  public TraceBlock(
-      final Supplier<BlockTracer> blockTracerSupplier,
-      final ProtocolSchedule protocolSchedule,
-      final BlockchainQueries queries) {
+  public TraceBlock(final ProtocolSchedule protocolSchedule, final BlockchainQueries queries) {
     super(queries);
-    this.blockTracerSupplier = blockTracerSupplier;
     this.protocolSchedule = protocolSchedule;
   }
 
@@ -64,41 +77,100 @@ protected Object resultByBlockNumber(
       final JsonRpcRequestContext request, final long blockNumber) {
     if (blockNumber == BlockHeader.GENESIS_BLOCK_NUMBER) {
       // Nothing to trace for the genesis block
-      return emptyResult();
+      return emptyResult().getArrayNode();
     }
+    LOG.trace("Received RPC rpcName={} block={}", getName(), blockNumber);
 
     return getBlockchainQueries()
         .getBlockchain()
         .getBlockByNumber(blockNumber)
-        .map(this::traceBlock)
+        .map(block -> traceBlock(block, Optional.empty()))
+        .map(ArrayNodeWrapper::getArrayNode)
         .orElse(null);
   }
 
-  private Object traceBlock(final Block block) {
+  protected ArrayNodeWrapper traceBlock(
+      final Block block, final Optional<FilterParameter> filterParameter) {
 
     if (block == null) {
       return emptyResult();
     }
-    final ArrayNode resultArrayNode = MAPPER.createArrayNode();
-
-    blockTracerSupplier
-        .get()
-        .trace(block, new DebugOperationTracer(new TraceOptions(false, false, true)))
-        .ifPresent(
-            blockTrace ->
-                generateTracesFromTransactionTraceAndBlock(
-                    blockTrace.getTransactionTraces(), block, resultArrayNode));
-
-    generateRewardsFromBlock(block, resultArrayNode);
-
-    return resultArrayNode;
+    final BlockHeader header = block.getHeader();
+
+    return Tracer.processTracing(
+            getBlockchainQueries(),
+            Optional.of(header),
+            traceableState -> {
+              ArrayNodeWrapper resultArrayNode = new ArrayNodeWrapper(MAPPER.createArrayNode());
+              final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(header);
+              final MainnetTransactionProcessor transactionProcessor =
+                  protocolSpec.getTransactionProcessor();
+              final ChainUpdater chainUpdater = new ChainUpdater(traceableState);
+
+              TransactionSource transactionSource = new TransactionSource(block);
+              final LabelledMetric<Counter> outputCounter =
+                  new PrometheusMetricsSystem(BesuMetricCategory.DEFAULT_METRIC_CATEGORIES, false)
+                      .createLabelledCounter(
+                          BesuMetricCategory.BLOCKCHAIN,
+                          "transactions_traceblock_pipeline_processed_total",
+                          "Number of transactions processed for each block",
+                          "step",
+                          "action");
+              DebugOperationTracer debugOperationTracer =
+                  new DebugOperationTracer(new TraceOptions(false, false, true));
+              ExecuteTransactionStep executeTransactionStep =
+                  new ExecuteTransactionStep(
+                      chainUpdater,
+                      transactionProcessor,
+                      getBlockchainQueries().getBlockchain(),
+                      debugOperationTracer,
+                      protocolSpec,
+                      block);
+              TraceFlatTransactionStep traceFlatTransactionStep =
+                  new TraceFlatTransactionStep(protocolSchedule, block, filterParameter);
+              BuildArrayNodeCompleterStep buildArrayNodeStep =
+                  new BuildArrayNodeCompleterStep(resultArrayNode);
+              Pipeline<TransactionTrace> traceBlockPipeline =
+                  createPipelineFrom(
+                          "getTransactions",
+                          transactionSource,
+                          4,
+                          outputCounter,
+                          false,
+                          "trace_block_transactions")
+                      .thenProcess("executeTransaction", executeTransactionStep)
+                      .thenProcessAsyncOrdered("traceFlatTransaction", traceFlatTransactionStep, 4)
+                      .andFinishWith(
+                          "buildArrayNode",
+                          traceStream -> traceStream.forEachOrdered(buildArrayNodeStep));
+
+              try {
+                if (getBlockchainQueries().getEthScheduler().isPresent()) {
+                  getBlockchainQueries()
+                      .getEthScheduler()
+                      .get()
+                      .startPipeline(traceBlockPipeline)
+                      .get();
+                } else {
+                  EthScheduler ethScheduler = new EthScheduler(1, 1, 1, 1, new NoOpMetricsSystem());
+                  ethScheduler.startPipeline(traceBlockPipeline).get();
+                }
+              } catch (InterruptedException | ExecutionException e) {
+                throw new RuntimeException(e);
+              }
+
+              resultArrayNode = buildArrayNodeStep.getResultArrayNode();
+              generateRewardsFromBlock(filterParameter, block, resultArrayNode);
+              return Optional.of(resultArrayNode);
+            })
+        .orElse(emptyResult());
   }
 
-  private void generateTracesFromTransactionTraceAndBlock(
+  protected void generateTracesFromTransactionTraceAndBlock(
+      final Optional<FilterParameter> filterParameter,
       final List<TransactionTrace> transactionTraces,
       final Block block,
-      final ArrayNode resultArrayNode) {
-
+      final ArrayNodeWrapper resultArrayNode) {
     transactionTraces.forEach(
         transactionTrace ->
             FlatTraceGenerator.generateFromTransactionTraceAndBlock(
@@ -106,12 +178,36 @@ private void generateTracesFromTransactionTraceAndBlock(
                 .forEachOrdered(resultArrayNode::addPOJO));
   }
 
-  private void generateRewardsFromBlock(final Block block, final ArrayNode resultArrayNode) {
+  protected void generateRewardsFromBlock(
+      final Optional<FilterParameter> maybeFilterParameter,
+      final Block block,
+      final ArrayNodeWrapper resultArrayNode) {
     RewardTraceGenerator.generateFromBlock(protocolSchedule, block)
         .forEachOrdered(resultArrayNode::addPOJO);
   }
 
-  private Object emptyResult() {
-    return MAPPER.createArrayNode();
+  ArrayNodeWrapper emptyResult() {
+    return new ArrayNodeWrapper(MAPPER.createArrayNode());
+  }
+
+  public static class ChainUpdater {
+
+    private final MutableWorldState worldState;
+    private WorldUpdater updater;
+
+    public ChainUpdater(final MutableWorldState worldState) {
+      this.worldState = worldState;
+    }
+
+    public WorldUpdater getNextUpdater() {
+      // if we have no prior updater, it must be the first TX, so use the block's initial state
+      if (updater == null) {
+        updater = worldState.updater();
+      } else if (updater instanceof StackedUpdater) {
+        ((StackedUpdater) updater).markTransactionBoundary();
+      }
+      updater = updater.updater();
+      return updater;
+    }
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceCall.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceCall.java
new file mode 100644
index 00000000000..c29aba8d30a
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceCall.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.BLOCK_NOT_FOUND;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.INTERNAL_ERROR;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TraceTypeParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
+import org.hyperledger.besu.ethereum.vm.DebugOperationTracer;
+
+import java.util.Optional;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TraceCall extends AbstractTraceByBlock implements JsonRpcMethod {
+  private static final Logger LOG = LoggerFactory.getLogger(TraceCall.class);
+
+  public TraceCall(
+      final BlockchainQueries blockchainQueries,
+      final ProtocolSchedule protocolSchedule,
+      final TransactionSimulator transactionSimulator) {
+    super(blockchainQueries, protocolSchedule, transactionSimulator);
+  }
+
+  @Override
+  public String getName() {
+    return transactionSimulator != null ? RpcMethod.TRACE_CALL.getMethodName() : null;
+  }
+
+  @Override
+  protected Object resultByBlockNumber(
+      final JsonRpcRequestContext requestContext, final long blockNumber) {
+    final JsonCallParameter callParams =
+        JsonCallParameterUtil.validateAndGetCallParams(requestContext);
+    final TraceTypeParameter traceTypeParameter =
+        requestContext.getRequiredParameter(1, TraceTypeParameter.class);
+    final String blockNumberString = String.valueOf(blockNumber);
+    LOG.atTrace()
+        .setMessage("Received RPC rpcName={} callParams={} block={} traceTypes={}")
+        .addArgument(this::getName)
+        .addArgument(callParams)
+        .addArgument(blockNumberString)
+        .addArgument(traceTypeParameter)
+        .log();
+
+    final Optional<BlockHeader> maybeBlockHeader =
+        blockchainQueriesSupplier.get().getBlockHeaderByNumber(blockNumber);
+
+    if (maybeBlockHeader.isEmpty()) {
+      return new JsonRpcErrorResponse(requestContext.getRequest().getId(), BLOCK_NOT_FOUND);
+    }
+
+    final Set<TraceTypeParameter.TraceType> traceTypes = traceTypeParameter.getTraceTypes();
+
+    final DebugOperationTracer tracer = new DebugOperationTracer(buildTraceOptions(traceTypes));
+    return transactionSimulator
+        .process(
+            callParams,
+            buildTransactionValidationParams(),
+            tracer,
+            (mutableWorldState, maybeSimulatorResult) ->
+                maybeSimulatorResult.map(
+                    result -> {
+                      if (result.isInvalid()) {
+                        LOG.error(String.format("Invalid simulator result %s", result));
+                        return new JsonRpcErrorResponse(
+                            requestContext.getRequest().getId(), INTERNAL_ERROR);
+                      }
+
+                      final TransactionTrace transactionTrace =
+                          new TransactionTrace(
+                              result.getTransaction(), result.getResult(), tracer.getTraceFrames());
+
+                      final Block block =
+                          blockchainQueriesSupplier.get().getBlockchain().getChainHeadBlock();
+
+                      return getTraceCallResult(
+                          protocolSchedule, traceTypes, result, transactionTrace, block);
+                    }),
+            maybeBlockHeader.get())
+        .orElse(new JsonRpcErrorResponse(requestContext.getRequest().getId(), INTERNAL_ERROR));
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceCallMany.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceCallMany.java
new file mode 100644
index 00000000000..ded4ff2b08e
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceCallMany.java
@@ -0,0 +1,191 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.BLOCK_NOT_FOUND;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.INTERNAL_ERROR;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TraceCallManyParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TraceTypeParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
+import org.hyperledger.besu.ethereum.transaction.TransactionSimulatorResult;
+import org.hyperledger.besu.ethereum.vm.DebugOperationTracer;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TraceCallMany extends TraceCall implements JsonRpcMethod {
+
+  private static final Logger LOG = LoggerFactory.getLogger(TraceCallMany.class);
+
+  public TraceCallMany(
+      final BlockchainQueries blockchainQueries,
+      final ProtocolSchedule protocolSchedule,
+      final TransactionSimulator transactionSimulator) {
+    super(blockchainQueries, protocolSchedule, transactionSimulator);
+  }
+
+  @Override
+  public String getName() {
+    return transactionSimulator != null ? RpcMethod.TRACE_CALL_MANY.getMethodName() : null;
+  }
+
+  @Override
+  protected BlockParameter blockParameter(final JsonRpcRequestContext request) {
+    final Optional<BlockParameter> maybeBlockParameter =
+        request.getOptionalParameter(2, BlockParameter.class);
+
+    if (maybeBlockParameter.isPresent()) {
+      return maybeBlockParameter.get();
+    }
+
+    return BlockParameter.LATEST;
+  }
+
+  @Override
+  protected Object resultByBlockNumber(
+      final JsonRpcRequestContext requestContext, final long blockNumber) {
+
+    if (requestContext.getRequest().getParamLength() != 2) {
+      return new JsonRpcErrorResponse(
+          requestContext.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
+    }
+
+    final TraceCallManyParameter[] transactionsAndTraceTypeParameters;
+    try {
+      transactionsAndTraceTypeParameters =
+          requestContext.getRequiredParameter(0, TraceCallManyParameter[].class);
+      final String blockNumberString = String.valueOf(blockNumber);
+      LOG.atTrace()
+          .setMessage("Received RPC rpcName={} trace_callManyParams={} block={}")
+          .addArgument(this::getName)
+          .addArgument(transactionsAndTraceTypeParameters)
+          .addArgument(blockNumberString)
+          .log();
+    } catch (final Exception e) {
+      LOG.error("Error parsing trace_callMany parameters: {}", e.getLocalizedMessage());
+      return new JsonRpcErrorResponse(
+          requestContext.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
+    }
+
+    final Optional<BlockHeader> maybeBlockHeader =
+        blockchainQueriesSupplier.get().getBlockHeaderByNumber(blockNumber);
+
+    if (maybeBlockHeader.isEmpty()) {
+      return new JsonRpcErrorResponse(requestContext.getRequest().getId(), BLOCK_NOT_FOUND);
+    }
+    final BlockHeader blockHeader = maybeBlockHeader.get();
+
+    final List<JsonNode> traceCallResults = new ArrayList<>();
+
+    return getBlockchainQueries()
+        .getAndMapWorldState(
+            blockHeader.getBlockHash(),
+            ws -> {
+              final WorldUpdater updater =
+                  transactionSimulator.getEffectiveWorldStateUpdater(blockHeader, ws);
+              try {
+                Arrays.stream(transactionsAndTraceTypeParameters)
+                    .forEachOrdered(
+                        param -> {
+                          final WorldUpdater localUpdater = updater.updater();
+                          traceCallResults.add(
+                              getSingleCallResult(
+                                  param.getTuple().getJsonCallParameter(),
+                                  param.getTuple().getTraceTypeParameter(),
+                                  blockHeader,
+                                  localUpdater));
+                          localUpdater.commit();
+                        });
+              } catch (final TransactionInvalidException e) {
+                LOG.error("Invalid transaction simulator result");
+                return Optional.of(
+                    new JsonRpcErrorResponse(requestContext.getRequest().getId(), INTERNAL_ERROR));
+              } catch (final EmptySimulatorResultException e) {
+                LOG.error(
+                    "Empty simulator result, call params: {}, blockHeader: {} ",
+                    JsonCallParameterUtil.validateAndGetCallParams(requestContext),
+                    blockHeader);
+                return Optional.of(
+                    new JsonRpcErrorResponse(requestContext.getRequest().getId(), INTERNAL_ERROR));
+              } catch (final Exception e) {
+                return Optional.of(
+                    new JsonRpcErrorResponse(requestContext.getRequest().getId(), INTERNAL_ERROR));
+              }
+              return Optional.of(traceCallResults);
+            });
+  }
+
+  private JsonNode getSingleCallResult(
+      final JsonCallParameter callParameter,
+      final TraceTypeParameter traceTypeParameter,
+      final BlockHeader header,
+      final WorldUpdater worldUpdater) {
+    final Set<TraceTypeParameter.TraceType> traceTypes = traceTypeParameter.getTraceTypes();
+    final DebugOperationTracer tracer = new DebugOperationTracer(buildTraceOptions(traceTypes));
+    final Optional<TransactionSimulatorResult> maybeSimulatorResult =
+        transactionSimulator.processWithWorldUpdater(
+            callParameter, buildTransactionValidationParams(), tracer, header, worldUpdater);
+
+    LOG.trace("Executing {} call for transaction {}", traceTypeParameter, callParameter);
+    if (maybeSimulatorResult.isEmpty()) {
+      throw new EmptySimulatorResultException();
+    }
+    final TransactionSimulatorResult simulatorResult = maybeSimulatorResult.get();
+    if (simulatorResult.isInvalid()) {
+      throw new TransactionInvalidException();
+    }
+
+    final TransactionTrace transactionTrace =
+        new TransactionTrace(
+            simulatorResult.getTransaction(), simulatorResult.getResult(), tracer.getTraceFrames());
+
+    final Block block = blockchainQueriesSupplier.get().getBlockchain().getChainHeadBlock();
+
+    return getTraceCallResult(
+        protocolSchedule, traceTypes, maybeSimulatorResult.get(), transactionTrace, block);
+  }
+
+  private static class TransactionInvalidException extends RuntimeException {
+    TransactionInvalidException() {
+      super();
+    }
+  }
+
+  private static class EmptySimulatorResultException extends RuntimeException {
+    EmptySimulatorResultException() {
+      super();
+    }
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceFilter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceFilter.java
new file mode 100644
index 00000000000..8c94f785065
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceFilter.java
@@ -0,0 +1,259 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import static org.hyperledger.besu.services.pipeline.PipelineBuilder.createPipelineFrom;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.FilterParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.Tracer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.flat.FlatTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.flat.RewardTraceGenerator;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.api.util.ArrayNodeWrapper;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.debug.TraceOptions;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.vm.DebugOperationTracer;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.metrics.prometheus.PrometheusMetricsSystem;
+import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
+import org.hyperledger.besu.services.pipeline.Pipeline;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.tuweni.bytes.Bytes32;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TraceFilter extends TraceBlock {
+
+  private static final Logger LOG = LoggerFactory.getLogger(TraceFilter.class);
+
+  public TraceFilter(
+      final Supplier<BlockTracer> blockTracerSupplier,
+      final ProtocolSchedule protocolSchedule,
+      final BlockchainQueries blockchainQueries) {
+    super(protocolSchedule, blockchainQueries);
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.TRACE_FILTER.getMethodName();
+  }
+
+  @Override
+  public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
+    final FilterParameter filterParameter =
+        requestContext.getRequiredParameter(0, FilterParameter.class);
+
+    final long fromBlock = resolveBlockNumber(filterParameter.getFromBlock());
+    final long toBlock = resolveBlockNumber(filterParameter.getToBlock());
+    LOG.trace("Received RPC rpcName={} fromBlock={} toBlock={}", getName(), fromBlock, toBlock);
+
+    final ObjectMapper mapper = new ObjectMapper();
+    final ArrayNodeWrapper resultArrayNode =
+        new ArrayNodeWrapper(
+            mapper.createArrayNode(), filterParameter.getAfter(), filterParameter.getCount());
+    if (fromBlock > toBlock)
+      return new JsonRpcSuccessResponse(
+          requestContext.getRequest().getId(), resultArrayNode.getArrayNode());
+    else
+      return traceFilterWithPipeline(
+          requestContext, filterParameter, fromBlock, toBlock, resultArrayNode);
+  }
+
+  private JsonRpcResponse traceFilterWithPipeline(
+      final JsonRpcRequestContext requestContext,
+      final FilterParameter filterParameter,
+      final long fromBlock,
+      final long toBlock,
+      final ArrayNodeWrapper resultArrayNode) {
+
+    long currentBlockNumber = fromBlock;
+    Optional<Block> block =
+        blockchainQueriesSupplier.get().getBlockchain().getBlockByNumber(currentBlockNumber);
+    while ((block.isEmpty() || block.get().getHeader().getParentHash().equals(Bytes32.ZERO))
+        && currentBlockNumber < toBlock) {
+      currentBlockNumber++;
+      block = blockchainQueriesSupplier.get().getBlockchain().getBlockByNumber(currentBlockNumber);
+    }
+    if (block.isEmpty()) {
+      return new JsonRpcSuccessResponse(
+          requestContext.getRequest().getId(), resultArrayNode.getArrayNode());
+    }
+    final BlockHeader header = block.get().getHeader();
+
+    List<Block> blockList = getBlockList(currentBlockNumber, toBlock, block);
+
+    ArrayNodeWrapper result =
+        Tracer.processTracing(
+                getBlockchainQueries(),
+                Optional.of(header),
+                traceableState -> {
+                  TraceFilterSource traceFilterSource =
+                      new TraceFilterSource(blockList, resultArrayNode);
+                  final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(header);
+                  final MainnetTransactionProcessor transactionProcessor =
+                      protocolSpec.getTransactionProcessor();
+                  final ChainUpdater chainUpdater = new ChainUpdater(traceableState);
+                  final LabelledMetric<Counter> outputCounter =
+                      new PrometheusMetricsSystem(
+                              BesuMetricCategory.DEFAULT_METRIC_CATEGORIES, false)
+                          .createLabelledCounter(
+                              BesuMetricCategory.BLOCKCHAIN,
+                              "transactions_tracefilter_pipeline_processed_total",
+                              "Number of transactions processed for trace_filter",
+                              "step",
+                              "action");
+
+                  DebugOperationTracer debugOperationTracer =
+                      new DebugOperationTracer(new TraceOptions(false, false, true));
+                  ExecuteTransactionStep executeTransactionStep =
+                      new ExecuteTransactionStep(
+                          chainUpdater,
+                          transactionProcessor,
+                          getBlockchainQueries().getBlockchain(),
+                          debugOperationTracer,
+                          protocolSpec);
+
+                  Function<TransactionTrace, CompletableFuture<Stream<FlatTrace>>>
+                      traceFlatTransactionStep =
+                          new TraceFlatTransactionStep(
+                              protocolSchedule, null, Optional.of(filterParameter));
+
+                  BuildArrayNodeCompleterStep buildArrayNodeStep =
+                      new BuildArrayNodeCompleterStep(resultArrayNode);
+                  Pipeline<TransactionTrace> traceBlockPipeline =
+                      createPipelineFrom(
+                              "getTransactions",
+                              traceFilterSource,
+                              4,
+                              outputCounter,
+                              false,
+                              "trace_block_transactions")
+                          .thenProcess("executeTransaction", executeTransactionStep)
+                          .thenProcessAsyncOrdered(
+                              "traceFlatTransaction", traceFlatTransactionStep, 4)
+                          .andFinishWith(
+                              "buildArrayNode",
+                              traceStream -> traceStream.forEachOrdered(buildArrayNodeStep));
+
+                  try {
+                    Optional<EthScheduler> ethSchedulerOpt =
+                        getBlockchainQueries().getEthScheduler();
+
+                    ethSchedulerOpt
+                        .orElse(new EthScheduler(1, 1, 1, 1, new NoOpMetricsSystem()))
+                        .startPipeline(traceBlockPipeline)
+                        .get();
+
+                  } catch (InterruptedException | ExecutionException e) {
+                    throw new RuntimeException(e);
+                  }
+                  return Optional.of(resultArrayNode);
+                })
+            .orElse(emptyResult());
+
+    return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), result.getArrayNode());
+  }
+
+  @NotNull
+  private List<Block> getBlockList(
+      final long fromBlock, final long toBlock, final Optional<Block> block) {
+    List<Block> blockList = new ArrayList<>();
+    Block currentBlock = block.get();
+    blockList.add(currentBlock);
+    long index = fromBlock + 1; // We already stored current Block
+    while (index <= toBlock) {
+      Optional<Block> blockByNumber =
+          blockchainQueriesSupplier.get().getBlockchain().getBlockByNumber(index);
+      blockByNumber.ifPresent(blockList::add);
+      index++;
+    }
+    return blockList;
+  }
+
+  public Map<Transaction, Block> createTransactionBlockMap(final List<Block> blockList) {
+    Map<Transaction, Block> transactionBlockMap = new HashMap<>();
+    for (Block block : blockList) {
+      List<Transaction> transactionList = block.getBody().getTransactions();
+      for (Transaction transaction : transactionList) {
+        transactionBlockMap.put(transaction, block);
+      }
+    }
+    return transactionBlockMap;
+  }
+
+  @Override
+  protected void generateRewardsFromBlock(
+      final Optional<FilterParameter> maybeFilterParameter,
+      final Block block,
+      final ArrayNodeWrapper resultArrayNode) {
+    maybeFilterParameter.ifPresent(
+        filterParameter -> {
+          final List<Address> fromAddress = filterParameter.getFromAddress();
+          if (fromAddress.isEmpty()) {
+            final List<Address> toAddress = filterParameter.getToAddress();
+            RewardTraceGenerator.generateFromBlock(protocolSchedule, block)
+                .map(FlatTrace.class::cast)
+                .filter(trace -> trace.getBlockNumber() != 0)
+                .filter(
+                    trace ->
+                        toAddress.isEmpty()
+                            || Optional.ofNullable(trace.getAction().getAuthor())
+                                .map(Address::fromHexString)
+                                .map(toAddress::contains)
+                                .orElse(false))
+                .forEachOrdered(resultArrayNode::addPOJO);
+          }
+        });
+  }
+
+  private long resolveBlockNumber(final BlockParameter param) {
+    if (param.getNumber().isPresent()) {
+      return param.getNumber().get();
+    } else if (param.isLatest()) {
+      return blockchainQueriesSupplier.get().headBlockNumber();
+    } else {
+      throw new IllegalStateException("Unknown block parameter type.");
+    }
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceFilterSource.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceFilterSource.java
new file mode 100644
index 00000000000..faee7dce962
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceFilterSource.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
+import org.hyperledger.besu.ethereum.api.util.ArrayNodeWrapper;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.Transaction;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
+
+public class TraceFilterSource implements Iterator<TransactionTrace> {
+
+  private final ArrayNodeWrapper resultArrayNode;
+  private final Iterator<Block> blockIterator;
+  private Iterator<TransactionTrace> transactionTraceIterator;
+  private Block currentBlock;
+
+  public TraceFilterSource(final List<Block> blockList, final ArrayNodeWrapper resultArrayNode) {
+    this.resultArrayNode = resultArrayNode;
+    this.blockIterator = blockList.iterator();
+    this.transactionTraceIterator = getNextTransactionIterator();
+  }
+
+  private Iterator<TransactionTrace> getNextTransactionIterator() {
+    if (!blockIterator.hasNext()) {
+      return null;
+    }
+
+    currentBlock = blockIterator.next();
+    List<Transaction> transactions = currentBlock.getBody().getTransactions();
+    List<TransactionTrace> transactionTraces = new ArrayList<>(transactions.size() + 1);
+
+    for (Transaction transaction : transactions) {
+      transactionTraces.add(new TransactionTrace(transaction, Optional.of(currentBlock)));
+    }
+
+    transactionTraces.add(new TransactionTrace(Optional.of(currentBlock)));
+    return transactionTraces.iterator();
+  }
+
+  @Override
+  public boolean hasNext() {
+    if (resultArrayNode.isFull()) return false;
+    if (transactionTraceIterator == null) {
+      return false;
+    }
+    if (transactionTraceIterator.hasNext()) {
+      return true;
+    }
+    transactionTraceIterator = getNextTransactionIterator();
+    return hasNext();
+  }
+
+  @Override
+  public TransactionTrace next() {
+    if (transactionTraceIterator == null) {
+      return null;
+    }
+    if (transactionTraceIterator.hasNext()) {
+      return transactionTraceIterator.next();
+    }
+    transactionTraceIterator = getNextTransactionIterator();
+    return next();
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceFlatTransactionStep.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceFlatTransactionStep.java
new file mode 100644
index 00000000000..5ec0bb3a4d1
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceFlatTransactionStep.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.FilterParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.Trace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.flat.FlatTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.flat.FlatTraceGenerator;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.flat.RewardTraceGenerator;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+public class TraceFlatTransactionStep
+    implements Function<TransactionTrace, CompletableFuture<Stream<FlatTrace>>> {
+
+  private final ProtocolSchedule protocolSchedule;
+  private final Block block;
+  private final Optional<FilterParameter> filterParameter;
+
+  public TraceFlatTransactionStep(
+      final ProtocolSchedule protocolSchedule,
+      final Block block,
+      final Optional<FilterParameter> filterParameter) {
+    this.protocolSchedule = protocolSchedule;
+    this.block = block;
+    this.filterParameter = filterParameter;
+  }
+
+  @Override
+  public CompletableFuture<Stream<FlatTrace>> apply(final TransactionTrace transactionTrace) {
+    Stream<Trace> traceStream = null;
+    Block block = this.block;
+    if (block == null) block = transactionTrace.getBlock().get();
+    if (transactionTrace.getTransaction() == null) {
+      traceStream = RewardTraceGenerator.generateFromBlock(protocolSchedule, block);
+    } else {
+      traceStream =
+          FlatTraceGenerator.generateFromTransactionTraceAndBlock(
+              protocolSchedule, transactionTrace, block);
+    }
+    if (filterParameter.isPresent()) {
+      final List<Address> fromAddress = filterParameter.get().getFromAddress();
+      final List<Address> toAddress = filterParameter.get().getToAddress();
+      return CompletableFuture.completedFuture(
+          traceStream
+              .map(FlatTrace.class::cast)
+              .filter(
+                  trace ->
+                      fromAddress.isEmpty()
+                          || Optional.ofNullable(trace.getAction().getFrom())
+                              .map(Address::fromHexString)
+                              .map(fromAddress::contains)
+                              .orElse(false))
+              .filter(
+                  trace ->
+                      toAddress.isEmpty()
+                          || Optional.ofNullable(trace.getAction().getTo())
+                              .map(Address::fromHexString)
+                              .map(toAddress::contains)
+                              .orElse(false)));
+
+    } else {
+      return CompletableFuture.completedFuture(traceStream.map(FlatTrace.class::cast));
+    }
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceGet.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceGet.java
new file mode 100644
index 00000000000..62f8ed55685
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceGet.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+
+import java.util.List;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TraceGet extends AbstractTraceByHash implements JsonRpcMethod {
+  private static final Logger LOG = LoggerFactory.getLogger(TraceGet.class);
+
+  public TraceGet(
+      final Supplier<BlockTracer> blockTracerSupplier,
+      final BlockchainQueries blockchainQueries,
+      final ProtocolSchedule protocolSchedule) {
+    super(blockTracerSupplier, blockchainQueries, protocolSchedule);
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.TRACE_GET.getMethodName();
+  }
+
+  @Override
+  public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
+    if (requestContext.getRequest().getParamLength() != 2) {
+      return new JsonRpcErrorResponse(
+          requestContext.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
+    }
+
+    final Hash transactionHash = requestContext.getRequiredParameter(0, Hash.class);
+    final List<?> traceNumbersAsStrings = requestContext.getRequiredParameter(1, List.class);
+    final List<Integer> traceAddress =
+        traceNumbersAsStrings.stream()
+            .map(t -> Integer.parseInt(((String) t).substring(2), 16))
+            .collect(Collectors.toList());
+
+    LOG.trace(
+        "Received RPC rpcName={} txHash={} traceAddress={}",
+        getName(),
+        transactionHash,
+        traceAddress);
+
+    return new JsonRpcSuccessResponse(
+        requestContext.getRequest().getId(),
+        resultByTransactionHash(transactionHash)
+            .filter(trace -> trace.getTraceAddress().equals(traceAddress))
+            .findFirst()
+            .orElse(null));
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceRawTransaction.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceRawTransaction.java
new file mode 100644
index 00000000000..db06b293c5e
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceRawTransaction.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.INTERNAL_ERROR;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TraceTypeParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.api.util.DomainObjectDecodeUtils;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.rlp.RLPException;
+import org.hyperledger.besu.ethereum.transaction.CallParameter;
+import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
+import org.hyperledger.besu.ethereum.vm.DebugOperationTracer;
+
+import java.util.Optional;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TraceRawTransaction extends AbstractTraceByBlock implements JsonRpcMethod {
+  private static final Logger LOG = LoggerFactory.getLogger(TraceRawTransaction.class);
+
+  public TraceRawTransaction(
+      final ProtocolSchedule protocolSchedule,
+      final BlockchainQueries blockchainQueries,
+      final TransactionSimulator transactionSimulator) {
+    super(blockchainQueries, protocolSchedule, transactionSimulator);
+  }
+
+  @Override
+  public String getName() {
+    return transactionSimulator != null ? RpcMethod.TRACE_RAW_TRANSACTION.getMethodName() : null;
+  }
+
+  @Override
+  protected Object resultByBlockNumber(
+      final JsonRpcRequestContext request, final long blockNumber) {
+    // this method does not get called because response() does the work
+    return null;
+  }
+
+  @Override
+  public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
+    if (requestContext.getRequest().getParamLength() != 2) {
+      return new JsonRpcErrorResponse(
+          requestContext.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
+    }
+
+    final var rawTransaction = requestContext.getRequiredParameter(0, String.class);
+    final TraceTypeParameter traceTypeParameter =
+        requestContext.getRequiredParameter(1, TraceTypeParameter.class);
+    LOG.trace(
+        "Received RPC rpcName={} rawTx={} traceType={}",
+        getName(),
+        rawTransaction,
+        traceTypeParameter);
+
+    final Transaction transaction;
+    try {
+      transaction = DomainObjectDecodeUtils.decodeRawTransaction(rawTransaction);
+      LOG.trace("rawTx decoded to transaction {}", transaction);
+    } catch (final RLPException | IllegalArgumentException e) {
+      return new JsonRpcErrorResponse(
+          requestContext.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
+    }
+
+    final Set<TraceTypeParameter.TraceType> traceTypes = traceTypeParameter.getTraceTypes();
+    final DebugOperationTracer tracer = new DebugOperationTracer(buildTraceOptions(traceTypes));
+    final BlockHeader headBlock = blockchainQueriesSupplier.get().headBlockHeader();
+    return transactionSimulator
+        .process(
+            CallParameter.fromTransaction(transaction),
+            buildTransactionValidationParams(),
+            tracer,
+            (mutableWorldState, transactionSimulatorResult) ->
+                transactionSimulatorResult.map(
+                    result -> {
+                      final TransactionTrace transactionTrace =
+                          new TransactionTrace(
+                              result.getTransaction(), result.getResult(), tracer.getTraceFrames());
+                      final Optional<Block> maybeBlock =
+                          blockchainQueriesSupplier
+                              .get()
+                              .getBlockchain()
+                              .getBlockByNumber(headBlock.getNumber());
+
+                      if (maybeBlock.isEmpty()) {
+                        return new JsonRpcErrorResponse(
+                            requestContext.getRequest().getId(), INTERNAL_ERROR);
+                      }
+
+                      final Block block = maybeBlock.get();
+                      final Object response =
+                          getTraceCallResult(
+                              protocolSchedule, traceTypes, result, transactionTrace, block);
+
+                      return new JsonRpcSuccessResponse(
+                          requestContext.getRequest().getId(), response);
+                    }),
+            headBlock)
+        .orElse(new JsonRpcErrorResponse(requestContext.getRequest().getId(), INTERNAL_ERROR));
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceReplayBlockTransactions.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceReplayBlockTransactions.java
index bdba0695cf1..f14b88932fc 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceReplayBlockTransactions.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceReplayBlockTransactions.java
@@ -14,55 +14,52 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
-import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TraceTypeParameter.TraceType.TRACE;
-import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TraceTypeParameter.TraceType.VM_TRACE;
+import static org.hyperledger.besu.services.pipeline.PipelineBuilder.createPipelineFrom;
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.TraceBlock.ChainUpdater;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TraceTypeParameter;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TraceTypeParameter.TraceType;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTrace;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.Tracer;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.TraceFormatter;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.TraceWriter;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.diff.StateDiffGenerator;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.flat.FlatTraceGenerator;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.vm.VmTraceGenerator;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TraceReplayResult;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.api.util.ArrayNodeWrapper;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.debug.TraceOptions;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 import org.hyperledger.besu.ethereum.vm.DebugOperationTracer;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.metrics.prometheus.PrometheusMetricsSystem;
+import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
+import org.hyperledger.besu.services.pipeline.Pipeline;
 
-import java.util.Arrays;
-import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Supplier;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Function;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.base.Suppliers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TraceReplayBlockTransactions extends AbstractBlockParameterMethod {
-  private final Supplier<BlockTracer> blockTracerSupplier;
-  private final Supplier<StateDiffGenerator> stateDiffGenerator =
-      Suppliers.memoize(StateDiffGenerator::new);
+  private static final Logger LOG = LoggerFactory.getLogger(TraceReplayBlockTransactions.class);
   private final ProtocolSchedule protocolSchedule;
+  private static final ObjectMapper MAPPER = new ObjectMapper();
 
   public TraceReplayBlockTransactions(
-      final Supplier<BlockTracer> blockTracerSupplier,
-      final ProtocolSchedule protocolSchedule,
-      final BlockchainQueries queries) {
+      final ProtocolSchedule protocolSchedule, final BlockchainQueries queries) {
     super(queries);
-    this.blockTracerSupplier = blockTracerSupplier;
     this.protocolSchedule = protocolSchedule;
   }
 
@@ -77,11 +74,17 @@ protected BlockParameter blockParameter(final JsonRpcRequestContext request) {
   }
 
   @Override
-  protected Object resultByBlockNumber(
+  protected ArrayNode resultByBlockNumber(
       final JsonRpcRequestContext request, final long blockNumber) {
     final TraceTypeParameter traceTypeParameter =
         request.getRequiredParameter(1, TraceTypeParameter.class);
 
+    LOG.trace(
+        "Received RPC rpcName={} block={} traceType={}",
+        getName(),
+        blockNumber,
+        traceTypeParameter);
+
     if (blockNumber == BlockHeader.GENESIS_BLOCK_NUMBER) {
       // Nothing to trace for the genesis block
       return emptyResult();
@@ -94,116 +97,86 @@ protected Object resultByBlockNumber(
         .orElse(null);
   }
 
-  private Object traceBlock(final Block block, final TraceTypeParameter traceTypeParameter) {
+  private ArrayNode traceBlock(final Block block, final TraceTypeParameter traceTypeParameter) {
 
-    if (block == null || block.getBody().getTransactions().isEmpty()) {
+    if (block == null) {
       return emptyResult();
     }
 
     final Set<TraceTypeParameter.TraceType> traceTypes = traceTypeParameter.getTraceTypes();
-    final TraceOptions traceOptions =
-        new TraceOptions(false, false, traceTypes.contains(VM_TRACE) || traceTypes.contains(TRACE));
-
-    return blockTracerSupplier
-        .get()
-        .trace(block, new DebugOperationTracer(traceOptions))
-        .map(BlockTrace::getTransactionTraces)
-        .map((traces) -> generateTracesFromTransactionTrace(traces, block, traceTypes))
-        .orElse(null);
-  }
-
-  private JsonNode generateTracesFromTransactionTrace(
-      final List<TransactionTrace> transactionTraces,
-      final Block block,
-      final Set<TraceTypeParameter.TraceType> traceTypes) {
-    final ObjectMapper mapper = new ObjectMapper();
-    final ArrayNode resultArrayNode = mapper.createArrayNode();
-    final AtomicInteger traceCounter = new AtomicInteger(0);
-    transactionTraces.forEach(
-        transactionTrace ->
-            handleTransactionTrace(
-                transactionTrace, block, traceTypes, mapper, resultArrayNode, traceCounter));
-    return resultArrayNode;
-  }
-
-  private void handleTransactionTrace(
-      final TransactionTrace transactionTrace,
-      final Block block,
-      final Set<TraceTypeParameter.TraceType> traceTypes,
-      final ObjectMapper mapper,
-      final ArrayNode resultArrayNode,
-      final AtomicInteger traceCounter) {
-    final ObjectNode resultNode = mapper.createObjectNode();
-
-    TransactionProcessingResult result = transactionTrace.getResult();
-    resultNode.put("output", result.getRevertReason().orElse(result.getOutput()).toString());
-
-    if (traceTypes.contains(TraceType.STATE_DIFF)) {
-      generateTracesFromTransactionTrace(
-          trace -> resultNode.putPOJO("stateDiff", trace),
-          protocolSchedule,
-          transactionTrace,
-          block,
-          (__, txTrace, currentBlock, ignored) ->
-              stateDiffGenerator.get().generateStateDiff(txTrace),
-          traceCounter);
-    }
-    setNullNodesIfNotPresent(resultNode, "stateDiff");
-    if (traceTypes.contains(TraceTypeParameter.TraceType.TRACE)) {
-      generateTracesFromTransactionTrace(
-          resultNode.putArray("trace")::addPOJO,
-          protocolSchedule,
-          transactionTrace,
-          block,
-          FlatTraceGenerator::generateFromTransactionTrace,
-          traceCounter);
-    }
-    setEmptyArrayIfNotPresent(resultNode, "trace");
-    resultNode.put("transactionHash", transactionTrace.getTransaction().getHash().toHexString());
-    if (traceTypes.contains(VM_TRACE)) {
-      generateTracesFromTransactionTrace(
-          trace -> resultNode.putPOJO("vmTrace", trace),
-          protocolSchedule,
-          transactionTrace,
-          block,
-          (protocolSchedule, txTrace, currentBlock, ignored) ->
-              new VmTraceGenerator(transactionTrace).generateTraceStream(),
-          traceCounter);
-    }
-    setNullNodesIfNotPresent(resultNode, "vmTrace");
-    resultArrayNode.add(resultNode);
-  }
-
-  private void generateTracesFromTransactionTrace(
-      final TraceWriter writer,
-      final ProtocolSchedule protocolSchedule,
-      final TransactionTrace transactionTrace,
-      final Block block,
-      final TraceFormatter formatter,
-      final AtomicInteger traceCounter) {
-    formatter
-        .format(protocolSchedule, transactionTrace, block, traceCounter)
-        .forEachOrdered(writer::write);
-  }
-
-  private void setNullNodesIfNotPresent(final ObjectNode parentNode, final String... keys) {
-    Arrays.asList(keys)
-        .forEach(
-            key ->
-                Optional.ofNullable(parentNode.get(key))
-                    .ifPresentOrElse(ignored -> {}, () -> parentNode.put(key, (String) null)));
-  }
 
-  private void setEmptyArrayIfNotPresent(final ObjectNode parentNode, final String... keys) {
-    Arrays.asList(keys)
-        .forEach(
-            key ->
-                Optional.ofNullable(parentNode.get(key))
-                    .ifPresentOrElse(ignored -> {}, () -> parentNode.putArray(key)));
+    final BlockHeader header = block.getHeader();
+    return Tracer.processTracing(
+            getBlockchainQueries(),
+            Optional.of(header),
+            traceableState -> {
+              ArrayNodeWrapper resultArrayNode = new ArrayNodeWrapper(MAPPER.createArrayNode());
+
+              final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(header);
+              final MainnetTransactionProcessor transactionProcessor =
+                  protocolSpec.getTransactionProcessor();
+              final ChainUpdater chainUpdater = new ChainUpdater(traceableState);
+
+              final TransactionSource transactionSource = new TransactionSource(block);
+              final LabelledMetric<Counter> outputCounter =
+                  new PrometheusMetricsSystem(BesuMetricCategory.DEFAULT_METRIC_CATEGORIES, false)
+                      .createLabelledCounter(
+                          BesuMetricCategory.BLOCKCHAIN,
+                          "transactions_tracereplayblock_pipeline_processed_total",
+                          "Number of transactions processed for each block",
+                          "step",
+                          "action");
+              final DebugOperationTracer debugOperationTracer =
+                  new DebugOperationTracer(new TraceOptions(false, false, true));
+              final ExecuteTransactionStep executeTransactionStep =
+                  new ExecuteTransactionStep(
+                      chainUpdater,
+                      transactionProcessor,
+                      getBlockchainQueries().getBlockchain(),
+                      debugOperationTracer,
+                      protocolSpec,
+                      block);
+
+              final Function<TransactionTrace, CompletableFuture<TraceReplayResult>>
+                  traceReplayTransactionStep =
+                      new TraceReplayTransactionStep(protocolSchedule, block, traceTypes);
+
+              final BuildArrayNodeCompleterStep buildArrayNodeStep =
+                  new BuildArrayNodeCompleterStep(resultArrayNode);
+
+              final Pipeline<TransactionTrace> traceBlockPipeline =
+                  createPipelineFrom(
+                          "getTransactions",
+                          transactionSource,
+                          4,
+                          outputCounter,
+                          false,
+                          "trace_replay_block_transactions")
+                      .thenProcess("executeTransaction", executeTransactionStep)
+                      .thenProcessAsyncOrdered(
+                          "traceReplayTransaction", traceReplayTransactionStep, 4)
+                      .andFinishWith("buildArrayNode", buildArrayNodeStep::accept);
+              try {
+                if (getBlockchainQueries().getEthScheduler().isPresent()) {
+                  getBlockchainQueries()
+                      .getEthScheduler()
+                      .get()
+                      .startPipeline(traceBlockPipeline)
+                      .get();
+                } else {
+                  EthScheduler ethScheduler = new EthScheduler(1, 1, 1, 1, new NoOpMetricsSystem());
+                  ethScheduler.startPipeline(traceBlockPipeline).get();
+                }
+              } catch (final InterruptedException | ExecutionException e) {
+                throw new RuntimeException(e);
+              }
+              resultArrayNode = buildArrayNodeStep.getResultArrayNode();
+              return Optional.of(resultArrayNode.getArrayNode());
+            })
+        .orElse(emptyResult());
   }
 
-  private Object emptyResult() {
-    final ObjectMapper mapper = new ObjectMapper();
-    return mapper.createArrayNode();
+  private ArrayNode emptyResult() {
+    return MAPPER.createArrayNode();
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceReplayTransactionStep.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceReplayTransactionStep.java
new file mode 100644
index 00000000000..651e0b4798e
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceReplayTransactionStep.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TraceTypeParameter.TraceType;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TraceReplayResult;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.diff.StateDiffGenerator;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.diff.StateDiffTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.flat.FlatTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.flat.FlatTraceGenerator;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.vm.VmTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.vm.VmTraceGenerator;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
+
+public class TraceReplayTransactionStep
+    implements Function<TransactionTrace, CompletableFuture<TraceReplayResult>> {
+
+  private final ProtocolSchedule protocolSchedule;
+  private final Block block;
+  private final Set<TraceType> traceTypes;
+
+  public TraceReplayTransactionStep(
+      final ProtocolSchedule protocolSchedule, final Block block, final Set<TraceType> traceTypes) {
+    this.protocolSchedule = protocolSchedule;
+    this.block = block;
+    this.traceTypes = traceTypes;
+  }
+
+  @Override
+  public CompletableFuture<TraceReplayResult> apply(final TransactionTrace transactionTrace) {
+    final TraceReplayResult.Builder builder = TraceReplayResult.builder();
+    transactionTrace
+        .getResult()
+        .getRevertReason()
+        .ifPresent(revertReason -> builder.revertReason(revertReason.toHexString()));
+
+    builder.output(transactionTrace.getResult().getOutput().toString());
+    builder.transactionHash(transactionTrace.getTransaction().getHash().toHexString());
+
+    if (traceTypes.contains(TraceType.STATE_DIFF)) {
+      new StateDiffGenerator()
+          .generateStateDiff(transactionTrace)
+          .forEachOrdered(stateDiff -> builder.stateDiff((StateDiffTrace) stateDiff));
+    }
+
+    if (traceTypes.contains(TraceType.TRACE)) {
+      FlatTraceGenerator.generateFromTransactionTrace(
+              protocolSchedule, transactionTrace, block, new AtomicInteger())
+          .forEachOrdered(trace -> builder.addTrace((FlatTrace) trace));
+    }
+
+    if (traceTypes.contains(TraceType.VM_TRACE)) {
+      new VmTraceGenerator(transactionTrace)
+          .generateTraceStream()
+          .forEachOrdered(vmTrace -> builder.vmTrace((VmTrace) vmTrace));
+    }
+    return CompletableFuture.completedFuture(builder.build());
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceTransaction.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceTransaction.java
index 35dde21f646..55d1c0569d9 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceTransaction.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TraceTransaction.java
@@ -14,42 +14,28 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTrace;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.flat.FlatTraceGenerator;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
-import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.debug.TraceOptions;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.ethereum.vm.DebugOperationTracer;
 
-import java.util.Collections;
 import java.util.function.Supplier;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class TraceTransaction implements JsonRpcMethod {
-  private final Supplier<BlockTracer> blockTracerSupplier;
-
-  private final BlockchainQueries blockchainQueries;
-  private final ProtocolSchedule protocolSchedule;
+public class TraceTransaction extends AbstractTraceByHash implements JsonRpcMethod {
+  private static final Logger LOG = LoggerFactory.getLogger(TraceTransaction.class);
 
   public TraceTransaction(
       final Supplier<BlockTracer> blockTracerSupplier,
       final ProtocolSchedule protocolSchedule,
       final BlockchainQueries blockchainQueries) {
-    this.blockTracerSupplier = blockTracerSupplier;
-    this.blockchainQueries = blockchainQueries;
-    this.protocolSchedule = protocolSchedule;
+    super(blockTracerSupplier, blockchainQueries, protocolSchedule);
   }
 
   @Override
@@ -60,50 +46,10 @@ public String getName() {
   @Override
   public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     final Hash transactionHash = requestContext.getRequiredParameter(0, Hash.class);
-    return new JsonRpcSuccessResponse(
-        requestContext.getRequest().getId(), resultByTransactionHash(transactionHash));
-  }
-
-  private Object resultByTransactionHash(final Hash transactionHash) {
-    return blockchainQueries
-        .transactionByHash(transactionHash)
-        .flatMap(TransactionWithMetadata::getBlockNumber)
-        .flatMap(blockNumber -> blockchainQueries.getBlockchain().getBlockByNumber(blockNumber))
-        .map((block) -> traceBlock(block, transactionHash))
-        .orElse(emptyResult());
-  }
-
-  private Object traceBlock(final Block block, final Hash transactionHash) {
-    if (block == null || block.getBody().getTransactions().isEmpty()) {
-      return emptyResult();
-    }
-    final TransactionTrace transactionTrace =
-        blockTracerSupplier.get()
-            .trace(block, new DebugOperationTracer(new TraceOptions(false, false, true)))
-            .map(BlockTrace::getTransactionTraces).orElse(Collections.emptyList()).stream()
-            .filter(trxTrace -> trxTrace.getTransaction().getHash().equals(transactionHash))
-            .findFirst()
-            .orElseThrow();
-    return generateTracesFromTransactionTraceAndBlock(protocolSchedule, transactionTrace, block);
-  }
+    LOG.trace("Received RPC rpcName={} txHash={}", getName(), transactionHash);
 
-  private JsonNode generateTracesFromTransactionTraceAndBlock(
-      final ProtocolSchedule protocolSchedule,
-      final TransactionTrace transactionTrace,
-      final Block block) {
-    final ObjectMapper mapper = new ObjectMapper();
-
-    final ArrayNode resultArrayNode = mapper.createArrayNode();
-
-    FlatTraceGenerator.generateFromTransactionTraceAndBlock(
-            protocolSchedule, transactionTrace, block)
-        .forEachOrdered(resultArrayNode::addPOJO);
-
-    return resultArrayNode;
-  }
-
-  private Object emptyResult() {
-    final ObjectMapper mapper = new ObjectMapper();
-    return mapper.createArrayNode();
+    return new JsonRpcSuccessResponse(
+        requestContext.getRequest().getId(),
+        arrayNodeFromTraceStream(resultByTransactionHash(transactionHash)));
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TransactionSource.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TransactionSource.java
new file mode 100644
index 00000000000..8d2975e06a1
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TransactionSource.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.Transaction;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class TransactionSource implements Iterator<TransactionTrace> {
+
+  private final List<Transaction> transactions;
+  private final AtomicInteger currentIndex = new AtomicInteger(0);
+  private final Block block;
+
+  public TransactionSource(final Block block) {
+    this.block = block;
+    this.transactions = block.getBody().getTransactions();
+  }
+
+  @Override
+  public boolean hasNext() {
+    return currentIndex.get() < (transactions.size());
+  }
+
+  @Override
+  public TransactionTrace next() {
+    return new TransactionTrace(
+        transactions.get(currentIndex.getAndIncrement()), Optional.of(block));
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuPendingTransactions.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuPendingTransactions.java
index e6defbd3139..d1cf49fd0d2 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuPendingTransactions.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuPendingTransactions.java
@@ -25,9 +25,9 @@
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 public class TxPoolBesuPendingTransactions implements JsonRpcMethod {
@@ -56,8 +56,9 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
             .map(PendingTransactionsParams::filters)
             .orElse(Collections.emptyList());
 
-    final Set<Transaction> pendingTransactionsFiltered =
-        pendingTransactionFilter.reduce(pendingTransactions.getTransactionInfo(), filters, limit);
+    final Collection<Transaction> pendingTransactionsFiltered =
+        pendingTransactionFilter.reduce(
+            pendingTransactions.getPendingTransactions(), filters, limit);
 
     return new JsonRpcSuccessResponse(
         requestContext.getRequest().getId(),
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuStatistics.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuStatistics.java
index d52d444210a..1950d771ce2 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuStatistics.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuStatistics.java
@@ -19,10 +19,10 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.PendingTransactionsStatisticsResult;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionInfo;
 
-import java.util.Set;
+import java.util.Collection;
 
 public class TxPoolBesuStatistics implements JsonRpcMethod {
 
@@ -43,10 +43,11 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
   }
 
   private PendingTransactionsStatisticsResult statistics() {
-    final Set<TransactionInfo> transactionInfo = pendingTransactions.getTransactionInfo();
+    final Collection<PendingTransaction> pendingTransaction =
+        pendingTransactions.getPendingTransactions();
     final long localCount =
-        transactionInfo.stream().filter(TransactionInfo::isReceivedFromLocalSource).count();
-    final long remoteCount = transactionInfo.size() - localCount;
+        pendingTransaction.stream().filter(PendingTransaction::isReceivedFromLocalSource).count();
+    final long remoteCount = pendingTransaction.size() - localCount;
     return new PendingTransactionsStatisticsResult(
         pendingTransactions.maxSize(), localCount, remoteCount);
   }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuTransactions.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuTransactions.java
index 378c81decb8..346241635f8 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuTransactions.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuTransactions.java
@@ -39,7 +39,7 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     final JsonRpcSuccessResponse jsonRpcSuccessResponse =
         new JsonRpcSuccessResponse(
             requestContext.getRequest().getId(),
-            new PendingTransactionsResult(pendingTransactions.getTransactionInfo()));
+            new PendingTransactionsResult(pendingTransactions.getPendingTransactions()));
     return jsonRpcSuccessResponse;
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdated.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdated.java
new file mode 100644
index 00000000000..a856e7b1874
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdated.java
@@ -0,0 +1,357 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import static java.util.stream.Collectors.toList;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.INVALID;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.SYNCING;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.VALID;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.WithdrawalsValidatorProvider.getWithdrawalsValidator;
+
+import org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator;
+import org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator.ForkchoiceResult;
+import org.hyperledger.besu.consensus.merge.blockcreation.PayloadIdentifier;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.EngineForkchoiceUpdatedParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.EnginePayloadAttributesParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.WithdrawalParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.EngineUpdateForkchoiceResult;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+
+import io.vertx.core.Vertx;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public abstract class AbstractEngineForkchoiceUpdated extends ExecutionEngineJsonRpcMethod {
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractEngineForkchoiceUpdated.class);
+  private final ProtocolSchedule protocolSchedule;
+  private final MergeMiningCoordinator mergeCoordinator;
+
+  public AbstractEngineForkchoiceUpdated(
+      final Vertx vertx,
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final MergeMiningCoordinator mergeCoordinator,
+      final EngineCallListener engineCallListener) {
+    super(vertx, protocolContext, engineCallListener);
+    this.protocolSchedule = protocolSchedule;
+    this.mergeCoordinator = mergeCoordinator;
+  }
+
+  @Override
+  public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext) {
+    engineCallListener.executionEngineCalled();
+
+    final Object requestId = requestContext.getRequest().getId();
+
+    final EngineForkchoiceUpdatedParameter forkChoice =
+        requestContext.getRequiredParameter(0, EngineForkchoiceUpdatedParameter.class);
+    final Optional<EnginePayloadAttributesParameter> maybePayloadAttributes =
+        requestContext.getOptionalParameter(1, EnginePayloadAttributesParameter.class);
+
+    LOG.debug("Forkchoice parameters {}", forkChoice);
+
+    mergeContext
+        .get()
+        .fireNewUnverifiedForkchoiceEvent(
+            forkChoice.getHeadBlockHash(),
+            forkChoice.getSafeBlockHash(),
+            forkChoice.getFinalizedBlockHash());
+
+    if (mergeContext.get().isSyncing()) {
+      return syncingResponse(requestId, forkChoice);
+    }
+
+    if (mergeCoordinator.isBadBlock(forkChoice.getHeadBlockHash())) {
+      logForkchoiceUpdatedCall(INVALID, forkChoice);
+      return new JsonRpcSuccessResponse(
+          requestId,
+          new EngineUpdateForkchoiceResult(
+              INVALID,
+              mergeCoordinator
+                  .getLatestValidHashOfBadBlock(forkChoice.getHeadBlockHash())
+                  .orElse(Hash.ZERO),
+              null,
+              Optional.of(forkChoice.getHeadBlockHash() + " is an invalid block")));
+    }
+
+    final Optional<BlockHeader> maybeNewHead =
+        mergeCoordinator.getOrSyncHeadByHash(
+            forkChoice.getHeadBlockHash(), forkChoice.getFinalizedBlockHash());
+
+    if (maybeNewHead.isEmpty()) {
+      return syncingResponse(requestId, forkChoice);
+    }
+
+    final BlockHeader newHead = maybeNewHead.get();
+
+    if (!isValidForkchoiceState(
+        forkChoice.getSafeBlockHash(), forkChoice.getFinalizedBlockHash(), newHead)) {
+      logForkchoiceUpdatedCall(INVALID, forkChoice);
+      return new JsonRpcErrorResponse(requestId, JsonRpcError.INVALID_FORKCHOICE_STATE);
+    }
+
+    // TODO: post-merge cleanup, this should be unnecessary after merge
+    if (requireTerminalPoWBlockValidation()
+        && !mergeContext.get().isCheckpointPostMergeSync()
+        && !mergeContext.get().isPostMergeAtGenesis()
+        && !mergeCoordinator.latestValidAncestorDescendsFromTerminal(newHead)
+        && !mergeContext.get().isChainPruningEnabled()) {
+      logForkchoiceUpdatedCall(INVALID, forkChoice);
+      return new JsonRpcSuccessResponse(
+          requestId,
+          new EngineUpdateForkchoiceResult(
+              INVALID,
+              Hash.ZERO,
+              null,
+              Optional.of(newHead + " did not descend from terminal block")));
+    }
+
+    maybePayloadAttributes.ifPresentOrElse(
+        this::logPayload, () -> LOG.debug("Payload attributes are null"));
+
+    final Optional<List<Withdrawal>> withdrawals =
+        maybePayloadAttributes.flatMap(
+            payloadAttributes ->
+                Optional.ofNullable(payloadAttributes.getWithdrawals())
+                    .map(
+                        ws ->
+                            ws.stream().map(WithdrawalParameter::toWithdrawal).collect(toList())));
+
+    ForkchoiceResult result =
+        mergeCoordinator.updateForkChoice(
+            newHead, forkChoice.getFinalizedBlockHash(), forkChoice.getSafeBlockHash());
+
+    if (maybePayloadAttributes.isPresent()
+        && !isPayloadAttributesValid(maybePayloadAttributes.get(), withdrawals, newHead)) {
+      LOG.atWarn()
+          .setMessage("Invalid payload attributes: {}")
+          .addArgument(
+              () ->
+                  maybePayloadAttributes
+                      .map(EnginePayloadAttributesParameter::serialize)
+                      .orElse(null))
+          .log();
+      return new JsonRpcErrorResponse(requestId, getInvalidPayloadError());
+    }
+
+    if (result.shouldNotProceedToPayloadBuildProcess()) {
+      if (ForkchoiceResult.Status.IGNORE_UPDATE_TO_OLD_HEAD.equals(result.getStatus())) {
+        logForkchoiceUpdatedCall(VALID, forkChoice);
+      } else {
+        logForkchoiceUpdatedCall(INVALID, forkChoice);
+      }
+      return handleNonValidForkchoiceUpdate(requestId, result);
+    }
+
+    // begin preparing a block if we have a non-empty payload attributes param
+    Optional<PayloadIdentifier> payloadId =
+        maybePayloadAttributes.map(
+            payloadAttributes ->
+                mergeCoordinator.preparePayload(
+                    newHead,
+                    payloadAttributes.getTimestamp(),
+                    payloadAttributes.getPrevRandao(),
+                    payloadAttributes.getSuggestedFeeRecipient(),
+                    withdrawals));
+
+    payloadId.ifPresent(
+        pid ->
+            LOG.atDebug()
+                .setMessage("returning identifier {} for requested payload {}")
+                .addArgument(pid::toHexString)
+                .addArgument(
+                    () -> maybePayloadAttributes.map(EnginePayloadAttributesParameter::serialize))
+                .log());
+
+    logForkchoiceUpdatedCall(VALID, forkChoice);
+    return new JsonRpcSuccessResponse(
+        requestId,
+        new EngineUpdateForkchoiceResult(
+            VALID,
+            result.getNewHead().map(BlockHeader::getHash).orElse(null),
+            payloadId.orElse(null),
+            Optional.empty()));
+  }
+
+  private boolean isPayloadAttributesValid(
+      final EnginePayloadAttributesParameter payloadAttributes,
+      final Optional<List<Withdrawal>> maybeWithdrawals,
+      final BlockHeader headBlockHeader) {
+
+    final boolean newTimestampGreaterThanHead =
+        payloadAttributes.getTimestamp() > headBlockHeader.getTimestamp();
+    return newTimestampGreaterThanHead
+        && getWithdrawalsValidator(
+                protocolSchedule, headBlockHeader, payloadAttributes.getTimestamp())
+            .validateWithdrawals(maybeWithdrawals);
+  }
+
+  private JsonRpcResponse handleNonValidForkchoiceUpdate(
+      final Object requestId, final ForkchoiceResult result) {
+    JsonRpcResponse response;
+
+    final Optional<Hash> latestValid = result.getLatestValid();
+
+    switch (result.getStatus()) {
+      case INVALID:
+        response =
+            new JsonRpcSuccessResponse(
+                requestId,
+                new EngineUpdateForkchoiceResult(
+                    INVALID, latestValid.orElse(null), null, result.getErrorMessage()));
+        break;
+      case IGNORE_UPDATE_TO_OLD_HEAD:
+        response =
+            new JsonRpcSuccessResponse(
+                requestId,
+                new EngineUpdateForkchoiceResult(
+                    VALID, latestValid.orElse(null), null, result.getErrorMessage()));
+        break;
+      default:
+        throw new AssertionError(
+            "ForkchoiceResult.Status "
+                + result.getStatus()
+                + " not handled in EngineForkchoiceUpdated.handleForkchoiceError");
+    }
+
+    return response;
+  }
+
+  private void logPayload(final EnginePayloadAttributesParameter payloadAttributes) {
+    LOG.atDebug()
+        .setMessage("timestamp: {}, prevRandao: {}, suggestedFeeRecipient: {}")
+        .addArgument(payloadAttributes::getTimestamp)
+        .addArgument(() -> payloadAttributes.getPrevRandao().toHexString())
+        .addArgument(() -> payloadAttributes.getSuggestedFeeRecipient().toHexString())
+        .log();
+  }
+
+  private boolean isValidForkchoiceState(
+      final Hash safeBlockHash, final Hash finalizedBlockHash, final BlockHeader newBlock) {
+    Optional<BlockHeader> maybeFinalizedBlock = Optional.empty();
+
+    if (!finalizedBlockHash.isZero()) {
+      maybeFinalizedBlock = protocolContext.getBlockchain().getBlockHeader(finalizedBlockHash);
+
+      // if the finalized block hash is not zero, we always need to have its block, because we
+      // only do this check once we have finished syncing
+      if (maybeFinalizedBlock.isEmpty()) {
+        return false;
+      }
+
+      // a valid finalized block must be an ancestor of the new head
+      if (!mergeCoordinator.isDescendantOf(maybeFinalizedBlock.get(), newBlock)) {
+        return false;
+      }
+    }
+
+    // A zero value is only allowed, if the transition block is not yet finalized.
+    // Once we have at least one finalized block, the transition block has either been finalized
+    // directly
+    // or through one of its descendants.
+    if (safeBlockHash.isZero()) {
+      return finalizedBlockHash.isZero();
+    }
+
+    final Optional<BlockHeader> maybeSafeBlock =
+        protocolContext.getBlockchain().getBlockHeader(safeBlockHash);
+
+    // if the safe block hash is not zero, we always need to have its block, because we
+    // only do this check once we have finished syncing
+    if (maybeSafeBlock.isEmpty()) {
+      return false;
+    }
+
+    // a valid safe block must be a descendant of the finalized block
+    if (maybeFinalizedBlock.isPresent()
+        && !mergeCoordinator.isDescendantOf(maybeFinalizedBlock.get(), maybeSafeBlock.get())) {
+      return false;
+    }
+
+    // a valid safe block must be an ancestor of the new block
+    return mergeCoordinator.isDescendantOf(maybeSafeBlock.get(), newBlock);
+  }
+
+  private JsonRpcResponse syncingResponse(
+      final Object requestId, final EngineForkchoiceUpdatedParameter forkChoice) {
+
+    logForkchoiceUpdatedCall(this::logAtDebug, SYNCING, forkChoice);
+    return new JsonRpcSuccessResponse(
+        requestId, new EngineUpdateForkchoiceResult(SYNCING, null, null, Optional.empty()));
+  }
+
+  protected boolean requireTerminalPoWBlockValidation() {
+    return false;
+  }
+
+  protected JsonRpcError getInvalidPayloadError() {
+    return JsonRpcError.INVALID_PARAMS;
+  }
+
+  // fcU calls are synchronous, no need to make volatile
+  private long lastFcuInfoLog = System.currentTimeMillis();
+  private static final String logMessage =
+      "{} for fork-choice-update: head: {}, finalized: {}, safeBlockHash: {}";
+
+  private void logForkchoiceUpdatedCall(
+      final EngineStatus status, final EngineForkchoiceUpdatedParameter forkChoice) {
+    logForkchoiceUpdatedCall(this::logAtInfo, status, forkChoice);
+  }
+
+  private void logForkchoiceUpdatedCall(
+      final BiConsumer<EngineStatus, EngineForkchoiceUpdatedParameter> logAtLevel,
+      final EngineStatus status,
+      final EngineForkchoiceUpdatedParameter forkChoice) {
+    // cheaply limit the noise of fcU during consensus client syncing to once a minute:
+    if (lastFcuInfoLog + ENGINE_API_LOGGING_THRESHOLD < System.currentTimeMillis()) {
+      lastFcuInfoLog = System.currentTimeMillis();
+      logAtLevel.accept(status, forkChoice);
+    }
+  }
+
+  private void logAtInfo(
+      final EngineStatus status, final EngineForkchoiceUpdatedParameter forkChoice) {
+    LOG.info(
+        logMessage,
+        status.name(),
+        forkChoice.getHeadBlockHash(),
+        forkChoice.getFinalizedBlockHash(),
+        forkChoice.getSafeBlockHash());
+  }
+
+  private void logAtDebug(
+      final EngineStatus status, final EngineForkchoiceUpdatedParameter forkChoice) {
+    LOG.debug(
+        logMessage,
+        status.name(),
+        forkChoice.getHeadBlockHash(),
+        forkChoice.getFinalizedBlockHash(),
+        forkChoice.getSafeBlockHash());
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineGetPayload.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineGetPayload.java
new file mode 100644
index 00000000000..d5eb2c04778
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineGetPayload.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator;
+import org.hyperledger.besu.consensus.merge.blockcreation.PayloadIdentifier;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
+
+import java.util.Optional;
+
+import io.vertx.core.Vertx;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public abstract class AbstractEngineGetPayload extends ExecutionEngineJsonRpcMethod {
+
+  private final MergeMiningCoordinator mergeMiningCoordinator;
+  protected final BlockResultFactory blockResultFactory;
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractEngineGetPayload.class);
+
+  public AbstractEngineGetPayload(
+      final Vertx vertx,
+      final ProtocolContext protocolContext,
+      final MergeMiningCoordinator mergeMiningCoordinator,
+      final BlockResultFactory blockResultFactory,
+      final EngineCallListener engineCallListener) {
+    super(vertx, protocolContext, engineCallListener);
+    this.mergeMiningCoordinator = mergeMiningCoordinator;
+    this.blockResultFactory = blockResultFactory;
+  }
+
+  @Override
+  public JsonRpcResponse syncResponse(final JsonRpcRequestContext request) {
+    engineCallListener.executionEngineCalled();
+
+    final PayloadIdentifier payloadId = request.getRequiredParameter(0, PayloadIdentifier.class);
+    mergeMiningCoordinator.finalizeProposalById(payloadId);
+    final Optional<BlockWithReceipts> blockWithReceipts =
+        mergeContext.get().retrieveBlockById(payloadId);
+    if (blockWithReceipts.isPresent()) {
+      final var proposal = blockWithReceipts.get();
+      LOG.atDebug().setMessage("assembledBlock {}").addArgument(() -> proposal).log();
+      return createResponse(request, payloadId, proposal);
+    }
+    return new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.UNKNOWN_PAYLOAD);
+  }
+
+  protected void logProposal(
+      final PayloadIdentifier payloadId,
+      final BlockWithReceipts proposal,
+      final Optional<Wei> maybeReward) {
+    final BlockHeader proposalHeader = proposal.getHeader();
+    final float gasUsedPerc = 100.0f * proposalHeader.getGasUsed() / proposalHeader.getGasLimit();
+
+    final String message =
+        "Fetch block proposal by identifier: {}, hash: {}, "
+            + "number: {}, coinbase: {}, transaction count: {}, gas used: {}%"
+            + maybeReward.map(unused -> ", reward: {}").orElse("{}");
+
+    LOG.atInfo()
+        .setMessage(message)
+        .addArgument(payloadId::toHexString)
+        .addArgument(proposalHeader::getHash)
+        .addArgument(proposalHeader::getNumber)
+        .addArgument(proposalHeader::getCoinbase)
+        .addArgument(() -> proposal.getBlock().getBody().getTransactions().size())
+        .addArgument(() -> String.format("%1.2f", gasUsedPerc))
+        .addArgument(maybeReward.map(Wei::toHumanReadableString).orElse(""))
+        .log();
+  }
+
+  protected abstract JsonRpcResponse createResponse(
+      final JsonRpcRequestContext request,
+      final PayloadIdentifier payloadId,
+      final BlockWithReceipts blockWithReceipts);
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java
new file mode 100644
index 00000000000..ba463759a69
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java
@@ -0,0 +1,369 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import static java.util.stream.Collectors.toList;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.ACCEPTED;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.INVALID;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.INVALID_BLOCK_HASH;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.SYNCING;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.VALID;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.DepositsValidatorProvider.getDepositsValidator;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.WithdrawalsValidatorProvider.getWithdrawalsValidator;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.INVALID_PARAMS;
+
+import org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.BlockProcessingResult;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.DepositParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.EnginePayloadParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.WithdrawalParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.EnginePayloadStatusResult;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.core.Deposit;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+import org.hyperledger.besu.ethereum.core.encoding.TransactionDecoder;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
+import org.hyperledger.besu.ethereum.mainnet.BodyValidation;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.rlp.RLPException;
+import org.hyperledger.besu.ethereum.trie.MerkleTrieException;
+import org.hyperledger.besu.plugin.services.exception.StorageException;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import io.vertx.core.Vertx;
+import io.vertx.core.json.Json;
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public abstract class AbstractEngineNewPayload extends ExecutionEngineJsonRpcMethod {
+
+  private static final Hash OMMERS_HASH_CONSTANT = Hash.EMPTY_LIST_HASH;
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractEngineNewPayload.class);
+  private static final BlockHeaderFunctions headerFunctions = new MainnetBlockHeaderFunctions();
+  private final ProtocolSchedule protocolSchedule;
+  private final MergeMiningCoordinator mergeCoordinator;
+  private final EthPeers ethPeers;
+
+  public AbstractEngineNewPayload(
+      final Vertx vertx,
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final MergeMiningCoordinator mergeCoordinator,
+      final EthPeers ethPeers,
+      final EngineCallListener engineCallListener) {
+    super(vertx, protocolContext, engineCallListener);
+    this.protocolSchedule = protocolSchedule;
+    this.mergeCoordinator = mergeCoordinator;
+    this.ethPeers = ethPeers;
+  }
+
+  @Override
+  public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext) {
+    engineCallListener.executionEngineCalled();
+
+    final EnginePayloadParameter blockParam =
+        requestContext.getRequiredParameter(0, EnginePayloadParameter.class);
+
+    Object reqId = requestContext.getRequest().getId();
+
+    LOG.atTrace()
+        .setMessage("blockparam: {}")
+        .addArgument(() -> Json.encodePrettily(blockParam))
+        .log();
+
+    final Optional<List<Withdrawal>> maybeWithdrawals =
+        Optional.ofNullable(blockParam.getWithdrawals())
+            .map(ws -> ws.stream().map(WithdrawalParameter::toWithdrawal).collect(toList()));
+
+    if (!getWithdrawalsValidator(
+            protocolSchedule, blockParam.getTimestamp(), blockParam.getBlockNumber())
+        .validateWithdrawals(maybeWithdrawals)) {
+      return new JsonRpcErrorResponse(reqId, INVALID_PARAMS);
+    }
+
+    final Optional<List<Deposit>> maybeDeposits =
+        Optional.ofNullable(blockParam.getDeposits())
+            .map(ds -> ds.stream().map(DepositParameter::toDeposit).collect(toList()));
+    if (!getDepositsValidator(
+            protocolSchedule, blockParam.getTimestamp(), blockParam.getBlockNumber())
+        .validateDepositParameter(maybeDeposits)) {
+      return new JsonRpcErrorResponse(reqId, INVALID_PARAMS);
+    }
+
+    if (mergeContext.get().isSyncing()) {
+      LOG.debug("We are syncing");
+      return respondWith(reqId, blockParam, null, SYNCING);
+    }
+
+    final List<Transaction> transactions;
+    try {
+      transactions =
+          blockParam.getTransactions().stream()
+              .map(Bytes::fromHexString)
+              .map(TransactionDecoder::decodeOpaqueBytes)
+              .collect(Collectors.toList());
+    } catch (final RLPException | IllegalArgumentException e) {
+      return respondWithInvalid(
+          reqId,
+          blockParam,
+          mergeCoordinator.getLatestValidAncestor(blockParam.getParentHash()).orElse(null),
+          INVALID,
+          "Failed to decode transactions from block parameter");
+    }
+
+    if (blockParam.getExtraData() == null) {
+      return respondWithInvalid(
+          reqId,
+          blockParam,
+          mergeCoordinator.getLatestValidAncestor(blockParam.getParentHash()).orElse(null),
+          INVALID,
+          "Field extraData must not be null");
+    }
+
+    final BlockHeader newBlockHeader =
+        new BlockHeader(
+            blockParam.getParentHash(),
+            OMMERS_HASH_CONSTANT,
+            blockParam.getFeeRecipient(),
+            blockParam.getStateRoot(),
+            BodyValidation.transactionsRoot(transactions),
+            blockParam.getReceiptsRoot(),
+            blockParam.getLogsBloom(),
+            Difficulty.ZERO,
+            blockParam.getBlockNumber(),
+            blockParam.getGasLimit(),
+            blockParam.getGasUsed(),
+            blockParam.getTimestamp(),
+            Bytes.fromHexString(blockParam.getExtraData()),
+            blockParam.getBaseFeePerGas(),
+            blockParam.getPrevRandao(),
+            0,
+            maybeWithdrawals.map(BodyValidation::withdrawalsRoot).orElse(null),
+            null,
+            maybeDeposits.map(BodyValidation::depositsRoot).orElse(null),
+            headerFunctions);
+
+    // ensure the block hash matches the blockParam hash
+    // this must be done before any other check
+    if (!newBlockHeader.getHash().equals(blockParam.getBlockHash())) {
+      String errorMessage =
+          String.format(
+              "Computed block hash %s does not match block hash parameter %s",
+              newBlockHeader.getBlockHash(), blockParam.getBlockHash());
+      LOG.debug(errorMessage);
+      return respondWithInvalid(reqId, blockParam, null, getInvalidBlockHashStatus(), errorMessage);
+    }
+    // do we already have this payload
+    if (protocolContext.getBlockchain().getBlockByHash(newBlockHeader.getBlockHash()).isPresent()) {
+      LOG.debug("block already present");
+      return respondWith(reqId, blockParam, blockParam.getBlockHash(), VALID);
+    }
+    if (mergeCoordinator.isBadBlock(blockParam.getBlockHash())) {
+      return respondWithInvalid(
+          reqId,
+          blockParam,
+          mergeCoordinator
+              .getLatestValidHashOfBadBlock(blockParam.getBlockHash())
+              .orElse(Hash.ZERO),
+          INVALID,
+          "Block already present in bad block manager.");
+    }
+
+    final Optional<BlockHeader> maybeParentHeader =
+        protocolContext.getBlockchain().getBlockHeader(blockParam.getParentHash());
+    if (maybeParentHeader.isPresent()
+        && (blockParam.getTimestamp() <= maybeParentHeader.get().getTimestamp())) {
+      return respondWithInvalid(
+          reqId,
+          blockParam,
+          mergeCoordinator.getLatestValidAncestor(blockParam.getParentHash()).orElse(null),
+          INVALID,
+          "block timestamp not greater than parent");
+    }
+
+    final var block =
+        new Block(
+            newBlockHeader,
+            new BlockBody(transactions, Collections.emptyList(), maybeWithdrawals, maybeDeposits));
+
+    if (maybeParentHeader.isEmpty()) {
+      LOG.atDebug()
+          .setMessage("Parent of block {} is not present, append it to backward sync")
+          .addArgument(block::toLogString)
+          .log();
+      mergeCoordinator.appendNewPayloadToSync(block);
+
+      return respondWith(reqId, blockParam, null, SYNCING);
+    }
+
+    // TODO: post-merge cleanup
+    if (requireTerminalPoWBlockValidation()
+        && !mergeContext.get().isCheckpointPostMergeSync()
+        && !mergeContext.get().isPostMergeAtGenesis()
+        && !mergeCoordinator.latestValidAncestorDescendsFromTerminal(newBlockHeader)
+        && !mergeContext.get().isChainPruningEnabled()) {
+      mergeCoordinator.addBadBlock(block, Optional.empty());
+      return respondWithInvalid(
+          reqId,
+          blockParam,
+          Hash.ZERO,
+          INVALID,
+          newBlockHeader.getHash() + " did not descend from terminal block");
+    }
+
+    final var latestValidAncestor = mergeCoordinator.getLatestValidAncestor(newBlockHeader);
+
+    if (latestValidAncestor.isEmpty()) {
+      return respondWith(reqId, blockParam, null, ACCEPTED);
+    }
+
+    // execute block and return result response
+    final long startTimeMs = System.currentTimeMillis();
+    final BlockProcessingResult executionResult = mergeCoordinator.rememberBlock(block);
+
+    if (executionResult.isSuccessful()) {
+      logImportedBlockInfo(block, (System.currentTimeMillis() - startTimeMs) / 1000.0);
+      return respondWith(reqId, blockParam, newBlockHeader.getHash(), VALID);
+    } else {
+      if (executionResult.causedBy().isPresent()) {
+        Throwable causedBy = executionResult.causedBy().get();
+        if (causedBy instanceof StorageException || causedBy instanceof MerkleTrieException) {
+          JsonRpcError error = JsonRpcError.INTERNAL_ERROR;
+          JsonRpcErrorResponse response = new JsonRpcErrorResponse(reqId, error);
+          return response;
+        }
+      }
+      LOG.debug("New payload is invalid: {}", executionResult.errorMessage.get());
+      return respondWithInvalid(
+          reqId,
+          blockParam,
+          latestValidAncestor.get(),
+          INVALID,
+          executionResult.errorMessage.get());
+    }
+  }
+
+  JsonRpcResponse respondWith(
+      final Object requestId,
+      final EnginePayloadParameter param,
+      final Hash latestValidHash,
+      final EngineStatus status) {
+    if (INVALID.equals(status) || INVALID_BLOCK_HASH.equals(status)) {
+      throw new IllegalArgumentException(
+          "Don't call respondWith() with invalid status of " + status.toString());
+    }
+    LOG.atDebug()
+        .setMessage(
+            "New payload: number: {}, hash: {}, parentHash: {}, latestValidHash: {}, status: {}")
+        .addArgument(param::getBlockNumber)
+        .addArgument(param::getBlockHash)
+        .addArgument(param::getParentHash)
+        .addArgument(() -> latestValidHash == null ? null : latestValidHash.toHexString())
+        .addArgument(status::name)
+        .log();
+    return new JsonRpcSuccessResponse(
+        requestId, new EnginePayloadStatusResult(status, latestValidHash, Optional.empty()));
+  }
+
+  // engine api calls are synchronous, no need for volatile
+  private long lastInvalidWarn = 0;
+
+  JsonRpcResponse respondWithInvalid(
+      final Object requestId,
+      final EnginePayloadParameter param,
+      final Hash latestValidHash,
+      final EngineStatus invalidStatus,
+      final String validationError) {
+    if (!INVALID.equals(invalidStatus) && !INVALID_BLOCK_HASH.equals(invalidStatus)) {
+      throw new IllegalArgumentException(
+          "Don't call respondWithInvalid() with non-invalid status of " + invalidStatus.toString());
+    }
+    final String invalidBlockLogMessage =
+        String.format(
+            "Invalid new payload: number: %s, hash: %s, parentHash: %s, latestValidHash: %s, status: %s, validationError: %s",
+            param.getBlockNumber(),
+            param.getBlockHash(),
+            param.getParentHash(),
+            latestValidHash == null ? null : latestValidHash.toHexString(),
+            invalidStatus.name(),
+            validationError);
+    // always log invalid at DEBUG
+    LOG.debug(invalidBlockLogMessage);
+    // periodically log at WARN
+    if (lastInvalidWarn + ENGINE_API_LOGGING_THRESHOLD < System.currentTimeMillis()) {
+      lastInvalidWarn = System.currentTimeMillis();
+      LOG.warn(invalidBlockLogMessage);
+    }
+    return new JsonRpcSuccessResponse(
+        requestId,
+        new EnginePayloadStatusResult(
+            invalidStatus, latestValidHash, Optional.of(validationError)));
+  }
+
+  protected boolean requireTerminalPoWBlockValidation() {
+    return false;
+  }
+
+  protected EngineStatus getInvalidBlockHashStatus() {
+    return INVALID;
+  }
+
+  private void logImportedBlockInfo(final Block block, final double timeInS) {
+    final StringBuilder message = new StringBuilder();
+    message.append("Imported #%,d / %d tx");
+    final List<Object> messageArgs =
+        new ArrayList<>(
+            List.of(block.getHeader().getNumber(), block.getBody().getTransactions().size()));
+    if (block.getBody().getWithdrawals().isPresent()) {
+      message.append(" / %d ws");
+      messageArgs.add(block.getBody().getWithdrawals().get().size());
+    }
+    if (block.getBody().getDeposits().isPresent()) {
+      message.append(" / %d ds");
+      messageArgs.add(block.getBody().getDeposits().get().size());
+    }
+    message.append(" / base fee %s / %,d (%01.1f%%) gas / (%s) in %01.3fs. Peers: %d");
+    messageArgs.addAll(
+        List.of(
+            block.getHeader().getBaseFee().map(Wei::toHumanReadableString).orElse("N/A"),
+            block.getHeader().getGasUsed(),
+            (block.getHeader().getGasUsed() * 100.0) / block.getHeader().getGasLimit(),
+            block.getHash().toHexString(),
+            timeInS,
+            ethPeers.peerCount()));
+    LOG.info(String.format(message.toString(), messageArgs.toArray()));
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/DepositsValidatorProvider.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/DepositsValidatorProvider.java
new file mode 100644
index 00000000000..36c29bd26a1
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/DepositsValidatorProvider.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
+import org.hyperledger.besu.ethereum.mainnet.DepositsValidator;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+
+import java.util.Optional;
+
+public class DepositsValidatorProvider {
+
+  static DepositsValidator getDepositsValidator(
+      final ProtocolSchedule protocolSchedule, final long blockTimestamp, final long blockNumber) {
+
+    final BlockHeader blockHeader =
+        BlockHeaderBuilder.createDefault()
+            .timestamp(blockTimestamp)
+            .number(blockNumber)
+            .buildBlockHeader();
+    return getDepositsValidator(protocolSchedule.getByBlockHeader(blockHeader));
+  }
+
+  private static DepositsValidator getDepositsValidator(final ProtocolSpec protocolSchedule) {
+    return Optional.ofNullable(protocolSchedule)
+        .map(ProtocolSpec::getDepositsValidator)
+        .orElseGet(DepositsValidator.ProhibitedDeposits::new);
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineCallListener.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineCallListener.java
new file mode 100644
index 00000000000..1020bca0dfa
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineCallListener.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+public interface EngineCallListener {
+  void executionEngineCalled();
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeCapabilities.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeCapabilities.java
new file mode 100644
index 00000000000..f59681a3854
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeCapabilities.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod.ENGINE_EXCHANGE_CAPABILITIES;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod.ENGINE_PREPARE_PAYLOAD_DEBUG;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import io.vertx.core.Vertx;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class EngineExchangeCapabilities extends ExecutionEngineJsonRpcMethod {
+  private static final Logger LOG = LoggerFactory.getLogger(EngineExchangeCapabilities.class);
+
+  public EngineExchangeCapabilities(
+      final Vertx vertx,
+      final ProtocolContext protocolContext,
+      final EngineCallListener engineCallListener) {
+    super(vertx, protocolContext, engineCallListener);
+  }
+
+  @Override
+  public String getName() {
+    return ENGINE_EXCHANGE_CAPABILITIES.getMethodName();
+  }
+
+  @Override
+  public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext) {
+    engineCallListener.executionEngineCalled();
+
+    final Object reqId = requestContext.getRequest().getId();
+
+    LOG.atTrace()
+        .setMessage("received remote capabilities: {}")
+        .addArgument(() -> requestContext.getRequiredParameter(0, String[].class))
+        .log();
+
+    final List<String> localCapabilities =
+        Stream.of(RpcMethod.values())
+            .filter(e -> e.getMethodName().startsWith("engine_"))
+            .filter(e -> !e.equals(ENGINE_EXCHANGE_CAPABILITIES))
+            .filter(e -> !e.equals(ENGINE_PREPARE_PAYLOAD_DEBUG))
+            .map(RpcMethod::getMethodName)
+            .collect(Collectors.toList());
+
+    return respondWith(reqId, localCapabilities);
+  }
+
+  private JsonRpcResponse respondWith(
+      final Object requestId, final List<String> localCapabilities) {
+    return new JsonRpcSuccessResponse(requestId, localCapabilities);
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeTransitionConfiguration.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeTransitionConfiguration.java
new file mode 100644
index 00000000000..92eb2ef715c
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeTransitionConfiguration.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod.ENGINE_EXCHANGE_TRANSITION_CONFIGURATION;
+
+import org.hyperledger.besu.consensus.merge.MergeContext;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.EngineExchangeTransitionConfigurationParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.EngineExchangeTransitionConfigurationResult;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+
+import java.util.Optional;
+import java.util.function.Supplier;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Suppliers;
+import io.vertx.core.Vertx;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class EngineExchangeTransitionConfiguration extends ExecutionEngineJsonRpcMethod {
+  private static final Logger LOG =
+      LoggerFactory.getLogger(EngineExchangeTransitionConfiguration.class);
+
+  // use (2^256 - 2^10) if engine is enabled in the absence of a TTD configuration
+  static final Difficulty FALLBACK_TTD_DEFAULT =
+      Difficulty.fromHexString(
+          "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc00");
+
+  private static final Supplier<ObjectMapper> mapperSupplier = Suppliers.memoize(ObjectMapper::new);
+
+  public EngineExchangeTransitionConfiguration(
+      final Vertx vertx,
+      final ProtocolContext protocolContext,
+      final EngineCallListener engineCallListener) {
+    super(vertx, protocolContext, engineCallListener);
+  }
+
+  @Override
+  public String getName() {
+    return ENGINE_EXCHANGE_TRANSITION_CONFIGURATION.getMethodName();
+  }
+
+  @Override
+  public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext) {
+    engineCallListener.executionEngineCalled();
+
+    final EngineExchangeTransitionConfigurationParameter remoteTransitionConfiguration =
+        requestContext.getRequiredParameter(
+            0, EngineExchangeTransitionConfigurationParameter.class);
+    final Object reqId = requestContext.getRequest().getId();
+
+    LOG.atTrace()
+        .setMessage("received transitionConfiguration: {}")
+        .addArgument(
+            () -> {
+              try {
+                return mapperSupplier.get().writeValueAsString(remoteTransitionConfiguration);
+              } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+              }
+            })
+        .log();
+
+    final Optional<BlockHeader> maybeTerminalPoWBlockHeader =
+        mergeContextOptional.flatMap(MergeContext::getTerminalPoWBlock);
+
+    final EngineExchangeTransitionConfigurationResult localTransitionConfiguration =
+        new EngineExchangeTransitionConfigurationResult(
+            mergeContextOptional
+                .map(c -> c.getTerminalTotalDifficulty())
+                .orElse(FALLBACK_TTD_DEFAULT),
+            maybeTerminalPoWBlockHeader.map(BlockHeader::getHash).orElse(Hash.ZERO),
+            maybeTerminalPoWBlockHeader.map(BlockHeader::getNumber).orElse(0L));
+
+    if (!localTransitionConfiguration
+        .getTerminalTotalDifficulty()
+        .equals(remoteTransitionConfiguration.getTerminalTotalDifficulty())) {
+      LOG.debug(
+          "Configured terminal total difficulty {} does not match value of consensus client {}",
+          localTransitionConfiguration.getTerminalTotalDifficulty(),
+          remoteTransitionConfiguration.getTerminalTotalDifficulty());
+    }
+
+    if (!localTransitionConfiguration
+        .getTerminalBlockHash()
+        .equals(remoteTransitionConfiguration.getTerminalBlockHash())) {
+      LOG.debug(
+          "Configured terminal block hash {} does not match value of consensus client {}",
+          localTransitionConfiguration.getTerminalBlockHash(),
+          remoteTransitionConfiguration.getTerminalBlockHash());
+    }
+
+    if (localTransitionConfiguration.getTerminalBlockNumber()
+        != remoteTransitionConfiguration.getTerminalBlockNumber()) {
+      LOG.debug(
+          "Configured terminal block number {} does not match value of consensus client {}",
+          localTransitionConfiguration.getTerminalBlockNumber(),
+          remoteTransitionConfiguration.getTerminalBlockNumber());
+    }
+
+    return respondWith(reqId, localTransitionConfiguration);
+  }
+
+  private JsonRpcResponse respondWith(
+      final Object requestId,
+      final EngineExchangeTransitionConfigurationResult transitionConfiguration) {
+    return new JsonRpcSuccessResponse(requestId, transitionConfiguration);
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineForkchoiceUpdatedV1.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineForkchoiceUpdatedV1.java
new file mode 100644
index 00000000000..cdfccca3c14
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineForkchoiceUpdatedV1.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+
+import io.vertx.core.Vertx;
+
+public class EngineForkchoiceUpdatedV1 extends AbstractEngineForkchoiceUpdated {
+
+  public EngineForkchoiceUpdatedV1(
+      final Vertx vertx,
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final MergeMiningCoordinator mergeCoordinator,
+      final EngineCallListener engineCallListener) {
+    super(vertx, protocolSchedule, protocolContext, mergeCoordinator, engineCallListener);
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.ENGINE_FORKCHOICE_UPDATED_V1.getMethodName();
+  }
+
+  @Override
+  protected boolean requireTerminalPoWBlockValidation() {
+    return true;
+  }
+
+  @Override
+  protected JsonRpcError getInvalidPayloadError() {
+    return JsonRpcError.INVALID_PAYLOAD_ATTRIBUTES;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineForkchoiceUpdatedV2.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineForkchoiceUpdatedV2.java
new file mode 100644
index 00000000000..84459b43c9c
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineForkchoiceUpdatedV2.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+
+import io.vertx.core.Vertx;
+
+// TODO Withdrawals use composition instead? Want to make it more obvious that there is no
+// difference between V1/V2 code other than the method name
+public class EngineForkchoiceUpdatedV2 extends AbstractEngineForkchoiceUpdated {
+
+  public EngineForkchoiceUpdatedV2(
+      final Vertx vertx,
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final MergeMiningCoordinator mergeCoordinator,
+      final EngineCallListener engineCallListener) {
+    super(vertx, protocolSchedule, protocolContext, mergeCoordinator, engineCallListener);
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.ENGINE_FORKCHOICE_UPDATED_V2.getMethodName();
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByHashV1.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByHashV1.java
new file mode 100644
index 00000000000..acbc1f72aef
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByHashV1.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.EngineGetPayloadBodiesResultV1;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+import io.vertx.core.Vertx;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class EngineGetPayloadBodiesByHashV1 extends ExecutionEngineJsonRpcMethod {
+
+  private static final int MAX_REQUEST_BLOCKS = 1024;
+  private static final Logger LOG = LoggerFactory.getLogger(EngineGetPayloadBodiesByHashV1.class);
+  private final BlockResultFactory blockResultFactory;
+
+  public EngineGetPayloadBodiesByHashV1(
+      final Vertx vertx,
+      final ProtocolContext protocolContext,
+      final BlockResultFactory blockResultFactory,
+      final EngineCallListener engineCallListener) {
+    super(vertx, protocolContext, engineCallListener);
+    this.blockResultFactory = blockResultFactory;
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.ENGINE_GET_PAYLOAD_BODIES_BY_HASH_V1.getMethodName();
+  }
+
+  @Override
+  public JsonRpcResponse syncResponse(final JsonRpcRequestContext request) {
+    engineCallListener.executionEngineCalled();
+
+    final Object reqId = request.getRequest().getId();
+
+    final Hash[] blockHashes = request.getRequiredParameter(0, Hash[].class);
+
+    LOG.atTrace()
+        .setMessage("{} parameters: blockHashes {}")
+        .addArgument(this::getName)
+        .addArgument(blockHashes)
+        .log();
+
+    if (blockHashes.length > getMaxRequestBlocks()) {
+      return new JsonRpcErrorResponse(reqId, JsonRpcError.INVALID_RANGE_REQUEST_TOO_LARGE);
+    }
+
+    final Blockchain blockchain = protocolContext.getBlockchain();
+
+    final EngineGetPayloadBodiesResultV1 engineGetPayloadBodiesResultV1 =
+        blockResultFactory.payloadBodiesCompleteV1(
+            Arrays.stream(blockHashes).map(blockchain::getBlockBody).collect(Collectors.toList()));
+
+    return new JsonRpcSuccessResponse(reqId, engineGetPayloadBodiesResultV1);
+  }
+
+  protected int getMaxRequestBlocks() {
+    return MAX_REQUEST_BLOCKS;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByRangeV1.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByRangeV1.java
new file mode 100644
index 00000000000..adbb3384d84
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByRangeV1.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.UnsignedLongParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.EngineGetPayloadBodiesResultV1;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+
+import java.util.stream.Collectors;
+import java.util.stream.LongStream;
+
+import io.vertx.core.Vertx;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class EngineGetPayloadBodiesByRangeV1 extends ExecutionEngineJsonRpcMethod {
+  private static final Logger LOG = LoggerFactory.getLogger(EngineGetPayloadBodiesByRangeV1.class);
+  private static final int MAX_REQUEST_BLOCKS = 1024;
+  private final BlockResultFactory blockResultFactory;
+
+  public EngineGetPayloadBodiesByRangeV1(
+      final Vertx vertx,
+      final ProtocolContext protocolContext,
+      final BlockResultFactory blockResultFactory,
+      final EngineCallListener engineCallListener) {
+    super(vertx, protocolContext, engineCallListener);
+    this.blockResultFactory = blockResultFactory;
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.ENGINE_GET_PAYLOAD_BODIES_BY_RANGE_V1.getMethodName();
+  }
+
+  @Override
+  public JsonRpcResponse syncResponse(final JsonRpcRequestContext request) {
+    engineCallListener.executionEngineCalled();
+
+    final long startBlockNumber =
+        request.getRequiredParameter(0, UnsignedLongParameter.class).getValue();
+    final long count = request.getRequiredParameter(1, UnsignedLongParameter.class).getValue();
+    final Object reqId = request.getRequest().getId();
+
+    LOG.atTrace()
+        .setMessage("{} parameters: start block number {} count {}")
+        .addArgument(this::getName)
+        .addArgument(startBlockNumber)
+        .addArgument(count)
+        .log();
+
+    if (startBlockNumber < 1 || count < 1) {
+      return new JsonRpcErrorResponse(reqId, JsonRpcError.INVALID_PARAMS);
+    }
+
+    if (count > getMaxRequestBlocks()) {
+      return new JsonRpcErrorResponse(reqId, JsonRpcError.INVALID_RANGE_REQUEST_TOO_LARGE);
+    }
+
+    final Blockchain blockchain = protocolContext.getBlockchain();
+    final long chainHeadBlockNumber = blockchain.getChainHeadBlockNumber();
+
+    // request startBlockNumber is beyond head of chain
+    if (chainHeadBlockNumber < startBlockNumber) {
+      // Empty List of payloadBodies
+      return new JsonRpcSuccessResponse(reqId, new EngineGetPayloadBodiesResultV1());
+    }
+
+    final long upperBound = startBlockNumber + count;
+
+    // if we've received request from blocks beyond the head we exclude those from the query
+    final long endExclusiveBlockNumber =
+        chainHeadBlockNumber < upperBound ? chainHeadBlockNumber + 1 : upperBound;
+
+    EngineGetPayloadBodiesResultV1 engineGetPayloadBodiesResultV1 =
+        blockResultFactory.payloadBodiesCompleteV1(
+            LongStream.range(startBlockNumber, endExclusiveBlockNumber)
+                .mapToObj(
+                    blockNumber ->
+                        blockchain
+                            .getBlockHashByNumber(blockNumber)
+                            .flatMap(blockchain::getBlockBody))
+                .collect(Collectors.toList()));
+
+    return new JsonRpcSuccessResponse(reqId, engineGetPayloadBodiesResultV1);
+  }
+
+  protected int getMaxRequestBlocks() {
+    return MAX_REQUEST_BLOCKS;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadV1.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadV1.java
new file mode 100644
index 00000000000..2484ac961e3
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadV1.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator;
+import org.hyperledger.besu.consensus.merge.blockcreation.PayloadIdentifier;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory;
+import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
+
+import java.util.Optional;
+
+import io.vertx.core.Vertx;
+
+public class EngineGetPayloadV1 extends AbstractEngineGetPayload {
+
+  public EngineGetPayloadV1(
+      final Vertx vertx,
+      final ProtocolContext protocolContext,
+      final MergeMiningCoordinator mergeMiningCoordinator,
+      final BlockResultFactory blockResultFactory,
+      final EngineCallListener engineCallListener) {
+    super(vertx, protocolContext, mergeMiningCoordinator, blockResultFactory, engineCallListener);
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.ENGINE_GET_PAYLOAD_V1.getMethodName();
+  }
+
+  @Override
+  protected JsonRpcResponse createResponse(
+      final JsonRpcRequestContext request,
+      final PayloadIdentifier payloadId,
+      final BlockWithReceipts blockWithReceipts) {
+    final var result =
+        blockResultFactory.payloadTransactionCompleteV1(blockWithReceipts.getBlock());
+    logProposal(payloadId, blockWithReceipts, Optional.empty());
+    return new JsonRpcSuccessResponse(request.getRequest().getId(), result);
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadV2.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadV2.java
new file mode 100644
index 00000000000..d14e9dec8a6
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadV2.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator;
+import org.hyperledger.besu.consensus.merge.blockcreation.PayloadIdentifier;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory;
+import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
+
+import java.util.Optional;
+
+import io.vertx.core.Vertx;
+
+public class EngineGetPayloadV2 extends AbstractEngineGetPayload {
+
+  public EngineGetPayloadV2(
+      final Vertx vertx,
+      final ProtocolContext protocolContext,
+      final MergeMiningCoordinator mergeMiningCoordinator,
+      final BlockResultFactory blockResultFactory,
+      final EngineCallListener engineCallListener) {
+    super(vertx, protocolContext, mergeMiningCoordinator, blockResultFactory, engineCallListener);
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.ENGINE_GET_PAYLOAD_V2.getMethodName();
+  }
+
+  @Override
+  protected JsonRpcResponse createResponse(
+      final JsonRpcRequestContext request,
+      final PayloadIdentifier payloadId,
+      final BlockWithReceipts blockWithReceipts) {
+    final var result = blockResultFactory.payloadTransactionCompleteV2(blockWithReceipts);
+    logProposal(
+        payloadId, blockWithReceipts, Optional.of(Wei.fromHexString(result.getBlockValue())));
+    return new JsonRpcSuccessResponse(request.getRequest().getId(), result);
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineNewPayloadV1.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineNewPayloadV1.java
new file mode 100644
index 00000000000..532df18e198
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineNewPayloadV1.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.INVALID_BLOCK_HASH;
+
+import org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+
+import io.vertx.core.Vertx;
+
+public class EngineNewPayloadV1 extends AbstractEngineNewPayload {
+
+  public EngineNewPayloadV1(
+      final Vertx vertx,
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final MergeMiningCoordinator mergeCoordinator,
+      final EthPeers ethPeers,
+      final EngineCallListener engineCallListener) {
+    super(vertx, protocolSchedule, protocolContext, mergeCoordinator, ethPeers, engineCallListener);
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.ENGINE_NEW_PAYLOAD_V1.getMethodName();
+  }
+
+  @Override
+  protected boolean requireTerminalPoWBlockValidation() {
+    return true;
+  }
+
+  @Override
+  protected EngineStatus getInvalidBlockHashStatus() {
+    return INVALID_BLOCK_HASH;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineNewPayloadV2.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineNewPayloadV2.java
new file mode 100644
index 00000000000..3642aee5e65
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineNewPayloadV2.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+
+import io.vertx.core.Vertx;
+
+public class EngineNewPayloadV2 extends AbstractEngineNewPayload {
+
+  public EngineNewPayloadV2(
+      final Vertx vertx,
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final MergeMiningCoordinator mergeCoordinator,
+      final EthPeers ethPeers,
+      final EngineCallListener engineCallListener) {
+    super(vertx, protocolSchedule, protocolContext, mergeCoordinator, ethPeers, engineCallListener);
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.ENGINE_NEW_PAYLOAD_V2.getMethodName();
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EnginePreparePayloadDebug.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EnginePreparePayloadDebug.java
new file mode 100644
index 00000000000..fe8f377d91b
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EnginePreparePayloadDebug.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import static java.util.stream.Collectors.toList;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.SYNCING;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.VALID;
+
+import org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator;
+import org.hyperledger.besu.consensus.merge.blockcreation.PayloadIdentifier;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.EnginePreparePayloadParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.WithdrawalParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.EnginePreparePayloadResult;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+
+import java.util.List;
+import java.util.Optional;
+
+import graphql.VisibleForTesting;
+import io.vertx.core.Vertx;
+
+public class EnginePreparePayloadDebug extends ExecutionEngineJsonRpcMethod {
+  private final MergeMiningCoordinator mergeCoordinator;
+
+  public EnginePreparePayloadDebug(
+      final Vertx vertx,
+      final ProtocolContext protocolContext,
+      final EngineCallListener engineCallListener,
+      final MergeMiningCoordinator mergeCoordinator) {
+    super(vertx, protocolContext, engineCallListener);
+    this.mergeCoordinator = mergeCoordinator;
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.ENGINE_PREPARE_PAYLOAD_DEBUG.getMethodName();
+  }
+
+  @Override
+  public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext) {
+    final EnginePreparePayloadParameter enginePreparePayloadParameter =
+        requestContext
+            .getOptionalParameter(0, EnginePreparePayloadParameter.class)
+            .orElse(
+                new EnginePreparePayloadParameter(
+                    Optional.empty(),
+                    Optional.empty(),
+                    Optional.empty(),
+                    Optional.empty(),
+                    Optional.empty()));
+
+    final var requestId = requestContext.getRequest().getId();
+
+    if (mergeContext.get().isSyncing()) {
+      return new JsonRpcSuccessResponse(requestId, new EnginePreparePayloadResult(SYNCING, null));
+    }
+
+    return generatePayload(enginePreparePayloadParameter)
+        .<JsonRpcResponse>map(
+            payloadIdentifier ->
+                new JsonRpcSuccessResponse(
+                    requestId, new EnginePreparePayloadResult(VALID, payloadIdentifier)))
+        .orElseGet(() -> new JsonRpcErrorResponse(requestId, JsonRpcError.INVALID_PARAMS));
+  }
+
+  @VisibleForTesting
+  Optional<PayloadIdentifier> generatePayload(final EnginePreparePayloadParameter param) {
+    final List<Withdrawal> withdrawals =
+        param.getWithdrawals().stream().map(WithdrawalParameter::toWithdrawal).collect(toList());
+
+    return param
+        .getParentHash()
+        .map(header -> protocolContext.getBlockchain().getBlockHeader(header))
+        .orElseGet(() -> Optional.of(protocolContext.getBlockchain().getChainHeadHeader()))
+        .map(
+            parentHeader ->
+                mergeCoordinator.preparePayload(
+                    parentHeader,
+                    param.getTimestamp().orElse(parentHeader.getTimestamp() + 1L),
+                    param.getPrevRandao(),
+                    param.getFeeRecipient(),
+                    Optional.of(withdrawals)));
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineQosTimer.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineQosTimer.java
new file mode 100644
index 00000000000..6b9c46dddba
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineQosTimer.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.QosTimer;
+
+import com.google.common.annotations.VisibleForTesting;
+import io.vertx.core.Vertx;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class EngineQosTimer implements EngineCallListener {
+  static final long QOS_TIMEOUT_MILLIS = 120000L;
+  private static final Logger LOG = LoggerFactory.getLogger(EngineQosTimer.class);
+
+  private final QosTimer qosTimer;
+
+  public EngineQosTimer(final Vertx vertx) {
+    qosTimer = new QosTimer(vertx, QOS_TIMEOUT_MILLIS, lastCall -> logTimeoutWarning());
+    qosTimer.resetTimer();
+  }
+
+  @Override
+  public void executionEngineCalled() {
+    getQosTimer().resetTimer();
+  }
+
+  public void logTimeoutWarning() {
+    LOG.warn(
+        "Execution engine not called in {} seconds, consensus client may not be connected",
+        QOS_TIMEOUT_MILLIS / 1000L);
+  }
+
+  @VisibleForTesting
+  public QosTimer getQosTimer() {
+    return qosTimer;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/WithdrawalsValidatorProvider.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/WithdrawalsValidatorProvider.java
new file mode 100644
index 00000000000..1ab4b78204f
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/WithdrawalsValidatorProvider.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.mainnet.WithdrawalsValidator;
+
+import java.util.Optional;
+
+public class WithdrawalsValidatorProvider {
+
+  static WithdrawalsValidator getWithdrawalsValidator(
+      final ProtocolSchedule protocolSchedule, final long blockTimestamp, final long blockNumber) {
+
+    final BlockHeader blockHeader =
+        BlockHeaderBuilder.createDefault()
+            .timestamp(blockTimestamp)
+            .number(blockNumber)
+            .buildBlockHeader();
+    return getWithdrawalsValidator(protocolSchedule.getByBlockHeader(blockHeader));
+  }
+
+  static WithdrawalsValidator getWithdrawalsValidator(
+      final ProtocolSchedule protocolSchedule,
+      final BlockHeader parentBlockHeader,
+      final long timestampForNextBlock) {
+
+    return getWithdrawalsValidator(
+        protocolSchedule.getForNextBlockHeader(parentBlockHeader, timestampForNextBlock));
+  }
+
+  private static WithdrawalsValidator getWithdrawalsValidator(final ProtocolSpec protocolSchedule) {
+    return Optional.ofNullable(protocolSchedule)
+        .map(ProtocolSpec::getWithdrawalsValidator)
+        .orElseGet(WithdrawalsValidator.ProhibitedWithdrawals::new);
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbase.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbase.java
index 5165c8133b6..ba3e3b09ac7 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbase.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbase.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
@@ -22,7 +23,6 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
-import org.hyperledger.besu.ethereum.core.Address;
 
 public class MinerSetCoinbase implements JsonRpcMethod {
 
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToAllowlist.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToAllowlist.java
index c4fde953988..b6c3390eaec 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToAllowlist.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToAllowlist.java
@@ -32,11 +32,11 @@
 public class PermAddNodesToAllowlist implements JsonRpcMethod {
 
   private final Optional<NodeLocalConfigPermissioningController>
-      nodeWhitelistPermissioningController;
+      nodeAllowlistPermissioningController;
 
   public PermAddNodesToAllowlist(
-      final Optional<NodeLocalConfigPermissioningController> nodeWhitelistPermissioningController) {
-    this.nodeWhitelistPermissioningController = nodeWhitelistPermissioningController;
+      final Optional<NodeLocalConfigPermissioningController> nodeAllowlistPermissioningController) {
+    this.nodeAllowlistPermissioningController = nodeAllowlistPermissioningController;
   }
 
   @Override
@@ -50,11 +50,11 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
         requestContext.getRequiredParameter(0, StringListParameter.class);
 
     try {
-      if (nodeWhitelistPermissioningController.isPresent()) {
+      if (nodeAllowlistPermissioningController.isPresent()) {
         try {
           final List<String> enodeURLs = enodeListParam.getStringList();
           final NodesAllowlistResult nodesAllowlistResult =
-              nodeWhitelistPermissioningController.get().addNodes(enodeURLs);
+              nodeAllowlistPermissioningController.get().addNodes(enodeURLs);
 
           switch (nodesAllowlistResult.result()) {
             case SUCCESS:
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesAllowlist.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesAllowlist.java
index ed763f8b1e3..728dd1d526e 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesAllowlist.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesAllowlist.java
@@ -30,11 +30,11 @@
 public class PermGetNodesAllowlist implements JsonRpcMethod {
 
   private final Optional<NodeLocalConfigPermissioningController>
-      nodeWhitelistPermissioningController;
+      nodeAllowlistPermissioningController;
 
   public PermGetNodesAllowlist(
-      final Optional<NodeLocalConfigPermissioningController> nodeWhitelistPermissioningController) {
-    this.nodeWhitelistPermissioningController = nodeWhitelistPermissioningController;
+      final Optional<NodeLocalConfigPermissioningController> nodeAllowlistPermissioningController) {
+    this.nodeAllowlistPermissioningController = nodeAllowlistPermissioningController;
   }
 
   @Override
@@ -45,9 +45,9 @@ public String getName() {
   @Override
   public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     try {
-      if (nodeWhitelistPermissioningController.isPresent()) {
+      if (nodeAllowlistPermissioningController.isPresent()) {
         final List<String> enodeList =
-            nodeWhitelistPermissioningController.get().getNodesAllowlist();
+            nodeAllowlistPermissioningController.get().getNodesAllowlist();
 
         return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), enodeList);
       } else {
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFile.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFile.java
index e17a7363062..f53334e8585 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFile.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFile.java
@@ -28,14 +28,14 @@
 
 public class PermReloadPermissionsFromFile implements JsonRpcMethod {
 
-  private final Optional<AccountLocalConfigPermissioningController> accountWhitelistController;
-  private final Optional<NodeLocalConfigPermissioningController> nodesWhitelistController;
+  private final Optional<AccountLocalConfigPermissioningController> accountAllowlistController;
+  private final Optional<NodeLocalConfigPermissioningController> nodesAllowlistController;
 
   public PermReloadPermissionsFromFile(
-      final Optional<AccountLocalConfigPermissioningController> accountWhitelistController,
-      final Optional<NodeLocalConfigPermissioningController> nodesWhitelistController) {
-    this.accountWhitelistController = accountWhitelistController;
-    this.nodesWhitelistController = nodesWhitelistController;
+      final Optional<AccountLocalConfigPermissioningController> accountAllowlistController,
+      final Optional<NodeLocalConfigPermissioningController> nodesAllowlistController) {
+    this.accountAllowlistController = accountAllowlistController;
+    this.nodesAllowlistController = nodesAllowlistController;
   }
 
   @Override
@@ -45,14 +45,14 @@ public String getName() {
 
   @Override
   public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
-    if (!accountWhitelistController.isPresent() && !nodesWhitelistController.isPresent()) {
+    if (!accountAllowlistController.isPresent() && !nodesAllowlistController.isPresent()) {
       return new JsonRpcErrorResponse(
           requestContext.getRequest().getId(), JsonRpcError.PERMISSIONING_NOT_ENABLED);
     }
 
     try {
-      accountWhitelistController.ifPresent(AccountLocalConfigPermissioningController::reload);
-      nodesWhitelistController.ifPresent(NodeLocalConfigPermissioningController::reload);
+      accountAllowlistController.ifPresent(AccountLocalConfigPermissioningController::reload);
+      nodesAllowlistController.ifPresent(NodeLocalConfigPermissioningController::reload);
       return new JsonRpcSuccessResponse(requestContext.getRequest().getId());
     } catch (Exception e) {
       return new JsonRpcErrorResponse(
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromAllowlist.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromAllowlist.java
index 3f28b603eed..f693d9fe0aa 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromAllowlist.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromAllowlist.java
@@ -32,11 +32,11 @@
 public class PermRemoveNodesFromAllowlist implements JsonRpcMethod {
 
   private final Optional<NodeLocalConfigPermissioningController>
-      nodeWhitelistPermissioningController;
+      nodeAllowlistPermissioningController;
 
   public PermRemoveNodesFromAllowlist(
-      final Optional<NodeLocalConfigPermissioningController> nodeWhitelistPermissioningController) {
-    this.nodeWhitelistPermissioningController = nodeWhitelistPermissioningController;
+      final Optional<NodeLocalConfigPermissioningController> nodeAllowlistPermissioningController) {
+    this.nodeAllowlistPermissioningController = nodeAllowlistPermissioningController;
   }
 
   @Override
@@ -49,11 +49,11 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     final StringListParameter enodeListParam =
         requestContext.getRequiredParameter(0, StringListParameter.class);
     try {
-      if (nodeWhitelistPermissioningController.isPresent()) {
+      if (nodeAllowlistPermissioningController.isPresent()) {
         try {
           final List<String> enodeURLs = enodeListParam.getStringList();
           final NodesAllowlistResult nodesAllowlistResult =
-              nodeWhitelistPermissioningController.get().removeNodes(enodeURLs);
+              nodeAllowlistPermissioningController.get().removeNodes(enodeURLs);
 
           switch (nodesAllowlistResult.result()) {
             case SUCCESS:
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/BlockParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/BlockParameter.java
index f70248ce15e..ceed60cbc95 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/BlockParameter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/BlockParameter.java
@@ -14,15 +14,17 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
 
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
 
 import java.util.Objects;
 import java.util.Optional;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 
-// Represents a block parameter that can be a special value ("pending", "earliest", "latest") or
-// a number formatted as a hex string.
+// Represents a block parameter that can be a special value ("pending", "earliest", "latest",
+// "finalized", "safe") or a number formatted as a hex string.
 // See: https://github.com/ethereum/wiki/wiki/JSON-RPC#the-default-block-parameter
 public class BlockParameter {
 
@@ -31,6 +33,8 @@ public class BlockParameter {
   public static final BlockParameter EARLIEST = new BlockParameter("earliest");
   public static final BlockParameter LATEST = new BlockParameter("latest");
   public static final BlockParameter PENDING = new BlockParameter("pending");
+  public static final BlockParameter FINALIZED = new BlockParameter("finalized");
+  public static final BlockParameter SAFE = new BlockParameter("safe");
 
   @JsonCreator
   public BlockParameter(final String value) {
@@ -49,6 +53,14 @@ public BlockParameter(final String value) {
         type = BlockParameterType.PENDING;
         number = Optional.empty();
         break;
+      case "finalized":
+        type = BlockParameterType.FINALIZED;
+        number = Optional.empty();
+        break;
+      case "safe":
+        type = BlockParameterType.SAFE;
+        number = Optional.empty();
+        break;
       default:
         type = BlockParameterType.NUMERIC;
         number = Optional.of(Long.decode(value));
@@ -77,10 +89,34 @@ public boolean isEarliest() {
     return this.type == BlockParameterType.EARLIEST;
   }
 
+  public boolean isFinalized() {
+    return this.type == BlockParameterType.FINALIZED;
+  }
+
+  public boolean isSafe() {
+    return this.type == BlockParameterType.SAFE;
+  }
+
   public boolean isNumeric() {
     return this.type == BlockParameterType.NUMERIC;
   }
 
+  public Optional<Long> getBlockNumber(final BlockchainQueries blockchain) {
+    if (this.isFinalized()) {
+      return blockchain.finalizedBlockHeader().map(ProcessableBlockHeader::getNumber);
+    } else if (this.isLatest()) {
+      return Optional.of(blockchain.headBlockNumber());
+    } else if (this.isPending()) {
+      // Pending not implemented, returns latest
+      return Optional.of(blockchain.headBlockNumber());
+    } else if (this.isSafe()) {
+      return blockchain.safeBlockHeader().map(ProcessableBlockHeader::getNumber);
+    } else {
+      // Alternate cases (numeric input or "earliest")
+      return this.getNumber();
+    }
+  }
+
   @Override
   public String toString() {
     return "BlockParameter{" + "type=" + type + ", number=" + number + '}';
@@ -103,6 +139,8 @@ private enum BlockParameterType {
     EARLIEST,
     LATEST,
     PENDING,
-    NUMERIC
+    NUMERIC,
+    FINALIZED,
+    SAFE
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/BlockParameterOrBlockHash.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/BlockParameterOrBlockHash.java
index 9c2e0f3f27d..172a34d56f6 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/BlockParameterOrBlockHash.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/BlockParameterOrBlockHash.java
@@ -14,21 +14,24 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
 
+import org.hyperledger.besu.config.JsonUtil;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 import java.util.Objects;
 import java.util.Optional;
 import java.util.OptionalLong;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
 
 /**
- * Represents a block parameter that can be a special value ("pending", "earliest", "latest") or a
- * number formatted as a hex string or a block hash.
+ * Represents a block parameter (or block hash) that can be a special value ("pending", "earliest",
+ * "latest", "finalized", "safe") or a number formatted as a hex string, or a block hash.
  *
  * <p>When distinguishing between a hash and a number it is presumed that a hash won't have three
- * quarters of the leading bytes as zero. This is fined for block hashes but not for precompiled
+ * quarters of the leading bytes as zero. This is fine for block hashes but not for precompiled
  * contracts.
  */
 public class BlockParameterOrBlockHash {
@@ -36,31 +39,68 @@ public class BlockParameterOrBlockHash {
   private final BlockParameterType type;
   private final OptionalLong number;
   private final Optional<Hash> blockHash;
+  private final boolean requireCanonical;
 
   @JsonCreator
-  public BlockParameterOrBlockHash(final String value) {
-    final String normalizedValue = value.toLowerCase();
-
-    if (Objects.equals(normalizedValue, "earliest")) {
-      type = BlockParameterType.EARLIEST;
-      number = OptionalLong.of(BlockHeader.GENESIS_BLOCK_NUMBER);
-      blockHash = Optional.empty();
-    } else if (Objects.equals(normalizedValue, "latest")) {
-      type = BlockParameterType.LATEST;
-      number = OptionalLong.empty();
-      blockHash = Optional.empty();
-    } else if (Objects.equals(normalizedValue, "pending")) {
-      type = BlockParameterType.PENDING;
-      number = OptionalLong.empty();
-      blockHash = Optional.empty();
-    } else if (normalizedValue.length() > 16) {
-      type = BlockParameterType.HASH;
-      number = OptionalLong.empty();
-      blockHash = Optional.of(Hash.fromHexStringLenient(normalizedValue));
+  public BlockParameterOrBlockHash(final Object value) throws JsonProcessingException {
+    if (value instanceof String) {
+      final String normalizedValue = String.valueOf(value).toLowerCase();
+
+      if (Objects.equals(normalizedValue, "earliest")) {
+        type = BlockParameterType.EARLIEST;
+        number = OptionalLong.of(BlockHeader.GENESIS_BLOCK_NUMBER);
+        blockHash = Optional.empty();
+        requireCanonical = false;
+      } else if (Objects.equals(normalizedValue, "latest")) {
+        type = BlockParameterType.LATEST;
+        number = OptionalLong.empty();
+        blockHash = Optional.empty();
+        requireCanonical = false;
+      } else if (Objects.equals(normalizedValue, "pending")) {
+        type = BlockParameterType.PENDING;
+        number = OptionalLong.empty();
+        blockHash = Optional.empty();
+        requireCanonical = false;
+      } else if (Objects.equals(normalizedValue, "safe")) {
+        type = BlockParameterType.SAFE;
+        number = OptionalLong.empty();
+        blockHash = Optional.empty();
+        requireCanonical = false;
+      } else if (Objects.equals(normalizedValue, "finalized")) {
+        type = BlockParameterType.FINALIZED;
+        number = OptionalLong.empty();
+        blockHash = Optional.empty();
+        requireCanonical = false;
+      } else if (normalizedValue.length() >= 65) { // with or without hex prefix
+        type = BlockParameterType.HASH;
+        number = OptionalLong.empty();
+        blockHash = Optional.of(Hash.fromHexStringLenient(normalizedValue));
+        requireCanonical = false;
+      } else if (normalizedValue.length() > 16) {
+        throw new IllegalArgumentException("hex number > 64 bits");
+      } else {
+        type = BlockParameterType.NUMERIC;
+        number = OptionalLong.of(Long.decode(value.toString()));
+        blockHash = Optional.empty();
+        requireCanonical = false;
+      }
     } else {
-      type = BlockParameterType.NUMERIC;
-      number = OptionalLong.of(Long.decode(value));
-      blockHash = Optional.empty();
+      JsonNode jsonNode = JsonUtil.objectNodeFromString(JsonUtil.getJson(value));
+      if (jsonNode.get("blockHash") != null) {
+        type = BlockParameterType.HASH;
+        number = OptionalLong.empty();
+        blockHash = Optional.of(Hash.fromHexStringLenient(jsonNode.get("blockHash").asText()));
+        if (jsonNode.get("requireCanonical") != null) {
+          requireCanonical = jsonNode.get("requireCanonical").asBoolean();
+        } else {
+          requireCanonical = false;
+        }
+      } else {
+        type = BlockParameterType.NUMERIC;
+        number = OptionalLong.of(Long.decode(jsonNode.get("blockNumber").asText()));
+        blockHash = Optional.empty();
+        requireCanonical = false;
+      }
     }
   }
 
@@ -72,6 +112,10 @@ public Optional<Hash> getHash() {
     return blockHash;
   }
 
+  public boolean getRequireCanonical() {
+    return requireCanonical;
+  }
+
   public boolean isPending() {
     return this.type == BlockParameterType.PENDING;
   }
@@ -80,6 +124,14 @@ public boolean isLatest() {
     return this.type == BlockParameterType.LATEST;
   }
 
+  public boolean isSafe() {
+    return this.type == BlockParameterType.SAFE;
+  }
+
+  public boolean isFinalized() {
+    return this.type == BlockParameterType.FINALIZED;
+  }
+
   public boolean isEarliest() {
     return this.type == BlockParameterType.EARLIEST;
   }
@@ -96,6 +148,8 @@ private enum BlockParameterType {
     EARLIEST,
     LATEST,
     PENDING,
+    SAFE,
+    FINALIZED,
     NUMERIC,
     HASH
   }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/DepositParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/DepositParameter.java
new file mode 100644
index 00000000000..c13bc0435fc
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/DepositParameter.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
+
+import org.hyperledger.besu.datatypes.BLSPublicKey;
+import org.hyperledger.besu.datatypes.BLSSignature;
+import org.hyperledger.besu.datatypes.GWei;
+import org.hyperledger.besu.ethereum.core.Deposit;
+
+import java.util.Objects;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonGetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.vertx.core.json.JsonObject;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt64;
+
+public class DepositParameter {
+
+  private final String publicKey;
+
+  private final String withdrawalCredentials;
+  private final String amount;
+
+  private final String signature;
+  private final String index;
+
+  @JsonCreator
+  public DepositParameter(
+      @JsonProperty("pubkey") final String pubKey,
+      @JsonProperty("withdrawalCredentials") final String withdrawalCredentials,
+      @JsonProperty("amount") final String amount,
+      @JsonProperty("signature") final String signature,
+      @JsonProperty("index") final String index) {
+    this.publicKey = pubKey;
+    this.withdrawalCredentials = withdrawalCredentials;
+    this.amount = amount;
+    this.signature = signature;
+    this.index = index;
+  }
+
+  public static DepositParameter fromDeposit(final Deposit deposit) {
+    return new DepositParameter(
+        deposit.getPublicKey().toString(),
+        deposit.getWithdrawalCredentials().toString(),
+        deposit.getAmount().toShortHexString(),
+        deposit.getSignature().toString(),
+        deposit.getIndex().toBytes().toQuantityHexString());
+  }
+
+  public Deposit toDeposit() {
+    return new Deposit(
+        BLSPublicKey.fromHexString(publicKey),
+        Bytes32.fromHexString(withdrawalCredentials),
+        GWei.fromHexString(amount),
+        BLSSignature.fromHexString(signature),
+        UInt64.fromHexString(index));
+  }
+
+  public JsonObject asJsonObject() {
+    return new JsonObject()
+        .put("pubKey", publicKey)
+        .put("withdrawalCredentials", withdrawalCredentials)
+        .put("amount", amount)
+        .put("signature", signature)
+        .put("index", index);
+  }
+
+  @JsonGetter
+  public String getPublicKey() {
+    return publicKey;
+  }
+
+  @JsonGetter
+  public String getWithdrawalCredentials() {
+    return withdrawalCredentials;
+  }
+
+  @JsonGetter
+  public String getAmount() {
+    return amount;
+  }
+
+  @JsonGetter
+  public String getSignature() {
+    return signature;
+  }
+
+  @JsonGetter
+  public String getIndex() {
+    return index;
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    final DepositParameter that = (DepositParameter) o;
+    return Objects.equals(publicKey, that.publicKey)
+        && Objects.equals(withdrawalCredentials, that.withdrawalCredentials)
+        && Objects.equals(amount, that.amount)
+        && Objects.equals(signature, that.signature)
+        && Objects.equals(index, that.index);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(publicKey, withdrawalCredentials, amount, signature, index);
+  }
+
+  @Override
+  public String toString() {
+    return "DepositParameter{"
+        + "pubKey='"
+        + publicKey
+        + '\''
+        + ", withdrawalCredentials='"
+        + withdrawalCredentials
+        + '\''
+        + ", amount='"
+        + amount
+        + '\''
+        + ", signature='"
+        + signature
+        + '\''
+        + ", index='"
+        + index
+        + '\''
+        + '}';
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EngineExchangeTransitionConfigurationParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EngineExchangeTransitionConfigurationParameter.java
new file mode 100644
index 00000000000..3833fa80c4f
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EngineExchangeTransitionConfigurationParameter.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class EngineExchangeTransitionConfigurationParameter {
+  private final Difficulty terminalTotalDifficulty;
+  private final Hash terminalBlockHash;
+  private final long terminalBlockNumber;
+
+  @JsonCreator
+  public EngineExchangeTransitionConfigurationParameter(
+      @JsonProperty("terminalTotalDifficulty") final String terminalTotalDifficulty,
+      @JsonProperty("terminalBlockHash") final String terminalBlockHash,
+      @JsonProperty("terminalBlockNumber") final UnsignedLongParameter terminalBlockNumber) {
+    this.terminalTotalDifficulty = Difficulty.fromHexString(terminalTotalDifficulty);
+    this.terminalBlockHash = Hash.fromHexString(terminalBlockHash);
+    this.terminalBlockNumber = terminalBlockNumber.getValue();
+  }
+
+  public Difficulty getTerminalTotalDifficulty() {
+    return terminalTotalDifficulty;
+  }
+
+  @JsonProperty("terminalTotalDifficulty")
+  public String getTerminalTotalDifficultyAsHexString() {
+    return terminalTotalDifficulty.toShortHexString();
+  }
+
+  public Hash getTerminalBlockHash() {
+    return terminalBlockHash;
+  }
+
+  @JsonProperty("terminalBlockHash")
+  public String getTerminalBlockHashAsHexString() {
+    return terminalBlockHash.toShortHexString();
+  }
+
+  public long getTerminalBlockNumber() {
+    return terminalBlockNumber;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EngineForkchoiceUpdatedParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EngineForkchoiceUpdatedParameter.java
new file mode 100644
index 00000000000..7b3e50a07e1
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EngineForkchoiceUpdatedParameter.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
+
+import org.hyperledger.besu.datatypes.Hash;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class EngineForkchoiceUpdatedParameter {
+  private final Hash headBlockHash;
+
+  private final Hash safeBlockHash;
+
+  private final Hash finalizedBlockHash;
+
+  public Hash getHeadBlockHash() {
+    return headBlockHash;
+  }
+
+  public Hash getFinalizedBlockHash() {
+    return finalizedBlockHash;
+  }
+
+  public Hash getSafeBlockHash() {
+    return safeBlockHash;
+  }
+
+  @JsonCreator
+  public EngineForkchoiceUpdatedParameter(
+      @JsonProperty("headBlockHash") final Hash headBlockHash,
+      @JsonProperty("finalizedBlockHash") final Hash finalizedBlockHash,
+      @JsonProperty("safeBlockHash") final Hash safeBlockHash) {
+    this.finalizedBlockHash = finalizedBlockHash;
+    this.headBlockHash = headBlockHash;
+    this.safeBlockHash = safeBlockHash;
+  }
+
+  @Override
+  public String toString() {
+    return "headBlockHash="
+        + headBlockHash
+        + ", safeBlockHash="
+        + safeBlockHash
+        + ", finalizedBlockHash="
+        + finalizedBlockHash;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EnginePayloadAttributesParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EnginePayloadAttributesParameter.java
new file mode 100644
index 00000000000..caa0fa5d74b
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EnginePayloadAttributesParameter.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
+
+import org.hyperledger.besu.datatypes.Address;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.vertx.core.json.JsonObject;
+import org.apache.tuweni.bytes.Bytes32;
+
+public class EnginePayloadAttributesParameter {
+
+  final Long timestamp;
+  final Bytes32 prevRandao;
+  final Address suggestedFeeRecipient;
+  final List<WithdrawalParameter> withdrawals;
+
+  @JsonCreator
+  public EnginePayloadAttributesParameter(
+      @JsonProperty("timestamp") final String timestamp,
+      @JsonProperty("prevRandao") final String prevRandao,
+      @JsonProperty("suggestedFeeRecipient") final String suggestedFeeRecipient,
+      @JsonProperty("withdrawals") final List<WithdrawalParameter> withdrawals) {
+    this.timestamp = Long.decode(timestamp);
+    this.prevRandao = Bytes32.fromHexString(prevRandao);
+    this.suggestedFeeRecipient = Address.fromHexString(suggestedFeeRecipient);
+    this.withdrawals = withdrawals;
+  }
+
+  public Long getTimestamp() {
+    return timestamp;
+  }
+
+  public Bytes32 getPrevRandao() {
+    return prevRandao;
+  }
+
+  public Address getSuggestedFeeRecipient() {
+    return suggestedFeeRecipient;
+  }
+
+  public List<WithdrawalParameter> getWithdrawals() {
+    return withdrawals;
+  }
+
+  public String serialize() {
+    final JsonObject json =
+        new JsonObject()
+            .put("timestamp", timestamp)
+            .put("prevRandao", prevRandao.toHexString())
+            .put("suggestedFeeRecipient", suggestedFeeRecipient.toHexString());
+    if (withdrawals != null) {
+      json.put(
+          "withdrawals",
+          withdrawals.stream().map(WithdrawalParameter::asJsonObject).collect(Collectors.toList()));
+    }
+    return json.encode();
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EnginePayloadParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EnginePayloadParameter.java
new file mode 100644
index 00000000000..13197d92b93
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EnginePayloadParameter.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.tuweni.bytes.Bytes32;
+
+/**
+ * parentHash: DATA, 32 Bytes feeRecipient: DATA, 20 Bytes stateRoot: DATA, 32 Bytes receiptsRoot:
+ * DATA, 32 Bytes logsBloom: DATA, 256 Bytes prevRandao: DATA, 32 Bytes blockNumber: QUANTITY
+ * gasLimit: QUANTITY gasUsed: QUANTITY timestamp: QUANTITY baseFeePerGas: QUANTITY blockHash: DATA,
+ * 32 Bytes transactions: Array of TypedTransaction
+ */
+public class EnginePayloadParameter {
+  private final Hash blockHash;
+  private final Hash parentHash;
+  private final Address feeRecipient;
+  private final Hash stateRoot;
+  private final long blockNumber;
+  private final Bytes32 prevRandao;
+  private final Wei baseFeePerGas;
+  private final long gasLimit;
+  private final long gasUsed;
+  private final long timestamp;
+  private final String extraData;
+  private final Hash receiptsRoot;
+  private final LogsBloomFilter logsBloom;
+  private final List<String> transactions;
+  private final List<WithdrawalParameter> withdrawals;
+  private final List<DepositParameter> deposits;
+
+  @JsonCreator
+  public EnginePayloadParameter(
+      @JsonProperty("blockHash") final Hash blockHash,
+      @JsonProperty("parentHash") final Hash parentHash,
+      @JsonProperty("feeRecipient") final Address feeRecipient,
+      @JsonProperty("stateRoot") final Hash stateRoot,
+      @JsonProperty("blockNumber") final UnsignedLongParameter blockNumber,
+      @JsonProperty("baseFeePerGas") final String baseFeePerGas,
+      @JsonProperty("gasLimit") final UnsignedLongParameter gasLimit,
+      @JsonProperty("gasUsed") final UnsignedLongParameter gasUsed,
+      @JsonProperty("timestamp") final UnsignedLongParameter timestamp,
+      @JsonProperty("extraData") final String extraData,
+      @JsonProperty("receiptRoot") final Hash receiptsRoot,
+      @JsonProperty("logsBloom") final LogsBloomFilter logsBloom,
+      @JsonProperty("prevRandao") final String prevRandao,
+      @JsonProperty("transactions") final List<String> transactions,
+      @JsonProperty("withdrawals") final List<WithdrawalParameter> withdrawals,
+      @JsonProperty("deposits") final List<DepositParameter> deposits) {
+    this.blockHash = blockHash;
+    this.parentHash = parentHash;
+    this.feeRecipient = feeRecipient;
+    this.stateRoot = stateRoot;
+    this.blockNumber = blockNumber.getValue();
+    this.baseFeePerGas = Wei.fromHexString(baseFeePerGas);
+    this.gasLimit = gasLimit.getValue();
+    this.gasUsed = gasUsed.getValue();
+    this.timestamp = timestamp.getValue();
+    this.extraData = extraData;
+    this.receiptsRoot = receiptsRoot;
+    this.logsBloom = logsBloom;
+    this.prevRandao = Bytes32.fromHexString(prevRandao);
+    this.transactions = transactions;
+    this.withdrawals = withdrawals;
+    this.deposits = deposits;
+  }
+
+  public Hash getBlockHash() {
+    return blockHash;
+  }
+
+  public Hash getParentHash() {
+    return parentHash;
+  }
+
+  public Address getFeeRecipient() {
+    return feeRecipient;
+  }
+
+  public Hash getStateRoot() {
+    return stateRoot;
+  }
+
+  public long getBlockNumber() {
+    return blockNumber;
+  }
+
+  public Wei getBaseFeePerGas() {
+    return baseFeePerGas;
+  }
+
+  public long getGasLimit() {
+    return gasLimit;
+  }
+
+  public long getGasUsed() {
+    return gasUsed;
+  }
+
+  public long getTimestamp() {
+    return timestamp;
+  }
+
+  public String getExtraData() {
+    return extraData;
+  }
+
+  public Hash getReceiptsRoot() {
+    return receiptsRoot;
+  }
+
+  public LogsBloomFilter getLogsBloom() {
+    return logsBloom;
+  }
+
+  public Bytes32 getPrevRandao() {
+    return prevRandao;
+  }
+
+  public List<String> getTransactions() {
+    return transactions;
+  }
+
+  public List<WithdrawalParameter> getWithdrawals() {
+    return withdrawals;
+  }
+
+  public List<DepositParameter> getDeposits() {
+    return deposits;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EnginePreparePayloadParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EnginePreparePayloadParameter.java
new file mode 100644
index 00000000000..698d3888ed4
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EnginePreparePayloadParameter.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.tuweni.bytes.Bytes32;
+
+public class EnginePreparePayloadParameter {
+  private final Optional<Hash> parentHash;
+  private final Address feeRecipient;
+  private final Bytes32 prevRandao;
+  private final Optional<Long> timestamp;
+  final List<WithdrawalParameter> withdrawals;
+
+  @JsonCreator
+  public EnginePreparePayloadParameter(
+      @JsonProperty("parentHash") final Optional<Hash> parentHash,
+      @JsonProperty("feeRecipient") final Optional<Address> feeRecipient,
+      @JsonProperty("timestamp") final Optional<UnsignedLongParameter> timestamp,
+      @JsonProperty("prevRandao") final Optional<String> prevRandao,
+      @JsonProperty("withdrawals") final Optional<List<WithdrawalParameter>> withdrawals) {
+    this.parentHash = parentHash;
+    this.feeRecipient = feeRecipient.orElse(Address.ZERO);
+    this.timestamp = timestamp.map(UnsignedLongParameter::getValue);
+    this.prevRandao = Bytes32.fromHexStringLenient(prevRandao.orElse("deadbeef"));
+    this.withdrawals = withdrawals.orElse(Collections.emptyList());
+  }
+
+  public Optional<Hash> getParentHash() {
+    return parentHash;
+  }
+
+  public Address getFeeRecipient() {
+    return feeRecipient;
+  }
+
+  public Optional<Long> getTimestamp() {
+    return timestamp;
+  }
+
+  public Bytes32 getPrevRandao() {
+    return prevRandao;
+  }
+
+  public List<WithdrawalParameter> getWithdrawals() {
+    return withdrawals;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/FilterParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/FilterParameter.java
index 4384567f862..9a68f9e2edb 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/FilterParameter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/FilterParameter.java
@@ -16,10 +16,10 @@
 
 import static java.util.Collections.emptyList;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.query.LogsQuery;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.LogTopic;
+import org.hyperledger.besu.evm.log.LogTopic;
 
 import java.util.List;
 import java.util.Objects;
@@ -30,34 +30,47 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.google.common.base.MoreObjects;
 
 public class FilterParameter {
 
   private final BlockParameter fromBlock;
   private final BlockParameter toBlock;
+  private final List<Address> fromAddress;
+  private final List<Address> toAddress;
   private final List<Address> addresses;
   private final List<List<LogTopic>> topics;
   private final Optional<Hash> maybeBlockHash;
   private final LogsQuery logsQuery;
+  private final Optional<Integer> after, count;
   private final boolean isValid;
 
   @JsonCreator
   public FilterParameter(
       @JsonProperty("fromBlock") final BlockParameter fromBlock,
       @JsonProperty("toBlock") final BlockParameter toBlock,
+      @JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+          @JsonProperty("fromAddress")
+          final List<Address> fromAddress,
+      @JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY) @JsonProperty("toAddress")
+          final List<Address> toAddress,
       @JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY) @JsonProperty("address")
           final List<Address> address,
       @JsonDeserialize(using = TopicsDeserializer.class) @JsonProperty("topics")
           final List<List<LogTopic>> topics,
-      @JsonProperty("blockHash") @JsonAlias({"blockhash"}) final Hash blockHash) {
+      @JsonProperty("blockHash") @JsonAlias({"blockhash"}) final Hash blockHash,
+      @JsonProperty("after") final Integer after,
+      @JsonProperty("count") final Integer count) {
     this.isValid = blockHash == null || (fromBlock == null && toBlock == null);
     this.fromBlock = fromBlock != null ? fromBlock : BlockParameter.LATEST;
     this.toBlock = toBlock != null ? toBlock : BlockParameter.LATEST;
+    this.fromAddress = fromAddress != null ? fromAddress : emptyList();
+    this.toAddress = toAddress != null ? toAddress : emptyList();
     this.addresses = address != null ? address : emptyList();
     this.topics = topics != null ? topics : emptyList();
     this.logsQuery = new LogsQuery(addresses, topics);
     this.maybeBlockHash = Optional.ofNullable(blockHash);
+    this.after = Optional.ofNullable(after);
+    this.count = Optional.ofNullable(count);
   }
 
   public BlockParameter getFromBlock() {
@@ -68,6 +81,14 @@ public BlockParameter getToBlock() {
     return toBlock;
   }
 
+  public List<Address> getFromAddress() {
+    return fromAddress;
+  }
+
+  public List<Address> getToAddress() {
+    return toAddress;
+  }
+
   public List<Address> getAddresses() {
     return addresses;
   }
@@ -84,33 +105,74 @@ public LogsQuery getLogsQuery() {
     return logsQuery;
   }
 
+  public Optional<Integer> getAfter() {
+    return after;
+  }
+
+  public Optional<Integer> getCount() {
+    return count;
+  }
+
   @Override
   public boolean equals(final Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
     FilterParameter that = (FilterParameter) o;
-    return fromBlock.equals(that.fromBlock)
-        && toBlock.equals(that.toBlock)
-        && addresses.equals(that.addresses)
-        && topics.equals(that.topics)
-        && maybeBlockHash.equals(that.maybeBlockHash)
-        && logsQuery.equals(that.logsQuery);
+    return isValid == that.isValid
+        && Objects.equals(fromBlock, that.fromBlock)
+        && Objects.equals(toBlock, that.toBlock)
+        && Objects.equals(fromAddress, that.fromAddress)
+        && Objects.equals(toAddress, that.toAddress)
+        && Objects.equals(addresses, that.addresses)
+        && Objects.equals(topics, that.topics)
+        && Objects.equals(maybeBlockHash, that.maybeBlockHash)
+        && Objects.equals(logsQuery, that.logsQuery)
+        && Objects.equals(after, that.after)
+        && Objects.equals(count, that.count);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(fromBlock, toBlock, addresses, topics, maybeBlockHash, logsQuery);
+    return Objects.hash(
+        fromBlock,
+        toBlock,
+        fromAddress,
+        toAddress,
+        addresses,
+        topics,
+        maybeBlockHash,
+        logsQuery,
+        after,
+        count,
+        isValid);
   }
 
   @Override
   public String toString() {
-    return MoreObjects.toStringHelper(this)
-        .add("fromBlock", fromBlock)
-        .add("toBlock", toBlock)
-        .add("addresses", addresses)
-        .add("topics", topics)
-        .add("blockHash", maybeBlockHash)
-        .toString();
+    return "FilterParameter{"
+        + "fromBlock="
+        + fromBlock
+        + ", toBlock="
+        + toBlock
+        + ", fromAddress="
+        + fromAddress
+        + ", toAddress="
+        + toAddress
+        + ", addresses="
+        + addresses
+        + ", topics="
+        + topics
+        + ", maybeBlockHash="
+        + maybeBlockHash
+        + ", logsQuery="
+        + logsQuery
+        + ", after="
+        + after
+        + ", count="
+        + count
+        + ", isValid="
+        + isValid
+        + '}';
   }
 
   public boolean isValid() {
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java
index c9ff32a3444..bbcc2ee2e72 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java
@@ -14,51 +14,68 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
 
-import static java.lang.Boolean.FALSE;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.deserializer.GasDeserializer;
-import org.hyperledger.besu.ethereum.core.deserializer.HexStringDeserializer;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.json.HexLongDeserializer;
+import org.hyperledger.besu.ethereum.core.json.HexStringDeserializer;
 import org.hyperledger.besu.ethereum.transaction.CallParameter;
+import org.hyperledger.besu.evm.AccessListEntry;
 
+import java.util.List;
 import java.util.Optional;
 
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class JsonCallParameter extends CallParameter {
 
-  private final boolean strict;
+  private static final Logger LOG = LoggerFactory.getLogger(JsonCallParameter.class);
+
+  private final Optional<Boolean> strict;
 
   @JsonCreator
   public JsonCallParameter(
       @JsonProperty("from") final Address from,
       @JsonProperty("to") final Address to,
-      @JsonDeserialize(using = GasDeserializer.class) @JsonProperty("gas") final Gas gasLimit,
+      @JsonDeserialize(using = HexLongDeserializer.class) @JsonProperty("gas") final Long gasLimit,
       @JsonProperty("gasPrice") final Wei gasPrice,
-      @JsonProperty("gasPremium") final Wei gasPremium,
-      @JsonProperty("feeCap") final Wei feeCap,
+      @JsonProperty("maxPriorityFeePerGas") final Wei maxPriorityFeePerGas,
+      @JsonProperty("maxFeePerGas") final Wei maxFeePerGas,
       @JsonProperty("value") final Wei value,
       @JsonDeserialize(using = HexStringDeserializer.class) @JsonProperty("data")
           final Bytes payload,
-      @JsonProperty("strict") final Boolean strict) {
+      @JsonProperty("strict") final Boolean strict,
+      @JsonProperty("accessList") final List<AccessListEntry> accessList) {
     super(
         from,
         to,
-        gasLimit != null ? gasLimit.toLong() : -1,
+        gasLimit != null ? gasLimit : -1L,
         gasPrice,
-        Optional.ofNullable(gasPremium),
-        Optional.ofNullable(feeCap),
+        Optional.ofNullable(maxPriorityFeePerGas),
+        Optional.ofNullable(maxFeePerGas),
         value,
-        payload);
-    this.strict = Optional.ofNullable(strict).orElse(FALSE);
+        payload,
+        Optional.ofNullable(accessList));
+    this.strict = Optional.ofNullable(strict);
   }
 
-  public boolean isStrict() {
+  public Optional<Boolean> isMaybeStrict() {
     return strict;
   }
+
+  @JsonAnySetter
+  public void logUnknownProperties(final String key, final Object value) {
+    LOG.debug(
+        "unknown property - {} with value - {} and type - {} caught during serialization",
+        key,
+        value,
+        value.getClass());
+  }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonRpcParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonRpcParameter.java
index d84ed0b9208..b025ec1d579 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonRpcParameter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonRpcParameter.java
@@ -20,10 +20,13 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 
 public class JsonRpcParameter {
 
-  private static final ObjectMapper mapper = new ObjectMapper();
+  private static final ObjectMapper mapper =
+      new ObjectMapper()
+          .registerModule(new Jdk8Module()); // Handle JDK8 Optionals (de)serialization
 
   /**
    * Retrieves a required parameter at the given index interpreted as the given class. Throws
@@ -71,7 +74,11 @@ public <T> Optional<T> optional(
         final String json = mapper.writeValueAsString(rawParam);
         param = mapper.readValue(json, paramClass);
       } catch (final JsonProcessingException e) {
-        throw new InvalidJsonRpcParameters("Invalid json rpc parameter at index " + index, e);
+        throw new InvalidJsonRpcParameters(
+            String.format(
+                "Invalid json rpc parameter at index %d. Supplied value was: '%s' of type: '%s' - expected type: '%s'",
+                index, rawParam, rawParam.getClass().getName(), paramClass.getName()),
+            e);
       }
     }
 
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TopicsDeserializer.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TopicsDeserializer.java
index 3aec91040e3..7e4b5794f47 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TopicsDeserializer.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TopicsDeserializer.java
@@ -16,7 +16,7 @@
 
 import static java.util.Collections.singletonList;
 
-import org.hyperledger.besu.ethereum.core.LogTopic;
+import org.hyperledger.besu.evm.log.LogTopic;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TraceCallManyParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TraceCallManyParameter.java
new file mode 100644
index 00000000000..4b0b618f7a4
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TraceCallManyParameter.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+
+public class TraceCallManyParameter {
+  TraceCallParameterTuple params;
+
+  @JsonCreator
+  public TraceCallManyParameter(
+      @JsonDeserialize(using = TraceCallParameterDeserializer.class)
+          final TraceCallParameterTuple parameters) {
+    this.params = parameters;
+  }
+
+  public TraceCallParameterTuple getTuple() {
+    return this.params;
+  }
+}
+
+class TraceCallParameterDeserializer extends StdDeserializer<TraceCallParameterTuple> {
+
+  public TraceCallParameterDeserializer(final Class<?> vc) {
+    super(vc);
+  }
+
+  public TraceCallParameterDeserializer() {
+    this(null);
+  }
+
+  @Override
+  public TraceCallParameterTuple deserialize(final JsonParser p, final DeserializationContext ctxt)
+      throws IOException {
+    final ObjectMapper mapper = new ObjectMapper();
+    final JsonNode tupleNode = p.getCodec().readTree(p);
+    return new TraceCallParameterTuple(
+        mapper.readValue(tupleNode.get(0).toString(), JsonCallParameter.class),
+        mapper.readValue(tupleNode.get(1).toString(), TraceTypeParameter.class));
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TraceCallParameterTuple.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TraceCallParameterTuple.java
new file mode 100644
index 00000000000..360a554e5c0
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TraceCallParameterTuple.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
+
+public class TraceCallParameterTuple {
+  private final JsonCallParameter jsonCallParameter;
+  private final TraceTypeParameter traceTypeParameter;
+
+  public TraceCallParameterTuple(
+      final JsonCallParameter callParameter, final TraceTypeParameter traceTypeParameter) {
+    this.jsonCallParameter = callParameter;
+    this.traceTypeParameter = traceTypeParameter;
+  }
+
+  public JsonCallParameter getJsonCallParameter() {
+    return jsonCallParameter;
+  }
+
+  public TraceTypeParameter getTraceTypeParameter() {
+    return traceTypeParameter;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TraceTypeParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TraceTypeParameter.java
index 93203c6e62e..80ba8bf6736 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TraceTypeParameter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TraceTypeParameter.java
@@ -76,4 +76,9 @@ private void validateTraceTypes(final List<String> traceTypesInput)
       throw new InvalidJsonRpcParameters("Invalid trace types supplied: " + unsupportedTypes);
     }
   }
+
+  @Override
+  public String toString() {
+    return "TraceTypeParameter" + getTraceTypes().stream().collect(Collectors.toList());
+  }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/UnsignedIntParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/UnsignedIntParameter.java
index b3fbf6ac027..a21917dc0ba 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/UnsignedIntParameter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/UnsignedIntParameter.java
@@ -28,6 +28,12 @@ public UnsignedIntParameter(final String value) {
     checkArgument(this.value >= 0);
   }
 
+  @JsonCreator
+  public UnsignedIntParameter(final int value) {
+    this.value = value;
+    checkArgument(this.value >= 0);
+  }
+
   public int getValue() {
     return value;
   }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/UnsignedLongParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/UnsignedLongParameter.java
index 74c49855169..603ae288c70 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/UnsignedLongParameter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/UnsignedLongParameter.java
@@ -28,6 +28,12 @@ public UnsignedLongParameter(final String value) {
     checkArgument(this.value >= 0);
   }
 
+  @JsonCreator
+  public UnsignedLongParameter(final long value) {
+    this.value = value;
+    checkArgument(this.value >= 0);
+  }
+
   public long getValue() {
     return value;
   }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/WithdrawalParameter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/WithdrawalParameter.java
new file mode 100644
index 00000000000..80bce6e31e0
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/WithdrawalParameter.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.GWei;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+
+import java.util.Objects;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonGetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.vertx.core.json.JsonObject;
+import org.apache.tuweni.units.bigints.UInt64;
+
+public class WithdrawalParameter {
+
+  private final String index;
+  private final String validatorIndex;
+  private final String address;
+  private final String amount;
+
+  @JsonCreator
+  public WithdrawalParameter(
+      @JsonProperty("index") final String index,
+      @JsonProperty("validatorIndex") final String validatorIndex,
+      @JsonProperty("address") final String address,
+      @JsonProperty("amount") final String amount) {
+    this.index = index;
+    this.validatorIndex = validatorIndex;
+    this.address = address;
+    this.amount = amount;
+  }
+
+  public static WithdrawalParameter fromWithdrawal(final Withdrawal withdrawal) {
+    return new WithdrawalParameter(
+        withdrawal.getIndex().toBytes().toQuantityHexString(),
+        withdrawal.getValidatorIndex().toBytes().toQuantityHexString(),
+        withdrawal.getAddress().toString(),
+        withdrawal.getAmount().toShortHexString());
+  }
+
+  public Withdrawal toWithdrawal() {
+    return new Withdrawal(
+        UInt64.fromHexString(index),
+        UInt64.fromHexString(validatorIndex),
+        Address.fromHexString(address),
+        GWei.fromHexString(amount));
+  }
+
+  public JsonObject asJsonObject() {
+    return new JsonObject()
+        .put("index", index)
+        .put("validatorIndex", validatorIndex)
+        .put("address", address)
+        .put("amount", amount);
+  }
+
+  @JsonGetter
+  public String getIndex() {
+    return index;
+  }
+
+  @JsonGetter
+  public String getValidatorIndex() {
+    return validatorIndex;
+  }
+
+  @JsonGetter
+  public String getAddress() {
+    return address;
+  }
+
+  @JsonGetter
+  public String getAmount() {
+    return amount;
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    final WithdrawalParameter that = (WithdrawalParameter) o;
+    return Objects.equals(index, that.index)
+        && Objects.equals(validatorIndex, that.validatorIndex)
+        && Objects.equals(address, that.address)
+        && Objects.equals(amount, that.amount);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(index, validatorIndex, address, amount);
+  }
+
+  @Override
+  public String toString() {
+    return "WithdrawalParameter{"
+        + "index='"
+        + index
+        + '\''
+        + ", validatorIndex='"
+        + validatorIndex
+        + '\''
+        + ", address='"
+        + address
+        + '\''
+        + ", amount='"
+        + amount
+        + '\''
+        + '}';
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/EnclavePublicKeyProvider.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/EnclavePublicKeyProvider.java
deleted file mode 100644
index 184fa1da560..00000000000
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/EnclavePublicKeyProvider.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods;
-
-import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.MultiTenancyUserUtil.enclavePublicKey;
-
-import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-
-import java.util.Optional;
-
-import io.vertx.ext.auth.User;
-
-@FunctionalInterface
-public interface EnclavePublicKeyProvider {
-
-  String getEnclaveKey(Optional<User> user);
-
-  static EnclavePublicKeyProvider build(final PrivacyParameters privacyParameters) {
-    return privacyParameters.isMultiTenancyEnabled()
-        ? multiTenancyEnclavePublicKeyProvider()
-        : defaultEnclavePublicKeyProvider(privacyParameters);
-  }
-
-  private static EnclavePublicKeyProvider multiTenancyEnclavePublicKeyProvider() {
-    return user ->
-        enclavePublicKey(user)
-            .orElseThrow(
-                () -> new IllegalStateException("Request does not contain an authorization token"));
-  }
-
-  private static EnclavePublicKeyProvider defaultEnclavePublicKeyProvider(
-      final PrivacyParameters privacyParameters) {
-    return user -> privacyParameters.getEnclavePublicKey();
-  }
-}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/MultiTenancyRpcMethodDecorator.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/MultiTenancyRpcMethodDecorator.java
index 27f1995b2b0..09ae469dfde 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/MultiTenancyRpcMethodDecorator.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/MultiTenancyRpcMethodDecorator.java
@@ -14,8 +14,6 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
-
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
@@ -26,10 +24,11 @@
 import java.util.Optional;
 
 import io.vertx.ext.auth.User;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MultiTenancyRpcMethodDecorator implements JsonRpcMethod {
-  private static final Logger LOG = getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(MultiTenancyRpcMethodDecorator.class);
   private final JsonRpcMethod rpcMethod;
 
   public MultiTenancyRpcMethodDecorator(final JsonRpcMethod rpcMethod) {
@@ -48,7 +47,7 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     if (user.isEmpty()) {
       LOG.error("Request does not contain an authorization token");
       return new JsonRpcUnauthorizedResponse(id, JsonRpcError.UNAUTHORIZED);
-    } else if (MultiTenancyUserUtil.enclavePublicKey(user).isEmpty()) {
+    } else if (MultiTenancyUserUtil.privacyUserId(user).isEmpty()) {
       LOG.error("Request token does not contain an enclave public key");
       return new JsonRpcErrorResponse(id, JsonRpcError.INVALID_REQUEST);
     } else {
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/MultiTenancyUserUtil.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/MultiTenancyUserUtil.java
index 882f74d9b85..871d3fa577c 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/MultiTenancyUserUtil.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/MultiTenancyUserUtil.java
@@ -19,9 +19,14 @@
 import io.vertx.ext.auth.User;
 
 public class MultiTenancyUserUtil {
+  private static final String PRIVACY_USER_ID_CLAIM = "privacyUserId";
   private static final String ENCLAVE_PRIVACY_PUBLIC_KEY_CLAIM = "privacyPublicKey";
 
-  public static Optional<String> enclavePublicKey(final Optional<User> user) {
-    return user.map(u -> u.principal().getString(ENCLAVE_PRIVACY_PUBLIC_KEY_CLAIM));
+  public static Optional<String> privacyUserId(final Optional<User> user) {
+    return user.map(
+        u -> {
+          final String id = u.principal().getString(PRIVACY_USER_ID_CLAIM);
+          return id != null ? id : u.principal().getString(ENCLAVE_PRIVACY_PUBLIC_KEY_CLAIM);
+        });
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/PrivGetFilterChanges.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/PrivGetFilterChanges.java
index 65333c30f91..cffa17d12f8 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/PrivGetFilterChanges.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/PrivGetFilterChanges.java
@@ -24,6 +24,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.LogsResult;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
+import org.hyperledger.besu.ethereum.privacy.MultiTenancyPrivacyController;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 
 import java.util.List;
@@ -31,16 +32,16 @@
 public class PrivGetFilterChanges implements JsonRpcMethod {
 
   private final PrivacyController privacyController;
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider;
+  private final PrivacyIdProvider privacyIdProvider;
   private final FilterManager filterManager;
 
   public PrivGetFilterChanges(
       final FilterManager filterManager,
       final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider) {
+      final PrivacyIdProvider privacyIdProvider) {
     this.filterManager = filterManager;
     this.privacyController = privacyController;
-    this.enclavePublicKeyProvider = enclavePublicKeyProvider;
+    this.privacyIdProvider = privacyIdProvider;
   }
 
   @Override
@@ -53,8 +54,9 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     final String privacyGroupId = requestContext.getRequiredParameter(0, String.class);
     final String filterId = requestContext.getRequiredParameter(1, String.class);
 
-    checkIfPrivacyGroupMatchesAuthenticatedEnclaveKey(requestContext, privacyGroupId);
-
+    if (privacyController instanceof MultiTenancyPrivacyController) {
+      checkIfPrivacyGroupMatchesAuthenticatedPrivacyUserId(requestContext, privacyGroupId);
+    }
     final List<LogWithMetadata> logs = filterManager.logsChanges(filterId);
     if (logs != null) {
       return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), new LogsResult(logs));
@@ -64,9 +66,9 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
         requestContext.getRequest().getId(), JsonRpcError.FILTER_NOT_FOUND);
   }
 
-  private void checkIfPrivacyGroupMatchesAuthenticatedEnclaveKey(
+  private void checkIfPrivacyGroupMatchesAuthenticatedPrivacyUserId(
       final JsonRpcRequestContext request, final String privacyGroupId) {
-    final String enclavePublicKey = enclavePublicKeyProvider.getEnclaveKey(request.getUser());
-    privacyController.verifyPrivacyGroupContainsEnclavePublicKey(privacyGroupId, enclavePublicKey);
+    final String privacyUserId = privacyIdProvider.getPrivacyUserId(request.getUser());
+    privacyController.verifyPrivacyGroupContainsPrivacyUserId(privacyGroupId, privacyUserId);
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/PrivGetFilterLogs.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/PrivGetFilterLogs.java
index 5b1e6e8d1e4..768cd29f661 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/PrivGetFilterLogs.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/PrivGetFilterLogs.java
@@ -24,6 +24,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.LogsResult;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
+import org.hyperledger.besu.ethereum.privacy.MultiTenancyPrivacyController;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 
 import java.util.List;
@@ -31,16 +32,16 @@
 public class PrivGetFilterLogs implements JsonRpcMethod {
 
   private final PrivacyController privacyController;
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider;
+  private final PrivacyIdProvider privacyIdProvider;
   private final FilterManager filterManager;
 
   public PrivGetFilterLogs(
       final FilterManager filterManager,
       final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider) {
+      final PrivacyIdProvider privacyIdProvider) {
     this.filterManager = filterManager;
     this.privacyController = privacyController;
-    this.enclavePublicKeyProvider = enclavePublicKeyProvider;
+    this.privacyIdProvider = privacyIdProvider;
   }
 
   @Override
@@ -53,7 +54,9 @@ public JsonRpcResponse response(final JsonRpcRequestContext request) {
     final String privacyGroupId = request.getRequiredParameter(0, String.class);
     final String filterId = request.getRequiredParameter(1, String.class);
 
-    checkIfPrivacyGroupMatchesAuthenticatedEnclaveKey(request, privacyGroupId);
+    if (privacyController instanceof MultiTenancyPrivacyController) {
+      checkIfPrivacyGroupMatchesAuthenticatedPrivacyUserId(request, privacyGroupId);
+    }
 
     final List<LogWithMetadata> logs = filterManager.logs(filterId);
     if (logs != null) {
@@ -64,9 +67,9 @@ public JsonRpcResponse response(final JsonRpcRequestContext request) {
         request.getRequest().getId(), JsonRpcError.LOGS_FILTER_NOT_FOUND);
   }
 
-  private void checkIfPrivacyGroupMatchesAuthenticatedEnclaveKey(
+  private void checkIfPrivacyGroupMatchesAuthenticatedPrivacyUserId(
       final JsonRpcRequestContext request, final String privacyGroupId) {
-    final String enclavePublicKey = enclavePublicKeyProvider.getEnclaveKey(request.getUser());
-    privacyController.verifyPrivacyGroupContainsEnclavePublicKey(privacyGroupId, enclavePublicKey);
+    final String privacyUserId = privacyIdProvider.getPrivacyUserId(request.getUser());
+    privacyController.verifyPrivacyGroupContainsPrivacyUserId(privacyGroupId, privacyUserId);
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/PrivUninstallFilter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/PrivUninstallFilter.java
index da88d4d400c..1683c9511c3 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/PrivUninstallFilter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/PrivUninstallFilter.java
@@ -20,21 +20,22 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.privacy.MultiTenancyPrivacyController;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 
 public class PrivUninstallFilter implements JsonRpcMethod {
 
   private final FilterManager filterManager;
   private final PrivacyController privacyController;
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider;
+  private final PrivacyIdProvider privacyIdProvider;
 
   public PrivUninstallFilter(
       final FilterManager filterManager,
       final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider) {
+      final PrivacyIdProvider privacyIdProvider) {
     this.filterManager = filterManager;
     this.privacyController = privacyController;
-    this.enclavePublicKeyProvider = enclavePublicKeyProvider;
+    this.privacyIdProvider = privacyIdProvider;
   }
 
   @Override
@@ -47,7 +48,9 @@ public JsonRpcResponse response(final JsonRpcRequestContext request) {
     final String privacyGroupId = request.getRequiredParameter(0, String.class);
     final String filterId = request.getRequiredParameter(1, String.class);
 
-    checkIfPrivacyGroupMatchesAuthenticatedEnclaveKey(request, privacyGroupId);
+    if (privacyController instanceof MultiTenancyPrivacyController) {
+      checkIfPrivacyGroupMatchesAuthenticatedEnclaveKey(request, privacyGroupId);
+    }
 
     return new JsonRpcSuccessResponse(
         request.getRequest().getId(), filterManager.uninstallFilter(filterId));
@@ -55,7 +58,7 @@ public JsonRpcResponse response(final JsonRpcRequestContext request) {
 
   private void checkIfPrivacyGroupMatchesAuthenticatedEnclaveKey(
       final JsonRpcRequestContext request, final String privacyGroupId) {
-    final String enclavePublicKey = enclavePublicKeyProvider.getEnclaveKey(request.getUser());
-    privacyController.verifyPrivacyGroupContainsEnclavePublicKey(privacyGroupId, enclavePublicKey);
+    final String privacyUserId = privacyIdProvider.getPrivacyUserId(request.getUser());
+    privacyController.verifyPrivacyGroupContainsPrivacyUserId(privacyGroupId, privacyUserId);
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/PrivacyIdProvider.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/PrivacyIdProvider.java
new file mode 100644
index 00000000000..5f01bae059b
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/PrivacyIdProvider.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods;
+
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.MultiTenancyUserUtil.privacyUserId;
+
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+
+import java.util.Optional;
+
+import io.vertx.ext.auth.User;
+
+@FunctionalInterface
+public interface PrivacyIdProvider {
+
+  String getPrivacyUserId(Optional<User> user);
+
+  static PrivacyIdProvider build(final PrivacyParameters privacyParameters) {
+    if (privacyParameters.isMultiTenancyEnabled()) {
+      return multiTenancyPrivacyUserIdProvider();
+    }
+    return defaultPrivacyUserIdProvider(privacyParameters);
+  }
+
+  private static PrivacyIdProvider multiTenancyPrivacyUserIdProvider() {
+    return user ->
+        privacyUserId(user)
+            .orElseThrow(
+                () -> new IllegalStateException("Request does not contain an authorization token"));
+  }
+
+  private static PrivacyIdProvider defaultPrivacyUserIdProvider(
+      final PrivacyParameters privacyParameters) {
+    return user -> privacyParameters.getPrivacyUserId();
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/AbstractEeaSendRawTransaction.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/AbstractEeaSendRawTransaction.java
new file mode 100644
index 00000000000..e02099eb368
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/AbstractEeaSendRawTransaction.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea;
+
+import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcEnclaveErrorConverter.convertEnclaveInvalidReason;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcErrorConverter.convertTransactionInvalidReason;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.DECODE_ERROR;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPException;
+import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
+import org.hyperledger.besu.ethereum.util.NonceProvider;
+import org.hyperledger.besu.plugin.data.TransactionType;
+import org.hyperledger.besu.plugin.services.privacy.PrivateMarkerTransactionFactory;
+
+import java.util.Optional;
+
+import io.vertx.ext.auth.User;
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public abstract class AbstractEeaSendRawTransaction implements JsonRpcMethod {
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractEeaSendRawTransaction.class);
+  private final TransactionPool transactionPool;
+  private final PrivacyIdProvider privacyIdProvider;
+  private final PrivateMarkerTransactionFactory privateMarkerTransactionFactory;
+  private final NonceProvider publicNonceProvider;
+
+  protected AbstractEeaSendRawTransaction(
+      final TransactionPool transactionPool,
+      final PrivacyIdProvider privacyIdProvider,
+      final PrivateMarkerTransactionFactory privateMarkerTransactionFactory,
+      final NonceProvider publicNonceProvider) {
+    this.transactionPool = transactionPool;
+    this.privacyIdProvider = privacyIdProvider;
+    this.privateMarkerTransactionFactory = privateMarkerTransactionFactory;
+    this.publicNonceProvider = publicNonceProvider;
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.EEA_SEND_RAW_TRANSACTION.getMethodName();
+  }
+
+  @Override
+  public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
+    final Object id = requestContext.getRequest().getId();
+    final Optional<User> user = requestContext.getUser();
+    final String rawPrivateTransaction = requestContext.getRequiredParameter(0, String.class);
+
+    try {
+      final PrivateTransaction privateTransaction =
+          PrivateTransaction.readFrom(RLP.input(Bytes.fromHexString(rawPrivateTransaction)));
+
+      final ValidationResult<TransactionInvalidReason> validationResult =
+          validatePrivateTransaction(privateTransaction, user);
+
+      if (!validationResult.isValid()) {
+        return new JsonRpcErrorResponse(
+            id, convertTransactionInvalidReason(validationResult.getInvalidReason()));
+      }
+
+      final Address sender =
+          privateMarkerTransactionFactory.getSender(
+              privateTransaction, privacyIdProvider.getPrivacyUserId(user));
+
+      final Transaction privateMarkerTransaction =
+          createPrivateMarkerTransaction(sender, privateTransaction, user);
+
+      return transactionPool
+          .addTransactionViaApi(privateMarkerTransaction)
+          .either(
+              () -> new JsonRpcSuccessResponse(id, privateMarkerTransaction.getHash().toString()),
+              errorReason -> getJsonRpcErrorResponse(id, errorReason));
+    } catch (final JsonRpcErrorResponseException e) {
+      return new JsonRpcErrorResponse(id, e.getJsonRpcError());
+    } catch (final IllegalArgumentException | RLPException e) {
+      LOG.error("Unable to decode EEA raw transaction", e);
+      return new JsonRpcErrorResponse(id, DECODE_ERROR);
+    } catch (final Exception e) {
+      return new JsonRpcErrorResponse(id, convertEnclaveInvalidReason(e.getMessage()));
+    }
+  }
+
+  JsonRpcErrorResponse getJsonRpcErrorResponse(
+      final Object id, final TransactionInvalidReason errorReason) {
+    if (errorReason.equals(TransactionInvalidReason.INTRINSIC_GAS_EXCEEDS_GAS_LIMIT)) {
+      return new JsonRpcErrorResponse(id, JsonRpcError.PMT_FAILED_INTRINSIC_GAS_EXCEEDS_LIMIT);
+    }
+    return new JsonRpcErrorResponse(id, convertTransactionInvalidReason(errorReason));
+  }
+
+  protected abstract ValidationResult<TransactionInvalidReason> validatePrivateTransaction(
+      final PrivateTransaction privateTransaction, final Optional<User> user);
+
+  protected abstract Transaction createPrivateMarkerTransaction(
+      final Address sender, final PrivateTransaction privateTransaction, final Optional<User> user);
+
+  protected Transaction createPrivateMarkerTransaction(
+      final Address sender,
+      final Address privacyPrecompileAddress,
+      final String pmtPayload,
+      final PrivateTransaction privateTransaction,
+      final String privacyUserId) {
+
+    final long nonce = publicNonceProvider.getNonce(sender);
+
+    final Transaction unsignedPrivateMarkerTransaction =
+        new Transaction.Builder()
+            .type(TransactionType.FRONTIER)
+            .sender(sender)
+            .nonce(nonce)
+            .gasPrice(privateTransaction.getGasPrice())
+            .gasLimit(getGasLimit(privateTransaction, pmtPayload))
+            .to(privacyPrecompileAddress)
+            .value(Wei.ZERO)
+            .payload(Bytes.fromBase64String(pmtPayload))
+            .build();
+
+    final Bytes rlpBytes =
+        privateMarkerTransactionFactory.create(
+            unsignedPrivateMarkerTransaction, privateTransaction, privacyUserId);
+    return Transaction.readFrom(rlpBytes);
+  }
+
+  protected abstract long getGasLimit(PrivateTransaction privateTransaction, String pmtPayload);
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransaction.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransaction.java
deleted file mode 100644
index ad930a68ec1..00000000000
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransaction.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea;
-
-import static org.apache.logging.log4j.LogManager.getLogger;
-import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcEnclaveErrorConverter.convertEnclaveInvalidReason;
-import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcErrorConverter.convertTransactionInvalidReason;
-import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.DECODE_ERROR;
-import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.PRIVATE_FROM_DOES_NOT_MATCH_ENCLAVE_PUBLIC_KEY;
-import static org.hyperledger.besu.ethereum.privacy.PrivacyGroupUtil.findOffchainPrivacyGroup;
-
-import org.hyperledger.besu.enclave.types.PrivacyGroup;
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
-import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
-import org.hyperledger.besu.ethereum.privacy.PrivacyController;
-import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
-import org.hyperledger.besu.ethereum.rlp.RLP;
-import org.hyperledger.besu.ethereum.rlp.RLPException;
-import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
-
-import java.util.Optional;
-
-import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-
-public class EeaSendRawTransaction implements JsonRpcMethod {
-
-  private static final Logger LOG = getLogger();
-  final TransactionPool transactionPool;
-  final PrivacyController privacyController;
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider;
-
-  public EeaSendRawTransaction(
-      final TransactionPool transactionPool,
-      final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider) {
-    this.transactionPool = transactionPool;
-    this.privacyController = privacyController;
-    this.enclavePublicKeyProvider = enclavePublicKeyProvider;
-  }
-
-  @Override
-  public String getName() {
-    return RpcMethod.EEA_SEND_RAW_TRANSACTION.getMethodName();
-  }
-
-  @Override
-  public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
-    final Object id = requestContext.getRequest().getId();
-    final String rawPrivateTransaction = requestContext.getRequiredParameter(0, String.class);
-
-    try {
-      final PrivateTransaction privateTransaction =
-          PrivateTransaction.readFrom(RLP.input(Bytes.fromHexString(rawPrivateTransaction)));
-
-      final String enclavePublicKey =
-          enclavePublicKeyProvider.getEnclaveKey(requestContext.getUser());
-
-      if (!privateTransaction.getPrivateFrom().equals(Bytes.fromBase64String(enclavePublicKey))) {
-        return new JsonRpcErrorResponse(id, PRIVATE_FROM_DOES_NOT_MATCH_ENCLAVE_PUBLIC_KEY);
-      }
-
-      final Optional<Bytes> maybePrivacyGroupId = privateTransaction.getPrivacyGroupId();
-
-      final Optional<PrivacyGroup> maybePrivacyGroup =
-          findPrivacyGroup(maybePrivacyGroupId, enclavePublicKey, privateTransaction);
-
-      final ValidationResult<TransactionInvalidReason> validationResult =
-          privacyController.validatePrivateTransaction(privateTransaction, enclavePublicKey);
-
-      if (!validationResult.isValid()) {
-        return new JsonRpcErrorResponse(
-            id, convertTransactionInvalidReason(validationResult.getInvalidReason()));
-      }
-
-      final Transaction privacyMarkerTransaction =
-          createPMT(privateTransaction, maybePrivacyGroup, maybePrivacyGroupId, enclavePublicKey);
-
-      return transactionPool
-          .addLocalTransaction(privacyMarkerTransaction)
-          .either(
-              () -> new JsonRpcSuccessResponse(id, privacyMarkerTransaction.getHash().toString()),
-              errorReason -> getJsonRpcErrorResponse(id, errorReason));
-
-    } catch (final JsonRpcErrorResponseException e) {
-      return new JsonRpcErrorResponse(id, e.getJsonRpcError());
-    } catch (final IllegalArgumentException | RLPException e) {
-      LOG.error(e);
-      return new JsonRpcErrorResponse(id, DECODE_ERROR);
-    } catch (final Exception e) {
-      return new JsonRpcErrorResponse(id, convertEnclaveInvalidReason(e.getMessage()));
-    }
-  }
-
-  Optional<PrivacyGroup> findPrivacyGroup(
-      final Optional<Bytes> maybePrivacyGroupId,
-      final String enclavePublicKey,
-      final PrivateTransaction privateTransaction) {
-    final Optional<PrivacyGroup> maybePrivacyGroup =
-        findOffchainPrivacyGroup(privacyController, maybePrivacyGroupId, enclavePublicKey);
-    return maybePrivacyGroup;
-  }
-
-  Transaction createPMT(
-      final PrivateTransaction privateTransaction,
-      final Optional<PrivacyGroup> maybePrivacyGroup,
-      final Optional<Bytes> maybePrivacyGroupId,
-      final String enclavePublicKey) {
-    final String privateTransactionLookupId =
-        privacyController.sendTransaction(privateTransaction, enclavePublicKey, maybePrivacyGroup);
-    return privacyController.createPrivacyMarkerTransaction(
-        privateTransactionLookupId, privateTransaction, Address.DEFAULT_PRIVACY);
-  }
-
-  JsonRpcErrorResponse getJsonRpcErrorResponse(
-      final Object id, final TransactionInvalidReason errorReason) {
-    if (errorReason.equals(TransactionInvalidReason.INTRINSIC_GAS_EXCEEDS_GAS_LIMIT)) {
-      return new JsonRpcErrorResponse(id, JsonRpcError.PMT_FAILED_INTRINSIC_GAS_EXCEEDS_LIMIT);
-    }
-    return new JsonRpcErrorResponse(id, convertTransactionInvalidReason(errorReason));
-  }
-}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/OnChainEeaSendRawTransaction.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/OnChainEeaSendRawTransaction.java
deleted file mode 100644
index 32abb4b8b5c..00000000000
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/OnChainEeaSendRawTransaction.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea;
-
-import static org.hyperledger.besu.ethereum.privacy.PrivacyGroupUtil.findOnchainPrivacyGroup;
-
-import org.hyperledger.besu.enclave.types.PrivacyGroup;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
-import org.hyperledger.besu.ethereum.privacy.PrivacyController;
-import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
-
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-
-public class OnChainEeaSendRawTransaction extends EeaSendRawTransaction {
-
-  public OnChainEeaSendRawTransaction(
-      final TransactionPool transactionPool,
-      final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider) {
-    super(transactionPool, privacyController, enclavePublicKeyProvider);
-  }
-
-  @Override
-  Optional<PrivacyGroup> findPrivacyGroup(
-      final Optional<Bytes> maybePrivacyGroupId,
-      final String enclavePublicKey,
-      final PrivateTransaction privateTransaction) {
-    if (maybePrivacyGroupId.isEmpty()) {
-      throw new JsonRpcErrorResponseException(JsonRpcError.ONCHAIN_PRIVACY_GROUP_ID_NOT_AVAILABLE);
-    }
-    final Optional<PrivacyGroup> maybePrivacyGroup =
-        findOnchainPrivacyGroup(
-            privacyController, maybePrivacyGroupId, enclavePublicKey, privateTransaction);
-    if (maybePrivacyGroup.isEmpty()) {
-      throw new JsonRpcErrorResponseException(JsonRpcError.ONCHAIN_PRIVACY_GROUP_DOES_NOT_EXIST);
-    }
-    return maybePrivacyGroup;
-  }
-
-  @Override
-  Transaction createPMT(
-      final PrivateTransaction privateTransaction,
-      final Optional<PrivacyGroup> maybePrivacyGroup,
-      final Optional<Bytes> maybePrivacyGroupId,
-      final String enclavePublicKey) {
-    final String privateTransactionLookupId =
-        privacyController.sendTransaction(privateTransaction, enclavePublicKey, maybePrivacyGroup);
-    final Bytes privacyGroupId =
-        maybePrivacyGroupId.get(); // exists, as it has been checked in findPrivacyGroup
-    final Optional<String> addPayloadPrivateTransactionLookupId =
-        privacyController.buildAndSendAddPayload(
-            privateTransaction, Bytes32.wrap(privacyGroupId), enclavePublicKey);
-    return privacyController.createPrivacyMarkerTransaction(
-        buildCompoundLookupId(privateTransactionLookupId, addPayloadPrivateTransactionLookupId),
-        privateTransaction,
-        Address.ONCHAIN_PRIVACY);
-  }
-
-  private String buildCompoundLookupId(
-      final String privateTransactionLookupId,
-      final Optional<String> maybePrivateTransactionLookupId) {
-    return maybePrivateTransactionLookupId.isPresent()
-        ? Bytes.concatenate(
-                Bytes.fromBase64String(privateTransactionLookupId),
-                Bytes.fromBase64String(maybePrivateTransactionLookupId.get()))
-            .toBase64String()
-        : privateTransactionLookupId;
-  }
-}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/PluginEeaSendRawTransaction.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/PluginEeaSendRawTransaction.java
new file mode 100644
index 00000000000..c81c0852e0a
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/PluginEeaSendRawTransaction.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea;
+
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.PLUGIN_PRIVACY;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+import org.hyperledger.besu.ethereum.privacy.PrivacyController;
+import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
+import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
+import org.hyperledger.besu.ethereum.util.NonceProvider;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.plugin.services.privacy.PrivateMarkerTransactionFactory;
+
+import java.util.Optional;
+
+import io.vertx.ext.auth.User;
+import org.apache.tuweni.bytes.Bytes;
+
+public class PluginEeaSendRawTransaction extends AbstractEeaSendRawTransaction {
+  private final PrivacyController privacyController;
+  private final PrivacyIdProvider privacyIdProvider;
+  private final GasCalculator gasCalculator;
+
+  public PluginEeaSendRawTransaction(
+      final TransactionPool transactionPool,
+      final PrivacyIdProvider privacyIdProvider,
+      final PrivateMarkerTransactionFactory privateMarkerTransactionFactory,
+      final NonceProvider publicNonceProvider,
+      final PrivacyController privacyController,
+      final GasCalculator gasCalculator) {
+    super(transactionPool, privacyIdProvider, privateMarkerTransactionFactory, publicNonceProvider);
+    this.privacyController = privacyController;
+    this.privacyIdProvider = privacyIdProvider;
+    this.gasCalculator = gasCalculator;
+  }
+
+  @Override
+  protected ValidationResult<TransactionInvalidReason> validatePrivateTransaction(
+      final PrivateTransaction privateTransaction, final Optional<User> user) {
+
+    final String privacyUserId = privacyIdProvider.getPrivacyUserId(user);
+
+    return privacyController.validatePrivateTransaction(privateTransaction, privacyUserId);
+  }
+
+  @Override
+  protected Transaction createPrivateMarkerTransaction(
+      final Address sender,
+      final PrivateTransaction privateTransaction,
+      final Optional<User> user) {
+
+    final String privacyUserId = privacyIdProvider.getPrivacyUserId(user);
+
+    final String payloadFromPlugin =
+        privacyController.createPrivateMarkerTransactionPayload(
+            privateTransaction, privacyUserId, Optional.empty());
+
+    return createPrivateMarkerTransaction(
+        sender, PLUGIN_PRIVACY, payloadFromPlugin, privateTransaction, privacyUserId);
+  }
+
+  @Override
+  protected long getGasLimit(final PrivateTransaction privateTransaction, final String pmtPayload) {
+    // The gas limit can not be determined by the sender because the payload could be changed by the
+    // plugin
+    // choose the highest of the two options
+    return Math.max(
+        privateTransaction.getGasLimit(),
+        gasCalculator.transactionIntrinsicGasCost(Bytes.fromBase64String(pmtPayload), false));
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/RestrictedFlexibleEeaSendRawTransaction.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/RestrictedFlexibleEeaSendRawTransaction.java
new file mode 100644
index 00000000000..8a5d4f07a32
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/RestrictedFlexibleEeaSendRawTransaction.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea;
+
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.enclave.types.PrivacyGroup;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+import org.hyperledger.besu.ethereum.privacy.FlexibleUtil;
+import org.hyperledger.besu.ethereum.privacy.PrivacyController;
+import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
+import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
+import org.hyperledger.besu.ethereum.util.NonceProvider;
+import org.hyperledger.besu.plugin.data.Restriction;
+import org.hyperledger.besu.plugin.services.privacy.PrivateMarkerTransactionFactory;
+
+import java.util.List;
+import java.util.Optional;
+
+import io.vertx.ext.auth.User;
+import org.apache.tuweni.bytes.Bytes;
+
+public class RestrictedFlexibleEeaSendRawTransaction extends AbstractEeaSendRawTransaction {
+
+  private final PrivacyController privacyController;
+  private final PrivacyIdProvider privacyIdProvider;
+
+  public RestrictedFlexibleEeaSendRawTransaction(
+      final TransactionPool transactionPool,
+      final PrivacyIdProvider privacyIdProvider,
+      final PrivateMarkerTransactionFactory privateMarkerTransactionFactory,
+      final NonceProvider publicNonceProvider,
+      final PrivacyController privacyController) {
+    super(transactionPool, privacyIdProvider, privateMarkerTransactionFactory, publicNonceProvider);
+    this.privacyController = privacyController;
+    this.privacyIdProvider = privacyIdProvider;
+  }
+
+  @Override
+  protected ValidationResult<TransactionInvalidReason> validatePrivateTransaction(
+      final PrivateTransaction privateTransaction, final Optional<User> user) {
+    if (!privateTransaction.getRestriction().equals(Restriction.RESTRICTED)) {
+      return ValidationResult.invalid(
+          TransactionInvalidReason.PRIVATE_UNIMPLEMENTED_TRANSACTION_TYPE);
+    }
+    return privacyController.validatePrivateTransaction(
+        privateTransaction, privacyIdProvider.getPrivacyUserId(user));
+  }
+
+  @Override
+  protected Transaction createPrivateMarkerTransaction(
+      final Address sender,
+      final PrivateTransaction privateTransaction,
+      final Optional<User> user) {
+    final Optional<Bytes> maybePrivacyGroupId = privateTransaction.getPrivacyGroupId();
+    if (maybePrivacyGroupId.isEmpty()) {
+      throw new JsonRpcErrorResponseException(JsonRpcError.FLEXIBLE_PRIVACY_GROUP_ID_NOT_AVAILABLE);
+    }
+    final Bytes privacyGroupId = maybePrivacyGroupId.get();
+
+    final String privacyUserId = privacyIdProvider.getPrivacyUserId(user);
+
+    Optional<PrivacyGroup> maybePrivacyGroup =
+        privacyController.findPrivacyGroupByGroupId(privacyGroupId.toBase64String(), privacyUserId);
+
+    final boolean isGroupAdditionTransaction =
+        FlexibleUtil.isGroupAdditionTransaction(privateTransaction);
+    if (maybePrivacyGroup.isEmpty() && !isGroupAdditionTransaction) {
+      throw new JsonRpcErrorResponseException(JsonRpcError.FLEXIBLE_PRIVACY_GROUP_DOES_NOT_EXIST);
+    }
+
+    if (isGroupAdditionTransaction) {
+      final List<String> participantsFromParameter =
+          FlexibleUtil.getParticipantsFromParameter(privateTransaction.getPayload());
+      if (maybePrivacyGroup.isEmpty()) {
+        maybePrivacyGroup =
+            Optional.of(
+                new PrivacyGroup(
+                    privacyGroupId.toBase64String(),
+                    PrivacyGroup.Type.FLEXIBLE,
+                    null,
+                    null,
+                    participantsFromParameter));
+      } else {
+        maybePrivacyGroup.get().addMembers(participantsFromParameter);
+      }
+    }
+
+    if (!maybePrivacyGroup.get().getMembers().contains(privacyUserId)) {
+      throw new JsonRpcErrorResponseException(JsonRpcError.FLEXIBLE_PRIVACY_GROUP_DOES_NOT_EXIST);
+    }
+
+    final String pmtPayload =
+        privacyController.createPrivateMarkerTransactionPayload(
+            privateTransaction, privacyUserId, maybePrivacyGroup);
+
+    return createPrivateMarkerTransaction(
+        sender, FLEXIBLE_PRIVACY, pmtPayload, privateTransaction, privacyUserId);
+  }
+
+  @Override
+  protected long getGasLimit(final PrivateTransaction privateTransaction, final String pmtPayload) {
+    return privateTransaction.getGasLimit();
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/RestrictedOffchainEeaSendRawTransaction.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/RestrictedOffchainEeaSendRawTransaction.java
new file mode 100644
index 00000000000..4f7754cd6ac
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/RestrictedOffchainEeaSendRawTransaction.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea;
+
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.PRIVATE_FROM_DOES_NOT_MATCH_ENCLAVE_PUBLIC_KEY;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.DEFAULT_PRIVACY;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.enclave.types.PrivacyGroup;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+import org.hyperledger.besu.ethereum.privacy.PrivacyController;
+import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
+import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
+import org.hyperledger.besu.ethereum.util.NonceProvider;
+import org.hyperledger.besu.plugin.data.Restriction;
+import org.hyperledger.besu.plugin.services.privacy.PrivateMarkerTransactionFactory;
+
+import java.util.Optional;
+
+import io.vertx.ext.auth.User;
+import org.apache.tuweni.bytes.Bytes;
+
+public class RestrictedOffchainEeaSendRawTransaction extends AbstractEeaSendRawTransaction {
+
+  final PrivacyController privacyController;
+  private final PrivacyIdProvider privacyIdProvider;
+
+  public RestrictedOffchainEeaSendRawTransaction(
+      final TransactionPool transactionPool,
+      final PrivacyIdProvider privacyIdProvider,
+      final PrivateMarkerTransactionFactory privateMarkerTransactionFactory,
+      final NonceProvider publicNonceProvider,
+      final PrivacyController privacyController) {
+    super(transactionPool, privacyIdProvider, privateMarkerTransactionFactory, publicNonceProvider);
+    this.privacyIdProvider = privacyIdProvider;
+    this.privacyController = privacyController;
+  }
+
+  @Override
+  protected ValidationResult<TransactionInvalidReason> validatePrivateTransaction(
+      final PrivateTransaction privateTransaction, final Optional<User> user) {
+
+    if (!privateTransaction.getRestriction().equals(Restriction.RESTRICTED)) {
+      return ValidationResult.invalid(
+          TransactionInvalidReason.PRIVATE_UNIMPLEMENTED_TRANSACTION_TYPE);
+    }
+
+    final String privacyUserId = privacyIdProvider.getPrivacyUserId(user);
+
+    if (!privateTransaction.getPrivateFrom().equals(Bytes.fromBase64String(privacyUserId))) {
+      throw new JsonRpcErrorResponseException(PRIVATE_FROM_DOES_NOT_MATCH_ENCLAVE_PUBLIC_KEY);
+    }
+
+    return privacyController.validatePrivateTransaction(privateTransaction, privacyUserId);
+  }
+
+  @Override
+  protected Transaction createPrivateMarkerTransaction(
+      final Address sender,
+      final PrivateTransaction privateTransaction,
+      final Optional<User> user) {
+
+    final String privacyUserId = privacyIdProvider.getPrivacyUserId(user);
+
+    final Optional<PrivacyGroup> maybePrivacyGroup =
+        privateTransaction
+            .getPrivacyGroupId()
+            .flatMap(
+                privacyGroupId ->
+                    privacyController.findPrivacyGroupByGroupId(
+                        privacyGroupId.toBase64String(), privacyUserId));
+
+    final String privateTransactionLookupId =
+        privacyController.createPrivateMarkerTransactionPayload(
+            privateTransaction, privacyUserId, maybePrivacyGroup);
+
+    return createPrivateMarkerTransaction(
+        sender, DEFAULT_PRIVACY, privateTransactionLookupId, privateTransaction, privacyUserId);
+  }
+
+  @Override
+  protected long getGasLimit(final PrivateTransaction privateTransaction, final String pmtPayload) {
+    return privateTransaction.getGasLimit();
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCall.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCall.java
index 5e78ebd191b..59fec4fb073 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCall.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCall.java
@@ -21,24 +21,27 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.AbstractBlockParameterMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
+import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
 
 public class PrivCall extends AbstractBlockParameterMethod {
 
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider;
+  private final PrivacyIdProvider privacyIdProvider;
   private final PrivacyController privacyController;
 
   public PrivCall(
       final BlockchainQueries blockchainQueries,
       final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider) {
+      final PrivacyIdProvider privacyIdProvider) {
     super(blockchainQueries);
-    this.enclavePublicKeyProvider = enclavePublicKeyProvider;
+    this.privacyIdProvider = privacyIdProvider;
     this.privacyController = privacyController;
   }
 
@@ -58,13 +61,10 @@ protected Object resultByBlockNumber(
     final JsonCallParameter callParams = validateAndGetCallParams(request);
     final String privacyGroupId = request.getRequiredParameter(0, String.class);
 
-    final String enclavePublicKey = enclavePublicKeyProvider.getEnclaveKey(request.getUser());
-
-    PrivUtil.checkMembershipForAuthenticatedUser(
-        privacyController, enclavePublicKeyProvider, request, privacyGroupId, blockNumber);
+    final String privacyUserId = privacyIdProvider.getPrivacyUserId(request.getUser());
 
     return privacyController
-        .simulatePrivateTransaction(privacyGroupId, enclavePublicKey, callParams, blockNumber)
+        .simulatePrivateTransaction(privacyGroupId, privacyUserId, callParams, blockNumber)
         .map(
             result ->
                 result
@@ -75,8 +75,7 @@ protected Object resultByBlockNumber(
                                 request.getRequest().getId(), result.getOutput().toString())),
                         reason ->
                             new JsonRpcErrorResponse(
-                                request.getRequest().getId(),
-                                JsonRpcErrorConverter.convertTransactionInvalidReason(reason))))
+                                request.getRequest().getId(), errorResponse(result, reason))))
         .orElse(validRequestBlockNotFound(request));
   }
 
@@ -89,6 +88,19 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     return (JsonRpcResponse) findResultByParamType(requestContext);
   }
 
+  private JsonRpcError errorResponse(
+      final TransactionProcessingResult result, final TransactionInvalidReason reason) {
+    final JsonRpcError jsonRpcError;
+    if (result.getRevertReason().isPresent() && result.getRevertReason().get().size() >= 4) {
+      jsonRpcError = JsonRpcError.REVERT_ERROR;
+      jsonRpcError.setData(result.getRevertReason().get().toHexString());
+    } else {
+      jsonRpcError = JsonRpcErrorConverter.convertTransactionInvalidReason(reason);
+    }
+
+    return jsonRpcError;
+  }
+
   private JsonCallParameter validateAndGetCallParams(final JsonRpcRequestContext request) {
     final JsonCallParameter callParams = request.getRequiredParameter(1, JsonCallParameter.class);
     if (callParams.getTo() == null) {
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroup.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroup.java
index 0bb9d00d42f..3527c02ad5b 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroup.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroup.java
@@ -14,33 +14,31 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
-
 import org.hyperledger.besu.enclave.types.PrivacyGroup;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcEnclaveErrorConverter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.parameters.CreatePrivacyGroupParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PrivCreatePrivacyGroup implements JsonRpcMethod {
 
-  private static final Logger LOG = getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PrivCreatePrivacyGroup.class);
   private final PrivacyController privacyController;
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider;
+  private final PrivacyIdProvider privacyIdProvider;
 
   public PrivCreatePrivacyGroup(
-      final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider) {
+      final PrivacyController privacyController, final PrivacyIdProvider privacyIdProvider) {
     this.privacyController = privacyController;
-    this.enclavePublicKeyProvider = enclavePublicKeyProvider;
+    this.privacyIdProvider = privacyIdProvider;
   }
 
   @Override
@@ -67,7 +65,7 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
               parameter.getAddresses(),
               parameter.getName(),
               parameter.getDescription(),
-              enclavePublicKeyProvider.getEnclaveKey(requestContext.getUser()));
+              privacyIdProvider.getPrivacyUserId(requestContext.getUser()));
     } catch (Exception e) {
       LOG.error("Failed to create privacy group", e);
       return new JsonRpcErrorResponse(
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDebugGetStateRoot.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDebugGetStateRoot.java
index c148cbe6aa8..e7f9ec8f102 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDebugGetStateRoot.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDebugGetStateRoot.java
@@ -14,15 +14,15 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.FIND_PRIVACY_GROUP_ERROR;
 
+import org.hyperledger.besu.enclave.EnclaveClientException;
 import org.hyperledger.besu.enclave.types.PrivacyGroup;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.AbstractBlockParameterMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
@@ -32,22 +32,24 @@
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 
 import java.util.Optional;
+import java.util.regex.Pattern;
 
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PrivDebugGetStateRoot extends AbstractBlockParameterMethod {
 
-  private static final Logger LOG = getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PrivDebugGetStateRoot.class);
 
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider;
+  private final PrivacyIdProvider privacyIdProvider;
   private final PrivacyController privacyController;
 
   public PrivDebugGetStateRoot(
       final BlockchainQueries blockchainQueries,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider,
+      final PrivacyIdProvider privacyIdProvider,
       final PrivacyController privacyController) {
     super(blockchainQueries);
-    this.enclavePublicKeyProvider = enclavePublicKeyProvider;
+    this.privacyIdProvider = privacyIdProvider;
     this.privacyController = privacyController;
   }
 
@@ -65,16 +67,28 @@ protected BlockParameter blockParameter(final JsonRpcRequestContext request) {
   protected Object resultByBlockNumber(
       final JsonRpcRequestContext requestContext, final long blockNumber) {
     final String privacyGroupId = requestContext.getRequiredParameter(0, String.class);
-    final String enclavePublicKey =
-        enclavePublicKeyProvider.getEnclaveKey(requestContext.getUser());
-    LOG.trace("Executing {}", this::getName);
+    final String privacyUserId = privacyIdProvider.getPrivacyUserId(requestContext.getUser());
+    if (LOG.isTraceEnabled()) {
+      LOG.trace("Executing {}", getName());
+    }
 
     final Optional<PrivacyGroup> privacyGroup;
     try {
-      privacyGroup = privacyController.findPrivacyGroupByGroupId(privacyGroupId, enclavePublicKey);
+      privacyGroup = privacyController.findPrivacyGroupByGroupId(privacyGroupId, privacyUserId);
     } catch (final MultiTenancyValidationException e) {
       return new JsonRpcErrorResponse(
           requestContext.getRequest().getId(), FIND_PRIVACY_GROUP_ERROR);
+    } catch (final EnclaveClientException e) {
+      final Pattern pattern = Pattern.compile("^Privacy group.*not found$");
+      if (e.getMessage().equals(JsonRpcError.ENCLAVE_PRIVACY_GROUP_MISSING.getMessage())
+          || pattern.matcher(e.getMessage()).find()) {
+        LOG.error("Failed to retrieve privacy group");
+        return new JsonRpcErrorResponse(
+            requestContext.getRequest().getId(), FIND_PRIVACY_GROUP_ERROR);
+      } else {
+        return new JsonRpcErrorResponse(
+            requestContext.getRequest().getId(), JsonRpcError.ENCLAVE_ERROR);
+      }
     } catch (final Exception e) {
       return new JsonRpcErrorResponse(
           requestContext.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
@@ -87,7 +101,7 @@ protected Object resultByBlockNumber(
     }
 
     return privacyController
-        .getStateRootByBlockNumber(privacyGroupId, enclavePublicKey, blockNumber)
+        .getStateRootByBlockNumber(privacyGroupId, privacyUserId, blockNumber)
         .<JsonRpcResponse>map(
             stateRootHash ->
                 new JsonRpcSuccessResponse(
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDeletePrivacyGroup.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDeletePrivacyGroup.java
index caafba310b8..ed9bab3c5ab 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDeletePrivacyGroup.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDeletePrivacyGroup.java
@@ -14,32 +14,31 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.DELETE_PRIVACY_GROUP_ERROR;
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.privacy.MultiTenancyValidationException;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PrivDeletePrivacyGroup implements JsonRpcMethod {
 
-  private static final Logger LOG = getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PrivDeletePrivacyGroup.class);
   private final PrivacyController privacyController;
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider;
+  private final PrivacyIdProvider privacyIdProvider;
 
   public PrivDeletePrivacyGroup(
-      final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider) {
+      final PrivacyController privacyController, final PrivacyIdProvider privacyIdProvider) {
     this.privacyController = privacyController;
-    this.enclavePublicKeyProvider = enclavePublicKeyProvider;
+    this.privacyIdProvider = privacyIdProvider;
   }
 
   @Override
@@ -57,7 +56,7 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     try {
       response =
           privacyController.deletePrivacyGroup(
-              privacyGroupId, enclavePublicKeyProvider.getEnclaveKey(requestContext.getUser()));
+              privacyGroupId, privacyIdProvider.getPrivacyUserId(requestContext.getUser()));
     } catch (final MultiTenancyValidationException e) {
       LOG.error("Unauthorized privacy multi-tenancy rpc request. {}", e.getMessage());
       return new JsonRpcErrorResponse(
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDistributeRawTransaction.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDistributeRawTransaction.java
index 1b113e6bbde..b225fbf467c 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDistributeRawTransaction.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDistributeRawTransaction.java
@@ -14,25 +14,23 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcEnclaveErrorConverter.convertEnclaveInvalidReason;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcErrorConverter.convertTransactionInvalidReason;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.DECODE_ERROR;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.ENCLAVE_ERROR;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.PRIVATE_FROM_DOES_NOT_MATCH_ENCLAVE_PUBLIC_KEY;
-import static org.hyperledger.besu.ethereum.privacy.PrivacyGroupUtil.findOffchainPrivacyGroup;
-import static org.hyperledger.besu.ethereum.privacy.PrivacyGroupUtil.findOnchainPrivacyGroup;
 
 import org.hyperledger.besu.enclave.types.PrivacyGroup;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+import org.hyperledger.besu.ethereum.privacy.FlexibleUtil;
 import org.hyperledger.besu.ethereum.privacy.MultiTenancyValidationException;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
@@ -41,25 +39,27 @@
 import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
 
 import java.util.Base64;
+import java.util.List;
 import java.util.Optional;
 
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PrivDistributeRawTransaction implements JsonRpcMethod {
 
-  private static final Logger LOG = getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PrivDistributeRawTransaction.class);
   private final PrivacyController privacyController;
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider;
-  private final boolean onchainPrivacyGroupsEnabled;
+  private final PrivacyIdProvider privacyIdProvider;
+  private final boolean flexiblePrivacyGroupsEnabled;
 
   public PrivDistributeRawTransaction(
       final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider,
-      final boolean onchainPrivacyGroupsEnabled) {
+      final PrivacyIdProvider privacyIdProvider,
+      final boolean flexiblePrivacyGroupsEnabled) {
     this.privacyController = privacyController;
-    this.enclavePublicKeyProvider = enclavePublicKeyProvider;
-    this.onchainPrivacyGroupsEnabled = onchainPrivacyGroupsEnabled;
+    this.privacyIdProvider = privacyIdProvider;
+    this.flexiblePrivacyGroupsEnabled = flexiblePrivacyGroupsEnabled;
   }
 
   @Override
@@ -76,31 +76,46 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
       final PrivateTransaction privateTransaction =
           PrivateTransaction.readFrom(RLP.input(Bytes.fromHexString(rawPrivateTransaction)));
 
-      final String enclavePublicKey =
-          enclavePublicKeyProvider.getEnclaveKey(requestContext.getUser());
+      final String privacyUserId = privacyIdProvider.getPrivacyUserId(requestContext.getUser());
 
-      if (!privateTransaction.getPrivateFrom().equals(Bytes.fromBase64String(enclavePublicKey))) {
+      if (!privateTransaction.getPrivateFrom().equals(Bytes.fromBase64String(privacyUserId))) {
         return new JsonRpcErrorResponse(id, PRIVATE_FROM_DOES_NOT_MATCH_ENCLAVE_PUBLIC_KEY);
       }
 
       final Optional<Bytes> maybePrivacyGroupId = privateTransaction.getPrivacyGroupId();
 
-      if (onchainPrivacyGroupsEnabled && maybePrivacyGroupId.isEmpty()) {
-        return new JsonRpcErrorResponse(id, JsonRpcError.ONCHAIN_PRIVACY_GROUP_ID_NOT_AVAILABLE);
+      if (flexiblePrivacyGroupsEnabled && maybePrivacyGroupId.isEmpty()) {
+        return new JsonRpcErrorResponse(id, JsonRpcError.FLEXIBLE_PRIVACY_GROUP_ID_NOT_AVAILABLE);
       }
 
-      final Optional<PrivacyGroup> maybePrivacyGroup =
-          onchainPrivacyGroupsEnabled
-              ? findOnchainPrivacyGroup(
-                  privacyController, maybePrivacyGroupId, enclavePublicKey, privateTransaction)
-              : findOffchainPrivacyGroup(privacyController, maybePrivacyGroupId, enclavePublicKey);
-
-      if (onchainPrivacyGroupsEnabled && maybePrivacyGroup.isEmpty()) {
-        return new JsonRpcErrorResponse(id, JsonRpcError.ONCHAIN_PRIVACY_GROUP_DOES_NOT_EXIST);
+      Optional<PrivacyGroup> maybePrivacyGroup =
+          maybePrivacyGroupId.flatMap(
+              gId ->
+                  privacyController.findPrivacyGroupByGroupId(gId.toBase64String(), privacyUserId));
+
+      if (flexiblePrivacyGroupsEnabled) {
+        if (FlexibleUtil.isGroupAdditionTransaction(privateTransaction)) {
+          final List<String> participantsFromParameter =
+              FlexibleUtil.getParticipantsFromParameter(privateTransaction.getPayload());
+          if (maybePrivacyGroup.isEmpty()) {
+            maybePrivacyGroup =
+                Optional.of(
+                    new PrivacyGroup(
+                        maybePrivacyGroupId.get().toBase64String(),
+                        PrivacyGroup.Type.FLEXIBLE,
+                        "",
+                        "",
+                        participantsFromParameter));
+          }
+          maybePrivacyGroup.get().addMembers(participantsFromParameter);
+        }
+        if (maybePrivacyGroup.isEmpty()) {
+          return new JsonRpcErrorResponse(id, JsonRpcError.FLEXIBLE_PRIVACY_GROUP_DOES_NOT_EXIST);
+        }
       }
 
       final ValidationResult<TransactionInvalidReason> validationResult =
-          privacyController.validatePrivateTransaction(privateTransaction, enclavePublicKey);
+          privacyController.validatePrivateTransaction(privateTransaction, privacyUserId);
 
       if (!validationResult.isValid()) {
         return new JsonRpcErrorResponse(
@@ -108,14 +123,14 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
       }
 
       final String enclaveKey =
-          privacyController.sendTransaction(
-              privateTransaction, enclavePublicKey, maybePrivacyGroup);
+          privacyController.createPrivateMarkerTransactionPayload(
+              privateTransaction, privacyUserId, maybePrivacyGroup);
       return new JsonRpcSuccessResponse(id, hexEncodeEnclaveKey(enclaveKey));
     } catch (final MultiTenancyValidationException e) {
       LOG.error("Unauthorized privacy multi-tenancy rpc request. {}", e.getMessage());
       return new JsonRpcErrorResponse(id, ENCLAVE_ERROR);
     } catch (final IllegalArgumentException | RLPException e) {
-      LOG.error(e);
+      LOG.error("Unable to decode transaction for distribute");
       return new JsonRpcErrorResponse(id, DECODE_ERROR);
     } catch (final Exception e) {
       return new JsonRpcErrorResponse(id, convertEnclaveInvalidReason(e.getMessage()));
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroup.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroup.java
index 6ba1ab03f1f..b836008927f 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroup.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroup.java
@@ -14,14 +14,13 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.FIND_PRIVACY_GROUP_ERROR;
 
 import org.hyperledger.besu.enclave.types.PrivacyGroup;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
@@ -31,19 +30,20 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+@SuppressWarnings("MockNotUsedInProduction")
 public class PrivFindPrivacyGroup implements JsonRpcMethod {
 
-  private static final Logger LOG = getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PrivFindPrivacyGroup.class);
   private final PrivacyController privacyController;
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider;
+  private final PrivacyIdProvider privacyIdProvider;
 
   public PrivFindPrivacyGroup(
-      final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider) {
+      final PrivacyController privacyController, final PrivacyIdProvider privacyIdProvider) {
     this.privacyController = privacyController;
-    this.enclavePublicKeyProvider = enclavePublicKeyProvider;
+    this.privacyIdProvider = privacyIdProvider;
   }
 
   @Override
@@ -63,9 +63,9 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     try {
       response =
           Arrays.asList(
-              privacyController.findOffChainPrivacyGroupByMembers(
+              privacyController.findPrivacyGroupByMembers(
                   Arrays.asList(addresses),
-                  enclavePublicKeyProvider.getEnclaveKey(requestContext.getUser())));
+                  privacyIdProvider.getPrivacyUserId(requestContext.getUser())));
     } catch (final MultiTenancyValidationException e) {
       LOG.error("Unauthorized privacy multi-tenancy rpc request. {}", e.getMessage());
       return new JsonRpcErrorResponse(
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetCode.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetCode.java
index 641e89cdd8a..b7cafd8cabe 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetCode.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetCode.java
@@ -14,13 +14,13 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.AbstractBlockParameterMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 
 import org.apache.tuweni.bytes.Bytes;
@@ -28,15 +28,15 @@
 public class PrivGetCode extends AbstractBlockParameterMethod {
 
   private final PrivacyController privacyController;
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider;
+  private final PrivacyIdProvider privacyIdProvider;
 
   public PrivGetCode(
       final BlockchainQueries blockchainQueries,
       final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider) {
+      final PrivacyIdProvider privacyIdProvider) {
     super(blockchainQueries);
     this.privacyController = privacyController;
-    this.enclavePublicKeyProvider = enclavePublicKeyProvider;
+    this.privacyIdProvider = privacyIdProvider;
   }
 
   @Override
@@ -55,14 +55,14 @@ protected String resultByBlockNumber(
     final String privacyGroupId = request.getRequiredParameter(0, String.class);
     final Address address = request.getRequiredParameter(1, Address.class);
 
-    final String enclavePublicKey = enclavePublicKeyProvider.getEnclaveKey(request.getUser());
+    final String privacyUserId = privacyIdProvider.getPrivacyUserId(request.getUser());
 
     return getBlockchainQueries()
         .getBlockHashByNumber(blockNumber)
         .flatMap(
             blockHash ->
                 privacyController.getContractCode(
-                    privacyGroupId, address, blockHash, enclavePublicKey))
+                    privacyGroupId, address, blockHash, privacyUserId))
         .map(Bytes::toString)
         .orElse(null);
   }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetEeaTransactionCount.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetEeaTransactionCount.java
index 8ccdfd73988..84c94868479 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetEeaTransactionCount.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetEeaTransactionCount.java
@@ -14,36 +14,43 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.GET_PRIVATE_TRANSACTION_NONCE_ERROR;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.PRIVATE_FROM_DOES_NOT_MATCH_ENCLAVE_PUBLIC_KEY;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.privacy.MultiTenancyValidationException;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
+import org.hyperledger.besu.ethereum.privacy.PrivacyGroupUtil;
 
-import org.apache.logging.log4j.Logger;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PrivGetEeaTransactionCount implements JsonRpcMethod {
 
-  private static final Logger LOG = getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PrivGetEeaTransactionCount.class);
 
   private final PrivacyController privacyController;
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider;
+  private final PrivacyIdProvider privacyIdProvider;
 
   public PrivGetEeaTransactionCount(
-      final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider) {
+      final PrivacyController privacyController, final PrivacyIdProvider privacyIdProvider) {
     this.privacyController = privacyController;
-    this.enclavePublicKeyProvider = enclavePublicKeyProvider;
+    this.privacyIdProvider = privacyIdProvider;
   }
 
   @Override
@@ -62,13 +69,20 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     final String privateFrom = requestContext.getRequiredParameter(1, String.class);
     final String[] privateFor = requestContext.getRequiredParameter(2, String[].class);
 
+    final String privacyUserId = privacyIdProvider.getPrivacyUserId(requestContext.getUser());
+
+    if (!privateFrom.equals(privacyUserId)) {
+      return new JsonRpcErrorResponse(
+          requestContext.getRequest().getId(), PRIVATE_FROM_DOES_NOT_MATCH_ENCLAVE_PUBLIC_KEY);
+    }
+
     try {
       final long nonce =
-          privacyController.determineEeaNonce(
+          determineEeaNonce(
               privateFrom,
               privateFor,
               address,
-              enclavePublicKeyProvider.getEnclaveKey(requestContext.getUser()));
+              privacyIdProvider.getPrivacyUserId(requestContext.getUser()));
       return new JsonRpcSuccessResponse(
           requestContext.getRequest().getId(), Quantity.create(nonce));
     } catch (final MultiTenancyValidationException e) {
@@ -81,4 +95,19 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
           requestContext.getRequest().getId(), GET_PRIVATE_TRANSACTION_NONCE_ERROR);
     }
   }
+
+  private long determineEeaNonce(
+      final String privateFrom,
+      final String[] privateFor,
+      final Address address,
+      final String privacyUserId) {
+
+    final Bytes from = Bytes.fromBase64String(privateFrom);
+    final List<Bytes> toAddresses =
+        Arrays.stream(privateFor).map(Bytes::fromBase64String).collect(Collectors.toList());
+
+    final Bytes32 privacyGroupId = PrivacyGroupUtil.calculateEeaPrivacyGroupId(from, toAddresses);
+    return privacyController.determineNonce(
+        address, privacyGroupId.toBase64String(), privacyUserId);
+  }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetLogs.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetLogs.java
index 0077b6326e1..dfde7bfbdfc 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetLogs.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetLogs.java
@@ -14,11 +14,12 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.FilterParameter;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
@@ -27,8 +28,8 @@
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.query.PrivacyQueries;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
+import org.hyperledger.besu.ethereum.privacy.MultiTenancyPrivacyController;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 
 import java.util.Collections;
@@ -40,17 +41,17 @@ public class PrivGetLogs implements JsonRpcMethod {
   private final BlockchainQueries blockchainQueries;
   private final PrivacyQueries privacyQueries;
   private final PrivacyController privacyController;
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider;
+  private final PrivacyIdProvider privacyIdProvider;
 
   public PrivGetLogs(
       final BlockchainQueries blockchainQueries,
       final PrivacyQueries privacyQueries,
       final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider) {
+      final PrivacyIdProvider privacyIdProvider) {
     this.blockchainQueries = blockchainQueries;
     this.privacyQueries = privacyQueries;
     this.privacyController = privacyController;
-    this.enclavePublicKeyProvider = enclavePublicKeyProvider;
+    this.privacyIdProvider = privacyIdProvider;
   }
 
   @Override
@@ -72,13 +73,9 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
         filter
             .getBlockHash()
             .map(
-                blockHash -> {
-                  return findLogsForBlockHash(requestContext, privacyGroupId, filter, blockHash);
-                })
-            .orElseGet(
-                () -> {
-                  return findLogsForBlockRange(requestContext, privacyGroupId, filter);
-                });
+                blockHash ->
+                    findLogsForBlockHash(requestContext, privacyGroupId, filter, blockHash))
+            .orElseGet(() -> findLogsForBlockRange(requestContext, privacyGroupId, filter));
 
     return new JsonRpcSuccessResponse(
         requestContext.getRequest().getId(), new LogsResult(matchingLogs));
@@ -88,11 +85,16 @@ private List<LogWithMetadata> findLogsForBlockRange(
       final JsonRpcRequestContext requestContext,
       final String privacyGroupId,
       final FilterParameter filter) {
+
+    if (privacyController instanceof MultiTenancyPrivacyController) {
+      checkIfPrivacyGroupMatchesAuthenticatedEnclaveKey(
+          requestContext, privacyGroupId, Optional.empty());
+    }
+
     final long fromBlockNumber = filter.getFromBlock().getNumber().orElse(0L);
     final long toBlockNumber =
         filter.getToBlock().getNumber().orElse(blockchainQueries.headBlockNumber());
-    PrivUtil.checkMembershipForAuthenticatedUser(
-        privacyController, enclavePublicKeyProvider, requestContext, privacyGroupId, toBlockNumber);
+
     return privacyQueries.matchingLogs(
         privacyGroupId, fromBlockNumber, toBlockNumber, filter.getLogsQuery());
   }
@@ -107,8 +109,21 @@ private List<LogWithMetadata> findLogsForBlockHash(
       return Collections.emptyList();
     }
     final long blockNumber = blockHeader.get().getNumber();
-    PrivUtil.checkMembershipForAuthenticatedUser(
-        privacyController, enclavePublicKeyProvider, requestContext, privacyGroupId, blockNumber);
+
+    if (privacyController instanceof MultiTenancyPrivacyController) {
+      checkIfPrivacyGroupMatchesAuthenticatedEnclaveKey(
+          requestContext, privacyGroupId, Optional.of(Long.valueOf(blockNumber)));
+    }
+
     return privacyQueries.matchingLogs(privacyGroupId, blockHash, filter.getLogsQuery());
   }
+
+  private void checkIfPrivacyGroupMatchesAuthenticatedEnclaveKey(
+      final JsonRpcRequestContext request,
+      final String privacyGroupId,
+      final Optional<Long> toBlock) {
+    final String privacyUserId = privacyIdProvider.getPrivacyUserId(request.getUser());
+    privacyController.verifyPrivacyGroupContainsPrivacyUserId(
+        privacyGroupId, privacyUserId, toBlock);
+  }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddress.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddress.java
index b26d00a03bd..816ed1c5da8 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddress.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddress.java
@@ -14,17 +14,17 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 
 public class PrivGetPrivacyPrecompileAddress implements JsonRpcMethod {
 
-  private final Integer privacyAddress;
+  private final Address privacyAddress;
 
   public PrivGetPrivacyPrecompileAddress(final PrivacyParameters privacyParameters) {
     privacyAddress = privacyParameters.getPrivacyAddress();
@@ -38,6 +38,6 @@ public String getName() {
   @Override
   public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     return new JsonRpcSuccessResponse(
-        requestContext.getRequest().getId(), Address.privacyPrecompiled(privacyAddress).toString());
+        requestContext.getRequest().getId(), privacyAddress.toString());
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransaction.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransaction.java
index 252b33c2d41..d260647c843 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransaction.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransaction.java
@@ -14,40 +14,38 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
-
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.enclave.EnclaveClientException;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcEnclaveErrorConverter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionGroupResult;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionLegacyResult;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionResult;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
 
 import java.util.Optional;
 
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PrivGetPrivateTransaction implements JsonRpcMethod {
 
-  private static final Logger LOG = getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PrivGetPrivateTransaction.class);
 
   private final PrivacyController privacyController;
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider;
+  private final PrivacyIdProvider privacyIdProvider;
 
   public PrivGetPrivateTransaction(
-      final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider) {
+      final PrivacyController privacyController, final PrivacyIdProvider privacyIdProvider) {
     this.privacyController = privacyController;
-    this.enclavePublicKeyProvider = enclavePublicKeyProvider;
+    this.privacyIdProvider = privacyIdProvider;
   }
 
   @Override
@@ -60,7 +58,7 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     LOG.trace("Executing {}", RpcMethod.PRIV_GET_PRIVATE_TRANSACTION.getMethodName());
 
     final Hash hash = requestContext.getRequiredParameter(0, Hash.class);
-    final String enclaveKey = enclavePublicKeyProvider.getEnclaveKey(requestContext.getUser());
+    final String enclaveKey = privacyIdProvider.getPrivacyUserId(requestContext.getUser());
 
     final Optional<PrivateTransaction> maybePrivateTx;
     try {
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCount.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCount.java
index 959f4b75976..824daacfc9b 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCount.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCount.java
@@ -14,35 +14,34 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.GET_PRIVATE_TRANSACTION_NONCE_ERROR;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.privacy.MultiTenancyValidationException;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PrivGetTransactionCount implements JsonRpcMethod {
 
-  private static final Logger LOG = getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PrivGetTransactionCount.class);
   private final PrivacyController privacyController;
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider;
+  private final PrivacyIdProvider privacyIdProvider;
 
   public PrivGetTransactionCount(
-      final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider) {
+      final PrivacyController privacyController, final PrivacyIdProvider privacyIdProvider) {
     this.privacyController = privacyController;
-    this.enclavePublicKeyProvider = enclavePublicKeyProvider;
+    this.privacyIdProvider = privacyIdProvider;
   }
 
   @Override
@@ -62,10 +61,10 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
 
     try {
       final long nonce =
-          privacyController.determineBesuNonce(
+          privacyController.determineNonce(
               address,
               privacyGroupId,
-              enclavePublicKeyProvider.getEnclaveKey(requestContext.getUser()));
+              privacyIdProvider.getPrivacyUserId(requestContext.getUser()));
       return new JsonRpcSuccessResponse(
           requestContext.getRequest().getId(), Quantity.create(nonce));
     } catch (final MultiTenancyValidationException e) {
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceipt.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceipt.java
index 0d6c431df93..000983a0ccb 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceipt.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceipt.java
@@ -14,21 +14,19 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
-
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.enclave.EnclaveClientException;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcEnclaveErrorConverter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionReceiptResult;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.privacy.ExecutedPrivateTransaction;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
@@ -38,25 +36,26 @@
 
 import java.util.Optional;
 
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PrivGetTransactionReceipt implements JsonRpcMethod {
 
-  private static final Logger LOG = getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PrivGetTransactionReceipt.class);
 
   private final PrivateStateStorage privateStateStorage;
   private final PrivacyController privacyController;
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider;
+  private final PrivacyIdProvider privacyIdProvider;
 
   public PrivGetTransactionReceipt(
       final PrivateStateStorage privateStateStorage,
       final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider) {
+      final PrivacyIdProvider privacyIdProvider) {
     this.privateStateStorage = privateStateStorage;
     this.privacyController = privacyController;
-    this.enclavePublicKeyProvider = enclavePublicKeyProvider;
+    this.privacyIdProvider = privacyIdProvider;
   }
 
   @Override
@@ -68,7 +67,7 @@ public String getName() {
   public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     LOG.trace("Executing {}", RpcMethod.PRIV_GET_TRANSACTION_RECEIPT.getMethodName());
     final Hash pmtTransactionHash = requestContext.getRequiredParameter(0, Hash.class);
-    final String enclaveKey = enclavePublicKeyProvider.getEnclaveKey(requestContext.getUser());
+    final String enclaveKey = privacyIdProvider.getPrivacyUserId(requestContext.getUser());
 
     final ExecutedPrivateTransaction privateTransaction;
     try {
@@ -125,7 +124,6 @@ private PrivateTransactionReceiptResult buildPrivateTransactionReceiptResult(
         privateTransaction.getBlockNumber(),
         privateTransaction.getPmtIndex(),
         privateTransaction.getPmtHash(),
-        privateTransaction.getHash(),
         privateTransaction.getPrivateFrom(),
         privateTransaction.getPrivateFor().orElse(null),
         privateTransaction.getPrivacyGroupId().orElse(null),
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivNewFilter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivNewFilter.java
index 87887096603..8c797540cb8 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivNewFilter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivNewFilter.java
@@ -19,26 +19,27 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.FilterParameter;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.privacy.MultiTenancyPrivacyController;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 
 public class PrivNewFilter implements JsonRpcMethod {
 
   private final FilterManager filterManager;
   private final PrivacyController privacyController;
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider;
+  private final PrivacyIdProvider privacyIdProvider;
 
   public PrivNewFilter(
       final FilterManager filterManager,
       final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider) {
+      final PrivacyIdProvider privacyIdProvider) {
     this.filterManager = filterManager;
     this.privacyController = privacyController;
-    this.enclavePublicKeyProvider = enclavePublicKeyProvider;
+    this.privacyIdProvider = privacyIdProvider;
   }
 
   @Override
@@ -50,10 +51,13 @@ public String getName() {
   public JsonRpcResponse response(final JsonRpcRequestContext request) {
     final String privacyGroupId = request.getRequiredParameter(0, String.class);
     final FilterParameter filter = request.getRequiredParameter(1, FilterParameter.class);
-    final String enclavePublicKey = enclavePublicKeyProvider.getEnclaveKey(request.getUser());
+    final String privacyUserId = privacyIdProvider.getPrivacyUserId(request.getUser());
 
-    // no need to pass blockNumber. To create a filter, you need to be a current member of the group
-    checkIfPrivacyGroupMatchesAuthenticatedEnclaveKey(enclavePublicKey, privacyGroupId);
+    if (privacyController instanceof MultiTenancyPrivacyController) {
+      // no need to pass blockNumber. To create a filter, you need to be a current member of the
+      // group
+      checkIfPrivacyGroupMatchesAuthenticatedPrivacyUserId(privacyUserId, privacyGroupId);
+    }
 
     if (!filter.isValid()) {
       return new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
@@ -62,7 +66,7 @@ public JsonRpcResponse response(final JsonRpcRequestContext request) {
     final String logFilterId =
         filterManager.installPrivateLogFilter(
             privacyGroupId,
-            enclavePublicKey,
+            privacyUserId,
             filter.getFromBlock(),
             filter.getToBlock(),
             filter.getLogsQuery());
@@ -70,8 +74,8 @@ public JsonRpcResponse response(final JsonRpcRequestContext request) {
     return new JsonRpcSuccessResponse(request.getRequest().getId(), logFilterId);
   }
 
-  private void checkIfPrivacyGroupMatchesAuthenticatedEnclaveKey(
-      final String enclavePublicKey, final String privacyGroupId) {
-    privacyController.verifyPrivacyGroupContainsEnclavePublicKey(privacyGroupId, enclavePublicKey);
+  private void checkIfPrivacyGroupMatchesAuthenticatedPrivacyUserId(
+      final String privacyUserId, final String privacyGroupId) {
+    privacyController.verifyPrivacyGroupContainsPrivacyUserId(privacyGroupId, privacyUserId);
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivUtil.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivUtil.java
index babc860d633..08a3e3a04c5 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivUtil.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivUtil.java
@@ -16,7 +16,7 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv;
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 
 import java.util.Optional;
@@ -25,15 +25,15 @@ public class PrivUtil {
 
   public static void checkMembershipForAuthenticatedUser(
       final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider,
+      final PrivacyIdProvider privacyIdProvider,
       final JsonRpcRequestContext request,
       final String privacyGroupId,
       final long blockNumber) {
-    final String enclavePublicKey = enclavePublicKeyProvider.getEnclaveKey(request.getUser());
+    final String privacyUserId = privacyIdProvider.getPrivacyUserId(request.getUser());
     // check group membership at previous block (they could have been removed as of blockNumber but
     // membership will be correct as at previous block)
     final long blockNumberToCheck = blockNumber == 0 ? 0 : blockNumber - 1;
-    privacyController.verifyPrivacyGroupContainsEnclavePublicKey(
-        privacyGroupId, enclavePublicKey, Optional.of(blockNumberToCheck));
+    privacyController.verifyPrivacyGroupContainsPrivacyUserId(
+        privacyGroupId, privacyUserId, Optional.of(blockNumberToCheck));
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/privx/PrivxFindFlexiblePrivacyGroup.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/privx/PrivxFindFlexiblePrivacyGroup.java
new file mode 100644
index 00000000000..263ed2ab485
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/privx/PrivxFindFlexiblePrivacyGroup.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.privx;
+
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.FIND_FLEXIBLE_PRIVACY_GROUP_ERROR;
+
+import org.hyperledger.besu.enclave.types.PrivacyGroup;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.privacy.MultiTenancyValidationException;
+import org.hyperledger.besu.ethereum.privacy.PrivacyController;
+
+import java.util.Arrays;
+
+import graphql.com.google.common.collect.Lists;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PrivxFindFlexiblePrivacyGroup implements JsonRpcMethod {
+
+  private static final Logger LOG = LoggerFactory.getLogger(PrivxFindFlexiblePrivacyGroup.class);
+  private final PrivacyController privacyController;
+  private final PrivacyIdProvider privacyIdProvider;
+
+  public PrivxFindFlexiblePrivacyGroup(
+      final PrivacyController privacyController, final PrivacyIdProvider privacyIdProvider) {
+    this.privacyController = privacyController;
+    this.privacyIdProvider = privacyIdProvider;
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.PRIVX_FIND_PRIVACY_GROUP.getMethodName();
+  }
+
+  @Override
+  public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
+    LOG.trace("Executing {}", RpcMethod.PRIVX_FIND_PRIVACY_GROUP.getMethodName());
+
+    final String[] addresses = requestContext.getRequiredParameter(0, String[].class);
+
+    LOG.trace("Finding a privacy group with members {}", Arrays.toString(addresses));
+
+    final PrivacyGroup[] response;
+    try {
+      response =
+          privacyController.findPrivacyGroupByMembers(
+              Arrays.asList(addresses),
+              privacyIdProvider.getPrivacyUserId(requestContext.getUser()));
+    } catch (final MultiTenancyValidationException e) {
+      LOG.error("Unauthorized privacy multi-tenancy rpc request. {}", e.getMessage());
+      return new JsonRpcErrorResponse(
+          requestContext.getRequest().getId(), FIND_FLEXIBLE_PRIVACY_GROUP_ERROR);
+    } catch (final Exception e) {
+      LOG.error("Failed to fetch flexible privacy group", e);
+      return new JsonRpcErrorResponse(
+          requestContext.getRequest().getId(), FIND_FLEXIBLE_PRIVACY_GROUP_ERROR);
+    }
+
+    return new JsonRpcSuccessResponse(
+        requestContext.getRequest().getId(), Lists.newArrayList(response));
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/privx/PrivxFindOnChainPrivacyGroup.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/privx/PrivxFindOnChainPrivacyGroup.java
deleted file mode 100644
index 4b791bc2786..00000000000
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/privx/PrivxFindOnChainPrivacyGroup.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.privx;
-
-import static org.apache.logging.log4j.LogManager.getLogger;
-import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.FIND_ONCHAIN_PRIVACY_GROUP_ERROR;
-
-import org.hyperledger.besu.enclave.types.PrivacyGroup;
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.privacy.MultiTenancyValidationException;
-import org.hyperledger.besu.ethereum.privacy.PrivacyController;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.logging.log4j.Logger;
-
-public class PrivxFindOnChainPrivacyGroup implements JsonRpcMethod {
-
-  private static final Logger LOG = getLogger();
-  private final PrivacyController privacyController;
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider;
-
-  public PrivxFindOnChainPrivacyGroup(
-      final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider) {
-    this.privacyController = privacyController;
-    this.enclavePublicKeyProvider = enclavePublicKeyProvider;
-  }
-
-  @Override
-  public String getName() {
-    return RpcMethod.PRIVX_FIND_PRIVACY_GROUP.getMethodName();
-  }
-
-  @Override
-  public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
-    LOG.trace("Executing {}", RpcMethod.PRIVX_FIND_PRIVACY_GROUP.getMethodName());
-
-    final String[] addresses = requestContext.getRequiredParameter(0, String[].class);
-
-    LOG.trace("Finding a privacy group with members {}", Arrays.toString(addresses));
-
-    final List<PrivacyGroup> response;
-    try {
-      response =
-          privacyController.findOnChainPrivacyGroupByMembers(
-              Arrays.asList(addresses),
-              enclavePublicKeyProvider.getEnclaveKey(requestContext.getUser()));
-    } catch (final MultiTenancyValidationException e) {
-      LOG.error("Unauthorized privacy multi-tenancy rpc request. {}", e.getMessage());
-      return new JsonRpcErrorResponse(
-          requestContext.getRequest().getId(), FIND_ONCHAIN_PRIVACY_GROUP_ERROR);
-    } catch (final Exception e) {
-      LOG.error("Failed to fetch on chain privacy group", e);
-      return new JsonRpcErrorResponse(
-          requestContext.getRequest().getId(), FIND_ONCHAIN_PRIVACY_GROUP_ERROR);
-    }
-
-    return new JsonRpcSuccessResponse(requestContext.getRequest().getId(), response);
-  }
-}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/privx/PrivxFindOnchainPrivacyGroup.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/privx/PrivxFindOnchainPrivacyGroup.java
new file mode 100644
index 00000000000..4df3daeafd1
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/privx/PrivxFindOnchainPrivacyGroup.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.privx;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
+import org.hyperledger.besu.ethereum.privacy.PrivacyController;
+
+// Use PrivxFindFlexiblePrivacyGroup instead
+@Deprecated
+public class PrivxFindOnchainPrivacyGroup extends PrivxFindFlexiblePrivacyGroup {
+
+  public PrivxFindOnchainPrivacyGroup(
+      final PrivacyController privacyController, final PrivacyIdProvider privacyIdProvider) {
+    super(privacyController, privacyIdProvider);
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.PRIVX_FIND_PRIVACY_GROUP_OLD.getMethodName();
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/BlockReplay.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/BlockReplay.java
index c2025488d3a..252771a7ed9 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/BlockReplay.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/BlockReplay.java
@@ -14,37 +14,33 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor;
 
+import org.hyperledger.besu.datatypes.DataGas;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.Tracer.TraceableState;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
 import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.ethereum.vm.CachingBlockHashLookup;
 
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 public class BlockReplay {
 
   private final ProtocolSchedule protocolSchedule;
   private final Blockchain blockchain;
-  private final WorldStateArchive worldStateArchive;
 
-  public BlockReplay(
-      final ProtocolSchedule protocolSchedule,
-      final Blockchain blockchain,
-      final WorldStateArchive worldStateArchive) {
+  public BlockReplay(final ProtocolSchedule protocolSchedule, final Blockchain blockchain) {
     this.protocolSchedule = protocolSchedule;
     this.blockchain = blockchain;
-    this.worldStateArchive = worldStateArchive;
   }
 
   public Optional<BlockTrace> block(
@@ -52,18 +48,23 @@ public Optional<BlockTrace> block(
     return performActionWithBlock(
         block.getHeader(),
         block.getBody(),
-        (body, header, blockchain, mutableWorldState, transactionProcessor) -> {
-          List<TransactionTrace> transactionTraces =
+        (body, header, blockchain, transactionProcessor, protocolSpec) -> {
+          final Wei dataGasPrice =
+              protocolSpec
+                  .getFeeMarket()
+                  .dataPrice(
+                      blockchain
+                          .getBlockHeader(header.getParentHash())
+                          .flatMap(BlockHeader::getExcessDataGas)
+                          .orElse(DataGas.ZERO));
+
+          final List<TransactionTrace> transactionTraces =
               body.getTransactions().stream()
                   .map(
                       transaction ->
                           action.performAction(
-                              transaction,
-                              header,
-                              blockchain,
-                              mutableWorldState,
-                              transactionProcessor))
-                  .collect(Collectors.toList());
+                              transaction, header, blockchain, transactionProcessor, dataGasPrice))
+                  .toList();
           return Optional.of(new BlockTrace(transactionTraces));
         });
   }
@@ -74,27 +75,39 @@ public Optional<BlockTrace> block(
   }
 
   public <T> Optional<T> beforeTransactionInBlock(
-      final Hash blockHash, final Hash transactionHash, final TransactionAction<T> action) {
+      final TraceableState mutableWorldState,
+      final Hash blockHash,
+      final Hash transactionHash,
+      final TransactionAction<T> action) {
     return performActionWithBlock(
         blockHash,
-        (body, header, blockchain, mutableWorldState, transactionProcessor) -> {
-          final BlockHashLookup blockHashLookup = new BlockHashLookup(header, blockchain);
+        (body, header, blockchain, transactionProcessor, protocolSpec) -> {
+          final BlockHashLookup blockHashLookup = new CachingBlockHashLookup(header, blockchain);
+          final Wei dataGasPrice =
+              protocolSpec
+                  .getFeeMarket()
+                  .dataPrice(
+                      blockchain
+                          .getBlockHeader(header.getParentHash())
+                          .flatMap(BlockHeader::getExcessDataGas)
+                          .orElse(DataGas.ZERO));
+
           for (final Transaction transaction : body.getTransactions()) {
             if (transaction.getHash().equals(transactionHash)) {
               return Optional.of(
                   action.performAction(
-                      transaction, header, blockchain, mutableWorldState, transactionProcessor));
+                      transaction, header, blockchain, transactionProcessor, dataGasPrice));
             } else {
-              final ProtocolSpec spec = protocolSchedule.getByBlockNumber(header.getNumber());
               transactionProcessor.processTransaction(
                   blockchain,
                   mutableWorldState.updater(),
                   header,
                   transaction,
-                  spec.getMiningBeneficiaryCalculator().calculateBeneficiary(header),
+                  protocolSpec.getMiningBeneficiaryCalculator().calculateBeneficiary(header),
                   blockHashLookup,
                   false,
-                  TransactionValidationParams.blockReplay());
+                  TransactionValidationParams.blockReplay(),
+                  dataGasPrice);
             }
           }
           return Optional.empty();
@@ -102,23 +115,28 @@ public <T> Optional<T> beforeTransactionInBlock(
   }
 
   public <T> Optional<T> afterTransactionInBlock(
-      final Hash blockHash, final Hash transactionHash, final TransactionAction<T> action) {
+      final TraceableState mutableWorldState,
+      final Hash blockHash,
+      final Hash transactionHash,
+      final TransactionAction<T> action) {
     return beforeTransactionInBlock(
+        mutableWorldState,
         blockHash,
         transactionHash,
-        (transaction, blockHeader, blockchain, worldState, transactionProcessor) -> {
-          final ProtocolSpec spec = protocolSchedule.getByBlockNumber(blockHeader.getNumber());
+        (transaction, blockHeader, blockchain, transactionProcessor, dataGasPrice) -> {
+          final ProtocolSpec spec = protocolSchedule.getByBlockHeader(blockHeader);
           transactionProcessor.processTransaction(
               blockchain,
-              worldState.updater(),
+              mutableWorldState.updater(),
               blockHeader,
               transaction,
               spec.getMiningBeneficiaryCalculator().calculateBeneficiary(blockHeader),
-              new BlockHashLookup(blockHeader, blockchain),
+              new CachingBlockHashLookup(blockHeader, blockchain),
               false,
-              TransactionValidationParams.blockReplay());
+              TransactionValidationParams.blockReplay(),
+              dataGasPrice);
           return action.performAction(
-              transaction, blockHeader, blockchain, worldState, transactionProcessor);
+              transaction, blockHeader, blockchain, transactionProcessor, dataGasPrice);
         });
   }
 
@@ -139,18 +157,10 @@ private <T> Optional<T> performActionWithBlock(
     if (body == null) {
       return Optional.empty();
     }
-    final ProtocolSpec protocolSpec = protocolSchedule.getByBlockNumber(header.getNumber());
+    final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(header);
     final MainnetTransactionProcessor transactionProcessor = protocolSpec.getTransactionProcessor();
-    final BlockHeader previous = blockchain.getBlockHeader(header.getParentHash()).orElse(null);
-    if (previous == null) {
-      return Optional.empty();
-    }
-    final MutableWorldState mutableWorldState =
-        worldStateArchive.getMutable(previous.getStateRoot()).orElse(null);
-    if (mutableWorldState == null) {
-      return Optional.empty();
-    }
-    return action.perform(body, header, blockchain, mutableWorldState, transactionProcessor);
+
+    return action.perform(body, header, blockchain, transactionProcessor, protocolSpec);
   }
 
   private Optional<Block> getBlock(final Hash blockHash) {
@@ -166,7 +176,7 @@ private Optional<Block> getBlock(final Hash blockHash) {
 
   private Optional<Block> getBadBlock(final Hash blockHash) {
     final ProtocolSpec protocolSpec =
-        protocolSchedule.getByBlockNumber(blockchain.getChainHeadHeader().getNumber());
+        protocolSchedule.getByBlockHeader(blockchain.getChainHeadHeader());
     return protocolSpec.getBadBlocksManager().getBadBlock(blockHash);
   }
 
@@ -176,8 +186,8 @@ Optional<T> perform(
         BlockBody body,
         BlockHeader blockHeader,
         Blockchain blockchain,
-        MutableWorldState worldState,
-        MainnetTransactionProcessor transactionProcessor);
+        MainnetTransactionProcessor transactionProcessor,
+        ProtocolSpec protocolSpec);
   }
 
   @FunctionalInterface
@@ -186,7 +196,7 @@ T performAction(
         Transaction transaction,
         BlockHeader blockHeader,
         Blockchain blockchain,
-        MutableWorldState worldState,
-        MainnetTransactionProcessor transactionProcessor);
+        MainnetTransactionProcessor transactionProcessor,
+        Wei dataGasPrice);
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/BlockTracer.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/BlockTracer.java
index d63478f6f7b..bfccaac9e2b 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/BlockTracer.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/BlockTracer.java
@@ -14,15 +14,15 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor;
 
-import org.hyperledger.besu.ethereum.core.AbstractWorldUpdater;
-import org.hyperledger.besu.ethereum.core.AbstractWorldUpdater.StackedUpdater;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.debug.TraceFrame;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
-import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
+import org.hyperledger.besu.ethereum.vm.CachingBlockHashLookup;
 import org.hyperledger.besu.ethereum.vm.DebugOperationTracer;
+import org.hyperledger.besu.evm.worldstate.StackedUpdater;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.util.List;
 import java.util.Optional;
@@ -38,22 +38,28 @@ public BlockTracer(final BlockReplay blockReplay) {
     this.blockReplay = blockReplay;
   }
 
-  public Optional<BlockTrace> trace(final Hash blockHash, final DebugOperationTracer tracer) {
-    return blockReplay.block(blockHash, prepareReplayAction(tracer));
+  public Optional<BlockTrace> trace(
+      final Tracer.TraceableState mutableWorldState,
+      final Hash blockHash,
+      final DebugOperationTracer tracer) {
+    return blockReplay.block(blockHash, prepareReplayAction(mutableWorldState, tracer));
   }
 
-  public Optional<BlockTrace> trace(final Block block, final DebugOperationTracer tracer) {
-    return blockReplay.block(block, prepareReplayAction(tracer));
+  public Optional<BlockTrace> trace(
+      final Tracer.TraceableState mutableWorldState,
+      final Block block,
+      final DebugOperationTracer tracer) {
+    return blockReplay.block(block, prepareReplayAction(mutableWorldState, tracer));
   }
 
   private BlockReplay.TransactionAction<TransactionTrace> prepareReplayAction(
-      final DebugOperationTracer tracer) {
-    return (transaction, header, blockchain, mutableWorldState, transactionProcessor) -> {
+      final MutableWorldState mutableWorldState, final DebugOperationTracer tracer) {
+    return (transaction, header, blockchain, transactionProcessor, dataGasPrice) -> {
       // if we have no prior updater, it must be the first TX, so use the block's initial state
       if (chainedUpdater == null) {
         chainedUpdater = mutableWorldState.updater();
-      } else if (chainedUpdater instanceof AbstractWorldUpdater.StackedUpdater) {
-        ((StackedUpdater) chainedUpdater).markTransactionBoundary();
+      } else if (chainedUpdater instanceof StackedUpdater<?, ?> stackedUpdater) {
+        stackedUpdater.markTransactionBoundary();
       }
       // create an updater for just this tx
       chainedUpdater = chainedUpdater.updater();
@@ -65,8 +71,9 @@ private BlockReplay.TransactionAction<TransactionTrace> prepareReplayAction(
               transaction,
               header.getCoinbase(),
               tracer,
-              new BlockHashLookup(header, blockchain),
-              false);
+              new CachingBlockHashLookup(header, blockchain),
+              false,
+              dataGasPrice);
       final List<TraceFrame> traceFrames = tracer.copyTraceFrames();
       tracer.reset();
       return new TransactionTrace(transaction, result, traceFrames);
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/Tracer.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/Tracer.java
new file mode 100644
index 00000000000..c6bbeceb741
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/Tracer.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes32;
+
+public class Tracer {
+
+  public static <TRACE> Optional<TRACE> processTracing(
+      final BlockchainQueries blockchainQueries,
+      final Hash blockHash,
+      final Function<TraceableState, ? extends Optional<TRACE>> mapper) {
+    return processTracing(
+        blockchainQueries, blockchainQueries.getBlockHeaderByHash(blockHash), mapper);
+  }
+
+  public static <TRACE> Optional<TRACE> processTracing(
+      final BlockchainQueries blockchainQueries,
+      final Optional<BlockHeader> blockHeader,
+      final Function<TraceableState, ? extends Optional<TRACE>> mapper) {
+    return blockHeader
+        .map(BlockHeader::getParentHash)
+        .flatMap(
+            parentHash ->
+                blockchainQueries.getAndMapWorldState(
+                    parentHash,
+                    mutableWorldState -> mapper.apply(new TraceableState(mutableWorldState))));
+  }
+
+  /**
+   * This class force the use of the processTracing method to do tracing. processTracing allows you
+   * to cleanly manage the worldstate, to close it etc
+   */
+  public static class TraceableState implements MutableWorldState {
+    private final MutableWorldState mutableWorldState;
+
+    private TraceableState(final MutableWorldState mutableWorldState) {
+      this.mutableWorldState = mutableWorldState;
+    }
+
+    @Override
+    public void persist(final BlockHeader blockHeader) {
+      mutableWorldState.persist(blockHeader);
+    }
+
+    @Override
+    public WorldUpdater updater() {
+      return mutableWorldState.updater();
+    }
+
+    @Override
+    public Hash rootHash() {
+      return mutableWorldState.rootHash();
+    }
+
+    @Override
+    public Hash frontierRootHash() {
+      return mutableWorldState.rootHash();
+    }
+
+    @Override
+    public Stream<StreamableAccount> streamAccounts(final Bytes32 startKeyHash, final int limit) {
+      return mutableWorldState.streamAccounts(startKeyHash, limit);
+    }
+
+    @Override
+    public Account get(final Address address) {
+      return mutableWorldState.get(address);
+    }
+
+    @Override
+    public void close() throws Exception {
+      mutableWorldState.close();
+    }
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/TransactionTrace.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/TransactionTrace.java
index dd669643348..9cdc5cb0463 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/TransactionTrace.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/TransactionTrace.java
@@ -14,17 +14,27 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor;
 
+import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.debug.TraceFrame;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 
 import java.util.List;
+import java.util.Optional;
 
 public class TransactionTrace {
 
   private final Transaction transaction;
   private final TransactionProcessingResult result;
   private final List<TraceFrame> traceFrames;
+  private final Optional<Block> block;
+
+  public TransactionTrace(final Optional<Block> block) {
+    this.transaction = null;
+    this.result = null;
+    this.traceFrames = null;
+    this.block = block;
+  }
 
   public TransactionTrace(
       final Transaction transaction,
@@ -33,6 +43,25 @@ public TransactionTrace(
     this.transaction = transaction;
     this.result = result;
     this.traceFrames = traceFrames;
+    this.block = Optional.empty();
+  }
+
+  public TransactionTrace(
+      final Transaction transaction,
+      final TransactionProcessingResult result,
+      final List<TraceFrame> traceFrames,
+      final Optional<Block> block) {
+    this.transaction = transaction;
+    this.result = result;
+    this.traceFrames = traceFrames;
+    this.block = block;
+  }
+
+  public TransactionTrace(final Transaction transaction, final Optional<Block> block) {
+    this.transaction = transaction;
+    this.result = null;
+    this.traceFrames = null;
+    this.block = block;
   }
 
   public Transaction getTransaction() {
@@ -54,4 +83,8 @@ public TransactionProcessingResult getResult() {
   public List<TraceFrame> getTraceFrames() {
     return traceFrames;
   }
+
+  public Optional<Block> getBlock() {
+    return block;
+  }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/TransactionTracer.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/TransactionTracer.java
index 60c7bbc2f82..6375b7befed 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/TransactionTracer.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/TransactionTracer.java
@@ -16,20 +16,24 @@
 
 import static java.util.function.Predicate.isEqual;
 
+import org.hyperledger.besu.datatypes.DataGas;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TransactionTraceParams;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
 import org.hyperledger.besu.ethereum.debug.TraceOptions;
 import org.hyperledger.besu.ethereum.mainnet.ImmutableTransactionValidationParams;
 import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
-import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
+import org.hyperledger.besu.ethereum.vm.CachingBlockHashLookup;
 import org.hyperledger.besu.ethereum.vm.DebugOperationTracer;
-import org.hyperledger.besu.ethereum.vm.OperationTracer;
-import org.hyperledger.besu.ethereum.vm.StandardJsonTracer;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.evm.tracing.StandardJsonTracer;
+import org.hyperledger.besu.evm.worldstate.StackedUpdater;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -42,12 +46,16 @@
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.base.Stopwatch;
+import org.apache.tuweni.units.bigints.UInt256;
 
 /** Used to produce debug traces of transactions */
 public class TransactionTracer {
 
   public static final String TRACE_PATH = "traces";
+  private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
   private final BlockReplay blockReplay;
 
@@ -56,24 +64,32 @@ public TransactionTracer(final BlockReplay blockReplay) {
   }
 
   public Optional<TransactionTrace> traceTransaction(
-      final Hash blockHash, final Hash transactionHash, final DebugOperationTracer tracer) {
-    return blockReplay.beforeTransactionInBlock(
-        blockHash,
-        transactionHash,
-        (transaction, header, blockchain, worldState, transactionProcessor) -> {
-          final TransactionProcessingResult result =
-              processTransaction(
-                  header,
-                  blockchain,
-                  worldState.updater(),
-                  transaction,
-                  transactionProcessor,
-                  tracer);
-          return new TransactionTrace(transaction, result, tracer.getTraceFrames());
-        });
+      final Tracer.TraceableState mutableWorldState,
+      final Hash blockHash,
+      final Hash transactionHash,
+      final DebugOperationTracer tracer) {
+    Optional<TransactionTrace> transactionTrace =
+        blockReplay.beforeTransactionInBlock(
+            mutableWorldState,
+            blockHash,
+            transactionHash,
+            (transaction, header, blockchain, transactionProcessor, dataGasPrice) -> {
+              final TransactionProcessingResult result =
+                  processTransaction(
+                      header,
+                      blockchain,
+                      mutableWorldState.updater(),
+                      transaction,
+                      transactionProcessor,
+                      tracer,
+                      dataGasPrice);
+              return new TransactionTrace(transaction, result, tracer.getTraceFrames());
+            });
+    return transactionTrace;
   }
 
   public List<String> traceTransactionToFile(
+      final MutableWorldState mutableWorldState,
       final Hash blockHash,
       final Optional<TransactionTraceParams> transactionTraceParams,
       final Path traceDir) {
@@ -96,10 +112,19 @@ public List<String> traceTransactionToFile(
     return blockReplay
         .performActionWithBlock(
             blockHash,
-            (body, header, blockchain, worldState, transactionProcessor) -> {
-              final WorldUpdater worldUpdater = worldState.updater();
+            (body, header, blockchain, transactionProcessor, protocolSpec) -> {
+              WorldUpdater stackedUpdater = mutableWorldState.updater().updater();
               final List<String> traces = new ArrayList<>();
+              final Wei dataGasPrice =
+                  protocolSpec
+                      .getFeeMarket()
+                      .dataPrice(
+                          blockchain
+                              .getBlockHeader(header.getParentHash())
+                              .flatMap(BlockHeader::getExcessDataGas)
+                              .orElse(DataGas.ZERO));
               for (int i = 0; i < body.getTransactions().size(); i++) {
+                ((StackedUpdater<?, ?>) stackedUpdater).markTransactionBoundary();
                 final Transaction transaction = body.getTransactions().get(i);
                 if (selectedHash.isEmpty()
                     || selectedHash.filter(isEqual(transaction.getHash())).isPresent()) {
@@ -110,12 +135,13 @@ public List<String> traceTransactionToFile(
                         processTransaction(
                             header,
                             blockchain,
-                            worldUpdater,
+                            stackedUpdater,
                             transaction,
                             transactionProcessor,
-                            new StandardJsonTracer(out, showMemory));
+                            new StandardJsonTracer(out, showMemory, true, true),
+                            dataGasPrice);
                     out.println(
-                        StandardJsonTracer.summaryTrace(
+                        summaryTrace(
                             transaction, timer.stop().elapsed(TimeUnit.NANOSECONDS), result));
                     traces.add(traceFile.getPath());
                   } catch (FileNotFoundException e) {
@@ -126,10 +152,11 @@ public List<String> traceTransactionToFile(
                   processTransaction(
                       header,
                       blockchain,
-                      worldUpdater,
+                      stackedUpdater,
                       transaction,
                       transactionProcessor,
-                      OperationTracer.NO_TRACING);
+                      OperationTracer.NO_TRACING,
+                      dataGasPrice);
                 }
               }
               return Optional.of(traces);
@@ -159,7 +186,8 @@ private TransactionProcessingResult processTransaction(
       final WorldUpdater worldUpdater,
       final Transaction transaction,
       final MainnetTransactionProcessor transactionProcessor,
-      final OperationTracer tracer) {
+      final OperationTracer tracer,
+      final Wei dataGasPrice) {
     return transactionProcessor.processTransaction(
         blockchain,
         worldUpdater,
@@ -167,8 +195,21 @@ private TransactionProcessingResult processTransaction(
         transaction,
         header.getCoinbase(),
         tracer,
-        new BlockHashLookup(header, blockchain),
+        new CachingBlockHashLookup(header, blockchain),
         false,
-        ImmutableTransactionValidationParams.builder().isAllowFutureNonce(true).build());
+        ImmutableTransactionValidationParams.builder().isAllowFutureNonce(true).build(),
+        dataGasPrice);
+  }
+
+  public static String summaryTrace(
+      final Transaction transaction, final long timer, final TransactionProcessingResult result) {
+    final ObjectNode summaryLine = OBJECT_MAPPER.createObjectNode();
+    summaryLine.put("output", result.getOutput().toUnprefixedHexString());
+    summaryLine.put(
+        "gasUsed",
+        StandardJsonTracer.shortNumber(
+            UInt256.valueOf(transaction.getGasLimit() - result.getGasRemaining())));
+    summaryLine.put("time", timer);
+    return summaryLine.toString();
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcError.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcError.java
index 6fe5eb63041..9554f6020fc 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcError.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcError.java
@@ -17,8 +17,10 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonGetter;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+@JsonInclude(value = JsonInclude.Include.NON_NULL)
 @JsonFormat(shape = JsonFormat.Shape.OBJECT)
 public enum JsonRpcError {
   // Standard errors
@@ -28,9 +30,14 @@ public enum JsonRpcError {
   INVALID_PARAMS(-32602, "Invalid params"),
   INTERNAL_ERROR(-32603, "Internal error"),
   TIMEOUT_ERROR(-32603, "Timeout expired"),
-
   METHOD_NOT_ENABLED(-32604, "Method not enabled"),
 
+  // Resource unavailable error
+  TX_POOL_DISABLED(-32002, "Transaction pool not enabled"),
+
+  // eth_getBlockByNumber specific error message
+  UNKNOWN_BLOCK(-39001, "Unknown block"),
+
   // eth_sendTransaction specific error message
   ETH_SEND_TX_NOT_AVAILABLE(
       -32604,
@@ -50,19 +57,37 @@ public enum JsonRpcError {
   // Transaction validation failures
   NONCE_TOO_LOW(-32001, "Nonce too low"),
   INVALID_TRANSACTION_SIGNATURE(-32002, "Invalid signature"),
+  INVALID_TRANSACTION_TYPE(-32602, "Invalid transaction type"),
   INTRINSIC_GAS_EXCEEDS_LIMIT(-32003, "Intrinsic gas exceeds gas limit"),
   TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE(-32004, "Upfront cost exceeds account balance"),
   EXCEEDS_BLOCK_GAS_LIMIT(-32005, "Transaction gas limit exceeds block gas limit"),
-  INCORRECT_NONCE(-32006, "Incorrect nonce"),
+  EXCEEDS_RPC_MAX_BLOCK_RANGE(-32005, "Requested range exceeds maximum RPC range limit"),
+  EXCEEDS_RPC_MAX_BATCH_SIZE(-32005, "Number of requests exceeds max batch size"),
+  NONCE_TOO_HIGH(-32006, "Nonce too high"),
   TX_SENDER_NOT_AUTHORIZED(-32007, "Sender account not authorized to send transactions"),
   CHAIN_HEAD_WORLD_STATE_NOT_AVAILABLE(-32008, "Initial sync is still in progress"),
   GAS_PRICE_TOO_LOW(-32009, "Gas price below configured minimum gas price"),
+  GAS_PRICE_BELOW_CURRENT_BASE_FEE(-32009, "Gas price below current base fee"),
   WRONG_CHAIN_ID(-32000, "Wrong chainId"),
   REPLAY_PROTECTED_SIGNATURES_NOT_SUPPORTED(-32000, "ChainId not supported"),
+  REPLAY_PROTECTED_SIGNATURE_REQUIRED(-32000, "ChainId is required"),
   TX_FEECAP_EXCEEDED(-32000, "Transaction fee cap exceeded"),
   REVERT_ERROR(-32000, "Execution reverted"),
-  GAS_PRICE_MUST_BE_ZERO(-3200, "gasPrice must be set to zero on a GoQuorum compatible network"),
+  TRANSACTION_NOT_FOUND(-32000, "Transaction not found"),
+  MAX_PRIORITY_FEE_PER_GAS_EXCEEDS_MAX_FEE_PER_GAS(
+      -32000, "Max priority fee per gas exceeds max fee per gas"),
+  NONCE_TOO_FAR_IN_FUTURE_FOR_SENDER(
+      -32000, "Transaction nonce is too distant from current sender nonce"),
+  LOWER_NONCE_INVALID_TRANSACTION_EXISTS(
+      -32000, "An invalid transaction with a lower nonce exists"),
+  TOTAL_DATA_GAS_TOO_HIGH(-32000, "Total data gas too high"),
 
+  // Execution engine failures
+  UNKNOWN_PAYLOAD(-32001, "Payload does not exist / is not available"),
+  INVALID_TERMINAL_BLOCK(-32002, "Terminal block doesn't satisfy terminal block conditions"),
+  INVALID_FORKCHOICE_STATE(-38002, "Invalid forkchoice state"),
+  INVALID_PAYLOAD_ATTRIBUTES(-38003, "Invalid payload attributes"),
+  INVALID_RANGE_REQUEST_TOO_LARGE(-38004, "Too large request"),
   // Miner failures
   COINBASE_NOT_SET(-32010, "Coinbase not set. Unable to start mining without a coinbase"),
   NO_HASHES_PER_SECOND(-32011, "No hashes being generated by the current node"),
@@ -117,34 +142,39 @@ public enum JsonRpcError {
 
   // Private transaction errors
   ENCLAVE_ERROR(-50100, "Error communicating with enclave"),
-  UNIMPLEMENTED_PRIVATE_TRANSACTION_TYPE(-50100, "Unimplemented private transaction type"),
+  UNSUPPORTED_PRIVATE_TRANSACTION_TYPE(-50100, "Unsupported private transaction type"),
   PRIVACY_NOT_ENABLED(-50100, "Privacy is not enabled"),
   CREATE_PRIVACY_GROUP_ERROR(-50100, "Error creating privacy group"),
+  DECODE_ERROR(-50100, "Unable to decode the private signed raw transaction"),
   DELETE_PRIVACY_GROUP_ERROR(-50100, "Error deleting privacy group"),
   FIND_PRIVACY_GROUP_ERROR(-50100, "Error finding privacy group"),
-  FIND_ONCHAIN_PRIVACY_GROUP_ERROR(-50100, "Error finding onchain privacy group"),
-  VALUE_NOT_ZERO(-50100, "We cannot transfer ether in a private transaction yet."),
-  DECODE_ERROR(-50100, "Unable to decode the private signed raw transaction"),
+  FIND_FLEXIBLE_PRIVACY_GROUP_ERROR(-50100, "Error finding flexible privacy group"),
   GET_PRIVATE_TRANSACTION_NONCE_ERROR(-50100, "Unable to determine nonce for account in group."),
   OFFCHAIN_PRIVACY_GROUP_DOES_NOT_EXIST(-50100, "Offchain Privacy group does not exist."),
-  ONCHAIN_PRIVACY_GROUP_DOES_NOT_EXIST(-50100, "Onchain Privacy group does not exist."),
-  ONCHAIN_PRIVACY_GROUP_NOT_ENABLED(-50100, "Onchain privacy groups not enabled."),
+  FLEXIBLE_PRIVACY_GROUP_DOES_NOT_EXIST(-50100, "Flexible Privacy group does not exist."),
+  FLEXIBLE_PRIVACY_GROUP_NOT_ENABLED(-50100, "Flexible privacy groups not enabled."),
   OFFCHAIN_PRIVACY_GROUP_NOT_ENABLED(
-      -50100, "Offchain privacy group can't be used with Onchain privacy groups enabled."),
-  ONCHAIN_PRIVACY_GROUP_ID_NOT_AVAILABLE(
-      -50100, "Private transactions to onchain privacy groups must use privacyGroupId"),
-  PRIVATE_FROM_DOES_NOT_MATCH_ENCLAVE_PUBLIC_KEY(
-      -50100, "Private from does not match enclave public key"),
+      -50100, "Offchain privacy group can't be used with Flexible privacy groups enabled."),
+  FLEXIBLE_PRIVACY_GROUP_ID_NOT_AVAILABLE(
+      -50100, "Private transactions to flexible privacy groups must use privacyGroupId"),
   PMT_FAILED_INTRINSIC_GAS_EXCEEDS_LIMIT(
       -50100,
-      "Private Marker Transaction failed due to intrinsic gas exceeding the limit. Gas limit used from the Private Transaction."),
+      "Privacy Marker Transaction failed due to intrinsic gas exceeding the limit. Gas limit used from the Private Transaction."),
+  PRIVATE_FROM_DOES_NOT_MATCH_ENCLAVE_PUBLIC_KEY(
+      -50100, "Private from does not match enclave public key"),
+  VALUE_NOT_ZERO(-50100, "We cannot transfer ether in a private transaction yet."),
+  PRIVATE_TRANSACTION_INVALID(-50100, "Private transaction invalid"),
+  PRIVATE_TRANSACTION_FAILED(-50100, "Private transaction failed"),
 
   CANT_CONNECT_TO_LOCAL_PEER(-32100, "Cannot add local node as peer."),
+  CANT_RESOLVE_PEER_ENODE_DNS(-32100, "Cannot resolve enode DNS hostname"),
+  DNS_NOT_ENABLED(-32100, "Enode DNS support is disabled"),
 
   // Invalid input errors
   ENODE_ID_INVALID(
       -32000,
       "Invalid node ID: node ID must have exactly 128 hexadecimal characters and should not include any '0x' hex prefix."),
+  JSON_RPC_NOT_CANONICAL_ERROR(-32000, "Invalid input"),
 
   // Enclave errors
   NODE_MISSING_PEER_URL(-50200, "NodeMissingPeerUrl"),
@@ -165,6 +195,11 @@ public enum JsonRpcError {
   ENCLAVE_PAYLOAD_NOT_FOUND(-50200, "EnclavePayloadNotFound"),
   CREATE_GROUP_INCLUDE_SELF(-50200, "CreatePrivacyGroupShouldIncludeSelf"),
 
+  // Tessera error codes
+  TESSERA_NODE_MISSING_PEER_URL(-50200, "Recipient not found for key:"),
+  TESSERA_CREATE_GROUP_INCLUDE_SELF(
+      -50200, "The list of members in a privacy group should include self"),
+
   /** Storing privacy group issue */
   ENCLAVE_UNABLE_STORE_PRIVACY_GROUP(-50200, "PrivacyGroupNotStored"),
   ENCLAVE_UNABLE_DELETE_PRIVACY_GROUP(-50200, "PrivacyGroupNotDeleted"),
@@ -176,6 +211,7 @@ public enum JsonRpcError {
 
   /** Plugins error */
   PLUGIN_NOT_FOUND(-60000, "Plugin not found"),
+  PLUGIN_INTERNAL_ERROR(-32603, "Plugin internal error"),
 
   // Retesteth Errors
 
@@ -184,10 +220,16 @@ public enum JsonRpcError {
 
   private final int code;
   private final String message;
+  private String data;
 
-  JsonRpcError(final int code, final String message) {
+  JsonRpcError(final int code, final String message, final String data) {
     this.code = code;
     this.message = message;
+    this.data = data;
+  }
+
+  JsonRpcError(final int code, final String message) {
+    this(code, message, null);
   }
 
   @JsonGetter("code")
@@ -200,11 +242,22 @@ public String getMessage() {
     return message;
   }
 
+  @JsonGetter("data")
+  public String getData() {
+    return data;
+  }
+
+  public void setData(final String data) {
+    this.data = data;
+  }
+
   @JsonCreator
   public static JsonRpcError fromJson(
-      @JsonProperty("code") final int code, @JsonProperty("message") final String message) {
+      @JsonProperty("code") final int code,
+      @JsonProperty("message") final String message,
+      @JsonProperty("data") final String data) {
     for (final JsonRpcError error : JsonRpcError.values()) {
-      if (error.code == code && error.message.equals(message)) {
+      if (error.code == code && error.message.equals(message) && error.data.equals(data)) {
         return error;
       }
     }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcSuccessResponse.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcSuccessResponse.java
index b9ab28cd408..82b1b8835b7 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcSuccessResponse.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcSuccessResponse.java
@@ -23,6 +23,8 @@
 @JsonPropertyOrder({"jsonrpc", "id", "result"})
 public class JsonRpcSuccessResponse implements JsonRpcResponse {
 
+  public static final String SUCCESS_RESULT = "Success";
+
   private final Object id;
   private final Object result;
 
@@ -33,7 +35,7 @@ public JsonRpcSuccessResponse(final Object id, final Object result) {
 
   public JsonRpcSuccessResponse(final Object id) {
     this.id = id;
-    this.result = "Success";
+    this.result = SUCCESS_RESULT;
   }
 
   @JsonGetter("id")
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/BlockResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/BlockResult.java
index 5bf2705069b..9ca61c8b0c7 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/BlockResult.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/BlockResult.java
@@ -14,10 +14,16 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
 
+import static java.util.stream.Collectors.toList;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.WithdrawalParameter;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
 
 import java.util.List;
+import java.util.Optional;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -25,6 +31,7 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.JsonNode;
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
   "number",
   "hash",
@@ -40,18 +47,20 @@
   "difficulty",
   "totalDifficulty",
   "extraData",
-  "baseFee",
+  "baseFeePerGas",
   "size",
   "gasLimit",
   "gasUsed",
   "timestamp",
   "uncles",
-  "transactions"
+  "transactions",
+  "withdrawalsRoot",
+  "withdrawals"
 })
 public class BlockResult implements JsonRpcResult {
 
   private final String number;
-  private final String hash;
+  protected final String hash;
   private final String mixHash;
   private final String parentHash;
   private final String nonce;
@@ -64,31 +73,34 @@ public class BlockResult implements JsonRpcResult {
   private final String difficulty;
   private final String totalDifficulty;
   private final String extraData;
-  private final String baseFee;
+  private final String baseFeePerGas;
   private final String size;
   private final String gasLimit;
   private final String gasUsed;
   private final String timestamp;
-  private final List<TransactionResult> transactions;
+  protected final List<TransactionResult> transactions;
   private final List<JsonNode> ommers;
   private final String coinbase;
+  private final String withdrawalsRoot;
+  private final List<WithdrawalParameter> withdrawals;
 
-  public <T extends TransactionResult> BlockResult(
+  public BlockResult(
       final BlockHeader header,
       final List<TransactionResult> transactions,
       final List<JsonNode> ommers,
       final Difficulty totalDifficulty,
       final int size) {
-    this(header, transactions, ommers, totalDifficulty, size, false);
+    this(header, transactions, ommers, totalDifficulty, size, false, Optional.empty());
   }
 
-  public <T extends TransactionResult> BlockResult(
+  public BlockResult(
       final BlockHeader header,
       final List<TransactionResult> transactions,
       final List<JsonNode> ommers,
       final Difficulty totalDifficulty,
       final int size,
-      final boolean includeCoinbase) {
+      final boolean includeCoinbase,
+      final Optional<List<Withdrawal>> withdrawals) {
     this.number = Quantity.create(header.getNumber());
     this.hash = header.getHash().toString();
     this.mixHash = header.getMixHash().toString();
@@ -103,7 +115,7 @@ public <T extends TransactionResult> BlockResult(
     this.difficulty = Quantity.create(header.getDifficulty());
     this.totalDifficulty = Quantity.create(totalDifficulty);
     this.extraData = header.getExtraData().toString();
-    this.baseFee = header.getBaseFee().map(Quantity::create).orElse(null);
+    this.baseFeePerGas = header.getBaseFee().map(Quantity::create).orElse(null);
     this.size = Quantity.create(size);
     this.gasLimit = Quantity.create(header.getGasLimit());
     this.gasUsed = Quantity.create(header.getGasUsed());
@@ -111,6 +123,11 @@ public <T extends TransactionResult> BlockResult(
     this.ommers = ommers;
     this.transactions = transactions;
     this.coinbase = includeCoinbase ? header.getCoinbase().toString() : null;
+    this.withdrawalsRoot = header.getWithdrawalsRoot().map(Hash::toString).orElse(null);
+    this.withdrawals =
+        withdrawals
+            .map(w -> w.stream().map(WithdrawalParameter::fromWithdrawal).collect(toList()))
+            .orElse(null);
   }
 
   @JsonGetter(value = "number")
@@ -183,9 +200,9 @@ public String getExtraData() {
     return extraData;
   }
 
-  @JsonGetter(value = "baseFee")
-  public String getBaseFee() {
-    return baseFee;
+  @JsonGetter(value = "baseFeePerGas")
+  public String getBaseFeePerGas() {
+    return baseFeePerGas;
   }
 
   @JsonGetter(value = "size")
@@ -223,4 +240,14 @@ public List<TransactionResult> getTransactions() {
   public String getCoinbase() {
     return coinbase;
   }
+
+  @JsonGetter(value = "withdrawalsRoot")
+  public String getWithdrawalsRoot() {
+    return withdrawalsRoot;
+  }
+
+  @JsonGetter(value = "withdrawals")
+  public List<WithdrawalParameter> getWithdrawals() {
+    return withdrawals;
+  }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/BlockResultFactory.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/BlockResultFactory.java
index cd456f52449..0b6d112dade 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/BlockResultFactory.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/BlockResultFactory.java
@@ -14,18 +14,26 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
 
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.EngineGetPayloadBodiesResultV1.PayloadBody;
 import org.hyperledger.besu.ethereum.api.query.BlockWithMetadata;
 import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
 import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.core.BlockValueCalculator;
+import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
+import org.hyperledger.besu.ethereum.core.encoding.TransactionEncoder;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.TextNode;
+import org.apache.tuweni.bytes.Bytes;
 
 public class BlockResultFactory {
 
@@ -52,7 +60,8 @@ public BlockResult transactionComplete(
         ommers,
         blockWithMetadata.getTotalDifficulty(),
         blockWithMetadata.getSize(),
-        includeCoinbase);
+        includeCoinbase,
+        blockWithMetadata.getWithdrawals());
   }
 
   public BlockResult transactionComplete(final Block block) {
@@ -64,6 +73,7 @@ public BlockResult transactionComplete(final Block block) {
           new TransactionWithMetadata(
               block.getBody().getTransactions().get(i),
               block.getHeader().getNumber(),
+              block.getHeader().getBaseFee(),
               block.getHash(),
               i));
     }
@@ -82,6 +92,42 @@ public BlockResult transactionComplete(final Block block) {
         block.getHeader(), txs, ommers, block.getHeader().getDifficulty(), block.calculateSize());
   }
 
+  public EngineGetPayloadResultV1 payloadTransactionCompleteV1(final Block block) {
+    final List<String> txs =
+        block.getBody().getTransactions().stream()
+            .map(TransactionEncoder::encodeOpaqueBytes)
+            .map(Bytes::toHexString)
+            .collect(Collectors.toList());
+
+    return new EngineGetPayloadResultV1(block.getHeader(), txs);
+  }
+
+  public EngineGetPayloadResultV2 payloadTransactionCompleteV2(
+      final BlockWithReceipts blockWithReceipts) {
+    final List<String> txs =
+        blockWithReceipts.getBlock().getBody().getTransactions().stream()
+            .map(TransactionEncoder::encodeOpaqueBytes)
+            .map(Bytes::toHexString)
+            .collect(Collectors.toList());
+
+    final Wei blockValue = new BlockValueCalculator().calculateBlockValue(blockWithReceipts);
+    return new EngineGetPayloadResultV2(
+        blockWithReceipts.getHeader(),
+        txs,
+        blockWithReceipts.getBlock().getBody().getWithdrawals(),
+        blockWithReceipts.getBlock().getBody().getDeposits(),
+        Quantity.create(blockValue));
+  }
+
+  public EngineGetPayloadBodiesResultV1 payloadBodiesCompleteV1(
+      final List<Optional<BlockBody>> blockBodies) {
+    final List<PayloadBody> payloadBodies =
+        blockBodies.stream()
+            .map(maybeBody -> maybeBody.map(PayloadBody::new).orElse(null))
+            .collect(Collectors.toList());
+    return new EngineGetPayloadBodiesResultV1(payloadBodies);
+  }
+
   public BlockResult transactionHash(final BlockWithMetadata<Hash, Hash> blockWithMetadata) {
     return transactionHash(blockWithMetadata, false);
   }
@@ -104,6 +150,7 @@ public BlockResult transactionHash(
         ommers,
         blockWithMetadata.getTotalDifficulty(),
         blockWithMetadata.getSize(),
-        includeCoinbase);
+        includeCoinbase,
+        blockWithMetadata.getWithdrawals());
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/CreateAccessListResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/CreateAccessListResult.java
new file mode 100644
index 00000000000..23476b7026e
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/CreateAccessListResult.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
+
+import org.hyperledger.besu.evm.AccessListEntry;
+
+import java.util.Collection;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonGetter;
+
+public class CreateAccessListResult {
+  List<AccessListEntry> accessListList;
+  String gasUsed;
+
+  public CreateAccessListResult(final List<AccessListEntry> accessListEntries, final long gasUsed) {
+    this.accessListList = accessListEntries;
+    this.gasUsed = Quantity.create(gasUsed);
+  }
+
+  @JsonGetter(value = "accessList")
+  public Collection<AccessListEntry> getAccessList() {
+    return accessListList;
+  }
+
+  @JsonGetter(value = "gasUsed")
+  public String getGasUsed() {
+    return gasUsed;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/DebugAccountAtResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/DebugAccountAtResult.java
new file mode 100644
index 00000000000..637b1fc7d33
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/DebugAccountAtResult.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
+
+import org.immutables.value.Value;
+
+@Value.Immutable
+public abstract class DebugAccountAtResult implements JsonRpcResult {
+  public abstract String getCode();
+
+  public abstract String getNonce();
+
+  public abstract String getBalance();
+
+  public abstract String getCodehash();
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/DebugStorageRangeAtResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/DebugStorageRangeAtResult.java
index b5cb16a0697..54d0abf8bc3 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/DebugStorageRangeAtResult.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/DebugStorageRangeAtResult.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
 
-import org.hyperledger.besu.ethereum.core.AccountStorageEntry;
+import org.hyperledger.besu.evm.account.AccountStorageEntry;
 
 import java.util.NavigableMap;
 import java.util.Objects;
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineExchangeTransitionConfigurationResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineExchangeTransitionConfigurationResult.java
new file mode 100644
index 00000000000..7f790268715
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineExchangeTransitionConfigurationResult.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+
+import com.fasterxml.jackson.annotation.JsonGetter;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonPropertyOrder({"terminalTotalDifficulty", "terminalBlockHash", "terminalBlockNumber"})
+public class EngineExchangeTransitionConfigurationResult {
+  private final Difficulty terminalTotalDifficulty;
+  private final Hash terminalBlockHash;
+  private final long terminalBlockNumber;
+
+  public EngineExchangeTransitionConfigurationResult(
+      final Difficulty terminalTotalDifficulty,
+      final Hash terminalBlockHash,
+      final long terminalBlockNumber) {
+    this.terminalTotalDifficulty = terminalTotalDifficulty;
+    this.terminalBlockHash = terminalBlockHash;
+    this.terminalBlockNumber = terminalBlockNumber;
+  }
+
+  @JsonGetter(value = "terminalTotalDifficulty")
+  public String getTerminalTotalDifficultyAsString() {
+    return Quantity.create(this.terminalTotalDifficulty.getAsBigInteger());
+  }
+
+  public Difficulty getTerminalTotalDifficulty() {
+    return terminalTotalDifficulty;
+  }
+
+  @JsonGetter(value = "terminalBlockHash")
+  public String getTerminalBlockHashAsString() {
+    return terminalBlockHash.toHexString();
+  }
+
+  public Hash getTerminalBlockHash() {
+    return terminalBlockHash;
+  }
+
+  @JsonGetter(value = "terminalBlockNumber")
+  public String getTerminalBlockNumberAsString() {
+    return Quantity.create(this.terminalBlockNumber);
+  }
+
+  public Long getTerminalBlockNumber() {
+    return terminalBlockNumber;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineGetPayloadBodiesResultV1.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineGetPayloadBodiesResultV1.java
new file mode 100644
index 00000000000..4358230ee09
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineGetPayloadBodiesResultV1.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.WithdrawalParameter;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.encoding.TransactionEncoder;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.annotation.JsonGetter;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonValue;
+import org.apache.tuweni.bytes.Bytes;
+
+@JsonPropertyOrder({"payloadBodies"})
+public class EngineGetPayloadBodiesResultV1 {
+
+  private final List<PayloadBody> payloadBodies;
+
+  public EngineGetPayloadBodiesResultV1() {
+    this.payloadBodies = Collections.<PayloadBody>emptyList();
+  }
+
+  public EngineGetPayloadBodiesResultV1(final List<PayloadBody> payloadBody) {
+    this.payloadBodies = payloadBody;
+  }
+
+  @JsonValue
+  public List<PayloadBody> getPayloadBodies() {
+    return payloadBodies;
+  }
+
+  public static class PayloadBody {
+    private final List<String> transactions;
+    private final List<WithdrawalParameter> withdrawals;
+
+    public PayloadBody(final BlockBody blockBody) {
+      this.transactions =
+          blockBody.getTransactions().stream()
+              .map(TransactionEncoder::encodeOpaqueBytes)
+              .map(Bytes::toHexString)
+              .collect(Collectors.toList());
+      this.withdrawals =
+          blockBody
+              .getWithdrawals()
+              .map(
+                  ws ->
+                      ws.stream()
+                          .map(WithdrawalParameter::fromWithdrawal)
+                          .collect(Collectors.toList()))
+              .orElse(null);
+    }
+
+    @JsonGetter(value = "transactions")
+    public List<String> getTransactions() {
+      return transactions;
+    }
+
+    @JsonGetter(value = "withdrawals")
+    public List<WithdrawalParameter> getWithdrawals() {
+      return withdrawals;
+    }
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineGetPayloadResultV1.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineGetPayloadResultV1.java
new file mode 100644
index 00000000000..0b21d15ef62
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineGetPayloadResultV1.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonGetter;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.apache.tuweni.bytes.Bytes32;
+
+@JsonPropertyOrder({
+  "parentHash",
+  "feeRecipient",
+  "stateRoot",
+  "receiptsRoot",
+  "logsBloom",
+  "prevRandao",
+  "blockNumber",
+  "gasLimit",
+  "gasUsed",
+  "timestamp",
+  "extraData",
+  "baseFeePerGas",
+  "blockHash",
+  "transactions"
+})
+public class EngineGetPayloadResultV1 {
+  protected final String blockHash;
+  private final String parentHash;
+  private final String feeRecipient;
+  private final String stateRoot;
+  private final String receiptsRoot;
+  private final String logsBloom;
+  private final String prevRandao;
+  private final String blockNumber;
+  private final String gasLimit;
+  private final String gasUsed;
+  private final String timestamp;
+  private final String extraData;
+  private final String baseFeePerGas;
+  protected final List<String> transactions;
+
+  public EngineGetPayloadResultV1(final BlockHeader header, final List<String> transactions) {
+    this.blockNumber = Quantity.create(header.getNumber());
+    this.blockHash = header.getHash().toString();
+    this.parentHash = header.getParentHash().toString();
+    this.logsBloom = header.getLogsBloom().toString();
+    this.stateRoot = header.getStateRoot().toString();
+    this.receiptsRoot = header.getReceiptsRoot().toString();
+    this.extraData = header.getExtraData().toString();
+    this.baseFeePerGas = header.getBaseFee().map(Quantity::create).orElse(null);
+    this.gasLimit = Quantity.create(header.getGasLimit());
+    this.gasUsed = Quantity.create(header.getGasUsed());
+    this.timestamp = Quantity.create(header.getTimestamp());
+    this.transactions = transactions;
+    this.feeRecipient = header.getCoinbase().toString();
+    this.prevRandao = header.getPrevRandao().map(Bytes32::toHexString).orElse(null);
+  }
+
+  @JsonGetter(value = "blockNumber")
+  public String getNumber() {
+    return blockNumber;
+  }
+
+  @JsonGetter(value = "blockHash")
+  public String getHash() {
+    return blockHash;
+  }
+
+  @JsonGetter(value = "parentHash")
+  public String getParentHash() {
+    return parentHash;
+  }
+
+  @JsonGetter(value = "logsBloom")
+  public String getLogsBloom() {
+    return logsBloom;
+  }
+
+  @JsonGetter(value = "prevRandao")
+  public String getPrevRandao() {
+    return prevRandao;
+  }
+
+  @JsonGetter(value = "stateRoot")
+  public String getStateRoot() {
+    return stateRoot;
+  }
+
+  @JsonGetter(value = "receiptsRoot")
+  public String getReceiptRoot() {
+    return receiptsRoot;
+  }
+
+  @JsonGetter(value = "extraData")
+  public String getExtraData() {
+    return extraData;
+  }
+
+  @JsonGetter(value = "baseFeePerGas")
+  public String getBaseFeePerGas() {
+    return baseFeePerGas;
+  }
+
+  @JsonGetter(value = "gasLimit")
+  public String getGasLimit() {
+    return gasLimit;
+  }
+
+  @JsonGetter(value = "gasUsed")
+  public String getGasUsed() {
+    return gasUsed;
+  }
+
+  @JsonGetter(value = "timestamp")
+  public String getTimestamp() {
+    return timestamp;
+  }
+
+  @JsonGetter(value = "transactions")
+  public List<String> getTransactions() {
+    return transactions;
+  }
+
+  @JsonGetter(value = "feeRecipient")
+  @JsonInclude(JsonInclude.Include.NON_NULL)
+  public String getFeeRecipient() {
+    return feeRecipient;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineGetPayloadResultV2.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineGetPayloadResultV2.java
new file mode 100644
index 00000000000..b5e9fafabe2
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineGetPayloadResultV2.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.DepositParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.WithdrawalParameter;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Deposit;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.annotation.JsonGetter;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.apache.tuweni.bytes.Bytes32;
+
+@JsonPropertyOrder({
+  "executionPayload",
+  "blockValue",
+})
+public class EngineGetPayloadResultV2 {
+  protected final PayloadResult executionPayload;
+  private final String blockValue;
+
+  public EngineGetPayloadResultV2(
+      final BlockHeader header,
+      final List<String> transactions,
+      final Optional<List<Withdrawal>> withdrawals,
+      final Optional<List<Deposit>> deposits,
+      final String blockValue) {
+    this.executionPayload = new PayloadResult(header, transactions, withdrawals, deposits);
+    this.blockValue = blockValue;
+  }
+
+  @JsonGetter(value = "executionPayload")
+  public PayloadResult getExecutionPayload() {
+    return executionPayload;
+  }
+
+  @JsonGetter(value = "blockValue")
+  public String getBlockValue() {
+    return blockValue;
+  }
+
+  public static class PayloadResult {
+
+    protected final String blockHash;
+    private final String parentHash;
+    private final String feeRecipient;
+    private final String stateRoot;
+    private final String receiptsRoot;
+    private final String logsBloom;
+    private final String prevRandao;
+    private final String blockNumber;
+    private final String gasLimit;
+    private final String gasUsed;
+    private final String timestamp;
+    private final String extraData;
+    private final String baseFeePerGas;
+    protected final List<String> transactions;
+    private final List<WithdrawalParameter> withdrawals;
+    private final List<DepositParameter> deposits;
+
+    public PayloadResult(
+        final BlockHeader header,
+        final List<String> transactions,
+        final Optional<List<Withdrawal>> withdrawals,
+        final Optional<List<Deposit>> deposits) {
+      this.blockNumber = Quantity.create(header.getNumber());
+      this.blockHash = header.getHash().toString();
+      this.parentHash = header.getParentHash().toString();
+      this.logsBloom = header.getLogsBloom().toString();
+      this.stateRoot = header.getStateRoot().toString();
+      this.receiptsRoot = header.getReceiptsRoot().toString();
+      this.extraData = header.getExtraData().toString();
+      this.baseFeePerGas = header.getBaseFee().map(Quantity::create).orElse(null);
+      this.gasLimit = Quantity.create(header.getGasLimit());
+      this.gasUsed = Quantity.create(header.getGasUsed());
+      this.timestamp = Quantity.create(header.getTimestamp());
+      this.transactions = transactions;
+      this.feeRecipient = header.getCoinbase().toString();
+      this.prevRandao = header.getPrevRandao().map(Bytes32::toHexString).orElse(null);
+      this.withdrawals =
+          withdrawals
+              .map(
+                  ws ->
+                      ws.stream()
+                          .map(WithdrawalParameter::fromWithdrawal)
+                          .collect(Collectors.toList()))
+              .orElse(null);
+      this.deposits =
+          deposits
+              .map(
+                  ds -> ds.stream().map(DepositParameter::fromDeposit).collect(Collectors.toList()))
+              .orElse(null);
+    }
+
+    @JsonGetter(value = "blockNumber")
+    public String getNumber() {
+      return blockNumber;
+    }
+
+    @JsonGetter(value = "blockHash")
+    public String getHash() {
+      return blockHash;
+    }
+
+    @JsonGetter(value = "parentHash")
+    public String getParentHash() {
+      return parentHash;
+    }
+
+    @JsonGetter(value = "logsBloom")
+    public String getLogsBloom() {
+      return logsBloom;
+    }
+
+    @JsonGetter(value = "prevRandao")
+    public String getPrevRandao() {
+      return prevRandao;
+    }
+
+    @JsonGetter(value = "stateRoot")
+    public String getStateRoot() {
+      return stateRoot;
+    }
+
+    @JsonGetter(value = "receiptsRoot")
+    public String getReceiptRoot() {
+      return receiptsRoot;
+    }
+
+    @JsonGetter(value = "extraData")
+    public String getExtraData() {
+      return extraData;
+    }
+
+    @JsonGetter(value = "baseFeePerGas")
+    public String getBaseFeePerGas() {
+      return baseFeePerGas;
+    }
+
+    @JsonGetter(value = "gasLimit")
+    public String getGasLimit() {
+      return gasLimit;
+    }
+
+    @JsonGetter(value = "gasUsed")
+    public String getGasUsed() {
+      return gasUsed;
+    }
+
+    @JsonGetter(value = "timestamp")
+    public String getTimestamp() {
+      return timestamp;
+    }
+
+    @JsonGetter(value = "transactions")
+    public List<String> getTransactions() {
+      return transactions;
+    }
+
+    @JsonGetter(value = "withdrawals")
+    public List<WithdrawalParameter> getWithdrawals() {
+      return withdrawals;
+    }
+
+    @JsonGetter(value = "deposits")
+    public List<DepositParameter> getDeposits() {
+      return deposits;
+    }
+
+    @JsonGetter(value = "feeRecipient")
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public String getFeeRecipient() {
+      return feeRecipient;
+    }
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EnginePayloadStatusResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EnginePayloadStatusResult.java
new file mode 100644
index 00000000000..6ea417ca11e
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EnginePayloadStatusResult.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus;
+
+import java.util.Optional;
+
+import com.fasterxml.jackson.annotation.JsonGetter;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonPropertyOrder({"status", "latestValidHash", "validationError"})
+public class EnginePayloadStatusResult {
+  EngineStatus status;
+  Optional<Hash> latestValidHash;
+  Optional<String> validationError;
+
+  public EnginePayloadStatusResult(
+      final EngineStatus status,
+      final Hash latestValidHash,
+      final Optional<String> validationError) {
+    this.status = status;
+    this.latestValidHash = Optional.ofNullable(latestValidHash);
+    this.validationError = validationError;
+  }
+
+  @JsonGetter(value = "status")
+  public String getStatusAsString() {
+    return status.name();
+  }
+
+  public EngineStatus getStatus() {
+    return status;
+  }
+
+  @JsonGetter(value = "latestValidHash")
+  public String getLatestValidHashAsString() {
+    return latestValidHash.map(Hash::toHexString).orElse(null);
+  }
+
+  public Optional<Hash> getLatestValidHash() {
+    return latestValidHash;
+  }
+
+  @JsonGetter(value = "validationError")
+  public String getError() {
+    return validationError.orElse(null);
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EnginePreparePayloadResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EnginePreparePayloadResult.java
new file mode 100644
index 00000000000..650ad973875
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EnginePreparePayloadResult.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
+
+import org.hyperledger.besu.consensus.merge.blockcreation.PayloadIdentifier;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus;
+
+import java.util.Optional;
+
+import com.fasterxml.jackson.annotation.JsonGetter;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonPropertyOrder({"status", "payloadId"})
+public class EnginePreparePayloadResult {
+  private final EngineStatus status;
+  private final PayloadIdentifier payloadId;
+
+  public EnginePreparePayloadResult(final EngineStatus status, final PayloadIdentifier payloadId) {
+    this.status = status;
+    this.payloadId = payloadId;
+  }
+
+  @JsonGetter(value = "status")
+  public String getStatus() {
+    return status.name();
+  }
+
+  @JsonGetter(value = "payloadId")
+  public String getPayloadId() {
+    return Optional.ofNullable(payloadId).map(PayloadIdentifier::toShortHexString).orElse("");
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineUpdateForkchoiceResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineUpdateForkchoiceResult.java
new file mode 100644
index 00000000000..f560d295094
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/EngineUpdateForkchoiceResult.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
+
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.INVALID;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.SYNCING;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.VALID;
+
+import org.hyperledger.besu.consensus.merge.blockcreation.PayloadIdentifier;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus;
+
+import java.util.EnumSet;
+import java.util.Optional;
+
+import com.fasterxml.jackson.annotation.JsonGetter;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonPropertyOrder({"payloadStatus", "payloadId"})
+public class EngineUpdateForkchoiceResult {
+  private final EnginePayloadStatusResult payloadStatus;
+  private final PayloadIdentifier payloadId;
+  static final EnumSet<EngineStatus> FORK_CHOICE_ENGINE_STATUS =
+      EnumSet.of(VALID, INVALID, SYNCING);
+
+  public EngineUpdateForkchoiceResult(
+      final EngineStatus status,
+      final Hash latestValidHash,
+      final PayloadIdentifier payloadId,
+      final Optional<String> errorMessage) {
+
+    if (!FORK_CHOICE_ENGINE_STATUS.contains(status)) {
+      throw new IllegalStateException(
+          String.format("Invalid status response %s for EngineForkChoiceResult", status.name()));
+    }
+
+    this.payloadStatus = new EnginePayloadStatusResult(status, latestValidHash, errorMessage);
+    this.payloadId = payloadId;
+  }
+
+  @JsonGetter(value = "payloadStatus")
+  public EnginePayloadStatusResult getPayloadStatus() {
+    return payloadStatus;
+  }
+
+  @JsonGetter(value = "payloadId")
+  public String getPayloadId() {
+    return Optional.ofNullable(payloadId).map(PayloadIdentifier::toHexString).orElse(null);
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/FeeHistory.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/FeeHistory.java
new file mode 100644
index 00000000000..08b130c3f5c
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/FeeHistory.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
+
+import static java.util.stream.Collectors.toUnmodifiableList;
+
+import org.hyperledger.besu.datatypes.Wei;
+
+import java.util.List;
+import java.util.Optional;
+import javax.annotation.Nullable;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.immutables.value.Value;
+
+@Value.Immutable
+public interface FeeHistory {
+
+  long getOldestBlock();
+
+  List<Wei> getBaseFeePerGas();
+
+  List<Double> getGasUsedRatio();
+
+  Optional<List<List<Wei>>> getReward();
+
+  @Value.Immutable
+  @Value.Style(allParameters = true)
+  @JsonInclude(JsonInclude.Include.NON_NULL)
+  interface FeeHistoryResult {
+    @JsonProperty("oldestBlock")
+    String getOldestBlock();
+
+    @JsonProperty("baseFeePerGas")
+    List<String> getBaseFeePerGas();
+
+    @JsonProperty("gasUsedRatio")
+    List<Double> getGasUsedRatio();
+
+    @Nullable
+    @JsonProperty("reward")
+    List<List<String>> getReward();
+
+    static FeeHistoryResult from(final FeeHistory feeHistory) {
+      return ImmutableFeeHistoryResult.of(
+          Quantity.create(feeHistory.getOldestBlock()),
+          feeHistory.getBaseFeePerGas().stream()
+              .map(Quantity::create)
+              .collect(toUnmodifiableList()),
+          feeHistory.getGasUsedRatio(),
+          feeHistory
+              .getReward()
+              .map(
+                  outerList ->
+                      outerList.stream()
+                          .map(
+                              innerList ->
+                                  innerList.stream()
+                                      .map(Quantity::create)
+                                      .collect(toUnmodifiableList()))
+                          .collect(toUnmodifiableList()))
+              .orElse(null));
+    }
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/PeerResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/PeerResult.java
index d092a0a86da..c420990d65b 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/PeerResult.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/PeerResult.java
@@ -29,7 +29,7 @@
 import com.fasterxml.jackson.databind.node.TextNode;
 import org.immutables.value.Value;
 
-@JsonPropertyOrder({"version", "name", "caps", "network", "port", "id", "protocols"})
+@JsonPropertyOrder({"version", "name", "caps", "network", "port", "id", "protocols", "enode"})
 @Value.Immutable
 @Value.Style(allParameters = true)
 public interface PeerResult {
@@ -49,6 +49,7 @@ static PeerResult fromEthPeer(final EthPeer peer) {
         .port(Quantity.create(peerInfo.getPort()))
         .id(peerInfo.getNodeId().toString())
         .protocols(Map.of(peer.getProtocolName(), ProtocolsResult.fromEthPeer(peer)))
+        .enode(connection.getRemoteEnode().toString())
         .build();
   }
 
@@ -72,4 +73,7 @@ static PeerResult fromEthPeer(final EthPeer peer) {
 
   @JsonGetter(value = "protocols")
   Map<String, ProtocolsResult> getProtocols();
+
+  @JsonGetter(value = "enode")
+  String getEnode();
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/PendingTransactionResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/PendingTransactionResult.java
new file mode 100644
index 00000000000..c87b34da0f6
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/PendingTransactionResult.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
+
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+
+import java.time.Instant;
+
+import com.fasterxml.jackson.annotation.JsonGetter;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonPropertyOrder({"hash", "isReceivedFromLocalSource"})
+public class PendingTransactionResult implements TransactionResult {
+
+  private final String hash;
+  private final boolean isReceivedFromLocalSource;
+  private final Instant addedToPoolAt;
+
+  public PendingTransactionResult(final PendingTransaction pendingTransaction) {
+    hash = pendingTransaction.getHash().toString();
+    isReceivedFromLocalSource = pendingTransaction.isReceivedFromLocalSource();
+    addedToPoolAt = Instant.ofEpochMilli(pendingTransaction.getAddedAt());
+  }
+
+  @JsonGetter(value = "hash")
+  public String getHash() {
+    return hash;
+  }
+
+  @JsonGetter(value = "addedToPoolAt")
+  public String getAddedToPoolAt() {
+    return addedToPoolAt.toString();
+  }
+
+  @JsonGetter(value = "isReceivedFromLocalSource")
+  public boolean isReceivedFromLocalSource() {
+    return isReceivedFromLocalSource;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/PendingTransactionsResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/PendingTransactionsResult.java
index af3e7156f75..39308fd38f9 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/PendingTransactionsResult.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/PendingTransactionsResult.java
@@ -14,24 +14,24 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
 
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionInfo;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
 
-import java.util.Set;
-import java.util.stream.Collectors;
+import java.util.Collection;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
 public class PendingTransactionsResult implements TransactionResult {
 
-  private final Set<TransactionInfoResult> transactionInfoResults;
+  private final List<PendingTransactionResult> pendingTransactionResults;
 
-  public PendingTransactionsResult(final Set<TransactionInfo> transactionInfoSet) {
-    transactionInfoResults =
-        transactionInfoSet.stream().map(TransactionInfoResult::new).collect(Collectors.toSet());
+  public PendingTransactionsResult(final Collection<PendingTransaction> pendingTransactionSet) {
+    pendingTransactionResults =
+        pendingTransactionSet.stream().map(PendingTransactionResult::new).toList();
   }
 
   @JsonValue
-  public Set<TransactionInfoResult> getResults() {
-    return transactionInfoResults;
+  public List<PendingTransactionResult> getResults() {
+    return pendingTransactionResults;
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/Quantity.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/Quantity.java
index f2e76178133..5a37301d1ed 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/Quantity.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/Quantity.java
@@ -17,7 +17,6 @@
 import java.math.BigInteger;
 import java.util.Objects;
 
-import com.google.common.base.Strings;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.units.bigints.UInt256;
@@ -44,7 +43,7 @@ public static String create(final int value) {
   }
 
   public static String create(final long value) {
-    return uint256ToHex(UInt256.valueOf(value));
+    return uint256ToHex(UInt256.fromHexString(Long.toHexString(value)));
   }
 
   public static String create(final Bytes value) {
@@ -73,7 +72,7 @@ public static String create(final byte value) {
    */
   public static String longToPaddedHex(final long val, final int byteLength) {
     final String formatted = Long.toHexString(val);
-    final String zeroPadding = Strings.repeat("0", byteLength * 2 - formatted.length());
+    final String zeroPadding = "0".repeat(byteLength * 2 - formatted.length());
     return String.format("%s%s%s", HEX_PREFIX, zeroPadding, formatted);
   }
 
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/SignerMetricResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/SignerMetricResult.java
index aeb858320c9..640ca24055d 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/SignerMetricResult.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/SignerMetricResult.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 
 import java.util.Objects;
 
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/StructLog.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/StructLog.java
index 7761e307729..f6a873b597f 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/StructLog.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/StructLog.java
@@ -14,7 +14,6 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
 
-import org.hyperledger.besu.ethereum.core.Gas;
 import org.hyperledger.besu.ethereum.debug.TraceFrame;
 
 import java.util.Arrays;
@@ -42,8 +41,8 @@ public class StructLog {
 
   public StructLog(final TraceFrame traceFrame) {
     depth = traceFrame.getDepth() + 1;
-    gas = traceFrame.getGasRemaining().toLong();
-    gasCost = traceFrame.getGasCost().map(Gas::toLong).orElse(0L);
+    gas = traceFrame.getGasRemaining();
+    gasCost = traceFrame.getGasCost().orElse(0L);
     memory =
         traceFrame
             .getMemory()
@@ -64,8 +63,7 @@ private static Map<String, String> formatStorage(final Map<UInt256, UInt256> sto
     final Map<String, String> formattedStorage = new TreeMap<>();
     storage.forEach(
         (key, value) ->
-            formattedStorage.put(
-                key.toBytes().toUnprefixedHexString(), value.toBytes().toUnprefixedHexString()));
+            formattedStorage.put(key.toUnprefixedHexString(), value.toUnprefixedHexString()));
     return formattedStorage;
   }
 
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TraceCallResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TraceCallResult.java
new file mode 100644
index 00000000000..699c3d4721a
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TraceCallResult.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.diff.StateDiffTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.flat.FlatTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.vm.VmTrace;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonGetter;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonPropertyOrder({"output", "stateDiff", "trace", "vmTrace"})
+public class TraceCallResult {
+  private final String output;
+  private final StateDiffTrace stateDiff;
+  private final List<FlatTrace> traces;
+  private final VmTrace vmTrace;
+
+  public TraceCallResult(
+      final String output,
+      final StateDiffTrace stateDiff,
+      final List<FlatTrace> traces,
+      final VmTrace vmTrace) {
+    this.output = output;
+    this.stateDiff = stateDiff;
+    this.traces = traces;
+    this.vmTrace = vmTrace;
+  }
+
+  @JsonGetter(value = "output")
+  public String getOutput() {
+    return output;
+  }
+
+  @JsonGetter(value = "stateDiff")
+  public StateDiffTrace getStateDiff() {
+    return stateDiff;
+  }
+
+  @JsonGetter(value = "trace")
+  public List<FlatTrace> getTraces() {
+    return traces;
+  }
+
+  @JsonGetter(value = "vmTrace")
+  public VmTrace getVmTrace() {
+    return vmTrace;
+  }
+
+  public static Builder builder() {
+    return new Builder();
+  }
+
+  public static class Builder {
+    private String output;
+    private StateDiffTrace stateDiff;
+    private final List<FlatTrace> traces = new ArrayList<>();
+    private VmTrace vmTrace;
+
+    public TraceCallResult build() {
+      return new TraceCallResult(output, stateDiff, traces, vmTrace);
+    }
+
+    public void output(final String output) {
+      this.output = output;
+    }
+
+    public void stateDiff(final StateDiffTrace stateDiff) {
+      this.stateDiff = stateDiff;
+    }
+
+    public void addTrace(final FlatTrace trace) {
+      traces.add(trace);
+    }
+
+    public void vmTrace(final VmTrace vmTrace) {
+      this.vmTrace = vmTrace;
+    }
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TraceReplayResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TraceReplayResult.java
new file mode 100644
index 00000000000..67256973c95
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TraceReplayResult.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.diff.StateDiffTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.flat.FlatTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.vm.VmTrace;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonGetter;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonPropertyOrder({"output", "revertReason", "stateDiff", "trace", "transactionHash", "vmTrace"})
+public class TraceReplayResult {
+  private final String output;
+  private final String revertReason;
+  private final StateDiffTrace stateDiff;
+  private final List<FlatTrace> traces;
+  private final VmTrace vmTrace;
+  private final String transactionHash;
+
+  public TraceReplayResult(
+      final String output,
+      final String revertReason,
+      final StateDiffTrace stateDiff,
+      final List<FlatTrace> traces,
+      final String transactionHash,
+      final VmTrace vmTrace) {
+    this.output = output;
+    this.revertReason = revertReason;
+    this.stateDiff = stateDiff;
+    this.traces = traces;
+    this.transactionHash = transactionHash;
+    this.vmTrace = vmTrace;
+  }
+
+  @JsonGetter(value = "output")
+  public String getOutput() {
+    return output;
+  }
+
+  @JsonInclude(Include.NON_NULL)
+  @JsonGetter(value = "revertReason")
+  public String getRevertReason() {
+    return revertReason;
+  }
+
+  @JsonGetter(value = "stateDiff")
+  public StateDiffTrace getStateDiff() {
+    return stateDiff;
+  }
+
+  @JsonGetter(value = "trace")
+  public List<FlatTrace> getTraces() {
+    return traces;
+  }
+
+  @JsonGetter(value = "vmTrace")
+  public VmTrace getVmTrace() {
+    return vmTrace;
+  }
+
+  @JsonGetter(value = "transactionHash")
+  public String getTransactionHash() {
+    return transactionHash;
+  }
+
+  public static Builder builder() {
+    return new Builder();
+  }
+
+  public static class Builder {
+    private String output;
+    private String revertReason;
+    private StateDiffTrace stateDiff;
+    private final List<FlatTrace> traces = new ArrayList<>();
+    private VmTrace vmTrace;
+    private String transactionHash;
+
+    public TraceReplayResult build() {
+      return new TraceReplayResult(
+          output, revertReason, stateDiff, traces, transactionHash, vmTrace);
+    }
+
+    public void output(final String output) {
+      this.output = output;
+    }
+
+    public void revertReason(final String revertReason) {
+      this.revertReason = revertReason;
+    }
+
+    public void stateDiff(final StateDiffTrace stateDiff) {
+      this.stateDiff = stateDiff;
+    }
+
+    public void transactionHash(final String transactionHash) {
+      this.transactionHash = transactionHash;
+    }
+
+    public void addTrace(final FlatTrace trace) {
+      traces.add(trace);
+    }
+
+    public void vmTrace(final VmTrace vmTrace) {
+      this.vmTrace = vmTrace;
+    }
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionCompleteResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionCompleteResult.java
index fdf572f592b..793a6f9cebf 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionCompleteResult.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionCompleteResult.java
@@ -14,24 +14,35 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
 
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
 import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.evm.AccessListEntry;
+import org.hyperledger.besu.plugin.data.TransactionType;
+
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import org.apache.tuweni.bytes.Bytes;
 
 @JsonPropertyOrder({
+  "accessList",
   "blockHash",
   "blockNumber",
+  "chainId",
   "from",
   "gas",
   "gasPrice",
+  "maxPriorityFeePerGas",
+  "maxFeePerGas",
   "hash",
   "input",
   "nonce",
   "to",
   "transactionIndex",
+  "type",
   "value",
   "v",
   "r",
@@ -39,16 +50,31 @@
 })
 public class TransactionCompleteResult implements TransactionResult {
 
+  @JsonInclude(JsonInclude.Include.NON_NULL)
+  private final List<AccessListEntry> accessList;
+
   private final String blockHash;
   private final String blockNumber;
+
+  @JsonInclude(JsonInclude.Include.NON_NULL)
+  private final String chainId;
+
   private final String from;
   private final String gas;
   private final String gasPrice;
+
+  @JsonInclude(JsonInclude.Include.NON_NULL)
+  private final String maxPriorityFeePerGas;
+
+  @JsonInclude(JsonInclude.Include.NON_NULL)
+  private final String maxFeePerGas;
+
   private final String hash;
   private final String input;
   private final String nonce;
   private final String to;
   private final String transactionIndex;
+  private final String type;
   private final String value;
   private final String v;
   private final String r;
@@ -56,22 +82,42 @@ public class TransactionCompleteResult implements TransactionResult {
 
   public TransactionCompleteResult(final TransactionWithMetadata tx) {
     final Transaction transaction = tx.getTransaction();
+    final TransactionType transactionType = transaction.getType();
+    this.accessList = transaction.getAccessList().orElse(null);
     this.blockHash = tx.getBlockHash().get().toString();
     this.blockNumber = Quantity.create(tx.getBlockNumber().get());
+    this.chainId = transaction.getChainId().map(Quantity::create).orElse(null);
     this.from = transaction.getSender().toString();
     this.gas = Quantity.create(transaction.getGasLimit());
-    this.gasPrice = Quantity.create(transaction.getGasPrice());
+    this.maxPriorityFeePerGas =
+        tx.getTransaction().getMaxPriorityFeePerGas().map(Wei::toShortHexString).orElse(null);
+    this.maxFeePerGas =
+        tx.getTransaction().getMaxFeePerGas().map(Wei::toShortHexString).orElse(null);
+    this.gasPrice =
+        Quantity.create(
+            transaction
+                .getGasPrice()
+                .orElseGet(() -> transaction.getEffectiveGasPrice(tx.getBaseFee())));
     this.hash = transaction.getHash().toString();
     this.input = transaction.getPayload().toString();
     this.nonce = Quantity.create(transaction.getNonce());
     this.to = transaction.getTo().map(Bytes::toHexString).orElse(null);
     this.transactionIndex = Quantity.create(tx.getTransactionIndex().get());
+    this.type =
+        transactionType.equals(TransactionType.FRONTIER)
+            ? Quantity.create(0)
+            : Quantity.create(transactionType.getSerializedType());
     this.value = Quantity.create(transaction.getValue());
     this.v = Quantity.create(transaction.getV());
     this.r = Quantity.create(transaction.getR());
     this.s = Quantity.create(transaction.getS());
   }
 
+  @JsonGetter(value = "accessList")
+  public List<AccessListEntry> getAccessList() {
+    return accessList;
+  }
+
   @JsonGetter(value = "blockHash")
   public String getBlockHash() {
     return blockHash;
@@ -82,6 +128,11 @@ public String getBlockNumber() {
     return blockNumber;
   }
 
+  @JsonGetter(value = "chainId")
+  public String getChainId() {
+    return chainId;
+  }
+
   @JsonGetter(value = "from")
   public String getFrom() {
     return from;
@@ -92,6 +143,16 @@ public String getGas() {
     return gas;
   }
 
+  @JsonGetter(value = "maxPriorityFeePerGas")
+  public String getMaxPriorityFeePerGas() {
+    return maxPriorityFeePerGas;
+  }
+
+  @JsonGetter(value = "maxFeePerGas")
+  public String getMaxFeePerGas() {
+    return maxFeePerGas;
+  }
+
   @JsonGetter(value = "gasPrice")
   public String getGasPrice() {
     return gasPrice;
@@ -122,6 +183,11 @@ public String getTransactionIndex() {
     return transactionIndex;
   }
 
+  @JsonGetter(value = "type")
+  public String getType() {
+    return type;
+  }
+
   @JsonGetter(value = "value")
   public String getValue() {
     return value;
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionInfoResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionInfoResult.java
deleted file mode 100644
index c4ea87bedef..00000000000
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionInfoResult.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
-
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionInfo;
-
-import java.time.Instant;
-
-import com.fasterxml.jackson.annotation.JsonGetter;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-@JsonPropertyOrder({"hash", "isReceivedFromLocalSource"})
-public class TransactionInfoResult implements TransactionResult {
-
-  private final String hash;
-  private final boolean isReceivedFromLocalSource;
-  private final Instant addedToPoolAt;
-
-  public TransactionInfoResult(final TransactionInfo transactionInfo) {
-    hash = transactionInfo.getHash().toString();
-    isReceivedFromLocalSource = transactionInfo.isReceivedFromLocalSource();
-    addedToPoolAt = transactionInfo.getAddedToPoolAt();
-  }
-
-  @JsonGetter(value = "hash")
-  public String getHash() {
-    return hash;
-  }
-
-  @JsonGetter(value = "addedToPoolAt")
-  public String getAddedToPoolAt() {
-    return addedToPoolAt.toString();
-  }
-
-  @JsonGetter(value = "isReceivedFromLocalSource")
-  public boolean isReceivedFromLocalSource() {
-    return isReceivedFromLocalSource;
-  }
-}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionPendingResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionPendingResult.java
index 5fe2fa8f23b..7aa3828e4d6 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionPendingResult.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionPendingResult.java
@@ -14,10 +14,18 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.evm.AccessListEntry;
+import org.hyperledger.besu.plugin.data.TransactionType;
+
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 @JsonPropertyOrder({
@@ -26,6 +34,9 @@
   "from",
   "gas",
   "gasPrice",
+  "maxPriorityFeePerGas",
+  "maxFeePerGas",
+  "maxFeePerDataGas",
   "hash",
   "input",
   "nonce",
@@ -34,34 +45,83 @@
   "value",
   "v",
   "r",
-  "s"
+  "s",
+  "blobVersionedHashes"
 })
 public class TransactionPendingResult implements TransactionResult {
 
+  @JsonInclude(JsonInclude.Include.NON_NULL)
+  private final List<AccessListEntry> accessList;
+
+  private final String chainId;
   private final String from;
   private final String gas;
+
   private final String gasPrice;
+
+  @JsonInclude(JsonInclude.Include.NON_NULL)
+  private final String maxPriorityFeePerGas;
+
+  @JsonInclude(JsonInclude.Include.NON_NULL)
+  private final String maxFeePerGas;
+
+  @JsonInclude(JsonInclude.Include.NON_NULL)
+  private final String maxFeePerDataGas;
+
   private final String hash;
   private final String input;
   private final String nonce;
+  private final String publicKey;
+  private final String raw;
   private final String to;
+  private final String type;
   private final String value;
   private final String v;
   private final String r;
   private final String s;
 
+  @JsonInclude(JsonInclude.Include.NON_NULL)
+  private final List<Hash> versionedHashes;
+
   public TransactionPendingResult(final Transaction transaction) {
+    final TransactionType transactionType = transaction.getType();
+    this.accessList = transaction.getAccessList().orElse(null);
+    this.chainId = transaction.getChainId().map(Quantity::create).orElse(null);
     this.from = transaction.getSender().toString();
     this.gas = Quantity.create(transaction.getGasLimit());
-    this.gasPrice = Quantity.create(transaction.getGasPrice());
+    this.maxPriorityFeePerGas =
+        transaction.getMaxPriorityFeePerGas().map(Wei::toShortHexString).orElse(null);
+    this.maxFeePerGas = transaction.getMaxFeePerGas().map(Wei::toShortHexString).orElse(null);
+    this.maxFeePerDataGas =
+        transaction.getMaxFeePerDataGas().map(Wei::toShortHexString).orElse(null);
+    this.gasPrice = transaction.getGasPrice().map(Quantity::create).orElse(maxFeePerGas);
     this.hash = transaction.getHash().toString();
     this.input = transaction.getPayload().toString();
     this.nonce = Quantity.create(transaction.getNonce());
+    this.publicKey = transaction.getPublicKey().orElse(null);
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    transaction.writeTo(out);
+    this.raw = out.encoded().toString();
     this.to = transaction.getTo().map(Address::toHexString).orElse(null);
+    this.type =
+        transactionType.equals(TransactionType.FRONTIER)
+            ? Quantity.create(0)
+            : Quantity.create(transactionType.getSerializedType());
     this.value = Quantity.create(transaction.getValue());
     this.v = Quantity.create(transaction.getV());
     this.r = Quantity.create(transaction.getR());
     this.s = Quantity.create(transaction.getS());
+    this.versionedHashes = transaction.getVersionedHashes().orElse(null);
+  }
+
+  @JsonGetter(value = "accessList")
+  public List<AccessListEntry> getAccessList() {
+    return accessList;
+  }
+
+  @JsonGetter(value = "chainId")
+  public String getChainId() {
+    return chainId;
   }
 
   @JsonGetter(value = "from")
@@ -79,6 +139,21 @@ public String getGasPrice() {
     return gasPrice;
   }
 
+  @JsonGetter(value = "maxPriorityFeePerGas")
+  public String getMaxPriorityFeePerGas() {
+    return maxPriorityFeePerGas;
+  }
+
+  @JsonGetter(value = "maxFeePerGas")
+  public String getMaxFeePerGas() {
+    return maxFeePerGas;
+  }
+
+  @JsonGetter(value = "maxFeePerDataGas")
+  public String getMaxFeePerDataGas() {
+    return maxFeePerDataGas;
+  }
+
   @JsonGetter(value = "hash")
   public String getHash() {
     return hash;
@@ -94,11 +169,26 @@ public String getNonce() {
     return nonce;
   }
 
+  @JsonGetter(value = "publicKey")
+  public String getPublicKey() {
+    return publicKey;
+  }
+
+  @JsonGetter(value = "raw")
+  public String getRaw() {
+    return raw;
+  }
+
   @JsonGetter(value = "to")
   public String getTo() {
     return to;
   }
 
+  @JsonGetter(value = "type")
+  public String getType() {
+    return type;
+  }
+
   @JsonGetter(value = "value")
   public String getValue() {
     return value;
@@ -118,4 +208,24 @@ public String getR() {
   public String getS() {
     return s;
   }
+
+  @JsonGetter(value = "blockHash")
+  public String getBlockHash() {
+    return null;
+  }
+
+  @JsonGetter(value = "blockNumber")
+  public String getBlockNumber() {
+    return null;
+  }
+
+  @JsonGetter(value = "transactionIndex")
+  public String getTransactionIndex() {
+    return null;
+  }
+
+  @JsonGetter(value = "blobVersionedHashes")
+  public List<Hash> getVersionedHashes() {
+    return versionedHashes;
+  }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptLogResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptLogResult.java
index d0f5e233ff5..8dc2e2158aa 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptLogResult.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptLogResult.java
@@ -14,9 +14,9 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
 
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Log;
-import org.hyperledger.besu.ethereum.core.LogTopic;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.log.LogTopic;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptResult.java
index bdd03dd1100..db032289bde 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptResult.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionReceiptResult.java
@@ -14,11 +14,13 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.query.TransactionReceiptWithMetadata;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Log;
+import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.plugin.data.TransactionType;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35,6 +37,7 @@
   "cumulativeGasUsed",
   "from",
   "gasUsed",
+  "effectiveGasPrice",
   "logs",
   "logsBloom",
   "root",
@@ -42,7 +45,8 @@
   "to",
   "transactionHash",
   "transactionIndex",
-  "revertReason"
+  "revertReason",
+  "type"
 })
 public abstract class TransactionReceiptResult {
 
@@ -52,6 +56,7 @@ public abstract class TransactionReceiptResult {
   private final String cumulativeGasUsed;
   private final String from;
   private final String gasUsed;
+  private final String effectiveGasPrice;
   private final List<TransactionReceiptLogResult> logs;
   private final String logsBloom;
   private final String to;
@@ -60,30 +65,36 @@ public abstract class TransactionReceiptResult {
   private final String revertReason;
 
   protected final TransactionReceipt receipt;
+  protected final String type;
 
   protected TransactionReceiptResult(final TransactionReceiptWithMetadata receiptWithMetadata) {
-
-    receipt = receiptWithMetadata.getReceipt();
-
+    final Transaction txn = receiptWithMetadata.getTransaction();
+    this.receipt = receiptWithMetadata.getReceipt();
     this.blockHash = receiptWithMetadata.getBlockHash().toString();
     this.blockNumber = Quantity.create(receiptWithMetadata.getBlockNumber());
-    this.contractAddress =
-        receiptWithMetadata.getTransaction().contractAddress().map(Address::toString).orElse(null);
+    this.contractAddress = txn.contractAddress().map(Address::toString).orElse(null);
     this.cumulativeGasUsed = Quantity.create(receipt.getCumulativeGasUsed());
-    this.from = receiptWithMetadata.getTransaction().getSender().toString();
+    this.from = txn.getSender().toString();
     this.gasUsed = Quantity.create(receiptWithMetadata.getGasUsed());
+    this.effectiveGasPrice =
+        Quantity.create(txn.getEffectiveGasPrice(receiptWithMetadata.getBaseFee()));
+
     this.logs =
         logReceipts(
-            receipt.getLogs(),
+            receipt.getLogsList(),
             receiptWithMetadata.getBlockNumber(),
-            receiptWithMetadata.getTransaction().getHash(),
+            txn.getHash(),
             receiptWithMetadata.getBlockHash(),
             receiptWithMetadata.getTransactionIndex());
     this.logsBloom = receipt.getBloomFilter().toString();
-    this.to = receiptWithMetadata.getTransaction().getTo().map(Bytes::toHexString).orElse(null);
-    this.transactionHash = receiptWithMetadata.getTransaction().getHash().toString();
+    this.to = txn.getTo().map(Bytes::toHexString).orElse(null);
+    this.transactionHash = txn.getHash().toString();
     this.transactionIndex = Quantity.create(receiptWithMetadata.getTransactionIndex());
     this.revertReason = receipt.getRevertReason().map(Bytes::toString).orElse(null);
+    this.type =
+        txn.getType().equals(TransactionType.FRONTIER)
+            ? Quantity.create(0)
+            : Quantity.create(txn.getType().getSerializedType());
   }
 
   @JsonGetter(value = "blockHash")
@@ -116,6 +127,11 @@ public String getGasUsed() {
     return gasUsed;
   }
 
+  @JsonGetter(value = "effectiveGasPrice")
+  public String getEffectiveGasPrice() {
+    return effectiveGasPrice;
+  }
+
   @JsonGetter(value = "logs")
   public List<TransactionReceiptLogResult> getLogs() {
     return logs;
@@ -141,6 +157,11 @@ public String getTransactionIndex() {
     return transactionIndex;
   }
 
+  @JsonGetter(value = "type")
+  public String getType() {
+    return type;
+  }
+
   @JsonInclude(JsonInclude.Include.NON_NULL)
   @JsonGetter(value = "revertReason")
   public String getRevertReason() {
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionGroupResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionGroupResult.java
index 7997b0e2df8..5d5aab868a7 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionGroupResult.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionGroupResult.java
@@ -23,7 +23,6 @@
   "from",
   "gas",
   "gasPrice",
-  "hash",
   "input",
   "nonce",
   "to",
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionReceiptResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionReceiptResult.java
index 731ac78ea2b..bd58ed82049 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionReceiptResult.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionReceiptResult.java
@@ -14,11 +14,12 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.privacy;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionReceiptLogResult;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Log;
-import org.hyperledger.besu.ethereum.core.LogsBloomFilter;
+import org.hyperledger.besu.ethereum.privacy.PrivacyGroupUtil;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -56,7 +57,6 @@ public class PrivateTransactionReceiptResult {
   private final String from;
   private final List<TransactionReceiptLogResult> logs;
   private final String to;
-  private final String transactionHash;
   private final String transactionIndex;
   private final String revertReason;
   private final String output;
@@ -77,7 +77,6 @@ public PrivateTransactionReceiptResult(
       final long blockNumber,
       final int txIndex,
       final Hash commitmentHash,
-      final Hash transactionHash,
       final Bytes privateFrom,
       final List<Bytes> privateFor,
       final Bytes privacyGroupId,
@@ -88,13 +87,15 @@ public PrivateTransactionReceiptResult(
     this.to = to;
     this.output = output.toString();
     this.commitmentHash = commitmentHash.toString();
-    this.transactionHash = transactionHash.toString();
     this.privateFrom = privateFrom != null ? privateFrom.toBase64String() : null;
     this.privateFor =
         privateFor != null
             ? privateFor.stream().map(Bytes::toBase64String).collect(Collectors.toList())
             : null;
-    this.privacyGroupId = privacyGroupId != null ? privacyGroupId.toBase64String() : null;
+    this.privacyGroupId =
+        privacyGroupId != null
+            ? privacyGroupId.toBase64String()
+            : PrivacyGroupUtil.calculateEeaPrivacyGroupId(privateFrom, privateFor).toBase64String();
     this.revertReason = revertReason != null ? revertReason.toString() : null;
     this.status = status;
     this.logs = logReceipts(logs, blockNumber, commitmentHash, blockHash, txIndex);
@@ -139,11 +140,6 @@ public String getCommitmentHash() {
     return commitmentHash;
   }
 
-  @JsonGetter("transactionHash")
-  public String getTransactionHash() {
-    return transactionHash;
-  }
-
   @JsonGetter("privateFrom")
   public String getPrivateFrom() {
     return privateFrom;
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionResult.java
index df344f66136..3f00076f1da 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionResult.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/privacy/PrivateTransactionResult.java
@@ -16,8 +16,8 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
@@ -26,7 +26,6 @@ public abstract class PrivateTransactionResult {
   private final String from;
   private final String gas;
   private final String gasPrice;
-  private final String hash;
   private final String input;
   private final String nonce;
   private final String to;
@@ -41,7 +40,6 @@ protected PrivateTransactionResult(final PrivateTransaction tx) {
     this.from = tx.getSender().toString();
     this.gas = Quantity.create(tx.getGasLimit());
     this.gasPrice = Quantity.create(tx.getGasPrice());
-    this.hash = tx.getHash().toString();
     this.input = tx.getPayload().toString();
     this.nonce = Quantity.create(tx.getNonce());
     this.to = tx.getTo().map(Address::toHexString).orElse(null);
@@ -68,11 +66,6 @@ public String getGasPrice() {
     return gasPrice;
   }
 
-  @JsonGetter(value = "hash")
-  public String getHash() {
-    return hash;
-  }
-
   @JsonGetter(value = "input")
   public String getInput() {
     return input;
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/proof/GetProofResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/proof/GetProofResult.java
index 763226d2881..f4adb7b0fed 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/proof/GetProofResult.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/proof/GetProofResult.java
@@ -14,9 +14,9 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.proof;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.proof.WorldStateProof;
 import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
 
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/proof/StorageEntryProof.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/proof/StorageEntryProof.java
index caf679316e2..3939906520e 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/proof/StorageEntryProof.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/proof/StorageEntryProof.java
@@ -39,7 +39,7 @@ public StorageEntryProof(final UInt256 key, final UInt256 value, final List<Byte
 
   @JsonGetter(value = "key")
   public String getKey() {
-    return key.toString();
+    return key.trimLeadingZeros().toHexString();
   }
 
   @JsonGetter(value = "value")
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/TracingUtils.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/TracingUtils.java
index e79bfbda2bb..248bfce3667 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/TracingUtils.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/TracingUtils.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing;
 
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.datatypes.Wei;
 
 import java.util.Arrays;
 import java.util.Optional;
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/diff/StateDiffGenerator.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/diff/StateDiffGenerator.java
index 070e15ebcbf..e8b975e11b8 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/diff/StateDiffGenerator.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/diff/StateDiffGenerator.java
@@ -16,14 +16,14 @@
 
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.diff;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.Trace;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.TracingUtils;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.UpdateTrackingAccount;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
 import org.hyperledger.besu.ethereum.debug.TraceFrame;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.worldstate.UpdateTrackingAccount;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/diff/StateDiffTrace.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/diff/StateDiffTrace.java
index f194ed22656..1a2ecc3d696 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/diff/StateDiffTrace.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/diff/StateDiffTrace.java
@@ -20,4 +20,4 @@
 
 import java.util.TreeMap;
 
-class StateDiffTrace extends TreeMap<String, AccountDiff> implements Trace {}
+public class StateDiffTrace extends TreeMap<String, AccountDiff> implements Trace {}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/Action.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/Action.java
index d89335a4823..03bafbe859f 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/Action.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/Action.java
@@ -18,7 +18,6 @@
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
-import org.hyperledger.besu.ethereum.core.Gas;
 import org.hyperledger.besu.ethereum.debug.TraceFrame;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -184,10 +183,10 @@ public static Builder from(final TransactionTrace trace) {
       if (!trace.getTraceFrames().isEmpty()) {
         final TraceFrame traceFrame = trace.getTraceFrames().get(0);
         builder.gas(
-            traceFrame
-                .getGasRemaining()
-                .plus(traceFrame.getPrecompiledGasCost().orElse(Gas.ZERO))
-                .toHexString());
+            "0x"
+                + Long.toHexString(
+                    traceFrame.getGasRemaining()
+                        + (traceFrame.getPrecompiledGasCost().orElse(0L))));
       }
       return builder;
     }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/FlatTrace.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/FlatTrace.java
index d040ed80155..0fbd2d68e75 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/FlatTrace.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/FlatTrace.java
@@ -33,6 +33,7 @@
   "blockNumber",
   "result",
   "error",
+  "revertReason",
   "subtraces",
   "traceAddress",
   "transactionHash",
@@ -47,6 +48,7 @@ public class FlatTrace implements Trace {
   private final Integer transactionPosition;
   private final String transactionHash;
   private final Optional<String> error;
+  private final String revertReason;
   private final int subtraces;
   private final List<Integer> traceAddress;
   private final String type;
@@ -72,7 +74,34 @@ protected FlatTrace(
         blockHash,
         transactionPosition,
         transactionHash,
-        error);
+        error,
+        null);
+  }
+
+  protected FlatTrace(
+      final Action.Builder actionBuilder,
+      final Result.Builder resultBuilder,
+      final int subtraces,
+      final List<Integer> traceAddress,
+      final String type,
+      final Long blockNumber,
+      final String blockHash,
+      final Integer transactionPosition,
+      final String transactionHash,
+      final Optional<String> error,
+      final String revertReason) {
+    this(
+        actionBuilder != null ? actionBuilder.build() : null,
+        resultBuilder != null ? resultBuilder.build() : null,
+        subtraces,
+        traceAddress,
+        type,
+        blockNumber,
+        blockHash,
+        transactionPosition,
+        transactionHash,
+        error,
+        revertReason);
   }
 
   protected FlatTrace(
@@ -85,7 +114,8 @@ protected FlatTrace(
       final String blockHash,
       final Integer transactionPosition,
       final String transactionHash,
-      final Optional<String> error) {
+      final Optional<String> error,
+      final String revertReason) {
     this.action = action;
     this.result = result;
     this.subtraces = subtraces;
@@ -96,6 +126,7 @@ protected FlatTrace(
     this.transactionPosition = transactionPosition;
     this.transactionHash = transactionHash;
     this.error = error;
+    this.revertReason = revertReason;
   }
 
   static Builder freshBuilder(final TransactionTrace transactionTrace) {
@@ -133,6 +164,11 @@ public String getError() {
     return error.orElse(null);
   }
 
+  @JsonInclude(NON_NULL)
+  public String getRevertReason() {
+    return revertReason;
+  }
+
   /**
    * This ridiculous construction returns a true "null" when we have a value in error, resulting in
    * jackson not serializing it, or a wrapped reference of either null or the value, resulting in
@@ -217,6 +253,7 @@ public static class Builder {
     private String transactionHash;
     private Integer transactionPosition;
     private Optional<String> error = Optional.empty();
+    private String revertReason;
 
     protected Builder() {}
 
@@ -265,6 +302,11 @@ public Builder error(final Optional<String> error) {
       return this;
     }
 
+    public Builder revertReason(final String revertReason) {
+      this.revertReason = revertReason;
+      return this;
+    }
+
     public String getType() {
       return type;
     }
@@ -297,6 +339,10 @@ public Optional<String> getError() {
       return error;
     }
 
+    public String getRevertReason() {
+      return revertReason;
+    }
+
     void incSubTraces() {
       this.subtraces++;
     }
@@ -312,7 +358,8 @@ public FlatTrace build() {
           blockHash,
           transactionPosition,
           transactionHash,
-          error);
+          error,
+          revertReason);
     }
 
     public Result.Builder getResultBuilder() {
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/FlatTraceGenerator.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/FlatTraceGenerator.java
index dccaec1d8e7..3a7fa3951fb 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/FlatTraceGenerator.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/FlatTraceGenerator.java
@@ -14,28 +14,29 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.flat;
 
+import static org.hyperledger.besu.evm.internal.Words.toAddress;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.Trace;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.TracingUtils;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Gas;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.debug.TraceFrame;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.ethereum.vm.Code;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Deque;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
+import java.util.OptionalLong;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
@@ -45,7 +46,6 @@
 import com.google.common.collect.Streams;
 import com.google.common.util.concurrent.Atomics;
 import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
 
 public class FlatTraceGenerator {
 
@@ -79,9 +79,11 @@ public static Stream<Trace> generateFromTransactionTrace(
     final Optional<String> smartContractAddress =
         smartContractCode.map(
             __ -> Address.contractAddress(tx.getSender(), tx.getNonce()).toHexString());
+    final Optional<Bytes> revertReason = transactionTrace.getResult().getRevertReason();
 
     // set code field in result node
     smartContractCode.ifPresent(firstFlatTraceBuilder.getResultBuilder()::code);
+    revertReason.ifPresent(r -> firstFlatTraceBuilder.revertReason(r.toHexString()));
 
     // set init field if transaction is a smart contract deployment
     tx.getInit().map(Bytes::toHexString).ifPresent(firstFlatTraceBuilder.getActionBuilder()::init);
@@ -108,10 +110,13 @@ && hasRevertInSubCall(transactionTrace, transactionTrace.getTraceFrames().get(0)
     }
 
     if (!transactionTrace.getTraceFrames().isEmpty()) {
-      final Optional<Gas> precompiledGasCost =
+      final OptionalLong precompiledGasCost =
           transactionTrace.getTraceFrames().get(0).getPrecompiledGasCost();
-      precompiledGasCost.ifPresent(
-          gas -> firstFlatTraceBuilder.getResultBuilder().gasUsed(gas.toHexString()));
+      if (precompiledGasCost.isPresent()) {
+        firstFlatTraceBuilder
+            .getResultBuilder()
+            .gasUsed("0x" + Long.toHexString(precompiledGasCost.getAsLong()));
+      }
     }
 
     final List<FlatTrace.Builder> flatTraces = new ArrayList<>();
@@ -133,8 +138,7 @@ && hasRevertInSubCall(transactionTrace, transactionTrace.getTraceFrames().get(0)
       final TraceFrame traceFrame = nextTraceFrame.get();
       nextTraceFrame = iter.hasNext() ? Optional.of(iter.next()) : Optional.empty();
       cumulativeGasCost +=
-          traceFrame.getGasCost().orElse(Gas.ZERO).toLong()
-              + traceFrame.getPrecompiledGasCost().orElse(Gas.ZERO).toLong();
+          traceFrame.getGasCost().orElse(0L) + traceFrame.getPrecompiledGasCost().orElse(0L);
 
       final String opcodeString = traceFrame.getOpcode();
       if ("CALL".equals(opcodeString)
@@ -193,7 +197,7 @@ && hasRevertInSubCall(transactionTrace, transactionTrace.getTraceFrames().get(0)
       }
 
       if (traceFrame.getExceptionalHaltReason().isPresent()) {
-        currentContext = handleHalt(tracesContexts, currentContext, traceFrame);
+        currentContext = handleHalt(flatTraces, tracesContexts, currentContext, traceFrame);
       }
 
       if (currentContext == null) {
@@ -219,12 +223,24 @@ public static Stream<Trace> generateFromTransactionTrace(
       final TransactionTrace transactionTrace,
       final Block block,
       final AtomicInteger traceCounter) {
+    return generateFromTransactionTrace(
+        protocolSchedule, transactionTrace, block, traceCounter, true);
+  }
+
+  public static Stream<Trace> generateFromTransactionTrace(
+      final ProtocolSchedule protocolSchedule,
+      final TransactionTrace transactionTrace,
+      final Block block,
+      final AtomicInteger traceCounter,
+      final boolean includeCreationMethod) {
     return generateFromTransactionTrace(
         protocolSchedule,
         transactionTrace,
         block,
         traceCounter,
-        builder -> addContractCreationMethodToTrace(transactionTrace, builder));
+        includeCreationMethod
+            ? builder -> addContractCreationMethodToTrace(transactionTrace, builder)
+            : builder -> {});
   }
 
   /**
@@ -257,7 +273,7 @@ private static FlatTrace.Context handleCall(
       final long cumulativeGasCost,
       final Deque<FlatTrace.Context> tracesContexts,
       final String opcodeString) {
-    final Bytes32[] stack = traceFrame.getStack().orElseThrow();
+    final Bytes[] stack = traceFrame.getStack().orElseThrow();
     final FlatTrace.Context lastContext = tracesContexts.peekLast();
 
     final String callingAddress = calculateCallingAddress(lastContext);
@@ -276,9 +292,10 @@ private static FlatTrace.Context handleCall(
             .from(callingAddress)
             .input(
                 nextTraceFrame.map(TraceFrame::getInputData).map(Bytes::toHexString).orElse(null))
-            .gas(nextTraceFrame.map(TraceFrame::getGasRemaining).orElse(Gas.ZERO).toHexString())
+            .gas(
+                "0x" + Long.toHexString(nextTraceFrame.map(TraceFrame::getGasRemaining).orElse(0L)))
             .callType(opcodeString.toLowerCase(Locale.US))
-            .value(Quantity.create(transactionTrace.getTransaction().getValue()));
+            .value(Quantity.create(traceFrame.getValue()));
 
     if (stack.length > 1) {
       subTraceActionBuilder.to(toAddress(stack[stack.length - 2]).toString());
@@ -319,10 +336,9 @@ private static FlatTrace.Context handleReturn(
     if ("STOP".equals(traceFrame.getOpcode()) && resultBuilder.isGasUsedEmpty()) {
       final long callStipend =
           protocolSchedule
-              .getByBlockNumber(block.getHeader().getNumber())
+              .getByBlockHeader(block.getHeader())
               .getGasCalculator()
-              .getAdditionalCallStipend()
-              .toLong();
+              .getAdditionalCallStipend();
       tracesContexts.stream()
           .filter(
               context ->
@@ -361,14 +377,14 @@ private static FlatTrace.Context handleSelfDestruct(
       final List<FlatTrace.Builder> flatTraces) {
 
     final Action.Builder actionBuilder = currentContext.getBuilder().getActionBuilder();
-    final Gas gasUsed =
-        Gas.fromHexString(actionBuilder.getGas())
-            .minus(traceFrame.getGasRemaining())
-            .plus(traceFrame.getGasCost().orElse(Gas.ZERO));
+    final long gasUsed =
+        Long.decode(actionBuilder.getGas())
+            - traceFrame.getGasRemaining()
+            + (traceFrame.getGasCost().orElse(0L));
 
-    currentContext.setGasUsed(gasUsed.toLong());
+    currentContext.setGasUsed(gasUsed);
 
-    final Bytes32[] stack = traceFrame.getStack().orElseThrow();
+    final Bytes[] stack = traceFrame.getStack().orElseThrow();
     final Address refundAddress = toAddress(stack[stack.length - 1]);
     final FlatTrace.Builder subTraceBuilder =
         FlatTrace.builder()
@@ -411,7 +427,7 @@ private static String getActionAddress(
   }
 
   private static String firstNonNull(final String defaultValue, final String... values) {
-    for (String value : values) {
+    for (final String value : values) {
       if (value != null) {
         return value;
       }
@@ -439,14 +455,14 @@ private static FlatTrace.Context handleCreateOperation(
     final Action.Builder subTraceActionBuilder =
         Action.builder()
             .from(smartContractAddress.orElse(callingAddress))
-            .gas(computeGas(traceFrame, nextTraceFrame).toHexString())
+            .gas("0x" + Long.toHexString(computeGas(traceFrame, nextTraceFrame)))
             .value(Quantity.create(nextTraceFrame.map(TraceFrame::getValue).orElse(Wei.ZERO)));
 
     traceFrame
         .getMaybeCode()
         .map(Code::getBytes)
         .map(Bytes::toHexString)
-        .map(subTraceActionBuilder::init);
+        .ifPresent(subTraceActionBuilder::init);
 
     final FlatTrace.Context currentContext =
         new FlatTrace.Context(subTraceBuilder.actionBuilder(subTraceActionBuilder));
@@ -463,20 +479,29 @@ private static FlatTrace.Context handleCreateOperation(
   }
 
   private static FlatTrace.Context handleHalt(
+      final List<FlatTrace.Builder> flatTraces,
       final Deque<FlatTrace.Context> tracesContexts,
       final FlatTrace.Context currentContext,
       final TraceFrame traceFrame) {
-    final FlatTrace.Builder traceFrameBuilder = currentContext.getBuilder();
+    final FlatTrace.Builder traceFrameBuilder;
+    if (currentContext == null) {
+      traceFrameBuilder = flatTraces.get(flatTraces.size() - 1);
+    } else {
+      traceFrameBuilder = currentContext.getBuilder();
+    }
     traceFrameBuilder.error(
         traceFrame.getExceptionalHaltReason().map(ExceptionalHaltReason::getDescription));
-    final Action.Builder actionBuilder = traceFrameBuilder.getActionBuilder();
-    actionBuilder.value(Quantity.create(traceFrame.getValue()));
-    tracesContexts.removeLast();
-    final FlatTrace.Context nextContext = tracesContexts.peekLast();
-    if (nextContext != null) {
-      nextContext.getBuilder().incSubTraces();
+    if (currentContext != null) {
+      final Action.Builder actionBuilder = traceFrameBuilder.getActionBuilder();
+      actionBuilder.value(Quantity.create(traceFrame.getValue()));
+      tracesContexts.removeLast();
+      final FlatTrace.Context nextContext = tracesContexts.peekLast();
+      if (nextContext != null) {
+        nextContext.getBuilder().incSubTraces();
+      }
+      return nextContext;
     }
-    return nextContext;
+    return currentContext;
   }
 
   private static FlatTrace.Context handleRevert(
@@ -505,19 +530,11 @@ private static FlatTrace.Context handleCallDataLoad(
 
   private static boolean hasRevertInSubCall(
       final TransactionTrace transactionTrace, final TraceFrame callFrame) {
-    for (int i = 0; i < transactionTrace.getTraceFrames().size(); i++) {
-      if (i + 1 < transactionTrace.getTraceFrames().size()) {
-        final TraceFrame next = transactionTrace.getTraceFrames().get(i + 1);
-        if (next.getDepth() == callFrame.getDepth()) {
-          if (next.getOpcode().equals("REVERT")) {
-            return true;
-          } else if (next.getOpcode().equals("RETURN")) {
-            return false;
-          }
-        }
-      }
-    }
-    return false;
+    return transactionTrace.getTraceFrames().stream()
+        .filter(traceFrame -> !traceFrame.equals(callFrame))
+        .takeWhile(traceFrame -> !traceFrame.getOpcode().equals("RETURN"))
+        .filter(traceFrame -> traceFrame.getOpcode().equals("REVERT"))
+        .anyMatch(traceFrame -> traceFrame.getDepth() == callFrame.getDepth());
   }
 
   private static String calculateCallingAddress(final FlatTrace.Context lastContext) {
@@ -551,42 +568,36 @@ private static long computeGasUsed(
       final TransactionTrace transactionTrace,
       final TraceFrame traceFrame) {
 
-    long gasRemainingBeforeProcessed;
-    long gasRemainingAfterProcessed;
+    final long gasRemainingBeforeProcessed;
+    final long gasRemainingAfterProcessed;
     long gasRefund = 0;
     if (tracesContexts.size() == 1) {
-      gasRemainingBeforeProcessed =
-          transactionTrace.getTraceFrames().get(0).getGasRemaining().toLong();
+      gasRemainingBeforeProcessed = transactionTrace.getTraceFrames().get(0).getGasRemaining();
       gasRemainingAfterProcessed = transactionTrace.getResult().getGasRemaining();
-      if (gasRemainingAfterProcessed > traceFrame.getGasRemaining().toLong()) {
-        gasRefund = gasRemainingAfterProcessed - traceFrame.getGasRemaining().toLong();
+      if (gasRemainingAfterProcessed > traceFrame.getGasRemaining()) {
+        gasRefund = gasRemainingAfterProcessed - traceFrame.getGasRemaining();
       } else {
-        gasRefund = traceFrame.getGasRefund().toLong();
+        gasRefund = traceFrame.getGasRefund();
       }
     } else {
       final Action.Builder actionBuilder = currentContext.getBuilder().getActionBuilder();
-      gasRemainingBeforeProcessed = Gas.fromHexString(actionBuilder.getGas()).toLong();
-      gasRemainingAfterProcessed = traceFrame.getGasRemaining().toLong();
+      gasRemainingBeforeProcessed = Long.decode(actionBuilder.getGas());
+      gasRemainingAfterProcessed = traceFrame.getGasRemaining();
     }
     return gasRemainingBeforeProcessed - gasRemainingAfterProcessed + gasRefund;
   }
 
-  private static Gas computeGas(
+  private static long computeGas(
       final TraceFrame traceFrame, final Optional<TraceFrame> nextTraceFrame) {
     if (traceFrame.getGasCost().isPresent()) {
-      final Gas gasNeeded = traceFrame.getGasCost().get();
-      final Gas currentGas = traceFrame.getGasRemaining();
-      if (currentGas.compareTo(gasNeeded) >= 0) {
-        final Gas gasRemaining = currentGas.minus(gasNeeded);
-        return gasRemaining.minus(Gas.of(Math.floorDiv(gasRemaining.toLong(), EIP_150_DIVISOR)));
+      final long gasNeeded = traceFrame.getGasCost().getAsLong();
+      final long currentGas = traceFrame.getGasRemaining();
+      if (currentGas >= gasNeeded) {
+        final long gasRemaining = currentGas - gasNeeded;
+        return gasRemaining - Math.floorDiv(gasRemaining, EIP_150_DIVISOR);
       }
     }
-    return nextTraceFrame.map(TraceFrame::getGasRemaining).orElse(Gas.ZERO);
-  }
-
-  private static Address toAddress(final Bytes32 value) {
-    return Address.wrap(
-        Bytes.of(Arrays.copyOfRange(value.toArray(), Bytes32.SIZE - Address.SIZE, Bytes32.SIZE)));
+    return nextTraceFrame.map(TraceFrame::getGasRemaining).orElse(0L);
   }
 
   private static List<Integer> calculateTraceAddress(final Deque<FlatTrace.Context> contexts) {
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/MixInIgnoreRevertReason.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/MixInIgnoreRevertReason.java
new file mode 100644
index 00000000000..1d24c6264ee
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/MixInIgnoreRevertReason.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.flat;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties({"revertReason"})
+public class MixInIgnoreRevertReason {}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/RewardTraceGenerator.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/RewardTraceGenerator.java
index 1521a91a973..db849389248 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/RewardTraceGenerator.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/RewardTraceGenerator.java
@@ -14,10 +14,10 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.flat;
 
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.Trace;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.mainnet.MiningBeneficiaryCalculator;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
@@ -46,7 +46,7 @@ public static Stream<Trace> generateFromBlock(
 
     final BlockHeader blockHeader = block.getHeader();
     final List<BlockHeader> ommers = block.getBody().getOmmers();
-    final ProtocolSpec protocolSpec = protocolSchedule.getByBlockNumber(blockHeader.getNumber());
+    final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(blockHeader);
     final Wei blockReward = protocolSpec.getBlockReward();
     final MiningBeneficiaryCalculator miningBeneficiaryCalculator =
         protocolSpec.getMiningBeneficiaryCalculator();
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/vm/Mem.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/vm/Mem.java
index 0c9f34ea316..8b8f4d96ab1 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/vm/Mem.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/vm/Mem.java
@@ -17,9 +17,9 @@
 public class Mem {
 
   private final String data;
-  private final int off;
+  private final long off;
 
-  public Mem(final String data, final int off) {
+  public Mem(final String data, final long off) {
     this.data = data;
     this.off = off;
   }
@@ -28,7 +28,7 @@ public String getData() {
     return data;
   }
 
-  public int getOff() {
+  public long getOff() {
     return off;
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/vm/VmTraceGenerator.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/vm/VmTraceGenerator.java
index 4780d1cec14..9800f7d6bd1 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/vm/VmTraceGenerator.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/vm/VmTraceGenerator.java
@@ -17,10 +17,10 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.Trace;
-import org.hyperledger.besu.ethereum.core.Gas;
 import org.hyperledger.besu.ethereum.debug.TraceFrame;
-import org.hyperledger.besu.ethereum.vm.Code;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.code.CodeV0;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
@@ -73,9 +73,9 @@ private Trace generateTrace() {
       Optional<TraceFrame> nextTraceFrame =
           iter.hasNext() ? Optional.of(iter.next()) : Optional.empty();
       while (nextTraceFrame.isPresent()) {
-        final TraceFrame currentTraceFrame = nextTraceFrame.get();
+        final TraceFrame traceFrame = nextTraceFrame.get();
         nextTraceFrame = iter.hasNext() ? Optional.of(iter.next()) : Optional.empty();
-        addFrame(currentTraceFrame, nextTraceFrame);
+        addFrame(traceFrame, nextTraceFrame);
       }
     }
     return rootVmTrace;
@@ -117,7 +117,8 @@ private void completeStep(
       final TraceFrame frame, final VmOperation op, final VmOperationExecutionReport report) {
     // add the operation representation to the list of traces
     final Optional<ExceptionalHaltReason> exceptionalHaltReason = frame.getExceptionalHaltReason();
-    if (exceptionalHaltReason.isPresent()
+    if (frame.getDepth() > 0
+        && exceptionalHaltReason.isPresent()
         && exceptionalHaltReason.get() == ExceptionalHaltReason.INSUFFICIENT_GAS) {
       op.setVmOperationExecutionReport(null);
     } else {
@@ -150,7 +151,7 @@ private void handleDepthIncreased(
         findLastFrameInCall(currentTraceFrame, currentIndex)
             .ifPresent(
                 lastFrameInCall -> {
-                  report.setUsed(lastFrameInCall.getGasRemaining().toLong());
+                  report.setUsed(lastFrameInCall.getGasRemaining());
                   lastFrameInCall
                       .getStack()
                       .filter(stack -> stack.length > 0)
@@ -160,30 +161,39 @@ private void handleDepthIncreased(
                   if (!currentOperation.startsWith("CREATE")) {
                     lastFrameInCall
                         .getMaybeUpdatedMemory()
-                        .map(
-                            mem ->
-                                new Mem(mem.getValue().toHexString(), mem.getOffset().intValue()))
+                        .map(mem -> new Mem(mem.getValue().toHexString(), mem.getOffset()))
                         .ifPresent(report::setMem);
                   }
                 });
 
         if (currentTraceFrame.getMaybeCode().map(Code::getSize).orElse(0) > 0) {
           if (nextTraceFrame.map(TraceFrame::getDepth).orElse(0) > currentTraceFrame.getDepth()) {
-            op.setCost(currentTraceFrame.getGasRemainingPostExecution().toLong() + op.getCost());
+            op.setCost(currentTraceFrame.getGasRemainingPostExecution() + op.getCost());
             final VmTrace newSubTrace = new VmTrace();
             parentTraces.addLast(newSubTrace);
             op.setSub(newSubTrace);
+          } else if (currentTraceFrame.getDepth() == 0) {
+            op.setCost(
+                currentTraceFrame.getGasRemaining()
+                    - currentTraceFrame.getGasRemainingPostExecution());
+            currentTraceFrame
+                .getMaybeCode()
+                .ifPresent(
+                    code ->
+                        op.setSub(
+                            new VmTrace(
+                                currentTraceFrame.getMaybeCode().get().getBytes().toHexString())));
           } else {
             op.setCost(op.getCost());
             op.setSub(null);
           }
         } else {
           if (currentTraceFrame.getPrecompiledGasCost().isPresent()) {
-            op.setCost(op.getCost() + currentTraceFrame.getPrecompiledGasCost().get().toLong());
-          } else if (currentOperation.equals("STATICCALL")
+            op.setCost(op.getCost() + currentTraceFrame.getPrecompiledGasCost().orElse(0L));
+          } else if ((currentOperation.equals("STATICCALL") || currentOperation.equals("CALL"))
               && nextTraceFrame.map(TraceFrame::getDepth).orElse(0)
                   > currentTraceFrame.getDepth()) {
-            op.setCost(currentTraceFrame.getGasRemainingPostExecution().toLong() + op.getCost());
+            op.setCost(currentTraceFrame.getGasRemainingPostExecution() + op.getCost());
           }
           op.setSub(new VmTrace());
         }
@@ -203,7 +213,7 @@ private void handleDepthDecreased(final TraceFrame frame) {
   private VmOperation buildVmOperation() {
     final VmOperation op = new VmOperation();
     // set gas cost and program counter
-    op.setCost(currentTraceFrame.getGasCost().orElse(Gas.ZERO).toLong());
+    op.setCost(currentTraceFrame.getGasCost().orElse(0L));
     op.setPc(currentTraceFrame.getPc());
     // op.setOperation(currentOperation);
     return op;
@@ -213,8 +223,7 @@ private VmOperationExecutionReport generateExecutionReport() {
     final VmOperationExecutionReport report = new VmOperationExecutionReport();
     // set gas remaining
     report.setUsed(
-        currentTraceFrame.getGasRemaining().toLong()
-            - currentTraceFrame.getGasCost().orElse(Gas.ZERO).toLong());
+        currentTraceFrame.getGasRemaining() - (currentTraceFrame.getGasCost().orElse(0L)));
     return report;
   }
 
@@ -231,9 +240,7 @@ private void generateTracingMemory(final VmOperationExecutionReport report) {
             .getMaybeUpdatedMemory()
             .map(
                 updatedMemory ->
-                    new Mem(
-                        updatedMemory.getValue().toHexString(),
-                        updatedMemory.getOffset().intValue()))
+                    new Mem(updatedMemory.getValue().toHexString(), updatedMemory.getOffset()))
             .ifPresent(report::setMem);
         break;
       default:
@@ -264,7 +271,7 @@ private void generateTracingStorage(final VmOperationExecutionReport report) {
             entry ->
                 report.setStore(
                     new Store(
-                        entry.getOffset().toBytes().toQuantityHexString(),
+                        entry.getOffset().toQuantityHexString(),
                         entry.getValue().toQuantityHexString())));
   }
 
@@ -280,7 +287,7 @@ private void initStep(final TraceFrame frame) {
     // set smart contract code
     if (currentTrace != null && "0x".equals(currentTrace.getCode())) {
       currentTrace.setCode(
-          currentTraceFrame.getMaybeCode().orElse(new Code()).getBytes().toHexString());
+          currentTraceFrame.getMaybeCode().orElse(CodeV0.EMPTY_CODE).getBytes().toHexString());
     }
   }
 
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/transaction/pool/PendingTransactionFilter.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/transaction/pool/PendingTransactionFilter.java
index 4ddb88ead02..958b2254206 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/transaction/pool/PendingTransactionFilter.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/transaction/pool/PendingTransactionFilter.java
@@ -17,16 +17,15 @@
 import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.transaction.pool.Predicate.ACTION;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.transaction.pool.Predicate.EQ;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionInfo;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * This class allows to filter a list of pending transactions
@@ -43,17 +42,20 @@ public class PendingTransactionFilter {
   public static final String VALUE_FIELD = "value";
   public static final String NONCE_FIELD = "nonce";
 
-  public Set<Transaction> reduce(
-      final Set<TransactionInfo> pendingTransactions, final List<Filter> filters, final int limit)
+  public Collection<Transaction> reduce(
+      final Collection<PendingTransaction> pendingTransactions,
+      final List<Filter> filters,
+      final int limit)
       throws InvalidJsonRpcParameters {
     return pendingTransactions.stream()
-        .filter(transactionInfo -> applyFilters(transactionInfo, filters))
+        .filter(pendingTx -> applyFilters(pendingTx, filters))
         .limit(limit)
-        .map(TransactionInfo::getTransaction)
-        .collect(Collectors.toSet());
+        .map(PendingTransaction::getTransaction)
+        .toList();
   }
 
-  private boolean applyFilters(final TransactionInfo transactionInfo, final List<Filter> filters)
+  private boolean applyFilters(
+      final PendingTransaction pendingTransaction, final List<Filter> filters)
       throws InvalidJsonRpcParameters {
     boolean isValid = true;
     for (Filter filter : filters) {
@@ -61,23 +63,26 @@ private boolean applyFilters(final TransactionInfo transactionInfo, final List<F
       final String value = filter.getFieldValue();
       switch (filter.getFieldName()) {
         case FROM_FIELD:
-          isValid = validateFrom(transactionInfo, predicate, value);
+          isValid = validateFrom(pendingTransaction, predicate, value);
           break;
         case TO_FIELD:
-          isValid = validateTo(transactionInfo, predicate, value);
+          isValid = validateTo(pendingTransaction, predicate, value);
           break;
         case GAS_PRICE_FIELD:
-          isValid = validateWei(transactionInfo.getTransaction().getGasPrice(), predicate, value);
+          isValid =
+              validateWei(
+                  pendingTransaction.getTransaction().getGasPrice().get(), predicate, value);
           break;
         case GAS_FIELD:
           isValid =
-              validateWei(Wei.of(transactionInfo.getTransaction().getGasLimit()), predicate, value);
+              validateWei(
+                  Wei.of(pendingTransaction.getTransaction().getGasLimit()), predicate, value);
           break;
         case VALUE_FIELD:
-          isValid = validateWei(transactionInfo.getTransaction().getValue(), predicate, value);
+          isValid = validateWei(pendingTransaction.getTransaction().getValue(), predicate, value);
           break;
         case NONCE_FIELD:
-          isValid = validateNonce(transactionInfo, predicate, value);
+          isValid = validateNonce(pendingTransaction, predicate, value);
           break;
       }
       if (!isValid) {
@@ -88,31 +93,31 @@ private boolean applyFilters(final TransactionInfo transactionInfo, final List<F
   }
 
   private boolean validateFrom(
-      final TransactionInfo transactionInfo, final Predicate predicate, final String value)
+      final PendingTransaction pendingTransaction, final Predicate predicate, final String value)
       throws InvalidJsonRpcParameters {
     return predicate
         .getOperator()
-        .apply(transactionInfo.getTransaction().getSender(), Address.fromHexString(value));
+        .apply(pendingTransaction.getTransaction().getSender(), Address.fromHexString(value));
   }
 
   private boolean validateTo(
-      final TransactionInfo transactionInfo, final Predicate predicate, final String value)
+      final PendingTransaction pendingTransaction, final Predicate predicate, final String value)
       throws InvalidJsonRpcParameters {
-    final Optional<Address> maybeTo = transactionInfo.getTransaction().getTo();
+    final Optional<Address> maybeTo = pendingTransaction.getTransaction().getTo();
     if (maybeTo.isPresent() && predicate.equals(EQ)) {
       return predicate.getOperator().apply(maybeTo.get(), Address.fromHexString(value));
     } else if (predicate.equals(ACTION)) {
-      return transactionInfo.getTransaction().isContractCreation();
+      return pendingTransaction.getTransaction().isContractCreation();
     }
     return false;
   }
 
   private boolean validateNonce(
-      final TransactionInfo transactionInfo, final Predicate predicate, final String value)
+      final PendingTransaction pendingTransaction, final Predicate predicate, final String value)
       throws InvalidJsonRpcParameters {
     return predicate
         .getOperator()
-        .apply(transactionInfo.getTransaction().getNonce(), Long.decode(value));
+        .apply(pendingTransaction.getTransaction().getNonce(), Long.decode(value));
   }
 
   private boolean validateWei(
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/ipc/JsonRpcIpcConfiguration.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/ipc/JsonRpcIpcConfiguration.java
new file mode 100644
index 00000000000..ac0de10e601
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/ipc/JsonRpcIpcConfiguration.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.ipc;
+
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.Collections;
+
+public class JsonRpcIpcConfiguration {
+
+  private final boolean enabled;
+  private final Path ipcPath;
+  private final Collection<String> enabledApis;
+
+  public JsonRpcIpcConfiguration() {
+    enabled = false;
+    ipcPath = null;
+    enabledApis = Collections.emptyList();
+  }
+
+  public JsonRpcIpcConfiguration(
+      final boolean enabled, final Path ipcPath, final Collection<String> enabledApis) {
+    this.enabled = enabled;
+    this.ipcPath = ipcPath;
+    this.enabledApis = enabledApis;
+  }
+
+  public boolean isEnabled() {
+    return enabled;
+  }
+
+  public Path getPath() {
+    return ipcPath;
+  }
+
+  public Collection<String> getEnabledApis() {
+    return enabledApis;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/ipc/JsonRpcIpcService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/ipc/JsonRpcIpcService.java
new file mode 100644
index 00000000000..d34434c91cb
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/ipc/JsonRpcIpcService.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.ipc;
+
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.INVALID_REQUEST;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.JsonRpcExecutor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
+import io.vertx.core.Future;
+import io.vertx.core.Vertx;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.json.DecodeException;
+import io.vertx.core.json.Json;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+import io.vertx.core.net.NetServer;
+import io.vertx.core.net.NetServerOptions;
+import io.vertx.core.net.NetSocket;
+import io.vertx.core.net.SocketAddress;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class JsonRpcIpcService {
+
+  private static final Logger LOG = LoggerFactory.getLogger(JsonRpcIpcService.class);
+  private static final ObjectWriter JSON_OBJECT_WRITER =
+      new ObjectMapper()
+          .registerModule(new Jdk8Module()) // Handle JDK8 Optionals (de)serialization
+          .writer()
+          .without(JsonGenerator.Feature.FLUSH_PASSED_TO_STREAM)
+          .with(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
+
+  private final Vertx vertx;
+  private final Path path;
+  private final JsonRpcExecutor jsonRpcExecutor;
+  private NetServer netServer;
+
+  public JsonRpcIpcService(final Vertx vertx, final Path path, final JsonRpcExecutor rpcExecutor) {
+    this.vertx = vertx;
+    this.path = path;
+    this.jsonRpcExecutor = rpcExecutor;
+  }
+
+  public Future<NetServer> start() {
+    netServer = vertx.createNetServer(buildNetServerOptions());
+    netServer.connectHandler(
+        socket -> {
+          AtomicBoolean closedSocket = new AtomicBoolean(false);
+          socket
+              .closeHandler(unused -> closedSocket.set(true))
+              .handler(
+                  buffer -> {
+                    if (buffer.length() == 0) {
+                      errorReturn(socket, null, JsonRpcError.INVALID_REQUEST);
+                    } else {
+                      try {
+                        final JsonObject jsonRpcRequest = buffer.toJsonObject();
+                        vertx
+                            .<JsonRpcResponse>executeBlocking(
+                                promise -> {
+                                  final JsonRpcResponse jsonRpcResponse =
+                                      jsonRpcExecutor.execute(
+                                          Optional.empty(),
+                                          null,
+                                          null,
+                                          closedSocket::get,
+                                          jsonRpcRequest,
+                                          req -> req.mapTo(JsonRpcRequest.class));
+                                  promise.complete(jsonRpcResponse);
+                                })
+                            .onSuccess(
+                                jsonRpcResponse -> {
+                                  try {
+                                    socket.write(
+                                        JSON_OBJECT_WRITER.writeValueAsString(jsonRpcResponse)
+                                            + '\n');
+                                  } catch (JsonProcessingException e) {
+                                    LOG.error("Error streaming JSON-RPC response", e);
+                                  }
+                                })
+                            .onFailure(
+                                throwable -> {
+                                  try {
+                                    final Integer id = jsonRpcRequest.getInteger("id", null);
+                                    errorReturn(socket, id, JsonRpcError.INTERNAL_ERROR);
+                                  } catch (ClassCastException idNotIntegerException) {
+                                    errorReturn(socket, null, JsonRpcError.INTERNAL_ERROR);
+                                  }
+                                });
+                      } catch (DecodeException jsonObjectDecodeException) {
+                        try {
+                          final JsonArray batchJsonRpcRequest = buffer.toJsonArray();
+                          if (batchJsonRpcRequest.isEmpty()) {
+                            errorReturn(socket, null, JsonRpcError.INVALID_REQUEST);
+                          } else {
+                            vertx
+                                .<List<JsonRpcResponse>>executeBlocking(
+                                    promise -> {
+                                      List<JsonRpcResponse> responses = new ArrayList<>();
+                                      for (int i = 0; i < batchJsonRpcRequest.size(); i++) {
+                                        final JsonObject jsonRequest;
+                                        try {
+                                          jsonRequest = batchJsonRpcRequest.getJsonObject(i);
+                                        } catch (ClassCastException e) {
+                                          responses.add(
+                                              new JsonRpcErrorResponse(null, INVALID_REQUEST));
+                                          continue;
+                                        }
+                                        responses.add(
+                                            jsonRpcExecutor.execute(
+                                                Optional.empty(),
+                                                null,
+                                                null,
+                                                closedSocket::get,
+                                                jsonRequest,
+                                                req -> req.mapTo(JsonRpcRequest.class)));
+                                      }
+                                      promise.complete(responses);
+                                    })
+                                .onSuccess(
+                                    jsonRpcBatchResponse -> {
+                                      try {
+                                        final JsonRpcResponse[] completed =
+                                            jsonRpcBatchResponse.stream()
+                                                .filter(
+                                                    jsonRpcResponse ->
+                                                        jsonRpcResponse.getType()
+                                                            != JsonRpcResponseType.NONE)
+                                                .toArray(JsonRpcResponse[]::new);
+
+                                        socket.write(
+                                            JSON_OBJECT_WRITER.writeValueAsString(completed)
+                                                + '\n');
+                                      } catch (JsonProcessingException e) {
+                                        LOG.error("Error streaming JSON-RPC response", e);
+                                      }
+                                    })
+                                .onFailure(
+                                    throwable ->
+                                        errorReturn(socket, null, JsonRpcError.INTERNAL_ERROR));
+                          }
+                        } catch (DecodeException jsonArrayDecodeException) {
+                          errorReturn(socket, null, JsonRpcError.PARSE_ERROR);
+                        }
+                      }
+                    }
+                  });
+        });
+    return netServer
+        .listen(SocketAddress.domainSocketAddress(path.toString()))
+        .onSuccess(successServer -> LOG.info("IPC endpoint opened: {}", path))
+        .onFailure(throwable -> LOG.error("Unable to open IPC endpoint", throwable));
+  }
+
+  public Future<Void> stop() {
+    if (netServer == null) {
+      return Future.succeededFuture();
+    } else {
+      return netServer
+          .close()
+          .onComplete(
+              closeResult -> {
+                try {
+                  Files.deleteIfExists(path);
+                } catch (IOException e) {
+                  LOG.error("Unable to delete IPC file", e);
+                }
+              });
+    }
+  }
+
+  private Future<Void> errorReturn(
+      final NetSocket socket, final Integer id, final JsonRpcError rpcError) {
+    return socket.write(Buffer.buffer(Json.encode(new JsonRpcErrorResponse(id, rpcError)) + '\n'));
+  }
+
+  private NetServerOptions buildNetServerOptions() {
+    return new NetServerOptions();
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/AdminJsonRpcMethods.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/AdminJsonRpcMethods.java
index 369c322c7e5..286758cb762 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/AdminJsonRpcMethods.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/AdminJsonRpcMethods.java
@@ -15,7 +15,6 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
 
 import org.hyperledger.besu.config.GenesisConfigOptions;
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.AdminAddPeer;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.AdminChangeLogLevel;
@@ -30,11 +29,13 @@
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
 import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeDnsConfiguration;
 import org.hyperledger.besu.nat.NatService;
 import org.hyperledger.besu.plugin.BesuPlugin;
 
 import java.math.BigInteger;
 import java.util.Map;
+import java.util.Optional;
 
 public class AdminJsonRpcMethods extends ApiGroupJsonRpcMethods {
 
@@ -46,6 +47,7 @@ public class AdminJsonRpcMethods extends ApiGroupJsonRpcMethods {
   private final NatService natService;
   private final Map<String, BesuPlugin> namedPlugins;
   private final EthPeers ethPeers;
+  private final Optional<EnodeDnsConfiguration> enodeDnsConfiguration;
 
   public AdminJsonRpcMethods(
       final String clientVersion,
@@ -55,7 +57,8 @@ public AdminJsonRpcMethods(
       final BlockchainQueries blockchainQueries,
       final Map<String, BesuPlugin> namedPlugins,
       final NatService natService,
-      final EthPeers ethPeers) {
+      final EthPeers ethPeers,
+      final Optional<EnodeDnsConfiguration> enodeDnsConfiguration) {
     this.clientVersion = clientVersion;
     this.networkId = networkId;
     this.genesisConfigOptions = genesisConfigOptions;
@@ -64,18 +67,19 @@ public AdminJsonRpcMethods(
     this.namedPlugins = namedPlugins;
     this.natService = natService;
     this.ethPeers = ethPeers;
+    this.enodeDnsConfiguration = enodeDnsConfiguration;
   }
 
   @Override
-  protected RpcApi getApiGroup() {
-    return RpcApis.ADMIN;
+  protected String getApiGroup() {
+    return RpcApis.ADMIN.name();
   }
 
   @Override
   protected Map<String, JsonRpcMethod> create() {
     return mapOf(
-        new AdminAddPeer(p2pNetwork),
-        new AdminRemovePeer(p2pNetwork),
+        new AdminAddPeer(p2pNetwork, enodeDnsConfiguration),
+        new AdminRemovePeer(p2pNetwork, enodeDnsConfiguration),
         new AdminNodeInfo(
             clientVersion,
             networkId,
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/ApiGroupJsonRpcMethods.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/ApiGroupJsonRpcMethods.java
index eb1d04e17c3..e92df9fb527 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/ApiGroupJsonRpcMethods.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/ApiGroupJsonRpcMethods.java
@@ -14,7 +14,6 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
 
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 
 import java.util.Arrays;
@@ -26,11 +25,11 @@
 public abstract class ApiGroupJsonRpcMethods implements JsonRpcMethods {
 
   @Override
-  public Map<String, JsonRpcMethod> create(final Collection<RpcApi> apis) {
+  public Map<String, JsonRpcMethod> create(final Collection<String> apis) {
     return apis.contains(getApiGroup()) ? create() : Collections.emptyMap();
   }
 
-  protected abstract RpcApi getApiGroup();
+  protected abstract String getApiGroup();
 
   protected abstract Map<String, JsonRpcMethod> create();
 
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/DebugJsonRpcMethods.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/DebugJsonRpcMethods.java
index 13c5fd6c99a..b34af183693 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/DebugJsonRpcMethods.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/DebugJsonRpcMethods.java
@@ -14,12 +14,20 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
 
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
+import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.DebugReplayBlock;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.DebugAccountAt;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.DebugAccountRange;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.DebugBatchSendRawTransaction;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.DebugGetBadBlocks;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.DebugGetRawBlock;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.DebugGetRawHeader;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.DebugGetRawReceipts;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.DebugGetRawTransaction;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.DebugMetrics;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.DebugResyncWorldstate;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.DebugSetHead;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.DebugStandardTraceBadBlockToFile;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.DebugStandardTraceBlockToFile;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.DebugStorageRangeAt;
@@ -33,6 +41,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTracer;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
@@ -46,56 +55,64 @@ public class DebugJsonRpcMethods extends ApiGroupJsonRpcMethods {
   private final BlockResultFactory blockResult = new BlockResultFactory();
 
   private final BlockchainQueries blockchainQueries;
+  private final ProtocolContext protocolContext;
   private final ProtocolSchedule protocolSchedule;
   private final ObservableMetricsSystem metricsSystem;
   private final TransactionPool transactionPool;
+  private final Synchronizer synchronizer;
   private final Path dataDir;
 
   DebugJsonRpcMethods(
       final BlockchainQueries blockchainQueries,
+      final ProtocolContext protocolContext,
       final ProtocolSchedule protocolSchedule,
       final ObservableMetricsSystem metricsSystem,
       final TransactionPool transactionPool,
+      final Synchronizer synchronizer,
       final Path dataDir) {
     this.blockchainQueries = blockchainQueries;
+    this.protocolContext = protocolContext;
     this.protocolSchedule = protocolSchedule;
     this.metricsSystem = metricsSystem;
     this.transactionPool = transactionPool;
+    this.synchronizer = synchronizer;
     this.dataDir = dataDir;
   }
 
   @Override
-  protected RpcApi getApiGroup() {
-    return RpcApis.DEBUG;
+  protected String getApiGroup() {
+    return RpcApis.DEBUG.name();
   }
 
   @Override
   protected Map<String, JsonRpcMethod> create() {
     final BlockReplay blockReplay =
-        new BlockReplay(
-            protocolSchedule,
-            blockchainQueries.getBlockchain(),
-            blockchainQueries.getWorldStateArchive());
+        new BlockReplay(protocolSchedule, blockchainQueries.getBlockchain());
 
     return mapOf(
         new DebugTraceTransaction(blockchainQueries, new TransactionTracer(blockReplay)),
         new DebugAccountRange(blockchainQueries),
         new DebugStorageRangeAt(blockchainQueries, blockReplay),
         new DebugMetrics(metricsSystem),
+        new DebugResyncWorldstate(protocolSchedule, protocolContext.getBlockchain(), synchronizer),
         new DebugTraceBlock(
             () -> new BlockTracer(blockReplay),
             ScheduleBasedBlockHeaderFunctions.create(protocolSchedule),
             blockchainQueries),
+        new DebugSetHead(blockchainQueries, protocolContext),
+        new DebugReplayBlock(blockchainQueries, protocolContext, protocolSchedule),
         new DebugTraceBlockByNumber(() -> new BlockTracer(blockReplay), blockchainQueries),
-        new DebugTraceBlockByHash(() -> new BlockTracer(blockReplay)),
+        new DebugTraceBlockByHash(() -> new BlockTracer(blockReplay), () -> blockchainQueries),
         new DebugBatchSendRawTransaction(transactionPool),
         new DebugGetBadBlocks(blockchainQueries, protocolSchedule, blockResult),
         new DebugStandardTraceBlockToFile(
             () -> new TransactionTracer(blockReplay), blockchainQueries, dataDir),
         new DebugStandardTraceBadBlockToFile(
-            () -> new TransactionTracer(blockReplay),
-            blockchainQueries,
-            protocolSchedule,
-            dataDir));
+            () -> new TransactionTracer(blockReplay), blockchainQueries, protocolSchedule, dataDir),
+        new DebugAccountAt(blockchainQueries, () -> new BlockTracer(blockReplay)),
+        new DebugGetRawHeader(blockchainQueries),
+        new DebugGetRawBlock(blockchainQueries),
+        new DebugGetRawReceipts(blockchainQueries),
+        new DebugGetRawTransaction(blockchainQueries));
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EeaJsonRpcMethods.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EeaJsonRpcMethods.java
index 18cd943a884..8594e2440e6 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EeaJsonRpcMethods.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EeaJsonRpcMethods.java
@@ -14,50 +14,81 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
 
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
+import org.hyperledger.besu.ethereum.api.jsonrpc.LatestNonceProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea.EeaSendRawTransaction;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea.OnChainEeaSendRawTransaction;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea.PluginEeaSendRawTransaction;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea.RestrictedFlexibleEeaSendRawTransaction;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea.RestrictedOffchainEeaSendRawTransaction;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivGetEeaTransactionCount;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
+import org.hyperledger.besu.ethereum.util.NonceProvider;
+import org.hyperledger.besu.plugin.services.privacy.PrivateMarkerTransactionFactory;
 
 import java.util.Map;
 
 public class EeaJsonRpcMethods extends PrivacyApiGroupJsonRpcMethods {
 
+  private final TransactionPool transactionPool;
+  private final PrivacyParameters privacyParameters;
+  private final NonceProvider nonceProvider;
+
   public EeaJsonRpcMethods(
       final BlockchainQueries blockchainQueries,
       final ProtocolSchedule protocolSchedule,
       final TransactionPool transactionPool,
       final PrivacyParameters privacyParameters) {
     super(blockchainQueries, protocolSchedule, transactionPool, privacyParameters);
+    this.transactionPool = transactionPool;
+    this.privacyParameters = privacyParameters;
+    this.nonceProvider =
+        new LatestNonceProvider(blockchainQueries, transactionPool.getPendingTransactions());
   }
 
   @Override
   protected Map<String, JsonRpcMethod> create(
       final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider) {
-    if (getPrivacyParameters().isOnchainPrivacyGroupsEnabled()) {
+      final PrivacyIdProvider privacyIdProvider,
+      final PrivateMarkerTransactionFactory privateMarkerTransactionFactory) {
+
+    if (privacyParameters.isPrivacyPluginEnabled()) {
+      return mapOf(
+          new PluginEeaSendRawTransaction(
+              transactionPool,
+              privacyIdProvider,
+              privateMarkerTransactionFactory,
+              nonceProvider,
+              privacyController,
+              getGasCalculator()),
+          new PrivGetEeaTransactionCount(privacyController, privacyIdProvider));
+    } else if (getPrivacyParameters().isFlexiblePrivacyGroupsEnabled()) {
       return mapOf(
-          new OnChainEeaSendRawTransaction(
-              getTransactionPool(), privacyController, enclavePublicKeyProvider),
-          new PrivGetEeaTransactionCount(privacyController, enclavePublicKeyProvider));
+          new RestrictedFlexibleEeaSendRawTransaction(
+              transactionPool,
+              privacyIdProvider,
+              privateMarkerTransactionFactory,
+              nonceProvider,
+              privacyController),
+          new PrivGetEeaTransactionCount(privacyController, privacyIdProvider));
     } else { // off chain privacy
       return mapOf(
-          new EeaSendRawTransaction(
-              getTransactionPool(), privacyController, enclavePublicKeyProvider),
-          new PrivGetEeaTransactionCount(privacyController, enclavePublicKeyProvider));
+          new RestrictedOffchainEeaSendRawTransaction(
+              transactionPool,
+              privacyIdProvider,
+              privateMarkerTransactionFactory,
+              nonceProvider,
+              privacyController),
+          new PrivGetEeaTransactionCount(privacyController, privacyIdProvider));
     }
   }
 
   @Override
-  protected RpcApi getApiGroup() {
-    return RpcApis.EEA;
+  protected String getApiGroup() {
+    return RpcApis.EEA.name();
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthJsonRpcMethods.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthJsonRpcMethods.java
index 1a2d13be1ee..43edba38359 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthJsonRpcMethods.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/EthJsonRpcMethods.java
@@ -14,7 +14,6 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
 
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthAccounts;
@@ -22,7 +21,9 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthCall;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthChainId;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthCoinbase;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthCreateAccessList;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthEstimateGas;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthFeeHistory;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGasPrice;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetBalance;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetBlockByHash;
@@ -70,6 +71,7 @@
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
 
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 
 public class EthJsonRpcMethods extends ApiGroupJsonRpcMethods {
@@ -83,6 +85,7 @@ public class EthJsonRpcMethods extends ApiGroupJsonRpcMethods {
   private final TransactionPool transactionPool;
   private final MiningCoordinator miningCoordinator;
   private final Set<Capability> supportedCapabilities;
+  private final Optional<Long> maxLogRange;
 
   public EthJsonRpcMethods(
       final BlockchainQueries blockchainQueries,
@@ -91,7 +94,8 @@ public EthJsonRpcMethods(
       final FilterManager filterManager,
       final TransactionPool transactionPool,
       final MiningCoordinator miningCoordinator,
-      final Set<Capability> supportedCapabilities) {
+      final Set<Capability> supportedCapabilities,
+      final Optional<Long> maxLogRange) {
     this.blockchainQueries = blockchainQueries;
     this.synchronizer = synchronizer;
     this.protocolSchedule = protocolSchedule;
@@ -99,11 +103,12 @@ public EthJsonRpcMethods(
     this.transactionPool = transactionPool;
     this.miningCoordinator = miningCoordinator;
     this.supportedCapabilities = supportedCapabilities;
+    this.maxLogRange = maxLogRange;
   }
 
   @Override
-  protected RpcApi getApiGroup() {
-    return RpcApis.ETH;
+  protected String getApiGroup() {
+    return RpcApis.ETH.name();
   }
 
   @Override
@@ -113,7 +118,7 @@ protected Map<String, JsonRpcMethod> create() {
         new EthBlockNumber(blockchainQueries),
         new EthGetBalance(blockchainQueries),
         new EthGetBlockByHash(blockchainQueries, blockResult),
-        new EthGetBlockByNumber(blockchainQueries, blockResult),
+        new EthGetBlockByNumber(blockchainQueries, blockResult, synchronizer),
         new EthGetBlockTransactionCountByNumber(blockchainQueries),
         new EthGetBlockTransactionCountByHash(blockchainQueries),
         new EthCall(
@@ -122,8 +127,9 @@ protected Map<String, JsonRpcMethod> create() {
                 blockchainQueries.getBlockchain(),
                 blockchainQueries.getWorldStateArchive(),
                 protocolSchedule)),
+        new EthFeeHistory(protocolSchedule, blockchainQueries.getBlockchain()),
         new EthGetCode(blockchainQueries),
-        new EthGetLogs(blockchainQueries),
+        new EthGetLogs(blockchainQueries, maxLogRange),
         new EthGetProof(blockchainQueries),
         new EthGetUncleCountByBlockHash(blockchainQueries),
         new EthGetUncleCountByBlockNumber(blockchainQueries),
@@ -150,6 +156,12 @@ protected Map<String, JsonRpcMethod> create() {
                 blockchainQueries.getBlockchain(),
                 blockchainQueries.getWorldStateArchive(),
                 protocolSchedule)),
+        new EthCreateAccessList(
+            blockchainQueries,
+            new TransactionSimulator(
+                blockchainQueries.getBlockchain(),
+                blockchainQueries.getWorldStateArchive(),
+                protocolSchedule)),
         new EthMining(miningCoordinator),
         new EthCoinbase(miningCoordinator),
         new EthProtocolVersion(supportedCapabilities),
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/ExecutionEngineJsonRpcMethods.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/ExecutionEngineJsonRpcMethods.java
new file mode 100644
index 00000000000..d42049b59e3
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/ExecutionEngineJsonRpcMethods.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
+
+import org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.EngineExchangeCapabilities;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.EngineExchangeTransitionConfiguration;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.EngineForkchoiceUpdatedV1;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.EngineForkchoiceUpdatedV2;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.EngineGetPayloadBodiesByHashV1;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.EngineGetPayloadBodiesByRangeV1;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.EngineGetPayloadV1;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.EngineGetPayloadV2;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.EngineNewPayloadV1;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.EngineNewPayloadV2;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.EnginePreparePayloadDebug;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine.EngineQosTimer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory;
+import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+
+import java.util.Map;
+import java.util.Optional;
+
+import io.vertx.core.Vertx;
+
+public class ExecutionEngineJsonRpcMethods extends ApiGroupJsonRpcMethods {
+
+  private final BlockResultFactory blockResultFactory = new BlockResultFactory();
+
+  private final Optional<MergeMiningCoordinator> mergeCoordinator;
+  private final ProtocolSchedule protocolSchedule;
+  private final ProtocolContext protocolContext;
+  private final EthPeers ethPeers;
+  private final Vertx consensusEngineServer;
+
+  ExecutionEngineJsonRpcMethods(
+      final MiningCoordinator miningCoordinator,
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final EthPeers ethPeers,
+      final Vertx consensusEngineServer) {
+    this.mergeCoordinator =
+        Optional.ofNullable(miningCoordinator)
+            .filter(mc -> mc.isCompatibleWithEngineApi())
+            .map(MergeMiningCoordinator.class::cast);
+    this.protocolSchedule = protocolSchedule;
+    this.protocolContext = protocolContext;
+    this.ethPeers = ethPeers;
+    this.consensusEngineServer = consensusEngineServer;
+  }
+
+  @Override
+  protected String getApiGroup() {
+    return RpcApis.ENGINE.name();
+  }
+
+  @Override
+  protected Map<String, JsonRpcMethod> create() {
+    final EngineQosTimer engineQosTimer = new EngineQosTimer(consensusEngineServer);
+
+    if (mergeCoordinator.isPresent()) {
+      return mapOf(
+          new EngineGetPayloadV1(
+              consensusEngineServer,
+              protocolContext,
+              mergeCoordinator.get(),
+              blockResultFactory,
+              engineQosTimer),
+          new EngineGetPayloadV2(
+              consensusEngineServer,
+              protocolContext,
+              mergeCoordinator.get(),
+              blockResultFactory,
+              engineQosTimer),
+          new EngineNewPayloadV1(
+              consensusEngineServer,
+              protocolSchedule,
+              protocolContext,
+              mergeCoordinator.get(),
+              ethPeers,
+              engineQosTimer),
+          new EngineNewPayloadV2(
+              consensusEngineServer,
+              protocolSchedule,
+              protocolContext,
+              mergeCoordinator.get(),
+              ethPeers,
+              engineQosTimer),
+          new EngineForkchoiceUpdatedV1(
+              consensusEngineServer,
+              protocolSchedule,
+              protocolContext,
+              mergeCoordinator.get(),
+              engineQosTimer),
+          new EngineForkchoiceUpdatedV2(
+              consensusEngineServer,
+              protocolSchedule,
+              protocolContext,
+              mergeCoordinator.get(),
+              engineQosTimer),
+          new EngineExchangeTransitionConfiguration(
+              consensusEngineServer, protocolContext, engineQosTimer),
+          new EngineGetPayloadBodiesByHashV1(
+              consensusEngineServer, protocolContext, blockResultFactory, engineQosTimer),
+          new EngineGetPayloadBodiesByRangeV1(
+              consensusEngineServer, protocolContext, blockResultFactory, engineQosTimer),
+          new EngineExchangeCapabilities(consensusEngineServer, protocolContext, engineQosTimer),
+          new EnginePreparePayloadDebug(
+              consensusEngineServer, protocolContext, engineQosTimer, mergeCoordinator.get()));
+    } else {
+      return mapOf(
+          new EngineExchangeTransitionConfiguration(
+              consensusEngineServer, protocolContext, engineQosTimer));
+    }
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/JsonRpcMethods.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/JsonRpcMethods.java
index 0b4ae464772..697243fce0e 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/JsonRpcMethods.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/JsonRpcMethods.java
@@ -14,12 +14,11 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
 
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 
 import java.util.Collection;
 import java.util.Map;
 
 public interface JsonRpcMethods {
-  Map<String, JsonRpcMethod> create(Collection<RpcApi> enabledRpcApis);
+  Map<String, JsonRpcMethod> create(Collection<String> enabledRpcApis);
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/JsonRpcMethodsFactory.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/JsonRpcMethodsFactory.java
index 8c1b4165831..5effa4dd5da 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/JsonRpcMethodsFactory.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/JsonRpcMethodsFactory.java
@@ -15,8 +15,8 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
 
 import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.RpcModules;
@@ -29,6 +29,7 @@
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeDnsConfiguration;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController;
 import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController;
@@ -46,6 +47,8 @@
 import java.util.Optional;
 import java.util.Set;
 
+import io.vertx.core.Vertx;
+
 public class JsonRpcMethodsFactory {
 
   public Map<String, JsonRpcMethod> methods(
@@ -56,14 +59,15 @@ public Map<String, JsonRpcMethod> methods(
       final BlockchainQueries blockchainQueries,
       final Synchronizer synchronizer,
       final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
       final FilterManager filterManager,
       final TransactionPool transactionPool,
       final MiningCoordinator miningCoordinator,
       final ObservableMetricsSystem metricsSystem,
       final Set<Capability> supportedCapabilities,
-      final Optional<AccountLocalConfigPermissioningController> accountsWhitelistController,
-      final Optional<NodeLocalConfigPermissioningController> nodeWhitelistController,
-      final Collection<RpcApi> rpcApis,
+      final Optional<AccountLocalConfigPermissioningController> accountsAllowlistController,
+      final Optional<NodeLocalConfigPermissioningController> nodeAllowlistController,
+      final Collection<String> rpcApis,
       final PrivacyParameters privacyParameters,
       final JsonRpcConfiguration jsonRpcConfiguration,
       final WebSocketConfiguration webSocketConfiguration,
@@ -71,13 +75,14 @@ public Map<String, JsonRpcMethod> methods(
       final NatService natService,
       final Map<String, BesuPlugin> namedPlugins,
       final Path dataDir,
-      final EthPeers ethPeers) {
+      final EthPeers ethPeers,
+      final Vertx consensusEngineServer,
+      final Optional<Long> maxLogRange,
+      final Optional<EnodeDnsConfiguration> enodeDnsConfiguration) {
     final Map<String, JsonRpcMethod> enabled = new HashMap<>();
-
     if (!rpcApis.isEmpty()) {
       final JsonRpcMethod modules = new RpcModules(rpcApis);
       enabled.put(modules.getName(), modules);
-
       final List<JsonRpcMethods> availableApiGroups =
           List.of(
               new AdminJsonRpcMethods(
@@ -88,11 +93,24 @@ public Map<String, JsonRpcMethod> methods(
                   blockchainQueries,
                   namedPlugins,
                   natService,
-                  ethPeers),
+                  ethPeers,
+                  enodeDnsConfiguration),
               new DebugJsonRpcMethods(
-                  blockchainQueries, protocolSchedule, metricsSystem, transactionPool, dataDir),
+                  blockchainQueries,
+                  protocolContext,
+                  protocolSchedule,
+                  metricsSystem,
+                  transactionPool,
+                  synchronizer,
+                  dataDir),
               new EeaJsonRpcMethods(
                   blockchainQueries, protocolSchedule, transactionPool, privacyParameters),
+              new ExecutionEngineJsonRpcMethods(
+                  miningCoordinator,
+                  protocolSchedule,
+                  protocolContext,
+                  ethPeers,
+                  consensusEngineServer),
               new EthJsonRpcMethods(
                   blockchainQueries,
                   synchronizer,
@@ -100,7 +118,8 @@ public Map<String, JsonRpcMethod> methods(
                   filterManager,
                   transactionPool,
                   miningCoordinator,
-                  supportedCapabilities),
+                  supportedCapabilities,
+                  maxLogRange),
               new NetJsonRpcMethods(
                   p2pNetwork,
                   networkId,
@@ -108,7 +127,7 @@ public Map<String, JsonRpcMethod> methods(
                   webSocketConfiguration,
                   metricsConfiguration),
               new MinerJsonRpcMethods(miningCoordinator),
-              new PermJsonRpcMethods(accountsWhitelistController, nodeWhitelistController),
+              new PermJsonRpcMethods(accountsAllowlistController, nodeAllowlistController),
               new PrivJsonRpcMethods(
                   blockchainQueries,
                   protocolSchedule,
@@ -118,7 +137,6 @@ public Map<String, JsonRpcMethod> methods(
               new PrivxJsonRpcMethods(
                   blockchainQueries, protocolSchedule, transactionPool, privacyParameters),
               new Web3JsonRpcMethods(clientVersion),
-              // TRACE Methods (Disabled while under development)
               new TraceJsonRpcMethods(blockchainQueries, protocolSchedule),
               new TxPoolJsonRpcMethods(transactionPool),
               new PluginsJsonRpcMethods(namedPlugins));
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/MinerJsonRpcMethods.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/MinerJsonRpcMethods.java
index 9530b9fe4c5..35d6502ad3f 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/MinerJsonRpcMethods.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/MinerJsonRpcMethods.java
@@ -14,7 +14,6 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
 
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.miner.MinerChangeTargetGasLimit;
@@ -35,8 +34,8 @@ public MinerJsonRpcMethods(final MiningCoordinator miningCoordinator) {
   }
 
   @Override
-  protected RpcApi getApiGroup() {
-    return RpcApis.MINER;
+  protected String getApiGroup() {
+    return RpcApis.MINER.name();
   }
 
   @Override
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/NetJsonRpcMethods.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/NetJsonRpcMethods.java
index 6ba51d6dc72..a3fcc318cf7 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/NetJsonRpcMethods.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/NetJsonRpcMethods.java
@@ -15,7 +15,6 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.NetEnode;
@@ -53,8 +52,8 @@ public NetJsonRpcMethods(
   }
 
   @Override
-  protected RpcApi getApiGroup() {
-    return RpcApis.NET;
+  protected String getApiGroup() {
+    return RpcApis.NET.name();
   }
 
   @Override
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PermJsonRpcMethods.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PermJsonRpcMethods.java
index 0514a307371..3a3b6cfb003 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PermJsonRpcMethods.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PermJsonRpcMethods.java
@@ -14,7 +14,6 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
 
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.permissioning.PermAddAccountsToAllowlist;
@@ -38,36 +37,36 @@
 
 public class PermJsonRpcMethods extends ApiGroupJsonRpcMethods {
 
-  private final Optional<AccountLocalConfigPermissioningController> accountsWhitelistController;
-  private final Optional<NodeLocalConfigPermissioningController> nodeWhitelistController;
+  private final Optional<AccountLocalConfigPermissioningController> accountsAllowlistController;
+  private final Optional<NodeLocalConfigPermissioningController> nodeAllowlistController;
 
   public PermJsonRpcMethods(
-      final Optional<AccountLocalConfigPermissioningController> accountsWhitelistController,
-      final Optional<NodeLocalConfigPermissioningController> nodeWhitelistController) {
-    this.accountsWhitelistController = accountsWhitelistController;
-    this.nodeWhitelistController = nodeWhitelistController;
+      final Optional<AccountLocalConfigPermissioningController> accountsAllowlistController,
+      final Optional<NodeLocalConfigPermissioningController> nodeAllowlistController) {
+    this.accountsAllowlistController = accountsAllowlistController;
+    this.nodeAllowlistController = nodeAllowlistController;
   }
 
   @Override
-  protected RpcApi getApiGroup() {
-    return RpcApis.PERM;
+  protected String getApiGroup() {
+    return RpcApis.PERM.name();
   }
 
   @Override
   protected Map<String, JsonRpcMethod> create() {
     return mapOf(
-        new PermAddNodesToWhitelist(nodeWhitelistController),
-        new PermAddNodesToAllowlist(nodeWhitelistController),
-        new PermRemoveNodesFromWhitelist(nodeWhitelistController),
-        new PermRemoveNodesFromAllowlist(nodeWhitelistController),
-        new PermGetNodesWhitelist(nodeWhitelistController),
-        new PermGetNodesAllowlist(nodeWhitelistController),
-        new PermGetAccountsWhitelist(accountsWhitelistController),
-        new PermGetAccountsAllowlist(accountsWhitelistController),
-        new PermAddAccountsToWhitelist(accountsWhitelistController),
-        new PermAddAccountsToAllowlist(accountsWhitelistController),
-        new PermRemoveAccountsFromWhitelist(accountsWhitelistController),
-        new PermRemoveAccountsFromAllowlist(accountsWhitelistController),
-        new PermReloadPermissionsFromFile(accountsWhitelistController, nodeWhitelistController));
+        new PermAddNodesToWhitelist(nodeAllowlistController),
+        new PermAddNodesToAllowlist(nodeAllowlistController),
+        new PermRemoveNodesFromWhitelist(nodeAllowlistController),
+        new PermRemoveNodesFromAllowlist(nodeAllowlistController),
+        new PermGetNodesWhitelist(nodeAllowlistController),
+        new PermGetNodesAllowlist(nodeAllowlistController),
+        new PermGetAccountsWhitelist(accountsAllowlistController),
+        new PermGetAccountsAllowlist(accountsAllowlistController),
+        new PermAddAccountsToWhitelist(accountsAllowlistController),
+        new PermAddAccountsToAllowlist(accountsAllowlistController),
+        new PermRemoveAccountsFromWhitelist(accountsAllowlistController),
+        new PermRemoveAccountsFromAllowlist(accountsAllowlistController),
+        new PermReloadPermissionsFromFile(accountsAllowlistController, nodeAllowlistController));
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PluginsJsonRpcMethods.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PluginsJsonRpcMethods.java
index 2588566a70a..0b73b8f401c 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PluginsJsonRpcMethods.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PluginsJsonRpcMethods.java
@@ -14,7 +14,6 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
 
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.PluginsReloadConfiguration;
@@ -31,8 +30,8 @@ public PluginsJsonRpcMethods(final Map<String, BesuPlugin> namedPlugins) {
   }
 
   @Override
-  protected RpcApi getApiGroup() {
-    return RpcApis.PLUGINS;
+  protected String getApiGroup() {
+    return RpcApis.PLUGINS.name();
   }
 
   @Override
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivJsonRpcMethods.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivJsonRpcMethods.java
index 905ee55e245..0f6df40d143 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivJsonRpcMethods.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivJsonRpcMethods.java
@@ -14,14 +14,13 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
 
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivGetFilterChanges;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivGetFilterLogs;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivUninstallFilter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivCall;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivCreatePrivacyGroup;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv.PrivDebugGetStateRoot;
@@ -40,6 +39,7 @@
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
+import org.hyperledger.besu.plugin.services.privacy.PrivateMarkerTransactionFactory;
 
 import java.util.Map;
 
@@ -58,48 +58,45 @@ public PrivJsonRpcMethods(
   }
 
   @Override
-  protected RpcApi getApiGroup() {
-    return RpcApis.PRIV;
+  protected String getApiGroup() {
+    return RpcApis.PRIV.name();
   }
 
   @Override
   protected Map<String, JsonRpcMethod> create(
       final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider) {
+      final PrivacyIdProvider privacyIdProvider,
+      final PrivateMarkerTransactionFactory privateMarkerTransactionFactory) {
 
     final Map<String, JsonRpcMethod> RPC_METHODS =
         mapOf(
-            new PrivCall(getBlockchainQueries(), privacyController, enclavePublicKeyProvider),
-            new PrivDebugGetStateRoot(
-                getBlockchainQueries(), enclavePublicKeyProvider, privacyController),
+            new PrivCall(getBlockchainQueries(), privacyController, privacyIdProvider),
+            new PrivDebugGetStateRoot(getBlockchainQueries(), privacyIdProvider, privacyController),
             new PrivDistributeRawTransaction(
                 privacyController,
-                enclavePublicKeyProvider,
-                getPrivacyParameters().isOnchainPrivacyGroupsEnabled()),
-            new PrivGetCode(getBlockchainQueries(), privacyController, enclavePublicKeyProvider),
+                privacyIdProvider,
+                getPrivacyParameters().isFlexiblePrivacyGroupsEnabled()),
+            new PrivGetCode(getBlockchainQueries(), privacyController, privacyIdProvider),
             new PrivGetLogs(
-                getBlockchainQueries(),
-                getPrivacyQueries(),
-                privacyController,
-                enclavePublicKeyProvider),
-            new PrivGetPrivateTransaction(privacyController, enclavePublicKeyProvider),
+                getBlockchainQueries(), getPrivacyQueries(), privacyController, privacyIdProvider),
+            new PrivGetPrivateTransaction(privacyController, privacyIdProvider),
             new PrivGetPrivacyPrecompileAddress(getPrivacyParameters()),
-            new PrivGetTransactionCount(privacyController, enclavePublicKeyProvider),
+            new PrivGetTransactionCount(privacyController, privacyIdProvider),
             new PrivGetTransactionReceipt(
                 getPrivacyParameters().getPrivateStateStorage(),
                 privacyController,
-                enclavePublicKeyProvider),
-            new PrivGetFilterLogs(filterManager, privacyController, enclavePublicKeyProvider),
-            new PrivGetFilterChanges(filterManager, privacyController, enclavePublicKeyProvider),
-            new PrivNewFilter(filterManager, privacyController, enclavePublicKeyProvider),
-            new PrivUninstallFilter(filterManager, privacyController, enclavePublicKeyProvider));
+                privacyIdProvider),
+            new PrivGetFilterLogs(filterManager, privacyController, privacyIdProvider),
+            new PrivGetFilterChanges(filterManager, privacyController, privacyIdProvider),
+            new PrivNewFilter(filterManager, privacyController, privacyIdProvider),
+            new PrivUninstallFilter(filterManager, privacyController, privacyIdProvider));
 
-    if (!getPrivacyParameters().isOnchainPrivacyGroupsEnabled()) {
+    if (!getPrivacyParameters().isFlexiblePrivacyGroupsEnabled()) {
       final Map<String, JsonRpcMethod> OFFCHAIN_METHODS =
           mapOf(
-              new PrivCreatePrivacyGroup(privacyController, enclavePublicKeyProvider),
-              new PrivDeletePrivacyGroup(privacyController, enclavePublicKeyProvider),
-              new PrivFindPrivacyGroup(privacyController, enclavePublicKeyProvider));
+              new PrivCreatePrivacyGroup(privacyController, privacyIdProvider),
+              new PrivDeletePrivacyGroup(privacyController, privacyIdProvider),
+              new PrivFindPrivacyGroup(privacyController, privacyIdProvider));
       OFFCHAIN_METHODS.forEach(
           (key, jsonRpcMethod) ->
               RPC_METHODS.merge(key, jsonRpcMethod, (oldVal, newVal) -> newVal));
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivacyApiGroupJsonRpcMethods.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivacyApiGroupJsonRpcMethods.java
index be424457ac4..304a36a677b 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivacyApiGroupJsonRpcMethods.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivacyApiGroupJsonRpcMethods.java
@@ -14,27 +14,28 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
 
-import org.hyperledger.besu.ethereum.api.jsonrpc.LatestNonceProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.DisabledPrivacyRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.MultiTenancyRpcMethodDecorator;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.query.PrivacyQueries;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.privacy.ChainHeadPrivateNonceProvider;
-import org.hyperledger.besu.ethereum.privacy.DefaultPrivacyController;
+import org.hyperledger.besu.ethereum.privacy.FlexiblePrivacyController;
 import org.hyperledger.besu.ethereum.privacy.MultiTenancyPrivacyController;
+import org.hyperledger.besu.ethereum.privacy.PluginPrivacyController;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 import org.hyperledger.besu.ethereum.privacy.PrivateNonceProvider;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransactionSimulator;
+import org.hyperledger.besu.ethereum.privacy.RestrictedDefaultPrivacyController;
 import org.hyperledger.besu.ethereum.privacy.markertransaction.FixedKeySigningPrivateMarkerTransactionFactory;
-import org.hyperledger.besu.ethereum.privacy.markertransaction.PrivateMarkerTransactionFactory;
 import org.hyperledger.besu.ethereum.privacy.markertransaction.RandomSigningPrivateMarkerTransactionFactory;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.plugin.services.privacy.PrivateMarkerTransactionFactory;
 
 import java.math.BigInteger;
 import java.util.Map;
@@ -86,15 +87,21 @@ public PrivacyParameters getPrivacyParameters() {
     return privacyParameters;
   }
 
+  public GasCalculator getGasCalculator() {
+    return protocolSchedule
+        .getByBlockHeader(blockchainQueries.headBlockHeader())
+        .getGasCalculator();
+  }
+
   @Override
   protected Map<String, JsonRpcMethod> create() {
     final PrivateMarkerTransactionFactory markerTransactionFactory =
-        createPrivateMarkerTransactionFactory(
-            privacyParameters, blockchainQueries, transactionPool.getPendingTransactions());
-    final EnclavePublicKeyProvider enclavePublicProvider =
-        EnclavePublicKeyProvider.build(privacyParameters);
-    final PrivacyController privacyController = createPrivacyController(markerTransactionFactory);
-    return create(privacyController, enclavePublicProvider).entrySet().stream()
+        createPrivateMarkerTransactionFactory();
+    final PrivacyIdProvider enclavePublicProvider = PrivacyIdProvider.build(privacyParameters);
+    final PrivacyController privacyController = createPrivacyController();
+    return create(privacyController, enclavePublicProvider, markerTransactionFactory)
+        .entrySet()
+        .stream()
         .collect(
             Collectors.toMap(
                 Map.Entry::getKey,
@@ -103,44 +110,56 @@ protected Map<String, JsonRpcMethod> create() {
 
   protected abstract Map<String, JsonRpcMethod> create(
       final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider);
-
-  private PrivateMarkerTransactionFactory createPrivateMarkerTransactionFactory(
-      final PrivacyParameters privacyParameters,
-      final BlockchainQueries blockchainQueries,
-      final PendingTransactions pendingTransactions) {
-
-    final Address privateContractAddress =
-        Address.privacyPrecompiled(privacyParameters.getPrivacyAddress());
-
-    if (privacyParameters.getSigningKeyPair().isPresent()) {
+      final PrivacyIdProvider privacyIdProvider,
+      PrivateMarkerTransactionFactory markerTransactionFactory);
+
+  private PrivateMarkerTransactionFactory createPrivateMarkerTransactionFactory() {
+    if (privacyParameters.getPrivacyService() != null
+        && privacyParameters.getPrivacyService().getPrivateMarkerTransactionFactory() != null) {
+      return privacyParameters.getPrivacyService().getPrivateMarkerTransactionFactory();
+    } else if (privacyParameters.getSigningKeyPair().isPresent()) {
       return new FixedKeySigningPrivateMarkerTransactionFactory(
-          privateContractAddress,
-          new LatestNonceProvider(blockchainQueries, pendingTransactions),
           privacyParameters.getSigningKeyPair().get());
     }
-    return new RandomSigningPrivateMarkerTransactionFactory(privateContractAddress);
+    return new RandomSigningPrivateMarkerTransactionFactory();
   }
 
-  private PrivacyController createPrivacyController(
-      final PrivateMarkerTransactionFactory markerTransactionFactory) {
+  private PrivacyController createPrivacyController() {
     final Optional<BigInteger> chainId = protocolSchedule.getChainId();
-    final DefaultPrivacyController defaultPrivacyController =
-        new DefaultPrivacyController(
-            getBlockchainQueries().getBlockchain(),
-            privacyParameters,
-            chainId,
-            markerTransactionFactory,
-            createPrivateTransactionSimulator(),
-            privateNonceProvider,
-            privacyParameters.getPrivateWorldStateReader());
-    return privacyParameters.isMultiTenancyEnabled()
-        ? new MultiTenancyPrivacyController(
-            defaultPrivacyController,
-            chainId,
-            privacyParameters.getEnclave(),
-            privacyParameters.isOnchainPrivacyGroupsEnabled())
-        : defaultPrivacyController;
+
+    if (privacyParameters.isPrivacyPluginEnabled()) {
+      return new PluginPrivacyController(
+          getBlockchainQueries().getBlockchain(),
+          privacyParameters,
+          chainId,
+          createPrivateTransactionSimulator(),
+          privateNonceProvider,
+          privacyParameters.getPrivateWorldStateReader());
+    } else {
+      final PrivacyController privacyController;
+      if (privacyParameters.isFlexiblePrivacyGroupsEnabled()) {
+        privacyController =
+            new FlexiblePrivacyController(
+                getBlockchainQueries().getBlockchain(),
+                privacyParameters,
+                chainId,
+                createPrivateTransactionSimulator(),
+                privateNonceProvider,
+                privacyParameters.getPrivateWorldStateReader());
+      } else {
+        privacyController =
+            new RestrictedDefaultPrivacyController(
+                getBlockchainQueries().getBlockchain(),
+                privacyParameters,
+                chainId,
+                createPrivateTransactionSimulator(),
+                privateNonceProvider,
+                privacyParameters.getPrivateWorldStateReader());
+      }
+      return privacyParameters.isMultiTenancyEnabled()
+          ? new MultiTenancyPrivacyController(privacyController)
+          : privacyController;
+    }
   }
 
   PrivacyQueries getPrivacyQueries() {
@@ -149,10 +168,13 @@ PrivacyQueries getPrivacyQueries() {
 
   private JsonRpcMethod createPrivacyMethod(
       final PrivacyParameters privacyParameters, final JsonRpcMethod rpcMethod) {
-    if (privacyParameters.isEnabled() && privacyParameters.isMultiTenancyEnabled()) {
+    final String methodName = rpcMethod.getName();
+    if (methodName.equals(RpcMethod.ETH_SEND_RAW_PRIVATE_TRANSACTION.getMethodName())) {
+      return rpcMethod;
+    } else if (privacyParameters.isEnabled() && privacyParameters.isMultiTenancyEnabled()) {
       return new MultiTenancyRpcMethodDecorator(rpcMethod);
     } else if (!privacyParameters.isEnabled()) {
-      return new DisabledPrivacyRpcMethod(rpcMethod.getName());
+      return new DisabledPrivacyRpcMethod(methodName);
     } else {
       return rpcMethod;
     }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivxJsonRpcMethods.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivxJsonRpcMethods.java
index 7d60405bc87..19d1c12ef24 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivxJsonRpcMethods.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivxJsonRpcMethods.java
@@ -14,16 +14,17 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
 
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.privx.PrivxFindOnChainPrivacyGroup;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.privx.PrivxFindFlexiblePrivacyGroup;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.privx.PrivxFindOnchainPrivacyGroup;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
+import org.hyperledger.besu.plugin.services.privacy.PrivateMarkerTransactionFactory;
 
 import java.util.Map;
 
@@ -38,16 +39,19 @@ public PrivxJsonRpcMethods(
   }
 
   @Override
-  protected RpcApi getApiGroup() {
-    return RpcApis.PRIV;
+  protected String getApiGroup() {
+    return RpcApis.PRIV.name();
   }
 
   @Override
   protected Map<String, JsonRpcMethod> create(
       final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider) {
-    if (getPrivacyParameters().isOnchainPrivacyGroupsEnabled()) {
-      return mapOf(new PrivxFindOnChainPrivacyGroup(privacyController, enclavePublicKeyProvider));
+      final PrivacyIdProvider privacyIdProvider,
+      final PrivateMarkerTransactionFactory privateMarkerTransactionFactory) {
+    if (getPrivacyParameters().isFlexiblePrivacyGroupsEnabled()) {
+      return mapOf(
+          new PrivxFindFlexiblePrivacyGroup(privacyController, privacyIdProvider),
+          new PrivxFindOnchainPrivacyGroup(privacyController, privacyIdProvider));
     } else {
       return Map.of();
     }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/TraceJsonRpcMethods.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/TraceJsonRpcMethods.java
index a42fe7c0e14..88c6db1dd4d 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/TraceJsonRpcMethods.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/TraceJsonRpcMethods.java
@@ -14,16 +14,21 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
 
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.TraceBlock;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.TraceCall;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.TraceCallMany;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.TraceFilter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.TraceGet;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.TraceRawTransaction;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.TraceReplayBlockTransactions;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.TraceTransaction;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockReplay;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
 
 import java.util.Map;
 
@@ -39,23 +44,41 @@ public class TraceJsonRpcMethods extends ApiGroupJsonRpcMethods {
   }
 
   @Override
-  protected RpcApi getApiGroup() {
-    // Disable TRACE functionality while under development
-    return RpcApis.TRACE;
+  protected String getApiGroup() {
+    return RpcApis.TRACE.name();
   }
 
   @Override
   protected Map<String, JsonRpcMethod> create() {
     final BlockReplay blockReplay =
-        new BlockReplay(
-            protocolSchedule,
-            blockchainQueries.getBlockchain(),
-            blockchainQueries.getWorldStateArchive());
+        new BlockReplay(protocolSchedule, blockchainQueries.getBlockchain());
     return mapOf(
-        new TraceReplayBlockTransactions(
-            () -> new BlockTracer(blockReplay), protocolSchedule, blockchainQueries),
+        new TraceReplayBlockTransactions(protocolSchedule, blockchainQueries),
+        new TraceFilter(() -> new BlockTracer(blockReplay), protocolSchedule, blockchainQueries),
+        new TraceGet(() -> new BlockTracer(blockReplay), blockchainQueries, protocolSchedule),
         new TraceTransaction(
             () -> new BlockTracer(blockReplay), protocolSchedule, blockchainQueries),
-        new TraceBlock(() -> new BlockTracer(blockReplay), protocolSchedule, blockchainQueries));
+        new TraceBlock(protocolSchedule, blockchainQueries),
+        new TraceCall(
+            blockchainQueries,
+            protocolSchedule,
+            new TransactionSimulator(
+                blockchainQueries.getBlockchain(),
+                blockchainQueries.getWorldStateArchive(),
+                protocolSchedule)),
+        new TraceCallMany(
+            blockchainQueries,
+            protocolSchedule,
+            new TransactionSimulator(
+                blockchainQueries.getBlockchain(),
+                blockchainQueries.getWorldStateArchive(),
+                protocolSchedule)),
+        new TraceRawTransaction(
+            protocolSchedule,
+            blockchainQueries,
+            new TransactionSimulator(
+                blockchainQueries.getBlockchain(),
+                blockchainQueries.getWorldStateArchive(),
+                protocolSchedule)));
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/TxPoolJsonRpcMethods.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/TxPoolJsonRpcMethods.java
index 63356484d5a..cc20c06b02b 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/TxPoolJsonRpcMethods.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/TxPoolJsonRpcMethods.java
@@ -14,7 +14,6 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
 
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.TxPoolBesuPendingTransactions;
@@ -33,8 +32,8 @@ public TxPoolJsonRpcMethods(final TransactionPool transactionPool) {
   }
 
   @Override
-  protected RpcApi getApiGroup() {
-    return RpcApis.TX_POOL;
+  protected String getApiGroup() {
+    return RpcApis.TXPOOL.name();
   }
 
   @Override
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/Web3JsonRpcMethods.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/Web3JsonRpcMethods.java
index ca9176aec21..e89f27191f7 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/Web3JsonRpcMethods.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/Web3JsonRpcMethods.java
@@ -14,7 +14,6 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
 
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.Web3ClientVersion;
@@ -31,8 +30,8 @@ public Web3JsonRpcMethods(final String clientVersion) {
   }
 
   @Override
-  protected RpcApi getApiGroup() {
-    return RpcApis.WEB3;
+  protected String getApiGroup() {
+    return RpcApis.WEB3.name();
   }
 
   @Override
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/JsonResponseStreamer.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/JsonResponseStreamer.java
new file mode 100644
index 00000000000..bc216c7fc2a
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/JsonResponseStreamer.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright Hyperledger Besu contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.websocket;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.concurrent.atomic.AtomicReference;
+
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.ServerWebSocket;
+import io.vertx.core.http.WebSocketFrame;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+class JsonResponseStreamer extends OutputStream {
+
+  private static final Logger LOG = LoggerFactory.getLogger(JsonResponseStreamer.class);
+  private static final Buffer EMPTY_BUFFER = Buffer.buffer();
+
+  private final ServerWebSocket response;
+  private final byte[] singleByteBuf = new byte[1];
+  private boolean firstFrame = true;
+  private boolean closed = false;
+  private Buffer buffer = EMPTY_BUFFER;
+  private final AtomicReference<Throwable> failure = new AtomicReference<>();
+
+  public JsonResponseStreamer(final ServerWebSocket response) {
+    this.response = response;
+    this.response.exceptionHandler(
+        event -> {
+          LOG.debug("Write to remote address {} failed", response.remoteAddress(), event);
+          failure.set(event);
+        });
+  }
+
+  @Override
+  public void write(final int b) throws IOException {
+    singleByteBuf[0] = (byte) b;
+    write(singleByteBuf, 0, 1);
+  }
+
+  @Override
+  public void write(final byte[] bbuf, final int off, final int len) throws IOException {
+    stopOnFailureOrClosed();
+
+    if (buffer != EMPTY_BUFFER) {
+      writeFrame(buffer, false);
+    }
+    Buffer buf = Buffer.buffer(len);
+    buf.appendBytes(bbuf, off, len);
+    buffer = buf;
+  }
+
+  private void writeFrame(final Buffer buf, final boolean isFinal) {
+    if (firstFrame) {
+      response
+          .writeFrame(WebSocketFrame.textFrame(buf.toString(), isFinal))
+          .onFailure(this::handleFailure);
+      firstFrame = false;
+    } else {
+      response
+          .writeFrame(WebSocketFrame.continuationFrame(buf, isFinal))
+          .onFailure(this::handleFailure);
+    }
+  }
+
+  @Override
+  public void close() throws IOException {
+    // write last buffer only if there were no previous failures and not already closed
+    if (!closed && failure.get() == null) {
+      writeFrame(buffer, true);
+      closed = true;
+    }
+  }
+
+  private void stopOnFailureOrClosed() throws IOException {
+    if (closed) {
+      throw new IOException("Stream closed");
+    }
+
+    Throwable t = failure.get();
+    if (t != null) {
+      LOG.debug("Stop writing to remote address {} due to a failure", response.remoteAddress(), t);
+      throw (t instanceof IOException) ? (IOException) t : new IOException(t);
+    }
+  }
+
+  private void handleFailure(final Throwable t) {
+    LOG.debug("Write to remote address {} failed", response.remoteAddress(), t);
+    failure.set(t);
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketConfiguration.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketConfiguration.java
index bc80170e984..e27f7f21cec 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketConfiguration.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketConfiguration.java
@@ -14,9 +14,10 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.websocket;
 
+import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.DEFAULT_RPC_APIS;
+
 import org.hyperledger.besu.ethereum.api.handlers.TimeoutOptions;
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
+import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.JwtAlgorithm;
 
 import java.io.File;
 import java.util.Arrays;
@@ -30,26 +31,41 @@
 public class WebSocketConfiguration {
   public static final String DEFAULT_WEBSOCKET_HOST = "127.0.0.1";
   public static final int DEFAULT_WEBSOCKET_PORT = 8546;
-  public static final List<RpcApi> DEFAULT_WEBSOCKET_APIS =
-      Arrays.asList(RpcApis.ETH, RpcApis.NET, RpcApis.WEB3);
+  public static final int DEFAULT_WEBSOCKET_ENGINE_PORT = 8551;
+  public static final int DEFAULT_WEBSOCKET_MAX_FRAME_SIZE = 1024 * 1024;
+  public static final int DEFAULT_MAX_ACTIVE_CONNECTIONS = 80;
 
   private boolean enabled;
   private int port;
   private String host;
-  private List<RpcApi> rpcApis;
+  private List<String> rpcApis;
+  private List<String> rpcApisNoAuth = Collections.emptyList();
   private boolean authenticationEnabled = false;
   private String authenticationCredentialsFile;
   private List<String> hostsAllowlist = Arrays.asList("localhost", "127.0.0.1");
   private File authenticationPublicKeyFile;
+  private JwtAlgorithm authenticationAlgorithm = JwtAlgorithm.RS256;
   private long timeoutSec;
+  private int maxActiveConnections;
+  private int maxFrameSize;
 
   public static WebSocketConfiguration createDefault() {
     final WebSocketConfiguration config = new WebSocketConfiguration();
     config.setEnabled(false);
     config.setHost(DEFAULT_WEBSOCKET_HOST);
     config.setPort(DEFAULT_WEBSOCKET_PORT);
-    config.setRpcApis(DEFAULT_WEBSOCKET_APIS);
+    config.setRpcApis(DEFAULT_RPC_APIS);
     config.setTimeoutSec(TimeoutOptions.defaultOptions().getTimeoutSeconds());
+    config.setMaxActiveConnections(DEFAULT_MAX_ACTIVE_CONNECTIONS);
+    config.setMaxFrameSize(DEFAULT_WEBSOCKET_MAX_FRAME_SIZE);
+    return config;
+  }
+
+  public static WebSocketConfiguration createEngineDefault() {
+    final WebSocketConfiguration config = createDefault();
+    config.setPort(DEFAULT_WEBSOCKET_ENGINE_PORT);
+    config.setRpcApis(Arrays.asList("ENGINE", "ETH"));
+    config.setHostsAllowlist(Arrays.asList("localhost", "127.0.0.1"));
     return config;
   }
 
@@ -79,14 +95,22 @@ public int getPort() {
     return port;
   }
 
-  public Collection<RpcApi> getRpcApis() {
+  public Collection<String> getRpcApis() {
     return rpcApis;
   }
 
-  public void setRpcApis(final List<RpcApi> rpcApis) {
+  public void setRpcApis(final List<String> rpcApis) {
     this.rpcApis = rpcApis;
   }
 
+  public Collection<String> getRpcApisNoAuth() {
+    return rpcApisNoAuth;
+  }
+
+  public void setRpcApisNoAuth(final List<String> rpcApis) {
+    this.rpcApisNoAuth = rpcApis;
+  }
+
   public boolean isAuthenticationEnabled() {
     return authenticationEnabled;
   }
@@ -119,6 +143,14 @@ public void setAuthenticationPublicKeyFile(final File authenticationPublicKeyFil
     this.authenticationPublicKeyFile = authenticationPublicKeyFile;
   }
 
+  public JwtAlgorithm getAuthenticationAlgorithm() {
+    return authenticationAlgorithm;
+  }
+
+  public void setAuthenticationAlgorithm(final JwtAlgorithm algorithm) {
+    authenticationAlgorithm = algorithm;
+  }
+
   public long getTimeoutSec() {
     return timeoutSec;
   }
@@ -175,4 +207,20 @@ public String toString() {
         .add("timeoutSec", timeoutSec)
         .toString();
   }
+
+  public int getMaxActiveConnections() {
+    return maxActiveConnections;
+  }
+
+  public void setMaxActiveConnections(final int maxActiveConnections) {
+    this.maxActiveConnections = maxActiveConnections;
+  }
+
+  public void setMaxFrameSize(final int maxFrameSize) {
+    this.maxFrameSize = maxFrameSize;
+  }
+
+  public Integer getMaxFrameSize() {
+    return maxFrameSize;
+  }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketMessageHandler.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketMessageHandler.java
new file mode 100644
index 00000000000..a4e552bc6fc
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketMessageHandler.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.websocket;
+
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.INVALID_REQUEST;
+
+import org.hyperledger.besu.ethereum.api.handlers.IsAliveHandler;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.JsonRpcExecutor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType;
+import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods.WebSocketRpcRequest;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import com.fasterxml.jackson.core.JsonGenerator.Feature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
+import io.vertx.core.Vertx;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.ServerWebSocket;
+import io.vertx.core.json.DecodeException;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.auth.User;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class WebSocketMessageHandler {
+
+  private static final Logger LOG = LoggerFactory.getLogger(WebSocketMessageHandler.class);
+  private static final ObjectWriter JSON_OBJECT_WRITER =
+      new ObjectMapper()
+          .registerModule(new Jdk8Module()) // Handle JDK8 Optionals (de)serialization
+          .writer()
+          .without(Feature.FLUSH_PASSED_TO_STREAM)
+          .with(Feature.AUTO_CLOSE_TARGET);
+
+  private final Vertx vertx;
+  private final JsonRpcExecutor jsonRpcExecutor;
+  final EthScheduler ethScheduler;
+  private final long timeoutSec;
+
+  public WebSocketMessageHandler(
+      final Vertx vertx,
+      final JsonRpcExecutor jsonRpcExecutor,
+      final EthScheduler ethScheduler,
+      final long timeoutSec) {
+    this.vertx = vertx;
+    this.jsonRpcExecutor = jsonRpcExecutor;
+    this.ethScheduler = ethScheduler;
+    this.timeoutSec = timeoutSec;
+  }
+
+  public void handle(
+      final ServerWebSocket websocket, final Buffer buffer, final Optional<User> user) {
+    if (buffer.length() == 0) {
+      replyToClient(websocket, errorResponse(null, JsonRpcError.INVALID_REQUEST));
+    } else {
+      try {
+        final JsonObject jsonRpcRequest = buffer.toJsonObject();
+        vertx
+            .<JsonRpcResponse>executeBlocking(
+                promise -> {
+                  try {
+                    final JsonRpcResponse jsonRpcResponse =
+                        jsonRpcExecutor.execute(
+                            user,
+                            null,
+                            null,
+                            new IsAliveHandler(ethScheduler, timeoutSec),
+                            jsonRpcRequest,
+                            req -> {
+                              final WebSocketRpcRequest websocketRequest =
+                                  req.mapTo(WebSocketRpcRequest.class);
+                              websocketRequest.setConnectionId(websocket.textHandlerID());
+                              return websocketRequest;
+                            });
+                    promise.complete(jsonRpcResponse);
+                  } catch (RuntimeException e) {
+                    promise.fail(e);
+                  }
+                })
+            .onSuccess(jsonRpcResponse -> replyToClient(websocket, jsonRpcResponse))
+            .onFailure(
+                throwable -> {
+                  try {
+                    final Integer id = jsonRpcRequest.getInteger("id", null);
+                    replyToClient(websocket, errorResponse(id, JsonRpcError.INTERNAL_ERROR));
+                  } catch (ClassCastException idNotIntegerException) {
+                    replyToClient(websocket, errorResponse(null, JsonRpcError.INTERNAL_ERROR));
+                  }
+                });
+      } catch (DecodeException jsonObjectDecodeException) {
+        try {
+          final JsonArray batchJsonRpcRequest = buffer.toJsonArray();
+          vertx
+              .<List<JsonRpcResponse>>executeBlocking(
+                  promise -> {
+                    List<JsonRpcResponse> responses = new ArrayList<>();
+                    for (int i = 0; i < batchJsonRpcRequest.size(); i++) {
+                      final JsonObject jsonRequest;
+                      try {
+                        jsonRequest = batchJsonRpcRequest.getJsonObject(i);
+                      } catch (ClassCastException e) {
+                        responses.add(new JsonRpcErrorResponse(null, INVALID_REQUEST));
+                        continue;
+                      }
+                      responses.add(
+                          jsonRpcExecutor.execute(
+                              user,
+                              null,
+                              null,
+                              new IsAliveHandler(ethScheduler, timeoutSec),
+                              jsonRequest,
+                              req -> {
+                                final WebSocketRpcRequest websocketRequest =
+                                    req.mapTo(WebSocketRpcRequest.class);
+                                websocketRequest.setConnectionId(websocket.textHandlerID());
+                                return websocketRequest;
+                              }));
+                    }
+                    promise.complete(responses);
+                  })
+              .onSuccess(
+                  jsonRpcBatchResponse -> {
+                    final JsonRpcResponse[] completed =
+                        jsonRpcBatchResponse.stream()
+                            .filter(
+                                jsonRpcResponse ->
+                                    jsonRpcResponse.getType() != JsonRpcResponseType.NONE)
+                            .toArray(JsonRpcResponse[]::new);
+                    replyToClient(websocket, completed);
+                  })
+              .onFailure(
+                  throwable ->
+                      replyToClient(websocket, errorResponse(null, JsonRpcError.INTERNAL_ERROR)));
+        } catch (RuntimeException jsonArrayDecodeException) {
+          replyToClient(websocket, errorResponse(null, JsonRpcError.INTERNAL_ERROR));
+        }
+      }
+    }
+  }
+
+  private void replyToClient(final ServerWebSocket websocket, final Object result) {
+    try {
+      // underlying output stream lifecycle is managed by the json object writer
+      JSON_OBJECT_WRITER.writeValue(new JsonResponseStreamer(websocket), result);
+    } catch (IOException ex) {
+      LOG.error("Error streaming JSON-RPC response", ex);
+    }
+  }
+
+  private JsonRpcResponse errorResponse(final Object id, final JsonRpcError error) {
+    return new JsonRpcErrorResponse(id, error);
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketRequestHandler.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketRequestHandler.java
deleted file mode 100644
index 5f98f59de95..00000000000
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketRequestHandler.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.api.jsonrpc.websocket;
-
-import static java.util.stream.Collectors.toList;
-import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.INVALID_REQUEST;
-
-import org.hyperledger.besu.ethereum.api.handlers.IsAliveHandler;
-import org.hyperledger.besu.ethereum.api.handlers.RpcMethodTimeoutException;
-import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationService;
-import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationUtils;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcUnauthorizedResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods.WebSocketRpcRequest;
-import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import io.vertx.core.AsyncResult;
-import io.vertx.core.CompositeFuture;
-import io.vertx.core.Future;
-import io.vertx.core.Handler;
-import io.vertx.core.Promise;
-import io.vertx.core.Vertx;
-import io.vertx.core.buffer.Buffer;
-import io.vertx.core.json.DecodeException;
-import io.vertx.core.json.Json;
-import io.vertx.core.json.JsonArray;
-import io.vertx.core.json.JsonObject;
-import io.vertx.ext.auth.User;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-public class WebSocketRequestHandler {
-
-  private static final Logger LOG = LogManager.getLogger();
-
-  private final Vertx vertx;
-  private final Map<String, JsonRpcMethod> methods;
-  final EthScheduler ethScheduler;
-  private final long timeoutSec;
-
-  public WebSocketRequestHandler(
-      final Vertx vertx,
-      final Map<String, JsonRpcMethod> methods,
-      final EthScheduler ethScheduler,
-      final long timeoutSec) {
-    this.vertx = vertx;
-    this.methods = methods;
-    this.ethScheduler = ethScheduler;
-    this.timeoutSec = timeoutSec;
-  }
-
-  public void handle(final String id, final String payload) {
-    handle(Optional.empty(), id, payload, Optional.empty());
-  }
-
-  public void handle(
-      final Optional<AuthenticationService> authenticationService,
-      final String id,
-      final String payload,
-      final Optional<User> user) {
-    vertx.executeBlocking(
-        executeHandler(authenticationService, id, payload, user), false, resultHandler(id));
-  }
-
-  private Handler<Promise<Object>> executeHandler(
-      final Optional<AuthenticationService> authenticationService,
-      final String id,
-      final String payload,
-      final Optional<User> user) {
-    return future -> {
-      final String json = payload.trim();
-      if (!json.isEmpty() && json.charAt(0) == '{') {
-        try {
-          handleSingleRequest(authenticationService, id, user, future, getRequest(payload));
-        } catch (final IllegalArgumentException | DecodeException e) {
-          LOG.debug("Error mapping json to WebSocketRpcRequest", e);
-          future.complete(new JsonRpcErrorResponse(null, JsonRpcError.INVALID_REQUEST));
-          return;
-        }
-      } else if (json.length() == 0) {
-        future.complete(errorResponse(null, INVALID_REQUEST));
-        return;
-      } else {
-        final JsonArray jsonArray = new JsonArray(json);
-        if (jsonArray.size() < 1) {
-          future.complete(errorResponse(null, INVALID_REQUEST));
-          return;
-        }
-        // handle batch request
-        LOG.debug("batch request size {}", jsonArray.size());
-        handleJsonBatchRequest(authenticationService, id, jsonArray, user);
-      }
-    };
-  }
-
-  private JsonRpcResponse process(
-      final Optional<AuthenticationService> authenticationService,
-      final String id,
-      final Optional<User> user,
-      final WebSocketRpcRequest requestBody) {
-
-    if (!methods.containsKey(requestBody.getMethod())) {
-      LOG.debug("Can't find method {}", requestBody.getMethod());
-      return new JsonRpcErrorResponse(requestBody.getId(), JsonRpcError.METHOD_NOT_FOUND);
-    }
-    final JsonRpcMethod method = methods.get(requestBody.getMethod());
-    try {
-      LOG.debug("WS-RPC request -> {}", requestBody.getMethod());
-      requestBody.setConnectionId(id);
-      if (AuthenticationUtils.isPermitted(authenticationService, user, method)) {
-        final JsonRpcRequestContext requestContext =
-            new JsonRpcRequestContext(
-                requestBody, user, new IsAliveHandler(ethScheduler, timeoutSec));
-        return method.response(requestContext);
-      } else {
-        return new JsonRpcUnauthorizedResponse(requestBody.getId(), JsonRpcError.UNAUTHORIZED);
-      }
-    } catch (final InvalidJsonRpcParameters e) {
-      LOG.debug("Invalid Params", e);
-      return new JsonRpcErrorResponse(requestBody.getId(), JsonRpcError.INVALID_PARAMS);
-    } catch (final RpcMethodTimeoutException e) {
-      LOG.error(JsonRpcError.TIMEOUT_ERROR.getMessage(), e);
-      return new JsonRpcErrorResponse(requestBody.getId(), JsonRpcError.TIMEOUT_ERROR);
-    } catch (final Exception e) {
-      LOG.error(JsonRpcError.INTERNAL_ERROR.getMessage(), e);
-      return new JsonRpcErrorResponse(requestBody.getId(), JsonRpcError.INTERNAL_ERROR);
-    }
-  }
-
-  private void handleSingleRequest(
-      final Optional<AuthenticationService> authenticationService,
-      final String id,
-      final Optional<User> user,
-      final Promise<Object> future,
-      final WebSocketRpcRequest requestBody) {
-    future.complete(process(authenticationService, id, user, requestBody));
-  }
-
-  @SuppressWarnings("rawtypes")
-  private void handleJsonBatchRequest(
-      final Optional<AuthenticationService> authenticationService,
-      final String id,
-      final JsonArray jsonArray,
-      final Optional<User> user) {
-    // Interpret json as rpc request
-    final List<Future> responses =
-        jsonArray.stream()
-            .map(
-                obj -> {
-                  if (!(obj instanceof JsonObject)) {
-                    return Future.succeededFuture(errorResponse(null, INVALID_REQUEST));
-                  }
-
-                  final JsonObject req = (JsonObject) obj;
-                  final Future<JsonRpcResponse> fut = Future.future();
-                  vertx.executeBlocking(
-                      future ->
-                          future.complete(
-                              process(authenticationService, id, user, getRequest(req.toString()))),
-                      false,
-                      ar -> {
-                        if (ar.failed()) {
-                          fut.fail(ar.cause());
-                        } else {
-                          fut.complete((JsonRpcResponse) ar.result());
-                        }
-                      });
-                  return fut;
-                })
-            .collect(toList());
-
-    CompositeFuture.all(responses)
-        .setHandler(
-            (res) -> {
-              final JsonRpcResponse[] completed =
-                  res.result().list().stream()
-                      .map(JsonRpcResponse.class::cast)
-                      .filter(this::isNonEmptyResponses)
-                      .toArray(JsonRpcResponse[]::new);
-
-              vertx.eventBus().send(id, Json.encode(completed));
-            });
-  }
-
-  private WebSocketRpcRequest getRequest(final String payload) {
-    return Json.decodeValue(payload, WebSocketRpcRequest.class);
-  }
-
-  private Handler<AsyncResult<Object>> resultHandler(final String id) {
-    return result -> {
-      if (result.succeeded()) {
-        replyToClient(id, Json.encodeToBuffer(result.result()));
-      } else {
-        replyToClient(
-            id, Json.encodeToBuffer(new JsonRpcErrorResponse(null, JsonRpcError.INTERNAL_ERROR)));
-      }
-    };
-  }
-
-  private void replyToClient(final String id, final Buffer request) {
-    vertx.eventBus().send(id, request.toString());
-  }
-
-  private JsonRpcResponse errorResponse(final Object id, final JsonRpcError error) {
-    return new JsonRpcErrorResponse(id, error);
-  }
-
-  private boolean isNonEmptyResponses(final JsonRpcResponse result) {
-    return result.getType() != JsonRpcResponseType.NONE;
-  }
-}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketService.java
index d5a1239837b..007cc3b4cba 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketService.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketService.java
@@ -15,14 +15,20 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.websocket;
 
 import static com.google.common.collect.Streams.stream;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationUtils.truncToken;
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationService;
 import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationUtils;
+import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.DefaultAuthenticationService;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.Logging403ErrorHandler;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
 
 import java.net.InetSocketAddress;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Splitter;
@@ -30,6 +36,8 @@
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.HttpConnection;
 import io.vertx.core.http.HttpServer;
 import io.vertx.core.http.HttpServerOptions;
 import io.vertx.core.http.HttpServerRequest;
@@ -39,19 +47,22 @@
 import io.vertx.ext.web.Router;
 import io.vertx.ext.web.RoutingContext;
 import io.vertx.ext.web.handler.BodyHandler;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class WebSocketService {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(WebSocketService.class);
 
   private static final InetSocketAddress EMPTY_SOCKET_ADDRESS = new InetSocketAddress("0.0.0.0", 0);
   private static final String APPLICATION_JSON = "application/json";
 
+  private final int maxActiveConnections;
+  private final AtomicInteger activeConnectionsCount = new AtomicInteger();
+
   private final Vertx vertx;
   private final WebSocketConfiguration configuration;
-  private final WebSocketRequestHandler websocketRequestHandler;
+  private final WebSocketMessageHandler websocketMessageHandler;
 
   private HttpServer httpServer;
 
@@ -60,23 +71,33 @@ public class WebSocketService {
   public WebSocketService(
       final Vertx vertx,
       final WebSocketConfiguration configuration,
-      final WebSocketRequestHandler websocketRequestHandler) {
+      final WebSocketMessageHandler websocketMessageHandler,
+      final MetricsSystem metricsSystem) {
     this(
         vertx,
         configuration,
-        websocketRequestHandler,
-        AuthenticationService.create(vertx, configuration));
+        websocketMessageHandler,
+        DefaultAuthenticationService.create(vertx, configuration),
+        metricsSystem);
   }
 
-  private WebSocketService(
+  public WebSocketService(
       final Vertx vertx,
       final WebSocketConfiguration configuration,
-      final WebSocketRequestHandler websocketRequestHandler,
-      final Optional<AuthenticationService> authenticationService) {
+      final WebSocketMessageHandler websocketMessageHandler,
+      final Optional<AuthenticationService> authenticationService,
+      final MetricsSystem metricsSystem) {
     this.vertx = vertx;
     this.configuration = configuration;
-    this.websocketRequestHandler = websocketRequestHandler;
+    this.websocketMessageHandler = websocketMessageHandler;
     this.authenticationService = authenticationService;
+    this.maxActiveConnections = configuration.getMaxActiveConnections();
+
+    metricsSystem.createIntegerGauge(
+        BesuMetricCategory.RPC,
+        "active_ws_connection_count",
+        "Total no of active rpc ws connections",
+        activeConnectionsCount::intValue);
   }
 
   public CompletableFuture<?> start() {
@@ -84,15 +105,19 @@ public CompletableFuture<?> start() {
         "Starting Websocket service on {}:{}", configuration.getHost(), configuration.getPort());
 
     final CompletableFuture<?> resultFuture = new CompletableFuture<>();
-
     httpServer =
         vertx
             .createHttpServer(
                 new HttpServerOptions()
                     .setHost(configuration.getHost())
                     .setPort(configuration.getPort())
-                    .setWebsocketSubProtocols("undefined"))
-            .websocketHandler(websocketHandler())
+                    .setHandle100ContinueAutomatically(true)
+                    .setCompressionSupported(true)
+                    .addWebSocketSubProtocol("undefined")
+                    .setMaxWebSocketFrameSize(configuration.getMaxFrameSize())
+                    .setMaxWebSocketMessageSize(configuration.getMaxFrameSize() * 4))
+            .webSocketHandler(websocketHandler())
+            .connectionHandler(connectionHandler())
             .requestHandler(httpHandler())
             .listen(startHandler(resultFuture));
 
@@ -105,7 +130,10 @@ private Handler<ServerWebSocket> websocketHandler() {
       final String connectionId = websocket.textHandlerID();
       final String token = getAuthToken(websocket);
       if (token != null) {
-        LOG.trace("Websocket authentication token {}", token);
+        LOG.atTrace()
+            .setMessage("Websocket authentication token {}")
+            .addArgument(() -> truncToken(token))
+            .log();
       }
 
       if (!hasAllowedHostnameHeader(Optional.ofNullable(websocket.headers().get("Host")))) {
@@ -114,20 +142,24 @@ private Handler<ServerWebSocket> websocketHandler() {
 
       LOG.debug("Websocket Connected ({})", socketAddressAsString(socketAddress));
 
-      websocket.textMessageHandler(
-          payload -> {
+      final Handler<Buffer> socketHandler =
+          buffer -> {
             LOG.debug(
-                "Received Websocket request {} ({})",
-                payload,
+                "Received Websocket request (binary frame) {} ({})",
+                buffer.toString(),
                 socketAddressAsString(socketAddress));
 
-            AuthenticationUtils.getUser(
-                authenticationService,
-                token,
-                user ->
-                    websocketRequestHandler.handle(
-                        authenticationService, connectionId, payload, user));
-          });
+            if (authenticationService.isPresent()) {
+              authenticationService
+                  .get()
+                  .authenticate(
+                      token, user -> websocketMessageHandler.handle(websocket, buffer, user));
+            } else {
+              websocketMessageHandler.handle(websocket, buffer, Optional.empty());
+            }
+          };
+      websocket.textMessageHandler(text -> socketHandler.handle(Buffer.buffer(text)));
+      websocket.binaryMessageHandler(socketHandler);
 
       websocket.closeHandler(
           v -> {
@@ -148,6 +180,34 @@ private Handler<ServerWebSocket> websocketHandler() {
     };
   }
 
+  private Handler<HttpConnection> connectionHandler() {
+
+    return connection -> {
+      if (activeConnectionsCount.get() >= maxActiveConnections) {
+        // disallow new connections to prevent DoS
+        LOG.warn(
+            "Rejecting new connection from {}. {}/{} max active connections limit reached.",
+            connection.remoteAddress(),
+            activeConnectionsCount.getAndIncrement(),
+            maxActiveConnections);
+        connection.close();
+      } else {
+        LOG.debug(
+            "Opened connection from {}. Total of active connections: {}/{}",
+            connection.remoteAddress(),
+            activeConnectionsCount.incrementAndGet(),
+            maxActiveConnections);
+      }
+      connection.closeHandler(
+          c ->
+              LOG.debug(
+                  "Connection closed from {}. Total of active connections: {}/{}",
+                  connection.remoteAddress(),
+                  activeConnectionsCount.decrementAndGet(),
+                  maxActiveConnections));
+    };
+  }
+
   private Handler<HttpServerRequest> httpHandler() {
     final Router router = Router.router(vertx);
 
@@ -164,9 +224,9 @@ private Handler<HttpServerRequest> httpHandler() {
       router
           .post("/login")
           .produces(APPLICATION_JSON)
-          .handler(AuthenticationService::handleDisabledLogin);
+          .handler(DefaultAuthenticationService::handleDisabledLogin);
     }
-
+    router.errorHandler(403, new Logging403ErrorHandler());
     router.route().handler(WebSocketService::handleHttpNotSupported);
     return router;
   }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/AbstractPrivateSubscriptionMethod.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/AbstractPrivateSubscriptionMethod.java
index fddfb7aa4cf..6ee6db4c0a6 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/AbstractPrivateSubscriptionMethod.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/AbstractPrivateSubscriptionMethod.java
@@ -15,29 +15,29 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods;
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 
 abstract class AbstractPrivateSubscriptionMethod extends AbstractSubscriptionMethod {
 
-  private final PrivacyController privacyController;
-  protected final EnclavePublicKeyProvider enclavePublicKeyProvider;
+  final PrivacyController privacyController;
+  protected final PrivacyIdProvider privacyIdProvider;
 
   AbstractPrivateSubscriptionMethod(
       final SubscriptionManager subscriptionManager,
       final SubscriptionRequestMapper mapper,
       final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider) {
+      final PrivacyIdProvider privacyIdProvider) {
     super(subscriptionManager, mapper);
     this.privacyController = privacyController;
-    this.enclavePublicKeyProvider = enclavePublicKeyProvider;
+    this.privacyIdProvider = privacyIdProvider;
   }
 
-  void checkIfPrivacyGroupMatchesAuthenticatedEnclaveKey(
+  void checkIfPrivacyGroupMatchesAuthenticatedPrivacyUserId(
       final JsonRpcRequestContext request, final String privacyGroupId) {
-    final String enclavePublicKey = enclavePublicKeyProvider.getEnclaveKey(request.getUser());
-    privacyController.verifyPrivacyGroupContainsEnclavePublicKey(privacyGroupId, enclavePublicKey);
+    final String privacyUserId = privacyIdProvider.getPrivacyUserId(request.getUser());
+    privacyController.verifyPrivacyGroupContainsPrivacyUserId(privacyGroupId, privacyUserId);
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/PrivSubscribe.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/PrivSubscribe.java
index 97a24750c9a..b3766c85b86 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/PrivSubscribe.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/PrivSubscribe.java
@@ -16,7 +16,7 @@
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
@@ -26,6 +26,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.InvalidSubscriptionRequestException;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.PrivateSubscribeRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper;
+import org.hyperledger.besu.ethereum.privacy.MultiTenancyPrivacyController;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 
 public class PrivSubscribe extends AbstractPrivateSubscriptionMethod {
@@ -34,8 +35,8 @@ public PrivSubscribe(
       final SubscriptionManager subscriptionManager,
       final SubscriptionRequestMapper mapper,
       final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider) {
-    super(subscriptionManager, mapper, privacyController, enclavePublicKeyProvider);
+      final PrivacyIdProvider privacyIdProvider) {
+    super(subscriptionManager, mapper, privacyController, privacyIdProvider);
   }
 
   @Override
@@ -46,13 +47,13 @@ public String getName() {
   @Override
   public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
     try {
-      final String enclavePublicKey =
-          enclavePublicKeyProvider.getEnclaveKey(requestContext.getUser());
+      final String privacyUserId = privacyIdProvider.getPrivacyUserId(requestContext.getUser());
       final PrivateSubscribeRequest subscribeRequest =
-          getMapper().mapPrivateSubscribeRequest(requestContext, enclavePublicKey);
-
-      checkIfPrivacyGroupMatchesAuthenticatedEnclaveKey(
-          requestContext, subscribeRequest.getPrivacyGroupId());
+          getMapper().mapPrivateSubscribeRequest(requestContext, privacyUserId);
+      if (privacyController instanceof MultiTenancyPrivacyController) {
+        checkIfPrivacyGroupMatchesAuthenticatedPrivacyUserId(
+            requestContext, subscribeRequest.getPrivacyGroupId());
+      }
 
       final Long subscriptionId = subscriptionManager().subscribe(subscribeRequest);
 
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/PrivUnsubscribe.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/PrivUnsubscribe.java
index 21cbdb46f5f..513c15c64e9 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/PrivUnsubscribe.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/PrivUnsubscribe.java
@@ -16,7 +16,7 @@
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
@@ -26,6 +26,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.InvalidSubscriptionRequestException;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.PrivateUnsubscribeRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper;
+import org.hyperledger.besu.ethereum.privacy.MultiTenancyPrivacyController;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 
 public class PrivUnsubscribe extends AbstractPrivateSubscriptionMethod {
@@ -34,8 +35,8 @@ public PrivUnsubscribe(
       final SubscriptionManager subscriptionManager,
       final SubscriptionRequestMapper mapper,
       final PrivacyController privacyController,
-      final EnclavePublicKeyProvider enclavePublicKeyProvider) {
-    super(subscriptionManager, mapper, privacyController, enclavePublicKeyProvider);
+      final PrivacyIdProvider privacyIdProvider) {
+    super(subscriptionManager, mapper, privacyController, privacyIdProvider);
   }
 
   @Override
@@ -49,8 +50,10 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
       final PrivateUnsubscribeRequest unsubscribeRequest =
           getMapper().mapPrivateUnsubscribeRequest(requestContext);
 
-      checkIfPrivacyGroupMatchesAuthenticatedEnclaveKey(
-          requestContext, unsubscribeRequest.getPrivacyGroupId());
+      if (privacyController instanceof MultiTenancyPrivacyController) {
+        checkIfPrivacyGroupMatchesAuthenticatedPrivacyUserId(
+            requestContext, unsubscribeRequest.getPrivacyGroupId());
+      }
 
       final boolean unsubscribed = subscriptionManager().unsubscribe(unsubscribeRequest);
 
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/PrivateWebSocketMethodsFactory.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/PrivateWebSocketMethodsFactory.java
index 07b48f487a2..be15dcd084b 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/PrivateWebSocketMethodsFactory.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/PrivateWebSocketMethodsFactory.java
@@ -14,25 +14,21 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods;
 
-import org.hyperledger.besu.ethereum.api.jsonrpc.LatestNonceProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.privacy.ChainHeadPrivateNonceProvider;
-import org.hyperledger.besu.ethereum.privacy.DefaultPrivacyController;
+import org.hyperledger.besu.ethereum.privacy.FlexiblePrivacyController;
 import org.hyperledger.besu.ethereum.privacy.MultiTenancyPrivacyController;
+import org.hyperledger.besu.ethereum.privacy.PluginPrivacyController;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 import org.hyperledger.besu.ethereum.privacy.PrivateNonceProvider;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransactionSimulator;
-import org.hyperledger.besu.ethereum.privacy.markertransaction.FixedKeySigningPrivateMarkerTransactionFactory;
-import org.hyperledger.besu.ethereum.privacy.markertransaction.PrivateMarkerTransactionFactory;
-import org.hyperledger.besu.ethereum.privacy.markertransaction.RandomSigningPrivateMarkerTransactionFactory;
+import org.hyperledger.besu.ethereum.privacy.RestrictedDefaultPrivacyController;
 
 import java.math.BigInteger;
 import java.util.Collection;
@@ -45,72 +41,65 @@ public class PrivateWebSocketMethodsFactory {
   private final SubscriptionManager subscriptionManager;
   private final ProtocolSchedule protocolSchedule;
   private final BlockchainQueries blockchainQueries;
-  private final TransactionPool transactionPool;
 
   public PrivateWebSocketMethodsFactory(
       final PrivacyParameters privacyParameters,
       final SubscriptionManager subscriptionManager,
       final ProtocolSchedule protocolSchedule,
-      final BlockchainQueries blockchainQueries,
-      final TransactionPool transactionPool) {
+      final BlockchainQueries blockchainQueries) {
     this.privacyParameters = privacyParameters;
     this.subscriptionManager = subscriptionManager;
     this.protocolSchedule = protocolSchedule;
     this.blockchainQueries = blockchainQueries;
-    this.transactionPool = transactionPool;
   }
 
   public Collection<JsonRpcMethod> methods() {
     final SubscriptionRequestMapper subscriptionRequestMapper = new SubscriptionRequestMapper();
-    final EnclavePublicKeyProvider enclavePublicKeyProvider =
-        EnclavePublicKeyProvider.build(privacyParameters);
+    final PrivacyIdProvider privacyIdProvider = PrivacyIdProvider.build(privacyParameters);
     final PrivacyController privacyController = createPrivacyController();
 
     return Set.of(
         new PrivSubscribe(
-            subscriptionManager,
-            subscriptionRequestMapper,
-            privacyController,
-            enclavePublicKeyProvider),
+            subscriptionManager, subscriptionRequestMapper, privacyController, privacyIdProvider),
         new PrivUnsubscribe(
-            subscriptionManager,
-            subscriptionRequestMapper,
-            privacyController,
-            enclavePublicKeyProvider));
-  }
-
-  private PrivateMarkerTransactionFactory createPrivateMarkerTransactionFactory() {
-
-    final Address privateContractAddress =
-        Address.privacyPrecompiled(privacyParameters.getPrivacyAddress());
-
-    if (privacyParameters.getSigningKeyPair().isPresent()) {
-      return new FixedKeySigningPrivateMarkerTransactionFactory(
-          privateContractAddress,
-          new LatestNonceProvider(blockchainQueries, transactionPool.getPendingTransactions()),
-          privacyParameters.getSigningKeyPair().get());
-    }
-    return new RandomSigningPrivateMarkerTransactionFactory(privateContractAddress);
+            subscriptionManager, subscriptionRequestMapper, privacyController, privacyIdProvider));
   }
 
   private PrivacyController createPrivacyController() {
     final Optional<BigInteger> chainId = protocolSchedule.getChainId();
-    final DefaultPrivacyController defaultPrivacyController =
-        new DefaultPrivacyController(
-            blockchainQueries.getBlockchain(),
-            privacyParameters,
-            chainId,
-            createPrivateMarkerTransactionFactory(),
-            createPrivateTransactionSimulator(),
-            createPrivateNonceProvider(),
-            privacyParameters.getPrivateWorldStateReader());
-    return privacyParameters.isMultiTenancyEnabled()
-        ? new MultiTenancyPrivacyController(
-            defaultPrivacyController,
-            chainId,
-            privacyParameters.getEnclave(),
-            privacyParameters.isOnchainPrivacyGroupsEnabled())
-        : defaultPrivacyController;
+    if (privacyParameters.isPrivacyPluginEnabled()) {
+      return new PluginPrivacyController(
+          blockchainQueries.getBlockchain(),
+          privacyParameters,
+          chainId,
+          createPrivateTransactionSimulator(),
+          createPrivateNonceProvider(),
+          privacyParameters.getPrivateWorldStateReader());
+    } else {
+      final PrivacyController restrictedPrivacyController;
+      if (privacyParameters.isFlexiblePrivacyGroupsEnabled()) {
+        restrictedPrivacyController =
+            new FlexiblePrivacyController(
+                blockchainQueries.getBlockchain(),
+                privacyParameters,
+                chainId,
+                createPrivateTransactionSimulator(),
+                createPrivateNonceProvider(),
+                privacyParameters.getPrivateWorldStateReader());
+      } else {
+        restrictedPrivacyController =
+            new RestrictedDefaultPrivacyController(
+                blockchainQueries.getBlockchain(),
+                privacyParameters,
+                chainId,
+                createPrivateTransactionSimulator(),
+                createPrivateNonceProvider(),
+                privacyParameters.getPrivateWorldStateReader());
+      }
+      return privacyParameters.isMultiTenancyEnabled()
+          ? new MultiTenancyPrivacyController(restrictedPrivacyController)
+          : restrictedPrivacyController;
+    }
   }
 
   private PrivateTransactionSimulator createPrivateTransactionSimulator() {
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilder.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilder.java
index fce58e1ef3a..00c7b046bc3 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilder.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilder.java
@@ -59,7 +59,7 @@ private Subscription logsSubscription(
           connectionId,
           privateSubscribeRequest.getFilterParameter(),
           privateSubscribeRequest.getPrivacyGroupId(),
-          privateSubscribeRequest.getEnclavePublicKey());
+          privateSubscribeRequest.getPrivacyUserId());
     } else {
       return new LogsSubscription(subscriptionId, connectionId, request.getFilterParameter());
     }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManager.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManager.java
index 992ae42dc2e..899a54cc536 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManager.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManager.java
@@ -39,8 +39,8 @@
 import io.vertx.core.AbstractVerticle;
 import io.vertx.core.eventbus.Message;
 import io.vertx.core.json.Json;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The SubscriptionManager is responsible for managing subscriptions and sending messages to the
@@ -48,7 +48,7 @@
  */
 public class SubscriptionManager extends AbstractVerticle implements PrivateTransactionObserver {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(SubscriptionManager.class);
 
   public static final String EVENTBUS_REMOVE_SUBSCRIPTIONS_ADDRESS =
       "SubscriptionManager::removeSubscriptions";
@@ -186,7 +186,7 @@ private void processPrivateTransactionEvents(final PrivateTransactionEvent event
     subscriptionsOfType(SubscriptionType.LOGS, PrivateLogsSubscription.class).stream()
         .filter(
             subscription ->
-                subscription.getEnclavePublicKey().equals(event.getEnclavePublicKey())
+                subscription.getPrivacyUserId().equals(event.getPrivacyUserId())
                     && subscription.getPrivacyGroupId().equals(event.getPrivacyGroupId()))
         .forEach(
             subscription ->
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionService.java
index d2744468633..780caef5043 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionService.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionService.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.blockheaders;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResult;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager;
@@ -21,8 +22,7 @@
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
 import org.hyperledger.besu.ethereum.chain.BlockAddedObserver;
-import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -46,8 +46,8 @@ public NewBlockHeadersSubscriptionService(
   @Override
   public void onBlockAdded(final BlockAddedEvent event) {
     if (event.isNewCanonicalHead()) {
-      final List<Block> blocks = new ArrayList<>();
-      Block blockPtr = event.getBlock();
+      final List<BlockHeader> blocks = new ArrayList<>();
+      BlockHeader blockPtr = event.getBlock().getHeader();
 
       while (!blockPtr.getHash().equals(event.getCommonAncestorHash())) {
         blocks.add(blockPtr);
@@ -55,7 +55,7 @@ public void onBlockAdded(final BlockAddedEvent event) {
         blockPtr =
             blockchainQueries
                 .getBlockchain()
-                .getBlockByHash(blockPtr.getHeader().getParentHash())
+                .getBlockHeader(blockPtr.getParentHash())
                 .orElseThrow(() -> new IllegalStateException("The block was on a orphaned chain."));
       }
 
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscriptionService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscriptionService.java
index 36b3cd8c721..960c76f24c0 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscriptionService.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscriptionService.java
@@ -60,7 +60,8 @@ public void accept(final LogWithMetadata logWithMetadata) {
   public void checkPrivateLogs(final BlockAddedEvent event) {
     privacyQueries.ifPresent(
         pq ->
-            subscriptionManager.subscriptionsOfType(SubscriptionType.LOGS, LogsSubscription.class)
+            subscriptionManager
+                .subscriptionsOfType(SubscriptionType.LOGS, LogsSubscription.class)
                 .stream()
                 .filter(PrivateLogsSubscription.class::isInstance)
                 .map(PrivateLogsSubscription.class::cast)
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/logs/PrivateLogsSubscription.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/logs/PrivateLogsSubscription.java
index 52edf243d43..550b98eca08 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/logs/PrivateLogsSubscription.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/logs/PrivateLogsSubscription.java
@@ -19,24 +19,24 @@
 public class PrivateLogsSubscription extends LogsSubscription {
 
   private final String privacyGroupId;
-  private final String enclavePublicKey;
+  private final String privacyUserId;
 
   public PrivateLogsSubscription(
       final Long subscriptionId,
       final String connectionId,
       final FilterParameter filterParameter,
       final String privacyGroupId,
-      final String enclavePublicKey) {
+      final String privacyUserId) {
     super(subscriptionId, connectionId, filterParameter);
     this.privacyGroupId = privacyGroupId;
-    this.enclavePublicKey = enclavePublicKey;
+    this.privacyUserId = privacyUserId;
   }
 
   public String getPrivacyGroupId() {
     return privacyGroupId;
   }
 
-  public String getEnclavePublicKey() {
-    return enclavePublicKey;
+  public String getPrivacyUserId() {
+    return privacyUserId;
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDetailResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDetailResult.java
index dcdf2ed4c78..bcd87a849e8 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDetailResult.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDetailResult.java
@@ -51,7 +51,7 @@ public class PendingTransactionDetailResult implements JsonRpcResult {
   public PendingTransactionDetailResult(final Transaction tx) {
     this.from = tx.getSender().toString();
     this.gas = Quantity.create(tx.getGasLimit());
-    this.gasPrice = Quantity.create(tx.getGasPrice());
+    this.gasPrice = tx.getGasPrice().map(Quantity::create).orElse(null);
     this.hash = tx.getHash().toString();
     this.input = tx.getPayload().toString();
     this.nonce = Quantity.create(tx.getNonce());
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDroppedSubscriptionService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDroppedSubscriptionService.java
index 7b97b9b1a07..60321836443 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDroppedSubscriptionService.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDroppedSubscriptionService.java
@@ -14,10 +14,10 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.pending;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.Subscription;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactionDroppedListener;
 
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionResult.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionResult.java
index aebdc724e0d..dddfdd0efa6 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionResult.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionResult.java
@@ -14,8 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.pending;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.JsonRpcResult;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 import com.fasterxml.jackson.annotation.JsonValue;
 
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionService.java
index 26ce0ad10ab..c015a7bdddc 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionService.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionService.java
@@ -18,11 +18,11 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactionListener;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactionAddedListener;
 
 import java.util.List;
 
-public class PendingTransactionSubscriptionService implements PendingTransactionListener {
+public class PendingTransactionSubscriptionService implements PendingTransactionAddedListener {
 
   private final SubscriptionManager subscriptionManager;
 
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/PrivateSubscribeRequest.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/PrivateSubscribeRequest.java
index fc1fbd430a5..f87f42ace38 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/PrivateSubscribeRequest.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/PrivateSubscribeRequest.java
@@ -21,7 +21,7 @@
 public class PrivateSubscribeRequest extends SubscribeRequest {
 
   private final String privacyGroupId;
-  private final String enclavePublicKey;
+  private final String privacyUserId;
 
   public PrivateSubscribeRequest(
       final SubscriptionType subscriptionType,
@@ -29,18 +29,18 @@ public PrivateSubscribeRequest(
       final Boolean includeTransaction,
       final String connectionId,
       final String privacyGroupId,
-      final String enclavePublicKey) {
+      final String privacyUserId) {
     super(subscriptionType, filterParameter, includeTransaction, connectionId);
     this.privacyGroupId = privacyGroupId;
-    this.enclavePublicKey = enclavePublicKey;
+    this.privacyUserId = privacyUserId;
   }
 
   public String getPrivacyGroupId() {
     return privacyGroupId;
   }
 
-  public String getEnclavePublicKey() {
-    return enclavePublicKey;
+  public String getPrivacyUserId() {
+    return privacyUserId;
   }
 
   @Override
@@ -55,8 +55,7 @@ public boolean equals(final Object o) {
       return false;
     }
     final PrivateSubscribeRequest that = (PrivateSubscribeRequest) o;
-    return privacyGroupId.equals(that.privacyGroupId)
-        && enclavePublicKey.equals(that.enclavePublicKey);
+    return privacyGroupId.equals(that.privacyGroupId) && privacyUserId.equals(that.privacyUserId);
   }
 
   @Override
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapper.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapper.java
index 41cf71c0578..b3e76fead87 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapper.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapper.java
@@ -89,7 +89,7 @@ public UnsubscribeRequest mapUnsubscribeRequest(final JsonRpcRequestContext json
   }
 
   public PrivateSubscribeRequest mapPrivateSubscribeRequest(
-      final JsonRpcRequestContext jsonRpcRequestContext, final String enclavePublicKey)
+      final JsonRpcRequestContext jsonRpcRequestContext, final String privacyUserId)
       throws InvalidSubscriptionRequestException {
     try {
       final WebSocketRpcRequest webSocketRpcRequestBody = validateRequest(jsonRpcRequestContext);
@@ -109,7 +109,7 @@ public PrivateSubscribeRequest mapPrivateSubscribeRequest(
                 null,
                 webSocketRpcRequestBody.getConnectionId(),
                 privacyGroupId,
-                enclavePublicKey);
+                privacyUserId);
           }
         default:
           throw new InvalidSubscriptionRequestException(
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/BackendQuery.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/BackendQuery.java
index 6c6e152ad4d..e3209c499df 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/BackendQuery.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/BackendQuery.java
@@ -20,11 +20,11 @@
 import java.util.concurrent.Callable;
 import java.util.function.Supplier;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class BackendQuery {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(BackendQuery.class);
 
   public static <T> T runIfAlive(final Callable<T> task, final Supplier<Boolean> alive)
       throws Exception {
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/BlockWithMetadata.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/BlockWithMetadata.java
index 6551e8b1611..def3aaea436 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/BlockWithMetadata.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/BlockWithMetadata.java
@@ -16,8 +16,10 @@
 
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
 
 import java.util.List;
+import java.util.Optional;
 
 public class BlockWithMetadata<T, O> {
 
@@ -26,6 +28,7 @@ public class BlockWithMetadata<T, O> {
   private final List<O> ommers;
   private final Difficulty totalDifficulty;
   private final int size;
+  private final Optional<List<Withdrawal>> withdrawals;
 
   /**
    * @param header The block header
@@ -40,11 +43,22 @@ public BlockWithMetadata(
       final List<O> ommers,
       final Difficulty totalDifficulty,
       final int size) {
+    this(header, transactions, ommers, totalDifficulty, size, Optional.empty());
+  }
+
+  public BlockWithMetadata(
+      final BlockHeader header,
+      final List<T> transactions,
+      final List<O> ommers,
+      final Difficulty totalDifficulty,
+      final int size,
+      final Optional<List<Withdrawal>> withdrawals) {
     this.header = header;
     this.transactions = transactions;
     this.ommers = ommers;
     this.totalDifficulty = totalDifficulty;
     this.size = size;
+    this.withdrawals = withdrawals;
   }
 
   public BlockHeader getHeader() {
@@ -66,4 +80,8 @@ public Difficulty getTotalDifficulty() {
   public int getSize() {
     return size;
   }
+
+  public Optional<List<Withdrawal>> getWithdrawals() {
+    return withdrawals;
+  }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueries.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueries.java
index a69bbed1936..96e01fdb1b2 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueries.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueries.java
@@ -17,31 +17,30 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static org.hyperledger.besu.ethereum.api.query.cache.TransactionLogBloomCacher.BLOCKS_PER_BLOOM_CACHE;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.ApiConfiguration;
 import org.hyperledger.besu.ethereum.api.ImmutableApiConfiguration;
-import org.hyperledger.besu.ethereum.api.handlers.RpcMethodTimeoutException;
 import org.hyperledger.besu.ethereum.api.query.cache.TransactionLogBloomCacher;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.chain.TransactionLocation;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
-import org.hyperledger.besu.ethereum.core.LogsBloomFilter;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldState;
 import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
 
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.RandomAccessFile;
+import java.math.BigInteger;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -49,24 +48,26 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.LongStream;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.units.bigints.UInt256;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class BlockchainQueries {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(BlockchainQueries.class);
 
   private final WorldStateArchive worldStateArchive;
   private final Blockchain blockchain;
   private final Optional<Path> cachePath;
   private final Optional<TransactionLogBloomCacher> transactionLogBloomCacher;
+  private final Optional<EthScheduler> ethScheduler;
   private final ApiConfiguration apiConfig;
 
   public BlockchainQueries(final Blockchain blockchain, final WorldStateArchive worldStateArchive) {
@@ -102,6 +103,7 @@ public BlockchainQueries(
     this.blockchain = blockchain;
     this.worldStateArchive = worldStateArchive;
     this.cachePath = cachePath;
+    this.ethScheduler = scheduler;
     this.transactionLogBloomCacher =
         (cachePath.isPresent() && scheduler.isPresent())
             ? Optional.of(
@@ -141,6 +143,33 @@ public long headBlockNumber() {
     return blockchain.getChainHeadBlockNumber();
   }
 
+  /**
+   * Return the header of the head of the chain.
+   *
+   * @return The header of the head of the chain.
+   */
+  public BlockHeader headBlockHeader() {
+    return blockchain.getChainHeadHeader();
+  }
+
+  /**
+   * Return the header of the last finalized block.
+   *
+   * @return The header of the last finalized block.
+   */
+  public Optional<BlockHeader> finalizedBlockHeader() {
+    return blockchain.getFinalized().flatMap(blockchain::getBlockHeader);
+  }
+
+  /**
+   * Return the header of the last safe block.
+   *
+   * @return The header of the last safe block.
+   */
+  public Optional<BlockHeader> safeBlockHeader() {
+    return blockchain.getSafeBlock().flatMap(blockchain::getBlockHeader);
+  }
+
   /**
    * Determines the block header for the address associated with this storage index.
    *
@@ -151,8 +180,24 @@ public long headBlockNumber() {
    */
   public Optional<UInt256> storageAt(
       final Address address, final UInt256 storageIndex, final long blockNumber) {
+    final Hash blockHash =
+        getBlockHeaderByNumber(blockNumber).map(BlockHeader::getHash).orElse(Hash.EMPTY);
+
+    return storageAt(address, storageIndex, blockHash);
+  }
+
+  /**
+   * Determines the block header for the address associated with this storage index.
+   *
+   * @param address The address of the account that owns the storage being queried.
+   * @param storageIndex The storage index whose value is being retrieved.
+   * @param blockHash The blockHash that is being queried.
+   * @return The value at the storage index being queried.
+   */
+  public Optional<UInt256> storageAt(
+      final Address address, final UInt256 storageIndex, final Hash blockHash) {
     return fromAccount(
-        address, blockNumber, account -> account.getStorageValue(storageIndex), UInt256.ZERO);
+        address, blockHash, account -> account.getStorageValue(storageIndex), UInt256.ZERO);
   }
 
   /**
@@ -163,7 +208,21 @@ public Optional<UInt256> storageAt(
    * @return The balance of the account in Wei.
    */
   public Optional<Wei> accountBalance(final Address address, final long blockNumber) {
-    return fromAccount(address, blockNumber, Account::getBalance, Wei.ZERO);
+    final Hash blockHash =
+        getBlockHeaderByNumber(blockNumber).map(BlockHeader::getHash).orElse(Hash.EMPTY);
+
+    return accountBalance(address, blockHash);
+  }
+
+  /**
+   * Returns the balance of the given account at a specific block hash.
+   *
+   * @param address The address of the account being queried.
+   * @param blockHash The block hash being queried.
+   * @return The balance of the account in Wei.
+   */
+  public Optional<Wei> accountBalance(final Address address, final Hash blockHash) {
+    return fromAccount(address, blockHash, Account::getBalance, Wei.ZERO);
   }
 
   /**
@@ -174,7 +233,21 @@ public Optional<Wei> accountBalance(final Address address, final long blockNumbe
    * @return The code associated with this address.
    */
   public Optional<Bytes> getCode(final Address address, final long blockNumber) {
-    return fromAccount(address, blockNumber, Account::getCode, Bytes.EMPTY);
+    final Hash blockHash =
+        getBlockHeaderByNumber(blockNumber).map(BlockHeader::getHash).orElse(Hash.EMPTY);
+
+    return getCode(address, blockHash);
+  }
+
+  /**
+   * Retrieves the code associated with the given account at a particular block hash.
+   *
+   * @param address The account address being queried.
+   * @param blockHash The hash of the block to be checked.
+   * @return The code associated with this address.
+   */
+  public Optional<Bytes> getCode(final Address address, final Hash blockHash) {
+    return fromAccount(address, blockHash, Account::getCode, Bytes.EMPTY);
   }
 
   /**
@@ -218,8 +291,22 @@ public Integer getTransactionCount(final Hash blockHeaderHash) {
    * @return The number of transactions sent from the given address.
    */
   public long getTransactionCount(final Address address, final long blockNumber) {
-    return getWorldState(blockNumber)
-        .map(worldState -> worldState.get(address))
+    final Hash blockHash =
+        getBlockHeaderByNumber(blockNumber).map(BlockHeader::getHash).orElse(Hash.EMPTY);
+
+    return getTransactionCount(address, blockHash);
+  }
+
+  /**
+   * Returns the number of transactions sent from the given address in the block at the given hash.
+   *
+   * @param address The address whose sent transactions we want to count.
+   * @param blockHash The hash of the block being queried.
+   * @return The number of transactions sent from the given address.
+   */
+  public long getTransactionCount(final Address address, final Hash blockHash) {
+    return getAndMapWorldState(
+            blockHash, worldState -> Optional.ofNullable(worldState.get(address)))
         .map(Account::getNonce)
         .orElse(0L);
   }
@@ -325,18 +412,26 @@ public Optional<BlockWithMetadata<TransactionWithMetadata, Hash>> blockByHash(
                             blockchain
                                 .getTotalDifficultyByHash(blockHeaderHash)
                                 .map(
-                                    (td) -> {
+                                    td -> {
                                       final List<Transaction> txs = body.getTransactions();
                                       final List<TransactionWithMetadata> formattedTxs =
                                           formatTransactions(
-                                              txs, header.getNumber(), blockHeaderHash);
+                                              txs,
+                                              header.getNumber(),
+                                              header.getBaseFee(),
+                                              blockHeaderHash);
                                       final List<Hash> ommers =
                                           body.getOmmers().stream()
                                               .map(BlockHeader::getHash)
                                               .collect(Collectors.toList());
                                       final int size = new Block(header, body).calculateSize();
                                       return new BlockWithMetadata<>(
-                                          header, formattedTxs, ommers, td, size);
+                                          header,
+                                          formattedTxs,
+                                          ommers,
+                                          td,
+                                          size,
+                                          body.getWithdrawals());
                                     })));
   }
 
@@ -380,7 +475,7 @@ public Optional<BlockWithMetadata<Hash, Hash>> blockByHashWithTxHashes(
                             blockchain
                                 .getTotalDifficultyByHash(blockHeaderHash)
                                 .map(
-                                    (td) -> {
+                                    td -> {
                                       final List<Hash> txs =
                                           body.getTransactions().stream()
                                               .map(Transaction::getHash)
@@ -390,7 +485,8 @@ public Optional<BlockWithMetadata<Hash, Hash>> blockByHashWithTxHashes(
                                               .map(BlockHeader::getHash)
                                               .collect(Collectors.toList());
                                       final int size = new Block(header, body).calculateSize();
-                                      return new BlockWithMetadata<>(header, txs, ommers, td, size);
+                                      return new BlockWithMetadata<>(
+                                          header, txs, ommers, td, size, body.getWithdrawals());
                                     })));
   }
 
@@ -447,7 +543,11 @@ public Optional<TransactionWithMetadata> transactionByHash(final Hash transactio
     final Transaction transaction = blockchain.getTransactionByHash(transactionHash).orElseThrow();
     return Optional.of(
         new TransactionWithMetadata(
-            transaction, header.getNumber(), blockHash, loc.getTransactionIndex()));
+            transaction,
+            header.getNumber(),
+            header.getBaseFee(),
+            blockHash,
+            loc.getTransactionIndex()));
   }
 
   /**
@@ -498,7 +598,7 @@ private TransactionWithMetadata transactionByHeaderAndIndex(
       return null;
     }
     return new TransactionWithMetadata(
-        txs.get(txIndex), header.getNumber(), blockHeaderHash, txIndex);
+        txs.get(txIndex), header.getNumber(), header.getBaseFee(), blockHeaderHash, txIndex);
   }
 
   public Optional<TransactionLocation> transactionLocationByHash(final Hash transactionHash) {
@@ -521,11 +621,12 @@ public Optional<TransactionReceiptWithMetadata> transactionReceiptByTransactionH
     // getTransactionLocation should not return if the TX or block doesn't exist, so throwing
     // on a missing optional is appropriate.
     final TransactionLocation location = maybeLocation.get();
-    final BlockBody blockBody = blockchain.getBlockBody(location.getBlockHash()).orElseThrow();
-    final Transaction transaction = blockBody.getTransactions().get(location.getTransactionIndex());
+    final Block block = blockchain.getBlockByHash(location.getBlockHash()).orElseThrow();
+    final Transaction transaction =
+        block.getBody().getTransactions().get(location.getTransactionIndex());
 
     final Hash blockhash = location.getBlockHash();
-    final BlockHeader header = blockchain.getBlockHeader(blockhash).orElseThrow();
+    final BlockHeader header = block.getHeader();
     final List<TransactionReceipt> transactionReceipts =
         blockchain.getTxReceipts(blockhash).orElseThrow();
     final TransactionReceipt transactionReceipt =
@@ -545,6 +646,7 @@ public Optional<TransactionReceiptWithMetadata> transactionReceiptByTransactionH
             transactionHash,
             location.getTransactionIndex(),
             gasUsed,
+            header.getBaseFee(),
             blockhash,
             header.getNumber()));
   }
@@ -604,12 +706,8 @@ public List<LogWithMetadata> matchingLogs(
         currentStep = nextStep;
       }
       return result;
-    } catch (final RpcMethodTimeoutException e) {
-      LOG.error("Error retrieving matching logs", e);
-      throw e;
     } catch (final Exception e) {
-      LOG.error("Error retrieving matching logs", e);
-      throw new RuntimeException(e);
+      throw new IllegalStateException("Error retrieving matching logs", e);
     }
   }
 
@@ -673,43 +771,33 @@ private List<LogWithMetadata> matchingLogsCached(
   public List<LogWithMetadata> matchingLogs(
       final Hash blockHash, final LogsQuery query, final Supplier<Boolean> isQueryAlive) {
     try {
-      final Optional<BlockHeader> blockHeader =
-          BackendQuery.runIfAlive(
-              "matchingLogs - getBlockHeader",
-              () -> blockchain.getBlockHeader(blockHash),
-              isQueryAlive);
+      final Optional<BlockHeader> blockHeader = getBlockHeader(blockHash, isQueryAlive);
       if (blockHeader.isEmpty()) {
         return Collections.emptyList();
       }
       // receipts and transactions should exist if the header exists, so throwing is ok.
-      final List<TransactionReceipt> receipts =
-          BackendQuery.runIfAlive(
-              "matchingLogs - getTxReceipts",
-              () -> blockchain.getTxReceipts(blockHash).orElseThrow(),
-              isQueryAlive);
-      final List<Transaction> transactions =
-          BackendQuery.runIfAlive(
-              "matchingLogs - getBlockBody",
-              () -> blockchain.getBlockBody(blockHash).orElseThrow().getTransactions(),
-              isQueryAlive);
+      final List<TransactionReceipt> receipts = getReceipts(blockHash, isQueryAlive);
+      final List<Transaction> transactions = getTransactions(blockHash, isQueryAlive);
       final long number = blockHeader.get().getNumber();
-      final boolean removed =
-          BackendQuery.runIfAlive(
-              "matchingLogs - blockIsOnCanonicalChain",
-              () -> !blockchain.blockIsOnCanonicalChain(blockHash),
-              isQueryAlive);
+      final boolean removed = getRemoved(blockHash, isQueryAlive);
+
+      final AtomicInteger logIndexOffset = new AtomicInteger();
       return IntStream.range(0, receipts.size())
           .mapToObj(
               i -> {
                 try {
                   BackendQuery.stopIfExpired(isQueryAlive);
-                  return LogWithMetadata.generate(
-                      receipts.get(i),
-                      number,
-                      blockHash,
-                      transactions.get(i).getHash(),
-                      i,
-                      removed);
+                  final List<LogWithMetadata> result =
+                      LogWithMetadata.generate(
+                          logIndexOffset.intValue(),
+                          receipts.get(i),
+                          number,
+                          blockHash,
+                          transactions.get(i).getHash(),
+                          i,
+                          removed);
+                  logIndexOffset.addAndGet(receipts.get(i).getLogs().size());
+                  return result;
                 } catch (final Exception e) {
                   throw new RuntimeException(e);
                 }
@@ -722,15 +810,92 @@ public List<LogWithMetadata> matchingLogs(
     }
   }
 
+  public List<LogWithMetadata> matchingLogs(
+      final Hash blockHash,
+      final TransactionWithMetadata transactionWithMetaData,
+      final Supplier<Boolean> isQueryAlive) {
+    if (transactionWithMetaData.getTransactionIndex().isEmpty()) {
+      throw new RuntimeException(
+          "Cannot find logs because transaction "
+              + transactionWithMetaData.getTransaction().getHash()
+              + " does not have a transaction index");
+    }
+
+    try {
+      final Optional<BlockHeader> blockHeader = getBlockHeader(blockHash, isQueryAlive);
+      if (blockHeader.isEmpty()) {
+        return Collections.emptyList();
+      }
+      // receipts and transactions should exist if the header exists, so throwing is ok.
+      final List<TransactionReceipt> receipts = getReceipts(blockHash, isQueryAlive);
+      final List<Transaction> transactions = getTransactions(blockHash, isQueryAlive);
+      final long number = blockHeader.get().getNumber();
+      final boolean removed = getRemoved(blockHash, isQueryAlive);
+
+      final int transactionIndex = transactionWithMetaData.getTransactionIndex().get();
+      final int logIndexOffset =
+          logIndexOffset(
+              transactionWithMetaData.getTransaction().getHash(), receipts, transactions);
+
+      return LogWithMetadata.generate(
+          logIndexOffset,
+          receipts.get(transactionIndex),
+          number,
+          blockHash,
+          transactions.get(transactionIndex).getHash(),
+          transactionIndex,
+          removed);
+
+    } catch (final Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
   /**
-   * Returns the world state for the corresponding block number
+   * Wraps an operation on MutableWorldState with try-with-resources the corresponding block hash.
+   * This method provides access to the worldstate via a mapper function in order to ensure all of
+   * the uses of the MutableWorldState are subsequently closed, via the try-with-resources block.
    *
+   * @param <U> return type of the operation on the MutableWorldState
+   * @param blockHash the block hash
+   * @param mapper Function which performs an operation on a MutableWorldState
+   * @return the world state at the block number
+   */
+  public <U> Optional<U> getAndMapWorldState(
+      final Hash blockHash, final Function<MutableWorldState, ? extends Optional<U>> mapper) {
+
+    return blockchain
+        .getBlockHeader(blockHash)
+        .flatMap(
+            blockHeader -> {
+              try (var ws = worldStateArchive.getMutable(blockHeader, false).orElse(null)) {
+                if (ws != null) {
+                  return mapper.apply(ws);
+                }
+              } catch (Exception ex) {
+                LOG.error("failed worldstate query for " + blockHash.toShortHexString(), ex);
+              }
+              LOG.atDebug()
+                  .setMessage("Failed to find worldstate for {}")
+                  .addArgument(blockHeader.toLogString())
+                  .log();
+              return Optional.empty();
+            });
+  }
+
+  /**
+   * Wraps an operation on MutableWorldState with try-with-resources the corresponding block number
+   *
+   * @param <U> return type of the operation on the MutableWorldState
    * @param blockNumber the block number
+   * @param mapper Function which performs an operation on a MutableWorldState returning type U
    * @return the world state at the block number
    */
-  public Optional<MutableWorldState> getWorldState(final long blockNumber) {
-    final Optional<BlockHeader> header = blockchain.getBlockHeader(blockNumber);
-    return header.map(BlockHeader::getStateRoot).flatMap(worldStateArchive::getMutable);
+  public <U> Optional<U> getAndMapWorldState(
+      final long blockNumber, final Function<MutableWorldState, ? extends Optional<U>> mapper) {
+    final Hash blockHash =
+        getBlockHeaderByNumber(blockNumber).map(BlockHeader::getHash).orElse(Hash.EMPTY);
+    return getAndMapWorldState(blockHash, mapper);
   }
 
   public Optional<Long> gasPrice() {
@@ -746,7 +911,8 @@ public Optional<Long> gasPrice() {
                         .orElseThrow(
                             () -> new IllegalStateException("Could not retrieve block #" + l)))
             .flatMap(Collection::stream)
-            .mapToLong(t -> t.getGasPrice().toLong())
+            .filter(t -> t.getGasPrice().isPresent())
+            .mapToLong(t -> t.getGasPrice().get().toLong())
             .sorted()
             .toArray();
     return (gasCollection == null || gasCollection.length == 0)
@@ -762,31 +928,55 @@ public Optional<Long> gasPrice() {
                             (int) ((gasCollection.length) * apiConfig.getGasPriceFraction()))])));
   }
 
-  private <T> Optional<T> fromWorldState(
-      final long blockNumber, final Function<WorldState, T> getter) {
-    if (outsideBlockchainRange(blockNumber)) {
-      return Optional.empty();
-    }
-    return getWorldState(blockNumber).map(getter);
+  public Optional<Wei> gasPriorityFee() {
+    final long blockHeight = headBlockNumber();
+    final BigInteger[] gasCollection =
+        LongStream.range(Math.max(0, blockHeight - apiConfig.getGasPriceBlocks()), blockHeight)
+            .mapToObj(
+                l ->
+                    blockchain
+                        .getBlockByNumber(l)
+                        .map(Block::getBody)
+                        .map(BlockBody::getTransactions)
+                        .orElseThrow(
+                            () -> new IllegalStateException("Could not retrieve block #" + l)))
+            .flatMap(Collection::stream)
+            .filter(t -> t.getMaxPriorityFeePerGas().isPresent())
+            .map(t -> t.getMaxPriorityFeePerGas().get().toBigInteger())
+            .sorted(BigInteger::compareTo)
+            .toArray(BigInteger[]::new);
+    return (gasCollection.length == 0)
+        ? Optional.empty()
+        : Optional.of(
+            Wei.of(
+                gasCollection[
+                    Math.min(
+                        gasCollection.length - 1,
+                        (int) ((gasCollection.length) * apiConfig.getGasPriceFraction()))]));
   }
 
   private <T> Optional<T> fromAccount(
       final Address address,
-      final long blockNumber,
+      final Hash blockHash,
       final Function<Account, T> getter,
       final T noAccountValue) {
-    return fromWorldState(
-        blockNumber,
+    return getAndMapWorldState(
+        blockHash,
         worldState ->
-            Optional.ofNullable(worldState.get(address)).map(getter).orElse(noAccountValue));
+            Optional.ofNullable(worldState.get(address))
+                .map(getter)
+                .or(() -> Optional.ofNullable(noAccountValue)));
   }
 
   private List<TransactionWithMetadata> formatTransactions(
-      final List<Transaction> txs, final long blockNumber, final Hash blockHash) {
+      final List<Transaction> txs,
+      final long blockNumber,
+      final Optional<Wei> baseFee,
+      final Hash blockHash) {
     final int count = txs.size();
     final List<TransactionWithMetadata> result = new ArrayList<>(count);
     for (int i = 0; i < count; i++) {
-      result.add(new TransactionWithMetadata(txs.get(i), blockNumber, blockHash, i));
+      result.add(new TransactionWithMetadata(txs.get(i), blockNumber, baseFee, blockHash, i));
     }
     return result;
   }
@@ -794,4 +984,54 @@ private List<TransactionWithMetadata> formatTransactions(
   private boolean outsideBlockchainRange(final long blockNumber) {
     return blockNumber > headBlockNumber() || blockNumber < BlockHeader.GENESIS_BLOCK_NUMBER;
   }
+
+  private Boolean getRemoved(final Hash blockHash, final Supplier<Boolean> isQueryAlive)
+      throws Exception {
+    return BackendQuery.runIfAlive(
+        "matchingLogs - blockIsOnCanonicalChain",
+        () -> !blockchain.blockIsOnCanonicalChain(blockHash),
+        isQueryAlive);
+  }
+
+  private List<Transaction> getTransactions(
+      final Hash blockHash, final Supplier<Boolean> isQueryAlive) throws Exception {
+    return BackendQuery.runIfAlive(
+        "matchingLogs - getBlockBody",
+        () -> blockchain.getBlockBody(blockHash).orElseThrow().getTransactions(),
+        isQueryAlive);
+  }
+
+  private List<TransactionReceipt> getReceipts(
+      final Hash blockHash, final Supplier<Boolean> isQueryAlive) throws Exception {
+    return BackendQuery.runIfAlive(
+        "matchingLogs - getTxReceipts",
+        () -> blockchain.getTxReceipts(blockHash).orElseThrow(),
+        isQueryAlive);
+  }
+
+  private Optional<BlockHeader> getBlockHeader(
+      final Hash blockHash, final Supplier<Boolean> isQueryAlive) throws Exception {
+    return BackendQuery.runIfAlive(
+        "matchingLogs - getBlockHeader", () -> blockchain.getBlockHeader(blockHash), isQueryAlive);
+  }
+
+  private int logIndexOffset(
+      final Hash transactionHash,
+      final List<TransactionReceipt> receipts,
+      final List<Transaction> transactions) {
+    int logIndexOffset = 0;
+    for (int i = 0; i < receipts.size(); i++) {
+      if (transactions.get(i).getHash().equals(transactionHash)) {
+        break;
+      }
+
+      logIndexOffset += receipts.get(i).getLogs().size();
+    }
+
+    return logIndexOffset;
+  }
+
+  public Optional<EthScheduler> getEthScheduler() {
+    return ethScheduler;
+  }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/LogsQuery.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/LogsQuery.java
index 526f0c9c9ad..79d5f0246c5 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/LogsQuery.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/LogsQuery.java
@@ -19,11 +19,11 @@
 import static java.util.Collections.emptyList;
 import static java.util.stream.Collectors.toUnmodifiableList;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TopicsDeserializer;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Log;
-import org.hyperledger.besu.ethereum.core.LogTopic;
-import org.hyperledger.besu.ethereum.core.LogsBloomFilter;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.log.LogTopic;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/PrivacyQueries.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/PrivacyQueries.java
index 697e3efbfaf..604bad0c9bc 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/PrivacyQueries.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/PrivacyQueries.java
@@ -14,9 +14,9 @@
  */
 package org.hyperledger.besu.ethereum.api.query;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.TransactionLocation;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransactionReceipt;
 import org.hyperledger.besu.ethereum.privacy.PrivateWorldStateReader;
@@ -26,6 +26,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.LongStream;
@@ -70,7 +71,7 @@ public List<LogWithMetadata> matchingLogs(
 
     final List<Hash> pmtHashList =
         privateTransactionMetadataList.stream()
-            .map(PrivateTransactionMetadata::getPrivacyMarkerTransactionHash)
+            .map(PrivateTransactionMetadata::getPrivateMarkerTransactionHash)
             .collect(Collectors.toList());
 
     final List<PrivateTransactionReceipt> privateTransactionReceiptList =
@@ -83,16 +84,24 @@ public List<LogWithMetadata> matchingLogs(
     final long blockNumber = blockHeader.get().getNumber();
     final boolean removed = !blockchainQueries.blockIsOnCanonicalChain(blockHash);
 
+    final AtomicInteger logIndexOffset = new AtomicInteger();
     return IntStream.range(0, privateTransactionReceiptList.size())
         .mapToObj(
-            i ->
-                LogWithMetadata.generate(
-                    privateTransactionReceiptList.get(i),
-                    blockNumber,
-                    blockHash,
-                    privateTransactionMetadataList.get(i).getPrivacyMarkerTransactionHash(),
-                    findPMTIndex(pmtHashList.get(i)),
-                    removed))
+            i -> {
+              final List<LogWithMetadata> result =
+                  LogWithMetadata.generate(
+                      logIndexOffset.intValue(),
+                      privateTransactionReceiptList.get(i),
+                      blockNumber,
+                      blockHash,
+                      privateTransactionMetadataList.get(i).getPrivateMarkerTransactionHash(),
+                      findPMTIndex(pmtHashList.get(i)),
+                      removed);
+
+              logIndexOffset.addAndGet(privateTransactionReceiptList.get(i).getLogs().size());
+
+              return result;
+            })
         .flatMap(Collection::stream)
         .filter(query::matches)
         .collect(Collectors.toList());
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/StateBackupService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/StateBackupService.java
index 080229cdfa8..6ae5125bc5f 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/StateBackupService.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/StateBackupService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -20,6 +20,7 @@
 import static com.google.common.base.Preconditions.checkState;
 
 import org.hyperledger.besu.config.JsonUtil;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
@@ -28,12 +29,11 @@
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.trie.Node;
-import org.hyperledger.besu.ethereum.trie.StoredMerklePatriciaTrie;
 import org.hyperledger.besu.ethereum.trie.TrieIterator;
 import org.hyperledger.besu.ethereum.trie.TrieIterator.State;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
 import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
-import org.hyperledger.besu.plugin.data.Hash;
 import org.hyperledger.besu.util.io.RollingFileWriter;
 
 import java.io.IOException;
@@ -52,14 +52,14 @@
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class StateBackupService {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(StateBackupService.class);
   private static final Bytes ACCOUNT_END_MARKER;
 
   static {
@@ -180,24 +180,19 @@ private Path receiptFileName(final int fileNumber, final boolean compressed) {
   }
 
   private BackupStatus backup(final long block, final boolean compress) throws IOException {
-    try {
-      checkArgument(
-          block >= 0 && block <= blockchain.getChainHeadBlockNumber(),
-          "Backup Block must be within blockchain");
-      backupStatus.targetBlock = block;
-      backupStatus.compressed = compress;
-      backupStatus.currentAccount = Bytes32.ZERO;
-
-      backupChainData();
-      backupLeaves();
-
-      writeManifest();
-
-      return backupStatus;
-    } catch (final Throwable t) {
-      LOG.error("Unexpected error", t);
-      throw t;
-    }
+    checkArgument(
+        block >= 0 && block <= blockchain.getChainHeadBlockNumber(),
+        "Backup Block must be within blockchain");
+    backupStatus.targetBlock = block;
+    backupStatus.compressed = compress;
+    backupStatus.currentAccount = Bytes32.ZERO;
+
+    backupChainData();
+    backupLeaves();
+
+    writeManifest();
+
+    return backupStatus;
   }
 
   private void writeManifest() throws IOException {
@@ -251,7 +246,7 @@ private TrieIterator.State visitAccount(final Bytes32 nodeKey, final Node<Bytes>
     final StateTrieAccountValue account =
         StateTrieAccountValue.readFrom(new BytesValueRLPInput(nodeValue, false));
 
-    final Bytes code = worldStateStorage.getCode(account.getCodeHash()).orElse(Bytes.EMPTY);
+    final Bytes code = worldStateStorage.getCode(account.getCodeHash(), null).orElse(Bytes.EMPTY);
     backupStatus.codeSize.addAndGet(code.size());
 
     final BytesValueRLPOutput accountOutput = new BytesValueRLPOutput();
@@ -297,7 +292,7 @@ private void backupChainData() throws IOException {
             new RollingFileWriter(this::bodyFileName, backupStatus.compressed);
         final RollingFileWriter receiptsWriter =
             new RollingFileWriter(this::receiptFileName, backupStatus.compressed)) {
-      for (int blockNumber = 0; blockNumber <= backupStatus.targetBlock; blockNumber++) {
+      for (long blockNumber = 0; blockNumber <= backupStatus.targetBlock; blockNumber++) {
         final Optional<Block> block = blockchain.getBlockByNumber(blockNumber);
         checkState(
             block.isPresent(), "Block data for %s was not found in the archive", blockNumber);
@@ -312,7 +307,7 @@ private void backupChainData() throws IOException {
         headerWriter.writeBytes(headerOutput.encoded().toArrayUnsafe());
 
         final BytesValueRLPOutput bodyOutput = new BytesValueRLPOutput();
-        block.get().getBody().writeTo(bodyOutput);
+        block.get().getBody().writeWrappedBodyTo(bodyOutput);
         bodyWriter.writeBytes(bodyOutput.encoded().toArrayUnsafe());
 
         final BytesValueRLPOutput receiptsOutput = new BytesValueRLPOutput();
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/TransactionReceiptWithMetadata.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/TransactionReceiptWithMetadata.java
index 4541b5ea59c..059c7aedc1f 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/TransactionReceiptWithMetadata.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/TransactionReceiptWithMetadata.java
@@ -14,15 +14,19 @@
  */
 package org.hyperledger.besu.ethereum.api.query;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 
+import java.util.Optional;
+
 public class TransactionReceiptWithMetadata {
   private final TransactionReceipt receipt;
   private final Hash transactionHash;
   private final int transactionIndex;
   private final long gasUsed;
+  private final Optional<Wei> baseFee;
   private final long blockNumber;
   private final Hash blockHash;
   private final Transaction transaction;
@@ -33,12 +37,14 @@ private TransactionReceiptWithMetadata(
       final Hash transactionHash,
       final int transactionIndex,
       final long gasUsed,
+      final Optional<Wei> baseFee,
       final Hash blockHash,
       final long blockNumber) {
     this.receipt = receipt;
     this.transactionHash = transactionHash;
     this.transactionIndex = transactionIndex;
     this.gasUsed = gasUsed;
+    this.baseFee = baseFee;
     this.blockHash = blockHash;
     this.blockNumber = blockNumber;
     this.transaction = transaction;
@@ -50,10 +56,18 @@ public static TransactionReceiptWithMetadata create(
       final Hash transactionHash,
       final int transactionIndex,
       final long gasUsed,
+      final Optional<Wei> baseFee,
       final Hash blockHash,
       final long blockNumber) {
     return new TransactionReceiptWithMetadata(
-        receipt, transaction, transactionHash, transactionIndex, gasUsed, blockHash, blockNumber);
+        receipt,
+        transaction,
+        transactionHash,
+        transactionIndex,
+        gasUsed,
+        baseFee,
+        blockHash,
+        blockNumber);
   }
 
   public TransactionReceipt getReceipt() {
@@ -85,4 +99,8 @@ public long getBlockNumber() {
   public long getGasUsed() {
     return gasUsed;
   }
+
+  public Optional<Wei> getBaseFee() {
+    return baseFee;
+  }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/TransactionWithMetadata.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/TransactionWithMetadata.java
index 5b519b1dc41..637b0f8f5ce 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/TransactionWithMetadata.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/TransactionWithMetadata.java
@@ -16,7 +16,8 @@
  */
 package org.hyperledger.besu.ethereum.api.query;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.Transaction;
 
 import java.util.Optional;
@@ -25,12 +26,14 @@ public class TransactionWithMetadata {
 
   private final Transaction transaction;
   private final Optional<Long> blockNumber;
+  private final Optional<Wei> baseFee;
   private final Optional<Hash> blockHash;
   private final Optional<Integer> transactionIndex;
 
   public TransactionWithMetadata(final Transaction transaction) {
     this.transaction = transaction;
     this.blockNumber = Optional.empty();
+    this.baseFee = Optional.empty();
     this.blockHash = Optional.empty();
     this.transactionIndex = Optional.empty();
   }
@@ -38,10 +41,12 @@ public TransactionWithMetadata(final Transaction transaction) {
   public TransactionWithMetadata(
       final Transaction transaction,
       final long blockNumber,
+      final Optional<Wei> baseFee,
       final Hash blockHash,
       final int transactionIndex) {
     this.transaction = transaction;
     this.blockNumber = Optional.of(blockNumber);
+    this.baseFee = baseFee;
     this.blockHash = Optional.of(blockHash);
     this.transactionIndex = Optional.of(transactionIndex);
   }
@@ -54,6 +59,10 @@ public Optional<Long> getBlockNumber() {
     return blockNumber;
   }
 
+  public Optional<Wei> getBaseFee() {
+    return baseFee;
+  }
+
   public Optional<Hash> getBlockHash() {
     return blockHash;
   }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/cache/AutoTransactionLogBloomCachingService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/cache/AutoTransactionLogBloomCachingService.java
index c6a4ce10736..7d694f7b9a4 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/cache/AutoTransactionLogBloomCachingService.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/cache/AutoTransactionLogBloomCachingService.java
@@ -28,11 +28,12 @@
 import java.util.OptionalLong;
 import java.util.stream.Stream;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AutoTransactionLogBloomCachingService {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG =
+      LoggerFactory.getLogger(AutoTransactionLogBloomCachingService.class);
   private final Blockchain blockchain;
   private final TransactionLogBloomCacher transactionLogBloomCacher;
   private OptionalLong blockAddedSubscriptionId = OptionalLong.empty();
@@ -53,9 +54,9 @@ public void start() {
       final LogBloomCacheMetadata logBloomCacheMetadata =
           LogBloomCacheMetadata.lookUpFrom(cacheDir);
       if (logBloomCacheMetadata.getVersion() < DEFAULT_VERSION) {
-        try (Stream<Path> walk = Files.walk(cacheDir)) {
+        try (final Stream<Path> walk = Files.walk(cacheDir)) {
           walk.filter(Files::isRegularFile).map(Path::toFile).forEach(File::delete);
-        } catch (Exception e) {
+        } catch (final Exception e) {
           LOG.error("Failed to update cache {}", e.getMessage());
         }
         new LogBloomCacheMetadata(DEFAULT_VERSION).writeToDirectory(cacheDir);
@@ -76,8 +77,18 @@ public void start() {
 
       transactionLogBloomCacher
           .getScheduler()
-          .scheduleFutureTask(transactionLogBloomCacher::cacheAll, Duration.ofMinutes(1));
-    } catch (IOException e) {
+          .scheduleFutureTask(
+              () ->
+                  // run long tasks in the computation executor
+                  transactionLogBloomCacher
+                      .getScheduler()
+                      .scheduleComputationTask(
+                          () -> {
+                            transactionLogBloomCacher.cacheAll();
+                            return null;
+                          }),
+              Duration.ofMinutes(1));
+    } catch (final IOException e) {
       LOG.error("Unhandled caching exception.", e);
     }
   }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/cache/LogBloomCacheMetadata.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/cache/LogBloomCacheMetadata.java
index cef41947c65..c47a54425e2 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/cache/LogBloomCacheMetadata.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/cache/LogBloomCacheMetadata.java
@@ -23,13 +23,13 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class LogBloomCacheMetadata {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(LogBloomCacheMetadata.class);
 
-  public static final int DEFAULT_VERSION = 2;
+  public static final int DEFAULT_VERSION = 3;
 
   private static final String METADATA_FILENAME = "CACHE_METADATA.json";
   private static final ObjectMapper MAPPER = new ObjectMapper();
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/cache/TransactionLogBloomCacher.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/cache/TransactionLogBloomCacher.java
index 2f60e70f947..dd6fed957ab 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/cache/TransactionLogBloomCacher.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/cache/TransactionLogBloomCacher.java
@@ -43,12 +43,12 @@
 import java.util.concurrent.locks.ReentrantLock;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TransactionLogBloomCacher {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(TransactionLogBloomCacher.class);
   private static final String NO_SPACE_LEFT_ON_DEVICE = "No space left on device";
 
   public static final int BLOCKS_PER_BLOOM_CACHE = 100_000;
@@ -97,7 +97,7 @@ public CachingStatus generateLogBloomCache(final long start, final long stop) {
     if (!cachingStatus.isCaching()) {
       try {
         cachingStatus.cachingCount.incrementAndGet();
-        LOG.info(
+        LOG.debug(
             "Generating transaction log bloom cache from block {} to block {} in {}",
             start,
             stop,
@@ -107,7 +107,7 @@ public CachingStatus generateLogBloomCache(final long start, final long stop) {
           return cachingStatus;
         }
         for (long blockNum = start; blockNum < stop; blockNum += BLOCKS_PER_BLOOM_CACHE) {
-          LOG.info("Caching segment at {}", blockNum);
+          LOG.trace("Caching segment at {}", blockNum);
           final File cacheFile = calculateCacheFileName(blockNum, cacheDir);
           blockchain
               .getBlockHeader(blockNum)
@@ -121,7 +121,7 @@ public CachingStatus generateLogBloomCache(final long start, final long stop) {
         LOG.error("Unhandled caching exception", e);
       } finally {
         cachingStatus.cachingCount.decrementAndGet();
-        LOG.info("Caching request complete");
+        LOG.trace("Caching request complete");
       }
     }
 
@@ -141,7 +141,7 @@ private void fillCacheFile(final long startBlock, final long stopBlock, final Fi
         cachingStatus.currentBlock = blockNum;
         blockNum++;
       }
-    } catch (IOException e) {
+    } catch (final IOException e) {
       if (e.getMessage().contains(NO_SPACE_LEFT_ON_DEVICE)) {
         LOG.error(e.getMessage());
         System.exit(0);
@@ -171,13 +171,13 @@ void cacheLogsBloomForBlockHeader(
             for (long number = ancestorBlockNumber.get() + 1;
                 number < blockHeader.getNumber();
                 number++) {
-              Optional<BlockHeader> ancestorBlockHeader = blockchain.getBlockHeader(number);
+              final Optional<BlockHeader> ancestorBlockHeader = blockchain.getBlockHeader(number);
               if (ancestorBlockHeader.isPresent()) {
-                cacheSingleBlock(ancestorBlockHeader.get(), cacheFile);
+                cacheSingleBlock(ancestorBlockHeader.get(), cacheFile, true);
               }
             }
           }
-          cacheSingleBlock(blockHeader, cacheFile);
+          cacheSingleBlock(blockHeader, cacheFile, true);
         } catch (final InvalidCacheException e) {
           populateLatestSegment(blockNumber);
         }
@@ -195,16 +195,15 @@ void cacheLogsBloomForBlockHeader(
     }
   }
 
-  private void cacheSingleBlock(final BlockHeader blockHeader, final File cacheFile)
+  private void cacheSingleBlock(
+      final BlockHeader blockHeader, final File cacheFile, final boolean isCheckSizeNeeded)
       throws IOException, InvalidCacheException {
     try (final RandomAccessFile writer = new RandomAccessFile(cacheFile, "rw")) {
 
-      long nbCachedBlocks = cacheFile.length() / BLOOM_BITS_LENGTH;
+      final long nbCachedBlocks = cacheFile.length() / BLOOM_BITS_LENGTH;
       final long blockIndex = (blockHeader.getNumber() % BLOCKS_PER_BLOOM_CACHE);
       final long offset = blockIndex * BLOOM_BITS_LENGTH;
-
-      // detect missing block
-      if (blockIndex > nbCachedBlocks) {
+      if (isCheckSizeNeeded && blockIndex > nbCachedBlocks) {
         throw new InvalidCacheException();
       }
       writer.seek(offset);
@@ -226,9 +225,11 @@ private boolean populateLatestSegment(final long eventBlockNumber) {
       long blockNumber =
           Math.min((segmentNumber + 1) * BLOCKS_PER_BLOOM_CACHE - 1, eventBlockNumber);
       fillCacheFile(segmentNumber * BLOCKS_PER_BLOOM_CACHE, blockNumber, currentFile);
-
       while (blockNumber <= eventBlockNumber && (blockNumber % BLOCKS_PER_BLOOM_CACHE != 0)) {
-        cacheSingleBlock(blockchain.getBlockHeader(blockNumber).orElseThrow(), currentFile);
+        Optional<BlockHeader> blockHeader = blockchain.getBlockHeader(blockNumber);
+        if (blockHeader.isPresent()) {
+          cacheSingleBlock(blockHeader.get(), currentFile, false);
+        }
         blockNumber++;
       }
       Files.move(
@@ -283,25 +284,29 @@ public void ensurePreviousSegmentsArePresent(
       final long blockNumber, final boolean overrideCacheCheck) {
     if (!cachingStatus.isCaching()) {
       scheduler.scheduleFutureTask(
-          () -> {
-            long currentSegment = (blockNumber / BLOCKS_PER_BLOOM_CACHE) - 1;
-            while (currentSegment >= 0) {
-              try {
-                if (overrideCacheCheck || !cachedSegments.getOrDefault(currentSegment, false)) {
-                  final long startBlock = currentSegment * BLOCKS_PER_BLOOM_CACHE;
-                  final File cacheFile = calculateCacheFileName(startBlock, cacheDir);
-                  if (overrideCacheCheck
-                      || !cacheFile.isFile()
-                      || cacheFile.length() != EXPECTED_BLOOM_FILE_SIZE) {
-                    generateLogBloomCache(startBlock, startBlock + BLOCKS_PER_BLOOM_CACHE);
-                  }
-                  cachedSegments.put(currentSegment, true);
-                }
-              } finally {
-                currentSegment--;
-              }
-            }
-          },
+          () ->
+              scheduler.scheduleComputationTask(
+                  () -> {
+                    long currentSegment = (blockNumber / BLOCKS_PER_BLOOM_CACHE) - 1;
+                    while (currentSegment >= 0) {
+                      try {
+                        if (overrideCacheCheck
+                            || !cachedSegments.getOrDefault(currentSegment, false)) {
+                          final long startBlock = currentSegment * BLOCKS_PER_BLOOM_CACHE;
+                          final File cacheFile = calculateCacheFileName(startBlock, cacheDir);
+                          if (overrideCacheCheck
+                              || !cacheFile.isFile()
+                              || cacheFile.length() != EXPECTED_BLOOM_FILE_SIZE) {
+                            generateLogBloomCache(startBlock, startBlock + BLOCKS_PER_BLOOM_CACHE);
+                          }
+                          cachedSegments.put(currentSegment, true);
+                        }
+                      } finally {
+                        currentSegment--;
+                      }
+                    }
+                    return null;
+                  }),
           Duration.ofSeconds(1));
     }
   }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/tls/TlsConfiguration.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/tls/TlsConfiguration.java
index 7d5e3da8689..9fa86722e08 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/tls/TlsConfiguration.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/tls/TlsConfiguration.java
@@ -18,21 +18,31 @@
 import static java.util.Objects.requireNonNull;
 
 import java.nio.file.Path;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.Supplier;
 
 public class TlsConfiguration {
+
   private final Path keyStorePath;
   private final Supplier<String> keyStorePasswordSupplier;
   private final Optional<TlsClientAuthConfiguration> clientAuthConfiguration;
+  private final Optional<Set<String>> secureTransportProtocols;
+  private final Optional<Set<String>> cipherSuites;
 
   private TlsConfiguration(
       final Path keyStorePath,
       final Supplier<String> keyStorePasswordSupplier,
-      final Optional<TlsClientAuthConfiguration> clientAuthConfiguration) {
+      final Optional<TlsClientAuthConfiguration> clientAuthConfiguration,
+      final Optional<Set<String>> secureTransportProtocols,
+      final Optional<Set<String>> cipherSuites) {
     this.keyStorePath = keyStorePath;
     this.keyStorePasswordSupplier = keyStorePasswordSupplier;
     this.clientAuthConfiguration = clientAuthConfiguration;
+    this.secureTransportProtocols = secureTransportProtocols;
+    this.cipherSuites = cipherSuites;
   }
 
   public Path getKeyStorePath() {
@@ -47,10 +57,20 @@ public Optional<TlsClientAuthConfiguration> getClientAuthConfiguration() {
     return clientAuthConfiguration;
   }
 
+  public Optional<Set<String>> getSecureTransportProtocols() {
+    return secureTransportProtocols;
+  }
+
+  public Optional<Set<String>> getCipherSuites() {
+    return cipherSuites;
+  }
+
   public static final class Builder {
     private Path keyStorePath;
     private Supplier<String> keyStorePasswordSupplier;
     private TlsClientAuthConfiguration clientAuthConfiguration;
+    private Set<String> secureTransportProtocols;
+    private Set<String> cipherSuites;
 
     private Builder() {}
 
@@ -74,11 +94,25 @@ public Builder withClientAuthConfiguration(
       return this;
     }
 
+    public Builder withSecureTransportProtocols(final List<String> secureTransportProtocols) {
+      this.secureTransportProtocols = new HashSet<>(secureTransportProtocols);
+      return this;
+    }
+
+    public Builder withCipherSuites(final List<String> cipherSuites) {
+      this.cipherSuites = new HashSet<>(cipherSuites);
+      return this;
+    }
+
     public TlsConfiguration build() {
       requireNonNull(keyStorePath, "Key Store Path must not be null");
       requireNonNull(keyStorePasswordSupplier, "Key Store password supplier must not be null");
       return new TlsConfiguration(
-          keyStorePath, keyStorePasswordSupplier, Optional.ofNullable(clientAuthConfiguration));
+          keyStorePath,
+          keyStorePasswordSupplier,
+          Optional.ofNullable(clientAuthConfiguration),
+          Optional.ofNullable(secureTransportProtocols),
+          Optional.ofNullable(cipherSuites));
     }
   }
 }
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/util/ArrayNodeWrapper.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/util/ArrayNodeWrapper.java
new file mode 100644
index 00000000000..b304d2a8d6e
--- /dev/null
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/util/ArrayNodeWrapper.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.util;
+
+import java.util.Iterator;
+import java.util.Optional;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+
+public class ArrayNodeWrapper {
+
+  private final ArrayNode arrayNode;
+  private final Optional<Integer> maybeAfter;
+  private final Optional<Integer> maybeCount;
+  private int currentOffset;
+
+  public ArrayNodeWrapper(final ArrayNode arrayNode) {
+    this(arrayNode, Optional.empty(), Optional.empty());
+  }
+
+  public ArrayNodeWrapper(
+      final ArrayNode arrayNode,
+      final Optional<Integer> maybeAfter,
+      final Optional<Integer> maybeCount) {
+    this.arrayNode = arrayNode;
+    currentOffset = 0;
+    this.maybeAfter = maybeAfter;
+    this.maybeCount = maybeCount;
+  }
+
+  public void addPOJO(final Object object) {
+    final boolean isValidOffset = maybeAfter.map(after -> currentOffset >= after).orElse(true);
+    final boolean isValidSize = maybeCount.map(count -> count > arrayNode.size()).orElse(true);
+    if (isValidOffset && isValidSize) {
+      arrayNode.addPOJO(object);
+    }
+    currentOffset++;
+  }
+
+  public void addAll(final ArrayNodeWrapper wrapper) {
+    final Iterator<JsonNode> elements = wrapper.arrayNode.elements();
+    while (!isFull() && elements.hasNext()) {
+      addPOJO(elements.next());
+    }
+  }
+
+  public boolean isFull() {
+    return maybeCount.map(count -> count <= arrayNode.size()).orElse(false);
+  }
+
+  public ArrayNode getArrayNode() {
+    return arrayNode;
+  }
+}
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/util/DomainObjectDecodeUtils.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/util/DomainObjectDecodeUtils.java
index abdb3779566..8c4c0d453e0 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/util/DomainObjectDecodeUtils.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/util/DomainObjectDecodeUtils.java
@@ -16,23 +16,22 @@
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcRequestException;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.core.encoding.TransactionDecoder;
 import org.hyperledger.besu.ethereum.rlp.RLPException;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
 
 public class DomainObjectDecodeUtils {
-  private static final Logger LOG = LogManager.getLogger();
 
-  public static Transaction decodeRawTransaction(final String rlp)
+  public static Transaction decodeRawTransaction(final String rawTransaction)
       throws InvalidJsonRpcRequestException {
     try {
-      return Transaction.readFrom(RLP.input(Bytes.fromHexString(rlp)));
-    } catch (final IllegalArgumentException | RLPException e) {
-      LOG.debug(e);
+      Bytes txnBytes = Bytes.fromHexString(rawTransaction);
+      return TransactionDecoder.decodeOpaqueBytes(txnBytes);
+    } catch (final IllegalArgumentException e) {
       throw new InvalidJsonRpcRequestException("Invalid raw transaction hex", e);
+    } catch (final RLPException r) {
+      throw new InvalidJsonRpcRequestException("Invalid RLP in raw transaction hex", r);
     }
   }
 }
diff --git a/ethereum/api/src/main/resources/schema.graphqls b/ethereum/api/src/main/resources/schema.graphqls
index b065daf5021..183bce31e9d 100644
--- a/ethereum/api/src/main/resources/schema.graphqls
+++ b/ethereum/api/src/main/resources/schema.graphqls
@@ -1,303 +1,572 @@
-# Bytes32 is a 32 byte binary string, represented as 0x-prefixed hexadecimal.
-scalar Bytes32
-# Address is a 20 byte Ethereum address, represented as 0x-prefixed hexadecimal.
-scalar Address
-# Bytes is an arbitrary length binary string, represented as 0x-prefixed hexadecimal.
-# An empty byte string is represented as '0x'. Byte strings must have an even number of hexadecimal nybbles.
-scalar Bytes
-# BigInt is a large integer. Input is accepted as either a JSON number or as a string.
-# Strings may be either decimal or 0x-prefixed hexadecimal. Output values are all
-# 0x-prefixed hexadecimal.
-scalar BigInt
-# Long is a 64 bit unsigned integer.
-scalar Long
-
-schema {
-    query: Query
-    mutation: Mutation
+"""EIP-2718"""
+type AccessTuple {
+  address: Address!
+  storageKeys: [Bytes32!]!
 }
 
-# Account is an Ethereum account at a particular block.
+"""Account is an Ethereum account at a particular block."""
 type Account {
-    # Address is the address owning the account.
-    address: Address!
-    # Balance is the balance of the account, in wei.
-    balance: BigInt!
-    # TransactionCount is the number of transactions sent from this account,
-    # or in the case of a contract, the number of contracts created. Otherwise
-    # known as the nonce.
-    transactionCount: Long!
-    # Code contains the smart contract code for this account, if the account
-    # is a (non-self-destructed) contract.
-    code: Bytes!
-    # Storage provides access to the storage of a contract account, indexed
-    # by its 32 byte slot identifier.
-    storage(slot: Bytes32!): Bytes32!
-}
+  """Address is the address owning the account."""
+  address: Address!
 
-# Log is an Ethereum event log.
-type Log {
-    # Index is the index of this log in the block.
-    index: Int!
-    # Account is the account which generated this log - this will always
-    # be a contract account.
-    account(block: Long): Account!
-    # Topics is a list of 0-4 indexed topics for the log.
-    topics: [Bytes32!]!
-    # Data is unindexed data for this log.
-    data: Bytes!
-    # Transaction is the transaction that generated this log entry.
-    transaction: Transaction!
+  """Balance is the balance of the account, in wei."""
+  balance: BigInt!
+
+  """
+  TransactionCount is the number of transactions sent from this account,
+  or in the case of a contract, the number of contracts created. Otherwise
+  known as the nonce.
+  """
+  transactionCount: Long!
+
+  """
+  Code contains the smart contract code for this account, if the account
+  is a (non-self-destructed) contract.
+  """
+  code: Bytes!
+
+  """
+  Storage provides access to the storage of a contract account, indexed
+  by its 32 byte slot identifier.
+  """
+  storage(slot: Bytes32!): Bytes32!
 }
 
-# Transaction is an Ethereum transaction.
-type Transaction {
-    # Hash is the hash of this transaction.
-    hash: Bytes32!
-    # Nonce is the nonce of the account this transaction was generated with.
-    nonce: Long!
-    # Index is the index of this transaction in the parent block. This will
-    # be null if the transaction has not yet been mined.
-    index: Int
-    # From is the account that sent this transaction - this will always be
-    # an externally owned account.
-    from(block: Long): Account!
-    # To is the account the transaction was sent to. This is null for
-    # contract-creating transactions.
-    to(block: Long): Account
-    # Value is the value, in wei, sent along with this transaction.
-    value: BigInt!
-    # GasPrice is the price offered to miners for gas, in wei per unit.
-    gasPrice: BigInt!
-    # Gas is the maximum amount of gas this transaction can consume.
-    gas: Long!
-    # InputData is the data supplied to the target of the transaction.
-    inputData: Bytes!
-    # Block is the block this transaction was mined in. This will be null if
-    # the transaction has not yet been mined.
-    block: Block
-
-    # Status is the return status of the transaction. This will be 1 if the
-    # transaction succeeded, or 0 if it failed (due to a revert, or due to
-    # running out of gas). If the transaction has not yet been mined, this
-    # field will be null.
-    status: Long
-    # GasUsed is the amount of gas that was used processing this transaction.
-    # If the transaction has not yet been mined, this field will be null.
-    gasUsed: Long
-    # CumulativeGasUsed is the total gas used in the block up to and including
-    # this transaction. If the transaction has not yet been mined, this field
-    # will be null.
-    cumulativeGasUsed: Long
-    # CreatedContract is the account that was created by a contract creation
-    # transaction. If the transaction was not a contract creation transaction,
-    # or it has not yet been mined, this field will be null.
-    createdContract(block: Long): Account
-    # Logs is a list of log entries emitted by this transaction. If the
-    # transaction has not yet been mined, this field will be null.
-    logs: [Log!]
+"""
+Address is a 20 byte Ethereum address, represented as 0x-prefixed hexadecimal.
+"""
+scalar Address
+
+"""
+BigInt is a large integer. Input is accepted as either a JSON number or as a string.
+Strings may be either decimal or 0x-prefixed hexadecimal. Output values are all
+0x-prefixed hexadecimal.
+"""
+scalar BigInt
+
+"""Block is an Ethereum block."""
+type Block {
+  """
+  Number is the number of this block, starting at 0 for the genesis block.
+  """
+  number: Long!
+
+  """Hash is the block hash of this block."""
+  hash: Bytes32!
+
+  """Parent is the parent block of this block."""
+  parent: Block
+
+  """Nonce is the block nonce, an 8 byte sequence determined by the miner."""
+  nonce: Bytes!
+
+  """
+  TransactionsRoot is the keccak256 hash of the root of the trie of transactions in this block.
+  """
+  transactionsRoot: Bytes32!
+
+  """
+  TransactionCount is the number of transactions in this block. if
+  transactions are not available for this block, this field will be null.
+  """
+  transactionCount: Long
+
+  """
+  StateRoot is the keccak256 hash of the state trie after this block was processed.
+  """
+  stateRoot: Bytes32!
+
+  """
+  ReceiptsRoot is the keccak256 hash of the trie of transaction receipts in this block.
+  """
+  receiptsRoot: Bytes32!
+
+  """Miner is the account that mined this block."""
+  miner(block: Long): Account!
+
+  """ExtraData is an arbitrary data field supplied by the miner."""
+  extraData: Bytes!
+
+  """
+  GasLimit is the maximum amount of gas that was available to transactions in this block.
+  """
+  gasLimit: Long!
+
+  """
+  GasUsed is the amount of gas that was used executing transactions in this block.
+  """
+  gasUsed: Long!
+
+  """
+  BaseFeePerGas is the fee per unit of gas burned by the protocol in this block.
+  """
+  baseFeePerGas: BigInt
+
+  """
+  NextBaseFeePerGas is the fee per unit of gas which needs to be burned in the next block.
+  """
+  nextBaseFeePerGas: BigInt
+
+  """Timestamp is the unix timestamp at which this block was mined."""
+  timestamp: Long!
+
+  """
+  LogsBloom is a bloom filter that can be used to check if a block may
+  contain log entries matching a filter.
+  """
+  logsBloom: Bytes!
+
+  """MixHash is the hash that was used as an input to the PoW process."""
+  mixHash: Bytes32!
+
+  """Difficulty is a measure of the difficulty of mining this block."""
+  difficulty: BigInt!
+
+  """
+  TotalDifficulty is the sum of all difficulty values up to and including
+  this block.
+  """
+  totalDifficulty: BigInt!
+
+  """
+  OmmerCount is the number of ommers (AKA uncles) associated with this
+  block. If ommers are unavailable, this field will be null.
+  """
+  ommerCount: Long
+
+  """
+  Ommers is a list of ommer (AKA uncle) blocks associated with this block.
+  If ommers are unavailable, this field will be null. Depending on your
+  node, the transactions, transactionAt, transactionCount, ommers,
+  ommerCount and ommerAt fields may not be available on any ommer blocks.
+  """
+  ommers: [Block]
+
+  """
+  OmmerAt returns the ommer (AKA uncle) at the specified index. If ommers
+  are unavailable, or the index is out of bounds, this field will be null.
+  """
+  ommerAt(index: Long!): Block
+
+  """
+  OmmerHash is the keccak256 hash of all the ommers (AKA uncles)
+  associated with this block.
+  """
+  ommerHash: Bytes32!
+
+  """
+  Transactions is a list of transactions associated with this block. If
+  transactions are unavailable for this block, this field will be null.
+  """
+  transactions: [Transaction!]
+
+  """
+  TransactionAt returns the transaction at the specified index. If
+  transactions are unavailable for this block, or if the index is out of
+  bounds, this field will be null.
+  """
+  transactionAt(index: Long!): Transaction
+
+  """Logs returns a filtered set of logs from this block."""
+  logs(filter: BlockFilterCriteria!): [Log!]!
+
+  """Account fetches an Ethereum account at the current block's state."""
+  account(address: Address!): Account!
+
+  """Call executes a local call operation at the current block's state."""
+  call(data: CallData!): CallResult
+
+  """
+  EstimateGas estimates the amount of gas that will be required for
+  successful execution of a transaction at the current block's state.
+  """
+  estimateGas(data: CallData!): Long!
+
+  """RawHeader is the RLP encoding of the block's header."""
+  rawHeader: Bytes!
+
+  """Raw is the RLP encoding of the block."""
+  raw: Bytes!
+
+  """
+  WithdrawalsRoot is the keccak256 hash of the root of the trie of withdrawals in this block.
+  If withdrawals are unavailable for this block, this field will be null.
+  """
+  withdrawalsRoot: Bytes32
+
+  """
+  Withdrawals is a list of withdrawals associated with this block. If
+  withdrawals are unavailable for this block, this field will be null.
+  """
+  withdrawals: [Withdrawal!]
 }
 
-# BlockFilterCriteria encapsulates log filter criteria for a filter applied
-# to a single block.
+"""
+BlockFilterCriteria encapsulates log filter criteria for a filter applied
+to a single block.
+"""
 input BlockFilterCriteria {
-    # Addresses is list of addresses that are of interest. If this list is
-    # empty, results will not be filtered by address.
-    addresses: [Address!]
-    # Topics list restricts matches to particular event topics. Each event has a list
-  # of topics. Topics matches a prefix of that list. An empty element array matches any
-  # topic. Non-empty elements represent an alternative that matches any of the
-  # contained topics.
-  #
-  # Examples:
-  #  - [] or nil          matches any topic list
-  #  - [[A]]              matches topic A in first position
-  #  - [[], [B]]          matches any topic in first position, B in second position
-  #  - [[A], [B]]         matches topic A in first position, B in second position
-  #  - [[A, B]], [C, D]]  matches topic (A OR B) in first position, (C OR D) in second position
-    topics: [[Bytes32!]!]
-}
+  """
+  Addresses is list of addresses that are of interest. If this list is
+  empty, results will not be filtered by address.
+  """
+  addresses: [Address!]
 
-# Block is an Ethereum block.
-type Block {
-    # Number is the number of this block, starting at 0 for the genesis block.
-    number: Long!
-    # Hash is the block hash of this block.
-    hash: Bytes32!
-    # Parent is the parent block of this block.
-    parent: Block
-    # Nonce is the block nonce, an 8 byte sequence determined by the miner.
-    nonce: Bytes!
-    # TransactionsRoot is the keccak256 hash of the root of the trie of transactions in this block.
-    transactionsRoot: Bytes32!
-    # TransactionCount is the number of transactions in this block. if
-    # transactions are not available for this block, this field will be null.
-    transactionCount: Int
-    # StateRoot is the keccak256 hash of the state trie after this block was processed.
-    stateRoot: Bytes32!
-    # ReceiptsRoot is the keccak256 hash of the trie of transaction receipts in this block.
-    receiptsRoot: Bytes32!
-    # Miner is the account that mined this block.
-    miner(block: Long): Account!
-    # ExtraData is an arbitrary data field supplied by the miner.
-    extraData: Bytes!
-    # GasLimit is the maximum amount of gas that was available to transactions in this block.
-    gasLimit: Long!
-    # GasUsed is the amount of gas that was used executing transactions in this block.
-    gasUsed: Long!
-    # Timestamp is the unix timestamp at which this block was mined.
-    timestamp: BigInt!
-    # LogsBloom is a bloom filter that can be used to check if a block may
-    # contain log entries matching a filter.
-    logsBloom: Bytes!
-    # MixHash is the hash that was used as an input to the PoW process.
-    mixHash: Bytes32!
-    # Difficulty is a measure of the difficulty of mining this block.
-    difficulty: BigInt!
-    # TotalDifficulty is the sum of all difficulty values up to and including
-    # this block.
-    totalDifficulty: BigInt!
-    # OmmerCount is the number of ommers (AKA uncles) associated with this
-    # block. If ommers are unavailable, this field will be null.
-    ommerCount: Int
-    # Ommers is a list of ommer (AKA uncle) blocks associated with this block.
-    # If ommers are unavailable, this field will be null. Depending on your
-    # node, the transactions, transactionAt, transactionCount, ommers,
-    # ommerCount and ommerAt fields may not be available on any ommer blocks.
-    ommers: [Block]
-    # OmmerAt returns the ommer (AKA uncle) at the specified index. If ommers
-    # are unavailable, or the index is out of bounds, this field will be null.
-    ommerAt(index: Int!): Block
-    # OmmerHash is the keccak256 hash of all the ommers (AKA uncles)
-    # associated with this block.
-    ommerHash: Bytes32!
-    # Transactions is a list of transactions associated with this block. If
-    # transactions are unavailable for this block, this field will be null.
-    transactions: [Transaction!]
-    # TransactionAt returns the transaction at the specified index. If
-    # transactions are unavailable for this block, or if the index is out of
-    # bounds, this field will be null.
-    transactionAt(index: Int!): Transaction
-    # Logs returns a filtered set of logs from this block.
-    logs(filter: BlockFilterCriteria!): [Log!]!
-    # Account fetches an Ethereum account at the current block's state.
-    account(address: Address!): Account!
-    # Call executes a local call operation at the current block's state.
-    call(data: CallData!): CallResult
-    # EstimateGas estimates the amount of gas that will be required for
-    # successful execution of a transaction at the current block's state.
-    estimateGas(data: CallData!): Long!
+  """
+  Topics list restricts matches to particular event topics. Each event has a list
+  of topics. Topics matches a prefix of that list. An empty element array matches any
+  topic. Non-empty elements represent an alternative that matches any of the
+  contained topics.
+
+  Examples:
+   - [] or nil          matches any topic list
+   - [[A]]              matches topic A in first position
+   - [[], [B]]          matches any topic in first position, B in second position
+   - [[A], [B]]         matches topic A in first position, B in second position
+   - [[A, B]], [C, D]]  matches topic (A OR B) in first position, (C OR D) in second position
+  """
+  topics: [[Bytes32!]!]
 }
 
-# CallData represents the data associated with a local contract call.
-# All fields are optional.
+"""
+Bytes is an arbitrary length binary string, represented as 0x-prefixed hexadecimal.
+An empty byte string is represented as '0x'. Byte strings must have an even number of hexadecimal nybbles.
+"""
+scalar Bytes
+
+"""
+Bytes32 is a 32 byte binary string, represented as 0x-prefixed hexadecimal.
+"""
+scalar Bytes32
+
+"""
+CallData represents the data associated with a local contract call.
+All fields are optional.
+"""
 input CallData {
-    # From is the address making the call.
-    from: Address
-    # To is the address the call is sent to.
-    to: Address
-    # Gas is the amount of gas sent with the call.
-    gas: Long
-    # GasPrice is the price, in wei, offered for each unit of gas.
-    gasPrice: BigInt
-    # Value is the value, in wei, sent along with the call.
-    value: BigInt
-    # Data is the data sent to the callee.
-    data: Bytes
+  """From is the address making the call."""
+  from: Address
+
+  """To is the address the call is sent to."""
+  to: Address
+
+  """Gas is the amount of gas sent with the call."""
+  gas: Long
+
+  """GasPrice is the price, in wei, offered for each unit of gas."""
+  gasPrice: BigInt
+
+  """MaxFeePerGas is the maximum fee per gas offered, in wei."""
+  maxFeePerGas: BigInt
+
+  """MaxPriorityFeePerGas is the maximum miner tip per gas offered, in wei."""
+  maxPriorityFeePerGas: BigInt
+
+  """Value is the value, in wei, sent along with the call."""
+  value: BigInt
+
+  """Data is the data sent to the callee."""
+  data: Bytes
 }
 
-# CallResult is the result of a local call operation.
+"""CallResult is the result of a local call operation."""
 type CallResult {
-    # Data is the return data of the called contract.
-    data: Bytes!
-    # GasUsed is the amount of gas used by the call, after any refunds.
-    gasUsed: Long!
-    # Status is the result of the call - 1 for success or 0 for failure.
-    status: Long!
+  """Data is the return data of the called contract."""
+  data: Bytes!
+
+  """GasUsed is the amount of gas used by the call, after any refunds."""
+  gasUsed: Long!
+
+  """Status is the result of the call - 1 for success or 0 for failure."""
+  status: Long!
 }
 
-# FilterCriteria encapsulates log filter criteria for searching log entries.
+"""
+FilterCriteria encapsulates log filter criteria for searching log entries.
+"""
 input FilterCriteria {
-    # FromBlock is the block at which to start searching, inclusive. Defaults
-    # to the latest block if not supplied.
-    fromBlock: Long
-    # ToBlock is the block at which to stop searching, inclusive. Defaults
-    # to the latest block if not supplied.
-    toBlock: Long
-    # Addresses is a list of addresses that are of interest. If this list is
-    # empty, results will not be filtered by address.
-    addresses: [Address!]
-    # Topics list restricts matches to particular event topics. Each event has a list
-  # of topics. Topics matches a prefix of that list. An empty element array matches any
-  # topic. Non-empty elements represent an alternative that matches any of the
-  # contained topics.
-  #
-  # Examples:
-  #  - [] or nil          matches any topic list
-  #  - [[A]]              matches topic A in first position
-  #  - [[], [B]]          matches any topic in first position, B in second position
-  #  - [[A], [B]]         matches topic A in first position, B in second position
-  #  - [[A, B]], [C, D]]  matches topic (A OR B) in first position, (C OR D) in second position
-    topics: [[Bytes32!]!]
+  """
+  FromBlock is the block at which to start searching, inclusive. Defaults
+  to the latest block if not supplied.
+  """
+  fromBlock: Long
+
+  """
+  ToBlock is the block at which to stop searching, inclusive. Defaults
+  to the latest block if not supplied.
+  """
+  toBlock: Long
+
+  """
+  Addresses is a list of addresses that are of interest. If this list is
+  empty, results will not be filtered by address.
+  """
+  addresses: [Address!]
+
+  """
+  Topics list restricts matches to particular event topics. Each event has a list
+  of topics. Topics matches a prefix of that list. An empty element array matches any
+  topic. Non-empty elements represent an alternative that matches any of the
+  contained topics.
+
+  Examples:
+   - [] or nil          matches any topic list
+   - [[A]]              matches topic A in first position
+   - [[], [B]]          matches any topic in first position, B in second position
+   - [[A], [B]]         matches topic A in first position, B in second position
+   - [[A, B]], [C, D]]  matches topic (A OR B) in first position, (C OR D) in second position
+  """
+  topics: [[Bytes32!]!]
 }
 
-# SyncState contains the current synchronisation state of the client.
-type SyncState{
-    # StartingBlock is the block number at which synchronisation started.
-    startingBlock: Long!
-    # CurrentBlock is the point at which synchronisation has presently reached.
-    currentBlock: Long!
-    # HighestBlock is the latest known block number.
-    highestBlock: Long!
-    # PulledStates is the number of state entries fetched so far, or null
-    # if this is not known or not relevant.
-    pulledStates: Long
-    # KnownStates is the number of states the node knows of so far, or null
-    # if this is not known or not relevant.
-    knownStates: Long
+"""Log is an Ethereum event log."""
+type Log {
+  """Index is the index of this log in the block."""
+  index: Long!
+
+  """
+  Account is the account which generated this log - this will always
+  be a contract account.
+  """
+  account(block: Long): Account!
+
+  """Topics is a list of 0-4 indexed topics for the log."""
+  topics: [Bytes32!]!
+
+  """Data is unindexed data for this log."""
+  data: Bytes!
+
+  """Transaction is the transaction that generated this log entry."""
+  transaction: Transaction!
 }
 
-# Pending represents the current pending state.
+"""
+Long is a 64 bit unsigned integer. Input is accepted as either a JSON number or as a string.
+Strings may be either decimal or 0x-prefixed hexadecimal. Output values are all
+0x-prefixed hexadecimal.
+"""
+scalar Long
+
+type Mutation {
+  """SendRawTransaction sends an RLP-encoded transaction to the network."""
+  sendRawTransaction(data: Bytes!): Bytes32!
+}
+
+"""Pending represents the current pending state."""
 type Pending {
-  # TransactionCount is the number of transactions in the pending state.
-  transactionCount: Int!
-  # Transactions is a list of transactions in the current pending state.
+  """TransactionCount is the number of transactions in the pending state."""
+  transactionCount: Long!
+
+  """Transactions is a list of transactions in the current pending state."""
   transactions: [Transaction!]
-  # Account fetches an Ethereum account for the pending state.
+
+  """Account fetches an Ethereum account for the pending state."""
   account(address: Address!): Account!
-  # Call executes a local call operation for the pending state.
+
+  """Call executes a local call operation for the pending state."""
   call(data: CallData!): CallResult
-  # EstimateGas estimates the amount of gas that will be required for
-  # successful execution of a transaction for the pending state.
-  estimateGas(data: CallData!): Long!  
+
+  """
+  EstimateGas estimates the amount of gas that will be required for
+  successful execution of a transaction for the pending state.
+  """
+  estimateGas(data: CallData!): Long!
 }
 
 type Query {
-    # Account fetches an Ethereum account at the specified block number.
-    # If blockNumber is not provided, it defaults to the most recent block.
-    account(address: Address!, blockNumber: Long): Account!
-    # Block fetches an Ethereum block by number or by hash. If neither is
-    # supplied, the most recent known block is returned.
-    block(number: Long, hash: Bytes32): Block!
-    # Blocks returns all the blocks between two numbers, inclusive. If
-    # to is not supplied, it defaults to the most recent known block.
-    blocks(from: Long!, to: Long): [Block!]!
-    # Pending returns the current pending state.
-    pending: Pending!
-    # Transaction returns a transaction specified by its hash.
-    transaction(hash: Bytes32!): Transaction
-    # Logs returns log entries matching the provided filter.
-    logs(filter: FilterCriteria!): [Log!]!
-    # GasPrice returns the node's estimate of a gas price sufficient to
-    # ensure a transaction is mined in a timely fashion.
-    gasPrice: BigInt!
-    # ProtocolVersion returns the current wire protocol version number.
-    protocolVersion: Int!
-    # Syncing returns information on the current synchronisation state.
-    syncing: SyncState
+  """
+  Block fetches an Ethereum block by number or by hash. If neither is
+  supplied, the most recent known block is returned.
+  """
+  block(number: Long, hash: Bytes32): Block
+
+  """
+  Blocks returns all the blocks between two numbers, inclusive. If
+  to is not supplied, it defaults to the most recent known block.
+  """
+  blocks(from: Long, to: Long): [Block!]!
+
+  """Pending returns the current pending state."""
+  pending: Pending!
+
+  """Transaction returns a transaction specified by its hash."""
+  transaction(hash: Bytes32!): Transaction
+
+  """Logs returns log entries matching the provided filter."""
+  logs(filter: FilterCriteria!): [Log!]!
+
+  """
+  GasPrice returns the node's estimate of a gas price sufficient to
+  ensure a transaction is mined in a timely fashion.
+  """
+  gasPrice: BigInt!
+
+  """
+  MaxPriorityFeePerGas returns the node's estimate of a gas tip sufficient
+  to ensure a transaction is mined in a timely fashion.
+  """
+  maxPriorityFeePerGas: BigInt!
+
+  """Syncing returns information on the current synchronisation state."""
+  syncing: SyncState
+
+  """
+  ChainID returns the current chain ID for transaction replay protection.
+  """
+  chainID: BigInt!
 }
 
-type Mutation {
-    # SendRawTransaction sends an RLP-encoded transaction to the network.
-    sendRawTransaction(data: Bytes!): Bytes32!
+"""SyncState contains the current synchronisation state of the client."""
+type SyncState {
+  """StartingBlock is the block number at which synchronisation started."""
+  startingBlock: Long!
+
+  """
+  CurrentBlock is the point at which synchronisation has presently reached.
+  """
+  currentBlock: Long!
+
+  """HighestBlock is the latest known block number."""
+  highestBlock: Long!
 }
+
+"""Transaction is an Ethereum transaction."""
+type Transaction {
+  """Hash is the hash of this transaction."""
+  hash: Bytes32!
+
+  """Nonce is the nonce of the account this transaction was generated with."""
+  nonce: Long!
+
+  """
+  Index is the index of this transaction in the parent block. This will
+  be null if the transaction has not yet been mined.
+  """
+  index: Long
+
+  """
+  From is the account that sent this transaction - this will always be
+  an externally owned account.
+  """
+  from(block: Long): Account!
+
+  """
+  To is the account the transaction was sent to. This is null for
+  contract-creating transactions.
+  """
+  to(block: Long): Account
+
+  """Value is the value, in wei, sent along with this transaction."""
+  value: BigInt!
+
+  """GasPrice is the price offered to miners for gas, in wei per unit."""
+  gasPrice: BigInt!
+
+  """
+  MaxFeePerGas is the maximum fee per gas offered to include a transaction, in wei.
+  """
+  maxFeePerGas: BigInt
+
+  """
+  MaxPriorityFeePerGas is the maximum miner tip per gas offered to include a transaction, in wei.
+  """
+  maxPriorityFeePerGas: BigInt
+
+  """
+  EffectiveTip is the actual amount of reward going to miner after considering the max fee cap.
+  """
+  effectiveTip: BigInt
+
+  """Gas is the maximum amount of gas this transaction can consume."""
+  gas: Long!
+
+  """InputData is the data supplied to the target of the transaction."""
+  inputData: Bytes!
+
+  """
+  Block is the block this transaction was mined in. This will be null if
+  the transaction has not yet been mined.
+  """
+  block: Block
+
+  """
+  Status is the return status of the transaction. This will be 1 if the
+  transaction succeeded, or 0 if it failed (due to a revert, or due to
+  running out of gas). If the transaction has not yet been mined, this
+  field will be null.
+  """
+  status: Long
+
+  """
+  GasUsed is the amount of gas that was used processing this transaction.
+  If the transaction has not yet been mined, this field will be null.
+  """
+  gasUsed: Long
+
+  """
+  CumulativeGasUsed is the total gas used in the block up to and including
+  this transaction. If the transaction has not yet been mined, this field
+  will be null.
+  """
+  cumulativeGasUsed: Long
+
+  """
+  EffectiveGasPrice is actual value per gas deducted from the sender's
+  account. Before EIP-1559, this is equal to the transaction's gas price.
+  After EIP-1559, it is baseFeePerGas + min(maxFeePerGas - baseFeePerGas,
+  maxPriorityFeePerGas). Legacy transactions and EIP-2930 transactions are
+  coerced into the EIP-1559 format by setting both maxFeePerGas and
+  maxPriorityFeePerGas as the transaction's gas price.
+  """
+  effectiveGasPrice: BigInt
+
+  """
+  CreatedContract is the account that was created by a contract creation
+  transaction. If the transaction was not a contract creation transaction,
+  or it has not yet been mined, this field will be null.
+  """
+  createdContract(block: Long): Account
+
+  """
+  Logs is a list of log entries emitted by this transaction. If the
+  transaction has not yet been mined, this field will be null.
+  """
+  logs: [Log!]
+  r: BigInt!
+  s: BigInt!
+  v: BigInt!
+
+  """Envelope transaction support"""
+  type: Long
+  accessList: [AccessTuple!]
+
+  """
+  Raw is the canonical encoding of the transaction.
+  For legacy transactions, it returns the RLP encoding.
+  For EIP-2718 typed transactions, it returns the type and payload.
+  """
+  raw: Bytes!
+
+  """
+  RawReceipt is the canonical encoding of the receipt. For post EIP-2718 typed transactions
+  this is equivalent to TxType || ReceiptEncoding.
+  """
+  rawReceipt: Bytes!
+}
+
+"""EIP-4895"""
+type Withdrawal {
+  """
+  Index is a monotonically increasing identifier issued by consensus layer.
+  """
+  index: Long!
+
+  """Validator is index of the validator associated with withdrawal."""
+  validator: Long!
+
+  """Address recipient of the withdrawn amount."""
+  address: Address!
+
+  """Amount is the withdrawal value in Gwei."""
+  amount: Long!
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/AbstractDataFetcherTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/AbstractDataFetcherTest.java
index 35b374b9a83..269cc27f062 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/AbstractDataFetcherTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/AbstractDataFetcherTest.java
@@ -17,12 +17,12 @@
 import org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter.NormalBlockAdapter;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 
 import java.util.Optional;
 import java.util.Set;
 
+import graphql.GraphQLContext;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import org.junit.Before;
@@ -37,19 +37,16 @@ public abstract class AbstractDataFetcherTest {
 
   @Mock protected DataFetchingEnvironment environment;
 
-  @Mock protected GraphQLDataFetcherContextImpl context;
-
   @Mock protected BlockchainQueries query;
 
-  @Mock protected BlockHeader header;
+  @Mock protected GraphQLContext graphQLContext;
 
-  @Mock protected MutableWorldState mutableWorldState;
+  @Mock protected BlockHeader header;
 
   @Before
   public void before() {
     final GraphQLDataFetchers fetchers = new GraphQLDataFetchers(supportedCapabilities);
     fetcher = fetchers.getBlockDataFetcher();
-    Mockito.when(environment.getContext()).thenReturn(context);
-    Mockito.when(context.getBlockchainQueries()).thenReturn(query);
+    Mockito.when(environment.getGraphQlContext()).thenReturn(graphQLContext);
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/AbstractEthGraphQLHttpServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/AbstractEthGraphQLHttpServiceTest.java
index 33c63f0da5e..01cf7d3bafe 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/AbstractEthGraphQLHttpServiceTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/AbstractEthGraphQLHttpServiceTest.java
@@ -14,49 +14,35 @@
  */
 package org.hyperledger.besu.ethereum.api.graphql;
 
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.ImmutableApiConfiguration;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
-import org.hyperledger.besu.ethereum.chain.GenesisState;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockImporter;
+import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
 import org.hyperledger.besu.ethereum.core.DefaultSyncStatus;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
-import org.hyperledger.besu.ethereum.core.ProtocolScheduleFixture;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.eth.EthProtocol;
 import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
-import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
-import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
-import org.hyperledger.besu.ethereum.util.RawBlockIterator;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.plugin.data.SyncStatus;
+import org.hyperledger.besu.plugin.data.TransactionType;
 import org.hyperledger.besu.testutil.BlockTestUtil;
 
-import java.net.URL;
-import java.nio.file.Paths;
-import java.time.Instant;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
-import com.google.common.base.Charsets;
-import com.google.common.io.Resources;
 import graphql.GraphQL;
 import io.vertx.core.Vertx;
 import okhttp3.MediaType;
@@ -72,13 +58,7 @@
 public abstract class AbstractEthGraphQLHttpServiceTest {
   @ClassRule public static final TemporaryFolder folder = new TemporaryFolder();
 
-  private static ProtocolSchedule PROTOCOL_SCHEDULE;
-
-  static List<Block> BLOCKS;
-
-  private static Block GENESIS_BLOCK;
-
-  private static GenesisState GENESIS_CONFIG;
+  private static BlockchainSetupUtil blockchainSetupUtil;
 
   private final Vertx vertx = Vertx.vertx();
 
@@ -91,30 +71,12 @@ public abstract class AbstractEthGraphQLHttpServiceTest {
   final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
   protected static final MediaType GRAPHQL = MediaType.parse("application/graphql; charset=utf-8");
 
-  private ProtocolContext context;
-
   @BeforeClass
-  public static void setupConstants() throws Exception {
-    PROTOCOL_SCHEDULE = ProtocolScheduleFixture.MAINNET;
-
-    final URL blocksUrl = BlockTestUtil.getTestBlockchainUrl();
-
-    final URL genesisJsonUrl = BlockTestUtil.getTestGenesisUrl();
-
-    BLOCKS = new ArrayList<>();
-    try (final RawBlockIterator iterator =
-        new RawBlockIterator(
-            Paths.get(blocksUrl.toURI()),
-            rlp -> BlockHeader.readFrom(rlp, new MainnetBlockHeaderFunctions()))) {
-      while (iterator.hasNext()) {
-        BLOCKS.add(iterator.next());
-      }
-    }
-
-    final String genesisJson = Resources.toString(genesisJsonUrl, Charsets.UTF_8);
-
-    GENESIS_BLOCK = BLOCKS.get(0);
-    GENESIS_CONFIG = GenesisState.fromJson(genesisJson, PROTOCOL_SCHEDULE);
+  public static void setupConstants() {
+    blockchainSetupUtil =
+        BlockchainSetupUtil.createForEthashChain(
+            BlockTestUtil.getHiveTestChainResources(), DataStorageFormat.BONSAI);
+    blockchainSetupUtil.importAllBlocks();
   }
 
   @Before
@@ -123,36 +85,35 @@ public void setupTest() throws Exception {
     final SyncStatus status = new DefaultSyncStatus(1, 2, 3, Optional.of(4L), Optional.of(5L));
     Mockito.when(synchronizerMock.getSyncStatus()).thenReturn(Optional.of(status));
 
-    final EthHashMiningCoordinator miningCoordinatorMock =
-        Mockito.mock(EthHashMiningCoordinator.class);
+    final PoWMiningCoordinator miningCoordinatorMock = Mockito.mock(PoWMiningCoordinator.class);
     Mockito.when(miningCoordinatorMock.getMinTransactionGasPrice()).thenReturn(Wei.of(16));
 
     final TransactionPool transactionPoolMock = Mockito.mock(TransactionPool.class);
 
-    Mockito.when(transactionPoolMock.addLocalTransaction(ArgumentMatchers.any(Transaction.class)))
+    Mockito.when(transactionPoolMock.addTransactionViaApi(ArgumentMatchers.any(Transaction.class)))
         .thenReturn(ValidationResult.valid());
     // nonce too low tests uses a tx with nonce=16
     Mockito.when(
-            transactionPoolMock.addLocalTransaction(
+            transactionPoolMock.addTransactionViaApi(
                 ArgumentMatchers.argThat(tx -> tx.getNonce() == 16)))
         .thenReturn(ValidationResult.invalid(TransactionInvalidReason.NONCE_TOO_LOW));
     final PendingTransactions pendingTransactionsMock = Mockito.mock(PendingTransactions.class);
     Mockito.when(transactionPoolMock.getPendingTransactions()).thenReturn(pendingTransactionsMock);
-    Mockito.when(pendingTransactionsMock.getTransactionInfo())
+    Mockito.when(pendingTransactionsMock.getPendingTransactions())
         .thenReturn(
             Collections.singleton(
-                new PendingTransactions.TransactionInfo(
-                    Transaction.builder().nonce(42).gasLimit(654321).build(),
-                    true,
-                    Instant.ofEpochSecond(Integer.MAX_VALUE))));
-
-    final WorldStateArchive stateArchive =
-        InMemoryStorageProvider.createInMemoryWorldStateArchive();
-    GENESIS_CONFIG.writeStateTo(stateArchive.getMutable());
-
-    final MutableBlockchain blockchain =
-        InMemoryStorageProvider.createInMemoryBlockchain(GENESIS_BLOCK);
-    context = new ProtocolContext(blockchain, stateArchive, null);
+                new PendingTransaction.Local(
+                    Transaction.builder()
+                        .type(TransactionType.FRONTIER)
+                        .nonce(42)
+                        .gasLimit(654321)
+                        .gasPrice(Wei.ONE)
+                        .build())));
+
+    final MutableBlockchain blockchain = blockchainSetupUtil.getBlockchain();
+    ProtocolContext context =
+        new ProtocolContext(
+            blockchain, blockchainSetupUtil.getWorldArchive(), null, Optional.empty());
     final BlockchainQueries blockchainQueries =
         new BlockchainQueries(
             context.getBlockchain(),
@@ -168,14 +129,6 @@ public void setupTest() throws Exception {
     final GraphQLConfiguration config = GraphQLConfiguration.createDefault();
 
     config.setPort(0);
-    final GraphQLDataFetcherContextImpl dataFetcherContext =
-        new GraphQLDataFetcherContextImpl(
-            blockchainQueries,
-            PROTOCOL_SCHEDULE,
-            transactionPoolMock,
-            miningCoordinatorMock,
-            synchronizerMock);
-
     final GraphQLDataFetchers dataFetchers = new GraphQLDataFetchers(supportedCapabilities);
     final GraphQL graphQL = GraphQLProvider.buildGraphQL(dataFetchers);
 
@@ -185,7 +138,17 @@ public void setupTest() throws Exception {
             folder.newFolder().toPath(),
             config,
             graphQL,
-            dataFetcherContext,
+            Map.of(
+                GraphQLContextType.BLOCKCHAIN_QUERIES,
+                blockchainQueries,
+                GraphQLContextType.PROTOCOL_SCHEDULE,
+                blockchainSetupUtil.getProtocolSchedule(),
+                GraphQLContextType.TRANSACTION_POOL,
+                transactionPoolMock,
+                GraphQLContextType.MINING_COORDINATOR,
+                miningCoordinatorMock,
+                GraphQLContextType.SYNCHRONIZER,
+                synchronizerMock),
             Mockito.mock(EthScheduler.class));
     service.start().join();
 
@@ -200,12 +163,4 @@ public void shutdownServer() {
     service.stop().join();
     vertx.close();
   }
-
-  void importBlock(final int n) {
-    final Block block = BLOCKS.get(n);
-    final ProtocolSpec protocolSpec =
-        PROTOCOL_SCHEDULE.getByBlockNumber(block.getHeader().getNumber());
-    final BlockImporter blockImporter = protocolSpec.getBlockImporter();
-    blockImporter.importBlock(context, block, HeaderValidationMode.FULL);
-  }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/BlockDataFetcherTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/BlockDataFetcherTest.java
index f26b5c253b1..b41bb17547c 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/BlockDataFetcherTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/BlockDataFetcherTest.java
@@ -16,14 +16,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter.EmptyAccountAdapter;
 import org.hyperledger.besu.ethereum.api.graphql.internal.pojoadapter.NormalBlockAdapter;
 import org.hyperledger.besu.ethereum.api.query.BlockWithMetadata;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 import java.util.Optional;
 
@@ -37,10 +37,10 @@
 public class BlockDataFetcherTest extends AbstractDataFetcherTest {
 
   @Test
-  public void bothNumberAndHashThrows() throws Exception {
+  public void bothNumberAndHashThrows() {
     final Hash fakedHash = Hash.hash(Bytes.of(1));
-    when(environment.getArgument(ArgumentMatchers.eq("number"))).thenReturn(1L);
-    when(environment.getArgument(ArgumentMatchers.eq("hash"))).thenReturn(fakedHash);
+    when(environment.getArgument("number")).thenReturn(1L);
+    when(environment.getArgument("hash")).thenReturn(fakedHash);
 
     assertThatThrownBy(() -> fetcher.get(environment)).isInstanceOf(GraphQLException.class);
   }
@@ -48,11 +48,11 @@ public void bothNumberAndHashThrows() throws Exception {
   @Test
   public void onlyNumber() throws Exception {
 
-    when(environment.getArgument(ArgumentMatchers.eq("number"))).thenReturn(1L);
-    when(environment.getArgument(ArgumentMatchers.eq("hash"))).thenReturn(null);
+    when(environment.getArgument("number")).thenReturn(1L);
+    when(environment.getArgument("hash")).thenReturn(null);
 
-    when(environment.getContext()).thenReturn(context);
-    when(context.getBlockchainQueries()).thenReturn(query);
+    when(environment.getGraphQlContext()).thenReturn(graphQLContext);
+    when(graphQLContext.get(GraphQLContextType.BLOCKCHAIN_QUERIES)).thenReturn(query);
     when(query.blockByNumber(ArgumentMatchers.anyLong()))
         .thenReturn(Optional.of(new BlockWithMetadata<>(null, null, null, null, 0)));
 
@@ -65,22 +65,21 @@ public void ibftMiner() throws Exception {
     // as null. The compromise is to report zeros and empty on query from a block.
     final Address testAddress = Address.fromHexString("0xdeadbeef");
 
-    when(environment.getArgument(ArgumentMatchers.eq("number"))).thenReturn(1L);
-    when(environment.getArgument(ArgumentMatchers.eq("hash"))).thenReturn(null);
+    when(environment.getArgument("number")).thenReturn(1L);
+    when(environment.getArgument("hash")).thenReturn(null);
 
-    when(environment.getContext()).thenReturn(context);
-    when(context.getBlockchainQueries()).thenReturn(query);
+    when(environment.getGraphQlContext()).thenReturn(graphQLContext);
+    when(graphQLContext.get(GraphQLContextType.BLOCKCHAIN_QUERIES)).thenReturn(query);
     when(query.blockByNumber(ArgumentMatchers.anyLong()))
         .thenReturn(Optional.of(new BlockWithMetadata<>(header, null, null, null, 0)));
     when(header.getCoinbase()).thenReturn(testAddress);
-    when(query.getWorldState(anyLong())).thenReturn(Optional.of(mutableWorldState));
 
     final Optional<NormalBlockAdapter> maybeBlock = fetcher.get(environment);
     assertThat(maybeBlock).isPresent();
-    assertThat(maybeBlock.get().getMiner(environment)).isPresent();
-    assertThat(((EmptyAccountAdapter) maybeBlock.get().getMiner(environment).get()).getBalance())
-        .isPresent();
-    assertThat(((EmptyAccountAdapter) maybeBlock.get().getMiner(environment).get()).getAddress())
-        .contains(testAddress);
+    assertThat(maybeBlock.get().getMiner(environment)).isNotNull();
+    assertThat(((EmptyAccountAdapter) maybeBlock.get().getMiner(environment)).getBalance())
+        .isGreaterThanOrEqualTo(Wei.ZERO);
+    assertThat(((EmptyAccountAdapter) maybeBlock.get().getMiner(environment)).getAddress())
+        .isEqualTo(testAddress);
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/EthGraphQLHttpBySpecTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/EthGraphQLHttpBySpecTest.java
index 78fefc9bc1d..7beef9c5251 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/EthGraphQLHttpBySpecTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/EthGraphQLHttpBySpecTest.java
@@ -49,10 +49,12 @@ public static Collection<String> specs() {
     specs.add("eth_call_Block8");
     specs.add("eth_call_Block8_invalidHexBytesData");
     specs.add("eth_call_BlockLatest");
+    specs.add("eth_call_from_contract");
 
     specs.add("eth_estimateGas_transfer");
     specs.add("eth_estimateGas_noParams");
     specs.add("eth_estimateGas_contractDeploy");
+    specs.add("eth_estimateGas_from_contract");
 
     specs.add("eth_gasPrice");
 
@@ -76,7 +78,9 @@ public static Collection<String> specs() {
     specs.add("eth_getCode");
     specs.add("eth_getCode_noCode");
 
+    specs.add("eth_getLogs_emptyListParam");
     specs.add("eth_getLogs_matchTopic");
+    specs.add("eth_getLogs_matchAnyTopic");
     specs.add("eth_getLogs_range");
 
     specs.add("eth_getStorageAt");
@@ -109,6 +113,16 @@ public static Collection<String> specs() {
     specs.add("graphql_tooComplex");
     specs.add("graphql_tooComplexSchema");
 
+    specs.add("graphql_variable_address");
+    specs.add("graphql_variable_bytes");
+    specs.add("graphql_variable_bytes32");
+    specs.add("graphql_variable_long");
+
+    specs.add("block_withdrawals_pre_shanghai");
+    specs.add("block_withdrawals");
+    specs.add("eth_getTransaction_type2");
+    specs.add("eth_getBlock_shanghai");
+
     return specs;
   }
 
@@ -124,10 +138,15 @@ private void graphQLCall(final String name) throws IOException {
             EthGraphQLHttpBySpecTest.class.getResource(testSpecFile), Charsets.UTF_8);
     final JsonObject spec = new JsonObject(json);
     final String rawRequestBody = spec.getString("request");
-    final RequestBody requestBody = RequestBody.create(rawRequestBody, GRAPHQL);
+    final String rawVariables = spec.getString("variables");
+    final RequestBody requestBody =
+        rawVariables == null
+            ? RequestBody.create(rawRequestBody, GRAPHQL)
+            : RequestBody.create(
+                "{ \"query\":\"" + rawRequestBody + "\", \"variables\": " + rawVariables + "}",
+                JSON);
     final Request request = new Request.Builder().post(requestBody).url(baseUrl).build();
 
-    importBlocks(1, BLOCKS.size());
     try (final Response resp = client.newCall(request).execute()) {
       final JsonObject expectedRespBody = spec.getJsonObject("response");
       final String resultStr = resp.body().string();
@@ -139,10 +158,4 @@ private void graphQLCall(final String name) throws IOException {
       Assertions.assertThat(resp.code()).isEqualTo(expectedStatusCode);
     }
   }
-
-  private void importBlocks(final int from, final int to) {
-    for (int i = from; i < to; ++i) {
-      importBlock(i);
-    }
-  }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceCorsTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceCorsTest.java
index 78a72691758..1b86c21e130 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceCorsTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceCorsTest.java
@@ -15,14 +15,16 @@
 package org.hyperledger.besu.ethereum.api.graphql;
 
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.eth.EthProtocol;
 import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 
+import java.nio.file.Path;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 import com.google.common.collect.Lists;
@@ -32,27 +34,26 @@
 import okhttp3.Request;
 import okhttp3.Response;
 import org.assertj.core.api.Assertions;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Mockito;
 
 public class GraphQLHttpServiceCorsTest {
-  @Rule public final TemporaryFolder folder = new TemporaryFolder();
+  @TempDir private static Path folder;
 
   private final Vertx vertx = Vertx.vertx();
   private final OkHttpClient client = new OkHttpClient();
   private GraphQLHttpService graphQLHttpService;
 
-  @Before
+  @BeforeEach
   public void before() {
     final GraphQLConfiguration configuration = GraphQLConfiguration.createDefault();
     configuration.setPort(0);
   }
 
-  @After
+  @AfterEach
   public void after() {
     client.dispatcher().executorService().shutdown();
     client.connectionPool().evictAll();
@@ -66,7 +67,7 @@ public void requestWithNonAcceptedOriginShouldFail() throws Exception {
 
     final Request request =
         new Request.Builder()
-            .url(graphQLHttpService.url() + "/graphql?query={protocolVersion}")
+            .url(graphQLHttpService.url() + "/graphql?query={maxPriorityFeePerGas}")
             .header("Origin", "http://bar.me")
             .build();
 
@@ -81,7 +82,7 @@ public void requestWithAcceptedOriginShouldSucceed() throws Exception {
 
     final Request request =
         new Request.Builder()
-            .url(graphQLHttpService.url() + "/graphql?query={protocolVersion}")
+            .url(graphQLHttpService.url() + "/graphql?query={maxPriorityFeePerGas}")
             .header("Origin", "http://foo.io")
             .build();
 
@@ -98,7 +99,7 @@ public void requestWithOneOfMultipleAcceptedOriginsShouldSucceed() throws Except
 
     final Request request =
         new Request.Builder()
-            .url(graphQLHttpService.url() + "/graphql?query={protocolVersion}")
+            .url(graphQLHttpService.url() + "/graphql?query={maxPriorityFeePerGas}")
             .header("Origin", "http://bar.me")
             .build();
 
@@ -114,7 +115,7 @@ public void requestWithNoneOfMultipleAcceptedOriginsShouldFail() throws Exceptio
 
     final Request request =
         new Request.Builder()
-            .url(graphQLHttpService.url() + "/graphql?query={protocolVersion}")
+            .url(graphQLHttpService.url() + "/graphql?query={maxPriorityFeePerGas}")
             .header("Origin", "http://hel.lo")
             .build();
 
@@ -129,7 +130,7 @@ public void requestWithNoOriginShouldSucceedWhenNoCorsConfigSet() throws Excepti
 
     final Request request =
         new Request.Builder()
-            .url(graphQLHttpService.url() + "/graphql?query={protocolVersion}")
+            .url(graphQLHttpService.url() + "/graphql?query={maxPriorityFeePerGas}")
             .build();
 
     try (final Response response = client.newCall(request).execute()) {
@@ -143,7 +144,7 @@ public void requestWithNoOriginShouldSucceedWhenCorsIsSet() throws Exception {
 
     final Request request =
         new Request.Builder()
-            .url(graphQLHttpService.url() + "/graphql?query={protocolVersion}")
+            .url(graphQLHttpService.url() + "/graphql?query={maxPriorityFeePerGas}")
             .build();
 
     try (final Response response = client.newCall(request).execute()) {
@@ -157,7 +158,7 @@ public void requestWithAnyOriginShouldNotSucceedWhenCorsIsEmpty() throws Excepti
 
     final Request request =
         new Request.Builder()
-            .url(graphQLHttpService.url() + "/graphql?query={protocolVersion}")
+            .url(graphQLHttpService.url() + "/graphql?query={maxPriorityFeePerGas}")
             .header("Origin", "http://bar.me")
             .build();
 
@@ -172,7 +173,7 @@ public void requestWithAnyOriginShouldSucceedWhenCorsIsStart() throws Exception
 
     final Request request =
         new Request.Builder()
-            .url(graphQLHttpService.url() + "/graphql?query={protocolVersion}")
+            .url(graphQLHttpService.url() + "/graphql?query={maxPriorityFeePerGas}")
             .header("Origin", "http://bar.me")
             .build();
 
@@ -187,7 +188,7 @@ public void requestWithAccessControlRequestMethodShouldReturnAllowedHeaders() th
 
     final Request request =
         new Request.Builder()
-            .url(graphQLHttpService.url() + "/graphql?query={protocolVersion}")
+            .url(graphQLHttpService.url() + "/graphql?query={maxPriorityFeePerGas}")
             .method("OPTIONS", null)
             .header("Access-Control-Request-Method", "OPTIONS")
             .header("Origin", "http://foo.io")
@@ -210,17 +211,19 @@ private GraphQLHttpService createGraphQLHttpServiceWithAllowedDomains(
     final BlockchainQueries blockchainQueries = Mockito.mock(BlockchainQueries.class);
     final Synchronizer synchronizer = Mockito.mock(Synchronizer.class);
 
-    final EthHashMiningCoordinator miningCoordinatorMock =
-        Mockito.mock(EthHashMiningCoordinator.class);
+    final PoWMiningCoordinator miningCoordinatorMock = Mockito.mock(PoWMiningCoordinator.class);
 
-    final GraphQLDataFetcherContextImpl dataFetcherContext =
-        Mockito.mock(GraphQLDataFetcherContextImpl.class);
-    Mockito.when(dataFetcherContext.getBlockchainQueries()).thenReturn(blockchainQueries);
-    Mockito.when(dataFetcherContext.getMiningCoordinator()).thenReturn(miningCoordinatorMock);
-
-    Mockito.when(dataFetcherContext.getTransactionPool())
-        .thenReturn(Mockito.mock(TransactionPool.class));
-    Mockito.when(dataFetcherContext.getSynchronizer()).thenReturn(synchronizer);
+    // mock graphql context
+    final Map<GraphQLContextType, Object> graphQLContextMap =
+        Map.of(
+            GraphQLContextType.BLOCKCHAIN_QUERIES,
+            blockchainQueries,
+            GraphQLContextType.TRANSACTION_POOL,
+            Mockito.mock(TransactionPool.class),
+            GraphQLContextType.MINING_COORDINATOR,
+            miningCoordinatorMock,
+            GraphQLContextType.SYNCHRONIZER,
+            synchronizer);
 
     final Set<Capability> supportedCapabilities = new HashSet<>();
     supportedCapabilities.add(EthProtocol.ETH62);
@@ -230,12 +233,7 @@ private GraphQLHttpService createGraphQLHttpServiceWithAllowedDomains(
 
     final GraphQLHttpService graphQLHttpService =
         new GraphQLHttpService(
-            vertx,
-            folder.newFolder().toPath(),
-            config,
-            graphQL,
-            dataFetcherContext,
-            Mockito.mock(EthScheduler.class));
+            vertx, folder, config, graphQL, graphQLContextMap, Mockito.mock(EthScheduler.class));
     graphQLHttpService.start().join();
 
     return graphQLHttpService;
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceHostWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceHostWhitelistTest.java
index 4568ae02307..fbee1785a31 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceHostWhitelistTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceHostWhitelistTest.java
@@ -15,7 +15,7 @@
 package org.hyperledger.besu.ethereum.api.graphql;
 
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.eth.EthProtocol;
 import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
@@ -27,6 +27,7 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import graphql.GraphQL;
@@ -71,17 +72,18 @@ private GraphQLHttpService createGraphQLHttpService() throws Exception {
     final BlockchainQueries blockchainQueries = Mockito.mock(BlockchainQueries.class);
     final Synchronizer synchronizer = Mockito.mock(Synchronizer.class);
 
-    final EthHashMiningCoordinator miningCoordinatorMock =
-        Mockito.mock(EthHashMiningCoordinator.class);
+    final PoWMiningCoordinator miningCoordinatorMock = Mockito.mock(PoWMiningCoordinator.class);
 
-    final GraphQLDataFetcherContextImpl dataFetcherContext =
-        Mockito.mock(GraphQLDataFetcherContextImpl.class);
-    Mockito.when(dataFetcherContext.getBlockchainQueries()).thenReturn(blockchainQueries);
-    Mockito.when(dataFetcherContext.getMiningCoordinator()).thenReturn(miningCoordinatorMock);
-
-    Mockito.when(dataFetcherContext.getTransactionPool())
-        .thenReturn(Mockito.mock(TransactionPool.class));
-    Mockito.when(dataFetcherContext.getSynchronizer()).thenReturn(synchronizer);
+    final Map<GraphQLContextType, Object> graphQLContextMap =
+        Map.of(
+            GraphQLContextType.BLOCKCHAIN_QUERIES,
+            blockchainQueries,
+            GraphQLContextType.TRANSACTION_POOL,
+            Mockito.mock(TransactionPool.class),
+            GraphQLContextType.MINING_COORDINATOR,
+            miningCoordinatorMock,
+            GraphQLContextType.SYNCHRONIZER,
+            synchronizer);
 
     final Set<Capability> supportedCapabilities = new HashSet<>();
     supportedCapabilities.add(EthProtocol.ETH62);
@@ -94,7 +96,7 @@ private GraphQLHttpService createGraphQLHttpService() throws Exception {
         folder.newFolder().toPath(),
         graphQLConfig,
         graphQL,
-        dataFetcherContext,
+        graphQLContextMap,
         Mockito.mock(EthScheduler.class));
   }
 
@@ -144,7 +146,7 @@ public void requestWithUnknownHostIsRejected() throws IOException {
   }
 
   private int doRequest(final String hostname) throws IOException {
-    final RequestBody body = RequestBody.create(GRAPHQL, "{protocolVersion}");
+    final RequestBody body = RequestBody.create("{maxPriorityFeePerGas}", GRAPHQL);
 
     final Request build =
         new Request.Builder()
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceTest.java
index 9e168267546..59aaff11d32 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/GraphQLHttpServiceTest.java
@@ -16,13 +16,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.query.BlockWithMetadata;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.eth.EthProtocol;
 import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
@@ -33,6 +33,7 @@
 import java.net.URL;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
@@ -69,8 +70,8 @@ public class GraphQLHttpServiceTest {
   protected static final MediaType GRAPHQL = MediaType.parse("application/graphql; charset=utf-8");
   private static BlockchainQueries blockchainQueries;
   private static GraphQL graphQL;
-  private static GraphQLDataFetcherContextImpl dataFetcherContext;
-  private static EthHashMiningCoordinator miningCoordinatorMock;
+  private static Map<GraphQLContextType, Object> graphQlContextMap;
+  private static PoWMiningCoordinator miningCoordinatorMock;
 
   private final GraphQLTestHelper testHelper = new GraphQLTestHelper();
 
@@ -80,15 +81,17 @@ public static void initServerAndClient() throws Exception {
     final Synchronizer synchronizer = Mockito.mock(Synchronizer.class);
     graphQL = Mockito.mock(GraphQL.class);
 
-    miningCoordinatorMock = Mockito.mock(EthHashMiningCoordinator.class);
-
-    dataFetcherContext = Mockito.mock(GraphQLDataFetcherContextImpl.class);
-    Mockito.when(dataFetcherContext.getBlockchainQueries()).thenReturn(blockchainQueries);
-    Mockito.when(dataFetcherContext.getMiningCoordinator()).thenReturn(miningCoordinatorMock);
-
-    Mockito.when(dataFetcherContext.getTransactionPool())
-        .thenReturn(Mockito.mock(TransactionPool.class));
-    Mockito.when(dataFetcherContext.getSynchronizer()).thenReturn(synchronizer);
+    miningCoordinatorMock = Mockito.mock(PoWMiningCoordinator.class);
+    graphQlContextMap =
+        Map.of(
+            GraphQLContextType.BLOCKCHAIN_QUERIES,
+            blockchainQueries,
+            GraphQLContextType.TRANSACTION_POOL,
+            Mockito.mock(TransactionPool.class),
+            GraphQLContextType.MINING_COORDINATOR,
+            miningCoordinatorMock,
+            GraphQLContextType.SYNCHRONIZER,
+            synchronizer);
 
     final Set<Capability> supportedCapabilities = new HashSet<>();
     supportedCapabilities.add(EthProtocol.ETH62);
@@ -110,7 +113,7 @@ private static GraphQLHttpService createGraphQLHttpService(final GraphQLConfigur
         folder.newFolder().toPath(),
         config,
         graphQL,
-        dataFetcherContext,
+        graphQlContextMap,
         Mockito.mock(EthScheduler.class));
   }
 
@@ -120,7 +123,7 @@ private static GraphQLHttpService createGraphQLHttpService() throws Exception {
         folder.newFolder().toPath(),
         createGraphQLConfig(),
         graphQL,
-        dataFetcherContext,
+        graphQlContextMap,
         Mockito.mock(EthScheduler.class));
   }
 
@@ -217,6 +220,7 @@ public void handleInvalidQuerySchema() throws Exception {
   @Test
   public void query_get() throws Exception {
     final Wei price = Wei.of(16);
+    Mockito.when(blockchainQueries.gasPrice()).thenReturn(Optional.of(price.toLong()));
     Mockito.when(miningCoordinatorMock.getMinTransactionGasPrice()).thenReturn(price);
 
     try (final Response resp = client.newCall(buildGetRequest("?query={gasPrice}")).execute()) {
@@ -276,8 +280,8 @@ public void query_untypedPost() throws Exception {
   @Test
   public void getSocketAddressWhenActive() {
     final InetSocketAddress socketAddress = service.socketAddress();
-    Assertions.assertThat("127.0.0.1").isEqualTo(socketAddress.getAddress().getHostAddress());
-    Assertions.assertThat(socketAddress.getPort() > 0).isTrue();
+    Assertions.assertThat(socketAddress.getAddress().getHostAddress()).isEqualTo("127.0.0.1");
+    Assertions.assertThat(socketAddress.getPort()).isPositive();
   }
 
   @Test
@@ -285,9 +289,9 @@ public void getSocketAddressWhenStoppedIsEmpty() throws Exception {
     final GraphQLHttpService service = createGraphQLHttpService();
 
     final InetSocketAddress socketAddress = service.socketAddress();
-    Assertions.assertThat("0.0.0.0").isEqualTo(socketAddress.getAddress().getHostAddress());
-    Assertions.assertThat(0).isEqualTo(socketAddress.getPort());
-    Assertions.assertThat("").isEqualTo(service.url());
+    Assertions.assertThat(socketAddress.getAddress().getHostAddress()).isEqualTo("0.0.0.0");
+    Assertions.assertThat(socketAddress.getPort()).isZero();
+    Assertions.assertThat(service.url()).isEmpty();
   }
 
   @Test
@@ -299,8 +303,8 @@ public void getSocketAddressWhenBindingToAllInterfaces() throws Exception {
 
     try {
       final InetSocketAddress socketAddress = service.socketAddress();
-      Assertions.assertThat("0.0.0.0").isEqualTo(socketAddress.getAddress().getHostAddress());
-      Assertions.assertThat(socketAddress.getPort() > 0).isTrue();
+      Assertions.assertThat(socketAddress.getAddress().getHostAddress()).isEqualTo("0.0.0.0");
+      Assertions.assertThat(socketAddress.getPort()).isPositive();
       Assertions.assertThat(!service.url().contains("0.0.0.0")).isTrue();
     } finally {
       service.stop().join();
@@ -327,12 +331,11 @@ public void ethGetUncleCountByBlockHash() throws Exception {
     @SuppressWarnings("unchecked")
     final List<Hash> list = Mockito.mock(List.class);
 
-    Mockito.when(blockchainQueries.blockByHash(ArgumentMatchers.eq(blockHash)))
-        .thenReturn(Optional.of(block));
+    Mockito.when(blockchainQueries.blockByHash(blockHash)).thenReturn(Optional.of(block));
     Mockito.when(block.getOmmers()).thenReturn(list);
     Mockito.when(list.size()).thenReturn(uncleCount);
 
-    final String query = "{block(hash:\"" + blockHash.toString() + "\") {ommerCount}}";
+    final String query = "{block(hash:\"" + blockHash + "\") {ommerCount}}";
 
     final RequestBody body = RequestBody.create(query, GRAPHQL);
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
@@ -340,8 +343,9 @@ public void ethGetUncleCountByBlockHash() throws Exception {
       final String jsonStr = resp.body().string();
       final JsonObject json = new JsonObject(jsonStr);
       testHelper.assertValidGraphQLResult(json);
-      final int result = json.getJsonObject("data").getJsonObject("block").getInteger("ommerCount");
-      Assertions.assertThat(result).isEqualTo(uncleCount);
+      final String result =
+          json.getJsonObject("data").getJsonObject("block").getString("ommerCount");
+      Assertions.assertThat(Bytes.fromHexStringLenient(result).toInt()).isEqualTo(uncleCount);
     }
   }
 
@@ -366,8 +370,9 @@ public void ethGetUncleCountByBlockNumber() throws Exception {
       final String jsonStr = resp.body().string();
       final JsonObject json = new JsonObject(jsonStr);
       testHelper.assertValidGraphQLResult(json);
-      final int result = json.getJsonObject("data").getJsonObject("block").getInteger("ommerCount");
-      Assertions.assertThat(result).isEqualTo(uncleCount);
+      final String result =
+          json.getJsonObject("data").getJsonObject("block").getString("ommerCount");
+      Assertions.assertThat(Bytes.fromHexStringLenient(result).toInt()).isEqualTo(uncleCount);
     }
   }
 
@@ -391,8 +396,9 @@ public void ethGetUncleCountByBlockLatest() throws Exception {
       final String jsonStr = resp.body().string();
       final JsonObject json = new JsonObject(jsonStr);
       testHelper.assertValidGraphQLResult(json);
-      final int result = json.getJsonObject("data").getJsonObject("block").getInteger("ommerCount");
-      Assertions.assertThat(result).isEqualTo(uncleCount);
+      final String result =
+          json.getJsonObject("data").getJsonObject("block").getString("ommerCount");
+      Assertions.assertThat(Bytes.fromHexStringLenient(result).toInt()).isEqualTo(uncleCount);
     }
   }
 
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/AddressScalarTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/AddressScalarTest.java
index 3bdb386e252..b6f97889264 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/AddressScalarTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/AddressScalarTest.java
@@ -15,27 +15,27 @@
 package org.hyperledger.besu.ethereum.api.graphql.scalar;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.graphql.internal.Scalars;
-import org.hyperledger.besu.ethereum.core.Address;
 
+import java.util.Locale;
+
+import graphql.GraphQLContext;
+import graphql.execution.CoercedVariables;
+import graphql.language.FloatValue;
 import graphql.language.StringValue;
 import graphql.schema.CoercingParseLiteralException;
 import graphql.schema.CoercingParseValueException;
 import graphql.schema.CoercingSerializeException;
 import graphql.schema.GraphQLScalarType;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
 
-@RunWith(MockitoJUnitRunner.class)
 public class AddressScalarTest {
 
   private GraphQLScalarType scalar;
-  @Rule public ExpectedException thrown = ExpectedException.none();
 
   private final String addrStr = "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f";
   private final String invalidAddrStr = "0x295ee1b4f6dd65047762f924ecd367c17eabf8f";
@@ -44,48 +44,85 @@ public class AddressScalarTest {
   private final StringValue invalidAddrValue = StringValue.newStringValue(invalidAddrStr).build();
 
   @Test
-  public void pareValueTest() {
-    final String result = (String) scalar.getCoercing().parseValue(addr);
-    assertThat(result).isEqualTo(addrStr);
+  public void parseValueTest() {
+    final Address result =
+        (Address)
+            scalar
+                .getCoercing()
+                .parseValue(addrStr, GraphQLContext.newContext().build(), Locale.ENGLISH);
+    assertThat(result).isEqualTo(addr);
   }
 
   @Test
-  public void pareValueErrorTest() {
-
-    thrown.expect(CoercingParseValueException.class);
-    scalar.getCoercing().parseValue(addrStr);
+  public void parseValueErrorTest() {
+    assertThatThrownBy(
+            () ->
+                scalar
+                    .getCoercing()
+                    .parseValue(3.4f, GraphQLContext.newContext().build(), Locale.ENGLISH))
+        .isInstanceOf(CoercingParseValueException.class);
   }
 
   @Test
   public void serializeTest() {
-
-    final String result = (String) scalar.getCoercing().serialize(addr);
+    final String result =
+        (String)
+            scalar
+                .getCoercing()
+                .serialize(addr, GraphQLContext.newContext().build(), Locale.ENGLISH);
     assertThat(result).isEqualTo(addrStr);
   }
 
   @Test
   public void serializeErrorTest() {
-
-    thrown.expect(CoercingSerializeException.class);
-    scalar.getCoercing().serialize(addrStr);
+    assertThatThrownBy(
+            () ->
+                scalar
+                    .getCoercing()
+                    .serialize(3.4f, GraphQLContext.newContext().build(), Locale.ENGLISH))
+        .isInstanceOf(CoercingSerializeException.class);
   }
 
   @Test
-  public void pareLiteralTest() {
-    final Address result = (Address) scalar.getCoercing().parseLiteral(addrValue);
+  public void parseLiteralTest() {
+    final Address result =
+        (Address)
+            scalar
+                .getCoercing()
+                .parseLiteral(
+                    addrValue,
+                    CoercedVariables.emptyVariables(),
+                    GraphQLContext.newContext().build(),
+                    Locale.ENGLISH);
     assertThat(result).isEqualTo(addr);
   }
 
   @Test
-  public void pareLiteralErrorTest() {
-    thrown.expect(CoercingParseLiteralException.class);
-    scalar.getCoercing().parseLiteral(addrStr);
+  public void parseLiteralErrorTest() {
+    assertThatThrownBy(
+            () ->
+                scalar
+                    .getCoercing()
+                    .parseLiteral(
+                        FloatValue.of(3.4f),
+                        CoercedVariables.emptyVariables(),
+                        GraphQLContext.newContext().build(),
+                        Locale.ENGLISH))
+        .isInstanceOf(CoercingParseLiteralException.class);
   }
 
   @Test
-  public void pareLiteralErrorTest2() {
-    thrown.expect(CoercingParseLiteralException.class);
-    scalar.getCoercing().parseLiteral(invalidAddrValue);
+  public void parseLiteralErrorTest2() {
+    assertThatThrownBy(
+            () ->
+                scalar
+                    .getCoercing()
+                    .parseLiteral(
+                        invalidAddrValue,
+                        CoercedVariables.emptyVariables(),
+                        GraphQLContext.newContext().build(),
+                        Locale.ENGLISH))
+        .isInstanceOf(CoercingParseLiteralException.class);
   }
 
   @Before
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/BigIntScalarTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/BigIntScalarTest.java
index 068ad0dd039..d1c4751bd94 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/BigIntScalarTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/BigIntScalarTest.java
@@ -15,9 +15,15 @@
 package org.hyperledger.besu.ethereum.api.graphql.scalar;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.hyperledger.besu.ethereum.api.graphql.internal.Scalars;
 
+import java.util.Locale;
+
+import graphql.GraphQLContext;
+import graphql.execution.CoercedVariables;
+import graphql.language.FloatValue;
 import graphql.language.StringValue;
 import graphql.schema.CoercingParseLiteralException;
 import graphql.schema.CoercingParseValueException;
@@ -25,63 +31,82 @@
 import graphql.schema.GraphQLScalarType;
 import org.apache.tuweni.units.bigints.UInt256;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
 
-@RunWith(MockitoJUnitRunner.class)
 public class BigIntScalarTest {
 
   private GraphQLScalarType scalar;
-  @Rule public ExpectedException thrown = ExpectedException.none();
 
   private final String str = "0x10";
   private final UInt256 value = UInt256.fromHexString(str);
-  private final StringValue strValue = StringValue.newStringValue(str).build();
   private final StringValue invalidStrValue = StringValue.newStringValue("0xgh").build();
 
   @Test
-  public void pareValueTest() {
-    final String result = (String) scalar.getCoercing().parseValue(value);
+  public void parseValueTest() {
+    final String result =
+        (String)
+            scalar
+                .getCoercing()
+                .parseValue(value, GraphQLContext.newContext().build(), Locale.ENGLISH);
     assertThat(result).isEqualTo(str);
   }
 
   @Test
-  public void pareValueErrorTest() {
-    thrown.expect(CoercingParseValueException.class);
-    scalar.getCoercing().parseValue(str);
+  public void parseValueErrorTest() {
+    assertThatThrownBy(
+            () ->
+                scalar
+                    .getCoercing()
+                    .parseValue(3.2, GraphQLContext.newContext().build(), Locale.ENGLISH))
+        .isInstanceOf(CoercingParseValueException.class);
   }
 
   @Test
   public void serializeTest() {
-    final String result = (String) scalar.getCoercing().serialize(value);
+    final String result =
+        (String)
+            scalar
+                .getCoercing()
+                .serialize(value, GraphQLContext.newContext().build(), Locale.ENGLISH);
     assertThat(result).isEqualTo(str);
   }
 
   @Test
   public void serializeErrorTest() {
-    thrown.expect(CoercingSerializeException.class);
-    scalar.getCoercing().serialize(str);
-  }
-
-  @Test
-  public void pareLiteralTest() {
-    final UInt256 result = (UInt256) scalar.getCoercing().parseLiteral(strValue);
-    assertThat(result).isEqualTo(value);
+    assertThatThrownBy(
+            () ->
+                scalar
+                    .getCoercing()
+                    .serialize(3.2, GraphQLContext.newContext().build(), Locale.ENGLISH))
+        .isInstanceOf(CoercingSerializeException.class);
   }
 
   @Test
-  public void pareLiteralErrorTest() {
-    thrown.expect(CoercingParseLiteralException.class);
-    scalar.getCoercing().parseLiteral(str);
+  public void parseLiteralErrorTest() {
+    assertThatThrownBy(
+            () ->
+                scalar
+                    .getCoercing()
+                    .parseLiteral(
+                        FloatValue.of(3.2),
+                        CoercedVariables.emptyVariables(),
+                        GraphQLContext.newContext().build(),
+                        Locale.ENGLISH))
+        .isInstanceOf(CoercingParseLiteralException.class);
   }
 
   @Test
-  public void pareLiteralErrorTest2() {
-    thrown.expect(CoercingParseLiteralException.class);
-    scalar.getCoercing().parseLiteral(invalidStrValue);
+  public void parseLiteralErrorTest2() {
+    assertThatThrownBy(
+            () ->
+                scalar
+                    .getCoercing()
+                    .parseLiteral(
+                        invalidStrValue,
+                        CoercedVariables.emptyVariables(),
+                        GraphQLContext.newContext().build(),
+                        Locale.ENGLISH))
+        .isInstanceOf(CoercingParseLiteralException.class);
   }
 
   @Before
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/Bytes32ScalarTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/Bytes32ScalarTest.java
index b77561894d7..4583ecac365 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/Bytes32ScalarTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/Bytes32ScalarTest.java
@@ -15,9 +15,15 @@
 package org.hyperledger.besu.ethereum.api.graphql.scalar;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.hyperledger.besu.ethereum.api.graphql.internal.Scalars;
 
+import java.util.Locale;
+
+import graphql.GraphQLContext;
+import graphql.execution.CoercedVariables;
+import graphql.language.FloatValue;
 import graphql.language.StringValue;
 import graphql.schema.CoercingParseLiteralException;
 import graphql.schema.CoercingParseValueException;
@@ -25,17 +31,11 @@
 import graphql.schema.GraphQLScalarType;
 import org.apache.tuweni.bytes.Bytes32;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
 
-@RunWith(MockitoJUnitRunner.class)
 public class Bytes32ScalarTest {
 
   private GraphQLScalarType scalar;
-  @Rule public ExpectedException thrown = ExpectedException.none();
 
   private final String str = "0x1234567812345678123456781234567812345678123456781234567812345678";
   private final Bytes32 value = Bytes32.fromHexString(str);
@@ -44,44 +44,81 @@ public class Bytes32ScalarTest {
 
   @Test
   public void pareValueTest() {
-    final String result = (String) scalar.getCoercing().parseValue(value);
-    assertThat(result).isEqualTo(str);
+    final var result =
+        scalar.getCoercing().parseValue(str, GraphQLContext.newContext().build(), Locale.ENGLISH);
+    assertThat(result).isEqualTo(value);
   }
 
   @Test
-  public void pareValueErrorTest() {
-    thrown.expect(CoercingParseValueException.class);
-    scalar.getCoercing().parseValue(str);
+  public void parseValueErrorTest() {
+    assertThatThrownBy(
+            () ->
+                scalar
+                    .getCoercing()
+                    .parseValue(3.2f, GraphQLContext.newContext().build(), Locale.ENGLISH))
+        .isInstanceOf(CoercingParseValueException.class);
   }
 
   @Test
   public void serializeTest() {
-    final String result = (String) scalar.getCoercing().serialize(value);
+    final String result =
+        (String)
+            scalar
+                .getCoercing()
+                .serialize(value, GraphQLContext.newContext().build(), Locale.ENGLISH);
     assertThat(result).isEqualTo(str);
   }
 
   @Test
   public void serializeErrorTest() {
-    thrown.expect(CoercingSerializeException.class);
-    scalar.getCoercing().serialize(str);
+    assertThatThrownBy(
+            () ->
+                scalar
+                    .getCoercing()
+                    .serialize(3.2f, GraphQLContext.newContext().build(), Locale.ENGLISH))
+        .isInstanceOf(CoercingSerializeException.class);
   }
 
   @Test
-  public void pareLiteralTest() {
-    final Bytes32 result = (Bytes32) scalar.getCoercing().parseLiteral(strValue);
+  public void parseLiteralTest() {
+    final Bytes32 result =
+        (Bytes32)
+            scalar
+                .getCoercing()
+                .parseLiteral(
+                    strValue,
+                    CoercedVariables.emptyVariables(),
+                    GraphQLContext.newContext().build(),
+                    Locale.ENGLISH);
     assertThat(result).isEqualTo(value);
   }
 
   @Test
-  public void pareLiteralErrorTest() {
-    thrown.expect(CoercingParseLiteralException.class);
-    scalar.getCoercing().parseLiteral(str);
+  public void parseLiteralErrorTest() {
+    assertThatThrownBy(
+            () ->
+                scalar
+                    .getCoercing()
+                    .parseLiteral(
+                        FloatValue.of(3.2f),
+                        CoercedVariables.emptyVariables(),
+                        GraphQLContext.newContext().build(),
+                        Locale.ENGLISH))
+        .isInstanceOf(CoercingParseLiteralException.class);
   }
 
   @Test
-  public void pareLiteralErrorTest2() {
-    thrown.expect(CoercingParseLiteralException.class);
-    scalar.getCoercing().parseLiteral(invalidStrValue);
+  public void parseLiteralErrorTest2() {
+    assertThatThrownBy(
+            () ->
+                scalar
+                    .getCoercing()
+                    .parseLiteral(
+                        invalidStrValue,
+                        CoercedVariables.emptyVariables(),
+                        GraphQLContext.newContext().build(),
+                        Locale.ENGLISH))
+        .isInstanceOf(CoercingParseLiteralException.class);
   }
 
   @Before
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/BytesScalarTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/BytesScalarTest.java
index 07a8be194f2..ae7204833b6 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/BytesScalarTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/BytesScalarTest.java
@@ -15,9 +15,15 @@
 package org.hyperledger.besu.ethereum.api.graphql.scalar;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.hyperledger.besu.ethereum.api.graphql.internal.Scalars;
 
+import java.util.Locale;
+
+import graphql.GraphQLContext;
+import graphql.execution.CoercedVariables;
+import graphql.language.FloatValue;
 import graphql.language.StringValue;
 import graphql.schema.CoercingParseLiteralException;
 import graphql.schema.CoercingParseValueException;
@@ -25,17 +31,11 @@
 import graphql.schema.GraphQLScalarType;
 import org.apache.tuweni.bytes.Bytes;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
 
-@RunWith(MockitoJUnitRunner.class)
 public class BytesScalarTest {
 
   private GraphQLScalarType scalar;
-  @Rule public ExpectedException thrown = ExpectedException.none();
 
   private final String str = "0x10";
   private final Bytes value = Bytes.fromHexString(str);
@@ -43,45 +43,82 @@ public class BytesScalarTest {
   private final StringValue invalidStrValue = StringValue.newStringValue("0xgh").build();
 
   @Test
-  public void pareValueTest() {
-    final String result = (String) scalar.getCoercing().parseValue(value);
-    assertThat(result).isEqualTo(str);
+  public void parseValueTest() {
+    final var result =
+        scalar.getCoercing().parseValue(str, GraphQLContext.newContext().build(), Locale.ENGLISH);
+    assertThat(result).isEqualTo(value);
   }
 
   @Test
-  public void pareValueErrorTest() {
-    thrown.expect(CoercingParseValueException.class);
-    scalar.getCoercing().parseValue(str);
+  public void parseValueErrorTest() {
+    assertThatThrownBy(
+            () ->
+                scalar
+                    .getCoercing()
+                    .parseValue(3.2f, GraphQLContext.newContext().build(), Locale.ENGLISH))
+        .isInstanceOf(CoercingParseValueException.class);
   }
 
   @Test
   public void serializeTest() {
-    final String result = (String) scalar.getCoercing().serialize(value);
+    final String result =
+        (String)
+            scalar
+                .getCoercing()
+                .serialize(value, GraphQLContext.newContext().build(), Locale.ENGLISH);
     assertThat(result).isEqualTo(str);
   }
 
   @Test
   public void serializeErrorTest() {
-    thrown.expect(CoercingSerializeException.class);
-    scalar.getCoercing().serialize(str);
+    assertThatThrownBy(
+            () ->
+                scalar
+                    .getCoercing()
+                    .serialize(3.2f, GraphQLContext.newContext().build(), Locale.ENGLISH))
+        .isInstanceOf(CoercingSerializeException.class);
   }
 
   @Test
-  public void pareLiteralTest() {
-    final Bytes result = (Bytes) scalar.getCoercing().parseLiteral(strValue);
+  public void parseLiteralTest() {
+    final Bytes result =
+        (Bytes)
+            scalar
+                .getCoercing()
+                .parseLiteral(
+                    strValue,
+                    CoercedVariables.emptyVariables(),
+                    GraphQLContext.newContext().build(),
+                    Locale.ENGLISH);
     assertThat(result).isEqualTo(value);
   }
 
   @Test
-  public void pareLiteralErrorTest() {
-    thrown.expect(CoercingParseLiteralException.class);
-    scalar.getCoercing().parseLiteral(str);
+  public void parseLiteralErrorTest() {
+    assertThatThrownBy(
+            () ->
+                scalar
+                    .getCoercing()
+                    .parseLiteral(
+                        FloatValue.of(3.2f),
+                        CoercedVariables.emptyVariables(),
+                        GraphQLContext.newContext().build(),
+                        Locale.ENGLISH))
+        .isInstanceOf(CoercingParseLiteralException.class);
   }
 
   @Test
-  public void pareLiteralErrorTest2() {
-    thrown.expect(CoercingParseLiteralException.class);
-    scalar.getCoercing().parseLiteral(invalidStrValue);
+  public void parseLiteralErrorTest2() {
+    assertThatThrownBy(
+            () ->
+                scalar
+                    .getCoercing()
+                    .parseLiteral(
+                        invalidStrValue,
+                        CoercedVariables.emptyVariables(),
+                        GraphQLContext.newContext().build(),
+                        Locale.ENGLISH))
+        .isInstanceOf(CoercingParseLiteralException.class);
   }
 
   @Before
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/LongScalarTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/LongScalarTest.java
index 8691ec0617b..3a0861fa84e 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/LongScalarTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/graphql/scalar/LongScalarTest.java
@@ -15,26 +15,25 @@
 package org.hyperledger.besu.ethereum.api.graphql.scalar;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.hyperledger.besu.ethereum.api.graphql.internal.Scalars;
 
+import java.util.Locale;
+
+import graphql.GraphQLContext;
+import graphql.execution.CoercedVariables;
 import graphql.language.StringValue;
 import graphql.schema.CoercingParseLiteralException;
 import graphql.schema.CoercingParseValueException;
 import graphql.schema.CoercingSerializeException;
 import graphql.schema.GraphQLScalarType;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
 
-@RunWith(MockitoJUnitRunner.class)
 public class LongScalarTest {
 
   private GraphQLScalarType scalar;
-  @Rule public ExpectedException thrown = ExpectedException.none();
 
   private final String str = "0xf4240";
   private final Long value = Long.decode(str);
@@ -43,52 +42,102 @@ public class LongScalarTest {
 
   @Test
   public void parseLongValueTest() {
-    assertThat(scalar.getCoercing().parseValue(value)).isEqualTo(value);
+    assertThat(
+            scalar
+                .getCoercing()
+                .parseValue(value, GraphQLContext.newContext().build(), Locale.ENGLISH))
+        .isEqualTo(value);
   }
 
   @Test
   public void parseStringValueTest() {
-    assertThat(scalar.getCoercing().parseValue(str)).isEqualTo(value);
+    assertThat(
+            scalar
+                .getCoercing()
+                .parseValue(str, GraphQLContext.newContext().build(), Locale.ENGLISH))
+        .isEqualTo(value);
   }
 
   @Test
-  public void pareValueErrorTest() {
-    thrown.expect(CoercingParseValueException.class);
-    scalar.getCoercing().parseValue(invalidStrValue);
+  public void parseValueErrorTest() {
+    assertThatThrownBy(
+            () ->
+                scalar
+                    .getCoercing()
+                    .parseValue(
+                        invalidStrValue, GraphQLContext.newContext().build(), Locale.ENGLISH))
+        .isInstanceOf(CoercingParseValueException.class);
   }
 
   @Test
   public void serializeLongTest() {
-    assertThat(scalar.getCoercing().serialize(value)).isEqualTo(value);
+    assertThat(
+            scalar
+                .getCoercing()
+                .serialize(value, GraphQLContext.newContext().build(), Locale.ENGLISH))
+        .isEqualTo(str);
   }
 
   @Test
   public void serializeStringTest() {
-    assertThat(scalar.getCoercing().serialize(str)).isEqualTo(value);
+    assertThat(
+            scalar
+                .getCoercing()
+                .serialize(str, GraphQLContext.newContext().build(), Locale.ENGLISH))
+        .isEqualTo(str);
   }
 
   @Test
   public void serializeErrorTest() {
-    thrown.expect(CoercingSerializeException.class);
-    scalar.getCoercing().serialize(invalidStrValue);
+    assertThatThrownBy(
+            () ->
+                scalar
+                    .getCoercing()
+                    .serialize(
+                        invalidStrValue, GraphQLContext.newContext().build(), Locale.ENGLISH))
+        .isInstanceOf(CoercingSerializeException.class);
   }
 
   @Test
-  public void pareLiteralTest() {
-    final Long result = (Long) scalar.getCoercing().parseLiteral(strValue);
+  public void parseLiteralTest() {
+    final Long result =
+        (Long)
+            scalar
+                .getCoercing()
+                .parseLiteral(
+                    strValue,
+                    CoercedVariables.emptyVariables(),
+                    GraphQLContext.newContext().build(),
+                    Locale.ENGLISH);
     assertThat(result).isEqualTo(value);
   }
 
   @Test
-  public void pareLiteralErrorTest() {
-    thrown.expect(CoercingParseLiteralException.class);
-    scalar.getCoercing().parseLiteral(str);
+  public void parseLiteralStringTest() {
+    final Long result =
+        (Long)
+            scalar
+                .getCoercing()
+                .parseLiteral(
+                    strValue,
+                    CoercedVariables.emptyVariables(),
+                    GraphQLContext.newContext().build(),
+                    Locale.ENGLISH);
+    assertThat(result).isEqualTo(value);
   }
 
   @Test
-  public void pareLiteralErrorTest2() {
-    thrown.expect(CoercingParseLiteralException.class);
-    scalar.getCoercing().parseLiteral(invalidStrValue);
+  public void parseLiteralErrorTest2() {
+    assertThatThrownBy(
+            () ->
+                scalar
+                    .getCoercing()
+                    .parseLiteral(
+                        invalidStrValue,
+                        CoercedVariables.emptyVariables(),
+                        GraphQLContext.newContext().build(),
+                        Locale.ENGLISH))
+        .isInstanceOf(CoercingParseLiteralException.class);
   }
 
   @Before
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AbstractJsonRpcHttpBySpecTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AbstractJsonRpcHttpBySpecTest.java
index 80232a7e7d1..4bb9fb11479 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AbstractJsonRpcHttpBySpecTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AbstractJsonRpcHttpBySpecTest.java
@@ -27,8 +27,11 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -49,9 +52,16 @@
 public abstract class AbstractJsonRpcHttpBySpecTest extends AbstractJsonRpcHttpServiceTest {
 
   private static final ObjectMapper objectMapper = new ObjectMapper();
+  private static final Pattern GAS_MATCH_FOR_STATE_DIFF =
+      Pattern.compile("\"balance\":(?!\"=\").*?},");
+  private static final Pattern GAS_MATCH_FOR_VM_TRACE =
+      Pattern.compile(",*\"cost\":[0-9a-fA-F]+,*|,\"used\":[0-9a-fA-F]+");
+  private static final Pattern GAS_MATCH_FOR_TRACE =
+      Pattern.compile("\"gasUsed\":\"[x0-9a-fA-F]+\",");
+
   private final URL specURL;
 
-  AbstractJsonRpcHttpBySpecTest(final String specName, final URL specURL) {
+  protected AbstractJsonRpcHttpBySpecTest(final String specName, final URL specURL) {
     this.specURL = specURL;
   }
 
@@ -68,7 +78,8 @@ public void jsonRPCCallWithSpecFile() throws Exception {
    * @return Parameters for this test which will contain the name of the test and the url of the
    *     spec file to run.
    */
-  static Object[][] findSpecFiles(final String... subDirectoryPaths) {
+  public static Object[][] findSpecFiles(
+      final String[] subDirectoryPaths, final String... exceptions) {
     final List<Object[]> specFiles = new ArrayList<>();
     for (final String path : subDirectoryPaths) {
       final URL url = AbstractJsonRpcHttpBySpecTest.class.getResource(path);
@@ -83,6 +94,7 @@ static Object[][] findSpecFiles(final String... subDirectoryPaths) {
         s.map(Path::toFile)
             .filter(f -> f.getPath().endsWith(".json"))
             .filter(f -> !f.getPath().contains("genesis"))
+            .filter(f -> Arrays.stream(exceptions).noneMatch(f.getPath()::contains))
             .map(AbstractJsonRpcHttpBySpecTest::fileToParams)
             .forEach(specFiles::add);
       } catch (final IOException e) {
@@ -110,7 +122,8 @@ private void jsonRPCCall(final URL specFile) throws IOException {
     final String json = Resources.toString(specFile, Charsets.UTF_8);
     final ObjectNode specNode = (ObjectNode) objectMapper.readTree(json);
     final String rawRequestBody = specNode.get("request").toString();
-    final RequestBody requestBody = RequestBody.create(JSON, rawRequestBody);
+
+    final RequestBody requestBody = RequestBody.create(rawRequestBody, JSON);
     final Request request = new Request.Builder().post(requestBody).url(baseUrl).build();
 
     try (final Response resp = client.newCall(request).execute()) {
@@ -122,7 +135,11 @@ private void jsonRPCCall(final URL specFile) throws IOException {
         try {
           final ObjectNode responseBody =
               (ObjectNode) objectMapper.readTree(Objects.requireNonNull(resp.body()).string());
-          checkResponse(responseBody, (ObjectNode) expectedResponse);
+          checkResponse(
+              responseBody,
+              (ObjectNode) expectedResponse,
+              getMethod(rawRequestBody),
+              getTraceType(specFile.toString()));
         } catch (final Exception e) {
           throw new RuntimeException("Unable to parse response as json object", e);
         }
@@ -136,13 +153,52 @@ private void jsonRPCCall(final URL specFile) throws IOException {
         }
         for (int i = 0; i < ((ArrayNode) expectedResponse).size(); i++) {
           checkResponse(
-              (ObjectNode) responseBody.get(i), (ObjectNode) ((ArrayNode) expectedResponse).get(i));
+              (ObjectNode) responseBody.get(i),
+              (ObjectNode) ((ArrayNode) expectedResponse).get(i),
+              getMethod(rawRequestBody),
+              getTraceType(specFile.toString()));
         }
       }
     }
   }
 
-  private void checkResponse(final ObjectNode responseBody, final ObjectNode expectedResponse)
+  private enum Method {
+    TRACE_CALL_MANY,
+    OTHER
+  }
+
+  private enum TraceType {
+    TRACE,
+    VM_TRACE,
+    STATE_DIFF,
+    OTHER
+  }
+
+  private Method getMethod(final String rawRequest) {
+    if (rawRequest.contains("\"method\":\"trace_callMany\"")) {
+      return Method.TRACE_CALL_MANY;
+    } else {
+      return Method.OTHER;
+    }
+  }
+
+  private TraceType getTraceType(final String fileName) {
+    if (fileName.contains("_trace")) {
+      return TraceType.TRACE;
+    } else if (fileName.contains("_vmTrace")) {
+      return TraceType.VM_TRACE;
+    } else if (fileName.contains("_stateDiff")) {
+      return TraceType.STATE_DIFF;
+    } else {
+      return TraceType.OTHER;
+    }
+  }
+
+  private void checkResponse(
+      final ObjectNode responseBody,
+      final ObjectNode expectedResponse,
+      final Method method,
+      final TraceType traceType)
       throws JsonProcessingException {
     // Check id
     final String actualId = responseBody.get("id").toString();
@@ -157,17 +213,48 @@ private void checkResponse(final ObjectNode responseBody, final ObjectNode expec
     // Check result
     if (expectedResponse.has("result")) {
       assertThat(responseBody.has("result")).isTrue();
-      final String expectedResult = expectedResponse.get("result").toString();
-      final String actualResult = responseBody.get("result").toString();
+
+      String expectedResult = expectedResponse.get("result").toString();
+      String actualResult = responseBody.get("result").toString();
+
+      if (method.equals(Method.TRACE_CALL_MANY)) {
+        // TODO: There are differences in gas cost (causing different balances as well). These are
+        // caused by
+        // OpenEthereum not implementing "Istanbul" correctly. Specially the SSTORE to dirty storage
+        // Slots should cost 800 gas rather than 5000
+        // This should be fixed, e.g. by using
+        // Erigon to
+        // create the expected output, or by making OpenEthereum work correctly.
+        switch (traceType) {
+          case TRACE:
+            expectedResult = filterStringTrace(expectedResult);
+            actualResult = filterStringTrace(actualResult);
+            break;
+          case VM_TRACE:
+            expectedResult = filterStringVmTrace(expectedResult);
+            actualResult = filterStringVmTrace(actualResult);
+            break;
+          case STATE_DIFF:
+            expectedResult = filterStringStateDiff(expectedResult);
+            actualResult = filterStringStateDiff(actualResult);
+            break;
+          default:
+            throw new RuntimeException(
+                "Unrecognized trace type (expected trace | vmTrace | stateDiff)");
+        }
+      }
+
       final ObjectMapper mapper = new ObjectMapper();
       mapper.configure(INDENT_OUTPUT, true);
       assertThat(
               mapper
                   .writerWithDefaultPrettyPrinter()
+                  .withoutAttribute("creationMethod")
                   .writeValueAsString(mapper.readTree(actualResult)))
           .isEqualTo(
               mapper
                   .writerWithDefaultPrettyPrinter()
+                  .withoutAttribute("creationMethod")
                   .writeValueAsString(mapper.readTree(expectedResult)));
     }
 
@@ -179,4 +266,19 @@ private void checkResponse(final ObjectNode responseBody, final ObjectNode expec
       assertThat(actualError).isEqualToIgnoringWhitespace(expectedError);
     }
   }
+
+  private String filterStringStateDiff(final String expectedResult) {
+    final Matcher m = GAS_MATCH_FOR_STATE_DIFF.matcher(expectedResult);
+    return m.replaceAll("");
+  }
+
+  private String filterStringVmTrace(final String expectedResult) {
+    final Matcher m = GAS_MATCH_FOR_VM_TRACE.matcher(expectedResult);
+    return m.replaceAll("");
+  }
+
+  private String filterStringTrace(final String expectedResult) {
+    final Matcher m = GAS_MATCH_FOR_TRACE.matcher(expectedResult);
+    return m.replaceAll("");
+  }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AbstractJsonRpcHttpServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AbstractJsonRpcHttpServiceTest.java
index 771f522c80e..1b7a536d0b5 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AbstractJsonRpcHttpServiceTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AbstractJsonRpcHttpServiceTest.java
@@ -21,6 +21,7 @@
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.config.StubGenesisConfigOptions;
+import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterIdGenerator;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
@@ -30,7 +31,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.methods.JsonRpcMethodsFactory;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
 import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
@@ -43,6 +44,7 @@
 import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
 import org.hyperledger.besu.nat.NatService;
@@ -59,6 +61,7 @@
 import java.util.Set;
 
 import io.vertx.core.Vertx;
+import io.vertx.core.VertxOptions;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import org.junit.After;
@@ -73,32 +76,44 @@ public abstract class AbstractJsonRpcHttpServiceTest {
 
   protected static String CLIENT_VERSION = "TestClientVersion/0.1.0";
   protected static final BigInteger NETWORK_ID = BigInteger.valueOf(123);
-  protected static final Collection<RpcApi> JSON_RPC_APIS =
-      Arrays.asList(RpcApis.ETH, RpcApis.NET, RpcApis.WEB3, RpcApis.DEBUG, RpcApis.TRACE);
+  protected static final Collection<String> JSON_RPC_APIS =
+      Arrays.asList(
+          RpcApis.ETH.name(),
+          RpcApis.NET.name(),
+          RpcApis.WEB3.name(),
+          RpcApis.DEBUG.name(),
+          RpcApis.TRACE.name());
 
   protected final Vertx vertx = Vertx.vertx();
+  protected final Vertx syncVertx = Vertx.vertx(new VertxOptions().setWorkerPoolSize(1));
   protected JsonRpcHttpService service;
   protected OkHttpClient client;
   protected String baseUrl;
   protected final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
   protected FilterManager filterManager;
 
-  private void setupBlockchain() {
-    blockchainSetupUtil = getBlockchainSetupUtil();
+  protected void setupBlockchain() {
+    blockchainSetupUtil = getBlockchainSetupUtil(DataStorageFormat.FOREST);
     blockchainSetupUtil.importAllBlocks();
   }
 
-  protected BlockchainSetupUtil getBlockchainSetupUtil() {
-    return BlockchainSetupUtil.forTesting();
+  protected void setupBonsaiBlockchain() {
+    blockchainSetupUtil = getBlockchainSetupUtil(DataStorageFormat.BONSAI);
+    blockchainSetupUtil.importAllBlocks();
+  }
+
+  protected BlockchainSetupUtil getBlockchainSetupUtil(final DataStorageFormat storageFormat) {
+    return BlockchainSetupUtil.forTesting(storageFormat);
   }
 
   protected BlockchainSetupUtil createBlockchainSetupUtil(
-      final String genesisPath, final String blocksPath) {
+      final String genesisPath, final String blocksPath, final DataStorageFormat storageFormat) {
     final URL genesisURL = AbstractJsonRpcHttpServiceTest.class.getResource(genesisPath);
     final URL blocksURL = AbstractJsonRpcHttpServiceTest.class.getResource(blocksPath);
     checkArgument(genesisURL != null, "Unable to locate genesis file: " + genesisPath);
     checkArgument(blocksURL != null, "Unable to locate blocks file: " + blocksPath);
-    return BlockchainSetupUtil.createForEthashChain(new ChainResources(genesisURL, blocksURL));
+    return BlockchainSetupUtil.createForEthashChain(
+        new ChainResources(genesisURL, blocksURL), storageFormat);
   }
 
   @Before
@@ -106,22 +121,24 @@ public void setup() throws Exception {
     setupBlockchain();
   }
 
-  protected BlockchainSetupUtil startServiceWithEmptyChain() throws Exception {
-    final BlockchainSetupUtil emptySetupUtil = getBlockchainSetupUtil();
+  protected BlockchainSetupUtil startServiceWithEmptyChain(final DataStorageFormat storageFormat)
+      throws Exception {
+    final BlockchainSetupUtil emptySetupUtil = getBlockchainSetupUtil(storageFormat);
     startService(emptySetupUtil);
     return emptySetupUtil;
   }
 
   protected Map<String, JsonRpcMethod> getRpcMethods(
       final JsonRpcConfiguration config, final BlockchainSetupUtil blockchainSetupUtil) {
+    final ProtocolContext protocolContext = mock(ProtocolContext.class);
     final Synchronizer synchronizerMock = mock(Synchronizer.class);
     final P2PNetwork peerDiscoveryMock = mock(P2PNetwork.class);
     final TransactionPool transactionPoolMock = mock(TransactionPool.class);
-    final EthHashMiningCoordinator miningCoordinatorMock = mock(EthHashMiningCoordinator.class);
-    when(transactionPoolMock.addLocalTransaction(any(Transaction.class)))
+    final PoWMiningCoordinator miningCoordinatorMock = mock(PoWMiningCoordinator.class);
+    when(transactionPoolMock.addTransactionViaApi(any(Transaction.class)))
         .thenReturn(ValidationResult.valid());
     // nonce too low tests uses a tx with nonce=16
-    when(transactionPoolMock.addLocalTransaction(argThat(tx -> tx.getNonce() == 16)))
+    when(transactionPoolMock.addTransactionViaApi(argThat(tx -> tx.getNonce() == 16)))
         .thenReturn(ValidationResult.invalid(TransactionInvalidReason.NONCE_TOO_LOW));
     final PendingTransactions pendingTransactionsMock = mock(PendingTransactions.class);
     when(transactionPoolMock.getPendingTransactions()).thenReturn(pendingTransactionsMock);
@@ -156,6 +173,7 @@ protected Map<String, JsonRpcMethod> getRpcMethods(
             blockchainQueries,
             synchronizerMock,
             blockchainSetupUtil.getProtocolSchedule(),
+            protocolContext,
             filterManager,
             transactionPoolMock,
             miningCoordinatorMock,
@@ -171,7 +189,10 @@ protected Map<String, JsonRpcMethod> getRpcMethods(
             natService,
             new HashMap<>(),
             folder.getRoot().toPath(),
-            mock(EthPeers.class));
+            mock(EthPeers.class),
+            syncVertx,
+            Optional.empty(),
+            Optional.empty());
   }
 
   protected void startService() throws Exception {
@@ -185,6 +206,7 @@ private void startService(final BlockchainSetupUtil blockchainSetupUtil) throws
     final NatService natService = new NatService(Optional.empty());
 
     config.setPort(0);
+    config.setMaxBatchSize(10);
     service =
         new JsonRpcHttpService(
             vertx,
@@ -207,5 +229,6 @@ public void shutdownServer() {
     client.connectionPool().evictAll();
     service.stop().join();
     vertx.close();
+    syncVertx.close();
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AdminJsonRpcHttpServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AdminJsonRpcHttpServiceTest.java
index 84edfef7f92..3b2497d18e7 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AdminJsonRpcHttpServiceTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AdminJsonRpcHttpServiceTest.java
@@ -17,6 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo;
@@ -25,6 +26,7 @@
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.StringTokenizer;
 
@@ -34,13 +36,19 @@
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.junit.BeforeClass;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class AdminJsonRpcHttpServiceTest extends JsonRpcHttpServiceTest {
-  private static final Logger LOG = LogManager.getLogger();
+public class AdminJsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
+  private static final Logger LOG = LoggerFactory.getLogger(AdminJsonRpcHttpServiceTest.class);
+
+  @BeforeClass
+  public static void setup() throws Exception {
+    initServerAndClient();
+  }
 
   @Test
   public void getPeers() throws Exception {
@@ -49,11 +57,14 @@ public void getPeers() throws Exception {
     caps.add(Capability.create("eth", 62));
     final List<EthPeer> peerList = new ArrayList<>();
     final PeerInfo info1 =
-        new PeerInfo(4, CLIENT_VERSION, caps, 30302, Bytes.fromHexString("0001"));
+        new PeerInfo(
+            4, CLIENT_VERSION, caps, 30302, Bytes.fromHexString(String.format("%0128x", 1)));
     final PeerInfo info2 =
-        new PeerInfo(4, CLIENT_VERSION, caps, 60302, Bytes.fromHexString("0002"));
+        new PeerInfo(
+            4, CLIENT_VERSION, caps, 60302, Bytes.fromHexString(String.format("%0128x", 2)));
     final PeerInfo info3 =
-        new PeerInfo(4, CLIENT_VERSION, caps, 60303, Bytes.fromHexString("0003"));
+        new PeerInfo(
+            4, CLIENT_VERSION, caps, 60303, Bytes.fromHexString(String.format("%0128x", 3)));
     final InetSocketAddress addr30301 = new InetSocketAddress("localhost", 30301);
     final InetSocketAddress addr30302 = new InetSocketAddress("localhost", 30302);
     final InetSocketAddress addr60301 = new InetSocketAddress("localhost", 60301);
@@ -66,21 +77,30 @@ public void getPeers() throws Exception {
             "eth",
             c -> {},
             List.of(),
-            TestClock.fixed()));
+            EthProtocolConfiguration.DEFAULT_MAX_MESSAGE_SIZE,
+            TestClock.fixed(),
+            Collections.emptyList(),
+            Bytes.random(64)));
     peerList.add(
         new EthPeer(
             MockPeerConnection.create(info2, addr30301, addr60302),
             "eth",
             c -> {},
             List.of(),
-            TestClock.fixed()));
+            EthProtocolConfiguration.DEFAULT_MAX_MESSAGE_SIZE,
+            TestClock.fixed(),
+            Collections.emptyList(),
+            Bytes.random(64)));
     peerList.add(
         new EthPeer(
             MockPeerConnection.create(info3, addr30301, addr60303),
             "eth",
             c -> {},
             List.of(),
-            TestClock.fixed()));
+            EthProtocolConfiguration.DEFAULT_MAX_MESSAGE_SIZE,
+            TestClock.fixed(),
+            Collections.emptyList(),
+            Bytes.random(64)));
 
     when(ethPeersMock.streamAllPeers()).thenReturn(peerList.stream());
     when(peerDiscoveryMock.getPeerCount()).thenReturn(peerList.size());
@@ -88,8 +108,8 @@ public void getPeers() throws Exception {
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
-            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"admin_peers\"}");
+            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"admin_peers\"}",
+            JSON);
     final Request request = new Request.Builder().post(body).url(baseUrl).build();
     LOG.info("Request: " + request);
     try (final Response resp = client.newCall(request).execute()) {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/DebugJsonRpcHttpBySpecTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/DebugJsonRpcHttpBySpecTest.java
deleted file mode 100644
index 23d11ba76f9..00000000000
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/DebugJsonRpcHttpBySpecTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.api.jsonrpc;
-
-import java.net.URL;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class DebugJsonRpcHttpBySpecTest extends AbstractJsonRpcHttpBySpecTest {
-
-  public DebugJsonRpcHttpBySpecTest(final String specName, final URL specURL) {
-    super(specName, specURL);
-  }
-
-  @Override
-  public void setup() throws Exception {
-    super.setup();
-    startService();
-  }
-
-  @Parameters(name = "{index}: {0}")
-  public static Object[][] specs() {
-    return findSpecFiles("debug");
-  }
-}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/EthJsonRpcHttpBySpecTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/EthJsonRpcHttpBySpecTest.java
deleted file mode 100644
index 65297951659..00000000000
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/EthJsonRpcHttpBySpecTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.api.jsonrpc;
-
-import java.net.URL;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class EthJsonRpcHttpBySpecTest extends AbstractJsonRpcHttpBySpecTest {
-
-  public EthJsonRpcHttpBySpecTest(final String specName, final URL specURL) {
-    super(specName, specURL);
-  }
-
-  @Override
-  public void setup() throws Exception {
-    super.setup();
-    startService();
-  }
-
-  @Parameters(name = "{index}: {0}")
-  public static Object[][] specs() {
-    return findSpecFiles("eth");
-  }
-}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonResponseStreamerTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonResponseStreamerTest.java
new file mode 100644
index 00000000000..3e3f8efc152
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonResponseStreamerTest.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright Hyperledger Besu contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.HttpServerResponse;
+import io.vertx.core.impl.future.FailedFuture;
+import io.vertx.core.impl.future.SucceededFuture;
+import io.vertx.core.net.SocketAddress;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatcher;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class JsonResponseStreamerTest {
+  private final SocketAddress testAddress = SocketAddress.domainSocketAddress("test");
+
+  @Mock private HttpServerResponse httpResponse;
+
+  @Mock private HttpServerResponse failedResponse;
+
+  @Before
+  public void before() {
+    when(httpResponse.write(any(Buffer.class))).thenReturn(new SucceededFuture<>(null, null));
+    when(failedResponse.write(any(Buffer.class)))
+        .thenReturn(new FailedFuture<Void>(new IOException()));
+  }
+
+  @Test
+  public void writeSingleChar() throws IOException {
+    JsonResponseStreamer streamer = new JsonResponseStreamer(httpResponse, testAddress);
+    streamer.write('x');
+
+    verify(httpResponse).write(argThat(bufferContains("x")));
+  }
+
+  @Test
+  public void writeString() throws IOException {
+    JsonResponseStreamer streamer = new JsonResponseStreamer(httpResponse, testAddress);
+    streamer.write("xyz".getBytes(StandardCharsets.UTF_8));
+
+    verify(httpResponse).write(argThat(bufferContains("xyz")));
+  }
+
+  @Test
+  public void writeSubString() throws IOException {
+    JsonResponseStreamer streamer = new JsonResponseStreamer(httpResponse, testAddress);
+    streamer.write("abcxyz".getBytes(StandardCharsets.UTF_8), 1, 3);
+
+    verify(httpResponse).write(argThat(bufferContains("bcx")));
+  }
+
+  @Test
+  public void writeTwice() throws IOException {
+    JsonResponseStreamer streamer = new JsonResponseStreamer(httpResponse, testAddress);
+    streamer.write("xyz".getBytes(StandardCharsets.UTF_8));
+    streamer.write('\n');
+
+    verify(httpResponse).write(argThat(bufferContains("xyz")));
+    verify(httpResponse).write(argThat(bufferContains("\n")));
+  }
+
+  @Test
+  public void writeStringAndClose() throws IOException {
+    try (JsonResponseStreamer streamer = new JsonResponseStreamer(httpResponse, testAddress)) {
+      streamer.write("xyz".getBytes(StandardCharsets.UTF_8));
+    }
+
+    verify(httpResponse).write(argThat(bufferContains("xyz")));
+    verify(httpResponse).end();
+  }
+
+  @Test
+  public void stopOnError() throws IOException {
+    try (JsonResponseStreamer streamer = new JsonResponseStreamer(failedResponse, testAddress)) {
+      streamer.write("xyz".getBytes(StandardCharsets.UTF_8));
+      assertThatThrownBy(() -> streamer.write("abc".getBytes(StandardCharsets.UTF_8)))
+          .isInstanceOf(IOException.class);
+    }
+
+    verify(failedResponse).write(argThat(bufferContains("xyz")));
+    verify(failedResponse, never()).write(argThat(bufferContains("abc")));
+    verify(failedResponse).end();
+  }
+
+  private ArgumentMatcher<Buffer> bufferContains(final String text) {
+    return buf -> buf.toString().equals(text);
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcConfigurationTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcConfigurationTest.java
index 37c3743d64b..d912193b9fc 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcConfigurationTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcConfigurationTest.java
@@ -15,6 +15,9 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.DEFAULT_RPC_APIS;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.JwtAlgorithm;
 
 import java.util.Optional;
 
@@ -31,8 +34,11 @@ public void defaultConfiguration() {
     assertThat(configuration.getHost()).isEqualTo("127.0.0.1");
     assertThat(configuration.getPort()).isEqualTo(8545);
     assertThat(configuration.getCorsAllowedDomains()).isEmpty();
-    assertThat(configuration.getRpcApis())
-        .containsExactlyInAnyOrder(RpcApis.ETH, RpcApis.NET, RpcApis.WEB3);
+    assertThat(configuration.getRpcApis()).containsExactlyInAnyOrderElementsOf(DEFAULT_RPC_APIS);
+    assertThat(configuration.getNoAuthRpcApis()).isEmpty();
+    assertThat(configuration.getMaxActiveConnections())
+        .isEqualTo(JsonRpcConfiguration.DEFAULT_MAX_ACTIVE_CONNECTIONS);
+    assertThat(configuration.getAuthenticationAlgorithm()).isEqualTo(JwtAlgorithm.RS256);
   }
 
   @Test
@@ -44,7 +50,7 @@ public void corsAllowedOriginsDefaultShouldBeEmptyList() {
   @Test
   public void rpcApiDefaultShouldBePredefinedList() {
     final JsonRpcConfiguration configuration = JsonRpcConfiguration.createDefault();
-    assertThat(configuration.getRpcApis()).containsExactly(RpcApis.ETH, RpcApis.NET, RpcApis.WEB3);
+    assertThat(configuration.getRpcApis()).containsExactlyElementsOf(DEFAULT_RPC_APIS);
   }
 
   @Test
@@ -62,11 +68,26 @@ public void settingCorsAllowedOriginsShouldOverridePreviousValues() {
   public void settingRpcApisShouldOverridePreviousValues() {
     final JsonRpcConfiguration configuration = JsonRpcConfiguration.createDefault();
 
-    configuration.setRpcApis(Lists.newArrayList(RpcApis.ETH, RpcApis.MINER));
-    assertThat(configuration.getRpcApis()).containsExactly(RpcApis.ETH, RpcApis.MINER);
+    configuration.setRpcApis(Lists.newArrayList(RpcApis.ETH.name(), RpcApis.MINER.name()));
+    assertThat(configuration.getRpcApis())
+        .containsExactly(RpcApis.ETH.name(), RpcApis.MINER.name());
+
+    configuration.setRpcApis(Lists.newArrayList(RpcApis.DEBUG.name()));
+    assertThat(configuration.getRpcApis()).containsExactly(RpcApis.DEBUG.name());
+  }
+
+  @Test
+  public void settingNoAuthRpcApisShouldOverridePreviousValues() {
+    final JsonRpcConfiguration configuration = JsonRpcConfiguration.createDefault();
+
+    configuration.setNoAuthRpcApis(
+        Lists.newArrayList(RpcMethod.ADMIN_ADD_PEER.name(), RpcMethod.ADMIN_PEERS.name()));
+    assertThat(configuration.getNoAuthRpcApis())
+        .containsExactly(RpcMethod.ADMIN_ADD_PEER.name(), RpcMethod.ADMIN_PEERS.name());
 
-    configuration.setRpcApis(Lists.newArrayList(RpcApis.DEBUG));
-    assertThat(configuration.getRpcApis()).containsExactly(RpcApis.DEBUG);
+    configuration.setNoAuthRpcApis(Lists.newArrayList(RpcMethod.MINER_SET_COINBASE.name()));
+    assertThat(configuration.getNoAuthRpcApis())
+        .containsExactly(RpcMethod.MINER_SET_COINBASE.name());
   }
 
   @Test
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcErrorConverterTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcErrorConverterTest.java
index f7c0cda75f3..42afd064578 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcErrorConverterTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcErrorConverterTest.java
@@ -37,8 +37,8 @@ public static Collection<Object[]> expectedErrorMapping() {
         new Object[][] {
           {TransactionInvalidReason.NONCE_TOO_LOW, JsonRpcError.NONCE_TOO_LOW},
           {TransactionInvalidReason.PRIVATE_NONCE_TOO_LOW, JsonRpcError.NONCE_TOO_LOW},
-          {TransactionInvalidReason.INCORRECT_NONCE, JsonRpcError.INCORRECT_NONCE},
-          {TransactionInvalidReason.INCORRECT_PRIVATE_NONCE, JsonRpcError.INCORRECT_NONCE},
+          {TransactionInvalidReason.NONCE_TOO_HIGH, JsonRpcError.NONCE_TOO_HIGH},
+          {TransactionInvalidReason.PRIVATE_NONCE_TOO_HIGH, JsonRpcError.NONCE_TOO_HIGH},
           {TransactionInvalidReason.INVALID_SIGNATURE, JsonRpcError.INVALID_TRANSACTION_SIGNATURE},
           {
             TransactionInvalidReason.INTRINSIC_GAS_EXCEEDS_GAS_LIMIT,
@@ -73,8 +73,7 @@ public static Collection<Object[]> expectedErrorMapping() {
           {
             TransactionInvalidReason.TRANSACTION_REPLACEMENT_UNDERPRICED,
             JsonRpcError.ETH_SEND_TX_REPLACEMENT_UNDERPRICED
-          },
-          {TransactionInvalidReason.GAS_PRICE_MUST_BE_ZERO, JsonRpcError.GAS_PRICE_MUST_BE_ZERO}
+          }
         });
   }
 
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceCorsTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceCorsTest.java
index 0b8cf755b2a..b090869bb5c 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceCorsTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceCorsTest.java
@@ -20,6 +20,7 @@
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.nat.NatService;
 
+import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Optional;
 
@@ -28,26 +29,25 @@
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class JsonRpcHttpServiceCorsTest {
-  @Rule public final TemporaryFolder folder = new TemporaryFolder();
+  @TempDir private static Path folder;
 
   private final Vertx vertx = Vertx.vertx();
   private final OkHttpClient client = new OkHttpClient();
   private JsonRpcHttpService jsonRpcHttpService;
 
-  @Before
+  @BeforeEach
   public void before() {
     final JsonRpcConfiguration configuration = JsonRpcConfiguration.createDefault();
     configuration.setPort(0);
   }
 
-  @After
+  @AfterEach
   public void after() {
     jsonRpcHttpService.stop().join();
   }
@@ -166,6 +166,21 @@ public void requestWithAnyOriginShouldSucceedWhenCorsIsStart() throws Exception
     }
   }
 
+  @Test
+  public void requestFromBrowserExtensionShouldSucceedWhenCorsIsStar() throws Exception {
+    jsonRpcHttpService = createJsonRpcHttpServiceWithAllowedDomains("*");
+
+    final Request request =
+        new Request.Builder()
+            .url(jsonRpcHttpService.url())
+            .header("Origin", "moz-extension://802123e4-a916-2d4e-bebf-384b0e2e86dd")
+            .build();
+
+    try (final Response response = client.newCall(request).execute()) {
+      assertThat(response.isSuccessful()).isTrue();
+    }
+  }
+
   @Test
   public void requestWithAccessControlRequestMethodShouldReturnAllowedHeaders() throws Exception {
     jsonRpcHttpService = createJsonRpcHttpServiceWithAllowedDomains("http://foo.io");
@@ -195,7 +210,7 @@ private JsonRpcHttpService createJsonRpcHttpServiceWithAllowedDomains(
     final JsonRpcHttpService jsonRpcHttpService =
         new JsonRpcHttpService(
             vertx,
-            folder.newFolder().toPath(),
+            folder,
             config,
             new NoOpMetricsSystem(),
             natService,
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceHostAllowlistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceHostAllowlistTest.java
new file mode 100644
index 00000000000..226197c5deb
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceHostAllowlistTest.java
@@ -0,0 +1,208 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.DEFAULT_RPC_APIS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+
+import org.hyperledger.besu.config.StubGenesisConfigOptions;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.methods.JsonRpcMethodsFactory;
+import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.core.Synchronizer;
+import org.hyperledger.besu.ethereum.eth.EthProtocol;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule;
+import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
+import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController;
+import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
+import org.hyperledger.besu.nat.NatService;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+import io.vertx.core.Vertx;
+import io.vertx.core.json.Json;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+public class JsonRpcHttpServiceHostAllowlistTest {
+
+  @ClassRule public static final TemporaryFolder folder = new TemporaryFolder();
+
+  protected static final Vertx vertx = Vertx.vertx();
+
+  private static Map<String, JsonRpcMethod> rpcMethods;
+  private static JsonRpcHttpService service;
+  private static OkHttpClient client;
+  private static String baseUrl;
+  private static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+  private static final String CLIENT_VERSION = "TestClientVersion/0.1.0";
+  private static final BigInteger CHAIN_ID = BigInteger.valueOf(123);
+
+  private final JsonRpcConfiguration jsonRpcConfig = createJsonRpcConfig();
+  private final NatService natService = new NatService(Optional.empty());
+
+  private final List<String> hostsAllowlist = Arrays.asList("ally", "friend");
+
+  @Before
+  public void initServerAndClient() throws Exception {
+    final P2PNetwork peerDiscoveryMock = mock(P2PNetwork.class);
+    final BlockchainQueries blockchainQueries = mock(BlockchainQueries.class);
+    final Synchronizer synchronizer = mock(Synchronizer.class);
+
+    final Set<Capability> supportedCapabilities = new HashSet<>();
+    supportedCapabilities.add(EthProtocol.ETH62);
+    supportedCapabilities.add(EthProtocol.ETH63);
+
+    rpcMethods =
+        spy(
+            new JsonRpcMethodsFactory()
+                .methods(
+                    CLIENT_VERSION,
+                    CHAIN_ID,
+                    new StubGenesisConfigOptions(),
+                    peerDiscoveryMock,
+                    blockchainQueries,
+                    synchronizer,
+                    MainnetProtocolSchedule.fromConfig(
+                        new StubGenesisConfigOptions().constantinopleBlock(0).chainId(CHAIN_ID)),
+                    mock(ProtocolContext.class),
+                    mock(FilterManager.class),
+                    mock(TransactionPool.class),
+                    mock(PoWMiningCoordinator.class),
+                    new NoOpMetricsSystem(),
+                    supportedCapabilities,
+                    Optional.of(mock(AccountLocalConfigPermissioningController.class)),
+                    Optional.of(mock(NodeLocalConfigPermissioningController.class)),
+                    DEFAULT_RPC_APIS,
+                    mock(PrivacyParameters.class),
+                    mock(JsonRpcConfiguration.class),
+                    mock(WebSocketConfiguration.class),
+                    mock(MetricsConfiguration.class),
+                    natService,
+                    new HashMap<>(),
+                    folder.getRoot().toPath(),
+                    mock(EthPeers.class),
+                    vertx,
+                    Optional.empty(),
+                    Optional.empty()));
+    service = createJsonRpcHttpService();
+    service.start().join();
+
+    client = new OkHttpClient();
+    baseUrl = service.url();
+  }
+
+  private JsonRpcHttpService createJsonRpcHttpService() throws Exception {
+    return new JsonRpcHttpService(
+        vertx,
+        folder.newFolder().toPath(),
+        jsonRpcConfig,
+        new NoOpMetricsSystem(),
+        natService,
+        rpcMethods,
+        HealthService.ALWAYS_HEALTHY,
+        HealthService.ALWAYS_HEALTHY);
+  }
+
+  private static JsonRpcConfiguration createJsonRpcConfig() {
+    final JsonRpcConfiguration config = JsonRpcConfiguration.createDefault();
+    config.setPort(0);
+    return config;
+  }
+
+  @After
+  public void shutdownServer() {
+    service.stop().join();
+  }
+
+  @Test
+  public void requestWithDefaultHeaderAndDefaultConfigIsAccepted() throws IOException {
+    assertThat(doRequest("localhost:50012")).isEqualTo(200);
+  }
+
+  @Test
+  public void requestWithEmptyHeaderAndDefaultConfigIsRejected() throws IOException {
+    assertThat(doRequest("")).isEqualTo(403);
+  }
+
+  @Test
+  public void requestWithAnyHostnameAndWildcardConfigIsAccepted() throws IOException {
+    jsonRpcConfig.setHostsAllowlist(Collections.singletonList("*"));
+    assertThat(doRequest("ally")).isEqualTo(200);
+    assertThat(doRequest("foe")).isEqualTo(200);
+  }
+
+  @Test
+  public void requestWithAllowlistedHostIsAccepted() throws IOException {
+    jsonRpcConfig.setHostsAllowlist(hostsAllowlist);
+    assertThat(doRequest("ally")).isEqualTo(200);
+    assertThat(doRequest("ally:12345")).isEqualTo(200);
+    assertThat(doRequest("friend")).isEqualTo(200);
+  }
+
+  @Test
+  public void requestWithUnknownHostIsRejected() throws IOException {
+    jsonRpcConfig.setHostsAllowlist(hostsAllowlist);
+    assertThat(doRequest("foe")).isEqualTo(403);
+  }
+
+  private int doRequest(final String hostname) throws IOException {
+    final RequestBody body =
+        RequestBody.create(
+            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode("123") + ",\"method\":\"net_version\"}",
+            JSON);
+
+    final Request build =
+        new Request.Builder().post(body).url(baseUrl).addHeader("Host", hostname).build();
+    return client.newCall(build).execute().code();
+  }
+
+  @Test
+  public void requestWithMalformedHostIsRejected() throws IOException {
+    jsonRpcConfig.setHostsAllowlist(hostsAllowlist);
+    assertThat(doRequest("ally:friend")).isEqualTo(403);
+    assertThat(doRequest("ally:123456")).isEqualTo(403);
+    assertThat(doRequest("ally:friend:1234")).isEqualTo(403);
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceHostWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceHostWhitelistTest.java
deleted file mode 100644
index 9b330a3801a..00000000000
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceHostWhitelistTest.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.api.jsonrpc;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-
-import org.hyperledger.besu.config.StubGenesisConfigOptions;
-import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.methods.JsonRpcMethodsFactory;
-import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
-import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
-import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-import org.hyperledger.besu.ethereum.core.Synchronizer;
-import org.hyperledger.besu.ethereum.eth.EthProtocol;
-import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
-import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule;
-import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
-import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
-import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController;
-import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController;
-import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
-import org.hyperledger.besu.nat.NatService;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-import io.vertx.core.Vertx;
-import io.vertx.core.json.Json;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
-public class JsonRpcHttpServiceHostWhitelistTest {
-
-  @ClassRule public static final TemporaryFolder folder = new TemporaryFolder();
-
-  protected static final Vertx vertx = Vertx.vertx();
-
-  private static Map<String, JsonRpcMethod> rpcMethods;
-  private static JsonRpcHttpService service;
-  private static OkHttpClient client;
-  private static String baseUrl;
-  private static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-  private static final String CLIENT_VERSION = "TestClientVersion/0.1.0";
-  private static final BigInteger CHAIN_ID = BigInteger.valueOf(123);
-  private static final Collection<RpcApi> JSON_RPC_APIS =
-      Arrays.asList(RpcApis.ETH, RpcApis.NET, RpcApis.WEB3);
-  private final JsonRpcConfiguration jsonRpcConfig = createJsonRpcConfig();
-  private final NatService natService = new NatService(Optional.empty());
-
-  private final List<String> hostsWhitelist = Arrays.asList("ally", "friend");
-
-  @Before
-  public void initServerAndClient() throws Exception {
-    final P2PNetwork peerDiscoveryMock = mock(P2PNetwork.class);
-    final BlockchainQueries blockchainQueries = mock(BlockchainQueries.class);
-    final Synchronizer synchronizer = mock(Synchronizer.class);
-
-    final Set<Capability> supportedCapabilities = new HashSet<>();
-    supportedCapabilities.add(EthProtocol.ETH62);
-    supportedCapabilities.add(EthProtocol.ETH63);
-
-    rpcMethods =
-        spy(
-            new JsonRpcMethodsFactory()
-                .methods(
-                    CLIENT_VERSION,
-                    CHAIN_ID,
-                    new StubGenesisConfigOptions(),
-                    peerDiscoveryMock,
-                    blockchainQueries,
-                    synchronizer,
-                    MainnetProtocolSchedule.fromConfig(
-                        new StubGenesisConfigOptions().constantinopleBlock(0).chainId(CHAIN_ID)),
-                    mock(FilterManager.class),
-                    mock(TransactionPool.class),
-                    mock(EthHashMiningCoordinator.class),
-                    new NoOpMetricsSystem(),
-                    supportedCapabilities,
-                    Optional.of(mock(AccountLocalConfigPermissioningController.class)),
-                    Optional.of(mock(NodeLocalConfigPermissioningController.class)),
-                    JSON_RPC_APIS,
-                    mock(PrivacyParameters.class),
-                    mock(JsonRpcConfiguration.class),
-                    mock(WebSocketConfiguration.class),
-                    mock(MetricsConfiguration.class),
-                    natService,
-                    new HashMap<>(),
-                    folder.getRoot().toPath(),
-                    mock(EthPeers.class)));
-    service = createJsonRpcHttpService();
-    service.start().join();
-
-    client = new OkHttpClient();
-    baseUrl = service.url();
-  }
-
-  private JsonRpcHttpService createJsonRpcHttpService() throws Exception {
-    return new JsonRpcHttpService(
-        vertx,
-        folder.newFolder().toPath(),
-        jsonRpcConfig,
-        new NoOpMetricsSystem(),
-        natService,
-        rpcMethods,
-        HealthService.ALWAYS_HEALTHY,
-        HealthService.ALWAYS_HEALTHY);
-  }
-
-  private static JsonRpcConfiguration createJsonRpcConfig() {
-    final JsonRpcConfiguration config = JsonRpcConfiguration.createDefault();
-    config.setPort(0);
-    return config;
-  }
-
-  @After
-  public void shutdownServer() {
-    service.stop().join();
-  }
-
-  @Test
-  public void requestWithDefaultHeaderAndDefaultConfigIsAccepted() throws IOException {
-    assertThat(doRequest("localhost:50012")).isEqualTo(200);
-  }
-
-  @Test
-  public void requestWithEmptyHeaderAndDefaultConfigIsRejected() throws IOException {
-    assertThat(doRequest("")).isEqualTo(403);
-  }
-
-  @Test
-  public void requestWithAnyHostnameAndWildcardConfigIsAccepted() throws IOException {
-    jsonRpcConfig.setHostsAllowlist(Collections.singletonList("*"));
-    assertThat(doRequest("ally")).isEqualTo(200);
-    assertThat(doRequest("foe")).isEqualTo(200);
-  }
-
-  @Test
-  public void requestWithWhitelistedHostIsAccepted() throws IOException {
-    jsonRpcConfig.setHostsAllowlist(hostsWhitelist);
-    assertThat(doRequest("ally")).isEqualTo(200);
-    assertThat(doRequest("ally:12345")).isEqualTo(200);
-    assertThat(doRequest("friend")).isEqualTo(200);
-  }
-
-  @Test
-  public void requestWithUnknownHostIsRejected() throws IOException {
-    jsonRpcConfig.setHostsAllowlist(hostsWhitelist);
-    assertThat(doRequest("foe")).isEqualTo(403);
-  }
-
-  private int doRequest(final String hostname) throws IOException {
-    final RequestBody body =
-        RequestBody.create(
-            JSON,
-            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode("123") + ",\"method\":\"net_version\"}");
-
-    final Request build =
-        new Request.Builder().post(body).url(baseUrl).addHeader("Host", hostname).build();
-    return client.newCall(build).execute().code();
-  }
-
-  @Test
-  public void requestWithMalformedHostIsRejected() throws IOException {
-    jsonRpcConfig.setHostsAllowlist(hostsWhitelist);
-    assertThat(doRequest("ally:friend")).isEqualTo(403);
-    assertThat(doRequest("ally:123456")).isEqualTo(403);
-    assertThat(doRequest("ally:friend:1234")).isEqualTo(403);
-  }
-}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceLoginTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceLoginTest.java
index 6eaecf0aea6..5d7e3391d04 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceLoginTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceLoginTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -22,7 +22,7 @@
 import static org.mockito.Mockito.spy;
 
 import org.hyperledger.besu.config.StubGenesisConfigOptions;
-import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationUtils;
+import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthAccounts;
@@ -34,7 +34,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.methods.JsonRpcMethodsFactory;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.eth.EthProtocol;
@@ -87,6 +87,7 @@
 
 @RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class JsonRpcHttpServiceLoginTest {
+
   @ClassRule public static final TemporaryFolder folder = new TemporaryFolder();
 
   private static final Vertx vertx = Vertx.vertx();
@@ -101,8 +102,11 @@ public class JsonRpcHttpServiceLoginTest {
   protected static P2PNetwork peerDiscoveryMock;
   protected static BlockchainQueries blockchainQueries;
   protected static Synchronizer synchronizer;
-  protected static final Collection<RpcApi> JSON_RPC_APIS =
-      Arrays.asList(RpcApis.ETH, RpcApis.NET, RpcApis.WEB3, RpcApis.ADMIN);
+  protected static final Collection<String> JSON_RPC_APIS =
+      Arrays.asList(
+          RpcApis.ETH.name(), RpcApis.NET.name(), RpcApis.WEB3.name(), RpcApis.ADMIN.name());
+  protected static final List<String> NO_AUTH_METHODS =
+      Arrays.asList(RpcMethod.NET_SERVICES.getMethodName());
   protected static JWTAuth jwtAuth;
   protected static String authPermissionsConfigFilePath = "JsonRpcHttpService/auth.toml";
   protected final JsonRpcTestHelper testHelper = new JsonRpcTestHelper();
@@ -132,9 +136,10 @@ public static void initServerAndClient() throws Exception {
                     blockchainQueries,
                     synchronizer,
                     MainnetProtocolSchedule.fromConfig(genesisConfigOptions),
+                    mock(ProtocolContext.class),
                     mock(FilterManager.class),
                     mock(TransactionPool.class),
-                    mock(EthHashMiningCoordinator.class),
+                    mock(PoWMiningCoordinator.class),
                     new NoOpMetricsSystem(),
                     supportedCapabilities,
                     Optional.empty(),
@@ -147,7 +152,10 @@ public static void initServerAndClient() throws Exception {
                     natService,
                     new HashMap<>(),
                     folder.getRoot().toPath(),
-                    mock(EthPeers.class)));
+                    mock(EthPeers.class),
+                    vertx,
+                    Optional.empty(),
+                    Optional.empty()));
     service = createJsonRpcHttpService();
     jwtAuth = service.authenticationService.get().getJwtAuthProvider();
     service.start().join();
@@ -166,6 +174,7 @@ private static JsonRpcHttpService createJsonRpcHttpService() throws Exception {
     final JsonRpcConfiguration config = createJsonRpcConfig();
     config.setAuthenticationEnabled(true);
     config.setAuthenticationCredentialsFile(authTomlPath);
+    config.setNoAuthRpcApis(NO_AUTH_METHODS);
 
     return new JsonRpcHttpService(
         vertx,
@@ -194,7 +203,7 @@ public static void shutdownServer() {
   @Test
   public void loginWithBadCredentials() throws IOException {
     final RequestBody body =
-        RequestBody.create(JSON, "{\"username\":\"user\",\"password\":\"badpass\"}");
+        RequestBody.create("{\"username\":\"user\",\"password\":\"badpass\"}", JSON);
     final Request request = new Request.Builder().post(body).url(baseUrl + "/login").build();
     try (final Response resp = client.newCall(request).execute()) {
       assertThat(resp.code()).isEqualTo(401);
@@ -205,7 +214,7 @@ public void loginWithBadCredentials() throws IOException {
   @Test
   public void loginWithGoodCredentials() throws IOException {
     final RequestBody body =
-        RequestBody.create(JSON, "{\"username\":\"user\",\"password\":\"pegasys\"}");
+        RequestBody.create("{\"username\":\"user\",\"password\":\"pegasys\"}", JSON);
     final Request request = new Request.Builder().post(body).url(baseUrl + "/login").build();
     try (final Response resp = client.newCall(request).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -222,7 +231,7 @@ public void loginWithGoodCredentials() throws IOException {
       assertThat(token).isNotNull();
 
       jwtAuth.authenticate(
-          new JsonObject().put("jwt", token),
+          new JsonObject().put("token", token),
           (r) -> {
             assertThat(r.succeeded()).isTrue();
             final User user = r.result();
@@ -239,7 +248,7 @@ public void loginWithGoodCredentials() throws IOException {
   @Test
   public void loginWithGoodCredentialsAndPermissions() throws IOException {
     final RequestBody body =
-        RequestBody.create(JSON, "{\"username\":\"user\",\"password\":\"pegasys\"}");
+        RequestBody.create("{\"username\":\"user\",\"password\":\"pegasys\"}", JSON);
     final Request request = new Request.Builder().post(body).url(baseUrl + "/login").build();
     try (final Response resp = client.newCall(request).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -256,7 +265,7 @@ public void loginWithGoodCredentialsAndPermissions() throws IOException {
       assertThat(token).isNotNull();
 
       jwtAuth.authenticate(
-          new JsonObject().put("jwt", token),
+          new JsonObject().put("token", token),
           (r) -> {
             assertThat(r.succeeded()).isTrue();
             final User user = r.result();
@@ -280,7 +289,7 @@ public void loginWithGoodCredentialsAndPermissions() throws IOException {
   public void loginDoesntPopulateJWTPayloadWithPassword()
       throws IOException, KeyStoreException, CertificateException, NoSuchAlgorithmException {
     final RequestBody body =
-        RequestBody.create(JSON, "{\"username\":\"user\",\"password\":\"pegasys\"}");
+        RequestBody.create("{\"username\":\"user\",\"password\":\"pegasys\"}", JSON);
     final Request request = new Request.Builder().post(body).url(baseUrl + "/login").build();
     try (final Response resp = client.newCall(request).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -307,7 +316,7 @@ public void loginDoesntPopulateJWTPayloadWithPassword()
   public void loginPopulatesJWTPayloadWithRequiredValues()
       throws IOException, KeyStoreException, CertificateException, NoSuchAlgorithmException {
     final RequestBody body =
-        RequestBody.create(JSON, "{\"username\":\"user\",\"password\":\"pegasys\"}");
+        RequestBody.create("{\"username\":\"user\",\"password\":\"pegasys\"}", JSON);
     final Request request = new Request.Builder().post(body).url(baseUrl + "/login").build();
     try (final Response resp = client.newCall(request).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -340,7 +349,7 @@ public void loginPopulatesJWTPayloadWithRequiredValues()
   private String login(final String username, final String password) throws IOException {
     final RequestBody loginBody =
         RequestBody.create(
-            JSON, "{\"username\":\"" + username + "\",\"password\":\"" + password + "\"}");
+            "{\"username\":\"" + username + "\",\"password\":\"" + password + "\"}", JSON);
     final Request loginRequest =
         new Request.Builder().post(loginBody).url(baseUrl + "/login").build();
     final String token;
@@ -364,7 +373,7 @@ private String login(final String username, final String password) throws IOExce
   @Test
   public void checkJsonRpcMethodsAvailableWithGoodCredentialsAndPermissions() throws IOException {
     final RequestBody body =
-        RequestBody.create(JSON, "{\"username\":\"user\",\"password\":\"pegasys\"}");
+        RequestBody.create("{\"username\":\"user\",\"password\":\"pegasys\"}", JSON);
     final Request request = new Request.Builder().post(body).url(baseUrl + "/login").build();
     try (final Response resp = client.newCall(request).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -387,33 +396,43 @@ public void checkJsonRpcMethodsAvailableWithGoodCredentialsAndPermissions() thro
       final JsonRpcMethod web3ClientVersion = new Web3ClientVersion("777");
 
       jwtAuth.authenticate(
-          new JsonObject().put("jwt", token),
+          new JsonObject().put("token", token),
           (r) -> {
             assertThat(r.succeeded()).isTrue();
             final User user = r.result();
             // single eth/blockNumber method permitted
             Assertions.assertThat(
-                    AuthenticationUtils.isPermitted(
-                        service.authenticationService, Optional.of(user), ethBlockNumber))
+                    service
+                        .authenticationService
+                        .get()
+                        .isPermitted(Optional.of(user), ethBlockNumber, Collections.emptyList()))
                 .isTrue();
             // eth/accounts NOT permitted
             assertThat(
-                    AuthenticationUtils.isPermitted(
-                        service.authenticationService, Optional.of(user), ethAccounts))
+                    service
+                        .authenticationService
+                        .get()
+                        .isPermitted(Optional.of(user), ethAccounts, Collections.emptyList()))
                 .isFalse();
             // allowed by web3/*
             assertThat(
-                    AuthenticationUtils.isPermitted(
-                        service.authenticationService, Optional.of(user), web3ClientVersion))
+                    service
+                        .authenticationService
+                        .get()
+                        .isPermitted(Optional.of(user), web3ClientVersion, Collections.emptyList()))
                 .isTrue();
             assertThat(
-                    AuthenticationUtils.isPermitted(
-                        service.authenticationService, Optional.of(user), web3Sha3))
+                    service
+                        .authenticationService
+                        .get()
+                        .isPermitted(Optional.of(user), web3Sha3, Collections.emptyList()))
                 .isTrue();
             // NO net permissions
             assertThat(
-                    AuthenticationUtils.isPermitted(
-                        service.authenticationService, Optional.of(user), netVersion))
+                    service
+                        .authenticationService
+                        .get()
+                        .isPermitted(Optional.of(user), netVersion, Collections.emptyList()))
                 .isFalse();
           });
     }
@@ -423,7 +442,7 @@ public void checkJsonRpcMethodsAvailableWithGoodCredentialsAndPermissions() thro
   public void checkJsonRpcMethodsAvailableWithGoodCredentialsAndAllPermissions()
       throws IOException {
     final RequestBody body =
-        RequestBody.create(JSON, "{\"username\":\"adminuser\",\"password\":\"pegasys\"}");
+        RequestBody.create("{\"username\":\"adminuser\",\"password\":\"pegasys\"}", JSON);
     final Request request = new Request.Builder().post(body).url(baseUrl + "/login").build();
     try (final Response resp = client.newCall(request).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -447,33 +466,43 @@ public void checkJsonRpcMethodsAvailableWithGoodCredentialsAndAllPermissions()
 
       // adminuser has *:* permissions so everything should be allowed
       jwtAuth.authenticate(
-          new JsonObject().put("jwt", token),
+          new JsonObject().put("token", token),
           (r) -> {
             assertThat(r.succeeded()).isTrue();
             final User user = r.result();
             // single eth/blockNumber method permitted
             Assertions.assertThat(
-                    AuthenticationUtils.isPermitted(
-                        service.authenticationService, Optional.of(user), ethBlockNumber))
+                    service
+                        .authenticationService
+                        .get()
+                        .isPermitted(Optional.of(user), ethBlockNumber, Collections.emptyList()))
                 .isTrue();
             // eth/accounts IS permitted
             assertThat(
-                    AuthenticationUtils.isPermitted(
-                        service.authenticationService, Optional.of(user), ethAccounts))
+                    service
+                        .authenticationService
+                        .get()
+                        .isPermitted(Optional.of(user), ethAccounts, Collections.emptyList()))
                 .isTrue();
             // allowed by *:*
             assertThat(
-                    AuthenticationUtils.isPermitted(
-                        service.authenticationService, Optional.of(user), web3ClientVersion))
+                    service
+                        .authenticationService
+                        .get()
+                        .isPermitted(Optional.of(user), web3ClientVersion, Collections.emptyList()))
                 .isTrue();
             assertThat(
-                    AuthenticationUtils.isPermitted(
-                        service.authenticationService, Optional.of(user), web3Sha3))
+                    service
+                        .authenticationService
+                        .get()
+                        .isPermitted(Optional.of(user), web3Sha3, Collections.emptyList()))
                 .isTrue();
             // YES net permissions
             assertThat(
-                    AuthenticationUtils.isPermitted(
-                        service.authenticationService, Optional.of(user), netVersion))
+                    service
+                        .authenticationService
+                        .get()
+                        .isPermitted(Optional.of(user), netVersion, Collections.emptyList()))
                 .isTrue();
           });
     }
@@ -484,8 +513,10 @@ public void checkPermissionsWithEmptyUser() {
     final JsonRpcMethod ethAccounts = new EthAccounts();
 
     assertThat(
-            AuthenticationUtils.isPermitted(
-                service.authenticationService, Optional.empty(), ethAccounts))
+            service
+                .authenticationService
+                .get()
+                .isPermitted(Optional.empty(), ethAccounts, Collections.emptyList()))
         .isFalse();
   }
 
@@ -494,10 +525,10 @@ public void web3ClientVersionUnsuccessfulBeforeLogin() throws Exception {
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
-                + ",\"method\":\"web3_clientVersion\"}");
+                + ",\"method\":\"web3_clientVersion\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(401);
@@ -510,10 +541,10 @@ public void web3ClientVersionUnsuccessfulWithBadBearer() throws Exception {
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
-                + ",\"method\":\"web3_clientVersion\"}");
+                + ",\"method\":\"web3_clientVersion\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body, "badtoken")).execute()) {
       assertThat(resp.code()).isEqualTo(401);
@@ -528,10 +559,10 @@ public void web3ClientVersionSuccessfulAfterLogin() throws Exception {
     final String id = "123";
     final RequestBody web3ClientVersionBody =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
-                + ",\"method\":\"web3_clientVersion\"}");
+                + ",\"method\":\"web3_clientVersion\"}",
+            JSON);
 
     try (final Response web3ClientVersionResp =
         client.newCall(buildPostRequest(web3ClientVersionBody, token)).execute()) {
@@ -545,6 +576,38 @@ public void web3ClientVersionSuccessfulAfterLogin() throws Exception {
     }
   }
 
+  @Test
+  public void noAuthMethodSuccessfulAfterLogin() throws Exception {
+    final String token = login("user", "pegasys");
+
+    final String id = "123";
+    final RequestBody requestBody =
+        RequestBody.create(
+            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"net_services\"}",
+            JSON);
+
+    try (final Response response = client.newCall(buildPostRequest(requestBody, token)).execute()) {
+      assertThat(response.code()).isEqualTo(200);
+      final JsonObject json = new JsonObject(response.body().string());
+      testHelper.assertValidJsonRpcResult(json, id);
+    }
+  }
+
+  @Test
+  public void noAuthMethodSuccessfulWithNoToken() throws Exception {
+    final String id = "123";
+    final RequestBody requestBody =
+        RequestBody.create(
+            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"net_services\"}",
+            JSON);
+
+    try (final Response response = client.newCall(buildPostRequest(requestBody)).execute()) {
+      assertThat(response.code()).isEqualTo(200);
+      final JsonObject json = new JsonObject(response.body().string());
+      testHelper.assertValidJsonRpcResult(json, id);
+    }
+  }
+
   @Test
   public void ethSyncingUnauthorisedWithoutPermission() throws Exception {
     final String token = login("user", "pegasys");
@@ -552,8 +615,8 @@ public void ethSyncingUnauthorisedWithoutPermission() throws Exception {
     final String id = "007";
     final RequestBody body =
         RequestBody.create(
-            JSON,
-            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"eth_syncing\"}");
+            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"eth_syncing\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body, token)).execute()) {
       assertThat(resp.code()).isEqualTo(401);
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceParameterizedTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceParameterizedTest.java
new file mode 100644
index 00000000000..f61986ff5c1
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceParameterizedTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright Hyperledger Besu contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import io.vertx.core.json.JsonObject;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class JsonRpcHttpServiceParameterizedTest extends JsonRpcHttpServiceTestBase {
+
+  private final String requestJson;
+
+  public JsonRpcHttpServiceParameterizedTest(final String requestJson) {
+    this.requestJson = requestJson;
+  }
+
+  @BeforeClass
+  public static void setup() throws Exception {
+    initServerAndClient();
+  }
+
+  /** Tears down the HTTP server. */
+  @AfterClass
+  public static void shutdownServer() {
+    service.stop().join();
+  }
+
+  @Parameterized.Parameters
+  public static Collection<Object[]> data() {
+    return Arrays.asList(new Object[][] {{"\"a string\""}, {"a string"}, {"{bla"}, {""}});
+  }
+
+  @Test
+  public void invalidJsonShouldReturnParseError() throws Exception {
+    final RequestBody body = RequestBody.create(requestJson, JSON);
+
+    try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
+      assertThat(resp.code()).isEqualTo(400);
+      final JsonObject json = new JsonObject(resp.body().string());
+      final JsonRpcError expectedError = JsonRpcError.PARSE_ERROR;
+      testHelper.assertValidJsonRpcError(
+          json, null, expectedError.getCode(), expectedError.getMessage());
+    }
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceRpcApisTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceRpcApisTest.java
index 6ba804079b0..06d428ab348 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceRpcApisTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceRpcApisTest.java
@@ -18,9 +18,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.config.StubGenesisConfigOptions;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
@@ -28,8 +31,10 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.methods.JsonRpcMethodsFactory;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.ProtocolScheduleFixture;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
@@ -49,14 +54,17 @@
 import org.hyperledger.besu.nat.NatService;
 
 import java.math.BigInteger;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Stream;
 
 import com.google.common.collect.Lists;
 import io.vertx.core.Vertx;
@@ -67,18 +75,18 @@
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class JsonRpcHttpServiceRpcApisTest {
-  @Rule public final TemporaryFolder folder = new TemporaryFolder();
+
+  @TempDir private static Path folder;
 
   private final Vertx vertx = Vertx.vertx();
   private final OkHttpClient client = new OkHttpClient();
@@ -91,18 +99,18 @@ public class JsonRpcHttpServiceRpcApisTest {
   private static final List<String> netServices =
       new ArrayList<>(Arrays.asList("jsonrpc", "ws", "p2p", "metrics"));
 
-  @Mock protected static BlockchainQueries blockchainQueries;
+  @Mock protected BlockchainQueries blockchainQueries;
 
   private final JsonRpcTestHelper testHelper = new JsonRpcTestHelper();
   private final NatService natService = new NatService(Optional.empty());
 
-  @Before
+  @BeforeEach
   public void before() {
     configuration = JsonRpcConfiguration.createDefault();
     configuration.setPort(0);
   }
 
-  @After
+  @AfterEach
   public void after() {
     service.stop().join();
   }
@@ -113,8 +121,8 @@ public void requestWithNetMethodShouldSucceedWhenDefaultApisEnabled() throws Exc
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
-            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"net_version\"}");
+            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"net_version\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -123,12 +131,12 @@ public void requestWithNetMethodShouldSucceedWhenDefaultApisEnabled() throws Exc
 
   @Test
   public void requestWithNetMethodShouldSucceedWhenNetApiIsEnabled() throws Exception {
-    service = createJsonRpcHttpServiceWithRpcApis(RpcApis.NET);
+    service = createJsonRpcHttpServiceWithRpcApis(RpcApis.NET.name());
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
-            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"net_version\"}");
+            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"net_version\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -138,12 +146,12 @@ public void requestWithNetMethodShouldSucceedWhenNetApiIsEnabled() throws Except
   @Test
   public void requestWithNetMethodShouldSuccessWithCode200WhenNetApiIsNotEnabled()
       throws Exception {
-    service = createJsonRpcHttpServiceWithRpcApis(RpcApis.WEB3);
+    service = createJsonRpcHttpServiceWithRpcApis(RpcApis.WEB3.name());
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
-            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"net_version\"}");
+            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"net_version\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -157,19 +165,19 @@ public void requestWithNetMethodShouldSuccessWithCode200WhenNetApiIsNotEnabled()
 
   @Test
   public void requestWithNetMethodShouldSucceedWhenNetApiAndOtherIsEnabled() throws Exception {
-    service = createJsonRpcHttpServiceWithRpcApis(RpcApis.NET, RpcApis.WEB3);
+    service = createJsonRpcHttpServiceWithRpcApis(RpcApis.NET.name(), RpcApis.WEB3.name());
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
-            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"net_version\"}");
+            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"net_version\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
     }
   }
 
-  private JsonRpcConfiguration createJsonRpcConfigurationWithRpcApis(final RpcApi... rpcApis) {
+  private JsonRpcConfiguration createJsonRpcConfigurationWithRpcApis(final String... rpcApis) {
     final JsonRpcConfiguration config = JsonRpcConfiguration.createDefault();
     config.setCorsAllowedDomains(singletonList("*"));
     config.setPort(0);
@@ -179,7 +187,7 @@ private JsonRpcConfiguration createJsonRpcConfigurationWithRpcApis(final RpcApi.
     return config;
   }
 
-  private JsonRpcHttpService createJsonRpcHttpServiceWithRpcApis(final RpcApi... rpcApis)
+  private JsonRpcHttpService createJsonRpcHttpServiceWithRpcApis(final String... rpcApis)
       throws Exception {
     return createJsonRpcHttpServiceWithRpcApis(createJsonRpcConfigurationWithRpcApis(rpcApis));
   }
@@ -201,9 +209,10 @@ private JsonRpcHttpService createJsonRpcHttpServiceWithRpcApis(final JsonRpcConf
                     blockchainQueries,
                     mock(Synchronizer.class),
                     ProtocolScheduleFixture.MAINNET,
+                    mock(ProtocolContext.class),
                     mock(FilterManager.class),
                     mock(TransactionPool.class),
-                    mock(EthHashMiningCoordinator.class),
+                    mock(PoWMiningCoordinator.class),
                     new NoOpMetricsSystem(),
                     supportedCapabilities,
                     Optional.of(mock(AccountLocalConfigPermissioningController.class)),
@@ -215,12 +224,15 @@ private JsonRpcHttpService createJsonRpcHttpServiceWithRpcApis(final JsonRpcConf
                     mock(MetricsConfiguration.class),
                     natService,
                     new HashMap<>(),
-                    folder.getRoot().toPath(),
-                    mock(EthPeers.class)));
+                    folder,
+                    mock(EthPeers.class),
+                    vertx,
+                    Optional.empty(),
+                    Optional.empty()));
     final JsonRpcHttpService jsonRpcHttpService =
         new JsonRpcHttpService(
             vertx,
-            folder.newFolder().toPath(),
+            folder,
             config,
             new NoOpMetricsSystem(),
             natService,
@@ -255,6 +267,10 @@ private P2PNetwork createP2pNetwork() {
             .setRlpx(RlpxConfiguration.create().setBindPort(0))
             .setDiscovery(DiscoveryConfiguration.create().setBindPort(0));
 
+    final MutableBlockchain blockchain = mock(MutableBlockchain.class);
+    final Block genesisBlock = mock(Block.class);
+    when(blockchain.getGenesisBlock()).thenReturn(genesisBlock);
+    when(genesisBlock.getHash()).thenReturn(Hash.ZERO);
     final P2PNetwork p2pNetwork =
         DefaultP2PNetwork.builder()
             .supportedCapabilities(Capability.create("eth", 63))
@@ -262,7 +278,12 @@ private P2PNetwork createP2pNetwork() {
             .vertx(vertx)
             .config(config)
             .metricsSystem(new NoOpMetricsSystem())
-            .storageProvider(new InMemoryStorageProvider())
+            .storageProvider(new InMemoryKeyValueStorageProvider())
+            .blockchain(blockchain)
+            .blockNumberForks(Collections.emptyList())
+            .timestampForks(Collections.emptyList())
+            .allConnectionsSupplier(Stream::empty)
+            .allActiveConnectionsSupplier(Stream::empty)
             .build();
 
     p2pNetwork.start();
@@ -297,9 +318,10 @@ private JsonRpcHttpService createJsonRpcHttpService(
                     blockchainQueries,
                     mock(Synchronizer.class),
                     ProtocolScheduleFixture.MAINNET,
+                    mock(ProtocolContext.class),
                     mock(FilterManager.class),
                     mock(TransactionPool.class),
-                    mock(EthHashMiningCoordinator.class),
+                    mock(PoWMiningCoordinator.class),
                     new NoOpMetricsSystem(),
                     supportedCapabilities,
                     Optional.of(mock(AccountLocalConfigPermissioningController.class)),
@@ -311,12 +333,15 @@ private JsonRpcHttpService createJsonRpcHttpService(
                     metricsConfiguration,
                     natService,
                     new HashMap<>(),
-                    folder.getRoot().toPath(),
-                    mock(EthPeers.class)));
+                    folder,
+                    mock(EthPeers.class),
+                    vertx,
+                    Optional.empty(),
+                    Optional.empty()));
     final JsonRpcHttpService jsonRpcHttpService =
         new JsonRpcHttpService(
             vertx,
-            folder.newFolder().toPath(),
+            folder,
             jsonRpcConfiguration,
             new NoOpMetricsSystem(),
             natService,
@@ -393,7 +418,7 @@ private void assertNetService(
   public RequestBody createNetServicesRequestBody() {
     final String id = "123";
     return RequestBody.create(
-        JSON, "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"net_services\"}");
+        "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"net_services\"}", JSON);
   }
 
   public JsonRpcHttpService getJsonRpcHttpService(final boolean[] enabledNetServices)
@@ -403,7 +428,7 @@ public JsonRpcHttpService getJsonRpcHttpService(final boolean[] enabledNetServic
     WebSocketConfiguration webSocketConfiguration = WebSocketConfiguration.createDefault();
     P2PNetwork p2pNetwork = mock(P2PNetwork.class);
     MetricsConfiguration metricsConfiguration = MetricsConfiguration.builder().build();
-    NatService natService = mock(NatService.class);
+    final NatService natService = mock(NatService.class);
 
     if (enabledNetServices[netServices.indexOf("jsonrpc")]) {
       jsonRpcConfiguration = createJsonRpcConfiguration();
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTest.java
index a376d6c3085..759426f3d83 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTest.java
@@ -20,65 +20,39 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.config.StubGenesisConfigOptions;
-import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
-import org.hyperledger.besu.ethereum.api.jsonrpc.methods.JsonRpcMethodsFactory;
-import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
 import org.hyperledger.besu.ethereum.api.query.BlockWithMetadata;
-import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.ethereum.api.util.TestJsonRpcMethodsUtil;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.DefaultSyncStatus;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.eth.EthProtocol;
-import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
-import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule;
-import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
-import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
-import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController;
-import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController;
-import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
-import org.hyperledger.besu.nat.NatService;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 import org.hyperledger.besu.plugin.data.SyncStatus;
 
 import java.math.BigInteger;
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 import java.util.stream.Collectors;
 
-import io.vertx.core.Vertx;
 import io.vertx.core.json.Json;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
@@ -86,106 +60,17 @@
 import org.apache.tuweni.units.bigints.UInt256;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.ClassRule;
 import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
 import org.mockito.ArgumentMatchers;
 
-public class JsonRpcHttpServiceTest {
-
-  @ClassRule public static final TemporaryFolder folder = new TemporaryFolder();
-
-  private static final Vertx vertx = Vertx.vertx();
-
-  protected static Map<String, JsonRpcMethod> rpcMethods;
-  protected static JsonRpcHttpService service;
-  protected static OkHttpClient client;
-  protected static String baseUrl;
-  protected static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-  protected static final String CLIENT_VERSION = "TestClientVersion/0.1.0";
-  protected static final BigInteger CHAIN_ID = BigInteger.valueOf(123);
-  protected static P2PNetwork peerDiscoveryMock;
-  protected static EthPeers ethPeersMock;
-  protected static BlockchainQueries blockchainQueries;
-  protected static Synchronizer synchronizer;
-  protected static final Collection<RpcApi> JSON_RPC_APIS =
-      Arrays.asList(RpcApis.ETH, RpcApis.NET, RpcApis.WEB3, RpcApis.ADMIN);
-  protected final JsonRpcTestHelper testHelper = new JsonRpcTestHelper();
-  protected static final NatService natService = new NatService(Optional.empty());
+public class JsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
 
   @BeforeClass
-  public static void initServerAndClient() throws Exception {
-    peerDiscoveryMock = mock(P2PNetwork.class);
-    ethPeersMock = mock(EthPeers.class);
-    blockchainQueries = mock(BlockchainQueries.class);
-    synchronizer = mock(Synchronizer.class);
-
-    final Set<Capability> supportedCapabilities = new HashSet<>();
-    supportedCapabilities.add(EthProtocol.ETH62);
-    supportedCapabilities.add(EthProtocol.ETH63);
-
-    rpcMethods =
-        spy(
-            new JsonRpcMethodsFactory()
-                .methods(
-                    CLIENT_VERSION,
-                    CHAIN_ID,
-                    new StubGenesisConfigOptions(),
-                    peerDiscoveryMock,
-                    blockchainQueries,
-                    synchronizer,
-                    MainnetProtocolSchedule.fromConfig(
-                        new StubGenesisConfigOptions().constantinopleBlock(0).chainId(CHAIN_ID)),
-                    mock(FilterManager.class),
-                    mock(TransactionPool.class),
-                    mock(EthHashMiningCoordinator.class),
-                    new NoOpMetricsSystem(),
-                    supportedCapabilities,
-                    Optional.of(mock(AccountLocalConfigPermissioningController.class)),
-                    Optional.of(mock(NodeLocalConfigPermissioningController.class)),
-                    JSON_RPC_APIS,
-                    mock(PrivacyParameters.class),
-                    mock(JsonRpcConfiguration.class),
-                    mock(WebSocketConfiguration.class),
-                    mock(MetricsConfiguration.class),
-                    natService,
-                    new HashMap<>(),
-                    folder.getRoot().toPath(),
-                    ethPeersMock));
-    service = createJsonRpcHttpService();
-    service.start().join();
+  public static void setup() throws Exception {
+    initServerAndClient();
+  }
 
-    // Build an OkHttp client.
-    client = new OkHttpClient();
-    baseUrl = service.url();
-  }
-
-  private static JsonRpcHttpService createJsonRpcHttpService(final JsonRpcConfiguration config)
-      throws Exception {
-    return new JsonRpcHttpService(
-        vertx,
-        folder.newFolder().toPath(),
-        config,
-        new NoOpMetricsSystem(),
-        natService,
-        rpcMethods,
-        HealthService.ALWAYS_HEALTHY,
-        HealthService.ALWAYS_HEALTHY);
-  }
-
-  private static JsonRpcHttpService createJsonRpcHttpService() throws Exception {
-    return new JsonRpcHttpService(
-        vertx,
-        folder.newFolder().toPath(),
-        createJsonRpcConfig(),
-        new NoOpMetricsSystem(),
-        natService,
-        rpcMethods,
-        HealthService.ALWAYS_HEALTHY,
-        HealthService.ALWAYS_HEALTHY);
-  }
-
-  private static JsonRpcConfiguration createJsonRpcConfig() {
+  protected static JsonRpcConfiguration createJsonRpcConfig() {
     final JsonRpcConfiguration config = JsonRpcConfiguration.createDefault();
     config.setPort(0);
     config.setHostsAllowlist(Collections.singletonList("*"));
@@ -201,7 +86,7 @@ public static void shutdownServer() {
   @Test
   public void handleLoginRequestWithAuthDisabled() throws Exception {
     final RequestBody body =
-        RequestBody.create(JSON, "{\"username\":\"user\",\"password\":\"pass\"}");
+        RequestBody.create("{\"username\":\"user\",\"password\":\"pass\"}", JSON);
     final Request request = new Request.Builder().post(body).url(baseUrl + "/login").build();
     try (final Response resp = client.newCall(request).execute()) {
       assertThat(resp.code()).isEqualTo(400);
@@ -237,10 +122,10 @@ public void handleUnknownRequestFields() throws Exception {
     // Create a request with an extra "beta" param
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
-                + ",\"method\":\"net_version\", \"beta\":true}");
+                + ",\"method\":\"net_version\", \"beta\":true}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -292,10 +177,10 @@ public void responseContainsJsonContentTypeHeader() throws Exception {
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
-                + ",\"method\":\"web3_clientVersion\"}");
+                + ",\"method\":\"web3_clientVersion\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.header("Content-Type")).isEqualTo("application/json");
@@ -307,10 +192,10 @@ public void web3ClientVersionSuccessful() throws Exception {
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
-                + ",\"method\":\"web3_clientVersion\"}");
+                + ",\"method\":\"web3_clientVersion\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -328,8 +213,8 @@ public void netVersionSuccessful() throws Exception {
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
-            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"net_version\"}");
+            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"net_version\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -347,8 +232,8 @@ public void ethAccountsSuccessful() throws Exception {
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
-            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"eth_accounts\"}");
+            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"eth_accounts\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -368,8 +253,8 @@ public void netPeerCountSuccessful() throws Exception {
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
-            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"net_peerCount\"}");
+            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"net_peerCount\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -392,12 +277,12 @@ public void ethGetUncleCountByBlockHash() throws Exception {
     final String params = "\"params\": [\"" + blockHash + "\"]";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ","
                 + params
-                + ",\"method\":\"eth_getUncleCountByBlockHash\"}");
+                + ",\"method\":\"eth_getUncleCountByBlockHash\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -420,12 +305,12 @@ public void ethGetUncleCountByBlockHashNoData() throws Exception {
     final String params = "\"params\": [\"" + blockHash + "\"]";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ","
                 + params
-                + ",\"method\":\"eth_getUncleCountByBlockHash\"}");
+                + ",\"method\":\"eth_getUncleCountByBlockHash\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -449,12 +334,12 @@ public void ethGetUncleCountByBlockNumber() throws Exception {
     final String params = "\"params\": [\"" + number + "\"]";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ","
                 + params
-                + ",\"method\":\"eth_getUncleCountByBlockNumber\"}");
+                + ",\"method\":\"eth_getUncleCountByBlockNumber\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -477,12 +362,12 @@ public void ethGetUncleCountByBlockNumberNoData() throws Exception {
     final String params = "\"params\": [\"" + number + "\"]";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ","
                 + params
-                + ",\"method\":\"eth_getUncleCountByBlockNumber\"}");
+                + ",\"method\":\"eth_getUncleCountByBlockNumber\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -504,12 +389,12 @@ public void ethGetUncleCountByBlockNumberEarliest() throws Exception {
     final String params = "\"params\": [\"earliest\"]";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ","
                 + params
-                + ",\"method\":\"eth_getUncleCountByBlockNumber\"}");
+                + ",\"method\":\"eth_getUncleCountByBlockNumber\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -532,12 +417,12 @@ public void ethGetUncleCountByBlockNumberLatest() throws Exception {
     final String params = "\"params\": [\"latest\"]";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ","
                 + params
-                + ",\"method\":\"eth_getUncleCountByBlockNumber\"}");
+                + ",\"method\":\"eth_getUncleCountByBlockNumber\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -552,16 +437,20 @@ public void ethGetUncleCountByBlockNumberLatest() throws Exception {
 
   @Test
   public void ethGetUncleCountByBlockNumberPending() throws Exception {
+    final int uncleCount = 0;
+    when(blockchainQueries.headBlockNumber()).thenReturn(0L);
+    when(blockchainQueries.getOmmerCount(eq(0L))).thenReturn(Optional.of(uncleCount));
+
     final String id = "123";
     final String params = "\"params\": [\"pending\"]";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ","
                 + params
-                + ",\"method\":\"eth_getUncleCountByBlockNumber\"}");
+                + ",\"method\":\"eth_getUncleCountByBlockNumber\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -579,12 +468,12 @@ public void ethGetUncleCountByBlockNumberPendingNoData() throws Exception {
     final String params = "\"params\": [\"pending\"]";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ","
                 + params
-                + ",\"method\":\"eth_getUncleCountByBlockNumber\"}");
+                + ",\"method\":\"eth_getUncleCountByBlockNumber\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -604,8 +493,8 @@ public void netPeerCountOfZero() throws Exception {
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
-            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"net_peerCount\"}");
+            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"net_peerCount\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -624,19 +513,24 @@ public void getBalanceForLatest() throws Exception {
     final BlockDataGenerator gen = new BlockDataGenerator();
     final Address address = gen.address();
     final String mockBalance = "0x35";
-    when(blockchainQueries.headBlockNumber()).thenReturn(0L);
-    when(blockchainQueries.accountBalance(eq(address), eq(0L)))
+
+    when(blockchainQueries.getBlockchain()).thenReturn(blockchain);
+    when(blockchainQueries.getBlockchain().getChainHead()).thenReturn(chainHead);
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getBlockHash()).thenReturn(Hash.ZERO);
+    when(chainHead.getBlockHeader()).thenReturn(blockHeader);
+    when(blockchainQueries.accountBalance(eq(address), eq(Hash.ZERO)))
         .thenReturn(Optional.of(Wei.fromHexString(mockBalance)));
 
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ",\"method\":\"eth_getBalance\", \"params\": [\""
                 + address
-                + "\",\"latest\"]}");
+                + "\",\"latest\"]}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -646,7 +540,7 @@ public void getBalanceForLatest() throws Exception {
       testHelper.assertValidJsonRpcResult(json, id);
       // Check result
       final String result = json.getString("result");
-      assertThat(mockBalance).isEqualTo(result);
+      assertThat(result).isEqualTo(mockBalance);
     }
   }
 
@@ -656,19 +550,23 @@ public void getBalanceForLatestWithZeroBalance() throws Exception {
     final BlockDataGenerator gen = new BlockDataGenerator();
     final Address address = gen.address();
     final Wei mockBalance = Wei.of(0);
-    when(blockchainQueries.headBlockNumber()).thenReturn(0L);
-    when(blockchainQueries.accountBalance(eq(address), eq(0L)))
+    when(blockchainQueries.getBlockchain()).thenReturn(blockchain);
+    when(blockchainQueries.getBlockchain().getChainHead()).thenReturn(chainHead);
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getBlockHash()).thenReturn(Hash.ZERO);
+    when(chainHead.getBlockHeader()).thenReturn(blockHeader);
+    when(blockchainQueries.accountBalance(eq(address), eq(Hash.ZERO)))
         .thenReturn(Optional.of(mockBalance));
 
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ",\"method\":\"eth_getBalance\", \"params\": [\""
                 + address
-                + "\",\"latest\"]}");
+                + "\",\"latest\"]}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -688,18 +586,20 @@ public void getBalanceForEarliest() throws Exception {
     final BlockDataGenerator gen = new BlockDataGenerator();
     final Address address = gen.address();
     final String mockBalance = "0x33";
-    when(blockchainQueries.accountBalance(eq(address), eq(0L)))
+    final Hash blockHash =
+        Hash.fromHexString("0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470");
+    when(blockchainQueries.accountBalance(eq(address), eq(blockHash)))
         .thenReturn(Optional.of(Wei.fromHexString(mockBalance)));
 
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ",\"method\":\"eth_getBalance\", \"params\": [\""
                 + address
-                + "\",\"earliest\"]}");
+                + "\",\"earliest\"]}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -709,7 +609,7 @@ public void getBalanceForEarliest() throws Exception {
       testHelper.assertValidJsonRpcResult(json, id);
       // Check result
       final String result = json.getString("result");
-      assertThat(mockBalance).isEqualTo(result);
+      assertThat(result).isEqualTo(mockBalance);
     }
   }
 
@@ -720,20 +620,23 @@ public void getBalanceByBlockNumber() throws Exception {
     final Address address = gen.address();
     final String mockBalance = "0x32";
     final long blockNumber = 13L;
-    when(blockchainQueries.accountBalance(eq(address), eq(blockNumber)))
+    final Hash blockHash =
+        Hash.fromHexString("0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470");
+    when(blockchainQueries.headBlockNumber()).thenReturn(21L);
+    when(blockchainQueries.accountBalance(eq(address), eq(blockHash)))
         .thenReturn(Optional.of(Wei.fromHexString(mockBalance)));
 
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ",\"method\":\"eth_getBalance\", \"params\": [\""
                 + address
                 + "\",\"0x"
                 + Long.toString(blockNumber, 16)
-                + "\"]}");
+                + "\"]}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -743,7 +646,7 @@ public void getBalanceByBlockNumber() throws Exception {
       testHelper.assertValidJsonRpcResult(json, id);
       // Check result
       final String result = json.getString("result");
-      assertThat(mockBalance).isEqualTo(result);
+      assertThat(result).isEqualTo(mockBalance);
     }
   }
 
@@ -755,12 +658,12 @@ public void getBlockByHashForUnknownBlock() throws Exception {
     final Hash blockHash = Hash.fromHexString(blockHashString);
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ",\"method\":\"eth_getBlockByHash\", \"params\": [\""
                 + blockHashString
-                + "\",true]}");
+                + "\",true]}",
+            JSON);
 
     // Setup mocks
     when(blockchainQueries.blockByHash(eq(blockHash))).thenReturn(Optional.empty());
@@ -790,12 +693,12 @@ public void getBlockByHashWithTransactions() throws Exception {
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ",\"method\":\"eth_getBlockByHash\", \"params\": [\""
                 + blockHash
-                + "\",true]}");
+                + "\",true]}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -822,12 +725,12 @@ public void getBlockByHashWithTransactionHashes() throws Exception {
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ",\"method\":\"eth_getBlockByHash\", \"params\": [\""
                 + blockHash
-                + "\",false]}");
+                + "\",false]}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -846,17 +749,17 @@ public void getBlockByHashWithMissingHashParameter() throws Exception {
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
-                + ",\"method\":\"eth_getBlockByHash\", \"params\": [true]}");
+                + ",\"method\":\"eth_getBlockByHash\", \"params\": [true]}",
+            JSON);
 
     // Setup mocks
     when(blockchainQueries.blockByHash(ArgumentMatchers.isA(Hash.class)))
         .thenReturn(Optional.empty());
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
-      assertThat(resp.code()).isEqualTo(400);
+      assertThat(resp.code()).isEqualTo(200);
       // Check general format of result
       final JsonObject json = new JsonObject(resp.body().string());
       final JsonRpcError expectedError = JsonRpcError.INVALID_PARAMS;
@@ -872,15 +775,15 @@ public void getBlockByHashWithMissingBooleanParameter() throws Exception {
         "0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d15273321";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ",\"method\":\"eth_getBlockByHash\", \"params\": [\""
                 + blockHashString
-                + "\"]}");
+                + "\"]}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
-      assertThat(resp.code()).isEqualTo(400);
+      assertThat(resp.code()).isEqualTo(200);
       // Check general format of result
       final JsonObject json = new JsonObject(resp.body().string());
       final JsonRpcError expectedError = JsonRpcError.INVALID_PARAMS;
@@ -895,15 +798,15 @@ public void getBlockByHashWithInvalidHashParameterWithOddLength() throws Excepti
     final String blockHashString = "0xe";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ",\"method\":\"eth_getBlockByHash\", \"params\": [\""
                 + blockHashString
-                + "\",true]}");
+                + "\",true]}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
-      assertThat(resp.code()).isEqualTo(400);
+      assertThat(resp.code()).isEqualTo(200);
       // Check general format of result
       final JsonObject json = new JsonObject(resp.body().string());
       final JsonRpcError expectedError = JsonRpcError.INVALID_PARAMS;
@@ -918,15 +821,15 @@ public void getBlockByHashWithInvalidHashParameterThatIsTooShort() throws Except
     final String blockHashString = "0xe670";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ",\"method\":\"eth_getBlockByHash\", \"params\": [\""
                 + blockHashString
-                + "\",true]}");
+                + "\",true]}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
-      assertThat(resp.code()).isEqualTo(400);
+      assertThat(resp.code()).isEqualTo(200);
       // Check general format of result
       final JsonObject json = new JsonObject(resp.body().string());
       final JsonRpcError expectedError = JsonRpcError.INVALID_PARAMS;
@@ -942,15 +845,15 @@ public void getBlockByHashWithInvalidBooleanParameter() throws Exception {
         "0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d15273321";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ",\"method\":\"eth_getBlockByHash\", \"params\": [\""
                 + blockHashString
-                + "\",{}]}");
+                + "\",{}]}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
-      assertThat(resp.code()).isEqualTo(400);
+      assertThat(resp.code()).isEqualTo(200);
       // Check general format of result
       final JsonObject json = new JsonObject(resp.body().string());
       final JsonRpcError expectedError = JsonRpcError.INVALID_PARAMS;
@@ -964,13 +867,13 @@ public void getBlockByHashWithAllParametersMissing() throws Exception {
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
-                + ",\"method\":\"eth_getBlockByHash\", \"params\": []}");
+                + ",\"method\":\"eth_getBlockByHash\", \"params\": []}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
-      assertThat(resp.code()).isEqualTo(400);
+      assertThat(resp.code()).isEqualTo(200);
       // Check general format of result
       final JsonObject json = new JsonObject(resp.body().string());
       final JsonRpcError expectedError = JsonRpcError.INVALID_PARAMS;
@@ -984,13 +887,13 @@ public void getBlockByHashWithNoParameters() throws Exception {
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
-                + ",\"method\":\"eth_getBlockByHash\"}");
+                + ",\"method\":\"eth_getBlockByHash\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
-      assertThat(resp.code()).isEqualTo(400);
+      assertThat(resp.code()).isEqualTo(200);
       // Check general format of result
       final JsonObject json = new JsonObject(resp.body().string());
       final JsonRpcError expectedError = JsonRpcError.INVALID_PARAMS;
@@ -1012,12 +915,12 @@ public void getBlockByNumberWithTransactions() throws Exception {
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ",\"method\":\"eth_getBlockByNumber\", \"params\": [\"0x"
                 + Long.toString(number, 16)
-                + "\",true]}");
+                + "\",true]}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -1044,12 +947,12 @@ public void getBlockByNumberWithTransactionHashes() throws Exception {
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ",\"method\":\"eth_getBlockByNumber\", \"params\": [\"0x"
                 + Long.toString(number, 16)
-                + "\",false]}");
+                + "\",false]}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -1069,13 +972,13 @@ public void getBlockByNumberForInvalidBlockParameter() throws Exception {
 
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
-                + ",\"method\":\"eth_getBlockByNumber\", \"params\": [\"bla\",false]}");
+                + ",\"method\":\"eth_getBlockByNumber\", \"params\": [\"bla\",false]}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
-      assertThat(resp.code()).isEqualTo(400);
+      assertThat(resp.code()).isEqualTo(200);
       // Check general format of result
       final String respBody = resp.body().string();
       final JsonObject json = new JsonObject(respBody);
@@ -1098,10 +1001,10 @@ public void getBlockByNumberForEarliest() throws Exception {
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
-                + ",\"method\":\"eth_getBlockByNumber\", \"params\": [\"earliest\",true]}");
+                + ",\"method\":\"eth_getBlockByNumber\", \"params\": [\"earliest\",true]}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -1120,10 +1023,10 @@ public void getBlockByNumberForBlockNumberZero() throws Exception {
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
-                + ",\"method\":\"eth_getBlockByNumber\", \"params\": [\"0x0\",true]}");
+                + ",\"method\":\"eth_getBlockByNumber\", \"params\": [\"0x0\",true]}",
+            JSON);
 
     // Setup mocks to return a block
     final BlockDataGenerator gen = new BlockDataGenerator();
@@ -1149,18 +1052,21 @@ public void getBlockByNumberForLatest() throws Exception {
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
-                + ",\"method\":\"eth_getBlockByNumber\", \"params\": [\"latest\",true]}");
+                + ",\"method\":\"eth_getBlockByNumber\", \"params\": [\"latest\",true]}",
+            JSON);
 
     // Setup mocks to return a block
     final BlockDataGenerator gen = new BlockDataGenerator();
+    gen.setBlockOptionsSupplier(() -> BlockDataGenerator.BlockOptions.create().setTimestamp(0L));
     final Block block = gen.genesisBlock();
     final BlockWithMetadata<TransactionWithMetadata, Hash> blockWithMetadata =
         blockWithMetadata(block);
-    when(blockchainQueries.headBlockNumber()).thenReturn(0L);
     when(blockchainQueries.blockByNumber(eq(0L))).thenReturn(Optional.of(blockWithMetadata));
+    WorldStateArchive state = mock(WorldStateArchive.class);
+    when(state.isWorldStateAvailable(any(Hash.class), any(Hash.class))).thenReturn(true);
+    when(blockchainQueries.getWorldStateArchive()).thenReturn(state);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -1179,10 +1085,20 @@ public void getBlockByNumberForPending() throws Exception {
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
-                + ",\"method\":\"eth_getBlockByNumber\", \"params\": [\"pending\",true]}");
+                + ",\"method\":\"eth_getBlockByNumber\", \"params\": [\"pending\",true]}",
+            JSON);
+    // Setup mocks to return a block
+    final BlockDataGenerator gen = new BlockDataGenerator();
+    final Block block = gen.genesisBlock();
+    final BlockWithMetadata<TransactionWithMetadata, Hash> blockWithMetadata =
+        blockWithMetadata(block);
+    when(blockchainQueries.blockByNumber(eq(0L))).thenReturn(Optional.of(blockWithMetadata));
+    when(blockchainQueries.headBlockHeader()).thenReturn(block.getHeader());
+    WorldStateArchive state = mock(WorldStateArchive.class);
+    when(state.isWorldStateAvailable(any(Hash.class), any(Hash.class))).thenReturn(true);
+    when(blockchainQueries.getWorldStateArchive()).thenReturn(state);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -1192,7 +1108,7 @@ public void getBlockByNumberForPending() throws Exception {
       testHelper.assertValidJsonRpcResult(json, id);
       // Check result
       final JsonObject result = json.getJsonObject("result");
-      assertThat(result).isNull();
+      verifyBlockResult(block, blockWithMetadata.getTotalDifficulty(), result, false);
     }
   }
 
@@ -1201,10 +1117,10 @@ public void extraneousParameters() throws Exception {
     final String id = "123";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
-                + ",\"method\":\"web3_clientVersion\", \"params\": [1,2,3]}");
+                + ",\"method\":\"web3_clientVersion\", \"params\": [1,2,3]}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -1222,7 +1138,7 @@ public void requestMissingVersionFieldShouldSucceed() throws Exception {
     final String id = "456";
     final RequestBody body =
         RequestBody.create(
-            JSON, "{\"id\":" + Json.encode(id) + ",\"method\":\"web3_clientVersion\"}");
+            "{\"id\":" + Json.encode(id) + ",\"method\":\"web3_clientVersion\"}", JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -1237,7 +1153,7 @@ public void requestMissingVersionFieldShouldSucceed() throws Exception {
   public void notification() throws Exception {
     // No id field is present - marking this as a notification
     final RequestBody body =
-        RequestBody.create(JSON, "{\"jsonrpc\":\"2.0\",\"method\":\"web3_clientVersion\"}");
+        RequestBody.create("{\"jsonrpc\":\"2.0\",\"method\":\"web3_clientVersion\"}", JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       // Notifications return an empty response
@@ -1252,7 +1168,7 @@ public void nullId() throws Exception {
     // Be lenient - allow explicit null id fields
     final RequestBody body =
         RequestBody.create(
-            JSON, "{\"jsonrpc\":\"2.0\",\"id\":null,\"method\":\"web3_clientVersion\"}");
+            "{\"jsonrpc\":\"2.0\",\"id\":null,\"method\":\"web3_clientVersion\"}", JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -1270,10 +1186,10 @@ public void emptyStringIdField() throws Exception {
     final String id = "";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
-                + ",\"method\":\"web3_clientVersion\"}");
+                + ",\"method\":\"web3_clientVersion\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       // An empty string is still a string, so should be a valid id
@@ -1292,10 +1208,10 @@ public void negativeNumericId() throws Exception {
     final int id = -1;
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
-                + ",\"method\":\"web3_clientVersion\"}");
+                + ",\"method\":\"web3_clientVersion\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -1316,10 +1232,10 @@ public void largeNumericId() throws Exception {
 
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
-                + ",\"method\":\"web3_clientVersion\"}");
+                + ",\"method\":\"web3_clientVersion\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -1342,10 +1258,10 @@ public void largeStringId() throws Exception {
 
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
-                + ",\"method\":\"web3_clientVersion\"}");
+                + ",\"method\":\"web3_clientVersion\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -1363,10 +1279,10 @@ public void fractionalNumericId() throws Exception {
     final double id = 1.5;
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
-                + ",\"method\":\"web3_clientVersion\"}");
+                + ",\"method\":\"web3_clientVersion\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -1383,7 +1299,7 @@ public void fractionalNumericId() throws Exception {
   public void objectId() throws Exception {
     final RequestBody body =
         RequestBody.create(
-            JSON, "{\"jsonrpc\":\"2.0\",\"id\":{},\"method\":\"web3_clientVersion\"}");
+            "{\"jsonrpc\":\"2.0\",\"id\":{},\"method\":\"web3_clientVersion\"}", JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(400);
@@ -1398,7 +1314,7 @@ public void objectId() throws Exception {
   public void arrayId() throws Exception {
     final RequestBody body =
         RequestBody.create(
-            JSON, "{\"jsonrpc\":\"2.0\",\"id\":[],\"method\":\"web3_clientVersion\"}");
+            "{\"jsonrpc\":\"2.0\",\"id\":[],\"method\":\"web3_clientVersion\"}", JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(400);
@@ -1413,7 +1329,7 @@ public void arrayId() throws Exception {
   public void missingMethodField() throws Exception {
     final Integer id = 2;
     final RequestBody body =
-        RequestBody.create(JSON, "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + "}");
+        RequestBody.create("{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + "}", JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(400);
@@ -1424,41 +1340,15 @@ public void missingMethodField() throws Exception {
     }
   }
 
-  @Test
-  public void invalidJson() throws Exception {
-    final RequestBody body = RequestBody.create(JSON, "{bla");
-
-    try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
-      assertThat(resp.code()).isEqualTo(400);
-      final JsonObject json = new JsonObject(resp.body().string());
-      final JsonRpcError expectedError = JsonRpcError.PARSE_ERROR;
-      testHelper.assertValidJsonRpcError(
-          json, null, expectedError.getCode(), expectedError.getMessage());
-    }
-  }
-
-  @Test
-  public void wrongJsonType() throws Exception {
-    final RequestBody body = RequestBody.create(JSON, "\"a string\"");
-
-    try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
-      assertThat(resp.code()).isEqualTo(400);
-      final JsonObject json = new JsonObject(resp.body().string());
-      final JsonRpcError expectedError = JsonRpcError.PARSE_ERROR;
-      testHelper.assertValidJsonRpcError(
-          json, null, expectedError.getCode(), expectedError.getMessage());
-    }
-  }
-
   @Test
   public void requestWithWrongVersionShouldSucceed() throws Exception {
     final String id = "234";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"1.0\",\"id\":"
                 + Json.encode(id)
-                + ",\"method\":\"web3_clientVersion\"}");
+                + ",\"method\":\"web3_clientVersion\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -1474,7 +1364,7 @@ public void unknownMethod() throws Exception {
     final String id = "234";
     final RequestBody body =
         RequestBody.create(
-            JSON, "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"bla\"}");
+            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"bla\"}", JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -1492,12 +1382,12 @@ public void disabledMethod() throws Exception {
     final String id = "234";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ",\"method\":\""
                 + methodName
-                + "\"}");
+                + "\"}",
+            JSON);
 
     when(rpcMethods.get(any(String.class))).thenReturn(null);
     when(rpcMethods.containsKey(any(String.class))).thenReturn(false);
@@ -1522,13 +1412,17 @@ public void exceptionallyHandleJsonSingleRequest() throws Exception {
     when(jsonRpcMethod.getName()).thenReturn("foo");
     when(jsonRpcMethod.response(any())).thenThrow(new RuntimeException("test exception"));
 
-    doReturn(Optional.of(jsonRpcMethod)).when(rpcMethods).get("foo");
+    doReturn(jsonRpcMethod).when(rpcMethods).get("foo");
 
     final RequestBody body =
-        RequestBody.create(JSON, "{\"jsonrpc\":\"2.0\",\"id\":\"666\",\"method\":\"foo\"}");
+        RequestBody.create("{\"jsonrpc\":\"2.0\",\"id\":\"666\",\"method\":\"foo\"}", JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
-      assertThat(resp.code()).isEqualTo(500);
+      assertThat(resp.code()).isEqualTo(200);
+      final JsonObject json = new JsonObject(resp.body().string());
+      final JsonRpcError expectedError = JsonRpcError.INTERNAL_ERROR;
+      testHelper.assertValidJsonRpcError(
+          json, "666", expectedError.getCode(), expectedError.getMessage());
     }
   }
 
@@ -1537,17 +1431,23 @@ public void exceptionallyHandleJsonBatchRequest() throws Exception {
     final JsonRpcMethod jsonRpcMethod = mock(JsonRpcMethod.class);
     when(jsonRpcMethod.getName()).thenReturn("foo");
     when(jsonRpcMethod.response(any())).thenThrow(new RuntimeException("test exception"));
-    doReturn(Optional.of(jsonRpcMethod)).when(rpcMethods).get("foo");
+    doReturn(jsonRpcMethod).when(rpcMethods).get("foo");
 
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "[{\"jsonrpc\":\"2.0\",\"id\":\"000\",\"method\":\"web3_clientVersion\"},"
                 + "{\"jsonrpc\":\"2.0\",\"id\":\"111\",\"method\":\"foo\"},"
-                + "{\"jsonrpc\":\"2.0\",\"id\":\"222\",\"method\":\"net_version\"}]");
+                + "{\"jsonrpc\":\"2.0\",\"id\":\"222\",\"method\":\"net_version\"}]",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
-      assertThat(resp.code()).isEqualTo(400);
+      assertThat(resp.code()).isEqualTo(200);
+      final JsonArray array = new JsonArray(resp.body().string());
+      testHelper.assertValidJsonRpcResult(array.getJsonObject(0), "000");
+      final JsonRpcError expectedError = JsonRpcError.INTERNAL_ERROR;
+      testHelper.assertValidJsonRpcError(
+          array.getJsonObject(1), "111", expectedError.getCode(), expectedError.getMessage());
+      testHelper.assertValidJsonRpcResult(array.getJsonObject(2), "222");
     }
   }
 
@@ -1558,7 +1458,6 @@ public void batchRequest() throws Exception {
     final int netVersionRequestId = 4;
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "[{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(clientVersionRequestId)
                 + ",\"method\":\"web3_clientVersion\"},"
@@ -1567,7 +1466,8 @@ public void batchRequest() throws Exception {
                 + ",\"method\":\"bla\"},"
                 + "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(netVersionRequestId)
-                + ",\"method\":\"net_version\"}]");
+                + ",\"method\":\"net_version\"}]",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -1615,7 +1515,7 @@ public void batchRequestContainingInvalidRequest() throws Exception {
             + Json.encode(netVersionRequestId)
             + ",\"method\":\"net_version\"}";
     final String batchRequest = "[" + String.join(", ", reqs) + "]";
-    final RequestBody body = RequestBody.create(JSON, batchRequest);
+    final RequestBody body = RequestBody.create(batchRequest, JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -1662,7 +1562,7 @@ public void batchRequestParseError() throws Exception {
             + "  {\"jsonrpc\": \"2.0\", \"method\"\n"
             + "]";
 
-    final RequestBody body = RequestBody.create(JSON, req);
+    final RequestBody body = RequestBody.create(req, JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(400);
@@ -1679,14 +1579,14 @@ public void batchRequestWithNotifications() throws Exception {
     final int netVersionRequestId = 3;
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "[{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(clientVersionRequestId)
                 + ",\"method\":\"web3_clientVersion\"},"
                 + "{\"jsonrpc\":\"2.0\", \"method\":\"web3_clientVersion\"},"
                 + "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(netVersionRequestId)
-                + ",\"method\":\"net_version\"}]");
+                + ",\"method\":\"net_version\"}]",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -1719,7 +1619,7 @@ public void batchRequestWithNotifications() throws Exception {
    */
   @Test
   public void emptyBatchRequest() throws Exception {
-    final RequestBody body = RequestBody.create(JSON, "[]");
+    final RequestBody body = RequestBody.create("[]", JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(400);
@@ -1766,7 +1666,12 @@ private void verifyBlockResult(
         final Hash expectedBlockHash = block.getHeader().getHash();
         final long expectedBlockNumber = block.getHeader().getNumber();
         assertTransactionResultMatchesTransaction(
-            transactionResult, transaction, expectedIndex, expectedBlockHash, expectedBlockNumber);
+            transactionResult,
+            transaction,
+            expectedIndex,
+            expectedBlockHash,
+            block.getHeader().getBaseFee(),
+            expectedBlockNumber);
       }
     }
   }
@@ -1776,6 +1681,7 @@ private void assertTransactionResultMatchesTransaction(
       final Transaction transaction,
       final Integer index,
       final Hash blockHash,
+      final Optional<Wei> baseFee,
       final Long blockNumber) {
     assertThat(Hash.fromHexString(result.getString("hash"))).isEqualTo(transaction.getHash());
     assertThat(Long.decode(result.getString("nonce"))).isEqualByComparingTo(transaction.getNonce());
@@ -1803,8 +1709,13 @@ private void assertTransactionResultMatchesTransaction(
       assertThat(result.getValue("to")).isNull();
     }
     assertThat(Wei.fromHexString(result.getString("value"))).isEqualTo(transaction.getValue());
-    assertThat(Wei.fromHexString(result.getString("gasPrice")))
-        .isEqualTo(transaction.getGasPrice());
+    assertThat(Optional.ofNullable(result.getString("gasPrice")).map(Wei::fromHexString))
+        .isEqualTo(Optional.of(transaction.getEffectiveGasPrice(baseFee)));
+    assertThat(Optional.ofNullable(result.getString("maxFeePerGas")).map(Wei::fromHexString))
+        .isEqualTo(transaction.getMaxFeePerGas());
+    assertThat(
+            Optional.ofNullable(result.getString("maxPriorityFeePerGas")).map(Wei::fromHexString))
+        .isEqualTo(transaction.getMaxPriorityFeePerGas());
     assertThat(Long.decode(result.getString("gas"))).isEqualTo(transaction.getGasLimit());
     assertThat(Bytes.fromHexString(result.getString("input"))).isEqualTo(transaction.getPayload());
   }
@@ -1847,8 +1758,8 @@ public void ethSyncingFalse() throws Exception {
     final String id = "007";
     final RequestBody body =
         RequestBody.create(
-            JSON,
-            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"eth_syncing\"}");
+            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"eth_syncing\"}",
+            JSON);
     when(synchronizer.getSyncStatus()).thenReturn(Optional.empty());
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
@@ -1869,8 +1780,8 @@ public void ethSyncingResultIsPresent() throws Exception {
     final String id = "999";
     final RequestBody body =
         RequestBody.create(
-            JSON,
-            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"eth_syncing\"}");
+            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"eth_syncing\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       final String respBody = resp.body().string();
@@ -1893,8 +1804,8 @@ public void ethFastSyncingResultIsPresent() throws Exception {
     final String id = "999";
     final RequestBody body =
         RequestBody.create(
-            JSON,
-            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"eth_syncing\"}");
+            "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"eth_syncing\"}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       final String respBody = resp.body().string();
@@ -1922,7 +1833,11 @@ public BlockWithMetadata<TransactionWithMetadata, Hash> blockWithMetadata(final
     for (int i = 0; i < txs.size(); i++) {
       formattedTxs.add(
           new TransactionWithMetadata(
-              txs.get(i), block.getHeader().getNumber(), block.getHash(), i));
+              txs.get(i),
+              block.getHeader().getNumber(),
+              block.getHeader().getBaseFee(),
+              block.getHash(),
+              i));
     }
     final List<Hash> ommers =
         block.getBody().getOmmers().stream().map(BlockHeader::getHash).collect(Collectors.toList());
@@ -1948,21 +1863,25 @@ public void ethGetStorageLatestAtIndexZero() throws Exception {
     final BlockDataGenerator gen = new BlockDataGenerator();
     final Address address = gen.address();
     final String mockStorage = "0x0000000000000000000000000000000000000000000000000000000000000001";
-    when(blockchainQueries.headBlockNumber()).thenReturn(0L);
-    when(blockchainQueries.storageAt(eq(address), eq(UInt256.ZERO), eq(0L)))
+    when(blockchainQueries.getBlockchain()).thenReturn(blockchain);
+    when(blockchainQueries.getBlockchain().getChainHead()).thenReturn(chainHead);
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getBlockHash()).thenReturn(Hash.ZERO);
+    when(chainHead.getBlockHeader()).thenReturn(blockHeader);
+    when(blockchainQueries.storageAt(eq(address), eq(UInt256.ZERO), eq(Hash.ZERO)))
         .thenReturn(Optional.of(UInt256.fromHexString(mockStorage)));
 
     final String id = "88";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ",\"method\":\"eth_getStorageAt\", \"params\": [\""
                 + address
                 + "\",\""
                 + UInt256.ZERO
-                + "\",\"latest\"]}");
+                + "\",\"latest\"]}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -1972,8 +1891,8 @@ public void ethGetStorageLatestAtIndexZero() throws Exception {
       testHelper.assertValidJsonRpcResult(json, id);
       // Check result
       final String result = json.getString("result");
-      assertThat("0x0000000000000000000000000000000000000000000000000000000000000001")
-          .isEqualTo(result);
+      assertThat(result)
+          .isEqualTo("0x0000000000000000000000000000000000000000000000000000000000000001");
     }
   }
 
@@ -1983,21 +1902,25 @@ public void ethGetStorageLatestAtIndexOne() throws Exception {
     final BlockDataGenerator gen = new BlockDataGenerator();
     final Address address = gen.address();
     final String mockStorage = "0x0000000000000000000000000000000000000000000000000000000000000006";
-    when(blockchainQueries.headBlockNumber()).thenReturn(0L);
-    when(blockchainQueries.storageAt(eq(address), eq(UInt256.ONE), eq(0L)))
+    when(blockchainQueries.getBlockchain()).thenReturn(blockchain);
+    when(blockchainQueries.getBlockchain().getChainHead()).thenReturn(chainHead);
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getBlockHash()).thenReturn(Hash.ZERO);
+    when(chainHead.getBlockHeader()).thenReturn(blockHeader);
+    when(blockchainQueries.storageAt(eq(address), eq(UInt256.ONE), eq(Hash.ZERO)))
         .thenReturn(Optional.of(UInt256.fromHexString(mockStorage)));
 
     final String id = "88";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ",\"method\":\"eth_getStorageAt\", \"params\": [\""
                 + address
                 + "\",\""
                 + UInt256.ONE
-                + "\",\"latest\"]}");
+                + "\",\"latest\"]}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -2007,8 +1930,8 @@ public void ethGetStorageLatestAtIndexOne() throws Exception {
       testHelper.assertValidJsonRpcResult(json, id);
       // Check result
       final String result = json.getString("result");
-      assertThat("0x0000000000000000000000000000000000000000000000000000000000000006")
-          .isEqualTo(result);
+      assertThat(result)
+          .isEqualTo("0x0000000000000000000000000000000000000000000000000000000000000006");
     }
   }
 
@@ -2018,20 +1941,22 @@ public void ethGetStorageAtEarliest() throws Exception {
     final BlockDataGenerator gen = new BlockDataGenerator();
     final Address address = gen.address();
     final String mockStorage = "0x0000000000000000000000000000000000000000000000000000000000000006";
-    when(blockchainQueries.storageAt(address, UInt256.ONE, 0L))
+    final Hash blockHash =
+        Hash.fromHexString("0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470");
+    when(blockchainQueries.storageAt(address, UInt256.ONE, blockHash))
         .thenReturn(Optional.of(UInt256.fromHexString(mockStorage)));
 
     final String id = "88";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ",\"method\":\"eth_getStorageAt\", \"params\": [\""
                 + address
                 + "\",\""
                 + UInt256.ONE
-                + "\",\"earliest\"]}");
+                + "\",\"earliest\"]}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -2041,8 +1966,8 @@ public void ethGetStorageAtEarliest() throws Exception {
       testHelper.assertValidJsonRpcResult(json, id);
       // Check result
       final String result = json.getString("result");
-      assertThat("0x0000000000000000000000000000000000000000000000000000000000000006")
-          .isEqualTo(result);
+      assertThat(result)
+          .isEqualTo("0x0000000000000000000000000000000000000000000000000000000000000006");
     }
   }
 
@@ -2052,13 +1977,14 @@ public void ethGetStorageAtBlockNumber() throws Exception {
     final BlockDataGenerator gen = new BlockDataGenerator();
     final Address address = gen.address();
     final String mockStorage = "0x0000000000000000000000000000000000000000000000000000000000000002";
-    when(blockchainQueries.storageAt(address, UInt256.ZERO, 0L))
+    final Hash blockHash =
+        Hash.fromHexString("0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470");
+    when(blockchainQueries.storageAt(address, UInt256.ZERO, blockHash))
         .thenReturn(Optional.of(UInt256.fromHexString(mockStorage)));
 
     final String id = "999";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ",\"method\":\"eth_getStorageAt\", \"params\": [\""
@@ -2067,7 +1993,8 @@ public void ethGetStorageAtBlockNumber() throws Exception {
                 + UInt256.ZERO
                 + "\",\""
                 + 0L
-                + "\"]}");
+                + "\"]}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
       assertThat(resp.code()).isEqualTo(200);
@@ -2078,8 +2005,8 @@ public void ethGetStorageAtBlockNumber() throws Exception {
 
       // Check result
       final Object result = json.getString("result");
-      assertThat("0x0000000000000000000000000000000000000000000000000000000000000002")
-          .isEqualTo(result);
+      assertThat(result)
+          .isEqualTo("0x0000000000000000000000000000000000000000000000000000000000000002");
     }
   }
 
@@ -2092,17 +2019,17 @@ public void ethGetStorageAtInvalidParameterStorageIndex() throws Exception {
     final String id = "88";
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ",\"method\":\"eth_getStorageAt\", \"params\": [\""
                 + address
                 + "\",\""
                 + "blah"
-                + "\",\"latest\"]}");
+                + "\",\"latest\"]}",
+            JSON);
 
     try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
-      assertThat(resp.code()).isEqualTo(400);
+      assertThat(resp.code()).isEqualTo(200);
       // Check general format of result
       final JsonObject json = new JsonObject(resp.body().string());
       final JsonRpcError expectedError = JsonRpcError.INVALID_PARAMS;
@@ -2125,11 +2052,38 @@ public void assertThatReadinessProbeWorks() throws Exception {
     }
   }
 
-  private Request buildPostRequest(final RequestBody body) {
-    return new Request.Builder().post(body).url(baseUrl).build();
+  @Test
+  public void handleResponseWithOptionalEmptyValue() throws Exception {
+    final JsonRpcMethod method = TestJsonRpcMethodsUtil.optionalEmptyResponse();
+    rpcMethods.put(method.getName(), method);
+
+    final String jsonString =
+        "{ \"id\": 1, \"jsonrpc\": \"2.0\", \"method\": \"" + method.getName() + "\" }";
+    final RequestBody body = RequestBody.create(jsonString, JSON);
+
+    try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
+      final JsonObject json = new JsonObject(resp.body().string());
+      assertThat(json.getString("result")).isNull();
+    } finally {
+      rpcMethods.remove(method.getName());
+    }
   }
 
-  private Request buildGetRequest(final String path) {
-    return new Request.Builder().get().url(baseUrl + path).build();
+  @Test
+  public void handleResponseWithOptionalExistingValue() throws Exception {
+    final String expectedValue = "foo";
+    final JsonRpcMethod method = TestJsonRpcMethodsUtil.optionalResponseWithValue(expectedValue);
+    rpcMethods.put(method.getName(), method);
+
+    final String jsonString =
+        "{ \"id\": 1, \"jsonrpc\": \"2.0\", \"method\": \"" + method.getName() + "\" }";
+    final RequestBody body = RequestBody.create(jsonString, JSON);
+
+    try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
+      final JsonObject json = new JsonObject(resp.body().string());
+      assertThat(json.getString("result")).isEqualTo(expectedValue);
+    } finally {
+      rpcMethods.remove(method.getName());
+    }
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTestBase.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTestBase.java
new file mode 100644
index 00000000000..0b3b9441dc8
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTestBase.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.api.jsonrpc;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+
+import org.hyperledger.besu.config.StubGenesisConfigOptions;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.methods.JsonRpcMethodsFactory;
+import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketConfiguration;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.chain.ChainHead;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.core.Synchronizer;
+import org.hyperledger.besu.ethereum.eth.EthProtocol;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule;
+import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
+import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController;
+import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
+import org.hyperledger.besu.nat.NatService;
+
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+import io.vertx.core.Vertx;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import org.junit.AfterClass;
+import org.junit.ClassRule;
+import org.junit.rules.TemporaryFolder;
+
+public class JsonRpcHttpServiceTestBase {
+
+  @ClassRule public static final TemporaryFolder folder = new TemporaryFolder();
+  protected final JsonRpcTestHelper testHelper = new JsonRpcTestHelper();
+
+  private static final Vertx vertx = Vertx.vertx();
+
+  protected static Map<String, JsonRpcMethod> rpcMethods;
+  protected static JsonRpcHttpService service;
+  protected static OkHttpClient client;
+  protected static String baseUrl;
+  protected static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+  protected static final String CLIENT_VERSION = "TestClientVersion/0.1.0";
+  protected static final BigInteger CHAIN_ID = BigInteger.valueOf(123);
+  protected static P2PNetwork peerDiscoveryMock;
+  protected static EthPeers ethPeersMock;
+  protected static Blockchain blockchain;
+  protected static BlockchainQueries blockchainQueries;
+  protected static ChainHead chainHead;
+  protected static Synchronizer synchronizer;
+  protected static final Collection<String> JSON_RPC_APIS =
+      Arrays.asList(
+          RpcApis.ETH.name(), RpcApis.NET.name(), RpcApis.WEB3.name(), RpcApis.ADMIN.name());
+  protected static final NatService natService = new NatService(Optional.empty());
+  protected static int maxConnections = 80;
+  protected static int maxBatchSize = 10;
+
+  public static void initServerAndClient() throws Exception {
+    peerDiscoveryMock = mock(P2PNetwork.class);
+    ethPeersMock = mock(EthPeers.class);
+    blockchain = mock(Blockchain.class);
+    blockchainQueries = mock(BlockchainQueries.class);
+    chainHead = mock(ChainHead.class);
+    synchronizer = mock(Synchronizer.class);
+
+    final Set<Capability> supportedCapabilities = new HashSet<>();
+    supportedCapabilities.add(EthProtocol.ETH62);
+    supportedCapabilities.add(EthProtocol.ETH63);
+
+    rpcMethods =
+        spy(
+            new JsonRpcMethodsFactory()
+                .methods(
+                    CLIENT_VERSION,
+                    CHAIN_ID,
+                    new StubGenesisConfigOptions(),
+                    peerDiscoveryMock,
+                    blockchainQueries,
+                    synchronizer,
+                    MainnetProtocolSchedule.fromConfig(
+                        new StubGenesisConfigOptions().constantinopleBlock(0).chainId(CHAIN_ID),
+                        EvmConfiguration.DEFAULT),
+                    mock(ProtocolContext.class),
+                    mock(FilterManager.class),
+                    mock(TransactionPool.class),
+                    mock(PoWMiningCoordinator.class),
+                    new NoOpMetricsSystem(),
+                    supportedCapabilities,
+                    Optional.of(mock(AccountLocalConfigPermissioningController.class)),
+                    Optional.of(mock(NodeLocalConfigPermissioningController.class)),
+                    JSON_RPC_APIS,
+                    mock(PrivacyParameters.class),
+                    mock(JsonRpcConfiguration.class),
+                    mock(WebSocketConfiguration.class),
+                    mock(MetricsConfiguration.class),
+                    natService,
+                    new HashMap<>(),
+                    folder.getRoot().toPath(),
+                    ethPeersMock,
+                    vertx,
+                    Optional.empty(),
+                    Optional.empty()));
+    service = createJsonRpcHttpService(createLimitedJsonRpcConfig());
+    service.start().join();
+
+    // Build an OkHttp client.
+    client = new OkHttpClient();
+    baseUrl = service.url();
+  }
+
+  protected static JsonRpcHttpService createJsonRpcHttpService(final JsonRpcConfiguration config)
+      throws Exception {
+    return new JsonRpcHttpService(
+        vertx,
+        folder.newFolder().toPath(),
+        config,
+        new NoOpMetricsSystem(),
+        natService,
+        rpcMethods,
+        HealthService.ALWAYS_HEALTHY,
+        HealthService.ALWAYS_HEALTHY);
+  }
+
+  protected static JsonRpcHttpService createJsonRpcHttpService() throws Exception {
+    return new JsonRpcHttpService(
+        vertx,
+        folder.newFolder().toPath(),
+        createLimitedJsonRpcConfig(),
+        new NoOpMetricsSystem(),
+        natService,
+        rpcMethods,
+        HealthService.ALWAYS_HEALTHY,
+        HealthService.ALWAYS_HEALTHY);
+  }
+
+  private static JsonRpcConfiguration createLimitedJsonRpcConfig() {
+    final JsonRpcConfiguration config = JsonRpcConfiguration.createDefault();
+    config.setPort(0);
+    config.setHostsAllowlist(Collections.singletonList("*"));
+    config.setMaxActiveConnections(maxConnections);
+    config.setMaxBatchSize(maxBatchSize);
+    return config;
+  }
+
+  protected Request buildPostRequest(final RequestBody body) {
+    return new Request.Builder().post(body).url(baseUrl).build();
+  }
+
+  protected Request buildGetRequest(final String path) {
+    return new Request.Builder().get().url(baseUrl + path).build();
+  }
+
+  /** Tears down the HTTP server. */
+  @AfterClass
+  public static void shutdownServer() {
+    service.stop().join();
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsClientAuthTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsClientAuthTest.java
index 9fd7ad29bf1..fcbfb399d16 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsClientAuthTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsClientAuthTest.java
@@ -16,9 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIOException;
-import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.ETH;
-import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.NET;
-import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.WEB3;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.DEFAULT_RPC_APIS;
 import static org.hyperledger.besu.ethereum.api.tls.KnownClientFileUtil.writeToKnownClientsFile;
 import static org.hyperledger.besu.ethereum.api.tls.TlsClientAuthConfiguration.Builder.aTlsClientAuthConfiguration;
 import static org.hyperledger.besu.ethereum.api.tls.TlsConfiguration.Builder.aTlsConfiguration;
@@ -26,6 +24,7 @@
 import static org.mockito.Mockito.spy;
 
 import org.hyperledger.besu.config.StubGenesisConfigOptions;
+import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
@@ -35,7 +34,7 @@
 import org.hyperledger.besu.ethereum.api.tls.FileBasedPasswordProvider;
 import org.hyperledger.besu.ethereum.api.tls.SelfSignedP12Certificate;
 import org.hyperledger.besu.ethereum.api.tls.TlsConfiguration;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.eth.EthProtocol;
@@ -55,10 +54,8 @@
 import java.math.BigInteger;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -88,7 +85,7 @@ public class JsonRpcHttpServiceTlsClientAuthTest {
   private static final String JSON_HEADER = "application/json; charset=utf-8";
   private static final String CLIENT_VERSION = "TestClientVersion/0.1.0";
   private static final BigInteger CHAIN_ID = BigInteger.valueOf(123);
-  private static final Collection<RpcApi> JSON_RPC_APIS = List.of(ETH, NET, WEB3);
+
   private static final NatService natService = new NatService(Optional.empty());
   private static final SelfSignedP12Certificate CLIENT_AS_CA_CERT =
       SelfSignedP12Certificate.create();
@@ -124,14 +121,15 @@ public void initServer() throws Exception {
                     synchronizer,
                     MainnetProtocolSchedule.fromConfig(
                         new StubGenesisConfigOptions().constantinopleBlock(0).chainId(CHAIN_ID)),
+                    mock(ProtocolContext.class),
                     mock(FilterManager.class),
                     mock(TransactionPool.class),
-                    mock(EthHashMiningCoordinator.class),
+                    mock(PoWMiningCoordinator.class),
                     new NoOpMetricsSystem(),
                     supportedCapabilities,
                     Optional.of(mock(AccountLocalConfigPermissioningController.class)),
                     Optional.of(mock(NodeLocalConfigPermissioningController.class)),
-                    JSON_RPC_APIS,
+                    DEFAULT_RPC_APIS,
                     mock(PrivacyParameters.class),
                     mock(JsonRpcConfiguration.class),
                     mock(WebSocketConfiguration.class),
@@ -139,7 +137,10 @@ public void initServer() throws Exception {
                     natService,
                     Collections.emptyMap(),
                     folder.getRoot().toPath(),
-                    mock(EthPeers.class)));
+                    mock(EthPeers.class),
+                    vertx,
+                    Optional.empty(),
+                    Optional.empty()));
 
     System.setProperty("javax.net.ssl.trustStore", CLIENT_AS_CA_CERT.getKeyStoreFile().toString());
     System.setProperty(
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsMisconfigurationTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsMisconfigurationTest.java
index bcddf932ff1..1e6d1f169cf 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsMisconfigurationTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsMisconfigurationTest.java
@@ -15,9 +15,7 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc;
 
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.ETH;
-import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.NET;
-import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.WEB3;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.DEFAULT_RPC_APIS;
 import static org.hyperledger.besu.ethereum.api.tls.KnownClientFileUtil.writeToKnownClientsFile;
 import static org.hyperledger.besu.ethereum.api.tls.TlsClientAuthConfiguration.Builder.aTlsClientAuthConfiguration;
 import static org.hyperledger.besu.ethereum.api.tls.TlsConfiguration.Builder.aTlsConfiguration;
@@ -25,6 +23,7 @@
 import static org.mockito.Mockito.spy;
 
 import org.hyperledger.besu.config.StubGenesisConfigOptions;
+import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
@@ -34,7 +33,7 @@
 import org.hyperledger.besu.ethereum.api.tls.FileBasedPasswordProvider;
 import org.hyperledger.besu.ethereum.api.tls.SelfSignedP12Certificate;
 import org.hyperledger.besu.ethereum.api.tls.TlsConfiguration;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.eth.EthProtocol;
@@ -49,12 +48,10 @@
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
 import org.hyperledger.besu.nat.NatService;
 
-import java.io.File;
 import java.io.IOException;
 import java.math.BigInteger;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -65,29 +62,29 @@
 
 import io.vertx.core.Vertx;
 import org.assertj.core.api.Assertions;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnJre;
+import org.junit.jupiter.api.condition.JRE;
+import org.junit.jupiter.api.io.TempDir;
 
-public class JsonRpcHttpServiceTlsMisconfigurationTest {
-  @ClassRule public static final TemporaryFolder folder = new TemporaryFolder();
+class JsonRpcHttpServiceTlsMisconfigurationTest {
 
   protected static final Vertx vertx = Vertx.vertx();
 
   private static final String CLIENT_VERSION = "TestClientVersion/0.1.0";
   private static final BigInteger CHAIN_ID = BigInteger.valueOf(123);
-  private static final Collection<RpcApi> JSON_RPC_APIS = List.of(ETH, NET, WEB3);
   private static final NatService natService = new NatService(Optional.empty());
   private final SelfSignedP12Certificate besuCertificate = SelfSignedP12Certificate.create();
+  @TempDir private Path tempDir;
   private Path knownClientsFile;
   private Map<String, JsonRpcMethod> rpcMethods;
   private JsonRpcHttpService service;
 
-  @Before
-  public void beforeEach() throws IOException {
-    knownClientsFile = folder.newFile().toPath();
+  @BeforeEach
+  public void beforeEach() {
+    knownClientsFile = tempDir.resolve("knownClients");
     writeToKnownClientsFile(
         besuCertificate.getCommonName(),
         besuCertificate.getCertificateHexFingerprint(),
@@ -112,31 +109,36 @@ public void beforeEach() throws IOException {
                     synchronizer,
                     MainnetProtocolSchedule.fromConfig(
                         new StubGenesisConfigOptions().constantinopleBlock(0).chainId(CHAIN_ID)),
+                    mock(ProtocolContext.class),
                     mock(FilterManager.class),
                     mock(TransactionPool.class),
-                    mock(EthHashMiningCoordinator.class),
+                    mock(PoWMiningCoordinator.class),
                     new NoOpMetricsSystem(),
                     supportedCapabilities,
                     Optional.of(mock(AccountLocalConfigPermissioningController.class)),
                     Optional.of(mock(NodeLocalConfigPermissioningController.class)),
-                    JSON_RPC_APIS,
+                    DEFAULT_RPC_APIS,
                     mock(PrivacyParameters.class),
                     mock(JsonRpcConfiguration.class),
                     mock(WebSocketConfiguration.class),
                     mock(MetricsConfiguration.class),
                     natService,
                     Collections.emptyMap(),
-                    folder.getRoot().toPath(),
-                    mock(EthPeers.class)));
+                    tempDir.getRoot(),
+                    mock(EthPeers.class),
+                    vertx,
+                    Optional.empty(),
+                    Optional.empty()));
   }
 
-  @After
+  @AfterEach
   public void shutdownServer() {
     Optional.ofNullable(service).ifPresent(s -> service.stop().join());
   }
 
   @Test
-  public void exceptionRaisedWhenNonExistentKeystoreFileIsSpecified() throws IOException {
+  void exceptionRaisedWhenNonExistentKeystoreFileIsSpecified() {
+    Assertions.setMaxStackTraceElementsDisplayed(60);
     service =
         createJsonRpcHttpService(
             rpcMethods, createJsonRpcConfig(invalidKeystorePathTlsConfiguration()));
@@ -150,7 +152,7 @@ public void exceptionRaisedWhenNonExistentKeystoreFileIsSpecified() throws IOExc
   }
 
   @Test
-  public void exceptionRaisedWhenIncorrectKeystorePasswordIsSpecified() throws IOException {
+  void exceptionRaisedWhenIncorrectKeystorePasswordIsSpecified() {
     service =
         createJsonRpcHttpService(
             rpcMethods, createJsonRpcConfig(invalidPasswordTlsConfiguration()));
@@ -161,11 +163,11 @@ public void exceptionRaisedWhenIncorrectKeystorePasswordIsSpecified() throws IOE
               Assertions.fail("service.start should have failed");
             })
         .withCauseInstanceOf(JsonRpcServiceException.class)
-        .withMessageContaining("failed to decrypt safe contents entry");
+        .withMessageContaining("keystore password was incorrect");
   }
 
   @Test
-  public void exceptionRaisedWhenIncorrectKeystorePasswordFileIsSpecified() throws IOException {
+  void exceptionRaisedWhenIncorrectKeystorePasswordFileIsSpecified() {
     service =
         createJsonRpcHttpService(
             rpcMethods, createJsonRpcConfig(invalidPasswordFileTlsConfiguration()));
@@ -180,7 +182,8 @@ public void exceptionRaisedWhenIncorrectKeystorePasswordFileIsSpecified() throws
   }
 
   @Test
-  public void exceptionRaisedWhenInvalidKeystoreFileIsSpecified() throws IOException {
+  @DisabledOnJre({JRE.JAVA_17, JRE.JAVA_18}) // error message changed
+  void exceptionRaisedWhenInvalidKeystoreFileIsSpecified() throws IOException {
     service =
         createJsonRpcHttpService(
             rpcMethods, createJsonRpcConfig(invalidKeystoreFileTlsConfiguration()));
@@ -195,7 +198,23 @@ public void exceptionRaisedWhenInvalidKeystoreFileIsSpecified() throws IOExcepti
   }
 
   @Test
-  public void exceptionRaisedWhenInvalidKnownClientsFileIsSpecified() throws IOException {
+  @DisabledOnJre({JRE.JAVA_11, JRE.JAVA_12, JRE.JAVA_13, JRE.JAVA_14, JRE.JAVA_15, JRE.JAVA_16})
+  void exceptionRaisedWhenInvalidKeystoreFileIsSpecified_NewJava() throws IOException {
+    service =
+        createJsonRpcHttpService(
+            rpcMethods, createJsonRpcConfig(invalidKeystoreFileTlsConfiguration()));
+    assertThatExceptionOfType(CompletionException.class)
+        .isThrownBy(
+            () -> {
+              service.start().join();
+              Assertions.fail("service.start should have failed");
+            })
+        .withCauseInstanceOf(JsonRpcServiceException.class)
+        .withMessageContaining("Tag number over 30 is not supported");
+  }
+
+  @Test
+  void exceptionRaisedWhenInvalidKnownClientsFileIsSpecified() throws IOException {
     service =
         createJsonRpcHttpService(
             rpcMethods, createJsonRpcConfig(invalidKnownClientsTlsConfiguration()));
@@ -210,9 +229,10 @@ public void exceptionRaisedWhenInvalidKnownClientsFileIsSpecified() throws IOExc
   }
 
   private TlsConfiguration invalidKeystoreFileTlsConfiguration() throws IOException {
-    final File tempFile = folder.newFile();
+    final Path tempFile = tempDir.resolve("invalidKeystoreFileTlsConfig");
+    Files.createFile(tempFile);
     return aTlsConfiguration()
-        .withKeyStorePath(tempFile.toPath())
+        .withKeyStorePath(tempFile)
         .withKeyStorePasswordSupplier(() -> "invalid_password")
         .withClientAuthConfiguration(
             aTlsClientAuthConfiguration().withKnownClientsFile(knownClientsFile).build())
@@ -248,7 +268,7 @@ private TlsConfiguration invalidPasswordFileTlsConfiguration() {
   }
 
   private TlsConfiguration invalidKnownClientsTlsConfiguration() throws IOException {
-    final Path tempKnownClientsFile = folder.newFile().toPath();
+    final Path tempKnownClientsFile = tempDir.resolve("invalidKnownClientsTlsConfiguration");
     Files.write(tempKnownClientsFile, List.of("cn invalid_sha256"));
 
     return TlsConfiguration.Builder.aTlsConfiguration()
@@ -260,11 +280,12 @@ private TlsConfiguration invalidKnownClientsTlsConfiguration() throws IOExceptio
   }
 
   private JsonRpcHttpService createJsonRpcHttpService(
-      final Map<String, JsonRpcMethod> rpcMethods, final JsonRpcConfiguration jsonRpcConfig)
-      throws IOException {
+      final Map<String, JsonRpcMethod> rpcMethods, final JsonRpcConfiguration jsonRpcConfig) {
+    final Path testDir = tempDir.resolve("createJsonRpcHttpSercice");
+    testDir.toFile().mkdirs();
     return new JsonRpcHttpService(
         vertx,
-        folder.newFolder().toPath(),
+        tempDir,
         jsonRpcConfig,
         new NoOpMetricsSystem(),
         natService,
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsTest.java
index ec7c5f33225..f45410cc9c8 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsTest.java
@@ -17,14 +17,13 @@
 import static okhttp3.Protocol.HTTP_1_1;
 import static okhttp3.Protocol.HTTP_2;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.ETH;
-import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.NET;
-import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.WEB3;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.DEFAULT_RPC_APIS;
 import static org.hyperledger.besu.ethereum.api.tls.TlsConfiguration.Builder.aTlsConfiguration;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 
 import org.hyperledger.besu.config.StubGenesisConfigOptions;
+import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
@@ -34,7 +33,7 @@
 import org.hyperledger.besu.ethereum.api.tls.FileBasedPasswordProvider;
 import org.hyperledger.besu.ethereum.api.tls.SelfSignedP12Certificate;
 import org.hyperledger.besu.ethereum.api.tls.TlsConfiguration;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.eth.EthProtocol;
@@ -54,10 +53,8 @@
 import java.math.BigInteger;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
@@ -85,7 +82,6 @@ public class JsonRpcHttpServiceTlsTest {
   private static final String JSON_HEADER = "application/json; charset=utf-8";
   private static final String CLIENT_VERSION = "TestClientVersion/0.1.0";
   private static final BigInteger CHAIN_ID = BigInteger.valueOf(123);
-  private static final Collection<RpcApi> JSON_RPC_APIS = List.of(ETH, NET, WEB3);
   private static final NatService natService = new NatService(Optional.empty());
   private JsonRpcHttpService service;
   private String baseUrl;
@@ -115,14 +111,15 @@ public void initServer() throws Exception {
                     synchronizer,
                     MainnetProtocolSchedule.fromConfig(
                         new StubGenesisConfigOptions().constantinopleBlock(0).chainId(CHAIN_ID)),
+                    mock(ProtocolContext.class),
                     mock(FilterManager.class),
                     mock(TransactionPool.class),
-                    mock(EthHashMiningCoordinator.class),
+                    mock(PoWMiningCoordinator.class),
                     new NoOpMetricsSystem(),
                     supportedCapabilities,
                     Optional.of(mock(AccountLocalConfigPermissioningController.class)),
                     Optional.of(mock(NodeLocalConfigPermissioningController.class)),
-                    JSON_RPC_APIS,
+                    DEFAULT_RPC_APIS,
                     mock(PrivacyParameters.class),
                     mock(JsonRpcConfiguration.class),
                     mock(WebSocketConfiguration.class),
@@ -130,7 +127,10 @@ public void initServer() throws Exception {
                     natService,
                     Collections.emptyMap(),
                     folder.getRoot().toPath(),
-                    mock(EthPeers.class)));
+                    mock(EthPeers.class),
+                    vertx,
+                    Optional.empty(),
+                    Optional.empty()));
     service = createJsonRpcHttpService(createJsonRpcConfig());
     service.start().join();
     baseUrl = service.url();
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/LatestNonceProviderTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/LatestNonceProviderTest.java
index bc3bb3874f6..bc3312fe059 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/LatestNonceProviderTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/LatestNonceProviderTest.java
@@ -15,42 +15,51 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
 
 import java.util.OptionalLong;
 
+import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class LatestNonceProviderTest {
 
-  private final Address senderAdress = Address.fromHexString("1");
+  private final Address senderAddress = Address.fromHexString("1");
 
-  private final PendingTransactions pendingTransactions = mock(PendingTransactions.class);
-  private final BlockchainQueries blockchainQueries = mock(BlockchainQueries.class);
-  private final LatestNonceProvider nonceProvider =
-      new LatestNonceProvider(blockchainQueries, pendingTransactions);
+  @Mock private BlockchainQueries blockchainQueries;
+  private LatestNonceProvider nonceProvider;
+
+  @Mock private PendingTransactions pendingTransactions;
+
+  @Before
+  public void setUp() {
+    nonceProvider = new LatestNonceProvider(blockchainQueries, pendingTransactions);
+  }
 
   @Test
   public void nextNonceUsesTxPool() {
     final long highestNonceInPendingTransactions = 123;
-    when(pendingTransactions.getNextNonceForSender(senderAdress))
+    when(pendingTransactions.getNextNonceForSender(senderAddress))
         .thenReturn(OptionalLong.of(highestNonceInPendingTransactions));
-    assertThat(nonceProvider.getNonce(senderAdress)).isEqualTo(highestNonceInPendingTransactions);
+    assertThat(nonceProvider.getNonce(senderAddress)).isEqualTo(highestNonceInPendingTransactions);
   }
 
   @Test
   public void nextNonceIsTakenFromBlockchainIfNoPendingTransactionResponse() {
     final long headBlockNumber = 8;
-    final long nonceInBLockchain = 56;
-    when(pendingTransactions.getNextNonceForSender(senderAdress)).thenReturn(OptionalLong.empty());
+    final long nonceInBlockchain = 56;
+    when(pendingTransactions.getNextNonceForSender(senderAddress)).thenReturn(OptionalLong.empty());
     when(blockchainQueries.headBlockNumber()).thenReturn(headBlockNumber);
-    when(blockchainQueries.getTransactionCount(senderAdress, headBlockNumber))
-        .thenReturn(nonceInBLockchain);
-    assertThat(nonceProvider.getNonce(senderAdress)).isEqualTo(nonceInBLockchain);
+    when(blockchainQueries.getTransactionCount(senderAddress, headBlockNumber))
+        .thenReturn(nonceInBlockchain);
+    assertThat(nonceProvider.getNonce(senderAddress)).isEqualTo(nonceInBlockchain);
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/LimitConnectionsJsonRpcHttpServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/LimitConnectionsJsonRpcHttpServiceTest.java
new file mode 100644
index 00000000000..0fcd03e1efa
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/LimitConnectionsJsonRpcHttpServiceTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.api.jsonrpc;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.io.IOException;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Response;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class LimitConnectionsJsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
+
+  @BeforeClass
+  public static void initLimitedServerAndClient() throws Exception {
+    maxConnections = 2;
+    initServerAndClient();
+  }
+
+  @Test
+  public void limitActiveConnections() throws Exception {
+    OkHttpClient newClient = new OkHttpClient();
+    int i;
+    for (i = 0; i < maxConnections; i++) {
+      // create a new client for each request because we want to test the limit
+      try (final Response resp = newClient.newCall(buildGetRequest("/readiness")).execute()) {
+        assertThat(resp.code()).isEqualTo(200);
+      }
+      // new client for each request so that connection does NOT get reused
+      newClient = new OkHttpClient();
+    }
+    // now we should get a rejected connection because we have hit the limit
+    assertThat(i).isEqualTo(maxConnections);
+    final OkHttpClient newClient2 = new OkHttpClient();
+
+    // end of stream gets wrapped locally by ConnectException with message "Connection refused"
+    // but in CI it comes through as is
+    assertThatThrownBy(() -> newClient2.newCall(buildGetRequest("/readiness")).execute())
+        .isInstanceOf(IOException.class)
+        .hasStackTraceContaining("unexpected end of stream");
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/MaxBatchSizeJsonRpcHttpServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/MaxBatchSizeJsonRpcHttpServiceTest.java
new file mode 100644
index 00000000000..d648baaa949
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/MaxBatchSizeJsonRpcHttpServiceTest.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.api.jsonrpc;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import org.junit.Test;
+
+public class MaxBatchSizeJsonRpcHttpServiceTest extends JsonRpcHttpServiceTestBase {
+
+  private void initMaxBatchSize(final int rpcMaxBatchSize) throws Exception {
+    maxBatchSize = rpcMaxBatchSize;
+    initServerAndClient();
+  }
+
+  @Test
+  public void shouldNotReturnErrorWhenConfigIsDisabled() throws Exception {
+
+    // disable batch size
+    initMaxBatchSize(-1);
+
+    // Create a batch request with 2 requests
+    final RequestBody body =
+        RequestBody.create(
+            "["
+                + "{\"jsonrpc\":\"2.0\",\"id\":1,\"method\":\"web3_clientVersion\"},"
+                + "{\"jsonrpc\":\"2.0\",\"id\":1,\"method\":\"web3_clientVersion\"}"
+                + "]",
+            JSON);
+
+    // Should not return error
+    try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
+      assertThat(resp.code()).isEqualTo(200);
+      final JsonArray json = new JsonArray(resp.body().string());
+      assertThat(json.size()).isEqualTo(2);
+    }
+  }
+
+  @Test
+  public void shouldReturnErrorWhenBatchRequestGreaterThanConfig() throws Exception {
+
+    // set max batch size
+    initMaxBatchSize(1);
+
+    // Create a batch request with 2 requests
+    final RequestBody body =
+        RequestBody.create(
+            "["
+                + "{\"jsonrpc\":\"2.0\",\"id\":1,\"method\":\"web3_clientVersion\"},"
+                + "{\"jsonrpc\":\"2.0\",\"id\":1,\"method\":\"web3_clientVersion\"}"
+                + "]",
+            JSON);
+
+    // Should return error
+    try (final Response resp = client.newCall(buildPostRequest(body)).execute()) {
+      assertThat(resp.code()).isEqualTo(200);
+      final JsonObject json = new JsonObject(resp.body().string());
+      final JsonRpcError expectedError = JsonRpcError.EXCEEDS_RPC_MAX_BATCH_SIZE;
+      testHelper.assertValidJsonRpcError(
+          json, null, expectedError.getCode(), expectedError.getMessage());
+    }
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/MockPeerConnection.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/MockPeerConnection.java
index 4011c4955b4..a2d37e8107d 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/MockPeerConnection.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/MockPeerConnection.java
@@ -17,11 +17,16 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
+import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo;
 
 import java.net.InetSocketAddress;
 
+import org.apache.tuweni.bytes.Bytes;
+
 public class MockPeerConnection {
   PeerInfo peerInfo;
   InetSocketAddress localAddress;
@@ -31,11 +36,30 @@ public static PeerConnection create(
       final PeerInfo peerInfo,
       final InetSocketAddress localAddress,
       final InetSocketAddress remoteAddress) {
-    PeerConnection peerConnection = mock(PeerConnection.class);
+    final PeerConnection peerConnection = mock(PeerConnection.class);
     when(peerConnection.getPeerInfo()).thenReturn(peerInfo);
+    if (peerInfo != null) {
+      when(peerConnection.getPeer()).thenReturn(createPeer(peerInfo.getNodeId()));
+    }
     when(peerConnection.getLocalAddress()).thenReturn(localAddress);
     when(peerConnection.getRemoteAddress()).thenReturn(remoteAddress);
+    when(peerConnection.getRemoteEnode())
+        .thenReturn(
+            EnodeURLImpl.builder()
+                .nodeId(peerInfo.getNodeId())
+                .ipAddress(remoteAddress.getAddress().getHostAddress())
+                .disableDiscovery()
+                .listeningPort(peerInfo.getPort())
+                .build());
 
     return peerConnection;
   }
+
+  public static EnodeURLImpl.Builder enodeBuilder() {
+    return EnodeURLImpl.builder().ipAddress("127.0.0.1").useDefaultPorts().nodeId(Peer.randomId());
+  }
+
+  public static Peer createPeer(final Bytes nodeId) {
+    return DefaultPeer.fromEnodeURL(enodeBuilder().nodeId(nodeId).build());
+  }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/SimpleTestTransactionBuilder.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/SimpleTestTransactionBuilder.java
index b4aeee53139..434f97986a3 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/SimpleTestTransactionBuilder.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/SimpleTestTransactionBuilder.java
@@ -17,10 +17,10 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
 
 import java.math.BigInteger;
 import java.util.Optional;
@@ -61,7 +61,7 @@ public static Transaction transaction(
 
     final Transaction transaction = mock(Transaction.class);
     when(transaction.getHash()).thenReturn(blockHash);
-    when(transaction.getGasPrice()).thenReturn(Wei.fromHexString(gasPrice));
+    when(transaction.getGasPrice()).thenReturn(Optional.of(Wei.fromHexString(gasPrice)));
     when(transaction.getNonce()).thenReturn(unsignedLong(nonce));
     when(transaction.getV()).thenReturn(bigInteger(v));
     when(transaction.getR()).thenReturn(bigInteger(r));
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/TraceJsonRpcHttpBySpecTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/TraceJsonRpcHttpBySpecTest.java
deleted file mode 100644
index 9b72430513f..00000000000
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/TraceJsonRpcHttpBySpecTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.api.jsonrpc;
-
-import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
-
-import java.net.URL;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class TraceJsonRpcHttpBySpecTest extends AbstractJsonRpcHttpBySpecTest {
-
-  public TraceJsonRpcHttpBySpecTest(final String specName, final URL specURL) {
-    super(specName, specURL);
-  }
-
-  @Override
-  public void setup() throws Exception {
-    super.setup();
-    startService();
-  }
-
-  @Override
-  protected BlockchainSetupUtil getBlockchainSetupUtil() {
-    return createBlockchainSetupUtil(
-        "trace/chain-data/genesis.json", "trace/chain-data/blocks.bin");
-  }
-
-  @Parameters(name = "{index}: {0}")
-  public static Object[][] specs() {
-    return AbstractJsonRpcHttpBySpecTest.findSpecFiles(
-        "trace/specs/trace-block",
-        "trace/specs/trace-transaction",
-        "trace/specs/replay-trace-transaction/flat",
-        "trace/specs/replay-trace-transaction/vm-trace",
-        "trace/specs/replay-trace-transaction/statediff",
-        "trace/specs/replay-trace-transaction/all",
-        "trace/specs/replay-trace-transaction/halt-cases");
-  }
-}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationServiceTest.java
index d1403173b32..0ce032617c7 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationServiceTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationServiceTest.java
@@ -21,13 +21,22 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Optional;
 
+import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.auth.JWTOptions;
+import io.vertx.ext.auth.User;
 import org.junit.Test;
 
 public class AuthenticationServiceTest {
   private final Vertx vertx = Vertx.vertx();
+  private static final String INVALID_TOKEN_WITHOUT_EXP =
+      "ewogICJhbGciOiAibm9uZSIsCiAgInR5cCI6ICJKV1QiCn"
+          + "0.eyJpYXQiOjE1MTYyMzkwMjIsInBlcm1pc3Npb25zIjpbIm5ldDpwZWVyQ291bnQiXX0";
 
   @Test
   public void authenticationServiceNotCreatedWhenRpcAuthenticationDisabledAndHasCredentialsFile() {
@@ -36,7 +45,7 @@ public void authenticationServiceNotCreatedWhenRpcAuthenticationDisabledAndHasCr
     jsonRpcConfiguration.setAuthenticationCredentialsFile("some/file/path");
 
     final Optional<AuthenticationService> authenticationService =
-        AuthenticationService.create(vertx, jsonRpcConfiguration);
+        DefaultAuthenticationService.create(vertx, jsonRpcConfiguration);
     assertThat(authenticationService).isEmpty();
   }
 
@@ -49,7 +58,7 @@ public void authenticationServiceNotCreatedWhenRpcAuthenticationDisabledAndHasPu
     jsonRpcConfiguration.setAuthenticationPublicKeyFile(publicKeyFile);
 
     final Optional<AuthenticationService> authenticationService =
-        AuthenticationService.create(vertx, jsonRpcConfiguration);
+        DefaultAuthenticationService.create(vertx, jsonRpcConfiguration);
     assertThat(authenticationService).isEmpty();
   }
 
@@ -64,7 +73,7 @@ public void authenticationServiceNotCreatedWhenRpcAuthenticationDisabledAndHasPu
     jsonRpcConfiguration.setAuthenticationCredentialsFile("some/file/path");
 
     final Optional<AuthenticationService> authenticationService =
-        AuthenticationService.create(vertx, jsonRpcConfiguration);
+        DefaultAuthenticationService.create(vertx, jsonRpcConfiguration);
     assertThat(authenticationService).isEmpty();
   }
 
@@ -75,7 +84,7 @@ public void authenticationServiceNotCreatedWhenWsAuthenticationDisabledAndHasCre
     webSocketConfiguration.setAuthenticationCredentialsFile("some/file/path");
 
     final Optional<AuthenticationService> authenticationService =
-        AuthenticationService.create(vertx, webSocketConfiguration);
+        DefaultAuthenticationService.create(vertx, webSocketConfiguration);
     assertThat(authenticationService).isEmpty();
   }
 
@@ -88,7 +97,7 @@ public void authenticationServiceNotCreatedWhenWsAuthenticationDisabledAndHasPub
     webSocketConfiguration.setAuthenticationPublicKeyFile(publicKeyFile);
 
     final Optional<AuthenticationService> authenticationService =
-        AuthenticationService.create(vertx, webSocketConfiguration);
+        DefaultAuthenticationService.create(vertx, webSocketConfiguration);
     assertThat(authenticationService).isEmpty();
   }
 
@@ -103,7 +112,79 @@ public void authenticationServiceNotCreatedWhenWsAuthenticationDisabledAndHasPub
     webSocketConfiguration.setAuthenticationCredentialsFile("some/file/path");
 
     final Optional<AuthenticationService> authenticationService =
-        AuthenticationService.create(vertx, webSocketConfiguration);
+        DefaultAuthenticationService.create(vertx, webSocketConfiguration);
     assertThat(authenticationService).isEmpty();
   }
+
+  @Test
+  public void authServiceNotCreatedWhenRpcAuthnDisabledAndHasAlgorithmSpecified() {
+    final JsonRpcConfiguration jsonRpcConfiguration = JsonRpcConfiguration.createDefault();
+    jsonRpcConfiguration.setAuthenticationEnabled(false);
+    jsonRpcConfiguration.setAuthenticationAlgorithm(JwtAlgorithm.RS256);
+
+    final Optional<AuthenticationService> authenticationService =
+        DefaultAuthenticationService.create(vertx, jsonRpcConfiguration);
+    assertThat(authenticationService).isEmpty();
+  }
+
+  @Test
+  public void authServiceNotCreatedWhenWsAuthDisabledAndHasAlgorithmSpecified() {
+    final WebSocketConfiguration webSocketConfiguration = WebSocketConfiguration.createDefault();
+    webSocketConfiguration.setAuthenticationEnabled(false);
+    webSocketConfiguration.setAuthenticationAlgorithm(JwtAlgorithm.RS256);
+
+    final Optional<AuthenticationService> authenticationService =
+        DefaultAuthenticationService.create(vertx, webSocketConfiguration);
+    assertThat(authenticationService).isEmpty();
+  }
+
+  @Test
+  public void getUserFailsIfTokenDoesNotHaveExpiryClaim() {
+    final WebSocketConfiguration webSocketConfiguration = WebSocketConfiguration.createDefault();
+    webSocketConfiguration.setAuthenticationEnabled(true);
+    final AuthenticationService authenticationService =
+        DefaultAuthenticationService.create(vertx, webSocketConfiguration).get();
+    final StubUserHandler handler = new StubUserHandler();
+
+    authenticationService.authenticate(INVALID_TOKEN_WITHOUT_EXP, handler);
+
+    assertThat(handler.getEvent()).isEmpty();
+  }
+
+  @Test
+  public void getUserSucceedsWithValidToken() {
+    final WebSocketConfiguration webSocketConfiguration = WebSocketConfiguration.createDefault();
+    webSocketConfiguration.setAuthenticationEnabled(true);
+    webSocketConfiguration.setAuthenticationPublicKeyFile(null);
+    final AuthenticationService authenticationService =
+        DefaultAuthenticationService.create(vertx, webSocketConfiguration).get();
+    final StubUserHandler handler = new StubUserHandler();
+    final JsonObject jwtContents =
+        new JsonObject()
+            .put("permissions", new JsonArray(Arrays.asList("net:peerCount")))
+            .put("username", "successKid");
+    final JWTOptions options = new JWTOptions().setExpiresInMinutes(5).setAlgorithm("RS256");
+    final String token =
+        authenticationService.getJwtAuthProvider().generateToken(jwtContents, options);
+    authenticationService.authenticate(token, handler);
+
+    User successKid = handler.getEvent().get();
+    assertThat(successKid.attributes().getLong("exp")).isNotNull();
+    assertThat(successKid.attributes().getLong("iat")).isNotNull();
+    assertThat(successKid.principal().getJsonArray("permissions").getString(0))
+        .isEqualTo("net:peerCount");
+  }
+
+  private static class StubUserHandler implements Handler<Optional<User>> {
+    private Optional<User> event;
+
+    @Override
+    public void handle(final Optional<User> event) {
+      this.event = event;
+    }
+
+    public Optional<User> getEvent() {
+      return event;
+    }
+  }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationUtilsTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationUtilsTest.java
index a3dda2ed722..9c611136017 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationUtilsTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/AuthenticationUtilsTest.java
@@ -15,29 +15,31 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.authentication;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
-import java.util.Optional;
-
-import io.vertx.core.Handler;
-import io.vertx.core.json.JsonObject;
-import io.vertx.ext.auth.User;
-import io.vertx.ext.auth.jwt.JWTAuth;
-import io.vertx.ext.auth.jwt.JWTAuthOptions;
-import io.vertx.ext.auth.jwt.impl.JWTAuthProviderImpl;
 import org.junit.Test;
 
 public class AuthenticationUtilsTest {
 
-  private static final String INVALID_TOKEN_WITHOUT_EXP =
-      "ewogICJhbGciOiAibm9uZSIsCiAgInR5cCI6ICJKV1QiCn"
-          + "0.eyJpYXQiOjE1MTYyMzkwMjIsInBlcm1pc3Npb25zIjpbIm5ldDpwZWVyQ291bnQiXX0";
-  private static final String VALID_TOKEN =
-      "ewogICJhbGciOiAibm9uZSIsCiAgInR5cCI6ICJKV1QiCn0.eyJpYXQiOjE1"
-          + "MTYyMzkwMjIsImV4cCI6NDcyOTM2MzIwMCwicGVybWlzc2lvbnMiOlsibmV0OnBlZXJDb3VudCJdfQ";
-  private static final String VALID_TOKEN_DECODED_PAYLOAD =
-      "{\"iat\": 1516239022,\"exp\": 4729363200," + "\"permissions\": [\"net:peerCount\"]}";
+  @Test
+  public void obfuscateTokenShouldReturnExpected() {
+    String header = "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9";
+    String token = AuthenticationUtils.getJwtTokenFromAuthorizationHeaderValue(header);
+    assertThat(AuthenticationUtils.truncToken(token)).isNotEqualTo(token);
+    assertThat(AuthenticationUtils.truncToken(token)).isEqualTo("eyJ0eXAi...UzI1NiJ9");
+  }
+
+  @Test
+  public void obfuscateNullTokenShouldReturnInvalid() {
+    String token = AuthenticationUtils.getJwtTokenFromAuthorizationHeaderValue(null);
+    assertThat(AuthenticationUtils.truncToken(token)).isEqualTo("Invalid JWT");
+  }
+
+  @Test
+  public void obfuscateEmptyTokenShouldReturnInvalid() {
+    String header = "";
+    String token = AuthenticationUtils.getJwtTokenFromAuthorizationHeaderValue(header);
+    assertThat(AuthenticationUtils.truncToken(token)).isEqualTo("Invalid JWT");
+  }
 
   @Test
   public void getJwtTokenFromNullStringShouldReturnNull() {
@@ -74,43 +76,4 @@ public void getJwtTokenFromValidAuthorizationHeaderValueShouldReturnToken() {
 
     assertThat(token).isEqualTo("eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9");
   }
-
-  @Test
-  public void getUserFailsIfTokenDoesNotHaveExpiryClaim() {
-    final AuthenticationService authenticationService = mock(AuthenticationService.class);
-    final JWTAuth jwtAuth = new JWTAuthProviderImpl(null, new JWTAuthOptions());
-    final StubUserHandler handler = new StubUserHandler();
-    when(authenticationService.getJwtAuthProvider()).thenReturn(jwtAuth);
-
-    AuthenticationUtils.getUser(
-        Optional.of(authenticationService), INVALID_TOKEN_WITHOUT_EXP, handler);
-
-    assertThat(handler.getEvent()).isEmpty();
-  }
-
-  @Test
-  public void getUserSucceedsWithValidToken() {
-    final AuthenticationService authenticationService = mock(AuthenticationService.class);
-    final JWTAuth jwtAuth = new JWTAuthProviderImpl(null, new JWTAuthOptions());
-    final StubUserHandler handler = new StubUserHandler();
-    when(authenticationService.getJwtAuthProvider()).thenReturn(jwtAuth);
-
-    AuthenticationUtils.getUser(Optional.of(authenticationService), VALID_TOKEN, handler);
-
-    assertThat(handler.getEvent().get().principal())
-        .isEqualTo(new JsonObject(VALID_TOKEN_DECODED_PAYLOAD));
-  }
-
-  private static class StubUserHandler implements Handler<Optional<User>> {
-    private Optional<User> event;
-
-    @Override
-    public void handle(final Optional<User> event) {
-      this.event = event;
-    }
-
-    public Optional<User> getEvent() {
-      return event;
-    }
-  }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/EngineAuthServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/EngineAuthServiceTest.java
new file mode 100644
index 00000000000..6093f0e5677
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/EngineAuthServiceTest.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ *  the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.api.jsonrpc.authentication;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.mock;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Optional;
+
+import io.vertx.core.Handler;
+import io.vertx.core.Vertx;
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.auth.User;
+import io.vertx.ext.auth.jwt.JWTAuth;
+import org.junit.Test;
+
+public class EngineAuthServiceTest {
+
+  @Test
+  public void createsEphemeralByDefault() throws IOException {
+    Vertx vertx = mock(Vertx.class);
+    Path dataDir = Files.createTempDirectory("besuUnitTest");
+    EngineAuthService auth = new EngineAuthService(vertx, Optional.empty(), dataDir);
+    assertThat(auth).isNotNull();
+    assertThat(dataDir.toFile()).exists();
+    assertThat(dataDir.toFile()).isDirectory();
+    boolean defaultFileFound =
+        Arrays.stream(dataDir.toFile().listFiles())
+            .anyMatch(
+                file -> {
+                  return file.getName().equals("jwt.hex");
+                });
+    assertThat(defaultFileFound).isTrue();
+  }
+
+  @Test
+  public void usesSpecified() throws IOException, URISyntaxException {
+    Vertx vertx = mock(Vertx.class);
+    final Path userKey =
+        Paths.get(ClassLoader.getSystemResource("authentication/ee-jwt-secret.hex").toURI());
+    Path dataDir = Files.createTempDirectory("besuUnitTest");
+    EngineAuthService auth = new EngineAuthService(vertx, Optional.of(userKey.toFile()), dataDir);
+    assertThat(auth).isNotNull();
+    JWTAuth jwtAuth = auth.getJwtAuthProvider();
+    String token =
+        jwtAuth.generateToken(new JsonObject().put("iat", System.currentTimeMillis() / 1000));
+
+    Handler<Optional<User>> authHandler =
+        new Handler<Optional<User>>() {
+          @Override
+          public void handle(final Optional<User> event) {
+            assertThat(event).isPresent();
+          }
+        };
+    auth.authenticate(token, authHandler);
+  }
+
+  @Test
+  public void throwsOnShortKey() throws IOException, URISyntaxException {
+    Vertx vertx = mock(Vertx.class);
+    final Path userKey =
+        Paths.get(
+            ClassLoader.getSystemResource("authentication/ee-jwt-secret-too-short.hex").toURI());
+    Path dataDir = Files.createTempDirectory("besuUnitTest");
+    final Optional<File> signingKey = Optional.of(userKey.toFile());
+    assertThatThrownBy(() -> new EngineAuthService(vertx, signingKey, dataDir))
+        .isInstanceOf(UnsecurableEngineApiException.class);
+  }
+
+  @Test
+  public void throwsKeyFileMissing() throws IOException, URISyntaxException {
+    Vertx vertx = mock(Vertx.class);
+    final Path userKey = Paths.get("no-such-file.hex");
+    Path dataDir = Files.createTempDirectory("besuUnitTest");
+    final Optional<File> signingKey = Optional.of(userKey.toFile());
+    assertThatThrownBy(() -> new EngineAuthService(vertx, signingKey, dataDir))
+        .isInstanceOf(UnsecurableEngineApiException.class);
+  }
+
+  @Test
+  public void denyExpired() throws IOException, URISyntaxException {
+    Vertx vertx = mock(Vertx.class);
+    final Path userKey =
+        Paths.get(ClassLoader.getSystemResource("authentication/ee-jwt-secret.hex").toURI());
+    Path dataDir = Files.createTempDirectory("besuUnitTest");
+    EngineAuthService auth = new EngineAuthService(vertx, Optional.of(userKey.toFile()), dataDir);
+    assertThat(auth).isNotNull();
+    JWTAuth jwtAuth = auth.getJwtAuthProvider();
+    String token =
+        jwtAuth.generateToken(
+            new JsonObject().put("iat", (System.currentTimeMillis() / 1000) - 61));
+
+    Handler<Optional<User>> authHandler = event -> assertThat(event).isEmpty();
+    auth.authenticate(token, authHandler);
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/JWTAuthOptionsFactoryTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/JWTAuthOptionsFactoryTest.java
index 77d9406938f..b173d72da26 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/JWTAuthOptionsFactoryTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/authentication/JWTAuthOptionsFactoryTest.java
@@ -16,21 +16,29 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.fail;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Arrays;
 
 import io.vertx.ext.auth.PubSecKeyOptions;
 import io.vertx.ext.auth.jwt.JWTAuthOptions;
+import org.bouncycastle.util.encoders.Base64;
+import org.bouncycastle.util.io.pem.PemObject;
+import org.bouncycastle.util.io.pem.PemReader;
 import org.junit.Test;
 
 public class JWTAuthOptionsFactoryTest {
 
-  private static final String JWT_PUBLIC_KEY =
+  private static final String JWT_PUBLIC_KEY_RS256 =
       "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw6tMhjogMulRbYby7bCL"
           + "rFhukDnxvm4XR3KSXLKdLLQHHyouMOQaLac9M+/Z1KkIpqfZPjLfW2/yUg2IKx4T"
           + "dvFVzbVq17X6dq49ZS8jJtb8l2+Vius4d3LnpvxCOematRG9Acn+2qLwC+sK7RPY"
@@ -39,16 +47,21 @@ public class JWTAuthOptionsFactoryTest {
           + "//fKVpD6qkQ3OopD+7gOziAYUxChw6RUWekV+uRgNADQhaqV6wDdogBz77wTJedV"
           + "YwIDAQAB";
 
+  private static final String JWT_PUBLIC_KEY_ES256 =
+      "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEy8+qE0ZFo4woPUCXfszptuDgaDpW"
+          + "Sv6D5F/pbolJ2wZTVkYXoGhA3wqy1RM1RYmROp9NEPLm3mZP+kzI4TMiGg==";
+
   @Test
   public void createsOptionsWithGeneratedKeyPair() {
     final JWTAuthOptionsFactory jwtAuthOptionsFactory = new JWTAuthOptionsFactory();
     final JWTAuthOptions jwtAuthOptions = jwtAuthOptionsFactory.createWithGeneratedKeyPair();
 
     assertThat(jwtAuthOptions.getPubSecKeys()).isNotNull();
-    assertThat(jwtAuthOptions.getPubSecKeys()).hasSize(1);
+    assertThat(jwtAuthOptions.getPubSecKeys()).hasSize(2);
     assertThat(jwtAuthOptions.getPubSecKeys().get(0).getAlgorithm()).isEqualTo("RS256");
-    assertThat(jwtAuthOptions.getPubSecKeys().get(0).getPublicKey()).isNotEmpty();
-    assertThat(jwtAuthOptions.getPubSecKeys().get(0).getSecretKey()).isNotEmpty();
+    assertThat(jwtAuthOptions.getPubSecKeys().get(0).getBuffer()).isNotNull();
+    assertThat(jwtAuthOptions.getPubSecKeys().get(1).getAlgorithm()).isEqualTo("RS256");
+    assertThat(jwtAuthOptions.getPubSecKeys().get(1).getBuffer()).isNotNull();
   }
 
   @Test
@@ -59,24 +72,58 @@ public void createsOptionsWithGeneratedKeyPairThatIsDifferentEachTime() {
 
     final PubSecKeyOptions pubSecKeyOptions1 = jwtAuthOptions1.getPubSecKeys().get(0);
     final PubSecKeyOptions pubSecKeyOptions2 = jwtAuthOptions2.getPubSecKeys().get(0);
-    assertThat(pubSecKeyOptions1.getPublicKey()).isNotEqualTo(pubSecKeyOptions2.getPublicKey());
-    assertThat(pubSecKeyOptions1.getSecretKey()).isNotEqualTo(pubSecKeyOptions2.getSecretKey());
+    assertThat(pubSecKeyOptions1.getBuffer()).isNotEqualTo(pubSecKeyOptions2.getBuffer());
   }
 
   @Test
-  public void createsOptionsUsingPublicKeyFile() throws URISyntaxException {
+  public void createsOptionsUsingPublicKeyFile() throws URISyntaxException, IOException {
     final JWTAuthOptionsFactory jwtAuthOptionsFactory = new JWTAuthOptionsFactory();
     final File enclavePublicKeyFile =
-        Paths.get(ClassLoader.getSystemResource("authentication/jwt_public_key").toURI())
+        Paths.get(ClassLoader.getSystemResource("authentication/jwt_public_key_rsa").toURI())
             .toAbsolutePath()
             .toFile();
 
     final JWTAuthOptions jwtAuthOptions =
         jwtAuthOptionsFactory.createForExternalPublicKey(enclavePublicKeyFile);
     assertThat(jwtAuthOptions.getPubSecKeys()).hasSize(1);
-    assertThat(jwtAuthOptions.getPubSecKeys().get(0).getAlgorithm()).isEqualTo("RS256");
-    assertThat(jwtAuthOptions.getPubSecKeys().get(0).getSecretKey()).isNull();
-    assertThat(jwtAuthOptions.getPubSecKeys().get(0).getPublicKey()).isEqualTo(JWT_PUBLIC_KEY);
+    final PubSecKeyOptions pubSecKeyOptions = jwtAuthOptions.getPubSecKeys().get(0);
+    assertThat(pubSecKeyOptions.getAlgorithm()).isEqualTo("RS256");
+    assertThat(pubSecKeyOptions.getSecretKey()).isNull();
+    PemObject publicKey =
+        new PemReader(
+                new InputStreamReader(
+                    new ByteArrayInputStream(pubSecKeyOptions.getBuffer().getBytes()),
+                    StandardCharsets.UTF_8))
+            .readPemObject();
+    assertThat(publicKey.getContent()).containsExactly(Base64.decode(JWT_PUBLIC_KEY_RS256));
+  }
+
+  @Test
+  public void createOptionsUsingECDASPublicKeyFile() throws URISyntaxException {
+    final JWTAuthOptionsFactory jwtAuthOptionsFactory = new JWTAuthOptionsFactory();
+    final File enclavePublicKeyFile =
+        Paths.get(ClassLoader.getSystemResource("authentication/jwt_public_key_ecdsa").toURI())
+            .toAbsolutePath()
+            .toFile();
+
+    try {
+      final JWTAuthOptions jwtAuthOptions =
+          jwtAuthOptionsFactory.createForExternalPublicKeyWithAlgorithm(
+              enclavePublicKeyFile, JwtAlgorithm.ES256);
+      assertThat(jwtAuthOptions.getPubSecKeys()).hasSize(1);
+      final PubSecKeyOptions pubSecKeyOptions = jwtAuthOptions.getPubSecKeys().get(0);
+      assertThat(pubSecKeyOptions.getAlgorithm()).isEqualTo("ES256");
+      assertThat(pubSecKeyOptions.getSecretKey()).isNull();
+      PemObject publicKey =
+          new PemReader(
+                  new InputStreamReader(
+                      new ByteArrayInputStream(pubSecKeyOptions.getBuffer().getBytes()),
+                      StandardCharsets.UTF_8))
+              .readPemObject();
+      assertThat(publicKey.getContent()).containsExactly(Base64.decode(JWT_PUBLIC_KEY_ES256));
+    } catch (Exception e) {
+      fail("Should not have exceptions thrown" + Arrays.toString(e.getStackTrace()));
+    }
   }
 
   @Test
@@ -92,12 +139,20 @@ public void failsToCreateOptionsWhenPublicKeyFileDoesNotExist() {
   @Test
   public void failsToCreateOptionsWhenPublicKeyFileIsInvalid() throws IOException {
     final JWTAuthOptionsFactory jwtAuthOptionsFactory = new JWTAuthOptionsFactory();
-    final Path enclavePublicKey = Files.createTempFile("enclave", "pub");
-    Files.writeString(enclavePublicKey, "invalidDataNo---HeadersAndNotBase64");
+    final Path enclavePublicKeyFile = Files.createTempFile("enclave", "pub");
+    Files.writeString(enclavePublicKeyFile, "invalidDataNo---HeadersAndNotBase64");
 
     assertThatThrownBy(
-            () -> jwtAuthOptionsFactory.createForExternalPublicKey(enclavePublicKey.toFile()))
+            () -> jwtAuthOptionsFactory.createForExternalPublicKey(enclavePublicKeyFile.toFile()))
         .isInstanceOf(IllegalStateException.class)
         .hasMessage("Authentication RPC public key file format is invalid");
   }
+
+  @Test
+  public void createsEphemeralHmacOptions() {
+    final JWTAuthOptionsFactory factory = new JWTAuthOptionsFactory();
+    JWTAuthOptions engineOptions = factory.engineApiJWTOptions(JwtAlgorithm.HS256);
+    byte[] publicKey = engineOptions.getPubSecKeys().get(0).getBuffer().getBytes();
+    assertThat(publicKey.length).isEqualTo(32);
+  }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/bonsai/DebugJsonRpcHttpBySpecTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/bonsai/DebugJsonRpcHttpBySpecTest.java
new file mode 100644
index 00000000000..ba55e7cf110
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/bonsai/DebugJsonRpcHttpBySpecTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.bonsai;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.AbstractJsonRpcHttpBySpecTest;
+
+import java.net.URL;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class DebugJsonRpcHttpBySpecTest extends AbstractJsonRpcHttpBySpecTest {
+
+  public DebugJsonRpcHttpBySpecTest(final String specName, final URL specURL) {
+    super(specName, specURL);
+  }
+
+  @Override
+  public void setup() throws Exception {
+    setupBonsaiBlockchain();
+    startService();
+  }
+
+  @Parameters(name = "{index}: {0}")
+  public static Object[][] specs() {
+    return findSpecFiles(
+        new String[] {"debug"},
+        "storageRange",
+        "accountRange"); // storageRange and accountRange are not working with bonsai trie
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/bonsai/EthByzantiumJsonRpcHttpBySpecTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/bonsai/EthByzantiumJsonRpcHttpBySpecTest.java
new file mode 100644
index 00000000000..d012c1eb40e
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/bonsai/EthByzantiumJsonRpcHttpBySpecTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.bonsai;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.AbstractJsonRpcHttpBySpecTest;
+import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+
+import java.net.URL;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class EthByzantiumJsonRpcHttpBySpecTest extends AbstractJsonRpcHttpBySpecTest {
+
+  public EthByzantiumJsonRpcHttpBySpecTest(final String specName, final URL specURL) {
+    super(specName, specURL);
+  }
+
+  @Override
+  public void setup() throws Exception {
+    setupBonsaiBlockchain();
+    startService();
+  }
+
+  @Override
+  protected BlockchainSetupUtil getBlockchainSetupUtil(final DataStorageFormat dataStorageFormat) {
+    return createBlockchainSetupUtil(
+        "trace/chain-data/genesis.json", "trace/chain-data/blocks.bin", dataStorageFormat);
+  }
+
+  @Parameters(name = "{index}: {0}")
+  public static Object[][] specs() {
+    return AbstractJsonRpcHttpBySpecTest.findSpecFiles(new String[] {"eth_latest"});
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/bonsai/EthJsonRpcHttpBySpecTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/bonsai/EthJsonRpcHttpBySpecTest.java
new file mode 100644
index 00000000000..96aa9b3adaf
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/bonsai/EthJsonRpcHttpBySpecTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.bonsai;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.AbstractJsonRpcHttpBySpecTest;
+
+import java.net.URL;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class EthJsonRpcHttpBySpecTest extends AbstractJsonRpcHttpBySpecTest {
+
+  public EthJsonRpcHttpBySpecTest(final String specName, final URL specURL) {
+    super(specName, specURL);
+  }
+
+  @Override
+  public void setup() throws Exception {
+    setupBonsaiBlockchain();
+    startService();
+  }
+
+  @Parameters(name = "{index}: {0}")
+  public static Object[][] specs() {
+    return findSpecFiles(
+        new String[] {"eth"}, "getProof"); // getProof is not working with bonsai trie
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/bonsai/TraceJsonRpcHttpBySpecTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/bonsai/TraceJsonRpcHttpBySpecTest.java
new file mode 100644
index 00000000000..922e1aa6ff4
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/bonsai/TraceJsonRpcHttpBySpecTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.bonsai;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.AbstractJsonRpcHttpBySpecTest;
+import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+
+import java.net.URL;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class TraceJsonRpcHttpBySpecTest extends AbstractJsonRpcHttpBySpecTest {
+
+  public TraceJsonRpcHttpBySpecTest(final String specName, final URL specURL) {
+    super(specName, specURL);
+  }
+
+  @Override
+  public void setup() throws Exception {
+    setupBonsaiBlockchain();
+    startService();
+  }
+
+  @Override
+  protected BlockchainSetupUtil getBlockchainSetupUtil(final DataStorageFormat storageFormat) {
+    return createBlockchainSetupUtil(
+        "trace/chain-data/genesis.json", "trace/chain-data/blocks.bin", storageFormat);
+  }
+
+  @Parameters(name = "{index}: {0}")
+  public static Object[][] specs() {
+    return AbstractJsonRpcHttpBySpecTest.findSpecFiles(
+        new String[] {
+          "trace/specs/trace-block",
+          "trace/specs/trace-get",
+          "trace/specs/trace-transaction",
+          "trace/specs/replay-trace-transaction/flat",
+          "trace/specs/replay-trace-transaction/vm-trace",
+          "trace/specs/replay-trace-transaction/statediff",
+          "trace/specs/replay-trace-transaction/all",
+          "trace/specs/replay-trace-transaction/halt-cases",
+          "trace/specs/trace-filter",
+          "trace/specs/trace-call",
+          "trace/specs/trace-callMany",
+          "trace/specs/trace-raw-transaction"
+        });
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/forest/DebugJsonRpcHttpBySpecTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/forest/DebugJsonRpcHttpBySpecTest.java
new file mode 100644
index 00000000000..b9ab7d398ab
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/forest/DebugJsonRpcHttpBySpecTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.forest;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.AbstractJsonRpcHttpBySpecTest;
+
+import java.net.URL;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class DebugJsonRpcHttpBySpecTest extends AbstractJsonRpcHttpBySpecTest {
+
+  public DebugJsonRpcHttpBySpecTest(final String specName, final URL specURL) {
+    super(specName, specURL);
+  }
+
+  @Override
+  public void setup() throws Exception {
+    setupBlockchain();
+    startService();
+  }
+
+  @Parameters(name = "{index}: {0}")
+  public static Object[][] specs() {
+    return findSpecFiles(new String[] {"debug"});
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/forest/EthByzantiumJsonRpcHttpBySpecTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/forest/EthByzantiumJsonRpcHttpBySpecTest.java
new file mode 100644
index 00000000000..3d0a85ce6e4
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/forest/EthByzantiumJsonRpcHttpBySpecTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.forest;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.AbstractJsonRpcHttpBySpecTest;
+import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+
+import java.net.URL;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class EthByzantiumJsonRpcHttpBySpecTest extends AbstractJsonRpcHttpBySpecTest {
+
+  public EthByzantiumJsonRpcHttpBySpecTest(final String specName, final URL specURL) {
+    super(specName, specURL);
+  }
+
+  @Override
+  public void setup() throws Exception {
+    setupBlockchain();
+    startService();
+  }
+
+  @Override
+  protected BlockchainSetupUtil getBlockchainSetupUtil(final DataStorageFormat storageFormat) {
+    return createBlockchainSetupUtil(
+        "trace/chain-data/genesis.json", "trace/chain-data/blocks.bin", storageFormat);
+  }
+
+  @Parameters(name = "{index}: {0}")
+  public static Object[][] specs() {
+    return AbstractJsonRpcHttpBySpecTest.findSpecFiles(new String[] {"eth_latest"});
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/forest/EthJsonRpcHttpBySpecTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/forest/EthJsonRpcHttpBySpecTest.java
new file mode 100644
index 00000000000..faf6ed93ac7
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/forest/EthJsonRpcHttpBySpecTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.forest;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.AbstractJsonRpcHttpBySpecTest;
+
+import java.net.URL;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class EthJsonRpcHttpBySpecTest extends AbstractJsonRpcHttpBySpecTest {
+
+  public EthJsonRpcHttpBySpecTest(final String specName, final URL specURL) {
+    super(specName, specURL);
+  }
+
+  @Override
+  public void setup() throws Exception {
+    setupBlockchain();
+    startService();
+  }
+
+  @Parameters(name = "{index}: {0}")
+  public static Object[][] specs() {
+    return findSpecFiles(new String[] {"eth"});
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/forest/TraceJsonRpcHttpBySpecTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/forest/TraceJsonRpcHttpBySpecTest.java
new file mode 100644
index 00000000000..d3a503ca8fe
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/forest/TraceJsonRpcHttpBySpecTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.forest;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.AbstractJsonRpcHttpBySpecTest;
+import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+
+import java.net.URL;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class TraceJsonRpcHttpBySpecTest extends AbstractJsonRpcHttpBySpecTest {
+
+  public TraceJsonRpcHttpBySpecTest(final String specName, final URL specURL) {
+    super(specName, specURL);
+  }
+
+  @Override
+  public void setup() throws Exception {
+    setupBlockchain();
+    startService();
+  }
+
+  @Override
+  protected BlockchainSetupUtil getBlockchainSetupUtil(final DataStorageFormat storageFormat) {
+    return createBlockchainSetupUtil(
+        "trace/chain-data/genesis.json", "trace/chain-data/blocks.bin", storageFormat);
+  }
+
+  @Parameters(name = "{index}: {0}")
+  public static Object[][] specs() {
+    return AbstractJsonRpcHttpBySpecTest.findSpecFiles(
+        new String[] {
+          "trace/specs/trace-block",
+          "trace/specs/trace-get",
+          "trace/specs/trace-transaction",
+          "trace/specs/replay-trace-transaction/flat",
+          "trace/specs/replay-trace-transaction/vm-trace",
+          "trace/specs/replay-trace-transaction/statediff",
+          "trace/specs/replay-trace-transaction/all",
+          "trace/specs/replay-trace-transaction/halt-cases",
+          "trace/specs/trace-filter",
+          "trace/specs/trace-call",
+          "trace/specs/trace-callMany",
+          "trace/specs/trace-raw-transaction"
+        });
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/QosTimerTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/QosTimerTest.java
new file mode 100644
index 00000000000..e89a83c6a71
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/QosTimerTest.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+import java.util.concurrent.TimeoutException;
+
+import io.vertx.core.Vertx;
+import io.vertx.ext.unit.Async;
+import io.vertx.ext.unit.TestContext;
+import io.vertx.ext.unit.junit.VertxUnitRunner;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(VertxUnitRunner.class)
+public class QosTimerTest {
+  static Vertx vertx = Vertx.vertx();
+
+  @Ignore("fails on CI with short timeouts and don't want to slow test suite down with longer ones")
+  @Test
+  public void shouldExecuteConsecutivelyAtTimeout(final TestContext ctx) {
+    final long TEST_QOS_TIMEOUT = 100L;
+    final int INVOCATIONS_COUNT = 2;
+    final Async async = ctx.async(INVOCATIONS_COUNT);
+    final long startTime = System.currentTimeMillis();
+    new QosTimer(vertx, TEST_QOS_TIMEOUT, z -> async.countDown());
+    async.awaitSuccess();
+    final long executionTime = System.currentTimeMillis() - startTime;
+    assertThat(executionTime)
+        .as("Execution ended ahead of time")
+        .isGreaterThanOrEqualTo(TEST_QOS_TIMEOUT * INVOCATIONS_COUNT);
+  }
+
+  @Test
+  public void shouldExecuteOnceAtTimeout(final TestContext ctx) {
+    final long TEST_QOS_TIMEOUT = 75L;
+    final Async async = ctx.async();
+    final long startTime = System.currentTimeMillis();
+    new QosTimer(vertx, TEST_QOS_TIMEOUT, z -> async.countDown());
+    async.awaitSuccess();
+    final long executionTime = System.currentTimeMillis() - startTime;
+    assertThat(executionTime)
+        .as("Execution ended ahead of time")
+        .isGreaterThanOrEqualTo(TEST_QOS_TIMEOUT);
+  }
+
+  @Test
+  public void shouldNotExecuteBeforeTimeout(final TestContext ctx) {
+    final long TEST_QOS_TIMEOUT = 200L;
+    final Async async = ctx.async();
+    new QosTimer(vertx, TEST_QOS_TIMEOUT, z -> async.countDown());
+    assertThatThrownBy(() -> async.awaitSuccess(50L)).isInstanceOf(TimeoutException.class);
+  }
+
+  @Test
+  public void shouldNotExecuteWhenReset(final TestContext ctx) {
+    final long TEST_QOS_TIMEOUT = 50L;
+    final Async async = ctx.async();
+    final var timer = new QosTimer(vertx, TEST_QOS_TIMEOUT, z -> async.countDown());
+    // reset QoS timer every 25 millis
+    vertx.setPeriodic(25L, z -> timer.resetTimer());
+    assertThatThrownBy(() -> async.awaitSuccess(200L)).isInstanceOf(TimeoutException.class);
+    async.complete();
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/EthJsonRpcHttpServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/EthJsonRpcHttpServiceTest.java
index 70fb8d2b99c..d431621fc82 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/EthJsonRpcHttpServiceTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/EthJsonRpcHttpServiceTest.java
@@ -16,11 +16,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.AbstractJsonRpcHttpServiceTest;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 
 import java.io.IOException;
 
@@ -56,7 +57,7 @@ public void getFilterChanges_noBlocks() throws Exception {
 
   @Test
   public void getFilterChanges_oneBlock() throws Exception {
-    BlockchainSetupUtil blockchainSetupUtil = startServiceWithEmptyChain();
+    BlockchainSetupUtil blockchainSetupUtil = startServiceWithEmptyChain(DataStorageFormat.FOREST);
     final String expectedRespBody =
         String.format(
             "{%n  \"jsonrpc\" : \"2.0\",%n  \"id\" : 2,%n  \"result\" : [ \"0x10aaf14a53caf27552325374429d3558398a36d3682ede6603c2c6511896e9f9\" ]%n}");
@@ -124,14 +125,14 @@ private Response jsonRpcRequest(final int id, final String method, final String
       throws Exception {
     final RequestBody body =
         RequestBody.create(
-            JSON,
             "{\"jsonrpc\":\"2.0\",\"id\":"
                 + Json.encode(id)
                 + ",\"params\": "
                 + params
                 + ",\"method\":\""
                 + method
-                + "\"}");
+                + "\"}",
+            JSON);
     final Request request = new Request.Builder().post(body).url(baseUrl).build();
     return client.newCall(request).execute();
   }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManagerLogFilterTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManagerLogFilterTest.java
index a56748d4510..709f349bf45 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManagerLogFilterTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManagerLogFilterTest.java
@@ -28,6 +28,8 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
@@ -35,10 +37,8 @@
 import org.hyperledger.besu.ethereum.api.query.PrivacyQueries;
 import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransactionEvent;
@@ -112,7 +112,7 @@ public void shouldUseBlockHashWhenCheckingLogsForChangesForPrivateFiltersOnly()
 
     final Hash blockAddedHash = recordBlockEvents(1).get(0).getBlock().getHash();
 
-    verify(blockchainQueries, never()).matchingLogs(any(), any(), any());
+    verify(blockchainQueries, never()).matchingLogs(any(Hash.class), any(LogsQuery.class), any());
     verify(privacyQueries).matchingLogs(eq(PRIVACY_GROUP_ID), eq(blockAddedHash), eq(logsQuery()));
   }
 
@@ -124,7 +124,7 @@ public void shouldReturnLogWhenLogFilterMatches() {
 
     final List<LogWithMetadata> retrievedLogs = filterManager.logsChanges(filterId);
 
-    assertThat(retrievedLogs).isEqualToComparingFieldByFieldRecursively(expectedLogs);
+    assertThat(retrievedLogs).usingRecursiveComparison().isEqualTo(expectedLogs);
   }
 
   @Test
@@ -295,8 +295,8 @@ public void removalEvent_uninstallsFilter() {
     assertThat(filterRepository.getFilter(privateLogFilterId, PrivateLogFilter.class)).isEmpty();
   }
 
-  private void privateTransactionEvent(final String privacyGroupId, final String enclavePublicKey) {
-    PrivateTransactionEvent event = new PrivateTransactionEvent(privacyGroupId, enclavePublicKey);
+  private void privateTransactionEvent(final String privacyGroupId, final String privacyUserId) {
+    PrivateTransactionEvent event = new PrivateTransactionEvent(privacyGroupId, privacyUserId);
     filterManager.processRemovalEvent(event);
   }
 
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManagerTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManagerTest.java
index e2069f4b109..5e0c220a36c 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManagerTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterManagerTest.java
@@ -22,12 +22,12 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterRepositoryTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterRepositoryTest.java
index eecbe19eb7b..6a8782eff13 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterRepositoryTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/FilterRepositoryTest.java
@@ -57,7 +57,7 @@ public void saveShouldAddFilterToRepository() {
 
     final BlockFilter retrievedFilter = repository.getFilter("id", BlockFilter.class).get();
 
-    assertThat(retrievedFilter).isEqualToComparingFieldByField(filter);
+    assertThat(retrievedFilter).usingRecursiveComparison().isEqualTo(filter);
   }
 
   @Test
@@ -89,7 +89,7 @@ public void getSingleFilterShouldReturnExistingFilterOfCorrectType() {
     final Optional<BlockFilter> optional = repository.getFilter(filter.getId(), BlockFilter.class);
 
     assertThat(optional.isPresent()).isTrue();
-    assertThat(optional.get()).isEqualToComparingFieldByField(filter);
+    assertThat(optional.get()).usingRecursiveComparison().isEqualTo(filter);
   }
 
   @Test
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/LogsQueryTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/LogsQueryTest.java
index cd24cdd4536..041130ad4fc 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/LogsQueryTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/filter/LogsQueryTest.java
@@ -18,11 +18,11 @@
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.query.LogsQuery;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Log;
-import org.hyperledger.besu.ethereum.core.LogTopic;
-import org.hyperledger.besu.ethereum.core.LogsBloomFilter;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.log.LogTopic;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminAddPeerTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminAddPeerTest.java
index e843928f086..8c476722d3d 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminAddPeerTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminAddPeerTest.java
@@ -26,6 +26,9 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
 import org.hyperledger.besu.ethereum.p2p.network.exceptions.P2PDisabledException;
+import org.hyperledger.besu.ethereum.p2p.peers.ImmutableEnodeDnsConfiguration;
+
+import java.util.Optional;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -39,6 +42,8 @@ public class AdminAddPeerTest {
   @Mock private P2PNetwork p2pNetwork;
 
   private AdminAddPeer method;
+  private AdminAddPeer methodDNSDisabled;
+  private AdminAddPeer methodDNSUpdateDisabled;
 
   final String validEnode =
       "enode://"
@@ -48,13 +53,48 @@ public class AdminAddPeerTest {
           + "00000000000000000000000000000000"
           + "@127.0.0.1:30303";
 
+  final String validDNSEnode =
+      "enode://"
+          + "00000000000000000000000000000000"
+          + "00000000000000000000000000000000"
+          + "00000000000000000000000000000000"
+          + "00000000000000000000000000000000"
+          + "@node.acme.com:30303";
+
   final JsonRpcRequestContext validRequest =
       new JsonRpcRequestContext(
           new JsonRpcRequest("2.0", "admin_addPeer", new String[] {validEnode}));
 
+  final JsonRpcRequestContext validDNSRequest =
+      new JsonRpcRequestContext(
+          new JsonRpcRequest("2.0", "admin_addPeer", new String[] {validDNSEnode}));
+
   @Before
   public void setup() {
-    method = new AdminAddPeer(p2pNetwork);
+    method =
+        new AdminAddPeer(
+            p2pNetwork,
+            Optional.of(
+                ImmutableEnodeDnsConfiguration.builder()
+                    .dnsEnabled(true)
+                    .updateEnabled(true)
+                    .build()));
+    methodDNSDisabled =
+        new AdminAddPeer(
+            p2pNetwork,
+            Optional.of(
+                ImmutableEnodeDnsConfiguration.builder()
+                    .dnsEnabled(false)
+                    .updateEnabled(true)
+                    .build()));
+    methodDNSUpdateDisabled =
+        new AdminAddPeer(
+            p2pNetwork,
+            Optional.of(
+                ImmutableEnodeDnsConfiguration.builder()
+                    .dnsEnabled(true)
+                    .updateEnabled(false)
+                    .build()));
   }
 
   @Test
@@ -66,7 +106,7 @@ public void requestIsMissingParameter() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -78,7 +118,7 @@ public void requestHasNullObjectParameter() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -90,7 +130,7 @@ public void requestHasNullArrayParameter() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -103,7 +143,7 @@ public void requestHasInvalidEnode() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -123,19 +163,55 @@ public void requestHasInvalidEnodeLength() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
   public void requestAddsValidEnode() {
-    when(p2pNetwork.addMaintainConnectionPeer(any())).thenReturn(true);
+    when(p2pNetwork.addMaintainedConnectionPeer(any())).thenReturn(true);
 
     final JsonRpcResponse expectedResponse =
         new JsonRpcSuccessResponse(validRequest.getRequest().getId(), true);
 
     final JsonRpcResponse actualResponse = method.response(validRequest);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void requestAddsValidDNSEnode() {
+    when(p2pNetwork.addMaintainedConnectionPeer(any())).thenReturn(true);
+
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(
+            validRequest.getRequest().getId(),
+            true); // DNS is mapped to an IP address, so we expect the non-DNS response
+
+    final JsonRpcResponse actualResponse = method.response(validDNSRequest);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void requestAddsDNSEnodeButDNSDisabled() {
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(
+            validDNSRequest.getRequest().getId(), JsonRpcError.DNS_NOT_ENABLED);
+
+    final JsonRpcResponse actualResponse = methodDNSDisabled.response(validDNSRequest);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void requestAddsDNSEnodeButDNSNotResolved() {
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(
+            validDNSRequest.getRequest().getId(), JsonRpcError.CANT_RESOLVE_PEER_ENODE_DNS);
+
+    final JsonRpcResponse actualResponse = methodDNSUpdateDisabled.response(validDNSRequest);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -149,24 +225,24 @@ public void requestRefusesListOfNodes() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
   public void requestReturnsFalseIfAddFails() {
-    when(p2pNetwork.addMaintainConnectionPeer(any())).thenReturn(false);
+    when(p2pNetwork.addMaintainedConnectionPeer(any())).thenReturn(false);
 
     final JsonRpcResponse expectedResponse =
         new JsonRpcSuccessResponse(validRequest.getRequest().getId(), false);
 
     final JsonRpcResponse actualResponse = method.response(validRequest);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
   public void requestReturnsErrorWhenP2pDisabled() {
-    when(p2pNetwork.addMaintainConnectionPeer(any()))
+    when(p2pNetwork.addMaintainedConnectionPeer(any()))
         .thenThrow(
             new P2PDisabledException("P2P networking disabled.  Unable to connect to add peer."));
 
@@ -175,6 +251,6 @@ public void requestReturnsErrorWhenP2pDisabled() {
 
     final JsonRpcResponse actualResponse = method.response(validRequest);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevelTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevelTest.java
index 6bcc0c8cd9d..eeefcbc045b 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevelTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminChangeLogLevelTest.java
@@ -22,14 +22,15 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.util.LogConfigurator;
 
 import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.core.config.Configurator;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @RunWith(MockitoJUnitRunner.class)
 public class AdminChangeLogLevelTest {
@@ -39,7 +40,7 @@ public class AdminChangeLogLevelTest {
   @Before
   public void before() {
     adminChangeLogLevel = new AdminChangeLogLevel();
-    Configurator.setAllLevels("", Level.INFO);
+    LogConfigurator.setLevel("", "INFO");
   }
 
   @Test
@@ -51,18 +52,18 @@ public void shouldReturnExpectedMethodName() {
   public void shouldReturnCorrectResponseWhenRequestHasLogLevel() {
     final JsonRpcRequestContext request =
         new JsonRpcRequestContext(
-            new JsonRpcRequest("2.0", "admin_changeLogLevel", new Object[] {Level.DEBUG}));
+            new JsonRpcRequest("2.0", "admin_changeLogLevel", new Object[] {Level.DEBUG.name()}));
     final JsonRpcResponse expectedResponse =
         new JsonRpcSuccessResponse(request.getRequest().getId());
 
-    final Level levelBeforeJsonRpcRequest = LogManager.getLogger().getLevel();
+    final Logger loggerBeforeJsonRpcRequest = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
     final JsonRpcSuccessResponse actualResponse =
         (JsonRpcSuccessResponse) adminChangeLogLevel.response(request);
-    final Level levelAfterJsonRpcRequest = LogManager.getLogger().getLevel();
+    final Logger loggerAfterJsonRpcRequest = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
-    assertThat(levelBeforeJsonRpcRequest).isEqualByComparingTo(Level.INFO);
-    assertThat(levelAfterJsonRpcRequest).isEqualByComparingTo(Level.DEBUG);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+    assertThat(loggerBeforeJsonRpcRequest.isInfoEnabled()).isTrue();
+    assertThat(loggerAfterJsonRpcRequest.isDebugEnabled()).isTrue();
   }
 
   @Test
@@ -70,24 +71,26 @@ public void shouldReturnCorrectResponseWhenRequestHasLogLevelAndFilters() {
     final JsonRpcRequestContext request =
         new JsonRpcRequestContext(
             new JsonRpcRequest(
-                "2.0", "admin_changeLogLevel", new Object[] {Level.DEBUG, new String[] {"com"}}));
+                "2.0",
+                "admin_changeLogLevel",
+                new Object[] {Level.DEBUG.name(), new String[] {"com"}}));
     final JsonRpcResponse expectedResponse =
         new JsonRpcSuccessResponse(request.getRequest().getId());
 
-    final Level levelOfAllProjectBeforeJsonRpcRequest = LogManager.getLogger().getLevel();
-    final Level levelWithSpecificPackageBeforeJsonRpcRequest =
-        LogManager.getLogger("com").getLevel();
+    final Logger loggerOfAllProjectBeforeJsonRpcRequest =
+        LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
+    final Logger loggerWithSpecificPackageBeforeJsonRpcRequest = LoggerFactory.getLogger("com");
     final JsonRpcSuccessResponse actualResponse =
         (JsonRpcSuccessResponse) adminChangeLogLevel.response(request);
-    final Level levelOfAllProjectAfterJsonRpcRequest = LogManager.getLogger().getLevel();
-    final Level levelWithSpecificPackageAfterJsonRpcRequest =
-        LogManager.getLogger("com").getLevel();
-
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
-    assertThat(levelOfAllProjectBeforeJsonRpcRequest).isEqualByComparingTo(Level.INFO);
-    assertThat(levelOfAllProjectAfterJsonRpcRequest).isEqualByComparingTo(Level.INFO);
-    assertThat(levelWithSpecificPackageBeforeJsonRpcRequest).isEqualByComparingTo(Level.INFO);
-    assertThat(levelWithSpecificPackageAfterJsonRpcRequest).isEqualByComparingTo(Level.DEBUG);
+    final Logger loggerOfAllProjectAfterJsonRpcRequest =
+        LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
+    final Logger loggerWithSpecificPackageAfterJsonRpcRequest = LoggerFactory.getLogger("com");
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+    assertThat(loggerOfAllProjectBeforeJsonRpcRequest.isInfoEnabled()).isTrue();
+    assertThat(loggerOfAllProjectAfterJsonRpcRequest.isInfoEnabled()).isTrue();
+    assertThat(loggerWithSpecificPackageBeforeJsonRpcRequest.isInfoEnabled()).isTrue();
+    assertThat(loggerWithSpecificPackageAfterJsonRpcRequest.isDebugEnabled()).isTrue();
   }
 
   @Test
@@ -98,14 +101,14 @@ public void requestHasValidStringLogLevelParameter() {
     final JsonRpcResponse expectedResponse =
         new JsonRpcSuccessResponse(request.getRequest().getId());
 
-    final Level levelBeforeJsonRpcRequest = LogManager.getLogger().getLevel();
+    final Logger loggerBeforeJsonRpcRequest = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
     final JsonRpcSuccessResponse actualResponse =
         (JsonRpcSuccessResponse) adminChangeLogLevel.response(request);
-    final Level levelAfterJsonRpcRequest = LogManager.getLogger().getLevel();
+    final Logger loggerAfterJsonRpcRequest = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
-    assertThat(levelBeforeJsonRpcRequest).isEqualByComparingTo(Level.INFO);
-    assertThat(levelAfterJsonRpcRequest).isEqualByComparingTo(Level.DEBUG);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+    assertThat(loggerBeforeJsonRpcRequest.isInfoEnabled()).isTrue();
+    assertThat(loggerAfterJsonRpcRequest.isDebugEnabled()).isTrue();
   }
 
   @Test
@@ -117,7 +120,7 @@ public void requestHasNullArrayParameter() {
         new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
 
     final JsonRpcResponse actualResponse = adminChangeLogLevel.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -129,7 +132,7 @@ public void requestHasInvalidStringLogLevelParameter() {
         new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
 
     final JsonRpcResponse actualResponse = adminChangeLogLevel.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -141,6 +144,6 @@ public void requestHasInvalidLogFilterParameter() {
         new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
 
     final JsonRpcResponse actualResponse = adminChangeLogLevel.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRemoveCacheTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRemoveCacheTest.java
index 741f4f7acf3..788d3126288 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRemoveCacheTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRemoveCacheTest.java
@@ -15,6 +15,7 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.when;
@@ -61,47 +62,24 @@ public void setup() {
 
   @Test
   public void testParameterized() {
-    when(blockchainQueries.headBlockNumber()).thenReturn(1000L);
+    long blockNumber = 1000L;
+    when(blockchainQueries.headBlockNumber()).thenReturn(blockNumber);
 
     final Object[][] testVector = {
-      {new String[] {}, 0L, blockchainQueries.headBlockNumber()},
+      {new String[] {}, 0L, blockNumber},
       {new String[] {"earliest"}, 0L, 0L},
-      {
-        new String[] {"latest"},
-        blockchainQueries.headBlockNumber(),
-        blockchainQueries.headBlockNumber()
-      },
-      {
-        new String[] {"pending"},
-        blockchainQueries.headBlockNumber(),
-        blockchainQueries.headBlockNumber()
-      },
+      {new String[] {"latest"}, blockNumber, blockNumber},
+      {new String[] {"pending"}, blockNumber, blockNumber},
       {new String[] {"0x50"}, 0x50L, 0x50L},
       {new String[] {"earliest", "earliest"}, 0L, 0L},
-      {new String[] {"earliest", "latest"}, 0L, blockchainQueries.headBlockNumber()},
-      {
-        new String[] {"latest", "latest"},
-        blockchainQueries.headBlockNumber(),
-        blockchainQueries.headBlockNumber()
-      },
-      {
-        new String[] {"pending", "latest"},
-        blockchainQueries.headBlockNumber(),
-        blockchainQueries.headBlockNumber()
-      },
-      {new String[] {"0x50", "latest"}, 0x50L, blockchainQueries.headBlockNumber()},
-      {new String[] {"earliest", "pending"}, 0L, blockchainQueries.headBlockNumber()},
-      {
-        new String[] {"latest", "pending"},
-        blockchainQueries.headBlockNumber(),
-        blockchainQueries.headBlockNumber()
-      },
-      {
-        new String[] {"pending", "pending"},
-        blockchainQueries.headBlockNumber(),
-        blockchainQueries.headBlockNumber()
-      },
-      {new String[] {"0x50", "pending"}, 0x50L, blockchainQueries.headBlockNumber()},
+      {new String[] {"earliest", "latest"}, 0L, blockNumber},
+      {new String[] {"latest", "latest"}, blockNumber, blockNumber},
+      {new String[] {"pending", "latest"}, blockNumber, blockNumber},
+      {new String[] {"0x50", "latest"}, 0x50L, blockNumber},
+      {new String[] {"earliest", "pending"}, 0L, blockNumber},
+      {new String[] {"latest", "pending"}, blockNumber, blockNumber},
+      {new String[] {"pending", "pending"}, blockNumber, blockNumber},
+      {new String[] {"0x50", "pending"}, 0x50L, blockNumber},
       {new String[] {"earliest", "0x100"}, 0L, 0x100L},
       {new String[] {"0x50", "0x100"}, 0x50L, 0x100L},
     };
@@ -131,7 +109,7 @@ private void testMockedResult(
 
     final JsonRpcResponse actualResponse = adminLogsRemoveCache.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
     assertThat(fromBlock.getValue()).isEqualTo(expectedFromBlock);
     assertThat(toBlock.getValue()).isEqualTo(expectedToBlock);
   }
@@ -152,10 +130,10 @@ public void requestCacheRemovedTest() {
 
     final JsonRpcResponse actualResponse = adminLogsRemoveCache.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
-  @Test(expected = IllegalStateException.class)
+  @Test
   public void requestBlockNumberNotFoundTest() {
     final JsonRpcRequestContext request =
         new JsonRpcRequestContext(
@@ -164,7 +142,8 @@ public void requestBlockNumberNotFoundTest() {
     when(blockchainQueries.getBlockchain()).thenReturn(blockchain);
     when(blockchain.getBlockByNumber(anyLong())).thenReturn(Optional.empty());
 
-    adminLogsRemoveCache.response(request);
+    assertThatThrownBy(() -> adminLogsRemoveCache.response(request))
+        .isInstanceOf(IllegalStateException.class);
   }
 
   @Test
@@ -180,6 +159,6 @@ public void requestBlockRangeInvalidTest() {
 
     final JsonRpcResponse actualResponse = adminLogsRemoveCache.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRepairCacheTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRepairCacheTest.java
index c7495c273e5..226eafb17b4 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRepairCacheTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminLogsRepairCacheTest.java
@@ -15,6 +15,7 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.when;
 
@@ -68,7 +69,7 @@ public void requestStartedTest() {
 
     final JsonRpcResponse actualResponse = adminLogsRepairCache.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -88,10 +89,10 @@ public void requestAlreadyRunningTest() {
 
     final JsonRpcResponse actualResponse = adminLogsRepairCache.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
-  @Test(expected = IllegalStateException.class)
+  @Test
   public void requestBlockNumberNotFoundTest() {
     final JsonRpcRequestContext request =
         new JsonRpcRequestContext(
@@ -100,6 +101,7 @@ public void requestBlockNumberNotFoundTest() {
     when(blockchainQueries.getBlockchain()).thenReturn(blockchain);
     when(blockchain.getBlockByNumber(anyLong())).thenReturn(Optional.empty());
 
-    adminLogsRepairCache.response(request);
+    assertThatThrownBy(() -> adminLogsRepairCache.response(request))
+        .isInstanceOf(IllegalStateException.class);
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminNodeInfoTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminNodeInfoTest.java
index 699a0b49960..b87bf4df4fc 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminNodeInfoTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminNodeInfoTest.java
@@ -21,6 +21,7 @@
 
 import org.hyperledger.besu.config.GenesisConfigOptions;
 import org.hyperledger.besu.config.StubGenesisConfigOptions;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
@@ -30,15 +31,16 @@
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.chain.ChainHead;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
 import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.nat.NatService;
 import org.hyperledger.besu.nat.core.domain.NatPortMapping;
 import org.hyperledger.besu.nat.core.domain.NatServiceType;
 import org.hyperledger.besu.nat.core.domain.NetworkProtocol;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.math.BigInteger;
 import java.util.Collections;
@@ -61,18 +63,18 @@ public class AdminNodeInfoTest {
   @Mock private Blockchain blockchain;
   @Mock private BlockchainQueries blockchainQueries;
   @Mock private NatService natService;
+  @Mock private BlockHeader blockHeader;
 
   private AdminNodeInfo method;
 
   private final Bytes nodeId =
       Bytes.fromHexString(
           "0x0f1b319e32017c3fcb221841f0f978701b4e9513fe6a567a2db43d43381a9c7e3dfe7cae13cbc2f56943400bacaf9082576ab087cd51983b17d729ae796f6807");
-  private final ChainHead testChainHead = new ChainHead(Hash.EMPTY, Difficulty.ONE, 1L);
   private final GenesisConfigOptions genesisConfigOptions =
       new StubGenesisConfigOptions().chainId(BigInteger.valueOf(2019));
   private final DefaultPeer defaultPeer =
       DefaultPeer.fromEnodeURL(
-          EnodeURL.builder()
+          EnodeURLImpl.builder()
               .nodeId(nodeId)
               .ipAddress("1.2.3.4")
               .discoveryPort(7890)
@@ -81,6 +83,9 @@ public class AdminNodeInfoTest {
 
   @Before
   public void setup() {
+    when(blockHeader.getHash()).thenReturn(Hash.EMPTY);
+    final ChainHead testChainHead = new ChainHead(blockHeader, Difficulty.ONE, 1L);
+
     when(blockchainQueries.getBlockchain()).thenReturn(blockchain);
     when(blockchainQueries.getBlockHashByNumber(anyLong())).thenReturn(Optional.of(Hash.EMPTY));
     when(blockchain.getChainHead()).thenReturn(testChainHead);
@@ -131,7 +136,7 @@ public void shouldReturnCorrectResult() {
     final JsonRpcResponse response = method.response(request);
     assertThat(response).isInstanceOf(JsonRpcSuccessResponse.class);
     final JsonRpcSuccessResponse actual = (JsonRpcSuccessResponse) response;
-    assertThat(actual.getResult()).isEqualTo(expected);
+    assertThat(actual.getResult()).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -182,13 +187,13 @@ public void shouldReturnCorrectResultWhenIsNatEnvironment() {
     final JsonRpcResponse response = method.response(request);
     assertThat(response).isInstanceOf(JsonRpcSuccessResponse.class);
     final JsonRpcSuccessResponse actual = (JsonRpcSuccessResponse) response;
-    assertThat(actual.getResult()).isEqualTo(expected);
+    assertThat(actual.getResult()).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
   public void handlesLocalEnodeWithListeningAndDiscoveryDisabled() {
     final EnodeURL localEnode =
-        EnodeURL.builder()
+        EnodeURLImpl.builder()
             .nodeId(nodeId)
             .ipAddress("1.2.3.4")
             .discoveryAndListeningPorts(0)
@@ -227,13 +232,13 @@ public void handlesLocalEnodeWithListeningAndDiscoveryDisabled() {
     final JsonRpcResponse response = method.response(request);
     assertThat(response).isInstanceOf(JsonRpcSuccessResponse.class);
     final JsonRpcSuccessResponse actual = (JsonRpcSuccessResponse) response;
-    assertThat(actual.getResult()).isEqualTo(expected);
+    assertThat(actual.getResult()).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
   public void handlesLocalEnodeWithListeningDisabled() {
     final EnodeURL localEnode =
-        EnodeURL.builder()
+        EnodeURLImpl.builder()
             .nodeId(nodeId)
             .ipAddress("1.2.3.4")
             .discoveryAndListeningPorts(0)
@@ -273,13 +278,13 @@ public void handlesLocalEnodeWithListeningDisabled() {
     final JsonRpcResponse response = method.response(request);
     assertThat(response).isInstanceOf(JsonRpcSuccessResponse.class);
     final JsonRpcSuccessResponse actual = (JsonRpcSuccessResponse) response;
-    assertThat(actual.getResult()).isEqualTo(expected);
+    assertThat(actual.getResult()).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
   public void handlesLocalEnodeWithDiscoveryDisabled() {
     final EnodeURL localEnode =
-        EnodeURL.builder()
+        EnodeURLImpl.builder()
             .nodeId(nodeId)
             .ipAddress("1.2.3.4")
             .discoveryAndListeningPorts(0)
@@ -320,7 +325,7 @@ public void handlesLocalEnodeWithDiscoveryDisabled() {
     final JsonRpcResponse response = method.response(request);
     assertThat(response).isInstanceOf(JsonRpcSuccessResponse.class);
     final JsonRpcSuccessResponse actual = (JsonRpcSuccessResponse) response;
-    assertThat(actual.getResult()).isEqualTo(expected);
+    assertThat(actual.getResult()).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -333,7 +338,7 @@ public void returnsErrorWhenP2PDisabled() {
 
     final JsonRpcResponse response = method.response(request);
     assertThat(response).isInstanceOf(JsonRpcErrorResponse.class);
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -348,7 +353,66 @@ public void returnsErrorWhenP2PNotReady() {
 
     final JsonRpcResponse response = method.response(request);
     assertThat(response).isInstanceOf(JsonRpcErrorResponse.class);
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @SuppressWarnings("unchecked")
+  @Test
+  public void returnsClassicForkBlocks() {
+    when(p2pNetwork.isP2pEnabled()).thenReturn(true);
+    when(p2pNetwork.getLocalEnode()).thenReturn(Optional.of(defaultPeer.getEnodeURL()));
+    final GenesisConfigOptions genesisClassicConfigOptions =
+        new StubGenesisConfigOptions()
+            .chainId(BigInteger.valueOf(2019))
+            .classicForkBlock(1)
+            .ecip1015(2)
+            .dieHard(3)
+            .gotham(4)
+            .defuseDifficultyBomb(5)
+            .atlantis(6)
+            .agharta(7)
+            .phoenix(8)
+            .thanos(9)
+            .magneto(10)
+            .mystique(12);
+
+    final AdminNodeInfo methodClassic =
+        new AdminNodeInfo(
+            "testnetClassic/1.0/this/that",
+            BigInteger.valueOf(2018),
+            genesisClassicConfigOptions,
+            p2pNetwork,
+            blockchainQueries,
+            natService);
+
+    final JsonRpcRequestContext request = adminNodeInfo();
+
+    final Map<String, Long> expectedConfig =
+        new HashMap<>(
+            Map.of(
+                "classicForkBlock", 1L,
+                "ecip1015Block", 2L,
+                "dieHardBlock", 3L,
+                "gothamBlock", 4L,
+                "ecip1041Block", 5L,
+                "atlantisBlock", 6L,
+                "aghartaBlock", 7L,
+                "phoenixBlock", 8L,
+                "thanosBlock", 9L,
+                "magnetoBlock", 10L));
+    expectedConfig.put("mystiqueBlock", 12L);
+
+    final JsonRpcResponse response = methodClassic.response(request);
+    assertThat(response).isInstanceOf(JsonRpcSuccessResponse.class);
+    final Object result = ((JsonRpcSuccessResponse) response).getResult();
+    assertThat(result).isInstanceOf(Map.class);
+    final Object protocolsMap = ((Map<?, ?>) result).get("protocols");
+    assertThat(protocolsMap).isInstanceOf(Map.class);
+    final Object ethMap = ((Map<?, ?>) protocolsMap).get("eth");
+    assertThat(ethMap).isInstanceOf(Map.class);
+    final Object configMap = ((Map<?, ?>) ethMap).get("config");
+    assertThat(configMap).isInstanceOf(Map.class);
+    assertThat(((Map<String, Long>) configMap)).containsAllEntriesOf(expectedConfig);
   }
 
   private JsonRpcRequestContext adminNodeInfo() {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminPeersTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminPeersTest.java
index 09a7e6ee7d7..5123c29fc56 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminPeersTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminPeersTest.java
@@ -25,9 +25,9 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.PeerResult;
+import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
-import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
 import org.hyperledger.besu.ethereum.p2p.network.exceptions.P2PDisabledException;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo;
@@ -54,7 +54,9 @@ public class AdminPeersTest {
 
   private AdminPeers adminPeers;
 
-  @Mock private P2PNetwork p2pNetwork;
+  private final String VALID_NODE_ID =
+      "6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0";
+
   @Mock private EthPeers ethPeers;
 
   @Before
@@ -75,7 +77,7 @@ public void shouldReturnEmptyPeersListWhenP2PNetworkDoesNotHavePeers() {
 
     final JsonRpcResponse response = adminPeers.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -103,17 +105,28 @@ public void shouldFailIfP2pDisabled() {
         new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.P2P_DISABLED);
 
     Assertions.assertThat(adminPeers.response(request))
-        .isEqualToComparingFieldByField(expectedResponse);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
   }
 
   private Collection<EthPeer> peerList() {
-    final PeerInfo peerInfo = new PeerInfo(5, "0x0", Collections.emptyList(), 30303, Bytes.EMPTY);
+    final PeerInfo peerInfo =
+        new PeerInfo(5, "0x0", Collections.emptyList(), 30303, Bytes.fromHexString(VALID_NODE_ID));
     final PeerConnection p =
         MockPeerConnection.create(
             peerInfo,
-            InetSocketAddress.createUnresolved("1.2.3.4", 9876),
-            InetSocketAddress.createUnresolved("4.3.2.1", 6789));
-    final EthPeer ethPeer = new EthPeer(p, "eth", c -> {}, List.of(), TestClock.fixed());
+            new InetSocketAddress("1.2.3.4", 9876),
+            new InetSocketAddress("4.3.2.1", 6789));
+    final EthPeer ethPeer =
+        new EthPeer(
+            p,
+            "eth",
+            c -> {},
+            List.of(),
+            EthProtocolConfiguration.DEFAULT_MAX_MESSAGE_SIZE,
+            TestClock.fixed(),
+            Collections.emptyList(),
+            Bytes.random(64));
     return Lists.newArrayList(ethPeer);
   }
 
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminRemovePeerTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminRemovePeerTest.java
new file mode 100644
index 00000000000..21c2cf2462f
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AdminRemovePeerTest.java
@@ -0,0 +1,258 @@
+/*
+ * Copyright Hyperledger Besu contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
+import org.hyperledger.besu.ethereum.p2p.network.exceptions.P2PDisabledException;
+import org.hyperledger.besu.ethereum.p2p.peers.ImmutableEnodeDnsConfiguration;
+
+import java.util.Optional;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
+public class AdminRemovePeerTest {
+
+  @Mock private P2PNetwork p2pNetwork;
+
+  private AdminRemovePeer method;
+  private AdminRemovePeer methodDNSDisabled;
+  private AdminRemovePeer methodDNSUpdateDisabled;
+
+  final String validEnode =
+      "enode://"
+          + "00000000000000000000000000000000"
+          + "00000000000000000000000000000000"
+          + "00000000000000000000000000000000"
+          + "00000000000000000000000000000000"
+          + "@127.0.0.1:30303";
+
+  final String validDNSEnode =
+      "enode://"
+          + "00000000000000000000000000000000"
+          + "00000000000000000000000000000000"
+          + "00000000000000000000000000000000"
+          + "00000000000000000000000000000000"
+          + "@node.acme.com:30303";
+
+  final JsonRpcRequestContext validRequest =
+      new JsonRpcRequestContext(
+          new JsonRpcRequest("2.0", "admin_removePeer", new String[] {validEnode}));
+
+  final JsonRpcRequestContext validDNSRequest =
+      new JsonRpcRequestContext(
+          new JsonRpcRequest("2.0", "admin_removePeer", new String[] {validDNSEnode}));
+
+  @Before
+  public void setup() {
+    method =
+        new AdminRemovePeer(
+            p2pNetwork,
+            Optional.of(
+                ImmutableEnodeDnsConfiguration.builder()
+                    .dnsEnabled(true)
+                    .updateEnabled(true)
+                    .build()));
+    methodDNSDisabled =
+        new AdminRemovePeer(
+            p2pNetwork,
+            Optional.of(
+                ImmutableEnodeDnsConfiguration.builder()
+                    .dnsEnabled(false)
+                    .updateEnabled(true)
+                    .build()));
+    methodDNSUpdateDisabled =
+        new AdminRemovePeer(
+            p2pNetwork,
+            Optional.of(
+                ImmutableEnodeDnsConfiguration.builder()
+                    .dnsEnabled(true)
+                    .updateEnabled(false)
+                    .build()));
+  }
+
+  @Test
+  public void requestIsMissingParameter() {
+    final JsonRpcRequestContext request =
+        new JsonRpcRequestContext(new JsonRpcRequest("2.0", "admin_removePeer", new String[] {}));
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
+
+    final JsonRpcResponse actualResponse = method.response(request);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void requestHasNullObjectParameter() {
+    final JsonRpcRequestContext request =
+        new JsonRpcRequestContext(new JsonRpcRequest("2.0", "admin_removePeer", null));
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
+
+    final JsonRpcResponse actualResponse = method.response(request);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void requestHasNullArrayParameter() {
+    final JsonRpcRequestContext request =
+        new JsonRpcRequestContext(
+            new JsonRpcRequest("2.0", "admin_removePeer", new String[] {null}));
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
+
+    final JsonRpcResponse actualResponse = method.response(request);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void requestHasInvalidEnode() {
+    final JsonRpcRequestContext request =
+        new JsonRpcRequestContext(
+            new JsonRpcRequest("2.0", "admin_removePeer", new String[] {"asdf"}));
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.PARSE_ERROR);
+
+    final JsonRpcResponse actualResponse = method.response(request);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void requestHasInvalidEnodeLength() {
+    String invalidLengthEnode =
+        "enode://"
+            + "0000000000000000000000000000000"
+            + "00000000000000000000000000000000"
+            + "00000000000000000000000000000000"
+            + "00000000000000000000000000000000"
+            + "@127.0.0.1:30303";
+    final JsonRpcRequestContext request =
+        new JsonRpcRequestContext(
+            new JsonRpcRequest("2.0", "admin_removePeer", new String[] {invalidLengthEnode}));
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.ENODE_ID_INVALID);
+
+    final JsonRpcResponse actualResponse = method.response(request);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void requestRemovesValidEnode() {
+    when(p2pNetwork.removeMaintainedConnectionPeer(any())).thenReturn(true);
+
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(validRequest.getRequest().getId(), true);
+
+    final JsonRpcResponse actualResponse = method.response(validRequest);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void requestRemovesValidDNSEnode() {
+    when(p2pNetwork.removeMaintainedConnectionPeer(any())).thenReturn(true);
+
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(
+            validRequest.getRequest().getId(),
+            true); // DNS is mapped to an IP address, so we expect the non-DNS response
+
+    final JsonRpcResponse actualResponse = method.response(validDNSRequest);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void requestRemovesDNSEnodeButDNSDisabled() {
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(
+            validDNSRequest.getRequest().getId(), JsonRpcError.DNS_NOT_ENABLED);
+
+    final JsonRpcResponse actualResponse = methodDNSDisabled.response(validDNSRequest);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void requestRemovesDNSEnodeButDNSNotResolved() {
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(
+            validDNSRequest.getRequest().getId(), JsonRpcError.CANT_RESOLVE_PEER_ENODE_DNS);
+
+    final JsonRpcResponse actualResponse = methodDNSUpdateDisabled.response(validDNSRequest);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void requestRefusesListOfNodes() {
+    final JsonRpcRequestContext request =
+        new JsonRpcRequestContext(
+            new JsonRpcRequest("2.0", "admin_removePeer", new String[] {validEnode, validEnode}));
+
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
+
+    final JsonRpcResponse actualResponse = method.response(request);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void requestReturnsFalseIfRemoveFails() {
+    when(p2pNetwork.removeMaintainedConnectionPeer(any())).thenReturn(false);
+
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(validRequest.getRequest().getId(), false);
+
+    final JsonRpcResponse actualResponse = method.response(validRequest);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void requestReturnsErrorWhenP2pDisabled() {
+    when(p2pNetwork.removeMaintainedConnectionPeer(any()))
+        .thenThrow(
+            new P2PDisabledException(
+                "P2P networking disabled.  Unable to connect to remove peer."));
+
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(validRequest.getRequest().getId(), JsonRpcError.P2P_DISABLED);
+
+    final JsonRpcResponse actualResponse = method.response(validRequest);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugAccountAtTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugAccountAtTest.java
new file mode 100644
index 00000000000..cc97c40bb38
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugAccountAtTest.java
@@ -0,0 +1,268 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import static org.hyperledger.besu.evm.account.Account.MAX_NONCE;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.Tracer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.DebugAccountAtResult;
+import org.hyperledger.besu.ethereum.api.query.BlockWithMetadata;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.debug.TraceFrame;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+
+import java.util.Collections;
+import java.util.Optional;
+import java.util.function.Function;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+class DebugAccountAtTest {
+  @Mock private BlockTracer blockTracer;
+  @Mock private BlockchainQueries blockchainQueries;
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  private BlockWithMetadata<TransactionWithMetadata, Hash> blockWithMetadata;
+
+  @Mock private BlockHeader blockHeader;
+  @Mock private TransactionWithMetadata transactionWithMetadata;
+  @Mock private BlockTrace blockTrace;
+  @Mock private TransactionTrace transactionTrace;
+  @Mock private TraceFrame traceFrame;
+  @Mock private Transaction transaction;
+  @Mock private WorldUpdater worldUpdater;
+  @Mock private MutableWorldState worldState;
+
+  @Mock private Account account;
+
+  private static DebugAccountAt debugAccountAt;
+
+  @BeforeEach
+  void init() {
+    debugAccountAt = new DebugAccountAt(blockchainQueries, () -> blockTracer);
+  }
+
+  @Test
+  void nameShouldBeDebugAccountAt() {
+    Assertions.assertThat(debugAccountAt.getName()).isEqualTo("debug_accountAt");
+  }
+
+  @Test
+  void testBlockNotFoundResponse() {
+    Mockito.when(blockchainQueries.getBlockHeaderByHash(any())).thenReturn(Optional.empty());
+
+    final Object[] params = new Object[] {Hash.ZERO.toHexString(), 0, Address.ZERO.toHexString()};
+    final JsonRpcRequestContext request =
+        new JsonRpcRequestContext(new JsonRpcRequest("2.0", "debug_accountAt", params));
+    final JsonRpcResponse response = debugAccountAt.response(request);
+
+    Assertions.assertThat(response).isInstanceOf(JsonRpcErrorResponse.class);
+    Assertions.assertThat(((JsonRpcErrorResponse) response).getError())
+        .isEqualByComparingTo(JsonRpcError.BLOCK_NOT_FOUND);
+  }
+
+  @Test
+  void testInvalidParamsResponseEmptyList() {
+    setupMockBlock();
+    Mockito.when(blockWithMetadata.getTransactions()).thenReturn(Collections.emptyList());
+
+    final Object[] params = new Object[] {Hash.ZERO.toHexString(), 0, Address.ZERO.toHexString()};
+    final JsonRpcRequestContext request =
+        new JsonRpcRequestContext(new JsonRpcRequest("2.0", "debug_accountAt", params));
+    final JsonRpcResponse response = debugAccountAt.response(request);
+
+    Assertions.assertThat(response).isInstanceOf(JsonRpcErrorResponse.class);
+    Assertions.assertThat(((JsonRpcErrorResponse) response).getError())
+        .isEqualByComparingTo(JsonRpcError.INVALID_PARAMS);
+  }
+
+  @Test
+  void testInvalidParamsResponseNegative() {
+    setupMockBlock();
+    Mockito.when(blockWithMetadata.getTransactions())
+        .thenReturn(Collections.singletonList(transactionWithMetadata));
+
+    final Object[] params = new Object[] {Hash.ZERO.toHexString(), -1, Address.ZERO.toHexString()};
+    final JsonRpcRequestContext request =
+        new JsonRpcRequestContext(new JsonRpcRequest("2.0", "debug_accountAt", params));
+    final JsonRpcResponse response = debugAccountAt.response(request);
+
+    Assertions.assertThat(response).isInstanceOf(JsonRpcErrorResponse.class);
+    Assertions.assertThat(((JsonRpcErrorResponse) response).getError())
+        .isEqualByComparingTo(JsonRpcError.INVALID_PARAMS);
+  }
+
+  @Test
+  void testInvalidParamsResponseTooHigh() {
+    setupMockBlock();
+    Mockito.when(blockWithMetadata.getTransactions())
+        .thenReturn(Collections.singletonList(transactionWithMetadata));
+
+    final Object[] params = new Object[] {Hash.ZERO.toHexString(), 2, Address.ZERO.toHexString()};
+    final JsonRpcRequestContext request =
+        new JsonRpcRequestContext(new JsonRpcRequest("2.0", "debug_accountAt", params));
+    final JsonRpcResponse response = debugAccountAt.response(request);
+
+    Assertions.assertThat(response).isInstanceOf(JsonRpcErrorResponse.class);
+    Assertions.assertThat(((JsonRpcErrorResponse) response).getError())
+        .isEqualByComparingTo(JsonRpcError.INVALID_PARAMS);
+  }
+
+  @Test
+  void testTransactionNotFoundResponse() {
+    doAnswer(
+            invocation ->
+                invocation
+                    .<Function<MutableWorldState, Optional<? extends JsonRpcResponse>>>getArgument(
+                        1)
+                    .apply(worldState))
+        .when(blockchainQueries)
+        .getAndMapWorldState(any(), any());
+
+    setupMockBlock();
+    Mockito.when(blockWithMetadata.getTransactions())
+        .thenReturn(Collections.singletonList(transactionWithMetadata));
+
+    final Object[] params = new Object[] {Hash.ZERO.toHexString(), 0, Address.ZERO.toHexString()};
+    final JsonRpcRequestContext request =
+        new JsonRpcRequestContext(new JsonRpcRequest("2.0", "debug_accountAt", params));
+    final JsonRpcResponse response = debugAccountAt.response(request);
+
+    Assertions.assertThat(response).isInstanceOf(JsonRpcErrorResponse.class);
+    Assertions.assertThat(((JsonRpcErrorResponse) response).getError())
+        .isEqualByComparingTo(JsonRpcError.TRANSACTION_NOT_FOUND);
+  }
+
+  @Test
+  void testNoAccountFoundResponse() {
+    doAnswer(
+            invocation ->
+                invocation
+                    .<Function<MutableWorldState, Optional<? extends JsonRpcResponse>>>getArgument(
+                        1)
+                    .apply(worldState))
+        .when(blockchainQueries)
+        .getAndMapWorldState(any(), any());
+
+    setupMockTransaction();
+    setupMockBlock();
+
+    final Object[] params = new Object[] {Hash.ZERO.toHexString(), 0, Address.ZERO.toHexString()};
+    final JsonRpcRequestContext request =
+        new JsonRpcRequestContext(new JsonRpcRequest("2.0", "debug_accountAt", params));
+
+    final JsonRpcResponse response = debugAccountAt.response(request);
+
+    Assertions.assertThat(response).isInstanceOf(JsonRpcErrorResponse.class);
+    Assertions.assertThat(((JsonRpcErrorResponse) response).getError())
+        .isEqualByComparingTo(JsonRpcError.NO_ACCOUNT_FOUND);
+  }
+
+  @Test
+  void shouldBeSuccessfulWhenTransactionsAndAccountArePresent() {
+    doAnswer(
+            invocation ->
+                invocation
+                    .<Function<MutableWorldState, Optional<? extends JsonRpcResponse>>>getArgument(
+                        1)
+                    .apply(worldState))
+        .when(blockchainQueries)
+        .getAndMapWorldState(any(), any());
+
+    final String codeString =
+        "0x608060405234801561001057600080fd5b506004361061002b5760003560e01c8063b27b880414610030575b";
+    final Bytes code = Bytes.fromHexString(codeString);
+    final long nonce = MAX_NONCE - 1;
+    final String balanceString = "0xffff";
+    final Wei balance = Wei.fromHexString(balanceString);
+    final Hash codeHash = Hash.hash(code);
+
+    setupMockTransaction();
+    setupMockAccount();
+    setupMockBlock();
+
+    Mockito.when(account.getCode()).thenReturn(code);
+    Mockito.when(account.getNonce()).thenReturn(nonce);
+    Mockito.when(account.getBalance()).thenReturn(balance);
+    Mockito.when(account.getCodeHash()).thenReturn(codeHash);
+
+    final Object[] params = new Object[] {Hash.ZERO.toHexString(), 0, Address.ZERO.toHexString()};
+    final JsonRpcRequestContext request =
+        new JsonRpcRequestContext(new JsonRpcRequest("2.0", "debug_accountAt", params));
+    final JsonRpcSuccessResponse response =
+        (JsonRpcSuccessResponse) debugAccountAt.response(request);
+
+    final DebugAccountAtResult result = (DebugAccountAtResult) response.getResult();
+    Assertions.assertThat(result.getCode()).isEqualTo(codeString);
+    Assertions.assertThat(result.getNonce()).isEqualTo("0x" + Long.toHexString(nonce));
+    Assertions.assertThat(result.getBalance()).isEqualTo(balanceString);
+    Assertions.assertThat(result.getCodehash()).isEqualTo(codeHash.toHexString());
+  }
+
+  private void setupMockAccount() {
+    Mockito.when(transactionTrace.getTraceFrames())
+        .thenReturn(Collections.singletonList(traceFrame));
+    Mockito.when(traceFrame.getWorldUpdater()).thenReturn(worldUpdater);
+    Mockito.when(worldUpdater.get(any())).thenReturn(account);
+    Mockito.when(account.getAddress()).thenReturn(Address.ZERO);
+  }
+
+  private void setupMockTransaction() {
+    Mockito.when(blockchainQueries.blockByHash(any())).thenReturn(Optional.of(blockWithMetadata));
+    Mockito.when(blockWithMetadata.getTransactions())
+        .thenReturn(Collections.singletonList(transactionWithMetadata));
+    Mockito.when(blockTracer.trace(any(Tracer.TraceableState.class), any(Hash.class), any()))
+        .thenReturn(Optional.of(blockTrace));
+    Mockito.when(blockTrace.getTransactionTraces())
+        .thenReturn(Collections.singletonList(transactionTrace));
+    Mockito.when(transactionTrace.getTransaction()).thenReturn(transaction);
+    Mockito.when(transactionWithMetadata.getTransaction()).thenReturn(transaction);
+    Mockito.when(transaction.getHash()).thenReturn(Hash.ZERO);
+  }
+
+  private void setupMockBlock() {
+    Mockito.when(blockchainQueries.blockByHash(any())).thenReturn(Optional.of(blockWithMetadata));
+    Mockito.when(blockchainQueries.getBlockHeaderByHash(any()))
+        .thenReturn(Optional.of(blockHeader));
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugBatchSendRawTransactionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugBatchSendRawTransactionTest.java
index feec12cba0b..c72b3f917d0 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugBatchSendRawTransactionTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugBatchSendRawTransactionTest.java
@@ -59,7 +59,7 @@ public void nominalCaseSingleTransaction() {
                 new Object[] {
                   "0xf868808203e882520894627306090abab3a6e1400e9345bc60c78a8bef57872386f26fc10000801ba0ac74ecfa0e9b85785f042c143ead4780931234cc9a032fce99fab1f45e0d90faa02fd17e8eb433d4ca47727653232045d4f81322619c0852d3fe8ddcfcedb66a43"
                 }));
-    when(transactionPool.addLocalTransaction(any(Transaction.class)))
+    when(transactionPool.addTransactionViaApi(any(Transaction.class)))
         .thenReturn(ValidationResult.valid());
     final JsonRpcSuccessResponse response = (JsonRpcSuccessResponse) method.response(request);
     assertThat(response).isNotNull();
@@ -78,7 +78,7 @@ public void nominalCaseMultipleTransactions() {
                   "0xf868808203e882520894627306090abab3a6e1400e9345bc60c78a8bef57872386f26fc10000801ba0ac74ecfa0e9b85785f042c143ead4780931234cc9a032fce99fab1f45e0d90faa02fd17e8eb433d4ca47727653232045d4f81322619c0852d3fe8ddcfcedb66a43",
                   "0xf868018203e882520894627306090abab3a6e1400e9345bc60c78a8bef57876a94d74f430000801ba092faeec7bcb7418a79cd9f74c739237d72d52b5ab25aa08e332053304456e129a0386e3e9205a3553ecc5e85fc753c93196484c0fdeaaacdd61425caeb11bc6e5a"
                 }));
-    when(transactionPool.addLocalTransaction(any(Transaction.class)))
+    when(transactionPool.addTransactionViaApi(any(Transaction.class)))
         .thenReturn(ValidationResult.valid());
     final JsonRpcSuccessResponse response = (JsonRpcSuccessResponse) method.response(request);
     assertThat(response).isNotNull();
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugGetBadBlockTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugGetBadBlockTest.java
index 4e7377d3603..21fa5c50be9 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugGetBadBlockTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugGetBadBlockTest.java
@@ -16,11 +16,12 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
-import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
@@ -39,6 +40,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Optional;
 
 import org.junit.Test;
 
@@ -63,7 +65,7 @@ public void nameShouldBeDebugTraceBlock() {
   @Test
   public void shouldReturnCorrectResponse() {
 
-    final SECP256K1.KeyPair keyPair = SECP256K1.KeyPair.generate();
+    final KeyPair keyPair = SignatureAlgorithmFactory.getInstance().generateKeyPair();
     final List<Transaction> transactions = new ArrayList<>();
     for (int i = 0; i < 3; i++) {
       transactions.add(transactionTestFixture.createTransaction(keyPair));
@@ -91,11 +93,10 @@ public void shouldReturnCorrectResponse() {
                     .setBlockHeaderFunctions(new MainnetBlockHeaderFunctions())
                     .setParentHash(parentBlock.getHash()));
 
-    badBlockManager.addBadBlock(badBlockWithTransaction);
-    badBlockManager.addBadBlock(badBlockWoTransaction);
-
+    badBlockManager.addBadBlock(badBlockWithTransaction, Optional.empty());
+    badBlockManager.addBadBlock(badBlockWoTransaction, Optional.empty());
     final ProtocolSpec protocolSpec = mock(ProtocolSpec.class);
-    when(protocolSchedule.getByBlockNumber(anyLong())).thenReturn(protocolSpec);
+    when(protocolSchedule.getByBlockHeader(any())).thenReturn(protocolSpec);
     when(protocolSpec.getBadBlocksManager()).thenReturn(badBlockManager);
 
     final JsonRpcRequestContext request =
@@ -123,7 +124,8 @@ public void shouldReturnCorrectResponse() {
   @Test
   public void shouldReturnCorrectResponseWhenNoInvalidBlockFound() {
     final ProtocolSpec protocolSpec = mock(ProtocolSpec.class);
-    when(protocolSchedule.getByBlockNumber(anyLong())).thenReturn(protocolSpec);
+
+    when(protocolSchedule.getByBlockHeader(any())).thenReturn(protocolSpec);
     when(protocolSpec.getBadBlocksManager()).thenReturn(badBlockManager);
 
     final JsonRpcRequestContext request =
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStandardTraceBadBlockToFileTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStandardTraceBadBlockToFileTest.java
index 397b35f4f81..1c749df131e 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStandardTraceBadBlockToFileTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStandardTraceBadBlockToFileTest.java
@@ -17,12 +17,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTracer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.chain.BadBlockManager;
@@ -31,13 +33,17 @@
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
 
+import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -48,6 +54,8 @@ public class DebugStandardTraceBadBlockToFileTest {
 
   private final BlockchainQueries blockchainQueries = mock(BlockchainQueries.class);
   private final Blockchain blockchain = mock(Blockchain.class);
+  private final MutableWorldState mutableWorldState = mock(MutableWorldState.class);
+
   private final ProtocolSchedule protocolSchedule = mock(ProtocolSchedule.class);
   private final TransactionTracer transactionTracer = mock(TransactionTracer.class);
   private final ProtocolSpec protocolSpec = mock(ProtocolSpec.class);
@@ -56,6 +64,18 @@ public class DebugStandardTraceBadBlockToFileTest {
       new DebugStandardTraceBadBlockToFile(
           () -> transactionTracer, blockchainQueries, protocolSchedule, folder.getRoot().toPath());
 
+  @Before
+  public void setup() {
+    doAnswer(
+            invocation ->
+                invocation
+                    .<Function<MutableWorldState, Optional<? extends JsonRpcResponse>>>getArgument(
+                        1)
+                    .apply(mutableWorldState))
+        .when(blockchainQueries)
+        .getAndMapWorldState(any(), any());
+  }
+
   @Test
   public void nameShouldBeDebugTraceTransaction() {
     assertThat(debugStandardTraceBadBlockToFile.getName())
@@ -81,14 +101,15 @@ public void shouldTraceTheTransactionUsingTheTransactionTracer() {
     paths.add("path-1");
 
     final BadBlockManager badBlockManager = new BadBlockManager();
-    badBlockManager.addBadBlock(block);
+    badBlockManager.addBadBlock(block, Optional.empty());
 
     final BlockHeader blockHeader = new BlockHeaderTestFixture().buildHeader();
     when(protocolSpec.getBadBlocksManager()).thenReturn(badBlockManager);
     when(blockchainQueries.getBlockchain()).thenReturn(blockchain);
     when(blockchain.getChainHeadHeader()).thenReturn(new BlockHeaderTestFixture().buildHeader());
-    when(protocolSchedule.getByBlockNumber(blockHeader.getNumber())).thenReturn(protocolSpec);
-    when(transactionTracer.traceTransactionToFile(eq(block.getHash()), any(), any()))
+    when(protocolSchedule.getByBlockHeader(blockHeader)).thenReturn(protocolSpec);
+    when(transactionTracer.traceTransactionToFile(
+            any(MutableWorldState.class), eq(block.getHash()), any(), any()))
         .thenReturn(paths);
     final JsonRpcSuccessResponse response =
         (JsonRpcSuccessResponse) debugStandardTraceBadBlockToFile.response(request);
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStandardTraceBlockToFileTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStandardTraceBlockToFileTest.java
index b49cb440487..ddae8a94ffe 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStandardTraceBlockToFileTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStandardTraceBlockToFileTest.java
@@ -18,6 +18,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
@@ -28,6 +29,8 @@
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -37,13 +40,17 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
+import org.mockito.Answers;
 
 public class DebugStandardTraceBlockToFileTest {
 
   @ClassRule public static final TemporaryFolder folder = new TemporaryFolder();
 
-  private final BlockchainQueries blockchainQueries = mock(BlockchainQueries.class);
+  private final WorldStateArchive archive =
+      mock(WorldStateArchive.class, Answers.RETURNS_DEEP_STUBS);
   private final Blockchain blockchain = mock(Blockchain.class);
+  private final BlockchainQueries blockchainQueries =
+      spy(new BlockchainQueries(blockchain, archive));
   private final TransactionTracer transactionTracer = mock(TransactionTracer.class);
   private final DebugStandardTraceBlockToFile debugStandardTraceBlockToFile =
       new DebugStandardTraceBlockToFile(
@@ -75,8 +82,10 @@ public void shouldTraceTheTransactionUsingTheTransactionTracer() {
     when(blockchainQueries.getBlockchain()).thenReturn(blockchain);
 
     when(blockchain.getBlockByHash(block.getHash())).thenReturn(Optional.of(block));
+    when(blockchain.getBlockHeader(genesis.getHash())).thenReturn(Optional.of(genesis.getHeader()));
 
-    when(transactionTracer.traceTransactionToFile(eq(block.getHash()), any(), any()))
+    when(transactionTracer.traceTransactionToFile(
+            any(MutableWorldState.class), eq(block.getHash()), any(), any()))
         .thenReturn(paths);
     final JsonRpcSuccessResponse response =
         (JsonRpcSuccessResponse) debugStandardTraceBlockToFile.response(request);
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStorageRangeAtTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStorageRangeAtTest.java
index 6b589458c10..5767b1b0085 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStorageRangeAtTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugStorageRangeAtTest.java
@@ -18,27 +18,31 @@
 import static org.assertj.core.api.Assertions.entry;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockReplay;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.Tracer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.DebugStorageRangeAtResult;
 import org.hyperledger.besu.ethereum.api.query.BlockWithMetadata;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.AccountStorageEntry;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.account.AccountStorageEntry;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -47,11 +51,13 @@
 import java.util.NavigableMap;
 import java.util.Optional;
 import java.util.TreeMap;
+import java.util.function.Function;
 
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.units.bigints.UInt256;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Answers;
 import org.mockito.invocation.InvocationOnMock;
 
 public class DebugStorageRangeAtTest {
@@ -60,16 +66,16 @@ public class DebugStorageRangeAtTest {
   private static final Bytes32 START_KEY_HASH = Bytes32.fromHexString("0x22");
   private final Blockchain blockchain = mock(Blockchain.class);
   private final BlockchainQueries blockchainQueries = mock(BlockchainQueries.class);
-  private final BlockReplay blockReplay = mock(BlockReplay.class);
+  private final BlockReplay blockReplay = mock(BlockReplay.class, Answers.RETURNS_DEEP_STUBS);
   private final DebugStorageRangeAt debugStorageRangeAt =
       new DebugStorageRangeAt(blockchainQueries, blockReplay);
-  private final MutableWorldState worldState = mock(MutableWorldState.class);
+  private final Tracer.TraceableState worldState = mock(Tracer.TraceableState.class);
   private final Account account = mock(Account.class);
   private final MainnetTransactionProcessor transactionProcessor =
       mock(MainnetTransactionProcessor.class);
   private final Transaction transaction = mock(Transaction.class);
 
-  private final BlockHeader blockHeader = mock(BlockHeader.class);
+  private final BlockHeader blockHeader = mock(BlockHeader.class, Answers.RETURNS_DEEP_STUBS);
   private final Hash blockHash =
       Hash.fromHexString("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
   private final Hash transactionHash =
@@ -89,7 +95,8 @@ public void nameShouldBeDebugStorageRangeAt() {
   @Test
   public void shouldRetrieveStorageRange_fullValues() {
     final TransactionWithMetadata transactionWithMetadata =
-        new TransactionWithMetadata(transaction, 12L, blockHash, TRANSACTION_INDEX);
+        new TransactionWithMetadata(
+            transaction, 12L, Optional.empty(), blockHash, TRANSACTION_INDEX);
     final BlockWithMetadata<TransactionWithMetadata, Hash> blockWithMetadata =
         new BlockWithMetadata<>(
             blockHeader,
@@ -111,10 +118,19 @@ public void shouldRetrieveStorageRange_fullValues() {
                 }));
 
     when(blockchainQueries.blockByHash(blockHash)).thenReturn(Optional.of(blockWithMetadata));
+    doAnswer(
+            invocation ->
+                invocation
+                    .<Function<MutableWorldState, Optional<? extends JsonRpcResponse>>>getArgument(
+                        1)
+                    .apply(worldState))
+        .when(blockchainQueries)
+        .getAndMapWorldState(any(), any());
     when(blockchainQueries.transactionByBlockHashAndIndex(blockHash, TRANSACTION_INDEX))
         .thenReturn(Optional.of(transactionWithMetadata));
     when(worldState.get(accountAddress)).thenReturn(account);
-    when(blockReplay.afterTransactionInBlock(eq(blockHash), eq(transactionHash), any()))
+    when(blockReplay.afterTransactionInBlock(
+            any(Tracer.TraceableState.class), any(Hash.class), eq(transactionHash), any()))
         .thenAnswer(this::callAction);
 
     final List<AccountStorageEntry> entries = new ArrayList<>();
@@ -151,8 +167,9 @@ public void shouldRetrieveStorageRange_fullValues() {
   }
 
   private Object callAction(final InvocationOnMock invocation) {
+    //noinspection rawtypes
     return Optional.of(
-        ((BlockReplay.TransactionAction) invocation.getArgument(2))
-            .performAction(transaction, blockHeader, blockchain, worldState, transactionProcessor));
+        ((BlockReplay.TransactionAction) invocation.getArgument(3))
+            .performAction(transaction, blockHeader, blockchain, transactionProcessor, Wei.ZERO));
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByHashTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByHashTest.java
index 1fb5079a49c..253dffb1dce 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByHashTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByHashTest.java
@@ -16,38 +16,66 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTrace;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.Tracer;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.debug.TraceFrame;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.function.Function;
 
 import org.apache.tuweni.bytes.Bytes;
+import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Answers;
 
 public class DebugTraceBlockByHashTest {
 
   private final BlockTracer blockTracer = mock(BlockTracer.class);
+
+  private final BlockchainQueries blockchainQueries =
+      mock(BlockchainQueries.class, Answers.RETURNS_DEEP_STUBS);
+  private final MutableWorldState mutableWorldState = mock(MutableWorldState.class);
+  private final BlockHeader blockHeader = mock(BlockHeader.class, Answers.RETURNS_DEEP_STUBS);
   private final DebugTraceBlockByHash debugTraceBlockByHash =
-      new DebugTraceBlockByHash(() -> blockTracer);
+      new DebugTraceBlockByHash(() -> blockTracer, () -> blockchainQueries);
 
   private final Hash blockHash =
       Hash.fromHexString("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
 
+  @Before
+  public void setUp() {
+    doAnswer(
+            invocation ->
+                invocation
+                    .<Function<MutableWorldState, Optional<? extends JsonRpcResponse>>>getArgument(
+                        1)
+                    .apply(mutableWorldState))
+        .when(blockchainQueries)
+        .getAndMapWorldState(any(), any());
+    when(blockchainQueries.getBlockHeaderByHash(any(Hash.class)))
+        .thenReturn(Optional.of(blockHeader));
+  }
+
   @Test
   public void nameShouldBeDebugTraceBlockByHash() {
     assertThat(debugTraceBlockByHash.getName()).isEqualTo("debug_traceBlockByHash");
@@ -63,9 +91,9 @@ public void shouldReturnCorrectResponse() {
         new TraceFrame(
             12,
             Optional.of("NONE"),
-            Gas.of(45),
-            Optional.of(Gas.of(56)),
-            Gas.ZERO,
+            45L,
+            OptionalLong.of(56L),
+            0L,
             2,
             Optional.empty(),
             null,
@@ -99,7 +127,8 @@ public void shouldReturnCorrectResponse() {
     when(transaction2Trace.getResult()).thenReturn(transaction2Result);
     when(transaction1Result.getOutput()).thenReturn(Bytes.fromHexString("1234"));
     when(transaction2Result.getOutput()).thenReturn(Bytes.fromHexString("1234"));
-    when(blockTracer.trace(eq(blockHash), any())).thenReturn(Optional.of(blockTrace));
+    when(blockTracer.trace(any(Tracer.TraceableState.class), eq(blockHash), any()))
+        .thenReturn(Optional.of(blockTrace));
 
     final JsonRpcSuccessResponse response =
         (JsonRpcSuccessResponse) debugTraceBlockByHash.response(request);
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByNumberTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByNumberTest.java
index bd6477a8d83..2b78ec562da 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByNumberTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockByNumberTest.java
@@ -18,36 +18,45 @@
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTrace;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.Tracer;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.DebugTraceTransactionResult;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.debug.TraceFrame;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 
 import java.util.Collection;
 import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.function.Function;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.junit.Test;
+import org.mockito.Answers;
 
 public class DebugTraceBlockByNumberTest {
 
-  private final BlockchainQueries blockchain = mock(BlockchainQueries.class);
-  private final BlockTracer blockTracer = mock(BlockTracer.class);
+  private final BlockchainQueries blockchainQueries =
+      mock(BlockchainQueries.class, Answers.RETURNS_DEEP_STUBS);
+
+  private final Tracer.TraceableState worldState = mock(Tracer.TraceableState.class);
+  private final BlockTracer blockTracer = mock(BlockTracer.class, Answers.RETURNS_DEEP_STUBS);
   private final DebugTraceBlockByNumber debugTraceBlockByNumber =
-      new DebugTraceBlockByNumber(() -> blockTracer, blockchain);
+      new DebugTraceBlockByNumber(() -> blockTracer, blockchainQueries);
 
   private final Hash blockHash =
       Hash.fromHexString("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
@@ -68,9 +77,9 @@ public void shouldReturnCorrectResponse() {
         new TraceFrame(
             12,
             Optional.of("NONE"),
-            Gas.of(45),
-            Optional.of(Gas.of(56)),
-            Gas.ZERO,
+            45L,
+            OptionalLong.of(56L),
+            0L,
             2,
             Optional.empty(),
             null,
@@ -104,8 +113,20 @@ public void shouldReturnCorrectResponse() {
     when(transaction2Trace.getResult()).thenReturn(transaction2Result);
     when(transaction1Result.getOutput()).thenReturn(Bytes.fromHexString("1234"));
     when(transaction2Result.getOutput()).thenReturn(Bytes.fromHexString("1234"));
-    when(blockchain.getBlockHashByNumber(blockNumber)).thenReturn(Optional.of(blockHash));
-    when(blockTracer.trace(eq(blockHash), any())).thenReturn(Optional.of(blockTrace));
+    when(blockchainQueries.getBlockHashByNumber(blockNumber)).thenReturn(Optional.of(blockHash));
+    when(blockchainQueries.getBlockHeaderByHash(any(Hash.class)))
+        .thenReturn(Optional.of(mock(BlockHeader.class, Answers.RETURNS_DEEP_STUBS)));
+
+    doAnswer(
+            invocation ->
+                invocation
+                    .<Function<MutableWorldState, ? extends Optional<? extends JsonRpcResponse>>>
+                        getArgument(1)
+                    .apply(worldState))
+        .when(blockchainQueries)
+        .getAndMapWorldState(any(), any());
+    when(blockTracer.trace(any(Tracer.TraceableState.class), any(Hash.class), any()))
+        .thenReturn(Optional.of(blockTrace));
 
     final JsonRpcSuccessResponse response =
         (JsonRpcSuccessResponse) debugTraceBlockByNumber.response(request);
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockTest.java
index cd4651bc5d7..df337f44f2f 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceBlockTest.java
@@ -18,39 +18,49 @@
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTrace;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockTracer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.Tracer;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.query.BlockWithMetadata;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.debug.TraceFrame;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Optional;
+import java.util.OptionalLong;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.junit.Test;
+import org.mockito.Answers;
 import org.mockito.Mockito;
 
 public class DebugTraceBlockTest {
 
   private final BlockTracer blockTracer = mock(BlockTracer.class);
-  private final BlockchainQueries blockchainQueries = mock(BlockchainQueries.class);
+  private final WorldStateArchive archive =
+      mock(WorldStateArchive.class, Answers.RETURNS_DEEP_STUBS);
+  private final Blockchain blockchain = mock(Blockchain.class);
+  private final BlockchainQueries blockchainQueries =
+      spy(new BlockchainQueries(blockchain, archive));
   private final DebugTraceBlock debugTraceBlock =
       new DebugTraceBlock(() -> blockTracer, new MainnetBlockHeaderFunctions(), blockchainQueries);
 
@@ -81,9 +91,9 @@ public void shouldReturnCorrectResponse() {
         new TraceFrame(
             12,
             Optional.of("NONE"),
-            Gas.of(45),
-            Optional.of(Gas.of(56)),
-            Gas.ZERO,
+            45L,
+            OptionalLong.of(56L),
+            0L,
             2,
             Optional.empty(),
             null,
@@ -117,17 +127,22 @@ public void shouldReturnCorrectResponse() {
     when(transaction2Trace.getResult()).thenReturn(transaction2Result);
     when(transaction1Result.getOutput()).thenReturn(Bytes.fromHexString("1234"));
     when(transaction2Result.getOutput()).thenReturn(Bytes.fromHexString("1234"));
-    when(blockTracer.trace(Mockito.eq(block), any())).thenReturn(Optional.of(blockTrace));
-
-    when(blockchainQueries.blockByHash(parentBlock.getHash()))
-        .thenReturn(
-            Optional.of(
-                new BlockWithMetadata<>(
-                    parentBlock.getHeader(),
-                    Collections.emptyList(),
-                    Collections.emptyList(),
-                    parentBlock.getHeader().getDifficulty(),
-                    parentBlock.calculateSize())));
+    when(blockTracer.trace(any(Tracer.TraceableState.class), Mockito.eq(block), any()))
+        .thenReturn(Optional.of(blockTrace));
+
+    when(blockchain.getBlockHeader(parentBlock.getHash()))
+        .thenReturn(Optional.of(parentBlock.getHeader()));
+    doAnswer(
+            invocation ->
+                Optional.of(
+                    new BlockWithMetadata<>(
+                        parentBlock.getHeader(),
+                        Collections.emptyList(),
+                        Collections.emptyList(),
+                        parentBlock.getHeader().getDifficulty(),
+                        parentBlock.calculateSize())))
+        .when(blockchainQueries)
+        .blockByHash(parentBlock.getHash());
 
     final JsonRpcSuccessResponse response =
         (JsonRpcSuccessResponse) debugTraceBlock.response(request);
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceTransactionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceTransactionTest.java
index feaa719ba00..c7c0aca44a6 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceTransactionTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/DebugTraceTransactionTest.java
@@ -17,23 +17,26 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.Tracer;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTracer;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.DebugTraceTransactionResult;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.StructLog;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.debug.TraceFrame;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.vm.DebugOperationTracer;
@@ -43,25 +46,47 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.function.Function;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
+import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Answers;
 
 public class DebugTraceTransactionTest {
 
-  private final BlockchainQueries blockchain = mock(BlockchainQueries.class);
+  private final BlockchainQueries blockchainQueries =
+      mock(BlockchainQueries.class, Answers.RETURNS_DEEP_STUBS);
+  private final BlockHeader blockHeader = mock(BlockHeader.class, Answers.RETURNS_DEEP_STUBS);
+  private final MutableWorldState mutableWorldState = mock(MutableWorldState.class);
   private final TransactionTracer transactionTracer = mock(TransactionTracer.class);
   private final DebugTraceTransaction debugTraceTransaction =
-      new DebugTraceTransaction(blockchain, transactionTracer);
+      new DebugTraceTransaction(blockchainQueries, transactionTracer);
   private final Transaction transaction = mock(Transaction.class);
 
-  private final BlockHeader blockHeader = mock(BlockHeader.class);
   private final Hash blockHash =
       Hash.fromHexString("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
   private final Hash transactionHash =
       Hash.fromHexString("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
 
+  @Before
+  public void setup() {
+    doAnswer(__ -> Optional.of(blockHeader))
+        .when(blockchainQueries)
+        .getBlockHeaderByHash(any(Hash.class));
+
+    doAnswer(
+            invocation ->
+                invocation
+                    .<Function<MutableWorldState, Optional<? extends JsonRpcResponse>>>getArgument(
+                        1)
+                    .apply(mutableWorldState))
+        .when(blockchainQueries)
+        .getAndMapWorldState(any(), any());
+  }
+
   @Test
   public void nameShouldBeDebugTraceTransaction() {
     assertThat(debugTraceTransaction.getName()).isEqualTo("debug_traceTransaction");
@@ -70,7 +95,7 @@ public void nameShouldBeDebugTraceTransaction() {
   @Test
   public void shouldTraceTheTransactionUsingTheTransactionTracer() {
     final TransactionWithMetadata transactionWithMetadata =
-        new TransactionWithMetadata(transaction, 12L, blockHash, 2);
+        new TransactionWithMetadata(transaction, 12L, Optional.empty(), blockHash, 2);
     final Map<String, Boolean> map = new HashMap<>();
     map.put("disableStorage", true);
     final Object[] params = new Object[] {transactionHash, map};
@@ -91,9 +116,9 @@ public void shouldTraceTheTransactionUsingTheTransactionTracer() {
         new TraceFrame(
             12,
             Optional.of("NONE"),
-            Gas.of(45),
-            Optional.of(Gas.of(56)),
-            Gas.ZERO,
+            45L,
+            OptionalLong.of(56L),
+            0L,
             2,
             Optional.empty(),
             null,
@@ -118,12 +143,14 @@ public void shouldTraceTheTransactionUsingTheTransactionTracer() {
     when(transaction.getGasLimit()).thenReturn(100L);
     when(result.getGasRemaining()).thenReturn(27L);
     when(result.getOutput()).thenReturn(Bytes.fromHexString("1234"));
-    when(blockHeader.getNumber()).thenReturn(12L);
-    when(blockchain.headBlockNumber()).thenReturn(12L);
-    when(blockchain.transactionByHash(transactionHash))
+    when(blockchainQueries.headBlockNumber()).thenReturn(12L);
+    when(blockchainQueries.transactionByHash(transactionHash))
         .thenReturn(Optional.of(transactionWithMetadata));
     when(transactionTracer.traceTransaction(
-            eq(blockHash), eq(transactionHash), any(DebugOperationTracer.class)))
+            any(Tracer.TraceableState.class),
+            eq(blockHash),
+            eq(transactionHash),
+            any(DebugOperationTracer.class)))
         .thenReturn(Optional.of(transactionTrace));
     final JsonRpcSuccessResponse response =
         (JsonRpcSuccessResponse) debugTraceTransaction.response(request);
@@ -156,9 +183,9 @@ public void shouldNotTraceTheTransactionIfNotFound() {
         new TraceFrame(
             12,
             Optional.of("NONE"),
-            Gas.of(45),
-            Optional.of(Gas.of(56)),
-            Gas.ZERO,
+            45L,
+            OptionalLong.of(56L),
+            0L,
             2,
             Optional.empty(),
             null,
@@ -183,11 +210,13 @@ public void shouldNotTraceTheTransactionIfNotFound() {
     when(transaction.getGasLimit()).thenReturn(100L);
     when(result.getGasRemaining()).thenReturn(27L);
     when(result.getOutput()).thenReturn(Bytes.fromHexString("1234"));
-    when(blockHeader.getNumber()).thenReturn(12L);
-    when(blockchain.headBlockNumber()).thenReturn(12L);
-    when(blockchain.transactionByHash(transactionHash)).thenReturn(Optional.empty());
+    when(blockchainQueries.headBlockNumber()).thenReturn(12L);
+    when(blockchainQueries.transactionByHash(transactionHash)).thenReturn(Optional.empty());
     when(transactionTracer.traceTransaction(
-            eq(blockHash), eq(transactionHash), any(DebugOperationTracer.class)))
+            any(Tracer.TraceableState.class),
+            eq(blockHash),
+            eq(transactionHash),
+            any(DebugOperationTracer.class)))
         .thenReturn(Optional.of(transactionTrace));
     final JsonRpcSuccessResponse response =
         (JsonRpcSuccessResponse) debugTraceTransaction.response(request);
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthBlockNumberTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthBlockNumberTest.java
index 697bfac100a..373bbbf4b46 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthBlockNumberTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthBlockNumberTest.java
@@ -63,6 +63,6 @@ public void shouldReturnCorrectResult() {
         new JsonRpcSuccessResponse(request.getRequest().getId(), Quantity.create(headBlockNumber));
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCallTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCallTest.java
index 51460b98888..5bdda906415 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCallTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCallTest.java
@@ -15,27 +15,37 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.catchThrowable;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.BLOCK_NOT_FOUND;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.INTERNAL_ERROR;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.chain.ChainHead;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.mainnet.ImmutableTransactionValidationParams;
+import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
 import org.hyperledger.besu.ethereum.transaction.CallParameter;
+import org.hyperledger.besu.ethereum.transaction.PreCloseStateHandler;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulatorResult;
 
@@ -45,6 +55,8 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
@@ -53,12 +65,20 @@ public class EthCallTest {
 
   private EthCall method;
 
+  @Mock private Blockchain blockchain;
+  @Mock ChainHead chainHead;
   @Mock private BlockchainQueries blockchainQueries;
   @Mock private TransactionSimulator transactionSimulator;
 
+  @Mock private BlockHeader blockHeader;
+
+  @Captor ArgumentCaptor<PreCloseStateHandler<Optional<JsonRpcResponse>>> mapperCaptor;
+
   @Before
   public void setUp() {
     method = new EthCall(blockchainQueries, transactionSimulator);
+    blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getBlockHash()).thenReturn(Hash.ZERO);
   }
 
   @Test
@@ -67,56 +87,49 @@ public void shouldReturnCorrectMethodName() {
   }
 
   @Test
-  public void shouldThrowInvalidJsonRpcParametersExceptionWhenMissingToField() {
-    final JsonCallParameter callParameter =
-        new JsonCallParameter(
-            Address.fromHexString("0x0"),
-            null,
-            Gas.ZERO,
-            Wei.ZERO,
-            null,
-            null,
-            Wei.ZERO,
-            Bytes.EMPTY,
-            null);
-    final JsonRpcRequestContext request = ethCallRequest(callParameter, "latest");
-
-    final Throwable thrown = catchThrowable(() -> method.response(request));
-
-    assertThat(thrown)
-        .isInstanceOf(InvalidJsonRpcParameters.class)
-        .hasNoCause()
-        .hasMessage("Missing \"to\" field in call arguments");
-  }
-
-  @Test
-  public void shouldReturnNullWhenProcessorReturnsEmpty() {
+  public void shouldReturnInternalErrorWhenProcessorReturnsEmpty() {
     final JsonRpcRequestContext request = ethCallRequest(callParameter(), "latest");
-    final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, null);
+    final JsonRpcResponse expectedResponse = new JsonRpcErrorResponse(null, INTERNAL_ERROR);
 
-    when(transactionSimulator.process(any(), any(), any(), anyLong())).thenReturn(Optional.empty());
+    when(blockchainQueries.getBlockchain()).thenReturn(blockchain);
+    when(blockchain.getChainHead()).thenReturn(chainHead);
+    when(transactionSimulator.process(any(), any(), any(), any(), any()))
+        .thenReturn(Optional.empty());
+
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getBaseFee()).thenReturn(Optional.of(Wei.ZERO));
+    when(chainHead.getBlockHeader()).thenReturn(blockHeader);
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
-    verify(transactionSimulator).process(any(), any(), any(), anyLong());
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+    verify(transactionSimulator).process(any(), any(), any(), any(), any());
   }
 
   @Test
   public void shouldAcceptRequestWhenMissingOptionalFields() {
     final JsonCallParameter callParameter =
-        new JsonCallParameter(
-            null, Address.fromHexString("0x0"), null, null, null, null, null, null, null);
+        new JsonCallParameter(null, null, null, null, null, null, null, null, Boolean.FALSE, null);
     final JsonRpcRequestContext request = ethCallRequest(callParameter, "latest");
     final JsonRpcResponse expectedResponse =
         new JsonRpcSuccessResponse(null, Bytes.of().toString());
 
-    mockTransactionProcessorSuccessResult(Bytes.of());
+    mockTransactionProcessorSuccessResult(expectedResponse);
+    when(blockchainQueries.getBlockchain()).thenReturn(blockchain);
+    when(blockchain.getChainHead()).thenReturn(chainHead);
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse);
-    verify(transactionSimulator).process(eq(callParameter), any(), any(), anyLong());
+    final TransactionSimulatorResult result = mock(TransactionSimulatorResult.class);
+    when(result.isSuccessful()).thenReturn(true);
+    when(result.getValidationResult()).thenReturn(ValidationResult.valid());
+    when(result.getOutput()).thenReturn(Bytes.of());
+    verify(transactionSimulator).process(any(), any(), any(), mapperCaptor.capture(), any());
+    assertThat(mapperCaptor.getValue().apply(mock(MutableWorldState.class), Optional.of(result)))
+        .isEqualTo(Optional.of(expectedResponse));
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+    verify(transactionSimulator).process(eq(callParameter), any(), any(), any(), any());
   }
 
   @Test
@@ -124,54 +137,194 @@ public void shouldReturnExecutionResultWhenExecutionIsSuccessful() {
     final JsonRpcRequestContext request = ethCallRequest(callParameter(), "latest");
     final JsonRpcResponse expectedResponse =
         new JsonRpcSuccessResponse(null, Bytes.of(1).toString());
-    mockTransactionProcessorSuccessResult(Bytes.of(1));
+    mockTransactionProcessorSuccessResult(expectedResponse);
+    when(blockchainQueries.getBlockchain()).thenReturn(blockchain);
+    when(blockchain.getChainHead()).thenReturn(chainHead);
+
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getBaseFee()).thenReturn(Optional.of(Wei.ZERO));
+    when(chainHead.getBlockHeader()).thenReturn(blockHeader);
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse);
-    verify(transactionSimulator).process(eq(callParameter()), any(), any(), anyLong());
+    final TransactionSimulatorResult result = mock(TransactionSimulatorResult.class);
+    when(result.isSuccessful()).thenReturn(true);
+    when(result.getValidationResult()).thenReturn(ValidationResult.valid());
+    when(result.getOutput()).thenReturn(Bytes.of(1));
+    verify(transactionSimulator).process(any(), any(), any(), mapperCaptor.capture(), any());
+    assertThat(mapperCaptor.getValue().apply(mock(MutableWorldState.class), Optional.of(result)))
+        .isEqualTo(Optional.of(expectedResponse));
+
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+    verify(transactionSimulator).process(eq(callParameter()), any(), any(), any(), any());
+    verify(blockchainQueries, atLeastOnce()).getBlockchain();
+    verifyNoMoreInteractions(blockchainQueries);
   }
 
   @Test
   public void shouldUseCorrectBlockNumberWhenLatest() {
     final JsonRpcRequestContext request = ethCallRequest(callParameter(), "latest");
-    when(blockchainQueries.headBlockNumber()).thenReturn(11L);
-    when(transactionSimulator.process(any(), any(), any(), anyLong())).thenReturn(Optional.empty());
+    when(blockchainQueries.getBlockchain()).thenReturn(blockchain);
+    when(blockchain.getChainHead()).thenReturn(chainHead);
+    when(transactionSimulator.process(any(), any(), any(), any(), any()))
+        .thenReturn(Optional.empty());
+
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getBaseFee()).thenReturn(Optional.of(Wei.ZERO));
+    when(chainHead.getBlockHeader()).thenReturn(blockHeader);
 
     method.response(request);
 
-    verify(transactionSimulator).process(any(), any(), any(), eq(11L));
+    verify(blockchainQueries, atLeastOnce()).getBlockchain();
+    verify(transactionSimulator).process(any(), any(), any(), any(), any());
   }
 
   @Test
   public void shouldUseCorrectBlockNumberWhenEarliest() {
     final JsonRpcRequestContext request = ethCallRequest(callParameter(), "earliest");
-    when(transactionSimulator.process(any(), any(), any(), anyLong())).thenReturn(Optional.empty());
+    when(blockchainQueries.getBlockHashByNumber(anyLong())).thenReturn(Optional.of(Hash.ZERO));
+    when(transactionSimulator.process(any(), any(), any(), any(), any()))
+        .thenReturn(Optional.empty());
+    when(blockchainQueries.getBlockHeaderByHash(Hash.ZERO))
+        .thenReturn(Optional.of(mock(BlockHeader.class)));
     method.response(request);
 
-    verify(transactionSimulator).process(any(), any(), any(), eq(0L));
+    verify(blockchainQueries).getBlockHeaderByHash(eq(Hash.ZERO));
+    verify(transactionSimulator).process(any(), any(), any(), any(), any());
+  }
+
+  @Test
+  public void shouldUseCorrectBlockNumberWhenSafe() {
+    final JsonRpcRequestContext request = ethCallRequest(callParameter(), "safe");
+    when(blockchainQueries.getBlockHeaderByHash(Hash.ZERO)).thenReturn(Optional.of(blockHeader));
+    when(blockchainQueries.safeBlockHeader()).thenReturn(Optional.of(blockHeader));
+    when(transactionSimulator.process(any(), any(), any(), any(), any()))
+        .thenReturn(Optional.empty());
+    method.response(request);
+
+    verify(blockchainQueries).getBlockHeaderByHash(Hash.ZERO);
+    verify(blockchainQueries).safeBlockHeader();
+    verify(transactionSimulator).process(any(), any(), any(), any(), any());
+  }
+
+  @Test
+  public void shouldUseCorrectBlockNumberWhenFinalized() {
+    final JsonRpcRequestContext request = ethCallRequest(callParameter(), "finalized");
+    when(blockchainQueries.getBlockHeaderByHash(Hash.ZERO)).thenReturn(Optional.of(blockHeader));
+    when(blockchainQueries.finalizedBlockHeader()).thenReturn(Optional.of(blockHeader));
+    when(transactionSimulator.process(any(), any(), any(), any(), any()))
+        .thenReturn(Optional.empty());
+    method.response(request);
+
+    verify(blockchainQueries).getBlockHeaderByHash(Hash.ZERO);
+    verify(blockchainQueries).finalizedBlockHeader();
+    verify(transactionSimulator).process(any(), any(), any(), any(), any());
   }
 
   @Test
   public void shouldUseCorrectBlockNumberWhenSpecified() {
     final JsonRpcRequestContext request = ethCallRequest(callParameter(), Quantity.create(13L));
-    when(transactionSimulator.process(any(), any(), any(), anyLong())).thenReturn(Optional.empty());
+    when(blockchainQueries.headBlockNumber()).thenReturn(14L);
+    when(blockchainQueries.getBlockHashByNumber(anyLong())).thenReturn(Optional.of(Hash.ZERO));
+    when(blockchainQueries.getBlockHeaderByHash(Hash.ZERO))
+        .thenReturn(Optional.of(mock(BlockHeader.class)));
+    when(transactionSimulator.process(any(), any(), any(), any(), any()))
+        .thenReturn(Optional.empty());
+
+    method.response(request);
+
+    verify(blockchainQueries).getBlockHeaderByHash(eq(Hash.ZERO));
+    verify(transactionSimulator).process(any(), any(), any(), any(), any());
+  }
+
+  @Test
+  public void shouldReturnBlockNotFoundWhenInvalidBlockNumberSpecified() {
+    final JsonRpcRequestContext request = ethCallRequest(callParameter(), Quantity.create(33L));
+    when(blockchainQueries.headBlockNumber()).thenReturn(14L);
+    final JsonRpcResponse expectedResponse = new JsonRpcErrorResponse(null, BLOCK_NOT_FOUND);
+
+    final JsonRpcResponse response = method.response(request);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
+
+    verify(blockchainQueries).headBlockNumber();
+  }
+
+  @Test
+  public void shouldAutoSelectIsAllowedExceedingBalanceToTrueWhenGasPriceIsZero() {
+    final JsonCallParameter callParameters = callParameter(Wei.ZERO, null, null);
+    internalAutoSelectIsAllowedExceedingBalance(callParameters, Optional.empty(), true);
+  }
+
+  @Test
+  public void shouldAutoSelectIsAllowedExceedingBalanceToTrueWhenGasPriceIsZeroAfterEIP1559() {
+    final JsonCallParameter callParameters = callParameter(Wei.ZERO, null, null);
+    internalAutoSelectIsAllowedExceedingBalance(callParameters, Optional.of(Wei.ONE), true);
+  }
+
+  @Test
+  public void shouldAutoSelectIsAllowedExceedingBalanceToFalseWhenGasPriceIsNotZero() {
+    final JsonCallParameter callParameters = callParameter(Wei.ONE, null, null);
+    internalAutoSelectIsAllowedExceedingBalance(callParameters, Optional.empty(), false);
+  }
+
+  @Test
+  public void shouldAutoSelectIsAllowedExceedingBalanceToFalseWhenGasPriceIsNotZeroAfterEIP1559() {
+    final JsonCallParameter callParameters = callParameter(Wei.ONE, null, null);
+    internalAutoSelectIsAllowedExceedingBalance(callParameters, Optional.of(Wei.ONE), false);
+  }
+
+  @Test
+  public void shouldAutoSelectIsAllowedExceedingBalanceToTrueWhenFeesAreZero() {
+    final JsonCallParameter callParameters = callParameter(null, Wei.ZERO, Wei.ZERO);
+    internalAutoSelectIsAllowedExceedingBalance(callParameters, Optional.of(Wei.ONE), true);
+  }
+
+  @Test
+  public void shouldAutoSelectIsAllowedExceedingBalanceToFalseWhenFeesAreZero() {
+    final JsonCallParameter callParameters = callParameter(null, Wei.ONE, Wei.ONE);
+    internalAutoSelectIsAllowedExceedingBalance(callParameters, Optional.of(Wei.ONE), false);
+  }
+
+  private void internalAutoSelectIsAllowedExceedingBalance(
+      final JsonCallParameter callParameter,
+      final Optional<Wei> baseFee,
+      final boolean isAllowedExceedingBalance) {
+    final JsonRpcRequestContext request = ethCallRequest(callParameter, "latest");
+
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getBaseFee()).thenReturn(baseFee);
+    when(blockchainQueries.getBlockchain()).thenReturn(blockchain);
+    when(blockchain.getChainHead()).thenReturn(chainHead);
+    when(chainHead.getBlockHeader()).thenReturn(blockHeader);
 
     method.response(request);
 
-    verify(transactionSimulator).process(any(), any(), any(), eq(13L));
+    final TransactionValidationParams transactionValidationParams =
+        ImmutableTransactionValidationParams.builder()
+            .from(TransactionValidationParams.transactionSimulator())
+            .isAllowExceedingBalance(isAllowedExceedingBalance)
+            .build();
+
+    verify(transactionSimulator)
+        .process(any(), eq(transactionValidationParams), any(), any(), any());
   }
 
   private JsonCallParameter callParameter() {
+    return callParameter(Wei.ZERO, null, null);
+  }
+
+  private JsonCallParameter callParameter(
+      final Wei gasPrice, final Wei maxFeesPerGas, final Wei maxPriorityFeesPerGas) {
     return new JsonCallParameter(
         Address.fromHexString("0x0"),
         Address.fromHexString("0x0"),
-        Gas.ZERO,
-        Wei.ZERO,
-        null,
-        null,
+        0L,
+        gasPrice,
+        maxFeesPerGas,
+        maxPriorityFeesPerGas,
         Wei.ZERO,
         Bytes.EMPTY,
+        null,
         null);
   }
 
@@ -181,12 +334,8 @@ private JsonRpcRequestContext ethCallRequest(
         new JsonRpcRequest("2.0", "eth_call", new Object[] {callParameter, blockNumberInHex}));
   }
 
-  private void mockTransactionProcessorSuccessResult(final Bytes output) {
-    final TransactionSimulatorResult result = mock(TransactionSimulatorResult.class);
-
-    when(result.getValidationResult()).thenReturn(ValidationResult.valid());
-    when(result.getOutput()).thenReturn(output);
-    when(transactionSimulator.process(any(), any(), any(), anyLong()))
-        .thenReturn(Optional.of(result));
+  private void mockTransactionProcessorSuccessResult(final JsonRpcResponse jsonRpcResponse) {
+    when(transactionSimulator.process(any(), any(), any(), any(), any()))
+        .thenReturn(Optional.of(jsonRpcResponse));
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthChainIdTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthChainIdTest.java
index b2a600f1ae8..2425b4299cc 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthChainIdTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthChainIdTest.java
@@ -50,7 +50,7 @@ public void shouldReturnChainId() {
 
     final JsonRpcResponse response = method.response(request());
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -60,7 +60,7 @@ public void shouldReturnNullWhenNoChainId() {
 
     final JsonRpcResponse response = method.response(request());
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   private JsonRpcRequestContext request() {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCoinbaseTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCoinbaseTest.java
index f682e27fca3..ddd0b7d4acb 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCoinbaseTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCoinbaseTest.java
@@ -19,6 +19,7 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
@@ -26,7 +27,6 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
-import org.hyperledger.besu.ethereum.core.Address;
 
 import java.util.Optional;
 
@@ -64,7 +64,7 @@ public void shouldReturnExpectedValueWhenMiningCoordinatorExists() {
     when(miningCoordinator.getCoinbase()).thenReturn(Optional.of(expectedAddress));
 
     final JsonRpcResponse actualResponse = method.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
     verify(miningCoordinator).getCoinbase();
     verifyNoMoreInteractions(miningCoordinator);
   }
@@ -77,7 +77,7 @@ public void shouldReturnErrorWhenCoinbaseNotSpecified() {
     when(miningCoordinator.getCoinbase()).thenReturn(Optional.empty());
 
     final JsonRpcResponse actualResponse = method.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   private JsonRpcRequestContext requestWithParams(final Object... params) {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCreateAccessListTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCreateAccessListTest.java
new file mode 100644
index 00000000000..06f9eed54e5
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCreateAccessListTest.java
@@ -0,0 +1,342 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.CreateAccessListResult;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.ethereum.transaction.CallParameter;
+import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
+import org.hyperledger.besu.ethereum.transaction.TransactionSimulatorResult;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.AccessListEntry;
+import org.hyperledger.besu.evm.tracing.AccessListOperationTracer;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.assertj.core.api.Assertions;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class EthCreateAccessListTest {
+
+  private final String METHOD = "eth_createAccessList";
+  private EthCreateAccessList method;
+
+  @Mock private BlockHeader blockHeader;
+  @Mock private Blockchain blockchain;
+  @Mock private BlockchainQueries blockchainQueries;
+  @Mock private TransactionSimulator transactionSimulator;
+  @Mock private WorldStateArchive worldStateArchive;
+
+  @Before
+  public void setUp() {
+    when(blockchainQueries.headBlockNumber()).thenReturn(1L);
+    when(blockchainQueries.getBlockchain()).thenReturn(blockchain);
+    when(blockchainQueries.getWorldStateArchive()).thenReturn(worldStateArchive);
+    when(blockchain.getBlockHeader(eq(1L))).thenReturn(Optional.of(blockHeader));
+    when(blockHeader.getGasLimit()).thenReturn(Long.MAX_VALUE);
+    when(blockHeader.getNumber()).thenReturn(1L);
+    when(worldStateArchive.isWorldStateAvailable(any(), any())).thenReturn(true);
+
+    method = new EthCreateAccessList(blockchainQueries, transactionSimulator);
+  }
+
+  @Test
+  public void shouldReturnCorrectMethodName() {
+    assertThat(method.getName()).isEqualTo(METHOD);
+  }
+
+  private JsonRpcRequestContext ethCreateAccessListRequest(final CallParameter callParameter) {
+    return new JsonRpcRequestContext(
+        new JsonRpcRequest("2.0", METHOD, new Object[] {callParameter}));
+  }
+
+  @Test
+  public void shouldReturnGasEstimateWhenTransientLegacyTransactionProcessorReturnsResultSuccess() {
+    final JsonRpcRequestContext request =
+        ethCreateAccessListRequest(legacyTransactionCallParameter(Wei.ZERO));
+    mockTransactionSimulatorResult(true, false, 1L);
+
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(null, new CreateAccessListResult(new ArrayList<>(), 1L));
+
+    Assertions.assertThat(method.response(request))
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldUseGasPriceParameterWhenIsPresent() {
+    final Wei gasPrice = Wei.of(1000);
+    final JsonRpcRequestContext request =
+        ethCreateAccessListRequest(legacyTransactionCallParameter(gasPrice));
+    mockTransactionSimulatorResult(true, false, 1L);
+
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(null, new CreateAccessListResult(new ArrayList<>(), 1L));
+
+    Assertions.assertThat(method.response(request))
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnGasEstimateErrorWhenGasPricePresentForEip1559Transaction() {
+    final JsonRpcRequestContext request =
+        ethCreateAccessListRequest(eip1559TransactionCallParameter(Optional.of(Wei.of(10))));
+    mockTransactionSimulatorResult(false, false, 1L);
+
+    Assertions.assertThatThrownBy(() -> method.response(request))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessageContaining("gasPrice cannot be used with baseFee or maxFeePerGas");
+  }
+
+  @Test
+  public void shouldReturnErrorWhenWorldStateIsNotAvailable() {
+    when(worldStateArchive.isWorldStateAvailable(any(), any())).thenReturn(false);
+    final JsonRpcRequestContext request =
+        ethCreateAccessListRequest(legacyTransactionCallParameter(Wei.ZERO));
+    mockTransactionSimulatorResult(false, false, 1L);
+
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(null, JsonRpcError.WORLD_STATE_UNAVAILABLE);
+
+    Assertions.assertThat(method.response(request))
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnErrorWhenTransactionReverted() {
+    final JsonRpcRequestContext request =
+        ethCreateAccessListRequest(legacyTransactionCallParameter(Wei.ZERO));
+    mockTransactionSimulatorResult(false, true, 1L);
+
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(null, JsonRpcError.REVERT_ERROR);
+
+    Assertions.assertThat(method.response(request))
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnEmptyAccessListIfNoParameterAndWithoutAccessedStorage() {
+    final List<AccessListEntry> expectedAccessList = new ArrayList<>();
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(null, new CreateAccessListResult(expectedAccessList, 1L));
+    final JsonRpcRequestContext request =
+        ethCreateAccessListRequest(eip1559TransactionCallParameter());
+    mockTransactionSimulatorResult(true, false, 1L);
+
+    Assertions.assertThat(method.response(request))
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
+    verify(transactionSimulator, times(1)).process(any(), any(), any(), anyLong());
+  }
+
+  @Test
+  public void shouldReturnAccessListIfNoParameterAndWithAccessedStorage() {
+    // Create a 1559 call without access lists
+    final JsonRpcRequestContext request =
+        ethCreateAccessListRequest(eip1559TransactionCallParameter());
+    // Create a list with one access list entry
+    final List<AccessListEntry> expectedAccessList = createAccessList();
+
+    // expect a list with the mocked access list
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(null, new CreateAccessListResult(expectedAccessList, 1L));
+    final AccessListOperationTracer tracer = createMockTracer(expectedAccessList);
+
+    // Set TransactionSimulator.process response
+    mockTransactionSimulatorResult(true, false, 1L);
+    Assertions.assertThat(responseWithMockTracer(request, tracer))
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
+    verify(transactionSimulator, times(2)).process(any(), any(), any(), anyLong());
+  }
+
+  @Test
+  public void shouldReturnEmptyAccessListIfNoAccessedStorage() {
+    // Create a list with one enter
+    final List<AccessListEntry> accessListParam = createAccessList();
+    // expect empty list
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(null, new CreateAccessListResult(new ArrayList<>(), 1L));
+    // create a request using the accessListParam
+    final JsonRpcRequestContext request =
+        ethCreateAccessListRequest(eip1559TransactionCallParameter(accessListParam));
+
+    // Set TransactionSimulator.process response
+    mockTransactionSimulatorResult(true, false, 1L);
+    Assertions.assertThat(method.response(request))
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
+    verify(transactionSimulator, times(1)).process(any(), any(), any(), anyLong());
+  }
+
+  @Test
+  public void shouldReturnAccessListIfParameterAndSameAccessedStorage() {
+    // Create a list with one access list entry
+    final List<AccessListEntry> expectedAccessList = createAccessList();
+    // Create a 1559 call with the expected access lists
+    final JsonRpcRequestContext request =
+        ethCreateAccessListRequest(eip1559TransactionCallParameter(expectedAccessList));
+
+    // expect a list with the mocked access list
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(null, new CreateAccessListResult(expectedAccessList, 1L));
+    final AccessListOperationTracer tracer = createMockTracer(expectedAccessList);
+
+    // Set TransactionSimulator.process response
+    mockTransactionSimulatorResult(true, false, 1L);
+    Assertions.assertThat(responseWithMockTracer(request, tracer))
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
+    verify(transactionSimulator, times(1)).process(any(), any(), any(), anyLong());
+  }
+
+  @Test
+  public void shouldReturnAccessListIfWithParameterAndDifferentAccessedStorage() {
+    // Create a list with one access list entry
+    final List<AccessListEntry> accessListParam = createAccessList();
+    // Create a 1559 call with the accessListParam
+    final JsonRpcRequestContext request =
+        ethCreateAccessListRequest(eip1559TransactionCallParameter(accessListParam));
+
+    // Create a list with one access list entry
+    final List<AccessListEntry> expectedAccessList = createAccessList();
+
+    // expect a list with the mocked access list
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(null, new CreateAccessListResult(expectedAccessList, 1L));
+    final AccessListOperationTracer tracer = createMockTracer(expectedAccessList);
+
+    // Set TransactionSimulator.process response
+    mockTransactionSimulatorResult(true, false, 1L);
+    Assertions.assertThat(responseWithMockTracer(request, tracer))
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
+    verify(transactionSimulator, times(2)).process(any(), any(), any(), anyLong());
+  }
+
+  private JsonRpcResponse responseWithMockTracer(
+      final JsonRpcRequestContext request, final AccessListOperationTracer tracer) {
+    try (final MockedStatic<AccessListOperationTracer> tracerMockedStatic =
+        Mockito.mockStatic(AccessListOperationTracer.class)) {
+      tracerMockedStatic.when(AccessListOperationTracer::create).thenReturn(tracer);
+      return method.response(request);
+    }
+  }
+
+  private AccessListOperationTracer createMockTracer(
+      final List<AccessListEntry> accessListEntries) {
+    final AccessListOperationTracer tracer = mock(AccessListOperationTracer.class);
+    when(tracer.getAccessList()).thenReturn(accessListEntries);
+    return tracer;
+  }
+
+  private void mockTransactionSimulatorResult(
+      final boolean isSuccessful, final boolean isReverted, final long estimateGas) {
+    final TransactionSimulatorResult mockTxSimResult = mock(TransactionSimulatorResult.class);
+    when(transactionSimulator.process(any(), any(), any(), anyLong()))
+        .thenReturn(Optional.of(mockTxSimResult));
+    final TransactionProcessingResult mockResult = mock(TransactionProcessingResult.class);
+    when(mockResult.getEstimateGasUsedByTransaction()).thenReturn(estimateGas);
+    when(mockResult.getRevertReason())
+        .thenReturn(isReverted ? Optional.of(Bytes.of(0)) : Optional.empty());
+    when(mockTxSimResult.getResult()).thenReturn(mockResult);
+    when(mockTxSimResult.isSuccessful()).thenReturn(isSuccessful);
+  }
+
+  private JsonCallParameter legacyTransactionCallParameter(final Wei gasPrice) {
+    return new JsonCallParameter(
+        Address.fromHexString("0x0"),
+        Address.fromHexString("0x0"),
+        0L,
+        gasPrice,
+        null,
+        null,
+        Wei.ZERO,
+        Bytes.EMPTY,
+        false,
+        null);
+  }
+
+  private CallParameter eip1559TransactionCallParameter() {
+    return eip1559TransactionCallParameter(Optional.empty(), null);
+  }
+
+  private CallParameter eip1559TransactionCallParameter(final Optional<Wei> gasPrice) {
+    return eip1559TransactionCallParameter(gasPrice, null);
+  }
+
+  private CallParameter eip1559TransactionCallParameter(
+      final List<AccessListEntry> accessListEntries) {
+    return eip1559TransactionCallParameter(Optional.empty(), accessListEntries);
+  }
+
+  private JsonCallParameter eip1559TransactionCallParameter(
+      final Optional<Wei> gasPrice, final List<AccessListEntry> accessListEntries) {
+    return new JsonCallParameter(
+        Address.fromHexString("0x0"),
+        Address.fromHexString("0x0"),
+        null,
+        gasPrice.orElse(null),
+        Wei.fromHexString("0x10"),
+        Wei.fromHexString("0x10"),
+        Wei.ZERO,
+        Bytes.EMPTY,
+        false,
+        accessListEntries);
+  }
+
+  private List<AccessListEntry> createAccessList() {
+    return List.of(
+        new AccessListEntry(Address.wrap(Bytes.random(Address.SIZE)), List.of(Bytes32.random())));
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java
index a05541bbe6a..7280560a5ac 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java
@@ -21,6 +21,8 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
@@ -32,10 +34,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.mainnet.ImmutableTransactionValidationParams;
 import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
@@ -44,8 +43,8 @@
 import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulatorResult;
-import org.hyperledger.besu.ethereum.vm.OperationTracer;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
 
 import java.util.Optional;
 
@@ -76,7 +75,7 @@ public void setUp() {
     when(blockchain.getBlockHeader(eq(1L))).thenReturn(Optional.of(blockHeader));
     when(blockHeader.getGasLimit()).thenReturn(Long.MAX_VALUE);
     when(blockHeader.getNumber()).thenReturn(1L);
-    when(worldStateArchive.isWorldStateAvailable(any())).thenReturn(true);
+    when(worldStateArchive.isWorldStateAvailable(any(), any())).thenReturn(true);
 
     method = new EthEstimateGas(blockchainQueries, transactionSimulator);
   }
@@ -101,7 +100,8 @@ public void shouldReturnErrorWhenTransientLegacyTransactionProcessorReturnsEmpty
         new JsonRpcErrorResponse(null, JsonRpcError.INTERNAL_ERROR);
 
     Assertions.assertThat(method.response(request))
-        .isEqualToComparingFieldByField(expectedResponse);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
   }
 
   @Test
@@ -118,7 +118,8 @@ public void shouldReturnErrorWhenTransientEip1559TransactionProcessorReturnsEmpt
         new JsonRpcErrorResponse(null, JsonRpcError.INTERNAL_ERROR);
 
     Assertions.assertThat(method.response(request))
-        .isEqualToComparingFieldByField(expectedResponse);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
   }
 
   @Test
@@ -130,7 +131,8 @@ public void shouldReturnGasEstimateWhenTransientLegacyTransactionProcessorReturn
     final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, Quantity.create(1L));
 
     Assertions.assertThat(method.response(request))
-        .isEqualToComparingFieldByField(expectedResponse);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
   }
 
   @Test
@@ -143,7 +145,8 @@ public void shouldUseGasPriceParameterWhenIsPresent() {
     final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, Quantity.create(1L));
 
     Assertions.assertThat(method.response(request))
-        .isEqualToComparingFieldByField(expectedResponse);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
   }
 
   @Test
@@ -153,7 +156,7 @@ public void shouldReturnGasEstimateErrorWhenGasPricePresentForEip1559Transaction
     mockTransientProcessorResultGasEstimate(1L, false, false);
     Assertions.assertThatThrownBy(() -> method.response(request))
         .isInstanceOf(InvalidJsonRpcParameters.class)
-        .hasMessageContaining("gasPrice cannot be used with baseFee or feeCap");
+        .hasMessageContaining("gasPrice cannot be used with baseFee or maxFeePerGas");
   }
 
   @Test
@@ -164,7 +167,8 @@ public void shouldReturnGasEstimateErrorWhenGasPricePresentForEip1559Transaction
 
     final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, Quantity.create(1L));
     Assertions.assertThat(method.response(request))
-        .isEqualToComparingFieldByField(expectedResponse);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
   }
 
   @Test
@@ -178,7 +182,8 @@ public void shouldReturnGasEstimateErrorWhenGasPricePresentForEip1559Transaction
         new JsonRpcErrorResponse(null, JsonRpcError.INTERNAL_ERROR);
 
     Assertions.assertThat(method.response(request))
-        .isEqualToComparingFieldByField(expectedResponse);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
   }
 
   @Test
@@ -191,7 +196,8 @@ public void shouldReturnGasEstimateErrorWhenGasPricePresentForEip1559Transaction
         new JsonRpcErrorResponse(null, JsonRpcError.INTERNAL_ERROR);
 
     Assertions.assertThat(method.response(request))
-        .isEqualToComparingFieldByField(expectedResponse);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
   }
 
   @Test
@@ -205,7 +211,8 @@ public void shouldReturnErrorWhenLegacyTransactionProcessorReturnsTxInvalidReaso
         new JsonRpcErrorResponse(null, JsonRpcError.TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE);
 
     Assertions.assertThat(method.response(request))
-        .isEqualToComparingFieldByField(expectedResponse);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
   }
 
   @Test
@@ -218,12 +225,13 @@ public void shouldReturnErrorWhenEip1559TransactionProcessorReturnsTxInvalidReas
         new JsonRpcErrorResponse(null, JsonRpcError.TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE);
 
     Assertions.assertThat(method.response(request))
-        .isEqualToComparingFieldByField(expectedResponse);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
   }
 
   @Test
   public void shouldReturnErrorWhenWorldStateIsNotAvailable() {
-    when(worldStateArchive.isWorldStateAvailable(any())).thenReturn(false);
+    when(worldStateArchive.isWorldStateAvailable(any(), any())).thenReturn(false);
     final JsonRpcRequestContext request =
         ethEstimateGasRequest(defaultLegacyTransactionCallParameter(Wei.ZERO));
     mockTransientProcessorResultGasEstimate(1L, false, false);
@@ -232,7 +240,8 @@ public void shouldReturnErrorWhenWorldStateIsNotAvailable() {
         new JsonRpcErrorResponse(null, JsonRpcError.WORLD_STATE_UNAVAILABLE);
 
     Assertions.assertThat(method.response(request))
-        .isEqualToComparingFieldByField(expectedResponse);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
   }
 
   @Test
@@ -245,7 +254,8 @@ public void shouldReturnErrorWhenTransactionReverted() {
         new JsonRpcErrorResponse(null, JsonRpcError.REVERT_ERROR);
 
     Assertions.assertThat(method.response(request))
-        .isEqualToComparingFieldByField(expectedResponse);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
   }
 
   @Test
@@ -343,13 +353,14 @@ private JsonCallParameter legacyTransactionCallParameter(
     return new JsonCallParameter(
         Address.fromHexString("0x0"),
         Address.fromHexString("0x0"),
-        Gas.ZERO,
+        0L,
         gasPrice,
         null,
         null,
         Wei.ZERO,
         Bytes.EMPTY,
-        isStrict);
+        isStrict,
+        null);
   }
 
   private CallParameter modifiedLegacyTransactionCallParameter(final Wei gasPrice) {
@@ -361,7 +372,8 @@ private CallParameter modifiedLegacyTransactionCallParameter(final Wei gasPrice)
         Optional.empty(),
         Optional.empty(),
         Wei.ZERO,
-        Bytes.EMPTY);
+        Bytes.EMPTY,
+        Optional.empty());
   }
 
   private CallParameter eip1559TransactionCallParameter() {
@@ -378,7 +390,8 @@ private JsonCallParameter eip1559TransactionCallParameter(final Optional<Wei> ga
         Wei.fromHexString("0x10"),
         Wei.ZERO,
         Bytes.EMPTY,
-        false);
+        false,
+        null);
   }
 
   private CallParameter modifiedEip1559TransactionCallParameter() {
@@ -390,7 +403,8 @@ private CallParameter modifiedEip1559TransactionCallParameter() {
         Optional.of(Wei.fromHexString("0x10")),
         Optional.of(Wei.fromHexString("0x10")),
         Wei.ZERO,
-        Bytes.EMPTY);
+        Bytes.EMPTY,
+        Optional.empty());
   }
 
   private JsonRpcRequestContext ethEstimateGasRequest(final CallParameter callParameter) {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthFeeHistoryTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthFeeHistoryTest.java
new file mode 100644
index 00000000000..24e00d2822a
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthFeeHistoryTest.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.FeeHistory;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.ImmutableFeeHistory;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.ImmutableFeeHistoryResult;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class EthFeeHistoryTest {
+  final BlockDataGenerator gen = new BlockDataGenerator();
+  private MutableBlockchain blockchain;
+  private EthFeeHistory method;
+  private ProtocolSchedule protocolSchedule;
+
+  @Before
+  public void setUp() {
+    protocolSchedule = mock(ProtocolSchedule.class);
+    final Block genesisBlock = gen.genesisBlock();
+    blockchain = createInMemoryBlockchain(genesisBlock);
+    gen.blockSequence(genesisBlock, 10)
+        .forEach(block -> blockchain.appendBlock(block, gen.receipts(block)));
+    method = new EthFeeHistory(protocolSchedule, blockchain);
+  }
+
+  @Test
+  public void params() {
+    final ProtocolSpec londonSpec = mock(ProtocolSpec.class);
+    when(londonSpec.getFeeMarket()).thenReturn(FeeMarket.london(5));
+    when(protocolSchedule.getForNextBlockHeader(any(), anyLong())).thenReturn(londonSpec);
+    // should fail because no required params given
+    assertThatThrownBy(this::feeHistoryRequest).isInstanceOf(InvalidJsonRpcParameters.class);
+    // should fail because newestBlock not given
+    assertThatThrownBy(() -> feeHistoryRequest("0x1")).isInstanceOf(InvalidJsonRpcParameters.class);
+    // should fail because blockCount not given
+    assertThatThrownBy(() -> feeHistoryRequest("latest"))
+        .isInstanceOf(InvalidJsonRpcParameters.class);
+    // should pass because both required params given
+    feeHistoryRequest("0x1", "latest");
+    // should pass because both required params and optional param given
+    feeHistoryRequest("0x1", "latest", new double[] {1, 20.4});
+    // should pass because both required params and optional param given
+    feeHistoryRequest("0x1", "latest", new double[] {1, 20.4});
+  }
+
+  @Test
+  public void allFieldsPresentForLatestBlock() {
+    final ProtocolSpec londonSpec = mock(ProtocolSpec.class);
+    when(londonSpec.getFeeMarket()).thenReturn(FeeMarket.london(5));
+    when(protocolSchedule.getForNextBlockHeader(
+            eq(blockchain.getChainHeadHeader()),
+            eq(blockchain.getChainHeadHeader().getTimestamp())))
+        .thenReturn(londonSpec);
+    final Object latest =
+        ((JsonRpcSuccessResponse) feeHistoryRequest("0x1", "latest", new double[] {100.0}))
+            .getResult();
+    assertThat(latest)
+        .isEqualTo(
+            FeeHistory.FeeHistoryResult.from(
+                ImmutableFeeHistory.builder()
+                    .oldestBlock(10)
+                    .baseFeePerGas(List.of(Wei.of(25496L), Wei.of(28683L)))
+                    .gasUsedRatio(List.of(0.9999999992132459))
+                    .reward(List.of(List.of(Wei.of(1524763764L))))
+                    .build()));
+  }
+
+  @Test
+  public void cantGetBlockHigherThanChainHead() {
+    assertThat(
+            ((JsonRpcErrorResponse) feeHistoryRequest("0x2", "11", new double[] {100.0}))
+                .getError())
+        .isEqualTo(JsonRpcError.INVALID_PARAMS);
+  }
+
+  @Test
+  public void blockCountBounds() {
+    assertThat(
+            ((JsonRpcErrorResponse) feeHistoryRequest("0x0", "latest", new double[] {100.0}))
+                .getError())
+        .isEqualTo(JsonRpcError.INVALID_PARAMS);
+    assertThat(
+            ((JsonRpcErrorResponse) feeHistoryRequest("0x401", "latest", new double[] {100.0}))
+                .getError())
+        .isEqualTo(JsonRpcError.INVALID_PARAMS);
+  }
+
+  @Test
+  public void doesntGoPastChainHeadWithHighBlockCount() {
+    final ProtocolSpec londonSpec = mock(ProtocolSpec.class);
+    when(londonSpec.getFeeMarket()).thenReturn(FeeMarket.london(5));
+    when(protocolSchedule.getForNextBlockHeader(
+            eq(blockchain.getChainHeadHeader()),
+            eq(blockchain.getChainHeadHeader().getTimestamp())))
+        .thenReturn(londonSpec);
+    final FeeHistory.FeeHistoryResult result =
+        (ImmutableFeeHistoryResult)
+            ((JsonRpcSuccessResponse) feeHistoryRequest("0x14", "latest")).getResult();
+    assertThat(Long.decode(result.getOldestBlock())).isEqualTo(0);
+    assertThat(result.getBaseFeePerGas()).hasSize(12);
+    assertThat(result.getGasUsedRatio()).hasSize(11);
+    assertThat(result.getReward()).isNull();
+  }
+
+  @Test
+  public void feeValuesAreInTheBlockCountAndHighestBlock() {
+    final ProtocolSpec londonSpec = mock(ProtocolSpec.class);
+    when(londonSpec.getFeeMarket()).thenReturn(FeeMarket.london(5));
+    when(protocolSchedule.getForNextBlockHeader(
+            eq(blockchain.getChainHeadHeader()),
+            eq(blockchain.getChainHeadHeader().getTimestamp())))
+        .thenReturn(londonSpec);
+    double[] percentile = new double[] {100.0};
+
+    final Object ninth =
+        ((JsonRpcSuccessResponse) feeHistoryRequest(2, "9", percentile)).getResult();
+    assertFeeMetadataSize(ninth, 2);
+
+    final Object eighth =
+        ((JsonRpcSuccessResponse) feeHistoryRequest(4, "8", percentile)).getResult();
+    assertFeeMetadataSize(eighth, 4);
+  }
+
+  @Test
+  public void feeValuesDontGoPastHighestBlock() {
+    final ProtocolSpec londonSpec = mock(ProtocolSpec.class);
+    when(londonSpec.getFeeMarket()).thenReturn(FeeMarket.london(5));
+    when(protocolSchedule.getForNextBlockHeader(
+            eq(blockchain.getChainHeadHeader()),
+            eq(blockchain.getChainHeadHeader().getTimestamp())))
+        .thenReturn(londonSpec);
+    double[] percentile = new double[] {100.0};
+
+    final Object second =
+        ((JsonRpcSuccessResponse) feeHistoryRequest(4, "2", percentile)).getResult();
+    assertFeeMetadataSize(second, 3);
+
+    final Object third =
+        ((JsonRpcSuccessResponse) feeHistoryRequest(11, "3", percentile)).getResult();
+    assertFeeMetadataSize(third, 4);
+  }
+
+  @Test
+  public void correctlyHandlesForkBlock() {
+    final ProtocolSpec londonSpec = mock(ProtocolSpec.class);
+    when(londonSpec.getFeeMarket()).thenReturn(FeeMarket.london(11));
+    when(protocolSchedule.getForNextBlockHeader(
+            eq(blockchain.getChainHeadHeader()),
+            eq(blockchain.getChainHeadHeader().getTimestamp())))
+        .thenReturn(londonSpec);
+    final FeeHistory.FeeHistoryResult result =
+        (FeeHistory.FeeHistoryResult)
+            ((JsonRpcSuccessResponse) feeHistoryRequest("0x1", "latest")).getResult();
+    assertThat(Wei.fromHexString(result.getBaseFeePerGas().get(1)))
+        .isEqualTo(FeeMarket.london(11).getInitialBasefee());
+  }
+
+  @Test
+  public void allZeroPercentilesForZeroBlock() {
+    final ProtocolSpec londonSpec = mock(ProtocolSpec.class);
+    when(londonSpec.getFeeMarket()).thenReturn(FeeMarket.london(5));
+    final BlockDataGenerator.BlockOptions blockOptions = BlockDataGenerator.BlockOptions.create();
+    blockOptions.hasTransactions(false);
+    blockOptions.setParentHash(blockchain.getChainHeadHash());
+    blockOptions.setBlockNumber(11);
+    final Block emptyBlock = gen.block(blockOptions);
+    blockchain.appendBlock(emptyBlock, gen.receipts(emptyBlock));
+    when(protocolSchedule.getForNextBlockHeader(
+            eq(blockchain.getChainHeadHeader()),
+            eq(blockchain.getChainHeadHeader().getTimestamp())))
+        .thenReturn(londonSpec);
+    final FeeHistory.FeeHistoryResult result =
+        (FeeHistory.FeeHistoryResult)
+            ((JsonRpcSuccessResponse) feeHistoryRequest("0x1", "latest", new double[] {100.0}))
+                .getResult();
+    assertThat(result.getReward()).isEqualTo(List.of(List.of("0x0")));
+  }
+
+  private void assertFeeMetadataSize(final Object feeObject, final int blockCount) {
+    assertThat(((ImmutableFeeHistoryResult) feeObject).getBaseFeePerGas().size())
+        .isEqualTo(blockCount + 1);
+    assertThat(((ImmutableFeeHistoryResult) feeObject).getReward().size()).isEqualTo(blockCount);
+    assertThat(((ImmutableFeeHistoryResult) feeObject).getGasUsedRatio().size())
+        .isEqualTo(blockCount);
+  }
+
+  private JsonRpcResponse feeHistoryRequest(final Object... params) {
+    return method.response(
+        new JsonRpcRequestContext(new JsonRpcRequest("2.0", "eth_feeHistory", params)));
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java
index 5a84dccabf8..043a87d92ce 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java
@@ -20,23 +20,23 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.ImmutableApiConfiguration;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.LogsBloomFilter;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
 
 import java.util.List;
 import java.util.Optional;
@@ -52,7 +52,7 @@
 @RunWith(MockitoJUnitRunner.class)
 public class EthGasPriceTest {
 
-  @Mock private EthHashMiningCoordinator miningCoordinator;
+  @Mock private PoWMiningCoordinator miningCoordinator;
   @Mock private Blockchain blockchain;
   private EthGasPrice method;
   private final String JSON_RPC_VERSION = "2.0";
@@ -89,7 +89,7 @@ public void shouldReturnMinValueWhenNoTransactionsExist() {
         .thenAnswer(invocation -> createEmptyBlock(invocation.getArgument(0, Long.class)));
 
     final JsonRpcResponse actualResponse = method.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
 
     verify(miningCoordinator).getMinTransactionGasPrice();
     verifyNoMoreInteractions(miningCoordinator);
@@ -111,7 +111,7 @@ public void shouldReturnMedianWhenTransactionsExist() {
         .thenAnswer(invocation -> createFakeBlock(invocation.getArgument(0, Long.class)));
 
     final JsonRpcResponse actualResponse = method.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
 
     verifyNoMoreInteractions(miningCoordinator);
 
@@ -132,7 +132,7 @@ public void shortChainQueriesAllBlocks() {
         .thenAnswer(invocation -> createFakeBlock(invocation.getArgument(0, Long.class)));
 
     final JsonRpcResponse actualResponse = method.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
 
     verifyNoMoreInteractions(miningCoordinator);
 
@@ -158,9 +158,12 @@ private Object createFakeBlock(final Long height) {
                 0,
                 0,
                 Bytes.EMPTY,
-                0L,
+                Wei.ZERO,
                 Hash.EMPTY,
                 0,
+                null,
+                null,
+                null,
                 null),
             new BlockBody(
                 List.of(
@@ -173,6 +176,7 @@ private Object createFakeBlock(final Long height) {
                         null,
                         Bytes.EMPTY,
                         Address.ZERO,
+                        Optional.empty(),
                         Optional.empty())),
                 List.of())));
   }
@@ -194,9 +198,12 @@ private Object createEmptyBlock(final Long height) {
                 0,
                 0,
                 Bytes.EMPTY,
-                0L,
+                Wei.ZERO,
                 Hash.EMPTY,
                 0,
+                null,
+                null,
+                null,
                 null),
             new BlockBody(List.of(), List.of())));
   }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHashTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHashTest.java
index 409a56d641b..e8c9ebe41e5 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHashTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByHashTest.java
@@ -15,19 +15,18 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
@@ -35,8 +34,6 @@
 @RunWith(MockitoJUnitRunner.class)
 public class EthGetBlockByHashTest {
 
-  @Rule public final ExpectedException thrown = ExpectedException.none();
-
   @Mock private BlockchainQueries blockchainQueries;
   private final BlockResultFactory blockResult = new BlockResultFactory();
   private EthGetBlockByHash method;
@@ -56,61 +53,41 @@ public void returnsCorrectMethodName() {
 
   @Test
   public void exceptionWhenNoParamsSupplied() {
-    final JsonRpcRequestContext request = requestWithParams();
-
-    thrown.expect(InvalidJsonRpcParameters.class);
-    thrown.expectMessage("Missing required json rpc parameter at index 0");
-
-    method.response(request);
-
+    assertThatThrownBy(() -> method.response(requestWithParams()))
+        .isInstanceOf(InvalidJsonRpcParameters.class);
     verifyNoMoreInteractions(blockchainQueries);
   }
 
   @Test
   public void exceptionWhenNoHashSupplied() {
-    final JsonRpcRequestContext request = requestWithParams("false");
-
-    thrown.expect(InvalidJsonRpcParameters.class);
-    thrown.expectMessage("Invalid json rpc parameter at index 0");
-
-    method.response(request);
-
+    assertThatThrownBy(() -> method.response(requestWithParams("false")))
+        .isInstanceOf(InvalidJsonRpcParameters.class);
     verifyNoMoreInteractions(blockchainQueries);
   }
 
   @Test
   public void exceptionWhenNoBoolSupplied() {
-    final JsonRpcRequestContext request = requestWithParams(ZERO_HASH);
-
-    thrown.expect(InvalidJsonRpcParameters.class);
-    thrown.expectMessage("Missing required json rpc parameter at index 1");
-
-    method.response(request);
-
+    assertThatThrownBy(() -> method.response(requestWithParams(ZERO_HASH)))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessage("Missing required json rpc parameter at index 1");
     verifyNoMoreInteractions(blockchainQueries);
   }
 
   @Test
   public void exceptionWhenHashParamInvalid() {
-    final JsonRpcRequestContext request = requestWithParams("hash", "true");
-
-    thrown.expect(InvalidJsonRpcParameters.class);
-    thrown.expectMessage("Invalid json rpc parameter at index 0");
-
-    method.response(request);
-
+    assertThatThrownBy(() -> method.response(requestWithParams("hash", "true")))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessage(
+            "Invalid json rpc parameter at index 0. Supplied value was: 'hash' of type: 'java.lang.String' - expected type: 'org.hyperledger.besu.datatypes.Hash'");
     verifyNoMoreInteractions(blockchainQueries);
   }
 
   @Test
   public void exceptionWhenBoolParamInvalid() {
-    final JsonRpcRequestContext request = requestWithParams(ZERO_HASH, "maybe");
-
-    thrown.expect(InvalidJsonRpcParameters.class);
-    thrown.expectMessage("Invalid json rpc parameter at index 1");
-
-    method.response(request);
-
+    assertThatThrownBy(() -> method.response(requestWithParams(ZERO_HASH, "maybe")))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessage(
+            "Invalid json rpc parameter at index 1. Supplied value was: 'maybe' of type: 'java.lang.String' - expected type: 'java.lang.Boolean'");
     verifyNoMoreInteractions(blockchainQueries);
   }
 
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByNumberTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByNumberTest.java
new file mode 100644
index 00000000000..b766b093161
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetBlockByNumberTest.java
@@ -0,0 +1,191 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResult;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Synchronizer;
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class EthGetBlockByNumberTest {
+  private static final String JSON_RPC_VERSION = "2.0";
+  private static final String ETH_METHOD = "eth_getBlockByNumber";
+  private static final int BLOCKCHAIN_LENGTH = 4;
+  private static final int FINALIZED_BLOCK_HEIGHT = 1;
+  private static final int SAFE_BLOCK_HEIGHT = 2;
+  private static final BlockDataGenerator blockDataGenerator = new BlockDataGenerator();
+
+  private final BlockResultFactory blockResult = new BlockResultFactory();
+  private BlockchainQueries blockchainQueries;
+  private MutableBlockchain blockchain;
+  private EthGetBlockByNumber method;
+  @Mock private Synchronizer synchronizer;
+  @Mock private WorldStateArchive worldStateArchive;
+
+  @Before
+  public void setUp() {
+    blockchain = createInMemoryBlockchain(blockDataGenerator.genesisBlock());
+
+    for (int i = 1; i < BLOCKCHAIN_LENGTH; i++) {
+      final BlockDataGenerator.BlockOptions options =
+          new BlockDataGenerator.BlockOptions()
+              .setBlockNumber(i)
+              .setParentHash(blockchain.getBlockHashByNumber(i - 1).orElseThrow());
+      final Block block = blockDataGenerator.block(options);
+      final List<TransactionReceipt> receipts = blockDataGenerator.receipts(block);
+
+      blockchain.appendBlock(block, receipts);
+    }
+
+    BlockHeader lastestHeader = blockchain.getChainHeadBlock().getHeader();
+    when(worldStateArchive.isWorldStateAvailable(
+            lastestHeader.getStateRoot(), lastestHeader.getHash()))
+        .thenReturn(Boolean.TRUE);
+
+    blockchainQueries = spy(new BlockchainQueries(blockchain, worldStateArchive));
+
+    method = new EthGetBlockByNumber(blockchainQueries, blockResult, synchronizer);
+  }
+
+  @Test
+  public void returnsCorrectMethodName() {
+    assertThat(method.getName()).isEqualTo(ETH_METHOD);
+  }
+
+  @Test
+  public void exceptionWhenNoParamsSupplied() {
+    assertThatThrownBy(() -> method.response(requestWithParams()))
+        .isInstanceOf(InvalidJsonRpcParameters.class);
+    verifyNoMoreInteractions(blockchainQueries);
+  }
+
+  @Test
+  public void exceptionWhenNoNumberSupplied() {
+    assertThatThrownBy(() -> method.response(requestWithParams("false")))
+        .isInstanceOf(InvalidJsonRpcParameters.class);
+    verifyNoMoreInteractions(blockchainQueries);
+  }
+
+  @Test
+  public void exceptionWhenNoBoolSupplied() {
+    assertThatThrownBy(() -> method.response(requestWithParams("0")))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessage("Missing required json rpc parameter at index 1");
+    verifyNoMoreInteractions(blockchainQueries);
+  }
+
+  @Test
+  public void exceptionWhenNumberParamInvalid() {
+    assertThatThrownBy(() -> method.response(requestWithParams("invalid", "true")))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessage(
+            "Invalid json rpc parameter at index 0. Supplied value was: 'invalid' of type: 'java.lang.String' - expected type: 'org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter'");
+    verifyNoMoreInteractions(blockchainQueries);
+  }
+
+  @Test
+  public void exceptionWhenBoolParamInvalid() {
+    assertThatThrownBy(() -> method.response(requestWithParams("0", "maybe")))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessage(
+            "Invalid json rpc parameter at index 1. Supplied value was: 'maybe' of type: 'java.lang.String' - expected type: 'java.lang.Boolean'");
+    verifyNoMoreInteractions(blockchainQueries);
+  }
+
+  @Test
+  public void errorWhenAskingFinalizedButFinalizedIsNotPresent() {
+    JsonRpcResponse resp = method.response(requestWithParams("finalized", "false"));
+    assertThat(resp.getType()).isEqualTo(JsonRpcResponseType.ERROR);
+    JsonRpcErrorResponse errorResp = (JsonRpcErrorResponse) resp;
+    assertThat(errorResp.getError()).isEqualTo(JsonRpcError.UNKNOWN_BLOCK);
+  }
+
+  @Test
+  public void errorWhenAskingSafeButSafeIsNotPresent() {
+    JsonRpcResponse resp = method.response(requestWithParams("safe", "false"));
+    assertThat(resp.getType()).isEqualTo(JsonRpcResponseType.ERROR);
+    JsonRpcErrorResponse errorResp = (JsonRpcErrorResponse) resp;
+    assertThat(errorResp.getError()).isEqualTo(JsonRpcError.UNKNOWN_BLOCK);
+  }
+
+  @Test
+  public void successWhenAskingEarliest() {
+    assertSuccess("earliest", 0L);
+  }
+
+  @Test
+  public void successWhenAskingLatest() {
+    assertSuccess("latest", BLOCKCHAIN_LENGTH - 1);
+  }
+
+  @Test
+  public void successWhenAskingFinalized() {
+    assertSuccessPos("finalized", FINALIZED_BLOCK_HEIGHT);
+  }
+
+  @Test
+  public void successWhenAskingSafe() {
+    assertSuccessPos("safe", SAFE_BLOCK_HEIGHT);
+  }
+
+  private void assertSuccess(final String tag, final long height) {
+    JsonRpcResponse resp = method.response(requestWithParams(tag, "false"));
+    assertThat(resp.getType()).isEqualTo(JsonRpcResponseType.SUCCESS);
+    JsonRpcSuccessResponse successResp = (JsonRpcSuccessResponse) resp;
+    BlockResult blockResult = (BlockResult) successResp.getResult();
+    assertThat(blockResult.getHash())
+        .isEqualTo(blockchain.getBlockHashByNumber(height).get().toString());
+  }
+
+  private void assertSuccessPos(final String tag, final long height) {
+    blockchain.setSafeBlock(blockchain.getBlockByNumber(SAFE_BLOCK_HEIGHT).get().getHash());
+    blockchain.setFinalized(blockchain.getBlockByNumber(FINALIZED_BLOCK_HEIGHT).get().getHash());
+    assertSuccess(tag, height);
+  }
+
+  private JsonRpcRequestContext requestWithParams(final Object... params) {
+    return new JsonRpcRequestContext(new JsonRpcRequest(JSON_RPC_VERSION, ETH_METHOD, params));
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterChangesTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterChangesTest.java
index 732c809574c..9791d2d0815 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterChangesTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterChangesTest.java
@@ -19,9 +19,11 @@
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
@@ -31,8 +33,6 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.LogsResult;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
 
 import java.util.List;
@@ -73,7 +73,7 @@ public void shouldThrowExceptionWhenNoParamsSupplied() {
         .isInstanceOf(InvalidJsonRpcParameters.class)
         .hasMessage("Missing required json rpc parameter at index 0");
 
-    verifyZeroInteractions(filterManager);
+    verifyNoInteractions(filterManager);
   }
 
   @Test
@@ -85,7 +85,7 @@ public void shouldThrowExceptionWhenInvalidParamsSupplied() {
         .isInstanceOf(InvalidJsonRpcParameters.class)
         .hasMessage("Missing required json rpc parameter at index 0");
 
-    verifyZeroInteractions(filterManager);
+    verifyNoInteractions(filterManager);
   }
 
   @Test
@@ -100,7 +100,7 @@ public void shouldReturnErrorResponseWhenFilterManagerDoesNotFindAnyFilters() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
     verify(filterManager).blockChanges(eq("0x1"));
     verify(filterManager).pendingTransactionChanges(eq("0x1"));
     verify(filterManager).logsChanges(eq("0x1"));
@@ -117,7 +117,7 @@ public void shouldReturnHashesWhenFilterManagerFindsBlockFilterWithHashes() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -129,7 +129,7 @@ public void shouldReturnEmptyHashesWhenFilterManagerFindsBlockFilterWithNoChange
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -144,7 +144,7 @@ public void shouldReturnHashesWhenFilterManagerFindsPendingTransactionFilterWith
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -157,7 +157,7 @@ public void shouldReturnEmptyHashesWhenFilterManagerFindsPendingTransactionFilte
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -172,7 +172,7 @@ public void shouldReturnLogsWhenFilterManagerFindsLogFilterWithLogs() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -187,7 +187,7 @@ public void shouldReturnEmptyLogsWhenFilterManagerFindsLogFilterWithNoChanges()
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   private JsonRpcRequestContext requestWithParams(final Object... params) {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterLogsTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterLogsTest.java
index 588b8076c39..04402a1abcc 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterLogsTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetFilterLogsTest.java
@@ -17,9 +17,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
@@ -29,8 +31,6 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.LogsResult;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
 
 import java.util.ArrayList;
@@ -72,7 +72,7 @@ public void shouldReturnErrorWhenMissingParams() {
         .isInstanceOf(InvalidJsonRpcParameters.class)
         .hasMessage("Missing required json rpc parameter at index 0");
 
-    verifyZeroInteractions(filterManager);
+    verifyNoInteractions(filterManager);
   }
 
   @Test
@@ -84,7 +84,7 @@ public void shouldReturnErrorWhenMissingFilterId() {
         .isInstanceOf(InvalidJsonRpcParameters.class)
         .hasMessage("Missing required json rpc parameter at index 0");
 
-    verifyZeroInteractions(filterManager);
+    verifyNoInteractions(filterManager);
   }
 
   @Test
@@ -96,7 +96,7 @@ public void shouldReturnFilterNotFoundWhenFilterManagerReturnsNull() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -108,7 +108,7 @@ public void shouldReturnEmptyListWhenFilterManagerReturnsEmpty() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -120,7 +120,7 @@ public void shouldReturnExpectedLogsWhenFilterManagerReturnsLogs() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   private JsonRpcRequestContext requestWithFilterId(final Object... filterId) {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetLogsTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetLogsTest.java
new file mode 100644
index 00000000000..ff3604d65e3
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetLogsTest.java
@@ -0,0 +1,314 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.FilterParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.ArrayList;
+import java.util.Optional;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class EthGetLogsTest {
+
+  private EthGetLogs method;
+
+  @Mock BlockchainQueries blockchainQueries;
+  @Mock Optional<Long> maxLogRange;
+
+  @Before
+  public void setUp() {
+    method = new EthGetLogs(blockchainQueries, maxLogRange);
+  }
+
+  @Test
+  public void shouldReturnCorrectMethodName() {
+    assertThat(method.getName()).isEqualTo("eth_getLogs");
+  }
+
+  @Test
+  public void shouldReturnErrorWhenMissingParams() {
+    final JsonRpcRequestContext request =
+        new JsonRpcRequestContext(new JsonRpcRequest("2.0", "eth_getLogs", new Object[] {}));
+
+    final Throwable thrown = catchThrowable(() -> method.response(request));
+    assertThat(thrown)
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessage("Missing required json rpc parameter at index 0");
+
+    verifyNoInteractions(blockchainQueries);
+  }
+
+  @Test
+  public void shouldQueryFinalizedBlock() {
+    final long blockNumber = 7L;
+    final JsonRpcRequestContext request = buildRequest("finalized", "finalized");
+
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+
+    when(blockchainQueries.finalizedBlockHeader()).thenReturn(Optional.of(blockHeader));
+    when(blockHeader.getNumber()).thenReturn(blockNumber);
+    when(blockchainQueries.matchingLogs(anyLong(), anyLong(), any(), any()))
+        .thenReturn(new ArrayList<>());
+
+    final JsonRpcResponse response = method.response(request);
+    assertThat(response).isInstanceOf(JsonRpcSuccessResponse.class);
+
+    verify(blockchainQueries).matchingLogs(eq(blockNumber), eq(blockNumber), any(), any());
+    verify(blockchainQueries, never()).headBlockNumber();
+    verify(blockchainQueries, never()).safeBlockHeader();
+  }
+
+  @Test
+  public void shouldQueryLatestBlock() {
+    final long latestBlockNumber = 7L;
+    final JsonRpcRequestContext request = buildRequest("latest", "latest");
+
+    when(blockchainQueries.headBlockNumber()).thenReturn(latestBlockNumber);
+    when(blockchainQueries.matchingLogs(anyLong(), anyLong(), any(), any()))
+        .thenReturn(new ArrayList<>());
+
+    final JsonRpcResponse response = method.response(request);
+    assertThat(response).isInstanceOf(JsonRpcSuccessResponse.class);
+
+    verify(blockchainQueries)
+        .matchingLogs(eq(latestBlockNumber), eq(latestBlockNumber), any(), any());
+    verify(blockchainQueries, never()).finalizedBlockHeader();
+    verify(blockchainQueries, never()).safeBlockHeader();
+  }
+
+  @Test
+  public void shouldQuerySafeBlock() {
+    final long blockNumber = 7L;
+    final JsonRpcRequestContext request = buildRequest("safe", "safe");
+
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+
+    when(blockchainQueries.safeBlockHeader()).thenReturn(Optional.of(blockHeader));
+    when(blockHeader.getNumber()).thenReturn(blockNumber);
+    when(blockchainQueries.matchingLogs(anyLong(), anyLong(), any(), any()))
+        .thenReturn(new ArrayList<>());
+
+    final JsonRpcResponse response = method.response(request);
+    assertThat(response).isInstanceOf(JsonRpcSuccessResponse.class);
+
+    verify(blockchainQueries).matchingLogs(eq(blockNumber), eq(blockNumber), any(), any());
+    verify(blockchainQueries, never()).finalizedBlockHeader();
+    verify(blockchainQueries, never()).headBlockNumber();
+  }
+
+  @Test
+  public void shouldQueryNumericBlock() {
+    final long fromBlock = 3L;
+    final long toBlock = 10L;
+    final JsonRpcRequestContext request = buildRequest(fromBlock, toBlock);
+
+    when(blockchainQueries.matchingLogs(anyLong(), anyLong(), any(), any()))
+        .thenReturn(new ArrayList<>());
+
+    final JsonRpcResponse response = method.response(request);
+    assertThat(response).isInstanceOf(JsonRpcSuccessResponse.class);
+
+    verify(blockchainQueries).matchingLogs(eq(fromBlock), eq(toBlock), any(), any());
+
+    verify(blockchainQueries, never()).finalizedBlockHeader();
+    verify(blockchainQueries, never()).headBlockNumber();
+    verify(blockchainQueries, never()).safeBlockHeader();
+  }
+
+  @Test
+  public void shouldQueryEarliestToNumeric() {
+    final long genesisBlock = 0L;
+    final long latestBlock = 50L;
+    final JsonRpcRequestContext request = buildRequest("earliest", latestBlock);
+
+    when(blockchainQueries.matchingLogs(anyLong(), anyLong(), any(), any()))
+        .thenReturn(new ArrayList<>());
+
+    final JsonRpcResponse response = method.response(request);
+    assertThat(response).isInstanceOf(JsonRpcSuccessResponse.class);
+
+    verify(blockchainQueries).matchingLogs(eq(genesisBlock), eq(latestBlock), any(), any());
+    verify(blockchainQueries, never()).finalizedBlockHeader();
+    verify(blockchainQueries, never()).safeBlockHeader();
+  }
+
+  @Test
+  public void shouldQueryWrappedNumeric() {
+    final long fromBlock = 50L;
+    final long toBlock = 100L;
+    final JsonRpcRequestContext request =
+        buildRequest(String.valueOf(fromBlock), String.valueOf(toBlock));
+
+    when(blockchainQueries.matchingLogs(anyLong(), anyLong(), any(), any()))
+        .thenReturn(new ArrayList<>());
+
+    final JsonRpcResponse response = method.response(request);
+    assertThat(response).isInstanceOf(JsonRpcSuccessResponse.class);
+
+    verify(blockchainQueries).matchingLogs(eq(fromBlock), eq(toBlock), any(), any());
+    verify(blockchainQueries, never()).finalizedBlockHeader();
+    verify(blockchainQueries, never()).headBlockNumber();
+    verify(blockchainQueries, never()).safeBlockHeader();
+  }
+
+  @Test
+  public void shouldQueryWrappedNumericToNumeric() {
+    final long fromBlock = 50L;
+    final long toBlock = 100L;
+    final JsonRpcRequestContext request = buildRequest(String.valueOf(fromBlock), toBlock);
+
+    when(blockchainQueries.matchingLogs(anyLong(), anyLong(), any(), any()))
+        .thenReturn(new ArrayList<>());
+
+    final JsonRpcResponse response = method.response(request);
+    assertThat(response).isInstanceOf(JsonRpcSuccessResponse.class);
+
+    verify(blockchainQueries).matchingLogs(eq(fromBlock), eq(toBlock), any(), any());
+    verify(blockchainQueries, never()).finalizedBlockHeader();
+    verify(blockchainQueries, never()).headBlockNumber();
+    verify(blockchainQueries, never()).safeBlockHeader();
+  }
+
+  @Test
+  public void shouldQueryEarliestToLatest() {
+    final long genesisBlock = 0L;
+    final long latestBlock = 50L;
+    final JsonRpcRequestContext request = buildRequest("earliest", "latest");
+
+    when(blockchainQueries.headBlockNumber()).thenReturn(latestBlock);
+    when(blockchainQueries.matchingLogs(anyLong(), anyLong(), any(), any()))
+        .thenReturn(new ArrayList<>());
+
+    final JsonRpcResponse response = method.response(request);
+    assertThat(response).isInstanceOf(JsonRpcSuccessResponse.class);
+
+    verify(blockchainQueries).matchingLogs(eq(genesisBlock), eq(latestBlock), any(), any());
+    verify(blockchainQueries, never()).finalizedBlockHeader();
+    verify(blockchainQueries, never()).safeBlockHeader();
+  }
+
+  @Test
+  public void shouldQuerySafeToFinalized() {
+    final long finalizedBlockNumber = 50L;
+    final long safeBlockNumber = 25L;
+    final JsonRpcRequestContext request = buildRequest("safe", "finalized");
+
+    final BlockHeader finalizedBlockHeader = mock(BlockHeader.class);
+    final BlockHeader safeBlockHeader = mock(BlockHeader.class);
+
+    when(blockchainQueries.finalizedBlockHeader()).thenReturn(Optional.of(finalizedBlockHeader));
+    when(blockchainQueries.safeBlockHeader()).thenReturn(Optional.of(safeBlockHeader));
+    when(finalizedBlockHeader.getNumber()).thenReturn(finalizedBlockNumber);
+    when(safeBlockHeader.getNumber()).thenReturn(safeBlockNumber);
+    when(blockchainQueries.matchingLogs(anyLong(), anyLong(), any(), any()))
+        .thenReturn(new ArrayList<>());
+
+    final JsonRpcResponse response = method.response(request);
+    assertThat(response).isInstanceOf(JsonRpcSuccessResponse.class);
+
+    verify(blockchainQueries)
+        .matchingLogs(eq(safeBlockNumber), eq(finalizedBlockNumber), any(), any());
+    verify(blockchainQueries, times(1)).finalizedBlockHeader();
+    verify(blockchainQueries, times(1)).safeBlockHeader();
+    verify(blockchainQueries, never()).headBlockNumber();
+  }
+
+  @Test
+  public void shouldFailIfNoSafeBlock() {
+    final JsonRpcRequestContext request = buildRequest("safe", "finalized");
+
+    when(blockchainQueries.safeBlockHeader()).thenReturn(Optional.empty());
+
+    final JsonRpcResponse response = method.response(request);
+    assertThat(response).isInstanceOf(JsonRpcErrorResponse.class);
+  }
+
+  @Test
+  public void shouldFailIfNoFinalizedBlock() {
+    final JsonRpcRequestContext request = buildRequest("finalized", "safe");
+
+    when(blockchainQueries.finalizedBlockHeader()).thenReturn(Optional.empty());
+
+    final JsonRpcResponse response = method.response(request);
+    assertThat(response).isInstanceOf(JsonRpcErrorResponse.class);
+  }
+
+  @Test
+  public void shouldFailIfParamsExceedMaxRange() {
+    final JsonRpcRequestContext request = buildRequest(0, 50);
+
+    when(maxLogRange.isPresent()).thenReturn(true);
+    when(maxLogRange.get()).thenReturn(20L);
+
+    final JsonRpcResponse response = method.response(request);
+    assertThat(response).isInstanceOf(JsonRpcErrorResponse.class);
+    final JsonRpcErrorResponse errorResponse = (JsonRpcErrorResponse) response;
+    assertThat(errorResponse.getError()).isEqualTo(JsonRpcError.EXCEEDS_RPC_MAX_BLOCK_RANGE);
+  }
+
+  private JsonRpcRequestContext buildRequest(final long fromBlock, final long toBlock) {
+    final FilterParameter filterParameter =
+        buildFilterParameter(new BlockParameter(fromBlock), new BlockParameter(toBlock));
+    return new JsonRpcRequestContext(
+        new JsonRpcRequest("2.0", "eth_getLogs", new Object[] {filterParameter}));
+  }
+
+  private JsonRpcRequestContext buildRequest(final String fromBlock, final long toBlock) {
+    final FilterParameter filterParameter =
+        buildFilterParameter(new BlockParameter(fromBlock), new BlockParameter(toBlock));
+    return new JsonRpcRequestContext(
+        new JsonRpcRequest("2.0", "eth_getLogs", new Object[] {filterParameter}));
+  }
+
+  private JsonRpcRequestContext buildRequest(final String fromBlock, final String toBlock) {
+    final FilterParameter filterParameter =
+        buildFilterParameter(new BlockParameter(fromBlock), new BlockParameter(toBlock));
+    return new JsonRpcRequestContext(
+        new JsonRpcRequest("2.0", "eth_getLogs", new Object[] {filterParameter}));
+  }
+
+  private FilterParameter buildFilterParameter(
+      final BlockParameter fromBlock, final BlockParameter toBlock) {
+    return new FilterParameter(fromBlock, toBlock, null, null, null, null, null, null, null);
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetMinerDataByBlockHashTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetMinerDataByBlockHashTest.java
index 7355925accb..f0fa298f0b6 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetMinerDataByBlockHashTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetMinerDataByBlockHashTest.java
@@ -21,6 +21,8 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
@@ -33,8 +35,6 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 
@@ -78,7 +78,7 @@ public void successTest() {
             header, Collections.emptyList(), Collections.emptyList(), Difficulty.of(100L), 5);
 
     when(blockchainQueries.blockByHash(any())).thenReturn(Optional.of(blockWithMetadata));
-    when(protocolSchedule.getByBlockNumber(header.getNumber())).thenReturn(protocolSpec);
+    when(protocolSchedule.getByBlockHeader(header)).thenReturn(protocolSpec);
     when(protocolSpec.getBlockReward()).thenReturn(Wei.fromEth(2));
     when(blockchainQueries.getBlockchain()).thenReturn(blockChain);
 
@@ -121,7 +121,7 @@ public void exceptionWhenHashParamInvalidTest() {
     JsonRpcRequestContext requestContext = new JsonRpcRequestContext(request);
     assertThatThrownBy(() -> method.response(requestContext))
         .isInstanceOf(InvalidJsonRpcParameters.class)
-        .hasMessage("Invalid json rpc parameter at index 0");
+        .hasMessageContaining("Invalid json rpc parameter at index 0");
 
     verifyNoMoreInteractions(blockchainQueries);
   }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetMinerDataByBlockNumberTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetMinerDataByBlockNumberTest.java
index e44cc001d8b..99e6e6889e8 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetMinerDataByBlockNumberTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetMinerDataByBlockNumberTest.java
@@ -21,6 +21,8 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
@@ -33,8 +35,6 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 
@@ -76,7 +76,7 @@ public void successTest() {
             header, Collections.emptyList(), Collections.emptyList(), Difficulty.of(100L), 5);
 
     when(blockchainQueries.blockByNumber(anyLong())).thenReturn(Optional.of(blockWithMetadata));
-    when(protocolSchedule.getByBlockNumber(header.getNumber())).thenReturn(protocolSpec);
+    when(protocolSchedule.getByBlockHeader(header)).thenReturn(protocolSpec);
     when(protocolSpec.getBlockReward()).thenReturn(Wei.fromEth(2));
     when(blockchainQueries.getBlockchain()).thenReturn(blockChain);
 
@@ -115,7 +115,7 @@ public void exceptionWhenNumberParamInvalidTest() {
     JsonRpcRequestContext requestContext = new JsonRpcRequestContext(request);
     assertThatThrownBy(() -> method.response(requestContext))
         .isInstanceOf(InvalidJsonRpcParameters.class)
-        .hasMessage("Invalid json rpc parameter at index 0");
+        .hasMessageContaining("Invalid json rpc parameter at index 0");
 
     verifyNoMoreInteractions(blockchainQueries);
   }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetProofTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetProofTest.java
index 677ab1d1ccf..e361a5b688f 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetProofTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetProofTest.java
@@ -15,46 +15,63 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.evm.account.Account.MAX_NONCE;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.proof.GetProofResult;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.chain.ChainHead;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.proof.WorldStateProof;
 import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 
 import java.util.Collections;
 import java.util.Optional;
+import java.util.function.Function;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.units.bigints.UInt256;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
-@RunWith(MockitoJUnitRunner.class)
-public class EthGetProofTest {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class EthGetProofTest {
+  @Mock private Blockchain blockchain;
 
-  @Rule public final ExpectedException thrown = ExpectedException.none();
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  private WorldStateArchive archive;
 
-  @Mock private BlockchainQueries blockchainQueries;
+  @Mock private ChainHead chainHead;
+  @Mock private BlockHeader blockHeader;
+  private BlockchainQueries blockchainQueries;
 
   private EthGetProof method;
   private final String JSON_RPC_VERSION = "2.0";
@@ -66,51 +83,55 @@ public class EthGetProofTest {
       UInt256.fromHexString("0x0000000000000000000000000000000000000000000000000000000000000001");
   private final long blockNumber = 1;
 
-  @Before
+  @BeforeEach
   public void setUp() {
-    method = new EthGetProof(blockchainQueries);
+    blockchainQueries = spy(new BlockchainQueries(blockchain, archive));
+    when(blockchainQueries.getBlockchain()).thenReturn(blockchain);
+    when(blockchainQueries.headBlockNumber()).thenReturn(14L);
+    when(blockchain.getChainHead()).thenReturn(chainHead);
+    when(chainHead.getBlockHeader()).thenReturn(blockHeader);
+    when(blockHeader.getBlockHash()).thenReturn(Hash.ZERO);
+    when(blockchain.getBlockHeader(Hash.ZERO)).thenReturn(Optional.of(mock(BlockHeader.class)));
+    method = spy(new EthGetProof(blockchainQueries));
   }
 
   @Test
-  public void returnsCorrectMethodName() {
+  void returnsCorrectMethodName() {
     assertThat(method.getName()).isEqualTo(ETH_METHOD);
   }
 
   @Test
-  public void errorWhenNoAddressAccountSupplied() {
+  void errorWhenNoAddressAccountSupplied() {
     final JsonRpcRequestContext request = requestWithParams(null, null, "latest");
 
-    thrown.expect(InvalidJsonRpcParameters.class);
-    thrown.expectMessage("Missing required json rpc parameter at index 0");
-
-    method.response(request);
+    Assertions.assertThatThrownBy(() -> method.response(request))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessageContaining("Missing required json rpc parameter at index 0");
   }
 
   @Test
-  public void errorWhenNoStorageKeysSupplied() {
+  void errorWhenNoStorageKeysSupplied() {
     final JsonRpcRequestContext request = requestWithParams(address.toString(), null, "latest");
 
-    thrown.expect(InvalidJsonRpcParameters.class);
-    thrown.expectMessage("Missing required json rpc parameter at index 1");
-
-    method.response(request);
+    Assertions.assertThatThrownBy(() -> method.response(request))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessageContaining("Missing required json rpc parameter at index 1");
   }
 
   @Test
-  public void errorWhenNoBlockNumberSupplied() {
+  void errorWhenNoBlockNumberSupplied() {
     final JsonRpcRequestContext request = requestWithParams(address.toString(), new String[] {});
 
-    thrown.expect(InvalidJsonRpcParameters.class);
-    thrown.expectMessage("Missing required json rpc parameter at index 2");
-
-    method.response(request);
+    Assertions.assertThatThrownBy(() -> method.response(request))
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessageContaining("Missing required json rpc parameter at index 2");
   }
 
   @Test
-  public void errorWhenAccountNotFound() {
-
+  void errorWhenAccountNotFound() {
     generateWorldState();
-
+    when(archive.getAccountProof(any(Hash.class), any(Address.class), any()))
+        .thenReturn(Optional.empty());
     final JsonRpcErrorResponse expectedResponse =
         new JsonRpcErrorResponse(null, JsonRpcError.NO_ACCOUNT_FOUND);
 
@@ -122,16 +143,15 @@ public void errorWhenAccountNotFound() {
 
     final JsonRpcErrorResponse response = (JsonRpcErrorResponse) method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
-  public void errorWhenWorldStateUnavailable() {
-
-    when(blockchainQueries.getWorldState(blockNumber)).thenReturn(Optional.empty());
+  void errorWhenWorldStateUnavailable() {
 
     final JsonRpcErrorResponse expectedResponse =
         new JsonRpcErrorResponse(null, JsonRpcError.WORLD_STATE_UNAVAILABLE);
+    when(archive.getMutable(any(BlockHeader.class), anyBoolean())).thenReturn(Optional.empty());
 
     final JsonRpcRequestContext request =
         requestWithParams(
@@ -141,11 +161,11 @@ public void errorWhenWorldStateUnavailable() {
 
     final JsonRpcErrorResponse response = (JsonRpcErrorResponse) method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
-  public void getProof() {
+  void getProof() {
 
     final GetProofResult expectedResponse = generateWorldState();
 
@@ -155,28 +175,31 @@ public void getProof() {
 
     final JsonRpcSuccessResponse response = (JsonRpcSuccessResponse) method.response(request);
 
-    assertThat(response.getResult()).isEqualToComparingFieldByFieldRecursively(expectedResponse);
+    final GetProofResult result = (GetProofResult) response.getResult();
+
+    assertThat(result).usingRecursiveComparison().isEqualTo(expectedResponse);
+    assertThat(result.getNonce()).isEqualTo("0xfffffffffffffffe");
+    assertThat(result.getStorageProof().size()).isGreaterThan(0);
+    assertThat(result.getStorageProof().get(0).getKey())
+        .isEqualTo(storageKey.trimLeadingZeros().toHexString());
   }
 
   private JsonRpcRequestContext requestWithParams(final Object... params) {
     return new JsonRpcRequestContext(new JsonRpcRequest(JSON_RPC_VERSION, ETH_METHOD, params));
   }
 
-  @SuppressWarnings("unchecked")
   private GetProofResult generateWorldState() {
 
     final Wei balance = Wei.of(1);
     final Hash codeHash =
         Hash.fromHexString("0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470");
-    final long nonce = 1;
+    final long nonce = MAX_NONCE - 1;
     final Hash rootHash =
         Hash.fromHexString("0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b431");
     final Hash storageRoot =
         Hash.fromHexString("0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421");
 
-    final WorldStateArchive worldStateArchive = mock(WorldStateArchive.class);
-
-    when(blockchainQueries.getWorldStateArchive()).thenReturn(worldStateArchive);
+    when(blockchainQueries.getWorldStateArchive()).thenReturn(archive);
 
     final StateTrieAccountValue stateTrieAccountValue = mock(StateTrieAccountValue.class);
     when(stateTrieAccountValue.getBalance()).thenReturn(balance);
@@ -199,12 +222,19 @@ private GetProofResult generateWorldState() {
                     "0x2222222222222222222222222222222222222222222222222222222222222222")));
     when(worldStateProof.getStorageValue(storageKey)).thenReturn(UInt256.ZERO);
 
-    when(worldStateArchive.getAccountProof(eq(rootHash), eq(address), anyList()))
+    when(archive.getAccountProof(eq(rootHash), eq(address), anyList()))
         .thenReturn(Optional.of(worldStateProof));
 
     final MutableWorldState mutableWorldState = mock(MutableWorldState.class);
     when(mutableWorldState.rootHash()).thenReturn(rootHash);
-    when(blockchainQueries.getWorldState(blockNumber)).thenReturn(Optional.of(mutableWorldState));
+    doAnswer(
+            invocation ->
+                invocation
+                    .<Function<MutableWorldState, Optional<? extends JsonRpcResponse>>>getArgument(
+                        1)
+                    .apply(mutableWorldState))
+        .when(blockchainQueries)
+        .getAndMapWorldState(any(), any());
 
     return GetProofResult.buildGetProofResult(address, worldStateProof);
   }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndexTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndexTest.java
index 38818d038a7..6a31107ec70 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndexTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByBlockHashAndIndexTest.java
@@ -39,8 +39,9 @@ public class EthGetTransactionByBlockHashAndIndexTest {
   @Test
   public void shouldReturnNullWhenBlockHashDoesNotExist() {
     method = new EthGetTransactionByBlockHashAndIndex(blockchain);
-    Bytes32 hash = Hash.keccak256(Bytes.wrap("horse".getBytes(UTF_8)));
-    JsonRpcSuccessResponse response = (JsonRpcSuccessResponse) method.response(request(hash, 1));
+    final Bytes32 hash = Hash.keccak256(Bytes.wrap("horse".getBytes(UTF_8)));
+    final JsonRpcSuccessResponse response =
+        (JsonRpcSuccessResponse) method.response(request(hash, 1));
     assertThat(response.getResult()).isEqualTo(null);
   }
 
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByHashTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByHashTest.java
new file mode 100644
index 00000000000..ecdb8fb67d0
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionByHashTest.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionCompleteResult;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionPendingResult;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.plugin.data.Transaction;
+
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class EthGetTransactionByHashTest {
+
+  private static final String VALID_TRANSACTION =
+      "0xf86d0485174876e800830222e0945aae326516b4f8fe08074b7e972e40a713048d62880de0b6b3a7640000801ba05d4e7998757264daab67df2ce6f7e7a0ae36910778a406ca73898c9899a32b9ea0674700d5c3d1d27f2e6b4469957dfd1a1c49bf92383d80717afc84eb05695d5b";
+
+  @Mock private BlockchainQueries blockchainQueries;
+  private EthGetTransactionByHash method;
+  private final String JSON_RPC_VERSION = "2.0";
+  private final String ETH_METHOD = "eth_getTransactionByHash";
+
+  @Mock private PendingTransactions pendingTransactions;
+
+  @Before
+  public void setUp() {
+    method = new EthGetTransactionByHash(blockchainQueries, pendingTransactions);
+  }
+
+  @Test
+  public void returnsCorrectMethodName() {
+    assertThat(method.getName()).isEqualTo(ETH_METHOD);
+  }
+
+  @Test
+  public void shouldReturnErrorResponseIfMissingRequiredParameter() {
+    final JsonRpcRequest request = new JsonRpcRequest("2.0", method.getName(), new Object[] {});
+    final JsonRpcRequestContext context = new JsonRpcRequestContext(request);
+
+    final JsonRpcErrorResponse expectedResponse =
+        new JsonRpcErrorResponse(request.getId(), JsonRpcError.INVALID_PARAMS);
+
+    final JsonRpcResponse actualResponse = method.response(context);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnNullResultWhenTransactionDoesNotExist() {
+    final String transactionHash =
+        "0xf9ef5f0cf02685711cdf687b72d4754901729b942f4ea7f956e7fb206cae2f9e";
+    when(pendingTransactions.getTransactionByHash(eq(Hash.fromHexString(transactionHash))))
+        .thenReturn(Optional.empty());
+    when(blockchainQueries.transactionByHash(eq(Hash.fromHexString(transactionHash))))
+        .thenReturn(Optional.empty());
+
+    final JsonRpcRequest request =
+        new JsonRpcRequest("2.0", method.getName(), new Object[] {transactionHash});
+    final JsonRpcRequestContext context = new JsonRpcRequestContext(request);
+
+    final JsonRpcSuccessResponse expectedResponse =
+        new JsonRpcSuccessResponse(request.getId(), null);
+
+    final JsonRpcResponse actualResponse = method.response(context);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnPendingTransactionWhenTransactionExistsAndIsPending() {
+    final org.hyperledger.besu.ethereum.core.Transaction transaction =
+        org.hyperledger.besu.ethereum.core.Transaction.readFrom(
+            Bytes.fromHexString(VALID_TRANSACTION));
+
+    when(pendingTransactions.getTransactionByHash(eq(transaction.getHash())))
+        .thenReturn(Optional.of(transaction));
+    verifyNoInteractions(blockchainQueries);
+
+    final JsonRpcRequest request =
+        new JsonRpcRequest(
+            "2.0", method.getName(), new Object[] {transaction.getHash().toHexString()});
+    final JsonRpcRequestContext context = new JsonRpcRequestContext(request);
+
+    final JsonRpcSuccessResponse expectedResponse =
+        new JsonRpcSuccessResponse(request.getId(), new TransactionPendingResult(transaction));
+
+    final JsonRpcResponse actualResponse = method.response(context);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void shouldReturnCompleteTransactionWhenTransactionExistsInBlockchain() {
+    final org.hyperledger.besu.ethereum.core.Transaction transaction =
+        org.hyperledger.besu.ethereum.core.Transaction.readFrom(
+            Bytes.fromHexString(VALID_TRANSACTION));
+    final TransactionWithMetadata transactionWithMetadata =
+        new TransactionWithMetadata(transaction, 1, Optional.empty(), Hash.ZERO, 0);
+
+    when(pendingTransactions.getTransactionByHash(eq(transaction.getHash())))
+        .thenReturn(Optional.empty());
+    verifyNoMoreInteractions(pendingTransactions);
+    when(blockchainQueries.transactionByHash(eq(transaction.getHash())))
+        .thenReturn(Optional.of(transactionWithMetadata));
+
+    final JsonRpcRequest request =
+        new JsonRpcRequest(
+            "2.0", method.getName(), new Object[] {transaction.getHash().toHexString()});
+    final JsonRpcRequestContext context = new JsonRpcRequestContext(request);
+
+    final JsonRpcSuccessResponse expectedResponse =
+        new JsonRpcSuccessResponse(
+            request.getId(), new TransactionCompleteResult(transactionWithMetadata));
+
+    final JsonRpcResponse actualResponse = method.response(context);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void validateResultSpec() {
+
+    PendingTransaction pendingTx = getPendingTransactions().stream().findFirst().get();
+    Hash hash = pendingTx.getHash();
+    when(this.pendingTransactions.getTransactionByHash(hash))
+        .thenReturn(Optional.of(pendingTx.getTransaction()));
+    final JsonRpcRequestContext request =
+        new JsonRpcRequestContext(
+            new JsonRpcRequest(JSON_RPC_VERSION, ETH_METHOD, new Object[] {hash}));
+
+    final JsonRpcSuccessResponse actualResponse = (JsonRpcSuccessResponse) method.response(request);
+    TransactionPendingResult result = (TransactionPendingResult) actualResponse.getResult();
+
+    assertThat(result.getBlockHash()).isNull();
+    assertThat(result.getBlockNumber()).isNull();
+    assertThat(result.getTransactionIndex()).isNull();
+
+    assertThat(result.getFrom()).isNotNull();
+    assertThat(result.getGas()).isNotNull();
+    assertThat(result.getGasPrice()).isNotNull();
+    assertThat(result.getHash()).isNotNull();
+    assertThat(result.getInput()).isNotNull();
+    assertThat(result.getNonce()).isNotNull();
+    assertThat(result.getPublicKey()).isNotNull();
+    assertThat(result.getRaw()).isNotNull();
+    assertThat(result.getTo()).isNotNull();
+    assertThat(result.getValue()).isNotNull();
+    assertThat(result.getV()).isNotNull();
+    assertThat(result.getR()).isNotNull();
+    assertThat(result.getS()).isNotNull();
+  }
+
+  private Set<PendingTransaction> getPendingTransactions() {
+
+    final BlockDataGenerator gen = new BlockDataGenerator();
+    Transaction pendingTransaction = gen.transaction();
+    System.out.println(pendingTransaction.getHash());
+    return gen.transactionsWithAllTypes(4).stream()
+        .map(transaction -> new PendingTransaction.Local(transaction))
+        .collect(Collectors.toUnmodifiableSet());
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionCountTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionCountTest.java
index 7f630f1773b..65fc57fa35b 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionCountTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionCountTest.java
@@ -15,34 +15,47 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.evm.account.Account.MAX_NONCE;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.chain.ChainHead;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
 
 import java.util.OptionalLong;
 
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class EthGetTransactionCountTest {
+  private final Blockchain blockchain = mock(Blockchain.class);
+  private final BlockchainQueries blockchainQueries = mock(BlockchainQueries.class);
+  private final ChainHead chainHead = mock(ChainHead.class);
 
-  private final BlockchainQueries blockchain = mock(BlockchainQueries.class);
-  private final PendingTransactions pendingTransactions = mock(PendingTransactions.class);
-
-  private final EthGetTransactionCount ethGetTransactionCount =
-      new EthGetTransactionCount(blockchain, pendingTransactions);
+  private EthGetTransactionCount ethGetTransactionCount;
   private final String pendingTransactionString = "0x00000000000000000000000000000000000000AA";
   private final Object[] pendingParams = new Object[] {pendingTransactionString, "pending"};
+  private PendingTransactions pendingTransactions;
+
+  @BeforeEach
+  public void setup() {
+    pendingTransactions = mock(PendingTransactions.class);
+    ethGetTransactionCount = new EthGetTransactionCount(blockchainQueries, pendingTransactions);
+  }
 
   @Test
   public void shouldUsePendingTransactionsWhenToldTo() {
-    when(pendingTransactions.getNextNonceForSender(Address.fromHexString(pendingTransactionString)))
-        .thenReturn(OptionalLong.of(12));
+
+    final Address address = Address.fromHexString(pendingTransactionString);
+    when(pendingTransactions.getNextNonceForSender(address)).thenReturn(OptionalLong.of(12));
+    mockGetTransactionCount(address, 7L);
     final JsonRpcRequestContext request =
         new JsonRpcRequestContext(
             new JsonRpcRequest("1", "eth_getTransactionCount", pendingParams));
@@ -53,10 +66,10 @@ public void shouldUsePendingTransactionsWhenToldTo() {
 
   @Test
   public void shouldUseLatestTransactionsWhenNoPendingTransactions() {
+
     final Address address = Address.fromHexString(pendingTransactionString);
     when(pendingTransactions.getNextNonceForSender(address)).thenReturn(OptionalLong.empty());
-    when(blockchain.headBlockNumber()).thenReturn(1L);
-    when(blockchain.getTransactionCount(address, 1L)).thenReturn(7L);
+    mockGetTransactionCount(address, 7L);
     final JsonRpcRequestContext request =
         new JsonRpcRequestContext(
             new JsonRpcRequest("1", "eth_getTransactionCount", pendingParams));
@@ -64,4 +77,56 @@ public void shouldUseLatestTransactionsWhenNoPendingTransactions() {
         (JsonRpcSuccessResponse) ethGetTransactionCount.response(request);
     assertThat(response.getResult()).isEqualTo("0x7");
   }
+
+  @Test
+  public void shouldUseLatestWhenItIsBiggerThanPending() {
+
+    final Address address = Address.fromHexString(pendingTransactionString);
+    mockGetTransactionCount(address, 8);
+    when(pendingTransactions.getNextNonceForSender(Address.fromHexString(pendingTransactionString)))
+        .thenReturn(OptionalLong.of(4));
+    final JsonRpcRequestContext request =
+        new JsonRpcRequestContext(
+            new JsonRpcRequest("1", "eth_getTransactionCount", pendingParams));
+    final JsonRpcSuccessResponse response =
+        (JsonRpcSuccessResponse) ethGetTransactionCount.response(request);
+    assertThat(response.getResult()).isEqualTo("0x8");
+  }
+
+  @Test
+  public void shouldReturnPendingWithHighNonce() {
+
+    final Address address = Address.fromHexString(pendingTransactionString);
+    when(pendingTransactions.getNextNonceForSender(address))
+        .thenReturn(OptionalLong.of(MAX_NONCE - 1));
+    mockGetTransactionCount(address, 7L);
+    final JsonRpcRequestContext request =
+        new JsonRpcRequestContext(
+            new JsonRpcRequest("1", "eth_getTransactionCount", pendingParams));
+    final JsonRpcSuccessResponse response =
+        (JsonRpcSuccessResponse) ethGetTransactionCount.response(request);
+    assertThat(response.getResult()).isEqualTo("0xfffffffffffffffe");
+  }
+
+  @Test
+  public void shouldReturnLatestWithHighNonce() {
+
+    final Address address = Address.fromHexString(pendingTransactionString);
+    when(pendingTransactions.getNextNonceForSender(address))
+        .thenReturn(OptionalLong.of(MAX_NONCE - 2));
+    mockGetTransactionCount(address, MAX_NONCE - 1);
+    final JsonRpcRequestContext request =
+        new JsonRpcRequestContext(
+            new JsonRpcRequest("1", "eth_getTransactionCount", pendingParams));
+    final JsonRpcSuccessResponse response =
+        (JsonRpcSuccessResponse) ethGetTransactionCount.response(request);
+    assertThat(response.getResult()).isEqualTo("0xfffffffffffffffe");
+  }
+
+  private void mockGetTransactionCount(final Address address, final long transactionCount) {
+    when(blockchainQueries.getBlockchain()).thenReturn(blockchain);
+    when(blockchain.getChainHead()).thenReturn(chainHead);
+    when(chainHead.getHash()).thenReturn(Hash.ZERO);
+    when(blockchainQueries.getTransactionCount(address, Hash.ZERO)).thenReturn(transactionCount);
+  }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java
index 761687a8dc4..def0693a75b 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java
@@ -18,7 +18,12 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
@@ -26,34 +31,36 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionReceiptStatusResult;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.query.TransactionReceiptWithMetadata;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.fees.TransactionGasBudgetCalculator;
-import org.hyperledger.besu.ethereum.core.fees.TransactionPriceCalculator;
+import org.hyperledger.besu.ethereum.mainnet.PoWHasher;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.plugin.data.TransactionType;
 
 import java.math.BigInteger;
 import java.util.Collections;
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256s;
 import org.junit.Test;
 
 public class EthGetTransactionReceiptTest {
-
-  private final TransactionReceipt stateReceipt =
+  private final TransactionReceipt statusReceipt =
       new TransactionReceipt(1, 12, Collections.emptyList(), Optional.empty());
   private final Hash stateRoot =
       Hash.fromHexString("0000000000000000000000000000000000000000000000000000000000000000");
   private final TransactionReceipt rootReceipt =
       new TransactionReceipt(stateRoot, 12, Collections.emptyList(), Optional.empty());
 
-  private final Signature signature = Signature.create(BigInteger.ONE, BigInteger.TEN, (byte) 1);
+  private final SECPSignature signature =
+      SignatureAlgorithmFactory.getInstance()
+          .createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 1);
   private final Address sender =
       Address.fromHexString("0x0000000000000000000000000000000000000003");
   private final Transaction transaction =
@@ -73,10 +80,12 @@ public class EthGetTransactionReceiptTest {
   private final Hash blockHash =
       Hash.fromHexString("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
 
-  private final TransactionReceiptWithMetadata stateReceiptWithMetaData =
-      TransactionReceiptWithMetadata.create(stateReceipt, transaction, hash, 1, 2, blockHash, 4);
+  private final TransactionReceiptWithMetadata statusReceiptWithMetadata =
+      TransactionReceiptWithMetadata.create(
+          statusReceipt, transaction, hash, 1, 2, Optional.empty(), blockHash, 4);
   private final TransactionReceiptWithMetadata rootReceiptWithMetaData =
-      TransactionReceiptWithMetadata.create(rootReceipt, transaction, hash, 1, 2, blockHash, 4);
+      TransactionReceiptWithMetadata.create(
+          rootReceipt, transaction, hash, 1, 2, Optional.empty(), blockHash, 4);
 
   private final ProtocolSpec rootTransactionTypeSpec =
       new ProtocolSpec(
@@ -99,10 +108,14 @@ public class EthGetTransactionReceiptTest {
           null,
           false,
           null,
-          TransactionPriceCalculator.frontier(),
+          GasLimitCalculator.constant(),
+          FeeMarket.legacy(),
+          null,
+          Optional.of(PoWHasher.ETHASH_LIGHT),
+          null,
           Optional.empty(),
-          TransactionGasBudgetCalculator.frontier(),
-          null);
+          null,
+          true);
   private final ProtocolSpec statusTransactionTypeSpec =
       new ProtocolSpec(
           "status",
@@ -124,10 +137,14 @@ public class EthGetTransactionReceiptTest {
           null,
           false,
           null,
-          TransactionPriceCalculator.frontier(),
+          GasLimitCalculator.constant(),
+          FeeMarket.legacy(),
+          null,
+          Optional.of(PoWHasher.ETHASH_LIGHT),
+          null,
           Optional.empty(),
-          TransactionGasBudgetCalculator.frontier(),
-          null);
+          null,
+          true);
 
   @SuppressWarnings("unchecked")
   private final ProtocolSchedule protocolSchedule = mock(ProtocolSchedule.class);
@@ -147,14 +164,15 @@ public class EthGetTransactionReceiptTest {
   public void shouldCreateAStatusTransactionReceiptWhenStatusTypeProtocol() {
     when(blockchain.headBlockNumber()).thenReturn(1L);
     when(blockchain.transactionReceiptByTransactionHash(receiptHash))
-        .thenReturn(Optional.of(stateReceiptWithMetaData));
-    when(protocolSchedule.getByBlockNumber(1)).thenReturn(statusTransactionTypeSpec);
+        .thenReturn(Optional.of(statusReceiptWithMetadata));
+    when(protocolSchedule.getByBlockHeader(blockHeader(1))).thenReturn(statusTransactionTypeSpec);
 
     final JsonRpcSuccessResponse response =
         (JsonRpcSuccessResponse) ethGetTransactionReceipt.response(request);
     final TransactionReceiptStatusResult result =
         (TransactionReceiptStatusResult) response.getResult();
 
+    assertThat(result.getType()).isEqualTo("0x0");
     assertThat(result.getStatus()).isEqualTo("0x1");
   }
 
@@ -163,12 +181,44 @@ public void shouldCreateARootTransactionReceiptWhenRootTypeProtocol() {
     when(blockchain.headBlockNumber()).thenReturn(1L);
     when(blockchain.transactionReceiptByTransactionHash(receiptHash))
         .thenReturn(Optional.of(rootReceiptWithMetaData));
-    when(protocolSchedule.getByBlockNumber(1)).thenReturn(rootTransactionTypeSpec);
+    when(protocolSchedule.getByBlockHeader(blockHeader(1))).thenReturn(rootTransactionTypeSpec);
 
     final JsonRpcSuccessResponse response =
         (JsonRpcSuccessResponse) ethGetTransactionReceipt.response(request);
     final TransactionReceiptRootResult result = (TransactionReceiptRootResult) response.getResult();
 
+    assertThat(result.getType()).isEqualTo("0x0");
     assertThat(result.getRoot()).isEqualTo(stateRoot.toString());
   }
+
+  @Test
+  public void shouldWorkFor1559Txs() {
+    when(blockchain.headBlockNumber()).thenReturn(1L);
+    final Transaction transaction1559 =
+        new BlockDataGenerator().transaction(TransactionType.EIP1559);
+    final Wei baseFee = Wei.ONE;
+    final TransactionReceiptWithMetadata transactionReceiptWithMetadata =
+        TransactionReceiptWithMetadata.create(
+            statusReceipt, transaction1559, hash, 1, 2, Optional.of(baseFee), blockHash, 4);
+    when(blockchain.transactionReceiptByTransactionHash(receiptHash))
+        .thenReturn(Optional.of(transactionReceiptWithMetadata));
+    when(protocolSchedule.getByBlockHeader(blockHeader(1))).thenReturn(rootTransactionTypeSpec);
+
+    final JsonRpcSuccessResponse response =
+        (JsonRpcSuccessResponse) ethGetTransactionReceipt.response(request);
+    final TransactionReceiptStatusResult result =
+        (TransactionReceiptStatusResult) response.getResult();
+
+    assertThat(result.getStatus()).isEqualTo("0x1");
+    assertThat(result.getType()).isEqualTo("0x2");
+    assertThat(Wei.fromHexString(result.getEffectiveGasPrice()))
+        .isEqualTo(
+            UInt256s.min(
+                baseFee.add(transaction1559.getMaxPriorityFeePerGas().get()),
+                transaction1559.getMaxFeePerGas().get()));
+  }
+
+  private BlockHeader blockHeader(final long number) {
+    return new BlockHeaderTestFixture().number(number).buildHeader();
+  }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndexTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndexTest.java
index 4033465ec8b..6f59f146d39 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndexTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockHashAndIndexTest.java
@@ -19,7 +19,9 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
@@ -34,7 +36,6 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
 
@@ -100,7 +101,7 @@ public void shouldReturnErrorWhenInvalidBlockHashParam() {
 
     assertThat(thrown)
         .isInstanceOf(InvalidJsonRpcParameters.class)
-        .hasMessage("Invalid json rpc parameter at index 0");
+        .hasMessageContaining("Invalid json rpc parameter at index 0");
   }
 
   @Test
@@ -112,7 +113,7 @@ public void shouldReturnErrorWhenInvalidIndexParam() {
 
     assertThat(thrown)
         .isInstanceOf(InvalidJsonRpcParameters.class)
-        .hasMessage("Invalid json rpc parameter at index 1");
+        .hasMessageContaining("Invalid json rpc parameter at index 1");
   }
 
   @Test
@@ -125,7 +126,7 @@ public void shouldReturnNullResultWhenBlockDoesNotHaveOmmer() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -140,7 +141,7 @@ public void shouldReturnExpectedBlockResult() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   private BlockResult blockResult(final BlockHeader header) {
@@ -161,12 +162,13 @@ private JsonRpcRequestContext getUncleByBlockHashAndIndex(final Object[] params)
 
   public BlockWithMetadata<TransactionWithMetadata, Hash> blockWithMetadata(
       final BlockHeader header) {
-    final KeyPair keyPair = KeyPair.generate();
+    final KeyPair keyPair = SignatureAlgorithmFactory.getInstance().generateKeyPair();
     final List<TransactionWithMetadata> transactions = new ArrayList<>();
     for (int i = 0; i < 3; i++) {
       final Transaction transaction = transactionTestFixture.createTransaction(keyPair);
       transactions.add(
-          new TransactionWithMetadata(transaction, header.getNumber(), header.getHash(), 0));
+          new TransactionWithMetadata(
+              transaction, header.getNumber(), header.getBaseFee(), header.getHash(), 0));
     }
 
     final List<Hash> ommers = new ArrayList<>();
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndexTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndexTest.java
index 10b3419a02f..f07d55178f6 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndexTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetUncleByBlockNumberAndIndexTest.java
@@ -19,7 +19,10 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
@@ -34,7 +37,6 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
 
@@ -101,14 +103,14 @@ public void shouldReturnNullResultWhenBlockDoesNotHaveOmmer() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
   public void shouldReturnExpectedBlockResult() {
     final JsonRpcRequestContext request =
         getUncleByBlockNumberAndIndex(new Object[] {"0x1", "0x0"});
-    final BlockHeader header = blockHeaderTestFixture.buildHeader();
+    final BlockHeader header = blockHeaderTestFixture.baseFeePerGas(Wei.of(7L)).buildHeader();
     final BlockResult expectedBlockResult = blockResult(header);
     final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, expectedBlockResult);
 
@@ -116,7 +118,7 @@ public void shouldReturnExpectedBlockResult() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   private BlockResult blockResult(final BlockHeader header) {
@@ -137,12 +139,13 @@ private JsonRpcRequestContext getUncleByBlockNumberAndIndex(final Object[] param
 
   public BlockWithMetadata<TransactionWithMetadata, Hash> blockWithMetadata(
       final BlockHeader header) {
-    final KeyPair keyPair = KeyPair.generate();
+    final KeyPair keyPair = SignatureAlgorithmFactory.getInstance().generateKeyPair();
     final List<TransactionWithMetadata> transactions = new ArrayList<>();
     for (int i = 0; i < 3; i++) {
       final Transaction transaction = transactionTestFixture.createTransaction(keyPair);
       transactions.add(
-          new TransactionWithMetadata(transaction, header.getNumber(), header.getHash(), 0));
+          new TransactionWithMetadata(
+              transaction, header.getNumber(), Optional.empty(), header.getHash(), 0));
     }
 
     final List<Hash> ommers = new ArrayList<>();
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetWorkTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetWorkTest.java
index 604fe9ca38b..c49f032eca8 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetWorkTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetWorkTest.java
@@ -23,14 +23,16 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
 import org.hyperledger.besu.ethereum.mainnet.DirectAcyclicGraphSeed;
 import org.hyperledger.besu.ethereum.mainnet.EpochCalculator;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolverInputs;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolverInputs;
 
+import java.util.List;
 import java.util.Optional;
 
 import com.google.common.io.BaseEncoding;
+import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.units.bigints.UInt256;
 import org.junit.Before;
 import org.junit.Test;
@@ -46,7 +48,7 @@ public class EthGetWorkTest {
   private final String hexValue =
       "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff";
 
-  @Mock private EthHashMiningCoordinator miningCoordinator;
+  @Mock private PoWMiningCoordinator miningCoordinator;
 
   @Before
   public void setUp() {
@@ -63,78 +65,71 @@ public void shouldReturnCorrectMethodName() {
   @Test
   public void shouldReturnCorrectResultOnGenesisDAG() {
     final JsonRpcRequestContext request = requestWithParams();
-    final EthHashSolverInputs values =
-        new EthHashSolverInputs(
-            UInt256.fromHexString(hexValue), BaseEncoding.base16().lowerCase().decode(hexValue), 0);
-    final String[] expectedValue = {
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-      "0x0"
-    };
+    final PoWSolverInputs values =
+        new PoWSolverInputs(UInt256.fromHexString(hexValue), Bytes.fromHexString(hexValue), 0);
+    final List<String> expectedValue =
+        List.of(
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "0x0");
     final JsonRpcResponse expectedResponse =
         new JsonRpcSuccessResponse(request.getRequest().getId(), expectedValue);
     when(miningCoordinator.getWorkDefinition()).thenReturn(Optional.of(values));
 
     final JsonRpcResponse actualResponse = method.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
   public void shouldReturnCorrectResultOnHighBlockSeed() {
     final JsonRpcRequestContext request = requestWithParams();
-    final EthHashSolverInputs values =
-        new EthHashSolverInputs(
-            UInt256.fromHexString(hexValue),
-            BaseEncoding.base16().lowerCase().decode(hexValue),
-            30000);
-
-    final String[] expectedValue = {
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-      "0x"
-          + BaseEncoding.base16()
-              .lowerCase()
-              .encode(
-                  DirectAcyclicGraphSeed.dagSeed(30000, miningCoordinator.getEpochCalculator())),
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-      "0x7530"
-    };
+    final PoWSolverInputs values =
+        new PoWSolverInputs(UInt256.fromHexString(hexValue), Bytes.fromHexString(hexValue), 30000);
+
+    final List<String> expectedValue =
+        List.of(
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "0x"
+                + BaseEncoding.base16()
+                    .lowerCase()
+                    .encode(
+                        DirectAcyclicGraphSeed.dagSeed(
+                            30000, new EpochCalculator.DefaultEpochCalculator())),
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "0x7530");
     final JsonRpcResponse expectedResponse =
         new JsonRpcSuccessResponse(request.getRequest().getId(), expectedValue);
     when(miningCoordinator.getWorkDefinition()).thenReturn(Optional.of(values));
 
     final JsonRpcResponse actualResponse = method.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
   public void shouldReturnCorrectResultOnHighBlockSeedEcip1099() {
-    when(miningCoordinator.getEpochCalculator())
-        .thenReturn(new EpochCalculator.Ecip1099EpochCalculator());
+    EpochCalculator epochCalculator = new EpochCalculator.Ecip1099EpochCalculator();
+    when(miningCoordinator.getEpochCalculator()).thenReturn(epochCalculator);
     method = new EthGetWork(miningCoordinator);
     final JsonRpcRequestContext request = requestWithParams();
-    final EthHashSolverInputs values =
-        new EthHashSolverInputs(
-            UInt256.fromHexString(hexValue),
-            BaseEncoding.base16().lowerCase().decode(hexValue),
-            60000);
-
-    final String[] expectedValue = {
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-      "0x"
-          + BaseEncoding.base16()
-              .lowerCase()
-              .encode(
-                  DirectAcyclicGraphSeed.dagSeed(60000, miningCoordinator.getEpochCalculator())),
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-      "0xea60"
-    };
+    final PoWSolverInputs values =
+        new PoWSolverInputs(UInt256.fromHexString(hexValue), Bytes.fromHexString(hexValue), 60000);
+
+    final List<String> expectedValue =
+        List.of(
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "0x"
+                + BaseEncoding.base16()
+                    .lowerCase()
+                    .encode(DirectAcyclicGraphSeed.dagSeed(60000, epochCalculator)),
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "0xea60");
     final JsonRpcResponse expectedResponse =
         new JsonRpcSuccessResponse(request.getRequest().getId(), expectedValue);
     when(miningCoordinator.getWorkDefinition()).thenReturn(Optional.of(values));
 
     final JsonRpcResponse actualResponse = method.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -145,7 +140,7 @@ public void shouldReturnErrorOnNoneMiningNode() {
     when(miningCoordinator.getWorkDefinition()).thenReturn(Optional.empty());
 
     final JsonRpcResponse actualResponse = method.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   private JsonRpcRequestContext requestWithParams(final Object... params) {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthHashrateTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthHashrateTest.java
index e8a7ae882fc..d4ada3f2779 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthHashrateTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthHashrateTest.java
@@ -21,7 +21,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
 
 import java.util.Optional;
 
@@ -34,7 +34,7 @@
 @RunWith(MockitoJUnitRunner.class)
 public class EthHashrateTest {
 
-  @Mock private EthHashMiningCoordinator miningCoordinator;
+  @Mock private PoWMiningCoordinator miningCoordinator;
   private EthHashrate method;
   private final String JSON_RPC_VERSION = "2.0";
   private final String ETH_METHOD = "eth_hashrate";
@@ -57,7 +57,7 @@ public void shouldReturnValueFromMiningCoordinator() {
     when(miningCoordinator.hashesPerSecond()).thenReturn(Optional.of(12L));
 
     final JsonRpcResponse actualResponse = method.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -68,7 +68,7 @@ public void shouldReturnZeroWhenMiningCoordinatorDoesNotHaveHashes() {
     when(miningCoordinator.hashesPerSecond()).thenReturn(Optional.empty());
 
     final JsonRpcResponse actualResponse = method.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   private JsonRpcRequestContext requestWithParams() {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthMiningTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthMiningTest.java
index 495e9099d7a..c118e0c7be8 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthMiningTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthMiningTest.java
@@ -23,7 +23,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -34,7 +34,7 @@
 @RunWith(MockitoJUnitRunner.class)
 public class EthMiningTest {
 
-  @Mock private EthHashMiningCoordinator miningCoordinator;
+  @Mock private PoWMiningCoordinator miningCoordinator;
   private EthMining method;
   private final String JSON_RPC_VERSION = "2.0";
   private final String ETH_METHOD = "eth_mining";
@@ -57,7 +57,7 @@ public void shouldReturnTrueWhenMining() {
     when(miningCoordinator.isMining()).thenReturn(true);
 
     final JsonRpcResponse actualResponse = method.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
     verify(miningCoordinator).isMining();
     verifyNoMoreInteractions(miningCoordinator);
   }
@@ -70,7 +70,7 @@ public void shouldReturnFalseWhenNotMining() {
     when(miningCoordinator.isMining()).thenReturn(false);
 
     final JsonRpcResponse actualResponse = method.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
     verify(miningCoordinator).isMining();
     verifyNoMoreInteractions(miningCoordinator);
   }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewBlockFilterTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewBlockFilterTest.java
index da5e25189df..082873e566c 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewBlockFilterTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewBlockFilterTest.java
@@ -56,7 +56,7 @@ public void getResponse() {
     final JsonRpcResponse expectedResponse =
         new JsonRpcSuccessResponse(request.getRequest().getId(), "0x0");
     final JsonRpcResponse actualResponse = method.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
     verify(filterManager).installBlockFilter();
     verifyNoMoreInteractions(filterManager);
   }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewFilterTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewFilterTest.java
index 27d2cb1b82c..2102add6c72 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewFilterTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthNewFilterTest.java
@@ -23,6 +23,8 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
@@ -33,9 +35,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.query.LogsQuery;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.LogTopic;
+import org.hyperledger.besu.evm.log.LogTopic;
 
 import java.util.Collections;
 import java.util.List;
@@ -66,7 +66,8 @@ public void methodReturnsExpectedMethodName() {
 
   @Test
   public void newFilterWithoutFromBlockParamUsesLatestAsDefault() {
-    final FilterParameter filterParameter = new FilterParameter(null, null, null, null, null);
+    final FilterParameter filterParameter =
+        new FilterParameter(null, null, null, null, null, null, null, null, null);
     final JsonRpcRequestContext request = ethNewFilter(filterParameter);
 
     method.response(request);
@@ -76,7 +77,8 @@ public void newFilterWithoutFromBlockParamUsesLatestAsDefault() {
 
   @Test
   public void newFilterWithoutToBlockParamUsesLatestAsDefault() {
-    final FilterParameter filterParameter = new FilterParameter(null, null, null, null, null);
+    final FilterParameter filterParameter =
+        new FilterParameter(null, null, null, null, null, null, null, null, null);
     final JsonRpcRequestContext request = ethNewFilter(filterParameter);
 
     method.response(request);
@@ -87,7 +89,8 @@ public void newFilterWithoutToBlockParamUsesLatestAsDefault() {
   @Test
   public void newFilterWithoutAddressAndTopicsParamsInstallsEmptyLogFilter() {
     final FilterParameter filterParameter =
-        new FilterParameter(BlockParameter.LATEST, BlockParameter.LATEST, null, null, null);
+        new FilterParameter(
+            BlockParameter.LATEST, BlockParameter.LATEST, null, null, null, null, null, null, null);
     final JsonRpcRequestContext request = ethNewFilter(filterParameter);
     final JsonRpcResponse expectedResponse =
         new JsonRpcSuccessResponse(request.getRequest().getId(), "0x1");
@@ -97,7 +100,7 @@ public void newFilterWithoutAddressAndTopicsParamsInstallsEmptyLogFilter() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
     verify(filterManager)
         .installLogFilter(
             refEq(BlockParameter.LATEST), refEq(BlockParameter.LATEST), eq(expectedLogsQuery));
@@ -116,7 +119,7 @@ public void newFilterWithTopicsOnlyParamInstallsExpectedLogFilter() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
     verify(filterManager)
         .installLogFilter(
             refEq(BlockParameter.LATEST), refEq(BlockParameter.LATEST), eq(expectedLogsQuery));
@@ -135,7 +138,7 @@ public void newFilterWithAddressOnlyParamInstallsExpectedLogFilter() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
     verify(filterManager)
         .installLogFilter(
             refEq(BlockParameter.LATEST), refEq(BlockParameter.LATEST), eq(expectedLogsQuery));
@@ -156,7 +159,7 @@ public void newFilterWithAddressAndTopicsParamInstallsExpectedLogFilter() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
     verify(filterManager)
         .installLogFilter(
             refEq(BlockParameter.LATEST), refEq(BlockParameter.LATEST), eq(expectedLogsQuery));
@@ -168,9 +171,13 @@ public void filterWithInvalidParameters() {
         new FilterParameter(
             BlockParameter.EARLIEST,
             BlockParameter.LATEST,
+            null,
+            null,
             Collections.emptyList(),
             Collections.emptyList(),
-            Hash.ZERO);
+            Hash.ZERO,
+            null,
+            null);
 
     final JsonRpcRequestContext request = ethNewFilter(invalidFilter);
 
@@ -194,8 +201,12 @@ private FilterParameter filterParamWithAddressAndTopics(
     return new FilterParameter(
         BlockParameter.LATEST,
         BlockParameter.LATEST,
+        null,
+        null,
         Optional.ofNullable(address).map(Collections::singletonList).orElse(emptyList()),
         topics,
+        null,
+        null,
         null);
   }
 
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthProtocolVersionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthProtocolVersionTest.java
index 9117ac702d0..1c0a19fe304 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthProtocolVersionTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthProtocolVersionTest.java
@@ -49,7 +49,7 @@ public void shouldReturn63WhenMaxProtocolIsETH63() {
     final JsonRpcResponse expectedResponse =
         new JsonRpcSuccessResponse(request.getRequest().getId(), "0x3f");
     final JsonRpcResponse actualResponse = method.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -63,7 +63,7 @@ public void shouldReturnNullNoEthProtocolsSupported() {
     final JsonRpcResponse expectedResponse =
         new JsonRpcSuccessResponse(request.getRequest().getId(), null);
     final JsonRpcResponse actualResponse = method.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -77,7 +77,7 @@ public void shouldReturn63WhenMixedProtocolsSupported() {
     final JsonRpcResponse expectedResponse =
         new JsonRpcSuccessResponse(request.getRequest().getId(), "0x3f");
     final JsonRpcResponse actualResponse = method.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   private JsonRpcRequestContext requestWithParams(final Object... params) {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendRawTransactionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendRawTransactionTest.java
index 73a97c9d54c..33521b25446 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendRawTransactionTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendRawTransactionTest.java
@@ -41,6 +41,7 @@ public class EthSendRawTransactionTest {
 
   private static final String VALID_TRANSACTION =
       "0xf86d0485174876e800830222e0945aae326516b4f8fe08074b7e972e40a713048d62880de0b6b3a7640000801ba05d4e7998757264daab67df2ce6f7e7a0ae36910778a406ca73898c9899a32b9ea0674700d5c3d1d27f2e6b4469957dfd1a1c49bf92383d80717afc84eb05695d5b";
+
   @Mock private TransactionPool transactionPool;
   private EthSendRawTransaction method;
 
@@ -60,7 +61,7 @@ public void requestIsMissingParameter() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -73,7 +74,7 @@ public void requestHasNullObjectParameter() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -87,7 +88,7 @@ public void requestHasNullArrayParameter() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -103,12 +104,12 @@ public void invalidTransactionRlpDecoding() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
   public void validTransactionIsSentToTransactionPool() {
-    when(transactionPool.addLocalTransaction(any(Transaction.class)))
+    when(transactionPool.addTransactionViaApi(any(Transaction.class)))
         .thenReturn(ValidationResult.valid());
 
     final JsonRpcRequestContext request =
@@ -122,8 +123,8 @@ public void validTransactionIsSentToTransactionPool() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
-    verify(transactionPool).addLocalTransaction(any(Transaction.class));
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+    verify(transactionPool).addTransactionViaApi(any(Transaction.class));
   }
 
   @Test
@@ -135,7 +136,7 @@ public void transactionWithNonceBelowAccountNonceIsRejected() {
   @Test
   public void transactionWithNonceAboveAccountNonceIsRejected() {
     verifyErrorForInvalidTransaction(
-        TransactionInvalidReason.INCORRECT_NONCE, JsonRpcError.INCORRECT_NONCE);
+        TransactionInvalidReason.NONCE_TOO_HIGH, JsonRpcError.NONCE_TOO_HIGH);
   }
 
   @Test
@@ -171,20 +172,20 @@ public void transactionWithNotWhitelistedSenderAccountIsRejected() {
   }
 
   @Test
-  public void transactionWithFeeCapExceededIsRejected() {
+  public void transactionWithIncorrectTransactionTypeIsRejected() {
     verifyErrorForInvalidTransaction(
-        TransactionInvalidReason.TX_FEECAP_EXCEEDED, JsonRpcError.TX_FEECAP_EXCEEDED);
+        TransactionInvalidReason.INVALID_TRANSACTION_FORMAT, JsonRpcError.INVALID_TRANSACTION_TYPE);
   }
 
   @Test
-  public void transactionWithNonZeroGasWithGoQuorumCompatibilityIsRejected() {
+  public void transactionWithFeeCapExceededIsRejected() {
     verifyErrorForInvalidTransaction(
-        TransactionInvalidReason.GAS_PRICE_MUST_BE_ZERO, JsonRpcError.GAS_PRICE_MUST_BE_ZERO);
+        TransactionInvalidReason.TX_FEECAP_EXCEEDED, JsonRpcError.TX_FEECAP_EXCEEDED);
   }
 
   private void verifyErrorForInvalidTransaction(
       final TransactionInvalidReason transactionInvalidReason, final JsonRpcError expectedError) {
-    when(transactionPool.addLocalTransaction(any(Transaction.class)))
+    when(transactionPool.addTransactionViaApi(any(Transaction.class)))
         .thenReturn(ValidationResult.invalid(transactionInvalidReason));
 
     final JsonRpcRequestContext request =
@@ -196,8 +197,8 @@ private void verifyErrorForInvalidTransaction(
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
-    verify(transactionPool).addLocalTransaction(any(Transaction.class));
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+    verify(transactionPool).addTransactionViaApi(any(Transaction.class));
   }
 
   @Test
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendTransactionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendTransactionTest.java
index 46565405900..7f0f5fad084 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendTransactionTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSendTransactionTest.java
@@ -51,6 +51,6 @@ public void requestIsMissingParameter() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSubmitWorkTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSubmitWorkTest.java
index 7a2b7ecfcb2..b63bcc84919 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSubmitWorkTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSubmitWorkTest.java
@@ -18,6 +18,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
@@ -25,14 +26,12 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolution;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolverInputs;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolution;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolverInputs;
 
 import java.util.Optional;
 
-import com.google.common.io.BaseEncoding;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.units.bigints.UInt256;
 import org.junit.Before;
@@ -49,7 +48,7 @@ public class EthSubmitWorkTest {
   private final String hexValue =
       "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff";
 
-  @Mock private EthHashMiningCoordinator miningCoordinator;
+  @Mock private PoWMiningCoordinator miningCoordinator;
 
   @Before
   public void setUp() {
@@ -67,15 +66,14 @@ public void shouldFailIfNoMiningEnabled() {
     final JsonRpcResponse actualResponse = method.response(request);
     final JsonRpcResponse expectedResponse =
         new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.NO_MINING_WORK_FOUND);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
   public void shouldFailIfMissingArguments() {
     final JsonRpcRequestContext request = requestWithParams();
-    final EthHashSolverInputs values =
-        new EthHashSolverInputs(
-            UInt256.fromHexString(hexValue), BaseEncoding.base16().lowerCase().decode(hexValue), 0);
+    final PoWSolverInputs values =
+        new PoWSolverInputs(UInt256.fromHexString(hexValue), Bytes.fromHexString(hexValue), 0);
     when(miningCoordinator.getWorkDefinition()).thenReturn(Optional.of(values));
     assertThatThrownBy(
             () -> method.response(request), "Missing required json rpc parameter at index 0")
@@ -84,21 +82,23 @@ public void shouldFailIfMissingArguments() {
 
   @Test
   public void shouldReturnTrueIfGivenCorrectResult() {
-    final EthHashSolverInputs firstInputs =
-        new EthHashSolverInputs(
+    final PoWSolverInputs firstInputs =
+        new PoWSolverInputs(
             UInt256.fromHexString(
                 "0x0083126e978d4fdf3b645a1cac083126e978d4fdf3b645a1cac083126e978d4f"),
-            new byte[] {
-              15, -114, -104, 87, -95, -36, -17, 120, 52, 1, 124, 61, -6, -66, 78, -27, -57, 118,
-              -18, -64, -103, -91, -74, -121, 42, 91, -14, -98, 101, 86, -43, -51
-            },
+            Bytes.wrap(
+                new byte[] {
+                  15, -114, -104, 87, -95, -36, -17, 120, 52, 1, 124, 61, -6, -66, 78, -27, -57,
+                  118, -18, -64, -103, -91, -74, -121, 42, 91, -14, -98, 101, 86, -43, -51
+                }),
             468);
 
-    final EthHashSolution expectedFirstOutput =
-        new EthHashSolution(
+    final PoWSolution expectedFirstOutput =
+        new PoWSolution(
             -6506032554016940193L,
             Hash.fromHexString(
                 "0xc5e3c33c86d64d0641dd3c86e8ce4628fe0aac0ef7b4c087c5fcaa45d5046d90"),
+            null,
             firstInputs.getPrePowHash());
     final JsonRpcRequestContext request =
         requestWithParams(
@@ -112,7 +112,7 @@ public void shouldReturnTrueIfGivenCorrectResult() {
     when(miningCoordinator.submitWork(expectedFirstOutput)).thenReturn(true);
 
     final JsonRpcResponse actualResponse = method.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -123,7 +123,7 @@ public void shouldReturnErrorOnNoneMiningNode() {
     when(miningCoordinator.getWorkDefinition()).thenReturn(Optional.empty());
 
     final JsonRpcResponse actualResponse = method.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   private JsonRpcRequestContext requestWithParams(final Object... params) {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSyncingTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSyncingTest.java
index aa818e55179..1f3db3ab376 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSyncingTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthSyncingTest.java
@@ -63,7 +63,7 @@ public void shouldReturnFalseWhenSyncStatusIsEmpty() {
     when(synchronizer.getSyncStatus()).thenReturn(optionalSyncStatus);
 
     final JsonRpcResponse actualResponse = method.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
     verify(synchronizer).getSyncStatus();
     verifyNoMoreInteractions(synchronizer);
   }
@@ -80,7 +80,7 @@ public void shouldReturnExpectedValueWhenSyncStatusIsNotEmpty() {
     when(synchronizer.getSyncStatus()).thenReturn(optionalSyncStatus);
 
     final JsonRpcResponse actualResponse = method.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
     verify(synchronizer).getSyncStatus();
     verifyNoMoreInteractions(synchronizer);
   }
@@ -97,7 +97,7 @@ public void shouldReturnExpectedValueWhenFastSyncStatusIsNotEmpty() {
     when(synchronizer.getSyncStatus()).thenReturn(optionalSyncStatus);
 
     final JsonRpcResponse actualResponse = method.response(request);
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
     verify(synchronizer).getSyncStatus();
     verifyNoMoreInteractions(synchronizer);
   }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetEnodeTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetEnodeTest.java
index 7a7512c5e38..826f4aac23c 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetEnodeTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetEnodeTest.java
@@ -26,7 +26,8 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
 import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.util.Optional;
 
@@ -49,7 +50,7 @@ public class NetEnodeTest {
 
   private final DefaultPeer defaultPeer =
       DefaultPeer.fromEnodeURL(
-          EnodeURL.builder()
+          EnodeURLImpl.builder()
               .nodeId(nodeId)
               .ipAddress("1.2.3.4")
               .discoveryPort(7890)
@@ -80,7 +81,8 @@ public void shouldReturnEnode() {
         new JsonRpcSuccessResponse(request.getRequest().getId(), enodeURL.get().toString());
 
     Assertions.assertThat(method.response(request))
-        .isEqualToComparingFieldByField(expectedResponse);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
   }
 
   @Test
@@ -92,7 +94,8 @@ public void shouldReturnErrorWhenP2pDisabled() {
         new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.P2P_DISABLED);
 
     Assertions.assertThat(method.response(request))
-        .isEqualToComparingFieldByField(expectedResponse);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
   }
 
   @Test
@@ -106,7 +109,8 @@ public void shouldReturnErrorWhenP2PEnabledButNoEnodeFound() {
             request.getRequest().getId(), JsonRpcError.P2P_NETWORK_NOT_RUNNING);
 
     Assertions.assertThat(method.response(request))
-        .isEqualToComparingFieldByField(expectedResponse);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
   }
 
   private JsonRpcRequestContext netEnodeRequest() {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetListeningTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetListeningTest.java
index fc0e3e216b0..4660ddf2880 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetListeningTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetListeningTest.java
@@ -52,7 +52,8 @@ public void shouldReturnTrueWhenNetworkIsListening() {
     final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, true);
 
     Assertions.assertThat(method.response(request))
-        .isEqualToComparingFieldByField(expectedResponse);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
   }
 
   @Test
@@ -63,7 +64,8 @@ public void shouldReturnFalseWhenNetworkIsNotListening() {
     final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, false);
 
     Assertions.assertThat(method.response(request))
-        .isEqualToComparingFieldByField(expectedResponse);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
   }
 
   @Test
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetVersionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetVersionTest.java
index 553e26b7920..d80e4023329 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetVersionTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/NetVersionTest.java
@@ -49,7 +49,7 @@ public void shouldReturnNetworkId() {
 
     final JsonRpcResponse response = method.response(request());
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -59,7 +59,7 @@ public void shouldReturnNullWhenNoNetworkId() {
 
     final JsonRpcResponse response = method.response(request());
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   private JsonRpcRequestContext request() {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/RpcModulesTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/RpcModulesTest.java
index c20b1b5c50b..b2339685748 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/RpcModulesTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/RpcModulesTest.java
@@ -36,7 +36,7 @@ public class RpcModulesTest {
 
   @Before
   public void setUp() {
-    method = new RpcModules(ImmutableList.of(RpcApis.DEBUG));
+    method = new RpcModules(ImmutableList.of(RpcApis.DEBUG.name()));
   }
 
   @Test
@@ -54,6 +54,6 @@ public void shouldReturnCorrectResult() {
         new JsonRpcSuccessResponse(request.getRequest().getId(), ImmutableMap.of("debug", "1.0"));
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuPendingTransactionsTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuPendingTransactionsTest.java
index a41ed595684..09b4752fae3 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuPendingTransactionsTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuPendingTransactionsTest.java
@@ -16,7 +16,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
@@ -25,23 +24,16 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.PendingTransactionsParams;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionPendingResult;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
 
-import java.math.BigInteger;
-import java.time.Instant;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.Map;
-import java.util.Optional;
+import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
-import org.apache.tuweni.bytes.Bytes;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -56,12 +48,13 @@ public class TxPoolBesuPendingTransactionsTest {
   private TxPoolBesuPendingTransactions method;
   private final String JSON_RPC_VERSION = "2.0";
   private final String TXPOOL_PENDING_TRANSACTIONS_METHOD = "txpool_besuPendingTransactions";
+  private Set<PendingTransaction> listTrx;
 
   @Before
   public void setUp() {
-    final Set<PendingTransactions.TransactionInfo> listTrx = getPendingTransactions();
+    listTrx = getPendingTransactions();
     method = new TxPoolBesuPendingTransactions(pendingTransactions);
-    when(this.pendingTransactions.getTransactionInfo()).thenReturn(listTrx);
+    when(this.pendingTransactions.getPendingTransactions()).thenReturn(listTrx);
   }
 
   @Test
@@ -79,7 +72,32 @@ public void shouldReturnPendingTransactions() {
     final JsonRpcSuccessResponse actualResponse = (JsonRpcSuccessResponse) method.response(request);
     final Set<TransactionPendingResult> result =
         (Set<TransactionPendingResult>) actualResponse.getResult();
-    assertThat(result.size()).isEqualTo(4);
+    assertThat(result.size()).isEqualTo(getPendingTransactions().size());
+  }
+
+  @Test
+  public void pendingTransactionsGasPricesDoNotHaveLeadingZeroes() {
+    final JsonRpcRequestContext request =
+        new JsonRpcRequestContext(
+            new JsonRpcRequest(
+                JSON_RPC_VERSION, TXPOOL_PENDING_TRANSACTIONS_METHOD, new Object[] {100}));
+
+    final JsonRpcSuccessResponse actualResponse = (JsonRpcSuccessResponse) method.response(request);
+    final Set<TransactionPendingResult> result =
+        (Set<TransactionPendingResult>) actualResponse.getResult();
+
+    assertThat(result)
+        .extracting(TransactionPendingResult::getGasPrice)
+        .filteredOn(Objects::nonNull)
+        .allSatisfy(p -> assertThat(p).doesNotContain("0x0"));
+    assertThat(result)
+        .extracting(TransactionPendingResult::getMaxFeePerGas)
+        .filteredOn(Objects::nonNull)
+        .allSatisfy(p -> assertThat(p).doesNotContain("0x0"));
+    assertThat(result)
+        .extracting(TransactionPendingResult::getMaxPriorityFeePerGas)
+        .filteredOn(Objects::nonNull)
+        .allSatisfy(p -> assertThat(p).doesNotContain("0x0"));
   }
 
   @Test
@@ -100,7 +118,8 @@ public void shouldReturnPendingTransactionsWithLimit() {
   public void shouldReturnPendingTransactionsWithFilter() {
 
     final Map<String, String> fromFilter = new HashMap<>();
-    fromFilter.put("eq", "0x0000000000000000000000000000000000000001");
+    fromFilter.put(
+        "eq", listTrx.stream().findAny().get().getTransaction().getSender().toHexString());
 
     final JsonRpcRequestContext request =
         new JsonRpcRequestContext(
@@ -234,26 +253,11 @@ public void shouldReturnsErrorIfInvalidPredicateUsedForToField() {
         .hasMessageContaining("The `to` filter only supports the `eq` or `action` operator");
   }
 
-  private Set<PendingTransactions.TransactionInfo> getPendingTransactions() {
-    final List<PendingTransactions.TransactionInfo> transactionInfoList = new ArrayList<>();
-    for (int i = 1; i < 5; i++) {
-      Transaction transaction = mock(Transaction.class);
-      when(transaction.getGasPrice()).thenReturn(Wei.of(i));
-      when(transaction.getValue()).thenReturn(Wei.of(i));
-      when(transaction.getGasLimit()).thenReturn((long) i);
-      when(transaction.getNonce()).thenReturn((long) i);
-      when(transaction.getPayload()).thenReturn(Bytes.EMPTY);
-      when(transaction.getV()).thenReturn(BigInteger.ONE);
-      when(transaction.getR()).thenReturn(BigInteger.ONE);
-      when(transaction.getS()).thenReturn(BigInteger.ONE);
-      when(transaction.getSender()).thenReturn(Address.fromHexString(String.valueOf(i)));
-      when(transaction.getTo())
-          .thenReturn(Optional.of(Address.fromHexString(String.valueOf(i + 1))));
-      when(transaction.getHash()).thenReturn(Hash.fromHexStringLenient(String.valueOf(i)));
-      transactionInfoList.add(
-          new PendingTransactions.TransactionInfo(
-              transaction, true, Instant.ofEpochSecond(Integer.MAX_VALUE)));
-    }
-    return new LinkedHashSet<>(transactionInfoList);
+  private Set<PendingTransaction> getPendingTransactions() {
+
+    final BlockDataGenerator gen = new BlockDataGenerator();
+    return gen.transactionsWithAllTypes(4).stream()
+        .map(transaction -> new PendingTransaction.Local(transaction))
+        .collect(Collectors.toUnmodifiableSet());
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuStatisticsTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuStatisticsTest.java
index c1633b37de3..b9646e18ff3 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuStatisticsTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuStatisticsTest.java
@@ -22,8 +22,8 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.PendingTransactionsStatisticsResult;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionInfo;
 
 import com.google.common.collect.Sets;
 import org.junit.Before;
@@ -57,11 +57,11 @@ public void shouldGiveStatistics() {
             new JsonRpcRequest(
                 JSON_RPC_VERSION, TXPOOL_PENDING_TRANSACTIONS_METHOD, new Object[] {}));
 
-    final TransactionInfo local = createTransactionInfo(true);
-    final TransactionInfo secondLocal = createTransactionInfo(true);
-    final TransactionInfo remote = createTransactionInfo(false);
+    final PendingTransaction local = createTransactionInfo(true);
+    final PendingTransaction secondLocal = createTransactionInfo(true);
+    final PendingTransaction remote = createTransactionInfo(false);
     when(pendingTransactions.maxSize()).thenReturn(123L);
-    when(pendingTransactions.getTransactionInfo())
+    when(pendingTransactions.getPendingTransactions())
         .thenReturn(Sets.newHashSet(local, secondLocal, remote));
 
     final JsonRpcSuccessResponse actualResponse = (JsonRpcSuccessResponse) method.response(request);
@@ -72,9 +72,9 @@ public void shouldGiveStatistics() {
     assertThat(result.getMaxSize()).isEqualTo(123);
   }
 
-  private TransactionInfo createTransactionInfo(final boolean local) {
-    final TransactionInfo transactionInfo = mock(TransactionInfo.class);
-    when(transactionInfo.isReceivedFromLocalSource()).thenReturn(local);
-    return transactionInfo;
+  private PendingTransaction createTransactionInfo(final boolean local) {
+    final PendingTransaction pendingTransaction = mock(PendingTransaction.class);
+    when(pendingTransaction.isReceivedFromLocalSource()).thenReturn(local);
+    return pendingTransaction;
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuTransactionsTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuTransactionsTest.java
index 4c20db2e6bb..8af90115964 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuTransactionsTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/TxPoolBesuTransactionsTest.java
@@ -18,14 +18,14 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.PendingTransactionResult;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.PendingTransactionsResult;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.TransactionInfoResult;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionInfo;
 
 import java.time.Instant;
 
@@ -58,26 +58,26 @@ public void returnsCorrectMethodName() {
 
   @Test
   public void shouldReturnPendingTransactions() {
-    Instant addedAt = Instant.ofEpochMilli(10_000_000);
+    long addedAt = 10_000_000;
     final JsonRpcRequestContext request =
         new JsonRpcRequestContext(
             new JsonRpcRequest(
                 JSON_RPC_VERSION, TXPOOL_PENDING_TRANSACTIONS_METHOD, new Object[] {}));
 
-    TransactionInfo transactionInfo = mock(TransactionInfo.class);
-    when(transactionInfo.getHash()).thenReturn(Hash.fromHexString(TRANSACTION_HASH));
-    when(transactionInfo.isReceivedFromLocalSource()).thenReturn(true);
-    when(transactionInfo.getAddedToPoolAt()).thenReturn(addedAt);
-    when(pendingTransactions.getTransactionInfo()).thenReturn(Sets.newHashSet(transactionInfo));
+    PendingTransaction pendingTransaction = mock(PendingTransaction.class);
+    when(pendingTransaction.getHash()).thenReturn(Hash.fromHexString(TRANSACTION_HASH));
+    when(pendingTransaction.isReceivedFromLocalSource()).thenReturn(true);
+    when(pendingTransaction.getAddedAt()).thenReturn(addedAt);
+    when(pendingTransactions.getPendingTransactions())
+        .thenReturn(Sets.newHashSet(pendingTransaction));
 
     final JsonRpcSuccessResponse actualResponse = (JsonRpcSuccessResponse) method.response(request);
     final PendingTransactionsResult result = (PendingTransactionsResult) actualResponse.getResult();
 
-    final TransactionInfoResult actualTransactionInfo =
-        result.getResults().stream().findFirst().get();
+    final PendingTransactionResult actualResult = result.getResults().stream().findFirst().get();
 
-    assertThat(actualTransactionInfo.getHash()).isEqualTo(TRANSACTION_HASH);
-    assertThat(actualTransactionInfo.isReceivedFromLocalSource()).isTrue();
-    assertThat(actualTransactionInfo.getAddedToPoolAt()).isEqualTo(addedAt.toString());
+    assertThat(actualResult.getHash()).isEqualTo(TRANSACTION_HASH);
+    assertThat(actualResult.isReceivedFromLocalSource()).isTrue();
+    assertThat(actualResult.getAddedToPoolAt()).isEqualTo(Instant.ofEpochMilli(addedAt).toString());
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3ClientVersionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3ClientVersionTest.java
index 5e9428ab6b6..833ceb1a0c6 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3ClientVersionTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3ClientVersionTest.java
@@ -46,6 +46,6 @@ public void shouldReturnCorrectResult() {
         new JsonRpcSuccessResponse(request.getRequest().getId(), CLIENT_VERSION);
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3Sha3Test.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3Sha3Test.java
index ffb0684788f..72417114600 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3Sha3Test.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/Web3Sha3Test.java
@@ -46,7 +46,7 @@ public void shouldReturnCorrectResult() {
             "0x47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad");
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -60,7 +60,7 @@ public void shouldReturnEmptyStringResult() {
             "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470");
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -73,7 +73,7 @@ public void shouldReturnErrorOnOddLengthParam() {
         new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -86,7 +86,7 @@ public void shouldReturnErrorOnNonHexParam() {
         new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -99,7 +99,7 @@ public void shouldReturnErrorOnNoPrefixParam() {
         new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -112,7 +112,7 @@ public void shouldReturnErrorOnNoPrefixNonHexParam() {
         new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -126,7 +126,7 @@ public void shouldReturnErrorOnExtraParam() {
         new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -138,6 +138,6 @@ public void shouldReturnErrorOnNoParam() {
         new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdatedTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdatedTest.java
new file mode 100644
index 00000000000..5eadc6c8ba0
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdatedTest.java
@@ -0,0 +1,772 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import static java.util.Collections.emptyList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.INVALID;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.SYNCING;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.VALID;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.merge.MergeContext;
+import org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator;
+import org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator.ForkchoiceResult;
+import org.hyperledger.besu.consensus.merge.blockcreation.PayloadIdentifier;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.GWei;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.EngineForkchoiceUpdatedParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.EnginePayloadAttributesParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.WithdrawalParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.EngineUpdateForkchoiceResult;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.mainnet.WithdrawalsValidator;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import io.vertx.core.Vertx;
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public abstract class AbstractEngineForkchoiceUpdatedTest {
+
+  @FunctionalInterface
+  interface MethodFactory {
+    AbstractEngineForkchoiceUpdated create(
+        final Vertx vertx,
+        final ProtocolSchedule protocolSchedule,
+        final ProtocolContext protocolContext,
+        final MergeMiningCoordinator mergeCoordinator,
+        final EngineCallListener engineCallListener);
+  }
+
+  private final MethodFactory methodFactory;
+  protected AbstractEngineForkchoiceUpdated method;
+
+  public AbstractEngineForkchoiceUpdatedTest(final MethodFactory methodFactory) {
+    this.methodFactory = methodFactory;
+  }
+
+  private static final Vertx vertx = Vertx.vertx();
+  private static final Hash mockHash = Hash.hash(Bytes32.fromHexStringLenient("0x1337deadbeef"));
+
+  private static final EngineForkchoiceUpdatedParameter mockFcuParam =
+      new EngineForkchoiceUpdatedParameter(mockHash, mockHash, mockHash);
+
+  protected static final BlockHeaderTestFixture blockHeaderBuilder =
+      new BlockHeaderTestFixture().baseFeePerGas(Wei.ONE);
+
+  @Mock private ProtocolSpec protocolSpec;
+  @Mock private ProtocolSchedule protocolSchedule;
+  @Mock private ProtocolContext protocolContext;
+
+  @Mock private MergeContext mergeContext;
+
+  @Mock protected MergeMiningCoordinator mergeCoordinator;
+
+  @Mock private MutableBlockchain blockchain;
+
+  @Mock private EngineCallListener engineCallListener;
+
+  @Before
+  public void before() {
+    when(protocolContext.safeConsensusContext(Mockito.any())).thenReturn(Optional.of(mergeContext));
+    when(protocolContext.getBlockchain()).thenReturn(blockchain);
+    when(protocolSpec.getWithdrawalsValidator())
+        .thenReturn(new WithdrawalsValidator.ProhibitedWithdrawals());
+    when(protocolSchedule.getForNextBlockHeader(any(), anyLong())).thenReturn(protocolSpec);
+    this.method =
+        methodFactory.create(
+            vertx, protocolSchedule, protocolContext, mergeCoordinator, engineCallListener);
+  }
+
+  @Test
+  public abstract void shouldReturnExpectedMethodName();
+
+  @Test
+  public void shouldReturnSyncingIfForwardSync() {
+    when(mergeContext.isSyncing()).thenReturn(true);
+    assertSuccessWithPayloadForForkchoiceResult(
+        mockFcuParam, Optional.empty(), mock(ForkchoiceResult.class), SYNCING);
+  }
+
+  @Test
+  public void shouldReturnSyncingIfMissingNewHead() {
+    assertSuccessWithPayloadForForkchoiceResult(
+        mockFcuParam, Optional.empty(), mock(ForkchoiceResult.class), SYNCING);
+  }
+
+  @Test
+  public void shouldReturnInvalidWithLatestValidHashOnBadBlock() {
+    BlockHeader mockHeader = blockHeaderBuilder.buildHeader();
+    Hash latestValidHash = Hash.hash(Bytes32.fromHexStringLenient("0xcafebabe"));
+    when(mergeCoordinator.isBadBlock(mockHeader.getHash())).thenReturn(true);
+    when(mergeCoordinator.getLatestValidHashOfBadBlock(mockHeader.getHash()))
+        .thenReturn(Optional.of(latestValidHash));
+
+    assertSuccessWithPayloadForForkchoiceResult(
+        new EngineForkchoiceUpdatedParameter(
+            mockHeader.getHash(), Hash.ZERO, mockHeader.getParentHash()),
+        Optional.empty(),
+        mock(ForkchoiceResult.class),
+        INVALID,
+        Optional.of(latestValidHash));
+  }
+
+  @Test
+  public void shouldReturnSyncingOnHeadNotFound() {
+    assertSuccessWithPayloadForForkchoiceResult(
+        mockFcuParam, Optional.empty(), mock(ForkchoiceResult.class), SYNCING);
+  }
+
+  @Test
+  public void shouldReturnValidWithoutFinalizedOrPayload() {
+    BlockHeader mockHeader = blockHeaderBuilder.buildHeader();
+    when(mergeCoordinator.getOrSyncHeadByHash(mockHeader.getHash(), Hash.ZERO))
+        .thenReturn(Optional.of(mockHeader));
+    if (validateTerminalPoWBlock()) {
+      when(mergeCoordinator.latestValidAncestorDescendsFromTerminal(mockHeader)).thenReturn(true);
+    }
+
+    assertSuccessWithPayloadForForkchoiceResult(
+        new EngineForkchoiceUpdatedParameter(mockHeader.getHash(), Hash.ZERO, Hash.ZERO),
+        Optional.empty(),
+        ForkchoiceResult.withResult(Optional.empty(), Optional.of(mockHeader)),
+        VALID);
+  }
+
+  @Test
+  public void shouldReturnInvalidOnOldTimestamp() {
+    BlockHeader parent = blockHeaderBuilder.buildHeader();
+    BlockHeader mockHeader =
+        blockHeaderBuilder
+            .parentHash(parent.getHash())
+            .timestamp(parent.getTimestamp())
+            .buildHeader();
+    when(blockchain.getBlockHeader(parent.getHash())).thenReturn(Optional.of(parent));
+    if (validateTerminalPoWBlock()) {
+      when(mergeCoordinator.latestValidAncestorDescendsFromTerminal(mockHeader)).thenReturn(true);
+    }
+    when(mergeCoordinator.isDescendantOf(any(), any())).thenReturn(true);
+    when(mergeContext.isSyncing()).thenReturn(false);
+    when(mergeCoordinator.getOrSyncHeadByHash(mockHeader.getHash(), parent.getHash()))
+        .thenReturn(Optional.of(mockHeader));
+    when(mergeCoordinator.updateForkChoice(mockHeader, parent.getHash(), parent.getHash()))
+        .thenReturn(
+            ForkchoiceResult.withFailure(
+                ForkchoiceResult.Status.INVALID,
+                "new head timestamp not greater than parent",
+                Optional.of(parent.getHash())));
+
+    EngineForkchoiceUpdatedParameter param =
+        new EngineForkchoiceUpdatedParameter(
+            mockHeader.getBlockHash(), parent.getBlockHash(), parent.getBlockHash());
+
+    EngineUpdateForkchoiceResult resp = fromSuccessResp(resp(param, Optional.empty()));
+
+    assertThat(resp.getPayloadStatus().getStatus()).isEqualTo(INVALID);
+    assertThat(resp.getPayloadStatus().getLatestValidHash()).isPresent();
+    assertThat(resp.getPayloadStatus().getLatestValidHash().get()).isEqualTo(parent.getBlockHash());
+    assertThat(resp.getPayloadStatus().getError())
+        .isEqualTo("new head timestamp not greater than parent");
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnValidWithNewHeadAndFinalizedNoPayload() {
+    BlockHeader mockParent = blockHeaderBuilder.number(9L).buildHeader();
+    BlockHeader mockHeader =
+        blockHeaderBuilder.number(10L).parentHash(mockParent.getHash()).buildHeader();
+    setupValidForkchoiceUpdate(mockHeader);
+
+    assertSuccessWithPayloadForForkchoiceResult(
+        new EngineForkchoiceUpdatedParameter(mockHeader.getHash(), Hash.ZERO, mockParent.getHash()),
+        Optional.empty(),
+        ForkchoiceResult.withResult(Optional.of(mockParent), Optional.of(mockHeader)),
+        VALID);
+  }
+
+  @Test
+  public void shouldReturnValidWithoutFinalizedWithPayload() {
+    BlockHeader mockHeader = blockHeaderBuilder.buildHeader();
+    when(mergeCoordinator.getOrSyncHeadByHash(mockHeader.getHash(), Hash.ZERO))
+        .thenReturn(Optional.of(mockHeader));
+    if (validateTerminalPoWBlock()) {
+      when(mergeCoordinator.latestValidAncestorDescendsFromTerminal(mockHeader)).thenReturn(true);
+    }
+
+    var payloadParams =
+        new EnginePayloadAttributesParameter(
+            String.valueOf(System.currentTimeMillis()),
+            Bytes32.fromHexStringLenient("0xDEADBEEF").toHexString(),
+            Address.ECREC.toString(),
+            null);
+    var mockPayloadId =
+        PayloadIdentifier.forPayloadParams(
+            mockHeader.getHash(),
+            payloadParams.getTimestamp(),
+            payloadParams.getPrevRandao(),
+            payloadParams.getSuggestedFeeRecipient(),
+            Optional.empty());
+
+    when(mergeCoordinator.preparePayload(
+            mockHeader,
+            payloadParams.getTimestamp(),
+            payloadParams.getPrevRandao(),
+            Address.ECREC,
+            Optional.empty()))
+        .thenReturn(mockPayloadId);
+
+    var res =
+        assertSuccessWithPayloadForForkchoiceResult(
+            new EngineForkchoiceUpdatedParameter(mockHeader.getHash(), Hash.ZERO, Hash.ZERO),
+            Optional.of(payloadParams),
+            ForkchoiceResult.withResult(Optional.empty(), Optional.of(mockHeader)),
+            VALID);
+
+    assertThat(res.getPayloadId()).isEqualTo(mockPayloadId.toHexString());
+  }
+
+  @Test
+  public void shouldReturnInvalidForkchoiceStateIfFinalizedBlockIsUnknown() {
+    BlockHeader newHead = blockHeaderBuilder.buildHeader();
+    Hash finalizedBlockHash = Hash.hash(Bytes32.fromHexStringLenient("0x424abcdef"));
+
+    when(blockchain.getBlockHeader(finalizedBlockHash)).thenReturn(Optional.empty());
+    when(mergeContext.isSyncing()).thenReturn(false);
+    when(mergeCoordinator.getOrSyncHeadByHash(newHead.getHash(), finalizedBlockHash))
+        .thenReturn(Optional.of(newHead));
+
+    var resp =
+        resp(
+            new EngineForkchoiceUpdatedParameter(
+                newHead.getBlockHash(), finalizedBlockHash, finalizedBlockHash),
+            Optional.empty());
+
+    assertInvalidForkchoiceState(resp);
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnInvalidForkchoiceStateIfFinalizedBlockIsNotAnAncestorOfNewHead() {
+    BlockHeader finalized = blockHeaderBuilder.buildHeader();
+    BlockHeader newHead = blockHeaderBuilder.buildHeader();
+
+    when(blockchain.getBlockHeader(newHead.getHash())).thenReturn(Optional.of(newHead));
+    when(blockchain.getBlockHeader(finalized.getHash())).thenReturn(Optional.of(finalized));
+    when(mergeContext.isSyncing()).thenReturn(false);
+    when(mergeCoordinator.getOrSyncHeadByHash(newHead.getHash(), finalized.getBlockHash()))
+        .thenReturn(Optional.of(newHead));
+    when(mergeCoordinator.isDescendantOf(finalized, newHead)).thenReturn(false);
+
+    var resp =
+        resp(
+            new EngineForkchoiceUpdatedParameter(
+                newHead.getBlockHash(), finalized.getBlockHash(), finalized.getBlockHash()),
+            Optional.empty());
+
+    assertInvalidForkchoiceState(resp);
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnInvalidForkchoiceStateIfSafeHeadZeroWithFinalizedBlock() {
+    BlockHeader parent = blockHeaderBuilder.buildHeader();
+    BlockHeader newHead =
+        blockHeaderBuilder
+            .parentHash(parent.getHash())
+            .timestamp(parent.getTimestamp())
+            .buildHeader();
+
+    when(blockchain.getBlockHeader(parent.getHash())).thenReturn(Optional.of(parent));
+    when(mergeContext.isSyncing()).thenReturn(false);
+    when(mergeCoordinator.getOrSyncHeadByHash(newHead.getHash(), parent.getBlockHash()))
+        .thenReturn(Optional.of(newHead));
+
+    var resp =
+        resp(
+            new EngineForkchoiceUpdatedParameter(
+                newHead.getBlockHash(), parent.getBlockHash(), Hash.ZERO),
+            Optional.empty());
+
+    assertInvalidForkchoiceState(resp);
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnInvalidForkchoiceStateIfSafeBlockIsUnknown() {
+    BlockHeader finalized = blockHeaderBuilder.buildHeader();
+    BlockHeader newHead =
+        blockHeaderBuilder
+            .parentHash(finalized.getHash())
+            .timestamp(finalized.getTimestamp())
+            .buildHeader();
+    Hash safeBlockBlockHash = Hash.hash(Bytes32.fromHexStringLenient("0x424abcdef"));
+
+    when(blockchain.getBlockHeader(finalized.getHash())).thenReturn(Optional.of(finalized));
+    when(blockchain.getBlockHeader(safeBlockBlockHash)).thenReturn(Optional.empty());
+    when(mergeContext.isSyncing()).thenReturn(false);
+    when(mergeCoordinator.getOrSyncHeadByHash(newHead.getHash(), finalized.getBlockHash()))
+        .thenReturn(Optional.of(newHead));
+    when(mergeCoordinator.isDescendantOf(finalized, newHead)).thenReturn(true);
+
+    var resp =
+        resp(
+            new EngineForkchoiceUpdatedParameter(
+                newHead.getBlockHash(), finalized.getBlockHash(), safeBlockBlockHash),
+            Optional.empty());
+
+    assertInvalidForkchoiceState(resp);
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnInvalidForkchoiceStateIfSafeBlockIsNotADescendantOfFinalized() {
+    BlockHeader finalized = blockHeaderBuilder.buildHeader();
+    BlockHeader newHead = blockHeaderBuilder.buildHeader();
+    BlockHeader safeBlock = blockHeaderBuilder.buildHeader();
+
+    when(blockchain.getBlockHeader(newHead.getHash())).thenReturn(Optional.of(newHead));
+    when(blockchain.getBlockHeader(finalized.getHash())).thenReturn(Optional.of(finalized));
+    when(blockchain.getBlockHeader(safeBlock.getHash())).thenReturn(Optional.of(safeBlock));
+    when(mergeContext.isSyncing()).thenReturn(false);
+    when(mergeCoordinator.getOrSyncHeadByHash(newHead.getHash(), finalized.getBlockHash()))
+        .thenReturn(Optional.of(newHead));
+    when(mergeCoordinator.isDescendantOf(finalized, newHead)).thenReturn(true);
+    when(mergeCoordinator.isDescendantOf(finalized, safeBlock)).thenReturn(false);
+
+    var resp =
+        resp(
+            new EngineForkchoiceUpdatedParameter(
+                newHead.getBlockHash(), finalized.getBlockHash(), safeBlock.getBlockHash()),
+            Optional.empty());
+
+    assertInvalidForkchoiceState(resp);
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnInvalidForkchoiceStateIfSafeBlockIsNotAnAncestorOfNewHead() {
+    BlockHeader finalized = blockHeaderBuilder.buildHeader();
+    BlockHeader newHead = blockHeaderBuilder.buildHeader();
+    BlockHeader safeBlock = blockHeaderBuilder.buildHeader();
+
+    when(blockchain.getBlockHeader(newHead.getHash())).thenReturn(Optional.of(newHead));
+    when(blockchain.getBlockHeader(finalized.getHash())).thenReturn(Optional.of(finalized));
+    when(blockchain.getBlockHeader(safeBlock.getHash())).thenReturn(Optional.of(safeBlock));
+    when(mergeContext.isSyncing()).thenReturn(false);
+    when(mergeCoordinator.getOrSyncHeadByHash(newHead.getHash(), finalized.getBlockHash()))
+        .thenReturn(Optional.of(newHead));
+    when(mergeCoordinator.isDescendantOf(finalized, newHead)).thenReturn(true);
+    when(mergeCoordinator.isDescendantOf(finalized, safeBlock)).thenReturn(true);
+    when(mergeCoordinator.isDescendantOf(safeBlock, newHead)).thenReturn(false);
+
+    var resp =
+        resp(
+            new EngineForkchoiceUpdatedParameter(
+                newHead.getBlockHash(), finalized.getBlockHash(), safeBlock.getBlockHash()),
+            Optional.empty());
+
+    assertInvalidForkchoiceState(resp);
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldIgnoreUpdateToOldHeadAndNotPreparePayload() {
+    BlockHeader mockHeader = blockHeaderBuilder.buildHeader();
+
+    when(mergeCoordinator.getOrSyncHeadByHash(mockHeader.getHash(), Hash.ZERO))
+        .thenReturn(Optional.of(mockHeader));
+    if (validateTerminalPoWBlock()) {
+      when(mergeCoordinator.latestValidAncestorDescendsFromTerminal(mockHeader)).thenReturn(true);
+    }
+
+    var ignoreOldHeadUpdateRes = ForkchoiceResult.withIgnoreUpdateToOldHead(mockHeader);
+    when(mergeCoordinator.updateForkChoice(any(), any(), any())).thenReturn(ignoreOldHeadUpdateRes);
+
+    var payloadParams =
+        new EnginePayloadAttributesParameter(
+            String.valueOf(System.currentTimeMillis()),
+            Bytes32.fromHexStringLenient("0xDEADBEEF").toHexString(),
+            Address.ECREC.toString(),
+            null);
+
+    var resp =
+        (JsonRpcSuccessResponse)
+            resp(
+                new EngineForkchoiceUpdatedParameter(
+                    mockHeader.getBlockHash(), Hash.ZERO, Hash.ZERO),
+                Optional.of(payloadParams));
+
+    var forkchoiceRes = (EngineUpdateForkchoiceResult) resp.getResult();
+
+    verify(mergeCoordinator, never()).preparePayload(any(), any(), any(), any(), any());
+
+    assertThat(forkchoiceRes.getPayloadStatus().getStatus()).isEqualTo(VALID);
+    assertThat(forkchoiceRes.getPayloadStatus().getError()).isNull();
+    assertThat(forkchoiceRes.getPayloadStatus().getLatestValidHashAsString())
+        .isEqualTo(mockHeader.getHash().toHexString());
+    assertThat(forkchoiceRes.getPayloadId()).isNull();
+    assertThat(forkchoiceRes.getPayloadId()).isNull();
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnInvalidIfPayloadTimestampNotGreaterThanHead() {
+    BlockHeader mockParent = blockHeaderBuilder.number(9L).buildHeader();
+    BlockHeader mockHeader =
+        blockHeaderBuilder.number(10L).parentHash(mockParent.getHash()).buildHeader();
+    setupValidForkchoiceUpdate(mockHeader);
+
+    final long timestampNotGreaterThanHead = mockHeader.getTimestamp();
+
+    var payloadParams =
+        new EnginePayloadAttributesParameter(
+            String.valueOf(timestampNotGreaterThanHead),
+            Bytes32.fromHexStringLenient("0xDEADBEEF").toHexString(),
+            Address.ECREC.toString(),
+            emptyList());
+
+    var resp =
+        resp(
+            new EngineForkchoiceUpdatedParameter(
+                mockHeader.getHash(), Hash.ZERO, mockParent.getHash()),
+            Optional.of(payloadParams));
+
+    assertInvalidForkchoiceState(resp, expectedInvalidPayloadError());
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnInvalidIfWithdrawalsIsNotNull_WhenWithdrawalsProhibited() {
+    BlockHeader mockParent = blockHeaderBuilder.number(9L).buildHeader();
+    BlockHeader mockHeader =
+        blockHeaderBuilder.number(10L).parentHash(mockParent.getHash()).buildHeader();
+    setupValidForkchoiceUpdate(mockHeader);
+
+    var payloadParams =
+        new EnginePayloadAttributesParameter(
+            String.valueOf(System.currentTimeMillis()),
+            Bytes32.fromHexStringLenient("0xDEADBEEF").toHexString(),
+            Address.ECREC.toString(),
+            emptyList());
+
+    var resp =
+        resp(
+            new EngineForkchoiceUpdatedParameter(
+                mockHeader.getHash(), Hash.ZERO, mockParent.getHash()),
+            Optional.of(payloadParams));
+
+    assertInvalidForkchoiceState(resp, expectedInvalidPayloadError());
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnValidIfWithdrawalsIsNull_WhenWithdrawalsProhibited() {
+    BlockHeader mockParent = blockHeaderBuilder.number(9L).buildHeader();
+    BlockHeader mockHeader =
+        blockHeaderBuilder.number(10L).parentHash(mockParent.getHash()).buildHeader();
+    setupValidForkchoiceUpdate(mockHeader);
+
+    var payloadParams =
+        new EnginePayloadAttributesParameter(
+            String.valueOf(System.currentTimeMillis()),
+            Bytes32.fromHexStringLenient("0xDEADBEEF").toHexString(),
+            Address.ECREC.toString(),
+            null);
+
+    var mockPayloadId =
+        PayloadIdentifier.forPayloadParams(
+            mockHeader.getHash(),
+            payloadParams.getTimestamp(),
+            payloadParams.getPrevRandao(),
+            payloadParams.getSuggestedFeeRecipient(),
+            Optional.empty());
+
+    when(mergeCoordinator.preparePayload(
+            mockHeader,
+            payloadParams.getTimestamp(),
+            payloadParams.getPrevRandao(),
+            Address.ECREC,
+            Optional.empty()))
+        .thenReturn(mockPayloadId);
+
+    assertSuccessWithPayloadForForkchoiceResult(
+        new EngineForkchoiceUpdatedParameter(mockHeader.getHash(), Hash.ZERO, mockParent.getHash()),
+        Optional.of(payloadParams),
+        ForkchoiceResult.withResult(Optional.empty(), Optional.of(mockHeader)),
+        VALID);
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnInvalidIfWithdrawalsIsNull_WhenWithdrawalsAllowed() {
+    when(protocolSpec.getWithdrawalsValidator())
+        .thenReturn(new WithdrawalsValidator.AllowedWithdrawals());
+
+    BlockHeader mockParent = blockHeaderBuilder.number(9L).buildHeader();
+    BlockHeader mockHeader =
+        blockHeaderBuilder.number(10L).parentHash(mockParent.getHash()).buildHeader();
+    setupValidForkchoiceUpdate(mockHeader);
+
+    var payloadParams =
+        new EnginePayloadAttributesParameter(
+            String.valueOf(System.currentTimeMillis()),
+            Bytes32.fromHexStringLenient("0xDEADBEEF").toHexString(),
+            Address.ECREC.toString(),
+            null);
+
+    var resp =
+        resp(
+            new EngineForkchoiceUpdatedParameter(
+                mockHeader.getHash(), Hash.ZERO, mockParent.getHash()),
+            Optional.of(payloadParams));
+
+    assertInvalidForkchoiceState(resp, expectedInvalidPayloadError());
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnValidIfWithdrawalsIsNotNull_WhenWithdrawalsAllowed() {
+    when(protocolSpec.getWithdrawalsValidator())
+        .thenReturn(new WithdrawalsValidator.AllowedWithdrawals());
+
+    BlockHeader mockParent = blockHeaderBuilder.number(9L).buildHeader();
+    BlockHeader mockHeader =
+        blockHeaderBuilder.number(10L).parentHash(mockParent.getHash()).buildHeader();
+    setupValidForkchoiceUpdate(mockHeader);
+
+    var withdrawalParameters =
+        List.of(
+            new WithdrawalParameter(
+                "0x1",
+                "0x10000",
+                "0x0100000000000000000000000000000000000000",
+                GWei.ONE.toHexString()));
+
+    var payloadParams =
+        new EnginePayloadAttributesParameter(
+            String.valueOf(System.currentTimeMillis()),
+            Bytes32.fromHexStringLenient("0xDEADBEEF").toHexString(),
+            Address.ECREC.toString(),
+            withdrawalParameters);
+
+    final Optional<List<Withdrawal>> withdrawals =
+        Optional.of(
+            withdrawalParameters.stream()
+                .map(WithdrawalParameter::toWithdrawal)
+                .collect(Collectors.toList()));
+
+    var mockPayloadId =
+        PayloadIdentifier.forPayloadParams(
+            mockHeader.getHash(),
+            payloadParams.getTimestamp(),
+            payloadParams.getPrevRandao(),
+            payloadParams.getSuggestedFeeRecipient(),
+            withdrawals);
+
+    when(mergeCoordinator.preparePayload(
+            mockHeader,
+            payloadParams.getTimestamp(),
+            payloadParams.getPrevRandao(),
+            Address.ECREC,
+            withdrawals))
+        .thenReturn(mockPayloadId);
+
+    assertSuccessWithPayloadForForkchoiceResult(
+        new EngineForkchoiceUpdatedParameter(mockHeader.getHash(), Hash.ZERO, mockParent.getHash()),
+        Optional.of(payloadParams),
+        ForkchoiceResult.withResult(Optional.empty(), Optional.of(mockHeader)),
+        VALID);
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnValidIfProtocolScheduleIsEmpty() {
+    when(protocolSchedule.getForNextBlockHeader(any(), anyLong())).thenReturn(null);
+
+    BlockHeader mockParent = blockHeaderBuilder.number(9L).buildHeader();
+    BlockHeader mockHeader =
+        blockHeaderBuilder.number(10L).parentHash(mockParent.getHash()).buildHeader();
+    setupValidForkchoiceUpdate(mockHeader);
+
+    var payloadParams =
+        new EnginePayloadAttributesParameter(
+            String.valueOf(System.currentTimeMillis()),
+            Bytes32.fromHexStringLenient("0xDEADBEEF").toHexString(),
+            Address.ECREC.toString(),
+            null);
+
+    var mockPayloadId =
+        PayloadIdentifier.forPayloadParams(
+            mockHeader.getHash(),
+            payloadParams.getTimestamp(),
+            payloadParams.getPrevRandao(),
+            payloadParams.getSuggestedFeeRecipient(),
+            Optional.empty());
+
+    when(mergeCoordinator.preparePayload(
+            mockHeader,
+            payloadParams.getTimestamp(),
+            payloadParams.getPrevRandao(),
+            Address.ECREC,
+            Optional.empty()))
+        .thenReturn(mockPayloadId);
+
+    assertSuccessWithPayloadForForkchoiceResult(
+        new EngineForkchoiceUpdatedParameter(mockHeader.getHash(), Hash.ZERO, mockParent.getHash()),
+        Optional.of(payloadParams),
+        ForkchoiceResult.withResult(Optional.empty(), Optional.of(mockHeader)),
+        VALID);
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  private void setupValidForkchoiceUpdate(final BlockHeader mockHeader) {
+    when(blockchain.getBlockHeader(any())).thenReturn(Optional.of(mockHeader));
+    when(mergeCoordinator.getOrSyncHeadByHash(mockHeader.getHash(), Hash.ZERO))
+        .thenReturn(Optional.of(mockHeader));
+    if (validateTerminalPoWBlock()) {
+      when(mergeCoordinator.latestValidAncestorDescendsFromTerminal(mockHeader)).thenReturn(true);
+    }
+    when(mergeCoordinator.isDescendantOf(any(), any())).thenReturn(true);
+  }
+
+  protected EngineUpdateForkchoiceResult assertSuccessWithPayloadForForkchoiceResult(
+      final EngineForkchoiceUpdatedParameter fcuParam,
+      final Optional<EnginePayloadAttributesParameter> payloadParam,
+      final ForkchoiceResult forkchoiceResult,
+      final EngineStatus expectedStatus) {
+    return assertSuccessWithPayloadForForkchoiceResult(
+        fcuParam, payloadParam, forkchoiceResult, expectedStatus, Optional.empty());
+  }
+
+  protected EngineUpdateForkchoiceResult assertSuccessWithPayloadForForkchoiceResult(
+      final EngineForkchoiceUpdatedParameter fcuParam,
+      final Optional<EnginePayloadAttributesParameter> payloadParam,
+      final ForkchoiceResult forkchoiceResult,
+      final EngineStatus expectedStatus,
+      final Optional<Hash> maybeLatestValidHash) {
+
+    // result from mergeCoordinator has no new finalized, new head:
+    when(mergeCoordinator.updateForkChoice(
+            any(BlockHeader.class), any(Hash.class), any(Hash.class)))
+        .thenReturn(forkchoiceResult);
+    var resp = resp(fcuParam, payloadParam);
+    var res = fromSuccessResp(resp);
+
+    assertThat(res.getPayloadStatus().getStatusAsString()).isEqualTo(expectedStatus.name());
+
+    if (expectedStatus.equals(VALID)) {
+      // check conditions when response is valid
+      assertThat(res.getPayloadStatus().getLatestValidHash())
+          .isEqualTo(forkchoiceResult.getNewHead().map(BlockHeader::getBlockHash));
+      assertThat(res.getPayloadStatus().getError()).isNullOrEmpty();
+      if (payloadParam.isPresent()) {
+        assertThat(res.getPayloadId()).isNotNull();
+      } else {
+        assertThat(res.getPayloadId()).isNull();
+      }
+    } else {
+      // assert null latest valid and payload identifier:
+      assertThat(res.getPayloadStatus().getLatestValidHash()).isEqualTo(maybeLatestValidHash);
+      assertThat(res.getPayloadId()).isNull();
+    }
+
+    // assert that listeners are always notified
+    verify(mergeContext)
+        .fireNewUnverifiedForkchoiceEvent(
+            fcuParam.getHeadBlockHash(),
+            fcuParam.getSafeBlockHash(),
+            fcuParam.getFinalizedBlockHash());
+
+    verify(engineCallListener, times(1)).executionEngineCalled();
+
+    return res;
+  }
+
+  protected boolean validateTerminalPoWBlock() {
+    return false;
+  }
+
+  protected JsonRpcError expectedInvalidPayloadError() {
+    return JsonRpcError.INVALID_PARAMS;
+  }
+
+  private JsonRpcResponse resp(
+      final EngineForkchoiceUpdatedParameter forkchoiceParam,
+      final Optional<EnginePayloadAttributesParameter> payloadParam) {
+    return method.response(
+        new JsonRpcRequestContext(
+            new JsonRpcRequest(
+                "2.0",
+                getMethodName(),
+                Stream.concat(Stream.of(forkchoiceParam), payloadParam.stream()).toArray())));
+  }
+
+  abstract String getMethodName();
+
+  private EngineUpdateForkchoiceResult fromSuccessResp(final JsonRpcResponse resp) {
+    assertThat(resp.getType()).isEqualTo(JsonRpcResponseType.SUCCESS);
+    return Optional.of(resp)
+        .map(JsonRpcSuccessResponse.class::cast)
+        .map(JsonRpcSuccessResponse::getResult)
+        .map(EngineUpdateForkchoiceResult.class::cast)
+        .get();
+  }
+
+  private void assertInvalidForkchoiceState(final JsonRpcResponse resp) {
+    assertInvalidForkchoiceState(resp, JsonRpcError.INVALID_FORKCHOICE_STATE);
+  }
+
+  private void assertInvalidForkchoiceState(
+      final JsonRpcResponse resp, final JsonRpcError jsonRpcError) {
+    assertThat(resp.getType()).isEqualTo(JsonRpcResponseType.ERROR);
+
+    var errorResp = (JsonRpcErrorResponse) resp;
+    assertThat(errorResp.getError()).isEqualTo(jsonRpcError);
+    assertThat(errorResp.getError().getMessage()).isEqualTo(jsonRpcError.getMessage());
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineGetPayloadTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineGetPayloadTest.java
new file mode 100644
index 00000000000..e31c96871b1
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineGetPayloadTest.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.merge.MergeContext;
+import org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator;
+import org.hyperledger.besu.consensus.merge.blockcreation.PayloadIdentifier;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
+
+import java.util.Collections;
+import java.util.Optional;
+
+import io.vertx.core.Vertx;
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public abstract class AbstractEngineGetPayloadTest {
+
+  @FunctionalInterface
+  interface MethodFactory {
+    AbstractEngineGetPayload create(
+        final Vertx vertx,
+        final ProtocolContext protocolContext,
+        final MergeMiningCoordinator mergeCoordinator,
+        final BlockResultFactory ethPeers,
+        final EngineCallListener engineCallListener);
+  }
+
+  private final MethodFactory methodFactory;
+  protected AbstractEngineGetPayload method;
+
+  public AbstractEngineGetPayloadTest(final MethodFactory methodFactory) {
+    this.methodFactory = methodFactory;
+  }
+
+  private static final Vertx vertx = Vertx.vertx();
+  protected static final BlockResultFactory factory = new BlockResultFactory();
+  protected static final PayloadIdentifier mockPid =
+      PayloadIdentifier.forPayloadParams(
+          Hash.ZERO, 1337L, Bytes32.random(), Address.fromHexString("0x42"), Optional.empty());
+  protected static final BlockHeader mockHeader =
+      new BlockHeaderTestFixture().prevRandao(Bytes32.random()).buildHeader();
+  private static final Block mockBlock =
+      new Block(mockHeader, new BlockBody(Collections.emptyList(), Collections.emptyList()));
+  private static final BlockWithReceipts mockBlockWithReceipts =
+      new BlockWithReceipts(mockBlock, Collections.emptyList());
+  private static final Block mockBlockWithWithdrawals =
+      new Block(
+          mockHeader,
+          new BlockBody(
+              Collections.emptyList(),
+              Collections.emptyList(),
+              Optional.of(Collections.emptyList()),
+              Optional.empty()));
+  private static final Block mockBlockWithDeposits =
+      new Block(
+          mockHeader,
+          new BlockBody(
+              Collections.emptyList(),
+              Collections.emptyList(),
+              Optional.empty(),
+              Optional.of(Collections.emptyList())));
+  protected static final BlockWithReceipts mockBlockWithReceiptsAndWithdrawals =
+      new BlockWithReceipts(mockBlockWithWithdrawals, Collections.emptyList());
+
+  protected static final BlockWithReceipts mockBlockWithReceiptsAndDeposits =
+      new BlockWithReceipts(mockBlockWithDeposits, Collections.emptyList());
+
+  @Mock private ProtocolContext protocolContext;
+
+  @Mock protected MergeContext mergeContext;
+  @Mock private MergeMiningCoordinator mergeMiningCoordinator;
+
+  @Mock protected EngineCallListener engineCallListener;
+
+  @Before
+  public void before() {
+    when(mergeContext.retrieveBlockById(mockPid)).thenReturn(Optional.of(mockBlockWithReceipts));
+    when(protocolContext.safeConsensusContext(Mockito.any())).thenReturn(Optional.of(mergeContext));
+    this.method =
+        methodFactory.create(
+            vertx, protocolContext, mergeMiningCoordinator, factory, engineCallListener);
+  }
+
+  @Test
+  public abstract void shouldReturnExpectedMethodName();
+
+  @Test
+  public abstract void shouldReturnBlockForKnownPayloadId();
+
+  @Test
+  public void shouldFailForUnknownPayloadId() {
+    final var resp =
+        resp(
+            getMethodName(),
+            PayloadIdentifier.forPayloadParams(
+                Hash.ZERO, 0L, Bytes32.random(), Address.fromHexString("0x42"), Optional.empty()));
+    assertThat(resp).isInstanceOf(JsonRpcErrorResponse.class);
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  abstract String getMethodName();
+
+  protected JsonRpcResponse resp(final String methodName, final PayloadIdentifier pid) {
+    return method.response(
+        new JsonRpcRequestContext(
+            new JsonRpcRequest("2.0", methodName, new Object[] {pid.serialize()})));
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayloadTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayloadTest.java
new file mode 100644
index 00000000000..e8fb1409e4d
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayloadTest.java
@@ -0,0 +1,685 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.ACCEPTED;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.INVALID;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.SYNCING;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.VALID;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.DepositParameterTestFixture.DEPOSIT_PARAM_1;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.WithdrawalParameterTestFixture.WITHDRAWAL_PARAM_1;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.INVALID_PARAMS;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.merge.MergeContext;
+import org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.BlockProcessingOutputs;
+import org.hyperledger.besu.ethereum.BlockProcessingResult;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.DepositParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.EnginePayloadParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.UnsignedLongParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.WithdrawalParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.EnginePayloadStatusResult;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.Deposit;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
+import org.hyperledger.besu.ethereum.mainnet.BodyValidation;
+import org.hyperledger.besu.ethereum.mainnet.DepositsValidator;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.mainnet.WithdrawalsValidator;
+import org.hyperledger.besu.ethereum.trie.MerkleTrieException;
+import org.hyperledger.besu.plugin.services.exception.StorageException;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import io.vertx.core.Vertx;
+import org.apache.tuweni.bytes.Bytes32;
+import org.jetbrains.annotations.NotNull;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public abstract class AbstractEngineNewPayloadTest {
+
+  @FunctionalInterface
+  interface MethodFactory {
+    AbstractEngineNewPayload create(
+        final Vertx vertx,
+        final ProtocolSchedule protocolSchedule,
+        final ProtocolContext protocolContext,
+        final MergeMiningCoordinator mergeCoordinator,
+        final EthPeers ethPeers,
+        final EngineCallListener engineCallListener);
+  }
+
+  private final MethodFactory methodFactory;
+  protected AbstractEngineNewPayload method;
+
+  public AbstractEngineNewPayloadTest(final MethodFactory methodFactory) {
+    this.methodFactory = methodFactory;
+  }
+
+  private static final Vertx vertx = Vertx.vertx();
+  private static final Hash mockHash = Hash.hash(Bytes32.fromHexStringLenient("0x1337deadbeef"));
+  private static final Address depositContractAddress =
+      Address.fromHexString("0x00000000219ab540356cbb839cbe05303d7705fa");
+
+  @Mock private ProtocolSpec protocolSpec;
+  @Mock private ProtocolSchedule protocolSchedule;
+  @Mock private ProtocolContext protocolContext;
+
+  @Mock private MergeContext mergeContext;
+
+  @Mock protected MergeMiningCoordinator mergeCoordinator;
+
+  @Mock protected MutableBlockchain blockchain;
+
+  @Mock private EthPeers ethPeers;
+
+  @Mock protected EngineCallListener engineCallListener;
+
+  @Before
+  public void before() {
+    when(protocolContext.safeConsensusContext(Mockito.any())).thenReturn(Optional.of(mergeContext));
+    when(protocolContext.getBlockchain()).thenReturn(blockchain);
+    when(protocolSpec.getWithdrawalsValidator())
+        .thenReturn(new WithdrawalsValidator.ProhibitedWithdrawals());
+    when(protocolSpec.getDepositsValidator())
+        .thenReturn(new DepositsValidator.ProhibitedDeposits());
+    when(protocolSchedule.getByBlockHeader(any())).thenReturn(protocolSpec);
+    when(ethPeers.peerCount()).thenReturn(1);
+    this.method =
+        methodFactory.create(
+            vertx,
+            protocolSchedule,
+            protocolContext,
+            mergeCoordinator,
+            ethPeers,
+            engineCallListener);
+  }
+
+  @Test
+  public abstract void shouldReturnExpectedMethodName();
+
+  @Test
+  public void shouldReturnValid() {
+    BlockHeader mockHeader =
+        setupValidPayload(
+            new BlockProcessingResult(Optional.of(new BlockProcessingOutputs(null, List.of()))),
+            Optional.empty(),
+            Optional.empty());
+
+    var resp = resp(mockPayload(mockHeader, Collections.emptyList()));
+
+    assertValidResponse(mockHeader, resp);
+  }
+
+  @Test
+  public void shouldReturnInvalidOnBlockExecutionError() {
+    BlockHeader mockHeader =
+        setupValidPayload(
+            new BlockProcessingResult("error 42"), Optional.empty(), Optional.empty());
+
+    var resp = resp(mockPayload(mockHeader, Collections.emptyList()));
+
+    EnginePayloadStatusResult res = fromSuccessResp(resp);
+    assertThat(res.getLatestValidHash().get()).isEqualTo(mockHash);
+    assertThat(res.getStatusAsString()).isEqualTo(INVALID.name());
+    assertThat(res.getError()).isEqualTo("error 42");
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnAcceptedOnLatestValidAncestorEmpty() {
+    BlockHeader mockHeader = createBlockHeader(Optional.empty(), Optional.empty());
+    when(blockchain.getBlockByHash(mockHeader.getHash())).thenReturn(Optional.empty());
+    when(blockchain.getBlockHeader(mockHeader.getParentHash()))
+        .thenReturn(Optional.of(mock(BlockHeader.class)));
+    when(mergeCoordinator.getLatestValidAncestor(any(BlockHeader.class)))
+        .thenReturn(Optional.empty());
+    if (validateTerminalPoWBlock()) {
+      when(mergeCoordinator.latestValidAncestorDescendsFromTerminal(any(BlockHeader.class)))
+          .thenReturn(true);
+    }
+
+    var resp = resp(mockPayload(mockHeader, Collections.emptyList()));
+
+    EnginePayloadStatusResult res = fromSuccessResp(resp);
+    assertThat(res.getLatestValidHash()).isEmpty();
+    assertThat(res.getStatusAsString()).isEqualTo(ACCEPTED.name());
+    assertThat(res.getError()).isNull();
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnSuccessOnAlreadyPresent() {
+    BlockHeader mockHeader = new BlockHeaderTestFixture().baseFeePerGas(Wei.ONE).buildHeader();
+    Block mockBlock =
+        new Block(mockHeader, new BlockBody(Collections.emptyList(), Collections.emptyList()));
+
+    when(blockchain.getBlockByHash(any())).thenReturn(Optional.of(mockBlock));
+
+    var resp = resp(mockPayload(mockHeader, Collections.emptyList()));
+
+    assertValidResponse(mockHeader, resp);
+  }
+
+  @Test
+  public void shouldReturnInvalidWithLatestValidHashIsABadBlock() {
+    BlockHeader mockHeader = createBlockHeader(Optional.empty(), Optional.empty());
+    Hash latestValidHash = Hash.hash(Bytes32.fromHexStringLenient("0xcafebabe"));
+
+    when(blockchain.getBlockByHash(mockHeader.getHash())).thenReturn(Optional.empty());
+    when(mergeCoordinator.isBadBlock(mockHeader.getHash())).thenReturn(true);
+    when(mergeCoordinator.getLatestValidHashOfBadBlock(mockHeader.getHash()))
+        .thenReturn(Optional.of(latestValidHash));
+
+    var resp = resp(mockPayload(mockHeader, Collections.emptyList()));
+
+    EnginePayloadStatusResult res = fromSuccessResp(resp);
+    assertThat(res.getLatestValidHash()).isEqualTo(Optional.of(latestValidHash));
+    assertThat(res.getStatusAsString()).isEqualTo(INVALID.name());
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldNotReturnInvalidOnStorageException() {
+    BlockHeader mockHeader =
+        setupValidPayload(
+            new BlockProcessingResult(Optional.empty(), new StorageException("database bedlam")),
+            Optional.empty(),
+            Optional.empty());
+
+    var resp = resp(mockPayload(mockHeader, Collections.emptyList()));
+
+    fromErrorResp(resp);
+    verify(engineCallListener, times(1)).executionEngineCalled();
+    verify(mergeCoordinator, times(0)).addBadBlock(any(), any());
+    // verify mainnetBlockValidator does not add to bad block manager
+  }
+
+  @Test
+  public void shouldNotReturnInvalidOnHandledMerkleTrieException() {
+    BlockHeader mockHeader =
+        setupValidPayload(
+            new BlockProcessingResult(Optional.empty(), new MerkleTrieException("missing leaf")),
+            Optional.empty(),
+            Optional.empty());
+
+    var resp = resp(mockPayload(mockHeader, Collections.emptyList()));
+
+    verify(engineCallListener, times(1)).executionEngineCalled();
+    verify(mergeCoordinator, times(0)).addBadBlock(any(), any());
+
+    fromErrorResp(resp);
+  }
+
+  @Test
+  public void shouldNotReturnInvalidOnThrownMerkleTrieException() {
+    BlockHeader mockHeader = createBlockHeader(Optional.empty(), Optional.empty());
+    when(blockchain.getBlockByHash(mockHeader.getHash())).thenReturn(Optional.empty());
+    when(blockchain.getBlockHeader(mockHeader.getParentHash()))
+        .thenReturn(Optional.of(mock(BlockHeader.class)));
+    when(mergeCoordinator.getLatestValidAncestor(any(BlockHeader.class)))
+        .thenReturn(Optional.of(mockHash));
+    if (validateTerminalPoWBlock()) {
+      when(mergeCoordinator.latestValidAncestorDescendsFromTerminal(any(BlockHeader.class)))
+          .thenReturn(true);
+    }
+    when(mergeCoordinator.rememberBlock(any())).thenThrow(new MerkleTrieException("missing leaf"));
+
+    var resp = resp(mockPayload(mockHeader, Collections.emptyList()));
+
+    verify(engineCallListener, times(1)).executionEngineCalled();
+    verify(mergeCoordinator, never()).addBadBlock(any(), any());
+
+    fromErrorResp(resp);
+  }
+
+  @Test
+  public void shouldReturnInvalidBlockHashOnBadHashParameter() {
+    BlockHeader mockHeader = new BlockHeaderTestFixture().buildHeader();
+
+    var resp = resp(mockPayload(mockHeader, Collections.emptyList()));
+
+    EnginePayloadStatusResult res = fromSuccessResp(resp);
+    assertThat(res.getLatestValidHash()).isEmpty();
+    assertThat(res.getStatusAsString()).isEqualTo(getExpectedInvalidBlockHashStatus().name());
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldCheckBlockValidityBeforeCheckingByHashForExisting() {
+    BlockHeader realHeader = new BlockHeaderTestFixture().baseFeePerGas(Wei.ONE).buildHeader();
+    BlockHeader paramHeader = spy(realHeader);
+    when(paramHeader.getHash()).thenReturn(Hash.fromHexStringLenient("0x1337"));
+
+    var resp = resp(mockPayload(paramHeader, Collections.emptyList()));
+
+    EnginePayloadStatusResult res = fromSuccessResp(resp);
+    assertThat(res.getLatestValidHash()).isEmpty();
+    assertThat(res.getStatusAsString()).isEqualTo(getExpectedInvalidBlockHashStatus().name());
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnInvalidOnMalformedTransactions() {
+    BlockHeader mockHeader = new BlockHeaderTestFixture().buildHeader();
+    when(mergeCoordinator.getLatestValidAncestor(any(Hash.class)))
+        .thenReturn(Optional.of(mockHash));
+
+    var resp = resp(mockPayload(mockHeader, List.of("0xDEAD", "0xBEEF")));
+
+    EnginePayloadStatusResult res = fromSuccessResp(resp);
+    assertThat(res.getLatestValidHash().get()).isEqualTo(mockHash);
+    assertThat(res.getStatusAsString()).isEqualTo(INVALID.name());
+    assertThat(res.getError()).isEqualTo("Failed to decode transactions from block parameter");
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnInvalidOnOldTimestampInBlock() {
+    BlockHeader parent = new BlockHeaderTestFixture().baseFeePerGas(Wei.ONE).buildHeader();
+    BlockHeader mockHeader =
+        new BlockHeaderTestFixture()
+            .baseFeePerGas(Wei.ONE)
+            .parentHash(parent.getHash())
+            .timestamp(parent.getTimestamp())
+            .buildHeader();
+    when(blockchain.getBlockByHash(mockHeader.getHash())).thenReturn(Optional.empty());
+    when(blockchain.getBlockHeader(parent.getHash())).thenReturn(Optional.of(parent));
+    var resp = resp(mockPayload(mockHeader, Collections.emptyList()));
+
+    assertThat(resp.getType()).isEqualTo(JsonRpcResponseType.SUCCESS);
+    var res = ((JsonRpcSuccessResponse) resp).getResult();
+    assertThat(res).isInstanceOf(EnginePayloadStatusResult.class);
+    var payloadStatusResult = (EnginePayloadStatusResult) res;
+    assertThat(payloadStatusResult.getStatus()).isEqualTo(INVALID);
+    assertThat(payloadStatusResult.getError()).isEqualTo("block timestamp not greater than parent");
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldRespondWithSyncingDuringForwardSync() {
+    BlockHeader mockHeader = new BlockHeaderTestFixture().baseFeePerGas(Wei.ONE).buildHeader();
+    when(mergeContext.isSyncing()).thenReturn(Boolean.TRUE);
+    var resp = resp(mockPayload(mockHeader, Collections.emptyList()));
+
+    EnginePayloadStatusResult res = fromSuccessResp(resp);
+    assertThat(res.getError()).isNull();
+    assertThat(res.getStatusAsString()).isEqualTo(SYNCING.name());
+    assertThat(res.getLatestValidHash()).isEmpty();
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldRespondWithSyncingDuringBackwardsSync() {
+    BlockHeader mockHeader = new BlockHeaderTestFixture().baseFeePerGas(Wei.ONE).buildHeader();
+    when(mergeCoordinator.appendNewPayloadToSync(any()))
+        .thenReturn(CompletableFuture.completedFuture(null));
+    var resp = resp(mockPayload(mockHeader, Collections.emptyList()));
+
+    EnginePayloadStatusResult res = fromSuccessResp(resp);
+    assertThat(res.getLatestValidHash()).isEmpty();
+    assertThat(res.getStatusAsString()).isEqualTo(SYNCING.name());
+    assertThat(res.getError()).isNull();
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  @Ignore
+  public void shouldRespondWithInvalidTerminalPowBlock() {
+    // TODO: implement this as part of https://github.com/hyperledger/besu/issues/3141
+    // mergeContext is a mock
+    //    assertThat(mergeContext.getTerminalTotalDifficulty()).isNull();
+  }
+
+  @Test
+  public void shouldRespondWithInvalidIfExtraDataIsNull() {
+    BlockHeader realHeader = new BlockHeaderTestFixture().baseFeePerGas(Wei.ONE).buildHeader();
+    BlockHeader paramHeader = spy(realHeader);
+    when(paramHeader.getHash()).thenReturn(Hash.fromHexStringLenient("0x1337"));
+    when(paramHeader.getExtraData().toHexString()).thenReturn(null);
+
+    var resp = resp(mockPayload(paramHeader, Collections.emptyList()));
+
+    EnginePayloadStatusResult res = fromSuccessResp(resp);
+    assertThat(res.getLatestValidHash()).isEmpty();
+    assertThat(res.getStatusAsString()).isEqualTo(INVALID.name());
+    assertThat(res.getError()).isEqualTo("Field extraData must not be null");
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnInvalidWhenBadBlock() {
+    when(mergeCoordinator.isBadBlock(any(Hash.class))).thenReturn(true);
+    BlockHeader mockHeader = new BlockHeaderTestFixture().baseFeePerGas(Wei.ONE).buildHeader();
+    var resp = resp(mockPayload(mockHeader, Collections.emptyList()));
+
+    EnginePayloadStatusResult res = fromSuccessResp(resp);
+    assertThat(res.getLatestValidHash()).contains(Hash.ZERO);
+    assertThat(res.getStatusAsString()).isEqualTo(INVALID.name());
+    assertThat(res.getError()).isEqualTo("Block already present in bad block manager.");
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnInvalidIfWithdrawalsIsNotNull_WhenWithdrawalsProhibited() {
+    final List<WithdrawalParameter> withdrawals = List.of();
+    when(protocolSpec.getWithdrawalsValidator())
+        .thenReturn(new WithdrawalsValidator.ProhibitedWithdrawals());
+
+    var resp =
+        resp(
+            mockPayload(
+                createBlockHeader(Optional.of(Collections.emptyList()), Optional.empty()),
+                Collections.emptyList(),
+                withdrawals,
+                null));
+
+    final JsonRpcError jsonRpcError = fromErrorResp(resp);
+    assertThat(jsonRpcError.getCode()).isEqualTo(INVALID_PARAMS.getCode());
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnValidIfWithdrawalsIsNull_WhenWithdrawalsProhibited() {
+    final List<WithdrawalParameter> withdrawals = null;
+    when(protocolSpec.getWithdrawalsValidator())
+        .thenReturn(new WithdrawalsValidator.ProhibitedWithdrawals());
+    BlockHeader mockHeader =
+        setupValidPayload(
+            new BlockProcessingResult(Optional.of(new BlockProcessingOutputs(null, List.of()))),
+            Optional.empty(),
+            Optional.empty());
+
+    var resp = resp(mockPayload(mockHeader, Collections.emptyList(), withdrawals, null));
+
+    assertValidResponse(mockHeader, resp);
+  }
+
+  @Test
+  public void shouldReturnInvalidIfWithdrawalsIsNull_WhenWithdrawalsAllowed() {
+    final List<WithdrawalParameter> withdrawals = null;
+    when(protocolSpec.getWithdrawalsValidator())
+        .thenReturn(new WithdrawalsValidator.AllowedWithdrawals());
+
+    var resp =
+        resp(
+            mockPayload(
+                createBlockHeader(Optional.empty(), Optional.empty()),
+                Collections.emptyList(),
+                withdrawals,
+                null));
+
+    assertThat(fromErrorResp(resp).getCode()).isEqualTo(INVALID_PARAMS.getCode());
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnValidIfWithdrawalsIsNotNull_WhenWithdrawalsAllowed() {
+    final List<WithdrawalParameter> withdrawalsParam = List.of(WITHDRAWAL_PARAM_1);
+    final List<Withdrawal> withdrawals = List.of(WITHDRAWAL_PARAM_1.toWithdrawal());
+    when(protocolSpec.getWithdrawalsValidator())
+        .thenReturn(new WithdrawalsValidator.AllowedWithdrawals());
+    BlockHeader mockHeader =
+        setupValidPayload(
+            new BlockProcessingResult(Optional.of(new BlockProcessingOutputs(null, List.of()))),
+            Optional.of(withdrawals),
+            Optional.empty());
+
+    var resp = resp(mockPayload(mockHeader, Collections.emptyList(), withdrawalsParam, null));
+
+    assertValidResponse(mockHeader, resp);
+  }
+
+  @Test
+  public void shouldReturnInvalidIfDepositsIsNotNull_WhenDepositsProhibited() {
+    final List<DepositParameter> deposits = List.of();
+    when(protocolSpec.getDepositsValidator())
+        .thenReturn(new DepositsValidator.ProhibitedDeposits());
+
+    var resp =
+        resp(
+            mockPayload(
+                createBlockHeader(Optional.empty(), Optional.of(Collections.emptyList())),
+                Collections.emptyList(),
+                null,
+                deposits));
+
+    final JsonRpcError jsonRpcError = fromErrorResp(resp);
+    assertThat(jsonRpcError.getCode()).isEqualTo(INVALID_PARAMS.getCode());
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnValidIfDepositsIsNull_WhenDepositsProhibited() {
+    final List<DepositParameter> deposits = null;
+    when(protocolSpec.getDepositsValidator())
+        .thenReturn(new DepositsValidator.ProhibitedDeposits());
+    BlockHeader mockHeader =
+        setupValidPayload(
+            new BlockProcessingResult(Optional.of(new BlockProcessingOutputs(null, List.of()))),
+            Optional.empty(),
+            Optional.empty());
+
+    var resp = resp(mockPayload(mockHeader, Collections.emptyList(), null, deposits));
+
+    assertValidResponse(mockHeader, resp);
+  }
+
+  @Test
+  public void shouldReturnInvalidIfDepositsIsNull_WhenDepositsAllowed() {
+    final List<DepositParameter> deposits = null;
+    when(protocolSpec.getDepositsValidator())
+        .thenReturn(new DepositsValidator.AllowedDeposits(depositContractAddress));
+
+    var resp =
+        resp(
+            mockPayload(
+                createBlockHeader(Optional.empty(), Optional.empty()),
+                Collections.emptyList(),
+                null,
+                deposits));
+
+    assertThat(fromErrorResp(resp).getCode()).isEqualTo(INVALID_PARAMS.getCode());
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnValidIfDepositsIsNotNull_WhenDepositsAllowed() {
+    final List<DepositParameter> depositsParam = List.of(DEPOSIT_PARAM_1);
+    final List<Deposit> deposits = List.of(DEPOSIT_PARAM_1.toDeposit());
+    when(protocolSpec.getDepositsValidator())
+        .thenReturn(new DepositsValidator.AllowedDeposits(depositContractAddress));
+    BlockHeader mockHeader =
+        setupValidPayload(
+            new BlockProcessingResult(Optional.of(new BlockProcessingOutputs(null, List.of()))),
+            Optional.empty(),
+            Optional.of(deposits));
+
+    var resp = resp(mockPayload(mockHeader, Collections.emptyList(), null, depositsParam));
+
+    assertValidResponse(mockHeader, resp);
+  }
+
+  @Test
+  public void shouldReturnValidIfProtocolScheduleIsEmpty() {
+    when(protocolSchedule.getByBlockHeader(any())).thenReturn(null);
+    BlockHeader mockHeader =
+        setupValidPayload(
+            new BlockProcessingResult(Optional.of(new BlockProcessingOutputs(null, List.of()))),
+            Optional.empty(),
+            Optional.empty());
+
+    var resp = resp(mockPayload(mockHeader, Collections.emptyList()));
+
+    assertValidResponse(mockHeader, resp);
+  }
+
+  protected JsonRpcResponse resp(final EnginePayloadParameter payload) {
+    return method.response(
+        new JsonRpcRequestContext(
+            new JsonRpcRequest(
+                "2.0", RpcMethod.ENGINE_NEW_PAYLOAD_V2.getMethodName(), new Object[] {payload})));
+  }
+
+  protected EnginePayloadParameter mockPayload(final BlockHeader header, final List<String> txs) {
+    return new EnginePayloadParameter(
+        header.getHash(),
+        header.getParentHash(),
+        header.getCoinbase(),
+        header.getStateRoot(),
+        new UnsignedLongParameter(header.getNumber()),
+        header.getBaseFee().map(w -> w.toHexString()).orElse("0x0"),
+        new UnsignedLongParameter(header.getGasLimit()),
+        new UnsignedLongParameter(header.getGasUsed()),
+        new UnsignedLongParameter(header.getTimestamp()),
+        header.getExtraData() == null ? null : header.getExtraData().toHexString(),
+        header.getReceiptsRoot(),
+        header.getLogsBloom(),
+        header.getPrevRandao().map(Bytes32::toHexString).orElse("0x0"),
+        txs,
+        null,
+        null);
+  }
+
+  private EnginePayloadParameter mockPayload(
+      final BlockHeader header,
+      final List<String> txs,
+      final List<WithdrawalParameter> withdrawals,
+      final List<DepositParameter> deposits) {
+    return new EnginePayloadParameter(
+        header.getHash(),
+        header.getParentHash(),
+        header.getCoinbase(),
+        header.getStateRoot(),
+        new UnsignedLongParameter(header.getNumber()),
+        header.getBaseFee().map(w -> w.toHexString()).orElse("0x0"),
+        new UnsignedLongParameter(header.getGasLimit()),
+        new UnsignedLongParameter(header.getGasUsed()),
+        new UnsignedLongParameter(header.getTimestamp()),
+        header.getExtraData() == null ? null : header.getExtraData().toHexString(),
+        header.getReceiptsRoot(),
+        header.getLogsBloom(),
+        header.getPrevRandao().map(Bytes32::toHexString).orElse("0x0"),
+        txs,
+        withdrawals,
+        deposits);
+  }
+
+  @NotNull
+  private BlockHeader setupValidPayload(
+      final BlockProcessingResult value,
+      final Optional<List<Withdrawal>> maybeWithdrawals,
+      final Optional<List<Deposit>> maybeDeposits) {
+    BlockHeader mockHeader = createBlockHeader(maybeWithdrawals, maybeDeposits);
+    when(blockchain.getBlockByHash(mockHeader.getHash())).thenReturn(Optional.empty());
+    when(blockchain.getBlockHeader(mockHeader.getParentHash()))
+        .thenReturn(Optional.of(mock(BlockHeader.class)));
+    when(mergeCoordinator.getLatestValidAncestor(any(BlockHeader.class)))
+        .thenReturn(Optional.of(mockHash));
+    if (validateTerminalPoWBlock()) {
+      when(mergeCoordinator.latestValidAncestorDescendsFromTerminal(any(BlockHeader.class)))
+          .thenReturn(true);
+    }
+    when(mergeCoordinator.rememberBlock(any())).thenReturn(value);
+    return mockHeader;
+  }
+
+  protected boolean validateTerminalPoWBlock() {
+    return false;
+  }
+
+  protected ExecutionEngineJsonRpcMethod.EngineStatus getExpectedInvalidBlockHashStatus() {
+    return INVALID;
+  }
+
+  protected EnginePayloadStatusResult fromSuccessResp(final JsonRpcResponse resp) {
+    assertThat(resp.getType()).isEqualTo(JsonRpcResponseType.SUCCESS);
+    return Optional.of(resp)
+        .map(JsonRpcSuccessResponse.class::cast)
+        .map(JsonRpcSuccessResponse::getResult)
+        .map(EnginePayloadStatusResult.class::cast)
+        .get();
+  }
+
+  private JsonRpcError fromErrorResp(final JsonRpcResponse resp) {
+    assertThat(resp.getType()).isEqualTo(JsonRpcResponseType.ERROR);
+    return Optional.of(resp)
+        .map(JsonRpcErrorResponse.class::cast)
+        .map(JsonRpcErrorResponse::getError)
+        .get();
+  }
+
+  protected BlockHeader createBlockHeader(
+      final Optional<List<Withdrawal>> maybeWithdrawals,
+      final Optional<List<Deposit>> maybeDeposits) {
+    BlockHeader parentBlockHeader =
+        new BlockHeaderTestFixture().baseFeePerGas(Wei.ONE).buildHeader();
+    BlockHeader mockHeader =
+        new BlockHeaderTestFixture()
+            .baseFeePerGas(Wei.ONE)
+            .parentHash(parentBlockHeader.getParentHash())
+            .number(parentBlockHeader.getNumber() + 1)
+            .timestamp(parentBlockHeader.getTimestamp() + 1)
+            .withdrawalsRoot(maybeWithdrawals.map(BodyValidation::withdrawalsRoot).orElse(null))
+            .depositsRoot(maybeDeposits.map(BodyValidation::depositsRoot).orElse(null))
+            .buildHeader();
+    return mockHeader;
+  }
+
+  private void assertValidResponse(final BlockHeader mockHeader, final JsonRpcResponse resp) {
+    EnginePayloadStatusResult res = fromSuccessResp(resp);
+    assertThat(res.getLatestValidHash().get()).isEqualTo(mockHeader.getHash());
+    assertThat(res.getStatusAsString()).isEqualTo(VALID.name());
+    assertThat(res.getError()).isNull();
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeCapabilitiesTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeCapabilitiesTest.java
new file mode 100644
index 00000000000..2a30a2e5dcb
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeCapabilitiesTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod.ENGINE_EXCHANGE_CAPABILITIES;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import io.vertx.core.Vertx;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class EngineExchangeCapabilitiesTest {
+  private EngineExchangeCapabilities method;
+  private static final Vertx vertx = Vertx.vertx();
+
+  @Mock private ProtocolContext protocolContext;
+
+  @Mock private EngineCallListener engineCallListener;
+
+  @Before
+  public void setUp() {
+    this.method = new EngineExchangeCapabilities(vertx, protocolContext, engineCallListener);
+  }
+
+  @Test
+  public void shouldReturnExpectedMethodName() {
+    assertThat(method.getName()).isEqualTo("engine_exchangeCapabilities");
+  }
+
+  @Test
+  public void shouldReturnAllSupportedEngineApiRpcNames() {
+    var response = resp(List.of("engine_newPayloadV1", "engine_newPayloadV2", "nonsense"));
+
+    var result = fromSuccessResp(response);
+    assertThat(result).allMatch(name -> name.startsWith("engine_"));
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldNotReturnSelf() {
+    var response = resp(Collections.emptyList());
+
+    var result = fromSuccessResp(response);
+    assertThat(result).allMatch(name -> !ENGINE_EXCHANGE_CAPABILITIES.getMethodName().equals(name));
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  private JsonRpcResponse resp(final List<String> capabilitiesParam) {
+    return method.response(
+        new JsonRpcRequestContext(
+            new JsonRpcRequest(
+                "2.0",
+                ENGINE_EXCHANGE_CAPABILITIES.getMethodName(),
+                new Object[] {capabilitiesParam})));
+  }
+
+  @SuppressWarnings("unchecked")
+  private List<String> fromSuccessResp(final JsonRpcResponse resp) {
+    assertThat(resp.getType()).isEqualTo(JsonRpcResponseType.SUCCESS);
+    return Optional.of(resp)
+        .map(JsonRpcSuccessResponse.class::cast)
+        .map(JsonRpcSuccessResponse::getResult)
+        .map(List.class::cast)
+        .get();
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeTransitionConfigurationTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeTransitionConfigurationTest.java
new file mode 100644
index 00000000000..0180d0269c7
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeTransitionConfigurationTest.java
@@ -0,0 +1,267 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.merge.MergeContext;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.EngineExchangeTransitionConfigurationParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.UnsignedLongParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.EngineExchangeTransitionConfigurationResult;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.ParsedExtraData;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
+
+import java.math.BigInteger;
+import java.util.Map;
+import java.util.Optional;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.vertx.core.Vertx;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class EngineExchangeTransitionConfigurationTest {
+  private EngineExchangeTransitionConfiguration method;
+  private static final Vertx vertx = Vertx.vertx();
+
+  @Mock private ProtocolContext protocolContext;
+
+  @Mock private MergeContext mergeContext;
+
+  @Mock private EngineCallListener engineCallListener;
+
+  @Before
+  public void setUp() {
+    when(protocolContext.safeConsensusContext(Mockito.any())).thenReturn(Optional.of(mergeContext));
+
+    this.method =
+        new EngineExchangeTransitionConfiguration(vertx, protocolContext, engineCallListener);
+  }
+
+  @Test
+  public void shouldReturnExpectedMethodName() {
+    // will break as specs change, intentional:
+    assertThat(method.getName()).isEqualTo("engine_exchangeTransitionConfigurationV1");
+  }
+
+  @Test
+  public void shouldNotReturnInvalidParamsOnTerminalBlockNumberNotZero() {
+    var mockBlockHeader =
+        new BlockHeaderTestFixture().difficulty(Difficulty.of(1339L)).number(420).buildHeader();
+    when(mergeContext.getTerminalPoWBlock()).thenReturn(Optional.of(mockBlockHeader));
+    when(mergeContext.getTerminalTotalDifficulty()).thenReturn(Difficulty.of(1337L));
+
+    var response =
+        resp(
+            new EngineExchangeTransitionConfigurationParameter(
+                "0", Hash.ZERO.toHexString(), new UnsignedLongParameter(1L)));
+
+    var result = fromSuccessResp(response);
+    assertThat(result.getTerminalTotalDifficulty()).isEqualTo(Difficulty.of(1337L));
+    assertThat(result.getTerminalBlockHash()).isEqualTo(mockBlockHeader.getHash());
+    assertThat(result.getTerminalBlockNumber()).isEqualTo(mockBlockHeader.getNumber());
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnZerosOnTerminalPoWBlockHeaderEmpty() {
+    when(mergeContext.getTerminalPoWBlock()).thenReturn(Optional.empty());
+    when(mergeContext.getTerminalTotalDifficulty()).thenReturn(Difficulty.of(1337L));
+
+    var response =
+        resp(
+            new EngineExchangeTransitionConfigurationParameter(
+                "0", Hash.ZERO.toHexString(), new UnsignedLongParameter(0L)));
+
+    var result = fromSuccessResp(response);
+    assertThat(result.getTerminalTotalDifficulty()).isEqualTo(Difficulty.of(1337L));
+    assertThat(result.getTerminalBlockHash()).isEqualTo(Hash.ZERO);
+    assertThat(result.getTerminalBlockNumber()).isEqualTo(0L);
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnDefaultOnNoTerminalTotalDifficultyConfigured() {
+    var response =
+        resp(
+            new EngineExchangeTransitionConfigurationParameter(
+                "0", Hash.ZERO.toHexString(), new UnsignedLongParameter(0L)));
+
+    var result = fromSuccessResp(response);
+    assertThat(result.getTerminalTotalDifficulty())
+        .isEqualTo(
+            UInt256.valueOf(
+                new BigInteger(
+                    "115792089237316195423570985008687907853269984665640564039457584007913129638912",
+                    10)));
+    assertThat(result.getTerminalBlockHash()).isEqualTo(Hash.ZERO);
+    assertThat(result.getTerminalBlockNumber()).isEqualTo(0L);
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnConfigurationOnConfigurationMisMatch() {
+    final BlockHeader fakeBlockHeader = createBlockHeader(Hash.fromHexStringLenient("0x01"), 42);
+    when(mergeContext.getTerminalPoWBlock()).thenReturn(Optional.of(fakeBlockHeader));
+    when(mergeContext.getTerminalTotalDifficulty()).thenReturn(Difficulty.of(24));
+
+    var response =
+        resp(
+            new EngineExchangeTransitionConfigurationParameter(
+                "1",
+                Hash.fromHexStringLenient("0xff").toHexString(),
+                new UnsignedLongParameter(0L)));
+
+    var result = fromSuccessResp(response);
+    assertThat(result.getTerminalTotalDifficulty()).isEqualTo(Difficulty.of(24));
+    assertThat(result.getTerminalBlockHash()).isEqualTo(Hash.fromHexStringLenient("0x01"));
+    assertThat(result.getTerminalBlockNumber()).isEqualTo(42);
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnConfigurationOnConfigurationMatch() {
+    final BlockHeader fakeBlockHeader = createBlockHeader(Hash.fromHexStringLenient("0x01"), 42);
+    when(mergeContext.getTerminalPoWBlock()).thenReturn(Optional.of(fakeBlockHeader));
+    when(mergeContext.getTerminalTotalDifficulty()).thenReturn(Difficulty.of(24));
+
+    var response =
+        resp(
+            new EngineExchangeTransitionConfigurationParameter(
+                "24",
+                Hash.fromHexStringLenient("0x01").toHexString(),
+                new UnsignedLongParameter(0)));
+
+    var result = fromSuccessResp(response);
+    assertThat(result.getTerminalTotalDifficulty()).isEqualTo(Difficulty.of(24));
+    assertThat(result.getTerminalBlockHash()).isEqualTo(Hash.fromHexStringLenient("0x01"));
+    assertThat(result.getTerminalBlockNumber()).isEqualTo(42);
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldAlwaysReturnResultsInHex() throws JsonProcessingException {
+    var mapper = new ObjectMapper();
+    var mockResult =
+        new EngineExchangeTransitionConfigurationResult(Difficulty.ZERO, Hash.ZERO, 0L);
+
+    assertThat(mockResult.getTerminalBlockNumberAsString()).isEqualTo("0x0");
+    assertThat(mockResult.getTerminalTotalDifficultyAsString()).isEqualTo("0x0");
+    assertThat(mockResult.getTerminalBlockHashAsString()).isEqualTo(Hash.ZERO.toHexString());
+
+    String json = mapper.writeValueAsString(mockResult);
+    var res = mapper.readValue(json, Map.class);
+    assertThat(res.get("terminalBlockNumber")).isEqualTo("0x0");
+    assertThat(res.get("terminalBlockHash"))
+        .isEqualTo("0x0000000000000000000000000000000000000000000000000000000000000000");
+    assertThat(res.get("terminalTotalDifficulty")).isEqualTo("0x0");
+  }
+
+  @Test
+  public void shouldStripLeadingZeros() throws JsonProcessingException {
+    var mapper = new ObjectMapper();
+    var mockResult =
+        new EngineExchangeTransitionConfigurationResult(Difficulty.ZERO, Hash.ZERO, 100);
+
+    assertThat(mockResult.getTerminalBlockNumberAsString()).isEqualTo("0x64");
+    assertThat(mockResult.getTerminalTotalDifficultyAsString()).isEqualTo("0x0");
+    assertThat(mockResult.getTerminalBlockHashAsString()).isEqualTo(Hash.ZERO.toHexString());
+
+    String json = mapper.writeValueAsString(mockResult);
+    var res = mapper.readValue(json, Map.class);
+    assertThat(res.get("terminalBlockNumber")).isEqualTo("0x64");
+    assertThat(res.get("terminalBlockHash"))
+        .isEqualTo("0x0000000000000000000000000000000000000000000000000000000000000000");
+    assertThat(res.get("terminalTotalDifficulty")).isEqualTo("0x0");
+  }
+
+  private JsonRpcResponse resp(final EngineExchangeTransitionConfigurationParameter param) {
+    return method.response(
+        new JsonRpcRequestContext(
+            new JsonRpcRequest(
+                "2.0",
+                RpcMethod.ENGINE_EXCHANGE_TRANSITION_CONFIGURATION.getMethodName(),
+                new Object[] {param})));
+  }
+
+  private EngineExchangeTransitionConfigurationResult fromSuccessResp(final JsonRpcResponse resp) {
+    assertThat(resp.getType()).isEqualTo(JsonRpcResponseType.SUCCESS);
+    return Optional.of(resp)
+        .map(JsonRpcSuccessResponse.class::cast)
+        .map(JsonRpcSuccessResponse::getResult)
+        .map(EngineExchangeTransitionConfigurationResult.class::cast)
+        .get();
+  }
+
+  private BlockHeader createBlockHeader(final Hash blockHash, final long blockNumber) {
+    return new BlockHeader(
+        Hash.EMPTY,
+        Hash.EMPTY,
+        Address.ZERO,
+        Hash.EMPTY,
+        Hash.EMPTY,
+        Hash.EMPTY,
+        LogsBloomFilter.empty(),
+        Difficulty.ZERO,
+        blockNumber,
+        0,
+        0,
+        0,
+        Bytes.EMPTY,
+        Wei.ZERO,
+        Bytes32.ZERO,
+        0,
+        null,
+        null,
+        null,
+        new BlockHeaderFunctions() {
+          @Override
+          public Hash hash(final BlockHeader header) {
+            return blockHash;
+          }
+
+          @Override
+          public ParsedExtraData parseExtraData(final BlockHeader header) {
+            return null;
+          }
+        });
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineForkchoiceUpdatedV1Test.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineForkchoiceUpdatedV1Test.java
new file mode 100644
index 00000000000..0433b55bae1
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineForkchoiceUpdatedV1Test.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.INVALID;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.EngineForkchoiceUpdatedParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.Optional;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class EngineForkchoiceUpdatedV1Test extends AbstractEngineForkchoiceUpdatedTest {
+
+  public EngineForkchoiceUpdatedV1Test() {
+    super(EngineForkchoiceUpdatedV1::new);
+  }
+
+  @Override
+  @Test
+  public void shouldReturnExpectedMethodName() {
+    assertThat(method.getName()).isEqualTo("engine_forkchoiceUpdatedV1");
+  }
+
+  @Test
+  public void shouldReturnInvalidOnBadTerminalBlock() {
+    BlockHeader mockHeader = blockHeaderBuilder.buildHeader();
+
+    when(mergeCoordinator.getOrSyncHeadByHash(mockHeader.getHash(), Hash.ZERO))
+        .thenReturn(Optional.of(mockHeader));
+    when(mergeCoordinator.latestValidAncestorDescendsFromTerminal(mockHeader)).thenReturn(false);
+    assertSuccessWithPayloadForForkchoiceResult(
+        new EngineForkchoiceUpdatedParameter(mockHeader.getHash(), Hash.ZERO, Hash.ZERO),
+        Optional.empty(),
+        mock(MergeMiningCoordinator.ForkchoiceResult.class),
+        INVALID,
+        Optional.of(Hash.ZERO));
+  }
+
+  @Override
+  protected String getMethodName() {
+    return RpcMethod.ENGINE_FORKCHOICE_UPDATED_V1.getMethodName();
+  }
+
+  @Override
+  protected boolean validateTerminalPoWBlock() {
+    return true;
+  }
+
+  @Override
+  protected JsonRpcError expectedInvalidPayloadError() {
+    return JsonRpcError.INVALID_PAYLOAD_ATTRIBUTES;
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineForkchoiceUpdatedV2Test.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineForkchoiceUpdatedV2Test.java
new file mode 100644
index 00000000000..695325762fe
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineForkchoiceUpdatedV2Test.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class EngineForkchoiceUpdatedV2Test extends AbstractEngineForkchoiceUpdatedTest {
+
+  public EngineForkchoiceUpdatedV2Test() {
+    super(EngineForkchoiceUpdatedV2::new);
+  }
+
+  @Override
+  @Test
+  public void shouldReturnExpectedMethodName() {
+    assertThat(method.getName()).isEqualTo("engine_forkchoiceUpdatedV2");
+  }
+
+  @Override
+  protected String getMethodName() {
+    return RpcMethod.ENGINE_FORKCHOICE_UPDATED_V2.getMethodName();
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByHashV1Test.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByHashV1Test.java
new file mode 100644
index 00000000000..8f202199681
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByHashV1Test.java
@@ -0,0 +1,270 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.INVALID_RANGE_REQUEST_TOO_LARGE;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.GWei;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.EngineGetPayloadBodiesResultV1;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import io.vertx.core.Vertx;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt64;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class EngineGetPayloadBodiesByHashV1Test {
+  private EngineGetPayloadBodiesByHashV1 method;
+  private static final Vertx vertx = Vertx.vertx();
+  private static final BlockResultFactory blockResultFactory = new BlockResultFactory();
+  @Mock private ProtocolContext protocolContext;
+  @Mock private EngineCallListener engineCallListener;
+  @Mock private MutableBlockchain blockchain;
+
+  @Before
+  public void before() {
+    when(protocolContext.getBlockchain()).thenReturn(blockchain);
+    this.method =
+        spy(
+            new EngineGetPayloadBodiesByHashV1(
+                vertx, protocolContext, blockResultFactory, engineCallListener));
+  }
+
+  @Test
+  public void shouldReturnExpectedMethodName() {
+    assertThat(method.getName()).isEqualTo("engine_getPayloadBodiesByHashV1");
+  }
+
+  @Test
+  public void shouldReturnEmptyPayloadBodiesWithEmptyHash() {
+    final var resp = resp(new Hash[] {});
+    final EngineGetPayloadBodiesResultV1 result = fromSuccessResp(resp);
+    assertThat(result.getPayloadBodies().isEmpty()).isTrue();
+  }
+
+  @Test
+  public void shouldReturnPayloadForKnownHashes() {
+    final SignatureAlgorithm sig = SignatureAlgorithmFactory.getInstance();
+    final Hash blockHash1 = Hash.wrap(Bytes32.random());
+    final Hash blockHash2 = Hash.wrap(Bytes32.random());
+    final Hash blockHash3 = Hash.wrap(Bytes32.random());
+    final BlockBody blockBody1 =
+        new BlockBody(
+            List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
+            Collections.emptyList());
+    final BlockBody blockBody2 =
+        new BlockBody(
+            List.of(
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair()),
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
+            Collections.emptyList());
+    final BlockBody blockBody3 =
+        new BlockBody(
+            List.of(
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair()),
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair()),
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
+            Collections.emptyList());
+    when(blockchain.getBlockBody(blockHash1)).thenReturn(Optional.of(blockBody1));
+    when(blockchain.getBlockBody(blockHash2)).thenReturn(Optional.of(blockBody2));
+    when(blockchain.getBlockBody(blockHash3)).thenReturn(Optional.of(blockBody3));
+
+    final var resp = resp(new Hash[] {blockHash1, blockHash2, blockHash3});
+    final var result = fromSuccessResp(resp);
+    assertThat(result.getPayloadBodies().size()).isEqualTo(3);
+    assertThat(result.getPayloadBodies().get(0).getTransactions().size()).isEqualTo(1);
+    assertThat(result.getPayloadBodies().get(1).getTransactions().size()).isEqualTo(2);
+    assertThat(result.getPayloadBodies().get(2).getTransactions().size()).isEqualTo(3);
+  }
+
+  @Test
+  public void shouldReturnNullForUnknownHashes() {
+    final Hash blockHash1 = Hash.wrap(Bytes32.random());
+    final Hash blockHash2 = Hash.wrap(Bytes32.random());
+    final Hash blockHash3 = Hash.wrap(Bytes32.random());
+    final var resp = resp(new Hash[] {blockHash1, blockHash2, blockHash3});
+    final var result = fromSuccessResp(resp);
+    assertThat(result.getPayloadBodies().size()).isEqualTo(3);
+    assertThat(result.getPayloadBodies().get(0)).isNull();
+    assertThat(result.getPayloadBodies().get(1)).isNull();
+    assertThat(result.getPayloadBodies().get(2)).isNull();
+  }
+
+  @Test
+  public void shouldReturnNullForUnknownHashAndPayloadForKnownHash() {
+    final SignatureAlgorithm sig = SignatureAlgorithmFactory.getInstance();
+    final Hash blockHash1 = Hash.wrap(Bytes32.random());
+    final Hash blockHash2 = Hash.wrap(Bytes32.random());
+    final Hash blockHash3 = Hash.wrap(Bytes32.random());
+    final BlockBody blockBody1 =
+        new BlockBody(
+            List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
+            Collections.emptyList());
+    final BlockBody blockBody3 =
+        new BlockBody(
+            List.of(
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair()),
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair()),
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
+            Collections.emptyList());
+    when(blockchain.getBlockBody(blockHash1)).thenReturn(Optional.of(blockBody1));
+    when(blockchain.getBlockBody(blockHash3)).thenReturn(Optional.of(blockBody3));
+
+    final var resp = resp(new Hash[] {blockHash1, blockHash2, blockHash3});
+    final var result = fromSuccessResp(resp);
+    assertThat(result.getPayloadBodies().size()).isEqualTo(3);
+    assertThat(result.getPayloadBodies().get(0).getTransactions().size()).isEqualTo(1);
+    assertThat(result.getPayloadBodies().get(1)).isNull();
+    assertThat(result.getPayloadBodies().get(2).getTransactions().size()).isEqualTo(3);
+  }
+
+  @Test
+  public void shouldReturnWithdrawalNullWhenBlockIsPreShanghai() {
+    final SignatureAlgorithm sig = SignatureAlgorithmFactory.getInstance();
+    final Hash blockHash1 = Hash.wrap(Bytes32.random());
+    final Hash blockHash2 = Hash.wrap(Bytes32.random());
+    final BlockBody preShanghaiBlockBody =
+        new BlockBody(
+            List.of(
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair()),
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair()),
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
+            Collections.emptyList());
+
+    final BlockBody preShanghaiBlockBody2 =
+        new BlockBody(
+            List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
+            Collections.emptyList(),
+            Optional.empty(),
+            Optional.empty());
+    when(blockchain.getBlockBody(blockHash1)).thenReturn(Optional.of(preShanghaiBlockBody));
+    when(blockchain.getBlockBody(blockHash2)).thenReturn(Optional.of(preShanghaiBlockBody2));
+
+    final var resp = resp(new Hash[] {blockHash1, blockHash2});
+    final var result = fromSuccessResp(resp);
+    assertThat(result.getPayloadBodies().size()).isEqualTo(2);
+    assertThat(result.getPayloadBodies().get(0).getTransactions().size()).isEqualTo(3);
+    assertThat(result.getPayloadBodies().get(0).getWithdrawals()).isNull();
+    assertThat(result.getPayloadBodies().get(1).getTransactions().size()).isEqualTo(1);
+    assertThat(result.getPayloadBodies().get(1).getWithdrawals()).isNull();
+  }
+
+  @Test
+  public void shouldReturnWithdrawalsWhenBlockIsPostShanghai() {
+    final SignatureAlgorithm sig = SignatureAlgorithmFactory.getInstance();
+    final Hash blockHash1 = Hash.wrap(Bytes32.random());
+    final Hash blockHash2 = Hash.wrap(Bytes32.random());
+    final Withdrawal withdrawal =
+        new Withdrawal(UInt64.ONE, UInt64.ONE, Address.fromHexString("0x1"), GWei.ONE);
+    final Withdrawal withdrawal2 =
+        new Withdrawal(UInt64.ONE, UInt64.ONE, Address.fromHexString("0x2"), GWei.ONE);
+
+    final BlockBody shanghaiBlockBody =
+        new BlockBody(
+            List.of(
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair()),
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair()),
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
+            Collections.emptyList(),
+            Optional.of(List.of(withdrawal)),
+            Optional.empty());
+
+    final BlockBody shanghaiBlockBody2 =
+        new BlockBody(
+            List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
+            Collections.emptyList(),
+            Optional.of(List.of(withdrawal2)),
+            Optional.empty());
+    when(blockchain.getBlockBody(blockHash1)).thenReturn(Optional.of(shanghaiBlockBody));
+    when(blockchain.getBlockBody(blockHash2)).thenReturn(Optional.of(shanghaiBlockBody2));
+
+    final var resp = resp(new Hash[] {blockHash1, blockHash2});
+    final var result = fromSuccessResp(resp);
+    assertThat(result.getPayloadBodies().size()).isEqualTo(2);
+    assertThat(result.getPayloadBodies().get(0).getTransactions().size()).isEqualTo(3);
+    assertThat(result.getPayloadBodies().get(0).getWithdrawals().size()).isEqualTo(1);
+    assertThat(result.getPayloadBodies().get(1).getTransactions().size()).isEqualTo(1);
+    assertThat(result.getPayloadBodies().get(1).getWithdrawals().size()).isEqualTo(1);
+  }
+
+  @Test
+  public void shouldReturnErrorWhenRequestExceedsPermittedNumberOfBlocks() {
+    final Hash blockHash1 = Hash.wrap(Bytes32.random());
+    final Hash blockHash2 = Hash.wrap(Bytes32.random());
+    final Hash[] hashes = new Hash[] {blockHash1, blockHash2};
+
+    doReturn(1).when(method).getMaxRequestBlocks();
+
+    final JsonRpcResponse resp = resp(hashes);
+    final var result = fromErrorResp(resp);
+    assertThat(result.getCode()).isEqualTo(INVALID_RANGE_REQUEST_TOO_LARGE.getCode());
+  }
+
+  private JsonRpcResponse resp(final Hash[] hashes) {
+    return method.response(
+        new JsonRpcRequestContext(
+            new JsonRpcRequest(
+                "2.0",
+                RpcMethod.ENGINE_GET_PAYLOAD_BODIES_BY_HASH_V1.getMethodName(),
+                new Object[] {hashes})));
+  }
+
+  private EngineGetPayloadBodiesResultV1 fromSuccessResp(final JsonRpcResponse resp) {
+    assertThat(resp.getType()).isEqualTo(JsonRpcResponseType.SUCCESS);
+    return Optional.of(resp)
+        .map(JsonRpcSuccessResponse.class::cast)
+        .map(JsonRpcSuccessResponse::getResult)
+        .map(EngineGetPayloadBodiesResultV1.class::cast)
+        .get();
+  }
+
+  private JsonRpcError fromErrorResp(final JsonRpcResponse resp) {
+    assertThat(resp.getType()).isEqualTo(JsonRpcResponseType.ERROR);
+    return Optional.of(resp)
+        .map(JsonRpcErrorResponse.class::cast)
+        .map(JsonRpcErrorResponse::getError)
+        .get();
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByRangeV1Test.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByRangeV1Test.java
new file mode 100644
index 00000000000..66821f9f49a
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadBodiesByRangeV1Test.java
@@ -0,0 +1,359 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.INVALID_PARAMS;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.INVALID_RANGE_REQUEST_TOO_LARGE;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.GWei;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.EngineGetPayloadBodiesResultV1;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import io.vertx.core.Vertx;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt64;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class EngineGetPayloadBodiesByRangeV1Test {
+  private EngineGetPayloadBodiesByRangeV1 method;
+  private static final Vertx vertx = Vertx.vertx();
+  private static final BlockResultFactory blockResultFactory = new BlockResultFactory();
+  @Mock private ProtocolContext protocolContext;
+  @Mock private EngineCallListener engineCallListener;
+  @Mock private MutableBlockchain blockchain;
+
+  @Before
+  public void before() {
+    when(protocolContext.getBlockchain()).thenReturn(blockchain);
+    this.method =
+        spy(
+            new EngineGetPayloadBodiesByRangeV1(
+                vertx, protocolContext, blockResultFactory, engineCallListener));
+  }
+
+  @Test
+  public void shouldReturnExpectedMethodName() {
+    assertThat(method.getName()).isEqualTo("engine_getPayloadBodiesByRangeV1");
+  }
+
+  @Test
+  public void shouldReturnPayloadForKnownNumber() {
+    final SignatureAlgorithm sig = SignatureAlgorithmFactory.getInstance();
+    final Hash blockHash1 = Hash.wrap(Bytes32.random());
+    final Hash blockHash2 = Hash.wrap(Bytes32.random());
+    final Hash blockHash3 = Hash.wrap(Bytes32.random());
+    final BlockBody blockBody1 =
+        new BlockBody(
+            List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
+            Collections.emptyList());
+    final BlockBody blockBody2 =
+        new BlockBody(
+            List.of(
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair()),
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
+            Collections.emptyList());
+    final BlockBody blockBody3 =
+        new BlockBody(
+            List.of(
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair()),
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair()),
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
+            Collections.emptyList());
+    when(blockchain.getChainHeadBlockNumber()).thenReturn(Long.valueOf(130));
+    when(blockchain.getBlockBody(blockHash1)).thenReturn(Optional.of(blockBody1));
+    when(blockchain.getBlockBody(blockHash2)).thenReturn(Optional.of(blockBody2));
+    when(blockchain.getBlockBody(blockHash3)).thenReturn(Optional.of(blockBody3));
+    when(blockchain.getBlockHashByNumber(123)).thenReturn(Optional.of(blockHash1));
+    when(blockchain.getBlockHashByNumber(124)).thenReturn(Optional.of(blockHash2));
+    when(blockchain.getBlockHashByNumber(125)).thenReturn(Optional.of(blockHash3));
+
+    final var resp = resp("0x7b", "0x3");
+    final EngineGetPayloadBodiesResultV1 result = fromSuccessResp(resp);
+    assertThat(result.getPayloadBodies().size()).isEqualTo(3);
+    assertThat(result.getPayloadBodies().get(0).getTransactions().size()).isEqualTo(1);
+    assertThat(result.getPayloadBodies().get(1).getTransactions().size()).isEqualTo(2);
+    assertThat(result.getPayloadBodies().get(2).getTransactions().size()).isEqualTo(3);
+  }
+
+  @Test
+  public void shouldReturnNullForUnknownNumber() {
+    when(blockchain.getChainHeadBlockNumber()).thenReturn(Long.valueOf(130));
+    final var resp = resp("0x7b", "0x3");
+    final EngineGetPayloadBodiesResultV1 result = fromSuccessResp(resp);
+    assertThat(result.getPayloadBodies().size()).isEqualTo(3);
+    assertThat(result.getPayloadBodies().get(0)).isNull();
+    assertThat(result.getPayloadBodies().get(1)).isNull();
+    assertThat(result.getPayloadBodies().get(2)).isNull();
+  }
+
+  @Test
+  public void shouldReturnNullForUnknownNumberAndPayloadForKnownNumber() {
+    final SignatureAlgorithm sig = SignatureAlgorithmFactory.getInstance();
+    final Hash blockHash1 = Hash.wrap(Bytes32.random());
+    final Hash blockHash3 = Hash.wrap(Bytes32.random());
+    final BlockBody blockBody1 =
+        new BlockBody(
+            List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
+            Collections.emptyList());
+    final BlockBody blockBody3 =
+        new BlockBody(
+            List.of(
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair()),
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair()),
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
+            Collections.emptyList());
+    when(blockchain.getChainHeadBlockNumber()).thenReturn(Long.valueOf(130));
+    when(blockchain.getBlockBody(blockHash1)).thenReturn(Optional.of(blockBody1));
+    when(blockchain.getBlockBody(blockHash3)).thenReturn(Optional.of(blockBody3));
+    when(blockchain.getBlockHashByNumber(123)).thenReturn(Optional.of(blockHash1));
+    when(blockchain.getBlockHashByNumber(125)).thenReturn(Optional.of(blockHash3));
+
+    final var resp = resp("0x7b", "0x3");
+    final var result = fromSuccessResp(resp);
+    assertThat(result.getPayloadBodies().size()).isEqualTo(3);
+    assertThat(result.getPayloadBodies().get(0).getTransactions().size()).isEqualTo(1);
+    assertThat(result.getPayloadBodies().get(1)).isNull();
+    assertThat(result.getPayloadBodies().get(2).getTransactions().size()).isEqualTo(3);
+  }
+
+  @Test
+  public void shouldReturnNullForWithdrawalsWhenBlockIsPreShanghai() {
+    final SignatureAlgorithm sig = SignatureAlgorithmFactory.getInstance();
+    final Hash blockHash1 = Hash.wrap(Bytes32.random());
+    final Hash blockHash2 = Hash.wrap(Bytes32.random());
+
+    final BlockBody preShanghaiBlockBody =
+        new BlockBody(
+            List.of(
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair()),
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair()),
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
+            Collections.emptyList());
+
+    final BlockBody preShanghaiBlockBody2 =
+        new BlockBody(
+            List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
+            Collections.emptyList(),
+            Optional.empty(),
+            Optional.empty());
+    when(blockchain.getChainHeadBlockNumber()).thenReturn(Long.valueOf(130));
+    when(blockchain.getBlockBody(blockHash1)).thenReturn(Optional.of(preShanghaiBlockBody));
+    when(blockchain.getBlockBody(blockHash2)).thenReturn(Optional.of(preShanghaiBlockBody2));
+    when(blockchain.getBlockHashByNumber(123)).thenReturn(Optional.of(blockHash1));
+    when(blockchain.getBlockHashByNumber(124)).thenReturn(Optional.of(blockHash2));
+
+    final var resp = resp("0x7b", "0x2");
+    final var result = fromSuccessResp(resp);
+    assertThat(result.getPayloadBodies().size()).isEqualTo(2);
+    assertThat(result.getPayloadBodies().get(0).getTransactions().size()).isEqualTo(3);
+    assertThat(result.getPayloadBodies().get(0).getWithdrawals()).isNull();
+    assertThat(result.getPayloadBodies().get(1).getTransactions().size()).isEqualTo(1);
+    assertThat(result.getPayloadBodies().get(1).getWithdrawals()).isNull();
+    ;
+  }
+
+  @Test
+  public void shouldReturnWithdrawalsWhenBlockIsPostShanghai() {
+    final SignatureAlgorithm sig = SignatureAlgorithmFactory.getInstance();
+    final Hash blockHash1 = Hash.wrap(Bytes32.random());
+    final Hash blockHash2 = Hash.wrap(Bytes32.random());
+    final Withdrawal withdrawal =
+        new Withdrawal(UInt64.ONE, UInt64.ONE, Address.fromHexString("0x1"), GWei.ONE);
+    final Withdrawal withdrawal2 =
+        new Withdrawal(UInt64.ONE, UInt64.ONE, Address.fromHexString("0x2"), GWei.ONE);
+
+    final BlockBody shanghaiBlockBody =
+        new BlockBody(
+            List.of(
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair()),
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair()),
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
+            Collections.emptyList(),
+            Optional.of(List.of(withdrawal)),
+            Optional.empty());
+
+    final BlockBody shanghaiBlockBody2 =
+        new BlockBody(
+            List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
+            Collections.emptyList(),
+            Optional.of(List.of(withdrawal2)),
+            Optional.empty());
+    when(blockchain.getChainHeadBlockNumber()).thenReturn(Long.valueOf(130));
+    when(blockchain.getBlockBody(blockHash1)).thenReturn(Optional.of(shanghaiBlockBody));
+    when(blockchain.getBlockBody(blockHash2)).thenReturn(Optional.of(shanghaiBlockBody2));
+    when(blockchain.getBlockHashByNumber(123)).thenReturn(Optional.of(blockHash1));
+    when(blockchain.getBlockHashByNumber(124)).thenReturn(Optional.of(blockHash2));
+
+    final var resp = resp("0x7b", "0x2");
+    final var result = fromSuccessResp(resp);
+    assertThat(result.getPayloadBodies().size()).isEqualTo(2);
+    assertThat(result.getPayloadBodies().get(0).getTransactions().size()).isEqualTo(3);
+    assertThat(result.getPayloadBodies().get(0).getWithdrawals().size()).isEqualTo(1);
+    assertThat(result.getPayloadBodies().get(1).getTransactions().size()).isEqualTo(1);
+    assertThat(result.getPayloadBodies().get(1).getWithdrawals().size()).isEqualTo(1);
+  }
+
+  @Test
+  public void shouldNotContainTrailingNullForBlocksPastTheCurrentHead() {
+    final SignatureAlgorithm sig = SignatureAlgorithmFactory.getInstance();
+    final Hash blockHash1 = Hash.wrap(Bytes32.random());
+    final Withdrawal withdrawal =
+        new Withdrawal(UInt64.ONE, UInt64.ONE, Address.fromHexString("0x1"), GWei.ONE);
+
+    final BlockBody shanghaiBlockBody =
+        new BlockBody(
+            List.of(
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair()),
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair()),
+                new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
+            Collections.emptyList(),
+            Optional.of(List.of(withdrawal)),
+            Optional.empty());
+    when(blockchain.getChainHeadBlockNumber()).thenReturn(Long.valueOf(123));
+    when(blockchain.getBlockBody(blockHash1)).thenReturn(Optional.of(shanghaiBlockBody));
+    when(blockchain.getBlockHashByNumber(123)).thenReturn(Optional.of(blockHash1));
+
+    final var resp = resp("0x7b", "0x3");
+    final var result = fromSuccessResp(resp);
+    assertThat(result.getPayloadBodies().size()).isEqualTo(1);
+  }
+
+  @Test
+  public void shouldReturnUpUntilHeadWhenStartBlockPlusCountEqualsHeadNumber() {
+    final SignatureAlgorithm sig = SignatureAlgorithmFactory.getInstance();
+    final Hash blockHash1 = Hash.wrap(Bytes32.random());
+    final Hash blockHash2 = Hash.wrap(Bytes32.random());
+    final Hash blockHash3 = Hash.wrap(Bytes32.random());
+    final Withdrawal withdrawal =
+        new Withdrawal(UInt64.ONE, UInt64.ONE, Address.fromHexString("0x1"), GWei.ONE);
+
+    final BlockBody shanghaiBlockBody =
+        new BlockBody(
+            List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
+            Collections.emptyList(),
+            Optional.of(List.of(withdrawal)),
+            Optional.empty());
+    final BlockBody shanghaiBlockBody2 =
+        new BlockBody(
+            List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
+            Collections.emptyList(),
+            Optional.of(List.of(withdrawal)),
+            Optional.empty());
+    final BlockBody shanghaiBlockBody3 =
+        new BlockBody(
+            List.of(new TransactionTestFixture().createTransaction(sig.generateKeyPair())),
+            Collections.emptyList(),
+            Optional.of(List.of(withdrawal)),
+            Optional.empty());
+    when(blockchain.getChainHeadBlockNumber()).thenReturn(Long.valueOf(125));
+    when(blockchain.getBlockBody(blockHash1)).thenReturn(Optional.of(shanghaiBlockBody));
+    when(blockchain.getBlockBody(blockHash2)).thenReturn(Optional.of(shanghaiBlockBody2));
+    when(blockchain.getBlockBody(blockHash3)).thenReturn(Optional.of(shanghaiBlockBody3));
+    when(blockchain.getBlockHashByNumber(123)).thenReturn(Optional.of(blockHash1));
+    when(blockchain.getBlockHashByNumber(124)).thenReturn(Optional.of(blockHash2));
+    when(blockchain.getBlockHashByNumber(125)).thenReturn(Optional.of(blockHash3));
+
+    final var resp = resp("0x7b", "0x3");
+    final var result = fromSuccessResp(resp);
+    assertThat(result.getPayloadBodies().size()).isEqualTo(3);
+  }
+
+  @Test
+  public void ShouldReturnEmptyPayloadForRequestsPastCurrentHead() {
+
+    when(blockchain.getChainHeadBlockNumber()).thenReturn(Long.valueOf(123));
+    final JsonRpcResponse resp = resp("0x7d", "0x3");
+    final var result = fromSuccessResp(resp);
+    assertThat(result.getPayloadBodies()).isEqualTo(Collections.EMPTY_LIST);
+  }
+
+  @Test
+  public void shouldReturnErrorWhenRequestExceedsPermittedNumberOfBlocks() {
+    doReturn(3).when(method).getMaxRequestBlocks();
+    final JsonRpcResponse resp = resp("0x539", "0x4");
+    final var result = fromErrorResp(resp);
+    assertThat(result.getCode()).isEqualTo(INVALID_RANGE_REQUEST_TOO_LARGE.getCode());
+  }
+
+  @Test
+  public void shouldReturnInvalidParamsIfStartIsZero() {
+    final JsonRpcResponse resp = resp("0x0", "0x539");
+    final var result = fromErrorResp(resp);
+    assertThat(result.getCode()).isEqualTo(INVALID_PARAMS.getCode());
+  }
+
+  @Test
+  public void shouldReturnInvalidParamsIfCountIsZero() {
+    final JsonRpcResponse resp = resp("0x539", "0x0");
+    final var result = fromErrorResp(resp);
+    assertThat(result.getCode()).isEqualTo(INVALID_PARAMS.getCode());
+  }
+
+  private JsonRpcResponse resp(final String startBlockNumber, final String range) {
+    return method.response(
+        new JsonRpcRequestContext(
+            new JsonRpcRequest(
+                "2.0",
+                RpcMethod.ENGINE_GET_PAYLOAD_BODIES_BY_RANGE_V1.getMethodName(),
+                new Object[] {startBlockNumber, range})));
+  }
+
+  private EngineGetPayloadBodiesResultV1 fromSuccessResp(final JsonRpcResponse resp) {
+    assertThat(resp.getType()).isEqualTo(JsonRpcResponseType.SUCCESS);
+    return Optional.of(resp)
+        .map(JsonRpcSuccessResponse.class::cast)
+        .map(JsonRpcSuccessResponse::getResult)
+        .map(EngineGetPayloadBodiesResultV1.class::cast)
+        .get();
+  }
+
+  private JsonRpcError fromErrorResp(final JsonRpcResponse resp) {
+    assertThat(resp.getType()).isEqualTo(JsonRpcResponseType.ERROR);
+    return Optional.of(resp)
+        .map(JsonRpcErrorResponse.class::cast)
+        .map(JsonRpcErrorResponse::getError)
+        .get();
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadV1Test.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadV1Test.java
new file mode 100644
index 00000000000..43a0ae44968
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadV1Test.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.EngineGetPayloadResultV1;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class EngineGetPayloadV1Test extends AbstractEngineGetPayloadTest {
+
+  public EngineGetPayloadV1Test() {
+    super(EngineGetPayloadV1::new);
+  }
+
+  @Override
+  @Test
+  public void shouldReturnExpectedMethodName() {
+    assertThat(method.getName()).isEqualTo("engine_getPayloadV1");
+  }
+
+  @Override
+  @Test
+  public void shouldReturnBlockForKnownPayloadId() {
+    final var resp = resp(RpcMethod.ENGINE_GET_PAYLOAD_V1.getMethodName(), mockPid);
+    assertThat(resp).isInstanceOf(JsonRpcSuccessResponse.class);
+    Optional.of(resp)
+        .map(JsonRpcSuccessResponse.class::cast)
+        .ifPresent(
+            r -> {
+              assertThat(r.getResult()).isInstanceOf(EngineGetPayloadResultV1.class);
+              final EngineGetPayloadResultV1 res = (EngineGetPayloadResultV1) r.getResult();
+              assertThat(res.getHash()).isEqualTo(mockHeader.getHash().toString());
+              assertThat(res.getPrevRandao())
+                  .isEqualTo(mockHeader.getPrevRandao().map(Bytes32::toString).orElse(""));
+            });
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Override
+  protected String getMethodName() {
+    return RpcMethod.ENGINE_GET_PAYLOAD_V1.getMethodName();
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadV2Test.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadV2Test.java
new file mode 100644
index 00000000000..2250f63e718
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineGetPayloadV2Test.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.EngineGetPayloadResultV2;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class EngineGetPayloadV2Test extends AbstractEngineGetPayloadTest {
+
+  public EngineGetPayloadV2Test() {
+    super(EngineGetPayloadV2::new);
+  }
+
+  @Override
+  @Test
+  public void shouldReturnExpectedMethodName() {
+    assertThat(method.getName()).isEqualTo("engine_getPayloadV2");
+  }
+
+  @Override
+  @Test
+  public void shouldReturnBlockForKnownPayloadId() {
+    // should return withdrawals for a post-Shanghai block
+    when(mergeContext.retrieveBlockById(mockPid))
+        .thenReturn(Optional.of(mockBlockWithReceiptsAndWithdrawals));
+
+    final var resp = resp(RpcMethod.ENGINE_GET_PAYLOAD_V2.getMethodName(), mockPid);
+    assertThat(resp).isInstanceOf(JsonRpcSuccessResponse.class);
+    Optional.of(resp)
+        .map(JsonRpcSuccessResponse.class::cast)
+        .ifPresent(
+            r -> {
+              assertThat(r.getResult()).isInstanceOf(EngineGetPayloadResultV2.class);
+              final EngineGetPayloadResultV2 res = (EngineGetPayloadResultV2) r.getResult();
+              assertThat(res.getExecutionPayload().getWithdrawals()).isNotNull();
+              assertThat(res.getExecutionPayload().getHash())
+                  .isEqualTo(mockHeader.getHash().toString());
+              assertThat(res.getBlockValue()).isEqualTo(Quantity.create(0));
+              assertThat(res.getExecutionPayload().getPrevRandao())
+                  .isEqualTo(mockHeader.getPrevRandao().map(Bytes32::toString).orElse(""));
+            });
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnBlockForKnownPayloadIdPostV6110() {
+    // should return deposits for a post-V6110 block
+    when(mergeContext.retrieveBlockById(mockPid))
+        .thenReturn(Optional.of(mockBlockWithReceiptsAndDeposits));
+
+    final var resp = resp(RpcMethod.ENGINE_GET_PAYLOAD_V2.getMethodName(), mockPid);
+    assertThat(resp).isInstanceOf(JsonRpcSuccessResponse.class);
+    Optional.of(resp)
+        .map(JsonRpcSuccessResponse.class::cast)
+        .ifPresent(
+            r -> {
+              assertThat(r.getResult()).isInstanceOf(EngineGetPayloadResultV2.class);
+              final EngineGetPayloadResultV2 res = (EngineGetPayloadResultV2) r.getResult();
+              assertThat(res.getExecutionPayload().getDeposits()).isNotNull();
+              assertThat(res.getExecutionPayload().getHash())
+                  .isEqualTo(mockHeader.getHash().toString());
+              assertThat(res.getBlockValue()).isEqualTo(Quantity.create(0));
+              assertThat(res.getExecutionPayload().getPrevRandao())
+                  .isEqualTo(mockHeader.getPrevRandao().map(Bytes32::toString).orElse(""));
+            });
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnExecutionPayloadWithoutWithdrawals_PreShanghaiBlock() {
+    final var resp = resp(RpcMethod.ENGINE_GET_PAYLOAD_V2.getMethodName(), mockPid);
+    assertThat(resp).isInstanceOf(JsonRpcSuccessResponse.class);
+    Optional.of(resp)
+        .map(JsonRpcSuccessResponse.class::cast)
+        .ifPresent(
+            r -> {
+              assertThat(r.getResult()).isInstanceOf(EngineGetPayloadResultV2.class);
+              final EngineGetPayloadResultV2 res = (EngineGetPayloadResultV2) r.getResult();
+              assertThat(res.getExecutionPayload().getWithdrawals()).isNull();
+              assertThat(res.getExecutionPayload().getDeposits()).isNull();
+            });
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Test
+  public void shouldReturnExecutionPayloadWithoutDeposits_PreV6110Block() {
+    when(mergeContext.retrieveBlockById(mockPid))
+        .thenReturn(Optional.of(mockBlockWithReceiptsAndWithdrawals));
+
+    final var resp = resp(RpcMethod.ENGINE_GET_PAYLOAD_V2.getMethodName(), mockPid);
+    assertThat(resp).isInstanceOf(JsonRpcSuccessResponse.class);
+    Optional.of(resp)
+        .map(JsonRpcSuccessResponse.class::cast)
+        .ifPresent(
+            r -> {
+              assertThat(r.getResult()).isInstanceOf(EngineGetPayloadResultV2.class);
+              final EngineGetPayloadResultV2 res = (EngineGetPayloadResultV2) r.getResult();
+              assertThat(res.getExecutionPayload().getDeposits()).isNull();
+            });
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Override
+  protected String getMethodName() {
+    return RpcMethod.ENGINE_GET_PAYLOAD_V2.getMethodName();
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineNewPayloadV1Test.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineNewPayloadV1Test.java
new file mode 100644
index 00000000000..f9a9200d57e
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineNewPayloadV1Test.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.INVALID;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.INVALID_BLOCK_HASH;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.EnginePayloadStatusResult;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.Collections;
+import java.util.Optional;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class EngineNewPayloadV1Test extends AbstractEngineNewPayloadTest {
+
+  public EngineNewPayloadV1Test() {
+    super(EngineNewPayloadV1::new);
+  }
+
+  @Override
+  @Test
+  public void shouldReturnExpectedMethodName() {
+    assertThat(method.getName()).isEqualTo("engine_newPayloadV1");
+  }
+
+  @Test
+  public void shouldReturnInvalidOnBadTerminalBlock() {
+    BlockHeader mockHeader = createBlockHeader(Optional.empty(), Optional.empty());
+    when(blockchain.getBlockByHash(mockHeader.getHash())).thenReturn(Optional.empty());
+    when(blockchain.getBlockHeader(mockHeader.getParentHash()))
+        .thenReturn(Optional.of(mock(BlockHeader.class)));
+    when(mergeCoordinator.latestValidAncestorDescendsFromTerminal(any(BlockHeader.class)))
+        .thenReturn(false);
+
+    var resp = resp(mockPayload(mockHeader, Collections.emptyList()));
+
+    EnginePayloadStatusResult res = fromSuccessResp(resp);
+    assertThat(res.getLatestValidHash()).isEqualTo(Optional.of(Hash.ZERO));
+    assertThat(res.getStatusAsString()).isEqualTo(INVALID.name());
+    verify(mergeCoordinator, atLeastOnce()).addBadBlock(any(), any());
+    verify(engineCallListener, times(1)).executionEngineCalled();
+  }
+
+  @Override
+  protected boolean validateTerminalPoWBlock() {
+    return true;
+  }
+
+  @Override
+  protected ExecutionEngineJsonRpcMethod.EngineStatus getExpectedInvalidBlockHashStatus() {
+    return INVALID_BLOCK_HASH;
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineNewPayloadV2Test.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineNewPayloadV2Test.java
new file mode 100644
index 00000000000..5de4ede7340
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineNewPayloadV2Test.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class EngineNewPayloadV2Test extends AbstractEngineNewPayloadTest {
+
+  public EngineNewPayloadV2Test() {
+    super(EngineNewPayloadV2::new);
+  }
+
+  @Override
+  @Test
+  public void shouldReturnExpectedMethodName() {
+    assertThat(method.getName()).isEqualTo("engine_newPayloadV2");
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EnginePreparePayloadDebugTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EnginePreparePayloadDebugTest.java
new file mode 100644
index 00000000000..c89df2fff80
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EnginePreparePayloadDebugTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.SYNCING;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod.EngineStatus.VALID;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.merge.MergeContext;
+import org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator;
+import org.hyperledger.besu.consensus.merge.blockcreation.PayloadIdentifier;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.EnginePreparePayloadParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.EnginePreparePayloadResult;
+
+import java.util.Optional;
+
+import io.vertx.core.Vertx;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class EnginePreparePayloadDebugTest {
+  private static final Vertx vertx = Vertx.vertx();
+  EnginePreparePayloadDebug method;
+  @Mock private ProtocolContext protocolContext;
+  @Mock private EngineCallListener engineCallListener;
+  @Mock private MergeMiningCoordinator mergeCoordinator;
+  @Mock private MergeContext mergeContext;
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  private JsonRpcRequestContext requestContext;
+
+  @Mock private EnginePreparePayloadParameter param;
+
+  @Before
+  public void setUp() {
+    when(protocolContext.safeConsensusContext(MergeContext.class))
+        .thenReturn(Optional.of(mergeContext));
+    when(requestContext.getOptionalParameter(0, EnginePreparePayloadParameter.class))
+        .thenReturn(Optional.of(param));
+    method =
+        spy(
+            new EnginePreparePayloadDebug(
+                vertx, protocolContext, engineCallListener, mergeCoordinator));
+  }
+
+  @Test
+  public void shouldReturnSyncing() {
+    when(mergeContext.isSyncing()).thenReturn(true);
+    var resp = method.syncResponse(requestContext);
+    assertThat(resp).isInstanceOf(JsonRpcSuccessResponse.class);
+    var result = ((JsonRpcSuccessResponse) resp).getResult();
+    assertThat(result).isInstanceOf(EnginePreparePayloadResult.class);
+    var payloadResult = (EnginePreparePayloadResult) result;
+    assertThat(payloadResult.getStatus()).isEqualTo(SYNCING.name());
+  }
+
+  @Test
+  public void shouldReturnPayloadId() {
+    checkForPayloadId();
+  }
+
+  @Test
+  public void shouldReturnPayloadIdWhenNoParams() {
+    when(requestContext.getOptionalParameter(0, EnginePreparePayloadParameter.class))
+        .thenReturn(Optional.empty());
+    checkForPayloadId();
+  }
+
+  private void checkForPayloadId() {
+    doAnswer(__ -> Optional.of(new PayloadIdentifier(0xdeadbeefL)))
+        .when(method)
+        .generatePayload(any());
+    var resp = method.syncResponse(requestContext);
+    assertThat(resp).isInstanceOf(JsonRpcSuccessResponse.class);
+    var result = ((JsonRpcSuccessResponse) resp).getResult();
+    assertThat(result).isInstanceOf(EnginePreparePayloadResult.class);
+    var payloadResult = (EnginePreparePayloadResult) result;
+    assertThat(payloadResult.getStatus()).isEqualTo(VALID.name());
+    assertThat(payloadResult.getPayloadId()).isEqualTo("0xdeadbeef");
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineQosTimerTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineQosTimerTest.java
new file mode 100644
index 00000000000..6eedc70819e
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineQosTimerTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.QosTimer;
+
+import io.vertx.core.Vertx;
+import io.vertx.ext.unit.Async;
+import io.vertx.ext.unit.TestContext;
+import io.vertx.ext.unit.junit.VertxUnitRunner;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(VertxUnitRunner.class)
+public class EngineQosTimerTest {
+  private EngineQosTimer engineQosTimer;
+  private Vertx vertx;
+
+  @Before
+  public void setUp() throws Exception {
+    vertx = Vertx.vertx();
+    engineQosTimer = new EngineQosTimer(vertx);
+  }
+
+  @After
+  public void cleanUp() {
+    vertx.close();
+  }
+
+  @Test
+  public void shouldNotWarnWhenCalledWithinTimeout(final TestContext ctx) {
+    final long TEST_QOS_TIMEOUT = 75L;
+    final Async async = ctx.async();
+    final var spyEngineQosTimer = spy(engineQosTimer);
+    final var spyTimer =
+        spy(new QosTimer(vertx, TEST_QOS_TIMEOUT, z -> spyEngineQosTimer.logTimeoutWarning()));
+    spyTimer.resetTimer();
+    doReturn(spyTimer).when(spyEngineQosTimer).getQosTimer();
+
+    // call executionEngineCalled() 50 milliseconds hence to reset our QoS timer
+    vertx.setTimer(50L, z -> spyEngineQosTimer.executionEngineCalled());
+
+    vertx.setTimer(
+        100L,
+        z -> {
+          try {
+            verify(spyTimer, atLeast(2)).resetTimer();
+            // should not warn
+            verify(spyEngineQosTimer, never()).logTimeoutWarning();
+            async.complete();
+          } catch (Exception ex) {
+            ctx.fail(ex);
+          }
+        });
+  }
+
+  @Test
+  public void shouldWarnWhenNotCalledWithinTimeout(final TestContext ctx) {
+    final long TEST_QOS_TIMEOUT = 75L;
+    final Async async = ctx.async();
+    final var spyEngineQosTimer = spy(engineQosTimer);
+    final var spyTimer =
+        spy(new QosTimer(vertx, TEST_QOS_TIMEOUT, z -> spyEngineQosTimer.logTimeoutWarning()));
+    spyTimer.resetTimer();
+    doReturn(spyTimer).when(spyEngineQosTimer).getQosTimer();
+
+    vertx.setTimer(
+        100L,
+        z -> {
+          try {
+            verify(spyTimer, atLeastOnce()).resetTimer();
+            // should warn
+            verify(spyEngineQosTimer, atLeastOnce()).logTimeoutWarning();
+            async.complete();
+          } catch (Exception ex) {
+            ctx.fail(ex);
+          }
+        });
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbaseTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbaseTest.java
index 6825eca51ab..9df4e5688de 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbaseTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetCoinbaseTest.java
@@ -21,6 +21,7 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.verify;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
@@ -29,7 +30,6 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
-import org.hyperledger.besu.ethereum.core.Address;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -82,7 +82,7 @@ public void shouldSetCoinbaseWhenRequestHasAddress() {
     final JsonRpcResponse response = method.response(request);
 
     verify(miningCoordinator).setCoinbase(eq(Address.fromHexString("0x0")));
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -99,7 +99,7 @@ public void shouldReturnAnInvalidRequestIfUnderlyingOperationThrowsUnsupportedOp
         .setCoinbase(any());
 
     final JsonRpcResponse response = method.response(request);
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   private JsonRpcRequestContext minerSetCoinbaseRequest(final String hexString) {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetEtherbaseTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetEtherbaseTest.java
index af94e966946..e4eb3c23797 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetEtherbaseTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerSetEtherbaseTest.java
@@ -59,6 +59,6 @@ public void shouldDelegateToMinerSetCoinbase() {
     method.response(request);
 
     final JsonRpcRequestContext delegatedRequest = requestCaptor.getValue();
-    assertThat(delegatedRequest).isEqualToComparingFieldByField(request);
+    assertThat(delegatedRequest).usingRecursiveComparison().isEqualTo(request);
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStartTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStartTest.java
index bb5972d2de2..eb09f5f6666 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStartTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStartTest.java
@@ -25,7 +25,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.blockcreation.CoinbaseNotSetException;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -38,7 +38,7 @@ public class MinerStartTest {
 
   private MinerStart method;
 
-  @Mock private EthHashMiningCoordinator miningCoordinator;
+  @Mock private PoWMiningCoordinator miningCoordinator;
 
   @Before
   public void before() {
@@ -58,7 +58,7 @@ public void shouldReturnTrueWhenMiningStartsSuccessfully() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -69,7 +69,7 @@ public void shouldReturnFalseWhenMiningDoesNotStart() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -82,7 +82,7 @@ public void shouldReturnCoinbaseNotSetErrorWhenCoinbaseHasNotBeenSet() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   private JsonRpcRequestContext minerStart() {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStopTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStopTest.java
index e80509f6d61..f5c443d3a52 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStopTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/miner/MinerStopTest.java
@@ -21,7 +21,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -34,7 +34,7 @@ public class MinerStopTest {
 
   private MinerStop method;
 
-  @Mock private EthHashMiningCoordinator miningCoordinator;
+  @Mock private PoWMiningCoordinator miningCoordinator;
 
   @Before
   public void before() {
@@ -54,7 +54,7 @@ public void shouldReturnTrueWhenMiningStopsSuccessfully() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -65,7 +65,7 @@ public void shouldReturnFalseWhenMiningDoesNotStopSuccessfully() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   private JsonRpcRequestContext minerStop() {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToAllowlistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToAllowlistTest.java
index b614da1117b..2eb4cb038b5 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToAllowlistTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToAllowlistTest.java
@@ -64,7 +64,7 @@ public void whenAccountsAreAddedToWhitelistShouldReturnSuccess() {
 
     JsonRpcResponse actualResponse = method.response(request(accounts));
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -76,7 +76,7 @@ public void whenAccountIsInvalidShouldReturnInvalidAccountErrorResponse() {
 
     JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -88,7 +88,7 @@ public void whenAccountExistsShouldReturnExistingEntryErrorResponse() {
 
     JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -100,7 +100,7 @@ public void whenInputHasDuplicatedAccountsShouldReturnDuplicatedEntryErrorRespon
 
     JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -113,7 +113,7 @@ public void whenEmptyListOnRequestShouldReturnEmptyEntryErrorResponse() {
 
     JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToWhitelistTest.java
index bc6d22c00b6..f423402b429 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToWhitelistTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddAccountsToWhitelistTest.java
@@ -65,7 +65,7 @@ public void whenAccountsAreAddedToWhitelistShouldReturnSuccess() {
 
     JsonRpcResponse actualResponse = method.response(request(accounts));
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -77,7 +77,7 @@ public void whenAccountIsInvalidShouldReturnInvalidAccountErrorResponse() {
 
     JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -89,7 +89,7 @@ public void whenAccountExistsShouldReturnExistingEntryErrorResponse() {
 
     JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -101,7 +101,7 @@ public void whenInputHasDuplicatedAccountsShouldReturnDuplicatedEntryErrorRespon
 
     JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -114,7 +114,7 @@ public void whenEmptyListOnRequestShouldReturnEmptyEntryErrorResponse() {
 
     JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToAllowlistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToAllowlistTest.java
index bbd2cbbda5a..500b7090336 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToAllowlistTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToAllowlistTest.java
@@ -33,6 +33,7 @@
 import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -83,7 +84,7 @@ public void shouldThrowInvalidJsonRpcParametersExceptionWhenOnlyBadEnode() {
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -99,22 +100,22 @@ public void shouldThrowInvalidJsonRpcParametersExceptionWhenBadEnodeInList() {
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
   public void shouldThrowInvalidJsonRpcParametersExceptionWhenEmptyEnode() {
-    final JsonRpcRequestContext request = buildRequest(Lists.emptyList());
+    final JsonRpcRequestContext request = buildRequest(Collections.emptyList());
     final JsonRpcResponse expected =
         new JsonRpcErrorResponse(
             request.getRequest().getId(), JsonRpcError.NODE_ALLOWLIST_EMPTY_ENTRY);
 
-    when(nodeLocalConfigPermissioningController.addNodes(eq(Lists.emptyList())))
+    when(nodeLocalConfigPermissioningController.addNodes(Collections.emptyList()))
         .thenReturn(new NodesAllowlistResult(AllowlistOperationResult.ERROR_EMPTY_ENTRY));
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -129,7 +130,7 @@ public void whenRequestContainsDuplicatedNodesShouldReturnDuplicatedEntryError()
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -144,7 +145,7 @@ public void whenRequestContainsEmptyListOfNodesShouldReturnEmptyEntryError() {
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -157,7 +158,7 @@ public void shouldAddSingleValidNode() {
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
 
     verify(nodeLocalConfigPermissioningController, times(1)).addNodes(any());
     verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -173,7 +174,7 @@ public void shouldAddMultipleValidNodes() {
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
 
     verify(nodeLocalConfigPermissioningController, times(1)).addNodes(any());
     verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -190,7 +191,8 @@ public void shouldFailWhenP2pDisabled() {
             request.getRequest().getId(), JsonRpcError.NODE_ALLOWLIST_NOT_ENABLED);
 
     Assertions.assertThat(method.response(request))
-        .isEqualToComparingFieldByField(expectedResponse);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
   }
 
   private JsonRpcRequestContext buildRequest(final List<String> enodeList) {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToWhitelistTest.java
index ea5daf79a5c..09eacb8220c 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToWhitelistTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermAddNodesToWhitelistTest.java
@@ -33,6 +33,7 @@
 import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -84,7 +85,7 @@ public void shouldThrowInvalidJsonRpcParametersExceptionWhenOnlyBadEnode() {
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -100,22 +101,22 @@ public void shouldThrowInvalidJsonRpcParametersExceptionWhenBadEnodeInList() {
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
   public void shouldThrowInvalidJsonRpcParametersExceptionWhenEmptyEnode() {
-    final JsonRpcRequestContext request = buildRequest(Lists.emptyList());
+    final JsonRpcRequestContext request = buildRequest(Collections.emptyList());
     final JsonRpcResponse expected =
         new JsonRpcErrorResponse(
             request.getRequest().getId(), JsonRpcError.NODE_ALLOWLIST_EMPTY_ENTRY);
 
-    when(nodeLocalConfigPermissioningController.addNodes(eq(Lists.emptyList())))
+    when(nodeLocalConfigPermissioningController.addNodes(Collections.emptyList()))
         .thenReturn(new NodesAllowlistResult(AllowlistOperationResult.ERROR_EMPTY_ENTRY));
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -130,7 +131,7 @@ public void whenRequestContainsDuplicatedNodesShouldReturnDuplicatedEntryError()
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -145,7 +146,7 @@ public void whenRequestContainsEmptyListOfNodesShouldReturnEmptyEntryError() {
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -158,7 +159,7 @@ public void shouldAddSingleValidNode() {
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
 
     verify(nodeLocalConfigPermissioningController, times(1)).addNodes(any());
     verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -174,7 +175,7 @@ public void shouldAddMultipleValidNodes() {
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
 
     verify(nodeLocalConfigPermissioningController, times(1)).addNodes(any());
     verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -191,7 +192,8 @@ public void shouldFailWhenP2pDisabled() {
             request.getRequest().getId(), JsonRpcError.NODE_ALLOWLIST_NOT_ENABLED);
 
     Assertions.assertThat(method.response(request))
-        .isEqualToComparingFieldByField(expectedResponse);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
   }
 
   private JsonRpcRequestContext buildRequest(final List<String> enodeList) {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsAllowlistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsAllowlistTest.java
index eaeaee4f34b..d7ffc872fb8 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsAllowlistTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsAllowlistTest.java
@@ -60,7 +60,7 @@ public void shouldReturnExpectedListOfAccountsWhenAllowlistHasBeenSet() {
 
     JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -71,6 +71,6 @@ public void shouldReturnEmptyListOfAccountsWhenAllowlistHasBeenSetAndIsEmpty() {
 
     JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsWhitelistTest.java
index 8e5b794e1bc..55300293d7a 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsWhitelistTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetAccountsWhitelistTest.java
@@ -61,7 +61,7 @@ public void shouldReturnExpectedListOfAccountsWhenWhitelistHasBeenSet() {
 
     JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -72,6 +72,6 @@ public void shouldReturnEmptyListOfAccountsWhenWhitelistHasBeenSetAndIsEmpty() {
 
     JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesAllowlistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesAllowlistTest.java
index a7d261b8459..38b6c12cfbb 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesAllowlistTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesAllowlistTest.java
@@ -28,6 +28,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -76,7 +77,7 @@ public void shouldReturnSuccessResponseWhenListPopulated() {
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
 
     verify(nodeLocalConfigPermissioningController, times(1)).getNodesAllowlist();
     verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -86,13 +87,13 @@ public void shouldReturnSuccessResponseWhenListPopulated() {
   public void shouldReturnSuccessResponseWhenListSetAndEmpty() {
     final JsonRpcRequestContext request = buildRequest();
     final JsonRpcResponse expected =
-        new JsonRpcSuccessResponse(request.getRequest().getId(), Lists.emptyList());
+        new JsonRpcSuccessResponse(request.getRequest().getId(), Collections.emptyList());
 
     when(nodeLocalConfigPermissioningController.getNodesAllowlist()).thenReturn(buildNodesList());
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
 
     verify(nodeLocalConfigPermissioningController, times(1)).getNodesAllowlist();
     verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -108,7 +109,8 @@ public void shouldFailWhenP2pDisabled() {
             request.getRequest().getId(), JsonRpcError.NODE_ALLOWLIST_NOT_ENABLED);
 
     Assertions.assertThat(method.response(request))
-        .isEqualToComparingFieldByField(expectedResponse);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
   }
 
   private JsonRpcRequestContext buildRequest() {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesWhitelistTest.java
index a644e090c4e..914caedbc0d 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesWhitelistTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermGetNodesWhitelistTest.java
@@ -28,6 +28,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -77,7 +78,7 @@ public void shouldReturnSuccessResponseWhenListPopulated() {
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
 
     verify(nodeLocalConfigPermissioningController, times(1)).getNodesAllowlist();
     verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -87,13 +88,13 @@ public void shouldReturnSuccessResponseWhenListPopulated() {
   public void shouldReturnSuccessResponseWhenListSetAndEmpty() {
     final JsonRpcRequestContext request = buildRequest();
     final JsonRpcResponse expected =
-        new JsonRpcSuccessResponse(request.getRequest().getId(), Lists.emptyList());
+        new JsonRpcSuccessResponse(request.getRequest().getId(), Collections.emptyList());
 
     when(nodeLocalConfigPermissioningController.getNodesAllowlist()).thenReturn(buildNodesList());
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
 
     verify(nodeLocalConfigPermissioningController, times(1)).getNodesAllowlist();
     verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -109,7 +110,8 @@ public void shouldFailWhenP2pDisabled() {
             request.getRequest().getId(), JsonRpcError.NODE_ALLOWLIST_NOT_ENABLED);
 
     Assertions.assertThat(method.response(request))
-        .isEqualToComparingFieldByField(expectedResponse);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
   }
 
   private JsonRpcRequestContext buildRequest() {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFileTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFileTest.java
index 5f8174cc154..cbc957aa5c8 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFileTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermReloadPermissionsFromFileTest.java
@@ -64,7 +64,7 @@ public void whenBothControllersAreNotPresentMethodShouldReturnPermissioningDisab
 
     JsonRpcResponse response = method.response(reloadRequest());
 
-    assertThat(response).isEqualToComparingFieldByField(expectedErrorResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedErrorResponse);
   }
 
   @Test
@@ -74,7 +74,7 @@ public void whenControllersReloadSucceedsMethodShouldReturnSuccess() {
     verify(accountLocalConfigPermissioningController).reload();
     verify(nodeLocalConfigPermissioningController).reload();
 
-    assertThat(response).isEqualToComparingFieldByField(successResponse());
+    assertThat(response).usingRecursiveComparison().isEqualTo(successResponse());
   }
 
   @Test
@@ -85,7 +85,7 @@ public void whenControllerReloadFailsMethodShouldReturnError() {
 
     JsonRpcResponse response = method.response(reloadRequest());
 
-    assertThat(response).isEqualToComparingFieldByField(expectedErrorResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedErrorResponse);
   }
 
   private JsonRpcSuccessResponse successResponse() {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromAllowlistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromAllowlistTest.java
index 995ecbe0105..60d3f7a8f8e 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromAllowlistTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromAllowlistTest.java
@@ -65,7 +65,7 @@ public void whenAccountsAreRemovedFromAllowlistShouldReturnSuccess() {
 
     JsonRpcResponse actualResponse = method.response(request(accounts));
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -77,7 +77,7 @@ public void whenAccountIsInvalidShouldReturnInvalidAccountErrorResponse() {
 
     JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -89,7 +89,7 @@ public void whenAccountIsAbsentShouldReturnAbsentAccountErrorResponse() {
 
     JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -101,7 +101,7 @@ public void whenInputHasDuplicatedAccountsShouldReturnDuplicatedEntryErrorRespon
 
     JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -114,7 +114,7 @@ public void whenEmptyListOnRequestShouldReturnEmptyEntryErrorResponse() {
 
     JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromWhitelistTest.java
index ba1a79b1b23..dd70d9458a9 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromWhitelistTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveAccountsFromWhitelistTest.java
@@ -66,7 +66,7 @@ public void whenAccountsAreRemovedFromWhitelistShouldReturnSuccess() {
 
     JsonRpcResponse actualResponse = method.response(request(accounts));
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -78,7 +78,7 @@ public void whenAccountIsInvalidShouldReturnInvalidAccountErrorResponse() {
 
     JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -90,7 +90,7 @@ public void whenAccountIsAbsentShouldReturnAbsentAccountErrorResponse() {
 
     JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -102,7 +102,7 @@ public void whenInputHasDuplicatedAccountsShouldReturnDuplicatedEntryErrorRespon
 
     JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -115,7 +115,7 @@ public void whenEmptyListOnRequestShouldReturnEmptyEntryErrorResponse() {
 
     JsonRpcResponse actualResponse = method.response(request(new ArrayList<>()));
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromAllowlistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromAllowlistTest.java
index f96526d1508..5fdd9b86cfa 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromAllowlistTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromAllowlistTest.java
@@ -33,6 +33,7 @@
 import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -82,22 +83,22 @@ public void shouldThrowInvalidJsonRpcParametersExceptionWhenBadEnode() {
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
   public void shouldThrowInvalidJsonRpcParametersExceptionWhenEmptyList() {
-    final JsonRpcRequestContext request = buildRequest(Lists.emptyList());
+    final JsonRpcRequestContext request = buildRequest(Collections.emptyList());
     final JsonRpcResponse expected =
         new JsonRpcErrorResponse(
             request.getRequest().getId(), JsonRpcError.NODE_ALLOWLIST_EMPTY_ENTRY);
 
-    when(nodeLocalConfigPermissioningController.removeNodes(eq(Lists.emptyList())))
+    when(nodeLocalConfigPermissioningController.removeNodes(Collections.emptyList()))
         .thenReturn(new NodesAllowlistResult(AllowlistOperationResult.ERROR_EMPTY_ENTRY));
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -110,7 +111,7 @@ public void shouldRemoveSingleValidNode() {
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
 
     verify(nodeLocalConfigPermissioningController, times(1)).removeNodes(any());
     verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -126,7 +127,7 @@ public void shouldRemoveMultipleValidNodes() {
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
 
     verify(nodeLocalConfigPermissioningController, times(1)).removeNodes(any());
     verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -141,7 +142,8 @@ public void shouldFailWhenP2pDisabled() {
             request.getRequest().getId(), JsonRpcError.NODE_ALLOWLIST_NOT_ENABLED);
 
     Assertions.assertThat(method.response(request))
-        .isEqualToComparingFieldByField(expectedResponse);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
   }
 
   @Test
@@ -156,7 +158,7 @@ public void whenRequestContainsDuplicatedNodesShouldReturnDuplicatedEntryError()
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -171,7 +173,7 @@ public void whenRequestContainsEmptyListOfNodesShouldReturnEmptyEntryError() {
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -187,7 +189,7 @@ public void shouldReturnCantRemoveBootnodeWhenRemovingBootnode() {
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   private JsonRpcRequestContext buildRequest(final List<String> enodeList) {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromWhitelistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromWhitelistTest.java
index f0dcde3de6b..79c4a7271a2 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromWhitelistTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/permissioning/PermRemoveNodesFromWhitelistTest.java
@@ -33,6 +33,7 @@
 import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -83,22 +84,22 @@ public void shouldThrowInvalidJsonRpcParametersExceptionWhenBadEnode() {
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
   public void shouldThrowInvalidJsonRpcParametersExceptionWhenEmptyList() {
-    final JsonRpcRequestContext request = buildRequest(Lists.emptyList());
+    final JsonRpcRequestContext request = buildRequest(Collections.emptyList());
     final JsonRpcResponse expected =
         new JsonRpcErrorResponse(
             request.getRequest().getId(), JsonRpcError.NODE_ALLOWLIST_EMPTY_ENTRY);
 
-    when(nodeLocalConfigPermissioningController.removeNodes(eq(Lists.emptyList())))
+    when(nodeLocalConfigPermissioningController.removeNodes(Collections.emptyList()))
         .thenReturn(new NodesAllowlistResult(AllowlistOperationResult.ERROR_EMPTY_ENTRY));
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -111,7 +112,7 @@ public void shouldRemoveSingleValidNode() {
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
 
     verify(nodeLocalConfigPermissioningController, times(1)).removeNodes(any());
     verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -127,7 +128,7 @@ public void shouldRemoveMultipleValidNodes() {
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
 
     verify(nodeLocalConfigPermissioningController, times(1)).removeNodes(any());
     verifyNoMoreInteractions(nodeLocalConfigPermissioningController);
@@ -142,7 +143,8 @@ public void shouldFailWhenP2pDisabled() {
             request.getRequest().getId(), JsonRpcError.NODE_ALLOWLIST_NOT_ENABLED);
 
     Assertions.assertThat(method.response(request))
-        .isEqualToComparingFieldByField(expectedResponse);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedResponse);
   }
 
   @Test
@@ -157,7 +159,7 @@ public void whenRequestContainsDuplicatedNodesShouldReturnDuplicatedEntryError()
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -172,7 +174,7 @@ public void whenRequestContainsEmptyListOfNodesShouldReturnEmptyEntryError() {
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   @Test
@@ -188,7 +190,7 @@ public void shouldReturnCantRemoveBootnodeWhenRemovingBootnode() {
 
     final JsonRpcResponse actual = method.response(request);
 
-    assertThat(actual).isEqualToComparingFieldByFieldRecursively(expected);
+    assertThat(actual).usingRecursiveComparison().isEqualTo(expected);
   }
 
   private JsonRpcRequestContext buildRequest(final List<String> enodeList) {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/BlockParameterTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/BlockParameterTest.java
new file mode 100644
index 00000000000..fa0899ee2c7
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/BlockParameterTest.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.junit.Test;
+
+public class BlockParameterTest {
+  @Test
+  public void earliestShouldReturnZeroNumberValue() {
+    final BlockParameter blockParameter = new BlockParameter("earliest");
+    assertThat(blockParameter.getNumber()).isPresent();
+    assertThat(blockParameter.getNumber().get()).isEqualTo(0);
+
+    assertThat(blockParameter.isEarliest()).isTrue();
+    assertThat(blockParameter.isFinalized()).isFalse();
+    assertThat(blockParameter.isLatest()).isFalse();
+    assertThat(blockParameter.isNumeric()).isFalse();
+    assertThat(blockParameter.isPending()).isFalse();
+    assertThat(blockParameter.isSafe()).isFalse();
+  }
+
+  @Test
+  public void latestShouldReturnEmptyNumberValue() {
+    final BlockParameter blockParameter = new BlockParameter("latest");
+    assertThat(blockParameter.getNumber()).isEmpty();
+
+    assertThat(blockParameter.isLatest()).isTrue();
+    assertThat(blockParameter.isEarliest()).isFalse();
+    assertThat(blockParameter.isFinalized()).isFalse();
+    assertThat(blockParameter.isNumeric()).isFalse();
+    assertThat(blockParameter.isPending()).isFalse();
+    assertThat(blockParameter.isSafe()).isFalse();
+  }
+
+  @Test
+  public void pendingShouldReturnEmptyNumberValue() {
+    final BlockParameter blockParameter = new BlockParameter("pending");
+    assertThat(blockParameter.getNumber()).isEmpty();
+
+    assertThat(blockParameter.isPending()).isTrue();
+    assertThat(blockParameter.isEarliest()).isFalse();
+    assertThat(blockParameter.isFinalized()).isFalse();
+    assertThat(blockParameter.isLatest()).isFalse();
+    assertThat(blockParameter.isNumeric()).isFalse();
+    assertThat(blockParameter.isSafe()).isFalse();
+  }
+
+  @Test
+  public void finalizedShouldReturnEmptyNumberValue() {
+    final BlockParameter blockParameter = new BlockParameter("finalized");
+    assertThat(blockParameter.getNumber()).isEmpty();
+
+    assertThat(blockParameter.isFinalized()).isTrue();
+    assertThat(blockParameter.isEarliest()).isFalse();
+    assertThat(blockParameter.isLatest()).isFalse();
+    assertThat(blockParameter.isNumeric()).isFalse();
+    assertThat(blockParameter.isPending()).isFalse();
+    assertThat(blockParameter.isSafe()).isFalse();
+  }
+
+  @Test
+  public void safeShouldReturnEmptyNumberValue() {
+    final BlockParameter blockParameter = new BlockParameter("safe");
+    assertThat(blockParameter.getNumber()).isEmpty();
+
+    assertThat(blockParameter.isSafe()).isTrue();
+    assertThat(blockParameter.isEarliest()).isFalse();
+    assertThat(blockParameter.isFinalized()).isFalse();
+    assertThat(blockParameter.isLatest()).isFalse();
+    assertThat(blockParameter.isNumeric()).isFalse();
+    assertThat(blockParameter.isPending()).isFalse();
+  }
+
+  @Test
+  public void stringNumberShouldReturnLongNumberValue() {
+    final BlockParameter blockParameter = new BlockParameter("7");
+    assertThat(blockParameter.getNumber()).isPresent();
+    assertThat(blockParameter.getNumber().get()).isEqualTo(7L);
+
+    assertThat(blockParameter.isNumeric()).isTrue();
+    assertThat(blockParameter.isEarliest()).isFalse();
+    assertThat(blockParameter.isFinalized()).isFalse();
+    assertThat(blockParameter.isLatest()).isFalse();
+    assertThat(blockParameter.isPending()).isFalse();
+    assertThat(blockParameter.isSafe()).isFalse();
+  }
+
+  @Test
+  public void longShouldReturnLongNumberValue() {
+    final BlockParameter blockParameter = new BlockParameter(5);
+    assertThat(blockParameter.getNumber()).isPresent();
+    assertThat(blockParameter.getNumber().get()).isEqualTo(5L);
+
+    assertThat(blockParameter.isNumeric()).isTrue();
+    assertThat(blockParameter.isEarliest()).isFalse();
+    assertThat(blockParameter.isFinalized()).isFalse();
+    assertThat(blockParameter.isLatest()).isFalse();
+    assertThat(blockParameter.isPending()).isFalse();
+    assertThat(blockParameter.isSafe()).isFalse();
+  }
+
+  @Test
+  public void upperCaseStringShouldBeHandled() {
+    final BlockParameter blockParameter = new BlockParameter("LATEST");
+    assertThat(blockParameter.getNumber()).isEmpty();
+    assertThat(blockParameter.isLatest()).isTrue();
+    assertThat(blockParameter.isEarliest()).isFalse();
+    assertThat(blockParameter.isFinalized()).isFalse();
+    assertThat(blockParameter.isNumeric()).isFalse();
+    assertThat(blockParameter.isPending()).isFalse();
+    assertThat(blockParameter.isSafe()).isFalse();
+  }
+
+  @Test
+  public void mixedCaseStringShouldBeHandled() {
+    final BlockParameter blockParameter = new BlockParameter("lATest");
+    assertThat(blockParameter.getNumber()).isEmpty();
+    assertThat(blockParameter.isLatest()).isTrue();
+    assertThat(blockParameter.isEarliest()).isFalse();
+    assertThat(blockParameter.isFinalized()).isFalse();
+    assertThat(blockParameter.isNumeric()).isFalse();
+    assertThat(blockParameter.isPending()).isFalse();
+    assertThat(blockParameter.isSafe()).isFalse();
+  }
+
+  @Test
+  public void invalidValueShouldThrowException() {
+    assertThatThrownBy(() -> new BlockParameter("invalid"))
+        .isInstanceOf(NumberFormatException.class)
+        .hasMessageContaining("invalid");
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/DepositParameterTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/DepositParameterTest.java
new file mode 100644
index 00000000000..6d2d383759b
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/DepositParameterTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.DepositParameterTestFixture.DEPOSIT_PARAM_1;
+
+import org.hyperledger.besu.datatypes.BLSPublicKey;
+import org.hyperledger.besu.datatypes.BLSSignature;
+import org.hyperledger.besu.datatypes.GWei;
+import org.hyperledger.besu.ethereum.core.Deposit;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt64;
+import org.junit.Test;
+
+public class DepositParameterTest {
+
+  @Test
+  public void toDeposit() {
+    Deposit expected =
+        new Deposit(
+            BLSPublicKey.fromHexString(
+                "0xb10a4a15bf67b328c9b101d09e5c6ee6672978fdad9ef0d9e2ceffaee99223555d8601f0cb3bcc4ce1af9864779a416e"),
+            Bytes32.fromHexString(
+                "0x0017a7fcf06faf493d30bbe2632ea7c2383cd86825e12797165de7aa35589483"),
+            GWei.of(32000000000L),
+            BLSSignature.fromHexString(
+                "0xa889db8300194050a2636c92a95bc7160515867614b7971a9500cdb62f9c0890217d2901c3241f86fac029428fc106930606154bd9e406d7588934a5f15b837180b17194d6e44bd6de23e43b163dfe12e369dcc75a3852cd997963f158217eb5"),
+            UInt64.ONE);
+    assertThat(DEPOSIT_PARAM_1.toDeposit()).isEqualTo(expected);
+  }
+
+  @Test
+  public void fromDeposit() {
+    Deposit deposit =
+        new Deposit(
+            BLSPublicKey.fromHexString(
+                "0xb10a4a15bf67b328c9b101d09e5c6ee6672978fdad9ef0d9e2ceffaee99223555d8601f0cb3bcc4ce1af9864779a416e"),
+            Bytes32.fromHexString(
+                "0x0017a7fcf06faf493d30bbe2632ea7c2383cd86825e12797165de7aa35589483"),
+            GWei.of(32000000000L),
+            BLSSignature.fromHexString(
+                "0xa889db8300194050a2636c92a95bc7160515867614b7971a9500cdb62f9c0890217d2901c3241f86fac029428fc106930606154bd9e406d7588934a5f15b837180b17194d6e44bd6de23e43b163dfe12e369dcc75a3852cd997963f158217eb5"),
+            UInt64.ONE);
+
+    assertThat(DepositParameter.fromDeposit(deposit)).isEqualTo(DEPOSIT_PARAM_1);
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/DepositParameterTestFixture.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/DepositParameterTestFixture.java
new file mode 100644
index 00000000000..ef9ef57b832
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/DepositParameterTestFixture.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
+
+public class DepositParameterTestFixture {
+
+  public static final DepositParameter DEPOSIT_PARAM_1 =
+      createDeposit(
+          "0xb10a4a15bf67b328c9b101d09e5c6ee6672978fdad9ef0d9e2ceffaee99223555d8601f0cb3bcc4ce1af9864779a416e",
+          "0x0017a7fcf06faf493d30bbe2632ea7c2383cd86825e12797165de7aa35589483",
+          "0x773594000",
+          "0xa889db8300194050a2636c92a95bc7160515867614b7971a9500cdb62f9c0890217d2901c3241f86fac029428fc106930606154bd9e406d7588934a5f15b837180b17194d6e44bd6de23e43b163dfe12e369dcc75a3852cd997963f158217eb5",
+          "0x1");
+  static final DepositParameter DEPOSIT_PARAM_2 =
+      createDeposit(
+          "0x8706d19a62f28a6a6549f96c5adaebac9124a61d44868ec94f6d2d707c6a2f82c9162071231dfeb40e24bfde4ffdf243",
+          "0x006a8dc800c6d8dd6977ef53264e2d030350f0145a91bcd167b4f1c3ea21b271",
+          "0x773594000",
+          "0x801b08ca107b623eca32ee9f9111b4e50eb9cfe19e38204b72de7dc04c5a5e00f61bab96f10842576f66020ce851083f1583dd9a6b73301bea6c245cf51f27cf96aeb018852c5f70bf485d16b957cfe49ca008913346b431e7653ae3ddb23b07",
+          "0x3");
+
+  private static DepositParameter createDeposit(
+      final String pubKey,
+      final String withdrawalCredentials,
+      final String amount,
+      final String signature,
+      final String index) {
+    return new DepositParameter(pubKey, withdrawalCredentials, amount, signature, index);
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EnginePayloadAttributesParameterTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EnginePayloadAttributesParameterTest.java
new file mode 100644
index 00000000000..56bee9fa279
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/EnginePayloadAttributesParameterTest.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.WithdrawalParameterTestFixture.WITHDRAWAL_PARAM_1;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.WithdrawalParameterTestFixture.WITHDRAWAL_PARAM_2;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.GWei;
+
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.Test;
+
+public class EnginePayloadAttributesParameterTest {
+
+  private static final String TIMESTAMP = "0x50";
+  private static final String PREV_RANDAO =
+      "0xff00000000000000000000000000000000000000000000000000000000000000";
+  private static final String SUGGESTED_FEE_RECIPIENT_ADDRESS =
+      "0xaa00000000000000000000000000000000000000";
+
+  @Test
+  public void attributesAreConvertedFromString_WithdrawalsOmitted() {
+    final EnginePayloadAttributesParameter parameter = parameterWithdrawalsOmitted();
+    assertThat(parameter.getTimestamp()).isEqualTo(80L);
+    assertThat(parameter.getPrevRandao())
+        .isEqualTo(
+            Bytes32.fromHexString(
+                "0xff00000000000000000000000000000000000000000000000000000000000000"));
+    assertThat(parameter.getSuggestedFeeRecipient())
+        .isEqualTo(Address.fromHexString("0xaa00000000000000000000000000000000000000"));
+    assertThat(parameter.getWithdrawals()).isNull();
+  }
+
+  @Test
+  public void attributesAreConvertedFromString_WithdrawalsPresent() {
+    final EnginePayloadAttributesParameter parameter = parameterWithdrawalsPresent();
+    assertThat(parameter.getTimestamp()).isEqualTo(80L);
+    assertThat(parameter.getPrevRandao())
+        .isEqualTo(
+            Bytes32.fromHexString(
+                "0xff00000000000000000000000000000000000000000000000000000000000000"));
+    assertThat(parameter.getSuggestedFeeRecipient())
+        .isEqualTo(Address.fromHexString("0xaa00000000000000000000000000000000000000"));
+    assertThat(parameter.getWithdrawals()).hasSize(2);
+  }
+
+  @Test
+  public void serialize_WithdrawalsOmitted() {
+    assertThat(parameterWithdrawalsOmitted().serialize())
+        .isEqualTo(
+            "{"
+                + "\"timestamp\":80,"
+                + "\"prevRandao\":\"0xff00000000000000000000000000000000000000000000000000000000000000\","
+                + "\"suggestedFeeRecipient\":\"0xaa00000000000000000000000000000000000000\""
+                + "}");
+  }
+
+  @Test
+  public void serialize_WithdrawalsPresent() {
+    assertThat(parameterWithdrawalsPresent().serialize())
+        .isEqualTo(
+            "{"
+                + "\"timestamp\":80,"
+                + "\"prevRandao\":\"0xff00000000000000000000000000000000000000000000000000000000000000\","
+                + "\"suggestedFeeRecipient\":\"0xaa00000000000000000000000000000000000000\","
+                + "\"withdrawals\":[{"
+                + "\"index\":\"0x0\","
+                + "\"validatorIndex\":\"0xffff\","
+                + "\"address\":\"0x0000000000000000000000000000000000000000\","
+                + "\"amount\":\"0x0\""
+                + "},"
+                + "{"
+                + "\"index\":\"0x1\","
+                + "\"validatorIndex\":\"0x10000\","
+                + "\"address\":\"0x0100000000000000000000000000000000000000\","
+                + "\"amount\":\""
+                + GWei.ONE.toHexString()
+                + "\""
+                + "}]"
+                + "}");
+  }
+
+  private EnginePayloadAttributesParameter parameterWithdrawalsOmitted() {
+    return new EnginePayloadAttributesParameter(
+        TIMESTAMP, PREV_RANDAO, SUGGESTED_FEE_RECIPIENT_ADDRESS, null);
+  }
+
+  private EnginePayloadAttributesParameter parameterWithdrawalsPresent() {
+    final List<WithdrawalParameter> withdrawals = List.of(WITHDRAWAL_PARAM_1, WITHDRAWAL_PARAM_2);
+    return new EnginePayloadAttributesParameter(
+        TIMESTAMP, PREV_RANDAO, SUGGESTED_FEE_RECIPIENT_ADDRESS, withdrawals);
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/FilterParameterTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/FilterParameterTest.java
index cc5c7034ede..73521ce6678 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/FilterParameterTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/FilterParameterTest.java
@@ -19,11 +19,11 @@
 import static java.util.stream.Collectors.toUnmodifiableList;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.LogTopic;
+import org.hyperledger.besu.evm.log.LogTopic;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -59,8 +59,7 @@ public void jsonWithArrayOfAddressesShouldSerializeSuccessfully() throws Excepti
     final FilterParameter parsedFilterParameter =
         request.getRequiredParameter(0, FilterParameter.class);
 
-    assertThat(parsedFilterParameter)
-        .isEqualToComparingFieldByFieldRecursively(expectedFilterParameter);
+    assertThat(parsedFilterParameter).usingRecursiveComparison().isEqualTo(expectedFilterParameter);
   }
 
   @Test
@@ -74,8 +73,7 @@ public void jsonWithSingleAddressShouldSerializeSuccessfully() throws Exception
     final FilterParameter parsedFilterParameter =
         request.getRequiredParameter(0, FilterParameter.class);
 
-    assertThat(parsedFilterParameter)
-        .isEqualToComparingFieldByFieldRecursively(expectedFilterParameter);
+    assertThat(parsedFilterParameter).usingRecursiveComparison().isEqualTo(expectedFilterParameter);
   }
 
   @Test
@@ -94,8 +92,7 @@ public void jsonWithSingleAddressAndSingleTopicShouldSerializeSuccessfully() thr
     final FilterParameter parsedFilterParameter =
         request.getRequiredParameter(0, FilterParameter.class);
 
-    assertThat(parsedFilterParameter)
-        .isEqualToComparingFieldByFieldRecursively(expectedFilterParameter);
+    assertThat(parsedFilterParameter).usingRecursiveComparison().isEqualTo(expectedFilterParameter);
   }
 
   @Test
@@ -114,8 +111,7 @@ public void jsonWithSingleAddressAndMultipleTopicsShouldSerializeSuccessfully()
     final FilterParameter parsedFilterParameter =
         request.getRequiredParameter(0, FilterParameter.class);
 
-    assertThat(parsedFilterParameter)
-        .isEqualToComparingFieldByFieldRecursively(expectedFilterParameter);
+    assertThat(parsedFilterParameter).usingRecursiveComparison().isEqualTo(expectedFilterParameter);
   }
 
   @Test
@@ -137,8 +133,7 @@ public void jsonWithSingleAddressAndMultipleListsOfTopicsShouldSerializeSuccessf
     final FilterParameter parsedFilterParameter =
         request.getRequiredParameter(0, FilterParameter.class);
 
-    assertThat(parsedFilterParameter)
-        .isEqualToComparingFieldByFieldRecursively(expectedFilterParameter);
+    assertThat(parsedFilterParameter).usingRecursiveComparison().isEqualTo(expectedFilterParameter);
   }
 
   @Test
@@ -195,7 +190,8 @@ public void jsonWithBlockHashIncludingAliasAndFromAndToParametersIsInvalid() thr
 
     assertThat(parsedFilterParameterUsingAlias.isValid()).isFalse();
     assertThat(parsedFilterParameter)
-        .isEqualToComparingFieldByField(parsedFilterParameterUsingAlias);
+        .usingRecursiveComparison()
+        .isEqualTo(parsedFilterParameterUsingAlias);
   }
 
   @Test
@@ -236,7 +232,8 @@ public void jsonBlockHashAliasSucceeds() throws Exception {
 
     // blockhash and blockHash should end up the same
     assertThat(parsedFilterParameter)
-        .isEqualToComparingFieldByField(parsedFilterParameterUsingAlias);
+        .usingRecursiveComparison()
+        .isEqualTo(parsedFilterParameterUsingAlias);
   }
 
   @Test
@@ -248,7 +245,8 @@ public void jsonWithParamsInDifferentOrderShouldDeserializeIntoFilterParameterSu
         "{\"address\":\"0x8CdaF0CD259887258Bc13a92C0a6dA92698644C0\",\"fromBlock\":\"earliest\",\"toBlock\":\"latest\",\"topics\":[\"0x492e34c7da2a87c57444aa0f6143558999bceec63065f04557cfb20932e0d591\"]}";
 
     assertThat(readJsonAsFilterParameter(jsonWithTopicsFirst))
-        .isEqualToComparingFieldByFieldRecursively(readJsonAsFilterParameter(jsonWithTopicsLast));
+        .usingRecursiveComparison()
+        .isEqualTo(readJsonAsFilterParameter(jsonWithTopicsLast));
   }
 
   @Test
@@ -413,6 +411,22 @@ public void twoTopicsInFirstAndSecondPositionShouldDeserializeAsTwoListsOfTopics
             List.of(LogTopic.fromHexString(TOPIC_FOUR), LogTopic.fromHexString(TOPIC_FIVE)));
   }
 
+  @Test
+  public void fromAndToAddressesShouldDeserializeAsTwoListsOfAddresses()
+      throws java.io.IOException {
+    final FilterParameter filterParameter =
+        readJsonAsFilterParameter("{\"fromAddress\":[\"0x0\"], \"toAddress\":[\"0x1\"]}");
+    assertThat(filterParameter.getFromAddress()).containsExactly(Address.fromHexString("0x0"));
+    assertThat(filterParameter.getToAddress()).containsExactly(Address.fromHexString("0x1"));
+  }
+
+  @Test
+  public void countAndAfterShouldDeserializeCorrectly() throws java.io.IOException {
+    final FilterParameter filterParameter = readJsonAsFilterParameter("{\"after\":1, \"count\":2}");
+    assertThat(filterParameter.getAfter()).contains(1);
+    assertThat(filterParameter.getCount()).contains(2);
+  }
+
   private <T> FilterParameter createFilterWithTopics(final T inputTopics)
       throws JsonProcessingException {
     final Map<String, T> payload = new HashMap<>();
@@ -426,8 +440,12 @@ private FilterParameter filterParameterWithAddresses(final String... addresses)
     return new FilterParameter(
         BlockParameter.LATEST,
         BlockParameter.LATEST,
+        null,
+        null,
         Arrays.stream(addresses).map(Address::fromHexString).collect(toUnmodifiableList()),
         null,
+        null,
+        null,
         null);
   }
 
@@ -435,9 +453,13 @@ private FilterParameter filterParameterWithSingleListOfTopics(final String... to
     return new FilterParameter(
         BlockParameter.LATEST,
         BlockParameter.LATEST,
+        null,
+        null,
         singletonList(Address.fromHexString("0x0")),
         singletonList(
             Arrays.stream(topics).map(LogTopic::fromHexString).collect(toUnmodifiableList())),
+        null,
+        null,
         null);
   }
 
@@ -448,8 +470,12 @@ private FilterParameter filterParameterWithListOfTopics(final String... topics)
     return new FilterParameter(
         BlockParameter.LATEST,
         BlockParameter.LATEST,
+        null,
+        null,
         singletonList(Address.fromHexString("0x0")),
         topicsListList,
+        null,
+        null,
         null);
   }
 
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TraceTypeParameterTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TraceTypeParameterTest.java
new file mode 100644
index 00000000000..af1b734ebe0
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/TraceTypeParameterTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+
+import java.util.List;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.Test;
+
+public class TraceTypeParameterTest {
+
+  @Test
+  public void jsonWithArrayOfTraceTypesShouldSerializeSuccessfully() throws Exception {
+    final String jsonWithTraceTypes =
+        "{\"jsonrpc\":\"2.0\",\"method\":\"trace_rawTransaction\",\"params\":[\"0xf86f\", [\"trace\",\"stateDiff\"]],\"id\":1}";
+    final JsonRpcRequestContext request =
+        new JsonRpcRequestContext(readJsonAsJsonRpcRequest(jsonWithTraceTypes));
+    final TraceTypeParameter expectedTraceTypeParam =
+        new TraceTypeParameter(List.of("trace", "stateDiff"));
+
+    final TraceTypeParameter parsedTraceTypeParam =
+        request.getRequiredParameter(1, TraceTypeParameter.class);
+
+    assertThat(parsedTraceTypeParam).usingRecursiveComparison().isEqualTo(expectedTraceTypeParam);
+    final String traceTypeString = parsedTraceTypeParam.toString();
+    assertThat(traceTypeString).contains(TraceTypeParameter.TraceType.TRACE.toString());
+    assertThat(traceTypeString).contains(TraceTypeParameter.TraceType.STATE_DIFF.toString());
+  }
+
+  private JsonRpcRequest readJsonAsJsonRpcRequest(final String json) throws java.io.IOException {
+    return new ObjectMapper().readValue(json, JsonRpcRequest.class);
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/WithdrawalParameterTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/WithdrawalParameterTest.java
new file mode 100644
index 00000000000..450ffd76762
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/WithdrawalParameterTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.WithdrawalParameterTestFixture.WITHDRAWAL_PARAM_1;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.GWei;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+
+import org.apache.tuweni.units.bigints.UInt64;
+import org.junit.Test;
+
+public class WithdrawalParameterTest {
+
+  @Test
+  public void toWithdrawal() {
+    Withdrawal expected =
+        new Withdrawal(
+            UInt64.fromHexString("0x0"),
+            UInt64.fromHexString("0xffff"),
+            Address.fromHexString("0x0000000000000000000000000000000000000000"),
+            GWei.of(0L));
+    assertThat(WITHDRAWAL_PARAM_1.toWithdrawal()).isEqualTo(expected);
+  }
+
+  @Test
+  public void fromWithdrawal() {
+    Withdrawal withdrawal =
+        new Withdrawal(
+            UInt64.fromHexString("0x0"),
+            UInt64.fromHexString("0xffff"),
+            Address.fromHexString("0x0000000000000000000000000000000000000000"),
+            GWei.of(0L));
+    assertThat(WithdrawalParameter.fromWithdrawal(withdrawal)).isEqualTo(WITHDRAWAL_PARAM_1);
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/WithdrawalParameterTestFixture.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/WithdrawalParameterTestFixture.java
new file mode 100644
index 00000000000..189b09ff8a5
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/WithdrawalParameterTestFixture.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
+
+import org.hyperledger.besu.datatypes.GWei;
+
+public class WithdrawalParameterTestFixture {
+
+  public static final WithdrawalParameter WITHDRAWAL_PARAM_1 =
+      createWithdrawal("0x0", "0xffff", "0x0000000000000000000000000000000000000000", "0x0");
+  static final WithdrawalParameter WITHDRAWAL_PARAM_2 =
+      createWithdrawal(
+          "0x1", "0x10000", "0x0100000000000000000000000000000000000000", GWei.ONE.toHexString());
+
+  private static WithdrawalParameter createWithdrawal(
+      final String index, final String validatorIndex, final String address, final String amount) {
+    return new WithdrawalParameter(index, validatorIndex, address, amount);
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/MultiTenancyRpcMethodDecoratorTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/MultiTenancyRpcMethodDecoratorTest.java
index 1a671c5ac26..2b1bc68e3f6 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/MultiTenancyRpcMethodDecoratorTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/MultiTenancyRpcMethodDecoratorTest.java
@@ -28,7 +28,8 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcUnauthorizedResponse;
 
 import io.vertx.core.json.JsonObject;
-import io.vertx.ext.auth.jwt.impl.JWTUser;
+import io.vertx.ext.auth.User;
+import io.vertx.ext.auth.impl.UserImpl;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -44,7 +45,7 @@ public class MultiTenancyRpcMethodDecoratorTest {
   public void delegatesWhenHasValidToken() {
     final JsonObject principle = new JsonObject();
     principle.put("privacyPublicKey", "ABC123");
-    final JWTUser user = new JWTUser(principle, "");
+    final UserImpl user = new UserImpl(principle, new JsonObject());
     final JsonRpcRequestContext rpcRequestContext = new JsonRpcRequestContext(rpcRequest, user);
 
     when(jsonRpcMethod.response(rpcRequestContext))
@@ -79,7 +80,7 @@ public void failsWhenHasNoToken() {
 
   @Test
   public void failsWhenTokenDoesNotHavePrivacyPublicKey() {
-    final JWTUser user = new JWTUser(new JsonObject(), "");
+    final User user = new UserImpl(new JsonObject(), new JsonObject());
     final JsonRpcRequestContext rpcRequestContext = new JsonRpcRequestContext(rpcRequest, user);
     final MultiTenancyRpcMethodDecorator tokenRpcDecorator =
         new MultiTenancyRpcMethodDecorator(jsonRpcMethod);
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/MultiTenancyUserUtilTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/MultiTenancyUserUtilTest.java
index 83f9ac62455..372612d27dc 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/MultiTenancyUserUtilTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/MultiTenancyUserUtilTest.java
@@ -16,36 +16,36 @@
 
 import static java.util.Optional.empty;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.MultiTenancyUserUtil.enclavePublicKey;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.MultiTenancyUserUtil.privacyUserId;
 
 import java.util.Optional;
 
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.auth.User;
-import io.vertx.ext.auth.jwt.impl.JWTUser;
+import io.vertx.ext.auth.impl.UserImpl;
 import org.junit.Test;
 
 public class MultiTenancyUserUtilTest {
 
   @Test
-  public void noEnclavePublicKeyWhenNoUserProvided() {
-    assertThat(enclavePublicKey(empty())).isEmpty();
+  public void noPrivacyUserIdWhenNoUserProvided() {
+    assertThat(privacyUserId(empty())).isEmpty();
   }
 
   @Test
   public void noEnclavePublicKeyWhenUserWithoutEnclavePublicKeyClaimProvided() {
     final JsonObject token = new JsonObject();
-    final Optional<User> user = Optional.of(new JWTUser(token, ""));
+    final Optional<User> user = Optional.of(new UserImpl(token, new JsonObject()));
 
-    assertThat(enclavePublicKey(user)).isEmpty();
+    assertThat(privacyUserId(user)).isEmpty();
   }
 
   @Test
   public void enclavePublicKeyKeyReturnedForUserWithEnclavePublicKeyClaim() {
     final JsonObject principle = new JsonObject();
     principle.put("privacyPublicKey", "ABC123");
-    final Optional<User> user = Optional.of(new JWTUser(principle, ""));
+    final Optional<User> user = Optional.of(new UserImpl(principle, new JsonObject()));
 
-    assertThat(enclavePublicKey(user)).contains("ABC123");
+    assertThat(privacyUserId(user)).contains("ABC123");
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/BaseEeaSendRawTransaction.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/BaseEeaSendRawTransaction.java
new file mode 100644
index 00000000000..d6f204a79fa
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/BaseEeaSendRawTransaction.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea;
+
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.DEFAULT_PRIVACY;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.PLUGIN_PRIVACY;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.privacy.PrivacyController;
+import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
+import org.hyperledger.besu.ethereum.privacy.markertransaction.FixedKeySigningPrivateMarkerTransactionFactory;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.evm.gascalculator.BerlinGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.plugin.data.Restriction;
+import org.hyperledger.besu.plugin.services.privacy.PrivateMarkerTransactionFactory;
+
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Optional;
+
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
+import org.apache.tuweni.bytes.Bytes;
+import org.mockito.Mock;
+
+public class BaseEeaSendRawTransaction {
+
+  final String MOCK_ORION_KEY = "bW9ja2tleQ==";
+
+  final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM_SUPPLIER =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+
+  final KeyPair keyPair =
+      SIGNATURE_ALGORITHM_SUPPLIER
+          .get()
+          .createKeyPair(
+              SIGNATURE_ALGORITHM_SUPPLIER
+                  .get()
+                  .createPrivateKey(
+                      new BigInteger(
+                          "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63", 16)));
+
+  final PrivateMarkerTransactionFactory privateMarkerTransactionFactory =
+      new FixedKeySigningPrivateMarkerTransactionFactory(keyPair);
+
+  final GasCalculator gasCalculator = new BerlinGasCalculator();
+
+  final Transaction PUBLIC_FLEXIBLE_TRANSACTION =
+      new Transaction(
+          0L,
+          Wei.of(1),
+          21000L,
+          Optional.of(FLEXIBLE_PRIVACY),
+          Wei.ZERO,
+          SIGNATURE_ALGORITHM_SUPPLIER
+              .get()
+              .createSignature(
+                  new BigInteger(
+                      "104310573331543561412661001400556426894275857431274618344686100036716947434951"),
+                  new BigInteger(
+                      "33080506591748900530090726168809539464160321639149722208454899701475015405641"),
+                  Byte.parseByte("1")),
+          Bytes.fromBase64String(MOCK_ORION_KEY),
+          Address.wrap(Bytes.fromHexString("0x8411b12666f68ef74cace3615c9d5a377729d03f")),
+          Optional.empty(),
+          Optional.empty());
+
+  final Transaction PUBLIC_PLUGIN_TRANSACTION =
+      new Transaction(
+          0L,
+          Wei.of(1),
+          21112L,
+          Optional.of(PLUGIN_PRIVACY),
+          Wei.ZERO,
+          SIGNATURE_ALGORITHM_SUPPLIER
+              .get()
+              .createSignature(
+                  new BigInteger(
+                      "111331907905663242841915789134040957461022579868467291368609335839524284474080"),
+                  new BigInteger(
+                      "16338460226177675602590882211136457396059831699034102939076916361204709826919"),
+                  Byte.parseByte("0")),
+          Bytes.fromBase64String(MOCK_ORION_KEY),
+          Address.wrap(Bytes.fromHexString("0x8411b12666f68ef74cace3615c9d5a377729d03f")),
+          Optional.empty(),
+          Optional.empty());
+
+  final Transaction PUBLIC_OFF_CHAIN_TRANSACTION =
+      new Transaction(
+          0L,
+          Wei.of(1),
+          21000L,
+          Optional.of(DEFAULT_PRIVACY),
+          Wei.ZERO,
+          SIGNATURE_ALGORITHM_SUPPLIER
+              .get()
+              .createSignature(
+                  new BigInteger(
+                      "45331864585825234947874751069766983839005678711670143534492294352090223768785"),
+                  new BigInteger(
+                      "32813839561238589140263096892921088101761344639911577803805398248765156383629"),
+                  Byte.parseByte("1")),
+          Bytes.fromBase64String(MOCK_ORION_KEY),
+          Address.wrap(Bytes.fromHexString("0x8411b12666f68ef74cace3615c9d5a377729d03f")),
+          Optional.empty(),
+          Optional.empty());
+
+  final JsonRpcRequestContext validPrivateForTransactionRequest =
+      new JsonRpcRequestContext(
+          new JsonRpcRequest(
+              "2.0", "eea_sendRawTransaction", new String[] {validPrivateForTransaction()}));
+
+  final JsonRpcRequestContext validPrivacyGroupTransactionRequest =
+      new JsonRpcRequestContext(
+          new JsonRpcRequest(
+              "2.0",
+              "eea_sendRawTransaction",
+              new String[] {validPrivatePrivacyGroupTransaction(Restriction.RESTRICTED)}));
+
+  final JsonRpcRequestContext validUnrestrictedPrivacyGroupTransactionRequest =
+      new JsonRpcRequestContext(
+          new JsonRpcRequest(
+              "2.0",
+              "eea_sendRawTransaction",
+              new String[] {validPrivatePrivacyGroupTransaction(Restriction.UNRESTRICTED)}));
+
+  final JsonRpcRequestContext validUnsuportedPrivacyGroupTransactionRequest =
+      new JsonRpcRequestContext(
+          new JsonRpcRequest(
+              "2.0",
+              "eea_sendRawTransaction",
+              new String[] {validPrivatePrivacyGroupTransaction(Restriction.UNSUPPORTED)}));
+
+  @Mock TransactionPool transactionPool;
+  @Mock PrivacyController privacyController;
+
+  private String validPrivateForTransaction() {
+    final PrivateTransaction.Builder privateTransactionBuilder =
+        PrivateTransaction.builder()
+            .nonce(0)
+            .gasPrice(Wei.of(1))
+            .gasLimit(21000)
+            .value(Wei.ZERO)
+            .payload(Bytes.EMPTY)
+            .to(Address.fromHexString("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"))
+            .chainId(BigInteger.ONE)
+            .privateFrom(Bytes.fromBase64String("S28yYlZxRCtuTmxOWUw1RUU3eTNJZE9udmlmdGppaXp="))
+            .privateFor(
+                List.of(
+                    Bytes.fromBase64String("S28yYlZxRCtuTmxOWUw1RUU3eTNJZE9udmlmdGppaXp="),
+                    Bytes.fromBase64String("QTFhVnRNeExDVUhtQlZIWG9aenpCZ1BiVy93ajVheER=")))
+            .restriction(Restriction.RESTRICTED);
+    return rlpEncodeTransaction(privateTransactionBuilder);
+  }
+
+  private String validPrivatePrivacyGroupTransaction(final Restriction restriction) {
+    final PrivateTransaction.Builder privateTransactionBuilder =
+        PrivateTransaction.builder()
+            .nonce(0)
+            .gasPrice(Wei.of(1))
+            .gasLimit(21000)
+            .value(Wei.ZERO)
+            .payload(Bytes.EMPTY)
+            .to(Address.fromHexString("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"))
+            .chainId(BigInteger.ONE)
+            .privateFrom(Bytes.fromBase64String("S28yYlZxRCtuTmxOWUw1RUU3eTNJZE9udmlmdGppaXp="))
+            .privacyGroupId(Bytes.fromBase64String("DyAOiF/ynpc+JXa2YAGB0bCitSlOMNm+ShmB/7M6C4w="))
+            .restriction(restriction);
+    return rlpEncodeTransaction(privateTransactionBuilder);
+  }
+
+  private String rlpEncodeTransaction(final PrivateTransaction.Builder privateTransactionBuilder) {
+    final PrivateTransaction privateTransaction = privateTransactionBuilder.signAndBuild(keyPair);
+    final BytesValueRLPOutput bvrlp = new BytesValueRLPOutput();
+    privateTransaction.writeTo(bvrlp);
+    return bvrlp.encoded().toHexString();
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransactionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransactionTest.java
index 816ca3c2a27..4ad29c1931c 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransactionTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/EeaSendRawTransactionTest.java
@@ -14,60 +14,35 @@
  */
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea;
 
-import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.PRIVATE_TRANSACTION_FAILED;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.PRIVATE_TRANSACTION_INVALID;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.crypto.SECP256K1;
-import org.hyperledger.besu.enclave.types.PrivacyGroup;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
 import org.hyperledger.besu.ethereum.privacy.MultiTenancyValidationException;
-import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
-import org.hyperledger.besu.ethereum.privacy.Restriction;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
 
-import java.math.BigInteger;
-import java.util.List;
-import java.util.Optional;
-
-import io.vertx.core.json.JsonObject;
-import io.vertx.ext.auth.User;
-import io.vertx.ext.auth.jwt.impl.JWTUser;
-import org.apache.tuweni.bytes.Bytes;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
-public class EeaSendRawTransactionTest {
-
-  static final String VALID_LEGACY_PRIVATE_TRANSACTION_RLP = validPrivateTransactionRlp();
-  static final String VALID_PRIVATE_TRANSACTION_RLP_PRIVACY_GROUP =
-      validPrivateTransactionRlpPrivacyGroup();
+public class EeaSendRawTransactionTest extends BaseEeaSendRawTransaction {
 
   // RLP encode fails creating a transaction without privateFrom so must be manually encoded
   private static final String PRIVATE_TRANSACTION_RLP_PRIVACY_GROUP_NO_PRIVATE_FROM =
@@ -78,37 +53,21 @@ public class EeaSendRawTransactionTest {
           + "885ff29e973e2576b6600181d1b0a2b5294e30d9be4a1981ff"
           + "b33a0b8c8a72657374726963746564";
 
-  static final Transaction PUBLIC_TRANSACTION =
-      new Transaction(
-          0L,
-          Wei.of(1),
-          21000L,
-          Optional.of(
-              Address.wrap(Bytes.fromHexString("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"))),
-          Wei.ZERO,
-          SECP256K1.Signature.create(
-              new BigInteger(
-                  "32886959230931919120748662916110619501838190146643992583529828535682419954515"),
-              new BigInteger(
-                  "14473701025599600909210599917245952381483216609124029382871721729679842002948"),
-              Byte.parseByte("0")),
-          Bytes.fromHexString("0x"),
-          Address.wrap(Bytes.fromHexString("0x8411b12666f68ef74cace3615c9d5a377729d03f")),
-          Optional.empty());
   static final String ENCLAVE_PUBLIC_KEY = "S28yYlZxRCtuTmxOWUw1RUU3eTNJZE9udmlmdGppaXo=";
+  final PrivacyIdProvider privacyIdProvider = (user) -> ENCLAVE_PUBLIC_KEY;
 
-  final String MOCK_ORION_KEY = "";
-  final User user = new JWTUser(new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY), "");
-  final EnclavePublicKeyProvider enclavePublicKeyProvider = (user) -> ENCLAVE_PUBLIC_KEY;
-
-  @Mock TransactionPool transactionPool;
-  @Mock EeaSendRawTransaction method;
-  @Mock PrivacyController privacyController;
+  RestrictedOffchainEeaSendRawTransaction method;
 
   @Before
   public void before() {
+
     method =
-        new EeaSendRawTransaction(transactionPool, privacyController, enclavePublicKeyProvider);
+        new RestrictedOffchainEeaSendRawTransaction(
+            transactionPool,
+            privacyIdProvider,
+            privateMarkerTransactionFactory,
+            address -> 0,
+            privacyController);
   }
 
   @Test
@@ -156,112 +115,7 @@ public void invalidTransactionRlpDecoding() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
-  }
-
-  @Test
-  public void validTransactionIsSentToTransactionPool() {
-    when(privacyController.sendTransaction(any(PrivateTransaction.class), any(), any()))
-        .thenReturn(MOCK_ORION_KEY);
-    when(privacyController.validatePrivateTransaction(
-            any(PrivateTransaction.class), any(String.class)))
-        .thenReturn(ValidationResult.valid());
-    when(privacyController.createPrivacyMarkerTransaction(
-            any(String.class), any(PrivateTransaction.class), any(Address.class)))
-        .thenReturn(PUBLIC_TRANSACTION);
-    when(transactionPool.addLocalTransaction(any(Transaction.class)))
-        .thenReturn(ValidationResult.valid());
-    final JsonRpcRequestContext request = getJsonRpcRequestContext();
-
-    final JsonRpcResponse expectedResponse =
-        new JsonRpcSuccessResponse(
-            request.getRequest().getId(),
-            "0x221e930a2c18d91fca4d509eaa3512f3e01fef266f660e32473de67474b36c15");
-
-    final JsonRpcResponse actualResponse = method.response(request);
-
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
-    verify(privacyController)
-        .sendTransaction(any(PrivateTransaction.class), eq(ENCLAVE_PUBLIC_KEY), any());
-    verify(privacyController)
-        .validatePrivateTransaction(any(PrivateTransaction.class), eq(ENCLAVE_PUBLIC_KEY));
-    verify(privacyController)
-        .createPrivacyMarkerTransaction(
-            any(String.class), any(PrivateTransaction.class), any(Address.class));
-    verify(transactionPool).addLocalTransaction(any(Transaction.class));
-  }
-
-  @Test
-  public void validTransactionPrivacyGroupIsSentToTransactionPool() {
-    when(privacyController.sendTransaction(any(PrivateTransaction.class), any(), any()))
-        .thenReturn(MOCK_ORION_KEY);
-    when(privacyController.validatePrivateTransaction(any(PrivateTransaction.class), anyString()))
-        .thenReturn(ValidationResult.valid());
-    when(privacyController.findOffChainPrivacyGroupByGroupId(any(String.class), any(String.class)))
-        .thenReturn(
-            Optional.of(
-                new PrivacyGroup(
-                    "", PrivacyGroup.Type.PANTHEON, "", "", singletonList(ENCLAVE_PUBLIC_KEY))));
-    when(privacyController.createPrivacyMarkerTransaction(
-            any(String.class), any(PrivateTransaction.class), any(Address.class)))
-        .thenReturn(PUBLIC_TRANSACTION);
-    when(transactionPool.addLocalTransaction(any(Transaction.class)))
-        .thenReturn(ValidationResult.valid());
-
-    final JsonRpcRequestContext request =
-        new JsonRpcRequestContext(
-            new JsonRpcRequest(
-                "2.0",
-                "eea_sendRawTransaction",
-                new String[] {VALID_PRIVATE_TRANSACTION_RLP_PRIVACY_GROUP}));
-
-    final JsonRpcResponse expectedResponse =
-        new JsonRpcSuccessResponse(
-            request.getRequest().getId(),
-            "0x221e930a2c18d91fca4d509eaa3512f3e01fef266f660e32473de67474b36c15");
-
-    final JsonRpcResponse actualResponse = method.response(request);
-
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
-    verify(privacyController).sendTransaction(any(PrivateTransaction.class), any(), any());
-    verify(privacyController)
-        .validatePrivateTransaction(any(PrivateTransaction.class), anyString());
-    verify(privacyController)
-        .createPrivacyMarkerTransaction(
-            any(String.class), any(PrivateTransaction.class), any(Address.class));
-    verify(transactionPool).addLocalTransaction(any(Transaction.class));
-  }
-
-  private JsonRpcRequestContext getJsonRpcRequestContext() {
-    return new JsonRpcRequestContext(
-        new JsonRpcRequest(
-            "2.0", "eea_sendRawTransaction", new String[] {VALID_LEGACY_PRIVATE_TRANSACTION_RLP}),
-        user);
-  }
-
-  @Test
-  public void transactionFailsIfPrivacyGroupDoesNotExist() {
-    method =
-        new EeaSendRawTransaction(transactionPool, privacyController, enclavePublicKeyProvider);
-
-    when(privacyController.findOffChainPrivacyGroupByGroupId(any(String.class), any(String.class)))
-        .thenThrow(
-            new RuntimeException(JsonRpcError.OFFCHAIN_PRIVACY_GROUP_DOES_NOT_EXIST.getMessage()));
-
-    final JsonRpcRequestContext request =
-        new JsonRpcRequestContext(
-            new JsonRpcRequest(
-                "2.0",
-                "eea_sendRawTransaction",
-                new String[] {VALID_PRIVATE_TRANSACTION_RLP_PRIVACY_GROUP}));
-
-    final JsonRpcResponse expectedResponse =
-        new JsonRpcErrorResponse(
-            request.getRequest().getId(), JsonRpcError.OFFCHAIN_PRIVACY_GROUP_DOES_NOT_EXIST);
-
-    final JsonRpcResponse actualResponse = method.response(request);
-
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
@@ -278,24 +132,24 @@ public void invalidTransactionWithoutPrivateFromFieldFailsWithDecodeError() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
     verifyNoInteractions(privacyController);
   }
 
   @Test
   public void invalidTransactionIsNotSentToEnclaveAndIsNotAddedToTransactionPool() {
-    when(privacyController.validatePrivateTransaction(any(PrivateTransaction.class), anyString()))
-        .thenReturn(ValidationResult.invalid(PRIVATE_TRANSACTION_FAILED));
-
-    final JsonRpcRequestContext request = getJsonRpcRequestContext();
+    when(privacyController.validatePrivateTransaction(any(), anyString()))
+        .thenReturn(ValidationResult.invalid(PRIVATE_TRANSACTION_INVALID));
 
     final JsonRpcResponse expectedResponse =
-        new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.INVALID_PARAMS);
+        new JsonRpcErrorResponse(
+            validPrivateForTransactionRequest.getRequest().getId(),
+            JsonRpcError.PRIVATE_TRANSACTION_INVALID);
 
-    final JsonRpcResponse actualResponse = method.response(request);
+    final JsonRpcResponse actualResponse = method.response(validPrivateForTransactionRequest);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
-    verify(privacyController, never()).sendTransaction(any(), any(), any());
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+    verify(privacyController, never()).createPrivateMarkerTransactionPayload(any(), any(), any());
     verifyNoInteractions(transactionPool);
   }
 
@@ -303,17 +157,17 @@ public void invalidTransactionIsNotSentToEnclaveAndIsNotAddedToTransactionPool()
   public void invalidTransactionFailingWithMultiTenancyValidationErrorReturnsUnauthorizedError() {
     when(privacyController.validatePrivateTransaction(any(PrivateTransaction.class), anyString()))
         .thenReturn(ValidationResult.valid());
-    when(privacyController.sendTransaction(any(PrivateTransaction.class), any(), any()))
+    when(privacyController.createPrivateMarkerTransactionPayload(
+            any(PrivateTransaction.class), any(), any()))
         .thenThrow(new MultiTenancyValidationException("validation failed"));
 
-    final JsonRpcRequestContext request = getJsonRpcRequestContext();
-
     final JsonRpcResponse expectedResponse =
-        new JsonRpcErrorResponse(request.getRequest().getId(), JsonRpcError.ENCLAVE_ERROR);
+        new JsonRpcErrorResponse(
+            validPrivateForTransactionRequest.getRequest().getId(), JsonRpcError.ENCLAVE_ERROR);
 
-    final JsonRpcResponse actualResponse = method.response(request);
+    final JsonRpcResponse actualResponse = method.response(validPrivateForTransactionRequest);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
     verifyNoInteractions(transactionPool);
   }
 
@@ -326,7 +180,7 @@ public void transactionWithNonceBelowAccountNonceIsRejected() {
   @Test
   public void transactionWithNonceAboveAccountNonceIsRejected() {
     verifyErrorForInvalidTransaction(
-        TransactionInvalidReason.INCORRECT_NONCE, JsonRpcError.INCORRECT_NONCE);
+        TransactionInvalidReason.NONCE_TOO_HIGH, JsonRpcError.NONCE_TOO_HIGH);
   }
 
   @Test
@@ -364,83 +218,24 @@ public void transactionWithNotWhitelistedSenderAccountIsRejected() {
   private void verifyErrorForInvalidTransaction(
       final TransactionInvalidReason transactionInvalidReason, final JsonRpcError expectedError) {
 
-    when(privacyController.sendTransaction(any(PrivateTransaction.class), any(), any()))
+    when(privacyController.createPrivateMarkerTransactionPayload(any(), any(), any()))
         .thenReturn(MOCK_ORION_KEY);
-    when(privacyController.validatePrivateTransaction(any(PrivateTransaction.class), anyString()))
+    when(privacyController.validatePrivateTransaction(any(), anyString()))
         .thenReturn(ValidationResult.valid());
-    when(privacyController.createPrivacyMarkerTransaction(
-            any(String.class), any(PrivateTransaction.class), any(Address.class)))
-        .thenReturn(PUBLIC_TRANSACTION);
-    when(transactionPool.addLocalTransaction(any(Transaction.class)))
+    when(transactionPool.addTransactionViaApi(any()))
         .thenReturn(ValidationResult.invalid(transactionInvalidReason));
-    final JsonRpcRequestContext request = getJsonRpcRequestContext();
 
     final JsonRpcResponse expectedResponse =
-        new JsonRpcErrorResponse(request.getRequest().getId(), expectedError);
+        new JsonRpcErrorResponse(
+            validPrivateForTransactionRequest.getRequest().getId(), expectedError);
 
-    final JsonRpcResponse actualResponse = method.response(request);
+    final JsonRpcResponse actualResponse = method.response(validPrivateForTransactionRequest);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
-    verify(privacyController).sendTransaction(any(PrivateTransaction.class), any(), any());
-    verify(privacyController)
-        .validatePrivateTransaction(any(PrivateTransaction.class), anyString());
-    verify(privacyController)
-        .createPrivacyMarkerTransaction(
-            any(String.class), any(PrivateTransaction.class), any(Address.class));
-    verify(transactionPool).addLocalTransaction(any(Transaction.class));
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 
   @Test
   public void getMethodReturnsExpectedName() {
     assertThat(method.getName()).matches("eea_sendRawTransaction");
   }
-
-  private static String validPrivateTransactionRlp() {
-    final PrivateTransaction.Builder privateTransactionBuilder =
-        PrivateTransaction.builder()
-            .nonce(0)
-            .gasPrice(Wei.of(1))
-            .gasLimit(21000)
-            .value(Wei.ZERO)
-            .payload(Bytes.EMPTY)
-            .to(Address.fromHexString("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"))
-            .chainId(BigInteger.ONE)
-            .privateFrom(Bytes.fromBase64String("S28yYlZxRCtuTmxOWUw1RUU3eTNJZE9udmlmdGppaXp="))
-            .privateFor(
-                List.of(
-                    Bytes.fromBase64String("S28yYlZxRCtuTmxOWUw1RUU3eTNJZE9udmlmdGppaXp="),
-                    Bytes.fromBase64String("QTFhVnRNeExDVUhtQlZIWG9aenpCZ1BiVy93ajVheER=")))
-            .restriction(Restriction.RESTRICTED);
-    return rlpEncodeTransaction(privateTransactionBuilder);
-  }
-
-  private static String validPrivateTransactionRlpPrivacyGroup() {
-    final PrivateTransaction.Builder privateTransactionBuilder =
-        PrivateTransaction.builder()
-            .nonce(0)
-            .gasPrice(Wei.of(1))
-            .gasLimit(21000)
-            .value(Wei.ZERO)
-            .payload(Bytes.EMPTY)
-            .to(Address.fromHexString("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"))
-            .chainId(BigInteger.ONE)
-            .privateFrom(Bytes.fromBase64String("S28yYlZxRCtuTmxOWUw1RUU3eTNJZE9udmlmdGppaXp="))
-            .privacyGroupId(Bytes.fromBase64String("DyAOiF/ynpc+JXa2YAGB0bCitSlOMNm+ShmB/7M6C4w="))
-            .restriction(Restriction.RESTRICTED);
-    return rlpEncodeTransaction(privateTransactionBuilder);
-  }
-
-  private static String rlpEncodeTransaction(
-      final PrivateTransaction.Builder privateTransactionBuilder) {
-    final SECP256K1.KeyPair keyPair =
-        SECP256K1.KeyPair.create(
-            SECP256K1.PrivateKey.create(
-                new BigInteger(
-                    "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63", 16)));
-
-    final PrivateTransaction privateTransaction = privateTransactionBuilder.signAndBuild(keyPair);
-    final BytesValueRLPOutput bvrlp = new BytesValueRLPOutput();
-    privateTransaction.writeTo(bvrlp);
-    return bvrlp.encoded().toHexString();
-  }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/OnChainEeaSendRawTransactionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/OnChainEeaSendRawTransactionTest.java
deleted file mode 100644
index 5311f68e523..00000000000
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/OnChainEeaSendRawTransactionTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.enclave.types.PrivacyGroup;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
-import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
-
-import java.util.Arrays;
-import java.util.Optional;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
-
-@RunWith(MockitoJUnitRunner.class)
-public class OnChainEeaSendRawTransactionTest extends EeaSendRawTransactionTest {
-
-  @Test
-  public void validOnChainTransactionPrivacyGroupIsSentToTransactionPool() {
-    method =
-        new OnChainEeaSendRawTransaction(
-            transactionPool, privacyController, enclavePublicKeyProvider);
-
-    when(privacyController.sendTransaction(any(PrivateTransaction.class), any(), any()))
-        .thenReturn(MOCK_ORION_KEY);
-    when(privacyController.validatePrivateTransaction(
-            any(PrivateTransaction.class), any(String.class)))
-        .thenReturn(ValidationResult.valid());
-    final Optional<PrivacyGroup> optionalPrivacyGroup =
-        Optional.of(
-            new PrivacyGroup(
-                "", PrivacyGroup.Type.ONCHAIN, "", "", Arrays.asList(ENCLAVE_PUBLIC_KEY)));
-    when(privacyController.findOnChainPrivacyGroupAndAddNewMembers(any(), any(), any()))
-        .thenReturn(optionalPrivacyGroup);
-    when(privacyController.createPrivacyMarkerTransaction(
-            any(String.class), any(PrivateTransaction.class), any(Address.class)))
-        .thenReturn(PUBLIC_TRANSACTION);
-    when(transactionPool.addLocalTransaction(any(Transaction.class)))
-        .thenReturn(ValidationResult.valid());
-
-    final JsonRpcRequestContext request =
-        new JsonRpcRequestContext(
-            new JsonRpcRequest(
-                "2.0",
-                "eea_sendRawTransaction",
-                new String[] {VALID_PRIVATE_TRANSACTION_RLP_PRIVACY_GROUP}));
-
-    final JsonRpcResponse expectedResponse =
-        new JsonRpcSuccessResponse(
-            request.getRequest().getId(),
-            "0x221e930a2c18d91fca4d509eaa3512f3e01fef266f660e32473de67474b36c15");
-
-    final JsonRpcResponse actualResponse = method.response(request);
-
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
-    verify(privacyController).sendTransaction(any(PrivateTransaction.class), any(), any());
-    verify(privacyController)
-        .validatePrivateTransaction(any(PrivateTransaction.class), any(String.class));
-    verify(privacyController)
-        .createPrivacyMarkerTransaction(
-            any(String.class), any(PrivateTransaction.class), eq(Address.ONCHAIN_PRIVACY));
-    verify(transactionPool).addLocalTransaction(any(Transaction.class));
-  }
-
-  @Test
-  public void transactionFailsForLegacyPrivateTransaction() {
-    method =
-        new OnChainEeaSendRawTransaction(
-            transactionPool, privacyController, enclavePublicKeyProvider);
-
-    final JsonRpcRequestContext request = getJsonRpcRequestContext();
-
-    final JsonRpcResponse expectedResponse =
-        new JsonRpcErrorResponse(
-            request.getRequest().getId(), JsonRpcError.ONCHAIN_PRIVACY_GROUP_ID_NOT_AVAILABLE);
-
-    final JsonRpcResponse actualResponse = method.response(request);
-
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
-  }
-
-  private JsonRpcRequestContext getJsonRpcRequestContext() {
-    return new JsonRpcRequestContext(
-        new JsonRpcRequest(
-            "2.0", "eea_sendRawTransaction", new String[] {VALID_LEGACY_PRIVATE_TRANSACTION_RLP}),
-        user);
-  }
-
-  @Test
-  public void offChainPrivacyGroupTransactionFailsWhenOnchainPrivacyGroupFeatureIsEnabled() {
-    method =
-        new OnChainEeaSendRawTransaction(
-            transactionPool, privacyController, enclavePublicKeyProvider);
-
-    when(privacyController.findOnChainPrivacyGroupAndAddNewMembers(any(), any(), any()))
-        .thenReturn(Optional.empty());
-
-    final JsonRpcRequestContext request =
-        new JsonRpcRequestContext(
-            new JsonRpcRequest(
-                "2.0",
-                "eea_sendRawTransaction",
-                new String[] {VALID_PRIVATE_TRANSACTION_RLP_PRIVACY_GROUP}));
-
-    final JsonRpcResponse expectedResponse =
-        new JsonRpcErrorResponse(
-            request.getRequest().getId(), JsonRpcError.ONCHAIN_PRIVACY_GROUP_DOES_NOT_EXIST);
-
-    final JsonRpcResponse actualResponse = method.response(request);
-
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
-  }
-}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/PluginEeaSendRawTransactionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/PluginEeaSendRawTransactionTest.java
new file mode 100644
index 00000000000..78e1b7876b6
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/PluginEeaSendRawTransactionTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class PluginEeaSendRawTransactionTest extends BaseEeaSendRawTransaction {
+
+  PluginEeaSendRawTransaction method;
+
+  @Before
+  public void before() {
+    method =
+        new PluginEeaSendRawTransaction(
+            transactionPool,
+            user -> "",
+            privateMarkerTransactionFactory,
+            address -> 0,
+            privacyController,
+            gasCalculator);
+  }
+
+  @Test
+  public void validUnrestrictedTransactionIsSentToTransactionPool() {
+
+    when(privacyController.createPrivateMarkerTransactionPayload(any(), any(), any()))
+        .thenReturn(MOCK_ORION_KEY);
+    when(privacyController.validatePrivateTransaction(any(), any()))
+        .thenReturn(ValidationResult.valid());
+
+    when(transactionPool.addTransactionViaApi(any())).thenReturn(ValidationResult.valid());
+
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(
+            validPrivacyGroupTransactionRequest.getRequest().getId(),
+            "0x8d84a2d2158c9be3c18a8e6d064fd085e440d117294ba2e7f909e36bf192ffbd");
+
+    final JsonRpcResponse actualResponse =
+        method.response(validUnrestrictedPrivacyGroupTransactionRequest);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+    verify(transactionPool).addTransactionViaApi(PUBLIC_PLUGIN_TRANSACTION);
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/RestrictedFlexibleEeaSendRawTransactionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/RestrictedFlexibleEeaSendRawTransactionTest.java
new file mode 100644
index 00000000000..7d11084308e
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/RestrictedFlexibleEeaSendRawTransactionTest.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.enclave.types.PrivacyGroup;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class RestrictedFlexibleEeaSendRawTransactionTest extends BaseEeaSendRawTransaction {
+  static final String ENCLAVE_PUBLIC_KEY = "S28yYlZxRCtuTmxOWUw1RUU3eTNJZE9udmlmdGppaXo=";
+
+  final PrivacyIdProvider privacyIdProvider = (user) -> ENCLAVE_PUBLIC_KEY;
+
+  RestrictedFlexibleEeaSendRawTransaction method;
+
+  @Before
+  public void before() {
+    method =
+        new RestrictedFlexibleEeaSendRawTransaction(
+            transactionPool,
+            privacyIdProvider,
+            privateMarkerTransactionFactory,
+            address -> 0,
+            privacyController);
+  }
+
+  @Test
+  public void validFlexibleTransactionPrivacyGroupIsSentToTransactionPool() {
+    when(privacyController.validatePrivateTransaction(any(), any()))
+        .thenReturn(ValidationResult.valid());
+    when(transactionPool.addTransactionViaApi(any(Transaction.class)))
+        .thenReturn(ValidationResult.valid());
+
+    when(privacyController.createPrivateMarkerTransactionPayload(any(), any(), any()))
+        .thenReturn(MOCK_ORION_KEY);
+
+    final Optional<PrivacyGroup> flexiblePrivacyGroup =
+        Optional.of(
+            new PrivacyGroup(
+                "", PrivacyGroup.Type.FLEXIBLE, "", "", Arrays.asList(ENCLAVE_PUBLIC_KEY)));
+
+    when(privacyController.findPrivacyGroupByGroupId(any(), any()))
+        .thenReturn(flexiblePrivacyGroup);
+
+    final JsonRpcSuccessResponse expectedResponse =
+        new JsonRpcSuccessResponse(
+            validPrivacyGroupTransactionRequest.getRequest().getId(),
+            "0x5af919ad2926e1cf98292dc0f3f8f74dbc446dd96debdd97e224e4695e662ff0");
+
+    final JsonRpcResponse actualResponse = method.response(validPrivacyGroupTransactionRequest);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+    verify(transactionPool).addTransactionViaApi(PUBLIC_FLEXIBLE_TRANSACTION);
+  }
+
+  @Test
+  public void transactionFailsForLegacyPrivateTransaction() {
+    when(privacyController.validatePrivateTransaction(any(), any()))
+        .thenReturn(ValidationResult.valid());
+
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(
+            validPrivateForTransactionRequest.getRequest().getId(),
+            JsonRpcError.FLEXIBLE_PRIVACY_GROUP_ID_NOT_AVAILABLE);
+
+    final JsonRpcResponse actualResponse = method.response(validPrivateForTransactionRequest);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void offchainPrivacyGroupTransactionFailsWhenFlexiblePrivacyGroupFeatureIsEnabled() {
+    when(privacyController.validatePrivateTransaction(any(), any()))
+        .thenReturn(ValidationResult.valid());
+
+    when(privacyController.findPrivacyGroupByGroupId(any(), any())).thenReturn(Optional.empty());
+
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(
+            validPrivacyGroupTransactionRequest.getRequest().getId(),
+            JsonRpcError.FLEXIBLE_PRIVACY_GROUP_DOES_NOT_EXIST);
+
+    final JsonRpcResponse actualResponse = method.response(validPrivacyGroupTransactionRequest);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void flexiblePrivacyGroupTransactionFailsWhenGroupDoesNotExist() {
+    when(privacyController.validatePrivateTransaction(any(), any()))
+        .thenReturn(ValidationResult.valid());
+
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(
+            validPrivacyGroupTransactionRequest.getRequest().getId(),
+            JsonRpcError.FLEXIBLE_PRIVACY_GROUP_DOES_NOT_EXIST);
+
+    final JsonRpcResponse actualResponse = method.response(validPrivacyGroupTransactionRequest);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void
+      transactionWithUnrestrictedTransactionTypeShouldReturnUnimplementedTransactionTypeError() {
+    final JsonRpcResponse actualResponse =
+        method.response(validUnrestrictedPrivacyGroupTransactionRequest);
+
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(
+            validPrivacyGroupTransactionRequest.getRequest().getId(),
+            JsonRpcError.UNSUPPORTED_PRIVATE_TRANSACTION_TYPE);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void
+      transactionWithUnsupportedTransactionTypeShouldReturnUnimplementedTransactionTypeError() {
+    final JsonRpcResponse actualResponse =
+        method.response(validUnsuportedPrivacyGroupTransactionRequest);
+
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(
+            validPrivacyGroupTransactionRequest.getRequest().getId(),
+            JsonRpcError.UNSUPPORTED_PRIVATE_TRANSACTION_TYPE);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/RestrictedOffchainEeaSendRawTransactionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/RestrictedOffchainEeaSendRawTransactionTest.java
new file mode 100644
index 00000000000..897346620f4
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/eea/RestrictedOffchainEeaSendRawTransactionTest.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.eea;
+
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.enclave.types.PrivacyGroup;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+
+import java.util.Optional;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class RestrictedOffchainEeaSendRawTransactionTest extends BaseEeaSendRawTransaction {
+  static final String ENCLAVE_PUBLIC_KEY = "S28yYlZxRCtuTmxOWUw1RUU3eTNJZE9udmlmdGppaXo=";
+
+  final PrivacyIdProvider privacyIdProvider = (user) -> ENCLAVE_PUBLIC_KEY;
+
+  RestrictedOffchainEeaSendRawTransaction method;
+
+  @Before
+  public void before() {
+    method =
+        new RestrictedOffchainEeaSendRawTransaction(
+            transactionPool,
+            privacyIdProvider,
+            privateMarkerTransactionFactory,
+            address -> 0,
+            privacyController);
+  }
+
+  @Test
+  public void validLegacyTransactionIsSentToTransactionPool() {
+    when(privacyController.createPrivateMarkerTransactionPayload(any(), any(), any()))
+        .thenReturn(MOCK_ORION_KEY);
+    when(privacyController.validatePrivateTransaction(any(), any()))
+        .thenReturn(ValidationResult.valid());
+    when(transactionPool.addTransactionViaApi(any())).thenReturn(ValidationResult.valid());
+
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(
+            validPrivateForTransactionRequest.getRequest().getId(),
+            "0x7f14b1aaa2fdddf918350d99801bf00a0eb1a1441b21b8c147f42db5ea675590");
+
+    final JsonRpcResponse actualResponse = method.response(validPrivateForTransactionRequest);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+    verify(transactionPool).addTransactionViaApi(PUBLIC_OFF_CHAIN_TRANSACTION);
+  }
+
+  @Test
+  public void validPantheonPrivacyGroupTransactionIsSentToTransactionPool() {
+    when(privacyController.validatePrivateTransaction(any(), any()))
+        .thenReturn(ValidationResult.valid());
+    when(privacyController.createPrivateMarkerTransactionPayload(any(), any(), any()))
+        .thenReturn(MOCK_ORION_KEY);
+
+    final Optional<PrivacyGroup> pantheonPrivacyGroup =
+        Optional.of(
+            new PrivacyGroup(
+                "", PrivacyGroup.Type.PANTHEON, "", "", singletonList(ENCLAVE_PUBLIC_KEY)));
+
+    when(privacyController.findPrivacyGroupByGroupId(any(), any()))
+        .thenReturn(pantheonPrivacyGroup);
+    when(transactionPool.addTransactionViaApi(any())).thenReturn(ValidationResult.valid());
+
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcSuccessResponse(
+            validPrivacyGroupTransactionRequest.getRequest().getId(),
+            "0x7f14b1aaa2fdddf918350d99801bf00a0eb1a1441b21b8c147f42db5ea675590");
+
+    final JsonRpcResponse actualResponse = method.response(validPrivacyGroupTransactionRequest);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void
+      transactionWithUnrestrictedTransactionTypeShouldReturnUnimplementedTransactionTypeError() {
+    final JsonRpcResponse actualResponse =
+        method.response(validUnrestrictedPrivacyGroupTransactionRequest);
+
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(
+            validPrivacyGroupTransactionRequest.getRequest().getId(),
+            JsonRpcError.UNSUPPORTED_PRIVATE_TRANSACTION_TYPE);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+
+  @Test
+  public void
+      transactionWithUnsupportedTransactionTypeShouldReturnUnimplementedTransactionTypeError() {
+    final JsonRpcResponse actualResponse =
+        method.response(validUnsuportedPrivacyGroupTransactionRequest);
+
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(
+            validPrivacyGroupTransactionRequest.getRequest().getId(),
+            JsonRpcError.UNSUPPORTED_PRIVATE_TRANSACTION_TYPE);
+
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCallTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCallTest.java
index 27063676fb2..1c447360b74 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCallTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCallTest.java
@@ -15,32 +15,28 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.catchThrowable;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
-import org.hyperledger.besu.ethereum.privacy.DefaultPrivacyController;
-import org.hyperledger.besu.ethereum.privacy.MultiTenancyValidationException;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
+import org.hyperledger.besu.ethereum.privacy.RestrictedDefaultPrivacyController;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.transaction.CallParameter;
 
@@ -62,12 +58,13 @@ public class PrivCallTest {
 
   @Mock private BlockchainQueries blockchainQueries;
   String privacyGroupId = "privacyGroupId";
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider = (user) -> ENCLAVE_PUBLIC_KEY;
-  private final PrivacyController privacyController = mock(DefaultPrivacyController.class);
+  private final PrivacyIdProvider privacyIdProvider = (user) -> ENCLAVE_PUBLIC_KEY;
+  private final PrivacyController privacyController =
+      mock(RestrictedDefaultPrivacyController.class);
 
   @Before
   public void setUp() {
-    method = new PrivCall(blockchainQueries, privacyController, enclavePublicKeyProvider);
+    method = new PrivCall(blockchainQueries, privacyController, privacyIdProvider);
   }
 
   @Test
@@ -81,12 +78,13 @@ public void shouldThrowInvalidJsonRpcParametersExceptionWhenMissingToField() {
         new JsonCallParameter(
             Address.fromHexString("0x0"),
             null,
-            Gas.ZERO,
+            0L,
             Wei.ZERO,
             null,
             null,
             Wei.ZERO,
             Bytes.EMPTY,
+            null,
             null);
     final JsonRpcRequestContext request = ethCallRequest(privacyGroupId, callParameter, "latest");
 
@@ -105,7 +103,7 @@ public void shouldReturnNullWhenProcessorReturnsEmpty() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
     verify(privacyController).simulatePrivateTransaction(any(), any(), any(), anyLong());
   }
 
@@ -113,7 +111,7 @@ public void shouldReturnNullWhenProcessorReturnsEmpty() {
   public void shouldAcceptRequestWhenMissingOptionalFields() {
     final JsonCallParameter callParameter =
         new JsonCallParameter(
-            null, Address.fromHexString("0x0"), null, null, null, null, null, null, null);
+            null, Address.fromHexString("0x0"), null, null, null, null, null, null, null, null);
     final JsonRpcRequestContext request = ethCallRequest(privacyGroupId, callParameter, "latest");
     final JsonRpcResponse expectedResponse =
         new JsonRpcSuccessResponse(null, Bytes.of().toString());
@@ -122,7 +120,7 @@ public void shouldAcceptRequestWhenMissingOptionalFields() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
     verify(privacyController)
         .simulatePrivateTransaction(any(), any(), eq(callParameter), anyLong());
   }
@@ -136,7 +134,7 @@ public void shouldReturnExecutionResultWhenExecutionIsSuccessful() {
 
     final JsonRpcResponse response = method.response(request);
 
-    assertThat(response).isEqualToComparingFieldByFieldRecursively(expectedResponse);
+    assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
     verify(privacyController)
         .simulatePrivateTransaction(any(), any(), eq(callParameter()), anyLong());
   }
@@ -182,29 +180,17 @@ public void shouldThrowCorrectExceptionWhenNoPrivacyGroupSpecified() {
         .hasMessage("Missing required json rpc parameter at index 0");
   }
 
-  @Test
-  public void multiTenancyCheckFailure() {
-    doThrow(new MultiTenancyValidationException("msg"))
-        .when(privacyController)
-        .verifyPrivacyGroupContainsEnclavePublicKey(
-            eq(privacyGroupId), eq(ENCLAVE_PUBLIC_KEY), eq(Optional.of(1L)));
-
-    final JsonRpcRequestContext request = ethCallRequest(privacyGroupId, callParameter(), "0x02");
-
-    assertThatThrownBy(() -> method.response(request))
-        .isInstanceOf(MultiTenancyValidationException.class);
-  }
-
   private JsonCallParameter callParameter() {
     return new JsonCallParameter(
         Address.fromHexString("0x0"),
         Address.fromHexString("0x0"),
-        Gas.ZERO,
+        0L,
         Wei.ZERO,
         null,
         null,
         Wei.ZERO,
         Bytes.EMPTY,
+        null,
         null);
   }
 
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroupTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroupTest.java
index 16e79a222d0..3b565f9f045 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroupTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCreatePrivacyGroupTest.java
@@ -27,7 +27,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.parameters.CreatePrivacyGroupParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
@@ -39,11 +39,12 @@
 
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.auth.User;
-import io.vertx.ext.auth.jwt.impl.JWTUser;
+import io.vertx.ext.auth.impl.UserImpl;
 import org.assertj.core.util.Lists;
 import org.junit.Before;
 import org.junit.Test;
 
+@SuppressWarnings("MockNotUsedInProduction")
 public class PrivCreatePrivacyGroupTest {
 
   private static final String FROM = "first participant";
@@ -56,8 +57,8 @@ public class PrivCreatePrivacyGroupTest {
   private final PrivacyParameters privacyParameters = mock(PrivacyParameters.class);
   private final PrivacyController privacyController = mock(PrivacyController.class);
   private final User user =
-      new JWTUser(new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY), "");
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider = (user) -> ENCLAVE_PUBLIC_KEY;
+      new UserImpl(new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY), new JsonObject());
+  private final PrivacyIdProvider privacyIdProvider = (user) -> ENCLAVE_PUBLIC_KEY;
 
   @Before
   public void setUp() {
@@ -72,10 +73,10 @@ public void verifyCreatePrivacyGroup() {
         new PrivacyGroup(expected, PrivacyGroup.Type.PANTHEON, NAME, DESCRIPTION, ADDRESSES);
     when(privacyController.createPrivacyGroup(ADDRESSES, NAME, DESCRIPTION, ENCLAVE_PUBLIC_KEY))
         .thenReturn(privacyGroup);
-    when(privacyParameters.getEnclavePublicKey()).thenReturn(FROM);
+    when(privacyParameters.getPrivacyUserId()).thenReturn(FROM);
 
     final PrivCreatePrivacyGroup privCreatePrivacyGroup =
-        new PrivCreatePrivacyGroup(privacyController, enclavePublicKeyProvider);
+        new PrivCreatePrivacyGroup(privacyController, privacyIdProvider);
 
     final CreatePrivacyGroupParameter param =
         new CreatePrivacyGroupParameter(ADDRESSES, NAME, DESCRIPTION);
@@ -101,10 +102,10 @@ public void verifyCreatePrivacyGroupWithoutDescription() {
         new PrivacyGroup(expected, PrivacyGroup.Type.PANTHEON, NAME, DESCRIPTION, ADDRESSES);
     when(privacyController.createPrivacyGroup(ADDRESSES, NAME, null, ENCLAVE_PUBLIC_KEY))
         .thenReturn(privacyGroup);
-    when(privacyParameters.getEnclavePublicKey()).thenReturn(FROM);
+    when(privacyParameters.getPrivacyUserId()).thenReturn(FROM);
 
     final PrivCreatePrivacyGroup privCreatePrivacyGroup =
-        new PrivCreatePrivacyGroup(privacyController, enclavePublicKeyProvider);
+        new PrivCreatePrivacyGroup(privacyController, privacyIdProvider);
 
     final Object[] params =
         new Object[] {
@@ -137,10 +138,10 @@ public void verifyCreatePrivacyGroupWithoutName() {
         new PrivacyGroup(expected, PrivacyGroup.Type.PANTHEON, NAME, DESCRIPTION, ADDRESSES);
     when(privacyController.createPrivacyGroup(ADDRESSES, null, DESCRIPTION, ENCLAVE_PUBLIC_KEY))
         .thenReturn(privacyGroup);
-    when(privacyParameters.getEnclavePublicKey()).thenReturn(FROM);
+    when(privacyParameters.getPrivacyUserId()).thenReturn(FROM);
 
     final PrivCreatePrivacyGroup privCreatePrivacyGroup =
-        new PrivCreatePrivacyGroup(privacyController, enclavePublicKeyProvider);
+        new PrivCreatePrivacyGroup(privacyController, privacyIdProvider);
 
     final Object[] params =
         new Object[] {
@@ -173,10 +174,10 @@ public void verifyCreatePrivacyGroupWithoutOptionalParams() {
         new PrivacyGroup(expected, PrivacyGroup.Type.PANTHEON, NAME, DESCRIPTION, ADDRESSES);
     when(privacyController.createPrivacyGroup(ADDRESSES, null, null, ENCLAVE_PUBLIC_KEY))
         .thenReturn(privacyGroup);
-    when(privacyParameters.getEnclavePublicKey()).thenReturn(FROM);
+    when(privacyParameters.getPrivacyUserId()).thenReturn(FROM);
 
     final PrivCreatePrivacyGroup privCreatePrivacyGroup =
-        new PrivCreatePrivacyGroup(privacyController, enclavePublicKeyProvider);
+        new PrivCreatePrivacyGroup(privacyController, privacyIdProvider);
 
     final Object[] params =
         new Object[] {
@@ -205,10 +206,10 @@ public void returnsCorrectExceptionInvalidParam() {
     final PrivacyGroup privacyGroup =
         new PrivacyGroup(expected, PrivacyGroup.Type.PANTHEON, NAME, DESCRIPTION, ADDRESSES);
     when(enclave.createPrivacyGroup(any(), any(), any(), any())).thenReturn(privacyGroup);
-    when(privacyParameters.getEnclavePublicKey()).thenReturn(FROM);
+    when(privacyParameters.getPrivacyUserId()).thenReturn(FROM);
 
     final PrivCreatePrivacyGroup privCreatePrivacyGroup =
-        new PrivCreatePrivacyGroup(privacyController, enclavePublicKeyProvider);
+        new PrivCreatePrivacyGroup(privacyController, privacyIdProvider);
 
     final Object[] params =
         new Object[] {
@@ -230,14 +231,14 @@ public String getDescription() {
         catchThrowableOfType(
             () -> privCreatePrivacyGroup.response(request), InvalidJsonRpcParameters.class);
 
-    assertThat(response.getMessage()).isEqualTo("Invalid json rpc parameter at index 0");
+    assertThat(response.getMessage()).contains("Invalid json rpc parameter at index 0");
   }
 
   @Test
   public void returnsCorrectExceptionMissingParam() {
 
     final PrivCreatePrivacyGroup privCreatePrivacyGroup =
-        new PrivCreatePrivacyGroup(privacyController, enclavePublicKeyProvider);
+        new PrivCreatePrivacyGroup(privacyController, privacyIdProvider);
 
     final Object[] params = new Object[] {};
 
@@ -256,7 +257,7 @@ public void returnsCorrectErrorEnclaveError() {
     when(privacyController.createPrivacyGroup(ADDRESSES, NAME, DESCRIPTION, ENCLAVE_PUBLIC_KEY))
         .thenThrow(new EnclaveClientException(400, "Enclave error"));
     final PrivCreatePrivacyGroup privCreatePrivacyGroup =
-        new PrivCreatePrivacyGroup(privacyController, enclavePublicKeyProvider);
+        new PrivCreatePrivacyGroup(privacyController, privacyIdProvider);
 
     final CreatePrivacyGroupParameter param =
         new CreatePrivacyGroupParameter(ADDRESSES, NAME, DESCRIPTION);
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDebugGetStateRootTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDebugGetStateRootTest.java
index 1006a9ea37b..c199408a4a2 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDebugGetStateRootTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDebugGetStateRootTest.java
@@ -24,20 +24,20 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.enclave.types.PrivacyGroup;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.privacy.DefaultPrivacyController;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
+import org.hyperledger.besu.ethereum.privacy.RestrictedDefaultPrivacyController;
 
 import java.util.Collections;
 import java.util.Optional;
@@ -58,15 +58,15 @@ public class PrivDebugGetStateRootTest {
           Collections.singletonList(ENCLAVE_PUBLIC_KEY));
 
   private PrivDebugGetStateRoot method;
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider = (user) -> ENCLAVE_PUBLIC_KEY;
+  private final PrivacyIdProvider privacyIdProvider = (user) -> ENCLAVE_PUBLIC_KEY;
 
   private final BlockchainQueries blockchainQueries = mock(BlockchainQueries.class);
-  private final PrivacyController privacyController = mock(DefaultPrivacyController.class);
+  private final PrivacyController privacyController =
+      mock(RestrictedDefaultPrivacyController.class);
 
   @Before
   public void setUp() {
-    method =
-        new PrivDebugGetStateRoot(blockchainQueries, enclavePublicKeyProvider, privacyController);
+    method = new PrivDebugGetStateRoot(blockchainQueries, privacyIdProvider, privacyController);
   }
 
   @Test
@@ -89,8 +89,6 @@ public void shouldThrowInvalidJsonRpcParametersExceptionWhenNoPrivacyGroup() {
   @Test
   public void shouldReturnErrorIfInvalidGroupId() {
     when(privacyController.findPrivacyGroupByGroupId(anyString(), anyString()))
-        .thenCallRealMethod();
-    when(privacyController.findOffChainPrivacyGroupByGroupId(anyString(), anyString()))
         .thenReturn(Optional.empty());
     final JsonRpcResponse response = method.response(request("not_base64", "latest"));
     assertThat(response.getType()).isEqualByComparingTo(JsonRpcResponseType.ERROR);
@@ -123,7 +121,7 @@ public void shouldReturnErrorIfUnableToFindStateRoot() {
   }
 
   @Test
-  public void shouldReturnSuccessWhenOffChainGroupExists() {
+  public void shouldReturnSuccessWhenOffchainGroupExists() {
     final Hash hash = Hash.EMPTY_LIST_HASH;
     when(privacyController.findPrivacyGroupByGroupId(anyString(), anyString()))
         .thenReturn(Optional.of(PRIVACY_GROUP));
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDeletePrivacyGroupTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDeletePrivacyGroupTest.java
index 0916cc60628..d08c27f79cc 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDeletePrivacyGroupTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDeletePrivacyGroupTest.java
@@ -19,22 +19,20 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.enclave.Enclave;
 import org.hyperledger.besu.enclave.EnclaveClientException;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.privacy.MultiTenancyValidationException;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.auth.User;
-import io.vertx.ext.auth.jwt.impl.JWTUser;
+import io.vertx.ext.auth.impl.UserImpl;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -42,18 +40,14 @@ public class PrivDeletePrivacyGroupTest {
   private static final String ENCLAVE_PUBLIC_KEY = "A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
   private static final String PRIVACY_GROUP_ID = "privacyGroupId";
 
-  private final Enclave enclave = mock(Enclave.class);
-  private final PrivacyParameters privacyParameters = mock(PrivacyParameters.class);
   private final PrivacyController privacyController = mock(PrivacyController.class);
   private final User user =
-      new JWTUser(new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY), "");
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider = (user) -> ENCLAVE_PUBLIC_KEY;
+      new UserImpl(new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY), new JsonObject());
+  private final PrivacyIdProvider privacyIdProvider = (user) -> ENCLAVE_PUBLIC_KEY;
   private JsonRpcRequestContext request;
 
   @Before
   public void setUp() {
-    when(privacyParameters.getEnclave()).thenReturn(enclave);
-    when(privacyParameters.isEnabled()).thenReturn(true);
     request =
         new JsonRpcRequestContext(
             new JsonRpcRequest("1", "priv_deletePrivacyGroup", new Object[] {PRIVACY_GROUP_ID}),
@@ -66,7 +60,7 @@ public void deletesPrivacyGroupWithValidGroupId() {
         .thenReturn(PRIVACY_GROUP_ID);
 
     final PrivDeletePrivacyGroup privDeletePrivacyGroup =
-        new PrivDeletePrivacyGroup(privacyController, enclavePublicKeyProvider);
+        new PrivDeletePrivacyGroup(privacyController, privacyIdProvider);
 
     final JsonRpcSuccessResponse response =
         (JsonRpcSuccessResponse) privDeletePrivacyGroup.response(request);
@@ -81,7 +75,7 @@ public void failsWithDeletePrivacyGroupErrorIfEnclaveFails() {
         .thenThrow(new EnclaveClientException(500, "some failure"));
 
     final PrivDeletePrivacyGroup privDeletePrivacyGroup =
-        new PrivDeletePrivacyGroup(privacyController, enclavePublicKeyProvider);
+        new PrivDeletePrivacyGroup(privacyController, privacyIdProvider);
 
     final JsonRpcErrorResponse response =
         (JsonRpcErrorResponse) privDeletePrivacyGroup.response(request);
@@ -95,7 +89,7 @@ public void failsWithUnauthorizedErrorIfMultiTenancyValidationFails() {
         .thenThrow(new MultiTenancyValidationException("validation failed"));
 
     final PrivDeletePrivacyGroup privDeletePrivacyGroup =
-        new PrivDeletePrivacyGroup(privacyController, enclavePublicKeyProvider);
+        new PrivDeletePrivacyGroup(privacyController, privacyIdProvider);
 
     final JsonRpcResponse expectedResponse =
         new JsonRpcErrorResponse(
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDistributeRawTransactionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDistributeRawTransactionTest.java
index f4cfaa02593..4976487e23c 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDistributeRawTransactionTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivDistributeRawTransactionTest.java
@@ -23,7 +23,7 @@
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
@@ -37,7 +37,7 @@
 
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.auth.User;
-import io.vertx.ext.auth.jwt.impl.JWTUser;
+import io.vertx.ext.auth.impl.UserImpl;
 import org.apache.tuweni.bytes.Bytes;
 import org.junit.Before;
 import org.junit.Test;
@@ -59,21 +59,23 @@ public class PrivDistributeRawTransactionTest {
   private static final String ENCLAVE_PUBLIC_KEY = "A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
 
   private final User user =
-      new JWTUser(new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY), "");
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider = (user) -> ENCLAVE_PUBLIC_KEY;
+      new UserImpl(
+          new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY), new JsonObject()) {};
+  private final PrivacyIdProvider privacyIdProvider = (user) -> ENCLAVE_PUBLIC_KEY;
 
-  @Mock private PrivDistributeRawTransaction method;
+  private PrivDistributeRawTransaction method;
   @Mock private PrivacyController privacyController;
 
   @Before
   public void before() {
-    method = new PrivDistributeRawTransaction(privacyController, enclavePublicKeyProvider, false);
+    method = new PrivDistributeRawTransaction(privacyController, privacyIdProvider, false);
   }
 
   @Test
   public void validTransactionHashReturnedAfterDistribute() {
     final String enclavePublicKey = "93Ky7lXwFkMc7+ckoFgUMku5bpr9tz4zhmWmk9RlNng=";
-    when(privacyController.sendTransaction(any(PrivateTransaction.class), any(), any()))
+    when(privacyController.createPrivateMarkerTransactionPayload(
+            any(PrivateTransaction.class), any(), any()))
         .thenReturn(enclavePublicKey);
     when(privacyController.validatePrivateTransaction(any(PrivateTransaction.class), anyString()))
         .thenReturn(ValidationResult.valid());
@@ -93,16 +95,18 @@ public void validTransactionHashReturnedAfterDistribute() {
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
     verify(privacyController)
-        .sendTransaction(any(PrivateTransaction.class), eq(ENCLAVE_PUBLIC_KEY), any());
+        .createPrivateMarkerTransactionPayload(
+            any(PrivateTransaction.class), eq(ENCLAVE_PUBLIC_KEY), any());
     verify(privacyController)
         .validatePrivateTransaction(any(PrivateTransaction.class), eq(ENCLAVE_PUBLIC_KEY));
   }
 
   @Test
   public void invalidTransactionFailingWithMultiTenancyValidationErrorReturnsUnauthorizedError() {
-    when(privacyController.sendTransaction(any(PrivateTransaction.class), any(), any()))
+    when(privacyController.createPrivateMarkerTransactionPayload(
+            any(PrivateTransaction.class), any(), any()))
         .thenThrow(new MultiTenancyValidationException("validation failed"));
     when(privacyController.validatePrivateTransaction(any(PrivateTransaction.class), anyString()))
         .thenReturn(ValidationResult.valid());
@@ -120,6 +124,6 @@ public void invalidTransactionFailingWithMultiTenancyValidationErrorReturnsUnaut
 
     final JsonRpcResponse actualResponse = method.response(request);
 
-    assertThat(actualResponse).isEqualToComparingFieldByField(expectedResponse);
+    assertThat(actualResponse).usingRecursiveComparison().isEqualTo(expectedResponse);
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroupTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroupTest.java
index 33a08d8c2f4..250f10638c8 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroupTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivFindPrivacyGroupTest.java
@@ -25,7 +25,7 @@
 import org.hyperledger.besu.enclave.types.PrivacyGroup;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
@@ -38,11 +38,12 @@
 
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.auth.User;
-import io.vertx.ext.auth.jwt.impl.JWTUser;
+import io.vertx.ext.auth.impl.UserImpl;
 import org.assertj.core.util.Lists;
 import org.junit.Before;
 import org.junit.Test;
 
+@SuppressWarnings("MockNotUsedInProduction")
 public class PrivFindPrivacyGroupTest {
   private static final String ENCLAVE_PUBLIC_KEY = VALID_BASE64_ENCLAVE_KEY.toBase64String();
   private static final List<String> ADDRESSES =
@@ -54,8 +55,8 @@ public class PrivFindPrivacyGroupTest {
   private final PrivacyParameters privacyParameters = mock(PrivacyParameters.class);
   private final PrivacyController privacyController = mock(PrivacyController.class);
   private final User user =
-      new JWTUser(new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY), "");
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider = (user) -> ENCLAVE_PUBLIC_KEY;
+      new UserImpl(new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY), new JsonObject());
+  private final PrivacyIdProvider privacyIdProvider = (user) -> ENCLAVE_PUBLIC_KEY;
 
   private JsonRpcRequestContext request;
   private PrivacyGroup privacyGroup;
@@ -77,45 +78,45 @@ public void setUp() {
   @SuppressWarnings("unchecked")
   @Test
   public void findsPrivacyGroupWithValidAddresses() {
-    when(privacyController.findOffChainPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY))
+    when(privacyController.findPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY))
         .thenReturn(new PrivacyGroup[] {privacyGroup});
 
     final PrivFindPrivacyGroup privFindPrivacyGroup =
-        new PrivFindPrivacyGroup(privacyController, enclavePublicKeyProvider);
+        new PrivFindPrivacyGroup(privacyController, privacyIdProvider);
 
     final JsonRpcSuccessResponse response =
         (JsonRpcSuccessResponse) privFindPrivacyGroup.response(request);
     final List<PrivacyGroup> result = (List<PrivacyGroup>) response.getResult();
     assertThat(result).hasSize(1);
-    assertThat(result.get(0)).isEqualToComparingFieldByField(privacyGroup);
-    verify(privacyController).findOffChainPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY);
+    assertThat(result.get(0)).usingRecursiveComparison().isEqualTo(privacyGroup);
+    verify(privacyController).findPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY);
   }
 
   @Test
   public void failsWithFindPrivacyGroupErrorIfEnclaveFails() {
-    when(privacyController.findOffChainPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY))
+    when(privacyController.findPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY))
         .thenThrow(new EnclaveClientException(500, "some failure"));
     final PrivFindPrivacyGroup privFindPrivacyGroup =
-        new PrivFindPrivacyGroup(privacyController, enclavePublicKeyProvider);
+        new PrivFindPrivacyGroup(privacyController, privacyIdProvider);
 
     final JsonRpcErrorResponse response =
         (JsonRpcErrorResponse) privFindPrivacyGroup.response(request);
     assertThat(response.getError()).isEqualTo(JsonRpcError.FIND_PRIVACY_GROUP_ERROR);
-    verify(privacyController).findOffChainPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY);
+    verify(privacyController).findPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY);
   }
 
   @Test
   public void failsWithUnauthorizedErrorIfMultiTenancyValidationFails() {
-    when(privacyController.findOffChainPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY))
+    when(privacyController.findPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY))
         .thenThrow(new MultiTenancyValidationException("validation failed"));
     final PrivFindPrivacyGroup privFindPrivacyGroup =
-        new PrivFindPrivacyGroup(privacyController, enclavePublicKeyProvider);
+        new PrivFindPrivacyGroup(privacyController, privacyIdProvider);
 
     final JsonRpcResponse expectedResponse =
         new JsonRpcErrorResponse(
             request.getRequest().getId(), JsonRpcError.FIND_PRIVACY_GROUP_ERROR);
     final JsonRpcResponse response = privFindPrivacyGroup.response(request);
     assertThat(response).isEqualTo(expectedResponse);
-    verify(privacyController).findOffChainPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY);
+    verify(privacyController).findPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY);
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetCodeTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetCodeTest.java
index 5feebc6b41e..c1890b8063c 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetCodeTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetCodeTest.java
@@ -22,14 +22,14 @@
 import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 
 import java.util.Optional;
@@ -46,7 +46,7 @@ public class PrivGetCodeTest {
 
   @Mock private PrivacyController privacyController;
   @Mock private BlockchainQueries mockBlockchainQueries;
-  @Mock private EnclavePublicKeyProvider enclavePublicKeyProvider;
+  @Mock private PrivacyIdProvider privacyIdProvider;
 
   private final Hash latestBlockHash = Hash.ZERO;
   private final String enclavePublicKey = "A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
@@ -60,9 +60,9 @@ public class PrivGetCodeTest {
 
   @Before
   public void before() {
-    when(enclavePublicKeyProvider.getEnclaveKey(any())).thenReturn(enclavePublicKey);
+    when(privacyIdProvider.getPrivacyUserId(any())).thenReturn(enclavePublicKey);
 
-    method = new PrivGetCode(mockBlockchainQueries, privacyController, enclavePublicKeyProvider);
+    method = new PrivGetCode(mockBlockchainQueries, privacyController, privacyIdProvider);
     privGetCodeRequest = buildPrivGetCodeRequest();
   }
 
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetEeaTransactionCountTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetEeaTransactionCountTest.java
index c813990f9d0..d87d125569d 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetEeaTransactionCountTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetEeaTransactionCountTest.java
@@ -15,69 +15,76 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.evm.account.Account.MAX_NONCE;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.enclave.EnclaveClientException;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.privacy.MultiTenancyValidationException;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 
-import org.junit.Before;
-import org.junit.Test;
+import java.util.stream.Stream;
 
-public class PrivGetEeaTransactionCountTest {
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class PrivGetEeaTransactionCountTest {
   private static final String ENCLAVE_PUBLIC_KEY = "A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
+  private static final String[] PRIVATE_FOR = {
+    "sgFkVOyFndZe/5SAZJO5UYbrl7pezHetveriBBWWnE8=",
+    "R1kW75NQC9XX3kwNpyPjCBFflM29+XvnKKS9VLrUkzo=",
+    "QzHuACXpfhoGAgrQriWJcDJ6MrUwcCvutKMoAn9KplQ="
+  };
 
-  private final PrivacyParameters privacyParameters = mock(PrivacyParameters.class);
   private final PrivacyController privacyController = mock(PrivacyController.class);
   private JsonRpcRequestContext request;
 
-  private final String privateFrom = "thePrivateFromKey";
-  private final String[] privateFor = new String[] {"first", "second", "third"};
-  private final Address address = Address.fromHexString("55");
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider = (user) -> ENCLAVE_PUBLIC_KEY;
+  private final Address address =
+      Address.fromHexString("0x1000000000000000000000000000000000000001");
+  private final PrivacyIdProvider privacyIdProvider = (user) -> ENCLAVE_PUBLIC_KEY;
 
-  @Before
+  @BeforeEach
   public void setup() {
-    when(privacyParameters.isEnabled()).thenReturn(true);
-    final Object[] jsonBody = new Object[] {address.toString(), privateFrom, privateFor};
+    final Object[] jsonBody = new Object[] {address.toString(), ENCLAVE_PUBLIC_KEY, PRIVATE_FOR};
     request =
         new JsonRpcRequestContext(
             new JsonRpcRequest("2.0", "priv_getEeaTransactionCount", jsonBody));
   }
 
-  @Test
-  public void validRequestProducesExpectedNonce() {
-    final long reportedNonce = 8L;
+  @ParameterizedTest(name = "{index}: {1}")
+  @MethodSource({"provideNonces"})
+  void validRequestProducesExpectedNonce(final long nonce, final String ignoredName) {
     final PrivGetEeaTransactionCount method =
-        new PrivGetEeaTransactionCount(privacyController, enclavePublicKeyProvider);
+        new PrivGetEeaTransactionCount(privacyController, privacyIdProvider);
 
-    when(privacyController.determineEeaNonce(privateFrom, privateFor, address, ENCLAVE_PUBLIC_KEY))
-        .thenReturn(reportedNonce);
+    when(privacyController.determineNonce(any(), any(), eq(ENCLAVE_PUBLIC_KEY))).thenReturn(nonce);
 
     final JsonRpcResponse response = method.response(request);
     assertThat(response).isInstanceOf(JsonRpcSuccessResponse.class);
 
     final JsonRpcSuccessResponse successResponse = (JsonRpcSuccessResponse) response;
-    final int returnedValue = Integer.decode((String) successResponse.getResult());
-    assertThat(returnedValue).isEqualTo(reportedNonce);
+    assertThat(successResponse.getResult()).isEqualTo("0x" + Long.toHexString(nonce));
   }
 
   @Test
-  public void nonceProviderThrowsRuntimeExceptionProducesErrorResponse() {
+  void nonceProviderThrowsRuntimeExceptionProducesErrorResponse() {
     final PrivGetEeaTransactionCount method =
-        new PrivGetEeaTransactionCount(privacyController, enclavePublicKeyProvider);
+        new PrivGetEeaTransactionCount(privacyController, privacyIdProvider);
 
-    when(privacyController.determineEeaNonce(privateFrom, privateFor, address, ENCLAVE_PUBLIC_KEY))
+    when(privacyController.determineNonce(any(), any(), eq(ENCLAVE_PUBLIC_KEY)))
         .thenThrow(EnclaveClientException.class);
 
     final JsonRpcResponse response = method.response(request);
@@ -89,11 +96,11 @@ public void nonceProviderThrowsRuntimeExceptionProducesErrorResponse() {
   }
 
   @Test
-  public void nonceProviderThrowsAnExceptionProducesErrorResponse() {
+  void nonceProviderThrowsAnExceptionProducesErrorResponse() {
     final PrivGetEeaTransactionCount method =
-        new PrivGetEeaTransactionCount(privacyController, enclavePublicKeyProvider);
+        new PrivGetEeaTransactionCount(privacyController, privacyIdProvider);
 
-    when(privacyController.determineEeaNonce(privateFrom, privateFor, address, ENCLAVE_PUBLIC_KEY))
+    when(privacyController.determineNonce(any(), any(), eq(ENCLAVE_PUBLIC_KEY)))
         .thenThrow(EnclaveClientException.class);
 
     final JsonRpcResponse response = method.response(request);
@@ -105,11 +112,11 @@ public void nonceProviderThrowsAnExceptionProducesErrorResponse() {
   }
 
   @Test
-  public void failsWithUnauthorizedErrorIfMultiTenancyValidationFails() {
+  void failsWithUnauthorizedErrorIfMultiTenancyValidationFails() {
     final PrivGetEeaTransactionCount method =
-        new PrivGetEeaTransactionCount(privacyController, enclavePublicKeyProvider);
+        new PrivGetEeaTransactionCount(privacyController, privacyIdProvider);
 
-    when(privacyController.determineEeaNonce(privateFrom, privateFor, address, ENCLAVE_PUBLIC_KEY))
+    when(privacyController.determineNonce(any(), any(), eq(ENCLAVE_PUBLIC_KEY)))
         .thenThrow(new MultiTenancyValidationException("validation failed"));
 
     final JsonRpcResponse response = method.response(request);
@@ -119,4 +126,8 @@ public void failsWithUnauthorizedErrorIfMultiTenancyValidationFails() {
     assertThat(errorResponse.getError())
         .isEqualTo(JsonRpcError.GET_PRIVATE_TRANSACTION_NONCE_ERROR);
   }
+
+  private static Stream<Arguments> provideNonces() {
+    return Stream.of(Arguments.of(8, "low nonce"), Arguments.of(MAX_NONCE - 1, "high nonce"));
+  }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetFilterChangesTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetFilterChangesTest.java
index 5d2f2277d98..d7a7c5caa7e 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetFilterChangesTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetFilterChangesTest.java
@@ -23,22 +23,22 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivGetFilterChanges;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.LogsResult;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
+import org.hyperledger.besu.ethereum.privacy.MultiTenancyPrivacyController;
 import org.hyperledger.besu.ethereum.privacy.MultiTenancyValidationException;
-import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 
 import java.util.Collections;
 import java.util.List;
@@ -60,14 +60,14 @@ public class PrivGetFilterChangesTest {
   private final String PRIVACY_GROUP_ID = "B1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
 
   @Mock private FilterManager filterManager;
-  @Mock private PrivacyController privacyController;
-  @Mock private EnclavePublicKeyProvider enclavePublicKeyProvider;
+  @Mock private MultiTenancyPrivacyController privacyController;
+  @Mock private PrivacyIdProvider privacyIdProvider;
 
   private PrivGetFilterChanges method;
 
   @Before
   public void before() {
-    method = new PrivGetFilterChanges(filterManager, privacyController, enclavePublicKeyProvider);
+    method = new PrivGetFilterChanges(filterManager, privacyController, privacyIdProvider);
   }
 
   @Test
@@ -84,6 +84,23 @@ public void privacyGroupIdIsRequired() {
         .hasMessageContaining("Missing required json rpc parameter at index 0");
   }
 
+  @Test
+  public void multiTenancyCheckFailure() {
+    final User user = mock(User.class);
+
+    when(privacyIdProvider.getPrivacyUserId(any())).thenReturn(ENCLAVE_KEY);
+    doThrow(new MultiTenancyValidationException("msg"))
+        .when(privacyController)
+        .verifyPrivacyGroupContainsPrivacyUserId(eq(PRIVACY_GROUP_ID), eq(ENCLAVE_KEY));
+
+    final JsonRpcRequestContext request =
+        privGetFilterChangesRequestWithUser(PRIVACY_GROUP_ID, FILTER_ID, user);
+
+    assertThatThrownBy(() -> method.response(request))
+        .isInstanceOf(MultiTenancyValidationException.class)
+        .hasMessageContaining("msg");
+  }
+
   @Test
   public void filterIdIsRequired() {
     final JsonRpcRequestContext request = privGetFilterChangesRequest(PRIVACY_GROUP_ID, null);
@@ -141,23 +158,6 @@ public void returnFilterNotFoundWhenLogsReturnIsNull() {
     assertThat(response).isEqualTo(expectedResponse);
   }
 
-  @Test
-  public void multiTenancyCheckFailure() {
-    final User user = mock(User.class);
-
-    when(enclavePublicKeyProvider.getEnclaveKey(any())).thenReturn(ENCLAVE_KEY);
-    doThrow(new MultiTenancyValidationException("msg"))
-        .when(privacyController)
-        .verifyPrivacyGroupContainsEnclavePublicKey(eq(PRIVACY_GROUP_ID), eq(ENCLAVE_KEY));
-
-    final JsonRpcRequestContext request =
-        privGetFilterChangesRequestWithUser(PRIVACY_GROUP_ID, FILTER_ID, user);
-
-    assertThatThrownBy(() -> method.response(request))
-        .isInstanceOf(MultiTenancyValidationException.class)
-        .hasMessageContaining("msg");
-  }
-
   private JsonRpcRequestContext privGetFilterChangesRequest(
       final String privacyGroupId, final String filterId) {
     return new JsonRpcRequestContext(
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetFilterLogsTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetFilterLogsTest.java
index a0a0049755b..feb3ac34321 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetFilterLogsTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetFilterLogsTest.java
@@ -16,35 +16,30 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivGetFilterLogs;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.LogsResult;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
-import org.hyperledger.besu.ethereum.privacy.MultiTenancyValidationException;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 
 import java.util.Collections;
 import java.util.List;
 
 import com.google.common.collect.Lists;
-import io.vertx.ext.auth.User;
 import org.apache.tuweni.bytes.Bytes;
 import org.junit.Before;
 import org.junit.Test;
@@ -56,18 +51,17 @@
 public class PrivGetFilterLogsTest {
 
   private final String FILTER_ID = "0xdbdb02abb65a2ba57a1cc0336c17ef75";
-  private final String ENCLAVE_KEY = "enclave_key";
   private final String PRIVACY_GROUP_ID = "B1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
 
   @Mock private FilterManager filterManager;
   @Mock private PrivacyController privacyController;
-  @Mock private EnclavePublicKeyProvider enclavePublicKeyProvider;
+  @Mock private PrivacyIdProvider privacyIdProvider;
 
   private PrivGetFilterLogs method;
 
   @Before
   public void before() {
-    method = new PrivGetFilterLogs(filterManager, privacyController, enclavePublicKeyProvider);
+    method = new PrivGetFilterLogs(filterManager, privacyController, privacyIdProvider);
   }
 
   @Test
@@ -141,36 +135,12 @@ public void returnFilterNotFoundWhenLogsReturnIsNull() {
     assertThat(response).isEqualTo(expectedResponse);
   }
 
-  @Test
-  public void multiTenancyCheckFailure() {
-    final User user = mock(User.class);
-
-    when(enclavePublicKeyProvider.getEnclaveKey(any())).thenReturn(ENCLAVE_KEY);
-    doThrow(new MultiTenancyValidationException("msg"))
-        .when(privacyController)
-        .verifyPrivacyGroupContainsEnclavePublicKey(eq(PRIVACY_GROUP_ID), eq(ENCLAVE_KEY));
-
-    final JsonRpcRequestContext request =
-        privGetFilterLogsRequestWithUser(PRIVACY_GROUP_ID, FILTER_ID, user);
-
-    assertThatThrownBy(() -> method.response(request))
-        .isInstanceOf(MultiTenancyValidationException.class)
-        .hasMessageContaining("msg");
-  }
-
   private JsonRpcRequestContext privGetFilterLogsRequest(
       final String privacyGroupId, final String filterId) {
     return new JsonRpcRequestContext(
         new JsonRpcRequest("2.0", "priv_getFilterLogs", new Object[] {privacyGroupId, filterId}));
   }
 
-  private JsonRpcRequestContext privGetFilterLogsRequestWithUser(
-      final String privacyGroupId, final String filterId, final User user) {
-    return new JsonRpcRequestContext(
-        new JsonRpcRequest("2.0", "priv_getFilterLogs", new Object[] {privacyGroupId, filterId}),
-        user);
-  }
-
   private LogWithMetadata logWithMetadata() {
     return new LogWithMetadata(
         0,
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetLogsTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetLogsTest.java
index 93b6052d496..d800cc277fe 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetLogsTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetLogsTest.java
@@ -18,17 +18,18 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.FilterParameter;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
@@ -37,13 +38,10 @@
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.api.query.LogsQuery;
 import org.hyperledger.besu.ethereum.api.query.PrivacyQueries;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.LogTopic;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
-import org.hyperledger.besu.ethereum.privacy.MultiTenancyValidationException;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
+import org.hyperledger.besu.evm.log.LogTopic;
 
 import java.util.Collections;
 import java.util.List;
@@ -52,7 +50,6 @@
 import java.util.stream.IntStream;
 
 import com.google.common.collect.Lists;
-import io.vertx.ext.auth.User;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.junit.Before;
@@ -64,21 +61,19 @@
 @RunWith(MockitoJUnitRunner.class)
 public class PrivGetLogsTest {
 
-  private final String ENCLAVE_KEY = "enclave_key";
   private final String PRIVACY_GROUP_ID = "B1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
 
   @Mock private BlockchainQueries blockchainQueries;
   @Mock private PrivacyQueries privacyQueries;
   @Mock private PrivacyController privacyController;
-  @Mock private EnclavePublicKeyProvider enclavePublicKeyProvider;
+  @Mock private PrivacyIdProvider privacyIdProvider;
 
   private PrivGetLogs method;
 
   @Before
   public void before() {
     method =
-        new PrivGetLogs(
-            blockchainQueries, privacyQueries, privacyController, enclavePublicKeyProvider);
+        new PrivGetLogs(blockchainQueries, privacyQueries, privacyController, privacyIdProvider);
   }
 
   @Test
@@ -110,9 +105,13 @@ public void filterWithInvalidParameters() {
         new FilterParameter(
             BlockParameter.EARLIEST,
             BlockParameter.EARLIEST,
+            null,
+            null,
             Collections.emptyList(),
             Collections.emptyList(),
-            Hash.ZERO);
+            Hash.ZERO,
+            null,
+            null);
 
     final JsonRpcRequestContext request = privGetLogRequest(PRIVACY_GROUP_ID, invalidFilter);
 
@@ -134,7 +133,7 @@ public void logQueryIsBuiltCorrectly() {
     when(blockHeader.getNumber()).thenReturn(100L);
 
     final FilterParameter blockHashFilter =
-        new FilterParameter(null, null, addresses, logTopics, blockHash);
+        new FilterParameter(null, null, null, null, addresses, logTopics, blockHash, null, null);
 
     final LogsQuery expectedQuery =
         new LogsQuery.Builder().addresses(addresses).topics(logTopics).build();
@@ -150,7 +149,15 @@ public void filterWithBlockHashQueriesOneBlockByHash() {
     final Hash blockHash = Hash.hash(Bytes32.random());
     final FilterParameter blockHashFilter =
         new FilterParameter(
-            null, null, Collections.emptyList(), Collections.emptyList(), blockHash);
+            null,
+            null,
+            null,
+            null,
+            Collections.emptyList(),
+            Collections.emptyList(),
+            blockHash,
+            null,
+            null);
 
     final List<LogWithMetadata> logWithMetadataList = logWithMetadataList(3);
     final LogsResult expectedLogsResult = new LogsResult(logWithMetadataList);
@@ -175,8 +182,12 @@ public void filterWithBlockRangeQueriesRangeOfBlock() {
         new FilterParameter(
             BlockParameter.EARLIEST,
             BlockParameter.LATEST,
+            null,
+            null,
             Collections.emptyList(),
             Collections.emptyList(),
+            null,
+            null,
             null);
     final List<LogWithMetadata> logWithMetadataList = logWithMetadataList(3);
     final LogsResult expectedLogsResult = new LogsResult(logWithMetadataList);
@@ -193,42 +204,12 @@ public void filterWithBlockRangeQueriesRangeOfBlock() {
     assertThat(logsResult).usingRecursiveComparison().isEqualTo(expectedLogsResult);
   }
 
-  @Test
-  public void multiTenancyCheckFailure() {
-    final User user = mock(User.class);
-    final FilterParameter filterParameter = mock(FilterParameter.class);
-    final BlockParameter blockParameter = new BlockParameter(100L);
-
-    when(enclavePublicKeyProvider.getEnclaveKey(any())).thenReturn(ENCLAVE_KEY);
-    when(filterParameter.isValid()).thenReturn(true);
-    when(filterParameter.getBlockHash()).thenReturn(Optional.empty());
-    when(filterParameter.getFromBlock()).thenReturn(blockParameter);
-    when(filterParameter.getToBlock()).thenReturn(blockParameter);
-    doThrow(new MultiTenancyValidationException("msg"))
-        .when(privacyController)
-        .verifyPrivacyGroupContainsEnclavePublicKey(
-            eq(PRIVACY_GROUP_ID), eq(ENCLAVE_KEY), eq(Optional.of(99L)));
-
-    final JsonRpcRequestContext request =
-        privGetLogRequestWithUser(PRIVACY_GROUP_ID, filterParameter, user);
-
-    assertThatThrownBy(() -> method.response(request))
-        .isInstanceOf(MultiTenancyValidationException.class);
-  }
-
   private JsonRpcRequestContext privGetLogRequest(
       final String privacyGroupId, final FilterParameter filterParameter) {
     return new JsonRpcRequestContext(
         new JsonRpcRequest("2.0", "priv_getLogs", new Object[] {privacyGroupId, filterParameter}));
   }
 
-  private JsonRpcRequestContext privGetLogRequestWithUser(
-      final String privacyGroupId, final FilterParameter filterParameter, final User user) {
-    return new JsonRpcRequestContext(
-        new JsonRpcRequest("2.0", "priv_getLogs", new Object[] {privacyGroupId, filterParameter}),
-        user);
-  }
-
   private List<LogWithMetadata> logWithMetadataList(final int length) {
     return IntStream.range(0, length).mapToObj(this::logWithMetadata).collect(Collectors.toList());
   }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddressTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddressTest.java
index ea0f7a8bde2..88cf1e29f03 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddressTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivacyPrecompileAddressTest.java
@@ -15,27 +15,27 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.DEFAULT_PRIVACY;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.PRIVACY;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 
 import org.junit.Test;
 
 public class PrivGetPrivacyPrecompileAddressTest {
 
-  private final int rawPrivacyAddress = Address.PRIVACY;
-  private final String privacyAddress = Address.privacyPrecompiled(rawPrivacyAddress).toString();
   private final PrivacyParameters privacyParameters = mock(PrivacyParameters.class);
 
   @Test
   public void verifyPrivacyPrecompileAddress() {
-    when(privacyParameters.getPrivacyAddress()).thenReturn(rawPrivacyAddress);
+    when(privacyParameters.getPrivacyAddress()).thenReturn(DEFAULT_PRIVACY);
     when(privacyParameters.isEnabled()).thenReturn(true);
 
     final PrivGetPrivacyPrecompileAddress privGetPrivacyPrecompileAddress =
@@ -49,6 +49,6 @@ public void verifyPrivacyPrecompileAddress() {
         (JsonRpcSuccessResponse) privGetPrivacyPrecompileAddress.response(request);
 
     verify(privacyParameters).getPrivacyAddress();
-    assertThat(response.getResult()).isEqualTo(privacyAddress);
+    assertThat(response.getResult()).isEqualTo(Address.precompiled(PRIVACY).toString());
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransactionTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransactionTest.java
index 32e71f87605..580a3388dad 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransactionTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetPrivateTransactionTest.java
@@ -19,10 +19,11 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.enclave.EnclaveClientException;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
@@ -30,7 +31,6 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionGroupResult;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionLegacyResult;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionResult;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.PrivateTransactionDataFixture;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.privacy.ExecutedPrivateTransaction;
@@ -41,7 +41,7 @@
 
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.auth.User;
-import io.vertx.ext.auth.jwt.impl.JWTUser;
+import io.vertx.ext.auth.impl.UserImpl;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -54,9 +54,10 @@ public class PrivGetPrivateTransactionTest {
   @Mock private PrivacyController privacyController;
 
   private final User user =
-      new JWTUser(
-          new JsonObject().put("privacyPublicKey", VALID_BASE64_ENCLAVE_KEY.toBase64String()), "");
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider =
+      new UserImpl(
+          new JsonObject().put("privacyPublicKey", VALID_BASE64_ENCLAVE_KEY.toBase64String()),
+          new JsonObject());
+  private final PrivacyIdProvider privacyIdProvider =
       (user) -> VALID_BASE64_ENCLAVE_KEY.toBase64String();
 
   private PrivGetPrivateTransaction privGetPrivateTransaction;
@@ -64,10 +65,9 @@ public class PrivGetPrivateTransactionTest {
 
   @Before
   public void before() {
-    privGetPrivateTransaction =
-        new PrivGetPrivateTransaction(privacyController, enclavePublicKeyProvider);
+    privGetPrivateTransaction = new PrivGetPrivateTransaction(privacyController, privacyIdProvider);
 
-    markerTransaction = PrivateTransactionDataFixture.privacyMarkerTransaction();
+    markerTransaction = PrivateTransactionDataFixture.privateMarkerTransaction();
   }
 
   @Test
@@ -86,7 +86,7 @@ public void returnsPrivateTransactionLegacy() {
     final JsonRpcRequestContext request = createRequestContext();
     final PrivateTransactionResult result = makeRequest(request);
 
-    assertThat(result).isEqualToComparingFieldByField(expectedResult);
+    assertThat(result).usingRecursiveComparison().isEqualTo(expectedResult);
   }
 
   @Test
@@ -105,7 +105,7 @@ public void returnsPrivateTransactionGroup() {
     final JsonRpcRequestContext request = createRequestContext();
     final PrivateTransactionResult result = makeRequest(request);
 
-    assertThat(result).isEqualToComparingFieldByField(expectedResult);
+    assertThat(result).usingRecursiveComparison().isEqualTo(expectedResult);
   }
 
   @Test
@@ -143,7 +143,7 @@ private JsonRpcRequestContext createRequestContext() {
 
   private PrivateTransactionResult makeRequest(final JsonRpcRequestContext request) {
     final PrivGetPrivateTransaction privGetPrivateTransaction =
-        new PrivGetPrivateTransaction(privacyController, enclavePublicKeyProvider);
+        new PrivGetPrivateTransaction(privacyController, privacyIdProvider);
     final JsonRpcSuccessResponse response =
         (JsonRpcSuccessResponse) privGetPrivateTransaction.response(request);
     return (PrivateTransactionResult) response.getResult();
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCountTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCountTest.java
index 5d9a507f7b8..d4be2da546a 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCountTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionCountTest.java
@@ -15,55 +15,55 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.priv;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.evm.account.Account.MAX_NONCE;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.enclave.EnclaveClientException;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.privacy.MultiTenancyValidationException;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 
+import java.util.stream.Stream;
+
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.auth.User;
-import io.vertx.ext.auth.jwt.impl.JWTUser;
-import org.junit.Before;
-import org.junit.Test;
+import io.vertx.ext.auth.impl.UserImpl;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
-public class PrivGetTransactionCountTest {
+class PrivGetTransactionCountTest {
 
   private static final String ENCLAVE_PUBLIC_KEY = "A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
-  private final PrivacyParameters privacyParameters = mock(PrivacyParameters.class);
   private final PrivacyController privacyController = mock(PrivacyController.class);
 
   private static final String PRIVACY_GROUP_ID = "DyAOiF/ynpc+JXa2YAGB0bCitSlOMNm+ShmB/7M6C4w=";
 
   private final Address senderAddress =
       Address.fromHexString("0x627306090abab3a6e1400e9345bc60c78a8bef57");
-  private final long NONCE = 5;
   private final User user =
-      new JWTUser(new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY), "");
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider = (user) -> ENCLAVE_PUBLIC_KEY;
-
-  @Before
-  public void before() {
-    when(privacyParameters.isEnabled()).thenReturn(true);
-    when(privacyController.determineBesuNonce(senderAddress, PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY))
-        .thenReturn(NONCE);
-  }
+      new UserImpl(
+          new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY), new JsonObject()) {};
+  private final PrivacyIdProvider privacyIdProvider = (user) -> ENCLAVE_PUBLIC_KEY;
+
+  @ParameterizedTest(name = "{index}: {1}")
+  @MethodSource({"provideNonces"})
+  void verifyTransactionCount(final long nonce, final String ignoredName) {
+    when(privacyController.determineNonce(senderAddress, PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY))
+        .thenReturn(nonce);
 
-  @Test
-  public void verifyTransactionCount() {
     final PrivGetTransactionCount privGetTransactionCount =
-        new PrivGetTransactionCount(privacyController, enclavePublicKeyProvider);
+        new PrivGetTransactionCount(privacyController, privacyIdProvider);
 
     final Object[] params = new Object[] {senderAddress, PRIVACY_GROUP_ID};
     final JsonRpcRequestContext request =
@@ -73,17 +73,16 @@ public void verifyTransactionCount() {
     final JsonRpcSuccessResponse response =
         (JsonRpcSuccessResponse) privGetTransactionCount.response(request);
 
-    assertThat(response.getResult()).isEqualTo(String.format("0x%X", NONCE));
-    verify(privacyController)
-        .determineBesuNonce(senderAddress, PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY);
+    assertThat(response.getResult()).isEqualTo("0x" + Long.toHexString(nonce));
+    verify(privacyController).determineNonce(senderAddress, PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY);
   }
 
   @Test
-  public void failsWithNonceErrorIfExceptionIsThrown() {
+  void failsWithNonceErrorIfExceptionIsThrown() {
     final PrivGetTransactionCount privGetTransactionCount =
-        new PrivGetTransactionCount(privacyController, enclavePublicKeyProvider);
+        new PrivGetTransactionCount(privacyController, privacyIdProvider);
 
-    when(privacyController.determineBesuNonce(senderAddress, PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY))
+    when(privacyController.determineNonce(senderAddress, PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY))
         .thenThrow(EnclaveClientException.class);
 
     final Object[] params = new Object[] {senderAddress, PRIVACY_GROUP_ID};
@@ -99,11 +98,11 @@ public void failsWithNonceErrorIfExceptionIsThrown() {
   }
 
   @Test
-  public void failsWithUnauthorizedErrorIfMultiTenancyValidationFails() {
+  void failsWithUnauthorizedErrorIfMultiTenancyValidationFails() {
     final PrivGetTransactionCount privGetTransactionCount =
-        new PrivGetTransactionCount(privacyController, enclavePublicKeyProvider);
+        new PrivGetTransactionCount(privacyController, privacyIdProvider);
 
-    when(privacyController.determineBesuNonce(senderAddress, PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY))
+    when(privacyController.determineNonce(senderAddress, PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY))
         .thenThrow(new MultiTenancyValidationException("validation failed"));
 
     final Object[] params = new Object[] {senderAddress, PRIVACY_GROUP_ID};
@@ -117,4 +116,8 @@ public void failsWithUnauthorizedErrorIfMultiTenancyValidationFails() {
     final JsonRpcResponse response = privGetTransactionCount.response(request);
     assertThat(response).isEqualTo(expectedResponse);
   }
+
+  private static Stream<Arguments> provideNonces() {
+    return Stream.of(Arguments.of(5, "low nonce"), Arguments.of(MAX_NONCE - 1, "high nonce"));
+  }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceiptTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceiptTest.java
index 43f8cede15a..00ebff2352e 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceiptTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivGetTransactionReceiptTest.java
@@ -17,23 +17,23 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 import static org.hyperledger.besu.ethereum.core.PrivateTransactionDataFixture.VALID_BASE64_ENCLAVE_KEY;
-import static org.hyperledger.besu.ethereum.core.PrivateTransactionDataFixture.privacyMarkerTransaction;
+import static org.hyperledger.besu.ethereum.core.PrivateTransactionDataFixture.privateMarkerTransaction;
 import static org.hyperledger.besu.ethereum.core.PrivateTransactionDataFixture.privateTransactionBesu;
 import static org.hyperledger.besu.ethereum.core.PrivateTransactionDataFixture.privateTransactionLegacy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.enclave.EnclaveClientException;
 import org.hyperledger.besu.enclave.EnclaveServerException;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.privacy.PrivateTransactionReceiptResult;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.privacy.ExecutedPrivateTransaction;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
@@ -46,7 +46,7 @@
 
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.auth.User;
-import io.vertx.ext.auth.jwt.impl.JWTUser;
+import io.vertx.ext.auth.impl.UserImpl;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.junit.Before;
@@ -66,9 +66,10 @@ public class PrivGetTransactionReceiptTest {
   private PrivGetTransactionReceipt privGetTransactionReceipt;
 
   private final User user =
-      new JWTUser(
-          new JsonObject().put("privacyPublicKey", VALID_BASE64_ENCLAVE_KEY.toBase64String()), "");
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider =
+      new UserImpl(
+          new JsonObject().put("privacyPublicKey", VALID_BASE64_ENCLAVE_KEY.toBase64String()),
+          new JsonObject());
+  private final PrivacyIdProvider privacyIdProvider =
       (user) -> VALID_BASE64_ENCLAVE_KEY.toBase64String();
 
   @Before
@@ -79,13 +80,12 @@ public void setUp() {
         .thenReturn(Optional.of(receipt));
 
     privGetTransactionReceipt =
-        new PrivGetTransactionReceipt(
-            privateStateStorage, privacyController, enclavePublicKeyProvider);
+        new PrivGetTransactionReceipt(privateStateStorage, privacyController, privacyIdProvider);
   }
 
   @Test
   public void returnReceiptIfLegacyTransactionExists() {
-    final Transaction pmt = privacyMarkerTransaction();
+    final Transaction pmt = privateMarkerTransaction();
     final PrivateTransaction legacyPrivateTransaction = privateTransactionLegacy();
     final ExecutedPrivateTransaction executedPrivateTransaction =
         createExecutedPrivateTransaction(pmt, legacyPrivateTransaction);
@@ -101,12 +101,12 @@ public void returnReceiptIfLegacyTransactionExists() {
     final PrivateTransactionReceiptResult result =
         (PrivateTransactionReceiptResult) response.getResult();
 
-    assertThat(result).isEqualToComparingFieldByField(expectedResult);
+    assertThat(result).usingRecursiveComparison().isEqualTo(expectedResult);
   }
 
   @Test
   public void returnReceiptIfBesuTransactionExists() {
-    final Transaction pmt = privacyMarkerTransaction();
+    final Transaction pmt = privateMarkerTransaction();
     final PrivateTransaction privateTransaction = privateTransactionBesu();
     final ExecutedPrivateTransaction executedPrivateTransaction =
         createExecutedPrivateTransaction(pmt, privateTransaction);
@@ -122,7 +122,7 @@ public void returnReceiptIfBesuTransactionExists() {
     final PrivateTransactionReceiptResult result =
         (PrivateTransactionReceiptResult) response.getResult();
 
-    assertThat(result).isEqualToComparingFieldByField(expectedResult);
+    assertThat(result).usingRecursiveComparison().isEqualTo(expectedResult);
   }
 
   @Test
@@ -152,7 +152,7 @@ public void enclaveConnectionIssueThrowsRuntimeException() {
 
   @Test
   public void transactionReceiptContainsRevertReasonWhenInvalidTransactionOccurs() {
-    final Transaction pmt = privacyMarkerTransaction();
+    final Transaction pmt = privateMarkerTransaction();
     final PrivateTransaction privateTransaction = privateTransactionBesu();
     final ExecutedPrivateTransaction executedPrivateTransaction =
         createExecutedPrivateTransaction(pmt, privateTransaction);
@@ -211,7 +211,6 @@ private PrivateTransactionReceiptResult privateTransactionReceiptResultFor(
         0,
         0,
         markerTransaction.getHash(),
-        privateTransaction.getHash(),
         privateTransaction.getPrivateFrom(),
         privateTransaction.getPrivateFor().isPresent()
             ? privateTransaction.getPrivateFor().get()
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivNewFilterTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivNewFilterTest.java
index 23440843bbc..dad2bdd3247 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivNewFilterTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivNewFilterTest.java
@@ -16,30 +16,27 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.refEq;
-import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.FilterParameter;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.query.LogsQuery;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.LogTopic;
-import org.hyperledger.besu.ethereum.privacy.MultiTenancyValidationException;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
+import org.hyperledger.besu.evm.log.LogTopic;
 
 import java.util.Collections;
 import java.util.List;
@@ -61,13 +58,13 @@ public class PrivNewFilterTest {
 
   @Mock private FilterManager filterManager;
   @Mock private PrivacyController privacyController;
-  @Mock private EnclavePublicKeyProvider enclavePublicKeyProvider;
+  @Mock private PrivacyIdProvider privacyIdProvider;
 
   private PrivNewFilter method;
 
   @Before
   public void before() {
-    method = new PrivNewFilter(filterManager, privacyController, enclavePublicKeyProvider);
+    method = new PrivNewFilter(filterManager, privacyController, privacyIdProvider);
   }
 
   @Test
@@ -99,9 +96,13 @@ public void filterWithInvalidParameters() {
         new FilterParameter(
             BlockParameter.EARLIEST,
             BlockParameter.LATEST,
+            null,
+            null,
             Collections.emptyList(),
             Collections.emptyList(),
-            Hash.ZERO);
+            Hash.ZERO,
+            null,
+            null);
 
     final JsonRpcRequestContext request = privNewFilterRequest(PRIVACY_GROUP_ID, invalidFilter);
 
@@ -118,11 +119,19 @@ public void filterWithExpectedQueryIsCreated() {
     final List<Address> addresses = List.of(Address.ZERO);
     final User user = mock(User.class);
     final List<List<LogTopic>> logTopics = List.of(List.of(LogTopic.of(Bytes32.random())));
-    when(enclavePublicKeyProvider.getEnclaveKey(eq(Optional.of(user)))).thenReturn(ENCLAVE_KEY);
+    when(privacyIdProvider.getPrivacyUserId(eq(Optional.of(user)))).thenReturn(ENCLAVE_KEY);
 
     final FilterParameter filter =
         new FilterParameter(
-            BlockParameter.EARLIEST, BlockParameter.LATEST, addresses, logTopics, null);
+            BlockParameter.EARLIEST,
+            BlockParameter.LATEST,
+            null,
+            null,
+            addresses,
+            logTopics,
+            null,
+            null,
+            null);
 
     final LogsQuery expectedQuery =
         new LogsQuery.Builder().addresses(addresses).topics(logTopics).build();
@@ -140,24 +149,6 @@ public void filterWithExpectedQueryIsCreated() {
             eq((expectedQuery)));
   }
 
-  @Test
-  public void multiTenancyCheckFailure() {
-    final User user = mock(User.class);
-    final FilterParameter filterParameter = mock(FilterParameter.class);
-
-    when(enclavePublicKeyProvider.getEnclaveKey(any())).thenReturn(ENCLAVE_KEY);
-    doThrow(new MultiTenancyValidationException("msg"))
-        .when(privacyController)
-        .verifyPrivacyGroupContainsEnclavePublicKey(eq(PRIVACY_GROUP_ID), eq(ENCLAVE_KEY));
-
-    final JsonRpcRequestContext request =
-        privNewFilterRequestWithUser(PRIVACY_GROUP_ID, filterParameter, user);
-
-    assertThatThrownBy(() -> method.response(request))
-        .isInstanceOf(MultiTenancyValidationException.class)
-        .hasMessageContaining("msg");
-  }
-
   private JsonRpcRequestContext privNewFilterRequest(
       final String privacyGroupId, final FilterParameter filterParameter) {
     return new JsonRpcRequestContext(
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivUninstallFilterTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivUninstallFilterTest.java
index 9590823a8c9..f5287a8104a 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivUninstallFilterTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivUninstallFilterTest.java
@@ -16,23 +16,17 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivUninstallFilter;
-import org.hyperledger.besu.ethereum.privacy.MultiTenancyValidationException;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 
-import io.vertx.ext.auth.User;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -43,18 +37,17 @@
 public class PrivUninstallFilterTest {
 
   private final String FILTER_ID = "0xdbdb02abb65a2ba57a1cc0336c17ef75";
-  private final String ENCLAVE_KEY = "enclave_key";
   private final String PRIVACY_GROUP_ID = "B1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
 
   @Mock private FilterManager filterManager;
   @Mock private PrivacyController privacyController;
-  @Mock private EnclavePublicKeyProvider enclavePublicKeyProvider;
+  @Mock private PrivacyIdProvider privacyIdProvider;
 
   private PrivUninstallFilter method;
 
   @Before
   public void before() {
-    method = new PrivUninstallFilter(filterManager, privacyController, enclavePublicKeyProvider);
+    method = new PrivUninstallFilter(filterManager, privacyController, privacyIdProvider);
   }
 
   @Test
@@ -88,33 +81,9 @@ public void correctFilterIsUninstalled() {
     verify(filterManager).uninstallFilter(eq(FILTER_ID));
   }
 
-  @Test
-  public void multiTenancyCheckFailure() {
-    final User user = mock(User.class);
-
-    when(enclavePublicKeyProvider.getEnclaveKey(any())).thenReturn(ENCLAVE_KEY);
-    doThrow(new MultiTenancyValidationException("msg"))
-        .when(privacyController)
-        .verifyPrivacyGroupContainsEnclavePublicKey(eq(PRIVACY_GROUP_ID), eq(ENCLAVE_KEY));
-
-    final JsonRpcRequestContext request =
-        privUninstallFilterRequestWithUser(PRIVACY_GROUP_ID, FILTER_ID, user);
-
-    assertThatThrownBy(() -> method.response(request))
-        .isInstanceOf(MultiTenancyValidationException.class)
-        .hasMessageContaining("msg");
-  }
-
   private JsonRpcRequestContext privUninstallFilterRequest(
       final String privacyGroupId, final String filterId) {
     return new JsonRpcRequestContext(
         new JsonRpcRequest("2.0", "priv_uninstallFilter", new Object[] {privacyGroupId, filterId}));
   }
-
-  private JsonRpcRequestContext privUninstallFilterRequestWithUser(
-      final String privacyGroupId, final String filterId, final User user) {
-    return new JsonRpcRequestContext(
-        new JsonRpcRequest("2.0", "priv_uninstallFilter", new Object[] {privacyGroupId, filterId}),
-        user);
-  }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/privx/PrivxFindFlexiblePrivacyGroupTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/privx/PrivxFindFlexiblePrivacyGroupTest.java
new file mode 100644
index 00000000000..8dacbaabdd1
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/privx/PrivxFindFlexiblePrivacyGroupTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.privx;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.enclave.EnclaveClientException;
+import org.hyperledger.besu.enclave.types.PrivacyGroup;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.privacy.MultiTenancyValidationException;
+import org.hyperledger.besu.ethereum.privacy.PrivacyController;
+
+import java.util.List;
+
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.auth.User;
+import io.vertx.ext.auth.impl.UserImpl;
+import org.assertj.core.util.Lists;
+import org.junit.Before;
+import org.junit.Test;
+
+public class PrivxFindFlexiblePrivacyGroupTest {
+  private static final String ENCLAVE_PUBLIC_KEY = "A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
+  private static final List<String> ADDRESSES =
+      List.of(
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "0x627306090abab3a6e1400e9345bc60c78a8bef57");
+
+  private final PrivacyController privacyController = mock(PrivacyController.class);
+
+  private final User user =
+      new UserImpl(new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY), new JsonObject());
+  private final PrivacyIdProvider privacyIdProvider = (user) -> ENCLAVE_PUBLIC_KEY;
+
+  private JsonRpcRequestContext request;
+  private PrivacyGroup privacyGroup;
+  private PrivxFindFlexiblePrivacyGroup privxFindFlexiblePrivacyGroup;
+
+  @Before
+  public void setUp() {
+    request =
+        new JsonRpcRequestContext(
+            new JsonRpcRequest("1", "privx_findFlexiblePrivacyGroup", new Object[] {ADDRESSES}),
+            user);
+    privacyGroup = new PrivacyGroup();
+    privacyGroup.setName("");
+    privacyGroup.setDescription("");
+    privacyGroup.setPrivacyGroupId("privacy group id");
+    privacyGroup.setMembers(Lists.list("member1"));
+
+    privxFindFlexiblePrivacyGroup =
+        new PrivxFindFlexiblePrivacyGroup(privacyController, privacyIdProvider);
+  }
+
+  @SuppressWarnings("unchecked")
+  @Test
+  public void findsPrivacyGroupWithValidAddresses() {
+    when(privacyController.findPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY))
+        .thenReturn(new PrivacyGroup[] {privacyGroup});
+
+    final JsonRpcSuccessResponse response =
+        (JsonRpcSuccessResponse) privxFindFlexiblePrivacyGroup.response(request);
+    final List<PrivacyGroup> result = (List<PrivacyGroup>) response.getResult();
+    assertThat(result).hasSize(1);
+    assertThat(result.get(0)).usingRecursiveComparison().isEqualTo(privacyGroup);
+    verify(privacyController).findPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY);
+  }
+
+  @Test
+  public void failsWithFindPrivacyGroupErrorIfEnclaveFails() {
+    when(privacyController.findPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY))
+        .thenThrow(new EnclaveClientException(500, "some failure"));
+
+    final JsonRpcErrorResponse response =
+        (JsonRpcErrorResponse) privxFindFlexiblePrivacyGroup.response(request);
+    assertThat(response.getError()).isEqualTo(JsonRpcError.FIND_FLEXIBLE_PRIVACY_GROUP_ERROR);
+    verify(privacyController).findPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY);
+  }
+
+  @Test
+  public void failsWithUnauthorizedErrorIfMultiTenancyValidationFails() {
+    when(privacyController.findPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY))
+        .thenThrow(new MultiTenancyValidationException("validation failed"));
+
+    final JsonRpcResponse expectedResponse =
+        new JsonRpcErrorResponse(
+            request.getRequest().getId(), JsonRpcError.FIND_FLEXIBLE_PRIVACY_GROUP_ERROR);
+    final JsonRpcResponse response = privxFindFlexiblePrivacyGroup.response(request);
+    assertThat(response).isEqualTo(expectedResponse);
+    verify(privacyController).findPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY);
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/privx/PrivxFindOnChainPrivacyGroupTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/privx/PrivxFindOnChainPrivacyGroupTest.java
deleted file mode 100644
index ed361cf1347..00000000000
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/privx/PrivxFindOnChainPrivacyGroupTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.privx;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.enclave.Enclave;
-import org.hyperledger.besu.enclave.EnclaveClientException;
-import org.hyperledger.besu.enclave.types.PrivacyGroup;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-import org.hyperledger.besu.ethereum.privacy.MultiTenancyValidationException;
-import org.hyperledger.besu.ethereum.privacy.PrivacyController;
-
-import java.util.Collections;
-import java.util.List;
-
-import io.vertx.core.json.JsonObject;
-import io.vertx.ext.auth.User;
-import io.vertx.ext.auth.jwt.impl.JWTUser;
-import org.assertj.core.util.Lists;
-import org.junit.Before;
-import org.junit.Test;
-
-public class PrivxFindOnChainPrivacyGroupTest {
-  private static final String ENCLAVE_PUBLIC_KEY = "A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
-  private static final List<String> ADDRESSES =
-      List.of(
-          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
-          "0x627306090abab3a6e1400e9345bc60c78a8bef57");
-
-  private final Enclave enclave = mock(Enclave.class);
-  private final PrivacyParameters privacyParameters = mock(PrivacyParameters.class);
-  private final PrivacyController privacyController = mock(PrivacyController.class);
-
-  private final User user =
-      new JWTUser(new JsonObject().put("privacyPublicKey", ENCLAVE_PUBLIC_KEY), "");
-  private final EnclavePublicKeyProvider enclavePublicKeyProvider = (user) -> ENCLAVE_PUBLIC_KEY;
-
-  private JsonRpcRequestContext request;
-  private PrivacyGroup privacyGroup;
-  private PrivxFindOnChainPrivacyGroup privxFindOnChainPrivacyGroup;
-
-  @Before
-  public void setUp() {
-    when(privacyParameters.getEnclave()).thenReturn(enclave);
-    when(privacyParameters.isEnabled()).thenReturn(true);
-    request =
-        new JsonRpcRequestContext(
-            new JsonRpcRequest("1", "privx_findOnChainPrivacyGroup", new Object[] {ADDRESSES}),
-            user);
-    privacyGroup = new PrivacyGroup();
-    privacyGroup.setName("");
-    privacyGroup.setDescription("");
-    privacyGroup.setPrivacyGroupId("privacy group id");
-    privacyGroup.setMembers(Lists.list("member1"));
-
-    privxFindOnChainPrivacyGroup =
-        new PrivxFindOnChainPrivacyGroup(privacyController, enclavePublicKeyProvider);
-  }
-
-  @SuppressWarnings("unchecked")
-  @Test
-  public void findsPrivacyGroupWithValidAddresses() {
-    when(privacyController.findOnChainPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY))
-        .thenReturn(Collections.singletonList(privacyGroup));
-
-    final JsonRpcSuccessResponse response =
-        (JsonRpcSuccessResponse) privxFindOnChainPrivacyGroup.response(request);
-    final List<PrivacyGroup> result = (List<PrivacyGroup>) response.getResult();
-    assertThat(result).hasSize(1);
-    assertThat(result.get(0)).isEqualToComparingFieldByField(privacyGroup);
-    verify(privacyController).findOnChainPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY);
-  }
-
-  @Test
-  public void failsWithFindPrivacyGroupErrorIfEnclaveFails() {
-    when(privacyController.findOnChainPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY))
-        .thenThrow(new EnclaveClientException(500, "some failure"));
-
-    final JsonRpcErrorResponse response =
-        (JsonRpcErrorResponse) privxFindOnChainPrivacyGroup.response(request);
-    assertThat(response.getError()).isEqualTo(JsonRpcError.FIND_ONCHAIN_PRIVACY_GROUP_ERROR);
-    verify(privacyController).findOnChainPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY);
-  }
-
-  @Test
-  public void failsWithUnauthorizedErrorIfMultiTenancyValidationFails() {
-    when(privacyController.findOnChainPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY))
-        .thenThrow(new MultiTenancyValidationException("validation failed"));
-
-    final JsonRpcResponse expectedResponse =
-        new JsonRpcErrorResponse(
-            request.getRequest().getId(), JsonRpcError.FIND_ONCHAIN_PRIVACY_GROUP_ERROR);
-    final JsonRpcResponse response = privxFindOnChainPrivacyGroup.response(request);
-    assertThat(response).isEqualTo(expectedResponse);
-    verify(privacyController).findOnChainPrivacyGroupByMembers(ADDRESSES, ENCLAVE_PUBLIC_KEY);
-  }
-}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/TransactionTracerTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/TransactionTracerTest.java
index 9d5bb1a2ef8..e2124a67c3f 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/TransactionTracerTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/TransactionTracerTest.java
@@ -20,24 +20,24 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.ImmutableTransactionTraceParams;
 import org.hyperledger.besu.ethereum.chain.BadBlockManager;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
 import org.hyperledger.besu.ethereum.debug.TraceFrame;
 import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.vm.DebugOperationTracer;
-import org.hyperledger.besu.ethereum.vm.StandardJsonTracer;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.tracing.StandardJsonTracer;
+import org.hyperledger.besu.evm.worldstate.StackedUpdater;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -65,8 +65,6 @@ public class TransactionTracerTest {
   @Mock private ProtocolSchedule protocolSchedule;
   @Mock private Blockchain blockchain;
 
-  @Mock private WorldStateArchive worldStateArchive;
-
   @Mock private BlockHeader blockHeader;
 
   @Mock private BlockBody blockBody;
@@ -81,7 +79,7 @@ public class TransactionTracerTest {
 
   @Mock private ProtocolSpec protocolSpec;
 
-  @Mock private MutableWorldState mutableWorldState;
+  @Mock private Tracer.TraceableState mutableWorldState;
 
   @Mock private MainnetTransactionProcessor transactionProcessor;
 
@@ -102,18 +100,16 @@ public class TransactionTracerTest {
 
   @Before
   public void setUp() throws Exception {
-    transactionTracer =
-        new TransactionTracer(new BlockReplay(protocolSchedule, blockchain, worldStateArchive));
+    transactionTracer = new TransactionTracer(new BlockReplay(protocolSchedule, blockchain));
     when(transaction.getHash()).thenReturn(transactionHash);
     when(otherTransaction.getHash()).thenReturn(otherTransactionHash);
     when(blockHeader.getNumber()).thenReturn(12L);
     when(blockHeader.getHash()).thenReturn(blockHash);
     when(blockHeader.getParentHash()).thenReturn(previousBlockHash);
-    when(previousBlockHeader.getStateRoot()).thenReturn(Hash.ZERO);
-    when(worldStateArchive.getMutable(Hash.ZERO)).thenReturn(Optional.of(mutableWorldState));
-    when(protocolSchedule.getByBlockNumber(12)).thenReturn(protocolSpec);
+    when(protocolSchedule.getByBlockHeader(blockHeader)).thenReturn(protocolSpec);
     when(protocolSpec.getTransactionProcessor()).thenReturn(transactionProcessor);
     when(protocolSpec.getMiningBeneficiaryCalculator()).thenReturn(BlockHeader::getCoinbase);
+    when(protocolSpec.getFeeMarket()).thenReturn(FeeMarket.london(0L));
     when(blockchain.getChainHeadHeader()).thenReturn(blockHeader);
     when(protocolSpec.getBadBlocksManager()).thenReturn(new BadBlockManager());
   }
@@ -121,7 +117,8 @@ public void setUp() throws Exception {
   @Test
   public void traceTransactionShouldReturnNoneWhenBlockHeaderNotFound() {
     final Optional<TransactionTrace> transactionTrace =
-        transactionTracer.traceTransaction(invalidBlockHash, transactionHash, tracer);
+        transactionTracer.traceTransaction(
+            mutableWorldState, invalidBlockHash, transactionHash, tracer);
     assertThat(transactionTrace).isEmpty();
   }
 
@@ -135,7 +132,7 @@ public void traceTransactionShouldReturnTraceFramesFromExecutionTracer() {
     when(tracer.getTraceFrames()).thenReturn(traceFrames);
 
     final Optional<TransactionTrace> transactionTrace =
-        transactionTracer.traceTransaction(blockHash, transactionHash, tracer);
+        transactionTracer.traceTransaction(mutableWorldState, blockHash, transactionHash, tracer);
 
     assertThat(transactionTrace.map(TransactionTrace::getTraceFrames)).contains(traceFrames);
   }
@@ -152,7 +149,7 @@ public void traceTransactionShouldReturnTraceFramesFromExecutionTracer() {
     when(tracer.getTraceFrames()).thenReturn(traceFrames);
 
     final Optional<TransactionTrace> transactionTrace =
-        transactionTracer.traceTransaction(blockHash, transactionHash, tracer);
+        transactionTracer.traceTransaction(mutableWorldState, blockHash, transactionHash, tracer);
 
     assertThat(transactionTrace.map(TransactionTrace::getTraceFrames)).contains(traceFrames);
   }
@@ -167,22 +164,23 @@ public void traceTransactionShouldReturnResultFromProcessTransaction() {
     when(blockBody.getTransactions()).thenReturn(Collections.singletonList(transaction));
     when(blockchain.getBlockBody(blockHash)).thenReturn(Optional.of(blockBody));
 
-    final WorldUpdater updater = mutableWorldState.updater();
-    final Address coinbase = blockHeader.getCoinbase();
+    final WorldUpdater updater = mock(WorldUpdater.class);
+    when(mutableWorldState.updater()).thenReturn(updater);
     when(transactionProcessor.processTransaction(
             eq(blockchain),
             eq(updater),
             eq(blockHeader),
             eq(transaction),
-            eq(coinbase),
+            eq(null),
             eq(tracer),
             any(),
             any(),
-            any()))
+            any(),
+            eq(Wei.ZERO)))
         .thenReturn(result);
 
     final Optional<TransactionTrace> transactionTrace =
-        transactionTracer.traceTransaction(blockHash, transactionHash, tracer);
+        transactionTracer.traceTransaction(mutableWorldState, blockHash, transactionHash, tracer);
 
     assertThat(transactionTrace.map(TransactionTrace::getResult)).contains(result);
   }
@@ -197,7 +195,7 @@ public void traceTransactionShouldReturnEmptyResultWhenTransactionNotInCurrentBl
     when(blockchain.getBlockBody(blockHash)).thenReturn(Optional.of(blockBody));
 
     final Optional<TransactionTrace> transactionTrace =
-        transactionTracer.traceTransaction(blockHash, transactionHash, tracer);
+        transactionTracer.traceTransaction(mutableWorldState, blockHash, transactionHash, tracer);
 
     assertThat(transactionTrace).isEmpty();
   }
@@ -209,7 +207,7 @@ public void traceTransactionShouldReturnEmptyResultWhenBlockIsNotAvailable() {
     when(blockchain.getBlockBody(blockHash)).thenReturn(Optional.empty());
 
     final Optional<TransactionTrace> transactionTrace =
-        transactionTracer.traceTransaction(blockHash, transactionHash, tracer);
+        transactionTracer.traceTransaction(mutableWorldState, blockHash, transactionHash, tracer);
 
     assertThat(transactionTrace).isEmpty();
   }
@@ -225,8 +223,11 @@ public void traceTransactionToFileShouldReturnEmptyListWhenNoTransaction() {
     when(blockBody.getTransactions()).thenReturn(transactions);
     when(blockchain.getBlockBody(blockHash)).thenReturn(Optional.of(blockBody));
 
+    final WorldUpdater updater = mock(WorldUpdater.class);
+    when(mutableWorldState.updater()).thenReturn(updater);
     final List<String> transactionTraces =
         transactionTracer.traceTransactionToFile(
+            mutableWorldState,
             blockHash,
             Optional.of(ImmutableTransactionTraceParams.builder().build()),
             traceDir.getRoot().toPath());
@@ -250,22 +251,26 @@ public void traceTransactionToFileShouldReturnResultFromProcessTransaction() thr
     when(blockBody.getTransactions()).thenReturn(Collections.singletonList(transaction));
     when(blockchain.getBlockBody(blockHash)).thenReturn(Optional.of(blockBody));
 
-    final WorldUpdater updater = mutableWorldState.updater();
-    final Address coinbase = blockHeader.getCoinbase();
+    final WorldUpdater updater = mock(WorldUpdater.class);
+    when(mutableWorldState.updater()).thenReturn(updater);
+    final WorldUpdater stackedUpdater = mock(StackedUpdater.class);
+    when(updater.updater()).thenReturn(stackedUpdater);
     when(transactionProcessor.processTransaction(
             eq(blockchain),
-            eq(updater),
+            eq(stackedUpdater),
             eq(blockHeader),
             eq(transaction),
-            eq(coinbase),
+            eq(null),
             any(StandardJsonTracer.class),
             any(),
             any(),
-            any()))
+            any(),
+            eq(Wei.ZERO)))
         .thenReturn(result);
 
     final List<String> transactionTraces =
         transactionTracer.traceTransactionToFile(
+            mutableWorldState,
             blockHash,
             Optional.of(ImmutableTransactionTraceParams.builder().build()),
             traceDir.getRoot().toPath());
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/MutableJsonRpcSuccessResponse.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/MutableJsonRpcSuccessResponse.java
new file mode 100644
index 00000000000..fc51f5209e4
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/MutableJsonRpcSuccessResponse.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright Hyperledger Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.response;
+
+import java.util.Objects;
+
+import com.fasterxml.jackson.annotation.JsonGetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonSetter;
+
+@JsonPropertyOrder({"jsonrpc", "id", "result"})
+public class MutableJsonRpcSuccessResponse {
+
+  private Object id;
+  private Object result;
+  private Object version;
+
+  public MutableJsonRpcSuccessResponse() {
+    this.id = null;
+    this.result = null;
+  }
+
+  public MutableJsonRpcSuccessResponse(final Object id, final Object result) {
+    this.id = id;
+    this.result = result;
+  }
+
+  public MutableJsonRpcSuccessResponse(final Object id) {
+    this.id = id;
+    this.result = "Success";
+  }
+
+  @JsonGetter("id")
+  public Object getId() {
+    return id;
+  }
+
+  @JsonGetter("result")
+  public Object getResult() {
+    return result;
+  }
+
+  @JsonSetter("id")
+  public void setId(final Object id) {
+    this.id = id;
+  }
+
+  @JsonSetter("result")
+  public void setResult(final Object result) {
+    this.result = result;
+  }
+
+  @JsonGetter("jsonrpc")
+  public Object getVersion() {
+    return version;
+  }
+
+  @JsonSetter("jsonrpc")
+  public void setVersion(final Object version) {
+    this.version = version;
+  }
+
+  @JsonIgnore
+  public JsonRpcResponseType getType() {
+    return JsonRpcResponseType.SUCCESS;
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    final MutableJsonRpcSuccessResponse that = (MutableJsonRpcSuccessResponse) o;
+    return Objects.equals(id, that.id) && Objects.equals(result, that.result);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, result);
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionCompleteResultTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionCompleteResultTest.java
new file mode 100644
index 00000000000..5c0a6c8f46f
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/TransactionCompleteResultTest.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.api.query.TransactionWithMetadata;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
+import org.hyperledger.besu.plugin.data.TransactionType;
+
+import java.util.List;
+import java.util.Optional;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ImmutableList;
+import org.junit.Test;
+
+public class TransactionCompleteResultTest {
+
+  @Test
+  public void eip1559TransactionWithShortWeiVals() {
+    final BlockDataGenerator gen = new BlockDataGenerator();
+    TransactionCompleteResult zeroPriorityFeeTx =
+        new TransactionCompleteResult(
+            new TransactionWithMetadata(
+                new TransactionTestFixture()
+                    .type(TransactionType.EIP1559)
+                    .maxFeePerGas(Optional.of(Wei.ONE))
+                    .maxPriorityFeePerGas(Optional.of(Wei.ZERO))
+                    .createTransaction(gen.generateKeyPair()),
+                0L,
+                Optional.of(Wei.of(7L)),
+                Hash.ZERO,
+                0));
+
+    assertThat(zeroPriorityFeeTx.getMaxFeePerGas()).isEqualTo("0x1");
+    assertThat(zeroPriorityFeeTx.getMaxPriorityFeePerGas()).isEqualTo("0x0");
+  }
+
+  @Test
+  public void eip1559TransactionFields() {
+    final BlockDataGenerator gen = new BlockDataGenerator();
+    final Transaction transaction = gen.transaction(TransactionType.EIP1559);
+    TransactionCompleteResult tcr =
+        new TransactionCompleteResult(
+            new TransactionWithMetadata(transaction, 0L, Optional.of(Wei.of(7L)), Hash.ZERO, 0));
+    assertThat(tcr.getMaxFeePerGas()).isNotEmpty();
+    assertThat(tcr.getMaxPriorityFeePerGas()).isNotEmpty();
+    assertThat(tcr.getGasPrice()).isNotEmpty();
+    assertThat(tcr.getGasPrice())
+        .isEqualTo(Quantity.create(transaction.getEffectiveGasPrice(Optional.of(Wei.of(7L)))));
+  }
+
+  @Test
+  public void legacyTransactionPostLondonFields() {
+    final BlockDataGenerator gen = new BlockDataGenerator();
+    final Transaction transaction = gen.transaction(TransactionType.FRONTIER);
+    TransactionCompleteResult tcr =
+        new TransactionCompleteResult(
+            new TransactionWithMetadata(transaction, 0L, Optional.of(Wei.of(7L)), Hash.ZERO, 0));
+    assertThat(tcr.getMaxFeePerGas()).isNull();
+    assertThat(tcr.getMaxPriorityFeePerGas()).isNull();
+    assertThat(tcr.getGasPrice()).isNotEmpty();
+    assertThat(tcr.getGasPrice())
+        .isEqualTo(Quantity.create(transaction.getGasPrice().orElseThrow()));
+  }
+
+  @Test
+  public void legacyTransactionPreLondonFields() {
+    final BlockDataGenerator gen = new BlockDataGenerator();
+    final Transaction transaction = gen.transaction(TransactionType.FRONTIER);
+    TransactionCompleteResult tcr =
+        new TransactionCompleteResult(
+            new TransactionWithMetadata(transaction, 0L, Optional.empty(), Hash.ZERO, 0));
+    assertThat(tcr.getMaxFeePerGas()).isNull();
+    assertThat(tcr.getMaxPriorityFeePerGas()).isNull();
+    assertThat(tcr.getGasPrice()).isNotEmpty();
+    assertThat(tcr.getGasPrice())
+        .isEqualTo(Quantity.create(transaction.getGasPrice().orElseThrow()));
+  }
+
+  @Test
+  public void accessListTransactionFields() {
+    final BlockDataGenerator gen = new BlockDataGenerator();
+    final Transaction transaction = gen.transaction(TransactionType.ACCESS_LIST);
+    final TransactionCompleteResult transactionCompleteResult =
+        new TransactionCompleteResult(
+            new TransactionWithMetadata(
+                transaction,
+                136,
+                Optional.empty(),
+                Hash.fromHexString(
+                    "0xfc84c3946cb419cbd8c2c68d5e79a3b2a03a8faff4d9e2be493f5a07eb5da95e"),
+                0));
+
+    assertThat(transactionCompleteResult.getGasPrice()).isNotEmpty();
+    assertThat(transactionCompleteResult.getMaxFeePerGas()).isNull();
+    assertThat(transactionCompleteResult.getMaxPriorityFeePerGas()).isNull();
+    final ObjectMapper objectMapper = new ObjectMapper();
+    final JsonNode transactionCompleteResultJson =
+        objectMapper.valueToTree(transactionCompleteResult);
+    final List<JsonNode> accessListJson =
+        ImmutableList.copyOf(transactionCompleteResultJson.get("accessList").elements());
+    assertThat(accessListJson).hasSizeGreaterThan(0);
+    accessListJson.forEach(
+        accessListEntryJson -> {
+          assertThat(accessListEntryJson.get("address").asText()).matches("^0x\\X{40}$");
+          ImmutableList.copyOf(accessListEntryJson.get("storageKeys").elements())
+              .forEach(
+                  storageKeyJson -> assertThat(storageKeyJson.asText()).matches("^0x\\X{64}$"));
+        });
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/FlatTraceGeneratorTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/FlatTraceGeneratorTest.java
new file mode 100644
index 00000000000..3569cbd6fa5
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/FlatTraceGeneratorTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.flat;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.TransactionTrace;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.Trace;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class FlatTraceGeneratorTest {
+  @Mock private Transaction transaction;
+  @Mock private TransactionProcessingResult transactionProcessingResult;
+
+  @Test
+  public void testGenerateFromTransactionTraceWithRevertReason() {
+    final Bytes revertReason = Bytes.random(32);
+    Mockito.when(transaction.getSender()).thenReturn(Address.ZERO);
+    Mockito.when(transactionProcessingResult.getRevertReason())
+        .thenReturn(Optional.of(revertReason));
+
+    final TransactionTrace transactionTrace =
+        new TransactionTrace(transaction, transactionProcessingResult, Collections.emptyList());
+    final Stream<Trace> traceStream =
+        FlatTraceGenerator.generateFromTransactionTrace(
+            null, transactionTrace, null, new AtomicInteger());
+    final List<Trace> traces = traceStream.collect(Collectors.toList());
+
+    Assertions.assertThat(traces.isEmpty()).isFalse();
+    Assertions.assertThat(traces.get(0)).isNotNull();
+    Assertions.assertThat(traces.get(0) instanceof FlatTrace).isTrue();
+    Assertions.assertThat(((FlatTrace) traces.get(0)).getRevertReason())
+        .isEqualTo(revertReason.toHexString());
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/RewardTraceGeneratorTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/RewardTraceGeneratorTest.java
index dc497c20ce0..ab8efc6c258 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/RewardTraceGeneratorTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/flat/RewardTraceGeneratorTest.java
@@ -18,14 +18,13 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.tracing.Trace;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.fees.TransactionGasBudgetCalculator;
 import org.hyperledger.besu.ethereum.mainnet.AbstractBlockProcessor;
 import org.hyperledger.besu.ethereum.mainnet.ClassicBlockProcessor;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockProcessor;
@@ -72,7 +71,7 @@ public void setUp() {
     final BlockHeader blockHeader =
         gen.header(0x0A, blockBody, new BlockDataGenerator.BlockOptions());
     block = new Block(blockHeader, blockBody);
-    when(protocolSchedule.getByBlockNumber(block.getHeader().getNumber())).thenReturn(protocolSpec);
+    when(protocolSchedule.getByBlockHeader(block.getHeader())).thenReturn(protocolSpec);
     when(protocolSpec.getBlockReward()).thenReturn(blockReward);
     when(protocolSpec.getMiningBeneficiaryCalculator()).thenReturn(miningBeneficiaryCalculator);
     when(miningBeneficiaryCalculator.calculateBeneficiary(block.getHeader()))
@@ -92,7 +91,7 @@ public void assertThatTraceGeneratorReturnValidRewardsForMainnetBlockProcessor()
             blockReward,
             BlockHeader::getCoinbase,
             true,
-            TransactionGasBudgetCalculator.frontier());
+            protocolSchedule);
     when(protocolSpec.getBlockProcessor()).thenReturn(blockProcessor);
 
     final Stream<Trace> traceStream =
@@ -151,7 +150,8 @@ public void assertThatTraceGeneratorReturnValidRewardsForClassicBlockProcessor()
             blockReward,
             BlockHeader::getCoinbase,
             true,
-            eraRounds);
+            eraRounds,
+            protocolSchedule);
     when(protocolSpec.getBlockProcessor()).thenReturn(blockProcessor);
 
     final Stream<Trace> traceStream =
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/transaction/pool/PendingTransactionFilterTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/transaction/pool/PendingTransactionFilterTest.java
index a611674ecb6..13c68f7c903 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/transaction/pool/PendingTransactionFilterTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/transaction/pool/PendingTransactionFilterTest.java
@@ -25,14 +25,13 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.transaction.pool.PendingTransactionFilter.Filter;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
 
-import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashSet;
@@ -114,7 +113,7 @@ public PendingTransactionFilterTest(
   @Test
   public void localAndRemoteAddressShouldNotStartWithForwardSlash() {
 
-    final Set<Transaction> filteredList =
+    final Collection<Transaction> filteredList =
         pendingTransactionFilter.reduce(getPendingTransactions(), filters, limit);
 
     assertThat(filteredList.size()).isEqualTo(expectedListOfTransactionHash.size());
@@ -123,12 +122,12 @@ public void localAndRemoteAddressShouldNotStartWithForwardSlash() {
     }
   }
 
-  private Set<PendingTransactions.TransactionInfo> getPendingTransactions() {
-    final List<PendingTransactions.TransactionInfo> transactionInfoList = new ArrayList<>();
+  private Set<PendingTransaction> getPendingTransactions() {
+    final List<PendingTransaction> pendingTransactionList = new ArrayList<>();
     final int numberTrx = 5;
     for (int i = 1; i < numberTrx; i++) {
       Transaction transaction = mock(Transaction.class);
-      when(transaction.getGasPrice()).thenReturn(Wei.of(i));
+      when(transaction.getGasPrice()).thenReturn(Optional.of(Wei.of(i)));
       when(transaction.getValue()).thenReturn(Wei.of(i));
       when(transaction.getGasLimit()).thenReturn((long) i);
       when(transaction.getNonce()).thenReturn((long) i);
@@ -139,10 +138,8 @@ private Set<PendingTransactions.TransactionInfo> getPendingTransactions() {
       if (i == numberTrx - 1) {
         when(transaction.isContractCreation()).thenReturn(true);
       }
-      transactionInfoList.add(
-          new PendingTransactions.TransactionInfo(
-              transaction, true, Instant.ofEpochSecond(Integer.MAX_VALUE)));
+      pendingTransactionList.add(new PendingTransaction.Local(transaction));
     }
-    return new LinkedHashSet<>(transactionInfoList);
+    return new LinkedHashSet<>(pendingTransactionList);
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/ipc/JsonRpcIpcServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/ipc/JsonRpcIpcServiceTest.java
new file mode 100644
index 00000000000..661d8e17a49
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/ipc/JsonRpcIpcServiceTest.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.ipc;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.BaseJsonRpcProcessor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.JsonRpcExecutor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import io.vertx.core.Vertx;
+import io.vertx.core.VertxOptions;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+import io.vertx.core.net.SocketAddress;
+import io.vertx.junit5.VertxExtension;
+import io.vertx.junit5.VertxTestContext;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.io.TempDir;
+
+@EnabledOnOs({OS.LINUX, OS.MAC})
+@ExtendWith(VertxExtension.class)
+class JsonRpcIpcServiceTest {
+
+  @TempDir private Path tempDir;
+  private Vertx vertx;
+  private VertxTestContext testContext;
+
+  @BeforeEach
+  public void setUp() {
+    vertx = Vertx.vertx(new VertxOptions().setPreferNativeTransport(true));
+    testContext = new VertxTestContext();
+  }
+
+  @AfterEach
+  public void after() throws Throwable {
+    assertThat(testContext.awaitCompletion(5, TimeUnit.SECONDS))
+        .describedAs("Test completed on time")
+        .isTrue();
+    if (testContext.failed()) {
+      throw testContext.causeOfFailure();
+    }
+  }
+
+  @Test
+  void successfulExecution() {
+    final Path socketPath = tempDir.resolve("besu-test.ipc");
+    final JsonRpcMethod testMethod = mock(JsonRpcMethod.class);
+    when(testMethod.response(any())).thenReturn(new JsonRpcSuccessResponse(1, "TEST OK"));
+    final JsonRpcIpcService service =
+        new JsonRpcIpcService(
+            vertx,
+            socketPath,
+            new JsonRpcExecutor(new BaseJsonRpcProcessor(), Map.of("test_method", testMethod)));
+    final String expectedResponse = "{\"jsonrpc\":\"2.0\",\"id\":1,\"result\":\"TEST OK\"}\n";
+
+    assertSocketCall(
+        service,
+        socketPath,
+        expectedResponse,
+        new JsonObject().put("id", 1).put("method", "test_method").toBuffer());
+  }
+
+  @Test
+  void successfulBatchExecution() {
+    final Path socketPath = tempDir.resolve("besu-test.ipc");
+    final JsonRpcMethod fooMethod = mock(JsonRpcMethod.class);
+    when(fooMethod.response(any())).thenReturn(new JsonRpcSuccessResponse(1, "FOO OK"));
+    final JsonRpcMethod barMethod = mock(JsonRpcMethod.class);
+    when(barMethod.response(any())).thenReturn(new JsonRpcSuccessResponse(2, "BAR OK"));
+    final JsonRpcIpcService service =
+        new JsonRpcIpcService(
+            vertx,
+            socketPath,
+            new JsonRpcExecutor(
+                new BaseJsonRpcProcessor(),
+                Map.of("foo_method", fooMethod, "bar_method", barMethod)));
+
+    assertSocketCall(
+        service,
+        socketPath,
+        "[{\"jsonrpc\":\"2.0\",\"id\":1,\"result\":\"FOO OK\"},{\"jsonrpc\":\"2.0\",\"id\":2,\"result\":\"BAR OK\"}]\n",
+        new JsonArray(
+                Arrays.asList(
+                    new JsonObject().put("id", 1).put("method", "foo_method"),
+                    new JsonObject().put("id", 2).put("method", "bar_method")))
+            .toBuffer());
+  }
+
+  @Test
+  void validJsonButNotRpcShouldReturnInvalidRequest() {
+    final Path socketPath = tempDir.resolve("besu-test.ipc");
+    final JsonRpcIpcService service =
+        new JsonRpcIpcService(
+            vertx,
+            socketPath,
+            new JsonRpcExecutor(new BaseJsonRpcProcessor(), Collections.emptyMap()));
+    final String expectedResponse =
+        "{\"jsonrpc\":\"2.0\",\"id\":null,\"error\":{\"code\":-32600,\"message\":\"Invalid Request\"}}\n";
+
+    assertSocketCall(service, socketPath, expectedResponse, Buffer.buffer("{\"foo\":\"bar\"}"));
+  }
+
+  @Test
+  void nonJsonRequestShouldReturnParseError() {
+    final Path socketPath = tempDir.resolve("besu-test.ipc");
+    final JsonRpcIpcService service =
+        new JsonRpcIpcService(vertx, socketPath, mock(JsonRpcExecutor.class));
+    final String expectedResponse =
+        "{\"jsonrpc\":\"2.0\",\"id\":null,\"error\":{\"code\":-32700,\"message\":\"Parse error\"}}\n";
+
+    assertSocketCall(service, socketPath, expectedResponse, Buffer.buffer("bad request"));
+  }
+
+  @Test
+  void shouldDeleteSocketFileOnStop() {
+    final Path socketPath = tempDir.resolve("besu-test.ipc");
+    final JsonRpcIpcService service =
+        new JsonRpcIpcService(vertx, socketPath, mock(JsonRpcExecutor.class));
+    service
+        .start()
+        .onComplete(
+            testContext.succeeding(
+                server ->
+                    service
+                        .stop()
+                        .onComplete(
+                            testContext.succeeding(
+                                handler ->
+                                    testContext.verify(
+                                        () -> {
+                                          assertThat(socketPath).doesNotExist();
+                                          testContext.completeNow();
+                                        })))));
+  }
+
+  private void assertSocketCall(
+      final JsonRpcIpcService service,
+      final Path socketPath,
+      final String expectedResponse,
+      final Buffer request) {
+    service
+        .start()
+        .onComplete(
+            testContext.succeeding(
+                server ->
+                    vertx
+                        .createNetClient()
+                        .connect(SocketAddress.domainSocketAddress(socketPath.toString()))
+                        .onComplete(
+                            testContext.succeeding(
+                                socket ->
+                                    socket
+                                        .handler(
+                                            buffer ->
+                                                testContext.verify(
+                                                    () -> {
+                                                      assertThat(buffer)
+                                                          .hasToString(expectedResponse);
+                                                      service
+                                                          .stop()
+                                                          .onComplete(
+                                                              testContext.succeedingThenComplete());
+                                                    }))
+                                        .write(request)))));
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivJsonRpcMethodsTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivJsonRpcMethodsTest.java
index dcf005c7aec..98268eebdb7 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivJsonRpcMethodsTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivJsonRpcMethodsTest.java
@@ -57,8 +57,8 @@ public void setup() {
   }
 
   @Test
-  public void offchainPrivacyGroupMethodsAreDisabledWhenOnchainPrivacyGroupIsEnabled() {
-    when(privacyParameters.isOnchainPrivacyGroupsEnabled()).thenReturn(true);
+  public void offchainPrivacyGroupMethodsAreDisabledWhenFlexiblePrivacyGroupIsEnabled() {
+    when(privacyParameters.isFlexiblePrivacyGroupsEnabled()).thenReturn(true);
     final Map<String, JsonRpcMethod> rpcMethods = privJsonRpcMethods.create();
 
     assertThat(rpcMethods.get(PRIV_CREATE_PRIVACY_GROUP.getMethodName())).isNull();
@@ -67,8 +67,8 @@ public void offchainPrivacyGroupMethodsAreDisabledWhenOnchainPrivacyGroupIsEnabl
   }
 
   @Test
-  public void offchainPrivacyGroupMethodsAreEnabledWhenOnchainPrivacyGroupIsDisabled() {
-    when(privacyParameters.isOnchainPrivacyGroupsEnabled()).thenReturn(false);
+  public void offchainPrivacyGroupMethodsAreEnabledWhenFlexiblePrivacyGroupIsDisabled() {
+    when(privacyParameters.isFlexiblePrivacyGroupsEnabled()).thenReturn(false);
     final Map<String, JsonRpcMethod> rpcMethods = privJsonRpcMethods.create();
 
     assertThat(rpcMethods.get(PRIV_CREATE_PRIVACY_GROUP.getMethodName())).isNotNull();
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivacyApiGroupJsonRpcMethodsTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivacyApiGroupJsonRpcMethodsTest.java
index af948ab3116..c546cbf6d57 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivacyApiGroupJsonRpcMethodsTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivacyApiGroupJsonRpcMethodsTest.java
@@ -19,13 +19,12 @@
 import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.PRIVACY_NOT_ENABLED;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApi;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.MultiTenancyRpcMethodDecorator;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponseType;
@@ -35,13 +34,14 @@
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.privacy.MultiTenancyPrivacyController;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
+import org.hyperledger.besu.plugin.services.privacy.PrivateMarkerTransactionFactory;
 
 import java.util.Map;
 import java.util.Optional;
 
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.auth.User;
-import io.vertx.ext.auth.jwt.impl.JWTUser;
+import io.vertx.ext.auth.impl.UserImpl;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -64,6 +64,7 @@ public class PrivacyApiGroupJsonRpcMethodsTest {
   @Before
   public void setup() {
     when(rpcMethod.getName()).thenReturn("priv_method");
+
     privacyApiGroupJsonRpcMethods =
         new TestPrivacyApiGroupJsonRpcMethods(
             blockchainQueries, protocolSchedule, transactionPool, privacyParameters, rpcMethod);
@@ -90,16 +91,15 @@ public void rpcsCreatedWithoutMultiTenancyUseOriginalRpcMethod() {
   @Test
   public void rpcsCreatedWithoutMultiTenancyUseFixedEnclavePublicKey() {
     when(privacyParameters.isEnabled()).thenReturn(true);
-    when(privacyParameters.getEnclavePublicKey()).thenReturn(DEFAULT_ENCLAVE_PUBLIC_KEY);
+    when(privacyParameters.getPrivacyUserId()).thenReturn(DEFAULT_ENCLAVE_PUBLIC_KEY);
 
     final User user = createUser(DEFAULT_ENCLAVE_PUBLIC_KEY);
     privacyApiGroupJsonRpcMethods.create();
-    final EnclavePublicKeyProvider enclavePublicKeyProvider =
-        privacyApiGroupJsonRpcMethods.enclavePublicKeyProvider;
+    final PrivacyIdProvider privacyIdProvider = privacyApiGroupJsonRpcMethods.privacyIdProvider;
 
-    assertThat(enclavePublicKeyProvider.getEnclaveKey(Optional.of(user)))
+    assertThat(privacyIdProvider.getPrivacyUserId(Optional.of(user)))
         .isEqualTo(DEFAULT_ENCLAVE_PUBLIC_KEY);
-    assertThat(enclavePublicKeyProvider.getEnclaveKey(Optional.empty()))
+    assertThat(privacyIdProvider.getPrivacyUserId(Optional.empty()))
         .isEqualTo(DEFAULT_ENCLAVE_PUBLIC_KEY);
   }
 
@@ -112,11 +112,10 @@ public void rpcsCreatedWithMultiTenancyUseEnclavePublicKeyFromRequest() {
     final User user2 = createUser("key2");
 
     privacyApiGroupJsonRpcMethods.create();
-    final EnclavePublicKeyProvider enclavePublicKeyProvider =
-        privacyApiGroupJsonRpcMethods.enclavePublicKeyProvider;
+    final PrivacyIdProvider privacyIdProvider = privacyApiGroupJsonRpcMethods.privacyIdProvider;
 
-    assertThat(enclavePublicKeyProvider.getEnclaveKey(Optional.of(user1))).isEqualTo("key1");
-    assertThat(enclavePublicKeyProvider.getEnclaveKey(Optional.of(user2))).isEqualTo("key2");
+    assertThat(privacyIdProvider.getPrivacyUserId(Optional.of(user1))).isEqualTo("key1");
+    assertThat(privacyIdProvider.getPrivacyUserId(Optional.of(user2))).isEqualTo("key2");
   }
 
   @Test
@@ -125,10 +124,9 @@ public void rpcsCreatedWithMultiTenancyAndWithoutUserFail() {
     when(privacyParameters.isMultiTenancyEnabled()).thenReturn(true);
 
     privacyApiGroupJsonRpcMethods.create();
-    final EnclavePublicKeyProvider enclavePublicKeyProvider =
-        privacyApiGroupJsonRpcMethods.enclavePublicKeyProvider;
+    final PrivacyIdProvider privacyIdProvider = privacyApiGroupJsonRpcMethods.privacyIdProvider;
 
-    assertThatThrownBy(() -> enclavePublicKeyProvider.getEnclaveKey(Optional.empty()))
+    assertThatThrownBy(() -> privacyIdProvider.getPrivacyUserId(Optional.empty()))
         .isInstanceOf(IllegalStateException.class)
         .hasMessage("Request does not contain an authorization token");
   }
@@ -160,14 +158,15 @@ public void rpcsCreatedWithMultiTenancyUseMultiTenancyController() {
   }
 
   private User createUser(final String enclavePublicKey) {
-    return new JWTUser(new JsonObject().put("privacyPublicKey", enclavePublicKey), "");
+    return new UserImpl(
+        new JsonObject().put("privacyPublicKey", enclavePublicKey), new JsonObject()) {};
   }
 
   private static class TestPrivacyApiGroupJsonRpcMethods extends PrivacyApiGroupJsonRpcMethods {
 
     private final JsonRpcMethod rpcMethod;
     private PrivacyController privacyController;
-    private EnclavePublicKeyProvider enclavePublicKeyProvider;
+    private PrivacyIdProvider privacyIdProvider;
 
     public TestPrivacyApiGroupJsonRpcMethods(
         final BlockchainQueries blockchainQueries,
@@ -182,15 +181,16 @@ public TestPrivacyApiGroupJsonRpcMethods(
     @Override
     protected Map<String, JsonRpcMethod> create(
         final PrivacyController privacyController,
-        final EnclavePublicKeyProvider enclavePublicKeyProvider) {
+        final PrivacyIdProvider privacyIdProvider,
+        final PrivateMarkerTransactionFactory privateMarkerTransactionFactory) {
       this.privacyController = privacyController;
-      this.enclavePublicKeyProvider = enclavePublicKeyProvider;
+      this.privacyIdProvider = privacyIdProvider;
       return mapOf(rpcMethod);
     }
 
     @Override
-    protected RpcApi getApiGroup() {
-      return RpcApis.PRIV;
+    protected String getApiGroup() {
+      return RpcApis.PRIV.name();
     }
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivxJsonRpcMethodsTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivxJsonRpcMethodsTest.java
index ef262f6636a..f62257673eb 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivxJsonRpcMethodsTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/PrivxJsonRpcMethodsTest.java
@@ -16,11 +16,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod.PRIVX_FIND_PRIVACY_GROUP;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod.PRIVX_FIND_PRIVACY_GROUP_OLD;
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.privx.PrivxFindOnChainPrivacyGroup;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.privx.PrivxFindFlexiblePrivacyGroup;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.privx.PrivxFindOnchainPrivacyGroup;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
@@ -54,8 +56,8 @@ public void setup() {
   }
 
   @Test
-  public void privxFindPrivacyGroupMethodIsDisabledWhenOnchainPrivacyGroupIsDisabled() {
-    when(privacyParameters.isOnchainPrivacyGroupsEnabled()).thenReturn(false);
+  public void privxFindPrivacyGroupMethodIsDisabledWhenFlexiblePrivacyGroupIsDisabled() {
+    when(privacyParameters.isFlexiblePrivacyGroupsEnabled()).thenReturn(false);
     final Map<String, JsonRpcMethod> rpcMethods = privxJsonRpcMethods.create();
     final JsonRpcMethod method = rpcMethods.get(PRIVX_FIND_PRIVACY_GROUP.getMethodName());
 
@@ -63,12 +65,23 @@ public void privxFindPrivacyGroupMethodIsDisabledWhenOnchainPrivacyGroupIsDisabl
   }
 
   @Test
-  public void privxFindPrivacyGroupMethodIsEnabledWhenOnchainPrivacyGroupIsEnabled() {
-    when(privacyParameters.isOnchainPrivacyGroupsEnabled()).thenReturn(true);
+  public void privxFindPrivacyGroupMethodIsEnabledWhenFlexiblePrivacyGroupIsEnabled() {
+    when(privacyParameters.isFlexiblePrivacyGroupsEnabled()).thenReturn(true);
     final Map<String, JsonRpcMethod> rpcMethods = privxJsonRpcMethods.create();
     final JsonRpcMethod method = rpcMethods.get(PRIVX_FIND_PRIVACY_GROUP.getMethodName());
 
     assertThat(method).isNotNull();
-    assertThat(method).isInstanceOf(PrivxFindOnChainPrivacyGroup.class);
+    assertThat(method).isInstanceOf(PrivxFindFlexiblePrivacyGroup.class);
+  }
+
+  @Deprecated
+  @Test
+  public void privxFindOnchainPrivacyGroupMethodIsStillEnabled() {
+    when(privacyParameters.isFlexiblePrivacyGroupsEnabled()).thenReturn(true);
+    final Map<String, JsonRpcMethod> rpcMethods = privxJsonRpcMethods.create();
+    final JsonRpcMethod method = rpcMethods.get(PRIVX_FIND_PRIVACY_GROUP_OLD.getMethodName());
+
+    assertThat(method).isNotNull();
+    assertThat(method).isInstanceOf(PrivxFindOnchainPrivacyGroup.class);
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/parameters/TraceCallManyParameterTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/parameters/TraceCallManyParameterTest.java
new file mode 100644
index 00000000000..fe99b9a2779
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/parameters/TraceCallManyParameterTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.parameters;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TraceCallManyParameter;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.TraceTypeParameter;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.exc.MismatchedInputException;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TraceCallManyParameterTest {
+  static final String emptyParamsJson = "[]";
+  static final String invalidJson = "[[\"invalid\"],[\"invalid\"]]";
+  static final String requestParamsJson =
+      "[ [ {\n"
+          + "      \"from\" : \"0xfe3b557e8fb62b89f4916b721be55ceb828dbd73\",\n"
+          + "      \"value\" : \"0x0\",\n"
+          + "      \"to\" : \"0x0010000000000000000000000000000000000000\",\n"
+          + "      \"gas\" : \"0xfffff2\",\n"
+          + "      \"gasPrice\" : \"0xef\",\n"
+          + "      \"data\" : \"0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002\"\n"
+          + "    }, [ \"trace\" ] ], [ {\n"
+          + "      \"from\" : \"0x627306090abab3a6e1400e9345bc60c78a8bef57\",\n"
+          + "      \"value\" : \"0x0\",\n"
+          + "      \"to\" : \"0x0010000000000000000000000000000000000000\",\n"
+          + "      \"gas\" : \"0xfffff2\",\n"
+          + "      \"gasPrice\" : \"0xef\",\n"
+          + "      \"data\" : \"0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004\"\n"
+          + "    }, [ \"trace\" ] ], [ {\n"
+          + "      \"from\" : \"0x627306090abab3a6e1400e9345bc60c78a8bef57\",\n"
+          + "      \"value\" : \"0x0\",\n"
+          + "      \"to\" : \"0x0010000000000000000000000000000000000000\",\n"
+          + "      \"gas\" : \"0xfffff2\",\n"
+          + "      \"gasPrice\" : \"0xef\",\n"
+          + "      \"data\" : \"0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000\"\n"
+          + "    }, [ \"trace\" ] ] ]";
+
+  private ObjectMapper mapper;
+
+  @Before
+  public void setup() {
+    mapper = new ObjectMapper();
+  }
+
+  @Test
+  public void testEmptyParamJsonParsesCorrectly() throws IOException {
+    final TraceCallManyParameter[] parameter =
+        mapper.readValue(emptyParamsJson, TraceCallManyParameter[].class);
+
+    assertThat(parameter).isNullOrEmpty();
+  }
+
+  @Test
+  public void testRequestParameterJsonParsesCorrectly() throws IOException {
+    final TraceCallManyParameter[] parameter =
+        mapper.readValue(requestParamsJson, TraceCallManyParameter[].class);
+
+    assertThat(parameter[0].getTuple()).isNotNull();
+    assertThat(parameter[0].getTuple().getJsonCallParameter()).isNotNull();
+    assertThat(parameter[0].getTuple().getJsonCallParameter().getFrom())
+        .isEqualTo(Address.fromHexString("0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"));
+    assertThat(parameter[2].getTuple().getJsonCallParameter().getTo())
+        .isEqualTo(Address.fromHexString("0x0010000000000000000000000000000000000000"));
+    assertThat(parameter[1].getTuple().getTraceTypeParameter().getTraceTypes()).hasSize(1);
+    assertThat(parameter[1].getTuple().getTraceTypeParameter().getTraceTypes())
+        .contains(TraceTypeParameter.TraceType.TRACE);
+  }
+
+  @Test
+  public void testInvalidJsonDoesNotParse() throws IOException {
+    assertThatExceptionOfType(MismatchedInputException.class)
+        .isThrownBy(() -> mapper.readValue(invalidJson, TraceCallManyParameter[].class));
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/timeout/TimeoutHandlerTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/timeout/TimeoutHandlerTest.java
index 599c58d272b..7c485932e7c 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/timeout/TimeoutHandlerTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/timeout/TimeoutHandlerTest.java
@@ -26,10 +26,10 @@
 import org.hyperledger.besu.ethereum.api.handlers.TimeoutOptions;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.context.ContextKey;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
@@ -37,7 +37,7 @@
 import com.google.common.collect.ImmutableMap;
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
-import io.vertx.core.json.Json;
+import io.vertx.core.json.JsonObject;
 import io.vertx.ext.web.RoutingContext;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -52,33 +52,14 @@ public class TimeoutHandlerTest {
   public static Collection<Object[]> data() {
     return Arrays.asList(
         new Object[][] {
-          {
-            Optional.empty(),
-            ETH_GET_LOGS,
-            body(ETH_GET_LOGS),
-            DEFAULT_OPTS.getTimeoutSeconds(),
-            true
-          },
-          {
-            Optional.empty(),
-            ETH_GET_LOGS,
-            body(ETH_BLOCK_NUMBER),
-            DEFAULT_OPTS.getTimeoutSeconds(),
-            false
-          },
-          {
-            Optional.of(DEFAULT_OPTS),
-            ETH_GET_LOGS,
-            body(ETH_BLOCK_NUMBER),
-            DEFAULT_OPTS.getTimeoutSeconds(),
-            true
-          }
+          {Optional.empty(), ETH_GET_LOGS, DEFAULT_OPTS.getTimeoutSeconds(), true},
+          {Optional.empty(), ETH_BLOCK_NUMBER, DEFAULT_OPTS.getTimeoutSeconds(), false},
+          {Optional.of(DEFAULT_OPTS), ETH_BLOCK_NUMBER, DEFAULT_OPTS.getTimeoutSeconds(), true}
         });
   }
 
   private static final TimeoutOptions DEFAULT_OPTS = TimeoutOptions.defaultOptions();
   private final Optional<TimeoutOptions> globalOptions;
-  private final String body;
   private final RpcMethod method;
   private final long timeoutSec;
   private final boolean timerMustBeSet;
@@ -86,11 +67,9 @@ public static Collection<Object[]> data() {
   public TimeoutHandlerTest(
       final Optional<TimeoutOptions> globalOptions,
       final RpcMethod method,
-      final String body,
       final long timeoutSec,
       final boolean timerMustBeSet) {
     this.globalOptions = globalOptions;
-    this.body = body;
     this.method = method;
     this.timeoutSec = timeoutSec;
     this.timerMustBeSet = timerMustBeSet;
@@ -98,22 +77,27 @@ public TimeoutHandlerTest(
 
   @Test
   public void test() {
-    final Map<String, TimeoutOptions> options =
-        ImmutableMap.of(
-            method.getMethodName(), new TimeoutOptions(timeoutSec, DEFAULT_OPTS.getErrorCode()));
-    final Handler<RoutingContext> handler = TimeoutHandler.handler(globalOptions, options, true);
+    final Map<String, TimeoutOptions> options;
+    if (timerMustBeSet) {
+      options =
+          ImmutableMap.of(
+              method.getMethodName(), new TimeoutOptions(timeoutSec, DEFAULT_OPTS.getErrorCode()));
+    } else {
+      options = Collections.emptyMap();
+    }
+    final Handler<RoutingContext> handler = TimeoutHandler.handler(globalOptions, options);
     final RoutingContext ctx = Mockito.spy(RoutingContext.class);
     final Vertx vertx = Mockito.spy(Vertx.class);
-    when(ctx.getBodyAsString()).thenReturn(body);
+
+    final JsonObject requestBody = Mockito.mock(JsonObject.class);
+    when(requestBody.getString("method")).thenReturn(method.getMethodName());
+    when(ctx.data()).thenReturn(Map.of(ContextKey.REQUEST_BODY_AS_JSON_OBJECT.name(), requestBody));
+    when(ctx.get(ContextKey.REQUEST_BODY_AS_JSON_OBJECT.name())).thenReturn(requestBody);
+
     when(ctx.vertx()).thenReturn(vertx);
     handler.handle(ctx);
-    verify(ctx).put(eq(ContextKey.REQUEST_BODY_AS_JSON_OBJECT.name()), any());
     verify(vertx, times(timerMustBeSet ? 1 : 0))
         .setTimer(eq(TimeUnit.SECONDS.toMillis(timeoutSec)), any());
     verify(ctx, times(timerMustBeSet ? 1 : 0)).addBodyEndHandler(any());
   }
-
-  private static String body(final RpcMethod method) {
-    return Json.encodePrettily(new JsonRpcRequest("2.0", method.getMethodName(), null));
-  }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/JsonResponseStreamerTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/JsonResponseStreamerTest.java
new file mode 100644
index 00000000000..4228e6ed7d0
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/JsonResponseStreamerTest.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright Hyperledger Besu contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.websocket;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import io.vertx.core.http.ServerWebSocket;
+import io.vertx.core.http.WebSocketFrame;
+import io.vertx.core.impl.future.FailedFuture;
+import io.vertx.core.impl.future.SucceededFuture;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatcher;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class JsonResponseStreamerTest {
+
+  @Mock private ServerWebSocket response;
+
+  @Mock private ServerWebSocket failedResponse;
+
+  @Before
+  public void before() {
+    when(response.writeFrame(any(WebSocketFrame.class)))
+        .thenReturn(new SucceededFuture<>(null, null));
+    when(failedResponse.writeFrame(any(WebSocketFrame.class)))
+        .thenReturn(new FailedFuture<Void>(new IOException()));
+  }
+
+  @Test
+  public void writeSingleChar() throws IOException {
+    try (JsonResponseStreamer streamer = new JsonResponseStreamer(response)) {
+      streamer.write('x');
+    }
+
+    verify(response).writeFrame(argThat(frameContains("x", true)));
+  }
+
+  @Test
+  public void writeString() throws IOException {
+    try (JsonResponseStreamer streamer = new JsonResponseStreamer(response)) {
+      streamer.write("xyz".getBytes(StandardCharsets.UTF_8), 0, 3);
+    }
+
+    verify(response).writeFrame(argThat(frameContains("xyz", true)));
+  }
+
+  @Test
+  public void writeSubString() throws IOException {
+    try (JsonResponseStreamer streamer = new JsonResponseStreamer(response)) {
+      streamer.write("abcxyz".getBytes(StandardCharsets.UTF_8), 1, 3);
+    }
+
+    verify(response).writeFrame(argThat(frameContains("bcx", true)));
+  }
+
+  @Test
+  public void writeTwice() throws IOException {
+    try (JsonResponseStreamer streamer = new JsonResponseStreamer(response)) {
+      streamer.write("xyz".getBytes(StandardCharsets.UTF_8));
+      streamer.write('\n');
+    }
+
+    verify(response).writeFrame(argThat(frameContains("xyz", false)));
+    verify(response).writeFrame(argThat(frameContains("\n", true)));
+  }
+
+  @Test
+  public void stopOnError() throws IOException {
+    try (JsonResponseStreamer streamer = new JsonResponseStreamer(failedResponse)) {
+      streamer.write("xyz".getBytes(StandardCharsets.UTF_8));
+      streamer.write('\n');
+      assertThatThrownBy(() -> streamer.write('\n')).isInstanceOf(IOException.class);
+    }
+
+    verify(failedResponse).writeFrame(argThat(frameContains("xyz", false)));
+    verify(failedResponse, never()).writeFrame(argThat(frameContains("\n", true)));
+  }
+
+  private ArgumentMatcher<WebSocketFrame> frameContains(final String text, final boolean isFinal) {
+    return frame -> frame.textData().equals(text) && frame.isFinal() == isFinal;
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/JsonRpcJWTTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/JsonRpcJWTTest.java
new file mode 100644
index 00000000000..66b82e73c6a
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/JsonRpcJWTTest.java
@@ -0,0 +1,433 @@
+/*
+ * Copyright Hyperledger Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.websocket;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+import static org.mockito.Mockito.spy;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.EngineJsonRpcService;
+import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
+import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.AuthenticationService;
+import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.EngineAuthService;
+import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService;
+import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService.HealthCheck;
+import org.hyperledger.besu.ethereum.api.jsonrpc.health.HealthService.ParamSource;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.MutableJsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods.WebSocketMethodsFactory;
+import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.nat.NatService;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import io.vertx.core.MultiMap;
+import io.vertx.core.Vertx;
+import io.vertx.core.http.HttpClient;
+import io.vertx.core.http.HttpClientOptions;
+import io.vertx.core.http.HttpClientRequest;
+import io.vertx.core.http.HttpHeaders;
+import io.vertx.core.http.HttpMethod;
+import io.vertx.core.http.WebSocket;
+import io.vertx.core.http.WebSocketConnectOptions;
+import io.vertx.core.json.Json;
+import io.vertx.ext.unit.Async;
+import io.vertx.ext.unit.TestContext;
+import io.vertx.ext.unit.junit.VertxUnitRunner;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+
+@RunWith(VertxUnitRunner.class)
+public class JsonRpcJWTTest {
+
+  @ClassRule public static final TemporaryFolder folder = new TemporaryFolder();
+  public static final String HOSTNAME = "127.0.0.1";
+
+  protected static Vertx vertx;
+
+  private final JsonRpcConfiguration jsonRpcConfiguration =
+      JsonRpcConfiguration.createEngineDefault();
+  private HttpClient httpClient;
+  private Optional<AuthenticationService> jwtAuth;
+  private HealthService healthy;
+  private EthScheduler scheduler;
+  private Path bufferDir;
+  private Map<String, JsonRpcMethod> websocketMethods;
+
+  @Before
+  public void initServerAndClient() {
+    jsonRpcConfiguration.setPort(0);
+    jsonRpcConfiguration.setHostsAllowlist(List.of("*"));
+    try {
+      jsonRpcConfiguration.setAuthenticationPublicKeyFile(
+          new File(this.getClass().getResource("jwt.hex").toURI()));
+    } catch (URISyntaxException e) {
+      fail("couldn't load jwt key from jwt.hex in classpath");
+    }
+    vertx = Vertx.vertx();
+
+    websocketMethods =
+        new WebSocketMethodsFactory(
+                new SubscriptionManager(new NoOpMetricsSystem()), new HashMap<>())
+            .methods();
+
+    bufferDir = null;
+    try {
+      bufferDir = Files.createTempDirectory("JsonRpcJWTTest").toAbsolutePath();
+    } catch (IOException e) {
+      fail("can't create tempdir", e);
+    }
+
+    jwtAuth =
+        Optional.of(
+            new EngineAuthService(
+                vertx,
+                Optional.ofNullable(jsonRpcConfiguration.getAuthenticationPublicKeyFile()),
+                bufferDir));
+
+    healthy =
+        new HealthService(
+            new HealthCheck() {
+              @Override
+              public boolean isHealthy(final ParamSource paramSource) {
+                return true;
+              }
+            });
+
+    scheduler = new EthScheduler(1, 1, 1, new NoOpMetricsSystem());
+  }
+
+  @After
+  public void after() {}
+
+  @Test
+  public void unauthenticatedWebsocketAllowedWithoutJWTAuth(final TestContext context) {
+
+    EngineJsonRpcService engineJsonRpcService =
+        new EngineJsonRpcService(
+            vertx,
+            bufferDir,
+            jsonRpcConfiguration,
+            new NoOpMetricsSystem(),
+            new NatService(Optional.empty(), true),
+            websocketMethods,
+            Optional.empty(),
+            scheduler,
+            Optional.empty(),
+            healthy,
+            healthy);
+
+    engineJsonRpcService.start().join();
+
+    final InetSocketAddress inetSocketAddress = engineJsonRpcService.socketAddress();
+    int listenPort = inetSocketAddress.getPort();
+
+    final HttpClientOptions httpClientOptions =
+        new HttpClientOptions().setDefaultHost(HOSTNAME).setDefaultPort(listenPort);
+
+    httpClient = vertx.createHttpClient(httpClientOptions);
+
+    WebSocketConnectOptions wsOpts = new WebSocketConnectOptions();
+    wsOpts.setPort(listenPort);
+    wsOpts.setHost(HOSTNAME);
+    wsOpts.setURI("/");
+
+    final Async async = context.async();
+    httpClient.webSocket(
+        wsOpts,
+        connected -> {
+          if (connected.failed()) {
+            connected.cause().printStackTrace();
+          }
+          assertThat(connected.succeeded()).isTrue();
+          WebSocket ws = connected.result();
+
+          JsonRpcRequest req =
+              new JsonRpcRequest("2.0", "eth_subscribe", List.of("syncing").toArray());
+          ws.frameHandler(
+              resp -> {
+                assertThat(resp.isText()).isTrue();
+                MutableJsonRpcSuccessResponse messageReply =
+                    Json.decodeValue(resp.textData(), MutableJsonRpcSuccessResponse.class);
+                assertThat(messageReply.getResult()).isEqualTo("0x1");
+                async.complete();
+              });
+          ws.writeTextMessage(Json.encode(req));
+        });
+
+    async.awaitSuccess(10000);
+    engineJsonRpcService.stop();
+    httpClient.close();
+  }
+
+  @Test
+  public void httpRequestWithDefaultHeaderAndValidJWTIsAccepted(final TestContext context) {
+
+    EngineJsonRpcService engineJsonRpcService =
+        new EngineJsonRpcService(
+            vertx,
+            bufferDir,
+            jsonRpcConfiguration,
+            new NoOpMetricsSystem(),
+            new NatService(Optional.empty(), true),
+            websocketMethods,
+            Optional.empty(),
+            scheduler,
+            jwtAuth,
+            healthy,
+            healthy);
+
+    engineJsonRpcService.start().join();
+
+    final InetSocketAddress inetSocketAddress = engineJsonRpcService.socketAddress();
+    int listenPort = inetSocketAddress.getPort();
+
+    final HttpClientOptions httpClientOptions =
+        new HttpClientOptions().setDefaultHost(HOSTNAME).setDefaultPort(listenPort);
+
+    httpClient = vertx.createHttpClient(httpClientOptions);
+
+    WebSocketConnectOptions wsOpts = new WebSocketConnectOptions();
+    wsOpts.setPort(listenPort);
+    wsOpts.setHost(HOSTNAME);
+    wsOpts.setURI("/");
+    wsOpts.addHeader(
+        "Authorization", "Bearer " + ((EngineAuthService) jwtAuth.get()).createToken());
+    wsOpts.addHeader(HttpHeaders.HOST, "anything");
+
+    final Async async = context.async();
+    httpClient.webSocket(
+        wsOpts,
+        connected -> {
+          if (connected.failed()) {
+            connected.cause().printStackTrace();
+          }
+          assertThat(connected.succeeded()).isTrue();
+          WebSocket ws = connected.result();
+          JsonRpcRequest req =
+              new JsonRpcRequest("1", "eth_subscribe", List.of("syncing").toArray());
+          ws.frameHandler(
+              resp -> {
+                assertThat(resp.isText()).isTrue();
+                System.out.println(resp.textData());
+                assertThat(resp.textData()).doesNotContain("error");
+                MutableJsonRpcSuccessResponse messageReply =
+                    Json.decodeValue(resp.textData(), MutableJsonRpcSuccessResponse.class);
+                assertThat(messageReply.getResult()).isEqualTo("0x1");
+                async.complete();
+              });
+          ws.writeTextMessage(Json.encode(req));
+        });
+
+    async.awaitSuccess(10000);
+    engineJsonRpcService.stop();
+    httpClient.close();
+  }
+
+  @Test
+  public void wsRequestFromBadHostAndValidJWTIsDenied(final TestContext context) {
+
+    JsonRpcConfiguration strictHost = JsonRpcConfiguration.createEngineDefault();
+    strictHost.setHostsAllowlist(List.of("localhost"));
+    strictHost.setPort(0);
+    try {
+      strictHost.setAuthenticationPublicKeyFile(
+          new File(this.getClass().getResource("jwt.hex").toURI()));
+    } catch (URISyntaxException e) {
+      fail("didn't parse jwt");
+    }
+
+    EngineJsonRpcService engineJsonRpcService =
+        spy(
+            new EngineJsonRpcService(
+                vertx,
+                bufferDir,
+                strictHost,
+                new NoOpMetricsSystem(),
+                new NatService(Optional.empty(), true),
+                websocketMethods,
+                Optional.empty(),
+                scheduler,
+                jwtAuth,
+                healthy,
+                healthy));
+
+    engineJsonRpcService.start().join();
+
+    final InetSocketAddress inetSocketAddress = engineJsonRpcService.socketAddress();
+    int listenPort = inetSocketAddress.getPort();
+
+    final HttpClientOptions httpClientOptions =
+        new HttpClientOptions().setDefaultHost(HOSTNAME).setDefaultPort(listenPort);
+
+    httpClient = vertx.createHttpClient(httpClientOptions);
+
+    WebSocketConnectOptions wsOpts = new WebSocketConnectOptions();
+    wsOpts.setPort(listenPort);
+    wsOpts.setHost(HOSTNAME);
+    wsOpts.setURI("/");
+    wsOpts.addHeader(
+        "Authorization", "Bearer " + ((EngineAuthService) jwtAuth.get()).createToken());
+    wsOpts.addHeader(HttpHeaders.HOST, "bogushost");
+
+    final Async async = context.async();
+    httpClient.webSocket(
+        wsOpts,
+        connected -> {
+          if (connected.failed()) {
+            connected.cause().printStackTrace();
+          }
+          assertThat(connected.succeeded()).isFalse();
+          async.complete();
+        });
+
+    async.awaitSuccess(10000);
+    engineJsonRpcService.stop();
+
+    httpClient.close();
+  }
+
+  @Test
+  public void httpRequestFromBadHostAndValidJWTIsDenied(final TestContext context) {
+
+    JsonRpcConfiguration strictHost = JsonRpcConfiguration.createEngineDefault();
+    strictHost.setHostsAllowlist(List.of("localhost"));
+    strictHost.setPort(0);
+    try {
+      strictHost.setAuthenticationPublicKeyFile(
+          new File(this.getClass().getResource("jwt.hex").toURI()));
+    } catch (URISyntaxException e) {
+      fail("didn't parse jwt");
+    }
+
+    EngineJsonRpcService engineJsonRpcService =
+        spy(
+            new EngineJsonRpcService(
+                vertx,
+                bufferDir,
+                strictHost,
+                new NoOpMetricsSystem(),
+                new NatService(Optional.empty(), true),
+                websocketMethods,
+                Optional.empty(),
+                scheduler,
+                jwtAuth,
+                healthy,
+                healthy));
+
+    engineJsonRpcService.start().join();
+
+    final InetSocketAddress inetSocketAddress = engineJsonRpcService.socketAddress();
+    int listenPort = inetSocketAddress.getPort();
+
+    final HttpClientOptions httpClientOptions =
+        new HttpClientOptions().setDefaultHost(HOSTNAME).setDefaultPort(listenPort);
+
+    httpClient = vertx.createHttpClient(httpClientOptions);
+
+    MultiMap headers =
+        HttpHeaders.set(
+                "Authorization", "Bearer " + ((EngineAuthService) jwtAuth.get()).createToken())
+            .set(HttpHeaders.HOST, "bogushost");
+
+    final Async async = context.async();
+    httpClient.request(
+        HttpMethod.GET,
+        "/",
+        connected -> {
+          if (connected.failed()) {
+            connected.cause().printStackTrace();
+          }
+          HttpClientRequest request = connected.result();
+          request.headers().addAll(headers);
+          request.send(
+              response -> {
+                assertThat(response.result().statusCode()).isNotEqualTo(500);
+                assertThat(response.result().statusCode()).isEqualTo(403);
+                async.complete();
+              });
+        });
+
+    async.awaitSuccess(10000);
+    engineJsonRpcService.stop();
+
+    httpClient.close();
+  }
+
+  @Test
+  public void httpRequestWithDefaultHeaderAndInvalidJWTIsDenied(final TestContext context) {
+
+    EngineJsonRpcService engineJsonRpcService =
+        new EngineJsonRpcService(
+            vertx,
+            bufferDir,
+            jsonRpcConfiguration,
+            new NoOpMetricsSystem(),
+            new NatService(Optional.empty(), true),
+            websocketMethods,
+            Optional.empty(),
+            scheduler,
+            jwtAuth,
+            healthy,
+            healthy);
+
+    engineJsonRpcService.start().join();
+
+    final InetSocketAddress inetSocketAddress = engineJsonRpcService.socketAddress();
+    int listenPort = inetSocketAddress.getPort();
+
+    final HttpClientOptions httpClientOptions =
+        new HttpClientOptions().setDefaultHost(HOSTNAME).setDefaultPort(listenPort);
+
+    httpClient = vertx.createHttpClient(httpClientOptions);
+
+    WebSocketConnectOptions wsOpts = new WebSocketConnectOptions();
+    wsOpts.setPort(listenPort);
+    wsOpts.setHost(HOSTNAME);
+    wsOpts.setURI("/");
+    wsOpts.addHeader("Authorization", "Bearer totallyunparseablenonsense");
+
+    final Async async = context.async();
+    httpClient.webSocket(
+        wsOpts,
+        connected -> {
+          if (connected.failed()) {
+            connected.cause().printStackTrace();
+          }
+          assertThat(connected.succeeded()).isFalse();
+          async.complete();
+        });
+
+    async.awaitSuccess(10000);
+    engineJsonRpcService.stop();
+    httpClient.close();
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketConfigurationTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketConfigurationTest.java
index a5c69cb0e57..7bfbcd844c2 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketConfigurationTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketConfigurationTest.java
@@ -15,9 +15,12 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.websocket;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis.DEFAULT_RPC_APIS;
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 
+import com.google.common.collect.Lists;
 import org.junit.Test;
 
 public class WebSocketConfigurationTest {
@@ -29,7 +32,35 @@ public void defaultConfiguration() {
     assertThat(configuration.isEnabled()).isFalse();
     assertThat(configuration.getHost()).isEqualTo("127.0.0.1");
     assertThat(configuration.getPort()).isEqualTo(8546);
+    assertThat(configuration.getRpcApis()).containsExactlyInAnyOrderElementsOf(DEFAULT_RPC_APIS);
+    assertThat(configuration.getRpcApisNoAuth()).isEmpty();
+    assertThat(configuration.getMaxActiveConnections())
+        .isEqualTo(WebSocketConfiguration.DEFAULT_MAX_ACTIVE_CONNECTIONS);
+  }
+
+  @Test
+  public void settingRpcApisShouldOverridePreviousValues() {
+    final WebSocketConfiguration configuration = WebSocketConfiguration.createDefault();
+
+    configuration.setRpcApis(Lists.newArrayList(RpcApis.ETH.name(), RpcApis.MINER.name()));
     assertThat(configuration.getRpcApis())
-        .containsExactlyInAnyOrder(RpcApis.ETH, RpcApis.NET, RpcApis.WEB3);
+        .containsExactly(RpcApis.ETH.name(), RpcApis.MINER.name());
+
+    configuration.setRpcApis(Lists.newArrayList(RpcApis.DEBUG.name()));
+    assertThat(configuration.getRpcApis()).containsExactly(RpcApis.DEBUG.name());
+  }
+
+  @Test
+  public void settingNoAuthRpcApisShouldOverridePreviousValues() {
+    final WebSocketConfiguration configuration = WebSocketConfiguration.createDefault();
+
+    configuration.setRpcApisNoAuth(
+        Lists.newArrayList(RpcMethod.ADMIN_ADD_PEER.name(), RpcMethod.ADMIN_PEERS.name()));
+    assertThat(configuration.getRpcApisNoAuth())
+        .containsExactly(RpcMethod.ADMIN_ADD_PEER.name(), RpcMethod.ADMIN_PEERS.name());
+
+    configuration.setRpcApisNoAuth(Lists.newArrayList(RpcMethod.MINER_SET_COINBASE.name()));
+    assertThat(configuration.getRpcApisNoAuth())
+        .containsExactly(RpcMethod.MINER_SET_COINBASE.name());
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketHostAllowlistTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketHostAllowlistTest.java
index feef7778946..afdc42fd057 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketHostAllowlistTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketHostAllowlistTest.java
@@ -20,6 +20,8 @@
 import static org.mockito.Mockito.spy;
 
 import org.hyperledger.besu.ethereum.api.handlers.TimeoutOptions;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.BaseJsonRpcProcessor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.JsonRpcExecutor;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods.WebSocketMethodsFactory;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager;
@@ -37,7 +39,7 @@
 import io.vertx.core.Vertx;
 import io.vertx.core.http.HttpClient;
 import io.vertx.core.http.HttpClientOptions;
-import io.vertx.core.http.HttpClientRequest;
+import io.vertx.core.http.HttpMethod;
 import io.vertx.ext.unit.Async;
 import io.vertx.ext.unit.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
@@ -59,7 +61,7 @@ public class WebSocketHostAllowlistTest {
 
   private final WebSocketConfiguration webSocketConfiguration =
       WebSocketConfiguration.createDefault();
-  private static WebSocketRequestHandler webSocketRequestHandlerSpy;
+  private static WebSocketMessageHandler webSocketMessageHandlerSpy;
   private WebSocketService websocketService;
   private HttpClient httpClient;
   private static final int VERTX_AWAIT_TIMEOUT_MILLIS = 10000;
@@ -74,16 +76,17 @@ public void initServerAndClient() {
         new WebSocketMethodsFactory(
                 new SubscriptionManager(new NoOpMetricsSystem()), new HashMap<>())
             .methods();
-    webSocketRequestHandlerSpy =
+    webSocketMessageHandlerSpy =
         spy(
-            new WebSocketRequestHandler(
+            new WebSocketMessageHandler(
                 vertx,
-                websocketMethods,
+                new JsonRpcExecutor(new BaseJsonRpcProcessor(), websocketMethods),
                 mock(EthScheduler.class),
                 TimeoutOptions.defaultOptions().getTimeoutSeconds()));
 
     websocketService =
-        new WebSocketService(vertx, webSocketConfiguration, webSocketRequestHandlerSpy);
+        new WebSocketService(
+            vertx, webSocketConfiguration, webSocketMessageHandlerSpy, new NoOpMetricsSystem());
     websocketService.start().join();
     final InetSocketAddress inetSocketAddress = websocketService.socketAddress();
 
@@ -98,7 +101,7 @@ public void initServerAndClient() {
 
   @After
   public void after() {
-    reset(webSocketRequestHandlerSpy);
+    reset(webSocketMessageHandlerSpy);
     websocketService.stop();
   }
 
@@ -179,7 +182,7 @@ public void websocketRequestWithMalformedHostIsRejected() {
   public void httpRequestWithMalformedHostIsRejected(final TestContext context) {
     webSocketConfiguration.setAuthenticationEnabled(false);
     webSocketConfiguration.setHostsAllowlist(hostsAllowlist);
-    doHttpRequestAndVerify(context, "ally:friend", 403);
+    doHttpRequestAndVerify(context, "ally:friend", 400);
     doHttpRequestAndVerify(context, "ally:123456", 403);
     doHttpRequestAndVerify(context, "ally:friend:1234", 403);
   }
@@ -188,19 +191,22 @@ private void doHttpRequestAndVerify(
       final TestContext context, final String hostname, final int expectedResponse) {
     final Async async = context.async();
 
-    final HttpClientRequest request =
-        httpClient.post(
-            websocketPort,
-            webSocketConfiguration.getHost(),
-            "/",
-            response -> {
-              assertThat(response.statusCode()).isEqualTo(expectedResponse);
-              async.complete();
-            });
-
-    request.putHeader("Host", hostname);
-    request.end();
-
+    httpClient.request(
+        HttpMethod.POST,
+        websocketPort,
+        webSocketConfiguration.getHost(),
+        "/",
+        request -> {
+          request.result().putHeader("Host", hostname);
+          request.result().end();
+          request
+              .result()
+              .send(
+                  response -> {
+                    assertThat(response.result().statusCode()).isEqualTo(expectedResponse);
+                    async.complete();
+                  });
+        });
     async.awaitSuccess(VERTX_AWAIT_TIMEOUT_MILLIS);
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketMessageHandlerTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketMessageHandlerTest.java
new file mode 100644
index 00000000000..5cfa997e465
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketMessageHandlerTest.java
@@ -0,0 +1,306 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.api.jsonrpc.websocket;
+
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.ethereum.api.handlers.TimeoutOptions;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.BaseJsonRpcProcessor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.JsonRpcExecutor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods.WebSocketRpcRequest;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+
+import io.vertx.core.Future;
+import io.vertx.core.Vertx;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.ServerWebSocket;
+import io.vertx.core.http.WebSocketFrame;
+import io.vertx.core.json.Json;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.unit.Async;
+import io.vertx.ext.unit.TestContext;
+import io.vertx.ext.unit.junit.VertxUnitRunner;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatcher;
+import org.mockito.Mockito;
+import org.mockito.stubbing.Answer;
+
+@RunWith(VertxUnitRunner.class)
+public class WebSocketMessageHandlerTest {
+
+  private static final int VERTX_AWAIT_TIMEOUT_MILLIS = 10000;
+
+  private Vertx vertx;
+  private WebSocketMessageHandler handler;
+  private JsonRpcMethod jsonRpcMethodMock;
+  private ServerWebSocket websocketMock;
+  private final Map<String, JsonRpcMethod> methods = new HashMap<>();
+
+  @Before
+  public void before(final TestContext context) {
+    vertx = Vertx.vertx();
+
+    jsonRpcMethodMock = mock(JsonRpcMethod.class);
+    websocketMock = mock(ServerWebSocket.class);
+
+    when(websocketMock.textHandlerID()).thenReturn(UUID.randomUUID().toString());
+
+    methods.put("eth_x", jsonRpcMethodMock);
+    handler =
+        new WebSocketMessageHandler(
+            vertx,
+            new JsonRpcExecutor(new BaseJsonRpcProcessor(), methods),
+            mock(EthScheduler.class),
+            TimeoutOptions.defaultOptions().getTimeoutSeconds());
+  }
+
+  @After
+  public void after(final TestContext context) {
+    Mockito.reset(jsonRpcMethodMock);
+    Mockito.reset(websocketMock);
+    vertx.close(context.asyncAssertSuccess());
+  }
+
+  @Test
+  public void handlerDeliversResponseSuccessfully(final TestContext context) {
+    final Async async = context.async();
+
+    final JsonObject requestJson = new JsonObject().put("id", 1).put("method", "eth_x");
+    final JsonRpcRequest requestBody = requestJson.mapTo(WebSocketRpcRequest.class);
+    final JsonRpcRequestContext expectedRequest = new JsonRpcRequestContext(requestBody);
+
+    final JsonRpcSuccessResponse expectedResponse =
+        new JsonRpcSuccessResponse(requestBody.getId(), null);
+
+    when(jsonRpcMethodMock.response(eq(expectedRequest))).thenReturn(expectedResponse);
+
+    when(websocketMock.writeFrame(argThat(this::isFinalFrame))).then(completeOnLastFrame(async));
+
+    handler.handle(websocketMock, requestJson.toBuffer(), Optional.empty());
+
+    async.awaitSuccess(WebSocketMessageHandlerTest.VERTX_AWAIT_TIMEOUT_MILLIS);
+
+    // can verify only after async not before
+    verify(websocketMock).writeFrame(argThat(isFrameWithText(Json.encode(expectedResponse))));
+    verify(websocketMock).writeFrame(argThat(this::isFinalFrame));
+    verify(jsonRpcMethodMock).response(eq(expectedRequest));
+  }
+
+  @Test
+  public void handlerBatchRequestDeliversResponseSuccessfully(final TestContext context) {
+    final Async async = context.async();
+
+    final JsonObject requestJson = new JsonObject().put("id", 1).put("method", "eth_x");
+    final JsonArray arrayJson = new JsonArray(List.of(requestJson, requestJson));
+    final JsonRpcRequest requestBody = requestJson.mapTo(WebSocketRpcRequest.class);
+    final JsonRpcRequestContext expectedRequest = new JsonRpcRequestContext(requestBody);
+    final JsonRpcSuccessResponse expectedSingleResponse =
+        new JsonRpcSuccessResponse(requestBody.getId(), null);
+
+    final JsonArray expectedBatchResponse =
+        new JsonArray(List.of(expectedSingleResponse, expectedSingleResponse));
+
+    when(jsonRpcMethodMock.response(eq(expectedRequest))).thenReturn(expectedSingleResponse);
+
+    when(websocketMock.writeFrame(argThat(this::isFinalFrame))).then(completeOnLastFrame(async));
+
+    handler.handle(websocketMock, arrayJson.toBuffer(), Optional.empty());
+
+    async.awaitSuccess(WebSocketMessageHandlerTest.VERTX_AWAIT_TIMEOUT_MILLIS);
+    // can verify only after async not before
+    verify(websocketMock).writeFrame(argThat(isFrameWithText(Json.encode(expectedBatchResponse))));
+    verify(websocketMock).writeFrame(argThat(this::isFinalFrame));
+    verify(jsonRpcMethodMock, Mockito.times(2)).response(eq(expectedRequest));
+  }
+
+  @Test
+  public void handlerBatchRequestContainingErrorsShouldRespondWithBatchErrors(
+      final TestContext context) {
+    ServerWebSocket websocketMock = mock(ServerWebSocket.class);
+
+    when(websocketMock.textHandlerID()).thenReturn(UUID.randomUUID().toString());
+
+    WebSocketMessageHandler handleBadCalls =
+        new WebSocketMessageHandler(
+            vertx,
+            new JsonRpcExecutor(new BaseJsonRpcProcessor(), methods),
+            mock(EthScheduler.class),
+            TimeoutOptions.defaultOptions().getTimeoutSeconds());
+
+    final Async async = context.async();
+
+    final JsonObject requestJson =
+        new JsonObject().put("id", 1).put("method", "eth_nonexistentMethod");
+    final JsonRpcErrorResponse expectedErrorResponse1 =
+        new JsonRpcErrorResponse(1, JsonRpcError.METHOD_NOT_FOUND);
+
+    final JsonArray arrayJson = new JsonArray(List.of(requestJson, requestJson));
+
+    final JsonArray expectedBatchResponse =
+        new JsonArray(List.of(expectedErrorResponse1, expectedErrorResponse1));
+
+    when(websocketMock.writeFrame(argThat(this::isFinalFrame))).then(completeOnLastFrame(async));
+
+    handleBadCalls.handle(websocketMock, arrayJson.toBuffer(), Optional.empty());
+
+    async.awaitSuccess(WebSocketMessageHandlerTest.VERTX_AWAIT_TIMEOUT_MILLIS);
+
+    // can verify only after async not before
+    verify(websocketMock).writeFrame(argThat(isFrameWithText(Json.encode(expectedBatchResponse))));
+    verify(websocketMock).writeFrame(argThat(this::isFinalFrame));
+    verifyNoInteractions(jsonRpcMethodMock);
+  }
+
+  @Test
+  public void jsonDecodeFailureShouldRespondInvalidRequest(final TestContext context) {
+    final Async async = context.async();
+
+    final JsonRpcErrorResponse expectedResponse =
+        new JsonRpcErrorResponse(null, JsonRpcError.INVALID_REQUEST);
+
+    when(websocketMock.writeFrame(argThat(this::isFinalFrame))).then(completeOnLastFrame(async));
+
+    handler.handle(websocketMock, Buffer.buffer(), Optional.empty());
+
+    async.awaitSuccess(VERTX_AWAIT_TIMEOUT_MILLIS);
+
+    // can verify only after async not before
+    verify(websocketMock).writeFrame(argThat(isFrameWithText(Json.encode(expectedResponse))));
+    verify(websocketMock).writeFrame(argThat(this::isFinalFrame));
+    verifyNoInteractions(jsonRpcMethodMock);
+  }
+
+  @Test
+  public void objectMapperFailureShouldRespondInvalidRequest(final TestContext context) {
+    final Async async = context.async();
+
+    final JsonRpcErrorResponse expectedResponse =
+        new JsonRpcErrorResponse(null, JsonRpcError.INVALID_REQUEST);
+
+    when(websocketMock.writeFrame(argThat(this::isFinalFrame))).then(completeOnLastFrame(async));
+
+    handler.handle(websocketMock, new JsonObject().toBuffer(), Optional.empty());
+
+    async.awaitSuccess(VERTX_AWAIT_TIMEOUT_MILLIS);
+
+    // can verify only after async not before
+    verify(websocketMock).writeFrame(argThat(isFrameWithText(Json.encode(expectedResponse))));
+    verify(websocketMock).writeFrame(argThat(this::isFinalFrame));
+    verifyNoInteractions(jsonRpcMethodMock);
+  }
+
+  @Test
+  public void absentMethodShouldRespondMethodNotFound(final TestContext context) {
+    final Async async = context.async();
+
+    final JsonObject requestJson =
+        new JsonObject().put("id", 1).put("method", "eth_nonexistentMethod");
+    final JsonRpcErrorResponse expectedResponse =
+        new JsonRpcErrorResponse(1, JsonRpcError.METHOD_NOT_FOUND);
+
+    when(websocketMock.writeFrame(argThat(this::isFinalFrame))).then(completeOnLastFrame(async));
+
+    handler.handle(websocketMock, requestJson.toBuffer(), Optional.empty());
+
+    async.awaitSuccess(WebSocketMessageHandlerTest.VERTX_AWAIT_TIMEOUT_MILLIS);
+
+    verify(websocketMock).writeFrame(argThat(isFrameWithText(Json.encode(expectedResponse))));
+    verify(websocketMock).writeFrame(argThat(this::isFinalFrame));
+    verifyNoInteractions(jsonRpcMethodMock);
+  }
+
+  @Test
+  public void onInvalidJsonRpcParametersExceptionProcessingRequestShouldRespondInvalidParams(
+      final TestContext context) {
+    final Async async = context.async();
+
+    final JsonObject requestJson = new JsonObject().put("id", 1).put("method", "eth_x");
+    final JsonRpcRequestContext expectedRequest =
+        new JsonRpcRequestContext(requestJson.mapTo(WebSocketRpcRequest.class));
+    when(jsonRpcMethodMock.response(eq(expectedRequest)))
+        .thenThrow(new InvalidJsonRpcParameters(""));
+    final JsonRpcErrorResponse expectedResponse =
+        new JsonRpcErrorResponse(1, JsonRpcError.INVALID_PARAMS);
+
+    when(websocketMock.writeFrame(argThat(this::isFinalFrame))).then(completeOnLastFrame(async));
+
+    handler.handle(websocketMock, requestJson.toBuffer(), Optional.empty());
+
+    async.awaitSuccess(WebSocketMessageHandlerTest.VERTX_AWAIT_TIMEOUT_MILLIS);
+
+    // can verify only after async not before
+    verify(websocketMock).writeFrame(argThat(isFrameWithText(Json.encode(expectedResponse))));
+    verify(websocketMock).writeFrame(argThat(this::isFinalFrame));
+  }
+
+  @Test
+  public void onExceptionProcessingRequestShouldRespondInternalError(final TestContext context) {
+    final Async async = context.async();
+
+    final JsonObject requestJson = new JsonObject().put("id", 1).put("method", "eth_x");
+    final JsonRpcRequestContext expectedRequest =
+        new JsonRpcRequestContext(requestJson.mapTo(WebSocketRpcRequest.class));
+    when(jsonRpcMethodMock.response(eq(expectedRequest))).thenThrow(new RuntimeException());
+    final JsonRpcErrorResponse expectedResponse =
+        new JsonRpcErrorResponse(1, JsonRpcError.INTERNAL_ERROR);
+
+    when(websocketMock.writeFrame(argThat(this::isFinalFrame))).then(completeOnLastFrame(async));
+
+    handler.handle(websocketMock, requestJson.toBuffer(), Optional.empty());
+
+    async.awaitSuccess(WebSocketMessageHandlerTest.VERTX_AWAIT_TIMEOUT_MILLIS);
+
+    // can verify only after async not before
+    verify(websocketMock).writeFrame(argThat(isFrameWithText(Json.encode(expectedResponse))));
+    verify(websocketMock).writeFrame(argThat(this::isFinalFrame));
+  }
+
+  private ArgumentMatcher<WebSocketFrame> isFrameWithText(final String text) {
+    return f -> f.isText() && f.textData().equals(text);
+  }
+
+  private boolean isFinalFrame(final WebSocketFrame frame) {
+    return frame.isFinal();
+  }
+
+  private Answer<Future<Void>> completeOnLastFrame(final Async async) {
+    return invocation -> {
+      async.complete();
+      return Future.succeededFuture();
+    };
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketRequestHandlerTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketRequestHandlerTest.java
deleted file mode 100644
index e4e3cd05ceb..00000000000
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketRequestHandlerTest.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.api.jsonrpc.websocket;
-
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.ethereum.api.handlers.TimeoutOptions;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods.WebSocketRpcRequest;
-import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import io.vertx.core.Vertx;
-import io.vertx.core.json.Json;
-import io.vertx.core.json.JsonArray;
-import io.vertx.core.json.JsonObject;
-import io.vertx.ext.unit.Async;
-import io.vertx.ext.unit.TestContext;
-import io.vertx.ext.unit.junit.VertxUnitRunner;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-
-@RunWith(VertxUnitRunner.class)
-public class WebSocketRequestHandlerTest {
-
-  private static final int VERTX_AWAIT_TIMEOUT_MILLIS = 10000;
-
-  private Vertx vertx;
-  private WebSocketRequestHandler handler;
-  private JsonRpcMethod jsonRpcMethodMock;
-  private final Map<String, JsonRpcMethod> methods = new HashMap<>();
-
-  @Before
-  public void before(final TestContext context) {
-    vertx = Vertx.vertx();
-
-    jsonRpcMethodMock = mock(JsonRpcMethod.class);
-
-    methods.put("eth_x", jsonRpcMethodMock);
-    handler =
-        new WebSocketRequestHandler(
-            vertx,
-            methods,
-            mock(EthScheduler.class),
-            TimeoutOptions.defaultOptions().getTimeoutSeconds());
-  }
-
-  @After
-  public void after(final TestContext context) {
-    Mockito.reset(jsonRpcMethodMock);
-    vertx.close(context.asyncAssertSuccess());
-  }
-
-  @Test
-  public void handlerDeliversResponseSuccessfully(final TestContext context) {
-    final Async async = context.async();
-
-    final JsonObject requestJson = new JsonObject().put("id", 1).put("method", "eth_x");
-    final JsonRpcRequest requestBody = requestJson.mapTo(WebSocketRpcRequest.class);
-    final JsonRpcRequestContext expectedRequest = new JsonRpcRequestContext(requestBody);
-
-    final JsonRpcSuccessResponse expectedResponse =
-        new JsonRpcSuccessResponse(requestBody.getId(), null);
-
-    when(jsonRpcMethodMock.response(eq(expectedRequest))).thenReturn(expectedResponse);
-
-    final String websocketId = UUID.randomUUID().toString();
-
-    vertx
-        .eventBus()
-        .consumer(websocketId)
-        .handler(
-            msg -> {
-              context.assertEquals(Json.encode(expectedResponse), msg.body());
-              async.complete();
-            })
-        .completionHandler(v -> handler.handle(websocketId, requestJson.toString()));
-
-    async.awaitSuccess(WebSocketRequestHandlerTest.VERTX_AWAIT_TIMEOUT_MILLIS);
-    // can verify only after async not before
-    verify(jsonRpcMethodMock).response(eq(expectedRequest));
-  }
-
-  @Test
-  public void handlerBatchRequestDeliversResponseSuccessfully(final TestContext context) {
-    final Async async = context.async();
-
-    final JsonObject requestJson = new JsonObject().put("id", 1).put("method", "eth_x");
-    final JsonArray arrayJson = new JsonArray(List.of(requestJson, requestJson));
-    final JsonRpcRequest requestBody = requestJson.mapTo(WebSocketRpcRequest.class);
-    final JsonRpcRequestContext expectedRequest = new JsonRpcRequestContext(requestBody);
-    final JsonRpcSuccessResponse expectedSingleResponse =
-        new JsonRpcSuccessResponse(requestBody.getId(), null);
-
-    final JsonArray expectedBatchResponse =
-        new JsonArray(List.of(expectedSingleResponse, expectedSingleResponse));
-
-    when(jsonRpcMethodMock.response(eq(expectedRequest))).thenReturn(expectedSingleResponse);
-
-    final String websocketId = UUID.randomUUID().toString();
-
-    vertx
-        .eventBus()
-        .consumer(websocketId)
-        .handler(
-            msg -> {
-              context.assertEquals(Json.encode(expectedBatchResponse), msg.body());
-              async.complete();
-            })
-        .completionHandler(v -> handler.handle(websocketId, arrayJson.toString()));
-
-    async.awaitSuccess(WebSocketRequestHandlerTest.VERTX_AWAIT_TIMEOUT_MILLIS);
-    // can verify only after async not before
-    verify(jsonRpcMethodMock, Mockito.times(2)).response(eq(expectedRequest));
-  }
-
-  @Test
-  public void handlerBatchRequestContainingErrorsShouldRespondWithBatchErrors(
-      final TestContext context) {
-    final Async async = context.async();
-
-    final JsonObject requestJson =
-        new JsonObject().put("id", 1).put("method", "eth_nonexistentMethod");
-    final JsonRpcErrorResponse expectedErrorResponse1 =
-        new JsonRpcErrorResponse(1, JsonRpcError.METHOD_NOT_FOUND);
-
-    final JsonArray arrayJson = new JsonArray(List.of(requestJson, ""));
-    final JsonRpcErrorResponse expectedErrorResponse2 =
-        new JsonRpcErrorResponse(null, JsonRpcError.INVALID_REQUEST);
-
-    final JsonArray expectedBatchResponse =
-        new JsonArray(List.of(expectedErrorResponse1, expectedErrorResponse2));
-
-    final String websocketId = UUID.randomUUID().toString();
-
-    vertx
-        .eventBus()
-        .consumer(websocketId)
-        .handler(
-            msg -> {
-              context.assertEquals(Json.encode(expectedBatchResponse), msg.body());
-              async.complete();
-            })
-        .completionHandler(v -> handler.handle(websocketId, arrayJson.toString()));
-
-    async.awaitSuccess(WebSocketRequestHandlerTest.VERTX_AWAIT_TIMEOUT_MILLIS);
-  }
-
-  @Test
-  public void jsonDecodeFailureShouldRespondInvalidRequest(final TestContext context) {
-    final Async async = context.async();
-
-    final JsonRpcErrorResponse expectedResponse =
-        new JsonRpcErrorResponse(null, JsonRpcError.INVALID_REQUEST);
-
-    final String websocketId = UUID.randomUUID().toString();
-
-    vertx
-        .eventBus()
-        .consumer(websocketId)
-        .handler(
-            msg -> {
-              context.assertEquals(Json.encode(expectedResponse), msg.body());
-              verifyZeroInteractions(jsonRpcMethodMock);
-              async.complete();
-            })
-        .completionHandler(v -> handler.handle(websocketId, ""));
-
-    async.awaitSuccess(VERTX_AWAIT_TIMEOUT_MILLIS);
-  }
-
-  @Test
-  public void objectMapperFailureShouldRespondInvalidRequest(final TestContext context) {
-    final Async async = context.async();
-
-    final JsonRpcErrorResponse expectedResponse =
-        new JsonRpcErrorResponse(null, JsonRpcError.INVALID_REQUEST);
-
-    final String websocketId = UUID.randomUUID().toString();
-
-    vertx
-        .eventBus()
-        .consumer(websocketId)
-        .handler(
-            msg -> {
-              context.assertEquals(Json.encode(expectedResponse), msg.body());
-              verifyZeroInteractions(jsonRpcMethodMock);
-              async.complete();
-            })
-        .completionHandler(v -> handler.handle(websocketId, "{}"));
-
-    async.awaitSuccess(VERTX_AWAIT_TIMEOUT_MILLIS);
-  }
-
-  @Test
-  public void absentMethodShouldRespondMethodNotFound(final TestContext context) {
-    final Async async = context.async();
-
-    final JsonObject requestJson =
-        new JsonObject().put("id", 1).put("method", "eth_nonexistentMethod");
-    final JsonRpcErrorResponse expectedResponse =
-        new JsonRpcErrorResponse(1, JsonRpcError.METHOD_NOT_FOUND);
-
-    final String websocketId = UUID.randomUUID().toString();
-
-    vertx
-        .eventBus()
-        .consumer(websocketId)
-        .handler(
-            msg -> {
-              context.assertEquals(Json.encode(expectedResponse), msg.body());
-              async.complete();
-            })
-        .completionHandler(v -> handler.handle(websocketId, requestJson.toString()));
-
-    async.awaitSuccess(WebSocketRequestHandlerTest.VERTX_AWAIT_TIMEOUT_MILLIS);
-  }
-
-  @Test
-  public void onInvalidJsonRpcParametersExceptionProcessingRequestShouldRespondInvalidParams(
-      final TestContext context) {
-    final Async async = context.async();
-
-    final JsonObject requestJson = new JsonObject().put("id", 1).put("method", "eth_x");
-    final JsonRpcRequestContext expectedRequest =
-        new JsonRpcRequestContext(requestJson.mapTo(WebSocketRpcRequest.class));
-    when(jsonRpcMethodMock.response(eq(expectedRequest)))
-        .thenThrow(new InvalidJsonRpcParameters(""));
-    final JsonRpcErrorResponse expectedResponse =
-        new JsonRpcErrorResponse(1, JsonRpcError.INVALID_PARAMS);
-
-    final String websocketId = UUID.randomUUID().toString();
-
-    vertx
-        .eventBus()
-        .consumer(websocketId)
-        .handler(
-            msg -> {
-              context.assertEquals(Json.encode(expectedResponse), msg.body());
-              async.complete();
-            })
-        .completionHandler(v -> handler.handle(websocketId, requestJson.toString()));
-
-    async.awaitSuccess(WebSocketRequestHandlerTest.VERTX_AWAIT_TIMEOUT_MILLIS);
-  }
-
-  @Test
-  public void onExceptionProcessingRequestShouldRespondInternalError(final TestContext context) {
-    final Async async = context.async();
-
-    final JsonObject requestJson = new JsonObject().put("id", 1).put("method", "eth_x");
-    final JsonRpcRequestContext expectedRequest =
-        new JsonRpcRequestContext(requestJson.mapTo(WebSocketRpcRequest.class));
-    when(jsonRpcMethodMock.response(eq(expectedRequest))).thenThrow(new RuntimeException());
-    final JsonRpcErrorResponse expectedResponse =
-        new JsonRpcErrorResponse(1, JsonRpcError.INTERNAL_ERROR);
-
-    final String websocketId = UUID.randomUUID().toString();
-
-    vertx
-        .eventBus()
-        .consumer(websocketId)
-        .handler(
-            msg -> {
-              context.assertEquals(Json.encode(expectedResponse), msg.body());
-              async.complete();
-            })
-        .completionHandler(v -> handler.handle(websocketId, requestJson.toString()));
-
-    async.awaitSuccess(WebSocketRequestHandlerTest.VERTX_AWAIT_TIMEOUT_MILLIS);
-  }
-}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketServiceLoginTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketServiceLoginTest.java
index 7067af9b452..4b9dc5e384a 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketServiceLoginTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketServiceLoginTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -22,54 +22,110 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.spy;
 
+import org.hyperledger.besu.config.StubGenesisConfigOptions;
+import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.handlers.TimeoutOptions;
+import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcConfiguration;
+import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcHttpService;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcApis;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.authentication.DefaultAuthenticationService;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.AuthenticatedJsonRpcProcessor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.BaseJsonRpcProcessor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.JsonRpcExecutor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.filter.FilterManager;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.methods.JsonRpcMethodsFactory;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods.WebSocketMethodsFactory;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager;
+import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.core.Synchronizer;
+import org.hyperledger.besu.ethereum.eth.EthProtocol;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
 import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule;
+import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
+import org.hyperledger.besu.nat.NatService;
 
+import java.math.BigInteger;
 import java.net.URISyntaxException;
 import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Base64;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 
 import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
-import io.vertx.core.MultiMap;
+import io.vertx.core.AsyncResult;
+import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
 import io.vertx.core.http.HttpClient;
 import io.vertx.core.http.HttpClientOptions;
 import io.vertx.core.http.HttpClientRequest;
-import io.vertx.core.http.RequestOptions;
-import io.vertx.core.http.impl.headers.VertxHttpHeaders;
+import io.vertx.core.http.HttpClientResponse;
+import io.vertx.core.http.HttpMethod;
+import io.vertx.core.http.WebSocketConnectOptions;
+import io.vertx.core.json.Json;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
+import io.vertx.ext.auth.JWTOptions;
 import io.vertx.ext.auth.User;
 import io.vertx.ext.auth.jwt.JWTAuth;
-import io.vertx.ext.jwt.JWTOptions;
 import io.vertx.ext.unit.Async;
 import io.vertx.ext.unit.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
 import org.assertj.core.api.Assertions;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.ClassRule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
 
 @RunWith(VertxUnitRunner.class)
 public class WebSocketServiceLoginTest {
   private static final int VERTX_AWAIT_TIMEOUT_MILLIS = 10000;
 
+  @ClassRule public static final TemporaryFolder folder = new TemporaryFolder();
+
   private Vertx vertx;
+  protected static Map<String, JsonRpcMethod> rpcMethods;
+  protected static JsonRpcHttpService service;
+  protected static OkHttpClient client;
+  protected static String baseUrl;
+  protected static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+  protected static final String CLIENT_VERSION = "TestClientVersion/0.1.0";
+  protected static final BigInteger CHAIN_ID = BigInteger.valueOf(123);
+  protected static P2PNetwork peerDiscoveryMock;
+  protected static BlockchainQueries blockchainQueries;
+  protected static Synchronizer synchronizer;
+  protected static final Collection<String> JSON_RPC_APIS =
+      Arrays.asList(
+          RpcApis.ETH.name(), RpcApis.NET.name(), RpcApis.WEB3.name(), RpcApis.ADMIN.name());
+  protected static final List<String> NO_AUTH_METHODS =
+      Arrays.asList(RpcMethod.NET_SERVICES.getMethodName());
+  protected static JWTAuth jwtAuth;
+  protected static final NatService natService = new NatService(Optional.empty());
   private WebSocketConfiguration websocketConfiguration;
-  private WebSocketRequestHandler webSocketRequestHandlerSpy;
+  private WebSocketMessageHandler webSocketMessageHandlerSpy;
   private WebSocketService websocketService;
   private HttpClient httpClient;
-  protected static JWTAuth jwtAuth;
 
   @Before
   public void before() throws URISyntaxException {
@@ -85,21 +141,71 @@ public void before() throws URISyntaxException {
     websocketConfiguration.setAuthenticationEnabled(true);
     websocketConfiguration.setAuthenticationCredentialsFile(authTomlPath);
     websocketConfiguration.setHostsAllowlist(Collections.singletonList("*"));
+    websocketConfiguration.setRpcApisNoAuth(new ArrayList<>(NO_AUTH_METHODS));
+    peerDiscoveryMock = mock(P2PNetwork.class);
+    blockchainQueries = mock(BlockchainQueries.class);
+    synchronizer = mock(Synchronizer.class);
+
+    final Set<Capability> supportedCapabilities = new HashSet<>();
+    supportedCapabilities.add(EthProtocol.ETH62);
+    supportedCapabilities.add(EthProtocol.ETH63);
+    final StubGenesisConfigOptions genesisConfigOptions =
+        new StubGenesisConfigOptions().constantinopleBlock(0).chainId(CHAIN_ID);
 
     final Map<String, JsonRpcMethod> websocketMethods =
         new WebSocketMethodsFactory(
                 new SubscriptionManager(new NoOpMetricsSystem()), new HashMap<>())
             .methods();
-    webSocketRequestHandlerSpy =
+
+    rpcMethods =
+        spy(
+            new JsonRpcMethodsFactory()
+                .methods(
+                    CLIENT_VERSION,
+                    CHAIN_ID,
+                    genesisConfigOptions,
+                    peerDiscoveryMock,
+                    blockchainQueries,
+                    synchronizer,
+                    MainnetProtocolSchedule.fromConfig(genesisConfigOptions),
+                    mock(ProtocolContext.class),
+                    mock(FilterManager.class),
+                    mock(TransactionPool.class),
+                    mock(PoWMiningCoordinator.class),
+                    new NoOpMetricsSystem(),
+                    supportedCapabilities,
+                    Optional.empty(),
+                    Optional.empty(),
+                    JSON_RPC_APIS,
+                    mock(PrivacyParameters.class),
+                    mock(JsonRpcConfiguration.class),
+                    mock(WebSocketConfiguration.class),
+                    mock(MetricsConfiguration.class),
+                    natService,
+                    new HashMap<>(),
+                    folder.getRoot().toPath(),
+                    mock(EthPeers.class),
+                    vertx,
+                    Optional.empty(),
+                    Optional.empty()));
+
+    websocketMethods.putAll(rpcMethods);
+    webSocketMessageHandlerSpy =
         spy(
-            new WebSocketRequestHandler(
+            new WebSocketMessageHandler(
                 vertx,
-                websocketMethods,
+                new JsonRpcExecutor(
+                    new AuthenticatedJsonRpcProcessor(
+                        new BaseJsonRpcProcessor(),
+                        DefaultAuthenticationService.create(vertx, websocketConfiguration).get(),
+                        websocketConfiguration.getRpcApisNoAuth()),
+                    websocketMethods),
                 mock(EthScheduler.class),
                 TimeoutOptions.defaultOptions().getTimeoutSeconds()));
 
     websocketService =
-        new WebSocketService(vertx, websocketConfiguration, webSocketRequestHandlerSpy);
+        new WebSocketService(
+            vertx, websocketConfiguration, webSocketMessageHandlerSpy, new NoOpMetricsSystem());
     websocketService.start().join();
     jwtAuth = websocketService.authenticationService.get().getJwtAuthProvider();
 
@@ -115,42 +221,46 @@ public void before() throws URISyntaxException {
 
   @After
   public void after() {
-    reset(webSocketRequestHandlerSpy);
+    reset(webSocketMessageHandlerSpy);
     websocketService.stop();
   }
 
   @Test
   public void loginWithBadCredentials(final TestContext context) {
     final Async async = context.async();
-    final HttpClientRequest request =
-        httpClient.post(
-            websocketConfiguration.getPort(),
-            websocketConfiguration.getHost(),
-            "/login",
-            response -> {
-              assertThat(response.statusCode()).isEqualTo(401);
-              assertThat(response.statusMessage()).isEqualTo("Unauthorized");
-              async.complete();
-            });
-    request.putHeader("Content-Type", "application/json; charset=utf-8");
-    request.end("{\"username\":\"user\",\"password\":\"pass\"}");
+    httpClient.request(
+        HttpMethod.POST,
+        websocketConfiguration.getPort(),
+        websocketConfiguration.getHost(),
+        "/login",
+        request -> {
+          request.result().putHeader("Content-Type", "application/json; charset=utf-8");
+          request.result().end("{\"username\":\"user\",\"password\":\"pass\"}");
+          request
+              .result()
+              .send(
+                  response -> {
+                    assertThat(response.result().statusCode()).isEqualTo(401);
+                    assertThat(response.result().statusMessage()).isEqualTo("Unauthorized");
+                    async.complete();
+                  });
+        });
+
     async.awaitSuccess(VERTX_AWAIT_TIMEOUT_MILLIS);
   }
 
   @Test
   public void loginWithGoodCredentials(final TestContext context) {
     final Async async = context.async();
-    final HttpClientRequest request =
-        httpClient.post(
-            websocketConfiguration.getPort(),
-            websocketConfiguration.getHost(),
-            "/login",
-            response -> {
-              assertThat(response.statusCode()).isEqualTo(200);
-              assertThat(response.statusMessage()).isEqualTo("OK");
-              assertThat(response.getHeader("Content-Type")).isNotNull();
-              assertThat(response.getHeader("Content-Type")).isEqualTo("application/json");
-              response.bodyHandler(
+    Handler<AsyncResult<HttpClientResponse>> responseHandler =
+        response -> {
+          assertThat(response.result().statusCode()).isEqualTo(200);
+          assertThat(response.result().statusMessage()).isEqualTo("OK");
+          assertThat(response.result().getHeader("Content-Type")).isNotNull();
+          assertThat(response.result().getHeader("Content-Type")).isEqualTo("application/json");
+          response
+              .result()
+              .bodyHandler(
                   buffer -> {
                     final String body = buffer.toString();
                     assertThat(body).isNotBlank();
@@ -158,13 +268,14 @@ public void loginWithGoodCredentials(final TestContext context) {
                     final JsonObject respBody = new JsonObject(body);
                     final String token = respBody.getString("token");
                     assertThat(token).isNotNull();
+                    assertThat(token).isNotEmpty();
 
                     websocketService
                         .authenticationService
                         .get()
                         .getJwtAuthProvider()
                         .authenticate(
-                            new JsonObject().put("jwt", token),
+                            new JsonObject().put("token", token),
                             (r) -> {
                               Assertions.assertThat(r.succeeded()).isTrue();
                               final User user = r.result();
@@ -189,9 +300,19 @@ public void loginWithGoodCredentials(final TestContext context) {
                                   });
                             });
                   });
-            });
-    request.putHeader("Content-Type", "application/json; charset=utf-8");
-    request.end("{\"username\":\"user\",\"password\":\"pegasys\"}");
+        };
+    Handler<AsyncResult<HttpClientRequest>> requestHandler =
+        request -> {
+          request.result().putHeader("Content-Type", "application/json; charset=utf-8");
+          request.result().end("{\"username\":\"user\",\"password\":\"pegasys\"}");
+          request.result().send(responseHandler);
+        };
+    httpClient.request(
+        HttpMethod.POST,
+        websocketConfiguration.getPort(),
+        websocketConfiguration.getHost(),
+        "/login",
+        requestHandler);
 
     async.awaitSuccess(VERTX_AWAIT_TIMEOUT_MILLIS);
   }
@@ -204,26 +325,55 @@ public void websocketServiceWithBadHeaderAuthenticationToken(final TestContext c
     final String expectedResponse =
         "{\"jsonrpc\":\"2.0\",\"id\":1,\"error\":{\"code\":-40100,\"message\":\"Unauthorized\"}}";
 
-    RequestOptions options = new RequestOptions();
+    WebSocketConnectOptions options = new WebSocketConnectOptions();
     options.setURI("/");
     options.setHost(websocketConfiguration.getHost());
     options.setPort(websocketConfiguration.getPort());
-    final MultiMap headers = new VertxHttpHeaders();
     String badtoken = "badtoken";
-    if (badtoken != null) {
-      headers.add("Authorization", "Bearer " + badtoken);
-    }
-    httpClient.websocket(
+    options.addHeader("Authorization", "Bearer " + badtoken);
+    httpClient.webSocket(
+        options,
+        webSocket -> {
+          webSocket.result().writeTextMessage(request);
+
+          webSocket
+              .result()
+              .handler(
+                  buffer -> {
+                    context.assertEquals(expectedResponse, buffer.toString());
+                    async.complete();
+                  });
+        });
+
+    async.awaitSuccess(VERTX_AWAIT_TIMEOUT_MILLIS);
+  }
+
+  @Test
+  public void netServicesSucceedWithNoAuth(final TestContext context) {
+    final Async async = context.async();
+
+    final String id = "123";
+    final String request =
+        "{\"jsonrpc\":\"2.0\",\"id\":" + Json.encode(id) + ",\"method\":\"net_services\"}";
+
+    final String expectedResponse = "{\"jsonrpc\":\"2.0\",\"id\":\"123\",\"result\":{}}";
+
+    WebSocketConnectOptions options = new WebSocketConnectOptions();
+    options.setURI("/");
+    options.setHost(websocketConfiguration.getHost());
+    options.setPort(websocketConfiguration.getPort());
+    httpClient.webSocket(
         options,
-        headers,
         webSocket -> {
-          webSocket.writeTextMessage(request);
+          webSocket.result().writeTextMessage(request);
 
-          webSocket.handler(
-              buffer -> {
-                context.assertEquals(expectedResponse, buffer.toString());
-                async.complete();
-              });
+          webSocket
+              .result()
+              .handler(
+                  buffer -> {
+                    context.assertEquals(expectedResponse, buffer.toString());
+                    async.complete();
+                  });
         });
 
     async.awaitSuccess(VERTX_AWAIT_TIMEOUT_MILLIS);
@@ -234,6 +384,7 @@ public void websocketServiceWithGoodHeaderAuthenticationToken(final TestContext
     final Async async = context.async();
 
     final JWTOptions jwtOptions = new JWTOptions().setExpiresInMinutes(5).setAlgorithm("RS256");
+
     final JsonObject jwtContents =
         new JsonObject().put("permissions", Lists.newArrayList("eth:*")).put("username", "user");
     final String goodToken = jwtAuth.generateToken(jwtContents, jwtOptions);
@@ -242,25 +393,25 @@ public void websocketServiceWithGoodHeaderAuthenticationToken(final TestContext
         "{\"id\": 1, \"method\": \"eth_subscribe\", \"params\": [\"syncing\"]}";
     final String expectedResponse = "{\"jsonrpc\":\"2.0\",\"id\":1,\"result\":\"0x1\"}";
 
-    RequestOptions options = new RequestOptions();
+    WebSocketConnectOptions options = new WebSocketConnectOptions();
     options.setURI("/");
     options.setHost(websocketConfiguration.getHost());
     options.setPort(websocketConfiguration.getPort());
-    final MultiMap headers = new VertxHttpHeaders();
     if (goodToken != null) {
-      headers.add("Authorization", "Bearer " + goodToken);
+      options.addHeader("Authorization", "Bearer " + goodToken);
     }
-    httpClient.websocket(
+    httpClient.webSocket(
         options,
-        headers,
         webSocket -> {
-          webSocket.writeTextMessage(requestSub);
+          webSocket.result().writeTextMessage(requestSub);
 
-          webSocket.handler(
-              buffer -> {
-                context.assertEquals(expectedResponse, buffer.toString());
-                async.complete();
-              });
+          webSocket
+              .result()
+              .handler(
+                  buffer -> {
+                    context.assertEquals(expectedResponse, buffer.toString());
+                    async.complete();
+                  });
         });
 
     async.awaitSuccess(VERTX_AWAIT_TIMEOUT_MILLIS);
@@ -269,42 +420,52 @@ public void websocketServiceWithGoodHeaderAuthenticationToken(final TestContext
   @Test
   public void loginPopulatesJWTPayloadWithRequiredValues(final TestContext context) {
     final Async async = context.async();
-    final HttpClientRequest request =
-        httpClient.post(
-            websocketConfiguration.getPort(),
-            websocketConfiguration.getHost(),
-            "/login",
-            response -> {
-              response.bodyHandler(
-                  buffer -> {
-                    final String body = buffer.toString();
-                    assertThat(body).isNotBlank();
-
-                    final JsonObject respBody = new JsonObject(body);
-                    final String token = respBody.getString("token");
-
-                    final JsonObject jwtPayload = decodeJwtPayload(token);
-                    assertThat(jwtPayload.getString("username")).isEqualTo("user");
-                    assertThat(jwtPayload.getJsonArray("permissions"))
-                        .isEqualTo(
-                            new JsonArray(
-                                list(
-                                    "fakePermission",
-                                    "eth:blockNumber",
-                                    "eth:subscribe",
-                                    "web3:*")));
-                    assertThat(jwtPayload.getString("privacyPublicKey"))
-                        .isEqualTo("A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=");
-                    assertThat(jwtPayload.containsKey("iat")).isTrue();
-                    assertThat(jwtPayload.containsKey("exp")).isTrue();
-                    final long tokenExpiry = jwtPayload.getLong("exp") - jwtPayload.getLong("iat");
-                    assertThat(tokenExpiry).isEqualTo(MINUTES.toSeconds(5));
-
-                    async.complete();
+    httpClient.request(
+        HttpMethod.POST,
+        websocketConfiguration.getPort(),
+        websocketConfiguration.getHost(),
+        "/login",
+        request -> {
+          request.result().putHeader("Content-Type", "application/json; charset=utf-8");
+          request.result().end("{\"username\":\"user\",\"password\":\"pegasys\"}");
+          request
+              .result()
+              .send(
+                  response -> {
+                    response
+                        .result()
+                        .bodyHandler(
+                            buffer -> {
+                              final String body = buffer.toString();
+                              assertThat(body).isNotBlank();
+
+                              final JsonObject respBody = new JsonObject(body);
+                              final String token = respBody.getString("token");
+
+                              final JsonObject jwtPayload = decodeJwtPayload(token);
+                              assertThat(jwtPayload.getString("username")).isEqualTo("user");
+                              assertThat(jwtPayload.getJsonArray("permissions"))
+                                  .isEqualTo(
+                                      new JsonArray(
+                                          list(
+                                              "fakePermission",
+                                              "eth:blockNumber",
+                                              "eth:subscribe",
+                                              "web3:*")));
+
+                              assertThat(jwtPayload.getString("privacyPublicKey"))
+                                  .isEqualTo("A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=");
+
+                              assertThat(jwtPayload.containsKey("iat")).isTrue();
+                              assertThat(jwtPayload.containsKey("exp")).isTrue();
+                              final long tokenExpiry =
+                                  jwtPayload.getLong("exp") - jwtPayload.getLong("iat");
+                              assertThat(tokenExpiry).isEqualTo(MINUTES.toSeconds(5));
+
+                              async.complete();
+                            });
                   });
-            });
-    request.putHeader("Content-Type", "application/json; charset=utf-8");
-    request.end("{\"username\":\"user\",\"password\":\"pegasys\"}");
+        });
 
     async.awaitSuccess(VERTX_AWAIT_TIMEOUT_MILLIS);
   }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketServiceTest.java
index a8229de2e83..6f26c513266 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketServiceTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketServiceTest.java
@@ -21,9 +21,12 @@
 import static org.mockito.Mockito.verifyNoInteractions;
 
 import org.hyperledger.besu.ethereum.api.handlers.TimeoutOptions;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.BaseJsonRpcProcessor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.JsonRpcExecutor;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods.WebSocketMethodsFactory;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager;
+import org.hyperledger.besu.ethereum.api.util.TestJsonRpcMethodsUtil;
 import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 
@@ -36,11 +39,10 @@
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.HttpClient;
 import io.vertx.core.http.HttpClientOptions;
-import io.vertx.core.http.HttpClientRequest;
-import io.vertx.core.http.HttpServerOptions;
+import io.vertx.core.http.HttpMethod;
 import io.vertx.core.http.WebSocket;
-import io.vertx.core.http.WebSocketBase;
 import io.vertx.core.http.WebSocketFrame;
+import io.vertx.core.json.JsonObject;
 import io.vertx.ext.unit.Async;
 import io.vertx.ext.unit.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
@@ -56,9 +58,12 @@ public class WebSocketServiceTest {
 
   private Vertx vertx;
   private WebSocketConfiguration websocketConfiguration;
-  private WebSocketRequestHandler webSocketRequestHandlerSpy;
+  private WebSocketMessageHandler webSocketMessageHandlerSpy;
+  private Map<String, JsonRpcMethod> websocketMethods;
   private WebSocketService websocketService;
   private HttpClient httpClient;
+  private final int maxConnections = 3;
+  private final int maxFrameSize = 1024 * 1024;
 
   @Before
   public void before() {
@@ -67,21 +72,24 @@ public void before() {
     websocketConfiguration = WebSocketConfiguration.createDefault();
     websocketConfiguration.setPort(0);
     websocketConfiguration.setHostsAllowlist(Collections.singletonList("*"));
+    websocketConfiguration.setMaxActiveConnections(maxConnections);
+    websocketConfiguration.setMaxFrameSize(maxFrameSize);
 
-    final Map<String, JsonRpcMethod> websocketMethods =
+    websocketMethods =
         new WebSocketMethodsFactory(
                 new SubscriptionManager(new NoOpMetricsSystem()), new HashMap<>())
             .methods();
-    webSocketRequestHandlerSpy =
+    webSocketMessageHandlerSpy =
         spy(
-            new WebSocketRequestHandler(
+            new WebSocketMessageHandler(
                 vertx,
-                websocketMethods,
+                new JsonRpcExecutor(new BaseJsonRpcProcessor(), websocketMethods),
                 mock(EthScheduler.class),
                 TimeoutOptions.defaultOptions().getTimeoutSeconds()));
 
     websocketService =
-        new WebSocketService(vertx, websocketConfiguration, webSocketRequestHandlerSpy);
+        new WebSocketService(
+            vertx, websocketConfiguration, webSocketMessageHandlerSpy, new NoOpMetricsSystem());
     websocketService.start().join();
 
     websocketConfiguration.setPort(websocketService.socketAddress().getPort());
@@ -96,10 +104,49 @@ public void before() {
 
   @After
   public void after() {
-    reset(webSocketRequestHandlerSpy);
+    reset(webSocketMessageHandlerSpy);
     websocketService.stop();
   }
 
+  @Test
+  public void limitActiveConnections(final TestContext context) {
+    // expecting maxConnections successful responses
+    final Async asyncResponse = context.async(maxConnections);
+    // and a number of rejections
+    final int countRejections = 2;
+    final Async asyncRejected = context.async(countRejections);
+
+    final String request = "{\"id\": 1, \"method\": \"eth_subscribe\", \"params\": [\"syncing\"]}";
+    // the number in the response is the subscription ID, so in successive responses this increments
+    final String expectedResponse1 = "{\"jsonrpc\":\"2.0\",\"id\":1,\"result\":\"0x1\"}";
+
+    // attempt to exceed max connections - but only maxConnections should succeed
+    for (int i = 0; i < maxConnections + countRejections; i++) {
+      httpClient.webSocket(
+          "/",
+          future -> {
+            if (future.succeeded()) {
+              WebSocket ws = future.result();
+              ws.handler(
+                  buffer -> {
+                    context.assertNotNull(buffer.toString());
+                    // assert a successful response
+                    context.assertTrue(
+                        buffer.toString().startsWith(expectedResponse1.substring(0, 36)));
+                    asyncResponse.countDown();
+                  });
+              ws.writeTextMessage(request);
+            } else {
+              // count down the rejected WS connections
+              asyncRejected.countDown();
+            }
+          });
+    }
+    // wait for successful responses AND rejected connections
+    asyncResponse.awaitSuccess(VERTX_AWAIT_TIMEOUT_MILLIS);
+    asyncRejected.awaitSuccess(VERTX_AWAIT_TIMEOUT_MILLIS);
+  }
+
   @Test
   public void websocketServiceExecutesHandlerOnMessage(final TestContext context) {
     final Async async = context.async();
@@ -107,16 +154,45 @@ public void websocketServiceExecutesHandlerOnMessage(final TestContext context)
     final String request = "{\"id\": 1, \"method\": \"eth_subscribe\", \"params\": [\"syncing\"]}";
     final String expectedResponse = "{\"jsonrpc\":\"2.0\",\"id\":1,\"result\":\"0x1\"}";
 
-    httpClient.websocket(
+    httpClient.webSocket(
         "/",
-        webSocket -> {
-          webSocket.handler(
-              buffer -> {
-                context.assertEquals(expectedResponse, buffer.toString());
-                async.complete();
-              });
+        future -> {
+          if (future.succeeded()) {
+            WebSocket ws = future.result();
+            ws.handler(
+                buffer -> {
+                  context.assertEquals(expectedResponse, buffer.toString());
+                  async.complete();
+                });
+
+            ws.writeTextMessage(request);
+          } else {
+            context.fail("websocket connection failed");
+          }
+        });
 
-          webSocket.writeTextMessage(request);
+    async.awaitSuccess(VERTX_AWAIT_TIMEOUT_MILLIS);
+  }
+
+  @Test
+  public void websocketServiceHandlesBinaryFrames(final TestContext context) {
+    final Async async = context.async();
+
+    httpClient.webSocket(
+        "/",
+        future -> {
+          if (future.succeeded()) {
+            WebSocket ws = future.result();
+            final JsonObject requestJson = new JsonObject().put("id", 1).put("method", "eth_x");
+            ws.handler(
+                // we don't really care what the response is
+                buffer -> {
+                  async.complete();
+                });
+            ws.writeFinalBinaryFrame(Buffer.buffer(requestJson.toString()));
+          } else {
+            context.fail("websocket connection failed");
+          }
         });
 
     async.awaitSuccess(VERTX_AWAIT_TIMEOUT_MILLIS);
@@ -134,7 +210,13 @@ public void websocketServiceRemoveSubscriptionOnConnectionClose(final TestContex
               context.assertNotNull(m.body());
               async.complete();
             })
-        .completionHandler(v -> httpClient.websocket("/", WebSocketBase::close));
+        .completionHandler(
+            v ->
+                httpClient.webSocket(
+                    "/",
+                    websocket -> {
+                      websocket.result().close();
+                    }));
 
     async.awaitSuccess(VERTX_AWAIT_TIMEOUT_MILLIS);
   }
@@ -143,14 +225,19 @@ public void websocketServiceRemoveSubscriptionOnConnectionClose(final TestContex
   public void websocketServiceCloseConnectionOnUnrecoverableError(final TestContext context) {
     final Async async = context.async();
 
-    final byte[] bigMessage = new byte[HttpServerOptions.DEFAULT_MAX_WEBSOCKET_MESSAGE_SIZE + 1];
+    final byte[] bigMessage = new byte[maxFrameSize + 1];
     Arrays.fill(bigMessage, (byte) 1);
 
-    httpClient.websocket(
+    httpClient.webSocket(
         "/",
-        webSocket -> {
-          webSocket.write(Buffer.buffer(bigMessage));
-          webSocket.closeHandler(v -> async.complete());
+        future -> {
+          if (future.succeeded()) {
+            WebSocket ws = future.result();
+            ws.write(Buffer.buffer(bigMessage));
+            ws.closeHandler(v -> async.complete());
+          } else {
+            context.fail("websocket connection failed");
+          }
         });
 
     async.awaitSuccess(VERTX_AWAIT_TIMEOUT_MILLIS);
@@ -161,42 +248,54 @@ public void websocketServiceCloseConnectionOnUnrecoverableError(final TestContex
   public void websocketServiceMustReturnErrorOnHttpRequest(final TestContext context) {
     final Async async = context.async();
 
-    httpClient
-        .post(
-            websocketConfiguration.getPort(),
-            websocketConfiguration.getHost(),
-            "/",
-            response ->
-                response.bodyHandler(
-                    b -> {
-                      context
-                          .assertEquals(400, response.statusCode())
-                          .assertEquals(
-                              "Websocket endpoint can't handle HTTP requests", b.toString());
-                      async.complete();
-                    }))
-        .end();
-
+    httpClient.request(
+        HttpMethod.POST,
+        websocketConfiguration.getPort(),
+        websocketConfiguration.getHost(),
+        "/",
+        request -> {
+          request
+              .result()
+              .send(
+                  response ->
+                      response
+                          .result()
+                          .bodyHandler(
+                              b -> {
+                                context
+                                    .assertEquals(400, response.result().statusCode())
+                                    .assertEquals(
+                                        "Websocket endpoint can't handle HTTP requests",
+                                        b.toString());
+                                async.complete();
+                              }));
+        });
     async.awaitSuccess(VERTX_AWAIT_TIMEOUT_MILLIS);
   }
 
   @Test
   public void handleLoginRequestWithAuthDisabled() {
-    final HttpClientRequest request =
-        httpClient.post(
-            websocketConfiguration.getPort(),
-            websocketConfiguration.getHost(),
-            "/login",
-            response -> {
-              assertThat(response.statusCode()).isEqualTo(400);
-              assertThat(response.statusMessage()).isEqualTo("Authentication not enabled");
-            });
-    request.putHeader("Content-Type", "application/json; charset=utf-8");
-    request.end("{\"username\":\"user\",\"password\":\"pass\"}");
+    httpClient.request(
+        HttpMethod.POST,
+        websocketConfiguration.getPort(),
+        websocketConfiguration.getHost(),
+        "/login",
+        request -> {
+          request.result().putHeader("Content-Type", "application/json; charset=utf-8");
+          request.result().end("{\"username\":\"user\",\"password\":\"pass\"}");
+          request
+              .result()
+              .send(
+                  response -> {
+                    assertThat(response.result().statusCode()).isEqualTo(400);
+                    assertThat(response.result().statusMessage())
+                        .isEqualTo("Authentication not enabled");
+                  });
+        });
   }
 
   @Test
-  public void webSocketDoesNotToHandlePingPayloadAsJsonRpcRequest(final TestContext context) {
+  public void webSocketDoesNotHandlePingPayloadAsJsonRpcRequest(final TestContext context) {
     final Async async = context.async();
 
     httpClient.webSocket(
@@ -214,7 +313,7 @@ public void webSocketDoesNotToHandlePingPayloadAsJsonRpcRequest(final TestContex
 
           websocket.closeHandler(
               h -> {
-                verifyNoInteractions(webSocketRequestHandlerSpy);
+                verifyNoInteractions(webSocketMessageHandlerSpy);
                 async.complete();
               });
 
@@ -224,4 +323,66 @@ public void webSocketDoesNotToHandlePingPayloadAsJsonRpcRequest(final TestContex
 
     async.awaitSuccess(VERTX_AWAIT_TIMEOUT_MILLIS);
   }
+
+  @Test
+  public void handleResponseWithOptionalEmptyValue(final TestContext context) {
+    final Async async = context.async();
+    final JsonRpcMethod method = TestJsonRpcMethodsUtil.optionalEmptyResponse();
+    websocketMethods.put(method.getName(), method);
+
+    final String request =
+        "{\"id\": 1, \"method\": \"" + method.getName() + "\", \"params\": [\"syncing\"]}";
+    final String expectedResponse = "{\"jsonrpc\":\"2.0\",\"id\":1,\"result\":null}";
+
+    httpClient.webSocket(
+        "/",
+        future -> {
+          if (future.succeeded()) {
+            WebSocket ws = future.result();
+            ws.handler(
+                buffer -> {
+                  context.assertEquals(expectedResponse, buffer.toString());
+                  async.complete();
+                });
+
+            ws.writeTextMessage(request);
+          } else {
+            context.fail("websocket connection failed");
+          }
+        });
+
+    async.awaitSuccess(VERTX_AWAIT_TIMEOUT_MILLIS);
+    async.handler((result) -> websocketMethods.remove(method.getName()));
+  }
+
+  @Test
+  public void handleResponseWithOptionalExistingValue(final TestContext context) {
+    final Async async = context.async();
+    final JsonRpcMethod method = TestJsonRpcMethodsUtil.optionalResponseWithValue("foo");
+    websocketMethods.put(method.getName(), method);
+
+    final String request =
+        "{\"id\": 1, \"method\": \"" + method.getName() + "\", \"params\": [\"syncing\"]}";
+    final String expectedResponse = "{\"jsonrpc\":\"2.0\",\"id\":1,\"result\":\"foo\"}";
+
+    httpClient.webSocket(
+        "/",
+        future -> {
+          if (future.succeeded()) {
+            WebSocket ws = future.result();
+            ws.handler(
+                buffer -> {
+                  context.assertEquals(expectedResponse, buffer.toString());
+                  async.complete();
+                });
+
+            ws.writeTextMessage(request);
+          } else {
+            context.fail("websocket connection failed");
+          }
+        });
+
+    async.awaitSuccess(VERTX_AWAIT_TIMEOUT_MILLIS);
+    async.handler((result) -> websocketMethods.remove(method.getName()));
+  }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthSubscribeIntegrationTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthSubscribeIntegrationTest.java
index df7c2c25217..e4656c1d2e6 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthSubscribeIntegrationTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthSubscribeIntegrationTest.java
@@ -15,10 +15,17 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.ethereum.api.handlers.TimeoutOptions;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.BaseJsonRpcProcessor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.JsonRpcExecutor;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
-import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketRequestHandler;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketMessageHandler;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.Subscription;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType;
@@ -28,24 +35,30 @@
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
+import io.vertx.core.Future;
 import io.vertx.core.Vertx;
+import io.vertx.core.http.ServerWebSocket;
+import io.vertx.core.http.WebSocketFrame;
 import io.vertx.core.json.Json;
 import io.vertx.ext.unit.Async;
 import io.vertx.ext.unit.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
-import org.assertj.core.api.Assertions;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatcher;
 import org.mockito.Mockito;
+import org.mockito.stubbing.Answer;
 
 @RunWith(VertxUnitRunner.class)
 public class EthSubscribeIntegrationTest {
 
   private Vertx vertx;
-  private WebSocketRequestHandler webSocketRequestHandler;
+  private WebSocketMessageHandler webSocketMessageHandler;
   private SubscriptionManager subscriptionManager;
   private WebSocketMethodsFactory webSocketMethodsFactory;
   private final int ASYNC_TIMEOUT = 5000;
@@ -57,10 +70,10 @@ public void before() {
     vertx = Vertx.vertx();
     subscriptionManager = new SubscriptionManager(new NoOpMetricsSystem());
     webSocketMethodsFactory = new WebSocketMethodsFactory(subscriptionManager, new HashMap<>());
-    webSocketRequestHandler =
-        new WebSocketRequestHandler(
+    webSocketMessageHandler =
+        new WebSocketMessageHandler(
             vertx,
-            webSocketMethodsFactory.methods(),
+            new JsonRpcExecutor(new BaseJsonRpcProcessor(), webSocketMethodsFactory.methods()),
             Mockito.mock(EthScheduler.class),
             TimeoutOptions.defaultOptions().getTimeoutSeconds());
   }
@@ -71,22 +84,24 @@ public void shouldAddConnectionToMap(final TestContext context) {
 
     final JsonRpcRequest subscribeRequestBody = createEthSubscribeRequestBody(CONNECTION_ID_1);
 
-    vertx
-        .eventBus()
-        .consumer(CONNECTION_ID_1)
-        .handler(
-            msg -> {
-              final List<SyncingSubscription> syncingSubscriptions = getSubscriptions();
-              assertThat(syncingSubscriptions).hasSize(1);
-              Assertions.assertThat(syncingSubscriptions.get(0).getConnectionId())
-                  .isEqualTo(CONNECTION_ID_1);
-              async.complete();
-            })
-        .completionHandler(
-            v ->
-                webSocketRequestHandler.handle(CONNECTION_ID_1, Json.encode(subscribeRequestBody)));
+    final JsonRpcSuccessResponse expectedResponse =
+        new JsonRpcSuccessResponse(subscribeRequestBody.getId(), "0x1");
+
+    final ServerWebSocket websocketMock = mock(ServerWebSocket.class);
+    when(websocketMock.textHandlerID()).thenReturn(CONNECTION_ID_1);
+    when(websocketMock.writeFrame(argThat(this::isFinalFrame)))
+        .then(completeOnLastFrame(async, websocketMock));
+
+    webSocketMessageHandler.handle(
+        websocketMock, Json.encodeToBuffer(subscribeRequestBody), Optional.empty());
 
     async.awaitSuccess(ASYNC_TIMEOUT);
+
+    final List<SyncingSubscription> syncingSubscriptions = getSubscriptions();
+    assertThat(syncingSubscriptions).hasSize(1);
+    assertThat(syncingSubscriptions.get(0).getConnectionId()).isEqualTo(CONNECTION_ID_1);
+    verify(websocketMock).writeFrame(argThat(isFrameWithAnyText(Json.encode(expectedResponse))));
+    verify(websocketMock).writeFrame(argThat(this::isFinalFrame));
   }
 
   @Test
@@ -96,43 +111,47 @@ public void shouldAddMultipleConnectionsToMap(final TestContext context) {
     final JsonRpcRequest subscribeRequestBody1 = createEthSubscribeRequestBody(CONNECTION_ID_1);
     final JsonRpcRequest subscribeRequestBody2 = createEthSubscribeRequestBody(CONNECTION_ID_2);
 
-    vertx
-        .eventBus()
-        .consumer(CONNECTION_ID_1)
-        .handler(
-            msg -> {
-              final List<SyncingSubscription> subscriptions = getSubscriptions();
-              assertThat(subscriptions).hasSize(1);
-              Assertions.assertThat(subscriptions.get(0).getConnectionId())
-                  .isEqualTo(CONNECTION_ID_1);
-              async.countDown();
-
-              vertx
-                  .eventBus()
-                  .consumer(CONNECTION_ID_2)
-                  .handler(
-                      msg2 -> {
-                        final List<SyncingSubscription> updatedSubscriptions = getSubscriptions();
-                        assertThat(updatedSubscriptions).hasSize(2);
-                        final List<String> connectionIds =
-                            updatedSubscriptions.stream()
-                                .map(Subscription::getConnectionId)
-                                .collect(Collectors.toList());
-                        assertThat(connectionIds)
-                            .containsExactlyInAnyOrder(CONNECTION_ID_1, CONNECTION_ID_2);
-                        async.countDown();
-                      })
-                  .completionHandler(
-                      v ->
-                          webSocketRequestHandler.handle(
-                              CONNECTION_ID_2, Json.encode(subscribeRequestBody2)));
-            })
-        .completionHandler(
-            v ->
-                webSocketRequestHandler.handle(
-                    CONNECTION_ID_1, Json.encode(subscribeRequestBody1)));
+    final JsonRpcSuccessResponse expectedResponse1 =
+        new JsonRpcSuccessResponse(subscribeRequestBody1.getId(), "0x1");
+    final JsonRpcSuccessResponse expectedResponse2 =
+        new JsonRpcSuccessResponse(subscribeRequestBody2.getId(), "0x2");
+
+    final ServerWebSocket websocketMock1 = mock(ServerWebSocket.class);
+    when(websocketMock1.textHandlerID()).thenReturn(CONNECTION_ID_1);
+    when(websocketMock1.writeFrame(argThat(this::isFinalFrame))).then(countDownOnLastFrame(async));
+
+    final ServerWebSocket websocketMock2 = mock(ServerWebSocket.class);
+    when(websocketMock2.textHandlerID()).thenReturn(CONNECTION_ID_2);
+    when(websocketMock2.writeFrame(argThat(this::isFinalFrame))).then(countDownOnLastFrame(async));
+
+    webSocketMessageHandler.handle(
+        websocketMock1, Json.encodeToBuffer(subscribeRequestBody1), Optional.empty());
+    webSocketMessageHandler.handle(
+        websocketMock2, Json.encodeToBuffer(subscribeRequestBody2), Optional.empty());
 
     async.awaitSuccess(ASYNC_TIMEOUT);
+
+    final List<SyncingSubscription> updatedSubscriptions = getSubscriptions();
+    assertThat(updatedSubscriptions).hasSize(2);
+    final List<String> connectionIds =
+        updatedSubscriptions.stream()
+            .map(Subscription::getConnectionId)
+            .collect(Collectors.toList());
+    assertThat(connectionIds).containsExactlyInAnyOrder(CONNECTION_ID_1, CONNECTION_ID_2);
+
+    verify(websocketMock1)
+        .writeFrame(
+            argThat(
+                isFrameWithAnyText(
+                    Json.encode(expectedResponse1), Json.encode(expectedResponse2))));
+    verify(websocketMock1).writeFrame(argThat(this::isFinalFrame));
+
+    verify(websocketMock2)
+        .writeFrame(
+            argThat(
+                isFrameWithAnyText(
+                    Json.encode(expectedResponse1), Json.encode(expectedResponse2))));
+    verify(websocketMock2).writeFrame(argThat(this::isFinalFrame));
   }
 
   private List<SyncingSubscription> getSubscriptions() {
@@ -147,4 +166,27 @@ private WebSocketRpcRequest createEthSubscribeRequestBody(final String connectio
             + "\"}",
         WebSocketRpcRequest.class);
   }
+
+  private ArgumentMatcher<WebSocketFrame> isFrameWithAnyText(final String... text) {
+    return f -> f.isText() && Stream.of(text).anyMatch(t -> t.equals(f.textData()));
+  }
+
+  private boolean isFinalFrame(final WebSocketFrame frame) {
+    return frame.isFinal();
+  }
+
+  private Answer<ServerWebSocket> completeOnLastFrame(
+      final Async async, final ServerWebSocket websocket) {
+    return invocation -> {
+      async.complete();
+      return websocket;
+    };
+  }
+
+  private Answer<Future<Void>> countDownOnLastFrame(final Async async) {
+    return invocation -> {
+      async.countDown();
+      return Future.succeededFuture();
+    };
+  }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribeIntegrationTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribeIntegrationTest.java
index db16e897ed3..ff8212d7b34 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribeIntegrationTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/EthUnsubscribeIntegrationTest.java
@@ -15,11 +15,17 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.ethereum.api.handlers.TimeoutOptions;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.BaseJsonRpcProcessor;
+import org.hyperledger.besu.ethereum.api.jsonrpc.execution.JsonRpcExecutor;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
-import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketRequestHandler;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.WebSocketMessageHandler;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscribeRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType;
@@ -27,8 +33,12 @@
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 
 import java.util.HashMap;
+import java.util.Optional;
 
+import io.vertx.core.Future;
 import io.vertx.core.Vertx;
+import io.vertx.core.http.ServerWebSocket;
+import io.vertx.core.http.WebSocketFrame;
 import io.vertx.core.json.Json;
 import io.vertx.ext.unit.Async;
 import io.vertx.ext.unit.TestContext;
@@ -36,12 +46,14 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatcher;
+import org.mockito.stubbing.Answer;
 
 @RunWith(VertxUnitRunner.class)
 public class EthUnsubscribeIntegrationTest {
 
   private Vertx vertx;
-  private WebSocketRequestHandler webSocketRequestHandler;
+  private WebSocketMessageHandler webSocketMessageHandler;
   private SubscriptionManager subscriptionManager;
   private WebSocketMethodsFactory webSocketMethodsFactory;
   private final int ASYNC_TIMEOUT = 5000;
@@ -52,10 +64,10 @@ public void before() {
     vertx = Vertx.vertx();
     subscriptionManager = new SubscriptionManager(new NoOpMetricsSystem());
     webSocketMethodsFactory = new WebSocketMethodsFactory(subscriptionManager, new HashMap<>());
-    webSocketRequestHandler =
-        new WebSocketRequestHandler(
+    webSocketMessageHandler =
+        new WebSocketMessageHandler(
             vertx,
-            webSocketMethodsFactory.methods(),
+            new JsonRpcExecutor(new BaseJsonRpcProcessor(), webSocketMethodsFactory.methods()),
             mock(EthScheduler.class),
             TimeoutOptions.defaultOptions().getTimeoutSeconds());
   }
@@ -73,19 +85,20 @@ public void shouldRemoveConnectionWithSingleSubscriptionFromMap(final TestContex
     final JsonRpcRequest unsubscribeRequestBody =
         createEthUnsubscribeRequestBody(subscriptionId, CONNECTION_ID);
 
-    vertx
-        .eventBus()
-        .consumer(CONNECTION_ID)
-        .handler(
-            msg -> {
-              assertThat(subscriptionManager.getSubscriptionById(subscriptionId)).isNull();
-              async.complete();
-            })
-        .completionHandler(
-            v ->
-                webSocketRequestHandler.handle(CONNECTION_ID, Json.encode(unsubscribeRequestBody)));
+    final JsonRpcSuccessResponse expectedResponse =
+        new JsonRpcSuccessResponse(unsubscribeRequestBody.getId(), Boolean.TRUE);
+
+    final ServerWebSocket websocketMock = mock(ServerWebSocket.class);
+    when(websocketMock.textHandlerID()).thenReturn(CONNECTION_ID);
+    when(websocketMock.writeFrame(argThat(this::isFinalFrame))).then(completeOnLastFrame(async));
+
+    webSocketMessageHandler.handle(
+        websocketMock, Json.encodeToBuffer(unsubscribeRequestBody), Optional.empty());
 
     async.awaitSuccess(ASYNC_TIMEOUT);
+    assertThat(subscriptionManager.getSubscriptionById(subscriptionId)).isNull();
+    verify(websocketMock).writeFrame(argThat(isFrameWithText(Json.encode(expectedResponse))));
+    verify(websocketMock).writeFrame(argThat(this::isFinalFrame));
   }
 
   @Test
@@ -104,20 +117,21 @@ public void shouldRemoveSubscriptionAndKeepConnection(final TestContext context)
     final JsonRpcRequest unsubscribeRequestBody =
         createEthUnsubscribeRequestBody(subscriptionId2, CONNECTION_ID);
 
-    vertx
-        .eventBus()
-        .consumer(CONNECTION_ID)
-        .handler(
-            msg -> {
-              assertThat(subscriptionManager.getSubscriptionById(subscriptionId1)).isNotNull();
-              assertThat(subscriptionManager.getSubscriptionById(subscriptionId2)).isNull();
-              async.complete();
-            })
-        .completionHandler(
-            v ->
-                webSocketRequestHandler.handle(CONNECTION_ID, Json.encode(unsubscribeRequestBody)));
+    final JsonRpcSuccessResponse expectedResponse =
+        new JsonRpcSuccessResponse(unsubscribeRequestBody.getId(), Boolean.TRUE);
+
+    final ServerWebSocket websocketMock = mock(ServerWebSocket.class);
+    when(websocketMock.textHandlerID()).thenReturn(CONNECTION_ID);
+    when(websocketMock.writeFrame(argThat(this::isFinalFrame))).then(completeOnLastFrame(async));
+
+    webSocketMessageHandler.handle(
+        websocketMock, Json.encodeToBuffer(unsubscribeRequestBody), Optional.empty());
 
     async.awaitSuccess(ASYNC_TIMEOUT);
+    assertThat(subscriptionManager.getSubscriptionById(subscriptionId1)).isNotNull();
+    assertThat(subscriptionManager.getSubscriptionById(subscriptionId2)).isNull();
+    verify(websocketMock).writeFrame(argThat(isFrameWithText(Json.encode(expectedResponse))));
+    verify(websocketMock).writeFrame(argThat(this::isFinalFrame));
   }
 
   private JsonRpcRequest createEthUnsubscribeRequestBody(
@@ -130,4 +144,19 @@ private JsonRpcRequest createEthUnsubscribeRequestBody(
             + "\"}",
         WebSocketRpcRequest.class);
   }
+
+  private ArgumentMatcher<WebSocketFrame> isFrameWithText(final String text) {
+    return f -> f.isText() && f.textData().equals(text);
+  }
+
+  private boolean isFinalFrame(final WebSocketFrame frame) {
+    return frame.isFinal();
+  }
+
+  private Answer<Future<Void>> completeOnLastFrame(final Async async) {
+    return invocation -> {
+      async.complete();
+      return Future.succeededFuture();
+    };
+  }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/PrivSubscribeTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/PrivSubscribeTest.java
index 9520323a913..522650edb83 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/PrivSubscribeTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/PrivSubscribeTest.java
@@ -15,15 +15,13 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
@@ -34,7 +32,6 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.PrivateSubscribeRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType;
-import org.hyperledger.besu.ethereum.privacy.MultiTenancyValidationException;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 
 import io.vertx.core.json.Json;
@@ -54,7 +51,7 @@ public class PrivSubscribeTest {
   @Mock private SubscriptionManager subscriptionManagerMock;
   @Mock private SubscriptionRequestMapper mapperMock;
   @Mock private PrivacyController privacyController;
-  @Mock private EnclavePublicKeyProvider enclavePublicKeyProvider;
+  @Mock private PrivacyIdProvider privacyIdProvider;
 
   private PrivSubscribe privSubscribe;
 
@@ -62,7 +59,7 @@ public class PrivSubscribeTest {
   public void before() {
     privSubscribe =
         new PrivSubscribe(
-            subscriptionManagerMock, mapperMock, privacyController, enclavePublicKeyProvider);
+            subscriptionManagerMock, mapperMock, privacyController, privacyIdProvider);
   }
 
   @Test
@@ -110,33 +107,6 @@ public void invalidSubscribeRequestRespondsInvalidRequestResponse() {
     assertThat(privSubscribe.response(jsonRpcrequestContext)).isEqualTo(expectedResponse);
   }
 
-  @Test
-  public void multiTenancyCheckFailure() {
-    final User user = mock(User.class);
-    final WebSocketRpcRequest webSocketRequest = createWebSocketRpcRequest();
-    final JsonRpcRequestContext jsonRpcrequestContext =
-        new JsonRpcRequestContext(webSocketRequest, user);
-
-    final PrivateSubscribeRequest subscribeRequest =
-        new PrivateSubscribeRequest(
-            SubscriptionType.LOGS,
-            null,
-            null,
-            webSocketRequest.getConnectionId(),
-            PRIVACY_GROUP_ID,
-            "public_key");
-
-    when(mapperMock.mapPrivateSubscribeRequest(any(), any())).thenReturn(subscribeRequest);
-    when(enclavePublicKeyProvider.getEnclaveKey(any())).thenReturn(ENCLAVE_KEY);
-    doThrow(new MultiTenancyValidationException("msg"))
-        .when(privacyController)
-        .verifyPrivacyGroupContainsEnclavePublicKey(eq(PRIVACY_GROUP_ID), eq(ENCLAVE_KEY));
-
-    assertThatThrownBy(() -> privSubscribe.response(jsonRpcrequestContext))
-        .isInstanceOf(MultiTenancyValidationException.class)
-        .hasMessageContaining("msg");
-  }
-
   @Test
   public void multiTenancyCheckSuccess() {
     final User user = mock(User.class);
@@ -154,7 +124,7 @@ public void multiTenancyCheckSuccess() {
             ENCLAVE_KEY);
 
     when(mapperMock.mapPrivateSubscribeRequest(any(), any())).thenReturn(subscribeRequest);
-    when(enclavePublicKeyProvider.getEnclaveKey(any())).thenReturn(ENCLAVE_KEY);
+    when(privacyIdProvider.getPrivacyUserId(any())).thenReturn(ENCLAVE_KEY);
 
     // This should pass if a MultiTenancyMultiTenancyValidationException isn't thrown
 
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/PrivUnsubscribeTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/PrivUnsubscribeTest.java
index 50db561cfba..9131032d2b3 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/PrivUnsubscribeTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/methods/PrivUnsubscribeTest.java
@@ -15,16 +15,14 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
-import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.EnclavePublicKeyProvider;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.privacy.methods.PrivacyIdProvider;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
@@ -33,11 +31,9 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.InvalidSubscriptionRequestException;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.PrivateUnsubscribeRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionRequestMapper;
-import org.hyperledger.besu.ethereum.privacy.MultiTenancyValidationException;
 import org.hyperledger.besu.ethereum.privacy.PrivacyController;
 
 import io.vertx.core.json.Json;
-import io.vertx.ext.auth.User;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -47,14 +43,13 @@
 @RunWith(MockitoJUnitRunner.class)
 public class PrivUnsubscribeTest {
 
-  private final String ENCLAVE_KEY = "enclave_key";
   private final String PRIVACY_GROUP_ID = "B1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
   private final String CONNECTION_ID = "test-connection-id";
 
   @Mock private SubscriptionManager subscriptionManagerMock;
   @Mock private SubscriptionRequestMapper mapperMock;
   @Mock private PrivacyController privacyController;
-  @Mock private EnclavePublicKeyProvider enclavePublicKeyProvider;
+  @Mock private PrivacyIdProvider privacyIdProvider;
 
   private PrivUnsubscribe privUnsubscribe;
 
@@ -62,7 +57,7 @@ public class PrivUnsubscribeTest {
   public void before() {
     privUnsubscribe =
         new PrivUnsubscribe(
-            subscriptionManagerMock, mapperMock, privacyController, enclavePublicKeyProvider);
+            subscriptionManagerMock, mapperMock, privacyController, privacyIdProvider);
   }
 
   @Test
@@ -110,25 +105,6 @@ public void whenSubscriptionNotFoundReturnError() {
     assertThat(privUnsubscribe.response(request)).isEqualTo(expectedResponse);
   }
 
-  @Test
-  public void multiTenancyCheckFailure() {
-    final User user = mock(User.class);
-    final JsonRpcRequestContext jsonRpcrequestContext = createPrivUnsubscribeRequestWithUser(user);
-
-    final PrivateUnsubscribeRequest unsubscribeRequest =
-        new PrivateUnsubscribeRequest(0L, CONNECTION_ID, PRIVACY_GROUP_ID);
-
-    when(mapperMock.mapPrivateUnsubscribeRequest(any())).thenReturn(unsubscribeRequest);
-    when(enclavePublicKeyProvider.getEnclaveKey(any())).thenReturn(ENCLAVE_KEY);
-    doThrow(new MultiTenancyValidationException("msg"))
-        .when(privacyController)
-        .verifyPrivacyGroupContainsEnclavePublicKey(eq(PRIVACY_GROUP_ID), eq(ENCLAVE_KEY));
-
-    assertThatThrownBy(() -> privUnsubscribe.response(jsonRpcrequestContext))
-        .isInstanceOf(MultiTenancyValidationException.class)
-        .hasMessageContaining("msg");
-  }
-
   private JsonRpcRequestContext createPrivUnsubscribeRequest() {
     return new JsonRpcRequestContext(
         Json.decodeValue(
@@ -137,14 +113,4 @@ private JsonRpcRequestContext createPrivUnsubscribeRequest() {
                 + "\", \"0x0\"]}",
             JsonRpcRequest.class));
   }
-
-  private JsonRpcRequestContext createPrivUnsubscribeRequestWithUser(final User user) {
-    return new JsonRpcRequestContext(
-        Json.decodeValue(
-            "{\"id\": 1, \"method\": \"priv_unsubscribe\", \"params\": [\""
-                + PRIVACY_GROUP_ID
-                + "\", \"0x0\"]}",
-            JsonRpcRequest.class),
-        user);
-  }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilderTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilderTest.java
index 811915283c5..c3a6b2c4b11 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilderTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionBuilderTest.java
@@ -53,7 +53,7 @@ public void shouldBuildLogsSubscriptionWhenSubscribeRequestTypeIsLogs() {
     final Subscription builtSubscription =
         subscriptionBuilder.build(1L, CONNECTION_ID, subscribeRequest);
 
-    assertThat(builtSubscription).isEqualToComparingFieldByField(expectedSubscription);
+    assertThat(builtSubscription).usingRecursiveComparison().isEqualTo(expectedSubscription);
   }
 
   @Test
@@ -76,7 +76,7 @@ public void shouldBuildPrivateLogsSubscriptionWhenSubscribeRequestTypeIsPrivateL
     final Subscription builtSubscription =
         subscriptionBuilder.build(1L, CONNECTION_ID, subscribeRequest);
 
-    assertThat(builtSubscription).isEqualToComparingFieldByField(expectedSubscription);
+    assertThat(builtSubscription).usingRecursiveComparison().isEqualTo(expectedSubscription);
   }
 
   @Test
@@ -89,7 +89,7 @@ public void shouldBuildNewBlockHeadsSubscriptionWhenSubscribeRequestTypeIsNewBlo
     final Subscription builtSubscription =
         subscriptionBuilder.build(1L, CONNECTION_ID, subscribeRequest);
 
-    assertThat(builtSubscription).isEqualToComparingFieldByField(expectedSubscription);
+    assertThat(builtSubscription).usingRecursiveComparison().isEqualTo(expectedSubscription);
   }
 
   @Test
@@ -102,7 +102,7 @@ public void shouldBuildSubscriptionWhenSubscribeRequestTypeIsNewPendingTransacti
     final Subscription builtSubscription =
         subscriptionBuilder.build(1L, CONNECTION_ID, subscribeRequest);
 
-    assertThat(builtSubscription).isEqualToComparingFieldByField(expectedSubscription);
+    assertThat(builtSubscription).usingRecursiveComparison().isEqualTo(expectedSubscription);
   }
 
   @Test
@@ -115,7 +115,7 @@ public void shouldBuildSubscriptionWhenSubscribeRequestTypeIsSyncing() {
     final Subscription builtSubscription =
         subscriptionBuilder.build(1L, CONNECTION_ID, subscribeRequest);
 
-    assertThat(builtSubscription).isEqualToComparingFieldByField(expectedSubscription);
+    assertThat(builtSubscription).usingRecursiveComparison().isEqualTo(expectedSubscription);
   }
 
   @Test
@@ -174,6 +174,7 @@ public void shouldThrownIllegalArgumentExceptionWhenMappingWrongSubscriptionType
   }
 
   private FilterParameter filterParameter() {
-    return new FilterParameter(BlockParameter.EARLIEST, BlockParameter.LATEST, null, null, null);
+    return new FilterParameter(
+        BlockParameter.EARLIEST, BlockParameter.LATEST, null, null, null, null, null, null, null);
   }
 }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManagerSendMessageTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManagerSendMessageTest.java
index 22413337a17..7f88a0e2598 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManagerSendMessageTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManagerSendMessageTest.java
@@ -31,6 +31,7 @@
 import io.vertx.ext.unit.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -50,6 +51,7 @@ public void before(final TestContext context) {
   }
 
   @Test
+  @Ignore
   public void shouldSendMessageOnTheConnectionIdEventBusAddressForExistingSubscription(
       final TestContext context) {
     final String connectionId = UUID.randomUUID().toString();
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManagerTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManagerTest.java
index 8a6f53c5fe4..e4213003294 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManagerTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/SubscriptionManagerTest.java
@@ -15,11 +15,8 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.catchThrowable;
-import static org.hamcrest.CoreMatchers.both;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.internal.matchers.ThrowableMessageMatcher.hasMessage;
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.FilterParameter;
@@ -37,14 +34,10 @@
 import java.util.UUID;
 
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 public class SubscriptionManagerTest {
 
-  @Rule public ExpectedException thrown = ExpectedException.none();
-
   private SubscriptionManager subscriptionManager;
   private final String CONNECTION_ID = "test-connection-id";
 
@@ -87,12 +80,9 @@ public void unsubscribeExistingSubscriptionShouldDestroySubscription() {
   @Test
   public void unsubscribeAbsentSubscriptionShouldThrowSubscriptionNotFoundException() {
     final UnsubscribeRequest unsubscribeRequest = new UnsubscribeRequest(1L, CONNECTION_ID);
-
-    thrown.expect(
-        both(hasMessage(equalTo("Subscription not found (id=1)")))
-            .and(instanceOf(SubscriptionNotFoundException.class)));
-
-    subscriptionManager.unsubscribe(unsubscribeRequest);
+    assertThatThrownBy(() -> subscriptionManager.unsubscribe(unsubscribeRequest))
+        .isInstanceOf(SubscriptionNotFoundException.class)
+        .hasMessage("Subscription not found (id=1)");
   }
 
   @Test
@@ -219,7 +209,16 @@ public void unsubscribeOthersSubscriptionsHavingOwnSubscriptionShouldReturnNotFo
   public void shouldUnsubscribeIfUserRemovedFromPrivacyGroup() {
     final String enclavePublicKey = "C1bVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
     final FilterParameter filterParameter =
-        new FilterParameter(BlockParameter.EARLIEST, BlockParameter.LATEST, null, null, null);
+        new FilterParameter(
+            BlockParameter.EARLIEST,
+            BlockParameter.LATEST,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null,
+            null);
     final String privacyGroupId = "ZDmkMK7CyxA1F1rktItzKFTfRwApg7aWzsTtm2IOZ5Y=";
     final PrivateSubscribeRequest privateSubscribeRequest =
         new PrivateSubscribeRequest(
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionServiceTest.java
index 38cac26f30d..0628cefadbf 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionServiceTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/blockheaders/NewBlockHeadersSubscriptionServiceTest.java
@@ -15,7 +15,7 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.blockheaders;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.times;
@@ -35,6 +35,7 @@
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage;
+import org.hyperledger.besu.ethereum.storage.keyvalue.VariablesKeyValueStorage;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
 
@@ -60,7 +61,9 @@ public class NewBlockHeadersSubscriptionServiceTest {
   private final BlockDataGenerator gen = new BlockDataGenerator();
   private final BlockchainStorage blockchainStorage =
       new KeyValueStoragePrefixedKeyBlockchainStorage(
-          new InMemoryKeyValueStorage(), new MainnetBlockHeaderFunctions());
+          new InMemoryKeyValueStorage(),
+          new VariablesKeyValueStorage(new InMemoryKeyValueStorage()),
+          new MainnetBlockHeaderFunctions());
   private final Block genesisBlock = gen.genesisBlock();
   private final MutableBlockchain blockchain =
       DefaultBlockchain.createMutable(genesisBlock, blockchainStorage, new NoOpMetricsSystem(), 0);
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscriptionServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscriptionServiceTest.java
index c2986aef5a1..d940a5f8ce5 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscriptionServiceTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/logs/LogsSubscriptionServiceTest.java
@@ -21,6 +21,8 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.FilterParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.LogResult;
@@ -28,19 +30,17 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager;
 import org.hyperledger.besu.ethereum.api.query.PrivacyQueries;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
-import org.hyperledger.besu.ethereum.core.Log;
-import org.hyperledger.besu.ethereum.core.LogTopic;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.log.LogTopic;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -66,7 +66,7 @@ public class LogsSubscriptionServiceTest {
 
   private final BlockDataGenerator gen = new BlockDataGenerator(1);
   private final MutableBlockchain blockchain =
-      InMemoryStorageProvider.createInMemoryBlockchain(gen.genesisBlock());
+      InMemoryKeyValueStorageProvider.createInMemoryBlockchain(gen.genesisBlock());
 
   private LogsSubscriptionService logsSubscriptionService;
   private final AtomicLong nextSubscriptionId = new AtomicLong();
@@ -90,8 +90,9 @@ public void singleMatchingLogEvent() {
     final List<TransactionReceipt> receipts = blockWithReceipts.getReceipts();
 
     final int txIndex = 1;
-    final int logIndex = 1;
-    final Log targetLog = receipts.get(txIndex).getLogs().get(logIndex);
+    final int logIndexInTransaction = 1;
+    final int logIndexInBlock = 3; // third log in the block
+    final Log targetLog = receipts.get(txIndex).getLogsList().get(logIndexInTransaction);
 
     final LogsSubscription subscription = createSubscription(targetLog.getLogger());
     registerSubscriptions(subscription);
@@ -104,7 +105,8 @@ public void singleMatchingLogEvent() {
 
     assertThat(logResults).hasSize(1);
     final LogResult result = logResults.get(0);
-    assertLogResultMatches(result, block, receipts, txIndex, logIndex, false);
+    assertLogResultMatches(
+        result, block, receipts, txIndex, logIndexInTransaction, logIndexInBlock, false);
   }
 
   @Test
@@ -115,8 +117,8 @@ public void singleMatchingLogEmittedThenRemovedInReorg() {
     final List<TransactionReceipt> receipts = blockWithReceipts.getReceipts();
 
     final int txIndex = 1;
-    final int logIndex = 1;
-    final Log targetLog = receipts.get(txIndex).getLogs().get(logIndex);
+    final int logListIndex = 1;
+    final Log targetLog = receipts.get(txIndex).getLogsList().get(logListIndex);
 
     final LogsSubscription subscription = createSubscription(targetLog.getLogger());
     registerSubscriptions(subscription);
@@ -138,9 +140,11 @@ public void singleMatchingLogEmittedThenRemovedInReorg() {
 
     assertThat(logResults).hasSize(2);
     final LogResult firstLog = logResults.get(0);
-    assertLogResultMatches(firstLog, block, receipts, txIndex, logIndex, false);
+    // third log in the block
+    assertLogResultMatches(firstLog, block, receipts, txIndex, logListIndex, 3, false);
     final LogResult secondLog = logResults.get(1);
-    assertLogResultMatches(secondLog, block, receipts, txIndex, logIndex, true);
+    // third log in the block, but was removed
+    assertLogResultMatches(secondLog, block, receipts, txIndex, logListIndex, 3, true);
   }
 
   @Test
@@ -151,8 +155,8 @@ public void singleMatchingLogEmittedThenMovedInReorg() {
     final List<TransactionReceipt> receipts = blockWithReceipts.getReceipts();
 
     final int txIndex = 1;
-    final int logIndex = 1;
-    final Log targetLog = receipts.get(txIndex).getLogs().get(logIndex);
+    final int logListIndex = 1;
+    final Log targetLog = receipts.get(txIndex).getLogsList().get(logListIndex);
 
     final LogsSubscription subscription = createSubscription(targetLog.getLogger());
     registerSubscriptions(subscription);
@@ -181,12 +185,12 @@ public void singleMatchingLogEmittedThenMovedInReorg() {
 
     assertThat(logResults).hasSize(3);
     final LogResult originalLog = logResults.get(0);
-    assertLogResultMatches(originalLog, block, receipts, txIndex, logIndex, false);
+    assertLogResultMatches(originalLog, block, receipts, txIndex, logListIndex, 3, false);
     final LogResult removedLog = logResults.get(1);
-    assertLogResultMatches(removedLog, block, receipts, txIndex, logIndex, true);
+    assertLogResultMatches(removedLog, block, receipts, txIndex, logListIndex, 3, true);
     final LogResult updatedLog = logResults.get(2);
     assertLogResultMatches(
-        updatedLog, newBlockWithLog.getBlock(), newBlockWithLog.getReceipts(), 0, 0, false);
+        updatedLog, newBlockWithLog.getBlock(), newBlockWithLog.getReceipts(), 0, 0, 0, false);
   }
 
   @Test
@@ -218,6 +222,9 @@ public void multipleMatchingLogsEmitted() {
 
     // Verify all logs are emitted
     assertThat(logResults).hasSize(targetBlocks.size() * txCount);
+
+    final List<Integer> expectedLogIndex = Arrays.asList(0, 2);
+
     for (int i = 0; i < targetBlocks.size(); i++) {
       final BlockWithReceipts targetBlock = targetBlocks.get(i);
       for (int j = 0; j < txCount; j++) {
@@ -228,6 +235,7 @@ public void multipleMatchingLogsEmitted() {
             targetBlock.getReceipts(),
             j,
             0,
+            expectedLogIndex.get(j),
             false);
       }
     }
@@ -241,7 +249,7 @@ public void multipleSubscriptionsForSingleMatchingLog() {
 
     final int txIndex = 1;
     final int logIndex = 1;
-    final Log targetLog = receipts.get(txIndex).getLogs().get(logIndex);
+    final Log targetLog = receipts.get(txIndex).getLogsList().get(logIndex);
 
     final List<LogsSubscription> subscriptions =
         Stream.generate(() -> createSubscription(targetLog.getLogger()))
@@ -259,7 +267,7 @@ public void multipleSubscriptionsForSingleMatchingLog() {
 
       assertThat(logResults).hasSize(1);
       final LogResult result = logResults.get(0);
-      assertLogResultMatches(result, block, receipts, txIndex, logIndex, false);
+      assertLogResultMatches(result, block, receipts, txIndex, logIndex, 3, false);
     }
   }
 
@@ -332,10 +340,11 @@ private void assertLogResultMatches(
       final Block block,
       final List<TransactionReceipt> receipts,
       final int txIndex,
+      final int logListIndex,
       final int logIndex,
       final boolean isRemoved) {
     final Transaction expectedTransaction = block.getBody().getTransactions().get(txIndex);
-    final Log expectedLog = receipts.get(txIndex).getLogs().get(logIndex);
+    final Log expectedLog = receipts.get(txIndex).getLogsList().get(logListIndex);
 
     assertThat(result.getLogIndex()).isEqualTo(Quantity.create(logIndex));
     assertThat(result.getTransactionIndex()).isEqualTo(Quantity.create(txIndex));
@@ -380,7 +389,7 @@ private BlockWithReceipts generateBlock(
       final TransactionReceipt receipt = gen.receipt(logsSupplier.get());
 
       receipts.add(receipt);
-      receipt.getLogs().forEach(logs::add);
+      receipt.getLogsList().forEach(logs::add);
       blockOptions.addTransaction(tx);
     }
 
@@ -399,8 +408,12 @@ private PrivateLogsSubscription createPrivateSubscription(
         new FilterParameter(
             BlockParameter.LATEST,
             BlockParameter.LATEST,
+            null,
+            null,
             Arrays.asList(address),
             Collections.emptyList(),
+            null,
+            null,
             null),
         privacyGroupId,
         enclavePublicKey);
@@ -417,7 +430,15 @@ private LogsSubscription createSubscription(
         nextSubscriptionId.incrementAndGet(),
         "conn",
         new FilterParameter(
-            BlockParameter.LATEST, BlockParameter.LATEST, addresses, logTopics, null));
+            BlockParameter.LATEST,
+            BlockParameter.LATEST,
+            null,
+            null,
+            addresses,
+            logTopics,
+            null,
+            null,
+            null));
   }
 
   private void registerSubscriptions(final LogsSubscription... subscriptions) {
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDroppedSubscriptionServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDroppedSubscriptionServiceTest.java
index d9ad8212fe2..98967114267 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDroppedSubscriptionServiceTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionDroppedSubscriptionServiceTest.java
@@ -19,16 +19,16 @@
 import static org.mockito.ArgumentMatchers.refEq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.Subscription;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
 
 import java.util.Arrays;
@@ -67,8 +67,8 @@ public void onTransactionAddedMustSendMessage() {
 
     service.onTransactionDropped(pending);
 
-    verifyZeroInteractions(block);
-    verifyZeroInteractions(blockchain);
+    verifyNoInteractions(block);
+    verifyNoInteractions(blockchain);
     verifySubscriptionMangerInteractions(messages(TX_ONE, subscriptionIds));
   }
 
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionServiceTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionServiceTest.java
index 27dad36d1c5..0a96b8f4fa0 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionServiceTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/pending/PendingTransactionSubscriptionServiceTest.java
@@ -18,17 +18,17 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.refEq;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.SimpleTestTransactionBuilder;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.Subscription;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.SubscriptionManager;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.subscription.request.SubscriptionType;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
 
 import java.util.Arrays;
@@ -67,8 +67,8 @@ public void onTransactionAddedMustSendMessage() {
 
     service.onTransactionAdded(pending);
 
-    verifyZeroInteractions(block);
-    verifyZeroInteractions(blockchain);
+    verifyNoInteractions(block);
+    verifyNoInteractions(blockchain);
     verifySubscriptionMangerInteractions(messages(TX_ONE, subscriptionIds));
   }
 
@@ -80,8 +80,8 @@ public void onTransactionAddedMustSendMessageWithDetails() {
 
     service.onTransactionAdded(pending);
 
-    verifyZeroInteractions(block);
-    verifyZeroInteractions(blockchain);
+    verifyNoInteractions(block);
+    verifyNoInteractions(blockchain);
     verifySubscriptionMangerDetailInteractions(messages(pending, subscriptionIds));
   }
 
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapperTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapperTest.java
index 5d0d7c566b8..5f46fd2ad59 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapperTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/subscription/request/SubscriptionRequestMapperTest.java
@@ -18,33 +18,26 @@
 import static java.util.Collections.singletonList;
 import static java.util.stream.Collectors.toUnmodifiableList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hamcrest.CoreMatchers.both;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.internal.matchers.ThrowableMessageMatcher.hasMessage;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.FilterParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.websocket.methods.WebSocketRpcRequest;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.LogTopic;
+import org.hyperledger.besu.evm.log.LogTopic;
 
 import java.util.List;
 import java.util.stream.Stream;
 
 import io.vertx.core.json.Json;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 public class SubscriptionRequestMapperTest {
 
-  @Rule public ExpectedException thrown = ExpectedException.none();
-
   private SubscriptionRequestMapper mapper;
   // These tests aren't passing through WebSocketRequestHandler, so connectionId is null.
   private final String CONNECTION_ID = null;
@@ -86,12 +79,11 @@ public void mapRequestToUnsubscribeRequestMissingSubscriptionIdFails() {
     final JsonRpcRequest jsonRpcRequest =
         parseWebSocketRpcRequest("{\"id\": 1, \"method\": \"eth_unsubscribe\", \"params\": []}");
 
-    thrown.expect(InvalidSubscriptionRequestException.class);
-    thrown.expectCause(
-        both(hasMessage(equalTo("Missing required json rpc parameter at index 0")))
-            .and(instanceOf(InvalidJsonRpcParameters.class)));
-
-    mapper.mapSubscribeRequest(new JsonRpcRequestContext(jsonRpcRequest));
+    assertThatThrownBy(() -> mapper.mapSubscribeRequest(new JsonRpcRequestContext(jsonRpcRequest)))
+        .isInstanceOf(InvalidSubscriptionRequestException.class)
+        .getCause()
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessage("Missing required json rpc parameter at index 0");
   }
 
   @Test
@@ -142,12 +134,11 @@ public void mapRequestToNewHeadsWithInvalidSecondParamFails() {
         parseWebSocketRpcRequest(
             "{\"id\": 1, \"method\": \"eth_subscribe\", \"params\": [\"newHeads\", {\"foo\": \"bar\"}]}");
 
-    thrown.expect(InvalidSubscriptionRequestException.class);
-    thrown.expectCause(
-        both(hasMessage(equalTo("Invalid json rpc parameter at index 1")))
-            .and(instanceOf(InvalidJsonRpcParameters.class)));
-
-    mapper.mapSubscribeRequest(new JsonRpcRequestContext(jsonRpcRequest));
+    assertThatThrownBy(() -> mapper.mapSubscribeRequest(new JsonRpcRequestContext(jsonRpcRequest)))
+        .isInstanceOf(InvalidSubscriptionRequestException.class)
+        .getCause()
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessageContaining("Invalid json rpc parameter at index 1");
   }
 
   @Test
@@ -176,8 +167,12 @@ public void mapRequestWithSingleAddress() {
             new FilterParameter(
                 BlockParameter.LATEST,
                 BlockParameter.LATEST,
+                null,
+                null,
                 singletonList(Address.fromHexString("0x8320fe7702b96808f7bbc0d4a888ed1468216cfd")),
                 emptyList(),
+                null,
+                null,
                 null),
             null,
             null);
@@ -185,8 +180,7 @@ public void mapRequestWithSingleAddress() {
     final SubscribeRequest subscribeRequest =
         mapper.mapSubscribeRequest(new JsonRpcRequestContext(jsonRpcRequest));
 
-    assertThat(subscribeRequest)
-        .isEqualToComparingFieldByFieldRecursively(expectedSubscribeRequest);
+    assertThat(subscribeRequest).usingRecursiveComparison().isEqualTo(expectedSubscribeRequest);
   }
 
   @Test
@@ -201,6 +195,8 @@ public void mapRequestWithMultipleAddresses() {
             new FilterParameter(
                 BlockParameter.LATEST,
                 BlockParameter.LATEST,
+                null,
+                null,
                 Stream.of(
                         "0x8320fe7702b96808f7bbc0d4a888ed1468216cfd",
                         "0xf17f52151EbEF6C7334FAD080c5704D77216b732")
@@ -210,6 +206,8 @@ public void mapRequestWithMultipleAddresses() {
                     singletonList(
                         LogTopic.fromHexString(
                             "0xd78a0cb8bb633d06981248b816e7bd33c2a35a6089241d099fa519e361cab902"))),
+                null,
+                null,
                 null),
             null,
             null);
@@ -217,8 +215,7 @@ public void mapRequestWithMultipleAddresses() {
     final SubscribeRequest subscribeRequest =
         mapper.mapSubscribeRequest(new JsonRpcRequestContext(jsonRpcRequest));
 
-    assertThat(subscribeRequest)
-        .isEqualToComparingFieldByFieldRecursively(expectedSubscribeRequest);
+    assertThat(subscribeRequest).usingRecursiveComparison().isEqualTo(expectedSubscribeRequest);
   }
 
   @Test
@@ -233,6 +230,8 @@ public void mapRequestWithMultipleTopics() {
             new FilterParameter(
                 BlockParameter.LATEST,
                 BlockParameter.LATEST,
+                null,
+                null,
                 singletonList(Address.fromHexString("0x8320fe7702b96808f7bbc0d4a888ed1468216cfd")),
                 List.of(
                     singletonList(
@@ -241,6 +240,8 @@ public void mapRequestWithMultipleTopics() {
                     singletonList(
                         LogTopic.fromHexString(
                             "0xd78a0cb8bb633d06981248b816e7bd33c2a35a6089241d099fa519e361cab901"))),
+                null,
+                null,
                 null),
             null,
             null);
@@ -248,8 +249,7 @@ public void mapRequestWithMultipleTopics() {
     final SubscribeRequest subscribeRequest =
         mapper.mapSubscribeRequest(new JsonRpcRequestContext(jsonRpcRequest));
 
-    assertThat(subscribeRequest)
-        .isEqualToComparingFieldByFieldRecursively(expectedSubscribeRequest);
+    assertThat(subscribeRequest).usingRecursiveComparison().isEqualTo(expectedSubscribeRequest);
   }
 
   @Test
@@ -264,8 +264,12 @@ public void mapRequestToLogsWithoutTopics() {
             new FilterParameter(
                 BlockParameter.LATEST,
                 BlockParameter.LATEST,
+                null,
+                null,
                 singletonList(Address.fromHexString("0x8320fe7702b96808f7bbc0d4a888ed1468216cfd")),
                 emptyList(),
+                null,
+                null,
                 null),
             null,
             null);
@@ -273,8 +277,7 @@ public void mapRequestToLogsWithoutTopics() {
     final SubscribeRequest subscribeRequest =
         mapper.mapSubscribeRequest(new JsonRpcRequestContext(jsonRpcRequest));
 
-    assertThat(subscribeRequest)
-        .isEqualToComparingFieldByFieldRecursively(expectedSubscribeRequest);
+    assertThat(subscribeRequest).usingRecursiveComparison().isEqualTo(expectedSubscribeRequest);
   }
 
   @Test
@@ -283,12 +286,11 @@ public void mapRequestToLogsWithInvalidTopicInFilter() {
         parseWebSocketRpcRequest(
             "{\"id\": 1, \"method\": \"eth_subscribe\", \"params\": [\"logs\", {\"address\": \"0x0\", \"topics\": [\"0x1\"]}]}");
 
-    thrown.expect(InvalidSubscriptionRequestException.class);
-    thrown.expectCause(
-        both(hasMessage(equalTo("Invalid json rpc parameter at index 1")))
-            .and(instanceOf(InvalidJsonRpcParameters.class)));
-
-    mapper.mapSubscribeRequest(new JsonRpcRequestContext(jsonRpcRequest));
+    assertThatThrownBy(() -> mapper.mapSubscribeRequest(new JsonRpcRequestContext(jsonRpcRequest)))
+        .isInstanceOf(InvalidSubscriptionRequestException.class)
+        .getCause()
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessageContaining("Invalid json rpc parameter at index 1");
   }
 
   @Test
@@ -297,12 +299,11 @@ public void mapRequestToLogsWithInvalidSecondParam() {
         parseWebSocketRpcRequest(
             "{\"id\": 1, \"method\": \"eth_subscribe\", \"params\": [\"logs\", {\"foo\": \"bar\"}]}");
 
-    thrown.expect(InvalidSubscriptionRequestException.class);
-    thrown.expectCause(
-        both(hasMessage(equalTo("Invalid json rpc parameter at index 1")))
-            .and(instanceOf(InvalidJsonRpcParameters.class)));
-
-    mapper.mapSubscribeRequest(new JsonRpcRequestContext(jsonRpcRequest));
+    assertThatThrownBy(() -> mapper.mapSubscribeRequest(new JsonRpcRequestContext(jsonRpcRequest)))
+        .isInstanceOf(InvalidSubscriptionRequestException.class)
+        .getCause()
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessageContaining("Invalid json rpc parameter at index 1");
   }
 
   @Test
@@ -367,12 +368,11 @@ public void mapAbsentSubscriptionTypeRequestFails() {
         parseWebSocketRpcRequest(
             "{\"id\": 1, \"method\": \"eth_subscribe\", \"params\": [\"foo\"]}");
 
-    thrown.expect(InvalidSubscriptionRequestException.class);
-    thrown.expectCause(
-        both(hasMessage(equalTo("Invalid json rpc parameter at index 0")))
-            .and(instanceOf(InvalidJsonRpcParameters.class)));
-
-    mapper.mapSubscribeRequest(new JsonRpcRequestContext(jsonRpcRequest));
+    assertThatThrownBy(() -> mapper.mapSubscribeRequest(new JsonRpcRequestContext(jsonRpcRequest)))
+        .isInstanceOf(InvalidSubscriptionRequestException.class)
+        .getCause()
+        .isInstanceOf(InvalidJsonRpcParameters.class)
+        .hasMessageContaining("Invalid json rpc parameter at index 0");
   }
 
   @Test
@@ -387,8 +387,12 @@ public void mapRequestToPrivateLogsSubscription() {
             new FilterParameter(
                 BlockParameter.LATEST,
                 BlockParameter.LATEST,
+                null,
+                null,
                 singletonList(Address.fromHexString("0x8320fe7702b96808f7bbc0d4a888ed1468216cfd")),
                 emptyList(),
+                null,
+                null,
                 null),
             null,
             null,
@@ -399,8 +403,7 @@ public void mapRequestToPrivateLogsSubscription() {
         mapper.mapPrivateSubscribeRequest(
             new JsonRpcRequestContext(jsonRpcRequest), ENCLAVE_PUBLIC_KEY);
 
-    assertThat(subscribeRequest)
-        .isEqualToComparingFieldByFieldRecursively(expectedSubscribeRequest);
+    assertThat(subscribeRequest).usingRecursiveComparison().isEqualTo(expectedSubscribeRequest);
   }
 
   @Test
@@ -409,11 +412,12 @@ public void mapRequestToPrivateSubscriptionWithInvalidType() {
         parseWebSocketRpcRequest(
             "{\"id\": 1, \"method\": \"priv_subscribe\", \"params\": [\"B1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=\", \"syncing\", {\"includeTransactions\": true}]}");
 
-    thrown.expect(InvalidSubscriptionRequestException.class);
-    thrown.expectMessage("Invalid subscribe request. Invalid private subscription type.");
-
-    mapper.mapPrivateSubscribeRequest(
-        new JsonRpcRequestContext(jsonRpcRequest), ENCLAVE_PUBLIC_KEY);
+    assertThatThrownBy(
+            () ->
+                mapper.mapPrivateSubscribeRequest(
+                    new JsonRpcRequestContext(jsonRpcRequest), ENCLAVE_PUBLIC_KEY))
+        .isInstanceOf(InvalidSubscriptionRequestException.class)
+        .hasMessage("Invalid subscribe request. Invalid private subscription type.");
   }
 
   @Test
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueriesLogCacheTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueriesLogCacheTest.java
index 105cd4cd46f..801c1d7bd8a 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueriesLogCacheTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueriesLogCacheTest.java
@@ -24,17 +24,17 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Log;
-import org.hyperledger.besu.ethereum.core.LogsBloomFilter;
 import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
@@ -110,6 +110,9 @@ public void setup() {
             null,
             Hash.EMPTY,
             0,
+            null,
+            null,
+            null,
             new MainnetBlockHeaderFunctions());
     testHash = fakeHeader.getHash();
     final BlockBody fakeBody = new BlockBody(Collections.emptyList(), Collections.emptyList());
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueriesTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueriesTest.java
index 0aad8d5af38..c4e64c7a432 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueriesTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueriesTest.java
@@ -18,24 +18,24 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldState;
 import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.worldstate.WorldState;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 
 import java.util.ArrayList;
@@ -196,6 +196,17 @@ public void getHeadBlockNumber() {
     assertThat(result).isEqualTo(3L);
   }
 
+  @Test
+  public void getHeadBlockHeader() {
+    final BlockchainWithData data = setupBlockchain(3);
+    final BlockchainQueries queries = data.blockchainQueries;
+
+    final BlockHeader targetBlockHeader = data.blockData.get(2).block.getHeader();
+
+    BlockHeader result = queries.headBlockHeader();
+    assertThat(targetBlockHeader).isEqualTo(result);
+  }
+
   @Test
   public void getAccountStorageBlockNumber() {
     final List<Address> addresses = Arrays.asList(gen.address(), gen.address(), gen.address());
@@ -204,8 +215,10 @@ public void getAccountStorageBlockNumber() {
     final BlockchainWithData data = setupBlockchain(3, addresses, storageKeys);
     final BlockchainQueries queries = data.blockchainQueries;
 
-    final Hash latestStateRoot0 = data.blockData.get(2).block.getHeader().getStateRoot();
-    final WorldState worldState0 = data.worldStateArchive.get(latestStateRoot0).get();
+    final BlockHeader blockHeader0 = data.blockData.get(2).block.getHeader();
+    final Hash latestStateRoot0 = blockHeader0.getStateRoot();
+    final WorldState worldState0 =
+        data.worldStateArchive.get(latestStateRoot0, blockHeader0.getHash()).get();
     addresses.forEach(
         address ->
             storageKeys.forEach(
@@ -215,8 +228,10 @@ public void getAccountStorageBlockNumber() {
                   assertThat(result).contains(actualAccount0.getStorageValue(storageKey));
                 }));
 
-    final Hash latestStateRoot1 = data.blockData.get(1).block.getHeader().getStateRoot();
-    final WorldState worldState1 = data.worldStateArchive.get(latestStateRoot1).get();
+    final BlockHeader header1 = data.blockData.get(1).block.getHeader();
+    final Hash latestStateRoot1 = header1.getStateRoot();
+    final WorldState worldState1 =
+        data.worldStateArchive.get(latestStateRoot1, header1.getHash()).get();
     addresses.forEach(
         address ->
             storageKeys.forEach(
@@ -236,8 +251,9 @@ public void getAccountBalanceAtBlockNumber() {
 
     for (int i = 0; i < blockCount; i++) {
       final long curBlockNumber = i;
-      final Hash stateRoot = data.blockData.get(i).block.getHeader().getStateRoot();
-      final WorldState worldState = data.worldStateArchive.get(stateRoot).get();
+      final BlockHeader header = data.blockData.get(i).block.getHeader();
+      final Hash stateRoot = header.getStateRoot();
+      final WorldState worldState = data.worldStateArchive.get(stateRoot, header.getHash()).get();
       assertThat(addresses).isNotEmpty();
 
       addresses.forEach(
@@ -395,7 +411,7 @@ public void getOmmerByBlockHashAndIndexShouldReturnEmptyWhenIndexIsOutOfRange()
 
   @Test
   public void getOmmerByBlockHashAndIndexShouldReturnExpectedOmmerHeader() {
-    final BlockchainWithData data = setupBlockchain(3);
+    final BlockchainWithData data = setupBlockchain(4);
     final BlockchainQueries queries = data.blockchainQueries;
     final Block targetBlock = data.blockData.get(data.blockData.size() - 1).block;
     final BlockHeader ommerBlockHeader = targetBlock.getBody().getOmmers().get(0);
@@ -443,15 +459,16 @@ public void getOmmerByBlockNumberAndIndexShouldReturnEmptyWhenIndexIsOutOfRange(
 
   @Test
   public void getOmmerByBlockNumberAndIndexShouldReturnExpectedOmmerHeader() {
-    final BlockchainWithData data = setupBlockchain(3);
+    final BlockchainWithData data = setupBlockchain(4);
     final BlockchainQueries queries = data.blockchainQueries;
     final Block targetBlock = data.blockData.get(data.blockData.size() - 1).block;
-    final BlockHeader ommerBlockHeader = targetBlock.getBody().getOmmers().get(1);
+    final List<BlockHeader> ommers = targetBlock.getBody().getOmmers();
+    final int ommerIndex = ommers.size() - 1;
 
     final BlockHeader retrievedOmmerBlockHeader =
-        queries.getOmmer(targetBlock.getHeader().getNumber(), 1).get();
+        queries.getOmmer(targetBlock.getHeader().getNumber(), ommerIndex).get();
 
-    assertThat(retrievedOmmerBlockHeader).isEqualTo(ommerBlockHeader);
+    assertThat(retrievedOmmerBlockHeader).isEqualTo(ommers.get(ommerIndex));
   }
 
   @Test
@@ -479,7 +496,7 @@ public void getLatestBlockOmmerByIndexShouldReturnEmptyWhenIndexIsOutOfRange() {
 
   @Test
   public void getLatestBlockOmmerByIndexShouldReturnExpectedOmmerHeader() {
-    final BlockchainWithData data = setupBlockchain(3);
+    final BlockchainWithData data = setupBlockchain(4);
     final BlockchainQueries queries = data.blockchainQueries;
     final Block targetBlock = data.blockData.get(data.blockData.size() - 1).block;
     final BlockHeader ommerBlockHeader = targetBlock.getBody().getOmmers().get(0);
@@ -563,7 +580,6 @@ private static class BlockchainWithData {
     final List<BlockData> blockData;
     final WorldStateArchive worldStateArchive;
     final BlockchainQueries blockchainQueries;
-    final EthScheduler scheduler;
 
     private BlockchainWithData(
         final MutableBlockchain blockchain,
@@ -573,7 +589,6 @@ private BlockchainWithData(
       this.blockchain = blockchain;
       this.blockData = blockData;
       this.worldStateArchive = worldStateArchive;
-      this.scheduler = scheduler;
       this.blockchainQueries = new BlockchainQueries(blockchain, worldStateArchive, scheduler);
     }
   }
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/LogsQueryTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/LogsQueryTest.java
index 48e8bfc58d8..19932e3da2f 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/LogsQueryTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/LogsQueryTest.java
@@ -19,9 +19,9 @@
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Log;
-import org.hyperledger.besu.ethereum.core.LogTopic;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.log.LogTopic;
 
 import java.util.List;
 
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/PrivacyQueriesTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/PrivacyQueriesTest.java
index a1a77cc8dc6..1da57461ea3 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/PrivacyQueriesTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/PrivacyQueriesTest.java
@@ -22,18 +22,18 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.TransactionLocation;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Log;
-import org.hyperledger.besu.ethereum.core.LogTopic;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
 import org.hyperledger.besu.ethereum.core.PrivateTransactionReceiptTestFixture;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransactionReceipt;
 import org.hyperledger.besu.ethereum.privacy.PrivateWorldStateReader;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateTransactionMetadata;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.log.LogTopic;
 
 import java.util.Collections;
 import java.util.List;
@@ -211,7 +211,7 @@ private void mockReceiptsWithLogsAndTopics(
               new PrivateTransactionReceiptTestFixture().logs(List.of(log)).create();
 
           when(privateWorldStateReader.getPrivateTransactionReceipt(
-                  blockHash, metadata.getPrivacyMarkerTransactionHash()))
+                  blockHash, metadata.getPrivateMarkerTransactionHash()))
               .thenReturn(Optional.of(receipt));
         });
   }
@@ -222,7 +222,7 @@ private void mockBlockchainWithPMTs(
 
     for (int i = 0; i < transactionMetadataList.size(); i++) {
       final PrivateTransactionMetadata privateTransactionMetadata = transactionMetadataList.get(i);
-      final Hash pmtHash = privateTransactionMetadata.getPrivacyMarkerTransactionHash();
+      final Hash pmtHash = privateTransactionMetadata.getPrivateMarkerTransactionHash();
       final TransactionLocation pmtLocation = new TransactionLocation(blockHeader.getHash(), i);
       when(blockchainQueries.transactionLocationByHash(pmtHash))
           .thenReturn(Optional.of(pmtLocation));
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/cache/TransactionLogBloomCacherTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/cache/TransactionLogBloomCacherTest.java
index e0f25da395c..d7664520291 100644
--- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/cache/TransactionLogBloomCacherTest.java
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/cache/TransactionLogBloomCacherTest.java
@@ -23,15 +23,15 @@
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Log;
-import org.hyperledger.besu.ethereum.core.LogsBloomFilter;
 import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
 
 import java.io.File;
 import java.io.IOException;
@@ -40,6 +40,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.junit.Before;
@@ -65,7 +66,7 @@ public class TransactionLogBloomCacherTest {
   private TransactionLogBloomCacher transactionLogBloomCacher;
 
   @BeforeClass
-  public static void setupClass() throws IOException {
+  public static void setupClass() {
     final Address testAddress = Address.fromHexString("0x123456");
     final Bytes testMessage = Bytes.fromHexString("0x9876");
     final Log testLog = new Log(testAddress, testMessage, List.of());
@@ -100,13 +101,22 @@ public void setup() throws IOException {
             null,
             Hash.EMPTY,
             0,
+            null,
+            null,
+            null,
             new MainnetBlockHeaderFunctions());
     testHash = fakeHeader.getHash();
     when(blockchain.getBlockHeader(anyLong())).thenReturn(Optional.of(fakeHeader));
-    when(scheduler.scheduleFutureTask(any(Runnable.class), any(Duration.class)))
+    when(scheduler.scheduleFutureTask(any(Supplier.class), any(Duration.class)))
+        .thenAnswer(
+            invocation -> {
+              invocation.getArgument(0, Supplier.class).get();
+              return null;
+            });
+    when(scheduler.scheduleComputationTask(any(Supplier.class)))
         .thenAnswer(
             invocation -> {
-              invocation.getArgument(0, Runnable.class).run();
+              invocation.getArgument(0, Supplier.class).get();
               return null;
             });
     transactionLogBloomCacher =
@@ -128,12 +138,12 @@ public void shouldUpdateCacheWhenBlockAdded() throws IOException {
 
     createLogBloomCache(logBloom);
 
-    createBlock(3L);
+    final BlockHeader header = createBlock(3L);
 
     assertThat(logBloom.length()).isEqualTo(BLOOM_BITS_LENGTH * 3);
 
     transactionLogBloomCacher.cacheLogsBloomForBlockHeader(
-        blockchain.getBlockHeader(3).get(), Optional.empty(), Optional.of(logBloom));
+        header, Optional.empty(), Optional.of(logBloom));
 
     assertThat(logBloom.length()).isEqualTo(BLOOM_BITS_LENGTH * 4);
     assertThat(cacheDir.getRoot().list().length).isEqualTo(1);
@@ -152,7 +162,7 @@ public void shouldReloadCacheWhenBLockIsMissing() throws IOException {
     }
 
     transactionLogBloomCacher.cacheLogsBloomForBlockHeader(
-        blockchain.getBlockHeader(4).get(), Optional.empty(), Optional.of(logBloom));
+        blockHeaders.get(4), Optional.empty(), Optional.of(logBloom));
 
     for (int i = 0; i < 5; i++) {
       assertThat(blockHeaders.get(i).getLogsBloom().toArray())
@@ -193,7 +203,7 @@ public void shouldUpdateCacheWhenChainReorgFired() throws IOException {
     }
 
     transactionLogBloomCacher.cacheLogsBloomForBlockHeader(
-        blockchain.getBlockHeader(4).get(), Optional.empty(), Optional.of(logBloom));
+        firstBranch.get(4), Optional.empty(), Optional.of(logBloom));
     assertThat(logBloom.length()).isEqualTo(BLOOM_BITS_LENGTH * 5);
     for (int i = 0; i < 5; i++) {
       assertThat(firstBranch.get(i).getLogsBloom().toArray())
@@ -208,7 +218,7 @@ public void shouldUpdateCacheWhenChainReorgFired() throws IOException {
     }
 
     transactionLogBloomCacher.cacheLogsBloomForBlockHeader(
-        blockchain.getBlockHeader(4).get(), blockchain.getBlockHeader(1), Optional.of(logBloom));
+        forkBranch.get(4), Optional.of(firstBranch.get(1)), Optional.of(logBloom));
     assertThat(logBloom.length()).isEqualTo(BLOOM_BITS_LENGTH * 5);
     for (int i = 0; i < 5; i++) {
       assertThat(forkBranch.get(i).getLogsBloom().toArray())
@@ -216,7 +226,7 @@ public void shouldUpdateCacheWhenChainReorgFired() throws IOException {
     }
 
     transactionLogBloomCacher.cacheLogsBloomForBlockHeader(
-        blockchain.getBlockHeader(1).get(), Optional.empty(), Optional.of(logBloom));
+        forkBranch.get(1), Optional.empty(), Optional.of(logBloom));
     assertThat(logBloom.length()).isEqualTo(BLOOM_BITS_LENGTH * 2);
 
     assertThat(cacheDir.getRoot().list().length).isEqualTo(1);
@@ -231,7 +241,7 @@ private void createLogBloomCache(final File logBloom) throws IOException {
   private byte[] readLogBloomCache(final File logBloom, final long number) throws IOException {
     try (final RandomAccessFile randomAccessFile = new RandomAccessFile(logBloom, "r")) {
       randomAccessFile.seek(BLOOM_BITS_LENGTH * number);
-      byte[] retrievedLog = new byte[BLOOM_BITS_LENGTH];
+      final byte[] retrievedLog = new byte[BLOOM_BITS_LENGTH];
       randomAccessFile.read(retrievedLog);
       return retrievedLog;
     }
@@ -264,6 +274,9 @@ private BlockHeader createBlock(final long number, final Optional<String> messag
             null,
             Hash.EMPTY,
             0,
+            null,
+            null,
+            null,
             new MainnetBlockHeaderFunctions());
     testHash = fakeHeader.getHash();
     when(blockchain.getBlockHeader(number)).thenReturn(Optional.of(fakeHeader));
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/util/DomainObjectDecodeUtilsTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/util/DomainObjectDecodeUtilsTest.java
new file mode 100644
index 00000000000..942898b8128
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/util/DomainObjectDecodeUtilsTest.java
@@ -0,0 +1,76 @@
+/*
+ *
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.api.util;
+
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.encoding.TransactionEncoder;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.evm.AccessListEntry;
+
+import java.math.BigInteger;
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+public class DomainObjectDecodeUtilsTest {
+
+  static final BlockDataGenerator gen = new BlockDataGenerator();
+  private static final SECPSignature signature =
+      SignatureAlgorithmFactory.getInstance()
+          .createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 1);
+  private static final Address sender =
+      Address.fromHexString("0x0000000000000000000000000000000000000003");
+
+  private static final Transaction accessListTxn =
+      Transaction.builder()
+          .chainId(BigInteger.valueOf(2018))
+          .accessList(List.of(new AccessListEntry(gen.address(), List.of(gen.bytes32()))))
+          .nonce(1)
+          .gasPrice(Wei.of(12))
+          .gasLimit(43)
+          .payload(Bytes.EMPTY)
+          .value(Wei.ZERO)
+          .signature(signature)
+          .sender(sender)
+          .guessType()
+          .build();
+
+  @Test
+  public void testAccessListRLPSerDes() {
+    final BytesValueRLPOutput encoded = new BytesValueRLPOutput();
+    TransactionEncoder.encodeForWire(accessListTxn, encoded);
+    Transaction decoded =
+        DomainObjectDecodeUtils.decodeRawTransaction(encoded.encoded().toHexString());
+    Assertions.assertThat(decoded.getAccessList().isPresent()).isTrue();
+    Assertions.assertThat(decoded.getAccessList().map(List::size).get()).isEqualTo(1);
+  }
+
+  @Test
+  public void testAccessList2718OpaqueSerDes() {
+    final Bytes encoded = TransactionEncoder.encodeOpaqueBytes(accessListTxn);
+    Transaction decoded = DomainObjectDecodeUtils.decodeRawTransaction(encoded.toString());
+    Assertions.assertThat(decoded.getAccessList().isPresent()).isTrue();
+    Assertions.assertThat(decoded.getAccessList().map(List::size).get()).isEqualTo(1);
+  }
+}
diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/util/TestJsonRpcMethodsUtil.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/util/TestJsonRpcMethodsUtil.java
new file mode 100644
index 00000000000..ada9e87c937
--- /dev/null
+++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/util/TestJsonRpcMethodsUtil.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.api.util;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+
+import java.util.Optional;
+
+public class TestJsonRpcMethodsUtil {
+
+  public static JsonRpcMethod optionalEmptyResponse() {
+    return new JsonRpcMethod() {
+      @Override
+      public String getName() {
+        return "temp_optionalEmptyResponse";
+      }
+
+      @Override
+      public JsonRpcResponse response(final JsonRpcRequestContext request) {
+        return new JsonRpcSuccessResponse(request.getRequest().getId(), Optional.empty());
+      }
+    };
+  }
+
+  public static JsonRpcMethod optionalResponseWithValue(final Object value) {
+    return new JsonRpcMethod() {
+      @Override
+      public String getName() {
+        return "temp_optionalWithValueResponse";
+      }
+
+      @Override
+      public JsonRpcResponse response(final JsonRpcRequestContext request) {
+        return new JsonRpcSuccessResponse(request.getRequest().getId(), Optional.of(value));
+      }
+    };
+  }
+}
diff --git a/ethereum/api/src/test/resources/authentication/ee-jwt-secret-too-short.hex b/ethereum/api/src/test/resources/authentication/ee-jwt-secret-too-short.hex
new file mode 100644
index 00000000000..4c5ed1b175e
--- /dev/null
+++ b/ethereum/api/src/test/resources/authentication/ee-jwt-secret-too-short.hex
@@ -0,0 +1 @@
+9465710175a93a3f2d67b0cb98d92d44ead4d1126a12233571884de92a8edc
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/authentication/ee-jwt-secret.hex b/ethereum/api/src/test/resources/authentication/ee-jwt-secret.hex
new file mode 100644
index 00000000000..24eabc6977b
--- /dev/null
+++ b/ethereum/api/src/test/resources/authentication/ee-jwt-secret.hex
@@ -0,0 +1 @@
+9465710175a93a3f2d67b0cb98d92d44ead4d1126a12233571884de92a8edc76
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/authentication/jwt_public_key_ecdsa b/ethereum/api/src/test/resources/authentication/jwt_public_key_ecdsa
new file mode 100644
index 00000000000..65a23fa3ed7
--- /dev/null
+++ b/ethereum/api/src/test/resources/authentication/jwt_public_key_ecdsa
@@ -0,0 +1,4 @@
+-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEy8+qE0ZFo4woPUCXfszptuDgaDpW
+Sv6D5F/pbolJ2wZTVkYXoGhA3wqy1RM1RYmROp9NEPLm3mZP+kzI4TMiGg==
+-----END PUBLIC KEY-----
diff --git a/ethereum/api/src/test/resources/authentication/jwt_public_key b/ethereum/api/src/test/resources/authentication/jwt_public_key_rsa
similarity index 100%
rename from ethereum/api/src/test/resources/authentication/jwt_public_key
rename to ethereum/api/src/test/resources/authentication/jwt_public_key_rsa
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/block_withdrawals.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/block_withdrawals.json
new file mode 100644
index 00000000000..d24ae7f6a17
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/block_withdrawals.json
@@ -0,0 +1,20 @@
+{
+  "request": "{ block (number: 33) { number withdrawalsRoot withdrawals { index amount validator address } } }",
+  "response": {
+    "data": {
+      "block": {
+        "number": "0x21",
+        "withdrawalsRoot": "0x37945ab58d2712a26df2a38d217e822694927e29b30d5993d7a53ccea618d1f3",
+        "withdrawals": [
+          {
+            "index": "0x0",
+            "amount": "0x2540be400",
+            "validator": "0xa",
+            "address": "0x0000000000000000000000000000000000000dad"
+          }
+        ]
+      }
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/block_withdrawals_pre_shanghai.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/block_withdrawals_pre_shanghai.json
new file mode 100644
index 00000000000..dcd0b1834c3
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/block_withdrawals_pre_shanghai.json
@@ -0,0 +1,13 @@
+{
+  "request": "{ block (number: 32) { number withdrawalsRoot withdrawals { index amount } } }",
+  "response": {
+    "data": {
+      "block": {
+        "number": "0x20",
+        "withdrawalsRoot": null,
+        "withdrawals": null
+      }
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_blockNumber.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_blockNumber.json
index b3b73618509..247ec0146e5 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_blockNumber.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_blockNumber.json
@@ -1,11 +1,9 @@
 {
-  "request":     
-    "{ block { number } }",
-
-  "response":  {
-    "data" : {
-      "block" : {
-        "number" : 32
+  "request": "{ block { number } }",
+  "response": {
+    "data": {
+      "block": {
+        "number": "0x21"
       }
     }
   },
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_Block8.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_Block8.json
index 26a2eb4a457..ce54a411f62 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_Block8.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_Block8.json
@@ -1,13 +1,12 @@
 {
-  "request": "{block(number :\"0x8\") {number call (data : {from : \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", to: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", data :\"0x12a7b914\"}){data status}}}"
-  ,
-  "response":{
-    "data" : {
-      "block" : {
-        "number" : 8,
-        "call" : {
-          "data" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-          "status" : 1
+  "request": "{block(number :\"0x8\") {number call (data : {from : \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", to: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", data :\"0x12a7b914\"}){data status}}}",
+  "response": {
+    "data": {
+      "block": {
+        "number": "0x8",
+        "call": {
+          "data": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "status": "0x1"
         }
       }
     }
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_Block8_invalidHexBytesData.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_Block8_invalidHexBytesData.json
index 2d876b42707..942849e3339 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_Block8_invalidHexBytesData.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_Block8_invalidHexBytesData.json
@@ -1,10 +1,9 @@
 {
-  "request": "{block(number :\"0x8\") {number call (data : {from : \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", to: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", data :\"12a7b914\"}){data status}}}"
-  ,
+  "request": "{block(number :\"0x8\") {number call (data : {from : \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", to: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", data :\"12a7b914\"}){data status}}}",
   "response": {
     "errors": [
       {
-        "message": "Validation error of type WrongType: argument 'data.data' with value 'StringValue{value='12a7b914'}' is not a valid 'Bytes' - Bytes value '12a7b914' is not prefixed with 0x @ 'block/call'",
+        "message": "Validation error (WrongType@[block/call]) : argument 'data.data' with value 'StringValue{value='12a7b914'}' is not a valid 'Bytes' - Bytes value '12a7b914' is not prefixed with 0x",
         "locations": [
           {
             "line": 1,
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_BlockLatest.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_BlockLatest.json
index 7478c29a74f..9b5bb2fd89c 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_BlockLatest.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_BlockLatest.json
@@ -1,13 +1,12 @@
 {
-  "request": "{block {number call (data : {from : \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", to: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", data :\"0x12a7b914\"}){data status}}}"
-  ,
-  "response":{
-    "data" : {
-      "block" : {
-        "number" : 32,
-        "call" : {
-          "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
-          "status" : 1
+  "request": "{block {number call (data : {from : \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", to: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", data :\"0x12a7b914\"}){data status}}}",
+  "response": {
+    "data": {
+      "block": {
+        "number": "0x21",
+        "call": {
+          "data": "0x0000000000000000000000000000000000000000000000000000000000000001",
+          "status": "0x1"
         }
       }
     }
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_from_contract.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_from_contract.json
new file mode 100644
index 00000000000..211a97be18f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_call_from_contract.json
@@ -0,0 +1,15 @@
+{
+  "request": "{block {number call (data : {from : \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", to: \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", data :\"0x123456\"}){data status}}}",
+  "response": {
+    "data": {
+      "block": {
+        "number": "0x21",
+        "call": {
+          "data": "0x",
+          "status": "0x1"
+        }
+      }
+    }
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_contractDeploy.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_contractDeploy.json
index a97ae258671..664a0e0135d 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_contractDeploy.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_contractDeploy.json
@@ -1,10 +1,9 @@
 {
-
-  "request" :"{block{estimateGas (data: {from :\"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", data :\"0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029\"})}}",
-  "response":{
-    "data" : {
-      "block" : {
-        "estimateGas" : 111953
+  "request": "{block{estimateGas (data: {from :\"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", data :\"0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029\"})}}",
+  "response": {
+    "data": {
+      "block": {
+        "estimateGas": "0x1f099"
       }
     }
   },
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_from_contract.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_from_contract.json
new file mode 100644
index 00000000000..0836cf0dc3c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_from_contract.json
@@ -0,0 +1,11 @@
+{
+  "request": "{block{estimateGas (data : {from : \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", to: \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", data :\"0x123456\"})}}",
+  "response": {
+    "data": {
+      "block": {
+        "estimateGas": "0x5238"
+      }
+    }
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_noParams.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_noParams.json
index 251bd7ebe5b..54a84b893e6 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_noParams.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_noParams.json
@@ -1,12 +1,11 @@
 {
-  "request" :"{block{ estimateGas(data:{}) }}",
-  "response":{
-    "data" : {
-      "block" : {
-        "estimateGas" : 21000
+  "request": "{block{ estimateGas(data:{}) }}",
+  "response": {
+    "data": {
+      "block": {
+        "estimateGas": "0xcf08"
       }
     }
   },
-
   "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_transfer.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_transfer.json
index 7e8b72f7a17..e30ffcf607c 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_transfer.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_estimateGas_transfer.json
@@ -1,9 +1,9 @@
 {
-  "request" :"{block{estimateGas (data: {from :\"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", to :\"0x8888f1f195afa192cfee860698584c030f4c9db1\"})}}",
-  "response":{
-    "data" : {
-      "block" : {
-        "estimateGas" : 21000
+  "request": "{block{estimateGas (data: {from :\"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", to :\"0x8888f1f195afa192cfee860698584c030f4c9db1\"})}}",
+  "response": {
+    "data": {
+      "block": {
+        "estimateGas": "0x5208"
       }
     }
   },
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_gasPrice.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_gasPrice.json
index 87dd050416c..744e7ea98b9 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_gasPrice.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_gasPrice.json
@@ -1,10 +1,9 @@
 {
-  "request":     
-    "{ gasPrice }",
-
+  "request": "{ gasPrice maxPriorityFeePerGas }",
   "response": {
-    "data" : {
-      "gasPrice" : "0x1"
+    "data": {
+      "gasPrice": "0x1",
+      "maxPriorityFeePerGas": "0x0"
     }
   },
   "statusCode": 200
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_0x19.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_0x19.json
index 0fb6139a4c5..ffb6f29b19c 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_0x19.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_0x19.json
@@ -1,9 +1,11 @@
 {
-  "request": "{account(blockNumber:\"0x19\", address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { balance } }",
+  "request": "{ block(number:\"0x19\") { account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { balance } } }",
   "response": {
-    "data" : {
-      "account" : {
-        "balance" : "0xfa"
+    "data": {
+      "block": {
+        "account": {
+          "balance": "0xfa"
+        }
       }
     }
   },
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_invalidAccountBlockNumber.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_invalidAccountBlockNumber.json
index f335954c09a..05cc4ebbac1 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_invalidAccountBlockNumber.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_invalidAccountBlockNumber.json
@@ -1,25 +1,14 @@
 {
-  "request": "{account(blockNumber:\"0x19\", address: \"0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef\") { balance } }",
+  "request": "{ block(number:\"0x19\") { account(address: \"0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef\") { balance } } }",
   "response": {
-    "errors": [
-      {
-        "message": "Exception while fetching data (/account) : Account with address 0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef does not exist",
-        "locations": [
-          {
-            "line": 1,
-            "column": 2
-          }
-        ],
-        "path": [
-          "account"
-        ],
-        "extensions": {
-          "classification": "DataFetchingException"
+    "data": {
+      "block": {
+        "account": {
+          "balance": "0x0"
         }
       }
-    ],
-    "data": null
+    }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
 
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_invalidAccountLatest.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_invalidAccountLatest.json
index e3cae9f064f..f8a30f59f0f 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_invalidAccountLatest.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_invalidAccountLatest.json
@@ -1,25 +1,14 @@
 {
-  "request": "{account(address: \"0xdeaff00ddeaff00ddeaff00ddeaff00ddeaff00d\") { balance } }",
+  "request": "{ pending { account(address: \"0xdeaff00ddeaff00ddeaff00ddeaff00ddeaff00d\") { balance } } }",
   "response": {
-    "errors": [
-      {
-        "message": "Exception while fetching data (/account) : Account with address 0xdeaff00ddeaff00ddeaff00ddeaff00ddeaff00d does not exist",
-        "locations": [
-          {
-            "line": 1,
-            "column": 2
-          }
-        ],
-        "path": [
-          "account"
-        ],
-        "extensions": {
-          "classification": "DataFetchingException"
+    "data": {
+      "pending": {
+        "account": {
+          "balance": "0x0"
         }
       }
-    ],
-    "data": null
+    }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
 
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_latest.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_latest.json
index 2ff04665d8f..018772a9e8a 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_latest.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_latest.json
@@ -1,9 +1,11 @@
 {
-  "request": "{account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { balance } }",
+  "request": "{ pending { account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { balance } } }",
   "response": {
-    "data" : {
-      "account" : {
-        "balance" : "0x140"
+    "data": {
+      "pending": {
+        "account": {
+          "balance": "0x140"
+        }
       }
     }
   },
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_toobig_bn.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_toobig_bn.json
index a522455c35c..cbc24c848e1 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_toobig_bn.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_toobig_bn.json
@@ -1,26 +1,26 @@
 {
-  "request": "{account(blockNumber:\"0x21\", address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { balance } }",
+  "request": "{ block(number:\"0x22\") { account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { balance } } }",
   "response": {
     "errors": [
       {
-        "message": "Exception while fetching data (/account) : Invalid params",
+        "message": "Exception while fetching data (/block) : Block number 34 was not found",
         "locations": [
           {
             "line": 1,
-            "column": 2
+            "column": 3
           }
         ],
         "path": [
-          "account"
+          "block"
         ],
         "extensions": {
-          "errorCode": -32602,
-          "errorMessage": "Invalid params",
           "classification": "DataFetchingException"
         }
       }
     ],
-    "data": null
+    "data": {
+      "block": null
+    }
   },
   "statusCode": 400
 }
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_without_addr.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_without_addr.json
index 3db97b24627..407b7319839 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_without_addr.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBalance_without_addr.json
@@ -1,13 +1,13 @@
 {
-  "request": "{account { balance } }",
+  "request": "{ pending { account { balance } } }",
   "response": {
     "errors": [
       {
-        "message": "Validation error of type MissingFieldArgument: Missing field argument address @ 'account'",
+        "message": "Validation error (MissingFieldArgument@[pending/account]) : Missing field argument 'address'",
         "locations": [
           {
             "line": 1,
-            "column": 2
+            "column": 13
           }
         ],
         "extensions": {
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlockTransactionCount_byHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlockTransactionCount_byHash.json
index 9ee5053e36a..a744313b7e8 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlockTransactionCount_byHash.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlockTransactionCount_byHash.json
@@ -1,13 +1,9 @@
 {
-  "request": 
-    
-    "{block (hash : \"0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6\") {transactionCount}} ",
-
-
-  "response":  {
-    "data" : {
-      "block" : {
-        "transactionCount" : 1
+  "request": "{block (hash : \"0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6\") {transactionCount}} ",
+  "response": {
+    "data": {
+      "block": {
+        "transactionCount": "0x1"
       }
     }
   },
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlockTransactionCount_byNumber.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlockTransactionCount_byNumber.json
index db2a5684eee..fa694a254a8 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlockTransactionCount_byNumber.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlockTransactionCount_byNumber.json
@@ -1,31 +1,29 @@
 {
-  "request": 
-    
-    "{block (number : \"0x1e\") {transactions{hash} timestamp difficulty totalDifficulty gasUsed gasLimit hash nonce ommerCount logsBloom mixHash ommerHash extraData stateRoot receiptsRoot transactionCount transactionsRoot}} ",
-
-
-  "response":  {
-    "data" : {
-      "block" : {
-        "transactions" : [ {
-          "hash" : "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4"
-        } ],
-        "timestamp" : "0x561bc336",
-        "difficulty" : "0x20740",
-        "totalDifficulty" : "0x3e6cc0",
-        "gasUsed" : 23585,
-        "gasLimit" : 3141592,
-        "hash" : "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6",
-        "nonce" : "0x5c321bd9e9f040f1",
-        "ommerCount" : 0,
-        "logsBloom" : "0x00000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000080000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000400000000000000000200000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000800000000040000000000000000000000000000000000000000010000000000000000000000000",
-        "mixHash" : "0x6ce1c4afb4f85fefd1b0ed966b20cd248f08d9a5b0df773f75c6c2f5cc237b7c",
-        "ommerHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-        "extraData" : "0x",
-        "stateRoot" : "0xdb46d6bb168130fe2cb60b4b24346137b5741f11283e0d7edace65c5f5466b2e",
-        "receiptsRoot" : "0x88b3b304b058b39791c26fdb94a05cc16ce67cf8f84f7348cb3c60c0ff342d0d",
-        "transactionCount" : 1,
-        "transactionsRoot" : "0x5a8d5d966b48e1331ae19eb459eb28882cdc7654e615d37774b79204e875dc01"
+  "request": "{block (number : \"0x1e\") {transactions{hash} timestamp difficulty totalDifficulty gasUsed gasLimit hash nonce ommerCount logsBloom mixHash ommerHash extraData stateRoot receiptsRoot transactionCount transactionsRoot}} ",
+  "response": {
+    "data": {
+      "block": {
+        "transactions": [
+          {
+            "hash": "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4"
+          }
+        ],
+        "timestamp": "0x561bc336",
+        "difficulty": "0x20740",
+        "totalDifficulty": "0x3e6cc0",
+        "gasUsed": "0x5c21",
+        "gasLimit": "0x2fefd8",
+        "hash": "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6",
+        "nonce": "0x5c321bd9e9f040f1",
+        "ommerCount": "0x0",
+        "logsBloom": "0x00000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000080000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000400000000000000000200000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000800000000040000000000000000000000000000000000000000010000000000000000000000000",
+        "mixHash": "0x6ce1c4afb4f85fefd1b0ed966b20cd248f08d9a5b0df773f75c6c2f5cc237b7c",
+        "ommerHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+        "extraData": "0x",
+        "stateRoot": "0xdb46d6bb168130fe2cb60b4b24346137b5741f11283e0d7edace65c5f5466b2e",
+        "receiptsRoot": "0x88b3b304b058b39791c26fdb94a05cc16ce67cf8f84f7348cb3c60c0ff342d0d",
+        "transactionCount": "0x1",
+        "transactionsRoot": "0x5a8d5d966b48e1331ae19eb459eb28882cdc7654e615d37774b79204e875dc01"
       }
     }
   },
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHash.json
index 9b44e00ba3f..2c88617ee68 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHash.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHash.json
@@ -1,32 +1,30 @@
 {
-  "request":
-
-    "{block (hash : \"0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6\") {number transactions{hash} timestamp difficulty totalDifficulty gasUsed gasLimit hash nonce ommerCount logsBloom mixHash ommerHash extraData stateRoot receiptsRoot transactionCount transactionsRoot}} ",
-
-
-  "response":  {
-    "data" : {
-      "block" : {
-        "number" : 30,
-        "transactions" : [ {
-          "hash" : "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4"
-        } ],
-        "timestamp" : "0x561bc336",
-        "difficulty" : "0x20740",
-        "totalDifficulty" : "0x3e6cc0",
-        "gasUsed" : 23585,
-        "gasLimit" : 3141592,
-        "hash" : "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6",
-        "nonce" : "0x5c321bd9e9f040f1",
-        "ommerCount" : 0,
-        "logsBloom" : "0x00000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000080000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000400000000000000000200000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000800000000040000000000000000000000000000000000000000010000000000000000000000000",
-        "mixHash" : "0x6ce1c4afb4f85fefd1b0ed966b20cd248f08d9a5b0df773f75c6c2f5cc237b7c",
-        "ommerHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-        "extraData" : "0x",
-        "stateRoot" : "0xdb46d6bb168130fe2cb60b4b24346137b5741f11283e0d7edace65c5f5466b2e",
-        "receiptsRoot" : "0x88b3b304b058b39791c26fdb94a05cc16ce67cf8f84f7348cb3c60c0ff342d0d",
-        "transactionCount" : 1,
-        "transactionsRoot" : "0x5a8d5d966b48e1331ae19eb459eb28882cdc7654e615d37774b79204e875dc01"
+  "request": "{block (hash : \"0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6\") {number transactions{hash} timestamp difficulty totalDifficulty gasUsed gasLimit hash nonce ommerCount logsBloom mixHash ommerHash extraData stateRoot receiptsRoot transactionCount transactionsRoot}} ",
+  "response": {
+    "data": {
+      "block": {
+        "number": "0x1e",
+        "transactions": [
+          {
+            "hash": "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4"
+          }
+        ],
+        "timestamp": "0x561bc336",
+        "difficulty": "0x20740",
+        "totalDifficulty": "0x3e6cc0",
+        "gasUsed": "0x5c21",
+        "gasLimit": "0x2fefd8",
+        "hash": "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6",
+        "nonce": "0x5c321bd9e9f040f1",
+        "ommerCount": "0x0",
+        "logsBloom": "0x00000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000080000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000400000000000000000200000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000800000000040000000000000000000000000000000000000000010000000000000000000000000",
+        "mixHash": "0x6ce1c4afb4f85fefd1b0ed966b20cd248f08d9a5b0df773f75c6c2f5cc237b7c",
+        "ommerHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+        "extraData": "0x",
+        "stateRoot": "0xdb46d6bb168130fe2cb60b4b24346137b5741f11283e0d7edace65c5f5466b2e",
+        "receiptsRoot": "0x88b3b304b058b39791c26fdb94a05cc16ce67cf8f84f7348cb3c60c0ff342d0d",
+        "transactionCount": "0x1",
+        "transactionsRoot": "0x5a8d5d966b48e1331ae19eb459eb28882cdc7654e615d37774b79204e875dc01"
       }
     }
   },
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHashInvalid.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHashInvalid.json
index f2651133f8d..a1ec74511c3 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHashInvalid.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHashInvalid.json
@@ -18,7 +18,9 @@
         }
       }
     ],
-    "data": null
+    "data": {
+      "block": null
+    }
   },
   "statusCode": 400
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHash_InvalidHexBytes32Hash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHash_InvalidHexBytes32Hash.json
index 792775e910d..415ea8e9e03 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHash_InvalidHexBytes32Hash.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byHash_InvalidHexBytes32Hash.json
@@ -3,7 +3,7 @@
   "response": {
     "errors": [
       {
-        "message": "Validation error of type WrongType: argument 'hash' with value 'StringValue{value='c8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6'}' is not a valid 'Bytes32' - Bytes32 value 'c8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6' is not prefixed with 0x @ 'block'",
+        "message": "Validation error (WrongType@[block]) : argument 'hash' with value 'StringValue{value='c8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6'}' is not a valid 'Bytes32' - Bytes32 value 'c8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6' is not prefixed with 0x",
         "locations": [
           {
             "line": 1,
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byNumber.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byNumber.json
index 2c85fdbce0d..f9c9c7ece8c 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byNumber.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byNumber.json
@@ -1,41 +1,39 @@
 {
-  "request": 
-    
-    "{block (number : \"0x1e\") {transactions{hash} timestamp difficulty totalDifficulty gasUsed gasLimit hash nonce ommerCount logsBloom mixHash ommerHash extraData stateRoot receiptsRoot transactionCount transactionsRoot ommers{hash} ommerAt(index : 1){hash} miner{address} account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\"){balance} parent{hash} }} ",
-
-
-  "response":{
-    "data" : {
-      "block" : {
-        "transactions" : [ {
-          "hash" : "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4"
-        } ],
-        "timestamp" : "0x561bc336",
-        "difficulty" : "0x20740",
-        "totalDifficulty" : "0x3e6cc0",
-        "gasUsed" : 23585,
-        "gasLimit" : 3141592,
-        "hash" : "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6",
-        "nonce" : "0x5c321bd9e9f040f1",
-        "ommerCount" : 0,
-        "logsBloom" : "0x00000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000080000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000400000000000000000200000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000800000000040000000000000000000000000000000000000000010000000000000000000000000",
-        "mixHash" : "0x6ce1c4afb4f85fefd1b0ed966b20cd248f08d9a5b0df773f75c6c2f5cc237b7c",
-        "ommerHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-        "extraData" : "0x",
-        "stateRoot" : "0xdb46d6bb168130fe2cb60b4b24346137b5741f11283e0d7edace65c5f5466b2e",
-        "receiptsRoot" : "0x88b3b304b058b39791c26fdb94a05cc16ce67cf8f84f7348cb3c60c0ff342d0d",
-        "transactionCount" : 1,
-        "transactionsRoot" : "0x5a8d5d966b48e1331ae19eb459eb28882cdc7654e615d37774b79204e875dc01",
-        "ommers" : [ ],
-        "ommerAt" : null,
-        "miner" : {
-          "address" : "0x8888f1f195afa192cfee860698584c030f4c9db1"
+  "request": "{block (number : \"0x1e\") {transactions{hash} timestamp difficulty totalDifficulty gasUsed gasLimit hash nonce ommerCount logsBloom mixHash ommerHash extraData stateRoot receiptsRoot transactionCount transactionsRoot ommers{hash} ommerAt(index : 1){hash} miner{address} account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\"){balance} parent{hash} }} ",
+  "response": {
+    "data": {
+      "block": {
+        "transactions": [
+          {
+            "hash": "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4"
+          }
+        ],
+        "timestamp": "0x561bc336",
+        "difficulty": "0x20740",
+        "totalDifficulty": "0x3e6cc0",
+        "gasUsed": "0x5c21",
+        "gasLimit": "0x2fefd8",
+        "hash": "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6",
+        "nonce": "0x5c321bd9e9f040f1",
+        "ommerCount": "0x0",
+        "logsBloom": "0x00000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000080000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000400000000000000000200000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000800000000040000000000000000000000000000000000000000010000000000000000000000000",
+        "mixHash": "0x6ce1c4afb4f85fefd1b0ed966b20cd248f08d9a5b0df773f75c6c2f5cc237b7c",
+        "ommerHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+        "extraData": "0x",
+        "stateRoot": "0xdb46d6bb168130fe2cb60b4b24346137b5741f11283e0d7edace65c5f5466b2e",
+        "receiptsRoot": "0x88b3b304b058b39791c26fdb94a05cc16ce67cf8f84f7348cb3c60c0ff342d0d",
+        "transactionCount": "0x1",
+        "transactionsRoot": "0x5a8d5d966b48e1331ae19eb459eb28882cdc7654e615d37774b79204e875dc01",
+        "ommers": [],
+        "ommerAt": null,
+        "miner": {
+          "address": "0x8888f1f195afa192cfee860698584c030f4c9db1"
         },
-        "account" : {
-          "balance" : "0x12c"
+        "account": {
+          "balance": "0x12c"
         },
-        "parent" : {
-          "hash" : "0xf8cfa377bd766cdf22edb388dd08cc149e85d24f2796678c835f3c54ab930803"
+        "parent": {
+          "hash": "0xf8cfa377bd766cdf22edb388dd08cc149e85d24f2796678c835f3c54ab930803"
         }
       }
     }
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byNumberInvalid.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byNumberInvalid.json
index 6c80bff0894..9022d6d3c52 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byNumberInvalid.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_byNumberInvalid.json
@@ -18,7 +18,9 @@
         }
       }
     ],
-    "data": null
+    "data": {
+      "block": null
+    }
   },
   "statusCode": 400
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_shanghai.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_shanghai.json
new file mode 100644
index 00000000000..3e98251971b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_shanghai.json
@@ -0,0 +1,29 @@
+{
+  "request": "{block (number : 33) { baseFeePerGas difficulty extraData miner { address } mixHash nonce stateRoot totalDifficulty withdrawalsRoot withdrawals { address amount index validator } }} ",
+  "response": {
+    "data": {
+      "block": {
+        "baseFeePerGas": "0x3b9aca00",
+        "difficulty": "0x0",
+        "extraData": "0x",
+        "miner": {
+          "address": "0x0000000000000000000000000000000000000000"
+        },
+        "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "nonce": "0x0000000000000000",
+        "stateRoot": "0x0d3c456bb68669bad05da3a1a766daab236c9df1da8f74edf5ebe9383f00084c",
+        "totalDifficulty": "0x427c00",
+        "withdrawalsRoot": "0x37945ab58d2712a26df2a38d217e822694927e29b30d5993d7a53ccea618d1f3",
+        "withdrawals": [
+          {
+            "address": "0x0000000000000000000000000000000000000dad",
+            "amount": "0x2540be400",
+            "index": "0x0",
+            "validator": "0xa"
+          }
+        ]
+      }
+    }
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_wrongParams.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_wrongParams.json
index d71a9c55ba1..178e91829ef 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_wrongParams.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getBlock_wrongParams.json
@@ -20,7 +20,9 @@
         }
       }
     ],
-    "data": null
+    "data": {
+      "block": null
+    }
   },
   "statusCode": 400
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getCode.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getCode.json
index 94ab5411b4c..e9e1ea45576 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getCode.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getCode.json
@@ -1,13 +1,13 @@
 {
-  "request" : "{ account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { code } }",
-
+  "request": "{ pending { account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { code } } }",
   "response": {
-    "data" : {
-      "account" :{
-          "code" :"0x6000357c010000000000000000000000000000000000000000000000000000000090048063102accc11461012c57806312a7b9141461013a5780631774e6461461014c5780631e26fd331461015d5780631f9030371461016e578063343a875d1461018057806338cc4831146101955780634e7ad367146101bd57806357cb2fc4146101cb57806365538c73146101e057806368895979146101ee57806376bc21d9146102005780639a19a9531461020e5780639dc2c8f51461021f578063a53b1c1e1461022d578063a67808571461023e578063b61c05031461024c578063c2b12a731461025a578063d2282dc51461026b578063e30081a01461027c578063e8beef5b1461028d578063f38b06001461029b578063f5b53e17146102a9578063fd408767146102bb57005b6101346104d6565b60006000f35b61014261039b565b8060005260206000f35b610157600435610326565b60006000f35b6101686004356102c9565b60006000f35b610176610442565b8060005260206000f35b6101886103d3565b8060ff1660005260206000f35b61019d610413565b8073ffffffffffffffffffffffffffffffffffffffff1660005260206000f35b6101c56104c5565b60006000f35b6101d36103b7565b8060000b60005260206000f35b6101e8610454565b60006000f35b6101f6610401565b8060005260206000f35b61020861051f565b60006000f35b6102196004356102e5565b60006000f35b610227610693565b60006000f35b610238600435610342565b60006000f35b610246610484565b60006000f35b610254610493565b60006000f35b61026560043561038d565b60006000f35b610276600435610350565b60006000f35b61028760043561035e565b60006000f35b6102956105b4565b60006000f35b6102a3610547565b60006000f35b6102b16103ef565b8060005260206000f35b6102c3610600565b60006000f35b80600060006101000a81548160ff021916908302179055505b50565b80600060016101000a81548160ff02191690837f01000000000000000000000000000000000000000000000000000000000000009081020402179055505b50565b80600060026101000a81548160ff021916908302179055505b50565b806001600050819055505b50565b806002600050819055505b50565b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908302179055505b50565b806004600050819055505b50565b6000600060009054906101000a900460ff1690506103b4565b90565b6000600060019054906101000a900460000b90506103d0565b90565b6000600060029054906101000a900460ff1690506103ec565b90565b600060016000505490506103fe565b90565b60006002600050549050610410565b90565b6000600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905061043f565b90565b60006004600050549050610451565b90565b7f65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be5806000602a81526020016000a15b565b6000602a81526020016000a05b565b60017f81933b308056e7e85668661dcd102b1f22795b4431f9cf4625794f381c271c6b6000602a81526020016000a25b565b60016000602a81526020016000a15b565b3373ffffffffffffffffffffffffffffffffffffffff1660017f0e216b62efbb97e751a2ce09f607048751720397ecfb9eef1e48a6644948985b6000602a81526020016000a35b565b3373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a25b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017f317b31292193c2a4f561cc40a95ea0d97a2733f14af6d6d59522473e1f3ae65f6000602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a35b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017fd5f0a30e4be0c6be577a71eceb7464245a796a7e6a55c0d971837b250de05f4e60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff16600160007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a35b56"
+    "data": {
+      "pending": {
+        "account": {
+          "code": "0x6000357c010000000000000000000000000000000000000000000000000000000090048063102accc11461012c57806312a7b9141461013a5780631774e6461461014c5780631e26fd331461015d5780631f9030371461016e578063343a875d1461018057806338cc4831146101955780634e7ad367146101bd57806357cb2fc4146101cb57806365538c73146101e057806368895979146101ee57806376bc21d9146102005780639a19a9531461020e5780639dc2c8f51461021f578063a53b1c1e1461022d578063a67808571461023e578063b61c05031461024c578063c2b12a731461025a578063d2282dc51461026b578063e30081a01461027c578063e8beef5b1461028d578063f38b06001461029b578063f5b53e17146102a9578063fd408767146102bb57005b6101346104d6565b60006000f35b61014261039b565b8060005260206000f35b610157600435610326565b60006000f35b6101686004356102c9565b60006000f35b610176610442565b8060005260206000f35b6101886103d3565b8060ff1660005260206000f35b61019d610413565b8073ffffffffffffffffffffffffffffffffffffffff1660005260206000f35b6101c56104c5565b60006000f35b6101d36103b7565b8060000b60005260206000f35b6101e8610454565b60006000f35b6101f6610401565b8060005260206000f35b61020861051f565b60006000f35b6102196004356102e5565b60006000f35b610227610693565b60006000f35b610238600435610342565b60006000f35b610246610484565b60006000f35b610254610493565b60006000f35b61026560043561038d565b60006000f35b610276600435610350565b60006000f35b61028760043561035e565b60006000f35b6102956105b4565b60006000f35b6102a3610547565b60006000f35b6102b16103ef565b8060005260206000f35b6102c3610600565b60006000f35b80600060006101000a81548160ff021916908302179055505b50565b80600060016101000a81548160ff02191690837f01000000000000000000000000000000000000000000000000000000000000009081020402179055505b50565b80600060026101000a81548160ff021916908302179055505b50565b806001600050819055505b50565b806002600050819055505b50565b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908302179055505b50565b806004600050819055505b50565b6000600060009054906101000a900460ff1690506103b4565b90565b6000600060019054906101000a900460000b90506103d0565b90565b6000600060029054906101000a900460ff1690506103ec565b90565b600060016000505490506103fe565b90565b60006002600050549050610410565b90565b6000600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905061043f565b90565b60006004600050549050610451565b90565b7f65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be5806000602a81526020016000a15b565b6000602a81526020016000a05b565b60017f81933b308056e7e85668661dcd102b1f22795b4431f9cf4625794f381c271c6b6000602a81526020016000a25b565b60016000602a81526020016000a15b565b3373ffffffffffffffffffffffffffffffffffffffff1660017f0e216b62efbb97e751a2ce09f607048751720397ecfb9eef1e48a6644948985b6000602a81526020016000a35b565b3373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a25b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017f317b31292193c2a4f561cc40a95ea0d97a2733f14af6d6d59522473e1f3ae65f6000602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a35b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017fd5f0a30e4be0c6be577a71eceb7464245a796a7e6a55c0d971837b250de05f4e60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff16600160007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a35b56"
+        }
       }
     }
   },
-
   "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getCode_noCode.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getCode_noCode.json
index 6dc35681905..55dad6d0ffa 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getCode_noCode.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getCode_noCode.json
@@ -1,14 +1,13 @@
 {
-  "request" : "{ account(address: \"0x8888f1f195afa192cfee860698584c030f4c9db1\") { code } }",
-
+  "request": "{ pending { account(address: \"0x8888f1f195afa192cfee860698584c030f4c9db1\") { code } } }",
   "response": {
-    "data" : {
-      "account" :{
-          "code" :"0x"
+    "data": {
+      "pending": {
+        "account": {
+          "code": "0x"
+        }
       }
     }
   },
-
   "statusCode": 200
-  
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_emptyListParam.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_emptyListParam.json
new file mode 100644
index 00000000000..f4d645018d9
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_emptyListParam.json
@@ -0,0 +1,27 @@
+{
+  "request": "{  block(number: \"0x20\") { logs( filter: {  topics :  [[], [\"0x000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b\"]]}) { index  topics  data account{address} transaction{hash} }  } }",
+  "response": {
+    "data": {
+      "block": {
+        "logs": [
+          {
+            "index": "0x0",
+            "topics": [
+              "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "0x000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+              "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+            ],
+            "data": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe9000000000000000000000000000000000000000000000000000000000000002a",
+            "account": {
+              "address": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"
+            },
+            "transaction": {
+              "hash": "0xcef53f2311d7c80e9086d661e69ac11a5f3d081e28e02a9ba9b66749407ac310"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_matchAnyTopic.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_matchAnyTopic.json
new file mode 100644
index 00000000000..eb56dccac12
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_matchAnyTopic.json
@@ -0,0 +1,25 @@
+{
+  "request": "{  block(number: \"0x17\") { logs( filter: {  topics :  []}) { index  topics  data account{address} transaction{hash} }  } }",
+  "response": {
+    "data": {
+      "block": {
+        "logs": [
+          {
+            "index": "0x0",
+            "topics": [
+              "0x65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be580"
+            ],
+            "data": "0x000000000000000000000000000000000000000000000000000000000000002a",
+            "account": {
+              "address": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"
+            },
+            "transaction": {
+              "hash": "0x97a385bf570ced7821c6495b3877ddd2afd5c452f350f0d4876e98d9161389c6"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_matchTopic.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_matchTopic.json
index 46f79ccd757..7a674cd57b8 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_matchTopic.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_matchTopic.json
@@ -1,22 +1,25 @@
 {
   "request": "{  block(number: \"0x17\") { logs( filter: {  topics :  [[\"0x000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b\", \"0x65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be580\"]]}) { index  topics  data account{address} transaction{hash} }  } }",
   "response": {
-    "data" : {
-      "block" : {
-        "logs" : [ {
-          "index" : 0,
-          "topics" : [ "0x65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be580" ],
-          "data" : "0x000000000000000000000000000000000000000000000000000000000000002a",
-          "account" : {
-            "address" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"
-          },
-          "transaction" : {
-            "hash" : "0x97a385bf570ced7821c6495b3877ddd2afd5c452f350f0d4876e98d9161389c6"
+    "data": {
+      "block": {
+        "logs": [
+          {
+            "index": "0x0",
+            "topics": [
+              "0x65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be580"
+            ],
+            "data": "0x000000000000000000000000000000000000000000000000000000000000002a",
+            "account": {
+              "address": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"
+            },
+            "transaction": {
+              "hash": "0x97a385bf570ced7821c6495b3877ddd2afd5c452f350f0d4876e98d9161389c6"
+            }
           }
-        } ]
+        ]
       }
     }
   },
-
   "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_range.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_range.json
index 34416ddb867..1d54cdf6285 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_range.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getLogs_range.json
@@ -4,7 +4,7 @@
     "data": {
       "logs": [
         {
-          "index": 0,
+          "index": "0x0",
           "topics": [
             "0x65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be580"
           ],
@@ -15,12 +15,12 @@
           "transaction": {
             "hash": "0x97a385bf570ced7821c6495b3877ddd2afd5c452f350f0d4876e98d9161389c6",
             "block": {
-              "number": 23
+              "number": "0x17"
             }
           }
         },
         {
-          "index": 0,
+          "index": "0x0",
           "topics": [],
           "data": "0x000000000000000000000000000000000000000000000000000000000000002a",
           "account": {
@@ -29,7 +29,7 @@
           "transaction": {
             "hash": "0x5ecd942096ab3f70c5bcc8f3a98f88c4ff0a3bd986417df9948eb1819db76d0e",
             "block": {
-              "number": 24
+              "number": "0x18"
             }
           }
         }
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getStorageAt.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getStorageAt.json
index aba1ecb1739..591be7bfd5b 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getStorageAt.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getStorageAt.json
@@ -1,13 +1,13 @@
 {
-  "request" :"{ account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { storage(slot: \"0x00000000000000000000000000000004\") } }",
-
+  "request": "{ pending { account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { storage(slot: \"0x00000000000000000000000000000004\") } } }",
   "response": {
-    "data" : {
-      "account" :{
-          "storage" :"0xaabbccffffffffffffffffffffffffffffffffffffffffffffffffffffffffee"
+    "data": {
+      "pending": {
+        "account": {
+          "storage": "0xaabbccffffffffffffffffffffffffffffffffffffffffffffffffffffffffee"
+        }
       }
     }
   },
-
   "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getStorageAt_illegalRangeGreaterThan.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getStorageAt_illegalRangeGreaterThan.json
index 535dd825d70..85d7d8ce9d7 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getStorageAt_illegalRangeGreaterThan.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getStorageAt_illegalRangeGreaterThan.json
@@ -1,13 +1,13 @@
 {
-  "request" :"{ account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { storage(slot: \"0x00000000000000000000000000000021\") } }",
-
-  "response":{
-    "data" : {
-      "account" : {
-        "storage" : "0x0000000000000000000000000000000000000000000000000000000000000000"
+  "request": "{ pending { account(address: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { storage(slot: \"0x00000000000000000000000000000021\") } } }",
+  "response": {
+    "data": {
+      "pending": {
+        "account": {
+          "storage": "0x0000000000000000000000000000000000000000000000000000000000000000"
+        }
       }
     }
   },
-
   "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransactionCount.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransactionCount.json
index 78d5822bb59..a1fc9e307c2 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransactionCount.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransactionCount.json
@@ -1,13 +1,13 @@
 {
-  "request" :"{ account(address: \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\") { transactionCount } }",
-
+  "request": "{ pending { account(address: \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\") { transactionCount } } }",
   "response": {
-    "data" : {
-      "account" :{
-          "transactionCount" : 32
+    "data": {
+      "pending": {
+        "account": {
+          "transactionCount": "0x21"
+        }
       }
     }
   },
-
   "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransactionReceipt.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransactionReceipt.json
index 9a3454d437e..983b460f617 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransactionReceipt.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransactionReceipt.json
@@ -1,27 +1,27 @@
-{ 
-  "request" : "{ transaction(hash: \"0x812742182a79a8e67733edc58cfa3767aa2d7ad06439d156ddbbb33e3403b4ed\") {block{hash logsBloom} hash createdContract{address} cumulativeGasUsed gas gasUsed logs{topics} from{address} to{address}  index } }",
-  
-  "response":{
-    "data" : {
-      "transaction" : {
-        "block" : {
-          "hash" : "0x10aaf14a53caf27552325374429d3558398a36d3682ede6603c2c6511896e9f9",
-          "logsBloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+{
+  "request": "{ transaction(hash: \"0x812742182a79a8e67733edc58cfa3767aa2d7ad06439d156ddbbb33e3403b4ed\") {block{hash logsBloom} hash createdContract{address} cumulativeGasUsed gas gasUsed logs{topics} from{address} to{address}  index } }",
+  "response": {
+    "data": {
+      "transaction": {
+        "block": {
+          "hash": "0x10aaf14a53caf27552325374429d3558398a36d3682ede6603c2c6511896e9f9",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
         },
-        "hash" : "0x812742182a79a8e67733edc58cfa3767aa2d7ad06439d156ddbbb33e3403b4ed",
-        "createdContract" : null,
-        "cumulativeGasUsed" : 493172,
-        "gas" : 3141592,
-        "gasUsed" : 493172,
-        "logs" : [ ],
-        "from" : {
-          "address" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+        "hash": "0x812742182a79a8e67733edc58cfa3767aa2d7ad06439d156ddbbb33e3403b4ed",
+        "createdContract": {
+          "address": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"
         },
-        "to" : null,
-        "index" : 0
+        "cumulativeGasUsed": "0x78674",
+        "gas": "0x2fefd8",
+        "gasUsed": "0x78674",
+        "logs": [],
+        "from": {
+          "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+        },
+        "to": null,
+        "index": "0x0"
       }
     }
   },
-  
   "statusCode": 200
 }
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockHashAndIndex.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockHashAndIndex.json
index 50c82e95365..649015ff2c7 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockHashAndIndex.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockHashAndIndex.json
@@ -1,20 +1,16 @@
 {
-  "request": 
-    
-  "{ block(hash: \"0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6\") { transactionAt(index: 0) {block{hash}  hash } } }",
-
-  "response":{
-    "data" : {
-      "block" : {
-        "transactionAt" : {
-          "block" : {
-            "hash" : "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6"
+  "request": "{ block(hash: \"0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6\") { transactionAt(index: 0) {block{hash}  hash } } }",
+  "response": {
+    "data": {
+      "block": {
+        "transactionAt": {
+          "block": {
+            "hash": "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6"
           },
-          "hash" : "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4"
+          "hash": "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4"
         }
       }
     }
   },
- 
   "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndIndex.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndIndex.json
index 84f8b19b323..c6cfbfcf7ec 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndIndex.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndIndex.json
@@ -1,20 +1,16 @@
 {
-  "request": 
-    
-  "{ block(number: \"0x1e\") { transactionAt(index: 0) {block{hash}  hash} } }",
-
-  "response":{
-    "data" : {
-      "block" : {
-        "transactionAt" : {
-          "block" : {
-            "hash" : "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6"
+  "request": "{ block(number: \"0x1e\") { transactionAt(index: 0) {block{hash}  hash} } }",
+  "response": {
+    "data": {
+      "block": {
+        "transactionAt": {
+          "block": {
+            "hash": "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6"
           },
-          "hash" : "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4"
+          "hash": "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4"
         }
       }
     }
   },
- 
   "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndInvalidIndex.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndInvalidIndex.json
index b15fe8df6d6..1fd7694f7db 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndInvalidIndex.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byBlockNumberAndInvalidIndex.json
@@ -1,12 +1,9 @@
 {
-  "request": 
-    
-  "{ block(number: \"0x1e\") { transactionAt(index: 1) {block{hash}  hash} } }",
-
-  "response":{
-    "data" : {
-      "block" : {
-        "transactionAt" : null
+  "request": "{ block(number: \"0x1e\") { transactionAt(index: 1) {block{hash}  hash} } }",
+  "response": {
+    "data": {
+      "block": {
+        "transactionAt": null
       }
     }
   },
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byHash.json
index 307a94cdd3a..63623394019 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byHash.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byHash.json
@@ -1,30 +1,31 @@
 {
-  "request":
-    "{transaction (hash : \"0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4\") { block{hash} gas gasPrice hash inputData nonce index value from {address} to {address}  logs{index} status createdContract{address} } } ",
-  "response":   {
-    "data" : {
-      "transaction" : {
-        "block" : {
-          "hash" : "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6"
+  "request": "{transaction (hash : \"0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4\") { block{hash} gas gasPrice hash inputData nonce index value from {address} to {address}  logs{index} status createdContract{address} } } ",
+  "response": {
+    "data": {
+      "transaction": {
+        "block": {
+          "hash": "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6"
         },
-        "gas" : 314159,
-        "gasPrice" : "0x1",
-        "hash" : "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4",
-        "inputData" : "0xe8beef5b",
-        "nonce" : 29,
-        "index" : 0,
-        "value" : "0xa",
-        "from" : {
-          "address" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+        "gas": "0x4cb2f",
+        "gasPrice": "0x1",
+        "hash": "0x9cc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4",
+        "inputData": "0xe8beef5b",
+        "nonce": "0x1d",
+        "index": "0x0",
+        "value": "0xa",
+        "from": {
+          "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
         },
-        "to" : {
-          "address" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"
+        "to": {
+          "address": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"
         },
-        "logs" : [ {
-          "index" : 0
-        } ],
-        "status" : null,
-        "createdContract" : null
+        "logs": [
+          {
+            "index": "0x0"
+          }
+        ],
+        "status": null,
+        "createdContract": null
       }
     }
   },
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byHashNull.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byHashNull.json
index d7386982f4a..85fcda84846 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byHashNull.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_byHashNull.json
@@ -1,12 +1,8 @@
 {
-  "request": 
-    
-    "{transaction (hash : \"0xffc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4\") { block{hash} gas gasPrice hash inputData nonce index value }} ",
-
-
+  "request": "{transaction (hash : \"0xffc6c7e602c56aa30c554bb691377f8703d778cec8845f4b88c0f72516b304f4\") { block{hash} gas gasPrice hash inputData nonce index value }} ",
   "response": {
-    "data" : {
-      "transaction" : null
+    "data": {
+      "transaction": null
     }
   },
   "statusCode": 200
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_type2.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_type2.json
new file mode 100644
index 00000000000..d88f5f51554
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_getTransaction_type2.json
@@ -0,0 +1,23 @@
+{
+  "request": "{transaction (hash : \"0x3ecd2ca6cf26c864d0ea5f038a58d4cd4a46a3e242fe92f446f392fdc232dd98\") { accessList { address storageKeys } maxFeePerGas maxPriorityFeePerGas nonce type status } } ",
+  "response": {
+    "data": {
+      "transaction": {
+        "accessList": [
+          {
+            "address": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+            "storageKeys": [
+              "0x0000000000000000000000000000000000000000000000000000000000000000"
+            ]
+          }
+        ],
+        "maxFeePerGas": "0xb2d05e00",
+        "maxPriorityFeePerGas": "0x3b9aca00",
+        "nonce": "0x20",
+        "type": "0x2",
+        "status": "0x1"
+      }
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_contractCreation.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_contractCreation.json
index 12370766ba0..dfa916e71c5 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_contractCreation.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_contractCreation.json
@@ -1,8 +1,8 @@
 {
-  "request" : "mutation { sendRawTransaction(data: \"0xf901ca0685174876e800830fffff8080b90177608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb00291ca00297f7489c9e70447d917f7069a145c9fd0543633bec0a17ac072f1e07ab7f24a0185bd6435c17603b85fd84b8b45605988e855238fe2bbc6ea1f7e9ee6a5fc15f\") }",
-  "response":{
-    "data" : {
-      "sendRawTransaction" : "0x84df486b376e7eaf35792d710fc38ce110e62ab9cdb73a45d191da74c2190617"
+  "request": "mutation { sendRawTransaction(data: \"0xf901ca0685174876e800830fffff8080b90177608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb00291ca00297f7489c9e70447d917f7069a145c9fd0543633bec0a17ac072f1e07ab7f24a0185bd6435c17603b85fd84b8b45605988e855238fe2bbc6ea1f7e9ee6a5fc15f\") }",
+  "response": {
+    "data": {
+      "sendRawTransaction": "0x84df486b376e7eaf35792d710fc38ce110e62ab9cdb73a45d191da74c2190617"
     }
   },
   "statusCode": 200
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_messageCall.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_messageCall.json
index 3ef2372b3f8..cccd1cd4d56 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_messageCall.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_messageCall.json
@@ -1,10 +1,9 @@
 {
-  "request" : "mutation { sendRawTransaction(data: \"0xf8690885174876e800830fffff94450b61224a7df4d8a70f3e20d4fd6a6380b920d180843bdab8bf1ba0efcd6b9df2054a4e8599c0967f8e1e45bca79e2998ed7e8bafb4d29aba7dd5c2a01097184ba24f20dc097f1915fbb5f6ac955bbfc014f181df4d80bf04f4a1cfa5\") }",
-  "response":{
-    "data" : {
-      "sendRawTransaction" : "0xaa6e6646456c576edcd712dbb3f30bf46c3d8310b203960c1e675534553b2daf"
+  "request": "mutation { sendRawTransaction(data: \"0xf8690885174876e800830fffff94450b61224a7df4d8a70f3e20d4fd6a6380b920d180843bdab8bf1ba0efcd6b9df2054a4e8599c0967f8e1e45bca79e2998ed7e8bafb4d29aba7dd5c2a01097184ba24f20dc097f1915fbb5f6ac955bbfc014f181df4d80bf04f4a1cfa5\") }",
+  "response": {
+    "data": {
+      "sendRawTransaction": "0xaa6e6646456c576edcd712dbb3f30bf46c3d8310b203960c1e675534553b2daf"
     }
   },
-
   "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_transferEther.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_transferEther.json
index 4b19d37e46c..df0ffba5ec7 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_transferEther.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_sendRawTransaction_transferEther.json
@@ -1,8 +1,8 @@
 {
-  "request" : "mutation { sendRawTransaction(data: \"0xf86d0485174876e800830222e0945aae326516b4f8fe08074b7e972e40a713048d62880de0b6b3a7640000801ba05d4e7998757264daab67df2ce6f7e7a0ae36910778a406ca73898c9899a32b9ea0674700d5c3d1d27f2e6b4469957dfd1a1c49bf92383d80717afc84eb05695d5b\") }",
-  "response":{
-    "data" : {
-      "sendRawTransaction" : "0xbaabcc1bd699e7378451e4ce5969edb9bdcae76cb79bdacae793525c31e423c7"
+  "request": "mutation { sendRawTransaction(data: \"0xf86d0485174876e800830222e0945aae326516b4f8fe08074b7e972e40a713048d62880de0b6b3a7640000801ba05d4e7998757264daab67df2ce6f7e7a0ae36910778a406ca73898c9899a32b9ea0674700d5c3d1d27f2e6b4469957dfd1a1c49bf92383d80717afc84eb05695d5b\") }",
+  "response": {
+    "data": {
+      "sendRawTransaction": "0xbaabcc1bd699e7378451e4ce5969edb9bdcae76cb79bdacae793525c31e423c7"
     }
   },
   "statusCode": 200
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_syncing.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_syncing.json
index 0b9401e8f39..8bc752caa36 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_syncing.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/eth_syncing.json
@@ -1,15 +1,11 @@
 {
-  "request":     
-    "{ syncing {startingBlock currentBlock highestBlock pulledStates knownStates } }",
-
+  "request": "{ syncing {startingBlock currentBlock highestBlock } }",
   "response": {
-    "data" : {
-      "syncing" : {
-        "startingBlock" : 1,
-        "currentBlock" : 2,
-        "highestBlock" : 3,
-        "pulledStates" : 4,
-        "knownStates" : 5
+    "data": {
+      "syncing": {
+        "startingBlock": "0x1",
+        "currentBlock": "0x2",
+        "highestBlock": "0x3"
       }
     }
   },
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_blocks_byFrom.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_blocks_byFrom.json
index 4e6c33d3f51..800542adbc0 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_blocks_byFrom.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_blocks_byFrom.json
@@ -4,13 +4,16 @@
     "data": {
       "blocks": [
         {
-          "number": 30
+          "number": "0x1e"
         },
         {
-          "number": 31
+          "number": "0x1f"
         },
         {
-          "number": 32
+          "number": "0x20"
+        },
+        {
+          "number": "0x21"
         }
       ]
     }
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_blocks_byRange.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_blocks_byRange.json
index 10f3e100224..b61f27e85ae 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_blocks_byRange.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_blocks_byRange.json
@@ -1,39 +1,39 @@
 {
-  "request": 
-    
-    "{blocks (from : \"0x1e\", to: \"0x20\") { number gasUsed gasLimit hash nonce  stateRoot receiptsRoot transactionCount }} ",
-
-
-  "response":{
-    "data" : {
-      "blocks" : [ {
-        "number"  : 30,
-        "gasUsed" : 23585,
-        "gasLimit" : 3141592,
-        "hash" : "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6",
-        "nonce" : "0x5c321bd9e9f040f1",
-        "stateRoot" : "0xdb46d6bb168130fe2cb60b4b24346137b5741f11283e0d7edace65c5f5466b2e",
-        "receiptsRoot" : "0x88b3b304b058b39791c26fdb94a05cc16ce67cf8f84f7348cb3c60c0ff342d0d",
-        "transactionCount" : 1
-      }, {
-        "number"  : 31,
-        "gasUsed" : 24303,
-        "gasLimit" : 3141592,
-        "hash" : "0x0f765087745aa259d9e5ac39c367c57432a16ed98e3b0d81c5b51d10f301dc49",
-        "nonce" : "0xd3a27a3001616468",
-        "stateRoot" : "0xa80997cf804269d64f2479baf535cf8f9090b70fbf515741c6995564f1e678bd",
-        "receiptsRoot" : "0x2440c44a3f75ad8b0425a73e7be2f61a5171112465cfd14e62e735b56d7178e6",
-        "transactionCount" : 1
-      }, {
-        "number"  : 32,
-        "gasUsed" : 23705,
-        "gasLimit" : 3141592,
-        "hash" : "0x71d59849ddd98543bdfbe8548f5eed559b07b8aaf196369f39134500eab68e53",
-        "nonce" : "0xdb063000b00e8026",
-        "stateRoot" : "0xf65f3dd13f72f5fa5607a5224691419969b4f4bae7a00a6cdb853f2ca9eeb1be",
-        "receiptsRoot" : "0xa50a7e67e833f4502524371ee462ccbcc6c6cabd2aeb1555c56150007a53183c",
-        "transactionCount" : 1
-      } ]
+  "request": "{blocks (from : \"0x1e\", to: \"0x20\") { number gasUsed gasLimit hash nonce  stateRoot receiptsRoot transactionCount }} ",
+  "response": {
+    "data": {
+      "blocks": [
+        {
+          "number": "0x1e",
+          "gasUsed": "0x5c21",
+          "gasLimit": "0x2fefd8",
+          "hash": "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6",
+          "nonce": "0x5c321bd9e9f040f1",
+          "stateRoot": "0xdb46d6bb168130fe2cb60b4b24346137b5741f11283e0d7edace65c5f5466b2e",
+          "receiptsRoot": "0x88b3b304b058b39791c26fdb94a05cc16ce67cf8f84f7348cb3c60c0ff342d0d",
+          "transactionCount": "0x1"
+        },
+        {
+          "number": "0x1f",
+          "gasUsed": "0x5eef",
+          "gasLimit": "0x2fefd8",
+          "hash": "0x0f765087745aa259d9e5ac39c367c57432a16ed98e3b0d81c5b51d10f301dc49",
+          "nonce": "0xd3a27a3001616468",
+          "stateRoot": "0xa80997cf804269d64f2479baf535cf8f9090b70fbf515741c6995564f1e678bd",
+          "receiptsRoot": "0x2440c44a3f75ad8b0425a73e7be2f61a5171112465cfd14e62e735b56d7178e6",
+          "transactionCount": "0x1"
+        },
+        {
+          "number": "0x20",
+          "gasUsed": "0x5c99",
+          "gasLimit": "0x2fefd8",
+          "hash": "0x71d59849ddd98543bdfbe8548f5eed559b07b8aaf196369f39134500eab68e53",
+          "nonce": "0xdb063000b00e8026",
+          "stateRoot": "0xf65f3dd13f72f5fa5607a5224691419969b4f4bae7a00a6cdb853f2ca9eeb1be",
+          "receiptsRoot": "0xa50a7e67e833f4502524371ee462ccbcc6c6cabd2aeb1555c56150007a53183c",
+          "transactionCount": "0x1"
+        }
+      ]
     }
   },
   "statusCode": 200
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_pending.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_pending.json
index 46cad8c1c74..e4a13259d10 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_pending.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_pending.json
@@ -1,24 +1,22 @@
 {
-  "request":
-    "{ pending { transactionCount transactions { nonce gas } account(address:\"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { balance} estimateGas(data:{}) call (data : {from : \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", to: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", data :\"0x12a7b914\"}){data status}} }",
-
+  "request": "{ pending { transactionCount transactions { nonce gas } account(address:\"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\") { balance} estimateGas(data:{}) call (data : {from : \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\", to: \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\", data :\"0x12a7b914\"}){data status}} }",
   "response": {
     "data": {
       "pending": {
-        "transactionCount": 0,
+        "transactionCount": "0x0",
         "transactions": [
           {
-            "nonce": 42,
-            "gas": 654321
+            "nonce": "0x2a",
+            "gas": "0x9fbf1"
           }
         ],
         "account": {
           "balance": "0x140"
         },
-        "estimateGas": 21000,
+        "estimateGas": "0xcf08",
         "call": {
           "data": "0x0000000000000000000000000000000000000000000000000000000000000001",
-          "status": 1
+          "status": "0x1"
         }
       }
     }
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_variable_address.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_variable_address.json
new file mode 100644
index 00000000000..79a162dd1bb
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_variable_address.json
@@ -0,0 +1,14 @@
+{
+  "variables": "{ \"address\": \"0x6295ee1b4f6dd65047762f924ecd367c17eabf8f\"}",
+  "request": "query getAddressBalance($address :Address!) { pending { account(address:$address) { balance} } }",
+  "response": {
+    "data": {
+      "pending": {
+        "account": {
+          "balance": "0x140"
+        }
+      }
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_variable_bytes.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_variable_bytes.json
new file mode 100644
index 00000000000..a5d0a0d2676
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_variable_bytes.json
@@ -0,0 +1,10 @@
+{
+  "variables": "{ \"data\": \"0xf86d0485174876e800830222e0945aae326516b4f8fe08074b7e972e40a713048d62880de0b6b3a7640000801ba05d4e7998757264daab67df2ce6f7e7a0ae36910778a406ca73898c9899a32b9ea0674700d5c3d1d27f2e6b4469957dfd1a1c49bf92383d80717afc84eb05695d5b\"}",
+  "request": "mutation postTransaction($data: Bytes!) { sendRawTransaction(data: $data) }",
+  "response": {
+    "data": {
+      "sendRawTransaction": "0xbaabcc1bd699e7378451e4ce5969edb9bdcae76cb79bdacae793525c31e423c7"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_variable_bytes32.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_variable_bytes32.json
new file mode 100644
index 00000000000..80ea297f164
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_variable_bytes32.json
@@ -0,0 +1,12 @@
+{
+  "variables": "{ \"hash\": \"0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6\"}",
+  "request": "query getBlock($hash :Bytes32!) { block(hash:$hash) { number } }",
+  "response": {
+    "data": {
+      "block": {
+        "number": "0x1e"
+      }
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_variable_long.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_variable_long.json
new file mode 100644
index 00000000000..4f1b8c5e264
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/graphql/graphql_variable_long.json
@@ -0,0 +1,17 @@
+{
+  "variables": "{ \"block1\": \"0x1d\", \"block2\": \"0x1e\"}",
+  "request": "query getBlockRange($block1 :Long, $block2: Long) { blocks(from: $block1, to: $block2) { hash } }",
+  "response": {
+    "data": {
+      "blocks": [
+        {
+          "hash": "0xf8cfa377bd766cdf22edb388dd08cc149e85d24f2796678c835f3c54ab930803"
+        },
+        {
+          "hash": "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6"
+        }
+      ]
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/debug_accountAt.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/debug_accountAt.json
new file mode 100644
index 00000000000..5df4dbc1c93
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/debug_accountAt.json
@@ -0,0 +1,23 @@
+{
+  "request": {
+    "id": 1,
+    "jsonrpc": "2.0",
+    "method": "debug_accountAt",
+    "params": [
+      "0xc8df1f061abb4d0c107b2b1a794ade8780b3120e681f723fe55a7be586d95ba6",
+      0,
+      "0xbcde5374fce5edbc8e2a8697c15331677e6ebf0b"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 1,
+    "result": {
+      "code": "0x0",
+      "nonce": "0x0",
+      "balance": "0x340aad21b3b70000",
+      "codehash" : "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/debug_traceTransaction_disableMemory.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/debug_traceTransaction_disableMemory.json
index b11bc15e285..cdd21f5f180 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/debug_traceTransaction_disableMemory.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/debug_traceTransaction_disableMemory.json
@@ -1584,4 +1584,4 @@
     }
   },
   "statusCode": 200
-},
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_blockHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_blockHash.json
new file mode 100644
index 00000000000..54f619fba5d
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_blockHash.json
@@ -0,0 +1,21 @@
+{
+  "request": {
+    "id": 3,
+    "jsonrpc": "2.0",
+    "method": "eth_call",
+    "params": [
+      {
+        "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+        "from": "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "data": "0x12a7b914"
+      },
+      "0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 3,
+    "result": "0x0000000000000000000000000000000000000000000000000000000000000001"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_blockHashObject.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_blockHashObject.json
new file mode 100644
index 00000000000..2fdc1835c7f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_blockHashObject.json
@@ -0,0 +1,23 @@
+{
+  "request": {
+    "id": 3,
+    "jsonrpc": "2.0",
+    "method": "eth_call",
+    "params": [
+      {
+        "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+        "from": "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "data": "0x12a7b914"
+      },
+      {
+        "blockHash": "0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb"
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 3,
+    "result": "0x0000000000000000000000000000000000000000000000000000000000000001"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_blockHashObjectCanonical.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_blockHashObjectCanonical.json
new file mode 100644
index 00000000000..7fd4fdfe56f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_blockHashObjectCanonical.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "id": 3,
+    "jsonrpc": "2.0",
+    "method": "eth_call",
+    "params": [
+      {
+        "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+        "from": "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "data": "0x12a7b914"
+      },
+      {
+        "blockHash": "0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb",
+        "requireCanonical": true
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 3,
+    "result": "0x0000000000000000000000000000000000000000000000000000000000000001"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_blockHashObjectCanonicalFalse.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_blockHashObjectCanonicalFalse.json
new file mode 100644
index 00000000000..ffba19e4c2f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_blockHashObjectCanonicalFalse.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "id": 3,
+    "jsonrpc": "2.0",
+    "method": "eth_call",
+    "params": [
+      {
+        "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+        "from": "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "data": "0x12a7b914"
+      },
+      {
+        "blockHash": "0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb",
+        "requireCanonical": false
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 3,
+    "result": "0x0000000000000000000000000000000000000000000000000000000000000001"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_blockNumber.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_blockNumber.json
new file mode 100644
index 00000000000..ffc90add58b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_blockNumber.json
@@ -0,0 +1,21 @@
+{
+  "request": {
+    "id": 3,
+    "jsonrpc": "2.0",
+    "method": "eth_call",
+    "params": [
+      {
+        "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+        "from": "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "data": "0x12a7b914"
+      },
+      "0x19"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 3,
+    "result": "0x0000000000000000000000000000000000000000000000000000000000000001"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_blockNumberObject.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_blockNumberObject.json
new file mode 100644
index 00000000000..f436131bd43
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_blockNumberObject.json
@@ -0,0 +1,23 @@
+{
+  "request": {
+    "id": 3,
+    "jsonrpc": "2.0",
+    "method": "eth_call",
+    "params": [
+      {
+        "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+        "from": "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "data": "0x12a7b914"
+      },
+      {
+        "blockNumber": "0x19"
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 3,
+    "result": "0x0000000000000000000000000000000000000000000000000000000000000001"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_callParamsMissing_block_8.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_callParamsMissing_block_8.json
index 59472c20002..562e0f33265 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_callParamsMissing_block_8.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_callParamsMissing_block_8.json
@@ -15,5 +15,5 @@
       "message":"Invalid params"
     }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_contractCreation.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_contractCreation.json
new file mode 100644
index 00000000000..8b4f59d80e9
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_contractCreation.json
@@ -0,0 +1,20 @@
+{
+  "request": {
+    "id": 4,
+    "jsonrpc": "2.0",
+    "method": "eth_call",
+    "params": [
+      {
+        "from": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "data": "0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"
+      },
+      "latest"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 4,
+    "result": "0x60806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_from_contract.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_from_contract.json
new file mode 100644
index 00000000000..88f340ced4e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_from_contract.json
@@ -0,0 +1,21 @@
+{
+  "request": {
+    "id": 3,
+    "jsonrpc": "2.0",
+    "method": "eth_call",
+    "params": [
+      {
+        "to": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "from": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+        "data": "0x123456"
+      },
+      "latest"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 3,
+    "result": "0x"
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_gasPriceTooHigh_block_8.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_gasPriceTooHigh_block_8.json
index 75027a417b8..fe81d9f74d8 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_gasPriceTooHigh_block_8.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_gasPriceTooHigh_block_8.json
@@ -1,24 +1,69 @@
 {
-  "request": {
-    "id": 4,
-    "jsonrpc": "2.0",
-    "method": "eth_call",
-    "params": [
-      {
-        "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
-        "from": "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-        "gasPrice": "0x10000000000000"
-      },
-      "0x8"
-    ]
-  },
-  "response": {
-    "jsonrpc": "2.0",
-    "id": 4,
-    "error" : {
-      "code" : -32004,
-      "message" : "Upfront cost exceeds account balance"
+  "request": [
+    {
+      "id": 3,
+      "jsonrpc": "2.0",
+      "method": "eth_call",
+      "params": [
+        {
+          "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+          "from": "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+          "gasPrice": "0x10000000000000",
+          "strict": false
+        },
+        "0x8"
+      ]
+    },
+    {
+      "id": 4,
+      "jsonrpc": "2.0",
+      "method": "eth_call",
+      "params": [
+        {
+          "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+          "from": "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+          "gasPrice": "0x10000000000000"
+        },
+        "0x8"
+      ]
+    },
+    {
+      "id": 5,
+      "jsonrpc": "2.0",
+      "method": "eth_call",
+      "params": [
+        {
+          "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+          "from": "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+          "gasPrice": "0x10000000000000",
+          "strict": true
+        },
+        "0x8"
+      ]
     }
-  },
+  ],
+  "response": [
+    {
+      "jsonrpc": "2.0",
+      "id": 3,
+      "result": "0x"
+    },
+    {
+      "jsonrpc": "2.0",
+      "id": 4,
+      "error": {
+        "code": -32004,
+        "message": "Upfront cost exceeds account balance"
+      }
+    },
+    {
+      "jsonrpc": "2.0",
+      "id": 5,
+      "error": {
+        "code": -32004,
+        "message": "Upfront cost exceeds account balance"
+      }
+    }
+  ],
   "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_invalidBlockhash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_invalidBlockhash.json
new file mode 100644
index 00000000000..d6a714eb49b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_invalidBlockhash.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "id": 3,
+    "jsonrpc": "2.0",
+    "method": "eth_call",
+    "params": [
+      {
+        "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+        "from": "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "data": "0x12a7b914"
+      },
+      "0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb1234"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 3,
+    "error" : {
+      "code" : -32602,
+      "message" : "Invalid params"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_toMissing_block_8.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_toMissing_block_8.json
deleted file mode 100644
index 87db58189c9..00000000000
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_toMissing_block_8.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "request": {
-    "id": 4,
-    "jsonrpc": "2.0",
-    "method": "eth_call",
-    "params": [
-      {
-        "from": "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-        "data": "0x12a7b914"
-      },
-      "0x8"
-    ]
-  },
-  "response": {
-    "jsonrpc": "2.0",
-    "id": 4,
-    "error":{
-      "code":-32602,
-      "message":"Invalid params"
-    }
-  },
-  "statusCode": 400
-}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_valueTooHigh_block_8.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_valueTooHigh_block_8.json
index bb01acf6ba1..bf990a869a4 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_valueTooHigh_block_8.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_valueTooHigh_block_8.json
@@ -1,24 +1,29 @@
 {
-  "request": {
-    "id": 4,
-    "jsonrpc": "2.0",
-    "method": "eth_call",
-    "params": [
-      {
-        "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
-        "from": "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-        "value": "0x340ab63a021fc9aa"
-      },
-      "0x8"
-    ]
-  },
-  "response": {
-    "jsonrpc": "2.0",
-    "id": 4,
-    "error" : {
-      "code" : -32004,
-      "message" : "Upfront cost exceeds account balance"
+  "request": [
+    {
+      "id": 4,
+      "jsonrpc": "2.0",
+      "method": "eth_call",
+      "params": [
+        {
+          "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+          "from": "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+          "value": "0x340ab63a021fc9aa",
+          "strict": true
+        },
+        "0x8"
+      ]
     }
-  },
+  ],
+  "response": [
+    {
+      "jsonrpc": "2.0",
+      "id": 4,
+      "error": {
+        "code": -32004,
+        "message": "Upfront cost exceeds account balance"
+      }
+    }
+  ],
   "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_estimateGas_contractDeploy.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_estimateGas_contractDeploy.json
index 501093d7b18..131e72b8e43 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_estimateGas_contractDeploy.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_estimateGas_contractDeploy.json
@@ -5,7 +5,7 @@
     "method": "eth_estimateGas",
     "params": [
       {
-        "from": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+        "from": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
         "data": "0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"
       }
     ]
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_estimateGas_from_contract.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_estimateGas_from_contract.json
new file mode 100644
index 00000000000..b0eef16720b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_estimateGas_from_contract.json
@@ -0,0 +1,20 @@
+{
+  "request": {
+    "id": 3,
+    "jsonrpc": "2.0",
+    "method": "eth_estimateGas",
+    "params": [
+      {
+        "to": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "from": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+        "data": "0x123456"
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 3,
+    "result": "0x52d4"
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_estimateGas_invalid.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_estimateGas_invalid.json
new file mode 100644
index 00000000000..21f5ffb3bcb
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_estimateGas_invalid.json
@@ -0,0 +1,22 @@
+{
+  "request": {
+    "id": 3,
+    "jsonrpc": "2.0",
+    "method": "eth_estimateGas",
+    "params": [
+      {
+        "from": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "data": "0x600160005560016000fe6011600155"
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 3,
+    "error": {
+      "code": -32603,
+      "message": "Internal error"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_estimateGas_transfer.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_estimateGas_transfer.json
index 5ce7101e655..79accf79b8e 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_estimateGas_transfer.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_estimateGas_transfer.json
@@ -5,7 +5,7 @@
     "method": "eth_estimateGas",
     "params": [
       {
-        "from": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+        "from": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
         "to": "0x8888f1f195afa192cfee860698584c030f4c9db1",
         "value": "0x1"
       }
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_feeHistory_fieldNamesWithReward.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_feeHistory_fieldNamesWithReward.json
new file mode 100644
index 00000000000..2b9efa72540
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_feeHistory_fieldNamesWithReward.json
@@ -0,0 +1,45 @@
+{
+  "request": {
+    "id": 28,
+    "jsonrpc": "2.0",
+    "method": "eth_feeHistory",
+    "params": [
+      "0x2",
+      "latest",
+      [
+        0.0,
+        100.0,
+        4.0
+      ]
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 28,
+    "result": {
+      "oldestBlock": "0x1f",
+      "baseFeePerGas": [
+        "0x0",
+        "0x0",
+        "0x0"
+      ],
+      "gasUsedRatio": [
+        0.00773588677333021,
+        0.007545537421791245
+      ],
+      "reward": [
+        [
+          "0x1",
+          "0x1",
+          "0x1"
+        ],
+        [
+          "0x1",
+          "0x1",
+          "0x1"
+        ]
+      ]
+    }
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_feeHistory_fieldNamesWithoutReward.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_feeHistory_fieldNamesWithoutReward.json
new file mode 100644
index 00000000000..cb439026614
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_feeHistory_fieldNamesWithoutReward.json
@@ -0,0 +1,28 @@
+{
+  "request": {
+    "id": 28,
+    "jsonrpc": "2.0",
+    "method": "eth_feeHistory",
+    "params": [
+      "0x2",
+      "latest"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 28,
+    "result": {
+      "oldestBlock": "0x1f",
+      "baseFeePerGas": [
+        "0x0",
+        "0x0",
+        "0x0"
+      ],
+      "gasUsedRatio": [
+        0.00773588677333021,
+        0.007545537421791245
+      ]
+    }
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_blockHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_blockHash.json
new file mode 100644
index 00000000000..e97c2e174b3
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_blockHash.json
@@ -0,0 +1,17 @@
+{
+  "request": {
+    "id": 28,
+    "jsonrpc": "2.0",
+    "method": "eth_getBalance",
+    "params": [
+      "0x8888f1f195afa192cfee860698584c030f4c9db1",
+      "0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 28,
+    "result": "0x6cb0f6ed0e034ae5d"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_blockHashObject.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_blockHashObject.json
new file mode 100644
index 00000000000..a0a7c277c39
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_blockHashObject.json
@@ -0,0 +1,19 @@
+{
+  "request": {
+    "id": 28,
+    "jsonrpc": "2.0",
+    "method": "eth_getBalance",
+    "params": [
+      "0x8888f1f195afa192cfee860698584c030f4c9db1",
+      {
+        "blockHash": "0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb"
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 28,
+    "result": "0x6cb0f6ed0e034ae5d"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_blockHashObjectCanonical.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_blockHashObjectCanonical.json
new file mode 100644
index 00000000000..2de4399d3ad
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_blockHashObjectCanonical.json
@@ -0,0 +1,20 @@
+{
+  "request": {
+    "id": 28,
+    "jsonrpc": "2.0",
+    "method": "eth_getBalance",
+    "params": [
+      "0x8888f1f195afa192cfee860698584c030f4c9db1",
+      {
+        "blockHash": "0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb",
+        "requireCanonical": true
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 28,
+    "result": "0x6cb0f6ed0e034ae5d"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_blockHashObjectCanonicalFalse.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_blockHashObjectCanonicalFalse.json
new file mode 100644
index 00000000000..7e755166e84
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_blockHashObjectCanonicalFalse.json
@@ -0,0 +1,20 @@
+{
+  "request": {
+    "id": 28,
+    "jsonrpc": "2.0",
+    "method": "eth_getBalance",
+    "params": [
+      "0x8888f1f195afa192cfee860698584c030f4c9db1",
+      {
+        "blockHash": "0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb",
+        "requireCanonical": false
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 28,
+    "result": "0x6cb0f6ed0e034ae5d"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_blockNumber.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_blockNumber.json
new file mode 100644
index 00000000000..d1a0c145322
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_blockNumber.json
@@ -0,0 +1,17 @@
+{
+  "request": {
+    "id": 28,
+    "jsonrpc": "2.0",
+    "method": "eth_getBalance",
+    "params": [
+      "0x8888f1f195afa192cfee860698584c030f4c9db1",
+      "0x19"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 28,
+    "result": "0x6cb0f6ed0e034ae5d"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_blockNumberObject.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_blockNumberObject.json
new file mode 100644
index 00000000000..6a5cfd75aa5
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_blockNumberObject.json
@@ -0,0 +1,19 @@
+{
+  "request": {
+    "id": 28,
+    "jsonrpc": "2.0",
+    "method": "eth_getBalance",
+    "params": [
+      "0x8888f1f195afa192cfee860698584c030f4c9db1",
+      {
+        "blockNumber": "0x19"
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 28,
+    "result": "0x6cb0f6ed0e034ae5d"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_illegalRangeGreaterThan.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_illegalRangeGreaterThan.json
index c52238a0bc9..8ff0a87d74b 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_illegalRangeGreaterThan.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_illegalRangeGreaterThan.json
@@ -11,7 +11,10 @@
   "response": {
     "jsonrpc": "2.0",
     "id": 28,
-    "result": null
+    "error": {
+      "code": -32000,
+      "message": "Block not found"
+    }
   },
   "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_illegalRangeLessThan.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_illegalRangeLessThan.json
index f5eb76565b8..146756fc552 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_illegalRangeLessThan.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_illegalRangeLessThan.json
@@ -11,7 +11,10 @@
   "response": {
     "jsonrpc": "2.0",
     "id": 28,
-    "result": null
+    "error": {
+      "code": -32602,
+      "message": "Invalid params"
+    }
   },
   "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_invalidBlockHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_invalidBlockHash.json
new file mode 100644
index 00000000000..fa6fab63065
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_invalidBlockHash.json
@@ -0,0 +1,20 @@
+{
+  "request": {
+    "id": 28,
+    "jsonrpc": "2.0",
+    "method": "eth_getBalance",
+    "params": [
+      "0x8888f1f195afa192cfee860698584c030f4c9db1",
+      "0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb1234"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 28,
+    "error" : {
+      "code" : -32602,
+      "message" : "Invalid params"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_invalidParams.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_invalidParams.json
index 6ed4b2ee46b..e84f3045a33 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_invalidParams.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBalance_invalidParams.json
@@ -13,5 +13,5 @@
       "message" : "Invalid params"
     }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_complete.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_complete.json
index 8f8da4ace03..f0f41a697dd 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_complete.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockByNumber_complete.json
@@ -43,6 +43,7 @@
           "nonce": "0xf",
           "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
           "transactionIndex": "0x0",
+          "type" : "0x0",
           "value": "0xa",
           "v": "0x1b",
           "r": "0x394fa9c43a2469d48b98f4f7e8dfdf7bd3c7abd9eafe8c124b362594aafc5d6",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_invalidParams.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_invalidParams.json
index eebd896b8e2..e05ba50cc6e 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_invalidParams.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByHash_invalidParams.json
@@ -13,5 +13,5 @@
       "message" : "Invalid params"
     }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_invalidParams.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_invalidParams.json
index 13218f3725f..7e40d417e76 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_invalidParams.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getBlockTransactionCountByNumber_invalidParams.json
@@ -13,5 +13,5 @@
       "message" : "Invalid params"
     }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_blockHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_blockHash.json
new file mode 100644
index 00000000000..5364b7af554
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_blockHash.json
@@ -0,0 +1,17 @@
+{
+  "request": {
+    "id": 0,
+    "jsonrpc": "2.0",
+    "method": "eth_getCode",
+    "params": [
+      "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+      "0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 0,
+    "result": "0x6000357c010000000000000000000000000000000000000000000000000000000090048063102accc11461012c57806312a7b9141461013a5780631774e6461461014c5780631e26fd331461015d5780631f9030371461016e578063343a875d1461018057806338cc4831146101955780634e7ad367146101bd57806357cb2fc4146101cb57806365538c73146101e057806368895979146101ee57806376bc21d9146102005780639a19a9531461020e5780639dc2c8f51461021f578063a53b1c1e1461022d578063a67808571461023e578063b61c05031461024c578063c2b12a731461025a578063d2282dc51461026b578063e30081a01461027c578063e8beef5b1461028d578063f38b06001461029b578063f5b53e17146102a9578063fd408767146102bb57005b6101346104d6565b60006000f35b61014261039b565b8060005260206000f35b610157600435610326565b60006000f35b6101686004356102c9565b60006000f35b610176610442565b8060005260206000f35b6101886103d3565b8060ff1660005260206000f35b61019d610413565b8073ffffffffffffffffffffffffffffffffffffffff1660005260206000f35b6101c56104c5565b60006000f35b6101d36103b7565b8060000b60005260206000f35b6101e8610454565b60006000f35b6101f6610401565b8060005260206000f35b61020861051f565b60006000f35b6102196004356102e5565b60006000f35b610227610693565b60006000f35b610238600435610342565b60006000f35b610246610484565b60006000f35b610254610493565b60006000f35b61026560043561038d565b60006000f35b610276600435610350565b60006000f35b61028760043561035e565b60006000f35b6102956105b4565b60006000f35b6102a3610547565b60006000f35b6102b16103ef565b8060005260206000f35b6102c3610600565b60006000f35b80600060006101000a81548160ff021916908302179055505b50565b80600060016101000a81548160ff02191690837f01000000000000000000000000000000000000000000000000000000000000009081020402179055505b50565b80600060026101000a81548160ff021916908302179055505b50565b806001600050819055505b50565b806002600050819055505b50565b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908302179055505b50565b806004600050819055505b50565b6000600060009054906101000a900460ff1690506103b4565b90565b6000600060019054906101000a900460000b90506103d0565b90565b6000600060029054906101000a900460ff1690506103ec565b90565b600060016000505490506103fe565b90565b60006002600050549050610410565b90565b6000600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905061043f565b90565b60006004600050549050610451565b90565b7f65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be5806000602a81526020016000a15b565b6000602a81526020016000a05b565b60017f81933b308056e7e85668661dcd102b1f22795b4431f9cf4625794f381c271c6b6000602a81526020016000a25b565b60016000602a81526020016000a15b565b3373ffffffffffffffffffffffffffffffffffffffff1660017f0e216b62efbb97e751a2ce09f607048751720397ecfb9eef1e48a6644948985b6000602a81526020016000a35b565b3373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a25b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017f317b31292193c2a4f561cc40a95ea0d97a2733f14af6d6d59522473e1f3ae65f6000602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a35b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017fd5f0a30e4be0c6be577a71eceb7464245a796a7e6a55c0d971837b250de05f4e60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff16600160007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a35b56"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_blockHashNotExist.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_blockHashNotExist.json
new file mode 100644
index 00000000000..4dd50c50ae6
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_blockHashNotExist.json
@@ -0,0 +1,20 @@
+{
+  "request": {
+    "id": 250,
+    "jsonrpc": "2.0",
+    "method": "eth_getCode",
+    "params": [
+      "0x8888f1f195afa192cfee860698584c030f4c9db1",
+      "0xe4ba271c3580fafebd874dc3107eba505b1061fd8d9780e3a5577e48f6168711"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 250,
+    "error" : {
+      "code" : -32000,
+      "message" : "Block not found"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_blockHashObject.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_blockHashObject.json
new file mode 100644
index 00000000000..dd67a406aca
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_blockHashObject.json
@@ -0,0 +1,19 @@
+{
+  "request": {
+    "id": 0,
+    "jsonrpc": "2.0",
+    "method": "eth_getCode",
+    "params": [
+      "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+      {
+        "blockHash": "0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb"
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 0,
+    "result": "0x6000357c010000000000000000000000000000000000000000000000000000000090048063102accc11461012c57806312a7b9141461013a5780631774e6461461014c5780631e26fd331461015d5780631f9030371461016e578063343a875d1461018057806338cc4831146101955780634e7ad367146101bd57806357cb2fc4146101cb57806365538c73146101e057806368895979146101ee57806376bc21d9146102005780639a19a9531461020e5780639dc2c8f51461021f578063a53b1c1e1461022d578063a67808571461023e578063b61c05031461024c578063c2b12a731461025a578063d2282dc51461026b578063e30081a01461027c578063e8beef5b1461028d578063f38b06001461029b578063f5b53e17146102a9578063fd408767146102bb57005b6101346104d6565b60006000f35b61014261039b565b8060005260206000f35b610157600435610326565b60006000f35b6101686004356102c9565b60006000f35b610176610442565b8060005260206000f35b6101886103d3565b8060ff1660005260206000f35b61019d610413565b8073ffffffffffffffffffffffffffffffffffffffff1660005260206000f35b6101c56104c5565b60006000f35b6101d36103b7565b8060000b60005260206000f35b6101e8610454565b60006000f35b6101f6610401565b8060005260206000f35b61020861051f565b60006000f35b6102196004356102e5565b60006000f35b610227610693565b60006000f35b610238600435610342565b60006000f35b610246610484565b60006000f35b610254610493565b60006000f35b61026560043561038d565b60006000f35b610276600435610350565b60006000f35b61028760043561035e565b60006000f35b6102956105b4565b60006000f35b6102a3610547565b60006000f35b6102b16103ef565b8060005260206000f35b6102c3610600565b60006000f35b80600060006101000a81548160ff021916908302179055505b50565b80600060016101000a81548160ff02191690837f01000000000000000000000000000000000000000000000000000000000000009081020402179055505b50565b80600060026101000a81548160ff021916908302179055505b50565b806001600050819055505b50565b806002600050819055505b50565b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908302179055505b50565b806004600050819055505b50565b6000600060009054906101000a900460ff1690506103b4565b90565b6000600060019054906101000a900460000b90506103d0565b90565b6000600060029054906101000a900460ff1690506103ec565b90565b600060016000505490506103fe565b90565b60006002600050549050610410565b90565b6000600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905061043f565b90565b60006004600050549050610451565b90565b7f65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be5806000602a81526020016000a15b565b6000602a81526020016000a05b565b60017f81933b308056e7e85668661dcd102b1f22795b4431f9cf4625794f381c271c6b6000602a81526020016000a25b565b60016000602a81526020016000a15b565b3373ffffffffffffffffffffffffffffffffffffffff1660017f0e216b62efbb97e751a2ce09f607048751720397ecfb9eef1e48a6644948985b6000602a81526020016000a35b565b3373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a25b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017f317b31292193c2a4f561cc40a95ea0d97a2733f14af6d6d59522473e1f3ae65f6000602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a35b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017fd5f0a30e4be0c6be577a71eceb7464245a796a7e6a55c0d971837b250de05f4e60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff16600160007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a35b56"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_blockHashObjectCanonical.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_blockHashObjectCanonical.json
new file mode 100644
index 00000000000..91725bab338
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_blockHashObjectCanonical.json
@@ -0,0 +1,20 @@
+{
+  "request": {
+    "id": 0,
+    "jsonrpc": "2.0",
+    "method": "eth_getCode",
+    "params": [
+      "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+      {
+        "blockHash": "0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb",
+        "requireCanonical": true
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 0,
+    "result": "0x6000357c010000000000000000000000000000000000000000000000000000000090048063102accc11461012c57806312a7b9141461013a5780631774e6461461014c5780631e26fd331461015d5780631f9030371461016e578063343a875d1461018057806338cc4831146101955780634e7ad367146101bd57806357cb2fc4146101cb57806365538c73146101e057806368895979146101ee57806376bc21d9146102005780639a19a9531461020e5780639dc2c8f51461021f578063a53b1c1e1461022d578063a67808571461023e578063b61c05031461024c578063c2b12a731461025a578063d2282dc51461026b578063e30081a01461027c578063e8beef5b1461028d578063f38b06001461029b578063f5b53e17146102a9578063fd408767146102bb57005b6101346104d6565b60006000f35b61014261039b565b8060005260206000f35b610157600435610326565b60006000f35b6101686004356102c9565b60006000f35b610176610442565b8060005260206000f35b6101886103d3565b8060ff1660005260206000f35b61019d610413565b8073ffffffffffffffffffffffffffffffffffffffff1660005260206000f35b6101c56104c5565b60006000f35b6101d36103b7565b8060000b60005260206000f35b6101e8610454565b60006000f35b6101f6610401565b8060005260206000f35b61020861051f565b60006000f35b6102196004356102e5565b60006000f35b610227610693565b60006000f35b610238600435610342565b60006000f35b610246610484565b60006000f35b610254610493565b60006000f35b61026560043561038d565b60006000f35b610276600435610350565b60006000f35b61028760043561035e565b60006000f35b6102956105b4565b60006000f35b6102a3610547565b60006000f35b6102b16103ef565b8060005260206000f35b6102c3610600565b60006000f35b80600060006101000a81548160ff021916908302179055505b50565b80600060016101000a81548160ff02191690837f01000000000000000000000000000000000000000000000000000000000000009081020402179055505b50565b80600060026101000a81548160ff021916908302179055505b50565b806001600050819055505b50565b806002600050819055505b50565b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908302179055505b50565b806004600050819055505b50565b6000600060009054906101000a900460ff1690506103b4565b90565b6000600060019054906101000a900460000b90506103d0565b90565b6000600060029054906101000a900460ff1690506103ec565b90565b600060016000505490506103fe565b90565b60006002600050549050610410565b90565b6000600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905061043f565b90565b60006004600050549050610451565b90565b7f65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be5806000602a81526020016000a15b565b6000602a81526020016000a05b565b60017f81933b308056e7e85668661dcd102b1f22795b4431f9cf4625794f381c271c6b6000602a81526020016000a25b565b60016000602a81526020016000a15b565b3373ffffffffffffffffffffffffffffffffffffffff1660017f0e216b62efbb97e751a2ce09f607048751720397ecfb9eef1e48a6644948985b6000602a81526020016000a35b565b3373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a25b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017f317b31292193c2a4f561cc40a95ea0d97a2733f14af6d6d59522473e1f3ae65f6000602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a35b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017fd5f0a30e4be0c6be577a71eceb7464245a796a7e6a55c0d971837b250de05f4e60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff16600160007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a35b56"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_blockHashObjectCanonicalFalse.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_blockHashObjectCanonicalFalse.json
new file mode 100644
index 00000000000..aa610788e4c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_blockHashObjectCanonicalFalse.json
@@ -0,0 +1,20 @@
+{
+  "request": {
+    "id": 0,
+    "jsonrpc": "2.0",
+    "method": "eth_getCode",
+    "params": [
+      "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+      {
+        "blockHash": "0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb",
+        "requireCanonical": false
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 0,
+    "result": "0x6000357c010000000000000000000000000000000000000000000000000000000090048063102accc11461012c57806312a7b9141461013a5780631774e6461461014c5780631e26fd331461015d5780631f9030371461016e578063343a875d1461018057806338cc4831146101955780634e7ad367146101bd57806357cb2fc4146101cb57806365538c73146101e057806368895979146101ee57806376bc21d9146102005780639a19a9531461020e5780639dc2c8f51461021f578063a53b1c1e1461022d578063a67808571461023e578063b61c05031461024c578063c2b12a731461025a578063d2282dc51461026b578063e30081a01461027c578063e8beef5b1461028d578063f38b06001461029b578063f5b53e17146102a9578063fd408767146102bb57005b6101346104d6565b60006000f35b61014261039b565b8060005260206000f35b610157600435610326565b60006000f35b6101686004356102c9565b60006000f35b610176610442565b8060005260206000f35b6101886103d3565b8060ff1660005260206000f35b61019d610413565b8073ffffffffffffffffffffffffffffffffffffffff1660005260206000f35b6101c56104c5565b60006000f35b6101d36103b7565b8060000b60005260206000f35b6101e8610454565b60006000f35b6101f6610401565b8060005260206000f35b61020861051f565b60006000f35b6102196004356102e5565b60006000f35b610227610693565b60006000f35b610238600435610342565b60006000f35b610246610484565b60006000f35b610254610493565b60006000f35b61026560043561038d565b60006000f35b610276600435610350565b60006000f35b61028760043561035e565b60006000f35b6102956105b4565b60006000f35b6102a3610547565b60006000f35b6102b16103ef565b8060005260206000f35b6102c3610600565b60006000f35b80600060006101000a81548160ff021916908302179055505b50565b80600060016101000a81548160ff02191690837f01000000000000000000000000000000000000000000000000000000000000009081020402179055505b50565b80600060026101000a81548160ff021916908302179055505b50565b806001600050819055505b50565b806002600050819055505b50565b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908302179055505b50565b806004600050819055505b50565b6000600060009054906101000a900460ff1690506103b4565b90565b6000600060019054906101000a900460000b90506103d0565b90565b6000600060029054906101000a900460ff1690506103ec565b90565b600060016000505490506103fe565b90565b60006002600050549050610410565b90565b6000600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905061043f565b90565b60006004600050549050610451565b90565b7f65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be5806000602a81526020016000a15b565b6000602a81526020016000a05b565b60017f81933b308056e7e85668661dcd102b1f22795b4431f9cf4625794f381c271c6b6000602a81526020016000a25b565b60016000602a81526020016000a15b565b3373ffffffffffffffffffffffffffffffffffffffff1660017f0e216b62efbb97e751a2ce09f607048751720397ecfb9eef1e48a6644948985b6000602a81526020016000a35b565b3373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a25b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017f317b31292193c2a4f561cc40a95ea0d97a2733f14af6d6d59522473e1f3ae65f6000602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a35b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017fd5f0a30e4be0c6be577a71eceb7464245a796a7e6a55c0d971837b250de05f4e60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff16600160007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a35b56"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_blockNumber.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_blockNumber.json
new file mode 100644
index 00000000000..e0dea631f92
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_blockNumber.json
@@ -0,0 +1,17 @@
+{
+  "request": {
+    "id": 0,
+    "jsonrpc": "2.0",
+    "method": "eth_getCode",
+    "params": [
+      "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+      "0x19"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 0,
+    "result": "0x6000357c010000000000000000000000000000000000000000000000000000000090048063102accc11461012c57806312a7b9141461013a5780631774e6461461014c5780631e26fd331461015d5780631f9030371461016e578063343a875d1461018057806338cc4831146101955780634e7ad367146101bd57806357cb2fc4146101cb57806365538c73146101e057806368895979146101ee57806376bc21d9146102005780639a19a9531461020e5780639dc2c8f51461021f578063a53b1c1e1461022d578063a67808571461023e578063b61c05031461024c578063c2b12a731461025a578063d2282dc51461026b578063e30081a01461027c578063e8beef5b1461028d578063f38b06001461029b578063f5b53e17146102a9578063fd408767146102bb57005b6101346104d6565b60006000f35b61014261039b565b8060005260206000f35b610157600435610326565b60006000f35b6101686004356102c9565b60006000f35b610176610442565b8060005260206000f35b6101886103d3565b8060ff1660005260206000f35b61019d610413565b8073ffffffffffffffffffffffffffffffffffffffff1660005260206000f35b6101c56104c5565b60006000f35b6101d36103b7565b8060000b60005260206000f35b6101e8610454565b60006000f35b6101f6610401565b8060005260206000f35b61020861051f565b60006000f35b6102196004356102e5565b60006000f35b610227610693565b60006000f35b610238600435610342565b60006000f35b610246610484565b60006000f35b610254610493565b60006000f35b61026560043561038d565b60006000f35b610276600435610350565b60006000f35b61028760043561035e565b60006000f35b6102956105b4565b60006000f35b6102a3610547565b60006000f35b6102b16103ef565b8060005260206000f35b6102c3610600565b60006000f35b80600060006101000a81548160ff021916908302179055505b50565b80600060016101000a81548160ff02191690837f01000000000000000000000000000000000000000000000000000000000000009081020402179055505b50565b80600060026101000a81548160ff021916908302179055505b50565b806001600050819055505b50565b806002600050819055505b50565b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908302179055505b50565b806004600050819055505b50565b6000600060009054906101000a900460ff1690506103b4565b90565b6000600060019054906101000a900460000b90506103d0565b90565b6000600060029054906101000a900460ff1690506103ec565b90565b600060016000505490506103fe565b90565b60006002600050549050610410565b90565b6000600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905061043f565b90565b60006004600050549050610451565b90565b7f65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be5806000602a81526020016000a15b565b6000602a81526020016000a05b565b60017f81933b308056e7e85668661dcd102b1f22795b4431f9cf4625794f381c271c6b6000602a81526020016000a25b565b60016000602a81526020016000a15b565b3373ffffffffffffffffffffffffffffffffffffffff1660017f0e216b62efbb97e751a2ce09f607048751720397ecfb9eef1e48a6644948985b6000602a81526020016000a35b565b3373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a25b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017f317b31292193c2a4f561cc40a95ea0d97a2733f14af6d6d59522473e1f3ae65f6000602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a35b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017fd5f0a30e4be0c6be577a71eceb7464245a796a7e6a55c0d971837b250de05f4e60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff16600160007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a35b56"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_blockNumberObject.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_blockNumberObject.json
new file mode 100644
index 00000000000..18ccd6de78e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_blockNumberObject.json
@@ -0,0 +1,19 @@
+{
+  "request": {
+    "id": 0,
+    "jsonrpc": "2.0",
+    "method": "eth_getCode",
+    "params": [
+      "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+      {
+        "blockNumber": "0x19"
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 0,
+    "result": "0x6000357c010000000000000000000000000000000000000000000000000000000090048063102accc11461012c57806312a7b9141461013a5780631774e6461461014c5780631e26fd331461015d5780631f9030371461016e578063343a875d1461018057806338cc4831146101955780634e7ad367146101bd57806357cb2fc4146101cb57806365538c73146101e057806368895979146101ee57806376bc21d9146102005780639a19a9531461020e5780639dc2c8f51461021f578063a53b1c1e1461022d578063a67808571461023e578063b61c05031461024c578063c2b12a731461025a578063d2282dc51461026b578063e30081a01461027c578063e8beef5b1461028d578063f38b06001461029b578063f5b53e17146102a9578063fd408767146102bb57005b6101346104d6565b60006000f35b61014261039b565b8060005260206000f35b610157600435610326565b60006000f35b6101686004356102c9565b60006000f35b610176610442565b8060005260206000f35b6101886103d3565b8060ff1660005260206000f35b61019d610413565b8073ffffffffffffffffffffffffffffffffffffffff1660005260206000f35b6101c56104c5565b60006000f35b6101d36103b7565b8060000b60005260206000f35b6101e8610454565b60006000f35b6101f6610401565b8060005260206000f35b61020861051f565b60006000f35b6102196004356102e5565b60006000f35b610227610693565b60006000f35b610238600435610342565b60006000f35b610246610484565b60006000f35b610254610493565b60006000f35b61026560043561038d565b60006000f35b610276600435610350565b60006000f35b61028760043561035e565b60006000f35b6102956105b4565b60006000f35b6102a3610547565b60006000f35b6102b16103ef565b8060005260206000f35b6102c3610600565b60006000f35b80600060006101000a81548160ff021916908302179055505b50565b80600060016101000a81548160ff02191690837f01000000000000000000000000000000000000000000000000000000000000009081020402179055505b50565b80600060026101000a81548160ff021916908302179055505b50565b806001600050819055505b50565b806002600050819055505b50565b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908302179055505b50565b806004600050819055505b50565b6000600060009054906101000a900460ff1690506103b4565b90565b6000600060019054906101000a900460000b90506103d0565b90565b6000600060029054906101000a900460ff1690506103ec565b90565b600060016000505490506103fe565b90565b60006002600050549050610410565b90565b6000600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905061043f565b90565b60006004600050549050610451565b90565b7f65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be5806000602a81526020016000a15b565b6000602a81526020016000a05b565b60017f81933b308056e7e85668661dcd102b1f22795b4431f9cf4625794f381c271c6b6000602a81526020016000a25b565b60016000602a81526020016000a15b565b3373ffffffffffffffffffffffffffffffffffffffff1660017f0e216b62efbb97e751a2ce09f607048751720397ecfb9eef1e48a6644948985b6000602a81526020016000a35b565b3373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a25b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017f317b31292193c2a4f561cc40a95ea0d97a2733f14af6d6d59522473e1f3ae65f6000602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660016000602a81526020016000a35b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff1660017fd5f0a30e4be0c6be577a71eceb7464245a796a7e6a55c0d971837b250de05f4e60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a45b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001023373ffffffffffffffffffffffffffffffffffffffff16600160007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe98152602001602a81526020016000a35b56"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_illegalRangeGreaterThan.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_illegalRangeGreaterThan.json
index 7b1bbbf61c6..dda543cef5b 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_illegalRangeGreaterThan.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_illegalRangeGreaterThan.json
@@ -11,7 +11,10 @@
   "response": {
     "jsonrpc": "2.0",
     "id": 13,
-    "result": null
+    "error": {
+      "code": -32000,
+      "message": "Block not found"
+    }
   },
   "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_illegalRangeLessThan.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_illegalRangeLessThan.json
index 680607f3fc8..6a336a96667 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_illegalRangeLessThan.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_illegalRangeLessThan.json
@@ -11,7 +11,10 @@
   "response": {
     "jsonrpc": "2.0",
     "id": 13,
-    "result": null
+    "error": {
+      "code": -32602,
+      "message": "Invalid params"
+    }
   },
   "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_invalidBlockHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_invalidBlockHash.json
new file mode 100644
index 00000000000..a5e1e004af8
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_invalidBlockHash.json
@@ -0,0 +1,20 @@
+{
+  "request": {
+    "id": 0,
+    "jsonrpc": "2.0",
+    "method": "eth_getCode",
+    "params": [
+      "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+      "0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb1234"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 0,
+    "error" : {
+      "code" : -32602,
+      "message" : "Invalid params"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_invalidParams.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_invalidParams.json
index ab0b87f1e95..5a65b4d17c5 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_invalidParams.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getCode_invalidParams.json
@@ -13,5 +13,5 @@
       "message": "Invalid params"
     }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_invalidInput.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_invalidInput.json
index 039d4dc6f8e..5a3dcb038a3 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_invalidInput.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_invalidInput.json
@@ -19,7 +19,7 @@
       "message": "Invalid params"
     }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
 
 
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_matchAnyTopic.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_matchAnyTopic.json
new file mode 100644
index 00000000000..fade130699c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getLogs_matchAnyTopic.json
@@ -0,0 +1,29 @@
+{
+  "request": {
+    "id": 406,
+    "jsonrpc": "2.0",
+    "method": "eth_getLogs",
+    "params": [{
+      "fromBlock": "0x17",
+      "toBlock": "0x17",
+      "address": [],
+      "topics": []
+    }]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 406,
+    "result" : [{
+      "logIndex" : "0x0",
+      "removed": false,
+      "blockNumber" : "0x17",
+      "blockHash" : "0x3c419f39b340a4c35cc27b8f7880b779dc1abb9814ad13a2a5a55b885cc8ec2d",
+      "transactionHash" : "0x97a385bf570ced7821c6495b3877ddd2afd5c452f350f0d4876e98d9161389c6",
+      "transactionIndex" : "0x0",
+      "address" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+      "data" : "0x000000000000000000000000000000000000000000000000000000000000002a",
+      "topics" : ["0x65c9ac8011e286e89d02a269890f41d67ca2cc597b2c76c7c69321ff492be580"]
+    }]
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getNewFilter_invalidFilter.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getNewFilter_invalidFilter.json
index 41c9c4d0582..be517fc357c 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getNewFilter_invalidFilter.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getNewFilter_invalidFilter.json
@@ -15,5 +15,5 @@
       "message" : "Invalid params"
     }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHash.json
new file mode 100644
index 00000000000..91fcf579d2d
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHash.json
@@ -0,0 +1,30 @@
+{
+  "request": {
+    "id": 28,
+    "jsonrpc": "2.0",
+    "method": "eth_getProof",
+    "params": [
+      "0x8888f1f195afa192cfee860698584c030f4c9db1",
+      ["0x0000000000000000000000000000000000000000000000000000000000000347"],
+      "0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb"
+    ]
+  },
+  "response": {
+    "jsonrpc" : "2.0",
+    "id" : 28,
+    "result" : {
+      "accountProof" : [ "0xf891a09e0124af825ca88d0c30ae4a69f2c339196c23952b0226f03c7e7460699c0541a097699db78357681938d946074cafa3355e921261ba0bd5081bff15c4f17d0c7f8080808080808080a044b83742345b4b2b4debce6d454e97bfb713ae1416dee357f5fd93f858a73a75808080a0d2c1b7d4a3c019943eff4e75716ade2750b1955abcf5d2355de6e3693d6c30d38080", "0xf872a0332fbb2bcac38ed596cbb34ae265df4d60b832ce8077a3abc6f57b4611005cfdb84ff84d808906cb0f6ed0e034ae5da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470" ],
+      "address" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+      "balance" : "0x6cb0f6ed0e034ae5d",
+      "codeHash" : "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+      "nonce" : "0x0",
+      "storageHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "storageProof" : [ {
+        "key" : "0x0347",
+        "value" : "0x0",
+        "proof" : [ ]
+      } ]
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHashObject.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHashObject.json
new file mode 100644
index 00000000000..ac8cbb6bcf1
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHashObject.json
@@ -0,0 +1,32 @@
+{
+  "request": {
+    "id": 28,
+    "jsonrpc": "2.0",
+    "method": "eth_getProof",
+    "params": [
+      "0x8888f1f195afa192cfee860698584c030f4c9db1",
+      ["0x0000000000000000000000000000000000000000000000000000000000000347"],
+      {
+        "blockHash":"0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb"
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc" : "2.0",
+    "id" : 28,
+    "result" : {
+      "accountProof" : [ "0xf891a09e0124af825ca88d0c30ae4a69f2c339196c23952b0226f03c7e7460699c0541a097699db78357681938d946074cafa3355e921261ba0bd5081bff15c4f17d0c7f8080808080808080a044b83742345b4b2b4debce6d454e97bfb713ae1416dee357f5fd93f858a73a75808080a0d2c1b7d4a3c019943eff4e75716ade2750b1955abcf5d2355de6e3693d6c30d38080", "0xf872a0332fbb2bcac38ed596cbb34ae265df4d60b832ce8077a3abc6f57b4611005cfdb84ff84d808906cb0f6ed0e034ae5da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470" ],
+      "address" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+      "balance" : "0x6cb0f6ed0e034ae5d",
+      "codeHash" : "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+      "nonce" : "0x0",
+      "storageHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "storageProof" : [ {
+        "key" : "0x0347",
+        "value" : "0x0",
+        "proof" : [ ]
+      } ]
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHashObjectCanonical.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHashObjectCanonical.json
new file mode 100644
index 00000000000..ab4e6269543
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHashObjectCanonical.json
@@ -0,0 +1,33 @@
+{
+  "request": {
+    "id": 28,
+    "jsonrpc": "2.0",
+    "method": "eth_getProof",
+    "params": [
+      "0x8888f1f195afa192cfee860698584c030f4c9db1",
+      ["0x0000000000000000000000000000000000000000000000000000000000000347"],
+      {
+        "blockHash":"0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb",
+        "requireCanonical": true
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc" : "2.0",
+    "id" : 28,
+    "result" : {
+      "accountProof" : [ "0xf891a09e0124af825ca88d0c30ae4a69f2c339196c23952b0226f03c7e7460699c0541a097699db78357681938d946074cafa3355e921261ba0bd5081bff15c4f17d0c7f8080808080808080a044b83742345b4b2b4debce6d454e97bfb713ae1416dee357f5fd93f858a73a75808080a0d2c1b7d4a3c019943eff4e75716ade2750b1955abcf5d2355de6e3693d6c30d38080", "0xf872a0332fbb2bcac38ed596cbb34ae265df4d60b832ce8077a3abc6f57b4611005cfdb84ff84d808906cb0f6ed0e034ae5da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470" ],
+      "address" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+      "balance" : "0x6cb0f6ed0e034ae5d",
+      "codeHash" : "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+      "nonce" : "0x0",
+      "storageHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "storageProof" : [ {
+        "key" : "0x0347",
+        "value" : "0x0",
+        "proof" : [ ]
+      } ]
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHashObjectCanonicalFalse.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHashObjectCanonicalFalse.json
new file mode 100644
index 00000000000..22ec46ae601
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockHashObjectCanonicalFalse.json
@@ -0,0 +1,33 @@
+{
+  "request": {
+    "id": 28,
+    "jsonrpc": "2.0",
+    "method": "eth_getProof",
+    "params": [
+      "0x8888f1f195afa192cfee860698584c030f4c9db1",
+      ["0x0000000000000000000000000000000000000000000000000000000000000347"],
+      {
+        "blockHash":"0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb",
+        "requireCanonical": false
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc" : "2.0",
+    "id" : 28,
+    "result" : {
+      "accountProof" : [ "0xf891a09e0124af825ca88d0c30ae4a69f2c339196c23952b0226f03c7e7460699c0541a097699db78357681938d946074cafa3355e921261ba0bd5081bff15c4f17d0c7f8080808080808080a044b83742345b4b2b4debce6d454e97bfb713ae1416dee357f5fd93f858a73a75808080a0d2c1b7d4a3c019943eff4e75716ade2750b1955abcf5d2355de6e3693d6c30d38080", "0xf872a0332fbb2bcac38ed596cbb34ae265df4d60b832ce8077a3abc6f57b4611005cfdb84ff84d808906cb0f6ed0e034ae5da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470" ],
+      "address" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+      "balance" : "0x6cb0f6ed0e034ae5d",
+      "codeHash" : "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+      "nonce" : "0x0",
+      "storageHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "storageProof" : [ {
+        "key" : "0x0347",
+        "value" : "0x0",
+        "proof" : [ ]
+      } ]
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockNumber.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockNumber.json
new file mode 100644
index 00000000000..d2ebfc9f513
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockNumber.json
@@ -0,0 +1,30 @@
+{
+  "request": {
+    "id": 28,
+    "jsonrpc": "2.0",
+    "method": "eth_getProof",
+    "params": [
+      "0x8888f1f195afa192cfee860698584c030f4c9db1",
+      ["0x0000000000000000000000000000000000000000000000000000000000000347"],
+      "0x19"
+    ]
+  },
+  "response": {
+    "jsonrpc" : "2.0",
+    "id" : 28,
+    "result" : {
+      "accountProof" : [ "0xf891a09e0124af825ca88d0c30ae4a69f2c339196c23952b0226f03c7e7460699c0541a097699db78357681938d946074cafa3355e921261ba0bd5081bff15c4f17d0c7f8080808080808080a044b83742345b4b2b4debce6d454e97bfb713ae1416dee357f5fd93f858a73a75808080a0d2c1b7d4a3c019943eff4e75716ade2750b1955abcf5d2355de6e3693d6c30d38080", "0xf872a0332fbb2bcac38ed596cbb34ae265df4d60b832ce8077a3abc6f57b4611005cfdb84ff84d808906cb0f6ed0e034ae5da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470" ],
+      "address" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+      "balance" : "0x6cb0f6ed0e034ae5d",
+      "codeHash" : "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+      "nonce" : "0x0",
+      "storageHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "storageProof" : [ {
+        "key" : "0x0347",
+        "value" : "0x0",
+        "proof" : [ ]
+      } ]
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockNumberObject.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockNumberObject.json
new file mode 100644
index 00000000000..5b7332d68bb
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_blockNumberObject.json
@@ -0,0 +1,32 @@
+{
+  "request": {
+    "id": 28,
+    "jsonrpc": "2.0",
+    "method": "eth_getProof",
+    "params": [
+      "0x8888f1f195afa192cfee860698584c030f4c9db1",
+      ["0x0000000000000000000000000000000000000000000000000000000000000347"],
+      {
+        "blockNumber":"0x19"
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc" : "2.0",
+    "id" : 28,
+    "result" : {
+      "accountProof" : [ "0xf891a09e0124af825ca88d0c30ae4a69f2c339196c23952b0226f03c7e7460699c0541a097699db78357681938d946074cafa3355e921261ba0bd5081bff15c4f17d0c7f8080808080808080a044b83742345b4b2b4debce6d454e97bfb713ae1416dee357f5fd93f858a73a75808080a0d2c1b7d4a3c019943eff4e75716ade2750b1955abcf5d2355de6e3693d6c30d38080", "0xf872a0332fbb2bcac38ed596cbb34ae265df4d60b832ce8077a3abc6f57b4611005cfdb84ff84d808906cb0f6ed0e034ae5da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470" ],
+      "address" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+      "balance" : "0x6cb0f6ed0e034ae5d",
+      "codeHash" : "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+      "nonce" : "0x0",
+      "storageHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "storageProof" : [ {
+        "key" : "0x0347",
+        "value" : "0x0",
+        "proof" : [ ]
+      } ]
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_illegalRangeGreaterThan.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_illegalRangeGreaterThan.json
new file mode 100644
index 00000000000..10ed44fbe1f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_illegalRangeGreaterThan.json
@@ -0,0 +1,21 @@
+{
+  "request": {
+    "id": 28,
+    "jsonrpc": "2.0",
+    "method": "eth_getProof",
+    "params": [
+      "0x8888f1f195afa192cfee860698584c030f4c9db1",
+      ["0x0000000000000000000000000000000000000000000000000000000000000347"],
+      "0x21"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 28,
+    "error": {
+      "code": -32000,
+      "message": "Block not found"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_illegalRangeLessThan.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_illegalRangeLessThan.json
new file mode 100644
index 00000000000..de1c3ccb57b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_illegalRangeLessThan.json
@@ -0,0 +1,21 @@
+{
+  "request": {
+    "id": 28,
+    "jsonrpc": "2.0",
+    "method": "eth_getProof",
+    "params": [
+      "0x8888f1f195afa192cfee860698584c030f4c9db1",
+      ["0x0000000000000000000000000000000000000000000000000000000000000347"],
+      "-0x10"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 28,
+    "error": {
+      "code": -32602,
+      "message": "Invalid params"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_invalidBlockHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_invalidBlockHash.json
new file mode 100644
index 00000000000..257380fdac1
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_invalidBlockHash.json
@@ -0,0 +1,21 @@
+{
+  "request": {
+    "id": 28,
+    "jsonrpc": "2.0",
+    "method": "eth_getProof",
+    "params": [
+      "0x8888f1f195afa192cfee860698584c030f4c9db1",
+      ["0x0000000000000000000000000000000000000000000000000000000000000347"],
+      "0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb1234"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 28,
+    "error" : {
+      "code" : -32602,
+      "message" : "Invalid params"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_invalidParams.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_invalidParams.json
new file mode 100644
index 00000000000..ba169f79dea
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_invalidParams.json
@@ -0,0 +1,17 @@
+{
+  "request": {
+    "id": 28,
+    "jsonrpc": "2.0",
+    "method": "eth_getProof",
+    "params": []
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 28,
+    "error" : {
+      "code" : -32602,
+      "message" : "Invalid params"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_latest.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_latest.json
new file mode 100644
index 00000000000..40c999f7161
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_latest.json
@@ -0,0 +1,30 @@
+{
+  "request": {
+    "id": 28,
+    "jsonrpc": "2.0",
+    "method": "eth_getProof",
+    "params": [
+      "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+      ["0x0000000000000000000000000000000000000000000000000000000000000347"],
+      "latest"
+    ]
+  },
+  "response": {
+    "jsonrpc" : "2.0",
+    "id" : 28,
+    "result" : {
+      "accountProof" : [ "0xf891a084e747fd6c2e7ca25d6f219938c2d9e3014c9e86e3fc3fb0014dcef9d10b6815a097699db78357681938d946074cafa3355e921261ba0bd5081bff15c4f17d0c7f8080808080808080a07ac9345327d90f69293f207fd3dbad91418e38cf6c663c97e8cda89c32448509808080a093e09806aca0b1db534f5e6940b2d43a717c47bf4dfc342a104d9945e82a221d8080", "0xf86ba03b8ec137a2f5a74ec3a73144b552caad890b18b5f725872fa212fff6d4d565bab848f84680820140a0dd3fa56425f8195f314c22547243081293b3f5537cd98ed8f84d4fda3f9a515ba035178fc0de1e7fc754dbd07360e6f80bed818b9e51c62682f312442c4838ac47" ],
+      "address" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+      "balance" : "0x140",
+      "codeHash" : "0x35178fc0de1e7fc754dbd07360e6f80bed818b9e51c62682f312442c4838ac47",
+      "nonce" : "0x0",
+      "storageHash" : "0xdd3fa56425f8195f314c22547243081293b3f5537cd98ed8f84d4fda3f9a515b",
+      "storageProof" : [ {
+        "key" : "0x0347",
+        "value" : "0x0",
+        "proof" : [ "0xf8b18080a0c7f91ee5ea67d593275fcc773a02a5e5fb37b0625ca5c5cdc783483d43f2d7c280a06672614c102b0f02e747250bae452ed105110e25761c15a2a459afbd9eb8cf2e808080a0f671e05fab19f512b16fdcbc938f5fbbfbbc2fa67fecb575bb7721c221f71cf78080a0ba2fc36b0235d7ea299126bd4d404cb38456f32a6c236b422a3868f98c69eda1a0d77552655c7b63916586a73350b1933836f2378789613b548b90fa0a44125df180808080"]
+      } ]
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_pending.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_pending.json
new file mode 100644
index 00000000000..ccbcfddd01b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getProof_pending.json
@@ -0,0 +1,30 @@
+{
+  "request": {
+    "id": 28,
+    "jsonrpc": "2.0",
+    "method": "eth_getProof",
+    "params": [
+      "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+      ["0x0000000000000000000000000000000000000000000000000000000000000347"],
+      "pending"
+    ]
+  },
+  "response": {
+    "jsonrpc" : "2.0",
+    "id" : 28,
+    "result" : {
+      "accountProof" : [ "0xf891a084e747fd6c2e7ca25d6f219938c2d9e3014c9e86e3fc3fb0014dcef9d10b6815a097699db78357681938d946074cafa3355e921261ba0bd5081bff15c4f17d0c7f8080808080808080a07ac9345327d90f69293f207fd3dbad91418e38cf6c663c97e8cda89c32448509808080a093e09806aca0b1db534f5e6940b2d43a717c47bf4dfc342a104d9945e82a221d8080", "0xf86ba03b8ec137a2f5a74ec3a73144b552caad890b18b5f725872fa212fff6d4d565bab848f84680820140a0dd3fa56425f8195f314c22547243081293b3f5537cd98ed8f84d4fda3f9a515ba035178fc0de1e7fc754dbd07360e6f80bed818b9e51c62682f312442c4838ac47" ],
+      "address" : "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+      "balance" : "0x140",
+      "codeHash" : "0x35178fc0de1e7fc754dbd07360e6f80bed818b9e51c62682f312442c4838ac47",
+      "nonce" : "0x0",
+      "storageHash" : "0xdd3fa56425f8195f314c22547243081293b3f5537cd98ed8f84d4fda3f9a515b",
+      "storageProof" : [ {
+        "key" : "0x0347",
+        "value" : "0x0",
+        "proof" : [ "0xf8b18080a0c7f91ee5ea67d593275fcc773a02a5e5fb37b0625ca5c5cdc783483d43f2d7c280a06672614c102b0f02e747250bae452ed105110e25761c15a2a459afbd9eb8cf2e808080a0f671e05fab19f512b16fdcbc938f5fbbfbbc2fa67fecb575bb7721c221f71cf78080a0ba2fc36b0235d7ea299126bd4d404cb38456f32a6c236b422a3868f98c69eda1a0d77552655c7b63916586a73350b1933836f2378789613b548b90fa0a44125df180808080"]
+      } ]
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_blockHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_blockHash.json
new file mode 100644
index 00000000000..6449240dcb4
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_blockHash.json
@@ -0,0 +1,18 @@
+{
+  "request": {
+    "id": 341,
+    "jsonrpc": "2.0",
+    "method": "eth_getStorageAt",
+    "params": [
+      "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+      "0x4",
+      "0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 341,
+    "result": "0xaabbccffffffffffffffffffffffffffffffffffffffffffffffffffffffffee"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_blockHashObject.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_blockHashObject.json
new file mode 100644
index 00000000000..f0276b0b8ed
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_blockHashObject.json
@@ -0,0 +1,20 @@
+{
+  "request": {
+    "id": 341,
+    "jsonrpc": "2.0",
+    "method": "eth_getStorageAt",
+    "params": [
+      "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+      "0x4",
+      {
+        "blockHash": "0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb"
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 341,
+    "result": "0xaabbccffffffffffffffffffffffffffffffffffffffffffffffffffffffffee"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_blockHashObjectCanonical.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_blockHashObjectCanonical.json
new file mode 100644
index 00000000000..17395b4c2b6
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_blockHashObjectCanonical.json
@@ -0,0 +1,21 @@
+{
+  "request": {
+    "id": 341,
+    "jsonrpc": "2.0",
+    "method": "eth_getStorageAt",
+    "params": [
+      "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+      "0x4",
+      {
+        "blockHash": "0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb",
+        "requireCanonical": true
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 341,
+    "result": "0xaabbccffffffffffffffffffffffffffffffffffffffffffffffffffffffffee"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_blockHashObjectCanonicalFalse.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_blockHashObjectCanonicalFalse.json
new file mode 100644
index 00000000000..fd6d0aaf1bd
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_blockHashObjectCanonicalFalse.json
@@ -0,0 +1,21 @@
+{
+  "request": {
+    "id": 341,
+    "jsonrpc": "2.0",
+    "method": "eth_getStorageAt",
+    "params": [
+      "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+      "0x4",
+      {
+        "blockHash": "0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb",
+        "requireCanonical": false
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 341,
+    "result": "0xaabbccffffffffffffffffffffffffffffffffffffffffffffffffffffffffee"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_blockNumber.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_blockNumber.json
new file mode 100644
index 00000000000..636221aed17
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_blockNumber.json
@@ -0,0 +1,18 @@
+{
+  "request": {
+    "id": 341,
+    "jsonrpc": "2.0",
+    "method": "eth_getStorageAt",
+    "params": [
+      "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+      "0x4",
+      "0x19"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 341,
+    "result": "0xaabbccffffffffffffffffffffffffffffffffffffffffffffffffffffffffee"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_blockNumberObject.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_blockNumberObject.json
new file mode 100644
index 00000000000..6c32e9cb5eb
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_blockNumberObject.json
@@ -0,0 +1,20 @@
+{
+  "request": {
+    "id": 341,
+    "jsonrpc": "2.0",
+    "method": "eth_getStorageAt",
+    "params": [
+      "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+      "0x4",
+      {
+        "blockNumber": "0x19"
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 341,
+    "result": "0xaabbccffffffffffffffffffffffffffffffffffffffffffffffffffffffffee"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_illegalRangeGreaterThan.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_illegalRangeGreaterThan.json
index dd366686396..4c5933b81c8 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_illegalRangeGreaterThan.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_illegalRangeGreaterThan.json
@@ -12,7 +12,10 @@
   "response": {
     "jsonrpc": "2.0",
     "id": 337,
-    "result": null
+    "error": {
+      "code": -32000,
+      "message": "Block not found"
+    }
   },
   "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_illegalRangeLessThan.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_illegalRangeLessThan.json
index 9061ee83d51..67892401ce3 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_illegalRangeLessThan.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_illegalRangeLessThan.json
@@ -12,7 +12,10 @@
   "response": {
     "jsonrpc": "2.0",
     "id": 337,
-    "result": null
+    "error": {
+      "code": -32602,
+      "message": "Invalid params"
+    }
   },
   "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_invalidBlockHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_invalidBlockHash.json
new file mode 100644
index 00000000000..3ab3afb25ea
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_invalidBlockHash.json
@@ -0,0 +1,21 @@
+{
+  "request": {
+    "id": 341,
+    "jsonrpc": "2.0",
+    "method": "eth_getStorageAt",
+    "params": [
+      "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+      "0x4",
+      "0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb1234"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 341,
+    "error" : {
+      "code" : -32602,
+      "message" : "Invalid params"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_invalidParams.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_invalidParams.json
index fda23e656a9..99af70906a3 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_invalidParams.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getStorageAt_invalidParams.json
@@ -13,5 +13,5 @@
       "message" : "Invalid params"
     }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_00.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_00.json
index a4edc86b628..e45820cb5d6 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_00.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_00.json
@@ -22,6 +22,7 @@
       "nonce": "0x0",
       "to": null,
       "transactionIndex": "0x0",
+      "type" : "0x0",
       "value": "0xa",
       "v": "0x1c",
       "r": "0xe439aa8812c1c0a751b0931ea20c5a30cd54fe15cae883c59fd8107e04557679",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_01.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_01.json
index 51cfefe27f2..ced91a28d4f 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_01.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_01.json
@@ -22,6 +22,7 @@
       "nonce": "0x1",
       "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
       "transactionIndex": "0x0",
+      "type" : "0x0",
       "value": "0xa",
       "v": "0x1b",
       "r": "0xed2e0f715eccaab4362c19c1cf35ad8031ab1cabe71ada3fe8b269fe9d726712",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_02.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_02.json
index e40ca03f955..bb8b9ca419f 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_02.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_02.json
@@ -22,6 +22,7 @@
       "nonce": "0x1f",
       "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
       "transactionIndex": "0x0",
+      "type" : "0x0",
       "value": "0xa",
       "v": "0x1b",
       "r": "0x705b002a7df60707d33812e0298411721be20ea5a2f533707295140d89263b79",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_intOverflow.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_intOverflow.json
index 30354bb71cb..7f804359ab5 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_intOverflow.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_intOverflow.json
@@ -16,5 +16,5 @@
       "message" : "Invalid params"
     }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParam_00.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParam_00.json
index 22371a93792..97240170b07 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParam_00.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParam_00.json
@@ -15,5 +15,5 @@
       "message" : "Invalid params"
     }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParam_01.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParam_01.json
index 626c3a4d746..6d12441ac7e 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParam_01.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParam_01.json
@@ -15,5 +15,5 @@
       "message" : "Invalid params"
     }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParams.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParams.json
index 9ea6c609f2a..64f1cdef765 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParams.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_missingParams.json
@@ -13,5 +13,5 @@
       "message" : "Invalid params"
     }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_wrongParamType.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_wrongParamType.json
index 288a015496c..977ea64f158 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_wrongParamType.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockHashAndIndex_wrongParamType.json
@@ -16,5 +16,5 @@
       "message" : "Invalid params"
     }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_00.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_00.json
index 16e6bd9a16b..60b591c417c 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_00.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_00.json
@@ -22,6 +22,7 @@
       "nonce": "0x1",
       "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
       "transactionIndex": "0x0",
+      "type" : "0x0",
       "value": "0xa",
       "v": "0x1b",
       "r": "0xed2e0f715eccaab4362c19c1cf35ad8031ab1cabe71ada3fe8b269fe9d726712",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_01.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_01.json
index 1216deeb017..c5c45006200 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_01.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_01.json
@@ -22,6 +22,7 @@
       "nonce": "0x2",
       "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
       "transactionIndex": "0x0",
+      "type" : "0x0",
       "value": "0xa",
       "v": "0x1b",
       "r": "0x9dc3bf93e023b46d5d6d3ff2e62b06e10ba3877b8df69a408d8f8ec2ad8ea040",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_invalidParams.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_invalidParams.json
index 0a5646a7214..8ba25d9c33b 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_invalidParams.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_invalidParams.json
@@ -13,5 +13,5 @@
       "message" : "Invalid params"
     }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_latest.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_latest.json
index ad8cfd98918..4e9d4df91eb 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_latest.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_latest.json
@@ -22,6 +22,7 @@
       "nonce": "0x1f",
       "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
       "transactionIndex": "0x0",
+      "type" : "0x0",
       "value": "0xa",
       "v": "0x1b",
       "r": "0x705b002a7df60707d33812e0298411721be20ea5a2f533707295140d89263b79",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_pending.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_pending.json
index 03e3bad6672..dcf1ce9fd3d 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_pending.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByBlockNumberAndIndex_pending.json
@@ -22,6 +22,7 @@
       "nonce": "0x1f",
       "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
       "transactionIndex": "0x0",
+      "type" : "0x0",
       "value": "0xa",
       "v": "0x1b",
       "r": "0x705b002a7df60707d33812e0298411721be20ea5a2f533707295140d89263b79",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_addressReceiver.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_addressReceiver.json
index 6634cfe19cb..ae8219d4332 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_addressReceiver.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_addressReceiver.json
@@ -21,6 +21,7 @@
       "nonce": "0x1d",
       "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
       "transactionIndex": "0x0",
+      "type" : "0x0",
       "value": "0xa",
       "v": "0x1c",
       "r": "0x11232cac2f935ab8dd5d5972438fde90e05d0dd620860b42886e7d54dc5c4a0c",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_contractCreation.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_contractCreation.json
index 2cea6d0874a..35fd3c253fb 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_contractCreation.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_contractCreation.json
@@ -21,6 +21,7 @@
       "nonce": "0x0",
       "to": null,
       "transactionIndex": "0x0",
+      "type" : "0x0",
       "value": "0xa",
       "v": "0x1c",
       "r": "0xe439aa8812c1c0a751b0931ea20c5a30cd54fe15cae883c59fd8107e04557679",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_invalidHashAndIndex.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_invalidHashAndIndex.json
index b3b3ff27a0b..03756bd7bb6 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_invalidHashAndIndex.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_invalidHashAndIndex.json
@@ -16,5 +16,5 @@
       "message" : "Invalid params"
     }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_invalidParams.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_invalidParams.json
index 86eb5867ff8..7791942380f 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_invalidParams.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_invalidParams.json
@@ -13,5 +13,5 @@
       "message" : "Invalid params"
     }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_typeMismatch.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_typeMismatch.json
index 48bb8402d7e..2263de69d16 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_typeMismatch.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionByHash_typeMismatch.json
@@ -15,5 +15,5 @@
       "message" : "Invalid params"
     }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_blockHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_blockHash.json
new file mode 100644
index 00000000000..d8d5ee7a15a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_blockHash.json
@@ -0,0 +1,17 @@
+{
+  "request": {
+    "id": 487,
+    "jsonrpc": "2.0",
+    "method": "eth_getTransactionCount",
+    "params": [
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      "0xf8f01382f5636d02edac7fff679a6feb7a572d37a395daaab77938feb6fe217f"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 487,
+    "result": "0x0"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_blockHashObject.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_blockHashObject.json
new file mode 100644
index 00000000000..66eb98c27d8
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_blockHashObject.json
@@ -0,0 +1,19 @@
+{
+  "request": {
+    "id": 487,
+    "jsonrpc": "2.0",
+    "method": "eth_getTransactionCount",
+    "params": [
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      {
+        "blockHash": "0xf8f01382f5636d02edac7fff679a6feb7a572d37a395daaab77938feb6fe217f"
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 487,
+    "result": "0x0"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_blockHashObjectCanonical.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_blockHashObjectCanonical.json
new file mode 100644
index 00000000000..51cea8b74c1
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_blockHashObjectCanonical.json
@@ -0,0 +1,20 @@
+{
+  "request": {
+    "id": 487,
+    "jsonrpc": "2.0",
+    "method": "eth_getTransactionCount",
+    "params": [
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      {
+        "blockHash": "0xf8f01382f5636d02edac7fff679a6feb7a572d37a395daaab77938feb6fe217f",
+        "requireCanonical": true
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 487,
+    "result": "0x0"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_blockHashObjectCanonicalFalse.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_blockHashObjectCanonicalFalse.json
new file mode 100644
index 00000000000..2413b269e67
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_blockHashObjectCanonicalFalse.json
@@ -0,0 +1,20 @@
+{
+  "request": {
+    "id": 487,
+    "jsonrpc": "2.0",
+    "method": "eth_getTransactionCount",
+    "params": [
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      {
+        "blockHash": "0xf8f01382f5636d02edac7fff679a6feb7a572d37a395daaab77938feb6fe217f",
+        "requireCanonical": false
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 487,
+    "result": "0x0"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_blockNumberObject.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_blockNumberObject.json
new file mode 100644
index 00000000000..36b5638b71e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_blockNumberObject.json
@@ -0,0 +1,19 @@
+{
+  "request": {
+    "id": 487,
+    "jsonrpc": "2.0",
+    "method": "eth_getTransactionCount",
+    "params": [
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      {
+        "blockNumber": "0x0"
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 487,
+    "result": "0x0"
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_illegalRange.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_illegalRange.json
index 9ceb071d9f5..462e8354c39 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_illegalRange.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_illegalRange.json
@@ -11,7 +11,10 @@
   "response": {
     "jsonrpc": "2.0",
     "id": 487,
-    "result": null
+    "error": {
+      "code": -32000,
+      "message": "Block not found"
+    }
   },
   "statusCode": 200
 }
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_invalidBlockHash.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_invalidBlockHash.json
new file mode 100644
index 00000000000..52651090e96
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_invalidBlockHash.json
@@ -0,0 +1,20 @@
+{
+  "request": {
+    "id": 487,
+    "jsonrpc": "2.0",
+    "method": "eth_getTransactionCount",
+    "params": [
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      "0xb73cee02246c6f32ac0f459934e89102c2ce904d966a4fc2ab6309c3e104b9cb1234"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 487,
+    "error" : {
+      "code" : -32602,
+      "message" : "Invalid params"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_invalidBlockNumber.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_invalidBlockNumber.json
new file mode 100644
index 00000000000..0ad4a0d3cb4
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_invalidBlockNumber.json
@@ -0,0 +1,20 @@
+{
+  "request": {
+    "id": 487,
+    "jsonrpc": "2.0",
+    "method": "eth_getTransactionCount",
+    "params": [
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      "0xD5C9556Ec8Fef8A240EDdFdd01433Dc6EC08CBCa"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 487,
+    "error" : {
+      "code" : -32602,
+      "message" : "Invalid params"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_missingArgument.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_missingArgument.json
index 873a94bc855..75437d4db8a 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_missingArgument.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionCount_missingArgument.json
@@ -13,5 +13,5 @@
       "message": "Invalid params"
     }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_contractAddress.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_contractAddress.json
index c64b099a4b1..63e8e5e6bea 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_contractAddress.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_contractAddress.json
@@ -17,12 +17,14 @@
       "cumulativeGasUsed": "0x78674",
       "from": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
       "gasUsed": "0x78674",
+      "effectiveGasPrice": "0x1",
       "logs": [],
       "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
       "root": "0x6a59608add7cee26032d1c5c3923b91d0b50e6103f61b2137b68229bcdc87395",
       "to": null,
       "transactionHash": "0x812742182a79a8e67733edc58cfa3767aa2d7ad06439d156ddbbb33e3403b4ed",
-      "transactionIndex": "0x0"
+      "transactionIndex": "0x0",
+      "type" : "0x0"
     }
   },
   "statusCode": 200
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_logs.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_logs.json
index 7ea85959cbb..d056272effa 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_logs.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_logs.json
@@ -17,6 +17,7 @@
       "cumulativeGasUsed": "0x5eef",
       "from": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
       "gasUsed": "0x5eef",
+      "effectiveGasPrice": "0x1",
       "logs": [
         {
           "address": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
@@ -39,7 +40,8 @@
       "root": "0xb55d027526b3f56953584db678b5c3d1a418812c0106b0cfbc3c912c7898dfe5",
       "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
       "transactionHash": "0x185a9154a0acc4e0ffc84029aee0f3dbf57ff0b84ec7624cb80e7373a03e8aeb",
-      "transactionIndex": "0x0"
+      "transactionIndex": "0x0",
+      "type" : "0x0"
     }
   },
   "statusCode": 200
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_nullContractAddress.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_nullContractAddress.json
index 031fc30c534..b084bb285b8 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_nullContractAddress.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_getTransactionReceipt_nullContractAddress.json
@@ -17,12 +17,14 @@
       "cumulativeGasUsed": "0x53f0",
       "from": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
       "gasUsed": "0x53f0",
+      "effectiveGasPrice": "0x1",
       "logs": [],
       "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
       "root": "0x947228066df6272aac99931a1a639621d4ac7dc461ce9fd93dfcaad933e299ee",
       "to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
       "transactionHash": "0xb1a62356d1433202cdef0ef9030f8abdfbb3aef549fab0867cf0eaee70b09d81",
-      "transactionIndex": "0x0"
+      "transactionIndex": "0x0",
+      "type" : "0x0"
     }
   },
   "statusCode": 200
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_invalidByteValueHex.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_invalidByteValueHex.json
index 43dc9552481..0b015c04cbc 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_invalidByteValueHex.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_invalidByteValueHex.json
@@ -4,7 +4,7 @@
     "jsonrpc": "2.0",
     "method": "eth_sendRawTransaction",
     "params": [
-      "0x0"
+      "0x0123"
     ]
   },
   "response": {
@@ -15,5 +15,5 @@
       "message" : "Invalid params"
     }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_invalidRawTransaction.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_invalidRawTransaction.json
index 0465f81b979..669f7e87127 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_invalidRawTransaction.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_invalidRawTransaction.json
@@ -15,5 +15,5 @@
       "message" : "Invalid params"
     }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_unsignedTransaction.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_unsignedTransaction.json
index 3b717f63b80..109cda75ab6 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_unsignedTransaction.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_sendRawTransaction_unsignedTransaction.json
@@ -15,5 +15,5 @@
       "message" : "Invalid params"
     }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth_latest/eth_call_revert.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth_latest/eth_call_revert.json
new file mode 100644
index 00000000000..29fe8e1105a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth_latest/eth_call_revert.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "id": 3,
+    "jsonrpc": "2.0",
+    "method": "eth_call",
+    "params": [
+      {
+        "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "to": "0x0110000000000000000000000000000000000000"
+      },
+      "0x11"
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 3,
+    "error": {
+      "code": -32000,
+      "message": "Execution reverted",
+      "data": "0x7d88c1856cc95352"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth_latest/eth_estimateGas_revert.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth_latest/eth_estimateGas_revert.json
new file mode 100644
index 00000000000..618653648e4
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth_latest/eth_estimateGas_revert.json
@@ -0,0 +1,23 @@
+{
+  "request": {
+    "id": 3,
+    "jsonrpc": "2.0",
+    "method": "eth_estimateGas",
+    "params": [
+      {
+        "from": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
+        "data": "0x600160005560016000fd6011600155"
+      }
+    ]
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "id": 3,
+    "error": {
+      "code": -32000,
+      "message": "Execution reverted",
+      "data": "0x00"
+    }
+  },
+  "statusCode": 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/blocks.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/blocks.json
index d27211ca776..7af5dfa4d13 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/blocks.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/blocks.json
@@ -550,6 +550,18 @@
           "data": "0x000000000000000000000000000000000000000000000000000000000000ea60"
         }
       ]
+    },
+    {
+      "number": "0x21",
+      "transactions" : [
+        {
+          "comment": "Call to a contract creation that fails with a stack underflow",
+          "secretKey": "0x8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63",
+          "gasLimit": "0x47B760",
+          "gasPrice": "0x1",
+          "data": "0x602af300"
+        }
+      ]
     }
   ]
 }
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/genesis.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/genesis.json
index 88287d79561..afc1b9de730 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/genesis.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/genesis.json
@@ -1,14 +1,7 @@
 {
   "config": {
     "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
-    "eip160Block": 0,
-    "byzantiumBlock": 0,
-    "constantinopleBlock": 0,
-    "constantinopleFixBlock": 0,
+    "petersburgBlock": 0,
     "istanbulBlock": 0,
     "ethash": {
       "fixeddifficulty": 15
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/all/trace_replayBlockTransactions_all_0x12.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/all/trace_replayBlockTransactions_all_0x12.json
index 4e3e524ed93..41d89231ba2 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/all/trace_replayBlockTransactions_all_0x12.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/all/trace_replayBlockTransactions_all_0x12.json
@@ -182,7 +182,8 @@
         }
       },
       {
-        "output": "0x7d88c1856cc95352",
+        "output": "0x",
+        "revertReason": "0x7d88c1856cc95352",
         "stateDiff": {
           "0x0000000000000000000000000000000000000000": {
             "balance": {
@@ -223,6 +224,7 @@
               "value": "0x0"
             },
             "error": "Reverted",
+            "revertReason": "0x7d88c1856cc95352",
             "subtraces": 0,
             "traceAddress": [],
             "type": "call"
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/all/trace_replayBlockTransactions_all_0x21.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/all/trace_replayBlockTransactions_all_0x21.json
new file mode 100644
index 00000000000..12a69b4f728
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/all/trace_replayBlockTransactions_all_0x21.json
@@ -0,0 +1,88 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_replayBlockTransactions",
+    "params": [
+      "0x21",
+      [
+        "trace",
+        "vmTrace",
+        "stateDiff"
+      ]
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "output": "0x",
+        "stateDiff": {
+          "0x0000000000000000000000000000000000000000": {
+            "balance": {
+              "*": {
+                "from": "0x3782f841c36b0fb3e",
+                "to": "0x3782f841c36f8b29e"
+              }
+            },
+            "code": "=",
+            "nonce": "=",
+            "storage": {}
+          },
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
+            "balance": {
+              "*": {
+                "from": "0xffffffffffffffffffffffffffffffffd28431e7b",
+                "to": "0xffffffffffffffffffffffffffffffffd27fb671b"
+              }
+            },
+            "code": "=",
+            "nonce": {
+              "*": {
+                "from": "0x1d",
+                "to": "0x1e"
+              }
+            },
+            "storage": {}
+          }
+        },
+        "trace": [
+          {
+            "action": {
+              "creationMethod": "create",
+              "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+              "gas": "0x46e824",
+              "init": "0x602af300",
+              "value": "0x0"
+            },
+            "error": "Stack underflow",
+            "subtraces": 0,
+            "traceAddress": [],
+            "type": "create"
+          }
+        ],
+        "transactionHash": "0xf0378e1bf579b23aff89255d93ade14fe9136a7cedd9c4985e9bec2d18ce65e9",
+        "vmTrace": {
+          "code": "0x602af300",
+          "ops": [
+            {
+              "cost": 3,
+              "ex": {
+                "mem": null,
+                "push": [
+                  "0x2a"
+                ],
+                "store": null,
+                "used": 4646945
+              },
+              "pc": 0,
+              "sub": null
+            }
+          ]
+        }
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/flat/trace_replayBlockTransactions_invalidBlockParam.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/flat/trace_replayBlockTransactions_invalidBlockParam.json
index 0281b72d665..b67f6eb872a 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/flat/trace_replayBlockTransactions_invalidBlockParam.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/flat/trace_replayBlockTransactions_invalidBlockParam.json
@@ -16,5 +16,5 @@
       "message": "Invalid params"
     }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/flat/trace_replayBlockTransactions_invalidTraceOptions.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/flat/trace_replayBlockTransactions_invalidTraceOptions.json
index 34c64277d9e..47f13b7287c 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/flat/trace_replayBlockTransactions_invalidTraceOptions.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/flat/trace_replayBlockTransactions_invalidTraceOptions.json
@@ -16,5 +16,5 @@
       "message": "Invalid params"
     }
   },
-  "statusCode": 400
+  "statusCode": 200
 }
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/flat/trace_replayBlockTransactions_traceOnly_0x12.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/flat/trace_replayBlockTransactions_traceOnly_0x12.json
index f1028642657..50396037426 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/flat/trace_replayBlockTransactions_traceOnly_0x12.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/flat/trace_replayBlockTransactions_traceOnly_0x12.json
@@ -39,7 +39,8 @@
         "vmTrace": null
       },
       {
-        "output": "0x7d88c1856cc95352",
+        "output": "0x",
+        "revertReason": "0x7d88c1856cc95352",
         "stateDiff": null,
         "trace": [
           {
@@ -52,6 +53,7 @@
               "value": "0x0"
             },
             "error": "Reverted",
+            "revertReason": "0x7d88c1856cc95352",
             "subtraces": 0,
             "traceAddress": [],
             "type": "call"
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/flat/trace_replayBlockTransactions_traceOnly_0x21.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/flat/trace_replayBlockTransactions_traceOnly_0x21.json
new file mode 100644
index 00000000000..7baa62b9c6c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/flat/trace_replayBlockTransactions_traceOnly_0x21.json
@@ -0,0 +1,41 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_replayBlockTransactions",
+    "params": [
+      "0x21",
+      [
+        "trace"
+      ]
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "output": "0x",
+        "stateDiff": null,
+        "trace": [
+          {
+            "action": {
+              "creationMethod": "create",
+              "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+              "gas": "0x46e824",
+              "init": "0x602af300",
+              "value": "0x0"
+            },
+            "error": "Stack underflow",
+            "subtraces": 0,
+            "traceAddress": [],
+            "type": "create"
+          }
+        ],
+        "transactionHash": "0xf0378e1bf579b23aff89255d93ade14fe9136a7cedd9c4985e9bec2d18ce65e9",
+        "vmTrace": null
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/statediff/trace_replayBlockTransactions_diffOnly_0x12.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/statediff/trace_replayBlockTransactions_diffOnly_0x12.json
index cb8e473dc8f..d16fce4bfa4 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/statediff/trace_replayBlockTransactions_diffOnly_0x12.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/statediff/trace_replayBlockTransactions_diffOnly_0x12.json
@@ -49,7 +49,8 @@
         "vmTrace": null
       },
       {
-        "output": "0x7d88c1856cc95352",
+        "output": "0x",
+        "revertReason": "0x7d88c1856cc95352",
         "stateDiff": {
           "0x0000000000000000000000000000000000000000": {
             "balance": {
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/vm-trace/trace_replayBlockTransactions_0x12.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/vm-trace/trace_replayBlockTransactions_0x12.json
index bc10f972761..2282ec667fc 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/vm-trace/trace_replayBlockTransactions_0x12.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/vm-trace/trace_replayBlockTransactions_0x12.json
@@ -134,7 +134,8 @@
         }
       },
       {
-        "output": "0x7d88c1856cc95352",
+        "output": "0x",
+        "revertReason": "0x7d88c1856cc95352",
         "stateDiff": null,
         "trace": [],
         "transactionHash": "0xc388baa0e55e6b73e850b22dc7e9853700f6b995fd55d95dd6ccd5a13d63c566",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/vm-trace/trace_replayBlockTransactions_0x21.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/vm-trace/trace_replayBlockTransactions_0x21.json
new file mode 100644
index 00000000000..3e79c741839
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/replay-trace-transaction/vm-trace/trace_replayBlockTransactions_0x21.json
@@ -0,0 +1,44 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_replayBlockTransactions",
+    "params": [
+      "0x21",
+      [
+        "vmTrace"
+      ]
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "output": "0x",
+        "stateDiff": null,
+        "trace": [],
+        "transactionHash": "0xf0378e1bf579b23aff89255d93ade14fe9136a7cedd9c4985e9bec2d18ce65e9",
+        "vmTrace": {
+          "code": "0x602af300",
+          "ops": [
+            {
+              "cost": 3,
+              "ex": {
+                "mem": null,
+                "push": [
+                  "0x2a"
+                ],
+                "store": null,
+                "used": 4646945
+              },
+              "pc": 0,
+              "sub": null
+            }
+          ]
+        }
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-block/trace_block_0x12.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-block/trace_block_0x12.json
index 44621d54944..36d712f492f 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-block/trace_block_0x12.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-block/trace_block_0x12.json
@@ -43,6 +43,7 @@
         "blockHash": "0x220bc13dc4f1ed38dcca927a5be15eca16497d279f4c40d7b8fe9704eadf1464",
         "blockNumber": 18,
         "error": "Reverted",
+        "revertReason": "0x7d88c1856cc95352",
         "subtraces": 0,
         "traceAddress": [],
         "transactionHash": "0xc388baa0e55e6b73e850b22dc7e9853700f6b995fd55d95dd6ccd5a13d63c566",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-block/trace_block_0x21.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-block/trace_block_0x21.json
new file mode 100644
index 00000000000..559f0ee6a3f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-block/trace_block_0x21.json
@@ -0,0 +1,49 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_block",
+    "params": [
+      "0x21"
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "creationMethod": "create",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0x46e824",
+          "init": "0x602af300",
+          "value": "0x0"
+        },
+        "blockHash": "0x156fa7f1633c5dd82d41b7c7d79049f620b25638ca87da137d13e1a27a210e49",
+        "blockNumber": 33,
+        "error": "Stack underflow",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xf0378e1bf579b23aff89255d93ade14fe9136a7cedd9c4985e9bec2d18ce65e9",
+        "transactionPosition": 0,
+        "type": "create"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x156fa7f1633c5dd82d41b7c7d79049f620b25638ca87da137d13e1a27a210e49",
+        "blockNumber": 33,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_02_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_02_0_stateDiff.json
new file mode 100644
index 00000000000..ca3e29c9a23
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_02_0_stateDiff.json
@@ -0,0 +1,66 @@
+{
+  "comment" : "Simple value transfer",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0000000000000000000000000000000000000999",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x1",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 0
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860d4816"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0000000000000000000000000000000000000999" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x1",
+              "to" : "0x2"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d079bf50c2"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 0
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_02_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_02_0_trace.json
new file mode 100644
index 00000000000..8ae4ad47344
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_02_0_trace.json
@@ -0,0 +1,43 @@
+{
+  "comment" : "Simple value transfer",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0000000000000000000000000000000000000999",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x1",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 0
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0000000000000000000000000000000000000999",
+          "value" : "0x1"
+        },
+        "result" : {
+          "gasUsed" : "0x0",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 0
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_02_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_02_0_vmTrace.json
new file mode 100644
index 00000000000..52829b09983
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_02_0_vmTrace.json
@@ -0,0 +1,30 @@
+{
+  "comment" : "Simple value transfer",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0000000000000000000000000000000000000999",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x1",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 53
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x",
+        "ops" : [ ]
+      }
+    },
+    "id" : 53
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_03_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_03_0_stateDiff.json
new file mode 100644
index 00000000000..ce05e50bf59
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_03_0_stateDiff.json
@@ -0,0 +1,67 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x6004600C60003960046000F3600035FF",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 1
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f1838685c9c2"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241" : {
+          "balance" : {
+            "+" : "0x0"
+          },
+          "code" : {
+            "+" : "0x600035ff"
+          },
+          "nonce" : {
+            "+" : "0x1"
+          },
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d07946cf17"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_03_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_03_0_trace.json
new file mode 100644
index 00000000000..af687786812
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_03_0_trace.json
@@ -0,0 +1,42 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x6004600C60003960046000F3600035FF",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 1
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff300e",
+          "init" : "0x6004600c60003960046000f3600035ff",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "code" : "0x600035ff",
+          "gasUsed" : "0x338"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_03_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_03_0_vmTrace.json
new file mode 100644
index 00000000000..f820d8b6f41
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_03_0_vmTrace.json
@@ -0,0 +1,103 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x6004600C60003960046000F3600035FF",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 54
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6004600c60003960046000f3600035ff",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723979
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc" ],
+            "store" : null,
+            "used" : 16723976
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723973
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0x600035ff",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723964
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723961
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 11,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 54
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_0_stateDiff.json
new file mode 100644
index 00000000000..5c1b902d758
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_0_stateDiff.json
@@ -0,0 +1,75 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,1),(2,2)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 2
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386a1490e"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0010000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+              }
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000002"
+              }
+            }
+          }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd271ad0ab"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 2
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_0_trace.json
new file mode 100644
index 00000000000..7877787a188
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_0_trace.json
@@ -0,0 +1,44 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,1),(2,2)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 2
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffabba",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9c58",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 2
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_0_vmTrace.json
new file mode 100644
index 00000000000..dfd72ccda7f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_0_vmTrace.json
@@ -0,0 +1,137 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,1),(2,2)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 55
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6020356000355560603560403555",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755639
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755636
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755633
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755630
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x1",
+              "val" : "0x1"
+            },
+            "used" : 16735630
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16735627
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16735624
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16735621
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16735618
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x2",
+              "val" : "0x2"
+            },
+            "used" : 16715618
+          },
+          "pc" : 13,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 55
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_1_stateDiff.json
new file mode 100644
index 00000000000..e909137428e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_1_stateDiff.json
@@ -0,0 +1,75 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(2,4)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 3
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386a1490e"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0010000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000003"
+              }
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000004"
+              }
+            }
+          }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d0792b4fcb"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 3
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_1_trace.json
new file mode 100644
index 00000000000..26a61ae8345
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_1_trace.json
@@ -0,0 +1,44 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(2,4)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 3
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffabba",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9c58",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 3
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_1_vmTrace.json
new file mode 100644
index 00000000000..e97c9fdfa65
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_1_vmTrace.json
@@ -0,0 +1,137 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(2,4)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 56
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6020356000355560603560403555",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755639
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16755636
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755633
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755630
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x1",
+              "val" : "0x3"
+            },
+            "used" : 16735630
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16735627
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16735624
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16735621
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16735618
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x2",
+              "val" : "0x4"
+            },
+            "used" : 16715618
+          },
+          "pc" : 13,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 56
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_2_stateDiff.json
new file mode 100644
index 00000000000..19285a7a09a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_2_stateDiff.json
@@ -0,0 +1,56 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(1,0)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 4
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183861533da"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d079b764ff"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 4
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_2_trace.json
new file mode 100644
index 00000000000..4a9458b7a69
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_2_trace.json
@@ -0,0 +1,44 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(1,0)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 4
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffabc6",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x5158",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 4
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_2_vmTrace.json
new file mode 100644
index 00000000000..026c55e76c9
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_04_2_vmTrace.json
@@ -0,0 +1,137 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(1,0)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 57
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6020356000355560603560403555",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755651
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16755648
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755645
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755642
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x1",
+              "val" : "0x3"
+            },
+            "used" : 16735642
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16735639
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16735636
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16735633
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16735630
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x1",
+              "val" : "0x0"
+            },
+            "used" : 16734830
+          },
+          "pc" : 13,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 57
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_05_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_05_0_stateDiff.json
new file mode 100644
index 00000000000..38031ae5673
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_05_0_stateDiff.json
@@ -0,0 +1,56 @@
+{
+  "comment" : "Clear contract storage keys 1 and 2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 5
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183861528a6"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27a6f113"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 5
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_05_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_05_0_trace.json
new file mode 100644
index 00000000000..829df25b714
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_05_0_trace.json
@@ -0,0 +1,44 @@
+{
+  "comment" : "Clear contract storage keys 1 and 2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 5
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffabd2",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x658",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 5
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_05_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_05_0_vmTrace.json
new file mode 100644
index 00000000000..5fdf107e976
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_05_0_vmTrace.json
@@ -0,0 +1,137 @@
+{
+  "comment" : "Clear contract storage keys 1 and 2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 58
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6020356000355560603560403555",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755663
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755660
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755657
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755654
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x1",
+              "val" : "0x0"
+            },
+            "used" : 16754854
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16754851
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754848
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16754845
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16754842
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x2",
+              "val" : "0x0"
+            },
+            "used" : 16754042
+          },
+          "pc" : 13,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 58
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_06_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_06_0_stateDiff.json
new file mode 100644
index 00000000000..b3ff816a9e1
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_06_0_stateDiff.json
@@ -0,0 +1,56 @@
+{
+  "comment" : "Self destruct and send contract balance to address provided in the data field.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0020000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000000000000000999",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 6
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860da92e"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27ae708b"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 6
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_06_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_06_0_trace.json
new file mode 100644
index 00000000000..2e29955cd0f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_06_0_trace.json
@@ -0,0 +1,44 @@
+{
+  "comment" : "Self destruct and send contract balance to address provided in the data field.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0020000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000000000000000999",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 6
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffad82",
+          "input" : "0x0000000000000000000000000000000000000999",
+          "to" : "0x0020000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x0",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 6
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_06_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_06_0_vmTrace.json
new file mode 100644
index 00000000000..ec4eaacb627
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_06_0_vmTrace.json
@@ -0,0 +1,31 @@
+{
+  "comment" : "Self destruct and send contract balance to address provided in the data field.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0020000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000000000000000999",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 59
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x",
+        "ops" : [ ]
+      }
+    },
+    "id" : 59
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_07_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_07_0_stateDiff.json
new file mode 100644
index 00000000000..84be38b9c9a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_07_0_stateDiff.json
@@ -0,0 +1,56 @@
+{
+  "comment" : "Increment 32 bytes provided in data field and return the value.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0030000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 7
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860def33"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27ae2a86"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 7
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_07_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_07_0_trace.json
new file mode 100644
index 00000000000..c55b6049114
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_07_0_trace.json
@@ -0,0 +1,44 @@
+{
+  "comment" : "Increment 32 bytes provided in data field and return the value.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0030000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 7
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffad52",
+          "input" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0030000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x1b",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 7
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_07_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_07_0_vmTrace.json
new file mode 100644
index 00000000000..2452eef2671
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_07_0_vmTrace.json
@@ -0,0 +1,124 @@
+{
+  "comment" : "Increment 32 bytes provided in data field and return the value.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0030000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 60
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60003560010160005260206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756047
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000001" ],
+            "store" : null,
+            "used" : 16756044
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756041
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000002" ],
+            "store" : null,
+            "used" : 16756038
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756035
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756029
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16756026
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756023
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756023
+          },
+          "pc" : 13,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 60
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_08_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_08_0_stateDiff.json
new file mode 100644
index 00000000000..ec720537d53
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_08_0_stateDiff.json
@@ -0,0 +1,56 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 8
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386112f08"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aaeab1"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 8
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_08_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_08_0_trace.json
new file mode 100644
index 00000000000..5ffe2d6d577
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_08_0_trace.json
@@ -0,0 +1,60 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 8
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffacc6",
+          "input" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x30a",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfbab36",
+          "input" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0030000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x1b",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 8
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_08_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_08_0_vmTrace.json
new file mode 100644
index 00000000000..4a6f2bb02c2
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_08_0_vmTrace.json
@@ -0,0 +1,313 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 61
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755907
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755904
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755901
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16755899
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755896
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x20" ],
+            "store" : null,
+            "used" : 16755893
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755890
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755887
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755878
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755875
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755873
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755870
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x30000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755867
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffac99" ],
+            "store" : null,
+            "used" : 16755865
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16494066,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755138
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x60003560010160005260206000f3",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493363
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000001" ],
+                "store" : null,
+                "used" : 16493360
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16493357
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000002" ],
+                "store" : null,
+                "used" : 16493354
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493351
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 6,
+              "ex" : {
+                "mem" : {
+                  "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+                  "off" : 0
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16493345
+              },
+              "pc" : 8,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16493342
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493339
+              },
+              "pc" : 11,
+              "sub" : null
+            }, {
+              "cost" : 0,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16493339
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755135
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755132
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755132
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 61
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_09_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_09_0_stateDiff.json
new file mode 100644
index 00000000000..09d606d0f2c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_09_0_stateDiff.json
@@ -0,0 +1,56 @@
+{
+  "comment" : "Proxy call to another contract - several levels deep. Using CALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 9
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f1838617bf80"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27a45a39"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 9
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_09_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_09_0_trace.json
new file mode 100644
index 00000000000..4a221bf1015
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_09_0_trace.json
@@ -0,0 +1,92 @@
+{
+  "comment" : "Proxy call to another contract - several levels deep. Using CALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 9
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffabae",
+          "input" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x8fa",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfbaa17",
+          "input" : "0x00000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x5ff",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xf7b88c",
+          "input" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x30a",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ 0, 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xf3d6cd",
+          "input" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0030000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x1b",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0, 0, 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 9
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_09_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_09_0_vmTrace.json
new file mode 100644
index 00000000000..89eb7ab334f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_09_0_vmTrace.json
@@ -0,0 +1,691 @@
+{
+  "comment" : "Proxy call to another contract - several levels deep. Using CALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 62
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755627
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755624
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755621
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755619
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16755616
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x60" ],
+            "store" : null,
+            "used" : 16755613
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755610
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755607
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 21,
+          "ex" : {
+            "mem" : {
+              "data" : "0x00000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755586
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755583
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755581
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755578
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755575
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffab75" ],
+            "store" : null,
+            "used" : 16755573
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16493779,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16753338
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16493076
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493073
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16493070
+              },
+              "pc" : 4,
+              "sub" : null
+            }, {
+              "cost" : 2,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16493068
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16493065
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40", "0x40" ],
+                "store" : null,
+                "used" : 16493062
+              },
+              "pc" : 8,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16493059
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493056
+              },
+              "pc" : 11,
+              "sub" : null
+            }, {
+              "cost" : 15,
+              "ex" : {
+                "mem" : {
+                  "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+                  "off" : 0
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16493041
+              },
+              "pc" : 13,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493038
+              },
+              "pc" : 14,
+              "sub" : null
+            }, {
+              "cost" : 2,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493036
+              },
+              "pc" : 16,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493033
+              },
+              "pc" : 17,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40000000000000000000000000000000000000" ],
+                "store" : null,
+                "used" : 16493030
+              },
+              "pc" : 19,
+              "sub" : null
+            }, {
+              "cost" : 2,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xfba9e4" ],
+                "store" : null,
+                "used" : 16493028
+              },
+              "pc" : 20,
+              "sub" : null
+            }, {
+              "cost" : 16235336,
+              "ex" : {
+                "mem" : {
+                  "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+                  "off" : 0
+                },
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16491550
+              },
+              "pc" : 21,
+              "sub" : {
+                "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+                "ops" : [ {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16234633
+                  },
+                  "pc" : 0,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16234630
+                  },
+                  "pc" : 2,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16234627
+                  },
+                  "pc" : 4,
+                  "sub" : null
+                }, {
+                  "cost" : 2,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x40" ],
+                    "store" : null,
+                    "used" : 16234625
+                  },
+                  "pc" : 6,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16234622
+                  },
+                  "pc" : 7,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20", "0x20" ],
+                    "store" : null,
+                    "used" : 16234619
+                  },
+                  "pc" : 8,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16234616
+                  },
+                  "pc" : 9,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16234613
+                  },
+                  "pc" : 11,
+                  "sub" : null
+                }, {
+                  "cost" : 9,
+                  "ex" : {
+                    "mem" : {
+                      "data" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+                      "off" : 0
+                    },
+                    "push" : [ ],
+                    "store" : null,
+                    "used" : 16234604
+                  },
+                  "pc" : 13,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16234601
+                  },
+                  "pc" : 14,
+                  "sub" : null
+                }, {
+                  "cost" : 2,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16234599
+                  },
+                  "pc" : 16,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16234596
+                  },
+                  "pc" : 17,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x30000000000000000000000000000000000000" ],
+                    "store" : null,
+                    "used" : 16234593
+                  },
+                  "pc" : 19,
+                  "sub" : null
+                }, {
+                  "cost" : 2,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0xf7b85f" ],
+                    "store" : null,
+                    "used" : 16234591
+                  },
+                  "pc" : 20,
+                  "sub" : null
+                }, {
+                  "cost" : 15980937,
+                  "ex" : {
+                    "mem" : {
+                      "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+                      "off" : 0
+                    },
+                    "push" : [ "0x1" ],
+                    "store" : null,
+                    "used" : 16233864
+                  },
+                  "pc" : 21,
+                  "sub" : {
+                    "code" : "0x60003560010160005260206000f3",
+                    "ops" : [ {
+                      "cost" : 3,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ "0x0" ],
+                        "store" : null,
+                        "used" : 15980234
+                      },
+                      "pc" : 0,
+                      "sub" : null
+                    }, {
+                      "cost" : 3,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000001" ],
+                        "store" : null,
+                        "used" : 15980231
+                      },
+                      "pc" : 2,
+                      "sub" : null
+                    }, {
+                      "cost" : 3,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ "0x1" ],
+                        "store" : null,
+                        "used" : 15980228
+                      },
+                      "pc" : 3,
+                      "sub" : null
+                    }, {
+                      "cost" : 3,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000002" ],
+                        "store" : null,
+                        "used" : 15980225
+                      },
+                      "pc" : 5,
+                      "sub" : null
+                    }, {
+                      "cost" : 3,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ "0x0" ],
+                        "store" : null,
+                        "used" : 15980222
+                      },
+                      "pc" : 6,
+                      "sub" : null
+                    }, {
+                      "cost" : 6,
+                      "ex" : {
+                        "mem" : {
+                          "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+                          "off" : 0
+                        },
+                        "push" : [ ],
+                        "store" : null,
+                        "used" : 15980216
+                      },
+                      "pc" : 8,
+                      "sub" : null
+                    }, {
+                      "cost" : 3,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ "0x20" ],
+                        "store" : null,
+                        "used" : 15980213
+                      },
+                      "pc" : 9,
+                      "sub" : null
+                    }, {
+                      "cost" : 3,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ "0x0" ],
+                        "store" : null,
+                        "used" : 15980210
+                      },
+                      "pc" : 11,
+                      "sub" : null
+                    }, {
+                      "cost" : 0,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ ],
+                        "store" : null,
+                        "used" : 15980210
+                      },
+                      "pc" : 13,
+                      "sub" : null
+                    } ]
+                  }
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16233861
+                  },
+                  "pc" : 22,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16233858
+                  },
+                  "pc" : 24,
+                  "sub" : null
+                }, {
+                  "cost" : 0,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ ],
+                    "store" : null,
+                    "used" : 16233858
+                  },
+                  "pc" : 26,
+                  "sub" : null
+                } ]
+              }
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16491547
+              },
+              "pc" : 22,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16491544
+              },
+              "pc" : 24,
+              "sub" : null
+            }, {
+              "cost" : 0,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16491544
+              },
+              "pc" : 26,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16753335
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16753332
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16753332
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 62
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0a_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0a_0_stateDiff.json
new file mode 100644
index 00000000000..dd7d2e1493d
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0a_0_stateDiff.json
@@ -0,0 +1,56 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep. Using CALLCODE.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0050000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 10
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386112f08"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aaeab1"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 10
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0a_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0a_0_trace.json
new file mode 100644
index 00000000000..234d6da2ca8
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0a_0_trace.json
@@ -0,0 +1,60 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep. Using CALLCODE.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0050000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 10
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffacc6",
+          "input" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0050000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x30a",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "callcode",
+          "from" : "0x0050000000000000000000000000000000000000",
+          "gas" : "0xfbab36",
+          "input" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0030000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x1b",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 10
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0a_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0a_0_vmTrace.json
new file mode 100644
index 00000000000..2d24eb0c107
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0a_0_vmTrace.json
@@ -0,0 +1,313 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep. Using CALLCODE.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0050000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 63
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af260206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755907
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755904
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755901
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16755899
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755896
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x20" ],
+            "store" : null,
+            "used" : 16755893
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755890
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755887
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755878
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755875
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755873
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755870
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x30000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755867
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffac99" ],
+            "store" : null,
+            "used" : 16755865
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16494066,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755138
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x60003560010160005260206000f3",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493363
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000001" ],
+                "store" : null,
+                "used" : 16493360
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16493357
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000002" ],
+                "store" : null,
+                "used" : 16493354
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493351
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 6,
+              "ex" : {
+                "mem" : {
+                  "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+                  "off" : 0
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16493345
+              },
+              "pc" : 8,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16493342
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493339
+              },
+              "pc" : 11,
+              "sub" : null
+            }, {
+              "cost" : 0,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16493339
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755135
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755132
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755132
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 63
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0b_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0b_0_stateDiff.json
new file mode 100644
index 00000000000..de904bb16fd
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0b_0_stateDiff.json
@@ -0,0 +1,56 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep. Using DELEGATECALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 11
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386112d2a"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aaec8f"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 11
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0b_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0b_0_trace.json
new file mode 100644
index 00000000000..7f03070d866
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0b_0_trace.json
@@ -0,0 +1,60 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep. Using DELEGATECALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 11
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffacc6",
+          "input" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0060000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x308",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "delegatecall",
+          "from" : "0x0060000000000000000000000000000000000000",
+          "gas" : "0xfbab38",
+          "input" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0030000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x1b",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 11
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0b_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0b_0_vmTrace.json
new file mode 100644
index 00000000000..92039a7c639
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0b_0_vmTrace.json
@@ -0,0 +1,303 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep. Using DELEGATECALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 64
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x602060006020360380602060003760006000355af460206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755907
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755904
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755901
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16755899
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755896
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x20" ],
+            "store" : null,
+            "used" : 16755893
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755890
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755887
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755878
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755875
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755872
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x30000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755869
+          },
+          "pc" : 18,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffac9b" ],
+            "store" : null,
+            "used" : 16755867
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 16494068,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755140
+          },
+          "pc" : 20,
+          "sub" : {
+            "code" : "0x60003560010160005260206000f3",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493365
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000001" ],
+                "store" : null,
+                "used" : 16493362
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16493359
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000002" ],
+                "store" : null,
+                "used" : 16493356
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493353
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 6,
+              "ex" : {
+                "mem" : {
+                  "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+                  "off" : 0
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16493347
+              },
+              "pc" : 8,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16493344
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493341
+              },
+              "pc" : 11,
+              "sub" : null
+            }, {
+              "cost" : 0,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16493341
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755137
+          },
+          "pc" : 21,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755134
+          },
+          "pc" : 23,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755134
+          },
+          "pc" : 25,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 64
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0c_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0c_0_stateDiff.json
new file mode 100644
index 00000000000..9478082fa01
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0c_0_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "Sequential memory modifications with MSTORE8.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0070000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 12
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860d6418"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aeb5a1"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 12
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0c_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0c_0_trace.json
new file mode 100644
index 00000000000..692598d5328
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0c_0_trace.json
@@ -0,0 +1,43 @@
+{
+  "comment" : "Sequential memory modifications with MSTORE8.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0070000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 12
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0070000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x1e",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 12
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0c_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0c_0_vmTrace.json
new file mode 100644
index 00000000000..63c526557b7
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0c_0_vmTrace.json
@@ -0,0 +1,129 @@
+{
+  "comment" : "Sequential memory modifications with MSTORE8.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0070000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 65
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x600160025360036004536001600553",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x01",
+              "off" : 2
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16756184
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x03",
+              "off" : 4
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756181
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756178
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16756175
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x01",
+              "off" : 5
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756172
+          },
+          "pc" : 14,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 65
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0d_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0d_0_stateDiff.json
new file mode 100644
index 00000000000..cd22c7f618b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0d_0_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "Sequential memory modifications with MSTORE.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0080000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 13
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860d5617"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aec3a2"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 13
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0d_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0d_0_trace.json
new file mode 100644
index 00000000000..c61215e1b2b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0d_0_trace.json
@@ -0,0 +1,43 @@
+{
+  "comment" : "Sequential memory modifications with MSTORE.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0080000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 13
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0080000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0xf",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 13
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0d_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0d_0_vmTrace.json
new file mode 100644
index 00000000000..416265ca3b6
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0d_0_vmTrace.json
@@ -0,0 +1,63 @@
+{
+  "comment" : "Sequential memory modifications with MSTORE.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0080000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 66
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000152",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 1
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 66,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 66
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_0_stateDiff.json
new file mode 100644
index 00000000000..32238466f5d
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_0_stateDiff.json
@@ -0,0 +1,68 @@
+{
+  "comment" : "Increments contract storage 0 by 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0090000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 14
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x04",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386228af0"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0090000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000000" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000003",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000004"
+              }
+            }
+          }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27998ec9"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 14
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_0_trace.json
new file mode 100644
index 00000000000..dcec20cb9a1
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_0_trace.json
@@ -0,0 +1,43 @@
+{
+  "comment" : "Increments contract storage 0 by 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0090000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 14
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x04",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0090000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x16c6",
+          "output" : "0x04"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 14
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_0_vmTrace.json
new file mode 100644
index 00000000000..963205ab075
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_0_vmTrace.json
@@ -0,0 +1,156 @@
+{
+  "comment" : "Increments contract storage 0 by 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0090000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 67
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x04",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6000546001018060005360005560016000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16755399
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755396
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16755393
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4", "0x4" ],
+            "store" : null,
+            "used" : 16755390
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755387
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x04",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755381
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755378
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x0",
+              "val" : "0x4"
+            },
+            "used" : 16750378
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16750375
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16750372
+          },
+          "pc" : 15,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16750372
+          },
+          "pc" : 17,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 67
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_1_stateDiff.json
new file mode 100644
index 00000000000..7f7d1f6598b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_1_stateDiff.json
@@ -0,0 +1,68 @@
+{
+  "comment" : "Increments contract storage 0 by 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0090000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 15
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x04",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386228af0"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0090000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000000" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000003",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000004"
+              }
+            }
+          }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27998ec9"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 15
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_1_trace.json
new file mode 100644
index 00000000000..113661e4dd4
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_1_trace.json
@@ -0,0 +1,43 @@
+{
+  "comment" : "Increments contract storage 0 by 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0090000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 15
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x04",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0090000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x16c6",
+          "output" : "0x04"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 15
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_1_vmTrace.json
new file mode 100644
index 00000000000..80e81ec8c35
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_1_vmTrace.json
@@ -0,0 +1,156 @@
+{
+  "comment" : "Increments contract storage 0 by 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0090000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 68
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x04",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6000546001018060005360005560016000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16755399
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755396
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16755393
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4", "0x4" ],
+            "store" : null,
+            "used" : 16755390
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755387
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x04",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755381
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755378
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x0",
+              "val" : "0x4"
+            },
+            "used" : 16750378
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16750375
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16750372
+          },
+          "pc" : 15,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16750372
+          },
+          "pc" : 17,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 68
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_2_stateDiff.json
new file mode 100644
index 00000000000..55aed682cd0
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_2_stateDiff.json
@@ -0,0 +1,68 @@
+{
+  "comment" : "Increments contract storage 0 by 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0090000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 16
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x04",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386228af0"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0090000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000000" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000003",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000004"
+              }
+            }
+          }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27998ec9"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 16
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_2_trace.json
new file mode 100644
index 00000000000..efd93be5ccb
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_2_trace.json
@@ -0,0 +1,43 @@
+{
+  "comment" : "Increments contract storage 0 by 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0090000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 16
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x04",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0090000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x16c6",
+          "output" : "0x04"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 16
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_2_vmTrace.json
new file mode 100644
index 00000000000..e49f4e2a2a7
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0e_2_vmTrace.json
@@ -0,0 +1,156 @@
+{
+  "comment" : "Increments contract storage 0 by 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0090000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 69
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x04",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6000546001018060005360005560016000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16755399
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755396
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16755393
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4", "0x4" ],
+            "store" : null,
+            "used" : 16755390
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755387
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x04",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755381
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755378
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x0",
+              "val" : "0x4"
+            },
+            "used" : 16750378
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16750375
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16750372
+          },
+          "pc" : 15,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16750372
+          },
+          "pc" : 17,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 69
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_0_stateDiff.json
new file mode 100644
index 00000000000..f3e6337251d
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_0_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "Log output with LOG1.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x00A0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 17
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386101f5b"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27abfa5e"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 17
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_0_trace.json
new file mode 100644
index 00000000000..f5d268bcb5a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_0_trace.json
@@ -0,0 +1,43 @@
+{
+  "comment" : "Log output with LOG1.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x00A0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 17
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x00a0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x30b",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 17
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_0_vmTrace.json
new file mode 100644
index 00000000000..c7965af5402
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_0_vmTrace.json
@@ -0,0 +1,103 @@
+{
+  "comment" : "Log output with LOG1.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x00A0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 70
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x608b60045360ff60016004a1",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x8b" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x8b",
+              "off" : 4
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756184
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16756181
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 758,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755423
+          },
+          "pc" : 11,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 70
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_1_stateDiff.json
new file mode 100644
index 00000000000..62710b5165f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_1_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "Log output with LOG2.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x00B0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 18
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386118041"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aa9978"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 18
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_1_trace.json
new file mode 100644
index 00000000000..37d84a21d78
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_1_trace.json
@@ -0,0 +1,43 @@
+{
+  "comment" : "Log output with LOG2.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x00B0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 18
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x00b0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x485",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 18
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_1_vmTrace.json
new file mode 100644
index 00000000000..93ae7359886
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_0f_1_vmTrace.json
@@ -0,0 +1,113 @@
+{
+  "comment" : "Log output with LOG2.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x00B0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 71
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x608b60045360aa60ff60016004a2",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x8b" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x8b",
+              "off" : 4
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xaa" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16756184
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756181
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16756178
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 1133,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755045
+          },
+          "pc" : 13,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 71
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_0_stateDiff.json
new file mode 100644
index 00000000000..a452e435710
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_0_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "Various exceptional halt cases. Invalid OPCODE (0x1F).",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x00C0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 19
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18474c0a58c"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffc38fb742d"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 19
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_0_trace.json
new file mode 100644
index 00000000000..8c60b46f7e4
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_0_trace.json
@@ -0,0 +1,40 @@
+{
+  "comment" : "Various exceptional halt cases. Invalid OPCODE (0x1F).",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x00C0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 19
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x00c0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "error" : "Bad instruction",
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 19
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_0_vmTrace.json
new file mode 100644
index 00000000000..d78e9136cf1
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_0_vmTrace.json
@@ -0,0 +1,40 @@
+{
+  "comment" : "Various exceptional halt cases. Invalid OPCODE (0x1F).",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x00C0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 72
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60011f",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 72
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_1_stateDiff.json
new file mode 100644
index 00000000000..7cc47b9c1c5
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_1_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "Various exceptional halt cases. INSUFFICIENT_STACK_ITEMS.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x00D0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 20
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18474c0a58c"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffc38fb742d"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 20
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_1_trace.json
new file mode 100644
index 00000000000..a51d6fa0dd2
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_1_trace.json
@@ -0,0 +1,40 @@
+{
+  "comment" : "Various exceptional halt cases. INSUFFICIENT_STACK_ITEMS.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x00D0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 20
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x00d0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "error" : "Stack underflow",
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 20
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_1_vmTrace.json
new file mode 100644
index 00000000000..423337852f8
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_1_vmTrace.json
@@ -0,0 +1,40 @@
+{
+  "comment" : "Various exceptional halt cases. INSUFFICIENT_STACK_ITEMS.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x00D0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 73
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x600120",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 73
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_2_stateDiff.json
new file mode 100644
index 00000000000..a54bc17b6be
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_2_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "Various exceptional halt cases. INVALID_JUMP_DESTINATION.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x00E0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 21
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18474c0a58c"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffc38fb742d"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 21
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_2_trace.json
new file mode 100644
index 00000000000..4e5fef4afee
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_2_trace.json
@@ -0,0 +1,40 @@
+{
+  "comment" : "Various exceptional halt cases. INVALID_JUMP_DESTINATION.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x00E0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 21
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x00e0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "error" : "Bad jump destination",
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 21
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_2_vmTrace.json
new file mode 100644
index 00000000000..c130f54f665
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_10_2_vmTrace.json
@@ -0,0 +1,50 @@
+{
+  "comment" : "Various exceptional halt cases. INVALID_JUMP_DESTINATION.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x00E0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 74
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60ff5660016002",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756191
+          },
+          "pc" : 2,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 74
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_11_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_11_0_stateDiff.json
new file mode 100644
index 00000000000..7f3c6cdf3f2
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_11_0_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "Pushes 1, 2, 3, then SWAP2 and SWAP1.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x00F0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 22
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860d5617"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aec3a2"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 22
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_11_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_11_0_trace.json
new file mode 100644
index 00000000000..333e251aa66
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_11_0_trace.json
@@ -0,0 +1,43 @@
+{
+  "comment" : "Pushes 1, 2, 3, then SWAP2 and SWAP1.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x00F0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 22
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x00f0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0xf",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 22
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_11_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_11_0_vmTrace.json
new file mode 100644
index 00000000000..90aaa45f7a5
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_11_0_vmTrace.json
@@ -0,0 +1,80 @@
+{
+  "comment" : "Pushes 1, 2, 3, then SWAP2 and SWAP1.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x00F0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 75
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6001600260039190",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16756193
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0x2", "0x1" ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x2" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 7,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 75
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_0_stateDiff.json
new file mode 100644
index 00000000000..6adb95b227b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_0_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "Memory Read.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0100000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 23
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860d6418"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aeb5a1"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 23
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_0_trace.json
new file mode 100644
index 00000000000..26a2fa528f7
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_0_trace.json
@@ -0,0 +1,43 @@
+{
+  "comment" : "Memory Read.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0100000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 23
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0100000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x1e",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 23
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_0_vmTrace.json
new file mode 100644
index 00000000000..84acbe143cf
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_0_vmTrace.json
@@ -0,0 +1,119 @@
+{
+  "comment" : "Memory Read.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0100000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 76
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x7f3940be4289e4c3587d88c1856cc95352461992db0a584c281226faefe560b3016000527f14c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e2272dbf884ef3905601052600851",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3940be4289e4c3587d88c1856cc95352461992db0a584c281226faefe560b301" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x3940be4289e4c3587d88c1856cc95352461992db0a584c281226faefe560b301",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e2272dbf884ef3905" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 36,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10" ],
+            "store" : null,
+            "used" : 16756184
+          },
+          "pc" : 69,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x14c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e2272dbf884ef3905",
+              "off" : 16
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756178
+          },
+          "pc" : 71,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x8" ],
+            "store" : null,
+            "used" : 16756175
+          },
+          "pc" : 72,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x7d88c1856cc9535214c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e",
+              "off" : 8
+            },
+            "push" : [ "0x7d88c1856cc9535214c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e" ],
+            "store" : null,
+            "used" : 16756172
+          },
+          "pc" : 74,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 76
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_1_stateDiff.json
new file mode 100644
index 00000000000..810ab6a645a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_1_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "Revert.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0110000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 24
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x7d88c1856cc95352",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860d6418"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aeb5a1"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 24
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_1_trace.json
new file mode 100644
index 00000000000..af59f0bd4ae
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_1_trace.json
@@ -0,0 +1,41 @@
+{
+  "comment" : "Revert. Note revertReason has been manually added to the response because OpenEthereum does not include it.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0110000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 24
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x7d88c1856cc95352",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0110000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "error" : "Reverted",
+        "revertReason" : "0x7d88c1856cc95352",
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 24
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_1_vmTrace.json
new file mode 100644
index 00000000000..d70f16ec91f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_12_1_vmTrace.json
@@ -0,0 +1,126 @@
+{
+  "comment" : "Revert.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0110000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 77
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x7d88c1856cc95352",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x7f3940be4289e4c3587d88c1856cc95352461992db0a584c281226faefe560b3016000527f14c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e2272dbf884ef390560105260086008fd",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3940be4289e4c3587d88c1856cc95352461992db0a584c281226faefe560b301" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x3940be4289e4c3587d88c1856cc95352461992db0a584c281226faefe560b301",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e2272dbf884ef3905" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 36,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10" ],
+            "store" : null,
+            "used" : 16756184
+          },
+          "pc" : 69,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x14c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e2272dbf884ef3905",
+              "off" : 16
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756178
+          },
+          "pc" : 71,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x8" ],
+            "store" : null,
+            "used" : 16756175
+          },
+          "pc" : 72,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x8" ],
+            "store" : null,
+            "used" : 16756172
+          },
+          "pc" : 74,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756172
+          },
+          "pc" : 76,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 77
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_0_stateDiff.json
new file mode 100644
index 00000000000..ea459e7dc6c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_0_stateDiff.json
@@ -0,0 +1,67 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x6004600C60003960046000F3600035FF",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 25
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f1838685c9c2"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241" : {
+          "balance" : {
+            "+" : "0x0"
+          },
+          "code" : {
+            "+" : "0x600035ff"
+          },
+          "nonce" : {
+            "+" : "0x1"
+          },
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d07946cf17"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 25
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_0_trace.json
new file mode 100644
index 00000000000..612a44399f3
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_0_trace.json
@@ -0,0 +1,42 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x6004600C60003960046000F3600035FF",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 25
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff300e",
+          "init" : "0x6004600c60003960046000f3600035ff",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "code" : "0x600035ff",
+          "gasUsed" : "0x338"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 25
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_0_vmTrace.json
new file mode 100644
index 00000000000..826dc9a58ce
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_0_vmTrace.json
@@ -0,0 +1,103 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x6004600C60003960046000F3600035FF",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 78
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6004600c60003960046000f3600035ff",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723979
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc" ],
+            "store" : null,
+            "used" : 16723976
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723973
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0x600035ff",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723964
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723961
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 11,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 78
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_1_stateDiff.json
new file mode 100644
index 00000000000..2a4561009c6
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_1_stateDiff.json
@@ -0,0 +1,67 @@
+{
+  "comment" : "call the prior contract then call log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x60006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5AF1600060006000600060007300A00000000000000000000000000000000000005AF1",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 26
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183868ca7b7"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241" : {
+          "balance" : {
+            "+" : "0x0"
+          },
+          "code" : {
+            "+" : "0x"
+          },
+          "nonce" : {
+            "+" : "0x1"
+          },
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d0793ff122"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 26
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_1_trace.json
new file mode 100644
index 00000000000..0ba1ec1b79b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_1_trace.json
@@ -0,0 +1,74 @@
+{
+  "comment" : "call the prior contract then call log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x60006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5AF1600060006000600060007300A00000000000000000000000000000000000005AF1",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 26
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff2e26",
+          "init" : "0x60006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5af1600060006000600060007300a00000000000000000000000000000000000005af1",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "code" : "0x",
+          "gasUsed" : "0x8ab"
+        },
+        "subtraces" : 2,
+        "traceAddress" : [ ],
+        "type" : "create"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "gas" : "0xfb2ea9",
+          "input" : "0x",
+          "to" : "0x8f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x0",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "gas" : "0xfb2be4",
+          "input" : "0x",
+          "to" : "0x00a0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x30b",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 1 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 26
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_1_vmTrace.json
new file mode 100644
index 00000000000..eaeea1e1480
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_1_vmTrace.json
@@ -0,0 +1,269 @@
+{
+  "comment" : "call the prior contract then call log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x60006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5AF1600060006000600060007300A00000000000000000000000000000000000005AF1",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 79
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5af1600060006000600060007300a00000000000000000000000000000000000005af1",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723491
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723488
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723485
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723482
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723479
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x8f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f" ],
+            "store" : null,
+            "used" : 16723476
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff2e12" ],
+            "store" : null,
+            "used" : 16723474
+          },
+          "pc" : 31,
+          "sub" : null
+        }, {
+          "cost" : 16462181,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16722774
+          },
+          "pc" : 32,
+          "sub" : {
+            "code" : "0x",
+            "ops" : [ ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16722771
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16722768
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16722765
+          },
+          "pc" : 37,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16722762
+          },
+          "pc" : 39,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16722759
+          },
+          "pc" : 41,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16722756
+          },
+          "pc" : 43,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff2b42" ],
+            "store" : null,
+            "used" : 16722754
+          },
+          "pc" : 64,
+          "sub" : null
+        }, {
+          "cost" : 16461472,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16721275
+          },
+          "pc" : 65,
+          "sub" : {
+            "code" : "0x608b60045360ff60016004a1",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x8b" ],
+                "store" : null,
+                "used" : 16460769
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16460766
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 6,
+              "ex" : {
+                "mem" : {
+                  "data" : "0x8b",
+                  "off" : 4
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16460760
+              },
+              "pc" : 4,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xff" ],
+                "store" : null,
+                "used" : 16460757
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16460754
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16460751
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 758,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16459993
+              },
+              "pc" : 11,
+              "sub" : null
+            } ]
+          }
+        } ]
+      }
+    },
+    "id" : 79
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_2_stateDiff.json
new file mode 100644
index 00000000000..e07a0692f05
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_2_stateDiff.json
@@ -0,0 +1,67 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x6004600C60003960046000F3600035FF",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 27
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f1838685c9c2"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241" : {
+          "balance" : {
+            "+" : "0x0"
+          },
+          "code" : {
+            "+" : "0x600035ff"
+          },
+          "nonce" : {
+            "+" : "0x1"
+          },
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d07946cf17"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 27
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_2_trace.json
new file mode 100644
index 00000000000..5dfd1a562fe
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_2_trace.json
@@ -0,0 +1,42 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x6004600C60003960046000F3600035FF",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 27
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff300e",
+          "init" : "0x6004600c60003960046000f3600035ff",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "code" : "0x600035ff",
+          "gasUsed" : "0x338"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 27
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_2_vmTrace.json
new file mode 100644
index 00000000000..cc5cbb9bdf6
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_2_vmTrace.json
@@ -0,0 +1,103 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x6004600C60003960046000F3600035FF",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 80
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6004600c60003960046000f3600035ff",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723979
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc" ],
+            "store" : null,
+            "used" : 16723976
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723973
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0x600035ff",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723964
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723961
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 11,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 80
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_3_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_3_stateDiff.json
new file mode 100644
index 00000000000..c549380c36d
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_3_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "call the prior contract then callcode log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x60006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45AF2600060006000600060007300A00000000000000000000000000000000000005AF2",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 28
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386476309"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d0798535d0"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 28
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_3_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_3_trace.json
new file mode 100644
index 00000000000..b9672c598c6
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_3_trace.json
@@ -0,0 +1,84 @@
+{
+  "comment" : "call the prior contract then callcode log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x60006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45AF2600060006000600060007300A00000000000000000000000000000000000005AF2",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 28
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff2e26",
+          "init" : "0x60006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45af2600060006000600060007300a00000000000000000000000000000000000005af2",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "code" : "0x",
+          "gasUsed" : "0x1c39"
+        },
+        "subtraces" : 2,
+        "traceAddress" : [ ],
+        "type" : "create"
+      }, {
+        "action" : {
+          "callType" : "callcode",
+          "from" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "gas" : "0xfb2ea9",
+          "input" : "0x",
+          "to" : "0x2c2b9c9a4a25e24b174f26114e8926a9f2128fe4",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x138e",
+          "output" : "0x"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "balance" : "0x0",
+          "refundAddress" : "0x0000000000000000000000000000000000000000"
+        },
+        "result" : null,
+        "subtraces" : 0,
+        "traceAddress" : [ 0, 0 ],
+        "type" : "suicide"
+      }, {
+        "action" : {
+          "callType" : "callcode",
+          "from" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "gas" : "0xfb18a5",
+          "input" : "0x",
+          "to" : "0x00a0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x30b",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 1 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 28
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_3_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_3_vmTrace.json
new file mode 100644
index 00000000000..c152ac74e55
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_3_vmTrace.json
@@ -0,0 +1,299 @@
+{
+  "comment" : "call the prior contract then callcode log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x60006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45AF2600060006000600060007300A00000000000000000000000000000000000005AF2",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 81
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45af2600060006000600060007300a00000000000000000000000000000000000005af2",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723491
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723488
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723485
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723482
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723479
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2c2b9c9a4a25e24b174f26114e8926a9f2128fe4" ],
+            "store" : null,
+            "used" : 16723476
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff2e12" ],
+            "store" : null,
+            "used" : 16723474
+          },
+          "pc" : 31,
+          "sub" : null
+        }, {
+          "cost" : 16462181,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16717768
+          },
+          "pc" : 32,
+          "sub" : {
+            "code" : "0x600035ff",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16461478
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16461475
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 5000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16456475
+              },
+              "pc" : 3,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717765
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717762
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717759
+          },
+          "pc" : 37,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717756
+          },
+          "pc" : 39,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717753
+          },
+          "pc" : 41,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16717750
+          },
+          "pc" : 43,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff17b4" ],
+            "store" : null,
+            "used" : 16717748
+          },
+          "pc" : 64,
+          "sub" : null
+        }, {
+          "cost" : 16456545,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16716269
+          },
+          "pc" : 65,
+          "sub" : {
+            "code" : "0x608b60045360ff60016004a1",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x8b" ],
+                "store" : null,
+                "used" : 16455842
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16455839
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 6,
+              "ex" : {
+                "mem" : {
+                  "data" : "0x8b",
+                  "off" : 4
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16455833
+              },
+              "pc" : 4,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xff" ],
+                "store" : null,
+                "used" : 16455830
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16455827
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16455824
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 758,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16455066
+              },
+              "pc" : 11,
+              "sub" : null
+            } ]
+          }
+        } ]
+      }
+    },
+    "id" : 81
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_4_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_4_stateDiff.json
new file mode 100644
index 00000000000..1d5b9428811
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_4_stateDiff.json
@@ -0,0 +1,67 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x6004600C60003960046000F3600035FF",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 29
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f1838685c9c2"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241" : {
+          "balance" : {
+            "+" : "0x0"
+          },
+          "code" : {
+            "+" : "0x600035ff"
+          },
+          "nonce" : {
+            "+" : "0x1"
+          },
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d07946cf17"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 29
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_4_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_4_trace.json
new file mode 100644
index 00000000000..4286e5ac15d
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_4_trace.json
@@ -0,0 +1,42 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x6004600C60003960046000F3600035FF",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 29
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff300e",
+          "init" : "0x6004600c60003960046000f3600035ff",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "code" : "0x600035ff",
+          "gasUsed" : "0x338"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 29
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_4_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_4_vmTrace.json
new file mode 100644
index 00000000000..f7820b133b3
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_4_vmTrace.json
@@ -0,0 +1,103 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x6004600C60003960046000F3600035FF",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 82
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6004600c60003960046000f3600035ff",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723979
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc" ],
+            "store" : null,
+            "used" : 16723976
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723973
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0x600035ff",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723964
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723961
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 11,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 82
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_5_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_5_stateDiff.json
new file mode 100644
index 00000000000..52c54477ab2
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_5_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "call the prior contract then delegatecall log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65AF460006000600060007300A00000000000000000000000000000000000005AF4",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 30
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386473817"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d0798560c2"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 30
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_5_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_5_trace.json
new file mode 100644
index 00000000000..20fb4f89b0f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_5_trace.json
@@ -0,0 +1,84 @@
+{
+  "comment" : "call the prior contract then delegatecall log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65AF460006000600060007300A00000000000000000000000000000000000005AF4",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 30
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff2e4e",
+          "init" : "0x600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65af460006000600060007300a00000000000000000000000000000000000005af4",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "code" : "0x",
+          "gasUsed" : "0x1c33"
+        },
+        "subtraces" : 2,
+        "traceAddress" : [ ],
+        "type" : "create"
+      }, {
+        "action" : {
+          "callType" : "delegatecall",
+          "from" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "gas" : "0xfb2ed3",
+          "input" : "0x",
+          "to" : "0xfb88de099e13c3ed21f80a7a1e49f8caecf10df6",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x138e",
+          "output" : "0x"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "balance" : "0x0",
+          "refundAddress" : "0x0000000000000000000000000000000000000000"
+        },
+        "result" : null,
+        "subtraces" : 0,
+        "traceAddress" : [ 0, 0 ],
+        "type" : "suicide"
+      }, {
+        "action" : {
+          "callType" : "delegatecall",
+          "from" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "gas" : "0xfb18d2",
+          "input" : "0x",
+          "to" : "0x00a0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x30b",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 1 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 30
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_5_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_5_vmTrace.json
new file mode 100644
index 00000000000..5035f2665fb
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_13_5_vmTrace.json
@@ -0,0 +1,279 @@
+{
+  "comment" : "call the prior contract then delegatecall log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65AF460006000600060007300A00000000000000000000000000000000000005AF4",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 83
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65af460006000600060007300a00000000000000000000000000000000000005af4",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723531
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723528
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723525
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723522
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xfb88de099e13c3ed21f80a7a1e49f8caecf10df6" ],
+            "store" : null,
+            "used" : 16723519
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff2e3d" ],
+            "store" : null,
+            "used" : 16723517
+          },
+          "pc" : 29,
+          "sub" : null
+        }, {
+          "cost" : 16462223,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16717811
+          },
+          "pc" : 30,
+          "sub" : {
+            "code" : "0x600035ff",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16461520
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16461517
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 5000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16456517
+              },
+              "pc" : 3,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717808
+          },
+          "pc" : 31,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717805
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717802
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717799
+          },
+          "pc" : 37,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16717796
+          },
+          "pc" : 39,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff17e2" ],
+            "store" : null,
+            "used" : 16717794
+          },
+          "pc" : 60,
+          "sub" : null
+        }, {
+          "cost" : 16456590,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16716315
+          },
+          "pc" : 61,
+          "sub" : {
+            "code" : "0x608b60045360ff60016004a1",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x8b" ],
+                "store" : null,
+                "used" : 16455887
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16455884
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 6,
+              "ex" : {
+                "mem" : {
+                  "data" : "0x8b",
+                  "off" : 4
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16455878
+              },
+              "pc" : 4,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xff" ],
+                "store" : null,
+                "used" : 16455875
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16455872
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16455869
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 758,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16455111
+              },
+              "pc" : 11,
+              "sub" : null
+            } ]
+          }
+        } ]
+      }
+    },
+    "id" : 83
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_0_stateDiff.json
new file mode 100644
index 00000000000..49a758cad8f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_0_stateDiff.json
@@ -0,0 +1,92 @@
+{
+  "comment" : "CREATE",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0130000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 31
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183872aa988"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0130000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1",
+              "to" : "0x2"
+            }
+          },
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000000" : {
+              "*" : {
+                "from" : "0x000000000000000000000000aac0627078c038eb3d06e04b57d020fe212be97d",
+                "to" : "0x0000000000000000000000002e615edd62acdfeb8ce3270b30fb36f0dbb8779d"
+              }
+            }
+          }
+        },
+        "0x2e615edd62acdfeb8ce3270b30fb36f0dbb8779d" : {
+          "balance" : {
+            "+" : "0x0"
+          },
+          "code" : {
+            "+" : "0xffff"
+          },
+          "nonce" : {
+            "+" : "0x1"
+          },
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "+" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "+" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+            }
+          }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd26917031"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 31
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_0_trace.json
new file mode 100644
index 00000000000..d70418c23bc
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_0_trace.json
@@ -0,0 +1,58 @@
+{
+  "comment" : "CREATE",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0130000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 31
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0130000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x131ae",
+          "output" : "0x"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "from" : "0x0130000000000000000000000000000000000000",
+          "gas" : "0xfb3412",
+          "init" : "0x600160015560015460025561ffff6000526002601ef3",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x2e615edd62acdfeb8ce3270b30fb36f0dbb8779d",
+          "code" : "0xffff",
+          "gasUsed" : "0xa10e"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 31
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_0_vmTrace.json
new file mode 100644
index 00000000000..d7ca2dccac5
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_0_vmTrace.json
@@ -0,0 +1,278 @@
+{
+  "comment" : "CREATE",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0130000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 84
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x75600160015560015460025561ffff6000526002601ef36000526016600a6000f060005500",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x600160015560015460025561ffff6000526002601ef3" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 23,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x00000000000000000000600160015560015460025561ffff6000526002601ef3",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 25,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x16" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 26,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa" ],
+            "store" : null,
+            "used" : 16756184
+          },
+          "pc" : 28,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756181
+          },
+          "pc" : 30,
+          "sub" : null
+        }, {
+          "cost" : 16494866,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2e615edd62acdfeb8ce3270b30fb36f0dbb8779d" ],
+            "store" : null,
+            "used" : 16682951
+          },
+          "pc" : 32,
+          "sub" : {
+            "code" : "0x600160015560015460025561ffff6000526002601ef3",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16462863
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16462860
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x1"
+                },
+                "used" : 16442860
+              },
+              "pc" : 4,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16442857
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 800,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16442057
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16442054
+              },
+              "pc" : 8,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x2",
+                  "val" : "0x1"
+                },
+                "used" : 16422054
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xffff" ],
+                "store" : null,
+                "used" : 16422051
+              },
+              "pc" : 11,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16422048
+              },
+              "pc" : 14,
+              "sub" : null
+            }, {
+              "cost" : 6,
+              "ex" : {
+                "mem" : {
+                  "data" : "0x000000000000000000000000000000000000000000000000000000000000ffff",
+                  "off" : 0
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16422042
+              },
+              "pc" : 16,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16422039
+              },
+              "pc" : 17,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1e" ],
+                "store" : null,
+                "used" : 16422036
+              },
+              "pc" : 19,
+              "sub" : null
+            }, {
+              "cost" : 0,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16422036
+              },
+              "pc" : 21,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16682948
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x0",
+              "val" : "0x2e615edd62acdfeb8ce3270b30fb36f0dbb8779d"
+            },
+            "used" : 16677948
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16677948
+          },
+          "pc" : 36,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 84
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_1_stateDiff.json
new file mode 100644
index 00000000000..f27ed09f002
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_1_stateDiff.json
@@ -0,0 +1,73 @@
+{
+  "comment" : "CREATE2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0140000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 32
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18470e3365c"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0140000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1",
+              "to" : "0x2"
+            }
+          },
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000000" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000deea5bd06fb86553643c1e94a2f5aac632b9ec9",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000000"
+              }
+            }
+          }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffc3cd8e35d"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 32
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_1_trace.json
new file mode 100644
index 00000000000..ca583b57783
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_1_trace.json
@@ -0,0 +1,54 @@
+{
+  "comment" : "CREATE2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0140000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 32
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0140000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0xfbc4b2",
+          "output" : "0x"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "from" : "0x0140000000000000000000000000000000000000",
+          "gas" : "0xfb3409",
+          "init" : "0x600160015560015460025560ff60005360016000f3",
+          "value" : "0x0"
+        },
+        "error" : "Out of gas",
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 32
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_1_vmTrace.json
new file mode 100644
index 00000000000..ca8059e7894
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_14_1_vmTrace.json
@@ -0,0 +1,149 @@
+{
+  "comment" : "CREATE2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0140000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 85
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x74600160015560015460025560ff60005360016000f360005260006015600b6000f560005500",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x600160015560015460025560ff60005360016000f3" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000600160015560015460025560ff60005360016000f3",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 25,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x15" ],
+            "store" : null,
+            "used" : 16756184
+          },
+          "pc" : 27,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb" ],
+            "store" : null,
+            "used" : 16756181
+          },
+          "pc" : 29,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756178
+          },
+          "pc" : 31,
+          "sub" : null
+        }, {
+          "cost" : 16494863,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 261315
+          },
+          "pc" : 33,
+          "sub" : {
+            "code" : "0x600160015560015460025560ff60005360016000f3",
+            "ops" : [ ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 261312
+          },
+          "pc" : 34,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x0",
+              "val" : "0x0"
+            },
+            "used" : 256312
+          },
+          "pc" : 36,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 256312
+          },
+          "pc" : 37,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 85
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_0_stateDiff.json
new file mode 100644
index 00000000000..a500bfb1e56
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_0_stateDiff.json
@@ -0,0 +1,75 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,1),(2,2)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 33
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386a499b1"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0010000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+              }
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000002"
+              }
+            }
+          }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d07927ff28"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 33
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_0_trace.json
new file mode 100644
index 00000000000..e10cb9e35cf
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_0_trace.json
@@ -0,0 +1,60 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,1),(2,2)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 33
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab2e",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9f59",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfba993",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9c58",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 33
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_0_vmTrace.json
new file mode 100644
index 00000000000..28966543423
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_0_vmTrace.json
@@ -0,0 +1,326 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,1),(2,2)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 86
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755499
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755496
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755493
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755491
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755488
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755485
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755482
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755479
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755452
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755449
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755447
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755444
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755441
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffaaef" ],
+            "store" : null,
+            "used" : 16755439
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16493647,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16714715
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492944
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492941
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492938
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492935
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x1"
+                },
+                "used" : 16472935
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16472932
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16472929
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16472926
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16472923
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x2",
+                  "val" : "0x2"
+                },
+                "used" : 16452923
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16714712
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16714709
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16714709
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 86
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_1_stateDiff.json
new file mode 100644
index 00000000000..6f27ad29a17
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_1_stateDiff.json
@@ -0,0 +1,75 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(2,4)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 34
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386a499b1"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0010000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000003"
+              }
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000004"
+              }
+            }
+          }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d07927ff28"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 34
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_1_trace.json
new file mode 100644
index 00000000000..48a609bbd61
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_1_trace.json
@@ -0,0 +1,60 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(2,4)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 34
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab2e",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9f59",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfba993",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9c58",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 34
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_1_vmTrace.json
new file mode 100644
index 00000000000..0c81fb7f242
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_1_vmTrace.json
@@ -0,0 +1,326 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(2,4)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 87
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755499
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755496
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755493
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755491
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755488
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755485
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755482
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755479
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755452
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755449
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755447
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755444
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755441
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffaaef" ],
+            "store" : null,
+            "used" : 16755439
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16493647,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16714715
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492944
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x3" ],
+                "store" : null,
+                "used" : 16492941
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492938
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492935
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x3"
+                },
+                "used" : 16472935
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16472932
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16472929
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16472926
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16472923
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x2",
+                  "val" : "0x4"
+                },
+                "used" : 16452923
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16714712
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16714709
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16714709
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 87
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_2_stateDiff.json
new file mode 100644
index 00000000000..9e976bccfda
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_2_stateDiff.json
@@ -0,0 +1,56 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(1,0)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 35
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f1838618847d"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d079b4145c"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 35
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_2_trace.json
new file mode 100644
index 00000000000..d41ab126f3e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_2_trace.json
@@ -0,0 +1,60 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(1,0)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 35
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab3a",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x5459",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfba99f",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x5158",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 35
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_2_vmTrace.json
new file mode 100644
index 00000000000..b447dfda74c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_2_vmTrace.json
@@ -0,0 +1,326 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(1,0)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 88
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755511
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755508
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755505
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755503
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755500
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755497
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755494
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755491
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755464
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755461
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755459
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755456
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755453
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffaafb" ],
+            "store" : null,
+            "used" : 16755451
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16493659,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16733927
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492956
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x3" ],
+                "store" : null,
+                "used" : 16492953
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492950
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492947
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x3"
+                },
+                "used" : 16472947
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16472944
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16472941
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16472938
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16472935
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 800,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x0"
+                },
+                "used" : 16472135
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16733924
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16733921
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16733921
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 88
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_3_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_3_stateDiff.json
new file mode 100644
index 00000000000..1beef0f8f03
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_3_stateDiff.json
@@ -0,0 +1,56 @@
+{
+  "comment" : "Clear contract storage keys 1 and 2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 36
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386187949"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d079b41f90"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 36
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_3_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_3_trace.json
new file mode 100644
index 00000000000..aac0f50f1a3
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_3_trace.json
@@ -0,0 +1,60 @@
+{
+  "comment" : "Clear contract storage keys 1 and 2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 36
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab46",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x959",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfba9aa",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x658",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 36
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_3_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_3_vmTrace.json
new file mode 100644
index 00000000000..20487f970a5
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_15_3_vmTrace.json
@@ -0,0 +1,326 @@
+{
+  "comment" : "Clear contract storage keys 1 and 2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 89
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755523
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755520
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755517
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755515
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755512
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755509
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755506
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755503
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755476
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755473
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755471
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755468
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755465
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffab07" ],
+            "store" : null,
+            "used" : 16755463
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16493670,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16753139
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492967
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492964
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492961
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492958
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 800,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x0"
+                },
+                "used" : 16492158
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16492155
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492152
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16492149
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16492146
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 800,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x2",
+                  "val" : "0x0"
+                },
+                "used" : 16491346
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16753136
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16753133
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16753133
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 89
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_0_stateDiff.json
new file mode 100644
index 00000000000..cec25b02824
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_0_stateDiff.json
@@ -0,0 +1,75 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,1),(2,2)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 37
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386a497d3"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0060000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+              }
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000002"
+              }
+            }
+          }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d079280106"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 37
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_0_trace.json
new file mode 100644
index 00000000000..1905d6ba9b5
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_0_trace.json
@@ -0,0 +1,60 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,1),(2,2)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 37
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab2e",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to" : "0x0060000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9f57",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "delegatecall",
+          "from" : "0x0060000000000000000000000000000000000000",
+          "gas" : "0xfba995",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9c58",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 37
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_0_vmTrace.json
new file mode 100644
index 00000000000..802379206a7
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_0_vmTrace.json
@@ -0,0 +1,316 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,1),(2,2)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 90
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x602060006020360380602060003760006000355af460206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755499
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755496
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755493
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755491
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755488
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755485
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755482
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755479
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755452
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755449
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755446
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755443
+          },
+          "pc" : 18,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffaaf1" ],
+            "store" : null,
+            "used" : 16755441
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 16493649,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16714717
+          },
+          "pc" : 20,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492946
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492943
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492940
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492937
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x1"
+                },
+                "used" : 16472937
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16472934
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16472931
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16472928
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16472925
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x2",
+                  "val" : "0x2"
+                },
+                "used" : 16452925
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16714714
+          },
+          "pc" : 21,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16714711
+          },
+          "pc" : 23,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16714711
+          },
+          "pc" : 25,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 90
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_1_stateDiff.json
new file mode 100644
index 00000000000..87951390147
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_1_stateDiff.json
@@ -0,0 +1,75 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(2,4)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 38
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386a497d3"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0060000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000003"
+              }
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000004"
+              }
+            }
+          }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d079280106"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 38
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_1_trace.json
new file mode 100644
index 00000000000..4bdaa9c2ceb
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_1_trace.json
@@ -0,0 +1,60 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(2,4)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 38
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab2e",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+          "to" : "0x0060000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9f57",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "delegatecall",
+          "from" : "0x0060000000000000000000000000000000000000",
+          "gas" : "0xfba995",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9c58",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 38
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_1_vmTrace.json
new file mode 100644
index 00000000000..ef9a484933f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_1_vmTrace.json
@@ -0,0 +1,316 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(2,4)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 91
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x602060006020360380602060003760006000355af460206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755499
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755496
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755493
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755491
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755488
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755485
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755482
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755479
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755452
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755449
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755446
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755443
+          },
+          "pc" : 18,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffaaf1" ],
+            "store" : null,
+            "used" : 16755441
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 16493649,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16714717
+          },
+          "pc" : 20,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492946
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x3" ],
+                "store" : null,
+                "used" : 16492943
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492940
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492937
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x3"
+                },
+                "used" : 16472937
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16472934
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16472931
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16472928
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16472925
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x2",
+                  "val" : "0x4"
+                },
+                "used" : 16452925
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16714714
+          },
+          "pc" : 21,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16714711
+          },
+          "pc" : 23,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16714711
+          },
+          "pc" : 25,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 91
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_2_stateDiff.json
new file mode 100644
index 00000000000..3d6aa48d60b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_2_stateDiff.json
@@ -0,0 +1,56 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(1,0)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 39
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f1838618829f"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d079b4163a"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 39
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_2_trace.json
new file mode 100644
index 00000000000..72bfa2e8a3c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_2_trace.json
@@ -0,0 +1,60 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(1,0)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 39
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab3a",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0060000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x5457",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "delegatecall",
+          "from" : "0x0060000000000000000000000000000000000000",
+          "gas" : "0xfba9a0",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x5158",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 39
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_2_vmTrace.json
new file mode 100644
index 00000000000..0fecdf9daf7
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_2_vmTrace.json
@@ -0,0 +1,316 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(1,0)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 92
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x602060006020360380602060003760006000355af460206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755511
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755508
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755505
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755503
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755500
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755497
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755494
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755491
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755464
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755461
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755458
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755455
+          },
+          "pc" : 18,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffaafd" ],
+            "store" : null,
+            "used" : 16755453
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 16493660,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16733929
+          },
+          "pc" : 20,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492957
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x3" ],
+                "store" : null,
+                "used" : 16492954
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492951
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492948
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x3"
+                },
+                "used" : 16472948
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16472945
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16472942
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16472939
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16472936
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 800,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x0"
+                },
+                "used" : 16472136
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16733926
+          },
+          "pc" : 21,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16733923
+          },
+          "pc" : 23,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16733923
+          },
+          "pc" : 25,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 92
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_3_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_3_stateDiff.json
new file mode 100644
index 00000000000..5fb01626f52
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_3_stateDiff.json
@@ -0,0 +1,56 @@
+{
+  "comment" : "Clear contract storage keys 1 and 2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 40
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f1838618776b"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d079b4216e"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 40
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_3_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_3_trace.json
new file mode 100644
index 00000000000..0dddabcb651
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_3_trace.json
@@ -0,0 +1,60 @@
+{
+  "comment" : "Clear contract storage keys 1 and 2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 40
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab46",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0060000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x957",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "delegatecall",
+          "from" : "0x0060000000000000000000000000000000000000",
+          "gas" : "0xfba9ac",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x658",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 40
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_3_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_3_vmTrace.json
new file mode 100644
index 00000000000..02bebced12f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_16_3_vmTrace.json
@@ -0,0 +1,316 @@
+{
+  "comment" : "Clear contract storage keys 1 and 2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 93
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x602060006020360380602060003760006000355af460206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755523
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755520
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755517
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755515
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755512
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755509
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755506
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755503
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755476
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755473
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755470
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755467
+          },
+          "pc" : 18,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffab09" ],
+            "store" : null,
+            "used" : 16755465
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 16493672,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16753141
+          },
+          "pc" : 20,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492969
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492966
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492963
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492960
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 800,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x0"
+                },
+                "used" : 16492160
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16492157
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492154
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16492151
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16492148
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 800,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x2",
+                  "val" : "0x0"
+                },
+                "used" : 16491348
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16753138
+          },
+          "pc" : 21,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16753135
+          },
+          "pc" : 23,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16753135
+          },
+          "pc" : 25,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 93
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_17_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_17_0_stateDiff.json
new file mode 100644
index 00000000000..7c7809360b0
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_17_0_stateDiff.json
@@ -0,0 +1,56 @@
+{
+  "comment" : "Proxy call to another contract. Using STATICCALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0120000000000000000000000000000000000000",
+      "gas" : "0x30d40",
+      "gasPrice" : "0x1",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 41
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18385c10c8b"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d07a0b8c4e"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 41
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_17_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_17_0_trace.json
new file mode 100644
index 00000000000..5f86c4de7bd
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_17_0_trace.json
@@ -0,0 +1,60 @@
+{
+  "comment" : "Proxy call to another contract. Using STATICCALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0120000000000000000000000000000000000000",
+      "gas" : "0x30d40",
+      "gasPrice" : "0x1",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 41
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0x2b654",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+          "to" : "0x0120000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x301",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000012"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "staticcall",
+          "from" : "0x0120000000000000000000000000000000000000",
+          "gas" : "0x2a88c",
+          "input" : "0x",
+          "to" : "0x0000000000000000000000000000000000000010",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x0",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 41
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_17_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_17_0_vmTrace.json
new file mode 100644
index 00000000000..0c5c2981602
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_17_0_vmTrace.json
@@ -0,0 +1,217 @@
+{
+  "comment" : "Proxy call to another contract. Using STATICCALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0120000000000000000000000000000000000000",
+      "gas" : "0x30d40",
+      "gasPrice" : "0x1",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 94
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355afa60206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 177745
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 177742
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 177739
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x94" ],
+            "store" : null,
+            "used" : 177737
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x74" ],
+            "store" : null,
+            "used" : 177734
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x74", "0x74" ],
+            "store" : null,
+            "used" : 177731
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 177728
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 177725
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 177698
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 177695
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 177693
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 177690
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10" ],
+            "store" : null,
+            "used" : 177687
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2b615" ],
+            "store" : null,
+            "used" : 177685
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 174920,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 176985
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x",
+            "ops" : [ ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 176982
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 176979
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 176979
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 94
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_18_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_18_0_stateDiff.json
new file mode 100644
index 00000000000..4a4396a9a77
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_18_0_stateDiff.json
@@ -0,0 +1,56 @@
+{
+  "comment" : "Proxy call to another contract - several levels deep. Using CALL and STATICCALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 42
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183861b6429"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27a0b590"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 42
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_18_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_18_0_trace.json
new file mode 100644
index 00000000000..2826d276b9f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_18_0_trace.json
@@ -0,0 +1,92 @@
+{
+  "comment" : "Proxy call to another contract - several levels deep. Using CALL and STATICCALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 42
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffa7e2",
+          "input" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x915",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000012"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfba648",
+          "input" : "0x00000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x608",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000012"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xf7b4ba",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+          "to" : "0x0120000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x301",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000012"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ 0, 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "staticcall",
+          "from" : "0x0120000000000000000000000000000000000000",
+          "gas" : "0xf3d2f9",
+          "input" : "0x",
+          "to" : "0x0000000000000000000000000000000000000010",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x0",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0, 0, 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 42
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_18_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_18_0_vmTrace.json
new file mode 100644
index 00000000000..cc66c00d0e2
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_18_0_vmTrace.json
@@ -0,0 +1,595 @@
+{
+  "comment" : "Proxy call to another contract - several levels deep. Using CALL and STATICCALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 95
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16754655
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754652
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16754649
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xd4" ],
+            "store" : null,
+            "used" : 16754647
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb4" ],
+            "store" : null,
+            "used" : 16754644
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb4", "0xb4" ],
+            "store" : null,
+            "used" : 16754641
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16754638
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754635
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 39,
+          "ex" : {
+            "mem" : {
+              "data" : "0x00000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16754596
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754593
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754591
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754588
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16754585
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffa797" ],
+            "store" : null,
+            "used" : 16754583
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16492804,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16752339
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492101
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492098
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492095
+              },
+              "pc" : 4,
+              "sub" : null
+            }, {
+              "cost" : 2,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xb4" ],
+                "store" : null,
+                "used" : 16492093
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x94" ],
+                "store" : null,
+                "used" : 16492090
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x94", "0x94" ],
+                "store" : null,
+                "used" : 16492087
+              },
+              "pc" : 8,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492084
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492081
+              },
+              "pc" : 11,
+              "sub" : null
+            }, {
+              "cost" : 33,
+              "ex" : {
+                "mem" : {
+                  "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+                  "off" : 0
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16492048
+              },
+              "pc" : 13,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492045
+              },
+              "pc" : 14,
+              "sub" : null
+            }, {
+              "cost" : 2,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492043
+              },
+              "pc" : 16,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492040
+              },
+              "pc" : 17,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x120000000000000000000000000000000000000" ],
+                "store" : null,
+                "used" : 16492037
+              },
+              "pc" : 19,
+              "sub" : null
+            }, {
+              "cost" : 2,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xfba603" ],
+                "store" : null,
+                "used" : 16492035
+              },
+              "pc" : 20,
+              "sub" : null
+            }, {
+              "cost" : 16234358,
+              "ex" : {
+                "mem" : {
+                  "data" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+                  "off" : 0
+                },
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16490566
+              },
+              "pc" : 21,
+              "sub" : {
+                "code" : "0x60206000602036038060206000376000346000355afa60206000f3",
+                "ops" : [ {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16233655
+                  },
+                  "pc" : 0,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16233652
+                  },
+                  "pc" : 2,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16233649
+                  },
+                  "pc" : 4,
+                  "sub" : null
+                }, {
+                  "cost" : 2,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x94" ],
+                    "store" : null,
+                    "used" : 16233647
+                  },
+                  "pc" : 6,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x74" ],
+                    "store" : null,
+                    "used" : 16233644
+                  },
+                  "pc" : 7,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x74", "0x74" ],
+                    "store" : null,
+                    "used" : 16233641
+                  },
+                  "pc" : 8,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16233638
+                  },
+                  "pc" : 9,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16233635
+                  },
+                  "pc" : 11,
+                  "sub" : null
+                }, {
+                  "cost" : 27,
+                  "ex" : {
+                    "mem" : {
+                      "data" : "0x000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+                      "off" : 0
+                    },
+                    "push" : [ ],
+                    "store" : null,
+                    "used" : 16233608
+                  },
+                  "pc" : 13,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16233605
+                  },
+                  "pc" : 14,
+                  "sub" : null
+                }, {
+                  "cost" : 2,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16233603
+                  },
+                  "pc" : 16,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16233600
+                  },
+                  "pc" : 17,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x10" ],
+                    "store" : null,
+                    "used" : 16233597
+                  },
+                  "pc" : 19,
+                  "sub" : null
+                }, {
+                  "cost" : 2,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0xf7b47b" ],
+                    "store" : null,
+                    "used" : 16233595
+                  },
+                  "pc" : 20,
+                  "sub" : null
+                }, {
+                  "cost" : 15979957,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x1" ],
+                    "store" : null,
+                    "used" : 16232895
+                  },
+                  "pc" : 21,
+                  "sub" : {
+                    "code" : "0x",
+                    "ops" : [ ]
+                  }
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16232892
+                  },
+                  "pc" : 22,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16232889
+                  },
+                  "pc" : 24,
+                  "sub" : null
+                }, {
+                  "cost" : 0,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ ],
+                    "store" : null,
+                    "used" : 16232889
+                  },
+                  "pc" : 26,
+                  "sub" : null
+                } ]
+              }
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16490563
+              },
+              "pc" : 22,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16490560
+              },
+              "pc" : 24,
+              "sub" : null
+            }, {
+              "cost" : 0,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16490560
+              },
+              "pc" : 26,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16752336
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16752333
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16752333
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 95
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_0_stateDiff.json
new file mode 100644
index 00000000000..3f49ca84e1d
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_0_stateDiff.json
@@ -0,0 +1,86 @@
+{
+  "comment" : "Deploy ERC20 contract",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e420000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 43
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18398dce1d4"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241" : {
+          "balance" : {
+            "+" : "0x0"
+          },
+          "code" : {
+            "+" : "0x606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029"
+          },
+          "nonce" : {
+            "+" : "0x1"
+          },
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000000" : {
+              "+" : "0x424e420000000000000000000000000000000000000000000000000000000006"
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "+" : "0x424e420000000000000000000000000000000000000000000000000000000006"
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "+" : "0x0000000000000000000000000000000000000000000000000000000000000012"
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000003" : {
+              "+" : "0x000000000000000000000000000000000000000000a56fa5b99019a5c8000000"
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000004" : {
+              "+" : "0x000000000000000000000000627306090abab3a6e1400e9345bc60c78a8bef57"
+            },
+            "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" : {
+              "+" : "0x000000000000000000000000000000000000000000a56fa5b99019a5c8000000"
+            }
+          }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d066efb705"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 43
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_0_trace.json
new file mode 100644
index 00000000000..c45c4fc2595
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_0_trace.json
@@ -0,0 +1,42 @@
+{
+  "comment" : "Deploy ERC20 contract",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e420000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 43
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xfdc95a",
+          "init" : "0x606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e420000000000000000000000000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "code" : "0x606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029",
+          "gasUsed" : "0x124192"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 43
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_0_vmTrace.json
new file mode 100644
index 00000000000..be92d2ab8a9
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_0_vmTrace.json
@@ -0,0 +1,3449 @@
+{
+  "comment" : "Deploy ERC20 contract",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e420000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 96
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e420000000000000000000000000000000000000000000000000000000000",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16632151
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16632148
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 12,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000060",
+              "off" : 64
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16632136
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16632134
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16632131
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10" ],
+            "store" : null,
+            "used" : 16632128
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16632118
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16632117
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16632114
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000060",
+              "off" : 64
+            },
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16632111
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x16d8" ],
+            "store" : null,
+            "used" : 16632108
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x17d8" ],
+            "store" : null,
+            "used" : 16632106
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16632103
+          },
+          "pc" : 25,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100", "0x100" ],
+            "store" : null,
+            "used" : 16632100
+          },
+          "pc" : 26,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x16d8" ],
+            "store" : null,
+            "used" : 16632097
+          },
+          "pc" : 27,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x100", "0x100", "0x16d8", "0x60" ],
+            "store" : null,
+            "used" : 16632094
+          },
+          "pc" : 31,
+          "sub" : null
+        }, {
+          "cost" : 51,
+          "ex" : {
+            "mem" : {
+              "data" : "0x000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e420000000000000000000000000000000000000000000000000000000000",
+              "off" : 96
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16632043
+          },
+          "pc" : 32,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x100", "0x60" ],
+            "store" : null,
+            "used" : 16632040
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x160" ],
+            "store" : null,
+            "used" : 16632037
+          },
+          "pc" : 34,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16632034
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000160",
+              "off" : 64
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16632031
+          },
+          "pc" : 37,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x60" ],
+            "store" : null,
+            "used" : 16632028
+          },
+          "pc" : 38,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x60" ],
+            "store" : null,
+            "used" : 16632025
+          },
+          "pc" : 39,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x000000000000000000000000000000000000000000a56fa5b99019a5c8000000",
+              "off" : 96
+            },
+            "push" : [ "0xa56fa5b99019a5c8000000" ],
+            "store" : null,
+            "used" : 16632022
+          },
+          "pc" : 40,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0x60" ],
+            "store" : null,
+            "used" : 16632019
+          },
+          "pc" : 41,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16632016
+          },
+          "pc" : 42,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16632013
+          },
+          "pc" : 44,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0xa56fa5b99019a5c8000000" ],
+            "store" : null,
+            "used" : 16632010
+          },
+          "pc" : 45,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0x80", "0x60" ],
+            "store" : null,
+            "used" : 16632007
+          },
+          "pc" : 46,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x80" ],
+            "store" : null,
+            "used" : 16632004
+          },
+          "pc" : 47,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16632001
+          },
+          "pc" : 48,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000080",
+              "off" : 128
+            },
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16631998
+          },
+          "pc" : 49,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x80", "0x80", "0x60" ],
+            "store" : null,
+            "used" : 16631995
+          },
+          "pc" : 50,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xe0" ],
+            "store" : null,
+            "used" : 16631992
+          },
+          "pc" : 51,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xe0", "0x80", "0x60" ],
+            "store" : null,
+            "used" : 16631989
+          },
+          "pc" : 52,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x80" ],
+            "store" : null,
+            "used" : 16631986
+          },
+          "pc" : 53,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16631983
+          },
+          "pc" : 54,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16631980
+          },
+          "pc" : 56,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0", "0xa0" ],
+            "store" : null,
+            "used" : 16631977
+          },
+          "pc" : 57,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+              "off" : 160
+            },
+            "push" : [ "0x12" ],
+            "store" : null,
+            "used" : 16631974
+          },
+          "pc" : 58,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12", "0xa0" ],
+            "store" : null,
+            "used" : 16631971
+          },
+          "pc" : 59,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16631968
+          },
+          "pc" : 60,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc0" ],
+            "store" : null,
+            "used" : 16631965
+          },
+          "pc" : 62,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc0", "0x12" ],
+            "store" : null,
+            "used" : 16631962
+          },
+          "pc" : 63,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12", "0xc0", "0x60" ],
+            "store" : null,
+            "used" : 16631959
+          },
+          "pc" : 64,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0xc0" ],
+            "store" : null,
+            "used" : 16631956
+          },
+          "pc" : 65,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc0", "0xc0" ],
+            "store" : null,
+            "used" : 16631953
+          },
+          "pc" : 66,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x00000000000000000000000000000000000000000000000000000000000000c0",
+              "off" : 192
+            },
+            "push" : [ "0xc0" ],
+            "store" : null,
+            "used" : 16631950
+          },
+          "pc" : 67,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0xc0", "0xc0", "0x60" ],
+            "store" : null,
+            "used" : 16631947
+          },
+          "pc" : 68,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x120" ],
+            "store" : null,
+            "used" : 16631944
+          },
+          "pc" : 69,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x120", "0xc0", "0x60" ],
+            "store" : null,
+            "used" : 16631941
+          },
+          "pc" : 70,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0xc0" ],
+            "store" : null,
+            "used" : 16631938
+          },
+          "pc" : 71,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16631936
+          },
+          "pc" : 72,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16631934
+          },
+          "pc" : 73,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16631933
+          },
+          "pc" : 74,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0xe0", "0x12", "0x120", "0xa56fa5b99019a5c8000000" ],
+            "store" : null,
+            "used" : 16631930
+          },
+          "pc" : 75,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16631927
+          },
+          "pc" : 76,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16631924
+          },
+          "pc" : 78,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16631922
+          },
+          "pc" : 80,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16631919
+          },
+          "pc" : 81,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16631916
+          },
+          "pc" : 102,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16631913
+          },
+          "pc" : 103,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16631910
+          },
+          "pc" : 124,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x627306090abab3a6e1400e9345bc60c78a8bef57", "0x0" ],
+            "store" : null,
+            "used" : 16631907
+          },
+          "pc" : 125,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x000000000000000000000000627306090abab3a6e1400e9345bc60c78a8bef57",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16631904
+          },
+          "pc" : 126,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16631901
+          },
+          "pc" : 127,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16631898
+          },
+          "pc" : 129,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16631895
+          },
+          "pc" : 130,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16631892
+          },
+          "pc" : 131,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16631889
+          },
+          "pc" : 132,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16631886
+          },
+          "pc" : 133,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16631883
+          },
+          "pc" : 135,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16631880
+          },
+          "pc" : 136,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" ],
+            "store" : null,
+            "used" : 16631838
+          },
+          "pc" : 138,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d", "0xa56fa5b99019a5c8000000" ],
+            "store" : null,
+            "used" : 16631835
+          },
+          "pc" : 139,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" ],
+            "store" : null,
+            "used" : 16631832
+          },
+          "pc" : 140,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d",
+              "val" : "0xa56fa5b99019a5c8000000"
+            },
+            "used" : 16611832
+          },
+          "pc" : 141,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16611830
+          },
+          "pc" : 142,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0xe0", "0x12", "0x120", "0xa56fa5b99019a5c8000000" ],
+            "store" : null,
+            "used" : 16611827
+          },
+          "pc" : 143,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16611824
+          },
+          "pc" : 144,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0x3", "0xa56fa5b99019a5c8000000" ],
+            "store" : null,
+            "used" : 16611821
+          },
+          "pc" : 146,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0x3" ],
+            "store" : null,
+            "used" : 16611818
+          },
+          "pc" : 147,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x3",
+              "val" : "0xa56fa5b99019a5c8000000"
+            },
+            "used" : 16591818
+          },
+          "pc" : 148,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16591816
+          },
+          "pc" : 149,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xe0", "0x12", "0x120", "0xe0" ],
+            "store" : null,
+            "used" : 16591813
+          },
+          "pc" : 150,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16591810
+          },
+          "pc" : 151,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0xe0" ],
+            "store" : null,
+            "used" : 16591807
+          },
+          "pc" : 153,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xe0", "0xe0" ],
+            "store" : null,
+            "used" : 16591804
+          },
+          "pc" : 154,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000003",
+              "off" : 224
+            },
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16591801
+          },
+          "pc" : 155,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0xe0" ],
+            "store" : null,
+            "used" : 16591798
+          },
+          "pc" : 156,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16591795
+          },
+          "pc" : 157,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16591792
+          },
+          "pc" : 159,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100", "0x3" ],
+            "store" : null,
+            "used" : 16591789
+          },
+          "pc" : 160,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xad" ],
+            "store" : null,
+            "used" : 16591786
+          },
+          "pc" : 161,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xad", "0x100", "0x3", "0x0" ],
+            "store" : null,
+            "used" : 16591783
+          },
+          "pc" : 165,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x3", "0x100" ],
+            "store" : null,
+            "used" : 16591780
+          },
+          "pc" : 166,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100", "0x3" ],
+            "store" : null,
+            "used" : 16591777
+          },
+          "pc" : 167,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12e" ],
+            "store" : null,
+            "used" : 16591774
+          },
+          "pc" : 168,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16591766
+          },
+          "pc" : 172,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16591765
+          },
+          "pc" : 302,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x100", "0x3", "0x0" ],
+            "store" : null,
+            "used" : 16591762
+          },
+          "pc" : 303,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x0" ],
+            "store" : null,
+            "used" : 16591759
+          },
+          "pc" : 304,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590959
+          },
+          "pc" : 305,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16590956
+          },
+          "pc" : 306,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x1", "0x0" ],
+            "store" : null,
+            "used" : 16590953
+          },
+          "pc" : 308,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16590950
+          },
+          "pc" : 309,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590947
+          },
+          "pc" : 311,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16590944
+          },
+          "pc" : 312,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16590941
+          },
+          "pc" : 313,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16590936
+          },
+          "pc" : 316,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16590933
+          },
+          "pc" : 317,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590930
+          },
+          "pc" : 318,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16590927
+          },
+          "pc" : 319,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2", "0x0" ],
+            "store" : null,
+            "used" : 16590924
+          },
+          "pc" : 321,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590919
+          },
+          "pc" : 322,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x0" ],
+            "store" : null,
+            "used" : 16590916
+          },
+          "pc" : 323,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590913
+          },
+          "pc" : 324,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16590910
+          },
+          "pc" : 326,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16590907
+          },
+          "pc" : 327,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590904
+          },
+          "pc" : 329,
+          "sub" : null
+        }, {
+          "cost" : 36,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16590868
+          },
+          "pc" : 331,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x0" ],
+            "store" : null,
+            "used" : 16590865
+          },
+          "pc" : 332,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f" ],
+            "store" : null,
+            "used" : 16590862
+          },
+          "pc" : 333,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f" ],
+            "store" : null,
+            "used" : 16590859
+          },
+          "pc" : 335,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16590856
+          },
+          "pc" : 336,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x1f" ],
+            "store" : null,
+            "used" : 16590853
+          },
+          "pc" : 338,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590848
+          },
+          "pc" : 339,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x0", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16590845
+          },
+          "pc" : 340,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16590842
+          },
+          "pc" : 341,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x3", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x100" ],
+            "store" : null,
+            "used" : 16590839
+          },
+          "pc" : 342,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x100", "0x3" ],
+            "store" : null,
+            "used" : 16590836
+          },
+          "pc" : 343,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f" ],
+            "store" : null,
+            "used" : 16590833
+          },
+          "pc" : 344,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590830
+          },
+          "pc" : 346,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x171" ],
+            "store" : null,
+            "used" : 16590827
+          },
+          "pc" : 347,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16590817
+          },
+          "pc" : 351,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100", "0x100" ],
+            "store" : null,
+            "used" : 16590814
+          },
+          "pc" : 352,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x424e420000000000000000000000000000000000000000000000000000000000",
+              "off" : 256
+            },
+            "push" : [ "0x424e420000000000000000000000000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16590811
+          },
+          "pc" : 353,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16590808
+          },
+          "pc" : 354,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" ],
+            "store" : null,
+            "used" : 16590805
+          },
+          "pc" : 356,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x424e420000000000000000000000000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16590802
+          },
+          "pc" : 357,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x100", "0x424e420000000000000000000000000000000000000000000000000000000000", "0x3" ],
+            "store" : null,
+            "used" : 16590799
+          },
+          "pc" : 358,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0x3" ],
+            "store" : null,
+            "used" : 16590796
+          },
+          "pc" : 359,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6" ],
+            "store" : null,
+            "used" : 16590793
+          },
+          "pc" : 360,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x424e420000000000000000000000000000000000000000000000000000000006" ],
+            "store" : null,
+            "used" : 16590790
+          },
+          "pc" : 361,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x3", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x100", "0x424e420000000000000000000000000000000000000000000000000000000006", "0x0" ],
+            "store" : null,
+            "used" : 16590787
+          },
+          "pc" : 362,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x0",
+              "val" : "0x424e420000000000000000000000000000000000000000000000000000000006"
+            },
+            "used" : 16570787
+          },
+          "pc" : 363,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1a2" ],
+            "store" : null,
+            "used" : 16570784
+          },
+          "pc" : 364,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570776
+          },
+          "pc" : 368,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570775
+          },
+          "pc" : 418,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570773
+          },
+          "pc" : 419,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x3" ],
+            "store" : null,
+            "used" : 16570770
+          },
+          "pc" : 420,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570768
+          },
+          "pc" : 421,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1b1" ],
+            "store" : null,
+            "used" : 16570765
+          },
+          "pc" : 422,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1b1", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16570762
+          },
+          "pc" : 426,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16570759
+          },
+          "pc" : 427,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1b5" ],
+            "store" : null,
+            "used" : 16570756
+          },
+          "pc" : 428,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570748
+          },
+          "pc" : 432,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570747
+          },
+          "pc" : 437,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1da" ],
+            "store" : null,
+            "used" : 16570744
+          },
+          "pc" : 438,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1da", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16570741
+          },
+          "pc" : 442,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16570738
+          },
+          "pc" : 443,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570737
+          },
+          "pc" : 444,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16570734
+          },
+          "pc" : 445,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16570731
+          },
+          "pc" : 446,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16570728
+          },
+          "pc" : 447,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16570725
+          },
+          "pc" : 448,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1d6" ],
+            "store" : null,
+            "used" : 16570722
+          },
+          "pc" : 449,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570712
+          },
+          "pc" : 453,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570711
+          },
+          "pc" : 470,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570709
+          },
+          "pc" : 471,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x1da" ],
+            "store" : null,
+            "used" : 16570706
+          },
+          "pc" : 472,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570698
+          },
+          "pc" : 473,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570697
+          },
+          "pc" : 474,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x1b1" ],
+            "store" : null,
+            "used" : 16570694
+          },
+          "pc" : 475,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570686
+          },
+          "pc" : 476,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570685
+          },
+          "pc" : 433,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570683
+          },
+          "pc" : 434,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0xad" ],
+            "store" : null,
+            "used" : 16570680
+          },
+          "pc" : 435,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570672
+          },
+          "pc" : 436,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570671
+          },
+          "pc" : 173,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570669
+          },
+          "pc" : 174,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x120", "0x120" ],
+            "store" : null,
+            "used" : 16570666
+          },
+          "pc" : 175,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16570663
+          },
+          "pc" : 176,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x120" ],
+            "store" : null,
+            "used" : 16570660
+          },
+          "pc" : 178,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x120", "0x120" ],
+            "store" : null,
+            "used" : 16570657
+          },
+          "pc" : 179,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000003",
+              "off" : 288
+            },
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16570654
+          },
+          "pc" : 180,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0x120" ],
+            "store" : null,
+            "used" : 16570651
+          },
+          "pc" : 181,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16570648
+          },
+          "pc" : 182,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x140" ],
+            "store" : null,
+            "used" : 16570645
+          },
+          "pc" : 184,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x140", "0x3" ],
+            "store" : null,
+            "used" : 16570642
+          },
+          "pc" : 185,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc6" ],
+            "store" : null,
+            "used" : 16570639
+          },
+          "pc" : 186,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc6", "0x140", "0x3", "0x1" ],
+            "store" : null,
+            "used" : 16570636
+          },
+          "pc" : 190,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x3", "0x140" ],
+            "store" : null,
+            "used" : 16570633
+          },
+          "pc" : 191,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x140", "0x3" ],
+            "store" : null,
+            "used" : 16570630
+          },
+          "pc" : 192,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12e" ],
+            "store" : null,
+            "used" : 16570627
+          },
+          "pc" : 193,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570619
+          },
+          "pc" : 197,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570618
+          },
+          "pc" : 302,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x140", "0x3", "0x1" ],
+            "store" : null,
+            "used" : 16570615
+          },
+          "pc" : 303,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x1" ],
+            "store" : null,
+            "used" : 16570612
+          },
+          "pc" : 304,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569812
+          },
+          "pc" : 305,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16569809
+          },
+          "pc" : 306,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x1", "0x0" ],
+            "store" : null,
+            "used" : 16569806
+          },
+          "pc" : 308,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16569803
+          },
+          "pc" : 309,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569800
+          },
+          "pc" : 311,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16569797
+          },
+          "pc" : 312,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16569794
+          },
+          "pc" : 313,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16569789
+          },
+          "pc" : 316,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16569786
+          },
+          "pc" : 317,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569783
+          },
+          "pc" : 318,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16569780
+          },
+          "pc" : 319,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2", "0x0" ],
+            "store" : null,
+            "used" : 16569777
+          },
+          "pc" : 321,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569772
+          },
+          "pc" : 322,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x1" ],
+            "store" : null,
+            "used" : 16569769
+          },
+          "pc" : 323,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569766
+          },
+          "pc" : 324,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16569763
+          },
+          "pc" : 326,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16569760
+          },
+          "pc" : 327,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569757
+          },
+          "pc" : 329,
+          "sub" : null
+        }, {
+          "cost" : 36,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16569721
+          },
+          "pc" : 331,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x0" ],
+            "store" : null,
+            "used" : 16569718
+          },
+          "pc" : 332,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f" ],
+            "store" : null,
+            "used" : 16569715
+          },
+          "pc" : 333,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f" ],
+            "store" : null,
+            "used" : 16569712
+          },
+          "pc" : 335,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16569709
+          },
+          "pc" : 336,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x1f" ],
+            "store" : null,
+            "used" : 16569706
+          },
+          "pc" : 338,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569701
+          },
+          "pc" : 339,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x0", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16569698
+          },
+          "pc" : 340,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16569695
+          },
+          "pc" : 341,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x3", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x140" ],
+            "store" : null,
+            "used" : 16569692
+          },
+          "pc" : 342,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x140", "0x3" ],
+            "store" : null,
+            "used" : 16569689
+          },
+          "pc" : 343,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f" ],
+            "store" : null,
+            "used" : 16569686
+          },
+          "pc" : 344,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569683
+          },
+          "pc" : 346,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x171" ],
+            "store" : null,
+            "used" : 16569680
+          },
+          "pc" : 347,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16569670
+          },
+          "pc" : 351,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x140", "0x140" ],
+            "store" : null,
+            "used" : 16569667
+          },
+          "pc" : 352,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x424e420000000000000000000000000000000000000000000000000000000000",
+              "off" : 320
+            },
+            "push" : [ "0x424e420000000000000000000000000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16569664
+          },
+          "pc" : 353,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16569661
+          },
+          "pc" : 354,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" ],
+            "store" : null,
+            "used" : 16569658
+          },
+          "pc" : 356,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x424e420000000000000000000000000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16569655
+          },
+          "pc" : 357,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x140", "0x424e420000000000000000000000000000000000000000000000000000000000", "0x3" ],
+            "store" : null,
+            "used" : 16569652
+          },
+          "pc" : 358,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0x3" ],
+            "store" : null,
+            "used" : 16569649
+          },
+          "pc" : 359,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6" ],
+            "store" : null,
+            "used" : 16569646
+          },
+          "pc" : 360,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x424e420000000000000000000000000000000000000000000000000000000006" ],
+            "store" : null,
+            "used" : 16569643
+          },
+          "pc" : 361,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x3", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x140", "0x424e420000000000000000000000000000000000000000000000000000000006", "0x1" ],
+            "store" : null,
+            "used" : 16569640
+          },
+          "pc" : 362,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x1",
+              "val" : "0x424e420000000000000000000000000000000000000000000000000000000006"
+            },
+            "used" : 16549640
+          },
+          "pc" : 363,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1a2" ],
+            "store" : null,
+            "used" : 16549637
+          },
+          "pc" : 364,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549629
+          },
+          "pc" : 368,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549628
+          },
+          "pc" : 418,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549626
+          },
+          "pc" : 419,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x3" ],
+            "store" : null,
+            "used" : 16549623
+          },
+          "pc" : 420,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549621
+          },
+          "pc" : 421,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1b1" ],
+            "store" : null,
+            "used" : 16549618
+          },
+          "pc" : 422,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1b1", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16549615
+          },
+          "pc" : 426,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16549612
+          },
+          "pc" : 427,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1b5" ],
+            "store" : null,
+            "used" : 16549609
+          },
+          "pc" : 428,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549601
+          },
+          "pc" : 432,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549600
+          },
+          "pc" : 437,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1da" ],
+            "store" : null,
+            "used" : 16549597
+          },
+          "pc" : 438,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1da", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16549594
+          },
+          "pc" : 442,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16549591
+          },
+          "pc" : 443,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549590
+          },
+          "pc" : 444,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16549587
+          },
+          "pc" : 445,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16549584
+          },
+          "pc" : 446,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16549581
+          },
+          "pc" : 447,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16549578
+          },
+          "pc" : 448,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1d6" ],
+            "store" : null,
+            "used" : 16549575
+          },
+          "pc" : 449,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549565
+          },
+          "pc" : 453,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549564
+          },
+          "pc" : 470,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549562
+          },
+          "pc" : 471,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x1da" ],
+            "store" : null,
+            "used" : 16549559
+          },
+          "pc" : 472,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549551
+          },
+          "pc" : 473,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549550
+          },
+          "pc" : 474,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x1b1" ],
+            "store" : null,
+            "used" : 16549547
+          },
+          "pc" : 475,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549539
+          },
+          "pc" : 476,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549538
+          },
+          "pc" : 433,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549536
+          },
+          "pc" : 434,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0xc6" ],
+            "store" : null,
+            "used" : 16549533
+          },
+          "pc" : 435,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549525
+          },
+          "pc" : 436,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549524
+          },
+          "pc" : 198,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549522
+          },
+          "pc" : 199,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12", "0x120", "0x12" ],
+            "store" : null,
+            "used" : 16549519
+          },
+          "pc" : 200,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16549516
+          },
+          "pc" : 201,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16549513
+          },
+          "pc" : 203,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16549510
+          },
+          "pc" : 205,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16549500
+          },
+          "pc" : 208,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2", "0x1", "0x2" ],
+            "store" : null,
+            "used" : 16549497
+          },
+          "pc" : 209,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16548697
+          },
+          "pc" : 210,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x0", "0x1" ],
+            "store" : null,
+            "used" : 16548694
+          },
+          "pc" : 211,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16548691
+          },
+          "pc" : 212,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16548686
+          },
+          "pc" : 214,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" ],
+            "store" : null,
+            "used" : 16548683
+          },
+          "pc" : 215,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16548680
+          },
+          "pc" : 216,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x1" ],
+            "store" : null,
+            "used" : 16548677
+          },
+          "pc" : 217,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12", "0x2", "0x0", "0x1", "0x12" ],
+            "store" : null,
+            "used" : 16548674
+          },
+          "pc" : 218,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16548671
+          },
+          "pc" : 219,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12" ],
+            "store" : null,
+            "used" : 16548668
+          },
+          "pc" : 221,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12" ],
+            "store" : null,
+            "used" : 16548663
+          },
+          "pc" : 222,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12" ],
+            "store" : null,
+            "used" : 16548660
+          },
+          "pc" : 223,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12", "0x2" ],
+            "store" : null,
+            "used" : 16548657
+          },
+          "pc" : 224,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x2",
+              "val" : "0x12"
+            },
+            "used" : 16528657
+          },
+          "pc" : 225,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16528655
+          },
+          "pc" : 226,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16528653
+          },
+          "pc" : 227,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16528650
+          },
+          "pc" : 228,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16528647
+          },
+          "pc" : 230,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16528644
+          },
+          "pc" : 232,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16528634
+          },
+          "pc" : 235,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4", "0x1", "0x4" ],
+            "store" : null,
+            "used" : 16528631
+          },
+          "pc" : 236,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16527831
+          },
+          "pc" : 237,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x0", "0x1" ],
+            "store" : null,
+            "used" : 16527828
+          },
+          "pc" : 238,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16527825
+          },
+          "pc" : 239,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16527820
+          },
+          "pc" : 260,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffff0000000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16527817
+          },
+          "pc" : 261,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16527814
+          },
+          "pc" : 262,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x1" ],
+            "store" : null,
+            "used" : 16527811
+          },
+          "pc" : 263,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57", "0x4", "0x0", "0x1", "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16527808
+          },
+          "pc" : 264,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16527805
+          },
+          "pc" : 265,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16527802
+          },
+          "pc" : 286,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16527797
+          },
+          "pc" : 287,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16527794
+          },
+          "pc" : 288,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57", "0x4" ],
+            "store" : null,
+            "used" : 16527791
+          },
+          "pc" : 289,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x4",
+              "val" : "0x627306090abab3a6e1400e9345bc60c78a8bef57"
+            },
+            "used" : 16507791
+          },
+          "pc" : 290,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507789
+          },
+          "pc" : 291,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507788
+          },
+          "pc" : 292,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507786
+          },
+          "pc" : 293,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507784
+          },
+          "pc" : 294,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507782
+          },
+          "pc" : 295,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507780
+          },
+          "pc" : 296,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1dd" ],
+            "store" : null,
+            "used" : 16507777
+          },
+          "pc" : 297,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507769
+          },
+          "pc" : 301,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507768
+          },
+          "pc" : 477,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14eb" ],
+            "store" : null,
+            "used" : 16507765
+          },
+          "pc" : 478,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14eb", "0x14eb" ],
+            "store" : null,
+            "used" : 16507762
+          },
+          "pc" : 481,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1ed" ],
+            "store" : null,
+            "used" : 16507759
+          },
+          "pc" : 482,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16507756
+          },
+          "pc" : 486,
+          "sub" : null
+        }, {
+          "cost" : 1033,
+          "ex" : {
+            "mem" : {
+              "data" : "0x606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16506723
+          },
+          "pc" : 488,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16506720
+          },
+          "pc" : 489,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16506720
+          },
+          "pc" : 491,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 96
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_1_stateDiff.json
new file mode 100644
index 00000000000..4c3ac3a671c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_1_stateDiff.json
@@ -0,0 +1,75 @@
+{
+  "comment" : "Transfert ERC20 tokens (with contract created 0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0x23c346000",
+      "value" : "0x0",
+      "data" : "0xa9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea00000",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 44
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f245bb51ccf29e"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffcd498adffa63b"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        },
+        "0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643" : {
+              "*" : {
+                "from" : "0x00000000000000000000000000000000000000000000003635c9adc5dea00000",
+                "to" : "0x00000000000000000000000000000000000000000000006c6b935b8bbd400000"
+              }
+            },
+            "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" : {
+              "*" : {
+                "from" : "0x000000000000000000000000000000000000000000a56f6f83c66bdfe9600000",
+                "to" : "0x000000000000000000000000000000000000000000a56f394dfcbe1a0ac00000"
+              }
+            }
+          }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 44
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_1_trace.json
new file mode 100644
index 00000000000..8c72641e109
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_1_trace.json
@@ -0,0 +1,44 @@
+{
+  "comment" : "Transfert ERC20 tokens (with contract created 0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0x23c346000",
+      "value" : "0x0",
+      "data" : "0xa9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea00000",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 44
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab66",
+          "input" : "0xa9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea00000",
+          "to" : "0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x43aa",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 44
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_1_vmTrace.json
new file mode 100644
index 00000000000..19a101f72d6
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_19_1_vmTrace.json
@@ -0,0 +1,4031 @@
+{
+  "comment" : "Transfert ERC20 tokens (with contract created 0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0x23c346000",
+      "value" : "0x0",
+      "data" : "0xa9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea00000",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 97
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16755555
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16755552
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 12,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000060",
+              "off" : 64
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755540
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x44" ],
+            "store" : null,
+            "used" : 16755538
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755535
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xd9" ],
+            "store" : null,
+            "used" : 16755532
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755522
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755519
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5c" ],
+            "store" : null,
+            "used" : 16755516
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100000000000000000000000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755513
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100000000000000000000000000000000000000000000000000000000", "0xa9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5c" ],
+            "store" : null,
+            "used" : 16755510
+          },
+          "pc" : 44,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755505
+          },
+          "pc" : 45,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffff" ],
+            "store" : null,
+            "used" : 16755502
+          },
+          "pc" : 46,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755499
+          },
+          "pc" : 51,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755496
+          },
+          "pc" : 52,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6fdde03" ],
+            "store" : null,
+            "used" : 16755493
+          },
+          "pc" : 53,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755490
+          },
+          "pc" : 58,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xe2" ],
+            "store" : null,
+            "used" : 16755487
+          },
+          "pc" : 59,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755477
+          },
+          "pc" : 62,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755474
+          },
+          "pc" : 63,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x95ea7b3" ],
+            "store" : null,
+            "used" : 16755471
+          },
+          "pc" : 64,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755468
+          },
+          "pc" : 69,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x171" ],
+            "store" : null,
+            "used" : 16755465
+          },
+          "pc" : 70,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755455
+          },
+          "pc" : 73,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755452
+          },
+          "pc" : 74,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x18160ddd" ],
+            "store" : null,
+            "used" : 16755449
+          },
+          "pc" : 75,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755446
+          },
+          "pc" : 80,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1cb" ],
+            "store" : null,
+            "used" : 16755443
+          },
+          "pc" : 81,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755433
+          },
+          "pc" : 84,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755430
+          },
+          "pc" : 85,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x23b872dd" ],
+            "store" : null,
+            "used" : 16755427
+          },
+          "pc" : 86,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755424
+          },
+          "pc" : 91,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f4" ],
+            "store" : null,
+            "used" : 16755421
+          },
+          "pc" : 92,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755411
+          },
+          "pc" : 95,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755408
+          },
+          "pc" : 96,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x313ce567" ],
+            "store" : null,
+            "used" : 16755405
+          },
+          "pc" : 97,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755402
+          },
+          "pc" : 102,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x26d" ],
+            "store" : null,
+            "used" : 16755399
+          },
+          "pc" : 103,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755389
+          },
+          "pc" : 106,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755386
+          },
+          "pc" : 107,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3bed33ce" ],
+            "store" : null,
+            "used" : 16755383
+          },
+          "pc" : 108,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755380
+          },
+          "pc" : 113,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x29c" ],
+            "store" : null,
+            "used" : 16755377
+          },
+          "pc" : 114,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755367
+          },
+          "pc" : 117,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755364
+          },
+          "pc" : 118,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x42966c68" ],
+            "store" : null,
+            "used" : 16755361
+          },
+          "pc" : 119,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755358
+          },
+          "pc" : 124,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2bf" ],
+            "store" : null,
+            "used" : 16755355
+          },
+          "pc" : 125,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755345
+          },
+          "pc" : 128,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755342
+          },
+          "pc" : 129,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6623fc46" ],
+            "store" : null,
+            "used" : 16755339
+          },
+          "pc" : 130,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755336
+          },
+          "pc" : 135,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2fa" ],
+            "store" : null,
+            "used" : 16755333
+          },
+          "pc" : 136,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755323
+          },
+          "pc" : 139,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755320
+          },
+          "pc" : 140,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x70a08231" ],
+            "store" : null,
+            "used" : 16755317
+          },
+          "pc" : 141,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755314
+          },
+          "pc" : 146,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x335" ],
+            "store" : null,
+            "used" : 16755311
+          },
+          "pc" : 147,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755301
+          },
+          "pc" : 150,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755298
+          },
+          "pc" : 151,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x8da5cb5b" ],
+            "store" : null,
+            "used" : 16755295
+          },
+          "pc" : 152,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755292
+          },
+          "pc" : 157,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x382" ],
+            "store" : null,
+            "used" : 16755289
+          },
+          "pc" : 158,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755279
+          },
+          "pc" : 161,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755276
+          },
+          "pc" : 162,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x95d89b41" ],
+            "store" : null,
+            "used" : 16755273
+          },
+          "pc" : 163,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755270
+          },
+          "pc" : 168,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3d7" ],
+            "store" : null,
+            "used" : 16755267
+          },
+          "pc" : 169,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755257
+          },
+          "pc" : 172,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755254
+          },
+          "pc" : 173,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755251
+          },
+          "pc" : 174,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755248
+          },
+          "pc" : 179,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x466" ],
+            "store" : null,
+            "used" : 16755245
+          },
+          "pc" : 180,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755235
+          },
+          "pc" : 183,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755234
+          },
+          "pc" : 1126,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755232
+          },
+          "pc" : 1127,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755229
+          },
+          "pc" : 1128,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x471" ],
+            "store" : null,
+            "used" : 16755226
+          },
+          "pc" : 1129,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755216
+          },
+          "pc" : 1132,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755215
+          },
+          "pc" : 1137,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4a6" ],
+            "store" : null,
+            "used" : 16755212
+          },
+          "pc" : 1138,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16755209
+          },
+          "pc" : 1141,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4", "0x4" ],
+            "store" : null,
+            "used" : 16755206
+          },
+          "pc" : 1143,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4", "0x4" ],
+            "store" : null,
+            "used" : 16755203
+          },
+          "pc" : 1144,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16755200
+          },
+          "pc" : 1145,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16755197
+          },
+          "pc" : 1146,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16755194
+          },
+          "pc" : 1167,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x4" ],
+            "store" : null,
+            "used" : 16755191
+          },
+          "pc" : 1168,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755188
+          },
+          "pc" : 1169,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x24" ],
+            "store" : null,
+            "used" : 16755185
+          },
+          "pc" : 1171,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x24", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16755182
+          },
+          "pc" : 1172,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x24", "0x4" ],
+            "store" : null,
+            "used" : 16755179
+          },
+          "pc" : 1173,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4", "0x24" ],
+            "store" : null,
+            "used" : 16755176
+          },
+          "pc" : 1174,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x24", "0x24" ],
+            "store" : null,
+            "used" : 16755173
+          },
+          "pc" : 1175,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16755170
+          },
+          "pc" : 1176,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x24" ],
+            "store" : null,
+            "used" : 16755167
+          },
+          "pc" : 1177,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755164
+          },
+          "pc" : 1178,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x44" ],
+            "store" : null,
+            "used" : 16755161
+          },
+          "pc" : 1180,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x44", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16755158
+          },
+          "pc" : 1181,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x44", "0x4" ],
+            "store" : null,
+            "used" : 16755155
+          },
+          "pc" : 1182,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4", "0x44" ],
+            "store" : null,
+            "used" : 16755152
+          },
+          "pc" : 1183,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755150
+          },
+          "pc" : 1184,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755148
+          },
+          "pc" : 1185,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xfd2" ],
+            "store" : null,
+            "used" : 16755145
+          },
+          "pc" : 1186,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755137
+          },
+          "pc" : 1189,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755136
+          },
+          "pc" : 4050,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755133
+          },
+          "pc" : 4051,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x3635c9adc5dea00000", "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16755130
+          },
+          "pc" : 4053,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16755127
+          },
+          "pc" : 4054,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16755124
+          },
+          "pc" : 4075,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755121
+          },
+          "pc" : 4076,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755118
+          },
+          "pc" : 4077,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff6" ],
+            "store" : null,
+            "used" : 16755115
+          },
+          "pc" : 4078,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755105
+          },
+          "pc" : 4081,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755104
+          },
+          "pc" : 4086,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755101
+          },
+          "pc" : 4087,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x0", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16755098
+          },
+          "pc" : 4089,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755095
+          },
+          "pc" : 4090,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755092
+          },
+          "pc" : 4091,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755089
+          },
+          "pc" : 4092,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1005" ],
+            "store" : null,
+            "used" : 16755086
+          },
+          "pc" : 4093,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755076
+          },
+          "pc" : 4096,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755075
+          },
+          "pc" : 4101,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16755072
+          },
+          "pc" : 4102,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16755069
+          },
+          "pc" : 4103,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755066
+          },
+          "pc" : 4105,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16755064
+          },
+          "pc" : 4107,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16755061
+          },
+          "pc" : 4108,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16755058
+          },
+          "pc" : 4129,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16755055
+          },
+          "pc" : 4130,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16755052
+          },
+          "pc" : 4151,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x627306090abab3a6e1400e9345bc60c78a8bef57", "0x0" ],
+            "store" : null,
+            "used" : 16755049
+          },
+          "pc" : 4152,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x000000000000000000000000627306090abab3a6e1400e9345bc60c78a8bef57",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755046
+          },
+          "pc" : 4153,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755043
+          },
+          "pc" : 4154,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755040
+          },
+          "pc" : 4156,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16755037
+          },
+          "pc" : 4157,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16755034
+          },
+          "pc" : 4158,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755031
+          },
+          "pc" : 4159,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755028
+          },
+          "pc" : 4160,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16755025
+          },
+          "pc" : 4162,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755022
+          },
+          "pc" : 4163,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" ],
+            "store" : null,
+            "used" : 16754980
+          },
+          "pc" : 4165,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f6f83c66bdfe9600000" ],
+            "store" : null,
+            "used" : 16754180
+          },
+          "pc" : 4166,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754177
+          },
+          "pc" : 4167,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16754174
+          },
+          "pc" : 4168,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1051" ],
+            "store" : null,
+            "used" : 16754171
+          },
+          "pc" : 4169,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16754161
+          },
+          "pc" : 4172,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16754160
+          },
+          "pc" : 4177,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16754157
+          },
+          "pc" : 4178,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754154
+          },
+          "pc" : 4180,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x3635c9adc5dea00000", "0x5", "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16754151
+          },
+          "pc" : 4182,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16754148
+          },
+          "pc" : 4183,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16754145
+          },
+          "pc" : 4204,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16754142
+          },
+          "pc" : 4205,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16754139
+          },
+          "pc" : 4226,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x0" ],
+            "store" : null,
+            "used" : 16754136
+          },
+          "pc" : 4227,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16754133
+          },
+          "pc" : 4228,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16754130
+          },
+          "pc" : 4229,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16754127
+          },
+          "pc" : 4231,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16754124
+          },
+          "pc" : 4232,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16754121
+          },
+          "pc" : 4233,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16754118
+          },
+          "pc" : 4234,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16754115
+          },
+          "pc" : 4235,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16754112
+          },
+          "pc" : 4237,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754109
+          },
+          "pc" : 4238,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643" ],
+            "store" : null,
+            "used" : 16754067
+          },
+          "pc" : 4240,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16753267
+          },
+          "pc" : 4241,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x3635c9adc5dea00000", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16753264
+          },
+          "pc" : 4242,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16753261
+          },
+          "pc" : 4243,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16753258
+          },
+          "pc" : 4245,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x3635c9adc5dea00000", "0x3635c9adc5dea00000", "0x3635c9adc5dea00000", "0x5", "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16753255
+          },
+          "pc" : 4247,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16753252
+          },
+          "pc" : 4248,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16753249
+          },
+          "pc" : 4269,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16753246
+          },
+          "pc" : 4270,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16753243
+          },
+          "pc" : 4291,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x0" ],
+            "store" : null,
+            "used" : 16753240
+          },
+          "pc" : 4292,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16753237
+          },
+          "pc" : 4293,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16753234
+          },
+          "pc" : 4294,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16753231
+          },
+          "pc" : 4296,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16753228
+          },
+          "pc" : 4297,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16753225
+          },
+          "pc" : 4298,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16753222
+          },
+          "pc" : 4299,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16753219
+          },
+          "pc" : 4300,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16753216
+          },
+          "pc" : 4302,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16753213
+          },
+          "pc" : 4303,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643" ],
+            "store" : null,
+            "used" : 16753171
+          },
+          "pc" : 4305,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16752371
+          },
+          "pc" : 4306,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000" ],
+            "store" : null,
+            "used" : 16752368
+          },
+          "pc" : 4307,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16752365
+          },
+          "pc" : 4308,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16752362
+          },
+          "pc" : 4309,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10de" ],
+            "store" : null,
+            "used" : 16752359
+          },
+          "pc" : 4310,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16752349
+          },
+          "pc" : 4313,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16752348
+          },
+          "pc" : 4318,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1127" ],
+            "store" : null,
+            "used" : 16752345
+          },
+          "pc" : 4319,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16752342
+          },
+          "pc" : 4322,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16752339
+          },
+          "pc" : 4324,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16752337
+          },
+          "pc" : 4326,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16752334
+          },
+          "pc" : 4327,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16752331
+          },
+          "pc" : 4348,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16752328
+          },
+          "pc" : 4349,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16752325
+          },
+          "pc" : 4370,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x627306090abab3a6e1400e9345bc60c78a8bef57", "0x0" ],
+            "store" : null,
+            "used" : 16752322
+          },
+          "pc" : 4371,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x000000000000000000000000627306090abab3a6e1400e9345bc60c78a8bef57",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16752319
+          },
+          "pc" : 4372,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16752316
+          },
+          "pc" : 4373,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16752313
+          },
+          "pc" : 4375,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16752310
+          },
+          "pc" : 4376,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16752307
+          },
+          "pc" : 4377,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16752304
+          },
+          "pc" : 4378,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16752301
+          },
+          "pc" : 4379,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16752298
+          },
+          "pc" : 4381,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16752295
+          },
+          "pc" : 4382,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" ],
+            "store" : null,
+            "used" : 16752253
+          },
+          "pc" : 4384,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f6f83c66bdfe9600000" ],
+            "store" : null,
+            "used" : 16751453
+          },
+          "pc" : 4385,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x1127", "0xa56f6f83c66bdfe9600000", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16751450
+          },
+          "pc" : 4386,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x146a" ],
+            "store" : null,
+            "used" : 16751447
+          },
+          "pc" : 4387,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751439
+          },
+          "pc" : 4390,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751438
+          },
+          "pc" : 5226,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16751435
+          },
+          "pc" : 5227,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1478" ],
+            "store" : null,
+            "used" : 16751432
+          },
+          "pc" : 5229,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f6f83c66bdfe9600000", "0x3635c9adc5dea00000", "0x0", "0x1478", "0xa56f6f83c66bdfe9600000" ],
+            "store" : null,
+            "used" : 16751429
+          },
+          "pc" : 5232,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x0", "0x1478", "0xa56f6f83c66bdfe9600000", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16751426
+          },
+          "pc" : 5233,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16751423
+          },
+          "pc" : 5234,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16751420
+          },
+          "pc" : 5235,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14af" ],
+            "store" : null,
+            "used" : 16751417
+          },
+          "pc" : 5236,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751409
+          },
+          "pc" : 5239,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751408
+          },
+          "pc" : 5295,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x1" ],
+            "store" : null,
+            "used" : 16751405
+          },
+          "pc" : 5296,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16751402
+          },
+          "pc" : 5297,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16751399
+          },
+          "pc" : 5298,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14bb" ],
+            "store" : null,
+            "used" : 16751396
+          },
+          "pc" : 5299,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751386
+          },
+          "pc" : 5302,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751385
+          },
+          "pc" : 5307,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751384
+          },
+          "pc" : 5308,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751382
+          },
+          "pc" : 5309,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751374
+          },
+          "pc" : 5310,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751373
+          },
+          "pc" : 5240,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x0", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16751370
+          },
+          "pc" : 5241,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f6f83c66bdfe9600000", "0x3635c9adc5dea00000", "0x0", "0x3635c9adc5dea00000", "0xa56f6f83c66bdfe9600000" ],
+            "store" : null,
+            "used" : 16751367
+          },
+          "pc" : 5242,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f394dfcbe1a0ac00000" ],
+            "store" : null,
+            "used" : 16751364
+          },
+          "pc" : 5243,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f394dfcbe1a0ac00000", "0x0" ],
+            "store" : null,
+            "used" : 16751361
+          },
+          "pc" : 5244,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751359
+          },
+          "pc" : 5245,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751358
+          },
+          "pc" : 5246,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f394dfcbe1a0ac00000", "0xa56f6f83c66bdfe9600000", "0x3635c9adc5dea00000", "0x1127" ],
+            "store" : null,
+            "used" : 16751355
+          },
+          "pc" : 5247,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1127", "0x3635c9adc5dea00000", "0xa56f6f83c66bdfe9600000" ],
+            "store" : null,
+            "used" : 16751352
+          },
+          "pc" : 5248,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751350
+          },
+          "pc" : 5249,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751348
+          },
+          "pc" : 5250,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751340
+          },
+          "pc" : 5251,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751339
+          },
+          "pc" : 4391,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16751336
+          },
+          "pc" : 4392,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16751333
+          },
+          "pc" : 4394,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16751331
+          },
+          "pc" : 4396,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16751328
+          },
+          "pc" : 4397,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16751325
+          },
+          "pc" : 4418,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16751322
+          },
+          "pc" : 4419,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16751319
+          },
+          "pc" : 4440,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x627306090abab3a6e1400e9345bc60c78a8bef57", "0x0" ],
+            "store" : null,
+            "used" : 16751316
+          },
+          "pc" : 4441,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x000000000000000000000000627306090abab3a6e1400e9345bc60c78a8bef57",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751313
+          },
+          "pc" : 4442,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16751310
+          },
+          "pc" : 4443,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16751307
+          },
+          "pc" : 4445,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16751304
+          },
+          "pc" : 4446,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16751301
+          },
+          "pc" : 4447,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751298
+          },
+          "pc" : 4448,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16751295
+          },
+          "pc" : 4449,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16751292
+          },
+          "pc" : 4451,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16751289
+          },
+          "pc" : 4452,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" ],
+            "store" : null,
+            "used" : 16751247
+          },
+          "pc" : 4454,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f394dfcbe1a0ac00000", "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d", "0xa56f394dfcbe1a0ac00000" ],
+            "store" : null,
+            "used" : 16751244
+          },
+          "pc" : 4455,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f394dfcbe1a0ac00000", "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" ],
+            "store" : null,
+            "used" : 16751241
+          },
+          "pc" : 4456,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d",
+              "val" : "0xa56f394dfcbe1a0ac00000"
+            },
+            "used" : 16746241
+          },
+          "pc" : 4457,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16746239
+          },
+          "pc" : 4458,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x11b3" ],
+            "store" : null,
+            "used" : 16746236
+          },
+          "pc" : 4459,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16746233
+          },
+          "pc" : 4462,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16746230
+          },
+          "pc" : 4464,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x3635c9adc5dea00000", "0x11b3", "0x5", "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16746227
+          },
+          "pc" : 4466,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16746224
+          },
+          "pc" : 4467,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16746221
+          },
+          "pc" : 4488,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16746218
+          },
+          "pc" : 4489,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16746215
+          },
+          "pc" : 4510,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x0" ],
+            "store" : null,
+            "used" : 16746212
+          },
+          "pc" : 4511,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16746209
+          },
+          "pc" : 4512,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16746206
+          },
+          "pc" : 4513,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16746203
+          },
+          "pc" : 4515,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16746200
+          },
+          "pc" : 4516,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16746197
+          },
+          "pc" : 4517,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16746194
+          },
+          "pc" : 4518,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16746191
+          },
+          "pc" : 4519,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16746188
+          },
+          "pc" : 4521,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16746185
+          },
+          "pc" : 4522,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643" ],
+            "store" : null,
+            "used" : 16746143
+          },
+          "pc" : 4524,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16745343
+          },
+          "pc" : 4525,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x11b3", "0x3635c9adc5dea00000", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16745340
+          },
+          "pc" : 4526,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1484" ],
+            "store" : null,
+            "used" : 16745337
+          },
+          "pc" : 4527,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745329
+          },
+          "pc" : 4530,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745328
+          },
+          "pc" : 5252,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16745325
+          },
+          "pc" : 5253,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x0" ],
+            "store" : null,
+            "used" : 16745322
+          },
+          "pc" : 5255,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x0", "0x0", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16745319
+          },
+          "pc" : 5256,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x3635c9adc5dea00000", "0x0", "0x0", "0x3635c9adc5dea00000", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16745316
+          },
+          "pc" : 5257,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000" ],
+            "store" : null,
+            "used" : 16745313
+          },
+          "pc" : 5258,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x0" ],
+            "store" : null,
+            "used" : 16745310
+          },
+          "pc" : 5259,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745308
+          },
+          "pc" : 5260,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14a4" ],
+            "store" : null,
+            "used" : 16745305
+          },
+          "pc" : 5261,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x3635c9adc5dea00000", "0x0", "0x6c6b935b8bbd400000", "0x14a4", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16745302
+          },
+          "pc" : 5264,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x14a4", "0x3635c9adc5dea00000", "0x6c6b935b8bbd400000" ],
+            "store" : null,
+            "used" : 16745299
+          },
+          "pc" : 5265,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16745296
+          },
+          "pc" : 5266,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16745293
+          },
+          "pc" : 5267,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x1" ],
+            "store" : null,
+            "used" : 16745290
+          },
+          "pc" : 5268,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16745287
+          },
+          "pc" : 5269,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x149f" ],
+            "store" : null,
+            "used" : 16745284
+          },
+          "pc" : 5270,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745274
+          },
+          "pc" : 5273,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745272
+          },
+          "pc" : 5274,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x0", "0x6c6b935b8bbd400000", "0x14a4", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16745269
+          },
+          "pc" : 5275,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x14a4", "0x3635c9adc5dea00000", "0x6c6b935b8bbd400000" ],
+            "store" : null,
+            "used" : 16745266
+          },
+          "pc" : 5276,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16745263
+          },
+          "pc" : 5277,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16745260
+          },
+          "pc" : 5278,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745259
+          },
+          "pc" : 5279,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14af" ],
+            "store" : null,
+            "used" : 16745256
+          },
+          "pc" : 5280,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745248
+          },
+          "pc" : 5283,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745247
+          },
+          "pc" : 5295,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x1" ],
+            "store" : null,
+            "used" : 16745244
+          },
+          "pc" : 5296,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16745241
+          },
+          "pc" : 5297,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16745238
+          },
+          "pc" : 5298,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14bb" ],
+            "store" : null,
+            "used" : 16745235
+          },
+          "pc" : 5299,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745225
+          },
+          "pc" : 5302,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745224
+          },
+          "pc" : 5307,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745223
+          },
+          "pc" : 5308,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745221
+          },
+          "pc" : 5309,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745213
+          },
+          "pc" : 5310,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745212
+          },
+          "pc" : 5284,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x6c6b935b8bbd400000" ],
+            "store" : null,
+            "used" : 16745209
+          },
+          "pc" : 5285,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x6c6b935b8bbd400000", "0x0" ],
+            "store" : null,
+            "used" : 16745206
+          },
+          "pc" : 5286,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745204
+          },
+          "pc" : 5287,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745203
+          },
+          "pc" : 5288,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745201
+          },
+          "pc" : 5289,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x3635c9adc5dea00000", "0x3635c9adc5dea00000", "0x11b3" ],
+            "store" : null,
+            "used" : 16745198
+          },
+          "pc" : 5290,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x11b3", "0x3635c9adc5dea00000", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16745195
+          },
+          "pc" : 5291,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745193
+          },
+          "pc" : 5292,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745191
+          },
+          "pc" : 5293,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745183
+          },
+          "pc" : 5294,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745182
+          },
+          "pc" : 4531,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16745179
+          },
+          "pc" : 4532,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16745176
+          },
+          "pc" : 4534,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x3635c9adc5dea00000", "0x6c6b935b8bbd400000", "0x5", "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16745173
+          },
+          "pc" : 4536,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16745170
+          },
+          "pc" : 4537,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16745167
+          },
+          "pc" : 4558,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16745164
+          },
+          "pc" : 4559,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16745161
+          },
+          "pc" : 4580,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x0" ],
+            "store" : null,
+            "used" : 16745158
+          },
+          "pc" : 4581,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745155
+          },
+          "pc" : 4582,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16745152
+          },
+          "pc" : 4583,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16745149
+          },
+          "pc" : 4585,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16745146
+          },
+          "pc" : 4586,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16745143
+          },
+          "pc" : 4587,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745140
+          },
+          "pc" : 4588,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16745137
+          },
+          "pc" : 4589,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16745134
+          },
+          "pc" : 4591,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16745131
+          },
+          "pc" : 4592,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643" ],
+            "store" : null,
+            "used" : 16745089
+          },
+          "pc" : 4594,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643", "0x6c6b935b8bbd400000" ],
+            "store" : null,
+            "used" : 16745086
+          },
+          "pc" : 4595,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643" ],
+            "store" : null,
+            "used" : 16745083
+          },
+          "pc" : 4596,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643",
+              "val" : "0x6c6b935b8bbd400000"
+            },
+            "used" : 16740083
+          },
+          "pc" : 4597,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16740081
+          },
+          "pc" : 4598,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x3635c9adc5dea00000", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16740078
+          },
+          "pc" : 4599,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16740075
+          },
+          "pc" : 4600,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16740072
+          },
+          "pc" : 4621,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16740070
+          },
+          "pc" : 4622,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16740067
+          },
+          "pc" : 4623,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16740064
+          },
+          "pc" : 4644,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef" ],
+            "store" : null,
+            "used" : 16740061
+          },
+          "pc" : 4645,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x627306090abab3a6e1400e9345bc60c78a8bef57", "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16740058
+          },
+          "pc" : 4678,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16740055
+          },
+          "pc" : 4679,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000060",
+              "off" : 64
+            },
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16740052
+          },
+          "pc" : 4681,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x60" ],
+            "store" : null,
+            "used" : 16740049
+          },
+          "pc" : 4682,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x60", "0x60", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16740046
+          },
+          "pc" : 4683,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x3635c9adc5dea00000", "0x60" ],
+            "store" : null,
+            "used" : 16740043
+          },
+          "pc" : 4684,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x00000000000000000000000000000000000000000000003635c9adc5dea00000",
+              "off" : 96
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16740037
+          },
+          "pc" : 4685,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16740034
+          },
+          "pc" : 4686,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16740031
+          },
+          "pc" : 4688,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x60", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16740028
+          },
+          "pc" : 4689,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16740026
+          },
+          "pc" : 4690,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16740024
+          },
+          "pc" : 4691,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16740021
+          },
+          "pc" : 4692,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000060",
+              "off" : 64
+            },
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16740018
+          },
+          "pc" : 4694,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x60" ],
+            "store" : null,
+            "used" : 16740015
+          },
+          "pc" : 4695,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x60", "0x80" ],
+            "store" : null,
+            "used" : 16740012
+          },
+          "pc" : 4696,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16740009
+          },
+          "pc" : 4697,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x60" ],
+            "store" : null,
+            "used" : 16740006
+          },
+          "pc" : 4698,
+          "sub" : null
+        }, {
+          "cost" : 1756,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16738250
+          },
+          "pc" : 4699,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16738249
+          },
+          "pc" : 4700,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16738247
+          },
+          "pc" : 4701,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16738245
+          },
+          "pc" : 4702,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16738237
+          },
+          "pc" : 4703,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16738236
+          },
+          "pc" : 1190,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16738236
+          },
+          "pc" : 1191,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 97
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1a_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1a_0_stateDiff.json
new file mode 100644
index 00000000000..dc0f32127c7
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1a_0_stateDiff.json
@@ -0,0 +1,56 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep with gas refund.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 45
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f1838618847d"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27a3953c"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 45
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1a_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1a_0_trace.json
new file mode 100644
index 00000000000..8e8f0f84da9
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1a_0_trace.json
@@ -0,0 +1,60 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep with gas refund.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 45
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffab3a",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x5459",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfba99f",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x5158",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 45
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1a_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1a_0_vmTrace.json
new file mode 100644
index 00000000000..7e81f92e7c6
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1a_0_vmTrace.json
@@ -0,0 +1,326 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep with gas refund.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 98
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755511
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755508
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755505
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755503
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755500
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755497
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755494
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755491
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755464
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755461
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755459
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755456
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755453
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffaafb" ],
+            "store" : null,
+            "used" : 16755451
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16493659,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16733927
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492956
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x3" ],
+                "store" : null,
+                "used" : 16492953
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492950
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492947
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x3"
+                },
+                "used" : 16472947
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16472944
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16472941
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16472938
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16472935
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 800,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x0"
+                },
+                "used" : 16472135
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16733924
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16733921
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16733921
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 98
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1b_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1b_0_stateDiff.json
new file mode 100644
index 00000000000..f1a22f0ea84
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1b_0_stateDiff.json
@@ -0,0 +1,56 @@
+{
+  "comment" : "Self destruct and send contract balance to the same address provided in the to field.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0150000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000150000000000000",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 46
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860da92e"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27ae708b"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 46
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1b_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1b_0_trace.json
new file mode 100644
index 00000000000..6996ebb82f7
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1b_0_trace.json
@@ -0,0 +1,44 @@
+{
+  "comment" : "Self destruct and send contract balance to the same address provided in the to field.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0150000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000150000000000000",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 46
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffad82",
+          "input" : "0x0000000000000000000000000150000000000000",
+          "to" : "0x0150000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x0",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 46
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1b_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1b_0_vmTrace.json
new file mode 100644
index 00000000000..318a596c110
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1b_0_vmTrace.json
@@ -0,0 +1,31 @@
+{
+  "comment" : "Self destruct and send contract balance to the same address provided in the to field.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0150000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x0000000000000000000000000150000000000000",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 99
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x",
+        "ops" : [ ]
+      }
+    },
+    "id" : 99
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1c_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1c_0_stateDiff.json
new file mode 100644
index 00000000000..646da799aec
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1c_0_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "Self destruct called in constructor with balance being returned to sender (from field)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 47
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183863e8934"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d0798e0fa5"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 47
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1c_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1c_0_trace.json
new file mode 100644
index 00000000000..75e38bec215
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1c_0_trace.json
@@ -0,0 +1,52 @@
+{
+  "comment" : "Self destruct called in constructor with balance being returned to sender (from field)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 47
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff2f0a",
+          "init" : "0x60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "code" : "0x",
+          "gasUsed" : "0x13a2"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "create"
+      }, {
+        "action" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "balance" : "0x0",
+          "refundAddress" : "0x627306090abab3a6e1400e9345bc60c78a8bef57"
+        },
+        "result" : null,
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "suicide"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 47
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1c_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1c_0_vmTrace.json
new file mode 100644
index 00000000000..72cbe018c76
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1c_0_vmTrace.json
@@ -0,0 +1,103 @@
+{
+  "comment" : "Self destruct called in constructor with balance being returned to sender (from field)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "data" : "0x60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 100
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16723719
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16723716
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 12,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000080",
+              "off" : 64
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723704
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16723702
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16723699
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16723696
+          },
+          "pc" : 27,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16718696
+          },
+          "pc" : 28,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 100
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1d_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1d_0_stateDiff.json
new file mode 100644
index 00000000000..fcee0ca0beb
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1d_0_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "Stack underflow during contract creation",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "gas" : "0x11940",
+      "gasPrice" : "0x1",
+      "value" : "0x0",
+      "data" : "0x6000f1",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 48
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18385c1cbde"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27fa4ddb"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 48
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1d_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1d_0_trace.json
new file mode 100644
index 00000000000..f594d61ffd5
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1d_0_trace.json
@@ -0,0 +1,38 @@
+{
+  "comment" : "Stack underflow during contract creation",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "gas" : "0x11940",
+      "gasPrice" : "0x1",
+      "value" : "0x0",
+      "data" : "0x6000f1",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 48
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0x4a14",
+          "init" : "0x6000f1",
+          "value" : "0x0"
+        },
+        "error" : "Stack underflow",
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 48
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1d_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1d_0_vmTrace.json
new file mode 100644
index 00000000000..b17d88b31f1
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1d_0_vmTrace.json
@@ -0,0 +1,40 @@
+{
+  "comment" : "Stack underflow during contract creation",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "gas" : "0x11940",
+      "gasPrice" : "0x1",
+      "value" : "0x0",
+      "data" : "0x6000f1",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 101
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6000f1",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 18961
+          },
+          "pc" : 0,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 101
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1e_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1e_0_stateDiff.json
new file mode 100644
index 00000000000..c26b183722e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1e_0_stateDiff.json
@@ -0,0 +1,67 @@
+{
+  "comment" : "Transaction to test refund_CallToSuicideTwice_d0g0v0_Istanbul",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0160000000000000000000000000000000000000",
+      "gas" : "0x989680",
+      "gasPrice" : "0x1",
+      "value" : "0xa",
+      "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 49
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18385c111f1"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0160000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xde0b6b3a764000a",
+              "to" : "0xde0b6b3a7640014"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27fb07be"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 49
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1e_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1e_0_trace.json
new file mode 100644
index 00000000000..5bf57379cf7
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1e_0_trace.json
@@ -0,0 +1,70 @@
+{
+  "comment" : "Transaction to test refund_CallToSuicideTwice_d0g0v0_Istanbul",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0160000000000000000000000000000000000000",
+      "gas" : "0x989680",
+      "gasPrice" : "0x1",
+      "value" : "0xa",
+      "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 49
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0x9843e0",
+          "input" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
+          "to" : "0x0160000000000000000000000000000000000000",
+          "value" : "0xa"
+        },
+        "result" : {
+          "gasUsed" : "0xcb3",
+          "output" : "0x"
+        },
+        "subtraces" : 2,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0160000000000000000000000000000000000000",
+          "gas" : "0x1f4",
+          "input" : "0x",
+          "to" : "0x0170000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "error" : "Out of gas",
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0160000000000000000000000000000000000000",
+          "gas" : "0x1f4",
+          "input" : "0x",
+          "to" : "0x0170000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "error" : "Out of gas",
+        "subtraces" : 0,
+        "traceAddress" : [ 1 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 49
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1e_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1e_0_vmTrace.json
new file mode 100644
index 00000000000..60744700611
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1e_0_vmTrace.json
@@ -0,0 +1,280 @@
+{
+  "comment" : "Transaction to test refund_CallToSuicideTwice_d0g0v0_Istanbul",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0160000000000000000000000000000000000000",
+      "gas" : "0x989680",
+      "gasPrice" : "0x1",
+      "value" : "0xa",
+      "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 102
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60006000600060006000730170000000000000000000000000000000000000600035f160005560006000600060006000730170000000000000000000000000000000000000600035f100",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9978845
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9978842
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9978839
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9978836
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9978833
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x170000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 9978830
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9978827
+          },
+          "pc" : 31,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f4" ],
+            "store" : null,
+            "used" : 9978824
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 1200,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9977624
+          },
+          "pc" : 34,
+          "sub" : {
+            "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff00",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x95e7baea6a6c7c4c2dfeb977efac326af552d87" ],
+                "store" : null,
+                "used" : 497
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 30000,
+              "ex" : null,
+              "pc" : 21,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9977621
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x0",
+              "val" : "0x0"
+            },
+            "used" : 9976821
+          },
+          "pc" : 37,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9976818
+          },
+          "pc" : 38,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9976815
+          },
+          "pc" : 40,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9976812
+          },
+          "pc" : 42,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9976809
+          },
+          "pc" : 44,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9976806
+          },
+          "pc" : 46,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x170000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 9976803
+          },
+          "pc" : 48,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9976800
+          },
+          "pc" : 69,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f4" ],
+            "store" : null,
+            "used" : 9976797
+          },
+          "pc" : 71,
+          "sub" : null
+        }, {
+          "cost" : 1200,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9975597
+          },
+          "pc" : 72,
+          "sub" : {
+            "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff00",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x95e7baea6a6c7c4c2dfeb977efac326af552d87" ],
+                "store" : null,
+                "used" : 497
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 30000,
+              "ex" : null,
+              "pc" : 21,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 9975597
+          },
+          "pc" : 73,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 102
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1f_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1f_0_stateDiff.json
new file mode 100644
index 00000000000..63f7153ca56
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1f_0_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "Call Precompiled contract directly",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0000000000000000000000000000000000000001",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 50
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183861838de"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d079b45ffb"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 50
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1f_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1f_0_trace.json
new file mode 100644
index 00000000000..8f53e66f1b4
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1f_0_trace.json
@@ -0,0 +1,43 @@
+{
+  "comment" : "Call Precompiled contract directly",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0000000000000000000000000000000000000001",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 50
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0000000000000000000000000000000000000001",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0xbb8",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 50
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1f_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1f_0_vmTrace.json
new file mode 100644
index 00000000000..063a7e5a229
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_1f_0_vmTrace.json
@@ -0,0 +1,30 @@
+{
+  "comment" : "Call Precompiled contract directly",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "to" : "0x0000000000000000000000000000000000000001",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "value" : "0x0",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 103
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x",
+        "ops" : [ ]
+      }
+    },
+    "id" : 103
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_20_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_20_0_stateDiff.json
new file mode 100644
index 00000000000..b3dda3b2cdc
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_20_0_stateDiff.json
@@ -0,0 +1,67 @@
+{
+  "comment" : "Call to a contract creation that fails with a depth of 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0180000000000000000000000000000000000000",
+      "gas" : "0x11fa1",
+      "gasPrice" : "0x10",
+      "value" : "0x0",
+      "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 51
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18385d298be"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0180000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1",
+              "to" : "0x2"
+            }
+          },
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27e980fb"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 51
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_20_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_20_0_trace.json
new file mode 100644
index 00000000000..c77d5b30028
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_20_0_trace.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "Call to a contract creation that fails with a depth of 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0180000000000000000000000000000000000000",
+      "gas" : "0x11fa1",
+      "gasPrice" : "0x10",
+      "value" : "0x0",
+      "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 51
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xcd01",
+          "input" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
+          "to" : "0x0180000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0xcbc2",
+          "output" : "0x"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "from" : "0x0180000000000000000000000000000000000000",
+          "gas" : "0x4eaa",
+          "init" : "0x600c600055602060406000f000",
+          "value" : "0x0"
+        },
+        "error" : "Out of gas",
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 51
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_20_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_20_0_vmTrace.json
new file mode 100644
index 00000000000..cea9637b1b6
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_20_0_vmTrace.json
@@ -0,0 +1,185 @@
+{
+  "comment" : "Call to a contract creation that fails with a depth of 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "to" : "0x0180000000000000000000000000000000000000",
+      "gas" : "0x11fa1",
+      "gasPrice" : "0x10",
+      "value" : "0x0",
+      "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 104
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6b600c600055602060406000f0600052600d60146000f000",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x600c600055602060406000f0" ],
+            "store" : null,
+            "used" : 52478
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 52475
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000600c600055602060406000f0",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 52469
+          },
+          "pc" : 15,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xd" ],
+            "store" : null,
+            "used" : 52466
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14" ],
+            "store" : null,
+            "used" : 52463
+          },
+          "pc" : 18,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 52460
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 52141,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 319
+          },
+          "pc" : 22,
+          "sub" : {
+            "code" : "0x600c600055602060406000f000",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xc" ],
+                "store" : null,
+                "used" : 20135
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 20132
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x0",
+                  "val" : "0xc"
+                },
+                "used" : 132
+              },
+              "pc" : 4,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 129
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 126
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 123
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 32009,
+              "ex" : null,
+              "pc" : 11,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 319
+          },
+          "pc" : 23,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 104
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_21_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_21_0_stateDiff.json
new file mode 100644
index 00000000000..3d84431553d
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_21_0_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "Call to a contract creation that fails with a stack underflow",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "gas" : "0x47b760",
+      "gasPrice" : "0x1",
+      "value" : "0x0",
+      "data" : "0x602af300",
+      "nonce" : "0x0"
+    }, [ "stateDiff" ], "latest" ],
+    "id" : 52
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860869fe"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27b3afbb"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 52
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_21_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_21_0_trace.json
new file mode 100644
index 00000000000..c007c3cd7b0
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_21_0_trace.json
@@ -0,0 +1,38 @@
+{
+  "comment" : "Call to a contract creation that fails with a stack underflow",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "gas" : "0x47b760",
+      "gasPrice" : "0x1",
+      "value" : "0x0",
+      "data" : "0x602af300",
+      "nonce" : "0x0"
+    }, [ "trace" ], "latest" ],
+    "id" : 52
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0x46e824",
+          "init" : "0x602af300",
+          "value" : "0x0"
+        },
+        "error" : "Stack underflow",
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 52
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_21_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_21_0_vmTrace.json
new file mode 100644
index 00000000000..7e35c861af6
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-call/trace_call_21_0_vmTrace.json
@@ -0,0 +1,40 @@
+{
+  "comment" : "Call to a contract creation that fails with a stack underflow",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_call",
+    "params" : [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "gas" : "0x47b760",
+      "gasPrice" : "0x1",
+      "value" : "0x0",
+      "data" : "0x602af300",
+      "nonce" : "0x0"
+    }, [ "vmTrace" ], "latest" ],
+    "id" : 105
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x602af300",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2a" ],
+            "store" : null,
+            "used" : 4646945
+          },
+          "pc" : 0,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 105
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_01_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_01_stateDiff.json
new file mode 100644
index 00000000000..d10984bab89
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_01_stateDiff.json
@@ -0,0 +1,15 @@
+{
+  "comment" : "",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_01_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_01_trace.json
new file mode 100644
index 00000000000..d10984bab89
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_01_trace.json
@@ -0,0 +1,15 @@
+{
+  "comment" : "",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_01_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_01_vmTrace.json
new file mode 100644
index 00000000000..d10984bab89
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_01_vmTrace.json
@@ -0,0 +1,15 @@
+{
+  "comment" : "",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_02_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_02_stateDiff.json
new file mode 100644
index 00000000000..4042006c75e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_02_stateDiff.json
@@ -0,0 +1,65 @@
+{
+  "comment" : "'Simple value transfer'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x1",
+      "to" : "0x0000000000000000000000000000000000000999",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860d4816"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0000000000000000000000000000000000000999" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x1",
+              "to" : "0x2"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d079bf50c2"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_02_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_02_trace.json
new file mode 100644
index 00000000000..3ba1732f93a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_02_trace.json
@@ -0,0 +1,42 @@
+{
+  "comment" : "'Simple value transfer'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x1",
+      "to" : "0x0000000000000000000000000000000000000999",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0000000000000000000000000000000000000999",
+          "value" : "0x1"
+        },
+        "result" : {
+          "gasUsed" : "0x0",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_02_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_02_vmTrace.json
new file mode 100644
index 00000000000..4555e6840f1
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_02_vmTrace.json
@@ -0,0 +1,29 @@
+{
+  "comment" : "'Simple value transfer'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x1",
+      "to" : "0x0000000000000000000000000000000000000999",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x",
+        "ops" : [ ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_03_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_03_stateDiff.json
new file mode 100644
index 00000000000..4377979e624
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_03_stateDiff.json
@@ -0,0 +1,66 @@
+{
+  "comment" : "'Deploy contract that will self-destruct when called.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x6004600C60003960046000F3600035FF"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x600035ff",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f1838685c9c2"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241" : {
+          "balance" : {
+            "+" : "0x0"
+          },
+          "code" : {
+            "+" : "0x600035ff"
+          },
+          "nonce" : {
+            "+" : "0x1"
+          },
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d07946cf17"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_03_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_03_trace.json
new file mode 100644
index 00000000000..c7064ada30b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_03_trace.json
@@ -0,0 +1,41 @@
+{
+  "comment" : "'Deploy contract that will self-destruct when called.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x6004600C60003960046000F3600035FF"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff300e",
+          "init" : "0x6004600c60003960046000f3600035ff",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "code" : "0x600035ff",
+          "gasUsed" : "0x338"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_03_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_03_vmTrace.json
new file mode 100644
index 00000000000..2562f4254d9
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_03_vmTrace.json
@@ -0,0 +1,102 @@
+{
+  "comment" : "'Deploy contract that will self-destruct when called.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x6004600C60003960046000F3600035FF"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6004600c60003960046000f3600035ff",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723979
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc" ],
+            "store" : null,
+            "used" : 16723976
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723973
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0x600035ff",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723964
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723961
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 11,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_04_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_04_stateDiff.json
new file mode 100644
index 00000000000..a520922f462
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_04_stateDiff.json
@@ -0,0 +1,186 @@
+{
+  "comment" : "'Set contract storage (key,value)'s: (1,1),(2,2)', 'Set contract storage (key,value)'s: (1,3),(2,4)', 'Set contract storage (key,value)'s: (1,3),(1,0)'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002"
+    }, [ "stateDiff" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004"
+    }, [ "stateDiff" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386a1490e"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0010000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+              }
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000002"
+              }
+            }
+          }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd271ad0ab"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18386a1490e",
+              "to" : "0x393f0f183871477ae"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0010000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000003"
+              }
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000002",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000004"
+              }
+            }
+          }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d07998b79b"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f183871477ae",
+              "to" : "0x393f0f183874660d8"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0010000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000003",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000000"
+              }
+            }
+          }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07998b79b",
+              "to" : "0xefffffffffffe28d07966ce71"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x18",
+              "to" : "0x19"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_04_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_04_trace.json
new file mode 100644
index 00000000000..1922abdd0c3
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_04_trace.json
@@ -0,0 +1,99 @@
+{
+  "comment" : "'Set contract storage (key,value)'s: (1,1),(2,2)', 'Set contract storage (key,value)'s: (1,3),(2,4)', 'Set contract storage (key,value)'s: (1,3),(1,0)'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002"
+    }, [ "trace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004"
+    }, [ "trace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffabba",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9c58",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffabba",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x2728",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffabc6",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x16c0",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_04_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_04_vmTrace.json
new file mode 100644
index 00000000000..bc969d0d5df
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_04_vmTrace.json
@@ -0,0 +1,378 @@
+{
+  "comment" : "'Set contract storage (key,value)'s: (1,1),(2,2)', 'Set contract storage (key,value)'s: (1,3),(2,4)', 'Set contract storage (key,value)'s: (1,3),(1,0)'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002"
+    }, [ "vmTrace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004"
+    }, [ "vmTrace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6020356000355560603560403555",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755639
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755636
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755633
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755630
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x1",
+              "val" : "0x1"
+            },
+            "used" : 16735630
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16735627
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16735624
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16735621
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16735618
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x2",
+              "val" : "0x2"
+            },
+            "used" : 16715618
+          },
+          "pc" : 13,
+          "sub" : null
+        } ]
+      }
+    }, {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6020356000355560603560403555",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755639
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16755636
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755633
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755630
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x1",
+              "val" : "0x3"
+            },
+            "used" : 16750630
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16750627
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16750624
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16750621
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16750618
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x2",
+              "val" : "0x4"
+            },
+            "used" : 16745618
+          },
+          "pc" : 13,
+          "sub" : null
+        } ]
+      }
+    }, {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6020356000355560603560403555",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755651
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16755648
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755645
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755642
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x1",
+              "val" : "0x3"
+            },
+            "used" : 16754842
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16754839
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754836
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16754833
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16754830
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x1",
+              "val" : "0x0"
+            },
+            "used" : 16749830
+          },
+          "pc" : 13,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_05_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_05_stateDiff.json
new file mode 100644
index 00000000000..27581a84651
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_05_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "'Clear contract storage keys 1 and 2'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183861528a6"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27a6f113"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_05_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_05_trace.json
new file mode 100644
index 00000000000..f7b334cf2b4
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_05_trace.json
@@ -0,0 +1,43 @@
+{
+  "comment" : "'Clear contract storage keys 1 and 2'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffabd2",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x658",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_05_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_05_vmTrace.json
new file mode 100644
index 00000000000..9fb2b8dd824
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_05_vmTrace.json
@@ -0,0 +1,136 @@
+{
+  "comment" : "'Clear contract storage keys 1 and 2'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0010000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6020356000355560603560403555",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755663
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755660
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755657
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755654
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x1",
+              "val" : "0x0"
+            },
+            "used" : 16754854
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16754851
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754848
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16754845
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16754842
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x2",
+              "val" : "0x0"
+            },
+            "used" : 16754042
+          },
+          "pc" : 13,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_06_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_06_stateDiff.json
new file mode 100644
index 00000000000..1eb29301010
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_06_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "'Self destruct and send contract balance to address provided in the data field.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0020000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000000000000000999"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860da92e"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27ae708b"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_06_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_06_trace.json
new file mode 100644
index 00000000000..36d560f1799
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_06_trace.json
@@ -0,0 +1,43 @@
+{
+  "comment" : "'Self destruct and send contract balance to address provided in the data field.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0020000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000000000000000999"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffad82",
+          "input" : "0x0000000000000000000000000000000000000999",
+          "to" : "0x0020000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x0",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_06_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_06_vmTrace.json
new file mode 100644
index 00000000000..db16af8c0f5
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_06_vmTrace.json
@@ -0,0 +1,30 @@
+{
+  "comment" : "'Self destruct and send contract balance to address provided in the data field.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0020000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000000000000000999"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x",
+        "ops" : [ ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_07_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_07_stateDiff.json
new file mode 100644
index 00000000000..713b14ae9d6
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_07_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "'Increment 32 bytes provided in data field and return the value.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0030000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0xf000000000000000000000000000000000000000000000000000000000000001"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860def33"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27ae2a86"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_07_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_07_trace.json
new file mode 100644
index 00000000000..e2e31df89ca
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_07_trace.json
@@ -0,0 +1,43 @@
+{
+  "comment" : "'Increment 32 bytes provided in data field and return the value.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0030000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0xf000000000000000000000000000000000000000000000000000000000000001"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffad52",
+          "input" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0030000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x1b",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_07_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_07_vmTrace.json
new file mode 100644
index 00000000000..b5b5ead50f6
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_07_vmTrace.json
@@ -0,0 +1,123 @@
+{
+  "comment" : "'Increment 32 bytes provided in data field and return the value.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0030000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0xf000000000000000000000000000000000000000000000000000000000000001"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60003560010160005260206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756047
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000001" ],
+            "store" : null,
+            "used" : 16756044
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756041
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000002" ],
+            "store" : null,
+            "used" : 16756038
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756035
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756029
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16756026
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756023
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756023
+          },
+          "pc" : 13,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_08_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_08_stateDiff.json
new file mode 100644
index 00000000000..04171f1a57d
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_08_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "'Proxy call to another contract - 1 level deep.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386112f08"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aaeab1"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_08_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_08_trace.json
new file mode 100644
index 00000000000..ba90ef0c107
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_08_trace.json
@@ -0,0 +1,59 @@
+{
+  "comment" : "'Proxy call to another contract - 1 level deep.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffacc6",
+          "input" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x30a",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfbab36",
+          "input" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0030000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x1b",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_08_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_08_vmTrace.json
new file mode 100644
index 00000000000..ede2700267a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_08_vmTrace.json
@@ -0,0 +1,312 @@
+{
+  "comment" : "'Proxy call to another contract - 1 level deep.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755907
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755904
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755901
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16755899
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755896
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x20" ],
+            "store" : null,
+            "used" : 16755893
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755890
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755887
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755878
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755875
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755873
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755870
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x30000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755867
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffac99" ],
+            "store" : null,
+            "used" : 16755865
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16494066,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755138
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x60003560010160005260206000f3",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493363
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000001" ],
+                "store" : null,
+                "used" : 16493360
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16493357
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000002" ],
+                "store" : null,
+                "used" : 16493354
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493351
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 6,
+              "ex" : {
+                "mem" : {
+                  "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+                  "off" : 0
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16493345
+              },
+              "pc" : 8,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16493342
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493339
+              },
+              "pc" : 11,
+              "sub" : null
+            }, {
+              "cost" : 0,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16493339
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755135
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755132
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755132
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_09_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_09_stateDiff.json
new file mode 100644
index 00000000000..a6907f34c86
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_09_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "'Proxy call to another contract - several levels deep. Using CALL.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f1838617bf80"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27a45a39"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_09_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_09_trace.json
new file mode 100644
index 00000000000..9f32a719235
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_09_trace.json
@@ -0,0 +1,91 @@
+{
+  "comment" : "'Proxy call to another contract - several levels deep. Using CALL.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffabae",
+          "input" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x8fa",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfbaa17",
+          "input" : "0x00000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x5ff",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xf7b88c",
+          "input" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x30a",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ 0, 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xf3d6cd",
+          "input" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0030000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x1b",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0, 0, 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_09_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_09_vmTrace.json
new file mode 100644
index 00000000000..b85a1882cf8
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_09_vmTrace.json
@@ -0,0 +1,690 @@
+{
+  "comment" : "'Proxy call to another contract - several levels deep. Using CALL.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755627
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755624
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755621
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755619
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16755616
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x60" ],
+            "store" : null,
+            "used" : 16755613
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755610
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755607
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 21,
+          "ex" : {
+            "mem" : {
+              "data" : "0x00000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755586
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755583
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755581
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755578
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755575
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffab75" ],
+            "store" : null,
+            "used" : 16755573
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16493779,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16753338
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16493076
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493073
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16493070
+              },
+              "pc" : 4,
+              "sub" : null
+            }, {
+              "cost" : 2,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16493068
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16493065
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40", "0x40" ],
+                "store" : null,
+                "used" : 16493062
+              },
+              "pc" : 8,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16493059
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493056
+              },
+              "pc" : 11,
+              "sub" : null
+            }, {
+              "cost" : 15,
+              "ex" : {
+                "mem" : {
+                  "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+                  "off" : 0
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16493041
+              },
+              "pc" : 13,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493038
+              },
+              "pc" : 14,
+              "sub" : null
+            }, {
+              "cost" : 2,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493036
+              },
+              "pc" : 16,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493033
+              },
+              "pc" : 17,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40000000000000000000000000000000000000" ],
+                "store" : null,
+                "used" : 16493030
+              },
+              "pc" : 19,
+              "sub" : null
+            }, {
+              "cost" : 2,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xfba9e4" ],
+                "store" : null,
+                "used" : 16493028
+              },
+              "pc" : 20,
+              "sub" : null
+            }, {
+              "cost" : 16235336,
+              "ex" : {
+                "mem" : {
+                  "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+                  "off" : 0
+                },
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16491550
+              },
+              "pc" : 21,
+              "sub" : {
+                "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+                "ops" : [ {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16234633
+                  },
+                  "pc" : 0,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16234630
+                  },
+                  "pc" : 2,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16234627
+                  },
+                  "pc" : 4,
+                  "sub" : null
+                }, {
+                  "cost" : 2,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x40" ],
+                    "store" : null,
+                    "used" : 16234625
+                  },
+                  "pc" : 6,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16234622
+                  },
+                  "pc" : 7,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20", "0x20" ],
+                    "store" : null,
+                    "used" : 16234619
+                  },
+                  "pc" : 8,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16234616
+                  },
+                  "pc" : 9,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16234613
+                  },
+                  "pc" : 11,
+                  "sub" : null
+                }, {
+                  "cost" : 9,
+                  "ex" : {
+                    "mem" : {
+                      "data" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+                      "off" : 0
+                    },
+                    "push" : [ ],
+                    "store" : null,
+                    "used" : 16234604
+                  },
+                  "pc" : 13,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16234601
+                  },
+                  "pc" : 14,
+                  "sub" : null
+                }, {
+                  "cost" : 2,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16234599
+                  },
+                  "pc" : 16,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16234596
+                  },
+                  "pc" : 17,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x30000000000000000000000000000000000000" ],
+                    "store" : null,
+                    "used" : 16234593
+                  },
+                  "pc" : 19,
+                  "sub" : null
+                }, {
+                  "cost" : 2,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0xf7b85f" ],
+                    "store" : null,
+                    "used" : 16234591
+                  },
+                  "pc" : 20,
+                  "sub" : null
+                }, {
+                  "cost" : 15980937,
+                  "ex" : {
+                    "mem" : {
+                      "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+                      "off" : 0
+                    },
+                    "push" : [ "0x1" ],
+                    "store" : null,
+                    "used" : 16233864
+                  },
+                  "pc" : 21,
+                  "sub" : {
+                    "code" : "0x60003560010160005260206000f3",
+                    "ops" : [ {
+                      "cost" : 3,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ "0x0" ],
+                        "store" : null,
+                        "used" : 15980234
+                      },
+                      "pc" : 0,
+                      "sub" : null
+                    }, {
+                      "cost" : 3,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000001" ],
+                        "store" : null,
+                        "used" : 15980231
+                      },
+                      "pc" : 2,
+                      "sub" : null
+                    }, {
+                      "cost" : 3,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ "0x1" ],
+                        "store" : null,
+                        "used" : 15980228
+                      },
+                      "pc" : 3,
+                      "sub" : null
+                    }, {
+                      "cost" : 3,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000002" ],
+                        "store" : null,
+                        "used" : 15980225
+                      },
+                      "pc" : 5,
+                      "sub" : null
+                    }, {
+                      "cost" : 3,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ "0x0" ],
+                        "store" : null,
+                        "used" : 15980222
+                      },
+                      "pc" : 6,
+                      "sub" : null
+                    }, {
+                      "cost" : 6,
+                      "ex" : {
+                        "mem" : {
+                          "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+                          "off" : 0
+                        },
+                        "push" : [ ],
+                        "store" : null,
+                        "used" : 15980216
+                      },
+                      "pc" : 8,
+                      "sub" : null
+                    }, {
+                      "cost" : 3,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ "0x20" ],
+                        "store" : null,
+                        "used" : 15980213
+                      },
+                      "pc" : 9,
+                      "sub" : null
+                    }, {
+                      "cost" : 3,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ "0x0" ],
+                        "store" : null,
+                        "used" : 15980210
+                      },
+                      "pc" : 11,
+                      "sub" : null
+                    }, {
+                      "cost" : 0,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ ],
+                        "store" : null,
+                        "used" : 15980210
+                      },
+                      "pc" : 13,
+                      "sub" : null
+                    } ]
+                  }
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16233861
+                  },
+                  "pc" : 22,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16233858
+                  },
+                  "pc" : 24,
+                  "sub" : null
+                }, {
+                  "cost" : 0,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ ],
+                    "store" : null,
+                    "used" : 16233858
+                  },
+                  "pc" : 26,
+                  "sub" : null
+                } ]
+              }
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16491547
+              },
+              "pc" : 22,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16491544
+              },
+              "pc" : 24,
+              "sub" : null
+            }, {
+              "cost" : 0,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16491544
+              },
+              "pc" : 26,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16753335
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16753332
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16753332
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0a_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0a_stateDiff.json
new file mode 100644
index 00000000000..8bda2d9ae7b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0a_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "'Proxy call to another contract - 1 level deep. Using CALLCODE.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0050000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386112f08"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aaeab1"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0a_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0a_trace.json
new file mode 100644
index 00000000000..9737b896fe1
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0a_trace.json
@@ -0,0 +1,59 @@
+{
+  "comment" : "'Proxy call to another contract - 1 level deep. Using CALLCODE.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0050000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffacc6",
+          "input" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0050000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x30a",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "callcode",
+          "from" : "0x0050000000000000000000000000000000000000",
+          "gas" : "0xfbab36",
+          "input" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0030000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x1b",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0a_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0a_vmTrace.json
new file mode 100644
index 00000000000..cde712bdfd6
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0a_vmTrace.json
@@ -0,0 +1,312 @@
+{
+  "comment" : "'Proxy call to another contract - 1 level deep. Using CALLCODE.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0050000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af260206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755907
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755904
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755901
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16755899
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755896
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x20" ],
+            "store" : null,
+            "used" : 16755893
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755890
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755887
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755878
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755875
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755873
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755870
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x30000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755867
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffac99" ],
+            "store" : null,
+            "used" : 16755865
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16494066,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755138
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x60003560010160005260206000f3",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493363
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000001" ],
+                "store" : null,
+                "used" : 16493360
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16493357
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000002" ],
+                "store" : null,
+                "used" : 16493354
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493351
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 6,
+              "ex" : {
+                "mem" : {
+                  "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+                  "off" : 0
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16493345
+              },
+              "pc" : 8,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16493342
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493339
+              },
+              "pc" : 11,
+              "sub" : null
+            }, {
+              "cost" : 0,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16493339
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755135
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755132
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755132
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0b_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0b_stateDiff.json
new file mode 100644
index 00000000000..452ae50065a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0b_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "'Proxy call to another contract - 1 level deep. Using DELEGATECALL.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386112d2a"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aaec8f"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0b_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0b_trace.json
new file mode 100644
index 00000000000..cf9965b1339
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0b_trace.json
@@ -0,0 +1,59 @@
+{
+  "comment" : "'Proxy call to another contract - 1 level deep. Using DELEGATECALL.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffacc6",
+          "input" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0060000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x308",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "delegatecall",
+          "from" : "0x0060000000000000000000000000000000000000",
+          "gas" : "0xfbab38",
+          "input" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0030000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x1b",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0b_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0b_vmTrace.json
new file mode 100644
index 00000000000..3642dc7e830
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0b_vmTrace.json
@@ -0,0 +1,302 @@
+{
+  "comment" : "'Proxy call to another contract - 1 level deep. Using DELEGATECALL.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x602060006020360380602060003760006000355af460206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755907
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755904
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755901
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16755899
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755896
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x20" ],
+            "store" : null,
+            "used" : 16755893
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755890
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755887
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755878
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755875
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755872
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x30000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755869
+          },
+          "pc" : 18,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffac9b" ],
+            "store" : null,
+            "used" : 16755867
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 16494068,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755140
+          },
+          "pc" : 20,
+          "sub" : {
+            "code" : "0x60003560010160005260206000f3",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493365
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000001" ],
+                "store" : null,
+                "used" : 16493362
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16493359
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000002" ],
+                "store" : null,
+                "used" : 16493356
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493353
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 6,
+              "ex" : {
+                "mem" : {
+                  "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+                  "off" : 0
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16493347
+              },
+              "pc" : 8,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16493344
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493341
+              },
+              "pc" : 11,
+              "sub" : null
+            }, {
+              "cost" : 0,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16493341
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755137
+          },
+          "pc" : 21,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755134
+          },
+          "pc" : 23,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755134
+          },
+          "pc" : 25,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0c_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0c_stateDiff.json
new file mode 100644
index 00000000000..e662b372a2e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0c_stateDiff.json
@@ -0,0 +1,54 @@
+{
+  "comment" : "'Sequential memory modifications with MSTORE8.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0070000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860d6418"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aeb5a1"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0c_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0c_trace.json
new file mode 100644
index 00000000000..ebe78b5a4b8
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0c_trace.json
@@ -0,0 +1,42 @@
+{
+  "comment" : "'Sequential memory modifications with MSTORE8.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0070000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0070000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x1e",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0c_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0c_vmTrace.json
new file mode 100644
index 00000000000..3dc54b78ccb
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0c_vmTrace.json
@@ -0,0 +1,128 @@
+{
+  "comment" : "'Sequential memory modifications with MSTORE8.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0070000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x600160025360036004536001600553",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x01",
+              "off" : 2
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16756184
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x03",
+              "off" : 4
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756181
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756178
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16756175
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x01",
+              "off" : 5
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756172
+          },
+          "pc" : 14,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0d_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0d_stateDiff.json
new file mode 100644
index 00000000000..ab806f7e28c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0d_stateDiff.json
@@ -0,0 +1,54 @@
+{
+  "comment" : "'Sequential memory modifications with MSTORE.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0080000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860d5617"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aec3a2"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0d_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0d_trace.json
new file mode 100644
index 00000000000..df9c1f8a028
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0d_trace.json
@@ -0,0 +1,42 @@
+{
+  "comment" : "'Sequential memory modifications with MSTORE.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0080000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0080000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0xf",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0d_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0d_vmTrace.json
new file mode 100644
index 00000000000..29b607ca3b0
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0d_vmTrace.json
@@ -0,0 +1,62 @@
+{
+  "comment" : "'Sequential memory modifications with MSTORE.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0080000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000152",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 1
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 66,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0e_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0e_stateDiff.json
new file mode 100644
index 00000000000..504854216ac
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0e_stateDiff.json
@@ -0,0 +1,171 @@
+{
+  "comment" : "'Increments contract storage 0 by 1', 'Increments contract storage 0 by 1', 'Increments contract storage 0 by 1'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0090000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "stateDiff" ] ], [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0090000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "stateDiff" ] ], [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0090000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x04",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386228af0"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0090000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000000" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000003",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000004"
+              }
+            }
+          }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27998ec9"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x05",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18386228af0",
+              "to" : "0x393f0f18386846342"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0090000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000000" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000004",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000005"
+              }
+            }
+          }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27998ec9",
+              "to" : "0xffffffffffffffffffffffffffffffffd2737b677"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1f",
+              "to" : "0x20"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x06",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18386846342",
+              "to" : "0x393f0f18386e63b94"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0090000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000000" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000006"
+              }
+            }
+          }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd2737b677",
+              "to" : "0xffffffffffffffffffffffffffffffffd26d5de25"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x20",
+              "to" : "0x21"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0e_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0e_trace.json
new file mode 100644
index 00000000000..024022249a7
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0e_trace.json
@@ -0,0 +1,96 @@
+{
+  "comment" : "'Increments contract storage 0 by 1', 'Increments contract storage 0 by 1', 'Increments contract storage 0 by 1'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0090000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "trace" ] ], [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0090000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "trace" ] ], [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0090000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x04",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0090000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x16c6",
+          "output" : "0x04"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x05",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0090000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x16c6",
+          "output" : "0x05"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x06",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0090000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x16c6",
+          "output" : "0x06"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0e_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0e_vmTrace.json
new file mode 100644
index 00000000000..b15bd28f9db
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0e_vmTrace.json
@@ -0,0 +1,435 @@
+{
+  "comment" : "'Increments contract storage 0 by 1', 'Increments contract storage 0 by 1', 'Increments contract storage 0 by 1'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0090000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "vmTrace" ] ], [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0090000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "vmTrace" ] ], [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0090000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x04",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6000546001018060005360005560016000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16755399
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755396
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16755393
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4", "0x4" ],
+            "store" : null,
+            "used" : 16755390
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755387
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x04",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755381
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755378
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x0",
+              "val" : "0x4"
+            },
+            "used" : 16750378
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16750375
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16750372
+          },
+          "pc" : 15,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16750372
+          },
+          "pc" : 17,
+          "sub" : null
+        } ]
+      }
+    }, {
+      "output" : "0x05",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6000546001018060005360005560016000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16755399
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755396
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16755393
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5", "0x5" ],
+            "store" : null,
+            "used" : 16755390
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755387
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x05",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755381
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755378
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x0",
+              "val" : "0x5"
+            },
+            "used" : 16750378
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16750375
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16750372
+          },
+          "pc" : 15,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16750372
+          },
+          "pc" : 17,
+          "sub" : null
+        } ]
+      }
+    }, {
+      "output" : "0x06",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6000546001018060005360005560016000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16755399
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755396
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6" ],
+            "store" : null,
+            "used" : 16755393
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6", "0x6" ],
+            "store" : null,
+            "used" : 16755390
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755387
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x06",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755381
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755378
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x0",
+              "val" : "0x6"
+            },
+            "used" : 16750378
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16750375
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16750372
+          },
+          "pc" : 15,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16750372
+          },
+          "pc" : 17,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0f_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0f_stateDiff.json
new file mode 100644
index 00000000000..fb34b1ae8be
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0f_stateDiff.json
@@ -0,0 +1,93 @@
+{
+  "comment" : "'Log output with LOG1.', 'Log output with LOG2.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x00A0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "stateDiff" ] ], [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x00B0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386101f5b"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27abfa5e"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18386101f5b",
+              "to" : "0x393f0f1838660ecfe"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27abfa5e",
+              "to" : "0xffffffffffffffffffffffffffffffffd275b2cbb"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1f",
+              "to" : "0x20"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0f_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0f_trace.json
new file mode 100644
index 00000000000..19bf162286b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0f_trace.json
@@ -0,0 +1,69 @@
+{
+  "comment" : "'Log output with LOG1.', 'Log output with LOG2.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x00A0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "trace" ] ], [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x00B0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x00a0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x30b",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x00b0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x485",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0f_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0f_vmTrace.json
new file mode 100644
index 00000000000..62b7efd482e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_0f_vmTrace.json
@@ -0,0 +1,199 @@
+{
+  "comment" : "'Log output with LOG1.', 'Log output with LOG2.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x00A0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "vmTrace" ] ], [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x00B0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x608b60045360ff60016004a1",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x8b" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x8b",
+              "off" : 4
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756184
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16756181
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 758,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755423
+          },
+          "pc" : 11,
+          "sub" : null
+        } ]
+      }
+    }, {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x608b60045360aa60ff60016004a2",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x8b" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x8b",
+              "off" : 4
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xaa" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16756184
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756181
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16756178
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 1133,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755045
+          },
+          "pc" : 13,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_10_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_10_stateDiff.json
new file mode 100644
index 00000000000..47de1e00613
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_10_stateDiff.json
@@ -0,0 +1,132 @@
+{
+  "comment" : "'Various exceptional halt cases. Invalid OPCODE (0x1F).', 'Various exceptional halt cases. INSUFFICIENT_STACK_ITEMS.', 'Various exceptional halt cases. INVALID_JUMP_DESTINATION.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x00C0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "stateDiff" ] ], [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x00D0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "stateDiff" ] ], [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x00E0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18474c0a58c"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffc38fb742d"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18474c0a58c",
+              "to" : "0x393f0f18563c0987a"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffc38fb742d",
+              "to" : "0xffffffffffffffffffffffffffffffffb49fb813f"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1f",
+              "to" : "0x20"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18563c0987a",
+              "to" : "0x393f0f18652c08b68"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffb49fb813f",
+              "to" : "0xffffffffffffffffffffffffffffffffa5afb8e51"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x20",
+              "to" : "0x21"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_10_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_10_trace.json
new file mode 100644
index 00000000000..f798460334a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_10_trace.json
@@ -0,0 +1,87 @@
+{
+  "comment" : "'Various exceptional halt cases. Invalid OPCODE (0x1F).', 'Various exceptional halt cases. INSUFFICIENT_STACK_ITEMS.', 'Various exceptional halt cases. INVALID_JUMP_DESTINATION.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x00C0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "trace" ] ], [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x00D0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "trace" ] ], [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x00E0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x00c0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "error" : "Bad instruction",
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x00d0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "error" : "Stack underflow",
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x00e0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "error" : "Bad jump destination",
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_10_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_10_vmTrace.json
new file mode 100644
index 00000000000..b55a260b50e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_10_vmTrace.json
@@ -0,0 +1,97 @@
+{
+  "comment" : "'Various exceptional halt cases. Invalid OPCODE (0x1F).', 'Various exceptional halt cases. INSUFFICIENT_STACK_ITEMS.', 'Various exceptional halt cases. INVALID_JUMP_DESTINATION.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x00C0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "vmTrace" ] ], [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x00D0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "vmTrace" ] ], [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x00E0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60011f",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        } ]
+      }
+    }, {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x600120",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        } ]
+      }
+    }, {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60ff5660016002",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756191
+          },
+          "pc" : 2,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_11_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_11_stateDiff.json
new file mode 100644
index 00000000000..ace5e3c8ae0
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_11_stateDiff.json
@@ -0,0 +1,54 @@
+{
+  "comment" : "'Pushes 1, 2, 3, then SWAP2 and SWAP1.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x00F0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860d5617"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aec3a2"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_11_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_11_trace.json
new file mode 100644
index 00000000000..f6a39a3ea2e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_11_trace.json
@@ -0,0 +1,42 @@
+{
+  "comment" : "'Pushes 1, 2, 3, then SWAP2 and SWAP1.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x00F0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x00f0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0xf",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_11_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_11_vmTrace.json
new file mode 100644
index 00000000000..09fe841269e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_11_vmTrace.json
@@ -0,0 +1,79 @@
+{
+  "comment" : "'Pushes 1, 2, 3, then SWAP2 and SWAP1.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x00F0000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6001600260039190",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16756193
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0x2", "0x1" ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x2" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 7,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_12_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_12_stateDiff.json
new file mode 100644
index 00000000000..871520d665b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_12_stateDiff.json
@@ -0,0 +1,93 @@
+{
+  "comment" : "'Memory Read.', 'Revert.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0100000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "stateDiff" ] ], [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0110000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860d6418"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aeb5a1"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x7d88c1856cc95352",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f183860d6418",
+              "to" : "0x393f0f183865a1592"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27aeb5a1",
+              "to" : "0xffffffffffffffffffffffffffffffffd27620427"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1f",
+              "to" : "0x20"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_12_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_12_trace.json
new file mode 100644
index 00000000000..3f942c46010
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_12_trace.json
@@ -0,0 +1,67 @@
+{
+  "comment" : "'Memory Read.', 'Revert.' Note revertReason has been manually added to the response because OpenEthereum does not include it.",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0100000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "trace" ] ], [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0110000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0100000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x1e",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x7d88c1856cc95352",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0110000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "error" : "Reverted",
+        "revertReason" : "0x7d88c1856cc95352",
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_12_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_12_vmTrace.json
new file mode 100644
index 00000000000..bdceaf57c94
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_12_vmTrace.json
@@ -0,0 +1,228 @@
+{
+  "comment" : "'Memory Read.', 'Revert.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0100000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "vmTrace" ] ], [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0110000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x7f3940be4289e4c3587d88c1856cc95352461992db0a584c281226faefe560b3016000527f14c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e2272dbf884ef3905601052600851",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3940be4289e4c3587d88c1856cc95352461992db0a584c281226faefe560b301" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x3940be4289e4c3587d88c1856cc95352461992db0a584c281226faefe560b301",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e2272dbf884ef3905" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 36,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10" ],
+            "store" : null,
+            "used" : 16756184
+          },
+          "pc" : 69,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x14c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e2272dbf884ef3905",
+              "off" : 16
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756178
+          },
+          "pc" : 71,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x8" ],
+            "store" : null,
+            "used" : 16756175
+          },
+          "pc" : 72,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x7d88c1856cc9535214c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e",
+              "off" : 8
+            },
+            "push" : [ "0x7d88c1856cc9535214c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e" ],
+            "store" : null,
+            "used" : 16756172
+          },
+          "pc" : 74,
+          "sub" : null
+        } ]
+      }
+    }, {
+      "output" : "0x7d88c1856cc95352",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x7f3940be4289e4c3587d88c1856cc95352461992db0a584c281226faefe560b3016000527f14c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e2272dbf884ef390560105260086008fd",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3940be4289e4c3587d88c1856cc95352461992db0a584c281226faefe560b301" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x3940be4289e4c3587d88c1856cc95352461992db0a584c281226faefe560b301",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e2272dbf884ef3905" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 36,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10" ],
+            "store" : null,
+            "used" : 16756184
+          },
+          "pc" : 69,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x14c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e2272dbf884ef3905",
+              "off" : 16
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756178
+          },
+          "pc" : 71,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x8" ],
+            "store" : null,
+            "used" : 16756175
+          },
+          "pc" : 72,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x8" ],
+            "store" : null,
+            "used" : 16756172
+          },
+          "pc" : 74,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756172
+          },
+          "pc" : 76,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_13_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_13_stateDiff.json
new file mode 100644
index 00000000000..c5f2d1abcf8
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_13_stateDiff.json
@@ -0,0 +1,297 @@
+{
+  "comment" : "'Deploy contract that will self-destruct when called.', 'call the prior contract then call log contract 00a0..00.', 'Deploy contract that will self-destruct when called.', 'call the prior contract then callcode log contract 00a0..00.', 'Deploy contract that will self-destruct when called.', 'call the prior contract then delegatecall log contract 00a0..00.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x6004600C60003960046000F3600035FF"
+    }, [ "stateDiff" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x60006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5AF1600060006000600060007300A00000000000000000000000000000000000005AF1"
+    }, [ "stateDiff" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x6004600C60003960046000F3600035FF"
+    }, [ "stateDiff" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x60006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45AF2600060006000600060007300A00000000000000000000000000000000000005AF2"
+    }, [ "stateDiff" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x6004600C60003960046000F3600035FF"
+    }, [ "stateDiff" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65AF460006000600060007300A00000000000000000000000000000000000005AF4"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x600035ff",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f1838685c9c2"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241" : {
+          "balance" : {
+            "+" : "0x0"
+          },
+          "code" : {
+            "+" : "0x600035ff"
+          },
+          "nonce" : {
+            "+" : "0x1"
+          },
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d07946cf17"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f1838685c9c2",
+              "to" : "0x393f0f1838751bedb"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x2a504b5e7ec284aca5b6f49716611237239f0b97" : {
+          "balance" : {
+            "+" : "0x0"
+          },
+          "code" : {
+            "+" : "0x"
+          },
+          "nonce" : {
+            "+" : "0x1"
+          },
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07946cf17",
+              "to" : "0xefffffffffffe28d0787ad9fe"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x18",
+              "to" : "0x19"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x600035ff",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f1838751bedb",
+              "to" : "0x393f0f1838816d5ff"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d0787ad9fe",
+              "to" : "0xefffffffffffe28d077b5c2da"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x19",
+              "to" : "0x1a"
+            }
+          },
+          "storage" : { }
+        },
+        "0xbd2c938b9f6bfc1a66368d08cb44dc3eb2ae27be" : {
+          "balance" : {
+            "+" : "0x0"
+          },
+          "code" : {
+            "+" : "0x600035ff"
+          },
+          "nonce" : {
+            "+" : "0x1"
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f1838816d5ff",
+              "to" : "0x393f0f183889d866a"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d077b5c2da",
+              "to" : "0xefffffffffffe28d0772f126f"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1a",
+              "to" : "0x1b"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x600035ff",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f183889d866a",
+              "to" : "0x393f0f18389629d8e"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d0772f126f",
+              "to" : "0xefffffffffffe28d07669fb4b"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1b",
+              "to" : "0x1c"
+            }
+          },
+          "storage" : { }
+        },
+        "0x8acee021a27779d8e98b9650722676b850b25e11" : {
+          "balance" : {
+            "+" : "0x0"
+          },
+          "code" : {
+            "+" : "0x600035ff"
+          },
+          "nonce" : {
+            "+" : "0x1"
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18389629d8e",
+              "to" : "0x393f0f18389e92307"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07669fb4b",
+              "to" : "0xefffffffffffe28d075e375d2"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1c",
+              "to" : "0x1d"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_13_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_13_trace.json
new file mode 100644
index 00000000000..bc384fceaca
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_13_trace.json
@@ -0,0 +1,287 @@
+{
+  "comment" : "'Deploy contract that will self-destruct when called.', 'call the prior contract then call log contract 00a0..00.', 'Deploy contract that will self-destruct when called.', 'call the prior contract then callcode log contract 00a0..00.', 'Deploy contract that will self-destruct when called.', 'call the prior contract then delegatecall log contract 00a0..00.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x6004600C60003960046000F3600035FF"
+    }, [ "trace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x60006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5AF1600060006000600060007300A00000000000000000000000000000000000005AF1"
+    }, [ "trace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x6004600C60003960046000F3600035FF"
+    }, [ "trace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x60006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45AF2600060006000600060007300A00000000000000000000000000000000000005AF2"
+    }, [ "trace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x6004600C60003960046000F3600035FF"
+    }, [ "trace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65AF460006000600060007300A00000000000000000000000000000000000005AF4"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff300e",
+          "init" : "0x6004600c60003960046000f3600035ff",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "code" : "0x600035ff",
+          "gasUsed" : "0x338"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff2e26",
+          "init" : "0x60006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5af1600060006000600060007300a00000000000000000000000000000000000005af1",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x2a504b5e7ec284aca5b6f49716611237239f0b97",
+          "code" : "0x",
+          "gasUsed" : "0x8ab"
+        },
+        "subtraces" : 2,
+        "traceAddress" : [ ],
+        "type" : "create"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x2a504b5e7ec284aca5b6f49716611237239f0b97",
+          "gas" : "0xfb2ea9",
+          "input" : "0x",
+          "to" : "0x8f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x0",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x2a504b5e7ec284aca5b6f49716611237239f0b97",
+          "gas" : "0xfb2be4",
+          "input" : "0x",
+          "to" : "0x00a0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x30b",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 1 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff300e",
+          "init" : "0x6004600c60003960046000f3600035ff",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0xbd2c938b9f6bfc1a66368d08cb44dc3eb2ae27be",
+          "code" : "0x600035ff",
+          "gasUsed" : "0x338"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff2e26",
+          "init" : "0x60006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45af2600060006000600060007300a00000000000000000000000000000000000005af2",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x2eca6fcfef74e2c8d03fbaf0ff6712314c9bd58b",
+          "code" : "0x",
+          "gasUsed" : "0x1c39"
+        },
+        "subtraces" : 2,
+        "traceAddress" : [ ],
+        "type" : "create"
+      }, {
+        "action" : {
+          "callType" : "callcode",
+          "from" : "0x2eca6fcfef74e2c8d03fbaf0ff6712314c9bd58b",
+          "gas" : "0xfb2ea9",
+          "input" : "0x",
+          "to" : "0x2c2b9c9a4a25e24b174f26114e8926a9f2128fe4",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x138e",
+          "output" : "0x"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "address" : "0x2eca6fcfef74e2c8d03fbaf0ff6712314c9bd58b",
+          "balance" : "0x0",
+          "refundAddress" : "0x0000000000000000000000000000000000000000"
+        },
+        "result" : null,
+        "subtraces" : 0,
+        "traceAddress" : [ 0, 0 ],
+        "type" : "suicide"
+      }, {
+        "action" : {
+          "callType" : "callcode",
+          "from" : "0x2eca6fcfef74e2c8d03fbaf0ff6712314c9bd58b",
+          "gas" : "0xfb18a5",
+          "input" : "0x",
+          "to" : "0x00a0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x30b",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 1 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff300e",
+          "init" : "0x6004600c60003960046000f3600035ff",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x8acee021a27779d8e98b9650722676b850b25e11",
+          "code" : "0x600035ff",
+          "gasUsed" : "0x338"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff2e4e",
+          "init" : "0x600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65af460006000600060007300a00000000000000000000000000000000000005af4",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0xf328c11c4df88d18fcbd30ad38d8b4714f4b33bf",
+          "code" : "0x",
+          "gasUsed" : "0x1c33"
+        },
+        "subtraces" : 2,
+        "traceAddress" : [ ],
+        "type" : "create"
+      }, {
+        "action" : {
+          "callType" : "delegatecall",
+          "from" : "0xf328c11c4df88d18fcbd30ad38d8b4714f4b33bf",
+          "gas" : "0xfb2ed3",
+          "input" : "0x",
+          "to" : "0xfb88de099e13c3ed21f80a7a1e49f8caecf10df6",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x138e",
+          "output" : "0x"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "address" : "0xf328c11c4df88d18fcbd30ad38d8b4714f4b33bf",
+          "balance" : "0x0",
+          "refundAddress" : "0x0000000000000000000000000000000000000000"
+        },
+        "result" : null,
+        "subtraces" : 0,
+        "traceAddress" : [ 0, 0 ],
+        "type" : "suicide"
+      }, {
+        "action" : {
+          "callType" : "delegatecall",
+          "from" : "0xf328c11c4df88d18fcbd30ad38d8b4714f4b33bf",
+          "gas" : "0xfb18d2",
+          "input" : "0x",
+          "to" : "0x00a0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x30b",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 1 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_13_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_13_vmTrace.json
new file mode 100644
index 00000000000..18e8921df57
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_13_vmTrace.json
@@ -0,0 +1,1075 @@
+{
+  "comment" : "'Deploy contract that will self-destruct when called.', 'call the prior contract then call log contract 00a0..00.', 'Deploy contract that will self-destruct when called.', 'call the prior contract then callcode log contract 00a0..00.', 'Deploy contract that will self-destruct when called.', 'call the prior contract then delegatecall log contract 00a0..00.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x6004600C60003960046000F3600035FF"
+    }, [ "vmTrace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x60006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5AF1600060006000600060007300A00000000000000000000000000000000000005AF1"
+    }, [ "vmTrace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x6004600C60003960046000F3600035FF"
+    }, [ "vmTrace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x60006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45AF2600060006000600060007300A00000000000000000000000000000000000005AF2"
+    }, [ "vmTrace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x6004600C60003960046000F3600035FF"
+    }, [ "vmTrace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65AF460006000600060007300A00000000000000000000000000000000000005AF4"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6004600c60003960046000f3600035ff",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723979
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc" ],
+            "store" : null,
+            "used" : 16723976
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723973
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0x600035ff",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723964
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723961
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 11,
+          "sub" : null
+        } ]
+      }
+    }, {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5af1600060006000600060007300a00000000000000000000000000000000000005af1",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723491
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723488
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723485
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723482
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723479
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x8f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f" ],
+            "store" : null,
+            "used" : 16723476
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff2e12" ],
+            "store" : null,
+            "used" : 16723474
+          },
+          "pc" : 31,
+          "sub" : null
+        }, {
+          "cost" : 16462181,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16722774
+          },
+          "pc" : 32,
+          "sub" : {
+            "code" : "0x",
+            "ops" : [ ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16722771
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16722768
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16722765
+          },
+          "pc" : 37,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16722762
+          },
+          "pc" : 39,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16722759
+          },
+          "pc" : 41,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16722756
+          },
+          "pc" : 43,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff2b42" ],
+            "store" : null,
+            "used" : 16722754
+          },
+          "pc" : 64,
+          "sub" : null
+        }, {
+          "cost" : 16461472,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16721275
+          },
+          "pc" : 65,
+          "sub" : {
+            "code" : "0x608b60045360ff60016004a1",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x8b" ],
+                "store" : null,
+                "used" : 16460769
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16460766
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 6,
+              "ex" : {
+                "mem" : {
+                  "data" : "0x8b",
+                  "off" : 4
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16460760
+              },
+              "pc" : 4,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xff" ],
+                "store" : null,
+                "used" : 16460757
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16460754
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16460751
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 758,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16459993
+              },
+              "pc" : 11,
+              "sub" : null
+            } ]
+          }
+        } ]
+      }
+    }, {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6004600c60003960046000f3600035ff",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723979
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc" ],
+            "store" : null,
+            "used" : 16723976
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723973
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0x600035ff",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723964
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723961
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 11,
+          "sub" : null
+        } ]
+      }
+    }, {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45af2600060006000600060007300a00000000000000000000000000000000000005af2",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723491
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723488
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723485
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723482
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723479
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2c2b9c9a4a25e24b174f26114e8926a9f2128fe4" ],
+            "store" : null,
+            "used" : 16723476
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff2e12" ],
+            "store" : null,
+            "used" : 16723474
+          },
+          "pc" : 31,
+          "sub" : null
+        }, {
+          "cost" : 16462181,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16717768
+          },
+          "pc" : 32,
+          "sub" : {
+            "code" : "0x600035ff",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16461478
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16461475
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 5000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16456475
+              },
+              "pc" : 3,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717765
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717762
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717759
+          },
+          "pc" : 37,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717756
+          },
+          "pc" : 39,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717753
+          },
+          "pc" : 41,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16717750
+          },
+          "pc" : 43,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff17b4" ],
+            "store" : null,
+            "used" : 16717748
+          },
+          "pc" : 64,
+          "sub" : null
+        }, {
+          "cost" : 16456545,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16716269
+          },
+          "pc" : 65,
+          "sub" : {
+            "code" : "0x608b60045360ff60016004a1",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x8b" ],
+                "store" : null,
+                "used" : 16455842
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16455839
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 6,
+              "ex" : {
+                "mem" : {
+                  "data" : "0x8b",
+                  "off" : 4
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16455833
+              },
+              "pc" : 4,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xff" ],
+                "store" : null,
+                "used" : 16455830
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16455827
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16455824
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 758,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16455066
+              },
+              "pc" : 11,
+              "sub" : null
+            } ]
+          }
+        } ]
+      }
+    }, {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6004600c60003960046000f3600035ff",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723979
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc" ],
+            "store" : null,
+            "used" : 16723976
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723973
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0x600035ff",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723964
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723961
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 11,
+          "sub" : null
+        } ]
+      }
+    }, {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65af460006000600060007300a00000000000000000000000000000000000005af4",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723531
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723528
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723525
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723522
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xfb88de099e13c3ed21f80a7a1e49f8caecf10df6" ],
+            "store" : null,
+            "used" : 16723519
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff2e3d" ],
+            "store" : null,
+            "used" : 16723517
+          },
+          "pc" : 29,
+          "sub" : null
+        }, {
+          "cost" : 16462223,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16717811
+          },
+          "pc" : 30,
+          "sub" : {
+            "code" : "0x600035ff",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16461520
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16461517
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 5000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16456517
+              },
+              "pc" : 3,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717808
+          },
+          "pc" : 31,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717805
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717802
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717799
+          },
+          "pc" : 37,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16717796
+          },
+          "pc" : 39,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff17e2" ],
+            "store" : null,
+            "used" : 16717794
+          },
+          "pc" : 60,
+          "sub" : null
+        }, {
+          "cost" : 16456590,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16716315
+          },
+          "pc" : 61,
+          "sub" : {
+            "code" : "0x608b60045360ff60016004a1",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x8b" ],
+                "store" : null,
+                "used" : 16455887
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16455884
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 6,
+              "ex" : {
+                "mem" : {
+                  "data" : "0x8b",
+                  "off" : 4
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16455878
+              },
+              "pc" : 4,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xff" ],
+                "store" : null,
+                "used" : 16455875
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16455872
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16455869
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 758,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16455111
+              },
+              "pc" : 11,
+              "sub" : null
+            } ]
+          }
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_14_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_14_stateDiff.json
new file mode 100644
index 00000000000..22fa37ff976
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_14_stateDiff.json
@@ -0,0 +1,148 @@
+{
+  "comment" : "'CREATE', 'CREATE2'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0130000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "stateDiff" ] ], [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0140000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183872aa988"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0130000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1",
+              "to" : "0x2"
+            }
+          },
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000000" : {
+              "*" : {
+                "from" : "0x000000000000000000000000aac0627078c038eb3d06e04b57d020fe212be97d",
+                "to" : "0x0000000000000000000000002e615edd62acdfeb8ce3270b30fb36f0dbb8779d"
+              }
+            }
+          }
+        },
+        "0x2e615edd62acdfeb8ce3270b30fb36f0dbb8779d" : {
+          "balance" : {
+            "+" : "0x0"
+          },
+          "code" : {
+            "+" : "0xffff"
+          },
+          "nonce" : {
+            "+" : "0x1"
+          },
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "+" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "+" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+            }
+          }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd26917031"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f183872aa988",
+              "to" : "0x393f0f184724d2d46"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0140000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1",
+              "to" : "0x2"
+            }
+          },
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000000" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000deea5bd06fb86553643c1e94a2f5aac632b9ec9",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000000"
+              }
+            }
+          }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd26917031",
+              "to" : "0xffffffffffffffffffffffffffffffffc3b6eec73"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1f",
+              "to" : "0x20"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_14_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_14_trace.json
new file mode 100644
index 00000000000..01331d70917
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_14_trace.json
@@ -0,0 +1,95 @@
+{
+  "comment" : "'CREATE', 'CREATE2'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0130000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "trace" ] ], [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0140000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0130000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x131ae",
+          "output" : "0x"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "from" : "0x0130000000000000000000000000000000000000",
+          "gas" : "0xfb3412",
+          "init" : "0x600160015560015460025561ffff6000526002601ef3",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x2e615edd62acdfeb8ce3270b30fb36f0dbb8779d",
+          "code" : "0xffff",
+          "gasUsed" : "0xa10e"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0140000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0xfbc4b2",
+          "output" : "0x"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "from" : "0x0140000000000000000000000000000000000000",
+          "gas" : "0xfb3409",
+          "init" : "0x600160015560015460025560ff60005360016000f3",
+          "value" : "0x0"
+        },
+        "error" : "Out of gas",
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_14_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_14_vmTrace.json
new file mode 100644
index 00000000000..43e18dac3a4
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_14_vmTrace.json
@@ -0,0 +1,410 @@
+{
+  "comment" : "'CREATE', 'CREATE2'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0130000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "vmTrace" ] ], [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0140000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x75600160015560015460025561ffff6000526002601ef36000526016600a6000f060005500",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x600160015560015460025561ffff6000526002601ef3" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 23,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x00000000000000000000600160015560015460025561ffff6000526002601ef3",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 25,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x16" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 26,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa" ],
+            "store" : null,
+            "used" : 16756184
+          },
+          "pc" : 28,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756181
+          },
+          "pc" : 30,
+          "sub" : null
+        }, {
+          "cost" : 16494866,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2e615edd62acdfeb8ce3270b30fb36f0dbb8779d" ],
+            "store" : null,
+            "used" : 16682951
+          },
+          "pc" : 32,
+          "sub" : {
+            "code" : "0x600160015560015460025561ffff6000526002601ef3",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16462863
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16462860
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x1"
+                },
+                "used" : 16442860
+              },
+              "pc" : 4,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16442857
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 800,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16442057
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16442054
+              },
+              "pc" : 8,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x2",
+                  "val" : "0x1"
+                },
+                "used" : 16422054
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xffff" ],
+                "store" : null,
+                "used" : 16422051
+              },
+              "pc" : 11,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16422048
+              },
+              "pc" : 14,
+              "sub" : null
+            }, {
+              "cost" : 6,
+              "ex" : {
+                "mem" : {
+                  "data" : "0x000000000000000000000000000000000000000000000000000000000000ffff",
+                  "off" : 0
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16422042
+              },
+              "pc" : 16,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16422039
+              },
+              "pc" : 17,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1e" ],
+                "store" : null,
+                "used" : 16422036
+              },
+              "pc" : 19,
+              "sub" : null
+            }, {
+              "cost" : 0,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16422036
+              },
+              "pc" : 21,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16682948
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x0",
+              "val" : "0x2e615edd62acdfeb8ce3270b30fb36f0dbb8779d"
+            },
+            "used" : 16677948
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16677948
+          },
+          "pc" : 36,
+          "sub" : null
+        } ]
+      }
+    }, {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x74600160015560015460025560ff60005360016000f360005260006015600b6000f560005500",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x600160015560015460025560ff60005360016000f3" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000600160015560015460025560ff60005360016000f3",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 25,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x15" ],
+            "store" : null,
+            "used" : 16756184
+          },
+          "pc" : 27,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb" ],
+            "store" : null,
+            "used" : 16756181
+          },
+          "pc" : 29,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756178
+          },
+          "pc" : 31,
+          "sub" : null
+        }, {
+          "cost" : 16494863,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 261315
+          },
+          "pc" : 33,
+          "sub" : {
+            "code" : "0x600160015560015460025560ff60005360016000f3",
+            "ops" : [ ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 261312
+          },
+          "pc" : 34,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x0",
+              "val" : "0x0"
+            },
+            "used" : 256312
+          },
+          "pc" : 36,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 256312
+          },
+          "pc" : 37,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_15_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_15_stateDiff.json
new file mode 100644
index 00000000000..12c2f247949
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_15_stateDiff.json
@@ -0,0 +1,239 @@
+{
+  "comment" : "'Set contract storage (key,value)'s: (1,1),(2,2)', 'Set contract storage (key,value)'s: (1,3),(2,4)', 'Set contract storage (key,value)'s: (1,3),(1,0)', 'Clear contract storage keys 1 and 2'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002"
+    }, [ "stateDiff" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004"
+    }, [ "stateDiff" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000"
+    }, [ "stateDiff" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386a499b1"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0010000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+              }
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000002"
+              }
+            }
+          }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d07927ff28"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18386a499b1",
+              "to" : "0x393f0f183871b18f4"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0010000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000003"
+              }
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000002",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000004"
+              }
+            }
+          }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07927ff28",
+              "to" : "0xefffffffffffe28d078b17fe5"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x18",
+              "to" : "0x19"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f183871b18f4",
+              "to" : "0x393f0f183874eaae7"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0010000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000003",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000000"
+              }
+            }
+          }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d078b17fe5",
+              "to" : "0xefffffffffffe28d0787dedf2"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x19",
+              "to" : "0x1a"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f183874eaae7",
+              "to" : "0x393f0f18387823740"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0010000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000004",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000000"
+              }
+            }
+          }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d0787dedf2",
+              "to" : "0xefffffffffffe28d0784a6199"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1a",
+              "to" : "0x1b"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_15_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_15_trace.json
new file mode 100644
index 00000000000..7b65298f678
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_15_trace.json
@@ -0,0 +1,191 @@
+{
+  "comment" : "'Set contract storage (key,value)'s: (1,1),(2,2)', 'Set contract storage (key,value)'s: (1,3),(2,4)', 'Set contract storage (key,value)'s: (1,3),(1,0)', 'Clear contract storage keys 1 and 2'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002"
+    }, [ "trace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004"
+    }, [ "trace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000"
+    }, [ "trace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab2e",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9f59",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfba993",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9c58",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab2e",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x2a29",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfba993",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x2728",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab3a",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x19c1",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfba99f",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x16c0",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab46",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x19c1",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfba9aa",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x16c0",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_15_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_15_vmTrace.json
new file mode 100644
index 00000000000..6f8c5a7991c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_15_vmTrace.json
@@ -0,0 +1,1255 @@
+{
+  "comment" : "'Set contract storage (key,value)'s: (1,1),(2,2)', 'Set contract storage (key,value)'s: (1,3),(2,4)', 'Set contract storage (key,value)'s: (1,3),(1,0)', 'Clear contract storage keys 1 and 2'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002"
+    }, [ "vmTrace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004"
+    }, [ "vmTrace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000"
+    }, [ "vmTrace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755499
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755496
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755493
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755491
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755488
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755485
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755482
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755479
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755452
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755449
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755447
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755444
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755441
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffaaef" ],
+            "store" : null,
+            "used" : 16755439
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16493647,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16714715
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492944
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492941
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492938
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492935
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x1"
+                },
+                "used" : 16472935
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16472932
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16472929
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16472926
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16472923
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x2",
+                  "val" : "0x2"
+                },
+                "used" : 16452923
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16714712
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16714709
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16714709
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    }, {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755499
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755496
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755493
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755491
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755488
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755485
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755482
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755479
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755452
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755449
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755447
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755444
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755441
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffaaef" ],
+            "store" : null,
+            "used" : 16755439
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16493647,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16744715
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492944
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x3" ],
+                "store" : null,
+                "used" : 16492941
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492938
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492935
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 5000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x3"
+                },
+                "used" : 16487935
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16487932
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16487929
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16487926
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16487923
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 5000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x2",
+                  "val" : "0x4"
+                },
+                "used" : 16482923
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16744712
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16744709
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16744709
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    }, {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755511
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755508
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755505
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755503
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755500
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755497
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755494
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755491
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755464
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755461
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755459
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755456
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755453
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffaafb" ],
+            "store" : null,
+            "used" : 16755451
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16493659,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16748927
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492956
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x3" ],
+                "store" : null,
+                "used" : 16492953
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492950
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492947
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 800,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x3"
+                },
+                "used" : 16492147
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16492144
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492141
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16492138
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492135
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 5000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x0"
+                },
+                "used" : 16487135
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16748924
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16748921
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16748921
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    }, {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755523
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755520
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755517
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755515
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755512
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755509
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755506
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755503
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755476
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755473
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755471
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755468
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755465
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffab07" ],
+            "store" : null,
+            "used" : 16755463
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16493670,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16748939
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492967
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492964
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492961
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492958
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 800,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x0"
+                },
+                "used" : 16492158
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16492155
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492152
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16492149
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16492146
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 5000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x2",
+                  "val" : "0x0"
+                },
+                "used" : 16487146
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16748936
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16748933
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16748933
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_16_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_16_stateDiff.json
new file mode 100644
index 00000000000..b240e14f18d
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_16_stateDiff.json
@@ -0,0 +1,239 @@
+{
+  "comment" : "'Set contract storage (key,value)'s: (1,1),(2,2)', 'Set contract storage (key,value)'s: (1,3),(2,4)', 'Set contract storage (key,value)'s: (1,3),(1,0)', 'Clear contract storage keys 1 and 2'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002"
+    }, [ "stateDiff" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004"
+    }, [ "stateDiff" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000"
+    }, [ "stateDiff" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386a497d3"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0060000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+              }
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000002"
+              }
+            }
+          }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d079280106"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18386a497d3",
+              "to" : "0x393f0f183871b1538"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0060000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000003"
+              }
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000002",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000004"
+              }
+            }
+          }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d079280106",
+              "to" : "0xefffffffffffe28d078b183a1"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x18",
+              "to" : "0x19"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f183871b1538",
+              "to" : "0x393f0f183874ea63c"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0060000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000003",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000000"
+              }
+            }
+          }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d078b183a1",
+              "to" : "0xefffffffffffe28d0787df29d"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x19",
+              "to" : "0x1a"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f183874ea63c",
+              "to" : "0x393f0f183878231a6"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0060000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000004",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000000"
+              }
+            }
+          }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d0787df29d",
+              "to" : "0xefffffffffffe28d0784a6733"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1a",
+              "to" : "0x1b"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_16_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_16_trace.json
new file mode 100644
index 00000000000..89f2cf407cd
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_16_trace.json
@@ -0,0 +1,191 @@
+{
+  "comment" : "'Set contract storage (key,value)'s: (1,1),(2,2)', 'Set contract storage (key,value)'s: (1,3),(2,4)', 'Set contract storage (key,value)'s: (1,3),(1,0)', 'Clear contract storage keys 1 and 2'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002"
+    }, [ "trace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004"
+    }, [ "trace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000"
+    }, [ "trace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab2e",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to" : "0x0060000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9f57",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "delegatecall",
+          "from" : "0x0060000000000000000000000000000000000000",
+          "gas" : "0xfba995",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9c58",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab2e",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+          "to" : "0x0060000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x2a27",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "delegatecall",
+          "from" : "0x0060000000000000000000000000000000000000",
+          "gas" : "0xfba995",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x2728",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab3a",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0060000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x19bf",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "delegatecall",
+          "from" : "0x0060000000000000000000000000000000000000",
+          "gas" : "0xfba9a0",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x16c0",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab46",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0060000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x19bf",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "delegatecall",
+          "from" : "0x0060000000000000000000000000000000000000",
+          "gas" : "0xfba9ac",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x16c0",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_16_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_16_vmTrace.json
new file mode 100644
index 00000000000..2915b64cf84
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_16_vmTrace.json
@@ -0,0 +1,1215 @@
+{
+  "comment" : "'Set contract storage (key,value)'s: (1,1),(2,2)', 'Set contract storage (key,value)'s: (1,3),(2,4)', 'Set contract storage (key,value)'s: (1,3),(1,0)', 'Clear contract storage keys 1 and 2'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002"
+    }, [ "vmTrace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004"
+    }, [ "vmTrace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000"
+    }, [ "vmTrace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0060000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x602060006020360380602060003760006000355af460206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755499
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755496
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755493
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755491
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755488
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755485
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755482
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755479
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755452
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755449
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755446
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755443
+          },
+          "pc" : 18,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffaaf1" ],
+            "store" : null,
+            "used" : 16755441
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 16493649,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16714717
+          },
+          "pc" : 20,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492946
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492943
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492940
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492937
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x1"
+                },
+                "used" : 16472937
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16472934
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16472931
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16472928
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16472925
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x2",
+                  "val" : "0x2"
+                },
+                "used" : 16452925
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16714714
+          },
+          "pc" : 21,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16714711
+          },
+          "pc" : 23,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16714711
+          },
+          "pc" : 25,
+          "sub" : null
+        } ]
+      }
+    }, {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x602060006020360380602060003760006000355af460206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755499
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755496
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755493
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755491
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755488
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755485
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755482
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755479
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755452
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755449
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755446
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755443
+          },
+          "pc" : 18,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffaaf1" ],
+            "store" : null,
+            "used" : 16755441
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 16493649,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16744717
+          },
+          "pc" : 20,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492946
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x3" ],
+                "store" : null,
+                "used" : 16492943
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492940
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492937
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 5000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x3"
+                },
+                "used" : 16487937
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16487934
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16487931
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16487928
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16487925
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 5000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x2",
+                  "val" : "0x4"
+                },
+                "used" : 16482925
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16744714
+          },
+          "pc" : 21,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16744711
+          },
+          "pc" : 23,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16744711
+          },
+          "pc" : 25,
+          "sub" : null
+        } ]
+      }
+    }, {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x602060006020360380602060003760006000355af460206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755511
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755508
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755505
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755503
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755500
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755497
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755494
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755491
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755464
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755461
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755458
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755455
+          },
+          "pc" : 18,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffaafd" ],
+            "store" : null,
+            "used" : 16755453
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 16493660,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16748929
+          },
+          "pc" : 20,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492957
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x3" ],
+                "store" : null,
+                "used" : 16492954
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492951
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492948
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 800,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x3"
+                },
+                "used" : 16492148
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16492145
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492142
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16492139
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492136
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 5000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x0"
+                },
+                "used" : 16487136
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16748926
+          },
+          "pc" : 21,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16748923
+          },
+          "pc" : 23,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16748923
+          },
+          "pc" : 25,
+          "sub" : null
+        } ]
+      }
+    }, {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x602060006020360380602060003760006000355af460206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755523
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755520
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755517
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755515
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755512
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755509
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755506
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755503
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755476
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755473
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755470
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755467
+          },
+          "pc" : 18,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffab09" ],
+            "store" : null,
+            "used" : 16755465
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 16493672,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16748941
+          },
+          "pc" : 20,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492969
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492966
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492963
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492960
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 800,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x0"
+                },
+                "used" : 16492160
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16492157
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492154
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16492151
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16492148
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 5000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x2",
+                  "val" : "0x0"
+                },
+                "used" : 16487148
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16748938
+          },
+          "pc" : 21,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16748935
+          },
+          "pc" : 23,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16748935
+          },
+          "pc" : 25,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_17_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_17_stateDiff.json
new file mode 100644
index 00000000000..36ee3f40cef
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_17_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "'Proxy call to another contract. Using STATICCALL.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0120000000000000000000000000000000000000",
+      "gas" : "0x30d40",
+      "gasPrice" : "0x1",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18385c10c8b"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d07a0b8c4e"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_17_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_17_trace.json
new file mode 100644
index 00000000000..4b41f985e2b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_17_trace.json
@@ -0,0 +1,59 @@
+{
+  "comment" : "'Proxy call to another contract. Using STATICCALL.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0120000000000000000000000000000000000000",
+      "gas" : "0x30d40",
+      "gasPrice" : "0x1",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0x2b654",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+          "to" : "0x0120000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x301",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000012"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "staticcall",
+          "from" : "0x0120000000000000000000000000000000000000",
+          "gas" : "0x2a88c",
+          "input" : "0x",
+          "to" : "0x0000000000000000000000000000000000000010",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x0",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_17_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_17_vmTrace.json
new file mode 100644
index 00000000000..45bc09bcc6f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_17_vmTrace.json
@@ -0,0 +1,216 @@
+{
+  "comment" : "'Proxy call to another contract. Using STATICCALL.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0120000000000000000000000000000000000000",
+      "gas" : "0x30d40",
+      "gasPrice" : "0x1",
+      "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355afa60206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 177745
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 177742
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 177739
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x94" ],
+            "store" : null,
+            "used" : 177737
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x74" ],
+            "store" : null,
+            "used" : 177734
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x74", "0x74" ],
+            "store" : null,
+            "used" : 177731
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 177728
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 177725
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 177698
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 177695
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 177693
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 177690
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10" ],
+            "store" : null,
+            "used" : 177687
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2b615" ],
+            "store" : null,
+            "used" : 177685
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 174920,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 176985
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x",
+            "ops" : [ ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 176982
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 176979
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 176979
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_18_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_18_stateDiff.json
new file mode 100644
index 00000000000..abc60bea2e0
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_18_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "'Proxy call to another contract - several levels deep. Using CALL and STATICCALL.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183861b6429"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27a0b590"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_18_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_18_trace.json
new file mode 100644
index 00000000000..c26b04ed237
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_18_trace.json
@@ -0,0 +1,91 @@
+{
+  "comment" : "'Proxy call to another contract - several levels deep. Using CALL and STATICCALL.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffa7e2",
+          "input" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x915",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000012"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfba648",
+          "input" : "0x00000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x608",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000012"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xf7b4ba",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+          "to" : "0x0120000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x301",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000012"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ 0, 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "staticcall",
+          "from" : "0x0120000000000000000000000000000000000000",
+          "gas" : "0xf3d2f9",
+          "input" : "0x",
+          "to" : "0x0000000000000000000000000000000000000010",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x0",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0, 0, 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_18_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_18_vmTrace.json
new file mode 100644
index 00000000000..1b7ed56bbc6
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_18_vmTrace.json
@@ -0,0 +1,594 @@
+{
+  "comment" : "'Proxy call to another contract - several levels deep. Using CALL and STATICCALL.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16754655
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754652
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16754649
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xd4" ],
+            "store" : null,
+            "used" : 16754647
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb4" ],
+            "store" : null,
+            "used" : 16754644
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb4", "0xb4" ],
+            "store" : null,
+            "used" : 16754641
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16754638
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754635
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 39,
+          "ex" : {
+            "mem" : {
+              "data" : "0x00000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16754596
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754593
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754591
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754588
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16754585
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffa797" ],
+            "store" : null,
+            "used" : 16754583
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16492804,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16752339
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492101
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492098
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492095
+              },
+              "pc" : 4,
+              "sub" : null
+            }, {
+              "cost" : 2,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xb4" ],
+                "store" : null,
+                "used" : 16492093
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x94" ],
+                "store" : null,
+                "used" : 16492090
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x94", "0x94" ],
+                "store" : null,
+                "used" : 16492087
+              },
+              "pc" : 8,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492084
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492081
+              },
+              "pc" : 11,
+              "sub" : null
+            }, {
+              "cost" : 33,
+              "ex" : {
+                "mem" : {
+                  "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+                  "off" : 0
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16492048
+              },
+              "pc" : 13,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492045
+              },
+              "pc" : 14,
+              "sub" : null
+            }, {
+              "cost" : 2,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492043
+              },
+              "pc" : 16,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492040
+              },
+              "pc" : 17,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x120000000000000000000000000000000000000" ],
+                "store" : null,
+                "used" : 16492037
+              },
+              "pc" : 19,
+              "sub" : null
+            }, {
+              "cost" : 2,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xfba603" ],
+                "store" : null,
+                "used" : 16492035
+              },
+              "pc" : 20,
+              "sub" : null
+            }, {
+              "cost" : 16234358,
+              "ex" : {
+                "mem" : {
+                  "data" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+                  "off" : 0
+                },
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16490566
+              },
+              "pc" : 21,
+              "sub" : {
+                "code" : "0x60206000602036038060206000376000346000355afa60206000f3",
+                "ops" : [ {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16233655
+                  },
+                  "pc" : 0,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16233652
+                  },
+                  "pc" : 2,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16233649
+                  },
+                  "pc" : 4,
+                  "sub" : null
+                }, {
+                  "cost" : 2,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x94" ],
+                    "store" : null,
+                    "used" : 16233647
+                  },
+                  "pc" : 6,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x74" ],
+                    "store" : null,
+                    "used" : 16233644
+                  },
+                  "pc" : 7,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x74", "0x74" ],
+                    "store" : null,
+                    "used" : 16233641
+                  },
+                  "pc" : 8,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16233638
+                  },
+                  "pc" : 9,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16233635
+                  },
+                  "pc" : 11,
+                  "sub" : null
+                }, {
+                  "cost" : 27,
+                  "ex" : {
+                    "mem" : {
+                      "data" : "0x000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+                      "off" : 0
+                    },
+                    "push" : [ ],
+                    "store" : null,
+                    "used" : 16233608
+                  },
+                  "pc" : 13,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16233605
+                  },
+                  "pc" : 14,
+                  "sub" : null
+                }, {
+                  "cost" : 2,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16233603
+                  },
+                  "pc" : 16,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16233600
+                  },
+                  "pc" : 17,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x10" ],
+                    "store" : null,
+                    "used" : 16233597
+                  },
+                  "pc" : 19,
+                  "sub" : null
+                }, {
+                  "cost" : 2,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0xf7b47b" ],
+                    "store" : null,
+                    "used" : 16233595
+                  },
+                  "pc" : 20,
+                  "sub" : null
+                }, {
+                  "cost" : 15979957,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x1" ],
+                    "store" : null,
+                    "used" : 16232895
+                  },
+                  "pc" : 21,
+                  "sub" : {
+                    "code" : "0x",
+                    "ops" : [ ]
+                  }
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16232892
+                  },
+                  "pc" : 22,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16232889
+                  },
+                  "pc" : 24,
+                  "sub" : null
+                }, {
+                  "cost" : 0,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ ],
+                    "store" : null,
+                    "used" : 16232889
+                  },
+                  "pc" : 26,
+                  "sub" : null
+                } ]
+              }
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16490563
+              },
+              "pc" : 22,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16490560
+              },
+              "pc" : 24,
+              "sub" : null
+            }, {
+              "cost" : 0,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16490560
+              },
+              "pc" : 26,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16752336
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16752333
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16752333
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_19_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_19_stateDiff.json
new file mode 100644
index 00000000000..fb5061ed6e1
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_19_stateDiff.json
@@ -0,0 +1,144 @@
+{
+  "comment" : "'Deploy ERC20 contract', 'Transfert ERC20 tokens (with contract created 0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87)'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e420000000000000000000000000000000000000000000000000000000000"
+    }, [ "stateDiff" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0x23c346000",
+      "data" : "0xa9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea00000"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18398dce1d4"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241" : {
+          "balance" : {
+            "+" : "0x0"
+          },
+          "code" : {
+            "+" : "0x606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029"
+          },
+          "nonce" : {
+            "+" : "0x1"
+          },
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000000" : {
+              "+" : "0x424e420000000000000000000000000000000000000000000000000000000006"
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "+" : "0x424e420000000000000000000000000000000000000000000000000000000006"
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "+" : "0x0000000000000000000000000000000000000000000000000000000000000012"
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000003" : {
+              "+" : "0x000000000000000000000000000000000000000000a56fa5b99019a5c8000000"
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000004" : {
+              "+" : "0x000000000000000000000000627306090abab3a6e1400e9345bc60c78a8bef57"
+            },
+            "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" : {
+              "+" : "0x000000000000000000000000000000000000000000a56fa5b99019a5c8000000"
+            }
+          }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d066efb705"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18398dce1d4",
+              "to" : "0x393f245bb64e921d4"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d066efb705",
+              "to" : "0xefffffffffffcd4989ae37705"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x18",
+              "to" : "0x19"
+            }
+          },
+          "storage" : { }
+        },
+        "0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643" : {
+              "*" : {
+                "from" : "0x00000000000000000000000000000000000000000000003635c9adc5dea00000",
+                "to" : "0x00000000000000000000000000000000000000000000006c6b935b8bbd400000"
+              }
+            },
+            "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" : {
+              "*" : {
+                "from" : "0x000000000000000000000000000000000000000000a56f6f83c66bdfe9600000",
+                "to" : "0x000000000000000000000000000000000000000000a56f394dfcbe1a0ac00000"
+              }
+            }
+          }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_19_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_19_trace.json
new file mode 100644
index 00000000000..de996ab62d8
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_19_trace.json
@@ -0,0 +1,69 @@
+{
+  "comment" : "'Deploy ERC20 contract', 'Transfert ERC20 tokens (with contract created 0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87)'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e420000000000000000000000000000000000000000000000000000000000"
+    }, [ "trace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0x23c346000",
+      "data" : "0xa9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea00000"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xfdc95a",
+          "init" : "0x606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e420000000000000000000000000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "code" : "0x606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029",
+          "gasUsed" : "0x124192"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    }, {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab66",
+          "input" : "0xa9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea00000",
+          "to" : "0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x43aa",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_19_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_19_vmTrace.json
new file mode 100644
index 00000000000..0404d15b88e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_19_vmTrace.json
@@ -0,0 +1,7463 @@
+{
+  "comment" : "'Deploy ERC20 contract', 'Transfert ERC20 tokens (with contract created 0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87)'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e420000000000000000000000000000000000000000000000000000000000"
+    }, [ "vmTrace" ] ], [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0x23c346000",
+      "data" : "0xa9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea00000"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e420000000000000000000000000000000000000000000000000000000000",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16632151
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16632148
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 12,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000060",
+              "off" : 64
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16632136
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16632134
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16632131
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10" ],
+            "store" : null,
+            "used" : 16632128
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16632118
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16632117
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16632114
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000060",
+              "off" : 64
+            },
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16632111
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x16d8" ],
+            "store" : null,
+            "used" : 16632108
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x17d8" ],
+            "store" : null,
+            "used" : 16632106
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16632103
+          },
+          "pc" : 25,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100", "0x100" ],
+            "store" : null,
+            "used" : 16632100
+          },
+          "pc" : 26,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x16d8" ],
+            "store" : null,
+            "used" : 16632097
+          },
+          "pc" : 27,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x100", "0x100", "0x16d8", "0x60" ],
+            "store" : null,
+            "used" : 16632094
+          },
+          "pc" : 31,
+          "sub" : null
+        }, {
+          "cost" : 51,
+          "ex" : {
+            "mem" : {
+              "data" : "0x000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e420000000000000000000000000000000000000000000000000000000000",
+              "off" : 96
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16632043
+          },
+          "pc" : 32,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x100", "0x60" ],
+            "store" : null,
+            "used" : 16632040
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x160" ],
+            "store" : null,
+            "used" : 16632037
+          },
+          "pc" : 34,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16632034
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000160",
+              "off" : 64
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16632031
+          },
+          "pc" : 37,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x60" ],
+            "store" : null,
+            "used" : 16632028
+          },
+          "pc" : 38,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x60" ],
+            "store" : null,
+            "used" : 16632025
+          },
+          "pc" : 39,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x000000000000000000000000000000000000000000a56fa5b99019a5c8000000",
+              "off" : 96
+            },
+            "push" : [ "0xa56fa5b99019a5c8000000" ],
+            "store" : null,
+            "used" : 16632022
+          },
+          "pc" : 40,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0x60" ],
+            "store" : null,
+            "used" : 16632019
+          },
+          "pc" : 41,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16632016
+          },
+          "pc" : 42,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16632013
+          },
+          "pc" : 44,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0xa56fa5b99019a5c8000000" ],
+            "store" : null,
+            "used" : 16632010
+          },
+          "pc" : 45,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0x80", "0x60" ],
+            "store" : null,
+            "used" : 16632007
+          },
+          "pc" : 46,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x80" ],
+            "store" : null,
+            "used" : 16632004
+          },
+          "pc" : 47,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16632001
+          },
+          "pc" : 48,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000080",
+              "off" : 128
+            },
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16631998
+          },
+          "pc" : 49,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x80", "0x80", "0x60" ],
+            "store" : null,
+            "used" : 16631995
+          },
+          "pc" : 50,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xe0" ],
+            "store" : null,
+            "used" : 16631992
+          },
+          "pc" : 51,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xe0", "0x80", "0x60" ],
+            "store" : null,
+            "used" : 16631989
+          },
+          "pc" : 52,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x80" ],
+            "store" : null,
+            "used" : 16631986
+          },
+          "pc" : 53,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16631983
+          },
+          "pc" : 54,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16631980
+          },
+          "pc" : 56,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0", "0xa0" ],
+            "store" : null,
+            "used" : 16631977
+          },
+          "pc" : 57,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+              "off" : 160
+            },
+            "push" : [ "0x12" ],
+            "store" : null,
+            "used" : 16631974
+          },
+          "pc" : 58,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12", "0xa0" ],
+            "store" : null,
+            "used" : 16631971
+          },
+          "pc" : 59,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16631968
+          },
+          "pc" : 60,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc0" ],
+            "store" : null,
+            "used" : 16631965
+          },
+          "pc" : 62,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc0", "0x12" ],
+            "store" : null,
+            "used" : 16631962
+          },
+          "pc" : 63,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12", "0xc0", "0x60" ],
+            "store" : null,
+            "used" : 16631959
+          },
+          "pc" : 64,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0xc0" ],
+            "store" : null,
+            "used" : 16631956
+          },
+          "pc" : 65,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc0", "0xc0" ],
+            "store" : null,
+            "used" : 16631953
+          },
+          "pc" : 66,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x00000000000000000000000000000000000000000000000000000000000000c0",
+              "off" : 192
+            },
+            "push" : [ "0xc0" ],
+            "store" : null,
+            "used" : 16631950
+          },
+          "pc" : 67,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0xc0", "0xc0", "0x60" ],
+            "store" : null,
+            "used" : 16631947
+          },
+          "pc" : 68,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x120" ],
+            "store" : null,
+            "used" : 16631944
+          },
+          "pc" : 69,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x120", "0xc0", "0x60" ],
+            "store" : null,
+            "used" : 16631941
+          },
+          "pc" : 70,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0xc0" ],
+            "store" : null,
+            "used" : 16631938
+          },
+          "pc" : 71,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16631936
+          },
+          "pc" : 72,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16631934
+          },
+          "pc" : 73,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16631933
+          },
+          "pc" : 74,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0xe0", "0x12", "0x120", "0xa56fa5b99019a5c8000000" ],
+            "store" : null,
+            "used" : 16631930
+          },
+          "pc" : 75,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16631927
+          },
+          "pc" : 76,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16631924
+          },
+          "pc" : 78,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16631922
+          },
+          "pc" : 80,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16631919
+          },
+          "pc" : 81,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16631916
+          },
+          "pc" : 102,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16631913
+          },
+          "pc" : 103,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16631910
+          },
+          "pc" : 124,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x627306090abab3a6e1400e9345bc60c78a8bef57", "0x0" ],
+            "store" : null,
+            "used" : 16631907
+          },
+          "pc" : 125,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x000000000000000000000000627306090abab3a6e1400e9345bc60c78a8bef57",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16631904
+          },
+          "pc" : 126,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16631901
+          },
+          "pc" : 127,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16631898
+          },
+          "pc" : 129,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16631895
+          },
+          "pc" : 130,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16631892
+          },
+          "pc" : 131,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16631889
+          },
+          "pc" : 132,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16631886
+          },
+          "pc" : 133,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16631883
+          },
+          "pc" : 135,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16631880
+          },
+          "pc" : 136,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" ],
+            "store" : null,
+            "used" : 16631838
+          },
+          "pc" : 138,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d", "0xa56fa5b99019a5c8000000" ],
+            "store" : null,
+            "used" : 16631835
+          },
+          "pc" : 139,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" ],
+            "store" : null,
+            "used" : 16631832
+          },
+          "pc" : 140,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d",
+              "val" : "0xa56fa5b99019a5c8000000"
+            },
+            "used" : 16611832
+          },
+          "pc" : 141,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16611830
+          },
+          "pc" : 142,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0xe0", "0x12", "0x120", "0xa56fa5b99019a5c8000000" ],
+            "store" : null,
+            "used" : 16611827
+          },
+          "pc" : 143,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16611824
+          },
+          "pc" : 144,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0x3", "0xa56fa5b99019a5c8000000" ],
+            "store" : null,
+            "used" : 16611821
+          },
+          "pc" : 146,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0x3" ],
+            "store" : null,
+            "used" : 16611818
+          },
+          "pc" : 147,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x3",
+              "val" : "0xa56fa5b99019a5c8000000"
+            },
+            "used" : 16591818
+          },
+          "pc" : 148,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16591816
+          },
+          "pc" : 149,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xe0", "0x12", "0x120", "0xe0" ],
+            "store" : null,
+            "used" : 16591813
+          },
+          "pc" : 150,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16591810
+          },
+          "pc" : 151,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0xe0" ],
+            "store" : null,
+            "used" : 16591807
+          },
+          "pc" : 153,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xe0", "0xe0" ],
+            "store" : null,
+            "used" : 16591804
+          },
+          "pc" : 154,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000003",
+              "off" : 224
+            },
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16591801
+          },
+          "pc" : 155,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0xe0" ],
+            "store" : null,
+            "used" : 16591798
+          },
+          "pc" : 156,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16591795
+          },
+          "pc" : 157,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16591792
+          },
+          "pc" : 159,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100", "0x3" ],
+            "store" : null,
+            "used" : 16591789
+          },
+          "pc" : 160,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xad" ],
+            "store" : null,
+            "used" : 16591786
+          },
+          "pc" : 161,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xad", "0x100", "0x3", "0x0" ],
+            "store" : null,
+            "used" : 16591783
+          },
+          "pc" : 165,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x3", "0x100" ],
+            "store" : null,
+            "used" : 16591780
+          },
+          "pc" : 166,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100", "0x3" ],
+            "store" : null,
+            "used" : 16591777
+          },
+          "pc" : 167,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12e" ],
+            "store" : null,
+            "used" : 16591774
+          },
+          "pc" : 168,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16591766
+          },
+          "pc" : 172,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16591765
+          },
+          "pc" : 302,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x100", "0x3", "0x0" ],
+            "store" : null,
+            "used" : 16591762
+          },
+          "pc" : 303,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x0" ],
+            "store" : null,
+            "used" : 16591759
+          },
+          "pc" : 304,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590959
+          },
+          "pc" : 305,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16590956
+          },
+          "pc" : 306,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x1", "0x0" ],
+            "store" : null,
+            "used" : 16590953
+          },
+          "pc" : 308,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16590950
+          },
+          "pc" : 309,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590947
+          },
+          "pc" : 311,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16590944
+          },
+          "pc" : 312,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16590941
+          },
+          "pc" : 313,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16590936
+          },
+          "pc" : 316,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16590933
+          },
+          "pc" : 317,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590930
+          },
+          "pc" : 318,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16590927
+          },
+          "pc" : 319,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2", "0x0" ],
+            "store" : null,
+            "used" : 16590924
+          },
+          "pc" : 321,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590919
+          },
+          "pc" : 322,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x0" ],
+            "store" : null,
+            "used" : 16590916
+          },
+          "pc" : 323,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590913
+          },
+          "pc" : 324,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16590910
+          },
+          "pc" : 326,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16590907
+          },
+          "pc" : 327,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590904
+          },
+          "pc" : 329,
+          "sub" : null
+        }, {
+          "cost" : 36,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16590868
+          },
+          "pc" : 331,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x0" ],
+            "store" : null,
+            "used" : 16590865
+          },
+          "pc" : 332,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f" ],
+            "store" : null,
+            "used" : 16590862
+          },
+          "pc" : 333,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f" ],
+            "store" : null,
+            "used" : 16590859
+          },
+          "pc" : 335,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16590856
+          },
+          "pc" : 336,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x1f" ],
+            "store" : null,
+            "used" : 16590853
+          },
+          "pc" : 338,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590848
+          },
+          "pc" : 339,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x0", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16590845
+          },
+          "pc" : 340,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16590842
+          },
+          "pc" : 341,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x3", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x100" ],
+            "store" : null,
+            "used" : 16590839
+          },
+          "pc" : 342,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x100", "0x3" ],
+            "store" : null,
+            "used" : 16590836
+          },
+          "pc" : 343,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f" ],
+            "store" : null,
+            "used" : 16590833
+          },
+          "pc" : 344,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590830
+          },
+          "pc" : 346,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x171" ],
+            "store" : null,
+            "used" : 16590827
+          },
+          "pc" : 347,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16590817
+          },
+          "pc" : 351,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100", "0x100" ],
+            "store" : null,
+            "used" : 16590814
+          },
+          "pc" : 352,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x424e420000000000000000000000000000000000000000000000000000000000",
+              "off" : 256
+            },
+            "push" : [ "0x424e420000000000000000000000000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16590811
+          },
+          "pc" : 353,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16590808
+          },
+          "pc" : 354,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" ],
+            "store" : null,
+            "used" : 16590805
+          },
+          "pc" : 356,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x424e420000000000000000000000000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16590802
+          },
+          "pc" : 357,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x100", "0x424e420000000000000000000000000000000000000000000000000000000000", "0x3" ],
+            "store" : null,
+            "used" : 16590799
+          },
+          "pc" : 358,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0x3" ],
+            "store" : null,
+            "used" : 16590796
+          },
+          "pc" : 359,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6" ],
+            "store" : null,
+            "used" : 16590793
+          },
+          "pc" : 360,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x424e420000000000000000000000000000000000000000000000000000000006" ],
+            "store" : null,
+            "used" : 16590790
+          },
+          "pc" : 361,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x3", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x100", "0x424e420000000000000000000000000000000000000000000000000000000006", "0x0" ],
+            "store" : null,
+            "used" : 16590787
+          },
+          "pc" : 362,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x0",
+              "val" : "0x424e420000000000000000000000000000000000000000000000000000000006"
+            },
+            "used" : 16570787
+          },
+          "pc" : 363,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1a2" ],
+            "store" : null,
+            "used" : 16570784
+          },
+          "pc" : 364,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570776
+          },
+          "pc" : 368,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570775
+          },
+          "pc" : 418,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570773
+          },
+          "pc" : 419,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x3" ],
+            "store" : null,
+            "used" : 16570770
+          },
+          "pc" : 420,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570768
+          },
+          "pc" : 421,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1b1" ],
+            "store" : null,
+            "used" : 16570765
+          },
+          "pc" : 422,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1b1", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16570762
+          },
+          "pc" : 426,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16570759
+          },
+          "pc" : 427,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1b5" ],
+            "store" : null,
+            "used" : 16570756
+          },
+          "pc" : 428,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570748
+          },
+          "pc" : 432,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570747
+          },
+          "pc" : 437,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1da" ],
+            "store" : null,
+            "used" : 16570744
+          },
+          "pc" : 438,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1da", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16570741
+          },
+          "pc" : 442,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16570738
+          },
+          "pc" : 443,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570737
+          },
+          "pc" : 444,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16570734
+          },
+          "pc" : 445,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16570731
+          },
+          "pc" : 446,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16570728
+          },
+          "pc" : 447,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16570725
+          },
+          "pc" : 448,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1d6" ],
+            "store" : null,
+            "used" : 16570722
+          },
+          "pc" : 449,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570712
+          },
+          "pc" : 453,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570711
+          },
+          "pc" : 470,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570709
+          },
+          "pc" : 471,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x1da" ],
+            "store" : null,
+            "used" : 16570706
+          },
+          "pc" : 472,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570698
+          },
+          "pc" : 473,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570697
+          },
+          "pc" : 474,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x1b1" ],
+            "store" : null,
+            "used" : 16570694
+          },
+          "pc" : 475,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570686
+          },
+          "pc" : 476,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570685
+          },
+          "pc" : 433,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570683
+          },
+          "pc" : 434,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0xad" ],
+            "store" : null,
+            "used" : 16570680
+          },
+          "pc" : 435,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570672
+          },
+          "pc" : 436,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570671
+          },
+          "pc" : 173,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570669
+          },
+          "pc" : 174,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x120", "0x120" ],
+            "store" : null,
+            "used" : 16570666
+          },
+          "pc" : 175,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16570663
+          },
+          "pc" : 176,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x120" ],
+            "store" : null,
+            "used" : 16570660
+          },
+          "pc" : 178,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x120", "0x120" ],
+            "store" : null,
+            "used" : 16570657
+          },
+          "pc" : 179,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000003",
+              "off" : 288
+            },
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16570654
+          },
+          "pc" : 180,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0x120" ],
+            "store" : null,
+            "used" : 16570651
+          },
+          "pc" : 181,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16570648
+          },
+          "pc" : 182,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x140" ],
+            "store" : null,
+            "used" : 16570645
+          },
+          "pc" : 184,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x140", "0x3" ],
+            "store" : null,
+            "used" : 16570642
+          },
+          "pc" : 185,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc6" ],
+            "store" : null,
+            "used" : 16570639
+          },
+          "pc" : 186,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc6", "0x140", "0x3", "0x1" ],
+            "store" : null,
+            "used" : 16570636
+          },
+          "pc" : 190,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x3", "0x140" ],
+            "store" : null,
+            "used" : 16570633
+          },
+          "pc" : 191,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x140", "0x3" ],
+            "store" : null,
+            "used" : 16570630
+          },
+          "pc" : 192,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12e" ],
+            "store" : null,
+            "used" : 16570627
+          },
+          "pc" : 193,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570619
+          },
+          "pc" : 197,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570618
+          },
+          "pc" : 302,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x140", "0x3", "0x1" ],
+            "store" : null,
+            "used" : 16570615
+          },
+          "pc" : 303,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x1" ],
+            "store" : null,
+            "used" : 16570612
+          },
+          "pc" : 304,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569812
+          },
+          "pc" : 305,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16569809
+          },
+          "pc" : 306,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x1", "0x0" ],
+            "store" : null,
+            "used" : 16569806
+          },
+          "pc" : 308,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16569803
+          },
+          "pc" : 309,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569800
+          },
+          "pc" : 311,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16569797
+          },
+          "pc" : 312,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16569794
+          },
+          "pc" : 313,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16569789
+          },
+          "pc" : 316,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16569786
+          },
+          "pc" : 317,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569783
+          },
+          "pc" : 318,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16569780
+          },
+          "pc" : 319,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2", "0x0" ],
+            "store" : null,
+            "used" : 16569777
+          },
+          "pc" : 321,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569772
+          },
+          "pc" : 322,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x1" ],
+            "store" : null,
+            "used" : 16569769
+          },
+          "pc" : 323,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569766
+          },
+          "pc" : 324,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16569763
+          },
+          "pc" : 326,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16569760
+          },
+          "pc" : 327,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569757
+          },
+          "pc" : 329,
+          "sub" : null
+        }, {
+          "cost" : 36,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16569721
+          },
+          "pc" : 331,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x0" ],
+            "store" : null,
+            "used" : 16569718
+          },
+          "pc" : 332,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f" ],
+            "store" : null,
+            "used" : 16569715
+          },
+          "pc" : 333,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f" ],
+            "store" : null,
+            "used" : 16569712
+          },
+          "pc" : 335,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16569709
+          },
+          "pc" : 336,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x1f" ],
+            "store" : null,
+            "used" : 16569706
+          },
+          "pc" : 338,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569701
+          },
+          "pc" : 339,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x0", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16569698
+          },
+          "pc" : 340,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16569695
+          },
+          "pc" : 341,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x3", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x140" ],
+            "store" : null,
+            "used" : 16569692
+          },
+          "pc" : 342,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x140", "0x3" ],
+            "store" : null,
+            "used" : 16569689
+          },
+          "pc" : 343,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f" ],
+            "store" : null,
+            "used" : 16569686
+          },
+          "pc" : 344,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569683
+          },
+          "pc" : 346,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x171" ],
+            "store" : null,
+            "used" : 16569680
+          },
+          "pc" : 347,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16569670
+          },
+          "pc" : 351,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x140", "0x140" ],
+            "store" : null,
+            "used" : 16569667
+          },
+          "pc" : 352,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x424e420000000000000000000000000000000000000000000000000000000000",
+              "off" : 320
+            },
+            "push" : [ "0x424e420000000000000000000000000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16569664
+          },
+          "pc" : 353,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16569661
+          },
+          "pc" : 354,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" ],
+            "store" : null,
+            "used" : 16569658
+          },
+          "pc" : 356,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x424e420000000000000000000000000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16569655
+          },
+          "pc" : 357,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x140", "0x424e420000000000000000000000000000000000000000000000000000000000", "0x3" ],
+            "store" : null,
+            "used" : 16569652
+          },
+          "pc" : 358,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0x3" ],
+            "store" : null,
+            "used" : 16569649
+          },
+          "pc" : 359,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6" ],
+            "store" : null,
+            "used" : 16569646
+          },
+          "pc" : 360,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x424e420000000000000000000000000000000000000000000000000000000006" ],
+            "store" : null,
+            "used" : 16569643
+          },
+          "pc" : 361,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x3", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x140", "0x424e420000000000000000000000000000000000000000000000000000000006", "0x1" ],
+            "store" : null,
+            "used" : 16569640
+          },
+          "pc" : 362,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x1",
+              "val" : "0x424e420000000000000000000000000000000000000000000000000000000006"
+            },
+            "used" : 16549640
+          },
+          "pc" : 363,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1a2" ],
+            "store" : null,
+            "used" : 16549637
+          },
+          "pc" : 364,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549629
+          },
+          "pc" : 368,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549628
+          },
+          "pc" : 418,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549626
+          },
+          "pc" : 419,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x3" ],
+            "store" : null,
+            "used" : 16549623
+          },
+          "pc" : 420,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549621
+          },
+          "pc" : 421,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1b1" ],
+            "store" : null,
+            "used" : 16549618
+          },
+          "pc" : 422,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1b1", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16549615
+          },
+          "pc" : 426,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16549612
+          },
+          "pc" : 427,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1b5" ],
+            "store" : null,
+            "used" : 16549609
+          },
+          "pc" : 428,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549601
+          },
+          "pc" : 432,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549600
+          },
+          "pc" : 437,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1da" ],
+            "store" : null,
+            "used" : 16549597
+          },
+          "pc" : 438,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1da", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16549594
+          },
+          "pc" : 442,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16549591
+          },
+          "pc" : 443,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549590
+          },
+          "pc" : 444,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16549587
+          },
+          "pc" : 445,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16549584
+          },
+          "pc" : 446,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16549581
+          },
+          "pc" : 447,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16549578
+          },
+          "pc" : 448,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1d6" ],
+            "store" : null,
+            "used" : 16549575
+          },
+          "pc" : 449,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549565
+          },
+          "pc" : 453,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549564
+          },
+          "pc" : 470,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549562
+          },
+          "pc" : 471,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x1da" ],
+            "store" : null,
+            "used" : 16549559
+          },
+          "pc" : 472,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549551
+          },
+          "pc" : 473,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549550
+          },
+          "pc" : 474,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x1b1" ],
+            "store" : null,
+            "used" : 16549547
+          },
+          "pc" : 475,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549539
+          },
+          "pc" : 476,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549538
+          },
+          "pc" : 433,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549536
+          },
+          "pc" : 434,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0xc6" ],
+            "store" : null,
+            "used" : 16549533
+          },
+          "pc" : 435,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549525
+          },
+          "pc" : 436,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549524
+          },
+          "pc" : 198,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549522
+          },
+          "pc" : 199,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12", "0x120", "0x12" ],
+            "store" : null,
+            "used" : 16549519
+          },
+          "pc" : 200,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16549516
+          },
+          "pc" : 201,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16549513
+          },
+          "pc" : 203,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16549510
+          },
+          "pc" : 205,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16549500
+          },
+          "pc" : 208,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2", "0x1", "0x2" ],
+            "store" : null,
+            "used" : 16549497
+          },
+          "pc" : 209,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16548697
+          },
+          "pc" : 210,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x0", "0x1" ],
+            "store" : null,
+            "used" : 16548694
+          },
+          "pc" : 211,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16548691
+          },
+          "pc" : 212,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16548686
+          },
+          "pc" : 214,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" ],
+            "store" : null,
+            "used" : 16548683
+          },
+          "pc" : 215,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16548680
+          },
+          "pc" : 216,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x1" ],
+            "store" : null,
+            "used" : 16548677
+          },
+          "pc" : 217,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12", "0x2", "0x0", "0x1", "0x12" ],
+            "store" : null,
+            "used" : 16548674
+          },
+          "pc" : 218,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16548671
+          },
+          "pc" : 219,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12" ],
+            "store" : null,
+            "used" : 16548668
+          },
+          "pc" : 221,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12" ],
+            "store" : null,
+            "used" : 16548663
+          },
+          "pc" : 222,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12" ],
+            "store" : null,
+            "used" : 16548660
+          },
+          "pc" : 223,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12", "0x2" ],
+            "store" : null,
+            "used" : 16548657
+          },
+          "pc" : 224,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x2",
+              "val" : "0x12"
+            },
+            "used" : 16528657
+          },
+          "pc" : 225,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16528655
+          },
+          "pc" : 226,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16528653
+          },
+          "pc" : 227,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16528650
+          },
+          "pc" : 228,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16528647
+          },
+          "pc" : 230,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16528644
+          },
+          "pc" : 232,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16528634
+          },
+          "pc" : 235,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4", "0x1", "0x4" ],
+            "store" : null,
+            "used" : 16528631
+          },
+          "pc" : 236,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16527831
+          },
+          "pc" : 237,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x0", "0x1" ],
+            "store" : null,
+            "used" : 16527828
+          },
+          "pc" : 238,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16527825
+          },
+          "pc" : 239,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16527820
+          },
+          "pc" : 260,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffff0000000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16527817
+          },
+          "pc" : 261,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16527814
+          },
+          "pc" : 262,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x1" ],
+            "store" : null,
+            "used" : 16527811
+          },
+          "pc" : 263,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57", "0x4", "0x0", "0x1", "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16527808
+          },
+          "pc" : 264,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16527805
+          },
+          "pc" : 265,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16527802
+          },
+          "pc" : 286,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16527797
+          },
+          "pc" : 287,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16527794
+          },
+          "pc" : 288,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57", "0x4" ],
+            "store" : null,
+            "used" : 16527791
+          },
+          "pc" : 289,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x4",
+              "val" : "0x627306090abab3a6e1400e9345bc60c78a8bef57"
+            },
+            "used" : 16507791
+          },
+          "pc" : 290,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507789
+          },
+          "pc" : 291,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507788
+          },
+          "pc" : 292,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507786
+          },
+          "pc" : 293,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507784
+          },
+          "pc" : 294,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507782
+          },
+          "pc" : 295,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507780
+          },
+          "pc" : 296,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1dd" ],
+            "store" : null,
+            "used" : 16507777
+          },
+          "pc" : 297,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507769
+          },
+          "pc" : 301,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507768
+          },
+          "pc" : 477,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14eb" ],
+            "store" : null,
+            "used" : 16507765
+          },
+          "pc" : 478,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14eb", "0x14eb" ],
+            "store" : null,
+            "used" : 16507762
+          },
+          "pc" : 481,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1ed" ],
+            "store" : null,
+            "used" : 16507759
+          },
+          "pc" : 482,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16507756
+          },
+          "pc" : 486,
+          "sub" : null
+        }, {
+          "cost" : 1033,
+          "ex" : {
+            "mem" : {
+              "data" : "0x606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16506723
+          },
+          "pc" : 488,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16506720
+          },
+          "pc" : 489,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16506720
+          },
+          "pc" : 491,
+          "sub" : null
+        } ]
+      }
+    }, {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16755555
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16755552
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 12,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000060",
+              "off" : 64
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755540
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x44" ],
+            "store" : null,
+            "used" : 16755538
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755535
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xd9" ],
+            "store" : null,
+            "used" : 16755532
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755522
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755519
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5c" ],
+            "store" : null,
+            "used" : 16755516
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100000000000000000000000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755513
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100000000000000000000000000000000000000000000000000000000", "0xa9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5c" ],
+            "store" : null,
+            "used" : 16755510
+          },
+          "pc" : 44,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755505
+          },
+          "pc" : 45,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffff" ],
+            "store" : null,
+            "used" : 16755502
+          },
+          "pc" : 46,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755499
+          },
+          "pc" : 51,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755496
+          },
+          "pc" : 52,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6fdde03" ],
+            "store" : null,
+            "used" : 16755493
+          },
+          "pc" : 53,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755490
+          },
+          "pc" : 58,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xe2" ],
+            "store" : null,
+            "used" : 16755487
+          },
+          "pc" : 59,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755477
+          },
+          "pc" : 62,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755474
+          },
+          "pc" : 63,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x95ea7b3" ],
+            "store" : null,
+            "used" : 16755471
+          },
+          "pc" : 64,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755468
+          },
+          "pc" : 69,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x171" ],
+            "store" : null,
+            "used" : 16755465
+          },
+          "pc" : 70,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755455
+          },
+          "pc" : 73,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755452
+          },
+          "pc" : 74,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x18160ddd" ],
+            "store" : null,
+            "used" : 16755449
+          },
+          "pc" : 75,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755446
+          },
+          "pc" : 80,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1cb" ],
+            "store" : null,
+            "used" : 16755443
+          },
+          "pc" : 81,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755433
+          },
+          "pc" : 84,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755430
+          },
+          "pc" : 85,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x23b872dd" ],
+            "store" : null,
+            "used" : 16755427
+          },
+          "pc" : 86,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755424
+          },
+          "pc" : 91,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f4" ],
+            "store" : null,
+            "used" : 16755421
+          },
+          "pc" : 92,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755411
+          },
+          "pc" : 95,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755408
+          },
+          "pc" : 96,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x313ce567" ],
+            "store" : null,
+            "used" : 16755405
+          },
+          "pc" : 97,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755402
+          },
+          "pc" : 102,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x26d" ],
+            "store" : null,
+            "used" : 16755399
+          },
+          "pc" : 103,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755389
+          },
+          "pc" : 106,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755386
+          },
+          "pc" : 107,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3bed33ce" ],
+            "store" : null,
+            "used" : 16755383
+          },
+          "pc" : 108,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755380
+          },
+          "pc" : 113,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x29c" ],
+            "store" : null,
+            "used" : 16755377
+          },
+          "pc" : 114,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755367
+          },
+          "pc" : 117,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755364
+          },
+          "pc" : 118,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x42966c68" ],
+            "store" : null,
+            "used" : 16755361
+          },
+          "pc" : 119,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755358
+          },
+          "pc" : 124,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2bf" ],
+            "store" : null,
+            "used" : 16755355
+          },
+          "pc" : 125,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755345
+          },
+          "pc" : 128,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755342
+          },
+          "pc" : 129,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6623fc46" ],
+            "store" : null,
+            "used" : 16755339
+          },
+          "pc" : 130,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755336
+          },
+          "pc" : 135,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2fa" ],
+            "store" : null,
+            "used" : 16755333
+          },
+          "pc" : 136,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755323
+          },
+          "pc" : 139,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755320
+          },
+          "pc" : 140,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x70a08231" ],
+            "store" : null,
+            "used" : 16755317
+          },
+          "pc" : 141,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755314
+          },
+          "pc" : 146,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x335" ],
+            "store" : null,
+            "used" : 16755311
+          },
+          "pc" : 147,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755301
+          },
+          "pc" : 150,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755298
+          },
+          "pc" : 151,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x8da5cb5b" ],
+            "store" : null,
+            "used" : 16755295
+          },
+          "pc" : 152,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755292
+          },
+          "pc" : 157,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x382" ],
+            "store" : null,
+            "used" : 16755289
+          },
+          "pc" : 158,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755279
+          },
+          "pc" : 161,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755276
+          },
+          "pc" : 162,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x95d89b41" ],
+            "store" : null,
+            "used" : 16755273
+          },
+          "pc" : 163,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755270
+          },
+          "pc" : 168,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3d7" ],
+            "store" : null,
+            "used" : 16755267
+          },
+          "pc" : 169,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755257
+          },
+          "pc" : 172,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755254
+          },
+          "pc" : 173,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755251
+          },
+          "pc" : 174,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755248
+          },
+          "pc" : 179,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x466" ],
+            "store" : null,
+            "used" : 16755245
+          },
+          "pc" : 180,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755235
+          },
+          "pc" : 183,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755234
+          },
+          "pc" : 1126,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755232
+          },
+          "pc" : 1127,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755229
+          },
+          "pc" : 1128,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x471" ],
+            "store" : null,
+            "used" : 16755226
+          },
+          "pc" : 1129,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755216
+          },
+          "pc" : 1132,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755215
+          },
+          "pc" : 1137,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4a6" ],
+            "store" : null,
+            "used" : 16755212
+          },
+          "pc" : 1138,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16755209
+          },
+          "pc" : 1141,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4", "0x4" ],
+            "store" : null,
+            "used" : 16755206
+          },
+          "pc" : 1143,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4", "0x4" ],
+            "store" : null,
+            "used" : 16755203
+          },
+          "pc" : 1144,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16755200
+          },
+          "pc" : 1145,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16755197
+          },
+          "pc" : 1146,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16755194
+          },
+          "pc" : 1167,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x4" ],
+            "store" : null,
+            "used" : 16755191
+          },
+          "pc" : 1168,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755188
+          },
+          "pc" : 1169,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x24" ],
+            "store" : null,
+            "used" : 16755185
+          },
+          "pc" : 1171,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x24", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16755182
+          },
+          "pc" : 1172,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x24", "0x4" ],
+            "store" : null,
+            "used" : 16755179
+          },
+          "pc" : 1173,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4", "0x24" ],
+            "store" : null,
+            "used" : 16755176
+          },
+          "pc" : 1174,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x24", "0x24" ],
+            "store" : null,
+            "used" : 16755173
+          },
+          "pc" : 1175,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16755170
+          },
+          "pc" : 1176,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x24" ],
+            "store" : null,
+            "used" : 16755167
+          },
+          "pc" : 1177,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755164
+          },
+          "pc" : 1178,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x44" ],
+            "store" : null,
+            "used" : 16755161
+          },
+          "pc" : 1180,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x44", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16755158
+          },
+          "pc" : 1181,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x44", "0x4" ],
+            "store" : null,
+            "used" : 16755155
+          },
+          "pc" : 1182,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4", "0x44" ],
+            "store" : null,
+            "used" : 16755152
+          },
+          "pc" : 1183,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755150
+          },
+          "pc" : 1184,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755148
+          },
+          "pc" : 1185,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xfd2" ],
+            "store" : null,
+            "used" : 16755145
+          },
+          "pc" : 1186,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755137
+          },
+          "pc" : 1189,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755136
+          },
+          "pc" : 4050,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755133
+          },
+          "pc" : 4051,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x3635c9adc5dea00000", "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16755130
+          },
+          "pc" : 4053,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16755127
+          },
+          "pc" : 4054,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16755124
+          },
+          "pc" : 4075,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755121
+          },
+          "pc" : 4076,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755118
+          },
+          "pc" : 4077,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff6" ],
+            "store" : null,
+            "used" : 16755115
+          },
+          "pc" : 4078,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755105
+          },
+          "pc" : 4081,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755104
+          },
+          "pc" : 4086,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755101
+          },
+          "pc" : 4087,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x0", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16755098
+          },
+          "pc" : 4089,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755095
+          },
+          "pc" : 4090,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755092
+          },
+          "pc" : 4091,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755089
+          },
+          "pc" : 4092,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1005" ],
+            "store" : null,
+            "used" : 16755086
+          },
+          "pc" : 4093,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755076
+          },
+          "pc" : 4096,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755075
+          },
+          "pc" : 4101,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16755072
+          },
+          "pc" : 4102,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16755069
+          },
+          "pc" : 4103,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755066
+          },
+          "pc" : 4105,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16755064
+          },
+          "pc" : 4107,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16755061
+          },
+          "pc" : 4108,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16755058
+          },
+          "pc" : 4129,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16755055
+          },
+          "pc" : 4130,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16755052
+          },
+          "pc" : 4151,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x627306090abab3a6e1400e9345bc60c78a8bef57", "0x0" ],
+            "store" : null,
+            "used" : 16755049
+          },
+          "pc" : 4152,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x000000000000000000000000627306090abab3a6e1400e9345bc60c78a8bef57",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755046
+          },
+          "pc" : 4153,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755043
+          },
+          "pc" : 4154,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755040
+          },
+          "pc" : 4156,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16755037
+          },
+          "pc" : 4157,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16755034
+          },
+          "pc" : 4158,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755031
+          },
+          "pc" : 4159,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755028
+          },
+          "pc" : 4160,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16755025
+          },
+          "pc" : 4162,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755022
+          },
+          "pc" : 4163,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" ],
+            "store" : null,
+            "used" : 16754980
+          },
+          "pc" : 4165,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f6f83c66bdfe9600000" ],
+            "store" : null,
+            "used" : 16754180
+          },
+          "pc" : 4166,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754177
+          },
+          "pc" : 4167,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16754174
+          },
+          "pc" : 4168,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1051" ],
+            "store" : null,
+            "used" : 16754171
+          },
+          "pc" : 4169,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16754161
+          },
+          "pc" : 4172,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16754160
+          },
+          "pc" : 4177,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16754157
+          },
+          "pc" : 4178,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754154
+          },
+          "pc" : 4180,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x3635c9adc5dea00000", "0x5", "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16754151
+          },
+          "pc" : 4182,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16754148
+          },
+          "pc" : 4183,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16754145
+          },
+          "pc" : 4204,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16754142
+          },
+          "pc" : 4205,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16754139
+          },
+          "pc" : 4226,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x0" ],
+            "store" : null,
+            "used" : 16754136
+          },
+          "pc" : 4227,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16754133
+          },
+          "pc" : 4228,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16754130
+          },
+          "pc" : 4229,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16754127
+          },
+          "pc" : 4231,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16754124
+          },
+          "pc" : 4232,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16754121
+          },
+          "pc" : 4233,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16754118
+          },
+          "pc" : 4234,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16754115
+          },
+          "pc" : 4235,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16754112
+          },
+          "pc" : 4237,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754109
+          },
+          "pc" : 4238,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643" ],
+            "store" : null,
+            "used" : 16754067
+          },
+          "pc" : 4240,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16753267
+          },
+          "pc" : 4241,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x3635c9adc5dea00000", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16753264
+          },
+          "pc" : 4242,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16753261
+          },
+          "pc" : 4243,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16753258
+          },
+          "pc" : 4245,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x3635c9adc5dea00000", "0x3635c9adc5dea00000", "0x3635c9adc5dea00000", "0x5", "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16753255
+          },
+          "pc" : 4247,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16753252
+          },
+          "pc" : 4248,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16753249
+          },
+          "pc" : 4269,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16753246
+          },
+          "pc" : 4270,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16753243
+          },
+          "pc" : 4291,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x0" ],
+            "store" : null,
+            "used" : 16753240
+          },
+          "pc" : 4292,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16753237
+          },
+          "pc" : 4293,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16753234
+          },
+          "pc" : 4294,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16753231
+          },
+          "pc" : 4296,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16753228
+          },
+          "pc" : 4297,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16753225
+          },
+          "pc" : 4298,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16753222
+          },
+          "pc" : 4299,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16753219
+          },
+          "pc" : 4300,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16753216
+          },
+          "pc" : 4302,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16753213
+          },
+          "pc" : 4303,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643" ],
+            "store" : null,
+            "used" : 16753171
+          },
+          "pc" : 4305,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16752371
+          },
+          "pc" : 4306,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000" ],
+            "store" : null,
+            "used" : 16752368
+          },
+          "pc" : 4307,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16752365
+          },
+          "pc" : 4308,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16752362
+          },
+          "pc" : 4309,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10de" ],
+            "store" : null,
+            "used" : 16752359
+          },
+          "pc" : 4310,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16752349
+          },
+          "pc" : 4313,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16752348
+          },
+          "pc" : 4318,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1127" ],
+            "store" : null,
+            "used" : 16752345
+          },
+          "pc" : 4319,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16752342
+          },
+          "pc" : 4322,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16752339
+          },
+          "pc" : 4324,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16752337
+          },
+          "pc" : 4326,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16752334
+          },
+          "pc" : 4327,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16752331
+          },
+          "pc" : 4348,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16752328
+          },
+          "pc" : 4349,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16752325
+          },
+          "pc" : 4370,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x627306090abab3a6e1400e9345bc60c78a8bef57", "0x0" ],
+            "store" : null,
+            "used" : 16752322
+          },
+          "pc" : 4371,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x000000000000000000000000627306090abab3a6e1400e9345bc60c78a8bef57",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16752319
+          },
+          "pc" : 4372,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16752316
+          },
+          "pc" : 4373,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16752313
+          },
+          "pc" : 4375,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16752310
+          },
+          "pc" : 4376,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16752307
+          },
+          "pc" : 4377,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16752304
+          },
+          "pc" : 4378,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16752301
+          },
+          "pc" : 4379,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16752298
+          },
+          "pc" : 4381,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16752295
+          },
+          "pc" : 4382,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" ],
+            "store" : null,
+            "used" : 16752253
+          },
+          "pc" : 4384,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f6f83c66bdfe9600000" ],
+            "store" : null,
+            "used" : 16751453
+          },
+          "pc" : 4385,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x1127", "0xa56f6f83c66bdfe9600000", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16751450
+          },
+          "pc" : 4386,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x146a" ],
+            "store" : null,
+            "used" : 16751447
+          },
+          "pc" : 4387,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751439
+          },
+          "pc" : 4390,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751438
+          },
+          "pc" : 5226,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16751435
+          },
+          "pc" : 5227,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1478" ],
+            "store" : null,
+            "used" : 16751432
+          },
+          "pc" : 5229,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f6f83c66bdfe9600000", "0x3635c9adc5dea00000", "0x0", "0x1478", "0xa56f6f83c66bdfe9600000" ],
+            "store" : null,
+            "used" : 16751429
+          },
+          "pc" : 5232,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x0", "0x1478", "0xa56f6f83c66bdfe9600000", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16751426
+          },
+          "pc" : 5233,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16751423
+          },
+          "pc" : 5234,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16751420
+          },
+          "pc" : 5235,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14af" ],
+            "store" : null,
+            "used" : 16751417
+          },
+          "pc" : 5236,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751409
+          },
+          "pc" : 5239,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751408
+          },
+          "pc" : 5295,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x1" ],
+            "store" : null,
+            "used" : 16751405
+          },
+          "pc" : 5296,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16751402
+          },
+          "pc" : 5297,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16751399
+          },
+          "pc" : 5298,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14bb" ],
+            "store" : null,
+            "used" : 16751396
+          },
+          "pc" : 5299,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751386
+          },
+          "pc" : 5302,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751385
+          },
+          "pc" : 5307,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751384
+          },
+          "pc" : 5308,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751382
+          },
+          "pc" : 5309,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751374
+          },
+          "pc" : 5310,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751373
+          },
+          "pc" : 5240,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x0", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16751370
+          },
+          "pc" : 5241,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f6f83c66bdfe9600000", "0x3635c9adc5dea00000", "0x0", "0x3635c9adc5dea00000", "0xa56f6f83c66bdfe9600000" ],
+            "store" : null,
+            "used" : 16751367
+          },
+          "pc" : 5242,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f394dfcbe1a0ac00000" ],
+            "store" : null,
+            "used" : 16751364
+          },
+          "pc" : 5243,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f394dfcbe1a0ac00000", "0x0" ],
+            "store" : null,
+            "used" : 16751361
+          },
+          "pc" : 5244,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751359
+          },
+          "pc" : 5245,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751358
+          },
+          "pc" : 5246,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f394dfcbe1a0ac00000", "0xa56f6f83c66bdfe9600000", "0x3635c9adc5dea00000", "0x1127" ],
+            "store" : null,
+            "used" : 16751355
+          },
+          "pc" : 5247,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1127", "0x3635c9adc5dea00000", "0xa56f6f83c66bdfe9600000" ],
+            "store" : null,
+            "used" : 16751352
+          },
+          "pc" : 5248,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751350
+          },
+          "pc" : 5249,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751348
+          },
+          "pc" : 5250,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751340
+          },
+          "pc" : 5251,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751339
+          },
+          "pc" : 4391,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16751336
+          },
+          "pc" : 4392,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16751333
+          },
+          "pc" : 4394,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16751331
+          },
+          "pc" : 4396,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16751328
+          },
+          "pc" : 4397,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16751325
+          },
+          "pc" : 4418,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16751322
+          },
+          "pc" : 4419,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16751319
+          },
+          "pc" : 4440,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x627306090abab3a6e1400e9345bc60c78a8bef57", "0x0" ],
+            "store" : null,
+            "used" : 16751316
+          },
+          "pc" : 4441,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x000000000000000000000000627306090abab3a6e1400e9345bc60c78a8bef57",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751313
+          },
+          "pc" : 4442,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16751310
+          },
+          "pc" : 4443,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16751307
+          },
+          "pc" : 4445,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16751304
+          },
+          "pc" : 4446,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16751301
+          },
+          "pc" : 4447,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751298
+          },
+          "pc" : 4448,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16751295
+          },
+          "pc" : 4449,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16751292
+          },
+          "pc" : 4451,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16751289
+          },
+          "pc" : 4452,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" ],
+            "store" : null,
+            "used" : 16751247
+          },
+          "pc" : 4454,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f394dfcbe1a0ac00000", "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d", "0xa56f394dfcbe1a0ac00000" ],
+            "store" : null,
+            "used" : 16751244
+          },
+          "pc" : 4455,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f394dfcbe1a0ac00000", "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" ],
+            "store" : null,
+            "used" : 16751241
+          },
+          "pc" : 4456,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d",
+              "val" : "0xa56f394dfcbe1a0ac00000"
+            },
+            "used" : 16746241
+          },
+          "pc" : 4457,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16746239
+          },
+          "pc" : 4458,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x11b3" ],
+            "store" : null,
+            "used" : 16746236
+          },
+          "pc" : 4459,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16746233
+          },
+          "pc" : 4462,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16746230
+          },
+          "pc" : 4464,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x3635c9adc5dea00000", "0x11b3", "0x5", "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16746227
+          },
+          "pc" : 4466,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16746224
+          },
+          "pc" : 4467,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16746221
+          },
+          "pc" : 4488,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16746218
+          },
+          "pc" : 4489,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16746215
+          },
+          "pc" : 4510,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x0" ],
+            "store" : null,
+            "used" : 16746212
+          },
+          "pc" : 4511,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16746209
+          },
+          "pc" : 4512,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16746206
+          },
+          "pc" : 4513,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16746203
+          },
+          "pc" : 4515,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16746200
+          },
+          "pc" : 4516,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16746197
+          },
+          "pc" : 4517,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16746194
+          },
+          "pc" : 4518,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16746191
+          },
+          "pc" : 4519,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16746188
+          },
+          "pc" : 4521,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16746185
+          },
+          "pc" : 4522,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643" ],
+            "store" : null,
+            "used" : 16746143
+          },
+          "pc" : 4524,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16745343
+          },
+          "pc" : 4525,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x11b3", "0x3635c9adc5dea00000", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16745340
+          },
+          "pc" : 4526,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1484" ],
+            "store" : null,
+            "used" : 16745337
+          },
+          "pc" : 4527,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745329
+          },
+          "pc" : 4530,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745328
+          },
+          "pc" : 5252,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16745325
+          },
+          "pc" : 5253,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x0" ],
+            "store" : null,
+            "used" : 16745322
+          },
+          "pc" : 5255,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x0", "0x0", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16745319
+          },
+          "pc" : 5256,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x3635c9adc5dea00000", "0x0", "0x0", "0x3635c9adc5dea00000", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16745316
+          },
+          "pc" : 5257,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000" ],
+            "store" : null,
+            "used" : 16745313
+          },
+          "pc" : 5258,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x0" ],
+            "store" : null,
+            "used" : 16745310
+          },
+          "pc" : 5259,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745308
+          },
+          "pc" : 5260,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14a4" ],
+            "store" : null,
+            "used" : 16745305
+          },
+          "pc" : 5261,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x3635c9adc5dea00000", "0x0", "0x6c6b935b8bbd400000", "0x14a4", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16745302
+          },
+          "pc" : 5264,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x14a4", "0x3635c9adc5dea00000", "0x6c6b935b8bbd400000" ],
+            "store" : null,
+            "used" : 16745299
+          },
+          "pc" : 5265,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16745296
+          },
+          "pc" : 5266,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16745293
+          },
+          "pc" : 5267,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x1" ],
+            "store" : null,
+            "used" : 16745290
+          },
+          "pc" : 5268,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16745287
+          },
+          "pc" : 5269,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x149f" ],
+            "store" : null,
+            "used" : 16745284
+          },
+          "pc" : 5270,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745274
+          },
+          "pc" : 5273,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745272
+          },
+          "pc" : 5274,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x0", "0x6c6b935b8bbd400000", "0x14a4", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16745269
+          },
+          "pc" : 5275,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x14a4", "0x3635c9adc5dea00000", "0x6c6b935b8bbd400000" ],
+            "store" : null,
+            "used" : 16745266
+          },
+          "pc" : 5276,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16745263
+          },
+          "pc" : 5277,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16745260
+          },
+          "pc" : 5278,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745259
+          },
+          "pc" : 5279,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14af" ],
+            "store" : null,
+            "used" : 16745256
+          },
+          "pc" : 5280,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745248
+          },
+          "pc" : 5283,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745247
+          },
+          "pc" : 5295,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x1" ],
+            "store" : null,
+            "used" : 16745244
+          },
+          "pc" : 5296,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16745241
+          },
+          "pc" : 5297,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16745238
+          },
+          "pc" : 5298,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14bb" ],
+            "store" : null,
+            "used" : 16745235
+          },
+          "pc" : 5299,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745225
+          },
+          "pc" : 5302,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745224
+          },
+          "pc" : 5307,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745223
+          },
+          "pc" : 5308,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745221
+          },
+          "pc" : 5309,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745213
+          },
+          "pc" : 5310,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745212
+          },
+          "pc" : 5284,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x6c6b935b8bbd400000" ],
+            "store" : null,
+            "used" : 16745209
+          },
+          "pc" : 5285,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x6c6b935b8bbd400000", "0x0" ],
+            "store" : null,
+            "used" : 16745206
+          },
+          "pc" : 5286,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745204
+          },
+          "pc" : 5287,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745203
+          },
+          "pc" : 5288,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745201
+          },
+          "pc" : 5289,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x3635c9adc5dea00000", "0x3635c9adc5dea00000", "0x11b3" ],
+            "store" : null,
+            "used" : 16745198
+          },
+          "pc" : 5290,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x11b3", "0x3635c9adc5dea00000", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16745195
+          },
+          "pc" : 5291,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745193
+          },
+          "pc" : 5292,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745191
+          },
+          "pc" : 5293,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745183
+          },
+          "pc" : 5294,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745182
+          },
+          "pc" : 4531,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16745179
+          },
+          "pc" : 4532,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16745176
+          },
+          "pc" : 4534,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x3635c9adc5dea00000", "0x6c6b935b8bbd400000", "0x5", "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16745173
+          },
+          "pc" : 4536,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16745170
+          },
+          "pc" : 4537,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16745167
+          },
+          "pc" : 4558,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16745164
+          },
+          "pc" : 4559,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16745161
+          },
+          "pc" : 4580,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x0" ],
+            "store" : null,
+            "used" : 16745158
+          },
+          "pc" : 4581,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745155
+          },
+          "pc" : 4582,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16745152
+          },
+          "pc" : 4583,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16745149
+          },
+          "pc" : 4585,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16745146
+          },
+          "pc" : 4586,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16745143
+          },
+          "pc" : 4587,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745140
+          },
+          "pc" : 4588,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16745137
+          },
+          "pc" : 4589,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16745134
+          },
+          "pc" : 4591,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16745131
+          },
+          "pc" : 4592,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643" ],
+            "store" : null,
+            "used" : 16745089
+          },
+          "pc" : 4594,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643", "0x6c6b935b8bbd400000" ],
+            "store" : null,
+            "used" : 16745086
+          },
+          "pc" : 4595,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643" ],
+            "store" : null,
+            "used" : 16745083
+          },
+          "pc" : 4596,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643",
+              "val" : "0x6c6b935b8bbd400000"
+            },
+            "used" : 16740083
+          },
+          "pc" : 4597,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16740081
+          },
+          "pc" : 4598,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x3635c9adc5dea00000", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16740078
+          },
+          "pc" : 4599,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16740075
+          },
+          "pc" : 4600,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16740072
+          },
+          "pc" : 4621,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16740070
+          },
+          "pc" : 4622,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16740067
+          },
+          "pc" : 4623,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16740064
+          },
+          "pc" : 4644,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef" ],
+            "store" : null,
+            "used" : 16740061
+          },
+          "pc" : 4645,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x627306090abab3a6e1400e9345bc60c78a8bef57", "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16740058
+          },
+          "pc" : 4678,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16740055
+          },
+          "pc" : 4679,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000060",
+              "off" : 64
+            },
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16740052
+          },
+          "pc" : 4681,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x60" ],
+            "store" : null,
+            "used" : 16740049
+          },
+          "pc" : 4682,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x60", "0x60", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16740046
+          },
+          "pc" : 4683,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x3635c9adc5dea00000", "0x60" ],
+            "store" : null,
+            "used" : 16740043
+          },
+          "pc" : 4684,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x00000000000000000000000000000000000000000000003635c9adc5dea00000",
+              "off" : 96
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16740037
+          },
+          "pc" : 4685,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16740034
+          },
+          "pc" : 4686,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16740031
+          },
+          "pc" : 4688,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x60", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16740028
+          },
+          "pc" : 4689,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16740026
+          },
+          "pc" : 4690,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16740024
+          },
+          "pc" : 4691,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16740021
+          },
+          "pc" : 4692,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000060",
+              "off" : 64
+            },
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16740018
+          },
+          "pc" : 4694,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x60" ],
+            "store" : null,
+            "used" : 16740015
+          },
+          "pc" : 4695,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x60", "0x80" ],
+            "store" : null,
+            "used" : 16740012
+          },
+          "pc" : 4696,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16740009
+          },
+          "pc" : 4697,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x60" ],
+            "store" : null,
+            "used" : 16740006
+          },
+          "pc" : 4698,
+          "sub" : null
+        }, {
+          "cost" : 1756,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16738250
+          },
+          "pc" : 4699,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16738249
+          },
+          "pc" : 4700,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16738247
+          },
+          "pc" : 4701,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16738245
+          },
+          "pc" : 4702,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16738237
+          },
+          "pc" : 4703,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16738236
+          },
+          "pc" : 1190,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16738236
+          },
+          "pc" : 1191,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1a_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1a_stateDiff.json
new file mode 100644
index 00000000000..f1d405789b5
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1a_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "'Proxy call to another contract - 1 level deep with gas refund.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f1838618847d"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27a3953c"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1a_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1a_trace.json
new file mode 100644
index 00000000000..b33228040d2
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1a_trace.json
@@ -0,0 +1,59 @@
+{
+  "comment" : "'Proxy call to another contract - 1 level deep with gas refund.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffab3a",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x5459",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfba99f",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x5158",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1a_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1a_vmTrace.json
new file mode 100644
index 00000000000..46927ada0b9
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1a_vmTrace.json
@@ -0,0 +1,325 @@
+{
+  "comment" : "'Proxy call to another contract - 1 level deep with gas refund.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0040000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755511
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755508
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755505
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755503
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755500
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755497
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755494
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755491
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755464
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755461
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755459
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755456
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755453
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffaafb" ],
+            "store" : null,
+            "used" : 16755451
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16493659,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16733927
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492956
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x3" ],
+                "store" : null,
+                "used" : 16492953
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492950
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492947
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x3"
+                },
+                "used" : 16472947
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16472944
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16472941
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16472938
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16472935
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 800,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x0"
+                },
+                "used" : 16472135
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16733924
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16733921
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16733921
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1b_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1b_stateDiff.json
new file mode 100644
index 00000000000..5ff6aac1704
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1b_stateDiff.json
@@ -0,0 +1,55 @@
+{
+  "comment" : "'Self destruct and send contract balance to the same address provided in the to field.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0150000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000150000000000000"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860da92e"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27ae708b"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1b_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1b_trace.json
new file mode 100644
index 00000000000..f403cadb596
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1b_trace.json
@@ -0,0 +1,43 @@
+{
+  "comment" : "'Self destruct and send contract balance to the same address provided in the to field.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0150000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000150000000000000"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffad82",
+          "input" : "0x0000000000000000000000000150000000000000",
+          "to" : "0x0150000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x0",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1b_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1b_vmTrace.json
new file mode 100644
index 00000000000..feb0efe800e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1b_vmTrace.json
@@ -0,0 +1,30 @@
+{
+  "comment" : "'Self destruct and send contract balance to the same address provided in the to field.'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0150000000000000000000000000000000000000",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x0000000000000000000000000150000000000000"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x",
+        "ops" : [ ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1c_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1c_stateDiff.json
new file mode 100644
index 00000000000..197cf92cb9e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1c_stateDiff.json
@@ -0,0 +1,54 @@
+{
+  "comment" : "'Self destruct called in constructor with balance being returned to sender (from field)'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183863e8934"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d0798e0fa5"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1c_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1c_trace.json
new file mode 100644
index 00000000000..6608128c62c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1c_trace.json
@@ -0,0 +1,51 @@
+{
+  "comment" : "'Self destruct called in constructor with balance being returned to sender (from field)'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff2f0a",
+          "init" : "0x60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "code" : "0x",
+          "gasUsed" : "0x13a2"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "create"
+      }, {
+        "action" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "balance" : "0x0",
+          "refundAddress" : "0x627306090abab3a6e1400e9345bc60c78a8bef57"
+        },
+        "result" : null,
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "suicide"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1c_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1c_vmTrace.json
new file mode 100644
index 00000000000..7b7084102c7
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1c_vmTrace.json
@@ -0,0 +1,102 @@
+{
+  "comment" : "'Self destruct called in constructor with balance being returned to sender (from field)'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef",
+      "data" : "0x60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16723719
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16723716
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 12,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000080",
+              "off" : 64
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723704
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16723702
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16723699
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16723696
+          },
+          "pc" : 27,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16718696
+          },
+          "pc" : 28,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1d_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1d_stateDiff.json
new file mode 100644
index 00000000000..7d5ce5376e4
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1d_stateDiff.json
@@ -0,0 +1,54 @@
+{
+  "comment" : "'Stack underflow during contract creation'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "gas" : "0x11940",
+      "gasPrice" : "0x1",
+      "data" : "0x6000f1"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18385c1cbde"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27fa4ddb"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1d_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1d_trace.json
new file mode 100644
index 00000000000..5209aa54dc2
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1d_trace.json
@@ -0,0 +1,37 @@
+{
+  "comment" : "'Stack underflow during contract creation'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "gas" : "0x11940",
+      "gasPrice" : "0x1",
+      "data" : "0x6000f1"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0x4a14",
+          "init" : "0x6000f1",
+          "value" : "0x0"
+        },
+        "error" : "Stack underflow",
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1d_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1d_vmTrace.json
new file mode 100644
index 00000000000..f3f607c57d0
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1d_vmTrace.json
@@ -0,0 +1,39 @@
+{
+  "comment" : "'Stack underflow during contract creation'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "gas" : "0x11940",
+      "gasPrice" : "0x1",
+      "data" : "0x6000f1"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6000f1",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 18961
+          },
+          "pc" : 0,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1e_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1e_stateDiff.json
new file mode 100644
index 00000000000..c5abc327c8e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1e_stateDiff.json
@@ -0,0 +1,66 @@
+{
+  "comment" : "'Transaction to test refund_CallToSuicideTwice_d0g0v0_Istanbul'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0xa",
+      "to" : "0x0160000000000000000000000000000000000000",
+      "gas" : "0x989680",
+      "gasPrice" : "0x1",
+      "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18385c111f1"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0160000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xde0b6b3a764000a",
+              "to" : "0xde0b6b3a7640014"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27fb07be"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1e_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1e_trace.json
new file mode 100644
index 00000000000..14208dbd231
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1e_trace.json
@@ -0,0 +1,69 @@
+{
+  "comment" : "'Transaction to test refund_CallToSuicideTwice_d0g0v0_Istanbul'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0xa",
+      "to" : "0x0160000000000000000000000000000000000000",
+      "gas" : "0x989680",
+      "gasPrice" : "0x1",
+      "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0x9843e0",
+          "input" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
+          "to" : "0x0160000000000000000000000000000000000000",
+          "value" : "0xa"
+        },
+        "result" : {
+          "gasUsed" : "0xcb3",
+          "output" : "0x"
+        },
+        "subtraces" : 2,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0160000000000000000000000000000000000000",
+          "gas" : "0x1f4",
+          "input" : "0x",
+          "to" : "0x0170000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "error" : "Out of gas",
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0160000000000000000000000000000000000000",
+          "gas" : "0x1f4",
+          "input" : "0x",
+          "to" : "0x0170000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "error" : "Out of gas",
+        "subtraces" : 0,
+        "traceAddress" : [ 1 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1e_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1e_vmTrace.json
new file mode 100644
index 00000000000..5fb3556acec
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1e_vmTrace.json
@@ -0,0 +1,279 @@
+{
+  "comment" : "'Transaction to test refund_CallToSuicideTwice_d0g0v0_Istanbul'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0xa",
+      "to" : "0x0160000000000000000000000000000000000000",
+      "gas" : "0x989680",
+      "gasPrice" : "0x1",
+      "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60006000600060006000730170000000000000000000000000000000000000600035f160005560006000600060006000730170000000000000000000000000000000000000600035f100",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9978845
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9978842
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9978839
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9978836
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9978833
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x170000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 9978830
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9978827
+          },
+          "pc" : 31,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f4" ],
+            "store" : null,
+            "used" : 9978824
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 1200,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9977624
+          },
+          "pc" : 34,
+          "sub" : {
+            "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff00",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x95e7baea6a6c7c4c2dfeb977efac326af552d87" ],
+                "store" : null,
+                "used" : 497
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 30000,
+              "ex" : null,
+              "pc" : 21,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9977621
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x0",
+              "val" : "0x0"
+            },
+            "used" : 9976821
+          },
+          "pc" : 37,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9976818
+          },
+          "pc" : 38,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9976815
+          },
+          "pc" : 40,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9976812
+          },
+          "pc" : 42,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9976809
+          },
+          "pc" : 44,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9976806
+          },
+          "pc" : 46,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x170000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 9976803
+          },
+          "pc" : 48,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9976800
+          },
+          "pc" : 69,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f4" ],
+            "store" : null,
+            "used" : 9976797
+          },
+          "pc" : 71,
+          "sub" : null
+        }, {
+          "cost" : 1200,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9975597
+          },
+          "pc" : 72,
+          "sub" : {
+            "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff00",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x95e7baea6a6c7c4c2dfeb977efac326af552d87" ],
+                "store" : null,
+                "used" : 497
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 30000,
+              "ex" : null,
+              "pc" : 21,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 9975597
+          },
+          "pc" : 73,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1f_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1f_stateDiff.json
new file mode 100644
index 00000000000..1efa7b96e43
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1f_stateDiff.json
@@ -0,0 +1,54 @@
+{
+  "comment" : "'Call Precompiled contract directly'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0000000000000000000000000000000000000001",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183861838de"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d079b45ffb"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1f_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1f_trace.json
new file mode 100644
index 00000000000..464eef02ec1
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1f_trace.json
@@ -0,0 +1,42 @@
+{
+  "comment" : "'Call Precompiled contract directly'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0000000000000000000000000000000000000001",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0000000000000000000000000000000000000001",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0xbb8",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1f_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1f_vmTrace.json
new file mode 100644
index 00000000000..0297bd9cfe1
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_1f_vmTrace.json
@@ -0,0 +1,29 @@
+{
+  "comment" : "'Call Precompiled contract directly'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+      "value" : "0x0",
+      "to" : "0x0000000000000000000000000000000000000001",
+      "gas" : "0xfffff2",
+      "gasPrice" : "0xef"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x",
+        "ops" : [ ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_20_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_20_stateDiff.json
new file mode 100644
index 00000000000..51a74b4bf55
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_20_stateDiff.json
@@ -0,0 +1,66 @@
+{
+  "comment" : "'Call to a contract creation that fails with a depth of 1'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0180000000000000000000000000000000000000",
+      "gas" : "0x11fa1",
+      "gasPrice" : "0x10",
+      "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18385d298be"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0180000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1",
+              "to" : "0x2"
+            }
+          },
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27e980fb"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_20_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_20_trace.json
new file mode 100644
index 00000000000..5d28ec1cacd
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_20_trace.json
@@ -0,0 +1,54 @@
+{
+  "comment" : "'Call to a contract creation that fails with a depth of 1'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0180000000000000000000000000000000000000",
+      "gas" : "0x11fa1",
+      "gasPrice" : "0x10",
+      "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xcd01",
+          "input" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
+          "to" : "0x0180000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0xcbc2",
+          "output" : "0x"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "from" : "0x0180000000000000000000000000000000000000",
+          "gas" : "0x4eaa",
+          "init" : "0x600c600055602060406000f000",
+          "value" : "0x0"
+        },
+        "error" : "Out of gas",
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_20_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_20_vmTrace.json
new file mode 100644
index 00000000000..d7b26200db1
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_20_vmTrace.json
@@ -0,0 +1,184 @@
+{
+  "comment" : "'Call to a contract creation that fails with a depth of 1'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "to" : "0x0180000000000000000000000000000000000000",
+      "gas" : "0x11fa1",
+      "gasPrice" : "0x10",
+      "data" : "0x000000000000000000000000000000000000000000000000000000000000ea60"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6b600c600055602060406000f0600052600d60146000f000",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x600c600055602060406000f0" ],
+            "store" : null,
+            "used" : 52478
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 52475
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000600c600055602060406000f0",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 52469
+          },
+          "pc" : 15,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xd" ],
+            "store" : null,
+            "used" : 52466
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14" ],
+            "store" : null,
+            "used" : 52463
+          },
+          "pc" : 18,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 52460
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 52141,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 319
+          },
+          "pc" : 22,
+          "sub" : {
+            "code" : "0x600c600055602060406000f000",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xc" ],
+                "store" : null,
+                "used" : 20135
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 20132
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x0",
+                  "val" : "0xc"
+                },
+                "used" : 132
+              },
+              "pc" : 4,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 129
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 126
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 123
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 32009,
+              "ex" : null,
+              "pc" : 11,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 319
+          },
+          "pc" : 23,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_21_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_21_stateDiff.json
new file mode 100644
index 00000000000..f0669e7e8f3
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_21_stateDiff.json
@@ -0,0 +1,54 @@
+{
+  "comment" : "'Call to a contract creation that fails with a stack underflow'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "gas" : "0x47b760",
+      "gasPrice" : "0x1",
+      "data" : "0x602af300"
+    }, [ "stateDiff" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860869fe"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27b3afbb"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_21_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_21_trace.json
new file mode 100644
index 00000000000..cb7eb6668ee
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_21_trace.json
@@ -0,0 +1,37 @@
+{
+  "comment" : "'Call to a contract creation that fails with a stack underflow'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "gas" : "0x47b760",
+      "gasPrice" : "0x1",
+      "data" : "0x602af300"
+    }, [ "trace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0x46e824",
+          "init" : "0x602af300",
+          "value" : "0x0"
+        },
+        "error" : "Stack underflow",
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_21_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_21_vmTrace.json
new file mode 100644
index 00000000000..550520c2f68
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-callMany/trace_callMany_21_vmTrace.json
@@ -0,0 +1,39 @@
+{
+  "comment" : "'Call to a contract creation that fails with a stack underflow'",
+  "request" : {
+    "method" : "trace_callMany",
+    "params" : [ [ [ {
+      "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+      "value" : "0x0",
+      "gas" : "0x47b760",
+      "gasPrice" : "0x1",
+      "data" : "0x602af300"
+    }, [ "vmTrace" ] ] ], "latest" ],
+    "id" : 1,
+    "jsonrpc" : "2.0"
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x602af300",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2a" ],
+            "store" : null,
+            "used" : 4646945
+          },
+          "pc" : 0,
+          "sub" : null
+        } ]
+      }
+    } ],
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_19_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_19_0xfe3_0x000.json
new file mode 100644
index 00000000000..ab8eae2012b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_19_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_19_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_19_0xfe3_all.json
new file mode 100644
index 00000000000..f74492bd5cc
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_19_0xfe3_all.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_19_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_19_all_0x000.json
new file mode 100644
index 00000000000..21504cc39d1
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_19_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 19,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_19_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_19_all_all.json
new file mode 100644
index 00000000000..c8751526fdb
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_19_all_all.json
@@ -0,0 +1,37 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 19
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x234813ec913b10cfa65f22ab7e74310aea08c5f7e1de7f78549f078644ab37b8",
+        "blockNumber": 1,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_2_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_2_0xfe3_0x000.json
new file mode 100644
index 00000000000..e6c77b537fd
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_2_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_2_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_2_0xfe3_all.json
new file mode 100644
index 00000000000..1d8fd2fc01a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_2_0xfe3_all.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_2_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_2_all_0x000.json
new file mode 100644
index 00000000000..d009961e210
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_2_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 2,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_2_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_2_all_all.json
new file mode 100644
index 00000000000..6681996cc01
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_0_count_2_all_all.json
@@ -0,0 +1,37 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 2
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x234813ec913b10cfa65f22ab7e74310aea08c5f7e1de7f78549f078644ab37b8",
+        "blockNumber": 1,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_19_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_19_0xfe3_0x000.json
new file mode 100644
index 00000000000..7a17185568f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_19_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_19_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_19_0xfe3_all.json
new file mode 100644
index 00000000000..ece1f478ea8
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_19_0xfe3_all.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_19_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_19_all_0x000.json
new file mode 100644
index 00000000000..21cd7d57b9f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_19_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 19,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_19_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_19_all_all.json
new file mode 100644
index 00000000000..ef37dd0c8ad
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_19_all_all.json
@@ -0,0 +1,21 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 19
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_2_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_2_0xfe3_0x000.json
new file mode 100644
index 00000000000..ecb0200e0a4
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_2_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_2_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_2_0xfe3_all.json
new file mode 100644
index 00000000000..cb4ec07622b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_2_0xfe3_all.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_2_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_2_all_0x000.json
new file mode 100644
index 00000000000..7e079e4783b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_2_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 2,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_2_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_2_all_all.json
new file mode 100644
index 00000000000..4a7ec42104f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x1_after_2_count_2_all_all.json
@@ -0,0 +1,21 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 2
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_19_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_19_0xfe3_0x000.json
new file mode 100644
index 00000000000..c24d5a4a963
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_19_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_19_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_19_0xfe3_all.json
new file mode 100644
index 00000000000..c7da8cb30a7
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_19_0xfe3_all.json
@@ -0,0 +1,415 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabba",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x9c58",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x4de634fe767d1f6d0512ca0c9c0a054d3a2596f7cdd7c1eea5f93046a740b3c7",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabd2",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcad905f558c932b0dd40ffac69b021569a24388ae5f00e6d91cfe99ca6eb69df",
+        "blockNumber": 5,
+        "result": {
+          "gasUsed": "0x16c0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xdb2cd5e93dedae66371fc4a95452c746e11f7d2097464707597b8807c889ef5b",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad82",
+          "input": "0x0000000000000000000000000000000000000999",
+          "to": "0x0020000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": {
+          "gasUsed": "0x7536",
+          "output": "0x"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad52",
+          "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0030000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xeed85fe57db751442c826cfe4fdf43b10a5c2bc8b6fd3a8ccced48eb3fb35885",
+        "blockNumber": 7,
+        "result": {
+          "gasUsed": "0x1b",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x47f4d445ea1812cb1ddd3464ab23d2bfc6ed408a8a9db1c497f94e8e06e85286",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": {
+          "gasUsed": "0x30a",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0xa29f9d6a4f183f4c22c4857544a9a6b69c48d7bb8a97652be06e50bb69470666",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabae",
+          "input": "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x650cefaa3eae1542dfd6f6fbdee553d743393369887a9dce7b658ca93069fee2",
+        "blockNumber": 9,
+        "result": {
+          "gasUsed": "0x8fa",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x4af0ef28fbfcbdee7cc5925797c1b9030b3848c2f63f92737c3fe76b45582af5",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0050000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xf020928933dc70cc8b6034b6881501cb6cbf57cacd8cfb01ed6b2329e68e7073",
+        "blockNumber": 10,
+        "result": {
+          "gasUsed": "0x30a",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x4ec95b7de430b61fc9a57ed35274fd766b7f5fac5213ab946963eb528deae6b5",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0060000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x61bfd9fcaa09a2a9df0276acce68b5212d42bebab67034aa6603cc6dfbb70db5",
+        "blockNumber": 11,
+        "result": {
+          "gasUsed": "0x308",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x6f77512ee9d43474a884c0703c86712fb98dca772fa6e12252786e3e23f196c1",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0070000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x9ac8374676c21436e676693b9b4162120e946a73625d07c9dd78718054327c87",
+        "blockNumber": 12,
+        "result": {
+          "gasUsed": "0x1e",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x12e4a98e63825852a69d7702202a3b593e4059ec913c479443665d590da18724",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0080000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xfc8c590f4fc52847a23c83df28ca920a6b76e587ba68ce1e85b67a6154be320a",
+        "blockNumber": 13,
+        "result": {
+          "gasUsed": "0xf",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x547c7e2fcdf9f88b03b4f4184d667d6768c669f279785774d0cf42435cab06f1",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0090000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xd8e78c27c182cefe8a1da2fe2980d6e2fd43a2e1db1bd7ff30f1eef79faa277b",
+        "blockNumber": 14,
+        "result": {
+          "gasUsed": "0x515e",
+          "output": "0x01"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xe3ebc73c55176c3f2e72b289f8a9cefbcd5b25dcd205db5661f81b0bb974fa73",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0090000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xd8e78c27c182cefe8a1da2fe2980d6e2fd43a2e1db1bd7ff30f1eef79faa277b",
+        "blockNumber": 14,
+        "result": {
+          "gasUsed": "0x16c6",
+          "output": "0x02"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xb4dc55ca4a7c1f72402860c594efaa7da32035003f8e203b7f6a3cf1826685a5",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0090000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xd8e78c27c182cefe8a1da2fe2980d6e2fd43a2e1db1bd7ff30f1eef79faa277b",
+        "blockNumber": 14,
+        "result": {
+          "gasUsed": "0x16c6",
+          "output": "0x03"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x1a9f6256886437cfa21ee7685dd7a996024bea4d4bf6554b14787a6c9e5b90e6",
+        "transactionPosition": 2,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00a0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x69e9470ef04a4188a806f3474b03001845fd3722f4c7c58589ef7623549f8dc8",
+        "blockNumber": 15,
+        "result": {
+          "gasUsed": "0x30b",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x293cefc718137a74d36a5da204e3617604a9e8dfc79b6a6efb11056b3efd3b4a",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00b0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x69e9470ef04a4188a806f3474b03001845fd3722f4c7c58589ef7623549f8dc8",
+        "blockNumber": 15,
+        "result": {
+          "gasUsed": "0x485",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xb19370be2ace59794ee9bb5a69db98464cd6cb0b02b9afb3b978c9aad2bf5417",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00c0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x7d3d4c1129ebce54739fedf2642ea2cfaeafa48c2c489a11512d95f578f92abc",
+        "blockNumber": 16,
+        "error": "Bad instruction",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x6aed559a5dcf73efa132d8182585c40fdc6ef3b99a7629d80ffd4a62cb3db622",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00d0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x7d3d4c1129ebce54739fedf2642ea2cfaeafa48c2c489a11512d95f578f92abc",
+        "blockNumber": 16,
+        "error": "Stack underflow",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xb39fa8a1cb1db4663dc3733bc014d524e90a862bf2607e028eeb3932d92574fe",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00e0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x7d3d4c1129ebce54739fedf2642ea2cfaeafa48c2c489a11512d95f578f92abc",
+        "blockNumber": 16,
+        "error": "Bad jump destination",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x11a725053a6ece79d8de11cb75dd1f09c40dcd109a1c63573e847ad4f456a296",
+        "transactionPosition": 2,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00f0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xfde8b9bcfdc9f75845f3eb9920107e51844478a09ec430dae2df741200da3058",
+        "blockNumber": 17,
+        "result": {
+          "gasUsed": "0xf",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x93d974a14c784be231a7b580a6476a330e5d6f9ddfef70a6b5cacd9f91a1e495",
+        "transactionPosition": 0,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_19_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_19_all_0x000.json
new file mode 100644
index 00000000000..73418f07ccf
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_19_all_0x000.json
@@ -0,0 +1,46 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 19,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0000000000000000000000000000000000000999",
+          "value": "0x1"
+        },
+        "blockHash": "0xf07e45fae684d31ce732c3026e57c810d4f236261aa39b20017137c348ffac4b",
+        "blockNumber": 2,
+        "result": {
+          "gasUsed": "0x0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x28fa8042c7b5835f4f91fc20937f3e70dcf3585c1afe31202bb6075185f9abfe",
+        "transactionPosition": 0,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_19_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_19_all_all.json
new file mode 100644
index 00000000000..33acd75bc58
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_19_all_all.json
@@ -0,0 +1,371 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 19
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x234813ec913b10cfa65f22ab7e74310aea08c5f7e1de7f78549f078644ab37b8",
+        "blockNumber": 1,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0000000000000000000000000000000000000999",
+          "value": "0x1"
+        },
+        "blockHash": "0xf07e45fae684d31ce732c3026e57c810d4f236261aa39b20017137c348ffac4b",
+        "blockNumber": 2,
+        "result": {
+          "gasUsed": "0x0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x28fa8042c7b5835f4f91fc20937f3e70dcf3585c1afe31202bb6075185f9abfe",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xf07e45fae684d31ce732c3026e57c810d4f236261aa39b20017137c348ffac4b",
+        "blockNumber": 2,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "creationMethod": "create",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xff300e",
+          "init": "0x6004600c60003960046000f3600035ff",
+          "value": "0x0"
+        },
+        "blockHash": "0x47a62e941d567d1d7411b32ff38bdef817357d226a0204c285e8db27b3808554",
+        "blockNumber": 3,
+        "result": {
+          "address": "0xf12b5dd4ead5f743c6baa640b0216200e89b60da",
+          "code": "0x600035ff",
+          "gasUsed": "0x338"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x8d5477f0aae852c3e9487b0f8e7b9ecf9ccdf23d7934d4b4b7eff40c271031e5",
+        "transactionPosition": 0,
+        "type": "create"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x47a62e941d567d1d7411b32ff38bdef817357d226a0204c285e8db27b3808554",
+        "blockNumber": 3,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabba",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x9c58",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x4de634fe767d1f6d0512ca0c9c0a054d3a2596f7cdd7c1eea5f93046a740b3c7",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffabba",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x2728",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xf882ec206292910527fd7095e59a1ca027b873296f1eba3886aa1addc4ff0ab9",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffabc6",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x16c0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x7ca6bf869e8882216f7443accb8d642df41af5bfa3a0e63bf03be2cfe629a030",
+        "transactionPosition": 2,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabd2",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcad905f558c932b0dd40ffac69b021569a24388ae5f00e6d91cfe99ca6eb69df",
+        "blockNumber": 5,
+        "result": {
+          "gasUsed": "0x16c0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xdb2cd5e93dedae66371fc4a95452c746e11f7d2097464707597b8807c889ef5b",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xcad905f558c932b0dd40ffac69b021569a24388ae5f00e6d91cfe99ca6eb69df",
+        "blockNumber": 5,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad82",
+          "input": "0x0000000000000000000000000000000000000999",
+          "to": "0x0020000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": {
+          "gasUsed": "0x7536",
+          "output": "0x"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "address": "0x0020000000000000000000000000000000000000",
+          "balance": "0x300",
+          "refundAddress": "0x0000000000000999000000000000000000000000"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [
+          0
+        ],
+        "transactionHash": "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e",
+        "transactionPosition": 0,
+        "type": "suicide"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad52",
+          "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0030000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xeed85fe57db751442c826cfe4fdf43b10a5c2bc8b6fd3a8ccced48eb3fb35885",
+        "blockNumber": 7,
+        "result": {
+          "gasUsed": "0x1b",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x47f4d445ea1812cb1ddd3464ab23d2bfc6ed408a8a9db1c497f94e8e06e85286",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xeed85fe57db751442c826cfe4fdf43b10a5c2bc8b6fd3a8ccced48eb3fb35885",
+        "blockNumber": 7,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": {
+          "gasUsed": "0x30a",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0xa29f9d6a4f183f4c22c4857544a9a6b69c48d7bb8a97652be06e50bb69470666",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x0040000000000000000000000000000000000000",
+          "gas": "0xfbab36",
+          "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0030000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": {
+          "gasUsed": "0x1b",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 0,
+        "traceAddress": [
+          0
+        ],
+        "transactionHash": "0xa29f9d6a4f183f4c22c4857544a9a6b69c48d7bb8a97652be06e50bb69470666",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_2_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_2_0xfe3_0x000.json
new file mode 100644
index 00000000000..e89792cab07
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_2_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_2_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_2_0xfe3_all.json
new file mode 100644
index 00000000000..c3c1ad7992f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_2_0xfe3_all.json
@@ -0,0 +1,67 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabba",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x9c58",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x4de634fe767d1f6d0512ca0c9c0a054d3a2596f7cdd7c1eea5f93046a740b3c7",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabd2",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcad905f558c932b0dd40ffac69b021569a24388ae5f00e6d91cfe99ca6eb69df",
+        "blockNumber": 5,
+        "result": {
+          "gasUsed": "0x16c0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xdb2cd5e93dedae66371fc4a95452c746e11f7d2097464707597b8807c889ef5b",
+        "transactionPosition": 0,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_2_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_2_all_0x000.json
new file mode 100644
index 00000000000..9e943bb9bb8
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_2_all_0x000.json
@@ -0,0 +1,46 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 2,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0000000000000000000000000000000000000999",
+          "value": "0x1"
+        },
+        "blockHash": "0xf07e45fae684d31ce732c3026e57c810d4f236261aa39b20017137c348ffac4b",
+        "blockNumber": 2,
+        "result": {
+          "gasUsed": "0x0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x28fa8042c7b5835f4f91fc20937f3e70dcf3585c1afe31202bb6075185f9abfe",
+        "transactionPosition": 0,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_2_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_2_all_all.json
new file mode 100644
index 00000000000..4491c9b52de
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_0_count_2_all_all.json
@@ -0,0 +1,58 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 2
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x234813ec913b10cfa65f22ab7e74310aea08c5f7e1de7f78549f078644ab37b8",
+        "blockNumber": 1,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0000000000000000000000000000000000000999",
+          "value": "0x1"
+        },
+        "blockHash": "0xf07e45fae684d31ce732c3026e57c810d4f236261aa39b20017137c348ffac4b",
+        "blockNumber": 2,
+        "result": {
+          "gasUsed": "0x0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x28fa8042c7b5835f4f91fc20937f3e70dcf3585c1afe31202bb6075185f9abfe",
+        "transactionPosition": 0,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_19_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_19_0xfe3_0x000.json
new file mode 100644
index 00000000000..8ccefd8a7d6
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_19_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_19_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_19_0xfe3_all.json
new file mode 100644
index 00000000000..6568000c744
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_19_0xfe3_all.json
@@ -0,0 +1,413 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad82",
+          "input": "0x0000000000000000000000000000000000000999",
+          "to": "0x0020000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": {
+          "gasUsed": "0x7536",
+          "output": "0x"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad52",
+          "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0030000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xeed85fe57db751442c826cfe4fdf43b10a5c2bc8b6fd3a8ccced48eb3fb35885",
+        "blockNumber": 7,
+        "result": {
+          "gasUsed": "0x1b",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x47f4d445ea1812cb1ddd3464ab23d2bfc6ed408a8a9db1c497f94e8e06e85286",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": {
+          "gasUsed": "0x30a",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0xa29f9d6a4f183f4c22c4857544a9a6b69c48d7bb8a97652be06e50bb69470666",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabae",
+          "input": "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x650cefaa3eae1542dfd6f6fbdee553d743393369887a9dce7b658ca93069fee2",
+        "blockNumber": 9,
+        "result": {
+          "gasUsed": "0x8fa",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x4af0ef28fbfcbdee7cc5925797c1b9030b3848c2f63f92737c3fe76b45582af5",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0050000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xf020928933dc70cc8b6034b6881501cb6cbf57cacd8cfb01ed6b2329e68e7073",
+        "blockNumber": 10,
+        "result": {
+          "gasUsed": "0x30a",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x4ec95b7de430b61fc9a57ed35274fd766b7f5fac5213ab946963eb528deae6b5",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0060000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x61bfd9fcaa09a2a9df0276acce68b5212d42bebab67034aa6603cc6dfbb70db5",
+        "blockNumber": 11,
+        "result": {
+          "gasUsed": "0x308",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x6f77512ee9d43474a884c0703c86712fb98dca772fa6e12252786e3e23f196c1",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0070000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x9ac8374676c21436e676693b9b4162120e946a73625d07c9dd78718054327c87",
+        "blockNumber": 12,
+        "result": {
+          "gasUsed": "0x1e",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x12e4a98e63825852a69d7702202a3b593e4059ec913c479443665d590da18724",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0080000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xfc8c590f4fc52847a23c83df28ca920a6b76e587ba68ce1e85b67a6154be320a",
+        "blockNumber": 13,
+        "result": {
+          "gasUsed": "0xf",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x547c7e2fcdf9f88b03b4f4184d667d6768c669f279785774d0cf42435cab06f1",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0090000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xd8e78c27c182cefe8a1da2fe2980d6e2fd43a2e1db1bd7ff30f1eef79faa277b",
+        "blockNumber": 14,
+        "result": {
+          "gasUsed": "0x515e",
+          "output": "0x01"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xe3ebc73c55176c3f2e72b289f8a9cefbcd5b25dcd205db5661f81b0bb974fa73",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0090000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xd8e78c27c182cefe8a1da2fe2980d6e2fd43a2e1db1bd7ff30f1eef79faa277b",
+        "blockNumber": 14,
+        "result": {
+          "gasUsed": "0x16c6",
+          "output": "0x02"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xb4dc55ca4a7c1f72402860c594efaa7da32035003f8e203b7f6a3cf1826685a5",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0090000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xd8e78c27c182cefe8a1da2fe2980d6e2fd43a2e1db1bd7ff30f1eef79faa277b",
+        "blockNumber": 14,
+        "result": {
+          "gasUsed": "0x16c6",
+          "output": "0x03"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x1a9f6256886437cfa21ee7685dd7a996024bea4d4bf6554b14787a6c9e5b90e6",
+        "transactionPosition": 2,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00a0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x69e9470ef04a4188a806f3474b03001845fd3722f4c7c58589ef7623549f8dc8",
+        "blockNumber": 15,
+        "result": {
+          "gasUsed": "0x30b",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x293cefc718137a74d36a5da204e3617604a9e8dfc79b6a6efb11056b3efd3b4a",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00b0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x69e9470ef04a4188a806f3474b03001845fd3722f4c7c58589ef7623549f8dc8",
+        "blockNumber": 15,
+        "result": {
+          "gasUsed": "0x485",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xb19370be2ace59794ee9bb5a69db98464cd6cb0b02b9afb3b978c9aad2bf5417",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00c0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x7d3d4c1129ebce54739fedf2642ea2cfaeafa48c2c489a11512d95f578f92abc",
+        "blockNumber": 16,
+        "error": "Bad instruction",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x6aed559a5dcf73efa132d8182585c40fdc6ef3b99a7629d80ffd4a62cb3db622",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00d0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x7d3d4c1129ebce54739fedf2642ea2cfaeafa48c2c489a11512d95f578f92abc",
+        "blockNumber": 16,
+        "error": "Stack underflow",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xb39fa8a1cb1db4663dc3733bc014d524e90a862bf2607e028eeb3932d92574fe",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00e0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x7d3d4c1129ebce54739fedf2642ea2cfaeafa48c2c489a11512d95f578f92abc",
+        "blockNumber": 16,
+        "error": "Bad jump destination",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x11a725053a6ece79d8de11cb75dd1f09c40dcd109a1c63573e847ad4f456a296",
+        "transactionPosition": 2,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00f0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xfde8b9bcfdc9f75845f3eb9920107e51844478a09ec430dae2df741200da3058",
+        "blockNumber": 17,
+        "result": {
+          "gasUsed": "0xf",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x93d974a14c784be231a7b580a6476a330e5d6f9ddfef70a6b5cacd9f91a1e495",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0100000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x220bc13dc4f1ed38dcca927a5be15eca16497d279f4c40d7b8fe9704eadf1464",
+        "blockNumber": 18,
+        "result": {
+          "gasUsed": "0x1e",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x2a5079cc535c429f668f13a7fb9a28bdba6831b5462bd04f781777b332a8fcbd",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0110000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x220bc13dc4f1ed38dcca927a5be15eca16497d279f4c40d7b8fe9704eadf1464",
+        "blockNumber": 18,
+        "error": "Reverted",
+        "revertReason" : "0x7d88c1856cc95352",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xc388baa0e55e6b73e850b22dc7e9853700f6b995fd55d95dd6ccd5a13d63c566",
+        "transactionPosition": 1,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_19_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_19_all_0x000.json
new file mode 100644
index 00000000000..6ea871dc341
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_19_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 19,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_19_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_19_all_all.json
new file mode 100644
index 00000000000..b29a1fbcae1
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_19_all_all.json
@@ -0,0 +1,379 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 19
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xf07e45fae684d31ce732c3026e57c810d4f236261aa39b20017137c348ffac4b",
+        "blockNumber": 2,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "creationMethod": "create",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xff300e",
+          "init": "0x6004600c60003960046000f3600035ff",
+          "value": "0x0"
+        },
+        "blockHash": "0x47a62e941d567d1d7411b32ff38bdef817357d226a0204c285e8db27b3808554",
+        "blockNumber": 3,
+        "result": {
+          "address": "0xf12b5dd4ead5f743c6baa640b0216200e89b60da",
+          "code": "0x600035ff",
+          "gasUsed": "0x338"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x8d5477f0aae852c3e9487b0f8e7b9ecf9ccdf23d7934d4b4b7eff40c271031e5",
+        "transactionPosition": 0,
+        "type": "create"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x47a62e941d567d1d7411b32ff38bdef817357d226a0204c285e8db27b3808554",
+        "blockNumber": 3,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabba",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x9c58",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x4de634fe767d1f6d0512ca0c9c0a054d3a2596f7cdd7c1eea5f93046a740b3c7",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffabba",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x2728",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xf882ec206292910527fd7095e59a1ca027b873296f1eba3886aa1addc4ff0ab9",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffabc6",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x16c0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x7ca6bf869e8882216f7443accb8d642df41af5bfa3a0e63bf03be2cfe629a030",
+        "transactionPosition": 2,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabd2",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcad905f558c932b0dd40ffac69b021569a24388ae5f00e6d91cfe99ca6eb69df",
+        "blockNumber": 5,
+        "result": {
+          "gasUsed": "0x16c0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xdb2cd5e93dedae66371fc4a95452c746e11f7d2097464707597b8807c889ef5b",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xcad905f558c932b0dd40ffac69b021569a24388ae5f00e6d91cfe99ca6eb69df",
+        "blockNumber": 5,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad82",
+          "input": "0x0000000000000000000000000000000000000999",
+          "to": "0x0020000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": {
+          "gasUsed": "0x7536",
+          "output": "0x"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "address": "0x0020000000000000000000000000000000000000",
+          "balance": "0x300",
+          "refundAddress": "0x0000000000000999000000000000000000000000"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [
+          0
+        ],
+        "transactionHash": "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e",
+        "transactionPosition": 0,
+        "type": "suicide"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad52",
+          "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0030000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xeed85fe57db751442c826cfe4fdf43b10a5c2bc8b6fd3a8ccced48eb3fb35885",
+        "blockNumber": 7,
+        "result": {
+          "gasUsed": "0x1b",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x47f4d445ea1812cb1ddd3464ab23d2bfc6ed408a8a9db1c497f94e8e06e85286",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xeed85fe57db751442c826cfe4fdf43b10a5c2bc8b6fd3a8ccced48eb3fb35885",
+        "blockNumber": 7,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": {
+          "gasUsed": "0x30a",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0xa29f9d6a4f183f4c22c4857544a9a6b69c48d7bb8a97652be06e50bb69470666",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x0040000000000000000000000000000000000000",
+          "gas": "0xfbab36",
+          "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0030000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": {
+          "gasUsed": "0x1b",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 0,
+        "traceAddress": [
+          0
+        ],
+        "transactionHash": "0xa29f9d6a4f183f4c22c4857544a9a6b69c48d7bb8a97652be06e50bb69470666",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabae",
+          "input": "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x650cefaa3eae1542dfd6f6fbdee553d743393369887a9dce7b658ca93069fee2",
+        "blockNumber": 9,
+        "result": {
+          "gasUsed": "0x8fa",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x4af0ef28fbfcbdee7cc5925797c1b9030b3848c2f63f92737c3fe76b45582af5",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x0040000000000000000000000000000000000000",
+          "gas": "0xfbaa17",
+          "input": "0x00000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x650cefaa3eae1542dfd6f6fbdee553d743393369887a9dce7b658ca93069fee2",
+        "blockNumber": 9,
+        "result": {
+          "gasUsed": "0x5ff",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [
+          0
+        ],
+        "transactionHash": "0x4af0ef28fbfcbdee7cc5925797c1b9030b3848c2f63f92737c3fe76b45582af5",
+        "transactionPosition": 0,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_2_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_2_0xfe3_0x000.json
new file mode 100644
index 00000000000..9b1557d6b08
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_2_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_2_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_2_0xfe3_all.json
new file mode 100644
index 00000000000..b1c83fc35bb
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_2_0xfe3_all.json
@@ -0,0 +1,67 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad82",
+          "input": "0x0000000000000000000000000000000000000999",
+          "to": "0x0020000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": {
+          "gasUsed": "0x7536",
+          "output": "0x"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad52",
+          "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0030000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xeed85fe57db751442c826cfe4fdf43b10a5c2bc8b6fd3a8ccced48eb3fb35885",
+        "blockNumber": 7,
+        "result": {
+          "gasUsed": "0x1b",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x47f4d445ea1812cb1ddd3464ab23d2bfc6ed408a8a9db1c497f94e8e06e85286",
+        "transactionPosition": 0,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_2_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_2_all_0x000.json
new file mode 100644
index 00000000000..f7d7e60b01e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_2_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 2,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_2_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_2_all_all.json
new file mode 100644
index 00000000000..c383a49f361
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x0_0x21_after_2_count_2_all_all.json
@@ -0,0 +1,58 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x0",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 2
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xf07e45fae684d31ce732c3026e57c810d4f236261aa39b20017137c348ffac4b",
+        "blockNumber": 2,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "creationMethod": "create",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xff300e",
+          "init": "0x6004600c60003960046000f3600035ff",
+          "value": "0x0"
+        },
+        "blockHash": "0x47a62e941d567d1d7411b32ff38bdef817357d226a0204c285e8db27b3808554",
+        "blockNumber": 3,
+        "result": {
+          "address": "0xf12b5dd4ead5f743c6baa640b0216200e89b60da",
+          "code": "0x600035ff",
+          "gasUsed": "0x338"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x8d5477f0aae852c3e9487b0f8e7b9ecf9ccdf23d7934d4b4b7eff40c271031e5",
+        "transactionPosition": 0,
+        "type": "create"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_19_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_19_0xfe3_0x000.json
new file mode 100644
index 00000000000..e98048e1315
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_19_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_19_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_19_0xfe3_all.json
new file mode 100644
index 00000000000..682c31c765a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_19_0xfe3_all.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_19_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_19_all_0x000.json
new file mode 100644
index 00000000000..11d1686424f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_19_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 19,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_19_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_19_all_all.json
new file mode 100644
index 00000000000..529f62ca192
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_19_all_all.json
@@ -0,0 +1,37 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 19
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x234813ec913b10cfa65f22ab7e74310aea08c5f7e1de7f78549f078644ab37b8",
+        "blockNumber": 1,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_2_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_2_0xfe3_0x000.json
new file mode 100644
index 00000000000..f290e538eba
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_2_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_2_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_2_0xfe3_all.json
new file mode 100644
index 00000000000..718c556f57a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_2_0xfe3_all.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_2_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_2_all_0x000.json
new file mode 100644
index 00000000000..960469596a9
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_2_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 2,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_2_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_2_all_all.json
new file mode 100644
index 00000000000..ed15f4b3aad
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_0_count_2_all_all.json
@@ -0,0 +1,37 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 2
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x234813ec913b10cfa65f22ab7e74310aea08c5f7e1de7f78549f078644ab37b8",
+        "blockNumber": 1,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_19_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_19_0xfe3_0x000.json
new file mode 100644
index 00000000000..15f07452b04
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_19_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_19_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_19_0xfe3_all.json
new file mode 100644
index 00000000000..6aaa7df24f9
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_19_0xfe3_all.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_19_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_19_all_0x000.json
new file mode 100644
index 00000000000..d6c7ede2457
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_19_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 19,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_19_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_19_all_all.json
new file mode 100644
index 00000000000..f449d0201dc
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_19_all_all.json
@@ -0,0 +1,21 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 19
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_2_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_2_0xfe3_0x000.json
new file mode 100644
index 00000000000..dbc3f7a02a1
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_2_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_2_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_2_0xfe3_all.json
new file mode 100644
index 00000000000..d04cfb4689f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_2_0xfe3_all.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_2_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_2_all_0x000.json
new file mode 100644
index 00000000000..23532a7bf03
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_2_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 2,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_2_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_2_all_all.json
new file mode 100644
index 00000000000..ca6af35ca04
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x1_after_2_count_2_all_all.json
@@ -0,0 +1,21 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 2
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_19_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_19_0xfe3_0x000.json
new file mode 100644
index 00000000000..e2c4c31eb15
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_19_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_19_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_19_0xfe3_all.json
new file mode 100644
index 00000000000..b21102dcf6f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_19_0xfe3_all.json
@@ -0,0 +1,415 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabba",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x9c58",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x4de634fe767d1f6d0512ca0c9c0a054d3a2596f7cdd7c1eea5f93046a740b3c7",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabd2",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcad905f558c932b0dd40ffac69b021569a24388ae5f00e6d91cfe99ca6eb69df",
+        "blockNumber": 5,
+        "result": {
+          "gasUsed": "0x16c0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xdb2cd5e93dedae66371fc4a95452c746e11f7d2097464707597b8807c889ef5b",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad82",
+          "input": "0x0000000000000000000000000000000000000999",
+          "to": "0x0020000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": {
+          "gasUsed": "0x7536",
+          "output": "0x"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad52",
+          "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0030000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xeed85fe57db751442c826cfe4fdf43b10a5c2bc8b6fd3a8ccced48eb3fb35885",
+        "blockNumber": 7,
+        "result": {
+          "gasUsed": "0x1b",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x47f4d445ea1812cb1ddd3464ab23d2bfc6ed408a8a9db1c497f94e8e06e85286",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": {
+          "gasUsed": "0x30a",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0xa29f9d6a4f183f4c22c4857544a9a6b69c48d7bb8a97652be06e50bb69470666",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabae",
+          "input": "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x650cefaa3eae1542dfd6f6fbdee553d743393369887a9dce7b658ca93069fee2",
+        "blockNumber": 9,
+        "result": {
+          "gasUsed": "0x8fa",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x4af0ef28fbfcbdee7cc5925797c1b9030b3848c2f63f92737c3fe76b45582af5",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0050000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xf020928933dc70cc8b6034b6881501cb6cbf57cacd8cfb01ed6b2329e68e7073",
+        "blockNumber": 10,
+        "result": {
+          "gasUsed": "0x30a",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x4ec95b7de430b61fc9a57ed35274fd766b7f5fac5213ab946963eb528deae6b5",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0060000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x61bfd9fcaa09a2a9df0276acce68b5212d42bebab67034aa6603cc6dfbb70db5",
+        "blockNumber": 11,
+        "result": {
+          "gasUsed": "0x308",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x6f77512ee9d43474a884c0703c86712fb98dca772fa6e12252786e3e23f196c1",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0070000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x9ac8374676c21436e676693b9b4162120e946a73625d07c9dd78718054327c87",
+        "blockNumber": 12,
+        "result": {
+          "gasUsed": "0x1e",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x12e4a98e63825852a69d7702202a3b593e4059ec913c479443665d590da18724",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0080000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xfc8c590f4fc52847a23c83df28ca920a6b76e587ba68ce1e85b67a6154be320a",
+        "blockNumber": 13,
+        "result": {
+          "gasUsed": "0xf",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x547c7e2fcdf9f88b03b4f4184d667d6768c669f279785774d0cf42435cab06f1",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0090000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xd8e78c27c182cefe8a1da2fe2980d6e2fd43a2e1db1bd7ff30f1eef79faa277b",
+        "blockNumber": 14,
+        "result": {
+          "gasUsed": "0x515e",
+          "output": "0x01"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xe3ebc73c55176c3f2e72b289f8a9cefbcd5b25dcd205db5661f81b0bb974fa73",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0090000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xd8e78c27c182cefe8a1da2fe2980d6e2fd43a2e1db1bd7ff30f1eef79faa277b",
+        "blockNumber": 14,
+        "result": {
+          "gasUsed": "0x16c6",
+          "output": "0x02"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xb4dc55ca4a7c1f72402860c594efaa7da32035003f8e203b7f6a3cf1826685a5",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0090000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xd8e78c27c182cefe8a1da2fe2980d6e2fd43a2e1db1bd7ff30f1eef79faa277b",
+        "blockNumber": 14,
+        "result": {
+          "gasUsed": "0x16c6",
+          "output": "0x03"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x1a9f6256886437cfa21ee7685dd7a996024bea4d4bf6554b14787a6c9e5b90e6",
+        "transactionPosition": 2,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00a0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x69e9470ef04a4188a806f3474b03001845fd3722f4c7c58589ef7623549f8dc8",
+        "blockNumber": 15,
+        "result": {
+          "gasUsed": "0x30b",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x293cefc718137a74d36a5da204e3617604a9e8dfc79b6a6efb11056b3efd3b4a",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00b0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x69e9470ef04a4188a806f3474b03001845fd3722f4c7c58589ef7623549f8dc8",
+        "blockNumber": 15,
+        "result": {
+          "gasUsed": "0x485",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xb19370be2ace59794ee9bb5a69db98464cd6cb0b02b9afb3b978c9aad2bf5417",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00c0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x7d3d4c1129ebce54739fedf2642ea2cfaeafa48c2c489a11512d95f578f92abc",
+        "blockNumber": 16,
+        "error": "Bad instruction",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x6aed559a5dcf73efa132d8182585c40fdc6ef3b99a7629d80ffd4a62cb3db622",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00d0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x7d3d4c1129ebce54739fedf2642ea2cfaeafa48c2c489a11512d95f578f92abc",
+        "blockNumber": 16,
+        "error": "Stack underflow",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xb39fa8a1cb1db4663dc3733bc014d524e90a862bf2607e028eeb3932d92574fe",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00e0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x7d3d4c1129ebce54739fedf2642ea2cfaeafa48c2c489a11512d95f578f92abc",
+        "blockNumber": 16,
+        "error": "Bad jump destination",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x11a725053a6ece79d8de11cb75dd1f09c40dcd109a1c63573e847ad4f456a296",
+        "transactionPosition": 2,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00f0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xfde8b9bcfdc9f75845f3eb9920107e51844478a09ec430dae2df741200da3058",
+        "blockNumber": 17,
+        "result": {
+          "gasUsed": "0xf",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x93d974a14c784be231a7b580a6476a330e5d6f9ddfef70a6b5cacd9f91a1e495",
+        "transactionPosition": 0,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_19_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_19_all_0x000.json
new file mode 100644
index 00000000000..3cae06a6ce3
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_19_all_0x000.json
@@ -0,0 +1,46 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 19,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0000000000000000000000000000000000000999",
+          "value": "0x1"
+        },
+        "blockHash": "0xf07e45fae684d31ce732c3026e57c810d4f236261aa39b20017137c348ffac4b",
+        "blockNumber": 2,
+        "result": {
+          "gasUsed": "0x0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x28fa8042c7b5835f4f91fc20937f3e70dcf3585c1afe31202bb6075185f9abfe",
+        "transactionPosition": 0,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_19_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_19_all_all.json
new file mode 100644
index 00000000000..67b53c30e54
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_19_all_all.json
@@ -0,0 +1,371 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 19
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x234813ec913b10cfa65f22ab7e74310aea08c5f7e1de7f78549f078644ab37b8",
+        "blockNumber": 1,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0000000000000000000000000000000000000999",
+          "value": "0x1"
+        },
+        "blockHash": "0xf07e45fae684d31ce732c3026e57c810d4f236261aa39b20017137c348ffac4b",
+        "blockNumber": 2,
+        "result": {
+          "gasUsed": "0x0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x28fa8042c7b5835f4f91fc20937f3e70dcf3585c1afe31202bb6075185f9abfe",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xf07e45fae684d31ce732c3026e57c810d4f236261aa39b20017137c348ffac4b",
+        "blockNumber": 2,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "creationMethod": "create",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xff300e",
+          "init": "0x6004600c60003960046000f3600035ff",
+          "value": "0x0"
+        },
+        "blockHash": "0x47a62e941d567d1d7411b32ff38bdef817357d226a0204c285e8db27b3808554",
+        "blockNumber": 3,
+        "result": {
+          "address": "0xf12b5dd4ead5f743c6baa640b0216200e89b60da",
+          "code": "0x600035ff",
+          "gasUsed": "0x338"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x8d5477f0aae852c3e9487b0f8e7b9ecf9ccdf23d7934d4b4b7eff40c271031e5",
+        "transactionPosition": 0,
+        "type": "create"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x47a62e941d567d1d7411b32ff38bdef817357d226a0204c285e8db27b3808554",
+        "blockNumber": 3,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabba",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x9c58",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x4de634fe767d1f6d0512ca0c9c0a054d3a2596f7cdd7c1eea5f93046a740b3c7",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffabba",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x2728",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xf882ec206292910527fd7095e59a1ca027b873296f1eba3886aa1addc4ff0ab9",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffabc6",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x16c0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x7ca6bf869e8882216f7443accb8d642df41af5bfa3a0e63bf03be2cfe629a030",
+        "transactionPosition": 2,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabd2",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcad905f558c932b0dd40ffac69b021569a24388ae5f00e6d91cfe99ca6eb69df",
+        "blockNumber": 5,
+        "result": {
+          "gasUsed": "0x16c0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xdb2cd5e93dedae66371fc4a95452c746e11f7d2097464707597b8807c889ef5b",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xcad905f558c932b0dd40ffac69b021569a24388ae5f00e6d91cfe99ca6eb69df",
+        "blockNumber": 5,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad82",
+          "input": "0x0000000000000000000000000000000000000999",
+          "to": "0x0020000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": {
+          "gasUsed": "0x7536",
+          "output": "0x"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "address": "0x0020000000000000000000000000000000000000",
+          "balance": "0x300",
+          "refundAddress": "0x0000000000000999000000000000000000000000"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [
+          0
+        ],
+        "transactionHash": "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e",
+        "transactionPosition": 0,
+        "type": "suicide"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad52",
+          "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0030000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xeed85fe57db751442c826cfe4fdf43b10a5c2bc8b6fd3a8ccced48eb3fb35885",
+        "blockNumber": 7,
+        "result": {
+          "gasUsed": "0x1b",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x47f4d445ea1812cb1ddd3464ab23d2bfc6ed408a8a9db1c497f94e8e06e85286",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xeed85fe57db751442c826cfe4fdf43b10a5c2bc8b6fd3a8ccced48eb3fb35885",
+        "blockNumber": 7,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": {
+          "gasUsed": "0x30a",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0xa29f9d6a4f183f4c22c4857544a9a6b69c48d7bb8a97652be06e50bb69470666",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x0040000000000000000000000000000000000000",
+          "gas": "0xfbab36",
+          "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0030000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": {
+          "gasUsed": "0x1b",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 0,
+        "traceAddress": [
+          0
+        ],
+        "transactionHash": "0xa29f9d6a4f183f4c22c4857544a9a6b69c48d7bb8a97652be06e50bb69470666",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_2_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_2_0xfe3_0x000.json
new file mode 100644
index 00000000000..7602871ab97
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_2_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_2_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_2_0xfe3_all.json
new file mode 100644
index 00000000000..c0073cc33a5
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_2_0xfe3_all.json
@@ -0,0 +1,67 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabba",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x9c58",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x4de634fe767d1f6d0512ca0c9c0a054d3a2596f7cdd7c1eea5f93046a740b3c7",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabd2",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcad905f558c932b0dd40ffac69b021569a24388ae5f00e6d91cfe99ca6eb69df",
+        "blockNumber": 5,
+        "result": {
+          "gasUsed": "0x16c0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xdb2cd5e93dedae66371fc4a95452c746e11f7d2097464707597b8807c889ef5b",
+        "transactionPosition": 0,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_2_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_2_all_0x000.json
new file mode 100644
index 00000000000..fe9076ca652
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_2_all_0x000.json
@@ -0,0 +1,46 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 2,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0000000000000000000000000000000000000999",
+          "value": "0x1"
+        },
+        "blockHash": "0xf07e45fae684d31ce732c3026e57c810d4f236261aa39b20017137c348ffac4b",
+        "blockNumber": 2,
+        "result": {
+          "gasUsed": "0x0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x28fa8042c7b5835f4f91fc20937f3e70dcf3585c1afe31202bb6075185f9abfe",
+        "transactionPosition": 0,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_2_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_2_all_all.json
new file mode 100644
index 00000000000..a55fb328e7d
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_0_count_2_all_all.json
@@ -0,0 +1,58 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 2
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x234813ec913b10cfa65f22ab7e74310aea08c5f7e1de7f78549f078644ab37b8",
+        "blockNumber": 1,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0000000000000000000000000000000000000999",
+          "value": "0x1"
+        },
+        "blockHash": "0xf07e45fae684d31ce732c3026e57c810d4f236261aa39b20017137c348ffac4b",
+        "blockNumber": 2,
+        "result": {
+          "gasUsed": "0x0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x28fa8042c7b5835f4f91fc20937f3e70dcf3585c1afe31202bb6075185f9abfe",
+        "transactionPosition": 0,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_19_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_19_0xfe3_0x000.json
new file mode 100644
index 00000000000..f9bf4105b5e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_19_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_19_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_19_0xfe3_all.json
new file mode 100644
index 00000000000..2e70bd32588
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_19_0xfe3_all.json
@@ -0,0 +1,413 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad82",
+          "input": "0x0000000000000000000000000000000000000999",
+          "to": "0x0020000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": {
+          "gasUsed": "0x7536",
+          "output": "0x"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad52",
+          "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0030000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xeed85fe57db751442c826cfe4fdf43b10a5c2bc8b6fd3a8ccced48eb3fb35885",
+        "blockNumber": 7,
+        "result": {
+          "gasUsed": "0x1b",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x47f4d445ea1812cb1ddd3464ab23d2bfc6ed408a8a9db1c497f94e8e06e85286",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": {
+          "gasUsed": "0x30a",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0xa29f9d6a4f183f4c22c4857544a9a6b69c48d7bb8a97652be06e50bb69470666",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabae",
+          "input": "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x650cefaa3eae1542dfd6f6fbdee553d743393369887a9dce7b658ca93069fee2",
+        "blockNumber": 9,
+        "result": {
+          "gasUsed": "0x8fa",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x4af0ef28fbfcbdee7cc5925797c1b9030b3848c2f63f92737c3fe76b45582af5",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0050000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xf020928933dc70cc8b6034b6881501cb6cbf57cacd8cfb01ed6b2329e68e7073",
+        "blockNumber": 10,
+        "result": {
+          "gasUsed": "0x30a",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x4ec95b7de430b61fc9a57ed35274fd766b7f5fac5213ab946963eb528deae6b5",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0060000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x61bfd9fcaa09a2a9df0276acce68b5212d42bebab67034aa6603cc6dfbb70db5",
+        "blockNumber": 11,
+        "result": {
+          "gasUsed": "0x308",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x6f77512ee9d43474a884c0703c86712fb98dca772fa6e12252786e3e23f196c1",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0070000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x9ac8374676c21436e676693b9b4162120e946a73625d07c9dd78718054327c87",
+        "blockNumber": 12,
+        "result": {
+          "gasUsed": "0x1e",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x12e4a98e63825852a69d7702202a3b593e4059ec913c479443665d590da18724",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0080000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xfc8c590f4fc52847a23c83df28ca920a6b76e587ba68ce1e85b67a6154be320a",
+        "blockNumber": 13,
+        "result": {
+          "gasUsed": "0xf",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x547c7e2fcdf9f88b03b4f4184d667d6768c669f279785774d0cf42435cab06f1",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0090000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xd8e78c27c182cefe8a1da2fe2980d6e2fd43a2e1db1bd7ff30f1eef79faa277b",
+        "blockNumber": 14,
+        "result": {
+          "gasUsed": "0x515e",
+          "output": "0x01"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xe3ebc73c55176c3f2e72b289f8a9cefbcd5b25dcd205db5661f81b0bb974fa73",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0090000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xd8e78c27c182cefe8a1da2fe2980d6e2fd43a2e1db1bd7ff30f1eef79faa277b",
+        "blockNumber": 14,
+        "result": {
+          "gasUsed": "0x16c6",
+          "output": "0x02"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xb4dc55ca4a7c1f72402860c594efaa7da32035003f8e203b7f6a3cf1826685a5",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0090000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xd8e78c27c182cefe8a1da2fe2980d6e2fd43a2e1db1bd7ff30f1eef79faa277b",
+        "blockNumber": 14,
+        "result": {
+          "gasUsed": "0x16c6",
+          "output": "0x03"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x1a9f6256886437cfa21ee7685dd7a996024bea4d4bf6554b14787a6c9e5b90e6",
+        "transactionPosition": 2,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00a0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x69e9470ef04a4188a806f3474b03001845fd3722f4c7c58589ef7623549f8dc8",
+        "blockNumber": 15,
+        "result": {
+          "gasUsed": "0x30b",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x293cefc718137a74d36a5da204e3617604a9e8dfc79b6a6efb11056b3efd3b4a",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00b0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x69e9470ef04a4188a806f3474b03001845fd3722f4c7c58589ef7623549f8dc8",
+        "blockNumber": 15,
+        "result": {
+          "gasUsed": "0x485",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xb19370be2ace59794ee9bb5a69db98464cd6cb0b02b9afb3b978c9aad2bf5417",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00c0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x7d3d4c1129ebce54739fedf2642ea2cfaeafa48c2c489a11512d95f578f92abc",
+        "blockNumber": 16,
+        "error": "Bad instruction",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x6aed559a5dcf73efa132d8182585c40fdc6ef3b99a7629d80ffd4a62cb3db622",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00d0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x7d3d4c1129ebce54739fedf2642ea2cfaeafa48c2c489a11512d95f578f92abc",
+        "blockNumber": 16,
+        "error": "Stack underflow",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xb39fa8a1cb1db4663dc3733bc014d524e90a862bf2607e028eeb3932d92574fe",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00e0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x7d3d4c1129ebce54739fedf2642ea2cfaeafa48c2c489a11512d95f578f92abc",
+        "blockNumber": 16,
+        "error": "Bad jump destination",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x11a725053a6ece79d8de11cb75dd1f09c40dcd109a1c63573e847ad4f456a296",
+        "transactionPosition": 2,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00f0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xfde8b9bcfdc9f75845f3eb9920107e51844478a09ec430dae2df741200da3058",
+        "blockNumber": 17,
+        "result": {
+          "gasUsed": "0xf",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x93d974a14c784be231a7b580a6476a330e5d6f9ddfef70a6b5cacd9f91a1e495",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0100000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x220bc13dc4f1ed38dcca927a5be15eca16497d279f4c40d7b8fe9704eadf1464",
+        "blockNumber": 18,
+        "result": {
+          "gasUsed": "0x1e",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x2a5079cc535c429f668f13a7fb9a28bdba6831b5462bd04f781777b332a8fcbd",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0110000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x220bc13dc4f1ed38dcca927a5be15eca16497d279f4c40d7b8fe9704eadf1464",
+        "blockNumber": 18,
+        "error": "Reverted",
+        "revertReason" : "0x7d88c1856cc95352",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xc388baa0e55e6b73e850b22dc7e9853700f6b995fd55d95dd6ccd5a13d63c566",
+        "transactionPosition": 1,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_19_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_19_all_0x000.json
new file mode 100644
index 00000000000..987bdc9e053
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_19_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 19,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_19_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_19_all_all.json
new file mode 100644
index 00000000000..697e1b25450
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_19_all_all.json
@@ -0,0 +1,379 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 19
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xf07e45fae684d31ce732c3026e57c810d4f236261aa39b20017137c348ffac4b",
+        "blockNumber": 2,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "creationMethod": "create",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xff300e",
+          "init": "0x6004600c60003960046000f3600035ff",
+          "value": "0x0"
+        },
+        "blockHash": "0x47a62e941d567d1d7411b32ff38bdef817357d226a0204c285e8db27b3808554",
+        "blockNumber": 3,
+        "result": {
+          "address": "0xf12b5dd4ead5f743c6baa640b0216200e89b60da",
+          "code": "0x600035ff",
+          "gasUsed": "0x338"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x8d5477f0aae852c3e9487b0f8e7b9ecf9ccdf23d7934d4b4b7eff40c271031e5",
+        "transactionPosition": 0,
+        "type": "create"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x47a62e941d567d1d7411b32ff38bdef817357d226a0204c285e8db27b3808554",
+        "blockNumber": 3,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabba",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x9c58",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x4de634fe767d1f6d0512ca0c9c0a054d3a2596f7cdd7c1eea5f93046a740b3c7",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffabba",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x2728",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xf882ec206292910527fd7095e59a1ca027b873296f1eba3886aa1addc4ff0ab9",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffabc6",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x16c0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x7ca6bf869e8882216f7443accb8d642df41af5bfa3a0e63bf03be2cfe629a030",
+        "transactionPosition": 2,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabd2",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcad905f558c932b0dd40ffac69b021569a24388ae5f00e6d91cfe99ca6eb69df",
+        "blockNumber": 5,
+        "result": {
+          "gasUsed": "0x16c0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xdb2cd5e93dedae66371fc4a95452c746e11f7d2097464707597b8807c889ef5b",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xcad905f558c932b0dd40ffac69b021569a24388ae5f00e6d91cfe99ca6eb69df",
+        "blockNumber": 5,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad82",
+          "input": "0x0000000000000000000000000000000000000999",
+          "to": "0x0020000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": {
+          "gasUsed": "0x7536",
+          "output": "0x"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "address": "0x0020000000000000000000000000000000000000",
+          "balance": "0x300",
+          "refundAddress": "0x0000000000000999000000000000000000000000"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [
+          0
+        ],
+        "transactionHash": "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e",
+        "transactionPosition": 0,
+        "type": "suicide"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad52",
+          "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0030000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xeed85fe57db751442c826cfe4fdf43b10a5c2bc8b6fd3a8ccced48eb3fb35885",
+        "blockNumber": 7,
+        "result": {
+          "gasUsed": "0x1b",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x47f4d445ea1812cb1ddd3464ab23d2bfc6ed408a8a9db1c497f94e8e06e85286",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xeed85fe57db751442c826cfe4fdf43b10a5c2bc8b6fd3a8ccced48eb3fb35885",
+        "blockNumber": 7,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": {
+          "gasUsed": "0x30a",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0xa29f9d6a4f183f4c22c4857544a9a6b69c48d7bb8a97652be06e50bb69470666",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x0040000000000000000000000000000000000000",
+          "gas": "0xfbab36",
+          "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0030000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": {
+          "gasUsed": "0x1b",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 0,
+        "traceAddress": [
+          0
+        ],
+        "transactionHash": "0xa29f9d6a4f183f4c22c4857544a9a6b69c48d7bb8a97652be06e50bb69470666",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabae",
+          "input": "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x650cefaa3eae1542dfd6f6fbdee553d743393369887a9dce7b658ca93069fee2",
+        "blockNumber": 9,
+        "result": {
+          "gasUsed": "0x8fa",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x4af0ef28fbfcbdee7cc5925797c1b9030b3848c2f63f92737c3fe76b45582af5",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x0040000000000000000000000000000000000000",
+          "gas": "0xfbaa17",
+          "input": "0x00000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x650cefaa3eae1542dfd6f6fbdee553d743393369887a9dce7b658ca93069fee2",
+        "blockNumber": 9,
+        "result": {
+          "gasUsed": "0x5ff",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [
+          0
+        ],
+        "transactionHash": "0x4af0ef28fbfcbdee7cc5925797c1b9030b3848c2f63f92737c3fe76b45582af5",
+        "transactionPosition": 0,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_2_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_2_0xfe3_0x000.json
new file mode 100644
index 00000000000..4ac683fe0ef
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_2_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_2_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_2_0xfe3_all.json
new file mode 100644
index 00000000000..be750b4854c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_2_0xfe3_all.json
@@ -0,0 +1,67 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad82",
+          "input": "0x0000000000000000000000000000000000000999",
+          "to": "0x0020000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": {
+          "gasUsed": "0x7536",
+          "output": "0x"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad52",
+          "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0030000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xeed85fe57db751442c826cfe4fdf43b10a5c2bc8b6fd3a8ccced48eb3fb35885",
+        "blockNumber": 7,
+        "result": {
+          "gasUsed": "0x1b",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x47f4d445ea1812cb1ddd3464ab23d2bfc6ed408a8a9db1c497f94e8e06e85286",
+        "transactionPosition": 0,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_2_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_2_all_0x000.json
new file mode 100644
index 00000000000..e59582eed47
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_2_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 2,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_2_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_2_all_all.json
new file mode 100644
index 00000000000..1a04fe29000
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x1_0x21_after_2_count_2_all_all.json
@@ -0,0 +1,58 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x1",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 2
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xf07e45fae684d31ce732c3026e57c810d4f236261aa39b20017137c348ffac4b",
+        "blockNumber": 2,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "creationMethod": "create",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xff300e",
+          "init": "0x6004600c60003960046000f3600035ff",
+          "value": "0x0"
+        },
+        "blockHash": "0x47a62e941d567d1d7411b32ff38bdef817357d226a0204c285e8db27b3808554",
+        "blockNumber": 3,
+        "result": {
+          "address": "0xf12b5dd4ead5f743c6baa640b0216200e89b60da",
+          "code": "0x600035ff",
+          "gasUsed": "0x338"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x8d5477f0aae852c3e9487b0f8e7b9ecf9ccdf23d7934d4b4b7eff40c271031e5",
+        "transactionPosition": 0,
+        "type": "create"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_19_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_19_0xfe3_0x000.json
new file mode 100644
index 00000000000..4d36cacfea3
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_19_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_19_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_19_0xfe3_all.json
new file mode 100644
index 00000000000..df7ebc9f5b3
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_19_0xfe3_all.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_19_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_19_all_0x000.json
new file mode 100644
index 00000000000..6e461342921
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_19_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 19,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_19_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_19_all_all.json
new file mode 100644
index 00000000000..d15f59c113e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_19_all_all.json
@@ -0,0 +1,21 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 19
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_2_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_2_0xfe3_0x000.json
new file mode 100644
index 00000000000..a5ec89ad261
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_2_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_2_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_2_0xfe3_all.json
new file mode 100644
index 00000000000..0c34c9213d2
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_2_0xfe3_all.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_2_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_2_all_0x000.json
new file mode 100644
index 00000000000..5b7279856d3
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_2_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 2,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_2_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_2_all_all.json
new file mode 100644
index 00000000000..9c3815d726a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_0_count_2_all_all.json
@@ -0,0 +1,21 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 2
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_19_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_19_0xfe3_0x000.json
new file mode 100644
index 00000000000..6134e59fa91
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_19_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_19_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_19_0xfe3_all.json
new file mode 100644
index 00000000000..e4c5fbaa143
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_19_0xfe3_all.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_19_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_19_all_0x000.json
new file mode 100644
index 00000000000..4bdddb60c28
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_19_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 19,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_19_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_19_all_all.json
new file mode 100644
index 00000000000..c167c8c6e13
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_19_all_all.json
@@ -0,0 +1,21 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 19
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_2_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_2_0xfe3_0x000.json
new file mode 100644
index 00000000000..3645583feee
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_2_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_2_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_2_0xfe3_all.json
new file mode 100644
index 00000000000..d202c67516d
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_2_0xfe3_all.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_2_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_2_all_0x000.json
new file mode 100644
index 00000000000..ff553cfe423
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_2_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 2,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_2_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_2_all_all.json
new file mode 100644
index 00000000000..875b881c7ab
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x1_after_2_count_2_all_all.json
@@ -0,0 +1,21 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 2
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_19_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_19_0xfe3_0x000.json
new file mode 100644
index 00000000000..9afdfd3886a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_19_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_19_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_19_0xfe3_all.json
new file mode 100644
index 00000000000..6acc4460816
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_19_0xfe3_all.json
@@ -0,0 +1,42 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "creationMethod": "create",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0x46e824",
+          "init": "0x602af300",
+          "value": "0x0"
+        },
+        "blockHash": "0x156fa7f1633c5dd82d41b7c7d79049f620b25638ca87da137d13e1a27a210e49",
+        "blockNumber": 33,
+        "error": "Stack underflow",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xf0378e1bf579b23aff89255d93ade14fe9136a7cedd9c4985e9bec2d18ce65e9",
+        "transactionPosition": 0,
+        "type": "create"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_19_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_19_all_0x000.json
new file mode 100644
index 00000000000..a51e0624279
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_19_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 19,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_19_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_19_all_all.json
new file mode 100644
index 00000000000..13b1f8ec0bc
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_19_all_all.json
@@ -0,0 +1,54 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 19
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "creationMethod": "create",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0x46e824",
+          "init": "0x602af300",
+          "value": "0x0"
+        },
+        "blockHash": "0x156fa7f1633c5dd82d41b7c7d79049f620b25638ca87da137d13e1a27a210e49",
+        "blockNumber": 33,
+        "error": "Stack underflow",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xf0378e1bf579b23aff89255d93ade14fe9136a7cedd9c4985e9bec2d18ce65e9",
+        "transactionPosition": 0,
+        "type": "create"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x156fa7f1633c5dd82d41b7c7d79049f620b25638ca87da137d13e1a27a210e49",
+        "blockNumber": 33,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_2_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_2_0xfe3_0x000.json
new file mode 100644
index 00000000000..cc8bdfb4d06
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_2_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_2_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_2_0xfe3_all.json
new file mode 100644
index 00000000000..fca4695f64c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_2_0xfe3_all.json
@@ -0,0 +1,42 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "creationMethod": "create",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0x46e824",
+          "init": "0x602af300",
+          "value": "0x0"
+        },
+        "blockHash": "0x156fa7f1633c5dd82d41b7c7d79049f620b25638ca87da137d13e1a27a210e49",
+        "blockNumber": 33,
+        "error": "Stack underflow",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xf0378e1bf579b23aff89255d93ade14fe9136a7cedd9c4985e9bec2d18ce65e9",
+        "transactionPosition": 0,
+        "type": "create"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_2_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_2_all_0x000.json
new file mode 100644
index 00000000000..ac8a31fd90c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_2_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 2,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_2_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_2_all_all.json
new file mode 100644
index 00000000000..cb3122e9582
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_0_count_2_all_all.json
@@ -0,0 +1,54 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 2
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "creationMethod": "create",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0x46e824",
+          "init": "0x602af300",
+          "value": "0x0"
+        },
+        "blockHash": "0x156fa7f1633c5dd82d41b7c7d79049f620b25638ca87da137d13e1a27a210e49",
+        "blockNumber": 33,
+        "error": "Stack underflow",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xf0378e1bf579b23aff89255d93ade14fe9136a7cedd9c4985e9bec2d18ce65e9",
+        "transactionPosition": 0,
+        "type": "create"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x156fa7f1633c5dd82d41b7c7d79049f620b25638ca87da137d13e1a27a210e49",
+        "blockNumber": 33,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_19_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_19_0xfe3_0x000.json
new file mode 100644
index 00000000000..84111004ba2
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_19_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_19_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_19_0xfe3_all.json
new file mode 100644
index 00000000000..306c9877b9d
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_19_0xfe3_all.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_19_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_19_all_0x000.json
new file mode 100644
index 00000000000..4b26cc6f687
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_19_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 19,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_19_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_19_all_all.json
new file mode 100644
index 00000000000..34453f68428
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_19_all_all.json
@@ -0,0 +1,21 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 19
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_2_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_2_0xfe3_0x000.json
new file mode 100644
index 00000000000..1d0753ac07f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_2_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_2_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_2_0xfe3_all.json
new file mode 100644
index 00000000000..1a220554aa4
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_2_0xfe3_all.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_2_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_2_all_0x000.json
new file mode 100644
index 00000000000..f5d7329be9d
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_2_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 2,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_2_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_2_all_all.json
new file mode 100644
index 00000000000..6c5f8231581
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x21_0x21_after_2_count_2_all_all.json
@@ -0,0 +1,21 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x21",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 2
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_19_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_19_0xfe3_0x000.json
new file mode 100644
index 00000000000..e312340485f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_19_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_19_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_19_0xfe3_all.json
new file mode 100644
index 00000000000..aa490c68b60
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_19_0xfe3_all.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_19_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_19_all_0x000.json
new file mode 100644
index 00000000000..2645ccd69d2
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_19_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 19,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_19_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_19_all_all.json
new file mode 100644
index 00000000000..4204b9c5bd1
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_19_all_all.json
@@ -0,0 +1,21 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 19
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_2_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_2_0xfe3_0x000.json
new file mode 100644
index 00000000000..96249a2da07
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_2_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_2_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_2_0xfe3_all.json
new file mode 100644
index 00000000000..6ae03779607
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_2_0xfe3_all.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_2_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_2_all_0x000.json
new file mode 100644
index 00000000000..00e1a0fdea2
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_2_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 2,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_2_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_2_all_all.json
new file mode 100644
index 00000000000..8ed082944ed
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_0_count_2_all_all.json
@@ -0,0 +1,21 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x1",
+        "after": 0,
+        "count": 2
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_19_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_19_0xfe3_0x000.json
new file mode 100644
index 00000000000..d337d91a865
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_19_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_19_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_19_0xfe3_all.json
new file mode 100644
index 00000000000..1b7add81b2e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_19_0xfe3_all.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_19_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_19_all_0x000.json
new file mode 100644
index 00000000000..ed623406fc3
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_19_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 19,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_19_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_19_all_all.json
new file mode 100644
index 00000000000..3727cd5ae55
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_19_all_all.json
@@ -0,0 +1,21 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 19
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_2_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_2_0xfe3_0x000.json
new file mode 100644
index 00000000000..e71762ab98e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_2_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_2_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_2_0xfe3_all.json
new file mode 100644
index 00000000000..88af1bd7a75
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_2_0xfe3_all.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_2_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_2_all_0x000.json
new file mode 100644
index 00000000000..c54eb131980
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_2_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 2,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_2_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_2_all_all.json
new file mode 100644
index 00000000000..04ef54903f1
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x1_after_2_count_2_all_all.json
@@ -0,0 +1,21 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x1",
+        "after": 2,
+        "count": 2
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_19_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_19_0xfe3_0x000.json
new file mode 100644
index 00000000000..cb803b7d638
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_19_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_19_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_19_0xfe3_all.json
new file mode 100644
index 00000000000..00517609a0d
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_19_0xfe3_all.json
@@ -0,0 +1,415 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabba",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x9c58",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x4de634fe767d1f6d0512ca0c9c0a054d3a2596f7cdd7c1eea5f93046a740b3c7",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabd2",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcad905f558c932b0dd40ffac69b021569a24388ae5f00e6d91cfe99ca6eb69df",
+        "blockNumber": 5,
+        "result": {
+          "gasUsed": "0x16c0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xdb2cd5e93dedae66371fc4a95452c746e11f7d2097464707597b8807c889ef5b",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad82",
+          "input": "0x0000000000000000000000000000000000000999",
+          "to": "0x0020000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": {
+          "gasUsed": "0x7536",
+          "output": "0x"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad52",
+          "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0030000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xeed85fe57db751442c826cfe4fdf43b10a5c2bc8b6fd3a8ccced48eb3fb35885",
+        "blockNumber": 7,
+        "result": {
+          "gasUsed": "0x1b",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x47f4d445ea1812cb1ddd3464ab23d2bfc6ed408a8a9db1c497f94e8e06e85286",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": {
+          "gasUsed": "0x30a",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0xa29f9d6a4f183f4c22c4857544a9a6b69c48d7bb8a97652be06e50bb69470666",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabae",
+          "input": "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x650cefaa3eae1542dfd6f6fbdee553d743393369887a9dce7b658ca93069fee2",
+        "blockNumber": 9,
+        "result": {
+          "gasUsed": "0x8fa",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x4af0ef28fbfcbdee7cc5925797c1b9030b3848c2f63f92737c3fe76b45582af5",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0050000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xf020928933dc70cc8b6034b6881501cb6cbf57cacd8cfb01ed6b2329e68e7073",
+        "blockNumber": 10,
+        "result": {
+          "gasUsed": "0x30a",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x4ec95b7de430b61fc9a57ed35274fd766b7f5fac5213ab946963eb528deae6b5",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0060000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x61bfd9fcaa09a2a9df0276acce68b5212d42bebab67034aa6603cc6dfbb70db5",
+        "blockNumber": 11,
+        "result": {
+          "gasUsed": "0x308",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x6f77512ee9d43474a884c0703c86712fb98dca772fa6e12252786e3e23f196c1",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0070000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x9ac8374676c21436e676693b9b4162120e946a73625d07c9dd78718054327c87",
+        "blockNumber": 12,
+        "result": {
+          "gasUsed": "0x1e",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x12e4a98e63825852a69d7702202a3b593e4059ec913c479443665d590da18724",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0080000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xfc8c590f4fc52847a23c83df28ca920a6b76e587ba68ce1e85b67a6154be320a",
+        "blockNumber": 13,
+        "result": {
+          "gasUsed": "0xf",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x547c7e2fcdf9f88b03b4f4184d667d6768c669f279785774d0cf42435cab06f1",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0090000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xd8e78c27c182cefe8a1da2fe2980d6e2fd43a2e1db1bd7ff30f1eef79faa277b",
+        "blockNumber": 14,
+        "result": {
+          "gasUsed": "0x515e",
+          "output": "0x01"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xe3ebc73c55176c3f2e72b289f8a9cefbcd5b25dcd205db5661f81b0bb974fa73",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0090000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xd8e78c27c182cefe8a1da2fe2980d6e2fd43a2e1db1bd7ff30f1eef79faa277b",
+        "blockNumber": 14,
+        "result": {
+          "gasUsed": "0x16c6",
+          "output": "0x02"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xb4dc55ca4a7c1f72402860c594efaa7da32035003f8e203b7f6a3cf1826685a5",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0090000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xd8e78c27c182cefe8a1da2fe2980d6e2fd43a2e1db1bd7ff30f1eef79faa277b",
+        "blockNumber": 14,
+        "result": {
+          "gasUsed": "0x16c6",
+          "output": "0x03"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x1a9f6256886437cfa21ee7685dd7a996024bea4d4bf6554b14787a6c9e5b90e6",
+        "transactionPosition": 2,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00a0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x69e9470ef04a4188a806f3474b03001845fd3722f4c7c58589ef7623549f8dc8",
+        "blockNumber": 15,
+        "result": {
+          "gasUsed": "0x30b",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x293cefc718137a74d36a5da204e3617604a9e8dfc79b6a6efb11056b3efd3b4a",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00b0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x69e9470ef04a4188a806f3474b03001845fd3722f4c7c58589ef7623549f8dc8",
+        "blockNumber": 15,
+        "result": {
+          "gasUsed": "0x485",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xb19370be2ace59794ee9bb5a69db98464cd6cb0b02b9afb3b978c9aad2bf5417",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00c0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x7d3d4c1129ebce54739fedf2642ea2cfaeafa48c2c489a11512d95f578f92abc",
+        "blockNumber": 16,
+        "error": "Bad instruction",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x6aed559a5dcf73efa132d8182585c40fdc6ef3b99a7629d80ffd4a62cb3db622",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00d0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x7d3d4c1129ebce54739fedf2642ea2cfaeafa48c2c489a11512d95f578f92abc",
+        "blockNumber": 16,
+        "error": "Stack underflow",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xb39fa8a1cb1db4663dc3733bc014d524e90a862bf2607e028eeb3932d92574fe",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00e0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x7d3d4c1129ebce54739fedf2642ea2cfaeafa48c2c489a11512d95f578f92abc",
+        "blockNumber": 16,
+        "error": "Bad jump destination",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x11a725053a6ece79d8de11cb75dd1f09c40dcd109a1c63573e847ad4f456a296",
+        "transactionPosition": 2,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00f0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xfde8b9bcfdc9f75845f3eb9920107e51844478a09ec430dae2df741200da3058",
+        "blockNumber": 17,
+        "result": {
+          "gasUsed": "0xf",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x93d974a14c784be231a7b580a6476a330e5d6f9ddfef70a6b5cacd9f91a1e495",
+        "transactionPosition": 0,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_19_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_19_all_0x000.json
new file mode 100644
index 00000000000..27454eaed14
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_19_all_0x000.json
@@ -0,0 +1,46 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 19,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0000000000000000000000000000000000000999",
+          "value": "0x1"
+        },
+        "blockHash": "0xf07e45fae684d31ce732c3026e57c810d4f236261aa39b20017137c348ffac4b",
+        "blockNumber": 2,
+        "result": {
+          "gasUsed": "0x0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x28fa8042c7b5835f4f91fc20937f3e70dcf3585c1afe31202bb6075185f9abfe",
+        "transactionPosition": 0,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_19_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_19_all_all.json
new file mode 100644
index 00000000000..bd9ba738dd2
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_19_all_all.json
@@ -0,0 +1,377 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 19
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0000000000000000000000000000000000000999",
+          "value": "0x1"
+        },
+        "blockHash": "0xf07e45fae684d31ce732c3026e57c810d4f236261aa39b20017137c348ffac4b",
+        "blockNumber": 2,
+        "result": {
+          "gasUsed": "0x0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x28fa8042c7b5835f4f91fc20937f3e70dcf3585c1afe31202bb6075185f9abfe",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xf07e45fae684d31ce732c3026e57c810d4f236261aa39b20017137c348ffac4b",
+        "blockNumber": 2,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "creationMethod": "create",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xff300e",
+          "init": "0x6004600c60003960046000f3600035ff",
+          "value": "0x0"
+        },
+        "blockHash": "0x47a62e941d567d1d7411b32ff38bdef817357d226a0204c285e8db27b3808554",
+        "blockNumber": 3,
+        "result": {
+          "address": "0xf12b5dd4ead5f743c6baa640b0216200e89b60da",
+          "code": "0x600035ff",
+          "gasUsed": "0x338"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x8d5477f0aae852c3e9487b0f8e7b9ecf9ccdf23d7934d4b4b7eff40c271031e5",
+        "transactionPosition": 0,
+        "type": "create"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x47a62e941d567d1d7411b32ff38bdef817357d226a0204c285e8db27b3808554",
+        "blockNumber": 3,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabba",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x9c58",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x4de634fe767d1f6d0512ca0c9c0a054d3a2596f7cdd7c1eea5f93046a740b3c7",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffabba",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x2728",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xf882ec206292910527fd7095e59a1ca027b873296f1eba3886aa1addc4ff0ab9",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffabc6",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x16c0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x7ca6bf869e8882216f7443accb8d642df41af5bfa3a0e63bf03be2cfe629a030",
+        "transactionPosition": 2,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabd2",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcad905f558c932b0dd40ffac69b021569a24388ae5f00e6d91cfe99ca6eb69df",
+        "blockNumber": 5,
+        "result": {
+          "gasUsed": "0x16c0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xdb2cd5e93dedae66371fc4a95452c746e11f7d2097464707597b8807c889ef5b",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xcad905f558c932b0dd40ffac69b021569a24388ae5f00e6d91cfe99ca6eb69df",
+        "blockNumber": 5,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad82",
+          "input": "0x0000000000000000000000000000000000000999",
+          "to": "0x0020000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": {
+          "gasUsed": "0x7536",
+          "output": "0x"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "address": "0x0020000000000000000000000000000000000000",
+          "balance": "0x300",
+          "refundAddress": "0x0000000000000999000000000000000000000000"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [
+          0
+        ],
+        "transactionHash": "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e",
+        "transactionPosition": 0,
+        "type": "suicide"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad52",
+          "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0030000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xeed85fe57db751442c826cfe4fdf43b10a5c2bc8b6fd3a8ccced48eb3fb35885",
+        "blockNumber": 7,
+        "result": {
+          "gasUsed": "0x1b",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x47f4d445ea1812cb1ddd3464ab23d2bfc6ed408a8a9db1c497f94e8e06e85286",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xeed85fe57db751442c826cfe4fdf43b10a5c2bc8b6fd3a8ccced48eb3fb35885",
+        "blockNumber": 7,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": {
+          "gasUsed": "0x30a",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0xa29f9d6a4f183f4c22c4857544a9a6b69c48d7bb8a97652be06e50bb69470666",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x0040000000000000000000000000000000000000",
+          "gas": "0xfbab36",
+          "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0030000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": {
+          "gasUsed": "0x1b",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 0,
+        "traceAddress": [
+          0
+        ],
+        "transactionHash": "0xa29f9d6a4f183f4c22c4857544a9a6b69c48d7bb8a97652be06e50bb69470666",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabae",
+          "input": "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x650cefaa3eae1542dfd6f6fbdee553d743393369887a9dce7b658ca93069fee2",
+        "blockNumber": 9,
+        "result": {
+          "gasUsed": "0x8fa",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x4af0ef28fbfcbdee7cc5925797c1b9030b3848c2f63f92737c3fe76b45582af5",
+        "transactionPosition": 0,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_2_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_2_0xfe3_0x000.json
new file mode 100644
index 00000000000..3f1b8665af8
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_2_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_2_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_2_0xfe3_all.json
new file mode 100644
index 00000000000..eb3e71e373c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_2_0xfe3_all.json
@@ -0,0 +1,67 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabba",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x9c58",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x4de634fe767d1f6d0512ca0c9c0a054d3a2596f7cdd7c1eea5f93046a740b3c7",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabd2",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcad905f558c932b0dd40ffac69b021569a24388ae5f00e6d91cfe99ca6eb69df",
+        "blockNumber": 5,
+        "result": {
+          "gasUsed": "0x16c0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xdb2cd5e93dedae66371fc4a95452c746e11f7d2097464707597b8807c889ef5b",
+        "transactionPosition": 0,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_2_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_2_all_0x000.json
new file mode 100644
index 00000000000..c4298dabb43
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_2_all_0x000.json
@@ -0,0 +1,46 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 2,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0000000000000000000000000000000000000999",
+          "value": "0x1"
+        },
+        "blockHash": "0xf07e45fae684d31ce732c3026e57c810d4f236261aa39b20017137c348ffac4b",
+        "blockNumber": 2,
+        "result": {
+          "gasUsed": "0x0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x28fa8042c7b5835f4f91fc20937f3e70dcf3585c1afe31202bb6075185f9abfe",
+        "transactionPosition": 0,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_2_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_2_all_all.json
new file mode 100644
index 00000000000..a25b63f9588
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_0_count_2_all_all.json
@@ -0,0 +1,58 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x21",
+        "after": 0,
+        "count": 2
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0000000000000000000000000000000000000999",
+          "value": "0x1"
+        },
+        "blockHash": "0xf07e45fae684d31ce732c3026e57c810d4f236261aa39b20017137c348ffac4b",
+        "blockNumber": 2,
+        "result": {
+          "gasUsed": "0x0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x28fa8042c7b5835f4f91fc20937f3e70dcf3585c1afe31202bb6075185f9abfe",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xf07e45fae684d31ce732c3026e57c810d4f236261aa39b20017137c348ffac4b",
+        "blockNumber": 2,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_19_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_19_0xfe3_0x000.json
new file mode 100644
index 00000000000..b65e09423fb
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_19_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_19_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_19_0xfe3_all.json
new file mode 100644
index 00000000000..606803a7225
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_19_0xfe3_all.json
@@ -0,0 +1,413 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 19,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad82",
+          "input": "0x0000000000000000000000000000000000000999",
+          "to": "0x0020000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": {
+          "gasUsed": "0x7536",
+          "output": "0x"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad52",
+          "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0030000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xeed85fe57db751442c826cfe4fdf43b10a5c2bc8b6fd3a8ccced48eb3fb35885",
+        "blockNumber": 7,
+        "result": {
+          "gasUsed": "0x1b",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x47f4d445ea1812cb1ddd3464ab23d2bfc6ed408a8a9db1c497f94e8e06e85286",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": {
+          "gasUsed": "0x30a",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0xa29f9d6a4f183f4c22c4857544a9a6b69c48d7bb8a97652be06e50bb69470666",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabae",
+          "input": "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x650cefaa3eae1542dfd6f6fbdee553d743393369887a9dce7b658ca93069fee2",
+        "blockNumber": 9,
+        "result": {
+          "gasUsed": "0x8fa",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x4af0ef28fbfcbdee7cc5925797c1b9030b3848c2f63f92737c3fe76b45582af5",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0050000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xf020928933dc70cc8b6034b6881501cb6cbf57cacd8cfb01ed6b2329e68e7073",
+        "blockNumber": 10,
+        "result": {
+          "gasUsed": "0x30a",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x4ec95b7de430b61fc9a57ed35274fd766b7f5fac5213ab946963eb528deae6b5",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0060000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x61bfd9fcaa09a2a9df0276acce68b5212d42bebab67034aa6603cc6dfbb70db5",
+        "blockNumber": 11,
+        "result": {
+          "gasUsed": "0x308",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x6f77512ee9d43474a884c0703c86712fb98dca772fa6e12252786e3e23f196c1",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0070000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x9ac8374676c21436e676693b9b4162120e946a73625d07c9dd78718054327c87",
+        "blockNumber": 12,
+        "result": {
+          "gasUsed": "0x1e",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x12e4a98e63825852a69d7702202a3b593e4059ec913c479443665d590da18724",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0080000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xfc8c590f4fc52847a23c83df28ca920a6b76e587ba68ce1e85b67a6154be320a",
+        "blockNumber": 13,
+        "result": {
+          "gasUsed": "0xf",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x547c7e2fcdf9f88b03b4f4184d667d6768c669f279785774d0cf42435cab06f1",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0090000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xd8e78c27c182cefe8a1da2fe2980d6e2fd43a2e1db1bd7ff30f1eef79faa277b",
+        "blockNumber": 14,
+        "result": {
+          "gasUsed": "0x515e",
+          "output": "0x01"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xe3ebc73c55176c3f2e72b289f8a9cefbcd5b25dcd205db5661f81b0bb974fa73",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0090000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xd8e78c27c182cefe8a1da2fe2980d6e2fd43a2e1db1bd7ff30f1eef79faa277b",
+        "blockNumber": 14,
+        "result": {
+          "gasUsed": "0x16c6",
+          "output": "0x02"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xb4dc55ca4a7c1f72402860c594efaa7da32035003f8e203b7f6a3cf1826685a5",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0090000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xd8e78c27c182cefe8a1da2fe2980d6e2fd43a2e1db1bd7ff30f1eef79faa277b",
+        "blockNumber": 14,
+        "result": {
+          "gasUsed": "0x16c6",
+          "output": "0x03"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x1a9f6256886437cfa21ee7685dd7a996024bea4d4bf6554b14787a6c9e5b90e6",
+        "transactionPosition": 2,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00a0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x69e9470ef04a4188a806f3474b03001845fd3722f4c7c58589ef7623549f8dc8",
+        "blockNumber": 15,
+        "result": {
+          "gasUsed": "0x30b",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x293cefc718137a74d36a5da204e3617604a9e8dfc79b6a6efb11056b3efd3b4a",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00b0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x69e9470ef04a4188a806f3474b03001845fd3722f4c7c58589ef7623549f8dc8",
+        "blockNumber": 15,
+        "result": {
+          "gasUsed": "0x485",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xb19370be2ace59794ee9bb5a69db98464cd6cb0b02b9afb3b978c9aad2bf5417",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00c0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x7d3d4c1129ebce54739fedf2642ea2cfaeafa48c2c489a11512d95f578f92abc",
+        "blockNumber": 16,
+        "error": "Bad instruction",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x6aed559a5dcf73efa132d8182585c40fdc6ef3b99a7629d80ffd4a62cb3db622",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00d0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x7d3d4c1129ebce54739fedf2642ea2cfaeafa48c2c489a11512d95f578f92abc",
+        "blockNumber": 16,
+        "error": "Stack underflow",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xb39fa8a1cb1db4663dc3733bc014d524e90a862bf2607e028eeb3932d92574fe",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00e0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x7d3d4c1129ebce54739fedf2642ea2cfaeafa48c2c489a11512d95f578f92abc",
+        "blockNumber": 16,
+        "error": "Bad jump destination",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x11a725053a6ece79d8de11cb75dd1f09c40dcd109a1c63573e847ad4f456a296",
+        "transactionPosition": 2,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x00f0000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xfde8b9bcfdc9f75845f3eb9920107e51844478a09ec430dae2df741200da3058",
+        "blockNumber": 17,
+        "result": {
+          "gasUsed": "0xf",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x93d974a14c784be231a7b580a6476a330e5d6f9ddfef70a6b5cacd9f91a1e495",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0100000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x220bc13dc4f1ed38dcca927a5be15eca16497d279f4c40d7b8fe9704eadf1464",
+        "blockNumber": 18,
+        "result": {
+          "gasUsed": "0x1e",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x2a5079cc535c429f668f13a7fb9a28bdba6831b5462bd04f781777b332a8fcbd",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffadea",
+          "input": "0x",
+          "to": "0x0110000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x220bc13dc4f1ed38dcca927a5be15eca16497d279f4c40d7b8fe9704eadf1464",
+        "blockNumber": 18,
+        "error": "Reverted",
+        "revertReason" : "0x7d88c1856cc95352",
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xc388baa0e55e6b73e850b22dc7e9853700f6b995fd55d95dd6ccd5a13d63c566",
+        "transactionPosition": 1,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_19_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_19_all_0x000.json
new file mode 100644
index 00000000000..3ea9770712d
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_19_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 19,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_19_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_19_all_all.json
new file mode 100644
index 00000000000..b3d82df79d3
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_19_all_all.json
@@ -0,0 +1,388 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 19
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "creationMethod": "create",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xff300e",
+          "init": "0x6004600c60003960046000f3600035ff",
+          "value": "0x0"
+        },
+        "blockHash": "0x47a62e941d567d1d7411b32ff38bdef817357d226a0204c285e8db27b3808554",
+        "blockNumber": 3,
+        "result": {
+          "address": "0xf12b5dd4ead5f743c6baa640b0216200e89b60da",
+          "code": "0x600035ff",
+          "gasUsed": "0x338"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x8d5477f0aae852c3e9487b0f8e7b9ecf9ccdf23d7934d4b4b7eff40c271031e5",
+        "transactionPosition": 0,
+        "type": "create"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x47a62e941d567d1d7411b32ff38bdef817357d226a0204c285e8db27b3808554",
+        "blockNumber": 3,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabba",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x9c58",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x4de634fe767d1f6d0512ca0c9c0a054d3a2596f7cdd7c1eea5f93046a740b3c7",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffabba",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x2728",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xf882ec206292910527fd7095e59a1ca027b873296f1eba3886aa1addc4ff0ab9",
+        "transactionPosition": 1,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xffabc6",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": {
+          "gasUsed": "0x16c0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x7ca6bf869e8882216f7443accb8d642df41af5bfa3a0e63bf03be2cfe629a030",
+        "transactionPosition": 2,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+        "blockNumber": 4,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabd2",
+          "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to": "0x0010000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcad905f558c932b0dd40ffac69b021569a24388ae5f00e6d91cfe99ca6eb69df",
+        "blockNumber": 5,
+        "result": {
+          "gasUsed": "0x16c0",
+          "output": "0x"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0xdb2cd5e93dedae66371fc4a95452c746e11f7d2097464707597b8807c889ef5b",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xcad905f558c932b0dd40ffac69b021569a24388ae5f00e6d91cfe99ca6eb69df",
+        "blockNumber": 5,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad82",
+          "input": "0x0000000000000000000000000000000000000999",
+          "to": "0x0020000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": {
+          "gasUsed": "0x7536",
+          "output": "0x"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "address": "0x0020000000000000000000000000000000000000",
+          "balance": "0x300",
+          "refundAddress": "0x0000000000000999000000000000000000000000"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [
+          0
+        ],
+        "transactionHash": "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e",
+        "transactionPosition": 0,
+        "type": "suicide"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad52",
+          "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0030000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xeed85fe57db751442c826cfe4fdf43b10a5c2bc8b6fd3a8ccced48eb3fb35885",
+        "blockNumber": 7,
+        "result": {
+          "gasUsed": "0x1b",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x47f4d445ea1812cb1ddd3464ab23d2bfc6ed408a8a9db1c497f94e8e06e85286",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0xeed85fe57db751442c826cfe4fdf43b10a5c2bc8b6fd3a8ccced48eb3fb35885",
+        "blockNumber": 7,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffacc6",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": {
+          "gasUsed": "0x30a",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0xa29f9d6a4f183f4c22c4857544a9a6b69c48d7bb8a97652be06e50bb69470666",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x0040000000000000000000000000000000000000",
+          "gas": "0xfbab36",
+          "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0030000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": {
+          "gasUsed": "0x1b",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 0,
+        "traceAddress": [
+          0
+        ],
+        "transactionHash": "0xa29f9d6a4f183f4c22c4857544a9a6b69c48d7bb8a97652be06e50bb69470666",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+        "blockNumber": 8,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffabae",
+          "input": "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x650cefaa3eae1542dfd6f6fbdee553d743393369887a9dce7b658ca93069fee2",
+        "blockNumber": 9,
+        "result": {
+          "gasUsed": "0x8fa",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x4af0ef28fbfcbdee7cc5925797c1b9030b3848c2f63f92737c3fe76b45582af5",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x0040000000000000000000000000000000000000",
+          "gas": "0xfbaa17",
+          "input": "0x00000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x650cefaa3eae1542dfd6f6fbdee553d743393369887a9dce7b658ca93069fee2",
+        "blockNumber": 9,
+        "result": {
+          "gasUsed": "0x5ff",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [
+          0
+        ],
+        "transactionHash": "0x4af0ef28fbfcbdee7cc5925797c1b9030b3848c2f63f92737c3fe76b45582af5",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0x0040000000000000000000000000000000000000",
+          "gas": "0xf7b88c",
+          "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0040000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0x650cefaa3eae1542dfd6f6fbdee553d743393369887a9dce7b658ca93069fee2",
+        "blockNumber": 9,
+        "result": {
+          "gasUsed": "0x30a",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 1,
+        "traceAddress": [
+          0,
+          0
+        ],
+        "transactionHash": "0x4af0ef28fbfcbdee7cc5925797c1b9030b3848c2f63f92737c3fe76b45582af5",
+        "transactionPosition": 0,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_2_0xfe3_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_2_0xfe3_0x000.json
new file mode 100644
index 00000000000..c5691b803ef
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_2_0xfe3_0x000.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ],
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_2_0xfe3_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_2_0xfe3_all.json
new file mode 100644
index 00000000000..b1b1fd5b521
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_2_0xfe3_all.json
@@ -0,0 +1,67 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 2,
+        "fromAddress": [
+          "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad82",
+          "input": "0x0000000000000000000000000000000000000999",
+          "to": "0x0020000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+        "blockNumber": 6,
+        "result": {
+          "gasUsed": "0x7536",
+          "output": "0x"
+        },
+        "subtraces": 1,
+        "traceAddress": [],
+        "transactionHash": "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e",
+        "transactionPosition": 0,
+        "type": "call"
+      },
+      {
+        "action": {
+          "callType": "call",
+          "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas": "0xffad52",
+          "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to": "0x0030000000000000000000000000000000000000",
+          "value": "0x0"
+        },
+        "blockHash": "0xeed85fe57db751442c826cfe4fdf43b10a5c2bc8b6fd3a8ccced48eb3fb35885",
+        "blockNumber": 7,
+        "result": {
+          "gasUsed": "0x1b",
+          "output": "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x47f4d445ea1812cb1ddd3464ab23d2bfc6ed408a8a9db1c497f94e8e06e85286",
+        "transactionPosition": 0,
+        "type": "call"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_2_all_0x000.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_2_all_0x000.json
new file mode 100644
index 00000000000..d48008cdfb9
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_2_all_0x000.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 2,
+        "toAddress": [
+          "0x0000000000000000000000000000000000000999"
+        ]
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_2_all_all.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_2_all_all.json
new file mode 100644
index 00000000000..14ef879b0d5
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-filter/trace_filter_0x2_0x21_after_2_count_2_all_all.json
@@ -0,0 +1,58 @@
+{
+  "request": {
+    "jsonrpc": "2.0",
+    "method": "trace_filter",
+    "params": [
+      {
+        "fromBlock": "0x2",
+        "toBlock": "0x21",
+        "after": 2,
+        "count": 2
+      }
+    ],
+    "id": 415
+  },
+  "response": {
+    "jsonrpc": "2.0",
+    "result": [
+      {
+        "action": {
+          "creationMethod": "create",
+          "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas": "0xff300e",
+          "init": "0x6004600c60003960046000f3600035ff",
+          "value": "0x0"
+        },
+        "blockHash": "0x47a62e941d567d1d7411b32ff38bdef817357d226a0204c285e8db27b3808554",
+        "blockNumber": 3,
+        "result": {
+          "address": "0xf12b5dd4ead5f743c6baa640b0216200e89b60da",
+          "code": "0x600035ff",
+          "gasUsed": "0x338"
+        },
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": "0x8d5477f0aae852c3e9487b0f8e7b9ecf9ccdf23d7934d4b4b7eff40c271031e5",
+        "transactionPosition": 0,
+        "type": "create"
+      },
+      {
+        "action": {
+          "author": "0x0000000000000000000000000000000000000000",
+          "rewardType": "block",
+          "value": "0x1bc16d674ec80000"
+        },
+        "blockHash": "0x47a62e941d567d1d7411b32ff38bdef817357d226a0204c285e8db27b3808554",
+        "blockNumber": 3,
+        "result": null,
+        "subtraces": 0,
+        "traceAddress": [],
+        "transactionHash": null,
+        "transactionPosition": null,
+        "type": "reward"
+      }
+    ],
+    "id": 415
+  },
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_02_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_02_0_0_trace.json
new file mode 100644
index 00000000000..58a574cdb59
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_02_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Simple value transfer",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x28fa8042c7b5835f4f91fc20937f3e70dcf3585c1afe31202bb6075185f9abfe", [ ] ],
+    "id" : 197
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+        "gas" : "0xffadea",
+        "input" : "0x",
+        "to" : "0x0000000000000000000000000000000000000999",
+        "value" : "0x1"
+      },
+      "blockHash" : "0xf07e45fae684d31ce732c3026e57c810d4f236261aa39b20017137c348ffac4b",
+      "blockNumber" : 2,
+      "result" : {
+        "gasUsed" : "0x0",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x28fa8042c7b5835f4f91fc20937f3e70dcf3585c1afe31202bb6075185f9abfe",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 197
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_03_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_03_0_0_trace.json
new file mode 100644
index 00000000000..2b08f1135c3
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_03_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x8d5477f0aae852c3e9487b0f8e7b9ecf9ccdf23d7934d4b4b7eff40c271031e5", [ ] ],
+    "id" : 200
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "creationMethod": "create",
+        "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+        "gas" : "0xff300e",
+        "init" : "0x6004600c60003960046000f3600035ff",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x47a62e941d567d1d7411b32ff38bdef817357d226a0204c285e8db27b3808554",
+      "blockNumber" : 3,
+      "result" : {
+        "address" : "0xf12b5dd4ead5f743c6baa640b0216200e89b60da",
+        "code" : "0x600035ff",
+        "gasUsed" : "0x338"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x8d5477f0aae852c3e9487b0f8e7b9ecf9ccdf23d7934d4b4b7eff40c271031e5",
+      "transactionPosition" : 0,
+      "type" : "create"
+    },
+    "id" : 200
+  },
+  "statusCode" : 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_04_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_04_0_0_trace.json
new file mode 100644
index 00000000000..b5b813482cc
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_04_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,1),(2,2)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x4de634fe767d1f6d0512ca0c9c0a054d3a2596f7cdd7c1eea5f93046a740b3c7", [ ] ],
+    "id" : 203
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffabba",
+        "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+        "to" : "0x0010000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+      "blockNumber" : 4,
+      "result" : {
+        "gasUsed" : "0x9c58",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x4de634fe767d1f6d0512ca0c9c0a054d3a2596f7cdd7c1eea5f93046a740b3c7",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 203
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_04_1_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_04_1_0_trace.json
new file mode 100644
index 00000000000..b5539b5ccae
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_04_1_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(2,4)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xf882ec206292910527fd7095e59a1ca027b873296f1eba3886aa1addc4ff0ab9", [ ] ],
+    "id" : 206
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+        "gas" : "0xffabba",
+        "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+        "to" : "0x0010000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+      "blockNumber" : 4,
+      "result" : {
+        "gasUsed" : "0x2728",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0xf882ec206292910527fd7095e59a1ca027b873296f1eba3886aa1addc4ff0ab9",
+      "transactionPosition" : 1,
+      "type" : "call"
+    },
+    "id" : 206
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_04_2_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_04_2_0_trace.json
new file mode 100644
index 00000000000..a4cd655c576
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_04_2_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(1,0)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x7ca6bf869e8882216f7443accb8d642df41af5bfa3a0e63bf03be2cfe629a030", [ ] ],
+    "id" : 209
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+        "gas" : "0xffabc6",
+        "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+        "to" : "0x0010000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0xa1221b6473a02f05fd7235f3b336c9a061c04e74afc0034e8d6207148149d2be",
+      "blockNumber" : 4,
+      "result" : {
+        "gasUsed" : "0x16c0",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x7ca6bf869e8882216f7443accb8d642df41af5bfa3a0e63bf03be2cfe629a030",
+      "transactionPosition" : 2,
+      "type" : "call"
+    },
+    "id" : 209
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_05_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_05_0_0_trace.json
new file mode 100644
index 00000000000..b8e5aa7a463
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_05_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Clear contract storage keys 1 and 2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xdb2cd5e93dedae66371fc4a95452c746e11f7d2097464707597b8807c889ef5b", [ ] ],
+    "id" : 212
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffabd2",
+        "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+        "to" : "0x0010000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0xcad905f558c932b0dd40ffac69b021569a24388ae5f00e6d91cfe99ca6eb69df",
+      "blockNumber" : 5,
+      "result" : {
+        "gasUsed" : "0x16c0",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0xdb2cd5e93dedae66371fc4a95452c746e11f7d2097464707597b8807c889ef5b",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 212
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_06_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_06_0_0_trace.json
new file mode 100644
index 00000000000..f8274584219
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_06_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Self destruct and send contract balance to address provided in the data field.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e", [ ] ],
+    "id" : 215
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffad82",
+        "input" : "0x0000000000000000000000000000000000000999",
+        "to" : "0x0020000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+      "blockNumber" : 6,
+      "result" : {
+        "gasUsed" : "0x7536",
+        "output" : "0x"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 215
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_06_0_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_06_0_1_trace.json
new file mode 100644
index 00000000000..2fb482d6881
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_06_0_1_trace.json
@@ -0,0 +1,29 @@
+{
+  "comment" : "Self destruct and send contract balance to address provided in the data field.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e", [ "0x0" ] ],
+    "id" : 216
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "address" : "0x0020000000000000000000000000000000000000",
+        "balance" : "0x300",
+        "refundAddress" : "0x0000000000000999000000000000000000000000"
+      },
+      "blockHash" : "0xcd5d9c7acdcbd3fb4b24a39e05a38e32235751bb0c9e4f1aa16dc598a2c2a9e4",
+      "blockNumber" : 6,
+      "result" : null,
+      "subtraces" : 0,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0x91eeabc671e2dd2b1c8ddebb46ba59e8cb3e7d189f80bcc868a9787728c6e59e",
+      "transactionPosition" : 0,
+      "type" : "suicide"
+    },
+    "id" : 216
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_07_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_07_0_0_trace.json
new file mode 100644
index 00000000000..e55c10d36e5
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_07_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Increment 32 bytes provided in data field and return the value.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x47f4d445ea1812cb1ddd3464ab23d2bfc6ed408a8a9db1c497f94e8e06e85286", [ ] ],
+    "id" : 219
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffad52",
+        "input" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+        "to" : "0x0030000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0xeed85fe57db751442c826cfe4fdf43b10a5c2bc8b6fd3a8ccced48eb3fb35885",
+      "blockNumber" : 7,
+      "result" : {
+        "gasUsed" : "0x1b",
+        "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x47f4d445ea1812cb1ddd3464ab23d2bfc6ed408a8a9db1c497f94e8e06e85286",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 219
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_08_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_08_0_0_trace.json
new file mode 100644
index 00000000000..ef03e8c52fa
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_08_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xa29f9d6a4f183f4c22c4857544a9a6b69c48d7bb8a97652be06e50bb69470666", [ ] ],
+    "id" : 222
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffacc6",
+        "input" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+        "to" : "0x0040000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+      "blockNumber" : 8,
+      "result" : {
+        "gasUsed" : "0x30a",
+        "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ ],
+      "transactionHash" : "0xa29f9d6a4f183f4c22c4857544a9a6b69c48d7bb8a97652be06e50bb69470666",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 222
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_08_0_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_08_0_1_trace.json
new file mode 100644
index 00000000000..93c5794e46b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_08_0_1_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xa29f9d6a4f183f4c22c4857544a9a6b69c48d7bb8a97652be06e50bb69470666", [ "0x0" ] ],
+    "id" : 223
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x0040000000000000000000000000000000000000",
+        "gas" : "0xfbab36",
+        "input" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+        "to" : "0x0030000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x35a8bb01d5da479278581033c58e242e6dd65606d4b5ee7332e074c849af2fe8",
+      "blockNumber" : 8,
+      "result" : {
+        "gasUsed" : "0x1b",
+        "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0xa29f9d6a4f183f4c22c4857544a9a6b69c48d7bb8a97652be06e50bb69470666",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 223
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_09_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_09_0_0_trace.json
new file mode 100644
index 00000000000..ea2aa90d7fb
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_09_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Proxy call to another contract - several levels deep. Using CALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x4af0ef28fbfcbdee7cc5925797c1b9030b3848c2f63f92737c3fe76b45582af5", [ ] ],
+    "id" : 226
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffabae",
+        "input" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+        "to" : "0x0040000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x650cefaa3eae1542dfd6f6fbdee553d743393369887a9dce7b658ca93069fee2",
+      "blockNumber" : 9,
+      "result" : {
+        "gasUsed" : "0x8fa",
+        "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x4af0ef28fbfcbdee7cc5925797c1b9030b3848c2f63f92737c3fe76b45582af5",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 226
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_09_0_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_09_0_1_trace.json
new file mode 100644
index 00000000000..cff8a78fbd7
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_09_0_1_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Proxy call to another contract - several levels deep. Using CALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x4af0ef28fbfcbdee7cc5925797c1b9030b3848c2f63f92737c3fe76b45582af5", [ "0x0" ] ],
+    "id" : 227
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x0040000000000000000000000000000000000000",
+        "gas" : "0xfbaa17",
+        "input" : "0x00000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+        "to" : "0x0040000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x650cefaa3eae1542dfd6f6fbdee553d743393369887a9dce7b658ca93069fee2",
+      "blockNumber" : 9,
+      "result" : {
+        "gasUsed" : "0x5ff",
+        "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0x4af0ef28fbfcbdee7cc5925797c1b9030b3848c2f63f92737c3fe76b45582af5",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 227
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_09_0_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_09_0_2_trace.json
new file mode 100644
index 00000000000..048c8e13dc7
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_09_0_2_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Proxy call to another contract - several levels deep. Using CALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x4af0ef28fbfcbdee7cc5925797c1b9030b3848c2f63f92737c3fe76b45582af5", [ "0x0", "0x0" ] ],
+    "id" : 228
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x0040000000000000000000000000000000000000",
+        "gas" : "0xf7b88c",
+        "input" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+        "to" : "0x0040000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x650cefaa3eae1542dfd6f6fbdee553d743393369887a9dce7b658ca93069fee2",
+      "blockNumber" : 9,
+      "result" : {
+        "gasUsed" : "0x30a",
+        "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ 0, 0 ],
+      "transactionHash" : "0x4af0ef28fbfcbdee7cc5925797c1b9030b3848c2f63f92737c3fe76b45582af5",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 228
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_09_0_3_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_09_0_3_trace.json
new file mode 100644
index 00000000000..950ed9dd74b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_09_0_3_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Proxy call to another contract - several levels deep. Using CALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x4af0ef28fbfcbdee7cc5925797c1b9030b3848c2f63f92737c3fe76b45582af5", [ "0x0", "0x0", "0x0" ] ],
+    "id" : 229
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x0040000000000000000000000000000000000000",
+        "gas" : "0xf3d6cd",
+        "input" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+        "to" : "0x0030000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x650cefaa3eae1542dfd6f6fbdee553d743393369887a9dce7b658ca93069fee2",
+      "blockNumber" : 9,
+      "result" : {
+        "gasUsed" : "0x1b",
+        "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ 0, 0, 0 ],
+      "transactionHash" : "0x4af0ef28fbfcbdee7cc5925797c1b9030b3848c2f63f92737c3fe76b45582af5",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 229
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0a_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0a_0_0_trace.json
new file mode 100644
index 00000000000..a8fc8d10e87
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0a_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep. Using CALLCODE.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x4ec95b7de430b61fc9a57ed35274fd766b7f5fac5213ab946963eb528deae6b5", [ ] ],
+    "id" : 232
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffacc6",
+        "input" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+        "to" : "0x0050000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0xf020928933dc70cc8b6034b6881501cb6cbf57cacd8cfb01ed6b2329e68e7073",
+      "blockNumber" : 10,
+      "result" : {
+        "gasUsed" : "0x30a",
+        "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x4ec95b7de430b61fc9a57ed35274fd766b7f5fac5213ab946963eb528deae6b5",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 232
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0a_0_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0a_0_1_trace.json
new file mode 100644
index 00000000000..aa93ccef3c8
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0a_0_1_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep. Using CALLCODE.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x4ec95b7de430b61fc9a57ed35274fd766b7f5fac5213ab946963eb528deae6b5", [ "0x0" ] ],
+    "id" : 233
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "callcode",
+        "from" : "0x0050000000000000000000000000000000000000",
+        "gas" : "0xfbab36",
+        "input" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+        "to" : "0x0030000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0xf020928933dc70cc8b6034b6881501cb6cbf57cacd8cfb01ed6b2329e68e7073",
+      "blockNumber" : 10,
+      "result" : {
+        "gasUsed" : "0x1b",
+        "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0x4ec95b7de430b61fc9a57ed35274fd766b7f5fac5213ab946963eb528deae6b5",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 233
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0b_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0b_0_0_trace.json
new file mode 100644
index 00000000000..b1965504b1b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0b_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep. Using DELEGATECALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x6f77512ee9d43474a884c0703c86712fb98dca772fa6e12252786e3e23f196c1", [ ] ],
+    "id" : 236
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffacc6",
+        "input" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+        "to" : "0x0060000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x61bfd9fcaa09a2a9df0276acce68b5212d42bebab67034aa6603cc6dfbb70db5",
+      "blockNumber" : 11,
+      "result" : {
+        "gasUsed" : "0x308",
+        "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x6f77512ee9d43474a884c0703c86712fb98dca772fa6e12252786e3e23f196c1",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 236
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0b_0_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0b_0_1_trace.json
new file mode 100644
index 00000000000..225ecd47221
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0b_0_1_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep. Using DELEGATECALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x6f77512ee9d43474a884c0703c86712fb98dca772fa6e12252786e3e23f196c1", [ "0x0" ] ],
+    "id" : 237
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "delegatecall",
+        "from" : "0x0060000000000000000000000000000000000000",
+        "gas" : "0xfbab38",
+        "input" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+        "to" : "0x0030000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x61bfd9fcaa09a2a9df0276acce68b5212d42bebab67034aa6603cc6dfbb70db5",
+      "blockNumber" : 11,
+      "result" : {
+        "gasUsed" : "0x1b",
+        "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0x6f77512ee9d43474a884c0703c86712fb98dca772fa6e12252786e3e23f196c1",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 237
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0c_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0c_0_0_trace.json
new file mode 100644
index 00000000000..3f66c435da5
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0c_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Sequential memory modifications with MSTORE8.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x12e4a98e63825852a69d7702202a3b593e4059ec913c479443665d590da18724", [ ] ],
+    "id" : 240
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffadea",
+        "input" : "0x",
+        "to" : "0x0070000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x9ac8374676c21436e676693b9b4162120e946a73625d07c9dd78718054327c87",
+      "blockNumber" : 12,
+      "result" : {
+        "gasUsed" : "0x1e",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x12e4a98e63825852a69d7702202a3b593e4059ec913c479443665d590da18724",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 240
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0d_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0d_0_0_trace.json
new file mode 100644
index 00000000000..e55cecfa2c3
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0d_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Sequential memory modifications with MSTORE.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x547c7e2fcdf9f88b03b4f4184d667d6768c669f279785774d0cf42435cab06f1", [ ] ],
+    "id" : 243
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffadea",
+        "input" : "0x",
+        "to" : "0x0080000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0xfc8c590f4fc52847a23c83df28ca920a6b76e587ba68ce1e85b67a6154be320a",
+      "blockNumber" : 13,
+      "result" : {
+        "gasUsed" : "0xf",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x547c7e2fcdf9f88b03b4f4184d667d6768c669f279785774d0cf42435cab06f1",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 243
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0e_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0e_0_0_trace.json
new file mode 100644
index 00000000000..17efa06c210
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0e_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Increments contract storage 0 by 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xe3ebc73c55176c3f2e72b289f8a9cefbcd5b25dcd205db5661f81b0bb974fa73", [ ] ],
+    "id" : 246
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffadea",
+        "input" : "0x",
+        "to" : "0x0090000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0xd8e78c27c182cefe8a1da2fe2980d6e2fd43a2e1db1bd7ff30f1eef79faa277b",
+      "blockNumber" : 14,
+      "result" : {
+        "gasUsed" : "0x515e",
+        "output" : "0x01"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0xe3ebc73c55176c3f2e72b289f8a9cefbcd5b25dcd205db5661f81b0bb974fa73",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 246
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0e_1_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0e_1_0_trace.json
new file mode 100644
index 00000000000..1d4b71647df
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0e_1_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Increments contract storage 0 by 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xb4dc55ca4a7c1f72402860c594efaa7da32035003f8e203b7f6a3cf1826685a5", [ ] ],
+    "id" : 249
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffadea",
+        "input" : "0x",
+        "to" : "0x0090000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0xd8e78c27c182cefe8a1da2fe2980d6e2fd43a2e1db1bd7ff30f1eef79faa277b",
+      "blockNumber" : 14,
+      "result" : {
+        "gasUsed" : "0x16c6",
+        "output" : "0x02"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0xb4dc55ca4a7c1f72402860c594efaa7da32035003f8e203b7f6a3cf1826685a5",
+      "transactionPosition" : 1,
+      "type" : "call"
+    },
+    "id" : 249
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0e_2_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0e_2_0_trace.json
new file mode 100644
index 00000000000..fffb875e9f0
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0e_2_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Increments contract storage 0 by 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x1a9f6256886437cfa21ee7685dd7a996024bea4d4bf6554b14787a6c9e5b90e6", [ ] ],
+    "id" : 252
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffadea",
+        "input" : "0x",
+        "to" : "0x0090000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0xd8e78c27c182cefe8a1da2fe2980d6e2fd43a2e1db1bd7ff30f1eef79faa277b",
+      "blockNumber" : 14,
+      "result" : {
+        "gasUsed" : "0x16c6",
+        "output" : "0x03"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x1a9f6256886437cfa21ee7685dd7a996024bea4d4bf6554b14787a6c9e5b90e6",
+      "transactionPosition" : 2,
+      "type" : "call"
+    },
+    "id" : 252
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0f_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0f_0_0_trace.json
new file mode 100644
index 00000000000..b5e3956e409
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0f_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Log output with LOG1.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x293cefc718137a74d36a5da204e3617604a9e8dfc79b6a6efb11056b3efd3b4a", [ ] ],
+    "id" : 255
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffadea",
+        "input" : "0x",
+        "to" : "0x00a0000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x69e9470ef04a4188a806f3474b03001845fd3722f4c7c58589ef7623549f8dc8",
+      "blockNumber" : 15,
+      "result" : {
+        "gasUsed" : "0x30b",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x293cefc718137a74d36a5da204e3617604a9e8dfc79b6a6efb11056b3efd3b4a",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 255
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0f_1_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0f_1_0_trace.json
new file mode 100644
index 00000000000..07bdd345032
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_0f_1_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Log output with LOG2.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xb19370be2ace59794ee9bb5a69db98464cd6cb0b02b9afb3b978c9aad2bf5417", [ ] ],
+    "id" : 258
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffadea",
+        "input" : "0x",
+        "to" : "0x00b0000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x69e9470ef04a4188a806f3474b03001845fd3722f4c7c58589ef7623549f8dc8",
+      "blockNumber" : 15,
+      "result" : {
+        "gasUsed" : "0x485",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0xb19370be2ace59794ee9bb5a69db98464cd6cb0b02b9afb3b978c9aad2bf5417",
+      "transactionPosition" : 1,
+      "type" : "call"
+    },
+    "id" : 258
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_10_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_10_0_0_trace.json
new file mode 100644
index 00000000000..a84ebcadbfe
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_10_0_0_trace.json
@@ -0,0 +1,32 @@
+{
+  "comment" : "Various exceptional halt cases. Invalid OPCODE (0x1F).",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x6aed559a5dcf73efa132d8182585c40fdc6ef3b99a7629d80ffd4a62cb3db622", [ ] ],
+    "id" : 261
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffadea",
+        "input" : "0x",
+        "to" : "0x00c0000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x7d3d4c1129ebce54739fedf2642ea2cfaeafa48c2c489a11512d95f578f92abc",
+      "blockNumber" : 16,
+      "error" : "Bad instruction",
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x6aed559a5dcf73efa132d8182585c40fdc6ef3b99a7629d80ffd4a62cb3db622",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 261
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_10_1_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_10_1_0_trace.json
new file mode 100644
index 00000000000..aaa3637b355
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_10_1_0_trace.json
@@ -0,0 +1,32 @@
+{
+  "comment" : "Various exceptional halt cases. INSUFFICIENT_STACK_ITEMS.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xb39fa8a1cb1db4663dc3733bc014d524e90a862bf2607e028eeb3932d92574fe", [ ] ],
+    "id" : 264
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffadea",
+        "input" : "0x",
+        "to" : "0x00d0000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x7d3d4c1129ebce54739fedf2642ea2cfaeafa48c2c489a11512d95f578f92abc",
+      "blockNumber" : 16,
+      "error" : "Stack underflow",
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0xb39fa8a1cb1db4663dc3733bc014d524e90a862bf2607e028eeb3932d92574fe",
+      "transactionPosition" : 1,
+      "type" : "call"
+    },
+    "id" : 264
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_10_2_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_10_2_0_trace.json
new file mode 100644
index 00000000000..694d6fdfec7
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_10_2_0_trace.json
@@ -0,0 +1,32 @@
+{
+  "comment" : "Various exceptional halt cases. INVALID_JUMP_DESTINATION.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x11a725053a6ece79d8de11cb75dd1f09c40dcd109a1c63573e847ad4f456a296", [ ] ],
+    "id" : 267
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffadea",
+        "input" : "0x",
+        "to" : "0x00e0000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x7d3d4c1129ebce54739fedf2642ea2cfaeafa48c2c489a11512d95f578f92abc",
+      "blockNumber" : 16,
+      "error" : "Bad jump destination",
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x11a725053a6ece79d8de11cb75dd1f09c40dcd109a1c63573e847ad4f456a296",
+      "transactionPosition" : 2,
+      "type" : "call"
+    },
+    "id" : 267
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_11_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_11_0_0_trace.json
new file mode 100644
index 00000000000..0ac1421c19a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_11_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Pushes 1, 2, 3, then SWAP2 and SWAP1.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x93d974a14c784be231a7b580a6476a330e5d6f9ddfef70a6b5cacd9f91a1e495", [ ] ],
+    "id" : 270
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffadea",
+        "input" : "0x",
+        "to" : "0x00f0000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0xfde8b9bcfdc9f75845f3eb9920107e51844478a09ec430dae2df741200da3058",
+      "blockNumber" : 17,
+      "result" : {
+        "gasUsed" : "0xf",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x93d974a14c784be231a7b580a6476a330e5d6f9ddfef70a6b5cacd9f91a1e495",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 270
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_12_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_12_0_0_trace.json
new file mode 100644
index 00000000000..40a8d069c53
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_12_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Memory Read.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x2a5079cc535c429f668f13a7fb9a28bdba6831b5462bd04f781777b332a8fcbd", [ ] ],
+    "id" : 273
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffadea",
+        "input" : "0x",
+        "to" : "0x0100000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x220bc13dc4f1ed38dcca927a5be15eca16497d279f4c40d7b8fe9704eadf1464",
+      "blockNumber" : 18,
+      "result" : {
+        "gasUsed" : "0x1e",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x2a5079cc535c429f668f13a7fb9a28bdba6831b5462bd04f781777b332a8fcbd",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 273
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_12_1_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_12_1_0_trace.json
new file mode 100644
index 00000000000..93cab0be43a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_12_1_0_trace.json
@@ -0,0 +1,33 @@
+{
+  "comment" : "Revert. Note revertReason has been manually added to the response because OpenEthereum does not include it.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xc388baa0e55e6b73e850b22dc7e9853700f6b995fd55d95dd6ccd5a13d63c566", [ ] ],
+    "id" : 276
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffadea",
+        "input" : "0x",
+        "to" : "0x0110000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x220bc13dc4f1ed38dcca927a5be15eca16497d279f4c40d7b8fe9704eadf1464",
+      "blockNumber" : 18,
+      "error" : "Reverted",
+      "revertReason" : "0x7d88c1856cc95352",
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0xc388baa0e55e6b73e850b22dc7e9853700f6b995fd55d95dd6ccd5a13d63c566",
+      "transactionPosition" : 1,
+      "type" : "call"
+    },
+    "id" : 276
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_0_0_trace.json
new file mode 100644
index 00000000000..1afd745cc34
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x1309b6d2187aa8b0dfe78fcf0a96d4a3e861bfbc381959d253ede57624a37f9b", [ ] ],
+    "id" : 279
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "creationMethod": "create",
+        "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+        "gas" : "0xff300e",
+        "init" : "0x6004600c60003960046000f3600035ff",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x425ea2cf9bb89c09f131ab531958c4d189b5d047fd924d74f25d49cf47a5a8f1",
+      "blockNumber" : 19,
+      "result" : {
+        "address" : "0x8f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f",
+        "code" : "0x600035ff",
+        "gasUsed" : "0x338"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x1309b6d2187aa8b0dfe78fcf0a96d4a3e861bfbc381959d253ede57624a37f9b",
+      "transactionPosition" : 0,
+      "type" : "create"
+    },
+    "id" : 279
+  },
+  "statusCode" : 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_1_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_1_0_trace.json
new file mode 100644
index 00000000000..cc4d6fef7d9
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_1_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "call the prior contract then call log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x6b9b967cfbeedeb7f0f4956b8103075ddfcea26c01d6d5dc3f9e2ed2ec9c42c0", [ ] ],
+    "id" : 282
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "creationMethod": "create",
+        "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+        "gas" : "0xff2e26",
+        "init" : "0x60006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5af1600060006000600060007300a00000000000000000000000000000000000005af1",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x425ea2cf9bb89c09f131ab531958c4d189b5d047fd924d74f25d49cf47a5a8f1",
+      "blockNumber" : 19,
+      "result" : {
+        "address" : "0x9fbda871d559710256a2502a2517b794b482db40",
+        "code" : "0x",
+        "gasUsed" : "0x1c39"
+      },
+      "subtraces" : 2,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x6b9b967cfbeedeb7f0f4956b8103075ddfcea26c01d6d5dc3f9e2ed2ec9c42c0",
+      "transactionPosition" : 1,
+      "type" : "create"
+    },
+    "id" : 282
+  },
+  "statusCode" : 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_1_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_1_1_trace.json
new file mode 100644
index 00000000000..bbb0a5affe0
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_1_1_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "call the prior contract then call log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x6b9b967cfbeedeb7f0f4956b8103075ddfcea26c01d6d5dc3f9e2ed2ec9c42c0", [ "0x0" ] ],
+    "id" : 283
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x9fbda871d559710256a2502a2517b794b482db40",
+        "gas" : "0xfb2ea9",
+        "input" : "0x",
+        "to" : "0x8f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x425ea2cf9bb89c09f131ab531958c4d189b5d047fd924d74f25d49cf47a5a8f1",
+      "blockNumber" : 19,
+      "result" : {
+        "gasUsed" : "0x138e",
+        "output" : "0x"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0x6b9b967cfbeedeb7f0f4956b8103075ddfcea26c01d6d5dc3f9e2ed2ec9c42c0",
+      "transactionPosition" : 1,
+      "type" : "call"
+    },
+    "id" : 283
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_1_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_1_2_trace.json
new file mode 100644
index 00000000000..beb6a987302
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_1_2_trace.json
@@ -0,0 +1,29 @@
+{
+  "comment" : "call the prior contract then call log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x6b9b967cfbeedeb7f0f4956b8103075ddfcea26c01d6d5dc3f9e2ed2ec9c42c0", [ "0x0", "0x0" ] ],
+    "id" : 284
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "address" : "0x8f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f",
+        "balance" : "0x0",
+        "refundAddress" : "0x0000000000000000000000000000000000000000"
+      },
+      "blockHash" : "0x425ea2cf9bb89c09f131ab531958c4d189b5d047fd924d74f25d49cf47a5a8f1",
+      "blockNumber" : 19,
+      "result" : null,
+      "subtraces" : 0,
+      "traceAddress" : [ 0, 0 ],
+      "transactionHash" : "0x6b9b967cfbeedeb7f0f4956b8103075ddfcea26c01d6d5dc3f9e2ed2ec9c42c0",
+      "transactionPosition" : 1,
+      "type" : "suicide"
+    },
+    "id" : 284
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_1_3_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_1_3_trace.json
new file mode 100644
index 00000000000..63443983a8f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_1_3_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "call the prior contract then call log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x6b9b967cfbeedeb7f0f4956b8103075ddfcea26c01d6d5dc3f9e2ed2ec9c42c0", [ "0x1" ] ],
+    "id" : 285
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x9fbda871d559710256a2502a2517b794b482db40",
+        "gas" : "0xfb18a5",
+        "input" : "0x",
+        "to" : "0x00a0000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x425ea2cf9bb89c09f131ab531958c4d189b5d047fd924d74f25d49cf47a5a8f1",
+      "blockNumber" : 19,
+      "result" : {
+        "gasUsed" : "0x30b",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ 1 ],
+      "transactionHash" : "0x6b9b967cfbeedeb7f0f4956b8103075ddfcea26c01d6d5dc3f9e2ed2ec9c42c0",
+      "transactionPosition" : 1,
+      "type" : "call"
+    },
+    "id" : 285
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_2_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_2_0_trace.json
new file mode 100644
index 00000000000..bee0d9d78b3
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_2_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xf12fd37f0836bd51f21bc15aa6bf5bea4b62fbbd39e1ee06725f91ac13ebc904", [ ] ],
+    "id" : 288
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "creationMethod": "create",
+        "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+        "gas" : "0xff300e",
+        "init" : "0x6004600c60003960046000f3600035ff",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x425ea2cf9bb89c09f131ab531958c4d189b5d047fd924d74f25d49cf47a5a8f1",
+      "blockNumber" : 19,
+      "result" : {
+        "address" : "0x2c2b9c9a4a25e24b174f26114e8926a9f2128fe4",
+        "code" : "0x600035ff",
+        "gasUsed" : "0x338"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0xf12fd37f0836bd51f21bc15aa6bf5bea4b62fbbd39e1ee06725f91ac13ebc904",
+      "transactionPosition" : 2,
+      "type" : "create"
+    },
+    "id" : 288
+  },
+  "statusCode" : 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_3_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_3_0_trace.json
new file mode 100644
index 00000000000..4a78d24084c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_3_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "call the prior contract then callcode log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x4c253746668dca6ac3f7b9bc18248b558a95b5fc881d140872c2dff984d344a7", [ ] ],
+    "id" : 291
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "creationMethod": "create",
+        "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+        "gas" : "0xff2e26",
+        "init" : "0x60006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45af2600060006000600060007300a00000000000000000000000000000000000005af2",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x425ea2cf9bb89c09f131ab531958c4d189b5d047fd924d74f25d49cf47a5a8f1",
+      "blockNumber" : 19,
+      "result" : {
+        "address" : "0x30753e4a8aad7f8597332e813735def5dd395028",
+        "code" : "0x",
+        "gasUsed" : "0x1c39"
+      },
+      "subtraces" : 2,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x4c253746668dca6ac3f7b9bc18248b558a95b5fc881d140872c2dff984d344a7",
+      "transactionPosition" : 3,
+      "type" : "create"
+    },
+    "id" : 291
+  },
+  "statusCode" : 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_3_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_3_1_trace.json
new file mode 100644
index 00000000000..93f7eee4264
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_3_1_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "call the prior contract then callcode log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x4c253746668dca6ac3f7b9bc18248b558a95b5fc881d140872c2dff984d344a7", [ "0x0" ] ],
+    "id" : 292
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "callcode",
+        "from" : "0x30753e4a8aad7f8597332e813735def5dd395028",
+        "gas" : "0xfb2ea9",
+        "input" : "0x",
+        "to" : "0x2c2b9c9a4a25e24b174f26114e8926a9f2128fe4",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x425ea2cf9bb89c09f131ab531958c4d189b5d047fd924d74f25d49cf47a5a8f1",
+      "blockNumber" : 19,
+      "result" : {
+        "gasUsed" : "0x138e",
+        "output" : "0x"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0x4c253746668dca6ac3f7b9bc18248b558a95b5fc881d140872c2dff984d344a7",
+      "transactionPosition" : 3,
+      "type" : "call"
+    },
+    "id" : 292
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_3_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_3_2_trace.json
new file mode 100644
index 00000000000..381f77fe8b6
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_3_2_trace.json
@@ -0,0 +1,29 @@
+{
+  "comment" : "call the prior contract then callcode log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x4c253746668dca6ac3f7b9bc18248b558a95b5fc881d140872c2dff984d344a7", [ "0x0", "0x0" ] ],
+    "id" : 293
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "address" : "0x30753e4a8aad7f8597332e813735def5dd395028",
+        "balance" : "0x0",
+        "refundAddress" : "0x0000000000000000000000000000000000000000"
+      },
+      "blockHash" : "0x425ea2cf9bb89c09f131ab531958c4d189b5d047fd924d74f25d49cf47a5a8f1",
+      "blockNumber" : 19,
+      "result" : null,
+      "subtraces" : 0,
+      "traceAddress" : [ 0, 0 ],
+      "transactionHash" : "0x4c253746668dca6ac3f7b9bc18248b558a95b5fc881d140872c2dff984d344a7",
+      "transactionPosition" : 3,
+      "type" : "suicide"
+    },
+    "id" : 293
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_3_3_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_3_3_trace.json
new file mode 100644
index 00000000000..c51fc92fa03
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_3_3_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "call the prior contract then callcode log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x4c253746668dca6ac3f7b9bc18248b558a95b5fc881d140872c2dff984d344a7", [ "0x1" ] ],
+    "id" : 294
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "callcode",
+        "from" : "0x30753e4a8aad7f8597332e813735def5dd395028",
+        "gas" : "0xfb18a5",
+        "input" : "0x",
+        "to" : "0x00a0000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x425ea2cf9bb89c09f131ab531958c4d189b5d047fd924d74f25d49cf47a5a8f1",
+      "blockNumber" : 19,
+      "result" : {
+        "gasUsed" : "0x30b",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ 1 ],
+      "transactionHash" : "0x4c253746668dca6ac3f7b9bc18248b558a95b5fc881d140872c2dff984d344a7",
+      "transactionPosition" : 3,
+      "type" : "call"
+    },
+    "id" : 294
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_4_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_4_0_trace.json
new file mode 100644
index 00000000000..4476501dbbb
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_4_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x821ca63d171c5a3c60d32a738803092a52562056db3727a175f659cf49aae283", [ ] ],
+    "id" : 297
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "creationMethod": "create",
+        "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+        "gas" : "0xff300e",
+        "init" : "0x6004600c60003960046000f3600035ff",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x425ea2cf9bb89c09f131ab531958c4d189b5d047fd924d74f25d49cf47a5a8f1",
+      "blockNumber" : 19,
+      "result" : {
+        "address" : "0xfb88de099e13c3ed21f80a7a1e49f8caecf10df6",
+        "code" : "0x600035ff",
+        "gasUsed" : "0x338"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x821ca63d171c5a3c60d32a738803092a52562056db3727a175f659cf49aae283",
+      "transactionPosition" : 4,
+      "type" : "create"
+    },
+    "id" : 297
+  },
+  "statusCode" : 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_5_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_5_0_trace.json
new file mode 100644
index 00000000000..880b2174f7e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_5_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "call the prior contract then delegatecall log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xb795475e8f1820b683b60eb1a366bdc23e29f9cdf9639f7768c6644d20e3bbd1", [ ] ],
+    "id" : 300
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "creationMethod": "create",
+        "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+        "gas" : "0xff2e4e",
+        "init" : "0x600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65af460006000600060007300a00000000000000000000000000000000000005af4",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x425ea2cf9bb89c09f131ab531958c4d189b5d047fd924d74f25d49cf47a5a8f1",
+      "blockNumber" : 19,
+      "result" : {
+        "address" : "0xaa588d3737b611bafd7bd713445b314bd453a5c8",
+        "code" : "0x",
+        "gasUsed" : "0x1c33"
+      },
+      "subtraces" : 2,
+      "traceAddress" : [ ],
+      "transactionHash" : "0xb795475e8f1820b683b60eb1a366bdc23e29f9cdf9639f7768c6644d20e3bbd1",
+      "transactionPosition" : 5,
+      "type" : "create"
+    },
+    "id" : 300
+  },
+  "statusCode" : 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_5_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_5_1_trace.json
new file mode 100644
index 00000000000..8c34c033d46
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_5_1_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "call the prior contract then delegatecall log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xb795475e8f1820b683b60eb1a366bdc23e29f9cdf9639f7768c6644d20e3bbd1", [ "0x0" ] ],
+    "id" : 301
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "delegatecall",
+        "from" : "0xaa588d3737b611bafd7bd713445b314bd453a5c8",
+        "gas" : "0xfb2ed3",
+        "input" : "0x",
+        "to" : "0xfb88de099e13c3ed21f80a7a1e49f8caecf10df6",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x425ea2cf9bb89c09f131ab531958c4d189b5d047fd924d74f25d49cf47a5a8f1",
+      "blockNumber" : 19,
+      "result" : {
+        "gasUsed" : "0x138e",
+        "output" : "0x"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0xb795475e8f1820b683b60eb1a366bdc23e29f9cdf9639f7768c6644d20e3bbd1",
+      "transactionPosition" : 5,
+      "type" : "call"
+    },
+    "id" : 301
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_5_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_5_2_trace.json
new file mode 100644
index 00000000000..be60d1819eb
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_5_2_trace.json
@@ -0,0 +1,29 @@
+{
+  "comment" : "call the prior contract then delegatecall log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xb795475e8f1820b683b60eb1a366bdc23e29f9cdf9639f7768c6644d20e3bbd1", [ "0x0", "0x0" ] ],
+    "id" : 302
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "address" : "0xaa588d3737b611bafd7bd713445b314bd453a5c8",
+        "balance" : "0x0",
+        "refundAddress" : "0x0000000000000000000000000000000000000000"
+      },
+      "blockHash" : "0x425ea2cf9bb89c09f131ab531958c4d189b5d047fd924d74f25d49cf47a5a8f1",
+      "blockNumber" : 19,
+      "result" : null,
+      "subtraces" : 0,
+      "traceAddress" : [ 0, 0 ],
+      "transactionHash" : "0xb795475e8f1820b683b60eb1a366bdc23e29f9cdf9639f7768c6644d20e3bbd1",
+      "transactionPosition" : 5,
+      "type" : "suicide"
+    },
+    "id" : 302
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_5_3_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_5_3_trace.json
new file mode 100644
index 00000000000..ec0780cc59c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_13_5_3_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "call the prior contract then delegatecall log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xb795475e8f1820b683b60eb1a366bdc23e29f9cdf9639f7768c6644d20e3bbd1", [ "0x1" ] ],
+    "id" : 303
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "delegatecall",
+        "from" : "0xaa588d3737b611bafd7bd713445b314bd453a5c8",
+        "gas" : "0xfb18d2",
+        "input" : "0x",
+        "to" : "0x00a0000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x425ea2cf9bb89c09f131ab531958c4d189b5d047fd924d74f25d49cf47a5a8f1",
+      "blockNumber" : 19,
+      "result" : {
+        "gasUsed" : "0x30b",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ 1 ],
+      "transactionHash" : "0xb795475e8f1820b683b60eb1a366bdc23e29f9cdf9639f7768c6644d20e3bbd1",
+      "transactionPosition" : 5,
+      "type" : "call"
+    },
+    "id" : 303
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_14_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_14_0_0_trace.json
new file mode 100644
index 00000000000..27ccca0db69
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_14_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "CREATE",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xd32c538fd1b3ef854c04ae39925dc9e849b568b92ea388f778b794851ab37f7c", [ ] ],
+    "id" : 306
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffadea",
+        "input" : "0x",
+        "to" : "0x0130000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x82066eb29b4f58f6ee0f8190e45efb31b3708397f0c147bf7a9bd3d1cae94e9b",
+      "blockNumber" : 20,
+      "result" : {
+        "gasUsed" : "0x16c46",
+        "output" : "0x"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ ],
+      "transactionHash" : "0xd32c538fd1b3ef854c04ae39925dc9e849b568b92ea388f778b794851ab37f7c",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 306
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_14_0_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_14_0_1_trace.json
new file mode 100644
index 00000000000..f8012dcc58e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_14_0_1_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "CREATE",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xd32c538fd1b3ef854c04ae39925dc9e849b568b92ea388f778b794851ab37f7c", [ "0x0" ] ],
+    "id" : 307
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "creationMethod": "create",
+        "from" : "0x0130000000000000000000000000000000000000",
+        "gas" : "0xfb3412",
+        "init" : "0x600160015560015460025561ffff6000526002601ef3",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x82066eb29b4f58f6ee0f8190e45efb31b3708397f0c147bf7a9bd3d1cae94e9b",
+      "blockNumber" : 20,
+      "result" : {
+        "address" : "0xaac0627078c038eb3d06e04b57d020fe212be97d",
+        "code" : "0xffff",
+        "gasUsed" : "0xa10e"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0xd32c538fd1b3ef854c04ae39925dc9e849b568b92ea388f778b794851ab37f7c",
+      "transactionPosition" : 0,
+      "type" : "create"
+    },
+    "id" : 307
+  },
+  "statusCode" : 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_14_1_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_14_1_0_trace.json
new file mode 100644
index 00000000000..a1b18650589
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_14_1_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "CREATE2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xaf151fc10eb21e76efb0bc74da179a674083e420280fb2985f76b0326682864a", [ ] ],
+    "id" : 310
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffadea",
+        "input" : "0x",
+        "to" : "0x0140000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x82066eb29b4f58f6ee0f8190e45efb31b3708397f0c147bf7a9bd3d1cae94e9b",
+      "blockNumber" : 20,
+      "result" : {
+        "gasUsed" : "0x16b87",
+        "output" : "0x"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ ],
+      "transactionHash" : "0xaf151fc10eb21e76efb0bc74da179a674083e420280fb2985f76b0326682864a",
+      "transactionPosition" : 1,
+      "type" : "call"
+    },
+    "id" : 310
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_14_1_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_14_1_1_trace.json
new file mode 100644
index 00000000000..eb5a4a9e89c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_14_1_1_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "CREATE2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xaf151fc10eb21e76efb0bc74da179a674083e420280fb2985f76b0326682864a", [ "0x0" ] ],
+    "id" : 311
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "creationMethod":"create2",
+        "from" : "0x0140000000000000000000000000000000000000",
+        "gas" : "0xfb3409",
+        "init" : "0x600160015560015460025560ff60005360016000f3",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x82066eb29b4f58f6ee0f8190e45efb31b3708397f0c147bf7a9bd3d1cae94e9b",
+      "blockNumber" : 20,
+      "result" : {
+        "address" : "0x0deea5bd06fb86553643c1e94a2f5aac632b9ec9",
+        "code" : "0xff",
+        "gasUsed" : "0xa046"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0xaf151fc10eb21e76efb0bc74da179a674083e420280fb2985f76b0326682864a",
+      "transactionPosition" : 1,
+      "type" : "create"
+    },
+    "id" : 311
+  },
+  "statusCode" : 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_0_0_trace.json
new file mode 100644
index 00000000000..96fbd847dc7
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,1),(2,2)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x7ab106c58a1c4d5c5f545f94ad266a945e3ed82835528fd3adbf7973d2c0c953", [ ] ],
+    "id" : 314
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+        "gas" : "0xffab2e",
+        "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+        "to" : "0x0040000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x6fd0a21e68ebfbfe21f359ec5b1ff07251a9bd96a7d30f03e4cd976d7a6729b7",
+      "blockNumber" : 21,
+      "result" : {
+        "gasUsed" : "0x9f59",
+        "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x7ab106c58a1c4d5c5f545f94ad266a945e3ed82835528fd3adbf7973d2c0c953",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 314
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_0_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_0_1_trace.json
new file mode 100644
index 00000000000..4d13cea5a57
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_0_1_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,1),(2,2)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x7ab106c58a1c4d5c5f545f94ad266a945e3ed82835528fd3adbf7973d2c0c953", [ "0x0" ] ],
+    "id" : 315
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x0040000000000000000000000000000000000000",
+        "gas" : "0xfba993",
+        "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+        "to" : "0x0010000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x6fd0a21e68ebfbfe21f359ec5b1ff07251a9bd96a7d30f03e4cd976d7a6729b7",
+      "blockNumber" : 21,
+      "result" : {
+        "gasUsed" : "0x9c58",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0x7ab106c58a1c4d5c5f545f94ad266a945e3ed82835528fd3adbf7973d2c0c953",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 315
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_1_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_1_0_trace.json
new file mode 100644
index 00000000000..511fccc6f87
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_1_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(2,4)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x2b701e0b45e80f1c179a3696786aff2a411a51b03153528d1579f20915def5e4", [ ] ],
+    "id" : 318
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+        "gas" : "0xffab2e",
+        "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+        "to" : "0x0040000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x6fd0a21e68ebfbfe21f359ec5b1ff07251a9bd96a7d30f03e4cd976d7a6729b7",
+      "blockNumber" : 21,
+      "result" : {
+        "gasUsed" : "0x2a29",
+        "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x2b701e0b45e80f1c179a3696786aff2a411a51b03153528d1579f20915def5e4",
+      "transactionPosition" : 1,
+      "type" : "call"
+    },
+    "id" : 318
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_1_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_1_1_trace.json
new file mode 100644
index 00000000000..110451331e9
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_1_1_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(2,4)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x2b701e0b45e80f1c179a3696786aff2a411a51b03153528d1579f20915def5e4", [ "0x0" ] ],
+    "id" : 319
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x0040000000000000000000000000000000000000",
+        "gas" : "0xfba993",
+        "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+        "to" : "0x0010000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x6fd0a21e68ebfbfe21f359ec5b1ff07251a9bd96a7d30f03e4cd976d7a6729b7",
+      "blockNumber" : 21,
+      "result" : {
+        "gasUsed" : "0x2728",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0x2b701e0b45e80f1c179a3696786aff2a411a51b03153528d1579f20915def5e4",
+      "transactionPosition" : 1,
+      "type" : "call"
+    },
+    "id" : 319
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_2_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_2_0_trace.json
new file mode 100644
index 00000000000..b80bc9f66d7
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_2_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(1,0)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xcc81ab56669a97c5debfff3e23ab5ffb366f04c8c7eaf83f259c975c1816cb41", [ ] ],
+    "id" : 322
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+        "gas" : "0xffab3a",
+        "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+        "to" : "0x0040000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x6fd0a21e68ebfbfe21f359ec5b1ff07251a9bd96a7d30f03e4cd976d7a6729b7",
+      "blockNumber" : 21,
+      "result" : {
+        "gasUsed" : "0x19c1",
+        "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ ],
+      "transactionHash" : "0xcc81ab56669a97c5debfff3e23ab5ffb366f04c8c7eaf83f259c975c1816cb41",
+      "transactionPosition" : 2,
+      "type" : "call"
+    },
+    "id" : 322
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_2_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_2_1_trace.json
new file mode 100644
index 00000000000..92c48a43ce3
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_2_1_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(1,0)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xcc81ab56669a97c5debfff3e23ab5ffb366f04c8c7eaf83f259c975c1816cb41", [ "0x0" ] ],
+    "id" : 323
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x0040000000000000000000000000000000000000",
+        "gas" : "0xfba99f",
+        "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+        "to" : "0x0010000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x6fd0a21e68ebfbfe21f359ec5b1ff07251a9bd96a7d30f03e4cd976d7a6729b7",
+      "blockNumber" : 21,
+      "result" : {
+        "gasUsed" : "0x16c0",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0xcc81ab56669a97c5debfff3e23ab5ffb366f04c8c7eaf83f259c975c1816cb41",
+      "transactionPosition" : 2,
+      "type" : "call"
+    },
+    "id" : 323
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_3_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_3_0_trace.json
new file mode 100644
index 00000000000..1540ce1f43a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_3_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Clear contract storage keys 1 and 2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x422edfe209e8b97f77a8e879db5182158f23e823ba7f59725d463d99d7ae66bd", [ ] ],
+    "id" : 326
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+        "gas" : "0xffab46",
+        "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+        "to" : "0x0040000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x6fd0a21e68ebfbfe21f359ec5b1ff07251a9bd96a7d30f03e4cd976d7a6729b7",
+      "blockNumber" : 21,
+      "result" : {
+        "gasUsed" : "0x19c1",
+        "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x422edfe209e8b97f77a8e879db5182158f23e823ba7f59725d463d99d7ae66bd",
+      "transactionPosition" : 3,
+      "type" : "call"
+    },
+    "id" : 326
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_3_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_3_1_trace.json
new file mode 100644
index 00000000000..05f5c5bb330
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_15_3_1_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Clear contract storage keys 1 and 2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x422edfe209e8b97f77a8e879db5182158f23e823ba7f59725d463d99d7ae66bd", [ "0x0" ] ],
+    "id" : 327
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x0040000000000000000000000000000000000000",
+        "gas" : "0xfba9aa",
+        "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+        "to" : "0x0010000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x6fd0a21e68ebfbfe21f359ec5b1ff07251a9bd96a7d30f03e4cd976d7a6729b7",
+      "blockNumber" : 21,
+      "result" : {
+        "gasUsed" : "0x16c0",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0x422edfe209e8b97f77a8e879db5182158f23e823ba7f59725d463d99d7ae66bd",
+      "transactionPosition" : 3,
+      "type" : "call"
+    },
+    "id" : 327
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_0_0_trace.json
new file mode 100644
index 00000000000..6c0678c93c7
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,1),(2,2)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x1f74ac428df5427f3a5576869e870cfff6712e4cffb1506bb4ef8f36c5e48162", [ ] ],
+    "id" : 330
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+        "gas" : "0xffab2e",
+        "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+        "to" : "0x0060000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x3ea838359ab3ad18a43f6229892b103fd348114157267e72700dfb8842e5131a",
+      "blockNumber" : 22,
+      "result" : {
+        "gasUsed" : "0x9f57",
+        "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x1f74ac428df5427f3a5576869e870cfff6712e4cffb1506bb4ef8f36c5e48162",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 330
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_0_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_0_1_trace.json
new file mode 100644
index 00000000000..df204ee3808
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_0_1_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,1),(2,2)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x1f74ac428df5427f3a5576869e870cfff6712e4cffb1506bb4ef8f36c5e48162", [ "0x0" ] ],
+    "id" : 331
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "delegatecall",
+        "from" : "0x0060000000000000000000000000000000000000",
+        "gas" : "0xfba995",
+        "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+        "to" : "0x0010000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x3ea838359ab3ad18a43f6229892b103fd348114157267e72700dfb8842e5131a",
+      "blockNumber" : 22,
+      "result" : {
+        "gasUsed" : "0x9c58",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0x1f74ac428df5427f3a5576869e870cfff6712e4cffb1506bb4ef8f36c5e48162",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 331
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_1_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_1_0_trace.json
new file mode 100644
index 00000000000..82733d5e6fe
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_1_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(2,4)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x43d6ba1caeced03b6fa8cc3549c0557eea52917f1de50f4da23c9642beca95ee", [ ] ],
+    "id" : 334
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+        "gas" : "0xffab2e",
+        "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+        "to" : "0x0060000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x3ea838359ab3ad18a43f6229892b103fd348114157267e72700dfb8842e5131a",
+      "blockNumber" : 22,
+      "result" : {
+        "gasUsed" : "0x2a27",
+        "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x43d6ba1caeced03b6fa8cc3549c0557eea52917f1de50f4da23c9642beca95ee",
+      "transactionPosition" : 1,
+      "type" : "call"
+    },
+    "id" : 334
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_1_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_1_1_trace.json
new file mode 100644
index 00000000000..9d244e4ce4a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_1_1_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(2,4)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x43d6ba1caeced03b6fa8cc3549c0557eea52917f1de50f4da23c9642beca95ee", [ "0x0" ] ],
+    "id" : 335
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "delegatecall",
+        "from" : "0x0060000000000000000000000000000000000000",
+        "gas" : "0xfba995",
+        "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+        "to" : "0x0010000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x3ea838359ab3ad18a43f6229892b103fd348114157267e72700dfb8842e5131a",
+      "blockNumber" : 22,
+      "result" : {
+        "gasUsed" : "0x2728",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0x43d6ba1caeced03b6fa8cc3549c0557eea52917f1de50f4da23c9642beca95ee",
+      "transactionPosition" : 1,
+      "type" : "call"
+    },
+    "id" : 335
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_2_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_2_0_trace.json
new file mode 100644
index 00000000000..789d5d04407
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_2_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(1,0)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x9eb50f31fc1d953e27331cd923f6b2f7fa11827d399c70aec00a04cf98cfd2ac", [ ] ],
+    "id" : 338
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+        "gas" : "0xffab3a",
+        "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+        "to" : "0x0060000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x3ea838359ab3ad18a43f6229892b103fd348114157267e72700dfb8842e5131a",
+      "blockNumber" : 22,
+      "result" : {
+        "gasUsed" : "0x19bf",
+        "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x9eb50f31fc1d953e27331cd923f6b2f7fa11827d399c70aec00a04cf98cfd2ac",
+      "transactionPosition" : 2,
+      "type" : "call"
+    },
+    "id" : 338
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_2_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_2_1_trace.json
new file mode 100644
index 00000000000..38abd2ad42c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_2_1_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(1,0)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x9eb50f31fc1d953e27331cd923f6b2f7fa11827d399c70aec00a04cf98cfd2ac", [ "0x0" ] ],
+    "id" : 339
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "delegatecall",
+        "from" : "0x0060000000000000000000000000000000000000",
+        "gas" : "0xfba9a0",
+        "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+        "to" : "0x0010000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x3ea838359ab3ad18a43f6229892b103fd348114157267e72700dfb8842e5131a",
+      "blockNumber" : 22,
+      "result" : {
+        "gasUsed" : "0x16c0",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0x9eb50f31fc1d953e27331cd923f6b2f7fa11827d399c70aec00a04cf98cfd2ac",
+      "transactionPosition" : 2,
+      "type" : "call"
+    },
+    "id" : 339
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_3_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_3_0_trace.json
new file mode 100644
index 00000000000..af24d076088
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_3_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Clear contract storage keys 1 and 2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xe2ef09a0b71f50947bd0bd1cacac77903d2a5fce80f34862bd4559727e0f608c", [ ] ],
+    "id" : 342
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+        "gas" : "0xffab46",
+        "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+        "to" : "0x0060000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x3ea838359ab3ad18a43f6229892b103fd348114157267e72700dfb8842e5131a",
+      "blockNumber" : 22,
+      "result" : {
+        "gasUsed" : "0x19bf",
+        "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ ],
+      "transactionHash" : "0xe2ef09a0b71f50947bd0bd1cacac77903d2a5fce80f34862bd4559727e0f608c",
+      "transactionPosition" : 3,
+      "type" : "call"
+    },
+    "id" : 342
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_3_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_3_1_trace.json
new file mode 100644
index 00000000000..e2882327bfa
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_16_3_1_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Clear contract storage keys 1 and 2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xe2ef09a0b71f50947bd0bd1cacac77903d2a5fce80f34862bd4559727e0f608c", [ "0x0" ] ],
+    "id" : 343
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "delegatecall",
+        "from" : "0x0060000000000000000000000000000000000000",
+        "gas" : "0xfba9ac",
+        "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+        "to" : "0x0010000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x3ea838359ab3ad18a43f6229892b103fd348114157267e72700dfb8842e5131a",
+      "blockNumber" : 22,
+      "result" : {
+        "gasUsed" : "0x16c0",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0xe2ef09a0b71f50947bd0bd1cacac77903d2a5fce80f34862bd4559727e0f608c",
+      "transactionPosition" : 3,
+      "type" : "call"
+    },
+    "id" : 343
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_17_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_17_0_0_trace.json
new file mode 100644
index 00000000000..c0ccffeca24
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_17_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Proxy call to another contract. Using STATICCALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xea357b8947f2aa968eba99ac995f07dbd5d006dc2eb4c2f1a2d4f4278a150373", [ ] ],
+    "id" : 346
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+        "gas" : "0x2b654",
+        "input" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+        "to" : "0x0120000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x5c224cb42aa0e0a60e0121ce5ee2ec3f08e5b83dab24de5f50e1d3fc9f450c50",
+      "blockNumber" : 23,
+      "result" : {
+        "gasUsed" : "0x301",
+        "output" : "0x0000000000000000000000000000000000000000000000000000000000000012"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ ],
+      "transactionHash" : "0xea357b8947f2aa968eba99ac995f07dbd5d006dc2eb4c2f1a2d4f4278a150373",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 346
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_17_0_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_17_0_1_trace.json
new file mode 100644
index 00000000000..648bb12eb54
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_17_0_1_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Proxy call to another contract. Using STATICCALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xea357b8947f2aa968eba99ac995f07dbd5d006dc2eb4c2f1a2d4f4278a150373", [ "0x0" ] ],
+    "id" : 347
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "staticcall",
+        "from" : "0x0120000000000000000000000000000000000000",
+        "gas" : "0x2a88c",
+        "input" : "0x",
+        "to" : "0x0000000000000000000000000000000000000010",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x5c224cb42aa0e0a60e0121ce5ee2ec3f08e5b83dab24de5f50e1d3fc9f450c50",
+      "blockNumber" : 23,
+      "result" : {
+        "gasUsed" : "0x0",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0xea357b8947f2aa968eba99ac995f07dbd5d006dc2eb4c2f1a2d4f4278a150373",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 347
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_18_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_18_0_0_trace.json
new file mode 100644
index 00000000000..cfca5860609
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_18_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Proxy call to another contract - several levels deep. Using CALL and STATICCALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x2f92ad4d4433cd8f78214c1ba3b3d3d8a2b1e993b6cf336eb9200c8d9ac3b94d", [ ] ],
+    "id" : 350
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffa7e2",
+        "input" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+        "to" : "0x0040000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x2773bc8754290aa9e4e1e82ef200e3a00e3255f02ddc3aef9c551c089ef9a8cd",
+      "blockNumber" : 24,
+      "result" : {
+        "gasUsed" : "0x915",
+        "output" : "0x0000000000000000000000000000000000000000000000000000000000000012"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x2f92ad4d4433cd8f78214c1ba3b3d3d8a2b1e993b6cf336eb9200c8d9ac3b94d",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 350
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_18_0_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_18_0_1_trace.json
new file mode 100644
index 00000000000..582c23e9e8a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_18_0_1_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Proxy call to another contract - several levels deep. Using CALL and STATICCALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x2f92ad4d4433cd8f78214c1ba3b3d3d8a2b1e993b6cf336eb9200c8d9ac3b94d", [ "0x0" ] ],
+    "id" : 351
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x0040000000000000000000000000000000000000",
+        "gas" : "0xfba648",
+        "input" : "0x00000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+        "to" : "0x0040000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x2773bc8754290aa9e4e1e82ef200e3a00e3255f02ddc3aef9c551c089ef9a8cd",
+      "blockNumber" : 24,
+      "result" : {
+        "gasUsed" : "0x608",
+        "output" : "0x0000000000000000000000000000000000000000000000000000000000000012"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0x2f92ad4d4433cd8f78214c1ba3b3d3d8a2b1e993b6cf336eb9200c8d9ac3b94d",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 351
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_18_0_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_18_0_2_trace.json
new file mode 100644
index 00000000000..c0a0a45896a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_18_0_2_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Proxy call to another contract - several levels deep. Using CALL and STATICCALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x2f92ad4d4433cd8f78214c1ba3b3d3d8a2b1e993b6cf336eb9200c8d9ac3b94d", [ "0x0", "0x0" ] ],
+    "id" : 352
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x0040000000000000000000000000000000000000",
+        "gas" : "0xf7b4ba",
+        "input" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+        "to" : "0x0120000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x2773bc8754290aa9e4e1e82ef200e3a00e3255f02ddc3aef9c551c089ef9a8cd",
+      "blockNumber" : 24,
+      "result" : {
+        "gasUsed" : "0x301",
+        "output" : "0x0000000000000000000000000000000000000000000000000000000000000012"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ 0, 0 ],
+      "transactionHash" : "0x2f92ad4d4433cd8f78214c1ba3b3d3d8a2b1e993b6cf336eb9200c8d9ac3b94d",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 352
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_18_0_3_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_18_0_3_trace.json
new file mode 100644
index 00000000000..afcddd64133
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_18_0_3_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Proxy call to another contract - several levels deep. Using CALL and STATICCALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x2f92ad4d4433cd8f78214c1ba3b3d3d8a2b1e993b6cf336eb9200c8d9ac3b94d", [ "0x0", "0x0", "0x0" ] ],
+    "id" : 353
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "staticcall",
+        "from" : "0x0120000000000000000000000000000000000000",
+        "gas" : "0xf3d2f9",
+        "input" : "0x",
+        "to" : "0x0000000000000000000000000000000000000010",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x2773bc8754290aa9e4e1e82ef200e3a00e3255f02ddc3aef9c551c089ef9a8cd",
+      "blockNumber" : 24,
+      "result" : {
+        "gasUsed" : "0x0",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ 0, 0, 0 ],
+      "transactionHash" : "0x2f92ad4d4433cd8f78214c1ba3b3d3d8a2b1e993b6cf336eb9200c8d9ac3b94d",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 353
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_19_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_19_0_0_trace.json
new file mode 100644
index 00000000000..10e6c760c5c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_19_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Deploy ERC20 contract",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xed9852eaa132d91f807e45dccd8d6859560f427637f9f4e3fc5741db997eefb0", [ ] ],
+    "id" : 356
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "creationMethod": "create",
+        "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+        "gas" : "0xfdc95a",
+        "init" : "0x606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e420000000000000000000000000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0xa7793ae6664b092057122795ad3ec0d4f6095dc3fa51903675cae89ac778a6ac",
+      "blockNumber" : 25,
+      "result" : {
+        "address" : "0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87",
+        "code" : "0x606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029",
+        "gasUsed" : "0x124192"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0xed9852eaa132d91f807e45dccd8d6859560f427637f9f4e3fc5741db997eefb0",
+      "transactionPosition" : 0,
+      "type" : "create"
+    },
+    "id" : 356
+  },
+  "statusCode" : 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_19_1_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_19_1_0_trace.json
new file mode 100644
index 00000000000..9c2e7cef5da
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_19_1_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Transfert ERC20 tokens (with contract created 0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x752c025084f7cd0dae7fc6193db319e6931873780b3ee8c6f5835515c9c24110", [ ] ],
+    "id" : 359
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+        "gas" : "0xffab66",
+        "input" : "0xa9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea00000",
+        "to" : "0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87",
+        "value" : "0x0"
+      },
+      "blockHash" : "0xa7793ae6664b092057122795ad3ec0d4f6095dc3fa51903675cae89ac778a6ac",
+      "blockNumber" : 25,
+      "result" : {
+        "gasUsed" : "0x7e42",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x752c025084f7cd0dae7fc6193db319e6931873780b3ee8c6f5835515c9c24110",
+      "transactionPosition" : 1,
+      "type" : "call"
+    },
+    "id" : 359
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1a_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1a_0_0_trace.json
new file mode 100644
index 00000000000..3e2fd448449
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1a_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep with gas refund.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x897ebf0a704b9e29de555e115b474cb212a7d217073452eee02bc47506b0622c", [ ] ],
+    "id" : 362
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffab3a",
+        "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+        "to" : "0x0040000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x7e01aa03af91b1b6bfc46f11e1e4b652a20af3f6440cbe3d7f9c5910c581e6e6",
+      "blockNumber" : 26,
+      "result" : {
+        "gasUsed" : "0x5459",
+        "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x897ebf0a704b9e29de555e115b474cb212a7d217073452eee02bc47506b0622c",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 362
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1a_0_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1a_0_1_trace.json
new file mode 100644
index 00000000000..3ac18a9a156
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1a_0_1_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep with gas refund.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x897ebf0a704b9e29de555e115b474cb212a7d217073452eee02bc47506b0622c", [ "0x0" ] ],
+    "id" : 363
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x0040000000000000000000000000000000000000",
+        "gas" : "0xfba99f",
+        "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+        "to" : "0x0010000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x7e01aa03af91b1b6bfc46f11e1e4b652a20af3f6440cbe3d7f9c5910c581e6e6",
+      "blockNumber" : 26,
+      "result" : {
+        "gasUsed" : "0x5158",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0x897ebf0a704b9e29de555e115b474cb212a7d217073452eee02bc47506b0622c",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 363
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1b_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1b_0_0_trace.json
new file mode 100644
index 00000000000..d01d4f61c1f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1b_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Self destruct and send contract balance to the same address provided in the to field.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x728abdc65550943b21eba1eef7bb9c7b594d6f629dda1be4ae01b0f3ffcc6b16", [ ] ],
+    "id" : 366
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffad82",
+        "input" : "0x0000000000000000000000000150000000000000",
+        "to" : "0x0150000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0xad804d4984008429f56b42be14d3d1ac9f1eaf33aa43aafb7a0fcaf2c4594f01",
+      "blockNumber" : 27,
+      "result" : {
+        "gasUsed" : "0x138e",
+        "output" : "0x"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x728abdc65550943b21eba1eef7bb9c7b594d6f629dda1be4ae01b0f3ffcc6b16",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 366
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1b_0_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1b_0_1_trace.json
new file mode 100644
index 00000000000..b9150495502
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1b_0_1_trace.json
@@ -0,0 +1,29 @@
+{
+  "comment" : "Self destruct and send contract balance to the same address provided in the to field.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x728abdc65550943b21eba1eef7bb9c7b594d6f629dda1be4ae01b0f3ffcc6b16", [ "0x0" ] ],
+    "id" : 367
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "address" : "0x0150000000000000000000000000000000000000",
+        "balance" : "0x300",
+        "refundAddress" : "0x0150000000000000000000000000000000000000"
+      },
+      "blockHash" : "0xad804d4984008429f56b42be14d3d1ac9f1eaf33aa43aafb7a0fcaf2c4594f01",
+      "blockNumber" : 27,
+      "result" : null,
+      "subtraces" : 0,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0x728abdc65550943b21eba1eef7bb9c7b594d6f629dda1be4ae01b0f3ffcc6b16",
+      "transactionPosition" : 0,
+      "type" : "suicide"
+    },
+    "id" : 367
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1c_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1c_0_0_trace.json
new file mode 100644
index 00000000000..6d419d338a3
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1c_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Self destruct called in constructor with balance being returned to sender (from field)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xbe1b55619f540ea8a7d7e9330ea642a195afe0d6d60ced6f463da67b46d3f503", [ ] ],
+    "id" : 370
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "creationMethod":"create",
+        "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+        "gas" : "0xff2f0a",
+        "init" : "0x60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x96a82625443a337a5bfb912fd96977156f380c68b0d33040afffdb09c4cdbd52",
+      "blockNumber" : 28,
+      "result" : {
+        "address" : "0xa4392264a2d8c998901d10c154c91725b1bf0158",
+        "code" : "0x",
+        "gasUsed" : "0x13a2"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ ],
+      "transactionHash" : "0xbe1b55619f540ea8a7d7e9330ea642a195afe0d6d60ced6f463da67b46d3f503",
+      "transactionPosition" : 0,
+      "type" : "create"
+    },
+    "id" : 370
+  },
+  "statusCode" : 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1c_0_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1c_0_1_trace.json
new file mode 100644
index 00000000000..4af475b031b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1c_0_1_trace.json
@@ -0,0 +1,29 @@
+{
+  "comment" : "Self destruct called in constructor with balance being returned to sender (from field)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xbe1b55619f540ea8a7d7e9330ea642a195afe0d6d60ced6f463da67b46d3f503", [ "0x0" ] ],
+    "id" : 371
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "address" : "0xa4392264a2d8c998901d10c154c91725b1bf0158",
+        "balance" : "0x0",
+        "refundAddress" : "0x627306090abab3a6e1400e9345bc60c78a8bef57"
+      },
+      "blockHash" : "0x96a82625443a337a5bfb912fd96977156f380c68b0d33040afffdb09c4cdbd52",
+      "blockNumber" : 28,
+      "result" : null,
+      "subtraces" : 0,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0xbe1b55619f540ea8a7d7e9330ea642a195afe0d6d60ced6f463da67b46d3f503",
+      "transactionPosition" : 0,
+      "type" : "suicide"
+    },
+    "id" : 371
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1d_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1d_0_0_trace.json
new file mode 100644
index 00000000000..e4fb5d292b8
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1d_0_0_trace.json
@@ -0,0 +1,31 @@
+{
+  "comment" : "Stack underflow during contract creation",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xf2f9f56aab631d441ff7bd85a195cea43c7285a4e0bd03823f6c37b379eb0cbe", [ ] ],
+    "id" : 374
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "creationMethod": "create",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0x4a14",
+        "init" : "0x6000f1",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x3cecd9469acbef39e092a08b5a2ce8b2b6a12e54e88bcb953a4e0e458fb3cf6d",
+      "blockNumber" : 29,
+      "error" : "Stack underflow",
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0xf2f9f56aab631d441ff7bd85a195cea43c7285a4e0bd03823f6c37b379eb0cbe",
+      "transactionPosition" : 0,
+      "type" : "create"
+    },
+    "id" : 374
+  },
+  "statusCode" : 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1e_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1e_0_0_trace.json
new file mode 100644
index 00000000000..f924b67acc9
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1e_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Transaction to test refund_CallToSuicideTwice_d0g0v0_Istanbul",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xbc7cedf9a139bc6a16959e1463a56ef5bdc07731e384d2a1c27e7828b563d594", [ ] ],
+    "id" : 377
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0x9843e0",
+        "input" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
+        "to" : "0x0160000000000000000000000000000000000000",
+        "value" : "0xa"
+      },
+      "blockHash" : "0xc016f949a0b11bb4e3151f9eca519f105f764d5f3a9fd71d6b24eacab731906a",
+      "blockNumber" : 30,
+      "result" : {
+        "gasUsed" : "0xcb3",
+        "output" : "0x"
+      },
+      "subtraces" : 2,
+      "traceAddress" : [ ],
+      "transactionHash" : "0xbc7cedf9a139bc6a16959e1463a56ef5bdc07731e384d2a1c27e7828b563d594",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 377
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1e_0_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1e_0_1_trace.json
new file mode 100644
index 00000000000..024b412e154
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1e_0_1_trace.json
@@ -0,0 +1,32 @@
+{
+  "comment" : "Transaction to test refund_CallToSuicideTwice_d0g0v0_Istanbul",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xbc7cedf9a139bc6a16959e1463a56ef5bdc07731e384d2a1c27e7828b563d594", [ "0x0" ] ],
+    "id" : 378
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x0160000000000000000000000000000000000000",
+        "gas" : "0x1f4",
+        "input" : "0x",
+        "to" : "0x0170000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0xc016f949a0b11bb4e3151f9eca519f105f764d5f3a9fd71d6b24eacab731906a",
+      "blockNumber" : 30,
+      "error" : "Out of gas",
+      "subtraces" : 0,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0xbc7cedf9a139bc6a16959e1463a56ef5bdc07731e384d2a1c27e7828b563d594",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 378
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1e_0_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1e_0_2_trace.json
new file mode 100644
index 00000000000..2845373e16e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1e_0_2_trace.json
@@ -0,0 +1,32 @@
+{
+  "comment" : "Transaction to test refund_CallToSuicideTwice_d0g0v0_Istanbul",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xbc7cedf9a139bc6a16959e1463a56ef5bdc07731e384d2a1c27e7828b563d594", [ "0x1" ] ],
+    "id" : 379
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x0160000000000000000000000000000000000000",
+        "gas" : "0x1f4",
+        "input" : "0x",
+        "to" : "0x0170000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0xc016f949a0b11bb4e3151f9eca519f105f764d5f3a9fd71d6b24eacab731906a",
+      "blockNumber" : 30,
+      "error" : "Out of gas",
+      "subtraces" : 0,
+      "traceAddress" : [ 1 ],
+      "transactionHash" : "0xbc7cedf9a139bc6a16959e1463a56ef5bdc07731e384d2a1c27e7828b563d594",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 379
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1f_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1f_0_0_trace.json
new file mode 100644
index 00000000000..21778c04930
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_1f_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Call Precompiled contract directly",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x8b75ccd7087daeb5fc2c64bbd157d869a53d794f015d60b5718708ab9e7100e8", [ ] ],
+    "id" : 382
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+        "gas" : "0xffadea",
+        "input" : "0x",
+        "to" : "0x0000000000000000000000000000000000000001",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x06d6bcd80a749c5027c659ee06e48c55b00c5ce35be2af3b0028467ddf1ce12b",
+      "blockNumber" : 31,
+      "result" : {
+        "gasUsed" : "0xbb8",
+        "output" : "0x"
+      },
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x8b75ccd7087daeb5fc2c64bbd157d869a53d794f015d60b5718708ab9e7100e8",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 382
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_20_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_20_0_0_trace.json
new file mode 100644
index 00000000000..a6bf72896c6
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_20_0_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Call to a contract creation that fails with a depth of 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x3a9118fe52689f19ec58b4e1a50a0ae07021812f4c0d72c703a669e90622f3cd", [ ] ],
+    "id" : 385
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xcd01",
+        "input" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
+        "to" : "0x0180000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x8b999c350ee739ebe2f7c5311c55c8c2e348704be2d196876ea9e92a509c7a6a",
+      "blockNumber" : 32,
+      "result" : {
+        "gasUsed" : "0xcbc2",
+        "output" : "0x"
+      },
+      "subtraces" : 1,
+      "traceAddress" : [ ],
+      "transactionHash" : "0x3a9118fe52689f19ec58b4e1a50a0ae07021812f4c0d72c703a669e90622f3cd",
+      "transactionPosition" : 0,
+      "type" : "call"
+    },
+    "id" : 385
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_20_0_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_20_0_1_trace.json
new file mode 100644
index 00000000000..f17b76bd94d
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_20_0_1_trace.json
@@ -0,0 +1,31 @@
+{
+  "comment" : "Call to a contract creation that fails with a depth of 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0x3a9118fe52689f19ec58b4e1a50a0ae07021812f4c0d72c703a669e90622f3cd", [ "0x0" ] ],
+    "id" : 386
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "creationMethod": "create",
+        "from" : "0x0180000000000000000000000000000000000000",
+        "gas" : "0x4eaa",
+        "init" : "0x600c600055602060406000f000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x8b999c350ee739ebe2f7c5311c55c8c2e348704be2d196876ea9e92a509c7a6a",
+      "blockNumber" : 32,
+      "error" : "Out of gas",
+      "subtraces" : 0,
+      "traceAddress" : [ 0 ],
+      "transactionHash" : "0x3a9118fe52689f19ec58b4e1a50a0ae07021812f4c0d72c703a669e90622f3cd",
+      "transactionPosition" : 0,
+      "type" : "create"
+    },
+    "id" : 386
+  },
+  "statusCode" : 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_21_0_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_21_0_0_trace.json
new file mode 100644
index 00000000000..f2ab1769438
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-get/trace_get_21_0_0_trace.json
@@ -0,0 +1,31 @@
+{
+  "comment" : "Call to a contract creation that fails with a stack underflow",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_get",
+    "params" : [ "0xf0378e1bf579b23aff89255d93ade14fe9136a7cedd9c4985e9bec2d18ce65e9", [ ] ],
+    "id" : 389
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "action" : {
+        "creationMethod": "create",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0x46e824",
+        "init" : "0x602af300",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x156fa7f1633c5dd82d41b7c7d79049f620b25638ca87da137d13e1a27a210e49",
+      "blockNumber" : 33,
+      "error" : "Stack underflow",
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0xf0378e1bf579b23aff89255d93ade14fe9136a7cedd9c4985e9bec2d18ce65e9",
+      "transactionPosition" : 0,
+      "type" : "create"
+    },
+    "id" : 389
+  },
+  "statusCode" : 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_02_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_02_0_stateDiff.json
new file mode 100644
index 00000000000..7d1599b1ff3
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_02_0_stateDiff.json
@@ -0,0 +1,59 @@
+{
+  "comment" : "Simple value transfer",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294000000000000000000000000000000000000099901801ca06aeaaaac3375bb814d36f8c5fb941dae51b55dffc22a6fd3b5b3dd30a9a489d6a05a07dd9d31a1b78fed59812496306fd9e17446cbb456e4e68f1d15b186567302", [ "stateDiff" ] ],
+    "id" : 0
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860d4816"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0000000000000000000000000000000000000999" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x1",
+              "to" : "0x2"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d079bf50c2"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 0
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_02_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_02_0_trace.json
new file mode 100644
index 00000000000..329978d3cab
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_02_0_trace.json
@@ -0,0 +1,36 @@
+{
+  "comment" : "Simple value transfer",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294000000000000000000000000000000000000099901801ca06aeaaaac3375bb814d36f8c5fb941dae51b55dffc22a6fd3b5b3dd30a9a489d6a05a07dd9d31a1b78fed59812496306fd9e17446cbb456e4e68f1d15b186567302", [ "trace" ] ],
+    "id" : 53
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0000000000000000000000000000000000000999",
+          "value" : "0x1"
+        },
+        "result" : {
+          "gasUsed" : "0x0",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 53
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_02_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_02_0_vmTrace.json
new file mode 100644
index 00000000000..9091ed9ab55
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_02_0_vmTrace.json
@@ -0,0 +1,23 @@
+{
+  "comment" : "Simple value transfer",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294000000000000000000000000000000000000099901801ca06aeaaaac3375bb814d36f8c5fb941dae51b55dffc22a6fd3b5b3dd30a9a489d6a05a07dd9d31a1b78fed59812496306fd9e17446cbb456e4e68f1d15b186567302", [ "vmTrace" ] ],
+    "id" : 106
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x",
+        "ops" : [ ]
+      }
+    },
+    "id" : 106
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_03_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_03_0_stateDiff.json
new file mode 100644
index 00000000000..4243204becc
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_03_0_stateDiff.json
@@ -0,0 +1,60 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "stateDiff" ] ],
+    "id" : 1
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f1838685c9c2"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241" : {
+          "balance" : {
+            "+" : "0x0"
+          },
+          "code" : {
+            "+" : "0x600035ff"
+          },
+          "nonce" : {
+            "+" : "0x1"
+          },
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d07946cf17"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 1
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_03_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_03_0_trace.json
new file mode 100644
index 00000000000..2d3e31214a7
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_03_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "trace" ] ],
+    "id" : 54
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff300e",
+          "init" : "0x6004600c60003960046000f3600035ff",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "code" : "0x600035ff",
+          "gasUsed" : "0x338"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 54
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_03_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_03_0_vmTrace.json
new file mode 100644
index 00000000000..f7423584718
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_03_0_vmTrace.json
@@ -0,0 +1,96 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "vmTrace" ] ],
+    "id" : 107
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6004600c60003960046000f3600035ff",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723979
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc" ],
+            "store" : null,
+            "used" : 16723976
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723973
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0x600035ff",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723964
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723961
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 11,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 107
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_0_stateDiff.json
new file mode 100644
index 00000000000..d28f9d06c85
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_0_stateDiff.json
@@ -0,0 +1,67 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,1),(2,2)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba05da194e824c48667c3fffc005ce2308c4a507737e8f7a370f52be7b4de29fefda009802caf0afd343a87e043b1c28508da3e1688c441905457b9289571c789831e", [ "stateDiff" ] ],
+    "id" : 2
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386a1490e"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0010000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+              }
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000002"
+              }
+            }
+          }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd271ad0ab"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 2
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_0_trace.json
new file mode 100644
index 00000000000..4759999c177
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_0_trace.json
@@ -0,0 +1,36 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,1),(2,2)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba05da194e824c48667c3fffc005ce2308c4a507737e8f7a370f52be7b4de29fefda009802caf0afd343a87e043b1c28508da3e1688c441905457b9289571c789831e", [ "trace" ] ],
+    "id" : 55
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffabba",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9c58",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 55
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_0_vmTrace.json
new file mode 100644
index 00000000000..960a0b5cc80
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_0_vmTrace.json
@@ -0,0 +1,129 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,1),(2,2)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba05da194e824c48667c3fffc005ce2308c4a507737e8f7a370f52be7b4de29fefda009802caf0afd343a87e043b1c28508da3e1688c441905457b9289571c789831e", [ "vmTrace" ] ],
+    "id" : 108
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6020356000355560603560403555",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755639
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755636
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755633
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755630
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x1",
+              "val" : "0x1"
+            },
+            "used" : 16735630
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16735627
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16735624
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16735621
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16735618
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x2",
+              "val" : "0x2"
+            },
+            "used" : 16715618
+          },
+          "pc" : 13,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 108
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_1_stateDiff.json
new file mode 100644
index 00000000000..9234f0079af
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_1_stateDiff.json
@@ -0,0 +1,67 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(2,4)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ca0966415c122a07c1862c8f5963aae24932b3621e386a9e65fb04b0b5dfcac7516a054518dd075127c40adfafa97b6243be762dd3f049ae6da2f1446b6067a4a98f8", [ "stateDiff" ] ],
+    "id" : 3
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386a1490e"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0010000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000003"
+              }
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000004"
+              }
+            }
+          }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d0792b4fcb"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 3
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_1_trace.json
new file mode 100644
index 00000000000..dde5f74024a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_1_trace.json
@@ -0,0 +1,36 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(2,4)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ca0966415c122a07c1862c8f5963aae24932b3621e386a9e65fb04b0b5dfcac7516a054518dd075127c40adfafa97b6243be762dd3f049ae6da2f1446b6067a4a98f8", [ "trace" ] ],
+    "id" : 56
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffabba",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9c58",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 56
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_1_vmTrace.json
new file mode 100644
index 00000000000..15c04213652
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_1_vmTrace.json
@@ -0,0 +1,129 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(2,4)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ca0966415c122a07c1862c8f5963aae24932b3621e386a9e65fb04b0b5dfcac7516a054518dd075127c40adfafa97b6243be762dd3f049ae6da2f1446b6067a4a98f8", [ "vmTrace" ] ],
+    "id" : 109
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6020356000355560603560403555",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755639
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16755636
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755633
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755630
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x1",
+              "val" : "0x3"
+            },
+            "used" : 16735630
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16735627
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16735624
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16735621
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16735618
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x2",
+              "val" : "0x4"
+            },
+            "used" : 16715618
+          },
+          "pc" : 13,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 109
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_2_stateDiff.json
new file mode 100644
index 00000000000..3814125edf7
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_2_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(1,0)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca02a0751ced12903f0ff0f90da44f2a76d10b90dfffcdcc4be522162cdbf59519ea041b3c94bb6bbdcafbb510a678775ece69648fea10f263f5dc505f0b6b75eb0aa", [ "stateDiff" ] ],
+    "id" : 4
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183861533da"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d079b764ff"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 4
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_2_trace.json
new file mode 100644
index 00000000000..708d1b1b62e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_2_trace.json
@@ -0,0 +1,36 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(1,0)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca02a0751ced12903f0ff0f90da44f2a76d10b90dfffcdcc4be522162cdbf59519ea041b3c94bb6bbdcafbb510a678775ece69648fea10f263f5dc505f0b6b75eb0aa", [ "trace" ] ],
+    "id" : 57
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffabc6",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x5158",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 57
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_2_vmTrace.json
new file mode 100644
index 00000000000..ead03c0ad9b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_04_2_vmTrace.json
@@ -0,0 +1,129 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(1,0)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca02a0751ced12903f0ff0f90da44f2a76d10b90dfffcdcc4be522162cdbf59519ea041b3c94bb6bbdcafbb510a678775ece69648fea10f263f5dc505f0b6b75eb0aa", [ "vmTrace" ] ],
+    "id" : 110
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6020356000355560603560403555",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755651
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16755648
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755645
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755642
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x1",
+              "val" : "0x3"
+            },
+            "used" : 16735642
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16735639
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16735636
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16735633
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16735630
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x1",
+              "val" : "0x0"
+            },
+            "used" : 16734830
+          },
+          "pc" : 13,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 110
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_05_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_05_0_stateDiff.json
new file mode 100644
index 00000000000..e43e26446c5
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_05_0_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Clear contract storage keys 1 and 2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ba0aabf9e3beeae05957a6b663f57f559fce4379d3b1f255245f42e0080e254254ca018e484db063e0ff3831bd2791a4e36cff6a982e74f57a0f5c43d966e2185736f", [ "stateDiff" ] ],
+    "id" : 5
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183861528a6"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27a6f113"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 5
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_05_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_05_0_trace.json
new file mode 100644
index 00000000000..51a5aece538
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_05_0_trace.json
@@ -0,0 +1,36 @@
+{
+  "comment" : "Clear contract storage keys 1 and 2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ba0aabf9e3beeae05957a6b663f57f559fce4379d3b1f255245f42e0080e254254ca018e484db063e0ff3831bd2791a4e36cff6a982e74f57a0f5c43d966e2185736f", [ "trace" ] ],
+    "id" : 58
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffabd2",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x658",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 58
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_05_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_05_0_vmTrace.json
new file mode 100644
index 00000000000..af69cee28e5
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_05_0_vmTrace.json
@@ -0,0 +1,129 @@
+{
+  "comment" : "Clear contract storage keys 1 and 2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8e28081ef83fffff294001000000000000000000000000000000000000080b88000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ba0aabf9e3beeae05957a6b663f57f559fce4379d3b1f255245f42e0080e254254ca018e484db063e0ff3831bd2791a4e36cff6a982e74f57a0f5c43d966e2185736f", [ "vmTrace" ] ],
+    "id" : 111
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6020356000355560603560403555",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755663
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755660
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755657
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755654
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x1",
+              "val" : "0x0"
+            },
+            "used" : 16754854
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16754851
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754848
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16754845
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16754842
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x2",
+              "val" : "0x0"
+            },
+            "used" : 16754042
+          },
+          "pc" : 13,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 111
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_06_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_06_0_stateDiff.json
new file mode 100644
index 00000000000..db5f8e06dc1
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_06_0_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Self destruct and send contract balance to address provided in the data field.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8758081ef83fffff2940020000000000000000000000000000000000000809400000000000000000000000000000000000009991ba06e24ac7e9168aa87f1f36357c3da73f1a3b842c9cf3ba0061b88d7875236c999a0476b670755aceb691763507e32e293172ba95e216bd8c78b9b5ab8d6afe1f49e", [ "stateDiff" ] ],
+    "id" : 6
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860da92e"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27ae708b"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 6
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_06_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_06_0_trace.json
new file mode 100644
index 00000000000..7abee19864e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_06_0_trace.json
@@ -0,0 +1,36 @@
+{
+  "comment" : "Self destruct and send contract balance to address provided in the data field.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8758081ef83fffff2940020000000000000000000000000000000000000809400000000000000000000000000000000000009991ba06e24ac7e9168aa87f1f36357c3da73f1a3b842c9cf3ba0061b88d7875236c999a0476b670755aceb691763507e32e293172ba95e216bd8c78b9b5ab8d6afe1f49e", [ "trace" ] ],
+    "id" : 59
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffad82",
+          "input" : "0x0000000000000000000000000000000000000999",
+          "to" : "0x0020000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x0",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 59
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_06_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_06_0_vmTrace.json
new file mode 100644
index 00000000000..c5e0ffbd4d2
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_06_0_vmTrace.json
@@ -0,0 +1,23 @@
+{
+  "comment" : "Self destruct and send contract balance to address provided in the data field.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8758081ef83fffff2940020000000000000000000000000000000000000809400000000000000000000000000000000000009991ba06e24ac7e9168aa87f1f36357c3da73f1a3b842c9cf3ba0061b88d7875236c999a0476b670755aceb691763507e32e293172ba95e216bd8c78b9b5ab8d6afe1f49e", [ "vmTrace" ] ],
+    "id" : 112
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x",
+        "ops" : [ ]
+      }
+    },
+    "id" : 112
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_07_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_07_0_stateDiff.json
new file mode 100644
index 00000000000..bfe1074eb75
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_07_0_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Increment 32 bytes provided in data field and return the value.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8818081ef83fffff294003000000000000000000000000000000000000080a0f0000000000000000000000000000000000000000000000000000000000000011ca0acbf3999783a6ff94ce42e07c959af589bfe860436243152ae90bf3b97d07c62a009f992840128573e7473e22b5329eb063e0d35ed2b36765813da92aeb344cb92", [ "stateDiff" ] ],
+    "id" : 7
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860def33"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27ae2a86"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 7
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_07_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_07_0_trace.json
new file mode 100644
index 00000000000..dcf10f66d88
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_07_0_trace.json
@@ -0,0 +1,36 @@
+{
+  "comment" : "Increment 32 bytes provided in data field and return the value.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8818081ef83fffff294003000000000000000000000000000000000000080a0f0000000000000000000000000000000000000000000000000000000000000011ca0acbf3999783a6ff94ce42e07c959af589bfe860436243152ae90bf3b97d07c62a009f992840128573e7473e22b5329eb063e0d35ed2b36765813da92aeb344cb92", [ "trace" ] ],
+    "id" : 60
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffad52",
+          "input" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0030000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x1b",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 60
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_07_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_07_0_vmTrace.json
new file mode 100644
index 00000000000..cc4bc5fd676
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_07_0_vmTrace.json
@@ -0,0 +1,116 @@
+{
+  "comment" : "Increment 32 bytes provided in data field and return the value.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8818081ef83fffff294003000000000000000000000000000000000000080a0f0000000000000000000000000000000000000000000000000000000000000011ca0acbf3999783a6ff94ce42e07c959af589bfe860436243152ae90bf3b97d07c62a009f992840128573e7473e22b5329eb063e0d35ed2b36765813da92aeb344cb92", [ "vmTrace" ] ],
+    "id" : 113
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60003560010160005260206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756047
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000001" ],
+            "store" : null,
+            "used" : 16756044
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756041
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000002" ],
+            "store" : null,
+            "used" : 16756038
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756035
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756029
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16756026
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756023
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756023
+          },
+          "pc" : 13,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 113
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_08_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_08_0_stateDiff.json
new file mode 100644
index 00000000000..bbf15094a07
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_08_0_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8a28081ef83fffff294004000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ba0227687bd85a4fc2cbf62bf0d7551be4efebeec740886ab4db7e17d54242f8d9da021ed85a8b09f1a20d80cba804281193113f3fc172421865670089f42bceb8fee", [ "stateDiff" ] ],
+    "id" : 8
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386112f08"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aaeab1"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 8
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_08_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_08_0_trace.json
new file mode 100644
index 00000000000..d6bcd154e1b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_08_0_trace.json
@@ -0,0 +1,52 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8a28081ef83fffff294004000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ba0227687bd85a4fc2cbf62bf0d7551be4efebeec740886ab4db7e17d54242f8d9da021ed85a8b09f1a20d80cba804281193113f3fc172421865670089f42bceb8fee", [ "trace" ] ],
+    "id" : 61
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffacc6",
+          "input" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x30a",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfbab36",
+          "input" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0030000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x1b",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 61
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_08_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_08_0_vmTrace.json
new file mode 100644
index 00000000000..4c632a77ce3
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_08_0_vmTrace.json
@@ -0,0 +1,305 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8a28081ef83fffff294004000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ba0227687bd85a4fc2cbf62bf0d7551be4efebeec740886ab4db7e17d54242f8d9da021ed85a8b09f1a20d80cba804281193113f3fc172421865670089f42bceb8fee", [ "vmTrace" ] ],
+    "id" : 114
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755907
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755904
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755901
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16755899
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755896
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x20" ],
+            "store" : null,
+            "used" : 16755893
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755890
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755887
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755878
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755875
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755873
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755870
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x30000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755867
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffac99" ],
+            "store" : null,
+            "used" : 16755865
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16494066,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755138
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x60003560010160005260206000f3",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493363
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000001" ],
+                "store" : null,
+                "used" : 16493360
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16493357
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000002" ],
+                "store" : null,
+                "used" : 16493354
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493351
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 6,
+              "ex" : {
+                "mem" : {
+                  "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+                  "off" : 0
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16493345
+              },
+              "pc" : 8,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16493342
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493339
+              },
+              "pc" : 11,
+              "sub" : null
+            }, {
+              "cost" : 0,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16493339
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755135
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755132
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755132
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 114
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_09_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_09_0_stateDiff.json
new file mode 100644
index 00000000000..e266e6e5208
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_09_0_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Proxy call to another contract - several levels deep. Using CALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8e28081ef83fffff294004000000000000000000000000000000000000080b880000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ba094e32d38bf8eb598113e948ab6540783d311efa0ce2f96cc5fd6bf49d645b979a03b8c2561f34996a4c8f82f83b0dedeb5cd6eb1a7b7ff8ea52a288c4af80993f4", [ "stateDiff" ] ],
+    "id" : 9
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f1838617bf80"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27a45a39"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 9
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_09_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_09_0_trace.json
new file mode 100644
index 00000000000..7da610dea88
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_09_0_trace.json
@@ -0,0 +1,84 @@
+{
+  "comment" : "Proxy call to another contract - several levels deep. Using CALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8e28081ef83fffff294004000000000000000000000000000000000000080b880000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ba094e32d38bf8eb598113e948ab6540783d311efa0ce2f96cc5fd6bf49d645b979a03b8c2561f34996a4c8f82f83b0dedeb5cd6eb1a7b7ff8ea52a288c4af80993f4", [ "trace" ] ],
+    "id" : 62
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffabae",
+          "input" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x8fa",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfbaa17",
+          "input" : "0x00000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x5ff",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xf7b88c",
+          "input" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x30a",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ 0, 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xf3d6cd",
+          "input" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0030000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x1b",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0, 0, 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 62
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_09_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_09_0_vmTrace.json
new file mode 100644
index 00000000000..3bf3deb74ba
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_09_0_vmTrace.json
@@ -0,0 +1,683 @@
+{
+  "comment" : "Proxy call to another contract - several levels deep. Using CALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8e28081ef83fffff294004000000000000000000000000000000000000080b880000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ba094e32d38bf8eb598113e948ab6540783d311efa0ce2f96cc5fd6bf49d645b979a03b8c2561f34996a4c8f82f83b0dedeb5cd6eb1a7b7ff8ea52a288c4af80993f4", [ "vmTrace" ] ],
+    "id" : 115
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755627
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755624
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755621
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755619
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16755616
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x60" ],
+            "store" : null,
+            "used" : 16755613
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755610
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755607
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 21,
+          "ex" : {
+            "mem" : {
+              "data" : "0x00000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755586
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755583
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755581
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755578
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755575
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffab75" ],
+            "store" : null,
+            "used" : 16755573
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16493779,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16753338
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16493076
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493073
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16493070
+              },
+              "pc" : 4,
+              "sub" : null
+            }, {
+              "cost" : 2,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16493068
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16493065
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40", "0x40" ],
+                "store" : null,
+                "used" : 16493062
+              },
+              "pc" : 8,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16493059
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493056
+              },
+              "pc" : 11,
+              "sub" : null
+            }, {
+              "cost" : 15,
+              "ex" : {
+                "mem" : {
+                  "data" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+                  "off" : 0
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16493041
+              },
+              "pc" : 13,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493038
+              },
+              "pc" : 14,
+              "sub" : null
+            }, {
+              "cost" : 2,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493036
+              },
+              "pc" : 16,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493033
+              },
+              "pc" : 17,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40000000000000000000000000000000000000" ],
+                "store" : null,
+                "used" : 16493030
+              },
+              "pc" : 19,
+              "sub" : null
+            }, {
+              "cost" : 2,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xfba9e4" ],
+                "store" : null,
+                "used" : 16493028
+              },
+              "pc" : 20,
+              "sub" : null
+            }, {
+              "cost" : 16235336,
+              "ex" : {
+                "mem" : {
+                  "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+                  "off" : 0
+                },
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16491550
+              },
+              "pc" : 21,
+              "sub" : {
+                "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+                "ops" : [ {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16234633
+                  },
+                  "pc" : 0,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16234630
+                  },
+                  "pc" : 2,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16234627
+                  },
+                  "pc" : 4,
+                  "sub" : null
+                }, {
+                  "cost" : 2,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x40" ],
+                    "store" : null,
+                    "used" : 16234625
+                  },
+                  "pc" : 6,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16234622
+                  },
+                  "pc" : 7,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20", "0x20" ],
+                    "store" : null,
+                    "used" : 16234619
+                  },
+                  "pc" : 8,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16234616
+                  },
+                  "pc" : 9,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16234613
+                  },
+                  "pc" : 11,
+                  "sub" : null
+                }, {
+                  "cost" : 9,
+                  "ex" : {
+                    "mem" : {
+                      "data" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+                      "off" : 0
+                    },
+                    "push" : [ ],
+                    "store" : null,
+                    "used" : 16234604
+                  },
+                  "pc" : 13,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16234601
+                  },
+                  "pc" : 14,
+                  "sub" : null
+                }, {
+                  "cost" : 2,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16234599
+                  },
+                  "pc" : 16,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16234596
+                  },
+                  "pc" : 17,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x30000000000000000000000000000000000000" ],
+                    "store" : null,
+                    "used" : 16234593
+                  },
+                  "pc" : 19,
+                  "sub" : null
+                }, {
+                  "cost" : 2,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0xf7b85f" ],
+                    "store" : null,
+                    "used" : 16234591
+                  },
+                  "pc" : 20,
+                  "sub" : null
+                }, {
+                  "cost" : 15980937,
+                  "ex" : {
+                    "mem" : {
+                      "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+                      "off" : 0
+                    },
+                    "push" : [ "0x1" ],
+                    "store" : null,
+                    "used" : 16233864
+                  },
+                  "pc" : 21,
+                  "sub" : {
+                    "code" : "0x60003560010160005260206000f3",
+                    "ops" : [ {
+                      "cost" : 3,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ "0x0" ],
+                        "store" : null,
+                        "used" : 15980234
+                      },
+                      "pc" : 0,
+                      "sub" : null
+                    }, {
+                      "cost" : 3,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000001" ],
+                        "store" : null,
+                        "used" : 15980231
+                      },
+                      "pc" : 2,
+                      "sub" : null
+                    }, {
+                      "cost" : 3,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ "0x1" ],
+                        "store" : null,
+                        "used" : 15980228
+                      },
+                      "pc" : 3,
+                      "sub" : null
+                    }, {
+                      "cost" : 3,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000002" ],
+                        "store" : null,
+                        "used" : 15980225
+                      },
+                      "pc" : 5,
+                      "sub" : null
+                    }, {
+                      "cost" : 3,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ "0x0" ],
+                        "store" : null,
+                        "used" : 15980222
+                      },
+                      "pc" : 6,
+                      "sub" : null
+                    }, {
+                      "cost" : 6,
+                      "ex" : {
+                        "mem" : {
+                          "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+                          "off" : 0
+                        },
+                        "push" : [ ],
+                        "store" : null,
+                        "used" : 15980216
+                      },
+                      "pc" : 8,
+                      "sub" : null
+                    }, {
+                      "cost" : 3,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ "0x20" ],
+                        "store" : null,
+                        "used" : 15980213
+                      },
+                      "pc" : 9,
+                      "sub" : null
+                    }, {
+                      "cost" : 3,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ "0x0" ],
+                        "store" : null,
+                        "used" : 15980210
+                      },
+                      "pc" : 11,
+                      "sub" : null
+                    }, {
+                      "cost" : 0,
+                      "ex" : {
+                        "mem" : null,
+                        "push" : [ ],
+                        "store" : null,
+                        "used" : 15980210
+                      },
+                      "pc" : 13,
+                      "sub" : null
+                    } ]
+                  }
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16233861
+                  },
+                  "pc" : 22,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16233858
+                  },
+                  "pc" : 24,
+                  "sub" : null
+                }, {
+                  "cost" : 0,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ ],
+                    "store" : null,
+                    "used" : 16233858
+                  },
+                  "pc" : 26,
+                  "sub" : null
+                } ]
+              }
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16491547
+              },
+              "pc" : 22,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16491544
+              },
+              "pc" : 24,
+              "sub" : null
+            }, {
+              "cost" : 0,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16491544
+              },
+              "pc" : 26,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16753335
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16753332
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16753332
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 115
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0a_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0a_0_stateDiff.json
new file mode 100644
index 00000000000..fb43ec75cac
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0a_0_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep. Using CALLCODE.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8a18081ef83fffff294005000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ca0f5a778187bd9ad3bdaef19edeffcb2a8917ed24295f70f0c0d31b47854e493d69f23060788506d5d3a59338decc302d55af0ccfeafa230c2a7fc0815ce13971d", [ "stateDiff" ] ],
+    "id" : 10
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386112f08"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aaeab1"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 10
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0a_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0a_0_trace.json
new file mode 100644
index 00000000000..48aaf2259b8
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0a_0_trace.json
@@ -0,0 +1,52 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep. Using CALLCODE.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8a18081ef83fffff294005000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ca0f5a778187bd9ad3bdaef19edeffcb2a8917ed24295f70f0c0d31b47854e493d69f23060788506d5d3a59338decc302d55af0ccfeafa230c2a7fc0815ce13971d", [ "trace" ] ],
+    "id" : 63
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffacc6",
+          "input" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0050000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x30a",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "callcode",
+          "from" : "0x0050000000000000000000000000000000000000",
+          "gas" : "0xfbab36",
+          "input" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0030000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x1b",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 63
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0a_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0a_0_vmTrace.json
new file mode 100644
index 00000000000..b406dde49d4
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0a_0_vmTrace.json
@@ -0,0 +1,305 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep. Using CALLCODE.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8a18081ef83fffff294005000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ca0f5a778187bd9ad3bdaef19edeffcb2a8917ed24295f70f0c0d31b47854e493d69f23060788506d5d3a59338decc302d55af0ccfeafa230c2a7fc0815ce13971d", [ "vmTrace" ] ],
+    "id" : 116
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af260206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755907
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755904
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755901
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16755899
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755896
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x20" ],
+            "store" : null,
+            "used" : 16755893
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755890
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755887
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755878
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755875
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755873
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755870
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x30000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755867
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffac99" ],
+            "store" : null,
+            "used" : 16755865
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16494066,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755138
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x60003560010160005260206000f3",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493363
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000001" ],
+                "store" : null,
+                "used" : 16493360
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16493357
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000002" ],
+                "store" : null,
+                "used" : 16493354
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493351
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 6,
+              "ex" : {
+                "mem" : {
+                  "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+                  "off" : 0
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16493345
+              },
+              "pc" : 8,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16493342
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493339
+              },
+              "pc" : 11,
+              "sub" : null
+            }, {
+              "cost" : 0,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16493339
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755135
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755132
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755132
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 116
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0b_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0b_0_stateDiff.json
new file mode 100644
index 00000000000..9ffe0958926
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0b_0_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep. Using DELEGATECALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8a28081ef83fffff294006000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ba01caa106cf71c1bce1cc77a1292bb78a0b54f983b323f24128f4b3b6ddf9ee6d3a072d4eb63594b91cbee2bb203298ae128abe99dc8d7270d213c48a6242d2bc605", [ "stateDiff" ] ],
+    "id" : 11
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386112d2a"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aaec8f"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 11
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0b_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0b_0_trace.json
new file mode 100644
index 00000000000..061c5a07d75
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0b_0_trace.json
@@ -0,0 +1,52 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep. Using DELEGATECALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8a28081ef83fffff294006000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ba01caa106cf71c1bce1cc77a1292bb78a0b54f983b323f24128f4b3b6ddf9ee6d3a072d4eb63594b91cbee2bb203298ae128abe99dc8d7270d213c48a6242d2bc605", [ "trace" ] ],
+    "id" : 64
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffacc6",
+          "input" : "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0060000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x308",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "delegatecall",
+          "from" : "0x0060000000000000000000000000000000000000",
+          "gas" : "0xfbab38",
+          "input" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+          "to" : "0x0030000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x1b",
+          "output" : "0xf000000000000000000000000000000000000000000000000000000000000002"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 64
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0b_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0b_0_vmTrace.json
new file mode 100644
index 00000000000..d8bc71b7751
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0b_0_vmTrace.json
@@ -0,0 +1,295 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep. Using DELEGATECALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8a28081ef83fffff294006000000000000000000000000000000000000080b8400000000000000000000000000030000000000000000000000000000000000000f0000000000000000000000000000000000000000000000000000000000000011ba01caa106cf71c1bce1cc77a1292bb78a0b54f983b323f24128f4b3b6ddf9ee6d3a072d4eb63594b91cbee2bb203298ae128abe99dc8d7270d213c48a6242d2bc605", [ "vmTrace" ] ],
+    "id" : 117
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x602060006020360380602060003760006000355af460206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755907
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755904
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755901
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16755899
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755896
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x20" ],
+            "store" : null,
+            "used" : 16755893
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755890
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755887
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755878
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755875
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755872
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x30000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755869
+          },
+          "pc" : 18,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffac9b" ],
+            "store" : null,
+            "used" : 16755867
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 16494068,
+          "ex" : {
+            "mem" : {
+              "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755140
+          },
+          "pc" : 20,
+          "sub" : {
+            "code" : "0x60003560010160005260206000f3",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493365
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000001" ],
+                "store" : null,
+                "used" : 16493362
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16493359
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xf000000000000000000000000000000000000000000000000000000000000002" ],
+                "store" : null,
+                "used" : 16493356
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493353
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 6,
+              "ex" : {
+                "mem" : {
+                  "data" : "0xf000000000000000000000000000000000000000000000000000000000000002",
+                  "off" : 0
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16493347
+              },
+              "pc" : 8,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16493344
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16493341
+              },
+              "pc" : 11,
+              "sub" : null
+            }, {
+              "cost" : 0,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16493341
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755137
+          },
+          "pc" : 21,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755134
+          },
+          "pc" : 23,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755134
+          },
+          "pc" : 25,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 117
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0c_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0c_0_stateDiff.json
new file mode 100644
index 00000000000..4a802aa0520
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0c_0_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Sequential memory modifications with MSTORE8.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294007000000000000000000000000000000000000080801ca037d0695dc0e97dafd4e2f08d7b9c05ec8f6825409ff49ded4714632ee49c5d4ca05123df205d2b5344b4693feb1a341c1b1d0c38cc53b105c58e0b8dbec3c0288b", [ "stateDiff" ] ],
+    "id" : 12
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860d6418"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aeb5a1"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 12
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0c_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0c_0_trace.json
new file mode 100644
index 00000000000..5043fb3a09c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0c_0_trace.json
@@ -0,0 +1,36 @@
+{
+  "comment" : "Sequential memory modifications with MSTORE8.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294007000000000000000000000000000000000000080801ca037d0695dc0e97dafd4e2f08d7b9c05ec8f6825409ff49ded4714632ee49c5d4ca05123df205d2b5344b4693feb1a341c1b1d0c38cc53b105c58e0b8dbec3c0288b", [ "trace" ] ],
+    "id" : 65
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0070000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x1e",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 65
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0c_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0c_0_vmTrace.json
new file mode 100644
index 00000000000..9a6021aa884
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0c_0_vmTrace.json
@@ -0,0 +1,122 @@
+{
+  "comment" : "Sequential memory modifications with MSTORE8.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294007000000000000000000000000000000000000080801ca037d0695dc0e97dafd4e2f08d7b9c05ec8f6825409ff49ded4714632ee49c5d4ca05123df205d2b5344b4693feb1a341c1b1d0c38cc53b105c58e0b8dbec3c0288b", [ "vmTrace" ] ],
+    "id" : 118
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x600160025360036004536001600553",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x01",
+              "off" : 2
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16756184
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x03",
+              "off" : 4
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756181
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756178
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16756175
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x01",
+              "off" : 5
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756172
+          },
+          "pc" : 14,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 118
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0d_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0d_0_stateDiff.json
new file mode 100644
index 00000000000..9caba89e978
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0d_0_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Sequential memory modifications with MSTORE.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294008000000000000000000000000000000000000080801ba0bbc28666e07f9906314109d70eba6b66298e48733d65ff0f8c299a21e51c3e7ca03e39b147df2ebce6326c93e3c9c42ba1dece7b994be120ab39e39c6da830acd2", [ "stateDiff" ] ],
+    "id" : 13
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860d5617"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aec3a2"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 13
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0d_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0d_0_trace.json
new file mode 100644
index 00000000000..8fe03da182c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0d_0_trace.json
@@ -0,0 +1,36 @@
+{
+  "comment" : "Sequential memory modifications with MSTORE.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294008000000000000000000000000000000000000080801ba0bbc28666e07f9906314109d70eba6b66298e48733d65ff0f8c299a21e51c3e7ca03e39b147df2ebce6326c93e3c9c42ba1dece7b994be120ab39e39c6da830acd2", [ "trace" ] ],
+    "id" : 66
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0080000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0xf",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 66
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0d_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0d_0_vmTrace.json
new file mode 100644
index 00000000000..152fa3e5475
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0d_0_vmTrace.json
@@ -0,0 +1,56 @@
+{
+  "comment" : "Sequential memory modifications with MSTORE.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294008000000000000000000000000000000000000080801ba0bbc28666e07f9906314109d70eba6b66298e48733d65ff0f8c299a21e51c3e7ca03e39b147df2ebce6326c93e3c9c42ba1dece7b994be120ab39e39c6da830acd2", [ "vmTrace" ] ],
+    "id" : 119
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000152",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 1
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 66,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 119
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_0_stateDiff.json
new file mode 100644
index 00000000000..6b39c1df6f7
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_0_stateDiff.json
@@ -0,0 +1,61 @@
+{
+  "comment" : "Increments contract storage 0 by 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294009000000000000000000000000000000000000080801ba068c10126acd98833d36c00d2a995791259fda42676d8a0a30f3f7c0c93779590a072f5a07167bdfec92a48834d545ca31ffe97a26b4f734e987ddca632416af647", [ "stateDiff" ] ],
+    "id" : 14
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x04",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386228af0"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0090000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000000" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000003",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000004"
+              }
+            }
+          }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27998ec9"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 14
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_0_trace.json
new file mode 100644
index 00000000000..b2172b375d5
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_0_trace.json
@@ -0,0 +1,36 @@
+{
+  "comment" : "Increments contract storage 0 by 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294009000000000000000000000000000000000000080801ba068c10126acd98833d36c00d2a995791259fda42676d8a0a30f3f7c0c93779590a072f5a07167bdfec92a48834d545ca31ffe97a26b4f734e987ddca632416af647", [ "trace" ] ],
+    "id" : 67
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x04",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0090000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x16c6",
+          "output" : "0x04"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 67
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_0_vmTrace.json
new file mode 100644
index 00000000000..f3bbe62895e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_0_vmTrace.json
@@ -0,0 +1,149 @@
+{
+  "comment" : "Increments contract storage 0 by 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294009000000000000000000000000000000000000080801ba068c10126acd98833d36c00d2a995791259fda42676d8a0a30f3f7c0c93779590a072f5a07167bdfec92a48834d545ca31ffe97a26b4f734e987ddca632416af647", [ "vmTrace" ] ],
+    "id" : 120
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x04",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6000546001018060005360005560016000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16755399
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755396
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16755393
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4", "0x4" ],
+            "store" : null,
+            "used" : 16755390
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755387
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x04",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755381
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755378
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x0",
+              "val" : "0x4"
+            },
+            "used" : 16750378
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16750375
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16750372
+          },
+          "pc" : 15,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16750372
+          },
+          "pc" : 17,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 120
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_1_stateDiff.json
new file mode 100644
index 00000000000..299a98474d4
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_1_stateDiff.json
@@ -0,0 +1,61 @@
+{
+  "comment" : "Increments contract storage 0 by 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294009000000000000000000000000000000000000080801ba068c10126acd98833d36c00d2a995791259fda42676d8a0a30f3f7c0c93779590a072f5a07167bdfec92a48834d545ca31ffe97a26b4f734e987ddca632416af647", [ "stateDiff" ] ],
+    "id" : 15
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x04",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386228af0"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0090000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000000" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000003",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000004"
+              }
+            }
+          }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27998ec9"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 15
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_1_trace.json
new file mode 100644
index 00000000000..b73bbb6a6ea
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_1_trace.json
@@ -0,0 +1,36 @@
+{
+  "comment" : "Increments contract storage 0 by 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294009000000000000000000000000000000000000080801ba068c10126acd98833d36c00d2a995791259fda42676d8a0a30f3f7c0c93779590a072f5a07167bdfec92a48834d545ca31ffe97a26b4f734e987ddca632416af647", [ "trace" ] ],
+    "id" : 68
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x04",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0090000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x16c6",
+          "output" : "0x04"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 68
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_1_vmTrace.json
new file mode 100644
index 00000000000..fcc0f83f58b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_1_vmTrace.json
@@ -0,0 +1,149 @@
+{
+  "comment" : "Increments contract storage 0 by 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294009000000000000000000000000000000000000080801ba068c10126acd98833d36c00d2a995791259fda42676d8a0a30f3f7c0c93779590a072f5a07167bdfec92a48834d545ca31ffe97a26b4f734e987ddca632416af647", [ "vmTrace" ] ],
+    "id" : 121
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x04",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6000546001018060005360005560016000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16755399
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755396
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16755393
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4", "0x4" ],
+            "store" : null,
+            "used" : 16755390
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755387
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x04",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755381
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755378
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x0",
+              "val" : "0x4"
+            },
+            "used" : 16750378
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16750375
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16750372
+          },
+          "pc" : 15,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16750372
+          },
+          "pc" : 17,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 121
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_2_stateDiff.json
new file mode 100644
index 00000000000..20532f46739
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_2_stateDiff.json
@@ -0,0 +1,61 @@
+{
+  "comment" : "Increments contract storage 0 by 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294009000000000000000000000000000000000000080801ba068c10126acd98833d36c00d2a995791259fda42676d8a0a30f3f7c0c93779590a072f5a07167bdfec92a48834d545ca31ffe97a26b4f734e987ddca632416af647", [ "stateDiff" ] ],
+    "id" : 16
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x04",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386228af0"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0090000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000000" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000003",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000004"
+              }
+            }
+          }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27998ec9"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 16
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_2_trace.json
new file mode 100644
index 00000000000..d4f2590975c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_2_trace.json
@@ -0,0 +1,36 @@
+{
+  "comment" : "Increments contract storage 0 by 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294009000000000000000000000000000000000000080801ba068c10126acd98833d36c00d2a995791259fda42676d8a0a30f3f7c0c93779590a072f5a07167bdfec92a48834d545ca31ffe97a26b4f734e987ddca632416af647", [ "trace" ] ],
+    "id" : 69
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x04",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0090000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x16c6",
+          "output" : "0x04"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 69
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_2_vmTrace.json
new file mode 100644
index 00000000000..0216005f102
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0e_2_vmTrace.json
@@ -0,0 +1,149 @@
+{
+  "comment" : "Increments contract storage 0 by 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294009000000000000000000000000000000000000080801ba068c10126acd98833d36c00d2a995791259fda42676d8a0a30f3f7c0c93779590a072f5a07167bdfec92a48834d545ca31ffe97a26b4f734e987ddca632416af647", [ "vmTrace" ] ],
+    "id" : 122
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x04",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6000546001018060005360005560016000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16755399
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755396
+          },
+          "pc" : 3,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16755393
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4", "0x4" ],
+            "store" : null,
+            "used" : 16755390
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755387
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x04",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755381
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755378
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x0",
+              "val" : "0x4"
+            },
+            "used" : 16750378
+          },
+          "pc" : 12,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16750375
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16750372
+          },
+          "pc" : 15,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16750372
+          },
+          "pc" : 17,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 122
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_0_stateDiff.json
new file mode 100644
index 00000000000..ea32997ec90
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_0_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Log output with LOG1.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff29400a000000000000000000000000000000000000080801ba0f42215cd96cc735c648c6e6779e4b0276270aa18355f9b248e68075c464784d2a01a5f04f9cfd276e8f3676061c88ca123f2f98a626b74bd6aece887354db82523", [ "stateDiff" ] ],
+    "id" : 17
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386101f5b"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27abfa5e"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 17
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_0_trace.json
new file mode 100644
index 00000000000..142dbd0bca9
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_0_trace.json
@@ -0,0 +1,36 @@
+{
+  "comment" : "Log output with LOG1.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff29400a000000000000000000000000000000000000080801ba0f42215cd96cc735c648c6e6779e4b0276270aa18355f9b248e68075c464784d2a01a5f04f9cfd276e8f3676061c88ca123f2f98a626b74bd6aece887354db82523", [ "trace" ] ],
+    "id" : 70
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x00a0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x30b",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 70
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_0_vmTrace.json
new file mode 100644
index 00000000000..1e9533ab516
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_0_vmTrace.json
@@ -0,0 +1,96 @@
+{
+  "comment" : "Log output with LOG1.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff29400a000000000000000000000000000000000000080801ba0f42215cd96cc735c648c6e6779e4b0276270aa18355f9b248e68075c464784d2a01a5f04f9cfd276e8f3676061c88ca123f2f98a626b74bd6aece887354db82523", [ "vmTrace" ] ],
+    "id" : 123
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x608b60045360ff60016004a1",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x8b" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x8b",
+              "off" : 4
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756184
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16756181
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 758,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755423
+          },
+          "pc" : 11,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 123
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_1_stateDiff.json
new file mode 100644
index 00000000000..4d9d43b9639
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_1_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Log output with LOG2.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff29400b000000000000000000000000000000000000080801ca0f0f0940cb847f877c7ff97f008ee5765c274ca1c6e96fd7f47f333aadf9f3047a00611937b19b220c7e81c80b372e8338fde6ab792e15aebd631cb0110b7bf0f09", [ "stateDiff" ] ],
+    "id" : 18
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386118041"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aa9978"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 18
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_1_trace.json
new file mode 100644
index 00000000000..b6bbbd9ae3b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_1_trace.json
@@ -0,0 +1,36 @@
+{
+  "comment" : "Log output with LOG2.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff29400b000000000000000000000000000000000000080801ca0f0f0940cb847f877c7ff97f008ee5765c274ca1c6e96fd7f47f333aadf9f3047a00611937b19b220c7e81c80b372e8338fde6ab792e15aebd631cb0110b7bf0f09", [ "trace" ] ],
+    "id" : 71
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x00b0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x485",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 71
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_1_vmTrace.json
new file mode 100644
index 00000000000..aa776d59517
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_0f_1_vmTrace.json
@@ -0,0 +1,106 @@
+{
+  "comment" : "Log output with LOG2.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff29400b000000000000000000000000000000000000080801ca0f0f0940cb847f877c7ff97f008ee5765c274ca1c6e96fd7f47f333aadf9f3047a00611937b19b220c7e81c80b372e8338fde6ab792e15aebd631cb0110b7bf0f09", [ "vmTrace" ] ],
+    "id" : 124
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x608b60045360aa60ff60016004a2",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x8b" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x8b",
+              "off" : 4
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xaa" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16756184
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756181
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16756178
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 1133,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755045
+          },
+          "pc" : 13,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 124
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_0_stateDiff.json
new file mode 100644
index 00000000000..6fcab1b2cca
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_0_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Various exceptional halt cases. Invalid OPCODE (0x1F).",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff29400c000000000000000000000000000000000000080801ba0d91c27daad8e1eb6b4063bd4300aa75310bbd0eb5cdbde908bcb20f5335f891ea0326703eb5dab4aea5451b387c8ca0e6546f4446efd5383f0ba7efbd2af3801ef", [ "stateDiff" ] ],
+    "id" : 19
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18474c0a58c"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffc38fb742d"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 19
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_0_trace.json
new file mode 100644
index 00000000000..d7376ce964b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_0_trace.json
@@ -0,0 +1,33 @@
+{
+  "comment" : "Various exceptional halt cases. Invalid OPCODE (0x1F).",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff29400c000000000000000000000000000000000000080801ba0d91c27daad8e1eb6b4063bd4300aa75310bbd0eb5cdbde908bcb20f5335f891ea0326703eb5dab4aea5451b387c8ca0e6546f4446efd5383f0ba7efbd2af3801ef", [ "trace" ] ],
+    "id" : 72
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x00c0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "error" : "Bad instruction",
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 72
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_0_vmTrace.json
new file mode 100644
index 00000000000..4e5b0943853
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_0_vmTrace.json
@@ -0,0 +1,33 @@
+{
+  "comment" : "Various exceptional halt cases. Invalid OPCODE (0x1F).",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff29400c000000000000000000000000000000000000080801ba0d91c27daad8e1eb6b4063bd4300aa75310bbd0eb5cdbde908bcb20f5335f891ea0326703eb5dab4aea5451b387c8ca0e6546f4446efd5383f0ba7efbd2af3801ef", [ "vmTrace" ] ],
+    "id" : 125
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60011f",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 125
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_1_stateDiff.json
new file mode 100644
index 00000000000..e35a4f32ea9
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_1_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Various exceptional halt cases. INSUFFICIENT_STACK_ITEMS.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff29400d000000000000000000000000000000000000080801ca07a612f4e688476ec724ca1b43bf42554fbb6fe7e23b9e11f266fb02d943fa0d7a06dc7585f54af231d7127f4461f0e12175582c106c890f34d5d0f9eeef76896a9", [ "stateDiff" ] ],
+    "id" : 20
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18474c0a58c"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffc38fb742d"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 20
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_1_trace.json
new file mode 100644
index 00000000000..affa7406b69
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_1_trace.json
@@ -0,0 +1,33 @@
+{
+  "comment" : "Various exceptional halt cases. INSUFFICIENT_STACK_ITEMS.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff29400d000000000000000000000000000000000000080801ca07a612f4e688476ec724ca1b43bf42554fbb6fe7e23b9e11f266fb02d943fa0d7a06dc7585f54af231d7127f4461f0e12175582c106c890f34d5d0f9eeef76896a9", [ "trace" ] ],
+    "id" : 73
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x00d0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "error" : "Stack underflow",
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 73
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_1_vmTrace.json
new file mode 100644
index 00000000000..652b72d42ff
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_1_vmTrace.json
@@ -0,0 +1,33 @@
+{
+  "comment" : "Various exceptional halt cases. INSUFFICIENT_STACK_ITEMS.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff29400d000000000000000000000000000000000000080801ca07a612f4e688476ec724ca1b43bf42554fbb6fe7e23b9e11f266fb02d943fa0d7a06dc7585f54af231d7127f4461f0e12175582c106c890f34d5d0f9eeef76896a9", [ "vmTrace" ] ],
+    "id" : 126
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x600120",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 126
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_2_stateDiff.json
new file mode 100644
index 00000000000..fd5e2df121d
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_2_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Various exceptional halt cases. INVALID_JUMP_DESTINATION.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff29400e000000000000000000000000000000000000080801ca028b46afe2345d255199e0df8a46e8e75cdb52d0360473f0f375f3b853d66a3c7a07c46f3eb520a65c3bce2ce47eb25223a62ac2d68b865e83d92d215334e93c9cd", [ "stateDiff" ] ],
+    "id" : 21
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18474c0a58c"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffc38fb742d"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 21
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_2_trace.json
new file mode 100644
index 00000000000..2e291874c7a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_2_trace.json
@@ -0,0 +1,33 @@
+{
+  "comment" : "Various exceptional halt cases. INVALID_JUMP_DESTINATION.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff29400e000000000000000000000000000000000000080801ca028b46afe2345d255199e0df8a46e8e75cdb52d0360473f0f375f3b853d66a3c7a07c46f3eb520a65c3bce2ce47eb25223a62ac2d68b865e83d92d215334e93c9cd", [ "trace" ] ],
+    "id" : 74
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x00e0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "error" : "Bad jump destination",
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 74
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_2_vmTrace.json
new file mode 100644
index 00000000000..7f87126bdfb
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_10_2_vmTrace.json
@@ -0,0 +1,43 @@
+{
+  "comment" : "Various exceptional halt cases. INVALID_JUMP_DESTINATION.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff29400e000000000000000000000000000000000000080801ca028b46afe2345d255199e0df8a46e8e75cdb52d0360473f0f375f3b853d66a3c7a07c46f3eb520a65c3bce2ce47eb25223a62ac2d68b865e83d92d215334e93c9cd", [ "vmTrace" ] ],
+    "id" : 127
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60ff5660016002",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756191
+          },
+          "pc" : 2,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 127
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_11_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_11_0_stateDiff.json
new file mode 100644
index 00000000000..c02b631124e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_11_0_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Pushes 1, 2, 3, then SWAP2 and SWAP1.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff29400f000000000000000000000000000000000000080801ca0b8b3fb6e8fcd85310a5a1fa9af5e2cfa90ba245e9328296cfc20a3880b26d390a079a15ed4130ec373e0f8fd897482fd4545891f5398f934254060085e4edc51c6", [ "stateDiff" ] ],
+    "id" : 22
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860d5617"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aec3a2"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 22
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_11_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_11_0_trace.json
new file mode 100644
index 00000000000..01b42cc5d3a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_11_0_trace.json
@@ -0,0 +1,36 @@
+{
+  "comment" : "Pushes 1, 2, 3, then SWAP2 and SWAP1.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff29400f000000000000000000000000000000000000080801ca0b8b3fb6e8fcd85310a5a1fa9af5e2cfa90ba245e9328296cfc20a3880b26d390a079a15ed4130ec373e0f8fd897482fd4545891f5398f934254060085e4edc51c6", [ "trace" ] ],
+    "id" : 75
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x00f0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0xf",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 75
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_11_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_11_0_vmTrace.json
new file mode 100644
index 00000000000..6d4f5b7d5e2
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_11_0_vmTrace.json
@@ -0,0 +1,73 @@
+{
+  "comment" : "Pushes 1, 2, 3, then SWAP2 and SWAP1.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff29400f000000000000000000000000000000000000080801ca0b8b3fb6e8fcd85310a5a1fa9af5e2cfa90ba245e9328296cfc20a3880b26d390a079a15ed4130ec373e0f8fd897482fd4545891f5398f934254060085e4edc51c6", [ "vmTrace" ] ],
+    "id" : 128
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6001600260039190",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16756193
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0x2", "0x1" ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x2" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 7,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 128
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_0_stateDiff.json
new file mode 100644
index 00000000000..a29b327152b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_0_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Memory Read.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294010000000000000000000000000000000000000080801ca02ef8d1f672cc0eb51035ae00fbee408f89653b04d60d1df04a143563841c3e84a05168865a0f5f5102a3c4204afc3a0cf6c952562f66fac49143338c827da5f584", [ "stateDiff" ] ],
+    "id" : 23
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860d6418"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aeb5a1"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 23
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_0_trace.json
new file mode 100644
index 00000000000..4390da92014
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_0_trace.json
@@ -0,0 +1,36 @@
+{
+  "comment" : "Memory Read.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294010000000000000000000000000000000000000080801ca02ef8d1f672cc0eb51035ae00fbee408f89653b04d60d1df04a143563841c3e84a05168865a0f5f5102a3c4204afc3a0cf6c952562f66fac49143338c827da5f584", [ "trace" ] ],
+    "id" : 76
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0100000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x1e",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 76
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_0_vmTrace.json
new file mode 100644
index 00000000000..ff1036c0fcd
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_0_vmTrace.json
@@ -0,0 +1,112 @@
+{
+  "comment" : "Memory Read.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294010000000000000000000000000000000000000080801ca02ef8d1f672cc0eb51035ae00fbee408f89653b04d60d1df04a143563841c3e84a05168865a0f5f5102a3c4204afc3a0cf6c952562f66fac49143338c827da5f584", [ "vmTrace" ] ],
+    "id" : 129
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x7f3940be4289e4c3587d88c1856cc95352461992db0a584c281226faefe560b3016000527f14c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e2272dbf884ef3905601052600851",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3940be4289e4c3587d88c1856cc95352461992db0a584c281226faefe560b301" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x3940be4289e4c3587d88c1856cc95352461992db0a584c281226faefe560b301",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e2272dbf884ef3905" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 36,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10" ],
+            "store" : null,
+            "used" : 16756184
+          },
+          "pc" : 69,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x14c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e2272dbf884ef3905",
+              "off" : 16
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756178
+          },
+          "pc" : 71,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x8" ],
+            "store" : null,
+            "used" : 16756175
+          },
+          "pc" : 72,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x7d88c1856cc9535214c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e",
+              "off" : 8
+            },
+            "push" : [ "0x7d88c1856cc9535214c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e" ],
+            "store" : null,
+            "used" : 16756172
+          },
+          "pc" : 74,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 129
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_1_stateDiff.json
new file mode 100644
index 00000000000..dcf9f3a4f6c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_1_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Revert.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294011000000000000000000000000000000000000080801ba011e7a12824856b23b46fcf302e3a51c94093143c0d18c2de32b38c3ef3b1251ca04eb5fa78e936ab47980dd424d34ef4e4f579daf1652db1a9b1fa442992451885", [ "stateDiff" ] ],
+    "id" : 24
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x7d88c1856cc95352",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860d6418"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27aeb5a1"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 24
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_1_trace.json
new file mode 100644
index 00000000000..faa638012f1
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_1_trace.json
@@ -0,0 +1,34 @@
+{
+  "comment" : "Revert. Note revertReason has been manually added to the response because OpenEthereum does not include it.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294011000000000000000000000000000000000000080801ba011e7a12824856b23b46fcf302e3a51c94093143c0d18c2de32b38c3ef3b1251ca04eb5fa78e936ab47980dd424d34ef4e4f579daf1652db1a9b1fa442992451885", [ "trace" ] ],
+    "id" : 77
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x7d88c1856cc95352",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0110000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "error" : "Reverted",
+        "revertReason" : "0x7d88c1856cc95352",
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 77
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_1_vmTrace.json
new file mode 100644
index 00000000000..45c5c5e003f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_12_1_vmTrace.json
@@ -0,0 +1,119 @@
+{
+  "comment" : "Revert.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294011000000000000000000000000000000000000080801ba011e7a12824856b23b46fcf302e3a51c94093143c0d18c2de32b38c3ef3b1251ca04eb5fa78e936ab47980dd424d34ef4e4f579daf1652db1a9b1fa442992451885", [ "vmTrace" ] ],
+    "id" : 130
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x7d88c1856cc95352",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x7f3940be4289e4c3587d88c1856cc95352461992db0a584c281226faefe560b3016000527f14c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e2272dbf884ef390560105260086008fd",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3940be4289e4c3587d88c1856cc95352461992db0a584c281226faefe560b301" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x3940be4289e4c3587d88c1856cc95352461992db0a584c281226faefe560b301",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e2272dbf884ef3905" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 36,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10" ],
+            "store" : null,
+            "used" : 16756184
+          },
+          "pc" : 69,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x14c4d2c102bdeb2354bfc3dc96a95e4512cf3a8461e0560e2272dbf884ef3905",
+              "off" : 16
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756178
+          },
+          "pc" : 71,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x8" ],
+            "store" : null,
+            "used" : 16756175
+          },
+          "pc" : 72,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x8" ],
+            "store" : null,
+            "used" : 16756172
+          },
+          "pc" : 74,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756172
+          },
+          "pc" : 76,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 130
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_0_stateDiff.json
new file mode 100644
index 00000000000..fa52901b5b1
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_0_stateDiff.json
@@ -0,0 +1,60 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "stateDiff" ] ],
+    "id" : 25
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f1838685c9c2"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241" : {
+          "balance" : {
+            "+" : "0x0"
+          },
+          "code" : {
+            "+" : "0x600035ff"
+          },
+          "nonce" : {
+            "+" : "0x1"
+          },
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d07946cf17"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 25
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_0_trace.json
new file mode 100644
index 00000000000..e5b44e827ba
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "trace" ] ],
+    "id" : 78
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff300e",
+          "init" : "0x6004600c60003960046000f3600035ff",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "code" : "0x600035ff",
+          "gasUsed" : "0x338"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 78
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_0_vmTrace.json
new file mode 100644
index 00000000000..01ef9309484
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_0_vmTrace.json
@@ -0,0 +1,96 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "vmTrace" ] ],
+    "id" : 131
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6004600c60003960046000f3600035ff",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723979
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc" ],
+            "store" : null,
+            "used" : 16723976
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723973
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0x600035ff",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723964
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723961
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 11,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 131
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_1_stateDiff.json
new file mode 100644
index 00000000000..072ca2d2109
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_1_stateDiff.json
@@ -0,0 +1,60 @@
+{
+  "comment" : "call the prior contract then call log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8908081ef83fffff28080b84260006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5af1600060006000600060007300a00000000000000000000000000000000000005af11ba0289116cd7bd226e6cc31cbd20382b9632ac9aca596f03be9927240957cca3b13a021ec53811de779577040a16c294d920fc5d3056c6cc3dd87763b2cf16fa2d3cf", [ "stateDiff" ] ],
+    "id" : 26
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183868ca7b7"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241" : {
+          "balance" : {
+            "+" : "0x0"
+          },
+          "code" : {
+            "+" : "0x"
+          },
+          "nonce" : {
+            "+" : "0x1"
+          },
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d0793ff122"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 26
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_1_trace.json
new file mode 100644
index 00000000000..c576813754b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_1_trace.json
@@ -0,0 +1,67 @@
+{
+  "comment" : "call the prior contract then call log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8908081ef83fffff28080b84260006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5af1600060006000600060007300a00000000000000000000000000000000000005af11ba0289116cd7bd226e6cc31cbd20382b9632ac9aca596f03be9927240957cca3b13a021ec53811de779577040a16c294d920fc5d3056c6cc3dd87763b2cf16fa2d3cf", [ "trace" ] ],
+    "id" : 79
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff2e26",
+          "init" : "0x60006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5af1600060006000600060007300a00000000000000000000000000000000000005af1",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "code" : "0x",
+          "gasUsed" : "0x8ab"
+        },
+        "subtraces" : 2,
+        "traceAddress" : [ ],
+        "type" : "create"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "gas" : "0xfb2ea9",
+          "input" : "0x",
+          "to" : "0x8f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x0",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "gas" : "0xfb2be4",
+          "input" : "0x",
+          "to" : "0x00a0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x30b",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 1 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 79
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_1_vmTrace.json
new file mode 100644
index 00000000000..067751b114d
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_1_vmTrace.json
@@ -0,0 +1,262 @@
+{
+  "comment" : "call the prior contract then call log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8908081ef83fffff28080b84260006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5af1600060006000600060007300a00000000000000000000000000000000000005af11ba0289116cd7bd226e6cc31cbd20382b9632ac9aca596f03be9927240957cca3b13a021ec53811de779577040a16c294d920fc5d3056c6cc3dd87763b2cf16fa2d3cf", [ "vmTrace" ] ],
+    "id" : 132
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60006000600060006000738f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f5af1600060006000600060007300a00000000000000000000000000000000000005af1",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723491
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723488
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723485
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723482
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723479
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x8f0483125fcb9aaaefa9209d8e9d7b9c8b9fb90f" ],
+            "store" : null,
+            "used" : 16723476
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff2e12" ],
+            "store" : null,
+            "used" : 16723474
+          },
+          "pc" : 31,
+          "sub" : null
+        }, {
+          "cost" : 16462181,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16722774
+          },
+          "pc" : 32,
+          "sub" : {
+            "code" : "0x",
+            "ops" : [ ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16722771
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16722768
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16722765
+          },
+          "pc" : 37,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16722762
+          },
+          "pc" : 39,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16722759
+          },
+          "pc" : 41,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16722756
+          },
+          "pc" : 43,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff2b42" ],
+            "store" : null,
+            "used" : 16722754
+          },
+          "pc" : 64,
+          "sub" : null
+        }, {
+          "cost" : 16461472,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16721275
+          },
+          "pc" : 65,
+          "sub" : {
+            "code" : "0x608b60045360ff60016004a1",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x8b" ],
+                "store" : null,
+                "used" : 16460769
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16460766
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 6,
+              "ex" : {
+                "mem" : {
+                  "data" : "0x8b",
+                  "off" : 4
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16460760
+              },
+              "pc" : 4,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xff" ],
+                "store" : null,
+                "used" : 16460757
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16460754
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16460751
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 758,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16459993
+              },
+              "pc" : 11,
+              "sub" : null
+            } ]
+          }
+        } ]
+      }
+    },
+    "id" : 132
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_2_stateDiff.json
new file mode 100644
index 00000000000..d93fe373fce
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_2_stateDiff.json
@@ -0,0 +1,60 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "stateDiff" ] ],
+    "id" : 27
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f1838685c9c2"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241" : {
+          "balance" : {
+            "+" : "0x0"
+          },
+          "code" : {
+            "+" : "0x600035ff"
+          },
+          "nonce" : {
+            "+" : "0x1"
+          },
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d07946cf17"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 27
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_2_trace.json
new file mode 100644
index 00000000000..84fde1492e5
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_2_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "trace" ] ],
+    "id" : 80
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff300e",
+          "init" : "0x6004600c60003960046000f3600035ff",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "code" : "0x600035ff",
+          "gasUsed" : "0x338"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 80
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_2_vmTrace.json
new file mode 100644
index 00000000000..7461629c03a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_2_vmTrace.json
@@ -0,0 +1,96 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "vmTrace" ] ],
+    "id" : 133
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6004600c60003960046000f3600035ff",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723979
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc" ],
+            "store" : null,
+            "used" : 16723976
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723973
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0x600035ff",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723964
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723961
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 11,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 133
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_3_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_3_stateDiff.json
new file mode 100644
index 00000000000..edef415cb6f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_3_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "call the prior contract then callcode log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8908081ef83fffff28080b84260006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45af2600060006000600060007300a00000000000000000000000000000000000005af21ca025631cda5dbd0c7232559a52b68cc0d36407d58dd8a68b1cf75c0e000a2c3c83a02c66c8028eb722940b53c0f6d5a989f69590b202d4c93d47650e1e328240dc46", [ "stateDiff" ] ],
+    "id" : 28
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386476309"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d0798535d0"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 28
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_3_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_3_trace.json
new file mode 100644
index 00000000000..2f40557e8fd
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_3_trace.json
@@ -0,0 +1,77 @@
+{
+  "comment" : "call the prior contract then callcode log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8908081ef83fffff28080b84260006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45af2600060006000600060007300a00000000000000000000000000000000000005af21ca025631cda5dbd0c7232559a52b68cc0d36407d58dd8a68b1cf75c0e000a2c3c83a02c66c8028eb722940b53c0f6d5a989f69590b202d4c93d47650e1e328240dc46", [ "trace" ] ],
+    "id" : 81
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff2e26",
+          "init" : "0x60006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45af2600060006000600060007300a00000000000000000000000000000000000005af2",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "code" : "0x",
+          "gasUsed" : "0x1c39"
+        },
+        "subtraces" : 2,
+        "traceAddress" : [ ],
+        "type" : "create"
+      }, {
+        "action" : {
+          "callType" : "callcode",
+          "from" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "gas" : "0xfb2ea9",
+          "input" : "0x",
+          "to" : "0x2c2b9c9a4a25e24b174f26114e8926a9f2128fe4",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x138e",
+          "output" : "0x"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "balance" : "0x0",
+          "refundAddress" : "0x0000000000000000000000000000000000000000"
+        },
+        "result" : null,
+        "subtraces" : 0,
+        "traceAddress" : [ 0, 0 ],
+        "type" : "suicide"
+      }, {
+        "action" : {
+          "callType" : "callcode",
+          "from" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "gas" : "0xfb18a5",
+          "input" : "0x",
+          "to" : "0x00a0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x30b",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 1 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 81
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_3_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_3_vmTrace.json
new file mode 100644
index 00000000000..f40a427bb83
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_3_vmTrace.json
@@ -0,0 +1,292 @@
+{
+  "comment" : "call the prior contract then callcode log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8908081ef83fffff28080b84260006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45af2600060006000600060007300a00000000000000000000000000000000000005af21ca025631cda5dbd0c7232559a52b68cc0d36407d58dd8a68b1cf75c0e000a2c3c83a02c66c8028eb722940b53c0f6d5a989f69590b202d4c93d47650e1e328240dc46", [ "vmTrace" ] ],
+    "id" : 134
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60006000600060006000732c2b9c9a4a25e24b174f26114e8926a9f2128fe45af2600060006000600060007300a00000000000000000000000000000000000005af2",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723491
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723488
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723485
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723482
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723479
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2c2b9c9a4a25e24b174f26114e8926a9f2128fe4" ],
+            "store" : null,
+            "used" : 16723476
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff2e12" ],
+            "store" : null,
+            "used" : 16723474
+          },
+          "pc" : 31,
+          "sub" : null
+        }, {
+          "cost" : 16462181,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16717768
+          },
+          "pc" : 32,
+          "sub" : {
+            "code" : "0x600035ff",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16461478
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16461475
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 5000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16456475
+              },
+              "pc" : 3,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717765
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717762
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717759
+          },
+          "pc" : 37,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717756
+          },
+          "pc" : 39,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717753
+          },
+          "pc" : 41,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16717750
+          },
+          "pc" : 43,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff17b4" ],
+            "store" : null,
+            "used" : 16717748
+          },
+          "pc" : 64,
+          "sub" : null
+        }, {
+          "cost" : 16456545,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16716269
+          },
+          "pc" : 65,
+          "sub" : {
+            "code" : "0x608b60045360ff60016004a1",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x8b" ],
+                "store" : null,
+                "used" : 16455842
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16455839
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 6,
+              "ex" : {
+                "mem" : {
+                  "data" : "0x8b",
+                  "off" : 4
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16455833
+              },
+              "pc" : 4,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xff" ],
+                "store" : null,
+                "used" : 16455830
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16455827
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16455824
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 758,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16455066
+              },
+              "pc" : 11,
+              "sub" : null
+            } ]
+          }
+        } ]
+      }
+    },
+    "id" : 134
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_4_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_4_stateDiff.json
new file mode 100644
index 00000000000..10920a29f90
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_4_stateDiff.json
@@ -0,0 +1,60 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "stateDiff" ] ],
+    "id" : 29
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f1838685c9c2"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241" : {
+          "balance" : {
+            "+" : "0x0"
+          },
+          "code" : {
+            "+" : "0x600035ff"
+          },
+          "nonce" : {
+            "+" : "0x1"
+          },
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d07946cf17"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 29
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_4_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_4_trace.json
new file mode 100644
index 00000000000..6e3c6ee2b04
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_4_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "trace" ] ],
+    "id" : 82
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff300e",
+          "init" : "0x6004600c60003960046000f3600035ff",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "code" : "0x600035ff",
+          "gasUsed" : "0x338"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 82
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_4_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_4_vmTrace.json
new file mode 100644
index 00000000000..a99f7ebb4dc
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_4_vmTrace.json
@@ -0,0 +1,96 @@
+{
+  "comment" : "Deploy contract that will self-destruct when called.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf85d8081ef83fffff28080906004600c60003960046000f3600035ff1ca0337ff9f36e027a93140cbcdf5376a7e8e2eac53ce55ba510b0f776462c8e1d4ba07aa95fbbe72e9e18d6a995ad1e36bb5dd054237efa20bfd468114945bae9b950", [ "vmTrace" ] ],
+    "id" : 135
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x600035ff",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6004600c60003960046000f3600035ff",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723979
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc" ],
+            "store" : null,
+            "used" : 16723976
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723973
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 9,
+          "ex" : {
+            "mem" : {
+              "data" : "0x600035ff",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723964
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16723961
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723958
+          },
+          "pc" : 11,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 135
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_5_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_5_stateDiff.json
new file mode 100644
index 00000000000..139cdbeb6af
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_5_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "call the prior contract then delegatecall log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf88c8081ef83fffff28080b83e600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65af460006000600060007300a00000000000000000000000000000000000005af41ba078d4cb280f228684a50ec9e98a467f4bb45064549feebbbe278944b5550892d5a011eb2ed6aad0ce9bf03a35dcd80264611c8415b7dfc2a0eadf0e74d15d2fefd9", [ "stateDiff" ] ],
+    "id" : 30
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386473817"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d0798560c2"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 30
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_5_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_5_trace.json
new file mode 100644
index 00000000000..9529b1a381c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_5_trace.json
@@ -0,0 +1,77 @@
+{
+  "comment" : "call the prior contract then delegatecall log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf88c8081ef83fffff28080b83e600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65af460006000600060007300a00000000000000000000000000000000000005af41ba078d4cb280f228684a50ec9e98a467f4bb45064549feebbbe278944b5550892d5a011eb2ed6aad0ce9bf03a35dcd80264611c8415b7dfc2a0eadf0e74d15d2fefd9", [ "trace" ] ],
+    "id" : 83
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff2e4e",
+          "init" : "0x600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65af460006000600060007300a00000000000000000000000000000000000005af4",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "code" : "0x",
+          "gasUsed" : "0x1c33"
+        },
+        "subtraces" : 2,
+        "traceAddress" : [ ],
+        "type" : "create"
+      }, {
+        "action" : {
+          "callType" : "delegatecall",
+          "from" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "gas" : "0xfb2ed3",
+          "input" : "0x",
+          "to" : "0xfb88de099e13c3ed21f80a7a1e49f8caecf10df6",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x138e",
+          "output" : "0x"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "balance" : "0x0",
+          "refundAddress" : "0x0000000000000000000000000000000000000000"
+        },
+        "result" : null,
+        "subtraces" : 0,
+        "traceAddress" : [ 0, 0 ],
+        "type" : "suicide"
+      }, {
+        "action" : {
+          "callType" : "delegatecall",
+          "from" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "gas" : "0xfb18d2",
+          "input" : "0x",
+          "to" : "0x00a0000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x30b",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 1 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 83
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_5_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_5_vmTrace.json
new file mode 100644
index 00000000000..4adc58507dc
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_13_5_vmTrace.json
@@ -0,0 +1,272 @@
+{
+  "comment" : "call the prior contract then delegatecall log contract 00a0..00.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf88c8081ef83fffff28080b83e600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65af460006000600060007300a00000000000000000000000000000000000005af41ba078d4cb280f228684a50ec9e98a467f4bb45064549feebbbe278944b5550892d5a011eb2ed6aad0ce9bf03a35dcd80264611c8415b7dfc2a0eadf0e74d15d2fefd9", [ "vmTrace" ] ],
+    "id" : 136
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x600060006000600073fb88de099e13c3ed21f80a7a1e49f8caecf10df65af460006000600060007300a00000000000000000000000000000000000005af4",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723531
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723528
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723525
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16723522
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xfb88de099e13c3ed21f80a7a1e49f8caecf10df6" ],
+            "store" : null,
+            "used" : 16723519
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff2e3d" ],
+            "store" : null,
+            "used" : 16723517
+          },
+          "pc" : 29,
+          "sub" : null
+        }, {
+          "cost" : 16462223,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16717811
+          },
+          "pc" : 30,
+          "sub" : {
+            "code" : "0x600035ff",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16461520
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16461517
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 5000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16456517
+              },
+              "pc" : 3,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717808
+          },
+          "pc" : 31,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717805
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717802
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16717799
+          },
+          "pc" : 37,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16717796
+          },
+          "pc" : 39,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff17e2" ],
+            "store" : null,
+            "used" : 16717794
+          },
+          "pc" : 60,
+          "sub" : null
+        }, {
+          "cost" : 16456590,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16716315
+          },
+          "pc" : 61,
+          "sub" : {
+            "code" : "0x608b60045360ff60016004a1",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x8b" ],
+                "store" : null,
+                "used" : 16455887
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16455884
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 6,
+              "ex" : {
+                "mem" : {
+                  "data" : "0x8b",
+                  "off" : 4
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16455878
+              },
+              "pc" : 4,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xff" ],
+                "store" : null,
+                "used" : 16455875
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16455872
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16455869
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 758,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16455111
+              },
+              "pc" : 11,
+              "sub" : null
+            } ]
+          }
+        } ]
+      }
+    },
+    "id" : 136
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_0_stateDiff.json
new file mode 100644
index 00000000000..fed78af193d
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_0_stateDiff.json
@@ -0,0 +1,85 @@
+{
+  "comment" : "CREATE",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294013000000000000000000000000000000000000080801ca0520dc757d985e2dc024c64213cb34bae49d9ea9651542403f12792d12849e7bda05e302b1d126293a98420c5c731278ab3f4133708930eceea320f7f77f6e52fa8", [ "stateDiff" ] ],
+    "id" : 31
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183872aa988"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0130000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1",
+              "to" : "0x2"
+            }
+          },
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000000" : {
+              "*" : {
+                "from" : "0x000000000000000000000000aac0627078c038eb3d06e04b57d020fe212be97d",
+                "to" : "0x0000000000000000000000002e615edd62acdfeb8ce3270b30fb36f0dbb8779d"
+              }
+            }
+          }
+        },
+        "0x2e615edd62acdfeb8ce3270b30fb36f0dbb8779d" : {
+          "balance" : {
+            "+" : "0x0"
+          },
+          "code" : {
+            "+" : "0xffff"
+          },
+          "nonce" : {
+            "+" : "0x1"
+          },
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "+" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "+" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+            }
+          }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd26917031"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 31
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_0_trace.json
new file mode 100644
index 00000000000..cc74ea36184
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_0_trace.json
@@ -0,0 +1,51 @@
+{
+  "comment" : "CREATE",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294013000000000000000000000000000000000000080801ca0520dc757d985e2dc024c64213cb34bae49d9ea9651542403f12792d12849e7bda05e302b1d126293a98420c5c731278ab3f4133708930eceea320f7f77f6e52fa8", [ "trace" ] ],
+    "id" : 84
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0130000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x131ae",
+          "output" : "0x"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "from" : "0x0130000000000000000000000000000000000000",
+          "gas" : "0xfb3412",
+          "init" : "0x600160015560015460025561ffff6000526002601ef3",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x2e615edd62acdfeb8ce3270b30fb36f0dbb8779d",
+          "code" : "0xffff",
+          "gasUsed" : "0xa10e"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 84
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_0_vmTrace.json
new file mode 100644
index 00000000000..e45186a55f4
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_0_vmTrace.json
@@ -0,0 +1,271 @@
+{
+  "comment" : "CREATE",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294013000000000000000000000000000000000000080801ca0520dc757d985e2dc024c64213cb34bae49d9ea9651542403f12792d12849e7bda05e302b1d126293a98420c5c731278ab3f4133708930eceea320f7f77f6e52fa8", [ "vmTrace" ] ],
+    "id" : 137
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x75600160015560015460025561ffff6000526002601ef36000526016600a6000f060005500",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x600160015560015460025561ffff6000526002601ef3" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 23,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x00000000000000000000600160015560015460025561ffff6000526002601ef3",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 25,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x16" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 26,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa" ],
+            "store" : null,
+            "used" : 16756184
+          },
+          "pc" : 28,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756181
+          },
+          "pc" : 30,
+          "sub" : null
+        }, {
+          "cost" : 16494866,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2e615edd62acdfeb8ce3270b30fb36f0dbb8779d" ],
+            "store" : null,
+            "used" : 16682951
+          },
+          "pc" : 32,
+          "sub" : {
+            "code" : "0x600160015560015460025561ffff6000526002601ef3",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16462863
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16462860
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x1"
+                },
+                "used" : 16442860
+              },
+              "pc" : 4,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16442857
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 800,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16442057
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16442054
+              },
+              "pc" : 8,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x2",
+                  "val" : "0x1"
+                },
+                "used" : 16422054
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xffff" ],
+                "store" : null,
+                "used" : 16422051
+              },
+              "pc" : 11,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16422048
+              },
+              "pc" : 14,
+              "sub" : null
+            }, {
+              "cost" : 6,
+              "ex" : {
+                "mem" : {
+                  "data" : "0x000000000000000000000000000000000000000000000000000000000000ffff",
+                  "off" : 0
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16422042
+              },
+              "pc" : 16,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16422039
+              },
+              "pc" : 17,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1e" ],
+                "store" : null,
+                "used" : 16422036
+              },
+              "pc" : 19,
+              "sub" : null
+            }, {
+              "cost" : 0,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16422036
+              },
+              "pc" : 21,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16682948
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x0",
+              "val" : "0x2e615edd62acdfeb8ce3270b30fb36f0dbb8779d"
+            },
+            "used" : 16677948
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16677948
+          },
+          "pc" : 36,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 137
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_1_stateDiff.json
new file mode 100644
index 00000000000..99a8b086c81
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_1_stateDiff.json
@@ -0,0 +1,66 @@
+{
+  "comment" : "CREATE2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294014000000000000000000000000000000000000080801ba02806a0625bd207bb1d798f9665a498208e579e81f5252d6b84d67fa54e7f3ee7a052655604404f68ee4c1a4b2775d346d529af467c747ae0f8de5bc4de3dadac65", [ "stateDiff" ] ],
+    "id" : 32
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18470e3365c"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0140000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1",
+              "to" : "0x2"
+            }
+          },
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000000" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000deea5bd06fb86553643c1e94a2f5aac632b9ec9",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000000"
+              }
+            }
+          }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffc3cd8e35d"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 32
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_1_trace.json
new file mode 100644
index 00000000000..5dbd9ac84f0
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_1_trace.json
@@ -0,0 +1,47 @@
+{
+  "comment" : "CREATE2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294014000000000000000000000000000000000000080801ba02806a0625bd207bb1d798f9665a498208e579e81f5252d6b84d67fa54e7f3ee7a052655604404f68ee4c1a4b2775d346d529af467c747ae0f8de5bc4de3dadac65", [ "trace" ] ],
+    "id" : 85
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0140000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0xfbc4b2",
+          "output" : "0x"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "from" : "0x0140000000000000000000000000000000000000",
+          "gas" : "0xfb3409",
+          "init" : "0x600160015560015460025560ff60005360016000f3",
+          "value" : "0x0"
+        },
+        "error" : "Out of gas",
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 85
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_1_vmTrace.json
new file mode 100644
index 00000000000..8ce08365abc
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_14_1_vmTrace.json
@@ -0,0 +1,142 @@
+{
+  "comment" : "CREATE2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294014000000000000000000000000000000000000080801ba02806a0625bd207bb1d798f9665a498208e579e81f5252d6b84d67fa54e7f3ee7a052655604404f68ee4c1a4b2775d346d529af467c747ae0f8de5bc4de3dadac65", [ "vmTrace" ] ],
+    "id" : 138
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x74600160015560015460025560ff60005360016000f360005260006015600b6000f560005500",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x600160015560015460025560ff60005360016000f3" ],
+            "store" : null,
+            "used" : 16756199
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756196
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000600160015560015460025560ff60005360016000f3",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16756190
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756187
+          },
+          "pc" : 25,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x15" ],
+            "store" : null,
+            "used" : 16756184
+          },
+          "pc" : 27,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb" ],
+            "store" : null,
+            "used" : 16756181
+          },
+          "pc" : 29,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16756178
+          },
+          "pc" : 31,
+          "sub" : null
+        }, {
+          "cost" : 16494863,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 261315
+          },
+          "pc" : 33,
+          "sub" : {
+            "code" : "0x600160015560015460025560ff60005360016000f3",
+            "ops" : [ ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 261312
+          },
+          "pc" : 34,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x0",
+              "val" : "0x0"
+            },
+            "used" : 256312
+          },
+          "pc" : 36,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 256312
+          },
+          "pc" : 37,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 138
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_0_stateDiff.json
new file mode 100644
index 00000000000..8cf2a5db619
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_0_stateDiff.json
@@ -0,0 +1,67 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,1),(2,2)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca00c14e70efe2cbc93d707aa5585018e7cab9e6e1d9ee2b52421e76fb235b72fe0a03d79b933403d282d2fbb1354eb024ac696f3a0a1f322523c836fba9c61ec050d", [ "stateDiff" ] ],
+    "id" : 33
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386a499b1"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0010000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+              }
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000002"
+              }
+            }
+          }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d07927ff28"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 33
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_0_trace.json
new file mode 100644
index 00000000000..9b101024511
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_0_trace.json
@@ -0,0 +1,52 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,1),(2,2)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca00c14e70efe2cbc93d707aa5585018e7cab9e6e1d9ee2b52421e76fb235b72fe0a03d79b933403d282d2fbb1354eb024ac696f3a0a1f322523c836fba9c61ec050d", [ "trace" ] ],
+    "id" : 86
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab2e",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9f59",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfba993",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9c58",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 86
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_0_vmTrace.json
new file mode 100644
index 00000000000..3558c136dbf
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_0_vmTrace.json
@@ -0,0 +1,318 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,1),(2,2)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ca00c14e70efe2cbc93d707aa5585018e7cab9e6e1d9ee2b52421e76fb235b72fe0a03d79b933403d282d2fbb1354eb024ac696f3a0a1f322523c836fba9c61ec050d", [ "vmTrace" ] ],
+    "id" : 139
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755499
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755496
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755493
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755491
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755488
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755485
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755482
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755479
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755452
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755449
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755447
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755444
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755441
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffaaef" ],
+            "store" : null,
+            "used" : 16755439
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16493647,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16714715
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492944
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492941
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492938
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492935
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x1"
+                },
+                "used" : 16472935
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16472932
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16472929
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16472926
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16472923
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x2",
+                  "val" : "0x2"
+                },
+                "used" : 16452923
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16714712
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16714709
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16714709
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 139
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_1_stateDiff.json
new file mode 100644
index 00000000000..74d28e18c68
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_1_stateDiff.json
@@ -0,0 +1,67 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(2,4)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ba05214eb40c07ac8c966fa4e9ea982da95fac9b4f8d7a19ab4554f3b6857213155a00933ef346d55b6eff54f58b4ec5a4f35e8cee52c5e7d5bb3c4cf9b81869d24b7", [ "stateDiff" ] ],
+    "id" : 34
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386a499b1"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0010000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000003"
+              }
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000004"
+              }
+            }
+          }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d07927ff28"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 34
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_1_trace.json
new file mode 100644
index 00000000000..39ac74b2d1f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_1_trace.json
@@ -0,0 +1,52 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(2,4)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ba05214eb40c07ac8c966fa4e9ea982da95fac9b4f8d7a19ab4554f3b6857213155a00933ef346d55b6eff54f58b4ec5a4f35e8cee52c5e7d5bb3c4cf9b81869d24b7", [ "trace" ] ],
+    "id" : 87
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab2e",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9f59",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfba993",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9c58",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 87
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_1_vmTrace.json
new file mode 100644
index 00000000000..4acab9c0721
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_1_vmTrace.json
@@ -0,0 +1,318 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(2,4)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ba05214eb40c07ac8c966fa4e9ea982da95fac9b4f8d7a19ab4554f3b6857213155a00933ef346d55b6eff54f58b4ec5a4f35e8cee52c5e7d5bb3c4cf9b81869d24b7", [ "vmTrace" ] ],
+    "id" : 140
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755499
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755496
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755493
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755491
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755488
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755485
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755482
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755479
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755452
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755449
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755447
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755444
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755441
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffaaef" ],
+            "store" : null,
+            "used" : 16755439
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16493647,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16714715
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492944
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x3" ],
+                "store" : null,
+                "used" : 16492941
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492938
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492935
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x3"
+                },
+                "used" : 16472935
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16472932
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16472929
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16472926
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16472923
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x2",
+                  "val" : "0x4"
+                },
+                "used" : 16452923
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16714712
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16714709
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16714709
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 140
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_2_stateDiff.json
new file mode 100644
index 00000000000..10e3494f0f6
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_2_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(1,0)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca0ae0dfb6a5936e47c231ffb6d5f2bd1c8af85dea061f50ba0c577a02a2b9e5ccaa03080f5b3c2aac67a2dd58663ef623e5ba81d33953c76eb728af915986f8a5813", [ "stateDiff" ] ],
+    "id" : 35
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f1838618847d"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d079b4145c"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 35
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_2_trace.json
new file mode 100644
index 00000000000..6e455c66e3b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_2_trace.json
@@ -0,0 +1,52 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(1,0)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca0ae0dfb6a5936e47c231ffb6d5f2bd1c8af85dea061f50ba0c577a02a2b9e5ccaa03080f5b3c2aac67a2dd58663ef623e5ba81d33953c76eb728af915986f8a5813", [ "trace" ] ],
+    "id" : 88
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab3a",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x5459",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfba99f",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x5158",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 88
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_2_vmTrace.json
new file mode 100644
index 00000000000..a0256709326
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_2_vmTrace.json
@@ -0,0 +1,318 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(1,0)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca0ae0dfb6a5936e47c231ffb6d5f2bd1c8af85dea061f50ba0c577a02a2b9e5ccaa03080f5b3c2aac67a2dd58663ef623e5ba81d33953c76eb728af915986f8a5813", [ "vmTrace" ] ],
+    "id" : 141
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755511
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755508
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755505
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755503
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755500
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755497
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755494
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755491
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755464
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755461
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755459
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755456
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755453
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffaafb" ],
+            "store" : null,
+            "used" : 16755451
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16493659,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16733927
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492956
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x3" ],
+                "store" : null,
+                "used" : 16492953
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492950
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492947
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x3"
+                },
+                "used" : 16472947
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16472944
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16472941
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16472938
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16472935
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 800,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x0"
+                },
+                "used" : 16472135
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16733924
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16733921
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16733921
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 141
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_3_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_3_stateDiff.json
new file mode 100644
index 00000000000..afa590fd29d
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_3_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Clear contract storage keys 1 and 2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ca0c748a345ce159827f5ab0139ddb910d58bb11791fb1afc2d113e0d4a748dcf4fa0482a8da9516acea2b34fa4f20968ee30c9f3cffdb3afa9744f5e3d8c0cb53596", [ "stateDiff" ] ],
+    "id" : 36
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386187949"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d079b41f90"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 36
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_3_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_3_trace.json
new file mode 100644
index 00000000000..4db5dec101c
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_3_trace.json
@@ -0,0 +1,52 @@
+{
+  "comment" : "Clear contract storage keys 1 and 2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ca0c748a345ce159827f5ab0139ddb910d58bb11791fb1afc2d113e0d4a748dcf4fa0482a8da9516acea2b34fa4f20968ee30c9f3cffdb3afa9744f5e3d8c0cb53596", [ "trace" ] ],
+    "id" : 89
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab46",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x959",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfba9aa",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x658",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 89
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_3_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_3_vmTrace.json
new file mode 100644
index 00000000000..411a3d2c8f6
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_15_3_vmTrace.json
@@ -0,0 +1,318 @@
+{
+  "comment" : "Clear contract storage keys 1 and 2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ca0c748a345ce159827f5ab0139ddb910d58bb11791fb1afc2d113e0d4a748dcf4fa0482a8da9516acea2b34fa4f20968ee30c9f3cffdb3afa9744f5e3d8c0cb53596", [ "vmTrace" ] ],
+    "id" : 142
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755523
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755520
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755517
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755515
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755512
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755509
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755506
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755503
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755476
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755473
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755471
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755468
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755465
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffab07" ],
+            "store" : null,
+            "used" : 16755463
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16493670,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16753139
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492967
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492964
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492961
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492958
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 800,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x0"
+                },
+                "used" : 16492158
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16492155
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492152
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16492149
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16492146
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 800,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x2",
+                  "val" : "0x0"
+                },
+                "used" : 16491346
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16753136
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16753133
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16753133
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 142
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_0_stateDiff.json
new file mode 100644
index 00000000000..86c5e1ca4c7
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_0_stateDiff.json
@@ -0,0 +1,67 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,1),(2,2)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba084903af53adee596c2b895610c41dca5da1ee4ed381f276de2698058e4e2209ca0717f119089f7f743f7a6586ce9dc7116103d4588a9d8ff2e81ac31f7ebbd4a29", [ "stateDiff" ] ],
+    "id" : 37
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386a497d3"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0060000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+              }
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000002"
+              }
+            }
+          }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d079280106"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 37
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_0_trace.json
new file mode 100644
index 00000000000..ca9e043c28e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_0_trace.json
@@ -0,0 +1,52 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,1),(2,2)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba084903af53adee596c2b895610c41dca5da1ee4ed381f276de2698058e4e2209ca0717f119089f7f743f7a6586ce9dc7116103d4588a9d8ff2e81ac31f7ebbd4a29", [ "trace" ] ],
+    "id" : 90
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab2e",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to" : "0x0060000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9f57",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "delegatecall",
+          "from" : "0x0060000000000000000000000000000000000000",
+          "gas" : "0xfba995",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9c58",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 90
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_0_vmTrace.json
new file mode 100644
index 00000000000..1231ce70ba8
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_0_vmTrace.json
@@ -0,0 +1,308 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,1),(2,2)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021ba084903af53adee596c2b895610c41dca5da1ee4ed381f276de2698058e4e2209ca0717f119089f7f743f7a6586ce9dc7116103d4588a9d8ff2e81ac31f7ebbd4a29", [ "vmTrace" ] ],
+    "id" : 143
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x602060006020360380602060003760006000355af460206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755499
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755496
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755493
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755491
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755488
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755485
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755482
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755479
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755452
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755449
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755446
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755443
+          },
+          "pc" : 18,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffaaf1" ],
+            "store" : null,
+            "used" : 16755441
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 16493649,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16714717
+          },
+          "pc" : 20,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492946
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492943
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492940
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492937
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x1"
+                },
+                "used" : 16472937
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16472934
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16472931
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16472928
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16472925
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x2",
+                  "val" : "0x2"
+                },
+                "used" : 16452925
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16714714
+          },
+          "pc" : 21,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16714711
+          },
+          "pc" : 23,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16714711
+          },
+          "pc" : 25,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 143
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_1_stateDiff.json
new file mode 100644
index 00000000000..cd392bb0059
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_1_stateDiff.json
@@ -0,0 +1,67 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(2,4)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ca00d29c006b870d19f20ee457aa54a3a121fd18274161c9c3908f71599558f19b7a056ed2dbffa79e65be4bd5f885857595d5fd40175e0be065d49de7027fe8d8a54", [ "stateDiff" ] ],
+    "id" : 38
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18386a497d3"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0060000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000003"
+              }
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "*" : {
+                "from" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "to" : "0x0000000000000000000000000000000000000000000000000000000000000004"
+              }
+            }
+          }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d079280106"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 38
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_1_trace.json
new file mode 100644
index 00000000000..eaead701577
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_1_trace.json
@@ -0,0 +1,52 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(2,4)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ca00d29c006b870d19f20ee457aa54a3a121fd18274161c9c3908f71599558f19b7a056ed2dbffa79e65be4bd5f885857595d5fd40175e0be065d49de7027fe8d8a54", [ "trace" ] ],
+    "id" : 91
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab2e",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+          "to" : "0x0060000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9f57",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "delegatecall",
+          "from" : "0x0060000000000000000000000000000000000000",
+          "gas" : "0xfba995",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x9c58",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 91
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_1_vmTrace.json
new file mode 100644
index 00000000000..8e0ba543fbc
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_1_vmTrace.json
@@ -0,0 +1,308 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(2,4)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000041ca00d29c006b870d19f20ee457aa54a3a121fd18274161c9c3908f71599558f19b7a056ed2dbffa79e65be4bd5f885857595d5fd40175e0be065d49de7027fe8d8a54", [ "vmTrace" ] ],
+    "id" : 144
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x602060006020360380602060003760006000355af460206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755499
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755496
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755493
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755491
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755488
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755485
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755482
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755479
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755452
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755449
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755446
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755443
+          },
+          "pc" : 18,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffaaf1" ],
+            "store" : null,
+            "used" : 16755441
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 16493649,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16714717
+          },
+          "pc" : 20,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492946
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x3" ],
+                "store" : null,
+                "used" : 16492943
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492940
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492937
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x3"
+                },
+                "used" : 16472937
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16472934
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x4" ],
+                "store" : null,
+                "used" : 16472931
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16472928
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16472925
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x2",
+                  "val" : "0x4"
+                },
+                "used" : 16452925
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16714714
+          },
+          "pc" : 21,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16714711
+          },
+          "pc" : 23,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16714711
+          },
+          "pc" : 25,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 144
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_2_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_2_stateDiff.json
new file mode 100644
index 00000000000..72bb63d4827
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_2_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(1,0)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ba03574aa082992029a0cce17baf01fab3ca78a9985b44b9ec1a48277ad18491283a01b70f4fb965d631dc9f9647400c091d639b055186e2d8882e07e6337b9a86bd9", [ "stateDiff" ] ],
+    "id" : 39
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f1838618829f"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d079b4163a"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 39
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_2_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_2_trace.json
new file mode 100644
index 00000000000..50c200c9228
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_2_trace.json
@@ -0,0 +1,52 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(1,0)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ba03574aa082992029a0cce17baf01fab3ca78a9985b44b9ec1a48277ad18491283a01b70f4fb965d631dc9f9647400c091d639b055186e2d8882e07e6337b9a86bd9", [ "trace" ] ],
+    "id" : 92
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab3a",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0060000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x5457",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "delegatecall",
+          "from" : "0x0060000000000000000000000000000000000000",
+          "gas" : "0xfba9a0",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x5158",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 92
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_2_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_2_vmTrace.json
new file mode 100644
index 00000000000..ca7161ad99e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_2_vmTrace.json
@@ -0,0 +1,308 @@
+{
+  "comment" : "Set contract storage (key,value)'s: (1,3),(1,0)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ba03574aa082992029a0cce17baf01fab3ca78a9985b44b9ec1a48277ad18491283a01b70f4fb965d631dc9f9647400c091d639b055186e2d8882e07e6337b9a86bd9", [ "vmTrace" ] ],
+    "id" : 145
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x602060006020360380602060003760006000355af460206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755511
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755508
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755505
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755503
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755500
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755497
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755494
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755491
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755464
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755461
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755458
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755455
+          },
+          "pc" : 18,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffaafd" ],
+            "store" : null,
+            "used" : 16755453
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 16493660,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16733929
+          },
+          "pc" : 20,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492957
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x3" ],
+                "store" : null,
+                "used" : 16492954
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492951
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492948
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x3"
+                },
+                "used" : 16472948
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16472945
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16472942
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16472939
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16472936
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 800,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x0"
+                },
+                "used" : 16472136
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16733926
+          },
+          "pc" : 21,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16733923
+          },
+          "pc" : 23,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16733923
+          },
+          "pc" : 25,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 145
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_3_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_3_stateDiff.json
new file mode 100644
index 00000000000..09783e51c58
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_3_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Clear contract storage keys 1 and 2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ca0c80b46c92075c830dd0da28397934a3d5a88b3834f10387508b5a53ba5b7ada1a0306b2d632afbf8af3344123fe72df3e7e4c3dca75a8bf9bf11963afedbdf75c4", [ "stateDiff" ] ],
+    "id" : 40
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f1838618776b"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d079b4216e"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 40
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_3_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_3_trace.json
new file mode 100644
index 00000000000..088a0d54b33
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_3_trace.json
@@ -0,0 +1,52 @@
+{
+  "comment" : "Clear contract storage keys 1 and 2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ca0c80b46c92075c830dd0da28397934a3d5a88b3834f10387508b5a53ba5b7ada1a0306b2d632afbf8af3344123fe72df3e7e4c3dca75a8bf9bf11963afedbdf75c4", [ "trace" ] ],
+    "id" : 93
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab46",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0060000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x957",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "delegatecall",
+          "from" : "0x0060000000000000000000000000000000000000",
+          "gas" : "0xfba9ac",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x658",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 93
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_3_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_3_vmTrace.json
new file mode 100644
index 00000000000..4096030e7d1
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_16_3_vmTrace.json
@@ -0,0 +1,308 @@
+{
+  "comment" : "Clear contract storage keys 1 and 2",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294006000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001ca0c80b46c92075c830dd0da28397934a3d5a88b3834f10387508b5a53ba5b7ada1a0306b2d632afbf8af3344123fe72df3e7e4c3dca75a8bf9bf11963afedbdf75c4", [ "vmTrace" ] ],
+    "id" : 146
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x602060006020360380602060003760006000355af460206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755523
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755520
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755517
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755515
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755512
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755509
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755506
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755503
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755476
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755473
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755470
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755467
+          },
+          "pc" : 18,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffab09" ],
+            "store" : null,
+            "used" : 16755465
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 16493672,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16753141
+          },
+          "pc" : 20,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492969
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492966
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492963
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492960
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 800,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x0"
+                },
+                "used" : 16492160
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16492157
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492154
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16492151
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x2" ],
+                "store" : null,
+                "used" : 16492148
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 800,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x2",
+                  "val" : "0x0"
+                },
+                "used" : 16491348
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16753138
+          },
+          "pc" : 21,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16753135
+          },
+          "pc" : 23,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16753135
+          },
+          "pc" : 25,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 146
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_17_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_17_0_stateDiff.json
new file mode 100644
index 00000000000..01a84c6a9ad
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_17_0_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Proxy call to another contract. Using STATICCALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8f5800183030d4094012000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ba00c83105e5af46d8b2f2aaa5c1b7437e8f182f6d146254e6ce1448e5544215701a037212e599b54c405191df381fcf6aca71fbfeafd052521cc61e24a9fd405728f", [ "stateDiff" ] ],
+    "id" : 41
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18385c10c8b"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d07a0b8c4e"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 41
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_17_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_17_0_trace.json
new file mode 100644
index 00000000000..112aa72ce0b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_17_0_trace.json
@@ -0,0 +1,52 @@
+{
+  "comment" : "Proxy call to another contract. Using STATICCALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8f5800183030d4094012000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ba00c83105e5af46d8b2f2aaa5c1b7437e8f182f6d146254e6ce1448e5544215701a037212e599b54c405191df381fcf6aca71fbfeafd052521cc61e24a9fd405728f", [ "trace" ] ],
+    "id" : 94
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0x2b654",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+          "to" : "0x0120000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x301",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000012"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "staticcall",
+          "from" : "0x0120000000000000000000000000000000000000",
+          "gas" : "0x2a88c",
+          "input" : "0x",
+          "to" : "0x0000000000000000000000000000000000000010",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x0",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 94
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_17_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_17_0_vmTrace.json
new file mode 100644
index 00000000000..5c0d0a9092b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_17_0_vmTrace.json
@@ -0,0 +1,209 @@
+{
+  "comment" : "Proxy call to another contract. Using STATICCALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8f5800183030d4094012000000000000000000000000000000000000080b8940000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ba00c83105e5af46d8b2f2aaa5c1b7437e8f182f6d146254e6ce1448e5544215701a037212e599b54c405191df381fcf6aca71fbfeafd052521cc61e24a9fd405728f", [ "vmTrace" ] ],
+    "id" : 147
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355afa60206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 177745
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 177742
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 177739
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x94" ],
+            "store" : null,
+            "used" : 177737
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x74" ],
+            "store" : null,
+            "used" : 177734
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x74", "0x74" ],
+            "store" : null,
+            "used" : 177731
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 177728
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 177725
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 177698
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 177695
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 177693
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 177690
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10" ],
+            "store" : null,
+            "used" : 177687
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2b615" ],
+            "store" : null,
+            "used" : 177685
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 174920,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 176985
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x",
+            "ops" : [ ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 176982
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 176979
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 176979
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 147
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_18_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_18_0_stateDiff.json
new file mode 100644
index 00000000000..e21dfd0d390
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_18_0_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Proxy call to another contract - several levels deep. Using CALL and STATICCALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901368081ef83fffff294004000000000000000000000000000000000000080b8d4000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ba05ce5005ae44f75f18a6f8fb4adc23dc5c3a8790625ee40c3bf0800a434f7d46da057dc1f834fbb3e40fe074e2e2917eb9c24d6623d01bc41f1e7797206c2d955c4", [ "stateDiff" ] ],
+    "id" : 42
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183861b6429"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27a0b590"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 42
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_18_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_18_0_trace.json
new file mode 100644
index 00000000000..ac624ad4b63
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_18_0_trace.json
@@ -0,0 +1,84 @@
+{
+  "comment" : "Proxy call to another contract - several levels deep. Using CALL and STATICCALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901368081ef83fffff294004000000000000000000000000000000000000080b8d4000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ba05ce5005ae44f75f18a6f8fb4adc23dc5c3a8790625ee40c3bf0800a434f7d46da057dc1f834fbb3e40fe074e2e2917eb9c24d6623d01bc41f1e7797206c2d955c4", [ "trace" ] ],
+    "id" : 95
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffa7e2",
+          "input" : "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x915",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000012"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfba648",
+          "input" : "0x00000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x608",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000012"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xf7b4ba",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+          "to" : "0x0120000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x301",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000012"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ 0, 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "staticcall",
+          "from" : "0x0120000000000000000000000000000000000000",
+          "gas" : "0xf3d2f9",
+          "input" : "0x",
+          "to" : "0x0000000000000000000000000000000000000010",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x0",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0, 0, 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 95
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_18_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_18_0_vmTrace.json
new file mode 100644
index 00000000000..ee85f4e1b4f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_18_0_vmTrace.json
@@ -0,0 +1,587 @@
+{
+  "comment" : "Proxy call to another contract - several levels deep. Using CALL and STATICCALL.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901368081ef83fffff294004000000000000000000000000000000000000080b8d4000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d1ba05ce5005ae44f75f18a6f8fb4adc23dc5c3a8790625ee40c3bf0800a434f7d46da057dc1f834fbb3e40fe074e2e2917eb9c24d6623d01bc41f1e7797206c2d955c4", [ "vmTrace" ] ],
+    "id" : 148
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16754655
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754652
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16754649
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xd4" ],
+            "store" : null,
+            "used" : 16754647
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb4" ],
+            "store" : null,
+            "used" : 16754644
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb4", "0xb4" ],
+            "store" : null,
+            "used" : 16754641
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16754638
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754635
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 39,
+          "ex" : {
+            "mem" : {
+              "data" : "0x00000000000000000000000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16754596
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754593
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754591
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754588
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16754585
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffa797" ],
+            "store" : null,
+            "used" : 16754583
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16492804,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16752339
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492101
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492098
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492095
+              },
+              "pc" : 4,
+              "sub" : null
+            }, {
+              "cost" : 2,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xb4" ],
+                "store" : null,
+                "used" : 16492093
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x94" ],
+                "store" : null,
+                "used" : 16492090
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x94", "0x94" ],
+                "store" : null,
+                "used" : 16492087
+              },
+              "pc" : 8,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492084
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492081
+              },
+              "pc" : 11,
+              "sub" : null
+            }, {
+              "cost" : 33,
+              "ex" : {
+                "mem" : {
+                  "data" : "0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+                  "off" : 0
+                },
+                "push" : [ ],
+                "store" : null,
+                "used" : 16492048
+              },
+              "pc" : 13,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492045
+              },
+              "pc" : 14,
+              "sub" : null
+            }, {
+              "cost" : 2,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492043
+              },
+              "pc" : 16,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492040
+              },
+              "pc" : 17,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x120000000000000000000000000000000000000" ],
+                "store" : null,
+                "used" : 16492037
+              },
+              "pc" : 19,
+              "sub" : null
+            }, {
+              "cost" : 2,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xfba603" ],
+                "store" : null,
+                "used" : 16492035
+              },
+              "pc" : 20,
+              "sub" : null
+            }, {
+              "cost" : 16234358,
+              "ex" : {
+                "mem" : {
+                  "data" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+                  "off" : 0
+                },
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16490566
+              },
+              "pc" : 21,
+              "sub" : {
+                "code" : "0x60206000602036038060206000376000346000355afa60206000f3",
+                "ops" : [ {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16233655
+                  },
+                  "pc" : 0,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16233652
+                  },
+                  "pc" : 2,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16233649
+                  },
+                  "pc" : 4,
+                  "sub" : null
+                }, {
+                  "cost" : 2,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x94" ],
+                    "store" : null,
+                    "used" : 16233647
+                  },
+                  "pc" : 6,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x74" ],
+                    "store" : null,
+                    "used" : 16233644
+                  },
+                  "pc" : 7,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x74", "0x74" ],
+                    "store" : null,
+                    "used" : 16233641
+                  },
+                  "pc" : 8,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16233638
+                  },
+                  "pc" : 9,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16233635
+                  },
+                  "pc" : 11,
+                  "sub" : null
+                }, {
+                  "cost" : 27,
+                  "ex" : {
+                    "mem" : {
+                      "data" : "0x000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+                      "off" : 0
+                    },
+                    "push" : [ ],
+                    "store" : null,
+                    "used" : 16233608
+                  },
+                  "pc" : 13,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16233605
+                  },
+                  "pc" : 14,
+                  "sub" : null
+                }, {
+                  "cost" : 2,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16233603
+                  },
+                  "pc" : 16,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16233600
+                  },
+                  "pc" : 17,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x10" ],
+                    "store" : null,
+                    "used" : 16233597
+                  },
+                  "pc" : 19,
+                  "sub" : null
+                }, {
+                  "cost" : 2,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0xf7b47b" ],
+                    "store" : null,
+                    "used" : 16233595
+                  },
+                  "pc" : 20,
+                  "sub" : null
+                }, {
+                  "cost" : 15979957,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x1" ],
+                    "store" : null,
+                    "used" : 16232895
+                  },
+                  "pc" : 21,
+                  "sub" : {
+                    "code" : "0x",
+                    "ops" : [ ]
+                  }
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x20" ],
+                    "store" : null,
+                    "used" : 16232892
+                  },
+                  "pc" : 22,
+                  "sub" : null
+                }, {
+                  "cost" : 3,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ "0x0" ],
+                    "store" : null,
+                    "used" : 16232889
+                  },
+                  "pc" : 24,
+                  "sub" : null
+                }, {
+                  "cost" : 0,
+                  "ex" : {
+                    "mem" : null,
+                    "push" : [ ],
+                    "store" : null,
+                    "used" : 16232889
+                  },
+                  "pc" : 26,
+                  "sub" : null
+                } ]
+              }
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16490563
+              },
+              "pc" : 22,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16490560
+              },
+              "pc" : 24,
+              "sub" : null
+            }, {
+              "cost" : 0,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : null,
+                "used" : 16490560
+              },
+              "pc" : 26,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16752336
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16752333
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16752333
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 148
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_0_stateDiff.json
new file mode 100644
index 00000000000..da15e0cb38f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_0_stateDiff.json
@@ -0,0 +1,79 @@
+{
+  "comment" : "Deploy ERC20 contract",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf918278081ef83fffff28080b917d8606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000001ca085af0f32688f0cfb7322bc82816f287ec5dae28b73e6edeb1bf4584e8fbc9ab4a03ba76883af2506574d6f60db96862670be4e095bbc56ff5a15f89a59525c0bc0", [ "stateDiff" ] ],
+    "id" : 43
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18398dce1d4"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241" : {
+          "balance" : {
+            "+" : "0x0"
+          },
+          "code" : {
+            "+" : "0x606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029"
+          },
+          "nonce" : {
+            "+" : "0x1"
+          },
+          "storage" : {
+            "0x0000000000000000000000000000000000000000000000000000000000000000" : {
+              "+" : "0x424e420000000000000000000000000000000000000000000000000000000006"
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000001" : {
+              "+" : "0x424e420000000000000000000000000000000000000000000000000000000006"
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000002" : {
+              "+" : "0x0000000000000000000000000000000000000000000000000000000000000012"
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000003" : {
+              "+" : "0x000000000000000000000000000000000000000000a56fa5b99019a5c8000000"
+            },
+            "0x0000000000000000000000000000000000000000000000000000000000000004" : {
+              "+" : "0x000000000000000000000000627306090abab3a6e1400e9345bc60c78a8bef57"
+            },
+            "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" : {
+              "+" : "0x000000000000000000000000000000000000000000a56fa5b99019a5c8000000"
+            }
+          }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d066efb705"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 43
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_0_trace.json
new file mode 100644
index 00000000000..092ee82de5f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_0_trace.json
@@ -0,0 +1,35 @@
+{
+  "comment" : "Deploy ERC20 contract",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf918278081ef83fffff28080b917d8606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000001ca085af0f32688f0cfb7322bc82816f287ec5dae28b73e6edeb1bf4584e8fbc9ab4a03ba76883af2506574d6f60db96862670be4e095bbc56ff5a15f89a59525c0bc0", [ "trace" ] ],
+    "id" : 96
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xfdc95a",
+          "init" : "0x606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e420000000000000000000000000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "code" : "0x606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029",
+          "gasUsed" : "0x124192"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 96
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_0_vmTrace.json
new file mode 100644
index 00000000000..6101667942a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_0_vmTrace.json
@@ -0,0 +1,3442 @@
+{
+  "comment" : "Deploy ERC20 contract",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf918278081ef83fffff28080b917d8606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000001ca085af0f32688f0cfb7322bc82816f287ec5dae28b73e6edeb1bf4584e8fbc9ab4a03ba76883af2506574d6f60db96862670be4e095bbc56ff5a15f89a59525c0bc0", [ "vmTrace" ] ],
+    "id" : 149
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x606060405234156200001057600080fd5b604051620016d8380380620016d8833981016040528080519060200190919080518201919060200180519060200190919080518201919050505b83600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550836003819055508260009080519060200190620000ad9291906200012e565b508060019080519060200190620000c69291906200012e565b5081600260006101000a81548160ff021916908360ff16021790555033600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b50505050620001dd565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106200017157805160ff1916838001178555620001a2565b82800160010185558215620001a2579182015b82811115620001a157825182559160200191906001019062000184565b5b509050620001b19190620001b5565b5090565b620001da91905b80821115620001d6576000816000905550600101620001bc565b5090565b90565b6114eb80620001ed6000396000f300606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e420000000000000000000000000000000000000000000000000000000000",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16632151
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16632148
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 12,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000060",
+              "off" : 64
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16632136
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16632134
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16632131
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10" ],
+            "store" : null,
+            "used" : 16632128
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16632118
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16632117
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16632114
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000060",
+              "off" : 64
+            },
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16632111
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x16d8" ],
+            "store" : null,
+            "used" : 16632108
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x17d8" ],
+            "store" : null,
+            "used" : 16632106
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16632103
+          },
+          "pc" : 25,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100", "0x100" ],
+            "store" : null,
+            "used" : 16632100
+          },
+          "pc" : 26,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x16d8" ],
+            "store" : null,
+            "used" : 16632097
+          },
+          "pc" : 27,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x100", "0x100", "0x16d8", "0x60" ],
+            "store" : null,
+            "used" : 16632094
+          },
+          "pc" : 31,
+          "sub" : null
+        }, {
+          "cost" : 51,
+          "ex" : {
+            "mem" : {
+              "data" : "0x000000000000000000000000000000000000000000a56fa5b99019a5c80000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000003424e4200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003424e420000000000000000000000000000000000000000000000000000000000",
+              "off" : 96
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16632043
+          },
+          "pc" : 32,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x100", "0x60" ],
+            "store" : null,
+            "used" : 16632040
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x160" ],
+            "store" : null,
+            "used" : 16632037
+          },
+          "pc" : 34,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16632034
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000160",
+              "off" : 64
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16632031
+          },
+          "pc" : 37,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x60" ],
+            "store" : null,
+            "used" : 16632028
+          },
+          "pc" : 38,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x60" ],
+            "store" : null,
+            "used" : 16632025
+          },
+          "pc" : 39,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x000000000000000000000000000000000000000000a56fa5b99019a5c8000000",
+              "off" : 96
+            },
+            "push" : [ "0xa56fa5b99019a5c8000000" ],
+            "store" : null,
+            "used" : 16632022
+          },
+          "pc" : 40,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0x60" ],
+            "store" : null,
+            "used" : 16632019
+          },
+          "pc" : 41,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16632016
+          },
+          "pc" : 42,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16632013
+          },
+          "pc" : 44,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0xa56fa5b99019a5c8000000" ],
+            "store" : null,
+            "used" : 16632010
+          },
+          "pc" : 45,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0x80", "0x60" ],
+            "store" : null,
+            "used" : 16632007
+          },
+          "pc" : 46,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x80" ],
+            "store" : null,
+            "used" : 16632004
+          },
+          "pc" : 47,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16632001
+          },
+          "pc" : 48,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000080",
+              "off" : 128
+            },
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16631998
+          },
+          "pc" : 49,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x80", "0x80", "0x60" ],
+            "store" : null,
+            "used" : 16631995
+          },
+          "pc" : 50,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xe0" ],
+            "store" : null,
+            "used" : 16631992
+          },
+          "pc" : 51,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xe0", "0x80", "0x60" ],
+            "store" : null,
+            "used" : 16631989
+          },
+          "pc" : 52,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x80" ],
+            "store" : null,
+            "used" : 16631986
+          },
+          "pc" : 53,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16631983
+          },
+          "pc" : 54,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16631980
+          },
+          "pc" : 56,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0", "0xa0" ],
+            "store" : null,
+            "used" : 16631977
+          },
+          "pc" : 57,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000012",
+              "off" : 160
+            },
+            "push" : [ "0x12" ],
+            "store" : null,
+            "used" : 16631974
+          },
+          "pc" : 58,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12", "0xa0" ],
+            "store" : null,
+            "used" : 16631971
+          },
+          "pc" : 59,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16631968
+          },
+          "pc" : 60,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc0" ],
+            "store" : null,
+            "used" : 16631965
+          },
+          "pc" : 62,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc0", "0x12" ],
+            "store" : null,
+            "used" : 16631962
+          },
+          "pc" : 63,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12", "0xc0", "0x60" ],
+            "store" : null,
+            "used" : 16631959
+          },
+          "pc" : 64,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0xc0" ],
+            "store" : null,
+            "used" : 16631956
+          },
+          "pc" : 65,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc0", "0xc0" ],
+            "store" : null,
+            "used" : 16631953
+          },
+          "pc" : 66,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x00000000000000000000000000000000000000000000000000000000000000c0",
+              "off" : 192
+            },
+            "push" : [ "0xc0" ],
+            "store" : null,
+            "used" : 16631950
+          },
+          "pc" : 67,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0xc0", "0xc0", "0x60" ],
+            "store" : null,
+            "used" : 16631947
+          },
+          "pc" : 68,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x120" ],
+            "store" : null,
+            "used" : 16631944
+          },
+          "pc" : 69,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x120", "0xc0", "0x60" ],
+            "store" : null,
+            "used" : 16631941
+          },
+          "pc" : 70,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0xc0" ],
+            "store" : null,
+            "used" : 16631938
+          },
+          "pc" : 71,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16631936
+          },
+          "pc" : 72,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16631934
+          },
+          "pc" : 73,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16631933
+          },
+          "pc" : 74,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0xe0", "0x12", "0x120", "0xa56fa5b99019a5c8000000" ],
+            "store" : null,
+            "used" : 16631930
+          },
+          "pc" : 75,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16631927
+          },
+          "pc" : 76,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16631924
+          },
+          "pc" : 78,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16631922
+          },
+          "pc" : 80,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16631919
+          },
+          "pc" : 81,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16631916
+          },
+          "pc" : 102,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16631913
+          },
+          "pc" : 103,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16631910
+          },
+          "pc" : 124,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x627306090abab3a6e1400e9345bc60c78a8bef57", "0x0" ],
+            "store" : null,
+            "used" : 16631907
+          },
+          "pc" : 125,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x000000000000000000000000627306090abab3a6e1400e9345bc60c78a8bef57",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16631904
+          },
+          "pc" : 126,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16631901
+          },
+          "pc" : 127,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16631898
+          },
+          "pc" : 129,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16631895
+          },
+          "pc" : 130,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16631892
+          },
+          "pc" : 131,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16631889
+          },
+          "pc" : 132,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16631886
+          },
+          "pc" : 133,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16631883
+          },
+          "pc" : 135,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16631880
+          },
+          "pc" : 136,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" ],
+            "store" : null,
+            "used" : 16631838
+          },
+          "pc" : 138,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d", "0xa56fa5b99019a5c8000000" ],
+            "store" : null,
+            "used" : 16631835
+          },
+          "pc" : 139,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" ],
+            "store" : null,
+            "used" : 16631832
+          },
+          "pc" : 140,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d",
+              "val" : "0xa56fa5b99019a5c8000000"
+            },
+            "used" : 16611832
+          },
+          "pc" : 141,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16611830
+          },
+          "pc" : 142,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0xe0", "0x12", "0x120", "0xa56fa5b99019a5c8000000" ],
+            "store" : null,
+            "used" : 16611827
+          },
+          "pc" : 143,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16611824
+          },
+          "pc" : 144,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0x3", "0xa56fa5b99019a5c8000000" ],
+            "store" : null,
+            "used" : 16611821
+          },
+          "pc" : 146,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56fa5b99019a5c8000000", "0x3" ],
+            "store" : null,
+            "used" : 16611818
+          },
+          "pc" : 147,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x3",
+              "val" : "0xa56fa5b99019a5c8000000"
+            },
+            "used" : 16591818
+          },
+          "pc" : 148,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16591816
+          },
+          "pc" : 149,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xe0", "0x12", "0x120", "0xe0" ],
+            "store" : null,
+            "used" : 16591813
+          },
+          "pc" : 150,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16591810
+          },
+          "pc" : 151,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0xe0" ],
+            "store" : null,
+            "used" : 16591807
+          },
+          "pc" : 153,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xe0", "0xe0" ],
+            "store" : null,
+            "used" : 16591804
+          },
+          "pc" : 154,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000003",
+              "off" : 224
+            },
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16591801
+          },
+          "pc" : 155,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0xe0" ],
+            "store" : null,
+            "used" : 16591798
+          },
+          "pc" : 156,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16591795
+          },
+          "pc" : 157,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16591792
+          },
+          "pc" : 159,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100", "0x3" ],
+            "store" : null,
+            "used" : 16591789
+          },
+          "pc" : 160,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xad" ],
+            "store" : null,
+            "used" : 16591786
+          },
+          "pc" : 161,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xad", "0x100", "0x3", "0x0" ],
+            "store" : null,
+            "used" : 16591783
+          },
+          "pc" : 165,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x3", "0x100" ],
+            "store" : null,
+            "used" : 16591780
+          },
+          "pc" : 166,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100", "0x3" ],
+            "store" : null,
+            "used" : 16591777
+          },
+          "pc" : 167,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12e" ],
+            "store" : null,
+            "used" : 16591774
+          },
+          "pc" : 168,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16591766
+          },
+          "pc" : 172,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16591765
+          },
+          "pc" : 302,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x100", "0x3", "0x0" ],
+            "store" : null,
+            "used" : 16591762
+          },
+          "pc" : 303,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x0" ],
+            "store" : null,
+            "used" : 16591759
+          },
+          "pc" : 304,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590959
+          },
+          "pc" : 305,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16590956
+          },
+          "pc" : 306,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x1", "0x0" ],
+            "store" : null,
+            "used" : 16590953
+          },
+          "pc" : 308,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16590950
+          },
+          "pc" : 309,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590947
+          },
+          "pc" : 311,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16590944
+          },
+          "pc" : 312,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16590941
+          },
+          "pc" : 313,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16590936
+          },
+          "pc" : 316,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16590933
+          },
+          "pc" : 317,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590930
+          },
+          "pc" : 318,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16590927
+          },
+          "pc" : 319,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2", "0x0" ],
+            "store" : null,
+            "used" : 16590924
+          },
+          "pc" : 321,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590919
+          },
+          "pc" : 322,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x0" ],
+            "store" : null,
+            "used" : 16590916
+          },
+          "pc" : 323,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590913
+          },
+          "pc" : 324,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16590910
+          },
+          "pc" : 326,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16590907
+          },
+          "pc" : 327,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590904
+          },
+          "pc" : 329,
+          "sub" : null
+        }, {
+          "cost" : 36,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16590868
+          },
+          "pc" : 331,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x0" ],
+            "store" : null,
+            "used" : 16590865
+          },
+          "pc" : 332,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f" ],
+            "store" : null,
+            "used" : 16590862
+          },
+          "pc" : 333,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f" ],
+            "store" : null,
+            "used" : 16590859
+          },
+          "pc" : 335,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16590856
+          },
+          "pc" : 336,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x1f" ],
+            "store" : null,
+            "used" : 16590853
+          },
+          "pc" : 338,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590848
+          },
+          "pc" : 339,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x0", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16590845
+          },
+          "pc" : 340,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16590842
+          },
+          "pc" : 341,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x3", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x100" ],
+            "store" : null,
+            "used" : 16590839
+          },
+          "pc" : 342,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x100", "0x3" ],
+            "store" : null,
+            "used" : 16590836
+          },
+          "pc" : 343,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f" ],
+            "store" : null,
+            "used" : 16590833
+          },
+          "pc" : 344,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16590830
+          },
+          "pc" : 346,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x171" ],
+            "store" : null,
+            "used" : 16590827
+          },
+          "pc" : 347,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16590817
+          },
+          "pc" : 351,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100", "0x100" ],
+            "store" : null,
+            "used" : 16590814
+          },
+          "pc" : 352,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x424e420000000000000000000000000000000000000000000000000000000000",
+              "off" : 256
+            },
+            "push" : [ "0x424e420000000000000000000000000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16590811
+          },
+          "pc" : 353,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16590808
+          },
+          "pc" : 354,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" ],
+            "store" : null,
+            "used" : 16590805
+          },
+          "pc" : 356,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x424e420000000000000000000000000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16590802
+          },
+          "pc" : 357,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x100", "0x424e420000000000000000000000000000000000000000000000000000000000", "0x3" ],
+            "store" : null,
+            "used" : 16590799
+          },
+          "pc" : 358,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0x3" ],
+            "store" : null,
+            "used" : 16590796
+          },
+          "pc" : 359,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6" ],
+            "store" : null,
+            "used" : 16590793
+          },
+          "pc" : 360,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x424e420000000000000000000000000000000000000000000000000000000006" ],
+            "store" : null,
+            "used" : 16590790
+          },
+          "pc" : 361,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x3", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x100", "0x424e420000000000000000000000000000000000000000000000000000000006", "0x0" ],
+            "store" : null,
+            "used" : 16590787
+          },
+          "pc" : 362,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x0",
+              "val" : "0x424e420000000000000000000000000000000000000000000000000000000006"
+            },
+            "used" : 16570787
+          },
+          "pc" : 363,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1a2" ],
+            "store" : null,
+            "used" : 16570784
+          },
+          "pc" : 364,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570776
+          },
+          "pc" : 368,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570775
+          },
+          "pc" : 418,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570773
+          },
+          "pc" : 419,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x3" ],
+            "store" : null,
+            "used" : 16570770
+          },
+          "pc" : 420,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570768
+          },
+          "pc" : 421,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1b1" ],
+            "store" : null,
+            "used" : 16570765
+          },
+          "pc" : 422,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1b1", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16570762
+          },
+          "pc" : 426,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16570759
+          },
+          "pc" : 427,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1b5" ],
+            "store" : null,
+            "used" : 16570756
+          },
+          "pc" : 428,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570748
+          },
+          "pc" : 432,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570747
+          },
+          "pc" : 437,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1da" ],
+            "store" : null,
+            "used" : 16570744
+          },
+          "pc" : 438,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1da", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16570741
+          },
+          "pc" : 442,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16570738
+          },
+          "pc" : 443,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570737
+          },
+          "pc" : 444,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16570734
+          },
+          "pc" : 445,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" ],
+            "store" : null,
+            "used" : 16570731
+          },
+          "pc" : 446,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16570728
+          },
+          "pc" : 447,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16570725
+          },
+          "pc" : 448,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1d6" ],
+            "store" : null,
+            "used" : 16570722
+          },
+          "pc" : 449,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570712
+          },
+          "pc" : 453,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570711
+          },
+          "pc" : 470,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570709
+          },
+          "pc" : 471,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x1da" ],
+            "store" : null,
+            "used" : 16570706
+          },
+          "pc" : 472,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570698
+          },
+          "pc" : 473,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570697
+          },
+          "pc" : 474,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563", "0x1b1" ],
+            "store" : null,
+            "used" : 16570694
+          },
+          "pc" : 475,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570686
+          },
+          "pc" : 476,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570685
+          },
+          "pc" : 433,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570683
+          },
+          "pc" : 434,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0xad" ],
+            "store" : null,
+            "used" : 16570680
+          },
+          "pc" : 435,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570672
+          },
+          "pc" : 436,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570671
+          },
+          "pc" : 173,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570669
+          },
+          "pc" : 174,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x120", "0x120" ],
+            "store" : null,
+            "used" : 16570666
+          },
+          "pc" : 175,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16570663
+          },
+          "pc" : 176,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x120" ],
+            "store" : null,
+            "used" : 16570660
+          },
+          "pc" : 178,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x120", "0x120" ],
+            "store" : null,
+            "used" : 16570657
+          },
+          "pc" : 179,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000003",
+              "off" : 288
+            },
+            "push" : [ "0x3" ],
+            "store" : null,
+            "used" : 16570654
+          },
+          "pc" : 180,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0x120" ],
+            "store" : null,
+            "used" : 16570651
+          },
+          "pc" : 181,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16570648
+          },
+          "pc" : 182,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x140" ],
+            "store" : null,
+            "used" : 16570645
+          },
+          "pc" : 184,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x140", "0x3" ],
+            "store" : null,
+            "used" : 16570642
+          },
+          "pc" : 185,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc6" ],
+            "store" : null,
+            "used" : 16570639
+          },
+          "pc" : 186,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xc6", "0x140", "0x3", "0x1" ],
+            "store" : null,
+            "used" : 16570636
+          },
+          "pc" : 190,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x3", "0x140" ],
+            "store" : null,
+            "used" : 16570633
+          },
+          "pc" : 191,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x140", "0x3" ],
+            "store" : null,
+            "used" : 16570630
+          },
+          "pc" : 192,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12e" ],
+            "store" : null,
+            "used" : 16570627
+          },
+          "pc" : 193,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570619
+          },
+          "pc" : 197,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16570618
+          },
+          "pc" : 302,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x140", "0x3", "0x1" ],
+            "store" : null,
+            "used" : 16570615
+          },
+          "pc" : 303,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x1" ],
+            "store" : null,
+            "used" : 16570612
+          },
+          "pc" : 304,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569812
+          },
+          "pc" : 305,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16569809
+          },
+          "pc" : 306,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x1", "0x0" ],
+            "store" : null,
+            "used" : 16569806
+          },
+          "pc" : 308,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16569803
+          },
+          "pc" : 309,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569800
+          },
+          "pc" : 311,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16569797
+          },
+          "pc" : 312,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16569794
+          },
+          "pc" : 313,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16569789
+          },
+          "pc" : 316,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16569786
+          },
+          "pc" : 317,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569783
+          },
+          "pc" : 318,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16569780
+          },
+          "pc" : 319,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2", "0x0" ],
+            "store" : null,
+            "used" : 16569777
+          },
+          "pc" : 321,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569772
+          },
+          "pc" : 322,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x1" ],
+            "store" : null,
+            "used" : 16569769
+          },
+          "pc" : 323,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569766
+          },
+          "pc" : 324,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16569763
+          },
+          "pc" : 326,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16569760
+          },
+          "pc" : 327,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569757
+          },
+          "pc" : 329,
+          "sub" : null
+        }, {
+          "cost" : 36,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16569721
+          },
+          "pc" : 331,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x0" ],
+            "store" : null,
+            "used" : 16569718
+          },
+          "pc" : 332,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f" ],
+            "store" : null,
+            "used" : 16569715
+          },
+          "pc" : 333,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f" ],
+            "store" : null,
+            "used" : 16569712
+          },
+          "pc" : 335,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16569709
+          },
+          "pc" : 336,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x1f" ],
+            "store" : null,
+            "used" : 16569706
+          },
+          "pc" : 338,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569701
+          },
+          "pc" : 339,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x0", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16569698
+          },
+          "pc" : 340,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16569695
+          },
+          "pc" : 341,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x3", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x140" ],
+            "store" : null,
+            "used" : 16569692
+          },
+          "pc" : 342,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x140", "0x3" ],
+            "store" : null,
+            "used" : 16569689
+          },
+          "pc" : 343,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f" ],
+            "store" : null,
+            "used" : 16569686
+          },
+          "pc" : 344,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16569683
+          },
+          "pc" : 346,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x171" ],
+            "store" : null,
+            "used" : 16569680
+          },
+          "pc" : 347,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16569670
+          },
+          "pc" : 351,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x140", "0x140" ],
+            "store" : null,
+            "used" : 16569667
+          },
+          "pc" : 352,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x424e420000000000000000000000000000000000000000000000000000000000",
+              "off" : 320
+            },
+            "push" : [ "0x424e420000000000000000000000000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16569664
+          },
+          "pc" : 353,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16569661
+          },
+          "pc" : 354,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" ],
+            "store" : null,
+            "used" : 16569658
+          },
+          "pc" : 356,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x424e420000000000000000000000000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16569655
+          },
+          "pc" : 357,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x140", "0x424e420000000000000000000000000000000000000000000000000000000000", "0x3" ],
+            "store" : null,
+            "used" : 16569652
+          },
+          "pc" : 358,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3", "0x3" ],
+            "store" : null,
+            "used" : 16569649
+          },
+          "pc" : 359,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6" ],
+            "store" : null,
+            "used" : 16569646
+          },
+          "pc" : 360,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x424e420000000000000000000000000000000000000000000000000000000006" ],
+            "store" : null,
+            "used" : 16569643
+          },
+          "pc" : 361,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x3", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x140", "0x424e420000000000000000000000000000000000000000000000000000000006", "0x1" ],
+            "store" : null,
+            "used" : 16569640
+          },
+          "pc" : 362,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x1",
+              "val" : "0x424e420000000000000000000000000000000000000000000000000000000006"
+            },
+            "used" : 16549640
+          },
+          "pc" : 363,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1a2" ],
+            "store" : null,
+            "used" : 16549637
+          },
+          "pc" : 364,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549629
+          },
+          "pc" : 368,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549628
+          },
+          "pc" : 418,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549626
+          },
+          "pc" : 419,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x3" ],
+            "store" : null,
+            "used" : 16549623
+          },
+          "pc" : 420,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549621
+          },
+          "pc" : 421,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1b1" ],
+            "store" : null,
+            "used" : 16549618
+          },
+          "pc" : 422,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1b1", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16549615
+          },
+          "pc" : 426,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16549612
+          },
+          "pc" : 427,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1b5" ],
+            "store" : null,
+            "used" : 16549609
+          },
+          "pc" : 428,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549601
+          },
+          "pc" : 432,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549600
+          },
+          "pc" : 437,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1da" ],
+            "store" : null,
+            "used" : 16549597
+          },
+          "pc" : 438,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1da", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16549594
+          },
+          "pc" : 442,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16549591
+          },
+          "pc" : 443,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549590
+          },
+          "pc" : 444,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16549587
+          },
+          "pc" : 445,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" ],
+            "store" : null,
+            "used" : 16549584
+          },
+          "pc" : 446,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16549581
+          },
+          "pc" : 447,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16549578
+          },
+          "pc" : 448,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1d6" ],
+            "store" : null,
+            "used" : 16549575
+          },
+          "pc" : 449,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549565
+          },
+          "pc" : 453,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549564
+          },
+          "pc" : 470,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549562
+          },
+          "pc" : 471,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x1da" ],
+            "store" : null,
+            "used" : 16549559
+          },
+          "pc" : 472,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549551
+          },
+          "pc" : 473,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549550
+          },
+          "pc" : 474,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6", "0x1b1" ],
+            "store" : null,
+            "used" : 16549547
+          },
+          "pc" : 475,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549539
+          },
+          "pc" : 476,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549538
+          },
+          "pc" : 433,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549536
+          },
+          "pc" : 434,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0xc6" ],
+            "store" : null,
+            "used" : 16549533
+          },
+          "pc" : 435,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549525
+          },
+          "pc" : 436,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549524
+          },
+          "pc" : 198,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16549522
+          },
+          "pc" : 199,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12", "0x120", "0x12" ],
+            "store" : null,
+            "used" : 16549519
+          },
+          "pc" : 200,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2" ],
+            "store" : null,
+            "used" : 16549516
+          },
+          "pc" : 201,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16549513
+          },
+          "pc" : 203,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16549510
+          },
+          "pc" : 205,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16549500
+          },
+          "pc" : 208,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2", "0x1", "0x2" ],
+            "store" : null,
+            "used" : 16549497
+          },
+          "pc" : 209,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16548697
+          },
+          "pc" : 210,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x0", "0x1" ],
+            "store" : null,
+            "used" : 16548694
+          },
+          "pc" : 211,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16548691
+          },
+          "pc" : 212,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16548686
+          },
+          "pc" : 214,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" ],
+            "store" : null,
+            "used" : 16548683
+          },
+          "pc" : 215,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16548680
+          },
+          "pc" : 216,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x1" ],
+            "store" : null,
+            "used" : 16548677
+          },
+          "pc" : 217,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12", "0x2", "0x0", "0x1", "0x12" ],
+            "store" : null,
+            "used" : 16548674
+          },
+          "pc" : 218,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff" ],
+            "store" : null,
+            "used" : 16548671
+          },
+          "pc" : 219,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12" ],
+            "store" : null,
+            "used" : 16548668
+          },
+          "pc" : 221,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12" ],
+            "store" : null,
+            "used" : 16548663
+          },
+          "pc" : 222,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12" ],
+            "store" : null,
+            "used" : 16548660
+          },
+          "pc" : 223,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x12", "0x2" ],
+            "store" : null,
+            "used" : 16548657
+          },
+          "pc" : 224,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x2",
+              "val" : "0x12"
+            },
+            "used" : 16528657
+          },
+          "pc" : 225,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16528655
+          },
+          "pc" : 226,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16528653
+          },
+          "pc" : 227,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16528650
+          },
+          "pc" : 228,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16528647
+          },
+          "pc" : 230,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100" ],
+            "store" : null,
+            "used" : 16528644
+          },
+          "pc" : 232,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16528634
+          },
+          "pc" : 235,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4", "0x1", "0x4" ],
+            "store" : null,
+            "used" : 16528631
+          },
+          "pc" : 236,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16527831
+          },
+          "pc" : 237,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x0", "0x1" ],
+            "store" : null,
+            "used" : 16527828
+          },
+          "pc" : 238,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16527825
+          },
+          "pc" : 239,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16527820
+          },
+          "pc" : 260,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffff0000000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16527817
+          },
+          "pc" : 261,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16527814
+          },
+          "pc" : 262,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x1" ],
+            "store" : null,
+            "used" : 16527811
+          },
+          "pc" : 263,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57", "0x4", "0x0", "0x1", "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16527808
+          },
+          "pc" : 264,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16527805
+          },
+          "pc" : 265,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16527802
+          },
+          "pc" : 286,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16527797
+          },
+          "pc" : 287,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16527794
+          },
+          "pc" : 288,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57", "0x4" ],
+            "store" : null,
+            "used" : 16527791
+          },
+          "pc" : 289,
+          "sub" : null
+        }, {
+          "cost" : 20000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x4",
+              "val" : "0x627306090abab3a6e1400e9345bc60c78a8bef57"
+            },
+            "used" : 16507791
+          },
+          "pc" : 290,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507789
+          },
+          "pc" : 291,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507788
+          },
+          "pc" : 292,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507786
+          },
+          "pc" : 293,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507784
+          },
+          "pc" : 294,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507782
+          },
+          "pc" : 295,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507780
+          },
+          "pc" : 296,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1dd" ],
+            "store" : null,
+            "used" : 16507777
+          },
+          "pc" : 297,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507769
+          },
+          "pc" : 301,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16507768
+          },
+          "pc" : 477,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14eb" ],
+            "store" : null,
+            "used" : 16507765
+          },
+          "pc" : 478,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14eb", "0x14eb" ],
+            "store" : null,
+            "used" : 16507762
+          },
+          "pc" : 481,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1ed" ],
+            "store" : null,
+            "used" : 16507759
+          },
+          "pc" : 482,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16507756
+          },
+          "pc" : 486,
+          "sub" : null
+        }, {
+          "cost" : 1033,
+          "ex" : {
+            "mem" : {
+              "data" : "0x606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16506723
+          },
+          "pc" : 488,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16506720
+          },
+          "pc" : 489,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16506720
+          },
+          "pc" : 491,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 149
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_1_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_1_stateDiff.json
new file mode 100644
index 00000000000..85212c33457
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_1_stateDiff.json
@@ -0,0 +1,67 @@
+{
+  "comment" : "Transfert ERC20 tokens (with contract created 0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8a98085023c34600083fffff294baaa2a3237035a2c7fa2a33c76b44a8c6fe18e8780b844a9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea000001b9fa752f720d59c20bb9e5523fc2d5c798c97e85286bc10caddf14e4a0e70abc3a02487da1189c3819b89b2f34e96bf6998b4e64c20380b80eaaf6f9138d58d9af2", [ "stateDiff" ] ],
+    "id" : 44
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f245bb51ccf29e"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffcd498adffa63b"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        },
+        "0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : {
+            "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643" : {
+              "*" : {
+                "from" : "0x00000000000000000000000000000000000000000000003635c9adc5dea00000",
+                "to" : "0x00000000000000000000000000000000000000000000006c6b935b8bbd400000"
+              }
+            },
+            "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" : {
+              "*" : {
+                "from" : "0x000000000000000000000000000000000000000000a56f6f83c66bdfe9600000",
+                "to" : "0x000000000000000000000000000000000000000000a56f394dfcbe1a0ac00000"
+              }
+            }
+          }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 44
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_1_trace.json
new file mode 100644
index 00000000000..f4f6e3c35c4
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_1_trace.json
@@ -0,0 +1,36 @@
+{
+  "comment" : "Transfert ERC20 tokens (with contract created 0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8a98085023c34600083fffff294baaa2a3237035a2c7fa2a33c76b44a8c6fe18e8780b844a9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea000001b9fa752f720d59c20bb9e5523fc2d5c798c97e85286bc10caddf14e4a0e70abc3a02487da1189c3819b89b2f34e96bf6998b4e64c20380b80eaaf6f9138d58d9af2", [ "trace" ] ],
+    "id" : 97
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffab66",
+          "input" : "0xa9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea00000",
+          "to" : "0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x43aa",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 97
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_1_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_1_vmTrace.json
new file mode 100644
index 00000000000..eb7f6d8b573
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_19_1_vmTrace.json
@@ -0,0 +1,4023 @@
+{
+  "comment" : "Transfert ERC20 tokens (with contract created 0xbaaa2a3237035a2c7fa2a33c76b44a8c6fe18e87)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8a98085023c34600083fffff294baaa2a3237035a2c7fa2a33c76b44a8c6fe18e8780b844a9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e400000000000000000000000000000000000000000000003635c9adc5dea000001b9fa752f720d59c20bb9e5523fc2d5c798c97e85286bc10caddf14e4a0e70abc3a02487da1189c3819b89b2f34e96bf6998b4e64c20380b80eaaf6f9138d58d9af2", [ "vmTrace" ] ],
+    "id" : 150
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x606060405236156100d9576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100e2578063095ea7b31461017157806318160ddd146101cb57806323b872dd146101f4578063313ce5671461026d5780633bed33ce1461029c57806342966c68146102bf5780636623fc46146102fa57806370a08231146103355780638da5cb5b1461038257806395d89b41146103d7578063a9059cbb14610466578063cd4217c1146104a8578063d7a78db8146104f5578063dd62ed3e14610530575b6100e05b5b565b005b34156100ed57600080fd5b6100f561059c565b6040518080602001828103825283818151815260200191508051906020019080838360005b838110156101365780820151818401525b60208101905061011a565b50505050905090810190601f1680156101635780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561017c57600080fd5b6101b1600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061063a565b604051808215151515815260200191505060405180910390f35b34156101d657600080fd5b6101de6106d6565b6040518082815260200191505060405180910390f35b34156101ff57600080fd5b610253600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106dc565b604051808215151515815260200191505060405180910390f35b341561027857600080fd5b610280610b01565b604051808260ff1660ff16815260200191505060405180910390f35b34156102a757600080fd5b6102bd6004808035906020019091905050610b14565b005b34156102ca57600080fd5b6102e06004808035906020019091905050610bd6565b604051808215151515815260200191505060405180910390f35b341561030557600080fd5b61031b6004808035906020019091905050610d29565b604051808215151515815260200191505060405180910390f35b341561034057600080fd5b61036c600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610ef6565b6040518082815260200191505060405180910390f35b341561038d57600080fd5b610395610f0e565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156103e257600080fd5b6103ea610f34565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561042b5780820151818401525b60208101905061040f565b50505050905090810190601f1680156104585780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b341561047157600080fd5b6104a6600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091908035906020019091905050610fd2565b005b34156104b357600080fd5b6104df600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611260565b6040518082815260200191505060405180910390f35b341561050057600080fd5b6105166004808035906020019091905050611278565b604051808215151515815260200191505060405180910390f35b341561053b57600080fd5b610586600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050611445565b6040518082815260200191505060405180910390f35b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156106325780601f1061060757610100808354040283529160200191610632565b820191906000526020600020905b81548152906001019060200180831161061557829003601f168201915b505050505081565b6000808211151561064a57600080fd5b81600760003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550600190505b92915050565b60035481565b6000808373ffffffffffffffffffffffffffffffffffffffff16141561070157600080fd5b60008211151561071057600080fd5b81600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561075c57600080fd5b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156107e957600080fd5b600760008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482111561087257600080fd5b6108bb600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610947600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610a10600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600760008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190505b9392505050565b600260009054906101000a900460ff1681565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610b7057600080fd5b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f193505050501515610bd257600080fd5b5b50565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610c2457600080fd5b600082111515610c3357600080fd5b610c7c600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610ccb6003548361146a565b6003819055503373ffffffffffffffffffffffffffffffffffffffff167fcc16f5dbb4873280815c1ee09dbd06736cffcc184412cf7a71a0fdb75d397ca5836040518082815260200191505060405180910390a2600190505b919050565b600081600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015610d7757600080fd5b600082111515610d8657600080fd5b610dcf600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610e5b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167f2cfce4af01bcb9d6cf6c84ee1b7c491100b8695368264146a94d71e10a63083f836040518082815260200191505060405180910390a2600190505b919050565b60056020528060005260406000206000915090505481565b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610fca5780601f10610f9f57610100808354040283529160200191610fca565b820191906000526020600020905b815481529060010190602001808311610fad57829003601f168201915b505050505081565b60008273ffffffffffffffffffffffffffffffffffffffff161415610ff657600080fd5b60008111151561100557600080fd5b80600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101561105157600080fd5b600560008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205481600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020540110156110de57600080fd5b611127600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548261146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506111b3600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205482611484565b600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35b5050565b60066020528060005260406000206000915090505481565b600081600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410156112c657600080fd5b6000821115156112d557600080fd5b61131e600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020548361146a565b600560003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055506113aa600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205483611484565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055503373ffffffffffffffffffffffffffffffffffffffff167ff97a274face0b5517365ad396b1fdba6f68bd3135ef603e44272adba3af5a1e0836040518082815260200191505060405180910390a2600190505b919050565b6007602052816000526040600020602052806000526040600020600091509150505481565b6000611478838311156114af565b81830390505b92915050565b60008082840190506114a484821015801561149f5750838210155b6114af565b8091505b5092915050565b8015156114bb57600080fd5b5b505600a165627a7a72305820082734e053ffbdf2a3195354a3210dff3723c239a1e76ae3be0936f6aed31bee0029",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16755555
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16755552
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 12,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000060",
+              "off" : 64
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755540
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x44" ],
+            "store" : null,
+            "used" : 16755538
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755535
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xd9" ],
+            "store" : null,
+            "used" : 16755532
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755522
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755519
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5c" ],
+            "store" : null,
+            "used" : 16755516
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100000000000000000000000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755513
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x100000000000000000000000000000000000000000000000000000000", "0xa9059cbb0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5c" ],
+            "store" : null,
+            "used" : 16755510
+          },
+          "pc" : 44,
+          "sub" : null
+        }, {
+          "cost" : 5,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755505
+          },
+          "pc" : 45,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffff" ],
+            "store" : null,
+            "used" : 16755502
+          },
+          "pc" : 46,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755499
+          },
+          "pc" : 51,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755496
+          },
+          "pc" : 52,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6fdde03" ],
+            "store" : null,
+            "used" : 16755493
+          },
+          "pc" : 53,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755490
+          },
+          "pc" : 58,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xe2" ],
+            "store" : null,
+            "used" : 16755487
+          },
+          "pc" : 59,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755477
+          },
+          "pc" : 62,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755474
+          },
+          "pc" : 63,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x95ea7b3" ],
+            "store" : null,
+            "used" : 16755471
+          },
+          "pc" : 64,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755468
+          },
+          "pc" : 69,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x171" ],
+            "store" : null,
+            "used" : 16755465
+          },
+          "pc" : 70,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755455
+          },
+          "pc" : 73,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755452
+          },
+          "pc" : 74,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x18160ddd" ],
+            "store" : null,
+            "used" : 16755449
+          },
+          "pc" : 75,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755446
+          },
+          "pc" : 80,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1cb" ],
+            "store" : null,
+            "used" : 16755443
+          },
+          "pc" : 81,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755433
+          },
+          "pc" : 84,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755430
+          },
+          "pc" : 85,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x23b872dd" ],
+            "store" : null,
+            "used" : 16755427
+          },
+          "pc" : 86,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755424
+          },
+          "pc" : 91,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f4" ],
+            "store" : null,
+            "used" : 16755421
+          },
+          "pc" : 92,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755411
+          },
+          "pc" : 95,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755408
+          },
+          "pc" : 96,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x313ce567" ],
+            "store" : null,
+            "used" : 16755405
+          },
+          "pc" : 97,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755402
+          },
+          "pc" : 102,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x26d" ],
+            "store" : null,
+            "used" : 16755399
+          },
+          "pc" : 103,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755389
+          },
+          "pc" : 106,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755386
+          },
+          "pc" : 107,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3bed33ce" ],
+            "store" : null,
+            "used" : 16755383
+          },
+          "pc" : 108,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755380
+          },
+          "pc" : 113,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x29c" ],
+            "store" : null,
+            "used" : 16755377
+          },
+          "pc" : 114,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755367
+          },
+          "pc" : 117,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755364
+          },
+          "pc" : 118,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x42966c68" ],
+            "store" : null,
+            "used" : 16755361
+          },
+          "pc" : 119,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755358
+          },
+          "pc" : 124,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2bf" ],
+            "store" : null,
+            "used" : 16755355
+          },
+          "pc" : 125,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755345
+          },
+          "pc" : 128,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755342
+          },
+          "pc" : 129,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6623fc46" ],
+            "store" : null,
+            "used" : 16755339
+          },
+          "pc" : 130,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755336
+          },
+          "pc" : 135,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2fa" ],
+            "store" : null,
+            "used" : 16755333
+          },
+          "pc" : 136,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755323
+          },
+          "pc" : 139,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755320
+          },
+          "pc" : 140,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x70a08231" ],
+            "store" : null,
+            "used" : 16755317
+          },
+          "pc" : 141,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755314
+          },
+          "pc" : 146,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x335" ],
+            "store" : null,
+            "used" : 16755311
+          },
+          "pc" : 147,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755301
+          },
+          "pc" : 150,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755298
+          },
+          "pc" : 151,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x8da5cb5b" ],
+            "store" : null,
+            "used" : 16755295
+          },
+          "pc" : 152,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755292
+          },
+          "pc" : 157,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x382" ],
+            "store" : null,
+            "used" : 16755289
+          },
+          "pc" : 158,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755279
+          },
+          "pc" : 161,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755276
+          },
+          "pc" : 162,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x95d89b41" ],
+            "store" : null,
+            "used" : 16755273
+          },
+          "pc" : 163,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755270
+          },
+          "pc" : 168,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3d7" ],
+            "store" : null,
+            "used" : 16755267
+          },
+          "pc" : 169,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755257
+          },
+          "pc" : 172,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb", "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755254
+          },
+          "pc" : 173,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9059cbb" ],
+            "store" : null,
+            "used" : 16755251
+          },
+          "pc" : 174,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755248
+          },
+          "pc" : 179,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x466" ],
+            "store" : null,
+            "used" : 16755245
+          },
+          "pc" : 180,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755235
+          },
+          "pc" : 183,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755234
+          },
+          "pc" : 1126,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755232
+          },
+          "pc" : 1127,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755229
+          },
+          "pc" : 1128,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x471" ],
+            "store" : null,
+            "used" : 16755226
+          },
+          "pc" : 1129,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755216
+          },
+          "pc" : 1132,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755215
+          },
+          "pc" : 1137,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4a6" ],
+            "store" : null,
+            "used" : 16755212
+          },
+          "pc" : 1138,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4" ],
+            "store" : null,
+            "used" : 16755209
+          },
+          "pc" : 1141,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4", "0x4" ],
+            "store" : null,
+            "used" : 16755206
+          },
+          "pc" : 1143,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4", "0x4" ],
+            "store" : null,
+            "used" : 16755203
+          },
+          "pc" : 1144,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16755200
+          },
+          "pc" : 1145,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16755197
+          },
+          "pc" : 1146,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16755194
+          },
+          "pc" : 1167,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x4" ],
+            "store" : null,
+            "used" : 16755191
+          },
+          "pc" : 1168,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755188
+          },
+          "pc" : 1169,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x24" ],
+            "store" : null,
+            "used" : 16755185
+          },
+          "pc" : 1171,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x24", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16755182
+          },
+          "pc" : 1172,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x24", "0x4" ],
+            "store" : null,
+            "used" : 16755179
+          },
+          "pc" : 1173,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4", "0x24" ],
+            "store" : null,
+            "used" : 16755176
+          },
+          "pc" : 1174,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x24", "0x24" ],
+            "store" : null,
+            "used" : 16755173
+          },
+          "pc" : 1175,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16755170
+          },
+          "pc" : 1176,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x24" ],
+            "store" : null,
+            "used" : 16755167
+          },
+          "pc" : 1177,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755164
+          },
+          "pc" : 1178,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x44" ],
+            "store" : null,
+            "used" : 16755161
+          },
+          "pc" : 1180,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x44", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16755158
+          },
+          "pc" : 1181,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x44", "0x4" ],
+            "store" : null,
+            "used" : 16755155
+          },
+          "pc" : 1182,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x4", "0x44" ],
+            "store" : null,
+            "used" : 16755152
+          },
+          "pc" : 1183,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755150
+          },
+          "pc" : 1184,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755148
+          },
+          "pc" : 1185,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xfd2" ],
+            "store" : null,
+            "used" : 16755145
+          },
+          "pc" : 1186,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755137
+          },
+          "pc" : 1189,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755136
+          },
+          "pc" : 4050,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755133
+          },
+          "pc" : 4051,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x3635c9adc5dea00000", "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16755130
+          },
+          "pc" : 4053,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16755127
+          },
+          "pc" : 4054,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16755124
+          },
+          "pc" : 4075,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755121
+          },
+          "pc" : 4076,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755118
+          },
+          "pc" : 4077,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xff6" ],
+            "store" : null,
+            "used" : 16755115
+          },
+          "pc" : 4078,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755105
+          },
+          "pc" : 4081,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755104
+          },
+          "pc" : 4086,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755101
+          },
+          "pc" : 4087,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x0", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16755098
+          },
+          "pc" : 4089,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755095
+          },
+          "pc" : 4090,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755092
+          },
+          "pc" : 4091,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16755089
+          },
+          "pc" : 4092,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1005" ],
+            "store" : null,
+            "used" : 16755086
+          },
+          "pc" : 4093,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755076
+          },
+          "pc" : 4096,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755075
+          },
+          "pc" : 4101,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16755072
+          },
+          "pc" : 4102,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16755069
+          },
+          "pc" : 4103,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755066
+          },
+          "pc" : 4105,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16755064
+          },
+          "pc" : 4107,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16755061
+          },
+          "pc" : 4108,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16755058
+          },
+          "pc" : 4129,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16755055
+          },
+          "pc" : 4130,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16755052
+          },
+          "pc" : 4151,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x627306090abab3a6e1400e9345bc60c78a8bef57", "0x0" ],
+            "store" : null,
+            "used" : 16755049
+          },
+          "pc" : 4152,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x000000000000000000000000627306090abab3a6e1400e9345bc60c78a8bef57",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755046
+          },
+          "pc" : 4153,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755043
+          },
+          "pc" : 4154,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755040
+          },
+          "pc" : 4156,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16755037
+          },
+          "pc" : 4157,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16755034
+          },
+          "pc" : 4158,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755031
+          },
+          "pc" : 4159,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755028
+          },
+          "pc" : 4160,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16755025
+          },
+          "pc" : 4162,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755022
+          },
+          "pc" : 4163,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" ],
+            "store" : null,
+            "used" : 16754980
+          },
+          "pc" : 4165,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f6f83c66bdfe9600000" ],
+            "store" : null,
+            "used" : 16754180
+          },
+          "pc" : 4166,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754177
+          },
+          "pc" : 4167,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16754174
+          },
+          "pc" : 4168,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1051" ],
+            "store" : null,
+            "used" : 16754171
+          },
+          "pc" : 4169,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16754161
+          },
+          "pc" : 4172,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16754160
+          },
+          "pc" : 4177,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16754157
+          },
+          "pc" : 4178,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754154
+          },
+          "pc" : 4180,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x3635c9adc5dea00000", "0x5", "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16754151
+          },
+          "pc" : 4182,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16754148
+          },
+          "pc" : 4183,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16754145
+          },
+          "pc" : 4204,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16754142
+          },
+          "pc" : 4205,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16754139
+          },
+          "pc" : 4226,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x0" ],
+            "store" : null,
+            "used" : 16754136
+          },
+          "pc" : 4227,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16754133
+          },
+          "pc" : 4228,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16754130
+          },
+          "pc" : 4229,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16754127
+          },
+          "pc" : 4231,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16754124
+          },
+          "pc" : 4232,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16754121
+          },
+          "pc" : 4233,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16754118
+          },
+          "pc" : 4234,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16754115
+          },
+          "pc" : 4235,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16754112
+          },
+          "pc" : 4237,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16754109
+          },
+          "pc" : 4238,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643" ],
+            "store" : null,
+            "used" : 16754067
+          },
+          "pc" : 4240,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16753267
+          },
+          "pc" : 4241,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x3635c9adc5dea00000", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16753264
+          },
+          "pc" : 4242,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16753261
+          },
+          "pc" : 4243,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16753258
+          },
+          "pc" : 4245,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x3635c9adc5dea00000", "0x3635c9adc5dea00000", "0x3635c9adc5dea00000", "0x5", "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16753255
+          },
+          "pc" : 4247,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16753252
+          },
+          "pc" : 4248,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16753249
+          },
+          "pc" : 4269,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16753246
+          },
+          "pc" : 4270,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16753243
+          },
+          "pc" : 4291,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x0" ],
+            "store" : null,
+            "used" : 16753240
+          },
+          "pc" : 4292,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16753237
+          },
+          "pc" : 4293,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16753234
+          },
+          "pc" : 4294,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16753231
+          },
+          "pc" : 4296,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16753228
+          },
+          "pc" : 4297,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16753225
+          },
+          "pc" : 4298,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16753222
+          },
+          "pc" : 4299,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16753219
+          },
+          "pc" : 4300,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16753216
+          },
+          "pc" : 4302,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16753213
+          },
+          "pc" : 4303,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643" ],
+            "store" : null,
+            "used" : 16753171
+          },
+          "pc" : 4305,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16752371
+          },
+          "pc" : 4306,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000" ],
+            "store" : null,
+            "used" : 16752368
+          },
+          "pc" : 4307,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16752365
+          },
+          "pc" : 4308,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16752362
+          },
+          "pc" : 4309,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10de" ],
+            "store" : null,
+            "used" : 16752359
+          },
+          "pc" : 4310,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16752349
+          },
+          "pc" : 4313,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16752348
+          },
+          "pc" : 4318,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1127" ],
+            "store" : null,
+            "used" : 16752345
+          },
+          "pc" : 4319,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16752342
+          },
+          "pc" : 4322,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16752339
+          },
+          "pc" : 4324,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16752337
+          },
+          "pc" : 4326,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16752334
+          },
+          "pc" : 4327,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16752331
+          },
+          "pc" : 4348,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16752328
+          },
+          "pc" : 4349,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16752325
+          },
+          "pc" : 4370,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x627306090abab3a6e1400e9345bc60c78a8bef57", "0x0" ],
+            "store" : null,
+            "used" : 16752322
+          },
+          "pc" : 4371,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x000000000000000000000000627306090abab3a6e1400e9345bc60c78a8bef57",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16752319
+          },
+          "pc" : 4372,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16752316
+          },
+          "pc" : 4373,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16752313
+          },
+          "pc" : 4375,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16752310
+          },
+          "pc" : 4376,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16752307
+          },
+          "pc" : 4377,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16752304
+          },
+          "pc" : 4378,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16752301
+          },
+          "pc" : 4379,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16752298
+          },
+          "pc" : 4381,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16752295
+          },
+          "pc" : 4382,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" ],
+            "store" : null,
+            "used" : 16752253
+          },
+          "pc" : 4384,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f6f83c66bdfe9600000" ],
+            "store" : null,
+            "used" : 16751453
+          },
+          "pc" : 4385,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x1127", "0xa56f6f83c66bdfe9600000", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16751450
+          },
+          "pc" : 4386,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x146a" ],
+            "store" : null,
+            "used" : 16751447
+          },
+          "pc" : 4387,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751439
+          },
+          "pc" : 4390,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751438
+          },
+          "pc" : 5226,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16751435
+          },
+          "pc" : 5227,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1478" ],
+            "store" : null,
+            "used" : 16751432
+          },
+          "pc" : 5229,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f6f83c66bdfe9600000", "0x3635c9adc5dea00000", "0x0", "0x1478", "0xa56f6f83c66bdfe9600000" ],
+            "store" : null,
+            "used" : 16751429
+          },
+          "pc" : 5232,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x0", "0x1478", "0xa56f6f83c66bdfe9600000", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16751426
+          },
+          "pc" : 5233,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16751423
+          },
+          "pc" : 5234,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16751420
+          },
+          "pc" : 5235,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14af" ],
+            "store" : null,
+            "used" : 16751417
+          },
+          "pc" : 5236,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751409
+          },
+          "pc" : 5239,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751408
+          },
+          "pc" : 5295,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x1" ],
+            "store" : null,
+            "used" : 16751405
+          },
+          "pc" : 5296,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16751402
+          },
+          "pc" : 5297,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16751399
+          },
+          "pc" : 5298,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14bb" ],
+            "store" : null,
+            "used" : 16751396
+          },
+          "pc" : 5299,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751386
+          },
+          "pc" : 5302,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751385
+          },
+          "pc" : 5307,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751384
+          },
+          "pc" : 5308,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751382
+          },
+          "pc" : 5309,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751374
+          },
+          "pc" : 5310,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751373
+          },
+          "pc" : 5240,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x0", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16751370
+          },
+          "pc" : 5241,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f6f83c66bdfe9600000", "0x3635c9adc5dea00000", "0x0", "0x3635c9adc5dea00000", "0xa56f6f83c66bdfe9600000" ],
+            "store" : null,
+            "used" : 16751367
+          },
+          "pc" : 5242,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f394dfcbe1a0ac00000" ],
+            "store" : null,
+            "used" : 16751364
+          },
+          "pc" : 5243,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f394dfcbe1a0ac00000", "0x0" ],
+            "store" : null,
+            "used" : 16751361
+          },
+          "pc" : 5244,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751359
+          },
+          "pc" : 5245,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751358
+          },
+          "pc" : 5246,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f394dfcbe1a0ac00000", "0xa56f6f83c66bdfe9600000", "0x3635c9adc5dea00000", "0x1127" ],
+            "store" : null,
+            "used" : 16751355
+          },
+          "pc" : 5247,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1127", "0x3635c9adc5dea00000", "0xa56f6f83c66bdfe9600000" ],
+            "store" : null,
+            "used" : 16751352
+          },
+          "pc" : 5248,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751350
+          },
+          "pc" : 5249,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751348
+          },
+          "pc" : 5250,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751340
+          },
+          "pc" : 5251,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751339
+          },
+          "pc" : 4391,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16751336
+          },
+          "pc" : 4392,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16751333
+          },
+          "pc" : 4394,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16751331
+          },
+          "pc" : 4396,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16751328
+          },
+          "pc" : 4397,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16751325
+          },
+          "pc" : 4418,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16751322
+          },
+          "pc" : 4419,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16751319
+          },
+          "pc" : 4440,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x627306090abab3a6e1400e9345bc60c78a8bef57", "0x0" ],
+            "store" : null,
+            "used" : 16751316
+          },
+          "pc" : 4441,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x000000000000000000000000627306090abab3a6e1400e9345bc60c78a8bef57",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751313
+          },
+          "pc" : 4442,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16751310
+          },
+          "pc" : 4443,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16751307
+          },
+          "pc" : 4445,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16751304
+          },
+          "pc" : 4446,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16751301
+          },
+          "pc" : 4447,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16751298
+          },
+          "pc" : 4448,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16751295
+          },
+          "pc" : 4449,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16751292
+          },
+          "pc" : 4451,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16751289
+          },
+          "pc" : 4452,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" ],
+            "store" : null,
+            "used" : 16751247
+          },
+          "pc" : 4454,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f394dfcbe1a0ac00000", "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d", "0xa56f394dfcbe1a0ac00000" ],
+            "store" : null,
+            "used" : 16751244
+          },
+          "pc" : 4455,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa56f394dfcbe1a0ac00000", "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d" ],
+            "store" : null,
+            "used" : 16751241
+          },
+          "pc" : 4456,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0xa9312db2f5fb32846f141a1d722f773c1064b8a16a8469d25062d3455a375b5d",
+              "val" : "0xa56f394dfcbe1a0ac00000"
+            },
+            "used" : 16746241
+          },
+          "pc" : 4457,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16746239
+          },
+          "pc" : 4458,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x11b3" ],
+            "store" : null,
+            "used" : 16746236
+          },
+          "pc" : 4459,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16746233
+          },
+          "pc" : 4462,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16746230
+          },
+          "pc" : 4464,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x3635c9adc5dea00000", "0x11b3", "0x5", "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16746227
+          },
+          "pc" : 4466,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16746224
+          },
+          "pc" : 4467,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16746221
+          },
+          "pc" : 4488,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16746218
+          },
+          "pc" : 4489,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16746215
+          },
+          "pc" : 4510,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x0" ],
+            "store" : null,
+            "used" : 16746212
+          },
+          "pc" : 4511,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16746209
+          },
+          "pc" : 4512,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16746206
+          },
+          "pc" : 4513,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16746203
+          },
+          "pc" : 4515,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16746200
+          },
+          "pc" : 4516,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16746197
+          },
+          "pc" : 4517,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16746194
+          },
+          "pc" : 4518,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16746191
+          },
+          "pc" : 4519,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16746188
+          },
+          "pc" : 4521,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16746185
+          },
+          "pc" : 4522,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643" ],
+            "store" : null,
+            "used" : 16746143
+          },
+          "pc" : 4524,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16745343
+          },
+          "pc" : 4525,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x11b3", "0x3635c9adc5dea00000", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16745340
+          },
+          "pc" : 4526,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1484" ],
+            "store" : null,
+            "used" : 16745337
+          },
+          "pc" : 4527,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745329
+          },
+          "pc" : 4530,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745328
+          },
+          "pc" : 5252,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16745325
+          },
+          "pc" : 5253,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0x0" ],
+            "store" : null,
+            "used" : 16745322
+          },
+          "pc" : 5255,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x0", "0x0", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16745319
+          },
+          "pc" : 5256,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x3635c9adc5dea00000", "0x0", "0x0", "0x3635c9adc5dea00000", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16745316
+          },
+          "pc" : 5257,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000" ],
+            "store" : null,
+            "used" : 16745313
+          },
+          "pc" : 5258,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x0" ],
+            "store" : null,
+            "used" : 16745310
+          },
+          "pc" : 5259,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745308
+          },
+          "pc" : 5260,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14a4" ],
+            "store" : null,
+            "used" : 16745305
+          },
+          "pc" : 5261,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x3635c9adc5dea00000", "0x0", "0x6c6b935b8bbd400000", "0x14a4", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16745302
+          },
+          "pc" : 5264,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x14a4", "0x3635c9adc5dea00000", "0x6c6b935b8bbd400000" ],
+            "store" : null,
+            "used" : 16745299
+          },
+          "pc" : 5265,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16745296
+          },
+          "pc" : 5266,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16745293
+          },
+          "pc" : 5267,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x1" ],
+            "store" : null,
+            "used" : 16745290
+          },
+          "pc" : 5268,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16745287
+          },
+          "pc" : 5269,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x149f" ],
+            "store" : null,
+            "used" : 16745284
+          },
+          "pc" : 5270,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745274
+          },
+          "pc" : 5273,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745272
+          },
+          "pc" : 5274,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x0", "0x6c6b935b8bbd400000", "0x14a4", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16745269
+          },
+          "pc" : 5275,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x14a4", "0x3635c9adc5dea00000", "0x6c6b935b8bbd400000" ],
+            "store" : null,
+            "used" : 16745266
+          },
+          "pc" : 5276,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16745263
+          },
+          "pc" : 5277,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16745260
+          },
+          "pc" : 5278,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745259
+          },
+          "pc" : 5279,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14af" ],
+            "store" : null,
+            "used" : 16745256
+          },
+          "pc" : 5280,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745248
+          },
+          "pc" : 5283,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745247
+          },
+          "pc" : 5295,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1", "0x1" ],
+            "store" : null,
+            "used" : 16745244
+          },
+          "pc" : 5296,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16745241
+          },
+          "pc" : 5297,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16745238
+          },
+          "pc" : 5298,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14bb" ],
+            "store" : null,
+            "used" : 16745235
+          },
+          "pc" : 5299,
+          "sub" : null
+        }, {
+          "cost" : 10,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745225
+          },
+          "pc" : 5302,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745224
+          },
+          "pc" : 5307,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745223
+          },
+          "pc" : 5308,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745221
+          },
+          "pc" : 5309,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745213
+          },
+          "pc" : 5310,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745212
+          },
+          "pc" : 5284,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x6c6b935b8bbd400000" ],
+            "store" : null,
+            "used" : 16745209
+          },
+          "pc" : 5285,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x6c6b935b8bbd400000", "0x0" ],
+            "store" : null,
+            "used" : 16745206
+          },
+          "pc" : 5286,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745204
+          },
+          "pc" : 5287,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745203
+          },
+          "pc" : 5288,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745201
+          },
+          "pc" : 5289,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x3635c9adc5dea00000", "0x3635c9adc5dea00000", "0x11b3" ],
+            "store" : null,
+            "used" : 16745198
+          },
+          "pc" : 5290,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x11b3", "0x3635c9adc5dea00000", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16745195
+          },
+          "pc" : 5291,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745193
+          },
+          "pc" : 5292,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745191
+          },
+          "pc" : 5293,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745183
+          },
+          "pc" : 5294,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745182
+          },
+          "pc" : 4531,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x5" ],
+            "store" : null,
+            "used" : 16745179
+          },
+          "pc" : 4532,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16745176
+          },
+          "pc" : 4534,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x3635c9adc5dea00000", "0x6c6b935b8bbd400000", "0x5", "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16745173
+          },
+          "pc" : 4536,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16745170
+          },
+          "pc" : 4537,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16745167
+          },
+          "pc" : 4558,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16745164
+          },
+          "pc" : 4559,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16745161
+          },
+          "pc" : 4580,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x0" ],
+            "store" : null,
+            "used" : 16745158
+          },
+          "pc" : 4581,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000a13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745155
+          },
+          "pc" : 4582,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16745152
+          },
+          "pc" : 4583,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16745149
+          },
+          "pc" : 4585,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5" ],
+            "store" : null,
+            "used" : 16745146
+          },
+          "pc" : 4586,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x5", "0x20" ],
+            "store" : null,
+            "used" : 16745143
+          },
+          "pc" : 4587,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000005",
+              "off" : 32
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16745140
+          },
+          "pc" : 4588,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16745137
+          },
+          "pc" : 4589,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16745134
+          },
+          "pc" : 4591,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16745131
+          },
+          "pc" : 4592,
+          "sub" : null
+        }, {
+          "cost" : 42,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643" ],
+            "store" : null,
+            "used" : 16745089
+          },
+          "pc" : 4594,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643", "0x6c6b935b8bbd400000" ],
+            "store" : null,
+            "used" : 16745086
+          },
+          "pc" : 4595,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x6c6b935b8bbd400000", "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643" ],
+            "store" : null,
+            "used" : 16745083
+          },
+          "pc" : 4596,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x47dfe2af6b00a2aac81c542b40f5676fc0072fa1ce62e1ef260aade0f4b29643",
+              "val" : "0x6c6b935b8bbd400000"
+            },
+            "used" : 16740083
+          },
+          "pc" : 4597,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16740081
+          },
+          "pc" : 4598,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x3635c9adc5dea00000", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16740078
+          },
+          "pc" : 4599,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16740075
+          },
+          "pc" : 4600,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4" ],
+            "store" : null,
+            "used" : 16740072
+          },
+          "pc" : 4621,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16740070
+          },
+          "pc" : 4622,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16740067
+          },
+          "pc" : 4623,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16740064
+          },
+          "pc" : 4644,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef" ],
+            "store" : null,
+            "used" : 16740061
+          },
+          "pc" : 4645,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0xa13aa5589f0dd8dd3bd5055b31add5ca0f2f8e4", "0x627306090abab3a6e1400e9345bc60c78a8bef57", "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16740058
+          },
+          "pc" : 4678,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16740055
+          },
+          "pc" : 4679,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000060",
+              "off" : 64
+            },
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16740052
+          },
+          "pc" : 4681,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x60" ],
+            "store" : null,
+            "used" : 16740049
+          },
+          "pc" : 4682,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x3635c9adc5dea00000", "0x60", "0x60", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16740046
+          },
+          "pc" : 4683,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x3635c9adc5dea00000", "0x60" ],
+            "store" : null,
+            "used" : 16740043
+          },
+          "pc" : 4684,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x00000000000000000000000000000000000000000000003635c9adc5dea00000",
+              "off" : 96
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16740037
+          },
+          "pc" : 4685,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16740034
+          },
+          "pc" : 4686,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16740031
+          },
+          "pc" : 4688,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x60", "0x3635c9adc5dea00000" ],
+            "store" : null,
+            "used" : 16740028
+          },
+          "pc" : 4689,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16740026
+          },
+          "pc" : 4690,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16740024
+          },
+          "pc" : 4691,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16740021
+          },
+          "pc" : 4692,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000060",
+              "off" : 64
+            },
+            "push" : [ "0x60" ],
+            "store" : null,
+            "used" : 16740018
+          },
+          "pc" : 4694,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x60" ],
+            "store" : null,
+            "used" : 16740015
+          },
+          "pc" : 4695,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x60", "0x60", "0x80" ],
+            "store" : null,
+            "used" : 16740012
+          },
+          "pc" : 4696,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16740009
+          },
+          "pc" : 4697,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20", "0x60" ],
+            "store" : null,
+            "used" : 16740006
+          },
+          "pc" : 4698,
+          "sub" : null
+        }, {
+          "cost" : 1756,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16738250
+          },
+          "pc" : 4699,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16738249
+          },
+          "pc" : 4700,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16738247
+          },
+          "pc" : 4701,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16738245
+          },
+          "pc" : 4702,
+          "sub" : null
+        }, {
+          "cost" : 8,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16738237
+          },
+          "pc" : 4703,
+          "sub" : null
+        }, {
+          "cost" : 1,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16738236
+          },
+          "pc" : 1190,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16738236
+          },
+          "pc" : 1191,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 150
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1a_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1a_0_stateDiff.json
new file mode 100644
index 00000000000..93b7b686e6a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1a_0_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep with gas refund.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca0c518ea0f936f43969e36335ba480ed8997bba40cc67b1de2197f61d20b847216a0039662d59802be842caf53d4cf22e952572e06c6c0f4abd8c9a6b0401d51b352", [ "stateDiff" ] ],
+    "id" : 45
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f1838618847d"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27a3953c"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 45
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1a_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1a_0_trace.json
new file mode 100644
index 00000000000..40dc5754f9f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1a_0_trace.json
@@ -0,0 +1,52 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep with gas refund.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca0c518ea0f936f43969e36335ba480ed8997bba40cc67b1de2197f61d20b847216a0039662d59802be842caf53d4cf22e952572e06c6c0f4abd8c9a6b0401d51b352", [ "trace" ] ],
+    "id" : 98
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffab3a",
+          "input" : "0x00000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0040000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x5459",
+          "output" : "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0040000000000000000000000000000000000000",
+          "gas" : "0xfba99f",
+          "input" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+          "to" : "0x0010000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x5158",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 98
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1a_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1a_0_vmTrace.json
new file mode 100644
index 00000000000..5eb225ab04e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1a_0_vmTrace.json
@@ -0,0 +1,318 @@
+{
+  "comment" : "Proxy call to another contract - 1 level deep with gas refund.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf901028081ef83fffff294004000000000000000000000000000000000000080b8a0000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000001ca0c518ea0f936f43969e36335ba480ed8997bba40cc67b1de2197f61d20b847216a0039662d59802be842caf53d4cf22e952572e06c6c0f4abd8c9a6b0401d51b352", [ "vmTrace" ] ],
+    "id" : 151
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60206000602036038060206000376000346000355af160206000f3",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755511
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755508
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755505
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xa0" ],
+            "store" : null,
+            "used" : 16755503
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16755500
+          },
+          "pc" : 7,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80", "0x80" ],
+            "store" : null,
+            "used" : 16755497
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16755494
+          },
+          "pc" : 9,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755491
+          },
+          "pc" : 11,
+          "sub" : null
+        }, {
+          "cost" : 27,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16755464
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755461
+          },
+          "pc" : 14,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755459
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16755456
+          },
+          "pc" : 17,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x10000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 16755453
+          },
+          "pc" : 19,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffaafb" ],
+            "store" : null,
+            "used" : 16755451
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 16493659,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000001",
+              "off" : 0
+            },
+            "push" : [ "0x1" ],
+            "store" : null,
+            "used" : 16733927
+          },
+          "pc" : 21,
+          "sub" : {
+            "code" : "0x6020356000355560603560403555",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 16492956
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x3" ],
+                "store" : null,
+                "used" : 16492953
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16492950
+              },
+              "pc" : 3,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16492947
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x3"
+                },
+                "used" : 16472947
+              },
+              "pc" : 6,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x60" ],
+                "store" : null,
+                "used" : 16472944
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 16472941
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 16472938
+              },
+              "pc" : 10,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x1" ],
+                "store" : null,
+                "used" : 16472935
+              },
+              "pc" : 12,
+              "sub" : null
+            }, {
+              "cost" : 800,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x1",
+                  "val" : "0x0"
+                },
+                "used" : 16472135
+              },
+              "pc" : 13,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x20" ],
+            "store" : null,
+            "used" : 16733924
+          },
+          "pc" : 22,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 16733921
+          },
+          "pc" : 24,
+          "sub" : null
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16733921
+          },
+          "pc" : 26,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 151
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1b_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1b_0_stateDiff.json
new file mode 100644
index 00000000000..ebb0bc09435
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1b_0_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Self destruct and send contract balance to the same address provided in the to field.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8758081ef83fffff2940150000000000000000000000000000000000000809400000000000000000000000001500000000000001ca0d4e0bc58b66988dbda935ddbbd86947e82ab33eff8a8f2601a8662f012641dd9a05f96e65ab05bfceadd224172895f85c1ffedc514eb8ad496675736f0e8a6f1f6", [ "stateDiff" ] ],
+    "id" : 46
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860da92e"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27ae708b"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 46
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1b_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1b_0_trace.json
new file mode 100644
index 00000000000..89b571659a7
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1b_0_trace.json
@@ -0,0 +1,36 @@
+{
+  "comment" : "Self destruct and send contract balance to the same address provided in the to field.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8758081ef83fffff2940150000000000000000000000000000000000000809400000000000000000000000001500000000000001ca0d4e0bc58b66988dbda935ddbbd86947e82ab33eff8a8f2601a8662f012641dd9a05f96e65ab05bfceadd224172895f85c1ffedc514eb8ad496675736f0e8a6f1f6", [ "trace" ] ],
+    "id" : 99
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xffad82",
+          "input" : "0x0000000000000000000000000150000000000000",
+          "to" : "0x0150000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0x0",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 99
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1b_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1b_0_vmTrace.json
new file mode 100644
index 00000000000..a43e52bb964
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1b_0_vmTrace.json
@@ -0,0 +1,23 @@
+{
+  "comment" : "Self destruct and send contract balance to the same address provided in the to field.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8758081ef83fffff2940150000000000000000000000000000000000000809400000000000000000000000001500000000000001ca0d4e0bc58b66988dbda935ddbbd86947e82ab33eff8a8f2601a8662f012641dd9a05f96e65ab05bfceadd224172895f85c1ffedc514eb8ad496675736f0e8a6f1f6", [ "vmTrace" ] ],
+    "id" : 152
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x",
+        "ops" : [ ]
+      }
+    },
+    "id" : 152
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1c_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1c_0_stateDiff.json
new file mode 100644
index 00000000000..41e99cbd627
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1c_0_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Self destruct called in constructor with balance being returned to sender (from field)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf86b8081ef83fffff280809e60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe1ba0392fdcde965c4f2b5149af02fbb43816cb7415bb9d320d48151179f01774d28ba04c52e1e0db0ccc4e1fa11f07e82beb5468af4c061883f9b3bab286167f1b637e", [ "stateDiff" ] ],
+    "id" : 47
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183863e8934"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d0798e0fa5"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 47
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1c_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1c_0_trace.json
new file mode 100644
index 00000000000..52dbd682b28
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1c_0_trace.json
@@ -0,0 +1,45 @@
+{
+  "comment" : "Self destruct called in constructor with balance being returned to sender (from field)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf86b8081ef83fffff280809e60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe1ba0392fdcde965c4f2b5149af02fbb43816cb7415bb9d320d48151179f01774d28ba04c52e1e0db0ccc4e1fa11f07e82beb5468af4c061883f9b3bab286167f1b637e", [ "trace" ] ],
+    "id" : 100
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xff2f0a",
+          "init" : "0x60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe",
+          "value" : "0x0"
+        },
+        "result" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "code" : "0x",
+          "gasUsed" : "0x13a2"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "create"
+      }, {
+        "action" : {
+          "address" : "0x3d49d1ef2ade060a33c6e6aa213513a7ee9a6241",
+          "balance" : "0x0",
+          "refundAddress" : "0x627306090abab3a6e1400e9345bc60c78a8bef57"
+        },
+        "result" : null,
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "suicide"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 100
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1c_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1c_0_vmTrace.json
new file mode 100644
index 00000000000..aad7e8cf61a
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1c_0_vmTrace.json
@@ -0,0 +1,96 @@
+{
+  "comment" : "Self destruct called in constructor with balance being returned to sender (from field)",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf86b8081ef83fffff280809e60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe1ba0392fdcde965c4f2b5149af02fbb43816cb7415bb9d320d48151179f01774d28ba04c52e1e0db0ccc4e1fa11f07e82beb5468af4c061883f9b3bab286167f1b637e", [ "vmTrace" ] ],
+    "id" : 153
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60806040523373ffffffffffffffffffffffffffffffffffffffff16fffe",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x80" ],
+            "store" : null,
+            "used" : 16723719
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x40" ],
+            "store" : null,
+            "used" : 16723716
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 12,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000000000000000000000000080",
+              "off" : 64
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 16723704
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 2,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16723702
+          },
+          "pc" : 5,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xffffffffffffffffffffffffffffffffffffffff" ],
+            "store" : null,
+            "used" : 16723699
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x627306090abab3a6e1400e9345bc60c78a8bef57" ],
+            "store" : null,
+            "used" : 16723696
+          },
+          "pc" : 27,
+          "sub" : null
+        }, {
+          "cost" : 5000,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 16718696
+          },
+          "pc" : 28,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 153
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1d_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1d_0_stateDiff.json
new file mode 100644
index 00000000000..720a9bbbb58
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1d_0_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Stack underflow during contract creation",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf84f8001830119408080836000f11ca0c77fe66bd7dee72c85f3fa03b81de0a5f8ca56e8c20c285cc241bda3dbb78c2fa026479c2a83de1d47ddde7e5d606044927ba7269ca8cf4cce20b1fd3588887c73", [ "stateDiff" ] ],
+    "id" : 48
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18385c1cbde"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27fa4ddb"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 48
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1d_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1d_0_trace.json
new file mode 100644
index 00000000000..0a4deaf9543
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1d_0_trace.json
@@ -0,0 +1,31 @@
+{
+  "comment" : "Stack underflow during contract creation",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf84f8001830119408080836000f11ca0c77fe66bd7dee72c85f3fa03b81de0a5f8ca56e8c20c285cc241bda3dbb78c2fa026479c2a83de1d47ddde7e5d606044927ba7269ca8cf4cce20b1fd3588887c73", [ "trace" ] ],
+    "id" : 101
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0x4a14",
+          "init" : "0x6000f1",
+          "value" : "0x0"
+        },
+        "error" : "Stack underflow",
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 101
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1d_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1d_0_vmTrace.json
new file mode 100644
index 00000000000..503bcdf1912
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1d_0_vmTrace.json
@@ -0,0 +1,33 @@
+{
+  "comment" : "Stack underflow during contract creation",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf84f8001830119408080836000f11ca0c77fe66bd7dee72c85f3fa03b81de0a5f8ca56e8c20c285cc241bda3dbb78c2fa026479c2a83de1d47ddde7e5d606044927ba7269ca8cf4cce20b1fd3588887c73", [ "vmTrace" ] ],
+    "id" : 154
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6000f1",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 18961
+          },
+          "pc" : 0,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 154
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1e_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1e_0_stateDiff.json
new file mode 100644
index 00000000000..31f55356eb6
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1e_0_stateDiff.json
@@ -0,0 +1,59 @@
+{
+  "comment" : "Transaction to test refund_CallToSuicideTwice_d0g0v0_Istanbul",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8808001839896809401600000000000000000000000000000000000000aa000000000000000000000000000000000000000000000000000000000000001f41ca0ac4588a676585985805d4607b85ff0f925f5975d1249f842f1a01e3b910553faa0551434f8fec86b2a8a00f988142c0bf3f0564e313c5e05ba277a64644560af82", [ "stateDiff" ] ],
+    "id" : 49
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18385c111f1"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0160000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xde0b6b3a764000a",
+              "to" : "0xde0b6b3a7640014"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27fb07be"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 49
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1e_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1e_0_trace.json
new file mode 100644
index 00000000000..1ff1abd70b2
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1e_0_trace.json
@@ -0,0 +1,62 @@
+{
+  "comment" : "Transaction to test refund_CallToSuicideTwice_d0g0v0_Istanbul",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8808001839896809401600000000000000000000000000000000000000aa000000000000000000000000000000000000000000000000000000000000001f41ca0ac4588a676585985805d4607b85ff0f925f5975d1249f842f1a01e3b910553faa0551434f8fec86b2a8a00f988142c0bf3f0564e313c5e05ba277a64644560af82", [ "trace" ] ],
+    "id" : 102
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0x9843e0",
+          "input" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
+          "to" : "0x0160000000000000000000000000000000000000",
+          "value" : "0xa"
+        },
+        "result" : {
+          "gasUsed" : "0xcb3",
+          "output" : "0x"
+        },
+        "subtraces" : 2,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0160000000000000000000000000000000000000",
+          "gas" : "0x1f4",
+          "input" : "0x",
+          "to" : "0x0170000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "error" : "Out of gas",
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x0160000000000000000000000000000000000000",
+          "gas" : "0x1f4",
+          "input" : "0x",
+          "to" : "0x0170000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "error" : "Out of gas",
+        "subtraces" : 0,
+        "traceAddress" : [ 1 ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 102
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1e_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1e_0_vmTrace.json
new file mode 100644
index 00000000000..ac31a5e1e5d
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1e_0_vmTrace.json
@@ -0,0 +1,272 @@
+{
+  "comment" : "Transaction to test refund_CallToSuicideTwice_d0g0v0_Istanbul",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8808001839896809401600000000000000000000000000000000000000aa000000000000000000000000000000000000000000000000000000000000001f41ca0ac4588a676585985805d4607b85ff0f925f5975d1249f842f1a01e3b910553faa0551434f8fec86b2a8a00f988142c0bf3f0564e313c5e05ba277a64644560af82", [ "vmTrace" ] ],
+    "id" : 155
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x60006000600060006000730170000000000000000000000000000000000000600035f160005560006000600060006000730170000000000000000000000000000000000000600035f100",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9978845
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9978842
+          },
+          "pc" : 2,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9978839
+          },
+          "pc" : 4,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9978836
+          },
+          "pc" : 6,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9978833
+          },
+          "pc" : 8,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x170000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 9978830
+          },
+          "pc" : 10,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9978827
+          },
+          "pc" : 31,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f4" ],
+            "store" : null,
+            "used" : 9978824
+          },
+          "pc" : 33,
+          "sub" : null
+        }, {
+          "cost" : 1200,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9977624
+          },
+          "pc" : 34,
+          "sub" : {
+            "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff00",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x95e7baea6a6c7c4c2dfeb977efac326af552d87" ],
+                "store" : null,
+                "used" : 497
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 30000,
+              "ex" : null,
+              "pc" : 21,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9977621
+          },
+          "pc" : 35,
+          "sub" : null
+        }, {
+          "cost" : 800,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : {
+              "key" : "0x0",
+              "val" : "0x0"
+            },
+            "used" : 9976821
+          },
+          "pc" : 37,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9976818
+          },
+          "pc" : 38,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9976815
+          },
+          "pc" : 40,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9976812
+          },
+          "pc" : 42,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9976809
+          },
+          "pc" : 44,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9976806
+          },
+          "pc" : 46,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x170000000000000000000000000000000000000" ],
+            "store" : null,
+            "used" : 9976803
+          },
+          "pc" : 48,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9976800
+          },
+          "pc" : 69,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x1f4" ],
+            "store" : null,
+            "used" : 9976797
+          },
+          "pc" : 71,
+          "sub" : null
+        }, {
+          "cost" : 1200,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 9975597
+          },
+          "pc" : 72,
+          "sub" : {
+            "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff00",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x95e7baea6a6c7c4c2dfeb977efac326af552d87" ],
+                "store" : null,
+                "used" : 497
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 30000,
+              "ex" : null,
+              "pc" : 21,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 9975597
+          },
+          "pc" : 73,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 155
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1f_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1f_0_stateDiff.json
new file mode 100644
index 00000000000..d3d76ca16d1
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1f_0_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Call Precompiled contract directly",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294000000000000000000000000000000000000000180801ca06bfb6514dc702ed8d3bcd6e31a32733a7215d574918a9e44fce67dbcffd6f91fa01b5966882a9c81a484f662634dc066c47918ac568e2d80b5ca9d3dc1fa4d6208", [ "stateDiff" ] ],
+    "id" : 50
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183861838de"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x627306090abab3a6e1400e9345bc60c78a8bef57" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xefffffffffffe28d07a0be63b",
+              "to" : "0xefffffffffffe28d079b45ffb"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x17",
+              "to" : "0x18"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 50
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1f_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1f_0_trace.json
new file mode 100644
index 00000000000..3ed43123dc7
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1f_0_trace.json
@@ -0,0 +1,36 @@
+{
+  "comment" : "Call Precompiled contract directly",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294000000000000000000000000000000000000000180801ca06bfb6514dc702ed8d3bcd6e31a32733a7215d574918a9e44fce67dbcffd6f91fa01b5966882a9c81a484f662634dc066c47918ac568e2d80b5ca9d3dc1fa4d6208", [ "trace" ] ],
+    "id" : 103
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+          "gas" : "0xffadea",
+          "input" : "0x",
+          "to" : "0x0000000000000000000000000000000000000001",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0xbb8",
+          "output" : "0x"
+        },
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "call"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 103
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1f_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1f_0_vmTrace.json
new file mode 100644
index 00000000000..4d822043f91
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_1f_0_vmTrace.json
@@ -0,0 +1,23 @@
+{
+  "comment" : "Call Precompiled contract directly",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf8618081ef83fffff294000000000000000000000000000000000000000180801ca06bfb6514dc702ed8d3bcd6e31a32733a7215d574918a9e44fce67dbcffd6f91fa01b5966882a9c81a484f662634dc066c47918ac568e2d80b5ca9d3dc1fa4d6208", [ "vmTrace" ] ],
+    "id" : 156
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x",
+        "ops" : [ ]
+      }
+    },
+    "id" : 156
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_20_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_20_0_stateDiff.json
new file mode 100644
index 00000000000..2ac533cbef3
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_20_0_stateDiff.json
@@ -0,0 +1,59 @@
+{
+  "comment" : "Call to a contract creation that fails with a depth of 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf880801083011fa194018000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba0fe83c0fb93afd79bdd52ede0bd5a42dca96354f89a5fcaec6665ed6ed74e003ca0247aeceb63d540425eac8e6def3ab2cbceab34eb0ac7a4058ebda5d58839284f", [ "stateDiff" ] ],
+    "id" : 51
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f18385d298be"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0x0180000000000000000000000000000000000000" : {
+          "balance" : "=",
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1",
+              "to" : "0x2"
+            }
+          },
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27e980fb"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 51
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_20_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_20_0_trace.json
new file mode 100644
index 00000000000..98fbaf26a77
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_20_0_trace.json
@@ -0,0 +1,47 @@
+{
+  "comment" : "Call to a contract creation that fails with a depth of 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf880801083011fa194018000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba0fe83c0fb93afd79bdd52ede0bd5a42dca96354f89a5fcaec6665ed6ed74e003ca0247aeceb63d540425eac8e6def3ab2cbceab34eb0ac7a4058ebda5d58839284f", [ "trace" ] ],
+    "id" : 104
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "callType" : "call",
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0xcd01",
+          "input" : "0x000000000000000000000000000000000000000000000000000000000000ea60",
+          "to" : "0x0180000000000000000000000000000000000000",
+          "value" : "0x0"
+        },
+        "result" : {
+          "gasUsed" : "0xcbc2",
+          "output" : "0x"
+        },
+        "subtraces" : 1,
+        "traceAddress" : [ ],
+        "type" : "call"
+      }, {
+        "action" : {
+          "from" : "0x0180000000000000000000000000000000000000",
+          "gas" : "0x4eaa",
+          "init" : "0x600c600055602060406000f000",
+          "value" : "0x0"
+        },
+        "error" : "Out of gas",
+        "subtraces" : 0,
+        "traceAddress" : [ 0 ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 104
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_20_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_20_0_vmTrace.json
new file mode 100644
index 00000000000..e8f5eea9b93
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_20_0_vmTrace.json
@@ -0,0 +1,177 @@
+{
+  "comment" : "Call to a contract creation that fails with a depth of 1",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf880801083011fa194018000000000000000000000000000000000000080a0000000000000000000000000000000000000000000000000000000000000ea601ba0fe83c0fb93afd79bdd52ede0bd5a42dca96354f89a5fcaec6665ed6ed74e003ca0247aeceb63d540425eac8e6def3ab2cbceab34eb0ac7a4058ebda5d58839284f", [ "vmTrace" ] ],
+    "id" : 157
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x6b600c600055602060406000f0600052600d60146000f000",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x600c600055602060406000f0" ],
+            "store" : null,
+            "used" : 52478
+          },
+          "pc" : 0,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 52475
+          },
+          "pc" : 13,
+          "sub" : null
+        }, {
+          "cost" : 6,
+          "ex" : {
+            "mem" : {
+              "data" : "0x0000000000000000000000000000000000000000600c600055602060406000f0",
+              "off" : 0
+            },
+            "push" : [ ],
+            "store" : null,
+            "used" : 52469
+          },
+          "pc" : 15,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0xd" ],
+            "store" : null,
+            "used" : 52466
+          },
+          "pc" : 16,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x14" ],
+            "store" : null,
+            "used" : 52463
+          },
+          "pc" : 18,
+          "sub" : null
+        }, {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 52460
+          },
+          "pc" : 20,
+          "sub" : null
+        }, {
+          "cost" : 52141,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x0" ],
+            "store" : null,
+            "used" : 319
+          },
+          "pc" : 22,
+          "sub" : {
+            "code" : "0x600c600055602060406000f000",
+            "ops" : [ {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0xc" ],
+                "store" : null,
+                "used" : 20135
+              },
+              "pc" : 0,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 20132
+              },
+              "pc" : 2,
+              "sub" : null
+            }, {
+              "cost" : 20000,
+              "ex" : {
+                "mem" : null,
+                "push" : [ ],
+                "store" : {
+                  "key" : "0x0",
+                  "val" : "0xc"
+                },
+                "used" : 132
+              },
+              "pc" : 4,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x20" ],
+                "store" : null,
+                "used" : 129
+              },
+              "pc" : 5,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x40" ],
+                "store" : null,
+                "used" : 126
+              },
+              "pc" : 7,
+              "sub" : null
+            }, {
+              "cost" : 3,
+              "ex" : {
+                "mem" : null,
+                "push" : [ "0x0" ],
+                "store" : null,
+                "used" : 123
+              },
+              "pc" : 9,
+              "sub" : null
+            }, {
+              "cost" : 32009,
+              "ex" : null,
+              "pc" : 11,
+              "sub" : null
+            } ]
+          }
+        }, {
+          "cost" : 0,
+          "ex" : {
+            "mem" : null,
+            "push" : [ ],
+            "store" : null,
+            "used" : 319
+          },
+          "pc" : 23,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 157
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_21_0_stateDiff.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_21_0_stateDiff.json
new file mode 100644
index 00000000000..b30d680ecb8
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_21_0_stateDiff.json
@@ -0,0 +1,48 @@
+{
+  "comment" : "Call to a contract creation that fails with a stack underflow",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf85080018347b760808084602af3001ba05fdcab69046b0aa875c5613e95ce0a8d9201c8a46681f2e7424a771252e49749a01c92706a2077ccf458e9ea614c418598707249e090bd67e90a80da574ac8cd6a", [ "stateDiff" ] ],
+    "id" : 52
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : {
+        "0x0000000000000000000000000000000000000000" : {
+          "balance" : {
+            "*" : {
+              "from" : "0x393f0f18385c0b29e",
+              "to" : "0x393f0f183860869fe"
+            }
+          },
+          "code" : "=",
+          "nonce" : "=",
+          "storage" : { }
+        },
+        "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" : {
+          "balance" : {
+            "*" : {
+              "from" : "0xffffffffffffffffffffffffffffffffd27fb671b",
+              "to" : "0xffffffffffffffffffffffffffffffffd27b3afbb"
+            }
+          },
+          "code" : "=",
+          "nonce" : {
+            "*" : {
+              "from" : "0x1e",
+              "to" : "0x1f"
+            }
+          },
+          "storage" : { }
+        }
+      },
+      "trace" : [ ],
+      "vmTrace" : null
+    },
+    "id" : 52
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_21_0_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_21_0_trace.json
new file mode 100644
index 00000000000..a9c786ebf4f
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_21_0_trace.json
@@ -0,0 +1,31 @@
+{
+  "comment" : "Call to a contract creation that fails with a stack underflow",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf85080018347b760808084602af3001ba05fdcab69046b0aa875c5613e95ce0a8d9201c8a46681f2e7424a771252e49749a01c92706a2077ccf458e9ea614c418598707249e090bd67e90a80da574ac8cd6a", [ "trace" ] ],
+    "id" : 105
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ {
+        "action" : {
+          "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+          "gas" : "0x46e824",
+          "init" : "0x602af300",
+          "value" : "0x0"
+        },
+        "error" : "Stack underflow",
+        "subtraces" : 0,
+        "traceAddress" : [ ],
+        "type" : "create"
+      } ],
+      "vmTrace" : null
+    },
+    "id" : 105
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_21_0_vmTrace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_21_0_vmTrace.json
new file mode 100644
index 00000000000..dfe8881216e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-raw-transaction/trace_rawTransaction_21_0_vmTrace.json
@@ -0,0 +1,33 @@
+{
+  "comment" : "Call to a contract creation that fails with a stack underflow",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_rawTransaction",
+    "params" : [ "0xf85080018347b760808084602af3001ba05fdcab69046b0aa875c5613e95ce0a8d9201c8a46681f2e7424a771252e49749a01c92706a2077ccf458e9ea614c418598707249e090bd67e90a80da574ac8cd6a", [ "vmTrace" ] ],
+    "id" : 158
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : {
+      "output" : "0x",
+      "stateDiff" : null,
+      "trace" : [ ],
+      "vmTrace" : {
+        "code" : "0x602af300",
+        "ops" : [ {
+          "cost" : 3,
+          "ex" : {
+            "mem" : null,
+            "push" : [ "0x2a" ],
+            "store" : null,
+            "used" : 4646945
+          },
+          "pc" : 0,
+          "sub" : null
+        } ]
+      }
+    },
+    "id" : 158
+  },
+  "statusCode" : 200
+}
\ No newline at end of file
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-transaction/trace_transaction_0x12.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-transaction/trace_transaction_0x12.json
index d8a15d93104..820ff3266cc 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-transaction/trace_transaction_0x12.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-transaction/trace_transaction_0x12.json
@@ -60,6 +60,7 @@
           "blockHash": "0x220bc13dc4f1ed38dcca927a5be15eca16497d279f4c40d7b8fe9704eadf1464",
           "blockNumber": 18,
           "error": "Reverted",
+          "revertReason": "0x7d88c1856cc95352",
           "subtraces": 0,
           "traceAddress": [],
           "transactionHash": "0xc388baa0e55e6b73e850b22dc7e9853700f6b995fd55d95dd6ccd5a13d63c566",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-transaction/trace_transaction_0x21.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-transaction/trace_transaction_0x21.json
new file mode 100644
index 00000000000..3dde510c73e
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-transaction/trace_transaction_0x21.json
@@ -0,0 +1,38 @@
+{
+  "request": [
+    {
+      "jsonrpc": "2.0",
+      "method": "trace_transaction",
+      "params": [
+        "0xf0378e1bf579b23aff89255d93ade14fe9136a7cedd9c4985e9bec2d18ce65e9"
+      ],
+      "id": 415
+    }
+  ],
+  "response": [
+    {
+      "jsonrpc": "2.0",
+      "result": [
+        {
+          "action": {
+            "creationMethod": "create",
+            "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+            "gas": "0x46e824",
+            "init": "0x602af300",
+            "value": "0x0"
+          },
+          "blockHash": "0x156fa7f1633c5dd82d41b7c7d79049f620b25638ca87da137d13e1a27a210e49",
+          "blockNumber": 33,
+          "error": "Stack underflow",
+          "subtraces": 0,
+          "traceAddress": [],
+          "transactionHash": "0xf0378e1bf579b23aff89255d93ade14fe9136a7cedd9c4985e9bec2d18ce65e9",
+          "transactionPosition": 0,
+          "type": "create"
+        }
+      ],
+      "id": 415
+    }
+  ],
+  "statusCode": 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-transaction/trace_transaction_12_1_trace.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-transaction/trace_transaction_12_1_trace.json
new file mode 100644
index 00000000000..77f2ae40f1b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/trace-transaction/trace_transaction_12_1_trace.json
@@ -0,0 +1,33 @@
+{
+  "comment" : "Revert. Note revertReason has been manually added to the response because OpenEthereum does not include it.",
+  "request" : {
+    "jsonrpc" : "2.0",
+    "method" : "trace_transaction",
+    "params" : [ "0xc388baa0e55e6b73e850b22dc7e9853700f6b995fd55d95dd6ccd5a13d63c566" ],
+    "id" : 155
+  },
+  "response" : {
+    "jsonrpc" : "2.0",
+    "result" : [ {
+      "action" : {
+        "callType" : "call",
+        "from" : "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
+        "gas" : "0xffadea",
+        "input" : "0x",
+        "to" : "0x0110000000000000000000000000000000000000",
+        "value" : "0x0"
+      },
+      "blockHash" : "0x220bc13dc4f1ed38dcca927a5be15eca16497d279f4c40d7b8fe9704eadf1464",
+      "blockNumber" : 18,
+      "error" : "Reverted",
+      "revertReason" : "0x7d88c1856cc95352",
+      "subtraces" : 0,
+      "traceAddress" : [ ],
+      "transactionHash" : "0xc388baa0e55e6b73e850b22dc7e9853700f6b995fd55d95dd6ccd5a13d63c566",
+      "transactionPosition" : 1,
+      "type" : "call"
+    } ],
+    "id" : 155
+  },
+  "statusCode" : 200
+}
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/jwt.hex b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/jwt.hex
new file mode 100644
index 00000000000..24eabc6977b
--- /dev/null
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/jwt.hex
@@ -0,0 +1 @@
+9465710175a93a3f2d67b0cb98d92d44ead4d1126a12233571884de92a8edc76
\ No newline at end of file
diff --git a/ethereum/blockcreation/build.gradle b/ethereum/blockcreation/build.gradle
index 129d6e5bcf7..6ab57e51315 100644
--- a/ethereum/blockcreation/build.gradle
+++ b/ethereum/blockcreation/build.gradle
@@ -14,16 +14,18 @@ jar {
 
 dependencies {
   implementation project(':config')
-  implementation project(':crypto')
+  implementation project(':crypto:algorithms')
+  implementation project(':datatypes')
   implementation project(':ethereum:core')
   implementation project(':ethereum:eth')
+  implementation project(':evm')
   implementation project(':services:kvstore')
   implementation project(':util')
 
   implementation 'com.google.guava:guava'
   implementation 'io.vertx:vertx-core'
-  implementation 'org.apache.tuweni:bytes'
-  implementation 'org.apache.tuweni:units'
+  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-units'
 
   testImplementation project(path: ':config', configuration: 'testSupportArtifacts')
   testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts')
@@ -32,8 +34,13 @@ dependencies {
   testImplementation project(':metrics:core')
   testImplementation project(':testutil')
 
+  testImplementation 'com.fasterxml.jackson.core:jackson-databind'
   testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.awaitility:awaitility'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
+  testImplementation 'org.mockito:mockito-junit-jupiter'
   testImplementation 'org.mockito:mockito-core'
+
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 }
diff --git a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreator.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreator.java
index be74a6b1e1a..5f4af0bf49d 100644
--- a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreator.java
+++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,32 +14,41 @@
  */
 package org.hyperledger.besu.ethereum.blockcreation;
 
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.DataGas;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.ethereum.blockcreation.BlockTransactionSelector.TransactionSelectionResults;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
 import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.core.Deposit;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.EvmAccount;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
 import org.hyperledger.besu.ethereum.core.SealableBlockHeader;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.core.fees.EIP1559;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+import org.hyperledger.besu.ethereum.core.encoding.DepositDecoder;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
 import org.hyperledger.besu.ethereum.mainnet.AbstractBlockProcessor;
 import org.hyperledger.besu.ethereum.mainnet.BodyValidation;
+import org.hyperledger.besu.ethereum.mainnet.DepositsValidator;
 import org.hyperledger.besu.ethereum.mainnet.DifficultyCalculator;
 import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.mainnet.WithdrawalsProcessor;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.evm.account.EvmAccount;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+import org.hyperledger.besu.plugin.data.TransactionType;
+import org.hyperledger.besu.plugin.services.exception.StorageException;
 import org.hyperledger.besu.plugin.services.securitymodule.SecurityModuleException;
 
 import java.math.BigInteger;
@@ -47,11 +56,14 @@
 import java.util.Optional;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Supplier;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class AbstractBlockCreator implements AsyncBlockCreator {
 
@@ -60,11 +72,11 @@ public interface ExtraDataCalculator {
     Bytes get(final BlockHeader parent);
   }
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractBlockCreator.class);
 
   protected final Address coinbase;
-
-  private final GasLimitCalculator gasLimitCalculator;
+  private final MiningBeneficiaryCalculator miningBeneficiaryCalculator;
+  protected final Supplier<Optional<Long>> targetGasLimitSupplier;
 
   private final ExtraDataCalculator extraDataCalculator;
   private final PendingTransactions pendingTransactions;
@@ -73,34 +85,34 @@ public interface ExtraDataCalculator {
   protected final BlockHeaderFunctions blockHeaderFunctions;
   private final Wei minTransactionGasPrice;
   private final Double minBlockOccupancyRatio;
-  private final Address miningBeneficiary;
   protected final BlockHeader parentHeader;
-  protected final ProtocolSpec protocolSpec;
+  private final Optional<Address> depositContractAddress;
 
   private final AtomicBoolean isCancelled = new AtomicBoolean(false);
 
   protected AbstractBlockCreator(
       final Address coinbase,
+      final MiningBeneficiaryCalculator miningBeneficiaryCalculator,
+      final Supplier<Optional<Long>> targetGasLimitSupplier,
       final ExtraDataCalculator extraDataCalculator,
       final PendingTransactions pendingTransactions,
       final ProtocolContext protocolContext,
       final ProtocolSchedule protocolSchedule,
-      final GasLimitCalculator gasLimitCalculator,
       final Wei minTransactionGasPrice,
-      final Address miningBeneficiary,
       final Double minBlockOccupancyRatio,
-      final BlockHeader parentHeader) {
+      final BlockHeader parentHeader,
+      final Optional<Address> depositContractAddress) {
     this.coinbase = coinbase;
+    this.miningBeneficiaryCalculator = miningBeneficiaryCalculator;
+    this.targetGasLimitSupplier = targetGasLimitSupplier;
     this.extraDataCalculator = extraDataCalculator;
     this.pendingTransactions = pendingTransactions;
     this.protocolContext = protocolContext;
     this.protocolSchedule = protocolSchedule;
-    this.gasLimitCalculator = gasLimitCalculator;
     this.minTransactionGasPrice = minTransactionGasPrice;
     this.minBlockOccupancyRatio = minBlockOccupancyRatio;
-    this.miningBeneficiary = miningBeneficiary;
     this.parentHeader = parentHeader;
-    this.protocolSpec = protocolSchedule.getByBlockNumber(parentHeader.getNumber() + 1);
+    this.depositContractAddress = depositContractAddress;
     blockHeaderFunctions = ScheduleBasedBlockHeaderFunctions.create(protocolSchedule);
   }
 
@@ -122,53 +134,104 @@ protected AbstractBlockCreator(
    * @return a block with appropriately selected transactions, seals and ommers.
    */
   @Override
-  public Block createBlock(final long timestamp) {
+  public BlockCreationResult createBlock(final long timestamp) {
     return createBlock(Optional.empty(), Optional.empty(), timestamp);
   }
 
   @Override
-  public Block createBlock(
+  public BlockCreationResult createBlock(
       final List<Transaction> transactions, final List<BlockHeader> ommers, final long timestamp) {
     return createBlock(Optional.of(transactions), Optional.of(ommers), timestamp);
   }
 
-  private Block createBlock(
+  @Override
+  public BlockCreationResult createBlock(
       final Optional<List<Transaction>> maybeTransactions,
       final Optional<List<BlockHeader>> maybeOmmers,
       final long timestamp) {
-    try {
-      final ProcessableBlockHeader processableBlockHeader = createPendingBlockHeader(timestamp);
+    return createBlock(
+        maybeTransactions, maybeOmmers, Optional.empty(), Optional.empty(), timestamp, true);
+  }
+
+  protected BlockCreationResult createBlock(
+      final Optional<List<Transaction>> maybeTransactions,
+      final Optional<List<BlockHeader>> maybeOmmers,
+      final Optional<List<Withdrawal>> maybeWithdrawals,
+      final Optional<Bytes32> maybePrevRandao,
+      final long timestamp,
+      boolean rewardCoinbase) {
+
+    try (final MutableWorldState disposableWorldState = duplicateWorldStateAtParent()) {
+      final ProtocolSpec newProtocolSpec =
+          protocolSchedule.getForNextBlockHeader(parentHeader, timestamp);
+
+      final ProcessableBlockHeader processableBlockHeader =
+          createPendingBlockHeader(timestamp, maybePrevRandao, newProtocolSpec);
+      final Address miningBeneficiary =
+          miningBeneficiaryCalculator.getMiningBeneficiary(processableBlockHeader.getNumber());
+      final Wei dataGasPrice =
+          newProtocolSpec
+              .getFeeMarket()
+              .dataPrice(parentHeader.getExcessDataGas().orElse(DataGas.ZERO));
 
       throwIfStopped();
 
-      final MutableWorldState disposableWorldState = duplicateWorldStateAtParent();
+      final List<BlockHeader> ommers = maybeOmmers.orElse(selectOmmers());
 
       throwIfStopped();
+      final TransactionSelectionResults transactionResults =
+          selectTransactions(
+              processableBlockHeader,
+              disposableWorldState,
+              maybeTransactions,
+              miningBeneficiary,
+              dataGasPrice,
+              newProtocolSpec);
 
-      final List<BlockHeader> ommers = maybeOmmers.orElse(selectOmmers());
+      transactionResults.logSelectionStats();
 
       throwIfStopped();
 
-      final BlockTransactionSelector.TransactionSelectionResults transactionResults =
-          selectTransactions(processableBlockHeader, disposableWorldState, maybeTransactions);
+      final Optional<WithdrawalsProcessor> maybeWithdrawalsProcessor =
+          newProtocolSpec.getWithdrawalsProcessor();
+      final boolean withdrawalsCanBeProcessed =
+          maybeWithdrawalsProcessor.isPresent() && maybeWithdrawals.isPresent();
+      if (withdrawalsCanBeProcessed) {
+        maybeWithdrawalsProcessor
+            .get()
+            .processWithdrawals(maybeWithdrawals.get(), disposableWorldState.updater());
+      }
 
       throwIfStopped();
 
-      final ProtocolSpec protocolSpec =
-          protocolSchedule.getByBlockNumber(processableBlockHeader.getNumber());
+      final DepositsValidator depositsValidator = newProtocolSpec.getDepositsValidator();
+      Optional<List<Deposit>> maybeDeposits = Optional.empty();
+      if (depositsValidator instanceof DepositsValidator.AllowedDeposits
+          && depositContractAddress.isPresent()) {
+        maybeDeposits = Optional.of(findDepositsFromReceipts(transactionResults));
+      }
+
+      throwIfStopped();
 
-      if (!rewardBeneficiary(
-          disposableWorldState,
-          processableBlockHeader,
-          ommers,
-          protocolSpec.getBlockReward(),
-          protocolSpec.isSkipZeroBlockRewards())) {
+      if (rewardCoinbase
+          && !rewardBeneficiary(
+              disposableWorldState,
+              processableBlockHeader,
+              ommers,
+              miningBeneficiary,
+              newProtocolSpec.getBlockReward(),
+              newProtocolSpec.isSkipZeroBlockRewards(),
+              newProtocolSpec)) {
         LOG.trace("Failed to apply mining reward, exiting.");
         throw new RuntimeException("Failed to apply mining reward.");
       }
 
       throwIfStopped();
 
+      final DataGas newExcessDataGas = computeExcessDataGas(transactionResults, newProtocolSpec);
+
+      throwIfStopped();
+
       final SealableBlockHeader sealableBlockHeader =
           BlockHeaderBuilder.create()
               .populateFrom(processableBlockHeader)
@@ -178,30 +241,71 @@ private Block createBlock(
                   BodyValidation.transactionsRoot(transactionResults.getTransactions()))
               .receiptsRoot(BodyValidation.receiptsRoot(transactionResults.getReceipts()))
               .logsBloom(BodyValidation.logsBloom(transactionResults.getReceipts()))
-              .gasUsed(transactionResults.getTotalCumulativeGasUsed())
+              .gasUsed(transactionResults.getCumulativeGasUsed())
               .extraData(extraDataCalculator.get(parentHeader))
+              .withdrawalsRoot(
+                  withdrawalsCanBeProcessed
+                      ? BodyValidation.withdrawalsRoot(maybeWithdrawals.get())
+                      : null)
+              .depositsRoot(maybeDeposits.map(BodyValidation::depositsRoot).orElse(null))
+              .excessDataGas(newExcessDataGas)
               .buildSealableBlockHeader();
 
       final BlockHeader blockHeader = createFinalBlockHeader(sealableBlockHeader);
 
-      return new Block(blockHeader, new BlockBody(transactionResults.getTransactions(), ommers));
+      final Optional<List<Withdrawal>> withdrawals =
+          withdrawalsCanBeProcessed ? maybeWithdrawals : Optional.empty();
+      final Block block =
+          new Block(
+              blockHeader,
+              new BlockBody(
+                  transactionResults.getTransactions(), ommers, withdrawals, maybeDeposits));
+      return new BlockCreationResult(block, transactionResults);
     } catch (final SecurityModuleException ex) {
-      LOG.warn("Failed to create block signature.", ex);
-      throw ex;
-    } catch (final CancellationException ex) {
-      LOG.trace("Attempt to create block was interrupted.");
+      throw new IllegalStateException("Failed to create block signature", ex);
+    } catch (final CancellationException | StorageException ex) {
       throw ex;
     } catch (final Exception ex) {
-      // TODO(tmm): How are we going to know this has exploded, and thus restart it?
-      LOG.trace("Block creation failed unexpectedly. Will restart on next block added to chain.");
-      throw ex;
+      throw new IllegalStateException(
+          "Block creation failed unexpectedly. Will restart on next block added to chain.", ex);
+    }
+  }
+
+  @VisibleForTesting
+  List<Deposit> findDepositsFromReceipts(final TransactionSelectionResults transactionResults) {
+    return transactionResults.getReceipts().stream()
+        .flatMap(receipt -> receipt.getLogsList().stream())
+        .filter(log -> depositContractAddress.get().equals(log.getLogger()))
+        .map(DepositDecoder::decodeFromLog)
+        .toList();
+  }
+
+  private DataGas computeExcessDataGas(
+      TransactionSelectionResults transactionResults, ProtocolSpec newProtocolSpec) {
+
+    if (newProtocolSpec.getFeeMarket().implementsDataFee()) {
+      final var gasCalculator = newProtocolSpec.getGasCalculator();
+      final int newBlobsCount =
+          transactionResults.getTransactionsByType(TransactionType.BLOB).stream()
+              .map(tx -> tx.getVersionedHashes().orElseThrow())
+              .mapToInt(List::size)
+              .sum();
+      // casting parent excess data gas to long since for the moment it should be well below that
+      // limit
+      return DataGas.of(
+          gasCalculator.computeExcessDataGas(
+              parentHeader.getExcessDataGas().map(DataGas::toLong).orElse(0L), newBlobsCount));
     }
+    return null;
   }
 
-  private BlockTransactionSelector.TransactionSelectionResults selectTransactions(
+  private TransactionSelectionResults selectTransactions(
       final ProcessableBlockHeader processableBlockHeader,
       final MutableWorldState disposableWorldState,
-      final Optional<List<Transaction>> transactions)
+      final Optional<List<Transaction>> transactions,
+      final Address miningBeneficiary,
+      final Wei dataGasPrice,
+      final ProtocolSpec protocolSpec)
       throws RuntimeException {
     final MainnetTransactionProcessor transactionProcessor = protocolSpec.getTransactionProcessor();
 
@@ -220,65 +324,70 @@ private BlockTransactionSelector.TransactionSelectionResults selectTransactions(
             minBlockOccupancyRatio,
             isCancelled::get,
             miningBeneficiary,
-            protocolSpec.getTransactionPriceCalculator(),
-            protocolSpec.getGasBudgetCalculator(),
-            protocolSpec.getEip1559());
+            dataGasPrice,
+            protocolSpec.getFeeMarket(),
+            protocolSpec.getGasCalculator(),
+            protocolSpec.getGasLimitCalculator(),
+            protocolContext.getTransactionSelectorFactory());
 
     if (transactions.isPresent()) {
-      return selector.evaluateTransactions(
-          processableBlockHeader.getNumber(),
-          processableBlockHeader.getGasLimit(),
-          transactions.get());
+      return selector.evaluateTransactions(transactions.get());
     } else {
-      return selector.buildTransactionListForBlock(
-          processableBlockHeader.getNumber(), processableBlockHeader.getGasLimit());
+      return selector.buildTransactionListForBlock();
     }
   }
 
   private MutableWorldState duplicateWorldStateAtParent() {
     final Hash parentStateRoot = parentHeader.getStateRoot();
-    final MutableWorldState worldState =
-        protocolContext
-            .getWorldStateArchive()
-            .getMutable(parentStateRoot)
-            .orElseThrow(
-                () -> {
-                  LOG.info("Unable to create block because world state is not available");
-                  return new IllegalStateException(
-                      "World state not available for block "
-                          + parentHeader.getNumber()
-                          + " with state root "
-                          + parentStateRoot);
-                });
-
-    return worldState.copy();
+    return protocolContext
+        .getWorldStateArchive()
+        .getMutable(parentHeader, false)
+        .orElseThrow(
+            () -> {
+              LOG.info("Unable to create block because world state is not available");
+              return new CancellationException(
+                  "World state not available for block "
+                      + parentHeader.getNumber()
+                      + " with state root "
+                      + parentStateRoot);
+            });
   }
 
   private List<BlockHeader> selectOmmers() {
     return Lists.newArrayList();
   }
 
-  private ProcessableBlockHeader createPendingBlockHeader(final long timestamp) {
+  private ProcessableBlockHeader createPendingBlockHeader(
+      final long timestamp,
+      final Optional<Bytes32> maybePrevRandao,
+      final ProtocolSpec protocolSpec) {
     final long newBlockNumber = parentHeader.getNumber() + 1;
-    final long gasLimit = gasLimitCalculator.nextGasLimit(parentHeader.getGasLimit());
+    long gasLimit =
+        protocolSpec
+            .getGasLimitCalculator()
+            .nextGasLimit(
+                parentHeader.getGasLimit(),
+                targetGasLimitSupplier.get().orElse(parentHeader.getGasLimit()),
+                newBlockNumber);
+
     final DifficultyCalculator difficultyCalculator = protocolSpec.getDifficultyCalculator();
     final BigInteger difficulty =
         difficultyCalculator.nextDifficulty(timestamp, parentHeader, protocolContext);
 
-    Long baseFee = null;
-    if (ExperimentalEIPs.eip1559Enabled && protocolSpec.isEip1559()) {
-      final EIP1559 eip1559 = protocolSpec.getEip1559().orElseThrow();
-      if (eip1559.isForkBlock(newBlockNumber)) {
-        baseFee = eip1559.getFeeMarket().getInitialBasefee();
-      } else {
-        baseFee =
-            eip1559.computeBaseFee(
-                newBlockNumber,
-                parentHeader.getBaseFee().orElseThrow(),
-                parentHeader.getGasUsed(),
-                eip1559.targetGasUsed(parentHeader));
-      }
-    }
+    final Wei baseFee =
+        Optional.of(protocolSpec.getFeeMarket())
+            .filter(FeeMarket::implementsBaseFee)
+            .map(BaseFeeMarket.class::cast)
+            .map(
+                feeMarket ->
+                    feeMarket.computeBaseFee(
+                        newBlockNumber,
+                        parentHeader.getBaseFee().orElse(Wei.ZERO),
+                        parentHeader.getGasUsed(),
+                        feeMarket.targetGasUsed(parentHeader)))
+            .orElse(null);
+
+    final Bytes32 prevRandao = maybePrevRandao.orElse(null);
     return BlockHeaderBuilder.create()
         .parentHash(parentHeader.getHash())
         .coinbase(coinbase)
@@ -287,6 +396,7 @@ private ProcessableBlockHeader createPendingBlockHeader(final long timestamp) {
         .gasLimit(gasLimit)
         .timestamp(timestamp)
         .baseFee(baseFee)
+        .prevRandao(prevRandao)
         .buildProcessableBlockHeader();
   }
 
@@ -311,8 +421,10 @@ boolean rewardBeneficiary(
       final MutableWorldState worldState,
       final ProcessableBlockHeader header,
       final List<BlockHeader> ommers,
+      final Address miningBeneficiary,
       final Wei blockReward,
-      final boolean skipZeroBlockRewards) {
+      final boolean skipZeroBlockRewards,
+      final ProtocolSpec protocolSpec) {
 
     // TODO(tmm): Added to make this work, should come from blockProcessor.
     final int MAX_GENERATION = 6;
@@ -353,4 +465,9 @@ boolean rewardBeneficiary(
 
   protected abstract BlockHeader createFinalBlockHeader(
       final SealableBlockHeader sealableBlockHeader);
+
+  @FunctionalInterface
+  protected interface MiningBeneficiaryCalculator {
+    Address getMiningBeneficiary(long blockNumber);
+  }
 }
diff --git a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMinerExecutor.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMinerExecutor.java
index 75db3d03648..83b9860d15a 100644
--- a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMinerExecutor.java
+++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMinerExecutor.java
@@ -14,14 +14,15 @@
  */
 package org.hyperledger.besu.ethereum.blockcreation;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.chain.EthHashObserver;
 import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.ethereum.chain.PoWObserver;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.mainnet.AbstractGasLimitSpecification;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.util.Subscribers;
 
@@ -31,25 +32,26 @@
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class AbstractMinerExecutor<M extends BlockMiner<? extends AbstractBlockCreator>> {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractMinerExecutor.class);
 
   private final ExecutorService executorService = Executors.newCachedThreadPool();
   protected final ProtocolContext protocolContext;
   protected final ProtocolSchedule protocolSchedule;
   protected final PendingTransactions pendingTransactions;
   protected final AbstractBlockScheduler blockScheduler;
-  protected final GasLimitCalculator gasLimitCalculator;
 
   protected volatile Bytes extraData;
   protected volatile Wei minTransactionGasPrice;
   protected volatile Double minBlockOccupancyRatio;
+  protected volatile Optional<AtomicLong> targetGasLimit;
 
   private final AtomicBoolean stopped = new AtomicBoolean(false);
 
@@ -58,21 +60,20 @@ protected AbstractMinerExecutor(
       final ProtocolSchedule protocolSchedule,
       final PendingTransactions pendingTransactions,
       final MiningParameters miningParams,
-      final AbstractBlockScheduler blockScheduler,
-      final GasLimitCalculator gasLimitCalculator) {
+      final AbstractBlockScheduler blockScheduler) {
     this.protocolContext = protocolContext;
     this.protocolSchedule = protocolSchedule;
     this.pendingTransactions = pendingTransactions;
     this.extraData = miningParams.getExtraData();
     this.minTransactionGasPrice = miningParams.getMinTransactionGasPrice();
     this.blockScheduler = blockScheduler;
-    this.gasLimitCalculator = gasLimitCalculator;
     this.minBlockOccupancyRatio = miningParams.getMinBlockOccupancyRatio();
+    this.targetGasLimit = miningParams.getTargetGasLimit();
   }
 
   public Optional<M> startAsyncMining(
       final Subscribers<MinedBlockObserver> observers,
-      final Subscribers<EthHashObserver> ethHashObservers,
+      final Subscribers<PoWObserver> ethHashObservers,
       final BlockHeader parentHeader) {
     try {
       final M currentRunningMiner = createMiner(observers, ethHashObservers, parentHeader);
@@ -98,7 +99,7 @@ public void awaitShutdown() throws InterruptedException {
 
   public abstract M createMiner(
       final Subscribers<MinedBlockObserver> subscribers,
-      final Subscribers<EthHashObserver> ethHashObservers,
+      final Subscribers<PoWObserver> ethHashObservers,
       final BlockHeader parentHeader);
 
   public void setExtraData(final Bytes extraData) {
@@ -115,7 +116,13 @@ public Wei getMinTransactionGasPrice() {
 
   public abstract Optional<Address> getCoinbase();
 
-  public void changeTargetGasLimit(final Long targetGasLimit) {
-    gasLimitCalculator.changeTargetGasLimit(targetGasLimit);
+  public void changeTargetGasLimit(final Long newTargetGasLimit) {
+    if (AbstractGasLimitSpecification.isValidTargetGasLimit(newTargetGasLimit)) {
+      this.targetGasLimit.ifPresentOrElse(
+          existing -> existing.set(newTargetGasLimit),
+          () -> this.targetGasLimit = Optional.of(new AtomicLong(newTargetGasLimit)));
+    } else {
+      throw new UnsupportedOperationException("Specified target gas limit is invalid");
+    }
   }
 }
diff --git a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMiningCoordinator.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMiningCoordinator.java
index 6c373ad584d..43475bc58b6 100644
--- a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMiningCoordinator.java
+++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMiningCoordinator.java
@@ -14,22 +14,23 @@
  */
 package org.hyperledger.besu.ethereum.blockcreation;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
 import org.hyperledger.besu.ethereum.chain.BlockAddedObserver;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.chain.EthHashObserver;
 import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.ethereum.chain.PoWObserver;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
 import org.hyperledger.besu.util.Subscribers;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.apache.tuweni.bytes.Bytes;
 
@@ -44,9 +45,11 @@ private enum State {
   }
 
   private final Subscribers<MinedBlockObserver> minedBlockObservers = Subscribers.create();
-  private final Subscribers<EthHashObserver> ethHashObservers = Subscribers.create();
+  private final Subscribers<PoWObserver> ethHashObservers = Subscribers.create();
   private final AbstractMinerExecutor<M> executor;
   private final SyncState syncState;
+  private final AtomicReference<Optional<Long>> remineOnNewHeadListenerId =
+      new AtomicReference<>(Optional.empty());
   protected final Blockchain blockchain;
 
   private State state = State.IDLE;
@@ -60,7 +63,6 @@ protected AbstractMiningCoordinator(
     this.executor = executor;
     this.blockchain = blockchain;
     this.syncState = syncState;
-    this.blockchain.observeBlockAdded(this);
     syncState.subscribeInSync(this::inSyncChanged);
   }
 
@@ -70,7 +72,13 @@ public Optional<Block> createBlock(
       final List<Transaction> transactions,
       final List<BlockHeader> ommers) {
     final M miner = executor.createMiner(minedBlockObservers, ethHashObservers, parentHeader);
-    return Optional.of(miner.createBlock(parentHeader, transactions, ommers));
+    return Optional.of(miner.createBlock(parentHeader, transactions, ommers).getBlock());
+  }
+
+  @Override
+  public Optional<Block> createBlock(final BlockHeader parentHeader, final long timestamp) {
+    final M miner = executor.createMiner(minedBlockObservers, ethHashObservers, parentHeader);
+    return Optional.of(miner.createBlock(parentHeader, timestamp).getBlock());
   }
 
   @Override
@@ -87,11 +95,10 @@ public void start() {
   @Override
   public void stop() {
     synchronized (this) {
-      if (state != State.RUNNING) {
-        return;
+      if (state == State.RUNNING) {
+        haltCurrentMiningOperation();
       }
       state = State.STOPPED;
-      haltCurrentMiningOperation();
       executor.shutDown();
     }
   }
@@ -108,6 +115,7 @@ public boolean enable() {
         return true;
       }
       isEnabled = true;
+      remineOnNewHeadListenerId.set(Optional.of(blockchain.observeBlockAdded(this)));
       startMiningIfPossible();
     }
     return true;
@@ -120,6 +128,7 @@ public boolean disable() {
         return false;
       }
       isEnabled = false;
+      remineOnNewHeadListenerId.get().ifPresent(blockchain::removeObserver);
       haltCurrentMiningOperation();
     }
     return false;
@@ -189,7 +198,7 @@ public void addMinedBlockObserver(final MinedBlockObserver obs) {
   }
 
   @Override
-  public void addEthHashObserver(final EthHashObserver obs) {
+  public void addEthHashObserver(final PoWObserver obs) {
     ethHashObservers.subscribe(obs);
   }
 
diff --git a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockCreator.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockCreator.java
index 1160ca20914..c82d96fa858 100644
--- a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockCreator.java
+++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockCreator.java
@@ -14,15 +14,41 @@
  */
 package org.hyperledger.besu.ethereum.blockcreation;
 
+import org.hyperledger.besu.ethereum.blockcreation.BlockTransactionSelector.TransactionSelectionResults;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Transaction;
 
 import java.util.List;
+import java.util.Optional;
 
 public interface BlockCreator {
-  Block createBlock(final long timestamp);
+  class BlockCreationResult {
+    private final Block block;
+    private final TransactionSelectionResults transactionSelectionResults;
 
-  Block createBlock(
+    public BlockCreationResult(
+        final Block block, final TransactionSelectionResults transactionSelectionResults) {
+      this.block = block;
+      this.transactionSelectionResults = transactionSelectionResults;
+    }
+
+    public Block getBlock() {
+      return block;
+    }
+
+    public TransactionSelectionResults getTransactionSelectionResults() {
+      return transactionSelectionResults;
+    }
+  }
+
+  BlockCreationResult createBlock(final long timestamp);
+
+  BlockCreationResult createBlock(
       final List<Transaction> transactions, final List<BlockHeader> ommers, final long timestamp);
+
+  BlockCreationResult createBlock(
+      final Optional<List<Transaction>> maybeTransactions,
+      final Optional<List<BlockHeader>> maybeOmmers,
+      final long timestamp);
 }
diff --git a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockMiner.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockMiner.java
index 495a742fd52..ccbfb52ab6a 100644
--- a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockMiner.java
+++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockMiner.java
@@ -15,23 +15,26 @@
 package org.hyperledger.besu.ethereum.blockcreation;
 
 import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.blockcreation.BlockCreator.BlockCreationResult;
 import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockImporter;
 import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.mainnet.BlockImportResult;
 import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.util.Subscribers;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
 import com.google.common.base.Stopwatch;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Responsible for creating a block, and importing it to the blockchain. This is specifically a
@@ -45,7 +48,7 @@
  */
 public class BlockMiner<M extends AbstractBlockCreator> implements Runnable {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(BlockMiner.class);
 
   protected final Function<BlockHeader, M> blockCreatorFactory;
   protected final M minerBlockCreator;
@@ -102,7 +105,7 @@ public void run() {
    * @param ommers The list of ommers to include.
    * @return the newly created block.
    */
-  public Block createBlock(
+  public BlockCreationResult createBlock(
       final BlockHeader parentHeader,
       final List<Transaction> transactions,
       final List<BlockHeader> ommers) {
@@ -111,6 +114,18 @@ public Block createBlock(
     return blockCreator.createBlock(transactions, ommers, timestamp);
   }
 
+  /**
+   * Create a block with the given timestamp.
+   *
+   * @param parentHeader The header of the parent of the block to be produced
+   * @param timestamp unix timestamp of the new block.
+   * @return the newly created block.
+   */
+  public BlockCreationResult createBlock(final BlockHeader parentHeader, final long timestamp) {
+    final BlockCreator blockCreator = this.blockCreatorFactory.apply(parentHeader);
+    return blockCreator.createBlock(Optional.empty(), Optional.empty(), timestamp);
+  }
+
   protected boolean mineBlock() throws InterruptedException {
     // Ensure the block is allowed to be mined - i.e. the timestamp on the new block is sufficiently
     // ahead of the parent, and still within allowable clock tolerance.
@@ -120,16 +135,16 @@ protected boolean mineBlock() throws InterruptedException {
 
     final Stopwatch stopwatch = Stopwatch.createStarted();
     LOG.trace("Mining a new block with timestamp {}", newBlockTimestamp);
-    final Block block = minerBlockCreator.createBlock(newBlockTimestamp);
+    final Block block = minerBlockCreator.createBlock(newBlockTimestamp).getBlock();
     LOG.trace(
         "Block created, importing to local chain, block includes {} transactions",
         block.getBody().getTransactions().size());
 
     final BlockImporter importer =
-        protocolSchedule.getByBlockNumber(block.getHeader().getNumber()).getBlockImporter();
-    final boolean blockImported =
+        protocolSchedule.getByBlockHeader(block.getHeader()).getBlockImporter();
+    final BlockImportResult blockImportResult =
         importer.importBlock(protocolContext, block, HeaderValidationMode.FULL);
-    if (blockImported) {
+    if (blockImportResult.isImported()) {
       notifyNewBlockListeners(block);
       final double taskTimeInSec = stopwatch.elapsed(TimeUnit.MILLISECONDS) / 1000.0;
       LOG.info(
@@ -146,7 +161,7 @@ protected boolean mineBlock() throws InterruptedException {
       LOG.error("Illegal block mined, could not be imported to local chain.");
     }
 
-    return blockImported;
+    return blockImportResult.isImported();
   }
 
   public void cancel() {
diff --git a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockTransactionSelector.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockTransactionSelector.java
index c52b893bd8a..88a2fc4573d 100644
--- a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockTransactionSelector.java
+++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockTransactionSelector.java
@@ -14,34 +14,47 @@
  */
 package org.hyperledger.besu.ethereum.blockcreation;
 
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.ethereum.core.LogsWrapper;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.core.fees.EIP1559;
-import org.hyperledger.besu.ethereum.core.fees.TransactionGasBudgetCalculator;
-import org.hyperledger.besu.ethereum.core.fees.TransactionPriceCalculator;
 import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionSelectionResult;
 import org.hyperledger.besu.ethereum.mainnet.AbstractBlockProcessor;
 import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
 import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
+import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
 import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
+import org.hyperledger.besu.ethereum.vm.CachingBlockHashLookup;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+import org.hyperledger.besu.plugin.data.TransactionSelectionResult;
 import org.hyperledger.besu.plugin.data.TransactionType;
+import org.hyperledger.besu.plugin.services.txselection.TransactionSelector;
+import org.hyperledger.besu.plugin.services.txselection.TransactionSelectorFactory;
 
+import java.util.ArrayList;
+import java.util.EnumMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.CancellationException;
+import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 import com.google.common.collect.Lists;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Responsible for extracting transactions from PendingTransactions and determining if the
@@ -51,7 +64,7 @@
  * <p>If a transaction is suitable for inclusion, the world state must be updated, and a receipt
  * generated.
  *
- * <p>The output from this class's exeuction will be:
+ * <p>The output from this class's execution will be:
  *
  * <ul>
  *   <li>A list of transactions to include in the block being constructed.
@@ -65,49 +78,142 @@
  */
 public class BlockTransactionSelector {
 
-  private final Wei minTransactionGasPrice;
-  private final Double minBlockOccupancyRatio;
+  public record TransactionValidationResult(
+      Transaction transaction, ValidationResult<TransactionInvalidReason> validationResult) {}
 
   public static class TransactionSelectionResults {
-
     private final List<Transaction> transactions = Lists.newArrayList();
+    private final Map<TransactionType, List<Transaction>> transactionsByType =
+        new EnumMap<>(TransactionType.class);
     private final List<TransactionReceipt> receipts = Lists.newArrayList();
-    private long frontierCumulativeGasUsed = 0;
-    private long eip1559CumulativeGasUsed = 0;
+    private final List<TransactionValidationResult> invalidTransactions = Lists.newArrayList();
+    private final List<TransactionSelectionResult> selectionResults = Lists.newArrayList();
+    private long cumulativeGasUsed = 0;
+    private long cumulativeDataGasUsed = 0;
 
     private void update(
-        final Transaction transaction, final TransactionReceipt receipt, final long gasUsed) {
+        final Transaction transaction,
+        final TransactionReceipt receipt,
+        final long gasUsed,
+        final long dataGasUsed) {
       transactions.add(transaction);
+      transactionsByType
+          .computeIfAbsent(transaction.getType(), type -> new ArrayList<>())
+          .add(transaction);
       receipts.add(receipt);
-      if (ExperimentalEIPs.eip1559Enabled
-          && transaction.getType().equals(TransactionType.EIP1559)) {
-        eip1559CumulativeGasUsed += gasUsed;
-      } else {
-        frontierCumulativeGasUsed += gasUsed;
-      }
+      cumulativeGasUsed += gasUsed;
+      cumulativeDataGasUsed += dataGasUsed;
+      LOG.atTrace()
+          .setMessage(
+              "New selected transaction {}, total transactions {}, cumulative gas used {}, cumulative data gas used {}")
+          .addArgument(transaction::toTraceLog)
+          .addArgument(transactions::size)
+          .addArgument(cumulativeGasUsed)
+          .addArgument(cumulativeDataGasUsed)
+          .log();
+    }
+
+    private void updateWithInvalidTransaction(
+        final Transaction transaction,
+        final ValidationResult<TransactionInvalidReason> validationResult) {
+      invalidTransactions.add(new TransactionValidationResult(transaction, validationResult));
     }
 
     public List<Transaction> getTransactions() {
       return transactions;
     }
 
+    public List<Transaction> getTransactionsByType(final TransactionType type) {
+      return transactionsByType.getOrDefault(type, List.of());
+    }
+
     public List<TransactionReceipt> getReceipts() {
       return receipts;
     }
 
-    public long getFrontierCumulativeGasUsed() {
-      return frontierCumulativeGasUsed;
+    public long getCumulativeGasUsed() {
+      return cumulativeGasUsed;
     }
 
-    public long getEip1559CumulativeGasUsed() {
-      return eip1559CumulativeGasUsed;
+    public long getCumulativeDataGasUsed() {
+      return cumulativeDataGasUsed;
     }
 
-    public long getTotalCumulativeGasUsed() {
-      return frontierCumulativeGasUsed + eip1559CumulativeGasUsed;
+    public List<TransactionValidationResult> getInvalidTransactions() {
+      return invalidTransactions;
+    }
+
+    public void addSelectionResult(final TransactionSelectionResult res) {
+      selectionResults.add(res);
+    }
+
+    public void logSelectionStats() {
+      if (LOG.isDebugEnabled()) {
+        final Map<TransactionSelectionResult, Long> selectionStats =
+            selectionResults.stream()
+                .collect(Collectors.groupingBy(Function.identity(), Collectors.counting()));
+
+        LOG.debug(
+            "Selection stats: Totals[Evaluated={}, Selected={}, Skipped={}, Dropped={}]; Detailed[{}]",
+            selectionResults.size(),
+            selectionStats.entrySet().stream()
+                .filter(e -> e.getKey().selected())
+                .map(Map.Entry::getValue)
+                .mapToInt(Long::intValue)
+                .sum(),
+            selectionStats.entrySet().stream()
+                .filter(e -> !e.getKey().selected())
+                .map(Map.Entry::getValue)
+                .mapToInt(Long::intValue)
+                .sum(),
+            selectionStats.entrySet().stream()
+                .filter(e -> e.getKey().discard())
+                .map(Map.Entry::getValue)
+                .mapToInt(Long::intValue)
+                .sum(),
+            selectionStats.entrySet().stream()
+                .map(e -> e.getKey().toString() + "=" + e.getValue())
+                .sorted()
+                .collect(Collectors.joining(", ")));
+      }
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+      TransactionSelectionResults that = (TransactionSelectionResults) o;
+      return cumulativeGasUsed == that.cumulativeGasUsed
+          && cumulativeDataGasUsed == that.cumulativeDataGasUsed
+          && transactions.equals(that.transactions)
+          && receipts.equals(that.receipts)
+          && invalidTransactions.equals(that.invalidTransactions);
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(
+          transactions, receipts, invalidTransactions, cumulativeGasUsed, cumulativeDataGasUsed);
+    }
+
+    public String toTraceLog() {
+      return "cumulativeGasUsed="
+          + cumulativeGasUsed
+          + ", cumulativeDataGasUsed="
+          + cumulativeDataGasUsed
+          + ", transactions="
+          + transactions.stream().map(Transaction::toTraceLog).collect(Collectors.joining("; "));
     }
   }
 
+  private static final Logger LOG = LoggerFactory.getLogger(BlockTransactionSelector.class);
+
+  private final Wei minTransactionGasPrice;
+  private final Double minBlockOccupancyRatio;
   private final Supplier<Boolean> isCancelled;
   private final MainnetTransactionProcessor transactionProcessor;
   private final ProcessableBlockHeader processableBlockHeader;
@@ -116,11 +222,13 @@ public long getTotalCumulativeGasUsed() {
   private final PendingTransactions pendingTransactions;
   private final AbstractBlockProcessor.TransactionReceiptFactory transactionReceiptFactory;
   private final Address miningBeneficiary;
-  private final TransactionPriceCalculator transactionPriceCalculator;
-  private final TransactionGasBudgetCalculator transactionGasBudgetCalculator;
-  private final Optional<EIP1559> eip1559;
+  private final Wei dataGasPrice;
+  private final FeeMarket feeMarket;
+  private final GasCalculator gasCalculator;
+  private final GasLimitCalculator gasLimitCalculator;
+  private final TransactionSelector transactionSelector;
 
-  private final TransactionSelectionResults transactionSelectionResult =
+  private final TransactionSelectionResults transactionSelectionResults =
       new TransactionSelectionResults();
 
   public BlockTransactionSelector(
@@ -134,9 +242,11 @@ public BlockTransactionSelector(
       final Double minBlockOccupancyRatio,
       final Supplier<Boolean> isCancelled,
       final Address miningBeneficiary,
-      final TransactionPriceCalculator transactionPriceCalculator,
-      final TransactionGasBudgetCalculator transactionGasBudgetCalculator,
-      final Optional<EIP1559> eip1559) {
+      final Wei dataGasPrice,
+      final FeeMarket feeMarket,
+      final GasCalculator gasCalculator,
+      final GasLimitCalculator gasLimitCalculator,
+      final Optional<TransactionSelectorFactory> transactionSelectorFactory) {
     this.transactionProcessor = transactionProcessor;
     this.blockchain = blockchain;
     this.worldState = worldState;
@@ -147,9 +257,12 @@ public BlockTransactionSelector(
     this.minTransactionGasPrice = minTransactionGasPrice;
     this.minBlockOccupancyRatio = minBlockOccupancyRatio;
     this.miningBeneficiary = miningBeneficiary;
-    this.transactionPriceCalculator = transactionPriceCalculator;
-    this.transactionGasBudgetCalculator = transactionGasBudgetCalculator;
-    this.eip1559 = eip1559;
+    this.dataGasPrice = dataGasPrice;
+    this.feeMarket = feeMarket;
+    this.gasCalculator = gasCalculator;
+    this.gasLimitCalculator = gasLimitCalculator;
+    this.transactionSelector =
+        transactionSelectorFactory.map(TransactionSelectorFactory::create).orElse(null);
   }
 
   /*
@@ -158,25 +271,35 @@ This function iterates over (potentially) all transactions in the PendingTransac
   If running in a thread, it can be cancelled via the isCancelled supplier (which will result
   in this throwing an CancellationException).
    */
-  public TransactionSelectionResults buildTransactionListForBlock(
-      final long blockNumber, final long gasLimit) {
+  public TransactionSelectionResults buildTransactionListForBlock() {
+    LOG.atDebug()
+        .setMessage("Transaction pool stats {}")
+        .addArgument(pendingTransactions.logStats())
+        .log();
     pendingTransactions.selectTransactions(
-        pendingTransaction -> evaluateTransaction(blockNumber, gasLimit, pendingTransaction));
-    return transactionSelectionResult;
+        pendingTransaction -> {
+          final var res = evaluateTransaction(pendingTransaction, false);
+          transactionSelectionResults.addSelectionResult(res);
+          return res;
+        });
+    LOG.atTrace()
+        .setMessage("Transaction selection result result {}")
+        .addArgument(transactionSelectionResults::toTraceLog)
+        .log();
+    return transactionSelectionResults;
   }
 
   /**
    * Evaluate the given transactions and return the result of that evaluation.
    *
-   * @param blockNumber The block number.
-   * @param gasLimit The gas limit.
    * @param transactions The set of transactions to evaluate.
    * @return The {@code TransactionSelectionResults} results of transaction evaluation.
    */
-  public TransactionSelectionResults evaluateTransactions(
-      final long blockNumber, final long gasLimit, final List<Transaction> transactions) {
-    transactions.forEach(transaction -> evaluateTransaction(blockNumber, gasLimit, transaction));
-    return transactionSelectionResult;
+  public TransactionSelectionResults evaluateTransactions(final List<Transaction> transactions) {
+    transactions.forEach(
+        transaction ->
+            transactionSelectionResults.addSelectionResult(evaluateTransaction(transaction, true)));
+    return transactionSelectionResults;
   }
 
   /*
@@ -189,31 +312,39 @@ public TransactionSelectionResults evaluateTransactions(
    *
    */
   private TransactionSelectionResult evaluateTransaction(
-      final long blockNumber, final long gasLimit, final Transaction transaction) {
+      final Transaction transaction, final boolean reportFutureNonceTransactionsAsInvalid) {
     if (isCancelled.get()) {
       throw new CancellationException("Cancelled during transaction selection.");
     }
 
-    if (transactionTooLargeForBlock(blockNumber, gasLimit, transaction)) {
+    if (transactionTooLargeForBlock(transaction)) {
+      LOG.atTrace()
+          .setMessage("Transaction {} too large to select for block creation")
+          .addArgument(transaction::toTraceLog)
+          .log();
       if (blockOccupancyAboveThreshold()) {
-        return TransactionSelectionResult.COMPLETE_OPERATION;
+        LOG.trace("Block occupancy above threshold, completing operation");
+        return TransactionSelectionResult.BLOCK_OCCUPANCY_ABOVE_THRESHOLD;
+      } else if (blockFull()) {
+        LOG.trace("Block full, completing operation");
+        return TransactionSelectionResult.BLOCK_FULL;
       } else {
-        return TransactionSelectionResult.CONTINUE;
+        return TransactionSelectionResult.TX_TOO_LARGE_FOR_REMAINING_GAS;
       }
     }
 
-    // If the gas price specified by the transaction is less than this node is willing to accept,
-    // do not include it in the block.
-    final Wei actualMinTransactionGasPriceInBlock =
-        transactionPriceCalculator.price(transaction, processableBlockHeader.getBaseFee());
-    if (minTransactionGasPrice.compareTo(actualMinTransactionGasPriceInBlock) > 0) {
-      return TransactionSelectionResult.DELETE_TRANSACTION_AND_CONTINUE;
+    if (transactionCurrentPriceBelowMin(transaction)) {
+      return TransactionSelectionResult.CURRENT_TX_PRICE_BELOW_MIN;
+    }
+    if (transactionDataPriceBelowMin(transaction)) {
+      return TransactionSelectionResult.DATA_PRICE_BELOW_CURRENT_MIN;
     }
 
     final WorldUpdater worldStateUpdater = worldState.updater();
-    final BlockHashLookup blockHashLookup = new BlockHashLookup(processableBlockHeader, blockchain);
+    final BlockHashLookup blockHashLookup =
+        new CachingBlockHashLookup(processableBlockHeader, blockchain);
 
-    final TransactionProcessingResult result =
+    final TransactionProcessingResult effectiveResult =
         transactionProcessor.processTransaction(
             blockchain,
             worldStateUpdater,
@@ -222,89 +353,173 @@ private TransactionSelectionResult evaluateTransaction(
             miningBeneficiary,
             blockHashLookup,
             false,
-            TransactionValidationParams.mining());
+            TransactionValidationParams.mining(),
+            dataGasPrice);
+
+    if (!effectiveResult.isInvalid()) {
+
+      final long gasUsedByTransaction =
+          transaction.getGasLimit() - effectiveResult.getGasRemaining();
+
+      final long cumulativeGasUsed =
+          transactionSelectionResults.getCumulativeGasUsed() + gasUsedByTransaction;
+
+      TransactionSelectionResult txSelectionResult = TransactionSelectionResult.SELECTED;
+
+      if (transactionSelector != null) {
+        txSelectionResult =
+            transactionSelector.selectTransaction(
+                transaction,
+                effectiveResult.getStatus() == TransactionProcessingResult.Status.SUCCESSFUL,
+                getLogs(effectiveResult.getLogs()),
+                cumulativeGasUsed);
+      }
+
+      if (txSelectionResult.equals(TransactionSelectionResult.SELECTED)) {
+
+        worldStateUpdater.commit();
+        final TransactionReceipt receipt =
+            transactionReceiptFactory.create(
+                transaction.getType(), effectiveResult, worldState, cumulativeGasUsed);
 
-    if (!result.isInvalid()) {
-      worldStateUpdater.commit();
-      updateTransactionResultTracking(transaction, result);
+        final long dataGasUsed = gasCalculator.dataGasCost(transaction.getBlobCount());
+
+        transactionSelectionResults.update(transaction, receipt, gasUsedByTransaction, dataGasUsed);
+
+        LOG.atTrace()
+            .setMessage("Selected {} for block creation")
+            .addArgument(transaction::toTraceLog)
+            .log();
+      }
+      return txSelectionResult;
     } else {
-      // If the transaction has an incorrect nonce, leave it in the pool and continue
-      if (result
-          .getValidationResult()
-          .getInvalidReason()
-          .equals(TransactionInvalidReason.INCORRECT_NONCE)) {
-        return TransactionSelectionResult.CONTINUE;
+
+      final boolean isIncorrectNonce = isIncorrectNonce(effectiveResult.getValidationResult());
+      if (!isIncorrectNonce || reportFutureNonceTransactionsAsInvalid) {
+        transactionSelectionResults.updateWithInvalidTransaction(
+            transaction, effectiveResult.getValidationResult());
       }
-      // If the transaction was invalid for any other reason, delete it, and continue.
-      return TransactionSelectionResult.DELETE_TRANSACTION_AND_CONTINUE;
+      return transactionSelectionResultForInvalidResult(
+          transaction, effectiveResult.getValidationResult());
     }
-    return TransactionSelectionResult.CONTINUE;
   }
 
-  /*
-  Responsible for updating the state maintained between transaction validation (i.e. receipts,
-  cumulative gas, world state root hash.).
-   */
-  private void updateTransactionResultTracking(
-      final Transaction transaction, final TransactionProcessingResult result) {
-    final long gasUsedByTransaction = transaction.getGasLimit() - result.getGasRemaining();
-    final long cumulativeGasUsed;
-    if (ExperimentalEIPs.eip1559Enabled && eip1559.isPresent()) {
-      cumulativeGasUsed =
-          transactionSelectionResult.getTotalCumulativeGasUsed() + gasUsedByTransaction;
-    } else {
-      cumulativeGasUsed =
-          transactionSelectionResult.getFrontierCumulativeGasUsed() + gasUsedByTransaction;
-    }
+  private List<org.hyperledger.besu.plugin.data.Log> getLogs(final List<Log> logs) {
+    return logs.stream().map(LogsWrapper::new).collect(Collectors.toList());
+  }
 
-    transactionSelectionResult.update(
-        transaction,
-        transactionReceiptFactory.create(
-            transaction.getType(), result, worldState, cumulativeGasUsed),
-        gasUsedByTransaction);
+  private boolean transactionDataPriceBelowMin(final Transaction transaction) {
+    if (transaction.getType().supportsBlob()) {
+      if (transaction.getMaxFeePerDataGas().orElseThrow().lessThan(dataGasPrice)) {
+        return true;
+      }
+    }
+    return false;
   }
 
-  private boolean transactionTooLargeForBlock(
-      final long blockNumber, final long gasLimit, final Transaction transaction) {
-
-    final long blockGasRemaining;
-    if (ExperimentalEIPs.eip1559Enabled && eip1559.isPresent()) {
-      switch (transaction.getType()) {
-        case EIP1559:
-          return !transactionGasBudgetCalculator.hasBudget(
-              transaction,
-              blockNumber,
-              gasLimit,
-              transactionSelectionResult.eip1559CumulativeGasUsed);
-        case FRONTIER:
-          return !transactionGasBudgetCalculator.hasBudget(
-              transaction,
-              blockNumber,
-              gasLimit,
-              transactionSelectionResult.frontierCumulativeGasUsed);
-        default:
-          throw new IllegalStateException(
-              String.format(
-                  "Developer error. Supported transaction type %s deoesn't have a block gas budget calculator",
-                  transaction.getType()));
+  private boolean transactionCurrentPriceBelowMin(final Transaction transaction) {
+    // Here we only care about EIP1159 since for Frontier and local transactions the checks
+    // that we do when accepting them in the pool are enough
+    if (transaction.getType().supports1559FeeMarket()
+        && !pendingTransactions.isLocalSender(transaction.getSender())) {
+
+      // For EIP1559 transactions, the price is dynamic and depends on network conditions, so we can
+      // only calculate at this time the current minimum price the transaction is willing to pay
+      // and if it is above the minimum accepted by the node.
+      // If below we do not delete the transaction, since when we added the transaction to the pool,
+      // we assured sure that the maxFeePerGas is >= of the minimum price accepted by the node
+      // and so the price of the transaction could satisfy this rule in the future
+      final Wei currentMinTransactionGasPriceInBlock =
+          feeMarket
+              .getTransactionPriceCalculator()
+              .price(transaction, processableBlockHeader.getBaseFee());
+      if (minTransactionGasPrice.compareTo(currentMinTransactionGasPriceInBlock) > 0) {
+        LOG.trace(
+            "Current gas fee of {} is lower than configured minimum {}, skipping",
+            transaction,
+            minTransactionGasPrice);
+        return true;
       }
-    } else {
-      blockGasRemaining =
-          processableBlockHeader.getGasLimit()
-              - transactionSelectionResult.getFrontierCumulativeGasUsed();
-      return transaction.getGasLimit() > blockGasRemaining;
     }
+    return false;
+  }
+
+  private TransactionSelectionResult transactionSelectionResultForInvalidResult(
+      final Transaction transaction,
+      final ValidationResult<TransactionInvalidReason> invalidReasonValidationResult) {
+
+    final TransactionInvalidReason invalidReason = invalidReasonValidationResult.getInvalidReason();
+    // If the invalid reason is transient, then leave the transaction in the pool and continue
+    if (isTransientValidationError(invalidReason)) {
+      LOG.atTrace()
+          .setMessage("Transient validation error {} for transaction {} keeping it in the pool")
+          .addArgument(invalidReason)
+          .addArgument(transaction::toTraceLog)
+          .log();
+      return TransactionSelectionResult.invalidTransient(invalidReason.name());
+    }
+    // If the transaction was invalid for any other reason, delete it, and continue.
+    LOG.atTrace()
+        .setMessage("Delete invalid transaction {}, reason {}")
+        .addArgument(transaction::toTraceLog)
+        .addArgument(invalidReason)
+        .log();
+    return TransactionSelectionResult.invalid(invalidReason.name());
+  }
+
+  private boolean isTransientValidationError(final TransactionInvalidReason invalidReason) {
+    return invalidReason.equals(TransactionInvalidReason.GAS_PRICE_BELOW_CURRENT_BASE_FEE)
+        || invalidReason.equals(TransactionInvalidReason.NONCE_TOO_HIGH);
+  }
+
+  private boolean isIncorrectNonce(final ValidationResult<TransactionInvalidReason> result) {
+    return result.getInvalidReason().equals(TransactionInvalidReason.NONCE_TOO_HIGH);
+  }
+
+  private boolean transactionTooLargeForBlock(final Transaction transaction) {
+    final long dataGasUsed = gasCalculator.dataGasCost(transaction.getBlobCount());
+
+    if (dataGasUsed
+        > gasLimitCalculator.currentDataGasLimit()
+            - transactionSelectionResults.getCumulativeDataGasUsed()) {
+      return true;
+    }
+
+    return transaction.getGasLimit() + dataGasUsed
+        > processableBlockHeader.getGasLimit() - transactionSelectionResults.getCumulativeGasUsed();
   }
 
   private boolean blockOccupancyAboveThreshold() {
-    final double gasUsed, gasAvailable;
-    gasAvailable = processableBlockHeader.getGasLimit();
+    final long gasAvailable = processableBlockHeader.getGasLimit();
 
-    if (ExperimentalEIPs.eip1559Enabled && eip1559.isPresent()) {
-      gasUsed = transactionSelectionResult.getTotalCumulativeGasUsed();
-    } else {
-      gasUsed = transactionSelectionResult.getFrontierCumulativeGasUsed();
+    final long gasUsed = transactionSelectionResults.getCumulativeGasUsed();
+    final long gasRemaining = gasAvailable - gasUsed;
+    final double occupancyRatio = (double) gasUsed / (double) gasAvailable;
+
+    LOG.trace(
+        "Min block occupancy ratio {}, gas used {}, available {}, remaining {}, used/available {}",
+        minBlockOccupancyRatio,
+        gasUsed,
+        gasAvailable,
+        gasRemaining,
+        occupancyRatio);
+
+    return occupancyRatio >= minBlockOccupancyRatio;
+  }
+
+  private boolean blockFull() {
+    final long gasAvailable = processableBlockHeader.getGasLimit();
+    final long gasUsed = transactionSelectionResults.getCumulativeGasUsed();
+
+    final long gasRemaining = gasAvailable - gasUsed;
+
+    if (gasRemaining < gasCalculator.getMinimumTransactionCost()) {
+      LOG.trace(
+          "Block full, remaining gas {} is less than minimum transaction gas cost {}",
+          gasRemaining,
+          gasCalculator.getMinimumTransactionCost());
+      return true;
     }
-    return (gasUsed / gasAvailable) >= minBlockOccupancyRatio;
+    return false;
   }
 }
diff --git a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashBlockCreator.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashBlockCreator.java
deleted file mode 100644
index 7c0a0a08061..00000000000
--- a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashBlockCreator.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.blockcreation;
-
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
-import org.hyperledger.besu.ethereum.core.SealableBlockHeader;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
-import org.hyperledger.besu.ethereum.mainnet.EthHash;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolution;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolver;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolverInputs;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-
-import java.math.BigInteger;
-import java.util.Optional;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.ExecutionException;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class EthHashBlockCreator extends AbstractBlockCreator {
-
-  private final EthHashSolver nonceSolver;
-
-  public EthHashBlockCreator(
-      final Address coinbase,
-      final ExtraDataCalculator extraDataCalculator,
-      final PendingTransactions pendingTransactions,
-      final ProtocolContext protocolContext,
-      final ProtocolSchedule protocolSchedule,
-      final GasLimitCalculator gasLimitCalculator,
-      final EthHashSolver nonceSolver,
-      final Wei minTransactionGasPrice,
-      final Double minBlockOccupancyRatio,
-      final BlockHeader parentHeader) {
-    super(
-        coinbase,
-        extraDataCalculator,
-        pendingTransactions,
-        protocolContext,
-        protocolSchedule,
-        gasLimitCalculator,
-        minTransactionGasPrice,
-        coinbase,
-        minBlockOccupancyRatio,
-        parentHeader);
-
-    this.nonceSolver = nonceSolver;
-  }
-
-  @Override
-  protected BlockHeader createFinalBlockHeader(final SealableBlockHeader sealableBlockHeader) {
-    final EthHashSolverInputs workDefinition = generateNonceSolverInputs(sealableBlockHeader);
-    final EthHashSolution solution;
-    try {
-      solution =
-          nonceSolver.solveFor(EthHashSolver.EthHashSolverJob.createFromInputs(workDefinition));
-    } catch (final InterruptedException ex) {
-      throw new CancellationException();
-    } catch (final ExecutionException ex) {
-      throw new RuntimeException("Failure occurred during nonce calculations.", ex);
-    }
-    return BlockHeaderBuilder.create()
-        .populateFrom(sealableBlockHeader)
-        .mixHash(solution.getMixHash())
-        .nonce(solution.getNonce())
-        .blockHeaderFunctions(blockHeaderFunctions)
-        .buildBlockHeader();
-  }
-
-  private EthHashSolverInputs generateNonceSolverInputs(
-      final SealableBlockHeader sealableBlockHeader) {
-    final BigInteger difficulty = sealableBlockHeader.getDifficulty().toBigInteger();
-    final UInt256 target =
-        difficulty.equals(BigInteger.ONE)
-            ? UInt256.MAX_VALUE
-            : UInt256.valueOf(EthHash.TARGET_UPPER_BOUND.divide(difficulty));
-
-    return new EthHashSolverInputs(
-        target, EthHash.hashHeader(sealableBlockHeader), sealableBlockHeader.getNumber());
-  }
-
-  public Optional<EthHashSolverInputs> getWorkDefinition() {
-    return nonceSolver.getWorkDefinition();
-  }
-
-  public Optional<Long> getHashesPerSecond() {
-    return nonceSolver.hashesPerSecond();
-  }
-
-  public boolean submitWork(final EthHashSolution solution) {
-    return nonceSolver.submitSolution(solution);
-  }
-
-  @Override
-  public void cancel() {
-    super.cancel();
-    nonceSolver.cancel();
-  }
-}
diff --git a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashBlockMiner.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashBlockMiner.java
deleted file mode 100644
index 0cd093e7ec3..00000000000
--- a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashBlockMiner.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.blockcreation;
-
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolution;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolverInputs;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.util.Subscribers;
-
-import java.util.Optional;
-import java.util.function.Function;
-
-/**
- * Provides the EthHash specific aspects of the mining operation - i.e. getting the work definition,
- * reporting the hashrate of the miner and accepting work submissions.
- *
- * <p>All other aspects of mining (i.e. pre-block delays, block creation and importing to the chain)
- * are all conducted by the parent class.
- */
-public class EthHashBlockMiner extends BlockMiner<EthHashBlockCreator> {
-
-  public EthHashBlockMiner(
-      final Function<BlockHeader, EthHashBlockCreator> blockCreator,
-      final ProtocolSchedule protocolSchedule,
-      final ProtocolContext protocolContext,
-      final Subscribers<MinedBlockObserver> observers,
-      final AbstractBlockScheduler scheduler,
-      final BlockHeader parentHeader) {
-    super(blockCreator, protocolSchedule, protocolContext, observers, scheduler, parentHeader);
-  }
-
-  public Optional<EthHashSolverInputs> getWorkDefinition() {
-    return minerBlockCreator.getWorkDefinition();
-  }
-
-  public Optional<Long> getHashesPerSecond() {
-    return minerBlockCreator.getHashesPerSecond();
-  }
-
-  public boolean submitWork(final EthHashSolution solution) {
-    return minerBlockCreator.submitWork(solution);
-  }
-}
diff --git a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMinerExecutor.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMinerExecutor.java
deleted file mode 100644
index 81c2917db36..00000000000
--- a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMinerExecutor.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.blockcreation;
-
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.chain.EthHashObserver;
-import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.MiningParameters;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
-import org.hyperledger.besu.ethereum.mainnet.EpochCalculator;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolver;
-import org.hyperledger.besu.ethereum.mainnet.EthHasher;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.util.Subscribers;
-
-import java.util.Optional;
-import java.util.function.Function;
-
-public class EthHashMinerExecutor extends AbstractMinerExecutor<EthHashBlockMiner> {
-
-  protected volatile Optional<Address> coinbase;
-  protected boolean stratumMiningEnabled;
-  protected final Iterable<Long> nonceGenerator;
-  protected final EpochCalculator epochCalculator;
-
-  public EthHashMinerExecutor(
-      final ProtocolContext protocolContext,
-      final ProtocolSchedule protocolSchedule,
-      final PendingTransactions pendingTransactions,
-      final MiningParameters miningParams,
-      final AbstractBlockScheduler blockScheduler,
-      final GasLimitCalculator gasLimitCalculator,
-      final EpochCalculator epochCalculator) {
-    super(
-        protocolContext,
-        protocolSchedule,
-        pendingTransactions,
-        miningParams,
-        blockScheduler,
-        gasLimitCalculator);
-    this.coinbase = miningParams.getCoinbase();
-    this.nonceGenerator = miningParams.getNonceGenerator().orElse(new RandomNonceGenerator());
-    this.epochCalculator = epochCalculator;
-  }
-
-  @Override
-  public Optional<EthHashBlockMiner> startAsyncMining(
-      final Subscribers<MinedBlockObserver> observers,
-      final Subscribers<EthHashObserver> ethHashObservers,
-      final BlockHeader parentHeader) {
-    if (coinbase.isEmpty()) {
-      throw new CoinbaseNotSetException("Unable to start mining without a coinbase.");
-    }
-    return super.startAsyncMining(observers, ethHashObservers, parentHeader);
-  }
-
-  @Override
-  public EthHashBlockMiner createMiner(
-      final Subscribers<MinedBlockObserver> observers,
-      final Subscribers<EthHashObserver> ethHashObservers,
-      final BlockHeader parentHeader) {
-    final EthHashSolver solver =
-        new EthHashSolver(
-            nonceGenerator,
-            new EthHasher.Light(),
-            stratumMiningEnabled,
-            ethHashObservers,
-            epochCalculator);
-    final Function<BlockHeader, EthHashBlockCreator> blockCreator =
-        (header) ->
-            new EthHashBlockCreator(
-                coinbase.get(),
-                parent -> extraData,
-                pendingTransactions,
-                protocolContext,
-                protocolSchedule,
-                gasLimitCalculator,
-                solver,
-                minTransactionGasPrice,
-                minBlockOccupancyRatio,
-                parentHeader);
-
-    return new EthHashBlockMiner(
-        blockCreator, protocolSchedule, protocolContext, observers, blockScheduler, parentHeader);
-  }
-
-  public void setCoinbase(final Address coinbase) {
-    if (coinbase == null) {
-      throw new IllegalArgumentException("Coinbase cannot be unset.");
-    } else {
-      this.coinbase = Optional.of(Address.wrap(coinbase.copy()));
-    }
-  }
-
-  void setStratumMiningEnabled(final boolean stratumMiningEnabled) {
-    this.stratumMiningEnabled = stratumMiningEnabled;
-  }
-
-  @Override
-  public Optional<Address> getCoinbase() {
-    return coinbase;
-  }
-
-  public EpochCalculator getEpochCalculator() {
-    return epochCalculator;
-  }
-}
diff --git a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMiningCoordinator.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMiningCoordinator.java
deleted file mode 100644
index 85440437d76..00000000000
--- a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMiningCoordinator.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.blockcreation;
-
-import static org.apache.logging.log4j.LogManager.getLogger;
-
-import org.hyperledger.besu.ethereum.chain.BlockAddedObserver;
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
-import org.hyperledger.besu.ethereum.mainnet.EpochCalculator;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolution;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolverInputs;
-
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import org.apache.logging.log4j.Logger;
-
-/**
- * Responsible for determining when a block mining operation should be started/stopped, then
- * creating an appropriate miner and starting it running in a thread.
- */
-public class EthHashMiningCoordinator extends AbstractMiningCoordinator<EthHashBlockMiner>
-    implements BlockAddedObserver {
-
-  private static final Logger LOG = getLogger();
-
-  private final EthHashMinerExecutor executor;
-
-  private final Cache<String, Long> sealerHashRate;
-
-  private volatile Optional<Long> cachedHashesPerSecond = Optional.empty();
-
-  public EthHashMiningCoordinator(
-      final Blockchain blockchain,
-      final EthHashMinerExecutor executor,
-      final SyncState syncState,
-      final int remoteSealersLimit,
-      final long remoteSealersTimeToLive) {
-    super(blockchain, executor, syncState);
-    this.executor = executor;
-    this.sealerHashRate =
-        CacheBuilder.newBuilder()
-            .maximumSize(remoteSealersLimit)
-            .expireAfterWrite(remoteSealersTimeToLive, TimeUnit.MINUTES)
-            .build();
-  }
-
-  @Override
-  public void setCoinbase(final Address coinbase) {
-    executor.setCoinbase(coinbase);
-  }
-
-  public void setStratumMiningEnabled(final boolean stratumMiningEnabled) {
-    executor.setStratumMiningEnabled(stratumMiningEnabled);
-  }
-
-  @Override
-  public void onResumeMining() {
-    LOG.info("Resuming mining operations");
-  }
-
-  @Override
-  public void onPauseMining() {
-    LOG.info("Pausing mining while behind chain head");
-  }
-
-  @Override
-  public Optional<Long> hashesPerSecond() {
-    if (sealerHashRate.size() <= 0) {
-      return localHashesPerSecond();
-    } else {
-      return remoteHashesPerSecond();
-    }
-  }
-
-  private Optional<Long> remoteHashesPerSecond() {
-    return Optional.of(sealerHashRate.asMap().values().stream().mapToLong(Long::longValue).sum());
-  }
-
-  private Optional<Long> localHashesPerSecond() {
-    final Optional<Long> currentHashesPerSecond =
-        currentRunningMiner.flatMap(EthHashBlockMiner::getHashesPerSecond);
-
-    if (currentHashesPerSecond.isPresent()) {
-      cachedHashesPerSecond = currentHashesPerSecond;
-      return currentHashesPerSecond;
-    } else {
-      return cachedHashesPerSecond;
-    }
-  }
-
-  @Override
-  public boolean submitHashRate(final String id, final Long hashrate) {
-    if (hashrate == 0) {
-      return false;
-    }
-    LOG.info("Hashrate submitted id {} hashrate {}", id, hashrate);
-    sealerHashRate.put(id, hashrate);
-    return true;
-  }
-
-  @Override
-  public void changeTargetGasLimit(final Long targetGasLimit) {
-    executor.changeTargetGasLimit(targetGasLimit);
-  }
-
-  @Override
-  public Optional<EthHashSolverInputs> getWorkDefinition() {
-    return currentRunningMiner.flatMap(EthHashBlockMiner::getWorkDefinition);
-  }
-
-  @Override
-  public boolean submitWork(final EthHashSolution solution) {
-    synchronized (this) {
-      return currentRunningMiner.map(miner -> miner.submitWork(solution)).orElse(false);
-    }
-  }
-
-  @Override
-  protected void haltMiner(final EthHashBlockMiner miner) {
-    miner.cancel();
-    miner.getHashesPerSecond().ifPresent(val -> cachedHashesPerSecond = Optional.of(val));
-  }
-
-  @Override
-  protected boolean newChainHeadInvalidatesMiningOperation(final BlockHeader newChainHeadHeader) {
-    return true;
-  }
-
-  public EpochCalculator getEpochCalculator() {
-    return executor.epochCalculator;
-  }
-}
diff --git a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/GasLimitCalculator.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/GasLimitCalculator.java
deleted file mode 100644
index d721446c136..00000000000
--- a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/GasLimitCalculator.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2019 ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.blockcreation;
-
-public interface GasLimitCalculator {
-
-  long nextGasLimit(long currentGasLimit);
-
-  default void changeTargetGasLimit(final Long __) {
-    throw new UnsupportedOperationException(
-        "Can only change target gas limit on a Targeting Gas Limit Calculator");
-  }
-
-  static GasLimitCalculator constant() {
-    return currentGasLimit -> currentGasLimit;
-  }
-}
diff --git a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/MiningCoordinator.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/MiningCoordinator.java
index bc56d21e8fe..68353f7ae7e 100644
--- a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/MiningCoordinator.java
+++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/MiningCoordinator.java
@@ -14,14 +14,14 @@
  */
 package org.hyperledger.besu.ethereum.blockcreation;
 
-import org.hyperledger.besu.ethereum.chain.EthHashObserver;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.chain.PoWObserver;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolution;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolverInputs;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolution;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolverInputs;
 
 import java.util.List;
 import java.util.Optional;
@@ -71,12 +71,12 @@ default Optional<Long> hashesPerSecond() {
     return Optional.empty();
   }
 
-  default Optional<EthHashSolverInputs> getWorkDefinition() {
+  default Optional<PoWSolverInputs> getWorkDefinition() {
     throw new UnsupportedOperationException(
         "Current consensus mechanism prevents querying work definition.");
   }
 
-  default boolean submitWork(final EthHashSolution solution) {
+  default boolean submitWork(final PoWSolution solution) {
     throw new UnsupportedOperationException(
         "Current consensus mechanism prevents submission of work solutions.");
   }
@@ -105,7 +105,20 @@ Optional<Block> createBlock(
       final List<Transaction> transactions,
       final List<BlockHeader> ommers);
 
-  default void addEthHashObserver(final EthHashObserver observer) {}
+  /**
+   * Creates a block if possible, otherwise return an empty result
+   *
+   * @param parentHeader The parent block's header
+   * @param timestamp unix timestamp of the new block.
+   * @return If supported, returns the block that was created, otherwise an empty response.
+   */
+  Optional<Block> createBlock(final BlockHeader parentHeader, final long timestamp);
+
+  default void addEthHashObserver(final PoWObserver observer) {}
 
   void changeTargetGasLimit(final Long targetGasLimit);
+
+  default boolean isCompatibleWithEngineApi() {
+    return false;
+  }
 }
diff --git a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/NoopMiningCoordinator.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/NoopMiningCoordinator.java
index 8f520b88b76..ab0a5c3d717 100644
--- a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/NoopMiningCoordinator.java
+++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/NoopMiningCoordinator.java
@@ -15,12 +15,12 @@
 
 package org.hyperledger.besu.ethereum.blockcreation;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
 
 import java.util.List;
 import java.util.Optional;
@@ -80,6 +80,11 @@ public Optional<Block> createBlock(
     return Optional.empty();
   }
 
+  @Override
+  public Optional<Block> createBlock(final BlockHeader parentHeader, final long timestamp) {
+    return Optional.empty();
+  }
+
   @Override
   public void changeTargetGasLimit(final Long targetGasLimit) {}
 }
diff --git a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/PoWBlockCreator.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/PoWBlockCreator.java
new file mode 100644
index 00000000000..90f529256ef
--- /dev/null
+++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/PoWBlockCreator.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.blockcreation;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
+import org.hyperledger.besu.ethereum.core.SealableBlockHeader;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.mainnet.EthHash;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolution;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolver;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolverInputs;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+
+import java.math.BigInteger;
+import java.util.Optional;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Supplier;
+
+import org.apache.tuweni.units.bigints.UInt256;
+
+public class PoWBlockCreator extends AbstractBlockCreator {
+
+  private final PoWSolver nonceSolver;
+
+  public PoWBlockCreator(
+      final Address coinbase,
+      final Supplier<Optional<Long>> targetGasLimitSupplier,
+      final ExtraDataCalculator extraDataCalculator,
+      final PendingTransactions pendingTransactions,
+      final ProtocolContext protocolContext,
+      final ProtocolSchedule protocolSchedule,
+      final PoWSolver nonceSolver,
+      final Wei minTransactionGasPrice,
+      final Double minBlockOccupancyRatio,
+      final BlockHeader parentHeader) {
+    super(
+        coinbase,
+        __ -> coinbase,
+        targetGasLimitSupplier,
+        extraDataCalculator,
+        pendingTransactions,
+        protocolContext,
+        protocolSchedule,
+        minTransactionGasPrice,
+        minBlockOccupancyRatio,
+        parentHeader,
+        Optional.empty());
+
+    this.nonceSolver = nonceSolver;
+  }
+
+  @Override
+  protected BlockHeader createFinalBlockHeader(final SealableBlockHeader sealableBlockHeader) {
+    final PoWSolverInputs workDefinition = generateNonceSolverInputs(sealableBlockHeader);
+    final PoWSolution solution;
+    try {
+      solution = nonceSolver.solveFor(PoWSolver.PoWSolverJob.createFromInputs(workDefinition));
+    } catch (final InterruptedException ex) {
+      throw new CancellationException();
+    } catch (final ExecutionException ex) {
+      throw new RuntimeException("Failure occurred during nonce calculations.", ex);
+    }
+    return BlockHeaderBuilder.create()
+        .populateFrom(sealableBlockHeader)
+        .mixHash(solution.getMixHash())
+        .nonce(solution.getNonce())
+        .blockHeaderFunctions(blockHeaderFunctions)
+        .buildBlockHeader();
+  }
+
+  private PoWSolverInputs generateNonceSolverInputs(final SealableBlockHeader sealableBlockHeader) {
+    final BigInteger difficulty = sealableBlockHeader.getDifficulty().toBigInteger();
+    final UInt256 target =
+        difficulty.equals(BigInteger.ONE)
+            ? UInt256.MAX_VALUE
+            : UInt256.valueOf(EthHash.TARGET_UPPER_BOUND.divide(difficulty));
+
+    return new PoWSolverInputs(
+        target, EthHash.hashHeader(sealableBlockHeader), sealableBlockHeader.getNumber());
+  }
+
+  public Optional<PoWSolverInputs> getWorkDefinition() {
+    return nonceSolver.getWorkDefinition();
+  }
+
+  public Optional<Long> getHashesPerSecond() {
+    return nonceSolver.hashesPerSecond();
+  }
+
+  public boolean submitWork(final PoWSolution solution) {
+    return nonceSolver.submitSolution(solution);
+  }
+
+  @Override
+  public void cancel() {
+    super.cancel();
+    nonceSolver.cancel();
+  }
+}
diff --git a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/PoWBlockMiner.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/PoWBlockMiner.java
new file mode 100644
index 00000000000..37e0b553dd0
--- /dev/null
+++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/PoWBlockMiner.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.blockcreation;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolution;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolverInputs;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.util.Subscribers;
+
+import java.util.Optional;
+import java.util.function.Function;
+
+/**
+ * Provides the proof-of-work specific aspects of the mining operation - i.e. getting the work
+ * definition, reporting the hashrate of the miner and accepting work submissions.
+ *
+ * <p>All other aspects of mining (i.e. pre-block delays, block creation and importing to the chain)
+ * are all conducted by the parent class.
+ */
+public class PoWBlockMiner extends BlockMiner<PoWBlockCreator> {
+
+  public PoWBlockMiner(
+      final Function<BlockHeader, PoWBlockCreator> blockCreator,
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final Subscribers<MinedBlockObserver> observers,
+      final AbstractBlockScheduler scheduler,
+      final BlockHeader parentHeader) {
+    super(blockCreator, protocolSchedule, protocolContext, observers, scheduler, parentHeader);
+  }
+
+  public Optional<PoWSolverInputs> getWorkDefinition() {
+    return minerBlockCreator.getWorkDefinition();
+  }
+
+  public Optional<Long> getHashesPerSecond() {
+    return minerBlockCreator.getHashesPerSecond();
+  }
+
+  public boolean submitWork(final PoWSolution solution) {
+    return minerBlockCreator.submitWork(solution);
+  }
+}
diff --git a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/PoWMinerExecutor.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/PoWMinerExecutor.java
new file mode 100644
index 00000000000..0d98b723db5
--- /dev/null
+++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/PoWMinerExecutor.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.blockcreation;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
+import org.hyperledger.besu.ethereum.chain.PoWObserver;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.mainnet.EpochCalculator;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolver;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.util.Subscribers;
+
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Function;
+
+public class PoWMinerExecutor extends AbstractMinerExecutor<PoWBlockMiner> {
+
+  protected volatile Optional<Address> coinbase;
+  protected boolean stratumMiningEnabled;
+  protected final Iterable<Long> nonceGenerator;
+  protected final EpochCalculator epochCalculator;
+  protected final long powJobTimeToLive;
+  protected final int maxOmmerDepth;
+
+  public PoWMinerExecutor(
+      final ProtocolContext protocolContext,
+      final ProtocolSchedule protocolSchedule,
+      final PendingTransactions pendingTransactions,
+      final MiningParameters miningParams,
+      final AbstractBlockScheduler blockScheduler,
+      final EpochCalculator epochCalculator,
+      final long powJobTimeToLive,
+      final int maxOmmerDepth) {
+    super(protocolContext, protocolSchedule, pendingTransactions, miningParams, blockScheduler);
+    this.coinbase = miningParams.getCoinbase();
+    this.nonceGenerator = miningParams.getNonceGenerator().orElse(new RandomNonceGenerator());
+    this.epochCalculator = epochCalculator;
+    this.powJobTimeToLive = powJobTimeToLive;
+    this.maxOmmerDepth = maxOmmerDepth;
+  }
+
+  @Override
+  public Optional<PoWBlockMiner> startAsyncMining(
+      final Subscribers<MinedBlockObserver> observers,
+      final Subscribers<PoWObserver> ethHashObservers,
+      final BlockHeader parentHeader) {
+    if (coinbase.isEmpty()) {
+      throw new CoinbaseNotSetException("Unable to start mining without a coinbase.");
+    }
+    return super.startAsyncMining(observers, ethHashObservers, parentHeader);
+  }
+
+  @Override
+  public PoWBlockMiner createMiner(
+      final Subscribers<MinedBlockObserver> observers,
+      final Subscribers<PoWObserver> ethHashObservers,
+      final BlockHeader parentHeader) {
+    // We don't need to consider the timestamp when getting the protocol schedule for the next block
+    // as timestamps are not used for defining forks when using POW
+    final ProtocolSpec nextBlockProtocolSpec =
+        protocolSchedule.getForNextBlockHeader(parentHeader, 0);
+    final PoWSolver solver =
+        new PoWSolver(
+            nonceGenerator,
+            nextBlockProtocolSpec.getPoWHasher().get(),
+            stratumMiningEnabled,
+            ethHashObservers,
+            epochCalculator,
+            powJobTimeToLive,
+            maxOmmerDepth);
+    final Function<BlockHeader, PoWBlockCreator> blockCreator =
+        (header) ->
+            new PoWBlockCreator(
+                coinbase.orElse(Address.ZERO),
+                () -> targetGasLimit.map(AtomicLong::longValue),
+                parent -> extraData,
+                pendingTransactions,
+                protocolContext,
+                protocolSchedule,
+                solver,
+                minTransactionGasPrice,
+                minBlockOccupancyRatio,
+                parentHeader);
+
+    return new PoWBlockMiner(
+        blockCreator, protocolSchedule, protocolContext, observers, blockScheduler, parentHeader);
+  }
+
+  public void setCoinbase(final Address coinbase) {
+    if (coinbase == null) {
+      throw new IllegalArgumentException("Coinbase cannot be unset.");
+    } else {
+      this.coinbase = Optional.of(Address.wrap(coinbase.copy()));
+    }
+  }
+
+  void setStratumMiningEnabled(final boolean stratumMiningEnabled) {
+    this.stratumMiningEnabled = stratumMiningEnabled;
+  }
+
+  @Override
+  public Optional<Address> getCoinbase() {
+    return coinbase;
+  }
+
+  public EpochCalculator getEpochCalculator() {
+    return epochCalculator;
+  }
+}
diff --git a/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/PoWMiningCoordinator.java b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/PoWMiningCoordinator.java
new file mode 100644
index 00000000000..1c94bb7821a
--- /dev/null
+++ b/ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/PoWMiningCoordinator.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.blockcreation;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.chain.BlockAddedObserver;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.ethereum.mainnet.EpochCalculator;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolution;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolverInputs;
+
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Responsible for determining when a block mining operation should be started/stopped, then
+ * creating an appropriate miner and starting it running in a thread.
+ */
+public class PoWMiningCoordinator extends AbstractMiningCoordinator<PoWBlockMiner>
+    implements BlockAddedObserver {
+
+  private static final Logger LOG = LoggerFactory.getLogger(PoWMiningCoordinator.class);
+
+  private final PoWMinerExecutor executor;
+
+  private final Cache<String, Long> sealerHashRate;
+
+  private volatile Optional<Long> cachedHashesPerSecond = Optional.empty();
+
+  public PoWMiningCoordinator(
+      final Blockchain blockchain,
+      final PoWMinerExecutor executor,
+      final SyncState syncState,
+      final int remoteSealersLimit,
+      final long remoteSealersTimeToLive) {
+    super(blockchain, executor, syncState);
+    this.executor = executor;
+    this.sealerHashRate =
+        CacheBuilder.newBuilder()
+            .maximumSize(remoteSealersLimit)
+            .expireAfterWrite(remoteSealersTimeToLive, TimeUnit.MINUTES)
+            .build();
+  }
+
+  @Override
+  public void setCoinbase(final Address coinbase) {
+    executor.setCoinbase(coinbase);
+  }
+
+  public void setStratumMiningEnabled(final boolean stratumMiningEnabled) {
+    executor.setStratumMiningEnabled(stratumMiningEnabled);
+  }
+
+  @Override
+  public void onResumeMining() {
+    LOG.info("Resuming mining operations");
+  }
+
+  @Override
+  public void onPauseMining() {
+    LOG.info("Pausing mining while behind chain head");
+  }
+
+  @Override
+  public Optional<Long> hashesPerSecond() {
+    if (sealerHashRate.size() <= 0) {
+      return localHashesPerSecond();
+    } else {
+      return remoteHashesPerSecond();
+    }
+  }
+
+  private Optional<Long> remoteHashesPerSecond() {
+    return Optional.of(sealerHashRate.asMap().values().stream().mapToLong(Long::longValue).sum());
+  }
+
+  private Optional<Long> localHashesPerSecond() {
+    final Optional<Long> currentHashesPerSecond =
+        currentRunningMiner.flatMap(PoWBlockMiner::getHashesPerSecond);
+
+    if (currentHashesPerSecond.isPresent()) {
+      cachedHashesPerSecond = currentHashesPerSecond;
+      return currentHashesPerSecond;
+    } else {
+      return cachedHashesPerSecond;
+    }
+  }
+
+  @Override
+  public boolean submitHashRate(final String id, final Long hashrate) {
+    if (hashrate == 0) {
+      return false;
+    }
+    LOG.info("Hashrate submitted id {} hashrate {}", id, hashrate);
+    sealerHashRate.put(id, hashrate);
+    return true;
+  }
+
+  @Override
+  public void changeTargetGasLimit(final Long targetGasLimit) {
+    executor.changeTargetGasLimit(targetGasLimit);
+  }
+
+  @Override
+  public Optional<PoWSolverInputs> getWorkDefinition() {
+    return currentRunningMiner.flatMap(PoWBlockMiner::getWorkDefinition);
+  }
+
+  @Override
+  public boolean submitWork(final PoWSolution solution) {
+    synchronized (this) {
+      return currentRunningMiner.map(miner -> miner.submitWork(solution)).orElse(false);
+    }
+  }
+
+  @Override
+  protected void haltMiner(final PoWBlockMiner miner) {
+    miner.cancel();
+    miner.getHashesPerSecond().ifPresent(val -> cachedHashesPerSecond = Optional.of(val));
+  }
+
+  @Override
+  protected boolean newChainHeadInvalidatesMiningOperation(final BlockHeader newChainHeadHeader) {
+    return true;
+  }
+
+  public EpochCalculator getEpochCalculator() {
+    return executor.epochCalculator;
+  }
+}
diff --git a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreatorTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreatorTest.java
new file mode 100644
index 00000000000..6a832cf011c
--- /dev/null
+++ b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreatorTest.java
@@ -0,0 +1,345 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.blockcreation;
+
+import static java.util.Collections.emptyList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSpecs.DEFAULT_DEPOSIT_CONTRACT_ADDRESS;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.BLSPublicKey;
+import org.hyperledger.besu.datatypes.BLSSignature;
+import org.hyperledger.besu.datatypes.GWei;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.blockcreation.BlockCreator.BlockCreationResult;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
+import org.hyperledger.besu.ethereum.core.Deposit;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.ExecutionContextTestFixture;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.core.SealableBlockHeader;
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.sorter.AbstractPendingTransactionsSorter;
+import org.hyperledger.besu.ethereum.eth.transactions.sorter.GasPricePendingTransactionsSorter;
+import org.hyperledger.besu.ethereum.mainnet.BodyValidation;
+import org.hyperledger.besu.ethereum.mainnet.DepositsValidator;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpecAdapters;
+import org.hyperledger.besu.ethereum.mainnet.WithdrawalsProcessor;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.log.LogTopic;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+
+import java.math.BigInteger;
+import java.time.Clock;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Supplier;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt64;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+abstract class AbstractBlockCreatorTest {
+  private static final Optional<Address> EMPTY_DEPOSIT_CONTRACT_ADDRESS = Optional.empty();
+  @Mock private WithdrawalsProcessor withdrawalsProcessor;
+
+  @Test
+  void findDepositsFromReceipts() {
+    final AbstractBlockCreator blockCreator =
+        blockCreatorWithAllowedDeposits(Optional.of(DEFAULT_DEPOSIT_CONTRACT_ADDRESS));
+    final BlockTransactionSelector.TransactionSelectionResults transactionResults =
+        mock(BlockTransactionSelector.TransactionSelectionResults.class);
+    BlockDataGenerator blockDataGenerator = new BlockDataGenerator();
+    TransactionReceipt receiptWithoutDeposit1 = blockDataGenerator.receipt();
+    TransactionReceipt receiptWithoutDeposit2 = blockDataGenerator.receipt();
+    final Log depositLog =
+        new Log(
+            DEFAULT_DEPOSIT_CONTRACT_ADDRESS,
+            Bytes.fromHexString(
+                "0x00000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000030b10a4a15bf67b328c9b101d09e5c6ee6672978fdad9ef0d9e2ceffaee99223555d8601f0cb3bcc4ce1af9864779a416e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200017a7fcf06faf493d30bbe2632ea7c2383cd86825e12797165de7aa35589483000000000000000000000000000000000000000000000000000000000000000800405973070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060a889db8300194050a2636c92a95bc7160515867614b7971a9500cdb62f9c0890217d2901c3241f86fac029428fc106930606154bd9e406d7588934a5f15b837180b17194d6e44bd6de23e43b163dfe12e369dcc75a3852cd997963f158217eb500000000000000000000000000000000000000000000000000000000000000083f3d080000000000000000000000000000000000000000000000000000000000"),
+            List.of(
+                LogTopic.fromHexString(
+                    "0x649bbc62d0e31342afea4e5cd82d4049e7e1ee912fc0889aa790803be39038c5")));
+    final TransactionReceipt receiptWithDeposit = blockDataGenerator.receipt(List.of(depositLog));
+    when(transactionResults.getReceipts())
+        .thenReturn(List.of(receiptWithoutDeposit1, receiptWithDeposit, receiptWithoutDeposit2));
+
+    Deposit expectedDeposit =
+        new Deposit(
+            BLSPublicKey.fromHexString(
+                "0xb10a4a15bf67b328c9b101d09e5c6ee6672978fdad9ef0d9e2ceffaee99223555d8601f0cb3bcc4ce1af9864779a416e"),
+            Bytes32.fromHexString(
+                "0x0017a7fcf06faf493d30bbe2632ea7c2383cd86825e12797165de7aa35589483"),
+            GWei.of(32000000000L),
+            BLSSignature.fromHexString(
+                "0xa889db8300194050a2636c92a95bc7160515867614b7971a9500cdb62f9c0890217d2901c3241f86fac029428fc106930606154bd9e406d7588934a5f15b837180b17194d6e44bd6de23e43b163dfe12e369dcc75a3852cd997963f158217eb5"),
+            UInt64.valueOf(539967));
+    final List<Deposit> expectedDeposits = List.of(expectedDeposit);
+
+    final List<Deposit> depositsFromReceipts =
+        blockCreator.findDepositsFromReceipts(transactionResults);
+
+    assertThat(depositsFromReceipts).isEqualTo(expectedDeposits);
+  }
+
+  @Test
+  void withAllowedDepositsAndContractAddress_DepositsAreParsed() {
+    final AbstractBlockCreator blockCreator =
+        blockCreatorWithAllowedDeposits(Optional.of(DEFAULT_DEPOSIT_CONTRACT_ADDRESS));
+
+    final BlockCreationResult blockCreationResult =
+        blockCreator.createBlock(
+            Optional.empty(),
+            Optional.empty(),
+            Optional.of(emptyList()),
+            Optional.empty(),
+            1L,
+            false);
+
+    List<Deposit> deposits = emptyList();
+    final Hash depositsRoot = BodyValidation.depositsRoot(deposits);
+    assertThat(blockCreationResult.getBlock().getHeader().getDepositsRoot()).hasValue(depositsRoot);
+    assertThat(blockCreationResult.getBlock().getBody().getDeposits()).hasValue(deposits);
+  }
+
+  @Test
+  void withAllowedDepositsAndNoContractAddress_DepositsAreNotParsed() {
+    final AbstractBlockCreator blockCreator = blockCreatorWithAllowedDeposits(Optional.empty());
+
+    final BlockCreationResult blockCreationResult =
+        blockCreator.createBlock(
+            Optional.empty(),
+            Optional.empty(),
+            Optional.of(emptyList()),
+            Optional.empty(),
+            1L,
+            false);
+
+    assertThat(blockCreationResult.getBlock().getHeader().getDepositsRoot()).isEmpty();
+    assertThat(blockCreationResult.getBlock().getBody().getDeposits()).isEmpty();
+  }
+
+  @Test
+  void withProhibitedDeposits_DepositsAreNotParsed() {
+    final AbstractBlockCreator blockCreator = blockCreatorWithProhibitedDeposits();
+
+    final BlockCreationResult blockCreationResult =
+        blockCreator.createBlock(
+            Optional.empty(),
+            Optional.empty(),
+            Optional.of(emptyList()),
+            Optional.empty(),
+            1L,
+            false);
+
+    assertThat(blockCreationResult.getBlock().getHeader().getDepositsRoot()).isEmpty();
+    assertThat(blockCreationResult.getBlock().getBody().getDeposits()).isEmpty();
+  }
+
+  private AbstractBlockCreator blockCreatorWithAllowedDeposits(
+      final Optional<Address> depositContractAddress) {
+    final ProtocolSpecAdapters protocolSpecAdapters =
+        ProtocolSpecAdapters.create(
+            0,
+            specBuilder ->
+                specBuilder.depositsValidator(
+                    new DepositsValidator.AllowedDeposits(depositContractAddress.orElse(null))));
+    return createBlockCreator(protocolSpecAdapters, depositContractAddress);
+  }
+
+  private AbstractBlockCreator blockCreatorWithProhibitedDeposits() {
+    final ProtocolSpecAdapters protocolSpecAdapters =
+        ProtocolSpecAdapters.create(
+            0,
+            specBuilder ->
+                specBuilder.depositsValidator(new DepositsValidator.ProhibitedDeposits()));
+    return createBlockCreator(protocolSpecAdapters, Optional.of(DEFAULT_DEPOSIT_CONTRACT_ADDRESS));
+  }
+
+  @Test
+  void withProcessorAndEmptyWithdrawals_NoWithdrawalsAreProcessed() {
+    final AbstractBlockCreator blockCreator = blockCreatorWithWithdrawalsProcessor();
+    final BlockCreationResult blockCreationResult =
+        blockCreator.createBlock(
+            Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), 1L, false);
+    verify(withdrawalsProcessor, never()).processWithdrawals(any(), any());
+    assertThat(blockCreationResult.getBlock().getHeader().getWithdrawalsRoot()).isEmpty();
+    assertThat(blockCreationResult.getBlock().getBody().getWithdrawals()).isEmpty();
+  }
+
+  @Test
+  void withNoProcessorAndEmptyWithdrawals_NoWithdrawalsAreNotProcessed() {
+    final AbstractBlockCreator blockCreator = blockCreatorWithoutWithdrawalsProcessor();
+    final BlockCreationResult blockCreationResult =
+        blockCreator.createBlock(
+            Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty(), 1L, false);
+    verify(withdrawalsProcessor, never()).processWithdrawals(any(), any());
+    assertThat(blockCreationResult.getBlock().getHeader().getWithdrawalsRoot()).isEmpty();
+    assertThat(blockCreationResult.getBlock().getBody().getWithdrawals()).isEmpty();
+  }
+
+  @Test
+  void withProcessorAndWithdrawals_WithdrawalsAreProcessed() {
+    final AbstractBlockCreator blockCreator = blockCreatorWithWithdrawalsProcessor();
+    final List<Withdrawal> withdrawals =
+        List.of(new Withdrawal(UInt64.ONE, UInt64.ONE, Address.fromHexString("0x1"), GWei.ONE));
+    final BlockCreationResult blockCreationResult =
+        blockCreator.createBlock(
+            Optional.empty(),
+            Optional.empty(),
+            Optional.of(withdrawals),
+            Optional.empty(),
+            1L,
+            false);
+
+    final Hash withdrawalsRoot = BodyValidation.withdrawalsRoot(withdrawals);
+    verify(withdrawalsProcessor).processWithdrawals(eq(withdrawals), any());
+    assertThat(blockCreationResult.getBlock().getHeader().getWithdrawalsRoot())
+        .hasValue(withdrawalsRoot);
+    assertThat(blockCreationResult.getBlock().getBody().getWithdrawals()).hasValue(withdrawals);
+  }
+
+  @Test
+  void withNoProcessorAndWithdrawals_WithdrawalsAreNotProcessed() {
+    final AbstractBlockCreator blockCreator = blockCreatorWithoutWithdrawalsProcessor();
+    final List<Withdrawal> withdrawals =
+        List.of(new Withdrawal(UInt64.ONE, UInt64.ONE, Address.fromHexString("0x1"), GWei.ONE));
+    final BlockCreationResult blockCreationResult =
+        blockCreator.createBlock(
+            Optional.empty(),
+            Optional.empty(),
+            Optional.of(withdrawals),
+            Optional.empty(),
+            1L,
+            false);
+    verify(withdrawalsProcessor, never()).processWithdrawals(any(), any());
+    assertThat(blockCreationResult.getBlock().getHeader().getWithdrawalsRoot()).isEmpty();
+    assertThat(blockCreationResult.getBlock().getBody().getWithdrawals()).isEmpty();
+  }
+
+  private AbstractBlockCreator blockCreatorWithWithdrawalsProcessor() {
+    final ProtocolSpecAdapters protocolSpecAdapters =
+        ProtocolSpecAdapters.create(
+            0, specBuilder -> specBuilder.withdrawalsProcessor(withdrawalsProcessor));
+    return createBlockCreator(protocolSpecAdapters, EMPTY_DEPOSIT_CONTRACT_ADDRESS);
+  }
+
+  private AbstractBlockCreator blockCreatorWithoutWithdrawalsProcessor() {
+    return createBlockCreator(new ProtocolSpecAdapters(Map.of()), EMPTY_DEPOSIT_CONTRACT_ADDRESS);
+  }
+
+  private AbstractBlockCreator createBlockCreator(
+      final ProtocolSpecAdapters protocolSpecAdapters,
+      final Optional<Address> depositContractAddress) {
+    final GenesisConfigOptions genesisConfigOptions = GenesisConfigFile.DEFAULT.getConfigOptions();
+    final ExecutionContextTestFixture executionContextTestFixture =
+        ExecutionContextTestFixture.builder()
+            .protocolSchedule(
+                new ProtocolScheduleBuilder(
+                        genesisConfigOptions,
+                        BigInteger.valueOf(42),
+                        protocolSpecAdapters,
+                        PrivacyParameters.DEFAULT,
+                        false,
+                        EvmConfiguration.DEFAULT)
+                    .createProtocolSchedule())
+            .build();
+
+    final MutableBlockchain blockchain = executionContextTestFixture.getBlockchain();
+    final AbstractPendingTransactionsSorter sorter =
+        new GasPricePendingTransactionsSorter(
+            ImmutableTransactionPoolConfiguration.builder().txPoolMaxSize(100).build(),
+            Clock.systemUTC(),
+            new NoOpMetricsSystem(),
+            blockchain::getChainHeadHeader);
+
+    return new TestBlockCreator(
+        Address.ZERO,
+        __ -> Address.ZERO,
+        () -> Optional.of(30_000_000L),
+        __ -> Bytes.fromHexString("deadbeef"),
+        sorter,
+        executionContextTestFixture.getProtocolContext(),
+        executionContextTestFixture.getProtocolSchedule(),
+        Wei.of(1L),
+        0d,
+        blockchain.getChainHeadHeader(),
+        depositContractAddress);
+  }
+
+  static class TestBlockCreator extends AbstractBlockCreator {
+
+    protected TestBlockCreator(
+        final Address coinbase,
+        final MiningBeneficiaryCalculator miningBeneficiaryCalculator,
+        final Supplier<Optional<Long>> targetGasLimitSupplier,
+        final ExtraDataCalculator extraDataCalculator,
+        final AbstractPendingTransactionsSorter pendingTransactions,
+        final ProtocolContext protocolContext,
+        final ProtocolSchedule protocolSchedule,
+        final Wei minTransactionGasPrice,
+        final Double minBlockOccupancyRatio,
+        final BlockHeader parentHeader,
+        final Optional<Address> depositContractAddress) {
+      super(
+          coinbase,
+          miningBeneficiaryCalculator,
+          targetGasLimitSupplier,
+          extraDataCalculator,
+          pendingTransactions,
+          protocolContext,
+          protocolSchedule,
+          minTransactionGasPrice,
+          minBlockOccupancyRatio,
+          parentHeader,
+          depositContractAddress);
+    }
+
+    @Override
+    protected BlockHeader createFinalBlockHeader(final SealableBlockHeader sealableBlockHeader) {
+      return BlockHeaderBuilder.create()
+          .difficulty(Difficulty.ZERO)
+          .populateFrom(sealableBlockHeader)
+          .mixHash(Hash.EMPTY)
+          .nonce(0L)
+          .blockHeaderFunctions(blockHeaderFunctions)
+          .buildBlockHeader();
+    }
+  }
+}
diff --git a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java
new file mode 100644
index 00000000000..cd7bdb87f6f
--- /dev/null
+++ b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java
@@ -0,0 +1,774 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.blockcreation;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.AddressHelpers;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
+import org.hyperledger.besu.ethereum.difficulty.fixed.FixedDifficultyProtocolSchedule;
+import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.eth.transactions.sorter.BaseFeePendingTransactionsSorter;
+import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.ethereum.referencetests.ReferenceTestBlockchain;
+import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.gascalculator.LondonGasCalculator;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.evm.worldstate.WorldState;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.data.TransactionSelectionResult;
+import org.hyperledger.besu.plugin.data.TransactionType;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.plugin.services.txselection.TransactionSelectorFactory;
+import org.hyperledger.besu.testutil.TestClock;
+
+import java.math.BigInteger;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import com.google.common.collect.Lists;
+import org.apache.tuweni.bytes.Bytes;
+import org.assertj.core.api.Assertions;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public abstract class AbstractBlockTransactionSelectorTest {
+  protected static final double MIN_OCCUPANCY_80_PERCENT = 0.8;
+  protected static final double MIN_OCCUPANCY_100_PERCENT = 1;
+  protected static final KeyPair keyPair =
+      SignatureAlgorithmFactory.getInstance().generateKeyPair();
+
+  protected final MetricsSystem metricsSystem = new NoOpMetricsSystem();
+
+  protected final Blockchain blockchain = new ReferenceTestBlockchain();
+  protected PendingTransactions pendingTransactions;
+  protected MutableWorldState worldState;
+  @Mock protected MainnetTransactionProcessor transactionProcessor;
+
+  @Before
+  public void setup() {
+    worldState = InMemoryKeyValueStorageProvider.createInMemoryWorldState();
+    pendingTransactions = createPendingTransactions();
+  }
+
+  protected abstract PendingTransactions createPendingTransactions();
+
+  private Boolean isCancelled() {
+    return false;
+  }
+
+  protected ProcessableBlockHeader createBlock(final long gasLimit) {
+    return createBlock(gasLimit, Wei.ONE);
+  }
+
+  protected ProcessableBlockHeader createBlock(final long gasLimit, final Wei baseFee) {
+    return BlockHeaderBuilder.create()
+        .parentHash(Hash.EMPTY)
+        .coinbase(Address.fromHexString(String.format("%020x", 1)))
+        .difficulty(Difficulty.ONE)
+        .number(1)
+        .gasLimit(gasLimit)
+        .timestamp(Instant.now().toEpochMilli())
+        .baseFee(baseFee)
+        .buildProcessableBlockHeader();
+  }
+
+  @Test
+  public void emptyPendingTransactionsResultsInEmptyVettingResult() {
+    final ProtocolSchedule protocolSchedule =
+        FixedDifficultyProtocolSchedule.create(
+            GenesisConfigFile.development().getConfigOptions(), EvmConfiguration.DEFAULT);
+    final MainnetTransactionProcessor mainnetTransactionProcessor =
+        protocolSchedule.getByBlockHeader(blockHeader(0)).getTransactionProcessor();
+
+    // The block should fit 5 transactions only
+    final ProcessableBlockHeader blockHeader = createBlock(5000);
+
+    final Address miningBeneficiary = AddressHelpers.ofValue(1);
+
+    final BlockTransactionSelector selector =
+        createBlockSelector(
+            mainnetTransactionProcessor,
+            blockHeader,
+            Wei.ZERO,
+            miningBeneficiary,
+            Wei.ZERO,
+            MIN_OCCUPANCY_80_PERCENT);
+
+    final BlockTransactionSelector.TransactionSelectionResults results =
+        selector.buildTransactionListForBlock();
+
+    assertThat(results.getTransactions().size()).isEqualTo(0);
+    assertThat(results.getReceipts().size()).isEqualTo(0);
+    assertThat(results.getCumulativeGasUsed()).isEqualTo(0);
+  }
+
+  @Test
+  public void failedTransactionsAreIncludedInTheBlock() {
+    final Transaction transaction = createTransaction(1);
+    pendingTransactions.addRemoteTransaction(transaction, Optional.empty());
+
+    ensureTransactionIsValid(transaction, 0, 5);
+
+    // The block should fit 3 transactions only
+    final ProcessableBlockHeader blockHeader = createBlock(5000);
+
+    final Address miningBeneficiary = AddressHelpers.ofValue(1);
+
+    final BlockTransactionSelector selector =
+        createBlockSelector(
+            transactionProcessor,
+            blockHeader,
+            Wei.ZERO,
+            miningBeneficiary,
+            Wei.ZERO,
+            MIN_OCCUPANCY_80_PERCENT);
+
+    final BlockTransactionSelector.TransactionSelectionResults results =
+        selector.buildTransactionListForBlock();
+
+    assertThat(results.getTransactions().size()).isEqualTo(1);
+    Assertions.assertThat(results.getTransactions()).contains(transaction);
+    assertThat(results.getReceipts().size()).isEqualTo(1);
+    assertThat(results.getCumulativeGasUsed()).isEqualTo(95L);
+  }
+
+  @Test
+  public void invalidTransactionsTransactionProcessingAreSkippedButBlockStillFills() {
+    final List<Transaction> transactionsToInject = Lists.newArrayList();
+    for (int i = 0; i < 5; i++) {
+      final Transaction tx = createTransaction(i);
+      transactionsToInject.add(tx);
+      pendingTransactions.addRemoteTransaction(tx, Optional.empty());
+      if (i == 1) {
+        ensureTransactionIsInvalid(tx, TransactionInvalidReason.NONCE_TOO_LOW);
+      } else {
+        ensureTransactionIsValid(tx);
+      }
+    }
+
+    // The block should fit 3 transactions only
+    final ProcessableBlockHeader blockHeader = createBlock(5000);
+
+    final Address miningBeneficiary = AddressHelpers.ofValue(1);
+
+    final BlockTransactionSelector selector =
+        createBlockSelector(
+            transactionProcessor,
+            blockHeader,
+            Wei.ZERO,
+            miningBeneficiary,
+            Wei.ZERO,
+            MIN_OCCUPANCY_80_PERCENT);
+
+    final BlockTransactionSelector.TransactionSelectionResults results =
+        selector.buildTransactionListForBlock();
+
+    assertThat(results.getTransactions().size()).isEqualTo(4);
+    assertThat(results.getTransactions().contains(transactionsToInject.get(1))).isFalse();
+    assertThat(results.getReceipts().size()).isEqualTo(4);
+    assertThat(results.getCumulativeGasUsed()).isEqualTo(400);
+  }
+
+  @Test
+  public void subsetOfPendingTransactionsIncludedWhenBlockGasLimitHit() {
+    final List<Transaction> transactionsToInject = Lists.newArrayList();
+    // Transactions are reported in reverse order.
+    for (int i = 0; i < 5; i++) {
+      final Transaction tx = createTransaction(i);
+      transactionsToInject.add(tx);
+      pendingTransactions.addRemoteTransaction(tx, Optional.empty());
+      ensureTransactionIsValid(tx);
+    }
+
+    final ProcessableBlockHeader blockHeader = createBlock(301);
+
+    final Address miningBeneficiary = AddressHelpers.ofValue(1);
+
+    final BlockTransactionSelector selector =
+        createBlockSelector(
+            transactionProcessor,
+            blockHeader,
+            Wei.ZERO,
+            miningBeneficiary,
+            Wei.ZERO,
+            MIN_OCCUPANCY_80_PERCENT);
+
+    final BlockTransactionSelector.TransactionSelectionResults results =
+        selector.buildTransactionListForBlock();
+
+    assertThat(results.getTransactions().size()).isEqualTo(3);
+
+    assertThat(results.getTransactions().containsAll(transactionsToInject.subList(0, 3))).isTrue();
+    assertThat(results.getReceipts().size()).isEqualTo(3);
+    assertThat(results.getCumulativeGasUsed()).isEqualTo(300);
+
+    // Ensure receipts have the correct cumulative gas
+    Assertions.assertThat(results.getReceipts().get(0).getCumulativeGasUsed()).isEqualTo(100);
+    Assertions.assertThat(results.getReceipts().get(1).getCumulativeGasUsed()).isEqualTo(200);
+    Assertions.assertThat(results.getReceipts().get(2).getCumulativeGasUsed()).isEqualTo(300);
+  }
+
+  @Test
+  public void useSingleGasSpaceForAllTransactions() {
+    final ProcessableBlockHeader blockHeader = createBlock(300);
+
+    final Address miningBeneficiary = AddressHelpers.ofValue(1);
+    final BaseFeePendingTransactionsSorter pendingTransactions1559 =
+        new BaseFeePendingTransactionsSorter(
+            ImmutableTransactionPoolConfiguration.builder().txPoolMaxSize(5).build(),
+            TestClock.system(ZoneId.systemDefault()),
+            metricsSystem,
+            () -> {
+              final BlockHeader mockBlockHeader = mock(BlockHeader.class);
+              when(mockBlockHeader.getBaseFee()).thenReturn(Optional.of(Wei.ONE));
+              return mockBlockHeader;
+            });
+    final BlockTransactionSelector selector =
+        new BlockTransactionSelector(
+            transactionProcessor,
+            blockchain,
+            worldState,
+            pendingTransactions1559,
+            blockHeader,
+            this::createReceipt,
+            Wei.of(6),
+            0.8,
+            this::isCancelled,
+            miningBeneficiary,
+            Wei.ZERO,
+            FeeMarket.london(0L),
+            new LondonGasCalculator(),
+            GasLimitCalculator.constant(),
+            Optional.empty());
+
+    // this should fill up all the block space
+    final Transaction fillingLegacyTx =
+        Transaction.builder()
+            .type(TransactionType.FRONTIER)
+            .gasLimit(300)
+            .gasPrice(Wei.of(10))
+            .nonce(1)
+            .payload(Bytes.EMPTY)
+            .to(Address.ID)
+            .value(Wei.ZERO)
+            .sender(Address.ID)
+            .chainId(BigInteger.ONE)
+            .signAndBuild(keyPair);
+
+    ensureTransactionIsValid(fillingLegacyTx);
+
+    // so we shouldn't include this
+    final Transaction extraEIP1559Tx =
+        Transaction.builder()
+            .type(TransactionType.EIP1559)
+            .nonce(0)
+            .maxPriorityFeePerGas(Wei.of(10))
+            .maxFeePerGas(Wei.of(10))
+            .gasLimit(50)
+            .to(Address.ID)
+            .value(Wei.of(0))
+            .payload(Bytes.EMPTY)
+            .chainId(BigInteger.ONE)
+            .signAndBuild(keyPair);
+
+    ensureTransactionIsValid(extraEIP1559Tx);
+
+    pendingTransactions1559.addRemoteTransaction(fillingLegacyTx, Optional.empty());
+    pendingTransactions1559.addRemoteTransaction(extraEIP1559Tx, Optional.empty());
+    final BlockTransactionSelector.TransactionSelectionResults results =
+        selector.buildTransactionListForBlock();
+
+    assertThat(results.getTransactions().size()).isEqualTo(1);
+  }
+
+  @Test
+  public void transactionTooLargeForBlockDoesNotPreventMoreBeingAddedIfBlockOccupancyNotReached() {
+    final ProcessableBlockHeader blockHeader = createBlock(300_000);
+
+    final Address miningBeneficiary = AddressHelpers.ofValue(1);
+    final BlockTransactionSelector selector =
+        createBlockSelector(
+            transactionProcessor,
+            blockHeader,
+            Wei.ZERO,
+            miningBeneficiary,
+            Wei.ZERO,
+            MIN_OCCUPANCY_80_PERCENT);
+
+    final TransactionTestFixture txTestFixture = new TransactionTestFixture();
+    // Add 3 transactions to the Pending Transactions, 79% of block, 100% of block and 10% of block
+    // should end up selecting the first and third only.
+    // NOTE - PendingTransactions outputs these in nonce order
+    final List<Transaction> transactionsToInject = Lists.newArrayList();
+    transactionsToInject.add(
+        txTestFixture
+            .gasLimit((long) (blockHeader.getGasLimit() * 0.79))
+            .nonce(1)
+            .createTransaction(keyPair));
+    transactionsToInject.add(
+        txTestFixture.gasLimit(blockHeader.getGasLimit()).nonce(2).createTransaction(keyPair));
+    transactionsToInject.add(
+        txTestFixture
+            .gasLimit((long) (blockHeader.getGasLimit() * 0.1))
+            .nonce(3)
+            .createTransaction(keyPair));
+
+    for (final Transaction tx : transactionsToInject) {
+      pendingTransactions.addRemoteTransaction(tx, Optional.empty());
+      ensureTransactionIsValid(tx);
+    }
+
+    final BlockTransactionSelector.TransactionSelectionResults results =
+        selector.buildTransactionListForBlock();
+
+    assertThat(results.getTransactions().size()).isEqualTo(2);
+    Assertions.assertThat(results.getTransactions().get(0)).isEqualTo(transactionsToInject.get(0));
+    Assertions.assertThat(results.getTransactions().get(1)).isEqualTo(transactionsToInject.get(2));
+  }
+
+  @Test
+  public void transactionSelectionStopsWhenSufficientBlockOccupancyIsReached() {
+    final ProcessableBlockHeader blockHeader = createBlock(300);
+
+    final Address miningBeneficiary = AddressHelpers.ofValue(1);
+    final BlockTransactionSelector selector =
+        createBlockSelector(
+            transactionProcessor,
+            blockHeader,
+            Wei.ZERO,
+            miningBeneficiary,
+            Wei.ZERO,
+            MIN_OCCUPANCY_80_PERCENT);
+
+    final TransactionTestFixture txTestFixture = new TransactionTestFixture();
+    // Add 4 transactions to the Pending Transactions 15% (ok), 79% (ok), 25% (too large), 10%
+    // (not included, it would fit, however previous transaction was too large and block was
+    // suitably populated).
+    // NOTE - PendingTransactions will output these in nonce order.
+    final Transaction[] txs =
+        new Transaction[] {
+          txTestFixture
+              .gasLimit((long) (blockHeader.getGasLimit() * 0.15))
+              .nonce(1)
+              .createTransaction(keyPair),
+          txTestFixture
+              .gasLimit((long) (blockHeader.getGasLimit() * 0.79))
+              .nonce(2)
+              .createTransaction(keyPair),
+          txTestFixture
+              .gasLimit((long) (blockHeader.getGasLimit() * 0.25))
+              .nonce(3)
+              .createTransaction(keyPair),
+          txTestFixture
+              .gasLimit((long) (blockHeader.getGasLimit() * 0.1))
+              .nonce(4)
+              .createTransaction(keyPair)
+        };
+
+    for (Transaction tx : txs) {
+      pendingTransactions.addRemoteTransaction(tx, Optional.empty());
+      ensureTransactionIsValid(tx);
+    }
+
+    final BlockTransactionSelector.TransactionSelectionResults results =
+        selector.buildTransactionListForBlock();
+
+    assertThat(results.getTransactions().size()).isEqualTo(2);
+    Assertions.assertThat(results.getTransactions().get(0)).isEqualTo(txs[0]);
+    Assertions.assertThat(results.getTransactions().get(1)).isEqualTo(txs[1]);
+    assertThat(results.getTransactions().contains(txs[3])).isFalse();
+    assertThat(results.getTransactions().contains(txs[2])).isFalse();
+  }
+
+  @Test
+  public void transactionSelectionStopsWhenBlockIsFull() {
+    final ProcessableBlockHeader blockHeader = createBlock(3_000_000);
+
+    final Address miningBeneficiary = AddressHelpers.ofValue(1);
+    final BlockTransactionSelector selector =
+        createBlockSelector(
+            transactionProcessor,
+            blockHeader,
+            Wei.ZERO,
+            miningBeneficiary,
+            Wei.ZERO,
+            MIN_OCCUPANCY_100_PERCENT);
+
+    final long minTxGasCost = getGasCalculator().getMinimumTransactionCost();
+
+    // Add 4 transactions to the Pending Transactions
+    // 0) 90% of block (selected)
+    // 1) 90% of block (skipped since too large)
+    // 2) enough gas to only leave space for a transaction with the min gas cost (selected)
+    // 3) min gas cost (selected and 100% block gas used)
+    // 4) min gas cost (not selected since selection stopped after tx 3)
+    // NOTE - PendingTransactions outputs these in nonce order
+
+    final long gasLimit0 = (long) (blockHeader.getGasLimit() * 0.9);
+    final long gasLimit1 = (long) (blockHeader.getGasLimit() * 0.9);
+    final long gasLimit2 = blockHeader.getGasLimit() - gasLimit0 - minTxGasCost;
+    final long gasLimit3 = minTxGasCost;
+    final long gasLimit4 = minTxGasCost;
+
+    final TransactionTestFixture txTestFixture = new TransactionTestFixture();
+    final List<Transaction> transactionsToInject = Lists.newArrayList();
+    transactionsToInject.add(txTestFixture.gasLimit(gasLimit0).nonce(0).createTransaction(keyPair));
+    transactionsToInject.add(txTestFixture.gasLimit(gasLimit1).nonce(1).createTransaction(keyPair));
+    transactionsToInject.add(txTestFixture.gasLimit(gasLimit2).nonce(2).createTransaction(keyPair));
+    transactionsToInject.add(txTestFixture.gasLimit(gasLimit3).nonce(3).createTransaction(keyPair));
+    transactionsToInject.add(txTestFixture.gasLimit(gasLimit4).nonce(4).createTransaction(keyPair));
+
+    for (final Transaction tx : transactionsToInject) {
+      pendingTransactions.addRemoteTransaction(tx, Optional.empty());
+      ensureTransactionIsValid(tx);
+    }
+
+    final BlockTransactionSelector.TransactionSelectionResults results =
+        selector.buildTransactionListForBlock();
+
+    assertThat(results.getTransactions())
+        .containsExactly(
+            transactionsToInject.get(0), transactionsToInject.get(2), transactionsToInject.get(3));
+    assertThat(results.getCumulativeGasUsed()).isEqualTo(blockHeader.getGasLimit());
+  }
+
+  @Test
+  public void transactionSelectionStopsWhenRemainingGasIsNotEnoughForAnyMoreTransaction() {
+    final ProcessableBlockHeader blockHeader = createBlock(3_000_000);
+
+    final Address miningBeneficiary = AddressHelpers.ofValue(1);
+    final BlockTransactionSelector selector =
+        createBlockSelector(
+            transactionProcessor,
+            blockHeader,
+            Wei.ZERO,
+            miningBeneficiary,
+            Wei.ZERO,
+            MIN_OCCUPANCY_100_PERCENT);
+
+    final long minTxGasCost = getGasCalculator().getMinimumTransactionCost();
+
+    // Add 4 transactions to the Pending Transactions
+    // 0) 90% of block (selected)
+    // 1) 90% of block (skipped since too large)
+    // 2) do not fill the block, but leaves less gas than the min for a tx (selected)
+    // 3) min gas cost (skipped since not enough gas remaining)
+    // NOTE - PendingTransactions outputs these in nonce order
+
+    final long gasLimit0 = (long) (blockHeader.getGasLimit() * 0.9);
+    final long gasLimit1 = (long) (blockHeader.getGasLimit() * 0.9);
+    final long gasLimit2 = blockHeader.getGasLimit() - gasLimit0 - (minTxGasCost - 1);
+    final long gasLimit3 = minTxGasCost;
+
+    final TransactionTestFixture txTestFixture = new TransactionTestFixture();
+    final List<Transaction> transactionsToInject = Lists.newArrayList();
+    transactionsToInject.add(txTestFixture.gasLimit(gasLimit0).nonce(0).createTransaction(keyPair));
+    transactionsToInject.add(txTestFixture.gasLimit(gasLimit1).nonce(1).createTransaction(keyPair));
+    transactionsToInject.add(txTestFixture.gasLimit(gasLimit2).nonce(2).createTransaction(keyPair));
+    transactionsToInject.add(txTestFixture.gasLimit(gasLimit3).nonce(3).createTransaction(keyPair));
+
+    for (final Transaction tx : transactionsToInject) {
+      pendingTransactions.addRemoteTransaction(tx, Optional.empty());
+      ensureTransactionIsValid(tx);
+    }
+
+    final BlockTransactionSelector.TransactionSelectionResults results =
+        selector.buildTransactionListForBlock();
+
+    assertThat(results.getTransactions())
+        .containsExactly(transactionsToInject.get(0), transactionsToInject.get(2));
+    assertThat(blockHeader.getGasLimit() - results.getCumulativeGasUsed()).isLessThan(minTxGasCost);
+  }
+
+  @Test
+  public void shouldDiscardTransactionsThatFailValidation() {
+    final ProcessableBlockHeader blockHeader = createBlock(300);
+
+    final Address miningBeneficiary = AddressHelpers.ofValue(1);
+    final BlockTransactionSelector selector =
+        createBlockSelector(
+            transactionProcessor,
+            blockHeader,
+            Wei.ZERO,
+            miningBeneficiary,
+            Wei.ZERO,
+            MIN_OCCUPANCY_80_PERCENT);
+
+    final TransactionTestFixture txTestFixture = new TransactionTestFixture();
+    final Transaction validTransaction =
+        txTestFixture.nonce(1).gasLimit(1).createTransaction(keyPair);
+    ensureTransactionIsValid(validTransaction, 2000, 10000);
+    final Transaction invalidTransaction =
+        txTestFixture.nonce(2).gasLimit(2).createTransaction(keyPair);
+    ensureTransactionIsInvalid(
+        invalidTransaction, TransactionInvalidReason.EXCEEDS_BLOCK_GAS_LIMIT);
+
+    pendingTransactions.addRemoteTransaction(validTransaction, Optional.empty());
+    pendingTransactions.addRemoteTransaction(invalidTransaction, Optional.empty());
+
+    selector.buildTransactionListForBlock();
+
+    Assertions.assertThat(pendingTransactions.getTransactionByHash(validTransaction.getHash()))
+        .isPresent();
+    Assertions.assertThat(pendingTransactions.getTransactionByHash(invalidTransaction.getHash()))
+        .isNotPresent();
+  }
+
+  @Test
+  public void transactionSelectionPluginShouldWork() {
+    final ProcessableBlockHeader blockHeader = createBlock(300);
+
+    final TransactionTestFixture txTestFixture = new TransactionTestFixture();
+    final Transaction selected =
+        txTestFixture
+            .nonce(1)
+            .gasLimit(1)
+            .createTransaction(SignatureAlgorithmFactory.getInstance().generateKeyPair());
+    ensureTransactionIsValid(selected, 2000, 10000);
+
+    final Transaction notSelectedTransient =
+        txTestFixture
+            .nonce(1)
+            .gasLimit(1)
+            .createTransaction(SignatureAlgorithmFactory.getInstance().generateKeyPair());
+    ensureTransactionIsValid(notSelectedTransient, 2000, 10000);
+
+    final Transaction notSelectedInvalid =
+        txTestFixture
+            .nonce(1)
+            .gasLimit(1)
+            .createTransaction(SignatureAlgorithmFactory.getInstance().generateKeyPair());
+    ensureTransactionIsValid(notSelectedInvalid, 2000, 10000);
+
+    final TransactionSelectorFactory transactionSelectorFactory =
+        (TransactionSelectorFactory)
+            () ->
+                (tx, s, logs, cg) -> {
+                  if (tx.equals(notSelectedTransient))
+                    return TransactionSelectionResult.invalidTransient("transient");
+                  if (tx.equals(notSelectedInvalid))
+                    return TransactionSelectionResult.invalid("invalid");
+                  return TransactionSelectionResult.SELECTED;
+                };
+
+    final Address miningBeneficiary = AddressHelpers.ofValue(1);
+    final BlockTransactionSelector selector =
+        createBlockSelectorWithTxSelPlugin(
+            transactionProcessor,
+            blockHeader,
+            Wei.ZERO,
+            miningBeneficiary,
+            Wei.ZERO,
+            MIN_OCCUPANCY_80_PERCENT,
+            transactionSelectorFactory);
+
+    pendingTransactions.addRemoteTransaction(selected, Optional.empty());
+    pendingTransactions.addRemoteTransaction(notSelectedTransient, Optional.empty());
+    pendingTransactions.addRemoteTransaction(notSelectedInvalid, Optional.empty());
+
+    final BlockTransactionSelector.TransactionSelectionResults transactionSelectionResults =
+        selector.buildTransactionListForBlock();
+
+    Assertions.assertThat(pendingTransactions.getTransactionByHash(notSelectedTransient.getHash()))
+        .isPresent();
+    Assertions.assertThat(pendingTransactions.getTransactionByHash(notSelectedInvalid.getHash()))
+        .isNotPresent();
+    //    Assertions.assertThat(pendingTransactions.getTransactionByHash(selected.getHash()))
+    //            .isNotPresent(); // TODO check with Fabio what should happen with selected txs
+    Assertions.assertThat(transactionSelectionResults.getTransactions()).contains(selected);
+    Assertions.assertThat(transactionSelectionResults.getTransactions())
+        .doesNotContain(notSelectedTransient);
+    Assertions.assertThat(transactionSelectionResults.getTransactions())
+        .doesNotContain(notSelectedInvalid);
+  }
+
+  @Test
+  public void transactionWithIncorrectNonceRemainsInPoolAndNotSelected() {
+    final ProcessableBlockHeader blockHeader = createBlock(5000);
+
+    final TransactionTestFixture txTestFixture = new TransactionTestFixture();
+    final Transaction futureTransaction =
+        txTestFixture.nonce(4).gasLimit(1).createTransaction(keyPair);
+
+    pendingTransactions.addRemoteTransaction(futureTransaction, Optional.empty());
+    ensureTransactionIsInvalid(futureTransaction, TransactionInvalidReason.NONCE_TOO_HIGH);
+
+    final Address miningBeneficiary = AddressHelpers.ofValue(1);
+    final BlockTransactionSelector selector =
+        createBlockSelector(
+            transactionProcessor,
+            blockHeader,
+            Wei.ZERO,
+            miningBeneficiary,
+            Wei.ZERO,
+            MIN_OCCUPANCY_80_PERCENT);
+
+    final BlockTransactionSelector.TransactionSelectionResults results =
+        selector.buildTransactionListForBlock();
+
+    Assertions.assertThat(pendingTransactions.getTransactionByHash(futureTransaction.getHash()))
+        .isPresent();
+    assertThat(results.getTransactions().size()).isEqualTo(0);
+  }
+
+  protected BlockTransactionSelector createBlockSelector(
+      final MainnetTransactionProcessor transactionProcessor,
+      final ProcessableBlockHeader blockHeader,
+      final Wei minGasPrice,
+      final Address miningBeneficiary,
+      final Wei dataGasPrice,
+      final double minBlockOccupancyRatio) {
+    final BlockTransactionSelector selector =
+        new BlockTransactionSelector(
+            transactionProcessor,
+            blockchain,
+            worldState,
+            pendingTransactions,
+            blockHeader,
+            this::createReceipt,
+            minGasPrice,
+            minBlockOccupancyRatio,
+            this::isCancelled,
+            miningBeneficiary,
+            dataGasPrice,
+            getFeeMarket(),
+            new LondonGasCalculator(),
+            GasLimitCalculator.constant(),
+            Optional.empty());
+
+    return selector;
+  }
+
+  protected BlockTransactionSelector createBlockSelectorWithTxSelPlugin(
+      final MainnetTransactionProcessor transactionProcessor,
+      final ProcessableBlockHeader blockHeader,
+      final Wei minGasPrice,
+      final Address miningBeneficiary,
+      final Wei dataGasPrice,
+      final double minBlockOccupancyRatio,
+      final TransactionSelectorFactory transactionSelectorFactory) {
+    final BlockTransactionSelector selector =
+        new BlockTransactionSelector(
+            transactionProcessor,
+            blockchain,
+            worldState,
+            pendingTransactions,
+            blockHeader,
+            this::createReceipt,
+            minGasPrice,
+            minBlockOccupancyRatio,
+            this::isCancelled,
+            miningBeneficiary,
+            dataGasPrice,
+            getFeeMarket(),
+            new LondonGasCalculator(),
+            GasLimitCalculator.constant(),
+            Optional.of(transactionSelectorFactory));
+
+    return selector;
+  }
+
+  protected abstract GasCalculator getGasCalculator();
+
+  protected abstract FeeMarket getFeeMarket();
+
+  private Transaction createTransaction(final int transactionNumber) {
+    return Transaction.builder()
+        .gasLimit(100)
+        .gasPrice(Wei.of(5))
+        .nonce(transactionNumber)
+        .payload(Bytes.EMPTY)
+        .to(Address.ID)
+        .value(Wei.of(transactionNumber))
+        .sender(Address.ID)
+        .chainId(BigInteger.ONE)
+        .guessType()
+        .signAndBuild(keyPair);
+  }
+
+  // This is a duplicate of the MainnetProtocolSpec::frontierTransactionReceiptFactory
+  private TransactionReceipt createReceipt(
+      final TransactionType __,
+      final TransactionProcessingResult result,
+      final WorldState worldState,
+      final long gasUsed) {
+    return new TransactionReceipt(
+        worldState.rootHash(), gasUsed, Lists.newArrayList(), Optional.empty());
+  }
+
+  protected void ensureTransactionIsValid(final Transaction tx) {
+    ensureTransactionIsValid(tx, 0, 0);
+  }
+
+  protected void ensureTransactionIsValid(
+      final Transaction tx, final long gasUsedByTransaction, final long gasRemaining) {
+    when(transactionProcessor.processTransaction(
+            any(), any(), any(), eq(tx), any(), any(), anyBoolean(), any(), any()))
+        .thenReturn(
+            TransactionProcessingResult.successful(
+                new ArrayList<>(),
+                gasUsedByTransaction,
+                gasRemaining,
+                Bytes.EMPTY,
+                ValidationResult.valid()));
+  }
+
+  protected void ensureTransactionIsInvalid(
+      final Transaction tx, final TransactionInvalidReason invalidReason) {
+    when(transactionProcessor.processTransaction(
+            any(), any(), any(), eq(tx), any(), any(), anyBoolean(), any(), any()))
+        .thenReturn(TransactionProcessingResult.invalid(ValidationResult.invalid(invalidReason)));
+  }
+
+  private BlockHeader blockHeader(final long number) {
+    return new BlockHeaderTestFixture().number(number).buildHeader();
+  }
+}
diff --git a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMiningCoordinatorTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMiningCoordinatorTest.java
index 14bb5f66853..623f612fcf4 100644
--- a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMiningCoordinatorTest.java
+++ b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractMiningCoordinatorTest.java
@@ -19,8 +19,8 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
@@ -44,9 +44,9 @@ public class AbstractMiningCoordinatorTest {
           new BlockHeaderTestFixture().buildHeader(),
           new BlockBody(Collections.emptyList(), Collections.emptyList()));
   private final Blockchain blockchain = mock(Blockchain.class);
-  private final EthHashMinerExecutor minerExecutor = mock(EthHashMinerExecutor.class);
+  private final PoWMinerExecutor minerExecutor = mock(PoWMinerExecutor.class);
   private final SyncState syncState = mock(SyncState.class);
-  private final EthHashBlockMiner blockMiner = mock(EthHashBlockMiner.class);
+  private final PoWBlockMiner blockMiner = mock(PoWBlockMiner.class);
   private final TestMiningCoordinator miningCoordinator =
       new TestMiningCoordinator(blockchain, minerExecutor, syncState);
 
@@ -60,7 +60,7 @@ public void shouldNotStartMiningWhenEnabledAndOutOfSync() {
     when(syncState.isInSync()).thenReturn(false);
     miningCoordinator.enable();
     miningCoordinator.start();
-    verifyZeroInteractions(minerExecutor, blockMiner);
+    verifyNoInteractions(minerExecutor, blockMiner);
   }
 
   @Test
@@ -222,11 +222,11 @@ public void shouldNotStartMiningWhenBlockAddedAndInSyncIfStoppedThenStarted() {
     verifyNoMoreInteractions(minerExecutor, blockMiner);
   }
 
-  public static class TestMiningCoordinator extends AbstractMiningCoordinator<EthHashBlockMiner> {
+  public static class TestMiningCoordinator extends AbstractMiningCoordinator<PoWBlockMiner> {
 
     public TestMiningCoordinator(
         final Blockchain blockchain,
-        final AbstractMinerExecutor<EthHashBlockMiner> executor,
+        final AbstractMinerExecutor<PoWBlockMiner> executor,
         final SyncState syncState) {
       super(blockchain, executor, syncState);
     }
diff --git a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/BlockMinerTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/BlockMinerTest.java
index d6fc9a97b57..feb784f89e0 100644
--- a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/BlockMinerTest.java
+++ b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/BlockMinerTest.java
@@ -22,14 +22,17 @@
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.blockcreation.BlockCreator.BlockCreationResult;
+import org.hyperledger.besu.ethereum.blockcreation.BlockTransactionSelector.TransactionSelectionResults;
 import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.BlockImporter;
+import org.hyperledger.besu.ethereum.mainnet.BlockImportResult;
+import org.hyperledger.besu.ethereum.mainnet.DefaultProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
-import org.hyperledger.besu.ethereum.mainnet.MutableProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 import org.hyperledger.besu.util.Subscribers;
@@ -51,12 +54,13 @@ public void blockCreatedIsAddedToBlockChain() throws InterruptedException {
         new Block(
             headerBuilder.buildHeader(), new BlockBody(Lists.newArrayList(), Lists.newArrayList()));
 
-    final ProtocolContext protocolContext = new ProtocolContext(null, null, null);
+    final ProtocolContext protocolContext = new ProtocolContext(null, null, null, Optional.empty());
 
-    final EthHashBlockCreator blockCreator = mock(EthHashBlockCreator.class);
-    final Function<BlockHeader, EthHashBlockCreator> blockCreatorSupplier =
+    final PoWBlockCreator blockCreator = mock(PoWBlockCreator.class);
+    final Function<BlockHeader, PoWBlockCreator> blockCreatorSupplier =
         (parentHeader) -> blockCreator;
-    when(blockCreator.createBlock(anyLong())).thenReturn(blockToCreate);
+    when(blockCreator.createBlock(anyLong()))
+        .thenReturn(new BlockCreationResult(blockToCreate, new TransactionSelectionResults()));
 
     final BlockImporter blockImporter = mock(BlockImporter.class);
     final ProtocolSpec protocolSpec = mock(ProtocolSpec.class);
@@ -64,13 +68,13 @@ public void blockCreatedIsAddedToBlockChain() throws InterruptedException {
     final ProtocolSchedule protocolSchedule = singleSpecSchedule(protocolSpec);
 
     when(protocolSpec.getBlockImporter()).thenReturn(blockImporter);
-    when(blockImporter.importBlock(any(), any(), any())).thenReturn(true);
+    when(blockImporter.importBlock(any(), any(), any())).thenReturn(new BlockImportResult(true));
 
     final MinedBlockObserver observer = mock(MinedBlockObserver.class);
     final DefaultBlockScheduler scheduler = mock(DefaultBlockScheduler.class);
     when(scheduler.waitUntilNextBlockCanBeMined(any())).thenReturn(5L);
-    final BlockMiner<EthHashBlockCreator> miner =
-        new EthHashBlockMiner(
+    final BlockMiner<PoWBlockCreator> miner =
+        new PoWBlockMiner(
             blockCreatorSupplier,
             protocolSchedule,
             protocolContext,
@@ -91,25 +95,30 @@ public void failureToImportDoesNotTriggerObservers() throws InterruptedException
         new Block(
             headerBuilder.buildHeader(), new BlockBody(Lists.newArrayList(), Lists.newArrayList()));
 
-    final ProtocolContext protocolContext = new ProtocolContext(null, null, null);
+    final ProtocolContext protocolContext = new ProtocolContext(null, null, null, Optional.empty());
 
-    final EthHashBlockCreator blockCreator = mock(EthHashBlockCreator.class);
-    final Function<BlockHeader, EthHashBlockCreator> blockCreatorSupplier =
+    final PoWBlockCreator blockCreator = mock(PoWBlockCreator.class);
+    final Function<BlockHeader, PoWBlockCreator> blockCreatorSupplier =
         (parentHeader) -> blockCreator;
-    when(blockCreator.createBlock(anyLong())).thenReturn(blockToCreate);
+    when(blockCreator.createBlock(anyLong()))
+        .thenReturn(new BlockCreationResult(blockToCreate, new TransactionSelectionResults()));
 
     final BlockImporter blockImporter = mock(BlockImporter.class);
     final ProtocolSpec protocolSpec = mock(ProtocolSpec.class);
     final ProtocolSchedule protocolSchedule = singleSpecSchedule(protocolSpec);
 
     when(protocolSpec.getBlockImporter()).thenReturn(blockImporter);
-    when(blockImporter.importBlock(any(), any(), any())).thenReturn(false, false, true);
+    when(blockImporter.importBlock(any(), any(), any()))
+        .thenReturn(
+            new BlockImportResult(false),
+            new BlockImportResult(false),
+            new BlockImportResult(true));
 
     final MinedBlockObserver observer = mock(MinedBlockObserver.class);
     final DefaultBlockScheduler scheduler = mock(DefaultBlockScheduler.class);
     when(scheduler.waitUntilNextBlockCanBeMined(any())).thenReturn(5L);
-    final BlockMiner<EthHashBlockCreator> miner =
-        new EthHashBlockMiner(
+    final BlockMiner<PoWBlockCreator> miner =
+        new PoWBlockMiner(
             blockCreatorSupplier,
             protocolSchedule,
             protocolContext,
@@ -133,9 +142,9 @@ private static Subscribers<MinedBlockObserver> subscribersContaining(
   }
 
   private ProtocolSchedule singleSpecSchedule(final ProtocolSpec protocolSpec) {
-    final MutableProtocolSchedule protocolSchedule =
-        new MutableProtocolSchedule(Optional.of(BigInteger.valueOf(1234)));
-    protocolSchedule.putMilestone(0, protocolSpec);
+    final DefaultProtocolSchedule protocolSchedule =
+        new DefaultProtocolSchedule(Optional.of(BigInteger.valueOf(1234)));
+    protocolSchedule.putBlockNumberMilestone(0, protocolSpec);
     return protocolSchedule;
   }
 }
diff --git a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/BlockTransactionSelectorTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/BlockTransactionSelectorTest.java
deleted file mode 100644
index c5eb2f9aa23..00000000000
--- a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/BlockTransactionSelectorTest.java
+++ /dev/null
@@ -1,577 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.blockcreation;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.config.GenesisConfigFile;
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.AddressHelpers;
-import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
-import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
-import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.TransactionReceipt;
-import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldState;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.core.fees.TransactionGasBudgetCalculator;
-import org.hyperledger.besu.ethereum.core.fees.TransactionPriceCalculator;
-import org.hyperledger.besu.ethereum.difficulty.fixed.FixedDifficultyProtocolSchedule;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
-import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
-import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
-import org.hyperledger.besu.ethereum.referencetests.ReferenceTestBlockchain;
-import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
-import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.plugin.data.TransactionType;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
-import org.hyperledger.besu.testutil.TestClock;
-
-import java.math.BigInteger;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-import com.google.common.collect.Lists;
-import org.apache.tuweni.bytes.Bytes;
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
-
-public class BlockTransactionSelectorTest {
-
-  private static final KeyPair keyPair = KeyPair.generate();
-  private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
-
-  private final Blockchain blockchain = new ReferenceTestBlockchain();
-  private final PendingTransactions pendingTransactions =
-      new PendingTransactions(
-          TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
-          5,
-          5,
-          TestClock.fixed(),
-          metricsSystem,
-          blockchain::getChainHeadHeader,
-          TransactionPoolConfiguration.DEFAULT_PRICE_BUMP);
-  private final MutableWorldState worldState = InMemoryStorageProvider.createInMemoryWorldState();
-  private final MainnetTransactionProcessor transactionProcessor =
-      mock(MainnetTransactionProcessor.class);
-
-  private Boolean isCancelled() {
-    return false;
-  }
-
-  private ProcessableBlockHeader createBlockWithGasLimit(final long gasLimit) {
-    return BlockHeaderBuilder.create()
-        .parentHash(Hash.EMPTY)
-        .coinbase(Address.fromHexString(String.format("%020x", 1)))
-        .difficulty(Difficulty.ONE)
-        .number(1)
-        .gasLimit(gasLimit)
-        .timestamp(Instant.now().toEpochMilli())
-        .buildProcessableBlockHeader();
-  }
-
-  @Test
-  public void emptyPendingTransactionsResultsInEmptyVettingResult() {
-    final ProtocolSchedule protocolSchedule =
-        FixedDifficultyProtocolSchedule.create(GenesisConfigFile.development().getConfigOptions());
-    final MainnetTransactionProcessor mainnetTransactionProcessor =
-        protocolSchedule.getByBlockNumber(0).getTransactionProcessor();
-
-    // The block should fit 5 transactions only
-    final ProcessableBlockHeader blockHeader = createBlockWithGasLimit(5000);
-
-    final Address miningBeneficiary = AddressHelpers.ofValue(1);
-
-    final BlockTransactionSelector selector =
-        new BlockTransactionSelector(
-            mainnetTransactionProcessor,
-            blockchain,
-            worldState,
-            pendingTransactions,
-            blockHeader,
-            this::createReceipt,
-            Wei.ZERO,
-            0.8,
-            this::isCancelled,
-            miningBeneficiary,
-            TransactionPriceCalculator.frontier(),
-            TransactionGasBudgetCalculator.frontier(),
-            Optional.empty());
-
-    final BlockTransactionSelector.TransactionSelectionResults results =
-        selector.buildTransactionListForBlock(blockHeader.getNumber(), blockHeader.getGasLimit());
-
-    assertThat(results.getTransactions().size()).isEqualTo(0);
-    assertThat(results.getReceipts().size()).isEqualTo(0);
-    assertThat(results.getFrontierCumulativeGasUsed()).isEqualTo(0);
-  }
-
-  @Test
-  public void failedTransactionsAreIncludedInTheBlock() {
-    final Transaction transaction = createTransaction(1);
-    pendingTransactions.addRemoteTransaction(transaction);
-
-    when(transactionProcessor.processTransaction(
-            any(), any(), any(), eq(transaction), any(), any(), anyBoolean(), any()))
-        .thenReturn(
-            TransactionProcessingResult.failed(0, 5, ValidationResult.valid(), Optional.empty()));
-
-    // The block should fit 3 transactions only
-    final ProcessableBlockHeader blockHeader = createBlockWithGasLimit(5000);
-
-    final Address miningBeneficiary = AddressHelpers.ofValue(1);
-
-    final BlockTransactionSelector selector =
-        new BlockTransactionSelector(
-            transactionProcessor,
-            blockchain,
-            worldState,
-            pendingTransactions,
-            blockHeader,
-            this::createReceipt,
-            Wei.ZERO,
-            0.8,
-            this::isCancelled,
-            miningBeneficiary,
-            TransactionPriceCalculator.frontier(),
-            TransactionGasBudgetCalculator.frontier(),
-            Optional.empty());
-
-    final BlockTransactionSelector.TransactionSelectionResults results =
-        selector.buildTransactionListForBlock(blockHeader.getNumber(), blockHeader.getGasLimit());
-
-    assertThat(results.getTransactions().size()).isEqualTo(1);
-    Assertions.assertThat(results.getTransactions()).contains(transaction);
-    assertThat(results.getReceipts().size()).isEqualTo(1);
-    assertThat(results.getFrontierCumulativeGasUsed()).isEqualTo(95L);
-  }
-
-  @Test
-  public void invalidTransactionsTransactionProcessingAreSkippedButBlockStillFills() {
-    final List<Transaction> transactionsToInject = Lists.newArrayList();
-    for (int i = 0; i < 5; i++) {
-      final Transaction tx = createTransaction(i);
-      transactionsToInject.add(tx);
-      pendingTransactions.addRemoteTransaction(tx);
-    }
-
-    when(transactionProcessor.processTransaction(
-            any(), any(), any(), any(), any(), any(), anyBoolean(), any()))
-        .thenReturn(
-            TransactionProcessingResult.successful(
-                new ArrayList<>(), 0, 0, Bytes.EMPTY, ValidationResult.valid()));
-    when(transactionProcessor.processTransaction(
-            any(),
-            any(),
-            any(),
-            eq(transactionsToInject.get(1)),
-            any(),
-            any(),
-            anyBoolean(),
-            any()))
-        .thenReturn(
-            TransactionProcessingResult.invalid(
-                ValidationResult.invalid(TransactionInvalidReason.NONCE_TOO_LOW)));
-
-    // The block should fit 3 transactions only
-    final ProcessableBlockHeader blockHeader = createBlockWithGasLimit(5000);
-
-    final Address miningBeneficiary = AddressHelpers.ofValue(1);
-
-    final BlockTransactionSelector selector =
-        new BlockTransactionSelector(
-            transactionProcessor,
-            blockchain,
-            worldState,
-            pendingTransactions,
-            blockHeader,
-            this::createReceipt,
-            Wei.ZERO,
-            0.8,
-            this::isCancelled,
-            miningBeneficiary,
-            TransactionPriceCalculator.frontier(),
-            TransactionGasBudgetCalculator.frontier(),
-            Optional.empty());
-
-    final BlockTransactionSelector.TransactionSelectionResults results =
-        selector.buildTransactionListForBlock(blockHeader.getNumber(), blockHeader.getGasLimit());
-
-    assertThat(results.getTransactions().size()).isEqualTo(4);
-    assertThat(results.getTransactions().contains(transactionsToInject.get(1))).isFalse();
-    assertThat(results.getReceipts().size()).isEqualTo(4);
-    assertThat(results.getFrontierCumulativeGasUsed()).isEqualTo(400);
-  }
-
-  @Test
-  public void subsetOfPendingTransactionsIncludedWhenBlockGasLimitHit() {
-    final List<Transaction> transactionsToInject = Lists.newArrayList();
-    // Transactions are reported in reverse order.
-    for (int i = 0; i < 5; i++) {
-      final Transaction tx = createTransaction(i);
-      transactionsToInject.add(tx);
-      pendingTransactions.addRemoteTransaction(tx);
-    }
-
-    when(transactionProcessor.processTransaction(
-            any(), any(), any(), any(), any(), any(), anyBoolean(), any()))
-        .thenReturn(
-            TransactionProcessingResult.successful(
-                new ArrayList<>(), 0, 0, Bytes.EMPTY, ValidationResult.valid()));
-
-    final ProcessableBlockHeader blockHeader = createBlockWithGasLimit(301);
-
-    final Address miningBeneficiary = AddressHelpers.ofValue(1);
-
-    final BlockTransactionSelector selector =
-        new BlockTransactionSelector(
-            transactionProcessor,
-            blockchain,
-            worldState,
-            pendingTransactions,
-            blockHeader,
-            this::createReceipt,
-            Wei.ZERO,
-            0.8,
-            this::isCancelled,
-            miningBeneficiary,
-            TransactionPriceCalculator.frontier(),
-            TransactionGasBudgetCalculator.frontier(),
-            Optional.empty());
-
-    final BlockTransactionSelector.TransactionSelectionResults results =
-        selector.buildTransactionListForBlock(blockHeader.getNumber(), blockHeader.getGasLimit());
-
-    assertThat(results.getTransactions().size()).isEqualTo(3);
-
-    assertThat(results.getTransactions().containsAll(transactionsToInject.subList(0, 3))).isTrue();
-    assertThat(results.getReceipts().size()).isEqualTo(3);
-    assertThat(results.getFrontierCumulativeGasUsed()).isEqualTo(300);
-
-    // Ensure receipts have the correct cumulative gas
-    Assertions.assertThat(results.getReceipts().get(0).getCumulativeGasUsed()).isEqualTo(100);
-    Assertions.assertThat(results.getReceipts().get(1).getCumulativeGasUsed()).isEqualTo(200);
-    Assertions.assertThat(results.getReceipts().get(2).getCumulativeGasUsed()).isEqualTo(300);
-  }
-
-  @Test
-  public void transactionOfferingGasPriceLessThanMinimumIsIdentifiedAndRemovedFromPending() {
-    final ProcessableBlockHeader blockHeader = createBlockWithGasLimit(301);
-
-    final Address miningBeneficiary = AddressHelpers.ofValue(1);
-    final BlockTransactionSelector selector =
-        new BlockTransactionSelector(
-            transactionProcessor,
-            blockchain,
-            worldState,
-            pendingTransactions,
-            blockHeader,
-            this::createReceipt,
-            Wei.of(6),
-            0.8,
-            this::isCancelled,
-            miningBeneficiary,
-            TransactionPriceCalculator.frontier(),
-            TransactionGasBudgetCalculator.frontier(),
-            Optional.empty());
-
-    final Transaction tx = createTransaction(1);
-    pendingTransactions.addRemoteTransaction(tx);
-
-    final BlockTransactionSelector.TransactionSelectionResults results =
-        selector.buildTransactionListForBlock(blockHeader.getNumber(), blockHeader.getGasLimit());
-
-    assertThat(results.getTransactions().size()).isEqualTo(0);
-    assertThat(pendingTransactions.size()).isEqualTo(0);
-  }
-
-  @Test
-  public void transactionTooLargeForBlockDoesNotPreventMoreBeingAddedIfBlockOccupancyNotReached() {
-    final ProcessableBlockHeader blockHeader = createBlockWithGasLimit(300);
-
-    when(transactionProcessor.processTransaction(
-            any(), any(), any(), any(), any(), any(), anyBoolean(), any()))
-        .thenReturn(
-            TransactionProcessingResult.successful(
-                new ArrayList<>(), 0, 0, Bytes.EMPTY, ValidationResult.valid()));
-
-    final Address miningBeneficiary = AddressHelpers.ofValue(1);
-    final BlockTransactionSelector selector =
-        new BlockTransactionSelector(
-            transactionProcessor,
-            blockchain,
-            worldState,
-            pendingTransactions,
-            blockHeader,
-            this::createReceipt,
-            Wei.ZERO,
-            0.8,
-            this::isCancelled,
-            miningBeneficiary,
-            TransactionPriceCalculator.frontier(),
-            TransactionGasBudgetCalculator.frontier(),
-            Optional.empty());
-
-    final TransactionTestFixture txTestFixture = new TransactionTestFixture();
-    // Add 3 transactions to the Pending Transactions, 79% of block, 100% of block and 10% of block
-    // should end up selecting the first and third only.
-    // NOTE - PendingTransactions outputs these in nonce order
-    final List<Transaction> transactionsToInject = Lists.newArrayList();
-    transactionsToInject.add(
-        txTestFixture
-            .gasLimit((long) (blockHeader.getGasLimit() * 0.79))
-            .nonce(1)
-            .createTransaction(keyPair));
-    transactionsToInject.add(
-        txTestFixture.gasLimit(blockHeader.getGasLimit()).nonce(2).createTransaction(keyPair));
-    transactionsToInject.add(
-        txTestFixture
-            .gasLimit((long) (blockHeader.getGasLimit() * 0.1))
-            .nonce(3)
-            .createTransaction(keyPair));
-
-    for (final Transaction tx : transactionsToInject) {
-      pendingTransactions.addRemoteTransaction(tx);
-    }
-
-    final BlockTransactionSelector.TransactionSelectionResults results =
-        selector.buildTransactionListForBlock(blockHeader.getNumber(), blockHeader.getGasLimit());
-
-    assertThat(results.getTransactions().size()).isEqualTo(2);
-    Assertions.assertThat(results.getTransactions().get(0)).isEqualTo(transactionsToInject.get(0));
-    Assertions.assertThat(results.getTransactions().get(1)).isEqualTo(transactionsToInject.get(2));
-  }
-
-  @Test
-  public void transactionSelectionStopsWhenSufficientBlockOccupancyIsReached() {
-    final ProcessableBlockHeader blockHeader = createBlockWithGasLimit(300);
-
-    // TransactionProcessor mock assumes all gas in the transaction was used (i.e. gasLimit).
-    when(transactionProcessor.processTransaction(
-            any(), any(), any(), any(), any(), any(), anyBoolean(), any()))
-        .thenReturn(
-            TransactionProcessingResult.successful(
-                new ArrayList<>(), 0, 0, Bytes.EMPTY, ValidationResult.valid()));
-
-    final Address miningBeneficiary = AddressHelpers.ofValue(1);
-    final BlockTransactionSelector selector =
-        new BlockTransactionSelector(
-            transactionProcessor,
-            blockchain,
-            worldState,
-            pendingTransactions,
-            blockHeader,
-            this::createReceipt,
-            Wei.ZERO,
-            0.8,
-            this::isCancelled,
-            miningBeneficiary,
-            TransactionPriceCalculator.frontier(),
-            TransactionGasBudgetCalculator.frontier(),
-            Optional.empty());
-
-    final TransactionTestFixture txTestFixture = new TransactionTestFixture();
-    // Add 4 transactions to the Pending Transactions 15% (ok), 79% (ok), 25% (too large), 10%
-    // (not included, it would fit, however previous transaction was too large and block was
-    // suitably populated).
-    // NOTE - PendingTransactions will output these in nonce order.
-    final Transaction transaction1 =
-        txTestFixture
-            .gasLimit((long) (blockHeader.getGasLimit() * 0.15))
-            .nonce(1)
-            .createTransaction(keyPair);
-    final Transaction transaction2 =
-        txTestFixture
-            .gasLimit((long) (blockHeader.getGasLimit() * 0.79))
-            .nonce(2)
-            .createTransaction(keyPair);
-    final Transaction transaction3 =
-        txTestFixture
-            .gasLimit((long) (blockHeader.getGasLimit() * 0.25))
-            .nonce(3)
-            .createTransaction(keyPair);
-    final Transaction transaction4 =
-        txTestFixture
-            .gasLimit((long) (blockHeader.getGasLimit() * 0.1))
-            .nonce(4)
-            .createTransaction(keyPair);
-
-    pendingTransactions.addRemoteTransaction(transaction1);
-    pendingTransactions.addRemoteTransaction(transaction2);
-    pendingTransactions.addRemoteTransaction(transaction3);
-    pendingTransactions.addRemoteTransaction(transaction4);
-
-    final BlockTransactionSelector.TransactionSelectionResults results =
-        selector.buildTransactionListForBlock(blockHeader.getNumber(), blockHeader.getGasLimit());
-
-    assertThat(results.getTransactions().size()).isEqualTo(2);
-    Assertions.assertThat(results.getTransactions().get(0)).isEqualTo(transaction1);
-    Assertions.assertThat(results.getTransactions().get(1)).isEqualTo(transaction2);
-    assertThat(results.getTransactions().contains(transaction4)).isFalse();
-    assertThat(results.getTransactions().contains(transaction3)).isFalse();
-  }
-
-  @Test
-  public void shouldDiscardTransactionsThatFailValidation() {
-    final ProcessableBlockHeader blockHeader = createBlockWithGasLimit(300);
-
-    final Address miningBeneficiary = AddressHelpers.ofValue(1);
-    final BlockTransactionSelector selector =
-        new BlockTransactionSelector(
-            transactionProcessor,
-            blockchain,
-            worldState,
-            pendingTransactions,
-            blockHeader,
-            this::createReceipt,
-            Wei.ZERO,
-            0.8,
-            this::isCancelled,
-            miningBeneficiary,
-            TransactionPriceCalculator.frontier(),
-            TransactionGasBudgetCalculator.frontier(),
-            Optional.empty());
-
-    final TransactionTestFixture txTestFixture = new TransactionTestFixture();
-    final Transaction validTransaction =
-        txTestFixture.nonce(1).gasLimit(1).createTransaction(keyPair);
-    final Transaction invalidTransaction =
-        txTestFixture.nonce(2).gasLimit(2).createTransaction(keyPair);
-
-    pendingTransactions.addRemoteTransaction(validTransaction);
-    pendingTransactions.addRemoteTransaction(invalidTransaction);
-
-    when(transactionProcessor.processTransaction(
-            eq(blockchain),
-            any(WorldUpdater.class),
-            eq(blockHeader),
-            eq(validTransaction),
-            any(),
-            any(),
-            anyBoolean(),
-            any()))
-        .thenReturn(
-            TransactionProcessingResult.successful(
-                new ArrayList<>(), 2000, 10000, Bytes.EMPTY, ValidationResult.valid()));
-    when(transactionProcessor.processTransaction(
-            eq(blockchain),
-            any(WorldUpdater.class),
-            eq(blockHeader),
-            eq(invalidTransaction),
-            any(),
-            any(),
-            anyBoolean(),
-            any()))
-        .thenReturn(
-            TransactionProcessingResult.invalid(
-                ValidationResult.invalid(TransactionInvalidReason.EXCEEDS_BLOCK_GAS_LIMIT)));
-
-    selector.buildTransactionListForBlock(blockHeader.getNumber(), blockHeader.getGasLimit());
-
-    Assertions.assertThat(pendingTransactions.getTransactionByHash(validTransaction.getHash()))
-        .isPresent();
-    Assertions.assertThat(pendingTransactions.getTransactionByHash(invalidTransaction.getHash()))
-        .isNotPresent();
-  }
-
-  @Test
-  public void transactionWithIncorrectNonceRemainsInPoolAndNotSelected() {
-    final ProcessableBlockHeader blockHeader = createBlockWithGasLimit(5000);
-
-    final TransactionTestFixture txTestFixture = new TransactionTestFixture();
-    final Transaction futureTransaction =
-        txTestFixture.nonce(5).gasLimit(1).createTransaction(keyPair);
-
-    pendingTransactions.addRemoteTransaction(futureTransaction);
-
-    when(transactionProcessor.processTransaction(
-            eq(blockchain),
-            any(WorldUpdater.class),
-            eq(blockHeader),
-            eq(futureTransaction),
-            any(),
-            any(),
-            anyBoolean(),
-            any()))
-        .thenReturn(
-            TransactionProcessingResult.invalid(
-                ValidationResult.invalid(TransactionInvalidReason.INCORRECT_NONCE)));
-
-    final Address miningBeneficiary = AddressHelpers.ofValue(1);
-    final BlockTransactionSelector selector =
-        new BlockTransactionSelector(
-            transactionProcessor,
-            blockchain,
-            worldState,
-            pendingTransactions,
-            blockHeader,
-            this::createReceipt,
-            Wei.ZERO,
-            0.8,
-            this::isCancelled,
-            miningBeneficiary,
-            TransactionPriceCalculator.frontier(),
-            TransactionGasBudgetCalculator.frontier(),
-            Optional.empty());
-
-    final BlockTransactionSelector.TransactionSelectionResults results =
-        selector.buildTransactionListForBlock(blockHeader.getNumber(), blockHeader.getGasLimit());
-
-    Assertions.assertThat(pendingTransactions.getTransactionByHash(futureTransaction.getHash()))
-        .isPresent();
-    assertThat(results.getTransactions().size()).isEqualTo(0);
-  }
-
-  private Transaction createTransaction(final int transactionNumber) {
-    return Transaction.builder()
-        .gasLimit(100)
-        .gasPrice(Wei.of(5))
-        .nonce(transactionNumber)
-        .payload(Bytes.EMPTY)
-        .to(Address.ID)
-        .value(Wei.of(transactionNumber))
-        .sender(Address.ID)
-        .chainId(BigInteger.ONE)
-        .guessType()
-        .signAndBuild(keyPair);
-  }
-
-  // This is a duplicate of the MainnetProtocolSpec::frontierTransactionReceiptFactory
-  private TransactionReceipt createReceipt(
-      final TransactionType __,
-      final TransactionProcessingResult result,
-      final WorldState worldState,
-      final long gasUsed) {
-    return new TransactionReceipt(
-        worldState.rootHash(), gasUsed, Lists.newArrayList(), Optional.empty());
-  }
-}
diff --git a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/EthHashBlockCreatorTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/EthHashBlockCreatorTest.java
deleted file mode 100644
index 7ea143588c6..00000000000
--- a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/EthHashBlockCreatorTest.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.blockcreation;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.config.GenesisConfigFile;
-import org.hyperledger.besu.config.GenesisConfigOptions;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
-import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.ExecutionContextTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
-import org.hyperledger.besu.ethereum.mainnet.EpochCalculator;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolver;
-import org.hyperledger.besu.ethereum.mainnet.EthHasher;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder;
-import org.hyperledger.besu.ethereum.mainnet.ValidationTestUtils;
-import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
-import org.hyperledger.besu.testutil.TestClock;
-import org.hyperledger.besu.util.Subscribers;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.Collections;
-import java.util.function.Function;
-
-import com.google.common.collect.Lists;
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-
-public class EthHashBlockCreatorTest {
-
-  private final Address BLOCK_1_COINBASE =
-      Address.fromHexString("0x05a56e2d52c817161883f50c441c3228cfe54d9f");
-
-  private static final long BLOCK_1_TIMESTAMP = Long.parseUnsignedLong("55ba4224", 16);
-
-  private static final long BLOCK_1_NONCE = Long.parseLong("539bd4979fef1ec4", 16);
-
-  private static final Bytes BLOCK_1_EXTRA_DATA =
-      Bytes.fromHexString("0x476574682f76312e302e302f6c696e75782f676f312e342e32");
-  private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
-
-  @Test
-  public void createMainnetBlock1() throws IOException {
-    final GenesisConfigOptions genesisConfigOptions = GenesisConfigFile.DEFAULT.getConfigOptions();
-    final ExecutionContextTestFixture executionContextTestFixture =
-        ExecutionContextTestFixture.builder()
-            .protocolSchedule(
-                new ProtocolScheduleBuilder(
-                        genesisConfigOptions,
-                        BigInteger.valueOf(42),
-                        Function.identity(),
-                        PrivacyParameters.DEFAULT,
-                        false,
-                        genesisConfigOptions.isQuorum())
-                    .createProtocolSchedule())
-            .build();
-
-    final EthHashSolver solver =
-        new EthHashSolver(
-            Lists.newArrayList(BLOCK_1_NONCE),
-            new EthHasher.Light(),
-            false,
-            Subscribers.none(),
-            new EpochCalculator.DefaultEpochCalculator());
-
-    final PendingTransactions pendingTransactions =
-        new PendingTransactions(
-            TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
-            1,
-            5,
-            TestClock.fixed(),
-            metricsSystem,
-            executionContextTestFixture.getProtocolContext().getBlockchain()::getChainHeadHeader,
-            TransactionPoolConfiguration.DEFAULT_PRICE_BUMP);
-
-    final EthHashBlockCreator blockCreator =
-        new EthHashBlockCreator(
-            BLOCK_1_COINBASE,
-            parent -> BLOCK_1_EXTRA_DATA,
-            pendingTransactions,
-            executionContextTestFixture.getProtocolContext(),
-            executionContextTestFixture.getProtocolSchedule(),
-            gasLimit -> gasLimit,
-            solver,
-            Wei.ZERO,
-            0.8,
-            executionContextTestFixture.getBlockchain().getChainHeadHeader());
-
-    // A Hashrate should not exist in the block creator prior to creating a block
-    assertThat(blockCreator.getHashesPerSecond().isPresent()).isFalse();
-
-    final Block actualBlock = blockCreator.createBlock(BLOCK_1_TIMESTAMP);
-    final Block expectedBlock = ValidationTestUtils.readBlock(1);
-
-    assertThat(actualBlock).isEqualTo(expectedBlock);
-    assertThat(blockCreator.getHashesPerSecond().isPresent()).isTrue();
-  }
-
-  @Test
-  public void createMainnetBlock1_fixedDifficulty1() {
-    final GenesisConfigOptions genesisConfigOptions =
-        GenesisConfigFile.fromConfig("{\"config\": {\"ethash\": {\"fixeddifficulty\":1}}}")
-            .getConfigOptions();
-    final ExecutionContextTestFixture executionContextTestFixture =
-        ExecutionContextTestFixture.builder()
-            .protocolSchedule(
-                new ProtocolScheduleBuilder(
-                        genesisConfigOptions,
-                        BigInteger.valueOf(42),
-                        Function.identity(),
-                        PrivacyParameters.DEFAULT,
-                        false,
-                        genesisConfigOptions.isQuorum())
-                    .createProtocolSchedule())
-            .build();
-
-    final EthHashSolver solver =
-        new EthHashSolver(
-            Lists.newArrayList(BLOCK_1_NONCE),
-            new EthHasher.Light(),
-            false,
-            Subscribers.none(),
-            new EpochCalculator.DefaultEpochCalculator());
-
-    final PendingTransactions pendingTransactions =
-        new PendingTransactions(
-            TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
-            1,
-            5,
-            TestClock.fixed(),
-            metricsSystem,
-            executionContextTestFixture.getProtocolContext().getBlockchain()::getChainHeadHeader,
-            TransactionPoolConfiguration.DEFAULT_PRICE_BUMP);
-
-    final EthHashBlockCreator blockCreator =
-        new EthHashBlockCreator(
-            BLOCK_1_COINBASE,
-            parent -> BLOCK_1_EXTRA_DATA,
-            pendingTransactions,
-            executionContextTestFixture.getProtocolContext(),
-            executionContextTestFixture.getProtocolSchedule(),
-            gasLimit -> gasLimit,
-            solver,
-            Wei.ZERO,
-            0.8,
-            executionContextTestFixture.getBlockchain().getChainHeadHeader());
-
-    blockCreator.createBlock(BLOCK_1_TIMESTAMP);
-    // If we weren't setting difficulty to 2^256-1 a difficulty of 1 would have caused a
-    // IllegalArgumentException at the previous line, as 2^256 is 33 bytes.
-  }
-
-  @Test
-  public void rewardBeneficiary_zeroReward_skipZeroRewardsFalse() {
-    final GenesisConfigOptions genesisConfigOptions =
-        GenesisConfigFile.fromConfig("{\"config\": {\"ethash\": {\"fixeddifficulty\":1}}}")
-            .getConfigOptions();
-    final ExecutionContextTestFixture executionContextTestFixture =
-        ExecutionContextTestFixture.builder()
-            .protocolSchedule(
-                new ProtocolScheduleBuilder(
-                        genesisConfigOptions,
-                        BigInteger.valueOf(42),
-                        Function.identity(),
-                        PrivacyParameters.DEFAULT,
-                        false,
-                        genesisConfigOptions.isQuorum())
-                    .createProtocolSchedule())
-            .build();
-
-    final EthHashSolver solver =
-        new EthHashSolver(
-            Lists.newArrayList(BLOCK_1_NONCE),
-            new EthHasher.Light(),
-            false,
-            Subscribers.none(),
-            new EpochCalculator.DefaultEpochCalculator());
-
-    final PendingTransactions pendingTransactions =
-        new PendingTransactions(
-            TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
-            1,
-            5,
-            TestClock.fixed(),
-            metricsSystem,
-            executionContextTestFixture.getProtocolContext().getBlockchain()::getChainHeadHeader,
-            TransactionPoolConfiguration.DEFAULT_PRICE_BUMP);
-
-    final EthHashBlockCreator blockCreator =
-        new EthHashBlockCreator(
-            BLOCK_1_COINBASE,
-            parent -> BLOCK_1_EXTRA_DATA,
-            pendingTransactions,
-            executionContextTestFixture.getProtocolContext(),
-            executionContextTestFixture.getProtocolSchedule(),
-            gasLimit -> gasLimit,
-            solver,
-            Wei.ZERO,
-            0.8,
-            executionContextTestFixture.getBlockchain().getChainHeadHeader());
-
-    final MutableWorldState mutableWorldState =
-        executionContextTestFixture.getStateArchive().getMutable();
-    assertThat(mutableWorldState.get(BLOCK_1_COINBASE)).isNull();
-
-    final ProcessableBlockHeader header =
-        BlockHeaderBuilder.create()
-            .parentHash(Hash.ZERO)
-            .coinbase(BLOCK_1_COINBASE)
-            .difficulty(Difficulty.ONE)
-            .number(1)
-            .gasLimit(1)
-            .timestamp(1)
-            .buildProcessableBlockHeader();
-
-    blockCreator.rewardBeneficiary(
-        mutableWorldState, header, Collections.emptyList(), Wei.ZERO, false);
-
-    assertThat(mutableWorldState.get(BLOCK_1_COINBASE)).isNotNull();
-    assertThat(mutableWorldState.get(BLOCK_1_COINBASE).getBalance()).isEqualTo(Wei.ZERO);
-  }
-
-  @Test
-  public void rewardBeneficiary_zeroReward_skipZeroRewardsTrue() {
-    final GenesisConfigOptions genesisConfigOptions =
-        GenesisConfigFile.fromConfig("{\"config\": {\"ethash\": {\"fixeddifficulty\":1}}}")
-            .getConfigOptions();
-    final ExecutionContextTestFixture executionContextTestFixture =
-        ExecutionContextTestFixture.builder()
-            .protocolSchedule(
-                new ProtocolScheduleBuilder(
-                        genesisConfigOptions,
-                        BigInteger.valueOf(42),
-                        Function.identity(),
-                        PrivacyParameters.DEFAULT,
-                        false,
-                        genesisConfigOptions.isQuorum())
-                    .createProtocolSchedule())
-            .build();
-
-    final EthHashSolver solver =
-        new EthHashSolver(
-            Lists.newArrayList(BLOCK_1_NONCE),
-            new EthHasher.Light(),
-            false,
-            Subscribers.none(),
-            new EpochCalculator.DefaultEpochCalculator());
-
-    final PendingTransactions pendingTransactions =
-        new PendingTransactions(
-            TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
-            1,
-            5,
-            TestClock.fixed(),
-            metricsSystem,
-            executionContextTestFixture.getProtocolContext().getBlockchain()::getChainHeadHeader,
-            TransactionPoolConfiguration.DEFAULT_PRICE_BUMP);
-
-    final EthHashBlockCreator blockCreator =
-        new EthHashBlockCreator(
-            BLOCK_1_COINBASE,
-            parent -> BLOCK_1_EXTRA_DATA,
-            pendingTransactions,
-            executionContextTestFixture.getProtocolContext(),
-            executionContextTestFixture.getProtocolSchedule(),
-            gasLimit -> gasLimit,
-            solver,
-            Wei.ZERO,
-            0.8,
-            executionContextTestFixture.getBlockchain().getChainHeadHeader());
-
-    final MutableWorldState mutableWorldState =
-        executionContextTestFixture.getStateArchive().getMutable();
-    assertThat(mutableWorldState.get(BLOCK_1_COINBASE)).isNull();
-
-    final ProcessableBlockHeader header =
-        BlockHeaderBuilder.create()
-            .parentHash(Hash.ZERO)
-            .coinbase(BLOCK_1_COINBASE)
-            .difficulty(Difficulty.ONE)
-            .number(1)
-            .gasLimit(1)
-            .timestamp(1)
-            .buildProcessableBlockHeader();
-
-    blockCreator.rewardBeneficiary(
-        mutableWorldState, header, Collections.emptyList(), Wei.ZERO, true);
-
-    assertThat(mutableWorldState.get(BLOCK_1_COINBASE)).isNull();
-  }
-}
diff --git a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMinerExecutorTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMinerExecutorTest.java
deleted file mode 100644
index 6fde2d92f9d..00000000000
--- a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMinerExecutorTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.blockcreation;
-
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-
-import org.hyperledger.besu.ethereum.core.MiningParameters;
-import org.hyperledger.besu.ethereum.core.MiningParametersTestBuilder;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
-import org.hyperledger.besu.ethereum.mainnet.EpochCalculator;
-import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
-import org.hyperledger.besu.testutil.TestClock;
-import org.hyperledger.besu.util.Subscribers;
-
-import org.junit.Test;
-
-public class EthHashMinerExecutorTest {
-  private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
-
-  @Test
-  public void startingMiningWithoutCoinbaseThrowsException() {
-    final MiningParameters miningParameters =
-        new MiningParametersTestBuilder().coinbase(null).build();
-
-    final PendingTransactions pendingTransactions =
-        new PendingTransactions(
-            TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
-            1,
-            5,
-            TestClock.fixed(),
-            metricsSystem,
-            () -> null,
-            TransactionPoolConfiguration.DEFAULT_PRICE_BUMP);
-
-    final EthHashMinerExecutor executor =
-        new EthHashMinerExecutor(
-            null,
-            null,
-            pendingTransactions,
-            miningParameters,
-            new DefaultBlockScheduler(1, 10, TestClock.fixed()),
-            GasLimitCalculator.constant(),
-            new EpochCalculator.DefaultEpochCalculator());
-
-    assertThatExceptionOfType(CoinbaseNotSetException.class)
-        .isThrownBy(() -> executor.startAsyncMining(Subscribers.create(), Subscribers.none(), null))
-        .withMessageContaining("Unable to start mining without a coinbase.");
-  }
-
-  @Test
-  public void settingCoinbaseToNullThrowsException() {
-    final MiningParameters miningParameters = new MiningParametersTestBuilder().build();
-
-    final PendingTransactions pendingTransactions =
-        new PendingTransactions(
-            TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
-            1,
-            5,
-            TestClock.fixed(),
-            metricsSystem,
-            () -> null,
-            TransactionPoolConfiguration.DEFAULT_PRICE_BUMP);
-
-    final EthHashMinerExecutor executor =
-        new EthHashMinerExecutor(
-            null,
-            null,
-            pendingTransactions,
-            miningParameters,
-            new DefaultBlockScheduler(1, 10, TestClock.fixed()),
-            GasLimitCalculator.constant(),
-            new EpochCalculator.DefaultEpochCalculator());
-
-    assertThatExceptionOfType(IllegalArgumentException.class)
-        .isThrownBy(() -> executor.setCoinbase(null))
-        .withMessageContaining("Coinbase cannot be unset.");
-  }
-}
diff --git a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMiningCoordinatorTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMiningCoordinatorTest.java
deleted file mode 100644
index 50036baeb73..00000000000
--- a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/EthHashMiningCoordinatorTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.blockcreation;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_REMOTE_SEALERS_LIMIT;
-import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_REMOTE_SEALERS_TTL;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.ethereum.core.ExecutionContextTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolution;
-
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.junit.Before;
-import org.junit.Test;
-
-public class EthHashMiningCoordinatorTest {
-
-  private final ExecutionContextTestFixture executionContext = ExecutionContextTestFixture.create();
-  private final SyncState syncState = mock(SyncState.class);
-  private final EthHashMinerExecutor executor = mock(EthHashMinerExecutor.class);
-  private final EthHashBlockMiner miner = mock(EthHashBlockMiner.class);
-
-  @Before
-  public void setUp() {
-    when(syncState.isInSync()).thenReturn(true);
-  }
-
-  @Test
-  public void miningCoordinatorIsCreatedDisabledWithNoReportableMiningStatistics() {
-    final EthHashMiningCoordinator miningCoordinator =
-        new EthHashMiningCoordinator(
-            executionContext.getBlockchain(),
-            executor,
-            syncState,
-            DEFAULT_REMOTE_SEALERS_LIMIT,
-            DEFAULT_REMOTE_SEALERS_TTL);
-    final EthHashSolution solution = new EthHashSolution(1L, Hash.EMPTY, new byte[Bytes32.SIZE]);
-
-    assertThat(miningCoordinator.isMining()).isFalse();
-    assertThat(miningCoordinator.hashesPerSecond()).isEqualTo(Optional.empty());
-    assertThat(miningCoordinator.getWorkDefinition()).isEqualTo(Optional.empty());
-    assertThat(miningCoordinator.submitWork(solution)).isFalse();
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  public void reportedHashRateIsCachedIfNoCurrentDataInMiner() {
-    final Optional<Long> hashRate1 = Optional.of(10L);
-    final Optional<Long> hashRate2 = Optional.empty();
-    final Optional<Long> hashRate3 = Optional.of(20L);
-
-    when(miner.getHashesPerSecond()).thenReturn(hashRate1, hashRate2, hashRate3);
-
-    when(executor.startAsyncMining(any(), any(), any())).thenReturn(Optional.of(miner));
-
-    final EthHashMiningCoordinator miningCoordinator =
-        new EthHashMiningCoordinator(
-            executionContext.getBlockchain(),
-            executor,
-            syncState,
-            DEFAULT_REMOTE_SEALERS_LIMIT,
-            DEFAULT_REMOTE_SEALERS_TTL);
-
-    // Must enable prior returning data
-    miningCoordinator.enable();
-    miningCoordinator.start();
-
-    assertThat(miningCoordinator.hashesPerSecond()).isEqualTo(hashRate1);
-    assertThat(miningCoordinator.hashesPerSecond()).isEqualTo(hashRate1);
-    assertThat(miningCoordinator.hashesPerSecond()).isEqualTo(hashRate3);
-  }
-}
diff --git a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/HashRateMiningCoordinatorTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/HashRateMiningCoordinatorTest.java
index 95de4bc1c84..dffe653feec 100644
--- a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/HashRateMiningCoordinatorTest.java
+++ b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/HashRateMiningCoordinatorTest.java
@@ -33,7 +33,7 @@
 public class HashRateMiningCoordinatorTest {
   private final Blockchain blockchain = mock(Blockchain.class);
   private final SyncState syncState = mock(SyncState.class);
-  private final EthHashMinerExecutor minerExecutor = mock(EthHashMinerExecutor.class);
+  private final PoWMinerExecutor minerExecutor = mock(PoWMinerExecutor.class);
   private final String id;
   private final Long hashRate;
   private final Long wantTotalHashrate;
@@ -66,8 +66,8 @@ public HashRateMiningCoordinatorTest(
 
   @Test
   public void test() {
-    final EthHashMiningCoordinator miningCoordinator =
-        new EthHashMiningCoordinator(blockchain, minerExecutor, syncState, 1000, 10);
+    final PoWMiningCoordinator miningCoordinator =
+        new PoWMiningCoordinator(blockchain, minerExecutor, syncState, 1000, 10);
     for (int i = 0; i < startSealersSize; i++) {
       miningCoordinator.submitHashRate(UUID.randomUUID().toString(), 1L);
     }
diff --git a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/IncrementingNonceGeneratorTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/IncrementingNonceGeneratorTest.java
index d0a09edf86e..04b4ae02622 100644
--- a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/IncrementingNonceGeneratorTest.java
+++ b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/IncrementingNonceGeneratorTest.java
@@ -22,7 +22,7 @@ public class IncrementingNonceGeneratorTest {
 
   @Test
   public void firstValueProvidedIsSuppliedAtConstruction() {
-    final Long initialValue = 0L;
+    final long initialValue = 0L;
     final IncrementingNonceGenerator generator = new IncrementingNonceGenerator(initialValue);
 
     assertThat(generator.iterator().next()).isEqualTo(initialValue);
@@ -30,7 +30,7 @@ public void firstValueProvidedIsSuppliedAtConstruction() {
 
   @Test
   public void rollOverFromMaxResetsToZero() {
-    final Long initialValue = 0xFFFFFFFFFFFFFFFFL;
+    final long initialValue = 0xFFFFFFFFFFFFFFFFL;
     final IncrementingNonceGenerator generator = new IncrementingNonceGenerator(initialValue);
 
     assertThat(generator.iterator().next()).isEqualTo(initialValue);
diff --git a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/LegacyFeeMarketBlockTransactionSelectorTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/LegacyFeeMarketBlockTransactionSelectorTest.java
new file mode 100644
index 00000000000..195c25b6634
--- /dev/null
+++ b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/LegacyFeeMarketBlockTransactionSelectorTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.blockcreation;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.eth.transactions.sorter.GasPricePendingTransactionsSorter;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.evm.gascalculator.BerlinGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.testutil.TestClock;
+
+import java.time.ZoneId;
+import java.util.Optional;
+
+public class LegacyFeeMarketBlockTransactionSelectorTest
+    extends AbstractBlockTransactionSelectorTest {
+
+  @Override
+  protected PendingTransactions createPendingTransactions() {
+
+    return new GasPricePendingTransactionsSorter(
+        ImmutableTransactionPoolConfiguration.builder()
+            .txPoolMaxSize(5)
+            .txPoolLimitByAccountPercentage(1)
+            .build(),
+        TestClock.system(ZoneId.systemDefault()),
+        metricsSystem,
+        LegacyFeeMarketBlockTransactionSelectorTest::mockBlockHeader);
+  }
+
+  private static BlockHeader mockBlockHeader() {
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getBaseFee()).thenReturn(Optional.empty());
+    return blockHeader;
+  }
+
+  @Override
+  protected FeeMarket getFeeMarket() {
+    return FeeMarket.legacy();
+  }
+
+  @Override
+  protected GasCalculator getGasCalculator() {
+    return new BerlinGasCalculator();
+  }
+}
diff --git a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/LondonFeeMarketBlockTransactionSelectorTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/LondonFeeMarketBlockTransactionSelectorTest.java
new file mode 100644
index 00000000000..0b4308341ee
--- /dev/null
+++ b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/LondonFeeMarketBlockTransactionSelectorTest.java
@@ -0,0 +1,223 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.blockcreation;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.AddressHelpers;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
+import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.eth.transactions.sorter.BaseFeePendingTransactionsSorter;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.gascalculator.LondonGasCalculator;
+import org.hyperledger.besu.plugin.data.TransactionType;
+import org.hyperledger.besu.testutil.TestClock;
+
+import java.math.BigInteger;
+import java.time.ZoneId;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Test;
+
+public class LondonFeeMarketBlockTransactionSelectorTest
+    extends AbstractBlockTransactionSelectorTest {
+
+  @Override
+  protected PendingTransactions createPendingTransactions() {
+    return new BaseFeePendingTransactionsSorter(
+        ImmutableTransactionPoolConfiguration.builder()
+            .txPoolMaxSize(5)
+            .txPoolLimitByAccountPercentage(1)
+            .build(),
+        TestClock.system(ZoneId.systemDefault()),
+        metricsSystem,
+        LondonFeeMarketBlockTransactionSelectorTest::mockBlockHeader);
+  }
+
+  @Override
+  protected GasCalculator getGasCalculator() {
+    return new LondonGasCalculator();
+  }
+
+  private static BlockHeader mockBlockHeader() {
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getBaseFee()).thenReturn(Optional.of(Wei.ONE));
+    return blockHeader;
+  }
+
+  @Override
+  protected FeeMarket getFeeMarket() {
+    return FeeMarket.london(0L);
+  }
+
+  @Test
+  public void eip1559TransactionCurrentGasPriceLessThanMinimumIsSkippedAndKeptInThePool() {
+    final ProcessableBlockHeader blockHeader = createBlock(301, Wei.ONE);
+
+    final Address miningBeneficiary = AddressHelpers.ofValue(1);
+    final BlockTransactionSelector selector =
+        createBlockSelector(
+            transactionProcessor,
+            blockHeader,
+            Wei.of(6),
+            miningBeneficiary,
+            Wei.ZERO,
+            MIN_OCCUPANCY_80_PERCENT);
+
+    // tx is willing to pay max 6 wei for gas, but current network condition (baseFee == 1)
+    // result in it paying 2 wei, that is below the minimum accepted by the node, so it is skipped
+    final Transaction tx = createEIP1559Transaction(1, Wei.of(6L), Wei.ONE);
+    pendingTransactions.addRemoteTransaction(tx, Optional.empty());
+
+    final BlockTransactionSelector.TransactionSelectionResults results =
+        selector.buildTransactionListForBlock();
+
+    assertThat(results.getTransactions().size()).isEqualTo(0);
+    assertThat(pendingTransactions.size()).isEqualTo(1);
+  }
+
+  @Test
+  public void eip1559TransactionCurrentGasPriceGreaterThanMinimumIsSelected() {
+    final ProcessableBlockHeader blockHeader = createBlock(301, Wei.of(5));
+
+    final Address miningBeneficiary = AddressHelpers.ofValue(1);
+    final BlockTransactionSelector selector =
+        createBlockSelector(
+            transactionProcessor,
+            blockHeader,
+            Wei.of(6),
+            miningBeneficiary,
+            Wei.ZERO,
+            MIN_OCCUPANCY_80_PERCENT);
+
+    // tx is willing to pay max 6 wei for gas, and current network condition (baseFee == 5)
+    // result in it paying the max, that is >= the minimum accepted by the node, so it is selected
+    final Transaction tx = createEIP1559Transaction(1, Wei.of(6), Wei.ONE);
+    pendingTransactions.addRemoteTransaction(tx, Optional.empty());
+
+    ensureTransactionIsValid(tx);
+
+    final BlockTransactionSelector.TransactionSelectionResults results =
+        selector.buildTransactionListForBlock();
+
+    assertThat(results.getTransactions().size()).isEqualTo(1);
+    assertThat(pendingTransactions.size()).isEqualTo(1);
+  }
+
+  @Test
+  public void eip1559LocalTransactionCurrentGasPriceLessThanMinimumIsSelected() {
+    final ProcessableBlockHeader blockHeader = createBlock(301, Wei.ONE);
+
+    final Address miningBeneficiary = AddressHelpers.ofValue(1);
+    final BlockTransactionSelector selector =
+        createBlockSelector(
+            transactionProcessor,
+            blockHeader,
+            Wei.of(6),
+            miningBeneficiary,
+            Wei.ZERO,
+            MIN_OCCUPANCY_80_PERCENT);
+
+    // tx is willing to pay max 6 wei for gas, but current network condition (baseFee == 1)
+    // result in it paying 2 wei, that is below the minimum accepted by the node, but since it is
+    // a local sender it is accepted anyway
+    final Transaction tx = createEIP1559Transaction(1, Wei.of(6L), Wei.ONE);
+    pendingTransactions.addLocalTransaction(tx, Optional.empty());
+
+    ensureTransactionIsValid(tx);
+
+    final BlockTransactionSelector.TransactionSelectionResults results =
+        selector.buildTransactionListForBlock();
+
+    assertThat(results.getTransactions().size()).isEqualTo(1);
+    assertThat(pendingTransactions.size()).isEqualTo(1);
+  }
+
+  @Test
+  public void transactionFromSameSenderWithMixedTypes() {
+    final ProcessableBlockHeader blockHeader = createBlock(5000);
+
+    final TransactionTestFixture txTestFixture = new TransactionTestFixture();
+    final Transaction txFrontier1 =
+        txTestFixture
+            .type(TransactionType.FRONTIER)
+            .nonce(0)
+            .gasLimit(1)
+            .gasPrice(Wei.ONE)
+            .createTransaction(keyPair);
+    final Transaction txLondon1 = createEIP1559Transaction(1, Wei.ONE, Wei.ONE);
+    final Transaction txFrontier2 =
+        txTestFixture
+            .type(TransactionType.FRONTIER)
+            .nonce(2)
+            .gasLimit(1)
+            .gasPrice(Wei.ONE)
+            .createTransaction(keyPair);
+    final Transaction txLondon2 = createEIP1559Transaction(3, Wei.ONE, Wei.ONE);
+
+    pendingTransactions.addRemoteTransaction(txFrontier1, Optional.empty());
+    pendingTransactions.addRemoteTransaction(txLondon1, Optional.empty());
+    pendingTransactions.addRemoteTransaction(txFrontier2, Optional.empty());
+    pendingTransactions.addRemoteTransaction(txLondon2, Optional.empty());
+
+    ensureTransactionIsValid(txFrontier1);
+    ensureTransactionIsValid(txLondon1);
+    ensureTransactionIsValid(txFrontier2);
+    ensureTransactionIsValid(txLondon2);
+
+    final Address miningBeneficiary = AddressHelpers.ofValue(1);
+    final BlockTransactionSelector selector =
+        createBlockSelector(
+            transactionProcessor,
+            blockHeader,
+            Wei.ZERO,
+            miningBeneficiary,
+            Wei.ZERO,
+            MIN_OCCUPANCY_80_PERCENT);
+
+    final BlockTransactionSelector.TransactionSelectionResults results =
+        selector.buildTransactionListForBlock();
+
+    assertThat(results.getTransactions())
+        .containsExactly(txFrontier1, txLondon1, txFrontier2, txLondon2);
+  }
+
+  private Transaction createEIP1559Transaction(
+      final int transactionNumber, final Wei maxFeePerGas, final Wei maxPriorityFeePerGas) {
+    return Transaction.builder()
+        .type(TransactionType.EIP1559)
+        .gasLimit(100)
+        .maxFeePerGas(maxFeePerGas)
+        .maxPriorityFeePerGas(maxPriorityFeePerGas)
+        .nonce(transactionNumber)
+        .payload(Bytes.EMPTY)
+        .to(Address.ID)
+        .value(Wei.of(transactionNumber))
+        .sender(Address.ID)
+        .chainId(BigInteger.ONE)
+        .guessType()
+        .signAndBuild(keyPair);
+  }
+}
diff --git a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/PoWBlockCreatorTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/PoWBlockCreatorTest.java
new file mode 100644
index 00000000000..4cc3d369ca8
--- /dev/null
+++ b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/PoWBlockCreatorTest.java
@@ -0,0 +1,329 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.blockcreation;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.blockcreation.BlockCreator.BlockCreationResult;
+import org.hyperledger.besu.ethereum.blockcreation.BlockTransactionSelector.TransactionSelectionResults;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.ExecutionContextTestFixture;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
+import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.sorter.BaseFeePendingTransactionsSorter;
+import org.hyperledger.besu.ethereum.mainnet.EpochCalculator;
+import org.hyperledger.besu.ethereum.mainnet.PoWHasher;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolver;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpecAdapters;
+import org.hyperledger.besu.ethereum.mainnet.ValidationTestUtils;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.testutil.TestClock;
+import org.hyperledger.besu.util.Subscribers;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.function.Function;
+
+import com.google.common.collect.Lists;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Test;
+
+class PoWBlockCreatorTest extends AbstractBlockCreatorTest {
+
+  private final Address BLOCK_1_COINBASE =
+      Address.fromHexString("0x05a56e2d52c817161883f50c441c3228cfe54d9f");
+
+  private static final long BLOCK_1_TIMESTAMP = Long.parseUnsignedLong("55ba4224", 16);
+
+  private static final long BLOCK_1_NONCE = Long.parseLong("539bd4979fef1ec4", 16);
+
+  private static final Bytes BLOCK_1_EXTRA_DATA =
+      Bytes.fromHexString("0x476574682f76312e302e302f6c696e75782f676f312e342e32");
+  private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
+
+  @Test
+  void createMainnetBlock1() throws IOException {
+    final GenesisConfigOptions genesisConfigOptions = GenesisConfigFile.DEFAULT.getConfigOptions();
+    final ExecutionContextTestFixture executionContextTestFixture =
+        ExecutionContextTestFixture.builder()
+            .protocolSchedule(
+                new ProtocolScheduleBuilder(
+                        genesisConfigOptions,
+                        BigInteger.valueOf(42),
+                        ProtocolSpecAdapters.create(0, Function.identity()),
+                        PrivacyParameters.DEFAULT,
+                        false,
+                        EvmConfiguration.DEFAULT)
+                    .createProtocolSchedule())
+            .build();
+
+    final PoWSolver solver =
+        new PoWSolver(
+            Lists.newArrayList(BLOCK_1_NONCE),
+            PoWHasher.ETHASH_LIGHT,
+            false,
+            Subscribers.none(),
+            new EpochCalculator.DefaultEpochCalculator(),
+            1000,
+            8);
+
+    final BaseFeePendingTransactionsSorter pendingTransactions =
+        new BaseFeePendingTransactionsSorter(
+            ImmutableTransactionPoolConfiguration.builder().txPoolMaxSize(1).build(),
+            TestClock.fixed(),
+            metricsSystem,
+            executionContextTestFixture.getProtocolContext().getBlockchain()::getChainHeadHeader);
+
+    final PoWBlockCreator blockCreator =
+        new PoWBlockCreator(
+            BLOCK_1_COINBASE,
+            Optional::empty,
+            parent -> BLOCK_1_EXTRA_DATA,
+            pendingTransactions,
+            executionContextTestFixture.getProtocolContext(),
+            executionContextTestFixture.getProtocolSchedule(),
+            solver,
+            Wei.ZERO,
+            0.8,
+            executionContextTestFixture.getBlockchain().getChainHeadHeader());
+
+    // A Hashrate should not exist in the block creator prior to creating a block
+    assertThat(blockCreator.getHashesPerSecond()).isNotPresent();
+
+    final BlockCreationResult blockResult = blockCreator.createBlock(BLOCK_1_TIMESTAMP);
+    final Block actualBlock = blockResult.getBlock();
+    final Block expectedBlock = ValidationTestUtils.readBlock(1);
+
+    assertThat(actualBlock).isEqualTo(expectedBlock);
+    assertThat(blockCreator.getHashesPerSecond()).isPresent();
+    assertThat(blockResult.getTransactionSelectionResults())
+        .isEqualTo(new TransactionSelectionResults());
+  }
+
+  @Test
+  void createMainnetBlock1_fixedDifficulty1() {
+    final GenesisConfigOptions genesisConfigOptions =
+        GenesisConfigFile.fromConfig("{\"config\": {\"ethash\": {\"fixeddifficulty\":1}}}")
+            .getConfigOptions();
+    final ExecutionContextTestFixture executionContextTestFixture =
+        ExecutionContextTestFixture.builder()
+            .protocolSchedule(
+                new ProtocolScheduleBuilder(
+                        genesisConfigOptions,
+                        BigInteger.valueOf(42),
+                        ProtocolSpecAdapters.create(0, Function.identity()),
+                        PrivacyParameters.DEFAULT,
+                        false,
+                        EvmConfiguration.DEFAULT)
+                    .createProtocolSchedule())
+            .build();
+
+    final PoWSolver solver =
+        new PoWSolver(
+            Lists.newArrayList(BLOCK_1_NONCE),
+            PoWHasher.ETHASH_LIGHT,
+            false,
+            Subscribers.none(),
+            new EpochCalculator.DefaultEpochCalculator(),
+            1000,
+            8);
+
+    final BaseFeePendingTransactionsSorter pendingTransactions =
+        new BaseFeePendingTransactionsSorter(
+            ImmutableTransactionPoolConfiguration.builder().txPoolMaxSize(1).build(),
+            TestClock.fixed(),
+            metricsSystem,
+            executionContextTestFixture.getProtocolContext().getBlockchain()::getChainHeadHeader);
+
+    final PoWBlockCreator blockCreator =
+        new PoWBlockCreator(
+            BLOCK_1_COINBASE,
+            Optional::empty,
+            parent -> BLOCK_1_EXTRA_DATA,
+            pendingTransactions,
+            executionContextTestFixture.getProtocolContext(),
+            executionContextTestFixture.getProtocolSchedule(),
+            solver,
+            Wei.ZERO,
+            0.8,
+            executionContextTestFixture.getBlockchain().getChainHeadHeader());
+
+    assertThat(blockCreator.createBlock(BLOCK_1_TIMESTAMP)).isNotNull();
+    // If we weren't setting difficulty to 2^256-1 a difficulty of 1 would have caused a
+    // IllegalArgumentException at the previous line, as 2^256 is 33 bytes.
+  }
+
+  @Test
+  void rewardBeneficiary_zeroReward_skipZeroRewardsFalse() {
+    final GenesisConfigOptions genesisConfigOptions =
+        GenesisConfigFile.fromConfig("{\"config\": {\"ethash\": {\"fixeddifficulty\":1}}}")
+            .getConfigOptions();
+    ProtocolSchedule protocolSchedule =
+        new ProtocolScheduleBuilder(
+                genesisConfigOptions,
+                BigInteger.valueOf(42),
+                ProtocolSpecAdapters.create(0, Function.identity()),
+                PrivacyParameters.DEFAULT,
+                false,
+                EvmConfiguration.DEFAULT)
+            .createProtocolSchedule();
+    final ExecutionContextTestFixture executionContextTestFixture =
+        ExecutionContextTestFixture.builder().protocolSchedule(protocolSchedule).build();
+
+    final PoWSolver solver =
+        new PoWSolver(
+            Lists.newArrayList(BLOCK_1_NONCE),
+            PoWHasher.ETHASH_LIGHT,
+            false,
+            Subscribers.none(),
+            new EpochCalculator.DefaultEpochCalculator(),
+            1000,
+            8);
+
+    final BaseFeePendingTransactionsSorter pendingTransactions =
+        new BaseFeePendingTransactionsSorter(
+            ImmutableTransactionPoolConfiguration.builder().txPoolMaxSize(1).build(),
+            TestClock.fixed(),
+            metricsSystem,
+            executionContextTestFixture.getProtocolContext().getBlockchain()::getChainHeadHeader);
+
+    final PoWBlockCreator blockCreator =
+        new PoWBlockCreator(
+            BLOCK_1_COINBASE,
+            () -> Optional.of(10_000_000L),
+            parent -> BLOCK_1_EXTRA_DATA,
+            pendingTransactions,
+            executionContextTestFixture.getProtocolContext(),
+            executionContextTestFixture.getProtocolSchedule(),
+            solver,
+            Wei.ZERO,
+            0.8,
+            executionContextTestFixture.getBlockchain().getChainHeadHeader());
+
+    final MutableWorldState mutableWorldState =
+        executionContextTestFixture.getStateArchive().getMutable();
+    assertThat(mutableWorldState.get(BLOCK_1_COINBASE)).isNull();
+
+    final ProcessableBlockHeader header =
+        BlockHeaderBuilder.create()
+            .parentHash(Hash.ZERO)
+            .coinbase(BLOCK_1_COINBASE)
+            .difficulty(Difficulty.ONE)
+            .number(1)
+            .gasLimit(1)
+            .timestamp(1)
+            .buildProcessableBlockHeader();
+
+    blockCreator.rewardBeneficiary(
+        mutableWorldState,
+        header,
+        Collections.emptyList(),
+        BLOCK_1_COINBASE,
+        Wei.ZERO,
+        false,
+        protocolSchedule.getByBlockHeader(header));
+
+    assertThat(mutableWorldState.get(BLOCK_1_COINBASE)).isNotNull();
+    assertThat(mutableWorldState.get(BLOCK_1_COINBASE).getBalance()).isEqualTo(Wei.ZERO);
+  }
+
+  @Test
+  void rewardBeneficiary_zeroReward_skipZeroRewardsTrue() {
+    final GenesisConfigOptions genesisConfigOptions =
+        GenesisConfigFile.fromConfig("{\"config\": {\"ethash\": {\"fixeddifficulty\":1}}}")
+            .getConfigOptions();
+    ProtocolSchedule protocolSchedule =
+        new ProtocolScheduleBuilder(
+                genesisConfigOptions,
+                BigInteger.valueOf(42),
+                ProtocolSpecAdapters.create(0, Function.identity()),
+                PrivacyParameters.DEFAULT,
+                false,
+                EvmConfiguration.DEFAULT)
+            .createProtocolSchedule();
+    final ExecutionContextTestFixture executionContextTestFixture =
+        ExecutionContextTestFixture.builder().protocolSchedule(protocolSchedule).build();
+
+    final PoWSolver solver =
+        new PoWSolver(
+            Lists.newArrayList(BLOCK_1_NONCE),
+            PoWHasher.ETHASH_LIGHT,
+            false,
+            Subscribers.none(),
+            new EpochCalculator.DefaultEpochCalculator(),
+            1000,
+            8);
+
+    final BaseFeePendingTransactionsSorter pendingTransactions =
+        new BaseFeePendingTransactionsSorter(
+            ImmutableTransactionPoolConfiguration.builder().txPoolMaxSize(1).build(),
+            TestClock.fixed(),
+            metricsSystem,
+            executionContextTestFixture.getProtocolContext().getBlockchain()::getChainHeadHeader);
+
+    final PoWBlockCreator blockCreator =
+        new PoWBlockCreator(
+            BLOCK_1_COINBASE,
+            () -> Optional.of(10_000_000L),
+            parent -> BLOCK_1_EXTRA_DATA,
+            pendingTransactions,
+            executionContextTestFixture.getProtocolContext(),
+            executionContextTestFixture.getProtocolSchedule(),
+            solver,
+            Wei.ZERO,
+            0.8,
+            executionContextTestFixture.getBlockchain().getChainHeadHeader());
+
+    final MutableWorldState mutableWorldState =
+        executionContextTestFixture.getStateArchive().getMutable();
+    assertThat(mutableWorldState.get(BLOCK_1_COINBASE)).isNull();
+
+    final ProcessableBlockHeader header =
+        BlockHeaderBuilder.create()
+            .parentHash(Hash.ZERO)
+            .coinbase(BLOCK_1_COINBASE)
+            .difficulty(Difficulty.ONE)
+            .number(1)
+            .gasLimit(1)
+            .timestamp(1)
+            .buildProcessableBlockHeader();
+
+    blockCreator.rewardBeneficiary(
+        mutableWorldState,
+        header,
+        Collections.emptyList(),
+        BLOCK_1_COINBASE,
+        Wei.ZERO,
+        true,
+        protocolSchedule.getByBlockHeader(header));
+
+    assertThat(mutableWorldState.get(BLOCK_1_COINBASE)).isNull();
+  }
+}
diff --git a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/PoWMinerExecutorTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/PoWMinerExecutorTest.java
new file mode 100644
index 00000000000..6c4a9f1b31d
--- /dev/null
+++ b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/PoWMinerExecutorTest.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.blockcreation;
+
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.sorter.GasPricePendingTransactionsSorter;
+import org.hyperledger.besu.ethereum.mainnet.EpochCalculator;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.testutil.TestClock;
+import org.hyperledger.besu.util.Subscribers;
+
+import java.time.ZoneId;
+import java.util.Optional;
+
+import org.junit.Test;
+
+public class PoWMinerExecutorTest {
+  private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
+
+  @Test
+  public void startingMiningWithoutCoinbaseThrowsException() {
+    final MiningParameters miningParameters =
+        new MiningParameters.Builder().coinbase(null).minTransactionGasPrice(Wei.of(1000)).build();
+
+    final GasPricePendingTransactionsSorter pendingTransactions =
+        new GasPricePendingTransactionsSorter(
+            ImmutableTransactionPoolConfiguration.builder().txPoolMaxSize(1).build(),
+            TestClock.system(ZoneId.systemDefault()),
+            metricsSystem,
+            PoWMinerExecutorTest::mockBlockHeader);
+
+    final PoWMinerExecutor executor =
+        new PoWMinerExecutor(
+            null,
+            null,
+            pendingTransactions,
+            miningParameters,
+            new DefaultBlockScheduler(1, 10, TestClock.fixed()),
+            new EpochCalculator.DefaultEpochCalculator(),
+            1000,
+            8);
+
+    assertThatExceptionOfType(CoinbaseNotSetException.class)
+        .isThrownBy(() -> executor.startAsyncMining(Subscribers.create(), Subscribers.none(), null))
+        .withMessageContaining("Unable to start mining without a coinbase.");
+  }
+
+  @Test
+  public void settingCoinbaseToNullThrowsException() {
+    final MiningParameters miningParameters = new MiningParameters.Builder().build();
+
+    final GasPricePendingTransactionsSorter pendingTransactions =
+        new GasPricePendingTransactionsSorter(
+            ImmutableTransactionPoolConfiguration.builder().txPoolMaxSize(1).build(),
+            TestClock.system(ZoneId.systemDefault()),
+            metricsSystem,
+            PoWMinerExecutorTest::mockBlockHeader);
+
+    final PoWMinerExecutor executor =
+        new PoWMinerExecutor(
+            null,
+            null,
+            pendingTransactions,
+            miningParameters,
+            new DefaultBlockScheduler(1, 10, TestClock.fixed()),
+            new EpochCalculator.DefaultEpochCalculator(),
+            1000,
+            8);
+
+    assertThatExceptionOfType(IllegalArgumentException.class)
+        .isThrownBy(() -> executor.setCoinbase(null))
+        .withMessageContaining("Coinbase cannot be unset.");
+  }
+
+  private static BlockHeader mockBlockHeader() {
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getBaseFee()).thenReturn(Optional.empty());
+    return blockHeader;
+  }
+}
diff --git a/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/PoWMiningCoordinatorTest.java b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/PoWMiningCoordinatorTest.java
new file mode 100644
index 00000000000..556c8f72b7e
--- /dev/null
+++ b/ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/PoWMiningCoordinatorTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.blockcreation;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_REMOTE_SEALERS_LIMIT;
+import static org.hyperledger.besu.ethereum.core.MiningParameters.DEFAULT_REMOTE_SEALERS_TTL;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.ExecutionContextTestFixture;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolution;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.Before;
+import org.junit.Test;
+
+public class PoWMiningCoordinatorTest {
+
+  private final ExecutionContextTestFixture executionContext = ExecutionContextTestFixture.create();
+  private final SyncState syncState = mock(SyncState.class);
+  private final PoWMinerExecutor executor = mock(PoWMinerExecutor.class);
+  private final PoWBlockMiner miner = mock(PoWBlockMiner.class);
+
+  @Before
+  public void setUp() {
+    when(syncState.isInSync()).thenReturn(true);
+  }
+
+  @Test
+  public void miningCoordinatorIsCreatedDisabledWithNoReportableMiningStatistics() {
+    final PoWMiningCoordinator miningCoordinator =
+        new PoWMiningCoordinator(
+            executionContext.getBlockchain(),
+            executor,
+            syncState,
+            DEFAULT_REMOTE_SEALERS_LIMIT,
+            DEFAULT_REMOTE_SEALERS_TTL);
+    final PoWSolution solution = new PoWSolution(1L, Hash.EMPTY, null, Bytes32.ZERO);
+
+    assertThat(miningCoordinator.isMining()).isFalse();
+    assertThat(miningCoordinator.hashesPerSecond()).isEqualTo(Optional.empty());
+    assertThat(miningCoordinator.getWorkDefinition()).isEqualTo(Optional.empty());
+    assertThat(miningCoordinator.submitWork(solution)).isFalse();
+  }
+
+  @Test
+  @SuppressWarnings("unchecked")
+  public void reportedHashRateIsCachedIfNoCurrentDataInMiner() {
+    final Optional<Long> hashRate1 = Optional.of(10L);
+    final Optional<Long> hashRate2 = Optional.empty();
+    final Optional<Long> hashRate3 = Optional.of(20L);
+
+    when(miner.getHashesPerSecond()).thenReturn(hashRate1, hashRate2, hashRate3);
+
+    when(executor.startAsyncMining(any(), any(), any())).thenReturn(Optional.of(miner));
+
+    final PoWMiningCoordinator miningCoordinator =
+        new PoWMiningCoordinator(
+            executionContext.getBlockchain(),
+            executor,
+            syncState,
+            DEFAULT_REMOTE_SEALERS_LIMIT,
+            DEFAULT_REMOTE_SEALERS_TTL);
+
+    // Must enable prior returning data
+    miningCoordinator.enable();
+    miningCoordinator.start();
+
+    assertThat(miningCoordinator.hashesPerSecond()).isEqualTo(hashRate1);
+    assertThat(miningCoordinator.hashesPerSecond()).isEqualTo(hashRate1);
+    assertThat(miningCoordinator.hashesPerSecond()).isEqualTo(hashRate3);
+  }
+}
diff --git a/ethereum/core/build.gradle b/ethereum/core/build.gradle
index c2c2a4416ba..d89acef3fcd 100644
--- a/ethereum/core/build.gradle
+++ b/ethereum/core/build.gradle
@@ -28,54 +28,78 @@ jar {
 }
 
 dependencies {
+  api 'org.slf4j:slf4j-api'
+  api 'org.web3j:core'
+
   annotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess'
 
   implementation project(':config')
-  implementation project(':crypto')
+  implementation project(':crypto:algorithms')
+  implementation project(':datatypes')
   implementation project(':enclave')
   implementation project(':ethereum:rlp')
   implementation project(':ethereum:trie')
+  implementation project(':evm')
   implementation project(':metrics:core')
   implementation project(':plugin-api')
   implementation project(':services:kvstore')
 
+
   implementation 'com.fasterxml.jackson.core:jackson-databind'
   implementation 'com.google.guava:guava'
+  implementation 'com.google.dagger:dagger'
+  annotationProcessor 'com.google.dagger:dagger-compiler'
+  implementation 'io.opentelemetry:opentelemetry-api'
   implementation 'io.vertx:vertx-core'
+
   implementation 'net.java.dev.jna:jna'
-  implementation 'org.apache.logging.log4j:log4j-api'
-  implementation 'org.apache.tuweni:bytes'
-  implementation 'org.apache.tuweni:units'
+  implementation 'org.apache.commons:commons-lang3'
+  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-concurrent'
+  implementation 'org.apache.tuweni:tuweni-units'
+  implementation 'org.apache.tuweni:tuweni-rlp'
   implementation 'org.hyperledger.besu:bls12-381'
   implementation 'org.immutables:value-annotations'
   implementation 'org.openquantumsafe:liboqs-java'
 
+  implementation 'io.prometheus:simpleclient_guava'
+
   implementation 'org.xerial.snappy:snappy-java'
 
   annotationProcessor 'org.immutables:value'
 
-  runtimeOnly 'org.apache.logging.log4j:log4j-core'
-
   testImplementation project(path: ':config', configuration: 'testSupportArtifacts')
+  testImplementation project(path: ':ethereum:api')
+  testImplementation project(path: ':ethereum:blockcreation')
   testImplementation project(path: ':ethereum:referencetests')
-  testImplementation project(path: ':ethereum:referencetests', configuration: 'testOutput')
+  testImplementation project(path: ':ethereum:eth')
   testImplementation project(':testutil')
+  testImplementation project(path: ':plugins:rocksdb')
+
 
   testImplementation 'junit:junit'
   testImplementation 'org.apache.logging.log4j:log4j-core'
-  testImplementation 'org.apache.tuweni:bytes'
-  testImplementation 'org.apache.tuweni:io'
-  testImplementation 'org.apache.tuweni:units'
+  testImplementation 'org.apache.tuweni:tuweni-bytes'
+  testImplementation 'org.apache.tuweni:tuweni-io'
+  testImplementation 'org.apache.tuweni:tuweni-units'
   testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
+  testImplementation 'org.junit.jupiter:junit-jupiter-params'
   testImplementation 'org.mockito:mockito-core'
+  testImplementation 'org.mockito:mockito-junit-jupiter'
+  testImplementation 'org.awaitility:awaitility'
+
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 
   integrationTestImplementation project(path: ':config', configuration: 'testSupportArtifacts')
   integrationTestImplementation project(':testutil')
 
-  integrationTestImplementation 'junit:junit'
-  integrationTestImplementation 'net.consensys:orion'
   integrationTestImplementation 'org.assertj:assertj-core'
+  integrationTestImplementation 'org.junit.jupiter:junit-jupiter-api'
   integrationTestImplementation 'org.mockito:mockito-core'
+  integrationTestImplementation 'org.testcontainers:testcontainers'
+
+  integrationTestRuntimeOnly 'org.junit.jupiter:junit-jupiter'
 
   testSupportImplementation project(path: ':config', configuration: 'testSupportArtifacts')
   testSupportImplementation project(':ethereum:eth')
@@ -86,7 +110,7 @@ dependencies {
   testSupportImplementation 'org.mockito:mockito-core'
 
   jmhImplementation project(path: ':config', configuration: 'testSupportArtifacts')
-  jmhImplementation project(':crypto')
+  jmhImplementation project(':crypto:algorithms')
   jmhImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
   jmhImplementation project(':ethereum:rlp')
   jmhImplementation project(':ethereum:trie')
@@ -105,129 +129,6 @@ task testJar(type: Jar) {
   from sourceSets.test.output
 }
 
-test {
-  exclude 'org/hyperledger/besu/ethereum/mainnet/DifficultyCalculatorTests.class'
-  exclude 'org/hyperledger/besu/ethereum/core/TransactionTest.class'
-  exclude 'org/hyperledger/besu/ethereum/vm/**ReferenceTest.class'
-  exclude 'org/hyperledger/besu/ethereum/vm/blockchain/**.class'
-  exclude 'org/hyperledger/besu/ethereum/vm/generalstate/**.class'
-}
-
-def generateTestFiles(FileTree jsonPath, File templateFile, String pathstrip, String destination, String namePrefix, String ... excludedPath) {
-  def referenceTestTemplate = templateFile.text
-
-  // This is how many json files to include in each test file
-  def fileSets = jsonPath.getFiles().collate(5)
-
-  fileSets.eachWithIndex { fileSet, idx ->
-    def paths = []
-    fileSet.each { testJsonFile ->
-      def parentFile = testJsonFile.getParentFile()
-      def parentPathFile = parentFile.getPath().substring(parentFile.getPath().indexOf(pathstrip))
-      if (!testJsonFile.getName().toString().startsWith(".") && !excludedPath.contains(parentPathFile)) {
-        def pathFile = testJsonFile.getPath()
-        paths << pathFile.substring(pathFile.indexOf(pathstrip))
-      }
-    }
-
-    def testFile = file(destination + "/" + namePrefix + "_" + idx + ".java")
-
-    def allPaths = '"' + paths.join('", "') + '"'
-
-    def testFileContents = referenceTestTemplate
-      .replaceAll("%%TESTS_FILE%%", allPaths)
-      .replaceAll("%%TESTS_NAME%%", namePrefix + "_" + idx)
-    testFile.newWriter().withWriter { w -> w << testFileContents }
-  }
-}
-
-task blockchainReferenceTestsSetup {
-  generateTestFiles(
-    fileTree('../referencetests/src/test/resources/BlockchainTests'),
-    file("./src/test/resources/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTest.java.template"),
-    "BlockchainTests",
-    "./src/test/java/org/hyperledger/besu/ethereum/vm/blockchain",
-    "BlockchainReferenceTest",
-    ("BlockchainTests/InvalidBlocks/bcExpectSection") // exclude test for test filling tool
-    )
-}
-
-task legacyBlockchainReferenceTestsSetup {
-  generateTestFiles(
-    fileTree('../referencetests/src/test/resources/LegacyTests/Constantinople/BlockchainTests'),
-    file("./src/test/resources/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTest.java.template"),
-    "LegacyTests",
-    "./src/test/java/org/hyperledger/besu/ethereum/vm/blockchain",
-    "LegacyBlockchainReferenceTest",
-    ("BlockchainTests/InvalidBlocks/bcExpectSection") // exclude test for test filling tool
-    )
-}
-
-task generalstateReferenceTestsSetup {
-  generateTestFiles(
-    fileTree("../referencetests/src/test/resources/GeneralStateTests"),
-    file("./src/test/resources/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTest.java.template"),
-    "GeneralStateTests",
-    "./src/test/java/org/hyperledger/besu/ethereum/vm/generalstate",
-    "GeneralStateReferenceTest"
-    )
-}
-
-task legacyGeneralstateReferenceTestsSetup {
-  generateTestFiles(
-    fileTree('../referencetests/src/test/resources/LegacyTests/Constantinople/GeneralStateTests'),
-    file("./src/test/resources/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTest.java.template"),
-    "LegacyTests",
-    "./src/test/java/org/hyperledger/besu/ethereum/vm/generalstate",
-    "LegacyGeneralStateReferenceTest"
-    )
-}
-
-task generalstateRegressionReferenceTestsSetup {
-  generateTestFiles(
-    fileTree("./src/test/resources/regressions/generalstate"),
-    file("./src/test/resources/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTest.java.template"),
-    "regressions",
-    "./src/test/java/org/hyperledger/besu/ethereum/vm/generalstate",
-    "GeneralStateRegressionReferenceTest"
-    )
-}
-
-task cleanupReferenceTests(type: Delete) {
-  delete fileTree("./src/test/java/org/hyperledger/besu/ethereum/vm/generalstate/") {
-    include("**/GeneralStateReferenceTest*.java")
-    include("**/GeneralStateRegressionReferenceTest*.java")
-  }
-  delete fileTree("./src/test/java/org/hyperledger/besu/ethereum/vm/blockchain/") { include("**/BlockchainReferenceTest*.java") }
-}
-
-clean.dependsOn(cleanupReferenceTests)
-
-task referenceTests(type: Test, dependsOn: [
-  "blockchainReferenceTestsSetup",
-  "generalstateReferenceTestsSetup",
-  "legacyBlockchainReferenceTestsSetup",
-  "legacyGeneralstateReferenceTestsSetup",
-  "generalstateRegressionReferenceTestsSetup",
-  "compileTestJava"
-]) {
-  compileTestJava.mustRunAfter blockchainReferenceTestsSetup
-  compileTestJava.mustRunAfter generalstateReferenceTestsSetup
-  compileTestJava.mustRunAfter generalstateRegressionReferenceTestsSetup
-  doFirst {
-    if (!file("../referencetests/src/test/resources/README.md").exists()) {
-      throw new GradleException("ethereum/referencetests/src/test/resources/README.md missing: please clone submodules (git submodule update --init --recursive)")
-    }
-  }
-  scanForTestClasses = false
-  enableAssertions = true
-  include 'org/hyperledger/besu/ethereum/core/TransactionTest.class'
-  include 'org/hyperledger/besu/ethereum/mainnet/DifficultyCalculatorTests.class'
-  include 'org/hyperledger/besu/ethereum/vm/**ReferenceTest.class'
-  include 'org/hyperledger/besu/ethereum/vm/blockchain/**.class'
-  include 'org/hyperledger/besu/ethereum/vm/generalstate/**.class'
-}
-
 artifacts {
   testArtifacts testJar
   testSupportArtifacts testSupportJar
diff --git a/ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContractIntegrationTest.java b/ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContractIntegrationTest.java
index 9f86a6d18a2..2c6e07433f0 100644
--- a/ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContractIntegrationTest.java
+++ b/ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContractIntegrationTest.java
@@ -17,23 +17,24 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.enclave.Enclave;
 import org.hyperledger.besu.enclave.EnclaveFactory;
 import org.hyperledger.besu.enclave.types.SendResponse;
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.PrivateTransactionDataFixture;
 import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.mainnet.SpuriousDragonGasCalculator;
+import org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils;
+import org.hyperledger.besu.ethereum.privacy.PrivateStateGenesisAllocator;
 import org.hyperledger.besu.ethereum.privacy.PrivateStateRootResolver;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransactionProcessor;
@@ -43,13 +44,20 @@
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.OperationTracer;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
-import org.hyperledger.orion.testutil.OrionKeyConfiguration;
-import org.hyperledger.orion.testutil.OrionTestHarness;
-import org.hyperledger.orion.testutil.OrionTestHarnessFactory;
-
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.SpuriousDragonGasCalculator;
+import org.hyperledger.besu.evm.precompile.PrecompiledContract;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+import org.hyperledger.enclave.testutil.EnclaveEncryptorType;
+import org.hyperledger.enclave.testutil.EnclaveKeyConfiguration;
+import org.hyperledger.enclave.testutil.TesseraTestHarness;
+import org.hyperledger.enclave.testutil.TesseraTestHarnessFactory;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -57,15 +65,14 @@
 import io.vertx.core.Vertx;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class PrivacyPrecompiledContractIntegrationTest {
 
-  @ClassRule public static final TemporaryFolder folder = new TemporaryFolder();
+  @TempDir private static Path folder;
 
   private static final Bytes VALID_PRIVATE_TRANSACTION_RLP =
       Bytes.fromHexString(
@@ -83,9 +90,8 @@ public class PrivacyPrecompiledContractIntegrationTest {
 
   private static Enclave enclave;
   private static MessageFrame messageFrame;
-  private static Blockchain blockchain;
 
-  private static OrionTestHarness testHarness;
+  private static TesseraTestHarness testHarness;
   private static WorldStateArchive worldStateArchive;
   private static PrivateStateStorage privateStateStorage;
   private static final Vertx vertx = Vertx.vertx();
@@ -97,7 +103,6 @@ private PrivateTransactionProcessor mockPrivateTxProcessor() {
         TransactionProcessingResult.successful(
             null, 0, 0, Bytes.fromHexString(DEFAULT_OUTPUT), null);
     when(mockPrivateTransactionProcessor.processTransaction(
-            nullable(Blockchain.class),
             nullable(WorldUpdater.class),
             nullable(WorldUpdater.class),
             nullable(ProcessableBlockHeader.class),
@@ -112,42 +117,47 @@ private PrivateTransactionProcessor mockPrivateTxProcessor() {
     return mockPrivateTransactionProcessor;
   }
 
-  @BeforeClass
+  @BeforeAll
   public static void setUpOnce() throws Exception {
-    folder.create();
 
     testHarness =
-        OrionTestHarnessFactory.create(
-            folder.newFolder().toPath(),
-            new OrionKeyConfiguration("orion_key_0.pub", "orion_key_1.key"));
+        TesseraTestHarnessFactory.create(
+            "enclave",
+            Files.createTempDirectory(folder, "enclave"),
+            new EnclaveKeyConfiguration(
+                new String[] {"enclave_key_0.pub"},
+                new String[] {"enclave_key_1.key"},
+                EnclaveEncryptorType.NOOP),
+            Optional.empty());
 
     testHarness.start();
 
     final EnclaveFactory factory = new EnclaveFactory(vertx);
     enclave = factory.createVertxEnclave(testHarness.clientUrl());
     messageFrame = mock(MessageFrame.class);
-    blockchain = mock(Blockchain.class);
     final BlockDataGenerator blockGenerator = new BlockDataGenerator();
     final Block genesis = blockGenerator.genesisBlock();
     final Block block =
         blockGenerator.block(
             new BlockDataGenerator.BlockOptions().setParentHash(genesis.getHeader().getHash()));
-    when(blockchain.getGenesisBlock()).thenReturn(genesis);
-    when(blockchain.getBlockByHash(block.getHash())).thenReturn(Optional.of(block));
-    when(blockchain.getBlockByHash(genesis.getHash())).thenReturn(Optional.of(genesis));
-    when(messageFrame.getBlockchain()).thenReturn(blockchain);
-    when(messageFrame.getBlockHeader()).thenReturn(block.getHeader());
+    when(messageFrame.getBlockValues()).thenReturn(block.getHeader());
     final PrivateMetadataUpdater privateMetadataUpdater = mock(PrivateMetadataUpdater.class);
     when(privateMetadataUpdater.getPrivateBlockMetadata(any())).thenReturn(null);
     when(privateMetadataUpdater.getPrivacyGroupHeadBlockMap())
         .thenReturn(PrivacyGroupHeadBlockMap.empty());
-    when(messageFrame.getPrivateMetadataUpdater()).thenReturn(privateMetadataUpdater);
+    when(messageFrame.getContextVariable(
+            eq(PrivateStateUtils.KEY_IS_PERSISTING_PRIVATE_STATE), anyBoolean()))
+        .thenReturn(false);
+    when(messageFrame.getContextVariable(eq(PrivateStateUtils.KEY_PRIVATE_METADATA_UPDATER)))
+        .thenReturn(privateMetadataUpdater);
+    when(messageFrame.hasContextVariable(eq(PrivateStateUtils.KEY_PRIVATE_METADATA_UPDATER)))
+        .thenReturn(true);
 
     worldStateArchive = mock(WorldStateArchive.class);
     final MutableWorldState mutableWorldState = mock(MutableWorldState.class);
     when(mutableWorldState.updater()).thenReturn(mock(WorldUpdater.class));
     when(worldStateArchive.getMutable()).thenReturn(mutableWorldState);
-    when(worldStateArchive.getMutable(any())).thenReturn(Optional.of(mutableWorldState));
+    when(worldStateArchive.getMutable(any(), any())).thenReturn(Optional.of(mutableWorldState));
 
     privateStateStorage = mock(PrivateStateStorage.class);
     final PrivateStateStorage.Updater storageUpdater = mock(PrivateStateStorage.Updater.class);
@@ -162,9 +172,9 @@ public static void setUpOnce() throws Exception {
     when(privateStateStorage.updater()).thenReturn(storageUpdater);
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDownOnce() {
-    testHarness.getOrion().stop();
+    testHarness.stop();
     vertx.close();
   }
 
@@ -191,12 +201,17 @@ public void testSendAndReceive() {
             new SpuriousDragonGasCalculator(),
             enclave,
             worldStateArchive,
-            new PrivateStateRootResolver(privateStateStorage));
+            new PrivateStateRootResolver(privateStateStorage),
+            new PrivateStateGenesisAllocator(
+                false, (privacyGroupId, blockNumber) -> Collections::emptyList),
+            "IntegrationTest");
 
     privacyPrecompiledContract.setPrivateTransactionProcessor(mockPrivateTxProcessor());
 
-    final Bytes actual =
-        privacyPrecompiledContract.compute(Bytes.fromBase64String(sr.getKey()), messageFrame);
+    final PrecompiledContract.PrecompileContractResult result =
+        privacyPrecompiledContract.computePrecompile(
+            Bytes.fromBase64String(sr.getKey()), messageFrame);
+    final Bytes actual = result.getOutput();
 
     assertThat(actual).isEqualTo(Bytes.fromHexString(DEFAULT_OUTPUT));
   }
@@ -210,7 +225,7 @@ public void testNoPrivateKeyError() throws RuntimeException {
 
     final Throwable thrown = catchThrowable(() -> enclave.send(s, publicKeys.get(0), publicKeys));
 
-    assertThat(thrown).hasMessageContaining("EnclaveDecodePublicKey");
+    assertThat(thrown).hasMessageContaining("Index 9 out of bounds for length 9");
   }
 
   @Test
@@ -222,6 +237,6 @@ public void testWrongPrivateKeyError() throws RuntimeException {
 
     final Throwable thrown = catchThrowable(() -> enclave.send(s, publicKeys.get(0), publicKeys));
 
-    assertThat(thrown).hasMessageContaining("NodeMissingPeerUrl");
+    assertThat(thrown).hasMessageContaining("Recipient not found for key:");
   }
 }
diff --git a/ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/vm/EntriesFromIntegrationTest.java b/ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/vm/EntriesFromIntegrationTest.java
index 6a820892766..e139d69352d 100644
--- a/ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/vm/EntriesFromIntegrationTest.java
+++ b/ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/vm/EntriesFromIntegrationTest.java
@@ -15,14 +15,14 @@
 package org.hyperledger.besu.ethereum.vm;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
 
-import org.hyperledger.besu.ethereum.core.AccountStorageEntry;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
+import org.hyperledger.besu.evm.account.AccountStorageEntry;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.util.Map;
 import java.util.Random;
@@ -30,15 +30,14 @@
 
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.units.bigints.UInt256;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class EntriesFromIntegrationTest {
 
   @Test
   @SuppressWarnings("MathAbsoluteRandom")
   public void shouldCollectStateEntries() {
-    final MutableWorldState worldState =
-        InMemoryStorageProvider.createInMemoryWorldStateArchive().getMutable();
+    final MutableWorldState worldState = createInMemoryWorldStateArchive().getMutable();
     final WorldUpdater updater = worldState.updater();
     MutableAccount account = updater.getOrCreate(Address.fromHexString("0x56")).getMutable();
     final Map<Bytes32, AccountStorageEntry> expectedValues = new TreeMap<>();
@@ -76,6 +75,6 @@ private void addExpectedValue(
       final UInt256 key,
       final UInt256 value) {
     account.setStorageValue(key, value);
-    expectedValues.put(Hash.hash(key.toBytes()), AccountStorageEntry.forKeyAndValue(key, value));
+    expectedValues.put(Hash.hash(key), AccountStorageEntry.forKeyAndValue(key, value));
   }
 }
diff --git a/ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/vm/TraceTransactionIntegrationTest.java b/ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/vm/TraceTransactionIntegrationTest.java
index a0eda0b729e..53c69b0c1f6 100644
--- a/ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/vm/TraceTransactionIntegrationTest.java
+++ b/ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/vm/TraceTransactionIntegrationTest.java
@@ -17,16 +17,16 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Account;
 import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.ExecutionContextTestFixture;
-import org.hyperledger.besu.ethereum.core.Gas;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
 import org.hyperledger.besu.ethereum.debug.TraceFrame;
 import org.hyperledger.besu.ethereum.debug.TraceOptions;
 import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
@@ -35,17 +35,20 @@
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 import org.hyperledger.besu.plugin.data.TransactionType;
 
 import java.util.List;
 import java.util.Map;
+import java.util.OptionalLong;
 import java.util.stream.Stream;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.units.bigints.UInt256;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TraceTransactionIntegrationTest {
 
@@ -62,20 +65,23 @@ public class TraceTransactionIntegrationTest {
   private MainnetTransactionProcessor transactionProcessor;
   private BlockHashLookup blockHashLookup;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     final ExecutionContextTestFixture contextTestFixture = ExecutionContextTestFixture.create();
     genesisBlock = contextTestFixture.getGenesis();
     blockchain = contextTestFixture.getBlockchain();
     worldStateArchive = contextTestFixture.getStateArchive();
     final ProtocolSchedule protocolSchedule = contextTestFixture.getProtocolSchedule();
-    transactionProcessor = protocolSchedule.getByBlockNumber(0).getTransactionProcessor();
-    blockHashLookup = new BlockHashLookup(genesisBlock.getHeader(), blockchain);
+    transactionProcessor =
+        protocolSchedule
+            .getByBlockHeader(new BlockHeaderTestFixture().number(0L).buildHeader())
+            .getTransactionProcessor();
+    blockHashLookup = new CachingBlockHashLookup(genesisBlock.getHeader(), blockchain);
   }
 
   @Test
   public void shouldTraceSStoreOperation() {
-    final KeyPair keyPair = KeyPair.generate();
+    final KeyPair keyPair = SignatureAlgorithmFactory.getInstance().generateKeyPair();
     final Transaction createTransaction =
         Transaction.builder()
             .type(TransactionType.FRONTIER)
@@ -86,19 +92,23 @@ public void shouldTraceSStoreOperation() {
             .value(Wei.ZERO)
             .signAndBuild(keyPair);
 
+    final BlockHeader genesisBlockHeader = genesisBlock.getHeader();
     final MutableWorldState worldState =
-        worldStateArchive.getMutable(genesisBlock.getHeader().getStateRoot()).get();
+        worldStateArchive
+            .getMutable(genesisBlockHeader.getStateRoot(), genesisBlockHeader.getHash())
+            .get();
     final WorldUpdater createTransactionUpdater = worldState.updater();
     TransactionProcessingResult result =
         transactionProcessor.processTransaction(
             blockchain,
             createTransactionUpdater,
-            genesisBlock.getHeader(),
+            genesisBlockHeader,
             createTransaction,
-            genesisBlock.getHeader().getCoinbase(),
+            genesisBlockHeader.getCoinbase(),
             blockHashLookup,
             false,
-            TransactionValidationParams.blockReplay());
+            TransactionValidationParams.blockReplay(),
+            Wei.ZERO);
     assertThat(result.isSuccessful()).isTrue();
     final Account createdContract =
         createTransactionUpdater.getTouchedAccounts().stream()
@@ -125,12 +135,13 @@ public void shouldTraceSStoreOperation() {
         transactionProcessor.processTransaction(
             blockchain,
             storeUpdater,
-            genesisBlock.getHeader(),
+            genesisBlockHeader,
             executeTransaction,
-            genesisBlock.getHeader().getCoinbase(),
+            genesisBlockHeader.getCoinbase(),
             tracer,
             blockHashLookup,
-            false);
+            false,
+            Wei.ZERO);
 
     assertThat(result.isSuccessful()).isTrue();
 
@@ -159,15 +170,20 @@ public void shouldTraceContractCreation() {
     final Transaction transaction =
         Transaction.readFrom(
             new BytesValueRLPInput(Bytes.fromHexString(CONTRACT_CREATION_TX), false));
+    final BlockHeader genesisBlockHeader = genesisBlock.getHeader();
     transactionProcessor.processTransaction(
         blockchain,
-        worldStateArchive.getMutable(genesisBlock.getHeader().getStateRoot()).get().updater(),
-        genesisBlock.getHeader(),
+        worldStateArchive
+            .getMutable(genesisBlockHeader.getStateRoot(), genesisBlockHeader.getHash())
+            .get()
+            .updater(),
+        genesisBlockHeader,
         transaction,
-        genesisBlock.getHeader().getCoinbase(),
+        genesisBlockHeader.getCoinbase(),
         tracer,
-        new BlockHashLookup(genesisBlock.getHeader(), blockchain),
-        false);
+        new CachingBlockHashLookup(genesisBlockHeader, blockchain),
+        false,
+        Wei.ZERO);
 
     final int expectedDepth = 0; // Reference impl returned 1. Why the difference?
 
@@ -176,8 +192,8 @@ public void shouldTraceContractCreation() {
 
     TraceFrame frame = traceFrames.get(0);
     assertThat(frame.getDepth()).isEqualTo(expectedDepth);
-    assertThat(frame.getGasRemaining()).isEqualTo(Gas.of(4632748));
-    assertThat(frame.getGasCost()).contains(Gas.of(3));
+    assertThat(frame.getGasRemaining()).isEqualTo(4632748L);
+    assertThat(frame.getGasCost()).isEqualTo(OptionalLong.of(3));
     assertThat(frame.getOpcode()).isEqualTo("PUSH1");
     assertThat(frame.getPc()).isEqualTo(0);
     assertStackContainsExactly(frame);
@@ -186,8 +202,8 @@ public void shouldTraceContractCreation() {
 
     frame = traceFrames.get(1);
     assertThat(frame.getDepth()).isEqualTo(expectedDepth);
-    assertThat(frame.getGasRemaining()).isEqualTo(Gas.of(4632745));
-    assertThat(frame.getGasCost()).contains(Gas.of(3));
+    assertThat(frame.getGasRemaining()).isEqualTo(4632745L);
+    assertThat(frame.getGasCost()).isEqualTo(OptionalLong.of(3L));
     assertThat(frame.getOpcode()).isEqualTo("PUSH1");
     assertThat(frame.getPc()).isEqualTo(2);
     assertStackContainsExactly(
@@ -197,8 +213,8 @@ public void shouldTraceContractCreation() {
 
     frame = traceFrames.get(2);
     assertThat(frame.getDepth()).isEqualTo(expectedDepth);
-    assertThat(frame.getGasRemaining()).isEqualTo(Gas.of(4632742));
-    assertThat(frame.getGasCost()).contains(Gas.of(12));
+    assertThat(frame.getGasRemaining()).isEqualTo(4632742L);
+    assertThat(frame.getGasCost()).isEqualTo(OptionalLong.of(12L));
     assertThat(frame.getOpcode()).isEqualTo("MSTORE");
     assertThat(frame.getPc()).isEqualTo(4);
     assertStackContainsExactly(
@@ -219,8 +235,8 @@ public void shouldTraceContractCreation() {
 
     frame = traceFrames.get(3);
     assertThat(frame.getDepth()).isEqualTo(expectedDepth);
-    assertThat(frame.getGasRemaining()).isEqualTo(Gas.of(4632730));
-    assertThat(frame.getGasCost()).contains(Gas.of(2));
+    assertThat(frame.getGasRemaining()).isEqualTo(4632730L);
+    assertThat(frame.getGasCost()).isEqualTo(OptionalLong.of(2L));
     assertThat(frame.getOpcode()).isEqualTo("CALLVALUE");
     assertThat(frame.getPc()).isEqualTo(5);
     assertStackContainsExactly(frame);
diff --git a/ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/worldstate/PrunerIntegrationTest.java b/ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/worldstate/PrunerIntegrationTest.java
index aa0f9bc0cfe..86f2694c3c0 100644
--- a/ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/worldstate/PrunerIntegrationTest.java
+++ b/ethereum/core/src/integration-test/java/org/hyperledger/besu/ethereum/worldstate/PrunerIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -15,23 +15,23 @@
 package org.hyperledger.besu.ethereum.worldstate;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
-import org.hyperledger.besu.ethereum.core.WorldState;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage;
 import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage;
-import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie;
-import org.hyperledger.besu.ethereum.trie.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
 import org.hyperledger.besu.ethereum.worldstate.Pruner.PruningPhase;
+import org.hyperledger.besu.evm.worldstate.WorldState;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
 import org.hyperledger.besu.testutil.MockExecutorService;
@@ -41,19 +41,20 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PrunerIntegrationTest {
 
   private final BlockDataGenerator gen = new BlockDataGenerator();
   private final NoOpMetricsSystem metricsSystem = new NoOpMetricsSystem();
-  private final Map<Bytes, byte[]> hashValueStore = new HashMap<>();
+  private final Map<Bytes, Optional<byte[]>> hashValueStore = new HashMap<>();
   private final InMemoryKeyValueStorage stateStorage = new TestInMemoryStorage(hashValueStore);
   private final WorldStateStorage worldStateStorage = new WorldStateKeyValueStorage(stateStorage);
   private final WorldStateArchive worldStateArchive =
@@ -137,9 +138,11 @@ private void testPruner(
 
       // Assert that blocks from mark point onward are still accessible
       for (int i = fullyMarkedBlockNum; i <= blockchain.getChainHeadBlockNumber(); i++) {
-        final Hash stateRoot = blockchain.getBlockHeader(i).get().getStateRoot();
-        assertThat(worldStateArchive.get(stateRoot)).isPresent();
-        final WorldState markedState = worldStateArchive.get(stateRoot).get();
+        final BlockHeader blockHeader = blockchain.getBlockHeader(i).get();
+        final Hash stateRoot = blockHeader.getStateRoot();
+        assertThat(worldStateArchive.get(stateRoot, blockHeader.getHash())).isPresent();
+        final WorldState markedState =
+            worldStateArchive.get(stateRoot, blockHeader.getHash()).get();
         // Traverse accounts and make sure all are accessible
         final int expectedAccounts = accountsPerBlock * i;
         final long accounts =
@@ -155,13 +158,14 @@ private void testPruner(
       for (int i = 0; i < fullyMarkedBlockNum; i++) {
         final BlockHeader curHeader = blockchain.getBlockHeader(i).get();
         if (!curHeader.getStateRoot().equals(Hash.EMPTY_TRIE_HASH)) {
-          assertThat(worldStateArchive.get(curHeader.getStateRoot())).isEmpty();
+          assertThat(worldStateArchive.get(curHeader.getStateRoot(), curHeader.getHash()))
+              .isEmpty();
         }
       }
 
       // Check that storage contains only the values we expect
       assertThat(hashValueStore.size()).isEqualTo(expectedNodes.size());
-      assertThat(hashValueStore.values())
+      assertThat(hashValueStore.values().stream().map(Optional::get))
           .containsExactlyInAnyOrderElementsOf(
               expectedNodes.stream().map(Bytes::toArrayUnsafe).collect(Collectors.toSet()));
     }
@@ -172,8 +176,10 @@ private void testPruner(
   private void generateBlockchainData(final int numBlocks, final int numAccounts) {
     Block parentBlock = blockchain.getChainHeadBlock();
     for (int i = 0; i < numBlocks; i++) {
+      final BlockHeader parentHeader = parentBlock.getHeader();
+      final Hash parentHash = parentBlock.getHash();
       final MutableWorldState worldState =
-          worldStateArchive.getMutable(parentBlock.getHeader().getStateRoot()).get();
+          worldStateArchive.getMutable(parentHeader.getStateRoot(), parentHash).get();
       gen.createRandomContractAccountsWithNonEmptyStorage(worldState, numAccounts);
       final Hash stateRoot = worldState.rootHash();
 
@@ -181,8 +187,8 @@ private void generateBlockchainData(final int numBlocks, final int numAccounts)
           gen.block(
               BlockOptions.create()
                   .setStateRoot(stateRoot)
-                  .setBlockNumber(parentBlock.getHeader().getNumber() + 1L)
-                  .setParentHash(parentBlock.getHash()));
+                  .setBlockNumber(parentHeader.getNumber() + 1L)
+                  .setParentHash(parentHash));
       final List<TransactionReceipt> receipts = gen.receipts(block);
       blockchain.appendBlock(block, receipts);
       parentBlock = block;
@@ -191,7 +197,7 @@ private void generateBlockchainData(final int numBlocks, final int numAccounts)
 
   private Set<Bytes> collectWorldStateNodes(final Hash stateRootHash, final Set<Bytes> collector) {
     final List<Hash> storageRoots = new ArrayList<>();
-    final MerklePatriciaTrie<Bytes32, Bytes> stateTrie = createStateTrie(stateRootHash);
+    final MerkleTrie<Bytes32, Bytes> stateTrie = createStateTrie(stateRootHash);
 
     // Collect storage roots and code
     stateTrie
@@ -210,25 +216,24 @@ private Set<Bytes> collectWorldStateNodes(final Hash stateRootHash, final Set<By
     collectTrieNodes(stateTrie, collector);
     // Collect storage nodes
     for (Hash storageRoot : storageRoots) {
-      final MerklePatriciaTrie<Bytes32, Bytes> storageTrie = createStorageTrie(storageRoot);
+      final MerkleTrie<Bytes32, Bytes> storageTrie = createStorageTrie(storageRoot);
       collectTrieNodes(storageTrie, collector);
     }
 
     return collector;
   }
 
-  private void collectTrieNodes(
-      final MerklePatriciaTrie<Bytes32, Bytes> trie, final Set<Bytes> collector) {
+  private void collectTrieNodes(final MerkleTrie<Bytes32, Bytes> trie, final Set<Bytes> collector) {
     final Bytes32 rootHash = trie.getRootHash();
     trie.visitAll(
         (node) -> {
           if (node.isReferencedByHash() || node.getHash().equals(rootHash)) {
-            collector.add(node.getRlp());
+            collector.add(node.getEncodedBytes());
           }
         });
   }
 
-  private MerklePatriciaTrie<Bytes32, Bytes> createStateTrie(final Bytes32 rootHash) {
+  private MerkleTrie<Bytes32, Bytes> createStateTrie(final Bytes32 rootHash) {
     return new StoredMerklePatriciaTrie<>(
         worldStateStorage::getAccountStateTrieNode,
         rootHash,
@@ -236,9 +241,9 @@ private MerklePatriciaTrie<Bytes32, Bytes> createStateTrie(final Bytes32 rootHas
         Function.identity());
   }
 
-  private MerklePatriciaTrie<Bytes32, Bytes> createStorageTrie(final Bytes32 rootHash) {
+  private MerkleTrie<Bytes32, Bytes> createStorageTrie(final Bytes32 rootHash) {
     return new StoredMerklePatriciaTrie<>(
-        worldStateStorage::getAccountStorageTrieNode,
+        (location, hash) -> worldStateStorage.getAccountStorageTrieNode(null, location, hash),
         rootHash,
         Function.identity(),
         Function.identity());
@@ -247,7 +252,7 @@ private MerklePatriciaTrie<Bytes32, Bytes> createStorageTrie(final Bytes32 rootH
   // Proxy class so that we have access to the constructor that takes our own map
   private static class TestInMemoryStorage extends InMemoryKeyValueStorage {
 
-    public TestInMemoryStorage(final Map<Bytes, byte[]> hashValueStore) {
+    public TestInMemoryStorage(final Map<Bytes, Optional<byte[]>> hashValueStore) {
       super(hashValueStore);
     }
   }
diff --git a/ethereum/core/src/jmh/java/org/hyperledger/besu/ethereum/vm/operations/BlockHashOperationBenchmark.java b/ethereum/core/src/jmh/java/org/hyperledger/besu/ethereum/vm/operations/BlockHashOperationBenchmark.java
index d118515bb0d..e431e1420cd 100644
--- a/ethereum/core/src/jmh/java/org/hyperledger/besu/ethereum/vm/operations/BlockHashOperationBenchmark.java
+++ b/ethereum/core/src/jmh/java/org/hyperledger/besu/ethereum/vm/operations/BlockHashOperationBenchmark.java
@@ -14,11 +14,13 @@
  */
 package org.hyperledger.besu.ethereum.vm.operations;
 
-import org.hyperledger.besu.ethereum.mainnet.ConstantinopleFixGasCalculator;
-import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
+import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
+import org.hyperledger.besu.ethereum.vm.CachingBlockHashLookup;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.PetersburgGasCalculator;
+import org.hyperledger.besu.evm.operation.BlockHashOperation;
 
-import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.units.bigints.UInt256;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Param;
@@ -44,7 +46,7 @@ public class BlockHashOperationBenchmark {
   @Setup
   public void prepare() throws Exception {
     operationBenchmarkHelper = OperationBenchmarkHelper.create();
-    operation = new BlockHashOperation(new ConstantinopleFixGasCalculator());
+    operation = new BlockHashOperation(new PetersburgGasCalculator());
     frame = operationBenchmarkHelper.createMessageFrame();
   }
 
@@ -54,20 +56,23 @@ public void cleanUp() throws Exception {
   }
 
   @Benchmark
-  public Bytes32 executeOperation() {
-    frame.pushStackItem(UInt256.valueOf(blockNumber).toBytes());
+  public Bytes executeOperation() {
+    frame.pushStackItem(UInt256.valueOf(blockNumber));
     operation.execute(frame, null);
     return frame.popStackItem();
   }
 
   @Benchmark
-  public Bytes32 executeOperationWithEmptyHashCache() {
+  public Bytes executeOperationWithEmptyHashCache() {
     final MessageFrame cleanFrame =
         operationBenchmarkHelper
             .createMessageFrameBuilder()
-            .blockHashLookup(new BlockHashLookup(frame.getBlockHeader(), frame.getBlockchain()))
+            .blockHashLookup(
+                new CachingBlockHashLookup(
+                    (ProcessableBlockHeader) frame.getBlockValues(),
+                    operationBenchmarkHelper.getBlockchain()))
             .build();
-    cleanFrame.pushStackItem(UInt256.valueOf(blockNumber).toBytes());
+    cleanFrame.pushStackItem(UInt256.valueOf(blockNumber));
     operation.execute(cleanFrame, null);
     return cleanFrame.popStackItem();
   }
diff --git a/ethereum/core/src/jmh/java/org/hyperledger/besu/ethereum/vm/operations/OperationBenchmarkHelper.java b/ethereum/core/src/jmh/java/org/hyperledger/besu/ethereum/vm/operations/OperationBenchmarkHelper.java
index c566aba41c0..81796f89f29 100644
--- a/ethereum/core/src/jmh/java/org/hyperledger/besu/ethereum/vm/operations/OperationBenchmarkHelper.java
+++ b/ethereum/core/src/jmh/java/org/hyperledger/besu/ethereum/vm/operations/OperationBenchmarkHelper.java
@@ -16,6 +16,7 @@
 
 import static java.util.Collections.emptyList;
 
+import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
@@ -23,7 +24,7 @@
 import org.hyperledger.besu.ethereum.core.Difficulty;
 import org.hyperledger.besu.ethereum.core.ExecutionContextTestFixture;
 import org.hyperledger.besu.ethereum.core.MessageFrameTestFixture;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
+import org.hyperledger.besu.evm.frame.MessageFrame;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBMetricsFactory;
@@ -42,14 +43,17 @@ public class OperationBenchmarkHelper {
   private final Path storageDirectory;
   private final KeyValueStorage keyValueStorage;
   private final MessageFrame messageFrame;
+  private final Blockchain blockchain;
 
   private OperationBenchmarkHelper(
       final Path storageDirectory,
       final KeyValueStorage keyValueStorage,
-      final MessageFrame messageFrame) {
+      final MessageFrame messageFrame,
+      final Blockchain blockchain) {
     this.storageDirectory = storageDirectory;
     this.keyValueStorage = keyValueStorage;
     this.messageFrame = messageFrame;
+    this.blockchain = blockchain;
   }
 
   public static OperationBenchmarkHelper create() throws IOException {
@@ -61,7 +65,7 @@ public static OperationBenchmarkHelper create() throws IOException {
             RocksDBMetricsFactory.PUBLIC_ROCKS_DB_METRICS);
 
     final ExecutionContextTestFixture executionContext =
-        ExecutionContextTestFixture.builder().keyValueStorage(keyValueStorage).build();
+        ExecutionContextTestFixture.builder().blockchainKeyValueStorage(keyValueStorage).build();
     final MutableBlockchain blockchain = executionContext.getBlockchain();
 
     for (int i = 1; i < 256; i++) {
@@ -85,7 +89,12 @@ public static OperationBenchmarkHelper create() throws IOException {
                     .difficulty(Difficulty.ONE)
                     .buildHeader())
             .build();
-    return new OperationBenchmarkHelper(storageDirectory, keyValueStorage, messageFrame);
+    return new OperationBenchmarkHelper(
+        storageDirectory, keyValueStorage, messageFrame, blockchain);
+  }
+
+  public Blockchain getBlockchain() {
+    return blockchain;
   }
 
   public MessageFrame createMessageFrame() {
@@ -96,8 +105,7 @@ public MessageFrame.Builder createMessageFrameBuilder() {
     return MessageFrame.builder()
         .type(MessageFrame.Type.MESSAGE_CALL)
         .messageFrameStack(messageFrame.getMessageFrameStack())
-        .blockchain(messageFrame.getBlockchain())
-        .worldState(messageFrame.getWorldState())
+        .worldUpdater(messageFrame.getWorldUpdater())
         .initialGas(messageFrame.getRemainingGas())
         .address(messageFrame.getContractAddress())
         .originator(messageFrame.getOriginatorAddress())
@@ -108,14 +116,12 @@ public MessageFrame.Builder createMessageFrameBuilder() {
         .value(messageFrame.getValue())
         .apparentValue(messageFrame.getApparentValue())
         .code(messageFrame.getCode())
-        .blockHeader(messageFrame.getBlockHeader())
+        .blockValues(messageFrame.getBlockValues())
         .depth(messageFrame.getMessageStackDepth())
         .isStatic(messageFrame.isStatic())
         .completer(messageFrame -> {})
         .miningBeneficiary(messageFrame.getMiningBeneficiary())
-        .maxStackSize(messageFrame.getMaxStackSize())
-        .blockHashLookup(messageFrame.getBlockHashLookup())
-        .returnStack(messageFrame.getReturnStack());
+        .maxStackSize(messageFrame.getMaxStackSize());
   }
 
   public void cleanUp() throws IOException {
diff --git a/ethereum/core/src/jmh/java/org/hyperledger/besu/ethereum/vm/operations/TransientStorageOperationBenchmark.java b/ethereum/core/src/jmh/java/org/hyperledger/besu/ethereum/vm/operations/TransientStorageOperationBenchmark.java
new file mode 100644
index 00000000000..612bedc2c74
--- /dev/null
+++ b/ethereum/core/src/jmh/java/org/hyperledger/besu/ethereum/vm/operations/TransientStorageOperationBenchmark.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright Hyperledger Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.vm.operations;
+
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
+import static org.mockito.Mockito.mock;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.MessageFrameTestFixture;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.CancunGasCalculator;
+import org.hyperledger.besu.evm.operation.TLoadOperation;
+import org.hyperledger.besu.evm.operation.TStoreOperation;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
+
+@State(Scope.Thread)
+public class TransientStorageOperationBenchmark {
+
+  private OperationBenchmarkHelper operationBenchmarkHelper;
+  private TStoreOperation tstore;
+  private TLoadOperation tload;
+  private MessageFrame frame;
+
+  private MessageFrame createMessageFrame(final Address address) {
+    final Blockchain blockchain = mock(Blockchain.class);
+
+    final WorldStateArchive worldStateArchive = createInMemoryWorldStateArchive();
+    final WorldUpdater worldStateUpdater = worldStateArchive.getMutable().updater();
+    final BlockHeader blockHeader = new BlockHeaderTestFixture().buildHeader();
+    final MessageFrame benchmarkFrame =
+        new MessageFrameTestFixture()
+            .address(address)
+            .worldUpdater(worldStateUpdater)
+            .blockHeader(blockHeader)
+            .blockchain(blockchain)
+            .build();
+    worldStateUpdater.getOrCreate(address).getMutable().setBalance(Wei.of(1));
+    worldStateUpdater.commit();
+
+    return benchmarkFrame;
+  }
+
+  @Setup
+  public void prepare() throws Exception {
+    operationBenchmarkHelper = OperationBenchmarkHelper.create();
+    CancunGasCalculator gasCalculator = new CancunGasCalculator();
+    tstore = new TStoreOperation(gasCalculator);
+    tload = new TLoadOperation(gasCalculator);
+    frame = createMessageFrame(Address.fromHexString("0x18675309"));
+  }
+
+  @TearDown
+  public void cleanUp() throws Exception {
+    operationBenchmarkHelper.cleanUp();
+  }
+
+  @Benchmark
+  public Bytes executeOperation() {
+    frame.pushStackItem(UInt256.ONE);
+    frame.pushStackItem(UInt256.fromHexString("0x01"));
+    tstore.execute(frame, null);
+    frame.pushStackItem(UInt256.fromHexString("0x01"));
+    tload.execute(frame, null);
+    return frame.popStackItem();
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/BlockProcessingOutputs.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/BlockProcessingOutputs.java
new file mode 100644
index 00000000000..9e062b4edeb
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/BlockProcessingOutputs.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ *  the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum;
+
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class BlockProcessingOutputs {
+
+  private final MutableWorldState worldState;
+  private final List<TransactionReceipt> receipts;
+
+  public BlockProcessingOutputs(
+      final MutableWorldState worldState, final List<TransactionReceipt> receipts) {
+    this.worldState = worldState;
+    this.receipts = receipts;
+  }
+
+  public static BlockProcessingOutputs empty() {
+    return new BlockProcessingOutputs(null, new ArrayList<>());
+  }
+
+  public MutableWorldState getWorldState() {
+    return worldState;
+  }
+
+  public List<TransactionReceipt> getReceipts() {
+    return receipts;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/BlockProcessingResult.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/BlockProcessingResult.java
new file mode 100644
index 00000000000..657a801455f
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/BlockProcessingResult.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ *  the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum;
+
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+public class BlockProcessingResult extends BlockValidationResult {
+
+  private final Optional<BlockProcessingOutputs> yield;
+  private final boolean isPartial;
+
+  public static final BlockProcessingResult FAILED = new BlockProcessingResult("processing failed");
+
+  public BlockProcessingResult(final Optional<BlockProcessingOutputs> yield) {
+    this.yield = yield;
+    this.isPartial = false;
+  }
+
+  public BlockProcessingResult(
+      final Optional<BlockProcessingOutputs> yield, final boolean isPartial) {
+    this.yield = yield;
+    this.isPartial = isPartial;
+  }
+
+  public BlockProcessingResult(
+      final Optional<BlockProcessingOutputs> yield, final String errorMessage) {
+    super(errorMessage);
+    this.yield = yield;
+    this.isPartial = false;
+  }
+
+  public BlockProcessingResult(
+      final Optional<BlockProcessingOutputs> yield, final Throwable cause) {
+    super(cause.getLocalizedMessage(), cause);
+    this.yield = yield;
+    this.isPartial = false;
+  }
+
+  public BlockProcessingResult(
+      final Optional<BlockProcessingOutputs> yield,
+      final String errorMessage,
+      final boolean isPartial) {
+    super(errorMessage);
+    this.yield = yield;
+    this.isPartial = isPartial;
+  }
+
+  public BlockProcessingResult(final String errorMessage) {
+    super(errorMessage);
+    this.isPartial = false;
+    this.yield = Optional.empty();
+  }
+
+  public Optional<BlockProcessingOutputs> getYield() {
+    return yield;
+  }
+
+  public boolean isPartial() {
+    return isPartial;
+  }
+
+  public List<TransactionReceipt> getReceipts() {
+    if (yield.isEmpty()) {
+      return new ArrayList<>();
+    } else {
+      return yield.get().getReceipts();
+    }
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/BlockValidationResult.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/BlockValidationResult.java
new file mode 100644
index 00000000000..63d786acdff
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/BlockValidationResult.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ *  the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum;
+
+import java.util.Optional;
+
+public class BlockValidationResult {
+
+  public final Optional<String> errorMessage;
+  public final Optional<Throwable> cause;
+  public final boolean success;
+
+  public BlockValidationResult() {
+    this.success = true;
+    this.errorMessage = Optional.empty();
+    this.cause = Optional.empty();
+  }
+
+  public BlockValidationResult(final String errorMessage) {
+    this.success = false;
+    this.errorMessage = Optional.of(errorMessage);
+    this.cause = Optional.empty();
+  }
+
+  public BlockValidationResult(final String errorMessage, final Throwable cause) {
+    this.success = false;
+    this.errorMessage = Optional.of(errorMessage);
+    this.cause = Optional.of(cause);
+  }
+
+  public boolean isSuccessful() {
+    return this.success;
+  }
+
+  public boolean isFailed() {
+    return !isSuccessful();
+  }
+
+  public Optional<Throwable> causedBy() {
+    return cause;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/BlockValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/BlockValidator.java
index f6ffc727abf..bed189c4935 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/BlockValidator.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/BlockValidator.java
@@ -15,31 +15,33 @@
 package org.hyperledger.besu.ethereum;
 
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
 
 import java.util.List;
-import java.util.Optional;
 
 public interface BlockValidator {
 
-  class BlockProcessingOutputs {
-    public final MutableWorldState worldState;
-    public final List<TransactionReceipt> receipts;
+  BlockProcessingResult validateAndProcessBlock(
+      final ProtocolContext context,
+      final Block block,
+      final HeaderValidationMode headerValidationMode,
+      final HeaderValidationMode ommerValidationMode);
 
-    public BlockProcessingOutputs(
-        final MutableWorldState worldState, final List<TransactionReceipt> receipts) {
-      this.worldState = worldState;
-      this.receipts = receipts;
-    }
-  }
+  BlockProcessingResult validateAndProcessBlock(
+      final ProtocolContext context,
+      final Block block,
+      final HeaderValidationMode headerValidationMode,
+      final HeaderValidationMode ommerValidationMode,
+      final boolean shouldPersist);
 
-  Optional<BlockProcessingOutputs> validateAndProcessBlock(
+  BlockProcessingResult validateAndProcessBlock(
       final ProtocolContext context,
       final Block block,
       final HeaderValidationMode headerValidationMode,
-      final HeaderValidationMode ommerValidationMode);
+      final HeaderValidationMode ommerValidationMode,
+      final boolean shouldPersist,
+      final boolean shouldRecordBadBlock);
 
   boolean fastBlockValidation(
       final ProtocolContext context,
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/ConsensusContext.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/ConsensusContext.java
new file mode 100644
index 00000000000..377d55953d8
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/ConsensusContext.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum;
+
+@FunctionalInterface
+public interface ConsensusContext {
+  <C extends ConsensusContext> C as(final Class<C> klass);
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/ConsensusContextFactory.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/ConsensusContextFactory.java
new file mode 100644
index 00000000000..848d861197b
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/ConsensusContextFactory.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum;
+
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+
+@FunctionalInterface
+public interface ConsensusContextFactory {
+
+  ConsensusContext create(
+      Blockchain blockchain,
+      WorldStateArchive worldStateArchive,
+      ProtocolSchedule protocolSchedule);
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/GasLimitCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/GasLimitCalculator.java
new file mode 100644
index 00000000000..30a35389afb
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/GasLimitCalculator.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2019 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum;
+
+public interface GasLimitCalculator {
+
+  long nextGasLimit(long currentGasLimit, long targetGasLimit, long newBlockNumber);
+
+  static GasLimitCalculator constant() {
+    return (currentGasLimit, targetGasLimit, newBlockNumber) -> currentGasLimit;
+  }
+
+  default long currentDataGasLimit() {
+    return 0L;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/MainnetBlockValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/MainnetBlockValidator.java
index d047429df1e..3d711618cec 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/MainnetBlockValidator.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/MainnetBlockValidator.java
@@ -14,8 +14,6 @@
  */
 package org.hyperledger.besu.ethereum;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
-
 import org.hyperledger.besu.ethereum.chain.BadBlockManager;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.Block;
@@ -26,23 +24,23 @@
 import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
 import org.hyperledger.besu.ethereum.mainnet.BlockProcessor;
 import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
+import org.hyperledger.besu.ethereum.trie.MerkleTrieException;
+import org.hyperledger.besu.plugin.services.exception.StorageException;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MainnetBlockValidator implements BlockValidator {
 
-  private static final Logger LOG = getLogger();
-
-  private final BlockHeaderValidator blockHeaderValidator;
-
-  private final BlockBodyValidator blockBodyValidator;
-
-  private final BlockProcessor blockProcessor;
-
-  private final BadBlockManager badBlockManager;
+  private static final Logger LOG = LoggerFactory.getLogger(MainnetBlockValidator.class);
+  protected final BlockHeaderValidator blockHeaderValidator;
+  protected final BlockBodyValidator blockBodyValidator;
+  protected final BlockProcessor blockProcessor;
+  protected final BadBlockManager badBlockManager;
 
   public MainnetBlockValidator(
       final BlockHeaderValidator blockHeaderValidator,
@@ -55,58 +53,158 @@ public MainnetBlockValidator(
     this.badBlockManager = badBlockManager;
   }
 
+  /**
+   * Performs a full validation and processing of a block
+   *
+   * @param context the {@link ProtocolContext}
+   * @param block the block being validated and processed
+   * @param headerValidationMode the {@link HeaderValidationMode} used for validating the header
+   * @param ommerValidationMode the {@link HeaderValidationMode} used for validating the ommers
+   * @return an optional containing the {@link BlockProcessingOutputs} with the output of processing
+   *     the block, empty if the block was deemed invalid or couldn't be processed
+   */
   @Override
-  public Optional<BlockProcessingOutputs> validateAndProcessBlock(
+  public BlockProcessingResult validateAndProcessBlock(
       final ProtocolContext context,
       final Block block,
       final HeaderValidationMode headerValidationMode,
       final HeaderValidationMode ommerValidationMode) {
-    final BlockHeader header = block.getHeader();
+    return validateAndProcessBlock(
+        context, block, headerValidationMode, ommerValidationMode, true, true);
+  }
 
-    final Optional<BlockHeader> maybeParentHeader =
-        context.getBlockchain().getBlockHeader(header.getParentHash());
-    if (!maybeParentHeader.isPresent()) {
-      LOG.error(
-          "Attempted to import block {} with hash {} but parent block {} was not present",
-          header.getNumber(),
-          header.getHash(),
-          header.getParentHash());
-      badBlockManager.addBadBlock(block);
-      return Optional.empty();
-    }
-    final BlockHeader parentHeader = maybeParentHeader.get();
+  @Override
+  public BlockProcessingResult validateAndProcessBlock(
+      final ProtocolContext context,
+      final Block block,
+      final HeaderValidationMode headerValidationMode,
+      final HeaderValidationMode ommerValidationMode,
+      final boolean shouldPersist) {
+    return validateAndProcessBlock(
+        context, block, headerValidationMode, ommerValidationMode, shouldPersist, true);
+  }
 
-    if (!blockHeaderValidator.validateHeader(header, parentHeader, context, headerValidationMode)) {
-      badBlockManager.addBadBlock(block);
-      return Optional.empty();
-    }
+  @Override
+  public BlockProcessingResult validateAndProcessBlock(
+      final ProtocolContext context,
+      final Block block,
+      final HeaderValidationMode headerValidationMode,
+      final HeaderValidationMode ommerValidationMode,
+      final boolean shouldPersist,
+      final boolean shouldRecordBadBlock) {
 
-    final MutableBlockchain blockchain = context.getBlockchain();
-    final Optional<MutableWorldState> maybeWorldState =
-        context.getWorldStateArchive().getMutable(parentHeader.getStateRoot());
-    if (!maybeWorldState.isPresent()) {
-      LOG.debug(
-          "Unable to process block {} because parent world state {} is not available",
-          header.getNumber(),
-          parentHeader.getStateRoot());
-      badBlockManager.addBadBlock(block);
-      return Optional.empty();
+    final BlockHeader header = block.getHeader();
+    final BlockHeader parentHeader;
+
+    try {
+      final MutableBlockchain blockchain = context.getBlockchain();
+      final Optional<BlockHeader> maybeParentHeader =
+          blockchain.getBlockHeader(header.getParentHash());
+      if (maybeParentHeader.isEmpty()) {
+        var retval =
+            new BlockProcessingResult(
+                "Parent block with hash " + header.getParentHash() + " not present");
+        handleAndLogImportFailure(block, retval, shouldRecordBadBlock);
+        return retval;
+      }
+      parentHeader = maybeParentHeader.get();
+
+      if (!blockHeaderValidator.validateHeader(
+          header, parentHeader, context, headerValidationMode)) {
+        var retval = new BlockProcessingResult("header validation rule violated, see logs");
+        handleAndLogImportFailure(block, retval, shouldRecordBadBlock);
+        return retval;
+      }
+    } catch (StorageException ex) {
+      var retval = new BlockProcessingResult(Optional.empty(), ex);
+      handleAndLogImportFailure(block, retval, shouldRecordBadBlock);
+      return retval;
     }
-    final MutableWorldState worldState = maybeWorldState.get();
-    final BlockProcessor.Result result = blockProcessor.processBlock(blockchain, worldState, block);
-    if (!result.isSuccessful()) {
-      badBlockManager.addBadBlock(block);
-      return Optional.empty();
+    try (final var worldState =
+        context.getWorldStateArchive().getMutable(parentHeader, shouldPersist).orElse(null)) {
+
+      if (worldState == null) {
+        var retval =
+            new BlockProcessingResult(
+                "Unable to process block because parent world state "
+                    + parentHeader.getStateRoot()
+                    + " is not available");
+        handleAndLogImportFailure(block, retval, shouldRecordBadBlock);
+        return retval;
+      }
+      var result = processBlock(context, worldState, block);
+      if (result.isFailed()) {
+        handleAndLogImportFailure(block, result, shouldRecordBadBlock);
+        return result;
+      } else {
+        List<TransactionReceipt> receipts =
+            result.getYield().map(BlockProcessingOutputs::getReceipts).orElse(new ArrayList<>());
+        if (!blockBodyValidator.validateBody(
+            context, block, receipts, worldState.rootHash(), ommerValidationMode)) {
+          handleAndLogImportFailure(block, result, shouldRecordBadBlock);
+          return new BlockProcessingResult("failed to validate output of imported block");
+        }
+
+        return new BlockProcessingResult(
+            Optional.of(new BlockProcessingOutputs(worldState, receipts)));
+      }
+    } catch (MerkleTrieException ex) {
+      context
+          .getSynchronizer()
+          .ifPresentOrElse(
+              synchronizer -> synchronizer.healWorldState(ex.getMaybeAddress(), ex.getLocation()),
+              () ->
+                  handleAndLogImportFailure(
+                      block,
+                      new BlockProcessingResult(Optional.empty(), ex),
+                      shouldRecordBadBlock));
+      return new BlockProcessingResult(Optional.empty(), ex);
+    } catch (StorageException ex) {
+      var retval = new BlockProcessingResult(Optional.empty(), ex);
+      handleAndLogImportFailure(block, retval, shouldRecordBadBlock);
+      return retval;
+    } catch (Exception ex) {
+      throw new RuntimeException(ex);
     }
+  }
 
-    final List<TransactionReceipt> receipts = result.getReceipts();
-    if (!blockBodyValidator.validateBody(
-        context, block, receipts, worldState.rootHash(), ommerValidationMode)) {
-      badBlockManager.addBadBlock(block);
-      return Optional.empty();
+  private void handleAndLogImportFailure(
+      final Block invalidBlock,
+      final BlockValidationResult result,
+      final boolean shouldRecordBadBlock) {
+    if (result.causedBy().isPresent()) {
+      LOG.info(
+          "Invalid block {}: {}, caused by {}",
+          invalidBlock.toLogString(),
+          result.errorMessage,
+          result.causedBy().get());
+      LOG.debug("with stack", result.causedBy().get());
+    } else {
+      if (result.errorMessage.isPresent()) {
+        LOG.info("Invalid block {}: {}", invalidBlock.toLogString(), result.errorMessage);
+      } else {
+        LOG.info("Invalid block {}", invalidBlock.toLogString());
+      }
     }
+    if (shouldRecordBadBlock) {
+      badBlockManager.addBadBlock(invalidBlock, result.causedBy());
+    } else {
+      LOG.debug("Invalid block {} not added to badBlockManager ", invalidBlock.toLogString());
+    }
+  }
 
-    return Optional.of(new BlockProcessingOutputs(worldState, receipts));
+  /**
+   * Processes a block, returning the result of the processing
+   *
+   * @param context the ProtocolContext
+   * @param worldState the world state for the parent block state root hash
+   * @param block the block to be processed
+   * @return the result of processing the block
+   */
+  protected BlockProcessingResult processBlock(
+      final ProtocolContext context, final MutableWorldState worldState, final Block block) {
+
+    return blockProcessor.processBlock(context.getBlockchain(), worldState, block);
   }
 
   @Override
@@ -118,12 +216,12 @@ public boolean fastBlockValidation(
       final HeaderValidationMode ommerValidationMode) {
     final BlockHeader header = block.getHeader();
     if (!blockHeaderValidator.validateHeader(header, context, headerValidationMode)) {
-      badBlockManager.addBadBlock(block);
+      badBlockManager.addBadBlock(block, Optional.empty());
       return false;
     }
 
     if (!blockBodyValidator.validateBodyLight(context, block, receipts, ommerValidationMode)) {
-      badBlockManager.addBadBlock(block);
+      badBlockManager.addBadBlock(block, Optional.empty());
       return false;
     }
     return true;
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/ProtocolContext.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/ProtocolContext.java
index f6a1bc66e1d..8c0fc460dc2 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/ProtocolContext.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/ProtocolContext.java
@@ -14,17 +14,13 @@
  */
 package org.hyperledger.besu.ethereum;
 
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.chain.BlockchainStorage;
-import org.hyperledger.besu.ethereum.chain.DefaultBlockchain;
-import org.hyperledger.besu.ethereum.chain.GenesisState;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.ethereum.storage.StorageProvider;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.plugin.services.txselection.TransactionSelectorFactory;
 
-import java.util.function.BiFunction;
+import java.util.Optional;
 
 /**
  * Holds the mutable state used to track the current context of the protocol. This is primarily the
@@ -34,40 +30,49 @@
 public class ProtocolContext {
   private final MutableBlockchain blockchain;
   private final WorldStateArchive worldStateArchive;
-  private final Object consensusState;
+  private final ConsensusContext consensusContext;
+  private final Optional<TransactionSelectorFactory> transactionSelectorFactory;
+
+  private Optional<Synchronizer> synchronizer;
 
   public ProtocolContext(
       final MutableBlockchain blockchain,
       final WorldStateArchive worldStateArchive,
-      final Object consensusState) {
+      final ConsensusContext consensusContext) {
+    this(blockchain, worldStateArchive, consensusContext, Optional.empty());
+  }
+
+  public ProtocolContext(
+      final MutableBlockchain blockchain,
+      final WorldStateArchive worldStateArchive,
+      final ConsensusContext consensusContext,
+      final Optional<TransactionSelectorFactory> transactionSelectorFactory) {
     this.blockchain = blockchain;
     this.worldStateArchive = worldStateArchive;
-    this.consensusState = consensusState;
+    this.consensusContext = consensusContext;
+    this.synchronizer = Optional.empty();
+    this.transactionSelectorFactory = transactionSelectorFactory;
   }
 
   public static ProtocolContext init(
-      final StorageProvider storageProvider,
+      final MutableBlockchain blockchain,
       final WorldStateArchive worldStateArchive,
-      final GenesisState genesisState,
       final ProtocolSchedule protocolSchedule,
-      final MetricsSystem metricsSystem,
-      final BiFunction<Blockchain, WorldStateArchive, Object> consensusContextFactory,
-      final long reorgLoggingThreshold) {
-    final BlockchainStorage blockchainStorage =
-        storageProvider.createBlockchainStorage(protocolSchedule);
-
-    final MutableBlockchain blockchain =
-        DefaultBlockchain.createMutable(
-            genesisState.getBlock(), blockchainStorage, metricsSystem, reorgLoggingThreshold);
-
-    if (blockchain.getChainHeadBlockNumber() < 1) {
-      genesisState.writeStateTo(worldStateArchive.getMutable());
-    }
-
+      final ConsensusContextFactory consensusContextFactory,
+      final Optional<TransactionSelectorFactory> transactionSelectorFactory) {
     return new ProtocolContext(
         blockchain,
         worldStateArchive,
-        consensusContextFactory.apply(blockchain, worldStateArchive));
+        consensusContextFactory.create(blockchain, worldStateArchive, protocolSchedule),
+        transactionSelectorFactory);
+  }
+
+  public Optional<Synchronizer> getSynchronizer() {
+    return synchronizer;
+  }
+
+  public void setSynchronizer(final Optional<Synchronizer> synchronizer) {
+    this.synchronizer = synchronizer;
   }
 
   public MutableBlockchain getBlockchain() {
@@ -78,7 +83,17 @@ public WorldStateArchive getWorldStateArchive() {
     return worldStateArchive;
   }
 
-  public <C> C getConsensusState(final Class<C> klass) {
-    return klass.cast(consensusState);
+  public <C extends ConsensusContext> C getConsensusContext(final Class<C> klass) {
+    return consensusContext.as(klass);
+  }
+
+  public <C extends ConsensusContext> Optional<C> safeConsensusContext(final Class<C> klass) {
+    return Optional.ofNullable(consensusContext)
+        .filter(c -> klass.isAssignableFrom(c.getClass()))
+        .map(klass::cast);
+  }
+
+  public Optional<TransactionSelectorFactory> getTransactionSelectorFactory() {
+    return transactionSelectorFactory;
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiAccount.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiAccount.java
index 99e71076a62..a7692b48d22 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiAccount.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiAccount.java
@@ -16,20 +16,21 @@
 
 package org.hyperledger.besu.ethereum.bonsai;
 
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.AccountStorageEntry;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.EvmAccount;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.ModificationNotAllowedException;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
-import org.hyperledger.besu.ethereum.core.UpdateTrackingAccount;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.datatypes.AccountValue;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.bonsai.worldview.BonsaiWorldView;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPException;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
-import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+import org.hyperledger.besu.evm.ModificationNotAllowedException;
+import org.hyperledger.besu.evm.account.AccountStorageEntry;
+import org.hyperledger.besu.evm.account.EvmAccount;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.worldstate.UpdateTrackingAccount;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -40,8 +41,8 @@
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.units.bigints.UInt256;
 
-public class BonsaiAccount implements MutableAccount, EvmAccount {
-  private final BonsaiWorldState context;
+public class BonsaiAccount implements MutableAccount, EvmAccount, AccountValue {
+  private final BonsaiWorldView context;
   private final boolean mutable;
 
   private final Address address;
@@ -51,19 +52,17 @@ public class BonsaiAccount implements MutableAccount, EvmAccount {
   private Wei balance;
   private Hash storageRoot;
   private Bytes code;
-  private int version;
 
   private final Map<UInt256, UInt256> updatedStorage = new HashMap<>();
 
-  BonsaiAccount(
-      final BonsaiWorldState context,
+  public BonsaiAccount(
+      final BonsaiWorldView context,
       final Address address,
       final Hash addressHash,
       final long nonce,
       final Wei balance,
       final Hash storageRoot,
       final Hash codeHash,
-      final int version,
       final boolean mutable) {
     this.context = context;
     this.address = address;
@@ -72,15 +71,14 @@ public class BonsaiAccount implements MutableAccount, EvmAccount {
     this.balance = balance;
     this.storageRoot = storageRoot;
     this.codeHash = codeHash;
-    this.version = version;
 
     this.mutable = mutable;
   }
 
-  BonsaiAccount(
-      final BonsaiWorldState context,
+  public BonsaiAccount(
+      final BonsaiWorldView context,
       final Address address,
-      final StateTrieAccountValue stateTrieAccount,
+      final AccountValue stateTrieAccount,
       final boolean mutable) {
     this(
         context,
@@ -90,15 +88,15 @@ public class BonsaiAccount implements MutableAccount, EvmAccount {
         stateTrieAccount.getBalance(),
         stateTrieAccount.getStorageRoot(),
         stateTrieAccount.getCodeHash(),
-        stateTrieAccount.getVersion(),
         mutable);
   }
 
-  BonsaiAccount(final BonsaiAccount toCopy) {
+  public BonsaiAccount(final BonsaiAccount toCopy) {
     this(toCopy, toCopy.context, false);
   }
 
-  BonsaiAccount(final BonsaiAccount toCopy, final BonsaiWorldState context, final boolean mutable) {
+  public BonsaiAccount(
+      final BonsaiAccount toCopy, final BonsaiWorldView context, final boolean mutable) {
     this.context = context;
     this.address = toCopy.address;
     this.addressHash = toCopy.addressHash;
@@ -107,14 +105,13 @@ public class BonsaiAccount implements MutableAccount, EvmAccount {
     this.storageRoot = toCopy.storageRoot;
     this.codeHash = toCopy.codeHash;
     this.code = toCopy.code;
-    this.version = toCopy.version;
     updatedStorage.putAll(toCopy.updatedStorage);
 
     this.mutable = mutable;
   }
 
-  BonsaiAccount(
-      final BonsaiWorldState context, final UpdateTrackingAccount<BonsaiAccount> tracked) {
+  public BonsaiAccount(
+      final BonsaiWorldView context, final UpdateTrackingAccount<BonsaiAccount> tracked) {
     this.context = context;
     this.address = tracked.getAddress();
     this.addressHash = tracked.getAddressHash();
@@ -123,14 +120,13 @@ public class BonsaiAccount implements MutableAccount, EvmAccount {
     this.storageRoot = Hash.EMPTY_TRIE_HASH;
     this.codeHash = tracked.getCodeHash();
     this.code = tracked.getCode();
-    this.version = tracked.getVersion();
     updatedStorage.putAll(tracked.getUpdatedStorage());
 
     this.mutable = true;
   }
 
-  static BonsaiAccount fromRLP(
-      final BonsaiWorldState context,
+  public static BonsaiAccount fromRLP(
+      final BonsaiWorldView context,
       final Address address,
       final Bytes encoded,
       final boolean mutable)
@@ -142,25 +138,11 @@ static BonsaiAccount fromRLP(
     final Wei balance = Wei.of(in.readUInt256Scalar());
     final Hash storageRoot = Hash.wrap(in.readBytes32());
     final Hash codeHash = Hash.wrap(in.readBytes32());
-    final int version;
-    if (!in.isEndOfCurrentList()) {
-      version = in.readIntScalar();
-    } else {
-      version = Account.DEFAULT_VERSION;
-    }
 
     in.leaveList();
 
     return new BonsaiAccount(
-        context,
-        address,
-        Hash.hash(address),
-        nonce,
-        balance,
-        storageRoot,
-        codeHash,
-        version,
-        mutable);
+        context, address, Hash.hash(address), nonce, balance, storageRoot, codeHash, mutable);
   }
 
   @Override
@@ -202,7 +184,7 @@ public void setBalance(final Wei value) {
   @Override
   public Bytes getCode() {
     if (code == null) {
-      code = context.getCode(address);
+      code = context.getCode(address, codeHash).orElse(Bytes.EMPTY);
     }
     return code;
   }
@@ -225,19 +207,6 @@ public Hash getCodeHash() {
     return codeHash;
   }
 
-  @Override
-  public int getVersion() {
-    return version;
-  }
-
-  @Override
-  public void setVersion(final int version) {
-    if (!mutable) {
-      throw new UnsupportedOperationException("Account is immutable");
-    }
-    this.version = version;
-  }
-
   @Override
   public UInt256 getStorageValue(final UInt256 key) {
     return context.getStorageValue(address, key);
@@ -245,7 +214,7 @@ public UInt256 getStorageValue(final UInt256 key) {
 
   @Override
   public UInt256 getOriginalStorageValue(final UInt256 key) {
-    return context.getOriginalStorageValue(address, key);
+    return context.getPriorStorageValue(address, key);
   }
 
   @Override
@@ -254,8 +223,14 @@ public NavigableMap<Bytes32, AccountStorageEntry> storageEntriesFrom(
     throw new RuntimeException("Bonsai Tries does not currently support enumerating storage");
   }
 
-  Bytes serializeAccount() {
+  public Bytes serializeAccount() {
     final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    writeTo(out);
+    return out.encoded();
+  }
+
+  @Override
+  public void writeTo(final RLPOutput out) {
     out.startList();
 
     out.writeLongScalar(nonce);
@@ -263,13 +238,7 @@ Bytes serializeAccount() {
     out.writeBytes(storageRoot);
     out.writeBytes(codeHash);
 
-    if (version != Account.DEFAULT_VERSION) {
-      // version of zero is never written out.
-      out.writeIntScalar(version);
-    }
-
     out.endList();
-    return out.encoded();
   }
 
   @Override
@@ -299,6 +268,7 @@ public MutableAccount getMutable() throws ModificationNotAllowedException {
     }
   }
 
+  @Override
   public Hash getStorageRoot() {
     return storageRoot;
   }
@@ -323,8 +293,6 @@ public String toString() {
         + storageRoot
         + ", codeHash="
         + codeHash
-        + ", version="
-        + version
         + '}';
   }
 
@@ -336,8 +304,8 @@ public String toString() {
    * @param context a description to be added to the thrown exceptions
    * @throws IllegalStateException if the stored values differ
    */
-  static void assertCloseEnoughForDiffing(
-      final BonsaiAccount source, final StateTrieAccountValue account, final String context) {
+  public static void assertCloseEnoughForDiffing(
+      final BonsaiAccount source, final AccountValue account, final String context) {
     if (source == null) {
       throw new IllegalStateException(context + ": source is null but target isn't");
     } else {
@@ -350,9 +318,6 @@ static void assertCloseEnoughForDiffing(
       if (!Objects.equals(source.storageRoot, account.getStorageRoot())) {
         throw new IllegalStateException(context + ": Storage Roots differ");
       }
-      if (source.version != account.getVersion()) {
-        throw new IllegalStateException(context + ": versions differ");
-      }
     }
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiLayeredWorldState.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiLayeredWorldState.java
deleted file mode 100644
index d0a489eee16..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiLayeredWorldState.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-
-package org.hyperledger.besu.ethereum.bonsai;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.WorldState;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Stream;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-/** A World State backed first by trie log layer and then by another world state. */
-public class BonsaiLayeredWorldState implements BonsaiWorldState, WorldState {
-
-  private final BonsaiWorldState parent;
-  private final TrieLogLayer trieLog;
-  private final Map<Address, Account> cachedAccounts = new HashMap<>();
-
-  public BonsaiLayeredWorldState(final BonsaiWorldState parent, final TrieLogLayer trieLog) {
-    checkArgument(trieLog.isFrozen(), "TrieLogs must be frozen to be used as world state.");
-    this.parent = parent;
-    this.trieLog = trieLog;
-  }
-
-  @Override
-  public Bytes getCode(final Address address) {
-    return trieLog.getCode(address).orElseGet(() -> parent.getCode(address));
-  }
-
-  @Override
-  public UInt256 getStorageValue(final Address address, final UInt256 key) {
-    return getStorageValueBySlotHash(address, Hash.hash(key.toBytes())).orElse(UInt256.ZERO);
-  }
-
-  @Override
-  public Optional<UInt256> getStorageValueBySlotHash(final Address address, final Hash slotHash) {
-    return trieLog
-        .getStorageBySlotHash(address, slotHash)
-        .or(() -> parent.getStorageValueBySlotHash(address, slotHash));
-  }
-
-  @Override
-  public UInt256 getOriginalStorageValue(final Address address, final UInt256 key) {
-    // This is the base layer for a block, all values are original.
-    return getStorageValue(address, key);
-  }
-
-  @Override
-  public Map<Bytes32, Bytes> getAllAccountStorage(final Address address, final Hash rootHash) {
-    final Map<Bytes32, Bytes> results = parent.getAllAccountStorage(address, rootHash);
-    trieLog
-        .streamStorageChanges(address)
-        .forEach(entry -> results.put(entry.getKey(), entry.getValue().getUpdated().toBytes()));
-    return results;
-  }
-
-  @Override
-  public Account get(final Address address) {
-    return cachedAccounts.computeIfAbsent(
-        address,
-        addr ->
-            trieLog
-                .getAccount(addr)
-                .map(
-                    stateTrieAccountValue ->
-                        (Account)
-                            new BonsaiAccount(
-                                BonsaiLayeredWorldState.this, addr, stateTrieAccountValue, false))
-                .orElseGet(() -> parent.get(address)));
-  }
-
-  @Override
-  public Hash rootHash() {
-    return trieLog.getBlockHash();
-  }
-
-  @Override
-  public Stream<StreamableAccount> streamAccounts(final Bytes32 startKeyHash, final int limit) {
-    throw new UnsupportedOperationException("Bonsai does not support pruning and debug RPCs");
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiPersistedWorldState.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiPersistedWorldState.java
deleted file mode 100644
index d4f7cd3d337..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiPersistedWorldState.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-
-package org.hyperledger.besu.ethereum.bonsai;
-
-import static org.hyperledger.besu.ethereum.bonsai.BonsaiAccount.fromRLP;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
-import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie;
-import org.hyperledger.besu.ethereum.trie.StoredMerklePatriciaTrie;
-import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
-import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
-import java.util.Optional;
-import java.util.function.Function;
-import java.util.stream.Stream;
-import javax.annotation.Nonnull;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class BonsaiPersistedWorldState implements MutableWorldState, BonsaiWorldState {
-
-  private static final byte[] WORLD_ROOT_KEY = "worldRoot".getBytes(StandardCharsets.UTF_8);
-
-  private final KeyValueStorage accountStorage;
-  private final KeyValueStorage codeStorage;
-  private final KeyValueStorage storageStorage;
-  private final KeyValueStorage trieBranchStorage;
-  private final KeyValueStorage trieLogStorage;
-
-  private Bytes32 worldStateRootHash;
-
-  private final BonsaiWorldStateArchive archive;
-  private BonsaiWorldStateUpdater updater;
-
-  public BonsaiPersistedWorldState(
-      final BonsaiWorldStateArchive archive,
-      final KeyValueStorage accountStorage,
-      final KeyValueStorage codeStorage,
-      final KeyValueStorage storageStorage,
-      final KeyValueStorage trieBranchStorage,
-      final KeyValueStorage trieLogStorage) {
-    this.archive = archive;
-    this.accountStorage = accountStorage;
-    this.codeStorage = codeStorage;
-    this.storageStorage = storageStorage;
-    this.trieBranchStorage = trieBranchStorage;
-    this.trieLogStorage = trieLogStorage;
-    worldStateRootHash =
-        Bytes32.wrap(
-            trieBranchStorage.get(WORLD_ROOT_KEY).map(Bytes::wrap).orElse(Hash.EMPTY_TRIE_HASH));
-  }
-
-  public BonsaiWorldStateArchive getArchive() {
-    return archive;
-  }
-
-  @Override
-  public MutableWorldState copy() {
-    throw new UnsupportedOperationException(
-        "Bonsai Tries does not support direct duplication of the persisted tries.");
-  }
-
-  @Override
-  public Bytes getCode(@Nonnull final Address address) {
-    return codeStorage.get(address.toArrayUnsafe()).map(Bytes::wrap).orElse(Bytes.EMPTY);
-  }
-
-  @Override
-  public void persist(final Hash blockHash) {
-    boolean success = false;
-    final KeyValueStorageTransaction accountTx = accountStorage.startTransaction();
-    final KeyValueStorageTransaction codeTx = codeStorage.startTransaction();
-    final KeyValueStorageTransaction storageTx = storageStorage.startTransaction();
-    final KeyValueStorageTransaction trieBranchTx = trieBranchStorage.startTransaction();
-    final KeyValueStorageTransaction trieLogTx = trieLogStorage.startTransaction();
-
-    try {
-      // first clear storage
-      for (final Address address : updater.getStorageToClear()) {
-        // because we are clearing persisted values we need the account root as persisted
-        final BonsaiAccount oldAccount =
-            accountStorage
-                .get(address.toArrayUnsafe())
-                .map(
-                    bytes ->
-                        fromRLP(BonsaiPersistedWorldState.this, address, Bytes.wrap(bytes), true))
-                .orElse(null);
-        if (oldAccount == null) {
-          // This is when an account is both created and deleted within the scope of the same
-          // block.  A not-uncommon DeFi bot pattern.
-          continue;
-        }
-        final StoredMerklePatriciaTrie<Bytes, Bytes> storageTrie =
-            new StoredMerklePatriciaTrie<>(
-                (location, key) -> getStorageTrieNode(address, location, key),
-                oldAccount.getStorageRoot(),
-                Function.identity(),
-                Function.identity());
-        Map<Bytes32, Bytes> entriesToDelete = storageTrie.entriesFrom(Bytes32.ZERO, 256);
-        while (!entriesToDelete.isEmpty()) {
-          entriesToDelete
-              .keySet()
-              .forEach(k -> storageTx.remove(Bytes.concatenate(address, k).toArrayUnsafe()));
-          if (entriesToDelete.size() == 256) {
-            entriesToDelete.keySet().forEach(storageTrie::remove);
-            entriesToDelete = storageTrie.entriesFrom(Bytes32.ZERO, 256);
-          } else {
-            break;
-          }
-        }
-      }
-
-      // second update account storage state.  This must be done before updating the accounts so
-      // that we can get the storage state hash
-      for (final Map.Entry<Address, Map<Hash, BonsaiValue<UInt256>>> storageAccountUpdate :
-          updater.getStorageToUpdate().entrySet()) {
-        final Address updatedAddress = storageAccountUpdate.getKey();
-        final BonsaiValue<BonsaiAccount> accountValue =
-            updater.getAccountsToUpdate().get(updatedAddress);
-        final BonsaiAccount accountOriginal = accountValue.getOriginal();
-        final Hash storageRoot =
-            (accountOriginal == null) ? Hash.EMPTY_TRIE_HASH : accountOriginal.getStorageRoot();
-        final StoredMerklePatriciaTrie<Bytes, Bytes> storageTrie =
-            new StoredMerklePatriciaTrie<>(
-                (location, key) -> getStorageTrieNode(updatedAddress, location, key),
-                storageRoot,
-                Function.identity(),
-                Function.identity());
-
-        // for manicured tries and composting, collect branches here (not implemented)
-
-        for (final Map.Entry<Hash, BonsaiValue<UInt256>> storageUpdate :
-            storageAccountUpdate.getValue().entrySet()) {
-          final Hash keyHash = storageUpdate.getKey();
-          final byte[] writeAddress = Bytes.concatenate(updatedAddress, keyHash).toArrayUnsafe();
-          final UInt256 updatedStorage = storageUpdate.getValue().getUpdated();
-          if (updatedStorage == null || updatedStorage.equals(UInt256.ZERO)) {
-            storageTx.remove(writeAddress);
-            storageTrie.remove(keyHash);
-          } else {
-            final Bytes32 updatedStorageBytes = updatedStorage.toBytes();
-            storageTx.put(writeAddress, updatedStorageBytes.toArrayUnsafe());
-            storageTrie.put(keyHash, rlpEncode(updatedStorageBytes));
-          }
-        }
-
-        final BonsaiAccount accountUpdated = accountValue.getUpdated();
-        if (accountUpdated != null) {
-          storageTrie.commit(
-              (location, key, value) ->
-                  writeStorageTrieNode(trieBranchTx, updatedAddress, location, value));
-          final Hash newStorageRoot = Hash.wrap(storageTrie.getRootHash());
-          accountUpdated.setStorageRoot(newStorageRoot);
-        }
-        // for manicured tries and composting, trim and compost here
-      }
-
-      // Third update the code.  This has the side effect of ensuring a code hash is calculated.
-      for (final Map.Entry<Address, BonsaiValue<Bytes>> codeUpdate :
-          updater.getCodeToUpdate().entrySet()) {
-        final Bytes updatedCode = codeUpdate.getValue().getUpdated();
-        if (updatedCode == null || updatedCode.size() == 0) {
-          codeTx.remove(codeUpdate.getKey().toArrayUnsafe());
-        } else {
-          codeTx.put(codeUpdate.getKey().toArrayUnsafe(), updatedCode.toArrayUnsafe());
-        }
-      }
-
-      // next collect the branches that will be trimmed
-      final StoredMerklePatriciaTrie<Bytes, Bytes> accountTrie =
-          new StoredMerklePatriciaTrie<>(
-              this::getTrieNode, worldStateRootHash, Function.identity(), Function.identity());
-
-      // for manicured tries and composting, collect branches here (not implemented)
-
-      // now add the accounts
-      for (final Map.Entry<Address, BonsaiValue<BonsaiAccount>> accountUpdate :
-          updater.getAccountsToUpdate().entrySet()) {
-        final Bytes accountKey = accountUpdate.getKey();
-        final BonsaiValue<BonsaiAccount> bonsaiValue = accountUpdate.getValue();
-        final BonsaiAccount updatedAccount = bonsaiValue.getUpdated();
-        if (updatedAccount == null) {
-          final Hash addressHash = Hash.hash(accountKey);
-          accountTrie.remove(addressHash);
-          accountTx.remove(accountKey.toArrayUnsafe());
-        } else {
-          final Hash addressHash = updatedAccount.getAddressHash();
-          final Bytes accountValue = updatedAccount.serializeAccount();
-          accountTx.put(accountKey.toArrayUnsafe(), accountValue.toArrayUnsafe());
-          accountTrie.put(addressHash, accountValue);
-        }
-      }
-
-      accountTrie.commit((location, hash, value) -> writeTrieNode(trieBranchTx, location, value));
-      worldStateRootHash = accountTrie.getRootHash();
-      trieBranchTx.put(WORLD_ROOT_KEY, worldStateRootHash.toArrayUnsafe());
-
-      // for manicured tries and composting, trim and compost branches here
-
-      if (blockHash != null) {
-        final TrieLogLayer trieLog = updater.generateTrieLog(blockHash);
-        trieLog.freeze();
-        // TODO add to archive here, but only once we get persisted follow distance implemented
-        // archive.addLayeredWorldState(new BonsaiLayeredWorldState(this, trieLog));
-
-        final BytesValueRLPOutput rlpLog = new BytesValueRLPOutput();
-        trieLog.writeTo(rlpLog);
-        trieLogTx.put(blockHash.toArrayUnsafe(), rlpLog.encoded().toArrayUnsafe());
-      }
-
-      success = true;
-    } finally {
-      if (success) {
-        accountTx.commit();
-        codeTx.commit();
-        storageTx.commit();
-        trieBranchTx.commit();
-        trieLogTx.commit();
-        updater.reset();
-      } else {
-        accountTx.rollback();
-        codeTx.rollback();
-        storageTx.rollback();
-        trieBranchTx.rollback();
-        trieLogTx.rollback();
-      }
-    }
-  }
-
-  private static Bytes rlpEncode(final Bytes bytes) {
-    final BytesValueRLPOutput out = new BytesValueRLPOutput();
-    out.writeBytes(bytes.trimLeadingZeros());
-    return out.encoded();
-  }
-
-  @Override
-  public WorldUpdater updater() {
-    if (updater == null) {
-      updater = new BonsaiWorldStateUpdater(this);
-    }
-    return updater;
-  }
-
-  @Override
-  public Hash rootHash() {
-    return Hash.wrap(worldStateRootHash);
-  }
-
-  @Override
-  public Stream<StreamableAccount> streamAccounts(final Bytes32 startKeyHash, final int limit) {
-    throw new RuntimeException("Bonsai Tries do not provide account streaming.");
-  }
-
-  @Override
-  public Account get(final Address address) {
-    return accountStorage
-        .get(address.toArrayUnsafe())
-        .map(bytes -> fromRLP(updater, address, Bytes.wrap(bytes), true))
-        .orElse(null);
-  }
-
-  private Optional<Bytes> getTrieNode(final Bytes location, final Bytes32 nodeHash) {
-    if (nodeHash.equals(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH)) {
-      return Optional.of(MerklePatriciaTrie.EMPTY_TRIE_NODE);
-    } else {
-      return trieBranchStorage.get(location.toArrayUnsafe()).map(Bytes::wrap);
-    }
-  }
-
-  private void writeTrieNode(
-      final KeyValueStorageTransaction tx, final Bytes location, final Bytes value) {
-    tx.put(location.toArrayUnsafe(), value.toArrayUnsafe());
-  }
-
-  private Optional<Bytes> getStorageTrieNode(
-      final Address address, final Bytes location, final Bytes32 nodeHash) {
-    if (nodeHash.equals(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH)) {
-      return Optional.of(MerklePatriciaTrie.EMPTY_TRIE_NODE);
-    } else {
-      return trieBranchStorage
-          .get(Bytes.concatenate(address, location).toArrayUnsafe())
-          .map(Bytes::wrap);
-    }
-  }
-
-  private void writeStorageTrieNode(
-      final KeyValueStorageTransaction tx,
-      final Address address,
-      final Bytes location,
-      final Bytes value) {
-    tx.put(Bytes.concatenate(address, location).toArrayUnsafe(), value.toArrayUnsafe());
-  }
-
-  @Override
-  public UInt256 getStorageValue(final Address address, final UInt256 storageKey) {
-    return getStorageValueBySlotHash(address, Hash.hash(storageKey.toBytes())).orElse(UInt256.ZERO);
-  }
-
-  @Override
-  public Optional<UInt256> getStorageValueBySlotHash(final Address address, final Hash slotHash) {
-    return storageStorage
-        .get(Bytes.concatenate(address, slotHash).toArrayUnsafe())
-        .map(Bytes::wrap)
-        .map(UInt256::fromBytes);
-  }
-
-  @Override
-  public UInt256 getOriginalStorageValue(final Address address, final UInt256 storageKey) {
-    return getStorageValue(address, storageKey);
-  }
-
-  @Override
-  public Map<Bytes32, Bytes> getAllAccountStorage(final Address address, final Hash rootHash) {
-    final StoredMerklePatriciaTrie<Bytes, Bytes> storageTrie =
-        new StoredMerklePatriciaTrie<>(
-            (location, key) -> getStorageTrieNode(address, location, key),
-            rootHash,
-            Function.identity(),
-            Function.identity());
-    return storageTrie.entriesFrom(Bytes32.ZERO, Integer.MAX_VALUE);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiValue.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiValue.java
index 869221b7858..7d862c7fb95 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiValue.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiValue.java
@@ -16,60 +16,88 @@
 
 package org.hyperledger.besu.ethereum.bonsai;
 
-import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+import org.hyperledger.besu.plugin.services.trielogs.TrieLog;
 
-import java.util.Objects;
-import java.util.function.BiConsumer;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
-public class BonsaiValue<T> {
-  private T original;
+public class BonsaiValue<T> implements TrieLog.LogTuple<T> {
+  private T prior;
   private T updated;
+  private boolean cleared;
 
-  BonsaiValue(final T original, final T updated) {
-    this.original = original;
+  public BonsaiValue(final T prior, final T updated) {
+    this.prior = prior;
     this.updated = updated;
+    this.cleared = false;
   }
 
-  public T getOriginal() {
-    return original;
+  public BonsaiValue(final T prior, final T updated, final boolean cleared) {
+    this.prior = prior;
+    this.updated = updated;
+    this.cleared = cleared;
+  }
+
+  @Override
+  public T getPrior() {
+    return prior;
   }
 
+  @Override
   public T getUpdated() {
     return updated;
   }
 
-  public void setOriginal(final T original) {
-    this.original = original;
+  public BonsaiValue<T> setPrior(final T prior) {
+    this.prior = prior;
+    return this;
   }
 
-  public void setUpdated(final T updated) {
+  public BonsaiValue<T> setUpdated(final T updated) {
+    this.cleared = updated == null;
     this.updated = updated;
+    return this;
   }
 
-  void writeRlp(final RLPOutput output, final BiConsumer<RLPOutput, T> writer) {
-    output.startList();
-    writeInnerRlp(output, writer);
-    output.endList();
+  public void setCleared() {
+    this.cleared = true;
   }
 
-  void writeInnerRlp(final RLPOutput output, final BiConsumer<RLPOutput, T> writer) {
-    if (original == null) {
-      output.writeNull();
-    } else {
-      writer.accept(output, original);
-    }
-    if (updated == null) {
-      output.writeNull();
-    } else {
-      writer.accept(output, updated);
-    }
+  @Override
+  public boolean isCleared() {
+    return cleared;
   }
 
-  boolean isUnchanged() {
-    return Objects.equals(updated, original);
+  @Override
+  public String toString() {
+    return "BonsaiValue{"
+        + "prior="
+        + prior
+        + ", updated="
+        + updated
+        + ", cleared="
+        + cleared
+        + '}';
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    BonsaiValue<?> that = (BonsaiValue<?>) o;
+    return new EqualsBuilder()
+        .append(cleared, that.cleared)
+        .append(prior, that.prior)
+        .append(updated, that.updated)
+        .isEquals();
   }
 
-  T effective() {
-    return updated == null ? original : updated;
+  @Override
+  public int hashCode() {
+    return new HashCodeBuilder(17, 37).append(prior).append(updated).append(cleared).toHashCode();
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldState.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldState.java
deleted file mode 100644
index 85904b58dbb..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldState.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-
-package org.hyperledger.besu.ethereum.bonsai;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.WorldView;
-
-import java.util.Map;
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public interface BonsaiWorldState extends WorldView {
-
-  Bytes getCode(Address address);
-
-  UInt256 getStorageValue(Address address, UInt256 key);
-
-  Optional<UInt256> getStorageValueBySlotHash(Address address, Hash slotHash);
-
-  UInt256 getOriginalStorageValue(Address address, UInt256 key);
-
-  /**
-   * Stream all the storage values of a account.
-   *
-   * @param address the account to stream
-   * @param rootHash the root hash of the account storage trie
-   * @return A map that is a copy of the entries. The key is the hashed slot number, and the value
-   *     is the Bytes representation of the storage value.
-   */
-  Map<Bytes32, Bytes> getAllAccountStorage(Address address, Hash rootHash);
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateArchive.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateArchive.java
deleted file mode 100644
index 9f268ff3799..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateArchive.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-
-package org.hyperledger.besu.ethereum.bonsai;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.WorldState;
-import org.hyperledger.besu.ethereum.proof.WorldStateProof;
-import org.hyperledger.besu.ethereum.storage.StorageProvider;
-import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class BonsaiWorldStateArchive implements WorldStateArchive {
-
-  private final BonsaiPersistedWorldState persistedState;
-  private final Map<Bytes32, BonsaiLayeredWorldState> layeredWorldStates;
-
-  public BonsaiWorldStateArchive(final StorageProvider provider) {
-    persistedState =
-        new BonsaiPersistedWorldState(
-            this,
-            provider.getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.ACCOUNT_INFO_STATE),
-            provider.getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.CODE_STORAGE),
-            provider.getStorageBySegmentIdentifier(
-                KeyValueSegmentIdentifier.ACCOUNT_STORAGE_STORAGE),
-            provider.getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.TRIE_BRANCH_STORAGE),
-            provider.getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.TRIE_LOG_STORAGE));
-    layeredWorldStates = new HashMap<>();
-  }
-
-  @Override
-  public Optional<WorldState> get(final Hash rootHash) {
-    if (layeredWorldStates.containsKey(rootHash)) {
-      return Optional.of(layeredWorldStates.get(rootHash));
-    } else if (rootHash.equals(persistedState.rootHash())) {
-      return Optional.of(persistedState);
-    } else {
-      return Optional.empty();
-    }
-  }
-
-  public void addLayeredWorldState(final BonsaiLayeredWorldState worldState) {
-    layeredWorldStates.put(worldState.rootHash(), worldState);
-  }
-
-  @Override
-  public boolean isWorldStateAvailable(final Hash rootHash) {
-    return layeredWorldStates.containsKey(rootHash)
-        || persistedState.rootHash().equals(rootHash) /* || check disk storage */;
-  }
-
-  @Override
-  public Optional<MutableWorldState> getMutable(final Hash rootHash) {
-    if (rootHash.equals(persistedState.rootHash())) {
-      return Optional.of(persistedState);
-    } else {
-      return Optional.empty();
-    }
-  }
-
-  @Override
-  public MutableWorldState getMutable() {
-    return persistedState;
-  }
-
-  @Override
-  public Optional<Bytes> getNodeData(final Hash hash) {
-    return Optional.empty();
-  }
-
-  @Override
-  public Optional<WorldStateProof> getAccountProof(
-      final Hash worldStateRoot,
-      final Address accountAddress,
-      final List<UInt256> accountStorageKeys) {
-    return Optional.empty();
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateProvider.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateProvider.java
new file mode 100644
index 00000000000..b3e7057f80e
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateProvider.java
@@ -0,0 +1,387 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.bonsai;
+
+import static org.hyperledger.besu.ethereum.bonsai.cache.CachedWorldStorageManager.RETAINED_LAYERS;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.bonsai.cache.CachedMerkleTrieLoader;
+import org.hyperledger.besu.ethereum.bonsai.cache.CachedWorldStorageManager;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.bonsai.trielog.TrieLogManager;
+import org.hyperledger.besu.ethereum.bonsai.worldview.BonsaiWorldState;
+import org.hyperledger.besu.ethereum.bonsai.worldview.BonsaiWorldStateUpdateAccumulator;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.proof.WorldStateProof;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.storage.StorageProvider;
+import org.hyperledger.besu.ethereum.trie.MerkleTrieException;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.worldstate.WorldState;
+import org.hyperledger.besu.metrics.ObservableMetricsSystem;
+import org.hyperledger.besu.plugin.BesuContext;
+import org.hyperledger.besu.plugin.services.trielogs.TrieLog;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Function;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class BonsaiWorldStateProvider implements WorldStateArchive {
+
+  private static final Logger LOG = LoggerFactory.getLogger(BonsaiWorldStateProvider.class);
+
+  private final Blockchain blockchain;
+
+  private final TrieLogManager trieLogManager;
+  private final BonsaiWorldState persistedState;
+  private final BonsaiWorldStateKeyValueStorage worldStateStorage;
+
+  private final CachedMerkleTrieLoader cachedMerkleTrieLoader;
+
+  public BonsaiWorldStateProvider(
+      final StorageProvider provider,
+      final Blockchain blockchain,
+      final CachedMerkleTrieLoader cachedMerkleTrieLoader,
+      final ObservableMetricsSystem metricsSystem,
+      final BesuContext pluginContext) {
+    this(
+        (BonsaiWorldStateKeyValueStorage)
+            provider.createWorldStateStorage(DataStorageFormat.BONSAI),
+        blockchain,
+        Optional.empty(),
+        cachedMerkleTrieLoader,
+        metricsSystem,
+        pluginContext);
+  }
+
+  public BonsaiWorldStateProvider(
+      final BonsaiWorldStateKeyValueStorage worldStateStorage,
+      final Blockchain blockchain,
+      final Optional<Long> maxLayersToLoad,
+      final CachedMerkleTrieLoader cachedMerkleTrieLoader,
+      final ObservableMetricsSystem metricsSystem,
+      final BesuContext pluginContext) {
+
+    // TODO: de-dup constructors
+    this.trieLogManager =
+        new CachedWorldStorageManager(
+            this,
+            blockchain,
+            worldStateStorage,
+            metricsSystem,
+            maxLayersToLoad.orElse(RETAINED_LAYERS),
+            pluginContext);
+    this.blockchain = blockchain;
+    this.worldStateStorage = worldStateStorage;
+    this.persistedState = new BonsaiWorldState(this, worldStateStorage);
+    this.cachedMerkleTrieLoader = cachedMerkleTrieLoader;
+    blockchain
+        .getBlockHeader(persistedState.worldStateBlockHash)
+        .ifPresent(
+            blockHeader ->
+                this.trieLogManager.addCachedLayer(
+                    blockHeader, persistedState.worldStateRootHash, persistedState));
+  }
+
+  @VisibleForTesting
+  BonsaiWorldStateProvider(
+      final TrieLogManager trieLogManager,
+      final BonsaiWorldStateKeyValueStorage worldStateStorage,
+      final Blockchain blockchain,
+      final CachedMerkleTrieLoader cachedMerkleTrieLoader) {
+    this.trieLogManager = trieLogManager;
+    this.blockchain = blockchain;
+    this.worldStateStorage = worldStateStorage;
+    this.persistedState = new BonsaiWorldState(this, worldStateStorage);
+    this.cachedMerkleTrieLoader = cachedMerkleTrieLoader;
+    blockchain
+        .getBlockHeader(persistedState.worldStateBlockHash)
+        .ifPresent(
+            blockHeader ->
+                this.trieLogManager.addCachedLayer(
+                    blockHeader, persistedState.worldStateRootHash, persistedState));
+  }
+
+  @Override
+  public Optional<WorldState> get(final Hash rootHash, final Hash blockHash) {
+    return trieLogManager
+        .getWorldState(blockHash)
+        .or(
+            () -> {
+              if (blockHash.equals(persistedState.blockHash())) {
+                return Optional.of(persistedState);
+              } else {
+                return Optional.empty();
+              }
+            })
+        .map(WorldState.class::cast);
+  }
+
+  @Override
+  public boolean isWorldStateAvailable(final Hash rootHash, final Hash blockHash) {
+    return trieLogManager.containWorldStateStorage(blockHash)
+        || persistedState.blockHash().equals(blockHash)
+        || worldStateStorage.isWorldStateAvailable(rootHash, blockHash);
+  }
+
+  @Override
+  public Optional<MutableWorldState> getMutable(
+      final BlockHeader blockHeader, final boolean shouldPersistState) {
+    if (shouldPersistState) {
+      return getMutable(blockHeader.getStateRoot(), blockHeader.getHash());
+    } else {
+      final BlockHeader chainHeadBlockHeader = blockchain.getChainHeadHeader();
+      if (chainHeadBlockHeader.getNumber() - blockHeader.getNumber()
+          >= trieLogManager.getMaxLayersToLoad()) {
+        LOG.warn(
+            "Exceeded the limit of back layers that can be loaded ({})",
+            trieLogManager.getMaxLayersToLoad());
+        return Optional.empty();
+      }
+      return trieLogManager
+          .getWorldState(blockHeader.getHash())
+          .or(() -> trieLogManager.getNearestWorldState(blockHeader))
+          .or(() -> trieLogManager.getHeadWorldState(blockchain::getBlockHeader))
+          .flatMap(
+              bonsaiWorldState ->
+                  rollMutableStateToBlockHash(bonsaiWorldState, blockHeader.getHash()))
+          .map(MutableWorldState::freeze);
+    }
+  }
+
+  @Override
+  public synchronized Optional<MutableWorldState> getMutable(
+      final Hash rootHash, final Hash blockHash) {
+    return rollMutableStateToBlockHash(persistedState, blockHash);
+  }
+
+  Optional<MutableWorldState> rollMutableStateToBlockHash(
+      final BonsaiWorldState mutableState, final Hash blockHash) {
+    if (blockHash.equals(mutableState.blockHash())) {
+      return Optional.of(mutableState);
+    } else {
+      try {
+
+        final Optional<BlockHeader> maybePersistedHeader =
+            blockchain.getBlockHeader(mutableState.blockHash()).map(BlockHeader.class::cast);
+
+        final List<TrieLog> rollBacks = new ArrayList<>();
+        final List<TrieLog> rollForwards = new ArrayList<>();
+        if (maybePersistedHeader.isEmpty()) {
+          trieLogManager.getTrieLogLayer(mutableState.blockHash()).ifPresent(rollBacks::add);
+        } else {
+          BlockHeader targetHeader = blockchain.getBlockHeader(blockHash).get();
+          BlockHeader persistedHeader = maybePersistedHeader.get();
+          // roll back from persisted to even with target
+          Hash persistedBlockHash = persistedHeader.getBlockHash();
+          while (persistedHeader.getNumber() > targetHeader.getNumber()) {
+            LOG.debug("Rollback {}", persistedBlockHash);
+            rollBacks.add(trieLogManager.getTrieLogLayer(persistedBlockHash).get());
+            persistedHeader = blockchain.getBlockHeader(persistedHeader.getParentHash()).get();
+            persistedBlockHash = persistedHeader.getBlockHash();
+          }
+          // roll forward to target
+          Hash targetBlockHash = targetHeader.getBlockHash();
+          while (persistedHeader.getNumber() < targetHeader.getNumber()) {
+            LOG.debug("Rollforward {}", targetBlockHash);
+            rollForwards.add(trieLogManager.getTrieLogLayer(targetBlockHash).get());
+            targetHeader = blockchain.getBlockHeader(targetHeader.getParentHash()).get();
+            targetBlockHash = targetHeader.getBlockHash();
+          }
+
+          // roll back in tandem until we hit a shared state
+          while (!persistedBlockHash.equals(targetBlockHash)) {
+            LOG.debug("Paired Rollback {}", persistedBlockHash);
+            LOG.debug("Paired Rollforward {}", targetBlockHash);
+            rollForwards.add(trieLogManager.getTrieLogLayer(targetBlockHash).get());
+            targetHeader = blockchain.getBlockHeader(targetHeader.getParentHash()).get();
+
+            rollBacks.add(trieLogManager.getTrieLogLayer(persistedBlockHash).get());
+            persistedHeader = blockchain.getBlockHeader(persistedHeader.getParentHash()).get();
+
+            targetBlockHash = targetHeader.getBlockHash();
+            persistedBlockHash = persistedHeader.getBlockHash();
+          }
+        }
+
+        // attempt the state rolling
+        final BonsaiWorldStateUpdateAccumulator bonsaiUpdater =
+            (BonsaiWorldStateUpdateAccumulator) mutableState.updater();
+        try {
+          for (final TrieLog rollBack : rollBacks) {
+            LOG.debug("Attempting Rollback of {}", rollBack.getBlockHash());
+            bonsaiUpdater.rollBack(rollBack);
+          }
+          for (int i = rollForwards.size() - 1; i >= 0; i--) {
+            final var forward = rollForwards.get(i);
+            LOG.debug("Attempting Rollforward of {}", rollForwards.get(i).getBlockHash());
+            bonsaiUpdater.rollForward(forward);
+          }
+          bonsaiUpdater.commit();
+
+          mutableState.persist(blockchain.getBlockHeader(blockHash).get());
+
+          LOG.debug(
+              "Archive rolling finished, {} now at {}",
+              mutableState.getWorldStateStorage().getClass().getSimpleName(),
+              blockHash);
+          return Optional.of(mutableState);
+        } catch (final MerkleTrieException re) {
+          // need to throw to trigger the heal
+          throw re;
+        } catch (final Exception e) {
+          // if we fail we must clean up the updater
+          bonsaiUpdater.reset();
+          LOG.debug(
+              "State rolling failed on "
+                  + mutableState.getWorldStateStorage().getClass().getSimpleName()
+                  + " for block hash "
+                  + blockHash,
+              e);
+
+          return Optional.empty();
+        }
+      } catch (final RuntimeException re) {
+        LOG.info("Archive rolling failed for block hash " + blockHash, re);
+        if (re instanceof MerkleTrieException) {
+          // need to throw to trigger the heal
+          throw re;
+        }
+        throw new MerkleTrieException(
+            "invalid", Optional.of(Address.ZERO), Hash.EMPTY, Bytes.EMPTY);
+      }
+    }
+  }
+
+  public CachedMerkleTrieLoader getCachedMerkleTrieLoader() {
+    return cachedMerkleTrieLoader;
+  }
+
+  @Override
+  public MutableWorldState getMutable() {
+    return persistedState;
+  }
+
+  /**
+   * Prepares the state healing process for a given address and location. It prepares the state
+   * healing, including retrieving data from storage, identifying invalid slots or nodes, removing
+   * account and slot from the state trie, and committing the changes. Finally, it downgrades the
+   * world state storage to partial flat database mode.
+   */
+  public void prepareStateHealing(final Address address, final Bytes location) {
+    final Set<Bytes> keysToDelete = new HashSet<>();
+    final BonsaiWorldStateKeyValueStorage.BonsaiUpdater updater = worldStateStorage.updater();
+    final Hash accountHash = Hash.hash(address);
+    final StoredMerklePatriciaTrie<Bytes, Bytes> accountTrie =
+        new StoredMerklePatriciaTrie<>(
+            (l, h) -> {
+              final Optional<Bytes> node = worldStateStorage.getAccountStateTrieNode(l, h);
+              if (node.isPresent()) {
+                keysToDelete.add(l);
+              }
+              return node;
+            },
+            persistedState.worldStateRootHash,
+            Function.identity(),
+            Function.identity());
+    try {
+      accountTrie
+          .get(accountHash)
+          .map(RLP::input)
+          .map(StateTrieAccountValue::readFrom)
+          .ifPresent(
+              account -> {
+                final StoredMerklePatriciaTrie<Bytes, Bytes> storageTrie =
+                    new StoredMerklePatriciaTrie<>(
+                        (l, h) -> {
+                          Optional<Bytes> node =
+                              worldStateStorage.getAccountStorageTrieNode(accountHash, l, h);
+                          if (node.isPresent()) {
+                            keysToDelete.add(Bytes.concatenate(accountHash, l));
+                          }
+                          return node;
+                        },
+                        account.getStorageRoot(),
+                        Function.identity(),
+                        Function.identity());
+                try {
+                  storageTrie.getPath(location);
+                } catch (Exception eA) {
+                  LOG.warn("Invalid slot found for account {} at location {}", address, location);
+                  // ignore
+                }
+              });
+    } catch (Exception eA) {
+      LOG.warn("Invalid node for account {} at location {}", address, location);
+      // ignore
+    }
+    keysToDelete.forEach(bytes -> updater.removeAccountStateTrieNode(bytes, null));
+    updater.commit();
+
+    worldStateStorage.downgradeToPartialFlatDbMode();
+  }
+
+  public TrieLogManager getTrieLogManager() {
+    return trieLogManager;
+  }
+
+  @Override
+  public void resetArchiveStateTo(final BlockHeader blockHeader) {
+    persistedState.resetWorldStateTo(blockHeader);
+    this.trieLogManager.reset();
+    this.trieLogManager.addCachedLayer(
+        blockHeader, persistedState.worldStateRootHash, persistedState);
+  }
+
+  @Override
+  public Optional<Bytes> getNodeData(final Hash hash) {
+    return Optional.empty();
+  }
+
+  @Override
+  public Optional<WorldStateProof> getAccountProof(
+      final Hash worldStateRoot,
+      final Address accountAddress,
+      final List<UInt256> accountStorageKeys) {
+    // FIXME we can do proofs for layered tries and the persisted trie
+    return Optional.empty();
+  }
+
+  @Override
+  public void close() {
+    try {
+      worldStateStorage.close();
+    } catch (Exception e) {
+      // no op
+    }
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateUpdater.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateUpdater.java
deleted file mode 100644
index b417169a8c7..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateUpdater.java
+++ /dev/null
@@ -1,620 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-
-package org.hyperledger.besu.ethereum.bonsai;
-
-import org.hyperledger.besu.ethereum.core.AbstractWorldUpdater;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.EvmAccount;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.UpdateTrackingAccount;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WrappedEvmAccount;
-import org.hyperledger.besu.ethereum.rlp.RLP;
-import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
-
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.function.Function;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class BonsaiWorldStateUpdater
-    extends AbstractWorldUpdater<BonsaiPersistedWorldState, BonsaiAccount>
-    implements BonsaiWorldState {
-
-  private final Map<Address, BonsaiValue<BonsaiAccount>> accountsToUpdate = new HashMap<>();
-  private final Map<Address, BonsaiValue<Bytes>> codeToUpdate = new HashMap<>();
-  private final Set<Address> storageToClear = new HashSet<>();
-
-  // storage sub mapped by _hashed_ key.  This is because in self_destruct calls we need to
-  // enumerate the old storage and delete it.  Those are trie stored by hashed key by spec and the
-  // alternative was to keep a giant pre-image cache of the entire trie.
-  private final Map<Address, Map<Hash, BonsaiValue<UInt256>>> storageToUpdate = new HashMap<>();
-
-  BonsaiWorldStateUpdater(final BonsaiPersistedWorldState world) {
-    super(world);
-  }
-
-  @Override
-  public Account get(final Address address) {
-    return super.get(address);
-  }
-
-  @Override
-  protected UpdateTrackingAccount<BonsaiAccount> track(
-      final UpdateTrackingAccount<BonsaiAccount> account) {
-    return super.track(account);
-  }
-
-  @Override
-  public EvmAccount getAccount(final Address address) {
-    return super.getAccount(address);
-  }
-
-  @Override
-  public EvmAccount createAccount(final Address address, final long nonce, final Wei balance) {
-    BonsaiValue<BonsaiAccount> bonsaiValue = accountsToUpdate.get(address);
-    if (bonsaiValue == null) {
-      bonsaiValue = new BonsaiValue<>(null, null);
-      accountsToUpdate.put(address, bonsaiValue);
-    } else if (bonsaiValue.getUpdated() != null) {
-      throw new IllegalStateException("Cannot create an account when one already exists");
-    }
-    final BonsaiAccount newAccount =
-        new BonsaiAccount(
-            this,
-            address,
-            Hash.hash(address),
-            nonce,
-            balance,
-            Hash.EMPTY_TRIE_HASH,
-            Hash.EMPTY,
-            Account.DEFAULT_VERSION,
-            true);
-    bonsaiValue.setUpdated(newAccount);
-    return new WrappedEvmAccount(track(new UpdateTrackingAccount<>(newAccount)));
-  }
-
-  Map<Address, BonsaiValue<BonsaiAccount>> getAccountsToUpdate() {
-    return accountsToUpdate;
-  }
-
-  Map<Address, BonsaiValue<Bytes>> getCodeToUpdate() {
-    return codeToUpdate;
-  }
-
-  public Set<Address> getStorageToClear() {
-    return storageToClear;
-  }
-
-  Map<Address, Map<Hash, BonsaiValue<UInt256>>> getStorageToUpdate() {
-    return storageToUpdate;
-  }
-
-  @Override
-  protected BonsaiAccount getForMutation(final Address address) {
-    final BonsaiValue<BonsaiAccount> bonsaiValue = accountsToUpdate.get(address);
-    if (bonsaiValue == null) {
-      final Account account = wrappedWorldView().get(address);
-      if (account instanceof BonsaiAccount) {
-        final BonsaiAccount mutableAccount = new BonsaiAccount((BonsaiAccount) account, this, true);
-        accountsToUpdate.put(address, new BonsaiValue<>((BonsaiAccount) account, mutableAccount));
-        return mutableAccount;
-      } else {
-        return null;
-      }
-    } else {
-      return bonsaiValue.getUpdated();
-    }
-  }
-
-  @Override
-  public Collection<? extends Account> getTouchedAccounts() {
-    return getUpdatedAccounts();
-  }
-
-  @Override
-  public Collection<Address> getDeletedAccountAddresses() {
-    return getDeletedAccounts();
-  }
-
-  @Override
-  public void revert() {
-    super.reset();
-  }
-
-  @Override
-  public void commit() {
-    for (final Address deletedAddress : getDeletedAccounts()) {
-      storageToClear.add(deletedAddress);
-      final BonsaiValue<Bytes> codeValue = codeToUpdate.get(deletedAddress);
-      if (codeValue != null) {
-        codeValue.setUpdated(null);
-      } else {
-        final Bytes deletedCode = wrappedWorldView().getCode(deletedAddress);
-        if (deletedCode != null) {
-          codeToUpdate.put(deletedAddress, new BonsaiValue<>(deletedCode, null));
-        }
-      }
-      final BonsaiValue<BonsaiAccount> accountValue =
-          accountsToUpdate.computeIfAbsent(
-              deletedAddress,
-              __ -> loadAccountFromParent(deletedAddress, new BonsaiValue<>(null, null)));
-
-      // mark all updated storage as to be cleared
-      final Map<Hash, BonsaiValue<UInt256>> deletedStorageUpdates =
-          storageToUpdate.computeIfAbsent(deletedAddress, k -> new HashMap<>());
-      final Iterator<Map.Entry<Hash, BonsaiValue<UInt256>>> iter =
-          deletedStorageUpdates.entrySet().iterator();
-      while (iter.hasNext()) {
-        final Map.Entry<Hash, BonsaiValue<UInt256>> updateEntry = iter.next();
-        final BonsaiValue<UInt256> updatedSlot = updateEntry.getValue();
-        if (updatedSlot.getOriginal() == null || updatedSlot.getOriginal().isZero()) {
-          iter.remove();
-        } else {
-          updatedSlot.setUpdated(null);
-        }
-      }
-
-      final BonsaiAccount effective = accountValue.effective();
-      if (effective != null) {
-        // Enumerate and delete addresses not updated
-        wrappedWorldView()
-            .getAllAccountStorage(deletedAddress, effective.getStorageRoot())
-            .forEach(
-                (keyHash, entryValue) -> {
-                  final Hash slotHash = Hash.wrap(keyHash);
-                  if (!deletedStorageUpdates.containsKey(slotHash)) {
-                    final UInt256 value = UInt256.fromBytes(RLP.decodeOne(entryValue));
-                    deletedStorageUpdates.put(slotHash, new BonsaiValue<>(value, null));
-                  }
-                });
-      }
-      if (deletedStorageUpdates.isEmpty()) {
-        storageToUpdate.remove(deletedAddress);
-      }
-      accountValue.setUpdated(null);
-    }
-
-    for (final UpdateTrackingAccount<BonsaiAccount> tracked : getUpdatedAccounts()) {
-      final Address updatedAddress = tracked.getAddress();
-      BonsaiAccount updatedAccount = tracked.getWrappedAccount();
-      if (updatedAccount == null) {
-        final BonsaiValue<BonsaiAccount> updatedAccountValue = accountsToUpdate.get(updatedAddress);
-        updatedAccount = new BonsaiAccount(this, tracked);
-        tracked.setWrappedAccount(updatedAccount);
-        if (updatedAccountValue == null) {
-          accountsToUpdate.put(updatedAddress, new BonsaiValue<>(null, updatedAccount));
-          codeToUpdate.put(updatedAddress, new BonsaiValue<>(null, updatedAccount.getCode()));
-        } else {
-          updatedAccountValue.setUpdated(updatedAccount);
-        }
-      } else {
-        updatedAccount.setBalance(tracked.getBalance());
-        updatedAccount.setNonce(tracked.getNonce());
-        updatedAccount.setCode(tracked.getCode());
-        if (tracked.getStorageWasCleared()) {
-          updatedAccount.clearStorage();
-        }
-        tracked.getUpdatedStorage().forEach(updatedAccount::setStorageValue);
-      }
-
-      if (tracked.codeWasUpdated()) {
-        final BonsaiValue<Bytes> pendingCode =
-            codeToUpdate.computeIfAbsent(
-                updatedAddress, addr -> new BonsaiValue<>(wrappedWorldView().getCode(addr), null));
-        pendingCode.setUpdated(updatedAccount.getCode());
-      }
-
-      final Map<Hash, BonsaiValue<UInt256>> pendingStorageUpdates =
-          storageToUpdate.computeIfAbsent(updatedAddress, __ -> new HashMap<>());
-      if (tracked.getStorageWasCleared()) {
-        storageToClear.add(updatedAddress);
-        pendingStorageUpdates.clear();
-      }
-
-      final TreeSet<Map.Entry<UInt256, UInt256>> entries =
-          new TreeSet<>(
-              Comparator.comparing(
-                  (Function<Map.Entry<UInt256, UInt256>, UInt256>) Map.Entry::getKey));
-      entries.addAll(updatedAccount.getUpdatedStorage().entrySet());
-
-      for (final Map.Entry<UInt256, UInt256> storageUpdate : entries) {
-        final UInt256 keyUInt = storageUpdate.getKey();
-        final Hash slotHash = Hash.hash(keyUInt.toBytes());
-        final UInt256 value = storageUpdate.getValue();
-        final BonsaiValue<UInt256> pendingValue = pendingStorageUpdates.get(slotHash);
-        if (pendingValue == null) {
-          pendingStorageUpdates.put(
-              slotHash, new BonsaiValue<>(updatedAccount.getOriginalStorageValue(keyUInt), value));
-        } else {
-          pendingValue.setUpdated(value);
-        }
-      }
-      updatedAccount.getUpdatedStorage().clear();
-
-      // TODO maybe add address preimage?
-    }
-  }
-
-  @Override
-  public Bytes getCode(final Address address) {
-    final BonsaiValue<Bytes> localCode = codeToUpdate.get(address);
-    if (localCode == null) {
-      return wrappedWorldView().getCode(address);
-    } else {
-      return localCode.getUpdated();
-    }
-  }
-
-  @Override
-  public UInt256 getStorageValue(final Address address, final UInt256 storageKey) {
-    // TODO maybe log the read into the trie layer?
-    final Hash slotHashBytes = Hash.hash(storageKey.toBytes());
-    return getStorageValueBySlotHash(address, slotHashBytes).orElse(UInt256.ZERO);
-  }
-
-  @Override
-  public Optional<UInt256> getStorageValueBySlotHash(final Address address, final Hash slotHash) {
-    final Map<Hash, BonsaiValue<UInt256>> localAccountStorage =
-        storageToUpdate.computeIfAbsent(address, key -> new HashMap<>());
-    final BonsaiValue<UInt256> value = localAccountStorage.get(slotHash);
-    if (value != null) {
-      return Optional.of(value.getUpdated());
-    } else {
-      final Optional<UInt256> valueUInt =
-          wrappedWorldView().getStorageValueBySlotHash(address, slotHash);
-      valueUInt.ifPresent(v -> localAccountStorage.put(slotHash, new BonsaiValue<>(v, v)));
-      return valueUInt;
-    }
-  }
-
-  @Override
-  public UInt256 getOriginalStorageValue(final Address address, final UInt256 storageKey) {
-    // TODO maybe log the read into the trie layer?
-    final Map<Hash, BonsaiValue<UInt256>> localAccountStorage =
-        storageToUpdate.computeIfAbsent(address, key -> new HashMap<>());
-    final Hash slotHashBytes = Hash.hash(storageKey.toBytes());
-    final BonsaiValue<UInt256> value = localAccountStorage.get(slotHashBytes);
-    if (value != null) {
-      final UInt256 updated = value.getUpdated();
-      if (updated != null) {
-        return updated;
-      }
-      final UInt256 original = value.getOriginal();
-      if (original != null) {
-        return original;
-      }
-    }
-    return getStorageValue(address, storageKey);
-  }
-
-  @Override
-  public Map<Bytes32, Bytes> getAllAccountStorage(final Address address, final Hash rootHash) {
-    final Map<Bytes32, Bytes> results = wrappedWorldView().getAllAccountStorage(address, rootHash);
-    storageToUpdate
-        .get(address)
-        .forEach((key, value) -> results.put(key, value.getUpdated().toBytes()));
-    return results;
-  }
-
-  public TrieLogLayer generateTrieLog(final Hash blockHash) {
-    final TrieLogLayer layer = new TrieLogLayer();
-    layer.setBlockHash(blockHash);
-    for (final Map.Entry<Address, BonsaiValue<BonsaiAccount>> updatedAccount :
-        accountsToUpdate.entrySet()) {
-      final BonsaiValue<BonsaiAccount> bonsaiValue = updatedAccount.getValue();
-      final BonsaiAccount oldValue = bonsaiValue.getOriginal();
-      final StateTrieAccountValue oldAccount =
-          oldValue == null
-              ? null
-              : new StateTrieAccountValue(
-                  oldValue.getNonce(),
-                  oldValue.getBalance(),
-                  oldValue.getStorageRoot(),
-                  oldValue.getCodeHash(),
-                  oldValue.getVersion());
-      final BonsaiAccount newValue = bonsaiValue.getUpdated();
-      final StateTrieAccountValue newAccount =
-          newValue == null
-              ? null
-              : new StateTrieAccountValue(
-                  newValue.getNonce(),
-                  newValue.getBalance(),
-                  newValue.getStorageRoot(),
-                  newValue.getCodeHash(),
-                  newValue.getVersion());
-      layer.addAccountChange(updatedAccount.getKey(), oldAccount, newAccount);
-    }
-
-    for (final Map.Entry<Address, BonsaiValue<Bytes>> updatedCode : codeToUpdate.entrySet()) {
-      layer.addCodeChange(
-          updatedCode.getKey(),
-          updatedCode.getValue().getOriginal(),
-          updatedCode.getValue().getUpdated());
-    }
-
-    for (final Map.Entry<Address, Map<Hash, BonsaiValue<UInt256>>> updatesStorage :
-        storageToUpdate.entrySet()) {
-      final Address address = updatesStorage.getKey();
-      for (final Map.Entry<Hash, BonsaiValue<UInt256>> slotUpdate :
-          updatesStorage.getValue().entrySet()) {
-        layer.addStorageChange(
-            address,
-            slotUpdate.getKey(),
-            slotUpdate.getValue().getOriginal(),
-            slotUpdate.getValue().getUpdated());
-      }
-    }
-
-    return layer;
-  }
-
-  public void rollForward(final TrieLogLayer layer) {
-    layer
-        .streamAccountChanges()
-        .forEach(
-            entry ->
-                rollAccountChange(
-                    entry.getKey(), entry.getValue().getOriginal(), entry.getValue().getUpdated()));
-    layer
-        .streamCodeChanges()
-        .forEach(
-            entry ->
-                rollCodeChange(
-                    entry.getKey(), entry.getValue().getOriginal(), entry.getValue().getUpdated()));
-    layer
-        .streamStorageChanges()
-        .forEach(
-            entry ->
-                entry
-                    .getValue()
-                    .forEach(
-                        (key, value) ->
-                            rollStorageChange(
-                                entry.getKey(), key, value.getOriginal(), value.getUpdated())));
-  }
-
-  public void rollBack(final TrieLogLayer layer) {
-    layer
-        .streamAccountChanges()
-        .forEach(
-            entry ->
-                rollAccountChange(
-                    entry.getKey(), entry.getValue().getUpdated(), entry.getValue().getOriginal()));
-    layer
-        .streamCodeChanges()
-        .forEach(
-            entry ->
-                rollCodeChange(
-                    entry.getKey(), entry.getValue().getUpdated(), entry.getValue().getOriginal()));
-    layer
-        .streamStorageChanges()
-        .forEach(
-            entry ->
-                entry
-                    .getValue()
-                    .forEach(
-                        (slotHash, value) ->
-                            rollStorageChange(
-                                entry.getKey(),
-                                slotHash,
-                                value.getUpdated(),
-                                value.getOriginal())));
-  }
-
-  private void rollAccountChange(
-      final Address address,
-      final StateTrieAccountValue expectedValue,
-      final StateTrieAccountValue replacementValue) {
-    if (Objects.equals(expectedValue, replacementValue)) {
-      // non-change, a cached read.
-      return;
-    }
-    BonsaiValue<BonsaiAccount> accountValue = accountsToUpdate.get(address);
-    if (accountValue == null) {
-      accountValue = loadAccountFromParent(address, accountValue);
-    }
-    if (accountValue == null) {
-      if (expectedValue == null && replacementValue != null) {
-        accountsToUpdate.put(
-            address,
-            new BonsaiValue<>(null, new BonsaiAccount(this, address, replacementValue, true)));
-      } else {
-        throw new IllegalStateException(
-            String.format(
-                "Expected to update account, but the account does not exist. Address=%s", address));
-      }
-    } else {
-      if (expectedValue == null) {
-        throw new IllegalStateException(
-            String.format(
-                "Expected to create account, but the account exists.  Address=%s", address));
-      }
-      BonsaiAccount.assertCloseEnoughForDiffing(
-          accountValue.getUpdated(), expectedValue, "Prior Value in Rolling Change");
-      if (replacementValue == null) {
-        if (accountValue.getOriginal() == null) {
-          accountsToUpdate.remove(address);
-        } else {
-          accountValue.setUpdated(null);
-        }
-      } else {
-        final BonsaiAccount existingAccount = accountValue.getUpdated();
-        existingAccount.setNonce(replacementValue.getNonce());
-        existingAccount.setBalance(replacementValue.getBalance());
-        existingAccount.setStorageRoot(replacementValue.getStorageRoot());
-        // depend on correctly structured layers to set code hash
-        existingAccount.setVersion(replacementValue.getVersion());
-      }
-    }
-  }
-
-  private BonsaiValue<BonsaiAccount> loadAccountFromParent(
-      final Address address, final BonsaiValue<BonsaiAccount> defaultValue) {
-    final Account parentAccount = wrappedWorldView().get(address);
-    if (parentAccount instanceof BonsaiAccount) {
-      final BonsaiAccount account = (BonsaiAccount) parentAccount;
-      final BonsaiValue<BonsaiAccount> loadedAccountValue =
-          new BonsaiValue<>(new BonsaiAccount(account), account);
-      accountsToUpdate.put(address, loadedAccountValue);
-      return loadedAccountValue;
-    } else {
-      return defaultValue;
-    }
-  }
-
-  private void rollCodeChange(
-      final Address address, final Bytes expectedCode, final Bytes replacementCode) {
-    if (Objects.equals(expectedCode, replacementCode)) {
-      // non-change, a cached read.
-      return;
-    }
-    BonsaiValue<Bytes> codeValue = codeToUpdate.get(address);
-    if (codeValue == null) {
-      final Bytes storedCode = wrappedWorldView().getCode(address);
-      if (!storedCode.isEmpty()) {
-        codeValue = new BonsaiValue<>(storedCode, storedCode);
-        codeToUpdate.put(address, codeValue);
-      }
-    }
-
-    if (codeValue == null) {
-      if (expectedCode == null && replacementCode != null) {
-        codeToUpdate.put(address, new BonsaiValue<>(null, replacementCode));
-      } else {
-        throw new IllegalStateException(
-            String.format(
-                "Expected to update code, but the code does not exist.  Address=%s", address));
-      }
-    } else {
-      if (expectedCode == null) {
-        throw new IllegalStateException(
-            String.format("Expected to create code, but the code exists.  Address=%s", address));
-      }
-      if (!codeValue.getUpdated().equals(expectedCode)) {
-        throw new IllegalStateException(
-            String.format(
-                "Old value of code does not match expected value.  Address=%s ExpectedHash=%s ActualHash=%s",
-                address, Hash.hash(expectedCode), Hash.hash(codeValue.getUpdated())));
-      }
-      if (replacementCode == null) {
-        if (codeValue.getOriginal() == null) {
-          codeToUpdate.remove(address);
-        } else {
-          codeValue.setUpdated(null);
-        }
-      } else {
-        codeValue.setUpdated(replacementCode);
-      }
-    }
-  }
-
-  private Map<Hash, BonsaiValue<UInt256>> maybeCreateStorageMap(
-      final Map<Hash, BonsaiValue<UInt256>> storageMap, final Address address) {
-    if (storageMap == null) {
-      final Map<Hash, BonsaiValue<UInt256>> newMap = new HashMap<>();
-      storageToUpdate.put(address, newMap);
-      return newMap;
-    } else {
-      return storageMap;
-    }
-  }
-
-  private void rollStorageChange(
-      final Address address,
-      final Hash slotHash,
-      final UInt256 expectedValue,
-      final UInt256 replacementValue) {
-    if (Objects.equals(expectedValue, replacementValue)) {
-      // non-change, a cached read.
-      return;
-    }
-    final Map<Hash, BonsaiValue<UInt256>> storageMap = storageToUpdate.get(address);
-    BonsaiValue<UInt256> slotValue = storageMap == null ? null : storageMap.get(slotHash);
-    if (slotValue == null) {
-      final Optional<UInt256> storageValue =
-          wrappedWorldView().getStorageValueBySlotHash(address, slotHash);
-      if (storageValue.isPresent()) {
-        slotValue = new BonsaiValue<>(storageValue.get(), storageValue.get());
-        storageToUpdate.computeIfAbsent(address, k -> new HashMap<>()).put(slotHash, slotValue);
-      }
-    }
-    if (slotValue == null) {
-      if (expectedValue == null && replacementValue != null) {
-        maybeCreateStorageMap(storageMap, address)
-            .put(slotHash, new BonsaiValue<>(null, replacementValue));
-      } else {
-        throw new IllegalStateException(
-            String.format(
-                "Expected to update storage value, but the slot does not exist. Account=%s SlotHash=%s",
-                address, slotHash));
-      }
-    } else {
-      if (expectedValue == null) {
-        throw new IllegalStateException(
-            String.format(
-                "Expected to create slot, but the slot exists. Account=%s SlotHash=%s",
-                address, slotHash));
-      }
-      final UInt256 existingSlotValue = slotValue.getUpdated();
-      if (!existingSlotValue.equals(expectedValue)) {
-        throw new IllegalStateException(
-            String.format(
-                "Old value of slot does not match expected value. Account=%s SlotHash=%s Expected=%s Actual=%s",
-                address,
-                slotHash,
-                expectedValue.toShortHexString(),
-                existingSlotValue.toShortHexString()));
-      }
-      if (replacementValue == null) {
-        if (slotValue.getOriginal() == null) {
-          final Map<Hash, BonsaiValue<UInt256>> thisStorageUpdate =
-              maybeCreateStorageMap(storageMap, address);
-          thisStorageUpdate.remove(slotHash);
-          if (thisStorageUpdate.isEmpty()) {
-            storageToUpdate.remove(address);
-          }
-        } else {
-          slotValue.setUpdated(null);
-        }
-      } else {
-        slotValue.setUpdated(replacementValue);
-      }
-    }
-  }
-
-  @Override
-  public void reset() {
-    storageToClear.clear();
-    storageToUpdate.clear();
-    codeToUpdate.clear();
-    accountsToUpdate.clear();
-    super.reset();
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/TrieLogLayer.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/TrieLogLayer.java
deleted file mode 100644
index 410c46905b8..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/TrieLogLayer.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-
-package org.hyperledger.besu.ethereum.bonsai;
-
-import static com.google.common.base.Preconditions.checkState;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.rlp.RLPInput;
-import org.hyperledger.besu.ethereum.rlp.RLPOutput;
-import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
-
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.function.Function;
-import java.util.stream.Stream;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt256;
-
-/**
- * This class encapsulates the changes that are done to transition one block to the next. This
- * includes serialization and deserialization tasks for storing this log to off-memory storage.
- *
- * <p>In this particular formulation only the "Leaves" are tracked" Future layers may track patrica
- * trie changes as well.
- */
-public class TrieLogLayer {
-
-  private Hash blockHash;
-  private final Map<Address, BonsaiValue<StateTrieAccountValue>> accounts = new TreeMap<>();
-  private final Map<Address, BonsaiValue<Bytes>> code = new TreeMap<>();
-  private final Map<Address, Map<Hash, BonsaiValue<UInt256>>> storage = new TreeMap<>();
-  private boolean frozen = false;
-
-  /** Locks the layer so no new changes can be added; */
-  void freeze() {
-    frozen = true; // The code never bothered me anyway
-  }
-
-  public Hash getBlockHash() {
-    return blockHash;
-  }
-
-  public void setBlockHash(final Hash blockHash) {
-    checkState(!frozen, "Layer is Frozen");
-    this.blockHash = blockHash;
-  }
-
-  public void addAccountChange(
-      final Address address,
-      final StateTrieAccountValue oldValue,
-      final StateTrieAccountValue newValue) {
-    checkState(!frozen, "Layer is Frozen");
-    accounts.put(address, new BonsaiValue<>(oldValue, newValue));
-  }
-
-  void addCodeChange(final Address address, final Bytes oldValue, final Bytes newValue) {
-    checkState(!frozen, "Layer is Frozen");
-    code.put(
-        address,
-        new BonsaiValue<>(
-            oldValue == null ? Bytes.EMPTY : oldValue, newValue == null ? Bytes.EMPTY : newValue));
-  }
-
-  void addStorageChange(
-      final Address address, final Hash slotHash, final UInt256 oldValue, final UInt256 newValue) {
-    checkState(!frozen, "Layer is Frozen");
-    storage
-        .computeIfAbsent(address, a -> new TreeMap<>())
-        .put(slotHash, new BonsaiValue<>(oldValue, newValue));
-  }
-
-  static TrieLogLayer readFrom(final RLPInput input) {
-    final TrieLogLayer newLayer = new TrieLogLayer();
-
-    input.enterList();
-    newLayer.blockHash = Hash.wrap(input.readBytes32());
-
-    while (!input.isEndOfCurrentList()) {
-      input.enterList();
-      final Address address = Address.readFrom(input);
-
-      if (input.nextIsNull()) {
-        input.skipNext();
-      } else {
-        input.enterList();
-        final StateTrieAccountValue oldValue = nullOrValue(input, StateTrieAccountValue::readFrom);
-        final StateTrieAccountValue newValue = nullOrValue(input, StateTrieAccountValue::readFrom);
-        input.leaveList();
-        newLayer.accounts.put(address, new BonsaiValue<>(oldValue, newValue));
-      }
-
-      if (input.nextIsNull()) {
-        input.skipNext();
-      } else {
-        input.enterList();
-        final Bytes oldCode = nullOrValue(input, RLPInput::readBytes);
-        final Bytes newCode = nullOrValue(input, RLPInput::readBytes);
-        input.leaveList();
-        newLayer.code.put(address, new BonsaiValue<>(oldCode, newCode));
-      }
-
-      if (input.nextIsNull()) {
-        input.skipNext();
-      } else {
-        final Map<Hash, BonsaiValue<UInt256>> storageChanges = new TreeMap<>();
-        input.enterList();
-        while (!input.isEndOfCurrentList()) {
-          input.enterList();
-          final Hash slotHash = Hash.wrap(input.readBytes32());
-          final UInt256 oldValue = nullOrValue(input, RLPInput::readUInt256Scalar);
-          final UInt256 newValue = nullOrValue(input, RLPInput::readUInt256Scalar);
-          storageChanges.put(slotHash, new BonsaiValue<>(oldValue, newValue));
-          input.leaveList();
-        }
-        input.leaveList();
-        newLayer.storage.put(address, storageChanges);
-      }
-      // lenient leave list for forward compatible additions.
-      input.leaveListLenient();
-    }
-    input.leaveListLenient();
-    newLayer.freeze();
-
-    return newLayer;
-  }
-
-  void writeTo(final RLPOutput output) {
-    freeze();
-
-    final Set<Address> addresses = new TreeSet<>();
-    addresses.addAll(accounts.keySet());
-    addresses.addAll(code.keySet());
-    addresses.addAll(storage.keySet());
-
-    output.startList(); // container
-    output.writeBytes(blockHash);
-
-    for (final Address address : addresses) {
-      output.startList(); // this change
-      output.writeBytes(address);
-
-      final BonsaiValue<StateTrieAccountValue> accountChange = accounts.get(address);
-      if (accountChange == null || accountChange.isUnchanged()) {
-        output.writeNull();
-      } else {
-        accountChange.writeRlp(output, (o, sta) -> sta.writeTo(o));
-      }
-
-      final BonsaiValue<Bytes> codeChange = code.get(address);
-      if (codeChange == null || codeChange.isUnchanged()) {
-        output.writeNull();
-      } else {
-        codeChange.writeRlp(output, RLPOutput::writeBytes);
-      }
-
-      final Map<Hash, BonsaiValue<UInt256>> storageChanges = storage.get(address);
-      if (storageChanges == null) {
-        output.writeNull();
-      } else {
-        output.startList();
-        for (final Map.Entry<Hash, BonsaiValue<UInt256>> storageChangeEntry :
-            storageChanges.entrySet()) {
-          output.startList();
-          output.writeBytes(storageChangeEntry.getKey());
-          storageChangeEntry.getValue().writeInnerRlp(output, RLPOutput::writeUInt256Scalar);
-          output.endList();
-        }
-        output.endList();
-      }
-      output.endList(); // this change
-    }
-    output.endList(); // container
-  }
-
-  Stream<Map.Entry<Address, BonsaiValue<StateTrieAccountValue>>> streamAccountChanges() {
-    return accounts.entrySet().stream();
-  }
-
-  Stream<Map.Entry<Address, BonsaiValue<Bytes>>> streamCodeChanges() {
-    return code.entrySet().stream();
-  }
-
-  Stream<Map.Entry<Address, Map<Hash, BonsaiValue<UInt256>>>> streamStorageChanges() {
-    return storage.entrySet().stream();
-  }
-
-  Stream<Map.Entry<Hash, BonsaiValue<UInt256>>> streamStorageChanges(final Address address) {
-    return storage.getOrDefault(address, Map.of()).entrySet().stream();
-  }
-
-  private static <T> T nullOrValue(final RLPInput input, final Function<RLPInput, T> reader) {
-    if (input.nextIsNull()) {
-      input.skipNext();
-      return null;
-    } else {
-      return reader.apply(input);
-    }
-  }
-
-  boolean isFrozen() {
-    return frozen;
-  }
-
-  public Optional<Bytes> getCode(final Address address) {
-    return Optional.ofNullable(code.get(address)).map(BonsaiValue::getUpdated);
-  }
-
-  Optional<UInt256> getStorageBySlotHash(final Address address, final Hash slotHash) {
-    return Optional.ofNullable(storage.get(address))
-        .map(i -> i.get(slotHash))
-        .map(BonsaiValue::getUpdated);
-  }
-
-  public Optional<StateTrieAccountValue> getAccount(final Address address) {
-    return Optional.ofNullable(accounts.get(address)).map(BonsaiValue::getUpdated);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/cache/CachedBonsaiWorldView.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/cache/CachedBonsaiWorldView.java
new file mode 100644
index 00000000000..473933b3959
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/cache/CachedBonsaiWorldView.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright Hyperledger Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.bonsai.cache;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage.BonsaiStorageSubscriber;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CachedBonsaiWorldView implements BonsaiStorageSubscriber {
+  private BonsaiWorldStateKeyValueStorage worldStateStorage;
+  private final BlockHeader blockHeader;
+  private long worldViewSubscriberId;
+  private static final Logger LOG = LoggerFactory.getLogger(CachedBonsaiWorldView.class);
+
+  public CachedBonsaiWorldView(
+      final BlockHeader blockHeader, final BonsaiWorldStateKeyValueStorage worldView) {
+    this.blockHeader = blockHeader;
+    this.worldStateStorage = worldView;
+    this.worldViewSubscriberId = worldStateStorage.subscribe(this);
+  }
+
+  public BonsaiWorldStateKeyValueStorage getWorldStateStorage() {
+    return worldStateStorage;
+  }
+
+  public long getBlockNumber() {
+    return blockHeader.getNumber();
+  }
+
+  public Hash getBlockHash() {
+    return blockHeader.getHash();
+  }
+
+  public synchronized void close() {
+    worldStateStorage.unSubscribe(this.worldViewSubscriberId);
+    try {
+      worldStateStorage.close();
+    } catch (final Exception e) {
+      LOG.warn("Failed to close worldstate storage for block " + blockHeader.toLogString(), e);
+    }
+  }
+
+  public synchronized void updateWorldStateStorage(
+      final BonsaiWorldStateKeyValueStorage newWorldStateStorage) {
+    long newSubscriberId = newWorldStateStorage.subscribe(this);
+    this.worldStateStorage.unSubscribe(this.worldViewSubscriberId);
+    BonsaiWorldStateKeyValueStorage oldWorldStateStorage = this.worldStateStorage;
+    this.worldStateStorage = newWorldStateStorage;
+    this.worldViewSubscriberId = newSubscriberId;
+    try {
+      oldWorldStateStorage.close();
+    } catch (final Exception e) {
+      LOG.warn(
+          "During update, failed to close prior worldstate storage for block "
+              + blockHeader.toLogString(),
+          e);
+    }
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/cache/CachedMerkleTrieLoader.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/cache/CachedMerkleTrieLoader.java
new file mode 100644
index 00000000000..9dd4955989a
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/cache/CachedMerkleTrieLoader.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.bonsai.cache;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.StorageSlotKey;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage.BonsaiStorageSubscriber;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.MerkleTrieException;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.metrics.ObservableMetricsSystem;
+import org.hyperledger.besu.metrics.prometheus.PrometheusMetricsSystem;
+
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import io.prometheus.client.guava.cache.CacheMetricsCollector;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+public class CachedMerkleTrieLoader implements BonsaiStorageSubscriber {
+
+  private static final int ACCOUNT_CACHE_SIZE = 100_000;
+  private static final int STORAGE_CACHE_SIZE = 200_000;
+  private final Cache<Bytes, Bytes> accountNodes =
+      CacheBuilder.newBuilder().recordStats().maximumSize(ACCOUNT_CACHE_SIZE).build();
+  private final Cache<Bytes, Bytes> storageNodes =
+      CacheBuilder.newBuilder().recordStats().maximumSize(STORAGE_CACHE_SIZE).build();
+
+  public CachedMerkleTrieLoader(final ObservableMetricsSystem metricsSystem) {
+
+    CacheMetricsCollector cacheMetrics = new CacheMetricsCollector();
+    cacheMetrics.addCache("accountsNodes", accountNodes);
+    cacheMetrics.addCache("storageNodes", storageNodes);
+    if (metricsSystem instanceof PrometheusMetricsSystem)
+      ((PrometheusMetricsSystem) metricsSystem)
+          .addCollector(BesuMetricCategory.BLOCKCHAIN, () -> cacheMetrics);
+  }
+
+  public void preLoadAccount(
+      final BonsaiWorldStateKeyValueStorage worldStateStorage,
+      final Hash worldStateRootHash,
+      final Address account) {
+    CompletableFuture.runAsync(
+        () -> cacheAccountNodes(worldStateStorage, worldStateRootHash, account));
+  }
+
+  @VisibleForTesting
+  public void cacheAccountNodes(
+      final BonsaiWorldStateKeyValueStorage worldStateStorage,
+      final Hash worldStateRootHash,
+      final Address account) {
+    final long storageSubscriberId = worldStateStorage.subscribe(this);
+    try {
+      final StoredMerklePatriciaTrie<Bytes, Bytes> accountTrie =
+          new StoredMerklePatriciaTrie<>(
+              (location, hash) -> {
+                Optional<Bytes> node = getAccountStateTrieNode(worldStateStorage, location, hash);
+                node.ifPresent(bytes -> accountNodes.put(Hash.hash(bytes), bytes));
+                return node;
+              },
+              worldStateRootHash,
+              Function.identity(),
+              Function.identity());
+      accountTrie.get(Hash.hash(account));
+    } catch (MerkleTrieException e) {
+      // ignore exception for the cache
+    } finally {
+      worldStateStorage.unSubscribe(storageSubscriberId);
+    }
+  }
+
+  public void preLoadStorageSlot(
+      final BonsaiWorldStateKeyValueStorage worldStateStorage,
+      final Address account,
+      final StorageSlotKey slotKey) {
+    CompletableFuture.runAsync(() -> cacheStorageNodes(worldStateStorage, account, slotKey));
+  }
+
+  @VisibleForTesting
+  public void cacheStorageNodes(
+      final BonsaiWorldStateKeyValueStorage worldStateStorage,
+      final Address account,
+      final StorageSlotKey slotKey) {
+    final Hash accountHash = Hash.hash(account);
+    final long storageSubscriberId = worldStateStorage.subscribe(this);
+    try {
+      worldStateStorage
+          .getStateTrieNode(Bytes.concatenate(accountHash, Bytes.EMPTY))
+          .ifPresent(
+              storageRoot -> {
+                try {
+                  final StoredMerklePatriciaTrie<Bytes, Bytes> storageTrie =
+                      new StoredMerklePatriciaTrie<>(
+                          (location, hash) -> {
+                            Optional<Bytes> node =
+                                getAccountStorageTrieNode(
+                                    worldStateStorage, accountHash, location, hash);
+                            node.ifPresent(bytes -> storageNodes.put(Hash.hash(bytes), bytes));
+                            return node;
+                          },
+                          Hash.hash(storageRoot),
+                          Function.identity(),
+                          Function.identity());
+                  storageTrie.get(slotKey.getSlotHash());
+                } catch (MerkleTrieException e) {
+                  // ignore exception for the cache
+                }
+              });
+    } finally {
+      worldStateStorage.unSubscribe(storageSubscriberId);
+    }
+  }
+
+  public Optional<Bytes> getAccountStateTrieNode(
+      final BonsaiWorldStateKeyValueStorage worldStateKeyValueStorage,
+      final Bytes location,
+      final Bytes32 nodeHash) {
+    if (nodeHash.equals(MerkleTrie.EMPTY_TRIE_NODE_HASH)) {
+      return Optional.of(MerkleTrie.EMPTY_TRIE_NODE);
+    } else {
+      return Optional.ofNullable(accountNodes.getIfPresent(nodeHash))
+          .or(() -> worldStateKeyValueStorage.getAccountStateTrieNode(location, nodeHash));
+    }
+  }
+
+  public Optional<Bytes> getAccountStorageTrieNode(
+      final BonsaiWorldStateKeyValueStorage worldStateKeyValueStorage,
+      final Hash accountHash,
+      final Bytes location,
+      final Bytes32 nodeHash) {
+    if (nodeHash.equals(MerkleTrie.EMPTY_TRIE_NODE_HASH)) {
+      return Optional.of(MerkleTrie.EMPTY_TRIE_NODE);
+    } else {
+      return Optional.ofNullable(storageNodes.getIfPresent(nodeHash))
+          .or(
+              () ->
+                  worldStateKeyValueStorage.getAccountStorageTrieNode(
+                      accountHash, location, nodeHash));
+    }
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/cache/CachedMerkleTrieLoaderModule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/cache/CachedMerkleTrieLoaderModule.java
new file mode 100644
index 00000000000..51cfdd8707e
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/cache/CachedMerkleTrieLoaderModule.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.bonsai.cache;
+
+import org.hyperledger.besu.metrics.ObservableMetricsSystem;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module
+public class CachedMerkleTrieLoaderModule {
+
+  @Provides
+  CachedMerkleTrieLoader provideCachedMerkleTrieLoaderModule(
+      final ObservableMetricsSystem metricsSystem) {
+    return new CachedMerkleTrieLoader(metricsSystem);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/cache/CachedWorldStorageManager.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/cache/CachedWorldStorageManager.java
new file mode 100644
index 00000000000..5ade72748d6
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/cache/CachedWorldStorageManager.java
@@ -0,0 +1,305 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.bonsai.cache;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.bonsai.BonsaiWorldStateProvider;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiSnapshotWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage.BonsaiStorageSubscriber;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateLayerStorage;
+import org.hyperledger.besu.ethereum.bonsai.trielog.AbstractTrieLogManager;
+import org.hyperledger.besu.ethereum.bonsai.trielog.TrieLogFactoryImpl;
+import org.hyperledger.besu.ethereum.bonsai.worldview.BonsaiWorldState;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.metrics.ObservableMetricsSystem;
+import org.hyperledger.besu.plugin.BesuContext;
+import org.hyperledger.besu.plugin.services.TrieLogService;
+import org.hyperledger.besu.plugin.services.trielogs.TrieLog;
+import org.hyperledger.besu.plugin.services.trielogs.TrieLogFactory;
+import org.hyperledger.besu.plugin.services.trielogs.TrieLogProvider;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.LongStream;
+import java.util.stream.Stream;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CachedWorldStorageManager extends AbstractTrieLogManager
+    implements BonsaiStorageSubscriber {
+  private static final Logger LOG = LoggerFactory.getLogger(CachedWorldStorageManager.class);
+  private final BonsaiWorldStateProvider archive;
+  private final ObservableMetricsSystem metricsSystem;
+
+  CachedWorldStorageManager(
+      final BonsaiWorldStateProvider archive,
+      final Blockchain blockchain,
+      final BonsaiWorldStateKeyValueStorage worldStateStorage,
+      final long maxLayersToLoad,
+      final Map<Bytes32, CachedBonsaiWorldView> cachedWorldStatesByHash,
+      final BesuContext pluginContext,
+      final ObservableMetricsSystem metricsSystem) {
+    super(blockchain, worldStateStorage, maxLayersToLoad, cachedWorldStatesByHash, pluginContext);
+    worldStateStorage.subscribe(this);
+    this.archive = archive;
+    this.metricsSystem = metricsSystem;
+  }
+
+  public CachedWorldStorageManager(
+      final BonsaiWorldStateProvider archive,
+      final Blockchain blockchain,
+      final BonsaiWorldStateKeyValueStorage worldStateStorage,
+      final ObservableMetricsSystem metricsSystem,
+      final long maxLayersToLoad,
+      final BesuContext pluginContext) {
+    this(
+        archive,
+        blockchain,
+        worldStateStorage,
+        maxLayersToLoad,
+        new ConcurrentHashMap<>(),
+        pluginContext,
+        metricsSystem);
+  }
+
+  @Override
+  public synchronized void addCachedLayer(
+      final BlockHeader blockHeader,
+      final Hash worldStateRootHash,
+      final BonsaiWorldState forWorldState) {
+    final Optional<CachedBonsaiWorldView> cachedBonsaiWorldView =
+        Optional.ofNullable(this.cachedWorldStatesByHash.get(blockHeader.getBlockHash()));
+    if (cachedBonsaiWorldView.isPresent()) {
+      // only replace if it is a layered storage
+      if (forWorldState.isPersisted()
+          && cachedBonsaiWorldView.get().getWorldStateStorage()
+              instanceof BonsaiWorldStateLayerStorage) {
+        LOG.atDebug()
+            .setMessage("updating layered world state for block {}, state root hash {}")
+            .addArgument(blockHeader::toLogString)
+            .addArgument(worldStateRootHash::toShortHexString)
+            .log();
+        cachedBonsaiWorldView
+            .get()
+            .updateWorldStateStorage(
+                new BonsaiSnapshotWorldStateKeyValueStorage(
+                    forWorldState.worldStateStorage, metricsSystem));
+      }
+    } else {
+      LOG.atDebug()
+          .setMessage("adding layered world state for block {}, state root hash {}")
+          .addArgument(blockHeader::toLogString)
+          .addArgument(worldStateRootHash::toShortHexString)
+          .log();
+      if (forWorldState.isPersisted()) {
+        cachedWorldStatesByHash.put(
+            blockHeader.getHash(),
+            new CachedBonsaiWorldView(
+                blockHeader,
+                new BonsaiSnapshotWorldStateKeyValueStorage(
+                    forWorldState.worldStateStorage, metricsSystem)));
+      } else {
+        // otherwise, add the layer to the cache
+        cachedWorldStatesByHash.put(
+            blockHeader.getHash(),
+            new CachedBonsaiWorldView(
+                blockHeader,
+                ((BonsaiWorldStateLayerStorage) forWorldState.getWorldStateStorage()).clone()));
+      }
+    }
+    scrubCachedLayers(blockHeader.getNumber());
+  }
+
+  @Override
+  public Optional<BonsaiWorldState> getWorldState(final Hash blockHash) {
+    if (cachedWorldStatesByHash.containsKey(blockHash)) {
+      // return a new worldstate using worldstate storage and an isolated copy of the updater
+      return Optional.ofNullable(cachedWorldStatesByHash.get(blockHash))
+          .map(
+              cached ->
+                  new BonsaiWorldState(
+                      archive, new BonsaiWorldStateLayerStorage(cached.getWorldStateStorage())));
+    }
+    LOG.atDebug()
+        .setMessage("did not find worldstate in cache for {}")
+        .addArgument(blockHash.toShortHexString())
+        .log();
+
+    return Optional.empty();
+  }
+
+  @Override
+  public Optional<BonsaiWorldState> getNearestWorldState(final BlockHeader blockHeader) {
+    LOG.atDebug()
+        .setMessage("getting nearest worldstate for {}")
+        .addArgument(blockHeader.toLogString())
+        .log();
+
+    return Optional.ofNullable(
+            cachedWorldStatesByHash.get(blockHeader.getParentHash())) // search parent block
+        .map(CachedBonsaiWorldView::getWorldStateStorage)
+        .or(
+            () -> {
+              // or else search the nearest state in the cache
+              LOG.atDebug()
+                  .setMessage("searching cache for nearest worldstate for {}")
+                  .addArgument(blockHeader.toLogString())
+                  .log();
+
+              final List<CachedBonsaiWorldView> cachedBonsaiWorldViews =
+                  new ArrayList<>(cachedWorldStatesByHash.values());
+              return cachedBonsaiWorldViews.stream()
+                  .sorted(
+                      Comparator.comparingLong(
+                          view -> Math.abs(blockHeader.getNumber() - view.getBlockNumber())))
+                  .map(CachedBonsaiWorldView::getWorldStateStorage)
+                  .findFirst();
+            })
+        .map(
+            storage ->
+                new BonsaiWorldState( // wrap the state in a layered worldstate
+                    archive, new BonsaiWorldStateLayerStorage(storage)));
+  }
+
+  @Override
+  public Optional<BonsaiWorldState> getHeadWorldState(
+      final Function<Hash, Optional<BlockHeader>> hashBlockHeaderFunction) {
+
+    LOG.atDebug().setMessage("getting head worldstate").log();
+
+    return rootWorldStateStorage
+        .getWorldStateBlockHash()
+        .flatMap(hashBlockHeaderFunction)
+        .flatMap(
+            blockHeader -> {
+              // add the head to the cache
+              addCachedLayer(
+                  blockHeader,
+                  blockHeader.getStateRoot(),
+                  new BonsaiWorldState(archive, rootWorldStateStorage));
+              return getWorldState(blockHeader.getHash());
+            });
+  }
+
+  @Override
+  public void reset() {
+    this.cachedWorldStatesByHash.clear();
+  }
+
+  @Override
+  public void onClearStorage() {
+    this.cachedWorldStatesByHash.clear();
+  }
+
+  @Override
+  public void onClearFlatDatabaseStorage() {
+    this.cachedWorldStatesByHash.clear();
+  }
+
+  @Override
+  public void onClearTrieLog() {
+    this.cachedWorldStatesByHash.clear();
+  }
+
+  @Override
+  public void onCloseStorage() {
+    this.cachedWorldStatesByHash.clear();
+  }
+
+  @VisibleForTesting
+  @Override
+  protected TrieLogFactory setupTrieLogFactory(final BesuContext pluginContext) {
+    // if we have a TrieLogService from pluginContext, use it.
+    var trieLogServicez =
+        Optional.ofNullable(pluginContext)
+            .flatMap(context -> context.getService(TrieLogService.class));
+
+    if (trieLogServicez.isPresent()) {
+      var trieLogService = trieLogServicez.get();
+      // push the TrieLogProvider into the TrieLogService
+      trieLogService.configureTrieLogProvider(getTrieLogProvider());
+
+      // configure plugin observers:
+      trieLogService.getObservers().forEach(trieLogObservers::subscribe);
+
+      // return the TrieLogFactory implementation from the TrieLogService
+      return trieLogService.getTrieLogFactory();
+    } else {
+      // Otherwise default to TrieLogFactoryImpl
+      return new TrieLogFactoryImpl();
+    }
+  }
+
+  @VisibleForTesting
+  TrieLogProvider getTrieLogProvider() {
+    return new TrieLogProvider() {
+      @Override
+      public <T extends TrieLog.LogTuple<?>> Optional<TrieLog> getTrieLogLayer(
+          final Hash blockHash) {
+        return CachedWorldStorageManager.this.getTrieLogLayer(blockHash);
+      }
+
+      @Override
+      public <T extends TrieLog.LogTuple<?>> Optional<TrieLog> getTrieLogLayer(
+          final long blockNumber) {
+        return CachedWorldStorageManager.this
+            .blockchain
+            .getBlockHeader(blockNumber)
+            .map(BlockHeader::getHash)
+            .flatMap(CachedWorldStorageManager.this::getTrieLogLayer);
+      }
+
+      @Override
+      public <T extends TrieLog.LogTuple<?>> List<TrieLogRangeTuple> getTrieLogsByRange(
+          final long fromBlockNumber, final long toBlockNumber) {
+        return rangeAsStream(fromBlockNumber, toBlockNumber)
+            .map(blockchain::getBlockHeader)
+            .map(
+                headerOpt ->
+                    headerOpt.flatMap(
+                        header ->
+                            CachedWorldStorageManager.this
+                                .getTrieLogLayer(header.getBlockHash())
+                                .map(
+                                    layer ->
+                                        new TrieLogRangeTuple(
+                                            header.getBlockHash(), header.getNumber(), layer))))
+            .filter(Optional::isPresent)
+            .map(Optional::get)
+            .collect(Collectors.toList());
+      }
+
+      Stream<Long> rangeAsStream(final long fromBlockNumber, final long toBlockNumber) {
+        if (Math.abs(toBlockNumber - fromBlockNumber) > LOG_RANGE_LIMIT) {
+          throw new IllegalArgumentException("Requested Range too large");
+        }
+        long left = Math.min(fromBlockNumber, toBlockNumber);
+        long right = Math.max(fromBlockNumber, toBlockNumber);
+        return LongStream.range(left, right).boxed();
+      }
+    };
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/BonsaiSnapshotWorldStateKeyValueStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/BonsaiSnapshotWorldStateKeyValueStorage.java
new file mode 100644
index 00000000000..82d68e0b766
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/BonsaiSnapshotWorldStateKeyValueStorage.java
@@ -0,0 +1,242 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.bonsai.storage;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.StorageSlotKey;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage.BonsaiStorageSubscriber;
+import org.hyperledger.besu.metrics.ObservableMetricsSystem;
+import org.hyperledger.besu.plugin.services.exception.StorageException;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
+import org.hyperledger.besu.plugin.services.storage.SnappableKeyValueStorage;
+import org.hyperledger.besu.plugin.services.storage.SnappedKeyValueStorage;
+
+import java.util.Optional;
+import java.util.function.Supplier;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class BonsaiSnapshotWorldStateKeyValueStorage extends BonsaiWorldStateKeyValueStorage
+    implements BonsaiStorageSubscriber {
+
+  protected final BonsaiWorldStateKeyValueStorage parentWorldStateStorage;
+  private static final Logger LOG =
+      LoggerFactory.getLogger(BonsaiSnapshotWorldStateKeyValueStorage.class);
+  private final long subscribeParentId;
+
+  public BonsaiSnapshotWorldStateKeyValueStorage(
+      final BonsaiWorldStateKeyValueStorage parentWorldStateStorage,
+      final SnappedKeyValueStorage accountStorage,
+      final SnappedKeyValueStorage codeStorage,
+      final SnappedKeyValueStorage storageStorage,
+      final SnappedKeyValueStorage trieBranchStorage,
+      final KeyValueStorage trieLogStorage,
+      final ObservableMetricsSystem metricsSystem) {
+    super(
+        parentWorldStateStorage.flatDbMode,
+        parentWorldStateStorage.flatDbReaderStrategy,
+        accountStorage,
+        codeStorage,
+        storageStorage,
+        trieBranchStorage,
+        trieLogStorage,
+        metricsSystem);
+    this.parentWorldStateStorage = parentWorldStateStorage;
+    this.subscribeParentId = parentWorldStateStorage.subscribe(this);
+  }
+
+  public BonsaiSnapshotWorldStateKeyValueStorage(
+      final BonsaiWorldStateKeyValueStorage worldStateStorage,
+      final ObservableMetricsSystem metricsSystem) {
+    this(
+        worldStateStorage,
+        ((SnappableKeyValueStorage) worldStateStorage.accountStorage).takeSnapshot(),
+        ((SnappableKeyValueStorage) worldStateStorage.codeStorage).takeSnapshot(),
+        ((SnappableKeyValueStorage) worldStateStorage.storageStorage).takeSnapshot(),
+        ((SnappableKeyValueStorage) worldStateStorage.trieBranchStorage).takeSnapshot(),
+        worldStateStorage.trieLogStorage,
+        metricsSystem);
+  }
+
+  private boolean isClosedGet() {
+    if (isClosed.get()) {
+      Throwable t = new Throwable("Attempting to access closed worldstate");
+      LOG.warn(t.getMessage(), t);
+    }
+    return isClosed.get();
+  }
+
+  @Override
+  public BonsaiUpdater updater() {
+    return new Updater(
+        ((SnappedKeyValueStorage) accountStorage).getSnapshotTransaction(),
+        ((SnappedKeyValueStorage) codeStorage).getSnapshotTransaction(),
+        ((SnappedKeyValueStorage) storageStorage).getSnapshotTransaction(),
+        ((SnappedKeyValueStorage) trieBranchStorage).getSnapshotTransaction(),
+        trieLogStorage.startTransaction());
+  }
+
+  @Override
+  public Optional<Bytes> getAccount(final Hash accountHash) {
+    return isClosedGet() ? Optional.empty() : super.getAccount(accountHash);
+  }
+
+  @Override
+  public Optional<Bytes> getCode(final Bytes32 codeHash, final Hash accountHash) {
+    return isClosedGet() ? Optional.empty() : super.getCode(codeHash, accountHash);
+  }
+
+  @Override
+  public Optional<Bytes> getAccountStateTrieNode(final Bytes location, final Bytes32 nodeHash) {
+    return isClosedGet() ? Optional.empty() : super.getAccountStateTrieNode(location, nodeHash);
+  }
+
+  @Override
+  public Optional<Bytes> getAccountStorageTrieNode(
+      final Hash accountHash, final Bytes location, final Bytes32 nodeHash) {
+    return isClosedGet()
+        ? Optional.empty()
+        : super.getAccountStorageTrieNode(accountHash, location, nodeHash);
+  }
+
+  @Override
+  public Optional<byte[]> getTrieLog(final Hash blockHash) {
+    return isClosedGet() ? Optional.empty() : super.getTrieLog(blockHash);
+  }
+
+  @Override
+  public Optional<Bytes> getStateTrieNode(final Bytes location) {
+    return isClosedGet() ? Optional.empty() : super.getStateTrieNode(location);
+  }
+
+  @Override
+  public Optional<Bytes> getWorldStateRootHash() {
+    return isClosedGet() ? Optional.empty() : super.getWorldStateRootHash();
+  }
+
+  @Override
+  public Optional<Hash> getWorldStateBlockHash() {
+    return isClosedGet() ? Optional.empty() : super.getWorldStateBlockHash();
+  }
+
+  @Override
+  public Optional<Bytes> getStorageValueByStorageSlotKey(
+      final Hash accountHash, final StorageSlotKey storageSlotKey) {
+    return isClosedGet()
+        ? Optional.empty()
+        : super.getStorageValueByStorageSlotKey(accountHash, storageSlotKey);
+  }
+
+  @Override
+  public Optional<Bytes> getStorageValueByStorageSlotKey(
+      final Supplier<Optional<Hash>> storageRootSupplier,
+      final Hash accountHash,
+      final StorageSlotKey storageSlotKey) {
+    return isClosedGet()
+        ? Optional.empty()
+        : super.getStorageValueByStorageSlotKey(storageRootSupplier, accountHash, storageSlotKey);
+  }
+
+  @Override
+  public boolean isWorldStateAvailable(final Bytes32 rootHash, final Hash blockHash) {
+    return !isClosedGet() && super.isWorldStateAvailable(rootHash, blockHash);
+  }
+
+  @Override
+  public void clear() {
+    // snapshot storage does not implement clear
+    throw new StorageException("Snapshot storage does not implement clear");
+  }
+
+  @Override
+  public void clearFlatDatabase() {
+    // snapshot storage does not implement clear
+    throw new StorageException("Snapshot storage does not implement clear");
+  }
+
+  @Override
+  public void clearTrieLog() {
+    // snapshot storage does not implement clear
+    throw new StorageException("Snapshot storage does not implement clear");
+  }
+
+  @Override
+  public void onCloseStorage() {
+    try {
+      // when the parent storage clears, close regardless of subscribers
+      doClose();
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @Override
+  public void onClearStorage() {
+    try {
+      // when the parent storage clears, close regardless of subscribers
+      doClose();
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @Override
+  public void onClearFlatDatabaseStorage() {
+    // when the parent storage clears, close regardless of subscribers
+    try {
+      doClose();
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @Override
+  public void onClearTrieLog() {
+    // when the parent storage clears, close regardless of subscribers
+    try {
+      doClose();
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @Override
+  protected synchronized void doClose() throws Exception {
+    if (!isClosedGet()) {
+      // alert any subscribers we are closing:
+      subscribers.forEach(BonsaiStorageSubscriber::onCloseStorage);
+
+      // close all of the SnappedKeyValueStorages:
+      accountStorage.close();
+      codeStorage.close();
+      storageStorage.close();
+      trieBranchStorage.close();
+
+      // unsubscribe the parent worldstate
+      parentWorldStateStorage.unSubscribe(subscribeParentId);
+
+      // set storage closed
+      isClosed.set(true);
+    }
+  }
+
+  public BonsaiWorldStateKeyValueStorage getParentWorldStateStorage() {
+    return parentWorldStateStorage;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/BonsaiWorldStateKeyValueStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/BonsaiWorldStateKeyValueStorage.java
new file mode 100644
index 00000000000..1b8def7fc3d
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/BonsaiWorldStateKeyValueStorage.java
@@ -0,0 +1,544 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.bonsai.storage;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.StorageSlotKey;
+import org.hyperledger.besu.ethereum.bonsai.storage.flat.FlatDbReaderStrategy;
+import org.hyperledger.besu.ethereum.bonsai.storage.flat.FullFlatDbReaderStrategy;
+import org.hyperledger.besu.ethereum.bonsai.storage.flat.PartialFlatDbReaderStrategy;
+import org.hyperledger.besu.ethereum.storage.StorageProvider;
+import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.ethereum.worldstate.FlatDbMode;
+import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.metrics.ObservableMetricsSystem;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
+import org.hyperledger.besu.util.Subscribers;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@SuppressWarnings("unused")
+public class BonsaiWorldStateKeyValueStorage implements WorldStateStorage, AutoCloseable {
+
+  private static final Logger LOG = LoggerFactory.getLogger(BonsaiWorldStateKeyValueStorage.class);
+
+  // 0x776f726c64526f6f74
+  public static final byte[] WORLD_ROOT_HASH_KEY = "worldRoot".getBytes(StandardCharsets.UTF_8);
+  // 0x776f726c64426c6f636b48617368
+  public static final byte[] WORLD_BLOCK_HASH_KEY =
+      "worldBlockHash".getBytes(StandardCharsets.UTF_8);
+
+  // 0x666C61744462537461747573
+  public static final byte[] FLAT_DB_MODE = "flatDbStatus".getBytes(StandardCharsets.UTF_8);
+
+  protected FlatDbMode flatDbMode;
+  protected FlatDbReaderStrategy flatDbReaderStrategy;
+
+  protected final KeyValueStorage accountStorage;
+  protected final KeyValueStorage codeStorage;
+  protected final KeyValueStorage storageStorage;
+  protected final KeyValueStorage trieBranchStorage;
+  protected final KeyValueStorage trieLogStorage;
+
+  protected final ObservableMetricsSystem metricsSystem;
+
+  private final AtomicBoolean shouldClose = new AtomicBoolean(false);
+
+  protected final AtomicBoolean isClosed = new AtomicBoolean(false);
+
+  protected final Subscribers<BonsaiStorageSubscriber> subscribers = Subscribers.create();
+
+  public BonsaiWorldStateKeyValueStorage(
+      final StorageProvider provider, final ObservableMetricsSystem metricsSystem) {
+    this.accountStorage =
+        provider.getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.ACCOUNT_INFO_STATE);
+    this.codeStorage =
+        provider.getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.CODE_STORAGE);
+    this.storageStorage =
+        provider.getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.ACCOUNT_STORAGE_STORAGE);
+    this.trieBranchStorage =
+        provider.getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.TRIE_BRANCH_STORAGE);
+    this.trieLogStorage =
+        provider.getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.TRIE_LOG_STORAGE);
+    this.metricsSystem = metricsSystem;
+    loadFlatDbStrategy();
+  }
+
+  public BonsaiWorldStateKeyValueStorage(
+      final FlatDbMode flatDbMode,
+      final FlatDbReaderStrategy flatDbReaderStrategy,
+      final KeyValueStorage accountStorage,
+      final KeyValueStorage codeStorage,
+      final KeyValueStorage storageStorage,
+      final KeyValueStorage trieBranchStorage,
+      final KeyValueStorage trieLogStorage,
+      final ObservableMetricsSystem metricsSystem) {
+    this.flatDbMode = flatDbMode;
+    this.flatDbReaderStrategy = flatDbReaderStrategy;
+    this.accountStorage = accountStorage;
+    this.codeStorage = codeStorage;
+    this.storageStorage = storageStorage;
+    this.trieBranchStorage = trieBranchStorage;
+    this.trieLogStorage = trieLogStorage;
+    this.metricsSystem = metricsSystem;
+  }
+
+  public void loadFlatDbStrategy() {
+    this.flatDbMode =
+        FlatDbMode.fromVersion(
+            trieBranchStorage
+                .get(FLAT_DB_MODE)
+                .map(Bytes::wrap)
+                .orElse(
+                    FlatDbMode.PARTIAL
+                        .getVersion())); // for backward compatibility we use partial as
+    // default
+    LOG.info("Bonsai flat db mode found {}", flatDbMode);
+    if (flatDbMode == FlatDbMode.FULL) {
+      this.flatDbReaderStrategy = new FullFlatDbReaderStrategy(metricsSystem);
+    } else {
+      this.flatDbReaderStrategy = new PartialFlatDbReaderStrategy(metricsSystem);
+    }
+  }
+
+  @Override
+  public DataStorageFormat getDataStorageFormat() {
+    return DataStorageFormat.BONSAI;
+  }
+
+  @Override
+  public FlatDbMode getFlatDbMode() {
+    return flatDbMode;
+  }
+
+  public FlatDbReaderStrategy getFlatDbReaderStrategy() {
+    return flatDbReaderStrategy;
+  }
+
+  @Override
+  public Optional<Bytes> getCode(final Bytes32 codeHash, final Hash accountHash) {
+    if (codeHash.equals(Hash.EMPTY)) {
+      return Optional.of(Bytes.EMPTY);
+    } else {
+      return getFlatDbReaderStrategy().getCode(codeHash, accountHash, codeStorage);
+    }
+  }
+
+  public Optional<Bytes> getAccount(final Hash accountHash) {
+    return getFlatDbReaderStrategy()
+        .getAccount(
+            this::getWorldStateRootHash,
+            this::getAccountStateTrieNode,
+            accountHash,
+            accountStorage);
+  }
+
+  @Override
+  public Optional<Bytes> getAccountStateTrieNode(final Bytes location, final Bytes32 nodeHash) {
+    if (nodeHash.equals(MerkleTrie.EMPTY_TRIE_NODE_HASH)) {
+      return Optional.of(MerkleTrie.EMPTY_TRIE_NODE);
+    } else {
+      return trieBranchStorage
+          .get(location.toArrayUnsafe())
+          .map(Bytes::wrap)
+          .filter(b -> Hash.hash(b).equals(nodeHash));
+    }
+  }
+
+  /**
+   * Retrieves the storage trie node associated with the specified account and location, if
+   * available.
+   *
+   * @param accountHash The hash of the account.
+   * @param location The location within the storage trie.
+   * @param maybeNodeHash The optional hash of the storage trie node to validate the retrieved data
+   *     against.
+   * @return The optional bytes of the storage trie node.
+   */
+  public Optional<Bytes> getAccountStorageTrieNode(
+      final Hash accountHash, final Bytes location, final Optional<Bytes32> maybeNodeHash) {
+    if (maybeNodeHash.filter(hash -> hash.equals(MerkleTrie.EMPTY_TRIE_NODE_HASH)).isPresent()) {
+      return Optional.of(MerkleTrie.EMPTY_TRIE_NODE);
+    } else {
+      return trieBranchStorage
+          .get(Bytes.concatenate(accountHash, location).toArrayUnsafe())
+          .map(Bytes::wrap)
+          .filter(data -> maybeNodeHash.map(hash -> Hash.hash(data).equals(hash)).orElse(true));
+    }
+  }
+
+  @Override
+  public Optional<Bytes> getAccountStorageTrieNode(
+      final Hash accountHash, final Bytes location, final Bytes32 nodeHash) {
+    return getAccountStorageTrieNode(accountHash, location, Optional.ofNullable(nodeHash));
+  }
+
+  public Optional<byte[]> getTrieLog(final Hash blockHash) {
+    return trieLogStorage.get(blockHash.toArrayUnsafe());
+  }
+
+  public Optional<Bytes> getStateTrieNode(final Bytes location) {
+    return trieBranchStorage.get(location.toArrayUnsafe()).map(Bytes::wrap);
+  }
+
+  public Optional<Bytes> getWorldStateRootHash() {
+    return trieBranchStorage.get(WORLD_ROOT_HASH_KEY).map(Bytes::wrap);
+  }
+
+  public Optional<Hash> getWorldStateBlockHash() {
+    return trieBranchStorage.get(WORLD_BLOCK_HASH_KEY).map(Bytes32::wrap).map(Hash::wrap);
+  }
+
+  public Optional<Bytes> getStorageValueByStorageSlotKey(
+      final Hash accountHash, final StorageSlotKey storageSlotKey) {
+    return getStorageValueByStorageSlotKey(
+        () ->
+            getAccount(accountHash)
+                .map(
+                    b ->
+                        StateTrieAccountValue.readFrom(
+                                org.hyperledger.besu.ethereum.rlp.RLP.input(b))
+                            .getStorageRoot()),
+        accountHash,
+        storageSlotKey);
+  }
+
+  public Optional<Bytes> getStorageValueByStorageSlotKey(
+      final Supplier<Optional<Hash>> storageRootSupplier,
+      final Hash accountHash,
+      final StorageSlotKey storageSlotKey) {
+    return getFlatDbReaderStrategy()
+        .getStorageValueByStorageSlotKey(
+            this::getWorldStateRootHash,
+            storageRootSupplier,
+            (location, hash) -> getAccountStorageTrieNode(accountHash, location, hash),
+            accountHash,
+            storageSlotKey,
+            storageStorage);
+  }
+
+  @Override
+  public Map<Bytes32, Bytes> streamFlatAccounts(
+      final Bytes startKeyHash, final Bytes32 endKeyHash, final long max) {
+    return getFlatDbReaderStrategy()
+        .streamAccountFlatDatabase(accountStorage, startKeyHash, endKeyHash, max);
+  }
+
+  @Override
+  public Map<Bytes32, Bytes> streamFlatStorages(
+      final Hash accountHash, final Bytes startKeyHash, final Bytes32 endKeyHash, final long max) {
+    return getFlatDbReaderStrategy()
+        .streamStorageFlatDatabase(storageStorage, accountHash, startKeyHash, endKeyHash, max);
+  }
+
+  @Override
+  public Optional<Bytes> getNodeData(final Bytes location, final Bytes32 hash) {
+    return Optional.empty();
+  }
+
+  @Override
+  public boolean isWorldStateAvailable(final Bytes32 rootHash, final Hash blockHash) {
+    return trieBranchStorage
+        .get(WORLD_ROOT_HASH_KEY)
+        .map(Bytes32::wrap)
+        .map(hash -> hash.equals(rootHash) || trieLogStorage.containsKey(blockHash.toArrayUnsafe()))
+        .orElse(false);
+  }
+
+  public void upgradeToFullFlatDbMode() {
+    final KeyValueStorageTransaction transaction = trieBranchStorage.startTransaction();
+    transaction.put(FLAT_DB_MODE, FlatDbMode.FULL.getVersion().toArrayUnsafe());
+    transaction.commit();
+    loadFlatDbStrategy(); // force reload of flat db reader strategy
+  }
+
+  public void downgradeToPartialFlatDbMode() {
+    final KeyValueStorageTransaction transaction = trieBranchStorage.startTransaction();
+    transaction.put(FLAT_DB_MODE, FlatDbMode.PARTIAL.getVersion().toArrayUnsafe());
+    transaction.commit();
+    loadFlatDbStrategy(); // force reload of flat db reader strategy
+  }
+
+  @Override
+  public void clear() {
+    subscribers.forEach(BonsaiStorageSubscriber::onClearStorage);
+    getFlatDbReaderStrategy().clearAll(accountStorage, storageStorage, codeStorage);
+    trieBranchStorage.clear();
+    trieLogStorage.clear();
+    loadFlatDbStrategy(); // force reload of flat db reader strategy
+  }
+
+  @Override
+  public void clearTrieLog() {
+    subscribers.forEach(BonsaiStorageSubscriber::onClearTrieLog);
+    trieLogStorage.clear();
+  }
+
+  @Override
+  public void clearFlatDatabase() {
+    subscribers.forEach(BonsaiStorageSubscriber::onClearFlatDatabaseStorage);
+    getFlatDbReaderStrategy().resetOnResync(accountStorage, storageStorage);
+  }
+
+  @Override
+  public BonsaiUpdater updater() {
+    return new Updater(
+        accountStorage.startTransaction(),
+        codeStorage.startTransaction(),
+        storageStorage.startTransaction(),
+        trieBranchStorage.startTransaction(),
+        trieLogStorage.startTransaction());
+  }
+
+  @Override
+  public long prune(final Predicate<byte[]> inUseCheck) {
+    throw new RuntimeException("Bonsai Tries do not work with pruning.");
+  }
+
+  @Override
+  public long addNodeAddedListener(final NodesAddedListener listener) {
+    throw new RuntimeException("addNodeAddedListener not available");
+  }
+
+  @Override
+  public void removeNodeAddedListener(final long id) {
+    throw new RuntimeException("removeNodeAddedListener not available");
+  }
+
+  public interface BonsaiUpdater extends WorldStateStorage.Updater {
+    BonsaiUpdater removeCode(final Hash accountHash);
+
+    BonsaiUpdater removeAccountInfoState(final Hash accountHash);
+
+    BonsaiUpdater putAccountInfoState(final Hash accountHash, final Bytes accountValue);
+
+    BonsaiUpdater putStorageValueBySlotHash(
+        final Hash accountHash, final Hash slotHash, final Bytes storage);
+
+    void removeStorageValueBySlotHash(final Hash accountHash, final Hash slotHash);
+
+    KeyValueStorageTransaction getTrieBranchStorageTransaction();
+
+    KeyValueStorageTransaction getTrieLogStorageTransaction();
+  }
+
+  public static class Updater implements BonsaiUpdater {
+
+    private final KeyValueStorageTransaction accountStorageTransaction;
+    private final KeyValueStorageTransaction codeStorageTransaction;
+    private final KeyValueStorageTransaction storageStorageTransaction;
+    private final KeyValueStorageTransaction trieBranchStorageTransaction;
+    private final KeyValueStorageTransaction trieLogStorageTransaction;
+
+    public Updater(
+        final KeyValueStorageTransaction accountStorageTransaction,
+        final KeyValueStorageTransaction codeStorageTransaction,
+        final KeyValueStorageTransaction storageStorageTransaction,
+        final KeyValueStorageTransaction trieBranchStorageTransaction,
+        final KeyValueStorageTransaction trieLogStorageTransaction) {
+
+      this.accountStorageTransaction = accountStorageTransaction;
+      this.codeStorageTransaction = codeStorageTransaction;
+      this.storageStorageTransaction = storageStorageTransaction;
+      this.trieBranchStorageTransaction = trieBranchStorageTransaction;
+      this.trieLogStorageTransaction = trieLogStorageTransaction;
+    }
+
+    @Override
+    public BonsaiUpdater removeCode(final Hash accountHash) {
+      codeStorageTransaction.remove(accountHash.toArrayUnsafe());
+      return this;
+    }
+
+    @Override
+    public BonsaiUpdater putCode(final Hash accountHash, final Bytes32 codeHash, final Bytes code) {
+      if (code.size() == 0) {
+        // Don't save empty values
+        return this;
+      }
+      codeStorageTransaction.put(accountHash.toArrayUnsafe(), code.toArrayUnsafe());
+      return this;
+    }
+
+    @Override
+    public BonsaiUpdater removeAccountInfoState(final Hash accountHash) {
+      accountStorageTransaction.remove(accountHash.toArrayUnsafe());
+      return this;
+    }
+
+    @Override
+    public BonsaiUpdater putAccountInfoState(final Hash accountHash, final Bytes accountValue) {
+      if (accountValue.size() == 0) {
+        // Don't save empty values
+        return this;
+      }
+      accountStorageTransaction.put(accountHash.toArrayUnsafe(), accountValue.toArrayUnsafe());
+      return this;
+    }
+
+    @Override
+    public WorldStateStorage.Updater saveWorldState(
+        final Bytes blockHash, final Bytes32 nodeHash, final Bytes node) {
+      trieBranchStorageTransaction.put(Bytes.EMPTY.toArrayUnsafe(), node.toArrayUnsafe());
+      trieBranchStorageTransaction.put(WORLD_ROOT_HASH_KEY, nodeHash.toArrayUnsafe());
+      trieBranchStorageTransaction.put(WORLD_BLOCK_HASH_KEY, blockHash.toArrayUnsafe());
+      return this;
+    }
+
+    @Override
+    public BonsaiUpdater putAccountStateTrieNode(
+        final Bytes location, final Bytes32 nodeHash, final Bytes node) {
+      if (nodeHash.equals(MerkleTrie.EMPTY_TRIE_NODE_HASH)) {
+        // Don't save empty nodes
+        return this;
+      }
+      trieBranchStorageTransaction.put(location.toArrayUnsafe(), node.toArrayUnsafe());
+      return this;
+    }
+
+    @Override
+    public BonsaiUpdater removeAccountStateTrieNode(final Bytes location, final Bytes32 nodeHash) {
+      trieBranchStorageTransaction.remove(location.toArrayUnsafe());
+      return this;
+    }
+
+    @Override
+    public synchronized BonsaiUpdater putAccountStorageTrieNode(
+        final Hash accountHash, final Bytes location, final Bytes32 nodeHash, final Bytes node) {
+      if (nodeHash.equals(MerkleTrie.EMPTY_TRIE_NODE_HASH)) {
+        // Don't save empty nodes
+        return this;
+      }
+      trieBranchStorageTransaction.put(
+          Bytes.concatenate(accountHash, location).toArrayUnsafe(), node.toArrayUnsafe());
+      return this;
+    }
+
+    @Override
+    public synchronized BonsaiUpdater putStorageValueBySlotHash(
+        final Hash accountHash, final Hash slotHash, final Bytes storage) {
+      storageStorageTransaction.put(
+          Bytes.concatenate(accountHash, slotHash).toArrayUnsafe(), storage.toArrayUnsafe());
+      return this;
+    }
+
+    @Override
+    public synchronized void removeStorageValueBySlotHash(
+        final Hash accountHash, final Hash slotHash) {
+      storageStorageTransaction.remove(Bytes.concatenate(accountHash, slotHash).toArrayUnsafe());
+    }
+
+    @Override
+    public KeyValueStorageTransaction getTrieBranchStorageTransaction() {
+      return trieBranchStorageTransaction;
+    }
+
+    @Override
+    public KeyValueStorageTransaction getTrieLogStorageTransaction() {
+      return trieLogStorageTransaction;
+    }
+
+    @Override
+    public void commit() {
+      accountStorageTransaction.commit();
+      codeStorageTransaction.commit();
+      storageStorageTransaction.commit();
+      trieBranchStorageTransaction.commit();
+      trieLogStorageTransaction.commit();
+    }
+
+    @Override
+    public void rollback() {
+      accountStorageTransaction.rollback();
+      codeStorageTransaction.rollback();
+      storageStorageTransaction.rollback();
+      trieBranchStorageTransaction.rollback();
+      trieLogStorageTransaction.rollback();
+    }
+  }
+
+  @Override
+  public synchronized void close() throws Exception {
+    // when the storage clears, close
+    shouldClose.set(true);
+    tryClose();
+  }
+
+  public synchronized long subscribe(final BonsaiStorageSubscriber sub) {
+    if (isClosed.get()) {
+      throw new RuntimeException("Storage is marked to close or has already closed");
+    }
+    return subscribers.subscribe(sub);
+  }
+
+  public synchronized void unSubscribe(final long id) {
+    subscribers.unsubscribe(id);
+    try {
+      tryClose();
+    } catch (Exception e) {
+      LOG.atWarn()
+          .setMessage("exception while trying to close : {}")
+          .addArgument(e::getMessage)
+          .log();
+    }
+  }
+
+  protected synchronized void tryClose() throws Exception {
+    if (shouldClose.get() && subscribers.getSubscriberCount() < 1) {
+      doClose();
+    }
+  }
+
+  protected synchronized void doClose() throws Exception {
+    if (!isClosed.get()) {
+      // alert any subscribers we are closing:
+      subscribers.forEach(BonsaiStorageSubscriber::onCloseStorage);
+
+      // close all of the KeyValueStorages:
+      accountStorage.close();
+      codeStorage.close();
+      storageStorage.close();
+      trieBranchStorage.close();
+      trieLogStorage.close();
+
+      // set storage closed
+      isClosed.set(true);
+    }
+  }
+
+  public interface BonsaiStorageSubscriber {
+    default void onClearStorage() {}
+
+    default void onClearFlatDatabaseStorage() {}
+
+    default void onClearTrieLog() {}
+
+    default void onCloseStorage() {}
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/BonsaiWorldStateLayerStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/BonsaiWorldStateLayerStorage.java
new file mode 100644
index 00000000000..2d6a6c407e6
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/BonsaiWorldStateLayerStorage.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.bonsai.storage;
+
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage.BonsaiStorageSubscriber;
+import org.hyperledger.besu.ethereum.worldstate.FlatDbMode;
+import org.hyperledger.besu.metrics.ObservableMetricsSystem;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
+import org.hyperledger.besu.plugin.services.storage.SnappedKeyValueStorage;
+import org.hyperledger.besu.services.kvstore.LayeredKeyValueStorage;
+
+public class BonsaiWorldStateLayerStorage extends BonsaiSnapshotWorldStateKeyValueStorage
+    implements BonsaiStorageSubscriber {
+
+  public BonsaiWorldStateLayerStorage(final BonsaiWorldStateKeyValueStorage parent) {
+    this(
+        new LayeredKeyValueStorage(parent.accountStorage),
+        new LayeredKeyValueStorage(parent.codeStorage),
+        new LayeredKeyValueStorage(parent.storageStorage),
+        new LayeredKeyValueStorage(parent.trieBranchStorage),
+        parent.trieLogStorage,
+        parent,
+        parent.metricsSystem);
+  }
+
+  public BonsaiWorldStateLayerStorage(
+      final SnappedKeyValueStorage accountStorage,
+      final SnappedKeyValueStorage codeStorage,
+      final SnappedKeyValueStorage storageStorage,
+      final SnappedKeyValueStorage trieBranchStorage,
+      final KeyValueStorage trieLogStorage,
+      final BonsaiWorldStateKeyValueStorage parent,
+      final ObservableMetricsSystem metricsSystem) {
+    super(
+        parent,
+        accountStorage,
+        codeStorage,
+        storageStorage,
+        trieBranchStorage,
+        trieLogStorage,
+        metricsSystem);
+  }
+
+  @Override
+  public FlatDbMode getFlatDbMode() {
+    return parentWorldStateStorage.getFlatDbMode();
+  }
+
+  @Override
+  public BonsaiWorldStateLayerStorage clone() {
+    return new BonsaiWorldStateLayerStorage(
+        ((LayeredKeyValueStorage) accountStorage).clone(),
+        ((LayeredKeyValueStorage) codeStorage).clone(),
+        ((LayeredKeyValueStorage) storageStorage).clone(),
+        ((LayeredKeyValueStorage) trieBranchStorage).clone(),
+        trieLogStorage,
+        parentWorldStateStorage,
+        metricsSystem);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/flat/FlatDbReaderStrategy.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/flat/FlatDbReaderStrategy.java
new file mode 100644
index 00000000000..86e60ae4d6c
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/flat/FlatDbReaderStrategy.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.bonsai.storage.flat;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.StorageSlotKey;
+import org.hyperledger.besu.ethereum.trie.NodeLoader;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.TreeMap;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import kotlin.Pair;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.rlp.RLP;
+
+/**
+ * This class represents a FlatDbReaderStrategy, which is responsible for reading data from flat
+ * databases. It implements various methods for retrieving account data, code data, and storage data
+ * from the corresponding KeyValueStorage.
+ */
+public abstract class FlatDbReaderStrategy {
+
+  protected final MetricsSystem metricsSystem;
+  protected final Counter getAccountCounter;
+  protected final Counter getAccountFoundInFlatDatabaseCounter;
+
+  protected final Counter getStorageValueCounter;
+  protected final Counter getStorageValueFlatDatabaseCounter;
+
+  public FlatDbReaderStrategy(final MetricsSystem metricsSystem) {
+    this.metricsSystem = metricsSystem;
+
+    getAccountCounter =
+        metricsSystem.createCounter(
+            BesuMetricCategory.BLOCKCHAIN,
+            "get_account_total",
+            "Total number of calls to getAccount");
+
+    getAccountFoundInFlatDatabaseCounter =
+        metricsSystem.createCounter(
+            BesuMetricCategory.BLOCKCHAIN,
+            "get_account_flat_database",
+            "Number of accounts found in the flat database");
+
+    getStorageValueCounter =
+        metricsSystem.createCounter(
+            BesuMetricCategory.BLOCKCHAIN,
+            "get_storagevalue_total",
+            "Total number of calls to getStorageValueBySlotHash");
+
+    getStorageValueFlatDatabaseCounter =
+        metricsSystem.createCounter(
+            BesuMetricCategory.BLOCKCHAIN,
+            "get_storagevalue_flat_database",
+            "Number of storage slots found in the flat database");
+  }
+
+  /*
+   * Retrieves the account data for the given account hash, using the world state root hash supplier and node loader.
+   */
+  public abstract Optional<Bytes> getAccount(
+      Supplier<Optional<Bytes>> worldStateRootHashSupplier,
+      NodeLoader nodeLoader,
+      Hash accountHash,
+      KeyValueStorage accountStorage);
+
+  /*
+   * Retrieves the storage value for the given account hash and storage slot key, using the world state root hash supplier, storage root supplier, and node loader.
+   */
+
+  public abstract Optional<Bytes> getStorageValueByStorageSlotKey(
+      Supplier<Optional<Bytes>> worldStateRootHashSupplier,
+      Supplier<Optional<Hash>> storageRootSupplier,
+      NodeLoader nodeLoader,
+      Hash accountHash,
+      StorageSlotKey storageSlotKey,
+      KeyValueStorage storageStorage);
+
+  /*
+   * Retrieves the code data for the given code hash and account hash.
+   */
+  public Optional<Bytes> getCode(
+      final Bytes32 codeHash, final Hash accountHash, final KeyValueStorage codeStorage) {
+    if (codeHash.equals(Hash.EMPTY)) {
+      return Optional.of(Bytes.EMPTY);
+    } else {
+      return codeStorage
+          .get(accountHash.toArrayUnsafe())
+          .map(Bytes::wrap)
+          .filter(b -> Hash.hash(b).equals(codeHash));
+    }
+  }
+
+  public void clearAll(
+      final KeyValueStorage accountStorage,
+      final KeyValueStorage storageStorage,
+      final KeyValueStorage codeStorage) {
+    accountStorage.clear();
+    storageStorage.clear();
+    codeStorage.clear();
+  }
+
+  public void resetOnResync(
+      final KeyValueStorage accountStorage, final KeyValueStorage storageStorage) {
+    accountStorage.clear();
+    storageStorage.clear();
+  }
+
+  public Map<Bytes32, Bytes> streamAccountFlatDatabase(
+      final KeyValueStorage accountStorage,
+      final Bytes startKeyHash,
+      final Bytes32 endKeyHash,
+      final long max) {
+    final Stream<Pair<Bytes32, Bytes>> pairStream =
+        accountStorage
+            .streamFromKey(startKeyHash.toArrayUnsafe())
+            .limit(max)
+            .map(pair -> new Pair<>(Bytes32.wrap(pair.getKey()), Bytes.wrap(pair.getValue())))
+            .takeWhile(pair -> pair.getFirst().compareTo(endKeyHash) <= 0);
+
+    final TreeMap<Bytes32, Bytes> collected =
+        pairStream.collect(
+            Collectors.toMap(Pair::getFirst, Pair::getSecond, (v1, v2) -> v1, TreeMap::new));
+    pairStream.close();
+    return collected;
+  }
+
+  public Map<Bytes32, Bytes> streamStorageFlatDatabase(
+      final KeyValueStorage storageStorage,
+      final Hash accountHash,
+      final Bytes startKeyHash,
+      final Bytes32 endKeyHash,
+      final long max) {
+    final Stream<Pair<Bytes32, Bytes>> pairStream =
+        storageStorage
+            .streamFromKey(Bytes.concatenate(accountHash, startKeyHash).toArrayUnsafe())
+            .takeWhile(pair -> Bytes.wrap(pair.getKey()).slice(0, Hash.SIZE).equals(accountHash))
+            .limit(max)
+            .map(
+                pair ->
+                    new Pair<>(
+                        Bytes32.wrap(Bytes.wrap(pair.getKey()).slice(Hash.SIZE)),
+                        RLP.encodeValue(Bytes.wrap(pair.getValue()).trimLeadingZeros())))
+            .takeWhile(pair -> pair.getFirst().compareTo(endKeyHash) <= 0);
+
+    final TreeMap<Bytes32, Bytes> collected =
+        pairStream.collect(
+            Collectors.toMap(Pair::getFirst, Pair::getSecond, (v1, v2) -> v1, TreeMap::new));
+    pairStream.close();
+    return collected;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/flat/FullFlatDbReaderStrategy.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/flat/FullFlatDbReaderStrategy.java
new file mode 100644
index 00000000000..e28ead510f1
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/flat/FullFlatDbReaderStrategy.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.bonsai.storage.flat;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.StorageSlotKey;
+import org.hyperledger.besu.ethereum.trie.NodeLoader;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
+
+import java.util.Optional;
+import java.util.function.Supplier;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class FullFlatDbReaderStrategy extends FlatDbReaderStrategy {
+
+  protected final Counter getAccountNotFoundInFlatDatabaseCounter;
+
+  protected final Counter getStorageValueNotFoundInFlatDatabaseCounter;
+
+  public FullFlatDbReaderStrategy(final MetricsSystem metricsSystem) {
+    super(metricsSystem);
+
+    getAccountNotFoundInFlatDatabaseCounter =
+        metricsSystem.createCounter(
+            BesuMetricCategory.BLOCKCHAIN,
+            "get_account_missing_flat_database",
+            "Number of accounts not found in the flat database");
+
+    getStorageValueNotFoundInFlatDatabaseCounter =
+        metricsSystem.createCounter(
+            BesuMetricCategory.BLOCKCHAIN,
+            "get_storagevalue_missing_flat_database",
+            "Number of storage slots not found in the flat database");
+  }
+
+  @Override
+  public Optional<Bytes> getAccount(
+      final Supplier<Optional<Bytes>> worldStateRootHashSupplier,
+      final NodeLoader nodeLoader,
+      final Hash accountHash,
+      final KeyValueStorage accountStorage) {
+    getAccountCounter.inc();
+    final Optional<Bytes> accountFound =
+        accountStorage.get(accountHash.toArrayUnsafe()).map(Bytes::wrap);
+    if (accountFound.isPresent()) {
+      getAccountFoundInFlatDatabaseCounter.inc();
+    } else {
+      getAccountNotFoundInFlatDatabaseCounter.inc();
+    }
+    return accountFound;
+  }
+
+  @Override
+  public Optional<Bytes> getStorageValueByStorageSlotKey(
+      final Supplier<Optional<Bytes>> worldStateRootHashSupplier,
+      final Supplier<Optional<Hash>> storageRootSupplier,
+      final NodeLoader nodeLoader,
+      final Hash accountHash,
+      final StorageSlotKey storageSlotKey,
+      final KeyValueStorage storageStorage) {
+    getStorageValueCounter.inc();
+    final Optional<Bytes> storageFound =
+        storageStorage
+            .get(Bytes.concatenate(accountHash, storageSlotKey.getSlotHash()).toArrayUnsafe())
+            .map(Bytes::wrap);
+    if (storageFound.isPresent()) {
+      getStorageValueFlatDatabaseCounter.inc();
+    } else {
+      getStorageValueNotFoundInFlatDatabaseCounter.inc();
+    }
+
+    return storageFound;
+  }
+
+  @Override
+  public void resetOnResync(
+      final KeyValueStorage accountStorage, final KeyValueStorage storageStorage) {
+    // NOOP
+    // not need to reset anything in full mode
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/flat/PartialFlatDbReaderStrategy.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/flat/PartialFlatDbReaderStrategy.java
new file mode 100644
index 00000000000..8ea0fbcde38
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/flat/PartialFlatDbReaderStrategy.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.bonsai.storage.flat;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.StorageSlotKey;
+import org.hyperledger.besu.ethereum.trie.NodeLoader;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredNodeFactory;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
+
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.rlp.RLP;
+
+/**
+ * This class represents a strategy for reading data from a partial flat database. It extends the
+ * FlatDbReaderStrategy and provides additional functionality for reading data from a merkle trie.
+ * If data is missing in the flat database, this strategy falls back to the merkle trie to retrieve
+ * the data. It adds a fallback mechanism for the `getAccount` and `getStorageValueByStorageSlotKey`
+ * methods, which checks if the data is present in the flat database, and if not, queries the merkle
+ * trie
+ */
+public class PartialFlatDbReaderStrategy extends FlatDbReaderStrategy {
+
+  protected final Counter getAccountMerkleTrieCounter;
+  protected final Counter getAccountMissingMerkleTrieCounter;
+
+  protected final Counter getStorageValueMerkleTrieCounter;
+  protected final Counter getStorageValueMissingMerkleTrieCounter;
+
+  public PartialFlatDbReaderStrategy(final MetricsSystem metricsSystem) {
+    super(metricsSystem);
+    getAccountMerkleTrieCounter =
+        metricsSystem.createCounter(
+            BesuMetricCategory.BLOCKCHAIN,
+            "get_account_merkle_trie",
+            "Number of accounts not found in the flat database, but found in the merkle trie");
+
+    getAccountMissingMerkleTrieCounter =
+        metricsSystem.createCounter(
+            BesuMetricCategory.BLOCKCHAIN,
+            "get_account_missing_merkle_trie",
+            "Number of accounts not found (either in the flat database or the merkle trie)");
+
+    getStorageValueMerkleTrieCounter =
+        metricsSystem.createCounter(
+            BesuMetricCategory.BLOCKCHAIN,
+            "get_storagevalue_merkle_trie",
+            "Number of storage slots not found in the flat database, but found in the merkle trie");
+
+    getStorageValueMissingMerkleTrieCounter =
+        metricsSystem.createCounter(
+            BesuMetricCategory.BLOCKCHAIN,
+            "get_storagevalue_missing_merkle_trie",
+            "Number of storage slots not found (either in the flat database or in the merkle trie)");
+  }
+
+  @Override
+  public Optional<Bytes> getAccount(
+      final Supplier<Optional<Bytes>> worldStateRootHashSupplier,
+      final NodeLoader nodeLoader,
+      final Hash accountHash,
+      final KeyValueStorage accountStorage) {
+    getAccountCounter.inc();
+    Optional<Bytes> response = accountStorage.get(accountHash.toArrayUnsafe()).map(Bytes::wrap);
+    if (response.isEmpty()) {
+      // after a snapsync/fastsync we only have the trie branches.
+      final Optional<Bytes> worldStateRootHash = worldStateRootHashSupplier.get();
+      if (worldStateRootHash.isPresent()) {
+        response =
+            new StoredMerklePatriciaTrie<>(
+                    new StoredNodeFactory<>(nodeLoader, Function.identity(), Function.identity()),
+                    Bytes32.wrap(worldStateRootHash.get()))
+                .get(accountHash);
+        if (response.isEmpty()) {
+          getAccountMissingMerkleTrieCounter.inc();
+        } else {
+          getAccountMerkleTrieCounter.inc();
+        }
+      }
+    } else {
+      getAccountFoundInFlatDatabaseCounter.inc();
+    }
+
+    return response;
+  }
+
+  @Override
+  public Optional<Bytes> getStorageValueByStorageSlotKey(
+      final Supplier<Optional<Bytes>> worldStateRootHashSupplier,
+      final Supplier<Optional<Hash>> storageRootSupplier,
+      final NodeLoader nodeLoader,
+      final Hash accountHash,
+      final StorageSlotKey storageSlotKey,
+      final KeyValueStorage storageStorage) {
+    getStorageValueCounter.inc();
+    Optional<Bytes> response =
+        storageStorage
+            .get(Bytes.concatenate(accountHash, storageSlotKey.getSlotHash()).toArrayUnsafe())
+            .map(Bytes::wrap);
+    if (response.isEmpty()) {
+      final Optional<Hash> storageRoot = storageRootSupplier.get();
+      final Optional<Bytes> worldStateRootHash = worldStateRootHashSupplier.get();
+      if (storageRoot.isPresent() && worldStateRootHash.isPresent()) {
+        response =
+            new StoredMerklePatriciaTrie<>(
+                    new StoredNodeFactory<>(nodeLoader, Function.identity(), Function.identity()),
+                    storageRoot.get())
+                .get(storageSlotKey.getSlotHash())
+                .map(bytes -> Bytes32.leftPad(RLP.decodeValue(bytes)));
+        if (response.isEmpty()) getStorageValueMissingMerkleTrieCounter.inc();
+        else getStorageValueMerkleTrieCounter.inc();
+      }
+    } else {
+      getStorageValueFlatDatabaseCounter.inc();
+    }
+    return response;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/trielog/AbstractTrieLogManager.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/trielog/AbstractTrieLogManager.java
new file mode 100644
index 00000000000..90aff386e83
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/trielog/AbstractTrieLogManager.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.bonsai.trielog;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.bonsai.cache.CachedBonsaiWorldView;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage.BonsaiUpdater;
+import org.hyperledger.besu.ethereum.bonsai.worldview.BonsaiWorldState;
+import org.hyperledger.besu.ethereum.bonsai.worldview.BonsaiWorldStateUpdateAccumulator;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.plugin.BesuContext;
+import org.hyperledger.besu.plugin.services.trielogs.TrieLog;
+import org.hyperledger.besu.plugin.services.trielogs.TrieLogEvent.TrieLogObserver;
+import org.hyperledger.besu.plugin.services.trielogs.TrieLogFactory;
+import org.hyperledger.besu.util.Subscribers;
+
+import java.util.Map;
+import java.util.Optional;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public abstract class AbstractTrieLogManager implements TrieLogManager {
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractTrieLogManager.class);
+  public static final long RETAINED_LAYERS = 512; // at least 256 + typical rollbacks
+  public static final long LOG_RANGE_LIMIT = 1000; // restrict trielog range queries to 1k logs
+  protected final Blockchain blockchain;
+  protected final BonsaiWorldStateKeyValueStorage rootWorldStateStorage;
+
+  protected final Map<Bytes32, CachedBonsaiWorldView> cachedWorldStatesByHash;
+  protected final long maxLayersToLoad;
+  protected final Subscribers<TrieLogObserver> trieLogObservers = Subscribers.create();
+
+  protected final TrieLogFactory trieLogFactory;
+
+  protected AbstractTrieLogManager(
+      final Blockchain blockchain,
+      final BonsaiWorldStateKeyValueStorage worldStateStorage,
+      final long maxLayersToLoad,
+      final Map<Bytes32, CachedBonsaiWorldView> cachedWorldStatesByHash,
+      final BesuContext pluginContext) {
+    this.blockchain = blockchain;
+    this.rootWorldStateStorage = worldStateStorage;
+    this.cachedWorldStatesByHash = cachedWorldStatesByHash;
+    this.maxLayersToLoad = maxLayersToLoad;
+    this.trieLogFactory = setupTrieLogFactory(pluginContext);
+  }
+
+  protected abstract TrieLogFactory setupTrieLogFactory(final BesuContext pluginContext);
+
+  @Override
+  public synchronized void saveTrieLog(
+      final BonsaiWorldStateUpdateAccumulator localUpdater,
+      final Hash forWorldStateRootHash,
+      final BlockHeader forBlockHeader,
+      final BonsaiWorldState forWorldState) {
+    // do not overwrite a trielog layer that already exists in the database.
+    // if it's only in memory we need to save it
+    // for example, in case of reorg we don't replace a trielog layer
+    if (rootWorldStateStorage.getTrieLog(forBlockHeader.getHash()).isEmpty()) {
+      final BonsaiUpdater stateUpdater = forWorldState.getWorldStateStorage().updater();
+      boolean success = false;
+      try {
+        final TrieLog trieLog = prepareTrieLog(forBlockHeader, localUpdater);
+        persistTrieLog(forBlockHeader, forWorldStateRootHash, trieLog, stateUpdater);
+
+        // notify trie log added observers, synchronously
+        trieLogObservers.forEach(o -> o.onTrieLogAdded(new TrieLogAddedEvent(trieLog)));
+
+        success = true;
+      } finally {
+        if (success) {
+          stateUpdater.commit();
+        } else {
+          stateUpdater.rollback();
+        }
+      }
+    }
+  }
+
+  @VisibleForTesting
+  TrieLog prepareTrieLog(
+      final BlockHeader blockHeader, final BonsaiWorldStateUpdateAccumulator localUpdater) {
+    LOG.atDebug()
+        .setMessage("Adding layered world state for {}")
+        .addArgument(blockHeader::toLogString)
+        .log();
+    final TrieLog trieLog = trieLogFactory.create(localUpdater, blockHeader);
+    trieLog.freeze();
+    return trieLog;
+  }
+
+  public synchronized void scrubCachedLayers(final long newMaxHeight) {
+    if (cachedWorldStatesByHash.size() > RETAINED_LAYERS) {
+      final long waterline = newMaxHeight - RETAINED_LAYERS;
+      cachedWorldStatesByHash.values().stream()
+          .filter(layer -> layer.getBlockNumber() < waterline)
+          .toList()
+          .forEach(
+              layer -> {
+                cachedWorldStatesByHash.remove(layer.getBlockHash());
+                layer.close();
+              });
+    }
+  }
+
+  private void persistTrieLog(
+      final BlockHeader blockHeader,
+      final Hash worldStateRootHash,
+      final TrieLog trieLog,
+      final BonsaiUpdater stateUpdater) {
+    LOG.atDebug()
+        .setMessage("Persisting trie log for block hash {} and world state root {}")
+        .addArgument(blockHeader::toLogString)
+        .addArgument(worldStateRootHash::toHexString)
+        .log();
+
+    stateUpdater
+        .getTrieLogStorageTransaction()
+        .put(blockHeader.getHash().toArrayUnsafe(), trieLogFactory.serialize(trieLog));
+  }
+
+  @Override
+  public boolean containWorldStateStorage(final Hash blockHash) {
+    return cachedWorldStatesByHash.containsKey(blockHash);
+  }
+
+  @Override
+  public long getMaxLayersToLoad() {
+    return maxLayersToLoad;
+  }
+
+  @Override
+  public Optional<TrieLog> getTrieLogLayer(final Hash blockHash) {
+    return rootWorldStateStorage.getTrieLog(blockHash).map(trieLogFactory::deserialize);
+  }
+
+  @Override
+  public synchronized long subscribe(final TrieLogObserver sub) {
+    return trieLogObservers.subscribe(sub);
+  }
+
+  @Override
+  public synchronized void unsubscribe(final long id) {
+    trieLogObservers.unsubscribe(id);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogAddedEvent.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogAddedEvent.java
new file mode 100644
index 00000000000..c9df72f0040
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogAddedEvent.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.bonsai.trielog;
+
+import org.hyperledger.besu.plugin.services.trielogs.TrieLog;
+import org.hyperledger.besu.plugin.services.trielogs.TrieLogEvent;
+
+public record TrieLogAddedEvent(TrieLog layer) implements TrieLogEvent {
+
+  @Override
+  public Type getType() {
+    return Type.ADDED;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogFactoryImpl.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogFactoryImpl.java
new file mode 100644
index 00000000000..ebac500061c
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogFactoryImpl.java
@@ -0,0 +1,257 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.bonsai.trielog;
+
+import org.hyperledger.besu.datatypes.AccountValue;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.StorageSlotKey;
+import org.hyperledger.besu.ethereum.bonsai.BonsaiValue;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
+import org.hyperledger.besu.plugin.data.BlockHeader;
+import org.hyperledger.besu.plugin.services.trielogs.TrieLog;
+import org.hyperledger.besu.plugin.services.trielogs.TrieLogAccumulator;
+import org.hyperledger.besu.plugin.services.trielogs.TrieLogFactory;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+
+public class TrieLogFactoryImpl implements TrieLogFactory {
+
+  @Override
+  public TrieLogLayer create(final TrieLogAccumulator accumulator, final BlockHeader blockHeader) {
+    TrieLogLayer layer = new TrieLogLayer();
+    layer.setBlockHash(blockHeader.getBlockHash());
+    layer.setBlockNumber(blockHeader.getNumber());
+    for (final var updatedAccount : accumulator.getAccountsToUpdate().entrySet()) {
+      final var bonsaiValue = updatedAccount.getValue();
+      final var oldAccountValue = bonsaiValue.getPrior();
+      final var newAccountValue = bonsaiValue.getUpdated();
+      if (oldAccountValue == null && newAccountValue == null) {
+        // by default do not persist empty reads of accounts to the trie log
+        continue;
+      }
+      layer.addAccountChange(updatedAccount.getKey(), oldAccountValue, newAccountValue);
+    }
+
+    for (final var updatedCode : accumulator.getCodeToUpdate().entrySet()) {
+      layer.addCodeChange(
+          updatedCode.getKey(),
+          updatedCode.getValue().getPrior(),
+          updatedCode.getValue().getUpdated(),
+          blockHeader.getBlockHash());
+    }
+
+    for (final var updatesStorage : accumulator.getStorageToUpdate().entrySet()) {
+      final Address address = updatesStorage.getKey();
+      for (final var slotUpdate : updatesStorage.getValue().entrySet()) {
+        var val = slotUpdate.getValue();
+
+        if (val.getPrior() == null && val.getUpdated() == null) {
+          // by default do not persist empty reads to the trie log
+          continue;
+        }
+
+        layer.addStorageChange(address, slotUpdate.getKey(), val.getPrior(), val.getUpdated());
+      }
+    }
+    return layer;
+  }
+
+  @Override
+  public byte[] serialize(final TrieLog layer) {
+    final BytesValueRLPOutput rlpLog = new BytesValueRLPOutput();
+    writeTo(layer, rlpLog);
+    return rlpLog.encoded().toArrayUnsafe();
+  }
+
+  public static void writeTo(final TrieLog layer, final RLPOutput output) {
+    layer.freeze();
+
+    final Set<Address> addresses = new TreeSet<>();
+    addresses.addAll(layer.getAccountChanges().keySet());
+    addresses.addAll(layer.getCodeChanges().keySet());
+    addresses.addAll(layer.getStorageChanges().keySet());
+
+    output.startList(); // container
+    output.writeBytes(layer.getBlockHash());
+
+    for (final Address address : addresses) {
+      output.startList(); // this change
+      output.writeBytes(address);
+
+      final TrieLog.LogTuple<AccountValue> accountChange = layer.getAccountChanges().get(address);
+      if (accountChange == null || accountChange.isUnchanged()) {
+        output.writeNull();
+      } else {
+        writeRlp(accountChange, output, (o, sta) -> sta.writeTo(o));
+      }
+
+      final TrieLog.LogTuple<Bytes> codeChange = layer.getCodeChanges().get(address);
+      if (codeChange == null || codeChange.isUnchanged()) {
+        output.writeNull();
+      } else {
+        writeRlp(codeChange, output, RLPOutput::writeBytes);
+      }
+
+      final Map<StorageSlotKey, TrieLog.LogTuple<UInt256>> storageChanges =
+          layer.getStorageChanges().get(address);
+      if (storageChanges == null) {
+        output.writeNull();
+      } else {
+        output.startList();
+        for (final Map.Entry<StorageSlotKey, TrieLog.LogTuple<UInt256>> storageChangeEntry :
+            storageChanges.entrySet()) {
+          output.startList();
+          // do not write slotKey, it is not used in mainnet bonsai trielogs
+          output.writeBytes(storageChangeEntry.getKey().getSlotHash());
+          writeInnerRlp(storageChangeEntry.getValue(), output, RLPOutput::writeUInt256Scalar);
+          output.endList();
+        }
+        output.endList();
+      }
+
+      output.endList(); // this change
+    }
+    output.endList(); // container
+  }
+
+  @Override
+  public TrieLogLayer deserialize(final byte[] bytes) {
+    return readFrom(new BytesValueRLPInput(Bytes.wrap(bytes), false));
+  }
+
+  public static TrieLogLayer readFrom(final RLPInput input) {
+    final TrieLogLayer newLayer = new TrieLogLayer();
+
+    input.enterList();
+    newLayer.blockHash = Hash.wrap(input.readBytes32());
+
+    while (!input.isEndOfCurrentList()) {
+      input.enterList();
+      final Address address = Address.readFrom(input);
+
+      if (input.nextIsNull()) {
+        input.skipNext();
+      } else {
+        input.enterList();
+        final StateTrieAccountValue oldValue = nullOrValue(input, StateTrieAccountValue::readFrom);
+        final StateTrieAccountValue newValue = nullOrValue(input, StateTrieAccountValue::readFrom);
+        final boolean isCleared = getOptionalIsCleared(input);
+        input.leaveList();
+        newLayer.accounts.put(address, new BonsaiValue<>(oldValue, newValue, isCleared));
+      }
+
+      if (input.nextIsNull()) {
+        input.skipNext();
+      } else {
+        input.enterList();
+        final Bytes oldCode = nullOrValue(input, RLPInput::readBytes);
+        final Bytes newCode = nullOrValue(input, RLPInput::readBytes);
+        final boolean isCleared = getOptionalIsCleared(input);
+        input.leaveList();
+        newLayer.code.put(address, new BonsaiValue<>(oldCode, newCode, isCleared));
+      }
+
+      if (input.nextIsNull()) {
+        input.skipNext();
+      } else {
+        final Map<StorageSlotKey, BonsaiValue<UInt256>> storageChanges = new TreeMap<>();
+        input.enterList();
+        while (!input.isEndOfCurrentList()) {
+          input.enterList();
+          final Hash slotHash = Hash.wrap(input.readBytes32());
+          final StorageSlotKey storageSlotKey = new StorageSlotKey(slotHash, Optional.empty());
+          final UInt256 oldValue = nullOrValue(input, RLPInput::readUInt256Scalar);
+          final UInt256 newValue = nullOrValue(input, RLPInput::readUInt256Scalar);
+          final boolean isCleared = getOptionalIsCleared(input);
+          storageChanges.put(storageSlotKey, new BonsaiValue<>(oldValue, newValue, isCleared));
+          input.leaveList();
+        }
+        input.leaveList();
+        newLayer.storage.put(address, storageChanges);
+      }
+
+      // TODO add trie nodes
+
+      // lenient leave list for forward compatible additions.
+      input.leaveListLenient();
+    }
+    input.leaveListLenient();
+    newLayer.freeze();
+
+    return newLayer;
+  }
+
+  protected static <T> T nullOrValue(final RLPInput input, final Function<RLPInput, T> reader) {
+    if (input.nextIsNull()) {
+      input.skipNext();
+      return null;
+    } else {
+      return reader.apply(input);
+    }
+  }
+
+  protected static boolean getOptionalIsCleared(final RLPInput input) {
+    return Optional.of(input.isEndOfCurrentList())
+        .filter(isEnd -> !isEnd) // isCleared is optional
+        .map(__ -> nullOrValue(input, RLPInput::readInt))
+        .filter(i -> i == 1)
+        .isPresent();
+  }
+
+  public static <T> void writeRlp(
+      final TrieLog.LogTuple<T> value,
+      final RLPOutput output,
+      final BiConsumer<RLPOutput, T> writer) {
+    output.startList();
+    writeInnerRlp(value, output, writer);
+    output.endList();
+  }
+
+  public static <T> void writeInnerRlp(
+      final TrieLog.LogTuple<T> value,
+      final RLPOutput output,
+      final BiConsumer<RLPOutput, T> writer) {
+    if (value.getPrior() == null) {
+      output.writeNull();
+    } else {
+      writer.accept(output, value.getPrior());
+    }
+    if (value.getUpdated() == null) {
+      output.writeNull();
+    } else {
+      writer.accept(output, value.getUpdated());
+    }
+    if (!value.isCleared()) {
+      output.writeNull();
+    } else {
+      output.writeInt(1);
+    }
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogLayer.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogLayer.java
new file mode 100644
index 00000000000..7d61e501266
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogLayer.java
@@ -0,0 +1,267 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.bonsai.trielog;
+
+import static com.google.common.base.Preconditions.checkState;
+
+import org.hyperledger.besu.datatypes.AccountValue;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.StorageSlotKey;
+import org.hyperledger.besu.ethereum.bonsai.BonsaiValue;
+import org.hyperledger.besu.plugin.services.trielogs.TrieLog;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.TreeMap;
+
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/**
+ * This class encapsulates the changes that are done to transition one block to the next. This
+ * includes serialization and deserialization tasks for storing this log to off-memory storage.
+ *
+ * <p>In this particular formulation only the "Leaves" are tracked Future layers may track patricia
+ * trie changes as well.
+ */
+@SuppressWarnings("unchecked")
+public class TrieLogLayer implements TrieLog {
+
+  protected Hash blockHash;
+  protected Optional<Long> blockNumber = Optional.empty();
+
+  Map<Address, BonsaiValue<AccountValue>> getAccounts() {
+    return accounts;
+  }
+
+  Map<Address, BonsaiValue<Bytes>> getCode() {
+    return code;
+  }
+
+  Map<Address, Map<StorageSlotKey, BonsaiValue<UInt256>>> getStorage() {
+    return storage;
+  }
+
+  protected final Map<Address, BonsaiValue<AccountValue>> accounts;
+  protected final Map<Address, BonsaiValue<Bytes>> code;
+  protected final Map<Address, Map<StorageSlotKey, BonsaiValue<UInt256>>> storage;
+  protected boolean frozen = false;
+
+  public TrieLogLayer() {
+    // TODO when tuweni fixes zero length byte comparison consider TreeMap
+    this.accounts = new HashMap<>();
+    this.code = new HashMap<>();
+    this.storage = new HashMap<>();
+  }
+
+  /** Locks the layer so no new changes can be added; */
+  @Override
+  public void freeze() {
+    frozen = true; // The code never bothered me anyway 🥶
+  }
+
+  @Override
+  public Hash getBlockHash() {
+    return blockHash;
+  }
+
+  public TrieLogLayer setBlockHash(final Hash blockHash) {
+    checkState(!frozen, "Layer is Frozen");
+    this.blockHash = blockHash;
+    return this;
+  }
+
+  @Override
+  public Optional<Long> getBlockNumber() {
+    return blockNumber;
+  }
+
+  public TrieLogLayer setBlockNumber(final long blockNumber) {
+    checkState(!frozen, "Layer is Frozen");
+    this.blockNumber = Optional.of(blockNumber);
+    return this;
+  }
+
+  public TrieLogLayer addAccountChange(
+      final Address address, final AccountValue oldValue, final AccountValue newValue) {
+    checkState(!frozen, "Layer is Frozen");
+    accounts.put(address, new BonsaiValue<>(oldValue, newValue));
+    return this;
+  }
+
+  public TrieLogLayer addCodeChange(
+      final Address address, final Bytes oldValue, final Bytes newValue, final Hash blockHash) {
+    checkState(!frozen, "Layer is Frozen");
+    code.put(address, new BonsaiValue<>(oldValue, newValue, newValue == null));
+    return this;
+  }
+
+  public TrieLogLayer addStorageChange(
+      final Address address,
+      final StorageSlotKey slot,
+      final UInt256 oldValue,
+      final UInt256 newValue) {
+    checkState(!frozen, "Layer is Frozen");
+    storage
+        .computeIfAbsent(address, a -> new TreeMap<>())
+        .put(slot, new BonsaiValue<>(oldValue, newValue));
+    return this;
+  }
+
+  @Override
+  public Map<Address, BonsaiValue<AccountValue>> getAccountChanges() {
+    return accounts;
+  }
+
+  @Override
+  public Map<Address, BonsaiValue<Bytes>> getCodeChanges() {
+    return code;
+  }
+
+  @Override
+  public Map<Address, Map<StorageSlotKey, BonsaiValue<UInt256>>> getStorageChanges() {
+    return storage;
+  }
+
+  public boolean hasStorageChanges(final Address address) {
+    return storage.containsKey(address);
+  }
+
+  @Override
+  public Map<StorageSlotKey, BonsaiValue<UInt256>> getStorageChanges(final Address address) {
+    return storage.getOrDefault(address, Map.of());
+  }
+
+  @Override
+  public Optional<Bytes> getPriorCode(final Address address) {
+    return Optional.ofNullable(code.get(address)).map(BonsaiValue::getPrior);
+  }
+
+  @Override
+  public Optional<Bytes> getCode(final Address address) {
+    return Optional.ofNullable(code.get(address)).map(BonsaiValue::getUpdated);
+  }
+
+  @Override
+  public Optional<UInt256> getPriorStorageByStorageSlotKey(
+      final Address address, final StorageSlotKey storageSlotKey) {
+    return Optional.ofNullable(storage.get(address))
+        .map(i -> i.get(storageSlotKey))
+        .map(BonsaiValue::getPrior);
+  }
+
+  @Override
+  public Optional<UInt256> getStorageByStorageSlotKey(
+      final Address address, final StorageSlotKey storageSlotKey) {
+    return Optional.ofNullable(storage.get(address))
+        .map(i -> i.get(storageSlotKey))
+        .map(BonsaiValue::getUpdated);
+  }
+
+  @Override
+  public Optional<AccountValue> getPriorAccount(final Address address) {
+    return Optional.ofNullable(accounts.get(address)).map(BonsaiValue::getPrior);
+  }
+
+  @Override
+  public Optional<AccountValue> getAccount(final Address address) {
+    return Optional.ofNullable(accounts.get(address)).map(BonsaiValue::getUpdated);
+  }
+
+  public String dump() {
+    final StringBuilder sb = new StringBuilder();
+    sb.append("TrieLog{" + "blockHash=").append(blockHash).append(frozen).append('}');
+    sb.append("accounts\n");
+    for (final Map.Entry<Address, BonsaiValue<AccountValue>> account : accounts.entrySet()) {
+      sb.append(" : ").append(account.getKey()).append("\n");
+      if (Objects.equals(account.getValue().getPrior(), account.getValue().getUpdated())) {
+        sb.append("   = ").append(account.getValue().getUpdated()).append("\n");
+      } else {
+        sb.append("   - ").append(account.getValue().getPrior()).append("\n");
+        sb.append("   + ").append(account.getValue().getUpdated()).append("\n");
+      }
+    }
+    sb.append("code").append("\n");
+    for (final Map.Entry<Address, BonsaiValue<Bytes>> code : code.entrySet()) {
+      sb.append(" : ").append(code.getKey()).append("\n");
+      if (Objects.equals(code.getValue().getPrior(), code.getValue().getUpdated())) {
+        sb.append("   = ").append(code.getValue().getPrior()).append("\n");
+      } else {
+        sb.append("   - ").append(code.getValue().getPrior()).append("\n");
+        sb.append("   + ").append(code.getValue().getUpdated()).append("\n");
+      }
+    }
+    sb.append("Storage").append("\n");
+    for (final Map.Entry<Address, Map<StorageSlotKey, BonsaiValue<UInt256>>> storage :
+        storage.entrySet()) {
+      sb.append(" : ").append(storage.getKey()).append("\n");
+      for (final Map.Entry<StorageSlotKey, BonsaiValue<UInt256>> slot :
+          storage.getValue().entrySet()) {
+        final UInt256 originalValue = slot.getValue().getPrior();
+        final UInt256 updatedValue = slot.getValue().getUpdated();
+        sb.append("   : ").append(slot.getKey()).append("\n");
+        if (Objects.equals(originalValue, updatedValue)) {
+          sb.append("     = ")
+              .append((originalValue == null) ? "null" : originalValue.toShortHexString())
+              .append("\n");
+        } else {
+          sb.append("     - ")
+              .append((originalValue == null) ? "null" : originalValue.toShortHexString())
+              .append("\n");
+          sb.append("     + ")
+              .append((updatedValue == null) ? "null" : updatedValue.toShortHexString())
+              .append("\n");
+        }
+      }
+    }
+    return sb.toString();
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    TrieLogLayer that = (TrieLogLayer) o;
+    return new EqualsBuilder()
+        .append(frozen, that.frozen)
+        .append(blockHash, that.blockHash)
+        .append(accounts, that.accounts)
+        .append(code, that.code)
+        .append(storage, that.storage)
+        .isEquals();
+  }
+
+  @Override
+  public int hashCode() {
+    return new HashCodeBuilder(17, 37)
+        .append(blockHash)
+        .append(frozen)
+        .append(accounts)
+        .append(code)
+        .append(storage)
+        .toHashCode();
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogManager.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogManager.java
new file mode 100644
index 00000000000..5da83180a1c
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogManager.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.bonsai.trielog;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.bonsai.worldview.BonsaiWorldState;
+import org.hyperledger.besu.ethereum.bonsai.worldview.BonsaiWorldStateUpdateAccumulator;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.plugin.services.trielogs.TrieLog;
+import org.hyperledger.besu.plugin.services.trielogs.TrieLogEvent;
+
+import java.util.Optional;
+import java.util.function.Function;
+
+public interface TrieLogManager {
+
+  void saveTrieLog(
+      final BonsaiWorldStateUpdateAccumulator localUpdater,
+      final Hash forWorldStateRootHash,
+      final BlockHeader forBlockHeader,
+      final BonsaiWorldState forWorldState);
+
+  void addCachedLayer(
+      BlockHeader blockHeader, Hash worldStateRootHash, BonsaiWorldState forWorldState);
+
+  boolean containWorldStateStorage(final Hash blockHash);
+
+  Optional<BonsaiWorldState> getWorldState(final Hash blockHash);
+
+  Optional<BonsaiWorldState> getNearestWorldState(final BlockHeader blockHeader);
+
+  Optional<BonsaiWorldState> getHeadWorldState(
+      final Function<Hash, Optional<BlockHeader>> hashBlockHeaderFunction);
+
+  long getMaxLayersToLoad();
+
+  void reset();
+
+  Optional<? extends TrieLog> getTrieLogLayer(final Hash blockHash);
+
+  long subscribe(final TrieLogEvent.TrieLogObserver sub);
+
+  void unsubscribe(final long id);
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/worldview/BonsaiWorldState.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/worldview/BonsaiWorldState.java
new file mode 100644
index 00000000000..d3f14e8e72e
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/worldview/BonsaiWorldState.java
@@ -0,0 +1,579 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.bonsai.worldview;
+
+import static org.hyperledger.besu.ethereum.bonsai.BonsaiAccount.fromRLP;
+import static org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage.WORLD_BLOCK_HASH_KEY;
+import static org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage.WORLD_ROOT_HASH_KEY;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.StorageSlotKey;
+import org.hyperledger.besu.ethereum.bonsai.BonsaiAccount;
+import org.hyperledger.besu.ethereum.bonsai.BonsaiValue;
+import org.hyperledger.besu.ethereum.bonsai.BonsaiWorldStateProvider;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiSnapshotWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage.BonsaiStorageSubscriber;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateLayerStorage;
+import org.hyperledger.besu.ethereum.bonsai.trielog.TrieLogManager;
+import org.hyperledger.besu.ethereum.bonsai.worldview.BonsaiWorldStateUpdateAccumulator.StorageConsumingMap;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.MerkleTrieException;
+import org.hyperledger.besu.ethereum.trie.NodeLoader;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+import org.hyperledger.besu.plugin.services.exception.StorageException;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+import javax.annotation.Nonnull;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class BonsaiWorldState
+    implements MutableWorldState, BonsaiWorldView, BonsaiStorageSubscriber {
+
+  private static final Logger LOG = LoggerFactory.getLogger(BonsaiWorldState.class);
+
+  public BonsaiWorldStateKeyValueStorage worldStateStorage;
+
+  private final BonsaiWorldStateProvider archive;
+  private final BonsaiWorldStateUpdateAccumulator accumulator;
+
+  public Hash worldStateRootHash;
+  public Hash worldStateBlockHash;
+
+  private boolean isFrozen;
+
+  public BonsaiWorldState(
+      final BonsaiWorldStateProvider archive,
+      final BonsaiWorldStateKeyValueStorage worldStateStorage) {
+    this.archive = archive;
+    this.worldStateStorage = worldStateStorage;
+    worldStateRootHash =
+        Hash.wrap(
+            Bytes32.wrap(worldStateStorage.getWorldStateRootHash().orElse(Hash.EMPTY_TRIE_HASH)));
+    worldStateBlockHash =
+        Hash.wrap(Bytes32.wrap(worldStateStorage.getWorldStateBlockHash().orElse(Hash.ZERO)));
+    accumulator =
+        new BonsaiWorldStateUpdateAccumulator(
+            this,
+            (addr, value) ->
+                archive
+                    .getCachedMerkleTrieLoader()
+                    .preLoadAccount(getWorldStateStorage(), worldStateRootHash, addr),
+            (addr, value) ->
+                archive
+                    .getCachedMerkleTrieLoader()
+                    .preLoadStorageSlot(getWorldStateStorage(), addr, value));
+  }
+
+  public BonsaiWorldState(
+      final BonsaiWorldStateProvider archive,
+      final BonsaiWorldStateKeyValueStorage worldStateStorage,
+      final BonsaiWorldStateUpdateAccumulator updater) {
+    this.archive = archive;
+    this.worldStateStorage = worldStateStorage;
+    this.worldStateRootHash =
+        Hash.wrap(
+            Bytes32.wrap(worldStateStorage.getWorldStateRootHash().orElse(Hash.EMPTY_TRIE_HASH)));
+    this.worldStateBlockHash =
+        Hash.wrap(Bytes32.wrap(worldStateStorage.getWorldStateBlockHash().orElse(Hash.ZERO)));
+    this.accumulator = updater;
+  }
+
+  public BonsaiWorldStateProvider getArchive() {
+    return archive;
+  }
+
+  @Override
+  public boolean isPersisted() {
+    return isPersisted(worldStateStorage);
+  }
+
+  private boolean isPersisted(final WorldStateStorage worldStateStorage) {
+    return !(worldStateStorage instanceof BonsaiSnapshotWorldStateKeyValueStorage);
+  }
+
+  @Override
+  public Optional<Bytes> getCode(@Nonnull final Address address, final Hash codeHash) {
+    return worldStateStorage.getCode(codeHash, Hash.hash(address));
+  }
+
+  /**
+   * Reset the worldState to this block header
+   *
+   * @param blockHeader block to use
+   */
+  public void resetWorldStateTo(final BlockHeader blockHeader) {
+    worldStateBlockHash = blockHeader.getBlockHash();
+    worldStateRootHash = blockHeader.getStateRoot();
+  }
+
+  @Override
+  public BonsaiWorldStateKeyValueStorage getWorldStateStorage() {
+    return worldStateStorage;
+  }
+
+  private Hash calculateRootHash(
+      final Optional<BonsaiWorldStateKeyValueStorage.BonsaiUpdater> maybeStateUpdater,
+      final BonsaiWorldStateUpdateAccumulator worldStateUpdater) {
+
+    clearStorage(maybeStateUpdater, worldStateUpdater);
+
+    // This must be done before updating the accounts so
+    // that we can get the storage state hash
+    Stream<Map.Entry<Address, StorageConsumingMap<StorageSlotKey, BonsaiValue<UInt256>>>>
+        storageStream = worldStateUpdater.getStorageToUpdate().entrySet().stream();
+    if (maybeStateUpdater.isEmpty()) {
+      storageStream =
+          storageStream
+              .parallel(); // if we are not updating the state updater we can use parallel stream
+    }
+    storageStream.forEach(
+        addressMapEntry ->
+            updateAccountStorageState(maybeStateUpdater, worldStateUpdater, addressMapEntry));
+
+    // Third update the code.  This has the side effect of ensuring a code hash is calculated.
+    updateCode(maybeStateUpdater, worldStateUpdater);
+
+    // next walk the account trie
+    final StoredMerklePatriciaTrie<Bytes, Bytes> accountTrie =
+        createTrie(
+            (location, hash) ->
+                archive
+                    .getCachedMerkleTrieLoader()
+                    .getAccountStateTrieNode(worldStateStorage, location, hash),
+            worldStateRootHash);
+
+    // for manicured tries and composting, collect branches here (not implemented)
+    updateTheAccounts(maybeStateUpdater, worldStateUpdater, accountTrie);
+
+    // TODO write to a cache and then generate a layer update from that and the
+    // DB tx updates.  Right now it is just DB updates.
+    maybeStateUpdater.ifPresent(
+        bonsaiUpdater -> {
+          accountTrie.commit(
+              (location, hash, value) ->
+                  writeTrieNode(bonsaiUpdater.getTrieBranchStorageTransaction(), location, value));
+        });
+    final Bytes32 rootHash = accountTrie.getRootHash();
+    return Hash.wrap(rootHash);
+  }
+
+  private void updateTheAccounts(
+      final Optional<BonsaiWorldStateKeyValueStorage.BonsaiUpdater> maybeStateUpdater,
+      final BonsaiWorldStateUpdateAccumulator worldStateUpdater,
+      final StoredMerklePatriciaTrie<Bytes, Bytes> accountTrie) {
+    for (final Map.Entry<Address, BonsaiValue<BonsaiAccount>> accountUpdate :
+        worldStateUpdater.getAccountsToUpdate().entrySet()) {
+      final Bytes accountKey = accountUpdate.getKey();
+      final BonsaiValue<BonsaiAccount> bonsaiValue = accountUpdate.getValue();
+      final BonsaiAccount updatedAccount = bonsaiValue.getUpdated();
+      try {
+        if (updatedAccount == null) {
+          final Hash addressHash = Hash.hash(accountKey);
+          accountTrie.remove(addressHash);
+          maybeStateUpdater.ifPresent(
+              bonsaiUpdater -> bonsaiUpdater.removeAccountInfoState(addressHash));
+        } else {
+          final Hash addressHash = updatedAccount.getAddressHash();
+          final Bytes accountValue = updatedAccount.serializeAccount();
+          maybeStateUpdater.ifPresent(
+              bonsaiUpdater ->
+                  bonsaiUpdater.putAccountInfoState(Hash.hash(accountKey), accountValue));
+          accountTrie.put(addressHash, accountValue);
+        }
+      } catch (MerkleTrieException e) {
+        // need to throw to trigger the heal
+        throw new MerkleTrieException(
+            e.getMessage(), Optional.of(Address.wrap(accountKey)), e.getHash(), e.getLocation());
+      }
+    }
+  }
+
+  private void updateCode(
+      final Optional<BonsaiWorldStateKeyValueStorage.BonsaiUpdater> maybeStateUpdater,
+      final BonsaiWorldStateUpdateAccumulator worldStateUpdater) {
+    maybeStateUpdater.ifPresent(
+        bonsaiUpdater -> {
+          for (final Map.Entry<Address, BonsaiValue<Bytes>> codeUpdate :
+              worldStateUpdater.getCodeToUpdate().entrySet()) {
+            final Bytes updatedCode = codeUpdate.getValue().getUpdated();
+            final Hash accountHash = Hash.hash(codeUpdate.getKey());
+            if (updatedCode == null || updatedCode.size() == 0) {
+              bonsaiUpdater.removeCode(accountHash);
+            } else {
+              bonsaiUpdater.putCode(accountHash, null, updatedCode);
+            }
+          }
+        });
+  }
+
+  private void updateAccountStorageState(
+      final Optional<BonsaiWorldStateKeyValueStorage.BonsaiUpdater> maybeStateUpdater,
+      final BonsaiWorldStateUpdateAccumulator worldStateUpdater,
+      final Map.Entry<Address, StorageConsumingMap<StorageSlotKey, BonsaiValue<UInt256>>>
+          storageAccountUpdate) {
+    final Address updatedAddress = storageAccountUpdate.getKey();
+    final Hash updatedAddressHash = Hash.hash(updatedAddress);
+    if (worldStateUpdater.getAccountsToUpdate().containsKey(updatedAddress)) {
+      final BonsaiValue<BonsaiAccount> accountValue =
+          worldStateUpdater.getAccountsToUpdate().get(updatedAddress);
+      final BonsaiAccount accountOriginal = accountValue.getPrior();
+      final Hash storageRoot =
+          (accountOriginal == null) ? Hash.EMPTY_TRIE_HASH : accountOriginal.getStorageRoot();
+      final StoredMerklePatriciaTrie<Bytes, Bytes> storageTrie =
+          createTrie(
+              (location, key) ->
+                  archive
+                      .getCachedMerkleTrieLoader()
+                      .getAccountStorageTrieNode(
+                          worldStateStorage, updatedAddressHash, location, key),
+              storageRoot);
+
+      // for manicured tries and composting, collect branches here (not implemented)
+      for (final Map.Entry<StorageSlotKey, BonsaiValue<UInt256>> storageUpdate :
+          storageAccountUpdate.getValue().entrySet()) {
+        final Hash slotHash = storageUpdate.getKey().getSlotHash();
+        final UInt256 updatedStorage = storageUpdate.getValue().getUpdated();
+        try {
+          if (updatedStorage == null || updatedStorage.equals(UInt256.ZERO)) {
+            maybeStateUpdater.ifPresent(
+                bonsaiUpdater ->
+                    bonsaiUpdater.removeStorageValueBySlotHash(updatedAddressHash, slotHash));
+            storageTrie.remove(slotHash);
+          } else {
+            maybeStateUpdater.ifPresent(
+                bonsaiUpdater ->
+                    bonsaiUpdater.putStorageValueBySlotHash(
+                        updatedAddressHash, slotHash, updatedStorage));
+            storageTrie.put(slotHash, BonsaiWorldView.encodeTrieValue(updatedStorage));
+          }
+        } catch (MerkleTrieException e) {
+          // need to throw to trigger the heal
+          throw new MerkleTrieException(
+              e.getMessage(),
+              Optional.of(Address.wrap(updatedAddress)),
+              e.getHash(),
+              e.getLocation());
+        }
+      }
+
+      final BonsaiAccount accountUpdated = accountValue.getUpdated();
+      if (accountUpdated != null) {
+        maybeStateUpdater.ifPresent(
+            bonsaiUpdater -> {
+              storageTrie.commit(
+                  (location, key, value) ->
+                      writeStorageTrieNode(
+                          bonsaiUpdater, updatedAddressHash, location, key, value));
+            });
+        final Hash newStorageRoot = Hash.wrap(storageTrie.getRootHash());
+        accountUpdated.setStorageRoot(newStorageRoot);
+      }
+    }
+    // for manicured tries and composting, trim and compost here
+  }
+
+  private void clearStorage(
+      final Optional<BonsaiWorldStateKeyValueStorage.BonsaiUpdater> maybeStateUpdater,
+      final BonsaiWorldStateUpdateAccumulator worldStateUpdater) {
+
+    maybeStateUpdater.ifPresent(
+        bonsaiUpdater -> {
+          for (final Address address : worldStateUpdater.getStorageToClear()) {
+            // because we are clearing persisted values we need the account root as persisted
+            final BonsaiAccount oldAccount =
+                worldStateStorage
+                    .getAccount(Hash.hash(address))
+                    .map(bytes -> fromRLP(BonsaiWorldState.this, address, bytes, true))
+                    .orElse(null);
+            if (oldAccount == null) {
+              // This is when an account is both created and deleted within the scope of the same
+              // block.  A not-uncommon DeFi bot pattern.
+              continue;
+            }
+            final Hash addressHash = Hash.hash(address);
+            final MerkleTrie<Bytes, Bytes> storageTrie =
+                createTrie(
+                    (location, key) -> getStorageTrieNode(addressHash, location, key),
+                    oldAccount.getStorageRoot());
+            try {
+              Map<Bytes32, Bytes> entriesToDelete = storageTrie.entriesFrom(Bytes32.ZERO, 256);
+              while (!entriesToDelete.isEmpty()) {
+                entriesToDelete
+                    .keySet()
+                    .forEach(
+                        k ->
+                            bonsaiUpdater.removeStorageValueBySlotHash(
+                                Hash.hash(address), Hash.wrap(k)));
+                entriesToDelete.keySet().forEach(storageTrie::remove);
+                if (entriesToDelete.size() == 256) {
+                  entriesToDelete = storageTrie.entriesFrom(Bytes32.ZERO, 256);
+                } else {
+                  break;
+                }
+              }
+            } catch (MerkleTrieException e) {
+              // need to throw to trigger the heal
+              throw new MerkleTrieException(
+                  e.getMessage(), Optional.of(Address.wrap(address)), e.getHash(), e.getLocation());
+            }
+          }
+        });
+  }
+
+  @Override
+  public void persist(final BlockHeader blockHeader) {
+    final Optional<BlockHeader> maybeBlockHeader = Optional.ofNullable(blockHeader);
+    LOG.atDebug()
+        .setMessage("Persist world state for block {}")
+        .addArgument(maybeBlockHeader)
+        .log();
+
+    final BonsaiWorldStateUpdateAccumulator localCopy = accumulator.copy();
+
+    boolean success = false;
+
+    final BonsaiWorldStateKeyValueStorage.BonsaiUpdater stateUpdater = worldStateStorage.updater();
+    Runnable saveTrieLog = () -> {};
+
+    try {
+      final Hash newWorldStateRootHash =
+          calculateRootHash(isFrozen ? Optional.empty() : Optional.of(stateUpdater), accumulator);
+      // if we are persisted with a block header, and the prior state is the parent
+      // then persist the TrieLog for that transition.
+      // If specified but not a direct descendant simply store the new block hash.
+      if (blockHeader != null) {
+        if (!newWorldStateRootHash.equals(blockHeader.getStateRoot())) {
+          throw new RuntimeException(
+              "World State Root does not match expected value, header "
+                  + blockHeader.getStateRoot().toHexString()
+                  + " calculated "
+                  + newWorldStateRootHash.toHexString());
+        }
+        saveTrieLog =
+            () -> {
+              final TrieLogManager trieLogManager = archive.getTrieLogManager();
+              trieLogManager.saveTrieLog(localCopy, newWorldStateRootHash, blockHeader, this);
+              // not save a frozen state in the cache
+              if (!isFrozen) {
+                trieLogManager.addCachedLayer(blockHeader, newWorldStateRootHash, this);
+              }
+            };
+
+        stateUpdater
+            .getTrieBranchStorageTransaction()
+            .put(WORLD_BLOCK_HASH_KEY, blockHeader.getHash().toArrayUnsafe());
+        worldStateBlockHash = blockHeader.getHash();
+      } else {
+        stateUpdater.getTrieBranchStorageTransaction().remove(WORLD_BLOCK_HASH_KEY);
+        worldStateBlockHash = null;
+      }
+
+      stateUpdater
+          .getTrieBranchStorageTransaction()
+          .put(WORLD_ROOT_HASH_KEY, newWorldStateRootHash.toArrayUnsafe());
+      worldStateRootHash = newWorldStateRootHash;
+      success = true;
+    } finally {
+      if (success) {
+        stateUpdater.commit();
+        accumulator.reset();
+        saveTrieLog.run();
+      } else {
+        stateUpdater.rollback();
+        accumulator.reset();
+      }
+    }
+  }
+
+  @Override
+  public WorldUpdater updater() {
+    return accumulator;
+  }
+
+  @Override
+  public Hash rootHash() {
+    if (isFrozen && accumulator.isAccumulatorStateChanged()) {
+      worldStateRootHash = calculateRootHash(Optional.empty(), accumulator.copy());
+      accumulator.resetAccumulatorStateChanged();
+    }
+    return Hash.wrap(worldStateRootHash);
+  }
+
+  static final KeyValueStorageTransaction noOpTx =
+      new KeyValueStorageTransaction() {
+
+        @Override
+        public void put(final byte[] key, final byte[] value) {
+          // no-op
+        }
+
+        @Override
+        public void remove(final byte[] key) {
+          // no-op
+        }
+
+        @Override
+        public void commit() throws StorageException {
+          // no-op
+        }
+
+        @Override
+        public void rollback() {
+          // no-op
+        }
+      };
+
+  @Override
+  public Hash frontierRootHash() {
+    return calculateRootHash(
+        Optional.of(
+            new BonsaiWorldStateKeyValueStorage.Updater(noOpTx, noOpTx, noOpTx, noOpTx, noOpTx)),
+        accumulator.copy());
+  }
+
+  public Hash blockHash() {
+    return worldStateBlockHash;
+  }
+
+  @Override
+  public Stream<StreamableAccount> streamAccounts(final Bytes32 startKeyHash, final int limit) {
+    throw new RuntimeException("Bonsai Tries do not provide account streaming.");
+  }
+
+  @Override
+  public Account get(final Address address) {
+    return worldStateStorage
+        .getAccount(Hash.hash(address))
+        .map(bytes -> fromRLP(accumulator, address, bytes, true))
+        .orElse(null);
+  }
+
+  protected Optional<Bytes> getAccountStateTrieNode(final Bytes location, final Bytes32 nodeHash) {
+    return worldStateStorage.getAccountStateTrieNode(location, nodeHash);
+  }
+
+  private void writeTrieNode(
+      final KeyValueStorageTransaction tx, final Bytes location, final Bytes value) {
+    tx.put(location.toArrayUnsafe(), value.toArrayUnsafe());
+  }
+
+  protected Optional<Bytes> getStorageTrieNode(
+      final Hash accountHash, final Bytes location, final Bytes32 nodeHash) {
+    return worldStateStorage.getAccountStorageTrieNode(accountHash, location, nodeHash);
+  }
+
+  private void writeStorageTrieNode(
+      final WorldStateStorage.Updater stateUpdater,
+      final Hash accountHash,
+      final Bytes location,
+      final Bytes32 nodeHash,
+      final Bytes value) {
+    stateUpdater.putAccountStorageTrieNode(accountHash, location, nodeHash, value);
+  }
+
+  @Override
+  public UInt256 getStorageValue(final Address address, final UInt256 storageKey) {
+    return getStorageValueByStorageSlotKey(address, new StorageSlotKey(storageKey))
+        .orElse(UInt256.ZERO);
+  }
+
+  @Override
+  public Optional<UInt256> getStorageValueByStorageSlotKey(
+      final Address address, final StorageSlotKey storageSlotKey) {
+    return worldStateStorage
+        .getStorageValueByStorageSlotKey(Hash.hash(address), storageSlotKey)
+        .map(UInt256::fromBytes);
+  }
+
+  public Optional<UInt256> getStorageValueByStorageSlotKey(
+      final Supplier<Optional<Hash>> storageRootSupplier,
+      final Address address,
+      final StorageSlotKey storageSlotKey) {
+    return worldStateStorage
+        .getStorageValueByStorageSlotKey(storageRootSupplier, Hash.hash(address), storageSlotKey)
+        .map(UInt256::fromBytes);
+  }
+
+  @Override
+  public UInt256 getPriorStorageValue(final Address address, final UInt256 storageKey) {
+    return getStorageValue(address, storageKey);
+  }
+
+  @Override
+  public Map<Bytes32, Bytes> getAllAccountStorage(final Address address, final Hash rootHash) {
+    final StoredMerklePatriciaTrie<Bytes, Bytes> storageTrie =
+        createTrie(
+            (location, key) -> getStorageTrieNode(Hash.hash(address), location, key), rootHash);
+    return storageTrie.entriesFrom(Bytes32.ZERO, Integer.MAX_VALUE);
+  }
+
+  @Override
+  public MutableWorldState freeze() {
+    this.isFrozen = true;
+    this.worldStateStorage = new BonsaiWorldStateLayerStorage(worldStateStorage);
+    return this;
+  }
+
+  private StoredMerklePatriciaTrie<Bytes, Bytes> createTrie(
+      final NodeLoader nodeLoader, final Bytes32 rootHash) {
+    return new StoredMerklePatriciaTrie<>(
+        nodeLoader, rootHash, Function.identity(), Function.identity());
+  }
+
+  @Override
+  public void close() {
+    try {
+      if (!isPersisted()) {
+        this.worldStateStorage.close();
+        if (isFrozen) {
+          closeFrozenStorage();
+        }
+      }
+    } catch (Exception e) {
+      // no op
+    }
+  }
+
+  private void closeFrozenStorage() {
+    try {
+      final BonsaiWorldStateLayerStorage worldStateLayerStorage =
+          (BonsaiWorldStateLayerStorage) worldStateStorage;
+      if (!isPersisted(worldStateLayerStorage.getParentWorldStateStorage())) {
+        worldStateLayerStorage.getParentWorldStateStorage().close();
+      }
+    } catch (Exception e) {
+      // no op
+    }
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/worldview/BonsaiWorldStateUpdateAccumulator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/worldview/BonsaiWorldStateUpdateAccumulator.java
new file mode 100644
index 00000000000..24ae04037bb
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/worldview/BonsaiWorldStateUpdateAccumulator.java
@@ -0,0 +1,833 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.bonsai.worldview;
+
+import org.hyperledger.besu.datatypes.AccountValue;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.StorageSlotKey;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.bonsai.BonsaiAccount;
+import org.hyperledger.besu.ethereum.bonsai.BonsaiValue;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.trie.MerkleTrieException;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.account.EvmAccount;
+import org.hyperledger.besu.evm.worldstate.AbstractWorldUpdater;
+import org.hyperledger.besu.evm.worldstate.UpdateTrackingAccount;
+import org.hyperledger.besu.evm.worldstate.WrappedEvmAccount;
+import org.hyperledger.besu.plugin.services.trielogs.TrieLog;
+import org.hyperledger.besu.plugin.services.trielogs.TrieLogAccumulator;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+
+import com.google.common.collect.ForwardingMap;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class BonsaiWorldStateUpdateAccumulator
+    extends AbstractWorldUpdater<BonsaiWorldView, BonsaiAccount>
+    implements BonsaiWorldView, TrieLogAccumulator {
+  private static final Logger LOG =
+      LoggerFactory.getLogger(BonsaiWorldStateUpdateAccumulator.class);
+  private final Consumer<BonsaiValue<BonsaiAccount>> accountPreloader;
+  private final Consumer<StorageSlotKey> storagePreloader;
+
+  private final AccountConsumingMap<BonsaiValue<BonsaiAccount>> accountsToUpdate;
+  private final Map<Address, BonsaiValue<Bytes>> codeToUpdate = new ConcurrentHashMap<>();
+  private final Set<Address> storageToClear = Collections.synchronizedSet(new HashSet<>());
+
+  // storage sub mapped by _hashed_ key.  This is because in self_destruct calls we need to
+  // enumerate the old storage and delete it.  Those are trie stored by hashed key by spec and the
+  // alternative was to keep a giant pre-image cache of the entire trie.
+  private final Map<Address, StorageConsumingMap<StorageSlotKey, BonsaiValue<UInt256>>>
+      storageToUpdate = new ConcurrentHashMap<>();
+
+  private boolean isAccumulatorStateChanged;
+
+  public BonsaiWorldStateUpdateAccumulator(
+      final BonsaiWorldView world,
+      final Consumer<BonsaiValue<BonsaiAccount>> accountPreloader,
+      final Consumer<StorageSlotKey> storagePreloader) {
+    super(world);
+    this.accountsToUpdate = new AccountConsumingMap<>(new ConcurrentHashMap<>(), accountPreloader);
+    this.accountPreloader = accountPreloader;
+    this.storagePreloader = storagePreloader;
+    this.isAccumulatorStateChanged = false;
+  }
+
+  public BonsaiWorldStateUpdateAccumulator copy() {
+    final BonsaiWorldStateUpdateAccumulator copy =
+        new BonsaiWorldStateUpdateAccumulator(
+            wrappedWorldView(), accountPreloader, storagePreloader);
+    copy.cloneFromUpdater(this);
+    return copy;
+  }
+
+  void cloneFromUpdater(final BonsaiWorldStateUpdateAccumulator source) {
+    accountsToUpdate.putAll(source.getAccountsToUpdate());
+    codeToUpdate.putAll(source.codeToUpdate);
+    storageToClear.addAll(source.storageToClear);
+    storageToUpdate.putAll(source.storageToUpdate);
+    updatedAccounts.putAll(source.updatedAccounts);
+    deletedAccounts.addAll(source.deletedAccounts);
+    this.isAccumulatorStateChanged = true;
+  }
+
+  @Override
+  public Account get(final Address address) {
+    return super.get(address);
+  }
+
+  @Override
+  protected UpdateTrackingAccount<BonsaiAccount> track(
+      final UpdateTrackingAccount<BonsaiAccount> account) {
+    return super.track(account);
+  }
+
+  @Override
+  public EvmAccount getAccount(final Address address) {
+    return super.getAccount(address);
+  }
+
+  @Override
+  public EvmAccount createAccount(final Address address, final long nonce, final Wei balance) {
+    BonsaiValue<BonsaiAccount> bonsaiValue = accountsToUpdate.get(address);
+
+    if (bonsaiValue == null) {
+      bonsaiValue = new BonsaiValue<>(null, null);
+      accountsToUpdate.put(address, bonsaiValue);
+    } else if (bonsaiValue.getUpdated() != null) {
+      throw new IllegalStateException("Cannot create an account when one already exists");
+    }
+
+    final BonsaiAccount newAccount =
+        new BonsaiAccount(
+            this,
+            address,
+            Hash.hash(address),
+            nonce,
+            balance,
+            Hash.EMPTY_TRIE_HASH,
+            Hash.EMPTY,
+            true);
+    bonsaiValue.setUpdated(newAccount);
+    return new WrappedEvmAccount(track(new UpdateTrackingAccount<>(newAccount)));
+  }
+
+  @Override
+  public Map<Address, BonsaiValue<BonsaiAccount>> getAccountsToUpdate() {
+    return accountsToUpdate;
+  }
+
+  @Override
+  public Map<Address, BonsaiValue<Bytes>> getCodeToUpdate() {
+    return codeToUpdate;
+  }
+
+  public Set<Address> getStorageToClear() {
+    return storageToClear;
+  }
+
+  @Override
+  public Map<Address, StorageConsumingMap<StorageSlotKey, BonsaiValue<UInt256>>>
+      getStorageToUpdate() {
+    return storageToUpdate;
+  }
+
+  @Override
+  protected BonsaiAccount getForMutation(final Address address) {
+    return loadAccount(address, BonsaiValue::getUpdated);
+  }
+
+  protected BonsaiAccount loadAccount(
+      final Address address,
+      final Function<BonsaiValue<BonsaiAccount>, BonsaiAccount> bonsaiAccountFunction) {
+    try {
+      final BonsaiValue<BonsaiAccount> bonsaiValue = accountsToUpdate.get(address);
+      if (bonsaiValue == null) {
+        final Account account;
+        if (wrappedWorldView() instanceof BonsaiWorldStateUpdateAccumulator) {
+          account =
+              ((BonsaiWorldStateUpdateAccumulator) wrappedWorldView())
+                  .loadAccount(address, bonsaiAccountFunction);
+        } else {
+          account = wrappedWorldView().get(address);
+        }
+        BonsaiAccount mutableAccount = null;
+        if (account instanceof BonsaiAccount) {
+          mutableAccount = new BonsaiAccount((BonsaiAccount) account, this, true);
+          accountsToUpdate.put(address, new BonsaiValue<>((BonsaiAccount) account, mutableAccount));
+          return mutableAccount;
+        } else {
+          // add the empty read in accountsToUpdate
+          accountsToUpdate.put(address, new BonsaiValue<>(null, null));
+          return null;
+        }
+      } else {
+        return bonsaiAccountFunction.apply(bonsaiValue);
+      }
+    } catch (MerkleTrieException e) {
+      // need to throw to trigger the heal
+      throw new MerkleTrieException(
+          e.getMessage(), Optional.of(address), e.getHash(), e.getLocation());
+    }
+  }
+
+  @Override
+  public Collection<? extends Account> getTouchedAccounts() {
+    return getUpdatedAccounts();
+  }
+
+  @Override
+  public Collection<Address> getDeletedAccountAddresses() {
+    return getDeletedAccounts();
+  }
+
+  @Override
+  public void revert() {
+    super.reset();
+  }
+
+  @Override
+  public void commit() {
+    this.isAccumulatorStateChanged = true;
+    for (final Address deletedAddress : getDeletedAccounts()) {
+      final BonsaiValue<BonsaiAccount> accountValue =
+          accountsToUpdate.computeIfAbsent(
+              deletedAddress,
+              __ -> loadAccountFromParent(deletedAddress, new BonsaiValue<>(null, null, true)));
+      storageToClear.add(deletedAddress);
+      final BonsaiValue<Bytes> codeValue = codeToUpdate.get(deletedAddress);
+      if (codeValue != null) {
+        codeValue.setUpdated(null).setCleared();
+      } else {
+        wrappedWorldView()
+            .getCode(
+                deletedAddress,
+                Optional.ofNullable(accountValue)
+                    .map(BonsaiValue::getPrior)
+                    .map(BonsaiAccount::getCodeHash)
+                    .orElse(Hash.EMPTY))
+            .ifPresent(
+                deletedCode ->
+                    codeToUpdate.put(deletedAddress, new BonsaiValue<>(deletedCode, null, true)));
+      }
+
+      // mark all updated storage as to be cleared
+      final Map<StorageSlotKey, BonsaiValue<UInt256>> deletedStorageUpdates =
+          storageToUpdate.computeIfAbsent(
+              deletedAddress,
+              k ->
+                  new StorageConsumingMap<>(
+                      deletedAddress, new ConcurrentHashMap<>(), storagePreloader));
+      final Iterator<Map.Entry<StorageSlotKey, BonsaiValue<UInt256>>> iter =
+          deletedStorageUpdates.entrySet().iterator();
+      while (iter.hasNext()) {
+        final Map.Entry<StorageSlotKey, BonsaiValue<UInt256>> updateEntry = iter.next();
+        final BonsaiValue<UInt256> updatedSlot = updateEntry.getValue();
+        if (updatedSlot.getPrior() == null || updatedSlot.getPrior().isZero()) {
+          iter.remove();
+        } else {
+          updatedSlot.setUpdated(null).setCleared();
+        }
+      }
+
+      final BonsaiAccount originalValue = accountValue.getPrior();
+      if (originalValue != null) {
+        // Enumerate and delete addresses not updated
+        wrappedWorldView()
+            .getAllAccountStorage(deletedAddress, originalValue.getStorageRoot())
+            .forEach(
+                (keyHash, entryValue) -> {
+                  final StorageSlotKey storageSlotKey =
+                      new StorageSlotKey(Hash.wrap(keyHash), Optional.empty());
+                  if (!deletedStorageUpdates.containsKey(storageSlotKey)) {
+                    final UInt256 value = UInt256.fromBytes(RLP.decodeOne(entryValue));
+                    deletedStorageUpdates.put(storageSlotKey, new BonsaiValue<>(value, null, true));
+                  }
+                });
+      }
+      if (deletedStorageUpdates.isEmpty()) {
+        storageToUpdate.remove(deletedAddress);
+      }
+      accountValue.setUpdated(null);
+    }
+
+    getUpdatedAccounts().parallelStream()
+        .forEach(
+            tracked -> {
+              final Address updatedAddress = tracked.getAddress();
+              final BonsaiAccount updatedAccount;
+              final BonsaiValue<BonsaiAccount> updatedAccountValue =
+                  accountsToUpdate.get(updatedAddress);
+              if (tracked.getWrappedAccount() == null) {
+                updatedAccount = new BonsaiAccount(this, tracked);
+                tracked.setWrappedAccount(updatedAccount);
+                if (updatedAccountValue == null) {
+                  accountsToUpdate.put(updatedAddress, new BonsaiValue<>(null, updatedAccount));
+                  codeToUpdate.put(
+                      updatedAddress, new BonsaiValue<>(null, updatedAccount.getCode()));
+                } else {
+                  updatedAccountValue.setUpdated(updatedAccount);
+                }
+              } else {
+                updatedAccount = tracked.getWrappedAccount();
+                updatedAccount.setBalance(tracked.getBalance());
+                updatedAccount.setNonce(tracked.getNonce());
+                if (tracked.codeWasUpdated()) {
+                  updatedAccount.setCode(tracked.getCode());
+                }
+                if (tracked.getStorageWasCleared()) {
+                  updatedAccount.clearStorage();
+                }
+                tracked.getUpdatedStorage().forEach(updatedAccount::setStorageValue);
+              }
+
+              if (tracked.codeWasUpdated()) {
+                final BonsaiValue<Bytes> pendingCode =
+                    codeToUpdate.computeIfAbsent(
+                        updatedAddress,
+                        addr ->
+                            new BonsaiValue<>(
+                                wrappedWorldView()
+                                    .getCode(
+                                        addr,
+                                        Optional.ofNullable(updatedAccountValue)
+                                            .map(BonsaiValue::getPrior)
+                                            .map(BonsaiAccount::getCodeHash)
+                                            .orElse(Hash.EMPTY))
+                                    .orElse(null),
+                                null));
+                pendingCode.setUpdated(updatedAccount.getCode());
+              }
+
+              // This is especially to avoid unnecessary computation for withdrawals
+              if (updatedAccount.getUpdatedStorage().isEmpty()) {
+                return;
+              }
+
+              final StorageConsumingMap<StorageSlotKey, BonsaiValue<UInt256>>
+                  pendingStorageUpdates =
+                      storageToUpdate.computeIfAbsent(
+                          updatedAddress,
+                          __ ->
+                              new StorageConsumingMap<>(
+                                  updatedAddress, new ConcurrentHashMap<>(), storagePreloader));
+
+              if (tracked.getStorageWasCleared()) {
+                storageToClear.add(updatedAddress);
+                pendingStorageUpdates.clear();
+              }
+
+              final TreeSet<Map.Entry<UInt256, UInt256>> entries =
+                  new TreeSet<>(Map.Entry.comparingByKey());
+              entries.addAll(updatedAccount.getUpdatedStorage().entrySet());
+
+              // parallel stream here may cause database corruption
+              entries.forEach(
+                  storageUpdate -> {
+                    final UInt256 keyUInt = storageUpdate.getKey();
+                    final Hash slotHash = Hash.hash(keyUInt);
+                    final StorageSlotKey slotKey =
+                        new StorageSlotKey(slotHash, Optional.of(keyUInt));
+                    final UInt256 value = storageUpdate.getValue();
+                    final BonsaiValue<UInt256> pendingValue = pendingStorageUpdates.get(slotKey);
+                    if (pendingValue == null) {
+                      pendingStorageUpdates.put(
+                          slotKey,
+                          new BonsaiValue<>(
+                              updatedAccount.getOriginalStorageValue(keyUInt), value));
+                    } else {
+                      pendingValue.setUpdated(value);
+                    }
+                  });
+
+              updatedAccount.getUpdatedStorage().clear();
+
+              if (pendingStorageUpdates.isEmpty()) {
+                storageToUpdate.remove(updatedAddress);
+              }
+
+              if (tracked.getStorageWasCleared()) {
+                tracked.setStorageWasCleared(false); // storage already cleared for this transaction
+              }
+            });
+  }
+
+  @Override
+  public Optional<Bytes> getCode(final Address address, final Hash codeHash) {
+    final BonsaiValue<Bytes> localCode = codeToUpdate.get(address);
+    if (localCode == null) {
+      final Optional<Bytes> code = wrappedWorldView().getCode(address, codeHash);
+      if (code.isEmpty() && !codeHash.equals(Hash.EMPTY)) {
+        throw new MerkleTrieException(
+            "invalid account code", Optional.of(address), codeHash, Bytes.EMPTY);
+      }
+      return code;
+    } else {
+      return Optional.ofNullable(localCode.getUpdated());
+    }
+  }
+
+  @Override
+  public UInt256 getStorageValue(final Address address, final UInt256 slotKey) {
+    StorageSlotKey storageSlotKey = new StorageSlotKey(Hash.hash(slotKey), Optional.of(slotKey));
+    return getStorageValueByStorageSlotKey(address, storageSlotKey).orElse(UInt256.ZERO);
+  }
+
+  @Override
+  public Optional<UInt256> getStorageValueByStorageSlotKey(
+      final Address address, final StorageSlotKey storageSlotKey) {
+    final Map<StorageSlotKey, BonsaiValue<UInt256>> localAccountStorage =
+        storageToUpdate.get(address);
+    if (localAccountStorage != null) {
+      final BonsaiValue<UInt256> value = localAccountStorage.get(storageSlotKey);
+      if (value != null) {
+        return Optional.ofNullable(value.getUpdated());
+      }
+    }
+    try {
+      final Optional<UInt256> valueUInt =
+          (wrappedWorldView() instanceof BonsaiWorldState)
+              ? ((BonsaiWorldState) wrappedWorldView())
+                  .getStorageValueByStorageSlotKey(
+                      () ->
+                          Optional.ofNullable(loadAccount(address, BonsaiValue::getPrior))
+                              .map(BonsaiAccount::getStorageRoot),
+                      address,
+                      storageSlotKey)
+              : wrappedWorldView().getStorageValueByStorageSlotKey(address, storageSlotKey);
+      storageToUpdate
+          .computeIfAbsent(
+              address,
+              key ->
+                  new StorageConsumingMap<>(address, new ConcurrentHashMap<>(), storagePreloader))
+          .put(storageSlotKey, new BonsaiValue<>(valueUInt.orElse(null), valueUInt.orElse(null)));
+
+      return valueUInt;
+    } catch (MerkleTrieException e) {
+      // need to throw to trigger the heal
+      throw new MerkleTrieException(
+          e.getMessage(), Optional.of(address), e.getHash(), e.getLocation());
+    }
+  }
+
+  @Override
+  public UInt256 getPriorStorageValue(final Address address, final UInt256 storageKey) {
+    // TODO maybe log the read into the trie layer?
+    StorageSlotKey storageSlotKey =
+        new StorageSlotKey(Hash.hash(storageKey), Optional.of(storageKey));
+    final Map<StorageSlotKey, BonsaiValue<UInt256>> localAccountStorage =
+        storageToUpdate.get(address);
+    if (localAccountStorage != null) {
+      final BonsaiValue<UInt256> value = localAccountStorage.get(storageSlotKey);
+      if (value != null) {
+        if (value.isCleared()) {
+          return UInt256.ZERO;
+        }
+        final UInt256 updated = value.getUpdated();
+        if (updated != null) {
+          return updated;
+        }
+        final UInt256 original = value.getPrior();
+        if (original != null) {
+          return original;
+        }
+      }
+    }
+    if (storageToClear.contains(address)) {
+      return UInt256.ZERO;
+    }
+    return getStorageValue(address, storageKey);
+  }
+
+  @Override
+  public Map<Bytes32, Bytes> getAllAccountStorage(final Address address, final Hash rootHash) {
+    final Map<Bytes32, Bytes> results = wrappedWorldView().getAllAccountStorage(address, rootHash);
+    final StorageConsumingMap<StorageSlotKey, BonsaiValue<UInt256>> bonsaiValueStorage =
+        storageToUpdate.get(address);
+    if (bonsaiValueStorage != null) {
+      // hash the key to match the implied storage interface of hashed slotKey
+      bonsaiValueStorage.forEach(
+          (key, value) -> results.put(key.getSlotHash(), value.getUpdated()));
+    }
+    return results;
+  }
+
+  @Override
+  public boolean isPersisted() {
+    return true;
+  }
+
+  @Override
+  public BonsaiWorldStateKeyValueStorage getWorldStateStorage() {
+    return wrappedWorldView().getWorldStateStorage();
+  }
+
+  public void rollForward(final TrieLog layer) {
+    layer.getAccountChanges().entrySet().stream()
+        .forEach(
+            entry ->
+                rollAccountChange(
+                    entry.getKey(), entry.getValue().getPrior(), entry.getValue().getUpdated()));
+    layer.getCodeChanges().entrySet().stream()
+        .forEach(
+            entry ->
+                rollCodeChange(
+                    entry.getKey(), entry.getValue().getPrior(), entry.getValue().getUpdated()));
+    layer.getStorageChanges().entrySet().stream()
+        .forEach(
+            entry ->
+                entry
+                    .getValue()
+                    .forEach(
+                        (storageSlotKey, value) ->
+                            rollStorageChange(
+                                entry.getKey(),
+                                storageSlotKey,
+                                value.getPrior(),
+                                value.getUpdated())));
+  }
+
+  public void rollBack(final TrieLog layer) {
+    layer.getAccountChanges().entrySet().stream()
+        .forEach(
+            entry ->
+                rollAccountChange(
+                    entry.getKey(), entry.getValue().getUpdated(), entry.getValue().getPrior()));
+    layer.getCodeChanges().entrySet().stream()
+        .forEach(
+            entry ->
+                rollCodeChange(
+                    entry.getKey(), entry.getValue().getUpdated(), entry.getValue().getPrior()));
+    layer.getStorageChanges().entrySet().stream()
+        .forEach(
+            entry ->
+                entry
+                    .getValue()
+                    .forEach(
+                        (storageSlotKey, value) ->
+                            rollStorageChange(
+                                entry.getKey(),
+                                storageSlotKey,
+                                value.getUpdated(),
+                                value.getPrior())));
+  }
+
+  private void rollAccountChange(
+      final Address address,
+      final AccountValue expectedValue,
+      final AccountValue replacementValue) {
+    if (Objects.equals(expectedValue, replacementValue)) {
+      // non-change, a cached read.
+      return;
+    }
+    BonsaiValue<BonsaiAccount> accountValue = accountsToUpdate.get(address);
+    if (accountValue == null) {
+      accountValue = loadAccountFromParent(address, accountValue);
+    }
+    if (accountValue == null) {
+      if (expectedValue == null && replacementValue != null) {
+        accountsToUpdate.put(
+            address,
+            new BonsaiValue<>(null, new BonsaiAccount(this, address, replacementValue, true)));
+      } else {
+        throw new IllegalStateException(
+            String.format(
+                "Expected to update account, but the account does not exist. Address=%s", address));
+      }
+    } else {
+      if (expectedValue == null) {
+        if (accountValue.getUpdated() != null) {
+          throw new IllegalStateException(
+              String.format(
+                  "Expected to create account, but the account exists.  Address=%s", address));
+        }
+      } else {
+        BonsaiAccount.assertCloseEnoughForDiffing(
+            accountValue.getUpdated(),
+            expectedValue,
+            "Address=" + address + " Prior Value in Rolling Change");
+      }
+      if (replacementValue == null) {
+        if (accountValue.getPrior() == null) {
+          // TODO: should we remove from the parent accumulated change also?  only if it is a
+          // private copy
+          accountsToUpdate.remove(address);
+        } else {
+          accountValue.setUpdated(null);
+        }
+      } else {
+        accountValue.setUpdated(
+            new BonsaiAccount(wrappedWorldView(), address, replacementValue, true));
+      }
+    }
+  }
+
+  private BonsaiValue<BonsaiAccount> loadAccountFromParent(
+      final Address address, final BonsaiValue<BonsaiAccount> defaultValue) {
+    try {
+      final Account parentAccount = wrappedWorldView().get(address);
+      if (parentAccount instanceof BonsaiAccount) {
+        final BonsaiAccount account = (BonsaiAccount) parentAccount;
+        final BonsaiValue<BonsaiAccount> loadedAccountValue =
+            new BonsaiValue<>(new BonsaiAccount(account), account);
+        accountsToUpdate.put(address, loadedAccountValue);
+        return loadedAccountValue;
+      } else {
+        return defaultValue;
+      }
+    } catch (MerkleTrieException e) {
+      // need to throw to trigger the heal
+      throw new MerkleTrieException(
+          e.getMessage(), Optional.of(address), e.getHash(), e.getLocation());
+    }
+  }
+
+  private void rollCodeChange(
+      final Address address, final Bytes expectedCode, final Bytes replacementCode) {
+    if (Objects.equals(expectedCode, replacementCode)) {
+      // non-change, a cached read.
+      return;
+    }
+    BonsaiValue<Bytes> codeValue = codeToUpdate.get(address);
+    if (codeValue == null) {
+      final Bytes storedCode =
+          wrappedWorldView()
+              .getCode(
+                  address, Optional.ofNullable(expectedCode).map(Hash::hash).orElse(Hash.EMPTY))
+              .orElse(Bytes.EMPTY);
+      if (!storedCode.isEmpty()) {
+        codeValue = new BonsaiValue<>(storedCode, storedCode);
+        codeToUpdate.put(address, codeValue);
+      }
+    }
+
+    if (codeValue == null) {
+      if ((expectedCode == null || expectedCode.size() == 0) && replacementCode != null) {
+        codeToUpdate.put(address, new BonsaiValue<>(null, replacementCode));
+      } else {
+        throw new IllegalStateException(
+            String.format(
+                "Expected to update code, but the code does not exist.  Address=%s", address));
+      }
+    } else {
+      final Bytes existingCode = codeValue.getUpdated();
+      if ((expectedCode == null || expectedCode.isEmpty())
+          && existingCode != null
+          && !existingCode.isEmpty()) {
+        LOG.warn("At Address={}, expected to create code, but code exists. Overwriting.", address);
+      } else if (!Objects.equals(expectedCode, existingCode)) {
+        throw new IllegalStateException(
+            String.format(
+                "Old value of code does not match expected value.  Address=%s ExpectedHash=%s ActualHash=%s",
+                address,
+                expectedCode == null ? "null" : Hash.hash(expectedCode),
+                Hash.hash(codeValue.getUpdated())));
+      }
+      if (replacementCode == null && codeValue.getPrior() == null) {
+        codeToUpdate.remove(address);
+      } else {
+        codeValue.setUpdated(replacementCode);
+      }
+    }
+  }
+
+  private Map<StorageSlotKey, BonsaiValue<UInt256>> maybeCreateStorageMap(
+      final Map<StorageSlotKey, BonsaiValue<UInt256>> storageMap, final Address address) {
+    if (storageMap == null) {
+      final StorageConsumingMap<StorageSlotKey, BonsaiValue<UInt256>> newMap =
+          new StorageConsumingMap<>(address, new ConcurrentHashMap<>(), storagePreloader);
+      storageToUpdate.put(address, newMap);
+      return newMap;
+    } else {
+      return storageMap;
+    }
+  }
+
+  private void rollStorageChange(
+      final Address address,
+      final StorageSlotKey storageSlotKey,
+      final UInt256 expectedValue,
+      final UInt256 replacementValue) {
+    if (Objects.equals(expectedValue, replacementValue)) {
+      // non-change, a cached read.
+      return;
+    }
+    if (replacementValue == null && expectedValue != null && expectedValue.isZero()) {
+      // corner case on deletes, non-change
+      return;
+    }
+    final Map<StorageSlotKey, BonsaiValue<UInt256>> storageMap = storageToUpdate.get(address);
+    BonsaiValue<UInt256> slotValue = storageMap == null ? null : storageMap.get(storageSlotKey);
+    if (slotValue == null) {
+      final Optional<UInt256> storageValue =
+          wrappedWorldView().getStorageValueByStorageSlotKey(address, storageSlotKey);
+      if (storageValue.isPresent()) {
+        slotValue = new BonsaiValue<>(storageValue.get(), storageValue.get());
+        storageToUpdate
+            .computeIfAbsent(
+                address,
+                k ->
+                    new StorageConsumingMap<>(address, new ConcurrentHashMap<>(), storagePreloader))
+            .put(storageSlotKey, slotValue);
+      }
+    }
+    if (slotValue == null) {
+      if ((expectedValue == null || expectedValue.isZero()) && replacementValue != null) {
+        maybeCreateStorageMap(storageMap, address)
+            .put(storageSlotKey, new BonsaiValue<>(null, replacementValue));
+      } else {
+        throw new IllegalStateException(
+            String.format(
+                "Expected to update storage value, but the slot does not exist. Account=%s SlotKey=%s",
+                address, storageSlotKey));
+      }
+    } else {
+      final UInt256 existingSlotValue = slotValue.getUpdated();
+      if ((expectedValue == null || expectedValue.isZero())
+          && existingSlotValue != null
+          && !existingSlotValue.isZero()) {
+        throw new IllegalStateException(
+            String.format(
+                "Expected to create slot, but the slot exists. Account=%s SlotKey=%s expectedValue=%s existingValue=%s",
+                address, storageSlotKey, expectedValue, existingSlotValue));
+      }
+      if (!isSlotEquals(expectedValue, existingSlotValue)) {
+        throw new IllegalStateException(
+            String.format(
+                "Old value of slot does not match expected value. Account=%s SlotKey=%s Expected=%s Actual=%s",
+                address,
+                storageSlotKey,
+                expectedValue == null ? "null" : expectedValue.toShortHexString(),
+                existingSlotValue == null ? "null" : existingSlotValue.toShortHexString()));
+      }
+      if (replacementValue == null && slotValue.getPrior() == null) {
+        final Map<StorageSlotKey, BonsaiValue<UInt256>> thisStorageUpdate =
+            maybeCreateStorageMap(storageMap, address);
+        thisStorageUpdate.remove(storageSlotKey);
+        if (thisStorageUpdate.isEmpty()) {
+          storageToUpdate.remove(address);
+        }
+      } else {
+        slotValue.setUpdated(replacementValue);
+      }
+    }
+  }
+
+  private boolean isSlotEquals(final UInt256 expectedValue, final UInt256 existingSlotValue) {
+    final UInt256 sanitizedExpectedValue = (expectedValue == null) ? UInt256.ZERO : expectedValue;
+    final UInt256 sanitizedExistingSlotValue =
+        (existingSlotValue == null) ? UInt256.ZERO : existingSlotValue;
+    return Objects.equals(sanitizedExpectedValue, sanitizedExistingSlotValue);
+  }
+
+  public boolean isAccumulatorStateChanged() {
+    return isAccumulatorStateChanged;
+  }
+
+  public void resetAccumulatorStateChanged() {
+    isAccumulatorStateChanged = false;
+  }
+
+  @Override
+  public void reset() {
+    storageToClear.clear();
+    storageToUpdate.clear();
+    codeToUpdate.clear();
+    accountsToUpdate.clear();
+    resetAccumulatorStateChanged();
+    super.reset();
+  }
+
+  public static class AccountConsumingMap<T> extends ForwardingMap<Address, T> {
+
+    private final ConcurrentHashMap<Address, T> accounts;
+    private final Consumer<T> consumer;
+
+    public AccountConsumingMap(
+        final ConcurrentHashMap<Address, T> accounts, final Consumer<T> consumer) {
+      this.accounts = accounts;
+      this.consumer = consumer;
+    }
+
+    @Override
+    public T put(@NotNull final Address address, @NotNull final T value) {
+      consumer.process(address, value);
+      return accounts.put(address, value);
+    }
+
+    public Consumer<T> getConsumer() {
+      return consumer;
+    }
+
+    @Override
+    protected Map<Address, T> delegate() {
+      return accounts;
+    }
+  }
+
+  public static class StorageConsumingMap<K, T> extends ForwardingMap<K, T> {
+
+    private final Address address;
+
+    private final ConcurrentHashMap<K, T> storages;
+    private final Consumer<K> consumer;
+
+    public StorageConsumingMap(
+        final Address address, final ConcurrentHashMap<K, T> storages, final Consumer<K> consumer) {
+      this.address = address;
+      this.storages = storages;
+      this.consumer = consumer;
+    }
+
+    @Override
+    public T put(@NotNull final K slotKey, @NotNull final T value) {
+      consumer.process(address, slotKey);
+      return storages.put(slotKey, value);
+    }
+
+    public Consumer<K> getConsumer() {
+      return consumer;
+    }
+
+    @Override
+    protected Map<K, T> delegate() {
+      return storages;
+    }
+  }
+
+  public interface Consumer<T> {
+    void process(final Address address, T value);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/worldview/BonsaiWorldView.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/worldview/BonsaiWorldView.java
new file mode 100644
index 00000000000..7a307ec3f40
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/worldview/BonsaiWorldView.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.bonsai.worldview;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.StorageSlotKey;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+import org.hyperledger.besu.evm.worldstate.WorldView;
+
+import java.util.Map;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+
+public interface BonsaiWorldView extends WorldView {
+
+  Optional<Bytes> getCode(Address address, final Hash codeHash);
+
+  UInt256 getStorageValue(Address address, UInt256 key);
+
+  Optional<UInt256> getStorageValueByStorageSlotKey(Address address, StorageSlotKey storageSlotKey);
+
+  UInt256 getPriorStorageValue(Address address, UInt256 key);
+
+  /**
+   * Retrieve all the storage values of an account.
+   *
+   * @param address the account to stream
+   * @param rootHash the root hash of the account storage trie
+   * @return A map that is a copy of the entries. The key is the hashed slot number, and the value
+   *     is the Bytes representation of the storage value.
+   */
+  Map<Bytes32, Bytes> getAllAccountStorage(final Address address, final Hash rootHash);
+
+  static Bytes encodeTrieValue(final Bytes bytes) {
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    out.writeBytes(bytes.trimLeadingZeros());
+    return out.encoded();
+  }
+
+  boolean isPersisted();
+
+  BonsaiWorldStateKeyValueStorage getWorldStateStorage();
+
+  WorldUpdater updater();
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BadBlockManager.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BadBlockManager.java
index 50f0011a5d2..da7055b51c3 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BadBlockManager.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BadBlockManager.java
@@ -14,8 +14,11 @@
  */
 package org.hyperledger.besu.ethereum.chain;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.trie.MerkleTrieException;
+import org.hyperledger.besu.plugin.services.exception.StorageException;
 
 import java.util.Collection;
 import java.util.Optional;
@@ -27,18 +30,31 @@ public class BadBlockManager {
 
   private final Cache<Hash, Block> badBlocks =
       CacheBuilder.newBuilder().maximumSize(100).concurrencyLevel(1).build();
+  private final Cache<Hash, BlockHeader> badHeaders =
+      CacheBuilder.newBuilder().maximumSize(100).concurrencyLevel(1).build();
+  private final Cache<Hash, Hash> latestValidHashes =
+      CacheBuilder.newBuilder().maximumSize(100).concurrencyLevel(1).build();
 
   /**
    * Add a new invalid block.
    *
    * @param badBlock the invalid block
+   * @param cause optional exception causing the block to be considered invalid
    */
-  public void addBadBlock(final Block badBlock) {
+  public void addBadBlock(final Block badBlock, final Optional<Throwable> cause) {
     if (badBlock != null) {
-      this.badBlocks.put(badBlock.getHash(), badBlock);
+      if (cause.isEmpty() || !isInternalError(cause.get())) {
+        this.badBlocks.put(badBlock.getHash(), badBlock);
+      }
     }
   }
 
+  public void reset() {
+    this.badBlocks.invalidateAll();
+    this.badHeaders.invalidateAll();
+    this.latestValidHashes.invalidateAll();
+  }
+
   /**
    * Return all invalid blocks
    *
@@ -57,4 +73,28 @@ public Collection<Block> getBadBlocks() {
   public Optional<Block> getBadBlock(final Hash hash) {
     return Optional.ofNullable(badBlocks.getIfPresent(hash));
   }
+
+  public void addBadHeader(final BlockHeader header) {
+    badHeaders.put(header.getHash(), header);
+  }
+
+  public Optional<BlockHeader> getBadHash(final Hash blockHash) {
+    return Optional.ofNullable(badHeaders.getIfPresent(blockHash));
+  }
+
+  public void addLatestValidHash(final Hash blockHash, final Hash latestValidHash) {
+    this.latestValidHashes.put(blockHash, latestValidHash);
+  }
+
+  public Optional<Hash> getLatestValidHash(final Hash blockHash) {
+    return Optional.ofNullable(latestValidHashes.getIfPresent(blockHash));
+  }
+
+  private boolean isInternalError(final Throwable causedBy) {
+    // As new "internal only" types of exception are discovered, add them here.
+    if (causedBy instanceof StorageException || causedBy instanceof MerkleTrieException) {
+      return true;
+    }
+    return false;
+  }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BlockAddedEvent.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BlockAddedEvent.java
index 9dbb0e4f190..ae35fd7084e 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BlockAddedEvent.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BlockAddedEvent.java
@@ -14,8 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.chain;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
@@ -36,7 +36,8 @@ public class BlockAddedEvent {
   public enum EventType {
     HEAD_ADVANCED,
     FORK,
-    CHAIN_REORG
+    CHAIN_REORG,
+    STORED_ONLY
   }
 
   private BlockAddedEvent(
@@ -98,12 +99,23 @@ public static BlockAddedEvent createForFork(final Block block) {
         block.getHeader().getParentHash());
   }
 
+  public static BlockAddedEvent createForStoredOnly(final Block block) {
+    return new BlockAddedEvent(
+        EventType.STORED_ONLY,
+        block,
+        Collections.emptyList(),
+        Collections.emptyList(),
+        Collections.emptyList(),
+        Collections.emptyList(),
+        block.getHeader().getParentHash());
+  }
+
   public Block getBlock() {
     return block;
   }
 
   public boolean isNewCanonicalHead() {
-    return eventType != EventType.FORK;
+    return eventType == EventType.HEAD_ADVANCED || eventType == EventType.CHAIN_REORG;
   }
 
   public EventType getEventType() {
@@ -129,4 +141,24 @@ public List<LogWithMetadata> getLogsWithMetadata() {
   public Hash getCommonAncestorHash() {
     return commonAncestorHash;
   }
+
+  @Override
+  public String toString() {
+    return "BlockAddedEvent{"
+        + "eventType="
+        + eventType
+        + ", block="
+        + block.toLogString()
+        + ", commonAncestorHash="
+        + commonAncestorHash
+        + ", addedTransactions count="
+        + addedTransactions.size()
+        + ", removedTransactions count="
+        + removedTransactions.size()
+        + ", transactionReceipts count ="
+        + transactionReceipts.size()
+        + ", logsWithMetadata count="
+        + logsWithMetadata.size()
+        + '}';
+  }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BlockAddedObserver.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BlockAddedObserver.java
index 63a6ebbc644..75c299e3abf 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BlockAddedObserver.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BlockAddedObserver.java
@@ -17,4 +17,6 @@
 @FunctionalInterface
 public interface BlockAddedObserver {
   void onBlockAdded(BlockAddedEvent event);
+
+  default void removeObserver() {}
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/Blockchain.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/Blockchain.java
index 00f4ebd56f0..17a9a57743c 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/Blockchain.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/Blockchain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,15 +14,16 @@
  */
 package org.hyperledger.besu.ethereum.chain;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
@@ -36,6 +37,20 @@ public interface Blockchain {
    */
   ChainHead getChainHead();
 
+  /**
+   * Return the last finalized block hash if present.
+   *
+   * @return The hash of the last finalized block
+   */
+  Optional<Hash> getFinalized();
+
+  /**
+   * Return the last safe block hash if present.
+   *
+   * @return The hash of the last safe block
+   */
+  Optional<Hash> getSafeBlock();
+
   /**
    * Return the block number of the head of the canonical chain.
    *
@@ -79,6 +94,11 @@ default Block getGenesisBlock() {
         .orElseThrow(() -> new IllegalStateException("Missing genesis block."));
   }
 
+  default BlockHeader getGenesisBlockHeader() {
+    return getBlockHeader(BlockHeader.GENESIS_BLOCK_NUMBER)
+        .orElseThrow(() -> new IllegalStateException("Missing genesis block header."));
+  }
+
   default Optional<Block> getBlockByHash(final Hash blockHash) {
     return getBlockHeader(blockHash)
         .flatMap(header -> getBlockBody(blockHash).map(body -> new Block(header, body)));
@@ -206,7 +226,7 @@ default long observeLogs(final Consumer<LogWithMetadata> logObserver) {
   }
 
   /**
-   * Removes an previously added observer of any type.
+   * Removes a previously added observer of any type.
    *
    * @param observerId the ID of the observer to remove
    * @return {@code true} if the observer was removed; otherwise {@code false}
@@ -230,4 +250,22 @@ default long observeLogs(final Consumer<LogWithMetadata> logObserver) {
    * @return {@code true} if the observer was removed; otherwise {@code false}
    */
   boolean removeChainReorgObserver(long observerId);
+
+  /**
+   * Gets the current block choice rule. When presented with two block headers indicate which chain
+   * is preferred. greater than zero: the first chain is preferred, less than zero: the second chain
+   * is preferred, or zero: no preference.
+   *
+   * @return The preferred block header
+   */
+  Comparator<BlockHeader> getBlockChoiceRule();
+
+  /**
+   * Sets the current fork choice rule. When presented with two block headers indicate which chain
+   * is more preferred. greater than zero: the first chain is more preferred, less than zero: the
+   * second chain is more preferred, or zero: no preference.
+   *
+   * @param blockChoiceRule The new fork choice rule.
+   */
+  void setBlockChoiceRule(Comparator<BlockHeader> blockChoiceRule);
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BlockchainStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BlockchainStorage.java
index 27206b06bb6..c610a3e0d2b 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BlockchainStorage.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/BlockchainStorage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,10 +14,10 @@
  */
 package org.hyperledger.besu.ethereum.chain;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 
 import java.util.Collection;
@@ -30,6 +30,10 @@ public interface BlockchainStorage {
 
   Collection<Hash> getForkHeads();
 
+  Optional<Hash> getFinalized();
+
+  Optional<Hash> getSafeBlock();
+
   Optional<BlockHeader> getBlockHeader(Hash blockHash);
 
   Optional<BlockBody> getBlockBody(Hash blockHash);
@@ -62,10 +66,22 @@ interface Updater {
 
     void setForkHeads(Collection<Hash> forkHeadHashes);
 
+    void setFinalized(Hash blockHash);
+
+    void setSafeBlock(Hash blockHash);
+
     void removeBlockHash(long blockNumber);
 
+    void removeBlockHeader(final Hash blockHash);
+
+    void removeBlockBody(final Hash blockHash);
+
+    void removeTransactionReceipts(final Hash blockHash);
+
     void removeTransactionLocation(Hash transactionHash);
 
+    void removeTotalDifficulty(final Hash blockHash);
+
     void commit();
 
     void rollback();
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/ChainDataPruner.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/ChainDataPruner.java
new file mode 100644
index 00000000000..7807786948d
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/ChainDataPruner.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.chain;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
+
+import java.util.Collection;
+import java.util.concurrent.ExecutorService;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ChainDataPruner implements BlockAddedObserver {
+  public static final int MAX_PRUNING_THREAD_QUEUE_SIZE = 16;
+  private static final Logger LOG = LoggerFactory.getLogger(ChainDataPruner.class);
+  private final BlockchainStorage blockchainStorage;
+  private final ChainDataPrunerStorage prunerStorage;
+  private final long blocksToRetain;
+  private final long pruningFrequency;
+  private final ExecutorService pruningExecutor;
+
+  public ChainDataPruner(
+      final BlockchainStorage blockchainStorage,
+      final ChainDataPrunerStorage prunerStorage,
+      final long blocksToRetain,
+      final long pruningFrequency,
+      final ExecutorService pruningExecutor) {
+    this.blockchainStorage = blockchainStorage;
+    this.prunerStorage = prunerStorage;
+    this.blocksToRetain = blocksToRetain;
+    this.pruningFrequency = pruningFrequency;
+    this.pruningExecutor = pruningExecutor;
+  }
+
+  @Override
+  public void onBlockAdded(final BlockAddedEvent event) {
+    final long blockNumber = event.getBlock().getHeader().getNumber();
+    final long storedPruningMark = prunerStorage.getPruningMark().orElse(blockNumber);
+    if (blockNumber < storedPruningMark) {
+      LOG.warn(
+          "Block added event: "
+              + event
+              + " has a block number of "
+              + blockNumber
+              + " < pruning mark "
+              + storedPruningMark
+              + " which normally indicates chain-pruning-blocks-retained is too small");
+      return;
+    }
+    final KeyValueStorageTransaction recordBlockHashesTransaction =
+        prunerStorage.startTransaction();
+    final Collection<Hash> forkBlocks = prunerStorage.getForkBlocks(blockNumber);
+    forkBlocks.add(event.getBlock().getHash());
+    prunerStorage.setForkBlocks(recordBlockHashesTransaction, blockNumber, forkBlocks);
+    recordBlockHashesTransaction.commit();
+
+    pruningExecutor.submit(
+        () -> {
+          final KeyValueStorageTransaction pruningTransaction = prunerStorage.startTransaction();
+          long currentPruningMark = storedPruningMark;
+          final long newPruningMark = blockNumber - blocksToRetain;
+          final long blocksToBePruned = newPruningMark - currentPruningMark;
+          if (event.isNewCanonicalHead() && blocksToBePruned >= pruningFrequency) {
+            long currentRetainedBlock = blockNumber - currentPruningMark + 1;
+            while (currentRetainedBlock > blocksToRetain) {
+              LOG.debug("Pruning chain data with block height of " + currentPruningMark);
+              pruneChainDataAtBlock(pruningTransaction, currentPruningMark);
+              currentPruningMark++;
+              currentRetainedBlock = blockNumber - currentPruningMark;
+            }
+          }
+          prunerStorage.setPruningMark(pruningTransaction, currentPruningMark);
+          pruningTransaction.commit();
+        });
+  }
+
+  private void pruneChainDataAtBlock(final KeyValueStorageTransaction tx, final long blockNumber) {
+    final Collection<Hash> oldForkBlocks = prunerStorage.getForkBlocks(blockNumber);
+    final BlockchainStorage.Updater updater = blockchainStorage.updater();
+    for (final Hash toPrune : oldForkBlocks) {
+      updater.removeBlockHeader(toPrune);
+      updater.removeBlockBody(toPrune);
+      updater.removeTransactionReceipts(toPrune);
+      updater.removeTotalDifficulty(toPrune);
+      blockchainStorage
+          .getBlockBody(toPrune)
+          .ifPresent(
+              blockBody ->
+                  blockBody
+                      .getTransactions()
+                      .forEach(t -> updater.removeTransactionLocation(t.getHash())));
+    }
+    updater.removeBlockHash(blockNumber);
+    updater.commit();
+    prunerStorage.removeForkBlocks(tx, blockNumber);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/ChainDataPrunerStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/ChainDataPrunerStorage.java
new file mode 100644
index 00000000000..8b50ec83d52
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/ChainDataPrunerStorage.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.chain;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+import java.util.Optional;
+
+import com.google.common.collect.Lists;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+
+public class ChainDataPrunerStorage {
+  private static final Bytes PRUNING_MARK_KEY =
+      Bytes.wrap("pruningMark".getBytes(StandardCharsets.UTF_8));
+
+  private static final Bytes VARIABLES_PREFIX = Bytes.of(1);
+  private static final Bytes FORK_BLOCKS_PREFIX = Bytes.of(2);
+
+  private final KeyValueStorage storage;
+
+  public ChainDataPrunerStorage(final KeyValueStorage storage) {
+    this.storage = storage;
+  }
+
+  public KeyValueStorageTransaction startTransaction() {
+    return this.storage.startTransaction();
+  }
+
+  public Optional<Long> getPruningMark() {
+    return get(VARIABLES_PREFIX, PRUNING_MARK_KEY).map(UInt256::fromBytes).map(UInt256::toLong);
+  }
+
+  public Collection<Hash> getForkBlocks(final long blockNumber) {
+    return get(FORK_BLOCKS_PREFIX, UInt256.valueOf(blockNumber))
+        .map(bytes -> RLP.input(bytes).readList(in -> bytesToHash(in.readBytes32())))
+        .orElse(Lists.newArrayList());
+  }
+
+  public void setPruningMark(final KeyValueStorageTransaction transaction, final long pruningMark) {
+    set(transaction, VARIABLES_PREFIX, PRUNING_MARK_KEY, UInt256.valueOf(pruningMark));
+  }
+
+  public void setForkBlocks(
+      final KeyValueStorageTransaction transaction,
+      final long blockNumber,
+      final Collection<Hash> forkBlocks) {
+    set(
+        transaction,
+        FORK_BLOCKS_PREFIX,
+        UInt256.valueOf(blockNumber),
+        RLP.encode(o -> o.writeList(forkBlocks, (val, out) -> out.writeBytes(val))));
+  }
+
+  public void removeForkBlocks(
+      final KeyValueStorageTransaction transaction, final long blockNumber) {
+    remove(transaction, FORK_BLOCKS_PREFIX, UInt256.valueOf(blockNumber));
+  }
+
+  private Optional<Bytes> get(final Bytes prefix, final Bytes key) {
+    return storage.get(Bytes.concatenate(prefix, key).toArrayUnsafe()).map(Bytes::wrap);
+  }
+
+  private void set(
+      final KeyValueStorageTransaction transaction,
+      final Bytes prefix,
+      final Bytes key,
+      final Bytes value) {
+    transaction.put(Bytes.concatenate(prefix, key).toArrayUnsafe(), value.toArrayUnsafe());
+  }
+
+  private void remove(
+      final KeyValueStorageTransaction transaction, final Bytes prefix, final Bytes key) {
+    transaction.remove(Bytes.concatenate(prefix, key).toArrayUnsafe());
+  }
+
+  private Hash bytesToHash(final Bytes bytes) {
+    return Hash.wrap(Bytes32.wrap(bytes, 0));
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/ChainHead.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/ChainHead.java
index 70d5e17597f..7ba1df3e788 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/ChainHead.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/ChainHead.java
@@ -14,20 +14,24 @@
  */
 package org.hyperledger.besu.ethereum.chain;
 
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 /** Head of a blockchain. */
 public final class ChainHead {
 
   private final Hash hash;
 
+  private final BlockHeader blockHeader;
+
   private final Difficulty totalDifficulty;
 
   private final long height;
 
-  public ChainHead(final Hash hash, final Difficulty totalDifficulty, final long height) {
-    this.hash = hash;
+  public ChainHead(final BlockHeader header, final Difficulty totalDifficulty, final long height) {
+    this.blockHeader = header;
+    this.hash = header.getHash();
     this.totalDifficulty = totalDifficulty;
     this.height = height;
   }
@@ -43,4 +47,12 @@ public Difficulty getTotalDifficulty() {
   public long getHeight() {
     return height;
   }
+
+  public String toLogString() {
+    return getHeight() + " (" + getHash().toHexString() + ")";
+  }
+
+  public BlockHeader getBlockHeader() {
+    return blockHeader;
+  }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/ChainPrunerConfiguration.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/ChainPrunerConfiguration.java
new file mode 100644
index 00000000000..99ac9bc486d
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/ChainPrunerConfiguration.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.chain;
+
+public class ChainPrunerConfiguration {
+  public static final ChainPrunerConfiguration DEFAULT =
+      new ChainPrunerConfiguration(false, 7200, 256);
+  private final boolean enabled;
+  private final long blocksRetained;
+  private final long blocksFrequency;
+
+  public ChainPrunerConfiguration(
+      final boolean enabled, final long blocksRetained, final long blocksFrequency) {
+    this.enabled = enabled;
+    this.blocksRetained = blocksRetained;
+    this.blocksFrequency = blocksFrequency;
+  }
+
+  public long getChainPruningBlocksRetained() {
+    return blocksRetained;
+  }
+
+  public boolean getChainPruningEnabled() {
+    return enabled;
+  }
+
+  public long getChainPruningBlocksFrequency() {
+    return blocksFrequency;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/DefaultBlockchain.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/DefaultBlockchain.java
index f77a2c4b1eb..22c60862450 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/DefaultBlockchain.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/DefaultBlockchain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -20,12 +20,13 @@
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
 
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.chain.BlockchainStorage.Updater;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
@@ -36,6 +37,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -49,11 +51,15 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Streams;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DefaultBlockchain implements MutableBlockchain {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(DefaultBlockchain.class);
+
+  private final Comparator<BlockHeader> heaviestChainBlockChoiceRule =
+      Comparator.comparing(this::calculateTotalDifficulty);
+
   protected final BlockchainStorage blockchainStorage;
 
   private final Subscribers<BlockAddedObserver> blockAddedObservers = Subscribers.create();
@@ -65,17 +71,28 @@ public class DefaultBlockchain implements MutableBlockchain {
   private volatile int chainHeadTransactionCount;
   private volatile int chainHeadOmmerCount;
 
+  private Comparator<BlockHeader> blockChoiceRule;
+
   private DefaultBlockchain(
       final Optional<Block> genesisBlock,
       final BlockchainStorage blockchainStorage,
       final MetricsSystem metricsSystem,
       final long reorgLoggingThreshold) {
+    this(genesisBlock, blockchainStorage, metricsSystem, reorgLoggingThreshold, null);
+  }
+
+  private DefaultBlockchain(
+      final Optional<Block> genesisBlock,
+      final BlockchainStorage blockchainStorage,
+      final MetricsSystem metricsSystem,
+      final long reorgLoggingThreshold,
+      final String dataDirectory) {
     checkNotNull(genesisBlock);
     checkNotNull(blockchainStorage);
     checkNotNull(metricsSystem);
 
     this.blockchainStorage = blockchainStorage;
-    genesisBlock.ifPresent(this::setGenesis);
+    genesisBlock.ifPresent(block -> this.setGenesis(block, dataDirectory));
 
     final Hash chainHead = blockchainStorage.getChainHead().get();
     chainHeader = blockchainStorage.getBlockHeader(chainHead).get();
@@ -124,7 +141,9 @@ private DefaultBlockchain(
         "chain_head_ommer_count",
         "Number of ommers in the current chain head block",
         () -> chainHeadOmmerCount);
+
     this.reorgLoggingThreshold = reorgLoggingThreshold;
+    this.blockChoiceRule = heaviestChainBlockChoiceRule;
   }
 
   public static MutableBlockchain createMutable(
@@ -137,6 +156,21 @@ public static MutableBlockchain createMutable(
         Optional.of(genesisBlock), blockchainStorage, metricsSystem, reorgLoggingThreshold);
   }
 
+  public static MutableBlockchain createMutable(
+      final Block genesisBlock,
+      final BlockchainStorage blockchainStorage,
+      final MetricsSystem metricsSystem,
+      final long reorgLoggingThreshold,
+      final String dataDirectory) {
+    checkNotNull(genesisBlock);
+    return new DefaultBlockchain(
+        Optional.of(genesisBlock),
+        blockchainStorage,
+        metricsSystem,
+        reorgLoggingThreshold,
+        dataDirectory);
+  }
+
   public static Blockchain create(
       final BlockchainStorage blockchainStorage,
       final MetricsSystem metricsSystem,
@@ -158,7 +192,17 @@ private static boolean validateStorageNonEmpty(final BlockchainStorage blockchai
 
   @Override
   public ChainHead getChainHead() {
-    return new ChainHead(chainHeader.getHash(), totalDifficulty, chainHeader.getNumber());
+    return new ChainHead(chainHeader, totalDifficulty, chainHeader.getNumber());
+  }
+
+  @Override
+  public Optional<Hash> getFinalized() {
+    return blockchainStorage.getFinalized();
+  }
+
+  @Override
+  public Optional<Hash> getSafeBlock() {
+    return blockchainStorage.getSafeBlock();
   }
 
   @Override
@@ -227,26 +271,49 @@ public Optional<TransactionLocation> getTransactionLocation(final Hash transacti
     return blockchainStorage.getTransactionLocation(transactionHash);
   }
 
+  @Override
+  public Comparator<BlockHeader> getBlockChoiceRule() {
+    return blockChoiceRule;
+  }
+
+  @Override
+  public void setBlockChoiceRule(final Comparator<BlockHeader> blockChoiceRule) {
+    this.blockChoiceRule = blockChoiceRule;
+  }
+
   @Override
   public synchronized void appendBlock(final Block block, final List<TransactionReceipt> receipts) {
+    appendBlockHelper(new BlockWithReceipts(block, receipts), false);
+  }
+
+  @Override
+  public synchronized void storeBlock(final Block block, final List<TransactionReceipt> receipts) {
+    appendBlockHelper(new BlockWithReceipts(block, receipts), true);
+  }
+
+  private boolean blockShouldBeProcessed(
+      final Block block, final List<TransactionReceipt> receipts) {
     checkArgument(
         block.getBody().getTransactions().size() == receipts.size(),
         "Supplied receipts do not match block transactions.");
     if (blockIsAlreadyTracked(block)) {
-      return;
+      return false;
     }
     checkArgument(blockIsConnected(block), "Attempt to append non-connected block.");
-
-    final BlockAddedEvent blockAddedEvent =
-        appendBlockHelper(new BlockWithReceipts(block, receipts));
-    blockAddedObservers.forEach(observer -> observer.onBlockAdded(blockAddedEvent));
+    return true;
   }
 
-  private BlockAddedEvent appendBlockHelper(final BlockWithReceipts blockWithReceipts) {
+  private void appendBlockHelper(
+      final BlockWithReceipts blockWithReceipts, final boolean storeOnly) {
+
+    if (!blockShouldBeProcessed(blockWithReceipts.getBlock(), blockWithReceipts.getReceipts())) {
+      return;
+    }
+
     final Block block = blockWithReceipts.getBlock();
     final List<TransactionReceipt> receipts = blockWithReceipts.getReceipts();
     final Hash hash = block.getHash();
-    final Difficulty td = calculateTotalDifficulty(block);
+    final Difficulty td = calculateTotalDifficulty(block.getHeader());
 
     final BlockchainStorage.Updater updater = blockchainStorage.updater();
 
@@ -255,55 +322,78 @@ private BlockAddedEvent appendBlockHelper(final BlockWithReceipts blockWithRecei
     updater.putTransactionReceipts(hash, receipts);
     updater.putTotalDifficulty(hash, td);
 
-    // Update canonical chain data
-    final BlockAddedEvent blockAddedEvent =
-        updateCanonicalChainData(updater, blockWithReceipts, td);
+    final BlockAddedEvent blockAddedEvent;
+    if (storeOnly) {
+      blockAddedEvent = handleStoreOnly(blockWithReceipts);
+    } else {
+      blockAddedEvent = updateCanonicalChainData(updater, blockWithReceipts);
+      if (blockAddedEvent.isNewCanonicalHead()) {
+        updateCacheForNewCanonicalHead(block, td);
+      }
+    }
 
     updater.commit();
-    if (blockAddedEvent.isNewCanonicalHead()) {
-      updateCacheForNewCanonicalHead(block, td);
+    blockAddedObservers.forEach(observer -> observer.onBlockAdded(blockAddedEvent));
+  }
+
+  @Override
+  public synchronized void unsafeImportBlock(
+      final Block block,
+      final List<TransactionReceipt> transactionReceipts,
+      final Optional<Difficulty> maybeTotalDifficulty) {
+    final BlockchainStorage.Updater updater = blockchainStorage.updater();
+    final Hash hash = block.getHash();
+    updater.putBlockHeader(hash, block.getHeader());
+    updater.putBlockHash(block.getHeader().getNumber(), hash);
+    updater.putBlockBody(hash, block.getBody());
+    final int nbTrx = block.getBody().getTransactions().size();
+    for (int i = 0; i < nbTrx; i++) {
+      final Hash transactionHash = block.getBody().getTransactions().get(i).getHash();
+      updater.putTransactionLocation(transactionHash, new TransactionLocation(transactionHash, i));
     }
+    updater.putTransactionReceipts(hash, transactionReceipts);
+    maybeTotalDifficulty.ifPresent(
+        totalDifficulty -> updater.putTotalDifficulty(hash, totalDifficulty));
+    updater.commit();
+  }
 
-    return blockAddedEvent;
+  @Override
+  public synchronized void unsafeSetChainHead(
+      final BlockHeader blockHeader, final Difficulty totalDifficulty) {
+    final BlockchainStorage.Updater updater = blockchainStorage.updater();
+    this.chainHeader = blockHeader;
+    this.totalDifficulty = totalDifficulty;
+    updater.setChainHead(blockHeader.getBlockHash());
+    updater.commit();
   }
 
-  private Difficulty calculateTotalDifficulty(final Block block) {
-    if (block.getHeader().getNumber() == BlockHeader.GENESIS_BLOCK_NUMBER) {
-      return block.getHeader().getDifficulty();
+  private Difficulty calculateTotalDifficulty(final BlockHeader blockHeader) {
+    if (blockHeader.getNumber() == BlockHeader.GENESIS_BLOCK_NUMBER) {
+      return blockHeader.getDifficulty();
     }
 
     final Difficulty parentTotalDifficulty =
         blockchainStorage
-            .getTotalDifficulty(block.getHeader().getParentHash())
+            .getTotalDifficulty(blockHeader.getParentHash())
             .orElseThrow(
                 () -> new IllegalStateException("Blockchain is missing total difficulty data."));
-    return block.getHeader().getDifficulty().add(parentTotalDifficulty);
+    return blockHeader.getDifficulty().add(parentTotalDifficulty);
   }
 
   private BlockAddedEvent updateCanonicalChainData(
-      final BlockchainStorage.Updater updater,
-      final BlockWithReceipts blockWithReceipts,
-      final Difficulty totalDifficulty) {
+      final BlockchainStorage.Updater updater, final BlockWithReceipts blockWithReceipts) {
+
     final Block newBlock = blockWithReceipts.getBlock();
     final Hash chainHead = blockchainStorage.getChainHead().orElse(null);
+
     if (newBlock.getHeader().getNumber() != BlockHeader.GENESIS_BLOCK_NUMBER && chainHead == null) {
       throw new IllegalStateException("Blockchain is missing chain head.");
     }
 
-    final Hash newBlockHash = newBlock.getHash();
     try {
-      if (chainHead == null || newBlock.getHeader().getParentHash().equals(chainHead)) {
-        // This block advances the chain, update the chain head
-        updater.putBlockHash(newBlock.getHeader().getNumber(), newBlockHash);
-        updater.setChainHead(newBlockHash);
-        indexTransactionForBlock(updater, newBlockHash, newBlock.getBody().getTransactions());
-        return BlockAddedEvent.createForHeadAdvancement(
-            newBlock,
-            LogWithMetadata.generate(
-                blockWithReceipts.getBlock(), blockWithReceipts.getReceipts(), false),
-            blockWithReceipts.getReceipts());
-      } else if (totalDifficulty.compareTo(blockchainStorage.getTotalDifficulty(chainHead).get())
-          > 0) {
+      if (newBlock.getHeader().getParentHash().equals(chainHead) || chainHead == null) {
+        return handleNewHead(updater, blockWithReceipts);
+      } else if (blockChoiceRule.compare(newBlock.getHeader(), chainHeader) > 0) {
         // New block represents a chain reorganization
         return handleChainReorg(updater, blockWithReceipts);
       } else {
@@ -318,6 +408,26 @@ private BlockAddedEvent updateCanonicalChainData(
     }
   }
 
+  private BlockAddedEvent handleStoreOnly(final BlockWithReceipts blockWithReceipts) {
+    return BlockAddedEvent.createForStoredOnly(blockWithReceipts.getBlock());
+  }
+
+  private BlockAddedEvent handleNewHead(
+      final Updater updater, final BlockWithReceipts blockWithReceipts) {
+    // This block advances the chain, update the chain head
+    final Hash newBlockHash = blockWithReceipts.getHash();
+
+    updater.putBlockHash(blockWithReceipts.getNumber(), newBlockHash);
+    updater.setChainHead(newBlockHash);
+    indexTransactionForBlock(
+        updater, newBlockHash, blockWithReceipts.getBlock().getBody().getTransactions());
+    return BlockAddedEvent.createForHeadAdvancement(
+        blockWithReceipts.getBlock(),
+        LogWithMetadata.generate(
+            blockWithReceipts.getBlock(), blockWithReceipts.getReceipts(), false),
+        blockWithReceipts.getReceipts());
+  }
+
   private BlockAddedEvent handleFork(final BlockchainStorage.Updater updater, final Block fork) {
     final Collection<Hash> forkHeads = blockchainStorage.getForkHeads();
 
@@ -336,7 +446,7 @@ private BlockAddedEvent handleFork(final BlockchainStorage.Updater updater, fina
 
   private BlockAddedEvent handleChainReorg(
       final BlockchainStorage.Updater updater, final BlockWithReceipts newChainHeadWithReceipts) {
-    BlockWithReceipts oldChainWithReceipts = getBlockWithReceipts(chainHeader).get();
+    final BlockWithReceipts oldChainWithReceipts = getBlockWithReceipts(chainHeader).get();
     BlockWithReceipts currentOldChainWithReceipts = oldChainWithReceipts;
     BlockWithReceipts currentNewChainWithReceipts = newChainHeadWithReceipts;
 
@@ -428,48 +538,74 @@ private void maybeLogReorg(
       final BlockWithReceipts newChainHeadWithReceipts,
       final BlockWithReceipts oldChainWithReceipts,
       final BlockWithReceipts commonAncestorWithReceipts) {
-    if (newChainHeadWithReceipts.getNumber() - commonAncestorWithReceipts.getNumber()
-            > reorgLoggingThreshold
-        || oldChainWithReceipts.getNumber() - commonAncestorWithReceipts.getNumber()
-            > reorgLoggingThreshold) {
+    if ((newChainHeadWithReceipts.getNumber() - commonAncestorWithReceipts.getNumber()
+                > reorgLoggingThreshold
+            || oldChainWithReceipts.getNumber() - commonAncestorWithReceipts.getNumber()
+                > reorgLoggingThreshold)
+        && LOG.isWarnEnabled()) {
       LOG.warn(
           "Chain Reorganization +{} new / -{} old\n{}",
-          () -> newChainHeadWithReceipts.getNumber() - commonAncestorWithReceipts.getNumber(),
-          () -> oldChainWithReceipts.getNumber() - commonAncestorWithReceipts.getNumber(),
-          () ->
-              Streams.zip(
-                      Stream.of("Old", "New", "Ancestor"),
-                      Stream.of(
-                              oldChainWithReceipts,
-                              newChainHeadWithReceipts,
-                              commonAncestorWithReceipts)
-                          .map(
-                              blockWithReceipts ->
-                                  String.format(
-                                      "hash: %s, height: %s",
-                                      blockWithReceipts.getHash(), blockWithReceipts.getNumber())),
-                      (label, values) -> String.format("%10s - %s", label, values))
-                  .collect(joining("\n")));
+          newChainHeadWithReceipts.getNumber() - commonAncestorWithReceipts.getNumber(),
+          oldChainWithReceipts.getNumber() - commonAncestorWithReceipts.getNumber(),
+          Streams.zip(
+                  Stream.of("Old", "New", "Ancestor"),
+                  Stream.of(
+                          oldChainWithReceipts,
+                          newChainHeadWithReceipts,
+                          commonAncestorWithReceipts)
+                      .map(
+                          blockWithReceipts ->
+                              String.format(
+                                  "hash: %s, height: %s",
+                                  blockWithReceipts.getHash(), blockWithReceipts.getNumber())),
+                  (label, values) -> String.format("%10s - %s", label, values))
+              .collect(joining("\n")));
     }
   }
 
   @Override
   public boolean rewindToBlock(final long blockNumber) {
-    final Optional<Hash> blockHash = blockchainStorage.getBlockHash(blockNumber);
-    if (blockHash.isEmpty()) {
-      return false;
-    }
+    return blockchainStorage.getBlockHash(blockNumber).map(this::rewindToBlock).orElse(false);
+  }
 
+  @Override
+  public boolean rewindToBlock(final Hash blockHash) {
     final BlockchainStorage.Updater updater = blockchainStorage.updater();
     try {
-      final BlockHeader oldBlockHeader = blockchainStorage.getBlockHeader(blockHash.get()).get();
+      final BlockHeader oldBlockHeader = blockchainStorage.getBlockHeader(blockHash).get();
       final BlockWithReceipts blockWithReceipts = getBlockWithReceipts(oldBlockHeader).get();
       final Block block = blockWithReceipts.getBlock();
 
-      handleChainReorg(updater, blockWithReceipts);
+      var reorgEvent = handleChainReorg(updater, blockWithReceipts);
       updater.commit();
+      blockAddedObservers.forEach(o -> o.onBlockAdded(reorgEvent));
+
+      updateCacheForNewCanonicalHead(block, calculateTotalDifficulty(block.getHeader()));
+      return true;
+    } catch (final NoSuchElementException e) {
+      // Any Optional.get() calls in this block should be present, missing data means data
+      // corruption or a bug.
+      updater.rollback();
+      throw new IllegalStateException("Blockchain is missing data that should be present.", e);
+    }
+  }
+
+  @Override
+  public boolean forwardToBlock(final BlockHeader blockHeader) {
+    checkArgument(
+        chainHeader.getHash().equals(blockHeader.getParentHash()),
+        "Supplied block header is not a child of the current chain head.");
+
+    final BlockchainStorage.Updater updater = blockchainStorage.updater();
+
+    try {
+      final BlockWithReceipts blockWithReceipts = getBlockWithReceipts(blockHeader).get();
 
-      updateCacheForNewCanonicalHead(block, calculateTotalDifficulty(block));
+      BlockAddedEvent newHeadEvent = handleNewHead(updater, blockWithReceipts);
+      updateCacheForNewCanonicalHead(
+          blockWithReceipts.getBlock(), calculateTotalDifficulty(blockHeader));
+      updater.commit();
+      blockAddedObservers.forEach(observer -> observer.onBlockAdded(newHeadEvent));
       return true;
     } catch (final NoSuchElementException e) {
       // Any Optional.get() calls in this block should be present, missing data means data
@@ -479,7 +615,21 @@ public boolean rewindToBlock(final long blockNumber) {
     }
   }
 
-  void updateCacheForNewCanonicalHead(final Block block, final Difficulty uInt256) {
+  @Override
+  public void setFinalized(final Hash blockHash) {
+    final var updater = blockchainStorage.updater();
+    updater.setFinalized(blockHash);
+    updater.commit();
+  }
+
+  @Override
+  public void setSafeBlock(final Hash blockHash) {
+    final var updater = blockchainStorage.updater();
+    updater.setSafeBlock(blockHash);
+    updater.commit();
+  }
+
+  private void updateCacheForNewCanonicalHead(final Block block, final Difficulty uInt256) {
     chainHeader = block.getHeader();
     totalDifficulty = uInt256;
     chainHeadTransactionCount = block.getBody().getTransactions().size();
@@ -507,7 +657,7 @@ Set<Hash> getForks() {
     return new HashSet<>(blockchainStorage.getForkHeads());
   }
 
-  private void setGenesis(final Block genesisBlock) {
+  private void setGenesis(final Block genesisBlock, final String dataDirectory) {
     checkArgument(
         genesisBlock.getHeader().getNumber() == BlockHeader.GENESIS_BLOCK_NUMBER,
         "Invalid genesis block.");
@@ -519,7 +669,7 @@ private void setGenesis(final Block genesisBlock) {
       updater.putBlockHeader(hash, genesisBlock.getHeader());
       updater.putBlockBody(hash, genesisBlock.getBody());
       updater.putTransactionReceipts(hash, emptyList());
-      updater.putTotalDifficulty(hash, calculateTotalDifficulty(genesisBlock));
+      updater.putTotalDifficulty(hash, calculateTotalDifficulty(genesisBlock.getHeader()));
       updater.putBlockHash(genesisBlock.getHeader().getNumber(), hash);
       updater.setChainHead(hash);
       updater.commit();
@@ -531,8 +681,11 @@ private void setGenesis(final Block genesisBlock) {
       }
       if (!genesisHash.get().equals(genesisBlock.getHash())) {
         throw new InvalidConfigurationException(
-            "Supplied genesis block does not match stored chain data.\n"
-                + "Please specify a different data directory with --data-path or specify the original genesis file with --genesis-file.");
+            "Supplied genesis block does not match chain data stored in "
+                + dataDirectory
+                + ".\n"
+                + "Please specify a different data directory with --data-path, specify the original genesis file with "
+                + "--genesis-file or supply a testnet/mainnet option with --network.");
       }
     }
   }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/EthHashObserver.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/EthHashObserver.java
deleted file mode 100644
index 402222f9312..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/EthHashObserver.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.chain;
-
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolution;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolverInputs;
-
-import java.util.function.Function;
-
-/** Observer of new work for the EthHash PoW algorithm */
-public interface EthHashObserver {
-
-  /**
-   * Send a new proof-of-work job to observers
-   *
-   * @param jobInput the proof-of-work job
-   */
-  void newJob(EthHashSolverInputs jobInput);
-
-  /**
-   * Sets a callback for the observer to provide solutions to jobs.
-   *
-   * @param submitSolutionCallback the callback to set on the observer, consuming a solution and
-   *     returning true if the solution is accepted, false if rejected.
-   */
-  void setSubmitWorkCallback(Function<EthHashSolution, Boolean> submitSolutionCallback);
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/GenesisState.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/GenesisState.java
index 5c81ede3c62..691a8ab9ee9 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/GenesisState.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/GenesisState.java
@@ -14,34 +14,38 @@
  */
 package org.hyperledger.besu.ethereum.chain;
 
+import static java.util.Collections.emptyList;
+
 import org.hyperledger.besu.config.GenesisAllocation;
 import org.hyperledger.besu.config.GenesisConfigFile;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
+import org.hyperledger.besu.ethereum.core.Deposit;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.LogsBloomFilter;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage;
 import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage;
 import org.hyperledger.besu.ethereum.worldstate.DefaultMutableWorldState;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
 
 import java.math.BigInteger;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
+import java.util.OptionalLong;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -52,9 +56,6 @@
 
 public final class GenesisState {
 
-  private static final BlockBody BODY =
-      new BlockBody(Collections.emptyList(), Collections.emptyList());
-
   private final Block block;
   private final List<GenesisAccount> genesisAccounts;
 
@@ -88,10 +89,19 @@ public static GenesisState fromConfig(
     final Block block =
         new Block(
             buildHeader(config, calculateGenesisStateHash(genesisAccounts), protocolSchedule),
-            BODY);
+            buildBody(config));
     return new GenesisState(block, genesisAccounts);
   }
 
+  private static BlockBody buildBody(final GenesisConfigFile config) {
+    final Optional<List<Withdrawal>> withdrawals =
+        isShanghaiAtGenesis(config) ? Optional.of(emptyList()) : Optional.empty();
+    final Optional<List<Deposit>> deposits =
+        isExperimentalEipsTimeAtGenesis(config) ? Optional.of(emptyList()) : Optional.empty();
+
+    return new BlockBody(emptyList(), emptyList(), withdrawals, deposits);
+  }
+
   public Block getBlock() {
     return block;
   }
@@ -102,13 +112,13 @@ public Block getBlock() {
    * @param target WorldView to write genesis state to
    */
   public void writeStateTo(final MutableWorldState target) {
-    writeAccountsTo(target, genesisAccounts, (Hash) block.getHeader().getBlockHash());
+    writeAccountsTo(target, genesisAccounts, block.getHeader());
   }
 
   private static void writeAccountsTo(
       final MutableWorldState target,
       final List<GenesisAccount> genesisAccounts,
-      final Hash rootHash) {
+      final BlockHeader rootHeader) {
     final WorldUpdater updater = target.updater();
     genesisAccounts.forEach(
         genesisAccount -> {
@@ -116,11 +126,10 @@ private static void writeAccountsTo(
           account.setNonce(genesisAccount.nonce);
           account.setBalance(genesisAccount.balance);
           account.setCode(genesisAccount.code);
-          account.setVersion(genesisAccount.version);
           genesisAccount.storage.forEach(account::setStorageValue);
         });
     updater.commit();
-    target.persist(rootHash);
+    target.persist(rootHeader);
   }
 
   private static Hash calculateGenesisStateHash(final List<GenesisAccount> genesisAccounts) {
@@ -130,7 +139,7 @@ private static Hash calculateGenesisStateHash(final List<GenesisAccount> genesis
         new WorldStatePreimageKeyValueStorage(new InMemoryKeyValueStorage());
     final MutableWorldState worldState =
         new DefaultMutableWorldState(stateStorage, preimageStorage);
-    writeAccountsTo(worldState, genesisAccounts, Hash.ZERO);
+    writeAccountsTo(worldState, genesisAccounts, null);
     return worldState.rootHash();
   }
 
@@ -156,6 +165,9 @@ private static BlockHeader buildHeader(
         .mixHash(parseMixHash(genesis))
         .nonce(parseNonce(genesis))
         .blockHeaderFunctions(ScheduleBasedBlockHeaderFunctions.create(protocolSchedule))
+        .baseFee(genesis.getGenesisBaseFeePerGas().orElse(null))
+        .withdrawalsRoot(isShanghaiAtGenesis(genesis) ? Hash.EMPTY_TRIE_HASH : null)
+        .depositsRoot(isExperimentalEipsTimeAtGenesis(genesis) ? Hash.EMPTY_TRIE_HASH : null)
         .buildBlockHeader();
   }
 
@@ -213,6 +225,22 @@ private static long parseUnsignedLong(final String value) {
     return Long.parseUnsignedLong(nonce, 16);
   }
 
+  private static boolean isShanghaiAtGenesis(final GenesisConfigFile genesis) {
+    final OptionalLong shanghaiTimestamp = genesis.getConfigOptions().getShanghaiTime();
+    if (shanghaiTimestamp.isPresent()) {
+      return shanghaiTimestamp.getAsLong() == genesis.getTimestamp();
+    }
+    return false;
+  }
+
+  private static boolean isExperimentalEipsTimeAtGenesis(final GenesisConfigFile genesis) {
+    final OptionalLong experimentalEipsTime = genesis.getConfigOptions().getExperimentalEipsTime();
+    if (experimentalEipsTime.isPresent()) {
+      return experimentalEipsTime.getAsLong() == genesis.getTimestamp();
+    }
+    return false;
+  }
+
   @Override
   public String toString() {
     return MoreObjects.toStringHelper(this)
@@ -228,7 +256,6 @@ private static final class GenesisAccount {
     final Wei balance;
     final Map<UInt256, UInt256> storage;
     final Bytes code;
-    final int version;
 
     static GenesisAccount fromAllocation(final GenesisAllocation allocation) {
       return new GenesisAccount(
@@ -236,8 +263,7 @@ static GenesisAccount fromAllocation(final GenesisAllocation allocation) {
           allocation.getAddress(),
           allocation.getBalance(),
           allocation.getStorage(),
-          allocation.getCode(),
-          allocation.getVersion());
+          allocation.getCode());
     }
 
     private GenesisAccount(
@@ -245,13 +271,11 @@ private GenesisAccount(
         final String hexAddress,
         final String balance,
         final Map<String, String> storage,
-        final String hexCode,
-        final String version) {
+        final String hexCode) {
       this.nonce = withNiceErrorMessage("nonce", hexNonce, GenesisState::parseUnsignedLong);
       this.address = withNiceErrorMessage("address", hexAddress, Address::fromHexString);
       this.balance = withNiceErrorMessage("balance", balance, this::parseBalance);
       this.code = hexCode != null ? Bytes.fromHexString(hexCode) : null;
-      this.version = version != null ? Integer.decode(version) : Account.DEFAULT_VERSION;
       this.storage = parseStorage(storage);
     }
 
@@ -268,16 +292,13 @@ private Wei parseBalance(final String balance) {
 
     private Map<UInt256, UInt256> parseStorage(final Map<String, String> storage) {
       final Map<UInt256, UInt256> parsedStorage = new HashMap<>();
-      storage
-          .entrySet()
-          .forEach(
-              (entry) -> {
-                final UInt256 key =
-                    withNiceErrorMessage("storage key", entry.getKey(), UInt256::fromHexString);
-                final UInt256 value =
-                    withNiceErrorMessage("storage value", entry.getValue(), UInt256::fromHexString);
-                parsedStorage.put(key, value);
-              });
+      storage.forEach(
+          (key1, value1) -> {
+            final UInt256 key = withNiceErrorMessage("storage key", key1, UInt256::fromHexString);
+            final UInt256 value =
+                withNiceErrorMessage("storage value", value1, UInt256::fromHexString);
+            parsedStorage.put(key, value);
+          });
 
       return parsedStorage;
     }
@@ -290,7 +311,6 @@ public String toString() {
           .add("balance", balance)
           .add("storage", storage)
           .add("code", code)
-          .add("version", version)
           .toString();
     }
   }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/MutableBlockchain.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/MutableBlockchain.java
index b0709d4903e..9ec7c8a9d9d 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/MutableBlockchain.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/MutableBlockchain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,10 +14,14 @@
  */
 package org.hyperledger.besu.ethereum.chain;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Difficulty;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 
 import java.util.List;
+import java.util.Optional;
 
 public interface MutableBlockchain extends Blockchain {
 
@@ -33,6 +37,25 @@ public interface MutableBlockchain extends Blockchain {
    */
   void appendBlock(Block block, List<TransactionReceipt> receipts);
 
+  /**
+   * Adds a block to the blockchain, without updating the chain state.
+   *
+   * <p>Block must be connected to the existing blockchain (its parent must already be stored),
+   * otherwise an {@link IllegalArgumentException} is thrown. Blocks representing forks are allowed
+   * as long as they are connected.
+   *
+   * @param block The block to append.
+   * @param receipts The list of receipts associated with this block's transactions.
+   */
+  void storeBlock(Block block, List<TransactionReceipt> receipts);
+
+  void unsafeImportBlock(
+      final Block block,
+      final List<TransactionReceipt> receipts,
+      final Optional<Difficulty> maybeTotalDifficulty);
+
+  void unsafeSetChainHead(final BlockHeader blockHeader, final Difficulty totalDifficulty);
+
   /**
    * Rolls back the canonical chainhead to the specified block number.
    *
@@ -41,4 +64,37 @@ public interface MutableBlockchain extends Blockchain {
    *     {@code blockNumber}
    */
   boolean rewindToBlock(final long blockNumber);
+
+  /**
+   * Rolls back the canonical chainhead to the specified block hash.
+   *
+   * @param blockHash The block hash to roll back to.
+   * @return {@code true} on success, {@code false} if the canonical chain height is less than
+   *     {@code blockNumber}
+   */
+  boolean rewindToBlock(final Hash blockHash);
+
+  /**
+   * Forward the canonical chainhead to the specified block hash. The block hash must be a child of
+   * the current chainhead, that is already stored
+   *
+   * @param blockHeader The block header to forward to.
+   * @return {@code true} on success, {@code false} if the block is not a child of the current head
+   *     {@code blockNumber}
+   */
+  boolean forwardToBlock(final BlockHeader blockHeader);
+
+  /**
+   * Set the hash of the last finalized block.
+   *
+   * @param blockHash The hash of the last finalized block.
+   */
+  void setFinalized(final Hash blockHash);
+
+  /**
+   * Set the hash of the last safe block.
+   *
+   * @param blockHash The hash of the last safe block.
+   */
+  void setSafeBlock(final Hash blockHash);
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/PoWObserver.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/PoWObserver.java
new file mode 100644
index 00000000000..09fb049286e
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/PoWObserver.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.chain;
+
+import org.hyperledger.besu.ethereum.mainnet.PoWSolution;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolverInputs;
+
+import java.util.function.Function;
+
+/** Observer of new work for the PoW algorithm */
+public interface PoWObserver {
+
+  /**
+   * Send a new proof-of-work job to observers
+   *
+   * @param jobInput the proof-of-work job
+   */
+  void newJob(PoWSolverInputs jobInput);
+
+  /**
+   * Sets a callback for the observer to provide solutions to jobs.
+   *
+   * @param submitSolutionCallback the callback to set on the observer, consuming a solution and
+   *     returning true if the solution is accepted, false if rejected.
+   */
+  void setSubmitWorkCallback(Function<PoWSolution, Boolean> submitSolutionCallback);
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/TransactionLocation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/TransactionLocation.java
index c5c56f6a8d4..e3fed07076f 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/TransactionLocation.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/TransactionLocation.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.chain;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
 
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/VariablesStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/VariablesStorage.java
new file mode 100644
index 00000000000..43a4361a0e4
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/VariablesStorage.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.chain;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import org.hyperledger.besu.datatypes.Hash;
+
+import java.util.Collection;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public interface VariablesStorage {
+  enum Keys {
+    CHAIN_HEAD_HASH("chainHeadHash"),
+    FORK_HEADS("forkHeads"),
+    FINALIZED_BLOCK_HASH("finalizedBlockHash"),
+    SAFE_BLOCK_HASH("safeBlockHash"),
+    SEQ_NO_STORE("local-enr-seqno");
+
+    private final String key;
+    private final byte[] byteArray;
+    private final Bytes bytes;
+
+    Keys(final String key) {
+      this.key = key;
+      this.byteArray = key.getBytes(UTF_8);
+      this.bytes = Bytes.wrap(byteArray);
+    }
+
+    public byte[] toByteArray() {
+      return byteArray;
+    }
+
+    public Bytes getBytes() {
+      return bytes;
+    }
+
+    @Override
+    public String toString() {
+      return key;
+    }
+  }
+
+  Optional<Hash> getChainHead();
+
+  Collection<Hash> getForkHeads();
+
+  Optional<Hash> getFinalized();
+
+  Optional<Hash> getSafeBlock();
+
+  Optional<Bytes> getLocalEnrSeqno();
+
+  Updater updater();
+
+  interface Updater {
+
+    void setChainHead(Hash blockHash);
+
+    void setForkHeads(Collection<Hash> forkHeadHashes);
+
+    void setFinalized(Hash blockHash);
+
+    void setSafeBlock(Hash blockHash);
+
+    void setLocalEnrSeqno(Bytes nodeRecord);
+
+    void removeAll();
+
+    void commit();
+
+    void rollback();
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AbstractWorldUpdater.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AbstractWorldUpdater.java
deleted file mode 100644
index db841d481b2..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AbstractWorldUpdater.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-/**
- * An abstract implementation of a {@link WorldUpdater} that buffers update over the {@link
- * WorldView} provided in the constructor in memory.
- *
- * <p>Concrete implementation have to implement the {@link #commit()} method.
- */
-public abstract class AbstractWorldUpdater<W extends WorldView, A extends Account>
-    implements WorldUpdater {
-
-  private final W world;
-
-  private final Map<Address, UpdateTrackingAccount<A>> updatedAccounts = new HashMap<>();
-  private final Set<Address> deletedAccounts = new HashSet<>();
-
-  protected AbstractWorldUpdater(final W world) {
-    this.world = world;
-  }
-
-  protected abstract A getForMutation(Address address);
-
-  protected UpdateTrackingAccount<A> track(final UpdateTrackingAccount<A> account) {
-    final Address address = account.getAddress();
-    updatedAccounts.put(address, account);
-    deletedAccounts.remove(address);
-    return account;
-  }
-
-  @Override
-  public EvmAccount createAccount(final Address address, final long nonce, final Wei balance) {
-    final UpdateTrackingAccount<A> account = new UpdateTrackingAccount<>(address);
-    account.setNonce(nonce);
-    account.setBalance(balance);
-    return new WrappedEvmAccount(track(account));
-  }
-
-  @Override
-  public Account get(final Address address) {
-    // We may have updated it already, so check that first.
-    final MutableAccount existing = updatedAccounts.get(address);
-    if (existing != null) {
-      return existing;
-    }
-    if (deletedAccounts.contains(address)) {
-      return null;
-    }
-    return world.get(address);
-  }
-
-  @Override
-  public EvmAccount getAccount(final Address address) {
-    // We may have updated it already, so check that first.
-    final MutableAccount existing = updatedAccounts.get(address);
-    if (existing != null) {
-      return new WrappedEvmAccount(existing);
-    }
-    if (deletedAccounts.contains(address)) {
-      return null;
-    }
-
-    // Otherwise, get it from our wrapped view and create a new update tracker.
-    final A origin = getForMutation(address);
-    if (origin == null) {
-      return null;
-    } else {
-      return new WrappedEvmAccount(track(new UpdateTrackingAccount<>(origin)));
-    }
-  }
-
-  @Override
-  public void deleteAccount(final Address address) {
-    deletedAccounts.add(address);
-    updatedAccounts.remove(address);
-  }
-
-  /**
-   * Creates an updater that buffer updates on top of this updater.
-   *
-   * <p>
-   *
-   * @return a new updater on top of this updater. Updates made to the returned object will become
-   *     visible on this updater when the returned updater is committed. Note however that updates
-   *     to this updater <b>may or may not</b> be reflected to the created updater, so it is
-   *     <b>strongly</b> advised to not update this updater until the returned one is discarded
-   *     (either after having been committed, or because the updates it represent are meant to be
-   *     discarded).
-   */
-  @Override
-  public WorldUpdater updater() {
-    return new StackedUpdater<>(this);
-  }
-
-  /**
-   * The world view on top of which this buffer updates.
-   *
-   * @return The world view on top of which this buffer updates.
-   */
-  protected W wrappedWorldView() {
-    return world;
-  }
-
-  @Override
-  public Optional<WorldUpdater> parentUpdater() {
-    if (world instanceof WorldUpdater) {
-      return Optional.of((WorldUpdater) world);
-    } else {
-      return Optional.empty();
-    }
-  }
-
-  /**
-   * The accounts modified in this updater.
-   *
-   * @return The accounts modified in this updater.
-   */
-  protected Collection<UpdateTrackingAccount<A>> getUpdatedAccounts() {
-    return updatedAccounts.values();
-  }
-
-  /**
-   * The accounts deleted as part of this updater.
-   *
-   * @return The accounts deleted as part of this updater.
-   */
-  protected Collection<Address> getDeletedAccounts() {
-    return deletedAccounts;
-  }
-
-  public static class StackedUpdater<W extends WorldView, A extends Account>
-      extends AbstractWorldUpdater<AbstractWorldUpdater<W, A>, UpdateTrackingAccount<A>> {
-
-    StackedUpdater(final AbstractWorldUpdater<W, A> world) {
-      super(world);
-    }
-
-    @Override
-    protected UpdateTrackingAccount<A> getForMutation(final Address address) {
-      final AbstractWorldUpdater<W, A> wrapped = wrappedWorldView();
-      final UpdateTrackingAccount<A> wrappedTracker = wrapped.updatedAccounts.get(address);
-      if (wrappedTracker != null) {
-        return wrappedTracker;
-      }
-      if (wrapped.deletedAccounts.contains(address)) {
-        return null;
-      }
-      // The wrapped one isn't tracking that account. We're creating a tracking "for him" (but
-      // don't add him yet to his tracking map) because we need it to satisfy the type system.
-      // We will recognize this case in commit below and use that tracker "pay back" our
-      // allocation, so this isn't lost.
-      final A account = wrappedWorldView().getForMutation(address);
-      return account == null ? null : new UpdateTrackingAccount<>(account);
-    }
-
-    @Override
-    public Collection<? extends Account> getTouchedAccounts() {
-      return new ArrayList<>(getUpdatedAccounts());
-    }
-
-    @Override
-    public Collection<Address> getDeletedAccountAddresses() {
-      return new ArrayList<>(getDeletedAccounts());
-    }
-
-    @Override
-    public void revert() {
-      getDeletedAccounts().clear();
-      getUpdatedAccounts().clear();
-    }
-
-    @Override
-    public void commit() {
-      final AbstractWorldUpdater<W, A> wrapped = wrappedWorldView();
-      // Our own updates should apply on top of the updates we're stacked on top, so our deletions
-      // may kill some of "their" updates, and our updates may review some of the account "they"
-      // deleted.
-      getDeletedAccounts().forEach(wrapped.updatedAccounts::remove);
-      getUpdatedAccounts().forEach(a -> wrapped.deletedAccounts.remove(a.getAddress()));
-
-      // Then push our deletes and updates to the stacked ones.
-      wrapped.deletedAccounts.addAll(getDeletedAccounts());
-
-      for (final UpdateTrackingAccount<UpdateTrackingAccount<A>> update : getUpdatedAccounts()) {
-        UpdateTrackingAccount<A> existing = wrapped.updatedAccounts.get(update.getAddress());
-        if (existing == null) {
-          // If we don't track this account, it's either a new one or getForMutation above had
-          // created a tracker to satisfy the type system above and we can reuse that now.
-          existing = update.getWrappedAccount();
-          if (existing == null) {
-            // Brand new account, create our own version
-            existing = new UpdateTrackingAccount<>(update.getAddress());
-          }
-          wrapped.updatedAccounts.put(existing.getAddress(), existing);
-        }
-        existing.setNonce(update.getNonce());
-        existing.setBalance(update.getBalance());
-        if (update.codeWasUpdated()) {
-          existing.setCode(update.getCode());
-          existing.setVersion(update.getVersion());
-        }
-        if (update.getStorageWasCleared()) {
-          existing.clearStorage();
-        }
-        update.getUpdatedStorage().forEach(existing::setStorageValue);
-      }
-    }
-
-    public void markTransactionBoundary() {
-      getUpdatedAccounts().forEach(UpdateTrackingAccount::markTransactionBoundary);
-    }
-  }
-
-  protected void reset() {
-    updatedAccounts.clear();
-    deletedAccounts.clear();
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AccountStorageEntry.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AccountStorageEntry.java
deleted file mode 100644
index 1ab7216a16b..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AccountStorageEntry.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core;
-
-import java.util.Objects;
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class AccountStorageEntry {
-
-  private final UInt256 value;
-  private final Optional<UInt256> key;
-  private final Bytes32 keyHash;
-
-  private AccountStorageEntry(
-      final UInt256 value, final Bytes32 keyHash, final Optional<UInt256> key) {
-    this.key = key;
-    this.keyHash = keyHash;
-    this.value = value;
-  }
-
-  public static AccountStorageEntry create(
-      final UInt256 value, final Bytes32 keyHash, final UInt256 key) {
-    return create(value, keyHash, Optional.ofNullable(key));
-  }
-
-  public static AccountStorageEntry create(
-      final UInt256 value, final Bytes32 keyHash, final Optional<UInt256> key) {
-    return new AccountStorageEntry(value, keyHash, key);
-  }
-
-  public static AccountStorageEntry forKeyAndValue(final UInt256 key, final UInt256 value) {
-    return create(value, Hash.hash(key.toBytes()), key);
-  }
-
-  /**
-   * The original key used for this storage entry. The hash of this key is used to store the value
-   * in the storage trie, so a preimage of the trie key must be available in order to provide the
-   * original key value.
-   *
-   * @return If available, returns the original key corresponding to this storage entry.
-   */
-  public Optional<UInt256> getKey() {
-    return key;
-  }
-
-  /**
-   * The hash of the storage key. When inserting storage entries the hash of the original key is
-   * used as the key. When iterating over values in the storage trie, only the hashedKey and value
-   * are available.
-   *
-   * @return The hash of the storage key.
-   */
-  public Bytes32 getKeyHash() {
-    return keyHash;
-  }
-
-  public UInt256 getValue() {
-    return value;
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (!(o instanceof AccountStorageEntry)) {
-      return false;
-    }
-    final AccountStorageEntry that = (AccountStorageEntry) o;
-    return Objects.equals(value, that.value)
-        && Objects.equals(key, that.key)
-        && Objects.equals(keyHash, that.keyHash);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(value, key, keyHash);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Block.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Block.java
index c75f400cee6..3abeaebd5cb 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Block.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Block.java
@@ -14,11 +14,11 @@
  */
 package org.hyperledger.besu.ethereum.core;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
 
-import java.util.List;
 import java.util.Objects;
 
 import org.apache.tuweni.bytes.Bytes;
@@ -57,8 +57,7 @@ public void writeTo(final RLPOutput out) {
     out.startList();
 
     header.writeTo(out);
-    out.writeList(body.getTransactions(), Transaction::writeTo);
-    out.writeList(body.getOmmers(), BlockHeader::writeTo);
+    body.writeTo(out);
 
     out.endList();
   }
@@ -66,11 +65,10 @@ public void writeTo(final RLPOutput out) {
   public static Block readFrom(final RLPInput in, final BlockHeaderFunctions hashFunction) {
     in.enterList();
     final BlockHeader header = BlockHeader.readFrom(in, hashFunction);
-    final List<Transaction> transactions = in.readList(Transaction::readFrom);
-    final List<BlockHeader> ommers = in.readList(rlp -> BlockHeader.readFrom(rlp, hashFunction));
+    final BlockBody body = BlockBody.readFrom(in, hashFunction);
     in.leaveList();
 
-    return new Block(header, new BlockBody(transactions, ommers));
+    return new Block(header, body);
   }
 
   @Override
@@ -98,4 +96,8 @@ public String toString() {
     sb.append("body=").append(body);
     return sb.append("}").toString();
   }
+
+  public String toLogString() {
+    return getHeader().toLogString();
+  }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockBody.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockBody.java
index 8ae7024b32d..7defb8eab29 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockBody.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockBody.java
@@ -20,85 +20,186 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 public class BlockBody implements org.hyperledger.besu.plugin.data.BlockBody {
 
   private static final BlockBody EMPTY =
       new BlockBody(Collections.emptyList(), Collections.emptyList());
-
+  /**
+   * Adding a new field with a corresponding root hash in the block header will require a change in
+   * {@link org.hyperledger.besu.ethereum.eth.manager.task.GetBodiesFromPeerTask.BodyIdentifier}
+   * Also requires adding the new field to the constructor used in the {@link
+   * org.hyperledger.besu.ethereum.util.RawBlockIterator }
+   */
   private final List<Transaction> transactions;
+
   private final List<BlockHeader> ommers;
+  private final Optional<List<Withdrawal>> withdrawals;
+  private final Optional<List<Deposit>> deposits;
 
   public BlockBody(final List<Transaction> transactions, final List<BlockHeader> ommers) {
     this.transactions = transactions;
     this.ommers = ommers;
+    this.withdrawals = Optional.empty();
+    this.deposits = Optional.empty();
+  }
+
+  public BlockBody(
+      final List<Transaction> transactions,
+      final List<BlockHeader> ommers,
+      final Optional<List<Withdrawal>> withdrawals,
+      final Optional<List<Deposit>> deposits) {
+    this.transactions = transactions;
+    this.ommers = ommers;
+    this.withdrawals = withdrawals;
+    this.deposits = deposits;
   }
 
   public static BlockBody empty() {
     return EMPTY;
   }
 
-  /** @return The list of transactions of the block. */
+  /**
+   * @return The list of transactions of the block.
+   */
   @Override
   public List<Transaction> getTransactions() {
     return transactions;
   }
 
-  /** @return The list of ommers of the block. */
+  /**
+   * @return The list of ommers of the block.
+   */
   @Override
   public List<BlockHeader> getOmmers() {
     return ommers;
   }
 
+  /**
+   * Returns the withdrawals of the block.
+   *
+   * @return The optional list of withdrawals included in the block.
+   */
+  @Override
+  public Optional<List<Withdrawal>> getWithdrawals() {
+    return withdrawals;
+  }
+
+  /**
+   * Returns the deposits of the block.
+   *
+   * @return The optional list of deposits included in the block.
+   */
+  @Override
+  public Optional<List<Deposit>> getDeposits() {
+    return deposits;
+  }
+
   /**
    * Writes Block to {@link RLPOutput}.
    *
    * @param output Output to write to
    */
-  public void writeTo(final RLPOutput output) {
+  public void writeWrappedBodyTo(final RLPOutput output) {
     output.startList();
+    writeTo(output);
+    output.endList();
+  }
 
+  public void writeTo(final RLPOutput output) {
     output.writeList(getTransactions(), Transaction::writeTo);
     output.writeList(getOmmers(), BlockHeader::writeTo);
-
-    output.endList();
+    withdrawals.ifPresent(withdrawals -> output.writeList(withdrawals, Withdrawal::writeTo));
+    deposits.ifPresent(deposits -> output.writeList(deposits, Deposit::writeTo));
   }
 
-  public static BlockBody readFrom(
+  public static BlockBody readWrappedBodyFrom(
       final RLPInput input, final BlockHeaderFunctions blockHeaderFunctions) {
+    return readWrappedBodyFrom(input, blockHeaderFunctions, false);
+  }
+
+  /**
+   * Read all fields from the block body expecting a list wrapping them An example of valid body
+   * structure that this method would be able to read is: [[txs],[ommers],[withdrawals]] This is
+   * used for decoding list of bodies
+   *
+   * @param input The RLP-encoded input
+   * @param blockHeaderFunctions The block header functions used for parsing block headers
+   * @param allowEmptyBody A flag indicating whether an empty body is allowed
+   * @return the decoded BlockBody from the RLP
+   */
+  public static BlockBody readWrappedBodyFrom(
+      final RLPInput input,
+      final BlockHeaderFunctions blockHeaderFunctions,
+      final boolean allowEmptyBody) {
     input.enterList();
-    // TODO: Support multiple hard fork transaction formats.
-    final BlockBody body =
-        new BlockBody(
-            input.readList(Transaction::readFrom),
-            input.readList(rlp -> BlockHeader.readFrom(rlp, blockHeaderFunctions)));
+    if (input.isEndOfCurrentList() && allowEmptyBody) {
+      // empty block [] -> Return empty body.
+      input.leaveList();
+      return empty();
+    }
+    final BlockBody body = readFrom(input, blockHeaderFunctions);
     input.leaveList();
     return body;
   }
 
+  /**
+   * Read all fields from the block body expecting no list wrapping them. An example of a valid body
+   * would be: [txs],[ommers],[withdrawals],[deposits] this method is called directly when importing
+   * a single block
+   *
+   * @param input The RLP-encoded input
+   * @param blockHeaderFunctions The block header functions used for parsing block headers
+   * @return the BlockBody decoded from the RLP
+   */
+  public static BlockBody readFrom(
+      final RLPInput input, final BlockHeaderFunctions blockHeaderFunctions) {
+    return new BlockBody(
+        input.readList(Transaction::readFrom),
+        input.readList(rlp -> BlockHeader.readFrom(rlp, blockHeaderFunctions)),
+        input.isEndOfCurrentList()
+            ? Optional.empty()
+            : Optional.of(input.readList(Withdrawal::readFrom)),
+        input.isEndOfCurrentList()
+            ? Optional.empty()
+            : Optional.of(input.readList(Deposit::readFrom)));
+  }
+
   @Override
-  public boolean equals(final Object obj) {
-    if (obj == this) {
-      return true;
-    }
-    if (!(obj instanceof BlockBody)) {
-      return false;
-    }
-    final BlockBody other = (BlockBody) obj;
-    return transactions.equals(other.transactions) && ommers.equals(other.ommers);
+  public boolean equals(final Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    BlockBody blockBody = (BlockBody) o;
+    return Objects.equals(transactions, blockBody.transactions)
+        && Objects.equals(ommers, blockBody.ommers)
+        && Objects.equals(withdrawals, blockBody.withdrawals)
+        && Objects.equals(deposits, blockBody.deposits);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(transactions, ommers);
+    return Objects.hash(transactions, ommers, withdrawals, deposits);
+  }
+
+  public boolean isEmpty() {
+    return transactions.isEmpty()
+        && ommers.isEmpty()
+        && withdrawals.isEmpty()
+        && deposits.isEmpty();
   }
 
   @Override
   public String toString() {
-    final StringBuilder sb = new StringBuilder();
-    sb.append("BlockBody{");
-    sb.append("transactions=").append(transactions).append(", ");
-    sb.append("ommers=").append(ommers);
-    return sb.append("}").toString();
+    return "BlockBody{"
+        + "transactions="
+        + transactions
+        + ", ommers="
+        + ommers
+        + ", withdrawals="
+        + withdrawals
+        + ", deposits="
+        + deposits
+        + '}';
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeader.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeader.java
index 124e13399c5..4a20c2de520 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeader.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,15 +14,21 @@
  */
 package org.hyperledger.besu.ethereum.core;
 
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.DataGas;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
 
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.Supplier;
 
 import com.google.common.base.Suppliers;
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
 
 /** A mined Ethereum block header. */
 public class BlockHeader extends SealableBlockHeader
@@ -32,8 +38,6 @@ public class BlockHeader extends SealableBlockHeader
 
   public static final long GENESIS_BLOCK_NUMBER = 0L;
 
-  private final Hash mixHash;
-
   private final long nonce;
 
   private final Supplier<Hash> hash;
@@ -54,9 +58,58 @@ public BlockHeader(
       final long gasUsed,
       final long timestamp,
       final Bytes extraData,
-      final Long baseFee,
-      final Hash mixHash,
+      final Wei baseFee,
+      final Bytes32 mixHashOrPrevRandao,
       final long nonce,
+      final Hash withdrawalsRoot,
+      final DataGas excessDataGas,
+      final Hash depositsRoot,
+      final BlockHeaderFunctions blockHeaderFunctions,
+      final Optional<LogsBloomFilter> privateLogsBloom) {
+    super(
+        parentHash,
+        ommersHash,
+        coinbase,
+        stateRoot,
+        transactionsRoot,
+        receiptsRoot,
+        logsBloom,
+        difficulty,
+        number,
+        gasLimit,
+        gasUsed,
+        timestamp,
+        extraData,
+        baseFee,
+        mixHashOrPrevRandao,
+        withdrawalsRoot,
+        excessDataGas,
+        depositsRoot);
+    this.nonce = nonce;
+    this.hash = Suppliers.memoize(() -> blockHeaderFunctions.hash(this));
+    this.parsedExtraData = Suppliers.memoize(() -> blockHeaderFunctions.parseExtraData(this));
+  }
+
+  public BlockHeader(
+      final Hash parentHash,
+      final Hash ommersHash,
+      final Address coinbase,
+      final Hash stateRoot,
+      final Hash transactionsRoot,
+      final Hash receiptsRoot,
+      final LogsBloomFilter logsBloom,
+      final Difficulty difficulty,
+      final long number,
+      final long gasLimit,
+      final long gasUsed,
+      final long timestamp,
+      final Bytes extraData,
+      final Wei baseFee,
+      final Bytes32 mixHashOrPrevRandao,
+      final long nonce,
+      final Hash withdrawalsRoot,
+      final DataGas excessDataGas,
+      final Hash depositsRoot,
       final BlockHeaderFunctions blockHeaderFunctions) {
     super(
         parentHash,
@@ -72,8 +125,11 @@ public BlockHeader(
         gasUsed,
         timestamp,
         extraData,
-        baseFee);
-    this.mixHash = mixHash;
+        baseFee,
+        mixHashOrPrevRandao,
+        withdrawalsRoot,
+        excessDataGas,
+        depositsRoot);
     this.nonce = nonce;
     this.hash = Suppliers.memoize(() -> blockHeaderFunctions.hash(this));
     this.parsedExtraData = Suppliers.memoize(() -> blockHeaderFunctions.parseExtraData(this));
@@ -86,7 +142,12 @@ public BlockHeader(
    */
   @Override
   public Hash getMixHash() {
-    return mixHash;
+    return Hash.wrap(mixHashOrPrevRandao);
+  }
+
+  @Override
+  public Bytes32 getMixHashOrPrevRandao() {
+    return mixHashOrPrevRandao;
   }
 
   /**
@@ -118,7 +179,7 @@ public Hash getHash() {
   }
 
   @Override
-  public org.hyperledger.besu.plugin.data.Hash getBlockHash() {
+  public Hash getBlockHash() {
     return hash.get();
   }
 
@@ -143,10 +204,19 @@ public void writeTo(final RLPOutput out) {
     out.writeLongScalar(gasUsed);
     out.writeLongScalar(timestamp);
     out.writeBytes(extraData);
-    out.writeBytes(mixHash);
+    out.writeBytes(mixHashOrPrevRandao);
     out.writeLong(nonce);
-    if (ExperimentalEIPs.eip1559Enabled && baseFee != null) {
-      out.writeLongScalar(baseFee);
+    if (baseFee != null) {
+      out.writeUInt256Scalar(baseFee);
+    }
+    if (withdrawalsRoot != null) {
+      out.writeBytes(withdrawalsRoot);
+    }
+    if (excessDataGas != null) {
+      out.writeUInt256Scalar(excessDataGas);
+    }
+    if (depositsRoot != null) {
+      out.writeBytes(depositsRoot);
     }
     out.endList();
   }
@@ -167,12 +237,15 @@ public static BlockHeader readFrom(
     final long gasUsed = input.readLongScalar();
     final long timestamp = input.readLongScalar();
     final Bytes extraData = input.readBytes();
-    final Hash mixHash = Hash.wrap(input.readBytes32());
+    final Bytes32 mixHashOrPrevRandao = input.readBytes32();
     final long nonce = input.readLong();
-    final Long baseFee =
-        ExperimentalEIPs.eip1559Enabled && !input.isEndOfCurrentList()
-            ? input.readLongScalar()
-            : null;
+    final Wei baseFee = !input.isEndOfCurrentList() ? Wei.of(input.readUInt256Scalar()) : null;
+    final Hash withdrawalHashRoot =
+        !input.isEndOfCurrentList() ? Hash.wrap(input.readBytes32()) : null;
+    final DataGas excessDataGas =
+        !input.isEndOfCurrentList() ? DataGas.of(input.readUInt256Scalar()) : null;
+    final Hash depositHashRoot =
+        !input.isEndOfCurrentList() ? Hash.wrap(input.readBytes32()) : null;
     input.leaveList();
     return new BlockHeader(
         parentHash,
@@ -189,8 +262,11 @@ public static BlockHeader readFrom(
         timestamp,
         extraData,
         baseFee,
-        mixHash,
+        mixHashOrPrevRandao,
         nonce,
+        withdrawalHashRoot,
+        excessDataGas,
+        depositHashRoot,
         blockHeaderFunctions);
   }
 
@@ -230,8 +306,17 @@ public String toString() {
     sb.append("timestamp=").append(timestamp).append(", ");
     sb.append("extraData=").append(extraData).append(", ");
     sb.append("baseFee=").append(baseFee).append(", ");
-    sb.append("mixHash=").append(mixHash).append(", ");
-    sb.append("nonce=").append(nonce);
+    sb.append("mixHashOrPrevRandao=").append(mixHashOrPrevRandao).append(", ");
+    sb.append("nonce=").append(nonce).append(", ");
+    if (withdrawalsRoot != null) {
+      sb.append("withdrawalsRoot=").append(withdrawalsRoot).append(", ");
+    }
+    if (excessDataGas != null) {
+      sb.append("excessDataGas=").append(excessDataGas).append(", ");
+    }
+    if (depositsRoot != null) {
+      sb.append("depositsRoot=").append(depositsRoot);
+    }
     return sb.append("}").toString();
   }
 
@@ -241,8 +326,7 @@ public static org.hyperledger.besu.ethereum.core.BlockHeader convertPluginBlockH
     return new org.hyperledger.besu.ethereum.core.BlockHeader(
         Hash.fromHexString(pluginBlockHeader.getParentHash().toHexString()),
         Hash.fromHexString(pluginBlockHeader.getOmmersHash().toHexString()),
-        org.hyperledger.besu.ethereum.core.Address.fromHexString(
-            pluginBlockHeader.getCoinbase().toHexString()),
+        Address.fromHexString(pluginBlockHeader.getCoinbase().toHexString()),
         Hash.fromHexString(pluginBlockHeader.getStateRoot().toHexString()),
         Hash.fromHexString(pluginBlockHeader.getTransactionsRoot().toHexString()),
         Hash.fromHexString(pluginBlockHeader.getReceiptsRoot().toHexString()),
@@ -253,9 +337,23 @@ public static org.hyperledger.besu.ethereum.core.BlockHeader convertPluginBlockH
         pluginBlockHeader.getGasUsed(),
         pluginBlockHeader.getTimestamp(),
         pluginBlockHeader.getExtraData(),
-        pluginBlockHeader.getBaseFee().orElse(null),
-        Hash.fromHexString(pluginBlockHeader.getMixHash().toHexString()),
+        pluginBlockHeader.getBaseFee().map(Wei::fromQuantity).orElse(null),
+        pluginBlockHeader.getPrevRandao().orElse(null),
         pluginBlockHeader.getNonce(),
+        pluginBlockHeader
+            .getWithdrawalsRoot()
+            .map(h -> Hash.fromHexString(h.toHexString()))
+            .orElse(null),
+        pluginBlockHeader.getExcessDataGas().map(DataGas::fromQuantity).orElse(null),
+        pluginBlockHeader
+            .getDepositsRoot()
+            .map(h -> Hash.fromHexString(h.toHexString()))
+            .orElse(null),
         blockHeaderFunctions);
   }
+
+  @Override
+  public String toLogString() {
+    return getNumber() + " (" + getHash() + ")";
+  }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeaderBuilder.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeaderBuilder.java
index 30a6b2fc77a..e670c37221d 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeaderBuilder.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeaderBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -18,10 +18,18 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.DataGas;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
+
 import java.time.Instant;
 import java.util.OptionalLong;
 
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
 
 /** A utility class for building block headers. */
 public class BlockHeaderBuilder {
@@ -36,6 +44,9 @@ public class BlockHeaderBuilder {
 
   private Hash transactionsRoot;
 
+  private Hash withdrawalsRoot = null;
+  private Hash depositsRoot = null;
+
   private Hash receiptsRoot;
 
   private LogsBloomFilter logsBloom;
@@ -52,9 +63,9 @@ public class BlockHeaderBuilder {
 
   private Bytes extraData;
 
-  private Long baseFee = null;
+  private Wei baseFee = null;
 
-  private Hash mixHash;
+  private Bytes32 mixHashOrPrevRandao = null;
 
   private BlockHeaderFunctions blockHeaderFunctions;
 
@@ -62,10 +73,32 @@ public class BlockHeaderBuilder {
   // instead of an invalid identifier such as -1.
   private OptionalLong nonce = OptionalLong.empty();
 
+  private DataGas excessDataGas = null;
+
   public static BlockHeaderBuilder create() {
     return new BlockHeaderBuilder();
   }
 
+  public static BlockHeaderBuilder createDefault() {
+    return new BlockHeaderBuilder()
+        .parentHash(Hash.EMPTY)
+        .coinbase(Address.ZERO)
+        .difficulty(Difficulty.ONE)
+        .number(0)
+        .gasLimit(30_000_000)
+        .timestamp(0)
+        .ommersHash(Hash.EMPTY_LIST_HASH)
+        .stateRoot(Hash.EMPTY_TRIE_HASH)
+        .transactionsRoot(Hash.EMPTY)
+        .receiptsRoot(Hash.EMPTY)
+        .logsBloom(LogsBloomFilter.empty())
+        .gasUsed(0)
+        .extraData(Bytes.EMPTY)
+        .mixHash(Hash.EMPTY)
+        .nonce(0)
+        .blockHeaderFunctions(new MainnetBlockHeaderFunctions());
+  }
+
   public static BlockHeaderBuilder fromHeader(final BlockHeader header) {
     return create()
         .parentHash(header.getParentHash())
@@ -83,11 +116,15 @@ public static BlockHeaderBuilder fromHeader(final BlockHeader header) {
         .extraData(header.getExtraData())
         .baseFee(header.getBaseFee().orElse(null))
         .mixHash(header.getMixHash())
-        .nonce(header.getNonce());
+        .nonce(header.getNonce())
+        .prevRandao(header.getPrevRandao().orElse(null))
+        .withdrawalsRoot(header.getWithdrawalsRoot().orElse(null))
+        .excessDataGas(header.getExcessDataGas().orElse(null))
+        .depositsRoot(header.getDepositsRoot().orElse(null));
   }
 
   public static BlockHeaderBuilder fromBuilder(final BlockHeaderBuilder fromBuilder) {
-    BlockHeaderBuilder toBuilder =
+    final BlockHeaderBuilder toBuilder =
         create()
             .parentHash(fromBuilder.parentHash)
             .ommersHash(fromBuilder.ommersHash)
@@ -102,8 +139,11 @@ public static BlockHeaderBuilder fromBuilder(final BlockHeaderBuilder fromBuilde
             .gasUsed(fromBuilder.gasUsed)
             .timestamp(fromBuilder.timestamp)
             .extraData(fromBuilder.extraData)
-            .mixHash(fromBuilder.mixHash)
             .baseFee(fromBuilder.baseFee)
+            .prevRandao(fromBuilder.mixHashOrPrevRandao)
+            .withdrawalsRoot(fromBuilder.withdrawalsRoot)
+            .excessDataGas(fromBuilder.excessDataGas)
+            .depositsRoot(fromBuilder.depositsRoot)
             .blockHeaderFunctions(fromBuilder.blockHeaderFunctions);
     toBuilder.nonce = fromBuilder.nonce;
     return toBuilder;
@@ -127,8 +167,11 @@ public BlockHeader buildBlockHeader() {
         timestamp < 0 ? Instant.now().getEpochSecond() : timestamp,
         extraData,
         baseFee,
-        mixHash,
+        mixHashOrPrevRandao,
         nonce.getAsLong(),
+        withdrawalsRoot,
+        excessDataGas,
+        depositsRoot,
         blockHeaderFunctions);
   }
 
@@ -136,7 +179,15 @@ public ProcessableBlockHeader buildProcessableBlockHeader() {
     validateProcessableBlockHeader();
 
     return new ProcessableBlockHeader(
-        parentHash, coinbase, difficulty, number, gasLimit, timestamp, baseFee);
+        parentHash,
+        coinbase,
+        difficulty,
+        number,
+        gasLimit,
+        timestamp,
+        baseFee,
+        mixHashOrPrevRandao,
+        excessDataGas);
   }
 
   public SealableBlockHeader buildSealableBlockHeader() {
@@ -156,12 +207,16 @@ public SealableBlockHeader buildSealableBlockHeader() {
         gasUsed,
         timestamp,
         extraData,
-        baseFee);
+        baseFee,
+        mixHashOrPrevRandao,
+        withdrawalsRoot,
+        excessDataGas,
+        depositsRoot);
   }
 
   private void validateBlockHeader() {
     validateSealableBlockHeader();
-    checkState(this.mixHash != null, "Missing mixHash");
+    checkState(this.mixHashOrPrevRandao != null, "Missing mixHash or prevRandao");
     checkState(this.nonce.isPresent(), "Missing nonce");
     checkState(this.blockHeaderFunctions != null, "Missing blockHeaderFunctions");
   }
@@ -195,6 +250,8 @@ public BlockHeaderBuilder populateFrom(final ProcessableBlockHeader processableB
     gasLimit(processableBlockHeader.getGasLimit());
     timestamp(processableBlockHeader.getTimestamp());
     baseFee(processableBlockHeader.getBaseFee().orElse(null));
+    processableBlockHeader.getPrevRandao().ifPresent(this::prevRandao);
+    processableBlockHeader.getExcessDataGas().ifPresent(this::excessDataGas);
     return this;
   }
 
@@ -214,6 +271,10 @@ public BlockHeaderBuilder populateFrom(final SealableBlockHeader sealableBlockHe
     timestamp(sealableBlockHeader.getTimestamp());
     extraData(sealableBlockHeader.getExtraData());
     baseFee(sealableBlockHeader.getBaseFee().orElse(null));
+    sealableBlockHeader.getPrevRandao().ifPresent(this::prevRandao);
+    withdrawalsRoot(sealableBlockHeader.getWithdrawalsRoot().orElse(null));
+    sealableBlockHeader.getExcessDataGas().ifPresent(this::excessDataGas);
+    depositsRoot(sealableBlockHeader.getDepositsRoot().orElse(null));
     return this;
   }
 
@@ -298,7 +359,7 @@ public BlockHeaderBuilder extraData(final Bytes data) {
 
   public BlockHeaderBuilder mixHash(final Hash mixHash) {
     checkNotNull(mixHash);
-    this.mixHash = mixHash;
+    this.mixHashOrPrevRandao = mixHash;
     return this;
   }
 
@@ -312,8 +373,30 @@ public BlockHeaderBuilder blockHeaderFunctions(final BlockHeaderFunctions blockH
     return this;
   }
 
-  public BlockHeaderBuilder baseFee(final Long baseFee) {
+  public BlockHeaderBuilder baseFee(final Wei baseFee) {
     this.baseFee = baseFee;
     return this;
   }
+
+  public BlockHeaderBuilder prevRandao(final Bytes32 prevRandao) {
+    if (prevRandao != null) {
+      this.mixHashOrPrevRandao = prevRandao;
+    }
+    return this;
+  }
+
+  public BlockHeaderBuilder withdrawalsRoot(final Hash hash) {
+    this.withdrawalsRoot = hash;
+    return this;
+  }
+
+  public BlockHeaderBuilder depositsRoot(final Hash hash) {
+    this.depositsRoot = hash;
+    return this;
+  }
+
+  public BlockHeaderBuilder excessDataGas(final DataGas excessDataGas) {
+    this.excessDataGas = excessDataGas;
+    return this;
+  }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeaderFunctions.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeaderFunctions.java
index 17a3be697d9..23621628ccf 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeaderFunctions.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeaderFunctions.java
@@ -14,6 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.core;
 
+import org.hyperledger.besu.datatypes.Hash;
+
 /**
  * An interface for calculating pars of a {@link BlockHeader} which vary based on the consensus
  * mechanism.
@@ -38,4 +40,16 @@ public interface BlockHeaderFunctions {
    *     consensus mechanism does not include parseable information in the extra data field.
    */
   ParsedExtraData parseExtraData(BlockHeader header);
+
+  /**
+   * Depending on the consensus, several block headers must be downloaded before the checkpoint in
+   * order to validate the following blocks. This method returns the necessary number of block
+   * headers to download to be able to start the checkpoint sync
+   *
+   * @param blockHeader of the checkpoint
+   * @return number of headers to download
+   */
+  default int getCheckPointWindowSize(final BlockHeader blockHeader) {
+    return 1;
+  }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockImporter.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockImporter.java
index ed3e5b962b2..ce5c849e3a2 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockImporter.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockImporter.java
@@ -15,6 +15,7 @@
 package org.hyperledger.besu.ethereum.core;
 
 import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.mainnet.BlockImportResult;
 import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
 
 import java.util.List;
@@ -34,10 +35,10 @@ public interface BlockImporter {
    * @param context The context to attempt to update
    * @param block The block
    * @param headerValidationMode Determines the validation to perform on this header.
-   * @return {@code true} if the block was added somewhere in the blockchain; otherwise {@code
-   *     false}
+   * @return {@code BlockImportResult}
+   * @see BlockImportResult
    */
-  default boolean importBlock(
+  default BlockImportResult importBlock(
       final ProtocolContext context,
       final Block block,
       final HeaderValidationMode headerValidationMode) {
@@ -51,10 +52,10 @@ default boolean importBlock(
    * @param block The block
    * @param headerValidationMode Determines the validation to perform on this header.
    * @param ommerValidationMode Determines the validation to perform on ommer headers.
-   * @return {@code true} if the block was added somewhere in the blockchain; otherwise {@code
-   *     false}
+   * @return {@code BlockImportResult}
+   * @see BlockImportResult
    */
-  boolean importBlock(
+  BlockImportResult importBlock(
       ProtocolContext context,
       Block block,
       HeaderValidationMode headerValidationMode,
@@ -69,10 +70,10 @@ boolean importBlock(
    * @param receipts The receipts associated with this block.
    * @param headerValidationMode Determines the validation to perform on this header.
    * @param ommerValidationMode Determines the validation to perform on ommer headers.
-   * @return {@code true} if the block was added somewhere in the blockchain; otherwise {@code
-   *     false}
+   * @return {@code BlockImportResult}
+   * @see BlockImportResult
    */
-  boolean fastImportBlock(
+  BlockImportResult fastImportBlock(
       ProtocolContext context,
       Block block,
       List<TransactionReceipt> receipts,
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockValueCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockValueCalculator.java
new file mode 100644
index 00000000000..cbf6a7c6941
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockValueCalculator.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright Contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core;
+
+import org.hyperledger.besu.datatypes.Wei;
+
+import java.util.List;
+
+public class BlockValueCalculator {
+
+  public Wei calculateBlockValue(final BlockWithReceipts blockWithReceipts) {
+    final Block block = blockWithReceipts.getBlock();
+    final List<Transaction> txs = block.getBody().getTransactions();
+    final List<TransactionReceipt> receipts = blockWithReceipts.getReceipts();
+    Wei totalFee = Wei.ZERO;
+    for (int i = 0; i < txs.size(); i++) {
+      final Wei minerFee = txs.get(i).getEffectivePriorityFeePerGas(block.getHeader().getBaseFee());
+      // we don't store gasUsed and need to calculate that on the fly
+      // receipts are fetched in ascending sorted by cumulativeGasUsed
+      long gasUsed = receipts.get(i).getCumulativeGasUsed();
+      if (i > 0) {
+        gasUsed = gasUsed - receipts.get(i - 1).getCumulativeGasUsed();
+      }
+      totalFee = totalFee.add(minerFee.multiply(gasUsed));
+    }
+    return totalFee;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockWithReceipts.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockWithReceipts.java
index ae642b065ad..05144c16b8b 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockWithReceipts.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockWithReceipts.java
@@ -14,6 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.core;
 
+import org.hyperledger.besu.datatypes.Hash;
+
 import java.util.List;
 import java.util.Objects;
 
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Deposit.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Deposit.java
new file mode 100644
index 00000000000..b01d6deee32
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Deposit.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core;
+
+import org.hyperledger.besu.datatypes.BLSPublicKey;
+import org.hyperledger.besu.datatypes.BLSSignature;
+import org.hyperledger.besu.datatypes.GWei;
+import org.hyperledger.besu.datatypes.PublicKey;
+import org.hyperledger.besu.ethereum.core.encoding.DepositDecoder;
+import org.hyperledger.besu.ethereum.core.encoding.DepositEncoder;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+
+import java.util.Objects;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt64;
+
+public class Deposit implements org.hyperledger.besu.plugin.data.Deposit {
+
+  private final BLSPublicKey pubKey;
+  private final Bytes32 depositWithdrawalCredentials;
+  private final GWei amount;
+  private final BLSSignature signature;
+  private final UInt64 index;
+
+  public Deposit(
+      final BLSPublicKey pubKey,
+      final Bytes32 depositWithdrawalCredentials,
+      final GWei amount,
+      final BLSSignature signature,
+      final UInt64 index) {
+    this.pubKey = pubKey;
+    this.depositWithdrawalCredentials = depositWithdrawalCredentials;
+    this.amount = amount;
+    this.signature = signature;
+    this.index = index;
+  }
+
+  public static Deposit readFrom(final Bytes rlpBytes) {
+    return readFrom(RLP.input(rlpBytes));
+  }
+
+  public static Deposit readFrom(final RLPInput rlpInput) {
+    return DepositDecoder.decode(rlpInput);
+  }
+
+  public void writeTo(final RLPOutput out) {
+    DepositEncoder.encode(this, out);
+  }
+
+  @Override
+  public PublicKey getPublicKey() {
+    return pubKey;
+  }
+
+  @Override
+  public Bytes32 getWithdrawalCredentials() {
+    return depositWithdrawalCredentials;
+  }
+
+  @Override
+  public GWei getAmount() {
+    return amount;
+  }
+
+  @Override
+  public BLSSignature getSignature() {
+    return signature;
+  }
+
+  @Override
+  public UInt64 getIndex() {
+    return index;
+  }
+
+  @Override
+  public String toString() {
+    return "Deposit{"
+        + "pubKey="
+        + pubKey
+        + ", withdrawalCredentials="
+        + depositWithdrawalCredentials
+        + ", amount="
+        + amount
+        + ", signature="
+        + signature
+        + ", index="
+        + index
+        + '}';
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    final Deposit that = (Deposit) o;
+    return Objects.equals(pubKey, that.pubKey)
+        && Objects.equals(depositWithdrawalCredentials, that.depositWithdrawalCredentials)
+        && Objects.equals(amount, that.amount)
+        && Objects.equals(signature, that.signature)
+        && Objects.equals(index, that.index);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(pubKey, depositWithdrawalCredentials, amount, signature, index);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/DepositContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/DepositContract.java
new file mode 100644
index 00000000000..9f36df7ca97
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/DepositContract.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.core;
+
+import org.hyperledger.besu.evm.log.LogTopic;
+
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+import org.web3j.abi.TypeReference;
+import org.web3j.abi.datatypes.DynamicBytes;
+import org.web3j.abi.datatypes.Event;
+import org.web3j.protocol.Web3j;
+import org.web3j.protocol.core.methods.response.Log;
+import org.web3j.tx.Contract;
+import org.web3j.tx.TransactionManager;
+import org.web3j.tx.gas.ContractGasProvider;
+
+public class DepositContract extends Contract {
+
+  public static final Event DEPOSITEVENT_EVENT =
+      new Event(
+          "DepositEvent",
+          Arrays.asList(
+              new TypeReference<DynamicBytes>() {},
+              new TypeReference<DynamicBytes>() {},
+              new TypeReference<DynamicBytes>() {},
+              new TypeReference<DynamicBytes>() {},
+              new TypeReference<DynamicBytes>() {}));
+
+  DepositContract(
+      final String contractBinary,
+      final String contractAddress,
+      final Web3j web3j,
+      final TransactionManager transactionManager,
+      final ContractGasProvider gasProvider) {
+    super(contractBinary, contractAddress, web3j, transactionManager, gasProvider);
+  }
+
+  public static EventValuesWithLog staticExtractDepositEventWithLog(
+      final org.hyperledger.besu.evm.log.Log log) {
+    Log web3jLog = new Log();
+    web3jLog.setTopics(
+        log.getTopics().stream().map(LogTopic::toHexString).collect(Collectors.toList()));
+    web3jLog.setData(log.getData().toHexString());
+
+    return staticExtractEventParametersWithLog(DEPOSITEVENT_EVENT, web3jLog);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Difficulty.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Difficulty.java
index 55dbd3bb712..f939c6109f9 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Difficulty.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Difficulty.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.core;
 
-import org.hyperledger.besu.plugin.data.Quantity;
+import org.hyperledger.besu.datatypes.Quantity;
 
 import java.math.BigInteger;
 
@@ -67,16 +67,34 @@ public static Difficulty fromHexString(final String str) {
     return new Difficulty(str);
   }
 
+  public static Difficulty fromHexOrDecimalString(final String str) {
+    return str.startsWith("0x") ? new Difficulty(str) : new Difficulty(new BigInteger(str));
+  }
+
   @Override
   public Number getValue() {
+    return getAsBigInteger();
+  }
+
+  @Override
+  public BigInteger getAsBigInteger() {
     return toBigInteger();
   }
 
+  public Bytes32 getAsBytes32() {
+    return this;
+  }
+
   @Override
   public String toHexString() {
     return super.toHexString();
   }
 
+  @Override
+  public String toShortHexString() {
+    return super.isZero() ? "0x0" : super.toShortHexString();
+  }
+
   @Override
   public Difficulty copy() {
     return super.copy();
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/EvmAccount.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/EvmAccount.java
deleted file mode 100644
index 26621f29887..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/EvmAccount.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core;
-
-public interface EvmAccount extends Account {
-  public MutableAccount getMutable() throws ModificationNotAllowedException;
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Gas.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Gas.java
deleted file mode 100644
index d7f68d3c824..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Gas.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core;
-
-import java.math.BigInteger;
-import javax.annotation.concurrent.Immutable;
-
-import com.google.common.primitives.Longs;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-/** A particular quantity of Gas as used by the Ethereum VM. */
-@Immutable
-public final class Gas {
-
-  private final long value;
-
-  public static final Gas ZERO = of(0);
-
-  public static final Gas MAX_VALUE = Gas.of(Long.MAX_VALUE);
-
-  private static final BigInteger MAX_VALUE_BIGINT = BigInteger.valueOf(Long.MAX_VALUE);
-
-  Gas(final long value) {
-    this.value = value;
-  }
-
-  public static Gas of(final long value) {
-    return new Gas(value);
-  }
-
-  public static Gas of(final BigInteger value) {
-    if (value.compareTo(MAX_VALUE_BIGINT) > 0) {
-      return MAX_VALUE;
-    }
-
-    return of(value.longValue());
-  }
-
-  public static Gas of(final UInt256 value) {
-    if (value.fitsLong()) {
-      return of(value.toLong());
-    } else {
-      return MAX_VALUE;
-    }
-  }
-
-  public static Gas of(final Bytes32 value) {
-    return Gas.of(UInt256.fromBytes(value));
-  }
-
-  public static Gas fromHexString(final String str) {
-    try {
-      final long value = Long.decode(str);
-      return Gas.of(value);
-    } catch (final NumberFormatException e) {
-      return MAX_VALUE;
-    }
-  }
-
-  /**
-   * The price of this amount of gas given the provided price per unit of gas.
-   *
-   * @param gasPrice The price per unit of gas.
-   * @return The price of this amount of gas for a per unit of gas price of {@code gasPrice}.
-   */
-  public Wei priceFor(final Wei gasPrice) {
-    return gasPrice.multiply(value);
-  }
-
-  public Gas max(final Gas other) {
-    return of(Long.max(value, other.value));
-  }
-
-  public Gas min(final Gas other) {
-    return of(Long.min(value, other.value));
-  }
-
-  public Gas dividedBy(final long other) {
-    return Gas.of(value / other);
-  }
-
-  public Gas plus(final Gas amount) {
-    try {
-      return of(Math.addExact(value, amount.value));
-    } catch (final ArithmeticException e) {
-      return MAX_VALUE;
-    }
-  }
-
-  public Gas minus(final Gas amount) {
-    return of(value - amount.value);
-  }
-
-  public Gas times(final Gas amount) {
-    try {
-      return of(Math.multiplyExact(value, amount.value));
-    } catch (final ArithmeticException e) {
-      return MAX_VALUE;
-    }
-  }
-
-  public Gas times(final long amount) {
-    return times(Gas.of(amount));
-  }
-
-  public UInt256 asUInt256() {
-    return UInt256.valueOf(value);
-  }
-
-  public int compareTo(final Gas other) {
-    return Long.compare(value, other.value);
-  }
-
-  public byte[] getBytes() {
-    return Longs.toByteArray(value);
-  }
-
-  public long toLong() {
-    return value;
-  }
-
-  @Override
-  public int hashCode() {
-    return Longs.hashCode(value);
-  }
-
-  @Override
-  public boolean equals(final Object obj) {
-    if (!(obj instanceof Gas)) {
-      return false;
-    }
-    final Gas other = (Gas) obj;
-    return value == other.value;
-  }
-
-  @Override
-  public String toString() {
-    return Long.toString(value);
-  }
-
-  public String toHexString() {
-    return String.format("0x%s", Long.toHexString(value));
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/GasAndAccessedState.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/GasAndAccessedState.java
new file mode 100644
index 00000000000..3ef9dcd4053
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/GasAndAccessedState.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.core;
+
+import static java.util.Collections.emptySet;
+
+import org.hyperledger.besu.datatypes.Address;
+
+import java.util.Set;
+
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+import org.apache.tuweni.bytes.Bytes32;
+
+public class GasAndAccessedState {
+  final long gas;
+  final Set<Address> accessListAddressSet;
+  final Multimap<Address, Bytes32> accessListStorageByAddress;
+
+  public GasAndAccessedState(
+      final long gas,
+      final Set<Address> accessListAddressSet,
+      final Multimap<Address, Bytes32> accessedStorage) {
+    this.gas = gas;
+    this.accessListAddressSet = accessListAddressSet;
+    this.accessListStorageByAddress = accessedStorage;
+  }
+
+  public GasAndAccessedState(final long gas) {
+    this.gas = gas;
+    this.accessListAddressSet = emptySet();
+    this.accessListStorageByAddress = HashMultimap.create();
+  }
+
+  public long getGas() {
+    return gas;
+  }
+
+  public Set<Address> getAccessListAddressSet() {
+    return accessListAddressSet;
+  }
+
+  public Multimap<Address, Bytes32> getAccessListStorageByAddress() {
+    return accessListStorageByAddress;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Hash.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Hash.java
deleted file mode 100644
index 599678139bb..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Hash.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core;
-
-import static org.hyperledger.besu.crypto.Hash.keccak256;
-
-import org.hyperledger.besu.ethereum.rlp.RLP;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.bytes.DelegatingBytes32;
-
-/** A 32-bytes hash value as used in Ethereum blocks, that is the result of the KEC algorithm. */
-public class Hash extends DelegatingBytes32 implements org.hyperledger.besu.plugin.data.Hash {
-
-  public static final Hash ZERO = new Hash(Bytes32.ZERO);
-
-  public static final Hash EMPTY_TRIE_HASH = Hash.hash(RLP.NULL);
-
-  public static final Hash EMPTY_LIST_HASH = Hash.hash(RLP.EMPTY_LIST);
-
-  public static final Hash EMPTY = hash(Bytes.EMPTY);
-
-  private Hash(final Bytes32 bytes) {
-    super(bytes);
-  }
-
-  public static Hash hash(final Bytes value) {
-    return new Hash(keccak256(value));
-  }
-
-  public static Hash wrap(final Bytes32 bytes) {
-    if (bytes instanceof Hash) {
-      return (Hash) bytes;
-    }
-    return new Hash(bytes);
-  }
-
-  /**
-   * Parse an hexadecimal string representing a hash value.
-   *
-   * @param str An hexadecimal string (with or without the leading '0x') representing a valid hash
-   *     value.
-   * @return The parsed hash.
-   * @throws NullPointerException if the provided string is {@code null}.
-   * @throws IllegalArgumentException if the string is either not hexadecimal, or not the valid
-   *     representation of a hash (not 32 bytes).
-   */
-  @JsonCreator
-  public static Hash fromHexString(final String str) {
-    return new Hash(Bytes32.fromHexStringStrict(str));
-  }
-
-  public static Hash fromHexStringLenient(final String str) {
-    return new Hash(Bytes32.fromHexStringLenient(str));
-  }
-
-  public static Hash fromPlugin(final org.hyperledger.besu.plugin.data.Hash blockHash) {
-    return blockHash instanceof Hash ? (Hash) blockHash : wrap(blockHash);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/LogWithMetadata.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/LogWithMetadata.java
index 9dd4989c6e3..57721af98b0 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/LogWithMetadata.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/LogWithMetadata.java
@@ -16,7 +16,11 @@
  */
 package org.hyperledger.besu.ethereum.core;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransactionReceipt;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.log.LogTopic;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -55,6 +59,7 @@ public LogWithMetadata(
   }
 
   public static List<LogWithMetadata> generate(
+      final int logIndexOffset,
       final TransactionReceipt receipt,
       final long number,
       final Hash blockHash,
@@ -62,26 +67,37 @@ public static List<LogWithMetadata> generate(
       final int transactionIndex,
       final boolean removed) {
     return generate(
-        receipt.getLogs(), number, blockHash, transactionHash, transactionIndex, removed);
+        logIndexOffset,
+        receipt.getLogsList(),
+        number,
+        blockHash,
+        transactionHash,
+        transactionIndex,
+        removed);
   }
 
   public static List<LogWithMetadata> generate(
       final Block block, final List<TransactionReceipt> receipts, final boolean removed) {
     final List<LogWithMetadata> logsWithMetadata = new ArrayList<>();
+    int logIndexOffset = 0;
     for (int txi = 0; txi < receipts.size(); ++txi) {
-      logsWithMetadata.addAll(
+      final List<LogWithMetadata> logs =
           generate(
+              logIndexOffset,
               receipts.get(txi),
               block.getHeader().getNumber(),
               block.getHash(),
               block.getBody().getTransactions().get(txi).getHash(),
               txi,
-              removed));
+              removed);
+      logIndexOffset += logs.size();
+      logsWithMetadata.addAll(logs);
     }
     return logsWithMetadata;
   }
 
   public static List<LogWithMetadata> generate(
+      final int logIndexOffset,
       final PrivateTransactionReceipt receipt,
       final long number,
       final Hash blockHash,
@@ -89,10 +105,17 @@ public static List<LogWithMetadata> generate(
       final int transactionIndex,
       final boolean removed) {
     return generate(
-        receipt.getLogs(), number, blockHash, transactionHash, transactionIndex, removed);
+        logIndexOffset,
+        receipt.getLogs(),
+        number,
+        blockHash,
+        transactionHash,
+        transactionIndex,
+        removed);
   }
 
   private static List<LogWithMetadata> generate(
+      final int logIndexOffset,
       final List<Log> receiptLogs,
       final long number,
       final Hash blockHash,
@@ -104,7 +127,7 @@ private static List<LogWithMetadata> generate(
     for (int logIndex = 0; logIndex < receiptLogs.size(); ++logIndex) {
       logs.add(
           new LogWithMetadata(
-              logIndex,
+              logIndexOffset + logIndex,
               number,
               blockHash,
               transactionHash,
@@ -170,10 +193,10 @@ public static LogWithMetadata fromPlugin(
     return new LogWithMetadata(
         pluginObject.getLogIndex(),
         pluginObject.getBlockNumber(),
-        Hash.fromPlugin(pluginObject.getBlockHash()),
-        Hash.fromPlugin(pluginObject.getTransactionHash()),
+        pluginObject.getBlockHash(),
+        pluginObject.getTransactionHash(),
         pluginObject.getTransactionIndex(),
-        Address.fromPlugin(pluginObject.getLogger()),
+        pluginObject.getLogger(),
         pluginObject.getData(),
         pluginObject.getTopics().stream().map(LogTopic::create).collect(Collectors.toList()),
         pluginObject.isRemoved());
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/LogsBloomFilter.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/LogsBloomFilter.java
deleted file mode 100644
index def5a4cc39c..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/LogsBloomFilter.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static org.hyperledger.besu.crypto.Hash.keccak256;
-
-import org.hyperledger.besu.ethereum.rlp.RLPException;
-import org.hyperledger.besu.ethereum.rlp.RLPInput;
-
-import java.util.Collection;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.DelegatingBytes;
-import org.apache.tuweni.bytes.MutableBytes;
-
-/*
- * Bloom filter implementation for storing persistent logs, describes a 2048-bit representation of
- * all log entries of a transaction, except data. Sets the bits of the 2048 byte array, where
- * indices are given by: The lower order 11-bits, of the first three double-bytes, of the SHA3, of
- * each value. For instance the address "0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6" results in the
- * KECCAK256 hash "bd2b01afcd27800b54d2179edc49e2bffde5078bb6d0b204694169b1643fb108", of which the
- * corresponding double-bytes are: bd2b, 01af, cd27, corresponding to the following bits in the
- * bloom filter: 1323, 431, 1319
- */
-public class LogsBloomFilter extends DelegatingBytes {
-
-  public static final int BYTE_SIZE = 256;
-  private static final int LEAST_SIGNIFICANT_BYTE = 0xFF;
-  private static final int LEAST_SIGNIFICANT_THREE_BITS = 0x7;
-  private static final int BITS_IN_BYTE = 8;
-
-  public LogsBloomFilter() {
-    super(Bytes.wrap(new byte[BYTE_SIZE]));
-  }
-
-  public LogsBloomFilter(final MutableBytes data) {
-    this(data.copy());
-  }
-
-  public LogsBloomFilter(final Bytes data) {
-    super(data);
-    checkArgument(
-        data.size() == BYTE_SIZE,
-        "Invalid size for bloom filter backing array: expected %s but got %s",
-        BYTE_SIZE,
-        data.size());
-  }
-
-  public static LogsBloomFilter fromHexString(final String hexString) {
-    return new LogsBloomFilter(Bytes.fromHexString(hexString));
-  }
-
-  public static LogsBloomFilter empty() {
-    return new LogsBloomFilter(Bytes.wrap(new byte[LogsBloomFilter.BYTE_SIZE]));
-  }
-
-  /**
-   * Creates a bloom filter from the given RLP-encoded input.
-   *
-   * @param input The input to read from
-   * @return the input's corresponding bloom filter
-   */
-  public static LogsBloomFilter readFrom(final RLPInput input) {
-    final Bytes bytes = input.readBytes();
-    if (bytes.size() != BYTE_SIZE) {
-      throw new RLPException(
-          String.format(
-              "LogsBloomFilter unexpected size of %s (needs %s)", bytes.size(), BYTE_SIZE));
-    }
-    return new LogsBloomFilter(bytes);
-  }
-
-  public boolean couldContain(final LogsBloomFilter subset) {
-    if (subset == null) {
-      return true;
-    }
-    if (subset.size() != size()) {
-      return false;
-    }
-    for (int i = 0; i < size(); i++) {
-      final byte subsetValue = subset.get(i);
-      if ((get(i) & subsetValue) != subsetValue) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  public static Builder builder() {
-    return new Builder();
-  }
-
-  public static final class Builder {
-    final MutableBytes data;
-
-    private Builder() {
-      data = MutableBytes.create(LogsBloomFilter.BYTE_SIZE);
-    }
-
-    public Builder insertFilter(final LogsBloomFilter other) {
-      for (int i = 0; i < data.size(); ++i) {
-        data.set(i, (byte) ((data.get(i) | other.get(i)) & 0xff));
-      }
-      return this;
-    }
-
-    public Builder insertLog(final Log log) {
-      insertBytes((Bytes) log.getLogger());
-
-      for (final LogTopic topic : log.getTopics()) {
-        insertBytes(topic);
-      }
-      return this;
-    }
-
-    public Builder insertLogs(final Collection<Log> logs) {
-      logs.forEach(this::insertLog);
-      return this;
-    }
-
-    public Builder insertBytes(final Bytes value) {
-      setBits(keccak256(value));
-      return this;
-    }
-
-    public LogsBloomFilter build() {
-      return new LogsBloomFilter(data);
-    }
-
-    /**
-     * Discover the low order 11-bits, of the first three double-bytes, of the SHA3 hash, of each
-     * value and update the bloom filter accordingly.
-     *
-     * @param hashValue The hash of the log item.
-     */
-    private void setBits(final Bytes hashValue) {
-      for (int counter = 0; counter < 6; counter += 2) {
-        final int setBloomBit =
-            ((hashValue.get(counter) & LEAST_SIGNIFICANT_THREE_BITS) << BITS_IN_BYTE)
-                + (hashValue.get(counter + 1) & LEAST_SIGNIFICANT_BYTE);
-        setBit(setBloomBit);
-      }
-    }
-
-    private void setBit(final int index) {
-      final int byteIndex = BYTE_SIZE - 1 - index / 8;
-      final int bitIndex = index % 8;
-      data.set(byteIndex, (byte) (data.get(byteIndex) | (1 << bitIndex)));
-    }
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/LogsWrapper.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/LogsWrapper.java
new file mode 100644
index 00000000000..7ff9af5374d
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/LogsWrapper.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.core;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.evm.log.Log;
+
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+public class LogsWrapper implements org.hyperledger.besu.plugin.data.Log {
+
+  final Log delegate;
+
+  public LogsWrapper(final Log delegate) {
+    this.delegate = delegate;
+  }
+
+  @Override
+  public Address getLogger() {
+    return delegate.getLogger();
+  }
+
+  @Override
+  public List<? extends Bytes32> getTopics() {
+    return delegate.getTopics();
+  }
+
+  @Override
+  public Bytes getData() {
+    return delegate.getData();
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MiningParameters.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MiningParameters.java
index 6430d042337..e90efaba5b9 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MiningParameters.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MiningParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,9 +14,13 @@
  */
 package org.hyperledger.besu.ethereum.core;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+
 import java.time.Duration;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.tuweni.bytes.Bytes;
 
@@ -26,10 +30,20 @@ public class MiningParameters {
 
   public static final long DEFAULT_REMOTE_SEALERS_TTL = Duration.ofMinutes(10).toMinutes();
 
+  public static final long DEFAULT_POW_JOB_TTL = Duration.ofMinutes(5).toMillis();
+
+  public static final int DEFAULT_MAX_OMMERS_DEPTH = 8;
+
+  public static final long DEFAULT_POS_BLOCK_CREATION_MAX_TIME = Duration.ofSeconds(12).toMillis();
+
+  public static final long DEFAULT_POS_BLOCK_CREATION_REPETITION_MIN_DURATION =
+      Duration.ofMillis(500).toMillis();
+
   private final Optional<Address> coinbase;
+  private final Optional<AtomicLong> targetGasLimit;
   private final Wei minTransactionGasPrice;
   private final Bytes extraData;
-  private final boolean enabled;
+  private final boolean miningEnabled;
   private final boolean stratumMiningEnabled;
   private final String stratumNetworkInterface;
   private final int stratumPort;
@@ -38,32 +52,17 @@ public class MiningParameters {
   private final Double minBlockOccupancyRatio;
   private final int remoteSealersLimit;
   private final long remoteSealersTimeToLive;
+  private final long powJobTimeToLive;
+  private final int maxOmmerDepth;
+  private final long posBlockCreationMaxTime;
+  private final long posBlockCreationRepetitionMinDuration;
 
-  public MiningParameters(
-      final Address coinbase,
-      final Wei minTransactionGasPrice,
-      final Bytes extraData,
-      final boolean enabled) {
-    this(
-        coinbase,
-        minTransactionGasPrice,
-        extraData,
-        enabled,
-        false,
-        "0.0.0.0",
-        8008,
-        "080c",
-        Optional.empty(),
-        0.8,
-        DEFAULT_REMOTE_SEALERS_LIMIT,
-        DEFAULT_REMOTE_SEALERS_TTL);
-  }
-
-  public MiningParameters(
+  private MiningParameters(
       final Address coinbase,
+      final Long targetGasLimit,
       final Wei minTransactionGasPrice,
       final Bytes extraData,
-      final boolean enabled,
+      final boolean miningEnabled,
       final boolean stratumMiningEnabled,
       final String stratumNetworkInterface,
       final int stratumPort,
@@ -71,11 +70,16 @@ public MiningParameters(
       final Optional<Iterable<Long>> maybeNonceGenerator,
       final Double minBlockOccupancyRatio,
       final int remoteSealersLimit,
-      final long remoteSealersTimeToLive) {
+      final long remoteSealersTimeToLive,
+      final long powJobTimeToLive,
+      final int maxOmmerDepth,
+      final long posBlockCreationMaxTime,
+      final long posBlockCreationRepetitionMinDuration) {
     this.coinbase = Optional.ofNullable(coinbase);
+    this.targetGasLimit = Optional.ofNullable(targetGasLimit).map(AtomicLong::new);
     this.minTransactionGasPrice = minTransactionGasPrice;
     this.extraData = extraData;
-    this.enabled = enabled;
+    this.miningEnabled = miningEnabled;
     this.stratumMiningEnabled = stratumMiningEnabled;
     this.stratumNetworkInterface = stratumNetworkInterface;
     this.stratumPort = stratumPort;
@@ -84,12 +88,20 @@ public MiningParameters(
     this.minBlockOccupancyRatio = minBlockOccupancyRatio;
     this.remoteSealersLimit = remoteSealersLimit;
     this.remoteSealersTimeToLive = remoteSealersTimeToLive;
+    this.powJobTimeToLive = powJobTimeToLive;
+    this.maxOmmerDepth = maxOmmerDepth;
+    this.posBlockCreationMaxTime = posBlockCreationMaxTime;
+    this.posBlockCreationRepetitionMinDuration = posBlockCreationRepetitionMinDuration;
   }
 
   public Optional<Address> getCoinbase() {
     return coinbase;
   }
 
+  public Optional<AtomicLong> getTargetGasLimit() {
+    return targetGasLimit;
+  }
+
   public Wei getMinTransactionGasPrice() {
     return minTransactionGasPrice;
   }
@@ -99,7 +111,7 @@ public Bytes getExtraData() {
   }
 
   public boolean isMiningEnabled() {
-    return enabled;
+    return miningEnabled;
   }
 
   public boolean isStratumMiningEnabled() {
@@ -134,6 +146,22 @@ public long getRemoteSealersTimeToLive() {
     return remoteSealersTimeToLive;
   }
 
+  public long getPowJobTimeToLive() {
+    return powJobTimeToLive;
+  }
+
+  public int getMaxOmmerDepth() {
+    return maxOmmerDepth;
+  }
+
+  public long getPosBlockCreationMaxTime() {
+    return posBlockCreationMaxTime;
+  }
+
+  public long getPosBlockCreationRepetitionMinDuration() {
+    return posBlockCreationRepetitionMinDuration;
+  }
+
   @Override
   public boolean equals(final Object o) {
     if (this == o) return true;
@@ -141,31 +169,39 @@ public boolean equals(final Object o) {
     MiningParameters that = (MiningParameters) o;
     return stratumPort == that.stratumPort
         && Objects.equals(coinbase, that.coinbase)
+        && Objects.equals(targetGasLimit, that.targetGasLimit)
         && Objects.equals(minTransactionGasPrice, that.minTransactionGasPrice)
         && Objects.equals(extraData, that.extraData)
-        && Objects.equals(enabled, that.enabled)
-        && Objects.equals(stratumMiningEnabled, that.stratumMiningEnabled)
+        && miningEnabled == that.miningEnabled
+        && stratumMiningEnabled == that.stratumMiningEnabled
         && Objects.equals(stratumNetworkInterface, that.stratumNetworkInterface)
         && Objects.equals(stratumExtranonce, that.stratumExtranonce)
         && Objects.equals(minBlockOccupancyRatio, that.minBlockOccupancyRatio)
-        && Objects.equals(remoteSealersTimeToLive, that.remoteSealersTimeToLive)
-        && Objects.equals(remoteSealersLimit, that.remoteSealersLimit);
+        && remoteSealersTimeToLive == that.remoteSealersTimeToLive
+        && remoteSealersLimit == that.remoteSealersLimit
+        && powJobTimeToLive == that.powJobTimeToLive
+        && posBlockCreationMaxTime == that.posBlockCreationMaxTime
+        && posBlockCreationRepetitionMinDuration == that.posBlockCreationRepetitionMinDuration;
   }
 
   @Override
   public int hashCode() {
     return Objects.hash(
         coinbase,
+        targetGasLimit,
         minTransactionGasPrice,
         extraData,
-        enabled,
+        miningEnabled,
         stratumMiningEnabled,
         stratumNetworkInterface,
         stratumPort,
         stratumExtranonce,
         minBlockOccupancyRatio,
         remoteSealersLimit,
-        remoteSealersTimeToLive);
+        remoteSealersTimeToLive,
+        powJobTimeToLive,
+        posBlockCreationMaxTime,
+        posBlockCreationRepetitionMinDuration);
   }
 
   @Override
@@ -173,12 +209,14 @@ public String toString() {
     return "MiningParameters{"
         + "coinbase="
         + coinbase
+        + ", targetGasLimit="
+        + targetGasLimit.map(Object::toString).orElse("null")
         + ", minTransactionGasPrice="
         + minTransactionGasPrice
         + ", extraData="
         + extraData
-        + ", enabled="
-        + enabled
+        + ", miningEnabled="
+        + miningEnabled
         + ", stratumMiningEnabled="
         + stratumMiningEnabled
         + ", stratumNetworkInterface='"
@@ -197,6 +235,170 @@ public String toString() {
         + remoteSealersLimit
         + ", remoteSealersTimeToLive="
         + remoteSealersTimeToLive
+        + ", powJobTimeToLive="
+        + powJobTimeToLive
+        + ", posBlockCreationMaxTime="
+        + posBlockCreationMaxTime
+        + ", posBlockCreationRepetitionMinDuration="
+        + posBlockCreationRepetitionMinDuration
         + '}';
   }
+
+  public static class Builder {
+
+    private Address coinbase = null;
+    private Long targetGasLimit = null;
+    private Wei minTransactionGasPrice = Wei.ZERO;
+    private Bytes extraData = Bytes.EMPTY;
+    private boolean miningEnabled = false;
+    private boolean stratumMiningEnabled = false;
+    private String stratumNetworkInterface = "0.0.0.0";
+    private int stratumPort = 8008;
+    private String stratumExtranonce = "080c";
+    private Iterable<Long> maybeNonceGenerator;
+    private Double minBlockOccupancyRatio = 0.8;
+    private int remoteSealersLimit = DEFAULT_REMOTE_SEALERS_LIMIT;
+    private long remoteSealersTimeToLive = DEFAULT_REMOTE_SEALERS_TTL;
+    private long powJobTimeToLive = DEFAULT_POW_JOB_TTL;
+    private int maxOmmerDepth = DEFAULT_MAX_OMMERS_DEPTH;
+    private long posBlockCreationMaxTime = DEFAULT_POS_BLOCK_CREATION_MAX_TIME;
+
+    private long posBlockCreationRepetitionMinDuration =
+        DEFAULT_POS_BLOCK_CREATION_REPETITION_MIN_DURATION;
+
+    public Builder() {
+      // zero arg
+    }
+
+    public Builder(final MiningParameters existing) {
+      existing.getCoinbase().ifPresent(cb -> this.coinbase = cb);
+      existing
+          .getTargetGasLimit()
+          .map(AtomicLong::longValue)
+          .ifPresent(gasLimit -> this.targetGasLimit = gasLimit);
+      this.minTransactionGasPrice = existing.getMinTransactionGasPrice();
+      this.extraData = existing.getExtraData();
+      this.miningEnabled = existing.isMiningEnabled();
+      this.stratumMiningEnabled = existing.isStratumMiningEnabled();
+      this.stratumNetworkInterface = existing.getStratumNetworkInterface();
+      this.stratumPort = existing.getStratumPort();
+      this.stratumExtranonce = existing.getStratumExtranonce();
+      existing.getNonceGenerator().ifPresent(ng -> this.maybeNonceGenerator = ng);
+      this.minBlockOccupancyRatio = existing.getMinBlockOccupancyRatio();
+      this.remoteSealersLimit = existing.getRemoteSealersLimit();
+      this.remoteSealersTimeToLive = existing.getRemoteSealersTimeToLive();
+      this.powJobTimeToLive = existing.getPowJobTimeToLive();
+      this.maxOmmerDepth = existing.getMaxOmmerDepth();
+      this.posBlockCreationMaxTime = existing.getPosBlockCreationMaxTime();
+      this.posBlockCreationRepetitionMinDuration =
+          existing.getPosBlockCreationRepetitionMinDuration();
+    }
+
+    public Builder coinbase(final Address address) {
+      this.coinbase = address;
+      return this;
+    }
+
+    public Builder targetGasLimit(final Long targetGasLimit) {
+      this.targetGasLimit = targetGasLimit;
+      return this;
+    }
+
+    public Builder minTransactionGasPrice(final Wei minTransactionGasPrice) {
+      this.minTransactionGasPrice = minTransactionGasPrice;
+      return this;
+    }
+
+    public Builder extraData(final Bytes extraData) {
+      this.extraData = extraData;
+      return this;
+    }
+
+    public Builder miningEnabled(final boolean miningEnabled) {
+      this.miningEnabled = miningEnabled;
+      return this;
+    }
+
+    public Builder stratumMiningEnabled(final boolean stratumMiningEnabled) {
+      this.stratumMiningEnabled = stratumMiningEnabled;
+      return this;
+    }
+
+    public Builder stratumNetworkInterface(final String stratumNetworkInterface) {
+      this.stratumNetworkInterface = stratumNetworkInterface;
+      return this;
+    }
+
+    public Builder stratumPort(final int stratumPort) {
+      this.stratumPort = stratumPort;
+      return this;
+    }
+
+    public Builder stratumExtranonce(final String stratumExtranonce) {
+      this.stratumExtranonce = stratumExtranonce;
+      return this;
+    }
+
+    public Builder maybeNonceGenerator(final Iterable<Long> maybeNonceGenerator) {
+      this.maybeNonceGenerator = maybeNonceGenerator;
+      return this;
+    }
+
+    public Builder minBlockOccupancyRatio(final Double minBlockOccupancyRatio) {
+      this.minBlockOccupancyRatio = minBlockOccupancyRatio;
+      return this;
+    }
+
+    public Builder remoteSealersLimit(final int remoteSealersLimit) {
+      this.remoteSealersLimit = remoteSealersLimit;
+      return this;
+    }
+
+    public Builder remoteSealersTimeToLive(final long remoteSealersTimeToLive) {
+      this.remoteSealersTimeToLive = remoteSealersTimeToLive;
+      return this;
+    }
+
+    public Builder powJobTimeToLive(final long powJobTimeToLive) {
+      this.powJobTimeToLive = powJobTimeToLive;
+      return this;
+    }
+
+    public Builder maxOmmerDepth(final int maxOmmerDepth) {
+      this.maxOmmerDepth = maxOmmerDepth;
+      return this;
+    }
+
+    public Builder posBlockCreationMaxTime(final long posBlockCreationMaxTime) {
+      this.posBlockCreationMaxTime = posBlockCreationMaxTime;
+      return this;
+    }
+
+    public Builder posBlockCreationRepetitionMinDuration(
+        final long posBlockCreationRepetitionMinDuration) {
+      this.posBlockCreationRepetitionMinDuration = posBlockCreationRepetitionMinDuration;
+      return this;
+    }
+
+    public MiningParameters build() {
+      return new MiningParameters(
+          coinbase,
+          targetGasLimit,
+          minTransactionGasPrice,
+          extraData,
+          miningEnabled,
+          stratumMiningEnabled,
+          stratumNetworkInterface,
+          stratumPort,
+          stratumExtranonce,
+          Optional.ofNullable(maybeNonceGenerator),
+          minBlockOccupancyRatio,
+          remoteSealersLimit,
+          remoteSealersTimeToLive,
+          powJobTimeToLive,
+          maxOmmerDepth,
+          posBlockCreationMaxTime,
+          posBlockCreationRepetitionMinDuration);
+    }
+  }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MutableWorldState.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MutableWorldState.java
index e5928d55b27..409003a3218 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MutableWorldState.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MutableWorldState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,20 +14,22 @@
  */
 package org.hyperledger.besu.ethereum.core;
 
-public interface MutableWorldState extends WorldState, MutableWorldView {
+import org.hyperledger.besu.evm.worldstate.MutableWorldView;
+import org.hyperledger.besu.evm.worldstate.WorldState;
 
-  /**
-   * Creates an independent copy of this world state initially equivalent to this world state.
-   *
-   * @return a copy of this world state.
-   */
-  MutableWorldState copy();
+public interface MutableWorldState extends WorldState, MutableWorldView {
 
   /**
    * Persist accumulated changes to underlying storage.
    *
-   * @param blockhash the block hash of the world state this represents. If this does not represent
-   *     a forward transition from one block to the next `null` should be passed in.
+   * @param blockHeader If persisting for an imported block, the block hash of the world state this
+   *     represents. If this does not represent a forward transition from one block to the next
+   *     `null` should be passed in.
    */
-  void persist(Hash blockhash);
+  void persist(BlockHeader blockHeader);
+
+  default MutableWorldState freeze() {
+    // no op
+    throw new UnsupportedOperationException("cannot freeze");
+  }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/PrivacyParameters.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/PrivacyParameters.java
index 579424246b5..43bdff8aafa 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/PrivacyParameters.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/PrivacyParameters.java
@@ -16,10 +16,12 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
+import org.hyperledger.besu.crypto.KeyPair;
 import org.hyperledger.besu.crypto.KeyPairUtil;
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.enclave.Enclave;
 import org.hyperledger.besu.enclave.EnclaveFactory;
+import org.hyperledger.besu.ethereum.privacy.PrivateStateGenesisAllocator;
 import org.hyperledger.besu.ethereum.privacy.PrivateStateRootResolver;
 import org.hyperledger.besu.ethereum.privacy.PrivateWorldStateReader;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivacyStorageProvider;
@@ -28,12 +30,15 @@
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.plugin.services.PrivacyPluginService;
+import org.hyperledger.besu.plugin.services.privacy.PrivacyGroupGenesisProvider;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.nio.file.Path;
 import java.util.Base64;
+import java.util.Collections;
 import java.util.Optional;
 
 import com.google.common.annotations.VisibleForTesting;
@@ -41,25 +46,45 @@
 
 public class PrivacyParameters {
 
+  // Last address that can be generated for a pre-compiled contract
+  public static final Integer PRIVACY = Byte.MAX_VALUE - 1;
+  public static final Address DEFAULT_PRIVACY = Address.precompiled(PRIVACY);
+  public static final Address FLEXIBLE_PRIVACY = Address.precompiled(PRIVACY - 1);
+
+  // Flexible privacy management contracts (injected in private state)
+  public static final Address FLEXIBLE_PRIVACY_PROXY = Address.precompiled(PRIVACY - 2);
+  public static final Address DEFAULT_FLEXIBLE_PRIVACY_MANAGEMENT =
+      Address.precompiled(PRIVACY - 3);
+
+  public static final Address PLUGIN_PRIVACY = Address.precompiled(PRIVACY - 4);
+
   public static final URI DEFAULT_ENCLAVE_URL = URI.create("http://localhost:8888");
   public static final PrivacyParameters DEFAULT = new PrivacyParameters();
 
   private boolean enabled;
   private URI enclaveUri;
-  private String enclavePublicKey;
+  private String privacyUserId;
   private File enclavePublicKeyFile;
-  private Optional<SECP256K1.KeyPair> signingKeyPair = Optional.empty();
+  private Optional<KeyPair> signingKeyPair = Optional.empty();
   private Enclave enclave;
   private PrivacyStorageProvider privateStorageProvider;
   private WorldStateArchive privateWorldStateArchive;
   private PrivateStateStorage privateStateStorage;
   private boolean multiTenancyEnabled;
-  private boolean onchainPrivacyGroupsEnabled;
+  private boolean flexiblePrivacyGroupsEnabled;
+  private boolean privacyPluginEnabled;
   private PrivateStateRootResolver privateStateRootResolver;
   private PrivateWorldStateReader privateWorldStateReader;
-
-  public Integer getPrivacyAddress() {
-    return onchainPrivacyGroupsEnabled ? Address.PRIVACY - 1 : Address.PRIVACY;
+  private PrivacyPluginService privacyPluginService;
+
+  public Address getPrivacyAddress() {
+    if (isPrivacyPluginEnabled()) {
+      return PLUGIN_PRIVACY;
+    } else if (isFlexiblePrivacyGroupsEnabled()) {
+      return FLEXIBLE_PRIVACY;
+    } else {
+      return DEFAULT_PRIVACY;
+    }
   }
 
   public Boolean isEnabled() {
@@ -78,13 +103,13 @@ private void setEnclaveUri(final URI enclaveUri) {
     this.enclaveUri = enclaveUri;
   }
 
-  public String getEnclavePublicKey() {
-    return enclavePublicKey;
+  public String getPrivacyUserId() {
+    return privacyUserId;
   }
 
   @VisibleForTesting
-  public void setEnclavePublicKey(final String enclavePublicKey) {
-    this.enclavePublicKey = enclavePublicKey;
+  public void setPrivacyUserId(final String privacyUserId) {
+    this.privacyUserId = privacyUserId;
   }
 
   public File getEnclavePublicKeyFile() {
@@ -95,11 +120,11 @@ private void setEnclavePublicKeyFile(final File enclavePublicKeyFile) {
     this.enclavePublicKeyFile = enclavePublicKeyFile;
   }
 
-  public Optional<SECP256K1.KeyPair> getSigningKeyPair() {
+  public Optional<KeyPair> getSigningKeyPair() {
     return signingKeyPair;
   }
 
-  private void setSigningKeyPair(final SECP256K1.KeyPair signingKeyPair) {
+  private void setSigningKeyPair(final KeyPair signingKeyPair) {
     this.signingKeyPair = Optional.ofNullable(signingKeyPair);
   }
 
@@ -143,12 +168,20 @@ public boolean isMultiTenancyEnabled() {
     return multiTenancyEnabled;
   }
 
-  private void setOnchainPrivacyGroupsEnabled(final boolean onchainPrivacyGroupsEnabled) {
-    this.onchainPrivacyGroupsEnabled = onchainPrivacyGroupsEnabled;
+  private void setFlexiblePrivacyGroupsEnabled(final boolean flexiblePrivacyGroupsEnabled) {
+    this.flexiblePrivacyGroupsEnabled = flexiblePrivacyGroupsEnabled;
   }
 
-  public boolean isOnchainPrivacyGroupsEnabled() {
-    return onchainPrivacyGroupsEnabled;
+  public boolean isFlexiblePrivacyGroupsEnabled() {
+    return flexiblePrivacyGroupsEnabled;
+  }
+
+  private void setPrivacyPluginEnabled(final boolean privacyPluginEnabled) {
+    this.privacyPluginEnabled = privacyPluginEnabled;
+  }
+
+  public boolean isPrivacyPluginEnabled() {
+    return privacyPluginEnabled;
   }
 
   public PrivateStateRootResolver getPrivateStateRootResolver() {
@@ -168,6 +201,32 @@ private void setPrivateWorldStateReader(final PrivateWorldStateReader privateWor
     this.privateWorldStateReader = privateWorldStateReader;
   }
 
+  private void setPrivacyService(final PrivacyPluginService privacyPluginService) {
+    this.privacyPluginService = privacyPluginService;
+  }
+
+  public PrivacyPluginService getPrivacyService() {
+    return privacyPluginService;
+  }
+
+  public PrivateStateGenesisAllocator getPrivateStateGenesisAllocator() {
+    // Note: the order of plugin registration may cause issues here.
+    // This is why it's instantiated on get. It's needed in the privacy pre-compile constructors
+    // but privacy parameters is built before the plugin has had a chance to register a provider
+    // and have cli options instantiated
+    return new PrivateStateGenesisAllocator(
+        flexiblePrivacyGroupsEnabled, createPrivateGenesisProvider());
+  }
+
+  private PrivacyGroupGenesisProvider createPrivateGenesisProvider() {
+    if (privacyPluginService != null
+        && privacyPluginService.getPrivacyGroupGenesisProvider() != null) {
+      return privacyPluginService.getPrivacyGroupGenesisProvider();
+    } else {
+      return (privacyGroupId, blockNumber) -> Collections::emptyList;
+    }
+  }
+
   @Override
   public String toString() {
     return "PrivacyParameters{"
@@ -175,10 +234,14 @@ public String toString() {
         + enabled
         + ", multiTenancyEnabled = "
         + multiTenancyEnabled
-        + ", onchainPrivacyGroupsEnabled = "
-        + onchainPrivacyGroupsEnabled
+        + ", privacyPluginEnabled = "
+        + privacyPluginEnabled
+        + ", flexiblePrivacyGroupsEnabled = "
+        + flexiblePrivacyGroupsEnabled
         + ", enclaveUri='"
         + enclaveUri
+        + ", privatePayloadEncryptionService='"
+        + privacyPluginService.getClass().getSimpleName()
         + '\''
         + '}';
   }
@@ -188,7 +251,7 @@ public static class Builder {
     private boolean enabled;
     private URI enclaveUrl;
     private File enclavePublicKeyFile;
-    private String enclavePublicKey;
+    private String privacyUserId;
     private Path privateKeyPath;
     private PrivacyStorageProvider storageProvider;
     private EnclaveFactory enclaveFactory;
@@ -196,7 +259,9 @@ public static class Builder {
     private Path privacyKeyStoreFile;
     private Path privacyKeyStorePasswordFile;
     private Path privacyTlsKnownEnclaveFile;
-    private boolean onchainPrivacyGroupsEnabled;
+    private boolean flexiblePrivacyGroupsEnabled;
+    private boolean privacyPluginEnabled;
+    private PrivacyPluginService privacyPluginService;
 
     public Builder setEnclaveUrl(final URI enclaveUrl) {
       this.enclaveUrl = enclaveUrl;
@@ -243,8 +308,26 @@ public Builder setPrivacyTlsKnownEnclaveFile(final Path privacyTlsKnownEnclaveFi
       return this;
     }
 
-    public Builder setOnchainPrivacyGroupsEnabled(final boolean onchainPrivacyGroupsEnabled) {
-      this.onchainPrivacyGroupsEnabled = onchainPrivacyGroupsEnabled;
+    public Builder setFlexiblePrivacyGroupsEnabled(final boolean flexiblePrivacyGroupsEnabled) {
+      this.flexiblePrivacyGroupsEnabled = flexiblePrivacyGroupsEnabled;
+      return this;
+    }
+
+    public Builder setPrivacyPluginEnabled(final boolean privacyPluginEnabled) {
+      this.privacyPluginEnabled = privacyPluginEnabled;
+      return this;
+    }
+
+    public Builder setPrivacyUserIdUsingFile(final File publicKeyFile) throws IOException {
+      this.enclavePublicKeyFile = publicKeyFile;
+      this.privacyUserId = Files.asCharSource(publicKeyFile, UTF_8).read();
+      // throws exception if invalid base 64
+      Base64.getDecoder().decode(this.privacyUserId);
+      return this;
+    }
+
+    public Builder setPrivacyService(final PrivacyPluginService privacyPluginService) {
+      this.privacyPluginService = privacyPluginService;
       return this;
     }
 
@@ -268,10 +351,14 @@ public PrivacyParameters build() {
                 privateStateRootResolver, privateWorldStateArchive, privateStateStorage));
 
         config.setPrivateWorldStateArchive(privateWorldStateArchive);
-        config.setEnclavePublicKey(enclavePublicKey);
-        config.setEnclavePublicKeyFile(enclavePublicKeyFile);
+
+        config.setPrivacyService(privacyPluginService);
+
         config.setPrivateStorageProvider(storageProvider);
         config.setPrivateStateStorage(privateStateStorage);
+
+        config.setPrivacyUserId(privacyUserId);
+        config.setEnclavePublicKeyFile(enclavePublicKeyFile);
         // pass TLS options to enclave factory if they are set
         if (privacyKeyStoreFile != null) {
           config.setEnclave(
@@ -283,32 +370,17 @@ public PrivacyParameters build() {
         } else {
           config.setEnclave(enclaveFactory.createVertxEnclave(enclaveUrl));
         }
+        config.setEnclaveUri(enclaveUrl);
 
         if (privateKeyPath != null) {
           config.setSigningKeyPair(KeyPairUtil.load(privateKeyPath.toFile()));
         }
       }
       config.setEnabled(enabled);
-      config.setEnclaveUri(enclaveUrl);
       config.setMultiTenancyEnabled(multiTenancyEnabled);
-      config.setOnchainPrivacyGroupsEnabled(onchainPrivacyGroupsEnabled);
+      config.setFlexiblePrivacyGroupsEnabled(flexiblePrivacyGroupsEnabled);
+      config.setPrivacyPluginEnabled(privacyPluginEnabled);
       return config;
     }
-
-    public Builder setEnclavePublicKeyUsingFile(final File publicKeyFile) throws IOException {
-      this.enclavePublicKeyFile = publicKeyFile;
-      this.enclavePublicKey = Files.asCharSource(publicKeyFile, UTF_8).read();
-      validatePublicKey(publicKeyFile);
-      return this;
-    }
-
-    private void validatePublicKey(final File publicKeyFile) {
-      if (publicKeyFile.length() != 44) {
-        throw new IllegalArgumentException(
-            "Contents of enclave public key file needs to be 44 characters long to decode to a valid 32 byte public key.");
-      }
-      // throws exception if invalid base 64
-      Base64.getDecoder().decode(this.enclavePublicKey);
-    }
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/ProcessableBlockHeader.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/ProcessableBlockHeader.java
index b35b3ab71df..bded52c4c18 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/ProcessableBlockHeader.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/ProcessableBlockHeader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,10 +14,19 @@
  */
 package org.hyperledger.besu.ethereum.core;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.DataGas;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.frame.BlockValues;
+
 import java.util.Optional;
 
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
 /** A block header capable of being processed. */
-public class ProcessableBlockHeader {
+public class ProcessableBlockHeader implements BlockValues {
 
   protected final Hash parentHash;
 
@@ -32,7 +41,10 @@ public class ProcessableBlockHeader {
   // The block creation timestamp (seconds since the unix epoch)
   protected final long timestamp;
   // base fee is included for post EIP-1559 blocks
-  protected final Long baseFee;
+  protected final Wei baseFee;
+  // prevRandao is included for post-merge blocks
+  protected final Bytes32 mixHashOrPrevRandao;
+  protected final DataGas excessDataGas;
 
   protected ProcessableBlockHeader(
       final Hash parentHash,
@@ -41,7 +53,9 @@ protected ProcessableBlockHeader(
       final long number,
       final long gasLimit,
       final long timestamp,
-      final Long baseFee) {
+      final Wei baseFee,
+      final Bytes32 mixHashOrPrevRandao,
+      final DataGas excessDataGas) {
     this.parentHash = parentHash;
     this.coinbase = coinbase;
     this.difficulty = difficulty;
@@ -49,6 +63,8 @@ protected ProcessableBlockHeader(
     this.gasLimit = gasLimit;
     this.timestamp = timestamp;
     this.baseFee = baseFee;
+    this.mixHashOrPrevRandao = mixHashOrPrevRandao;
+    this.excessDataGas = excessDataGas;
   }
 
   /**
@@ -78,11 +94,22 @@ public Difficulty getDifficulty() {
     return difficulty;
   }
 
+  /**
+   * Returns the block difficulty.
+   *
+   * @return the block difficulty
+   */
+  @Override
+  public Bytes getDifficultyBytes() {
+    return difficulty.getAsBytes32();
+  }
+
   /**
    * Returns the block number.
    *
    * @return the block number
    */
+  @Override
   public long getNumber() {
     return number;
   }
@@ -92,6 +119,7 @@ public long getNumber() {
    *
    * @return the block gas limit
    */
+  @Override
   public long getGasLimit() {
     return gasLimit;
   }
@@ -101,6 +129,7 @@ public long getGasLimit() {
    *
    * @return the block timestamp
    */
+  @Override
   public long getTimestamp() {
     return timestamp;
   }
@@ -108,9 +137,37 @@ public long getTimestamp() {
   /**
    * Returns the basefee of the block.
    *
-   * @return the raw bytes of the extra data field
+   * @return the optional long value for base fee
    */
-  public Optional<Long> getBaseFee() {
+  @Override
+  public Optional<Wei> getBaseFee() {
     return Optional.ofNullable(baseFee);
   }
+
+  /**
+   * Returns the mixHash before merge, and the prevRandao value after
+   *
+   * @return the mixHash before merge, and the prevRandao value after
+   */
+  @Override
+  public Bytes32 getMixHashOrPrevRandao() {
+    return mixHashOrPrevRandao;
+  }
+
+  /**
+   * Returns the prevRandao of the block.
+   *
+   * @return the raw bytes of the prevRandao field
+   */
+  public Optional<Bytes32> getPrevRandao() {
+    return Optional.ofNullable(mixHashOrPrevRandao);
+  }
+
+  public Optional<DataGas> getExcessDataGas() {
+    return Optional.ofNullable(excessDataGas);
+  }
+
+  public String toLogString() {
+    return getNumber() + " (time: " + getTimestamp() + ")";
+  }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/SealableBlockHeader.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/SealableBlockHeader.java
index e329976e826..c742b6ab746 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/SealableBlockHeader.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/SealableBlockHeader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,7 +14,16 @@
  */
 package org.hyperledger.besu.ethereum.core;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.DataGas;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
+
+import java.util.Optional;
+
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
 
 /** A block header capable of being sealed. */
 public class SealableBlockHeader extends ProcessableBlockHeader {
@@ -32,6 +41,10 @@ public class SealableBlockHeader extends ProcessableBlockHeader {
 
   protected final Bytes extraData;
 
+  protected final Hash withdrawalsRoot;
+
+  protected final Hash depositsRoot;
+
   protected SealableBlockHeader(
       final Hash parentHash,
       final Hash ommersHash,
@@ -46,11 +59,26 @@ protected SealableBlockHeader(
       final long gasUsed,
       final long timestamp,
       final Bytes extraData,
-      final Long baseFee) {
-    super(parentHash, coinbase, difficulty, number, gasLimit, timestamp, baseFee);
+      final Wei baseFee,
+      final Bytes32 mixHashOrPrevRandao,
+      final Hash withdrawalsRoot,
+      final DataGas excessDataGas,
+      final Hash depositsRoot) {
+    super(
+        parentHash,
+        coinbase,
+        difficulty,
+        number,
+        gasLimit,
+        timestamp,
+        baseFee,
+        mixHashOrPrevRandao,
+        excessDataGas);
     this.ommersHash = ommersHash;
     this.stateRoot = stateRoot;
     this.transactionsRoot = transactionsRoot;
+    this.withdrawalsRoot = withdrawalsRoot;
+    this.depositsRoot = depositsRoot;
     this.receiptsRoot = receiptsRoot;
     this.logsBloom = logsBloom;
     this.gasUsed = gasUsed;
@@ -119,4 +147,22 @@ public long getGasUsed() {
   public Bytes getExtraData() {
     return extraData;
   }
+
+  /**
+   * Returns the block withdrawals root hash.
+   *
+   * @return the block withdrawals root hash
+   */
+  public Optional<Hash> getWithdrawalsRoot() {
+    return Optional.ofNullable(withdrawalsRoot);
+  }
+
+  /**
+   * Returns the block deposits root hash.
+   *
+   * @return the block deposits root hash
+   */
+  public Optional<Hash> getDepositsRoot() {
+    return Optional.ofNullable(depositsRoot);
+  }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Synchronizer.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Synchronizer.java
index 24f60f0ae80..7d60c4d357b 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Synchronizer.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Synchronizer.java
@@ -14,10 +14,14 @@
  */
 package org.hyperledger.besu.ethereum.core;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.plugin.data.SyncStatus;
 import org.hyperledger.besu.plugin.services.BesuEvents;
 
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import org.apache.tuweni.bytes.Bytes;
 
 /** Provides an interface to block synchronization processes. */
 public interface Synchronizer {
@@ -25,7 +29,7 @@ public interface Synchronizer {
   // Default tolerance used to determine whether or not this node is "in sync"
   long DEFAULT_IN_SYNC_TOLERANCE = 5;
 
-  void start();
+  CompletableFuture<Void> start();
 
   void stop();
 
@@ -39,6 +43,10 @@ public interface Synchronizer {
    */
   Optional<SyncStatus> getSyncStatus();
 
+  boolean resyncWorldState();
+
+  boolean healWorldState(final Optional<Address> maybeAccountToRepair, final Bytes location);
+
   long subscribeSyncStatus(final BesuEvents.SyncStatusListener listener);
 
   boolean unsubscribeSyncStatus(long observerId);
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Transaction.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Transaction.java
index 81c70f1e433..3a444e5528f 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Transaction.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Transaction.java
@@ -14,29 +14,46 @@
  */
 package org.hyperledger.besu.ethereum.core;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static org.hyperledger.besu.crypto.Hash.keccak256;
 
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
-import org.hyperledger.besu.crypto.SECP256K1;
-import org.hyperledger.besu.ethereum.core.encoding.TransactionRLPDecoder;
-import org.hyperledger.besu.ethereum.core.encoding.TransactionRLPEncoder;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SECPPublicKey;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Quantity;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.encoding.TransactionDecoder;
+import org.hyperledger.besu.ethereum.core.encoding.TransactionEncoder;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
-import org.hyperledger.besu.plugin.data.Quantity;
+import org.hyperledger.besu.evm.AccessListEntry;
 import org.hyperledger.besu.plugin.data.TransactionType;
 
 import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
+import com.google.common.primitives.Longs;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.units.bigints.UInt256;
+import org.apache.tuweni.units.bigints.UInt256s;
 
 /** An operation submitted by an external actor to be applied to the system. */
-public class Transaction implements org.hyperledger.besu.plugin.data.Transaction {
+public class Transaction
+    implements org.hyperledger.besu.plugin.data.Transaction,
+        org.hyperledger.besu.plugin.data.UnsignedPrivateMarkerTransaction {
 
   // Used for transactions that are not tied to a specific chain
   // (e.g. does not have a chain id associated with it).
@@ -45,9 +62,6 @@ public class Transaction implements org.hyperledger.besu.plugin.data.Transaction
 
   public static final BigInteger REPLAY_PROTECTED_V_BASE = BigInteger.valueOf(35);
 
-  public static final BigInteger GO_QUORUM_PRIVATE_TRANSACTION_V_VALUE_MIN = BigInteger.valueOf(37);
-  public static final BigInteger GO_QUORUM_PRIVATE_TRANSACTION_V_VALUE_MAX = BigInteger.valueOf(38);
-
   // The v signature parameter starts at 36 because 1 is the first valid chainId so:
   // chainId > 1 implies that 2 * chainId + V_BASE > 36.
   public static final BigInteger REPLAY_PROTECTED_V_MIN = BigInteger.valueOf(36);
@@ -56,11 +70,12 @@ public class Transaction implements org.hyperledger.besu.plugin.data.Transaction
 
   private final long nonce;
 
-  private final Wei gasPrice;
+  private final Optional<Wei> gasPrice;
 
-  private final Wei gasPremium;
+  private final Optional<Wei> maxPriorityFeePerGas;
 
-  private final Wei feeCap;
+  private final Optional<Wei> maxFeePerGas;
+  private final Optional<Wei> maxFeePerDataGas;
 
   private final long gasLimit;
 
@@ -68,13 +83,13 @@ public class Transaction implements org.hyperledger.besu.plugin.data.Transaction
 
   private final Wei value;
 
-  private final SECP256K1.Signature signature;
+  private final SECPSignature signature;
 
   private final Bytes payload;
 
-  private final Optional<BigInteger> chainId;
+  private final Optional<List<AccessListEntry>> maybeAccessList;
 
-  private final Optional<BigInteger> v;
+  private final Optional<BigInteger> chainId;
 
   // Caches a "hash" of a portion of the transaction used for sender recovery.
   // Note that this hash does not include the transaction signature so it does not
@@ -87,14 +102,23 @@ public class Transaction implements org.hyperledger.besu.plugin.data.Transaction
 
   // Caches the hash used to uniquely identify the transaction.
   protected volatile Hash hash;
+  // Caches the size in bytes of the encoded transaction.
+  protected volatile int size = -1;
   private final TransactionType transactionType;
 
+  private final SignatureAlgorithm signatureAlgorithm = SignatureAlgorithmFactory.getInstance();
+  private final Optional<List<Hash>> versionedHashes;
+
   public static Builder builder() {
     return new Builder();
   }
 
+  public static Transaction readFrom(final Bytes rlpBytes) {
+    return readFrom(RLP.input(rlpBytes));
+  }
+
   public static Transaction readFrom(final RLPInput rlpInput) {
-    return TransactionRLPDecoder.decode(rlpInput);
+    return TransactionDecoder.decodeForWire(rlpInput);
   }
 
   /**
@@ -103,18 +127,18 @@ public static Transaction readFrom(final RLPInput rlpInput) {
    * @param transactionType the transaction type
    * @param nonce the nonce
    * @param gasPrice the gas price
-   * @param gasPremium the gas premium
-   * @param feeCap the fee cap
+   * @param maxPriorityFeePerGas the max priority fee per gas
+   * @param maxFeePerGas the max fee per gas
+   * @param maxFeePerDataGas the max fee per data gas
    * @param gasLimit the gas limit
    * @param to the transaction recipient
    * @param value the value being transferred to the recipient
    * @param signature the signature
    * @param payload the payload
+   * @param maybeAccessList the optional list of addresses/storage slots this transaction intends to
+   *     preload
    * @param sender the transaction sender
    * @param chainId the chain id to apply the transaction to
-   * @param v the v value. This is only passed in directly for GoQuorum private transactions
-   *     (v=37|38). For all other transactions, the v value is derived from the signature. If v is
-   *     provided here, the chain id must be empty.
    *     <p>The {@code to} will be an {@code Optional.empty()} for a contract creation transaction;
    *     otherwise it should contain an address.
    *     <p>The {@code chainId} must be greater than 0 to be applied to a specific chain; otherwise
@@ -123,106 +147,132 @@ public static Transaction readFrom(final RLPInput rlpInput) {
   public Transaction(
       final TransactionType transactionType,
       final long nonce,
-      final Wei gasPrice,
-      final Wei gasPremium,
-      final Wei feeCap,
+      final Optional<Wei> gasPrice,
+      final Optional<Wei> maxPriorityFeePerGas,
+      final Optional<Wei> maxFeePerGas,
+      final Optional<Wei> maxFeePerDataGas,
       final long gasLimit,
       final Optional<Address> to,
       final Wei value,
-      final SECP256K1.Signature signature,
+      final SECPSignature signature,
       final Bytes payload,
+      final Optional<List<AccessListEntry>> maybeAccessList,
       final Address sender,
       final Optional<BigInteger> chainId,
-      final Optional<BigInteger> v) {
-    if (v.isPresent() && chainId.isPresent()) {
-      throw new IllegalStateException(
-          String.format("chainId '%s' and v '%s' cannot both be provided", chainId.get(), v.get()));
+      final Optional<List<Hash>> versionedHashes) {
+
+    if (transactionType.requiresChainId()) {
+      checkArgument(
+          chainId.isPresent(), "Chain id must be present for transaction type %s", transactionType);
     }
+
+    if (maybeAccessList.isPresent()) {
+      checkArgument(
+          transactionType.supportsAccessList(),
+          "Must not specify access list for transaction not supporting it");
+    }
+
+    if (Objects.equals(transactionType, TransactionType.ACCESS_LIST)) {
+      checkArgument(
+          maybeAccessList.isPresent(), "Must specify access list for access list transaction");
+    }
+
+    if (versionedHashes.isPresent() || maxFeePerDataGas.isPresent()) {
+      checkArgument(
+          transactionType.supportsBlob(),
+          "Must not specify blob versioned hashes of max fee per data gas for transaction not supporting it");
+    }
+
+    if (transactionType.supportsBlob()) {
+      checkArgument(
+          versionedHashes.isPresent(), "Must specify blob versioned hashes for blob transaction");
+      checkArgument(
+          !versionedHashes.get().isEmpty(), "Blob transaction must have at least one blob");
+      checkArgument(
+          maxFeePerDataGas.isPresent(), "Must specify max fee per data gas for blob transaction");
+    }
+
     this.transactionType = transactionType;
     this.nonce = nonce;
     this.gasPrice = gasPrice;
-    this.gasPremium = gasPremium;
-    this.feeCap = feeCap;
+    this.maxPriorityFeePerGas = maxPriorityFeePerGas;
+    this.maxFeePerGas = maxFeePerGas;
+    this.maxFeePerDataGas = maxFeePerDataGas;
     this.gasLimit = gasLimit;
     this.to = to;
     this.value = value;
     this.signature = signature;
     this.payload = payload;
+    this.maybeAccessList = maybeAccessList;
     this.sender = sender;
     this.chainId = chainId;
-    this.v = v;
+    this.versionedHashes = versionedHashes;
+
+    if (isUpfrontGasCostTooHigh()) {
+      throw new IllegalArgumentException("Upfront gas cost exceeds UInt256");
+    }
   }
 
   public Transaction(
       final long nonce,
-      final Wei gasPrice,
-      final Wei gasPremium,
-      final Wei feeCap,
+      final Optional<Wei> gasPrice,
+      final Optional<Wei> maxPriorityFeePerGas,
+      final Optional<Wei> maxFeePerGas,
+      final Optional<Wei> maxFeePerDataGas,
       final long gasLimit,
       final Optional<Address> to,
       final Wei value,
-      final SECP256K1.Signature signature,
+      final SECPSignature signature,
       final Bytes payload,
       final Address sender,
       final Optional<BigInteger> chainId,
-      final Optional<BigInteger> v) {
+      final Optional<List<Hash>> versionedHashes) {
     this(
         TransactionType.FRONTIER,
         nonce,
         gasPrice,
-        gasPremium,
-        feeCap,
+        maxPriorityFeePerGas,
+        maxFeePerGas,
+        maxFeePerDataGas,
         gasLimit,
         to,
         value,
         signature,
         payload,
+        Optional.empty(),
         sender,
         chainId,
-        v);
+        versionedHashes);
   }
 
-  /**
-   * Instantiates a transaction instance.
-   *
-   * @param nonce the nonce
-   * @param gasPrice the gas price
-   * @param gasLimit the gas limit
-   * @param to the transaction recipient
-   * @param value the value being transferred to the recipient
-   * @param signature the signature
-   * @param payload the payload
-   * @param sender the transaction sender
-   * @param chainId the chain id to apply the transaction to
-   *     <p>The {@code to} will be an {@code Optional.empty()} for a contract creation transaction;
-   *     otherwise it should contain an address.
-   *     <p>The {@code chainId} must be greater than 0 to be applied to a specific chain; otherwise
-   *     it will default to any chain.
-   */
   public Transaction(
       final long nonce,
       final Wei gasPrice,
       final long gasLimit,
-      final Optional<Address> to,
+      final Address to,
       final Wei value,
-      final SECP256K1.Signature signature,
+      final SECPSignature signature,
       final Bytes payload,
-      final Address sender,
-      final Optional<BigInteger> chainId) {
+      final Optional<BigInteger> chainId,
+      final Optional<List<Hash>> versionedHashes) {
     this(
+        TransactionType.FRONTIER,
         nonce,
-        gasPrice,
-        null,
-        null,
+        Optional.of(gasPrice),
+        Optional.empty(),
+        Optional.empty(),
+        Optional.empty(),
         gasLimit,
-        to,
+        Optional.of(to),
         value,
         signature,
         payload,
-        sender,
+        Optional.empty(),
+        null,
         chainId,
-        Optional.empty());
+        versionedHashes);
   }
+
   /**
    * Instantiates a transaction instance.
    *
@@ -235,7 +285,6 @@ public Transaction(
    * @param payload the payload
    * @param sender the transaction sender
    * @param chainId the chain id to apply the transaction to
-   * @param v the v value (only passed in directly for GoQuorum private transactions)
    *     <p>The {@code to} will be an {@code Optional.empty()} for a contract creation transaction;
    *     otherwise it should contain an address.
    *     <p>The {@code chainId} must be greater than 0 to be applied to a specific chain; otherwise
@@ -247,12 +296,25 @@ public Transaction(
       final long gasLimit,
       final Optional<Address> to,
       final Wei value,
-      final SECP256K1.Signature signature,
+      final SECPSignature signature,
       final Bytes payload,
       final Address sender,
       final Optional<BigInteger> chainId,
-      final Optional<BigInteger> v) {
-    this(nonce, gasPrice, null, null, gasLimit, to, value, signature, payload, sender, chainId, v);
+      final Optional<List<Hash>> versionedHashes) {
+    this(
+        nonce,
+        Optional.of(gasPrice),
+        Optional.empty(),
+        Optional.empty(),
+        Optional.empty(),
+        gasLimit,
+        to,
+        value,
+        signature,
+        payload,
+        sender,
+        chainId,
+        versionedHashes);
   }
 
   /**
@@ -271,28 +333,73 @@ public long getNonce() {
    * @return the transaction gas price
    */
   @Override
-  public Wei getGasPrice() {
+  public Optional<Wei> getGasPrice() {
     return gasPrice;
   }
 
   /**
-   * Return the transaction gas premium.
+   * Return the transaction max priority per gas.
+   *
+   * @return the transaction max priority per gas
+   */
+  @Override
+  public Optional<Wei> getMaxPriorityFeePerGas() {
+    return maxPriorityFeePerGas;
+  }
+
+  /**
+   * Return the transaction max fee per gas.
    *
-   * @return the transaction gas premium
+   * @return the transaction max fee per gas
    */
   @Override
-  public Optional<Quantity> getGasPremium() {
-    return Optional.ofNullable(gasPremium);
+  public Optional<Wei> getMaxFeePerGas() {
+    return maxFeePerGas;
   }
 
   /**
-   * Return the transaction fee cap.
+   * Return the transaction max fee per data gas.
    *
-   * @return the transaction fee cap
+   * @return the transaction max fee per data gas
    */
   @Override
-  public Optional<Quantity> getFeeCap() {
-    return Optional.ofNullable(feeCap);
+  public Optional<Wei> getMaxFeePerDataGas() {
+    return maxFeePerDataGas;
+  }
+
+  /**
+   * Boolean which indicates the transaction has associated cost data, whether gas price or 1559 fee
+   * market parameters.
+   *
+   * @return whether cost params are present
+   */
+  public boolean hasCostParams() {
+    return Arrays.asList(
+            getGasPrice(), getMaxFeePerGas(), getMaxPriorityFeePerGas(), getMaxFeePerDataGas())
+        .stream()
+        .flatMap(Optional::stream)
+        .map(Quantity::getAsBigInteger)
+        .anyMatch(q -> q.longValue() > 0L);
+  }
+
+  public Wei getEffectivePriorityFeePerGas(final Optional<Wei> maybeBaseFee) {
+    return maybeBaseFee
+        .map(
+            baseFee -> {
+              if (getType().supports1559FeeMarket()) {
+                if (baseFee.greaterOrEqualThan(getMaxFeePerGas().get())) {
+                  return Wei.ZERO;
+                }
+                return UInt256s.min(
+                    getMaxPriorityFeePerGas().get(), getMaxFeePerGas().get().subtract(baseFee));
+              } else {
+                if (baseFee.greaterOrEqualThan(getGasPrice().get())) {
+                  return Wei.ZERO;
+                }
+                return getGasPrice().get().subtract(baseFee);
+              }
+            })
+        .orElseGet(() -> getGasPrice().orElse(Wei.ZERO));
   }
 
   /**
@@ -305,6 +412,15 @@ public long getGasLimit() {
     return gasLimit;
   }
 
+  /**
+   * Returns the number of blobs this transaction has, or 0 if not a blob transaction type
+   *
+   * @return return the count
+   */
+  public int getBlobCount() {
+    return versionedHashes.map(List::size).orElse(0);
+  }
+
   /**
    * Returns the transaction recipient.
    *
@@ -333,7 +449,7 @@ public Wei getValue() {
    *
    * @return the signature used to sign the transaction
    */
-  public SECP256K1.Signature getSignature() {
+  public SECPSignature getSignature() {
     return signature;
   }
 
@@ -367,6 +483,10 @@ public Optional<Bytes> getData() {
     return getTo().isPresent() ? Optional.of(payload) : Optional.empty();
   }
 
+  public Optional<List<AccessListEntry>> getAccessList() {
+    return maybeAccessList;
+  }
+
   /**
    * Return the transaction chain id (if it exists)
    *
@@ -388,8 +508,9 @@ public Optional<BigInteger> getChainId() {
   @Override
   public Address getSender() {
     if (sender == null) {
-      final SECP256K1.PublicKey publicKey =
-          SECP256K1.PublicKey.recoverFromSignature(getOrComputeSenderRecoveryHash(), signature)
+      final SECPPublicKey publicKey =
+          signatureAlgorithm
+              .recoverPublicKeyFromSignature(getOrComputeSenderRecoveryHash(), signature)
               .orElseThrow(
                   () ->
                       new IllegalStateException(
@@ -399,18 +520,33 @@ public Address getSender() {
     return sender;
   }
 
+  /**
+   * Returns the public key extracted from the signature.
+   *
+   * @return the public key
+   */
+  public Optional<String> getPublicKey() {
+    return signatureAlgorithm
+        .recoverPublicKeyFromSignature(getOrComputeSenderRecoveryHash(), signature)
+        .map(SECPPublicKey::toString);
+  }
+
   private Bytes32 getOrComputeSenderRecoveryHash() {
     if (hashNoSignature == null) {
       hashNoSignature =
           computeSenderRecoveryHash(
+              transactionType,
               nonce,
-              gasPrice,
-              gasPremium,
-              feeCap,
+              gasPrice.orElse(null),
+              maxPriorityFeePerGas.orElse(null),
+              maxFeePerGas.orElse(null),
+              maxFeePerDataGas.orElse(null),
               gasLimit,
-              to.orElse(null),
+              to,
               value,
               payload,
+              maybeAccessList,
+              versionedHashes.orElse(null),
               chainId);
     }
     return hashNoSignature;
@@ -422,7 +558,7 @@ private Bytes32 getOrComputeSenderRecoveryHash() {
    * @param out the output to write the transaction to
    */
   public void writeTo(final RLPOutput out) {
-    TransactionRLPEncoder.encode(this, out);
+    TransactionEncoder.encodeForWire(this, out);
   }
 
   @Override
@@ -437,15 +573,18 @@ public BigInteger getS() {
 
   @Override
   public BigInteger getV() {
-    if (this.v.isPresent()) {
-      return this.v.get();
-    }
 
     final BigInteger recId = BigInteger.valueOf(signature.getRecId());
-    if (chainId.isEmpty()) {
-      return recId.add(REPLAY_UNPROTECTED_V_BASE);
+
+    if (transactionType != null && transactionType != TransactionType.FRONTIER) {
+      // EIP-2718 typed transaction, return yParity:
+      return recId;
     } else {
-      return recId.add(REPLAY_PROTECTED_V_BASE).add(TWO.multiply(chainId.get()));
+      if (chainId.isEmpty()) {
+        return recId.add(REPLAY_UNPROTECTED_V_BASE);
+      } else {
+        return recId.add(REPLAY_PROTECTED_V_BASE).add(TWO.multiply(chainId.get()));
+      }
     }
   }
 
@@ -457,12 +596,32 @@ public BigInteger getV() {
   @Override
   public Hash getHash() {
     if (hash == null) {
-      final Bytes rlp = RLP.encode(this::writeTo);
-      hash = Hash.hash(rlp);
+      memoizeHashAndSize();
     }
     return hash;
   }
 
+  /**
+   * Returns the size in bytes of the encoded transaction.
+   *
+   * @return the size in bytes of the encoded transaction.
+   */
+  public int getSize() {
+    if (size == -1) {
+      memoizeHashAndSize();
+    }
+    return size;
+  }
+
+  private void memoizeHashAndSize() {
+    final Bytes bytes = TransactionEncoder.encodeOpaqueBytes(this);
+    hash = Hash.hash(bytes);
+
+    final BytesValueRLPOutput rlpOutput = new BytesValueRLPOutput();
+    TransactionEncoder.encodeForWire(transactionType, bytes, rlpOutput);
+    size = rlpOutput.encodedSize();
+  }
+
   /**
    * Returns whether the transaction is a contract creation
    *
@@ -473,22 +632,56 @@ public boolean isContractCreation() {
   }
 
   /**
-   * Calculates the up-front cost for the gas the transaction can use.
+   * Calculates the max up-front cost for the gas the transaction can use.
    *
-   * @return the up-front cost for the gas the transaction can use.
+   * @return the max up-front cost for the gas the transaction can use.
+   */
+  private Wei getMaxUpfrontGasCost(final long dataGasPerBlock) {
+    return getUpfrontGasCost(
+        getMaxGasPrice(), getMaxFeePerDataGas().orElse(Wei.ZERO), dataGasPerBlock);
+  }
+
+  /**
+   * Check if the upfront gas cost is over the max allowed
+   *
+   * @return true is upfront data cost overflow uint256 max value
    */
-  public Wei getUpfrontGasCost() {
-    return getUpfrontGasCost(getGasPrice());
+  private boolean isUpfrontGasCostTooHigh() {
+    return calculateUpfrontGasCost(getMaxGasPrice(), Wei.ZERO, 0L).bitLength() > 256;
   }
 
   /**
-   * Calculates the up-front cost for the gas the transaction can use.
+   * Calculates the up-front cost for the gas and data gas the transaction can use.
    *
    * @param gasPrice the gas price to use
+   * @param dataGasPrice the data gas price to use
    * @return the up-front cost for the gas the transaction can use.
    */
-  public Wei getUpfrontGasCost(final Wei gasPrice) {
-    return Wei.of(getGasLimit()).multiply(gasPrice);
+  public Wei getUpfrontGasCost(
+      final Wei gasPrice, final Wei dataGasPrice, final long totalDataGas) {
+    if (gasPrice == null || gasPrice.isZero()) {
+      return Wei.ZERO;
+    }
+
+    final var cost = calculateUpfrontGasCost(gasPrice, dataGasPrice, totalDataGas);
+
+    if (cost.bitLength() > 256) {
+      return Wei.MAX_WEI;
+    } else {
+      return Wei.of(cost);
+    }
+  }
+
+  private BigInteger calculateUpfrontGasCost(
+      final Wei gasPrice, final Wei dataGasPrice, final long totalDataGas) {
+    var cost =
+        new BigInteger(1, Longs.toByteArray(getGasLimit())).multiply(gasPrice.getAsBigInteger());
+
+    if (transactionType.supportsBlob()) {
+      cost = cost.add(dataGasPrice.getAsBigInteger().multiply(BigInteger.valueOf(totalDataGas)));
+    }
+
+    return cost;
   }
 
   /**
@@ -500,8 +693,37 @@ public Wei getUpfrontGasCost(final Wei gasPrice) {
    *
    * @return the up-front gas cost for the transaction
    */
-  public Wei getUpfrontCost() {
-    return getUpfrontGasCost().add(getValue());
+  public Wei getUpfrontCost(final long totalDataGas) {
+    return getMaxUpfrontGasCost(totalDataGas).addExact(getValue());
+  }
+
+  /**
+   * Return the maximum fee per gas the sender is willing to pay for this transaction.
+   *
+   * @return max fee per gas in wei
+   */
+  public Wei getMaxGasPrice() {
+    return maxFeePerGas.orElseGet(
+        () ->
+            gasPrice.orElseThrow(
+                () ->
+                    new IllegalStateException(
+                        "Transaction requires either gasPrice or maxFeePerGas")));
+  }
+  /**
+   * Calculates the effectiveGasPrice of a transaction on the basis of an {@code Optional<Long>}
+   * baseFee and handles unwrapping Optional fee parameters. If baseFee is present, effective gas is
+   * calculated as:
+   *
+   * <p>min((baseFeePerGas + maxPriorityFeePerGas), maxFeePerGas)
+   *
+   * <p>Otherwise, return gasPrice for legacy transactions.
+   *
+   * @param baseFeePerGas optional baseFee from the block header, if we are post-london
+   * @return the effective gas price.
+   */
+  public final Wei getEffectiveGasPrice(final Optional<Wei> baseFeePerGas) {
+    return getEffectivePriorityFeePerGas(baseFeePerGas).addExact(baseFeePerGas.orElse(Wei.ZERO));
   }
 
   @Override
@@ -509,52 +731,236 @@ public TransactionType getType() {
     return this.transactionType;
   }
 
+  public Optional<List<Hash>> getVersionedHashes() {
+    return this.versionedHashes;
+  }
+
   /**
    * Returns whether or not the transaction is a GoQuorum private transaction. <br>
    * <br>
-   * A GoQuorum private transaction has its <i>v</i> value equal to 37 or 38.
+   * A GoQuorum private transaction has its <i>v</i> value equal to 37 or 38, and does not contain a
+   * chainId.
    *
+   * @param goQuorumCompatibilityMode true if GoQuorum compatbility mode is set
    * @return true if GoQuorum private transaction, false otherwise
    */
-  public boolean isGoQuorumPrivateTransaction() {
-    return v.map(
-            value ->
-                GO_QUORUM_PRIVATE_TRANSACTION_V_VALUE_MIN.equals(value)
-                    || GO_QUORUM_PRIVATE_TRANSACTION_V_VALUE_MAX.equals(value))
-        .orElse(false);
+  public boolean isGoQuorumPrivateTransaction(final boolean goQuorumCompatibilityMode) {
+    return false;
+  }
+
+  /**
+   * Return the list of transaction hashes extracted from the collection of Transaction passed as
+   * argument
+   *
+   * @param transactions a collection of transactions
+   * @return the list of transaction hashes
+   */
+  public static List<Hash> toHashList(final Collection<Transaction> transactions) {
+    return transactions.stream().map(Transaction::getHash).collect(Collectors.toUnmodifiableList());
   }
 
   private static Bytes32 computeSenderRecoveryHash(
+      final TransactionType transactionType,
       final long nonce,
       final Wei gasPrice,
-      final Wei gasPremium,
-      final Wei feeCap,
+      final Wei maxPriorityFeePerGas,
+      final Wei maxFeePerGas,
+      final Wei maxFeePerDataGas,
       final long gasLimit,
-      final Address to,
+      final Optional<Address> to,
       final Wei value,
       final Bytes payload,
+      final Optional<List<AccessListEntry>> accessList,
+      final List<Hash> versionedHashes,
       final Optional<BigInteger> chainId) {
-    return keccak256(
+    if (transactionType.requiresChainId()) {
+      checkArgument(chainId.isPresent(), "Transaction type %s requires chainId", transactionType);
+    }
+    final Bytes preimage;
+    switch (transactionType) {
+      case FRONTIER:
+        preimage = frontierPreimage(nonce, gasPrice, gasLimit, to, value, payload, chainId);
+        break;
+      case EIP1559:
+        preimage =
+            eip1559Preimage(
+                nonce,
+                maxPriorityFeePerGas,
+                maxFeePerGas,
+                gasLimit,
+                to,
+                value,
+                payload,
+                chainId,
+                accessList);
+        break;
+      case BLOB:
+        preimage =
+            blobPreimage(
+                nonce,
+                maxPriorityFeePerGas,
+                maxFeePerGas,
+                maxFeePerDataGas,
+                gasLimit,
+                to,
+                value,
+                payload,
+                chainId,
+                accessList,
+                versionedHashes);
+        break;
+      case ACCESS_LIST:
+        preimage =
+            accessListPreimage(
+                nonce,
+                gasPrice,
+                gasLimit,
+                to,
+                value,
+                payload,
+                accessList.orElseThrow(
+                    () ->
+                        new IllegalStateException(
+                            "Developer error: the transaction should be guaranteed to have an access list here")),
+                chainId);
+        break;
+      default:
+        throw new IllegalStateException(
+            "Developer error. Didn't specify signing hash preimage computation");
+    }
+    return keccak256(preimage);
+  }
+
+  private static Bytes frontierPreimage(
+      final long nonce,
+      final Wei gasPrice,
+      final long gasLimit,
+      final Optional<Address> to,
+      final Wei value,
+      final Bytes payload,
+      final Optional<BigInteger> chainId) {
+    return RLP.encode(
+        rlpOutput -> {
+          rlpOutput.startList();
+          rlpOutput.writeLongScalar(nonce);
+          rlpOutput.writeUInt256Scalar(gasPrice);
+          rlpOutput.writeLongScalar(gasLimit);
+          rlpOutput.writeBytes(to.map(Bytes::copy).orElse(Bytes.EMPTY));
+          rlpOutput.writeUInt256Scalar(value);
+          rlpOutput.writeBytes(payload);
+          if (chainId.isPresent()) {
+            rlpOutput.writeBigIntegerScalar(chainId.get());
+            rlpOutput.writeUInt256Scalar(UInt256.ZERO);
+            rlpOutput.writeUInt256Scalar(UInt256.ZERO);
+          }
+          rlpOutput.endList();
+        });
+  }
+
+  private static Bytes eip1559Preimage(
+      final long nonce,
+      final Wei maxPriorityFeePerGas,
+      final Wei maxFeePerGas,
+      final long gasLimit,
+      final Optional<Address> to,
+      final Wei value,
+      final Bytes payload,
+      final Optional<BigInteger> chainId,
+      final Optional<List<AccessListEntry>> accessList) {
+    final Bytes encoded =
         RLP.encode(
-            out -> {
-              out.startList();
-              out.writeLongScalar(nonce);
-              out.writeUInt256Scalar(gasPrice);
-              out.writeLongScalar(gasLimit);
-              out.writeBytes(to == null ? Bytes.EMPTY : to);
-              out.writeUInt256Scalar(value);
-              out.writeBytes(payload);
-              if (ExperimentalEIPs.eip1559Enabled && gasPremium != null && feeCap != null) {
-                out.writeUInt256Scalar(gasPremium);
-                out.writeUInt256Scalar(feeCap);
-              }
-              if (chainId.isPresent()) {
-                out.writeBigIntegerScalar(chainId.get());
-                out.writeUInt256Scalar(UInt256.ZERO);
-                out.writeUInt256Scalar(UInt256.ZERO);
-              }
-              out.endList();
-            }));
+            rlpOutput -> {
+              rlpOutput.startList();
+              eip1559PreimageFields(
+                  nonce,
+                  maxPriorityFeePerGas,
+                  maxFeePerGas,
+                  gasLimit,
+                  to,
+                  value,
+                  payload,
+                  chainId,
+                  accessList,
+                  rlpOutput);
+              rlpOutput.endList();
+            });
+    return Bytes.concatenate(Bytes.of(TransactionType.EIP1559.getSerializedType()), encoded);
+  }
+
+  private static void eip1559PreimageFields(
+      final long nonce,
+      final Wei maxPriorityFeePerGas,
+      final Wei maxFeePerGas,
+      final long gasLimit,
+      final Optional<Address> to,
+      final Wei value,
+      final Bytes payload,
+      final Optional<BigInteger> chainId,
+      final Optional<List<AccessListEntry>> accessList,
+      final RLPOutput rlpOutput) {
+    rlpOutput.writeBigIntegerScalar(chainId.orElseThrow());
+    rlpOutput.writeLongScalar(nonce);
+    rlpOutput.writeUInt256Scalar(maxPriorityFeePerGas);
+    rlpOutput.writeUInt256Scalar(maxFeePerGas);
+    rlpOutput.writeLongScalar(gasLimit);
+    rlpOutput.writeBytes(to.map(Bytes::copy).orElse(Bytes.EMPTY));
+    rlpOutput.writeUInt256Scalar(value);
+    rlpOutput.writeBytes(payload);
+    TransactionEncoder.writeAccessList(rlpOutput, accessList);
+  }
+
+  private static Bytes blobPreimage(
+      final long nonce,
+      final Wei maxPriorityFeePerGas,
+      final Wei maxFeePerGas,
+      final Wei maxFeePerDataGas,
+      final long gasLimit,
+      final Optional<Address> to,
+      final Wei value,
+      final Bytes payload,
+      final Optional<BigInteger> chainId,
+      final Optional<List<AccessListEntry>> accessList,
+      final List<Hash> versionedHashes) {
+    final Bytes encoded =
+        RLP.encode(
+            rlpOutput -> {
+              rlpOutput.startList();
+              eip1559PreimageFields(
+                  nonce,
+                  maxPriorityFeePerGas,
+                  maxFeePerGas,
+                  gasLimit,
+                  to,
+                  value,
+                  payload,
+                  chainId,
+                  accessList,
+                  rlpOutput);
+              rlpOutput.writeUInt256Scalar(maxFeePerDataGas);
+              TransactionEncoder.writeBlobVersionedHashes(rlpOutput, versionedHashes);
+              rlpOutput.endList();
+            });
+    return Bytes.concatenate(Bytes.of(TransactionType.BLOB.getSerializedType()), encoded);
+  }
+
+  private static Bytes accessListPreimage(
+      final long nonce,
+      final Wei gasPrice,
+      final long gasLimit,
+      final Optional<Address> to,
+      final Wei value,
+      final Bytes payload,
+      final List<AccessListEntry> accessList,
+      final Optional<BigInteger> chainId) {
+    final Bytes encode =
+        RLP.encode(
+            rlpOutput -> {
+              rlpOutput.startList();
+              TransactionEncoder.encodeAccessListInner(
+                  chainId, nonce, gasPrice, gasLimit, to, value, payload, accessList, rlpOutput);
+              rlpOutput.endList();
+            });
+    return Bytes.concatenate(Bytes.of(TransactionType.ACCESS_LIST.getSerializedType()), encode);
   }
 
   @Override
@@ -563,23 +969,34 @@ public boolean equals(final Object other) {
       return false;
     }
     final Transaction that = (Transaction) other;
-    return this.chainId.equals(that.chainId)
+    return Objects.equals(this.chainId, that.chainId)
         && this.gasLimit == that.gasLimit
         && Objects.equals(this.gasPrice, that.gasPrice)
-        && Objects.equals(this.gasPremium, that.gasPremium)
-        && Objects.equals(this.feeCap, that.feeCap)
+        && Objects.equals(this.maxPriorityFeePerGas, that.maxPriorityFeePerGas)
+        && Objects.equals(this.maxFeePerGas, that.maxFeePerGas)
+        && Objects.equals(this.maxFeePerDataGas, that.maxFeePerDataGas)
         && this.nonce == that.nonce
-        && this.payload.equals(that.payload)
-        && this.signature.equals(that.signature)
-        && this.to.equals(that.to)
-        && this.value.equals(that.value)
-        && this.v.equals(that.v);
+        && Objects.equals(this.payload, that.payload)
+        && Objects.equals(this.signature, that.signature)
+        && Objects.equals(this.to, that.to)
+        && Objects.equals(this.value, that.value)
+        && Objects.equals(this.getV(), that.getV());
   }
 
   @Override
   public int hashCode() {
     return Objects.hash(
-        nonce, gasPrice, gasPremium, feeCap, gasLimit, to, value, payload, signature, chainId, v);
+        nonce,
+        gasPrice,
+        maxPriorityFeePerGas,
+        maxFeePerGas,
+        maxFeePerDataGas,
+        gasLimit,
+        to,
+        value,
+        payload,
+        signature,
+        chainId);
   }
 
   @Override
@@ -588,18 +1005,55 @@ public String toString() {
     sb.append(isContractCreation() ? "ContractCreation" : "MessageCall").append("{");
     sb.append("type=").append(getType()).append(", ");
     sb.append("nonce=").append(getNonce()).append(", ");
-    sb.append("gasPrice=").append(getGasPrice()).append(", ");
-    if (getGasPremium().isPresent() && getFeeCap().isPresent()) {
-      sb.append("gasPremium=").append(getGasPremium()).append(", ");
-      sb.append("feeCap=").append(getFeeCap()).append(", ");
+    getGasPrice()
+        .ifPresent(
+            gasPrice -> sb.append("gasPrice=").append(gasPrice.toShortHexString()).append(", "));
+    if (getMaxPriorityFeePerGas().isPresent() && getMaxFeePerGas().isPresent()) {
+      sb.append("maxPriorityFeePerGas=")
+          .append(getMaxPriorityFeePerGas().map(Wei::toShortHexString).get())
+          .append(", ");
+      sb.append("maxFeePerGas=")
+          .append(getMaxFeePerGas().map(Wei::toShortHexString).get())
+          .append(", ");
+      getMaxFeePerDataGas()
+          .ifPresent(
+              wei -> sb.append("maxFeePerDataGas=").append(wei.toShortHexString()).append(", "));
     }
     sb.append("gasLimit=").append(getGasLimit()).append(", ");
     if (getTo().isPresent()) sb.append("to=").append(getTo().get()).append(", ");
     sb.append("value=").append(getValue()).append(", ");
     sb.append("sig=").append(getSignature()).append(", ");
     if (chainId.isPresent()) sb.append("chainId=").append(getChainId().get()).append(", ");
-    if (v.isPresent()) sb.append("v=").append(v.get()).append(", ");
     sb.append("payload=").append(getPayload());
+    if (transactionType.equals(TransactionType.ACCESS_LIST)) {
+      sb.append(", ").append("accessList=").append(maybeAccessList);
+    }
+    return sb.append("}").toString();
+  }
+
+  public String toTraceLog() {
+    final StringBuilder sb = new StringBuilder();
+    sb.append(getHash()).append("={");
+    sb.append(isContractCreation() ? "ContractCreation" : "MessageCall").append(", ");
+    sb.append(getNonce()).append(", ");
+    sb.append(getSender()).append(", ");
+    sb.append(getType()).append(", ");
+    getGasPrice()
+        .ifPresent(
+            gasPrice -> sb.append("gp: ").append(gasPrice.toHumanReadableString()).append(", "));
+    if (getMaxPriorityFeePerGas().isPresent() && getMaxFeePerGas().isPresent()) {
+      sb.append("mf: ")
+          .append(getMaxFeePerGas().map(Wei::toHumanReadableString).get())
+          .append(", ");
+      sb.append("pf: ")
+          .append(getMaxPriorityFeePerGas().map(Wei::toHumanReadableString).get())
+          .append(", ");
+      getMaxFeePerDataGas()
+          .ifPresent(wei -> sb.append("df: ").append(wei.toHumanReadableString()).append(", "));
+    }
+    sb.append("gl: ").append(getGasLimit()).append(", ");
+    sb.append("v: ").append(getValue().toHumanReadableString()).append(", ");
+    getTo().ifPresent(to -> sb.append(to));
     return sb.append("}").toString();
   }
 
@@ -611,6 +1065,7 @@ public Optional<Address> contractAddress() {
   }
 
   public static class Builder {
+    private static final Optional<List<AccessListEntry>> EMPTY_ACCESS_LIST = Optional.of(List.of());
 
     protected TransactionType transactionType;
 
@@ -618,25 +1073,34 @@ public static class Builder {
 
     protected Wei gasPrice;
 
-    protected Wei gasPremium;
+    protected Wei maxPriorityFeePerGas;
 
-    protected Wei feeCap;
+    protected Wei maxFeePerGas;
+    protected Wei maxFeePerDataGas;
 
     protected long gasLimit = -1L;
 
-    protected Address to;
+    protected Optional<Address> to = Optional.empty();
 
     protected Wei value;
 
-    protected SECP256K1.Signature signature;
+    protected SECPSignature signature;
 
     protected Bytes payload;
 
+    protected Optional<List<AccessListEntry>> accessList = Optional.empty();
+
     protected Address sender;
 
     protected Optional<BigInteger> chainId = Optional.empty();
 
     protected Optional<BigInteger> v = Optional.empty();
+    protected List<Hash> versionedHashes = null;
+
+    public Builder type(final TransactionType transactionType) {
+      this.transactionType = transactionType;
+      return this;
+    }
 
     public Builder chainId(final BigInteger chainId) {
       this.chainId = Optional.of(chainId);
@@ -653,13 +1117,18 @@ public Builder gasPrice(final Wei gasPrice) {
       return this;
     }
 
-    public Builder gasPremium(final Wei gasPremium) {
-      this.gasPremium = gasPremium;
+    public Builder maxPriorityFeePerGas(final Wei maxPriorityFeePerGas) {
+      this.maxPriorityFeePerGas = maxPriorityFeePerGas;
+      return this;
+    }
+
+    public Builder maxFeePerGas(final Wei maxFeePerGas) {
+      this.maxFeePerGas = maxFeePerGas;
       return this;
     }
 
-    public Builder feeCap(final Wei feeCap) {
-      this.feeCap = feeCap;
+    public Builder maxFeePerDataGas(final Wei maxFeePerDataGas) {
+      this.maxFeePerDataGas = maxFeePerDataGas;
       return this;
     }
 
@@ -679,7 +1148,7 @@ public Builder value(final Wei value) {
     }
 
     public Builder to(final Address to) {
-      this.to = to;
+      this.to = Optional.ofNullable(to);
       return this;
     }
 
@@ -688,39 +1157,67 @@ public Builder payload(final Bytes payload) {
       return this;
     }
 
+    public Builder accessList(final List<AccessListEntry> accessList) {
+      this.accessList =
+          accessList == null
+              ? Optional.empty()
+              : accessList.isEmpty() ? EMPTY_ACCESS_LIST : Optional.of(accessList);
+      return this;
+    }
+
     public Builder sender(final Address sender) {
       this.sender = sender;
       return this;
     }
 
-    public Builder signature(final SECP256K1.Signature signature) {
+    public Builder signature(final SECPSignature signature) {
       this.signature = signature;
       return this;
     }
 
-    public Builder type(final TransactionType transactionType) {
-      this.transactionType = transactionType;
+    public Builder versionedHashes(final List<Hash> versionedHashes) {
+      this.versionedHashes = versionedHashes;
+      return this;
+    }
+
+    public Builder guessType() {
+      if (versionedHashes != null && !versionedHashes.isEmpty()) {
+        transactionType = TransactionType.BLOB;
+      } else if (maxPriorityFeePerGas != null || maxFeePerGas != null) {
+        transactionType = TransactionType.EIP1559;
+      } else if (accessList.isPresent()) {
+        transactionType = TransactionType.ACCESS_LIST;
+      } else {
+        transactionType = TransactionType.FRONTIER;
+      }
       return this;
     }
 
+    public TransactionType getTransactionType() {
+      return transactionType;
+    }
+
     public Transaction build() {
+      if (transactionType == null) guessType();
       return new Transaction(
           transactionType,
           nonce,
-          gasPrice,
-          gasPremium,
-          feeCap,
+          Optional.ofNullable(gasPrice),
+          Optional.ofNullable(maxPriorityFeePerGas),
+          Optional.ofNullable(maxFeePerGas),
+          Optional.ofNullable(maxFeePerDataGas),
           gasLimit,
-          Optional.ofNullable(to),
+          to,
           value,
           signature,
           payload,
+          accessList,
           sender,
           chainId,
-          v);
+          Optional.ofNullable(versionedHashes));
     }
 
-    public Transaction signAndBuild(final SECP256K1.KeyPair keys) {
+    public Transaction signAndBuild(final KeyPair keys) {
       checkState(
           signature == null, "The transaction signature has already been provided to this builder");
       signature(computeSignature(keys));
@@ -728,20 +1225,24 @@ public Transaction signAndBuild(final SECP256K1.KeyPair keys) {
       return build();
     }
 
-    SECP256K1.Signature computeSignature(final SECP256K1.KeyPair keys) {
-      final Bytes32 hash =
-          computeSenderRecoveryHash(
-              nonce, gasPrice, gasPremium, feeCap, gasLimit, to, value, payload, chainId);
-      return SECP256K1.sign(hash, keys);
-    }
-
-    public Builder guessType() {
-      if (gasPremium != null || feeCap != null) {
-        transactionType = TransactionType.EIP1559;
-      } else {
-        transactionType = TransactionType.FRONTIER;
-      }
-      return this;
+    SECPSignature computeSignature(final KeyPair keys) {
+      return SignatureAlgorithmFactory.getInstance()
+          .sign(
+              computeSenderRecoveryHash(
+                  transactionType,
+                  nonce,
+                  gasPrice,
+                  maxPriorityFeePerGas,
+                  maxFeePerGas,
+                  maxFeePerDataGas,
+                  gasLimit,
+                  to,
+                  value,
+                  payload,
+                  accessList,
+                  versionedHashes,
+                  chainId),
+              keys);
     }
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/TransactionReceipt.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/TransactionReceipt.java
index c537fec9913..cdb7a8829d1 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/TransactionReceipt.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/TransactionReceipt.java
@@ -14,15 +14,21 @@
  */
 package org.hyperledger.besu.ethereum.core;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.mainnet.TransactionReceiptType;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPException;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
 import org.hyperledger.besu.plugin.data.TransactionType;
 
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import com.google.common.base.MoreObjects;
 import org.apache.tuweni.bytes.Bytes;
@@ -114,7 +120,7 @@ public TransactionReceipt(
         revertReason);
   }
 
-  private TransactionReceipt(
+  public TransactionReceipt(
       final TransactionType transactionType,
       final int status,
       final long cumulativeGasUsed,
@@ -153,7 +159,7 @@ private TransactionReceipt(
     this.status = status;
     this.logs = logs;
     this.bloomFilter = bloomFilter;
-    transactionReceiptType =
+    this.transactionReceiptType =
         stateRoot == null ? TransactionReceiptType.STATUS : TransactionReceiptType.ROOT;
     this.revertReason = revertReason;
   }
@@ -171,26 +177,35 @@ public void writeToWithRevertReason(final RLPOutput out) {
     writeTo(out, true);
   }
 
-  private void writeTo(final RLPOutput out, final boolean withRevertReason) {
+  private void writeTo(final RLPOutput rlpOutput, final boolean withRevertReason) {
+    if (transactionType.equals(TransactionType.FRONTIER)) {
+      writeToForReceiptTrie(rlpOutput, withRevertReason);
+    } else {
+      rlpOutput.writeBytes(RLP.encode(out -> writeToForReceiptTrie(out, withRevertReason)));
+    }
+  }
+
+  public void writeToForReceiptTrie(final RLPOutput rlpOutput, final boolean withRevertReason) {
     if (!transactionType.equals(TransactionType.FRONTIER)) {
-      out.writeRaw(Bytes.of((byte) transactionType.getSerializedType()));
+      rlpOutput.writeIntScalar(transactionType.getSerializedType());
     }
-    out.startList();
+
+    rlpOutput.startList();
 
     // Determine whether it's a state root-encoded transaction receipt
     // or is a status code-encoded transaction receipt.
     if (stateRoot != null) {
-      out.writeBytes(stateRoot);
+      rlpOutput.writeBytes(stateRoot);
     } else {
-      out.writeLongScalar(status);
+      rlpOutput.writeLongScalar(status);
     }
-    out.writeLongScalar(cumulativeGasUsed);
-    out.writeBytes(bloomFilter);
-    out.writeList(logs, Log::writeTo);
+    rlpOutput.writeLongScalar(cumulativeGasUsed);
+    rlpOutput.writeBytes(bloomFilter);
+    rlpOutput.writeList(logs, Log::writeTo);
     if (withRevertReason && revertReason.isPresent()) {
-      out.writeBytes(revertReason.get());
+      rlpOutput.writeBytes(revertReason.get());
     }
-    out.endList();
+    rlpOutput.endList();
   }
 
   /**
@@ -206,57 +221,51 @@ public static TransactionReceipt readFrom(final RLPInput input) {
   /**
    * Creates a transaction receipt for the given RLP
    *
-   * @param input the RLP-encoded transaction receipt
+   * @param rlpInput the RLP-encoded transaction receipt
    * @param revertReasonAllowed whether the rlp input is allowed to have a revert reason
    * @return the transaction receipt
    */
   public static TransactionReceipt readFrom(
-      final RLPInput input, final boolean revertReasonAllowed) {
+      final RLPInput rlpInput, final boolean revertReasonAllowed) {
+    RLPInput input = rlpInput;
     TransactionType transactionType = TransactionType.FRONTIER;
-    try {
-      input.enterList();
-    } catch (RLPException rlpe) {
-      if (rlpe.getMessage().contains("Expected current item to be a list")) {
-        // This is an EIP-2718 receipt
-        transactionType = TransactionType.of(input.readByte());
-        input.enterList();
-      } else {
-        throw rlpe;
-      }
+    if (!rlpInput.nextIsList()) {
+      final Bytes typedTransactionReceiptBytes = input.readBytes();
+      transactionType = TransactionType.of(typedTransactionReceiptBytes.get(0));
+      input = new BytesValueRLPInput(typedTransactionReceiptBytes.slice(1), false);
     }
 
-    try {
-      // Get the first element to check later to determine the
-      // correct transaction receipt encoding to use.
-      final RLPInput firstElement = input.readAsRlp();
-      final long cumulativeGas = input.readLongScalar();
-      // The logs below will populate the bloom filter upon construction.
-      // TODO consider validating that the logs and bloom filter match.
-      final LogsBloomFilter bloomFilter = LogsBloomFilter.readFrom(input);
-      final List<Log> logs = input.readList(Log::readFrom);
-      final Optional<Bytes> revertReason;
-      if (input.isEndOfCurrentList()) {
-        revertReason = Optional.empty();
-      } else {
-        if (!revertReasonAllowed) {
-          throw new RLPException("Unexpected value at end of TransactionReceipt");
-        }
-        revertReason = Optional.of(input.readBytes());
+    input.enterList();
+    // Get the first element to check later to determine the
+    // correct transaction receipt encoding to use.
+    final RLPInput firstElement = input.readAsRlp();
+    final long cumulativeGas = input.readLongScalar();
+    // The logs below will populate the bloom filter upon construction.
+    // TODO consider validating that the logs and bloom filter match.
+    final LogsBloomFilter bloomFilter = LogsBloomFilter.readFrom(input);
+    final List<Log> logs = input.readList(Log::readFrom);
+    final Optional<Bytes> revertReason;
+    if (input.isEndOfCurrentList()) {
+      revertReason = Optional.empty();
+    } else {
+      if (!revertReasonAllowed) {
+        throw new RLPException("Unexpected value at end of TransactionReceipt");
       }
+      revertReason = Optional.of(input.readBytes());
+    }
 
-      // Status code-encoded transaction receipts have a single
-      // byte for success (0x01) or failure (0x80).
-      if (firstElement.raw().size() == 1) {
-        final int status = firstElement.readIntScalar();
-        return new TransactionReceipt(
-            transactionType, status, cumulativeGas, logs, bloomFilter, revertReason);
-      } else {
-        final Hash stateRoot = Hash.wrap(firstElement.readBytes32());
-        return new TransactionReceipt(
-            transactionType, stateRoot, cumulativeGas, logs, bloomFilter, revertReason);
-      }
-    } finally {
+    // Status code-encoded transaction receipts have a single
+    // byte for success (0x01) or failure (0x80).
+    if (firstElement.raw().size() == 1) {
+      final int status = firstElement.readIntScalar();
+      input.leaveList();
+      return new TransactionReceipt(
+          transactionType, status, cumulativeGas, logs, bloomFilter, revertReason);
+    } else {
+      final Hash stateRoot = Hash.wrap(firstElement.readBytes32());
       input.leaveList();
+      return new TransactionReceipt(
+          transactionType, stateRoot, cumulativeGas, logs, bloomFilter, revertReason);
     }
   }
 
@@ -285,7 +294,16 @@ public long getCumulativeGasUsed() {
    * @return the logs generated by the transaction
    */
   @Override
-  public List<Log> getLogs() {
+  public List<? extends org.hyperledger.besu.plugin.data.Log> getLogs() {
+    return logs.stream().map(LogsWrapper::new).collect(Collectors.toList());
+  }
+
+  /**
+   * Returns the logs generated by the transaction.
+   *
+   * @return the logs generated by the transaction
+   */
+  public List<Log> getLogsList() {
     return logs;
   }
 
@@ -327,8 +345,8 @@ public boolean equals(final Object obj) {
       return false;
     }
     final TransactionReceipt other = (TransactionReceipt) obj;
-    return logs.equals(other.getLogs())
-        && stateRoot.equals(other.stateRoot)
+    return logs.equals(other.getLogsList())
+        && Objects.equals(stateRoot, other.stateRoot)
         && cumulativeGasUsed == other.getCumulativeGasUsed()
         && status == other.status;
   }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Util.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Util.java
index 637ef4cd218..139ef031ec7 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Util.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Util.java
@@ -14,8 +14,11 @@
  */
 package org.hyperledger.besu.ethereum.core;
 
-import org.hyperledger.besu.crypto.SECP256K1.PublicKey;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
+import org.hyperledger.besu.crypto.SECPPublicKey;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 
 import org.apache.tuweni.bytes.Bytes;
 
@@ -29,13 +32,14 @@ public class Util {
    * @param dataHash the hash of the data which was signed.
    * @return The Address of the Ethereum node which signed the data defined by the supplied dataHash
    */
-  public static Address signatureToAddress(final Signature seal, final Hash dataHash) {
-    return PublicKey.recoverFromSignature(dataHash, seal)
+  public static Address signatureToAddress(final SECPSignature seal, final Hash dataHash) {
+    return SignatureAlgorithmFactory.getInstance()
+        .recoverPublicKeyFromSignature(dataHash, seal)
         .map(Util::publicKeyToAddress)
         .orElse(null);
   }
 
-  public static Address publicKeyToAddress(final PublicKey publicKey) {
+  public static Address publicKeyToAddress(final SECPPublicKey publicKey) {
     return publicKeyToAddress(publicKey.getEncodedBytes());
   }
 
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Wei.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Wei.java
deleted file mode 100644
index 2adb4bf7ee5..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Wei.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core;
-
-import org.hyperledger.besu.plugin.data.Quantity;
-
-import java.math.BigInteger;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.BaseUInt256Value;
-import org.apache.tuweni.units.bigints.UInt256;
-
-/** A particular quantity of Wei, the Ethereum currency. */
-public final class Wei extends BaseUInt256Value<Wei> implements Quantity {
-
-  public static final Wei ZERO = of(0);
-
-  public static final Wei ONE = of(1);
-
-  Wei(final UInt256 value) {
-    super(value, Wei::new);
-  }
-
-  private Wei(final long v) {
-    this(UInt256.valueOf(v));
-  }
-
-  private Wei(final BigInteger v) {
-    this(UInt256.valueOf(v));
-  }
-
-  private Wei(final String hexString) {
-    this(UInt256.fromHexString(hexString));
-  }
-
-  public static Wei of(final long value) {
-    return new Wei(value);
-  }
-
-  public static Wei of(final BigInteger value) {
-    return new Wei(value);
-  }
-
-  public static Wei of(final UInt256 value) {
-    return new Wei(value);
-  }
-
-  public static Wei ofNumber(final Number value) {
-    return new Wei((BigInteger) value);
-  }
-
-  public static Wei wrap(final Bytes32 value) {
-    return new Wei(UInt256.fromBytes(value));
-  }
-
-  public static Wei fromHexString(final String str) {
-    return new Wei(str);
-  }
-
-  public static Wei fromEth(final long eth) {
-    return Wei.of(BigInteger.valueOf(eth).multiply(BigInteger.TEN.pow(18)));
-  }
-
-  @Override
-  public Number getValue() {
-    return toBigInteger();
-  }
-
-  @Override
-  public String toHexString() {
-    return super.toHexString();
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Withdrawal.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Withdrawal.java
new file mode 100644
index 00000000000..4fe64ec2016
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Withdrawal.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.GWei;
+import org.hyperledger.besu.ethereum.core.encoding.WithdrawalDecoder;
+import org.hyperledger.besu.ethereum.core.encoding.WithdrawalEncoder;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+
+import java.util.Objects;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt64;
+
+public class Withdrawal implements org.hyperledger.besu.plugin.data.Withdrawal {
+  private final UInt64 index;
+  private final UInt64 validatorIndex;
+  private final Address address;
+  private final GWei amount;
+
+  public Withdrawal(
+      final UInt64 index, final UInt64 validatorIndex, final Address address, final GWei amount) {
+    this.index = index;
+    this.validatorIndex = validatorIndex;
+    this.address = address;
+    this.amount = amount;
+  }
+
+  public static Withdrawal readFrom(final Bytes rlpBytes) {
+    return readFrom(RLP.input(rlpBytes));
+  }
+
+  public static Withdrawal readFrom(final RLPInput rlpInput) {
+    return WithdrawalDecoder.decode(rlpInput);
+  }
+
+  public void writeTo(final RLPOutput out) {
+    WithdrawalEncoder.encode(this, out);
+  }
+
+  @Override
+  public UInt64 getIndex() {
+    return index;
+  }
+
+  @Override
+  public UInt64 getValidatorIndex() {
+    return validatorIndex;
+  }
+
+  @Override
+  public Address getAddress() {
+    return address;
+  }
+
+  @Override
+  public GWei getAmount() {
+    return amount;
+  }
+
+  @Override
+  public String toString() {
+    return "Withdrawal{"
+        + "index="
+        + index
+        + ", validatorIndex="
+        + validatorIndex
+        + ", address="
+        + address
+        + ", amount="
+        + amount
+        + '}';
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    final Withdrawal that = (Withdrawal) o;
+    return Objects.equals(index, that.index)
+        && Objects.equals(validatorIndex, that.validatorIndex)
+        && Objects.equals(address, that.address)
+        && Objects.equals(amount, that.amount);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(index, validatorIndex, address, amount);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/deserializer/GasDeserializer.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/deserializer/GasDeserializer.java
deleted file mode 100644
index f2a9aa51bdc..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/deserializer/GasDeserializer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core.deserializer;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-
-public class GasDeserializer extends StdDeserializer<Gas> {
-  public GasDeserializer() {
-    this(null);
-  }
-
-  public GasDeserializer(final Class<?> vc) {
-    super(vc);
-  }
-
-  @Override
-  public Gas deserialize(final JsonParser jsonparser, final DeserializationContext context)
-      throws IOException {
-    return Gas.fromHexString(jsonparser.getCodec().readValue(jsonparser, String.class));
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/DepositDecoder.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/DepositDecoder.java
new file mode 100644
index 00000000000..cb8410d3d28
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/DepositDecoder.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core.encoding;
+
+import org.hyperledger.besu.datatypes.BLSPublicKey;
+import org.hyperledger.besu.datatypes.BLSSignature;
+import org.hyperledger.besu.datatypes.GWei;
+import org.hyperledger.besu.ethereum.core.Deposit;
+import org.hyperledger.besu.ethereum.core.DepositContract;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.evm.log.Log;
+
+import java.nio.ByteOrder;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt64;
+import org.web3j.tx.Contract;
+
+public class DepositDecoder {
+
+  public static Deposit decode(final RLPInput rlpInput) {
+    rlpInput.enterList();
+    final BLSPublicKey publicKey = BLSPublicKey.readFrom(rlpInput);
+    final Bytes32 depositWithdrawalCredential = Bytes32.wrap(rlpInput.readBytes());
+    final GWei amount = GWei.of(rlpInput.readUInt64Scalar());
+    final BLSSignature signature = BLSSignature.readFrom(rlpInput);
+    final UInt64 index = UInt64.valueOf(rlpInput.readBigIntegerScalar());
+    rlpInput.leaveList();
+
+    return new Deposit(publicKey, depositWithdrawalCredential, amount, signature, index);
+  }
+
+  public static Deposit decodeFromLog(final Log log) {
+    Contract.EventValuesWithLog eventValues = DepositContract.staticExtractDepositEventWithLog(log);
+    final byte[] rawPublicKey = (byte[]) eventValues.getNonIndexedValues().get(0).getValue();
+    final byte[] rawWithdrawalCredential =
+        (byte[]) eventValues.getNonIndexedValues().get(1).getValue();
+    final byte[] rawAmount = (byte[]) eventValues.getNonIndexedValues().get(2).getValue();
+    final byte[] rawSignature = (byte[]) eventValues.getNonIndexedValues().get(3).getValue();
+    final byte[] rawIndex = (byte[]) eventValues.getNonIndexedValues().get(4).getValue();
+
+    return new Deposit(
+        BLSPublicKey.wrap(Bytes.wrap(rawPublicKey)),
+        Bytes32.wrap(Bytes.wrap(rawWithdrawalCredential)),
+        GWei.of(
+            Bytes.wrap(rawAmount)
+                .toLong(
+                    ByteOrder.LITTLE_ENDIAN)), // Amount is little endian as per Deposit Contract
+        BLSSignature.wrap(Bytes.wrap(rawSignature)),
+        UInt64.valueOf(Bytes.wrap(rawIndex).reverse().toLong()));
+  }
+
+  public static Deposit decodeOpaqueBytes(final Bytes input) {
+    return decode(RLP.input(input));
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/DepositEncoder.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/DepositEncoder.java
new file mode 100644
index 00000000000..d5171d18f79
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/DepositEncoder.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core.encoding;
+
+import org.hyperledger.besu.ethereum.core.Deposit;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class DepositEncoder {
+
+  public static void encode(final Deposit deposit, final RLPOutput rlpOutput) {
+    rlpOutput.startList();
+    rlpOutput.writeBytes(deposit.getPublicKey());
+    rlpOutput.writeBytes(deposit.getWithdrawalCredentials());
+    rlpOutput.writeUInt64Scalar(deposit.getAmount());
+    rlpOutput.writeBytes(deposit.getSignature());
+    rlpOutput.writeUInt64Scalar(deposit.getIndex());
+    rlpOutput.endList();
+  }
+
+  public static Bytes encodeOpaqueBytes(final Deposit deposit) {
+    return RLP.encode(rlpOutput -> encode(deposit, rlpOutput));
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/TransactionDecoder.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/TransactionDecoder.java
new file mode 100644
index 00000000000..bd41e0276bf
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/TransactionDecoder.java
@@ -0,0 +1,201 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core.encoding;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.hyperledger.besu.ethereum.core.Transaction.REPLAY_PROTECTED_V_BASE;
+import static org.hyperledger.besu.ethereum.core.Transaction.REPLAY_PROTECTED_V_MIN;
+import static org.hyperledger.besu.ethereum.core.Transaction.REPLAY_UNPROTECTED_V_BASE;
+import static org.hyperledger.besu.ethereum.core.Transaction.REPLAY_UNPROTECTED_V_BASE_PLUS_1;
+import static org.hyperledger.besu.ethereum.core.Transaction.TWO;
+
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.evm.AccessListEntry;
+import org.hyperledger.besu.plugin.data.TransactionType;
+
+import java.math.BigInteger;
+import java.util.Optional;
+import java.util.function.Supplier;
+
+import com.google.common.base.Suppliers;
+import com.google.common.collect.ImmutableMap;
+import org.apache.tuweni.bytes.Bytes;
+
+public class TransactionDecoder {
+
+  @FunctionalInterface
+  interface Decoder {
+    Transaction decode(RLPInput input);
+  }
+
+  private static final ImmutableMap<TransactionType, Decoder> TYPED_TRANSACTION_DECODERS =
+      ImmutableMap.of(
+          TransactionType.ACCESS_LIST,
+          TransactionDecoder::decodeAccessList,
+          TransactionType.EIP1559,
+          TransactionDecoder::decodeEIP1559);
+
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+
+  public static Transaction decodeForWire(final RLPInput rlpInput) {
+    if (rlpInput.nextIsList()) {
+      return decodeFrontier(rlpInput);
+    } else {
+      final Bytes typedTransactionBytes = rlpInput.readBytes();
+      final TransactionType transactionType =
+          TransactionType.of(typedTransactionBytes.get(0) & 0xff);
+      return getDecoder(transactionType).decode(RLP.input(typedTransactionBytes.slice(1)));
+    }
+  }
+
+  public static Transaction decodeOpaqueBytes(final Bytes input) {
+    final TransactionType transactionType;
+    try {
+      transactionType = TransactionType.of(input.get(0));
+    } catch (final IllegalArgumentException __) {
+      return decodeForWire(RLP.input(input));
+    }
+    return getDecoder(transactionType).decode(RLP.input(input.slice(1)));
+  }
+
+  private static Decoder getDecoder(final TransactionType transactionType) {
+    return checkNotNull(
+        TYPED_TRANSACTION_DECODERS.get(transactionType),
+        "Developer Error. A supported transaction type %s has no associated decoding logic",
+        transactionType);
+  }
+
+  static Transaction decodeFrontier(final RLPInput input) {
+    input.enterList();
+    final Transaction.Builder builder =
+        Transaction.builder()
+            .type(TransactionType.FRONTIER)
+            .nonce(input.readLongScalar())
+            .gasPrice(Wei.of(input.readUInt256Scalar()))
+            .gasLimit(input.readLongScalar())
+            .to(input.readBytes(v -> v.size() == 0 ? null : Address.wrap(v)))
+            .value(Wei.of(input.readUInt256Scalar()))
+            .payload(input.readBytes());
+
+    final BigInteger v = input.readBigIntegerScalar();
+    final byte recId;
+    Optional<BigInteger> chainId = Optional.empty();
+    if (v.equals(REPLAY_UNPROTECTED_V_BASE) || v.equals(REPLAY_UNPROTECTED_V_BASE_PLUS_1)) {
+      recId = v.subtract(REPLAY_UNPROTECTED_V_BASE).byteValueExact();
+    } else if (v.compareTo(REPLAY_PROTECTED_V_MIN) > 0) {
+      chainId = Optional.of(v.subtract(REPLAY_PROTECTED_V_BASE).divide(TWO));
+      recId = v.subtract(TWO.multiply(chainId.get()).add(REPLAY_PROTECTED_V_BASE)).byteValueExact();
+    } else {
+      throw new RuntimeException(
+          String.format("An unsupported encoded `v` value of %s was found", v));
+    }
+    final BigInteger r = input.readUInt256Scalar().toUnsignedBigInteger();
+    final BigInteger s = input.readUInt256Scalar().toUnsignedBigInteger();
+    final SECPSignature signature = SIGNATURE_ALGORITHM.get().createSignature(r, s, recId);
+
+    input.leaveList();
+
+    chainId.ifPresent(builder::chainId);
+    return builder.signature(signature).build();
+  }
+
+  private static Transaction decodeAccessList(final RLPInput rlpInput) {
+    rlpInput.enterList();
+    final Transaction.Builder preSignatureTransactionBuilder =
+        Transaction.builder()
+            .type(TransactionType.ACCESS_LIST)
+            .chainId(BigInteger.valueOf(rlpInput.readLongScalar()))
+            .nonce(rlpInput.readLongScalar())
+            .gasPrice(Wei.of(rlpInput.readUInt256Scalar()))
+            .gasLimit(rlpInput.readLongScalar())
+            .to(
+                rlpInput.readBytes(
+                    addressBytes -> addressBytes.size() == 0 ? null : Address.wrap(addressBytes)))
+            .value(Wei.of(rlpInput.readUInt256Scalar()))
+            .payload(rlpInput.readBytes())
+            .accessList(
+                rlpInput.readList(
+                    accessListEntryRLPInput -> {
+                      accessListEntryRLPInput.enterList();
+                      final AccessListEntry accessListEntry =
+                          new AccessListEntry(
+                              Address.wrap(accessListEntryRLPInput.readBytes()),
+                              accessListEntryRLPInput.readList(RLPInput::readBytes32));
+                      accessListEntryRLPInput.leaveList();
+                      return accessListEntry;
+                    }));
+    final byte recId = (byte) rlpInput.readIntScalar();
+    final Transaction transaction =
+        preSignatureTransactionBuilder
+            .signature(
+                SIGNATURE_ALGORITHM
+                    .get()
+                    .createSignature(
+                        rlpInput.readUInt256Scalar().toUnsignedBigInteger(),
+                        rlpInput.readUInt256Scalar().toUnsignedBigInteger(),
+                        recId))
+            .build();
+    rlpInput.leaveList();
+    return transaction;
+  }
+
+  static Transaction decodeEIP1559(final RLPInput input) {
+    input.enterList();
+    final BigInteger chainId = input.readBigIntegerScalar();
+    final Transaction.Builder builder =
+        Transaction.builder()
+            .type(TransactionType.EIP1559)
+            .chainId(chainId)
+            .nonce(input.readLongScalar())
+            .maxPriorityFeePerGas(Wei.of(input.readUInt256Scalar()))
+            .maxFeePerGas(Wei.of(input.readUInt256Scalar()))
+            .gasLimit(input.readLongScalar())
+            .to(input.readBytes(v -> v.size() == 0 ? null : Address.wrap(v)))
+            .value(Wei.of(input.readUInt256Scalar()))
+            .payload(input.readBytes())
+            .accessList(
+                input.readList(
+                    accessListEntryRLPInput -> {
+                      accessListEntryRLPInput.enterList();
+                      final AccessListEntry accessListEntry =
+                          new AccessListEntry(
+                              Address.wrap(accessListEntryRLPInput.readBytes()),
+                              accessListEntryRLPInput.readList(RLPInput::readBytes32));
+                      accessListEntryRLPInput.leaveList();
+                      return accessListEntry;
+                    }));
+    final byte recId = (byte) input.readIntScalar();
+    final Transaction transaction =
+        builder
+            .signature(
+                SIGNATURE_ALGORITHM
+                    .get()
+                    .createSignature(
+                        input.readUInt256Scalar().toUnsignedBigInteger(),
+                        input.readUInt256Scalar().toUnsignedBigInteger(),
+                        recId))
+            .build();
+    input.leaveList();
+    return transaction;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/TransactionEncoder.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/TransactionEncoder.java
new file mode 100644
index 00000000000..3af82a68301
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/TransactionEncoder.java
@@ -0,0 +1,208 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core.encoding;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+import org.hyperledger.besu.evm.AccessListEntry;
+import org.hyperledger.besu.plugin.data.TransactionType;
+
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class TransactionEncoder {
+
+  @FunctionalInterface
+  interface Encoder {
+    void encode(Transaction transaction, RLPOutput output);
+  }
+
+  private static final Map<TransactionType, Encoder> TYPED_TRANSACTION_ENCODERS =
+      Map.of(
+          TransactionType.ACCESS_LIST,
+          TransactionEncoder::encodeAccessList,
+          TransactionType.EIP1559,
+          TransactionEncoder::encodeEIP1559);
+
+  public static void encodeForWire(final Transaction transaction, final RLPOutput rlpOutput) {
+    final TransactionType transactionType =
+        checkNotNull(
+            transaction.getType(), "Transaction type for %s was not specified.", transaction);
+    encodeForWire(transactionType, encodeOpaqueBytes(transaction), rlpOutput);
+  }
+
+  public static void encodeForWire(
+      final TransactionType transactionType, final Bytes opaqueBytes, final RLPOutput rlpOutput) {
+    checkNotNull(transactionType, "Transaction type was not specified.");
+    if (TransactionType.FRONTIER.equals(transactionType)) {
+      rlpOutput.writeRaw(opaqueBytes);
+    } else {
+      rlpOutput.writeBytes(opaqueBytes);
+    }
+  }
+
+  public static Bytes encodeOpaqueBytes(final Transaction transaction) {
+    final TransactionType transactionType =
+        checkNotNull(
+            transaction.getType(), "Transaction type for %s was not specified.", transaction);
+    if (TransactionType.FRONTIER.equals(transactionType)) {
+      return RLP.encode(rlpOutput -> encodeFrontier(transaction, rlpOutput));
+    } else {
+      final Encoder encoder =
+          checkNotNull(
+              TYPED_TRANSACTION_ENCODERS.get(transactionType),
+              "Developer Error. A supported transaction type %s has no associated encoding logic",
+              transactionType);
+      return Bytes.concatenate(
+          Bytes.of(transactionType.getSerializedType()),
+          RLP.encode(rlpOutput -> encoder.encode(transaction, rlpOutput)));
+    }
+  }
+
+  static void encodeFrontier(final Transaction transaction, final RLPOutput out) {
+    out.startList();
+    out.writeLongScalar(transaction.getNonce());
+    out.writeUInt256Scalar(transaction.getGasPrice().orElseThrow());
+    out.writeLongScalar(transaction.getGasLimit());
+    out.writeBytes(transaction.getTo().map(Bytes::copy).orElse(Bytes.EMPTY));
+    out.writeUInt256Scalar(transaction.getValue());
+    out.writeBytes(transaction.getPayload());
+    writeSignatureAndV(transaction, out);
+    out.endList();
+  }
+
+  static void encodeAccessList(final Transaction transaction, final RLPOutput rlpOutput) {
+    rlpOutput.startList();
+    encodeAccessListInner(
+        transaction.getChainId(),
+        transaction.getNonce(),
+        transaction.getGasPrice().orElseThrow(),
+        transaction.getGasLimit(),
+        transaction.getTo(),
+        transaction.getValue(),
+        transaction.getPayload(),
+        transaction
+            .getAccessList()
+            .orElseThrow(
+                () ->
+                    new IllegalStateException(
+                        "Developer error: access list should be guaranteed to be present")),
+        rlpOutput);
+    rlpOutput.writeIntScalar(transaction.getSignature().getRecId());
+    writeSignature(transaction, rlpOutput);
+    rlpOutput.endList();
+  }
+
+  public static void encodeAccessListInner(
+      final Optional<BigInteger> chainId,
+      final long nonce,
+      final Wei gasPrice,
+      final long gasLimit,
+      final Optional<Address> to,
+      final Wei value,
+      final Bytes payload,
+      final List<AccessListEntry> accessList,
+      final RLPOutput rlpOutput) {
+    rlpOutput.writeBigIntegerScalar(chainId.orElseThrow());
+    rlpOutput.writeLongScalar(nonce);
+    rlpOutput.writeUInt256Scalar(gasPrice);
+    rlpOutput.writeLongScalar(gasLimit);
+    rlpOutput.writeBytes(to.map(Bytes::copy).orElse(Bytes.EMPTY));
+    rlpOutput.writeUInt256Scalar(value);
+    rlpOutput.writeBytes(payload);
+    /*
+    Access List encoding should look like this
+    where hex strings represent raw bytes
+    [
+      [
+        "0xde0b295669a9fd93d5f28d9ec85e40f4cb697bae",
+        [
+          "0x0000000000000000000000000000000000000000000000000000000000000003",
+          "0x0000000000000000000000000000000000000000000000000000000000000007"
+        ]
+      ],
+      [
+        "0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
+        []
+      ]
+    ] */
+    writeAccessList(rlpOutput, Optional.of(accessList));
+  }
+
+  static void encodeEIP1559(final Transaction transaction, final RLPOutput out) {
+    out.startList();
+    out.writeBigIntegerScalar(transaction.getChainId().orElseThrow());
+    out.writeLongScalar(transaction.getNonce());
+    out.writeUInt256Scalar(transaction.getMaxPriorityFeePerGas().orElseThrow());
+    out.writeUInt256Scalar(transaction.getMaxFeePerGas().orElseThrow());
+    out.writeLongScalar(transaction.getGasLimit());
+    out.writeBytes(transaction.getTo().map(Bytes::copy).orElse(Bytes.EMPTY));
+    out.writeUInt256Scalar(transaction.getValue());
+    out.writeBytes(transaction.getPayload());
+    writeAccessList(out, transaction.getAccessList());
+    writeSignatureAndRecoveryId(transaction, out);
+    out.endList();
+  }
+
+  public static void writeAccessList(
+      final RLPOutput out, final Optional<List<AccessListEntry>> accessListEntries) {
+    if (accessListEntries.isEmpty()) {
+      out.writeEmptyList();
+    } else {
+      out.writeList(
+          accessListEntries.get(),
+          (accessListEntry, accessListEntryRLPOutput) -> {
+            accessListEntryRLPOutput.startList();
+            out.writeBytes(accessListEntry.getAddress());
+            out.writeList(
+                accessListEntry.getStorageKeys(),
+                (storageKeyBytes, storageKeyBytesRLPOutput) ->
+                    storageKeyBytesRLPOutput.writeBytes(storageKeyBytes));
+            accessListEntryRLPOutput.endList();
+          });
+    }
+  }
+
+  public static void writeBlobVersionedHashes(
+      final RLPOutput rlpOutput, final List<Hash> versionedHashes) {
+    // ToDo 4844: implement
+  }
+
+  private static void writeSignatureAndV(final Transaction transaction, final RLPOutput out) {
+    out.writeBigIntegerScalar(transaction.getV());
+    writeSignature(transaction, out);
+  }
+
+  private static void writeSignatureAndRecoveryId(
+      final Transaction transaction, final RLPOutput out) {
+    out.writeIntScalar(transaction.getSignature().getRecId());
+    writeSignature(transaction, out);
+  }
+
+  private static void writeSignature(final Transaction transaction, final RLPOutput out) {
+    out.writeBigIntegerScalar(transaction.getSignature().getR());
+    out.writeBigIntegerScalar(transaction.getSignature().getS());
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/TransactionRLPDecoder.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/TransactionRLPDecoder.java
deleted file mode 100644
index f0f130ceb70..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/TransactionRLPDecoder.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core.encoding;
-
-import static org.hyperledger.besu.ethereum.core.Transaction.GO_QUORUM_PRIVATE_TRANSACTION_V_VALUE_MAX;
-import static org.hyperledger.besu.ethereum.core.Transaction.GO_QUORUM_PRIVATE_TRANSACTION_V_VALUE_MIN;
-import static org.hyperledger.besu.ethereum.core.Transaction.REPLAY_PROTECTED_V_BASE;
-import static org.hyperledger.besu.ethereum.core.Transaction.REPLAY_PROTECTED_V_MIN;
-import static org.hyperledger.besu.ethereum.core.Transaction.REPLAY_UNPROTECTED_V_BASE;
-import static org.hyperledger.besu.ethereum.core.Transaction.REPLAY_UNPROTECTED_V_BASE_PLUS_1;
-import static org.hyperledger.besu.ethereum.core.Transaction.TWO;
-
-import org.hyperledger.besu.config.GoQuorumOptions;
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
-import org.hyperledger.besu.crypto.SECP256K1;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.rlp.RLPInput;
-import org.hyperledger.besu.plugin.data.TransactionType;
-
-import java.math.BigInteger;
-import java.util.Optional;
-
-import com.google.common.collect.ImmutableMap;
-import org.apache.tuweni.bytes.Bytes;
-
-public class TransactionRLPDecoder {
-
-  @FunctionalInterface
-  interface Decoder {
-    Transaction decode(RLPInput input);
-  }
-
-  private static final ImmutableMap<TransactionType, TransactionRLPDecoder.Decoder>
-      TYPED_TRANSACTION_DECODERS =
-          ImmutableMap.of(TransactionType.EIP1559, TransactionRLPDecoder::decodeEIP1559);
-
-  public static Transaction decode(final RLPInput rlpInput) {
-    if (GoQuorumOptions.goquorumCompatibilityMode) {
-      return decodeGoQuorum(rlpInput);
-    }
-    if (rlpInput.nextIsList()) {
-      return decodeFrontierOrEip1559(rlpInput);
-    } else {
-      final Bytes typedTransactionBytes = rlpInput.raw();
-      final int firstByte = typedTransactionBytes.get(0) & 0xff;
-      final TransactionType transactionType = TransactionType.of(firstByte);
-      rlpInput.skipNext(); // throw away the type byte
-      final Decoder decoder =
-          Optional.ofNullable(TYPED_TRANSACTION_DECODERS.get(transactionType))
-              .orElseThrow(
-                  () ->
-                      new IllegalStateException(
-                          String.format(
-                              "Developer Error. A supported transaction type %s has no associated decoding logic",
-                              transactionType)));
-      return decoder.decode(rlpInput);
-    }
-  }
-
-  static Transaction decodeFrontierOrEip1559(final RLPInput input) {
-    input.enterList();
-
-    final Transaction.Builder builder =
-        Transaction.builder()
-            .nonce(input.readLongScalar())
-            .gasPrice(Wei.of(input.readUInt256Scalar()))
-            .gasLimit(input.readLongScalar())
-            .to(input.readBytes(v -> v.size() == 0 ? null : Address.wrap(v)))
-            .value(Wei.of(input.readUInt256Scalar()))
-            .payload(input.readBytes());
-
-    final Bytes maybeGasPremiumOrV = input.readBytes();
-    final Bytes maybeFeeCapOrR = input.readBytes();
-    final Bytes maybeVOrS = input.readBytes();
-    final BigInteger v, r, s;
-    // if this is the end of the list we are processing a legacy transaction
-    if (input.isEndOfCurrentList()) {
-      builder.type(TransactionType.FRONTIER);
-      v = maybeGasPremiumOrV.toUnsignedBigInteger();
-      r = maybeFeeCapOrR.toUnsignedBigInteger();
-      s = maybeVOrS.toUnsignedBigInteger();
-    } else {
-      // otherwise this is an EIP-1559 transaction
-      builder.type(TransactionType.EIP1559);
-      builder
-          .gasPremium(Wei.of(maybeGasPremiumOrV.toBigInteger()))
-          .feeCap(Wei.of(maybeFeeCapOrR.toBigInteger()));
-      v = maybeVOrS.toBigInteger();
-      r = input.readUInt256Scalar().toBytes().toUnsignedBigInteger();
-      s = input.readUInt256Scalar().toBytes().toUnsignedBigInteger();
-    }
-    final byte recId;
-    Optional<BigInteger> chainId = Optional.empty();
-    if (v.equals(REPLAY_UNPROTECTED_V_BASE) || v.equals(REPLAY_UNPROTECTED_V_BASE_PLUS_1)) {
-      recId = v.subtract(REPLAY_UNPROTECTED_V_BASE).byteValueExact();
-    } else if (v.compareTo(REPLAY_PROTECTED_V_MIN) > 0) {
-      chainId = Optional.of(v.subtract(REPLAY_PROTECTED_V_BASE).divide(TWO));
-      recId = v.subtract(TWO.multiply(chainId.get()).add(REPLAY_PROTECTED_V_BASE)).byteValueExact();
-    } else {
-      throw new RuntimeException(
-          String.format("An unsupported encoded `v` value of %s was found", v));
-    }
-    final SECP256K1.Signature signature = SECP256K1.Signature.create(r, s, recId);
-    input.leaveList();
-    chainId.ifPresent(builder::chainId);
-    return builder.signature(signature).build();
-  }
-
-  static Transaction decodeFrontier(final RLPInput input) {
-    input.enterList();
-    final Transaction.Builder builder =
-        Transaction.builder()
-            .type(TransactionType.FRONTIER)
-            .nonce(input.readLongScalar())
-            .gasPrice(Wei.of(input.readUInt256Scalar()))
-            .gasLimit(input.readLongScalar())
-            .to(input.readBytes(v -> v.size() == 0 ? null : Address.wrap(v)))
-            .value(Wei.of(input.readUInt256Scalar()))
-            .payload(input.readBytes());
-
-    final BigInteger v = input.readBigIntegerScalar();
-    final byte recId;
-    Optional<BigInteger> chainId = Optional.empty();
-    if (v.equals(REPLAY_UNPROTECTED_V_BASE) || v.equals(REPLAY_UNPROTECTED_V_BASE_PLUS_1)) {
-      recId = v.subtract(REPLAY_UNPROTECTED_V_BASE).byteValueExact();
-    } else if (v.compareTo(REPLAY_PROTECTED_V_MIN) > 0) {
-      chainId = Optional.of(v.subtract(REPLAY_PROTECTED_V_BASE).divide(TWO));
-      recId = v.subtract(TWO.multiply(chainId.get()).add(REPLAY_PROTECTED_V_BASE)).byteValueExact();
-    } else {
-      throw new RuntimeException(
-          String.format("An unsupported encoded `v` value of %s was found", v));
-    }
-    final BigInteger r = input.readUInt256Scalar().toBytes().toUnsignedBigInteger();
-    final BigInteger s = input.readUInt256Scalar().toBytes().toUnsignedBigInteger();
-    final SECP256K1.Signature signature = SECP256K1.Signature.create(r, s, recId);
-
-    input.leaveList();
-
-    chainId.ifPresent(builder::chainId);
-    return builder.signature(signature).build();
-  }
-
-  static Transaction decodeEIP1559(final RLPInput input) {
-    ExperimentalEIPs.eip1559MustBeEnabled();
-    input.enterList();
-
-    final Transaction.Builder builder =
-        Transaction.builder()
-            .type(TransactionType.EIP1559)
-            .nonce(input.readLongScalar())
-            .gasPrice(Wei.of(input.readUInt256Scalar()))
-            .gasLimit(input.readLongScalar())
-            .to(input.readBytes(v -> v.size() == 0 ? null : Address.wrap(v)))
-            .value(Wei.of(input.readUInt256Scalar()))
-            .payload(input.readBytes())
-            .gasPremium(Wei.of(input.readBytes().toBigInteger()))
-            .feeCap(Wei.of(input.readBytes().toBigInteger()));
-
-    final BigInteger v = input.readBytes().toBigInteger();
-    final BigInteger r = input.readUInt256Scalar().toBytes().toUnsignedBigInteger();
-    final BigInteger s = input.readUInt256Scalar().toBytes().toUnsignedBigInteger();
-    final byte recId;
-    Optional<BigInteger> chainId = Optional.empty();
-    if (v.equals(REPLAY_UNPROTECTED_V_BASE) || v.equals(REPLAY_UNPROTECTED_V_BASE_PLUS_1)) {
-      recId = v.subtract(REPLAY_UNPROTECTED_V_BASE).byteValueExact();
-    } else if (v.compareTo(REPLAY_PROTECTED_V_MIN) > 0) {
-      chainId = Optional.of(v.subtract(REPLAY_PROTECTED_V_BASE).divide(TWO));
-      recId = v.subtract(TWO.multiply(chainId.get()).add(REPLAY_PROTECTED_V_BASE)).byteValueExact();
-    } else {
-      throw new RuntimeException(
-          String.format("An unsupported encoded `v` value of %s was found", v));
-    }
-    final SECP256K1.Signature signature = SECP256K1.Signature.create(r, s, recId);
-    input.leaveList();
-    chainId.ifPresent(builder::chainId);
-    return builder.signature(signature).build();
-  }
-
-  static Transaction decodeGoQuorum(final RLPInput input) {
-    input.enterList();
-
-    final Transaction.Builder builder =
-        Transaction.builder()
-            .type(TransactionType.FRONTIER)
-            .nonce(input.readLongScalar())
-            .gasPrice(Wei.of(input.readUInt256Scalar()))
-            .gasLimit(input.readLongScalar())
-            .to(input.readBytes(v -> v.size() == 0 ? null : Address.wrap(v)))
-            .value(Wei.of(input.readUInt256Scalar()))
-            .payload(input.readBytes());
-
-    final BigInteger v = input.readBigIntegerScalar();
-    final byte recId;
-    Optional<BigInteger> chainId = Optional.empty();
-    if (isGoQuorumPrivateTransaction(v)) {
-      // GoQuorum private TX. No chain ID. Preserve the v value as provided.
-      builder.v(v);
-      recId = v.subtract(GO_QUORUM_PRIVATE_TRANSACTION_V_VALUE_MIN).byteValueExact();
-    } else if (v.equals(REPLAY_UNPROTECTED_V_BASE) || v.equals(REPLAY_UNPROTECTED_V_BASE_PLUS_1)) {
-      recId = v.subtract(REPLAY_UNPROTECTED_V_BASE).byteValueExact();
-    } else if (v.compareTo(REPLAY_PROTECTED_V_MIN) > 0) {
-      chainId = Optional.of(v.subtract(REPLAY_PROTECTED_V_BASE).divide(TWO));
-      recId = v.subtract(TWO.multiply(chainId.get()).add(REPLAY_PROTECTED_V_BASE)).byteValueExact();
-    } else {
-      throw new RuntimeException(
-          String.format("An unsupported encoded `v` value of %s was found", v));
-    }
-    final BigInteger r = input.readUInt256Scalar().toBytes().toUnsignedBigInteger();
-    final BigInteger s = input.readUInt256Scalar().toBytes().toUnsignedBigInteger();
-    final SECP256K1.Signature signature = SECP256K1.Signature.create(r, s, recId);
-
-    input.leaveList();
-    chainId.ifPresent(builder::chainId);
-    return builder.signature(signature).build();
-  }
-
-  private static boolean isGoQuorumPrivateTransaction(final BigInteger v) {
-    return v.equals(GO_QUORUM_PRIVATE_TRANSACTION_V_VALUE_MAX)
-        || v.equals(GO_QUORUM_PRIVATE_TRANSACTION_V_VALUE_MIN);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/TransactionRLPEncoder.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/TransactionRLPEncoder.java
deleted file mode 100644
index c0e2eb0f254..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/TransactionRLPEncoder.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core.encoding;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.rlp.RLP;
-import org.hyperledger.besu.ethereum.rlp.RLPOutput;
-import org.hyperledger.besu.plugin.data.Quantity;
-import org.hyperledger.besu.plugin.data.TransactionType;
-
-import java.util.Optional;
-
-import com.google.common.collect.ImmutableMap;
-import org.apache.tuweni.bytes.Bytes;
-
-public class TransactionRLPEncoder {
-
-  @FunctionalInterface
-  interface Encoder {
-    void encode(Transaction transaction, RLPOutput output);
-  }
-
-  private static final ImmutableMap<TransactionType, Encoder> TYPED_TRANSACTION_ENCODERS =
-      ImmutableMap.of(TransactionType.EIP1559, TransactionRLPEncoder::encodeEIP1559);
-
-  public static void encode(final Transaction transaction, final RLPOutput rlpOutput) {
-    final TransactionType transactionType =
-        checkNotNull(
-            transaction.getType(), "Transaction type for %s was not specified.", transaction);
-    if (TransactionType.FRONTIER.equals(transactionType)) {
-      encodeFrontier(transaction, rlpOutput);
-    } else if (TransactionType.EIP1559.equals(transactionType)) {
-      encodeEIP1559(transaction, rlpOutput);
-    } else {
-      final Encoder encoder =
-          Optional.ofNullable(TYPED_TRANSACTION_ENCODERS.get(transactionType))
-              .orElseThrow(
-                  () ->
-                      new IllegalStateException(
-                          String.format(
-                              "Developer Error. A supported transaction type %s has no associated"
-                                  + " encoding logic",
-                              transactionType)));
-      rlpOutput.writeRaw(
-          Bytes.concatenate(
-              Bytes.of((byte) transactionType.getSerializedType()),
-              RLP.encode(output -> encoder.encode(transaction, output))));
-    }
-  }
-
-  static void encodeFrontier(final Transaction transaction, final RLPOutput out) {
-    out.startList();
-    out.writeLongScalar(transaction.getNonce());
-    out.writeUInt256Scalar(transaction.getGasPrice());
-    out.writeLongScalar(transaction.getGasLimit());
-    out.writeBytes(transaction.getTo().map(Bytes::copy).orElse(Bytes.EMPTY));
-    out.writeUInt256Scalar(transaction.getValue());
-    out.writeBytes(transaction.getPayload());
-    writeSignature(transaction, out);
-    out.endList();
-  }
-
-  static void encodeEIP1559(final Transaction transaction, final RLPOutput out) {
-    ExperimentalEIPs.eip1559MustBeEnabled();
-
-    out.startList();
-    out.writeLongScalar(transaction.getNonce());
-    out.writeNull();
-    out.writeLongScalar(transaction.getGasLimit());
-    out.writeBytes(transaction.getTo().map(Bytes::copy).orElse(Bytes.EMPTY));
-    out.writeUInt256Scalar(transaction.getValue());
-    out.writeBytes(transaction.getPayload());
-    out.writeUInt256Scalar(
-        transaction.getGasPremium().map(Quantity::getValue).map(Wei::ofNumber).orElseThrow());
-    out.writeUInt256Scalar(
-        transaction.getFeeCap().map(Quantity::getValue).map(Wei::ofNumber).orElseThrow());
-    writeSignature(transaction, out);
-    out.endList();
-  }
-
-  private static void writeSignature(final Transaction transaction, final RLPOutput out) {
-    out.writeBigIntegerScalar(transaction.getV());
-    out.writeBigIntegerScalar(transaction.getSignature().getR());
-    out.writeBigIntegerScalar(transaction.getSignature().getS());
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/WithdrawalDecoder.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/WithdrawalDecoder.java
new file mode 100644
index 00000000000..77ec6ad0200
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/WithdrawalDecoder.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core.encoding;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.GWei;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt64;
+
+public class WithdrawalDecoder {
+
+  public static Withdrawal decode(final RLPInput rlpInput) {
+    rlpInput.enterList();
+    final UInt64 index = UInt64.valueOf(rlpInput.readBigIntegerScalar());
+    final UInt64 validatorIndex = UInt64.valueOf(rlpInput.readBigIntegerScalar());
+    final Address address = Address.readFrom(rlpInput);
+    final GWei amount = GWei.of(rlpInput.readUInt64Scalar());
+    rlpInput.leaveList();
+
+    return new Withdrawal(index, validatorIndex, address, amount);
+  }
+
+  public static Withdrawal decodeOpaqueBytes(final Bytes input) {
+    return decode(RLP.input(input));
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/WithdrawalEncoder.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/WithdrawalEncoder.java
new file mode 100644
index 00000000000..9dcac154501
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/encoding/WithdrawalEncoder.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core.encoding;
+
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class WithdrawalEncoder {
+
+  public static void encode(final Withdrawal withdrawal, final RLPOutput rlpOutput) {
+    rlpOutput.startList();
+    rlpOutput.writeBigIntegerScalar(withdrawal.getIndex().toBigInteger());
+    rlpOutput.writeBigIntegerScalar(withdrawal.getValidatorIndex().toBigInteger());
+    rlpOutput.writeBytes(withdrawal.getAddress());
+    rlpOutput.writeUInt64Scalar(withdrawal.getAmount());
+    rlpOutput.endList();
+  }
+
+  public static Bytes encodeOpaqueBytes(final Withdrawal withdrawal) {
+    return RLP.encode(rlpOutput -> encode(withdrawal, rlpOutput));
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/feemarket/BaseFee.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/feemarket/BaseFee.java
new file mode 100644
index 00000000000..010d94a174c
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/feemarket/BaseFee.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core.feemarket;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+
+public class BaseFee {
+  private final Wei value;
+  private final Wei delta;
+  private final Wei minNextValue;
+  private final Wei maxNextValue;
+
+  public BaseFee(final BaseFeeMarket feeMarket, final Wei value) {
+    this.value = value;
+    this.delta = value.divide(feeMarket.getBasefeeMaxChangeDenominator());
+    this.minNextValue = value.subtract(delta);
+    this.maxNextValue = value.add(delta);
+  }
+
+  public Wei getValue() {
+    return value;
+  }
+
+  public Wei getDelta() {
+    return delta;
+  }
+
+  public Wei getMinNextValue() {
+    return minNextValue;
+  }
+
+  public Wei getMaxNextValue() {
+    return maxNextValue;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/feemarket/CoinbaseFeePriceCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/feemarket/CoinbaseFeePriceCalculator.java
new file mode 100644
index 00000000000..17beb4ad0ec
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/feemarket/CoinbaseFeePriceCalculator.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core.feemarket;
+
+import org.hyperledger.besu.datatypes.Wei;
+
+import java.util.Optional;
+
+@FunctionalInterface
+public interface CoinbaseFeePriceCalculator {
+  Wei price(long coinbaseFee, Wei transactionGasPrice, Optional<Wei> baseFee);
+
+  static CoinbaseFeePriceCalculator frontier() {
+    return (coinbaseFee, transactionGasPrice, baseFee) -> transactionGasPrice.multiply(coinbaseFee);
+  }
+
+  static CoinbaseFeePriceCalculator eip1559() {
+    return (coinbaseFee, transactionGasPrice, baseFee) -> {
+      return transactionGasPrice.subtract(baseFee.orElseThrow()).multiply(coinbaseFee);
+    };
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/feemarket/FeeMarketException.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/feemarket/FeeMarketException.java
new file mode 100644
index 00000000000..34e8d9967a1
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/feemarket/FeeMarketException.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core.feemarket;
+
+public class FeeMarketException extends Exception {
+
+  public static FeeMarketException MissingBaseFeeFromBlockHeader() {
+    return new FeeMarketException("Invalid block header: basefee should be specified");
+  }
+
+  public static FeeMarketException BaseFeePresentBeforeForkBlock() {
+    return new FeeMarketException(
+        "Invalid block header: basefee should not be present before fee market fork block");
+  }
+
+  public static FeeMarketException MissingBaseFeeMarket() {
+    return new FeeMarketException(
+        "Incorrectly configured ProtocolSchedule: requires BaseFeeMarket");
+  }
+
+  private FeeMarketException(final String reason) {
+    super(reason);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/feemarket/TransactionPriceCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/feemarket/TransactionPriceCalculator.java
new file mode 100644
index 00000000000..b68da184006
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/feemarket/TransactionPriceCalculator.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core.feemarket;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Transaction;
+
+import java.util.Optional;
+
+@FunctionalInterface
+public interface TransactionPriceCalculator {
+  Wei price(Transaction transaction, Optional<Wei> baseFee);
+
+  static TransactionPriceCalculator frontier() {
+    return (transaction, baseFee) -> transaction.getGasPrice().orElse(Wei.ZERO);
+  }
+
+  static TransactionPriceCalculator eip1559() {
+    return (transaction, maybeBaseFee) -> {
+      final Wei baseFee = maybeBaseFee.orElseThrow();
+      if (!transaction.getType().supports1559FeeMarket()) {
+        return transaction.getGasPrice().orElse(Wei.ZERO);
+      }
+      final Wei maxPriorityFeePerGas = transaction.getMaxPriorityFeePerGas().orElseThrow();
+      final Wei maxFeePerGas = transaction.getMaxFeePerGas().orElseThrow();
+      Wei price = maxPriorityFeePerGas.add(baseFee);
+      if (price.compareTo(maxFeePerGas) > 0) {
+        price = maxFeePerGas;
+      }
+      return price;
+    };
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/BaseFee.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/BaseFee.java
deleted file mode 100644
index b349a6bb74d..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/BaseFee.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core.fees;
-
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-
-import java.util.Optional;
-import java.util.function.Supplier;
-
-public class BaseFee {
-  private final long value;
-  private final long delta;
-  private final long minNextValue;
-  private final long maxNextValue;
-
-  public BaseFee(final FeeMarket feeMarket, final long value) {
-    this.value = value;
-    this.delta = Math.floorDiv(value, feeMarket.getBasefeeMaxChangeDenominator());
-    this.minNextValue = value - delta;
-    this.maxNextValue = value + delta;
-  }
-
-  public static Wei minTransactionPriceInNextBlock(
-      final Transaction transaction,
-      final TransactionPriceCalculator calculator,
-      final Supplier<Optional<Long>> baseFeeSupplier) {
-    final Optional<Long> baseFee = baseFeeSupplier.get();
-    Optional<Long> minBaseFeeInNextBlock = Optional.empty();
-    if (baseFee.isPresent()) {
-      minBaseFeeInNextBlock =
-          Optional.of(new BaseFee(FeeMarket.eip1559(), baseFee.get()).getMinNextValue());
-    }
-    return calculator.price(transaction, minBaseFeeInNextBlock);
-  }
-
-  public long getValue() {
-    return value;
-  }
-
-  public long getDelta() {
-    return delta;
-  }
-
-  public long getMinNextValue() {
-    return minNextValue;
-  }
-
-  public long getMaxNextValue() {
-    return maxNextValue;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/CoinbaseFeePriceCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/CoinbaseFeePriceCalculator.java
deleted file mode 100644
index 21bb3114b2c..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/CoinbaseFeePriceCalculator.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core.fees;
-
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Wei;
-
-import java.util.Optional;
-
-@FunctionalInterface
-public interface CoinbaseFeePriceCalculator {
-  Wei price(Gas coinbaseFee, Wei transactionGasPrice, Optional<Long> baseFee);
-
-  static CoinbaseFeePriceCalculator frontier() {
-    return (coinbaseFee, transactionGasPrice, baseFee) -> coinbaseFee.priceFor(transactionGasPrice);
-  }
-
-  static CoinbaseFeePriceCalculator eip1559() {
-    return (coinbaseFee, transactionGasPrice, baseFee) -> {
-      ExperimentalEIPs.eip1559MustBeEnabled();
-      return coinbaseFee.priceFor(transactionGasPrice.subtract(Wei.of(baseFee.orElseThrow())));
-    };
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/EIP1559.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/EIP1559.java
deleted file mode 100644
index 5252c7c532d..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/EIP1559.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core.fees;
-
-import static java.lang.Math.floorDiv;
-import static java.lang.Math.max;
-
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-public class EIP1559 {
-  private static final Logger LOG = LogManager.getLogger();
-
-  private final long initialForkBlknum;
-
-  private final FeeMarket feeMarket = FeeMarket.eip1559();
-
-  public EIP1559(final long forkBlockNumber) {
-    initialForkBlknum = forkBlockNumber;
-  }
-
-  public long computeBaseFee(
-      final long blockNumber,
-      final long parentBaseFee,
-      final long parentBlockGasUsed,
-      final long targetGasUsed) {
-    guardActivation();
-    long gasDelta, feeDelta, baseFee;
-    if (parentBlockGasUsed == targetGasUsed) {
-      return parentBaseFee;
-    } else if (parentBlockGasUsed > targetGasUsed) {
-      gasDelta = parentBlockGasUsed - targetGasUsed;
-      feeDelta =
-          max(
-              floorDiv(
-                  floorDiv(parentBaseFee * gasDelta, targetGasUsed),
-                  feeMarket.getBasefeeMaxChangeDenominator()),
-              1);
-      baseFee = parentBaseFee + feeDelta;
-    } else {
-      gasDelta = targetGasUsed - parentBlockGasUsed;
-      feeDelta =
-          floorDiv(
-              floorDiv(parentBaseFee * gasDelta, targetGasUsed),
-              feeMarket.getBasefeeMaxChangeDenominator());
-      baseFee = parentBaseFee - feeDelta;
-    }
-    LOG.trace(
-        "block #{} parentBaseFee: {} parentGasUsed: {} parentGasTarget: {} baseFee: {}",
-        blockNumber,
-        parentBaseFee,
-        parentBlockGasUsed,
-        targetGasUsed,
-        baseFee);
-    return baseFee;
-  }
-
-  public boolean isValidBaseFee(final long parentBaseFee, final long baseFee) {
-    guardActivation();
-    return Math.abs(baseFee - parentBaseFee)
-        <= Math.max(1, parentBaseFee / feeMarket.getBasefeeMaxChangeDenominator());
-  }
-
-  public boolean isEIP1559(final long blockNumber) {
-    guardActivation();
-    return blockNumber >= initialForkBlknum;
-  }
-
-  public boolean isForkBlock(final long blockNumber) {
-    guardActivation();
-    return initialForkBlknum == blockNumber;
-  }
-
-  public long getForkBlock() {
-    guardActivation();
-    return initialForkBlknum;
-  }
-
-  private void guardActivation() {
-    if (!ExperimentalEIPs.eip1559Enabled) {
-      throw new RuntimeException("EIP-1559 is not enabled");
-    }
-  }
-
-  public long targetGasUsed(final BlockHeader header) {
-    guardActivation();
-    return header.getGasLimit();
-  }
-
-  public FeeMarket getFeeMarket() {
-    return feeMarket;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/EIP1559MissingBaseFeeFromBlockHeader.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/EIP1559MissingBaseFeeFromBlockHeader.java
deleted file mode 100644
index 68c0c101805..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/EIP1559MissingBaseFeeFromBlockHeader.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core.fees;
-
-public class EIP1559MissingBaseFeeFromBlockHeader extends Exception {
-  public EIP1559MissingBaseFeeFromBlockHeader() {
-    super("Invalid block header: basefee should be specified");
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/FeeMarket.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/FeeMarket.java
deleted file mode 100644
index b3d88aaee5d..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/FeeMarket.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core.fees;
-
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
-
-public interface FeeMarket {
-
-  long getBasefeeMaxChangeDenominator();
-
-  long getInitialBasefee();
-
-  long getSlackCoefficient();
-
-  static FeeMarket eip1559() {
-    return new FeeMarketConfig(
-        ExperimentalEIPs.basefeeMaxChangeDenominator,
-        ExperimentalEIPs.initialBasefee,
-        ExperimentalEIPs.slackCoefficient);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/FeeMarketConfig.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/FeeMarketConfig.java
deleted file mode 100644
index 7e8b4a4afc3..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/FeeMarketConfig.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core.fees;
-
-public class FeeMarketConfig implements FeeMarket {
-  private final long basefeeMaxChangeDenominator;
-  private final long initialBasefee;
-  private final long slackCoefficient;
-
-  public FeeMarketConfig(
-      final long basefeeMaxChangeDenominator,
-      final long initialBasefee,
-      final long slackCoefficient) {
-    this.basefeeMaxChangeDenominator = basefeeMaxChangeDenominator;
-    this.initialBasefee = initialBasefee;
-    this.slackCoefficient = slackCoefficient;
-  }
-
-  @Override
-  public long getBasefeeMaxChangeDenominator() {
-    return basefeeMaxChangeDenominator;
-  }
-
-  @Override
-  public long getInitialBasefee() {
-    return initialBasefee;
-  }
-
-  @Override
-  public long getSlackCoefficient() {
-    return slackCoefficient;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/TransactionGasBudgetCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/TransactionGasBudgetCalculator.java
deleted file mode 100644
index d269d907ce5..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/TransactionGasBudgetCalculator.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core.fees;
-
-import org.hyperledger.besu.ethereum.core.Transaction;
-
-@FunctionalInterface
-public interface TransactionGasBudgetCalculator {
-
-  boolean hasBudget(
-      final Transaction transaction,
-      final long blockNumber,
-      final long gasLimit,
-      final long gasUsed);
-
-  static TransactionGasBudgetCalculator frontier() {
-    return gasBudgetCalculator((blockNumber, gasLimit, ignored) -> gasLimit);
-  }
-
-  static TransactionGasBudgetCalculator eip1559(final EIP1559 eip1559) {
-    return gasBudgetCalculator(
-        (blockNumber, gasLimit, transaction) ->
-            eip1559.isEIP1559(blockNumber)
-                ? gasLimit * eip1559.getFeeMarket().getSlackCoefficient()
-                : gasLimit);
-  }
-
-  static TransactionGasBudgetCalculator gasBudgetCalculator(
-      final BlockGasLimitCalculator blockGasLimitCalculator) {
-    return (transaction, blockNumber, gasLimit, gasUsed) -> {
-      final long remainingGasBudget =
-          blockGasLimitCalculator.apply(blockNumber, gasLimit, transaction) - gasUsed;
-      return Long.compareUnsigned(transaction.getGasLimit(), remainingGasBudget) <= 0;
-    };
-  }
-
-  @FunctionalInterface
-  interface BlockGasLimitCalculator {
-    long apply(final long blockNumber, final long gasLimit, Transaction transaction);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/TransactionPriceCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/TransactionPriceCalculator.java
deleted file mode 100644
index bc41d422106..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/fees/TransactionPriceCalculator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core.fees;
-
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.plugin.data.TransactionType;
-
-import java.math.BigInteger;
-import java.util.Optional;
-
-@FunctionalInterface
-public interface TransactionPriceCalculator {
-  Wei price(Transaction transaction, Optional<Long> baseFee);
-
-  static TransactionPriceCalculator frontier() {
-    return (transaction, baseFee) -> transaction.getGasPrice();
-  }
-
-  static TransactionPriceCalculator eip1559() {
-    return (transaction, maybeBaseFee) -> {
-      if (transaction.getType().equals(TransactionType.FRONTIER)) {
-        return transaction.getGasPrice();
-      }
-      ExperimentalEIPs.eip1559MustBeEnabled();
-      final Wei gasPremium =
-          Wei.of((BigInteger) transaction.getGasPremium().orElseThrow().getValue());
-      final Wei feeCap = Wei.of((BigInteger) transaction.getFeeCap().orElseThrow().getValue());
-      final Wei baseFee = Wei.of(maybeBaseFee.orElseThrow());
-      Wei price = gasPremium.add(baseFee);
-      if (price.compareTo(feeCap) > 0) {
-        price = feeCap;
-      }
-      return price;
-    };
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/json/HexLongDeserializer.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/json/HexLongDeserializer.java
new file mode 100644
index 00000000000..79d81905059
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/json/HexLongDeserializer.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core.json;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+
+public class HexLongDeserializer extends StdDeserializer<Long> {
+  public HexLongDeserializer() {
+    this(null);
+  }
+
+  public HexLongDeserializer(final Class<?> vc) {
+    super(vc);
+  }
+
+  @Override
+  public Long deserialize(final JsonParser jsonparser, final DeserializationContext context)
+      throws IOException {
+    return Long.decode(jsonparser.getCodec().readValue(jsonparser, String.class));
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/deserializer/HexStringDeserializer.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/json/HexStringDeserializer.java
similarity index 95%
rename from ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/deserializer/HexStringDeserializer.java
rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/json/HexStringDeserializer.java
index 8e6a79d1668..d9578259a9c 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/deserializer/HexStringDeserializer.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/json/HexStringDeserializer.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.core.deserializer;
+package org.hyperledger.besu.ethereum.core.json;
 
 import java.io.IOException;
 
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/debug/TraceFrame.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/debug/TraceFrame.java
index fea65a06c5c..ed5a627d31d 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/debug/TraceFrame.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/debug/TraceFrame.java
@@ -14,16 +14,17 @@
  */
 package org.hyperledger.besu.ethereum.debug;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.vm.Code;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.internal.MemoryEntry;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.internal.MemoryEntry;
+import org.hyperledger.besu.evm.internal.StorageEntry;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.util.Map;
 import java.util.Optional;
+import java.util.OptionalLong;
 
 import com.google.common.base.MoreObjects;
 import org.apache.tuweni.bytes.Bytes;
@@ -34,9 +35,9 @@ public class TraceFrame {
 
   private final int pc;
   private final Optional<String> opcode;
-  private final Gas gasRemaining;
-  private final Optional<Gas> gasCost;
-  private final Gas gasRefund;
+  private final long gasRemaining;
+  private final OptionalLong gasCost;
+  private final long gasRefund;
   private final int depth;
   private Optional<ExceptionalHaltReason> exceptionalHaltReason;
   private final Address recipient;
@@ -46,6 +47,7 @@ public class TraceFrame {
   private final Optional<Bytes32[]> stack;
   private final Optional<Bytes[]> memory;
   private final Optional<Map<UInt256, UInt256>> storage;
+
   private final WorldUpdater worldUpdater;
   private final Optional<Bytes> revertReason;
   private final Optional<Map<Address, Wei>> maybeRefunds;
@@ -53,18 +55,18 @@ public class TraceFrame {
   private final int stackItemsProduced;
   private final Optional<Bytes32[]> stackPostExecution;
 
-  private Gas gasRemainingPostExecution;
+  private long gasRemainingPostExecution;
   private final boolean virtualOperation;
   private final Optional<MemoryEntry> maybeUpdatedMemory;
-  private final Optional<MemoryEntry> maybeUpdatedStorage;
-  private Optional<Gas> precompiledGasCost;
+  private final Optional<StorageEntry> maybeUpdatedStorage;
+  private OptionalLong precompiledGasCost;
 
   public TraceFrame(
       final int pc,
       final Optional<String> opcode,
-      final Gas gasRemaining,
-      final Optional<Gas> gasCost,
-      final Gas gasRefund,
+      final long gasRemaining,
+      final OptionalLong gasCost,
+      final long gasRefund,
       final int depth,
       final Optional<ExceptionalHaltReason> exceptionalHaltReason,
       final Address recipient,
@@ -82,7 +84,7 @@ public TraceFrame(
       final Optional<Bytes32[]> stackPostExecution,
       final boolean virtualOperation,
       final Optional<MemoryEntry> maybeUpdatedMemory,
-      final Optional<MemoryEntry> maybeUpdatedStorage) {
+      final Optional<StorageEntry> maybeUpdatedStorage) {
     this.pc = pc;
     this.opcode = opcode;
     this.gasRemaining = gasRemaining;
@@ -106,7 +108,7 @@ public TraceFrame(
     this.virtualOperation = virtualOperation;
     this.maybeUpdatedMemory = maybeUpdatedMemory;
     this.maybeUpdatedStorage = maybeUpdatedStorage;
-    precompiledGasCost = Optional.empty();
+    precompiledGasCost = OptionalLong.empty();
   }
 
   public int getPc() {
@@ -117,15 +119,15 @@ public String getOpcode() {
     return opcode.orElse("");
   }
 
-  public Gas getGasRemaining() {
+  public long getGasRemaining() {
     return gasRemaining;
   }
 
-  public Optional<Gas> getGasCost() {
+  public OptionalLong getGasCost() {
     return gasCost;
   }
 
-  public Gas getGasRefund() {
+  public long getGasRefund() {
     return gasRefund;
   }
 
@@ -150,7 +152,7 @@ public Wei getValue() {
   }
 
   public Bytes getInputData() {
-    return inputData;
+    return this.inputData;
   }
 
   public Bytes getOutputData() {
@@ -208,11 +210,11 @@ public Optional<Bytes32[]> getStackPostExecution() {
     return stackPostExecution;
   }
 
-  public Gas getGasRemainingPostExecution() {
+  public long getGasRemainingPostExecution() {
     return gasRemainingPostExecution;
   }
 
-  public void setGasRemainingPostExecution(final Gas gasRemainingPostExecution) {
+  public void setGasRemainingPostExecution(final long gasRemainingPostExecution) {
     this.gasRemainingPostExecution = gasRemainingPostExecution;
   }
 
@@ -224,15 +226,15 @@ public Optional<MemoryEntry> getMaybeUpdatedMemory() {
     return maybeUpdatedMemory;
   }
 
-  public Optional<MemoryEntry> getMaybeUpdatedStorage() {
+  public Optional<StorageEntry> getMaybeUpdatedStorage() {
     return maybeUpdatedStorage;
   }
 
-  public Optional<Gas> getPrecompiledGasCost() {
+  public OptionalLong getPrecompiledGasCost() {
     return precompiledGasCost;
   }
 
-  public void setPrecompiledGasCost(final Optional<Gas> precompiledGasCost) {
+  public void setPrecompiledGasCost(final OptionalLong precompiledGasCost) {
     this.precompiledGasCost = precompiledGasCost;
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/difficulty/fixed/FixedDifficultyProtocolSchedule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/difficulty/fixed/FixedDifficultyProtocolSchedule.java
index 014ea997fa4..a79f8f7e642 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/difficulty/fixed/FixedDifficultyProtocolSchedule.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/difficulty/fixed/FixedDifficultyProtocolSchedule.java
@@ -18,6 +18,8 @@
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpecAdapters;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 
 /** A ProtocolSchedule which behaves similarly to MainNet, but with a much reduced difficulty. */
 public class FixedDifficultyProtocolSchedule {
@@ -25,22 +27,29 @@ public class FixedDifficultyProtocolSchedule {
   public static ProtocolSchedule create(
       final GenesisConfigOptions config,
       final PrivacyParameters privacyParameters,
-      final boolean isRevertReasonEnabled) {
+      final boolean isRevertReasonEnabled,
+      final EvmConfiguration evmConfiguration) {
     return new ProtocolScheduleBuilder(
             config,
-            builder -> builder.difficultyCalculator(FixedDifficultyCalculators.calculator(config)),
+            ProtocolSpecAdapters.create(
+                0,
+                builder ->
+                    builder.difficultyCalculator(FixedDifficultyCalculators.calculator(config))),
             privacyParameters,
             isRevertReasonEnabled,
-            config.isQuorum())
+            evmConfiguration)
         .createProtocolSchedule();
   }
 
   public static ProtocolSchedule create(
-      final GenesisConfigOptions config, final boolean isRevertReasonEnabled) {
-    return create(config, PrivacyParameters.DEFAULT, isRevertReasonEnabled);
+      final GenesisConfigOptions config,
+      final boolean isRevertReasonEnabled,
+      final EvmConfiguration evmConfiguration) {
+    return create(config, PrivacyParameters.DEFAULT, isRevertReasonEnabled, evmConfiguration);
   }
 
-  public static ProtocolSchedule create(final GenesisConfigOptions config) {
-    return create(config, PrivacyParameters.DEFAULT, false);
+  public static ProtocolSchedule create(
+      final GenesisConfigOptions config, final EvmConfiguration evmConfiguration) {
+    return create(config, PrivacyParameters.DEFAULT, false, evmConfiguration);
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/ForkId.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/forkid/ForkId.java
similarity index 76%
rename from ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/ForkId.java
rename to ethereum/core/src/main/java/org/hyperledger/besu/ethereum/forkid/ForkId.java
index 4ae0dc6d4aa..921fdffe3f6 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/ForkId.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/forkid/ForkId.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.eth.manager;
+package org.hyperledger.besu.ethereum.forkid;
 
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
@@ -21,6 +21,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
 
@@ -39,6 +40,19 @@ public ForkId(final Bytes hash, final long next) {
     this(hash, Bytes.wrap(EndianUtils.longToBigEndian(next)).trimLeadingZeros());
   }
 
+  public static Optional<ForkId> fromRawForkId(final Object rawForkId) {
+    if (rawForkId != null) {
+      try {
+        @SuppressWarnings("unchecked")
+        final List<List<Bytes>> typedRawForkId = (List<List<Bytes>>) rawForkId;
+        return Optional.of(new ForkId(typedRawForkId.get(0).get(0), typedRawForkId.get(0).get(1)));
+      } catch (final Exception e) {
+        return Optional.empty();
+      }
+    }
+    return Optional.empty();
+  }
+
   public long getNext() {
     return next.toLong();
   }
@@ -47,6 +61,14 @@ public Bytes getHash() {
     return hash;
   }
 
+  public List<Bytes> getForkIdAsBytesList() {
+    final List<Bytes> bytesList = new ArrayList<>();
+    bytesList.add(hash);
+    bytesList.add(next);
+
+    return bytesList;
+  }
+
   void createForkIdRLP() {
     final BytesValueRLPOutput out = new BytesValueRLPOutput();
     writeTo(out);
@@ -91,6 +113,6 @@ public boolean equals(final Object obj) {
 
   @Override
   public int hashCode() {
-    return super.hashCode();
+    return 31 * this.hash.hashCode() * this.next.hashCode();
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/forkid/ForkIdManager.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/forkid/ForkIdManager.java
new file mode 100644
index 00000000000..6cb560192ef
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/forkid/ForkIdManager.java
@@ -0,0 +1,241 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.forkid;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.plugin.data.BlockHeader;
+import org.hyperledger.besu.util.EndianUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.zip.CRC32;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+public class ForkIdManager {
+
+  private final Hash genesisHash;
+  private final List<ForkId> blockNumbersForkIds;
+  private final List<ForkId> timestampsForkIds;
+  private final List<ForkId> allForkIds;
+
+  private final List<Long> blockNumberForks;
+  private final List<Long> timestampForks;
+
+  private final Supplier<BlockHeader> chainHeadSupplier;
+  private final long forkNext;
+  private final boolean onlyZerosForkBlocks;
+  private final long highestKnownFork;
+  private Bytes genesisHashCrc;
+  private final boolean legacyEth64;
+
+  public ForkIdManager(
+      final Blockchain blockchain,
+      final List<Long> blockNumberForks,
+      final List<Long> timestampForks,
+      final boolean legacyEth64) {
+    checkNotNull(blockchain);
+    checkNotNull(blockNumberForks);
+    this.chainHeadSupplier = blockchain::getChainHeadHeader;
+    this.genesisHash = blockchain.getGenesisBlock().getHash();
+    this.blockNumbersForkIds = new ArrayList<>();
+    this.timestampsForkIds = new ArrayList<>();
+    this.legacyEth64 = legacyEth64;
+    this.blockNumberForks =
+        blockNumberForks.stream()
+            .filter(fork -> fork > 0L)
+            .distinct()
+            .sorted()
+            .collect(Collectors.toUnmodifiableList());
+    this.timestampForks =
+        timestampForks.stream()
+            .filter(fork -> fork > 0L)
+            .distinct()
+            .sorted()
+            .collect(Collectors.toUnmodifiableList());
+    final List<Long> allForkNumbers =
+        Stream.concat(blockNumberForks.stream(), timestampForks.stream())
+            .collect(Collectors.toList());
+    this.onlyZerosForkBlocks = allForkNumbers.stream().allMatch(value -> 0L == value);
+    this.forkNext = createForkIds();
+    this.allForkIds =
+        Stream.concat(blockNumbersForkIds.stream(), timestampsForkIds.stream())
+            .collect(Collectors.toList());
+    this.highestKnownFork =
+        !allForkNumbers.isEmpty() ? allForkNumbers.get(allForkNumbers.size() - 1) : 0L;
+  }
+
+  public ForkId getForkIdForChainHead() {
+    if (legacyEth64) {
+      return blockNumbersForkIds.isEmpty()
+          ? null
+          : blockNumbersForkIds.get(blockNumbersForkIds.size() - 1);
+    }
+    final BlockHeader header = chainHeadSupplier.get();
+    for (final ForkId forkId : blockNumbersForkIds) {
+      if (header.getNumber() < forkId.getNext()) {
+        return forkId;
+      }
+    }
+    for (final ForkId forkId : timestampsForkIds) {
+      if (header.getTimestamp() < forkId.getNext()) {
+        return forkId;
+      }
+    }
+    return allForkIds.isEmpty()
+        ? new ForkId(genesisHashCrc, 0)
+        : allForkIds.get(allForkIds.size() - 1);
+  }
+
+  @VisibleForTesting
+  public List<ForkId> getAllForkIds() {
+    return allForkIds;
+  }
+
+  public static ForkId readFrom(final RLPInput in) {
+    in.enterList();
+    final Bytes hash = in.readBytes();
+    final Bytes next = in.readBytes();
+    in.leaveList();
+    return new ForkId(hash, next);
+  }
+
+  /**
+   * EIP-2124 behaviour
+   *
+   * @param forkId to be validated.
+   * @return boolean (peer valid (true) or invalid (false))
+   */
+  public boolean peerCheck(final ForkId forkId) {
+    if (forkId == null || onlyZerosForkBlocks) {
+      return true; // Another method must be used to validate (i.e. genesis hash)
+    }
+    // Run the fork checksum validation rule set:
+    //   1. If local and remote FORK_CSUM matches, connect.
+    //        The two nodes are in the same fork state currently. They might know
+    //        of differing future forks, but that's not relevant until the fork
+    //        triggers (might be postponed, nodes might be updated to match).
+    //   2. If the remote FORK_CSUM is a subset of the local past forks and the
+    //      remote FORK_NEXT matches with the locally following fork block number,
+    //      connect.
+    //        Remote node is currently syncing. It might eventually diverge from
+    //        us, but at this current point in time we don't have enough information.
+    //   3. If the remote FORK_CSUM is a superset of the local past forks and can
+    //      be completed with locally known future forks, connect.
+    //        Local node is currently syncing. It might eventually diverge from
+    //        the remote, but at this current point in time we don't have enough
+    //        information.
+    //   4. Reject in all other cases.
+    if (!isHashKnown(forkId.getHash())) {
+      return false;
+    }
+
+    final BlockHeader header = chainHeadSupplier.get();
+    final long forkValue =
+        blockNumberForks.contains(forkNext) ? header.getNumber() : header.getTimestamp();
+
+    return forkValue < forkNext
+        || (isForkKnown(forkId.getNext())
+            && isRemoteAwareOfPresent(forkId.getHash(), forkId.getNext()));
+  }
+
+  /**
+   * Non EIP-2124 behaviour
+   *
+   * @param peerGenesisHash Hash to be validated.
+   * @return boolean
+   */
+  public boolean peerCheck(final Bytes32 peerGenesisHash) {
+    return !peerGenesisHash.equals(genesisHash);
+  }
+
+  private boolean isHashKnown(final Bytes forkHash) {
+    return allForkIds.stream().map(ForkId::getHash).anyMatch(hash -> hash.equals(forkHash));
+  }
+
+  private boolean isForkKnown(final Long nextFork) {
+    return highestKnownFork < nextFork
+        || allForkIds.stream().map(ForkId::getNext).anyMatch(fork -> fork.equals(nextFork));
+  }
+
+  private boolean isRemoteAwareOfPresent(final Bytes forkHash, final Long nextFork) {
+    for (final ForkId j : getAllForkIds()) {
+      if (forkHash.equals(j.getHash())) {
+        if (nextFork.equals(j.getNext())) {
+          return true;
+        } else if (j.getNext() == 0L) {
+          return highestKnownFork <= nextFork; // Remote aware of an additional future fork
+        } else {
+          return false;
+        }
+      }
+    }
+    return false;
+  }
+
+  private long createForkIds() {
+    final CRC32 crc = new CRC32();
+    crc.update(genesisHash.toArray());
+    genesisHashCrc = getCurrentCrcHash(crc);
+    final List<Bytes> forkHashes = new ArrayList<>(List.of(genesisHashCrc));
+    blockNumberForks.forEach(
+        fork -> {
+          updateCrc(crc, fork);
+          forkHashes.add(getCurrentCrcHash(crc));
+        });
+
+    timestampForks.forEach(
+        fork -> {
+          updateCrc(crc, fork);
+          forkHashes.add(getCurrentCrcHash(crc));
+        });
+
+    // This loop is for all the fork hashes that have an associated "next fork"
+    for (int i = 0; i < blockNumberForks.size(); i++) {
+      blockNumbersForkIds.add(new ForkId(forkHashes.get(i), blockNumberForks.get(i)));
+    }
+    for (int i = 0; i < timestampForks.size(); i++) {
+      timestampsForkIds.add(
+          new ForkId(forkHashes.get(blockNumberForks.size() + i), timestampForks.get(i)));
+    }
+    long forkNext = 0;
+    if (!timestampForks.isEmpty()) {
+      forkNext = timestampForks.get(timestampForks.size() - 1);
+      timestampsForkIds.add(new ForkId(forkHashes.get(forkHashes.size() - 1), 0));
+    } else if (!blockNumberForks.isEmpty()) {
+      forkNext = blockNumbersForkIds.get(blockNumbersForkIds.size() - 1).getNext();
+      blockNumbersForkIds.add(new ForkId(forkHashes.get(forkHashes.size() - 1), 0));
+    }
+    return forkNext;
+  }
+
+  private static void updateCrc(final CRC32 crc, final Long block) {
+    final byte[] byteRepresentationFork = EndianUtils.longToBigEndian(block);
+    crc.update(byteRepresentationFork, 0, byteRepresentationFork.length);
+  }
+
+  private static Bytes getCurrentCrcHash(final CRC32 crc) {
+    return Bytes.ofUnsignedInt(crc.getValue());
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractBlockProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractBlockProcessor.java
index cb92dd3aa2d..e61e3b1a90d 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractBlockProcessor.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractBlockProcessor.java
@@ -14,30 +14,40 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.DataGas;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.BlockProcessingOutputs;
+import org.hyperledger.besu.ethereum.BlockProcessingResult;
+import org.hyperledger.besu.ethereum.bonsai.worldview.BonsaiWorldState;
+import org.hyperledger.besu.ethereum.bonsai.worldview.BonsaiWorldStateUpdateAccumulator;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Deposit;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldState;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.core.fees.TransactionGasBudgetCalculator;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateMetadataUpdater;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.ethereum.trie.MerkleTrieException;
 import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
-import org.hyperledger.besu.ethereum.vm.OperationTracer;
+import org.hyperledger.besu.ethereum.vm.CachingBlockHashLookup;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.evm.worldstate.WorldState;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 import org.hyperledger.besu.plugin.data.TransactionType;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
-import com.google.common.collect.ImmutableList;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class AbstractBlockProcessor implements BlockProcessor {
+
   @FunctionalInterface
   public interface TransactionReceiptFactory {
 
@@ -48,55 +58,20 @@ TransactionReceipt create(
         long gasUsed);
   }
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractBlockProcessor.class);
 
   static final int MAX_GENERATION = 6;
 
-  public static class Result implements BlockProcessor.Result {
-
-    private static final AbstractBlockProcessor.Result FAILED =
-        new AbstractBlockProcessor.Result(false, null);
-
-    private final boolean successful;
+  protected final MainnetTransactionProcessor transactionProcessor;
 
-    private final List<TransactionReceipt> receipts;
-
-    public static AbstractBlockProcessor.Result successful(
-        final List<TransactionReceipt> receipts) {
-      return new AbstractBlockProcessor.Result(true, ImmutableList.copyOf(receipts));
-    }
-
-    public static AbstractBlockProcessor.Result failed() {
-      return FAILED;
-    }
-
-    Result(final boolean successful, final List<TransactionReceipt> receipts) {
-      this.successful = successful;
-      this.receipts = receipts;
-    }
-
-    @Override
-    public List<TransactionReceipt> getReceipts() {
-      return receipts;
-    }
-
-    @Override
-    public boolean isSuccessful() {
-      return successful;
-    }
-  }
-
-  private final MainnetTransactionProcessor transactionProcessor;
-
-  private final AbstractBlockProcessor.TransactionReceiptFactory transactionReceiptFactory;
+  protected final AbstractBlockProcessor.TransactionReceiptFactory transactionReceiptFactory;
 
   final Wei blockReward;
 
-  private final boolean skipZeroBlockRewards;
-
-  private final MiningBeneficiaryCalculator miningBeneficiaryCalculator;
+  protected final boolean skipZeroBlockRewards;
+  private final ProtocolSchedule protocolSchedule;
 
-  private final TransactionGasBudgetCalculator gasBudgetCalculator;
+  protected final MiningBeneficiaryCalculator miningBeneficiaryCalculator;
 
   protected AbstractBlockProcessor(
       final MainnetTransactionProcessor transactionProcessor,
@@ -104,44 +79,47 @@ protected AbstractBlockProcessor(
       final Wei blockReward,
       final MiningBeneficiaryCalculator miningBeneficiaryCalculator,
       final boolean skipZeroBlockRewards,
-      final TransactionGasBudgetCalculator gasBudgetCalculator) {
+      final ProtocolSchedule protocolSchedule) {
     this.transactionProcessor = transactionProcessor;
     this.transactionReceiptFactory = transactionReceiptFactory;
     this.blockReward = blockReward;
     this.miningBeneficiaryCalculator = miningBeneficiaryCalculator;
     this.skipZeroBlockRewards = skipZeroBlockRewards;
-    this.gasBudgetCalculator = gasBudgetCalculator;
+    this.protocolSchedule = protocolSchedule;
   }
 
   @Override
-  public AbstractBlockProcessor.Result processBlock(
+  public BlockProcessingResult processBlock(
       final Blockchain blockchain,
       final MutableWorldState worldState,
       final BlockHeader blockHeader,
       final List<Transaction> transactions,
       final List<BlockHeader> ommers,
+      final Optional<List<Withdrawal>> maybeWithdrawals,
+      final Optional<List<Deposit>> maybeDeposits,
       final PrivateMetadataUpdater privateMetadataUpdater) {
-
     final List<TransactionReceipt> receipts = new ArrayList<>();
     long currentGasUsed = 0;
+
+    final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(blockHeader);
+
     for (final Transaction transaction : transactions) {
-      final long remainingGasBudget = blockHeader.getGasLimit() - currentGasUsed;
-      if (!gasBudgetCalculator.hasBudget(
-          transaction, blockHeader.getNumber(), blockHeader.getGasLimit(), currentGasUsed)) {
-        LOG.info(
-            "Block processing error: transaction gas limit {} exceeds available block budget"
-                + " remaining {}. Block {} Transaction {}",
-            transaction.getGasLimit(),
-            remainingGasBudget,
-            blockHeader.getHash().toHexString(),
-            transaction.getHash().toHexString());
-        return AbstractBlockProcessor.Result.failed();
+      if (!hasAvailableBlockBudget(blockHeader, transaction, currentGasUsed)) {
+        return new BlockProcessingResult(Optional.empty(), "provided gas insufficient");
       }
 
       final WorldUpdater worldStateUpdater = worldState.updater();
-      final BlockHashLookup blockHashLookup = new BlockHashLookup(blockHeader, blockchain);
+      final BlockHashLookup blockHashLookup = new CachingBlockHashLookup(blockHeader, blockchain);
       final Address miningBeneficiary =
           miningBeneficiaryCalculator.calculateBeneficiary(blockHeader);
+      final Wei dataGasPrice =
+          protocolSpec
+              .getFeeMarket()
+              .dataPrice(
+                  blockchain
+                      .getBlockHeader(blockHeader.getParentHash())
+                      .flatMap(BlockHeader::getExcessDataGas)
+                      .orElse(DataGas.ZERO));
 
       final TransactionProcessingResult result =
           transactionProcessor.processTransaction(
@@ -154,33 +132,82 @@ public AbstractBlockProcessor.Result processBlock(
               blockHashLookup,
               true,
               TransactionValidationParams.processingBlock(),
-              privateMetadataUpdater);
+              privateMetadataUpdater,
+              dataGasPrice);
       if (result.isInvalid()) {
-        LOG.info(
-            "Block processing error: transaction invalid '{}'. Block {} Transaction {}",
-            result.getValidationResult().getInvalidReason(),
-            blockHeader.getHash().toHexString(),
-            transaction.getHash().toHexString());
-        return AbstractBlockProcessor.Result.failed();
+        String errorMessage =
+            MessageFormat.format(
+                "Block processing error: transaction invalid {0}. Block {1} Transaction {2}",
+                result.getValidationResult().getErrorMessage(),
+                blockHeader.getHash().toHexString(),
+                transaction.getHash().toHexString());
+        LOG.info(errorMessage);
+        if (worldState instanceof BonsaiWorldState) {
+          ((BonsaiWorldStateUpdateAccumulator) worldStateUpdater).reset();
+        }
+        return new BlockProcessingResult(Optional.empty(), errorMessage);
       }
-
       worldStateUpdater.commit();
 
       currentGasUsed += transaction.getGasLimit() - result.getGasRemaining();
-
       final TransactionReceipt transactionReceipt =
           transactionReceiptFactory.create(
               transaction.getType(), result, worldState, currentGasUsed);
       receipts.add(transactionReceipt);
     }
 
+    final Optional<WithdrawalsProcessor> maybeWithdrawalsProcessor =
+        protocolSpec.getWithdrawalsProcessor();
+    if (maybeWithdrawalsProcessor.isPresent() && maybeWithdrawals.isPresent()) {
+      try {
+        maybeWithdrawalsProcessor
+            .get()
+            .processWithdrawals(maybeWithdrawals.get(), worldState.updater());
+      } catch (final Exception e) {
+        LOG.error("failed processing withdrawals", e);
+        return new BlockProcessingResult(Optional.empty(), e);
+      }
+    }
+
     if (!rewardCoinbase(worldState, blockHeader, ommers, skipZeroBlockRewards)) {
       // no need to log, rewardCoinbase logs the error.
-      return AbstractBlockProcessor.Result.failed();
+      if (worldState instanceof BonsaiWorldState) {
+        ((BonsaiWorldStateUpdateAccumulator) worldState.updater()).reset();
+      }
+      return new BlockProcessingResult(Optional.empty(), "ommer too old");
+    }
+
+    try {
+      worldState.persist(blockHeader);
+    } catch (MerkleTrieException e) {
+      LOG.trace("Merkle trie exception during Transaction processing ", e);
+      if (worldState instanceof BonsaiWorldState) {
+        ((BonsaiWorldStateUpdateAccumulator) worldState.updater()).reset();
+      }
+      throw e;
+    } catch (Exception e) {
+      LOG.error("failed persisting block", e);
+      return new BlockProcessingResult(Optional.empty(), e);
+    }
+
+    return new BlockProcessingResult(Optional.of(new BlockProcessingOutputs(worldState, receipts)));
+  }
+
+  protected boolean hasAvailableBlockBudget(
+      final BlockHeader blockHeader, final Transaction transaction, final long currentGasUsed) {
+    final long remainingGasBudget = blockHeader.getGasLimit() - currentGasUsed;
+    if (Long.compareUnsigned(transaction.getGasLimit(), remainingGasBudget) > 0) {
+      LOG.info(
+          "Block processing error: transaction gas limit {} exceeds available block budget"
+              + " remaining {}. Block {} Transaction {}",
+          transaction.getGasLimit(),
+          remainingGasBudget,
+          blockHeader.getHash().toHexString(),
+          transaction.getHash().toHexString());
+      return false;
     }
 
-    worldState.persist(blockHeader.getHash());
-    return AbstractBlockProcessor.Result.successful(receipts);
+    return true;
   }
 
   protected MiningBeneficiaryCalculator getMiningBeneficiaryCalculator() {
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractGasLimitSpecification.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractGasLimitSpecification.java
index 665ceeac653..70e80527b78 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractGasLimitSpecification.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractGasLimitSpecification.java
@@ -19,6 +19,10 @@
 /** Specification for the block gasLimit. */
 public abstract class AbstractGasLimitSpecification {
 
+  public static final long DEFAULT_MAX_CONSTANT_ADMUSTMENT_INCREMENT = 1024L;
+  public static final long DEFAULT_MIN_GAS_LIMIT = 5000L;
+  public static final long DEFAULT_MAX_GAS_LIMIT = Long.MAX_VALUE;
+
   private static final int GAS_LIMIT_BOUND_DIVISOR = 1024;
   protected final long minGasLimit;
   protected final long maxGasLimit;
@@ -33,7 +37,11 @@ protected AbstractGasLimitSpecification(final long minGasLimit, final long maxGa
     this.maxGasLimit = maxGasLimit;
   }
 
-  protected static long deltaBound(final long currentGasLimit) {
+  public static long deltaBound(final long currentGasLimit) {
     return Long.divideUnsigned(currentGasLimit, GAS_LIMIT_BOUND_DIVISOR);
   }
+
+  public static boolean isValidTargetGasLimit(final long targetGasLimit) {
+    return DEFAULT_MIN_GAS_LIMIT <= targetGasLimit && DEFAULT_MAX_GAS_LIMIT >= targetGasLimit;
+  }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractPrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractPrecompiledContract.java
deleted file mode 100644
index 6913fc41fc9..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractPrecompiledContract.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import org.hyperledger.besu.enclave.EnclaveConfigurationException;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-
-/** Skeleton class for @{link PrecompileContract} implementations. */
-public abstract class AbstractPrecompiledContract implements PrecompiledContract {
-
-  private static final Logger LOG = LogManager.getLogger();
-
-  private final GasCalculator gasCalculator;
-
-  private final String name;
-
-  protected AbstractPrecompiledContract(final String name, final GasCalculator gasCalculator) {
-    this.name = name;
-    this.gasCalculator = gasCalculator;
-  }
-
-  protected GasCalculator gasCalculator() {
-    return gasCalculator;
-  }
-
-  @Override
-  public String getName() {
-    return name;
-  }
-
-  @Override
-  public abstract Gas gasRequirement(Bytes input);
-
-  @Override
-  public abstract Bytes compute(Bytes input, MessageFrame messageFrame);
-
-  protected boolean privateFromMatchesSenderKey(
-      final Bytes transactionPrivateFrom, final String payloadSenderKey) {
-    if (payloadSenderKey == null) {
-      LOG.warn(
-          "Missing sender key from Orion response. Upgrade Orion to 1.6 to enforce privateFrom check.");
-      throw new EnclaveConfigurationException(
-          "Incompatible Orion version. Orion version must be 1.6.0 or greater.");
-    }
-
-    if (transactionPrivateFrom == null || transactionPrivateFrom.isEmpty()) {
-      LOG.warn("Private transaction is missing privateFrom");
-      return false;
-    }
-
-    if (!payloadSenderKey.equals(transactionPrivateFrom.toBase64String())) {
-      LOG.warn("Private transaction privateFrom doesn't match payload sender key");
-      return false;
-    }
-
-    return true;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BaseFeeBlockBodyValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BaseFeeBlockBodyValidator.java
new file mode 100644
index 00000000000..62629dde665
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BaseFeeBlockBodyValidator.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.ethereum.core.feemarket.TransactionPriceCalculator;
+
+import java.util.List;
+import java.util.Optional;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class BaseFeeBlockBodyValidator extends MainnetBlockBodyValidator {
+  private static final Logger LOG = LoggerFactory.getLogger(BaseFeeBlockBodyValidator.class);
+
+  public BaseFeeBlockBodyValidator(final ProtocolSchedule protocolSchedule) {
+    super(protocolSchedule);
+  }
+
+  @Override
+  public boolean validateBodyLight(
+      final ProtocolContext context,
+      final Block block,
+      final List<TransactionReceipt> receipts,
+      final HeaderValidationMode ommerValidationMode) {
+
+    return super.validateBodyLight(context, block, receipts, ommerValidationMode)
+        && validateTransactionGasPrice(block);
+  }
+
+  @VisibleForTesting
+  boolean validateTransactionGasPrice(final Block block) {
+
+    final BlockBody body = block.getBody();
+    final List<Transaction> transactions = body.getTransactions();
+    final TransactionPriceCalculator transactionPriceCalculator =
+        protocolSchedule
+            .getByBlockHeader(block.getHeader())
+            .getFeeMarket()
+            .getTransactionPriceCalculator();
+
+    for (final Transaction transaction : transactions) {
+      final Optional<Wei> baseFee = block.getHeader().getBaseFee();
+      final Wei price = transactionPriceCalculator.price(transaction, baseFee);
+      if (price.compareTo(baseFee.orElseThrow()) < 0) {
+        LOG.warn(
+            "Invalid block: transaction gas price {} must be greater than base fee {}",
+            price.toString(),
+            baseFee.orElseThrow());
+        return false;
+      }
+    }
+    return true;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BerlinGasCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BerlinGasCalculator.java
deleted file mode 100644
index e717d9bfe20..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BerlinGasCalculator.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import static org.hyperledger.besu.ethereum.core.Address.BLS12_MAP_FP2_TO_G2;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.BigIntegerModularExponentiationPrecompiledContract;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.math.BigInteger;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class BerlinGasCalculator extends IstanbulGasCalculator {
-
-  // new constants for EIP-2929
-  private static final Gas COLD_SLOAD_COST = Gas.of(2100);
-  private static final Gas COLD_ACCOUNT_ACCESS_COST = Gas.of(2600);
-  private static final Gas WARM_STORAGE_READ_COST = Gas.of(100);
-
-  // redefinitions for EIP-2929
-  private static final Gas SLOAD_GAS = WARM_STORAGE_READ_COST;
-  private static final Gas SSTORE_RESET_GAS = Gas.of(5000L).minus(COLD_SLOAD_COST);
-
-  // unchanged from Istanbul
-  private static final Gas SSTORE_SET_GAS = Gas.of(20_000);
-  private static final Gas SSTORE_CLEARS_SCHEDULE = Gas.of(15_000);
-
-  private static final Gas SSTORE_SET_GAS_LESS_SLOAD_GAS = SSTORE_SET_GAS.minus(SLOAD_GAS);
-  private static final Gas SSTORE_RESET_GAS_LESS_SLOAD_GAS = SSTORE_RESET_GAS.minus(SLOAD_GAS);
-  private static final Gas NEGATIVE_SSTORE_CLEARS_SCHEDULE = Gas.ZERO.minus(SSTORE_CLEARS_SCHEDULE);
-
-  // unchanged from Frontier
-  private static final Gas COPY_WORD_GAS_COST = Gas.of(3L);
-
-  private final int maxPrecompile;
-
-  protected BerlinGasCalculator(final int maxPrecompile) {
-    this.maxPrecompile = maxPrecompile;
-  }
-
-  public BerlinGasCalculator() {
-    this(BLS12_MAP_FP2_TO_G2.toArrayUnsafe()[19]);
-  }
-
-  @Override
-  public boolean isPrecompile(final Address address) {
-    final byte[] addressBytes = address.toArrayUnsafe();
-    for (int i = 0; i < 19; i++) {
-      if (addressBytes[i] != 0) {
-        return false;
-      }
-    }
-    final int lastByte = Byte.toUnsignedInt(addressBytes[19]);
-    return lastByte <= maxPrecompile && lastByte != 0;
-  }
-
-  // new costs
-  @Override
-  public Gas getColdSloadCost() {
-    return COLD_SLOAD_COST;
-  }
-
-  @Override
-  public Gas getColdAccountAccessCost() {
-    return COLD_ACCOUNT_ACCESS_COST;
-  }
-
-  @Override
-  public Gas getWarmStorageReadCost() {
-    return WARM_STORAGE_READ_COST;
-  }
-
-  // Zeroed out old costs
-  @Override
-  public Gas getBalanceOperationGasCost() {
-    return Gas.ZERO;
-  }
-
-  @Override
-  protected Gas callOperationBaseGasCost() {
-    return Gas.ZERO;
-  }
-
-  @Override
-  public Gas extCodeHashOperationGasCost() {
-    return Gas.ZERO;
-  }
-
-  @Override
-  public Gas getExtCodeSizeOperationGasCost() {
-    return Gas.ZERO;
-  }
-
-  @Override
-  public Gas getSloadOperationGasCost() {
-    return Gas.ZERO;
-  }
-
-  // Redefined costs from EIP-2929
-  @Override
-  public Gas callOperationGasCost(
-      final MessageFrame frame,
-      final Gas stipend,
-      final UInt256 inputDataOffset,
-      final UInt256 inputDataLength,
-      final UInt256 outputDataOffset,
-      final UInt256 outputDataLength,
-      final Wei transferValue,
-      final Account recipient,
-      final Address to) {
-    final Gas baseCost =
-        super.callOperationGasCost(
-            frame,
-            stipend,
-            inputDataOffset,
-            inputDataLength,
-            outputDataOffset,
-            outputDataLength,
-            transferValue,
-            recipient,
-            to);
-    final boolean accountIsWarm = frame.warmUpAddress(to) || isPrecompile(to);
-    return baseCost.plus(accountIsWarm ? getWarmStorageReadCost() : getColdAccountAccessCost());
-  }
-
-  // defined in Frontier, but re-implemented with no base cost.
-  @Override
-  public Gas extCodeCopyOperationGasCost(
-      final MessageFrame frame, final UInt256 offset, final UInt256 length) {
-    return copyWordsToMemoryGasCost(frame, Gas.ZERO, COPY_WORD_GAS_COST, offset, length);
-  }
-
-  // defined in Istanbul, but re-implemented with new constants
-  @Override
-  // As per https://eips.ethereum.org/EIPS/eip-2200
-  public Gas calculateStorageCost(
-      final Account account, final UInt256 key, final UInt256 newValue) {
-
-    final UInt256 currentValue = account.getStorageValue(key);
-    if (currentValue.equals(newValue)) {
-      return SLOAD_GAS;
-    } else {
-      final UInt256 originalValue = account.getOriginalStorageValue(key);
-      if (originalValue.equals(currentValue)) {
-        return originalValue.isZero() ? SSTORE_SET_GAS : SSTORE_RESET_GAS;
-      } else {
-        return SLOAD_GAS;
-      }
-    }
-  }
-
-  // defined in Istanbul, but re-implemented with new constants
-  @Override
-  // As per https://eips.ethereum.org/EIPS/eip-2200
-  public Gas calculateStorageRefundAmount(
-      final Account account, final UInt256 key, final UInt256 newValue) {
-
-    final UInt256 currentValue = account.getStorageValue(key);
-    if (currentValue.equals(newValue)) {
-      return Gas.ZERO;
-    } else {
-      final UInt256 originalValue = account.getOriginalStorageValue(key);
-      if (originalValue.equals(currentValue)) {
-        if (originalValue.isZero()) {
-          return Gas.ZERO;
-        } else if (newValue.isZero()) {
-          return SSTORE_CLEARS_SCHEDULE;
-        } else {
-          return Gas.ZERO;
-        }
-      } else {
-        Gas refund = Gas.ZERO;
-        if (!originalValue.isZero()) {
-          if (currentValue.isZero()) {
-            refund = NEGATIVE_SSTORE_CLEARS_SCHEDULE;
-          } else if (newValue.isZero()) {
-            refund = SSTORE_CLEARS_SCHEDULE;
-          }
-        }
-
-        if (originalValue.equals(newValue)) {
-          refund =
-              refund.plus(
-                  originalValue.isZero()
-                      ? SSTORE_SET_GAS_LESS_SLOAD_GAS
-                      : SSTORE_RESET_GAS_LESS_SLOAD_GAS);
-        }
-        return refund;
-      }
-    }
-  }
-
-  @Override
-  public Gas modExpGasCost(final Bytes input) {
-    final BigInteger baseLength =
-        BigIntegerModularExponentiationPrecompiledContract.baseLength(input);
-    final BigInteger exponentLength =
-        BigIntegerModularExponentiationPrecompiledContract.exponentLength(input);
-    final BigInteger modulusLength =
-        BigIntegerModularExponentiationPrecompiledContract.modulusLength(input);
-    final BigInteger exponentOffset =
-        BigIntegerModularExponentiationPrecompiledContract.BASE_OFFSET.add(baseLength);
-    final int firstExponentBytesCap =
-        exponentLength.min(ByzantiumGasCalculator.MAX_FIRST_EXPONENT_BYTES).intValue();
-    final BigInteger firstExpBytes =
-        BigIntegerModularExponentiationPrecompiledContract.extractParameter(
-            input, exponentOffset, firstExponentBytesCap);
-    final BigInteger adjustedExponentLength = adjustedExponentLength(exponentLength, firstExpBytes);
-    final BigInteger multiplicationComplexity =
-        modulusLength
-            .max(baseLength)
-            .add(BigInteger.valueOf(7))
-            .divide(BigInteger.valueOf(8))
-            .pow(2);
-
-    final BigInteger gasRequirement =
-        multiplicationComplexity
-            .multiply(adjustedExponentLength.max(BigInteger.ONE))
-            .divide(BigInteger.valueOf(3));
-
-    // Gas price is so large it will not fit in a Gas type, so an
-    // very very very unlikely high gas price is used instead.
-    if (gasRequirement.bitLength() > ByzantiumGasCalculator.MAX_GAS_BITS) {
-      return Gas.of(Long.MAX_VALUE);
-    } else {
-      return Gas.of(gasRequirement.max(BigInteger.valueOf(200)));
-    }
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockBodyValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockBodyValidator.java
index a270c701df2..e063c584fd2 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockBodyValidator.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockBodyValidator.java
@@ -14,9 +14,9 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 
 import java.util.List;
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockHeaderValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockHeaderValidator.java
index 77bc33232d9..53937ba4261 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockHeaderValidator.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockHeaderValidator.java
@@ -23,12 +23,12 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class BlockHeaderValidator {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(BlockHeaderValidator.class);
 
   private final List<Rule> rules;
 
@@ -87,7 +87,12 @@ private boolean applyRules(
       final Predicate<Rule> filter) {
     return rules.stream()
         .filter(filter)
-        .allMatch(rule -> rule.validate(header, parent, protocolContext));
+        .allMatch(
+            rule -> {
+              boolean worked = rule.validate(header, parent, protocolContext);
+              if (!worked) LOG.debug("{} rule failed", rule.innerRuleClass().getCanonicalName());
+              return worked;
+            });
   }
 
   private Optional<BlockHeader> getParent(final BlockHeader header, final ProtocolContext context) {
@@ -101,15 +106,15 @@ private Optional<BlockHeader> getParent(final BlockHeader header, final Protocol
 
   private static class Rule {
     private final boolean detachedSupported;
-    private final AttachedBlockHeaderValidationRule rule;
+    private final AttachedBlockHeaderValidationRule wrappedRule;
     private final boolean includeInLightValidation;
 
     private Rule(
         final boolean detachedSupported,
-        final AttachedBlockHeaderValidationRule rule,
+        final AttachedBlockHeaderValidationRule toWrap,
         final boolean includeInLightValidation) {
       this.detachedSupported = detachedSupported;
-      this.rule = rule;
+      this.wrappedRule = toWrap;
       this.includeInLightValidation = includeInLightValidation;
     }
 
@@ -119,12 +124,16 @@ boolean isDetachedSupported() {
 
     public boolean validate(
         final BlockHeader header, final BlockHeader parent, final ProtocolContext protocolContext) {
-      return this.rule.validate(header, parent, protocolContext);
+      return this.wrappedRule.validate(header, parent, protocolContext);
     }
 
     boolean includeInLightValidation() {
       return includeInLightValidation;
     }
+
+    public Class<? extends AttachedBlockHeaderValidationRule> innerRuleClass() {
+      return wrappedRule.getClass();
+    }
   }
 
   public static class Builder {
@@ -134,8 +143,8 @@ public static class Builder {
     public Builder addRule(
         final Function<DifficultyCalculator, AttachedBlockHeaderValidationRule> ruleBuilder) {
       this.rulesBuilder.add(
-          difficultyCalculator -> {
-            final AttachedBlockHeaderValidationRule rule = ruleBuilder.apply(difficultyCalculator);
+          applyMe -> {
+            final AttachedBlockHeaderValidationRule rule = ruleBuilder.apply(applyMe);
             return new Rule(false, rule, rule.includeInLightValidation());
           });
       return this;
@@ -148,12 +157,11 @@ public Builder addRule(final AttachedBlockHeaderValidationRule rule) {
 
     public Builder addRule(final DetachedBlockHeaderValidationRule rule) {
       this.rulesBuilder.add(
-          ignored -> {
-            return new Rule(
-                true,
-                (header, parent, protocolContext) -> rule.validate(header, parent),
-                rule.includeInLightValidation());
-          });
+          ignored ->
+              new Rule(
+                  true,
+                  (header, parent, protocolContext) -> rule.validate(header, parent),
+                  rule.includeInLightValidation()));
       return this;
     }
 
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockImportResult.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockImportResult.java
new file mode 100644
index 00000000000..920b343059a
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockImportResult.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet;
+
+/** The result of a block import. */
+public class BlockImportResult {
+  private final BlockImportStatus status;
+
+  public enum BlockImportStatus {
+    IMPORTED,
+    NOT_IMPORTED,
+    ALREADY_IMPORTED
+  }
+
+  public BlockImportResult(final boolean status) {
+    this.status = status ? BlockImportStatus.IMPORTED : BlockImportStatus.NOT_IMPORTED;
+  }
+
+  public BlockImportResult(final BlockImportStatus status) {
+    this.status = status;
+  }
+
+  /**
+   * The result of the block import call
+   *
+   * @return {@code true} if the block was added somewhere in the blockchain; otherwise {@code
+   *     false}
+   */
+  public boolean isImported() {
+    return status == BlockImportStatus.IMPORTED || status == BlockImportStatus.ALREADY_IMPORTED;
+  }
+
+  public BlockImportStatus getStatus() {
+    return status;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockProcessor.java
index c9a349cb11f..060bce5bd77 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockProcessor.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockProcessor.java
@@ -14,16 +14,20 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.BlockProcessingResult;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Deposit;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateMetadataUpdater;
 
 import java.util.List;
+import java.util.Optional;
 
 /** Processes a block. */
 public interface BlockProcessor {
@@ -36,16 +40,30 @@ interface Result {
      *
      * <p>This is only valid when {@code BlockProcessor#isSuccessful} returns {@code true}.
      *
-     * @return the receipts generated for the transactions the a block
+     * @return the receipts generated for the transactions in a block
      */
     List<TransactionReceipt> getReceipts();
 
+    /**
+     * The private receipts generated for the private transactions in a block when in
+     * goQuorumCompatibilityMode
+     *
+     * <p>This is only valid when {@code BlockProcessor#isSuccessful} returns {@code true}.
+     *
+     * @return the receipts generated for the private transactions in a block
+     */
+    List<TransactionReceipt> getPrivateReceipts();
+
     /**
      * Returns whether the block was successfully processed.
      *
      * @return {@code true} if the block was processed successfully; otherwise {@code false}
      */
     boolean isSuccessful();
+
+    default boolean isFailed() {
+      return !isSuccessful();
+    }
   }
 
   /**
@@ -56,7 +74,7 @@ interface Result {
    * @param block the block to process
    * @return the block processing result
    */
-  default Result processBlock(
+  default BlockProcessingResult processBlock(
       final Blockchain blockchain, final MutableWorldState worldState, final Block block) {
     return processBlock(
         blockchain,
@@ -64,6 +82,8 @@ default Result processBlock(
         block.getHeader(),
         block.getBody().getTransactions(),
         block.getBody().getOmmers(),
+        block.getBody().getWithdrawals(),
+        block.getBody().getDeposits(),
         null);
   }
 
@@ -77,13 +97,21 @@ default Result processBlock(
    * @param ommers the block ommers
    * @return the block processing result
    */
-  default Result processBlock(
+  default BlockProcessingResult processBlock(
       final Blockchain blockchain,
       final MutableWorldState worldState,
       final BlockHeader blockHeader,
       final List<Transaction> transactions,
       final List<BlockHeader> ommers) {
-    return processBlock(blockchain, worldState, blockHeader, transactions, ommers, null);
+    return processBlock(
+        blockchain,
+        worldState,
+        blockHeader,
+        transactions,
+        ommers,
+        Optional.empty(),
+        Optional.empty(),
+        null);
   }
 
   /**
@@ -94,17 +122,41 @@ default Result processBlock(
    * @param blockHeader the block header for the block
    * @param transactions the transactions in the block
    * @param ommers the block ommers
+   * @param withdrawals the withdrawals for the block
+   * @param deposits the deposits for the block
    * @param privateMetadataUpdater the updater used to update the private metadata for the block
    * @return the block processing result
    */
-  Result processBlock(
+  BlockProcessingResult processBlock(
       Blockchain blockchain,
       MutableWorldState worldState,
       BlockHeader blockHeader,
       List<Transaction> transactions,
       List<BlockHeader> ommers,
+      Optional<List<Withdrawal>> withdrawals,
+      Optional<List<Deposit>> deposits,
       PrivateMetadataUpdater privateMetadataUpdater);
 
+  /**
+   * Processes the block when running Besu in GoQuorum-compatible mode
+   *
+   * @param blockchain the blockchain to append the block to
+   * @param worldState the world state to apply public transactions to
+   * @param privateWorldState the private world state to apply private transaction to
+   * @param block the block to process
+   * @return the block processing result
+   */
+  default BlockProcessingResult processBlock(
+      final Blockchain blockchain,
+      final MutableWorldState worldState,
+      final MutableWorldState privateWorldState,
+      final Block block) {
+    /*
+     This method should never be executed. All GoQuorum processing must happen in the GoQuorumBlockProcessor.
+    */
+    throw new IllegalStateException("Tried to process GoQuorum block on AbstractBlockProcessor");
+  }
+
   /**
    * Get ommer reward in ${@link Wei}
    *
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BodyValidation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BodyValidation.java
index 211c69994b9..9fac97eaedf 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BodyValidation.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BodyValidation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -16,16 +16,22 @@
 
 import static org.hyperledger.besu.crypto.Hash.keccak256;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.LogsBloomFilter;
+import org.hyperledger.besu.ethereum.core.Deposit;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+import org.hyperledger.besu.ethereum.core.encoding.DepositEncoder;
+import org.hyperledger.besu.ethereum.core.encoding.TransactionEncoder;
+import org.hyperledger.besu.ethereum.core.encoding.WithdrawalEncoder;
 import org.hyperledger.besu.ethereum.rlp.RLP;
-import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie;
-import org.hyperledger.besu.ethereum.trie.SimpleMerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.patricia.SimpleMerklePatriciaTrie;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
 
 import java.util.List;
+import java.util.stream.IntStream;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.units.bigints.UInt256;
@@ -38,10 +44,10 @@ private BodyValidation() {
   }
 
   private static Bytes indexKey(final int i) {
-    return RLP.encodeOne(UInt256.valueOf(i).toBytes().trimLeadingZeros());
+    return RLP.encodeOne(UInt256.valueOf(i).trimLeadingZeros());
   }
 
-  private static MerklePatriciaTrie<Bytes, Bytes> trie() {
+  private static MerkleTrie<Bytes, Bytes> trie() {
     return new SimpleMerklePatriciaTrie<>(b -> b);
   }
 
@@ -52,11 +58,42 @@ private static MerklePatriciaTrie<Bytes, Bytes> trie() {
    * @return the transaction root
    */
   public static Hash transactionsRoot(final List<Transaction> transactions) {
-    final MerklePatriciaTrie<Bytes, Bytes> trie = trie();
+    final MerkleTrie<Bytes, Bytes> trie = trie();
 
-    for (int i = 0; i < transactions.size(); ++i) {
-      trie.put(indexKey(i), RLP.encode(transactions.get(i)::writeTo));
-    }
+    IntStream.range(0, transactions.size())
+        .forEach(
+            i -> trie.put(indexKey(i), TransactionEncoder.encodeOpaqueBytes(transactions.get(i))));
+
+    return Hash.wrap(trie.getRootHash());
+  }
+
+  /**
+   * Generates the withdrawals root for a list of withdrawals
+   *
+   * @param withdrawals the transactions
+   * @return the transaction root
+   */
+  public static Hash withdrawalsRoot(final List<Withdrawal> withdrawals) {
+    final MerkleTrie<Bytes, Bytes> trie = trie();
+
+    IntStream.range(0, withdrawals.size())
+        .forEach(
+            i -> trie.put(indexKey(i), WithdrawalEncoder.encodeOpaqueBytes(withdrawals.get(i))));
+
+    return Hash.wrap(trie.getRootHash());
+  }
+
+  /**
+   * Generates the deposits root for a list of deposits
+   *
+   * @param deposits the transactions
+   * @return the transaction root
+   */
+  public static Hash depositsRoot(final List<Deposit> deposits) {
+    final MerkleTrie<Bytes, Bytes> trie = trie();
+
+    IntStream.range(0, deposits.size())
+        .forEach(i -> trie.put(indexKey(i), DepositEncoder.encodeOpaqueBytes(deposits.get(i))));
 
     return Hash.wrap(trie.getRootHash());
   }
@@ -68,11 +105,15 @@ public static Hash transactionsRoot(final List<Transaction> transactions) {
    * @return the receipt root
    */
   public static Hash receiptsRoot(final List<TransactionReceipt> receipts) {
-    final MerklePatriciaTrie<Bytes, Bytes> trie = trie();
+    final MerkleTrie<Bytes, Bytes> trie = trie();
 
-    for (int i = 0; i < receipts.size(); ++i) {
-      trie.put(indexKey(i), RLP.encode(receipts.get(i)::writeTo));
-    }
+    IntStream.range(0, receipts.size())
+        .forEach(
+            i ->
+                trie.put(
+                    indexKey(i),
+                    RLP.encode(
+                        rlpOutput -> receipts.get(i).writeToForReceiptTrie(rlpOutput, false))));
 
     return Hash.wrap(trie.getRootHash());
   }
@@ -94,7 +135,7 @@ public static Hash ommersHash(final List<BlockHeader> ommers) {
    * @return the logs bloom filter
    */
   public static LogsBloomFilter logsBloom(final List<TransactionReceipt> receipts) {
-    LogsBloomFilter.Builder filterBuilder = LogsBloomFilter.builder();
+    final LogsBloomFilter.Builder filterBuilder = LogsBloomFilter.builder();
 
     receipts.forEach(receipt -> filterBuilder.insertFilter(receipt.getBloomFilter()));
 
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ByzantiumGasCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ByzantiumGasCalculator.java
deleted file mode 100644
index 334e48a9e3a..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ByzantiumGasCalculator.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.BigIntegerModularExponentiationPrecompiledContract;
-
-import java.math.BigInteger;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public class ByzantiumGasCalculator extends SpuriousDragonGasCalculator {
-  private static final BigInteger GQUADDIVISOR = BigInteger.valueOf(20);
-  private static final BigInteger WORD_SIZE = BigInteger.valueOf(32);
-  private static final BigInteger BITS_IN_BYTE = BigInteger.valueOf(8);
-
-  public static final BigInteger MAX_FIRST_EXPONENT_BYTES = BigInteger.valueOf(32);
-  public static final int MAX_GAS_BITS = 255;
-
-  @Override
-  public Gas modExpGasCost(final Bytes input) {
-    final BigInteger baseLength =
-        BigIntegerModularExponentiationPrecompiledContract.baseLength(input);
-    final BigInteger exponentLength =
-        BigIntegerModularExponentiationPrecompiledContract.exponentLength(input);
-    final BigInteger modulusLength =
-        BigIntegerModularExponentiationPrecompiledContract.modulusLength(input);
-    final BigInteger exponentOffset =
-        BigIntegerModularExponentiationPrecompiledContract.BASE_OFFSET.add(baseLength);
-    final int firstExponentBytesCap = exponentLength.min(MAX_FIRST_EXPONENT_BYTES).intValue();
-    final BigInteger firstExpBytes =
-        BigIntegerModularExponentiationPrecompiledContract.extractParameter(
-            input, exponentOffset, firstExponentBytesCap);
-    final BigInteger adjustedExponentLength = adjustedExponentLength(exponentLength, firstExpBytes);
-    final BigInteger multiplicationComplexity =
-        BigIntegerModularExponentiationPrecompiledContract.multiplicationComplexity(
-            baseLength.max(modulusLength));
-    final BigInteger gasRequirement =
-        multiplicationComplexity
-            .multiply(adjustedExponentLength.max(BigInteger.ONE))
-            .divide(GQUADDIVISOR);
-
-    // Gas price is so large it will not fit in a Gas type, so an
-    // very very very unlikely high gas price is used instead.
-    if (gasRequirement.bitLength() > MAX_GAS_BITS) {
-      return Gas.of(Long.MAX_VALUE);
-    } else {
-      return Gas.of(gasRequirement);
-    }
-  }
-
-  public static BigInteger adjustedExponentLength(
-      final BigInteger exponentLength, final BigInteger firstExpBytes) {
-    final BigInteger bitLength = bitLength(firstExpBytes);
-    if (exponentLength.compareTo(WORD_SIZE) <= 0) {
-      return bitLength;
-    } else {
-      return BITS_IN_BYTE.multiply(exponentLength.subtract(WORD_SIZE)).add(bitLength);
-    }
-  }
-
-  private static BigInteger bitLength(final BigInteger n) {
-    return n.compareTo(BigInteger.ZERO) == 0
-        ? BigInteger.ZERO
-        : BigInteger.valueOf(n.bitLength() - 1L);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/CancunTargetingGasLimitCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/CancunTargetingGasLimitCalculator.java
new file mode 100644
index 00000000000..c0c3366f4df
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/CancunTargetingGasLimitCalculator.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet;
+
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+
+public class CancunTargetingGasLimitCalculator extends LondonTargetingGasLimitCalculator {
+  private static final long MAX_DATA_GAS_PER_BLOCK = 1 << 19;
+
+  public CancunTargetingGasLimitCalculator(
+      final long londonForkBlock, final BaseFeeMarket feeMarket) {
+    super(londonForkBlock, feeMarket);
+  }
+
+  @Override
+  public long currentDataGasLimit() {
+    return MAX_DATA_GAS_PER_BLOCK;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ClassicBlockProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ClassicBlockProcessor.java
index 4b5555eb284..5079c0763be 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ClassicBlockProcessor.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ClassicBlockProcessor.java
@@ -14,23 +14,22 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.core.fees.TransactionGasBudgetCalculator;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.math.BigInteger;
 import java.util.List;
 import java.util.OptionalLong;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ClassicBlockProcessor extends AbstractBlockProcessor {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(ClassicBlockProcessor.class);
 
   private static final long DEFAULT_ERA_LENGTH = 5_000_000L;
 
@@ -42,14 +41,15 @@ public ClassicBlockProcessor(
       final Wei blockReward,
       final MiningBeneficiaryCalculator miningBeneficiaryCalculator,
       final boolean skipZeroBlockRewards,
-      final OptionalLong eraLen) {
+      final OptionalLong eraLen,
+      final ProtocolSchedule protocolSchedule) {
     super(
         transactionProcessor,
         transactionReceiptFactory,
         blockReward,
         miningBeneficiaryCalculator,
         skipZeroBlockRewards,
-        TransactionGasBudgetCalculator.frontier());
+        protocolSchedule);
     eraLength = eraLen.orElse(DEFAULT_ERA_LENGTH);
   }
 
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ClassicDifficultyCalculators.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ClassicDifficultyCalculators.java
index a74cb73fbaf..9a8f30d01f4 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ClassicDifficultyCalculators.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ClassicDifficultyCalculators.java
@@ -14,8 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.plugin.data.Quantity;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Quantity;
 
 import java.math.BigInteger;
 
@@ -103,6 +103,6 @@ private static BigInteger ensureMinimumDifficulty(final BigInteger difficulty) {
   }
 
   private static BigInteger difficulty(final Quantity value) {
-    return (BigInteger) value.getValue();
+    return value.getAsBigInteger();
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ClassicProtocolSpecs.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ClassicProtocolSpecs.java
index a859ecc61fd..bb99bd72390 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ClassicProtocolSpecs.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ClassicProtocolSpecs.java
@@ -14,33 +14,54 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
-import org.hyperledger.besu.ethereum.core.Account;
+import static org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSpecs.powHasher;
+
+import org.hyperledger.besu.config.PowAlgorithm;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldState;
-import org.hyperledger.besu.ethereum.core.fees.CoinbaseFeePriceCalculator;
-import org.hyperledger.besu.ethereum.core.fees.TransactionPriceCalculator;
-import org.hyperledger.besu.ethereum.mainnet.contractvalidation.MaxCodeSizeRule;
+import org.hyperledger.besu.ethereum.core.feemarket.CoinbaseFeePriceCalculator;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
+import org.hyperledger.besu.evm.MainnetEVMs;
+import org.hyperledger.besu.evm.contractvalidation.MaxCodeSizeRule;
+import org.hyperledger.besu.evm.contractvalidation.PrefixCodeRule;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.BerlinGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.DieHardGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.IstanbulGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.LondonGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.PetersburgGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.SpuriousDragonGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.TangerineWhistleGasCalculator;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.evm.processor.ContractCreationProcessor;
+import org.hyperledger.besu.evm.processor.MessageCallProcessor;
+import org.hyperledger.besu.evm.worldstate.WorldState;
 import org.hyperledger.besu.plugin.data.TransactionType;
 
 import java.math.BigInteger;
 import java.util.Collections;
+import java.util.List;
 import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.OptionalLong;
+import java.util.Set;
 
 public class ClassicProtocolSpecs {
   private static final Wei MAX_BLOCK_REWARD = Wei.fromEth(5);
 
+  private ClassicProtocolSpecs() {
+    // utility class
+  }
+
   public static ProtocolSpecBuilder classicRecoveryInitDefinition(
       final OptionalInt contractSizeLimit,
       final OptionalInt configStackSizeLimit,
-      final boolean quorumCompatibilityMode) {
+      final EvmConfiguration evmConfiguration) {
     return MainnetProtocolSpecs.homesteadDefinition(
-            contractSizeLimit, configStackSizeLimit, quorumCompatibilityMode)
-        .blockHeaderValidatorBuilder(MainnetBlockHeaderValidator.createClassicValidator())
+            contractSizeLimit, configStackSizeLimit, evmConfiguration)
+        .blockHeaderValidatorBuilder(
+            feeMarket -> MainnetBlockHeaderValidator.createClassicValidator())
         .name("ClassicRecoveryInit");
   }
 
@@ -48,24 +69,23 @@ public static ProtocolSpecBuilder tangerineWhistleDefinition(
       final Optional<BigInteger> chainId,
       final OptionalInt contractSizeLimit,
       final OptionalInt configStackSizeLimit,
-      final boolean quorumCompatibilityMode) {
+      final EvmConfiguration evmConfiguration) {
     return MainnetProtocolSpecs.homesteadDefinition(
-            contractSizeLimit, configStackSizeLimit, quorumCompatibilityMode)
+            contractSizeLimit, configStackSizeLimit, evmConfiguration)
         .gasCalculator(TangerineWhistleGasCalculator::new)
         .transactionValidatorBuilder(
-            gasCalculator ->
-                new MainnetTransactionValidator(
-                    gasCalculator, true, chainId, quorumCompatibilityMode))
+            (gasCalculator, gasLimitCalculator) ->
+                new MainnetTransactionValidator(gasCalculator, gasLimitCalculator, true, chainId))
         .name("ClassicTangerineWhistle");
   }
 
   public static ProtocolSpecBuilder dieHardDefinition(
       final Optional<BigInteger> chainId,
-      final OptionalInt configContractSizeLimit,
+      final OptionalInt ignoredConfigContractSizeLimit,
       final OptionalInt configStackSizeLimit,
-      final boolean quorumCompatibilityMode) {
+      final EvmConfiguration evmConfiguration) {
     return tangerineWhistleDefinition(
-            chainId, OptionalInt.empty(), configStackSizeLimit, quorumCompatibilityMode)
+            chainId, OptionalInt.empty(), configStackSizeLimit, evmConfiguration)
         .gasCalculator(DieHardGasCalculator::new)
         .difficultyCalculator(ClassicDifficultyCalculators.DIFFICULTY_BOMB_PAUSED)
         .name("DieHard");
@@ -76,9 +96,8 @@ public static ProtocolSpecBuilder gothamDefinition(
       final OptionalInt contractSizeLimit,
       final OptionalInt configStackSizeLimit,
       final OptionalLong ecip1017EraRounds,
-      final boolean quorumCompatibilityMode) {
-    return dieHardDefinition(
-            chainId, contractSizeLimit, configStackSizeLimit, quorumCompatibilityMode)
+      final EvmConfiguration evmConfiguration) {
+    return dieHardDefinition(chainId, contractSizeLimit, configStackSizeLimit, evmConfiguration)
         .blockReward(MAX_BLOCK_REWARD)
         .difficultyCalculator(ClassicDifficultyCalculators.DIFFICULTY_BOMB_DELAYED)
         .blockProcessorBuilder(
@@ -87,14 +106,15 @@ public static ProtocolSpecBuilder gothamDefinition(
                 blockReward,
                 miningBeneficiaryCalculator,
                 skipZeroBlockRewards,
-                gasBudgetCalculator) ->
+                protocolSchedule) ->
                 new ClassicBlockProcessor(
                     transactionProcessor,
                     transactionReceiptFactory,
                     blockReward,
                     miningBeneficiaryCalculator,
                     skipZeroBlockRewards,
-                    ecip1017EraRounds))
+                    ecip1017EraRounds,
+                    protocolSchedule))
         .name("Gotham");
   }
 
@@ -103,18 +123,13 @@ public static ProtocolSpecBuilder defuseDifficultyBombDefinition(
       final OptionalInt contractSizeLimit,
       final OptionalInt configStackSizeLimit,
       final OptionalLong ecip1017EraRounds,
-      final boolean quorumCompatibilityMode) {
+      final EvmConfiguration evmConfiguration) {
     return gothamDefinition(
-            chainId,
-            contractSizeLimit,
-            configStackSizeLimit,
-            ecip1017EraRounds,
-            quorumCompatibilityMode)
+            chainId, contractSizeLimit, configStackSizeLimit, ecip1017EraRounds, evmConfiguration)
         .difficultyCalculator(ClassicDifficultyCalculators.DIFFICULTY_BOMB_REMOVED)
         .transactionValidatorBuilder(
-            gasCalculator ->
-                new MainnetTransactionValidator(
-                    gasCalculator, true, chainId, quorumCompatibilityMode))
+            (gasCalculator, gasLimitCalculator) ->
+                new MainnetTransactionValidator(gasCalculator, gasLimitCalculator, true, chainId))
         .name("DefuseDifficultyBomb");
   }
 
@@ -124,7 +139,7 @@ public static ProtocolSpecBuilder atlantisDefinition(
       final OptionalInt configStackSizeLimit,
       final boolean enableRevertReason,
       final OptionalLong ecip1017EraRounds,
-      final boolean quorumCompatibilityMode) {
+      final EvmConfiguration evmConfiguration) {
     final int contractSizeLimit =
         configContractSizeLimit.orElse(MainnetProtocolSpecs.SPURIOUS_DRAGON_CONTRACT_SIZE_LIMIT);
     final int stackSizeLimit = configStackSizeLimit.orElse(MessageFrame.DEFAULT_MAX_STACK_SIZE);
@@ -133,13 +148,12 @@ public static ProtocolSpecBuilder atlantisDefinition(
             configContractSizeLimit,
             configStackSizeLimit,
             ecip1017EraRounds,
-            quorumCompatibilityMode)
-        .evmBuilder(MainnetEvmRegistries::byzantium)
+            evmConfiguration)
+        .evmBuilder(MainnetEVMs::byzantium)
+        .evmConfiguration(evmConfiguration)
         .gasCalculator(SpuriousDragonGasCalculator::new)
         .skipZeroBlockRewards(true)
-        .messageCallProcessorBuilder(
-            (evm, precompileContractRegistry) ->
-                new MainnetMessageCallProcessor(evm, precompileContractRegistry))
+        .messageCallProcessorBuilder(MessageCallProcessor::new)
         .precompileContractRegistryBuilder(MainnetPrecompiledContractRegistries::byzantium)
         .difficultyCalculator(ClassicDifficultyCalculators.EIP100)
         .transactionReceiptFactory(
@@ -148,7 +162,7 @@ public static ProtocolSpecBuilder atlantisDefinition(
                 : ClassicProtocolSpecs::byzantiumTransactionReceiptFactory)
         .contractCreationProcessorBuilder(
             (gasCalculator, evm) ->
-                new MainnetContractCreationProcessor(
+                new ContractCreationProcessor(
                     gasCalculator,
                     evm,
                     true,
@@ -165,9 +179,9 @@ public static ProtocolSpecBuilder atlantisDefinition(
                     contractCreationProcessor,
                     messageCallProcessor,
                     true,
+                    false,
                     stackSizeLimit,
-                    Account.DEFAULT_VERSION,
-                    TransactionPriceCalculator.frontier(),
+                    FeeMarket.legacy(),
                     CoinbaseFeePriceCalculator.frontier()))
         .name("Atlantis");
   }
@@ -178,17 +192,17 @@ public static ProtocolSpecBuilder aghartaDefinition(
       final OptionalInt configStackSizeLimit,
       final boolean enableRevertReason,
       final OptionalLong ecip1017EraRounds,
-      final boolean quorumCompatibilityMode) {
+      final EvmConfiguration evmConfiguration) {
     return atlantisDefinition(
             chainId,
             configContractSizeLimit,
             configStackSizeLimit,
             enableRevertReason,
             ecip1017EraRounds,
-            quorumCompatibilityMode)
-        .evmBuilder(MainnetEvmRegistries::constantinople)
-        .gasCalculator(ConstantinopleFixGasCalculator::new)
-        .evmBuilder(gasCalculator -> MainnetEvmRegistries.constantinople(gasCalculator))
+            evmConfiguration)
+        .evmBuilder(MainnetEVMs::constantinople)
+        .gasCalculator(PetersburgGasCalculator::new)
+        .evmBuilder(MainnetEVMs::constantinople)
         .precompileContractRegistryBuilder(MainnetPrecompiledContractRegistries::istanbul)
         .name("Agharta");
   }
@@ -199,18 +213,19 @@ public static ProtocolSpecBuilder phoenixDefinition(
       final OptionalInt configStackSizeLimit,
       final boolean enableRevertReason,
       final OptionalLong ecip1017EraRounds,
-      final boolean quorumCompatibilityMode) {
+      final EvmConfiguration evmConfiguration) {
     return aghartaDefinition(
             chainId,
             configContractSizeLimit,
             configStackSizeLimit,
             enableRevertReason,
             ecip1017EraRounds,
-            quorumCompatibilityMode)
+            evmConfiguration)
         .gasCalculator(IstanbulGasCalculator::new)
         .evmBuilder(
-            gasCalculator ->
-                MainnetEvmRegistries.istanbul(gasCalculator, chainId.orElse(BigInteger.ZERO)))
+            (gasCalculator, evmConfig) ->
+                MainnetEVMs.istanbul(
+                    gasCalculator, chainId.orElse(BigInteger.ZERO), evmConfiguration))
         .precompileContractRegistryBuilder(MainnetPrecompiledContractRegistries::istanbul)
         .name("Phoenix");
   }
@@ -221,20 +236,22 @@ public static ProtocolSpecBuilder thanosDefinition(
       final OptionalInt configStackSizeLimit,
       final boolean enableRevertReason,
       final OptionalLong ecip1017EraRounds,
-      final boolean quorumCompatibilityMode) {
+      final EvmConfiguration evmConfiguration) {
     return phoenixDefinition(
             chainId,
             configContractSizeLimit,
             configStackSizeLimit,
             enableRevertReason,
             ecip1017EraRounds,
-            quorumCompatibilityMode)
+            evmConfiguration)
         .blockHeaderValidatorBuilder(
-            MainnetBlockHeaderValidator.createBlockHeaderValidator(
-                new EpochCalculator.Ecip1099EpochCalculator()))
+            feeMarket ->
+                MainnetBlockHeaderValidator.createPgaBlockHeaderValidator(
+                    new EpochCalculator.Ecip1099EpochCalculator(), powHasher(PowAlgorithm.ETHASH)))
         .ommerHeaderValidatorBuilder(
-            MainnetBlockHeaderValidator.createOmmerValidator(
-                new EpochCalculator.Ecip1099EpochCalculator()))
+            feeMarket ->
+                MainnetBlockHeaderValidator.createLegacyFeeMarketOmmerValidator(
+                    new EpochCalculator.Ecip1099EpochCalculator(), powHasher(PowAlgorithm.ETHASH)))
         .name("Thanos");
   }
 
@@ -257,4 +274,62 @@ private static TransactionReceipt byzantiumTransactionReceiptFactoryWithReasonEn
     return new TransactionReceipt(
         result.isSuccessful() ? 1 : 0, gasUsed, result.getLogs(), result.getRevertReason());
   }
+
+  public static ProtocolSpecBuilder magnetoDefinition(
+      final Optional<BigInteger> chainId,
+      final OptionalInt configContractSizeLimit,
+      final OptionalInt configStackSizeLimit,
+      final boolean enableRevertReason,
+      final OptionalLong ecip1017EraRounds,
+      final EvmConfiguration evmConfiguration) {
+    return thanosDefinition(
+            chainId,
+            configContractSizeLimit,
+            configStackSizeLimit,
+            enableRevertReason,
+            ecip1017EraRounds,
+            evmConfiguration)
+        .gasCalculator(BerlinGasCalculator::new)
+        .transactionValidatorBuilder(
+            (gasCalculator, gasLimitCalculator) ->
+                new MainnetTransactionValidator(
+                    gasCalculator,
+                    gasLimitCalculator,
+                    true,
+                    chainId,
+                    Set.of(TransactionType.FRONTIER, TransactionType.ACCESS_LIST)))
+        .transactionReceiptFactory(
+            enableRevertReason
+                ? MainnetProtocolSpecs::berlinTransactionReceiptFactoryWithReasonEnabled
+                : MainnetProtocolSpecs::berlinTransactionReceiptFactory)
+        .name("Magneto");
+  }
+
+  public static ProtocolSpecBuilder mystiqueDefinition(
+      final Optional<BigInteger> chainId,
+      final OptionalInt configContractSizeLimit,
+      final OptionalInt configStackSizeLimit,
+      final boolean enableRevertReason,
+      final OptionalLong ecip1017EraRounds,
+      final EvmConfiguration evmConfiguration) {
+    final int contractSizeLimit =
+        configContractSizeLimit.orElse(MainnetProtocolSpecs.SPURIOUS_DRAGON_CONTRACT_SIZE_LIMIT);
+    return magnetoDefinition(
+            chainId,
+            configContractSizeLimit,
+            configStackSizeLimit,
+            enableRevertReason,
+            ecip1017EraRounds,
+            evmConfiguration)
+        .gasCalculator(LondonGasCalculator::new)
+        .contractCreationProcessorBuilder(
+            (gasCalculator, evm) ->
+                new ContractCreationProcessor(
+                    gasCalculator,
+                    evm,
+                    true,
+                    List.of(MaxCodeSizeRule.of(contractSizeLimit), PrefixCodeRule.of()),
+                    1))
+        .name("Mystique");
+  }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ConstantinopleFixGasCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ConstantinopleFixGasCalculator.java
deleted file mode 100644
index 59b81c21a54..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ConstantinopleFixGasCalculator.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Gas;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-/**
- * Gas Calculator for Petersberg Hard Fork. Rollback EIP-1283.
- *
- * <p>Neither {@link TangerineWhistleGasCalculator} nor {@link SpuriousDragonGasCalculator} overrode
- * these two methods so {@link FrontierGasCalculator} is the source.
- */
-public class ConstantinopleFixGasCalculator extends ConstantinopleGasCalculator {
-
-  /** Same as {#link {@link FrontierGasCalculator#STORAGE_SET_GAS_COST} */
-  private static final Gas STORAGE_SET_GAS_COST = Gas.of(20_000L);
-  /** Same as {#link {@link FrontierGasCalculator#STORAGE_RESET_GAS_COST} */
-  private static final Gas STORAGE_RESET_GAS_COST = Gas.of(5_000L);
-  /** Same as {#link {@link FrontierGasCalculator#STORAGE_RESET_REFUND_AMOUNT} */
-  private static final Gas STORAGE_RESET_REFUND_AMOUNT = Gas.of(15_000L);
-
-  /**
-   * Same as {#link {@link FrontierGasCalculator#calculateStorageCost(Account, UInt256, UInt256)}
-   */
-  @Override
-  public Gas calculateStorageCost(
-      final Account account, final UInt256 key, final UInt256 newValue) {
-    return !newValue.isZero() && account.getStorageValue(key).isZero()
-        ? STORAGE_SET_GAS_COST
-        : STORAGE_RESET_GAS_COST;
-  }
-
-  /**
-   * Same as {#link {@link FrontierGasCalculator#calculateStorageRefundAmount(Account, UInt256,
-   * UInt256)}
-   */
-  @Override
-  public Gas calculateStorageRefundAmount(
-      final Account account, final UInt256 key, final UInt256 newValue) {
-    return newValue.isZero() && !account.getStorageValue(key).isZero()
-        ? STORAGE_RESET_REFUND_AMOUNT
-        : Gas.ZERO;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ConstantinopleGasCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ConstantinopleGasCalculator.java
deleted file mode 100644
index 0d4aeccde8b..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ConstantinopleGasCalculator.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class ConstantinopleGasCalculator extends ByzantiumGasCalculator {
-
-  private static final Gas SSTORE_NO_OP_COST = Gas.of(200);
-  private static final Gas SSTORE_ADDITIONAL_WRITE_COST = Gas.of(200);
-  private static final Gas SSTORE_FIRST_DIRTY_NEW_STORAGE_COST = Gas.of(20_000);
-  private static final Gas SSTORE_FIRST_DIRTY_EXISTING_STORAGE_COST = Gas.of(5_000);
-  private static final Gas STORAGE_RESET_REFUND_AMOUNT = Gas.of(15_000);
-  private static final Gas NEGATIVE_STORAGE_RESET_REFUND_AMOUNT = Gas.of(-15_000);
-  private static final Gas SSTORE_DIRTY_RETURN_TO_UNUSED_REFUND_AMOUNT = Gas.of(19800);
-  private static final Gas SSTORE_DIRTY_RETURN_TO_ORIGINAL_VALUE_REFUND_AMOUNT = Gas.of(4800);
-
-  private static final Gas EXTCODE_HASH_COST = Gas.of(400);
-
-  @Override
-  public Gas create2OperationGasCost(final MessageFrame frame) {
-    final UInt256 initCodeLength = UInt256.fromBytes(frame.getStackItem(2));
-    final UInt256 numWords = initCodeLength.divideCeil(Bytes32.SIZE);
-    final Gas initCodeHashCost = SHA3_OPERATION_WORD_GAS_COST.times(Gas.of(numWords));
-    return createOperationGasCost(frame).plus(initCodeHashCost);
-  }
-
-  @Override
-  // As per https://eips.ethereum.org/EIPS/eip-1283
-  public Gas calculateStorageCost(
-      final Account account, final UInt256 key, final UInt256 newValue) {
-
-    final UInt256 currentValue = account.getStorageValue(key);
-    if (currentValue.equals(newValue)) {
-      return SSTORE_NO_OP_COST;
-    } else {
-      final UInt256 originalValue = account.getOriginalStorageValue(key);
-      if (originalValue.equals(currentValue)) {
-        return originalValue.isZero()
-            ? SSTORE_FIRST_DIRTY_NEW_STORAGE_COST
-            : SSTORE_FIRST_DIRTY_EXISTING_STORAGE_COST;
-      } else {
-        return SSTORE_ADDITIONAL_WRITE_COST;
-      }
-    }
-  }
-
-  @Override
-  // As per https://eips.ethereum.org/EIPS/eip-1283
-  public Gas calculateStorageRefundAmount(
-      final Account account, final UInt256 key, final UInt256 newValue) {
-
-    final UInt256 currentValue = account.getStorageValue(key);
-    if (currentValue.equals(newValue)) {
-      return Gas.ZERO;
-    } else {
-      final UInt256 originalValue = account.getOriginalStorageValue(key);
-      if (originalValue.equals(currentValue)) {
-        if (originalValue.isZero()) {
-          return Gas.ZERO;
-        } else if (newValue.isZero()) {
-          return STORAGE_RESET_REFUND_AMOUNT;
-        } else {
-          return Gas.ZERO;
-        }
-      } else {
-        Gas refund = Gas.ZERO;
-        if (!originalValue.isZero()) {
-          if (currentValue.isZero()) {
-            refund = NEGATIVE_STORAGE_RESET_REFUND_AMOUNT;
-          } else if (newValue.isZero()) {
-            refund = STORAGE_RESET_REFUND_AMOUNT;
-          }
-        }
-
-        if (originalValue.equals(newValue)) {
-          refund =
-              refund.plus(
-                  originalValue.isZero()
-                      ? SSTORE_DIRTY_RETURN_TO_UNUSED_REFUND_AMOUNT
-                      : SSTORE_DIRTY_RETURN_TO_ORIGINAL_VALUE_REFUND_AMOUNT);
-        }
-        return refund;
-      }
-    }
-  }
-
-  @Override
-  public Gas extCodeHashOperationGasCost() {
-    return EXTCODE_HASH_COST;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ContractValidationRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ContractValidationRule.java
deleted file mode 100644
index 04a79a52a0b..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ContractValidationRule.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-@FunctionalInterface
-public interface ContractValidationRule {
-
-  boolean validate(MessageFrame frame);
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/DefaultProtocolSchedule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/DefaultProtocolSchedule.java
new file mode 100644
index 00000000000..a2de85905f3
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/DefaultProtocolSchedule.java
@@ -0,0 +1,130 @@
+/*
+ *
+ *  * Copyright Hyperledger Besu Contributors.
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ *  * the License. You may obtain a copy of the License at
+ *  *
+ *  * http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ *  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ *  * specific language governing permissions and limitations under the License.
+ *  *
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.mainnet;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
+import org.hyperledger.besu.ethereum.core.TransactionFilter;
+import org.hyperledger.besu.ethereum.mainnet.ScheduledProtocolSpec.BlockNumberProtocolSpec;
+import org.hyperledger.besu.ethereum.mainnet.ScheduledProtocolSpec.TimestampProtocolSpec;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+
+import java.math.BigInteger;
+import java.util.Comparator;
+import java.util.NavigableSet;
+import java.util.Optional;
+import java.util.TreeSet;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import com.google.common.annotations.VisibleForTesting;
+
+public class DefaultProtocolSchedule implements ProtocolSchedule {
+
+  @VisibleForTesting
+  protected NavigableSet<ScheduledProtocolSpec> protocolSpecs =
+      new TreeSet<>(Comparator.comparing(ScheduledProtocolSpec::milestone).reversed());
+
+  private final Optional<BigInteger> chainId;
+
+  public DefaultProtocolSchedule(final Optional<BigInteger> chainId) {
+    this.chainId = chainId;
+  }
+
+  @VisibleForTesting
+  protected DefaultProtocolSchedule(final DefaultProtocolSchedule protocolSchedule) {
+    this.chainId = protocolSchedule.chainId;
+    this.protocolSpecs = protocolSchedule.protocolSpecs;
+  }
+
+  @Override
+  public ProtocolSpec getByBlockHeader(final ProcessableBlockHeader blockHeader) {
+    checkArgument(
+        !protocolSpecs.isEmpty(), "At least 1 milestone must be provided to the protocol schedule");
+    checkArgument(
+        protocolSpecs.last().milestone() == 0, "There must be a milestone starting from block 0");
+
+    // protocolSpecs is sorted in descending block order, so the first one we find that's lower than
+    // the requested level will be the most appropriate spec
+    for (final ScheduledProtocolSpec spec : protocolSpecs) {
+      if (spec.isOnOrAfterMilestoneBoundary(blockHeader)) {
+        return spec.spec();
+      }
+    }
+    return null;
+  }
+
+  @Override
+  public Optional<BigInteger> getChainId() {
+    return chainId;
+  }
+
+  @Override
+  public String listMilestones() {
+    return protocolSpecs.stream()
+        .sorted(Comparator.comparing(ScheduledProtocolSpec::milestone))
+        .map(scheduledSpec -> scheduledSpec.spec().getName() + ": " + scheduledSpec.milestone())
+        .collect(Collectors.joining(", ", "[", "]"));
+  }
+
+  @Override
+  public boolean isOnMilestoneBoundary(final BlockHeader blockHeader) {
+    return this.protocolSpecs.stream().anyMatch(s -> s.isOnMilestoneBoundary(blockHeader));
+  }
+
+  @Override
+  public void putBlockNumberMilestone(final long blockNumber, final ProtocolSpec protocolSpec) {
+    putMilestone(BlockNumberProtocolSpec.create(blockNumber, protocolSpec));
+  }
+
+  @Override
+  public void putTimestampMilestone(final long timestamp, final ProtocolSpec protocolSpec) {
+    putMilestone(TimestampProtocolSpec.create(timestamp, protocolSpec));
+  }
+
+  private void putMilestone(final ScheduledProtocolSpec scheduledProtocolSpec) {
+    // Ensure this replaces any existing spec at the same block number.
+    protocolSpecs.remove(scheduledProtocolSpec);
+    protocolSpecs.add(scheduledProtocolSpec);
+  }
+
+  @Override
+  public boolean anyMatch(final Predicate<ScheduledProtocolSpec> predicate) {
+    return this.protocolSpecs.stream().anyMatch(predicate);
+  }
+
+  @Override
+  public void setTransactionFilter(final TransactionFilter transactionFilter) {
+    protocolSpecs.forEach(
+        spec -> spec.spec().getTransactionValidator().setTransactionFilter(transactionFilter));
+  }
+
+  @Override
+  public void setPublicWorldStateArchiveForPrivacyBlockProcessor(
+      final WorldStateArchive publicWorldStateArchive) {
+    protocolSpecs.forEach(
+        spec -> {
+          final BlockProcessor blockProcessor = spec.spec().getBlockProcessor();
+          if (PrivacyBlockProcessor.class.isAssignableFrom(blockProcessor.getClass()))
+            ((PrivacyBlockProcessor) blockProcessor)
+                .setPublicWorldStateArchive(publicWorldStateArchive);
+        });
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/DepositsValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/DepositsValidator.java
new file mode 100644
index 00000000000..befa2231083
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/DepositsValidator.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.mainnet;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.Deposit;
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.ethereum.core.encoding.DepositDecoder;
+import org.hyperledger.besu.evm.log.Log;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public interface DepositsValidator {
+
+  boolean validateDepositParameter(Optional<List<Deposit>> deposits);
+
+  boolean validateDeposits(Block block, List<TransactionReceipt> receipts);
+
+  boolean validateDepositsRoot(Block block);
+
+  class ProhibitedDeposits implements DepositsValidator {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ProhibitedDeposits.class);
+
+    @Override
+    public boolean validateDepositParameter(final Optional<List<Deposit>> deposits) {
+      return deposits.isEmpty();
+    }
+
+    @Override
+    public boolean validateDeposits(final Block block, final List<TransactionReceipt> receipts) {
+      Optional<List<Deposit>> deposits = block.getBody().getDeposits();
+      final boolean isValid = deposits.isEmpty();
+      if (!isValid) {
+        LOG.warn("Deposits must be empty when Deposits are prohibited but were: {}", deposits);
+      }
+      return isValid;
+    }
+
+    @Override
+    public boolean validateDepositsRoot(final Block block) {
+      final Optional<Hash> depositsRoot = block.getHeader().getDepositsRoot();
+      if (depositsRoot.isPresent()) {
+        LOG.warn(
+            "DepositsRoot must be null when Deposits are prohibited but was: {}",
+            depositsRoot.get());
+        return false;
+      }
+
+      return true;
+    }
+  }
+
+  class AllowedDeposits implements DepositsValidator {
+
+    private static final Logger LOG = LoggerFactory.getLogger(AllowedDeposits.class);
+    private final Address depositContractAddress;
+
+    public AllowedDeposits(final Address depositContractAddress) {
+      this.depositContractAddress = depositContractAddress;
+    }
+
+    @Override
+    public boolean validateDepositParameter(final Optional<List<Deposit>> deposits) {
+      return deposits.isPresent();
+    }
+
+    @Override
+    public boolean validateDeposits(final Block block, final List<TransactionReceipt> receipts) {
+      if (block.getBody().getDeposits().isEmpty()) {
+        LOG.warn("Deposits must not be empty when Deposits are activated");
+        return false;
+      }
+
+      List<Deposit> actualDeposits = new ArrayList<>(block.getBody().getDeposits().get());
+      List<Deposit> expectedDeposits = new ArrayList<>();
+
+      for (TransactionReceipt receipt : receipts) {
+        for (Log log : receipt.getLogsList()) {
+          if (depositContractAddress.equals(log.getLogger())) {
+            Deposit deposit = DepositDecoder.decodeFromLog(log);
+            expectedDeposits.add(deposit);
+          }
+        }
+      }
+
+      boolean isValid = actualDeposits.equals(expectedDeposits);
+
+      if (!isValid) {
+        LOG.warn(
+            "Deposits validation failed. Deposits from block body do not match deposits from logs. Block hash: {}",
+            block.getHash());
+        LOG.debug(
+            "Deposits from logs: {}, deposits from block body: {}",
+            expectedDeposits,
+            actualDeposits);
+      }
+
+      return isValid;
+    }
+
+    @Override
+    public boolean validateDepositsRoot(final Block block) {
+      checkArgument(block.getBody().getDeposits().isPresent(), "Block body must contain deposits");
+      final Optional<Hash> depositsRoot = block.getHeader().getDepositsRoot();
+      if (depositsRoot.isEmpty()) {
+        LOG.warn("depositsRoot must not be null when Deposits are activated");
+        return false;
+      }
+
+      final List<Deposit> deposits = block.getBody().getDeposits().get();
+      final Hash expectedDepositsRoot = BodyValidation.depositsRoot(deposits);
+      if (!expectedDepositsRoot.equals(depositsRoot.get())) {
+        LOG.info(
+            "Invalid block: depositsRoot mismatch (expected={}, actual={})",
+            expectedDepositsRoot,
+            depositsRoot.get());
+        return false;
+      }
+
+      return true;
+    }
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/DirectAcyclicGraphSeed.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/DirectAcyclicGraphSeed.java
index 07d267cb84a..8f5e5fda685 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/DirectAcyclicGraphSeed.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/DirectAcyclicGraphSeed.java
@@ -14,9 +14,9 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
+import static org.hyperledger.besu.crypto.MessageDigestFactory.KECCAK256_ALG;
 import static org.hyperledger.besu.ethereum.mainnet.EthHash.EPOCH_LENGTH;
 
-import org.hyperledger.besu.crypto.Hash;
 import org.hyperledger.besu.crypto.MessageDigestFactory;
 
 import java.security.DigestException;
@@ -25,11 +25,13 @@
 
 public class DirectAcyclicGraphSeed {
 
+  private DirectAcyclicGraphSeed() {}
+
   public static final ThreadLocal<MessageDigest> KECCAK_256 =
       ThreadLocal.withInitial(
           () -> {
             try {
-              return MessageDigestFactory.create(Hash.KECCAK256_ALG);
+              return MessageDigestFactory.create(KECCAK256_ALG);
             } catch (final NoSuchAlgorithmException ex) {
               throw new IllegalStateException(ex);
             }
@@ -47,7 +49,7 @@ public static byte[] dagSeed(final long block, final EpochCalculator epochCalcul
     final byte[] seed = new byte[32];
     if (Long.compareUnsigned(startBlock, EPOCH_LENGTH) >= 0) {
       final MessageDigest keccak256 = KECCAK_256.get();
-      for (int i = 0; i < Long.divideUnsigned(startBlock, EPOCH_LENGTH); ++i) {
+      for (long i = 0; i < Long.divideUnsigned(startBlock, EPOCH_LENGTH); ++i) {
         keccak256.update(seed);
         try {
           keccak256.digest(seed, 0, seed.length);
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHash.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHash.java
index ba68875bd4f..dd718023c01 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHash.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHash.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.SealableBlockHeader;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 
@@ -23,10 +23,13 @@
 import java.nio.ByteOrder;
 import java.security.DigestException;
 import java.security.MessageDigest;
+import java.util.Arrays;
 import java.util.function.BiConsumer;
 
 import com.google.common.primitives.Ints;
 import com.google.common.primitives.Longs;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
 import org.bouncycastle.jcajce.provider.digest.Keccak;
 
 /** Implementation of EthHash. */
@@ -71,19 +74,19 @@ public final class EthHash {
    * @return A byte array holding MixHash in its first 32 bytes and the EthHash result in the in
    *     bytes 32 to 63
    */
-  public static byte[] hashimotoLight(
-      final long size, final int[] cache, final byte[] header, final long nonce) {
+  public static PoWSolution hashimotoLight(
+      final long size, final int[] cache, final Bytes header, final long nonce) {
     return hashimoto(header, size, nonce, (target, ind) -> calcDatasetItem(target, cache, ind));
   }
 
-  public static byte[] hashimoto(
-      final byte[] header,
+  public static PoWSolution hashimoto(
+      final Bytes header,
       final long size,
       final long nonce,
       final BiConsumer<byte[], Integer> datasetLookup) {
     final int n = (int) Long.divideUnsigned(size, MIX_BYTES);
     final MessageDigest keccak512 = KECCAK_512.get();
-    keccak512.update(header);
+    keccak512.update(header.toArrayUnsafe());
     keccak512.update(Longs.toByteArray(Long.reverseBytes(nonce)));
     final byte[] seed = keccak512.digest();
     final ByteBuffer mixBuffer = ByteBuffer.allocate(MIX_BYTES).order(ByteOrder.LITTLE_ENDIAN);
@@ -121,7 +124,12 @@ public static byte[] hashimoto(
     } catch (final DigestException ex) {
       throw new IllegalStateException(ex);
     }
-    return result;
+
+    return new PoWSolution(
+        nonce,
+        Hash.wrap(Bytes32.wrap(Arrays.copyOf(result, 32))),
+        Bytes32.wrap(result, 32),
+        header);
   }
 
   /**
@@ -163,7 +171,7 @@ public static void calcDatasetItem(final byte[] buffer, final int[] cache, final
    * @param header Block Header
    * @return Truncated BlockHeader hash
    */
-  public static byte[] hashHeader(final SealableBlockHeader header) {
+  public static Bytes32 hashHeader(final SealableBlockHeader header) {
     final BytesValueRLPOutput out = new BytesValueRLPOutput();
     out.startList();
     out.writeBytes(header.getParentHash());
@@ -180,11 +188,11 @@ public static byte[] hashHeader(final SealableBlockHeader header) {
     out.writeLongScalar(header.getTimestamp());
     out.writeBytes(header.getExtraData());
     if (header.getBaseFee().isPresent()) {
-      ExperimentalEIPs.eip1559MustBeEnabled();
-      out.writeLongScalar(header.getBaseFee().get());
+      out.writeUInt256Scalar(header.getBaseFee().get());
     }
     out.endList();
-    return DirectAcyclicGraphSeed.KECCAK_256.get().digest(out.encoded().toArray());
+    return Bytes32.wrap(
+        DirectAcyclicGraphSeed.KECCAK_256.get().digest(out.encoded().toArrayUnsafe()));
   }
 
   /**
@@ -273,7 +281,7 @@ private static boolean isPrime(final long num) {
     if (num > 2 && (num & 1) == 0) {
       return false;
     }
-    for (int i = 3; i * i <= num; i += 2) {
+    for (long i = 3; i * i <= num; i += 2) {
       if (num % i == 0) {
         return false;
       }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolution.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolution.java
deleted file mode 100644
index f1dd18cfdbc..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolution.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import org.hyperledger.besu.ethereum.core.Hash;
-
-import java.util.Arrays;
-import java.util.Objects;
-
-public class EthHashSolution {
-  private final long nonce;
-  private final Hash mixHash;
-  private final byte[] powHash;
-
-  public EthHashSolution(final long nonce, final Hash mixHash, final byte[] powHash) {
-    this.nonce = nonce;
-    this.mixHash = mixHash;
-    this.powHash = powHash;
-  }
-
-  public long getNonce() {
-    return nonce;
-  }
-
-  public Hash getMixHash() {
-    return mixHash;
-  }
-
-  public byte[] getPowHash() {
-    return powHash;
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    EthHashSolution that = (EthHashSolution) o;
-    return nonce == that.nonce
-        && Objects.equals(mixHash, that.mixHash)
-        && Arrays.equals(powHash, that.powHash);
-  }
-
-  @Override
-  public int hashCode() {
-    int result = Objects.hash(nonce, mixHash);
-    result = 31 * result + Arrays.hashCode(powHash);
-    return result;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolver.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolver.java
deleted file mode 100644
index 302b585396f..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolver.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import static org.apache.logging.log4j.LogManager.getLogger;
-
-import org.hyperledger.besu.ethereum.chain.EthHashObserver;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.util.Subscribers;
-
-import java.util.Arrays;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
-import com.google.common.base.Stopwatch;
-import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class EthHashSolver {
-
-  private static final Logger LOG = getLogger();
-
-  public static class EthHashSolverJob {
-
-    private final EthHashSolverInputs inputs;
-    private final CompletableFuture<EthHashSolution> nonceFuture;
-
-    EthHashSolverJob(
-        final EthHashSolverInputs inputs, final CompletableFuture<EthHashSolution> nonceFuture) {
-      this.inputs = inputs;
-      this.nonceFuture = nonceFuture;
-    }
-
-    public static EthHashSolverJob createFromInputs(final EthHashSolverInputs inputs) {
-      return new EthHashSolverJob(inputs, new CompletableFuture<>());
-    }
-
-    EthHashSolverInputs getInputs() {
-      return inputs;
-    }
-
-    public boolean isDone() {
-      return nonceFuture.isDone();
-    }
-
-    void solvedWith(final EthHashSolution solution) {
-      nonceFuture.complete(solution);
-    }
-
-    public void cancel() {
-      nonceFuture.cancel(false);
-    }
-
-    public void failed(final Throwable ex) {
-      nonceFuture.completeExceptionally(ex);
-    }
-
-    EthHashSolution getSolution() throws InterruptedException, ExecutionException {
-      return nonceFuture.get();
-    }
-  }
-
-  private final long NO_MINING_CONDUCTED = -1;
-
-  private final Iterable<Long> nonceGenerator;
-  private final EthHasher ethHasher;
-  private volatile long hashesPerSecond = NO_MINING_CONDUCTED;
-  private final Boolean stratumMiningEnabled;
-  private final Subscribers<EthHashObserver> ethHashObservers;
-  private final EpochCalculator epochCalculator;
-  private volatile Optional<EthHashSolverJob> currentJob = Optional.empty();
-
-  public EthHashSolver(
-      final Iterable<Long> nonceGenerator,
-      final EthHasher ethHasher,
-      final Boolean stratumMiningEnabled,
-      final Subscribers<EthHashObserver> ethHashObservers,
-      final EpochCalculator epochCalculator) {
-    this.nonceGenerator = nonceGenerator;
-    this.ethHasher = ethHasher;
-    this.stratumMiningEnabled = stratumMiningEnabled;
-    this.ethHashObservers = ethHashObservers;
-    ethHashObservers.forEach(observer -> observer.setSubmitWorkCallback(this::submitSolution));
-    this.epochCalculator = epochCalculator;
-  }
-
-  public EthHashSolution solveFor(final EthHashSolverJob job)
-      throws InterruptedException, ExecutionException {
-    currentJob = Optional.of(job);
-    if (stratumMiningEnabled) {
-      ethHashObservers.forEach(observer -> observer.newJob(job.inputs));
-    } else {
-      findValidNonce();
-    }
-    return currentJob.get().getSolution();
-  }
-
-  private void findValidNonce() {
-    final Stopwatch operationTimer = Stopwatch.createStarted();
-    final EthHashSolverJob job = currentJob.get();
-    long hashesExecuted = 0;
-    final byte[] hashBuffer = new byte[64];
-    for (final Long n : nonceGenerator) {
-
-      if (job.isDone()) {
-        return;
-      }
-
-      final Optional<EthHashSolution> solution = testNonce(job.getInputs(), n, hashBuffer);
-      solution.ifPresent(job::solvedWith);
-
-      hashesExecuted++;
-      final double operationDurationSeconds = operationTimer.elapsed(TimeUnit.NANOSECONDS) / 1e9;
-      hashesPerSecond = (long) (hashesExecuted / operationDurationSeconds);
-    }
-    job.failed(new IllegalStateException("No valid nonce found."));
-  }
-
-  private Optional<EthHashSolution> testNonce(
-      final EthHashSolverInputs inputs, final long nonce, final byte[] hashBuffer) {
-    ethHasher.hash(
-        hashBuffer, nonce, inputs.getBlockNumber(), epochCalculator, inputs.getPrePowHash());
-    final UInt256 x = UInt256.fromBytes(Bytes32.wrap(hashBuffer, 32));
-    if (x.compareTo(inputs.getTarget()) <= 0) {
-      final Hash mixedHash =
-          Hash.wrap(Bytes32.leftPad(Bytes.wrap(hashBuffer).slice(0, Bytes32.SIZE)));
-      return Optional.of(new EthHashSolution(nonce, mixedHash, inputs.getPrePowHash()));
-    }
-    return Optional.empty();
-  }
-
-  public void cancel() {
-    currentJob.ifPresent(EthHashSolverJob::cancel);
-  }
-
-  public Optional<EthHashSolverInputs> getWorkDefinition() {
-    return currentJob.flatMap(job -> Optional.of(job.getInputs()));
-  }
-
-  public Optional<Long> hashesPerSecond() {
-    if (hashesPerSecond == NO_MINING_CONDUCTED) {
-      return Optional.empty();
-    }
-    return Optional.of(hashesPerSecond);
-  }
-
-  public boolean submitSolution(final EthHashSolution solution) {
-    final Optional<EthHashSolverJob> jobSnapshot = currentJob;
-    if (jobSnapshot.isEmpty()) {
-      LOG.debug("No current job, rejecting miner work");
-      return false;
-    }
-
-    final EthHashSolverJob job = jobSnapshot.get();
-    final EthHashSolverInputs inputs = job.getInputs();
-    if (!Arrays.equals(inputs.getPrePowHash(), solution.getPowHash())) {
-      LOG.debug("Miner's solution does not match current job");
-      return false;
-    }
-    final byte[] hashBuffer = new byte[64];
-    final Optional<EthHashSolution> calculatedSolution =
-        testNonce(inputs, solution.getNonce(), hashBuffer);
-
-    if (calculatedSolution.isPresent()) {
-      LOG.debug("Accepting a solution from a miner");
-      currentJob.get().solvedWith(calculatedSolution.get());
-      return true;
-    }
-    LOG.debug("Rejecting a solution from a miner");
-    return false;
-  }
-
-  public Iterable<Long> getNonceGenerator() {
-    return nonceGenerator;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolverInputs.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolverInputs.java
deleted file mode 100644
index 51611a6b3c2..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolverInputs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import java.util.Arrays;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class EthHashSolverInputs {
-  private final UInt256 target;
-  private final byte[] prePowHash;
-  private final long blockNumber;
-
-  public EthHashSolverInputs(
-      final UInt256 target, final byte[] prePowHash, final long blockNumber) {
-    this.target = target;
-    this.prePowHash = prePowHash;
-    this.blockNumber = blockNumber;
-  }
-
-  public UInt256 getTarget() {
-    return target;
-  }
-
-  public byte[] getPrePowHash() {
-    return prePowHash;
-  }
-
-  public long getBlockNumber() {
-    return blockNumber;
-  }
-
-  @Override
-  public String toString() {
-    return "EthHashSolverInputs{"
-        + "target="
-        + target
-        + ", prePowHash="
-        + Arrays.toString(prePowHash)
-        + ", blockNumber="
-        + blockNumber
-        + '}';
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHasher.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHasher.java
deleted file mode 100644
index d2792549600..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/EthHasher.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet;
-
-public interface EthHasher {
-
-  /**
-   * Hash of a particular block and nonce.
-   *
-   * @param buffer At least 64 bytes long buffer to store EthHash result in
-   * @param nonce Block Nonce
-   * @param number Block Number
-   * @param epochCalc EpochCalculator for calculating epoch
-   * @param headerHash Block Header (without mix digest and nonce) Hash
-   */
-  void hash(byte[] buffer, long nonce, long number, EpochCalculator epochCalc, byte[] headerHash);
-
-  final class Light implements EthHasher {
-
-    private static final EthHashCacheFactory cacheFactory = new EthHashCacheFactory();
-
-    @Override
-    public void hash(
-        final byte[] buffer,
-        final long nonce,
-        final long number,
-        final EpochCalculator epochCalc,
-        final byte[] headerHash) {
-      final EthHashCacheFactory.EthHashDescriptor cache =
-          cacheFactory.ethHashCacheFor(number, epochCalc);
-      final byte[] hash =
-          EthHash.hashimotoLight(cache.getDatasetSize(), cache.getCache(), headerHash, nonce);
-      System.arraycopy(hash, 0, buffer, 0, hash.length);
-    }
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/FrontierGasCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/FrontierGasCalculator.java
deleted file mode 100644
index 935922c35f9..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/FrontierGasCalculator.java
+++ /dev/null
@@ -1,473 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Words;
-import org.hyperledger.besu.ethereum.vm.operations.ExpOperation;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class FrontierGasCalculator implements GasCalculator {
-
-  private static final Gas TX_DATA_ZERO_COST = Gas.of(4L);
-
-  private static final Gas TX_DATA_NON_ZERO_COST = Gas.of(68L);
-
-  private static final Gas TX_BASE_COST = Gas.of(21_000L);
-
-  private static final Gas TX_CREATE_EXTRA_COST = Gas.of(0L);
-
-  private static final Gas CODE_DEPOSIT_BYTE_COST = Gas.of(200L);
-
-  private static final Gas ID_PRECOMPILED_BASE_GAS_COST = Gas.of(15L);
-
-  private static final Gas ID_PRECOMPILED_WORD_GAS_COST = Gas.of(3L);
-
-  private static final Gas ECREC_PRECOMPILED_GAS_COST = Gas.of(3_000L);
-
-  private static final Gas SHA256_PRECOMPILED_BASE_GAS_COST = Gas.of(60L);
-
-  private static final Gas SHA256_PRECOMPILED_WORD_GAS_COST = Gas.of(12L);
-
-  private static final Gas RIPEMD160_PRECOMPILED_WORD_GAS_COST = Gas.of(120L);
-
-  private static final Gas RIPEMD160_PRECOMPILED_BASE_GAS_COST = Gas.of(600L);
-
-  private static final Gas VERY_LOW_TIER_GAS_COST = Gas.of(3L);
-
-  private static final Gas LOW_TIER_GAS_COST = Gas.of(5L);
-
-  private static final Gas BASE_TIER_GAS_COST = Gas.of(2L);
-
-  private static final Gas MID_TIER_GAS_COST = Gas.of(8L);
-
-  private static final Gas HIGH_TIER_GAS_COST = Gas.of(10L);
-
-  private static final Gas CALL_OPERATION_BASE_GAS_COST = Gas.of(40L);
-
-  private static final Gas CALL_VALUE_TRANSFER_GAS_COST = Gas.of(9_000L);
-
-  private static final Gas ADDITIONAL_CALL_STIPEND = Gas.of(2_300L);
-
-  private static final Gas NEW_ACCOUNT_GAS_COST = Gas.of(25_000L);
-
-  private static final Gas CREATE_OPERATION_GAS_COST = Gas.of(32_000L);
-
-  private static final Gas COPY_WORD_GAS_COST = Gas.of(3L);
-
-  private static final Gas MEMORY_WORD_GAS_COST = Gas.of(3L);
-
-  private static final Gas BALANCE_OPERATION_GAS_COST = Gas.of(20L);
-
-  private static final Gas BLOCKHASH_OPERATION_GAS_COST = Gas.of(20L);
-
-  private static final Gas EXP_OPERATION_BASE_GAS_COST = Gas.of(10);
-
-  private static final Gas EXP_OPERATION_BYTE_GAS_COST = Gas.of(10);
-
-  private static final Gas EXT_CODE_BASE_GAS_COST = Gas.of(20L);
-
-  private static final Gas JUMPDEST_OPERATION_GAS_COST = Gas.of(1);
-
-  private static final Gas LOG_OPERATION_BASE_GAS_COST = Gas.of(375L);
-
-  private static final Gas LOG_OPERATION_DATA_BYTE_GAS_COST = Gas.of(8L);
-
-  private static final Gas LOG_OPERATION_TOPIC_GAS_COST = Gas.of(375L);
-
-  private static final Gas SELFDESTRUCT_OPERATION_GAS_COST = Gas.of(0);
-
-  private static final Gas SHA3_OPERATION_BASE_GAS_COST = Gas.of(30L);
-
-  static final Gas SHA3_OPERATION_WORD_GAS_COST = Gas.of(6L);
-
-  private static final Gas SLOAD_OPERATION_GAS_COST = Gas.of(50);
-
-  private static final Gas STORAGE_SET_GAS_COST = Gas.of(20_000L);
-
-  private static final Gas STORAGE_RESET_GAS_COST = Gas.of(5_000L);
-
-  private static final Gas STORAGE_RESET_REFUND_AMOUNT = Gas.of(15_000L);
-
-  private static final Gas SELF_DESTRUCT_REFUND_AMOUNT = Gas.of(24_000L);
-
-  @Override
-  public Gas transactionIntrinsicGasCost(final Transaction transaction) {
-    final Bytes payload = transaction.getPayload();
-    int zeros = 0;
-    for (int i = 0; i < payload.size(); i++) {
-      if (payload.get(i) == 0) {
-        ++zeros;
-      }
-    }
-    final int nonZeros = payload.size() - zeros;
-
-    Gas cost =
-        TX_BASE_COST
-            .plus(TX_DATA_ZERO_COST.times(zeros))
-            .plus(TX_DATA_NON_ZERO_COST.times(nonZeros));
-
-    if (transaction.isContractCreation()) {
-      cost = cost.plus(txCreateExtraGasCost());
-    }
-
-    return cost;
-  }
-
-  /**
-   * Returns the additional gas cost for contract creation transactions
-   *
-   * @return the additional gas cost for contract creation transactions
-   */
-  protected Gas txCreateExtraGasCost() {
-    return TX_CREATE_EXTRA_COST;
-  }
-
-  @Override
-  public Gas codeDepositGasCost(final int codeSize) {
-    return CODE_DEPOSIT_BYTE_COST.times(codeSize);
-  }
-
-  @Override
-  public Gas idPrecompiledContractGasCost(final Bytes input) {
-    return ID_PRECOMPILED_WORD_GAS_COST
-        .times(Words.numWords(input))
-        .plus(ID_PRECOMPILED_BASE_GAS_COST);
-  }
-
-  @Override
-  public Gas getEcrecPrecompiledContractGasCost() {
-    return ECREC_PRECOMPILED_GAS_COST;
-  }
-
-  @Override
-  public Gas sha256PrecompiledContractGasCost(final Bytes input) {
-    return SHA256_PRECOMPILED_WORD_GAS_COST
-        .times(Words.numWords(input))
-        .plus(SHA256_PRECOMPILED_BASE_GAS_COST);
-  }
-
-  @Override
-  public Gas ripemd160PrecompiledContractGasCost(final Bytes input) {
-    return RIPEMD160_PRECOMPILED_WORD_GAS_COST
-        .times(Words.numWords(input))
-        .plus(RIPEMD160_PRECOMPILED_BASE_GAS_COST);
-  }
-
-  @Override
-  public Gas getZeroTierGasCost() {
-    return Gas.ZERO;
-  }
-
-  @Override
-  public Gas getVeryLowTierGasCost() {
-    return VERY_LOW_TIER_GAS_COST;
-  }
-
-  @Override
-  public Gas getLowTierGasCost() {
-    return LOW_TIER_GAS_COST;
-  }
-
-  @Override
-  public Gas getBaseTierGasCost() {
-    return BASE_TIER_GAS_COST;
-  }
-
-  @Override
-  public Gas getMidTierGasCost() {
-    return MID_TIER_GAS_COST;
-  }
-
-  @Override
-  public Gas getHighTierGasCost() {
-    return HIGH_TIER_GAS_COST;
-  }
-
-  /**
-   * Returns the base gas cost to execute a call operation.
-   *
-   * @return the base gas cost to execute a call operation
-   */
-  protected Gas callOperationBaseGasCost() {
-    return CALL_OPERATION_BASE_GAS_COST;
-  }
-
-  /**
-   * Returns the gas cost to transfer funds in a call operation.
-   *
-   * @return the gas cost to transfer funds in a call operation
-   */
-  Gas callValueTransferGasCost() {
-    return CALL_VALUE_TRANSFER_GAS_COST;
-  }
-
-  /**
-   * Returns the gas cost to create a new account.
-   *
-   * @return the gas cost to create a new account
-   */
-  Gas newAccountGasCost() {
-    return NEW_ACCOUNT_GAS_COST;
-  }
-
-  @Override
-  public Gas callOperationGasCost(
-      final MessageFrame frame,
-      final Gas stipend,
-      final UInt256 inputDataOffset,
-      final UInt256 inputDataLength,
-      final UInt256 outputDataOffset,
-      final UInt256 outputDataLength,
-      final Wei transferValue,
-      final Account recipient,
-      final Address to) {
-    final Gas inputDataMemoryExpansionCost =
-        memoryExpansionGasCost(frame, inputDataOffset, inputDataLength);
-    final Gas outputDataMemoryExpansionCost =
-        memoryExpansionGasCost(frame, outputDataOffset, outputDataLength);
-    final Gas memoryExpansionCost = inputDataMemoryExpansionCost.max(outputDataMemoryExpansionCost);
-
-    Gas cost = callOperationBaseGasCost().plus(stipend).plus(memoryExpansionCost);
-
-    if (!transferValue.isZero()) {
-      cost = cost.plus(callValueTransferGasCost());
-    }
-
-    if (recipient == null) {
-      cost = cost.plus(newAccountGasCost());
-    }
-
-    return cost;
-  }
-
-  /**
-   * Returns the additional call stipend for calls with value transfers.
-   *
-   * @return the additional call stipend for calls with value transfers
-   */
-  @Override
-  public Gas getAdditionalCallStipend() {
-    return ADDITIONAL_CALL_STIPEND;
-  }
-
-  @Override
-  public Gas gasAvailableForChildCall(
-      final MessageFrame frame, final Gas stipend, final boolean transfersValue) {
-    if (transfersValue) {
-      return stipend.plus(getAdditionalCallStipend());
-    } else {
-      return stipend;
-    }
-  }
-
-  @Override
-  public Gas createOperationGasCost(final MessageFrame frame) {
-    final UInt256 initCodeOffset = UInt256.fromBytes(frame.getStackItem(1));
-    final UInt256 initCodeLength = UInt256.fromBytes(frame.getStackItem(2));
-
-    final Gas memoryGasCost = memoryExpansionGasCost(frame, initCodeOffset, initCodeLength);
-    return CREATE_OPERATION_GAS_COST.plus(memoryGasCost);
-  }
-
-  @Override
-  public Gas gasAvailableForChildCreate(final Gas stipend) {
-    return stipend;
-  }
-
-  @Override
-  public Gas dataCopyOperationGasCost(
-      final MessageFrame frame, final UInt256 offset, final UInt256 length) {
-    return copyWordsToMemoryGasCost(
-        frame, VERY_LOW_TIER_GAS_COST, COPY_WORD_GAS_COST, offset, length);
-  }
-
-  @Override
-  public Gas memoryExpansionGasCost(
-      final MessageFrame frame, final UInt256 offset, final UInt256 length) {
-
-    final Gas pre = memoryCost(frame.memoryWordSize());
-    final Gas post = memoryCost(frame.calculateMemoryExpansion(offset, length));
-
-    return post.minus(pre);
-  }
-
-  @Override
-  public Gas getBalanceOperationGasCost() {
-    return BALANCE_OPERATION_GAS_COST;
-  }
-
-  @Override
-  public Gas getBlockHashOperationGasCost() {
-    return BLOCKHASH_OPERATION_GAS_COST;
-  }
-
-  /**
-   * Returns the gas cost for a byte in the {@link ExpOperation}.
-   *
-   * @return the gas cost for a byte in the exponent operation
-   */
-  protected Gas expOperationByteGasCost() {
-    return EXP_OPERATION_BYTE_GAS_COST;
-  }
-
-  @Override
-  public Gas expOperationGasCost(final int numBytes) {
-    return expOperationByteGasCost().times(Gas.of(numBytes)).plus(EXP_OPERATION_BASE_GAS_COST);
-  }
-
-  /**
-   * Returns the base gas cost for external code accesses.
-   *
-   * @return the base gas cost for external code accesses
-   */
-  protected Gas extCodeBaseGasCost() {
-    return EXT_CODE_BASE_GAS_COST;
-  }
-
-  @Override
-  public Gas extCodeCopyOperationGasCost(
-      final MessageFrame frame, final UInt256 offset, final UInt256 length) {
-    return copyWordsToMemoryGasCost(
-        frame, extCodeBaseGasCost(), COPY_WORD_GAS_COST, offset, length);
-  }
-
-  @Override
-  public Gas extCodeHashOperationGasCost() {
-    throw new UnsupportedOperationException(
-        "EXTCODEHASH not supported by " + getClass().getSimpleName());
-  }
-
-  @Override
-  public Gas getExtCodeSizeOperationGasCost() {
-    return extCodeBaseGasCost();
-  }
-
-  @Override
-  public Gas getJumpDestOperationGasCost() {
-    return JUMPDEST_OPERATION_GAS_COST;
-  }
-
-  @Override
-  public Gas logOperationGasCost(
-      final MessageFrame frame,
-      final UInt256 dataOffset,
-      final UInt256 dataLength,
-      final int numTopics) {
-    return Gas.ZERO
-        .plus(LOG_OPERATION_BASE_GAS_COST)
-        .plus(LOG_OPERATION_DATA_BYTE_GAS_COST.times(Gas.of(dataLength)))
-        .plus(LOG_OPERATION_TOPIC_GAS_COST.times(numTopics))
-        .plus(memoryExpansionGasCost(frame, dataOffset, dataLength));
-  }
-
-  @Override
-  public Gas mLoadOperationGasCost(final MessageFrame frame, final UInt256 offset) {
-    return VERY_LOW_TIER_GAS_COST.plus(memoryExpansionGasCost(frame, offset, UInt256.valueOf(32)));
-  }
-
-  @Override
-  public Gas mStoreOperationGasCost(final MessageFrame frame, final UInt256 offset) {
-    return VERY_LOW_TIER_GAS_COST.plus(memoryExpansionGasCost(frame, offset, UInt256.valueOf(32)));
-  }
-
-  @Override
-  public Gas mStore8OperationGasCost(final MessageFrame frame, final UInt256 offset) {
-    return VERY_LOW_TIER_GAS_COST.plus(memoryExpansionGasCost(frame, offset, UInt256.ONE));
-  }
-
-  @Override
-  public Gas selfDestructOperationGasCost(final Account recipient, final Wei inheritance) {
-    return SELFDESTRUCT_OPERATION_GAS_COST;
-  }
-
-  @Override
-  public Gas sha3OperationGasCost(
-      final MessageFrame frame, final UInt256 offset, final UInt256 length) {
-    return copyWordsToMemoryGasCost(
-        frame, SHA3_OPERATION_BASE_GAS_COST, SHA3_OPERATION_WORD_GAS_COST, offset, length);
-  }
-
-  @Override
-  public Gas create2OperationGasCost(final MessageFrame frame) {
-    throw new UnsupportedOperationException(
-        "CREATE2 operation not supported by " + getClass().getSimpleName());
-  }
-
-  @Override
-  public Gas getSloadOperationGasCost() {
-    return SLOAD_OPERATION_GAS_COST;
-  }
-
-  @Override
-  public Gas calculateStorageCost(
-      final Account account, final UInt256 key, final UInt256 newValue) {
-    return !newValue.isZero() && account.getStorageValue(key).isZero()
-        ? STORAGE_SET_GAS_COST
-        : STORAGE_RESET_GAS_COST;
-  }
-
-  @Override
-  public Gas calculateStorageRefundAmount(
-      final Account account, final UInt256 key, final UInt256 newValue) {
-    return newValue.isZero() && !account.getStorageValue(key).isZero()
-        ? STORAGE_RESET_REFUND_AMOUNT
-        : Gas.ZERO;
-  }
-
-  @Override
-  public Gas getSelfDestructRefundAmount() {
-    return SELF_DESTRUCT_REFUND_AMOUNT;
-  }
-
-  @Override
-  public Gas getBeginSubGasCost() {
-    throw new UnsupportedOperationException(
-        "BEGINSUB operation not supported by " + getClass().getSimpleName());
-  }
-
-  protected Gas copyWordsToMemoryGasCost(
-      final MessageFrame frame,
-      final Gas baseGasCost,
-      final Gas wordGasCost,
-      final UInt256 offset,
-      final UInt256 length) {
-    final UInt256 numWords = length.divideCeil(Bytes32.SIZE);
-
-    final Gas copyCost = wordGasCost.times(Gas.of(numWords)).plus(baseGasCost);
-    final Gas memoryCost = memoryExpansionGasCost(frame, offset, length);
-
-    return copyCost.plus(memoryCost);
-  }
-
-  private static Gas memoryCost(final UInt256 length) {
-    if (!length.fitsInt()) {
-      return Gas.MAX_VALUE;
-    }
-    final Gas len = Gas.of(length);
-    final Gas base = len.times(len).dividedBy(512);
-
-    return MEMORY_WORD_GAS_COST.times(len).plus(base);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/FrontierTargetingGasLimitCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/FrontierTargetingGasLimitCalculator.java
new file mode 100644
index 00000000000..49295e39468
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/FrontierTargetingGasLimitCalculator.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2019 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet;
+
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class FrontierTargetingGasLimitCalculator extends AbstractGasLimitSpecification
+    implements GasLimitCalculator {
+  private static final Logger LOG =
+      LoggerFactory.getLogger(FrontierTargetingGasLimitCalculator.class);
+  private final long maxConstantAdjustmentIncrement;
+
+  public FrontierTargetingGasLimitCalculator() {
+    this(DEFAULT_MAX_CONSTANT_ADMUSTMENT_INCREMENT, DEFAULT_MIN_GAS_LIMIT, DEFAULT_MAX_GAS_LIMIT);
+  }
+
+  public FrontierTargetingGasLimitCalculator(
+      final long maxConstantAdjustmentIncrement, final long minGasLimit, final long maxGasLimit) {
+    super(minGasLimit, maxGasLimit);
+    this.maxConstantAdjustmentIncrement = maxConstantAdjustmentIncrement;
+  }
+
+  @Override
+  public long nextGasLimit(
+      final long currentGasLimit, final long targetGasLimit, final long newBlockNumber) {
+    final long nextGasLimit;
+    if (targetGasLimit > currentGasLimit) {
+      nextGasLimit = Math.min(targetGasLimit, safeAddAtMost(currentGasLimit));
+    } else if (targetGasLimit < currentGasLimit) {
+      nextGasLimit = Math.max(targetGasLimit, safeSubAtMost(currentGasLimit));
+    } else {
+      nextGasLimit = currentGasLimit;
+    }
+
+    if (nextGasLimit != currentGasLimit) {
+      LOG.debug("Adjusting block gas limit from {} to {}", currentGasLimit, nextGasLimit);
+    }
+
+    return nextGasLimit;
+  }
+
+  private long adjustAmount(final long currentGasLimit) {
+    final long maxProportionalAdjustmentLimit = Math.max(deltaBound(currentGasLimit) - 1, 0);
+    return Math.min(maxConstantAdjustmentIncrement, maxProportionalAdjustmentLimit);
+  }
+
+  protected long safeAddAtMost(final long gasLimit) {
+    try {
+      return Math.addExact(gasLimit, adjustAmount(gasLimit));
+    } catch (final ArithmeticException ex) {
+      return Long.MAX_VALUE;
+    }
+  }
+
+  protected long safeSubAtMost(final long gasLimit) {
+    try {
+      return Math.max(Math.subtractExact(gasLimit, adjustAmount(gasLimit)), 0);
+    } catch (final ArithmeticException ex) {
+      return 0;
+    }
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/IstanbulGasCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/IstanbulGasCalculator.java
deleted file mode 100644
index 6fc1ecec4f8..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/IstanbulGasCalculator.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Transaction;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class IstanbulGasCalculator extends ConstantinopleFixGasCalculator {
-
-  private static final Gas TX_DATA_ZERO_COST = Gas.of(4L);
-  private static final Gas ISTANBUL_TX_DATA_NON_ZERO_COST = Gas.of(16L);
-  private static final Gas TX_BASE_COST = Gas.of(21_000L);
-
-  private static final Gas SLOAD_GAS = Gas.of(800);
-  private static final Gas BALANCE_OPERATION_GAS_COST = Gas.of(700);
-  private static final Gas EXTCODE_HASH_COST = Gas.of(700);
-
-  private static final Gas SSTORE_SET_GAS = Gas.of(20_000);
-  private static final Gas SSTORE_RESET_GAS = Gas.of(5_000);
-  private static final Gas SSTORE_CLEARS_SCHEDULE = Gas.of(15_000);
-
-  private static final Gas SSTORE_SET_GAS_LESS_SLOAD_GAS = SSTORE_SET_GAS.minus(SLOAD_GAS);
-  private static final Gas SSTORE_RESET_GAS_LESS_SLOAD_GAS = SSTORE_RESET_GAS.minus(SLOAD_GAS);
-  private static final Gas NEGATIVE_SSTORE_CLEARS_SCHEDULE = Gas.ZERO.minus(SSTORE_CLEARS_SCHEDULE);
-
-  @Override
-  public Gas transactionIntrinsicGasCost(final Transaction transaction) {
-    final Bytes payload = transaction.getPayload();
-    int zeros = 0;
-    for (int i = 0; i < payload.size(); i++) {
-      if (payload.get(i) == 0) {
-        ++zeros;
-      }
-    }
-    final int nonZeros = payload.size() - zeros;
-
-    Gas cost =
-        TX_BASE_COST
-            .plus(TX_DATA_ZERO_COST.times(zeros))
-            .plus(ISTANBUL_TX_DATA_NON_ZERO_COST.times(nonZeros));
-
-    if (transaction.isContractCreation()) {
-      cost = cost.plus(txCreateExtraGasCost());
-    }
-
-    return cost;
-  }
-
-  @Override
-  // As per https://eips.ethereum.org/EIPS/eip-2200
-  public Gas calculateStorageCost(
-      final Account account, final UInt256 key, final UInt256 newValue) {
-
-    final UInt256 currentValue = account.getStorageValue(key);
-    if (currentValue.equals(newValue)) {
-      return SLOAD_GAS;
-    } else {
-      final UInt256 originalValue = account.getOriginalStorageValue(key);
-      if (originalValue.equals(currentValue)) {
-        return originalValue.isZero() ? SSTORE_SET_GAS : SSTORE_RESET_GAS;
-      } else {
-        return SLOAD_GAS;
-      }
-    }
-  }
-
-  @Override
-  // As per https://eips.ethereum.org/EIPS/eip-2200
-  public Gas calculateStorageRefundAmount(
-      final Account account, final UInt256 key, final UInt256 newValue) {
-
-    final UInt256 currentValue = account.getStorageValue(key);
-    if (currentValue.equals(newValue)) {
-      return Gas.ZERO;
-    } else {
-      final UInt256 originalValue = account.getOriginalStorageValue(key);
-      if (originalValue.equals(currentValue)) {
-        if (originalValue.isZero()) {
-          return Gas.ZERO;
-        } else if (newValue.isZero()) {
-          return SSTORE_CLEARS_SCHEDULE;
-        } else {
-          return Gas.ZERO;
-        }
-      } else {
-        Gas refund = Gas.ZERO;
-        if (!originalValue.isZero()) {
-          if (currentValue.isZero()) {
-            refund = NEGATIVE_SSTORE_CLEARS_SCHEDULE;
-          } else if (newValue.isZero()) {
-            refund = SSTORE_CLEARS_SCHEDULE;
-          }
-        }
-
-        if (originalValue.equals(newValue)) {
-          refund =
-              refund.plus(
-                  originalValue.isZero()
-                      ? SSTORE_SET_GAS_LESS_SLOAD_GAS
-                      : SSTORE_RESET_GAS_LESS_SLOAD_GAS);
-        }
-        return refund;
-      }
-    }
-  }
-
-  @Override
-  // As per https://eips.ethereum.org/EIPS/eip-1884
-  public Gas getSloadOperationGasCost() {
-    return SLOAD_GAS;
-  }
-
-  @Override
-  // As per https://eips.ethereum.org/EIPS/eip-1884
-  public Gas getBalanceOperationGasCost() {
-    return BALANCE_OPERATION_GAS_COST;
-  }
-
-  @Override
-  // As per https://eips.ethereum.org/EIPS/eip-1884
-  public Gas extCodeHashOperationGasCost() {
-    return EXTCODE_HASH_COST;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/LondonTargetingGasLimitCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/LondonTargetingGasLimitCalculator.java
new file mode 100644
index 00000000000..6e03a2523ea
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/LondonTargetingGasLimitCalculator.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2019 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet;
+
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LondonTargetingGasLimitCalculator extends FrontierTargetingGasLimitCalculator {
+  private static final Logger LOG =
+      LoggerFactory.getLogger(LondonTargetingGasLimitCalculator.class);
+  private final long londonForkBlock;
+  private final BaseFeeMarket feeMarket;
+
+  public LondonTargetingGasLimitCalculator(
+      final long londonForkBlock, final BaseFeeMarket feeMarket) {
+    this(
+        DEFAULT_MAX_CONSTANT_ADMUSTMENT_INCREMENT,
+        DEFAULT_MIN_GAS_LIMIT,
+        DEFAULT_MAX_GAS_LIMIT,
+        londonForkBlock,
+        feeMarket);
+  }
+
+  public LondonTargetingGasLimitCalculator(
+      final long maxConstantAdjustmentIncrement,
+      final long minGasLimit,
+      final long maxGasLimit,
+      final long londonForkBlock,
+      final BaseFeeMarket feeMarket) {
+    super(maxConstantAdjustmentIncrement, minGasLimit, maxGasLimit);
+    this.londonForkBlock = londonForkBlock;
+    this.feeMarket = feeMarket;
+  }
+
+  @Override
+  public long nextGasLimit(
+      final long currentGasLimit, final long targetGasLimit, final long newBlockNumber) {
+    long nextGasLimit;
+    if (targetGasLimit > currentGasLimit) {
+      nextGasLimit = Math.min(targetGasLimit, safeAddAtMost(currentGasLimit));
+    } else if (targetGasLimit < currentGasLimit) {
+      nextGasLimit = Math.max(targetGasLimit, safeSubAtMost(currentGasLimit));
+    } else {
+      nextGasLimit = currentGasLimit;
+    }
+
+    if (londonForkBlock == newBlockNumber) {
+      nextGasLimit = nextGasLimit * feeMarket.getSlackCoefficient();
+    }
+
+    if (nextGasLimit != currentGasLimit) {
+      LOG.debug("Adjusting block gas limit from {} to {}", currentGasLimit, nextGasLimit);
+    }
+
+    return nextGasLimit;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockBodyValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockBodyValidator.java
index 7af751d1f79..abaab920666 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockBodyValidator.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockBodyValidator.java
@@ -14,46 +14,33 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.LogsBloomFilter;
-import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.fees.EIP1559;
-import org.hyperledger.besu.ethereum.core.fees.TransactionPriceCalculator;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
 
 import java.util.HashSet;
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MainnetBlockBodyValidator implements BlockBodyValidator {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(MainnetBlockBodyValidator.class);
 
   private static final int MAX_OMMERS = 2;
 
   private static final int MAX_GENERATION = 6;
-  private final ProtocolSchedule protocolSchedule;
-  private final Optional<EIP1559> maybeEip1559;
+  protected final ProtocolSchedule protocolSchedule;
 
   public MainnetBlockBodyValidator(final ProtocolSchedule protocolSchedule) {
-    this(protocolSchedule, Optional.empty());
-  }
-
-  public MainnetBlockBodyValidator(
-      final ProtocolSchedule protocolSchedule, final Optional<EIP1559> maybeEip1559) {
     this.protocolSchedule = protocolSchedule;
-    this.maybeEip1559 = maybeEip1559;
   }
 
   @Override
@@ -68,7 +55,8 @@ public boolean validateBody(
       return false;
     }
 
-    if (!validateStateRoot(block.getHeader().getStateRoot(), worldStateRootHash)) {
+    if (!validateStateRoot(
+        block.getHeader(), block.getHeader().getStateRoot(), worldStateRootHash)) {
       LOG.warn("Invalid block RLP : {}", block.toRlp().toHexString());
       receipts.forEach(
           receipt ->
@@ -89,22 +77,22 @@ public boolean validateBodyLight(
     final BlockBody body = block.getBody();
 
     final Bytes32 transactionsRoot = BodyValidation.transactionsRoot(body.getTransactions());
-    if (!validateTransactionsRoot(header.getTransactionsRoot(), transactionsRoot)) {
+    if (!validateTransactionsRoot(header, header.getTransactionsRoot(), transactionsRoot)) {
       return false;
     }
 
     final Bytes32 receiptsRoot = BodyValidation.receiptsRoot(receipts);
-    if (!validateReceiptsRoot(header.getReceiptsRoot(), receiptsRoot)) {
+    if (!validateReceiptsRoot(header, header.getReceiptsRoot(), receiptsRoot)) {
       return false;
     }
 
     final long gasUsed =
         receipts.isEmpty() ? 0 : receipts.get(receipts.size() - 1).getCumulativeGasUsed();
-    if (!validateGasUsed(header.getGasUsed(), gasUsed)) {
+    if (!validateGasUsed(header, header.getGasUsed(), gasUsed)) {
       return false;
     }
 
-    if (!validateLogsBloom(header.getLogsBloom(), BodyValidation.logsBloom(receipts))) {
+    if (!validateLogsBloom(header, header.getLogsBloom(), BodyValidation.logsBloom(receipts))) {
       return false;
     }
 
@@ -112,17 +100,25 @@ public boolean validateBodyLight(
       return false;
     }
 
-    if (!validateTransactionGasPrice(block)) {
+    if (!validateWithdrawals(block)) {
+      return false;
+    }
+
+    if (!validateDeposits(block, receipts)) {
       return false;
     }
 
     return true;
   }
 
-  private static boolean validateTransactionsRoot(final Bytes32 expected, final Bytes32 actual) {
+  private static boolean validateTransactionsRoot(
+      final BlockHeader header, final Bytes32 expected, final Bytes32 actual) {
     if (!expected.equals(actual)) {
       LOG.info(
-          "Invalid block: transaction root mismatch (expected={}, actual={})", expected, actual);
+          "Invalid block {}: transaction root mismatch (expected={}, actual={})",
+          header.toLogString(),
+          expected,
+          actual);
       return false;
     }
 
@@ -130,37 +126,55 @@ private static boolean validateTransactionsRoot(final Bytes32 expected, final By
   }
 
   private static boolean validateLogsBloom(
-      final LogsBloomFilter expected, final LogsBloomFilter actual) {
+      final BlockHeader header, final LogsBloomFilter expected, final LogsBloomFilter actual) {
     if (!expected.equals(actual)) {
       LOG.warn(
-          "Invalid block: logs bloom filter mismatch (expected={}, actual={})", expected, actual);
+          "Invalid block {}: logs bloom filter mismatch (expected={}, actual={})",
+          header.toLogString(),
+          expected,
+          actual);
       return false;
     }
 
     return true;
   }
 
-  private static boolean validateGasUsed(final long expected, final long actual) {
+  private static boolean validateGasUsed(
+      final BlockHeader header, final long expected, final long actual) {
     if (expected != actual) {
-      LOG.warn("Invalid block: gas used mismatch (expected={}, actual={})", expected, actual);
+      LOG.warn(
+          "Invalid block {}: gas used mismatch (expected={}, actual={})",
+          header.toLogString(),
+          expected,
+          actual);
       return false;
     }
 
     return true;
   }
 
-  private static boolean validateReceiptsRoot(final Bytes32 expected, final Bytes32 actual) {
+  private static boolean validateReceiptsRoot(
+      final BlockHeader header, final Bytes32 expected, final Bytes32 actual) {
     if (!expected.equals(actual)) {
-      LOG.warn("Invalid block: receipts root mismatch (expected={}, actual={})", expected, actual);
+      LOG.warn(
+          "Invalid block {}: receipts root mismatch (expected={}, actual={})",
+          header.toLogString(),
+          expected,
+          actual);
       return false;
     }
 
     return true;
   }
 
-  private static boolean validateStateRoot(final Bytes32 expected, final Bytes32 actual) {
+  private static boolean validateStateRoot(
+      final BlockHeader header, final Bytes32 expected, final Bytes32 actual) {
     if (!expected.equals(actual)) {
-      LOG.warn("Invalid block: state root mismatch (expected={}, actual={})", expected, actual);
+      LOG.warn(
+          "Invalid block {}: state root mismatch (expected={}, actual={})",
+          header.toLogString(),
+          expected,
+          actual);
       return false;
     }
 
@@ -175,7 +189,7 @@ private boolean validateEthHash(
     final BlockBody body = block.getBody();
 
     final Bytes32 ommerHash = BodyValidation.ommersHash(body.getOmmers());
-    if (!validateOmmersHash(header.getOmmersHash(), ommerHash)) {
+    if (!validateOmmersHash(header, header.getOmmersHash(), ommerHash)) {
       return false;
     }
 
@@ -186,9 +200,14 @@ private boolean validateEthHash(
     return true;
   }
 
-  private static boolean validateOmmersHash(final Bytes32 expected, final Bytes32 actual) {
+  private static boolean validateOmmersHash(
+      final BlockHeader header, final Bytes32 expected, final Bytes32 actual) {
     if (!expected.equals(actual)) {
-      LOG.warn("Invalid block: ommers hash mismatch (expected={}, actual={})", expected, actual);
+      LOG.warn(
+          "Invalid block {}: ommers hash mismatch (expected={}, actual={})",
+          header.toLogString(),
+          expected,
+          actual);
       return false;
     }
 
@@ -201,18 +220,22 @@ private boolean validateOmmers(
       final List<BlockHeader> ommers,
       final HeaderValidationMode ommerValidationMode) {
     if (ommers.size() > MAX_OMMERS) {
-      LOG.warn("Invalid block: ommer count {} exceeds ommer limit {}", ommers.size(), MAX_OMMERS);
+      LOG.warn(
+          "Invalid block {}: ommer count {} exceeds ommer limit {}",
+          header.toLogString(),
+          ommers.size(),
+          MAX_OMMERS);
       return false;
     }
 
     if (!areOmmersUnique(ommers)) {
-      LOG.warn("Invalid block: ommers are not unique");
+      LOG.warn("Invalid block {}: ommers are not unique", header.toLogString());
       return false;
     }
 
     for (final BlockHeader ommer : ommers) {
       if (!isOmmerValid(context, header, ommer, ommerValidationMode)) {
-        LOG.warn("Invalid block: ommer is invalid");
+        LOG.warn("Invalid block {}: ommer is invalid", header.toLogString());
         return false;
       }
     }
@@ -240,7 +263,7 @@ private boolean isOmmerValid(
       final BlockHeader current,
       final BlockHeader ommer,
       final HeaderValidationMode ommerValidationMode) {
-    final ProtocolSpec protocolSpec = protocolSchedule.getByBlockNumber(ommer.getNumber());
+    final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(ommer);
     if (!protocolSpec
         .getOmmerHeaderValidator()
         .validateHeader(ommer, context, ommerValidationMode)) {
@@ -271,28 +294,31 @@ private boolean isOmmerSiblingOfAncestor(
     return false;
   }
 
-  private boolean validateTransactionGasPrice(final Block block) {
-    if (!ExperimentalEIPs.eip1559Enabled || maybeEip1559.isEmpty()) {
-      return true;
+  private boolean validateWithdrawals(final Block block) {
+    final WithdrawalsValidator withdrawalsValidator =
+        protocolSchedule.getByBlockHeader(block.getHeader()).getWithdrawalsValidator();
+
+    if (!withdrawalsValidator.validateWithdrawals(block.getBody().getWithdrawals())) {
+      return false;
     }
-    final EIP1559 eip1559 = maybeEip1559.get();
-    if (!eip1559.isEIP1559(block.getHeader().getNumber())) {
-      return true;
+
+    if (!withdrawalsValidator.validateWithdrawalsRoot(block)) {
+      return false;
     }
-    final BlockBody body = block.getBody();
-    final List<Transaction> transactions = body.getTransactions();
-    final TransactionPriceCalculator transactionPriceCalculator =
-        TransactionPriceCalculator.eip1559();
-    for (final Transaction transaction : transactions) {
-      final Optional<Long> baseFee = block.getHeader().getBaseFee();
-      final Wei price = transactionPriceCalculator.price(transaction, baseFee);
-      if (price.compareTo(Wei.of(baseFee.orElseThrow())) < 0) {
-        LOG.warn(
-            "Invalid block: transaction gas price {} must be greater than base fee {}",
-            price.toString(),
-            baseFee.orElseThrow());
-        return false;
-      }
+
+    return true;
+  }
+
+  private boolean validateDeposits(final Block block, final List<TransactionReceipt> receipts) {
+    final DepositsValidator depositsValidator =
+        protocolSchedule.getByBlockHeader(block.getHeader()).getDepositsValidator();
+
+    if (!depositsValidator.validateDeposits(block, receipts)) {
+      return false;
+    }
+
+    if (!depositsValidator.validateDepositsRoot(block)) {
+      return false;
     }
 
     return true;
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderFunctions.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderFunctions.java
index 718db6af373..a009e0843e9 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderFunctions.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderFunctions.java
@@ -14,9 +14,9 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.ParsedExtraData;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderValidator.java
index 0bf0c716d9e..0f0d53d565e 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderValidator.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderValidator.java
@@ -14,45 +14,65 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
+import org.hyperledger.besu.config.MergeConfigOptions;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.fees.EIP1559;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
 import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.AncestryValidationRule;
+import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.BaseFeeMarketBlockHeaderGasPriceValidationRule;
 import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.CalculatedDifficultyValidationRule;
 import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.ConstantFieldValidationRule;
-import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.EIP1559BlockHeaderGasPriceValidationRule;
+import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.ConstantOmmersHashRule;
 import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.ExtraDataMaxLengthValidationRule;
 import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.GasLimitRangeAndDeltaValidationRule;
 import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.GasUsageValidationRule;
+import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.IncrementalTimestampRule;
+import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.NoDifficultyRule;
+import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.NoNonceRule;
 import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.ProofOfWorkValidationRule;
 import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.TimestampBoundedByFutureParameter;
 import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.TimestampMoreRecentThanParent;
 
+import java.util.Optional;
+
+import com.google.common.annotations.VisibleForTesting;
 import org.apache.tuweni.bytes.Bytes;
 
 public final class MainnetBlockHeaderValidator {
 
   public static final Bytes DAO_EXTRA_DATA = Bytes.fromHexString("0x64616f2d686172642d666f726b");
-  private static final int MIN_GAS_LIMIT = 5000;
-  private static final long MAX_GAS_LIMIT = 0x7fffffffffffffffL;
+  public static final int MIN_GAS_LIMIT = 5000;
+  public static final long MAX_GAS_LIMIT = 0x7fffffffffffffffL;
   public static final int TIMESTAMP_TOLERANCE_S = 15;
   public static final int MINIMUM_SECONDS_SINCE_PARENT = 1;
   public static final Bytes CLASSIC_FORK_BLOCK_HEADER =
       Bytes.fromHexString("0x94365e3a8c0b35089c1d1195081fe7489b528a84b22199c916180db8b28ade7f");
 
+  private MainnetBlockHeaderValidator() {
+    // utility class
+  }
+
   public static BlockHeaderValidator.Builder create() {
-    return createValidator();
+    return createPgaFeeMarketValidator(PoWHasher.ETHASH_LIGHT);
+  }
+
+  public static BlockHeaderValidator.Builder create(final PoWHasher hasher) {
+    return createPgaFeeMarketValidator(hasher);
   }
 
   public static BlockHeaderValidator.Builder createDaoValidator() {
-    return createValidator()
+    return createPgaFeeMarketValidator()
         .addRule(
             new ConstantFieldValidationRule<>(
                 "extraData", BlockHeader::getExtraData, DAO_EXTRA_DATA));
   }
 
   public static BlockHeaderValidator.Builder createClassicValidator() {
-    return createValidator()
+    return createClassicValidator(PoWHasher.ETHASH_LIGHT);
+  }
+
+  public static BlockHeaderValidator.Builder createClassicValidator(final PoWHasher hasher) {
+    return createPgaFeeMarketValidator(hasher)
         .addRule(
             new ConstantFieldValidationRule<>(
                 "hash",
@@ -68,11 +88,13 @@ public static boolean validateHeaderForClassicFork(final BlockHeader header) {
     return header.getNumber() != 1_920_000 || header.getHash().equals(CLASSIC_FORK_BLOCK_HEADER);
   }
 
-  static BlockHeaderValidator.Builder createOmmerValidator() {
-    return createOmmerValidator(new EpochCalculator.DefaultEpochCalculator());
+  static BlockHeaderValidator.Builder createLegacyFeeMarketOmmerValidator() {
+    return createLegacyFeeMarketOmmerValidator(
+        new EpochCalculator.DefaultEpochCalculator(), PoWHasher.ETHASH_LIGHT);
   }
 
-  static BlockHeaderValidator.Builder createOmmerValidator(final EpochCalculator epochCalculator) {
+  static BlockHeaderValidator.Builder createLegacyFeeMarketOmmerValidator(
+      final EpochCalculator epochCalculator, final PoWHasher hasher) {
     return new BlockHeaderValidator.Builder()
         .addRule(CalculatedDifficultyValidationRule::new)
         .addRule(new AncestryValidationRule())
@@ -80,15 +102,19 @@ static BlockHeaderValidator.Builder createOmmerValidator(final EpochCalculator e
         .addRule(new GasUsageValidationRule())
         .addRule(new TimestampMoreRecentThanParent(MINIMUM_SECONDS_SINCE_PARENT))
         .addRule(new ExtraDataMaxLengthValidationRule(BlockHeader.MAX_EXTRA_DATA_BYTES))
-        .addRule(new ProofOfWorkValidationRule(epochCalculator));
+        .addRule(new ProofOfWorkValidationRule(epochCalculator, hasher, Optional.empty()));
+  }
+
+  private static BlockHeaderValidator.Builder createPgaFeeMarketValidator() {
+    return createPgaFeeMarketValidator(PoWHasher.ETHASH_LIGHT);
   }
 
-  private static BlockHeaderValidator.Builder createValidator() {
-    return createBlockHeaderValidator(new EpochCalculator.DefaultEpochCalculator());
+  private static BlockHeaderValidator.Builder createPgaFeeMarketValidator(final PoWHasher hasher) {
+    return createPgaBlockHeaderValidator(new EpochCalculator.DefaultEpochCalculator(), hasher);
   }
 
-  static BlockHeaderValidator.Builder createBlockHeaderValidator(
-      final EpochCalculator epochCalculator) {
+  public static BlockHeaderValidator.Builder createPgaBlockHeaderValidator(
+      final EpochCalculator epochCalculator, final PoWHasher hasher) {
     return new BlockHeaderValidator.Builder()
         .addRule(CalculatedDifficultyValidationRule::new)
         .addRule(new AncestryValidationRule())
@@ -97,31 +123,76 @@ static BlockHeaderValidator.Builder createBlockHeaderValidator(
         .addRule(new TimestampMoreRecentThanParent(MINIMUM_SECONDS_SINCE_PARENT))
         .addRule(new TimestampBoundedByFutureParameter(TIMESTAMP_TOLERANCE_S))
         .addRule(new ExtraDataMaxLengthValidationRule(BlockHeader.MAX_EXTRA_DATA_BYTES))
-        .addRule(new ProofOfWorkValidationRule(epochCalculator));
+        .addRule(new ProofOfWorkValidationRule(epochCalculator, hasher, Optional.empty()));
   }
 
-  static BlockHeaderValidator.Builder createEip1559Validator(final EIP1559 eip1559) {
-    ExperimentalEIPs.eip1559MustBeEnabled();
+  public static BlockHeaderValidator.Builder createBaseFeeMarketValidator(
+      final BaseFeeMarket baseFeeMarket) {
+    return createBaseFeeMarketValidator(baseFeeMarket, MergeConfigOptions.isMergeEnabled());
+  }
+
+  @VisibleForTesting
+  public static BlockHeaderValidator.Builder createBaseFeeMarketValidator(
+      final BaseFeeMarket baseFeeMarket, final boolean isMergeEnabled) {
+    var builder =
+        new BlockHeaderValidator.Builder()
+            .addRule(CalculatedDifficultyValidationRule::new)
+            .addRule(new AncestryValidationRule())
+            .addRule(new GasUsageValidationRule())
+            .addRule(
+                new GasLimitRangeAndDeltaValidationRule(
+                    MIN_GAS_LIMIT, Long.MAX_VALUE, Optional.of(baseFeeMarket)))
+            .addRule(new TimestampMoreRecentThanParent(MINIMUM_SECONDS_SINCE_PARENT))
+            .addRule(new TimestampBoundedByFutureParameter(TIMESTAMP_TOLERANCE_S))
+            .addRule(new ExtraDataMaxLengthValidationRule(BlockHeader.MAX_EXTRA_DATA_BYTES))
+            .addRule((new BaseFeeMarketBlockHeaderGasPriceValidationRule(baseFeeMarket)));
+
+    // if this is not a merged PoS network, add the proof of work validation rule:
+    if (!isMergeEnabled) {
+      builder.addRule(
+          new ProofOfWorkValidationRule(
+              new EpochCalculator.DefaultEpochCalculator(),
+              PoWHasher.ETHASH_LIGHT,
+              Optional.of(baseFeeMarket)));
+    }
+    return builder;
+  }
+
+  static BlockHeaderValidator.Builder createBaseFeeMarketOmmerValidator(
+      final BaseFeeMarket baseFeeMarket) {
     return new BlockHeaderValidator.Builder()
         .addRule(CalculatedDifficultyValidationRule::new)
         .addRule(new AncestryValidationRule())
         .addRule(new GasUsageValidationRule())
+        .addRule(
+            new GasLimitRangeAndDeltaValidationRule(
+                MIN_GAS_LIMIT, Long.MAX_VALUE, Optional.of(baseFeeMarket)))
         .addRule(new TimestampMoreRecentThanParent(MINIMUM_SECONDS_SINCE_PARENT))
-        .addRule(new TimestampBoundedByFutureParameter(TIMESTAMP_TOLERANCE_S))
         .addRule(new ExtraDataMaxLengthValidationRule(BlockHeader.MAX_EXTRA_DATA_BYTES))
-        .addRule(new ProofOfWorkValidationRule(new EpochCalculator.DefaultEpochCalculator(), true))
-        .addRule((new EIP1559BlockHeaderGasPriceValidationRule(eip1559)));
+        .addRule(
+            new ProofOfWorkValidationRule(
+                new EpochCalculator.DefaultEpochCalculator(),
+                PoWHasher.ETHASH_LIGHT,
+                Optional.of(baseFeeMarket)))
+        .addRule((new BaseFeeMarketBlockHeaderGasPriceValidationRule(baseFeeMarket)));
   }
 
-  static BlockHeaderValidator.Builder createEip1559OmmerValidator(final EIP1559 eip1559) {
-    ExperimentalEIPs.eip1559MustBeEnabled();
+  public static BlockHeaderValidator.Builder mergeBlockHeaderValidator(final FeeMarket feeMarket) {
+
+    var baseFeeMarket = (BaseFeeMarket) feeMarket;
+
     return new BlockHeaderValidator.Builder()
-        .addRule(CalculatedDifficultyValidationRule::new)
         .addRule(new AncestryValidationRule())
         .addRule(new GasUsageValidationRule())
-        .addRule(new TimestampMoreRecentThanParent(MINIMUM_SECONDS_SINCE_PARENT))
+        .addRule(
+            new GasLimitRangeAndDeltaValidationRule(
+                MIN_GAS_LIMIT, Long.MAX_VALUE, Optional.of(baseFeeMarket)))
+        .addRule(new TimestampBoundedByFutureParameter(TIMESTAMP_TOLERANCE_S))
         .addRule(new ExtraDataMaxLengthValidationRule(BlockHeader.MAX_EXTRA_DATA_BYTES))
-        .addRule(new ProofOfWorkValidationRule(new EpochCalculator.DefaultEpochCalculator(), true))
-        .addRule((new EIP1559BlockHeaderGasPriceValidationRule(eip1559)));
+        .addRule((new BaseFeeMarketBlockHeaderGasPriceValidationRule(baseFeeMarket)))
+        .addRule(new ConstantOmmersHashRule())
+        .addRule(new NoNonceRule())
+        .addRule(new NoDifficultyRule())
+        .addRule(new IncrementalTimestampRule());
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockImporter.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockImporter.java
index 865b1f8840b..7af94d491de 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockImporter.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockImporter.java
@@ -19,9 +19,9 @@
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockImporter;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.ethereum.mainnet.BlockImportResult.BlockImportStatus;
 
 import java.util.List;
-import java.util.Optional;
 
 public class MainnetBlockImporter implements BlockImporter {
 
@@ -32,28 +32,32 @@ public MainnetBlockImporter(final BlockValidator blockValidator) {
   }
 
   @Override
-  public synchronized boolean importBlock(
+  public synchronized BlockImportResult importBlock(
       final ProtocolContext context,
       final Block block,
       final HeaderValidationMode headerValidationMode,
       final HeaderValidationMode ommerValidationMode) {
     if (context.getBlockchain().contains(block.getHash())) {
-      return true;
+      return new BlockImportResult(BlockImportStatus.ALREADY_IMPORTED);
     }
 
-    final Optional<BlockValidator.BlockProcessingOutputs> outputs =
+    final var result =
         blockValidator.validateAndProcessBlock(
             context, block, headerValidationMode, ommerValidationMode);
 
-    outputs.ifPresent(
-        processingOutputs ->
-            context.getBlockchain().appendBlock(block, processingOutputs.receipts));
+    if (result.isSuccessful()) {
+      result
+          .getYield()
+          .ifPresent(
+              processingOutputs ->
+                  context.getBlockchain().appendBlock(block, processingOutputs.getReceipts()));
+    }
 
-    return outputs.isPresent();
+    return new BlockImportResult(result.isSuccessful());
   }
 
   @Override
-  public boolean fastImportBlock(
+  public BlockImportResult fastImportBlock(
       final ProtocolContext context,
       final Block block,
       final List<TransactionReceipt> receipts,
@@ -63,9 +67,9 @@ public boolean fastImportBlock(
     if (blockValidator.fastBlockValidation(
         context, block, receipts, headerValidationMode, ommerValidationMode)) {
       context.getBlockchain().appendBlock(block, receipts);
-      return true;
+      return new BlockImportResult(true);
     }
 
-    return false;
+    return new BlockImportResult(false);
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockProcessor.java
index b72fbe3f296..ae1187eb6bb 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockProcessor.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockProcessor.java
@@ -14,22 +14,21 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.core.fees.TransactionGasBudgetCalculator;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.util.List;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MainnetBlockProcessor extends AbstractBlockProcessor {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(MainnetBlockProcessor.class);
 
   public MainnetBlockProcessor(
       final MainnetTransactionProcessor transactionProcessor,
@@ -37,18 +36,18 @@ public MainnetBlockProcessor(
       final Wei blockReward,
       final MiningBeneficiaryCalculator miningBeneficiaryCalculator,
       final boolean skipZeroBlockRewards,
-      final TransactionGasBudgetCalculator gasBudgetCalculator) {
+      final ProtocolSchedule protocolSchedule) {
     super(
         transactionProcessor,
         transactionReceiptFactory,
         blockReward,
         miningBeneficiaryCalculator,
         skipZeroBlockRewards,
-        gasBudgetCalculator);
+        protocolSchedule);
   }
 
   @Override
-  boolean rewardCoinbase(
+  protected boolean rewardCoinbase(
       final MutableWorldState worldState,
       final BlockHeader header,
       final List<BlockHeader> ommers,
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetContractCreationProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetContractCreationProcessor.java
deleted file mode 100644
index 61fbccc9b5f..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetContractCreationProcessor.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.ModificationNotAllowedException;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.OperationTracer;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-
-import com.google.common.collect.ImmutableSet;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-
-/** A contract creation message processor. */
-public class MainnetContractCreationProcessor extends AbstractMessageProcessor {
-
-  private static final Logger LOG = LogManager.getLogger();
-
-  private final boolean requireCodeDepositToSucceed;
-
-  private final GasCalculator gasCalculator;
-
-  private final long initialContractNonce;
-
-  private final List<ContractValidationRule> contractValidationRules;
-
-  private final int accountVersion;
-
-  public MainnetContractCreationProcessor(
-      final GasCalculator gasCalculator,
-      final EVM evm,
-      final boolean requireCodeDepositToSucceed,
-      final List<ContractValidationRule> contractValidationRules,
-      final long initialContractNonce,
-      final Collection<Address> forceCommitAddresses,
-      final int accountVersion) {
-    super(evm, forceCommitAddresses);
-    this.gasCalculator = gasCalculator;
-    this.requireCodeDepositToSucceed = requireCodeDepositToSucceed;
-    this.contractValidationRules = contractValidationRules;
-    this.initialContractNonce = initialContractNonce;
-    this.accountVersion = accountVersion;
-  }
-
-  public MainnetContractCreationProcessor(
-      final GasCalculator gasCalculator,
-      final EVM evm,
-      final boolean requireCodeDepositToSucceed,
-      final List<ContractValidationRule> contractValidationRules,
-      final long initialContractNonce,
-      final Collection<Address> forceCommitAddresses) {
-    this(
-        gasCalculator,
-        evm,
-        requireCodeDepositToSucceed,
-        contractValidationRules,
-        initialContractNonce,
-        forceCommitAddresses,
-        Account.DEFAULT_VERSION);
-  }
-
-  public MainnetContractCreationProcessor(
-      final GasCalculator gasCalculator,
-      final EVM evm,
-      final boolean requireCodeDepositToSucceed,
-      final List<ContractValidationRule> contractValidationRules,
-      final long initialContractNonce) {
-    this(
-        gasCalculator,
-        evm,
-        requireCodeDepositToSucceed,
-        contractValidationRules,
-        initialContractNonce,
-        ImmutableSet.of(),
-        Account.DEFAULT_VERSION);
-  }
-
-  private static boolean accountExists(final Account account) {
-    // The account exists if it has sent a transaction
-    // or already has its code initialized.
-    return account.getNonce() > 0 || !account.getCode().isEmpty();
-  }
-
-  @Override
-  public void start(final MessageFrame frame, final OperationTracer operationTracer) {
-    if (LOG.isTraceEnabled()) {
-      LOG.trace("Executing contract-creation");
-    }
-    try {
-      final MutableAccount sender =
-          frame.getWorldState().getAccount(frame.getSenderAddress()).getMutable();
-      sender.decrementBalance(frame.getValue());
-
-      final MutableAccount contract =
-          frame.getWorldState().getOrCreate(frame.getContractAddress()).getMutable();
-      if (accountExists(contract)) {
-        LOG.trace(
-            "Contract creation error: account as already been created for address {}",
-            frame.getContractAddress());
-        frame.setState(MessageFrame.State.EXCEPTIONAL_HALT);
-        operationTracer.traceAccountCreationResult(
-            frame, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-      } else {
-        contract.incrementBalance(frame.getValue());
-        contract.setNonce(initialContractNonce);
-        contract.clearStorage();
-        frame.setState(MessageFrame.State.CODE_EXECUTING);
-      }
-    } catch (ModificationNotAllowedException ex) {
-      LOG.trace("Contract creation error: illegal modification not allowed from private state");
-      frame.setState(MessageFrame.State.EXCEPTIONAL_HALT);
-    }
-  }
-
-  @Override
-  protected void codeSuccess(final MessageFrame frame, final OperationTracer operationTracer) {
-    final Bytes contractCode = frame.getOutputData();
-
-    final Gas depositFee = gasCalculator.codeDepositGasCost(contractCode.size());
-
-    if (frame.getRemainingGas().compareTo(depositFee) < 0) {
-      LOG.trace(
-          "Not enough gas to pay the code deposit fee for {}: "
-              + "remaining gas = {} < {} = deposit fee",
-          frame.getContractAddress(),
-          frame.getRemainingGas(),
-          depositFee);
-      if (requireCodeDepositToSucceed) {
-        LOG.trace("Contract creation error: insufficient funds for code deposit");
-        frame.setState(MessageFrame.State.EXCEPTIONAL_HALT);
-        operationTracer.traceAccountCreationResult(
-            frame, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-      } else {
-        frame.setState(MessageFrame.State.COMPLETED_SUCCESS);
-      }
-    } else {
-      if (contractValidationRules.stream().allMatch(rule -> rule.validate(frame))) {
-        frame.decrementRemainingGas(depositFee);
-
-        // Finalize contract creation, setting the contract code.
-        final MutableAccount contract =
-            frame.getWorldState().getOrCreate(frame.getContractAddress()).getMutable();
-        contract.setCode(contractCode);
-        contract.setVersion(accountVersion);
-        LOG.trace(
-            "Successful creation of contract {} with code of size {} (Gas remaining: {})",
-            frame.getContractAddress(),
-            contractCode.size(),
-            frame.getRemainingGas());
-        frame.setState(MessageFrame.State.COMPLETED_SUCCESS);
-      } else {
-        frame.setState(MessageFrame.State.EXCEPTIONAL_HALT);
-        operationTracer.traceAccountCreationResult(
-            frame, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-      }
-    }
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetDifficultyCalculators.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetDifficultyCalculators.java
index c341319e20f..46f0a05e5dc 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetDifficultyCalculators.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetDifficultyCalculators.java
@@ -14,13 +14,12 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Quantity;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.plugin.data.Quantity;
 
 import java.math.BigInteger;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.primitives.Ints;
 
 /** Provides the various difficultly calculates used on mainnet hard forks. */
@@ -39,10 +38,13 @@ public abstract class MainnetDifficultyCalculators {
   private static final long BYZANTIUM_FAKE_BLOCK_OFFSET = 2_999_999L;
   private static final long CONSTANTINOPLE_FAKE_BLOCK_OFFSET = 4_999_999L;
   private static final long MUIR_GLACIER_FAKE_BLOCK_OFFSET = 8_999_999L;
+  private static final long LONDON_FAKE_BLOCK_OFFSET = 9_699_999L;
+  private static final long ARROW_GLACIER_FAKE_BLOCK_OFFSET = 10_699_999L;
+  private static final long GRAY_GLACIER_FAKE_BLOCK_OFFSET = 11_399_999L;
 
   private MainnetDifficultyCalculators() {}
 
-  public static DifficultyCalculator FRONTIER =
+  static final DifficultyCalculator FRONTIER =
       (time, parent, protocolContext) -> {
         final BigInteger parentDifficulty = difficulty(parent.getDifficulty());
         final BigInteger adjust = parentDifficulty.divide(DIFFICULTY_BOUND_DIVISOR);
@@ -57,7 +59,7 @@ private MainnetDifficultyCalculators() {}
         return periodCount > 1 ? adjustForPeriod(periodCount, difficulty) : difficulty;
       };
 
-  public static DifficultyCalculator HOMESTEAD =
+  static final DifficultyCalculator HOMESTEAD =
       (time, parent, protocolContext) -> {
         final BigInteger parentDifficulty = difficulty(parent.getDifficulty());
         final BigInteger difficulty =
@@ -69,19 +71,37 @@ private MainnetDifficultyCalculators() {}
         return periodCount > 1 ? adjustForPeriod(periodCount, difficulty) : difficulty;
       };
 
-  @VisibleForTesting
-  public static DifficultyCalculator BYZANTIUM =
+  static final DifficultyCalculator BYZANTIUM =
       (time, parent, protocolContext) ->
           calculateThawedDifficulty(time, parent, BYZANTIUM_FAKE_BLOCK_OFFSET);
 
-  static DifficultyCalculator CONSTANTINOPLE =
+  static final DifficultyCalculator CONSTANTINOPLE =
       (time, parent, protocolContext) ->
           calculateThawedDifficulty(time, parent, CONSTANTINOPLE_FAKE_BLOCK_OFFSET);
 
-  static DifficultyCalculator MUIR_GLACIER =
+  static final DifficultyCalculator MUIR_GLACIER =
       (time, parent, protocolContext) ->
           calculateThawedDifficulty(time, parent, MUIR_GLACIER_FAKE_BLOCK_OFFSET);
 
+  // As per https://eips.ethereum.org/EIPS/eip-3554
+  static final DifficultyCalculator LONDON =
+      (time, parent, protocolContext) ->
+          calculateThawedDifficulty(time, parent, LONDON_FAKE_BLOCK_OFFSET);
+
+  // As per https://eips.ethereum.org/EIPS/eip-4345
+  static final DifficultyCalculator ARROW_GLACIER =
+      (time, parent, protocolContext) ->
+          calculateThawedDifficulty(time, parent, ARROW_GLACIER_FAKE_BLOCK_OFFSET);
+
+  // As per https://eips.ethereum.org/EIPS/eip-5133
+  static final DifficultyCalculator GRAY_GLACIER =
+      (time, parent, protocolContext) ->
+          calculateThawedDifficulty(time, parent, GRAY_GLACIER_FAKE_BLOCK_OFFSET);
+
+  // Proof-of-Stake difficulty must not be altered
+  static final DifficultyCalculator PROOF_OF_STAKE_DIFFICULTY =
+      (time, parent, protocolContext) -> BigInteger.ZERO;
+
   private static BigInteger calculateThawedDifficulty(
       final long time, final BlockHeader parent, final long fakeBlockOffset) {
     final BigInteger parentDifficulty = difficulty(parent.getDifficulty());
@@ -126,6 +146,6 @@ private static BigInteger ensureMinimumDifficulty(final BigInteger difficulty) {
   }
 
   private static BigInteger difficulty(final Quantity value) {
-    return (BigInteger) value.getValue();
+    return value.getAsBigInteger();
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetEvmRegistries.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetEvmRegistries.java
deleted file mode 100644
index 789b8cc2e13..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetEvmRegistries.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.OperationRegistry;
-import org.hyperledger.besu.ethereum.vm.operations.AddModOperation;
-import org.hyperledger.besu.ethereum.vm.operations.AddOperation;
-import org.hyperledger.besu.ethereum.vm.operations.AddressOperation;
-import org.hyperledger.besu.ethereum.vm.operations.AndOperation;
-import org.hyperledger.besu.ethereum.vm.operations.BalanceOperation;
-import org.hyperledger.besu.ethereum.vm.operations.BeginSubOperation;
-import org.hyperledger.besu.ethereum.vm.operations.BlockHashOperation;
-import org.hyperledger.besu.ethereum.vm.operations.ByteOperation;
-import org.hyperledger.besu.ethereum.vm.operations.CallCodeOperation;
-import org.hyperledger.besu.ethereum.vm.operations.CallDataCopyOperation;
-import org.hyperledger.besu.ethereum.vm.operations.CallDataLoadOperation;
-import org.hyperledger.besu.ethereum.vm.operations.CallDataSizeOperation;
-import org.hyperledger.besu.ethereum.vm.operations.CallOperation;
-import org.hyperledger.besu.ethereum.vm.operations.CallValueOperation;
-import org.hyperledger.besu.ethereum.vm.operations.CallerOperation;
-import org.hyperledger.besu.ethereum.vm.operations.ChainIdOperation;
-import org.hyperledger.besu.ethereum.vm.operations.CodeCopyOperation;
-import org.hyperledger.besu.ethereum.vm.operations.CodeSizeOperation;
-import org.hyperledger.besu.ethereum.vm.operations.CoinbaseOperation;
-import org.hyperledger.besu.ethereum.vm.operations.Create2Operation;
-import org.hyperledger.besu.ethereum.vm.operations.CreateOperation;
-import org.hyperledger.besu.ethereum.vm.operations.DelegateCallOperation;
-import org.hyperledger.besu.ethereum.vm.operations.DifficultyOperation;
-import org.hyperledger.besu.ethereum.vm.operations.DivOperation;
-import org.hyperledger.besu.ethereum.vm.operations.DupOperation;
-import org.hyperledger.besu.ethereum.vm.operations.EqOperation;
-import org.hyperledger.besu.ethereum.vm.operations.ExpOperation;
-import org.hyperledger.besu.ethereum.vm.operations.ExtCodeCopyOperation;
-import org.hyperledger.besu.ethereum.vm.operations.ExtCodeHashOperation;
-import org.hyperledger.besu.ethereum.vm.operations.ExtCodeSizeOperation;
-import org.hyperledger.besu.ethereum.vm.operations.GasLimitOperation;
-import org.hyperledger.besu.ethereum.vm.operations.GasOperation;
-import org.hyperledger.besu.ethereum.vm.operations.GasPriceOperation;
-import org.hyperledger.besu.ethereum.vm.operations.GtOperation;
-import org.hyperledger.besu.ethereum.vm.operations.InvalidOperation;
-import org.hyperledger.besu.ethereum.vm.operations.IsZeroOperation;
-import org.hyperledger.besu.ethereum.vm.operations.JumpDestOperation;
-import org.hyperledger.besu.ethereum.vm.operations.JumpOperation;
-import org.hyperledger.besu.ethereum.vm.operations.JumpSubOperation;
-import org.hyperledger.besu.ethereum.vm.operations.JumpiOperation;
-import org.hyperledger.besu.ethereum.vm.operations.LogOperation;
-import org.hyperledger.besu.ethereum.vm.operations.LtOperation;
-import org.hyperledger.besu.ethereum.vm.operations.MLoadOperation;
-import org.hyperledger.besu.ethereum.vm.operations.MSizeOperation;
-import org.hyperledger.besu.ethereum.vm.operations.MStore8Operation;
-import org.hyperledger.besu.ethereum.vm.operations.MStoreOperation;
-import org.hyperledger.besu.ethereum.vm.operations.ModOperation;
-import org.hyperledger.besu.ethereum.vm.operations.MulModOperation;
-import org.hyperledger.besu.ethereum.vm.operations.MulOperation;
-import org.hyperledger.besu.ethereum.vm.operations.NotOperation;
-import org.hyperledger.besu.ethereum.vm.operations.NumberOperation;
-import org.hyperledger.besu.ethereum.vm.operations.OrOperation;
-import org.hyperledger.besu.ethereum.vm.operations.OriginOperation;
-import org.hyperledger.besu.ethereum.vm.operations.PCOperation;
-import org.hyperledger.besu.ethereum.vm.operations.PopOperation;
-import org.hyperledger.besu.ethereum.vm.operations.PushOperation;
-import org.hyperledger.besu.ethereum.vm.operations.ReturnDataCopyOperation;
-import org.hyperledger.besu.ethereum.vm.operations.ReturnDataSizeOperation;
-import org.hyperledger.besu.ethereum.vm.operations.ReturnOperation;
-import org.hyperledger.besu.ethereum.vm.operations.ReturnSubOperation;
-import org.hyperledger.besu.ethereum.vm.operations.RevertOperation;
-import org.hyperledger.besu.ethereum.vm.operations.SDivOperation;
-import org.hyperledger.besu.ethereum.vm.operations.SGtOperation;
-import org.hyperledger.besu.ethereum.vm.operations.SLoadOperation;
-import org.hyperledger.besu.ethereum.vm.operations.SLtOperation;
-import org.hyperledger.besu.ethereum.vm.operations.SModOperation;
-import org.hyperledger.besu.ethereum.vm.operations.SStoreOperation;
-import org.hyperledger.besu.ethereum.vm.operations.SarOperation;
-import org.hyperledger.besu.ethereum.vm.operations.SelfBalanceOperation;
-import org.hyperledger.besu.ethereum.vm.operations.SelfDestructOperation;
-import org.hyperledger.besu.ethereum.vm.operations.Sha3Operation;
-import org.hyperledger.besu.ethereum.vm.operations.ShlOperation;
-import org.hyperledger.besu.ethereum.vm.operations.ShrOperation;
-import org.hyperledger.besu.ethereum.vm.operations.SignExtendOperation;
-import org.hyperledger.besu.ethereum.vm.operations.StaticCallOperation;
-import org.hyperledger.besu.ethereum.vm.operations.StopOperation;
-import org.hyperledger.besu.ethereum.vm.operations.SubOperation;
-import org.hyperledger.besu.ethereum.vm.operations.SwapOperation;
-import org.hyperledger.besu.ethereum.vm.operations.TimestampOperation;
-import org.hyperledger.besu.ethereum.vm.operations.XorOperation;
-
-import java.math.BigInteger;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-
-/** Provides EVMs supporting the appropriate operations for mainnet hard forks. */
-abstract class MainnetEvmRegistries {
-
-  static EVM frontier(final GasCalculator gasCalculator) {
-    final OperationRegistry registry = new OperationRegistry();
-
-    registerFrontierOpcodes(registry, gasCalculator, Account.DEFAULT_VERSION);
-
-    return new EVM(registry, gasCalculator);
-  }
-
-  static EVM homestead(final GasCalculator gasCalculator) {
-    final OperationRegistry registry = new OperationRegistry();
-
-    registerHomesteadOpcodes(registry, gasCalculator, Account.DEFAULT_VERSION);
-
-    return new EVM(registry, gasCalculator);
-  }
-
-  static EVM byzantium(final GasCalculator gasCalculator) {
-    final OperationRegistry registry = new OperationRegistry();
-
-    registerByzantiumOpcodes(registry, gasCalculator, Account.DEFAULT_VERSION);
-
-    return new EVM(registry, gasCalculator);
-  }
-
-  static EVM constantinople(final GasCalculator gasCalculator) {
-    final OperationRegistry registry = new OperationRegistry();
-
-    registerConstantinopleOpcodes(registry, gasCalculator, Account.DEFAULT_VERSION);
-
-    return new EVM(registry, gasCalculator);
-  }
-
-  static EVM istanbul(final GasCalculator gasCalculator, final BigInteger chainId) {
-    final OperationRegistry registry = new OperationRegistry();
-
-    registerIstanbulOpcodes(registry, gasCalculator, Account.DEFAULT_VERSION, chainId);
-
-    return new EVM(registry, gasCalculator);
-  }
-
-  static EVM berlin(final GasCalculator gasCalculator, final BigInteger chainId) {
-    final OperationRegistry registry = new OperationRegistry();
-
-    registerBerlinOpcodes(registry, gasCalculator, Account.DEFAULT_VERSION, chainId);
-
-    return new EVM(registry, gasCalculator);
-  }
-
-  private static void registerFrontierOpcodes(
-      final OperationRegistry registry,
-      final GasCalculator gasCalculator,
-      final int accountVersion) {
-    registry.put(new AddOperation(gasCalculator), accountVersion);
-    registry.put(new AddOperation(gasCalculator), accountVersion);
-    registry.put(new MulOperation(gasCalculator), accountVersion);
-    registry.put(new SubOperation(gasCalculator), accountVersion);
-    registry.put(new DivOperation(gasCalculator), accountVersion);
-    registry.put(new SDivOperation(gasCalculator), accountVersion);
-    registry.put(new ModOperation(gasCalculator), accountVersion);
-    registry.put(new SModOperation(gasCalculator), accountVersion);
-    registry.put(new ExpOperation(gasCalculator), accountVersion);
-    registry.put(new AddModOperation(gasCalculator), accountVersion);
-    registry.put(new MulModOperation(gasCalculator), accountVersion);
-    registry.put(new SignExtendOperation(gasCalculator), accountVersion);
-    registry.put(new LtOperation(gasCalculator), accountVersion);
-    registry.put(new GtOperation(gasCalculator), accountVersion);
-    registry.put(new SLtOperation(gasCalculator), accountVersion);
-    registry.put(new SGtOperation(gasCalculator), accountVersion);
-    registry.put(new EqOperation(gasCalculator), accountVersion);
-    registry.put(new IsZeroOperation(gasCalculator), accountVersion);
-    registry.put(new AndOperation(gasCalculator), accountVersion);
-    registry.put(new OrOperation(gasCalculator), accountVersion);
-    registry.put(new XorOperation(gasCalculator), accountVersion);
-    registry.put(new NotOperation(gasCalculator), accountVersion);
-    registry.put(new ByteOperation(gasCalculator), accountVersion);
-    registry.put(new Sha3Operation(gasCalculator), accountVersion);
-    registry.put(new AddressOperation(gasCalculator), accountVersion);
-    registry.put(new BalanceOperation(gasCalculator), accountVersion);
-    registry.put(new OriginOperation(gasCalculator), accountVersion);
-    registry.put(new CallerOperation(gasCalculator), accountVersion);
-    registry.put(new CallValueOperation(gasCalculator), accountVersion);
-    registry.put(new CallDataLoadOperation(gasCalculator), accountVersion);
-    registry.put(new CallDataSizeOperation(gasCalculator), accountVersion);
-    registry.put(new CallDataCopyOperation(gasCalculator), accountVersion);
-    registry.put(new CodeSizeOperation(gasCalculator), accountVersion);
-    registry.put(new CodeCopyOperation(gasCalculator), accountVersion);
-    registry.put(new GasPriceOperation(gasCalculator), accountVersion);
-    registry.put(new ExtCodeCopyOperation(gasCalculator), accountVersion);
-    registry.put(new ExtCodeSizeOperation(gasCalculator), accountVersion);
-    registry.put(new BlockHashOperation(gasCalculator), accountVersion);
-    registry.put(new CoinbaseOperation(gasCalculator), accountVersion);
-    registry.put(new TimestampOperation(gasCalculator), accountVersion);
-    registry.put(new NumberOperation(gasCalculator), accountVersion);
-    registry.put(new DifficultyOperation(gasCalculator), accountVersion);
-    registry.put(new GasLimitOperation(gasCalculator), accountVersion);
-    registry.put(new PopOperation(gasCalculator), accountVersion);
-    registry.put(new MLoadOperation(gasCalculator), accountVersion);
-    registry.put(new MStoreOperation(gasCalculator), accountVersion);
-    registry.put(new MStore8Operation(gasCalculator), accountVersion);
-    registry.put(new SLoadOperation(gasCalculator), accountVersion);
-    registry.put(
-        new SStoreOperation(gasCalculator, SStoreOperation.FRONTIER_MINIMUM), accountVersion);
-    registry.put(new JumpOperation(gasCalculator), accountVersion);
-    registry.put(new JumpiOperation(gasCalculator), accountVersion);
-    registry.put(new PCOperation(gasCalculator), accountVersion);
-    registry.put(new MSizeOperation(gasCalculator), accountVersion);
-    registry.put(new GasOperation(gasCalculator), accountVersion);
-    registry.put(new JumpDestOperation(gasCalculator), accountVersion);
-    registry.put(new ReturnOperation(gasCalculator), accountVersion);
-    registry.put(new InvalidOperation(gasCalculator), accountVersion);
-    registry.put(new StopOperation(gasCalculator), accountVersion);
-    registry.put(new SelfDestructOperation(gasCalculator), accountVersion);
-    registry.put(new CreateOperation(gasCalculator), accountVersion);
-    registry.put(new CallOperation(gasCalculator), accountVersion);
-    registry.put(new CallCodeOperation(gasCalculator), accountVersion);
-
-    // Register the PUSH1, PUSH2, ..., PUSH32 operations.
-    for (int i = 1; i <= 32; ++i) {
-      registry.put(new PushOperation(i, gasCalculator), accountVersion);
-    }
-
-    // Register the DUP1, DUP2, ..., DUP16 operations.
-    for (int i = 1; i <= 16; ++i) {
-      registry.put(new DupOperation(i, gasCalculator), accountVersion);
-    }
-
-    // Register the SWAP1, SWAP2, ..., SWAP16 operations.
-    for (int i = 1; i <= 16; ++i) {
-      registry.put(new SwapOperation(i, gasCalculator), accountVersion);
-    }
-
-    // Register the LOG0, LOG1, ..., LOG4 operations.
-    for (int i = 0; i < 5; ++i) {
-      registry.put(new LogOperation(i, gasCalculator), accountVersion);
-    }
-  }
-
-  private static void registerHomesteadOpcodes(
-      final OperationRegistry registry,
-      final GasCalculator gasCalculator,
-      final int accountVersion) {
-    registerFrontierOpcodes(registry, gasCalculator, accountVersion);
-    registry.put(new DelegateCallOperation(gasCalculator), accountVersion);
-  }
-
-  private static void registerByzantiumOpcodes(
-      final OperationRegistry registry,
-      final GasCalculator gasCalculator,
-      final int accountVersion) {
-    registerHomesteadOpcodes(registry, gasCalculator, accountVersion);
-    registry.put(new ReturnDataCopyOperation(gasCalculator), accountVersion);
-    registry.put(new ReturnDataSizeOperation(gasCalculator), accountVersion);
-    registry.put(new RevertOperation(gasCalculator), accountVersion);
-    registry.put(new StaticCallOperation(gasCalculator), accountVersion);
-  }
-
-  private static void registerConstantinopleOpcodes(
-      final OperationRegistry registry,
-      final GasCalculator gasCalculator,
-      final int accountVersion) {
-    registerByzantiumOpcodes(registry, gasCalculator, accountVersion);
-    registry.put(new Create2Operation(gasCalculator), accountVersion);
-    registry.put(new SarOperation(gasCalculator), accountVersion);
-    registry.put(new ShlOperation(gasCalculator), accountVersion);
-    registry.put(new ShrOperation(gasCalculator), accountVersion);
-    registry.put(new ExtCodeHashOperation(gasCalculator), accountVersion);
-  }
-
-  private static void registerIstanbulOpcodes(
-      final OperationRegistry registry,
-      final GasCalculator gasCalculator,
-      final int accountVersion,
-      final BigInteger chainId) {
-    registerConstantinopleOpcodes(registry, gasCalculator, accountVersion);
-    registry.put(
-        new ChainIdOperation(gasCalculator, Bytes32.leftPad(Bytes.of(chainId.toByteArray()))),
-        Account.DEFAULT_VERSION);
-    registry.put(new SelfBalanceOperation(gasCalculator), Account.DEFAULT_VERSION);
-    registry.put(
-        new SStoreOperation(gasCalculator, SStoreOperation.EIP_1706_MINIMUM),
-        Account.DEFAULT_VERSION);
-  }
-
-  private static void registerBerlinOpcodes(
-      final OperationRegistry registry,
-      final GasCalculator gasCalculator,
-      final int accountVersion,
-      final BigInteger chainId) {
-    registerIstanbulOpcodes(registry, gasCalculator, accountVersion, chainId);
-    registry.put(new BeginSubOperation(gasCalculator), accountVersion);
-    registry.put(new JumpSubOperation(gasCalculator), accountVersion);
-    registry.put(new ReturnSubOperation(gasCalculator), accountVersion);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetMessageCallProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetMessageCallProcessor.java
deleted file mode 100644
index 1c87b7ba5ee..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetMessageCallProcessor.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.ModificationNotAllowedException;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.OperationTracer;
-
-import java.util.Collection;
-
-import com.google.common.collect.ImmutableSet;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-
-public class MainnetMessageCallProcessor extends AbstractMessageProcessor {
-  private static final Logger LOG = LogManager.getLogger();
-
-  private final PrecompileContractRegistry precompiles;
-
-  public MainnetMessageCallProcessor(
-      final EVM evm,
-      final PrecompileContractRegistry precompiles,
-      final Collection<Address> forceCommitAddresses) {
-    super(evm, forceCommitAddresses);
-    this.precompiles = precompiles;
-  }
-
-  public MainnetMessageCallProcessor(final EVM evm, final PrecompileContractRegistry precompiles) {
-    super(evm, ImmutableSet.of());
-    this.precompiles = precompiles;
-  }
-
-  @Override
-  public void start(final MessageFrame frame, final OperationTracer operationTracer) {
-    LOG.trace("Executing message-call");
-    try {
-      transferValue(frame);
-
-      // Check first if the message call is to a pre-compile contract
-      final PrecompiledContract precompile =
-          precompiles.get(frame.getContractAddress(), frame.getContractAccountVersion());
-      if (precompile != null) {
-        executePrecompile(precompile, frame, operationTracer);
-      } else {
-        frame.setState(MessageFrame.State.CODE_EXECUTING);
-      }
-    } catch (ModificationNotAllowedException ex) {
-      LOG.trace("Message call error: illegal modification not allowed from private state");
-      frame.setState(MessageFrame.State.EXCEPTIONAL_HALT);
-    }
-  }
-
-  @Override
-  protected void codeSuccess(final MessageFrame frame, final OperationTracer operationTracer) {
-    LOG.trace(
-        "Successful message call of {} to {} (Gas remaining: {})",
-        frame.getSenderAddress(),
-        frame.getRecipientAddress(),
-        frame.getRemainingGas());
-    frame.setState(MessageFrame.State.COMPLETED_SUCCESS);
-  }
-
-  /**
-   * Transfers the message call value from the sender to the recipient.
-   *
-   * <p>Assumes that the transaction has been validated so that the sender has the required fund as
-   * of the world state of this executor.
-   */
-  private void transferValue(final MessageFrame frame) {
-    final MutableAccount senderAccount =
-        frame.getWorldState().getAccount(frame.getSenderAddress()).getMutable();
-    // The yellow paper explicitly states that if the recipient account doesn't exist at this
-    // point, it is created.
-    final MutableAccount recipientAccount =
-        frame.getWorldState().getOrCreate(frame.getRecipientAddress()).getMutable();
-
-    if (frame.getRecipientAddress().equals(frame.getSenderAddress())) {
-      LOG.trace("Message call of {} to itself: no fund transferred", frame.getSenderAddress());
-    } else {
-      final Wei prevSenderBalance = senderAccount.decrementBalance(frame.getValue());
-      final Wei prevRecipientBalance = recipientAccount.incrementBalance(frame.getValue());
-
-      LOG.trace(
-          "Transferred value {} for message call from {} ({} -> {}) to {} ({} -> {})",
-          frame.getValue(),
-          frame.getSenderAddress(),
-          prevSenderBalance,
-          senderAccount.getBalance(),
-          frame.getRecipientAddress(),
-          prevRecipientBalance,
-          recipientAccount.getBalance());
-    }
-  }
-
-  /**
-   * Executes this message call knowing that it is a call to the provide pre-compiled contract.
-   *
-   * @param contract The contract this is a message call to.
-   */
-  private void executePrecompile(
-      final PrecompiledContract contract,
-      final MessageFrame frame,
-      final OperationTracer operationTracer) {
-    final Gas gasRequirement = contract.gasRequirement(frame.getInputData());
-    if (frame.getRemainingGas().compareTo(gasRequirement) < 0) {
-      LOG.trace(
-          "Not enough gas available for pre-compiled contract code {}: requiring "
-              + "{} but only {} gas available",
-          contract,
-          gasRequirement,
-          frame.getRemainingGas());
-      frame.setState(MessageFrame.State.EXCEPTIONAL_HALT);
-    } else {
-      frame.decrementRemainingGas(gasRequirement);
-      final Bytes output = contract.compute(frame.getInputData(), frame);
-      operationTracer.tracePrecompileCall(frame, gasRequirement, output);
-      if (output != null) {
-        if (contract.getName().equals("Privacy") || contract.getName().equals("OnChainPrivacy")) {
-          // do not decrement the gas requirement for a privacy pre-compile contract call -> leads
-          // to discrepancies in receipts root between public and private nodes in a network.
-          frame.incrementRemainingGas(gasRequirement);
-          frame.setState(MessageFrame.State.CODE_EXECUTING);
-          return;
-        }
-        frame.setOutputData(output);
-        LOG.trace(
-            "Precompiled contract {}  successfully executed (gas consumed: {})",
-            contract.getName(),
-            gasRequirement);
-        frame.setState(MessageFrame.State.COMPLETED_SUCCESS);
-      } else {
-        LOG.trace("Precompiled contract  {} failed (gas consumed: {})", contract, gasRequirement);
-        frame.setState(MessageFrame.State.EXCEPTIONAL_HALT);
-      }
-    }
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java
index b492b225e38..a70e20cf243 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistries.java
@@ -14,173 +14,83 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.AltBN128AddPrecompiledContract;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.AltBN128MulPrecompiledContract;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.AltBN128PairingPrecompiledContract;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.BLAKE2BFPrecompileContract;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.BLS12G1AddPrecompiledContract;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.BLS12G1MulPrecompiledContract;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.BLS12G1MultiExpPrecompiledContract;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.BLS12G2AddPrecompiledContract;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.BLS12G2MulPrecompiledContract;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.BLS12G2MultiExpPrecompiledContract;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.BLS12MapFp2ToG2PrecompiledContract;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.BLS12MapFpToG1PrecompiledContract;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.BLS12PairingPrecompiledContract;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.BigIntegerModularExponentiationPrecompiledContract;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.ECRECPrecompiledContract;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.IDPrecompiledContract;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.RIPEMD160PrecompiledContract;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.SHA256PrecompiledContract;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.privacy.OnChainPrivacyPrecompiledContract;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.DEFAULT_PRIVACY;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.PLUGIN_PRIVACY;
+import static org.hyperledger.besu.evm.precompile.MainnetPrecompiledContracts.populateForByzantium;
+import static org.hyperledger.besu.evm.precompile.MainnetPrecompiledContracts.populateForCancun;
+import static org.hyperledger.besu.evm.precompile.MainnetPrecompiledContracts.populateForFrontier;
+import static org.hyperledger.besu.evm.precompile.MainnetPrecompiledContracts.populateForFutureEIPs;
+import static org.hyperledger.besu.evm.precompile.MainnetPrecompiledContracts.populateForIstanbul;
+
+import org.hyperledger.besu.ethereum.mainnet.precompiles.privacy.FlexiblePrivacyPrecompiledContract;
+import org.hyperledger.besu.ethereum.mainnet.precompiles.privacy.PrivacyPluginPrecompiledContract;
 import org.hyperledger.besu.ethereum.mainnet.precompiles.privacy.PrivacyPrecompiledContract;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
+import org.hyperledger.besu.evm.precompile.PrecompileContractRegistry;
 
 /** Provides the various precompiled contracts used on mainnet hard forks. */
-public abstract class MainnetPrecompiledContractRegistries {
-
-  private MainnetPrecompiledContractRegistries() {}
-
-  private static void populateForFrontier(
-      final PrecompileContractRegistry registry,
-      final GasCalculator gasCalculator,
-      final int accountVersion) {
-    registry.put(Address.ECREC, accountVersion, new ECRECPrecompiledContract(gasCalculator));
-    registry.put(Address.SHA256, accountVersion, new SHA256PrecompiledContract(gasCalculator));
-    registry.put(
-        Address.RIPEMD160, accountVersion, new RIPEMD160PrecompiledContract(gasCalculator));
-    registry.put(Address.ID, accountVersion, new IDPrecompiledContract(gasCalculator));
-  }
+public interface MainnetPrecompiledContractRegistries {
 
-  public static PrecompileContractRegistry frontier(
+  static PrecompileContractRegistry frontier(
       final PrecompiledContractConfiguration precompiledContractConfiguration) {
     final PrecompileContractRegistry registry = new PrecompileContractRegistry();
-    populateForFrontier(
-        registry, precompiledContractConfiguration.getGasCalculator(), Account.DEFAULT_VERSION);
+    populateForFrontier(registry, precompiledContractConfiguration.getGasCalculator());
     return registry;
   }
 
-  private static void populateForByzantium(
-      final PrecompileContractRegistry registry,
-      final GasCalculator gasCalculator,
-      final int accountVersion) {
-    populateForFrontier(registry, gasCalculator, accountVersion);
-    registry.put(
-        Address.MODEXP,
-        accountVersion,
-        new BigIntegerModularExponentiationPrecompiledContract(gasCalculator));
-    registry.put(
-        Address.ALTBN128_ADD,
-        accountVersion,
-        AltBN128AddPrecompiledContract.byzantium(gasCalculator));
-    registry.put(
-        Address.ALTBN128_MUL,
-        accountVersion,
-        AltBN128MulPrecompiledContract.byzantium(gasCalculator));
-    registry.put(
-        Address.ALTBN128_PAIRING,
-        accountVersion,
-        AltBN128PairingPrecompiledContract.byzantium(gasCalculator));
-  }
-
-  public static PrecompileContractRegistry byzantium(
+  static PrecompileContractRegistry byzantium(
       final PrecompiledContractConfiguration precompiledContractConfiguration) {
     final PrecompileContractRegistry registry = new PrecompileContractRegistry();
-    populateForByzantium(
-        registry, precompiledContractConfiguration.getGasCalculator(), Account.DEFAULT_VERSION);
+    populateForByzantium(registry, precompiledContractConfiguration.getGasCalculator());
     return registry;
   }
 
-  private static void populateForIstanbul(
-      final PrecompileContractRegistry registry,
-      final GasCalculator gasCalculator,
-      final int accountVersion) {
-    populateForByzantium(registry, gasCalculator, accountVersion);
-    registry.put(
-        Address.ALTBN128_ADD,
-        Account.DEFAULT_VERSION,
-        AltBN128AddPrecompiledContract.istanbul(gasCalculator));
-    registry.put(
-        Address.ALTBN128_MUL,
-        Account.DEFAULT_VERSION,
-        AltBN128MulPrecompiledContract.istanbul(gasCalculator));
-    registry.put(
-        Address.ALTBN128_PAIRING,
-        Account.DEFAULT_VERSION,
-        AltBN128PairingPrecompiledContract.istanbul(gasCalculator));
-    registry.put(
-        Address.BLAKE2B_F_COMPRESSION,
-        Account.DEFAULT_VERSION,
-        new BLAKE2BFPrecompileContract(gasCalculator));
-  }
-
-  public static PrecompileContractRegistry istanbul(
+  static PrecompileContractRegistry istanbul(
       final PrecompiledContractConfiguration precompiledContractConfiguration) {
     final PrecompileContractRegistry registry = new PrecompileContractRegistry();
-    populateForIstanbul(
-        registry, precompiledContractConfiguration.getGasCalculator(), Account.DEFAULT_VERSION);
+    populateForIstanbul(registry, precompiledContractConfiguration.getGasCalculator());
     return registry;
   }
 
-  private static void populateForBerlin(
-      final PrecompileContractRegistry registry,
-      final GasCalculator gasCalculator,
-      final int accountVersion) {
-    populateForIstanbul(registry, gasCalculator, accountVersion);
-    registry.put(Address.BLS12_G1ADD, Account.DEFAULT_VERSION, new BLS12G1AddPrecompiledContract());
-    registry.put(Address.BLS12_G1MUL, Account.DEFAULT_VERSION, new BLS12G1MulPrecompiledContract());
-    registry.put(
-        Address.BLS12_G1MULTIEXP,
-        Account.DEFAULT_VERSION,
-        new BLS12G1MultiExpPrecompiledContract());
-    registry.put(Address.BLS12_G2ADD, Account.DEFAULT_VERSION, new BLS12G2AddPrecompiledContract());
-    registry.put(Address.BLS12_G2MUL, Account.DEFAULT_VERSION, new BLS12G2MulPrecompiledContract());
-    registry.put(
-        Address.BLS12_G2MULTIEXP,
-        Account.DEFAULT_VERSION,
-        new BLS12G2MultiExpPrecompiledContract());
-    registry.put(
-        Address.BLS12_PAIRING, Account.DEFAULT_VERSION, new BLS12PairingPrecompiledContract());
-    registry.put(
-        Address.BLS12_MAP_FP_TO_G1,
-        Account.DEFAULT_VERSION,
-        new BLS12MapFpToG1PrecompiledContract());
-    registry.put(
-        Address.BLS12_MAP_FP2_TO_G2,
-        Account.DEFAULT_VERSION,
-        new BLS12MapFp2ToG2PrecompiledContract());
+  static PrecompileContractRegistry cancun(
+      final PrecompiledContractConfiguration precompiledContractConfiguration) {
+    final PrecompileContractRegistry registry = new PrecompileContractRegistry();
+    populateForCancun(registry, precompiledContractConfiguration.getGasCalculator());
+    return registry;
   }
 
-  public static PrecompileContractRegistry berlin(
+  static PrecompileContractRegistry futureEips(
       final PrecompiledContractConfiguration precompiledContractConfiguration) {
     final PrecompileContractRegistry registry = new PrecompileContractRegistry();
-    populateForBerlin(
-        registry, precompiledContractConfiguration.getGasCalculator(), Account.DEFAULT_VERSION);
+    populateForFutureEIPs(registry, precompiledContractConfiguration.getGasCalculator());
     return registry;
   }
 
   static void appendPrivacy(
       final PrecompileContractRegistry registry,
-      final PrecompiledContractConfiguration precompiledContractConfiguration,
-      final int accountVersion) {
+      final PrecompiledContractConfiguration precompiledContractConfiguration) {
 
     if (!precompiledContractConfiguration.getPrivacyParameters().isEnabled()) {
       return;
     }
 
-    if (precompiledContractConfiguration.getPrivacyParameters().isOnchainPrivacyGroupsEnabled()) {
+    if (precompiledContractConfiguration.getPrivacyParameters().isPrivacyPluginEnabled()) {
+      registry.put(
+          PLUGIN_PRIVACY,
+          new PrivacyPluginPrecompiledContract(
+              precompiledContractConfiguration.getGasCalculator(),
+              precompiledContractConfiguration.getPrivacyParameters()));
+    } else if (precompiledContractConfiguration
+        .getPrivacyParameters()
+        .isFlexiblePrivacyGroupsEnabled()) {
       registry.put(
-          Address.ONCHAIN_PRIVACY,
-          accountVersion,
-          new OnChainPrivacyPrecompiledContract(
+          FLEXIBLE_PRIVACY,
+          new FlexiblePrivacyPrecompiledContract(
               precompiledContractConfiguration.getGasCalculator(),
               precompiledContractConfiguration.getPrivacyParameters()));
     } else {
       registry.put(
-          Address.DEFAULT_PRIVACY,
-          accountVersion,
+          DEFAULT_PRIVACY,
           new PrivacyPrecompiledContract(
               precompiledContractConfiguration.getGasCalculator(),
               precompiledContractConfiguration.getPrivacyParameters(),
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSchedule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSchedule.java
index 3fcc0eaf4a4..921a0a16dca 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSchedule.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSchedule.java
@@ -18,6 +18,7 @@
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.difficulty.fixed.FixedDifficultyCalculators;
 import org.hyperledger.besu.ethereum.difficulty.fixed.FixedDifficultyProtocolSchedule;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 
 import java.math.BigInteger;
 import java.util.function.Function;
@@ -34,23 +35,25 @@ public class MainnetProtocolSchedule {
    *     starting points
    * @param privacyParameters the parameters set for private transactions
    * @param isRevertReasonEnabled whether storing the revert reason is for failed transactions
+   * @param evmConfiguration how to configure the EVMs jumpdest cache
    * @return A configured mainnet protocol schedule
    */
   public static ProtocolSchedule fromConfig(
       final GenesisConfigOptions config,
       final PrivacyParameters privacyParameters,
-      final boolean isRevertReasonEnabled) {
+      final boolean isRevertReasonEnabled,
+      final EvmConfiguration evmConfiguration) {
     if (FixedDifficultyCalculators.isFixedDifficultyInConfig(config)) {
       return FixedDifficultyProtocolSchedule.create(
-          config, privacyParameters, isRevertReasonEnabled);
+          config, privacyParameters, isRevertReasonEnabled, evmConfiguration);
     }
     return new ProtocolScheduleBuilder(
             config,
             DEFAULT_CHAIN_ID,
-            Function.identity(),
+            ProtocolSpecAdapters.create(0, Function.identity()),
             privacyParameters,
             isRevertReasonEnabled,
-            config.isQuorum())
+            evmConfiguration)
         .createProtocolSchedule();
   }
 
@@ -60,11 +63,27 @@ public static ProtocolSchedule fromConfig(
    * @param config {@link GenesisConfigOptions} containing the config options for the milestone
    *     starting points
    * @param isRevertReasonEnabled whether storing the revert reason is for failed transactions
+   * @param evmConfiguration how to configure the EVMs jumpdest cache
    * @return A configured mainnet protocol schedule
    */
   public static ProtocolSchedule fromConfig(
-      final GenesisConfigOptions config, final boolean isRevertReasonEnabled) {
-    return fromConfig(config, PrivacyParameters.DEFAULT, isRevertReasonEnabled);
+      final GenesisConfigOptions config,
+      final boolean isRevertReasonEnabled,
+      final EvmConfiguration evmConfiguration) {
+    return fromConfig(config, PrivacyParameters.DEFAULT, isRevertReasonEnabled, evmConfiguration);
+  }
+
+  /**
+   * Create a Mainnet protocol schedule from a config object
+   *
+   * @param config {@link GenesisConfigOptions} containing the config options for the milestone
+   *     starting points
+   * @param evmConfiguration size of
+   * @return A configured mainnet protocol schedule
+   */
+  public static ProtocolSchedule fromConfig(
+      final GenesisConfigOptions config, final EvmConfiguration evmConfiguration) {
+    return fromConfig(config, PrivacyParameters.DEFAULT, false, evmConfiguration);
   }
 
   /**
@@ -75,6 +94,6 @@ public static ProtocolSchedule fromConfig(
    * @return A configured mainnet protocol schedule
    */
   public static ProtocolSchedule fromConfig(final GenesisConfigOptions config) {
-    return fromConfig(config, PrivacyParameters.DEFAULT, false);
+    return fromConfig(config, PrivacyParameters.DEFAULT, false, EvmConfiguration.DEFAULT);
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecFactory.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecFactory.java
new file mode 100644
index 00000000000..3a06d803980
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecFactory.java
@@ -0,0 +1,290 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet;
+
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+
+import java.math.BigInteger;
+import java.util.Optional;
+import java.util.OptionalInt;
+import java.util.OptionalLong;
+
+public class MainnetProtocolSpecFactory {
+
+  private final Optional<BigInteger> chainId;
+  private final OptionalInt contractSizeLimit;
+  private final OptionalInt evmStackSize;
+  private final boolean isRevertReasonEnabled;
+  private final OptionalLong ecip1017EraRounds;
+  private final EvmConfiguration evmConfiguration;
+
+  public MainnetProtocolSpecFactory(
+      final Optional<BigInteger> chainId,
+      final OptionalInt contractSizeLimit,
+      final OptionalInt evmStackSize,
+      final boolean isRevertReasonEnabled,
+      final OptionalLong ecip1017EraRounds,
+      final EvmConfiguration evmConfiguration) {
+    this.chainId = chainId;
+    this.contractSizeLimit = contractSizeLimit;
+    this.evmStackSize = evmStackSize;
+    this.isRevertReasonEnabled = isRevertReasonEnabled;
+    this.ecip1017EraRounds = ecip1017EraRounds;
+    this.evmConfiguration = evmConfiguration;
+  }
+
+  public ProtocolSpecBuilder frontierDefinition() {
+    return MainnetProtocolSpecs.frontierDefinition(
+        contractSizeLimit, evmStackSize, evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder homesteadDefinition() {
+    return MainnetProtocolSpecs.homesteadDefinition(
+        contractSizeLimit, evmStackSize, evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder daoRecoveryInitDefinition() {
+    return MainnetProtocolSpecs.daoRecoveryInitDefinition(
+        contractSizeLimit, evmStackSize, evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder daoRecoveryTransitionDefinition() {
+    return MainnetProtocolSpecs.daoRecoveryTransitionDefinition(
+        contractSizeLimit, evmStackSize, evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder tangerineWhistleDefinition() {
+    return MainnetProtocolSpecs.tangerineWhistleDefinition(
+        contractSizeLimit, evmStackSize, evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder spuriousDragonDefinition() {
+    return MainnetProtocolSpecs.spuriousDragonDefinition(
+        chainId, contractSizeLimit, evmStackSize, evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder byzantiumDefinition() {
+    return MainnetProtocolSpecs.byzantiumDefinition(
+        chainId, contractSizeLimit, evmStackSize, isRevertReasonEnabled, evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder constantinopleDefinition() {
+    return MainnetProtocolSpecs.constantinopleDefinition(
+        chainId, contractSizeLimit, evmStackSize, isRevertReasonEnabled, evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder petersburgDefinition() {
+    return MainnetProtocolSpecs.petersburgDefinition(
+        chainId, contractSizeLimit, evmStackSize, isRevertReasonEnabled, evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder istanbulDefinition() {
+    return MainnetProtocolSpecs.istanbulDefinition(
+        chainId, contractSizeLimit, evmStackSize, isRevertReasonEnabled, evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder muirGlacierDefinition() {
+    return MainnetProtocolSpecs.muirGlacierDefinition(
+        chainId, contractSizeLimit, evmStackSize, isRevertReasonEnabled, evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder berlinDefinition() {
+    return MainnetProtocolSpecs.berlinDefinition(
+        chainId, contractSizeLimit, evmStackSize, isRevertReasonEnabled, evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder londonDefinition(final GenesisConfigOptions genesisConfigOptions) {
+    return MainnetProtocolSpecs.londonDefinition(
+        chainId,
+        contractSizeLimit,
+        evmStackSize,
+        isRevertReasonEnabled,
+        genesisConfigOptions,
+        evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder arrowGlacierDefinition(
+      final GenesisConfigOptions genesisConfigOptions) {
+    return MainnetProtocolSpecs.arrowGlacierDefinition(
+        chainId,
+        contractSizeLimit,
+        evmStackSize,
+        isRevertReasonEnabled,
+        genesisConfigOptions,
+        evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder grayGlacierDefinition(
+      final GenesisConfigOptions genesisConfigOptions) {
+    return MainnetProtocolSpecs.grayGlacierDefinition(
+        chainId,
+        contractSizeLimit,
+        evmStackSize,
+        isRevertReasonEnabled,
+        genesisConfigOptions,
+        evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder parisDefinition(final GenesisConfigOptions genesisConfigOptions) {
+    return MainnetProtocolSpecs.parisDefinition(
+        chainId,
+        contractSizeLimit,
+        evmStackSize,
+        isRevertReasonEnabled,
+        genesisConfigOptions,
+        evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder shanghaiDefinition(final GenesisConfigOptions genesisConfigOptions) {
+    return MainnetProtocolSpecs.shanghaiDefinition(
+        chainId,
+        contractSizeLimit,
+        evmStackSize,
+        isRevertReasonEnabled,
+        genesisConfigOptions,
+        evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder cancunDefinition(final GenesisConfigOptions genesisConfigOptions) {
+    return MainnetProtocolSpecs.cancunDefinition(
+        chainId,
+        contractSizeLimit,
+        evmStackSize,
+        isRevertReasonEnabled,
+        genesisConfigOptions,
+        evmConfiguration);
+  }
+
+  /**
+   * The "future" fork consists of EIPs that have been approved for Ethereum Mainnet but not
+   * scheduled for a fork. This is also known as "Eligible For Inclusion" (EFI) or "Considered for
+   * Inclusion" (CFI).
+   *
+   * <p>There is no guarantee of the contents of this fork across Besu releases and should be
+   * considered unstable.
+   *
+   * @param genesisConfigOptions the chain options from the genesis config
+   * @return a protocol spec for the "Future" fork.
+   */
+  public ProtocolSpecBuilder futureEipsDefinition(final GenesisConfigOptions genesisConfigOptions) {
+    return MainnetProtocolSpecs.futureEipsDefinition(
+        chainId,
+        contractSizeLimit,
+        evmStackSize,
+        isRevertReasonEnabled,
+        genesisConfigOptions,
+        evmConfiguration);
+  }
+
+  /**
+   * The "experimental" fork consists of EIPs and other changes that have not been approved for any
+   * fork but are implemented in Besu, either for demonstration or experimentation.
+   *
+   * <p>There is no guarantee of the contents of this fork across Besu releases and should be
+   * considered unstable.
+   *
+   * @param genesisConfigOptions the chain options from the genesis config
+   * @return a protocol spec for the "Experimental" fork.
+   */
+  public ProtocolSpecBuilder experimentalEipsDefinition(
+      final GenesisConfigOptions genesisConfigOptions) {
+    return MainnetProtocolSpecs.experimentalEipsDefinition(
+        chainId,
+        contractSizeLimit,
+        evmStackSize,
+        isRevertReasonEnabled,
+        genesisConfigOptions,
+        evmConfiguration);
+  }
+
+  ////////////////////////////////////////////////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////////////////////////////////////////////////
+  // Classic Protocol Specs
+  public ProtocolSpecBuilder dieHardDefinition() {
+    return ClassicProtocolSpecs.dieHardDefinition(
+        chainId, contractSizeLimit, evmStackSize, evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder gothamDefinition() {
+    return ClassicProtocolSpecs.gothamDefinition(
+        chainId, contractSizeLimit, evmStackSize, ecip1017EraRounds, evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder defuseDifficultyBombDefinition() {
+    return ClassicProtocolSpecs.defuseDifficultyBombDefinition(
+        chainId, contractSizeLimit, evmStackSize, ecip1017EraRounds, evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder atlantisDefinition() {
+    return ClassicProtocolSpecs.atlantisDefinition(
+        chainId,
+        contractSizeLimit,
+        evmStackSize,
+        isRevertReasonEnabled,
+        ecip1017EraRounds,
+        evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder aghartaDefinition() {
+    return ClassicProtocolSpecs.aghartaDefinition(
+        chainId,
+        contractSizeLimit,
+        evmStackSize,
+        isRevertReasonEnabled,
+        ecip1017EraRounds,
+        evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder phoenixDefinition() {
+    return ClassicProtocolSpecs.phoenixDefinition(
+        chainId,
+        contractSizeLimit,
+        evmStackSize,
+        isRevertReasonEnabled,
+        ecip1017EraRounds,
+        evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder thanosDefinition() {
+    return ClassicProtocolSpecs.thanosDefinition(
+        chainId,
+        contractSizeLimit,
+        evmStackSize,
+        isRevertReasonEnabled,
+        ecip1017EraRounds,
+        evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder magnetoDefinition() {
+    return ClassicProtocolSpecs.magnetoDefinition(
+        chainId,
+        contractSizeLimit,
+        evmStackSize,
+        isRevertReasonEnabled,
+        ecip1017EraRounds,
+        evmConfiguration);
+  }
+
+  public ProtocolSpecBuilder mystiqueDefinition() {
+    return ClassicProtocolSpecs.mystiqueDefinition(
+        chainId,
+        contractSizeLimit,
+        evmStackSize,
+        isRevertReasonEnabled,
+        ecip1017EraRounds,
+        evmConfiguration);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java
index 0d2a7002469..18417763bd4 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java
@@ -15,29 +15,50 @@
 package org.hyperledger.besu.ethereum.mainnet;
 
 import org.hyperledger.besu.config.GenesisConfigOptions;
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
+import org.hyperledger.besu.config.PowAlgorithm;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.BlockProcessingResult;
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.MainnetBlockValidator;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
+import org.hyperledger.besu.ethereum.core.Deposit;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldState;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.core.fees.CoinbaseFeePriceCalculator;
-import org.hyperledger.besu.ethereum.core.fees.EIP1559;
-import org.hyperledger.besu.ethereum.core.fees.TransactionGasBudgetCalculator;
-import org.hyperledger.besu.ethereum.core.fees.TransactionPriceCalculator;
-import org.hyperledger.besu.ethereum.mainnet.contractvalidation.MaxCodeSizeRule;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+import org.hyperledger.besu.ethereum.core.feemarket.CoinbaseFeePriceCalculator;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpecBuilder.BlockValidatorBuilder;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransactionProcessor;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransactionValidator;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateMetadataUpdater;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
+import org.hyperledger.besu.evm.MainnetEVMs;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.contractvalidation.EOFValidationCodeRule;
+import org.hyperledger.besu.evm.contractvalidation.MaxCodeSizeRule;
+import org.hyperledger.besu.evm.contractvalidation.PrefixCodeRule;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.BerlinGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.ByzantiumGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.CancunGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.ConstantinopleGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.FrontierGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.HomesteadGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.IstanbulGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.LondonGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.PetersburgGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.ShanghaiGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.SpuriousDragonGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.TangerineWhistleGasCalculator;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.evm.processor.ContractCreationProcessor;
+import org.hyperledger.besu.evm.processor.MessageCallProcessor;
+import org.hyperledger.besu.evm.worldstate.WorldState;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 import org.hyperledger.besu.plugin.data.TransactionType;
 
 import java.io.IOException;
@@ -48,19 +69,18 @@
 import java.util.Optional;
 import java.util.OptionalInt;
 import java.util.Set;
-import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import com.google.common.collect.ImmutableSet;
 import com.google.common.io.Resources;
 import io.vertx.core.json.JsonArray;
 
-/** Provides the various @{link ProtocolSpec}s on mainnet hard forks. */
+/** Provides the various {@link ProtocolSpec}s on mainnet hard forks. */
 public abstract class MainnetProtocolSpecs {
 
   public static final int FRONTIER_CONTRACT_SIZE_LIMIT = Integer.MAX_VALUE;
 
   public static final int SPURIOUS_DRAGON_CONTRACT_SIZE_LIMIT = 24576;
+  public static final int SHANGHAI_INIT_CODE_SIZE_LIMIT = 2 * SPURIOUS_DRAGON_CONTRACT_SIZE_LIMIT;
 
   private static final Address RIPEMD160_PRECOMPILE =
       Address.fromHexString("0x0000000000000000000000000000000000000003");
@@ -68,8 +88,8 @@ public abstract class MainnetProtocolSpecs {
   // A consensus bug at Ethereum mainnet transaction 0xcf416c53
   // deleted an empty account even when the message execution scope
   // failed, but the transaction itself succeeded.
-  private static final ImmutableSet<Address> SPURIOUS_DRAGON_FORCE_DELETE_WHEN_EMPTY_ADDRESSES =
-      ImmutableSet.of(RIPEMD160_PRECOMPILE);
+  private static final Set<Address> SPURIOUS_DRAGON_FORCE_DELETE_WHEN_EMPTY_ADDRESSES =
+      Set.of(RIPEMD160_PRECOMPILE);
 
   private static final Wei FRONTIER_BLOCK_REWARD = Wei.fromEth(5);
 
@@ -77,31 +97,35 @@ public abstract class MainnetProtocolSpecs {
 
   private static final Wei CONSTANTINOPLE_BLOCK_REWARD = Wei.fromEth(2);
 
+  public static final Address DEFAULT_DEPOSIT_CONTRACT_ADDRESS =
+      Address.fromHexString("0x00000000219ab540356cbb839cbe05303d7705fa");
+
   private MainnetProtocolSpecs() {}
 
   public static ProtocolSpecBuilder frontierDefinition(
       final OptionalInt configContractSizeLimit,
       final OptionalInt configStackSizeLimit,
-      final boolean quorumCompatibilityMode) {
+      final EvmConfiguration evmConfiguration) {
     final int contractSizeLimit = configContractSizeLimit.orElse(FRONTIER_CONTRACT_SIZE_LIMIT);
     final int stackSizeLimit = configStackSizeLimit.orElse(MessageFrame.DEFAULT_MAX_STACK_SIZE);
     return new ProtocolSpecBuilder()
         .gasCalculator(FrontierGasCalculator::new)
-        .evmBuilder(MainnetEvmRegistries::frontier)
+        .gasLimitCalculator(new FrontierTargetingGasLimitCalculator())
+        .evmBuilder(MainnetEVMs::frontier)
         .precompileContractRegistryBuilder(MainnetPrecompiledContractRegistries::frontier)
-        .messageCallProcessorBuilder(MainnetMessageCallProcessor::new)
+        .messageCallProcessorBuilder(MessageCallProcessor::new)
         .contractCreationProcessorBuilder(
             (gasCalculator, evm) ->
-                new MainnetContractCreationProcessor(
+                new ContractCreationProcessor(
                     gasCalculator,
                     evm,
                     false,
                     Collections.singletonList(MaxCodeSizeRule.of(contractSizeLimit)),
                     0))
         .transactionValidatorBuilder(
-            gasCalculator ->
+            (gasCalculator, gasLimitCalculator) ->
                 new MainnetTransactionValidator(
-                    gasCalculator, false, Optional.empty(), quorumCompatibilityMode))
+                    gasCalculator, gasLimitCalculator, false, Optional.empty()))
         .transactionProcessorBuilder(
             (gasCalculator,
                 transactionValidator,
@@ -113,61 +137,70 @@ public static ProtocolSpecBuilder frontierDefinition(
                     contractCreationProcessor,
                     messageCallProcessor,
                     false,
+                    false,
                     stackSizeLimit,
-                    Account.DEFAULT_VERSION,
-                    TransactionPriceCalculator.frontier(),
+                    FeeMarket.legacy(),
                     CoinbaseFeePriceCalculator.frontier()))
         .privateTransactionProcessorBuilder(
-            (gasCalculator,
-                transactionValidator,
+            (transactionValidator,
                 contractCreationProcessor,
                 messageCallProcessor,
                 privateTransactionValidator) ->
                 new PrivateTransactionProcessor(
-                    gasCalculator,
                     transactionValidator,
                     contractCreationProcessor,
                     messageCallProcessor,
                     false,
                     stackSizeLimit,
-                    Account.DEFAULT_VERSION,
                     new PrivateTransactionValidator(Optional.empty())))
         .difficultyCalculator(MainnetDifficultyCalculators.FRONTIER)
-        .blockHeaderValidatorBuilder(MainnetBlockHeaderValidator.create())
-        .ommerHeaderValidatorBuilder(MainnetBlockHeaderValidator.createOmmerValidator())
+        .blockHeaderValidatorBuilder(feeMarket -> MainnetBlockHeaderValidator.create())
+        .ommerHeaderValidatorBuilder(
+            feeMarket -> MainnetBlockHeaderValidator.createLegacyFeeMarketOmmerValidator())
         .blockBodyValidatorBuilder(MainnetBlockBodyValidator::new)
         .transactionReceiptFactory(MainnetProtocolSpecs::frontierTransactionReceiptFactory)
         .blockReward(FRONTIER_BLOCK_REWARD)
         .skipZeroBlockRewards(false)
         .blockProcessorBuilder(MainnetBlockProcessor::new)
-        .blockValidatorBuilder(MainnetBlockValidator::new)
+        .blockValidatorBuilder(MainnetProtocolSpecs.blockValidatorBuilder())
         .blockImporterBuilder(MainnetBlockImporter::new)
         .blockHeaderFunctions(new MainnetBlockHeaderFunctions())
         .miningBeneficiaryCalculator(BlockHeader::getCoinbase)
+        .evmConfiguration(evmConfiguration)
         .name("Frontier");
   }
 
+  public static PoWHasher powHasher(final PowAlgorithm powAlgorithm) {
+    if (powAlgorithm == null) {
+      return PoWHasher.UNSUPPORTED;
+    }
+    return powAlgorithm == PowAlgorithm.ETHASH ? PoWHasher.ETHASH_LIGHT : PoWHasher.UNSUPPORTED;
+  }
+
+  public static BlockValidatorBuilder blockValidatorBuilder() {
+    return MainnetBlockValidator::new;
+  }
+
   public static ProtocolSpecBuilder homesteadDefinition(
       final OptionalInt configContractSizeLimit,
       final OptionalInt configStackSizeLimit,
-      final boolean quorumCompatibilityMode) {
+      final EvmConfiguration evmConfiguration) {
     final int contractSizeLimit = configContractSizeLimit.orElse(FRONTIER_CONTRACT_SIZE_LIMIT);
-    return frontierDefinition(
-            configContractSizeLimit, configStackSizeLimit, quorumCompatibilityMode)
+    return frontierDefinition(configContractSizeLimit, configStackSizeLimit, evmConfiguration)
         .gasCalculator(HomesteadGasCalculator::new)
-        .evmBuilder(MainnetEvmRegistries::homestead)
+        .evmBuilder(MainnetEVMs::homestead)
         .contractCreationProcessorBuilder(
             (gasCalculator, evm) ->
-                new MainnetContractCreationProcessor(
+                new ContractCreationProcessor(
                     gasCalculator,
                     evm,
                     true,
                     Collections.singletonList(MaxCodeSizeRule.of(contractSizeLimit)),
                     0))
         .transactionValidatorBuilder(
-            gasCalculator ->
+            (gasCalculator, gasLimitCalculator) ->
                 new MainnetTransactionValidator(
-                    gasCalculator, true, Optional.empty(), quorumCompatibilityMode))
+                    gasCalculator, gasLimitCalculator, true, Optional.empty()))
         .difficultyCalculator(MainnetDifficultyCalculators.HOMESTEAD)
         .name("Homestead");
   }
@@ -175,16 +208,16 @@ public static ProtocolSpecBuilder homesteadDefinition(
   public static ProtocolSpecBuilder daoRecoveryInitDefinition(
       final OptionalInt contractSizeLimit,
       final OptionalInt configStackSizeLimit,
-      final boolean quorumCompatibilityMode) {
-    return homesteadDefinition(contractSizeLimit, configStackSizeLimit, quorumCompatibilityMode)
-        .blockHeaderValidatorBuilder(MainnetBlockHeaderValidator.createDaoValidator())
+      final EvmConfiguration evmConfiguration) {
+    return homesteadDefinition(contractSizeLimit, configStackSizeLimit, evmConfiguration)
+        .blockHeaderValidatorBuilder(feeMarket -> MainnetBlockHeaderValidator.createDaoValidator())
         .blockProcessorBuilder(
             (transactionProcessor,
                 transactionReceiptFactory,
                 blockReward,
                 miningBeneficiaryCalculator,
                 skipZeroBlockRewards,
-                gasBudgetCalculator) ->
+                protocolSchedule) ->
                 new DaoBlockProcessor(
                     new MainnetBlockProcessor(
                         transactionProcessor,
@@ -192,16 +225,15 @@ public static ProtocolSpecBuilder daoRecoveryInitDefinition(
                         blockReward,
                         miningBeneficiaryCalculator,
                         skipZeroBlockRewards,
-                        gasBudgetCalculator)))
+                        protocolSchedule)))
         .name("DaoRecoveryInit");
   }
 
   public static ProtocolSpecBuilder daoRecoveryTransitionDefinition(
       final OptionalInt contractSizeLimit,
       final OptionalInt configStackSizeLimit,
-      final boolean quorumCompatibilityMode) {
-    return daoRecoveryInitDefinition(
-            contractSizeLimit, configStackSizeLimit, quorumCompatibilityMode)
+      final EvmConfiguration evmConfiguration) {
+    return daoRecoveryInitDefinition(contractSizeLimit, configStackSizeLimit, evmConfiguration)
         .blockProcessorBuilder(MainnetBlockProcessor::new)
         .name("DaoRecoveryTransition");
   }
@@ -209,8 +241,8 @@ public static ProtocolSpecBuilder daoRecoveryTransitionDefinition(
   public static ProtocolSpecBuilder tangerineWhistleDefinition(
       final OptionalInt contractSizeLimit,
       final OptionalInt configStackSizeLimit,
-      final boolean quorumCompatibilityMode) {
-    return homesteadDefinition(contractSizeLimit, configStackSizeLimit, quorumCompatibilityMode)
+      final EvmConfiguration evmConfiguration) {
+    return homesteadDefinition(contractSizeLimit, configStackSizeLimit, evmConfiguration)
         .gasCalculator(TangerineWhistleGasCalculator::new)
         .name("TangerineWhistle");
   }
@@ -219,24 +251,23 @@ public static ProtocolSpecBuilder spuriousDragonDefinition(
       final Optional<BigInteger> chainId,
       final OptionalInt configContractSizeLimit,
       final OptionalInt configStackSizeLimit,
-      final boolean quorumCompatibilityMode) {
+      final EvmConfiguration evmConfiguration) {
     final int contractSizeLimit =
         configContractSizeLimit.orElse(SPURIOUS_DRAGON_CONTRACT_SIZE_LIMIT);
     final int stackSizeLimit = configStackSizeLimit.orElse(MessageFrame.DEFAULT_MAX_STACK_SIZE);
 
-    return tangerineWhistleDefinition(
-            OptionalInt.empty(), configStackSizeLimit, quorumCompatibilityMode)
+    return tangerineWhistleDefinition(OptionalInt.empty(), configStackSizeLimit, evmConfiguration)
         .gasCalculator(SpuriousDragonGasCalculator::new)
         .skipZeroBlockRewards(true)
         .messageCallProcessorBuilder(
             (evm, precompileContractRegistry) ->
-                new MainnetMessageCallProcessor(
+                new MessageCallProcessor(
                     evm,
                     precompileContractRegistry,
                     SPURIOUS_DRAGON_FORCE_DELETE_WHEN_EMPTY_ADDRESSES))
         .contractCreationProcessorBuilder(
             (gasCalculator, evm) ->
-                new MainnetContractCreationProcessor(
+                new ContractCreationProcessor(
                     gasCalculator,
                     evm,
                     true,
@@ -244,9 +275,8 @@ public static ProtocolSpecBuilder spuriousDragonDefinition(
                     1,
                     SPURIOUS_DRAGON_FORCE_DELETE_WHEN_EMPTY_ADDRESSES))
         .transactionValidatorBuilder(
-            gasCalculator ->
-                new MainnetTransactionValidator(
-                    gasCalculator, true, chainId, quorumCompatibilityMode))
+            (gasCalculator, gasLimitCalculator) ->
+                new MainnetTransactionValidator(gasCalculator, gasLimitCalculator, true, chainId))
         .transactionProcessorBuilder(
             (gasCalculator,
                 transactionValidator,
@@ -258,9 +288,9 @@ public static ProtocolSpecBuilder spuriousDragonDefinition(
                     contractCreationProcessor,
                     messageCallProcessor,
                     true,
+                    false,
                     stackSizeLimit,
-                    Account.DEFAULT_VERSION,
-                    TransactionPriceCalculator.frontier(),
+                    FeeMarket.legacy(),
                     CoinbaseFeePriceCalculator.frontier()))
         .name("SpuriousDragon");
   }
@@ -270,12 +300,12 @@ public static ProtocolSpecBuilder byzantiumDefinition(
       final OptionalInt contractSizeLimit,
       final OptionalInt configStackSizeLimit,
       final boolean enableRevertReason,
-      final boolean quorumCompatibilityMode) {
+      final EvmConfiguration evmConfiguration) {
     final int stackSizeLimit = configStackSizeLimit.orElse(MessageFrame.DEFAULT_MAX_STACK_SIZE);
     return spuriousDragonDefinition(
-            chainId, contractSizeLimit, configStackSizeLimit, quorumCompatibilityMode)
+            chainId, contractSizeLimit, configStackSizeLimit, evmConfiguration)
         .gasCalculator(ByzantiumGasCalculator::new)
-        .evmBuilder(MainnetEvmRegistries::byzantium)
+        .evmBuilder(MainnetEVMs::byzantium)
         .precompileContractRegistryBuilder(MainnetPrecompiledContractRegistries::byzantium)
         .difficultyCalculator(MainnetDifficultyCalculators.BYZANTIUM)
         .transactionReceiptFactory(
@@ -285,19 +315,16 @@ public static ProtocolSpecBuilder byzantiumDefinition(
         .blockReward(BYZANTIUM_BLOCK_REWARD)
         .privateTransactionValidatorBuilder(() -> new PrivateTransactionValidator(chainId))
         .privateTransactionProcessorBuilder(
-            (gasCalculator,
-                transactionValidator,
+            (transactionValidator,
                 contractCreationProcessor,
                 messageCallProcessor,
                 privateTransactionValidator) ->
                 new PrivateTransactionProcessor(
-                    gasCalculator,
                     transactionValidator,
                     contractCreationProcessor,
                     messageCallProcessor,
                     false,
                     stackSizeLimit,
-                    Account.DEFAULT_VERSION,
                     privateTransactionValidator))
         .name("Byzantium");
   }
@@ -307,34 +334,26 @@ public static ProtocolSpecBuilder constantinopleDefinition(
       final OptionalInt contractSizeLimit,
       final OptionalInt configStackSizeLimit,
       final boolean enableRevertReason,
-      final boolean quorumCompatibilityMode) {
+      final EvmConfiguration evmConfiguration) {
     return byzantiumDefinition(
-            chainId,
-            contractSizeLimit,
-            configStackSizeLimit,
-            enableRevertReason,
-            quorumCompatibilityMode)
+            chainId, contractSizeLimit, configStackSizeLimit, enableRevertReason, evmConfiguration)
         .difficultyCalculator(MainnetDifficultyCalculators.CONSTANTINOPLE)
         .gasCalculator(ConstantinopleGasCalculator::new)
-        .evmBuilder(MainnetEvmRegistries::constantinople)
+        .evmBuilder(MainnetEVMs::constantinople)
         .blockReward(CONSTANTINOPLE_BLOCK_REWARD)
         .name("Constantinople");
   }
 
-  public static ProtocolSpecBuilder constantinopleFixDefinition(
+  public static ProtocolSpecBuilder petersburgDefinition(
       final Optional<BigInteger> chainId,
       final OptionalInt contractSizeLimit,
       final OptionalInt configStackSizeLimit,
       final boolean enableRevertReason,
-      final boolean quorumCompatibilityMode) {
+      final EvmConfiguration evmConfiguration) {
     return constantinopleDefinition(
-            chainId,
-            contractSizeLimit,
-            configStackSizeLimit,
-            enableRevertReason,
-            quorumCompatibilityMode)
-        .gasCalculator(ConstantinopleFixGasCalculator::new)
-        .name("ConstantinopleFix");
+            chainId, contractSizeLimit, configStackSizeLimit, enableRevertReason, evmConfiguration)
+        .gasCalculator(PetersburgGasCalculator::new)
+        .name("Petersburg");
   }
 
   public static ProtocolSpecBuilder istanbulDefinition(
@@ -342,23 +361,24 @@ public static ProtocolSpecBuilder istanbulDefinition(
       final OptionalInt configContractSizeLimit,
       final OptionalInt configStackSizeLimit,
       final boolean enableRevertReason,
-      final boolean quorumCompatibilityMode) {
+      final EvmConfiguration evmConfiguration) {
     final int contractSizeLimit =
         configContractSizeLimit.orElse(SPURIOUS_DRAGON_CONTRACT_SIZE_LIMIT);
-    return constantinopleFixDefinition(
+    return petersburgDefinition(
             chainId,
             configContractSizeLimit,
             configStackSizeLimit,
             enableRevertReason,
-            quorumCompatibilityMode)
+            evmConfiguration)
         .gasCalculator(IstanbulGasCalculator::new)
         .evmBuilder(
-            gasCalculator ->
-                MainnetEvmRegistries.istanbul(gasCalculator, chainId.orElse(BigInteger.ZERO)))
+            (gasCalculator, jdCacheConfig) ->
+                MainnetEVMs.istanbul(
+                    gasCalculator, chainId.orElse(BigInteger.ZERO), evmConfiguration))
         .precompileContractRegistryBuilder(MainnetPrecompiledContractRegistries::istanbul)
         .contractCreationProcessorBuilder(
             (gasCalculator, evm) ->
-                new MainnetContractCreationProcessor(
+                new ContractCreationProcessor(
                     gasCalculator,
                     evm,
                     true,
@@ -373,13 +393,9 @@ static ProtocolSpecBuilder muirGlacierDefinition(
       final OptionalInt contractSizeLimit,
       final OptionalInt configStackSizeLimit,
       final boolean enableRevertReason,
-      final boolean quorumCompatibilityMode) {
+      final EvmConfiguration evmConfiguration) {
     return istanbulDefinition(
-            chainId,
-            contractSizeLimit,
-            configStackSizeLimit,
-            enableRevertReason,
-            quorumCompatibilityMode)
+            chainId, contractSizeLimit, configStackSizeLimit, enableRevertReason, evmConfiguration)
         .difficultyCalculator(MainnetDifficultyCalculators.MUIR_GLACIER)
         .name("MuirGlacier");
   }
@@ -389,21 +405,18 @@ static ProtocolSpecBuilder berlinDefinition(
       final OptionalInt contractSizeLimit,
       final OptionalInt configStackSizeLimit,
       final boolean enableRevertReason,
-      final boolean quorumCompatibilityMode) {
-    if (!ExperimentalEIPs.berlinEnabled) {
-      throw new RuntimeException("Berlin feature flag must be enabled --Xberlin-enabled");
-    }
+      final EvmConfiguration evmConfiguration) {
     return muirGlacierDefinition(
-            chainId,
-            contractSizeLimit,
-            configStackSizeLimit,
-            enableRevertReason,
-            quorumCompatibilityMode)
+            chainId, contractSizeLimit, configStackSizeLimit, enableRevertReason, evmConfiguration)
         .gasCalculator(BerlinGasCalculator::new)
-        .evmBuilder(
-            gasCalculator ->
-                MainnetEvmRegistries.berlin(gasCalculator, chainId.orElse(BigInteger.ZERO)))
-        .precompileContractRegistryBuilder(MainnetPrecompiledContractRegistries::berlin)
+        .transactionValidatorBuilder(
+            (gasCalculator, gasLimitCalculator) ->
+                new MainnetTransactionValidator(
+                    gasCalculator,
+                    gasLimitCalculator,
+                    true,
+                    chainId,
+                    Set.of(TransactionType.FRONTIER, TransactionType.ACCESS_LIST)))
         .transactionReceiptFactory(
             enableRevertReason
                 ? MainnetProtocolSpecs::berlinTransactionReceiptFactoryWithReasonEnabled
@@ -411,33 +424,44 @@ static ProtocolSpecBuilder berlinDefinition(
         .name("Berlin");
   }
 
-  // TODO EIP-1559 change for the actual fork name when known
-  static ProtocolSpecBuilder eip1559Definition(
+  static ProtocolSpecBuilder londonDefinition(
       final Optional<BigInteger> chainId,
-      final Optional<TransactionPriceCalculator> transactionPriceCalculator,
-      final OptionalInt contractSizeLimit,
+      final OptionalInt configContractSizeLimit,
       final OptionalInt configStackSizeLimit,
       final boolean enableRevertReason,
       final GenesisConfigOptions genesisConfigOptions,
-      final boolean quorumCompatibilityMode) {
-    ExperimentalEIPs.eip1559MustBeEnabled();
+      final EvmConfiguration evmConfiguration) {
+    final int contractSizeLimit =
+        configContractSizeLimit.orElse(SPURIOUS_DRAGON_CONTRACT_SIZE_LIMIT);
     final int stackSizeLimit = configStackSizeLimit.orElse(MessageFrame.DEFAULT_MAX_STACK_SIZE);
-    final EIP1559 eip1559 = new EIP1559(genesisConfigOptions.getEIP1559BlockNumber().orElse(0));
-    return muirGlacierDefinition(
+    final long londonForkBlockNumber =
+        genesisConfigOptions.getLondonBlockNumber().orElse(Long.MAX_VALUE);
+    final BaseFeeMarket londonFeeMarket =
+        genesisConfigOptions.isZeroBaseFee()
+            ? FeeMarket.zeroBaseFee(londonForkBlockNumber)
+            : FeeMarket.london(londonForkBlockNumber, genesisConfigOptions.getBaseFeePerGas());
+    return berlinDefinition(
             chainId,
-            contractSizeLimit,
+            configContractSizeLimit,
             configStackSizeLimit,
             enableRevertReason,
-            quorumCompatibilityMode)
+            evmConfiguration)
+        .gasCalculator(LondonGasCalculator::new)
+        .gasLimitCalculator(
+            new LondonTargetingGasLimitCalculator(londonForkBlockNumber, londonFeeMarket))
         .transactionValidatorBuilder(
-            gasCalculator ->
+            (gasCalculator, gasLimitCalculator) ->
                 new MainnetTransactionValidator(
                     gasCalculator,
-                    transactionPriceCalculator,
+                    gasLimitCalculator,
+                    londonFeeMarket,
                     true,
                     chainId,
-                    Set.of(TransactionType.FRONTIER, TransactionType.EIP1559),
-                    genesisConfigOptions.isQuorum()))
+                    Set.of(
+                        TransactionType.FRONTIER,
+                        TransactionType.ACCESS_LIST,
+                        TransactionType.EIP1559),
+                    Integer.MAX_VALUE))
         .transactionProcessorBuilder(
             (gasCalculator,
                 transactionValidator,
@@ -449,17 +473,291 @@ static ProtocolSpecBuilder eip1559Definition(
                     contractCreationProcessor,
                     messageCallProcessor,
                     true,
+                    false,
                     stackSizeLimit,
-                    Account.DEFAULT_VERSION,
-                    transactionPriceCalculator.orElseThrow(),
+                    londonFeeMarket,
                     CoinbaseFeePriceCalculator.eip1559()))
-        .name("EIP-1559")
-        .transactionPriceCalculator(transactionPriceCalculator.orElseThrow())
-        .eip1559(Optional.of(eip1559))
-        .gasBudgetCalculator(TransactionGasBudgetCalculator.eip1559(eip1559))
-        .blockHeaderValidatorBuilder(MainnetBlockHeaderValidator.createEip1559Validator(eip1559))
+        .contractCreationProcessorBuilder(
+            (gasCalculator, evm) ->
+                new ContractCreationProcessor(
+                    gasCalculator,
+                    evm,
+                    true,
+                    List.of(MaxCodeSizeRule.of(contractSizeLimit), PrefixCodeRule.of()),
+                    1,
+                    SPURIOUS_DRAGON_FORCE_DELETE_WHEN_EMPTY_ADDRESSES))
+        .evmBuilder(
+            (gasCalculator, jdCacheConfig) ->
+                MainnetEVMs.london(
+                    gasCalculator, chainId.orElse(BigInteger.ZERO), evmConfiguration))
+        .feeMarket(londonFeeMarket)
+        .difficultyCalculator(MainnetDifficultyCalculators.LONDON)
+        .blockHeaderValidatorBuilder(
+            feeMarket -> MainnetBlockHeaderValidator.createBaseFeeMarketValidator(londonFeeMarket))
         .ommerHeaderValidatorBuilder(
-            MainnetBlockHeaderValidator.createEip1559OmmerValidator(eip1559));
+            feeMarket ->
+                MainnetBlockHeaderValidator.createBaseFeeMarketOmmerValidator(londonFeeMarket))
+        .blockBodyValidatorBuilder(BaseFeeBlockBodyValidator::new)
+        .name("London");
+  }
+
+  static ProtocolSpecBuilder arrowGlacierDefinition(
+      final Optional<BigInteger> chainId,
+      final OptionalInt configContractSizeLimit,
+      final OptionalInt configStackSizeLimit,
+      final boolean enableRevertReason,
+      final GenesisConfigOptions genesisConfigOptions,
+      final EvmConfiguration evmConfiguration) {
+    return londonDefinition(
+            chainId,
+            configContractSizeLimit,
+            configStackSizeLimit,
+            enableRevertReason,
+            genesisConfigOptions,
+            evmConfiguration)
+        .difficultyCalculator(MainnetDifficultyCalculators.ARROW_GLACIER)
+        .name("ArrowGlacier");
+  }
+
+  static ProtocolSpecBuilder grayGlacierDefinition(
+      final Optional<BigInteger> chainId,
+      final OptionalInt configContractSizeLimit,
+      final OptionalInt configStackSizeLimit,
+      final boolean enableRevertReason,
+      final GenesisConfigOptions genesisConfigOptions,
+      final EvmConfiguration evmConfiguration) {
+    return arrowGlacierDefinition(
+            chainId,
+            configContractSizeLimit,
+            configStackSizeLimit,
+            enableRevertReason,
+            genesisConfigOptions,
+            evmConfiguration)
+        .difficultyCalculator(MainnetDifficultyCalculators.GRAY_GLACIER)
+        .name("GrayGlacier");
+  }
+
+  static ProtocolSpecBuilder parisDefinition(
+      final Optional<BigInteger> chainId,
+      final OptionalInt configContractSizeLimit,
+      final OptionalInt configStackSizeLimit,
+      final boolean enableRevertReason,
+      final GenesisConfigOptions genesisConfigOptions,
+      final EvmConfiguration evmConfiguration) {
+
+    return grayGlacierDefinition(
+            chainId,
+            configContractSizeLimit,
+            configStackSizeLimit,
+            enableRevertReason,
+            genesisConfigOptions,
+            evmConfiguration)
+        .evmBuilder(
+            (gasCalculator, jdCacheConfig) ->
+                MainnetEVMs.paris(gasCalculator, chainId.orElse(BigInteger.ZERO), evmConfiguration))
+        .difficultyCalculator(MainnetDifficultyCalculators.PROOF_OF_STAKE_DIFFICULTY)
+        .blockHeaderValidatorBuilder(MainnetBlockHeaderValidator::mergeBlockHeaderValidator)
+        .blockReward(Wei.ZERO)
+        .skipZeroBlockRewards(true)
+        .isPoS(true)
+        .name("ParisFork");
+  }
+
+  static ProtocolSpecBuilder shanghaiDefinition(
+      final Optional<BigInteger> chainId,
+      final OptionalInt configContractSizeLimit,
+      final OptionalInt configStackSizeLimit,
+      final boolean enableRevertReason,
+      final GenesisConfigOptions genesisConfigOptions,
+      final EvmConfiguration evmConfiguration) {
+
+    // extra variables need to support flipping the warm coinbase flag.
+    final int stackSizeLimit = configStackSizeLimit.orElse(MessageFrame.DEFAULT_MAX_STACK_SIZE);
+    final long londonForkBlockNumber = genesisConfigOptions.getLondonBlockNumber().orElse(0L);
+    final BaseFeeMarket londonFeeMarket =
+        genesisConfigOptions.isZeroBaseFee()
+            ? FeeMarket.zeroBaseFee(londonForkBlockNumber)
+            : FeeMarket.london(londonForkBlockNumber, genesisConfigOptions.getBaseFeePerGas());
+
+    return parisDefinition(
+            chainId,
+            configContractSizeLimit,
+            configStackSizeLimit,
+            enableRevertReason,
+            genesisConfigOptions,
+            evmConfiguration)
+        // gas calculator has new code to support EIP-3860 limit and meter initcode
+        .gasCalculator(ShanghaiGasCalculator::new)
+        // EVM has a new operation for EIP-3855 PUSH0 instruction
+        .evmBuilder(
+            (gasCalculator, jdCacheConfig) ->
+                MainnetEVMs.shanghai(
+                    gasCalculator, chainId.orElse(BigInteger.ZERO), evmConfiguration))
+        // we need to flip the Warm Coinbase flag for EIP-3651 warm coinbase
+        .transactionProcessorBuilder(
+            (gasCalculator,
+                transactionValidator,
+                contractCreationProcessor,
+                messageCallProcessor) ->
+                new MainnetTransactionProcessor(
+                    gasCalculator,
+                    transactionValidator,
+                    contractCreationProcessor,
+                    messageCallProcessor,
+                    true,
+                    true,
+                    stackSizeLimit,
+                    londonFeeMarket,
+                    CoinbaseFeePriceCalculator.eip1559()))
+        // Contract creation rules for EIP-3860 Limit and meter intitcode
+        .transactionValidatorBuilder(
+            (gasCalculator, gasLimitCalculator) ->
+                new MainnetTransactionValidator(
+                    gasCalculator,
+                    gasLimitCalculator,
+                    londonFeeMarket,
+                    true,
+                    chainId,
+                    Set.of(
+                        TransactionType.FRONTIER,
+                        TransactionType.ACCESS_LIST,
+                        TransactionType.EIP1559),
+                    SHANGHAI_INIT_CODE_SIZE_LIMIT))
+        .withdrawalsProcessor(new WithdrawalsProcessor())
+        .withdrawalsValidator(new WithdrawalsValidator.AllowedWithdrawals())
+        .name("Shanghai");
+  }
+
+  static ProtocolSpecBuilder cancunDefinition(
+      final Optional<BigInteger> chainId,
+      final OptionalInt configContractSizeLimit,
+      final OptionalInt configStackSizeLimit,
+      final boolean enableRevertReason,
+      final GenesisConfigOptions genesisConfigOptions,
+      final EvmConfiguration evmConfiguration) {
+
+    final int stackSizeLimit = configStackSizeLimit.orElse(MessageFrame.DEFAULT_MAX_STACK_SIZE);
+    final int contractSizeLimit =
+        configContractSizeLimit.orElse(SPURIOUS_DRAGON_CONTRACT_SIZE_LIMIT);
+    final long londonForkBlockNumber = genesisConfigOptions.getLondonBlockNumber().orElse(0L);
+    final BaseFeeMarket cancunFeeMarket =
+        genesisConfigOptions.isZeroBaseFee()
+            ? FeeMarket.zeroBaseFee(londonForkBlockNumber)
+            : FeeMarket.cancun(londonForkBlockNumber, genesisConfigOptions.getBaseFeePerGas());
+
+    final GasLimitCalculator cancunGasLimitCalculator =
+        new CancunTargetingGasLimitCalculator(londonForkBlockNumber, cancunFeeMarket);
+
+    return shanghaiDefinition(
+            chainId,
+            configContractSizeLimit,
+            configStackSizeLimit,
+            enableRevertReason,
+            genesisConfigOptions,
+            evmConfiguration)
+        .feeMarket(cancunFeeMarket)
+        // gas calculator for EIP-4844 data gas
+        .gasCalculator(CancunGasCalculator::new)
+        // gas limit with EIP-4844 max data gas per block
+        .gasLimitCalculator(cancunGasLimitCalculator)
+        // EVM changes to support EOF EIPs (3670, 4200, 4750, 5450)
+        .evmBuilder(
+            (gasCalculator, jdCacheConfig) ->
+                MainnetEVMs.cancun(
+                    gasCalculator, chainId.orElse(BigInteger.ZERO), evmConfiguration))
+        // change contract call creator to accept EOF code
+        .contractCreationProcessorBuilder(
+            (gasCalculator, evm) ->
+                new ContractCreationProcessor(
+                    gasCalculator,
+                    evm,
+                    true,
+                    List.of(
+                        MaxCodeSizeRule.of(contractSizeLimit), EOFValidationCodeRule.of(1, false)),
+                    1,
+                    SPURIOUS_DRAGON_FORCE_DELETE_WHEN_EMPTY_ADDRESSES))
+        // use Cancun fee market
+        .transactionProcessorBuilder(
+            (gasCalculator,
+                transactionValidator,
+                contractCreationProcessor,
+                messageCallProcessor) ->
+                new MainnetTransactionProcessor(
+                    gasCalculator,
+                    transactionValidator,
+                    contractCreationProcessor,
+                    messageCallProcessor,
+                    true,
+                    true,
+                    stackSizeLimit,
+                    cancunFeeMarket,
+                    CoinbaseFeePriceCalculator.eip1559()))
+        // change to check for max data gas per block for EIP-4844
+        .transactionValidatorBuilder(
+            (gasCalculator, gasLimitCalculator) ->
+                new MainnetTransactionValidator(
+                    gasCalculator,
+                    gasLimitCalculator,
+                    cancunFeeMarket,
+                    true,
+                    chainId,
+                    Set.of(
+                        TransactionType.FRONTIER,
+                        TransactionType.ACCESS_LIST,
+                        TransactionType.EIP1559,
+                        TransactionType.BLOB),
+                    SHANGHAI_INIT_CODE_SIZE_LIMIT))
+        .precompileContractRegistryBuilder(MainnetPrecompiledContractRegistries::cancun)
+        .name("Cancun");
+  }
+
+  static ProtocolSpecBuilder futureEipsDefinition(
+      final Optional<BigInteger> chainId,
+      final OptionalInt configContractSizeLimit,
+      final OptionalInt configStackSizeLimit,
+      final boolean enableRevertReason,
+      final GenesisConfigOptions genesisConfigOptions,
+      final EvmConfiguration evmConfiguration) {
+
+    return cancunDefinition(
+            chainId,
+            configContractSizeLimit,
+            configStackSizeLimit,
+            enableRevertReason,
+            genesisConfigOptions,
+            evmConfiguration)
+        .evmBuilder(
+            (gasCalculator, jdCacheConfig) ->
+                MainnetEVMs.futureEips(
+                    gasCalculator, chainId.orElse(BigInteger.ZERO), evmConfiguration))
+        .precompileContractRegistryBuilder(MainnetPrecompiledContractRegistries::futureEips)
+        .name("FutureEips");
+  }
+
+  static ProtocolSpecBuilder experimentalEipsDefinition(
+      final Optional<BigInteger> chainId,
+      final OptionalInt configContractSizeLimit,
+      final OptionalInt configStackSizeLimit,
+      final boolean enableRevertReason,
+      final GenesisConfigOptions genesisConfigOptions,
+      final EvmConfiguration evmConfiguration) {
+
+    final Address depositContractAddress =
+        genesisConfigOptions.getDepositContractAddress().orElse(DEFAULT_DEPOSIT_CONTRACT_ADDRESS);
+
+    return futureEipsDefinition(
+            chainId,
+            configContractSizeLimit,
+            configStackSizeLimit,
+            enableRevertReason,
+            genesisConfigOptions,
+            evmConfiguration)
+        .evmBuilder(
+            (gasCalculator, jdCacheConfig) ->
+                MainnetEVMs.experimentalEips(
+                    gasCalculator, chainId.orElse(BigInteger.ZERO), evmConfiguration))
+        .depositsValidator(new DepositsValidator.AllowedDeposits(depositContractAddress))
+        .name("ExperimentalEips");
   }
 
   private static TransactionReceipt frontierTransactionReceiptFactory(
@@ -469,7 +767,7 @@ private static TransactionReceipt frontierTransactionReceiptFactory(
       final WorldState worldState,
       final long gasUsed) {
     return new TransactionReceipt(
-        worldState.rootHash(),
+        worldState.frontierRootHash(),
         gasUsed,
         result.getLogs(),
         Optional.empty()); // No revert reason in frontier
@@ -495,7 +793,7 @@ private static TransactionReceipt byzantiumTransactionReceiptFactoryWithReasonEn
         result.isSuccessful() ? 1 : 0, gasUsed, result.getLogs(), result.getRevertReason());
   }
 
-  private static TransactionReceipt berlinTransactionReceiptFactory(
+  static TransactionReceipt berlinTransactionReceiptFactory(
       final TransactionType transactionType,
       final TransactionProcessingResult transactionProcessingResult,
       final WorldState worldState,
@@ -508,7 +806,7 @@ private static TransactionReceipt berlinTransactionReceiptFactory(
         Optional.empty());
   }
 
-  private static TransactionReceipt berlinTransactionReceiptFactoryWithReasonEnabled(
+  static TransactionReceipt berlinTransactionReceiptFactoryWithReasonEnabled(
       final TransactionType transactionType,
       final TransactionProcessingResult transactionProcessingResult,
       final WorldState worldState,
@@ -530,16 +828,25 @@ public DaoBlockProcessor(final BlockProcessor wrapped) {
     }
 
     @Override
-    public Result processBlock(
+    public BlockProcessingResult processBlock(
         final Blockchain blockchain,
         final MutableWorldState worldState,
         final BlockHeader blockHeader,
         final List<Transaction> transactions,
         final List<BlockHeader> ommers,
+        final Optional<List<Withdrawal>> withdrawals,
+        final Optional<List<Deposit>> deposits,
         final PrivateMetadataUpdater privateMetadataUpdater) {
       updateWorldStateForDao(worldState);
       return wrapped.processBlock(
-          blockchain, worldState, blockHeader, transactions, ommers, privateMetadataUpdater);
+          blockchain,
+          worldState,
+          blockHeader,
+          transactions,
+          ommers,
+          withdrawals,
+          deposits,
+          privateMetadataUpdater);
     }
 
     private static final Address DAO_REFUND_CONTRACT_ADDRESS =
@@ -555,7 +862,7 @@ private void updateWorldStateForDao(final MutableWorldState worldState) {
             IntStream.range(0, json.size())
                 .mapToObj(json::getString)
                 .map(Address::fromHexString)
-                .collect(Collectors.toList());
+                .toList();
         final WorldUpdater worldUpdater = worldState.updater();
         final MutableAccount daoRefundContract =
             worldUpdater.getOrCreate(DAO_REFUND_CONTRACT_ADDRESS).getMutable();
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java
index 741e6626fe3..181b43e91f5 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java
@@ -14,46 +14,57 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
+import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_IS_PERSISTING_PRIVATE_STATE;
+import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_PRIVATE_METADATA_UPDATER;
+import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_TRANSACTION;
+import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_TRANSACTION_HASH;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.AccountState;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.EvmAccount;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
 import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.core.fees.CoinbaseFeePriceCalculator;
-import org.hyperledger.besu.ethereum.core.fees.TransactionPriceCalculator;
+import org.hyperledger.besu.ethereum.core.feemarket.CoinbaseFeePriceCalculator;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateMetadataUpdater;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
+import org.hyperledger.besu.ethereum.trie.MerkleTrieException;
 import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
-import org.hyperledger.besu.ethereum.vm.Code;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.OperationTracer;
-import org.hyperledger.besu.ethereum.vm.operations.ReturnStack;
-import org.hyperledger.besu.plugin.data.TransactionType;
+import org.hyperledger.besu.evm.AccessListEntry;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.account.EvmAccount;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.code.CodeV0;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.processor.AbstractMessageProcessor;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.util.ArrayDeque;
-import java.util.ArrayList;
 import java.util.Deque;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Multimap;
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MainnetTransactionProcessor {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(MainnetTransactionProcessor.class);
 
-  private final GasCalculator gasCalculator;
+  protected final GasCalculator gasCalculator;
 
-  private final MainnetTransactionValidator transactionValidator;
+  protected final MainnetTransactionValidator transactionValidator;
 
   private final AbstractMessageProcessor contractCreationProcessor;
 
@@ -61,11 +72,34 @@ public class MainnetTransactionProcessor {
 
   private final int maxStackSize;
 
-  private final int createContractAccountVersion;
+  private final boolean clearEmptyAccounts;
+
+  protected final boolean warmCoinbase;
 
-  private final TransactionPriceCalculator transactionPriceCalculator;
+  protected final FeeMarket feeMarket;
   private final CoinbaseFeePriceCalculator coinbaseFeePriceCalculator;
 
+  public MainnetTransactionProcessor(
+      final GasCalculator gasCalculator,
+      final MainnetTransactionValidator transactionValidator,
+      final AbstractMessageProcessor contractCreationProcessor,
+      final AbstractMessageProcessor messageCallProcessor,
+      final boolean clearEmptyAccounts,
+      final boolean warmCoinbase,
+      final int maxStackSize,
+      final FeeMarket feeMarket,
+      final CoinbaseFeePriceCalculator coinbaseFeePriceCalculator) {
+    this.gasCalculator = gasCalculator;
+    this.transactionValidator = transactionValidator;
+    this.contractCreationProcessor = contractCreationProcessor;
+    this.messageCallProcessor = messageCallProcessor;
+    this.clearEmptyAccounts = clearEmptyAccounts;
+    this.warmCoinbase = warmCoinbase;
+    this.maxStackSize = maxStackSize;
+    this.feeMarket = feeMarket;
+    this.coinbaseFeePriceCalculator = coinbaseFeePriceCalculator;
+  }
+
   /**
    * Applies a transaction to the current system state.
    *
@@ -90,7 +124,8 @@ public TransactionProcessingResult processTransaction(
       final Address miningBeneficiary,
       final BlockHashLookup blockHashLookup,
       final Boolean isPersistingPrivateState,
-      final TransactionValidationParams transactionValidationParams) {
+      final TransactionValidationParams transactionValidationParams,
+      final Wei dataGasPrice) {
     return processTransaction(
         blockchain,
         worldState,
@@ -100,7 +135,9 @@ public TransactionProcessingResult processTransaction(
         OperationTracer.NO_TRACING,
         blockHashLookup,
         isPersistingPrivateState,
-        transactionValidationParams);
+        transactionValidationParams,
+        null,
+        dataGasPrice);
   }
 
   /**
@@ -129,7 +166,8 @@ public TransactionProcessingResult processTransaction(
       final BlockHashLookup blockHashLookup,
       final Boolean isPersistingPrivateState,
       final TransactionValidationParams transactionValidationParams,
-      final OperationTracer operationTracer) {
+      final OperationTracer operationTracer,
+      final Wei dataGasPrice) {
     return processTransaction(
         blockchain,
         worldState,
@@ -139,7 +177,9 @@ public TransactionProcessingResult processTransaction(
         operationTracer,
         blockHashLookup,
         isPersistingPrivateState,
-        transactionValidationParams);
+        transactionValidationParams,
+        null,
+        dataGasPrice);
   }
 
   /**
@@ -163,7 +203,8 @@ public TransactionProcessingResult processTransaction(
       final Address miningBeneficiary,
       final OperationTracer operationTracer,
       final BlockHashLookup blockHashLookup,
-      final Boolean isPersistingPrivateState) {
+      final Boolean isPersistingPrivateState,
+      final Wei dataGasPrice) {
     return processTransaction(
         blockchain,
         worldState,
@@ -173,7 +214,9 @@ public TransactionProcessingResult processTransaction(
         operationTracer,
         blockHashLookup,
         isPersistingPrivateState,
-        ImmutableTransactionValidationParams.builder().build());
+        ImmutableTransactionValidationParams.builder().build(),
+        null,
+        dataGasPrice);
   }
 
   /**
@@ -199,7 +242,8 @@ public TransactionProcessingResult processTransaction(
       final OperationTracer operationTracer,
       final BlockHashLookup blockHashLookup,
       final Boolean isPersistingPrivateState,
-      final TransactionValidationParams transactionValidationParams) {
+      final TransactionValidationParams transactionValidationParams,
+      final Wei dataGasPrice) {
     return processTransaction(
         blockchain,
         worldState,
@@ -210,34 +254,12 @@ public TransactionProcessingResult processTransaction(
         blockHashLookup,
         isPersistingPrivateState,
         transactionValidationParams,
-        null);
-  }
-
-  private final boolean clearEmptyAccounts;
-
-  public MainnetTransactionProcessor(
-      final GasCalculator gasCalculator,
-      final MainnetTransactionValidator transactionValidator,
-      final AbstractMessageProcessor contractCreationProcessor,
-      final AbstractMessageProcessor messageCallProcessor,
-      final boolean clearEmptyAccounts,
-      final int maxStackSize,
-      final int createContractAccountVersion,
-      final TransactionPriceCalculator transactionPriceCalculator,
-      final CoinbaseFeePriceCalculator coinbaseFeePriceCalculator) {
-    this.gasCalculator = gasCalculator;
-    this.transactionValidator = transactionValidator;
-    this.contractCreationProcessor = contractCreationProcessor;
-    this.messageCallProcessor = messageCallProcessor;
-    this.clearEmptyAccounts = clearEmptyAccounts;
-    this.maxStackSize = maxStackSize;
-    this.createContractAccountVersion = createContractAccountVersion;
-    this.transactionPriceCalculator = transactionPriceCalculator;
-    this.coinbaseFeePriceCalculator = coinbaseFeePriceCalculator;
+        null,
+        dataGasPrice);
   }
 
   public TransactionProcessingResult processTransaction(
-      final Blockchain blockchain,
+      final Blockchain ignoredBlockchain,
       final WorldUpdater worldState,
       final ProcessableBlockHeader blockHeader,
       final Transaction transaction,
@@ -246,22 +268,25 @@ public TransactionProcessingResult processTransaction(
       final BlockHashLookup blockHashLookup,
       final Boolean isPersistingPrivateState,
       final TransactionValidationParams transactionValidationParams,
-      final PrivateMetadataUpdater privateMetadataUpdater) {
+      final PrivateMetadataUpdater privateMetadataUpdater,
+      final Wei dataGasPrice) {
     try {
       LOG.trace("Starting execution of {}", transaction);
-
       ValidationResult<TransactionInvalidReason> validationResult =
-          transactionValidator.validate(transaction, blockHeader.getBaseFee());
+          transactionValidator.validate(
+              transaction, blockHeader.getBaseFee(), transactionValidationParams);
       // Make sure the transaction is intrinsically valid before trying to
       // compare against a sender account (because the transaction may not
       // be signed correctly to extract the sender).
       if (!validationResult.isValid()) {
-        LOG.warn("Invalid transaction: {}", validationResult.getErrorMessage());
+        LOG.debug("Invalid transaction: {}", validationResult.getErrorMessage());
         return TransactionProcessingResult.invalid(validationResult);
       }
 
       final Address senderAddress = transaction.getSender();
-      final EvmAccount sender = worldState.getOrCreate(senderAddress);
+
+      final EvmAccount sender = worldState.getOrCreateSenderAccount(senderAddress);
+
       validationResult =
           transactionValidator.validateForSender(transaction, sender, transactionValidationParams);
       if (!validationResult.isValid()) {
@@ -271,15 +296,19 @@ public TransactionProcessingResult processTransaction(
 
       final MutableAccount senderMutableAccount = sender.getMutable();
       final long previousNonce = senderMutableAccount.incrementNonce();
-      final Wei transactionGasPrice =
-          transactionPriceCalculator.price(transaction, blockHeader.getBaseFee());
       LOG.trace(
           "Incremented sender {} nonce ({} -> {})",
           senderAddress,
           previousNonce,
           sender.getNonce());
 
-      final Wei upfrontGasCost = transaction.getUpfrontGasCost(transactionGasPrice);
+      final Wei transactionGasPrice =
+          feeMarket.getTransactionPriceCalculator().price(transaction, blockHeader.getBaseFee());
+
+      final long dataGas = gasCalculator.dataGasCost(transaction.getBlobCount());
+
+      final Wei upfrontGasCost =
+          transaction.getUpfrontGasCost(transactionGasPrice, dataGasPrice, dataGas);
       final Wei previousBalance = senderMutableAccount.decrementBalance(upfrontGasCost);
       LOG.trace(
           "Deducted sender {} upfront gas cost {} ({} -> {})",
@@ -288,53 +317,85 @@ public TransactionProcessingResult processTransaction(
           previousBalance,
           sender.getBalance());
 
-      final Gas intrinsicGas = gasCalculator.transactionIntrinsicGasCost(transaction);
-      final Gas gasAvailable = Gas.of(transaction.getGasLimit()).minus(intrinsicGas);
+      final List<AccessListEntry> accessListEntries = transaction.getAccessList().orElse(List.of());
+      // we need to keep a separate hash set of addresses in case they specify no storage.
+      // No-storage is a common pattern, especially for Externally Owned Accounts
+      final Set<Address> addressList = new HashSet<>();
+      final Multimap<Address, Bytes32> storageList = HashMultimap.create();
+      int accessListStorageCount = 0;
+      for (final var entry : accessListEntries) {
+        final Address address = entry.getAddress();
+        addressList.add(address);
+        final List<Bytes32> storageKeys = entry.getStorageKeys();
+        storageList.putAll(address, storageKeys);
+        accessListStorageCount += storageKeys.size();
+      }
+      if (warmCoinbase) {
+        addressList.add(miningBeneficiary);
+      }
+
+      final long intrinsicGas =
+          gasCalculator.transactionIntrinsicGasCost(
+              transaction.getPayload(), transaction.isContractCreation());
+      final long accessListGas =
+          gasCalculator.accessListGasCost(accessListEntries.size(), accessListStorageCount);
+
+      final long gasAvailable = transaction.getGasLimit() - intrinsicGas - accessListGas;
       LOG.trace(
-          "Gas available for execution {} = {} - {} (limit - intrinsic)",
+          "Gas available for execution {} = {} - {} - {} (limit - intrinsic - accessList)",
           gasAvailable,
           transaction.getGasLimit(),
-          intrinsicGas);
+          intrinsicGas,
+          accessListGas);
 
       final WorldUpdater worldUpdater = worldState.updater();
       final Deque<MessageFrame> messageFrameStack = new ArrayDeque<>();
+      final ImmutableMap.Builder<String, Object> contextVariablesBuilder =
+          ImmutableMap.<String, Object>builder()
+              .put(KEY_IS_PERSISTING_PRIVATE_STATE, isPersistingPrivateState)
+              .put(KEY_TRANSACTION, transaction)
+              .put(KEY_TRANSACTION_HASH, transaction.getHash());
+      if (privateMetadataUpdater != null) {
+        contextVariablesBuilder.put(KEY_PRIVATE_METADATA_UPDATER, privateMetadataUpdater);
+      }
+
       final MessageFrame.Builder commonMessageFrameBuilder =
           MessageFrame.builder()
               .messageFrameStack(messageFrameStack)
               .maxStackSize(maxStackSize)
-              .returnStack(new ReturnStack())
-              .blockchain(blockchain)
-              .worldState(worldUpdater.updater())
+              .worldUpdater(worldUpdater.updater())
               .initialGas(gasAvailable)
               .originator(senderAddress)
               .gasPrice(transactionGasPrice)
               .sender(senderAddress)
               .value(transaction.getValue())
               .apparentValue(transaction.getValue())
-              .blockHeader(blockHeader)
+              .blockValues(blockHeader)
               .depth(0)
               .completer(__ -> {})
               .miningBeneficiary(miningBeneficiary)
               .blockHashLookup(blockHashLookup)
-              .isPersistingPrivateState(isPersistingPrivateState)
-              .transactionHash(transaction.getHash())
-              .privateMetadataUpdater(privateMetadataUpdater);
+              .contextVariables(contextVariablesBuilder.build())
+              .accessListWarmAddresses(addressList)
+              .accessListWarmStorage(storageList);
 
       final MessageFrame initialFrame;
       if (transaction.isContractCreation()) {
         final Address contractAddress =
-            Address.contractAddress(senderAddress, sender.getNonce() - 1L);
+            Address.contractAddress(senderAddress, senderMutableAccount.getNonce() - 1L);
 
+        final Bytes initCodeBytes = transaction.getPayload();
         initialFrame =
             commonMessageFrameBuilder
                 .type(MessageFrame.Type.CONTRACT_CREATION)
                 .address(contractAddress)
                 .contract(contractAddress)
-                .contractAccountVersion(createContractAccountVersion)
                 .inputData(Bytes.EMPTY)
-                .code(new Code(transaction.getPayload()))
+                .versionedHashes(transaction.getVersionedHashes())
+                .code(contractCreationProcessor.getCodeFromEVM(null, initCodeBytes))
                 .build();
       } else {
+        @SuppressWarnings("OptionalGetWithoutIsPresent") // isContractCall tests isPresent
         final Address to = transaction.getTo().get();
         final Optional<Account> maybeContract = Optional.ofNullable(worldState.get(to));
         initialFrame =
@@ -342,17 +403,24 @@ public TransactionProcessingResult processTransaction(
                 .type(MessageFrame.Type.MESSAGE_CALL)
                 .address(to)
                 .contract(to)
-                .contractAccountVersion(
-                    maybeContract.map(AccountState::getVersion).orElse(Account.DEFAULT_VERSION))
                 .inputData(transaction.getPayload())
-                .code(new Code(maybeContract.map(AccountState::getCode).orElse(Bytes.EMPTY)))
+                .versionedHashes(transaction.getVersionedHashes())
+                .code(
+                    maybeContract
+                        .map(c -> messageCallProcessor.getCodeFromEVM(c.getCodeHash(), c.getCode()))
+                        .orElse(CodeV0.EMPTY_CODE))
                 .build();
       }
 
       messageFrameStack.addFirst(initialFrame);
 
-      while (!messageFrameStack.isEmpty()) {
-        process(messageFrameStack.peekFirst(), operationTracer);
+      if (initialFrame.getCode().isValid()) {
+        while (!messageFrameStack.isEmpty()) {
+          process(messageFrameStack.peekFirst(), operationTracer);
+        }
+      } else {
+        initialFrame.setState(MessageFrame.State.EXCEPTIONAL_HALT);
+        initialFrame.setExceptionalHaltReason(Optional.of(ExceptionalHaltReason.INVALID_CODE));
       }
 
       if (initialFrame.getState() == MessageFrame.State.COMPLETED_SUCCESS) {
@@ -362,81 +430,79 @@ public TransactionProcessingResult processTransaction(
       if (LOG.isTraceEnabled()) {
         LOG.trace(
             "Gas used by transaction: {}, by message call/contract creation: {}",
-            () -> Gas.of(transaction.getGasLimit()).minus(initialFrame.getRemainingGas()),
-            () -> gasAvailable.minus(initialFrame.getRemainingGas()));
+            transaction.getGasLimit() - initialFrame.getRemainingGas(),
+            gasAvailable - initialFrame.getRemainingGas());
       }
 
       // Refund the sender by what we should and pay the miner fee (note that we're doing them one
       // after the other so that if it is the same account somehow, we end up with the right result)
-      final Gas selfDestructRefund =
-          gasCalculator.getSelfDestructRefundAmount().times(initialFrame.getSelfDestructs().size());
-      final Gas refundGas = initialFrame.getGasRefund().plus(selfDestructRefund);
-      final Gas refunded = refunded(transaction, initialFrame.getRemainingGas(), refundGas);
-      final Wei refundedWei = refunded.priceFor(transactionGasPrice);
+      final long selfDestructRefund =
+          gasCalculator.getSelfDestructRefundAmount() * initialFrame.getSelfDestructs().size();
+      final long baseRefundGas = initialFrame.getGasRefund() + selfDestructRefund;
+      final long refundedGas = refunded(transaction, initialFrame.getRemainingGas(), baseRefundGas);
+      final Wei refundedWei = transactionGasPrice.multiply(refundedGas);
       senderMutableAccount.incrementBalance(refundedWei);
 
-      final Gas gasUsedByTransaction =
-          Gas.of(transaction.getGasLimit()).minus(initialFrame.getRemainingGas());
+      final long gasUsedByTransaction = transaction.getGasLimit() - initialFrame.getRemainingGas();
 
-      final MutableAccount coinbase = worldState.getOrCreate(miningBeneficiary).getMutable();
-      final Gas coinbaseFee = Gas.of(transaction.getGasLimit()).minus(refunded);
-      if (blockHeader.getBaseFee().isPresent()
-          && transaction.getType().equals(TransactionType.EIP1559)) {
-        final Wei baseFee = Wei.of(blockHeader.getBaseFee().get());
+      // update the coinbase
+      final var coinbase = worldState.getOrCreate(miningBeneficiary).getMutable();
+      final long usedGas = transaction.getGasLimit() - refundedGas;
+      final CoinbaseFeePriceCalculator coinbaseCalculator;
+      if (blockHeader.getBaseFee().isPresent()) {
+        final Wei baseFee = blockHeader.getBaseFee().get();
         if (transactionGasPrice.compareTo(baseFee) < 0) {
           return TransactionProcessingResult.failed(
-              gasUsedByTransaction.toLong(),
-              refunded.toLong(),
+              gasUsedByTransaction,
+              refundedGas,
               ValidationResult.invalid(
                   TransactionInvalidReason.TRANSACTION_PRICE_TOO_LOW,
                   "transaction price must be greater than base fee"),
               Optional.empty());
         }
+        coinbaseCalculator = coinbaseFeePriceCalculator;
+      } else {
+        coinbaseCalculator = CoinbaseFeePriceCalculator.frontier();
       }
-      final CoinbaseFeePriceCalculator coinbaseCreditService =
-          transaction.getType().equals(TransactionType.FRONTIER)
-              ? CoinbaseFeePriceCalculator.frontier()
-              : coinbaseFeePriceCalculator;
+
       final Wei coinbaseWeiDelta =
-          coinbaseCreditService.price(coinbaseFee, transactionGasPrice, blockHeader.getBaseFee());
+          coinbaseCalculator.price(usedGas, transactionGasPrice, blockHeader.getBaseFee());
 
       coinbase.incrementBalance(coinbaseWeiDelta);
 
       initialFrame.getSelfDestructs().forEach(worldState::deleteAccount);
 
       if (clearEmptyAccounts) {
-        clearEmptyAccounts(worldState);
+        worldState.clearAccountsThatAreEmpty();
       }
 
       if (initialFrame.getState() == MessageFrame.State.COMPLETED_SUCCESS) {
         return TransactionProcessingResult.successful(
             initialFrame.getLogs(),
-            gasUsedByTransaction.toLong(),
-            refunded.toLong(),
+            gasUsedByTransaction,
+            refundedGas,
             initialFrame.getOutputData(),
             validationResult);
       } else {
         return TransactionProcessingResult.failed(
-            gasUsedByTransaction.toLong(),
-            refunded.toLong(),
-            validationResult,
-            initialFrame.getRevertReason());
+            gasUsedByTransaction, refundedGas, validationResult, initialFrame.getRevertReason());
       }
+    } catch (final MerkleTrieException re) {
+      // need to throw to trigger the heal
+      throw re;
     } catch (final RuntimeException re) {
       LOG.error("Critical Exception Processing Transaction", re);
       return TransactionProcessingResult.invalid(
           ValidationResult.invalid(
-              TransactionInvalidReason.INTERNAL_ERROR,
-              "Internal Error in Besu - " + re.toString()));
+              TransactionInvalidReason.INTERNAL_ERROR, "Internal Error in Besu - " + re));
     }
   }
 
-  private static void clearEmptyAccounts(final WorldUpdater worldState) {
-    new ArrayList<>(worldState.getTouchedAccounts())
-        .stream().filter(Account::isEmpty).forEach(a -> worldState.deleteAccount(a.getAddress()));
+  public MainnetTransactionValidator getTransactionValidator() {
+    return transactionValidator;
   }
 
-  private void process(final MessageFrame frame, final OperationTracer operationTracer) {
+  protected void process(final MessageFrame frame, final OperationTracer operationTracer) {
     final AbstractMessageProcessor executor = getMessageProcessor(frame.getType());
 
     executor.process(frame, operationTracer);
@@ -453,12 +519,12 @@ private AbstractMessageProcessor getMessageProcessor(final MessageFrame.Type typ
     }
   }
 
-  private static Gas refunded(
-      final Transaction transaction, final Gas gasRemaining, final Gas gasRefund) {
-    // Integer truncation takes care of the the floor calculation needed after the divide.
-    final Gas maxRefundAllowance =
-        Gas.of(transaction.getGasLimit()).minus(gasRemaining).dividedBy(2);
-    final Gas refundAllowance = maxRefundAllowance.min(gasRefund);
-    return gasRemaining.plus(refundAllowance);
+  protected long refunded(
+      final Transaction transaction, final long gasRemaining, final long gasRefund) {
+    // Integer truncation takes care of the floor calculation needed after the divide.
+    final long maxRefundAllowance =
+        (transaction.getGasLimit() - gasRemaining) / gasCalculator.getMaxRefundQuotient();
+    final long refundAllowance = Math.min(maxRefundAllowance, gasRefund);
+    return gasRemaining + refundAllowance;
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidator.java
index cc69a5e88fb..549828ac906 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidator.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidator.java
@@ -14,15 +14,19 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
-import org.hyperledger.besu.crypto.SECP256K1;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Gas;
+import static org.hyperledger.besu.evm.account.Account.MAX_NONCE;
+
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionFilter;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.fees.TransactionPriceCalculator;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
 import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
 import org.hyperledger.besu.plugin.data.TransactionType;
 
 import java.math.BigInteger;
@@ -38,7 +42,8 @@
 public class MainnetTransactionValidator {
 
   private final GasCalculator gasCalculator;
-  private final Optional<TransactionPriceCalculator> transactionPriceCalculator;
+  private final GasLimitCalculator gasLimitCalculator;
+  private final FeeMarket feeMarket;
 
   private final boolean disallowSignatureMalleability;
 
@@ -46,35 +51,53 @@ public class MainnetTransactionValidator {
 
   private Optional<TransactionFilter> transactionFilter = Optional.empty();
   private final Set<TransactionType> acceptedTransactionTypes;
-  private final boolean goQuorumCompatibilityMode;
+
+  private final int maxInitcodeSize;
+
+  public MainnetTransactionValidator(
+      final GasCalculator gasCalculator,
+      final GasLimitCalculator gasLimitCalculator,
+      final boolean checkSignatureMalleability,
+      final Optional<BigInteger> chainId) {
+    this(
+        gasCalculator,
+        gasLimitCalculator,
+        checkSignatureMalleability,
+        chainId,
+        Set.of(TransactionType.FRONTIER));
+  }
 
   public MainnetTransactionValidator(
       final GasCalculator gasCalculator,
+      final GasLimitCalculator gasLimitCalculator,
       final boolean checkSignatureMalleability,
       final Optional<BigInteger> chainId,
-      final boolean goQuorumCompatibilityMode) {
+      final Set<TransactionType> acceptedTransactionTypes) {
     this(
         gasCalculator,
-        Optional.empty(),
+        gasLimitCalculator,
+        FeeMarket.legacy(),
         checkSignatureMalleability,
         chainId,
-        Set.of(TransactionType.FRONTIER),
-        goQuorumCompatibilityMode);
+        acceptedTransactionTypes,
+        Integer.MAX_VALUE);
   }
 
   public MainnetTransactionValidator(
       final GasCalculator gasCalculator,
-      final Optional<TransactionPriceCalculator> transactionPriceCalculator,
+      final GasLimitCalculator gasLimitCalculator,
+      final FeeMarket feeMarket,
       final boolean checkSignatureMalleability,
       final Optional<BigInteger> chainId,
       final Set<TransactionType> acceptedTransactionTypes,
-      final boolean goQuorumCompatibilityMode) {
+      final int maxInitcodeSize) {
     this.gasCalculator = gasCalculator;
-    this.transactionPriceCalculator = transactionPriceCalculator;
+    this.gasLimitCalculator = gasLimitCalculator;
+    this.feeMarket = feeMarket;
     this.disallowSignatureMalleability = checkSignatureMalleability;
     this.chainId = chainId;
     this.acceptedTransactionTypes = acceptedTransactionTypes;
-    this.goQuorumCompatibilityMode = goQuorumCompatibilityMode;
+    this.maxInitcodeSize = maxInitcodeSize;
   }
 
   /**
@@ -82,44 +105,90 @@ public MainnetTransactionValidator(
    *
    * @param transaction the transaction to validate
    * @param baseFee optional baseFee
-   * @return An empty @{link Optional} if the transaction is considered valid; otherwise an @{code
+   * @param transactionValidationParams Validation parameters that will be used
+   * @return An empty {@link Optional} if the transaction is considered valid; otherwise an {@code
    *     Optional} containing a {@link TransactionInvalidReason} that identifies why the transaction
    *     is invalid.
    */
   public ValidationResult<TransactionInvalidReason> validate(
-      final Transaction transaction, final Optional<Long> baseFee) {
+      final Transaction transaction,
+      final Optional<Wei> baseFee,
+      final TransactionValidationParams transactionValidationParams) {
     final ValidationResult<TransactionInvalidReason> signatureResult =
         validateTransactionSignature(transaction);
     if (!signatureResult.isValid()) {
       return signatureResult;
     }
 
-    if (goQuorumCompatibilityMode && !transaction.getGasPrice().isZero()) {
-      return ValidationResult.invalid(
-          TransactionInvalidReason.GAS_PRICE_MUST_BE_ZERO,
-          "gasPrice must be set to zero on a GoQuorum compatible network");
-    }
-
     final TransactionType transactionType = transaction.getType();
     if (!acceptedTransactionTypes.contains(transactionType)) {
       return ValidationResult.invalid(
           TransactionInvalidReason.INVALID_TRANSACTION_FORMAT,
           String.format(
               "Transaction type %s is invalid, accepted transaction types are %s",
-              transactionType, acceptedTransactionTypes.toString()));
+              transactionType, acceptedTransactionTypes));
+    }
+
+    if (transaction.getNonce() == MAX_NONCE) {
+      return ValidationResult.invalid(
+          TransactionInvalidReason.NONCE_OVERFLOW, "Nonce must be less than 2^64-1");
     }
 
-    if (transactionType.equals(TransactionType.EIP1559)) {
-      final Wei price = transactionPriceCalculator.orElseThrow().price(transaction, baseFee);
-      if (price.compareTo(Wei.of(baseFee.orElseThrow())) < 0) {
+    if (transaction.isContractCreation() && transaction.getPayload().size() > maxInitcodeSize) {
+      return ValidationResult.invalid(
+          TransactionInvalidReason.INITCODE_TOO_LARGE,
+          String.format(
+              "Initcode size of %d exceeds maximum size of %s",
+              transaction.getPayload().size(), maxInitcodeSize));
+    }
+
+    return validateCostAndFee(transaction, baseFee, transactionValidationParams);
+  }
+
+  private ValidationResult<TransactionInvalidReason> validateCostAndFee(
+      final Transaction transaction,
+      final Optional<Wei> maybeBaseFee,
+      final TransactionValidationParams transactionValidationParams) {
+
+    if (maybeBaseFee.isPresent()) {
+      final Wei price = feeMarket.getTransactionPriceCalculator().price(transaction, maybeBaseFee);
+      if (!transactionValidationParams.isAllowMaxFeeGasBelowBaseFee()
+          && price.compareTo(maybeBaseFee.orElseThrow()) < 0) {
+        return ValidationResult.invalid(
+            TransactionInvalidReason.GAS_PRICE_BELOW_CURRENT_BASE_FEE,
+            "gasPrice is less than the current BaseFee");
+      }
+
+      // assert transaction.max_fee_per_gas >= transaction.max_priority_fee_per_gas
+      if (transaction.getType().supports1559FeeMarket()
+          && transaction
+                  .getMaxPriorityFeePerGas()
+                  .get()
+                  .getAsBigInteger()
+                  .compareTo(transaction.getMaxFeePerGas().get().getAsBigInteger())
+              > 0) {
+        return ValidationResult.invalid(
+            TransactionInvalidReason.MAX_PRIORITY_FEE_PER_GAS_EXCEEDS_MAX_FEE_PER_GAS,
+            "max priority fee per gas cannot be greater than max fee per gas");
+      }
+    }
+
+    if (transaction.getType().supportsBlob()) {
+      final long txTotalDataGas = gasCalculator.dataGasCost(transaction.getBlobCount());
+      if (txTotalDataGas > gasLimitCalculator.currentDataGasLimit()) {
         return ValidationResult.invalid(
-            TransactionInvalidReason.INVALID_TRANSACTION_FORMAT,
-            String.format("gasPrice is less than the current BaseFee"));
+            TransactionInvalidReason.TOTAL_DATA_GAS_TOO_HIGH,
+            String.format(
+                "total data gas %d exceeds max data gas per block %d",
+                txTotalDataGas, gasLimitCalculator.currentDataGasLimit()));
       }
     }
 
-    final Gas intrinsicGasCost = gasCalculator.transactionIntrinsicGasCost(transaction);
-    if (intrinsicGasCost.compareTo(Gas.of(transaction.getGasLimit())) > 0) {
+    final long intrinsicGasCost =
+        gasCalculator.transactionIntrinsicGasCost(
+                transaction.getPayload(), transaction.isContractCreation())
+            + (transaction.getAccessList().map(gasCalculator::accessListGasCost).orElse(0L));
+    if (Long.compareUnsigned(intrinsicGasCost, transaction.getGasLimit()) > 0) {
       return ValidationResult.invalid(
           TransactionInvalidReason.INTRINSIC_GAS_EXCEEDS_GAS_LIMIT,
           String.format(
@@ -136,18 +205,22 @@ public ValidationResult<TransactionInvalidReason> validateForSender(
       final TransactionValidationParams validationParams) {
     Wei senderBalance = Account.DEFAULT_BALANCE;
     long senderNonce = Account.DEFAULT_NONCE;
+    Hash codeHash = Hash.EMPTY;
 
     if (sender != null) {
       senderBalance = sender.getBalance();
       senderNonce = sender.getNonce();
+      if (sender.getCodeHash() != null) codeHash = sender.getCodeHash();
     }
 
-    if (transaction.getUpfrontCost().compareTo(senderBalance) > 0) {
+    final Wei upfrontCost =
+        transaction.getUpfrontCost(gasCalculator.dataGasCost(transaction.getBlobCount()));
+    if (upfrontCost.compareTo(senderBalance) > 0) {
       return ValidationResult.invalid(
           TransactionInvalidReason.UPFRONT_COST_EXCEEDS_BALANCE,
           String.format(
               "transaction up-front cost %s exceeds transaction sender account balance %s",
-              transaction.getUpfrontCost(), senderBalance));
+              upfrontCost.toQuantityHexString(), senderBalance.toQuantityHexString()));
     }
 
     if (transaction.getNonce() < senderNonce) {
@@ -160,12 +233,20 @@ public ValidationResult<TransactionInvalidReason> validateForSender(
 
     if (!validationParams.isAllowFutureNonce() && senderNonce != transaction.getNonce()) {
       return ValidationResult.invalid(
-          TransactionInvalidReason.INCORRECT_NONCE,
+          TransactionInvalidReason.NONCE_TOO_HIGH,
           String.format(
               "transaction nonce %s does not match sender account nonce %s.",
               transaction.getNonce(), senderNonce));
     }
 
+    if (!validationParams.isAllowContractAddressAsSender() && !codeHash.equals(Hash.EMPTY)) {
+      return ValidationResult.invalid(
+          TransactionInvalidReason.TX_SENDER_NOT_AUTHORIZED,
+          String.format(
+              "Sender %s has deployed code and so is not authorized to send transactions",
+              transaction.getSender()));
+    }
+
     if (!isSenderAllowed(transaction, validationParams)) {
       return ValidationResult.invalid(
           TransactionInvalidReason.TX_SENDER_NOT_AUTHORIZED,
@@ -175,6 +256,10 @@ public ValidationResult<TransactionInvalidReason> validateForSender(
     return ValidationResult.valid();
   }
 
+  public boolean isReplayProtectionSupported() {
+    return chainId.isPresent();
+  }
+
   public ValidationResult<TransactionInvalidReason> validateTransactionSignature(
       final Transaction transaction) {
     if (chainId.isPresent()
@@ -186,20 +271,20 @@ public ValidationResult<TransactionInvalidReason> validateTransactionSignature(
               transaction.getChainId().get(), chainId.get()));
     }
 
-    if (!chainId.isPresent() && transaction.getChainId().isPresent()) {
+    if (chainId.isEmpty() && transaction.getChainId().isPresent()) {
       return ValidationResult.invalid(
           TransactionInvalidReason.REPLAY_PROTECTED_SIGNATURES_NOT_SUPPORTED,
           "replay protected signatures is not supported");
     }
 
-    final SECP256K1.Signature signature = transaction.getSignature();
-    if (disallowSignatureMalleability
-        && signature.getS().compareTo(SECP256K1.HALF_CURVE_ORDER) > 0) {
+    final SECPSignature signature = transaction.getSignature();
+    final BigInteger halfCurveOrder = SignatureAlgorithmFactory.getInstance().getHalfCurveOrder();
+    if (disallowSignatureMalleability && signature.getS().compareTo(halfCurveOrder) > 0) {
       return ValidationResult.invalid(
           TransactionInvalidReason.INVALID_SIGNATURE,
           String.format(
               "Signature s value should be less than %s, but got %s",
-              SECP256K1.HALF_CURVE_ORDER, signature.getS()));
+              halfCurveOrder, signature.getS()));
     }
 
     // org.bouncycastle.math.ec.ECCurve.AbstractFp.decompressPoint throws an
@@ -211,7 +296,6 @@ public ValidationResult<TransactionInvalidReason> validateTransactionSignature(
           TransactionInvalidReason.INVALID_SIGNATURE,
           "sender could not be extracted from transaction signature");
     }
-
     return ValidationResult.valid();
   }
 
@@ -236,7 +320,7 @@ public void setTransactionFilter(final TransactionFilter transactionFilter) {
   }
 
   /**
-   * Asserts whether a transaction is valid for the sender accounts current state.
+   * Asserts whether a transaction is valid for the sender account's current state.
    *
    * <p>Note: {@code validate} should be called before getting the sender {@link Account} used in
    * this method to ensure that a sender can be extracted from the {@link Transaction}.
@@ -247,7 +331,7 @@ public void setTransactionFilter(final TransactionFilter transactionFilter) {
    *     will be considered valid (used when received transactions in the transaction pool). If
    *     false, only a transaction with the nonce equals the account nonce will be considered valid
    *     (used when processing transactions).
-   * @return An empty @{link Optional} if the transaction is considered valid; otherwise an @{code
+   * @return An empty {@link Optional} if the transaction is considered valid; otherwise an {@code
    *     Optional} containing a {@link TransactionInvalidReason} that identifies why the transaction
    *     is invalid.
    */
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MiningBeneficiaryCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MiningBeneficiaryCalculator.java
index 3577c266cc8..7afb9fb22a8 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MiningBeneficiaryCalculator.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MiningBeneficiaryCalculator.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 
 @FunctionalInterface
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MutableProtocolSchedule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MutableProtocolSchedule.java
deleted file mode 100644
index 0166e05635c..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MutableProtocolSchedule.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import org.hyperledger.besu.ethereum.core.TransactionFilter;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
-
-import java.math.BigInteger;
-import java.util.Comparator;
-import java.util.NavigableSet;
-import java.util.Optional;
-import java.util.TreeSet;
-import java.util.stream.Collectors;
-
-public class MutableProtocolSchedule implements ProtocolSchedule {
-
-  private final NavigableSet<ScheduledProtocolSpec> protocolSpecs =
-      new TreeSet<>(
-          Comparator.<ScheduledProtocolSpec, Long>comparing(ScheduledProtocolSpec::getBlock)
-              .reversed());
-  private final Optional<BigInteger> chainId;
-
-  public MutableProtocolSchedule(final Optional<BigInteger> chainId) {
-    this.chainId = chainId;
-  }
-
-  @Override
-  public Optional<BigInteger> getChainId() {
-    return chainId;
-  }
-
-  public void putMilestone(final long blockNumber, final ProtocolSpec protocolSpec) {
-    final ScheduledProtocolSpec scheduledProtocolSpec =
-        new ScheduledProtocolSpec(blockNumber, protocolSpec);
-    // Ensure this replaces any existing spec at the same block number.
-    protocolSpecs.remove(scheduledProtocolSpec);
-    protocolSpecs.add(scheduledProtocolSpec);
-  }
-
-  @Override
-  public ProtocolSpec getByBlockNumber(final long number) {
-    checkArgument(number >= 0, "number must be non-negative");
-    checkArgument(
-        !protocolSpecs.isEmpty(), "At least 1 milestone must be provided to the protocol schedule");
-    checkArgument(
-        protocolSpecs.last().getBlock() == 0, "There must be a milestone starting from block 0");
-    // protocolSpecs is sorted in descending block order, so the first one we find that's lower than
-    // the requested level will be the most appropriate spec
-    for (final ScheduledProtocolSpec s : protocolSpecs) {
-      if (number >= s.getBlock()) {
-        return s.getSpec();
-      }
-    }
-    return null;
-  }
-
-  public String listMilestones() {
-    return protocolSpecs.stream()
-        .sorted(Comparator.comparing(ScheduledProtocolSpec::getBlock))
-        .map(spec -> spec.getSpec().getName() + ": " + spec.getBlock())
-        .collect(Collectors.joining(", ", "[", "]"));
-  }
-
-  @Override
-  public void setTransactionFilter(final TransactionFilter transactionFilter) {
-    protocolSpecs.forEach(
-        spec -> spec.getSpec().getTransactionValidator().setTransactionFilter(transactionFilter));
-  }
-
-  @Override
-  public void setPublicWorldStateArchiveForPrivacyBlockProcessor(
-      final WorldStateArchive publicWorldStateArchive) {
-    protocolSpecs.forEach(
-        spec -> {
-          final BlockProcessor blockProcessor = spec.getSpec().getBlockProcessor();
-          if (PrivacyBlockProcessor.class.isAssignableFrom(blockProcessor.getClass()))
-            ((PrivacyBlockProcessor) blockProcessor)
-                .setPublicWorldStateArchive(publicWorldStateArchive);
-        });
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PoWHasher.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PoWHasher.java
new file mode 100644
index 00000000000..f578e0f8994
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PoWHasher.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public interface PoWHasher {
+
+  PoWHasher ETHASH_LIGHT = new EthashLight();
+  PoWHasher UNSUPPORTED = new Unsupported();
+
+  /**
+   * Hash of a particular block and nonce.
+   *
+   * @param nonce Block Nonce
+   * @param number Block Number
+   * @param epochCalc EpochCalculator for calculating epoch
+   * @param prePowHash Block Header (without mix digest and nonce) Hash
+   * @return the PoW solution computed by the hashing function
+   */
+  PoWSolution hash(long nonce, long number, EpochCalculator epochCalc, Bytes prePowHash);
+
+  /** Implementation of Ethash Hashimoto Light Implementation. */
+  final class EthashLight implements PoWHasher {
+
+    private static final EthHashCacheFactory cacheFactory = new EthHashCacheFactory();
+
+    private EthashLight() {}
+
+    @Override
+    public PoWSolution hash(
+        final long nonce,
+        final long number,
+        final EpochCalculator epochCalc,
+        final Bytes prePowHash) {
+      final EthHashCacheFactory.EthHashDescriptor cache =
+          cacheFactory.ethHashCacheFor(number, epochCalc);
+      final PoWSolution solution =
+          EthHash.hashimotoLight(cache.getDatasetSize(), cache.getCache(), prePowHash, nonce);
+      return solution;
+    }
+  }
+
+  /** Implementation of an inoperative hasher. */
+  final class Unsupported implements PoWHasher {
+
+    private Unsupported() {}
+
+    @Override
+    public PoWSolution hash(
+        final long nonce,
+        final long number,
+        final EpochCalculator epochCalc,
+        final Bytes prePowHash) {
+      throw new UnsupportedOperationException("Hashing is unsupported");
+    }
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PoWSolution.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PoWSolution.java
new file mode 100644
index 00000000000..e2dcb157cc9
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PoWSolution.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet;
+
+import org.hyperledger.besu.datatypes.Hash;
+
+import java.util.Objects;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class PoWSolution {
+  private final long nonce;
+  private final Hash mixHash;
+  private final Bytes powHash;
+  private final Bytes solution;
+
+  public PoWSolution(
+      final long nonce, final Hash mixHash, final Bytes solution, final Bytes powHash) {
+    this.nonce = nonce;
+    this.mixHash = mixHash;
+    this.solution = solution;
+    this.powHash = powHash;
+  }
+
+  public long getNonce() {
+    return nonce;
+  }
+
+  public Hash getMixHash() {
+    return mixHash;
+  }
+
+  public Bytes getPowHash() {
+    return powHash;
+  }
+
+  public Bytes getSolution() {
+    return solution;
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    PoWSolution that = (PoWSolution) o;
+    return nonce == that.nonce
+        && Objects.equals(mixHash, that.mixHash)
+        && Objects.equals(solution, that.solution)
+        && Objects.equals(powHash, that.powHash);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(nonce, mixHash, solution, powHash);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PoWSolver.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PoWSolver.java
new file mode 100644
index 00000000000..3248f304100
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PoWSolver.java
@@ -0,0 +1,218 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet;
+
+import org.hyperledger.besu.ethereum.chain.PoWObserver;
+import org.hyperledger.besu.util.Subscribers;
+
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+import com.google.common.base.Stopwatch;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.concurrent.ExpiringMap;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PoWSolver {
+
+  private final int maxOmmerDepth;
+  private static final Logger LOG = LoggerFactory.getLogger(PoWSolver.class);
+  private final long powJobTimeToLive;
+
+  public static class PoWSolverJob {
+
+    private final PoWSolverInputs inputs;
+    private final CompletableFuture<PoWSolution> nonceFuture;
+
+    PoWSolverJob(final PoWSolverInputs inputs, final CompletableFuture<PoWSolution> nonceFuture) {
+      this.inputs = inputs;
+      this.nonceFuture = nonceFuture;
+    }
+
+    public static PoWSolverJob createFromInputs(final PoWSolverInputs inputs) {
+      return new PoWSolverJob(inputs, new CompletableFuture<>());
+    }
+
+    PoWSolverInputs getInputs() {
+      return inputs;
+    }
+
+    public boolean isDone() {
+      return nonceFuture.isDone();
+    }
+
+    void solvedWith(final PoWSolution solution) {
+      nonceFuture.complete(solution);
+    }
+
+    public void cancel() {
+      nonceFuture.cancel(false);
+    }
+
+    public void failed(final Throwable ex) {
+      nonceFuture.completeExceptionally(ex);
+    }
+
+    PoWSolution getSolution() throws InterruptedException, ExecutionException {
+      return nonceFuture.get();
+    }
+  }
+
+  private final long NO_MINING_CONDUCTED = -1;
+
+  private final Iterable<Long> nonceGenerator;
+  private final PoWHasher poWHasher;
+  private volatile long hashesPerSecond = NO_MINING_CONDUCTED;
+  private final Boolean stratumMiningEnabled;
+  private final Subscribers<PoWObserver> ethHashObservers;
+  private final EpochCalculator epochCalculator;
+  private volatile Optional<PoWSolverJob> currentJob = Optional.empty();
+  private final ExpiringMap<Bytes, PoWSolverJob> currentJobs = new ExpiringMap<>();
+
+  public PoWSolver(
+      final Iterable<Long> nonceGenerator,
+      final PoWHasher poWHasher,
+      final Boolean stratumMiningEnabled,
+      final Subscribers<PoWObserver> ethHashObservers,
+      final EpochCalculator epochCalculator,
+      final long powJobTimeToLive,
+      final int maxOmmerDepth) {
+    this.nonceGenerator = nonceGenerator;
+    this.poWHasher = poWHasher;
+    this.stratumMiningEnabled = stratumMiningEnabled;
+    this.ethHashObservers = ethHashObservers;
+    ethHashObservers.forEach(observer -> observer.setSubmitWorkCallback(this::submitSolution));
+    this.epochCalculator = epochCalculator;
+    this.powJobTimeToLive = powJobTimeToLive;
+    this.maxOmmerDepth = maxOmmerDepth;
+  }
+
+  public PoWSolution solveFor(final PoWSolverJob job)
+      throws InterruptedException, ExecutionException {
+    currentJob = Optional.of(job);
+    currentJobs.put(
+        job.getInputs().getPrePowHash(), job, System.currentTimeMillis() + powJobTimeToLive);
+    if (stratumMiningEnabled) {
+      LOG.debug(
+          "solving with stratum miner for {} observers", ethHashObservers.getSubscriberCount());
+      ethHashObservers.forEach(observer -> observer.newJob(job.inputs));
+    } else {
+      LOG.debug("solving with cpu miner");
+      findValidNonce();
+    }
+    return job.getSolution();
+  }
+
+  private void findValidNonce() {
+    final Stopwatch operationTimer = Stopwatch.createStarted();
+    final PoWSolverJob job = currentJob.get();
+    long hashesExecuted = 0;
+    for (final Long n : nonceGenerator) {
+
+      if (job.isDone()) {
+        return;
+      }
+
+      final Optional<PoWSolution> solution = testNonce(job.getInputs(), n);
+      solution.ifPresent(job::solvedWith);
+
+      hashesExecuted++;
+      final double operationDurationSeconds = operationTimer.elapsed(TimeUnit.NANOSECONDS) / 1e9;
+      hashesPerSecond = (long) (hashesExecuted / operationDurationSeconds);
+    }
+    job.failed(new IllegalStateException("No valid nonce found."));
+  }
+
+  private Optional<PoWSolution> testNonce(final PoWSolverInputs inputs, final long nonce) {
+    return Optional.ofNullable(
+            poWHasher.hash(nonce, inputs.getBlockNumber(), epochCalculator, inputs.getPrePowHash()))
+        .filter(sol -> UInt256.fromBytes(sol.getSolution()).compareTo(inputs.getTarget()) <= 0);
+  }
+
+  public void cancel() {
+    currentJob.ifPresent(PoWSolverJob::cancel);
+  }
+
+  public Optional<PoWSolverInputs> getWorkDefinition() {
+    return currentJob.flatMap(job -> Optional.of(job.getInputs()));
+  }
+
+  public Optional<Long> hashesPerSecond() {
+    if (hashesPerSecond == NO_MINING_CONDUCTED) {
+      return Optional.empty();
+    }
+    return Optional.of(hashesPerSecond);
+  }
+
+  public boolean submitSolution(final PoWSolution solution) {
+    final Optional<PoWSolverJob> jobSnapshot = currentJob;
+    PoWSolverJob jobToTestWith = null;
+    if (jobSnapshot.isEmpty()) {
+      LOG.debug("No current job, rejecting miner work");
+      return false;
+    }
+
+    PoWSolverJob headJob = jobSnapshot.get();
+    if (headJob.getInputs().getPrePowHash().equals(solution.getPowHash())) {
+      LOG.debug("Head job matches the solution pow hash {}", solution.getPowHash());
+      jobToTestWith = headJob;
+    }
+    if (jobToTestWith == null) {
+      PoWSolverJob ommerCandidate = currentJobs.get(solution.getPowHash());
+      if (ommerCandidate != null) {
+        long distanceToHead =
+            headJob.getInputs().getBlockNumber() - ommerCandidate.getInputs().getBlockNumber();
+        LOG.debug(
+            "Found ommer candidate {} with block number {}, distance to head {}",
+            solution.getPowHash(),
+            ommerCandidate.getInputs().getBlockNumber(),
+            distanceToHead);
+        if (distanceToHead <= maxOmmerDepth) {
+          jobToTestWith = ommerCandidate;
+        } else {
+          LOG.debug("Discarded ommer solution as too far from head {}", distanceToHead);
+        }
+      }
+    }
+    if (jobToTestWith == null) {
+      LOG.debug("No matching job found for hash {}, rejecting solution", solution.getPowHash());
+      return false;
+    }
+    if (jobToTestWith.isDone()) {
+      LOG.debug("Matching job found for hash {}, but already solved", solution.getPowHash());
+      return false;
+    }
+    final PoWSolverInputs inputs = jobToTestWith.getInputs();
+
+    final Optional<PoWSolution> calculatedSolution = testNonce(inputs, solution.getNonce());
+
+    if (calculatedSolution.isPresent()) {
+      LOG.debug("Accepting a solution from a miner");
+      currentJobs.remove(solution.getPowHash());
+      jobToTestWith.solvedWith(calculatedSolution.get());
+      return true;
+    }
+    LOG.debug("Rejecting a solution from a miner");
+    return false;
+  }
+
+  public Iterable<Long> getNonceGenerator() {
+    return nonceGenerator;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PoWSolverInputs.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PoWSolverInputs.java
new file mode 100644
index 00000000000..fcb4297f055
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PoWSolverInputs.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+
+public class PoWSolverInputs {
+  private final UInt256 target;
+  private final Bytes prePowHash;
+  private final long blockNumber;
+
+  public PoWSolverInputs(final UInt256 target, final Bytes prePowHash, final long blockNumber) {
+    this.target = target;
+    this.prePowHash = prePowHash;
+    this.blockNumber = blockNumber;
+  }
+
+  public UInt256 getTarget() {
+    return target;
+  }
+
+  public Bytes getPrePowHash() {
+    return prePowHash;
+  }
+
+  public long getBlockNumber() {
+    return blockNumber;
+  }
+
+  @Override
+  public String toString() {
+    return "PoWSolverInputs{"
+        + "target="
+        + target
+        + ", prePowHash="
+        + prePowHash
+        + ", blockNumber="
+        + blockNumber
+        + '}';
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrecompileContractRegistry.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrecompileContractRegistry.java
deleted file mode 100644
index 0660b11d003..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrecompileContractRegistry.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import org.hyperledger.besu.ethereum.core.Address;
-
-import com.google.common.collect.HashBasedTable;
-import com.google.common.collect.Table;
-
-/** Encapsulates a group of {@link PrecompiledContract}s used together. */
-public class PrecompileContractRegistry {
-
-  private final Table<Address, Integer, PrecompiledContract> precompiles;
-
-  public PrecompileContractRegistry() {
-    this.precompiles = HashBasedTable.create(16, 2);
-  }
-
-  public PrecompiledContract get(final Address address, final int contractAccountVersion) {
-    return precompiles.get(address, contractAccountVersion);
-  }
-
-  public void put(
-      final Address address,
-      final int contractAccountVersion,
-      final PrecompiledContract precompile) {
-    precompiles.put(address, contractAccountVersion, precompile);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrecompiledContract.java
deleted file mode 100644
index 7b6f17da9d7..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrecompiledContract.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import javax.annotation.Nonnull;
-
-import org.apache.tuweni.bytes.Bytes;
-
-/**
- * A pre-compiled contract.
- *
- * <p>It corresponds to one of the function defined in Appendix E of the Yellow Paper (rev.
- * a91c29c).
- */
-public interface PrecompiledContract {
-
-  /**
-   * Returns the pre-compiled contract name.
-   *
-   * @return the pre-compiled contract name
-   */
-  String getName();
-
-  /**
-   * Gas requirement for the contract.
-   *
-   * @param input the input for the pre-compiled contract (on which the gas requirement may or may
-   *     not depend).
-   * @return the gas requirement (cost) for the pre-compiled contract.
-   */
-  Gas gasRequirement(Bytes input);
-
-  /**
-   * Executes the pre-compiled contract.
-   *
-   * @param input the input for the pre-compiled contract.
-   * @param messageFrame context for this message
-   * @return the output of the pre-compiled contract.
-   */
-  Bytes compute(Bytes input, @Nonnull MessageFrame messageFrame);
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrecompiledContractConfiguration.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrecompiledContractConfiguration.java
index bf56af301a0..b2956c36473 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrecompiledContractConfiguration.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrecompiledContractConfiguration.java
@@ -15,7 +15,7 @@
 package org.hyperledger.besu.ethereum.mainnet;
 
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
 
 public class PrecompiledContractConfiguration {
   private GasCalculator gasCalculator;
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrivacyBlockProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrivacyBlockProcessor.java
index 11abefde05c..0db16f0c4db 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrivacyBlockProcessor.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrivacyBlockProcessor.java
@@ -14,15 +14,20 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY;
+
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.enclave.Enclave;
 import org.hyperledger.besu.enclave.EnclaveClientException;
 import org.hyperledger.besu.enclave.types.ReceiveResponse;
+import org.hyperledger.besu.ethereum.BlockProcessingResult;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.core.Deposit;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+import org.hyperledger.besu.ethereum.privacy.PrivateStateGenesisAllocator;
 import org.hyperledger.besu.ethereum.privacy.PrivateStateRehydration;
 import org.hyperledger.besu.ethereum.privacy.PrivateStateRootResolver;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransactionWithMetadata;
@@ -38,14 +43,14 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PrivacyBlockProcessor implements BlockProcessor {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PrivacyBlockProcessor.class);
 
   private final BlockProcessor blockProcessor;
   private final ProtocolSchedule protocolSchedule;
@@ -53,6 +58,7 @@ public class PrivacyBlockProcessor implements BlockProcessor {
   private final PrivateStateStorage privateStateStorage;
   private final WorldStateArchive privateWorldStateArchive;
   private final PrivateStateRootResolver privateStateRootResolver;
+  private final PrivateStateGenesisAllocator privateStateGenesisAllocator;
   private WorldStateArchive publicWorldStateArchive;
 
   public PrivacyBlockProcessor(
@@ -61,13 +67,15 @@ public PrivacyBlockProcessor(
       final Enclave enclave,
       final PrivateStateStorage privateStateStorage,
       final WorldStateArchive privateWorldStateArchive,
-      final PrivateStateRootResolver privateStateRootResolver) {
+      final PrivateStateRootResolver privateStateRootResolver,
+      final PrivateStateGenesisAllocator privateStateGenesisAllocator) {
     this.blockProcessor = blockProcessor;
     this.protocolSchedule = protocolSchedule;
     this.enclave = enclave;
     this.privateStateStorage = privateStateStorage;
     this.privateWorldStateArchive = privateWorldStateArchive;
     this.privateStateRootResolver = privateStateRootResolver;
+    this.privateStateGenesisAllocator = privateStateGenesisAllocator;
   }
 
   public void setPublicWorldStateArchive(final WorldStateArchive publicWorldStateArchive) {
@@ -75,12 +83,14 @@ public void setPublicWorldStateArchive(final WorldStateArchive publicWorldStateA
   }
 
   @Override
-  public Result processBlock(
+  public BlockProcessingResult processBlock(
       final Blockchain blockchain,
       final MutableWorldState worldState,
       final BlockHeader blockHeader,
       final List<Transaction> transactions,
       final List<BlockHeader> ommers,
+      final Optional<List<Withdrawal>> withdrawals,
+      final Optional<List<Deposit>> deposits,
       final PrivateMetadataUpdater privateMetadataUpdater) {
 
     if (privateMetadataUpdater != null) {
@@ -92,9 +102,16 @@ public Result processBlock(
     final PrivateMetadataUpdater metadataUpdater =
         new PrivateMetadataUpdater(blockHeader, privateStateStorage);
 
-    final Result result =
+    final BlockProcessingResult result =
         blockProcessor.processBlock(
-            blockchain, worldState, blockHeader, transactions, ommers, metadataUpdater);
+            blockchain,
+            worldState,
+            blockHeader,
+            transactions,
+            ommers,
+            withdrawals,
+            deposits,
+            metadataUpdater);
     metadataUpdater.commit();
     return result;
   }
@@ -104,16 +121,14 @@ void maybeRehydrate(
       final BlockHeader blockHeader,
       final List<Transaction> transactions) {
     transactions.stream()
-        .filter(
-            t ->
-                t.getTo().isPresent()
-                    && t.getTo().equals(Optional.of(Address.ONCHAIN_PRIVACY))
-                    && t.getPayload().size() == 64)
+        .filter(this::onchainAddToGroupPrivateMarkerTransactions)
         .forEach(
-            t -> {
-              final Bytes32 addKey = Bytes32.wrap(t.getPayload().slice(32, 32));
+            pmt -> {
+              final Bytes32 privateTransactionsLookupId =
+                  Bytes32.wrap(pmt.getPayload().slice(32, 32));
               try {
-                final ReceiveResponse receiveResponse = enclave.receive(addKey.toBase64String());
+                final ReceiveResponse receiveResponse =
+                    enclave.receive(privateTransactionsLookupId.toBase64String());
                 final List<PrivateTransactionWithMetadata> privateTransactionWithMetadataList =
                     PrivateTransactionWithMetadata.readListFromPayload(
                         Bytes.wrap(Base64.getDecoder().decode(receiveResponse.getPayload())));
@@ -125,15 +140,15 @@ void maybeRehydrate(
                             .getPrivacyGroupId()
                             .get());
 
-                final List<PrivateTransactionWithMetadata> actualList =
-                    createActualList(
+                final List<PrivateTransactionWithMetadata> actualListToRehydrate =
+                    transactionsInGroupThatNeedToBeApplied(
                         blockHeader, privateTransactionWithMetadataList, privacyGroupId);
 
-                if (actualList.size() > 0) {
+                if (actualListToRehydrate.size() > 0) {
                   LOG.debug(
                       "Rehydrating privacy group {}, number of transactions to be rehydrated is {} out of a total number of {} transactions.",
                       privacyGroupId.toString(),
-                      actualList.size(),
+                      actualListToRehydrate.size(),
                       privateTransactionWithMetadataList.size());
                   final PrivateStateRehydration privateStateRehydration =
                       new PrivateStateRehydration(
@@ -142,9 +157,13 @@ void maybeRehydrate(
                           protocolSchedule,
                           publicWorldStateArchive,
                           privateWorldStateArchive,
-                          privateStateRootResolver);
-                  privateStateRehydration.rehydrate(actualList);
-                  privateStateStorage.updater().putAddDataKey(privacyGroupId, addKey).commit();
+                          privateStateRootResolver,
+                          privateStateGenesisAllocator);
+                  privateStateRehydration.rehydrate(actualListToRehydrate);
+                  privateStateStorage
+                      .updater()
+                      .putAddDataKey(privacyGroupId, privateTransactionsLookupId)
+                      .commit();
                 }
               } catch (final EnclaveClientException e) {
                 // we were not being added because we have not found the add blob
@@ -152,7 +171,13 @@ void maybeRehydrate(
             });
   }
 
-  private List<PrivateTransactionWithMetadata> createActualList(
+  private boolean onchainAddToGroupPrivateMarkerTransactions(final Transaction t) {
+    return t.getTo().isPresent()
+        && t.getTo().equals(Optional.of(FLEXIBLE_PRIVACY))
+        && t.getPayload().size() == 64;
+  }
+
+  private List<PrivateTransactionWithMetadata> transactionsInGroupThatNeedToBeApplied(
       final BlockHeader blockHeader,
       final List<PrivateTransactionWithMetadata> privateTransactionWithMetadataList,
       final Bytes32 privacyGroupId) {
@@ -191,16 +216,16 @@ private List<PrivateTransactionWithMetadata> createActualList(
           actualList = Collections.emptyList();
         } else {
           // we are being added, but do not have to rehydrate all private transactions
-          final Hash nodeLatestPrivacyMarkerTransactionHash =
+          final Hash nodeLatestPrivateMarkerTransactionHash =
               nodeLatestPrivateTxMetadataList
                   .get(nodeLatestPrivateTxMetadataList.size() - 1)
-                  .getPrivacyMarkerTransactionHash();
+                  .getPrivateMarkerTransactionHash();
           for (int i = 0; i < privateTransactionWithMetadataList.size(); i++) {
             if (!privateTransactionWithMetadataList
                 .get(i)
                 .getPrivateTransactionMetadata()
-                .getPrivacyMarkerTransactionHash()
-                .equals(nodeLatestPrivacyMarkerTransactionHash)) {
+                .getPrivateMarkerTransactionHash()
+                .equals(nodeLatestPrivateMarkerTransactionHash)) {
               continue;
             }
             if (privateTransactionWithMetadataList.size() - 1 == i) {
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrivacySupportingProtocolSchedule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrivacySupportingProtocolSchedule.java
new file mode 100644
index 00000000000..d841e4b9eba
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrivacySupportingProtocolSchedule.java
@@ -0,0 +1,29 @@
+/*
+ *
+ *  * Copyright Hyperledger Besu Contributors.
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ *  * the License. You may obtain a copy of the License at
+ *  *
+ *  * http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ *  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ *  * specific language governing permissions and limitations under the License.
+ *  *
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.mainnet;
+
+import org.hyperledger.besu.ethereum.core.TransactionFilter;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+
+public interface PrivacySupportingProtocolSchedule {
+
+  void setTransactionFilter(final TransactionFilter transactionFilter);
+
+  void setPublicWorldStateArchiveForPrivacyBlockProcessor(
+      final WorldStateArchive publicWorldStateArchive);
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrivateStateUtils.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrivateStateUtils.java
new file mode 100644
index 00000000000..78e33790d56
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/PrivateStateUtils.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet;
+
+public class PrivateStateUtils {
+
+  public static String KEY_IS_PERSISTING_PRIVATE_STATE = "isPersistingPrivateState";
+  public static String KEY_TRANSACTION = "transaction";
+  public static String KEY_TRANSACTION_HASH = "transactionHash";
+  public static String KEY_PRIVATE_METADATA_UPDATER = "privateMetadataUpdater";
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSchedule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSchedule.java
index 0372e269230..e1a0afbdca3 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSchedule.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSchedule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright contributors to Hyperledger Besu.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -12,22 +12,42 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+
 package org.hyperledger.besu.ethereum.mainnet;
 
-import org.hyperledger.besu.ethereum.core.TransactionFilter;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
+import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
 
 import java.math.BigInteger;
 import java.util.Optional;
+import java.util.function.Predicate;
+
+public interface ProtocolSchedule extends PrivacySupportingProtocolSchedule {
 
-public interface ProtocolSchedule {
+  ProtocolSpec getByBlockHeader(final ProcessableBlockHeader blockHeader);
 
-  ProtocolSpec getByBlockNumber(long number);
+  default ProtocolSpec getForNextBlockHeader(
+      final BlockHeader parentBlockHeader, final long timestampForNextBlock) {
+    final BlockHeader nextBlockHeader =
+        BlockHeaderBuilder.fromHeader(parentBlockHeader)
+            .number(parentBlockHeader.getNumber() + 1)
+            .timestamp(timestampForNextBlock)
+            .parentHash(parentBlockHeader.getHash())
+            .blockHeaderFunctions(new MainnetBlockHeaderFunctions())
+            .buildBlockHeader();
+    return getByBlockHeader(nextBlockHeader);
+  }
 
   Optional<BigInteger> getChainId();
 
-  void setTransactionFilter(TransactionFilter transactionFilter);
+  String listMilestones();
+
+  void putBlockNumberMilestone(final long blockNumber, final ProtocolSpec protocolSpec);
+
+  void putTimestampMilestone(final long timestamp, final ProtocolSpec protocolSpec);
+
+  boolean isOnMilestoneBoundary(final BlockHeader blockHeader);
 
-  void setPublicWorldStateArchiveForPrivacyBlockProcessor(
-      WorldStateArchive publicWorldStateArchive);
+  boolean anyMatch(Predicate<ScheduledProtocolSpec> predicate);
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java
index 318707e24ca..786fdd35976 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java
@@ -15,339 +15,190 @@
 package org.hyperledger.besu.ethereum.mainnet;
 
 import org.hyperledger.besu.config.GenesisConfigOptions;
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
 import org.hyperledger.besu.ethereum.chain.BadBlockManager;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-import org.hyperledger.besu.ethereum.core.fees.TransactionPriceCalculator;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransactionValidator;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 
 import java.math.BigInteger;
 import java.util.Optional;
 import java.util.OptionalLong;
+import java.util.TreeMap;
 import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ProtocolScheduleBuilder {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(ProtocolScheduleBuilder.class);
   private final GenesisConfigOptions config;
-  private final Function<ProtocolSpecBuilder, ProtocolSpecBuilder> protocolSpecAdapter;
   private final Optional<BigInteger> defaultChainId;
+  private final ProtocolSpecAdapters protocolSpecAdapters;
   private final PrivacyParameters privacyParameters;
   private final boolean isRevertReasonEnabled;
+  private final EvmConfiguration evmConfiguration;
   private final BadBlockManager badBlockManager = new BadBlockManager();
-  private final boolean quorumCompatibilityMode;
+
+  private DefaultProtocolSchedule protocolSchedule;
 
   public ProtocolScheduleBuilder(
       final GenesisConfigOptions config,
       final BigInteger defaultChainId,
-      final Function<ProtocolSpecBuilder, ProtocolSpecBuilder> protocolSpecAdapter,
+      final ProtocolSpecAdapters protocolSpecAdapters,
       final PrivacyParameters privacyParameters,
       final boolean isRevertReasonEnabled,
-      final boolean quorumCompatibilityMode) {
+      final EvmConfiguration evmConfiguration) {
     this(
         config,
         Optional.of(defaultChainId),
-        protocolSpecAdapter,
+        protocolSpecAdapters,
         privacyParameters,
         isRevertReasonEnabled,
-        quorumCompatibilityMode);
+        evmConfiguration);
   }
 
   public ProtocolScheduleBuilder(
       final GenesisConfigOptions config,
-      final Function<ProtocolSpecBuilder, ProtocolSpecBuilder> protocolSpecAdapter,
+      final ProtocolSpecAdapters protocolSpecAdapters,
       final PrivacyParameters privacyParameters,
       final boolean isRevertReasonEnabled,
-      final boolean quorumCompatibilityMode) {
+      final EvmConfiguration evmConfiguration) {
     this(
         config,
         Optional.empty(),
-        protocolSpecAdapter,
+        protocolSpecAdapters,
         privacyParameters,
         isRevertReasonEnabled,
-        quorumCompatibilityMode);
+        evmConfiguration);
   }
 
   private ProtocolScheduleBuilder(
       final GenesisConfigOptions config,
       final Optional<BigInteger> defaultChainId,
-      final Function<ProtocolSpecBuilder, ProtocolSpecBuilder> protocolSpecAdapter,
+      final ProtocolSpecAdapters protocolSpecAdapters,
       final PrivacyParameters privacyParameters,
       final boolean isRevertReasonEnabled,
-      final boolean quorumCompatibilityMode) {
+      final EvmConfiguration evmConfiguration) {
     this.config = config;
-    this.defaultChainId = defaultChainId;
-    this.protocolSpecAdapter = protocolSpecAdapter;
+    this.protocolSpecAdapters = protocolSpecAdapters;
     this.privacyParameters = privacyParameters;
     this.isRevertReasonEnabled = isRevertReasonEnabled;
-    this.quorumCompatibilityMode = quorumCompatibilityMode;
+    this.evmConfiguration = evmConfiguration;
+    this.defaultChainId = defaultChainId;
   }
 
   public ProtocolSchedule createProtocolSchedule() {
-    final Optional<BigInteger> chainId =
-        config.getChainId().map(Optional::of).orElse(defaultChainId);
-    final MutableProtocolSchedule protocolSchedule = new MutableProtocolSchedule(chainId);
+    final Optional<BigInteger> chainId = config.getChainId().or(() -> defaultChainId);
+    protocolSchedule = new DefaultProtocolSchedule(chainId);
+    initSchedule(protocolSchedule, chainId);
+    return protocolSchedule;
+  }
+
+  private void initSchedule(
+      final ProtocolSchedule protocolSchedule, final Optional<BigInteger> chainId) {
+
+    final MainnetProtocolSpecFactory specFactory =
+        new MainnetProtocolSpecFactory(
+            chainId,
+            config.getContractSizeLimit(),
+            config.getEvmStackSize(),
+            isRevertReasonEnabled,
+            config.getEcip1017EraRounds(),
+            evmConfiguration);
 
     validateForkOrdering();
 
-    addProtocolSpec(
-        protocolSchedule,
-        OptionalLong.of(0),
-        MainnetProtocolSpecs.frontierDefinition(
-            config.getContractSizeLimit(), config.getEvmStackSize(), quorumCompatibilityMode));
-    addProtocolSpec(
-        protocolSchedule,
-        config.getHomesteadBlockNumber(),
-        MainnetProtocolSpecs.homesteadDefinition(
-            config.getContractSizeLimit(), config.getEvmStackSize(), quorumCompatibilityMode));
+    final TreeMap<Long, BuilderMapEntry> builders = buildMilestoneMap(specFactory);
+
+    // At this stage, all milestones are flagged with correct modifier, but ProtocolSpecs must be
+    // inserted _AT_ the modifier block entry.
+    if (!builders.isEmpty()) {
+      protocolSpecAdapters.stream()
+          .forEach(
+              entry -> {
+                final long modifierBlock = entry.getKey();
+                final BuilderMapEntry parent =
+                    Optional.ofNullable(builders.floorEntry(modifierBlock))
+                        .orElse(builders.firstEntry())
+                        .getValue();
+                builders.put(
+                    modifierBlock,
+                    new BuilderMapEntry(
+                        parent.milestoneType,
+                        modifierBlock,
+                        parent.getBuilder(),
+                        entry.getValue()));
+              });
+    }
+
+    // Create the ProtocolSchedule, such that the Dao/fork milestones can be inserted
+    builders
+        .values()
+        .forEach(
+            e ->
+                addProtocolSpec(
+                    protocolSchedule,
+                    e.milestoneType,
+                    e.getBlockIdentifier(),
+                    e.getBuilder(),
+                    e.modifier));
 
+    // NOTE: It is assumed that Daofork blocks will not be used for private networks
+    // as too many risks exist around inserting a protocol-spec between daoBlock and daoBlock+10.
     config
         .getDaoForkBlock()
         .ifPresent(
             daoBlockNumber -> {
+              final BuilderMapEntry previousSpecBuilder =
+                  builders.floorEntry(daoBlockNumber).getValue();
               final ProtocolSpec originalProtocolSpec =
-                  protocolSchedule.getByBlockNumber(daoBlockNumber);
+                  getProtocolSpec(
+                      protocolSchedule,
+                      previousSpecBuilder.getBuilder(),
+                      previousSpecBuilder.getModifier());
               addProtocolSpec(
                   protocolSchedule,
-                  OptionalLong.of(daoBlockNumber),
-                  MainnetProtocolSpecs.daoRecoveryInitDefinition(
-                      config.getContractSizeLimit(),
-                      config.getEvmStackSize(),
-                      quorumCompatibilityMode));
+                  BuilderMapEntry.MilestoneType.BLOCK_NUMBER,
+                  daoBlockNumber,
+                  specFactory.daoRecoveryInitDefinition(),
+                  protocolSpecAdapters.getModifierForBlock(daoBlockNumber));
               addProtocolSpec(
                   protocolSchedule,
-                  OptionalLong.of(daoBlockNumber + 1),
-                  MainnetProtocolSpecs.daoRecoveryTransitionDefinition(
-                      config.getContractSizeLimit(),
-                      config.getEvmStackSize(),
-                      quorumCompatibilityMode));
-
+                  BuilderMapEntry.MilestoneType.BLOCK_NUMBER,
+                  daoBlockNumber + 1L,
+                  specFactory.daoRecoveryTransitionDefinition(),
+                  protocolSpecAdapters.getModifierForBlock(daoBlockNumber + 1L));
               // Return to the previous protocol spec after the dao fork has completed.
-              protocolSchedule.putMilestone(daoBlockNumber + 10, originalProtocolSpec);
+              protocolSchedule.putBlockNumberMilestone(daoBlockNumber + 10, originalProtocolSpec);
             });
 
-    addProtocolSpec(
-        protocolSchedule,
-        config.getTangerineWhistleBlockNumber(),
-        MainnetProtocolSpecs.tangerineWhistleDefinition(
-            config.getContractSizeLimit(), config.getEvmStackSize(), quorumCompatibilityMode));
-    addProtocolSpec(
-        protocolSchedule,
-        config.getSpuriousDragonBlockNumber(),
-        MainnetProtocolSpecs.spuriousDragonDefinition(
-            chainId,
-            config.getContractSizeLimit(),
-            config.getEvmStackSize(),
-            quorumCompatibilityMode));
-    addProtocolSpec(
-        protocolSchedule,
-        config.getByzantiumBlockNumber(),
-        MainnetProtocolSpecs.byzantiumDefinition(
-            chainId,
-            config.getContractSizeLimit(),
-            config.getEvmStackSize(),
-            isRevertReasonEnabled,
-            quorumCompatibilityMode));
-    addProtocolSpec(
-        protocolSchedule,
-        config.getConstantinopleBlockNumber(),
-        MainnetProtocolSpecs.constantinopleDefinition(
-            chainId,
-            config.getContractSizeLimit(),
-            config.getEvmStackSize(),
-            isRevertReasonEnabled,
-            quorumCompatibilityMode));
-    addProtocolSpec(
-        protocolSchedule,
-        config.getConstantinopleFixBlockNumber(),
-        MainnetProtocolSpecs.constantinopleFixDefinition(
-            chainId,
-            config.getContractSizeLimit(),
-            config.getEvmStackSize(),
-            isRevertReasonEnabled,
-            quorumCompatibilityMode));
-    addProtocolSpec(
-        protocolSchedule,
-        config.getIstanbulBlockNumber(),
-        MainnetProtocolSpecs.istanbulDefinition(
-            chainId,
-            config.getContractSizeLimit(),
-            config.getEvmStackSize(),
-            isRevertReasonEnabled,
-            quorumCompatibilityMode));
-    addProtocolSpec(
-        protocolSchedule,
-        config.getMuirGlacierBlockNumber(),
-        MainnetProtocolSpecs.muirGlacierDefinition(
-            chainId,
-            config.getContractSizeLimit(),
-            config.getEvmStackSize(),
-            isRevertReasonEnabled,
-            quorumCompatibilityMode));
-
-    if (ExperimentalEIPs.berlinEnabled) {
-      addProtocolSpec(
-          protocolSchedule,
-          config.getBerlinBlockNumber(),
-          MainnetProtocolSpecs.berlinDefinition(
-              chainId,
-              config.getContractSizeLimit(),
-              config.getEvmStackSize(),
-              isRevertReasonEnabled,
-              quorumCompatibilityMode));
-    }
-
-    if (ExperimentalEIPs.eip1559Enabled) {
-      final Optional<TransactionPriceCalculator> transactionPriceCalculator =
-          Optional.of(TransactionPriceCalculator.eip1559());
-      addProtocolSpec(
-          protocolSchedule,
-          config.getEIP1559BlockNumber(),
-          MainnetProtocolSpecs.eip1559Definition(
-              chainId,
-              transactionPriceCalculator,
-              config.getContractSizeLimit(),
-              config.getEvmStackSize(),
-              isRevertReasonEnabled,
-              config,
-              quorumCompatibilityMode));
-    }
-
     // specs for classic network
     config
         .getClassicForkBlock()
         .ifPresent(
             classicBlockNumber -> {
-              final ProtocolSpec originalProtocolSpce =
-                  protocolSchedule.getByBlockNumber(classicBlockNumber);
+              final BuilderMapEntry previousSpecBuilder =
+                  builders.floorEntry(classicBlockNumber).getValue();
+              final ProtocolSpec originalProtocolSpec =
+                  getProtocolSpec(
+                      protocolSchedule,
+                      previousSpecBuilder.getBuilder(),
+                      previousSpecBuilder.getModifier());
               addProtocolSpec(
                   protocolSchedule,
-                  OptionalLong.of(classicBlockNumber),
+                  BuilderMapEntry.MilestoneType.BLOCK_NUMBER,
+                  classicBlockNumber,
                   ClassicProtocolSpecs.classicRecoveryInitDefinition(
-                      config.getContractSizeLimit(),
-                      config.getEvmStackSize(),
-                      quorumCompatibilityMode));
-              protocolSchedule.putMilestone(classicBlockNumber + 1, originalProtocolSpce);
+                      config.getContractSizeLimit(), config.getEvmStackSize(), evmConfiguration),
+                  Function.identity());
+              protocolSchedule.putBlockNumberMilestone(
+                  classicBlockNumber + 1, originalProtocolSpec);
             });
 
-    addProtocolSpec(
-        protocolSchedule,
-        config.getEcip1015BlockNumber(),
-        ClassicProtocolSpecs.tangerineWhistleDefinition(
-            chainId,
-            config.getContractSizeLimit(),
-            config.getEvmStackSize(),
-            quorumCompatibilityMode));
-    addProtocolSpec(
-        protocolSchedule,
-        config.getDieHardBlockNumber(),
-        ClassicProtocolSpecs.dieHardDefinition(
-            chainId,
-            config.getContractSizeLimit(),
-            config.getEvmStackSize(),
-            quorumCompatibilityMode));
-    addProtocolSpec(
-        protocolSchedule,
-        config.getGothamBlockNumber(),
-        ClassicProtocolSpecs.gothamDefinition(
-            chainId,
-            config.getContractSizeLimit(),
-            config.getEvmStackSize(),
-            config.getEcip1017EraRounds(),
-            quorumCompatibilityMode));
-    addProtocolSpec(
-        protocolSchedule,
-        config.getDefuseDifficultyBombBlockNumber(),
-        ClassicProtocolSpecs.defuseDifficultyBombDefinition(
-            chainId,
-            config.getContractSizeLimit(),
-            config.getEvmStackSize(),
-            config.getEcip1017EraRounds(),
-            quorumCompatibilityMode));
-    addProtocolSpec(
-        protocolSchedule,
-        config.getAtlantisBlockNumber(),
-        ClassicProtocolSpecs.atlantisDefinition(
-            chainId,
-            config.getContractSizeLimit(),
-            config.getEvmStackSize(),
-            isRevertReasonEnabled,
-            config.getEcip1017EraRounds(),
-            quorumCompatibilityMode));
-    addProtocolSpec(
-        protocolSchedule,
-        config.getAghartaBlockNumber(),
-        ClassicProtocolSpecs.aghartaDefinition(
-            chainId,
-            config.getContractSizeLimit(),
-            config.getEvmStackSize(),
-            isRevertReasonEnabled,
-            config.getEcip1017EraRounds(),
-            quorumCompatibilityMode));
-    addProtocolSpec(
-        protocolSchedule,
-        config.getPhoenixBlockNumber(),
-        ClassicProtocolSpecs.phoenixDefinition(
-            chainId,
-            config.getContractSizeLimit(),
-            config.getEvmStackSize(),
-            isRevertReasonEnabled,
-            config.getEcip1017EraRounds(),
-            quorumCompatibilityMode));
-    addProtocolSpec(
-        protocolSchedule,
-        config.getThanosBlockNumber(),
-        ClassicProtocolSpecs.thanosDefinition(
-            chainId,
-            config.getContractSizeLimit(),
-            config.getEvmStackSize(),
-            isRevertReasonEnabled,
-            config.getEcip1017EraRounds(),
-            quorumCompatibilityMode));
-    addProtocolSpec(
-        protocolSchedule,
-        config.getLacchainPostQuantumBlockNumber(),
-        LacchainProtocolSpecs.postQuantumDefinition(
-            chainId,
-            config.getContractSizeLimit(),
-            config.getEvmStackSize(),
-            isRevertReasonEnabled,
-            quorumCompatibilityMode));
-
     LOG.info("Protocol schedule created with milestones: {}", protocolSchedule.listMilestones());
-    return protocolSchedule;
-  }
-
-  private void addProtocolSpec(
-      final MutableProtocolSchedule protocolSchedule,
-      final OptionalLong blockNumber,
-      final ProtocolSpecBuilder definition) {
-    blockNumber.ifPresent(
-        number ->
-            protocolSchedule.putMilestone(
-                number,
-                protocolSpecAdapter
-                    .apply(definition)
-                    .badBlocksManager(badBlockManager)
-                    .privacyParameters(privacyParameters)
-                    .privateTransactionValidatorBuilder(
-                        () -> new PrivateTransactionValidator(protocolSchedule.getChainId()))
-                    .build(protocolSchedule)));
-  }
-
-  private long validateForkOrder(
-      final String forkName, final OptionalLong thisForkBlock, final long lastForkBlock) {
-    final long referenceForkBlock = thisForkBlock.orElse(lastForkBlock);
-    if (lastForkBlock > referenceForkBlock) {
-      throw new RuntimeException(
-          String.format(
-              "Genesis Config Error: '%s' is scheduled for block %d but it must be on or after block %d.",
-              forkName, thisForkBlock.getAsLong(), lastForkBlock));
-    }
-    return referenceForkBlock;
   }
 
   private void validateForkOrdering() {
@@ -371,14 +222,22 @@ private void validateEthereumForkOrdering() {
     lastForkBlock =
         validateForkOrder("Constantinople", config.getConstantinopleBlockNumber(), lastForkBlock);
     lastForkBlock =
-        validateForkOrder(
-            "ConstantinopleFix", config.getConstantinopleFixBlockNumber(), lastForkBlock);
+        validateForkOrder("Petersburg", config.getPetersburgBlockNumber(), lastForkBlock);
     lastForkBlock = validateForkOrder("Istanbul", config.getIstanbulBlockNumber(), lastForkBlock);
     lastForkBlock =
         validateForkOrder("MuirGlacier", config.getMuirGlacierBlockNumber(), lastForkBlock);
-    if (ExperimentalEIPs.berlinEnabled) {
-      lastForkBlock = validateForkOrder("Berlin", config.getBerlinBlockNumber(), lastForkBlock);
-    }
+    lastForkBlock = validateForkOrder("Berlin", config.getBerlinBlockNumber(), lastForkBlock);
+    lastForkBlock = validateForkOrder("London", config.getLondonBlockNumber(), lastForkBlock);
+    lastForkBlock =
+        validateForkOrder("ArrowGlacier", config.getArrowGlacierBlockNumber(), lastForkBlock);
+    lastForkBlock =
+        validateForkOrder("GrayGlacier", config.getGrayGlacierBlockNumber(), lastForkBlock);
+    // Begin timestamp forks
+    lastForkBlock = validateForkOrder("Shanghai", config.getShanghaiTime(), lastForkBlock);
+    lastForkBlock = validateForkOrder("Cancun", config.getCancunTime(), lastForkBlock);
+    lastForkBlock = validateForkOrder("FutureEips", config.getFutureEipsTime(), lastForkBlock);
+    lastForkBlock =
+        validateForkOrder("ExperimentalEips", config.getExperimentalEipsTime(), lastForkBlock);
     assert (lastForkBlock >= 0);
   }
 
@@ -396,6 +255,171 @@ private void validateClassicForkOrdering() {
     lastForkBlock = validateForkOrder("Atlantis", config.getAtlantisBlockNumber(), lastForkBlock);
     lastForkBlock = validateForkOrder("Agharta", config.getAghartaBlockNumber(), lastForkBlock);
     lastForkBlock = validateForkOrder("Phoenix", config.getPhoenixBlockNumber(), lastForkBlock);
+    lastForkBlock = validateForkOrder("Thanos", config.getThanosBlockNumber(), lastForkBlock);
+    lastForkBlock = validateForkOrder("Magneto", config.getMagnetoBlockNumber(), lastForkBlock);
+    lastForkBlock = validateForkOrder("Mystique", config.getMystiqueBlockNumber(), lastForkBlock);
     assert (lastForkBlock >= 0);
   }
+
+  private long validateForkOrder(
+      final String forkName, final OptionalLong thisForkBlock, final long lastForkBlock) {
+    final long referenceForkBlock = thisForkBlock.orElse(lastForkBlock);
+    if (lastForkBlock > referenceForkBlock) {
+      throw new RuntimeException(
+          String.format(
+              "Genesis Config Error: '%s' is scheduled for milestone %d but it must be on or after milestone %d.",
+              forkName, thisForkBlock.getAsLong(), lastForkBlock));
+    }
+    return referenceForkBlock;
+  }
+
+  private TreeMap<Long, BuilderMapEntry> buildMilestoneMap(
+      final MainnetProtocolSpecFactory specFactory) {
+    return createMilestones(specFactory)
+        .flatMap(Optional::stream)
+        .collect(
+            Collectors.toMap(
+                BuilderMapEntry::getBlockIdentifier,
+                b -> b,
+                (existing, replacement) -> replacement,
+                TreeMap::new));
+  }
+
+  private Stream<Optional<BuilderMapEntry>> createMilestones(
+      final MainnetProtocolSpecFactory specFactory) {
+    return Stream.of(
+        blockNumberMilestone(OptionalLong.of(0), specFactory.frontierDefinition()),
+        blockNumberMilestone(config.getHomesteadBlockNumber(), specFactory.homesteadDefinition()),
+        blockNumberMilestone(
+            config.getTangerineWhistleBlockNumber(), specFactory.tangerineWhistleDefinition()),
+        blockNumberMilestone(
+            config.getSpuriousDragonBlockNumber(), specFactory.spuriousDragonDefinition()),
+        blockNumberMilestone(config.getByzantiumBlockNumber(), specFactory.byzantiumDefinition()),
+        blockNumberMilestone(
+            config.getConstantinopleBlockNumber(), specFactory.constantinopleDefinition()),
+        blockNumberMilestone(config.getPetersburgBlockNumber(), specFactory.petersburgDefinition()),
+        blockNumberMilestone(config.getIstanbulBlockNumber(), specFactory.istanbulDefinition()),
+        blockNumberMilestone(
+            config.getMuirGlacierBlockNumber(), specFactory.muirGlacierDefinition()),
+        blockNumberMilestone(config.getBerlinBlockNumber(), specFactory.berlinDefinition()),
+        blockNumberMilestone(config.getLondonBlockNumber(), specFactory.londonDefinition(config)),
+        blockNumberMilestone(
+            config.getArrowGlacierBlockNumber(), specFactory.arrowGlacierDefinition(config)),
+        blockNumberMilestone(
+            config.getGrayGlacierBlockNumber(), specFactory.grayGlacierDefinition(config)),
+        blockNumberMilestone(
+            config.getMergeNetSplitBlockNumber(), specFactory.parisDefinition(config)),
+        // Timestamp Forks
+        timestampMilestone(config.getShanghaiTime(), specFactory.shanghaiDefinition(config)),
+        timestampMilestone(config.getCancunTime(), specFactory.cancunDefinition(config)),
+        timestampMilestone(config.getFutureEipsTime(), specFactory.futureEipsDefinition(config)),
+        timestampMilestone(
+            config.getExperimentalEipsTime(), specFactory.experimentalEipsDefinition(config)),
+
+        // Classic Milestones
+        blockNumberMilestone(
+            config.getEcip1015BlockNumber(), specFactory.tangerineWhistleDefinition()),
+        blockNumberMilestone(config.getDieHardBlockNumber(), specFactory.dieHardDefinition()),
+        blockNumberMilestone(config.getGothamBlockNumber(), specFactory.gothamDefinition()),
+        blockNumberMilestone(
+            config.getDefuseDifficultyBombBlockNumber(),
+            specFactory.defuseDifficultyBombDefinition()),
+        blockNumberMilestone(config.getAtlantisBlockNumber(), specFactory.atlantisDefinition()),
+        blockNumberMilestone(config.getAghartaBlockNumber(), specFactory.aghartaDefinition()),
+        blockNumberMilestone(config.getPhoenixBlockNumber(), specFactory.phoenixDefinition()),
+        blockNumberMilestone(config.getThanosBlockNumber(), specFactory.thanosDefinition()),
+        blockNumberMilestone(config.getMagnetoBlockNumber(), specFactory.magnetoDefinition()),
+        blockNumberMilestone(config.getMystiqueBlockNumber(), specFactory.mystiqueDefinition()));
+  }
+
+  private Optional<BuilderMapEntry> timestampMilestone(
+      final OptionalLong blockIdentifier, final ProtocolSpecBuilder builder) {
+    return createMilestone(blockIdentifier, builder, BuilderMapEntry.MilestoneType.TIMESTAMP);
+  }
+
+  private Optional<BuilderMapEntry> blockNumberMilestone(
+      final OptionalLong blockIdentifier, final ProtocolSpecBuilder builder) {
+    return createMilestone(blockIdentifier, builder, BuilderMapEntry.MilestoneType.BLOCK_NUMBER);
+  }
+
+  private Optional<BuilderMapEntry> createMilestone(
+      final OptionalLong blockIdentifier,
+      final ProtocolSpecBuilder builder,
+      final BuilderMapEntry.MilestoneType milestoneType) {
+    if (blockIdentifier.isEmpty()) {
+      return Optional.empty();
+    }
+    final long blockVal = blockIdentifier.getAsLong();
+    return Optional.of(
+        new BuilderMapEntry(
+            milestoneType, blockVal, builder, protocolSpecAdapters.getModifierForBlock(blockVal)));
+  }
+
+  private ProtocolSpec getProtocolSpec(
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolSpecBuilder definition,
+      final Function<ProtocolSpecBuilder, ProtocolSpecBuilder> modifier) {
+    definition
+        .badBlocksManager(badBlockManager)
+        .privacyParameters(privacyParameters)
+        .privateTransactionValidatorBuilder(
+            () -> new PrivateTransactionValidator(protocolSchedule.getChainId()));
+
+    return modifier.apply(definition).build(protocolSchedule);
+  }
+
+  private void addProtocolSpec(
+      final ProtocolSchedule protocolSchedule,
+      final BuilderMapEntry.MilestoneType milestoneType,
+      final long blockNumberOrTimestamp,
+      final ProtocolSpecBuilder definition,
+      final Function<ProtocolSpecBuilder, ProtocolSpecBuilder> modifier) {
+
+    switch (milestoneType) {
+      case BLOCK_NUMBER -> protocolSchedule.putBlockNumberMilestone(
+          blockNumberOrTimestamp, getProtocolSpec(protocolSchedule, definition, modifier));
+      case TIMESTAMP -> protocolSchedule.putTimestampMilestone(
+          blockNumberOrTimestamp, getProtocolSpec(protocolSchedule, definition, modifier));
+      default -> throw new IllegalStateException(
+          "Unexpected milestoneType: "
+              + milestoneType
+              + " for milestone: "
+              + blockNumberOrTimestamp);
+    }
+  }
+
+  private static class BuilderMapEntry {
+    private final MilestoneType milestoneType;
+    private final long blockIdentifier;
+    private final ProtocolSpecBuilder builder;
+    private final Function<ProtocolSpecBuilder, ProtocolSpecBuilder> modifier;
+
+    public BuilderMapEntry(
+        final MilestoneType milestoneType,
+        final long blockIdentifier,
+        final ProtocolSpecBuilder builder,
+        final Function<ProtocolSpecBuilder, ProtocolSpecBuilder> modifier) {
+      this.milestoneType = milestoneType;
+      this.blockIdentifier = blockIdentifier;
+      this.builder = builder;
+      this.modifier = modifier;
+    }
+
+    public long getBlockIdentifier() {
+      return blockIdentifier;
+    }
+
+    public ProtocolSpecBuilder getBuilder() {
+      return builder;
+    }
+
+    public Function<ProtocolSpecBuilder, ProtocolSpecBuilder> getModifier() {
+      return modifier;
+    }
+
+    private enum MilestoneType {
+      BLOCK_NUMBER,
+      TIMESTAMP
+    }
+  }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpec.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpec.java
index 37cfb363141..652acc26c49 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpec.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpec.java
@@ -14,18 +14,17 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.BlockValidator;
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.chain.BadBlockManager;
 import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.core.BlockImporter;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.fees.EIP1559;
-import org.hyperledger.besu.ethereum.core.fees.TransactionGasBudgetCalculator;
-import org.hyperledger.besu.ethereum.core.fees.TransactionPriceCalculator;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransactionProcessor;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.precompile.PrecompileContractRegistry;
 
 import java.util.Optional;
 
@@ -37,6 +36,8 @@ public class ProtocolSpec {
 
   private final GasCalculator gasCalculator;
 
+  private final GasLimitCalculator gasLimitCalculator;
+
   private final MainnetTransactionValidator transactionValidator;
 
   private final MainnetTransactionProcessor transactionProcessor;
@@ -69,14 +70,17 @@ public class ProtocolSpec {
 
   private final PrivateTransactionProcessor privateTransactionProcessor;
 
-  private final TransactionPriceCalculator transactionPriceCalculator;
+  private final FeeMarket feeMarket;
 
-  private final Optional<EIP1559> eip1559;
+  private final BadBlockManager badBlockManager;
 
-  private final TransactionGasBudgetCalculator gasBudgetCalculator;
+  private final Optional<PoWHasher> powHasher;
 
-  private final BadBlockManager badBlockManager;
+  private final WithdrawalsValidator withdrawalsValidator;
+  private final Optional<WithdrawalsProcessor> withdrawalsProcessor;
+  private final DepositsValidator depositsValidator;
 
+  private final boolean isPoS;
   /**
    * Creates a new protocol specification instance.
    *
@@ -99,10 +103,14 @@ public class ProtocolSpec {
    * @param precompileContractRegistry all the pre-compiled contracts added
    * @param skipZeroBlockRewards should rewards be skipped if it is zero
    * @param gasCalculator the gas calculator to use.
-   * @param transactionPriceCalculator the transaction price calculator to use.
-   * @param eip1559 an {@link Optional} wrapping {@link EIP1559} manager class if appropriate.
-   * @param gasBudgetCalculator the gas budget calculator to use.
+   * @param gasLimitCalculator the gas limit calculator to use.
+   * @param feeMarket an {@link Optional} wrapping {@link FeeMarket} class if appropriate.
    * @param badBlockManager the cache to use to keep invalid blocks
+   * @param powHasher the proof-of-work hasher
+   * @param withdrawalsValidator the withdrawals validator to use
+   * @param withdrawalsProcessor the Withdrawals processor to use
+   * @param depositsValidator the withdrawals validator to use
+   * @param isPoS indicates whether the current spec is PoS
    */
   public ProtocolSpec(
       final String name,
@@ -124,10 +132,14 @@ public ProtocolSpec(
       final PrecompileContractRegistry precompileContractRegistry,
       final boolean skipZeroBlockRewards,
       final GasCalculator gasCalculator,
-      final TransactionPriceCalculator transactionPriceCalculator,
-      final Optional<EIP1559> eip1559,
-      final TransactionGasBudgetCalculator gasBudgetCalculator,
-      final BadBlockManager badBlockManager) {
+      final GasLimitCalculator gasLimitCalculator,
+      final FeeMarket feeMarket,
+      final BadBlockManager badBlockManager,
+      final Optional<PoWHasher> powHasher,
+      final WithdrawalsValidator withdrawalsValidator,
+      final Optional<WithdrawalsProcessor> withdrawalsProcessor,
+      final DepositsValidator depositsValidator,
+      final boolean isPoS) {
     this.name = name;
     this.evm = evm;
     this.transactionValidator = transactionValidator;
@@ -147,10 +159,14 @@ public ProtocolSpec(
     this.precompileContractRegistry = precompileContractRegistry;
     this.skipZeroBlockRewards = skipZeroBlockRewards;
     this.gasCalculator = gasCalculator;
-    this.transactionPriceCalculator = transactionPriceCalculator;
-    this.eip1559 = eip1559;
-    this.gasBudgetCalculator = gasBudgetCalculator;
+    this.gasLimitCalculator = gasLimitCalculator;
+    this.feeMarket = feeMarket;
     this.badBlockManager = badBlockManager;
+    this.powHasher = powHasher;
+    this.withdrawalsValidator = withdrawalsValidator;
+    this.withdrawalsProcessor = withdrawalsProcessor;
+    this.depositsValidator = depositsValidator;
+    this.isPoS = isPoS;
   }
 
   /**
@@ -171,6 +187,10 @@ public MainnetTransactionValidator getTransactionValidator() {
     return transactionValidator;
   }
 
+  public boolean isReplayProtectionSupported() {
+    return transactionValidator.isReplayProtectionSupported();
+  }
+
   /**
    * Returns the transaction processor used in this specification.
    *
@@ -312,42 +332,59 @@ public GasCalculator getGasCalculator() {
   }
 
   /**
-   * Returns the transaction price calculator used in this specification.
+   * Returns the gasLimitCalculator used in this specification.
    *
-   * @return the transaction price calculator
+   * @return the gas limit calculator
    */
-  public TransactionPriceCalculator getTransactionPriceCalculator() {
-    return transactionPriceCalculator;
+  public GasLimitCalculator getGasLimitCalculator() {
+    return gasLimitCalculator;
   }
 
   /**
-   * Returns the EIP1559 manager used in this specification.
+   * Returns the Fee Market used in this specification.
    *
-   * @return the {@link Optional} wrapping EIP-1559 manager
+   * @return the {@link FeeMarket} implementation.
    */
-  public Optional<EIP1559> getEip1559() {
-    return eip1559;
+  public FeeMarket getFeeMarket() {
+    return feeMarket;
   }
 
-  public boolean isEip1559() {
-    return ExperimentalEIPs.eip1559Enabled && eip1559.isPresent();
+  /**
+   * Returns the bad blocks manager
+   *
+   * @return the bad blocks manager
+   */
+  public BadBlockManager getBadBlocksManager() {
+    return badBlockManager;
   }
 
   /**
-   * Returns the gas budget calculator in this specification.
+   * Returns the Proof-of-Work hasher
    *
-   * @return the gas budget calculator
+   * @return the Proof-of-Work hasher
    */
-  public TransactionGasBudgetCalculator getGasBudgetCalculator() {
-    return gasBudgetCalculator;
+  public Optional<PoWHasher> getPoWHasher() {
+    return powHasher;
+  }
+
+  public WithdrawalsValidator getWithdrawalsValidator() {
+    return withdrawalsValidator;
+  }
+
+  public Optional<WithdrawalsProcessor> getWithdrawalsProcessor() {
+    return withdrawalsProcessor;
+  }
+
+  public DepositsValidator getDepositsValidator() {
+    return depositsValidator;
   }
 
   /**
-   * Returns the bad blocks manager
+   * Returns true if the network is running Proof of Stake
    *
-   * @return the bad blocks manager
+   * @return true if the network is running Proof of Stake
    */
-  public BadBlockManager getBadBlocksManager() {
-    return badBlockManager;
+  public boolean isPoS() {
+    return isPoS;
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecAdapters.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecAdapters.java
new file mode 100644
index 00000000000..e328357a1ec
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecAdapters.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.NavigableSet;
+import java.util.TreeSet;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+public class ProtocolSpecAdapters {
+
+  final Map<Long, Function<ProtocolSpecBuilder, ProtocolSpecBuilder>> modifiers;
+
+  public ProtocolSpecAdapters(
+      final Map<Long, Function<ProtocolSpecBuilder, ProtocolSpecBuilder>> modifiers) {
+    this.modifiers = modifiers;
+  }
+
+  public static ProtocolSpecAdapters create(
+      final long blockNumberOrTimestamp,
+      final Function<ProtocolSpecBuilder, ProtocolSpecBuilder> modifier) {
+    final Map<Long, Function<ProtocolSpecBuilder, ProtocolSpecBuilder>> entries = new HashMap<>();
+    entries.put(blockNumberOrTimestamp, modifier);
+    return new ProtocolSpecAdapters(entries);
+  }
+
+  public Function<ProtocolSpecBuilder, ProtocolSpecBuilder> getModifierForBlock(
+      final long blockNumberOrTimestamp) {
+    final NavigableSet<Long> epochs = new TreeSet<>(modifiers.keySet());
+    final Long modifier = epochs.floor(blockNumberOrTimestamp);
+
+    if (modifier == null) {
+      return Function.identity();
+    }
+
+    return modifiers.get(modifier);
+  }
+
+  public Stream<Map.Entry<Long, Function<ProtocolSpecBuilder, ProtocolSpecBuilder>>> stream() {
+    return modifiers.entrySet().stream();
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecBuilder.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecBuilder.java
index 84ee5e0ba14..b71ccbda046 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecBuilder.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecBuilder.java
@@ -15,24 +15,28 @@
 package org.hyperledger.besu.ethereum.mainnet;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.DEFAULT_PRIVACY;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.PLUGIN_PRIVACY;
 
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.BlockValidator;
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.chain.BadBlockManager;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.core.BlockImporter;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.fees.EIP1559;
-import org.hyperledger.besu.ethereum.core.fees.TransactionGasBudgetCalculator;
-import org.hyperledger.besu.ethereum.core.fees.TransactionPriceCalculator;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.privacy.OnChainPrivacyPrecompiledContract;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.ethereum.mainnet.precompiles.privacy.FlexiblePrivacyPrecompiledContract;
+import org.hyperledger.besu.ethereum.mainnet.precompiles.privacy.PrivacyPluginPrecompiledContract;
 import org.hyperledger.besu.ethereum.mainnet.precompiles.privacy.PrivacyPrecompiledContract;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransactionProcessor;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransactionValidator;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.evm.precompile.PrecompileContractRegistry;
+import org.hyperledger.besu.evm.processor.AbstractMessageProcessor;
 
 import java.util.Optional;
 import java.util.function.BiFunction;
@@ -41,15 +45,18 @@
 
 public class ProtocolSpecBuilder {
   private Supplier<GasCalculator> gasCalculatorBuilder;
+  private GasLimitCalculator gasLimitCalculator;
   private Wei blockReward;
   private boolean skipZeroBlockRewards;
   private BlockHeaderFunctions blockHeaderFunctions;
   private AbstractBlockProcessor.TransactionReceiptFactory transactionReceiptFactory;
   private DifficultyCalculator difficultyCalculator;
-  private Function<GasCalculator, EVM> evmBuilder;
-  private Function<GasCalculator, MainnetTransactionValidator> transactionValidatorBuilder;
-  private BlockHeaderValidator.Builder blockHeaderValidatorBuilder;
-  private BlockHeaderValidator.Builder ommerHeaderValidatorBuilder;
+  private EvmConfiguration evmConfiguration;
+  private BiFunction<GasCalculator, EvmConfiguration, EVM> evmBuilder;
+  private BiFunction<GasCalculator, GasLimitCalculator, MainnetTransactionValidator>
+      transactionValidatorBuilder;
+  private Function<FeeMarket, BlockHeaderValidator.Builder> blockHeaderValidatorBuilder;
+  private Function<FeeMarket, BlockHeaderValidator.Builder> ommerHeaderValidatorBuilder;
   private Function<ProtocolSchedule, BlockBodyValidator> blockBodyValidatorBuilder;
   private BiFunction<GasCalculator, EVM, AbstractMessageProcessor> contractCreationProcessorBuilder;
   private Function<PrecompiledContractConfiguration, PrecompileContractRegistry>
@@ -65,18 +72,26 @@ public class ProtocolSpecBuilder {
   private PrivacyParameters privacyParameters;
   private PrivateTransactionProcessorBuilder privateTransactionProcessorBuilder;
   private PrivateTransactionValidatorBuilder privateTransactionValidatorBuilder;
-  private TransactionPriceCalculator transactionPriceCalculator =
-      TransactionPriceCalculator.frontier();
-  private Optional<EIP1559> eip1559 = Optional.empty();
-  private TransactionGasBudgetCalculator gasBudgetCalculator =
-      TransactionGasBudgetCalculator.frontier();
+  private WithdrawalsValidator withdrawalsValidator =
+      new WithdrawalsValidator.ProhibitedWithdrawals();
+  private WithdrawalsProcessor withdrawalsProcessor;
+
+  private DepositsValidator depositsValidator = new DepositsValidator.ProhibitedDeposits();
+  private FeeMarket feeMarket = FeeMarket.legacy();
   private BadBlockManager badBlockManager;
+  private PoWHasher powHasher = PoWHasher.ETHASH_LIGHT;
+  private boolean isPoS = false;
 
   public ProtocolSpecBuilder gasCalculator(final Supplier<GasCalculator> gasCalculatorBuilder) {
     this.gasCalculatorBuilder = gasCalculatorBuilder;
     return this;
   }
 
+  public ProtocolSpecBuilder gasLimitCalculator(final GasLimitCalculator gasLimitCalculator) {
+    this.gasLimitCalculator = gasLimitCalculator;
+    return this;
+  }
+
   public ProtocolSpecBuilder blockReward(final Wei blockReward) {
     this.blockReward = blockReward;
     return this;
@@ -103,25 +118,27 @@ public ProtocolSpecBuilder difficultyCalculator(final DifficultyCalculator diffi
     return this;
   }
 
-  public ProtocolSpecBuilder evmBuilder(final Function<GasCalculator, EVM> evmBuilder) {
+  public ProtocolSpecBuilder evmBuilder(
+      final BiFunction<GasCalculator, EvmConfiguration, EVM> evmBuilder) {
     this.evmBuilder = evmBuilder;
     return this;
   }
 
   public ProtocolSpecBuilder transactionValidatorBuilder(
-      final Function<GasCalculator, MainnetTransactionValidator> transactionValidatorBuilder) {
+      final BiFunction<GasCalculator, GasLimitCalculator, MainnetTransactionValidator>
+          transactionValidatorBuilder) {
     this.transactionValidatorBuilder = transactionValidatorBuilder;
     return this;
   }
 
   public ProtocolSpecBuilder blockHeaderValidatorBuilder(
-      final BlockHeaderValidator.Builder blockHeaderValidatorBuilder) {
+      final Function<FeeMarket, BlockHeaderValidator.Builder> blockHeaderValidatorBuilder) {
     this.blockHeaderValidatorBuilder = blockHeaderValidatorBuilder;
     return this;
   }
 
   public ProtocolSpecBuilder ommerHeaderValidatorBuilder(
-      final BlockHeaderValidator.Builder ommerHeaderValidatorBuilder) {
+      final Function<FeeMarket, BlockHeaderValidator.Builder> ommerHeaderValidatorBuilder) {
     this.ommerHeaderValidatorBuilder = ommerHeaderValidatorBuilder;
     return this;
   }
@@ -148,9 +165,7 @@ public ProtocolSpecBuilder precompileContractRegistryBuilder(
               precompileContractRegistryBuilder.apply(precompiledContractConfiguration);
           if (precompiledContractConfiguration.getPrivacyParameters().isEnabled()) {
             MainnetPrecompiledContractRegistries.appendPrivacy(
-                registry, precompiledContractConfiguration, Account.DEFAULT_VERSION);
-            MainnetPrecompiledContractRegistries.appendPrivacy(
-                registry, precompiledContractConfiguration, 1);
+                registry, precompiledContractConfiguration);
           }
           return registry;
         };
@@ -215,31 +230,51 @@ public ProtocolSpecBuilder privacyParameters(final PrivacyParameters privacyPara
     return this;
   }
 
-  public ProtocolSpecBuilder transactionPriceCalculator(
-      final TransactionPriceCalculator transactionPriceCalculator) {
-    this.transactionPriceCalculator = transactionPriceCalculator;
+  public ProtocolSpecBuilder feeMarket(final FeeMarket feeMarket) {
+    this.feeMarket = feeMarket;
     return this;
   }
 
-  public ProtocolSpecBuilder eip1559(final Optional<EIP1559> eip1559) {
-    this.eip1559 = eip1559;
+  public ProtocolSpecBuilder badBlocksManager(final BadBlockManager badBlockManager) {
+    this.badBlockManager = badBlockManager;
     return this;
   }
 
-  public ProtocolSpecBuilder gasBudgetCalculator(
-      final TransactionGasBudgetCalculator gasBudgetCalculator) {
-    this.gasBudgetCalculator = gasBudgetCalculator;
+  public ProtocolSpecBuilder powHasher(final PoWHasher powHasher) {
+    this.powHasher = powHasher;
     return this;
   }
 
-  public ProtocolSpecBuilder badBlocksManager(final BadBlockManager badBlockManager) {
-    this.badBlockManager = badBlockManager;
+  public ProtocolSpecBuilder evmConfiguration(final EvmConfiguration evmConfiguration) {
+    this.evmConfiguration = evmConfiguration;
+    return this;
+  }
+
+  public ProtocolSpecBuilder withdrawalsValidator(final WithdrawalsValidator withdrawalsValidator) {
+    this.withdrawalsValidator = withdrawalsValidator;
+    return this;
+  }
+
+  public ProtocolSpecBuilder withdrawalsProcessor(final WithdrawalsProcessor withdrawalsProcessor) {
+    this.withdrawalsProcessor = withdrawalsProcessor;
+    return this;
+  }
+
+  public ProtocolSpecBuilder depositsValidator(final DepositsValidator depositsValidator) {
+    this.depositsValidator = depositsValidator;
+    return this;
+  }
+
+  public ProtocolSpecBuilder isPoS(final boolean isPoS) {
+    this.isPoS = isPoS;
     return this;
   }
 
   public ProtocolSpec build(final ProtocolSchedule protocolSchedule) {
     checkNotNull(gasCalculatorBuilder, "Missing gasCalculator");
+    checkNotNull(gasLimitCalculator, "Missing gasLimitCalculator");
     checkNotNull(evmBuilder, "Missing operation registry");
+    checkNotNull(evmConfiguration, "Missing evm configuration");
     checkNotNull(transactionValidatorBuilder, "Missing transaction validator");
     checkNotNull(privateTransactionValidatorBuilder, "Missing private transaction validator");
     checkNotNull(contractCreationProcessorBuilder, "Missing contract creation processor");
@@ -260,16 +295,15 @@ public ProtocolSpec build(final ProtocolSchedule protocolSchedule) {
     checkNotNull(miningBeneficiaryCalculator, "Missing Mining Beneficiary Calculator");
     checkNotNull(protocolSchedule, "Missing protocol schedule");
     checkNotNull(privacyParameters, "Missing privacy parameters");
-    checkNotNull(transactionPriceCalculator, "Missing transaction price calculator");
-    checkNotNull(eip1559, "Missing eip1559 optional wrapper");
+    checkNotNull(feeMarket, "Missing fee market");
     checkNotNull(badBlockManager, "Missing bad blocks manager");
 
     final GasCalculator gasCalculator = gasCalculatorBuilder.get();
-    final EVM evm = evmBuilder.apply(gasCalculator);
+    final EVM evm = evmBuilder.apply(gasCalculator, evmConfiguration);
     final PrecompiledContractConfiguration precompiledContractConfiguration =
         new PrecompiledContractConfiguration(gasCalculator, privacyParameters);
     final MainnetTransactionValidator transactionValidator =
-        transactionValidatorBuilder.apply(gasCalculator);
+        transactionValidatorBuilder.apply(gasCalculator, gasLimitCalculator);
     final AbstractMessageProcessor contractCreationProcessor =
         contractCreationProcessorBuilder.apply(gasCalculator, evm);
     final PrecompileContractRegistry precompileContractRegistry =
@@ -281,46 +315,23 @@ public ProtocolSpec build(final ProtocolSchedule protocolSchedule) {
             gasCalculator, transactionValidator, contractCreationProcessor, messageCallProcessor);
 
     final BlockHeaderValidator blockHeaderValidator =
-        blockHeaderValidatorBuilder.difficultyCalculator(difficultyCalculator).build();
+        createBlockHeaderValidator(blockHeaderValidatorBuilder);
 
     final BlockHeaderValidator ommerHeaderValidator =
-        ommerHeaderValidatorBuilder.difficultyCalculator(difficultyCalculator).build();
+        createBlockHeaderValidator(ommerHeaderValidatorBuilder);
+
     final BlockBodyValidator blockBodyValidator = blockBodyValidatorBuilder.apply(protocolSchedule);
 
-    BlockProcessor blockProcessor =
-        blockProcessorBuilder.apply(
-            transactionProcessor,
-            transactionReceiptFactory,
-            blockReward,
-            miningBeneficiaryCalculator,
-            skipZeroBlockRewards,
-            gasBudgetCalculator);
+    BlockProcessor blockProcessor = createBlockProcessor(transactionProcessor, protocolSchedule);
     // Set private Tx Processor
-    PrivateTransactionProcessor privateTransactionProcessor = null;
-    if (privacyParameters.isEnabled()) {
-      final PrivateTransactionValidator privateTransactionValidator =
-          privateTransactionValidatorBuilder.apply();
-      privateTransactionProcessor =
-          privateTransactionProcessorBuilder.apply(
-              gasCalculator,
-              transactionValidator,
-              contractCreationProcessor,
-              messageCallProcessor,
-              privateTransactionValidator);
-
-      if (privacyParameters.isOnchainPrivacyGroupsEnabled()) {
-        final OnChainPrivacyPrecompiledContract onChainPrivacyPrecompiledContract =
-            (OnChainPrivacyPrecompiledContract)
-                precompileContractRegistry.get(Address.ONCHAIN_PRIVACY, Account.DEFAULT_VERSION);
-        onChainPrivacyPrecompiledContract.setPrivateTransactionProcessor(
-            privateTransactionProcessor);
-      } else {
-        final PrivacyPrecompiledContract privacyPrecompiledContract =
-            (PrivacyPrecompiledContract)
-                precompileContractRegistry.get(Address.DEFAULT_PRIVACY, Account.DEFAULT_VERSION);
-        privacyPrecompiledContract.setPrivateTransactionProcessor(privateTransactionProcessor);
-      }
+    PrivateTransactionProcessor privateTransactionProcessor =
+        createPrivateTransactionProcessor(
+            transactionValidator,
+            contractCreationProcessor,
+            messageCallProcessor,
+            precompileContractRegistry);
 
+    if (privacyParameters.isEnabled()) {
       blockProcessor =
           new PrivacyBlockProcessor(
               blockProcessor,
@@ -328,7 +339,8 @@ public ProtocolSpec build(final ProtocolSchedule protocolSchedule) {
               privacyParameters.getEnclave(),
               privacyParameters.getPrivateStateStorage(),
               privacyParameters.getPrivateWorldStateArchive(),
-              privacyParameters.getPrivateStateRootResolver());
+              privacyParameters.getPrivateStateRootResolver(),
+              privacyParameters.getPrivateStateGenesisAllocator());
     }
 
     final BlockValidator blockValidator =
@@ -355,10 +367,69 @@ public ProtocolSpec build(final ProtocolSchedule protocolSchedule) {
         precompileContractRegistry,
         skipZeroBlockRewards,
         gasCalculator,
-        transactionPriceCalculator,
-        eip1559,
-        gasBudgetCalculator,
-        badBlockManager);
+        gasLimitCalculator,
+        feeMarket,
+        badBlockManager,
+        Optional.ofNullable(powHasher),
+        withdrawalsValidator,
+        Optional.ofNullable(withdrawalsProcessor),
+        depositsValidator,
+        isPoS);
+  }
+
+  private PrivateTransactionProcessor createPrivateTransactionProcessor(
+      final MainnetTransactionValidator transactionValidator,
+      final AbstractMessageProcessor contractCreationProcessor,
+      final AbstractMessageProcessor messageCallProcessor,
+      final PrecompileContractRegistry precompileContractRegistry) {
+    PrivateTransactionProcessor privateTransactionProcessor = null;
+    if (privacyParameters.isEnabled()) {
+      final PrivateTransactionValidator privateTransactionValidator =
+          privateTransactionValidatorBuilder.apply();
+      privateTransactionProcessor =
+          privateTransactionProcessorBuilder.apply(
+              transactionValidator,
+              contractCreationProcessor,
+              messageCallProcessor,
+              privateTransactionValidator);
+
+      if (privacyParameters.isPrivacyPluginEnabled()) {
+        final PrivacyPluginPrecompiledContract privacyPluginPrecompiledContract =
+            (PrivacyPluginPrecompiledContract) precompileContractRegistry.get(PLUGIN_PRIVACY);
+        privacyPluginPrecompiledContract.setPrivateTransactionProcessor(
+            privateTransactionProcessor);
+      } else if (privacyParameters.isFlexiblePrivacyGroupsEnabled()) {
+        final FlexiblePrivacyPrecompiledContract flexiblePrivacyPrecompiledContract =
+            (FlexiblePrivacyPrecompiledContract) precompileContractRegistry.get(FLEXIBLE_PRIVACY);
+        flexiblePrivacyPrecompiledContract.setPrivateTransactionProcessor(
+            privateTransactionProcessor);
+      } else {
+        final PrivacyPrecompiledContract privacyPrecompiledContract =
+            (PrivacyPrecompiledContract) precompileContractRegistry.get(DEFAULT_PRIVACY);
+        privacyPrecompiledContract.setPrivateTransactionProcessor(privateTransactionProcessor);
+      }
+    }
+    return privateTransactionProcessor;
+  }
+
+  private BlockProcessor createBlockProcessor(
+      final MainnetTransactionProcessor transactionProcessor,
+      final ProtocolSchedule protocolSchedule) {
+    return blockProcessorBuilder.apply(
+        transactionProcessor,
+        transactionReceiptFactory,
+        blockReward,
+        miningBeneficiaryCalculator,
+        skipZeroBlockRewards,
+        protocolSchedule);
+  }
+
+  private BlockHeaderValidator createBlockHeaderValidator(
+      final Function<FeeMarket, BlockHeaderValidator.Builder> blockHeaderValidatorBuilder) {
+    return blockHeaderValidatorBuilder
+        .apply(feeMarket)
+        .difficultyCalculator(difficultyCalculator)
+        .build();
   }
 
   public interface TransactionProcessorBuilder {
@@ -371,7 +442,6 @@ MainnetTransactionProcessor apply(
 
   public interface PrivateTransactionProcessorBuilder {
     PrivateTransactionProcessor apply(
-        GasCalculator gasCalculator,
         MainnetTransactionValidator transactionValidator,
         AbstractMessageProcessor contractCreationProcessor,
         AbstractMessageProcessor messageCallProcessor,
@@ -389,7 +459,7 @@ BlockProcessor apply(
         Wei blockReward,
         MiningBeneficiaryCalculator miningBeneficiaryCalculator,
         boolean skipZeroBlockRewards,
-        TransactionGasBudgetCalculator gasBudgetCalculator);
+        ProtocolSchedule protocolSchedule);
   }
 
   public interface BlockValidatorBuilder {
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ScheduleBasedBlockHeaderFunctions.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ScheduleBasedBlockHeaderFunctions.java
index 05d79732b17..7ba9bbf7366 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ScheduleBasedBlockHeaderFunctions.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ScheduleBasedBlockHeaderFunctions.java
@@ -14,9 +14,9 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.ParsedExtraData;
 import org.hyperledger.besu.ethereum.core.SealableBlockHeader;
 
@@ -47,6 +47,6 @@ public ParsedExtraData parseExtraData(final BlockHeader header) {
   }
 
   private BlockHeaderFunctions getBlockHeaderFunctions(final SealableBlockHeader header) {
-    return protocolSchedule.getByBlockNumber(header.getNumber()).getBlockHeaderFunctions();
+    return protocolSchedule.getByBlockHeader(header).getBlockHeaderFunctions();
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ScheduledProtocolSpec.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ScheduledProtocolSpec.java
index c08c139e74e..278f45b9abb 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ScheduledProtocolSpec.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ScheduledProtocolSpec.java
@@ -14,21 +14,89 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
-/** Tuple that associates a {@link ProtocolSpec} with a given block level starting point */
-public class ScheduledProtocolSpec {
-  private final long block;
-  private final ProtocolSpec spec;
-
-  public ScheduledProtocolSpec(final long block, final ProtocolSpec spec) {
-    this.block = block;
-    this.spec = spec;
-  }
+import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
+
+/**
+ * Associates a {@link ProtocolSpec} with a given block number or timestamp level starting point
+ * Knows how to query the timestamp or block number of a given block header
+ */
+public interface ScheduledProtocolSpec {
+  boolean isOnOrAfterMilestoneBoundary(ProcessableBlockHeader header);
+
+  boolean isOnMilestoneBoundary(ProcessableBlockHeader header);
+
+  long milestone();
+
+  ProtocolSpec spec();
+
+  class TimestampProtocolSpec implements ScheduledProtocolSpec {
+
+    private final long timestamp;
+    private final ProtocolSpec protocolSpec;
+
+    public static TimestampProtocolSpec create(
+        final long timestamp, final ProtocolSpec protocolSpec) {
+      return new TimestampProtocolSpec(timestamp, protocolSpec);
+    }
+
+    private TimestampProtocolSpec(final long timestamp, final ProtocolSpec protocolSpec) {
+      this.timestamp = timestamp;
+      this.protocolSpec = protocolSpec;
+    }
 
-  public long getBlock() {
-    return block;
+    @Override
+    public boolean isOnOrAfterMilestoneBoundary(final ProcessableBlockHeader header) {
+      return header.getTimestamp() >= timestamp;
+    }
+
+    @Override
+    public boolean isOnMilestoneBoundary(final ProcessableBlockHeader header) {
+      return header.getTimestamp() == timestamp;
+    }
+
+    @Override
+    public long milestone() {
+      return timestamp;
+    }
+
+    @Override
+    public ProtocolSpec spec() {
+      return protocolSpec;
+    }
   }
 
-  public ProtocolSpec getSpec() {
-    return spec;
+  class BlockNumberProtocolSpec implements ScheduledProtocolSpec {
+    private final long blockNumber;
+    private final ProtocolSpec protocolSpec;
+
+    public static BlockNumberProtocolSpec create(
+        final long blockNumber, final ProtocolSpec protocolSpec) {
+      return new BlockNumberProtocolSpec(blockNumber, protocolSpec);
+    }
+
+    private BlockNumberProtocolSpec(final long blockNumber, final ProtocolSpec protocolSpec) {
+      this.blockNumber = blockNumber;
+      this.protocolSpec = protocolSpec;
+    }
+
+    @Override
+    public boolean isOnOrAfterMilestoneBoundary(final ProcessableBlockHeader header) {
+      return header.getNumber() >= blockNumber;
+    }
+
+    @Override
+    public boolean isOnMilestoneBoundary(final ProcessableBlockHeader header) {
+      return header.getNumber() == blockNumber;
+    }
+
+    @Override
+    public long milestone() {
+      return blockNumber;
+    }
+
+    @Override
+    public ProtocolSpec spec() {
+      return protocolSpec;
+    }
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/SpuriousDragonGasCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/SpuriousDragonGasCalculator.java
deleted file mode 100644
index 67946c1af27..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/SpuriousDragonGasCalculator.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class SpuriousDragonGasCalculator extends TangerineWhistleGasCalculator {
-
-  private static final Gas EXP_OPERATION_BYTE_GAS_COST = Gas.of(50L);
-
-  @Override
-  public Gas callOperationGasCost(
-      final MessageFrame frame,
-      final Gas stipend,
-      final UInt256 inputDataOffset,
-      final UInt256 inputDataLength,
-      final UInt256 outputDataOffset,
-      final UInt256 outputDataLength,
-      final Wei transferValue,
-      final Account recipient,
-      final Address to) {
-    final Gas inputDataMemoryExpansionCost =
-        memoryExpansionGasCost(frame, inputDataOffset, inputDataLength);
-    final Gas outputDataMemoryExpansionCost =
-        memoryExpansionGasCost(frame, outputDataOffset, outputDataLength);
-    final Gas memoryExpansionCost = inputDataMemoryExpansionCost.max(outputDataMemoryExpansionCost);
-
-    Gas cost = callOperationBaseGasCost().plus(memoryExpansionCost);
-
-    if (!transferValue.isZero()) {
-      cost = cost.plus(callValueTransferGasCost());
-    }
-
-    if ((recipient == null || recipient.isEmpty()) && !transferValue.isZero()) {
-      cost = cost.plus(newAccountGasCost());
-    }
-
-    return cost;
-  }
-
-  @Override
-  protected Gas expOperationByteGasCost() {
-    return EXP_OPERATION_BYTE_GAS_COST;
-  }
-
-  private static final Gas SELFDESTRUCT_OPERATION_GAS_COST = Gas.of(5_000L);
-
-  private static final Gas SELFDESTRUCT_OPERATION_CREATES_NEW_ACCOUNT = Gas.of(30_000L);
-
-  @Override
-  public Gas selfDestructOperationGasCost(final Account recipient, final Wei inheritance) {
-    if ((recipient == null || recipient.isEmpty()) && !inheritance.isZero()) {
-      return SELFDESTRUCT_OPERATION_CREATES_NEW_ACCOUNT;
-    } else {
-      return SELFDESTRUCT_OPERATION_GAS_COST;
-    }
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TangerineWhistleGasCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TangerineWhistleGasCalculator.java
deleted file mode 100644
index 171fee869ed..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TangerineWhistleGasCalculator.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class TangerineWhistleGasCalculator extends HomesteadGasCalculator {
-
-  private static final Gas BALANCE_OPERATION_GAS_COST = Gas.of(400L);
-
-  private static final Gas CALL_OPERATION_BASE_GAS_COST = Gas.of(700L);
-
-  private static final Gas EXT_CODE_BASE_GAS_COST = Gas.of(700L);
-
-  private static final Gas SELFDESTRUCT_OPERATION_GAS_COST = Gas.of(5_000L);
-
-  private static final Gas SELFDESTRUCT_OPERATION_CREATES_NEW_ACCOUNT = Gas.of(30_000L);
-
-  private static final Gas SLOAD_OPERATION_GAS_COST = Gas.of(200L);
-
-  @Override
-  public Gas getBalanceOperationGasCost() {
-    return BALANCE_OPERATION_GAS_COST;
-  }
-
-  // Returns all but 1/64 (n - floor(n /16)) of the provided value
-  private static Gas allButOneSixtyFourth(final Gas value) {
-    return value.minus(value.dividedBy(64));
-  }
-
-  @Override
-  protected Gas callOperationBaseGasCost() {
-    return CALL_OPERATION_BASE_GAS_COST;
-  }
-
-  @Override
-  public Gas callOperationGasCost(
-      final MessageFrame frame,
-      final Gas stipend,
-      final UInt256 inputDataOffset,
-      final UInt256 inputDataLength,
-      final UInt256 outputDataOffset,
-      final UInt256 outputDataLength,
-      final Wei transferValue,
-      final Account recipient,
-      final Address to) {
-    final Gas inputDataMemoryExpansionCost =
-        memoryExpansionGasCost(frame, inputDataOffset, inputDataLength);
-    final Gas outputDataMemoryExpansionCost =
-        memoryExpansionGasCost(frame, outputDataOffset, outputDataLength);
-    final Gas memoryExpansionCost = inputDataMemoryExpansionCost.max(outputDataMemoryExpansionCost);
-
-    Gas cost = callOperationBaseGasCost().plus(memoryExpansionCost);
-
-    if (!transferValue.isZero()) {
-      cost = cost.plus(callValueTransferGasCost());
-    }
-
-    if (recipient == null) {
-      cost = cost.plus(newAccountGasCost());
-    }
-
-    return cost;
-  }
-
-  private static Gas gasCap(final Gas remaining, final Gas stipend) {
-    return allButOneSixtyFourth(remaining).min(stipend);
-  }
-
-  @Override
-  public Gas gasAvailableForChildCall(
-      final MessageFrame frame, final Gas stipend, final boolean transfersValue) {
-    final Gas gasCap = gasCap(frame.getRemainingGas(), stipend);
-
-    // TODO: Integrate this into AbstractCallOperation since it's
-    // a little out of place to mutate the frame here.
-    frame.decrementRemainingGas(gasCap);
-
-    if (transfersValue) {
-      return gasCap.plus(getAdditionalCallStipend());
-    } else {
-      return gasCap;
-    }
-  }
-
-  @Override
-  public Gas gasAvailableForChildCreate(final Gas stipend) {
-    return allButOneSixtyFourth(stipend);
-  }
-
-  @Override
-  protected Gas extCodeBaseGasCost() {
-    return EXT_CODE_BASE_GAS_COST;
-  }
-
-  @Override
-  public Gas selfDestructOperationGasCost(final Account recipient, final Wei inheritance) {
-    if (recipient == null) {
-      return SELFDESTRUCT_OPERATION_CREATES_NEW_ACCOUNT;
-    } else {
-      return SELFDESTRUCT_OPERATION_GAS_COST;
-    }
-  }
-
-  @Override
-  public Gas getSloadOperationGasCost() {
-    return SLOAD_OPERATION_GAS_COST;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidationParams.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidationParams.java
index fb282a09599..c60f376907d 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidationParams.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidationParams.java
@@ -21,19 +21,19 @@
 public interface TransactionValidationParams {
 
   TransactionValidationParams processingBlockParams =
-      ImmutableTransactionValidationParams.of(false, false, true, false);
+      ImmutableTransactionValidationParams.of(false, false, false, true, false, false);
 
   TransactionValidationParams transactionPoolParams =
-      ImmutableTransactionValidationParams.of(true, false, false, true);
+      ImmutableTransactionValidationParams.of(true, false, true, true, true, false);
 
   TransactionValidationParams miningParams =
-      ImmutableTransactionValidationParams.of(false, false, true, true);
+      ImmutableTransactionValidationParams.of(false, false, false, true, true, false);
 
   TransactionValidationParams blockReplayParams =
-      ImmutableTransactionValidationParams.of(false, false, false, false);
+      ImmutableTransactionValidationParams.of(false, false, false, false, false, false);
 
   TransactionValidationParams transactionSimulatorParams =
-      ImmutableTransactionValidationParams.of(false, false, false, false);
+      ImmutableTransactionValidationParams.of(false, false, false, false, false, true);
 
   @Value.Default
   default boolean isAllowFutureNonce() {
@@ -45,6 +45,11 @@ default boolean isAllowExceedingBalance() {
     return false;
   }
 
+  @Value.Default
+  default boolean isAllowMaxFeeGasBelowBaseFee() {
+    return false;
+  }
+
   @Value.Default
   default boolean checkOnchainPermissions() {
     return false;
@@ -55,6 +60,11 @@ default boolean checkLocalPermissions() {
     return true;
   }
 
+  @Value.Default
+  default boolean isAllowContractAddressAsSender() {
+    return false;
+  }
+
   static TransactionValidationParams transactionSimulator() {
     return transactionSimulatorParams;
   }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/WithdrawalsProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/WithdrawalsProcessor.java
new file mode 100644
index 00000000000..b91f81208a6
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/WithdrawalsProcessor.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet;
+
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+import org.hyperledger.besu.evm.account.EvmAccount;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+
+import java.util.List;
+
+public class WithdrawalsProcessor {
+
+  public void processWithdrawals(
+      final List<Withdrawal> withdrawals, final WorldUpdater worldUpdater) {
+    for (final Withdrawal withdrawal : withdrawals) {
+      final EvmAccount account = worldUpdater.getOrCreate(withdrawal.getAddress());
+      account.getMutable().incrementBalance(withdrawal.getAmount().getAsWei());
+    }
+    worldUpdater.clearAccountsThatAreEmpty();
+    worldUpdater.commit();
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/WithdrawalsValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/WithdrawalsValidator.java
new file mode 100644
index 00000000000..2adf0f7f719
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/WithdrawalsValidator.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.mainnet;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public interface WithdrawalsValidator {
+
+  boolean validateWithdrawals(Optional<List<Withdrawal>> withdrawals);
+
+  boolean validateWithdrawalsRoot(Block block);
+
+  class ProhibitedWithdrawals implements WithdrawalsValidator {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ProhibitedWithdrawals.class);
+
+    @Override
+    public boolean validateWithdrawals(final Optional<List<Withdrawal>> withdrawals) {
+      final boolean isValid = withdrawals.isEmpty();
+      if (!isValid) {
+        LOG.warn(
+            "withdrawals must be null when Withdrawals are prohibited but were: {}", withdrawals);
+      }
+      return isValid;
+    }
+
+    @Override
+    public boolean validateWithdrawalsRoot(final Block block) {
+      final Optional<Hash> withdrawalsRoot = block.getHeader().getWithdrawalsRoot();
+      if (withdrawalsRoot.isPresent()) {
+        LOG.warn(
+            "withdrawalsRoot must be null when Withdrawals are prohibited but was: {}",
+            withdrawalsRoot.get());
+        return false;
+      }
+
+      return true;
+    }
+  }
+
+  class AllowedWithdrawals implements WithdrawalsValidator {
+
+    private static final Logger LOG = LoggerFactory.getLogger(AllowedWithdrawals.class);
+
+    @Override
+    public boolean validateWithdrawals(final Optional<List<Withdrawal>> withdrawals) {
+      final boolean isValid = withdrawals.isPresent();
+      if (!isValid) {
+        LOG.warn("withdrawals must not be null when Withdrawals are activated");
+      }
+      return isValid;
+    }
+
+    @Override
+    public boolean validateWithdrawalsRoot(final Block block) {
+      checkArgument(
+          block.getBody().getWithdrawals().isPresent(), "Block body must contain withdrawals");
+      final Optional<Hash> withdrawalsRoot = block.getHeader().getWithdrawalsRoot();
+      if (withdrawalsRoot.isEmpty()) {
+        LOG.warn("withdrawalsRoot must not be null when Withdrawals are activated");
+        return false;
+      }
+
+      final List<Withdrawal> withdrawals = block.getBody().getWithdrawals().get();
+      final Hash expectedWithdrawalsRoot = BodyValidation.withdrawalsRoot(withdrawals);
+      if (!expectedWithdrawalsRoot.equals(withdrawalsRoot.get())) {
+        LOG.info(
+            "Invalid block: transaction root mismatch (expected={}, actual={})",
+            expectedWithdrawalsRoot,
+            withdrawalsRoot.get());
+        return false;
+      }
+
+      return true;
+    }
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/contractvalidation/MaxCodeSizeRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/contractvalidation/MaxCodeSizeRule.java
deleted file mode 100644
index 7d49fbf0a4e..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/contractvalidation/MaxCodeSizeRule.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet.contractvalidation;
-
-import org.hyperledger.besu.ethereum.mainnet.ContractValidationRule;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-public class MaxCodeSizeRule implements ContractValidationRule {
-
-  private static final Logger LOG = LogManager.getLogger();
-
-  private final int maxCodeSize;
-
-  private MaxCodeSizeRule(final int maxCodeSize) {
-    this.maxCodeSize = maxCodeSize;
-  }
-
-  @Override
-  public boolean validate(final MessageFrame frame) {
-    final int contractCodeSize = frame.getOutputData().size();
-    if (contractCodeSize <= maxCodeSize) {
-      return true;
-    } else {
-      LOG.trace(
-          "Contract creation error: code size {} exceeds code size limit {}",
-          contractCodeSize,
-          maxCodeSize);
-      return false;
-    }
-  }
-
-  public static ContractValidationRule of(final int maxCodeSize) {
-    return new MaxCodeSizeRule(maxCodeSize);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/BaseFeeMarket.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/BaseFeeMarket.java
new file mode 100644
index 00000000000..4678092003d
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/BaseFeeMarket.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet.feemarket;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+public interface BaseFeeMarket extends FeeMarket {
+
+  enum ValidationMode {
+    NONE,
+    INITIAL,
+    ONGOING
+  }
+
+  @Override
+  default boolean implementsBaseFee() {
+    return true;
+  }
+
+  long getBasefeeMaxChangeDenominator();
+
+  Wei getInitialBasefee();
+
+  long getSlackCoefficient();
+
+  /**
+   * Compute the "gas target" for this block, which results in no baseFee adjustment in a subsequent
+   * block.
+   *
+   * @param blockHeader block header to compute gas target of.
+   * @return long target gas value.
+   */
+  default long targetGasUsed(final BlockHeader blockHeader) {
+    return blockHeader.getGasLimit() / getSlackCoefficient();
+  }
+
+  Wei computeBaseFee(
+      final long blockNumber,
+      final Wei parentBaseFee,
+      final long parentBlockGasUsed,
+      final long targetGasUsed);
+
+  ValidationMode baseFeeValidationMode(final long blockNumber);
+
+  ValidationMode gasLimitValidationMode(final long blockNumber);
+
+  boolean isBeforeForkBlock(final long blockNumber);
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/CancunFeeMarket.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/CancunFeeMarket.java
new file mode 100644
index 00000000000..68f0ba26a63
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/CancunFeeMarket.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet.feemarket;
+
+import org.hyperledger.besu.datatypes.DataGas;
+import org.hyperledger.besu.datatypes.Wei;
+
+import java.math.BigInteger;
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CancunFeeMarket extends LondonFeeMarket {
+  private static final Logger LOG = LoggerFactory.getLogger(CancunFeeMarket.class);
+  private static final BigInteger MIN_DATA_GAS_PRICE = BigInteger.ONE;
+  private static final BigInteger DATA_GAS_PRICE_UPDATE_FRACTION = BigInteger.valueOf(2225652);
+
+  public CancunFeeMarket(
+      final long londonForkBlockNumber, final Optional<Wei> baseFeePerGasOverride) {
+    super(londonForkBlockNumber, baseFeePerGasOverride);
+  }
+
+  @Override
+  public boolean implementsDataFee() {
+    return true;
+  }
+
+  @Override
+  public Wei dataPrice(final DataGas excessDataGas) {
+    final var dataGasPrice =
+        Wei.of(
+            fakeExponential(
+                MIN_DATA_GAS_PRICE, excessDataGas.toBigInteger(), DATA_GAS_PRICE_UPDATE_FRACTION));
+    LOG.atTrace()
+        .setMessage("parentExcessDataGas: {} dataGasPrice: {}")
+        .addArgument(excessDataGas::toShortHexString)
+        .addArgument(dataGasPrice::toHexString)
+        .log();
+
+    return dataGasPrice;
+  }
+
+  private BigInteger fakeExponential(
+      final BigInteger factor, final BigInteger numerator, final BigInteger denominator) {
+    int i = 1;
+    BigInteger output = BigInteger.ZERO;
+    BigInteger numeratorAccumulator = factor.multiply(denominator);
+    while (numeratorAccumulator.signum() > 0) {
+      output = output.add(numeratorAccumulator);
+      numeratorAccumulator =
+          (numeratorAccumulator.multiply(numerator))
+              .divide(denominator.multiply(BigInteger.valueOf(i)));
+      ++i;
+    }
+    return output.divide(denominator);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/FeeMarket.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/FeeMarket.java
new file mode 100644
index 00000000000..dc20b43438f
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/FeeMarket.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet.feemarket;
+
+import org.hyperledger.besu.datatypes.DataGas;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.feemarket.TransactionPriceCalculator;
+
+import java.util.Optional;
+
+public interface FeeMarket {
+
+  default boolean implementsBaseFee() {
+    return false;
+  }
+
+  default boolean implementsDataFee() {
+    return false;
+  }
+
+  TransactionPriceCalculator getTransactionPriceCalculator();
+
+  boolean satisfiesFloorTxFee(Transaction txn);
+
+  static BaseFeeMarket london(final long londonForkBlockNumber) {
+    return london(londonForkBlockNumber, Optional.empty());
+  }
+
+  static BaseFeeMarket london(
+      final long londonForkBlockNumber, final Optional<Wei> baseFeePerGasOverride) {
+    return new LondonFeeMarket(londonForkBlockNumber, baseFeePerGasOverride);
+  }
+
+  static BaseFeeMarket cancun(
+      final long londonForkBlockNumber, final Optional<Wei> baseFeePerGasOverride) {
+    return new CancunFeeMarket(londonForkBlockNumber, baseFeePerGasOverride);
+  }
+
+  static BaseFeeMarket zeroBaseFee(final long londonForkBlockNumber) {
+    return new ZeroBaseFeeMarket(londonForkBlockNumber);
+  }
+
+  static FeeMarket legacy() {
+    return new LegacyFeeMarket();
+  }
+
+  default Wei dataPrice(final DataGas excessDataGas) {
+    return Wei.ZERO;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LegacyFeeMarket.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LegacyFeeMarket.java
new file mode 100644
index 00000000000..8e73ec2948c
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LegacyFeeMarket.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet.feemarket;
+
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.feemarket.TransactionPriceCalculator;
+
+public class LegacyFeeMarket implements FeeMarket {
+
+  private final TransactionPriceCalculator txPriceCalculator;
+
+  public LegacyFeeMarket() {
+    this.txPriceCalculator = TransactionPriceCalculator.frontier();
+  }
+
+  @Override
+  public TransactionPriceCalculator getTransactionPriceCalculator() {
+    return txPriceCalculator;
+  }
+
+  @Override
+  public boolean satisfiesFloorTxFee(final Transaction txn) {
+    return true;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LondonFeeMarket.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LondonFeeMarket.java
new file mode 100644
index 00000000000..6f454b464eb
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LondonFeeMarket.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet.feemarket;
+
+import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.feemarket.TransactionPriceCalculator;
+
+import java.util.Optional;
+
+import org.apache.tuweni.units.bigints.UInt256s;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LondonFeeMarket implements BaseFeeMarket {
+  private static final Logger LOG = LoggerFactory.getLogger(LondonFeeMarket.class);
+
+  static final Wei DEFAULT_BASEFEE_INITIAL_VALUE =
+      GenesisConfigFile.BASEFEE_AT_GENESIS_DEFAULT_VALUE;
+  static final long DEFAULT_BASEFEE_MAX_CHANGE_DENOMINATOR = 8L;
+  static final long DEFAULT_SLACK_COEFFICIENT = 2L;
+
+  private static final Wei DEFAULT_BASEFEE_FLOOR = Wei.of(7L);
+
+  private final Wei baseFeeInitialValue;
+  private final long londonForkBlockNumber;
+  private final TransactionPriceCalculator txPriceCalculator;
+  private final Wei baseFeeFloor;
+
+  public LondonFeeMarket(final long londonForkBlockNumber) {
+    this(londonForkBlockNumber, Optional.empty());
+  }
+
+  public LondonFeeMarket(
+      final long londonForkBlockNumber, final Optional<Wei> baseFeePerGasOverride) {
+    this.txPriceCalculator = TransactionPriceCalculator.eip1559();
+    this.londonForkBlockNumber = londonForkBlockNumber;
+    this.baseFeeInitialValue = baseFeePerGasOverride.orElse(DEFAULT_BASEFEE_INITIAL_VALUE);
+    this.baseFeeFloor = baseFeeInitialValue.isZero() ? Wei.ZERO : DEFAULT_BASEFEE_FLOOR;
+  }
+
+  @Override
+  public long getBasefeeMaxChangeDenominator() {
+    return DEFAULT_BASEFEE_MAX_CHANGE_DENOMINATOR;
+  }
+
+  @Override
+  public Wei getInitialBasefee() {
+    return baseFeeInitialValue;
+  }
+
+  @Override
+  public long getSlackCoefficient() {
+    return DEFAULT_SLACK_COEFFICIENT;
+  }
+
+  @Override
+  public TransactionPriceCalculator getTransactionPriceCalculator() {
+    return txPriceCalculator;
+  }
+
+  @Override
+  public boolean satisfiesFloorTxFee(final Transaction txn) {
+    // ensure effective baseFee is at least above floor
+    return txn.getGasPrice()
+        .map(Optional::of)
+        .orElse(txn.getMaxFeePerGas())
+        .filter(fee -> fee.greaterOrEqualThan(baseFeeFloor))
+        .isPresent();
+  }
+
+  @Override
+  public Wei computeBaseFee(
+      final long blockNumber,
+      final Wei parentBaseFee,
+      final long parentBlockGasUsed,
+      final long targetGasUsed) {
+    if (londonForkBlockNumber == blockNumber) {
+      return getInitialBasefee();
+    }
+
+    long gasDelta;
+    Wei feeDelta, baseFee;
+    if (parentBlockGasUsed == targetGasUsed) {
+      return parentBaseFee;
+    } else if (parentBlockGasUsed > targetGasUsed) {
+      gasDelta = parentBlockGasUsed - targetGasUsed;
+      final long denominator = getBasefeeMaxChangeDenominator();
+      feeDelta =
+          UInt256s.max(
+              parentBaseFee.multiply(gasDelta).divide(targetGasUsed).divide(denominator), Wei.ONE);
+      baseFee = parentBaseFee.add(feeDelta);
+    } else {
+      gasDelta = targetGasUsed - parentBlockGasUsed;
+      final long denominator = getBasefeeMaxChangeDenominator();
+      feeDelta = parentBaseFee.multiply(gasDelta).divide(targetGasUsed).divide(denominator);
+      baseFee = parentBaseFee.subtract(feeDelta);
+    }
+    LOG.trace(
+        "block #{} parentBaseFee: {} parentGasUsed: {} parentGasTarget: {} baseFee: {}",
+        blockNumber,
+        parentBaseFee,
+        parentBlockGasUsed,
+        targetGasUsed,
+        baseFee);
+    return baseFee;
+  }
+
+  @Override
+  public ValidationMode baseFeeValidationMode(final long blockNumber) {
+    return londonForkBlockNumber == blockNumber ? ValidationMode.INITIAL : ValidationMode.ONGOING;
+  }
+
+  @Override
+  public ValidationMode gasLimitValidationMode(final long blockNumber) {
+    return londonForkBlockNumber == blockNumber ? ValidationMode.INITIAL : ValidationMode.ONGOING;
+  }
+
+  @Override
+  public boolean isBeforeForkBlock(final long blockNumber) {
+    return londonForkBlockNumber > blockNumber;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/ZeroBaseFeeMarket.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/ZeroBaseFeeMarket.java
new file mode 100644
index 00000000000..c2f406cad04
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/feemarket/ZeroBaseFeeMarket.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet.feemarket;
+
+import org.hyperledger.besu.datatypes.Wei;
+
+import java.util.Optional;
+
+public class ZeroBaseFeeMarket extends LondonFeeMarket {
+
+  public ZeroBaseFeeMarket(final long londonForkBlockNumber) {
+    super(londonForkBlockNumber, Optional.of(Wei.ZERO));
+  }
+
+  @Override
+  public Wei computeBaseFee(
+      final long blockNumber,
+      final Wei parentBaseFee,
+      final long parentBlockGasUsed,
+      final long targetGasUsed) {
+
+    return Wei.ZERO;
+  }
+
+  @Override
+  public ValidationMode baseFeeValidationMode(final long blockNumber) {
+    return ValidationMode.NONE;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/AncestryValidationRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/AncestryValidationRule.java
index 6dc9d922bd5..3f128313e53 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/AncestryValidationRule.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/AncestryValidationRule.java
@@ -17,15 +17,15 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Ensures the hash of the parent block matches that specified in the parent hash of the proposed
  * header.
  */
 public class AncestryValidationRule implements DetachedBlockHeaderValidationRule {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(AncestryValidationRule.class);
 
   @Override
   public boolean validate(final BlockHeader header, final BlockHeader parent) {
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/AttachedComposedFromDetachedRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/AttachedComposedFromDetachedRule.java
new file mode 100644
index 00000000000..362cfba0e67
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/AttachedComposedFromDetachedRule.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright Hyperledger Besu Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet.headervalidationrules;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule;
+import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule;
+
+/**
+ * An attached proof of work validation rule that wraps the detached version of the same. Suitable
+ * for use in block validator stacks supporting the merge.
+ */
+public class AttachedComposedFromDetachedRule implements AttachedBlockHeaderValidationRule {
+
+  private final DetachedBlockHeaderValidationRule detachedRule;
+
+  public AttachedComposedFromDetachedRule(final DetachedBlockHeaderValidationRule detachedRule) {
+    this.detachedRule = detachedRule;
+  }
+
+  @Override
+  public boolean validate(
+      final BlockHeader header, final BlockHeader parent, final ProtocolContext protocolContext) {
+    return detachedRule.validate(header, parent);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/BaseFeeMarketBlockHeaderGasPriceValidationRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/BaseFeeMarketBlockHeaderGasPriceValidationRule.java
new file mode 100644
index 00000000000..4a972868389
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/BaseFeeMarketBlockHeaderGasPriceValidationRule.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet.headervalidationrules;
+
+import static org.hyperledger.besu.ethereum.core.feemarket.FeeMarketException.MissingBaseFeeFromBlockHeader;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.feemarket.FeeMarketException;
+import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class BaseFeeMarketBlockHeaderGasPriceValidationRule
+    implements DetachedBlockHeaderValidationRule {
+  private static final Logger LOG =
+      LoggerFactory.getLogger(BaseFeeMarketBlockHeaderGasPriceValidationRule.class);
+  private final BaseFeeMarket baseFeeMarket;
+
+  public BaseFeeMarketBlockHeaderGasPriceValidationRule(final BaseFeeMarket baseFeeMarket) {
+    this.baseFeeMarket = baseFeeMarket;
+  }
+
+  @Override
+  public boolean validate(final BlockHeader header, final BlockHeader parent) {
+    try {
+
+      // if this is the fork block, baseFee should be the initial baseFee
+      if (BaseFeeMarket.ValidationMode.INITIAL.equals(
+          baseFeeMarket.baseFeeValidationMode(header.getNumber()))) {
+        return baseFeeMarket
+            .getInitialBasefee()
+            .equals(header.getBaseFee().orElseThrow(() -> MissingBaseFeeFromBlockHeader()));
+      } else if (BaseFeeMarket.ValidationMode.NONE.equals(
+          baseFeeMarket.baseFeeValidationMode(header.getNumber()))) {
+        // skip validation to allow sync when a zero baseFee chain has historical baseFees
+        return true;
+      }
+
+      final Wei parentBaseFee =
+          parent.getBaseFee().orElseThrow(() -> MissingBaseFeeFromBlockHeader());
+      final Wei currentBaseFee =
+          header.getBaseFee().orElseThrow(() -> MissingBaseFeeFromBlockHeader());
+
+      final long targetGasUsed = baseFeeMarket.targetGasUsed(parent);
+      final Wei expectedBaseFee =
+          baseFeeMarket.computeBaseFee(
+              header.getNumber(), parentBaseFee, parent.getGasUsed(), targetGasUsed);
+      if (!expectedBaseFee.equals(currentBaseFee)) {
+        LOG.info(
+            "Invalid block header: basefee {} does not equal expected basefee {}",
+            header.getBaseFee().orElseThrow(),
+            expectedBaseFee);
+        return false;
+      }
+
+      return true;
+    } catch (final FeeMarketException e) {
+      LOG.info("Invalid block header: " + e.getMessage());
+      return false;
+    }
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/CalculatedDifficultyValidationRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/CalculatedDifficultyValidationRule.java
index cd429805f3b..bcc4e213586 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/CalculatedDifficultyValidationRule.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/CalculatedDifficultyValidationRule.java
@@ -21,11 +21,12 @@
 
 import java.math.BigInteger;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CalculatedDifficultyValidationRule implements AttachedBlockHeaderValidationRule {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG =
+      LoggerFactory.getLogger(CalculatedDifficultyValidationRule.class);
   private final DifficultyCalculator difficultyCalculator;
 
   public CalculatedDifficultyValidationRule(final DifficultyCalculator difficultyCalculator) {
@@ -35,8 +36,8 @@ public CalculatedDifficultyValidationRule(final DifficultyCalculator difficultyC
   @Override
   public boolean validate(
       final BlockHeader header, final BlockHeader parent, final ProtocolContext context) {
-    final BigInteger actualDifficulty =
-        new BigInteger(1, header.getDifficulty().toBytes().toArray());
+
+    final BigInteger actualDifficulty = new BigInteger(1, header.getDifficulty().toArray());
     final BigInteger expectedDifficulty =
         difficultyCalculator.nextDifficulty(header.getTimestamp(), parent, context);
 
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRule.java
index 4f1bfc38c81..c2de1293d50 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRule.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRule.java
@@ -14,17 +14,16 @@
  */
 package org.hyperledger.besu.ethereum.mainnet.headervalidationrules;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
-
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule;
 
 import java.util.function.Function;
 
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ConstantFieldValidationRule<T> implements DetachedBlockHeaderValidationRule {
-  private static final Logger LOG = getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(ConstantFieldValidationRule.class);
   private final T expectedValue;
   private final Function<BlockHeader, T> accessor;
   private final String fieldName;
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ConstantOmmersHashRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ConstantOmmersHashRule.java
new file mode 100644
index 00000000000..61eb038f65f
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ConstantOmmersHashRule.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.mainnet.headervalidationrules;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule;
+
+public class ConstantOmmersHashRule implements AttachedBlockHeaderValidationRule {
+
+  private static final Hash mergeConstant = Hash.EMPTY_LIST_HASH;
+
+  @Override
+  public boolean validate(
+      final BlockHeader header, final BlockHeader parent, final ProtocolContext protocolContext) {
+    return header.getOmmersHash().equals(mergeConstant);
+  }
+
+  @Override
+  public boolean includeInLightValidation() {
+    return AttachedBlockHeaderValidationRule.super.includeInLightValidation();
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/EIP1559BlockHeaderGasPriceValidationRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/EIP1559BlockHeaderGasPriceValidationRule.java
deleted file mode 100644
index e599d6e8f94..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/EIP1559BlockHeaderGasPriceValidationRule.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet.headervalidationrules;
-
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.fees.EIP1559;
-import org.hyperledger.besu.ethereum.core.fees.EIP1559MissingBaseFeeFromBlockHeader;
-import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-public class EIP1559BlockHeaderGasPriceValidationRule implements DetachedBlockHeaderValidationRule {
-  private static final Logger LOG = LogManager.getLogger();
-  private final EIP1559 eip1559;
-
-  public EIP1559BlockHeaderGasPriceValidationRule(final EIP1559 eip1559) {
-    this.eip1559 = eip1559;
-  }
-
-  @Override
-  public boolean validate(final BlockHeader header, final BlockHeader parent) {
-    try {
-      if (!eip1559.isEIP1559(header.getNumber())) {
-        return true;
-      }
-      if (eip1559.isForkBlock(header.getNumber())) {
-        return eip1559.getFeeMarket().getInitialBasefee()
-            == header.getBaseFee().orElseThrow(EIP1559MissingBaseFeeFromBlockHeader::new);
-      }
-
-      final Long parentBaseFee =
-          parent.getBaseFee().orElseThrow(EIP1559MissingBaseFeeFromBlockHeader::new);
-      final Long currentBaseFee =
-          header.getBaseFee().orElseThrow(EIP1559MissingBaseFeeFromBlockHeader::new);
-      final long targetGasUsed = eip1559.targetGasUsed(parent);
-      final long baseFee =
-          eip1559.computeBaseFee(
-              header.getNumber(), parentBaseFee, parent.getGasUsed(), targetGasUsed);
-      if (baseFee != header.getBaseFee().orElseThrow()) {
-        LOG.info(
-            "Invalid block header: basefee {} does not equal expected basefee {}",
-            header.getBaseFee().orElseThrow(),
-            baseFee);
-        return false;
-      }
-      return baseFee == currentBaseFee && eip1559.isValidBaseFee(parentBaseFee, currentBaseFee);
-    } catch (final EIP1559MissingBaseFeeFromBlockHeader e) {
-      LOG.info("Invalid block header: " + e.getMessage());
-      return false;
-    }
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRule.java
index 5f7e6428f27..438d5e426a5 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRule.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ExtraDataMaxLengthValidationRule.java
@@ -17,9 +17,9 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Responsible for ensuring the extra data fields in the header contain the appropriate number of
@@ -27,7 +27,7 @@
  */
 public class ExtraDataMaxLengthValidationRule implements DetachedBlockHeaderValidationRule {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(ExtraDataMaxLengthValidationRule.class);
   private final long maxExtraDataBytes;
 
   public ExtraDataMaxLengthValidationRule(final long maxExtraDataBytes) {
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRule.java
index 24be8f89590..888b56cfb8d 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRule.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRule.java
@@ -17,9 +17,12 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.mainnet.AbstractGasLimitSpecification;
 import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Responsible for ensuring the gasLimit specified in the supplied block header is within bounds as
@@ -29,10 +32,19 @@
 public class GasLimitRangeAndDeltaValidationRule extends AbstractGasLimitSpecification
     implements DetachedBlockHeaderValidationRule {
 
-  private static final Logger LOG = LogManager.getLogger(GasLimitRangeAndDeltaValidationRule.class);
+  private static final Logger LOG =
+      LoggerFactory.getLogger(GasLimitRangeAndDeltaValidationRule.class);
 
-  public GasLimitRangeAndDeltaValidationRule(final long minGasLimit, final long maxGasLimit) {
+  private final Optional<BaseFeeMarket> baseFeeMarket;
+
+  public GasLimitRangeAndDeltaValidationRule(
+      final long minGasLimit, final long maxGasLimit, final Optional<BaseFeeMarket> baseFeeMarket) {
     super(minGasLimit, maxGasLimit);
+    this.baseFeeMarket = baseFeeMarket;
+  }
+
+  public GasLimitRangeAndDeltaValidationRule(final long minGasLimit, final long maxGasLimit) {
+    this(minGasLimit, maxGasLimit, Optional.empty());
   }
 
   @Override
@@ -48,9 +60,24 @@ public boolean validate(final BlockHeader header, final BlockHeader parent) {
       return false;
     }
 
-    final long parentGasLimit = parent.getGasLimit();
+    if (baseFeeMarket.isEmpty() && header.getBaseFee().isPresent()) {
+      LOG.info(
+          "Invalid block header: basefee should not be present in a block without a base fee market");
+      return false;
+    }
+
+    long parentGasLimit =
+        baseFeeMarket
+            .filter(
+                baseFeeMarket ->
+                    BaseFeeMarket.ValidationMode.INITIAL.equals(
+                        baseFeeMarket.gasLimitValidationMode(header.getNumber())))
+            .map(baseFeeMarket -> parent.getGasLimit() * baseFeeMarket.getSlackCoefficient())
+            .orElse(parent.getGasLimit());
+
     final long difference = Math.abs(parentGasLimit - gasLimit);
     final long bounds = deltaBound(parentGasLimit);
+    // this is an exclusive bound, so the difference should be strictly less:
     if (Long.compareUnsigned(difference, bounds) >= 0) {
       LOG.info(
           "Invalid block header: gas limit delta {} is out of bounds of {}", difference, bounds);
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasUsageValidationRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasUsageValidationRule.java
index 189046f4843..1756349d71c 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasUsageValidationRule.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasUsageValidationRule.java
@@ -15,13 +15,10 @@
 package org.hyperledger.besu.ethereum.mainnet.headervalidationrules;
 
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.fees.EIP1559;
 import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule;
 
-import java.util.Optional;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Validates the gas used in executing the block (defined by the supplied header) is less than or
@@ -29,25 +26,13 @@
  */
 public class GasUsageValidationRule implements DetachedBlockHeaderValidationRule {
 
-  private static final Logger LOG = LogManager.getLogger();
-
-  private final Optional<EIP1559> eip1559;
-
-  public GasUsageValidationRule() {
-    this.eip1559 = Optional.empty();
-  }
+  private static final Logger LOG = LoggerFactory.getLogger(GasUsageValidationRule.class);
 
-  public GasUsageValidationRule(final Optional<EIP1559> eip1559) {
-    this.eip1559 = eip1559;
-  }
+  public GasUsageValidationRule() {}
 
   @Override
   public boolean validate(final BlockHeader header, final BlockHeader parent) {
-    long slackCoefficient = 1;
-    if (eip1559.isPresent() && eip1559.get().isEIP1559(header.getNumber())) {
-      slackCoefficient = eip1559.get().getFeeMarket().getSlackCoefficient();
-    }
-    if (header.getGasUsed() > (header.getGasLimit() * slackCoefficient)) {
+    if (header.getGasUsed() > header.getGasLimit()) {
       LOG.info(
           "Invalid block header: gas used {} exceeds gas limit {}",
           header.getGasUsed(),
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/IncrementalTimestampRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/IncrementalTimestampRule.java
new file mode 100644
index 00000000000..bc29e0db9f2
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/IncrementalTimestampRule.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.mainnet.headervalidationrules;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule;
+
+public class IncrementalTimestampRule implements AttachedBlockHeaderValidationRule {
+
+  @Override
+  public boolean validate(
+      final BlockHeader header, final BlockHeader parent, final ProtocolContext protocolContext) {
+
+    final long blockTimestamp = header.getTimestamp();
+    final long parentTimestamp = parent.getTimestamp();
+
+    return blockTimestamp > parentTimestamp;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/NoDifficultyRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/NoDifficultyRule.java
new file mode 100644
index 00000000000..51828cc3678
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/NoDifficultyRule.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.mainnet.headervalidationrules;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule;
+
+public class NoDifficultyRule implements AttachedBlockHeaderValidationRule {
+
+  @Override
+  public boolean validate(
+      final BlockHeader header, final BlockHeader parent, final ProtocolContext protocolContext) {
+    return (header.getDifficulty() == null || header.getDifficulty().equals(Difficulty.ZERO));
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/NoNonceRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/NoNonceRule.java
new file mode 100644
index 00000000000..400565fe868
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/NoNonceRule.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.mainnet.headervalidationrules;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.mainnet.AttachedBlockHeaderValidationRule;
+
+public class NoNonceRule implements AttachedBlockHeaderValidationRule {
+
+  @Override
+  public boolean validate(
+      final BlockHeader header, final BlockHeader parent, final ProtocolContext protocolContext) {
+    return header.getNonce() == 0L;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRule.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRule.java
index f9f2be91ebc..6f1612f1c89 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRule.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRule.java
@@ -14,70 +14,75 @@
  */
 package org.hyperledger.besu.ethereum.mainnet.headervalidationrules;
 
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
+import static java.lang.Boolean.FALSE;
+
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule;
 import org.hyperledger.besu.ethereum.mainnet.EpochCalculator;
-import org.hyperledger.besu.ethereum.mainnet.EthHasher;
+import org.hyperledger.besu.ethereum.mainnet.PoWHasher;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolution;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 
 import java.math.BigInteger;
+import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.units.bigints.UInt256;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class ProofOfWorkValidationRule implements DetachedBlockHeaderValidationRule {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(ProofOfWorkValidationRule.class);
 
   private static final BigInteger ETHASH_TARGET_UPPER_BOUND = BigInteger.valueOf(2).pow(256);
 
-  static final EthHasher HASHER = new EthHasher.Light();
+  private final PoWHasher hasher;
 
   private final EpochCalculator epochCalculator;
-  private final boolean includeBaseFee;
-
-  public ProofOfWorkValidationRule(final EpochCalculator epochCalculator) {
-    this(epochCalculator, false);
-  }
+  private final Optional<FeeMarket> feeMarket;
 
   public ProofOfWorkValidationRule(
-      final EpochCalculator epochCalculator, final boolean includeBaseFee) {
+      final EpochCalculator epochCalculator,
+      final PoWHasher hasher,
+      final Optional<FeeMarket> feeMarket) {
     this.epochCalculator = epochCalculator;
-    this.includeBaseFee = includeBaseFee;
+    this.hasher = hasher;
+    this.feeMarket = feeMarket;
+  }
+
+  public ProofOfWorkValidationRule(final EpochCalculator epochCalculator, final PoWHasher hasher) {
+    this(epochCalculator, hasher, Optional.empty());
   }
 
   @Override
   public boolean validate(final BlockHeader header, final BlockHeader parent) {
-    if (includeBaseFee) {
-      if (!ExperimentalEIPs.eip1559Enabled) {
-        LOG.info("Invalid block header: EIP-1559 feature flag must be enabled --Xeip1559-enabled");
-        return false;
-      } else if (header.getBaseFee().isEmpty()) {
+
+    if (imlementsBaseFeeMarket()) {
+      if (header.getBaseFee().isEmpty()) {
         LOG.info("Invalid block header: missing mandatory base fee.");
         return false;
       }
+    } else if (header.getBaseFee().isPresent()) {
+      LOG.info("Invalid block header: presence of basefee in a non-eip1559 block");
+      return false;
     }
 
-    final byte[] hashBuffer = new byte[64];
     final Hash headerHash = hashHeader(header);
-    HASHER.hash(
-        hashBuffer, header.getNonce(), header.getNumber(), epochCalculator, headerHash.toArray());
+    PoWSolution solution =
+        hasher.hash(header.getNonce(), header.getNumber(), epochCalculator, headerHash);
 
     if (header.getDifficulty().isZero()) {
       LOG.info("Invalid block header: difficulty is 0");
       return false;
     }
-    final BigInteger difficulty = header.getDifficulty().toBytes().toUnsignedBigInteger();
+    final BigInteger difficulty = header.getDifficulty().toUnsignedBigInteger();
     final UInt256 target =
         difficulty.equals(BigInteger.ONE)
             ? UInt256.MAX_VALUE
             : UInt256.valueOf(ETHASH_TARGET_UPPER_BOUND.divide(difficulty));
-    final UInt256 result = UInt256.fromBytes(Bytes32.wrap(hashBuffer, 32));
+    final UInt256 result = UInt256.fromBytes(solution.getSolution());
     if (result.compareTo(target) > 0) {
       LOG.info(
           "Invalid block header: the EthHash result {} was greater than the target {}.\n"
@@ -88,8 +93,7 @@ public boolean validate(final BlockHeader header, final BlockHeader parent) {
       return false;
     }
 
-    final Hash mixedHash =
-        Hash.wrap(Bytes32.leftPad(Bytes.wrap(hashBuffer).slice(0, Bytes32.SIZE)));
+    final Hash mixedHash = solution.getMixHash();
     if (!header.getMixHash().equals(mixedHash)) {
       LOG.info(
           "Invalid block header: header mixed hash {} does not equal calculated mixed hash {}.\n"
@@ -121,9 +125,8 @@ Hash hashHeader(final BlockHeader header) {
     out.writeLongScalar(header.getGasUsed());
     out.writeLongScalar(header.getTimestamp());
     out.writeBytes(header.getExtraData());
-    if (includeBaseFee && header.getBaseFee().isPresent()) {
-      ExperimentalEIPs.eip1559MustBeEnabled();
-      out.writeLongScalar(header.getBaseFee().get());
+    if (imlementsBaseFeeMarket() && header.getBaseFee().isPresent()) {
+      out.writeUInt256Scalar(header.getBaseFee().get());
     }
     out.endList();
 
@@ -134,4 +137,8 @@ Hash hashHeader(final BlockHeader header) {
   public boolean includeInLightValidation() {
     return false;
   }
+
+  private boolean imlementsBaseFeeMarket() {
+    return feeMarket.map(FeeMarket::implementsBaseFee).orElse(FALSE);
+  }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/TimestampBoundedByFutureParameter.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/TimestampBoundedByFutureParameter.java
index 68b5ae94cc6..c5271b67ea3 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/TimestampBoundedByFutureParameter.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/TimestampBoundedByFutureParameter.java
@@ -19,8 +19,8 @@
 
 import java.util.concurrent.TimeUnit;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Responsible for ensuring the timestamp of a block is not more than "acceptableClockDriftSeconds'
@@ -28,7 +28,8 @@
  */
 public class TimestampBoundedByFutureParameter implements DetachedBlockHeaderValidationRule {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TimestampBoundedByFutureParameter.class);
   private final long acceptableClockDriftSeconds;
 
   public TimestampBoundedByFutureParameter(final long acceptableClockDriftSeconds) {
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/TimestampMoreRecentThanParent.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/TimestampMoreRecentThanParent.java
index 08ce0173b3a..6aa7e5479ef 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/TimestampMoreRecentThanParent.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/TimestampMoreRecentThanParent.java
@@ -19,13 +19,13 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.mainnet.DetachedBlockHeaderValidationRule;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Responsible for ensuring the timestamp of a block is newer than its parent. */
 public class TimestampMoreRecentThanParent implements DetachedBlockHeaderValidationRule {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(TimestampMoreRecentThanParent.class);
   private final long minimumSecondsSinceParent;
 
   public TimestampMoreRecentThanParent(final long minimumSecondsSinceParent) {
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AbstractAltBnPrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AbstractAltBnPrecompiledContract.java
deleted file mode 100644
index 9ff6319a46d..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AbstractAltBnPrecompiledContract.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-import org.hyperledger.besu.ethereum.mainnet.AbstractPrecompiledContract;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
-
-import com.sun.jna.ptr.IntByReference;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-
-public abstract class AbstractAltBnPrecompiledContract extends AbstractPrecompiledContract {
-
-  private static final Logger LOG = LogManager.getLogger();
-  static boolean useNative = true;
-
-  public static void enableNative() {
-    useNative = LibEthPairings.ENABLED;
-    LOG.info(
-        useNative
-            ? "Using LibEthPairings native alt bn128"
-            : "Native alt bn128 requested but not available");
-  }
-
-  private final byte operationId;
-
-  AbstractAltBnPrecompiledContract(
-      final String name, final GasCalculator gasCalculator, final byte operationId) {
-    super(name, gasCalculator);
-    this.operationId = operationId;
-  }
-
-  public Bytes computeNative(final Bytes input, final MessageFrame messageFrame) {
-    final byte[] result = new byte[LibEthPairings.EIP196_PREALLOCATE_FOR_RESULT_BYTES];
-    final byte[] error = new byte[LibEthPairings.EIP2537_PREALLOCATE_FOR_ERROR_BYTES];
-
-    final IntByReference o_len =
-        new IntByReference(LibEthPairings.EIP196_PREALLOCATE_FOR_RESULT_BYTES);
-    final IntByReference err_len =
-        new IntByReference(LibEthPairings.EIP2537_PREALLOCATE_FOR_ERROR_BYTES);
-    final int errorNo =
-        LibEthPairings.eip196_perform_operation(
-            operationId, input.toArrayUnsafe(), input.size(), result, o_len, error, err_len);
-    if (errorNo == 0) {
-      return Bytes.wrap(result, 0, o_len.getValue());
-    } else {
-      final String errorString = new String(error, 0, err_len.getValue(), UTF_8);
-      messageFrame.setRevertReason(Bytes.wrap(error, 0, err_len.getValue()));
-      LOG.trace("Error executing precompiled contract {}: '{}'", getName(), errorString);
-      return null;
-    }
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AbstractBLS12PrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AbstractBLS12PrecompiledContract.java
deleted file mode 100644
index 64360071638..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AbstractBLS12PrecompiledContract.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-import org.hyperledger.besu.ethereum.mainnet.PrecompiledContract;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
-
-import javax.annotation.Nonnull;
-
-import com.sun.jna.ptr.IntByReference;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-
-public abstract class AbstractBLS12PrecompiledContract implements PrecompiledContract {
-
-  private static final Logger LOG = LogManager.getLogger();
-
-  static final int[] DISCOUNT_TABLE =
-      new int[] {
-        -1, 1_200, 888, 764, 641, 594, 547, 500, 453, 438, 423, 408, 394, 379, 364, 349,
-        334, 330, 326, 322, 318, 314, 310, 306, 302, 298, 294, 289, 285, 281, 277, 273,
-        269, 268, 266, 265, 263, 262, 260, 259, 257, 256, 254, 253, 251, 250, 248, 247,
-        245, 244, 242, 241, 239, 238, 236, 235, 233, 232, 231, 229, 228, 226, 225, 223,
-        222, 221, 220, 219, 219, 218, 217, 216, 216, 215, 214, 213, 213, 212, 211, 211,
-        210, 209, 208, 208, 207, 206, 205, 205, 204, 203, 202, 202, 201, 200, 199, 199,
-        198, 197, 196, 196, 195, 194, 193, 193, 192, 191, 191, 190, 189, 188, 188, 187,
-        186, 185, 185, 184, 183, 182, 182, 181, 180, 179, 179, 178, 177, 176, 176, 175,
-        174
-      };
-
-  static final int MAX_DISCOUNT = 174;
-
-  private final String name;
-  private final byte operationId;
-
-  AbstractBLS12PrecompiledContract(final String name, final byte operationId) {
-    this.name = name;
-    this.operationId = operationId;
-  }
-
-  @Override
-  public String getName() {
-    return name;
-  }
-
-  @Override
-  public Bytes compute(final Bytes input, @Nonnull final MessageFrame messageFrame) {
-    final byte[] result = new byte[LibEthPairings.EIP2537_PREALLOCATE_FOR_RESULT_BYTES];
-    final byte[] error = new byte[LibEthPairings.EIP2537_PREALLOCATE_FOR_ERROR_BYTES];
-
-    final IntByReference o_len =
-        new IntByReference(LibEthPairings.EIP2537_PREALLOCATE_FOR_RESULT_BYTES);
-    final IntByReference err_len =
-        new IntByReference(LibEthPairings.EIP2537_PREALLOCATE_FOR_ERROR_BYTES);
-    final int errorNo =
-        LibEthPairings.eip2537_perform_operation(
-            operationId, input.toArrayUnsafe(), input.size(), result, o_len, error, err_len);
-    if (errorNo == 0) {
-      return Bytes.wrap(result, 0, o_len.getValue());
-    } else {
-      final String errorMessage = new String(error, 0, err_len.getValue(), UTF_8);
-      messageFrame.setRevertReason(Bytes.wrap(error, 0, err_len.getValue()));
-      LOG.trace("Error executing precompiled contract {}: '{}'", name, errorMessage);
-      return null;
-    }
-  }
-
-  protected int getDiscount(final int k) {
-    // `k * multiplication_cost * discount / multiplier` where `multiplier = 1000`
-    // multiplication_cost and multiplier are folded into one constant as a long and placed first to
-    // prevent int32 overflow
-    // there was a table prepared for discount in case of k <= 128 points in the multiexponentiation
-    // with a discount cup max_discount for k > 128.
-
-    if (k >= DISCOUNT_TABLE.length) {
-      return MAX_DISCOUNT;
-    }
-    return DISCOUNT_TABLE[k];
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128AddPrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128AddPrecompiledContract.java
deleted file mode 100644
index 846ad9bf10c..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128AddPrecompiledContract.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import org.hyperledger.besu.crypto.altbn128.AltBn128Point;
-import org.hyperledger.besu.crypto.altbn128.Fq;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
-
-import java.math.BigInteger;
-import java.util.Arrays;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.MutableBytes;
-
-public class AltBN128AddPrecompiledContract extends AbstractAltBnPrecompiledContract {
-
-  private final Gas gasCost;
-
-  private AltBN128AddPrecompiledContract(final GasCalculator gasCalculator, final Gas gasCost) {
-    super("AltBN128Add", gasCalculator, LibEthPairings.EIP196_ADD_OPERATION_RAW_VALUE);
-    this.gasCost = gasCost;
-  }
-
-  public static AltBN128AddPrecompiledContract byzantium(final GasCalculator gasCalculator) {
-    return new AltBN128AddPrecompiledContract(gasCalculator, Gas.of(500));
-  }
-
-  public static AltBN128AddPrecompiledContract istanbul(final GasCalculator gasCalculator) {
-    return new AltBN128AddPrecompiledContract(gasCalculator, Gas.of(150));
-  }
-
-  @Override
-  public Gas gasRequirement(final Bytes input) {
-    return gasCost;
-  }
-
-  @Override
-  public Bytes compute(final Bytes input, final MessageFrame messageFrame) {
-    if (useNative) {
-      return computeNative(input, messageFrame);
-    } else {
-      return computeDefault(input);
-    }
-  }
-
-  private static Bytes computeDefault(final Bytes input) {
-    final BigInteger x1 = extractParameter(input, 0, 32);
-    final BigInteger y1 = extractParameter(input, 32, 32);
-    final BigInteger x2 = extractParameter(input, 64, 32);
-    final BigInteger y2 = extractParameter(input, 96, 32);
-
-    final AltBn128Point p1 = new AltBn128Point(Fq.create(x1), Fq.create(y1));
-    final AltBn128Point p2 = new AltBn128Point(Fq.create(x2), Fq.create(y2));
-    if (!p1.isOnCurve() || !p2.isOnCurve()) {
-      return null;
-    }
-    final AltBn128Point sum = p1.add(p2);
-    final Bytes x = sum.getX().toBytes();
-    final Bytes y = sum.getY().toBytes();
-    final MutableBytes result = MutableBytes.create(64);
-    x.copyTo(result, 32 - x.size());
-    y.copyTo(result, 64 - y.size());
-
-    return result;
-  }
-
-  private static BigInteger extractParameter(
-      final Bytes input, final int offset, final int length) {
-    if (offset > input.size() || length == 0) {
-      return BigInteger.ZERO;
-    }
-    final byte[] raw = Arrays.copyOfRange(input.toArray(), offset, offset + length);
-    return new BigInteger(1, raw);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128MulPrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128MulPrecompiledContract.java
deleted file mode 100644
index 7ca6e2c2127..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128MulPrecompiledContract.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import org.hyperledger.besu.crypto.altbn128.AltBn128Point;
-import org.hyperledger.besu.crypto.altbn128.Fq;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
-
-import java.math.BigInteger;
-import java.util.Arrays;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.MutableBytes;
-
-public class AltBN128MulPrecompiledContract extends AbstractAltBnPrecompiledContract {
-
-  private static final BigInteger MAX_N =
-      new BigInteger(
-          "115792089237316195423570985008687907853269984665640564039457584007913129639935");
-
-  private final Gas gasCost;
-
-  private AltBN128MulPrecompiledContract(final GasCalculator gasCalculator, final Gas gasCost) {
-    super("AltBN128Mul", gasCalculator, LibEthPairings.EIP196_MUL_OPERATION_RAW_VALUE);
-    this.gasCost = gasCost;
-  }
-
-  public static AltBN128MulPrecompiledContract byzantium(final GasCalculator gasCalculator) {
-    return new AltBN128MulPrecompiledContract(gasCalculator, Gas.of(40_000));
-  }
-
-  public static AltBN128MulPrecompiledContract istanbul(final GasCalculator gasCalculator) {
-    return new AltBN128MulPrecompiledContract(gasCalculator, Gas.of(6_000));
-  }
-
-  @Override
-  public Gas gasRequirement(final Bytes input) {
-    return gasCost;
-  }
-
-  @Override
-  public Bytes compute(final Bytes input, final MessageFrame messageFrame) {
-    if (useNative) {
-      return computeNative(input, messageFrame);
-    } else {
-      return computeDefault(input);
-    }
-  }
-
-  private static Bytes computeDefault(final Bytes input) {
-    final BigInteger x = extractParameter(input, 0, 32);
-    final BigInteger y = extractParameter(input, 32, 32);
-    final BigInteger n = extractParameter(input, 64, 32);
-
-    final AltBn128Point p = new AltBn128Point(Fq.create(x), Fq.create(y));
-    if (!p.isOnCurve() || n.compareTo(MAX_N) > 0) {
-      return null;
-    }
-    final AltBn128Point product = p.multiply(n);
-
-    final Bytes xResult = product.getX().toBytes();
-    final Bytes yResult = product.getY().toBytes();
-    final MutableBytes result = MutableBytes.create(64);
-    xResult.copyTo(result, 32 - xResult.size());
-    yResult.copyTo(result, 64 - yResult.size());
-
-    return result;
-  }
-
-  private static BigInteger extractParameter(
-      final Bytes input, final int offset, final int length) {
-    if (offset > input.size() || length == 0) {
-      return BigInteger.ZERO;
-    }
-    final byte[] raw = Arrays.copyOfRange(input.toArray(), offset, offset + length);
-    return new BigInteger(1, raw);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128PairingPrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128PairingPrecompiledContract.java
deleted file mode 100644
index 87e9d00d8ce..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128PairingPrecompiledContract.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import org.hyperledger.besu.crypto.altbn128.AltBn128Fq12Pairer;
-import org.hyperledger.besu.crypto.altbn128.AltBn128Fq2Point;
-import org.hyperledger.besu.crypto.altbn128.AltBn128Point;
-import org.hyperledger.besu.crypto.altbn128.Fq;
-import org.hyperledger.besu.crypto.altbn128.Fq12;
-import org.hyperledger.besu.crypto.altbn128.Fq2;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public class AltBN128PairingPrecompiledContract extends AbstractAltBnPrecompiledContract {
-
-  private static final int FIELD_LENGTH = 32;
-  private static final int PARAMETER_LENGTH = 192;
-
-  static final Bytes FALSE =
-      Bytes.fromHexString("0x0000000000000000000000000000000000000000000000000000000000000000");
-  static final Bytes TRUE =
-      Bytes.fromHexString("0x0000000000000000000000000000000000000000000000000000000000000001");
-
-  private final Gas pairingGasCost;
-  private final Gas baseGasCost;
-
-  private AltBN128PairingPrecompiledContract(
-      final GasCalculator gasCalculator, final Gas pairingGasCost, final Gas baseGasCost) {
-    super("AltBN128Pairing", gasCalculator, LibEthPairings.EIP196_PAIR_OPERATION_RAW_VALUE);
-    this.pairingGasCost = pairingGasCost;
-    this.baseGasCost = baseGasCost;
-  }
-
-  public static AltBN128PairingPrecompiledContract byzantium(final GasCalculator gasCalculator) {
-    return new AltBN128PairingPrecompiledContract(gasCalculator, Gas.of(80_000), Gas.of(100_000));
-  }
-
-  public static AltBN128PairingPrecompiledContract istanbul(final GasCalculator gasCalculator) {
-    return new AltBN128PairingPrecompiledContract(gasCalculator, Gas.of(34_000), Gas.of(45_000));
-  }
-
-  @Override
-  public Gas gasRequirement(final Bytes input) {
-    final int parameters = input.size() / PARAMETER_LENGTH;
-    return pairingGasCost.times(parameters).plus(baseGasCost);
-  }
-
-  @Override
-  public Bytes compute(final Bytes input, final MessageFrame messageFrame) {
-    if (input.isEmpty()) {
-      return TRUE;
-    }
-    if (input.size() % PARAMETER_LENGTH != 0) {
-      return null;
-    }
-    if (useNative) {
-      return computeNative(input, messageFrame);
-    } else {
-      return computeDefault(input);
-    }
-  }
-
-  private static Bytes computeDefault(final Bytes input) {
-    final int parameters = input.size() / PARAMETER_LENGTH;
-    final List<AltBn128Point> a = new ArrayList<>();
-    final List<AltBn128Fq2Point> b = new ArrayList<>();
-    for (int i = 0; i < parameters; ++i) {
-      final BigInteger p1_x = extractParameter(input, i * PARAMETER_LENGTH, FIELD_LENGTH);
-      final BigInteger p1_y = extractParameter(input, i * PARAMETER_LENGTH + 32, FIELD_LENGTH);
-      final AltBn128Point p1 = new AltBn128Point(Fq.create(p1_x), Fq.create(p1_y));
-      if (!p1.isOnCurve()) {
-        return null;
-      }
-      a.add(p1);
-
-      final BigInteger p2_xImag = extractParameter(input, i * PARAMETER_LENGTH + 64, FIELD_LENGTH);
-      final BigInteger p2_xReal = extractParameter(input, i * PARAMETER_LENGTH + 96, FIELD_LENGTH);
-      final BigInteger p2_yImag = extractParameter(input, i * PARAMETER_LENGTH + 128, FIELD_LENGTH);
-      final BigInteger p2_yReal = extractParameter(input, i * PARAMETER_LENGTH + 160, FIELD_LENGTH);
-      final Fq2 p2_x = Fq2.create(p2_xReal, p2_xImag);
-      final Fq2 p2_y = Fq2.create(p2_yReal, p2_yImag);
-      final AltBn128Fq2Point p2 = new AltBn128Fq2Point(p2_x, p2_y);
-      if (!p2.isOnCurve() || !p2.isInGroup()) {
-        return null;
-      }
-      b.add(p2);
-    }
-
-    Fq12 exponent = Fq12.one();
-    for (int i = 0; i < parameters; ++i) {
-      exponent = exponent.multiply(AltBn128Fq12Pairer.pair(a.get(i), b.get(i)));
-    }
-
-    if (AltBn128Fq12Pairer.finalize(exponent).equals(Fq12.one())) {
-      return TRUE;
-    } else {
-      return FALSE;
-    }
-  }
-
-  private static BigInteger extractParameter(
-      final Bytes input, final int offset, final int length) {
-    if (offset > input.size() || length == 0) {
-      return BigInteger.ZERO;
-    }
-    final byte[] raw = Arrays.copyOfRange(input.toArray(), offset, offset + length);
-    return new BigInteger(1, raw);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLAKE2BFPrecompileContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLAKE2BFPrecompileContract.java
deleted file mode 100644
index 186e707ab2a..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLAKE2BFPrecompileContract.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import static java.util.Arrays.copyOfRange;
-import static org.hyperledger.besu.crypto.Blake2bfMessageDigest.Blake2bfDigest.MESSAGE_LENGTH_BYTES;
-
-import org.hyperledger.besu.crypto.Hash;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.mainnet.AbstractPrecompiledContract;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.math.BigInteger;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-
-// https://github.com/keep-network/go-ethereum/pull/4
-public class BLAKE2BFPrecompileContract extends AbstractPrecompiledContract {
-
-  private static final Logger LOG = LogManager.getLogger();
-
-  public BLAKE2BFPrecompileContract(final GasCalculator gasCalculator) {
-    super("BLAKE2f", gasCalculator);
-  }
-
-  @Override
-  public Gas gasRequirement(final Bytes input) {
-    if (input.size() != MESSAGE_LENGTH_BYTES) {
-      // Input is malformed, we can't read the number of rounds.
-      // Precompile can't be executed so we set its price to 0.
-      return Gas.ZERO;
-    }
-    if ((input.get(212) & 0xFE) != 0) {
-      // Input is malformed, F value can be only 0 or 1
-      return Gas.ZERO;
-    }
-
-    final byte[] roundsBytes = copyOfRange(input.toArray(), 0, 4);
-    final BigInteger rounds = new BigInteger(1, roundsBytes);
-    return Gas.of(rounds);
-  }
-
-  @Override
-  public Bytes compute(final Bytes input, final MessageFrame messageFrame) {
-    if (input.size() != MESSAGE_LENGTH_BYTES) {
-      LOG.trace(
-          "Incorrect input length.  Expected {} and got {}", MESSAGE_LENGTH_BYTES, input.size());
-      return null;
-    }
-    if ((input.get(212) & 0xFE) != 0) {
-      LOG.trace("Incorrect finalization flag, expected 0 or 1 and got {}", input.get(212));
-      return null;
-    }
-    return Hash.blake2bf(input);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1MultiExpPrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1MultiExpPrecompiledContract.java
deleted file mode 100644
index 2756e1dd3b9..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1MultiExpPrecompiledContract.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public class BLS12G1MultiExpPrecompiledContract extends AbstractBLS12PrecompiledContract {
-
-  public BLS12G1MultiExpPrecompiledContract() {
-    super("BLS12_G1MULTIEXP", LibEthPairings.BLS12_G1MULTIEXP_OPERATION_RAW_VALUE);
-  }
-
-  @Override
-  public Gas gasRequirement(final Bytes input) {
-    final int k = input.size() / 160;
-    return Gas.of(12L * k * getDiscount(k));
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2MultiExpPrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2MultiExpPrecompiledContract.java
deleted file mode 100644
index 61aa6dc1020..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2MultiExpPrecompiledContract.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public class BLS12G2MultiExpPrecompiledContract extends AbstractBLS12PrecompiledContract {
-
-  public BLS12G2MultiExpPrecompiledContract() {
-    super("BLS12_G2MULTIEXP", LibEthPairings.BLS12_G2MULTIEXP_OPERATION_RAW_VALUE);
-  }
-
-  @Override
-  public Gas gasRequirement(final Bytes input) {
-    final int k = input.size() / 288;
-    return Gas.of(55L * k * getDiscount(k));
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12MapFp2ToG2PrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12MapFp2ToG2PrecompiledContract.java
deleted file mode 100644
index 5530aa8375f..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12MapFp2ToG2PrecompiledContract.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public class BLS12MapFp2ToG2PrecompiledContract extends AbstractBLS12PrecompiledContract {
-
-  public BLS12MapFp2ToG2PrecompiledContract() {
-    super("BLS12_MAP_FIELD_TO_CURVE", LibEthPairings.BLS12_MAP_FP2_TO_G2_OPERATION_RAW_VALUE);
-  }
-
-  @Override
-  public Gas gasRequirement(final Bytes input) {
-    return Gas.of(110_000);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12MapFpToG1PrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12MapFpToG1PrecompiledContract.java
deleted file mode 100644
index fb0902bd6b8..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12MapFpToG1PrecompiledContract.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public class BLS12MapFpToG1PrecompiledContract extends AbstractBLS12PrecompiledContract {
-
-  public BLS12MapFpToG1PrecompiledContract() {
-    super("BLS12_MAP_FIELD_TO_CURVE", LibEthPairings.BLS12_MAP_FP_TO_G1_OPERATION_RAW_VALUE);
-  }
-
-  @Override
-  public Gas gasRequirement(final Bytes input) {
-    return Gas.of(5_500);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12PairingPrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12PairingPrecompiledContract.java
deleted file mode 100644
index 3da76d64664..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12PairingPrecompiledContract.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public class BLS12PairingPrecompiledContract extends AbstractBLS12PrecompiledContract {
-
-  public BLS12PairingPrecompiledContract() {
-    super("BLS12_PAIRING", LibEthPairings.BLS12_PAIR_OPERATION_RAW_VALUE);
-  }
-
-  @Override
-  public Gas gasRequirement(final Bytes input) {
-    final int k = input.size() / 384;
-    return Gas.of(23_000L * k + 115_000);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BigIntegerModularExponentiationPrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BigIntegerModularExponentiationPrecompiledContract.java
deleted file mode 100644
index 87f4f5b034b..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BigIntegerModularExponentiationPrecompiledContract.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.mainnet.AbstractPrecompiledContract;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.math.BigInteger;
-import java.util.Arrays;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.MutableBytes;
-
-// The big integer modular exponentiation precompiled contract defined in EIP-198.
-public class BigIntegerModularExponentiationPrecompiledContract
-    extends AbstractPrecompiledContract {
-
-  public static final BigInteger BASE_OFFSET = BigInteger.valueOf(96);
-  private static final int PARAMETER_LENGTH = 32;
-  private static final int BASE_LENGTH_OFFSET = 0;
-  private static final int EXPONENT_LENGTH_OFFSET = 32;
-  private static final int MODULUS_LENGTH_OFFSET = 64;
-
-  private static final BigInteger BIGINT_4 = BigInteger.valueOf(4);
-  private static final BigInteger BIGINT_16 = BigInteger.valueOf(16);
-  private static final BigInteger BIGINT_64 = BigInteger.valueOf(64);
-  private static final BigInteger BIGINT_96 = BigInteger.valueOf(96);
-  private static final BigInteger BIGINT_480 = BigInteger.valueOf(480);
-  private static final BigInteger BIGINT_1024 = BigInteger.valueOf(1_024L);
-  private static final BigInteger BIGINT_3072 = BigInteger.valueOf(3_072L);
-  private static final BigInteger BIGINT_199680 = BigInteger.valueOf(199_680L);
-
-  public BigIntegerModularExponentiationPrecompiledContract(final GasCalculator gasCalculator) {
-    super("BigIntModExp", gasCalculator);
-  }
-
-  @Override
-  public Gas gasRequirement(final Bytes input) {
-    return gasCalculator().modExpGasCost(input);
-  }
-
-  @Override
-  public Bytes compute(final Bytes input, final MessageFrame messageFrame) {
-    final BigInteger baseLength = baseLength(input);
-    final BigInteger exponentLength = exponentLength(input);
-    final BigInteger modulusLength = modulusLength(input);
-    final BigInteger exponentOffset = BASE_OFFSET.add(baseLength);
-    final BigInteger modulusOffset = exponentOffset.add(exponentLength);
-    final BigInteger base = extractParameter(input, BASE_OFFSET, baseLength.intValue());
-    final BigInteger exp = extractParameter(input, exponentOffset, exponentLength.intValue());
-    final BigInteger mod = extractParameter(input, modulusOffset, modulusLength.intValue());
-
-    final Bytes modExp;
-    // Result must be the length of the modulus.
-    final MutableBytes result = MutableBytes.create(modulusLength.intValue());
-    if (mod.compareTo(BigInteger.ZERO) == 0) {
-      modExp = MutableBytes.EMPTY;
-    } else {
-      // BigInteger zero-pads positive values whose most significant bit is a 1 if
-      // the padding was not there.
-      modExp = Bytes.wrap(base.modPow(exp, mod).toByteArray()).trimLeadingZeros();
-    }
-
-    modExp.copyTo(result, result.size() - modExp.size());
-    return result;
-  }
-
-  // Equation to estimate the multiplication complexity.
-  public static BigInteger multiplicationComplexity(final BigInteger x) {
-    if (x.compareTo(BIGINT_64) <= 0) {
-      return square(x);
-    } else if (x.compareTo(BIGINT_1024) <= 0) {
-      return square(x).divide(BIGINT_4).add(BIGINT_96.multiply(x)).subtract(BIGINT_3072);
-    } else {
-      return square(x).divide(BIGINT_16).add(BIGINT_480.multiply(x)).subtract(BIGINT_199680);
-    }
-  }
-
-  public static BigInteger baseLength(final Bytes input) {
-    return extractParameter(input, BASE_LENGTH_OFFSET, PARAMETER_LENGTH);
-  }
-
-  public static BigInteger exponentLength(final Bytes input) {
-    return extractParameter(input, EXPONENT_LENGTH_OFFSET, PARAMETER_LENGTH);
-  }
-
-  public static BigInteger modulusLength(final Bytes input) {
-    return extractParameter(input, MODULUS_LENGTH_OFFSET, PARAMETER_LENGTH);
-  }
-
-  private static BigInteger extractParameter(
-      final Bytes input, final int offset, final int length) {
-    if (offset > input.size() || length == 0) {
-      return BigInteger.ZERO;
-    }
-    final byte[] raw = Arrays.copyOfRange(input.toArray(), offset, offset + length);
-    return new BigInteger(1, raw);
-  }
-
-  public static BigInteger extractParameter(
-      final Bytes input, final BigInteger offset, final int length) {
-    if (BigInteger.valueOf(input.size()).compareTo(offset) <= 0) {
-      return BigInteger.ZERO;
-    }
-    return extractParameter(input, offset.intValue(), length);
-  }
-
-  private static BigInteger square(final BigInteger n) {
-    return n.multiply(n);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/ECRECPrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/ECRECPrecompiledContract.java
deleted file mode 100644
index df909e219c1..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/ECRECPrecompiledContract.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import org.hyperledger.besu.crypto.SECP256K1.PublicKey;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.mainnet.AbstractPrecompiledContract;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.math.BigInteger;
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.bytes.MutableBytes;
-import org.apache.tuweni.bytes.MutableBytes32;
-
-public class ECRECPrecompiledContract extends AbstractPrecompiledContract {
-
-  private static final int V_BASE = 27;
-
-  public ECRECPrecompiledContract(final GasCalculator gasCalculator) {
-    super("ECREC", gasCalculator);
-  }
-
-  @Override
-  public Gas gasRequirement(final Bytes input) {
-    return gasCalculator().getEcrecPrecompiledContractGasCost();
-  }
-
-  @Override
-  public Bytes compute(final Bytes input, final MessageFrame messageFrame) {
-    final int size = input.size();
-    final Bytes d = size >= 128 ? input : Bytes.wrap(input, MutableBytes.create(128 - size));
-    final Bytes32 h = Bytes32.wrap(d, 0);
-    // Note that the Yellow Paper defines v as the next 32 bytes (so 32..63). Yet, v is a simple
-    // byte in ECDSARECOVER and the Yellow Paper is not very clear on this mismatch but it appears
-    // it is simply the last byte of those 32 bytes that needs to be used. It does appear we need
-    // to check the rest of the bytes are zero though.
-    if (!d.slice(32, 31).isZero()) {
-      return Bytes.EMPTY;
-    }
-
-    final int recId = d.get(63) - V_BASE;
-    final BigInteger r = d.slice(64, 32).toUnsignedBigInteger();
-    final BigInteger s = d.slice(96, 32).toUnsignedBigInteger();
-
-    final Signature signature;
-    try {
-      signature = Signature.create(r, s, (byte) recId);
-    } catch (final IllegalArgumentException e) {
-      return Bytes.EMPTY;
-    }
-
-    // SECP256K1#PublicKey#recoverFromSignature throws an Illegal argument exception
-    // when it is unable to recover the key. There is not a straightforward way to
-    // check the arguments ahead of time to determine if the fail will happen and
-    // the library needs to be updated.
-    try {
-      final Optional<PublicKey> recovered = PublicKey.recoverFromSignature(h, signature);
-      if (!recovered.isPresent()) {
-        return Bytes.EMPTY;
-      }
-
-      final Bytes32 hashed = Hash.hash(recovered.get().getEncodedBytes());
-      final MutableBytes32 result = MutableBytes32.create();
-      hashed.slice(12).copyTo(result, 12);
-      return result;
-    } catch (final IllegalArgumentException e) {
-      return Bytes.EMPTY;
-    }
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/IDPrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/IDPrecompiledContract.java
deleted file mode 100644
index 57aeaee073c..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/IDPrecompiledContract.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.mainnet.AbstractPrecompiledContract;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public class IDPrecompiledContract extends AbstractPrecompiledContract {
-
-  public IDPrecompiledContract(final GasCalculator gasCalculator) {
-    super("ID", gasCalculator);
-  }
-
-  @Override
-  public Gas gasRequirement(final Bytes input) {
-    return gasCalculator().idPrecompiledContractGasCost(input);
-  }
-
-  @Override
-  public Bytes compute(final Bytes input, final MessageFrame messageFrame) {
-    return input;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/RIPEMD160PrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/RIPEMD160PrecompiledContract.java
deleted file mode 100644
index 8b2596438d0..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/RIPEMD160PrecompiledContract.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import org.hyperledger.besu.crypto.Hash;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.mainnet.AbstractPrecompiledContract;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-
-public class RIPEMD160PrecompiledContract extends AbstractPrecompiledContract {
-
-  public RIPEMD160PrecompiledContract(final GasCalculator gasCalculator) {
-    super("RIPEMD160", gasCalculator);
-  }
-
-  @Override
-  public Gas gasRequirement(final Bytes input) {
-    return gasCalculator().ripemd160PrecompiledContractGasCost(input);
-  }
-
-  @Override
-  public Bytes compute(final Bytes input, final MessageFrame messageFrame) {
-    return Bytes32.leftPad(Hash.ripemd160(input));
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/SHA256PrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/SHA256PrecompiledContract.java
deleted file mode 100644
index 46dc10024e4..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/SHA256PrecompiledContract.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import org.hyperledger.besu.crypto.Hash;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.mainnet.AbstractPrecompiledContract;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public class SHA256PrecompiledContract extends AbstractPrecompiledContract {
-
-  public SHA256PrecompiledContract(final GasCalculator gasCalculator) {
-    super("SHA256", gasCalculator);
-  }
-
-  @Override
-  public Gas gasRequirement(final Bytes input) {
-    return gasCalculator().sha256PrecompiledContractGasCost(input);
-  }
-
-  @Override
-  public Bytes compute(final Bytes input, final MessageFrame messageFrame) {
-    return Hash.sha256(input);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/FlexiblePrivacyPrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/FlexiblePrivacyPrecompiledContract.java
new file mode 100644
index 00000000000..0dd6863f94e
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/FlexiblePrivacyPrecompiledContract.java
@@ -0,0 +1,362 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet.precompiles.privacy;
+
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY_PROXY;
+import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_IS_PERSISTING_PRIVATE_STATE;
+import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_PRIVATE_METADATA_UPDATER;
+import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_TRANSACTION_HASH;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.enclave.Enclave;
+import org.hyperledger.besu.enclave.EnclaveClientException;
+import org.hyperledger.besu.enclave.types.PrivacyGroup;
+import org.hyperledger.besu.enclave.types.ReceiveResponse;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
+import org.hyperledger.besu.ethereum.privacy.FlexiblePrivacyGroupContract;
+import org.hyperledger.besu.ethereum.privacy.FlexibleUtil;
+import org.hyperledger.besu.ethereum.privacy.PrivateStateGenesisAllocator;
+import org.hyperledger.besu.ethereum.privacy.PrivateStateRootResolver;
+import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
+import org.hyperledger.besu.ethereum.privacy.PrivateTransactionEvent;
+import org.hyperledger.besu.ethereum.privacy.PrivateTransactionObserver;
+import org.hyperledger.besu.ethereum.privacy.PrivateTransactionReceipt;
+import org.hyperledger.besu.ethereum.privacy.VersionedPrivateTransaction;
+import org.hyperledger.besu.ethereum.privacy.group.FlexibleGroupManagement;
+import org.hyperledger.besu.ethereum.privacy.storage.PrivateMetadataUpdater;
+import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+import org.hyperledger.besu.util.Subscribers;
+
+import java.util.Base64;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import javax.annotation.Nonnull;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class FlexiblePrivacyPrecompiledContract extends PrivacyPrecompiledContract {
+
+  private static final Logger LOG =
+      LoggerFactory.getLogger(FlexiblePrivacyPrecompiledContract.class);
+
+  private final Subscribers<PrivateTransactionObserver> privateTransactionEventObservers =
+      Subscribers.create();
+
+  public FlexiblePrivacyPrecompiledContract(
+      final GasCalculator gasCalculator,
+      final Enclave enclave,
+      final WorldStateArchive worldStateArchive,
+      final PrivateStateRootResolver privateStateRootResolver,
+      final PrivateStateGenesisAllocator privateStateGenesisAllocator) {
+    super(
+        gasCalculator,
+        enclave,
+        worldStateArchive,
+        privateStateRootResolver,
+        privateStateGenesisAllocator,
+        "FlexiblePrivacy");
+  }
+
+  public FlexiblePrivacyPrecompiledContract(
+      final GasCalculator gasCalculator, final PrivacyParameters privacyParameters) {
+    this(
+        gasCalculator,
+        privacyParameters.getEnclave(),
+        privacyParameters.getPrivateWorldStateArchive(),
+        privacyParameters.getPrivateStateRootResolver(),
+        privacyParameters.getPrivateStateGenesisAllocator());
+  }
+
+  public long addPrivateTransactionObserver(final PrivateTransactionObserver observer) {
+    return privateTransactionEventObservers.subscribe(observer);
+  }
+
+  public boolean removePrivateTransactionObserver(final long observerId) {
+    return privateTransactionEventObservers.unsubscribe(observerId);
+  }
+
+  @Nonnull
+  @Override
+  public PrecompileContractResult computePrecompile(
+      final Bytes input, @Nonnull final MessageFrame messageFrame) {
+    if (skipContractExecution(messageFrame)) {
+      return NO_RESULT;
+    }
+    if (input == null || (input.size() != 32 && input.size() != 64)) {
+      LOG.error("Can not fetch private transaction payload with key of invalid length {}", input);
+      return NO_RESULT;
+    }
+
+    final Hash pmtHash = messageFrame.getContextVariable(KEY_TRANSACTION_HASH);
+
+    final String key = input.slice(0, 32).toBase64String();
+
+    final ReceiveResponse receiveResponse;
+    try {
+      receiveResponse = getReceiveResponse(key);
+    } catch (final EnclaveClientException e) {
+      LOG.debug("Can not fetch private transaction payload with key {}", key, e);
+      return NO_RESULT;
+    }
+
+    final BytesValueRLPInput bytesValueRLPInput =
+        new BytesValueRLPInput(
+            Bytes.wrap(Base64.getDecoder().decode(receiveResponse.getPayload())), false);
+    final VersionedPrivateTransaction versionedPrivateTransaction =
+        VersionedPrivateTransaction.readFrom(bytesValueRLPInput);
+    final PrivateTransaction privateTransaction =
+        versionedPrivateTransaction.getPrivateTransaction();
+
+    final Bytes privateFrom = privateTransaction.getPrivateFrom();
+    if (!privateFromMatchesSenderKey(privateFrom, receiveResponse.getSenderKey())) {
+      return NO_RESULT;
+    }
+
+    final Optional<Bytes> maybeGroupId = privateTransaction.getPrivacyGroupId();
+    if (maybeGroupId.isEmpty()) {
+      return NO_RESULT;
+    }
+
+    final Bytes32 privacyGroupId = Bytes32.wrap(maybeGroupId.get());
+
+    LOG.debug("Processing private transaction {} in privacy group {}", pmtHash, privacyGroupId);
+
+    final ProcessableBlockHeader currentBlockHeader =
+        (ProcessableBlockHeader) messageFrame.getBlockValues();
+
+    final PrivateMetadataUpdater privateMetadataUpdater =
+        messageFrame.getContextVariable(KEY_PRIVATE_METADATA_UPDATER);
+    final Hash lastRootHash =
+        privateStateRootResolver.resolveLastStateRoot(privacyGroupId, privateMetadataUpdater);
+
+    final MutableWorldState disposablePrivateState =
+        privateWorldStateArchive.getMutable(lastRootHash, null).get();
+
+    final WorldUpdater privateWorldStateUpdater = disposablePrivateState.updater();
+
+    maybeApplyGenesisToPrivateWorldState(
+        lastRootHash,
+        disposablePrivateState,
+        privateWorldStateUpdater,
+        privacyGroupId,
+        currentBlockHeader.getNumber());
+
+    if (!canExecute(
+        messageFrame,
+        currentBlockHeader,
+        privateTransaction,
+        versionedPrivateTransaction.getVersion(),
+        privacyGroupId,
+        disposablePrivateState,
+        privateWorldStateUpdater,
+        privateFrom)) {
+      return NO_RESULT;
+    }
+
+    final TransactionProcessingResult result =
+        processPrivateTransaction(
+            messageFrame, privateTransaction, privacyGroupId, privateWorldStateUpdater);
+
+    if (result.isInvalid() || !result.isSuccessful()) {
+      LOG.error(
+          "Failed to process private transaction {}: {}",
+          pmtHash,
+          result.getValidationResult().getErrorMessage());
+
+      privateMetadataUpdater.putTransactionReceipt(pmtHash, new PrivateTransactionReceipt(result));
+
+      return NO_RESULT;
+    }
+
+    sendParticipantRemovedEvent(privateTransaction);
+
+    if (messageFrame.getContextVariable(KEY_IS_PERSISTING_PRIVATE_STATE, false)) {
+
+      privateWorldStateUpdater.commit();
+      disposablePrivateState.persist(null);
+
+      storePrivateMetadata(
+          pmtHash, privacyGroupId, disposablePrivateState, privateMetadataUpdater, result);
+    }
+
+    return new PrecompileContractResult(
+        result.getOutput(), true, MessageFrame.State.CODE_EXECUTING, Optional.empty());
+  }
+
+  private void sendParticipantRemovedEvent(final PrivateTransaction privateTransaction) {
+    if (isRemovingParticipant(privateTransaction)) {
+      // get first participant parameter - there is only one for removal transaction
+      final String removedParticipant =
+          getRemovedParticipantFromParameter(privateTransaction.getPayload());
+
+      final PrivateTransactionEvent removalEvent =
+          new PrivateTransactionEvent(
+              privateTransaction.getPrivacyGroupId().get().toBase64String(), removedParticipant);
+      privateTransactionEventObservers.forEach(
+          sub -> sub.onPrivateTransactionProcessed(removalEvent));
+    }
+  }
+
+  boolean canExecute(
+      final MessageFrame messageFrame,
+      final ProcessableBlockHeader currentBlockHeader,
+      final PrivateTransaction privateTransaction,
+      final Bytes32 version,
+      final Bytes32 privacyGroupId,
+      final MutableWorldState disposablePrivateState,
+      final WorldUpdater privateWorldStateUpdater,
+      final Bytes privateFrom) {
+    final FlexiblePrivacyGroupContract flexiblePrivacyGroupContract =
+        new FlexiblePrivacyGroupContract(
+            messageFrame,
+            currentBlockHeader,
+            disposablePrivateState,
+            privateWorldStateUpdater,
+            privateWorldStateArchive,
+            privateTransactionProcessor);
+
+    final boolean isAddingParticipant = isAddingParticipant(privateTransaction);
+    final boolean isContractLocked = isContractLocked(flexiblePrivacyGroupContract, privacyGroupId);
+
+    if (isAddingParticipant && !isContractLocked) {
+      LOG.debug(
+          "Privacy Group {} is not locked while trying to add to group with commitment {}",
+          privacyGroupId.toHexString(),
+          messageFrame.getContextVariable(KEY_TRANSACTION_HASH));
+      return false;
+    }
+
+    if (isContractLocked && !isTargetingFlexiblePrivacyProxy(privateTransaction)) {
+      LOG.debug(
+          "Privacy Group {} is locked while trying to execute transaction with commitment {}",
+          privacyGroupId.toHexString(),
+          messageFrame.getContextVariable(KEY_TRANSACTION_HASH));
+      return false;
+    }
+
+    if (!flexiblePrivacyGroupVersionMatches(
+        flexiblePrivacyGroupContract, privacyGroupId, version)) {
+      LOG.debug(
+          "Privacy group version mismatch while trying to execute transaction with commitment {}",
+          (Hash) messageFrame.getContextVariable(KEY_TRANSACTION_HASH));
+      return false;
+    }
+
+    if (!isMemberOfPrivacyGroup(
+        isAddingParticipant,
+        privateTransaction,
+        privateFrom,
+        flexiblePrivacyGroupContract,
+        privacyGroupId)) {
+      LOG.debug(
+          "PrivateTransaction with hash {} cannot execute in privacy group {} because privateFrom"
+              + " {} is not a member.",
+          messageFrame.getContextVariable(KEY_TRANSACTION_HASH),
+          privacyGroupId.toBase64String(),
+          privateFrom.toBase64String());
+      return false;
+    }
+
+    return true;
+  }
+
+  private boolean isMemberOfPrivacyGroup(
+      final boolean isAddingParticipant,
+      final PrivateTransaction privateTransaction,
+      final Bytes privateFrom,
+      final FlexiblePrivacyGroupContract flexiblePrivacyGroupContract,
+      final Bytes32 privacyGroupId) {
+    final List<String> members =
+        flexiblePrivacyGroupContract
+            .getPrivacyGroupByIdAndBlockHash(privacyGroupId.toBase64String(), Optional.empty())
+            .map(PrivacyGroup::getMembers)
+            .orElse(Collections.emptyList());
+
+    List<String> participantsFromParameter = Collections.emptyList();
+    if (members.isEmpty() && isAddingParticipant) {
+      // creating a new group, so we are checking whether the privateFrom is one of the members of
+      // the new group
+      participantsFromParameter =
+          FlexibleUtil.getParticipantsFromParameter(privateTransaction.getPayload());
+    }
+    final String base64privateFrom = privateFrom.toBase64String();
+    return members.contains(base64privateFrom)
+        || participantsFromParameter.contains(base64privateFrom);
+  }
+
+  private String getRemovedParticipantFromParameter(final Bytes input) {
+    return input.slice(4).toBase64String();
+  }
+
+  private boolean isTargetingFlexiblePrivacyProxy(final PrivateTransaction privateTransaction) {
+    return privateTransaction.getTo().isPresent()
+        && privateTransaction.getTo().get().equals(FLEXIBLE_PRIVACY_PROXY);
+  }
+
+  private boolean isAddingParticipant(final PrivateTransaction privateTransaction) {
+    return isTargetingFlexiblePrivacyProxy(privateTransaction)
+        && privateTransaction
+            .getPayload()
+            .toHexString()
+            .startsWith(FlexibleGroupManagement.ADD_PARTICIPANTS_METHOD_SIGNATURE.toHexString());
+  }
+
+  private boolean isRemovingParticipant(final PrivateTransaction privateTransaction) {
+    return isTargetingFlexiblePrivacyProxy(privateTransaction)
+        && privateTransaction
+            .getPayload()
+            .toHexString()
+            .startsWith(FlexibleGroupManagement.REMOVE_PARTICIPANT_METHOD_SIGNATURE.toHexString());
+  }
+
+  protected boolean isContractLocked(
+      final FlexiblePrivacyGroupContract flexiblePrivacyGroupContract,
+      final Bytes32 privacyGroupId) {
+    final Optional<Bytes32> canExecuteResult =
+        flexiblePrivacyGroupContract.getCanExecute(
+            privacyGroupId.toBase64String(), Optional.empty());
+    return canExecuteResult.map(Bytes::isZero).orElse(true);
+  }
+
+  protected boolean flexiblePrivacyGroupVersionMatches(
+      final FlexiblePrivacyGroupContract flexiblePrivacyGroupContract,
+      final Bytes32 privacyGroupId,
+      final Bytes32 version) {
+    final Optional<Bytes32> contractVersionResult =
+        flexiblePrivacyGroupContract.getVersion(privacyGroupId.toBase64String(), Optional.empty());
+    final boolean versionEqual = contractVersionResult.map(version::equals).orElse(false);
+
+    if (!versionEqual) {
+      LOG.debug(
+          "Privacy Group {} version mismatch: expecting {} but got {}",
+          privacyGroupId.toBase64String(),
+          contractVersionResult,
+          Optional.of(version));
+    }
+
+    return versionEqual;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/OnChainPrivacyPrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/OnChainPrivacyPrecompiledContract.java
deleted file mode 100644
index ac5960d5592..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/OnChainPrivacyPrecompiledContract.java
+++ /dev/null
@@ -1,503 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles.privacy;
-
-import static org.hyperledger.besu.ethereum.privacy.PrivateStateRootResolver.EMPTY_ROOT_HASH;
-
-import org.hyperledger.besu.crypto.SECP256K1;
-import org.hyperledger.besu.enclave.Enclave;
-import org.hyperledger.besu.enclave.EnclaveClientException;
-import org.hyperledger.besu.enclave.types.ReceiveResponse;
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.EvmAccount;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
-import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.debug.TraceOptions;
-import org.hyperledger.besu.ethereum.privacy.PrivateStateRootResolver;
-import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
-import org.hyperledger.besu.ethereum.privacy.PrivateTransactionEvent;
-import org.hyperledger.besu.ethereum.privacy.PrivateTransactionObserver;
-import org.hyperledger.besu.ethereum.privacy.PrivateTransactionReceipt;
-import org.hyperledger.besu.ethereum.privacy.Restriction;
-import org.hyperledger.besu.ethereum.privacy.VersionedPrivateTransaction;
-import org.hyperledger.besu.ethereum.privacy.group.OnChainGroupManagement;
-import org.hyperledger.besu.ethereum.privacy.storage.PrivateMetadataUpdater;
-import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
-import org.hyperledger.besu.ethereum.rlp.RLP;
-import org.hyperledger.besu.ethereum.rlp.RLPInput;
-import org.hyperledger.besu.ethereum.vm.DebugOperationTracer;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
-import org.hyperledger.besu.util.Subscribers;
-
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class OnChainPrivacyPrecompiledContract extends PrivacyPrecompiledContract {
-
-  // Dummy signature for transactions to not fail being processed.
-  private static final SECP256K1.Signature FAKE_SIGNATURE =
-      SECP256K1.Signature.create(SECP256K1.HALF_CURVE_ORDER, SECP256K1.HALF_CURVE_ORDER, (byte) 0);
-
-  private final Subscribers<PrivateTransactionObserver> privateTransactionEventObservers =
-      Subscribers.create();
-
-  private static final Logger LOG = LogManager.getLogger();
-
-  public OnChainPrivacyPrecompiledContract(
-      final GasCalculator gasCalculator,
-      final Enclave enclave,
-      final WorldStateArchive worldStateArchive,
-      final PrivateStateRootResolver privateStateRootResolver) {
-    super(gasCalculator, enclave, worldStateArchive, privateStateRootResolver, "OnChainPrivacy");
-  }
-
-  public OnChainPrivacyPrecompiledContract(
-      final GasCalculator gasCalculator, final PrivacyParameters privacyParameters) {
-    super(
-        gasCalculator,
-        privacyParameters.getEnclave(),
-        privacyParameters.getPrivateWorldStateArchive(),
-        privacyParameters.getPrivateStateRootResolver(),
-        "OnChainPrivacy");
-  }
-
-  public long addPrivateTransactionObserver(final PrivateTransactionObserver observer) {
-    return privateTransactionEventObservers.subscribe(observer);
-  }
-
-  public boolean removePrivateTransactionObserver(final long observerId) {
-    return privateTransactionEventObservers.unsubscribe(observerId);
-  }
-
-  @Override
-  public Bytes compute(final Bytes input, final MessageFrame messageFrame) {
-
-    if (skipContractExecution(messageFrame)) {
-      return Bytes.EMPTY;
-    }
-
-    final Hash pmtHash = messageFrame.getTransactionHash();
-
-    final String key = input.slice(0, 32).toBase64String();
-
-    final ReceiveResponse receiveResponse;
-    try {
-      receiveResponse = getReceiveResponse(key);
-    } catch (final EnclaveClientException e) {
-      LOG.debug("Can not fetch private transaction payload with key {}", key, e);
-      return Bytes.EMPTY;
-    }
-
-    final BytesValueRLPInput bytesValueRLPInput =
-        new BytesValueRLPInput(
-            Bytes.wrap(Base64.getDecoder().decode(receiveResponse.getPayload())), false);
-    final VersionedPrivateTransaction versionedPrivateTransaction =
-        VersionedPrivateTransaction.readFrom(bytesValueRLPInput);
-    final PrivateTransaction privateTransaction =
-        versionedPrivateTransaction.getPrivateTransaction();
-
-    final Bytes privateFrom = privateTransaction.getPrivateFrom();
-    if (!privateFromMatchesSenderKey(privateFrom, receiveResponse.getSenderKey())) {
-      return Bytes.EMPTY;
-    }
-
-    final Optional<Bytes> maybeGroupId = privateTransaction.getPrivacyGroupId();
-    if (maybeGroupId.isEmpty()) {
-      return Bytes.EMPTY;
-    }
-
-    final Bytes32 privacyGroupId = Bytes32.wrap(maybeGroupId.get());
-
-    LOG.debug("Processing private transaction {} in privacy group {}", pmtHash, privacyGroupId);
-
-    final ProcessableBlockHeader currentBlockHeader = messageFrame.getBlockHeader();
-
-    final PrivateMetadataUpdater privateMetadataUpdater = messageFrame.getPrivateMetadataUpdater();
-    final Hash lastRootHash =
-        privateStateRootResolver.resolveLastStateRoot(privacyGroupId, privateMetadataUpdater);
-
-    final MutableWorldState disposablePrivateState =
-        privateWorldStateArchive.getMutable(lastRootHash).get();
-
-    final WorldUpdater privateWorldStateUpdater = disposablePrivateState.updater();
-
-    final WorldUpdater publicWorldState = messageFrame.getWorldState();
-    final Blockchain blockchain = messageFrame.getBlockchain();
-
-    maybeInjectDefaultManagementAndProxy(
-        lastRootHash, disposablePrivateState, privateWorldStateUpdater);
-
-    if (!canExecute(
-        messageFrame,
-        currentBlockHeader,
-        privateTransaction,
-        versionedPrivateTransaction.getVersion(),
-        publicWorldState,
-        privacyGroupId,
-        blockchain,
-        disposablePrivateState,
-        privateWorldStateUpdater,
-        privateFrom)) {
-      return Bytes.EMPTY;
-    }
-
-    final TransactionProcessingResult result =
-        processPrivateTransaction(
-            messageFrame, privateTransaction, privacyGroupId, privateWorldStateUpdater);
-
-    if (result.isInvalid() || !result.isSuccessful()) {
-      LOG.error(
-          "Failed to process private transaction {}: {}",
-          pmtHash,
-          result.getValidationResult().getErrorMessage());
-
-      privateMetadataUpdater.putTransactionReceipt(pmtHash, new PrivateTransactionReceipt(result));
-
-      return Bytes.EMPTY;
-    }
-
-    sendParticipantRemovedEvent(privateTransaction);
-
-    if (messageFrame.isPersistingPrivateState()) {
-
-      privateWorldStateUpdater.commit();
-      disposablePrivateState.persist(null);
-
-      storePrivateMetadata(
-          pmtHash, privacyGroupId, disposablePrivateState, privateMetadataUpdater, result);
-    }
-
-    return result.getOutput();
-  }
-
-  private void sendParticipantRemovedEvent(final PrivateTransaction privateTransaction) {
-    if (privateTransaction.isGroupRemovalTransaction()) {
-      // get first participant parameter - there is only one for removal transaction
-      final String removedParticipant =
-          getRemovedParticipantFromParameter(privateTransaction.getPayload());
-
-      final PrivateTransactionEvent removalEvent =
-          new PrivateTransactionEvent(
-              privateTransaction.getPrivacyGroupId().get().toBase64String(), removedParticipant);
-      privateTransactionEventObservers.forEach(
-          sub -> sub.onPrivateTransactionProcessed(removalEvent));
-    }
-  }
-
-  boolean canExecute(
-      final MessageFrame messageFrame,
-      final ProcessableBlockHeader currentBlockHeader,
-      final PrivateTransaction privateTransaction,
-      final Bytes32 version,
-      final WorldUpdater publicWorldState,
-      final Bytes32 privacyGroupId,
-      final Blockchain blockchain,
-      final MutableWorldState disposablePrivateState,
-      final WorldUpdater privateWorldStateUpdater,
-      final Bytes privateFrom) {
-
-    final boolean isAddingParticipant =
-        privateTransaction
-            .getPayload()
-            .toHexString()
-            .startsWith(OnChainGroupManagement.ADD_PARTICIPANTS_METHOD_SIGNATURE.toHexString());
-
-    final boolean isPrivacyGroupLocked =
-        isContractLocked(
-            messageFrame,
-            currentBlockHeader,
-            publicWorldState,
-            privacyGroupId,
-            blockchain,
-            disposablePrivateState,
-            privateWorldStateUpdater);
-
-    if (isAddingParticipant && !isPrivacyGroupLocked) {
-      LOG.debug(
-          "Privacy Group {} is not locked while trying to add to group with commitment {}",
-          privacyGroupId.toHexString(),
-          messageFrame.getTransactionHash());
-      return false;
-    }
-
-    if (!isAddingParticipant && isPrivacyGroupLocked) {
-      LOG.debug(
-          "Privacy Group {} is locked while trying to execute transaction with commitment {}",
-          privacyGroupId.toHexString(),
-          messageFrame.getTransactionHash());
-      return false;
-    }
-
-    if (!onChainPrivacyGroupVersionMatches(
-        messageFrame,
-        currentBlockHeader,
-        version,
-        publicWorldState,
-        privacyGroupId,
-        blockchain,
-        disposablePrivateState,
-        privateWorldStateUpdater)) {
-      LOG.debug(
-          "Privacy group version mismatch while trying to execute transaction with commitment {}",
-          messageFrame.getTransactionHash());
-      return false;
-    }
-
-    if (!isMemberOfPrivacyGroup(
-        isAddingParticipant,
-        privateTransaction,
-        privateFrom,
-        privacyGroupId,
-        messageFrame,
-        currentBlockHeader,
-        publicWorldState,
-        blockchain,
-        disposablePrivateState,
-        privateWorldStateUpdater)) {
-      LOG.debug(
-          "PrivateTransaction with hash {} cannot execute in privacy group {} because privateFrom"
-              + " {} is not a member.",
-          messageFrame.getTransactionHash(),
-          privacyGroupId.toBase64String(),
-          privateFrom.toBase64String());
-      return false;
-    }
-
-    return true;
-  }
-
-  private boolean isMemberOfPrivacyGroup(
-      final boolean isAddingParticipant,
-      final PrivateTransaction privateTransaction,
-      final Bytes privateFrom,
-      final Bytes32 privacyGroupId,
-      final MessageFrame messageFrame,
-      final ProcessableBlockHeader currentBlockHeader,
-      final WorldUpdater publicWorldState,
-      final Blockchain blockchain,
-      final MutableWorldState disposablePrivateState,
-      final WorldUpdater privateWorldStateUpdater) {
-    final TransactionProcessingResult result =
-        simulateTransaction(
-            messageFrame,
-            currentBlockHeader,
-            publicWorldState,
-            privacyGroupId,
-            blockchain,
-            disposablePrivateState,
-            privateWorldStateUpdater,
-            OnChainGroupManagement.GET_PARTICIPANTS_METHOD_SIGNATURE);
-    final List<Bytes> list = getMembersFromResult(result);
-    List<String> participantsFromParameter = Collections.emptyList();
-    if (list.isEmpty() && isAddingParticipant) {
-      // creating a new group, so we are checking whether the privateFrom is one of the members of
-      // the new group
-      participantsFromParameter = getParticipantsFromParameter(privateTransaction.getPayload());
-    }
-    return list.contains(privateFrom)
-        || participantsFromParameter.contains(privateFrom.toBase64String());
-  }
-
-  List<Bytes> getMembersFromResult(final TransactionProcessingResult result) {
-    List<Bytes> list = Collections.emptyList();
-    if (result != null && result.isSuccessful()) {
-      final RLPInput rlpInput = RLP.input(result.getOutput());
-      if (rlpInput.nextSize() > 0) {
-        list = decodeList(rlpInput.raw());
-      }
-    }
-    return list;
-  }
-
-  // TODO: this method is copied from DefaultPrivacyController. Fix the duplication in a separate GI
-  private List<String> getParticipantsFromParameter(final Bytes input) {
-    final List<String> participants = new ArrayList<>();
-    final Bytes mungedParticipants = input.slice(4 + 32 + 32);
-    for (int i = 0; i <= mungedParticipants.size() - 32; i += 32) {
-      participants.add(mungedParticipants.slice(i, 32).toBase64String());
-    }
-    return participants;
-  }
-
-  private String getRemovedParticipantFromParameter(final Bytes input) {
-    return input.slice(4).toBase64String();
-  }
-
-  private List<Bytes> decodeList(final Bytes rlpEncodedList) {
-    final ArrayList<Bytes> decodedElements = new ArrayList<>();
-    // first 32 bytes is dynamic list offset
-    final UInt256 lengthOfList = UInt256.fromBytes(rlpEncodedList.slice(32, 32)); // length of list
-    for (int i = 0; i < lengthOfList.toLong(); ++i) {
-      decodedElements.add(Bytes.wrap(rlpEncodedList.slice(64 + (32 * i), 32))); // participant
-    }
-    return decodedElements;
-  }
-
-  protected boolean isContractLocked(
-      final MessageFrame messageFrame,
-      final ProcessableBlockHeader currentBlockHeader,
-      final WorldUpdater publicWorldState,
-      final Bytes32 privacyGroupId,
-      final Blockchain blockchain,
-      final MutableWorldState disposablePrivateState,
-      final WorldUpdater privateWorldStateUpdater) {
-    final TransactionProcessingResult result =
-        simulateTransaction(
-            messageFrame,
-            currentBlockHeader,
-            publicWorldState,
-            privacyGroupId,
-            blockchain,
-            disposablePrivateState,
-            privateWorldStateUpdater,
-            OnChainGroupManagement.CAN_EXECUTE_METHOD_SIGNATURE);
-    return result.getOutput().toHexString().endsWith("0");
-  }
-
-  protected TransactionProcessingResult simulateTransaction(
-      final MessageFrame messageFrame,
-      final ProcessableBlockHeader currentBlockHeader,
-      final WorldUpdater publicWorldState,
-      final Bytes32 privacyGroupId,
-      final Blockchain currentBlockchain,
-      final MutableWorldState disposablePrivateState,
-      final WorldUpdater privateWorldStateUpdater,
-      final Bytes methodSignature) {
-    // We need the "lock status" of the group for every single transaction but we don't want this
-    // call to affect the state
-    // privateTransactionProcessor.processTransaction(...) commits the state if the process was
-    // successful before it returns
-    final MutableWorldState localMutableState =
-        privateWorldStateArchive.getMutable(disposablePrivateState.rootHash()).get();
-    final WorldUpdater updater = localMutableState.updater();
-
-    return privateTransactionProcessor.processTransaction(
-        currentBlockchain,
-        publicWorldState,
-        updater,
-        currentBlockHeader,
-        messageFrame.getTransactionHash(),
-        buildSimulationTransaction(privacyGroupId, privateWorldStateUpdater, methodSignature),
-        messageFrame.getMiningBeneficiary(),
-        new DebugOperationTracer(TraceOptions.DEFAULT),
-        messageFrame.getBlockHashLookup(),
-        privacyGroupId);
-  }
-
-  protected void maybeInjectDefaultManagementAndProxy(
-      final Hash lastRootHash,
-      final MutableWorldState disposablePrivateState,
-      final WorldUpdater privateWorldStateUpdater) {
-    if (lastRootHash.equals(EMPTY_ROOT_HASH)) {
-      // inject management
-      final EvmAccount managementPrecompile =
-          privateWorldStateUpdater.createAccount(Address.DEFAULT_ONCHAIN_PRIVACY_MANAGEMENT);
-      final MutableAccount mutableManagementPrecompiled = managementPrecompile.getMutable();
-      // this is the code for the simple management contract
-      mutableManagementPrecompiled.setCode(
-          OnChainGroupManagement.DEFAULT_GROUP_MANAGEMENT_RUNTIME_BYTECODE);
-
-      // inject proxy
-      final EvmAccount proxyPrecompile =
-          privateWorldStateUpdater.createAccount(Address.ONCHAIN_PRIVACY_PROXY);
-      final MutableAccount mutableProxyPrecompiled = proxyPrecompile.getMutable();
-      // this is the code for the proxy contract
-      mutableProxyPrecompiled.setCode(OnChainGroupManagement.PROXY_RUNTIME_BYTECODE);
-      // manually set the management contract address so the proxy can trust it
-      mutableProxyPrecompiled.setStorageValue(
-          UInt256.ZERO,
-          UInt256.fromBytes(Bytes32.leftPad(Address.DEFAULT_ONCHAIN_PRIVACY_MANAGEMENT)));
-
-      privateWorldStateUpdater.commit();
-      disposablePrivateState.persist(null);
-    }
-  }
-
-  protected boolean onChainPrivacyGroupVersionMatches(
-      final MessageFrame messageFrame,
-      final ProcessableBlockHeader currentBlockHeader,
-      final Bytes32 version,
-      final WorldUpdater publicWorldState,
-      final Bytes32 privacyGroupId,
-      final Blockchain currentBlockchain,
-      final MutableWorldState disposablePrivateState,
-      final WorldUpdater privateWorldStateUpdater) {
-    // We need the "version" of the group for every single transaction but we don't want this
-    // call to affect the state
-    // privateTransactionProcessor.processTransaction(...) commits the state if the process was
-    // successful before it returns
-    final TransactionProcessingResult getVersionResult =
-        simulateTransaction(
-            messageFrame,
-            currentBlockHeader,
-            publicWorldState,
-            privacyGroupId,
-            currentBlockchain,
-            disposablePrivateState,
-            privateWorldStateUpdater,
-            OnChainGroupManagement.GET_VERSION_METHOD_SIGNATURE);
-
-    if (version.equals(getVersionResult.getOutput())) {
-      return true;
-    }
-    LOG.debug(
-        "Privacy Group {} version mismatch for commitment {}: expecting {} but got {}",
-        privacyGroupId.toBase64String(),
-        messageFrame.getTransactionHash(),
-        getVersionResult.getOutput(),
-        version);
-    return false;
-  }
-
-  private PrivateTransaction buildSimulationTransaction(
-      final Bytes privacyGroupId,
-      final WorldUpdater privateWorldStateUpdater,
-      final Bytes payload) {
-    return PrivateTransaction.builder()
-        .privateFrom(Bytes.EMPTY)
-        .privacyGroupId(privacyGroupId)
-        .restriction(Restriction.RESTRICTED)
-        .nonce(
-            privateWorldStateUpdater.getAccount(Address.ZERO) != null
-                ? privateWorldStateUpdater.getAccount(Address.ZERO).getNonce()
-                : 0)
-        .gasPrice(Wei.of(1000))
-        .gasLimit(3000000)
-        .to(Address.ONCHAIN_PRIVACY_PROXY)
-        .sender(Address.ZERO)
-        .value(Wei.ZERO)
-        .payload(payload)
-        .signature(FAKE_SIGNATURE)
-        .build();
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPluginPrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPluginPrecompiledContract.java
new file mode 100644
index 00000000000..723af2efa4f
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPluginPrecompiledContract.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet.precompiles.privacy;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils;
+import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
+import org.hyperledger.besu.ethereum.privacy.PrivateTransactionReceipt;
+import org.hyperledger.besu.ethereum.privacy.storage.PrivateMetadataUpdater;
+import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+
+import java.util.Optional;
+import javax.annotation.Nonnull;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PrivacyPluginPrecompiledContract extends PrivacyPrecompiledContract {
+  private static final Logger LOG = LoggerFactory.getLogger(PrivacyPluginPrecompiledContract.class);
+  private final PrivacyParameters privacyParameters;
+
+  public PrivacyPluginPrecompiledContract(
+      final GasCalculator gasCalculator, final PrivacyParameters privacyParameters) {
+    super(gasCalculator, privacyParameters, "PluginPrivacy");
+    this.privacyParameters = privacyParameters;
+  }
+
+  @Nonnull
+  @Override
+  public PrecompileContractResult computePrecompile(
+      final Bytes input, @Nonnull final MessageFrame messageFrame) {
+    if (skipContractExecution(messageFrame)) {
+      return NO_RESULT;
+    }
+
+    final Optional<org.hyperledger.besu.plugin.data.PrivateTransaction> pluginPrivateTransaction =
+        privacyParameters
+            .getPrivacyService()
+            .getPayloadProvider()
+            .getPrivateTransactionFromPayload(
+                messageFrame.getContextVariable(PrivateStateUtils.KEY_TRANSACTION));
+
+    if (pluginPrivateTransaction.isEmpty()) {
+      return NO_RESULT;
+    }
+
+    final PrivateTransaction privateTransaction =
+        PrivateTransaction.readFrom(pluginPrivateTransaction.get());
+
+    final Bytes32 privacyGroupId = privateTransaction.determinePrivacyGroupId();
+    final Hash pmtHash = messageFrame.getContextVariable(PrivateStateUtils.KEY_TRANSACTION_HASH);
+
+    LOG.debug(
+        "Processing unrestricted private transaction {} in privacy group {}",
+        pmtHash,
+        privacyGroupId);
+
+    final PrivateMetadataUpdater privateMetadataUpdater =
+        messageFrame.getContextVariable(PrivateStateUtils.KEY_PRIVATE_METADATA_UPDATER);
+    final Hash lastRootHash =
+        privateStateRootResolver.resolveLastStateRoot(privacyGroupId, privateMetadataUpdater);
+
+    final MutableWorldState disposablePrivateState =
+        privateWorldStateArchive.getMutable(lastRootHash, null).get();
+
+    final WorldUpdater privateWorldStateUpdater = disposablePrivateState.updater();
+
+    maybeApplyGenesisToPrivateWorldState(
+        lastRootHash,
+        disposablePrivateState,
+        privateWorldStateUpdater,
+        privacyGroupId,
+        messageFrame.getBlockValues().getNumber());
+
+    final TransactionProcessingResult result =
+        processPrivateTransaction(
+            messageFrame, privateTransaction, privacyGroupId, privateWorldStateUpdater);
+
+    if (result.isInvalid() || !result.isSuccessful()) {
+      LOG.error(
+          "Failed to process unrestricted private transaction {}: {}",
+          pmtHash,
+          result.getValidationResult().getErrorMessage());
+
+      privateMetadataUpdater.putTransactionReceipt(pmtHash, new PrivateTransactionReceipt(result));
+
+      return NO_RESULT;
+    }
+
+    if (messageFrame.getContextVariable(PrivateStateUtils.KEY_IS_PERSISTING_PRIVATE_STATE, false)) {
+
+      privateWorldStateUpdater.commit();
+      disposablePrivateState.persist(null);
+
+      storePrivateMetadata(
+          pmtHash, privacyGroupId, disposablePrivateState, privateMetadataUpdater, result);
+    }
+
+    return new PrecompileContractResult(
+        result.getOutput(), true, MessageFrame.State.CODE_EXECUTING, Optional.empty());
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContract.java
index 9b40048a2fd..b1a754c9fe2 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContract.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContract.java
@@ -14,20 +14,23 @@
  */
 package org.hyperledger.besu.ethereum.mainnet.precompiles.privacy;
 
+import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_IS_PERSISTING_PRIVATE_STATE;
+import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_PRIVATE_METADATA_UPDATER;
+import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_TRANSACTION_HASH;
+import static org.hyperledger.besu.ethereum.privacy.PrivateStateRootResolver.EMPTY_ROOT_HASH;
+
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.enclave.Enclave;
 import org.hyperledger.besu.enclave.EnclaveClientException;
+import org.hyperledger.besu.enclave.EnclaveConfigurationException;
 import org.hyperledger.besu.enclave.EnclaveIOException;
 import org.hyperledger.besu.enclave.EnclaveServerException;
 import org.hyperledger.besu.enclave.types.ReceiveResponse;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.debug.TraceOptions;
-import org.hyperledger.besu.ethereum.mainnet.AbstractPrecompiledContract;
+import org.hyperledger.besu.ethereum.privacy.PrivateStateGenesisAllocator;
 import org.hyperledger.besu.ethereum.privacy.PrivateStateRootResolver;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransactionProcessor;
@@ -36,26 +39,35 @@
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateTransactionMetadata;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
-import org.hyperledger.besu.ethereum.vm.DebugOperationTracer;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.frame.BlockValues;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.precompile.AbstractPrecompiledContract;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.util.Base64;
+import java.util.Optional;
+import javax.annotation.Nonnull;
 
-import com.google.common.annotations.VisibleForTesting;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PrivacyPrecompiledContract extends AbstractPrecompiledContract {
   private final Enclave enclave;
   final WorldStateArchive privateWorldStateArchive;
   final PrivateStateRootResolver privateStateRootResolver;
+  private final PrivateStateGenesisAllocator privateStateGenesisAllocator;
   PrivateTransactionProcessor privateTransactionProcessor;
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PrivacyPrecompiledContract.class);
+
+  static final PrecompileContractResult NO_RESULT =
+      new PrecompileContractResult(
+          Bytes.EMPTY, true, MessageFrame.State.CODE_EXECUTING, Optional.empty());
 
   public PrivacyPrecompiledContract(
       final GasCalculator gasCalculator,
@@ -66,28 +78,22 @@ public PrivacyPrecompiledContract(
         privacyParameters.getEnclave(),
         privacyParameters.getPrivateWorldStateArchive(),
         privacyParameters.getPrivateStateRootResolver(),
+        privacyParameters.getPrivateStateGenesisAllocator(),
         name);
   }
 
-  @VisibleForTesting
-  PrivacyPrecompiledContract(
-      final GasCalculator gasCalculator,
-      final Enclave enclave,
-      final WorldStateArchive worldStateArchive,
-      final PrivateStateRootResolver privateStateRootResolver) {
-    this(gasCalculator, enclave, worldStateArchive, privateStateRootResolver, "Privacy");
-  }
-
   protected PrivacyPrecompiledContract(
       final GasCalculator gasCalculator,
       final Enclave enclave,
       final WorldStateArchive worldStateArchive,
       final PrivateStateRootResolver privateStateRootResolver,
+      final PrivateStateGenesisAllocator privateStateGenesisAllocator,
       final String name) {
     super(name, gasCalculator);
     this.enclave = enclave;
     this.privateWorldStateArchive = worldStateArchive;
     this.privateStateRootResolver = privateStateRootResolver;
+    this.privateStateGenesisAllocator = privateStateGenesisAllocator;
   }
 
   public void setPrivateTransactionProcessor(
@@ -96,18 +102,20 @@ public void setPrivateTransactionProcessor(
   }
 
   @Override
-  public Gas gasRequirement(final Bytes input) {
-    return Gas.of(0L);
+  public long gasRequirement(final Bytes input) {
+    return 0L;
   }
 
+  @Nonnull
   @Override
-  public Bytes compute(final Bytes input, final MessageFrame messageFrame) {
+  public PrecompileContractResult computePrecompile(
+      final Bytes input, @Nonnull final MessageFrame messageFrame) {
 
     if (skipContractExecution(messageFrame)) {
-      return Bytes.EMPTY;
+      return NO_RESULT;
     }
 
-    final Hash pmtHash = messageFrame.getTransactionHash();
+    final Hash pmtHash = messageFrame.getContextVariable(KEY_TRANSACTION_HASH);
 
     final String key = input.toBase64String();
     final ReceiveResponse receiveResponse;
@@ -115,7 +123,7 @@ public Bytes compute(final Bytes input, final MessageFrame messageFrame) {
       receiveResponse = getReceiveResponse(key);
     } catch (final EnclaveClientException e) {
       LOG.debug("Can not fetch private transaction payload with key {}", key, e);
-      return Bytes.EMPTY;
+      return NO_RESULT;
     }
 
     final BytesValueRLPInput bytesValueRLPInput =
@@ -126,7 +134,7 @@ public Bytes compute(final Bytes input, final MessageFrame messageFrame) {
 
     final Bytes privateFrom = privateTransaction.getPrivateFrom();
     if (!privateFromMatchesSenderKey(privateFrom, receiveResponse.getSenderKey())) {
-      return Bytes.EMPTY;
+      return NO_RESULT;
     }
 
     final Bytes32 privacyGroupId =
@@ -138,30 +146,37 @@ public Bytes compute(final Bytes input, final MessageFrame messageFrame) {
               .retrievePrivacyGroup(privacyGroupId.toBase64String())
               .getMembers()
               .contains(privateFrom.toBase64String())) {
-        return Bytes.EMPTY;
+        return NO_RESULT;
       }
     } catch (final EnclaveClientException e) {
       // This exception is thrown when the privacy group can not be found
-      return Bytes.EMPTY;
+      return NO_RESULT;
     } catch (final EnclaveServerException e) {
-      LOG.error("Enclave is responding with an error, perhaps it has a misconfiguration?", e);
-      throw e;
+      throw new IllegalStateException(
+          "Enclave is responding with an error, perhaps it has a misconfiguration?", e);
     } catch (final EnclaveIOException e) {
-      LOG.error("Can not communicate with enclave, is it up?", e);
-      throw e;
+      throw new IllegalStateException("Can not communicate with enclave, is it up?", e);
     }
 
     LOG.debug("Processing private transaction {} in privacy group {}", pmtHash, privacyGroupId);
 
-    final PrivateMetadataUpdater privateMetadataUpdater = messageFrame.getPrivateMetadataUpdater();
+    final PrivateMetadataUpdater privateMetadataUpdater =
+        messageFrame.getContextVariable(KEY_PRIVATE_METADATA_UPDATER);
     final Hash lastRootHash =
         privateStateRootResolver.resolveLastStateRoot(privacyGroupId, privateMetadataUpdater);
 
     final MutableWorldState disposablePrivateState =
-        privateWorldStateArchive.getMutable(lastRootHash).get();
+        privateWorldStateArchive.getMutable(lastRootHash, null).get();
 
     final WorldUpdater privateWorldStateUpdater = disposablePrivateState.updater();
 
+    maybeApplyGenesisToPrivateWorldState(
+        lastRootHash,
+        disposablePrivateState,
+        privateWorldStateUpdater,
+        privacyGroupId,
+        messageFrame.getBlockValues().getNumber());
+
     final TransactionProcessingResult result =
         processPrivateTransaction(
             messageFrame, privateTransaction, privacyGroupId, privateWorldStateUpdater);
@@ -174,11 +189,10 @@ public Bytes compute(final Bytes input, final MessageFrame messageFrame) {
 
       privateMetadataUpdater.putTransactionReceipt(pmtHash, new PrivateTransactionReceipt(result));
 
-      return Bytes.EMPTY;
+      return NO_RESULT;
     }
 
-    if (messageFrame.isPersistingPrivateState()) {
-
+    if (messageFrame.getContextVariable(KEY_IS_PERSISTING_PRIVATE_STATE, false)) {
       privateWorldStateUpdater.commit();
       disposablePrivateState.persist(null);
 
@@ -186,7 +200,20 @@ public Bytes compute(final Bytes input, final MessageFrame messageFrame) {
           pmtHash, privacyGroupId, disposablePrivateState, privateMetadataUpdater, result);
     }
 
-    return result.getOutput();
+    return new PrecompileContractResult(
+        result.getOutput(), true, MessageFrame.State.CODE_EXECUTING, Optional.empty());
+  }
+
+  protected void maybeApplyGenesisToPrivateWorldState(
+      final Hash lastRootHash,
+      final MutableWorldState disposablePrivateState,
+      final WorldUpdater privateWorldStateUpdater,
+      final Bytes32 privacyGroupId,
+      final long blockNumber) {
+    if (lastRootHash.equals(EMPTY_ROOT_HASH)) {
+      this.privateStateGenesisAllocator.applyGenesisToPrivateWorldState(
+          disposablePrivateState, privateWorldStateUpdater, privacyGroupId, blockNumber);
+    }
   }
 
   void storePrivateMetadata(
@@ -217,14 +244,13 @@ TransactionProcessingResult processPrivateTransaction(
       final WorldUpdater privateWorldStateUpdater) {
 
     return privateTransactionProcessor.processTransaction(
-        messageFrame.getBlockchain(),
-        messageFrame.getWorldState(),
+        messageFrame.getWorldUpdater(),
         privateWorldStateUpdater,
-        messageFrame.getBlockHeader(),
-        messageFrame.getTransactionHash(),
+        (ProcessableBlockHeader) messageFrame.getBlockValues(),
+        messageFrame.getContextVariable(KEY_TRANSACTION_HASH),
         privateTransaction,
         messageFrame.getMiningBeneficiary(),
-        new DebugOperationTracer(TraceOptions.DEFAULT),
+        OperationTracer.NO_TRACING,
         messageFrame.getBlockHashLookup(),
         privacyGroupId);
   }
@@ -234,11 +260,10 @@ ReceiveResponse getReceiveResponse(final String key) {
     try {
       receiveResponse = enclave.receive(key);
     } catch (final EnclaveServerException e) {
-      LOG.error("Enclave is responding with an error, perhaps it has a misconfiguration?", e);
-      throw e;
+      throw new IllegalStateException(
+          "Enclave is responding with an error, perhaps it has a misconfiguration?", e);
     } catch (final EnclaveIOException e) {
-      LOG.error("Can not communicate with enclave is it up?", e);
-      throw e;
+      throw new IllegalStateException("Can not communicate with enclave is it up?", e);
     }
     return receiveResponse;
   }
@@ -251,21 +276,43 @@ boolean isSimulatingPMT(final MessageFrame messageFrame) {
     // If there's no PrivateMetadataUpdater, the precompile has not been called through the
     // PrivacyBlockProcessor. This indicates the PMT is being simulated and execution of the
     // precompile is not required.
-    return messageFrame.getPrivateMetadataUpdater() == null;
+    return !messageFrame.hasContextVariable(KEY_PRIVATE_METADATA_UPDATER);
   }
 
   boolean isMining(final MessageFrame messageFrame) {
     boolean isMining = false;
-    final ProcessableBlockHeader currentBlockHeader = messageFrame.getBlockHeader();
+    final BlockValues currentBlockHeader = messageFrame.getBlockValues();
     if (!BlockHeader.class.isAssignableFrom(currentBlockHeader.getClass())) {
-      if (!messageFrame.isPersistingPrivateState()) {
-        isMining = true;
-      } else {
+      if (messageFrame.getContextVariable(KEY_IS_PERSISTING_PRIVATE_STATE, false)) {
         throw new IllegalArgumentException(
             "The MessageFrame contains an illegal block header type. Cannot persist private block"
                 + " metadata without current block hash.");
+      } else {
+        isMining = true;
       }
     }
     return isMining;
   }
+
+  protected boolean privateFromMatchesSenderKey(
+      final Bytes transactionPrivateFrom, final String payloadSenderKey) {
+    if (payloadSenderKey == null) {
+      LOG.warn(
+          "Missing sender key from Orion response. Upgrade Orion to 1.6 to enforce privateFrom check.");
+      throw new EnclaveConfigurationException(
+          "Incompatible Orion version. Orion version must be 1.6.0 or greater.");
+    }
+
+    if (transactionPrivateFrom == null || transactionPrivateFrom.isEmpty()) {
+      LOG.warn("Private transaction is missing privateFrom");
+      return false;
+    }
+
+    if (!payloadSenderKey.equals(transactionPrivateFrom.toBase64String())) {
+      LOG.warn("Private transaction privateFrom doesn't match payload sender key");
+      return false;
+    }
+
+    return true;
+  }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/AbstractPrivacyController.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/AbstractPrivacyController.java
new file mode 100644
index 00000000000..dd8d171c818
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/AbstractPrivacyController.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.privacy;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+import org.hyperledger.besu.ethereum.privacy.storage.PrivateStateStorage;
+import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.ethereum.transaction.CallParameter;
+import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
+
+import java.math.BigInteger;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+public abstract class AbstractPrivacyController implements PrivacyController {
+
+  final Blockchain blockchain;
+  final PrivateStateStorage privateStateStorage;
+  final PrivateTransactionValidator privateTransactionValidator;
+  final PrivateTransactionSimulator privateTransactionSimulator;
+  final PrivateNonceProvider privateNonceProvider;
+  final PrivateWorldStateReader privateWorldStateReader;
+  final PrivateStateRootResolver privateStateRootResolver;
+
+  protected AbstractPrivacyController(
+      final Blockchain blockchain,
+      final PrivacyParameters privacyParameters,
+      final Optional<BigInteger> chainId,
+      final PrivateTransactionSimulator privateTransactionSimulator,
+      final PrivateNonceProvider privateNonceProvider,
+      final PrivateWorldStateReader privateWorldStateReader) {
+    this(
+        blockchain,
+        privacyParameters.getPrivateStateStorage(),
+        new PrivateTransactionValidator(chainId),
+        privateTransactionSimulator,
+        privateNonceProvider,
+        privateWorldStateReader,
+        privacyParameters.getPrivateStateRootResolver());
+  }
+
+  protected AbstractPrivacyController(
+      final Blockchain blockchain,
+      final PrivateStateStorage privateStateStorage,
+      final PrivateTransactionValidator privateTransactionValidator,
+      final PrivateTransactionSimulator privateTransactionSimulator,
+      final PrivateNonceProvider privateNonceProvider,
+      final PrivateWorldStateReader privateWorldStateReader,
+      final PrivateStateRootResolver privateStateRootResolver) {
+    this.blockchain = blockchain;
+    this.privateStateStorage = privateStateStorage;
+    this.privateTransactionValidator = privateTransactionValidator;
+    this.privateTransactionSimulator = privateTransactionSimulator;
+    this.privateNonceProvider = privateNonceProvider;
+    this.privateWorldStateReader = privateWorldStateReader;
+    this.privateStateRootResolver = privateStateRootResolver;
+  }
+
+  @Override
+  public ValidationResult<TransactionInvalidReason> validatePrivateTransaction(
+      final PrivateTransaction privateTransaction, final String privacyUserId) {
+    final String privacyGroupId = privateTransaction.determinePrivacyGroupId().toBase64String();
+    return privateTransactionValidator.validate(
+        privateTransaction,
+        determineNonce(privateTransaction.getSender(), privacyGroupId, privacyUserId),
+        true);
+  }
+
+  @Override
+  public long determineNonce(
+      final Address sender, final String privacyGroupId, final String privacyUserId) {
+    return privateNonceProvider.getNonce(
+        sender, Bytes32.wrap(Bytes.fromBase64String(privacyGroupId)));
+  }
+
+  @Override
+  public Optional<TransactionProcessingResult> simulatePrivateTransaction(
+      final String privacyGroupId,
+      final String privacyUserId,
+      final CallParameter callParams,
+      final long blockNumber) {
+    return privateTransactionSimulator.process(privacyGroupId, callParams, blockNumber);
+  }
+
+  @Override
+  public Optional<Bytes> getContractCode(
+      final String privacyGroupId,
+      final Address contractAddress,
+      final Hash blockHash,
+      final String privacyUserId) {
+    return privateWorldStateReader.getContractCode(privacyGroupId, blockHash, contractAddress);
+  }
+
+  @Override
+  public Optional<Hash> getStateRootByBlockNumber(
+      final String privacyGroupId, final String privacyUserId, final long blockNumber) {
+    return blockchain
+        .getBlockByNumber(blockNumber)
+        .map(
+            block ->
+                privateStateRootResolver.resolveLastStateRoot(
+                    Bytes32.wrap(Bytes.fromBase64String(privacyGroupId)), block.getHash()));
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/AbstractRestrictedPrivacyController.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/AbstractRestrictedPrivacyController.java
new file mode 100644
index 00000000000..75d0df629cd
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/AbstractRestrictedPrivacyController.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.privacy;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.enclave.Enclave;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.privacy.storage.PrivateStateStorage;
+
+import java.util.Optional;
+
+public abstract class AbstractRestrictedPrivacyController extends AbstractPrivacyController {
+
+  final Enclave enclave;
+  final PrivateTransactionLocator privateTransactionLocator;
+
+  protected AbstractRestrictedPrivacyController(
+      final Blockchain blockchain,
+      final PrivateStateStorage privateStateStorage,
+      final Enclave enclave,
+      final PrivateTransactionValidator privateTransactionValidator,
+      final PrivateTransactionSimulator privateTransactionSimulator,
+      final PrivateNonceProvider privateNonceProvider,
+      final PrivateWorldStateReader privateWorldStateReader,
+      final PrivateStateRootResolver privateStateRootResolver) {
+    super(
+        blockchain,
+        privateStateStorage,
+        privateTransactionValidator,
+        privateTransactionSimulator,
+        privateNonceProvider,
+        privateWorldStateReader,
+        privateStateRootResolver);
+    this.enclave = enclave;
+    this.privateTransactionLocator =
+        new PrivateTransactionLocator(blockchain, enclave, privateStateStorage);
+  }
+
+  @Override
+  public Optional<ExecutedPrivateTransaction> findPrivateTransactionByPmtHash(
+      final Hash pmtHash, final String enclaveKey) {
+    return privateTransactionLocator.findByPmtHash(pmtHash, enclaveKey);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/ChainHeadPrivateNonceProvider.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/ChainHeadPrivateNonceProvider.java
index 8d10f565a8e..b457a5e9832 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/ChainHeadPrivateNonceProvider.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/ChainHeadPrivateNonceProvider.java
@@ -14,12 +14,12 @@
  */
 package org.hyperledger.besu.ethereum.privacy;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.account.Account;
 
 import org.apache.tuweni.bytes.Bytes32;
 
@@ -40,10 +40,11 @@ public ChainHeadPrivateNonceProvider(
   @Override
   public long getNonce(final Address sender, final Bytes32 privacyGroupId) {
     final BlockHeader chainHeadHeader = blockchain.getChainHeadHeader();
+    final Hash chainHeadHash = chainHeadHeader.getHash();
     final Hash stateRoot =
-        privateStateRootResolver.resolveLastStateRoot(privacyGroupId, chainHeadHeader.getHash());
+        privateStateRootResolver.resolveLastStateRoot(privacyGroupId, chainHeadHash);
     return privateWorldStateArchive
-        .get(stateRoot)
+        .get(stateRoot, chainHeadHash)
         .map(
             privateWorldState -> {
               final Account account = privateWorldState.get(sender);
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/DefaultPrivacyController.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/DefaultPrivacyController.java
deleted file mode 100644
index ef36e0030fe..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/DefaultPrivacyController.java
+++ /dev/null
@@ -1,574 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.privacy;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.hyperledger.besu.ethereum.privacy.group.OnChainGroupManagement.ADD_PARTICIPANTS_METHOD_SIGNATURE;
-import static org.hyperledger.besu.ethereum.privacy.group.OnChainGroupManagement.GET_PARTICIPANTS_METHOD_SIGNATURE;
-import static org.hyperledger.besu.ethereum.privacy.group.OnChainGroupManagement.GET_VERSION_METHOD_SIGNATURE;
-
-import org.hyperledger.besu.enclave.Enclave;
-import org.hyperledger.besu.enclave.EnclaveClientException;
-import org.hyperledger.besu.enclave.types.PrivacyGroup;
-import org.hyperledger.besu.enclave.types.ReceiveResponse;
-import org.hyperledger.besu.enclave.types.SendResponse;
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
-import org.hyperledger.besu.ethereum.privacy.markertransaction.PrivateMarkerTransactionFactory;
-import org.hyperledger.besu.ethereum.privacy.storage.PrivacyGroupHeadBlockMap;
-import org.hyperledger.besu.ethereum.privacy.storage.PrivateStateStorage;
-import org.hyperledger.besu.ethereum.privacy.storage.PrivateTransactionMetadata;
-import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
-import org.hyperledger.besu.ethereum.rlp.RLP;
-import org.hyperledger.besu.ethereum.rlp.RLPInput;
-import org.hyperledger.besu.ethereum.transaction.CallParameter;
-import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class DefaultPrivacyController implements PrivacyController {
-
-  private static final Logger LOG = LogManager.getLogger();
-
-  private final Blockchain blockchain;
-  private final PrivateStateStorage privateStateStorage;
-  private final Enclave enclave;
-  private final PrivateTransactionValidator privateTransactionValidator;
-  private final PrivateMarkerTransactionFactory privateMarkerTransactionFactory;
-  private final PrivateTransactionSimulator privateTransactionSimulator;
-  private final PrivateNonceProvider privateNonceProvider;
-  private final PrivateWorldStateReader privateWorldStateReader;
-  private final PrivateTransactionLocator privateTransactionLocator;
-  private final PrivateStateRootResolver privateStateRootResolver;
-
-  public DefaultPrivacyController(
-      final Blockchain blockchain,
-      final PrivacyParameters privacyParameters,
-      final Optional<BigInteger> chainId,
-      final PrivateMarkerTransactionFactory privateMarkerTransactionFactory,
-      final PrivateTransactionSimulator privateTransactionSimulator,
-      final PrivateNonceProvider privateNonceProvider,
-      final PrivateWorldStateReader privateWorldStateReader) {
-    this(
-        blockchain,
-        privacyParameters.getPrivateStateStorage(),
-        privacyParameters.getEnclave(),
-        new PrivateTransactionValidator(chainId),
-        privateMarkerTransactionFactory,
-        privateTransactionSimulator,
-        privateNonceProvider,
-        privateWorldStateReader,
-        privacyParameters.getPrivateStateRootResolver());
-  }
-
-  public DefaultPrivacyController(
-      final Blockchain blockchain,
-      final PrivateStateStorage privateStateStorage,
-      final Enclave enclave,
-      final PrivateTransactionValidator privateTransactionValidator,
-      final PrivateMarkerTransactionFactory privateMarkerTransactionFactory,
-      final PrivateTransactionSimulator privateTransactionSimulator,
-      final PrivateNonceProvider privateNonceProvider,
-      final PrivateWorldStateReader privateWorldStateReader,
-      final PrivateStateRootResolver privateStateRootResolver) {
-    this.blockchain = blockchain;
-    this.privateStateStorage = privateStateStorage;
-    this.enclave = enclave;
-    this.privateTransactionValidator = privateTransactionValidator;
-    this.privateMarkerTransactionFactory = privateMarkerTransactionFactory;
-    this.privateTransactionSimulator = privateTransactionSimulator;
-    this.privateNonceProvider = privateNonceProvider;
-    this.privateWorldStateReader = privateWorldStateReader;
-    this.privateTransactionLocator =
-        new PrivateTransactionLocator(blockchain, enclave, privateStateStorage);
-    this.privateStateRootResolver = privateStateRootResolver;
-  }
-
-  @Override
-  public Optional<ExecutedPrivateTransaction> findPrivateTransactionByPmtHash(
-      final Hash pmtHash, final String enclaveKey) {
-    return privateTransactionLocator.findByPmtHash(pmtHash, enclaveKey);
-  }
-
-  @Override
-  public String sendTransaction(
-      final PrivateTransaction privateTransaction,
-      final String enclavePublicKey,
-      final Optional<PrivacyGroup> maybePrivacyGroup) {
-    try {
-      LOG.trace("Storing private transaction in enclave");
-      final SendResponse sendResponse =
-          sendRequest(privateTransaction, enclavePublicKey, maybePrivacyGroup);
-      return sendResponse.getKey();
-    } catch (final Exception e) {
-      LOG.error("Failed to store private transaction in enclave", e);
-      throw e;
-    }
-  }
-
-  @Override
-  public ReceiveResponse retrieveTransaction(
-      final String enclaveKey, final String enclavePublicKey) {
-    return enclave.receive(enclaveKey, enclavePublicKey);
-  }
-
-  @Override
-  public PrivacyGroup createPrivacyGroup(
-      final List<String> addresses,
-      final String name,
-      final String description,
-      final String enclavePublicKey) {
-    return enclave.createPrivacyGroup(addresses, enclavePublicKey, name, description);
-  }
-
-  @Override
-  public String deletePrivacyGroup(final String privacyGroupId, final String enclavePublicKey) {
-    return enclave.deletePrivacyGroup(privacyGroupId, enclavePublicKey);
-  }
-
-  @Override
-  public PrivacyGroup[] findOffChainPrivacyGroupByMembers(
-      final List<String> addresses, final String enclavePublicKey) {
-    return enclave.findPrivacyGroup(addresses);
-  }
-
-  @Override
-  public Transaction createPrivacyMarkerTransaction(
-      final String privateTransactionLookupId, final PrivateTransaction privateTransaction) {
-    return privateMarkerTransactionFactory.create(privateTransactionLookupId, privateTransaction);
-  }
-
-  @Override
-  public Transaction createPrivacyMarkerTransaction(
-      final String privateTransactionLookupId,
-      final PrivateTransaction privateTransaction,
-      final Address privacyPrecompileAddress) {
-    return privateMarkerTransactionFactory.create(
-        privateTransactionLookupId, privateTransaction, privacyPrecompileAddress);
-  }
-
-  @Override
-  public ValidationResult<TransactionInvalidReason> validatePrivateTransaction(
-      final PrivateTransaction privateTransaction, final String enclavePublicKey) {
-    final String privacyGroupId = privateTransaction.determinePrivacyGroupId().toBase64String();
-    return privateTransactionValidator.validate(
-        privateTransaction,
-        determineBesuNonce(privateTransaction.getSender(), privacyGroupId, enclavePublicKey),
-        true);
-  }
-
-  @Override
-  public long determineEeaNonce(
-      final String privateFrom,
-      final String[] privateFor,
-      final Address address,
-      final String enclavePublicKey) {
-    final List<String> groupMembers = Lists.asList(privateFrom, privateFor);
-
-    final List<PrivacyGroup> matchingGroups =
-        Lists.newArrayList(enclave.findPrivacyGroup(groupMembers));
-
-    final List<PrivacyGroup> legacyGroups =
-        matchingGroups.stream()
-            .filter(group -> group.getType() == PrivacyGroup.Type.LEGACY)
-            .collect(Collectors.toList());
-
-    if (legacyGroups.size() == 0) {
-      // the legacy group does not exist yet
-      return 0;
-    }
-    Preconditions.checkArgument(
-        legacyGroups.size() == 1,
-        String.format(
-            "Found invalid number of privacy groups (%d), expected 1.", legacyGroups.size()));
-
-    final String privacyGroupId = legacyGroups.get(0).getPrivacyGroupId();
-
-    return determineBesuNonce(address, privacyGroupId, enclavePublicKey);
-  }
-
-  @Override
-  public long determineBesuNonce(
-      final Address sender, final String privacyGroupId, final String enclavePublicKey) {
-    return privateNonceProvider.getNonce(
-        sender, Bytes32.wrap(Bytes.fromBase64String(privacyGroupId)));
-  }
-
-  @Override
-  public Optional<TransactionProcessingResult> simulatePrivateTransaction(
-      final String privacyGroupId,
-      final String enclavePublicKey,
-      final CallParameter callParams,
-      final long blockNumber) {
-    final Optional<TransactionProcessingResult> result =
-        privateTransactionSimulator.process(privacyGroupId, callParams, blockNumber);
-    return result;
-  }
-
-  @Override
-  public Optional<String> buildAndSendAddPayload(
-      final PrivateTransaction privateTransaction,
-      final Bytes32 privacyGroupId,
-      final String enclavePublicKey) {
-    if (isGroupAdditionTransaction(privateTransaction)) {
-      final List<PrivateTransactionMetadata> privateTransactionMetadataList =
-          buildTransactionMetadataList(privacyGroupId);
-      if (privateTransactionMetadataList.size() > 0) {
-        final List<PrivateTransactionWithMetadata> privateTransactionWithMetadataList =
-            retrievePrivateTransactions(
-                privacyGroupId, privateTransactionMetadataList, enclavePublicKey);
-        final Bytes bytes = serializeAddToGroupPayload(privateTransactionWithMetadataList);
-        final List<String> privateFor =
-            getParticipantsFromParameter(privateTransaction.getPayload());
-        return Optional.of(
-            enclave.send(bytes.toBase64String(), enclavePublicKey, privateFor).getKey());
-      }
-    }
-    return Optional.empty();
-  }
-
-  @Override
-  public Optional<PrivacyGroup> findPrivacyGroupByGroupId(
-      final String privacyGroupId, final String enclaveKey) {
-    try {
-      return findOffChainPrivacyGroupByGroupId(privacyGroupId, enclaveKey);
-    } catch (final EnclaveClientException ex) {
-      // An exception is thrown if the offchain group cannot be found
-      LOG.debug("Offchain privacy group not found: {}", privacyGroupId);
-    }
-    return findOnChainPrivacyGroupByGroupId(Bytes.fromBase64String(privacyGroupId), enclaveKey);
-  }
-
-  @Override
-  public Optional<PrivacyGroup> findOffChainPrivacyGroupByGroupId(
-      final String privacyGroupId, final String enclaveKey) {
-    return Optional.ofNullable(enclave.retrievePrivacyGroup(privacyGroupId));
-  }
-
-  @Override
-  public List<PrivacyGroup> findOnChainPrivacyGroupByMembers(
-      final List<String> addresses, final String enclavePublicKey) {
-    final ArrayList<PrivacyGroup> privacyGroups = new ArrayList<>();
-    final PrivacyGroupHeadBlockMap privacyGroupHeadBlockMap =
-        privateStateStorage
-            .getPrivacyGroupHeadBlockMap(blockchain.getChainHeadHash())
-            .orElse(PrivacyGroupHeadBlockMap.empty());
-    privacyGroupHeadBlockMap
-        .keySet()
-        .forEach(
-            c -> {
-              final Optional<PrivacyGroup> maybePrivacyGroup =
-                  findOnChainPrivacyGroupByGroupId(c, enclavePublicKey);
-              if (maybePrivacyGroup.isPresent()
-                  && maybePrivacyGroup.get().getMembers().containsAll(addresses)) {
-                privacyGroups.add(maybePrivacyGroup.get());
-              }
-            });
-    return privacyGroups;
-  }
-
-  public Optional<PrivacyGroup> findOnChainPrivacyGroupByGroupId(
-      final Bytes privacyGroupId, final String enclaveKey) {
-    // get the privateFor list from the management contract
-    final Optional<TransactionProcessingResult> privateTransactionSimulatorResultOptional =
-        privateTransactionSimulator.process(
-            privacyGroupId.toBase64String(), buildCallParams(GET_PARTICIPANTS_METHOD_SIGNATURE));
-
-    if (privateTransactionSimulatorResultOptional.isPresent()
-        && privateTransactionSimulatorResultOptional.get().isSuccessful()) {
-      final RLPInput rlpInput =
-          RLP.input(privateTransactionSimulatorResultOptional.get().getOutput());
-      if (rlpInput.nextSize() > 0) {
-        return Optional.of(
-            new PrivacyGroup(
-                privacyGroupId.toBase64String(),
-                PrivacyGroup.Type.ONCHAIN,
-                "",
-                "",
-                decodeList(rlpInput.raw())));
-      } else {
-        return Optional.empty();
-      }
-    } else {
-      return Optional.empty();
-    }
-  }
-
-  @Override
-  public Optional<PrivacyGroup> findOnChainPrivacyGroupAndAddNewMembers(
-      final Bytes privacyGroupId,
-      final String enclavePublicKey,
-      final PrivateTransaction privateTransaction) {
-    // get the privateFor list from the management contract
-    final Optional<TransactionProcessingResult> privateTransactionSimulatorResultOptional =
-        privateTransactionSimulator.process(
-            privacyGroupId.toBase64String(), buildCallParams(GET_PARTICIPANTS_METHOD_SIGNATURE));
-
-    final List<String> members = new ArrayList<>();
-    if (privateTransactionSimulatorResultOptional.isPresent()
-        && privateTransactionSimulatorResultOptional.get().isSuccessful()) {
-      final RLPInput rlpInput =
-          RLP.input(privateTransactionSimulatorResultOptional.get().getOutput());
-      if (rlpInput.nextSize() > 0) {
-        members.addAll(decodeList(rlpInput.raw()));
-        if (!members.contains(enclavePublicKey)) {
-          return Optional.empty();
-        }
-      }
-    }
-    if (isGroupAdditionTransaction(privateTransaction)) {
-      final List<String> participantsFromParameter =
-          getParticipantsFromParameter(privateTransaction.getPayload());
-      members.addAll(participantsFromParameter);
-    }
-    if (members.isEmpty()) {
-      return Optional.empty();
-    } else {
-      return Optional.of(
-          new PrivacyGroup(
-              privacyGroupId.toBase64String(), PrivacyGroup.Type.ONCHAIN, "", "", members));
-    }
-  }
-
-  private List<String> decodeList(final Bytes rlpEncodedList) {
-    final ArrayList<String> decodedElements = new ArrayList<>();
-    // first 32 bytes is dynamic list offset
-    final UInt256 lengthOfList = UInt256.fromBytes(rlpEncodedList.slice(32, 32)); // length of list
-    for (int i = 0; i < lengthOfList.toLong(); ++i) {
-      decodedElements.add(
-          Bytes.wrap(rlpEncodedList.slice(64 + (32 * i), 32)).toBase64String()); // participant
-    }
-    return decodedElements;
-  }
-
-  private List<String> getParticipantsFromParameter(final Bytes input) {
-    final List<String> participants = new ArrayList<>();
-    final Bytes mungedParticipants = input.slice(4 + 32 + 32);
-    for (int i = 0; i <= mungedParticipants.size() - 32; i += 32) {
-      participants.add(mungedParticipants.slice(i, 32).toBase64String());
-    }
-    return participants;
-  }
-
-  private CallParameter buildCallParams(final Bytes methodCall) {
-    return new CallParameter(
-        Address.ZERO, Address.ONCHAIN_PRIVACY_PROXY, 3000000, Wei.of(1000), Wei.ZERO, methodCall);
-  }
-
-  private List<PrivateTransactionMetadata> buildTransactionMetadataList(
-      final Bytes privacyGroupId) {
-    final List<PrivateTransactionMetadata> pmtHashes = new ArrayList<>();
-    PrivacyGroupHeadBlockMap privacyGroupHeadBlockMap =
-        privateStateStorage
-            .getPrivacyGroupHeadBlockMap(blockchain.getChainHeadHash())
-            .orElse(PrivacyGroupHeadBlockMap.empty());
-    if (privacyGroupHeadBlockMap.get(privacyGroupId) != null) {
-      Hash blockHash = privacyGroupHeadBlockMap.get(privacyGroupId);
-      while (blockHash != null) {
-        pmtHashes.addAll(
-            0,
-            privateStateStorage
-                .getPrivateBlockMetadata(blockHash, Bytes32.wrap(privacyGroupId))
-                .get()
-                .getPrivateTransactionMetadataList());
-        blockHash = blockchain.getBlockHeader(blockHash).get().getParentHash();
-        privacyGroupHeadBlockMap =
-            privateStateStorage
-                .getPrivacyGroupHeadBlockMap(blockHash)
-                .orElse(PrivacyGroupHeadBlockMap.empty());
-        if (privacyGroupHeadBlockMap.get(privacyGroupId) != null) {
-          blockHash = privacyGroupHeadBlockMap.get(privacyGroupId);
-        } else {
-          break;
-        }
-      }
-    }
-    return pmtHashes;
-  }
-
-  private List<PrivateTransactionWithMetadata> retrievePrivateTransactions(
-      final Bytes32 privacyGroupId,
-      final List<PrivateTransactionMetadata> privateTransactionMetadataList,
-      final String enclavePublicKey) {
-    final ArrayList<PrivateTransactionWithMetadata> privateTransactions = new ArrayList<>();
-    privateStateStorage
-        .getAddDataKey(privacyGroupId)
-        .ifPresent(key -> privateTransactions.addAll(retrieveAddBlob(key.toBase64String())));
-    for (int i = privateTransactions.size(); i < privateTransactionMetadataList.size(); i++) {
-      final PrivateTransactionMetadata privateTransactionMetadata =
-          privateTransactionMetadataList.get(i);
-      final Transaction privateMarkerTransaction =
-          blockchain
-              .getTransactionByHash(privateTransactionMetadata.getPrivacyMarkerTransactionHash())
-              .orElseThrow();
-      final ReceiveResponse receiveResponse =
-          retrieveTransaction(
-              privateMarkerTransaction.getPayload().slice(0, 32).toBase64String(),
-              enclavePublicKey);
-      final BytesValueRLPInput input =
-          new BytesValueRLPInput(
-              Bytes.fromBase64String(new String(receiveResponse.getPayload(), UTF_8)), false);
-      input.enterList();
-      privateTransactions.add(
-          new PrivateTransactionWithMetadata(
-              PrivateTransaction.readFrom(input), privateTransactionMetadata));
-      input.leaveListLenient();
-    }
-
-    return privateTransactions;
-  }
-
-  @Override
-  public boolean isGroupAdditionTransaction(final PrivateTransaction privateTransaction) {
-    return privateTransaction.getTo().isPresent()
-        && privateTransaction.getTo().get().equals(Address.ONCHAIN_PRIVACY_PROXY)
-        && privateTransaction
-            .getPayload()
-            .toHexString()
-            .startsWith(ADD_PARTICIPANTS_METHOD_SIGNATURE.toHexString());
-  }
-
-  @Override
-  public Optional<Bytes> getContractCode(
-      final String privacyGroupId,
-      final Address contractAddress,
-      final Hash blockHash,
-      final String enclavePublicKey) {
-    return privateWorldStateReader.getContractCode(privacyGroupId, blockHash, contractAddress);
-  }
-
-  @Override
-  public List<PrivateTransactionWithMetadata> retrieveAddBlob(final String addDataKey) {
-    final ReceiveResponse addReceiveResponse = enclave.receive(addDataKey);
-    return PrivateTransactionWithMetadata.readListFromPayload(
-        Bytes.wrap(Base64.getDecoder().decode(addReceiveResponse.getPayload())));
-  }
-
-  private Bytes serializeAddToGroupPayload(
-      final List<PrivateTransactionWithMetadata> privateTransactionWithMetadataList) {
-
-    final BytesValueRLPOutput rlpOutput = new BytesValueRLPOutput();
-    rlpOutput.startList();
-    privateTransactionWithMetadataList.forEach(
-        privateTransactionWithMetadata -> privateTransactionWithMetadata.writeTo(rlpOutput));
-    rlpOutput.endList();
-
-    return rlpOutput.encoded();
-  }
-
-  private SendResponse sendRequest(
-      final PrivateTransaction privateTransaction,
-      final String enclavePublicKey,
-      final Optional<PrivacyGroup> maybePrivacyGroup) {
-    final BytesValueRLPOutput rlpOutput = new BytesValueRLPOutput();
-
-    if (maybePrivacyGroup.isPresent()) {
-      final PrivacyGroup privacyGroup = maybePrivacyGroup.get();
-      if (privacyGroup.getType() == PrivacyGroup.Type.ONCHAIN) {
-        // onchain privacy group
-        final Optional<TransactionProcessingResult> result =
-            privateTransactionSimulator.process(
-                privateTransaction.getPrivacyGroupId().get().toBase64String(),
-                buildCallParams(GET_VERSION_METHOD_SIGNATURE));
-        new VersionedPrivateTransaction(privateTransaction, result).writeTo(rlpOutput);
-        final List<String> onChainPrivateFor = privacyGroup.getMembers();
-        return enclave.send(
-            rlpOutput.encoded().toBase64String(),
-            privateTransaction.getPrivateFrom().toBase64String(),
-            onChainPrivateFor);
-      } else if (privacyGroup.getType() == PrivacyGroup.Type.PANTHEON) {
-        // offchain privacy group
-        privateTransaction.writeTo(rlpOutput);
-        return enclave.send(
-            rlpOutput.encoded().toBase64String(),
-            enclavePublicKey,
-            privateTransaction.getPrivacyGroupId().get().toBase64String());
-      } else {
-        // this should not happen
-        throw new RuntimeException();
-      }
-    }
-    // legacy transaction
-    final List<String> privateFor = resolveLegacyPrivateFor(privateTransaction);
-    if (privateFor.isEmpty()) {
-      privateFor.add(privateTransaction.getPrivateFrom().toBase64String());
-    }
-    privateTransaction.writeTo(rlpOutput);
-    final String payload = rlpOutput.encoded().toBase64String();
-
-    return enclave.send(payload, privateTransaction.getPrivateFrom().toBase64String(), privateFor);
-  }
-
-  private List<String> resolveLegacyPrivateFor(final PrivateTransaction privateTransaction) {
-    final ArrayList<String> privateFor = new ArrayList<>();
-    final boolean isLegacyTransaction = privateTransaction.getPrivateFor().isPresent();
-    if (isLegacyTransaction) {
-      privateFor.addAll(
-          privateTransaction.getPrivateFor().get().stream()
-              .map(Bytes::toBase64String)
-              .collect(Collectors.toList()));
-    }
-    return privateFor;
-  }
-
-  @Override
-  public void verifyPrivacyGroupContainsEnclavePublicKey(
-      final String privacyGroupId, final String enclavePublicKey) {
-    // NO VALIDATION NEEDED
-  }
-
-  @Override
-  public void verifyPrivacyGroupContainsEnclavePublicKey(
-      final String privacyGroupId, final String enclavePublicKey, final Optional<Long> blockNumber)
-      throws MultiTenancyValidationException {
-    // NO VALIDATION NEEDED
-  }
-
-  @Override
-  public PrivateTransactionSimulator getTransactionSimulator() {
-    return privateTransactionSimulator;
-  }
-
-  @Override
-  public Optional<Hash> getStateRootByBlockNumber(
-      final String privacyGroupId, final String enclavePublicKey, final long blockNumber) {
-    return blockchain
-        .getBlockByNumber(blockNumber)
-        .map(
-            block ->
-                privateStateRootResolver.resolveLastStateRoot(
-                    Bytes32.wrap(Bytes.fromBase64String(privacyGroupId)), block.getHash()));
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/ExecutedPrivateTransaction.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/ExecutedPrivateTransaction.java
index eea50750699..4d00c3b37be 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/ExecutedPrivateTransaction.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/ExecutedPrivateTransaction.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.privacy;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 
 /**
  * This class represents a private transaction that has been executed. Therefore, it contains the
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/FlexiblePrivacyController.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/FlexiblePrivacyController.java
new file mode 100644
index 00000000000..595727752b5
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/FlexiblePrivacyController.java
@@ -0,0 +1,347 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.privacy;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY_PROXY;
+import static org.hyperledger.besu.ethereum.privacy.group.FlexibleGroupManagement.GET_PARTICIPANTS_METHOD_SIGNATURE;
+import static org.hyperledger.besu.ethereum.privacy.group.FlexibleGroupManagement.GET_VERSION_METHOD_SIGNATURE;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.enclave.Enclave;
+import org.hyperledger.besu.enclave.types.PrivacyGroup;
+import org.hyperledger.besu.enclave.types.ReceiveResponse;
+import org.hyperledger.besu.enclave.types.SendResponse;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.privacy.storage.PrivacyGroupHeadBlockMap;
+import org.hyperledger.besu.ethereum.privacy.storage.PrivateStateStorage;
+import org.hyperledger.besu.ethereum.privacy.storage.PrivateTransactionMetadata;
+import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.ethereum.transaction.CallParameter;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+import java.util.Optional;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class FlexiblePrivacyController extends AbstractRestrictedPrivacyController {
+
+  private static final Logger LOG = LoggerFactory.getLogger(FlexiblePrivacyController.class);
+
+  private FlexiblePrivacyGroupContract flexiblePrivacyGroupContract;
+
+  public FlexiblePrivacyController(
+      final Blockchain blockchain,
+      final PrivacyParameters privacyParameters,
+      final Optional<BigInteger> chainId,
+      final PrivateTransactionSimulator privateTransactionSimulator,
+      final PrivateNonceProvider privateNonceProvider,
+      final PrivateWorldStateReader privateWorldStateReader) {
+    this(
+        blockchain,
+        privacyParameters.getPrivateStateStorage(),
+        privacyParameters.getEnclave(),
+        new PrivateTransactionValidator(chainId),
+        privateTransactionSimulator,
+        privateNonceProvider,
+        privateWorldStateReader,
+        privacyParameters.getPrivateStateRootResolver());
+  }
+
+  public FlexiblePrivacyController(
+      final Blockchain blockchain,
+      final PrivateStateStorage privateStateStorage,
+      final Enclave enclave,
+      final PrivateTransactionValidator privateTransactionValidator,
+      final PrivateTransactionSimulator privateTransactionSimulator,
+      final PrivateNonceProvider privateNonceProvider,
+      final PrivateWorldStateReader privateWorldStateReader,
+      final PrivateStateRootResolver privateStateRootResolver) {
+    super(
+        blockchain,
+        privateStateStorage,
+        enclave,
+        privateTransactionValidator,
+        privateTransactionSimulator,
+        privateNonceProvider,
+        privateWorldStateReader,
+        privateStateRootResolver);
+
+    flexiblePrivacyGroupContract = new FlexiblePrivacyGroupContract(privateTransactionSimulator);
+  }
+
+  @Override
+  public String createPrivateMarkerTransactionPayload(
+      final PrivateTransaction privateTransaction,
+      final String privacyUserId,
+      final Optional<PrivacyGroup> privacyGroup) {
+    LOG.trace("Storing private transaction in enclave");
+    final SendResponse sendResponse = sendRequest(privateTransaction, privacyGroup);
+    final String firstPart = sendResponse.getKey();
+    final Optional<String> optionalSecondPart =
+        buildAndSendAddPayload(
+            privateTransaction,
+            Bytes32.wrap(privateTransaction.getPrivacyGroupId().orElseThrow()),
+            privacyUserId);
+
+    return buildCompoundLookupId(firstPart, optionalSecondPart);
+  }
+
+  @Override
+  public Optional<PrivacyGroup> findPrivacyGroupByGroupId(
+      final String privacyGroupId, final String enclaveKey) {
+    // get the privateFor list from the management contract
+    final Optional<TransactionProcessingResult> privateTransactionSimulatorResultOptional =
+        privateTransactionSimulator.process(
+            privacyGroupId, buildCallParams(GET_PARTICIPANTS_METHOD_SIGNATURE));
+
+    if (privateTransactionSimulatorResultOptional.isPresent()
+        && privateTransactionSimulatorResultOptional.get().isSuccessful()) {
+      final RLPInput rlpInput =
+          RLP.input(privateTransactionSimulatorResultOptional.get().getOutput());
+      if (rlpInput.nextSize() > 0) {
+        return Optional.of(
+            new PrivacyGroup(
+                privacyGroupId,
+                PrivacyGroup.Type.FLEXIBLE,
+                "",
+                "",
+                FlexibleUtil.decodeList(rlpInput.raw())));
+      }
+    }
+    return Optional.empty();
+  }
+
+  @Override
+  public PrivacyGroup[] findPrivacyGroupByMembers(
+      final List<String> addresses, final String privacyUserId) {
+    final ArrayList<PrivacyGroup> privacyGroups = new ArrayList<>();
+    final PrivacyGroupHeadBlockMap privacyGroupHeadBlockMap =
+        privateStateStorage
+            .getPrivacyGroupHeadBlockMap(blockchain.getChainHeadHash())
+            .orElse(PrivacyGroupHeadBlockMap.empty());
+    privacyGroupHeadBlockMap
+        .keySet()
+        .forEach(
+            c -> {
+              final Optional<PrivacyGroup> maybePrivacyGroup =
+                  findPrivacyGroupByGroupId(c.toBase64String(), privacyUserId);
+              if (maybePrivacyGroup.isPresent()
+                  && maybePrivacyGroup.get().getMembers().containsAll(addresses)) {
+                privacyGroups.add(maybePrivacyGroup.get());
+              }
+            });
+    return privacyGroups.toArray(new PrivacyGroup[0]);
+  }
+
+  @Override
+  public PrivacyGroup createPrivacyGroup(
+      final List<String> addresses,
+      final String name,
+      final String description,
+      final String privacyUserId) {
+    throw new PrivacyConfigurationNotSupportedException(
+        "Method not supported when using flexible privacy");
+  }
+
+  @Override
+  public String deletePrivacyGroup(final String privacyGroupId, final String privacyUserId) {
+    throw new PrivacyConfigurationNotSupportedException(
+        "Method not supported when using flexible privacy");
+  }
+
+  @Override
+  public void verifyPrivacyGroupContainsPrivacyUserId(
+      final String privacyGroupId, final String privacyUserId) {
+    verifyPrivacyGroupContainsPrivacyUserId(privacyGroupId, privacyUserId, Optional.empty());
+  }
+
+  @Override
+  public void verifyPrivacyGroupContainsPrivacyUserId(
+      final String privacyGroupId, final String privacyUserId, final Optional<Long> blockNumber) {
+    final Optional<PrivacyGroup> maybePrivacyGroup =
+        flexiblePrivacyGroupContract.getPrivacyGroupByIdAndBlockNumber(privacyGroupId, blockNumber);
+    // IF the group exists, check member
+    // ELSE member is valid if the group doesn't exist yet - this is normal for flexible privacy
+    // groups
+    maybePrivacyGroup.ifPresent(
+        group -> {
+          if (!group.getMembers().contains(privacyUserId)) {
+            throw new MultiTenancyValidationException(
+                "Privacy group must contain the enclave public key");
+          }
+        });
+  }
+
+  private List<PrivateTransactionMetadata> buildTransactionMetadataList(
+      final Bytes privacyGroupId) {
+    final List<PrivateTransactionMetadata> pmtHashes = new ArrayList<>();
+    PrivacyGroupHeadBlockMap privacyGroupHeadBlockMap =
+        privateStateStorage
+            .getPrivacyGroupHeadBlockMap(blockchain.getChainHeadHash())
+            .orElse(PrivacyGroupHeadBlockMap.empty());
+    if (privacyGroupHeadBlockMap.containsKey(privacyGroupId)) {
+      Hash blockHash = privacyGroupHeadBlockMap.get(privacyGroupId);
+      while (blockHash != null) {
+        pmtHashes.addAll(
+            0,
+            privateStateStorage
+                .getPrivateBlockMetadata(blockHash, Bytes32.wrap(privacyGroupId))
+                .orElseThrow()
+                .getPrivateTransactionMetadataList());
+        blockHash = blockchain.getBlockHeader(blockHash).orElseThrow().getParentHash();
+        privacyGroupHeadBlockMap =
+            privateStateStorage
+                .getPrivacyGroupHeadBlockMap(blockHash)
+                .orElse(PrivacyGroupHeadBlockMap.empty());
+        if (privacyGroupHeadBlockMap.containsKey(privacyGroupId)) {
+          blockHash = privacyGroupHeadBlockMap.get(privacyGroupId);
+        } else {
+          break;
+        }
+      }
+    }
+    return pmtHashes;
+  }
+
+  private List<PrivateTransactionWithMetadata> retrievePrivateTransactions(
+      final Bytes32 privacyGroupId,
+      final List<PrivateTransactionMetadata> privateTransactionMetadataList,
+      final String privacyUserId) {
+    final ArrayList<PrivateTransactionWithMetadata> privateTransactions = new ArrayList<>();
+    privateStateStorage
+        .getAddDataKey(privacyGroupId)
+        .ifPresent(key -> privateTransactions.addAll(retrieveAddBlob(key.toBase64String())));
+    for (int i = privateTransactions.size(); i < privateTransactionMetadataList.size(); i++) {
+      final PrivateTransactionMetadata privateTransactionMetadata =
+          privateTransactionMetadataList.get(i);
+      final Transaction privateMarkerTransaction =
+          blockchain
+              .getTransactionByHash(privateTransactionMetadata.getPrivateMarkerTransactionHash())
+              .orElseThrow();
+      final ReceiveResponse receiveResponse =
+          retrieveTransaction(
+              privateMarkerTransaction.getPayload().slice(0, 32).toBase64String(), privacyUserId);
+      final BytesValueRLPInput input =
+          new BytesValueRLPInput(
+              Bytes.fromBase64String(new String(receiveResponse.getPayload(), UTF_8)), false);
+      input.enterList();
+      privateTransactions.add(
+          new PrivateTransactionWithMetadata(
+              PrivateTransaction.readFrom(input), privateTransactionMetadata));
+      input.leaveListLenient();
+    }
+
+    return privateTransactions;
+  }
+
+  private List<PrivateTransactionWithMetadata> retrieveAddBlob(final String addDataKey) {
+    final ReceiveResponse addReceiveResponse = enclave.receive(addDataKey);
+    return PrivateTransactionWithMetadata.readListFromPayload(
+        Bytes.wrap(Base64.getDecoder().decode(addReceiveResponse.getPayload())));
+  }
+
+  private Optional<String> buildAndSendAddPayload(
+      final PrivateTransaction privateTransaction,
+      final Bytes32 privacyGroupId,
+      final String privacyUserId) {
+    if (FlexibleUtil.isGroupAdditionTransaction(privateTransaction)) {
+      final List<PrivateTransactionMetadata> privateTransactionMetadataList =
+          buildTransactionMetadataList(privacyGroupId);
+      if (!privateTransactionMetadataList.isEmpty()) {
+        final List<PrivateTransactionWithMetadata> privateTransactionWithMetadataList =
+            retrievePrivateTransactions(
+                privacyGroupId, privateTransactionMetadataList, privacyUserId);
+        final Bytes bytes = serializeAddToGroupPayload(privateTransactionWithMetadataList);
+        final List<String> privateFor =
+            FlexibleUtil.getParticipantsFromParameter(privateTransaction.getPayload());
+        return Optional.of(
+            enclave.send(bytes.toBase64String(), privacyUserId, privateFor).getKey());
+      }
+    }
+
+    return Optional.empty();
+  }
+
+  private String buildCompoundLookupId(
+      final String privateTransactionLookupId,
+      final Optional<String> maybePrivateTransactionLookupId) {
+    return maybePrivateTransactionLookupId.isPresent()
+        ? Bytes.concatenate(
+                Bytes.fromBase64String(privateTransactionLookupId),
+                Bytes.fromBase64String(maybePrivateTransactionLookupId.get()))
+            .toBase64String()
+        : privateTransactionLookupId;
+  }
+
+  private Bytes serializeAddToGroupPayload(
+      final List<PrivateTransactionWithMetadata> privateTransactionWithMetadataList) {
+
+    final BytesValueRLPOutput rlpOutput = new BytesValueRLPOutput();
+    rlpOutput.startList();
+    privateTransactionWithMetadataList.forEach(
+        privateTransactionWithMetadata -> privateTransactionWithMetadata.writeTo(rlpOutput));
+    rlpOutput.endList();
+
+    return rlpOutput.encoded();
+  }
+
+  private SendResponse sendRequest(
+      final PrivateTransaction privateTransaction, final Optional<PrivacyGroup> maybePrivacyGroup) {
+    final BytesValueRLPOutput rlpOutput = new BytesValueRLPOutput();
+
+    final PrivacyGroup privacyGroup = maybePrivacyGroup.orElseThrow();
+    final Optional<TransactionProcessingResult> version =
+        privateTransactionSimulator.process(
+            privateTransaction.getPrivacyGroupId().orElseThrow().toBase64String(),
+            buildCallParams(GET_VERSION_METHOD_SIGNATURE));
+    new VersionedPrivateTransaction(privateTransaction, version).writeTo(rlpOutput);
+    final List<String> flexiblePrivateFor = privacyGroup.getMembers();
+    return enclave.send(
+        rlpOutput.encoded().toBase64String(),
+        privateTransaction.getPrivateFrom().toBase64String(),
+        flexiblePrivateFor);
+  }
+
+  CallParameter buildCallParams(final Bytes methodCall) {
+    return new CallParameter(
+        Address.ZERO, FLEXIBLE_PRIVACY_PROXY, 3000000, Wei.of(1000), Wei.ZERO, methodCall);
+  }
+
+  ReceiveResponse retrieveTransaction(final String enclaveKey, final String privacyUserId) {
+    return enclave.receive(enclaveKey, privacyUserId);
+  }
+
+  @VisibleForTesting
+  public void setFlexiblePrivacyGroupContract(
+      final FlexiblePrivacyGroupContract flexiblePrivacyGroupContract) {
+    this.flexiblePrivacyGroupContract = flexiblePrivacyGroupContract;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/FlexiblePrivacyGroupContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/FlexiblePrivacyGroupContract.java
new file mode 100644
index 00000000000..6a1ce56f70a
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/FlexiblePrivacyGroupContract.java
@@ -0,0 +1,232 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.privacy;
+
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY_PROXY;
+import static org.hyperledger.besu.ethereum.privacy.group.FlexibleGroupManagement.CAN_EXECUTE_METHOD_SIGNATURE;
+import static org.hyperledger.besu.ethereum.privacy.group.FlexibleGroupManagement.GET_PARTICIPANTS_METHOD_SIGNATURE;
+import static org.hyperledger.besu.ethereum.privacy.group.FlexibleGroupManagement.GET_VERSION_METHOD_SIGNATURE;
+
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.enclave.types.PrivacyGroup;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
+import org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils;
+import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.ethereum.transaction.CallParameter;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+import org.hyperledger.besu.plugin.data.Restriction;
+
+import java.util.Optional;
+
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+/*
+ This class is an abstraction on top of the privacy group management smart contract.
+
+ It is possible to use it in two different ways that carry different
+ lifetime expectations and call semantics:
+
+ 1. When constructed using `FlexiblePrivacyGroupContract(PrivateTransactionSimulator)`
+    the object is expected to be long-lived. Methods can be supplied
+    with block height or block hash parameters to select which block's
+    state is queried.
+
+ 2. When using the alternative constructor, no height or hash
+    parameter must be supplied to subsequent method calls. All methods
+    operate on the state specified by the given MessageFrame. Only
+    when constructed this way, the class can be used to query state
+    that is not on a block boundary. Used this way, the object's lifetime is intended to be short.
+*/
+public class FlexiblePrivacyGroupContract {
+
+  @FunctionalInterface
+  public interface TransactionSimulator {
+    Optional<TransactionProcessingResult> simulate(
+        final String privacyGroupId,
+        final Bytes callData,
+        final Optional<Hash> blockHash,
+        final Optional<Long> blockNumber);
+  }
+
+  final TransactionSimulator transactionSimulator;
+
+  public FlexiblePrivacyGroupContract(
+      final PrivateTransactionSimulator privateTransactionSimulator) {
+    transactionSimulator =
+        (privacyGroupId, callData, blockHash, blockNumber) -> {
+          final CallParameter callParameter = buildCallParams(callData);
+          if (blockHash.isPresent()) {
+            return privateTransactionSimulator.process(
+                privacyGroupId, callParameter, blockHash.get());
+          } else if (blockNumber.isPresent()) {
+            return privateTransactionSimulator.process(
+                privacyGroupId, callParameter, blockNumber.get());
+          } else {
+            return privateTransactionSimulator.process(privacyGroupId, callParameter);
+          }
+        };
+  }
+
+  public FlexiblePrivacyGroupContract(
+      final MessageFrame messageFrame,
+      final ProcessableBlockHeader currentBlockHeader,
+      final MutableWorldState disposablePrivateState,
+      final WorldUpdater privateWorldStateUpdater,
+      final WorldStateArchive privateWorldStateArchive,
+      final PrivateTransactionProcessor privateTransactionProcessor) {
+    transactionSimulator =
+        (base64privacyGroupId, callData, blockHash, blockNumber) -> {
+          assert !blockHash.isPresent();
+          assert !blockNumber.isPresent();
+
+          final Bytes privacyGroupId = Bytes.fromBase64String(base64privacyGroupId);
+          final MutableWorldState localMutableState =
+              privateWorldStateArchive.getMutable(disposablePrivateState.rootHash(), null).get();
+          final WorldUpdater updater = localMutableState.updater();
+          final PrivateTransaction privateTransaction =
+              buildTransaction(privacyGroupId, privateWorldStateUpdater, callData);
+
+          return Optional.of(
+              privateTransactionProcessor.processTransaction(
+                  messageFrame.getWorldUpdater(),
+                  updater,
+                  currentBlockHeader,
+                  messageFrame.getContextVariable(PrivateStateUtils.KEY_TRANSACTION_HASH),
+                  privateTransaction,
+                  messageFrame.getMiningBeneficiary(),
+                  OperationTracer.NO_TRACING,
+                  messageFrame.getBlockHashLookup(),
+                  privacyGroupId));
+        };
+  }
+
+  public Optional<PrivacyGroup> getPrivacyGroupById(final String privacyGroupId) {
+    return getPrivacyGroup(privacyGroupId, Optional.empty(), Optional.empty());
+  }
+
+  public Optional<PrivacyGroup> getPrivacyGroupByIdAndBlockNumber(
+      final String privacyGroupId, final Optional<Long> blockNumber) {
+    return getPrivacyGroup(privacyGroupId, Optional.empty(), blockNumber);
+  }
+
+  public Optional<PrivacyGroup> getPrivacyGroupByIdAndBlockHash(
+      final String privacyGroupId, final Optional<Hash> blockHash) {
+    return getPrivacyGroup(privacyGroupId, blockHash, Optional.empty());
+  }
+
+  private Optional<PrivacyGroup> getPrivacyGroup(
+      final String privacyGroupId,
+      final Optional<Hash> blockHash,
+      final Optional<Long> blockNumber) {
+
+    final Optional<TransactionProcessingResult> result =
+        transactionSimulator.simulate(
+            privacyGroupId, GET_PARTICIPANTS_METHOD_SIGNATURE, blockHash, blockNumber);
+    return readPrivacyGroupFromResult(privacyGroupId, result);
+  }
+
+  private Optional<PrivacyGroup> readPrivacyGroupFromResult(
+      final String privacyGroupId, final Optional<TransactionProcessingResult> result) {
+    if (result.isEmpty()) {
+      return Optional.empty();
+    }
+
+    if (!result.get().isSuccessful()) {
+      return Optional.empty();
+    }
+
+    final RLPInput rlpInput = RLP.input(result.get().getOutput());
+    if (rlpInput.nextSize() > 0) {
+      final PrivacyGroup privacyGroup =
+          new PrivacyGroup(
+              privacyGroupId,
+              PrivacyGroup.Type.FLEXIBLE,
+              "",
+              "",
+              FlexibleUtil.decodeList(rlpInput.raw()));
+      return Optional.of(privacyGroup);
+    } else {
+      return Optional.empty();
+    }
+  }
+
+  public Optional<Bytes32> getVersion(final String privacyGroupId, final Optional<Hash> blockHash) {
+    final Optional<TransactionProcessingResult> result =
+        transactionSimulator.simulate(
+            privacyGroupId, GET_VERSION_METHOD_SIGNATURE, blockHash, Optional.empty());
+    return result.map(TransactionProcessingResult::getOutput).map(Bytes32::wrap);
+  }
+
+  public Optional<Bytes32> getCanExecute(
+      final String privacyGroupId, final Optional<Hash> blockHash) {
+    final Optional<TransactionProcessingResult> result =
+        transactionSimulator.simulate(
+            privacyGroupId, CAN_EXECUTE_METHOD_SIGNATURE, blockHash, Optional.empty());
+    return result.map(TransactionProcessingResult::getOutput).map(Bytes32::wrap);
+  }
+
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+
+  // Dummy signature for transactions to not fail being processed.
+  private static final SECPSignature FAKE_SIGNATURE =
+      SIGNATURE_ALGORITHM
+          .get()
+          .createSignature(
+              SIGNATURE_ALGORITHM.get().getHalfCurveOrder(),
+              SIGNATURE_ALGORITHM.get().getHalfCurveOrder(),
+              (byte) 0);
+
+  private PrivateTransaction buildTransaction(
+      final Bytes privacyGroupId,
+      final WorldUpdater privateWorldStateUpdater,
+      final Bytes payload) {
+    return PrivateTransaction.builder()
+        .privateFrom(Bytes.EMPTY)
+        .privacyGroupId(privacyGroupId)
+        .restriction(Restriction.RESTRICTED)
+        .nonce(
+            privateWorldStateUpdater.getAccount(Address.ZERO) != null
+                ? privateWorldStateUpdater.getAccount(Address.ZERO).getNonce()
+                : 0)
+        .gasPrice(Wei.of(1000))
+        .gasLimit(3000000)
+        .to(FLEXIBLE_PRIVACY_PROXY)
+        .sender(Address.ZERO)
+        .value(Wei.ZERO)
+        .payload(payload)
+        .signature(FAKE_SIGNATURE)
+        .build();
+  }
+
+  private CallParameter buildCallParams(final Bytes methodCall) {
+    return new CallParameter(
+        Address.ZERO, FLEXIBLE_PRIVACY_PROXY, 3000000, Wei.of(1000), Wei.ZERO, methodCall);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/FlexibleUtil.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/FlexibleUtil.java
new file mode 100644
index 00000000000..1425fdb114e
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/FlexibleUtil.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.privacy;
+
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY_PROXY;
+import static org.hyperledger.besu.ethereum.privacy.group.FlexibleGroupManagement.ADD_PARTICIPANTS_METHOD_SIGNATURE;
+
+import org.hyperledger.besu.datatypes.Address;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+
+public class FlexibleUtil {
+
+  private FlexibleUtil() {}
+
+  public static boolean isGroupAdditionTransaction(final PrivateTransaction privateTransaction) {
+    final Optional<Address> to = privateTransaction.getTo();
+    return to.isPresent()
+        && to.get().equals(FLEXIBLE_PRIVACY_PROXY)
+        && privateTransaction
+            .getPayload()
+            .toHexString()
+            .startsWith(ADD_PARTICIPANTS_METHOD_SIGNATURE.toHexString());
+  }
+
+  public static List<String> getParticipantsFromParameter(final Bytes input) {
+    if (input.size() < 68) return new ArrayList<>();
+    final int numberOfParticipants = UInt256.fromBytes(input.slice(4 + 32, 32)).toInt();
+
+    // Method selector + offset +  number of participants + (offset * number of participants)
+    final Bytes encodedParticipants = input.slice(4 + 32 + 32 + (32 * numberOfParticipants));
+
+    return getParticipantsFromEncodedParticipants(encodedParticipants, numberOfParticipants);
+  }
+
+  public static List<String> decodeList(final Bytes rlpEncodedList) {
+    if (rlpEncodedList.size() < 64) return new ArrayList<>();
+
+    // Bytes uses a byte[] for the content which can only have up to Integer.MAX_VALUE-5 elements
+    final int lengthOfList =
+        UInt256.fromBytes(rlpEncodedList.slice(32, 32)).toInt(); // length of list
+
+    final Bytes encodedParticipants = rlpEncodedList.slice(32 + 32 + (32 * lengthOfList));
+
+    return getParticipantsFromEncodedParticipants(encodedParticipants, lengthOfList);
+  }
+
+  private static List<String> getParticipantsFromEncodedParticipants(
+      final Bytes encodedParticipants, final int numberOfParticipants) {
+    final List<String> participants = new ArrayList<>();
+
+    if (numberOfParticipants == 0) return participants;
+    // The participant value is enclosed in the closest multiple of 32 (for instance, 91 would be
+    // enclosed in 96)
+    final int sliceSize = encodedParticipants.size() / numberOfParticipants;
+
+    // All the participants have to have the same size, so it is enough to check the first one
+    final int participantSize = UInt256.fromBytes(encodedParticipants.slice(0, 32)).toInt();
+
+    // Each slice should have a size of 32 bytes (because of the size value of each participant) +
+    // the actual participant wrapped in a 32 byte long multiple (96 for 91)
+    final int mod32ParticipantsSize = participantSize % 32;
+    final int participantSizeBytes32Wrapped =
+        mod32ParticipantsSize != 0
+            ? (32 - mod32ParticipantsSize) + participantSize
+            : participantSize;
+    if (sliceSize != 32 + participantSizeBytes32Wrapped) return participants;
+
+    for (int i = 0; i <= encodedParticipants.size() - sliceSize; i += sliceSize) {
+      // The size of each participant (as of now, either 32 or 91 because of the enclave public key
+      // size for NaCl and EC) is stored in 32 bytes
+      participants.add(encodedParticipants.slice(i + 32, participantSize).toBase64String());
+    }
+
+    return participants;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/MultiTenancyPrivacyController.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/MultiTenancyPrivacyController.java
index 1b11ef773fe..192c376a0e5 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/MultiTenancyPrivacyController.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/MultiTenancyPrivacyController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,59 +14,25 @@
  */
 package org.hyperledger.besu.ethereum.privacy;
 
-import org.hyperledger.besu.enclave.Enclave;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.enclave.types.PrivacyGroup;
-import org.hyperledger.besu.enclave.types.ReceiveResponse;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.transaction.CallParameter;
 import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
 
-import java.math.BigInteger;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
-import com.google.common.annotations.VisibleForTesting;
 import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
 
 public class MultiTenancyPrivacyController implements PrivacyController {
 
   private final PrivacyController privacyController;
-  private final Enclave enclave;
-  private final PrivateTransactionValidator privateTransactionValidator;
-  private final Optional<OnchainPrivacyGroupContract> onchainPrivacyGroupContract;
 
-  public MultiTenancyPrivacyController(
-      final PrivacyController privacyController,
-      final Optional<BigInteger> chainId,
-      final Enclave enclave,
-      final boolean onchainPrivacyGroupsEnabled) {
+  public MultiTenancyPrivacyController(final PrivacyController privacyController) {
     this.privacyController = privacyController;
-    this.enclave = enclave;
-    this.onchainPrivacyGroupContract =
-        onchainPrivacyGroupsEnabled
-            ? Optional.of(
-                new OnchainPrivacyGroupContract(privacyController.getTransactionSimulator()))
-            : Optional.empty();
-    privateTransactionValidator = new PrivateTransactionValidator(chainId);
-  }
-
-  @VisibleForTesting
-  MultiTenancyPrivacyController(
-      final PrivacyController privacyController,
-      final Optional<BigInteger> chainId,
-      final Enclave enclave,
-      final Optional<OnchainPrivacyGroupContract> onchainPrivacyGroupContract) {
-    this.privacyController = privacyController;
-    this.enclave = enclave;
-    this.onchainPrivacyGroupContract = onchainPrivacyGroupContract;
-    privateTransactionValidator = new PrivateTransactionValidator(chainId);
   }
 
   @Override
@@ -76,25 +42,17 @@ public Optional<ExecutedPrivateTransaction> findPrivateTransactionByPmtHash(
   }
 
   @Override
-  public String sendTransaction(
+  public String createPrivateMarkerTransactionPayload(
       final PrivateTransaction privateTransaction,
-      final String enclavePublicKey,
+      final String privacyUserId,
       final Optional<PrivacyGroup> maybePrivacyGroup) {
-    verifyPrivateFromMatchesEnclavePublicKey(
-        privateTransaction.getPrivateFrom().toBase64String(), enclavePublicKey);
-    if (privateTransaction.getPrivacyGroupId().isPresent()) {
-      verifyPrivacyGroupContainsEnclavePublicKey(
-          privateTransaction.getPrivacyGroupId().get().toBase64String(), enclavePublicKey);
+    final Optional<Bytes> maybePrivacyGroupId = privateTransaction.getPrivacyGroupId();
+    if (maybePrivacyGroupId.isPresent()) {
+      verifyPrivacyGroupContainsPrivacyUserId(
+          maybePrivacyGroupId.get().toBase64String(), privacyUserId);
     }
-    return privacyController.sendTransaction(
-        privateTransaction, enclavePublicKey, maybePrivacyGroup);
-  }
-
-  @Override
-  public ReceiveResponse retrieveTransaction(
-      final String enclaveKey, final String enclavePublicKey) {
-    // no validation necessary as the enclave receive only returns data for the enclave public key
-    return privacyController.retrieveTransaction(enclaveKey, enclavePublicKey);
+    return privacyController.createPrivateMarkerTransactionPayload(
+        privateTransaction, privacyUserId, maybePrivacyGroup);
   }
 
   @Override
@@ -102,115 +60,64 @@ public PrivacyGroup createPrivacyGroup(
       final List<String> addresses,
       final String name,
       final String description,
-      final String enclavePublicKey) {
-    // no validation necessary as the enclave createPrivacyGroup fails if the addresses don't
-    // include the from (enclavePublicKey)
-    return privacyController.createPrivacyGroup(addresses, name, description, enclavePublicKey);
-  }
-
-  @Override
-  public String deletePrivacyGroup(final String privacyGroupId, final String enclavePublicKey) {
-    verifyPrivacyGroupContainsEnclavePublicKey(privacyGroupId, enclavePublicKey);
-    return privacyController.deletePrivacyGroup(privacyGroupId, enclavePublicKey);
-  }
-
-  @Override
-  public PrivacyGroup[] findOffChainPrivacyGroupByMembers(
-      final List<String> addresses, final String enclavePublicKey) {
-    if (!addresses.contains(enclavePublicKey)) {
+      final String privacyUserId) {
+    if (!addresses.contains(privacyUserId)) {
       throw new MultiTenancyValidationException(
           "Privacy group addresses must contain the enclave public key");
     }
-    final PrivacyGroup[] resultantGroups =
-        privacyController.findOffChainPrivacyGroupByMembers(addresses, enclavePublicKey);
-    return Arrays.stream(resultantGroups)
-        .filter(g -> g.getMembers().contains(enclavePublicKey))
-        .toArray(PrivacyGroup[]::new);
+    return privacyController.createPrivacyGroup(addresses, name, description, privacyUserId);
   }
 
   @Override
-  public Transaction createPrivacyMarkerTransaction(
-      final String privateTransactionLookupId, final PrivateTransaction privateTransaction) {
-    return privacyController.createPrivacyMarkerTransaction(
-        privateTransactionLookupId, privateTransaction);
+  public String deletePrivacyGroup(final String privacyGroupId, final String privacyUserId) {
+    verifyPrivacyGroupContainsPrivacyUserId(privacyGroupId, privacyUserId);
+    return privacyController.deletePrivacyGroup(privacyGroupId, privacyUserId);
   }
 
   @Override
-  public Transaction createPrivacyMarkerTransaction(
-      final String privateTransactionLookupId,
-      final PrivateTransaction privateTransaction,
-      final Address privacyPrecompileAddress) {
-    return privacyController.createPrivacyMarkerTransaction(
-        privateTransactionLookupId, privateTransaction, privacyPrecompileAddress);
+  public PrivacyGroup[] findPrivacyGroupByMembers(
+      final List<String> addresses, final String privacyUserId) {
+    if (!addresses.contains(privacyUserId)) {
+      throw new MultiTenancyValidationException(
+          "Privacy group addresses must contain the enclave public key");
+    }
+    return privacyController.findPrivacyGroupByMembers(addresses, privacyUserId);
   }
 
   @Override
   public ValidationResult<TransactionInvalidReason> validatePrivateTransaction(
-      final PrivateTransaction privateTransaction, final String enclavePublicKey) {
-    final String privacyGroupId = privateTransaction.determinePrivacyGroupId().toBase64String();
-    verifyPrivacyGroupContainsEnclavePublicKey(privacyGroupId, enclavePublicKey);
-    return privateTransactionValidator.validate(
-        privateTransaction,
-        determineBesuNonce(privateTransaction.getSender(), privacyGroupId, enclavePublicKey),
-        true);
-  }
+      final PrivateTransaction privateTransaction, final String privacyUserId) {
 
-  @Override
-  public long determineEeaNonce(
-      final String privateFrom,
-      final String[] privateFor,
-      final Address address,
-      final String enclavePublicKey) {
-    verifyPrivateFromMatchesEnclavePublicKey(privateFrom, enclavePublicKey);
-    return privacyController.determineEeaNonce(privateFrom, privateFor, address, enclavePublicKey);
+    final String privacyGroupId = privateTransaction.determinePrivacyGroupId().toBase64String();
+    verifyPrivacyGroupContainsPrivacyUserId(privacyGroupId, privacyUserId);
+    return privacyController.validatePrivateTransaction(privateTransaction, privacyUserId);
   }
 
   @Override
-  public long determineBesuNonce(
-      final Address sender, final String privacyGroupId, final String enclavePublicKey) {
-    verifyPrivacyGroupContainsEnclavePublicKey(privacyGroupId, enclavePublicKey);
-    return privacyController.determineBesuNonce(sender, privacyGroupId, enclavePublicKey);
+  public long determineNonce(
+      final Address sender, final String privacyGroupId, final String privacyUserId) {
+    verifyPrivacyGroupContainsPrivacyUserId(privacyGroupId, privacyUserId);
+    return privacyController.determineNonce(sender, privacyGroupId, privacyUserId);
   }
 
   @Override
   public Optional<TransactionProcessingResult> simulatePrivateTransaction(
       final String privacyGroupId,
-      final String enclavePublicKey,
+      final String privacyUserId,
       final CallParameter callParams,
       final long blockNumber) {
-    verifyPrivacyGroupContainsEnclavePublicKey(
-        privacyGroupId, enclavePublicKey, Optional.of(blockNumber));
+    verifyPrivacyGroupContainsPrivacyUserId(
+        privacyGroupId, privacyUserId, Optional.of(blockNumber));
     return privacyController.simulatePrivateTransaction(
-        privacyGroupId, enclavePublicKey, callParams, blockNumber);
-  }
-
-  @Override
-  public Optional<String> buildAndSendAddPayload(
-      final PrivateTransaction privateTransaction,
-      final Bytes32 privacyGroupId,
-      final String enclaveKey) {
-    verifyPrivateFromMatchesEnclavePublicKey(
-        privateTransaction.getPrivateFrom().toBase64String(), enclaveKey);
-    verifyPrivacyGroupContainsEnclavePublicKey(
-        privateTransaction.getPrivacyGroupId().get().toBase64String(), enclaveKey);
-    return privacyController.buildAndSendAddPayload(privateTransaction, privacyGroupId, enclaveKey);
-  }
-
-  @Override
-  public Optional<PrivacyGroup> findOffChainPrivacyGroupByGroupId(
-      final String privacyGroupId, final String enclavePublicKey) {
-    final Optional<PrivacyGroup> maybePrivacyGroup =
-        privacyController.findOffChainPrivacyGroupByGroupId(privacyGroupId, enclavePublicKey);
-    checkGroupParticipation(maybePrivacyGroup, enclavePublicKey);
-    return maybePrivacyGroup;
+        privacyGroupId, privacyUserId, callParams, blockNumber);
   }
 
   @Override
   public Optional<PrivacyGroup> findPrivacyGroupByGroupId(
-      final String privacyGroupId, final String enclaveKey) {
+      final String privacyGroupId, final String privacyUserId) {
     final Optional<PrivacyGroup> maybePrivacyGroup =
-        privacyController.findPrivacyGroupByGroupId(privacyGroupId, enclaveKey);
-    checkGroupParticipation(maybePrivacyGroup, enclaveKey);
+        privacyController.findPrivacyGroupByGroupId(privacyGroupId, privacyUserId);
+    checkGroupParticipation(maybePrivacyGroup, privacyUserId);
     return maybePrivacyGroup;
   }
 
@@ -223,121 +130,36 @@ private void checkGroupParticipation(
     }
   }
 
-  @Override
-  public List<PrivacyGroup> findOnChainPrivacyGroupByMembers(
-      final List<String> addresses, final String enclavePublicKey) {
-    if (!addresses.contains(enclavePublicKey)) {
-      throw new MultiTenancyValidationException(
-          "Privacy group addresses must contain the enclave public key");
-    }
-    final List<PrivacyGroup> resultantGroups =
-        privacyController.findOnChainPrivacyGroupByMembers(addresses, enclavePublicKey);
-    return resultantGroups.stream()
-        .filter(g -> g.getMembers().contains(enclavePublicKey))
-        .collect(Collectors.toList());
-  }
-
-  @Override
-  public List<PrivateTransactionWithMetadata> retrieveAddBlob(final String addDataKey) {
-    return privacyController.retrieveAddBlob(addDataKey);
-  }
-
-  @Override
-  public boolean isGroupAdditionTransaction(final PrivateTransaction privateTransaction) {
-    return privacyController.isGroupAdditionTransaction(privateTransaction);
-  }
-
   @Override
   public Optional<Bytes> getContractCode(
       final String privacyGroupId,
       final Address contractAddress,
       final Hash blockHash,
-      final String enclavePublicKey) {
-    verifyPrivacyGroupContainsEnclavePublicKey(privacyGroupId, enclavePublicKey);
+      final String privacyUserId) {
+    verifyPrivacyGroupContainsPrivacyUserId(privacyGroupId, privacyUserId);
     return privacyController.getContractCode(
-        privacyGroupId, contractAddress, blockHash, enclavePublicKey);
+        privacyGroupId, contractAddress, blockHash, privacyUserId);
   }
 
   @Override
-  public Optional<PrivacyGroup> findOnChainPrivacyGroupAndAddNewMembers(
-      final Bytes privacyGroupId,
-      final String enclavePublicKey,
-      final PrivateTransaction privateTransaction) {
-    final Optional<PrivacyGroup> maybePrivacyGroup =
-        privacyController.findOnChainPrivacyGroupAndAddNewMembers(
-            privacyGroupId, enclavePublicKey, privateTransaction);
-    // The check that the enclavePublicKey is a member (if the group already exists) is done in the
-    // DefaultPrivacyController.
-    return maybePrivacyGroup;
-  }
-
-  private void verifyPrivateFromMatchesEnclavePublicKey(
-      final String privateFrom, final String enclavePublicKey) {
-    if (!privateFrom.equals(enclavePublicKey)) {
-      throw new MultiTenancyValidationException(
-          "Transaction privateFrom must match enclave public key");
-    }
+  public void verifyPrivacyGroupContainsPrivacyUserId(
+      final String privacyGroupId, final String privacyUserId) {
+    privacyController.verifyPrivacyGroupContainsPrivacyUserId(privacyGroupId, privacyUserId);
   }
 
   @Override
-  public void verifyPrivacyGroupContainsEnclavePublicKey(
-      final String privacyGroupId, final String enclavePublicKey) {
-    verifyPrivacyGroupContainsEnclavePublicKey(privacyGroupId, enclavePublicKey, Optional.empty());
-  }
-
-  @Override
-  public void verifyPrivacyGroupContainsEnclavePublicKey(
-      final String privacyGroupId, final String enclavePublicKey, final Optional<Long> blockNumber)
+  public void verifyPrivacyGroupContainsPrivacyUserId(
+      final String privacyGroupId, final String privacyUserId, final Optional<Long> blockNumber)
       throws MultiTenancyValidationException {
-    onchainPrivacyGroupContract.ifPresentOrElse(
-        (contract) -> {
-          verifyOnchainPrivacyGroupContainsMember(
-              contract, privacyGroupId, enclavePublicKey, blockNumber);
-        },
-        () -> {
-          verifyOffchainPrivacyGroupContainsMember(privacyGroupId, enclavePublicKey);
-        });
-  }
-
-  private void verifyOffchainPrivacyGroupContainsMember(
-      final String privacyGroupId, final String enclavePublicKey) {
-    final PrivacyGroup offchainPrivacyGroup = enclave.retrievePrivacyGroup(privacyGroupId);
-    if (!offchainPrivacyGroup.getMembers().contains(enclavePublicKey)) {
-      throw new MultiTenancyValidationException(
-          "Privacy group must contain the enclave public key");
-    }
-  }
-
-  private void verifyOnchainPrivacyGroupContainsMember(
-      final OnchainPrivacyGroupContract contract,
-      final String privacyGroupId,
-      final String enclavePublicKey,
-      final Optional<Long> blockNumber) {
-    final Optional<PrivacyGroup> maybePrivacyGroup =
-        contract.getPrivacyGroupByIdAndBlockNumber(privacyGroupId, blockNumber);
-    // IF the group exists, check member
-    // ELSE member is valid if the group doesn't exist yet - this is normal for onchain privacy
-    // groups
-    maybePrivacyGroup.ifPresent(
-        (group) -> {
-          if (!group.getMembers().contains(enclavePublicKey)) {
-            throw new MultiTenancyValidationException(
-                "Privacy group must contain the enclave public key");
-          }
-        });
-  }
-
-  @Override
-  public PrivateTransactionSimulator getTransactionSimulator() {
-    return privacyController.getTransactionSimulator();
+    privacyController.verifyPrivacyGroupContainsPrivacyUserId(
+        privacyGroupId, privacyUserId, blockNumber);
   }
 
   @Override
   public Optional<Hash> getStateRootByBlockNumber(
-      final String privacyGroupId, final String enclavePublicKey, final long blockNumber) {
-    verifyPrivacyGroupContainsEnclavePublicKey(
-        privacyGroupId, enclavePublicKey, Optional.of(blockNumber));
-    return privacyController.getStateRootByBlockNumber(
-        privacyGroupId, enclavePublicKey, blockNumber);
+      final String privacyGroupId, final String privacyUserId, final long blockNumber) {
+    verifyPrivacyGroupContainsPrivacyUserId(
+        privacyGroupId, privacyUserId, Optional.of(blockNumber));
+    return privacyController.getStateRootByBlockNumber(privacyGroupId, privacyUserId, blockNumber);
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/OnchainPrivacyGroupContract.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/OnchainPrivacyGroupContract.java
deleted file mode 100644
index dbd7a172377..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/OnchainPrivacyGroupContract.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.privacy;
-
-import static org.hyperledger.besu.ethereum.privacy.group.OnChainGroupManagement.GET_PARTICIPANTS_METHOD_SIGNATURE;
-import static org.hyperledger.besu.ethereum.privacy.group.OnChainGroupManagement.GET_VERSION_METHOD_SIGNATURE;
-
-import org.hyperledger.besu.enclave.types.PrivacyGroup;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
-import org.hyperledger.besu.ethereum.rlp.RLP;
-import org.hyperledger.besu.ethereum.rlp.RLPInput;
-import org.hyperledger.besu.ethereum.transaction.CallParameter;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-/*
- This contract is an abstraction on top of the privacy group management smart contract.
- TODO: there are a few places on OnChainPrivacyPrecompiledContract that we could use this class instead of a transaction simulator there.
-*/
-public class OnchainPrivacyGroupContract {
-
-  private final PrivateTransactionSimulator privateTransactionSimulator;
-
-  public OnchainPrivacyGroupContract(
-      final PrivateTransactionSimulator privateTransactionSimulator) {
-    this.privateTransactionSimulator = privateTransactionSimulator;
-  }
-
-  public Optional<PrivacyGroup> getPrivacyGroupById(final String privacyGroupId) {
-    return getPrivacyGroup(privacyGroupId, Optional.empty(), Optional.empty());
-  }
-
-  public Optional<PrivacyGroup> getPrivacyGroupByIdAndBlockNumber(
-      final String privacyGroupId, final Optional<Long> blockNumber) {
-    return getPrivacyGroup(privacyGroupId, Optional.empty(), blockNumber);
-  }
-
-  public Optional<PrivacyGroup> getPrivacyGroupByIdAndBlockHash(
-      final String privacyGroupId, final Optional<Hash> blockHash) {
-    return getPrivacyGroup(privacyGroupId, blockHash, Optional.empty());
-  }
-
-  private Optional<PrivacyGroup> getPrivacyGroup(
-      final String privacyGroupId,
-      final Optional<Hash> blockHash,
-      final Optional<Long> blockNumber) {
-
-    final CallParameter callParams = buildCallParams(GET_PARTICIPANTS_METHOD_SIGNATURE);
-    final Optional<TransactionProcessingResult> result;
-
-    if (blockHash.isPresent()) {
-      result = privateTransactionSimulator.process(privacyGroupId, callParams, blockHash.get());
-    } else if (blockNumber.isPresent()) {
-      result = privateTransactionSimulator.process(privacyGroupId, callParams, blockNumber.get());
-    } else {
-      result = privateTransactionSimulator.process(privacyGroupId, callParams);
-    }
-    return readPrivacyGroupFromResult(privacyGroupId, result);
-  }
-
-  private Optional<PrivacyGroup> readPrivacyGroupFromResult(
-      final String privacyGroupId, final Optional<TransactionProcessingResult> result) {
-    if (result.isEmpty()) {
-      return Optional.empty();
-    }
-
-    if (!result.get().isSuccessful()) {
-      return Optional.empty();
-    }
-
-    final RLPInput rlpInput = RLP.input(result.get().getOutput());
-    if (rlpInput.nextSize() > 0) {
-      final PrivacyGroup privacyGroup =
-          new PrivacyGroup(
-              privacyGroupId, PrivacyGroup.Type.ONCHAIN, "", "", decodeList(rlpInput.raw()));
-      return Optional.of(privacyGroup);
-    } else {
-      return Optional.empty();
-    }
-  }
-
-  public Optional<Bytes32> getVersion(final String privacyGroupId, final Optional<Hash> blockHash) {
-    final CallParameter callParams = buildCallParams(GET_VERSION_METHOD_SIGNATURE);
-    final Optional<TransactionProcessingResult> result;
-
-    if (blockHash.isPresent()) {
-      result = privateTransactionSimulator.process(privacyGroupId, callParams, blockHash.get());
-    } else {
-      result = privateTransactionSimulator.process(privacyGroupId, callParams);
-    }
-
-    return result.map(TransactionProcessingResult::getOutput).map(Bytes32::wrap);
-  }
-
-  private CallParameter buildCallParams(final Bytes methodCall) {
-    return new CallParameter(
-        Address.ZERO, Address.ONCHAIN_PRIVACY_PROXY, 3000000, Wei.of(1000), Wei.ZERO, methodCall);
-  }
-
-  private List<String> decodeList(final Bytes rlpEncodedList) {
-    final ArrayList<String> decodedElements = new ArrayList<>();
-    // first 32 bytes is dynamic list offset
-    final UInt256 lengthOfList = UInt256.fromBytes(rlpEncodedList.slice(32, 32)); // length of list
-    for (int i = 0; i < lengthOfList.toLong(); ++i) {
-      decodedElements.add(
-          Bytes.wrap(rlpEncodedList.slice(64 + (32 * i), 32)).toBase64String()); // participant
-    }
-    return decodedElements;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PluginPrivacyController.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PluginPrivacyController.java
new file mode 100644
index 00000000000..22cb76d4503
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PluginPrivacyController.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.privacy;
+
+import static org.hyperledger.besu.ethereum.privacy.PrivateTransaction.readFrom;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.enclave.types.PrivacyGroup;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.chain.TransactionLocation;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.plugin.services.PrivacyPluginService;
+
+import java.math.BigInteger;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+public class PluginPrivacyController extends AbstractPrivacyController {
+
+  private final PrivacyPluginService privacyPluginService;
+
+  public PluginPrivacyController(
+      final Blockchain blockchain,
+      final PrivacyParameters privacyParameters,
+      final Optional<BigInteger> chainId,
+      final PrivateTransactionSimulator privateTransactionSimulator,
+      final PrivateNonceProvider privateNonceProvider,
+      final PrivateWorldStateReader privateWorldStateReader) {
+    super(
+        blockchain,
+        privacyParameters,
+        chainId,
+        privateTransactionSimulator,
+        privateNonceProvider,
+        privateWorldStateReader);
+    this.privacyPluginService = privacyParameters.getPrivacyService();
+  }
+
+  @Override
+  public String createPrivateMarkerTransactionPayload(
+      final PrivateTransaction privateTransaction,
+      final String privacyUserId,
+      final Optional<PrivacyGroup> privacyGroup) {
+
+    return privacyPluginService
+        .getPayloadProvider()
+        .generateMarkerPayload(privateTransaction, privacyUserId)
+        .toBase64String();
+  }
+
+  @Override
+  public Optional<ExecutedPrivateTransaction> findPrivateTransactionByPmtHash(
+      final Hash pmtHash, final String enclaveKey) {
+
+    final Optional<Transaction> transaction = blockchain.getTransactionByHash(pmtHash);
+
+    if (transaction.isEmpty()) {
+      return Optional.empty();
+    }
+
+    final TransactionLocation transactionLocation =
+        blockchain.getTransactionLocation(pmtHash).orElseThrow();
+
+    final BlockHeader blockHeader =
+        blockchain.getBlockHeader(transactionLocation.getBlockHash()).orElseThrow();
+
+    final Optional<org.hyperledger.besu.plugin.data.PrivateTransaction> pluginPrivateTransaction =
+        privacyPluginService
+            .getPayloadProvider()
+            .getPrivateTransactionFromPayload(transaction.get());
+
+    if (pluginPrivateTransaction.isEmpty()) {
+      return Optional.empty();
+    }
+
+    final PrivateTransaction privateTransaction = readFrom(pluginPrivateTransaction.get());
+
+    final String internalPrivacyGroupId =
+        privateTransaction.determinePrivacyGroupId().toBase64String();
+
+    final ExecutedPrivateTransaction executedPrivateTransaction =
+        new ExecutedPrivateTransaction(
+            blockHeader.getHash(),
+            blockHeader.getNumber(),
+            pmtHash,
+            transactionLocation.getTransactionIndex(),
+            internalPrivacyGroupId,
+            privateTransaction);
+
+    return Optional.of(executedPrivateTransaction);
+  }
+
+  @Override
+  public PrivacyGroup createPrivacyGroup(
+      final List<String> addresses,
+      final String name,
+      final String description,
+      final String privacyUserId) {
+    throw new PrivacyConfigurationNotSupportedException(
+        "Method not supported when using PrivacyPlugin");
+  }
+
+  @Override
+  public String deletePrivacyGroup(final String privacyGroupId, final String privacyUserId) {
+    throw new PrivacyConfigurationNotSupportedException(
+        "Method not supported when using PrivacyPlugin");
+  }
+
+  @Override
+  public Optional<PrivacyGroup> findPrivacyGroupByGroupId(
+      final String privacyGroupId, final String privacyUserId) {
+    verifyPrivacyGroupContainsPrivacyUserId(privacyUserId, privacyGroupId);
+
+    return Optional.of(
+        new PrivacyGroup(
+            privacyGroupId,
+            PrivacyGroup.Type.LEGACY,
+            "PrivacyPlugin",
+            "PrivacyPlugin",
+            Collections.emptyList()));
+  }
+
+  @Override
+  public PrivacyGroup[] findPrivacyGroupByMembers(
+      final List<String> asList, final String privacyUserId) {
+    throw new PrivacyConfigurationNotSupportedException(
+        "Method not supported when using PrivacyPlugin");
+  }
+
+  @Override
+  public void verifyPrivacyGroupContainsPrivacyUserId(
+      final String privacyGroupId, final String privacyUserId, final Optional<Long> blockNumber) {
+    if (!privacyPluginService
+        .getPrivacyGroupAuthProvider()
+        .canAccess(privacyGroupId, privacyUserId, blockNumber)) {
+      throw new MultiTenancyValidationException(
+          "Privacy group must contain the enclave public key");
+    }
+  }
+
+  @Override
+  public void verifyPrivacyGroupContainsPrivacyUserId(
+      final String privacyUserId, final String privacyGroupId) {
+    verifyPrivacyGroupContainsPrivacyUserId(privacyUserId, privacyGroupId, Optional.empty());
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivacyConfigurationNotSupportedException.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivacyConfigurationNotSupportedException.java
new file mode 100644
index 00000000000..c52011f4026
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivacyConfigurationNotSupportedException.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.privacy;
+
+public class PrivacyConfigurationNotSupportedException extends RuntimeException {
+  public PrivacyConfigurationNotSupportedException(final String message) {
+    super(message);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivacyController.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivacyController.java
index 3d6b0cb7d38..8f0d3f1270c 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivacyController.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivacyController.java
@@ -14,11 +14,9 @@
  */
 package org.hyperledger.besu.ethereum.privacy;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.enclave.types.PrivacyGroup;
-import org.hyperledger.besu.enclave.types.ReceiveResponse;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.transaction.CallParameter;
@@ -28,83 +26,51 @@
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
 
 public interface PrivacyController {
 
   Optional<ExecutedPrivateTransaction> findPrivateTransactionByPmtHash(
       final Hash pmtHash, final String enclaveKey);
 
-  String sendTransaction(
+  String createPrivateMarkerTransactionPayload(
       PrivateTransaction privateTransaction,
-      String enclavePublicKey,
+      String privacyUserId,
       Optional<PrivacyGroup> privacyGroup);
 
-  ReceiveResponse retrieveTransaction(String enclaveKey, String enclavePublicKey);
-
   PrivacyGroup createPrivacyGroup(
-      List<String> addresses, String name, String description, String enclavePublicKey);
-
-  String deletePrivacyGroup(String privacyGroupId, String enclavePublicKey);
+      List<String> addresses, String name, String description, String privacyUserId);
 
-  PrivacyGroup[] findOffChainPrivacyGroupByMembers(List<String> addresses, String enclavePublicKey);
+  String deletePrivacyGroup(String privacyGroupId, String privacyUserId);
 
-  Transaction createPrivacyMarkerTransaction(
-      String privateTransactionLookupId, PrivateTransaction privateTransaction);
+  PrivacyGroup[] findPrivacyGroupByMembers(List<String> addresses, String privacyUserId);
 
-  Transaction createPrivacyMarkerTransaction(
-      String privateTransactionLookupId,
-      PrivateTransaction privateTransaction,
-      Address privacyPrecompileAddress);
+  Optional<PrivacyGroup> findPrivacyGroupByGroupId(String privacyGroupId, String privacyUserId);
 
   ValidationResult<TransactionInvalidReason> validatePrivateTransaction(
-      PrivateTransaction privateTransaction, String enclavePublicKey);
+      PrivateTransaction privateTransaction, String privacyUserId);
 
-  long determineEeaNonce(
-      String privateFrom, String[] privateFor, Address address, String enclavePublicKey);
-
-  long determineBesuNonce(Address sender, String privacyGroupId, String enclavePublicKey);
+  long determineNonce(Address sender, String privacyGroupId, String privacyUserId);
 
   Optional<TransactionProcessingResult> simulatePrivateTransaction(
       final String privacyGroupId,
-      final String enclavePublicKey,
+      final String privacyUserId,
       final CallParameter callParams,
       final long blockNumber);
 
-  Optional<String> buildAndSendAddPayload(
-      PrivateTransaction privateTransaction, Bytes32 privacyGroupId, String enclaveKey);
-
-  Optional<PrivacyGroup> findOffChainPrivacyGroupByGroupId(
-      String toBase64String, String enclaveKey);
-
-  Optional<PrivacyGroup> findPrivacyGroupByGroupId(
-      final String privacyGroupId, final String enclaveKey);
-
-  List<PrivacyGroup> findOnChainPrivacyGroupByMembers(List<String> asList, String enclaveKey);
-
   Optional<Bytes> getContractCode(
       final String privacyGroupId,
       final Address contractAddress,
       final Hash blockHash,
-      final String enclavePublicKey);
-
-  Optional<PrivacyGroup> findOnChainPrivacyGroupAndAddNewMembers(
-      Bytes privacyGroupId, String enclavePublicKey, final PrivateTransaction privateTransaction);
+      final String privacyUserId);
 
-  List<PrivateTransactionWithMetadata> retrieveAddBlob(String addDataKey);
-
-  boolean isGroupAdditionTransaction(PrivateTransaction privateTransaction);
-
-  void verifyPrivacyGroupContainsEnclavePublicKey(
-      final String privacyGroupId, final String enclavePublicKey)
+  void verifyPrivacyGroupContainsPrivacyUserId(
+      final String privacyGroupId, final String privacyUserId)
       throws MultiTenancyValidationException;
 
-  void verifyPrivacyGroupContainsEnclavePublicKey(
-      final String privacyGroupId, final String enclavePublicKey, final Optional<Long> blockNumber)
+  void verifyPrivacyGroupContainsPrivacyUserId(
+      final String privacyGroupId, final String privacyUserId, final Optional<Long> blockNumber)
       throws MultiTenancyValidationException;
 
-  PrivateTransactionSimulator getTransactionSimulator();
-
   Optional<Hash> getStateRootByBlockNumber(
-      final String privacyGroupId, final String enclavePublicKey, final long blockNumber);
+      final String privacyGroupId, final String privacyUserId, final long blockNumber);
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivacyGroupUtil.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivacyGroupUtil.java
index 1e354613dc1..e4b537161e9 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivacyGroupUtil.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivacyGroupUtil.java
@@ -15,14 +15,12 @@
 package org.hyperledger.besu.ethereum.privacy;
 
 import org.hyperledger.besu.crypto.Hash;
-import org.hyperledger.besu.enclave.types.PrivacyGroup;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.apache.tuweni.bytes.Bytes;
@@ -30,18 +28,19 @@
 
 public class PrivacyGroupUtil {
 
-  // Both Orion and Besu have code to generate the privacyGroupId for LEGACY AKA EEA groups.
-  // Functionality relies on them both generating the same value.
-  // Orion code is here:
-  // https://github.com/ConsenSys/orion/blob/05759341ec1a216e6837df91e421207c8294ad2a/src/main/java/net/consensys/orion/enclave/sodium/SodiumEnclave.java
+  /*
+   * Tessera and Besu both have code to generate the privacyGroupId for LEGACY AKA EEA groups.
+   * Functionality relies on them both generating the same value. Tessera code is here:
+   * https://github.com/ConsenSys/tessera/blob/c756e1bf2d1c7a7806cf3cb5b31361f51ad705f1/enclave/enclave-api/src/main/java/com/quorum/tessera/enclave/PrivacyGroupUtil.java
+   */
   public static Bytes32 calculateEeaPrivacyGroupId(
       final Bytes privateFrom, final List<Bytes> privateFor) {
-    final List<Bytes> privacyGroupIds = new ArrayList<>();
-    privacyGroupIds.add(privateFrom);
-    privacyGroupIds.addAll(privateFor);
+    final List<Bytes> privacyGroupMembers = new ArrayList<>();
+    privacyGroupMembers.add(privateFrom);
+    privacyGroupMembers.addAll(privateFor);
 
     final List<byte[]> sortedPublicEnclaveKeys =
-        privacyGroupIds.stream()
+        privacyGroupMembers.stream()
             .distinct()
             .map(Bytes::toArray)
             .sorted(Comparator.comparing(Arrays::hashCode))
@@ -50,29 +49,8 @@ public static Bytes32 calculateEeaPrivacyGroupId(
     final BytesValueRLPOutput bytesValueRLPOutput = new BytesValueRLPOutput();
     bytesValueRLPOutput.writeList(
         sortedPublicEnclaveKeys,
-        (enclavePublicKey, rlpOutput) -> rlpOutput.writeBytes(Bytes.of(enclavePublicKey)));
+        (privacyUserId, rlpOutput) -> rlpOutput.writeBytes(Bytes.of(privacyUserId)));
 
     return Hash.keccak256(bytesValueRLPOutput.encoded());
   }
-
-  public static Optional<PrivacyGroup> findOnchainPrivacyGroup(
-      final PrivacyController privacyController,
-      final Optional<Bytes> maybePrivacyGroupId,
-      final String enclavePublicKey,
-      final PrivateTransaction privateTransaction) {
-    return maybePrivacyGroupId.flatMap(
-        privacyGroupId ->
-            privacyController.findOnChainPrivacyGroupAndAddNewMembers(
-                privacyGroupId, enclavePublicKey, privateTransaction));
-  }
-
-  public static Optional<PrivacyGroup> findOffchainPrivacyGroup(
-      final PrivacyController privacyController,
-      final Optional<Bytes> maybePrivacyGroupId,
-      final String enclavePublicKey) {
-    return maybePrivacyGroupId.flatMap(
-        privacyGroupId ->
-            privacyController.findOffChainPrivacyGroupByGroupId(
-                privacyGroupId.toBase64String(), enclavePublicKey));
-  }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivacyValidationException.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivacyValidationException.java
new file mode 100644
index 00000000000..ac25fce3f47
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivacyValidationException.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.privacy;
+
+public class PrivacyValidationException extends RuntimeException {
+
+  public PrivacyValidationException(final String message) {
+    super(message);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateGroupRehydrationBlockProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateGroupRehydrationBlockProcessor.java
index 480fda83ebb..713d73c48e5 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateGroupRehydrationBlockProcessor.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateGroupRehydrationBlockProcessor.java
@@ -16,44 +16,46 @@
 
 import static org.hyperledger.besu.ethereum.privacy.PrivateStateRootResolver.EMPTY_ROOT_HASH;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.BlockProcessingOutputs;
+import org.hyperledger.besu.ethereum.BlockProcessingResult;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.EvmAccount;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
 import org.hyperledger.besu.ethereum.mainnet.AbstractBlockProcessor;
 import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
 import org.hyperledger.besu.ethereum.mainnet.MiningBeneficiaryCalculator;
 import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
-import org.hyperledger.besu.ethereum.privacy.group.OnChainGroupManagement;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateMetadataUpdater;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateStateStorage;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateTransactionMetadata;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
-import org.hyperledger.besu.ethereum.vm.OperationTracer;
+import org.hyperledger.besu.ethereum.vm.CachingBlockHashLookup;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PrivateGroupRehydrationBlockProcessor {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG =
+      LoggerFactory.getLogger(PrivateGroupRehydrationBlockProcessor.class);
 
   static final int MAX_GENERATION = 6;
 
@@ -62,6 +64,7 @@ public class PrivateGroupRehydrationBlockProcessor {
   private final AbstractBlockProcessor.TransactionReceiptFactory transactionReceiptFactory;
   final Wei blockReward;
   private final boolean skipZeroBlockRewards;
+  private final PrivateStateGenesisAllocator privateStateGenesisAllocator;
   private final MiningBeneficiaryCalculator miningBeneficiaryCalculator;
 
   public PrivateGroupRehydrationBlockProcessor(
@@ -70,16 +73,18 @@ public PrivateGroupRehydrationBlockProcessor(
       final AbstractBlockProcessor.TransactionReceiptFactory transactionReceiptFactory,
       final Wei blockReward,
       final MiningBeneficiaryCalculator miningBeneficiaryCalculator,
-      final boolean skipZeroBlockRewards) {
+      final boolean skipZeroBlockRewards,
+      final PrivateStateGenesisAllocator privateStateGenesisAllocator) {
     this.transactionProcessor = transactionProcessor;
     this.privateTransactionProcessor = privateTransactionProcessor;
     this.transactionReceiptFactory = transactionReceiptFactory;
     this.blockReward = blockReward;
     this.miningBeneficiaryCalculator = miningBeneficiaryCalculator;
     this.skipZeroBlockRewards = skipZeroBlockRewards;
+    this.privateStateGenesisAllocator = privateStateGenesisAllocator;
   }
 
-  public AbstractBlockProcessor.Result processBlock(
+  public BlockProcessingResult processBlock(
       final Blockchain blockchain,
       final MutableWorldState worldState,
       final WorldStateArchive privateWorldStateArchive,
@@ -105,11 +110,11 @@ public AbstractBlockProcessor.Result processBlock(
                 + " remaining {}",
             transaction.getGasLimit(),
             remainingGasBudget);
-        return AbstractBlockProcessor.Result.failed();
+        return BlockProcessingResult.FAILED;
       }
 
       final WorldUpdater worldStateUpdater = worldState.updater();
-      final BlockHashLookup blockHashLookup = new BlockHashLookup(blockHeader, blockchain);
+      final BlockHashLookup blockHashLookup = new CachingBlockHashLookup(blockHeader, blockchain);
       final Address miningBeneficiary =
           miningBeneficiaryCalculator.calculateBeneficiary(blockHeader);
 
@@ -121,10 +126,17 @@ public AbstractBlockProcessor.Result processBlock(
             privateStateRootResolver.resolveLastStateRoot(privacyGroupId, metadataUpdater);
 
         final MutableWorldState disposablePrivateState =
-            privateWorldStateArchive.getMutable(lastRootHash).get();
-        final WorldUpdater privateStateUpdater = disposablePrivateState.updater();
-        maybeInjectDefaultManagementAndProxy(
-            lastRootHash, disposablePrivateState, privateStateUpdater);
+            privateWorldStateArchive.getMutable(lastRootHash, null).get();
+        final WorldUpdater privateWorldStateUpdater = disposablePrivateState.updater();
+
+        if (lastRootHash.equals(EMPTY_ROOT_HASH)) {
+          privateStateGenesisAllocator.applyGenesisToPrivateWorldState(
+              disposablePrivateState,
+              privateWorldStateUpdater,
+              privacyGroupId,
+              blockHeader.getNumber());
+        }
+
         LOG.debug(
             "Pre-rehydrate root hash: {} for tx {}",
             disposablePrivateState.rootHash(),
@@ -132,18 +144,17 @@ public AbstractBlockProcessor.Result processBlock(
 
         final TransactionProcessingResult privateResult =
             privateTransactionProcessor.processTransaction(
-                blockchain,
                 worldStateUpdater.updater(),
-                privateStateUpdater,
+                privateWorldStateUpdater,
                 blockHeader,
                 transactionHash,
                 privateTransaction,
                 miningBeneficiary,
                 OperationTracer.NO_TRACING,
-                new BlockHashLookup(blockHeader, blockchain),
+                new CachingBlockHashLookup(blockHeader, blockchain),
                 privateTransaction.getPrivacyGroupId().get());
 
-        privateStateUpdater.commit();
+        privateWorldStateUpdater.commit();
         disposablePrivateState.persist(null);
 
         storePrivateMetadata(
@@ -167,9 +178,10 @@ public AbstractBlockProcessor.Result processBlock(
               miningBeneficiary,
               blockHashLookup,
               false,
-              TransactionValidationParams.processingBlock());
+              TransactionValidationParams.processingBlock(),
+              Wei.ZERO);
       if (result.isInvalid()) {
-        return AbstractBlockProcessor.Result.failed();
+        return BlockProcessingResult.FAILED;
       }
 
       gasUsed = transaction.getGasLimit() - result.getGasRemaining() + gasUsed;
@@ -179,12 +191,12 @@ public AbstractBlockProcessor.Result processBlock(
     }
 
     if (!rewardCoinbase(worldState, blockHeader, ommers, skipZeroBlockRewards)) {
-      return AbstractBlockProcessor.Result.failed();
+      return BlockProcessingResult.FAILED;
     }
 
     metadataUpdater.commit();
-
-    return AbstractBlockProcessor.Result.successful(receipts);
+    BlockProcessingOutputs blockProcessingOutput = new BlockProcessingOutputs(worldState, receipts);
+    return new BlockProcessingResult(Optional.of(blockProcessingOutput));
   }
 
   void storePrivateMetadata(
@@ -208,35 +220,6 @@ void storePrivateMetadata(
         new PrivateTransactionMetadata(commitmentHash, disposablePrivateState.rootHash()));
   }
 
-  protected void maybeInjectDefaultManagementAndProxy(
-      final Hash lastRootHash,
-      final MutableWorldState disposablePrivateState,
-      final WorldUpdater privateWorldStateUpdater) {
-    if (lastRootHash.equals(EMPTY_ROOT_HASH)) {
-      // inject management
-      final EvmAccount managementPrecompile =
-          privateWorldStateUpdater.createAccount(Address.DEFAULT_ONCHAIN_PRIVACY_MANAGEMENT);
-      final MutableAccount mutableManagementPrecompiled = managementPrecompile.getMutable();
-      // this is the code for the simple management contract
-      mutableManagementPrecompiled.setCode(
-          OnChainGroupManagement.DEFAULT_GROUP_MANAGEMENT_RUNTIME_BYTECODE);
-
-      // inject proxy
-      final EvmAccount proxyPrecompile =
-          privateWorldStateUpdater.createAccount(Address.ONCHAIN_PRIVACY_PROXY);
-      final MutableAccount mutableProxyPrecompiled = proxyPrecompile.getMutable();
-      // this is the code for the proxy contract
-      mutableProxyPrecompiled.setCode(OnChainGroupManagement.PROXY_RUNTIME_BYTECODE);
-      // manually set the management contract address so the proxy can trust it
-      mutableProxyPrecompiled.setStorageValue(
-          UInt256.ZERO,
-          UInt256.fromBytes(Bytes32.leftPad(Address.DEFAULT_ONCHAIN_PRIVACY_MANAGEMENT)));
-
-      privateWorldStateUpdater.commit();
-      disposablePrivateState.persist(null);
-    }
-  }
-
   private boolean rewardCoinbase(
       final MutableWorldState worldState,
       final ProcessableBlockHeader header,
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateNonceProvider.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateNonceProvider.java
index 5544bce92cd..76c72741691 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateNonceProvider.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateNonceProvider.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.privacy;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 
 import org.apache.tuweni.bytes.Bytes32;
 
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateStateGenesisAllocator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateStateGenesisAllocator.java
new file mode 100644
index 00000000000..1f84f210b92
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateStateGenesisAllocator.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.privacy;
+
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.DEFAULT_FLEXIBLE_PRIVACY_MANAGEMENT;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY_PROXY;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.privacy.group.FlexibleGroupManagement;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+import org.hyperledger.besu.plugin.data.PrivacyGenesis;
+import org.hyperledger.besu.plugin.services.privacy.PrivacyGroupGenesisProvider;
+
+import java.math.BigInteger;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PrivateStateGenesisAllocator {
+  private static final Logger LOG = LoggerFactory.getLogger(PrivateStateGenesisAllocator.class);
+
+  private final Boolean isFlexiblePrivacyEnabled;
+  private final PrivacyGroupGenesisProvider privacyGroupGenesisProvider;
+
+  public PrivateStateGenesisAllocator(
+      final Boolean isFlexiblePrivacyEnabled,
+      final PrivacyGroupGenesisProvider privacyGroupGenesisProvider) {
+    this.isFlexiblePrivacyEnabled = isFlexiblePrivacyEnabled;
+    this.privacyGroupGenesisProvider = privacyGroupGenesisProvider;
+  }
+
+  public void applyGenesisToPrivateWorldState(
+      final MutableWorldState disposablePrivateState,
+      final WorldUpdater privateWorldStateUpdater,
+      final Bytes privacyGroupId,
+      final long blockNumber) {
+
+    final PrivacyGenesis genesis =
+        privacyGroupGenesisProvider.getPrivacyGenesis(privacyGroupId, blockNumber);
+
+    if (genesis.getAccounts().size() > 0) {
+
+      LOG.debug(
+          "Applying {} privacy accounts onto {} private state genesis at {}",
+          genesis.getAccounts().size(),
+          privacyGroupId,
+          blockNumber);
+
+      genesis
+          .getAccounts()
+          .forEach(
+              (genesisAccount) -> {
+                final Address address = genesisAccount.getAddress();
+                if (address.toBigInteger().compareTo(BigInteger.valueOf(Byte.MAX_VALUE)) < 0) {
+                  LOG.warn(
+                      "Genesis address {} is in reserved range and may be overwritten", address);
+                }
+
+                final MutableAccount account =
+                    privateWorldStateUpdater.createAccount(address).getMutable();
+
+                LOG.debug("{} applied to genesis", address.toHexString());
+
+                account.setNonce(genesisAccount.getNonce());
+                account.setBalance(Wei.fromQuantity(genesisAccount.getBalance()));
+                account.setCode(genesisAccount.getCode());
+
+                genesisAccount.getStorage().forEach(account::setStorageValue);
+              });
+    }
+
+    if (isFlexiblePrivacyEnabled) {
+      // inject management
+      final MutableAccount managementContract =
+          privateWorldStateUpdater.createAccount(DEFAULT_FLEXIBLE_PRIVACY_MANAGEMENT).getMutable();
+
+      // this is the code for the simple management contract
+      managementContract.setCode(FlexibleGroupManagement.DEFAULT_GROUP_MANAGEMENT_RUNTIME_BYTECODE);
+
+      // inject proxy
+      final MutableAccount procyContract =
+          privateWorldStateUpdater.createAccount(FLEXIBLE_PRIVACY_PROXY).getMutable();
+
+      // this is the code for the proxy contract
+      procyContract.setCode(FlexibleGroupManagement.PROXY_RUNTIME_BYTECODE);
+      // manually set the management contract address so the proxy can trust it
+      procyContract.setStorageValue(
+          UInt256.ZERO, UInt256.fromBytes(Bytes32.leftPad(DEFAULT_FLEXIBLE_PRIVACY_MANAGEMENT)));
+    }
+
+    privateWorldStateUpdater.commit();
+    disposablePrivateState.persist(null);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateStateRehydration.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateStateRehydration.java
index d6fe7844a55..51953e225e9 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateStateRehydration.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateStateRehydration.java
@@ -14,11 +14,11 @@
  */
 package org.hyperledger.besu.ethereum.privacy;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.chain.TransactionLocation;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
@@ -32,14 +32,14 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PrivateStateRehydration {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PrivateStateRehydration.class);
 
   private final PrivateStateStorage privateStateStorage;
   private final Blockchain blockchain;
@@ -47,6 +47,7 @@ public class PrivateStateRehydration {
   private final WorldStateArchive publicWorldStateArchive;
   private final WorldStateArchive privateWorldStateArchive;
   private final PrivateStateRootResolver privateStateRootResolver;
+  private final PrivateStateGenesisAllocator privateStateGenesisAllocator;
 
   public PrivateStateRehydration(
       final PrivateStateStorage privateStateStorage,
@@ -54,13 +55,15 @@ public PrivateStateRehydration(
       final ProtocolSchedule protocolSchedule,
       final WorldStateArchive publicWorldStateArchive,
       final WorldStateArchive privateWorldStateArchive,
-      final PrivateStateRootResolver privateStateRootResolver) {
+      final PrivateStateRootResolver privateStateRootResolver,
+      final PrivateStateGenesisAllocator privateStateGenesisAllocator) {
     this.privateStateStorage = privateStateStorage;
     this.blockchain = blockchain;
     this.protocolSchedule = protocolSchedule;
     this.publicWorldStateArchive = publicWorldStateArchive;
     this.privateWorldStateArchive = privateWorldStateArchive;
     this.privateStateRootResolver = privateStateRootResolver;
+    this.privateStateGenesisAllocator = privateStateGenesisAllocator;
   }
 
   public void rehydrate(
@@ -70,7 +73,7 @@ public void rehydrate(
     final Optional<Bytes> maybeGroupId =
         privateTransactionWithMetadataList.get(0).getPrivateTransaction().getPrivacyGroupId();
     if (maybeGroupId.isEmpty()) {
-      LOG.debug("Onchain groups must have a group id.");
+      LOG.debug("Flexible groups must have a group id.");
       return;
     }
     final Bytes32 privacyGroupId = Bytes32.wrap(maybeGroupId.get());
@@ -98,7 +101,7 @@ public void rehydrate(
       final PrivateTransactionWithMetadata transactionWithMetadata =
           privateTransactionWithMetadataList.get(j);
       pmtHashToPrivateTransactionMap.put(
-          transactionWithMetadata.getPrivateTransactionMetadata().getPrivacyMarkerTransactionHash(),
+          transactionWithMetadata.getPrivateTransactionMetadata().getPrivateMarkerTransactionHash(),
           transactionWithMetadata.getPrivateTransaction());
     }
 
@@ -117,7 +120,7 @@ public void rehydrate(
           privateTransactionWithMetadataList
               .get(i)
               .getPrivateTransactionMetadata()
-              .getPrivacyMarkerTransactionHash();
+              .getPrivateMarkerTransactionHash();
 
       final Optional<TransactionLocation> transactionLocationOfLastPmtInBlock =
           blockchain.getTransactionLocation(lastPmtHash);
@@ -137,7 +140,7 @@ public void rehydrate(
               .map(Transaction::getHash)
               .collect(Collectors.toList()));
 
-      final ProtocolSpec protocolSpec = protocolSchedule.getByBlockNumber(blockHeader.getNumber());
+      final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(blockHeader);
       final PrivateGroupRehydrationBlockProcessor privateGroupRehydrationBlockProcessor =
           new PrivateGroupRehydrationBlockProcessor(
               protocolSpec.getTransactionProcessor(),
@@ -145,13 +148,15 @@ public void rehydrate(
               protocolSpec.getTransactionReceiptFactory(),
               protocolSpec.getBlockReward(),
               protocolSpec.getMiningBeneficiaryCalculator(),
-              protocolSpec.isSkipZeroBlockRewards());
+              protocolSpec.isSkipZeroBlockRewards(),
+              privateStateGenesisAllocator);
 
       final MutableWorldState publicWorldState =
           blockchain
               .getBlockHeader(blockHeader.getParentHash())
-              .map(BlockHeader::getStateRoot)
-              .flatMap(publicWorldStateArchive::getMutable)
+              .flatMap(
+                  header ->
+                      publicWorldStateArchive.getMutable(header.getStateRoot(), header.getHash()))
               .orElseThrow(RuntimeException::new);
 
       privateGroupRehydrationBlockProcessor.processBlock(
@@ -240,7 +245,7 @@ private Hash getBlockHashForIndex(
             privateTransactionWithMetadataList
                 .get(index)
                 .getPrivateTransactionMetadata()
-                .getPrivacyMarkerTransactionHash())
+                .getPrivateMarkerTransactionHash())
         .orElseThrow()
         .getBlockHash();
   }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateStateRootResolver.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateStateRootResolver.java
index 2a64a13d7c2..747e31d1b05 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateStateRootResolver.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateStateRootResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,19 +14,19 @@
  */
 package org.hyperledger.besu.ethereum.privacy;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivacyGroupHeadBlockMap;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateBlockMetadata;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateMetadataUpdater;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateStateStorage;
-import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
 
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes32;
 
 public class PrivateStateRootResolver {
-  public static final Hash EMPTY_ROOT_HASH = Hash.wrap(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH);
+  public static final Hash EMPTY_ROOT_HASH = Hash.wrap(MerkleTrie.EMPTY_TRIE_NODE_HASH);
 
   private final PrivateStateStorage privateStateStorage;
 
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransaction.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransaction.java
index 86f4cb94f53..c108d27626f 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransaction.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransaction.java
@@ -16,16 +16,24 @@
 
 import static com.google.common.base.Preconditions.checkState;
 import static org.hyperledger.besu.crypto.Hash.keccak256;
-import static org.hyperledger.besu.ethereum.privacy.group.OnChainGroupManagement.REMOVE_PARTICIPANT_METHOD_SIGNATURE;
-
-import org.hyperledger.besu.crypto.SECP256K1;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Wei;
+import static org.hyperledger.besu.plugin.data.Restriction.RESTRICTED;
+import static org.hyperledger.besu.plugin.data.Restriction.UNRESTRICTED;
+import static org.hyperledger.besu.plugin.data.Restriction.UNSUPPORTED;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SECPPublicKey;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPException;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+import org.hyperledger.besu.plugin.data.Restriction;
 
 import java.math.BigInteger;
 import java.util.Arrays;
@@ -33,16 +41,21 @@
 import java.util.Objects;
 import java.util.Optional;
 
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import com.google.common.collect.Lists;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.units.bigints.UInt256;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** An operation submitted by an external actor to be applied to the system. */
-public class PrivateTransaction {
+public class PrivateTransaction implements org.hyperledger.besu.plugin.data.PrivateTransaction {
+  private static final Logger LOG = LoggerFactory.getLogger(PrivateTransaction.class);
 
   // Used for transactions that are not tied to a specific chain
-  // (e.g. does not have a chain id associated with it).
+  // (i.e. does not have a chain id associated with it).
   private static final BigInteger REPLAY_UNPROTECTED_V_BASE = BigInteger.valueOf(27);
   private static final BigInteger REPLAY_UNPROTECTED_V_BASE_PLUS_1 = BigInteger.valueOf(28);
 
@@ -64,7 +77,7 @@ public class PrivateTransaction {
 
   private final Wei value;
 
-  private final SECP256K1.Signature signature;
+  private final SECPSignature signature;
 
   private final Bytes payload;
 
@@ -79,7 +92,7 @@ public class PrivateTransaction {
   private final Restriction restriction;
 
   // Caches a "hash" of a portion of the transaction used for sender recovery.
-  // Note that this hash does not include the transaction signature so it does not
+  // Note that this hash does not include the transaction signature, so it does not
   // fully identify the transaction (use the result of the {@code hash()} for that).
   // It is only used to compute said signature and recover the sender from it.
   protected volatile Bytes32 hashNoSignature;
@@ -87,15 +100,52 @@ public class PrivateTransaction {
   // Caches the transaction sender.
   protected volatile Address sender;
 
-  // Caches the hash used to uniquely identify the transaction.
-  // This field will be removed in 1.5.0
-  @Deprecated(since = "1.4.3")
-  protected volatile Hash hash;
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
 
   public static Builder builder() {
     return new Builder();
   }
 
+  public static PrivateTransaction readFrom(
+      final org.hyperledger.besu.plugin.data.PrivateTransaction p) {
+
+    final BigInteger v = p.getV();
+    final byte recId;
+    Optional<BigInteger> chainId = p.getChainId();
+    if (v.equals(REPLAY_UNPROTECTED_V_BASE) || v.equals(REPLAY_UNPROTECTED_V_BASE_PLUS_1)) {
+      recId = v.subtract(REPLAY_UNPROTECTED_V_BASE).byteValueExact();
+    } else if (v.compareTo(REPLAY_PROTECTED_V_MIN) > 0) {
+      chainId = Optional.of(v.subtract(REPLAY_PROTECTED_V_BASE).divide(TWO));
+      recId = v.subtract(TWO.multiply(chainId.get()).add(REPLAY_PROTECTED_V_BASE)).byteValueExact();
+    } else {
+      throw new RuntimeException(
+          String.format("An unsupported encoded `v` value of %s was found", v));
+    }
+
+    final SECPSignature signature =
+        SIGNATURE_ALGORITHM.get().createSignature(p.getR(), p.getS(), recId);
+
+    final Builder b =
+        builder()
+            .nonce(p.getNonce())
+            .gasPrice(Wei.of(p.getGasPrice().getAsBigInteger()))
+            .gasLimit(p.getGasLimit())
+            .to(p.getTo().map(Address::wrap).orElse(null))
+            .value(Wei.of(p.getValue().getAsBigInteger()))
+            .sender(Address.wrap(p.getSender()))
+            .payload(p.getPayload())
+            .privateFrom(p.getPrivateFrom())
+            .restriction(p.getRestriction())
+            .signature(signature);
+
+    chainId.ifPresent(b::chainId);
+    p.getPrivateFor().ifPresent(b::privateFor);
+    p.getPrivacyGroupId().ifPresent(b::privacyGroupId);
+
+    return b.build();
+  }
+
   @SuppressWarnings({"unchecked"})
   public static PrivateTransaction readFrom(final RLPInput input) throws RLPException {
     input.enterList();
@@ -121,9 +171,9 @@ public static PrivateTransaction readFrom(final RLPInput input) throws RLPExcept
       throw new RuntimeException(
           String.format("An unsupported encoded `v` value of %s was found", v));
     }
-    final BigInteger r = input.readUInt256Scalar().toBytes().toUnsignedBigInteger();
-    final BigInteger s = input.readUInt256Scalar().toBytes().toUnsignedBigInteger();
-    final SECP256K1.Signature signature = SECP256K1.Signature.create(r, s, recId);
+    final BigInteger r = input.readUInt256Scalar().toUnsignedBigInteger();
+    final BigInteger s = input.readUInt256Scalar().toUnsignedBigInteger();
+    final SECPSignature signature = SIGNATURE_ALGORITHM.get().createSignature(r, s, recId);
 
     final Bytes privateFrom = input.readBytes();
     final Object privateForOrPrivacyGroupId = resolvePrivateForOrPrivacyGroupId(input.readAsRlp());
@@ -150,25 +200,19 @@ public static PrivateTransaction readFrom(final RLPInput input) throws RLPExcept
     }
   }
 
-  public boolean isGroupRemovalTransaction() {
-    return this.getTo().isPresent()
-        && this.getTo().get().equals(Address.ONCHAIN_PRIVACY_PROXY)
-        && this.getPayload()
-            .toHexString()
-            .startsWith(REMOVE_PARTICIPANT_METHOD_SIGNATURE.toHexString());
-  }
-
   private static Object resolvePrivateForOrPrivacyGroupId(final RLPInput item) {
     return item.nextIsList() ? item.readList(RLPInput::readBytes) : item.readBytes();
   }
 
   private static Restriction convertToEnum(final Bytes readBytes) {
-    if (readBytes.equals(Restriction.RESTRICTED.getBytes())) {
-      return Restriction.RESTRICTED;
-    } else if (readBytes.equals(Restriction.UNRESTRICTED.getBytes())) {
-      return Restriction.UNRESTRICTED;
+    if (readBytes.equals(RESTRICTED.getBytes())) {
+      return RESTRICTED;
+    } else if (readBytes.equals(UNRESTRICTED.getBytes())) {
+      return UNRESTRICTED;
+    } else {
+      LOG.error("Transaction restriction '{}' not supported", readBytes.toString());
+      return UNSUPPORTED;
     }
-    return Restriction.UNSUPPORTED;
   }
 
   /**
@@ -199,7 +243,7 @@ protected PrivateTransaction(
       final long gasLimit,
       final Optional<Address> to,
       final Wei value,
-      final SECP256K1.Signature signature,
+      final SECPSignature signature,
       final Bytes payload,
       final Address sender,
       final Optional<BigInteger> chainId,
@@ -244,6 +288,7 @@ protected PrivateTransaction(final PrivateTransaction privateTransaction) {
    *
    * @return the transaction nonce
    */
+  @Override
   public long getNonce() {
     return nonce;
   }
@@ -253,6 +298,7 @@ public long getNonce() {
    *
    * @return the transaction gas price
    */
+  @Override
   public Wei getGasPrice() {
     return gasPrice;
   }
@@ -262,6 +308,7 @@ public Wei getGasPrice() {
    *
    * @return the transaction gas limit
    */
+  @Override
   public long getGasLimit() {
     return gasLimit;
   }
@@ -274,6 +321,7 @@ public long getGasLimit() {
    *
    * @return the transaction recipient if a message call; otherwise {@code Optional.empty()}
    */
+  @Override
   public Optional<Address> getTo() {
     return to;
   }
@@ -283,6 +331,7 @@ public Optional<Address> getTo() {
    *
    * @return the value transferred in the transaction
    */
+  @Override
   public Wei getValue() {
     return value;
   }
@@ -292,7 +341,7 @@ public Wei getValue() {
    *
    * @return the signature used to sign the transaction
    */
-  public SECP256K1.Signature getSignature() {
+  public SECPSignature getSignature() {
     return signature;
   }
 
@@ -301,6 +350,7 @@ public SECP256K1.Signature getSignature() {
    *
    * @return the transaction payload
    */
+  @Override
   public Bytes getPayload() {
     return payload;
   }
@@ -313,6 +363,7 @@ public Bytes getPayload() {
    *
    * @return the transaction chain id if it exists; otherwise {@code OptionalInt.empty()}
    */
+  @Override
   public Optional<BigInteger> getChainId() {
     return chainId;
   }
@@ -322,6 +373,7 @@ public Optional<BigInteger> getChainId() {
    *
    * @return the enclave public key of the sender.
    */
+  @Override
   public Bytes getPrivateFrom() {
     return privateFrom;
   }
@@ -331,6 +383,7 @@ public Bytes getPrivateFrom() {
    *
    * @return the enclave public keys of the receivers
    */
+  @Override
   public Optional<List<Bytes>> getPrivateFor() {
     return privateFor;
   }
@@ -340,6 +393,7 @@ public Optional<List<Bytes>> getPrivateFor() {
    *
    * @return the enclave privacy group id.
    */
+  @Override
   public Optional<Bytes> getPrivacyGroupId() {
     return privacyGroupId;
   }
@@ -349,6 +403,7 @@ public Optional<Bytes> getPrivacyGroupId() {
    *
    * @return the restriction
    */
+  @Override
   public Restriction getRestriction() {
     return restriction;
   }
@@ -358,10 +413,13 @@ public Restriction getRestriction() {
    *
    * @return the transaction sender
    */
+  @Override
   public Address getSender() {
     if (sender == null) {
-      final SECP256K1.PublicKey publicKey =
-          SECP256K1.PublicKey.recoverFromSignature(getOrComputeSenderRecoveryHash(), signature)
+      final SECPPublicKey publicKey =
+          SIGNATURE_ALGORITHM
+              .get()
+              .recoverPublicKeyFromSignature(getOrComputeSenderRecoveryHash(), signature)
               .orElseThrow(
                   () ->
                       new IllegalStateException(
@@ -396,38 +454,44 @@ private Bytes32 getOrComputeSenderRecoveryHash() {
    * @param out the output to write the transaction to
    */
   public void writeTo(final RLPOutput out) {
+    out.writeRLPBytes(serialize(this).encoded());
+  }
+
+  public static BytesValueRLPOutput serialize(
+      final org.hyperledger.besu.plugin.data.PrivateTransaction t) {
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
     out.startList();
 
-    out.writeLongScalar(getNonce());
-    out.writeUInt256Scalar(getGasPrice());
-    out.writeLongScalar(getGasLimit());
-    out.writeBytes(getTo().isPresent() ? getTo().get() : Bytes.EMPTY);
-    out.writeUInt256Scalar(getValue());
-    out.writeBytes(getPayload());
-    writeSignature(out);
-    out.writeBytes(getPrivateFrom());
-    getPrivateFor()
+    out.writeLongScalar(t.getNonce());
+    out.writeUInt256Scalar((Wei) t.getGasPrice());
+    out.writeLongScalar(t.getGasLimit());
+    out.writeBytes(t.getTo().isPresent() ? t.getTo().get() : Bytes.EMPTY);
+    out.writeUInt256Scalar((Wei) t.getValue());
+    out.writeBytes(t.getPayload());
+    out.writeBigIntegerScalar(t.getV());
+    out.writeBigIntegerScalar(t.getR());
+    out.writeBigIntegerScalar(t.getS());
+    out.writeBytes(t.getPrivateFrom());
+    t.getPrivateFor()
         .ifPresent(privateFor -> out.writeList(privateFor, (bv, rlpO) -> rlpO.writeBytes(bv)));
-    getPrivacyGroupId().ifPresent(out::writeBytes);
-    out.writeBytes(getRestriction().getBytes());
+    t.getPrivacyGroupId().ifPresent(out::writeBytes);
+    out.writeBytes(t.getRestriction().getBytes());
 
     out.endList();
+    return out;
   }
 
-  private void writeSignature(final RLPOutput out) {
-    out.writeBigIntegerScalar(getV());
-    out.writeBigIntegerScalar(getSignature().getR());
-    out.writeBigIntegerScalar(getSignature().getS());
-  }
-
+  @Override
   public BigInteger getR() {
     return signature.getR();
   }
 
+  @Override
   public BigInteger getS() {
     return signature.getS();
   }
 
+  @Override
   public BigInteger getV() {
     final BigInteger v;
     final BigInteger recId = BigInteger.valueOf(signature.getRecId());
@@ -439,22 +503,6 @@ public BigInteger getV() {
     return v;
   }
 
-  /**
-   * Returns the transaction hash.
-   *
-   * @deprecated All private transactions should be identified by their corresponding PMT hash.
-   * @return the transaction hash
-   */
-  // This field will be removed in 1.5.0
-  @Deprecated(since = "1.4.3")
-  public Hash getHash() {
-    if (hash == null) {
-      final Bytes rlp = RLP.encode(this::writeTo);
-      hash = Hash.hash(rlp);
-    }
-    return hash;
-  }
-
   /**
    * Returns whether the transaction is a contract creation
    *
@@ -613,7 +661,7 @@ public static class Builder {
 
     protected Wei value;
 
-    protected SECP256K1.Signature signature;
+    protected SECPSignature signature;
 
     protected Bytes payload;
 
@@ -669,7 +717,7 @@ public Builder sender(final Address sender) {
       return this;
     }
 
-    public Builder signature(final SECP256K1.Signature signature) {
+    public Builder signature(final SECPSignature signature) {
       this.signature = signature;
       return this;
     }
@@ -715,7 +763,7 @@ public PrivateTransaction build() {
           restriction);
     }
 
-    public PrivateTransaction signAndBuild(final SECP256K1.KeyPair keys) {
+    public PrivateTransaction signAndBuild(final KeyPair keys) {
       checkState(
           signature == null, "The transaction signature has already been provided to this builder");
       signature(computeSignature(keys));
@@ -723,7 +771,7 @@ public PrivateTransaction signAndBuild(final SECP256K1.KeyPair keys) {
       return build();
     }
 
-    protected SECP256K1.Signature computeSignature(final SECP256K1.KeyPair keys) {
+    protected SECPSignature computeSignature(final KeyPair keys) {
       final Bytes32 hash =
           computeSenderRecoveryHash(
               nonce,
@@ -737,7 +785,7 @@ protected SECP256K1.Signature computeSignature(final SECP256K1.KeyPair keys) {
               privateFor,
               privacyGroupId,
               restriction.getBytes());
-      return SECP256K1.sign(hash, keys);
+      return SIGNATURE_ALGORITHM.get().sign(hash, keys);
     }
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionEvent.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionEvent.java
index 7d088dbcab2..aa28a3e8baf 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionEvent.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionEvent.java
@@ -17,18 +17,18 @@
 
 public class PrivateTransactionEvent {
   private final String privacyGroupId;
-  private final String enclavePublicKey;
+  private final String privacyUserId;
 
-  public PrivateTransactionEvent(final String privacyGroupId, final String enclavePublicKey) {
+  public PrivateTransactionEvent(final String privacyGroupId, final String privacyUserId) {
     this.privacyGroupId = privacyGroupId;
-    this.enclavePublicKey = enclavePublicKey;
+    this.privacyUserId = privacyUserId;
   }
 
   public String getPrivacyGroupId() {
     return privacyGroupId;
   }
 
-  public String getEnclavePublicKey() {
-    return enclavePublicKey;
+  public String getPrivacyUserId() {
+    return privacyUserId;
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionLocator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionLocator.java
index ca569e9750a..f6b951dbbd5 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionLocator.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionLocator.java
@@ -15,15 +15,14 @@
 package org.hyperledger.besu.ethereum.privacy;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.logging.log4j.LogManager.getLogger;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.enclave.Enclave;
 import org.hyperledger.besu.enclave.EnclaveClientException;
 import org.hyperledger.besu.enclave.types.ReceiveResponse;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.chain.TransactionLocation;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivacyGroupHeadBlockMap;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateStateStorage;
@@ -35,13 +34,14 @@
 import java.util.Optional;
 import java.util.Set;
 
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PrivateTransactionLocator {
 
-  private static final Logger LOG = getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PrivateTransactionLocator.class);
 
   private final Blockchain blockchain;
   private final Enclave enclave;
@@ -155,8 +155,7 @@ private TransactionFromEnclave readPrivateTransactionFromPayload(
         privateTransaction = PrivateTransaction.readFrom(input);
       }
     } catch (final RLPException e) {
-      LOG.debug("Error de-serializing private transaction from enclave", e);
-      throw e;
+      throw new IllegalStateException("Error de-serializing private transaction from enclave", e);
     }
 
     return new TransactionFromEnclave(privateTransaction, receiveResponse.getPrivacyGroupId());
@@ -192,10 +191,10 @@ private Optional<TransactionFromEnclave> tryFetchingTransactionFromAddBlob(
 
           for (final PrivateTransactionWithMetadata privateTx :
               privateTransactionWithMetadataList) {
-            final Hash actualPrivacyMarkerTransactionHash =
-                privateTx.getPrivateTransactionMetadata().getPrivacyMarkerTransactionHash();
+            final Hash actualPrivateMarkerTransactionHash =
+                privateTx.getPrivateTransactionMetadata().getPrivateMarkerTransactionHash();
 
-            if (expectedPmtHash.equals(actualPrivacyMarkerTransactionHash)) {
+            if (expectedPmtHash.equals(actualPrivateMarkerTransactionHash)) {
               return Optional.of(
                   new TransactionFromEnclave(
                       privateTx.getPrivateTransaction(),
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionProcessor.java
index ca1e9905afd..4628ef6b151 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionProcessor.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionProcessor.java
@@ -14,45 +14,39 @@
  */
 package org.hyperledger.besu.ethereum.privacy;
 
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.AccountState;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.EvmAccount;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
+import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_TRANSACTION_HASH;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.mainnet.AbstractMessageProcessor;
 import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionValidator;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
-import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
-import org.hyperledger.besu.ethereum.vm.Code;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.OperationTracer;
-import org.hyperledger.besu.ethereum.vm.operations.ReturnStack;
 import org.hyperledger.besu.ethereum.worldstate.DefaultMutablePrivateWorldStateUpdater;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.account.EvmAccount;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.code.CodeV0;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.processor.AbstractMessageProcessor;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
+import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PrivateTransactionProcessor {
 
-  private static final Logger LOG = LogManager.getLogger();
-
-  @SuppressWarnings("unused")
-  private final GasCalculator gasCalculator;
+  private static final Logger LOG = LoggerFactory.getLogger(PrivateTransactionProcessor.class);
 
   @SuppressWarnings("unused")
   private final MainnetTransactionValidator transactionValidator;
@@ -65,33 +59,25 @@ public class PrivateTransactionProcessor {
 
   private final int maxStackSize;
 
-  private final int createContractAccountVersion;
-
   @SuppressWarnings("unused")
   private final boolean clearEmptyAccounts;
 
   public PrivateTransactionProcessor(
-      final GasCalculator gasCalculator,
       final MainnetTransactionValidator transactionValidator,
       final AbstractMessageProcessor contractCreationProcessor,
       final AbstractMessageProcessor messageCallProcessor,
       final boolean clearEmptyAccounts,
       final int maxStackSize,
-      final int createContractAccountVersion,
       final PrivateTransactionValidator privateTransactionValidator) {
-    this.gasCalculator = gasCalculator;
     this.transactionValidator = transactionValidator;
     this.contractCreationProcessor = contractCreationProcessor;
     this.messageCallProcessor = messageCallProcessor;
     this.clearEmptyAccounts = clearEmptyAccounts;
     this.maxStackSize = maxStackSize;
-    this.createContractAccountVersion = createContractAccountVersion;
     this.privateTransactionValidator = privateTransactionValidator;
   }
 
-  @SuppressWarnings("unused")
   public TransactionProcessingResult processTransaction(
-      final Blockchain blockchain,
       final WorldUpdater publicWorldState,
       final WorldUpdater privateWorldState,
       final ProcessableBlockHeader blockHeader,
@@ -99,7 +85,7 @@ public TransactionProcessingResult processTransaction(
       final PrivateTransaction transaction,
       final Address miningBeneficiary,
       final OperationTracer operationTracer,
-      final BlockHashLookup blockHashLookup,
+      final Function<Long, Hash> blockHashLookup,
       final Bytes privacyGroupId) {
     try {
       LOG.trace("Starting private execution of {}", transaction);
@@ -131,21 +117,19 @@ public TransactionProcessingResult processTransaction(
           MessageFrame.builder()
               .messageFrameStack(messageFrameStack)
               .maxStackSize(maxStackSize)
-              .returnStack(new ReturnStack())
-              .blockchain(blockchain)
-              .worldState(mutablePrivateWorldStateUpdater)
-              .initialGas(Gas.MAX_VALUE)
+              .worldUpdater(mutablePrivateWorldStateUpdater)
+              .initialGas(Long.MAX_VALUE)
               .originator(senderAddress)
               .gasPrice(transaction.getGasPrice())
               .sender(senderAddress)
               .value(transaction.getValue())
               .apparentValue(transaction.getValue())
-              .blockHeader(blockHeader)
+              .blockValues(blockHeader)
               .depth(0)
               .completer(__ -> {})
               .miningBeneficiary(miningBeneficiary)
               .blockHashLookup(blockHashLookup)
-              .transactionHash(pmtHash);
+              .contextVariables(Map.of(KEY_TRANSACTION_HASH, pmtHash));
 
       final MessageFrame initialFrame;
       if (transaction.isContractCreation()) {
@@ -154,32 +138,34 @@ public TransactionProcessingResult processTransaction(
 
         LOG.debug(
             "Calculated contract address {} from sender {} with nonce {} and privacy group {}",
-            privateContractAddress.toString(),
+            privateContractAddress,
             senderAddress,
             previousNonce,
-            privacyGroupId.toString());
+            privacyGroupId);
 
+        final Bytes initCodeBytes = transaction.getPayload();
         initialFrame =
             commonMessageFrameBuilder
                 .type(MessageFrame.Type.CONTRACT_CREATION)
                 .address(privateContractAddress)
                 .contract(privateContractAddress)
-                .contractAccountVersion(createContractAccountVersion)
                 .inputData(Bytes.EMPTY)
-                .code(new Code(transaction.getPayload()))
+                .code(contractCreationProcessor.getCodeFromEVM(null, initCodeBytes))
                 .build();
       } else {
         final Address to = transaction.getTo().get();
-        final Optional<Account> maybeContract = Optional.ofNullable(privateWorldState.get(to));
+        final Optional<Account> maybeContract =
+            Optional.ofNullable(mutablePrivateWorldStateUpdater.get(to));
         initialFrame =
             commonMessageFrameBuilder
                 .type(MessageFrame.Type.MESSAGE_CALL)
                 .address(to)
                 .contract(to)
-                .contractAccountVersion(
-                    maybeContract.map(AccountState::getVersion).orElse(Account.DEFAULT_VERSION))
                 .inputData(transaction.getPayload())
-                .code(new Code(maybeContract.map(AccountState::getCode).orElse(Bytes.EMPTY)))
+                .code(
+                    maybeContract
+                        .map(c -> messageCallProcessor.getCodeFromEVM(c.getCodeHash(), c.getCode()))
+                        .orElse(CodeV0.EMPTY_CODE))
                 .build();
       }
 
@@ -207,8 +193,7 @@ public TransactionProcessingResult processTransaction(
       LOG.error("Critical Exception Processing Transaction", re);
       return TransactionProcessingResult.invalid(
           ValidationResult.invalid(
-              TransactionInvalidReason.INTERNAL_ERROR,
-              "Internal Error in Besu - " + re.toString()));
+              TransactionInvalidReason.INTERNAL_ERROR, "Internal Error in Besu - " + re));
     }
   }
 
@@ -235,14 +220,4 @@ private AbstractMessageProcessor getMessageProcessor(final MessageFrame.Type typ
         throw new IllegalStateException("Request for unsupported message processor type " + type);
     }
   }
-
-  @SuppressWarnings("unused")
-  private static Gas refunded(
-      final Transaction transaction, final Gas gasRemaining, final Gas gasRefund) {
-    // Integer truncation takes care of the the floor calculation needed after the divide.
-    final Gas maxRefundAllowance =
-        Gas.of(transaction.getGasLimit()).minus(gasRemaining).dividedBy(2);
-    final Gas refundAllowance = maxRefundAllowance.min(gasRefund);
-    return gasRemaining.plus(refundAllowance);
-  }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionReceipt.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionReceipt.java
index bb5ddc99cac..34ae107af92 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionReceipt.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionReceipt.java
@@ -14,10 +14,10 @@
  */
 package org.hyperledger.besu.ethereum.privacy;
 
-import org.hyperledger.besu.ethereum.core.Log;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+import org.hyperledger.besu.evm.log.Log;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionSimulator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionSimulator.java
index 2b892768320..061c56353fb 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionSimulator.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionSimulator.java
@@ -14,26 +14,30 @@
  */
 package org.hyperledger.besu.ethereum.privacy;
 
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.debug.TraceOptions;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.transaction.CallParameter;
-import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
-import org.hyperledger.besu.ethereum.vm.DebugOperationTracer;
+import org.hyperledger.besu.ethereum.vm.CachingBlockHashLookup;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.plugin.data.Restriction;
 
 import java.util.Optional;
+import java.util.function.Supplier;
 
+import com.google.common.base.Suppliers;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 
@@ -45,9 +49,17 @@
  */
 public class PrivateTransactionSimulator {
 
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+
   // Dummy signature for transactions to not fail being processed.
-  private static final SECP256K1.Signature FAKE_SIGNATURE =
-      SECP256K1.Signature.create(SECP256K1.HALF_CURVE_ORDER, SECP256K1.HALF_CURVE_ORDER, (byte) 0);
+  private static final SECPSignature FAKE_SIGNATURE =
+      SIGNATURE_ALGORITHM
+          .get()
+          .createSignature(
+              SIGNATURE_ALGORITHM.get().getHalfCurveOrder(),
+              SIGNATURE_ALGORITHM.get().getHalfCurveOrder(),
+              (byte) 0);
 
   private static final Address DEFAULT_FROM = Address.ZERO;
 
@@ -94,7 +106,7 @@ private Optional<TransactionProcessingResult> process(
     }
 
     final MutableWorldState publicWorldState =
-        worldStateArchive.getMutable(header.getStateRoot()).orElse(null);
+        worldStateArchive.getMutable(header.getStateRoot(), header.getHash()).orElse(null);
     if (publicWorldState == null) {
       return Optional.empty();
     }
@@ -105,19 +117,21 @@ private Optional<TransactionProcessingResult> process(
         privateStateRootResolver.resolveLastStateRoot(privacyGroupId, header.getHash());
 
     final MutableWorldState disposablePrivateState =
-        privacyParameters.getPrivateWorldStateArchive().getMutable(lastRootHash).get();
+        privacyParameters
+            .getPrivateWorldStateArchive()
+            .getMutable(lastRootHash, header.getHash())
+            .get();
 
     final PrivateTransaction transaction =
         getPrivateTransaction(callParams, header, privacyGroupId, disposablePrivateState);
 
-    final ProtocolSpec protocolSpec = protocolSchedule.getByBlockNumber(header.getNumber());
+    final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(header);
 
     final PrivateTransactionProcessor privateTransactionProcessor =
         protocolSpec.getPrivateTransactionProcessor();
 
     final TransactionProcessingResult result =
         privateTransactionProcessor.processTransaction(
-            blockchain,
             publicWorldState.updater(),
             disposablePrivateState.updater(),
             header,
@@ -125,8 +139,8 @@ private Optional<TransactionProcessingResult> process(
             // exist
             transaction,
             protocolSpec.getMiningBeneficiaryCalculator().calculateBeneficiary(header),
-            new DebugOperationTracer(TraceOptions.DEFAULT),
-            new BlockHashLookup(header, blockchain),
+            OperationTracer.NO_TRACING,
+            new CachingBlockHashLookup(header, blockchain),
             privacyGroupId);
 
     return Optional.of(result);
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionValidator.java
index 65db76fbf6a..9bbfa6194be 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionValidator.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionValidator.java
@@ -20,12 +20,12 @@
 import java.math.BigInteger;
 import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PrivateTransactionValidator {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PrivateTransactionValidator.class);
 
   private final Optional<BigInteger> chainId;
 
@@ -77,7 +77,7 @@ public ValidationResult<TransactionInvalidReason> validate(
               transactionNonce, accountNonce);
       LOG.debug(errorMessage);
       return ValidationResult.invalid(
-          TransactionInvalidReason.INCORRECT_PRIVATE_NONCE, errorMessage);
+          TransactionInvalidReason.PRIVATE_NONCE_TOO_HIGH, errorMessage);
     }
 
     return ValidationResult.valid();
@@ -88,11 +88,6 @@ private ValidationResult<TransactionInvalidReason> validatePrivateTransactionFie
     if (!privateTransaction.getValue().isZero()) {
       return ValidationResult.invalid(TransactionInvalidReason.PRIVATE_VALUE_NOT_ZERO);
     }
-    if (!privateTransaction.getRestriction().equals(Restriction.RESTRICTED)) {
-      return ValidationResult.invalid(
-          TransactionInvalidReason.PRIVATE_UNIMPLEMENTED_TRANSACTION_TYPE);
-    }
-
     return ValidationResult.valid();
   }
 
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateWorldStateReader.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateWorldStateReader.java
index 5386ec089ab..af32e76513c 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateWorldStateReader.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateWorldStateReader.java
@@ -14,8 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.privacy;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateBlockMetadata;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateStateStorage;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateTransactionMetadata;
@@ -50,7 +50,7 @@ public Optional<Bytes> getContractCode(
             Bytes32.wrap(Bytes.fromBase64String(privacyGroupId)), blockHash);
 
     return privateWorldStateArchive
-        .get(latestStateRoot)
+        .get(latestStateRoot, blockHash)
         .flatMap(worldState -> Optional.ofNullable(worldState.get(contractAddress)))
         .flatMap(account -> Optional.ofNullable(account.getCode()));
   }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/RestrictedDefaultPrivacyController.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/RestrictedDefaultPrivacyController.java
new file mode 100644
index 00000000000..386bfe147b4
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/RestrictedDefaultPrivacyController.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.privacy;
+
+import org.hyperledger.besu.enclave.Enclave;
+import org.hyperledger.besu.enclave.types.PrivacyGroup;
+import org.hyperledger.besu.enclave.types.SendResponse;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.privacy.storage.PrivateStateStorage;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RestrictedDefaultPrivacyController extends AbstractRestrictedPrivacyController {
+
+  private static final Logger LOG =
+      LoggerFactory.getLogger(RestrictedDefaultPrivacyController.class);
+
+  public RestrictedDefaultPrivacyController(
+      final Blockchain blockchain,
+      final PrivacyParameters privacyParameters,
+      final Optional<BigInteger> chainId,
+      final PrivateTransactionSimulator privateTransactionSimulator,
+      final PrivateNonceProvider privateNonceProvider,
+      final PrivateWorldStateReader privateWorldStateReader) {
+    this(
+        blockchain,
+        privacyParameters.getPrivateStateStorage(),
+        privacyParameters.getEnclave(),
+        new PrivateTransactionValidator(chainId),
+        privateTransactionSimulator,
+        privateNonceProvider,
+        privateWorldStateReader,
+        privacyParameters.getPrivateStateRootResolver());
+  }
+
+  public RestrictedDefaultPrivacyController(
+      final Blockchain blockchain,
+      final PrivateStateStorage privateStateStorage,
+      final Enclave enclave,
+      final PrivateTransactionValidator privateTransactionValidator,
+      final PrivateTransactionSimulator privateTransactionSimulator,
+      final PrivateNonceProvider privateNonceProvider,
+      final PrivateWorldStateReader privateWorldStateReader,
+      final PrivateStateRootResolver privateStateRootResolver) {
+    super(
+        blockchain,
+        privateStateStorage,
+        enclave,
+        privateTransactionValidator,
+        privateTransactionSimulator,
+        privateNonceProvider,
+        privateWorldStateReader,
+        privateStateRootResolver);
+  }
+
+  @Override
+  public String createPrivateMarkerTransactionPayload(
+      final PrivateTransaction privateTransaction,
+      final String privacyUserId,
+      final Optional<PrivacyGroup> maybePrivacyGroup) {
+    LOG.trace("Storing private transaction in enclave");
+    final SendResponse sendResponse =
+        sendRequest(privateTransaction, privacyUserId, maybePrivacyGroup);
+    return sendResponse.getKey();
+  }
+
+  @Override
+  public PrivacyGroup createPrivacyGroup(
+      final List<String> addresses,
+      final String name,
+      final String description,
+      final String privacyUserId) {
+    return enclave.createPrivacyGroup(addresses, privacyUserId, name, description);
+  }
+
+  @Override
+  public String deletePrivacyGroup(final String privacyGroupId, final String privacyUserId) {
+    return enclave.deletePrivacyGroup(privacyGroupId, privacyUserId);
+  }
+
+  @Override
+  public PrivacyGroup[] findPrivacyGroupByMembers(
+      final List<String> addresses, final String privacyUserId) {
+    return enclave.findPrivacyGroup(addresses);
+  }
+
+  @Override
+  public Optional<PrivacyGroup> findPrivacyGroupByGroupId(
+      final String privacyGroupId, final String privacyUserId) {
+    return Optional.ofNullable(enclave.retrievePrivacyGroup(privacyGroupId));
+  }
+
+  private SendResponse sendRequest(
+      final PrivateTransaction privateTransaction,
+      final String privacyUserId,
+      final Optional<PrivacyGroup> maybePrivacyGroup) {
+    final BytesValueRLPOutput rlpOutput = new BytesValueRLPOutput();
+
+    if (maybePrivacyGroup.isPresent()) {
+      final PrivacyGroup privacyGroup = maybePrivacyGroup.get();
+      if (privacyGroup.getType() == PrivacyGroup.Type.PANTHEON) {
+        // offchain privacy group
+        privateTransaction.writeTo(rlpOutput);
+        return enclave.send(
+            rlpOutput.encoded().toBase64String(),
+            privacyUserId,
+            privateTransaction.getPrivacyGroupId().get().toBase64String());
+      } else {
+        // this should not happen
+        throw new IllegalArgumentException(
+            "Wrong privacy group type "
+                + privacyGroup.getType()
+                + " when "
+                + PrivacyGroup.Type.PANTHEON
+                + " was expected.");
+      }
+    }
+    // legacy transaction
+    final List<String> privateFor = resolveLegacyPrivateFor(privateTransaction);
+    if (privateFor.isEmpty()) {
+      privateFor.add(privateTransaction.getPrivateFrom().toBase64String());
+    }
+    privateTransaction.writeTo(rlpOutput);
+    final String payload = rlpOutput.encoded().toBase64String();
+
+    return enclave.send(payload, privateTransaction.getPrivateFrom().toBase64String(), privateFor);
+  }
+
+  private List<String> resolveLegacyPrivateFor(final PrivateTransaction privateTransaction) {
+    final ArrayList<String> privateFor = new ArrayList<>();
+    final boolean isLegacyTransaction = privateTransaction.getPrivateFor().isPresent();
+    if (isLegacyTransaction) {
+      privateFor.addAll(
+          privateTransaction.getPrivateFor().get().stream()
+              .map(Bytes::toBase64String)
+              .collect(Collectors.toList()));
+    }
+    return privateFor;
+  }
+
+  @Override
+  public void verifyPrivacyGroupContainsPrivacyUserId(
+      final String privacyGroupId, final String privacyUserId) {
+    final PrivacyGroup offchainPrivacyGroup = enclave.retrievePrivacyGroup(privacyGroupId);
+    if (!offchainPrivacyGroup.getMembers().contains(privacyUserId)) {
+      throw new MultiTenancyValidationException(
+          "Privacy group must contain the enclave public key");
+    }
+  }
+
+  @Override
+  public void verifyPrivacyGroupContainsPrivacyUserId(
+      final String privacyGroupId, final String privacyUserId, final Optional<Long> blockNumber) {
+    verifyPrivacyGroupContainsPrivacyUserId(privacyGroupId, privacyUserId);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/group/FlexibleGroupManagement.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/group/FlexibleGroupManagement.java
new file mode 100644
index 00000000000..06477cc839a
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/group/FlexibleGroupManagement.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.privacy.group;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class FlexibleGroupManagement {
+  public static final Bytes PROXY_RUNTIME_BYTECODE =
+      Bytes.fromHexString(
+          "608060405234801561001057600080fd5b506004361061009e5760003560e01c806378b903371161006657806378b9033714610149578063965a25ef146101675780639738968c14610197578063a69df4b5146101b5578063f83d08ba146101bf5761009e565b80630d8e6e2c146100a35780631f52a8ee146100c15780633659cfe6146100f15780635aa68ac01461010d5780635c60da1b1461012b575b600080fd5b6100ab6101c9565b6040516100b8919061113e565b60405180910390f35b6100db60048036038101906100d69190610e37565b610273565b6040516100e89190611123565b60405180910390f35b61010b60048036038101906101069190610d1a565b610375565b005b6101156106c7565b6040516101229190611101565b60405180910390f35b610133610778565b60405161014091906110c2565b60405180910390f35b61015161079c565b60405161015e9190611123565b60405180910390f35b610181600480360381019061017c9190610d47565b610846565b60405161018e9190611123565b60405180910390f35b61019f610902565b6040516101ac9190611123565b60405180910390f35b6101bd6109ae565b005b6101c7610a37565b005b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff16630d8e6e2c6040518163ffffffff1660e01b815260040160206040518083038186803b15801561023557600080fd5b505afa158015610249573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061026d9190610e0a565b91505090565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905060008173ffffffffffffffffffffffffffffffffffffffff16631f52a8ee86866040518363ffffffff1660e01b81526004016102d6929190611159565b602060405180830381600087803b1580156102f057600080fd5b505af1158015610304573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103289190610ddd565b9050801561036a577f52213552a930e6de0c0d7df74ece31dac1306b2c7e200ceded7a4442853189b58585604051610361929190611159565b60405180910390a15b809250505092915050565b3073ffffffffffffffffffffffffffffffffffffffff166378b903376040518163ffffffff1660e01b815260040160206040518083038186803b1580156103bb57600080fd5b505afa1580156103cf573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103f39190610ddd565b610432576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016104299061117d565b60405180910390fd5b8073ffffffffffffffffffffffffffffffffffffffff1660008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614156104c1576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016104b89061119d565b60405180910390fd5b3073ffffffffffffffffffffffffffffffffffffffff16639738968c6040518163ffffffff1660e01b8152600401602060405180830381600087803b15801561050957600080fd5b505af115801561051d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105419190610ddd565b610580576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610577906111bd565b60405180910390fd5b60003073ffffffffffffffffffffffffffffffffffffffff16635aa68ac06040518163ffffffff1660e01b815260040160006040518083038186803b1580156105c857600080fd5b505afa1580156105dc573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f820116820180604052508101906106059190610d94565b905061061082610ac0565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663965a25ef836040518263ffffffff1660e01b815260040161066f9190611101565b602060405180830381600087803b15801561068957600080fd5b505af115801561069d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106c19190610ddd565b50505050565b606060008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff16635aa68ac06040518163ffffffff1660e01b815260040160006040518083038186803b15801561073557600080fd5b505afa158015610749573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f820116820180604052508101906107729190610d94565b91505090565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff166378b903376040518163ffffffff1660e01b815260040160206040518083038186803b15801561080857600080fd5b505afa15801561081c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108409190610ddd565b91505090565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663965a25ef85856040518363ffffffff1660e01b81526004016108a79291906110dd565b602060405180830381600087803b1580156108c157600080fd5b505af11580156108d5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108f99190610ddd565b91505092915050565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff16639738968c6040518163ffffffff1660e01b8152600401602060405180830381600087803b15801561097057600080fd5b505af1158015610984573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109a89190610ddd565b91505090565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663a69df4b56040518163ffffffff1660e01b8152600401600060405180830381600087803b158015610a1c57600080fd5b505af1158015610a30573d6000803e3d6000fd5b5050505050565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663f83d08ba6040518163ffffffff1660e01b8152600401600060405180830381600087803b158015610aa557600080fd5b505af1158015610ab9573d6000803e3d6000fd5b5050505050565b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b6000610b16610b1184611202565b6111dd565b90508083825260208201905082856020860282011115610b3957610b3861144e565b5b60005b85811015610b8757815167ffffffffffffffff811115610b5f57610b5e611444565b5b808601610b6c8982610cec565b85526020850194506020840193505050600181019050610b3c565b5050509392505050565b6000610ba4610b9f8461122e565b6111dd565b905082815260208101848484011115610bc057610bbf611453565b5b610bcb8482856113a7565b509392505050565b600081359050610be281611565565b92915050565b60008083601f840112610bfe57610bfd611444565b5b8235905067ffffffffffffffff811115610c1b57610c1a61143f565b5b602083019150836020820283011115610c3757610c3661144e565b5b9250929050565b600082601f830112610c5357610c52611444565b5b8151610c63848260208601610b03565b91505092915050565b600081519050610c7b8161157c565b92915050565b600081519050610c9081611593565b92915050565b60008083601f840112610cac57610cab611444565b5b8235905067ffffffffffffffff811115610cc957610cc861143f565b5b602083019150836001820283011115610ce557610ce461144e565b5b9250929050565b600082601f830112610d0157610d00611444565b5b8151610d11848260208601610b91565b91505092915050565b600060208284031215610d3057610d2f611462565b5b6000610d3e84828501610bd3565b91505092915050565b60008060208385031215610d5e57610d5d611462565b5b600083013567ffffffffffffffff811115610d7c57610d7b611458565b5b610d8885828601610be8565b92509250509250929050565b600060208284031215610daa57610da9611462565b5b600082015167ffffffffffffffff811115610dc857610dc7611458565b5b610dd484828501610c3e565b91505092915050565b600060208284031215610df357610df2611462565b5b6000610e0184828501610c6c565b91505092915050565b600060208284031215610e2057610e1f611462565b5b6000610e2e84828501610c81565b91505092915050565b60008060208385031215610e4e57610e4d611462565b5b600083013567ffffffffffffffff811115610e6c57610e6b611458565b5b610e7885828601610c96565b92509250509250929050565b6000610e91848484610fc6565b90509392505050565b6000610ea68383611020565b905092915050565b610eb781611350565b82525050565b6000610ec983856112a9565b935083602084028501610edb8461125f565b8060005b87811015610f21578484038952610ef682846112ed565b610f01868284610e84565b9550610f0c8461128f565b935060208b019a505050600181019050610edf565b50829750879450505050509392505050565b6000610f3e82611279565b610f4881856112a9565b935083602082028501610f5a85611269565b8060005b85811015610f965784840389528151610f778582610e9a565b9450610f828361129c565b925060208a01995050600181019050610f5e565b50829750879550505050505092915050565b610fb181611362565b82525050565b610fc08161136e565b82525050565b6000610fd283856112ba565b9350610fdf838584611398565b610fe883611467565b840190509392505050565b6000610fff83856112cb565b935061100c838584611398565b61101583611467565b840190509392505050565b600061102b82611284565b61103581856112ba565b93506110458185602086016113a7565b61104e81611467565b840191505092915050565b60006110666017836112dc565b915061107182611478565b602082019050919050565b60006110896054836112dc565b9150611094826114a1565b606082019050919050565b60006110ac602f836112dc565b91506110b782611516565b604082019050919050565b60006020820190506110d76000830184610eae565b92915050565b600060208201905081810360008301526110f8818486610ebd565b90509392505050565b6000602082019050818103600083015261111b8184610f33565b905092915050565b60006020820190506111386000830184610fa8565b92915050565b60006020820190506111536000830184610fb7565b92915050565b60006020820190508181036000830152611174818486610ff3565b90509392505050565b6000602082019050818103600083015261119681611059565b9050919050565b600060208201905081810360008301526111b68161107c565b9050919050565b600060208201905081810360008301526111d68161109f565b9050919050565b60006111e76111f8565b90506111f382826113da565b919050565b6000604051905090565b600067ffffffffffffffff82111561121d5761121c61140b565b5b602082029050602081019050919050565b600067ffffffffffffffff8211156112495761124861140b565b5b61125282611467565b9050602081019050919050565b6000819050919050565b6000819050602082019050919050565b600081519050919050565b600081519050919050565b6000602082019050919050565b6000602082019050919050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b6000808335600160200384360303811261130a5761130961145d565b5b83810192508235915060208301925067ffffffffffffffff8211156113325761133161143a565b5b60018202360384131561134857611347611449565b5b509250929050565b600061135b82611378565b9050919050565b60008115159050919050565b6000819050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b82818337600083830152505050565b60005b838110156113c55780820151818401526020810190506113aa565b838111156113d4576000848401525b50505050565b6113e382611467565b810181811067ffffffffffffffff821117156114025761140161140b565b5b80604052505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f54686520636f6e7472616374206973206c6f636b65642e000000000000000000600082015250565b7f54686520636f6e747261637420746f207570677261646520746f20686173207460008201527f6f20626520646966666572656e742066726f6d207468652063757272656e742060208201527f6d616e6167656d656e7420636f6e74726163742e000000000000000000000000604082015250565b7f4e6f7420616c6c6f77656420746f207570677261646520746865206d616e616760008201527f656d656e7420636f6e74726163742e0000000000000000000000000000000000602082015250565b61156e81611350565b811461157957600080fd5b50565b61158581611362565b811461159057600080fd5b50565b61159c8161136e565b81146115a757600080fd5b5056fea264697066735822122001e0b04de8d55c3deb395f7e8a600f0ed07dcdec96c5b5791d63e6e3affbb46a64736f6c63430008070033");
+
+  public static final Bytes DEFAULT_GROUP_MANAGEMENT_RUNTIME_BYTECODE =
+      Bytes.fromHexString(
+          "608060405234801561001057600080fd5b50600436106100885760003560e01c8063965a25ef1161005b578063965a25ef146101175780639738968c14610147578063a69df4b514610165578063f83d08ba1461016f57610088565b80630d8e6e2c1461008d5780631f52a8ee146100ab5780635aa68ac0146100db57806378b90337146100f9575b600080fd5b610095610179565b6040516100a291906111c5565b60405180910390f35b6100c560048036038101906100c09190610d38565b610183565b6040516100d2919061111e565b60405180910390f35b6100e361024b565b6040516100f091906110fc565b60405180910390f35b610101610324565b60405161010e919061111e565b60405180910390f35b610131600480360381019061012c9190610ceb565b61033a565b60405161013e919061111e565b60405180910390f35b61014f6104b4565b60405161015c919061111e565b60405180910390f35b61016d61050b565b005b6101776105d0565b005b6000600154905090565b60008060149054906101000a900460ff1661019d57600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff161461022b576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016102229061121e565b60405180910390fd5b60006102378484610693565b90506102416107e6565b8091505092915050565b60606002805480602002602001604051908101604052809291908181526020016000905b8282101561031b57838290600052602060002001805461028e9061144d565b80601f01602080910402602001604051908101604052809291908181526020018280546102ba9061144d565b80156103075780601f106102dc57610100808354040283529160200191610307565b820191906000526020600020905b8154815290600101906020018083116102ea57829003601f168201915b50505050508152602001906001019061026f565b50505050905090565b60008060149054906101000a900460ff16905090565b60008060149054906101000a900460ff161561035557600080fd5b600073ffffffffffffffffffffffffffffffffffffffff1660008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614156103eb57326000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff1614610479576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016104709061121e565b60405180910390fd5b60006104858484610827565b90506001600060146101000a81548160ff0219169083151502179055506104aa6107e6565b8091505092915050565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff1614905090565b600060149054906101000a900460ff161561052557600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff16146105b3576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016105aa9061121e565b60405180910390fd5b6001600060146101000a81548160ff021916908315150217905550565b600060149054906101000a900460ff166105e957600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff1614610677576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161066e9061121e565b60405180910390fd5b60008060146101000a81548160ff021916908315150217905550565b600080600384846040516106a89291906110cc565b90815260200160405180910390205490506000811180156106ce57506002805490508111155b156107da57600280549050811461077a576000600260016002805490506106f59190611385565b8154811061070657610705611555565b5b9060005260206000200190508060026001846107229190611385565b8154811061073357610732611555565b5b906000526020600020019080546107499061144d565b610754929190610acf565b508160038260405161076691906110e5565b908152602001604051809103902081905550505b600280548061078c5761078b611526565b5b6001900381819060005260206000200160006107a89190610b5c565b90556000600385856040516107be9291906110cc565b90815260200160405180910390208190555060019150506107e0565b60009150505b92915050565b6001436107f39190611385565b40416002604051602001610809939291906111e0565b60405160208183030381529060405280519060200120600181905550565b6000806001905060005b848490508110156109f05761086985858381811061085257610851611555565b5b9050602002810190610864919061123e565b6109fb565b156108df577f1673b13ca99fc5f5d54f8ebc163339b3c03f5f661cec3f5dfe506fdbd2602de660008686848181106108a4576108a3611555565b5b90506020028101906108b6919061123e565b6040516108c593929190611180565b60405180910390a18180156108d8575060005b91506109dd565b600061090e8686848181106108f7576108f6611555565b5b9050602002810190610909919061123e565b610a29565b9050600081610952576040518060400160405280601b81526020017f4163636f756e7420697320616c72656164792061204d656d626572000000000081525061096c565b604051806060016040528060218152602001611610602191395b90507f1673b13ca99fc5f5d54f8ebc163339b3c03f5f661cec3f5dfe506fdbd2602de6828888868181106109a3576109a2611555565b5b90506020028101906109b5919061123e565b846040516109c69493929190611139565b60405180910390a18380156109d85750815b935050505b80806109e89061147f565b915050610831565b508091505092915050565b60008060038484604051610a109291906110cc565b9081526020016040518091039020541415905092915050565b60008060038484604051610a3e9291906110cc565b9081526020016040518091039020541415610ac4576002838390918060018154018082558091505060019003906000526020600020016000909192909192909192909192509190610a90929190610b9c565b5060028054905060038484604051610aa99291906110cc565b90815260200160405180910390208190555060019050610ac9565b600090505b92915050565b828054610adb9061144d565b90600052602060002090601f016020900481019282610afd5760008555610b4b565b82601f10610b0e5780548555610b4b565b82800160010185558215610b4b57600052602060002091601f016020900482015b82811115610b4a578254825591600101919060010190610b2f565b5b509050610b589190610c22565b5090565b508054610b689061144d565b6000825580601f10610b7a5750610b99565b601f016020900490600052602060002090810190610b989190610c22565b5b50565b828054610ba89061144d565b90600052602060002090601f016020900481019282610bca5760008555610c11565b82601f10610be357803560ff1916838001178555610c11565b82800160010185558215610c11579182015b82811115610c10578235825591602001919060010190610bf5565b5b509050610c1e9190610c22565b5090565b5b80821115610c3b576000816000905550600101610c23565b5090565b60008083601f840112610c5557610c54611589565b5b8235905067ffffffffffffffff811115610c7257610c71611584565b5b602083019150836020820283011115610c8e57610c8d611598565b5b9250929050565b60008083601f840112610cab57610caa611589565b5b8235905067ffffffffffffffff811115610cc857610cc7611584565b5b602083019150836001820283011115610ce457610ce3611598565b5b9250929050565b60008060208385031215610d0257610d016115a7565b5b600083013567ffffffffffffffff811115610d2057610d1f6115a2565b5b610d2c85828601610c3f565b92509250509250929050565b60008060208385031215610d4f57610d4e6115a7565b5b600083013567ffffffffffffffff811115610d6d57610d6c6115a2565b5b610d7985828601610c95565b92509250509250929050565b6000610d918383610f15565b905092915050565b6000610da58383610fcd565b905092915050565b610db6816113b9565b82525050565b6000610dc7826112f0565b610dd18185611336565b935083602082028501610de3856112a1565b8060005b85811015610e1f5784840389528151610e008582610d85565b9450610e0b8361131c565b925060208a01995050600181019050610de7565b50829750879550505050505092915050565b6000610e3c826112fb565b610e468185611336565b935083602082028501610e58856112b1565b8060005b85811015610e9357848403895281610e748582610d99565b9450610e7f83611329565b925060208a01995050600181019050610e5c565b50829750879550505050505092915050565b610eae816113cb565b82525050565b610ebd816113d7565b82525050565b6000610ecf8385611358565b9350610edc83858461140b565b610ee5836115ac565b840190509392505050565b6000610efc8385611369565b9350610f0983858461140b565b82840190509392505050565b6000610f2082611306565b610f2a8185611347565b9350610f3a81856020860161141a565b610f43816115ac565b840191505092915050565b60008154610f5b8161144d565b610f658186611369565b94506001821660008114610f805760018114610f9157610fc4565b60ff19831686528186019350610fc4565b610f9a856112db565b60005b83811015610fbc57815481890152600182019150602081019050610f9d565b838801955050505b50505092915050565b60008154610fda8161144d565b610fe48186611347565b94506001821660008114610fff576001811461101157611044565b60ff1983168652602086019350611044565b61101a856112c6565b60005b8381101561103c5781548189015260018201915060208101905061101d565b808801955050505b50505092915050565b600061105882611311565b6110628185611374565b935061107281856020860161141a565b61107b816115ac565b840191505092915050565b6000611093601583611374565b915061109e826115bd565b602082019050919050565b60006110b6601b83611374565b91506110c1826115e6565b602082019050919050565b60006110d9828486610ef0565b91508190509392505050565b60006110f18284610f4e565b915081905092915050565b600060208201905081810360008301526111168184610dbc565b905092915050565b60006020820190506111336000830184610ea5565b92915050565b600060608201905061114e6000830187610ea5565b8181036020830152611161818587610ec3565b90508181036040830152611175818461104d565b905095945050505050565b60006060820190506111956000830186610ea5565b81810360208301526111a8818486610ec3565b905081810360408301526111bb816110a9565b9050949350505050565b60006020820190506111da6000830184610eb4565b92915050565b60006060820190506111f56000830186610eb4565b6112026020830185610dad565b81810360408301526112148184610e31565b9050949350505050565b6000602082019050818103600083015261123781611086565b9050919050565b6000808335600160200384360303811261125b5761125a611593565b5b80840192508235915067ffffffffffffffff82111561127d5761127c61158e565b5b6020830192506001820236038313156112995761129861159d565b5b509250929050565b6000819050602082019050919050565b60008190508160005260206000209050919050565b60008190508160005260206000209050919050565b60008190508160005260206000209050919050565b600081519050919050565b600081549050919050565b600081519050919050565b600081519050919050565b6000602082019050919050565b6000600182019050919050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600081905092915050565b600082825260208201905092915050565b600061139082611401565b915061139b83611401565b9250828210156113ae576113ad6114c8565b5b828203905092915050565b60006113c4826113e1565b9050919050565b60008115159050919050565b6000819050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b82818337600083830152505050565b60005b8381101561143857808201518184015260208101905061141d565b83811115611447576000848401525b50505050565b6000600282049050600182168061146557607f821691505b60208210811415611479576114786114f7565b5b50919050565b600061148a82611401565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8214156114bd576114bc6114c8565b5b600182019050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4f726967696e206e6f7420746865206f776e65722e0000000000000000000000600082015250565b7f4163636f756e7420697320616c72656164792061204d656d626572000000000060008201525056fe4d656d626572206163636f756e74206164646564207375636365737366756c6c79a2646970667358221220c72b46f6338ebbdb7d6899962f7502c65afac97831e6ef969db5361611256b8d64736f6c63430008070033");
+
+  public static final Bytes ADD_PARTICIPANTS_METHOD_SIGNATURE = Bytes.fromHexString("0x965a25ef");
+  public static final Bytes CAN_EXECUTE_METHOD_SIGNATURE = Bytes.fromHexString("0x78b90337");
+  public static final Bytes GET_PARTICIPANTS_METHOD_SIGNATURE = Bytes.fromHexString("0x5aa68ac0");
+  public static final Bytes GET_VERSION_METHOD_SIGNATURE = Bytes.fromHexString("0x0d8e6e2c");
+  public static final Bytes LOCK_GROUP_METHOD_SIGNATURE = Bytes.fromHexString("0xf83d08ba");
+  public static final Bytes REMOVE_PARTICIPANT_METHOD_SIGNATURE = Bytes.fromHexString("0x1f52a8ee");
+  public static final Bytes UNLOCK_GROUP_METHOD_SIGNATURE = Bytes.fromHexString("0xa69df4b5");
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/group/OnChainGroupManagement.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/group/OnChainGroupManagement.java
deleted file mode 100644
index e8900f1b90e..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/group/OnChainGroupManagement.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.privacy.group;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public class OnChainGroupManagement {
-  public static final Bytes PROXY_RUNTIME_BYTECODE =
-      Bytes.fromHexString(
-          "608060405234801561001057600080fd5b506004361061009e5760003560e01c80639738968c116100665780639738968c146101b8578063a69df4b5146101d8578063b4926e25146101e2578063f83d08ba146102b0578063fd017797146102ba5761009e565b80630d8e6e2c146100a35780633659cfe6146100c15780635aa68ac0146101055780635c60da1b1461016457806378b9033714610198575b600080fd5b6100ab6102fe565b6040518082815260200191505060405180910390f35b610103600480360360208110156100d757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506103ab565b005b61010d61083e565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b83811015610150578082015181840152602081019050610135565b505050509050019250505060405180910390f35b61016c610987565b604051808273ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6101a06109ab565b60405180821515815260200191505060405180910390f35b6101c0610a58565b60405180821515815260200191505060405180910390f35b6101e0610b07565b005b610298600480360360208110156101f857600080fd5b810190808035906020019064010000000081111561021557600080fd5b82018360208201111561022757600080fd5b8035906020019184602083028401116401000000008311171561024957600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600081840152601f19601f820116905080830192505050505050509192919290505050610b90565b60405180821515815260200191505060405180910390f35b6102b8610c8d565b005b6102e6600480360360208110156102d057600080fd5b8101908080359060200190929190505050610d16565b60405180821515815260200191505060405180910390f35b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff16630d8e6e2c6040518163ffffffff1660e01b815260040160206040518083038186803b15801561036a57600080fd5b505afa15801561037e573d6000803e3d6000fd5b505050506040513d602081101561039457600080fd5b810190808051906020019092919050505091505090565b3073ffffffffffffffffffffffffffffffffffffffff166378b903376040518163ffffffff1660e01b815260040160206040518083038186803b1580156103f157600080fd5b505afa158015610405573d6000803e3d6000fd5b505050506040513d602081101561041b57600080fd5b810190808051906020019092919050505061049e576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260178152602001807f54686520636f6e7472616374206973206c6f636b65642e00000000000000000081525060200191505060405180910390fd5b8073ffffffffffffffffffffffffffffffffffffffff1660008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161415610543576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526054815260200180610e5a6054913960600191505060405180910390fd5b3073ffffffffffffffffffffffffffffffffffffffff16639738968c6040518163ffffffff1660e01b8152600401602060405180830381600087803b15801561058b57600080fd5b505af115801561059f573d6000803e3d6000fd5b505050506040513d60208110156105b557600080fd5b810190808051906020019092919050505061061b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602f815260200180610eae602f913960400191505060405180910390fd5b60603073ffffffffffffffffffffffffffffffffffffffff16635aa68ac06040518163ffffffff1660e01b815260040160006040518083038186803b15801561066357600080fd5b505afa158015610677573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f8201168201806040525060208110156106a157600080fd5b81019080805160405193929190846401000000008211156106c157600080fd5b838201915060208201858111156106d757600080fd5b82518660208202830111640100000000821117156106f457600080fd5b8083526020830192505050908051906020019060200280838360005b8381101561072b578082015181840152602081019050610710565b50505050905001604052505050905061074382610e16565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663b4926e25836040518263ffffffff1660e01b81526004018080602001828103825283818151815260200191508051906020019060200280838360005b838110156107d85780820151818401526020810190506107bd565b5050505090500192505050602060405180830381600087803b1580156107fd57600080fd5b505af1158015610811573d6000803e3d6000fd5b505050506040513d602081101561082757600080fd5b810190808051906020019092919050505050505050565b606060008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff16635aa68ac06040518163ffffffff1660e01b815260040160006040518083038186803b1580156108ac57600080fd5b505afa1580156108c0573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f8201168201806040525060208110156108ea57600080fd5b810190808051604051939291908464010000000082111561090a57600080fd5b8382019150602082018581111561092057600080fd5b825186602082028301116401000000008211171561093d57600080fd5b8083526020830192505050908051906020019060200280838360005b83811015610974578082015181840152602081019050610959565b5050505090500160405250505091505090565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff166378b903376040518163ffffffff1660e01b815260040160206040518083038186803b158015610a1757600080fd5b505afa158015610a2b573d6000803e3d6000fd5b505050506040513d6020811015610a4157600080fd5b810190808051906020019092919050505091505090565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff16639738968c6040518163ffffffff1660e01b8152600401602060405180830381600087803b158015610ac657600080fd5b505af1158015610ada573d6000803e3d6000fd5b505050506040513d6020811015610af057600080fd5b810190808051906020019092919050505091505090565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663a69df4b56040518163ffffffff1660e01b8152600401600060405180830381600087803b158015610b7557600080fd5b505af1158015610b89573d6000803e3d6000fd5b5050505050565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663b4926e25846040518263ffffffff1660e01b81526004018080602001828103825283818151815260200191508051906020019060200280838360005b83811015610c25578082015181840152602081019050610c0a565b5050505090500192505050602060405180830381600087803b158015610c4a57600080fd5b505af1158015610c5e573d6000803e3d6000fd5b505050506040513d6020811015610c7457600080fd5b8101908080519060200190929190505050915050919050565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663f83d08ba6040518163ffffffff1660e01b8152600401600060405180830381600087803b158015610cfb57600080fd5b505af1158015610d0f573d6000803e3d6000fd5b5050505050565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905060008173ffffffffffffffffffffffffffffffffffffffff1663fd017797856040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b158015610d9157600080fd5b505af1158015610da5573d6000803e3d6000fd5b505050506040513d6020811015610dbb57600080fd5b810190808051906020019092919050505090508015610e0c577fef2df0cc0f44b5a36a7de9951ef49ba4d861649244ff89bcf7ffaa1ac7291e89846040518082815260200191505060405180910390a15b8092505050919050565b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505056fe54686520636f6e747261637420746f207570677261646520746f2068617320746f20626520646966666572656e742066726f6d207468652063757272656e74206d616e6167656d656e7420636f6e74726163742e4e6f7420616c6c6f77656420746f207570677261646520746865206d616e6167656d656e7420636f6e74726163742ea26469706673582212203cacc7680fcd907639c87ed995ee91e1de9ef4d7da7437f854fb3a8fbab9b0db64736f6c634300060c0033");
-
-  public static final Bytes DEFAULT_GROUP_MANAGEMENT_RUNTIME_BYTECODE =
-      Bytes.fromHexString(
-          "608060405234801561001057600080fd5b50600436106100885760003560e01c8063a69df4b51161005b578063a69df4b51461014a578063b4926e2514610154578063f83d08ba14610222578063fd0177971461022c57610088565b80630d8e6e2c1461008d5780635aa68ac0146100ab57806378b903371461010a5780639738968c1461012a575b600080fd5b610095610270565b6040518082815260200191505060405180910390f35b6100b361027a565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b838110156100f65780820151818401526020810190506100db565b505050509050019250505060405180910390f35b6101126102d2565b60405180821515815260200191505060405180910390f35b6101326102e8565b60405180821515815260200191505060405180910390f35b61015261033f565b005b61020a6004803603602081101561016a57600080fd5b810190808035906020019064010000000081111561018757600080fd5b82018360208201111561019957600080fd5b803590602001918460208302840111640100000000831117156101bb57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600081840152601f19601f820116905080830192505050505050509192919290505050610437565b60405180821515815260200191505060405180910390f35b61022a6105e3565b005b6102586004803603602081101561024257600080fd5b81019080803590602001909291905050506106d9565b60405180821515815260200191505060405180910390f35b6000600154905090565b606060028054806020026020016040519081016040528092919081815260200182805480156102c857602002820191906000526020600020905b8154815260200190600101908083116102b4575b5050505050905090565b60008060149054906101000a900460ff16905090565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff1614905090565b600060149054906101000a900460ff161561035957600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff161461041a576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260158152602001807f4f726967696e206e6f7420746865206f776e65722e000000000000000000000081525060200191505060405180910390fd5b6001600060146101000a81548160ff021916908315150217905550565b60008060149054906101000a900460ff161561045257600080fd5b600073ffffffffffffffffffffffffffffffffffffffff1660008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614156104e857326000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff16146105a9576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260158152602001807f4f726967696e206e6f7420746865206f776e65722e000000000000000000000081525060200191505060405180910390fd5b60006105b4836107d3565b90506001600060146101000a81548160ff0219169083151502179055506105d9610a0c565b5080915050919050565b600060149054906101000a900460ff166105fc57600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff16146106bd576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260158152602001807f4f726967696e206e6f7420746865206f776e65722e000000000000000000000081525060200191505060405180910390fd5b60008060146101000a81548160ff021916908315150217905550565b60008060149054906101000a900460ff166106f357600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff16146107b4576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260158152602001807f4f726967696e206e6f7420746865206f776e65722e000000000000000000000081525060200191505060405180910390fd5b60006107bf83610a96565b90506107c9610a0c565b5080915050919050565b6000806001905060005b8351811015610a02576108028482815181106107f557fe5b6020026020010151610b81565b156108a7577fcc7365305ae5f16c463d1383713d699f43c5548bbda5537ee61373ceb9aaf213600085838151811061083657fe5b6020026020010151604051808315158152602001828152602001806020018281038252601b8152602001807f4163636f756e7420697320616c72656164792061204d656d6265720000000000815250602001935050505060405180910390a18180156108a0575060005b91506109f5565b60006108c58583815181106108b857fe5b6020026020010151610ba1565b9050606081610909576040518060400160405280601b81526020017f4163636f756e7420697320616c72656164792061204d656d6265720000000000815250610923565b604051806060016040528060218152602001610c18602191395b90507fcc7365305ae5f16c463d1383713d699f43c5548bbda5537ee61373ceb9aaf2138287858151811061095357fe5b60200260200101518360405180841515815260200183815260200180602001828103825283818151815260200191508051906020019080838360005b838110156109aa57808201518184015260208101905061098f565b50505050905090810190601f1680156109d75780820380516001836020036101000a031916815260200191505b5094505050505060405180910390a18380156109f05750815b935050505b80806001019150506107dd565b5080915050919050565b60006001430340416002604051602001808481526020018373ffffffffffffffffffffffffffffffffffffffff1660601b81526014018280548015610a7057602002820191906000526020600020905b815481526020019060010190808311610a5c575b505093505050506040516020818303038152906040528051906020012060018190555090565b60008060036000848152602001908152602001600020549050600081118015610ac457506002805490508111155b15610b76576002805490508114610b32576000600260016002805490500381548110610aec57fe5b906000526020600020015490508060026001840381548110610b0a57fe5b9060005260206000200181905550816003600083815260200190815260200160002081905550505b6002805480610b3d57fe5b60019003818190600052602060002001600090559055600060036000858152602001908152602001600020819055506001915050610b7c565b60009150505b919050565b600080600360008481526020019081526020016000205414159050919050565b60008060036000848152602001908152602001600020541415610c0d576002829080600181540180825580915050600190039060005260206000200160009091909190915055600280549050600360008481526020019081526020016000208190555060019050610c12565b600090505b91905056fe4d656d626572206163636f756e74206164646564207375636365737366756c6c79a26469706673582212208c78668851cd6fd2c8c66c0f57ff99c07d7fa22aaac6e0806def9d467f320ecf64736f6c634300060c0033");
-
-  public static final Bytes ADD_PARTICIPANTS_METHOD_SIGNATURE = Bytes.fromHexString("0xb4926e25");
-  public static final Bytes CAN_EXECUTE_METHOD_SIGNATURE = Bytes.fromHexString("0x78b90337");
-  public static final Bytes GET_PARTICIPANTS_METHOD_SIGNATURE = Bytes.fromHexString("0x5aa68ac0");
-  public static final Bytes GET_VERSION_METHOD_SIGNATURE = Bytes.fromHexString("0x0d8e6e2c");
-  public static final Bytes LOCK_GROUP_METHOD_SIGNATURE = Bytes.fromHexString("0xf83d08ba");
-  public static final Bytes REMOVE_PARTICIPANT_METHOD_SIGNATURE = Bytes.fromHexString("0xfd017797");
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/markertransaction/FixedKeySigningPrivateMarkerTransactionFactory.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/markertransaction/FixedKeySigningPrivateMarkerTransactionFactory.java
index 7063bdedc4e..daca31fadc0 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/markertransaction/FixedKeySigningPrivateMarkerTransactionFactory.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/markertransaction/FixedKeySigningPrivateMarkerTransactionFactory.java
@@ -14,40 +14,37 @@
  */
 package org.hyperledger.besu.ethereum.privacy.markertransaction;
 
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.core.Util;
-import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
-import org.hyperledger.besu.ethereum.util.NonceProvider;
+import org.hyperledger.besu.plugin.data.PrivateTransaction;
+import org.hyperledger.besu.plugin.data.UnsignedPrivateMarkerTransaction;
+import org.hyperledger.besu.plugin.services.privacy.PrivateMarkerTransactionFactory;
+
+import org.apache.tuweni.bytes.Bytes;
 
 public class FixedKeySigningPrivateMarkerTransactionFactory
-    extends PrivateMarkerTransactionFactory {
+    extends SigningPrivateMarkerTransactionFactory implements PrivateMarkerTransactionFactory {
 
-  private final NonceProvider nonceProvider;
   private final KeyPair signingKey;
   private final Address sender;
 
-  public FixedKeySigningPrivateMarkerTransactionFactory(
-      final Address privacyPrecompileAddress,
-      final NonceProvider nonceProvider,
-      final KeyPair signingKey) {
-    super(privacyPrecompileAddress);
-    this.nonceProvider = nonceProvider;
+  public FixedKeySigningPrivateMarkerTransactionFactory(final KeyPair signingKey) {
     this.signingKey = signingKey;
     this.sender = Util.publicKeyToAddress(signingKey.getPublicKey());
   }
 
   @Override
-  public Transaction create(
-      final String privateTransactionLookupId,
+  public Address getSender(
+      final PrivateTransaction privateTransaction, final String privacyUserId) {
+    return this.sender;
+  }
+
+  @Override
+  public Bytes create(
+      final UnsignedPrivateMarkerTransaction unsignedPrivateMarkerTransaction,
       final PrivateTransaction privateTransaction,
-      final Address precompileAddress) {
-    return create(
-        privateTransactionLookupId,
-        privateTransaction,
-        nonceProvider.getNonce(sender),
-        signingKey,
-        precompileAddress);
+      final String privacyUserId) {
+    return signAndBuild(unsignedPrivateMarkerTransaction, signingKey);
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/markertransaction/PrivateMarkerTransactionFactory.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/markertransaction/PrivateMarkerTransactionFactory.java
deleted file mode 100644
index 7d21767798b..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/markertransaction/PrivateMarkerTransactionFactory.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.privacy.markertransaction;
-
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
-import org.hyperledger.besu.plugin.data.TransactionType;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public abstract class PrivateMarkerTransactionFactory {
-
-  private final Address privacyPrecompileAddress;
-
-  protected PrivateMarkerTransactionFactory(final Address privacyPrecompileAddress) {
-    this.privacyPrecompileAddress = privacyPrecompileAddress;
-  }
-
-  public Transaction create(
-      final String privateTransactionLookupId, final PrivateTransaction privateTransaction) {
-    return create(privateTransactionLookupId, privateTransaction, privacyPrecompileAddress);
-  }
-
-  public abstract Transaction create(
-      final String privateTransactionLookupId,
-      final PrivateTransaction privateTransaction,
-      final Address precompileAddress);
-
-  protected Transaction create(
-      final String privateTransactionLookupId,
-      final PrivateTransaction privateTransaction,
-      final long nonce,
-      final KeyPair signingKey,
-      final Address precompileAddress) {
-    return Transaction.builder()
-        .type(TransactionType.FRONTIER)
-        .nonce(nonce)
-        .gasPrice(privateTransaction.getGasPrice())
-        .gasLimit(privateTransaction.getGasLimit())
-        .to(precompileAddress)
-        .value(privateTransaction.getValue())
-        .payload(Bytes.fromBase64String(privateTransactionLookupId))
-        .signAndBuild(signingKey);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/markertransaction/RandomSigningPrivateMarkerTransactionFactory.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/markertransaction/RandomSigningPrivateMarkerTransactionFactory.java
index e6f95de0118..7dce7e906ad 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/markertransaction/RandomSigningPrivateMarkerTransactionFactory.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/markertransaction/RandomSigningPrivateMarkerTransactionFactory.java
@@ -14,23 +14,39 @@
  */
 package org.hyperledger.besu.ethereum.privacy.markertransaction;
 
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.plugin.data.PrivateTransaction;
+import org.hyperledger.besu.plugin.data.UnsignedPrivateMarkerTransaction;
+import org.hyperledger.besu.plugin.services.privacy.PrivateMarkerTransactionFactory;
 
-public class RandomSigningPrivateMarkerTransactionFactory extends PrivateMarkerTransactionFactory {
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
+import org.apache.tuweni.bytes.Bytes;
 
-  public RandomSigningPrivateMarkerTransactionFactory(final Address privacyPrecompileAddress) {
-    super(privacyPrecompileAddress);
+public class RandomSigningPrivateMarkerTransactionFactory
+    extends SigningPrivateMarkerTransactionFactory implements PrivateMarkerTransactionFactory {
+
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM_SUPPLIER =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+
+  @Override
+  public Address getSender(
+      final PrivateTransaction privateTransaction, final String privacyUserId) {
+    // Note the address here is only used as a key to lock nonce generation for the same address
+    final KeyPair signingKey = SIGNATURE_ALGORITHM_SUPPLIER.get().generateKeyPair();
+    return org.hyperledger.besu.datatypes.Address.extract(signingKey.getPublicKey());
   }
 
   @Override
-  public Transaction create(
-      final String privateTransactionLookupId,
+  public Bytes create(
+      final UnsignedPrivateMarkerTransaction unsignedPrivateMarkerTransaction,
       final PrivateTransaction privateTransaction,
-      final Address precompileAddress) {
-    final KeyPair signingKey = KeyPair.generate();
-    return create(privateTransactionLookupId, privateTransaction, 0, signingKey, precompileAddress);
+      final String privacyUserId) {
+    final KeyPair signingKey = SIGNATURE_ALGORITHM_SUPPLIER.get().generateKeyPair();
+
+    return signAndBuild(unsignedPrivateMarkerTransaction, signingKey);
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/markertransaction/SigningPrivateMarkerTransactionFactory.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/markertransaction/SigningPrivateMarkerTransactionFactory.java
new file mode 100644
index 00000000000..db5156a364c
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/markertransaction/SigningPrivateMarkerTransactionFactory.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.privacy.markertransaction;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.plugin.data.TransactionType;
+import org.hyperledger.besu.plugin.data.UnsignedPrivateMarkerTransaction;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class SigningPrivateMarkerTransactionFactory {
+
+  protected Bytes signAndBuild(
+      final UnsignedPrivateMarkerTransaction unsignedPrivateMarkerTransaction,
+      final KeyPair signingKey) {
+    final Transaction transaction =
+        Transaction.builder()
+            .type(TransactionType.FRONTIER)
+            .nonce(unsignedPrivateMarkerTransaction.getNonce())
+            .gasPrice(
+                unsignedPrivateMarkerTransaction.getGasPrice().map(Wei::fromQuantity).orElse(null))
+            .gasLimit(unsignedPrivateMarkerTransaction.getGasLimit())
+            .to(unsignedPrivateMarkerTransaction.getTo().get())
+            .value(Wei.fromQuantity(unsignedPrivateMarkerTransaction.getValue()))
+            .payload(unsignedPrivateMarkerTransaction.getPayload())
+            .signAndBuild(signingKey);
+
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    transaction.writeTo(out);
+    return out.encoded();
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/LegacyPrivateStateKeyValueStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/LegacyPrivateStateKeyValueStorage.java
index c3175c33b0f..91475652c57 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/LegacyPrivateStateKeyValueStorage.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/LegacyPrivateStateKeyValueStorage.java
@@ -16,10 +16,10 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Log;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.evm.log.Log;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
 
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/LegacyPrivateStateStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/LegacyPrivateStateStorage.java
index 4ea10e7dcc6..3c807669290 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/LegacyPrivateStateStorage.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/LegacyPrivateStateStorage.java
@@ -14,8 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.privacy.storage;
 
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Log;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.evm.log.Log;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/PrivacyGroupHeadBlockMap.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/PrivacyGroupHeadBlockMap.java
index 37ce4ee2d2c..b02f30aa0b0 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/PrivacyGroupHeadBlockMap.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/PrivacyGroupHeadBlockMap.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.privacy.storage;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
 
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/PrivateBlockMetadata.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/PrivateBlockMetadata.java
index ed69e9e89fa..3d6e9a48561 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/PrivateBlockMetadata.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/PrivateBlockMetadata.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.privacy.storage;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
 
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/PrivateTransactionMetadata.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/PrivateTransactionMetadata.java
index a99ee5efe1d..f17381b7768 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/PrivateTransactionMetadata.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/PrivateTransactionMetadata.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.privacy.storage;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
 
@@ -22,11 +22,11 @@
 
 /** Mined private transaction metadata. */
 public class PrivateTransactionMetadata {
-  private final Hash privacyMarkerTransactionHash;
+  private final Hash privateMarkerTransactionHash;
   private final Hash stateRoot;
 
-  public PrivateTransactionMetadata(final Hash privacyMarkerTransactionHash, final Hash stateRoot) {
-    this.privacyMarkerTransactionHash = privacyMarkerTransactionHash;
+  public PrivateTransactionMetadata(final Hash privateMarkerTransactionHash, final Hash stateRoot) {
+    this.privateMarkerTransactionHash = privateMarkerTransactionHash;
     this.stateRoot = stateRoot;
   }
 
@@ -34,14 +34,14 @@ public Hash getStateRoot() {
     return stateRoot;
   }
 
-  public Hash getPrivacyMarkerTransactionHash() {
-    return privacyMarkerTransactionHash;
+  public Hash getPrivateMarkerTransactionHash() {
+    return privateMarkerTransactionHash;
   }
 
   public void writeTo(final RLPOutput out) {
     out.startList();
 
-    out.writeBytes(privacyMarkerTransactionHash);
+    out.writeBytes(privateMarkerTransactionHash);
     out.writeBytes(stateRoot);
 
     out.endList();
@@ -63,12 +63,12 @@ public boolean equals(final Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
     final PrivateTransactionMetadata that = (PrivateTransactionMetadata) o;
-    return privacyMarkerTransactionHash.equals(that.privacyMarkerTransactionHash)
+    return privateMarkerTransactionHash.equals(that.privateMarkerTransactionHash)
         && stateRoot.equals(that.stateRoot);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(privacyMarkerTransactionHash, stateRoot);
+    return Objects.hash(privateMarkerTransactionHash, stateRoot);
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/migration/PrivateMigrationBlockProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/migration/PrivateMigrationBlockProcessor.java
index 8a9da8b5f0b..73ebea34384 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/migration/PrivateMigrationBlockProcessor.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/migration/PrivateMigrationBlockProcessor.java
@@ -14,16 +14,16 @@
  */
 package org.hyperledger.besu.ethereum.privacy.storage.migration;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.BlockProcessingOutputs;
+import org.hyperledger.besu.ethereum.BlockProcessingResult;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
 import org.hyperledger.besu.ethereum.mainnet.AbstractBlockProcessor;
 import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
 import org.hyperledger.besu.ethereum.mainnet.MiningBeneficiaryCalculator;
@@ -31,16 +31,20 @@
 import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
+import org.hyperledger.besu.ethereum.vm.CachingBlockHashLookup;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PrivateMigrationBlockProcessor {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PrivateMigrationBlockProcessor.class);
 
   static final int MAX_GENERATION = 6;
 
@@ -72,7 +76,7 @@ public PrivateMigrationBlockProcessor(final ProtocolSpec protocolSpec) {
         protocolSpec.isSkipZeroBlockRewards());
   }
 
-  public AbstractBlockProcessor.Result processBlock(
+  public BlockProcessingResult processBlock(
       final Blockchain blockchain,
       final MutableWorldState worldState,
       final BlockHeader blockHeader,
@@ -89,11 +93,11 @@ public AbstractBlockProcessor.Result processBlock(
                 + " remaining {}",
             transaction.getGasLimit(),
             remainingGasBudget);
-        return AbstractBlockProcessor.Result.failed();
+        return BlockProcessingResult.FAILED;
       }
 
       final WorldUpdater worldStateUpdater = worldState.updater();
-      final BlockHashLookup blockHashLookup = new BlockHashLookup(blockHeader, blockchain);
+      final BlockHashLookup blockHashLookup = new CachingBlockHashLookup(blockHeader, blockchain);
       final Address miningBeneficiary =
           miningBeneficiaryCalculator.calculateBeneficiary(blockHeader);
 
@@ -106,9 +110,10 @@ public AbstractBlockProcessor.Result processBlock(
               miningBeneficiary,
               blockHashLookup,
               true,
-              TransactionValidationParams.processingBlock());
+              TransactionValidationParams.processingBlock(),
+              Wei.ZERO);
       if (result.isInvalid()) {
-        return AbstractBlockProcessor.Result.failed();
+        return BlockProcessingResult.FAILED;
       }
 
       worldStateUpdater.commit();
@@ -119,10 +124,10 @@ public AbstractBlockProcessor.Result processBlock(
     }
 
     if (!rewardCoinbase(worldState, blockHeader, ommers, skipZeroBlockRewards)) {
-      return AbstractBlockProcessor.Result.failed();
+      return BlockProcessingResult.FAILED;
     }
-
-    return AbstractBlockProcessor.Result.successful(receipts);
+    BlockProcessingOutputs blockProcessingOutput = new BlockProcessingOutputs(worldState, receipts);
+    return new BlockProcessingResult(Optional.of(blockProcessingOutput));
   }
 
   private boolean rewardCoinbase(
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/migration/PrivateStorageMigration.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/migration/PrivateStorageMigration.java
index 5b795c9fe66..af9fc214b8e 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/migration/PrivateStorageMigration.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/migration/PrivateStorageMigration.java
@@ -16,11 +16,11 @@
 
 import static org.hyperledger.besu.ethereum.privacy.storage.PrivateStateKeyValueStorage.SCHEMA_VERSION_1_4_0;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
@@ -36,13 +36,13 @@
 import java.util.Set;
 import java.util.function.Function;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PrivateStorageMigration {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PrivateStorageMigration.class);
 
   private final Blockchain blockchain;
   private final Address privacyPrecompileAddress;
@@ -80,7 +80,7 @@ public void migratePrivateStorage() {
 
     LOG.info("Migrating private storage database...");
 
-    for (int blockNumber = 0; blockNumber <= chainHeadBlockNumber; blockNumber++) {
+    for (long blockNumber = 0; blockNumber <= chainHeadBlockNumber; blockNumber++) {
       final Block block =
           blockchain
               .getBlockByNumber(blockNumber)
@@ -93,15 +93,16 @@ public void migratePrivateStorage() {
 
       final int lastPmtIndex = findLastPMTIndexInBlock(block);
       if (lastPmtIndex >= 0) {
-        final ProtocolSpec protocolSpec = protocolSchedule.getByBlockNumber(blockNumber);
+        final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(blockHeader);
         final PrivateMigrationBlockProcessor privateMigrationBlockProcessor =
             privateMigrationBlockProcessorBuilder.apply(protocolSpec);
 
         final MutableWorldState publicWorldState =
             blockchain
                 .getBlockHeader(blockHeader.getParentHash())
-                .map(BlockHeader::getStateRoot)
-                .flatMap(publicWorldStateArchive::getMutable)
+                .flatMap(
+                    header ->
+                        publicWorldStateArchive.getMutable(header.getStateRoot(), header.getHash()))
                 .orElseThrow(PrivateStorageMigrationException::new);
 
         final List<Transaction> transactionsToProcess =
@@ -130,14 +131,14 @@ private int findLastPMTIndexInBlock(final Block block) {
     final List<Transaction> txs = block.getBody().getTransactions();
     int lastPmtIndex = -1;
     for (int i = 0; i < txs.size(); i++) {
-      if (isPrivacyMarkerTransaction(txs.get(i))) {
+      if (isPrivateMarkerTransaction(txs.get(i))) {
         lastPmtIndex = i;
       }
     }
     return lastPmtIndex;
   }
 
-  private boolean isPrivacyMarkerTransaction(final Transaction tx) {
+  private boolean isPrivateMarkerTransaction(final Transaction tx) {
     return tx.getTo().isPresent() && tx.getTo().get().equals(privacyPrecompileAddress);
   }
 
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/migration/PrivateStorageMigrationService.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/migration/PrivateStorageMigrationService.java
index 9b2c7c43653..3eba73fc0a8 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/migration/PrivateStorageMigrationService.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/storage/migration/PrivateStorageMigrationService.java
@@ -21,12 +21,12 @@
 
 import java.util.function.Supplier;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PrivateStorageMigrationService {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PrivateStorageMigrationService.class);
 
   private final PrivateStateStorage privateStateStorage;
   private final boolean migrationFlag;
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/processing/TransactionProcessingResult.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/processing/TransactionProcessingResult.java
index 9053ef416f3..66a7837e39c 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/processing/TransactionProcessingResult.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/processing/TransactionProcessingResult.java
@@ -14,9 +14,9 @@
  */
 package org.hyperledger.besu.ethereum.processing;
 
-import org.hyperledger.besu.ethereum.core.Log;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
 import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
+import org.hyperledger.besu.evm.log.Log;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/proof/WorldStateProofProvider.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/proof/WorldStateProofProvider.java
index 761e9151cf9..d9f23f39566 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/proof/WorldStateProofProvider.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/proof/WorldStateProofProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,25 +14,38 @@
  */
 package org.hyperledger.besu.ethereum.proof;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.rlp.RLP;
-import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.trie.InnerNodeDiscoveryManager;
+import org.hyperledger.besu.ethereum.trie.InnerNodeDiscoveryManager.InnerNode;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.MerkleTrieException;
 import org.hyperledger.besu.ethereum.trie.Proof;
-import org.hyperledger.besu.ethereum.trie.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.trie.patricia.RemoveVisitor;
+import org.hyperledger.besu.ethereum.trie.patricia.SimpleMerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
 import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.NavigableMap;
 import java.util.Optional;
 import java.util.SortedMap;
 import java.util.TreeMap;
+import java.util.function.Function;
 
+import com.google.common.collect.Ordering;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.units.bigints.UInt256;
 
+/**
+ * The WorldStateProofProvider class is responsible for providing proofs for world state entries. It
+ * interacts with the underlying storage and trie data structures to generate proofs.
+ */
 public class WorldStateProofProvider {
 
   private final WorldStateStorage worldStateStorage;
@@ -46,12 +59,12 @@ public Optional<WorldStateProof> getAccountProof(
       final Address accountAddress,
       final List<UInt256> accountStorageKeys) {
 
-    if (!worldStateStorage.isWorldStateAvailable(worldStateRoot)) {
+    if (!worldStateStorage.isWorldStateAvailable(worldStateRoot, null)) {
       return Optional.empty();
     } else {
-      final Hash addressHash = Hash.hash(accountAddress);
+      final Hash accountHash = Hash.hash(accountAddress);
       final Proof<Bytes> accountProof =
-          newAccountStateTrie(worldStateRoot).getValueWithProof(addressHash);
+          newAccountStateTrie(worldStateRoot).getValueWithProof(accountHash);
 
       return accountProof
           .getValue()
@@ -60,29 +73,154 @@ public Optional<WorldStateProof> getAccountProof(
           .map(
               account -> {
                 final SortedMap<UInt256, Proof<Bytes>> storageProofs =
-                    getStorageProofs(account, accountStorageKeys);
+                    getStorageProofs(accountHash, account, accountStorageKeys);
                 return new WorldStateProof(account, accountProof, storageProofs);
               });
     }
   }
 
   private SortedMap<UInt256, Proof<Bytes>> getStorageProofs(
-      final StateTrieAccountValue account, final List<UInt256> accountStorageKeys) {
-    final MerklePatriciaTrie<Bytes32, Bytes> storageTrie =
-        newAccountStorageTrie(account.getStorageRoot());
+      final Hash accountHash,
+      final StateTrieAccountValue account,
+      final List<UInt256> accountStorageKeys) {
+    final MerkleTrie<Bytes32, Bytes> storageTrie =
+        newAccountStorageTrie(accountHash, account.getStorageRoot());
     final NavigableMap<UInt256, Proof<Bytes>> storageProofs = new TreeMap<>();
     accountStorageKeys.forEach(
-        key -> storageProofs.put(key, storageTrie.getValueWithProof(Hash.hash(key.toBytes()))));
+        key -> storageProofs.put(key, storageTrie.getValueWithProof(Hash.hash(key))));
     return storageProofs;
   }
 
-  private MerklePatriciaTrie<Bytes32, Bytes> newAccountStateTrie(final Bytes32 rootHash) {
+  /**
+   * Retrieves the proof-related nodes for an account in the specified world state.
+   *
+   * @param worldStateRoot The root hash of the world state.
+   * @param accountHash The hash of the account.
+   * @return A list of proof-related nodes for the account.
+   */
+  public List<Bytes> getAccountProofRelatedNodes(
+      final Hash worldStateRoot, final Bytes32 accountHash) {
+    final Proof<Bytes> accountProof =
+        newAccountStateTrie(worldStateRoot).getValueWithProof(accountHash);
+    return accountProof.getProofRelatedNodes();
+  }
+
+  /**
+   * Retrieves the proof-related nodes for a storage slot in the specified account storage trie.
+   *
+   * @param storageRoot The root hash of the account storage trie.
+   * @param accountHash The hash of the account.
+   * @param slotHash The hash of the storage slot.
+   * @return A list of proof-related nodes for the storage slot.
+   */
+  public List<Bytes> getStorageProofRelatedNodes(
+      final Bytes32 storageRoot, final Bytes32 accountHash, final Bytes32 slotHash) {
+    final Proof<Bytes> storageProof =
+        newAccountStorageTrie(Hash.wrap(accountHash), storageRoot).getValueWithProof(slotHash);
+    return storageProof.getProofRelatedNodes();
+  }
+
+  private MerkleTrie<Bytes, Bytes> newAccountStateTrie(final Bytes32 rootHash) {
     return new StoredMerklePatriciaTrie<>(
         worldStateStorage::getAccountStateTrieNode, rootHash, b -> b, b -> b);
   }
 
-  private MerklePatriciaTrie<Bytes32, Bytes> newAccountStorageTrie(final Bytes32 rootHash) {
+  private MerkleTrie<Bytes32, Bytes> newAccountStorageTrie(
+      final Hash accountHash, final Bytes32 rootHash) {
     return new StoredMerklePatriciaTrie<>(
-        worldStateStorage::getAccountStorageTrieNode, rootHash, b -> b, b -> b);
+        (location, hash) ->
+            worldStateStorage.getAccountStorageTrieNode(accountHash, location, hash),
+        rootHash,
+        b -> b,
+        b -> b);
+  }
+
+  /**
+   * Checks if a range proof is valid for a given range of keys.
+   *
+   * @param startKeyHash The hash of the starting key in the range.
+   * @param endKeyHash The hash of the ending key in the range.
+   * @param rootHash The root hash of the Merkle Trie.
+   * @param proofs The list of proofs for the keys in the range.
+   * @param keys The TreeMap of key-value pairs representing the range.
+   * @return {@code true} if the range proof is valid, {@code false} otherwise.
+   */
+  public boolean isValidRangeProof(
+      final Bytes32 startKeyHash,
+      final Bytes32 endKeyHash,
+      final Bytes32 rootHash,
+      final List<Bytes> proofs,
+      final TreeMap<Bytes32, Bytes> keys) {
+
+    // check if it's monotonic increasing
+    if (!Ordering.natural().isOrdered(keys.keySet())) {
+      return false;
+    }
+
+    // when proof is empty we need to have all the keys to reconstruct the trie
+    if (proofs.isEmpty()) {
+      final MerkleTrie<Bytes, Bytes> trie = new SimpleMerklePatriciaTrie<>(Function.identity());
+      // add the received keys in the trie
+      for (Map.Entry<Bytes32, Bytes> key : keys.entrySet()) {
+        trie.put(key.getKey(), key.getValue());
+      }
+
+      return rootHash.equals(trie.getRootHash());
+    }
+
+    // reconstruct a part of the trie with the proof
+    final Map<Bytes32, Bytes> proofsEntries = new HashMap<>();
+    for (Bytes proof : proofs) {
+      proofsEntries.put(Hash.hash(proof), proof);
+    }
+
+    if (keys.isEmpty()) {
+      final MerkleTrie<Bytes, Bytes> trie =
+          new StoredMerklePatriciaTrie<>(
+              new InnerNodeDiscoveryManager<>(
+                  (location, hash) -> Optional.ofNullable(proofsEntries.get(hash)),
+                  Function.identity(),
+                  Function.identity(),
+                  startKeyHash,
+                  endKeyHash,
+                  false),
+              rootHash);
+      try {
+        // check if there is not missing element
+        // a missing node will throw an exception while it is loading
+        // @see org.hyperledger.besu.ethereum.trie.StoredNode#load()
+        trie.entriesFrom(startKeyHash, Integer.MAX_VALUE);
+      } catch (MerkleTrieException e) {
+        return false;
+      }
+      return true;
+    }
+
+    // search inner nodes in the range created by the proofs and remove
+    final InnerNodeDiscoveryManager<Bytes> snapStoredNodeFactory =
+        new InnerNodeDiscoveryManager<>(
+            (location, hash) -> Optional.ofNullable(proofsEntries.get(hash)),
+            Function.identity(),
+            Function.identity(),
+            startKeyHash,
+            keys.lastKey(),
+            true);
+    final MerkleTrie<Bytes, Bytes> trie =
+        new StoredMerklePatriciaTrie<>(snapStoredNodeFactory, rootHash);
+    // filling out innerNodes of the InnerNodeDiscoveryManager by walking through the trie
+    trie.visitAll(node -> {});
+    final List<InnerNode> innerNodes = snapStoredNodeFactory.getInnerNodes();
+    for (InnerNode innerNode : innerNodes) {
+      trie.removePath(
+          Bytes.concatenate(innerNode.location(), innerNode.path()), new RemoveVisitor<>(false));
+    }
+
+    // add the received keys in the trie to reconstruct the trie
+    for (Map.Entry<Bytes32, Bytes> account : keys.entrySet()) {
+      trie.put(account.getKey(), account.getValue());
+    }
+
+    // check if the generated root hash is valid
+    return rootHash.equals(trie.getRootHash());
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/StorageProvider.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/StorageProvider.java
index cad37c1168a..fea099d5769 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/StorageProvider.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/StorageProvider.java
@@ -15,23 +15,33 @@
 package org.hyperledger.besu.ethereum.storage;
 
 import org.hyperledger.besu.ethereum.chain.BlockchainStorage;
+import org.hyperledger.besu.ethereum.chain.VariablesStorage;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
 import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier;
+import org.hyperledger.besu.plugin.services.storage.SnappableKeyValueStorage;
 
 import java.io.Closeable;
 
 public interface StorageProvider extends Closeable {
 
-  BlockchainStorage createBlockchainStorage(ProtocolSchedule protocolSchedule);
+  VariablesStorage createVariablesStorage();
 
-  WorldStateStorage createWorldStateStorage();
+  BlockchainStorage createBlockchainStorage(
+      ProtocolSchedule protocolSchedule, VariablesStorage variablesStorage);
+
+  WorldStateStorage createWorldStateStorage(DataStorageFormat dataStorageFormat);
 
   WorldStatePreimageStorage createWorldStatePreimageStorage();
 
   KeyValueStorage getStorageBySegmentIdentifier(SegmentIdentifier segment);
 
+  SnappableKeyValueStorage getSnappableStorageBySegmentIdentifier(SegmentIdentifier segment);
+
   boolean isWorldStateIterable();
+
+  boolean isWorldStateSnappable();
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueSegmentIdentifier.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueSegmentIdentifier.java
index 996b6ec8f4d..9cce0230cdb 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueSegmentIdentifier.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueSegmentIdentifier.java
@@ -19,7 +19,7 @@
 import org.bouncycastle.util.Arrays;
 
 public enum KeyValueSegmentIdentifier implements SegmentIdentifier {
-  BLOCKCHAIN(new byte[] {1}),
+  BLOCKCHAIN(new byte[] {1}, true),
   WORLD_STATE(new byte[] {2}, new int[] {0, 1}),
   PRIVATE_TRANSACTIONS(new byte[] {3}),
   PRIVATE_STATE(new byte[] {4}),
@@ -28,18 +28,41 @@ public enum KeyValueSegmentIdentifier implements SegmentIdentifier {
   CODE_STORAGE(new byte[] {7}, new int[] {2}),
   ACCOUNT_STORAGE_STORAGE(new byte[] {8}, new int[] {2}),
   TRIE_BRANCH_STORAGE(new byte[] {9}, new int[] {2}),
-  TRIE_LOG_STORAGE(new byte[] {10}, new int[] {2});
+  TRIE_LOG_STORAGE(new byte[] {10}, new int[] {2}),
+  VARIABLES(new byte[] {11}), // formerly GOQUORUM_PRIVATE_WORLD_STATE
+
+  // previously supported GoQuorum private states
+  // no longer used but need to be retained for db backward compatibility
+  GOQUORUM_PRIVATE_STORAGE(new byte[] {12}),
+
+  BACKWARD_SYNC_HEADERS(new byte[] {13}),
+  BACKWARD_SYNC_BLOCKS(new byte[] {14}),
+  BACKWARD_SYNC_CHAIN(new byte[] {15}),
+  SNAPSYNC_MISSING_ACCOUNT_RANGE(new byte[] {16}),
+  SNAPSYNC_ACCOUNT_TO_FIX(new byte[] {17}),
+  CHAIN_PRUNER_STATE(new byte[] {18});
 
   private final byte[] id;
   private final int[] versionList;
+  private final boolean containsStaticData;
 
   KeyValueSegmentIdentifier(final byte[] id) {
     this(id, new int[] {0, 1, 2});
   }
 
+  KeyValueSegmentIdentifier(final byte[] id, final boolean containsStaticData) {
+    this(id, new int[] {0, 1, 2}, containsStaticData);
+  }
+
   KeyValueSegmentIdentifier(final byte[] id, final int[] versionList) {
+    this(id, versionList, false);
+  }
+
+  KeyValueSegmentIdentifier(
+      final byte[] id, final int[] versionList, final boolean containsStaticData) {
     this.id = id;
     this.versionList = versionList;
+    this.containsStaticData = containsStaticData;
   }
 
   @Override
@@ -52,6 +75,11 @@ public byte[] getId() {
     return id;
   }
 
+  @Override
+  public boolean containsStaticData() {
+    return containsStaticData;
+  }
+
   @Override
   public boolean includeInDatabaseVersion(final int version) {
     return Arrays.contains(versionList, version);
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStoragePrefixedKeyBlockchainStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStoragePrefixedKeyBlockchainStorage.java
index 729557f1b9b..9134ca91c01 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStoragePrefixedKeyBlockchainStorage.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStoragePrefixedKeyBlockchainStorage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,62 +14,80 @@
  */
 package org.hyperledger.besu.ethereum.storage.keyvalue;
 
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.CHAIN_HEAD_HASH;
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.FINALIZED_BLOCK_HASH;
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.FORK_HEADS;
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.SAFE_BLOCK_HASH;
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.SEQ_NO_STORE;
+
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.BlockchainStorage;
 import org.hyperledger.besu.ethereum.chain.TransactionLocation;
+import org.hyperledger.besu.ethereum.chain.VariablesStorage;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
 
-import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 
-import com.google.common.collect.Lists;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.units.bigints.UInt256;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class KeyValueStoragePrefixedKeyBlockchainStorage implements BlockchainStorage {
+  private static final Logger LOG =
+      LoggerFactory.getLogger(KeyValueStoragePrefixedKeyBlockchainStorage.class);
 
-  private static final Bytes CHAIN_HEAD_KEY =
-      Bytes.wrap("chainHeadHash".getBytes(StandardCharsets.UTF_8));
-  private static final Bytes FORK_HEADS_KEY =
-      Bytes.wrap("forkHeads".getBytes(StandardCharsets.UTF_8));
+  @Deprecated(since = "23.4.2", forRemoval = true)
+  private static final Bytes VARIABLES_PREFIX = Bytes.of(1);
 
-  private static final Bytes CONSTANTS_PREFIX = Bytes.of(1);
   private static final Bytes BLOCK_HEADER_PREFIX = Bytes.of(2);
   private static final Bytes BLOCK_BODY_PREFIX = Bytes.of(3);
   private static final Bytes TRANSACTION_RECEIPTS_PREFIX = Bytes.of(4);
   private static final Bytes BLOCK_HASH_PREFIX = Bytes.of(5);
   private static final Bytes TOTAL_DIFFICULTY_PREFIX = Bytes.of(6);
   private static final Bytes TRANSACTION_LOCATION_PREFIX = Bytes.of(7);
-
-  private final KeyValueStorage storage;
-  private final BlockHeaderFunctions blockHeaderFunctions;
+  final KeyValueStorage blockchainStorage;
+  final VariablesStorage variablesStorage;
+  final BlockHeaderFunctions blockHeaderFunctions;
 
   public KeyValueStoragePrefixedKeyBlockchainStorage(
-      final KeyValueStorage storage, final BlockHeaderFunctions blockHeaderFunctions) {
-    this.storage = storage;
+      final KeyValueStorage blockchainStorage,
+      final VariablesStorage variablesStorage,
+      final BlockHeaderFunctions blockHeaderFunctions) {
+    this.blockchainStorage = blockchainStorage;
+    this.variablesStorage = variablesStorage;
     this.blockHeaderFunctions = blockHeaderFunctions;
+    migrateVariables();
   }
 
   @Override
   public Optional<Hash> getChainHead() {
-    return get(CONSTANTS_PREFIX, CHAIN_HEAD_KEY).map(this::bytesToHash);
+    return variablesStorage.getChainHead();
   }
 
   @Override
   public Collection<Hash> getForkHeads() {
-    return get(CONSTANTS_PREFIX, FORK_HEADS_KEY)
-        .map(bytes -> RLP.input(bytes).readList(in -> this.bytesToHash(in.readBytes32())))
-        .orElse(Lists.newArrayList());
+    return variablesStorage.getForkHeads();
+  }
+
+  @Override
+  public Optional<Hash> getFinalized() {
+    return variablesStorage.getFinalized();
+  }
+
+  @Override
+  public Optional<Hash> getSafeBlock() {
+    return variablesStorage.getSafeBlock();
   }
 
   @Override
@@ -81,7 +99,7 @@ public Optional<BlockHeader> getBlockHeader(final Hash blockHash) {
   @Override
   public Optional<BlockBody> getBlockBody(final Hash blockHash) {
     return get(BLOCK_BODY_PREFIX, blockHash)
-        .map(bytes -> BlockBody.readFrom(RLP.input(bytes), blockHeaderFunctions));
+        .map(bytes -> BlockBody.readWrappedBodyFrom(RLP.input(bytes), blockHeaderFunctions));
   }
 
   @Override
@@ -91,7 +109,7 @@ public Optional<List<TransactionReceipt>> getTransactionReceipts(final Hash bloc
 
   @Override
   public Optional<Hash> getBlockHash(final long blockNumber) {
-    return get(BLOCK_HASH_PREFIX, UInt256.valueOf(blockNumber).toBytes()).map(this::bytesToHash);
+    return get(BLOCK_HASH_PREFIX, UInt256.valueOf(blockNumber)).map(this::bytesToHash);
   }
 
   @Override
@@ -107,7 +125,7 @@ public Optional<TransactionLocation> getTransactionLocation(final Hash transacti
 
   @Override
   public Updater updater() {
-    return new Updater(storage.startTransaction());
+    return new Updater(blockchainStorage.startTransaction(), variablesStorage.updater());
   }
 
   private List<TransactionReceipt> rlpDecodeTransactionReceipts(final Bytes bytes) {
@@ -118,16 +136,129 @@ private Hash bytesToHash(final Bytes bytes) {
     return Hash.wrap(Bytes32.wrap(bytes, 0));
   }
 
-  private Optional<Bytes> get(final Bytes prefix, final Bytes key) {
-    return storage.get(Bytes.concatenate(prefix, key).toArrayUnsafe()).map(Bytes::wrap);
+  Optional<Bytes> get(final Bytes prefix, final Bytes key) {
+    return blockchainStorage.get(Bytes.concatenate(prefix, key).toArrayUnsafe()).map(Bytes::wrap);
+  }
+
+  /**
+   * One time migration of variables from the blockchain storage to the dedicated variable storage.
+   * To avoid state inconsistency in case of a downgrade done without running the storage
+   * revert-variables subcommand it fails giving the possibility to retry the downgrade procedure.
+   */
+  private void migrateVariables() {
+    final var blockchainUpdater = updater();
+    final var variablesUpdater = variablesStorage.updater();
+
+    get(VARIABLES_PREFIX, CHAIN_HEAD_HASH.getBytes())
+        .map(this::bytesToHash)
+        .ifPresent(
+            bch ->
+                variablesStorage
+                    .getChainHead()
+                    .ifPresentOrElse(
+                        vch -> {
+                          if (!vch.equals(bch)) {
+                            logInconsistencyAndFail(CHAIN_HEAD_HASH, bch, vch);
+                          }
+                        },
+                        () -> {
+                          variablesUpdater.setChainHead(bch);
+                          LOG.info("Migrated key {} to variables storage", CHAIN_HEAD_HASH);
+                        }));
+
+    get(VARIABLES_PREFIX, FINALIZED_BLOCK_HASH.getBytes())
+        .map(this::bytesToHash)
+        .ifPresent(
+            bfh -> {
+              variablesStorage
+                  .getFinalized()
+                  .ifPresentOrElse(
+                      vfh -> {
+                        if (!vfh.equals(bfh)) {
+                          logInconsistencyAndFail(FINALIZED_BLOCK_HASH, bfh, vfh);
+                        }
+                      },
+                      () -> {
+                        variablesUpdater.setFinalized(bfh);
+                        LOG.info("Migrated key {} to variables storage", FINALIZED_BLOCK_HASH);
+                      });
+            });
+
+    get(VARIABLES_PREFIX, SAFE_BLOCK_HASH.getBytes())
+        .map(this::bytesToHash)
+        .ifPresent(
+            bsh -> {
+              variablesStorage
+                  .getSafeBlock()
+                  .ifPresentOrElse(
+                      vsh -> {
+                        if (!vsh.equals(bsh)) {
+                          logInconsistencyAndFail(SAFE_BLOCK_HASH, bsh, vsh);
+                        }
+                      },
+                      () -> {
+                        variablesUpdater.setSafeBlock(bsh);
+                        LOG.info("Migrated key {} to variables storage", SAFE_BLOCK_HASH);
+                      });
+            });
+
+    get(VARIABLES_PREFIX, FORK_HEADS.getBytes())
+        .map(bytes -> RLP.input(bytes).readList(in -> this.bytesToHash(in.readBytes32())))
+        .ifPresent(
+            bfh -> {
+              final var vfh = variablesStorage.getForkHeads();
+              if (vfh.isEmpty()) {
+                variablesUpdater.setForkHeads(bfh);
+                LOG.info("Migrated key {} to variables storage", FORK_HEADS);
+              } else if (!List.copyOf(vfh).equals(bfh)) {
+                logInconsistencyAndFail(FORK_HEADS, bfh, vfh);
+              }
+            });
+
+    get(Bytes.EMPTY, SEQ_NO_STORE.getBytes())
+        .ifPresent(
+            bsns -> {
+              variablesStorage
+                  .getLocalEnrSeqno()
+                  .ifPresentOrElse(
+                      vsns -> {
+                        if (!vsns.equals(bsns)) {
+                          logInconsistencyAndFail(SEQ_NO_STORE, bsns, vsns);
+                        }
+                      },
+                      () -> {
+                        variablesUpdater.setLocalEnrSeqno(bsns);
+                        LOG.info("Migrated key {} to variables storage", SEQ_NO_STORE);
+                      });
+            });
+
+    blockchainUpdater.removeVariables();
+
+    variablesUpdater.commit();
+    blockchainUpdater.commit();
+  }
+
+  private static void logInconsistencyAndFail(
+      final VariablesStorage.Keys key, final Object bch, final Object vch) {
+    LOG.error(
+        "Inconsistency found when migrating {} to variables storage,"
+            + " probably this is due to a downgrade done without running the `storage revert-variables`"
+            + " subcommand first, see https://github.com/hyperledger/besu/pull/5471",
+        key);
+    throw new IllegalStateException(
+        key + " mismatch: blockchain storage value=" + bch + ", variables storage value=" + vch);
   }
 
   public static class Updater implements BlockchainStorage.Updater {
 
-    private final KeyValueStorageTransaction transaction;
+    private final KeyValueStorageTransaction blockchainTransaction;
+    private final VariablesStorage.Updater variablesUpdater;
 
-    private Updater(final KeyValueStorageTransaction transaction) {
-      this.transaction = transaction;
+    Updater(
+        final KeyValueStorageTransaction blockchainTransaction,
+        final VariablesStorage.Updater variablesUpdater) {
+      this.blockchainTransaction = blockchainTransaction;
+      this.variablesUpdater = variablesUpdater;
     }
 
     @Override
@@ -137,7 +268,7 @@ public void putBlockHeader(final Hash blockHash, final BlockHeader blockHeader)
 
     @Override
     public void putBlockBody(final Hash blockHash, final BlockBody blockBody) {
-      set(BLOCK_BODY_PREFIX, blockHash, RLP.encode(blockBody::writeTo));
+      set(BLOCK_BODY_PREFIX, blockHash, RLP.encode(blockBody::writeWrappedBodyTo));
     }
 
     @Override
@@ -154,29 +285,52 @@ public void putTransactionReceipts(
 
     @Override
     public void putBlockHash(final long blockNumber, final Hash blockHash) {
-      set(BLOCK_HASH_PREFIX, UInt256.valueOf(blockNumber).toBytes(), blockHash);
+      set(BLOCK_HASH_PREFIX, UInt256.valueOf(blockNumber), blockHash);
     }
 
     @Override
     public void putTotalDifficulty(final Hash blockHash, final Difficulty totalDifficulty) {
-      set(TOTAL_DIFFICULTY_PREFIX, blockHash, totalDifficulty.toBytes());
+      set(TOTAL_DIFFICULTY_PREFIX, blockHash, totalDifficulty);
     }
 
     @Override
     public void setChainHead(final Hash blockHash) {
-      set(CONSTANTS_PREFIX, CHAIN_HEAD_KEY, blockHash);
+      variablesUpdater.setChainHead(blockHash);
     }
 
     @Override
     public void setForkHeads(final Collection<Hash> forkHeadHashes) {
-      final Bytes data =
-          RLP.encode(o -> o.writeList(forkHeadHashes, (val, out) -> out.writeBytes(val)));
-      set(CONSTANTS_PREFIX, FORK_HEADS_KEY, data);
+      variablesUpdater.setForkHeads(forkHeadHashes);
+    }
+
+    @Override
+    public void setFinalized(final Hash blockHash) {
+      variablesUpdater.setFinalized(blockHash);
+    }
+
+    @Override
+    public void setSafeBlock(final Hash blockHash) {
+      variablesUpdater.setSafeBlock(blockHash);
     }
 
     @Override
     public void removeBlockHash(final long blockNumber) {
-      remove(BLOCK_HASH_PREFIX, UInt256.valueOf(blockNumber).toBytes());
+      remove(BLOCK_HASH_PREFIX, UInt256.valueOf(blockNumber));
+    }
+
+    @Override
+    public void removeBlockHeader(final Hash blockHash) {
+      remove(BLOCK_HEADER_PREFIX, blockHash);
+    }
+
+    @Override
+    public void removeBlockBody(final Hash blockHash) {
+      remove(BLOCK_BODY_PREFIX, blockHash);
+    }
+
+    @Override
+    public void removeTransactionReceipts(final Hash blockHash) {
+      remove(TRANSACTION_RECEIPTS_PREFIX, blockHash);
     }
 
     @Override
@@ -184,26 +338,42 @@ public void removeTransactionLocation(final Hash transactionHash) {
       remove(TRANSACTION_LOCATION_PREFIX, transactionHash);
     }
 
+    @Override
+    public void removeTotalDifficulty(final Hash blockHash) {
+      remove(TOTAL_DIFFICULTY_PREFIX, blockHash);
+    }
+
     @Override
     public void commit() {
-      transaction.commit();
+      blockchainTransaction.commit();
+      variablesUpdater.commit();
     }
 
     @Override
     public void rollback() {
-      transaction.rollback();
+      variablesUpdater.rollback();
+      blockchainTransaction.rollback();
     }
 
-    private void set(final Bytes prefix, final Bytes key, final Bytes value) {
-      transaction.put(Bytes.concatenate(prefix, key).toArrayUnsafe(), value.toArrayUnsafe());
+    void set(final Bytes prefix, final Bytes key, final Bytes value) {
+      blockchainTransaction.put(
+          Bytes.concatenate(prefix, key).toArrayUnsafe(), value.toArrayUnsafe());
     }
 
     private void remove(final Bytes prefix, final Bytes key) {
-      transaction.remove(Bytes.concatenate(prefix, key).toArrayUnsafe());
+      blockchainTransaction.remove(Bytes.concatenate(prefix, key).toArrayUnsafe());
     }
 
     private Bytes rlpEncode(final List<TransactionReceipt> receipts) {
       return RLP.encode(o -> o.writeList(receipts, TransactionReceipt::writeToWithRevertReason));
     }
+
+    private void removeVariables() {
+      remove(VARIABLES_PREFIX, CHAIN_HEAD_HASH.getBytes());
+      remove(VARIABLES_PREFIX, FINALIZED_BLOCK_HASH.getBytes());
+      remove(VARIABLES_PREFIX, SAFE_BLOCK_HASH.getBytes());
+      remove(VARIABLES_PREFIX, FORK_HEADS.getBytes());
+      remove(Bytes.EMPTY, SEQ_NO_STORE.getBytes());
+    }
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStorageProvider.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStorageProvider.java
index 403d223edc3..13ad3270f01 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStorageProvider.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStorageProvider.java
@@ -14,14 +14,19 @@
  */
 package org.hyperledger.besu.ethereum.storage.keyvalue;
 
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
 import org.hyperledger.besu.ethereum.chain.BlockchainStorage;
+import org.hyperledger.besu.ethereum.chain.VariablesStorage;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.storage.StorageProvider;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.metrics.ObservableMetricsSystem;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
 import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier;
+import org.hyperledger.besu.plugin.services.storage.SnappableKeyValueStorage;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -30,31 +35,52 @@
 
 public class KeyValueStorageProvider implements StorageProvider {
 
-  private final Function<SegmentIdentifier, KeyValueStorage> storageCreator;
+  public static final boolean SEGMENT_ISOLATION_SUPPORTED = true;
+  public static final boolean SNAPSHOT_ISOLATION_UNSUPPORTED = false;
+
+  protected final Function<SegmentIdentifier, KeyValueStorage> storageCreator;
   private final KeyValueStorage worldStatePreimageStorage;
   private final boolean isWorldStateIterable;
-  private final Map<SegmentIdentifier, KeyValueStorage> storageInstances = new HashMap<>();
+  private final boolean isWorldStateSnappable;
+  protected final Map<SegmentIdentifier, KeyValueStorage> storageInstances = new HashMap<>();
+  private final ObservableMetricsSystem metricsSystem;
 
   public KeyValueStorageProvider(
       final Function<SegmentIdentifier, KeyValueStorage> storageCreator,
       final KeyValueStorage worldStatePreimageStorage,
-      final boolean segmentIsolationSupported) {
+      final boolean segmentIsolationSupported,
+      final boolean storageSnapshotIsolationSupported,
+      final ObservableMetricsSystem metricsSystem) {
     this.storageCreator = storageCreator;
     this.worldStatePreimageStorage = worldStatePreimageStorage;
     this.isWorldStateIterable = segmentIsolationSupported;
+    this.isWorldStateSnappable = storageSnapshotIsolationSupported;
+    this.metricsSystem = metricsSystem;
+  }
+
+  @Override
+  public VariablesStorage createVariablesStorage() {
+    return new VariablesKeyValueStorage(
+        getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.VARIABLES));
   }
 
   @Override
-  public BlockchainStorage createBlockchainStorage(final ProtocolSchedule protocolSchedule) {
+  public BlockchainStorage createBlockchainStorage(
+      final ProtocolSchedule protocolSchedule, final VariablesStorage variablesStorage) {
     return new KeyValueStoragePrefixedKeyBlockchainStorage(
         getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.BLOCKCHAIN),
+        variablesStorage,
         ScheduleBasedBlockHeaderFunctions.create(protocolSchedule));
   }
 
   @Override
-  public WorldStateStorage createWorldStateStorage() {
-    return new WorldStateKeyValueStorage(
-        getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.WORLD_STATE));
+  public WorldStateStorage createWorldStateStorage(final DataStorageFormat dataStorageFormat) {
+    if (dataStorageFormat.equals(DataStorageFormat.BONSAI)) {
+      return new BonsaiWorldStateKeyValueStorage(this, metricsSystem);
+    } else {
+      return new WorldStateKeyValueStorage(
+          getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.WORLD_STATE));
+    }
   }
 
   @Override
@@ -67,11 +93,22 @@ public KeyValueStorage getStorageBySegmentIdentifier(final SegmentIdentifier seg
     return storageInstances.computeIfAbsent(segment, storageCreator);
   }
 
+  @Override
+  public SnappableKeyValueStorage getSnappableStorageBySegmentIdentifier(
+      final SegmentIdentifier segment) {
+    return (SnappableKeyValueStorage) getStorageBySegmentIdentifier(segment);
+  }
+
   @Override
   public boolean isWorldStateIterable() {
     return isWorldStateIterable;
   }
 
+  @Override
+  public boolean isWorldStateSnappable() {
+    return isWorldStateSnappable;
+  }
+
   @Override
   public void close() throws IOException {
     for (final KeyValueStorage kvs : storageInstances.values()) {
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStorageProviderBuilder.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStorageProviderBuilder.java
index ae2dea9744c..2bddd3d5825 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStorageProviderBuilder.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStorageProviderBuilder.java
@@ -16,6 +16,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import org.hyperledger.besu.metrics.ObservableMetricsSystem;
 import org.hyperledger.besu.plugin.services.BesuConfiguration;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
@@ -62,6 +63,8 @@ public KeyValueStorageProvider build() {
     return new KeyValueStorageProvider(
         segment -> storageFactory.create(segment, commonConfiguration, metricsSystem),
         worldStatePreImageStorage,
-        storageFactory.isSegmentIsolationSupported());
+        storageFactory.isSegmentIsolationSupported(),
+        storageFactory.isSnapshotIsolationSupported(),
+        (ObservableMetricsSystem) metricsSystem);
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/VariablesKeyValueStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/VariablesKeyValueStorage.java
new file mode 100644
index 00000000000..28e6648a82d
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/VariablesKeyValueStorage.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.storage.keyvalue;
+
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.CHAIN_HEAD_HASH;
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.FINALIZED_BLOCK_HASH;
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.FORK_HEADS;
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.SAFE_BLOCK_HASH;
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.SEQ_NO_STORE;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.chain.VariablesStorage;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
+
+import java.util.Collection;
+import java.util.Optional;
+
+import com.google.common.collect.Lists;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+public class VariablesKeyValueStorage implements VariablesStorage {
+  final KeyValueStorage variables;
+
+  public VariablesKeyValueStorage(final KeyValueStorage variables) {
+    this.variables = variables;
+  }
+
+  @Override
+  public Optional<Hash> getChainHead() {
+    return getVariable(CHAIN_HEAD_HASH).map(this::bytesToHash);
+  }
+
+  @Override
+  public Collection<Hash> getForkHeads() {
+    return getVariable(FORK_HEADS)
+        .map(bytes -> RLP.input(bytes).readList(in -> this.bytesToHash(in.readBytes32())))
+        .orElse(Lists.newArrayList());
+  }
+
+  @Override
+  public Optional<Hash> getFinalized() {
+    return getVariable(FINALIZED_BLOCK_HASH).map(this::bytesToHash);
+  }
+
+  @Override
+  public Optional<Hash> getSafeBlock() {
+    return getVariable(SAFE_BLOCK_HASH).map(this::bytesToHash);
+  }
+
+  @Override
+  public Optional<Bytes> getLocalEnrSeqno() {
+    return getVariable(SEQ_NO_STORE).map(Bytes::wrap);
+  }
+
+  @Override
+  public Updater updater() {
+    return new Updater(variables.startTransaction());
+  }
+
+  private Hash bytesToHash(final Bytes bytes) {
+    return Hash.wrap(Bytes32.wrap(bytes, 0));
+  }
+
+  Optional<Bytes> getVariable(final Keys key) {
+    return variables.get(key.toByteArray()).map(Bytes::wrap);
+  }
+
+  public static class Updater implements VariablesStorage.Updater {
+
+    private final KeyValueStorageTransaction variablesTransaction;
+
+    Updater(final KeyValueStorageTransaction variablesTransaction) {
+      this.variablesTransaction = variablesTransaction;
+    }
+
+    @Override
+    public void setChainHead(final Hash blockHash) {
+      setVariable(CHAIN_HEAD_HASH, blockHash);
+    }
+
+    @Override
+    public void setForkHeads(final Collection<Hash> forkHeadHashes) {
+      final Bytes data =
+          RLP.encode(o -> o.writeList(forkHeadHashes, (val, out) -> out.writeBytes(val)));
+      setVariable(FORK_HEADS, data);
+    }
+
+    @Override
+    public void setFinalized(final Hash blockHash) {
+      setVariable(FINALIZED_BLOCK_HASH, blockHash);
+    }
+
+    @Override
+    public void setSafeBlock(final Hash blockHash) {
+      setVariable(SAFE_BLOCK_HASH, blockHash);
+    }
+
+    @Override
+    public void setLocalEnrSeqno(final Bytes nodeRecord) {
+      setVariable(SEQ_NO_STORE, nodeRecord);
+    }
+
+    @Override
+    public void removeAll() {
+      removeVariable(CHAIN_HEAD_HASH);
+      removeVariable(FINALIZED_BLOCK_HASH);
+      removeVariable(SAFE_BLOCK_HASH);
+      removeVariable(FORK_HEADS);
+      removeVariable(SEQ_NO_STORE);
+    }
+
+    @Override
+    public void commit() {
+      variablesTransaction.commit();
+    }
+
+    @Override
+    public void rollback() {
+      variablesTransaction.rollback();
+    }
+
+    void setVariable(final Keys key, final Bytes value) {
+      variablesTransaction.put(key.toByteArray(), value.toArrayUnsafe());
+    }
+
+    void removeVariable(final Keys key) {
+      variablesTransaction.remove(key.toByteArray());
+    }
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/WorldStateKeyValueStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/WorldStateKeyValueStorage.java
index 455b1e75e9b..007a65f2138 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/WorldStateKeyValueStorage.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/WorldStateKeyValueStorage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,8 +14,10 @@
  */
 package org.hyperledger.besu.ethereum.storage.keyvalue;
 
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.ethereum.worldstate.FlatDbMode;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
@@ -44,7 +46,12 @@ public WorldStateKeyValueStorage(final KeyValueStorage keyValueStorage) {
   }
 
   @Override
-  public Optional<Bytes> getCode(final Bytes32 codeHash) {
+  public DataStorageFormat getDataStorageFormat() {
+    return DataStorageFormat.FOREST;
+  }
+
+  @Override
+  public Optional<Bytes> getCode(final Bytes32 codeHash, final Hash accountHash) {
     if (codeHash.equals(Hash.EMPTY)) {
       return Optional.of(Bytes.EMPTY);
     } else {
@@ -58,22 +65,28 @@ public Optional<Bytes> getAccountStateTrieNode(final Bytes location, final Bytes
   }
 
   @Override
-  public Optional<Bytes> getAccountStorageTrieNode(final Bytes location, final Bytes32 nodeHash) {
+  public Optional<Bytes> getAccountStorageTrieNode(
+      final Hash accountHash, final Bytes location, final Bytes32 nodeHash) {
     return getTrieNode(nodeHash);
   }
 
   private Optional<Bytes> getTrieNode(final Bytes32 nodeHash) {
-    if (nodeHash.equals(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH)) {
-      return Optional.of(MerklePatriciaTrie.EMPTY_TRIE_NODE);
+    if (nodeHash.equals(MerkleTrie.EMPTY_TRIE_NODE_HASH)) {
+      return Optional.of(MerkleTrie.EMPTY_TRIE_NODE);
     } else {
       return keyValueStorage.get(nodeHash.toArrayUnsafe()).map(Bytes::wrap);
     }
   }
 
+  @Override
+  public FlatDbMode getFlatDbMode() {
+    return FlatDbMode.NO_FLATTENED;
+  }
+
   @Override
   public Optional<Bytes> getNodeData(final Bytes location, final Bytes32 hash) {
-    if (hash.equals(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH)) {
-      return Optional.of(MerklePatriciaTrie.EMPTY_TRIE_NODE);
+    if (hash.equals(MerkleTrie.EMPTY_TRIE_NODE_HASH)) {
+      return Optional.of(MerkleTrie.EMPTY_TRIE_NODE);
     } else if (hash.equals(Hash.EMPTY)) {
       return Optional.of(Bytes.EMPTY);
     } else {
@@ -82,10 +95,25 @@ public Optional<Bytes> getNodeData(final Bytes location, final Bytes32 hash) {
   }
 
   @Override
-  public boolean isWorldStateAvailable(final Bytes32 rootHash) {
+  public boolean isWorldStateAvailable(final Bytes32 rootHash, final Hash blockHash) {
     return getAccountStateTrieNode(Bytes.EMPTY, rootHash).isPresent();
   }
 
+  @Override
+  public void clear() {
+    keyValueStorage.clear();
+  }
+
+  @Override
+  public void clearTrieLog() {
+    // nothing to do for forest
+  }
+
+  @Override
+  public void clearFlatDatabase() {
+    // nothing to do for forest
+  }
+
   @Override
   public Updater updater() {
     return new Updater(lock, keyValueStorage.startTransaction(), nodeAddedListeners);
@@ -94,8 +122,8 @@ public Updater updater() {
   @Override
   public long prune(final Predicate<byte[]> inUseCheck) {
     final AtomicInteger prunedKeys = new AtomicInteger(0);
-    try (final Stream<byte[]> keys = keyValueStorage.streamKeys()) {
-      keys.forEach(
+    try (final Stream<byte[]> entry = keyValueStorage.streamKeys()) {
+      entry.forEach(
           key -> {
             lock.lock();
             try {
@@ -138,13 +166,8 @@ public Updater(
     }
 
     @Override
-    public Updater removeAccountStateTrieNode(final Bytes32 nodeHash) {
-      transaction.remove(nodeHash.toArrayUnsafe());
-      return this;
-    }
-
-    @Override
-    public Updater putCode(final Bytes32 codeHash, final Bytes code) {
+    public WorldStateStorage.Updater putCode(
+        final Hash accountHash, final Bytes32 codeHash, final Bytes code) {
       if (code.size() == 0) {
         // Don't save empty values
         return this;
@@ -155,10 +178,16 @@ public Updater putCode(final Bytes32 codeHash, final Bytes code) {
       return this;
     }
 
+    @Override
+    public WorldStateStorage.Updater saveWorldState(
+        final Bytes blockHash, final Bytes32 nodeHash, final Bytes node) {
+      return putAccountStateTrieNode(null, nodeHash, node);
+    }
+
     @Override
     public Updater putAccountStateTrieNode(
         final Bytes location, final Bytes32 nodeHash, final Bytes node) {
-      if (nodeHash.equals(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH)) {
+      if (nodeHash.equals(MerkleTrie.EMPTY_TRIE_NODE_HASH)) {
         // Don't save empty nodes
         return this;
       }
@@ -167,10 +196,17 @@ public Updater putAccountStateTrieNode(
       return this;
     }
 
+    @Override
+    public WorldStateStorage.Updater removeAccountStateTrieNode(
+        final Bytes location, final Bytes32 nodeHash) {
+      transaction.remove(nodeHash.toArrayUnsafe());
+      return this;
+    }
+
     @Override
     public Updater putAccountStorageTrieNode(
-        final Bytes location, final Bytes32 nodeHash, final Bytes node) {
-      if (nodeHash.equals(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH)) {
+        final Hash accountHash, final Bytes location, final Bytes32 nodeHash, final Bytes node) {
+      if (nodeHash.equals(MerkleTrie.EMPTY_TRIE_NODE_HASH)) {
         // Don't save empty nodes
         return this;
       }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/WorldStatePreimageKeyValueStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/WorldStatePreimageKeyValueStorage.java
index 5d9fc27e300..8824b3ef827 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/WorldStatePreimageKeyValueStorage.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/WorldStatePreimageKeyValueStorage.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.storage.keyvalue;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
@@ -64,7 +64,7 @@ public Updater(final KeyValueStorageTransaction transaction) {
     @Override
     public WorldStatePreimageStorage.Updater putStorageTrieKeyPreimage(
         final Bytes32 trieKey, final UInt256 preimage) {
-      transaction.put(trieKey.toArrayUnsafe(), preimage.toBytes().toArrayUnsafe());
+      transaction.put(trieKey.toArrayUnsafe(), preimage.toArrayUnsafe());
       return this;
     }
 
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/CallParameter.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/CallParameter.java
index 516bd3e8be2..dbf5eb249e5 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/CallParameter.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/CallParameter.java
@@ -14,9 +14,12 @@
  */
 package org.hyperledger.besu.ethereum.transaction;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.evm.AccessListEntry;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -31,9 +34,9 @@ public class CallParameter {
 
   private final long gasLimit;
 
-  private final Optional<Wei> gasPremium;
+  private final Optional<Wei> maxPriorityFeePerGas;
 
-  private final Optional<Wei> feeCap;
+  private final Optional<Wei> maxFeePerGas;
 
   private final Wei gasPrice;
 
@@ -41,6 +44,8 @@ public class CallParameter {
 
   private final Bytes payload;
 
+  private final Optional<List<AccessListEntry>> accessList;
+
   public CallParameter(
       final Address from,
       final Address to,
@@ -51,8 +56,9 @@ public CallParameter(
     this.from = from;
     this.to = to;
     this.gasLimit = gasLimit;
-    this.gasPremium = Optional.empty();
-    this.feeCap = Optional.empty();
+    this.accessList = Optional.empty();
+    this.maxPriorityFeePerGas = Optional.empty();
+    this.maxFeePerGas = Optional.empty();
     this.gasPrice = gasPrice;
     this.value = value;
     this.payload = payload;
@@ -63,18 +69,20 @@ public CallParameter(
       final Address to,
       final long gasLimit,
       final Wei gasPrice,
-      final Optional<Wei> gasPremium,
-      final Optional<Wei> feeCap,
+      final Optional<Wei> maxPriorityFeePerGas,
+      final Optional<Wei> maxFeePerGas,
       final Wei value,
-      final Bytes payload) {
+      final Bytes payload,
+      final Optional<List<AccessListEntry>> accessList) {
     this.from = from;
     this.to = to;
     this.gasLimit = gasLimit;
-    this.gasPremium = gasPremium;
-    this.feeCap = feeCap;
+    this.maxPriorityFeePerGas = maxPriorityFeePerGas;
+    this.maxFeePerGas = maxFeePerGas;
     this.gasPrice = gasPrice;
     this.value = value;
     this.payload = payload;
+    this.accessList = accessList;
   }
 
   public Address getFrom() {
@@ -93,12 +101,12 @@ public Wei getGasPrice() {
     return gasPrice;
   }
 
-  public Optional<Wei> getGasPremium() {
-    return gasPremium;
+  public Optional<Wei> getMaxPriorityFeePerGas() {
+    return maxPriorityFeePerGas;
   }
 
-  public Optional<Wei> getFeeCap() {
-    return feeCap;
+  public Optional<Wei> getMaxFeePerGas() {
+    return maxFeePerGas;
   }
 
   public Wei getValue() {
@@ -109,6 +117,10 @@ public Bytes getPayload() {
     return payload;
   }
 
+  public Optional<List<AccessListEntry>> getAccessList() {
+    return accessList;
+  }
+
   @Override
   public boolean equals(final Object o) {
     if (this == o) {
@@ -122,14 +134,28 @@ public boolean equals(final Object o) {
         && Objects.equals(from, that.from)
         && Objects.equals(to, that.to)
         && Objects.equals(gasPrice, that.gasPrice)
-        && Objects.equals(gasPremium, that.gasPremium)
-        && Objects.equals(feeCap, that.feeCap)
+        && Objects.equals(maxPriorityFeePerGas, that.maxPriorityFeePerGas)
+        && Objects.equals(maxFeePerGas, that.maxFeePerGas)
         && Objects.equals(value, that.value)
         && Objects.equals(payload, that.payload);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(from, to, gasLimit, gasPrice, gasPremium, feeCap, value, payload);
+    return Objects.hash(
+        from, to, gasLimit, gasPrice, maxPriorityFeePerGas, maxFeePerGas, value, payload);
+  }
+
+  public static CallParameter fromTransaction(final Transaction tx) {
+    return new CallParameter(
+        tx.getSender(),
+        tx.getTo().orElseGet(() -> null),
+        tx.getGasLimit(),
+        Wei.fromQuantity(tx.getGasPrice().orElseGet(() -> Wei.ZERO)),
+        Optional.of(Wei.fromQuantity(tx.getMaxPriorityFeePerGas().orElseGet(() -> Wei.ZERO))),
+        tx.getMaxFeePerGas(),
+        Wei.fromQuantity(tx.getValue()),
+        tx.getPayload(),
+        tx.getAccessList());
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/PreCloseStateHandler.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/PreCloseStateHandler.java
new file mode 100644
index 00000000000..7bae8c100ea
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/PreCloseStateHandler.java
@@ -0,0 +1,54 @@
+/*
+ *
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.transaction;
+
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+
+import java.util.Optional;
+import java.util.function.BiFunction;
+
+/**
+ * This class is passed to the transaction simulator and allows executing code before the copy of
+ * the worldstate is closed. When processing a transaction with the simulator, a copy of the
+ * worldstate is created, and once the simulation process is complete, the copy is closed. In some
+ * cases the simulator fills a Tracer that requires updates from the worldstate. If we want to
+ * generate a trace after the execution, it would fail. This interface allows us to execute our code
+ * before the worldstate is closed, ensuring that we can generate our objects without any issues.
+ * Then, the simulator will properly close the copy of the worldstate.
+ */
+public interface PreCloseStateHandler<U>
+    extends BiFunction<
+        MutableWorldState, Optional<TransactionSimulatorResult>, Optional<? extends U>> {
+
+  /**
+   * This method executes code before the worldstate is closed. It takes two parameters:
+   * mutableWorldState, which represents the worldstate before it is closed, and
+   * transactionSimulatorResult, which holds the result of the transaction simulation. The method
+   * returns an Optional object containing the created object. The specific type of the object can
+   * vary based on the implementation and is determined by the caller's needs. The purpose of this
+   * method is to provide a hook for executing custom code or generating objects before the
+   * worldstate is closed, allowing for any necessary processing or operations to be performed.
+   *
+   * @param mutableWorldState The worldstate before it is closed.
+   * @param transactionSimulatorResult The result of the transaction simulation.
+   * @return The object that has been created.
+   */
+  @Override
+  Optional<U> apply(
+      final MutableWorldState mutableWorldState,
+      final Optional<TransactionSimulatorResult> transactionSimulatorResult);
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionInvalidReason.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionInvalidReason.java
index d8b8ab38cac..12735850953 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionInvalidReason.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionInvalidReason.java
@@ -20,29 +20,40 @@
 public enum TransactionInvalidReason {
   WRONG_CHAIN_ID,
   REPLAY_PROTECTED_SIGNATURES_NOT_SUPPORTED,
+  REPLAY_PROTECTED_SIGNATURE_REQUIRED,
   INVALID_SIGNATURE,
   UPFRONT_COST_EXCEEDS_BALANCE,
   NONCE_TOO_LOW,
-  INCORRECT_NONCE,
+  NONCE_TOO_HIGH,
+  NONCE_OVERFLOW,
   INTRINSIC_GAS_EXCEEDS_GAS_LIMIT,
   EXCEEDS_BLOCK_GAS_LIMIT,
   TX_SENDER_NOT_AUTHORIZED,
+  CHAIN_HEAD_NOT_AVAILABLE,
   CHAIN_HEAD_WORLD_STATE_NOT_AVAILABLE,
   EXCEEDS_PER_TRANSACTION_GAS_LIMIT,
   INVALID_TRANSACTION_FORMAT,
   TRANSACTION_PRICE_TOO_LOW,
   TRANSACTION_ALREADY_KNOWN,
   TRANSACTION_REPLACEMENT_UNDERPRICED,
+  MAX_PRIORITY_FEE_PER_GAS_EXCEEDS_MAX_FEE_PER_GAS,
+  INITCODE_TOO_LARGE,
+  NONCE_TOO_FAR_IN_FUTURE_FOR_SENDER,
+  LOWER_NONCE_INVALID_TRANSACTION_EXISTS,
+  TOTAL_DATA_GAS_TOO_HIGH,
+  GAS_PRICE_TOO_LOW,
+  GAS_PRICE_BELOW_CURRENT_BASE_FEE,
+  MAX_FEE_PER_GAS_BELOW_CURRENT_BASE_FEE,
+  TX_FEECAP_EXCEEDED,
+  INTERNAL_ERROR,
+  TX_POOL_DISABLED,
+
   // Private Transaction Invalid Reasons
+  PRIVATE_TRANSACTION_INVALID,
   PRIVATE_TRANSACTION_FAILED,
   PRIVATE_NONCE_TOO_LOW,
   OFFCHAIN_PRIVACY_GROUP_DOES_NOT_EXIST,
-  INCORRECT_PRIVATE_NONCE,
-  GAS_PRICE_TOO_LOW,
-  TX_FEECAP_EXCEEDED,
+  PRIVATE_NONCE_TOO_HIGH,
   PRIVATE_VALUE_NOT_ZERO,
-  PRIVATE_UNIMPLEMENTED_TRANSACTION_TYPE,
-  INTERNAL_ERROR,
-  // Quroum Compatibility Invalid Reasons
-  GAS_PRICE_MUST_BE_ZERO
+  PRIVATE_UNIMPLEMENTED_TRANSACTION_TYPE
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulator.java
index 6d5348e2277..bc457e87e5d 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulator.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulator.java
@@ -14,28 +14,36 @@
  */
 package org.hyperledger.besu.ethereum.transaction;
 
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.DataGas;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
 import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
-import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
-import org.hyperledger.besu.ethereum.vm.OperationTracer;
+import org.hyperledger.besu.ethereum.vm.CachingBlockHashLookup;
+import org.hyperledger.besu.ethereum.vm.DebugOperationTracer;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
-import org.hyperledger.besu.plugin.data.TransactionType;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
+import java.math.BigInteger;
 import java.util.Optional;
+import java.util.function.Supplier;
+import javax.annotation.Nonnull;
 
+import com.google.common.base.Suppliers;
 import org.apache.tuweni.bytes.Bytes;
 
 /*
@@ -45,10 +53,17 @@
  * blockchain or to estimate the transaction gas cost.
  */
 public class TransactionSimulator {
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
 
   // Dummy signature for transactions to not fail being processed.
-  private static final SECP256K1.Signature FAKE_SIGNATURE =
-      SECP256K1.Signature.create(SECP256K1.HALF_CURVE_ORDER, SECP256K1.HALF_CURVE_ORDER, (byte) 0);
+  private static final SECPSignature FAKE_SIGNATURE =
+      SIGNATURE_ALGORITHM
+          .get()
+          .createSignature(
+              SIGNATURE_ALGORITHM.get().getHalfCurveOrder(),
+              SIGNATURE_ALGORITHM.get().getHalfCurveOrder(),
+              (byte) 0);
 
   // TODO: Identify a better default from account to use, such as the registered
   // coinbase or an account currently unlocked by the client.
@@ -74,7 +89,62 @@ public Optional<TransactionSimulatorResult> process(
       final OperationTracer operationTracer,
       final long blockNumber) {
     final BlockHeader header = blockchain.getBlockHeader(blockNumber).orElse(null);
-    return process(callParams, transactionValidationParams, operationTracer, header);
+    return process(
+        callParams,
+        transactionValidationParams,
+        operationTracer,
+        (mutableWorldState, transactionSimulatorResult) -> transactionSimulatorResult,
+        header);
+  }
+
+  public Optional<TransactionSimulatorResult> processAtHead(final CallParameter callParams) {
+    return process(
+        callParams,
+        TransactionValidationParams.transactionSimulator(),
+        OperationTracer.NO_TRACING,
+        (mutableWorldState, transactionSimulatorResult) -> transactionSimulatorResult,
+        blockchain.getChainHeadHeader());
+  }
+
+  /**
+   * Processes a transaction simulation with the provided parameters and executes pre-worldstate
+   * close actions.
+   *
+   * @param callParams The call parameters for the transaction.
+   * @param transactionValidationParams The validation parameters for the transaction.
+   * @param operationTracer The tracer for capturing operations during processing.
+   * @param preWorldStateCloseGuard The pre-worldstate close guard for executing pre-close actions.
+   * @param header The block header.
+   * @return An Optional containing the result of the processing.
+   */
+  public <U> Optional<U> process(
+      final CallParameter callParams,
+      final TransactionValidationParams transactionValidationParams,
+      final OperationTracer operationTracer,
+      final PreCloseStateHandler<U> preWorldStateCloseGuard,
+      final BlockHeader header) {
+    if (header == null) {
+      return Optional.empty();
+    }
+
+    try (final MutableWorldState ws = getWorldState(header)) {
+
+      WorldUpdater updater = getEffectiveWorldStateUpdater(header, ws);
+
+      // in order to trace the state diff we need to make sure that
+      // the world updater always has a parent
+      if (operationTracer instanceof DebugOperationTracer) {
+        updater = updater.parentUpdater().isPresent() ? updater : updater.updater();
+      }
+
+      return preWorldStateCloseGuard.apply(
+          ws,
+          processWithWorldUpdater(
+              callParams, transactionValidationParams, operationTracer, header, updater));
+
+    } catch (final Exception e) {
+      return Optional.empty();
+    }
   }
 
   public Optional<TransactionSimulatorResult> process(
@@ -84,6 +154,7 @@ public Optional<TransactionSimulatorResult> process(
         callParams,
         TransactionValidationParams.transactionSimulator(),
         OperationTracer.NO_TRACING,
+        (mutableWorldState, transactionSimulatorResult) -> transactionSimulatorResult,
         header);
   }
 
@@ -96,90 +167,165 @@ public Optional<TransactionSimulatorResult> process(
         blockNumber);
   }
 
-  public Optional<TransactionSimulatorResult> processAtHead(final CallParameter callParams) {
-    return process(
-        callParams,
-        TransactionValidationParams.transactionSimulator(),
-        OperationTracer.NO_TRACING,
-        blockchain.getChainHeadHeader());
+  private MutableWorldState getWorldState(final BlockHeader header) {
+    return worldStateArchive
+        .getMutable(header, false)
+        .orElseThrow(
+            () ->
+                new IllegalArgumentException(
+                    "Public world state not available for block " + header.toLogString()));
   }
 
-  private Optional<TransactionSimulatorResult> process(
+  @Nonnull
+  public Optional<TransactionSimulatorResult> processWithWorldUpdater(
       final CallParameter callParams,
       final TransactionValidationParams transactionValidationParams,
       final OperationTracer operationTracer,
-      final BlockHeader header) {
-    if (header == null) {
-      return Optional.empty();
-    }
-    final MutableWorldState worldState =
-        worldStateArchive.getMutable(header.getStateRoot()).orElse(null);
-    if (worldState == null) {
-      return Optional.empty();
-    }
+      final BlockHeader header,
+      final WorldUpdater updater) {
+    final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(header);
 
     final Address senderAddress =
         callParams.getFrom() != null ? callParams.getFrom() : DEFAULT_FROM;
-    final Account sender = worldState.get(senderAddress);
+
+    BlockHeader blockHeaderToProcess = header;
+
+    if (transactionValidationParams.isAllowExceedingBalance() && header.getBaseFee().isPresent()) {
+      blockHeaderToProcess =
+          BlockHeaderBuilder.fromHeader(header)
+              .baseFee(Wei.ZERO)
+              .blockHeaderFunctions(protocolSpec.getBlockHeaderFunctions())
+              .buildBlockHeader();
+    }
+
+    final Account sender = updater.get(senderAddress);
     final long nonce = sender != null ? sender.getNonce() : 0L;
+
     final long gasLimit =
-        callParams.getGasLimit() >= 0 ? callParams.getGasLimit() : header.getGasLimit();
-    final Wei gasPrice = callParams.getGasPrice() != null ? callParams.getGasPrice() : Wei.ZERO;
+        callParams.getGasLimit() >= 0
+            ? callParams.getGasLimit()
+            : blockHeaderToProcess.getGasLimit();
     final Wei value = callParams.getValue() != null ? callParams.getValue() : Wei.ZERO;
     final Bytes payload = callParams.getPayload() != null ? callParams.getPayload() : Bytes.EMPTY;
 
-    final WorldUpdater updater = worldState.updater();
+    final MainnetTransactionProcessor transactionProcessor =
+        protocolSchedule.getByBlockHeader(blockHeaderToProcess).getTransactionProcessor();
 
-    if (transactionValidationParams.isAllowExceedingBalance()) {
-      updater.getOrCreate(senderAddress).getMutable().incrementBalance(Wei.of(Long.MAX_VALUE));
+    final Optional<Transaction> maybeTransaction =
+        buildTransaction(
+            callParams,
+            transactionValidationParams,
+            header,
+            senderAddress,
+            nonce,
+            gasLimit,
+            value,
+            payload);
+    if (maybeTransaction.isEmpty()) {
+      return Optional.empty();
     }
 
+    final Optional<BlockHeader> maybeParentHeader =
+        blockchain.getBlockHeader(blockHeaderToProcess.getParentHash());
+    final Wei dataGasPrice =
+        protocolSpec
+            .getFeeMarket()
+            .dataPrice(
+                maybeParentHeader.flatMap(BlockHeader::getExcessDataGas).orElse(DataGas.ZERO));
+
+    final Transaction transaction = maybeTransaction.get();
+    final TransactionProcessingResult result =
+        transactionProcessor.processTransaction(
+            blockchain,
+            updater,
+            blockHeaderToProcess,
+            transaction,
+            protocolSpec
+                .getMiningBeneficiaryCalculator()
+                .calculateBeneficiary(blockHeaderToProcess),
+            new CachingBlockHashLookup(blockHeaderToProcess, blockchain),
+            false,
+            transactionValidationParams,
+            operationTracer,
+            dataGasPrice);
+
+    return Optional.of(new TransactionSimulatorResult(transaction, result));
+  }
+
+  private Optional<Transaction> buildTransaction(
+      final CallParameter callParams,
+      final TransactionValidationParams transactionValidationParams,
+      final BlockHeader header,
+      final Address senderAddress,
+      final long nonce,
+      final long gasLimit,
+      final Wei value,
+      final Bytes payload) {
     final Transaction.Builder transactionBuilder =
         Transaction.builder()
-            .type(TransactionType.FRONTIER)
             .nonce(nonce)
-            .gasPrice(gasPrice)
             .gasLimit(gasLimit)
             .to(callParams.getTo())
             .sender(senderAddress)
             .value(value)
             .payload(payload)
             .signature(FAKE_SIGNATURE);
-    callParams.getGasPremium().ifPresent(transactionBuilder::gasPremium);
-    callParams.getFeeCap().ifPresent(transactionBuilder::feeCap);
 
-    final Transaction transaction = transactionBuilder.build();
+    // Set access list if present
+    callParams.getAccessList().ifPresent(transactionBuilder::accessList);
 
-    final ProtocolSpec protocolSpec = protocolSchedule.getByBlockNumber(header.getNumber());
+    final Wei gasPrice;
+    final Wei maxFeePerGas;
+    final Wei maxPriorityFeePerGas;
+    if (transactionValidationParams.isAllowExceedingBalance()) {
+      gasPrice = Wei.ZERO;
+      maxFeePerGas = Wei.ZERO;
+      maxPriorityFeePerGas = Wei.ZERO;
+    } else {
+      gasPrice = callParams.getGasPrice() != null ? callParams.getGasPrice() : Wei.ZERO;
+      maxFeePerGas = callParams.getMaxFeePerGas().orElse(gasPrice);
+      maxPriorityFeePerGas = callParams.getMaxPriorityFeePerGas().orElse(gasPrice);
+    }
+    if (header.getBaseFee().isEmpty()) {
+      transactionBuilder.gasPrice(gasPrice);
+    } else if (protocolSchedule.getChainId().isPresent()) {
+      transactionBuilder.maxFeePerGas(maxFeePerGas).maxPriorityFeePerGas(maxPriorityFeePerGas);
+    } else {
+      return Optional.empty();
+    }
 
-    final MainnetTransactionProcessor transactionProcessor =
-        protocolSchedule.getByBlockNumber(header.getNumber()).getTransactionProcessor();
-    final TransactionProcessingResult result =
-        transactionProcessor.processTransaction(
-            blockchain,
-            updater,
-            header,
-            transaction,
-            protocolSpec.getMiningBeneficiaryCalculator().calculateBeneficiary(header),
-            new BlockHashLookup(header, blockchain),
-            false,
-            transactionValidationParams,
-            operationTracer);
+    transactionBuilder.guessType();
+    if (transactionBuilder.getTransactionType().requiresChainId()) {
+      transactionBuilder.chainId(
+          protocolSchedule
+              .getChainId()
+              .orElse(BigInteger.ONE)); // needed to make some transactions valid
+    }
 
-    return Optional.of(new TransactionSimulatorResult(transaction, result));
+    final Transaction transaction = transactionBuilder.build();
+    return Optional.ofNullable(transaction);
+  }
+
+  public WorldUpdater getEffectiveWorldStateUpdater(
+      final BlockHeader header, final MutableWorldState publicWorldState) {
+    return publicWorldState.updater();
   }
 
   public Optional<Boolean> doesAddressExistAtHead(final Address address) {
-    return doesAddressExist(address, blockchain.getChainHeadHeader());
+    final BlockHeader header = blockchain.getChainHeadHeader();
+    try (final MutableWorldState worldState =
+        worldStateArchive.getMutable(header, false).orElseThrow()) {
+      return doesAddressExist(worldState, address, header);
+    } catch (final Exception ex) {
+      return Optional.empty();
+    }
   }
 
-  public Optional<Boolean> doesAddressExist(final Address address, final BlockHeader header) {
+  public Optional<Boolean> doesAddressExist(
+      final MutableWorldState worldState, final Address address, final BlockHeader header) {
     if (header == null) {
       return Optional.empty();
     }
-
-    final MutableWorldState worldState =
-        worldStateArchive.getMutable(header.getStateRoot()).orElse(null);
     if (worldState == null) {
       return Optional.empty();
     }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorResult.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorResult.java
index 25995ed7ced..ac5ab21aea4 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorResult.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorResult.java
@@ -39,6 +39,10 @@ public boolean isSuccessful() {
     return result.isSuccessful();
   }
 
+  public boolean isInvalid() {
+    return result.isInvalid();
+  }
+
   public long getGasEstimate() {
     return transaction.getGasLimit() - result.getGasRemaining();
   }
@@ -55,6 +59,10 @@ public TransactionProcessingResult getResult() {
     return result;
   }
 
+  public Transaction getTransaction() {
+    return transaction;
+  }
+
   @Override
   public boolean equals(final Object o) {
     if (this == o) {
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/util/LogUtil.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/util/LogUtil.java
new file mode 100644
index 00000000000..9f1a9a424b6
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/util/LogUtil.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.util;
+
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Consumer;
+
+public class LogUtil {
+  static ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
+
+  public static void throttledLog(
+      final Consumer<String> logger,
+      final String logMessage,
+      final AtomicBoolean shouldLog,
+      final int logRepeatDelay) {
+
+    if (shouldLog.compareAndSet(true, false)) {
+      logger.accept(logMessage);
+
+      final Runnable runnable = () -> shouldLog.set(true);
+      executor.schedule(runnable, logRepeatDelay, TimeUnit.SECONDS);
+    }
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/util/NonceProvider.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/util/NonceProvider.java
index 8971f7ff5ed..2ac0a50fbd0 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/util/NonceProvider.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/util/NonceProvider.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.util;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 
 @FunctionalInterface
 public interface NonceProvider {
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/util/RawBlockIterator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/util/RawBlockIterator.java
index ef980ef5ff4..6c7f9849c39 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/util/RawBlockIterator.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/util/RawBlockIterator.java
@@ -17,7 +17,7 @@
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
@@ -29,7 +29,6 @@
 import java.nio.file.Path;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-import java.util.function.Function;
 
 import org.apache.tuweni.bytes.Bytes;
 
@@ -37,25 +36,23 @@ public final class RawBlockIterator implements Iterator<Block>, Closeable {
   private static final int DEFAULT_INIT_BUFFER_CAPACITY = 1 << 16;
 
   private final FileChannel fileChannel;
-  private final Function<RLPInput, BlockHeader> headerReader;
   private ByteBuffer readBuffer;
+  private final BlockHeaderFunctions blockHeaderFunctions;
 
   private Block next;
 
   RawBlockIterator(
-      final Path file,
-      final Function<RLPInput, BlockHeader> headerReader,
-      final int initialCapacity)
+      final Path file, final BlockHeaderFunctions blockHeaderFunctions, final int initialCapacity)
       throws IOException {
+    this.blockHeaderFunctions = blockHeaderFunctions;
     fileChannel = FileChannel.open(file);
-    this.headerReader = headerReader;
     readBuffer = ByteBuffer.allocate(initialCapacity);
     nextBlock();
   }
 
-  public RawBlockIterator(final Path file, final Function<RLPInput, BlockHeader> headerReader)
+  public RawBlockIterator(final Path file, final BlockHeaderFunctions blockHeaderFunctions)
       throws IOException {
-    this(file, headerReader, DEFAULT_INIT_BUFFER_CAPACITY);
+    this(file, blockHeaderFunctions, DEFAULT_INIT_BUFFER_CAPACITY);
   }
 
   @Override
@@ -99,9 +96,8 @@ private void nextBlock() throws IOException {
       final Bytes rlpBytes = Bytes.wrap(Bytes.wrapByteBuffer(readBuffer, 0, length).toArray());
       final RLPInput rlp = new BytesValueRLPInput(rlpBytes, false);
       rlp.enterList();
-      final BlockHeader header = headerReader.apply(rlp);
-      final BlockBody body =
-          new BlockBody(rlp.readList(Transaction::readFrom), rlp.readList(headerReader));
+      final BlockHeader header = BlockHeader.readFrom(rlp, blockHeaderFunctions);
+      final BlockBody body = BlockBody.readFrom(rlp, blockHeaderFunctions);
       next = new Block(header, body);
       readBuffer.position(length);
       readBuffer.compact();
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/AbstractCallOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/AbstractCallOperation.java
deleted file mode 100644
index a65fa330ecd..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/AbstractCallOperation.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Wei;
-
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-/**
- * A skeleton class for implementing call operations.
- *
- * <p>A call operation creates a child message call from the current message context, allows it to
- * execute, and then updates the current message context based on its execution.
- */
-public abstract class AbstractCallOperation extends AbstractOperation {
-
-  protected static final OperationResult UNDERFLOW_RESPONSE =
-      new OperationResult(
-          Optional.empty(), Optional.of(ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS));
-
-  protected AbstractCallOperation(
-      final int opcode,
-      final String name,
-      final int stackItemsConsumed,
-      final int stackItemsProduced,
-      final boolean updatesProgramCounter,
-      final int opSize,
-      final GasCalculator gasCalculator) {
-    super(
-        opcode,
-        name,
-        stackItemsConsumed,
-        stackItemsProduced,
-        updatesProgramCounter,
-        opSize,
-        gasCalculator);
-  }
-
-  /**
-   * Returns the additional gas to provide the call operation.
-   *
-   * @param frame The current message frame
-   * @return the additional gas to provide the call operation
-   */
-  protected abstract Gas gas(MessageFrame frame);
-
-  /**
-   * Returns the account the call is being made to.
-   *
-   * @param frame The current message frame
-   * @return the account the call is being made to
-   */
-  protected abstract Address to(MessageFrame frame);
-
-  /**
-   * Returns the value being transferred in the call
-   *
-   * @param frame The current message frame
-   * @return the value being transferred in the call
-   */
-  protected abstract Wei value(MessageFrame frame);
-
-  /**
-   * Returns the apparent value being transferred in the call
-   *
-   * @param frame The current message frame
-   * @return the apparent value being transferred in the call
-   */
-  protected abstract Wei apparentValue(MessageFrame frame);
-
-  /**
-   * Returns the memory offset the input data starts at.
-   *
-   * @param frame The current message frame
-   * @return the memory offset the input data starts at
-   */
-  protected abstract UInt256 inputDataOffset(MessageFrame frame);
-
-  /**
-   * Returns the length of the input data to read from memory.
-   *
-   * @param frame The current message frame
-   * @return the length of the input data to read from memory.
-   */
-  protected abstract UInt256 inputDataLength(MessageFrame frame);
-
-  /**
-   * Returns the memory offset the offset data starts at.
-   *
-   * @param frame The current message frame
-   * @return the memory offset the offset data starts at
-   */
-  protected abstract UInt256 outputDataOffset(MessageFrame frame);
-
-  /**
-   * Returns the length of the output data to read from memory.
-   *
-   * @param frame The current message frame
-   * @return the length of the output data to read from memory.
-   */
-  protected abstract UInt256 outputDataLength(MessageFrame frame);
-
-  /**
-   * Returns the account address the call operation is being performed on
-   *
-   * @param frame The current message frame
-   * @return the account address the call operation is being performed on
-   */
-  protected abstract Address address(MessageFrame frame);
-
-  /**
-   * Returns the account address the call operation is being sent from
-   *
-   * @param frame The current message frame
-   * @return the account address the call operation is being sent from
-   */
-  protected abstract Address sender(MessageFrame frame);
-
-  /**
-   * Returns the gas available to execute the child message call.
-   *
-   * @param frame The current message frame
-   * @return the gas available to execute the child message call
-   */
-  protected abstract Gas gasAvailableForChildCall(MessageFrame frame);
-
-  /**
-   * Returns whether or not the child message call should be static.
-   *
-   * @param frame The current message frame
-   * @return {@code true} if the child message call should be static; otherwise {@code false}
-   */
-  protected abstract boolean isStatic(MessageFrame frame);
-
-  @Override
-  public OperationResult execute(final MessageFrame frame, final EVM evm) {
-    // manual check because some reads won't come until the "complete" step.
-    if (frame.stackSize() < getStackItemsConsumed()) {
-      return UNDERFLOW_RESPONSE;
-    }
-
-    final Gas cost = cost(frame);
-    final Optional<Gas> optionalCost = Optional.ofNullable(cost);
-    if (cost != null) {
-      if (frame.getRemainingGas().compareTo(cost) < 0) {
-        return new OperationResult(
-            optionalCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-      }
-      frame.decrementRemainingGas(cost);
-
-      frame.clearReturnData();
-
-      final Address to = to(frame);
-      final Account contract = frame.getWorldState().get(to);
-
-      final Account account = frame.getWorldState().get(frame.getRecipientAddress());
-      final Wei balance = account.getBalance();
-      if (value(frame).compareTo(balance) > 0 || frame.getMessageStackDepth() >= 1024) {
-        frame.expandMemory(inputDataOffset(frame), inputDataLength(frame));
-        frame.expandMemory(outputDataOffset(frame), outputDataLength(frame));
-        frame.incrementRemainingGas(gasAvailableForChildCall(frame).plus(cost));
-        frame.popStackItems(getStackItemsConsumed());
-        frame.pushStackItem(Bytes32.ZERO);
-        return new OperationResult(optionalCost, Optional.empty());
-      }
-
-      final Bytes inputData = frame.readMemory(inputDataOffset(frame), inputDataLength(frame));
-
-      final MessageFrame childFrame =
-          MessageFrame.builder()
-              .type(MessageFrame.Type.MESSAGE_CALL)
-              .messageFrameStack(frame.getMessageFrameStack())
-              .blockchain(frame.getBlockchain())
-              .worldState(frame.getWorldState().updater())
-              .initialGas(gasAvailableForChildCall(frame))
-              .address(address(frame))
-              .originator(frame.getOriginatorAddress())
-              .contract(to)
-              .contractAccountVersion(
-                  contract != null ? contract.getVersion() : Account.DEFAULT_VERSION)
-              .gasPrice(frame.getGasPrice())
-              .inputData(inputData)
-              .sender(sender(frame))
-              .value(value(frame))
-              .apparentValue(apparentValue(frame))
-              .code(new Code(contract != null ? contract.getCode() : Bytes.EMPTY))
-              .blockHeader(frame.getBlockHeader())
-              .depth(frame.getMessageStackDepth() + 1)
-              .isStatic(isStatic(frame))
-              .completer(child -> complete(frame, child))
-              .miningBeneficiary(frame.getMiningBeneficiary())
-              .blockHashLookup(frame.getBlockHashLookup())
-              .maxStackSize(frame.getMaxStackSize())
-              .returnStack(frame.getReturnStack())
-              .build();
-      frame.incrementRemainingGas(cost);
-      childFrame.copyWarmedUpFields(frame);
-
-      frame.getMessageFrameStack().addFirst(childFrame);
-      frame.setState(MessageFrame.State.CODE_SUSPENDED);
-    }
-    return new OperationResult(optionalCost, Optional.empty());
-  }
-
-  protected abstract Gas cost(final MessageFrame frame);
-
-  public void complete(final MessageFrame frame, final MessageFrame childFrame) {
-    frame.setState(MessageFrame.State.CODE_EXECUTING);
-
-    final UInt256 outputOffset = outputDataOffset(frame);
-    final UInt256 outputSize = outputDataLength(frame);
-    final Bytes outputData = childFrame.getOutputData();
-    final int outputSizeAsInt = outputSize.intValue();
-
-    if (outputSizeAsInt > outputData.size()) {
-      frame.expandMemory(outputOffset, outputSize);
-      frame.writeMemory(outputOffset, UInt256.valueOf(outputData.size()), outputData, true);
-    } else {
-      frame.writeMemory(outputOffset, outputSize, outputData, true);
-    }
-
-    frame.setReturnData(outputData);
-    frame.addLogs(childFrame.getLogs());
-    frame.addSelfDestructs(childFrame.getSelfDestructs());
-    frame.incrementGasRefund(childFrame.getGasRefund());
-
-    final Gas gasRemaining = childFrame.getRemainingGas();
-    frame.incrementRemainingGas(gasRemaining);
-
-    frame.popStackItems(getStackItemsConsumed());
-    if (childFrame.getState() == MessageFrame.State.COMPLETED_SUCCESS) {
-      frame.mergeWarmedUpFields(childFrame);
-      frame.pushStackItem(UInt256.ONE.toBytes());
-    } else {
-      frame.pushStackItem(Bytes32.ZERO);
-    }
-
-    final int currentPC = frame.getPC();
-    frame.setPC(currentPC + 1);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/AbstractOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/AbstractOperation.java
deleted file mode 100644
index 8d5bdf64dd6..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/AbstractOperation.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm;
-
-/**
- * All {@link Operation} implementations should inherit from this class to get the setting of some
- * members for free.
- */
-public abstract class AbstractOperation implements Operation {
-
-  private final int opcode;
-  private final String name;
-  private final int stackItemsConsumed;
-  private final int stackItemsProduced;
-  private final boolean updatesProgramCounter;
-  private final int opSize;
-  private final GasCalculator gasCalculator;
-
-  protected AbstractOperation(
-      final int opcode,
-      final String name,
-      final int stackItemsConsumed,
-      final int stackItemsProduced,
-      final boolean updatesProgramCounter,
-      final int opSize,
-      final GasCalculator gasCalculator) {
-    this.opcode = opcode & 0xff;
-    this.name = name;
-    this.stackItemsConsumed = stackItemsConsumed;
-    this.stackItemsProduced = stackItemsProduced;
-    this.updatesProgramCounter = updatesProgramCounter;
-    this.opSize = opSize;
-    this.gasCalculator = gasCalculator;
-  }
-
-  protected GasCalculator gasCalculator() {
-    return gasCalculator;
-  }
-
-  @Override
-  public int getOpcode() {
-    return opcode;
-  }
-
-  @Override
-  public String getName() {
-    return name;
-  }
-
-  @Override
-  public int getStackItemsConsumed() {
-    return stackItemsConsumed;
-  }
-
-  @Override
-  public int getStackItemsProduced() {
-    return stackItemsProduced;
-  }
-
-  @Override
-  public boolean getUpdatesProgramCounter() {
-    return updatesProgramCounter;
-  }
-
-  @Override
-  public int getOpSize() {
-    return opSize;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/BlockHashLookup.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/BlockHashLookup.java
index 3b0f14e044a..b8f09783cf2 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/BlockHashLookup.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/BlockHashLookup.java
@@ -14,13 +14,10 @@
  */
 package org.hyperledger.besu.ethereum.vm;
 
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
-import org.hyperledger.besu.ethereum.vm.operations.BlockHashOperation;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.evm.operation.BlockHashOperation;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.function.Function;
 
 /**
  * Calculates and caches block hashes by number following the chain for a specific branch. This is
@@ -30,29 +27,4 @@
  * <p>A new BlockHashCache must be created for each block being processed but should be reused for
  * all transactions within that block.
  */
-public class BlockHashLookup {
-
-  private ProcessableBlockHeader searchStartHeader;
-  private final Blockchain blockchain;
-  private final Map<Long, Hash> hashByNumber = new HashMap<>();
-
-  public BlockHashLookup(final ProcessableBlockHeader currentBlock, final Blockchain blockchain) {
-    this.searchStartHeader = currentBlock;
-    this.blockchain = blockchain;
-    hashByNumber.put(currentBlock.getNumber() - 1, currentBlock.getParentHash());
-  }
-
-  public Hash getBlockHash(final long blockNumber) {
-    final Hash cachedHash = hashByNumber.get(blockNumber);
-    if (cachedHash != null) {
-      return cachedHash;
-    }
-    while (searchStartHeader != null && searchStartHeader.getNumber() - 1 > blockNumber) {
-      searchStartHeader = blockchain.getBlockHeader(searchStartHeader.getParentHash()).orElse(null);
-      if (searchStartHeader != null) {
-        hashByNumber.put(searchStartHeader.getNumber() - 1, searchStartHeader.getParentHash());
-      }
-    }
-    return hashByNumber.getOrDefault(blockNumber, Hash.ZERO);
-  }
-}
+public interface BlockHashLookup extends Function<Long, Hash> {}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/CachingBlockHashLookup.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/CachingBlockHashLookup.java
new file mode 100644
index 00000000000..1e1e47ece4a
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/CachingBlockHashLookup.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.vm;
+
+import static org.hyperledger.besu.datatypes.Hash.ZERO;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
+import org.hyperledger.besu.evm.operation.BlockHashOperation;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Calculates and caches block hashes by number following the chain for a specific branch. This is
+ * used by {@link BlockHashOperation} and ensures that the correct block hash is returned even when
+ * the block being imported is on a fork.
+ *
+ * <p>A new BlockHashCache must be created for each block being processed but should be reused for
+ * all transactions within that block.
+ */
+public class CachingBlockHashLookup implements BlockHashLookup {
+
+  private ProcessableBlockHeader searchStartHeader;
+  private final Blockchain blockchain;
+  private final Map<Long, Hash> hashByNumber = new HashMap<>();
+
+  public CachingBlockHashLookup(
+      final ProcessableBlockHeader currentBlock, final Blockchain blockchain) {
+    this.searchStartHeader = currentBlock;
+    this.blockchain = blockchain;
+    hashByNumber.put(currentBlock.getNumber() - 1, currentBlock.getParentHash());
+  }
+
+  @Override
+  public Hash apply(final Long blockNumber) {
+    final Hash cachedHash = hashByNumber.get(blockNumber);
+    if (cachedHash != null) {
+      return cachedHash;
+    }
+    while (searchStartHeader != null && searchStartHeader.getNumber() - 1 > blockNumber) {
+      searchStartHeader = blockchain.getBlockHeader(searchStartHeader.getParentHash()).orElse(null);
+      if (searchStartHeader != null) {
+        hashByNumber.put(searchStartHeader.getNumber() - 1, searchStartHeader.getParentHash());
+      }
+    }
+    return hashByNumber.getOrDefault(blockNumber, ZERO);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Code.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Code.java
deleted file mode 100644
index 946cd5d4126..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Code.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm;
-
-import org.hyperledger.besu.ethereum.vm.operations.BeginSubOperation;
-import org.hyperledger.besu.ethereum.vm.operations.JumpDestOperation;
-
-import java.util.BitSet;
-
-import com.google.common.base.MoreObjects;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt256;
-
-/** Represents EVM code associated with an account. */
-public class Code {
-
-  /** The bytes representing the code. */
-  private final Bytes bytes;
-
-  /** Used to cache valid jump destinations. */
-  private BitSet validJumpDestinations;
-
-  /** Used to cache valid jump sub destinations. */
-  private BitSet validJumpSubDestinations;
-
-  /**
-   * Public constructor.
-   *
-   * @param bytes The byte representation of the code.
-   */
-  public Code(final Bytes bytes) {
-    this.bytes = bytes;
-  }
-
-  public Code() {
-    this(Bytes.EMPTY);
-  }
-
-  /**
-   * Returns true if the object is equal to this; otherwise false.
-   *
-   * @param other The object to compare this with.
-   * @return True if the object is equal to this; otherwise false.
-   */
-  @Override
-  public boolean equals(final Object other) {
-    if (other == null) return false;
-    if (other == this) return true;
-    if (!(other instanceof Code)) return false;
-
-    final Code that = (Code) other;
-    return this.bytes.equals(that.bytes);
-  }
-
-  @Override
-  public int hashCode() {
-    return bytes.hashCode();
-  }
-
-  /**
-   * Size of the Code, in bytes
-   *
-   * @return The number of bytes in the code.
-   */
-  public int getSize() {
-    return bytes.size();
-  }
-
-  /**
-   * Determine whether a specified destination is a valid jump target.
-   *
-   * @param evm the EVM executing this code
-   * @param frame The current message frame
-   * @param destination The destination we're checking for validity.
-   * @return Whether or not this location is a valid jump destination.
-   */
-  public boolean isValidJumpDestination(
-      final EVM evm, final MessageFrame frame, final UInt256 destination) {
-    if (!destination.fitsInt()) return false;
-
-    final int jumpDestination = destination.intValue();
-    if (jumpDestination >= getSize()) return false;
-
-    if (validJumpDestinations == null) {
-      // Calculate valid jump destinations
-      validJumpDestinations = new BitSet(getSize());
-      evm.forEachOperation(
-          this,
-          frame.getContractAccountVersion(),
-          (final Operation op, final Integer offset) -> {
-            if (op.getOpcode() == JumpDestOperation.OPCODE) {
-              validJumpDestinations.set(offset);
-            }
-          });
-    }
-    return validJumpDestinations.get(jumpDestination);
-  }
-
-  /**
-   * Determine whether a specified destination is a valid jump sub target.
-   *
-   * @param evm the EVM executing this code
-   * @param frame The current message frame
-   * @param destination The destination we're checking for validity.
-   * @return Whether or not this location is a valid jump sub destination.
-   */
-  public boolean isValidJumpSubDestination(
-      final EVM evm, final MessageFrame frame, final UInt256 destination) {
-    if (!destination.fitsInt()) return false;
-    final int jumpDestination = destination.intValue();
-    if (jumpDestination >= getSize()) return false;
-
-    if (validJumpSubDestinations == null) {
-      // Calculate valid jump destinations
-      validJumpSubDestinations = new BitSet(getSize());
-      evm.forEachOperation(
-          this,
-          frame.getContractAccountVersion(),
-          (final Operation op, final Integer offset) -> {
-            if (op.getOpcode() == BeginSubOperation.OPCODE) {
-              validJumpSubDestinations.set(offset);
-            }
-          });
-    }
-    return validJumpSubDestinations.get(jumpDestination);
-  }
-
-  public Bytes getBytes() {
-    return bytes;
-  }
-
-  @Override
-  public String toString() {
-    return MoreObjects.toStringHelper(this).add("bytes", bytes).toString();
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/DebugOperationTracer.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/DebugOperationTracer.java
index 4f8931cdf87..8d8287a82de 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/DebugOperationTracer.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/DebugOperationTracer.java
@@ -14,19 +14,25 @@
  */
 package org.hyperledger.besu.ethereum.vm;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.ModificationNotAllowedException;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
+import static org.apache.tuweni.bytes.Bytes32.leftPad;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.debug.TraceFrame;
 import org.hyperledger.besu.ethereum.debug.TraceOptions;
-import org.hyperledger.besu.ethereum.vm.Operation.OperationResult;
+import org.hyperledger.besu.evm.ModificationNotAllowedException;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.operation.Operation;
+import org.hyperledger.besu.evm.operation.Operation.OperationResult;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.OptionalLong;
 import java.util.TreeMap;
 
 import org.apache.tuweni.bytes.Bytes;
@@ -35,31 +41,39 @@
 
 public class DebugOperationTracer implements OperationTracer {
 
-  private static final UInt256 UINT256_32 = UInt256.valueOf(32);
-
   private final TraceOptions options;
   private List<TraceFrame> traceFrames = new ArrayList<>();
   private TraceFrame lastFrame;
 
+  private Optional<Bytes32[]> preExecutionStack;
+  private long gasRemaining;
+  private Bytes inputData;
+  private int pc;
+
   public DebugOperationTracer(final TraceOptions options) {
     this.options = options;
   }
 
   @Override
-  public void traceExecution(final MessageFrame frame, final ExecuteOperation executeOperation) {
+  public void tracePreExecution(final MessageFrame frame) {
+    preExecutionStack = captureStack(frame);
+    gasRemaining = frame.getRemainingGas();
+    if (lastFrame != null && frame.getMessageStackDepth() > lastFrame.getDepth())
+      inputData = frame.getInputData().copy();
+    else inputData = frame.getInputData();
+    pc = frame.getPC();
+  }
+
+  @Override
+  public void tracePostExecution(final MessageFrame frame, final OperationResult operationResult) {
     final Operation currentOperation = frame.getCurrentOperation();
     final int depth = frame.getMessageStackDepth();
     final String opcode = currentOperation.getName();
-    final int pc = frame.getPC();
-    final Gas gasRemaining = frame.getRemainingGas();
-    final Bytes inputData = frame.getInputData();
-    final Optional<Bytes32[]> stack = captureStack(frame);
-    final WorldUpdater worldUpdater = frame.getWorldState();
-    final Optional<Bytes32[]> stackPostExecution;
-    final OperationResult operationResult = executeOperation.execute();
+    final WorldUpdater worldUpdater = frame.getWorldUpdater();
     final Bytes outputData = frame.getOutputData();
     final Optional<Bytes[]> memory = captureMemory(frame);
-    stackPostExecution = captureStack(frame);
+    final Optional<Bytes32[]> stackPostExecution = captureStack(frame);
+
     if (lastFrame != null) {
       lastFrame.setGasRemainingPostExecution(gasRemaining);
     }
@@ -71,15 +85,17 @@ public void traceExecution(final MessageFrame frame, final ExecuteOperation exec
             pc,
             Optional.of(opcode),
             gasRemaining,
-            operationResult.getGasCost(),
+            operationResult.getGasCost() == 0
+                ? OptionalLong.empty()
+                : OptionalLong.of(operationResult.getGasCost()),
             frame.getGasRefund(),
             depth,
-            operationResult.getHaltReason(),
+            Optional.ofNullable(operationResult.getHaltReason()),
             frame.getRecipientAddress(),
             frame.getApparentValue(),
             inputData,
             outputData,
-            stack,
+            preExecutionStack,
             memory,
             storage,
             worldUpdater,
@@ -97,25 +113,25 @@ public void traceExecution(final MessageFrame frame, final ExecuteOperation exec
 
   @Override
   public void tracePrecompileCall(
-      final MessageFrame frame, final Gas gasRequirement, final Bytes output) {
+      final MessageFrame frame, final long gasRequirement, final Bytes output) {
     if (traceFrames.isEmpty()) {
       final TraceFrame traceFrame =
           new TraceFrame(
               frame.getPC(),
               Optional.empty(),
               frame.getRemainingGas(),
-              Optional.empty(),
+              OptionalLong.empty(),
               frame.getGasRefund(),
               frame.getMessageStackDepth(),
               Optional.empty(),
               frame.getRecipientAddress(),
               frame.getValue(),
-              frame.getInputData(),
+              frame.getInputData().copy(),
               frame.getOutputData(),
               Optional.empty(),
               Optional.empty(),
               Optional.empty(),
-              frame.getWorldState(),
+              frame.getWorldUpdater(),
               Optional.empty(),
               Optional.ofNullable(frame.getRefunds()),
               Optional.ofNullable(frame.getCode()),
@@ -126,7 +142,7 @@ public void tracePrecompileCall(
               Optional.empty());
       traceFrames.add(traceFrame);
     }
-    traceFrames.get(traceFrames.size() - 1).setPrecompiledGasCost(Optional.of(gasRequirement));
+    traceFrames.get(traceFrames.size() - 1).setPrecompiledGasCost(OptionalLong.of(gasRequirement));
   }
 
   @Override
@@ -150,18 +166,18 @@ public void traceAccountCreationResult(
                     frame.getPC(),
                     Optional.empty(),
                     frame.getRemainingGas(),
-                    Optional.empty(),
+                    OptionalLong.empty(),
                     frame.getGasRefund(),
                     frame.getMessageStackDepth(),
                     Optional.of(exceptionalHaltReason),
                     frame.getRecipientAddress(),
                     frame.getValue(),
-                    frame.getInputData(),
+                    frame.getInputData().copy(),
                     frame.getOutputData(),
                     Optional.empty(),
                     Optional.empty(),
                     Optional.empty(),
-                    frame.getWorldState(),
+                    frame.getWorldUpdater(),
                     Optional.empty(),
                     Optional.ofNullable(frame.getRefunds()),
                     Optional.ofNullable(frame.getCode()),
@@ -183,7 +199,7 @@ private Optional<Map<UInt256, UInt256>> captureStorage(final MessageFrame frame)
       final Map<UInt256, UInt256> storageContents =
           new TreeMap<>(
               frame
-                  .getWorldState()
+                  .getWorldUpdater()
                   .getAccount(frame.getRecipientAddress())
                   .getMutable()
                   .getUpdatedStorage());
@@ -197,9 +213,9 @@ private Optional<Bytes[]> captureMemory(final MessageFrame frame) {
     if (!options.isMemoryEnabled()) {
       return Optional.empty();
     }
-    final Bytes[] memoryContents = new Bytes32[frame.memoryWordSize().intValue()];
+    final Bytes[] memoryContents = new Bytes[frame.memoryWordSize()];
     for (int i = 0; i < memoryContents.length; i++) {
-      memoryContents[i] = frame.readMemory(UInt256.valueOf(i * 32L), UINT256_32);
+      memoryContents[i] = frame.readMemory(i * 32L, 32);
     }
     return Optional.of(memoryContents);
   }
@@ -212,7 +228,7 @@ private Optional<Bytes32[]> captureStack(final MessageFrame frame) {
     final Bytes32[] stackContents = new Bytes32[frame.stackSize()];
     for (int i = 0; i < stackContents.length; i++) {
       // Record stack contents in reverse
-      stackContents[i] = frame.getStackItem(stackContents.length - i - 1);
+      stackContents[i] = leftPad(frame.getStackItem(stackContents.length - i - 1));
     }
     return Optional.of(stackContents);
   }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/EVM.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/EVM.java
deleted file mode 100644
index 28c8ee174ef..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/EVM.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm;
-
-import static org.apache.logging.log4j.LogManager.getLogger;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.FixedStack.OverflowException;
-import org.hyperledger.besu.ethereum.vm.FixedStack.UnderflowException;
-import org.hyperledger.besu.ethereum.vm.MessageFrame.State;
-import org.hyperledger.besu.ethereum.vm.Operation.OperationResult;
-import org.hyperledger.besu.ethereum.vm.operations.InvalidOperation;
-import org.hyperledger.besu.ethereum.vm.operations.StopOperation;
-import org.hyperledger.besu.ethereum.vm.operations.VirtualOperation;
-
-import java.util.Optional;
-import java.util.function.BiConsumer;
-
-import com.google.common.annotations.VisibleForTesting;
-import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-
-public class EVM {
-  private static final Logger LOG = getLogger();
-
-  protected static final OperationResult OVERFLOW_RESPONSE =
-      new OperationResult(
-          Optional.empty(), Optional.of(ExceptionalHaltReason.TOO_MANY_STACK_ITEMS));
-  protected static final OperationResult UNDERFLOW_RESPONSE =
-      new OperationResult(
-          Optional.empty(), Optional.of(ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS));
-
-  private final OperationRegistry operations;
-  private final Operation endOfScriptStop;
-
-  public EVM(final OperationRegistry operations, final GasCalculator gasCalculator) {
-    this.operations = operations;
-    this.endOfScriptStop = new VirtualOperation(new StopOperation(gasCalculator));
-  }
-
-  public void runToHalt(final MessageFrame frame, final OperationTracer operationTracer) {
-    while (frame.getState() == MessageFrame.State.CODE_EXECUTING) {
-      executeNextOperation(frame, operationTracer);
-    }
-  }
-
-  void forEachOperation(
-      final Code code,
-      final int contractAccountVersion,
-      final BiConsumer<Operation, Integer> operationDelegate) {
-    int pc = 0;
-    final int length = code.getSize();
-
-    while (pc < length) {
-      final Operation curOp = operationAtOffset(code, contractAccountVersion, pc);
-      operationDelegate.accept(curOp, pc);
-      pc += curOp.getOpSize();
-    }
-  }
-
-  private void executeNextOperation(
-      final MessageFrame frame, final OperationTracer operationTracer) {
-    frame.setCurrentOperation(
-        operationAtOffset(frame.getCode(), frame.getContractAccountVersion(), frame.getPC()));
-    operationTracer.traceExecution(
-        frame,
-        () -> {
-          OperationResult result;
-          try {
-            result = frame.getCurrentOperation().execute(frame, this);
-          } catch (final OverflowException oe) {
-            result = OVERFLOW_RESPONSE;
-          } catch (final UnderflowException ue) {
-            result = UNDERFLOW_RESPONSE;
-          }
-          frame.setGasCost(result.getGasCost());
-          logState(frame, result.getGasCost().orElse(Gas.ZERO));
-          final Optional<ExceptionalHaltReason> haltReason = result.getHaltReason();
-          if (haltReason.isPresent()) {
-            LOG.trace("MessageFrame evaluation halted because of {}", haltReason.get());
-            frame.setExceptionalHaltReason(haltReason);
-            frame.setState(State.EXCEPTIONAL_HALT);
-          } else if (result.getGasCost().isPresent()) {
-            frame.decrementRemainingGas(result.getGasCost().get());
-          }
-          incrementProgramCounter(frame);
-
-          return result;
-        });
-  }
-
-  private void incrementProgramCounter(final MessageFrame frame) {
-    final Operation operation = frame.getCurrentOperation();
-    if (frame.getState() == State.CODE_EXECUTING && !operation.getUpdatesProgramCounter()) {
-      final int currentPC = frame.getPC();
-      final int opSize = operation.getOpSize();
-      frame.setPC(currentPC + opSize);
-    }
-  }
-
-  private static void logState(final MessageFrame frame, final Gas currentGasCost) {
-    if (LOG.isTraceEnabled()) {
-      final StringBuilder builder = new StringBuilder();
-      builder.append("Depth: ").append(frame.getMessageStackDepth()).append("\n");
-      builder.append("Operation: ").append(frame.getCurrentOperation().getName()).append("\n");
-      builder.append("PC: ").append(frame.getPC()).append("\n");
-      builder.append("Gas cost: ").append(currentGasCost).append("\n");
-      builder.append("Gas Remaining: ").append(frame.getRemainingGas()).append("\n");
-      builder.append("Depth: ").append(frame.getMessageStackDepth()).append("\n");
-      builder.append("Stack:");
-      for (int i = 0; i < frame.stackSize(); ++i) {
-        builder.append("\n\t").append(i).append(" ").append(frame.getStackItem(i));
-      }
-      LOG.trace(builder.toString());
-    }
-  }
-
-  @VisibleForTesting
-  Operation operationAtOffset(final Code code, final int contractAccountVersion, final int offset) {
-    final Bytes bytecode = code.getBytes();
-    // If the length of the program code is shorter than the required offset, halt execution.
-    if (offset >= bytecode.size()) {
-      return endOfScriptStop;
-    }
-
-    final byte opcode = bytecode.get(offset);
-    final Operation operation = operations.get(opcode, contractAccountVersion);
-    if (operation == null) {
-      return new InvalidOperation(opcode, null);
-    } else {
-      return operation;
-    }
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/EstimateGasOperationTracer.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/EstimateGasOperationTracer.java
deleted file mode 100644
index b32a1837442..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/EstimateGasOperationTracer.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.operations.SStoreOperation;
-
-public class EstimateGasOperationTracer implements OperationTracer {
-
-  private int maxDepth = 0;
-
-  private Gas sStoreStipendNeeded = Gas.ZERO;
-
-  @Override
-  public void traceExecution(
-      final MessageFrame frame, final OperationTracer.ExecuteOperation executeOperation) {
-    try {
-      executeOperation.execute();
-    } finally {
-      if (frame.getCurrentOperation() instanceof SStoreOperation
-          && sStoreStipendNeeded.compareTo(Gas.ZERO) == 0) {
-        sStoreStipendNeeded =
-            ((SStoreOperation) frame.getCurrentOperation()).getMinumumGasRemaining();
-      }
-      if (maxDepth < frame.getMessageStackDepth()) {
-        maxDepth = frame.getMessageStackDepth();
-      }
-    }
-  }
-
-  public int getMaxDepth() {
-    return maxDepth;
-  }
-
-  public Gas getStipendNeeded() {
-    return sStoreStipendNeeded;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ExceptionalHaltReason.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ExceptionalHaltReason.java
deleted file mode 100644
index c25b13aceec..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/ExceptionalHaltReason.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm;
-
-public enum ExceptionalHaltReason {
-  NONE(""),
-  INSUFFICIENT_GAS("Out of gas"),
-  INSUFFICIENT_STACK_ITEMS("Stack underflow"),
-  INVALID_JUMP_DESTINATION("Bad jump destination"),
-  INVALID_OPERATION("Bad instruction"),
-  INVALID_RETURN_DATA_BUFFER_ACCESS("Out of bounds"),
-  TOO_MANY_STACK_ITEMS("Out of stack"),
-  ILLEGAL_STATE_CHANGE("Illegal state change"),
-  INVALID_RETSUB("Invalid retsub"),
-  INVALID_SUB_ROUTINE_ENTRY("Invalid subroutine entry");
-
-  String description;
-
-  ExceptionalHaltReason(final String description) {
-    this.description = description;
-  }
-
-  public String getDescription() {
-    return description;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/FixedStack.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/FixedStack.java
deleted file mode 100644
index 199a7f738a7..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/FixedStack.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import java.lang.reflect.Array;
-import java.util.Arrays;
-
-/**
- * An operand stack for the Ethereum Virtual machine (EVM).
- *
- * <p>The operand stack is responsible for storing the current operands that the EVM can execute. It
- * is assumed to have a fixed size.
- */
-public class FixedStack<T> {
-
-  private final T[] entries;
-
-  private final int maxSize;
-
-  private int top;
-
-  public static class UnderflowException extends RuntimeException {
-    // Don't create a stack trace since these are not "errors" per say but are using exceptions to
-    // throw rare control flow conditions (EVM stack overflow) that are expected to be seen in
-    // normal
-    // operations.
-    @Override
-    public synchronized Throwable fillInStackTrace() {
-      return this;
-    }
-  }
-
-  public static class OverflowException extends RuntimeException {
-    // Don't create a stack trace since these are not "errors" per say but are using exceptions to
-    // throw rare control flow conditions (EVM stack overflow) that are expected to be seen in
-    // normal
-    // operations.
-    @Override
-    public synchronized Throwable fillInStackTrace() {
-      return this;
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  public FixedStack(final int maxSize, final Class<T> klass) {
-    checkArgument(maxSize >= 0, "max size must be non-negative");
-
-    this.entries = (T[]) Array.newInstance(klass, maxSize);
-    this.maxSize = maxSize;
-    this.top = -1;
-  }
-
-  public T get(final int offset) {
-    if (offset < 0 || offset >= size()) {
-      throw new IndexOutOfBoundsException();
-    }
-
-    return entries[top - offset];
-  }
-
-  public T pop() {
-    if (top < 0) {
-      throw new UnderflowException();
-    }
-
-    final T removed = entries[top];
-    entries[top--] = null;
-    return removed;
-  }
-
-  /**
-   * Pops the specified number of operands from the stack.
-   *
-   * @param items the number of operands to pop off the stack
-   * @throws IllegalArgumentException if the items to pop is negative.
-   * @throws UnderflowException when the items to pop is greater than {@link #size()}
-   */
-  void bulkPop(final int items) {
-    if (items < 0) {
-      throw new IllegalArgumentException(
-          String.format("requested number of items to bulk pop (%d) is negative", items));
-    }
-    checkArgument(items > 0, "number of items to pop must be greater than 0");
-    if (items > size()) {
-      throw new UnderflowException();
-    }
-
-    for (int i = 0; i < items; ++i) {
-      pop();
-    }
-  }
-
-  public void push(final T operand) {
-    final int nextTop = top + 1;
-    if (nextTop == maxSize) {
-      throw new OverflowException();
-    }
-    entries[nextTop] = operand;
-    top = nextTop;
-  }
-
-  public void set(final int offset, final T operand) {
-    if (offset < 0 || offset >= size()) {
-      throw new IndexOutOfBoundsException();
-    }
-
-    entries[top - offset] = operand;
-  }
-
-  public int size() {
-    return top + 1;
-  }
-
-  @Override
-  public String toString() {
-    final StringBuilder builder = new StringBuilder();
-    for (int i = 0; i < entries.length; ++i) {
-      builder.append(String.format("\n0x%04X ", i)).append(entries[i]);
-    }
-    return builder.toString();
-  }
-
-  @Override
-  public int hashCode() {
-    return Arrays.hashCode(entries);
-  }
-
-  @SuppressWarnings("unchecked")
-  @Override
-  public boolean equals(final Object other) {
-    if (!(other instanceof FixedStack)) {
-      return false;
-    }
-
-    final FixedStack<T> that = (FixedStack<T>) other;
-    return Arrays.deepEquals(this.entries, that.entries);
-  }
-
-  public boolean isFull() {
-    return top + 1 >= maxSize;
-  }
-
-  public boolean isEmpty() {
-    return top < 0;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/GasCalculator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/GasCalculator.java
deleted file mode 100644
index f845de434f1..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/GasCalculator.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.mainnet.AbstractMessageProcessor;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.ECRECPrecompiledContract;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.IDPrecompiledContract;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.RIPEMD160PrecompiledContract;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.SHA256PrecompiledContract;
-import org.hyperledger.besu.ethereum.vm.operations.BalanceOperation;
-import org.hyperledger.besu.ethereum.vm.operations.BeginSubOperation;
-import org.hyperledger.besu.ethereum.vm.operations.BlockHashOperation;
-import org.hyperledger.besu.ethereum.vm.operations.ExpOperation;
-import org.hyperledger.besu.ethereum.vm.operations.ExtCodeCopyOperation;
-import org.hyperledger.besu.ethereum.vm.operations.ExtCodeHashOperation;
-import org.hyperledger.besu.ethereum.vm.operations.ExtCodeSizeOperation;
-import org.hyperledger.besu.ethereum.vm.operations.JumpDestOperation;
-import org.hyperledger.besu.ethereum.vm.operations.LogOperation;
-import org.hyperledger.besu.ethereum.vm.operations.MLoadOperation;
-import org.hyperledger.besu.ethereum.vm.operations.MStore8Operation;
-import org.hyperledger.besu.ethereum.vm.operations.MStoreOperation;
-import org.hyperledger.besu.ethereum.vm.operations.SLoadOperation;
-import org.hyperledger.besu.ethereum.vm.operations.SelfDestructOperation;
-import org.hyperledger.besu.ethereum.vm.operations.Sha3Operation;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt256;
-
-/**
- * Provides various gas cost lookups and calculations used during block processing.
- *
- * <p>The {@code GasCalculator} is meant to encapsulate all {@link Gas}-related calculations except
- * for the following "safe" operations:
- *
- * <ul>
- *   <li><b>Operation Gas Deductions:</b> Deducting the operation's gas cost from the VM's current
- *       message frame because the
- * </ul>
- */
-public interface GasCalculator {
-
-  // Transaction Gas Calculations
-
-  /**
-   * Returns a {@link Transaction}s intrinisic gas cost
-   *
-   * @param transaction The transaction
-   * @return the transaction's intrinsic gas cost
-   */
-  Gas transactionIntrinsicGasCost(Transaction transaction);
-
-  // Contract Creation Gas Calculations
-
-  /**
-   * Returns the cost for a {@link AbstractMessageProcessor} to deposit the code in storage
-   *
-   * @param codeSize The size of the code in bytes
-   * @return the code deposit cost
-   */
-  Gas codeDepositGasCost(int codeSize);
-
-  // Precompiled Contract Gas Calculations
-
-  /**
-   * Returns the gas cost to execute the {@link IDPrecompiledContract}.
-   *
-   * @param input The input to the ID precompiled contract
-   * @return the gas cost to execute the ID precompiled contract
-   */
-  Gas idPrecompiledContractGasCost(Bytes input);
-
-  /**
-   * Returns the gas cost to execute the {@link ECRECPrecompiledContract}.
-   *
-   * @return the gas cost to execute the ECREC precompiled contract
-   */
-  Gas getEcrecPrecompiledContractGasCost();
-
-  /**
-   * Returns the gas cost to execute the {@link SHA256PrecompiledContract}.
-   *
-   * @param input The input to the SHA256 precompiled contract
-   * @return the gas cost to execute the SHA256 precompiled contract
-   */
-  Gas sha256PrecompiledContractGasCost(Bytes input);
-
-  /**
-   * Returns the gas cost to execute the {@link RIPEMD160PrecompiledContract}.
-   *
-   * @param input The input to the RIPEMD160 precompiled contract
-   * @return the gas cost to execute the RIPEMD160 precompiled contract
-   */
-  Gas ripemd160PrecompiledContractGasCost(Bytes input);
-
-  // Gas Tier Lookups
-
-  /**
-   * Returns the gas cost for the zero gas tier.
-   *
-   * @return the gas cost for the zero gas tier
-   */
-  Gas getZeroTierGasCost();
-
-  /**
-   * Returns the gas cost for the very low gas tier.
-   *
-   * @return the gas cost for the very low gas tier
-   */
-  Gas getVeryLowTierGasCost();
-
-  /**
-   * Returns the gas cost for the low gas tier.
-   *
-   * @return the gas cost for the low gas tier
-   */
-  Gas getLowTierGasCost();
-
-  /**
-   * Returns the gas cost for the base gas tier.
-   *
-   * @return the gas cost for the base gas tier
-   */
-  Gas getBaseTierGasCost();
-
-  /**
-   * Returns the gas cost for the mid gas tier.
-   *
-   * @return the gas cost for the mid gas tier
-   */
-  Gas getMidTierGasCost();
-
-  /**
-   * Returns the gas cost for the high gas tier.
-   *
-   * @return the gas cost for the high gas tier
-   */
-  Gas getHighTierGasCost();
-
-  // Call/Create Operation Calculations
-
-  /**
-   * Returns the gas cost for one of the various CALL operations.
-   *
-   * @param frame The current frame
-   * @param stipend The gas stipend being provided by the CALL caller
-   * @param inputDataOffset The offset in memory to retrieve the CALL input data
-   * @param inputDataLength The CALL input data length
-   * @param outputDataOffset The offset in memory to place the CALL output data
-   * @param outputDataLength The CALL output data length
-   * @param transferValue The wei being transferred
-   * @param recipient The CALL recipient (may be null if self destructed or new)
-   * @param contract The address of the recipient (never null)
-   * @return The gas cost for the CALL operation
-   */
-  Gas callOperationGasCost(
-      MessageFrame frame,
-      Gas stipend,
-      UInt256 inputDataOffset,
-      UInt256 inputDataLength,
-      UInt256 outputDataOffset,
-      UInt256 outputDataLength,
-      Wei transferValue,
-      Account recipient,
-      Address contract);
-
-  Gas getAdditionalCallStipend();
-
-  /**
-   * Returns the amount of gas parent will provide its child CALL.
-   *
-   * @param frame The current frame
-   * @param stipend The gas stipend being provided by the CALL caller
-   * @param transfersValue Whether or not the call transfers any wei
-   * @return the amount of gas parent will provide its child CALL
-   */
-  Gas gasAvailableForChildCall(MessageFrame frame, Gas stipend, boolean transfersValue);
-
-  /**
-   * Returns the amount of gas the CREATE operation will consume.
-   *
-   * @param frame The current frame
-   * @return the amount of gas the CREATE operation will consume
-   */
-  Gas createOperationGasCost(MessageFrame frame);
-
-  /**
-   * Returns the amount of gas the CREATE2 operation will consume.
-   *
-   * @param frame The current frame
-   * @return the amount of gas the CREATE2 operation will consume
-   */
-  Gas create2OperationGasCost(MessageFrame frame);
-
-  /**
-   * Returns the amount of gas parent will provide its child CREATE.
-   *
-   * @param stipend The gas stipend being provided by the CREATE caller
-   * @return the amount of gas parent will provide its child CREATE
-   */
-  Gas gasAvailableForChildCreate(Gas stipend);
-
-  // Re-used Operation Calculations
-
-  /**
-   * Returns the amount of gas consumed by the data copy operation.
-   *
-   * @param frame The current frame
-   * @param offset The offset in memory to copy the data to
-   * @param length The length of the data being copied into memory
-   * @return the amount of gas consumed by the data copy operation
-   */
-  Gas dataCopyOperationGasCost(MessageFrame frame, UInt256 offset, UInt256 length);
-
-  /**
-   * Returns the cost of expanding memory for the specified access.
-   *
-   * @param frame The current frame
-   * @param offset The offset in memory where the access occurs
-   * @param length the length of the memory access
-   * @return The gas required to expand memory for the specified access
-   */
-  Gas memoryExpansionGasCost(MessageFrame frame, UInt256 offset, UInt256 length);
-
-  // Specific Non-call Operation Calculations
-
-  /**
-   * Returns the cost for executing a {@link BalanceOperation}.
-   *
-   * @return the cost for executing the balance operation
-   */
-  Gas getBalanceOperationGasCost();
-
-  /**
-   * Returns the cost for executing a {@link BlockHashOperation}.
-   *
-   * @return the cost for executing the block hash operation
-   */
-  Gas getBlockHashOperationGasCost();
-
-  /**
-   * Returns the cost for executing a {@link ExpOperation}.
-   *
-   * @param numBytes The number of bytes for the exponent parameter
-   * @return the cost for executing the exp operation
-   */
-  Gas expOperationGasCost(int numBytes);
-
-  /**
-   * Returns the cost for executing a {@link ExtCodeCopyOperation}.
-   *
-   * @param frame The current frame
-   * @param offset The offset in memory to external code copy the data to
-   * @param length The length of the code being copied into memory
-   * @return the cost for executing the external code size operation
-   */
-  Gas extCodeCopyOperationGasCost(MessageFrame frame, UInt256 offset, UInt256 length);
-
-  /**
-   * Returns the cost for executing a {@link ExtCodeHashOperation}.
-   *
-   * @return the cost for executing the external code hash operation
-   */
-  Gas extCodeHashOperationGasCost();
-
-  /**
-   * Returns the cost for executing a {@link ExtCodeSizeOperation}.
-   *
-   * @return the cost for executing the external code size operation
-   */
-  Gas getExtCodeSizeOperationGasCost();
-
-  /**
-   * Returns the cost for executing a {@link JumpDestOperation}.
-   *
-   * @return the cost for executing the jump destination operation
-   */
-  Gas getJumpDestOperationGasCost();
-
-  /**
-   * Returns the cost for executing a {@link LogOperation}.
-   *
-   * @param frame The current frame
-   * @param dataOffset The offset in memory where the log data exists
-   * @param dataLength The length of the log data to read from memory
-   * @param numTopics The number of topics in the log
-   * @return the cost for executing the external code size operation
-   */
-  Gas logOperationGasCost(
-      MessageFrame frame, UInt256 dataOffset, UInt256 dataLength, int numTopics);
-
-  /**
-   * Returns the cost for executing a {@link MLoadOperation}.
-   *
-   * @param frame The current frame
-   * @param offset The offset in memory where the access takes place
-   * @return the cost for executing the memory load operation
-   */
-  Gas mLoadOperationGasCost(MessageFrame frame, UInt256 offset);
-
-  /**
-   * Returns the cost for executing a {@link MStoreOperation}.
-   *
-   * @param frame The current frame
-   * @param offset The offset in memory where the access takes place
-   * @return the cost for executing the memory store operation
-   */
-  Gas mStoreOperationGasCost(MessageFrame frame, UInt256 offset);
-
-  /**
-   * Returns the cost for executing a {@link MStore8Operation}.
-   *
-   * @param frame The current frame
-   * @param offset The offset in memory where the access takes place
-   * @return the cost for executing the memory byte store operation
-   */
-  Gas mStore8OperationGasCost(MessageFrame frame, UInt256 offset);
-
-  /**
-   * Returns the cost for executing a {@link SelfDestructOperation}.
-   *
-   * @param recipient The recipient of the self destructed inheritance (may be null)
-   * @param inheritance The amount the recipient will receive
-   * @return the cost for executing the self destruct operation
-   */
-  Gas selfDestructOperationGasCost(Account recipient, Wei inheritance);
-
-  /**
-   * Returns the cost for executing a {@link Sha3Operation}.
-   *
-   * @param frame The current frame
-   * @param offset The offset in memory where the data to be hashed exists
-   * @param length The hashed data length
-   * @return the cost for executing the memory byte store operation
-   */
-  Gas sha3OperationGasCost(MessageFrame frame, UInt256 offset, UInt256 length);
-
-  /**
-   * Returns the cost for executing a {@link SLoadOperation}.
-   *
-   * @return the cost for executing the storage load operation
-   */
-  Gas getSloadOperationGasCost();
-
-  /**
-   * Returns the cost for an SSTORE operation.
-   *
-   * @param account the account that storage will be changed in
-   * @param key the key the new value is to be stored under
-   * @param newValue the new value to be stored
-   * @return the gas cost for the SSTORE operation
-   */
-  Gas calculateStorageCost(Account account, UInt256 key, UInt256 newValue);
-
-  /**
-   * Returns the refund amount for an SSTORE operation.
-   *
-   * @param account the account that storage will be changed in
-   * @param key the key the new value is to be stored under
-   * @param newValue the new value to be stored
-   * @return the gas refund for the SSTORE operation
-   */
-  Gas calculateStorageRefundAmount(Account account, UInt256 key, UInt256 newValue);
-
-  /**
-   * Returns the refund amount for deleting an account in a {@link SelfDestructOperation}.
-   *
-   * @return the refund amount for deleting an account in a self destruct operation
-   */
-  Gas getSelfDestructRefundAmount();
-
-  /**
-   * Returns the cost for executing a {@link BeginSubOperation}.
-   *
-   * @return the cost for executing begin sub operation
-   */
-  Gas getBeginSubGasCost();
-
-  /**
-   * Returns the cost of a SLOAD to a storage slot not previously loaded in the TX context.
-   *
-   * @return the cost of a SLOAD to a storage slot not previously loaded in the TX context.
-   */
-  default Gas getColdSloadCost() {
-    return Gas.ZERO;
-  }
-
-  /**
-   * Returns the cost to access an account not previously accessed in the TX context.
-   *
-   * @return the cost to access an account not previously accessed in the TX context.
-   */
-  default Gas getColdAccountAccessCost() {
-    return Gas.ZERO;
-  }
-
-  /**
-   * Returns the cost of a SLOAD to a storage slot that has previously been loaded in the TX
-   * context.
-   *
-   * @return the cost of a SLOAD to a storage slot that has previously been loaded in the TX
-   *     context.
-   */
-  default Gas getWarmStorageReadCost() {
-    return Gas.ZERO;
-  }
-
-  /**
-   * For the purposes of this gas calculator, is this address a precompile?
-   *
-   * @param address the address to test for being a precompile
-   * @return true if it is a precompile.
-   */
-  default boolean isPrecompile(final Address address) {
-    return false;
-  }
-
-  default Gas modExpGasCost(final Bytes input) {
-    return Gas.ZERO;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Memory.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Memory.java
deleted file mode 100644
index ef51777944b..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Memory.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm;
-
-import java.math.BigInteger;
-import java.util.Arrays;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-import org.apache.tuweni.units.bigints.UInt256s;
-
-/**
- * A EVM memory implementation.
- *
- * <p>Note: this is meant to map to I in Section 9.1 "Basics" and Section 9.4.1 "Machine State" in
- * the Yellow Paper Revision 59dccd.
- */
-public class Memory {
-
-  // See below.
-  private static final long MAX_BYTES = Integer.MAX_VALUE;
-
-  /**
-   * The data stored within the memory.
-   *
-   * <p>Note that the current Ethereum spec don't put a limit on memory, so we could theoretically
-   * overflow this. A byte array implementation limits us to 2GiB. But that would cost over 51
-   * trillion gas. So this is likely a reasonable limitation, at least at first.
-   */
-  private byte[] data;
-
-  private UInt256 activeWords;
-  private int dataSize256;
-
-  public Memory() {
-    data = new byte[0];
-    updateSize();
-  }
-
-  private void updateSize() {
-    dataSize256 = data.length / Bytes32.SIZE;
-    activeWords = UInt256.valueOf(dataSize256);
-  }
-
-  private static RuntimeException overflow(final long v) {
-    return overflow(String.valueOf(v));
-  }
-
-  private static RuntimeException overflow(final String v) {
-    // TODO: we should probably have another specific exception so this properly end up as an
-    // exceptional halt condition with a clear message (message that can indicate that if anyone
-    // runs into this, he should contact us so we know it's a case we do need to handle).
-    final String msg = "Memory index or length %s too large, cannot be larger than %d";
-    throw new IllegalStateException(String.format(msg, v, MAX_BYTES));
-  }
-
-  private void checkByteIndex(final long v) {
-    // We can have at most MAX_BYTES, so an index can only at most MAX_BYTES - 1.
-    if (v < 0 || v >= MAX_BYTES) throw overflow(v);
-  }
-
-  private int asByteIndex(final UInt256 w) {
-    try {
-      final long v = w.toLong();
-      checkByteIndex(v);
-      return (int) v;
-    } catch (final IllegalStateException e) {
-      throw overflow(w.toString());
-    }
-  }
-
-  private static int asByteLength(final UInt256 l) {
-    try {
-      // While we can theoretically support up to 32 * Integer.MAX_VALUE due to storing words, and
-      // so an index in memory need to be a long internally, we simply cannot load/store more than
-      // Integer.MAX_VALUE bytes at a time (Bytes has an int size).
-      return l.intValue();
-    } catch (final IllegalStateException e) {
-      throw overflow(l.toString());
-    }
-  }
-
-  /**
-   * For use in memoryExpansionGasCost() of GasCost. Returns the number of new active words that
-   * accommodate at least the number of specified bytes from the provide memory offset.
-   *
-   * <p>Not that this has to return a UInt256 for Gas calculation, in case someone writes code that
-   * require a crazy amount of data. Such allocation should get prohibitive however and we will end
-   * up with an Out-of-Gas error.
-   *
-   * @param location The offset in memory from which we want to accommodate {@code numBytes}.
-   * @param numBytes The minimum number of bytes in memory.
-   * @return The number of active words that accommodate at least the number of specified bytes.
-   */
-  UInt256 calculateNewActiveWords(final UInt256 location, final UInt256 numBytes) {
-    if (numBytes.isZero()) {
-      return activeWords;
-    }
-
-    if (location.fitsInt() && numBytes.fitsInt()) {
-      // Fast common path (note that we work on int but use long arithmetic to avoid issues)
-      final long byteSize = location.toLong() + numBytes.toLong();
-      int wordSize = Math.toIntExact(byteSize / Bytes32.SIZE);
-      if (byteSize % Bytes32.SIZE != 0) wordSize += 1;
-      return wordSize > dataSize256 ? UInt256.valueOf(wordSize) : activeWords;
-    } else {
-      // Slow, rare path
-
-      // Note that this is one place where, while the result will fit UInt256, we should compute
-      // without modulo for extreme cases.
-      final BigInteger byteSize =
-          location.toBytes().toUnsignedBigInteger().add(numBytes.toBytes().toUnsignedBigInteger());
-      final BigInteger[] result = byteSize.divideAndRemainder(BigInteger.valueOf(Bytes32.SIZE));
-      BigInteger wordSize = result[0];
-      if (!result[1].equals(BigInteger.ZERO)) {
-        wordSize = wordSize.add(BigInteger.ONE);
-      }
-      return UInt256s.max(activeWords, UInt256.valueOf(wordSize));
-    }
-  }
-
-  /**
-   * Expands the active words to accommodate the specified byte position.
-   *
-   * @param offset The location in memory to start with.
-   * @param numBytes The number of bytes to get.
-   */
-  void ensureCapacityForBytes(final UInt256 offset, final UInt256 numBytes) {
-    if (!offset.fitsInt()) return;
-    if (!numBytes.fitsInt()) return;
-    ensureCapacityForBytes(offset.intValue(), numBytes.intValue());
-  }
-
-  /**
-   * Expands the active words to accommodate the specified byte position.
-   *
-   * @param offset The location in memory to start with.
-   * @param numBytes The number of bytes to get.
-   */
-  void ensureCapacityForBytes(final int offset, final int numBytes) {
-    // Do not increase the memory capacity if no bytes are being written
-    // regardless of what the address may be.
-    if (numBytes == 0) {
-      return;
-    }
-    final int lastByteIndex = Math.addExact(offset, numBytes);
-    final int lastWordRequired = ((lastByteIndex - 1) / Bytes32.SIZE);
-    maybeExpandCapacity(lastWordRequired + 1);
-  }
-
-  /**
-   * Expands the memory to the specified number of active words.
-   *
-   * @param newActiveWords The new number of active words to expand to.
-   */
-  private void maybeExpandCapacity(final int newActiveWords) {
-    if (dataSize256 >= newActiveWords) return;
-
-    // Require full capacity to guarantee we don't resize more than once.
-    final byte[] newData = new byte[newActiveWords * Bytes32.SIZE];
-    System.arraycopy(data, 0, newData, 0, data.length);
-    data = newData;
-    updateSize();
-  }
-
-  /**
-   * Returns true if the object is equal to this memory instance; otherwise false.
-   *
-   * @param other The object to compare this memory instance with.
-   * @return True if the object is equal to this memory instance.
-   */
-  @Override
-  public boolean equals(final Object other) {
-    if (other == null) return false;
-    if (other == this) return true;
-    if (!(other instanceof Memory)) return false;
-
-    final Memory that = (Memory) other;
-    return Arrays.equals(this.data, that.data);
-  }
-
-  @Override
-  public int hashCode() {
-    return Arrays.hashCode(data);
-  }
-
-  /**
-   * Returns the current number of active bytes stored in memory.
-   *
-   * @return The current number of active bytes stored in memory.
-   */
-  int getActiveBytes() {
-    return data.length;
-  }
-
-  /**
-   * Returns the current number of active words stored in memory.
-   *
-   * @return The current number of active words stored in memory.
-   */
-  UInt256 getActiveWords() {
-    return activeWords;
-  }
-
-  /**
-   * Returns a copy of bytes from memory.
-   *
-   * @param location The location in memory to start with.
-   * @param numBytes The number of bytes to get.
-   * @return A fresh copy of the bytes from memory starting at {@code location} and extending {@code
-   *     numBytes}.
-   */
-  public Bytes getBytes(final UInt256 location, final UInt256 numBytes) {
-    // Note: if length == 0, we don't require any memory expansion, whatever location is. So
-    // we we must call asByteIndex(location) after this check so as it doesn't throw if the location
-    // is too big but the length is 0 (which is somewhat nonsensical, but is exercise by some
-    // tests).
-    final int length = asByteLength(numBytes);
-    if (length == 0) {
-      return Bytes.EMPTY;
-    }
-
-    final int start = asByteIndex(location);
-
-    ensureCapacityForBytes(start, length);
-    return Bytes.of(Arrays.copyOfRange(data, start, start + numBytes.intValue()));
-  }
-
-  /**
-   * Copy the bytes from the provided number of bytes from the provided value to memory from the
-   * provided offset.
-   *
-   * <p>Note that this method will extend memory to accommodate the location assigned and bytes
-   * copied and so never fails.
-   *
-   * @param memOffset the location in memory at which to start copying the bytes of {@code value}.
-   * @param sourceOffset the location in the source to start copying.
-   * @param numBytes the number of bytes to set in memory. Note that this value may differ from
-   *     {@code value.size()}: if {@code numBytes < value.size()} bytes, only {@code numBytes} will
-   *     be copied from {@code value}; if {@code numBytes < value.size()}, then only the bytes in
-   *     {@code value} will be copied, but the memory will be expanded if necessary to cover {@code
-   *     numBytes} (in other words, {@link #getActiveWords()} will return a value consistent with
-   *     having set {@code numBytes} bytes, even if less than that have been concretely set due to
-   *     {@code value} being smaller).
-   * @param bytes the bytes to copy to memory from {@code location}.
-   */
-  public void setBytes(
-      final UInt256 memOffset,
-      final UInt256 sourceOffset,
-      final UInt256 numBytes,
-      final Bytes bytes) {
-    final int offset = sourceOffset.fitsInt() ? sourceOffset.intValue() : Integer.MAX_VALUE;
-    final int length = numBytes.fitsInt() ? numBytes.intValue() : Integer.MAX_VALUE;
-
-    if (offset >= bytes.size()) {
-      clearBytes(memOffset, numBytes);
-      return;
-    }
-
-    final Bytes toCopy = bytes.slice(offset, Math.min(length, bytes.size() - offset));
-    setBytes(memOffset, numBytes, toCopy);
-  }
-
-  /**
-   * Copy the bytes from the provided number of bytes from the provided value to memory from the
-   * provided offset.
-   *
-   * <p>Note that this method will extend memory to accommodate the location assigned and bytes
-   * copied and so never fails.
-   *
-   * @param location the location in memory at which to start copying the bytes of {@code value}.
-   * @param numBytes the number of bytes to set in memory. Note that this value may differ from
-   *     {@code value.size()}: if {@code numBytes < value.size()} bytes, only {@code numBytes} will
-   *     be copied from {@code value}; if {@code numBytes > value.size()}, then only the bytes in
-   *     {@code value} will be copied, but the memory will be expanded if necessary to cover {@code
-   *     numBytes} (in other words, {@link #getActiveWords()} will return a value consistent with
-   *     having set {@code numBytes} bytes, even if less than that have been concretely set due to
-   *     {@code value} being smaller).
-   * @param taintedValue the bytes to copy to memory from {@code location}.
-   */
-  public void setBytes(final UInt256 location, final UInt256 numBytes, final Bytes taintedValue) {
-    if (numBytes.isZero()) {
-      return;
-    }
-
-    final int start = asByteIndex(location);
-    final int length = asByteLength(numBytes);
-    final int srcLength = taintedValue.size();
-    final int end = Math.addExact(start, length);
-
-    ensureCapacityForBytes(start, length);
-    if (srcLength >= length) {
-      System.arraycopy(taintedValue.toArrayUnsafe(), 0, data, start, length);
-    } else {
-      Arrays.fill(data, start, end, (byte) 0);
-      System.arraycopy(taintedValue.toArrayUnsafe(), 0, data, start, srcLength);
-    }
-  }
-
-  /**
-   * Clears (set to 0) some contiguous number of bytes in memory.
-   *
-   * @param location The location in memory from which to start clearing the bytes.
-   * @param numBytes The number of bytes to clear.
-   */
-  private void clearBytes(final UInt256 location, final UInt256 numBytes) {
-    // See getBytes for why we check length == 0 first, before calling asByteIndex(location).
-    final int length = asByteLength(numBytes);
-    if (length == 0) {
-      return;
-    }
-    clearBytes(asByteIndex(location), length);
-  }
-
-  /**
-   * Clears (set to 0) some contiguous number of bytes in memory.
-   *
-   * @param location The location in memory from which to start clearing the bytes.
-   * @param numBytes The number of bytes to clear.
-   */
-  private void clearBytes(final int location, final int numBytes) {
-    if (numBytes == 0) {
-      return;
-    }
-
-    ensureCapacityForBytes(location, numBytes);
-    Arrays.fill(data, location, location + numBytes, (byte) 0);
-  }
-
-  /**
-   * Sets a single byte in memory at the provided location.
-   *
-   * @param location the location of the byte to set.
-   * @param value the value to set for the byte at {@code location}.
-   */
-  void setByte(final UInt256 location, final byte value) {
-    final int start = asByteIndex(location);
-    ensureCapacityForBytes(start, 1);
-    data[start] = value;
-  }
-
-  /**
-   * Returns a copy of the 32-bytes word that begins at the specified memory location.
-   *
-   * @param location The memory location the 256-bit word begins at.
-   * @return a copy of the 32-bytes word that begins at the specified memory location.
-   */
-  public Bytes32 getWord(final UInt256 location) {
-    final int start = asByteIndex(location);
-    ensureCapacityForBytes(start, Bytes32.SIZE);
-    return Bytes32.wrap(Arrays.copyOfRange(data, start, start + Bytes32.SIZE));
-  }
-
-  /**
-   * Sets a 32-bytes word in memory at the provided location.
-   *
-   * <p>Note that this method will extend memory to accommodate the location assigned and bytes
-   * copied and so never fails.
-   *
-   * @param location the location at which to start setting the bytes.
-   * @param bytes the 32 bytes to copy at {@code location}.
-   */
-  public void setWord(final UInt256 location, final Bytes32 bytes) {
-    final int start = asByteIndex(location);
-    ensureCapacityForBytes(start, Bytes32.SIZE);
-
-    System.arraycopy(bytes.toArrayUnsafe(), 0, data, start, Bytes32.SIZE);
-  }
-
-  @Override
-  public String toString() {
-    return Bytes.wrap(data).toHexString();
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/MessageFrame.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/MessageFrame.java
deleted file mode 100644
index 442885b0ae3..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/MessageFrame.java
+++ /dev/null
@@ -1,1341 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
-
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Log;
-import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.mainnet.AbstractMessageProcessor;
-import org.hyperledger.besu.ethereum.privacy.storage.PrivateMetadataUpdater;
-import org.hyperledger.besu.ethereum.vm.internal.MemoryEntry;
-import org.hyperledger.besu.ethereum.vm.operations.ReturnStack;
-
-import java.util.ArrayList;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Consumer;
-
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.bytes.MutableBytes;
-import org.apache.tuweni.units.bigints.UInt256;
-
-/**
- * A container object for all of the state associated with a message.
- *
- * <p>A message corresponds to an interaction between two accounts. A {@link Transaction} spawns at
- * least one message when its processed. Messages can also spawn messages depending on the code
- * executed within a message.
- *
- * <p>Note that there is no specific Message object in the code base. Instead message executions
- * correspond to a {@code MessageFrame} and a specific {@link AbstractMessageProcessor}. Currently
- * there are two such {@link AbstractMessageProcessor} types:
- *
- * <p><b>Message Call ({@code MESSAGE_CALL})</b>
- *
- * <p>A message call consists of applying a set of changes to an account on behalf of another
- * account. At the minimal end of changes is a value transfer between a sender and recipient
- * account. If the recipient account contains code, that code is also executed.
- *
- * <p><b>Contract Creation ({@code CONTRACT_CREATION})</b>
- *
- * <p>A contract creation, as its name suggests, creates contract accounts. Contract initialization
- * code and a value are supplied to initialize the contract account code and balance, respectively.
- */
-public class MessageFrame {
-
-  /**
-   * Message Frame State.
-   *
-   * <h2>Message Frame Lifecycle</h2>
-   *
-   * <p>The diagram below presents the message frame lifecycle:
-   *
-   * <pre>
-   *            ------------------------------------------------------
-   *            |                                                    |
-   *            |                                                    v
-   *            |               ---------------------     ---------------------
-   *            |               |                   |     |                   |
-   *            |               |    CODE_SUCCESS   | --&gt; | COMPLETED_SUCCESS |
-   *            |               |                   |     |                   |
-   *            |               ---------------------     ---------------------
-   *            |                         ^
-   *            |                         |
-   *  ---------------------     ---------------------     ---------------------
-   *  |                   |     |                   | --&gt; |                   |
-   *  |    NOT_STARTED    | --&gt; |   CODE_EXECUTING  |     |   CODE_SUSPENDED  |
-   *  |                   |     |                   | &lt;-- |                   |
-   *  ---------------------     ---------------------     ---------------------
-   *            |                         |
-   *            |                         |
-   *            |                         |                 ---------------------
-   *            |                         |                 |                   |
-   *            |                         |------------&gt; |      REVERTED     |
-   *            |                         |                 |                   |
-   *            |                         |                 ---------------------
-   *            |                         |
-   *            |                         v
-   *            |               ---------------------     ---------------------
-   *            |               |                   |     |                   |
-   *            |-------------&gt; |  EXCEPTIONAL_HALT | --&gt; | COMPLETED_FAILURE |
-   *                            |                   |     |                   |
-   *                            ---------------------     ---------------------
-   * </pre>
-   *
-   * <h3>Message Not Started ({@link #NOT_STARTED})</h3>
-   *
-   * <p>The message has not begun to execute yet.
-   *
-   * <h3>Code Executing ({@link #CODE_EXECUTING})</h3>
-   *
-   * <p>The message contains code and has begun executing it. The execution will continue until it
-   * is halted due to (1) spawning a child message (2) encountering an exceptional halting condition
-   * (2) completing successfully.
-   *
-   * <h3>Code Suspended Execution ({@link #CODE_SUSPENDED})</h3>
-   *
-   * <p>The message has spawned a child message and has suspended its execution until the child
-   * message has completed and notified its parent message. The message will then continue executing
-   * code ({@link #CODE_EXECUTING}) again.
-   *
-   * <h3>Code Execution Completed Successfully ({@link #CODE_SUSPENDED})</h3>
-   *
-   * <p>The code within the message has executed to completion successfully.
-   *
-   * <h3>Message Exceptionally Halted ({@link #EXCEPTIONAL_HALT})</h3>
-   *
-   * <p>The message execution has encountered an exceptional halting condition at some point during
-   * its execution.
-   *
-   * <h3>Message Reverted ({@link #REVERT})</h3>
-   *
-   * <p>The message execution has requested to revert state during execution.
-   *
-   * <h3>Message Execution Failed ({@link #COMPLETED_FAILED})</h3>
-   *
-   * <p>The message execution failed to execute successfully; most likely due to encountering an
-   * exceptional halting condition. At this point the message frame is finalized and the parent is
-   * notified.
-   *
-   * <h3>Message Execution Completed Successfully ({@link #COMPLETED_SUCCESS})</h3>
-   *
-   * <p>The message execution completed successfully and needs to finalized and propagated to the
-   * parent message that spawned it.
-   */
-  public enum State {
-
-    /** Message execution has not started. */
-    NOT_STARTED,
-
-    /** Code execution within the message is in progress. */
-    CODE_EXECUTING,
-
-    /** Code execution within the message has finished successfully. */
-    CODE_SUCCESS,
-
-    /** Code execution within the message has been suspended. */
-    CODE_SUSPENDED,
-
-    /** An exceptional halting condition has occurred. */
-    EXCEPTIONAL_HALT,
-
-    /** State changes were reverted during execution. */
-    REVERT,
-
-    /** The message execution has failed to complete successfully. */
-    COMPLETED_FAILED,
-
-    /** The message execution has completed successfully. */
-    COMPLETED_SUCCESS,
-  }
-
-  /** The message type the frame corresponds to. */
-  public enum Type {
-
-    /** A Contract creation message. */
-    CONTRACT_CREATION,
-
-    /** A message call message. */
-    MESSAGE_CALL,
-  }
-
-  public static final int DEFAULT_MAX_STACK_SIZE = 1024;
-
-  // Global data fields.
-  private final WorldUpdater worldState;
-  private final Blockchain blockchain;
-
-  // Metadata fields.
-  private final Type type;
-  private State state;
-
-  // Machine state fields.
-  private Gas gasRemaining;
-  private final BlockHashLookup blockHashLookup;
-  private final int maxStackSize;
-  private int pc;
-  private final Memory memory;
-  private final OperandStack stack;
-  private Bytes output;
-  private Bytes returnData;
-  private final boolean isStatic;
-
-  // Transaction substate fields.
-  private final List<Log> logs;
-  private Gas gasRefund;
-  private final Set<Address> selfDestructs;
-  private final Map<Address, Wei> refunds;
-  private Set<Address> warmedUpAddresses;
-  private Multimap<Address, Bytes32> warmedUpStorage;
-
-  // Execution Environment fields.
-  private final Address recipient;
-  private final Address originator;
-  private final Address contract;
-  private final int contractAccountVersion;
-  private final Wei gasPrice;
-  private final Bytes inputData;
-  private final Address sender;
-  private final Wei value;
-  private final Wei apparentValue;
-  private final Code code;
-  private final ProcessableBlockHeader blockHeader;
-  private final int depth;
-  private final Deque<MessageFrame> messageFrameStack;
-  private final Address miningBeneficiary;
-  private final Boolean isPersistingPrivateState;
-  private final PrivateMetadataUpdater privateMetadataUpdater;
-  private Optional<Bytes> revertReason;
-
-  // as defined on https://eips.ethereum.org/EIPS/eip-2315
-  private final ReturnStack returnStack;
-
-  // Privacy Execution Environment fields.
-  private final Hash transactionHash;
-
-  // Miscellaneous fields.
-  private Optional<ExceptionalHaltReason> exceptionalHaltReason = Optional.empty();
-  private Operation currentOperation;
-  private Optional<Gas> gasCost = Optional.empty();
-  private final Consumer<MessageFrame> completer;
-  private Optional<MemoryEntry> maybeUpdatedMemory = Optional.empty();
-  private Optional<MemoryEntry> maybeUpdatedStorage = Optional.empty();
-
-  public static Builder builder() {
-    return new Builder();
-  }
-
-  private MessageFrame(
-      final Type type,
-      final Blockchain blockchain,
-      final Deque<MessageFrame> messageFrameStack,
-      final ReturnStack returnStack,
-      final WorldUpdater worldState,
-      final Gas initialGas,
-      final Address recipient,
-      final Address originator,
-      final Address contract,
-      final int contractAccountVersion,
-      final Wei gasPrice,
-      final Bytes inputData,
-      final Address sender,
-      final Wei value,
-      final Wei apparentValue,
-      final Code code,
-      final ProcessableBlockHeader blockHeader,
-      final int depth,
-      final boolean isStatic,
-      final Consumer<MessageFrame> completer,
-      final Address miningBeneficiary,
-      final BlockHashLookup blockHashLookup,
-      final Boolean isPersistingPrivateState,
-      final PrivateMetadataUpdater privateMetadataUpdater,
-      final Hash transactionHash,
-      final Optional<Bytes> revertReason,
-      final int maxStackSize) {
-    this.type = type;
-    this.blockchain = blockchain;
-    this.messageFrameStack = messageFrameStack;
-    this.returnStack = returnStack;
-    this.worldState = worldState;
-    this.gasRemaining = initialGas;
-    this.blockHashLookup = blockHashLookup;
-    this.maxStackSize = maxStackSize;
-    this.pc = 0;
-    this.memory = new Memory();
-    this.stack = new OperandStack(maxStackSize);
-    this.output = Bytes.EMPTY;
-    this.returnData = Bytes.EMPTY;
-    this.logs = new ArrayList<>();
-    this.gasRefund = Gas.ZERO;
-    this.selfDestructs = new HashSet<>();
-    this.refunds = new HashMap<>();
-    this.recipient = recipient;
-    this.originator = originator;
-    this.contract = contract;
-    this.contractAccountVersion = contractAccountVersion;
-    this.gasPrice = gasPrice;
-    this.inputData = inputData;
-    this.sender = sender;
-    this.value = value;
-    this.apparentValue = apparentValue;
-    this.code = code;
-    this.blockHeader = blockHeader;
-    this.depth = depth;
-    this.state = State.NOT_STARTED;
-    this.isStatic = isStatic;
-    this.completer = completer;
-    this.miningBeneficiary = miningBeneficiary;
-    this.isPersistingPrivateState = isPersistingPrivateState;
-    this.privateMetadataUpdater = privateMetadataUpdater;
-    this.transactionHash = transactionHash;
-    this.revertReason = revertReason;
-
-    this.warmedUpAddresses = new HashSet<>();
-    warmedUpAddresses.add(sender);
-    warmedUpAddresses.add(contract);
-    this.warmedUpStorage = HashMultimap.create();
-  }
-
-  /**
-   * Return the program counter.
-   *
-   * @return the program counter
-   */
-  public int getPC() {
-    return pc;
-  }
-
-  /**
-   * Set the program counter.
-   *
-   * @param pc The new program counter value
-   */
-  public void setPC(final int pc) {
-    this.pc = pc;
-  }
-
-  /** Deducts the remaining gas. */
-  public void clearGasRemaining() {
-    this.gasRemaining = Gas.ZERO;
-  }
-
-  /**
-   * Decrement the amount of remaining gas.
-   *
-   * @param amount The amount of gas to deduct
-   */
-  public void decrementRemainingGas(final Gas amount) {
-    this.gasRemaining = gasRemaining.minus(amount);
-  }
-
-  /**
-   * Return the amount of remaining gas.
-   *
-   * @return the amount of remaining gas
-   */
-  public Gas getRemainingGas() {
-    return gasRemaining;
-  }
-
-  /**
-   * Increment the amount of remaining gas.
-   *
-   * @param amount The amount of gas to increment
-   */
-  public void incrementRemainingGas(final Gas amount) {
-    this.gasRemaining = gasRemaining.plus(amount);
-  }
-
-  /**
-   * Set the amount of remaining gas.
-   *
-   * @param amount The amount of remaining gas
-   */
-  public void setGasRemaining(final Gas amount) {
-    this.gasRemaining = amount;
-  }
-
-  /**
-   * Return the output data.
-   *
-   * @return the output data
-   */
-  public Bytes getOutputData() {
-    return output;
-  }
-
-  /**
-   * Set the output data.
-   *
-   * @param output The output data
-   */
-  public void setOutputData(final Bytes output) {
-    this.output = output;
-  }
-
-  /** Clears the output data buffer. */
-  public void clearOutputData() {
-    setOutputData(Bytes.EMPTY);
-  }
-
-  /**
-   * Return the return data.
-   *
-   * @return the return data
-   */
-  public Bytes getReturnData() {
-    return returnData;
-  }
-
-  /**
-   * Set the return data.
-   *
-   * @param returnData The return data
-   */
-  public void setReturnData(final Bytes returnData) {
-    this.returnData = returnData;
-  }
-
-  /** Clear the return data buffer. */
-  public void clearReturnData() {
-    setReturnData(Bytes.EMPTY);
-  }
-
-  /**
-   * Returns the item at the specified offset in the stack.
-   *
-   * @param offset The item's position relative to the top of the stack
-   * @return The item at the specified offset in the stack
-   * @throws IndexOutOfBoundsException if the offset is out of range
-   */
-  public Bytes32 getStackItem(final int offset) {
-    return stack.get(offset);
-  }
-
-  /**
-   * Removes the item at the top of the stack.
-   *
-   * @return the item at the top of the stack
-   * @throws IllegalStateException if the stack is empty
-   */
-  public Bytes32 popStackItem() {
-    return stack.pop();
-  }
-
-  /**
-   * Removes the corresponding number of items from the top of the stack.
-   *
-   * @param n The number of items to pop off the stack
-   */
-  public void popStackItems(final int n) {
-    stack.bulkPop(n);
-  }
-
-  /**
-   * Pushes the corresponding item onto the top of the stack
-   *
-   * @param value The value to push onto the stack.
-   */
-  public void pushStackItem(final Bytes32 value) {
-    stack.push(value);
-  }
-
-  /**
-   * Sets the stack item at the specified offset from the top of the stack to the value
-   *
-   * @param offset The item's position relative to the top of the stack
-   * @param value The value to set the stack item to
-   * @throws IllegalStateException if the stack is too small
-   */
-  public void setStackItem(final int offset, final Bytes32 value) {
-    stack.set(offset, value);
-  }
-
-  /**
-   * Return the current stack size.
-   *
-   * @return The current stack size
-   */
-  public int stackSize() {
-    return stack.size();
-  }
-
-  /**
-   * Tests if the return stack is full
-   *
-   * @return true is the return stack is full, else false
-   */
-  public boolean isReturnStackFull() {
-    return returnStack.isFull();
-  }
-
-  /**
-   * Tests if the return stack is empty
-   *
-   * @return true is the return stack is empty, else false
-   */
-  public boolean isReturnStackEmpty() {
-    return returnStack.isEmpty();
-  }
-
-  /**
-   * Removes the item at the top of the return stack.
-   *
-   * @return the item at the top of the return stack
-   * @throws IllegalStateException if the return stack is empty
-   */
-  public int popReturnStackItem() {
-    return returnStack.pop();
-  }
-
-  /**
-   * Return the return stack.
-   *
-   * @return the return stack
-   */
-  public ReturnStack getReturnStack() {
-    return returnStack;
-  }
-
-  /**
-   * Pushes the corresponding item onto the top of the return stack
-   *
-   * @param value The value to push onto the return stack.
-   * @throws IllegalStateException if the stack is full
-   */
-  public void pushReturnStackItem(final int value) {
-    returnStack.push(value);
-  }
-
-  /**
-   * Returns whether or not the message frame is static or not.
-   *
-   * @return {@code} true if the frame is static; otherwise {@code false}
-   */
-  public boolean isStatic() {
-    return isStatic;
-  }
-
-  /**
-   * Returns the memory size for specified memory access.
-   *
-   * @param offset The offset in memory
-   * @param length The length of the memory access
-   * @return the memory size for specified memory access
-   */
-  public UInt256 calculateMemoryExpansion(final UInt256 offset, final UInt256 length) {
-    return memory.calculateNewActiveWords(offset, length);
-  }
-
-  /**
-   * Expands memory to accommodate the specified memory access.
-   *
-   * @param offset The offset in memory
-   * @param length The length of the memory access
-   */
-  public void expandMemory(final UInt256 offset, final UInt256 length) {
-    memory.ensureCapacityForBytes(offset, length);
-  }
-
-  /**
-   * Returns the number of bytes in memory.
-   *
-   * @return the number of bytes in memory
-   */
-  public long memoryByteSize() {
-    return memory.getActiveBytes();
-  }
-
-  /**
-   * Returns the number of words in memory.
-   *
-   * @return the number of words in memory
-   */
-  public UInt256 memoryWordSize() {
-    return memory.getActiveWords();
-  }
-
-  /**
-   * Returns the revertReason as string
-   *
-   * @return the revertReason string
-   */
-  public Optional<Bytes> getRevertReason() {
-    return revertReason;
-  }
-
-  public void setRevertReason(final Bytes revertReason) {
-    this.revertReason = Optional.ofNullable(revertReason);
-  }
-
-  /**
-   * Read bytes in memory.
-   *
-   * @param offset The offset in memory
-   * @param length The length of the bytes to read
-   * @return The bytes in the specified range
-   */
-  public Bytes readMemory(final UInt256 offset, final UInt256 length) {
-    return readMemory(offset, length, false);
-  }
-
-  /**
-   * Read bytes in memory.
-   *
-   * @param offset The offset in memory
-   * @param length The length of the bytes to read
-   * @param explicitMemoryRead true if triggered by a memory opcode, false otherwise
-   * @return The bytes in the specified range
-   */
-  public Bytes readMemory(
-      final UInt256 offset, final UInt256 length, final boolean explicitMemoryRead) {
-    final Bytes value = memory.getBytes(offset, length);
-    if (explicitMemoryRead) {
-      setUpdatedMemory(offset, value);
-    }
-    return value;
-  }
-
-  /**
-   * Write byte to memory
-   *
-   * @param offset The offset in memory
-   * @param value The value to set in memory
-   * @param explicitMemoryUpdate true if triggered by a memory opcode, false otherwise
-   */
-  public void writeMemory(
-      final UInt256 offset, final byte value, final boolean explicitMemoryUpdate) {
-    memory.setByte(offset, value);
-    if (explicitMemoryUpdate) {
-      setUpdatedMemory(offset, Bytes.of(value));
-    }
-  }
-
-  /**
-   * Write bytes to memory
-   *
-   * @param offset The offset in memory
-   * @param length The length of the bytes to write
-   * @param value The value to write
-   */
-  public void writeMemory(final UInt256 offset, final UInt256 length, final Bytes value) {
-    writeMemory(offset, length, value, false);
-  }
-
-  /**
-   * Write bytes to memory
-   *
-   * @param offset The offset in memory
-   * @param length The length of the bytes to write
-   * @param value The value to write
-   * @param explicitMemoryUpdate true if triggered by a memory opcode, false otherwise
-   */
-  public void writeMemory(
-      final UInt256 offset,
-      final UInt256 length,
-      final Bytes value,
-      final boolean explicitMemoryUpdate) {
-    memory.setBytes(offset, length, value);
-    if (explicitMemoryUpdate) {
-      setUpdatedMemory(offset, UInt256.ZERO, length, value);
-    }
-  }
-
-  /**
-   * Write bytes to memory
-   *
-   * @param offset The offset in memory to start the write
-   * @param sourceOffset The offset in the source value to start the write
-   * @param length The length of the bytes to write
-   * @param value The value to write
-   */
-  public void writeMemory(
-      final UInt256 offset, final UInt256 sourceOffset, final UInt256 length, final Bytes value) {
-    writeMemory(offset, sourceOffset, length, value, false);
-  }
-
-  /**
-   * Write bytes to memory
-   *
-   * @param offset The offset in memory to start the write
-   * @param sourceOffset The offset in the source value to start the write
-   * @param length The length of the bytes to write
-   * @param value The value to write
-   * @param explicitMemoryUpdate true if triggered by a memory opcode, false otherwise
-   */
-  public void writeMemory(
-      final UInt256 offset,
-      final UInt256 sourceOffset,
-      final UInt256 length,
-      final Bytes value,
-      final boolean explicitMemoryUpdate) {
-    memory.setBytes(offset, sourceOffset, length, value);
-    if (explicitMemoryUpdate && length.toLong() > 0) {
-      setUpdatedMemory(offset, sourceOffset, length, value);
-    }
-  }
-
-  private void setUpdatedMemory(
-      final UInt256 offset, final UInt256 sourceOffset, final UInt256 length, final Bytes value) {
-    final int srcOff = sourceOffset.fitsInt() ? sourceOffset.intValue() : Integer.MAX_VALUE;
-    final int len = length.fitsInt() ? length.intValue() : Integer.MAX_VALUE;
-    final int endIndex = srcOff + len;
-    if (srcOff >= 0 && endIndex > 0) {
-      final int srcSize = value.size();
-      if (endIndex > srcSize) {
-        final MutableBytes paddedAnswer = MutableBytes.create(len);
-        if (srcOff < srcSize) {
-          value.slice(srcOff, srcSize - srcOff).copyTo(paddedAnswer, 0);
-        }
-        setUpdatedMemory(offset, paddedAnswer.copy());
-      } else {
-        setUpdatedMemory(offset, value.slice(srcOff, len).copy());
-      }
-    }
-  }
-
-  private void setUpdatedMemory(final UInt256 offset, final Bytes value) {
-    maybeUpdatedMemory = Optional.of(new MemoryEntry(offset, value));
-  }
-
-  public void storageWasUpdated(final UInt256 storageAddress, final Bytes value) {
-    maybeUpdatedStorage = Optional.of(new MemoryEntry(storageAddress, value));
-  }
-  /**
-   * Accumulate a log.
-   *
-   * @param log The log to accumulate
-   */
-  public void addLog(final Log log) {
-    logs.add(log);
-  }
-
-  /**
-   * Accumulate logs.
-   *
-   * @param logs The logs to accumulate
-   */
-  public void addLogs(final List<Log> logs) {
-    this.logs.addAll(logs);
-  }
-
-  /** Clear the accumulated logs. */
-  public void clearLogs() {
-    logs.clear();
-  }
-
-  /**
-   * Return the accumulated logs.
-   *
-   * @return the accumulated logs
-   */
-  public List<Log> getLogs() {
-    return logs;
-  }
-
-  /**
-   * Increment the gas refund.
-   *
-   * @param amount The amount to increment the refund
-   */
-  public void incrementGasRefund(final Gas amount) {
-    this.gasRefund = gasRefund.plus(amount);
-  }
-
-  /** Clear the accumulated gas refund. */
-  public void clearGasRefund() {
-    gasRefund = Gas.ZERO;
-  }
-
-  /**
-   * Return the accumulated gas refund.
-   *
-   * @return accumulated gas refund
-   */
-  public Gas getGasRefund() {
-    return gasRefund;
-  }
-
-  /**
-   * Add recipient to the self-destruct set if not already present.
-   *
-   * @param address The recipient to self-destruct
-   */
-  public void addSelfDestruct(final Address address) {
-    selfDestructs.add(address);
-  }
-
-  /**
-   * Add addresses to the self-destruct set if they are not already present.
-   *
-   * @param addresses The addresses to self-destruct
-   */
-  public void addSelfDestructs(final Set<Address> addresses) {
-    selfDestructs.addAll(addresses);
-  }
-
-  /** Removes all entries in the self-destruct set. */
-  public void clearSelfDestructs() {
-    selfDestructs.clear();
-  }
-
-  /**
-   * Returns the self-destruct set.
-   *
-   * @return the self-destruct set
-   */
-  public Set<Address> getSelfDestructs() {
-    return selfDestructs;
-  }
-
-  /**
-   * Add refund to the refunds map if not already present.
-   *
-   * @param beneficiary the beneficiary of the refund.
-   * @param amount the amount of the refund.
-   */
-  public void addRefund(final Address beneficiary, final Wei amount) {
-    refunds.put(beneficiary, amount);
-  }
-
-  /**
-   * Returns the refunds map.
-   *
-   * @return the refunds map
-   */
-  Map<Address, Wei> getRefunds() {
-    return refunds;
-  }
-
-  /**
-   * "Warms up" the address as per EIP-2929
-   *
-   * @param address the address to warm up
-   * @return true if the address was already warmed up
-   */
-  public boolean warmUpAddress(final Address address) {
-    return !warmedUpAddresses.add(address);
-  }
-
-  /**
-   * "Warms up" the storage slot as per EIP-2929
-   *
-   * @param address the address whose storage is being warmed up
-   * @param slot the slot being warmed up
-   * @return true if the storage slot was already warmed up
-   */
-  public boolean warmUpStorage(final Address address, final Bytes32 slot) {
-    return !warmedUpStorage.put(address, slot);
-  }
-
-  public void copyWarmedUpFields(final MessageFrame parentFrame) {
-    if (parentFrame == this) {
-      return;
-    }
-
-    warmedUpAddresses = new HashSet<>(parentFrame.warmedUpAddresses);
-    warmedUpStorage = HashMultimap.create(parentFrame.warmedUpStorage);
-  }
-
-  public void mergeWarmedUpFields(final MessageFrame childFrame) {
-    if (childFrame == this) {
-      return;
-    }
-
-    warmedUpAddresses = childFrame.warmedUpAddresses;
-    warmedUpStorage = childFrame.warmedUpStorage;
-  }
-
-  /**
-   * Returns the current blockchain.
-   *
-   * @return the current blockchain
-   */
-  public Blockchain getBlockchain() {
-    return blockchain;
-  }
-
-  /**
-   * Return the world state.
-   *
-   * @return the world state
-   */
-  public WorldUpdater getWorldState() {
-    return worldState;
-  }
-
-  /**
-   * Returns the message frame type.
-   *
-   * @return the message frame type
-   */
-  public Type getType() {
-    return type;
-  }
-
-  /**
-   * Returns the current execution state.
-   *
-   * @return the current execution state
-   */
-  public State getState() {
-    return state;
-  }
-
-  /**
-   * Sets the current execution state.
-   *
-   * @param state The new execution state
-   */
-  public void setState(final State state) {
-    this.state = state;
-  }
-
-  /**
-   * Returns the code currently being executed.
-   *
-   * @return the code currently being executed
-   */
-  public Code getCode() {
-    return code;
-  }
-
-  /**
-   * Returns the current input data.
-   *
-   * @return the current input data
-   */
-  public Bytes getInputData() {
-    return inputData;
-  }
-
-  /**
-   * Returns the recipient account recipient
-   *
-   * @return the callee account recipient
-   */
-  public Address getRecipientAddress() {
-    return recipient;
-  }
-
-  /**
-   * Returns the message stack depth.
-   *
-   * @return the message stack depth
-   */
-  public int getMessageStackDepth() {
-    return depth;
-  }
-
-  /**
-   * Returns the recipient that originated the message.
-   *
-   * @return the recipient that originated the message
-   */
-  public Address getOriginatorAddress() {
-    return originator;
-  }
-
-  /**
-   * Returns the recipient of the code currently executing.
-   *
-   * @return the recipient of the code currently executing
-   */
-  public Address getContractAddress() {
-    return contract;
-  }
-
-  /**
-   * Returns the current gas price.
-   *
-   * @return the current gas price
-   */
-  public Wei getGasPrice() {
-    return gasPrice;
-  }
-
-  /**
-   * Returns the recipient of the sender.
-   *
-   * @return the recipient of the sender
-   */
-  public Address getSenderAddress() {
-    return sender;
-  }
-
-  /**
-   * Returns the value being transferred.
-   *
-   * @return the value being transferred
-   */
-  public Wei getValue() {
-    return value;
-  }
-
-  /**
-   * Returns the apparent value being transferred.
-   *
-   * @return the apparent value being transferred
-   */
-  public Wei getApparentValue() {
-    return apparentValue;
-  }
-
-  /**
-   * Returns the current block header.
-   *
-   * @return the current block header
-   */
-  public ProcessableBlockHeader getBlockHeader() {
-    return blockHeader;
-  }
-
-  /** Performs updates based on the message frame's execution. */
-  public void notifyCompletion() {
-    completer.accept(this);
-  }
-
-  /**
-   * Returns the current message frame stack.
-   *
-   * @return the current message frame stack
-   */
-  public Deque<MessageFrame> getMessageFrameStack() {
-    return messageFrameStack;
-  }
-
-  void setExceptionalHaltReason(final Optional<ExceptionalHaltReason> exceptionalHaltReason) {
-    this.exceptionalHaltReason = exceptionalHaltReason;
-  }
-
-  public Optional<ExceptionalHaltReason> getExceptionalHaltReason() {
-    return exceptionalHaltReason;
-  }
-
-  /**
-   * Returns the current miningBeneficiary (aka coinbase)
-   *
-   * @return the current mining beneficiary
-   */
-  public Address getMiningBeneficiary() {
-    return miningBeneficiary;
-  }
-
-  public BlockHashLookup getBlockHashLookup() {
-    return blockHashLookup;
-  }
-
-  public Operation getCurrentOperation() {
-    return currentOperation;
-  }
-
-  public Optional<Gas> getGasCost() {
-    return gasCost;
-  }
-
-  public int getMaxStackSize() {
-    return maxStackSize;
-  }
-
-  /**
-   * Returns whether Message calls will be persisted
-   *
-   * @return whether Message calls will be persisted
-   */
-  public Boolean isPersistingPrivateState() {
-    return isPersistingPrivateState;
-  }
-
-  public PrivateMetadataUpdater getPrivateMetadataUpdater() {
-    return privateMetadataUpdater;
-  }
-
-  /**
-   * Returns the transaction hash of the transaction being processed
-   *
-   * @return the transaction hash of the transaction being processed
-   */
-  public Hash getTransactionHash() {
-    return transactionHash;
-  }
-
-  public void setCurrentOperation(final Operation currentOperation) {
-    this.currentOperation = currentOperation;
-  }
-
-  public void setGasCost(final Optional<Gas> gasCost) {
-    this.gasCost = gasCost;
-  }
-
-  public int getContractAccountVersion() {
-    return contractAccountVersion;
-  }
-
-  Optional<MemoryEntry> getMaybeUpdatedMemory() {
-    return maybeUpdatedMemory;
-  }
-
-  Optional<MemoryEntry> getMaybeUpdatedStorage() {
-    return maybeUpdatedStorage;
-  }
-
-  public void reset() {
-    maybeUpdatedMemory = Optional.empty();
-    maybeUpdatedStorage = Optional.empty();
-  }
-
-  public static class Builder {
-
-    private Type type;
-    private Blockchain blockchain;
-    private Deque<MessageFrame> messageFrameStack;
-    private WorldUpdater worldState;
-    private Gas initialGas;
-    private Address address;
-    private Address originator;
-    private Address contract;
-    private int contractAccountVersion = -1;
-    private Wei gasPrice;
-    private Bytes inputData;
-    private Address sender;
-    private Wei value;
-    private Wei apparentValue;
-    private Code code;
-    private ProcessableBlockHeader blockHeader;
-    private int depth = -1;
-    private int maxStackSize = DEFAULT_MAX_STACK_SIZE;
-    private boolean isStatic = false;
-    private Consumer<MessageFrame> completer;
-    private Address miningBeneficiary;
-    private BlockHashLookup blockHashLookup;
-    private Boolean isPersistingPrivateState = false;
-    private PrivateMetadataUpdater privateMetadataUpdater = null;
-    private Hash transactionHash;
-    private Optional<Bytes> reason = Optional.empty();
-    private ReturnStack returnStack = new ReturnStack();
-
-    public Builder type(final Type type) {
-      this.type = type;
-      return this;
-    }
-
-    public Builder returnStack(final ReturnStack returnStack) {
-      this.returnStack = returnStack;
-      return this;
-    }
-
-    public Builder messageFrameStack(final Deque<MessageFrame> messageFrameStack) {
-      this.messageFrameStack = messageFrameStack;
-      return this;
-    }
-
-    public Builder blockchain(final Blockchain blockchain) {
-      this.blockchain = blockchain;
-      return this;
-    }
-
-    public Builder worldState(final WorldUpdater worldState) {
-      this.worldState = worldState;
-      return this;
-    }
-
-    public Builder initialGas(final Gas initialGas) {
-      this.initialGas = initialGas;
-      return this;
-    }
-
-    public Builder address(final Address address) {
-      this.address = address;
-      return this;
-    }
-
-    public Builder originator(final Address originator) {
-      this.originator = originator;
-      return this;
-    }
-
-    public Builder contract(final Address contract) {
-      this.contract = contract;
-      return this;
-    }
-
-    public Builder contractAccountVersion(final int contractAccountVersion) {
-      checkArgument(contractAccountVersion >= 0, "Contract account version cannot be negative");
-      this.contractAccountVersion = contractAccountVersion;
-      return this;
-    }
-
-    public Builder gasPrice(final Wei gasPrice) {
-      this.gasPrice = gasPrice;
-      return this;
-    }
-
-    public Builder inputData(final Bytes inputData) {
-      this.inputData = inputData;
-      return this;
-    }
-
-    public Builder sender(final Address sender) {
-      this.sender = sender;
-      return this;
-    }
-
-    public Builder value(final Wei value) {
-      this.value = value;
-      return this;
-    }
-
-    public Builder apparentValue(final Wei apparentValue) {
-      this.apparentValue = apparentValue;
-      return this;
-    }
-
-    public Builder code(final Code code) {
-      this.code = code;
-      return this;
-    }
-
-    public Builder blockHeader(final ProcessableBlockHeader blockHeader) {
-      this.blockHeader = blockHeader;
-      return this;
-    }
-
-    public Builder depth(final int depth) {
-      this.depth = depth;
-      return this;
-    }
-
-    public Builder isStatic(final boolean isStatic) {
-      this.isStatic = isStatic;
-      return this;
-    }
-
-    public Builder maxStackSize(final int maxStackSize) {
-      this.maxStackSize = maxStackSize;
-      return this;
-    }
-
-    public Builder completer(final Consumer<MessageFrame> completer) {
-      this.completer = completer;
-      return this;
-    }
-
-    public Builder miningBeneficiary(final Address miningBeneficiary) {
-      this.miningBeneficiary = miningBeneficiary;
-      return this;
-    }
-
-    public Builder blockHashLookup(final BlockHashLookup blockHashLookup) {
-      this.blockHashLookup = blockHashLookup;
-      return this;
-    }
-
-    public Builder isPersistingPrivateState(final Boolean isPersistingPrivateState) {
-      this.isPersistingPrivateState = isPersistingPrivateState;
-      return this;
-    }
-
-    public Builder privateMetadataUpdater(final PrivateMetadataUpdater privateMetadataUpdater) {
-      this.privateMetadataUpdater = privateMetadataUpdater;
-      return this;
-    }
-
-    public Builder transactionHash(final Hash transactionHash) {
-      this.transactionHash = transactionHash;
-      return this;
-    }
-
-    public Builder reason(final Bytes reason) {
-      this.reason = Optional.ofNullable(reason);
-      return this;
-    }
-
-    private void validate() {
-      checkState(type != null, "Missing message frame type");
-      checkState(blockchain != null, "Missing message frame blockchain");
-      checkState(messageFrameStack != null, "Missing message frame message frame stack");
-      checkState(returnStack != null, "Missing return stack");
-      checkState(worldState != null, "Missing message frame world state");
-      checkState(initialGas != null, "Missing message frame initial getGasRemaining");
-      checkState(address != null, "Missing message frame recipient");
-      checkState(originator != null, "Missing message frame originator");
-      checkState(contract != null, "Missing message frame contract");
-      checkState(gasPrice != null, "Missing message frame getGasRemaining price");
-      checkState(inputData != null, "Missing message frame input data");
-      checkState(sender != null, "Missing message frame sender");
-      checkState(value != null, "Missing message frame value");
-      checkState(apparentValue != null, "Missing message frame apparent value");
-      checkState(code != null, "Missing message frame code");
-      checkState(blockHeader != null, "Missing message frame block header");
-      checkState(depth > -1, "Missing message frame depth");
-      checkState(completer != null, "Missing message frame completer");
-      checkState(miningBeneficiary != null, "Missing mining beneficiary");
-      checkState(blockHashLookup != null, "Missing block hash lookup");
-      checkState(isPersistingPrivateState != null, "Missing isPersistingPrivateState");
-      checkState(contractAccountVersion != -1, "Missing contractAccountVersion");
-    }
-
-    public MessageFrame build() {
-      validate();
-
-      return new MessageFrame(
-          type,
-          blockchain,
-          messageFrameStack,
-          returnStack,
-          worldState,
-          initialGas,
-          address,
-          originator,
-          contract,
-          contractAccountVersion,
-          gasPrice,
-          inputData,
-          sender,
-          value,
-          apparentValue,
-          code,
-          blockHeader,
-          depth,
-          isStatic,
-          completer,
-          miningBeneficiary,
-          blockHashLookup,
-          isPersistingPrivateState,
-          privateMetadataUpdater,
-          transactionHash,
-          reason,
-          maxStackSize);
-    }
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/OperandStack.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/OperandStack.java
deleted file mode 100644
index 44aa7abe9d7..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/OperandStack.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-
-package org.hyperledger.besu.ethereum.vm;
-
-import org.apache.tuweni.bytes.Bytes32;
-
-public class OperandStack extends FixedStack<Bytes32> {
-
-  public OperandStack(final int maxSize) {
-    super(maxSize, Bytes32.class);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Operation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Operation.java
deleted file mode 100644
index 392232bd013..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Operation.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-
-import java.util.Optional;
-
-public interface Operation {
-
-  class OperationResult {
-    final Optional<Gas> gasCost;
-    final Optional<ExceptionalHaltReason> haltReason;
-
-    public OperationResult(
-        final Optional<Gas> gasCost, final Optional<ExceptionalHaltReason> haltReason) {
-      this.gasCost = gasCost;
-      this.haltReason = haltReason;
-    }
-
-    public Optional<Gas> getGasCost() {
-      return gasCost;
-    }
-
-    public Optional<ExceptionalHaltReason> getHaltReason() {
-      return haltReason;
-    }
-  }
-
-  /**
-   * Executes the logic behind this operation.
-   *
-   * <p>Implementors are responsible for calculating gas cost, checking Out-of-gas conditions,
-   * applying gas cost to the MessageFrame, executing the operation including all side effects, and
-   * checking for all operation related exceptional halts such as OutOfGas, InvalidJumpDestination,
-   * Stack overflow/underflow, etc., and storing the halt in the MessageFrame
-   *
-   * @param frame The frame for execution of this operation.
-   * @param evm The EVM for execution of this operation.
-   * @return the gas cost and any exeptional halt reasons of the operation.
-   */
-  OperationResult execute(final MessageFrame frame, final EVM evm);
-
-  int getOpcode();
-
-  String getName();
-
-  int getStackItemsConsumed();
-
-  int getStackItemsProduced();
-
-  boolean getUpdatesProgramCounter();
-
-  int getOpSize();
-
-  /**
-   * Determines whether or not this operation has been virtually added to the contract code. For
-   * instance if the contract is not ended by a STOP opcode the {@link EVM} adds an explicit end of
-   * script stop which can be considered as virtual.
-   *
-   * @return a boolean indicating if the operation is virtual.
-   */
-  default boolean isVirtualOperation() {
-    return false;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/OperationRegistry.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/OperationRegistry.java
deleted file mode 100644
index c0180cdbeeb..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/OperationRegistry.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm;
-
-import com.google.common.base.Preconditions;
-
-/** Encapsulates a group of {@link Operation}s used together. */
-public class OperationRegistry {
-
-  private static final int NUM_OPERATIONS = 256;
-
-  private final Operation[][] operations;
-
-  public OperationRegistry() {
-    this(1);
-  }
-
-  public OperationRegistry(final int numVersions) {
-    Preconditions.checkArgument(numVersions >= 1);
-    this.operations = new Operation[numVersions][NUM_OPERATIONS];
-  }
-
-  public Operation get(final byte opcode, final int version) {
-    return get(opcode & 0xff, version);
-  }
-
-  public Operation get(final int opcode, final int version) {
-    return operations[version][opcode];
-  }
-
-  public void put(final Operation operation, final int version) {
-    operations[version][operation.getOpcode()] = operation;
-  }
-
-  public Operation getOrDefault(
-      final byte opcode, final int version, final Operation defaultOperation) {
-    final Operation operation = get(opcode, version);
-
-    if (operation == null) {
-      return defaultOperation;
-    }
-
-    return operation;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/OperationTracer.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/OperationTracer.java
deleted file mode 100644
index 7a6be24bc6f..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/OperationTracer.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.Operation.OperationResult;
-
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public interface OperationTracer {
-
-  OperationTracer NO_TRACING = ((frame, executeOperation) -> executeOperation.execute());
-
-  void traceExecution(MessageFrame frame, ExecuteOperation executeOperation);
-
-  default void tracePrecompileCall(
-      final MessageFrame frame, final Gas gasRequirement, final Bytes output) {}
-
-  default void traceAccountCreationResult(
-      final MessageFrame frame, final Optional<ExceptionalHaltReason> haltReason) {}
-
-  interface ExecuteOperation {
-
-    OperationResult execute();
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/StandardJsonTracer.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/StandardJsonTracer.java
deleted file mode 100644
index 5e0817674bb..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/StandardJsonTracer.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-
-package org.hyperledger.besu.ethereum.vm;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
-import org.hyperledger.besu.ethereum.vm.Operation.OperationResult;
-import org.hyperledger.besu.ethereum.vm.operations.ReturnStack;
-
-import java.io.PrintStream;
-import java.nio.charset.StandardCharsets;
-import java.util.Optional;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class StandardJsonTracer implements OperationTracer {
-
-  private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-
-  private final PrintStream out;
-  private final boolean showMemory;
-
-  public StandardJsonTracer(final PrintStream out, final boolean showMemory) {
-    this.out = out;
-    this.showMemory = showMemory;
-  }
-
-  public static String shortNumber(final UInt256 number) {
-    return number.isZero() ? "0x0" : number.toShortHexString();
-  }
-
-  private static String shortBytes(final Bytes bytes) {
-    return bytes.isZero() ? "0x0" : bytes.toShortHexString();
-  }
-
-  public static String summaryTrace(
-      final Transaction transaction, final long timer, final TransactionProcessingResult result) {
-    final ObjectNode summaryLine = OBJECT_MAPPER.createObjectNode();
-    summaryLine.put("output", result.getOutput().toUnprefixedHexString());
-    summaryLine.put(
-        "gasUsed",
-        StandardJsonTracer.shortNumber(
-            UInt256.valueOf(transaction.getGasLimit() - result.getGasRemaining())));
-    summaryLine.put("time", timer);
-    return summaryLine.toString();
-  }
-
-  @Override
-  public void traceExecution(
-      final MessageFrame messageFrame, final ExecuteOperation executeOperation) {
-    final ObjectNode traceLine = OBJECT_MAPPER.createObjectNode();
-
-    final Operation currentOp = messageFrame.getCurrentOperation();
-    traceLine.put("pc", messageFrame.getPC());
-    traceLine.put("op", Bytes.of(currentOp.getOpcode()).toInt());
-    traceLine.put("gas", shortNumber(messageFrame.getRemainingGas().asUInt256()));
-    traceLine.putNull("gasCost");
-    traceLine.putNull("memory");
-    traceLine.putNull("memSize");
-    final ArrayNode stack = traceLine.putArray("stack");
-    for (int i = messageFrame.stackSize() - 1; i >= 0; i--) {
-      stack.add(shortBytes(messageFrame.getStackItem(i)));
-    }
-    final ArrayNode returnStack = traceLine.putArray("returnStack");
-    final ReturnStack rs = messageFrame.getReturnStack();
-    for (int i = rs.size() - 1; i >= 0; i--) {
-      returnStack.add("0x" + Integer.toHexString(rs.get(i) - 1));
-    }
-    Bytes returnData = messageFrame.getReturnData();
-    traceLine.put("returnData", returnData.size() > 0 ? returnData.toHexString() : null);
-    traceLine.put("depth", messageFrame.getMessageStackDepth() + 1);
-
-    final OperationResult executeResult = executeOperation.execute();
-
-    traceLine.put("refund", messageFrame.getGasRefund().toLong());
-    traceLine.put(
-        "gasCost", executeResult.getGasCost().map(gas -> shortNumber(gas.asUInt256())).orElse(""));
-    if (showMemory) {
-      traceLine.put(
-          "memory",
-          messageFrame
-              .readMemory(UInt256.ZERO, messageFrame.memoryWordSize().multiply(32))
-              .toHexString());
-    } else {
-      traceLine.put("memory", "0x");
-    }
-    traceLine.put("memSize", messageFrame.memoryByteSize());
-
-    final String error =
-        executeResult
-            .getHaltReason()
-            .map(ExceptionalHaltReason::getDescription)
-            .orElse(
-                messageFrame
-                    .getRevertReason()
-                    .map(bytes -> new String(bytes.toArrayUnsafe(), StandardCharsets.UTF_8))
-                    .orElse(""));
-    traceLine.put("opName", currentOp.getName());
-    traceLine.put("error", error);
-    out.println(traceLine.toString());
-  }
-
-  @Override
-  public void tracePrecompileCall(
-      final MessageFrame frame, final Gas gasRequirement, final Bytes output) {}
-
-  @Override
-  public void traceAccountCreationResult(
-      final MessageFrame frame, final Optional<ExceptionalHaltReason> haltReason) {}
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Words.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Words.java
deleted file mode 100644
index bc0e9643932..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/Words.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm;
-
-import org.hyperledger.besu.ethereum.core.Address;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.bytes.MutableBytes32;
-
-/** Static utility methods to work with VM words (that is, {@link Bytes32} values). */
-public abstract class Words {
-  private Words() {}
-
-  /**
-   * Creates a new word containing the provided address.
-   *
-   * @param address The address to convert to a word.
-   * @return A VM word containing {@code address} (left-padded as according to the VM specification
-   *     (Appendix H. of the Yellow paper)).
-   */
-  public static Bytes32 fromAddress(final Address address) {
-    final MutableBytes32 bytes = MutableBytes32.create();
-    address.copyTo(bytes, Bytes32.SIZE - Address.SIZE);
-    return bytes;
-  }
-
-  /**
-   * Extract an address from the the provided address.
-   *
-   * @param bytes The word to extract the address from.
-   * @return An address build from the right-most 160-bits of the {@code bytes} (as according to the
-   *     VM specification (Appendix H. of the Yellow paper)).
-   */
-  public static Address toAddress(final Bytes32 bytes) {
-    return Address.wrap(bytes.slice(bytes.size() - Address.SIZE, Address.SIZE).copy());
-  }
-
-  /**
-   * The number of words corresponding to the provided input.
-   *
-   * <p>In other words, this compute {@code input.size() / 32} but rounded up.
-   *
-   * @param input the input to check.
-   * @return the number of (32 bytes) words that {@code input} spans.
-   */
-  public static int numWords(final Bytes input) {
-    // m/n round up == (m + n - 1)/n: http://www.cs.nott.ac.uk/~psarb2/G51MPC/slides/NumberLogic.pdf
-    return (input.size() + Bytes32.SIZE - 1) / Bytes32.SIZE;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/internal/MemoryEntry.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/internal/MemoryEntry.java
deleted file mode 100644
index 60acdcd34fa..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/internal/MemoryEntry.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.hyperledger.besu.ethereum.vm.internal;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class MemoryEntry {
-  private final UInt256 offset;
-  private final Bytes value;
-
-  public MemoryEntry(final UInt256 offset, final Bytes value) {
-    this.offset = offset;
-    this.value = value;
-  }
-
-  public UInt256 getOffset() {
-    return offset;
-  }
-
-  public Bytes getValue() {
-    return value;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AbstractCreateOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AbstractCreateOperation.java
deleted file mode 100644
index 0296b2d0a13..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AbstractCreateOperation.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.vm.AbstractOperation;
-import org.hyperledger.besu.ethereum.vm.Code;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Words;
-
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public abstract class AbstractCreateOperation extends AbstractOperation {
-
-  protected static final OperationResult UNDERFLOW_RESPONSE =
-      new OperationResult(
-          Optional.empty(), Optional.of(ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS));
-
-  AbstractCreateOperation(
-      final int opcode,
-      final String name,
-      final int stackItemsConsumed,
-      final int stackItemsProduced,
-      final boolean updatesProgramCounter,
-      final int opSize,
-      final GasCalculator gasCalculator) {
-    super(
-        opcode,
-        name,
-        stackItemsConsumed,
-        stackItemsProduced,
-        updatesProgramCounter,
-        opSize,
-        gasCalculator);
-  }
-
-  @Override
-  public OperationResult execute(final MessageFrame frame, final EVM evm) {
-    // manual check because some reads won't come until the "complete" step.
-    if (frame.stackSize() < getStackItemsConsumed()) {
-      return UNDERFLOW_RESPONSE;
-    }
-
-    final Gas cost = cost(frame);
-    final Optional<Gas> optionalCost = Optional.ofNullable(cost);
-    if (cost != null) {
-      if (frame.isStatic()) {
-        return new OperationResult(
-            optionalCost, Optional.of(ExceptionalHaltReason.ILLEGAL_STATE_CHANGE));
-      } else if (frame.getRemainingGas().compareTo(cost) < 0) {
-        return new OperationResult(
-            optionalCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-      }
-      final Wei value = Wei.wrap(frame.getStackItem(0));
-
-      final Address address = frame.getRecipientAddress();
-      final MutableAccount account = frame.getWorldState().getAccount(address).getMutable();
-
-      frame.clearReturnData();
-
-      if (value.compareTo(account.getBalance()) > 0 || frame.getMessageStackDepth() >= 1024) {
-        fail(frame);
-      } else {
-        spawnChildMessage(frame);
-      }
-    }
-
-    return new OperationResult(optionalCost, Optional.empty());
-  }
-
-  protected abstract Gas cost(final MessageFrame frame);
-
-  protected abstract Address targetContractAddress(MessageFrame frame);
-
-  private void fail(final MessageFrame frame) {
-    final UInt256 inputOffset = UInt256.fromBytes(frame.getStackItem(1));
-    final UInt256 inputSize = UInt256.fromBytes(frame.getStackItem(2));
-    frame.readMemory(inputOffset, inputSize);
-    frame.popStackItems(getStackItemsConsumed());
-    frame.pushStackItem(Bytes32.ZERO);
-  }
-
-  private void spawnChildMessage(final MessageFrame frame) {
-    // memory cost needs to be calculated prior to memory expansion
-    final Gas cost = cost(frame);
-    frame.decrementRemainingGas(cost);
-
-    final Address address = frame.getRecipientAddress();
-    final MutableAccount account = frame.getWorldState().getAccount(address).getMutable();
-
-    account.incrementNonce();
-
-    final Wei value = Wei.wrap(frame.getStackItem(0));
-    final UInt256 inputOffset = UInt256.fromBytes(frame.getStackItem(1));
-    final UInt256 inputSize = UInt256.fromBytes(frame.getStackItem(2));
-    final Bytes inputData = frame.readMemory(inputOffset, inputSize);
-
-    final Address contractAddress = targetContractAddress(frame);
-
-    final Gas childGasStipend = gasCalculator().gasAvailableForChildCreate(frame.getRemainingGas());
-    frame.decrementRemainingGas(childGasStipend);
-
-    final MessageFrame childFrame =
-        MessageFrame.builder()
-            .type(MessageFrame.Type.CONTRACT_CREATION)
-            .messageFrameStack(frame.getMessageFrameStack())
-            .blockchain(frame.getBlockchain())
-            .worldState(frame.getWorldState().updater())
-            .initialGas(childGasStipend)
-            .address(contractAddress)
-            .originator(frame.getOriginatorAddress())
-            .contract(contractAddress)
-            .contractAccountVersion(frame.getContractAccountVersion())
-            .gasPrice(frame.getGasPrice())
-            .inputData(Bytes.EMPTY)
-            .sender(frame.getRecipientAddress())
-            .value(value)
-            .apparentValue(value)
-            .code(new Code(inputData))
-            .blockHeader(frame.getBlockHeader())
-            .depth(frame.getMessageStackDepth() + 1)
-            .completer(child -> complete(frame, child))
-            .miningBeneficiary(frame.getMiningBeneficiary())
-            .blockHashLookup(frame.getBlockHashLookup())
-            .maxStackSize(frame.getMaxStackSize())
-            .returnStack(frame.getReturnStack())
-            .build();
-
-    frame.incrementRemainingGas(cost);
-    childFrame.copyWarmedUpFields(frame);
-
-    frame.getMessageFrameStack().addFirst(childFrame);
-    frame.setState(MessageFrame.State.CODE_SUSPENDED);
-  }
-
-  private void complete(final MessageFrame frame, final MessageFrame childFrame) {
-    frame.setState(MessageFrame.State.CODE_EXECUTING);
-
-    frame.incrementRemainingGas(childFrame.getRemainingGas());
-    frame.addLogs(childFrame.getLogs());
-    frame.addSelfDestructs(childFrame.getSelfDestructs());
-    frame.incrementGasRefund(childFrame.getGasRefund());
-    frame.popStackItems(getStackItemsConsumed());
-
-    if (childFrame.getState() == MessageFrame.State.COMPLETED_SUCCESS) {
-      frame.mergeWarmedUpFields(childFrame);
-      frame.pushStackItem(Words.fromAddress(childFrame.getContractAddress()));
-    } else {
-      frame.setReturnData(childFrame.getOutputData());
-      frame.pushStackItem(Bytes32.ZERO);
-    }
-
-    final int currentPC = frame.getPC();
-    frame.setPC(currentPC + 1);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AbstractFixedCostOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AbstractFixedCostOperation.java
deleted file mode 100644
index 91052bedcd5..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AbstractFixedCostOperation.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.AbstractOperation;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.FixedStack.OverflowException;
-import org.hyperledger.besu.ethereum.vm.FixedStack.UnderflowException;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Optional;
-
-abstract class AbstractFixedCostOperation extends AbstractOperation {
-
-  protected final OperationResult successResponse;
-  protected final OperationResult outOfGasResponse;
-  private final OperationResult underflowResponse;
-  private final OperationResult overflowResponse;
-  protected final Gas gasCost;
-
-  protected AbstractFixedCostOperation(
-      final int opcode,
-      final String name,
-      final int stackItemsConsumed,
-      final int stackItemsProduced,
-      final boolean updatesProgramCounter,
-      final int opSize,
-      final GasCalculator gasCalculator,
-      final Gas fixedCost) {
-    super(
-        opcode,
-        name,
-        stackItemsConsumed,
-        stackItemsProduced,
-        updatesProgramCounter,
-        opSize,
-        gasCalculator);
-    gasCost = fixedCost;
-    successResponse = new OperationResult(Optional.of(gasCost), Optional.empty());
-    outOfGasResponse =
-        new OperationResult(
-            Optional.of(gasCost), Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-    underflowResponse =
-        new OperationResult(
-            Optional.of(gasCost), Optional.of(ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS));
-    overflowResponse =
-        new OperationResult(
-            Optional.of(gasCost), Optional.of(ExceptionalHaltReason.TOO_MANY_STACK_ITEMS));
-  }
-
-  @Override
-  public final OperationResult execute(final MessageFrame frame, final EVM evm) {
-    try {
-      if (frame.getRemainingGas().compareTo(gasCost) < 0) {
-        return outOfGasResponse;
-      } else {
-        return executeFixedCostOperation(frame, evm);
-      }
-    } catch (final UnderflowException ufe) {
-      return underflowResponse;
-    } catch (final OverflowException ofe) {
-      return overflowResponse;
-    }
-  }
-
-  protected abstract OperationResult executeFixedCostOperation(MessageFrame frame, EVM evm);
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AddModOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AddModOperation.java
deleted file mode 100644
index d4402f6659e..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AddModOperation.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class AddModOperation extends AbstractFixedCostOperation {
-
-  public AddModOperation(final GasCalculator gasCalculator) {
-    super(0x08, "ADDMOD", 3, 1, false, 1, gasCalculator, gasCalculator.getMidTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 value0 = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 value1 = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 value2 = UInt256.fromBytes(frame.popStackItem());
-
-    if (value2.isZero()) {
-      frame.pushStackItem(Bytes32.ZERO);
-    } else {
-      final UInt256 result = value0.addMod(value1, value2);
-      frame.pushStackItem(result.toBytes());
-    }
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AddOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AddOperation.java
deleted file mode 100644
index b28a70b5f44..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AddOperation.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class AddOperation extends AbstractFixedCostOperation {
-
-  public AddOperation(final GasCalculator gasCalculator) {
-    super(0x01, "ADD", 2, 1, false, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 value0 = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 value1 = UInt256.fromBytes(frame.popStackItem());
-
-    final UInt256 result = value0.add(value1);
-
-    frame.pushStackItem(result.toBytes());
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AddressOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AddressOperation.java
deleted file mode 100644
index 9102fdff767..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AddressOperation.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Words;
-
-public class AddressOperation extends AbstractFixedCostOperation {
-
-  public AddressOperation(final GasCalculator gasCalculator) {
-    super(0x30, "ADDRESS", 0, 1, false, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final Address address = frame.getRecipientAddress();
-    frame.pushStackItem(Words.fromAddress(address));
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AndOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AndOperation.java
deleted file mode 100644
index 60d428ab1be..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/AndOperation.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class AndOperation extends AbstractFixedCostOperation {
-
-  public AndOperation(final GasCalculator gasCalculator) {
-    super(0x16, "AND", 2, 1, false, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 value0 = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 value1 = UInt256.fromBytes(frame.popStackItem());
-
-    final UInt256 result = value0.and(value1);
-    frame.pushStackItem(result.toBytes());
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/BalanceOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/BalanceOperation.java
deleted file mode 100644
index 70bf8d1b7d8..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/BalanceOperation.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.AbstractOperation;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.FixedStack.OverflowException;
-import org.hyperledger.besu.ethereum.vm.FixedStack.UnderflowException;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Words;
-
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes32;
-
-public class BalanceOperation extends AbstractOperation {
-
-  private final Optional<Gas> warmCost;
-  private final Optional<Gas> coldCost;
-
-  public BalanceOperation(final GasCalculator gasCalculator) {
-    super(0x31, "BALANCE", 1, 1, false, 1, gasCalculator);
-    final Gas baseCost = gasCalculator.getBalanceOperationGasCost();
-    warmCost = Optional.of(baseCost.plus(gasCalculator.getWarmStorageReadCost()));
-    coldCost = Optional.of(baseCost.plus(gasCalculator.getColdAccountAccessCost()));
-  }
-
-  @Override
-  public OperationResult execute(final MessageFrame frame, final EVM evm) {
-    try {
-      final Address address = Words.toAddress(frame.popStackItem());
-      final boolean accountIsWarm =
-          frame.warmUpAddress(address) || gasCalculator().isPrecompile(address);
-      final Optional<Gas> optionalCost = accountIsWarm ? warmCost : coldCost;
-      if (frame.getRemainingGas().compareTo(optionalCost.get()) < 0) {
-        return new OperationResult(
-            optionalCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-      } else {
-        final Account account = frame.getWorldState().get(address);
-        frame.pushStackItem(account == null ? Bytes32.ZERO : account.getBalance().toBytes());
-        return new OperationResult(optionalCost, Optional.empty());
-      }
-    } catch (final UnderflowException ufe) {
-      return new OperationResult(
-          warmCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS));
-    } catch (final OverflowException ofe) {
-      return new OperationResult(warmCost, Optional.of(ExceptionalHaltReason.TOO_MANY_STACK_ITEMS));
-    }
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/BeginSubOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/BeginSubOperation.java
deleted file mode 100644
index cec46e43347..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/BeginSubOperation.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Optional;
-
-public class BeginSubOperation extends AbstractFixedCostOperation {
-
-  public static final int OPCODE = 0x5c;
-  private final OperationResult invalidEntryResponse;
-
-  public BeginSubOperation(final GasCalculator gasCalculator) {
-    super(OPCODE, "BEGINSUB", 0, 0, false, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
-    invalidEntryResponse =
-        new OperationResult(
-            Optional.of(gasCalculator.getBaseTierGasCost()),
-            Optional.of(ExceptionalHaltReason.INVALID_SUB_ROUTINE_ENTRY));
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    return invalidEntryResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/BlockHashOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/BlockHashOperation.java
deleted file mode 100644
index 6529da43dbd..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/BlockHashOperation.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
-import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class BlockHashOperation extends AbstractFixedCostOperation {
-
-  private static final int MAX_RELATIVE_BLOCK = 255;
-
-  public BlockHashOperation(final GasCalculator gasCalculator) {
-    super(
-        0x40,
-        "BLOCKHASH",
-        1,
-        1,
-        false,
-        1,
-        gasCalculator,
-        gasCalculator.getBlockHashOperationGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 blockArg = UInt256.fromBytes(frame.popStackItem());
-
-    // Short-circuit if value is unreasonably large
-    if (!blockArg.fitsLong()) {
-      frame.pushStackItem(Bytes32.ZERO);
-      return successResponse;
-    }
-
-    final long soughtBlock = blockArg.toLong();
-    final ProcessableBlockHeader blockHeader = frame.getBlockHeader();
-    final long currentBlockNumber = blockHeader.getNumber();
-    final long mostRecentBlockNumber = currentBlockNumber - 1;
-
-    // If the current block is the genesis block or the sought block is
-    // not within the last 256 completed blocks, zero is returned.
-    if (currentBlockNumber == BlockHeader.GENESIS_BLOCK_NUMBER
-        || soughtBlock < (mostRecentBlockNumber - MAX_RELATIVE_BLOCK)
-        || soughtBlock > mostRecentBlockNumber) {
-      frame.pushStackItem(Bytes32.ZERO);
-    } else {
-      final BlockHashLookup blockHashLookup = frame.getBlockHashLookup();
-      final Hash blockHash = blockHashLookup.getBlockHash(soughtBlock);
-      frame.pushStackItem(blockHash);
-    }
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ByteOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ByteOperation.java
deleted file mode 100644
index a7a6a5e0365..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ByteOperation.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.MutableBytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class ByteOperation extends AbstractFixedCostOperation {
-
-  public ByteOperation(final GasCalculator gasCalculator) {
-    super(0x1A, "BYTE", 2, 1, false, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
-  }
-
-  private UInt256 getByte(final UInt256 seq, final UInt256 offset) {
-    if (!offset.fitsInt()) {
-      return UInt256.ZERO;
-    }
-
-    final int index = offset.intValue();
-    if (index >= 32) {
-      return UInt256.ZERO;
-    }
-
-    final byte b = seq.toBytes().get(index);
-    final MutableBytes32 res = MutableBytes32.create();
-    res.set(31, b);
-    return UInt256.fromBytes(res);
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 value0 = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 value1 = UInt256.fromBytes(frame.popStackItem());
-
-    // Stack items are reversed for the BYTE operation.
-    final UInt256 result = getByte(value1, value0);
-
-    frame.pushStackItem(result.toBytes());
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallCodeOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallCodeOperation.java
deleted file mode 100644
index 98e03e4ee1d..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallCodeOperation.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.vm.AbstractCallOperation;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Words;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class CallCodeOperation extends AbstractCallOperation {
-
-  public CallCodeOperation(final GasCalculator gasCalculator) {
-    super(0xF2, "CALLCODE", 7, 1, false, 1, gasCalculator);
-  }
-
-  @Override
-  protected Gas gas(final MessageFrame frame) {
-    return Gas.of(frame.getStackItem(0));
-  }
-
-  @Override
-  protected Address to(final MessageFrame frame) {
-    return Words.toAddress(frame.getStackItem(1));
-  }
-
-  @Override
-  protected Wei value(final MessageFrame frame) {
-    return Wei.wrap(frame.getStackItem(2));
-  }
-
-  @Override
-  protected Wei apparentValue(final MessageFrame frame) {
-    return value(frame);
-  }
-
-  @Override
-  protected UInt256 inputDataOffset(final MessageFrame frame) {
-    return UInt256.fromBytes(frame.getStackItem(3));
-  }
-
-  @Override
-  protected UInt256 inputDataLength(final MessageFrame frame) {
-    return UInt256.fromBytes(frame.getStackItem(4));
-  }
-
-  @Override
-  protected UInt256 outputDataOffset(final MessageFrame frame) {
-    return UInt256.fromBytes(frame.getStackItem(5));
-  }
-
-  @Override
-  protected UInt256 outputDataLength(final MessageFrame frame) {
-    return UInt256.fromBytes(frame.getStackItem(6));
-  }
-
-  @Override
-  protected Address address(final MessageFrame frame) {
-    return frame.getRecipientAddress();
-  }
-
-  @Override
-  protected Address sender(final MessageFrame frame) {
-    return frame.getRecipientAddress();
-  }
-
-  @Override
-  public Gas gasAvailableForChildCall(final MessageFrame frame) {
-    return gasCalculator().gasAvailableForChildCall(frame, gas(frame), !value(frame).isZero());
-  }
-
-  @Override
-  protected boolean isStatic(final MessageFrame frame) {
-    return frame.isStatic();
-  }
-
-  @Override
-  public Gas cost(final MessageFrame frame) {
-    final Gas stipend = gas(frame);
-    final UInt256 inputDataOffset = inputDataOffset(frame);
-    final UInt256 inputDataLength = inputDataLength(frame);
-    final UInt256 outputDataOffset = outputDataOffset(frame);
-    final UInt256 outputDataLength = outputDataLength(frame);
-    final Account recipient = frame.getWorldState().get(address(frame));
-
-    return gasCalculator()
-        .callOperationGasCost(
-            frame,
-            stipend,
-            inputDataOffset,
-            inputDataLength,
-            outputDataOffset,
-            outputDataLength,
-            value(frame),
-            recipient,
-            to(frame));
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallDataCopyOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallDataCopyOperation.java
deleted file mode 100644
index 6645b35634c..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallDataCopyOperation.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.AbstractOperation;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class CallDataCopyOperation extends AbstractOperation {
-
-  public CallDataCopyOperation(final GasCalculator gasCalculator) {
-    super(0x37, "CALLDATACOPY", 3, 0, false, 1, gasCalculator);
-  }
-
-  @Override
-  public OperationResult execute(final MessageFrame frame, final EVM evm) {
-    final UInt256 memOffset = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 sourceOffset = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 numBytes = UInt256.fromBytes(frame.popStackItem());
-
-    final Gas cost = gasCalculator().dataCopyOperationGasCost(frame, memOffset, numBytes);
-    final Optional<Gas> optionalCost = Optional.of(cost);
-    if (frame.getRemainingGas().compareTo(cost) < 0) {
-      return new OperationResult(optionalCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-    }
-
-    final Bytes callData = frame.getInputData();
-
-    frame.writeMemory(memOffset, sourceOffset, numBytes, callData, true);
-
-    return new OperationResult(optionalCost, Optional.empty());
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallDataLoadOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallDataLoadOperation.java
deleted file mode 100644
index 05927566927..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallDataLoadOperation.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.bytes.MutableBytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class CallDataLoadOperation extends AbstractFixedCostOperation {
-
-  public CallDataLoadOperation(final GasCalculator gasCalculator) {
-    super(
-        0x35, "CALLDATALOAD", 1, 1, false, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 startWord = UInt256.fromBytes(frame.popStackItem());
-
-    // If the start index doesn't fit a int, it comes after anything in data, and so the returned
-    // word should be zero.
-    if (!startWord.fitsInt()) {
-      frame.pushStackItem(Bytes32.ZERO);
-      return successResponse;
-    }
-
-    final int offset = startWord.intValue();
-    final Bytes data = frame.getInputData();
-    final MutableBytes32 res = MutableBytes32.create();
-    if (offset < data.size()) {
-      final Bytes toCopy = data.slice(offset, Math.min(Bytes32.SIZE, data.size() - offset));
-      toCopy.copyTo(res, 0);
-    }
-    frame.pushStackItem(res);
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallDataSizeOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallDataSizeOperation.java
deleted file mode 100644
index 0568dc4da8a..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallDataSizeOperation.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class CallDataSizeOperation extends AbstractFixedCostOperation {
-
-  public CallDataSizeOperation(final GasCalculator gasCalculator) {
-    super(0x36, "CALLDATASIZE", 0, 1, false, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final Bytes callData = frame.getInputData();
-    frame.pushStackItem(UInt256.valueOf(callData.size()).toBytes());
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallOperation.java
deleted file mode 100644
index 8d41029893a..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallOperation.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.vm.AbstractCallOperation;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Words;
-
-import java.util.Optional;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class CallOperation extends AbstractCallOperation {
-
-  public CallOperation(final GasCalculator gasCalculator) {
-    super(0xF1, "CALL", 7, 1, false, 1, gasCalculator);
-  }
-
-  @Override
-  protected Gas gas(final MessageFrame frame) {
-    return Gas.of(frame.getStackItem(0));
-  }
-
-  @Override
-  protected Address to(final MessageFrame frame) {
-    return Words.toAddress(frame.getStackItem(1));
-  }
-
-  @Override
-  protected Wei value(final MessageFrame frame) {
-    return Wei.wrap(frame.getStackItem(2));
-  }
-
-  @Override
-  protected Wei apparentValue(final MessageFrame frame) {
-    return value(frame);
-  }
-
-  @Override
-  protected UInt256 inputDataOffset(final MessageFrame frame) {
-    return UInt256.fromBytes(frame.getStackItem(3));
-  }
-
-  @Override
-  protected UInt256 inputDataLength(final MessageFrame frame) {
-    return UInt256.fromBytes(frame.getStackItem(4));
-  }
-
-  @Override
-  protected UInt256 outputDataOffset(final MessageFrame frame) {
-    return UInt256.fromBytes(frame.getStackItem(5));
-  }
-
-  @Override
-  protected UInt256 outputDataLength(final MessageFrame frame) {
-    return UInt256.fromBytes(frame.getStackItem(6));
-  }
-
-  @Override
-  protected Address address(final MessageFrame frame) {
-    return to(frame);
-  }
-
-  @Override
-  protected Address sender(final MessageFrame frame) {
-    return frame.getRecipientAddress();
-  }
-
-  @Override
-  public Gas gasAvailableForChildCall(final MessageFrame frame) {
-    return gasCalculator().gasAvailableForChildCall(frame, gas(frame), !value(frame).isZero());
-  }
-
-  @Override
-  protected boolean isStatic(final MessageFrame frame) {
-    return frame.isStatic();
-  }
-
-  @Override
-  public Gas cost(final MessageFrame frame) {
-    final Gas stipend = gas(frame);
-    final UInt256 inputDataOffset = inputDataOffset(frame);
-    final UInt256 inputDataLength = inputDataLength(frame);
-    final UInt256 outputDataOffset = outputDataOffset(frame);
-    final UInt256 outputDataLength = outputDataLength(frame);
-    final Account recipient = frame.getWorldState().get(address(frame));
-
-    return gasCalculator()
-        .callOperationGasCost(
-            frame,
-            stipend,
-            inputDataOffset,
-            inputDataLength,
-            outputDataOffset,
-            outputDataLength,
-            value(frame),
-            recipient,
-            to(frame));
-  }
-
-  @Override
-  public OperationResult execute(final MessageFrame frame, final EVM evm) {
-    if (frame.isStatic() && !value(frame).isZero()) {
-      return new OperationResult(
-          Optional.of(cost(frame)), Optional.of(ExceptionalHaltReason.ILLEGAL_STATE_CHANGE));
-    } else {
-      return super.execute(frame, evm);
-    }
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallValueOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallValueOperation.java
deleted file mode 100644
index eb962f68725..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallValueOperation.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-public class CallValueOperation extends AbstractFixedCostOperation {
-
-  public CallValueOperation(final GasCalculator gasCalculator) {
-    super(0x34, "CALLVALUE", 0, 1, false, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final Wei value = frame.getApparentValue();
-    frame.pushStackItem(value.toBytes());
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallerOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallerOperation.java
deleted file mode 100644
index 1a9e64a5443..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CallerOperation.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Words;
-
-public class CallerOperation extends AbstractFixedCostOperation {
-
-  public CallerOperation(final GasCalculator gasCalculator) {
-    super(0x33, "CALLER", 0, 1, false, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final Address callerAddress = frame.getSenderAddress();
-    frame.pushStackItem(Words.fromAddress(callerAddress));
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ChainIdOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ChainIdOperation.java
deleted file mode 100644
index 8cc9cbae692..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ChainIdOperation.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes32;
-
-public class ChainIdOperation extends AbstractFixedCostOperation {
-
-  private final Bytes32 chainId;
-
-  public ChainIdOperation(final GasCalculator gasCalculator, final Bytes32 chainId) {
-    super(0x46, "CHAINID", 0, 1, false, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
-    this.chainId = chainId;
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    frame.pushStackItem(chainId);
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CodeCopyOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CodeCopyOperation.java
deleted file mode 100644
index 40b11ac4eca..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CodeCopyOperation.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.AbstractOperation;
-import org.hyperledger.besu.ethereum.vm.Code;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Optional;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class CodeCopyOperation extends AbstractOperation {
-
-  public CodeCopyOperation(final GasCalculator gasCalculator) {
-    super(0x39, "CODECOPY", 3, 0, false, 1, gasCalculator);
-  }
-
-  @Override
-  public OperationResult execute(final MessageFrame frame, final EVM evm) {
-    final UInt256 memOffset = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 sourceOffset = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 numBytes = UInt256.fromBytes(frame.popStackItem());
-
-    final Gas cost = gasCalculator().dataCopyOperationGasCost(frame, memOffset, numBytes);
-    final Optional<Gas> optionalCost = Optional.of(cost);
-    if (frame.getRemainingGas().compareTo(cost) < 0) {
-      return new OperationResult(optionalCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-    }
-
-    final Code code = frame.getCode();
-
-    frame.writeMemory(memOffset, sourceOffset, numBytes, code.getBytes(), true);
-
-    return new OperationResult(optionalCost, Optional.empty());
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CodeSizeOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CodeSizeOperation.java
deleted file mode 100644
index c7babcbc879..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CodeSizeOperation.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.Code;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class CodeSizeOperation extends AbstractFixedCostOperation {
-
-  public CodeSizeOperation(final GasCalculator gasCalculator) {
-    super(0x38, "CODESIZE", 0, 1, false, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final Code code = frame.getCode();
-    frame.pushStackItem(UInt256.valueOf(code.getSize()).toBytes());
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CoinbaseOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CoinbaseOperation.java
deleted file mode 100644
index e9fa01c181f..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CoinbaseOperation.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Words;
-
-public class CoinbaseOperation extends AbstractFixedCostOperation {
-
-  public CoinbaseOperation(final GasCalculator gasCalculator) {
-    super(0x41, "COINBASE", 0, 1, false, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final Address coinbase = frame.getMiningBeneficiary();
-    frame.pushStackItem(Words.fromAddress(coinbase));
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/Create2Operation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/Create2Operation.java
deleted file mode 100644
index d8f3c963c70..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/Create2Operation.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class Create2Operation extends AbstractCreateOperation {
-
-  private static final Bytes PREFIX = Bytes.fromHexString("0xFF");
-
-  public Create2Operation(final GasCalculator gasCalculator) {
-    super(0xF5, "CREATE2", 4, 1, false, 1, gasCalculator);
-  }
-
-  @Override
-  protected Address targetContractAddress(final MessageFrame frame) {
-    final Address sender = frame.getRecipientAddress();
-    final UInt256 offset = UInt256.fromBytes(frame.getStackItem(1));
-    final UInt256 length = UInt256.fromBytes(frame.getStackItem(2));
-    final Bytes32 salt = frame.getStackItem(3);
-    final Bytes initCode = frame.readMemory(offset, length);
-    final Hash hash = Hash.hash(Bytes.concatenate(PREFIX, sender, salt, Hash.hash(initCode)));
-    final Address address = Address.extract(hash);
-    frame.warmUpAddress(address);
-    return address;
-  }
-
-  @Override
-  public Gas cost(final MessageFrame frame) {
-    return gasCalculator().create2OperationGasCost(frame);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CreateOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CreateOperation.java
deleted file mode 100644
index 46786582a69..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/CreateOperation.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-public class CreateOperation extends AbstractCreateOperation {
-
-  public CreateOperation(final GasCalculator gasCalculator) {
-    super(0xF0, "CREATE", 3, 1, false, 1, gasCalculator);
-  }
-
-  @Override
-  public Gas cost(final MessageFrame frame) {
-    return gasCalculator().createOperationGasCost(frame);
-  }
-
-  @Override
-  protected Address targetContractAddress(final MessageFrame frame) {
-    final Account sender = frame.getWorldState().get(frame.getRecipientAddress());
-    // Decrement nonce by 1 to normalize the effect of transaction execution
-    final Address address =
-        Address.contractAddress(frame.getRecipientAddress(), sender.getNonce() - 1L);
-    frame.warmUpAddress(address);
-    return address;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DelegateCallOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DelegateCallOperation.java
deleted file mode 100644
index 47a3e984ddb..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DelegateCallOperation.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.vm.AbstractCallOperation;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Words;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class DelegateCallOperation extends AbstractCallOperation {
-
-  public DelegateCallOperation(final GasCalculator gasCalculator) {
-    super(0xF4, "DELEGATECALL", 6, 1, false, 1, gasCalculator);
-  }
-
-  @Override
-  protected Gas gas(final MessageFrame frame) {
-    return Gas.of(frame.getStackItem(0));
-  }
-
-  @Override
-  protected Address to(final MessageFrame frame) {
-    return Words.toAddress(frame.getStackItem(1));
-  }
-
-  @Override
-  protected Wei value(final MessageFrame frame) {
-    return Wei.ZERO;
-  }
-
-  @Override
-  protected Wei apparentValue(final MessageFrame frame) {
-    return frame.getApparentValue();
-  }
-
-  @Override
-  protected UInt256 inputDataOffset(final MessageFrame frame) {
-    return UInt256.fromBytes(frame.getStackItem(2));
-  }
-
-  @Override
-  protected UInt256 inputDataLength(final MessageFrame frame) {
-    return UInt256.fromBytes(frame.getStackItem(3));
-  }
-
-  @Override
-  protected UInt256 outputDataOffset(final MessageFrame frame) {
-    return UInt256.fromBytes(frame.getStackItem(4));
-  }
-
-  @Override
-  protected UInt256 outputDataLength(final MessageFrame frame) {
-    return UInt256.fromBytes(frame.getStackItem(5));
-  }
-
-  @Override
-  protected Address address(final MessageFrame frame) {
-    return frame.getRecipientAddress();
-  }
-
-  @Override
-  protected Address sender(final MessageFrame frame) {
-    return frame.getSenderAddress();
-  }
-
-  @Override
-  public Gas gasAvailableForChildCall(final MessageFrame frame) {
-    return gasCalculator().gasAvailableForChildCall(frame, gas(frame), false);
-  }
-
-  @Override
-  protected boolean isStatic(final MessageFrame frame) {
-    return frame.isStatic();
-  }
-
-  @Override
-  public Gas cost(final MessageFrame frame) {
-    final Gas stipend = gas(frame);
-    final UInt256 inputDataOffset = inputDataOffset(frame);
-    final UInt256 inputDataLength = inputDataLength(frame);
-    final UInt256 outputDataOffset = outputDataOffset(frame);
-    final UInt256 outputDataLength = outputDataLength(frame);
-    final Account recipient = frame.getWorldState().get(address(frame));
-
-    return gasCalculator()
-        .callOperationGasCost(
-            frame,
-            stipend,
-            inputDataOffset,
-            inputDataLength,
-            outputDataOffset,
-            outputDataLength,
-            Wei.ZERO,
-            recipient,
-            to(frame));
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DifficultyOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DifficultyOperation.java
deleted file mode 100644
index a0f96ce8d0d..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DifficultyOperation.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-public class DifficultyOperation extends AbstractFixedCostOperation {
-
-  public DifficultyOperation(final GasCalculator gasCalculator) {
-    super(0x44, "DIFFICULTY", 0, 1, false, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final Difficulty difficulty = frame.getBlockHeader().getDifficulty();
-    frame.pushStackItem(difficulty.toBytes());
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DivOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DivOperation.java
deleted file mode 100644
index ea155985490..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DivOperation.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class DivOperation extends AbstractFixedCostOperation {
-
-  public DivOperation(final GasCalculator gasCalculator) {
-    super(0x04, "DIV", 2, 1, false, 1, gasCalculator, gasCalculator.getLowTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 value0 = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 value1 = UInt256.fromBytes(frame.popStackItem());
-
-    if (value1.isZero()) {
-      frame.pushStackItem(Bytes32.ZERO);
-    } else {
-      final UInt256 result = value0.divide(value1);
-      frame.pushStackItem(result.toBytes());
-    }
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DupOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DupOperation.java
deleted file mode 100644
index ed143d90a46..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/DupOperation.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Optional;
-
-public class DupOperation extends AbstractFixedCostOperation {
-
-  protected final OperationResult underflowResponse;
-
-  private final int index;
-
-  public DupOperation(final int index, final GasCalculator gasCalculator) {
-    super(
-        0x80 + index - 1,
-        "DUP" + index,
-        index,
-        index + 1,
-        false,
-        1,
-        gasCalculator,
-        gasCalculator.getVeryLowTierGasCost());
-    this.index = index;
-    this.underflowResponse =
-        new OperationResult(
-            Optional.of(gasCost), Optional.of(ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS));
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    // getStackItem won't throw under/overflows.  Check explicitly.
-    if (frame.stackSize() < getStackItemsConsumed()) {
-      return underflowResponse;
-    }
-
-    frame.pushStackItem(frame.getStackItem(index - 1));
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/EqOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/EqOperation.java
deleted file mode 100644
index 5077e7fecbe..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/EqOperation.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class EqOperation extends AbstractFixedCostOperation {
-
-  public EqOperation(final GasCalculator gasCalculator) {
-    super(0x14, "EQ", 2, 1, false, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 value0 = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 value1 = UInt256.fromBytes(frame.popStackItem());
-
-    final Bytes32 result = (value0.equals(value1) ? UInt256.valueOf(1) : UInt256.ZERO).toBytes();
-
-    frame.pushStackItem(result);
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExpOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExpOperation.java
deleted file mode 100644
index 9eca2ad5c8e..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExpOperation.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.AbstractOperation;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Optional;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class ExpOperation extends AbstractOperation {
-
-  public ExpOperation(final GasCalculator gasCalculator) {
-    super(0x0A, "EXP", 2, 1, false, 1, gasCalculator);
-  }
-
-  @Override
-  public OperationResult execute(final MessageFrame frame, final EVM evm) {
-    final UInt256 number = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 power = UInt256.fromBytes(frame.popStackItem());
-
-    final int numBytes = (power.bitLength() + 7) / 8;
-
-    final Gas cost = gasCalculator().expOperationGasCost(numBytes);
-    final Optional<Gas> optionalCost = Optional.of(cost);
-    if (frame.getRemainingGas().compareTo(cost) < 0) {
-      return new OperationResult(optionalCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-    }
-
-    final UInt256 result = number.pow(power);
-
-    frame.pushStackItem(result.toBytes());
-    return new OperationResult(optionalCost, Optional.empty());
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeCopyOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeCopyOperation.java
deleted file mode 100644
index 5f4c3b5c1b1..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeCopyOperation.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.AbstractOperation;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Words;
-
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class ExtCodeCopyOperation extends AbstractOperation {
-
-  public ExtCodeCopyOperation(final GasCalculator gasCalculator) {
-    super(0x3C, "EXTCODECOPY", 4, 0, false, 1, gasCalculator);
-  }
-
-  @Override
-  public OperationResult execute(final MessageFrame frame, final EVM evm) {
-    final Address address = Words.toAddress(frame.popStackItem());
-    final UInt256 memOffset = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 sourceOffset = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 numBytes = UInt256.fromBytes(frame.popStackItem());
-
-    final boolean accountIsWarm =
-        frame.warmUpAddress(address) || gasCalculator().isPrecompile(address);
-    final Gas cost =
-        gasCalculator()
-            .extCodeCopyOperationGasCost(frame, memOffset, numBytes)
-            .plus(
-                accountIsWarm
-                    ? gasCalculator().getWarmStorageReadCost()
-                    : gasCalculator().getColdAccountAccessCost());
-
-    final Optional<Gas> optionalCost = Optional.of(cost);
-    if (frame.getRemainingGas().compareTo(cost) < 0) {
-      return new OperationResult(optionalCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-    }
-
-    final Account account = frame.getWorldState().get(address);
-    final Bytes code = account != null ? account.getCode() : Bytes.EMPTY;
-
-    frame.writeMemory(memOffset, sourceOffset, numBytes, code);
-    return new OperationResult(optionalCost, Optional.empty());
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeHashOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeHashOperation.java
deleted file mode 100644
index a7c5864723c..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeHashOperation.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.AbstractOperation;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.FixedStack.OverflowException;
-import org.hyperledger.besu.ethereum.vm.FixedStack.UnderflowException;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Words;
-
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes32;
-
-public class ExtCodeHashOperation extends AbstractOperation {
-
-  private final Optional<Gas> warmCost;
-  private final Optional<Gas> coldCost;
-
-  public ExtCodeHashOperation(final GasCalculator gasCalculator) {
-    super(0x3F, "EXTCODEHASH", 1, 1, false, 1, gasCalculator);
-    final Gas baseCost = gasCalculator.extCodeHashOperationGasCost();
-    warmCost = Optional.of(baseCost.plus(gasCalculator.getWarmStorageReadCost()));
-    coldCost = Optional.of(baseCost.plus(gasCalculator.getColdAccountAccessCost()));
-  }
-
-  @Override
-  public OperationResult execute(final MessageFrame frame, final EVM evm) {
-    try {
-      final Address address = Words.toAddress(frame.popStackItem());
-      final boolean accountIsWarm =
-          frame.warmUpAddress(address) || gasCalculator().isPrecompile(address);
-      final Optional<Gas> optionalCost = accountIsWarm ? warmCost : coldCost;
-      if (frame.getRemainingGas().compareTo(optionalCost.get()) < 0) {
-        return new OperationResult(
-            optionalCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-      } else {
-        final Account account = frame.getWorldState().get(address);
-        if (account == null || account.isEmpty()) {
-          frame.pushStackItem(Bytes32.ZERO);
-        } else {
-          frame.pushStackItem(account.getCodeHash());
-        }
-        return new OperationResult(optionalCost, Optional.empty());
-      }
-    } catch (final UnderflowException ufe) {
-      return new OperationResult(
-          warmCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS));
-    } catch (final OverflowException ofe) {
-      return new OperationResult(warmCost, Optional.of(ExceptionalHaltReason.TOO_MANY_STACK_ITEMS));
-    }
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeSizeOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeSizeOperation.java
deleted file mode 100644
index 93c9d3bf7e1..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeSizeOperation.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.AbstractOperation;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.FixedStack.OverflowException;
-import org.hyperledger.besu.ethereum.vm.FixedStack.UnderflowException;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Words;
-
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class ExtCodeSizeOperation extends AbstractOperation {
-
-  private final Optional<Gas> warmCost;
-  private final Optional<Gas> coldCost;
-
-  public ExtCodeSizeOperation(final GasCalculator gasCalculator) {
-    super(0x3B, "EXTCODESIZE", 1, 1, false, 1, gasCalculator);
-    final Gas baseCost = gasCalculator.getExtCodeSizeOperationGasCost();
-    warmCost = Optional.of(baseCost.plus(gasCalculator.getWarmStorageReadCost()));
-    coldCost = Optional.of(baseCost.plus(gasCalculator.getColdAccountAccessCost()));
-  }
-
-  @Override
-  public OperationResult execute(final MessageFrame frame, final EVM evm) {
-    try {
-      final Address address = Words.toAddress(frame.popStackItem());
-      final boolean accountIsWarm =
-          frame.warmUpAddress(address) || gasCalculator().isPrecompile(address);
-      final Optional<Gas> optionalCost = accountIsWarm ? warmCost : coldCost;
-      if (frame.getRemainingGas().compareTo(optionalCost.get()) < 0) {
-        return new OperationResult(
-            optionalCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-      } else {
-        final Account account = frame.getWorldState().get(address);
-        frame.pushStackItem(
-            account == null ? Bytes32.ZERO : UInt256.valueOf(account.getCode().size()).toBytes());
-        return new OperationResult(optionalCost, Optional.empty());
-      }
-    } catch (final UnderflowException ufe) {
-      return new OperationResult(
-          warmCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS));
-    } catch (final OverflowException ofe) {
-      return new OperationResult(warmCost, Optional.of(ExceptionalHaltReason.TOO_MANY_STACK_ITEMS));
-    }
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GasLimitOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GasLimitOperation.java
deleted file mode 100644
index 9ce524657f8..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GasLimitOperation.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-
-public class GasLimitOperation extends AbstractFixedCostOperation {
-
-  public GasLimitOperation(final GasCalculator gasCalculator) {
-    super(0x45, "GASLIMIT", 0, 1, false, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final Gas gasLimit = Gas.of(frame.getBlockHeader().getGasLimit());
-    final Bytes32 value = Bytes32.leftPad(Bytes.of(gasLimit.getBytes()));
-    frame.pushStackItem(value);
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GasOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GasOperation.java
deleted file mode 100644
index ef992f5c6b7..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GasOperation.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-
-public class GasOperation extends AbstractFixedCostOperation {
-
-  public GasOperation(final GasCalculator gasCalculator) {
-    super(0x5A, "GAS", 0, 1, false, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final Gas gasRemaining = frame.getRemainingGas().minus(gasCost);
-    final Bytes32 value = Bytes32.leftPad(Bytes.of(gasRemaining.getBytes()));
-    frame.pushStackItem(value);
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GasPriceOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GasPriceOperation.java
deleted file mode 100644
index 253eb4657a2..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GasPriceOperation.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-public class GasPriceOperation extends AbstractFixedCostOperation {
-
-  public GasPriceOperation(final GasCalculator gasCalculator) {
-    super(0x3A, "GASPRICE", 0, 1, false, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final Wei gasPrice = frame.getGasPrice();
-    frame.pushStackItem(gasPrice.toBytes());
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GtOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GtOperation.java
deleted file mode 100644
index 35a51eb2da3..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/GtOperation.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class GtOperation extends AbstractFixedCostOperation {
-
-  public GtOperation(final GasCalculator gasCalculator) {
-    super(0x11, "GT", 2, 1, false, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 value0 = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 value1 = UInt256.fromBytes(frame.popStackItem());
-
-    final Bytes32 result =
-        (value0.compareTo(value1) > 0 ? UInt256.valueOf(1) : UInt256.ZERO).toBytes();
-
-    frame.pushStackItem(result);
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/InvalidOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/InvalidOperation.java
deleted file mode 100644
index 6bc1d927a98..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/InvalidOperation.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.AbstractOperation;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Optional;
-
-public class InvalidOperation extends AbstractOperation {
-
-  protected final OperationResult invalidOperation;
-
-  public InvalidOperation(final GasCalculator gasCalculator) {
-    this(0xFE, gasCalculator);
-  }
-
-  public InvalidOperation(final int opcode, final GasCalculator gasCalculator) {
-    super(opcode, "INVALID", -1, -1, false, 1, gasCalculator);
-    invalidOperation =
-        new OperationResult(
-            Optional.of(Gas.ZERO), Optional.of(ExceptionalHaltReason.INVALID_OPERATION));
-  }
-
-  @Override
-  public OperationResult execute(final MessageFrame frame, final EVM evm) {
-    return invalidOperation;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/IsZeroOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/IsZeroOperation.java
deleted file mode 100644
index 85cf1f02042..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/IsZeroOperation.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class IsZeroOperation extends AbstractFixedCostOperation {
-
-  public IsZeroOperation(final GasCalculator gasCalculator) {
-    super(0x15, "ISZERO", 1, 1, false, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 value = UInt256.fromBytes(frame.popStackItem());
-
-    frame.pushStackItem(value.isZero() ? UInt256.ONE.toBytes() : UInt256.ZERO.toBytes());
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/JumpDestOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/JumpDestOperation.java
deleted file mode 100644
index a7b16b8a646..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/JumpDestOperation.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-public class JumpDestOperation extends AbstractFixedCostOperation {
-
-  public static final int OPCODE = 0x5B;
-
-  public JumpDestOperation(final GasCalculator gasCalculator) {
-    super(
-        OPCODE,
-        "JUMPDEST",
-        0,
-        0,
-        false,
-        1,
-        gasCalculator,
-        gasCalculator.getJumpDestOperationGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/JumpOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/JumpOperation.java
deleted file mode 100644
index 773229613a7..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/JumpOperation.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.Code;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Optional;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class JumpOperation extends AbstractFixedCostOperation {
-
-  private final OperationResult invalidJumpResponse;
-
-  public JumpOperation(final GasCalculator gasCalculator) {
-    super(0x56, "JUMP", 2, 0, true, 1, gasCalculator, gasCalculator.getMidTierGasCost());
-    invalidJumpResponse =
-        new OperationResult(
-            Optional.of(gasCost), Optional.of(ExceptionalHaltReason.INVALID_JUMP_DESTINATION));
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 jumpDestination = UInt256.fromBytes(frame.popStackItem());
-    final Code code = frame.getCode();
-    if (!code.isValidJumpDestination(evm, frame, jumpDestination)) {
-      return invalidJumpResponse;
-    } else {
-      frame.setPC(jumpDestination.intValue());
-      return successResponse;
-    }
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/JumpSubOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/JumpSubOperation.java
deleted file mode 100644
index 5d14e6e4a8d..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/JumpSubOperation.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.Code;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Optional;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class JumpSubOperation extends AbstractFixedCostOperation {
-
-  private final OperationResult overflowResponse;
-  private final OperationResult invalidJumpDestinationResponse;
-
-  public JumpSubOperation(final GasCalculator gasCalculator) {
-    super(0x5e, "JUMPSUB", 1, 0, true, 1, gasCalculator, gasCalculator.getHighTierGasCost());
-    this.overflowResponse =
-        new OperationResult(
-            Optional.of(gasCost), Optional.of(ExceptionalHaltReason.TOO_MANY_STACK_ITEMS));
-    this.invalidJumpDestinationResponse =
-        new OperationResult(
-            Optional.of(gasCost), Optional.of(ExceptionalHaltReason.INVALID_JUMP_DESTINATION));
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final Code code = frame.getCode();
-
-    if (frame.isReturnStackFull()) {
-      return overflowResponse;
-    }
-
-    final UInt256 location = UInt256.fromBytes(frame.popStackItem());
-    if (!code.isValidJumpSubDestination(evm, frame, location)) {
-      return invalidJumpDestinationResponse;
-    }
-
-    frame.pushReturnStackItem(frame.getPC() + 1);
-    frame.setPC(location.intValue() + 1);
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/JumpiOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/JumpiOperation.java
deleted file mode 100644
index 4da27951ed7..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/JumpiOperation.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.Code;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class JumpiOperation extends AbstractFixedCostOperation {
-
-  private final OperationResult invalidJumpResponse;
-
-  public JumpiOperation(final GasCalculator gasCalculator) {
-    super(0x57, "JUMPI", 2, 0, true, 1, gasCalculator, gasCalculator.getHighTierGasCost());
-    invalidJumpResponse =
-        new OperationResult(
-            Optional.of(gasCost), Optional.of(ExceptionalHaltReason.INVALID_JUMP_DESTINATION));
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 jumpDestination = UInt256.fromBytes(frame.popStackItem());
-    final Bytes32 condition = frame.popStackItem();
-
-    // If condition is zero (false), no jump is will be performed. Therefore skip the test.
-    if (condition.isZero()) {
-      frame.setPC(frame.getPC() + 1);
-    } else {
-      final Code code = frame.getCode();
-      if (!code.isValidJumpDestination(evm, frame, jumpDestination)) {
-        return invalidJumpResponse;
-      }
-      frame.setPC(jumpDestination.intValue());
-    }
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/LogOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/LogOperation.java
deleted file mode 100644
index 730e076cc25..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/LogOperation.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Log;
-import org.hyperledger.besu.ethereum.core.LogTopic;
-import org.hyperledger.besu.ethereum.vm.AbstractOperation;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Optional;
-
-import com.google.common.collect.ImmutableList;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class LogOperation extends AbstractOperation {
-
-  private final int numTopics;
-
-  public LogOperation(final int numTopics, final GasCalculator gasCalculator) {
-    super(0xA0 + numTopics, "LOG" + numTopics, numTopics + 2, 0, false, 1, gasCalculator);
-    this.numTopics = numTopics;
-  }
-
-  @Override
-  public OperationResult execute(final MessageFrame frame, final EVM evm) {
-    final UInt256 dataLocation = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 numBytes = UInt256.fromBytes(frame.popStackItem());
-
-    final Gas cost = gasCalculator().logOperationGasCost(frame, dataLocation, numBytes, numTopics);
-    final Optional<Gas> optionalCost = Optional.of(cost);
-    if (frame.isStatic()) {
-      return new OperationResult(
-          optionalCost, Optional.of(ExceptionalHaltReason.ILLEGAL_STATE_CHANGE));
-    } else if (frame.getRemainingGas().compareTo(cost) < 0) {
-      return new OperationResult(optionalCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-    }
-
-    final Address address = frame.getRecipientAddress();
-
-    final Bytes data = frame.readMemory(dataLocation, numBytes);
-
-    final ImmutableList.Builder<LogTopic> builder =
-        ImmutableList.builderWithExpectedSize(numTopics);
-    for (int i = 0; i < numTopics; i++) {
-      builder.add(LogTopic.create(frame.popStackItem()));
-    }
-
-    frame.addLog(new Log(address, data, builder.build()));
-    return new OperationResult(optionalCost, Optional.empty());
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/LtOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/LtOperation.java
deleted file mode 100644
index 41d88bab671..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/LtOperation.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class LtOperation extends AbstractFixedCostOperation {
-
-  public LtOperation(final GasCalculator gasCalculator) {
-    super(0x10, "LT", 2, 1, false, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 value0 = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 value1 = UInt256.fromBytes(frame.popStackItem());
-
-    final Bytes32 result =
-        value0.compareTo(value1) < 0 ? UInt256.ONE.toBytes() : UInt256.ZERO.toBytes();
-
-    frame.pushStackItem(result);
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MLoadOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MLoadOperation.java
deleted file mode 100644
index 60498ee609f..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MLoadOperation.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.AbstractOperation;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class MLoadOperation extends AbstractOperation {
-
-  public MLoadOperation(final GasCalculator gasCalculator) {
-    super(0x51, "MLOAD", 1, 1, false, 1, gasCalculator);
-  }
-
-  @Override
-  public OperationResult execute(final MessageFrame frame, final EVM evm) {
-    final UInt256 location = UInt256.fromBytes(frame.popStackItem());
-
-    final Gas cost = gasCalculator().mLoadOperationGasCost(frame, location);
-    final Optional<Gas> optionalCost = Optional.of(cost);
-    if (frame.getRemainingGas().compareTo(cost) < 0) {
-      return new OperationResult(optionalCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-    }
-
-    final Bytes32 value = Bytes32.leftPad(frame.readMemory(location, UInt256.valueOf(32), true));
-
-    frame.pushStackItem(value);
-    return new OperationResult(optionalCost, Optional.empty());
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MSizeOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MSizeOperation.java
deleted file mode 100644
index 58c2eaa66b8..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MSizeOperation.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class MSizeOperation extends AbstractFixedCostOperation {
-
-  public MSizeOperation(final GasCalculator gasCalculator) {
-    super(0x59, "MSIZE", 0, 1, false, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    frame.pushStackItem(UInt256.valueOf(frame.memoryByteSize()).toBytes());
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MStore8Operation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MStore8Operation.java
deleted file mode 100644
index 9260d37716c..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MStore8Operation.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.AbstractOperation;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class MStore8Operation extends AbstractOperation {
-
-  public MStore8Operation(final GasCalculator gasCalculator) {
-    super(0x53, "MSTORE8", 2, 0, false, 1, gasCalculator);
-  }
-
-  @Override
-  public OperationResult execute(final MessageFrame frame, final EVM evm) {
-    final UInt256 location = UInt256.fromBytes(frame.popStackItem());
-    final Bytes32 value = frame.popStackItem();
-
-    final Gas cost = gasCalculator().mStore8OperationGasCost(frame, location);
-    final Optional<Gas> optionalCost = Optional.of(cost);
-    if (frame.getRemainingGas().compareTo(cost) < 0) {
-      return new OperationResult(optionalCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-    }
-
-    frame.writeMemory(location, value.get(Bytes32.SIZE - 1), true);
-    return new OperationResult(optionalCost, Optional.empty());
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MStoreOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MStoreOperation.java
deleted file mode 100644
index 8565012bbc5..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MStoreOperation.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.AbstractOperation;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class MStoreOperation extends AbstractOperation {
-
-  public MStoreOperation(final GasCalculator gasCalculator) {
-    super(0x52, "MSTORE", 2, 0, false, 1, gasCalculator);
-  }
-
-  @Override
-  public OperationResult execute(final MessageFrame frame, final EVM evm) {
-    final UInt256 location = UInt256.fromBytes(frame.popStackItem());
-    final Bytes32 value = frame.popStackItem();
-
-    final Gas cost = gasCalculator().mStoreOperationGasCost(frame, location);
-    final Optional<Gas> optionalCost = Optional.of(cost);
-    if (frame.getRemainingGas().compareTo(cost) < 0) {
-      return new OperationResult(optionalCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-    }
-
-    frame.writeMemory(location, UInt256.valueOf(32), value, true);
-    return new OperationResult(optionalCost, Optional.empty());
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ModOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ModOperation.java
deleted file mode 100644
index 73d310663b8..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ModOperation.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class ModOperation extends AbstractFixedCostOperation {
-
-  public ModOperation(final GasCalculator gasCalculator) {
-    super(0x06, "MOD", 2, 1, false, 1, gasCalculator, gasCalculator.getLowTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 value0 = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 value1 = UInt256.fromBytes(frame.popStackItem());
-
-    final UInt256 result = value0.mod0(value1);
-    frame.pushStackItem(result.toBytes());
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MulModOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MulModOperation.java
deleted file mode 100644
index 32665c4748f..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MulModOperation.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class MulModOperation extends AbstractFixedCostOperation {
-
-  public MulModOperation(final GasCalculator gasCalculator) {
-    super(0x09, "MULMOD", 3, 1, false, 1, gasCalculator, gasCalculator.getMidTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 value0 = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 value1 = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 value2 = UInt256.fromBytes(frame.popStackItem());
-
-    if (value2.isZero()) {
-      frame.pushStackItem(Bytes32.ZERO);
-    } else {
-      final UInt256 result = value0.multiplyMod(value1, value2);
-      frame.pushStackItem(result.toBytes());
-    }
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MulOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MulOperation.java
deleted file mode 100644
index 297ab343a29..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/MulOperation.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class MulOperation extends AbstractFixedCostOperation {
-
-  public MulOperation(final GasCalculator gasCalculator) {
-    super(0x02, "MUL", 2, 1, false, 1, gasCalculator, gasCalculator.getLowTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 value0 = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 value1 = UInt256.fromBytes(frame.popStackItem());
-
-    final UInt256 result = value0.multiply(value1);
-
-    frame.pushStackItem(result.toBytes());
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/NotOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/NotOperation.java
deleted file mode 100644
index e1ddbf7731f..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/NotOperation.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class NotOperation extends AbstractFixedCostOperation {
-
-  public NotOperation(final GasCalculator gasCalculator) {
-    super(0x19, "NOT", 1, 1, false, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 value = UInt256.fromBytes(frame.popStackItem());
-
-    final UInt256 result = value.not();
-
-    frame.pushStackItem(result.toBytes());
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/NumberOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/NumberOperation.java
deleted file mode 100644
index 6ad68319f21..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/NumberOperation.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class NumberOperation extends AbstractFixedCostOperation {
-
-  public NumberOperation(final GasCalculator gasCalculator) {
-    super(0x43, "NUMBER", 0, 1, false, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final long number = frame.getBlockHeader().getNumber();
-    frame.pushStackItem(UInt256.valueOf(number).toBytes());
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/OrOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/OrOperation.java
deleted file mode 100644
index f981e184127..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/OrOperation.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class OrOperation extends AbstractFixedCostOperation {
-
-  public OrOperation(final GasCalculator gasCalculator) {
-    super(0x17, "OR", 2, 1, false, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 value0 = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 value1 = UInt256.fromBytes(frame.popStackItem());
-
-    final UInt256 result = value0.or(value1);
-
-    frame.pushStackItem(result.toBytes());
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/OriginOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/OriginOperation.java
deleted file mode 100644
index 3c8ebf58d40..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/OriginOperation.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Words;
-
-public class OriginOperation extends AbstractFixedCostOperation {
-
-  public OriginOperation(final GasCalculator gasCalculator) {
-    super(0x32, "ORIGIN", 0, 1, false, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final Address originAddress = frame.getOriginatorAddress();
-    frame.pushStackItem(Words.fromAddress(originAddress));
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/PCOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/PCOperation.java
deleted file mode 100644
index 15b22836a17..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/PCOperation.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class PCOperation extends AbstractFixedCostOperation {
-
-  public PCOperation(final GasCalculator gasCalculator) {
-    super(0x58, "PC", 0, 1, false, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    frame.pushStackItem(UInt256.valueOf(frame.getPC()).toBytes());
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/PopOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/PopOperation.java
deleted file mode 100644
index a2f5a51061d..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/PopOperation.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-public class PopOperation extends AbstractFixedCostOperation {
-
-  public PopOperation(final GasCalculator gasCalculator) {
-    super(0x50, "POP", 1, 0, false, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    frame.popStackItem();
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/PushOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/PushOperation.java
deleted file mode 100644
index 6d1be2a5740..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/PushOperation.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import static java.lang.Math.min;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.MutableBytes32;
-
-public class PushOperation extends AbstractFixedCostOperation {
-
-  private final int length;
-
-  public PushOperation(final int length, final GasCalculator gasCalculator) {
-    super(
-        0x60 + length - 1,
-        "PUSH" + length,
-        0,
-        1,
-        false,
-        length + 1,
-        gasCalculator,
-        gasCalculator.getVeryLowTierGasCost());
-    this.length = length;
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final int pc = frame.getPC();
-    final Bytes code = frame.getCode().getBytes();
-
-    final int copyLength = min(length, code.size() - pc - 1);
-    final MutableBytes32 bytes = MutableBytes32.create();
-    code.slice(pc + 1, copyLength).copyTo(bytes, bytes.size() - length);
-    frame.pushStackItem(bytes);
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnDataCopyOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnDataCopyOperation.java
deleted file mode 100644
index b31655117f1..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnDataCopyOperation.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.AbstractOperation;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class ReturnDataCopyOperation extends AbstractOperation {
-
-  protected static final OperationResult INVALID_RETURN_DATA_BUFFER_ACCESS =
-      new OperationResult(
-          Optional.empty(), Optional.of(ExceptionalHaltReason.INVALID_RETURN_DATA_BUFFER_ACCESS));
-
-  public ReturnDataCopyOperation(final GasCalculator gasCalculator) {
-    super(0x3E, "RETURNDATACOPY", 3, 0, false, 1, gasCalculator);
-  }
-
-  @Override
-  public OperationResult execute(final MessageFrame frame, final EVM evm) {
-    final UInt256 memOffset = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 sourceOffset = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 numBytes = UInt256.fromBytes(frame.popStackItem());
-    final Bytes returnData = frame.getReturnData();
-    final UInt256 returnDataLength = UInt256.valueOf(returnData.size());
-
-    if (!sourceOffset.fitsInt()
-        || !numBytes.fitsInt()
-        || sourceOffset.add(numBytes).compareTo(returnDataLength) > 0) {
-      return INVALID_RETURN_DATA_BUFFER_ACCESS;
-    }
-
-    final Gas cost = gasCalculator().dataCopyOperationGasCost(frame, memOffset, numBytes);
-    final Optional<Gas> optionalCost = Optional.of(cost);
-    if (frame.getRemainingGas().compareTo(cost) < 0) {
-      return new OperationResult(optionalCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-    }
-
-    frame.writeMemory(memOffset, sourceOffset, numBytes, returnData, true);
-
-    return new OperationResult(optionalCost, Optional.empty());
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnDataSizeOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnDataSizeOperation.java
deleted file mode 100644
index 5c605d2231a..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnDataSizeOperation.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class ReturnDataSizeOperation extends AbstractFixedCostOperation {
-
-  public ReturnDataSizeOperation(final GasCalculator gasCalculator) {
-    super(
-        0x3D, "RETURNDATASIZE", 0, 1, false, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final Bytes returnData = frame.getReturnData();
-    frame.pushStackItem(UInt256.valueOf(returnData.size()).toBytes());
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnOperation.java
deleted file mode 100644
index bab1c68414a..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnOperation.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.AbstractOperation;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Optional;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class ReturnOperation extends AbstractOperation {
-
-  public ReturnOperation(final GasCalculator gasCalculator) {
-    super(0xF3, "RETURN", 2, 0, false, 1, gasCalculator);
-  }
-
-  @Override
-  public OperationResult execute(final MessageFrame frame, final EVM evm) {
-    final UInt256 from = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 length = UInt256.fromBytes(frame.popStackItem());
-
-    final Gas cost = gasCalculator().memoryExpansionGasCost(frame, from, length);
-    final Optional<Gas> optionalCost = Optional.of(cost);
-    if (frame.getRemainingGas().compareTo(cost) < 0) {
-      return new OperationResult(optionalCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-    }
-
-    frame.setOutputData(frame.readMemory(from, length));
-    frame.setState(MessageFrame.State.CODE_SUCCESS);
-    return new OperationResult(optionalCost, Optional.empty());
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnStack.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnStack.java
deleted file mode 100644
index a0cc9f97fc6..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnStack.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.FixedStack;
-
-/**
- * This class describes the behaviour of the Return stack introduce on the
- * https://eips.ethereum.org/EIPS/eip-2315
- */
-public class ReturnStack extends FixedStack<Integer> {
-
-  // as defined on https://eips.ethereum.org/EIPS/eip-2315
-  private static final int MAX_RETURN_STACK_SIZE = 1023;
-
-  public ReturnStack() {
-    super(MAX_RETURN_STACK_SIZE, Integer.class);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnSubOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnSubOperation.java
deleted file mode 100644
index 4be6f37797a..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ReturnSubOperation.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Optional;
-
-public class ReturnSubOperation extends AbstractFixedCostOperation {
-
-  private final OperationResult invalidRetsubResponse;
-
-  public ReturnSubOperation(final GasCalculator gasCalculator) {
-    super(0x5d, "RETURNSUB", 0, 0, true, 1, gasCalculator, gasCalculator.getLowTierGasCost());
-    invalidRetsubResponse =
-        new OperationResult(
-            Optional.of(gasCalculator.getLowTierGasCost()),
-            Optional.of(ExceptionalHaltReason.INVALID_RETSUB));
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    if (frame.isReturnStackEmpty()) {
-      return invalidRetsubResponse;
-    }
-
-    frame.setPC(frame.popReturnStackItem());
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/RevertOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/RevertOperation.java
deleted file mode 100644
index 08a547fb8d5..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/RevertOperation.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.AbstractOperation;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class RevertOperation extends AbstractOperation {
-
-  public RevertOperation(final GasCalculator gasCalculator) {
-    super(0xFD, "REVERT", 2, 0, false, 1, gasCalculator);
-  }
-
-  @Override
-  public OperationResult execute(final MessageFrame frame, final EVM evm) {
-    final UInt256 from = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 length = UInt256.fromBytes(frame.popStackItem());
-
-    final Gas cost = gasCalculator().memoryExpansionGasCost(frame, from, length);
-    final Optional<Gas> optionalCost = Optional.of(cost);
-    if (frame.getRemainingGas().compareTo(cost) < 0) {
-      return new OperationResult(optionalCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-    }
-
-    final Bytes reason = frame.readMemory(from, length);
-    frame.setOutputData(reason);
-    frame.setRevertReason(reason);
-    frame.setState(MessageFrame.State.REVERT);
-    return new OperationResult(optionalCost, Optional.empty());
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SDivOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SDivOperation.java
deleted file mode 100644
index 3ea0a7651e7..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SDivOperation.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.math.BigInteger;
-import java.util.Arrays;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-
-public class SDivOperation extends AbstractFixedCostOperation {
-
-  public SDivOperation(final GasCalculator gasCalculator) {
-    super(0x05, "SDIV", 2, 1, false, 1, gasCalculator, gasCalculator.getLowTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final Bytes32 value0 = frame.popStackItem();
-    final Bytes32 value1 = frame.popStackItem();
-    if (value1.isZero()) {
-      frame.pushStackItem(Bytes32.ZERO);
-    } else {
-      final BigInteger result = value0.toBigInteger().divide(value1.toBigInteger());
-      Bytes resultBytes = Bytes.wrap(result.toByteArray());
-      if (resultBytes.size() > 32) {
-        resultBytes = resultBytes.slice(resultBytes.size() - 32, 32);
-      }
-
-      final byte[] padding = new byte[32 - resultBytes.size()];
-      Arrays.fill(padding, result.signum() < 0 ? (byte) 0xFF : 0x00);
-
-      frame.pushStackItem(Bytes32.wrap(Bytes.concatenate(Bytes.wrap(padding), resultBytes)));
-    }
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SGtOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SGtOperation.java
deleted file mode 100644
index a20b89c9220..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SGtOperation.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.math.BigInteger;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class SGtOperation extends AbstractFixedCostOperation {
-
-  public SGtOperation(final GasCalculator gasCalculator) {
-    super(0x13, "SGT", 2, 1, false, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final Bytes32 value0 = frame.popStackItem();
-    final Bytes32 value1 = frame.popStackItem();
-
-    final BigInteger b0 = value0.toBigInteger();
-    final BigInteger b1 = value1.toBigInteger();
-
-    final Bytes32 result = b0.compareTo(b1) > 0 ? UInt256.ONE.toBytes() : UInt256.ZERO.toBytes();
-
-    frame.pushStackItem(result);
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SLoadOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SLoadOperation.java
deleted file mode 100644
index ed665d0074b..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SLoadOperation.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.AbstractOperation;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.FixedStack.OverflowException;
-import org.hyperledger.besu.ethereum.vm.FixedStack.UnderflowException;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class SLoadOperation extends AbstractOperation {
-
-  private final Optional<Gas> warmCost;
-  private final Optional<Gas> coldCost;
-
-  private final OperationResult warmSuccess;
-  private final OperationResult coldSuccess;
-
-  public SLoadOperation(final GasCalculator gasCalculator) {
-    super(0x54, "SLOAD", 1, 1, false, 1, gasCalculator);
-    final Gas baseCost = gasCalculator.getSloadOperationGasCost();
-    warmCost = Optional.of(baseCost.plus(gasCalculator.getWarmStorageReadCost()));
-    coldCost = Optional.of(baseCost.plus(gasCalculator.getColdSloadCost()));
-
-    warmSuccess = new OperationResult(warmCost, Optional.empty());
-    coldSuccess = new OperationResult(coldCost, Optional.empty());
-  }
-
-  @Override
-  public OperationResult execute(final MessageFrame frame, final EVM evm) {
-    try {
-      final Account account = frame.getWorldState().get(frame.getRecipientAddress());
-      final Address address = account.getAddress();
-      final Bytes32 key = frame.popStackItem();
-      final boolean slotIsWarm = frame.warmUpStorage(address, key);
-      final Optional<Gas> optionalCost = slotIsWarm ? warmCost : coldCost;
-      if (frame.getRemainingGas().compareTo(optionalCost.get()) < 0) {
-        return new OperationResult(
-            optionalCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-      } else {
-        frame.pushStackItem(account.getStorageValue(UInt256.fromBytes(key)).toBytes());
-
-        return slotIsWarm ? warmSuccess : coldSuccess;
-      }
-    } catch (final UnderflowException ufe) {
-      return new OperationResult(
-          warmCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS));
-    } catch (final OverflowException ofe) {
-      return new OperationResult(warmCost, Optional.of(ExceptionalHaltReason.TOO_MANY_STACK_ITEMS));
-    }
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SLtOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SLtOperation.java
deleted file mode 100644
index 6ce6c76750c..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SLtOperation.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.math.BigInteger;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class SLtOperation extends AbstractFixedCostOperation {
-
-  public SLtOperation(final GasCalculator gasCalculator) {
-    super(0x12, "SLT", 2, 1, false, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final Bytes32 value0 = frame.popStackItem();
-    final Bytes32 value1 = frame.popStackItem();
-
-    final BigInteger b0 = value0.toBigInteger();
-    final BigInteger b1 = value1.toBigInteger();
-
-    final Bytes32 result = b0.compareTo(b1) < 0 ? UInt256.ONE.toBytes() : UInt256.ZERO.toBytes();
-
-    frame.pushStackItem(result);
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SModOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SModOperation.java
deleted file mode 100644
index 0d68ab1bf33..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SModOperation.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.math.BigInteger;
-import java.util.Arrays;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-
-public class SModOperation extends AbstractFixedCostOperation {
-
-  public SModOperation(final GasCalculator gasCalculator) {
-    super(0x07, "SMOD", 2, 1, false, 1, gasCalculator, gasCalculator.getLowTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final Bytes32 value0 = frame.popStackItem();
-    final Bytes32 value1 = frame.popStackItem();
-
-    if (value1.isZero()) {
-      frame.pushStackItem(Bytes32.ZERO);
-    } else {
-      final BigInteger b1 = value0.toBigInteger();
-      final BigInteger b2 = value1.toBigInteger();
-      BigInteger result = b1.abs().mod(b2.abs());
-      if (b1.signum() < 0) {
-        result = result.negate();
-      }
-
-      Bytes resultBytes = Bytes.wrap(result.toByteArray());
-      if (resultBytes.size() > 32) {
-        resultBytes = resultBytes.slice(resultBytes.size() - 32, 32);
-      }
-
-      final byte[] padding = new byte[32 - resultBytes.size()];
-      Arrays.fill(padding, result.signum() < 0 ? (byte) 0xFF : 0x00);
-
-      frame.pushStackItem(Bytes32.wrap(Bytes.concatenate(Bytes.wrap(padding), resultBytes)));
-    }
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SStoreOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SStoreOperation.java
deleted file mode 100644
index e90b28df167..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SStoreOperation.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
-import org.hyperledger.besu.ethereum.vm.AbstractOperation;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Optional;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class SStoreOperation extends AbstractOperation {
-
-  public static final Gas FRONTIER_MINIMUM = Gas.ZERO;
-  public static final Gas EIP_1706_MINIMUM = Gas.of(2300);
-
-  protected static final OperationResult ILLEGAL_STATE_CHANGE =
-      new OperationResult(
-          Optional.empty(), Optional.of(ExceptionalHaltReason.ILLEGAL_STATE_CHANGE));
-
-  private final Gas minumumGasRemaining;
-
-  public SStoreOperation(final GasCalculator gasCalculator, final Gas minumumGasRemaining) {
-    super(0x55, "SSTORE", 2, 0, false, 1, gasCalculator);
-    this.minumumGasRemaining = minumumGasRemaining;
-  }
-
-  public Gas getMinumumGasRemaining() {
-    return minumumGasRemaining;
-  }
-
-  @Override
-  public OperationResult execute(final MessageFrame frame, final EVM evm) {
-
-    final UInt256 key = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 value = UInt256.fromBytes(frame.popStackItem());
-
-    final MutableAccount account =
-        frame.getWorldState().getAccount(frame.getRecipientAddress()).getMutable();
-    if (account == null) {
-      return ILLEGAL_STATE_CHANGE;
-    }
-
-    final Address address = account.getAddress();
-    final boolean slotIsWarm = frame.warmUpStorage(address, key.toBytes());
-    final Gas cost =
-        gasCalculator()
-            .calculateStorageCost(account, key, value)
-            .plus(slotIsWarm ? Gas.ZERO : gasCalculator().getColdSloadCost());
-
-    final Optional<Gas> optionalCost = Optional.of(cost);
-    final Gas remainingGas = frame.getRemainingGas();
-    if (frame.isStatic()) {
-      return new OperationResult(
-          optionalCost, Optional.of(ExceptionalHaltReason.ILLEGAL_STATE_CHANGE));
-    } else if (remainingGas.compareTo(cost) < 0) {
-      return new OperationResult(optionalCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-    } else if (remainingGas.compareTo(minumumGasRemaining) <= 0) {
-      return new OperationResult(
-          Optional.of(minumumGasRemaining), Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-    }
-
-    // Increment the refund counter.
-    frame.incrementGasRefund(gasCalculator().calculateStorageRefundAmount(account, key, value));
-
-    account.setStorageValue(key, value);
-    frame.storageWasUpdated(key, value.toBytes());
-    return new OperationResult(optionalCost, Optional.empty());
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SarOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SarOperation.java
deleted file mode 100644
index 336c5b28f07..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SarOperation.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class SarOperation extends AbstractFixedCostOperation {
-
-  private static final Bytes32 ALL_BITS =
-      Bytes32.fromHexString("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
-
-  public SarOperation(final GasCalculator gasCalculator) {
-    super(0x1d, "SAR", 2, 1, false, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 shiftAmount = UInt256.fromBytes(frame.popStackItem());
-    Bytes32 value = frame.popStackItem();
-
-    final boolean negativeNumber = value.get(0) < 0;
-
-    // short circuit result if we are shifting more than the width of the data.
-    if (!shiftAmount.fitsInt() || shiftAmount.intValue() >= 256) {
-      final Bytes32 overflow = negativeNumber ? ALL_BITS : Bytes32.ZERO;
-      frame.pushStackItem(overflow);
-      return successResponse;
-    }
-
-    // first perform standard shift right.
-    value = value.shiftRight(shiftAmount.intValue());
-
-    // if a negative number, carry through the sign.
-    if (negativeNumber) {
-      final Bytes32 significantBits = ALL_BITS.shiftLeft(256 - shiftAmount.intValue());
-      value = value.or(significantBits);
-    }
-    frame.pushStackItem(value);
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SelfBalanceOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SelfBalanceOperation.java
deleted file mode 100644
index 2beab9eabf0..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SelfBalanceOperation.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes32;
-
-public class SelfBalanceOperation extends AbstractFixedCostOperation {
-
-  public SelfBalanceOperation(final GasCalculator gasCalculator) {
-    super(0x47, "SELFBALANCE", 0, 1, false, 1, gasCalculator, gasCalculator.getLowTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final Address accountAddress = frame.getRecipientAddress();
-    final Account account = frame.getWorldState().get(accountAddress);
-    frame.pushStackItem(account == null ? Bytes32.ZERO : account.getBalance().toBytes());
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SelfDestructOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SelfDestructOperation.java
deleted file mode 100644
index c14dfea7090..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SelfDestructOperation.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.vm.AbstractOperation;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Words;
-
-import java.util.Optional;
-
-public class SelfDestructOperation extends AbstractOperation {
-
-  public SelfDestructOperation(final GasCalculator gasCalculator) {
-    super(0xFF, "SELFDESTRUCT", 1, 0, false, 1, gasCalculator);
-  }
-
-  @Override
-  public OperationResult execute(final MessageFrame frame, final EVM evm) {
-    final Address recipientAddress = Words.toAddress(frame.popStackItem());
-
-    // because of weird EIP150/158 reasons we care about a null account so we can't merge this.
-    final Account recipientNullable = frame.getWorldState().get(recipientAddress);
-    final Wei inheritance = frame.getWorldState().get(frame.getRecipientAddress()).getBalance();
-
-    final boolean accountIsWarm =
-        frame.warmUpAddress(recipientAddress) || gasCalculator().isPrecompile(recipientAddress);
-
-    final Gas cost =
-        gasCalculator()
-            .selfDestructOperationGasCost(recipientNullable, inheritance)
-            .plus(accountIsWarm ? Gas.ZERO : gasCalculator().getColdAccountAccessCost());
-    final Optional<Gas> optionalCost = Optional.of(cost);
-
-    if (frame.isStatic()) {
-      return new OperationResult(
-          optionalCost, Optional.of(ExceptionalHaltReason.ILLEGAL_STATE_CHANGE));
-    } else if (frame.getRemainingGas().compareTo(cost) < 0) {
-      return new OperationResult(optionalCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-    }
-
-    final Address address = frame.getRecipientAddress();
-    final MutableAccount account = frame.getWorldState().getAccount(address).getMutable();
-
-    frame.addSelfDestruct(address);
-
-    final MutableAccount recipient =
-        frame.getWorldState().getOrCreate(recipientAddress).getMutable();
-
-    if (!account.getAddress().equals(recipient.getAddress())) {
-      recipient.incrementBalance(account.getBalance());
-    }
-
-    // add refund in message frame
-    frame.addRefund(recipient.getAddress(), account.getBalance());
-
-    account.setBalance(Wei.ZERO);
-
-    frame.setState(MessageFrame.State.CODE_SUCCESS);
-    return new OperationResult(optionalCost, Optional.empty());
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/Sha3Operation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/Sha3Operation.java
deleted file mode 100644
index a04f4f8f80f..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/Sha3Operation.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.vm.AbstractOperation;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class Sha3Operation extends AbstractOperation {
-
-  public Sha3Operation(final GasCalculator gasCalculator) {
-    super(0x20, "SHA3", 2, 1, false, 1, gasCalculator);
-  }
-
-  @Override
-  public OperationResult execute(final MessageFrame frame, final EVM evm) {
-    final UInt256 from = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 length = UInt256.fromBytes(frame.popStackItem());
-
-    final Gas cost = gasCalculator().sha3OperationGasCost(frame, from, length);
-    final Optional<Gas> optionalCost = Optional.of(cost);
-    if (frame.getRemainingGas().compareTo(cost) < 0) {
-      return new OperationResult(optionalCost, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
-    }
-
-    final Bytes bytes = frame.readMemory(from, length);
-    frame.pushStackItem(Hash.hash(bytes));
-    return new OperationResult(optionalCost, Optional.empty());
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ShlOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ShlOperation.java
deleted file mode 100644
index 05ef6616543..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ShlOperation.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class ShlOperation extends AbstractFixedCostOperation {
-
-  public ShlOperation(final GasCalculator gasCalculator) {
-    super(0x1b, "SHL", 2, 1, false, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 shiftAmount = UInt256.fromBytes(frame.popStackItem());
-    final Bytes32 value = frame.popStackItem();
-
-    if (!shiftAmount.fitsInt() || shiftAmount.intValue() >= 256) {
-      frame.pushStackItem(Bytes32.ZERO);
-    } else {
-      frame.pushStackItem(value.shiftLeft(shiftAmount.intValue()));
-    }
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ShrOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ShrOperation.java
deleted file mode 100644
index e637965c0cc..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/ShrOperation.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class ShrOperation extends AbstractFixedCostOperation {
-
-  public ShrOperation(final GasCalculator gasCalculator) {
-    super(0x1c, "SHR", 2, 1, false, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 shiftAmount = UInt256.fromBytes(frame.popStackItem());
-    final Bytes32 value = frame.popStackItem();
-
-    if (!shiftAmount.fitsInt() || shiftAmount.intValue() >= 256) {
-      frame.pushStackItem(Bytes32.ZERO);
-    } else {
-      frame.pushStackItem(value.shiftRight(shiftAmount.intValue()));
-    }
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SignExtendOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SignExtendOperation.java
deleted file mode 100644
index 8a6ff525f28..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SignExtendOperation.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.MutableBytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class SignExtendOperation extends AbstractFixedCostOperation {
-
-  public SignExtendOperation(final GasCalculator gasCalculator) {
-    super(0x0B, "SIGNEXTEND", 2, 1, false, 1, gasCalculator, gasCalculator.getLowTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 value0 = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 value1 = UInt256.fromBytes(frame.popStackItem());
-
-    // Stack items are reversed for the SIGNEXTEND operation.
-    final UInt256 result = signExtend(value1, value0);
-
-    frame.pushStackItem(result.toBytes());
-
-    return successResponse;
-  }
-
-  private static UInt256 signExtend(final UInt256 v1, final UInt256 v2) {
-    final MutableBytes32 result = MutableBytes32.create();
-
-    // Any value >= 31 imply an index <= 0, so no work to do (note that 0 itself is a valid index,
-    // but copying the 0th byte to itself is only so useful).
-    if (!v2.fitsInt() || v2.intValue() >= 31) {
-      v1.toBytes().copyTo(result);
-      return UInt256.fromBytes(result);
-    }
-
-    // This is safe, since other < 31.
-    final int byteIndex = 32 - 1 - v2.toBytes().getInt(32 - 4);
-    final byte toSet = v1.toBytes().get(byteIndex) < 0 ? (byte) 0xFF : 0x00;
-    result.mutableSlice(0, byteIndex).fill(toSet);
-    v1.toBytes().slice(byteIndex).copyTo(result, byteIndex);
-    return UInt256.fromBytes(result);
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/StaticCallOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/StaticCallOperation.java
deleted file mode 100644
index 9a6e247766e..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/StaticCallOperation.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.vm.AbstractCallOperation;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Words;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class StaticCallOperation extends AbstractCallOperation {
-
-  public StaticCallOperation(final GasCalculator gasCalculator) {
-    super(0xFA, "STATICCALL", 6, 1, false, 1, gasCalculator);
-  }
-
-  @Override
-  protected Gas gas(final MessageFrame frame) {
-    return Gas.of(frame.getStackItem(0));
-  }
-
-  @Override
-  protected Address to(final MessageFrame frame) {
-    return Words.toAddress(frame.getStackItem(1));
-  }
-
-  @Override
-  protected Wei value(final MessageFrame frame) {
-    return Wei.ZERO;
-  }
-
-  @Override
-  protected Wei apparentValue(final MessageFrame frame) {
-    return value(frame);
-  }
-
-  @Override
-  protected UInt256 inputDataOffset(final MessageFrame frame) {
-    return UInt256.fromBytes(frame.getStackItem(2));
-  }
-
-  @Override
-  protected UInt256 inputDataLength(final MessageFrame frame) {
-    return UInt256.fromBytes(frame.getStackItem(3));
-  }
-
-  @Override
-  protected UInt256 outputDataOffset(final MessageFrame frame) {
-    return UInt256.fromBytes(frame.getStackItem(4));
-  }
-
-  @Override
-  protected UInt256 outputDataLength(final MessageFrame frame) {
-    return UInt256.fromBytes(frame.getStackItem(5));
-  }
-
-  @Override
-  protected Address address(final MessageFrame frame) {
-    return to(frame);
-  }
-
-  @Override
-  protected Address sender(final MessageFrame frame) {
-    return frame.getRecipientAddress();
-  }
-
-  @Override
-  public Gas gasAvailableForChildCall(final MessageFrame frame) {
-    return gasCalculator().gasAvailableForChildCall(frame, gas(frame), !value(frame).isZero());
-  }
-
-  @Override
-  protected boolean isStatic(final MessageFrame frame) {
-    return true;
-  }
-
-  @Override
-  public Gas cost(final MessageFrame frame) {
-    final Gas stipend = gas(frame);
-    final UInt256 inputDataOffset = inputDataOffset(frame);
-    final UInt256 inputDataLength = inputDataLength(frame);
-    final UInt256 outputDataOffset = outputDataOffset(frame);
-    final UInt256 outputDataLength = outputDataLength(frame);
-    final Account recipient = frame.getWorldState().get(address(frame));
-
-    return gasCalculator()
-        .callOperationGasCost(
-            frame,
-            stipend,
-            inputDataOffset,
-            inputDataLength,
-            outputDataOffset,
-            outputDataLength,
-            value(frame),
-            recipient,
-            to(frame));
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/StopOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/StopOperation.java
deleted file mode 100644
index bb93191142f..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/StopOperation.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public class StopOperation extends AbstractFixedCostOperation {
-
-  public StopOperation(final GasCalculator gasCalculator) {
-    super(0x00, "STOP", 0, 0, false, 1, gasCalculator, gasCalculator.getZeroTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    frame.setState(MessageFrame.State.CODE_SUCCESS);
-    frame.setOutputData(Bytes.EMPTY);
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SubOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SubOperation.java
deleted file mode 100644
index 0b02797ae3d..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SubOperation.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class SubOperation extends AbstractFixedCostOperation {
-
-  public SubOperation(final GasCalculator gasCalculator) {
-    super(0x03, "SUB", 2, 1, false, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 value0 = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 value1 = UInt256.fromBytes(frame.popStackItem());
-
-    final UInt256 result = value0.subtract(value1);
-
-    frame.pushStackItem(result.toBytes());
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SwapOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SwapOperation.java
deleted file mode 100644
index 16218e8fb63..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/SwapOperation.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes32;
-
-public class SwapOperation extends AbstractFixedCostOperation {
-
-  private final int index;
-  protected final OperationResult underflowResponse;
-
-  public SwapOperation(final int index, final GasCalculator gasCalculator) {
-    super(
-        0x90 + index - 1,
-        "SWAP" + index,
-        index + 1,
-        index + 1,
-        false,
-        1,
-        gasCalculator,
-        gasCalculator.getVeryLowTierGasCost());
-    this.index = index;
-    this.underflowResponse =
-        new OperationResult(
-            Optional.of(gasCost), Optional.of(ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS));
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    // getStackItem doesn't under/overflow.  Check explicitly.
-    if (frame.stackSize() < getStackItemsConsumed()) {
-      return underflowResponse;
-    }
-
-    final Bytes32 tmp = frame.getStackItem(0);
-    frame.setStackItem(0, frame.getStackItem(index));
-    frame.setStackItem(index, tmp);
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/TimestampOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/TimestampOperation.java
deleted file mode 100644
index c12be827a91..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/TimestampOperation.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class TimestampOperation extends AbstractFixedCostOperation {
-
-  public TimestampOperation(final GasCalculator gasCalculator) {
-    super(0x42, "TIMESTAMP", 0, 1, false, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final long timestamp = frame.getBlockHeader().getTimestamp();
-    frame.pushStackItem(UInt256.valueOf(timestamp).toBytes());
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/XorOperation.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/XorOperation.java
deleted file mode 100644
index f3fcfa0ac81..00000000000
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/XorOperation.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.units.bigints.UInt256;
-
-public class XorOperation extends AbstractFixedCostOperation {
-
-  public XorOperation(final GasCalculator gasCalculator) {
-    super(0x18, "XOR", 2, 1, false, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
-  }
-
-  @Override
-  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
-    final UInt256 value0 = UInt256.fromBytes(frame.popStackItem());
-    final UInt256 value1 = UInt256.fromBytes(frame.popStackItem());
-
-    final UInt256 result = value0.xor(value1);
-
-    frame.pushStackItem(result.toBytes());
-
-    return successResponse;
-  }
-}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/DataStorageConfiguration.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/DataStorageConfiguration.java
index 165bcc01ee4..93b22807ee9 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/DataStorageConfiguration.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/DataStorageConfiguration.java
@@ -21,10 +21,15 @@
 @Value.Immutable
 public interface DataStorageConfiguration {
 
+  long DEFAULT_BONSAI_MAX_LAYERS_TO_LOAD = 512;
+
   DataStorageConfiguration DEFAULT_CONFIG =
       ImmutableDataStorageConfiguration.builder()
           .dataStorageFormat(DataStorageFormat.FOREST)
+          .bonsaiMaxLayersToLoad(DEFAULT_BONSAI_MAX_LAYERS_TO_LOAD)
           .build();
 
   DataStorageFormat getDataStorageFormat();
+
+  Long getBonsaiMaxLayersToLoad();
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/DefaultMutablePrivateWorldStateUpdater.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/DefaultMutablePrivateWorldStateUpdater.java
index 3df0b8876d6..fe1bf39ecbd 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/DefaultMutablePrivateWorldStateUpdater.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/DefaultMutablePrivateWorldStateUpdater.java
@@ -14,20 +14,23 @@
  */
 package org.hyperledger.besu.ethereum.worldstate;
 
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.EvmAccount;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.core.WrappedEvmAccount;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.account.EvmAccount;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+import org.hyperledger.besu.evm.worldstate.WrappedEvmAccount;
 
 import java.util.Collection;
 import java.util.Optional;
 
+// This class uses a public WorldUpdater and a private WorldUpdater to provide a
+// MutableWorldStateUpdater that can read and write from the private world state and can read from
+// the public world state, but cannot write to it.
 public class DefaultMutablePrivateWorldStateUpdater implements WorldUpdater {
 
-  private final WorldUpdater publicWorldUpdater;
-  private final WorldUpdater privateWorldUpdater;
+  protected final WorldUpdater publicWorldUpdater;
+  protected final WorldUpdater privateWorldUpdater;
 
   public DefaultMutablePrivateWorldStateUpdater(
       final WorldUpdater publicWorldUpdater, final WorldUpdater privateWorldUpdater) {
@@ -37,7 +40,7 @@ public DefaultMutablePrivateWorldStateUpdater(
 
   @Override
   public EvmAccount createAccount(final Address address, final long nonce, final Wei balance) {
-    return privateWorldUpdater.createAccount(address);
+    return privateWorldUpdater.createAccount(address, nonce, balance);
   }
 
   @Override
@@ -45,11 +48,6 @@ public EvmAccount createAccount(final Address address) {
     return privateWorldUpdater.createAccount(address);
   }
 
-  @Override
-  public EvmAccount getOrCreate(final Address address) {
-    return privateWorldUpdater.getOrCreate(address);
-  }
-
   @Override
   public EvmAccount getAccount(final Address address) {
     final EvmAccount privateAccount = privateWorldUpdater.getAccount(address);
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/DefaultMutableWorldState.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/DefaultMutableWorldState.java
index 217267754c2..e18931a4ef1 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/DefaultMutableWorldState.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/DefaultMutableWorldState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,22 +14,22 @@
  */
 package org.hyperledger.besu.ethereum.worldstate;
 
-import org.hyperledger.besu.ethereum.core.AbstractWorldUpdater;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.AccountState;
-import org.hyperledger.besu.ethereum.core.AccountStorageEntry;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.UpdateTrackingAccount;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldState;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPException;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
-import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie;
-import org.hyperledger.besu.ethereum.trie.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.account.AccountStorageEntry;
+import org.hyperledger.besu.evm.worldstate.AbstractWorldUpdater;
+import org.hyperledger.besu.evm.worldstate.UpdateTrackingAccount;
+import org.hyperledger.besu.evm.worldstate.WorldState;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -53,16 +53,15 @@ public class DefaultMutableWorldState implements MutableWorldState {
   private final WorldStateStorage worldStateStorage;
   private final WorldStatePreimageStorage preimageStorage;
 
-  private final MerklePatriciaTrie<Bytes32, Bytes> accountStateTrie;
-  private final Map<Address, MerklePatriciaTrie<Bytes32, Bytes>> updatedStorageTries =
-      new HashMap<>();
+  private final MerkleTrie<Bytes32, Bytes> accountStateTrie;
+  private final Map<Address, MerkleTrie<Bytes32, Bytes>> updatedStorageTries = new HashMap<>();
   private final Map<Address, Bytes> updatedAccountCode = new HashMap<>();
   private final Map<Bytes32, UInt256> newStorageKeyPreimages = new HashMap<>();
   private final Map<Bytes32, Address> newAccountKeyPreimages = new HashMap<>();
 
   public DefaultMutableWorldState(
       final WorldStateStorage storage, final WorldStatePreimageStorage preimageStorage) {
-    this(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH, storage, preimageStorage);
+    this(MerkleTrie.EMPTY_TRIE_NODE_HASH, storage, preimageStorage);
   }
 
   public DefaultMutableWorldState(
@@ -88,14 +87,17 @@ public DefaultMutableWorldState(final WorldState worldState) {
     this.accountStateTrie = newAccountStateTrie(other.accountStateTrie.getRootHash());
   }
 
-  private MerklePatriciaTrie<Bytes32, Bytes> newAccountStateTrie(final Bytes32 rootHash) {
+  private MerkleTrie<Bytes32, Bytes> newAccountStateTrie(final Bytes32 rootHash) {
     return new StoredMerklePatriciaTrie<>(
         worldStateStorage::getAccountStateTrieNode, rootHash, b -> b, b -> b);
   }
 
-  private MerklePatriciaTrie<Bytes32, Bytes> newAccountStorageTrie(final Bytes32 rootHash) {
+  private MerkleTrie<Bytes32, Bytes> newAccountStorageTrie(final Bytes32 rootHash) {
     return new StoredMerklePatriciaTrie<>(
-        worldStateStorage::getAccountStorageTrieNode, rootHash, b -> b, b -> b);
+        (location, hash) -> worldStateStorage.getAccountStorageTrieNode(null, location, hash),
+        rootHash,
+        b -> b,
+        b -> b);
   }
 
   @Override
@@ -104,8 +106,8 @@ public Hash rootHash() {
   }
 
   @Override
-  public MutableWorldState copy() {
-    return new DefaultMutableWorldState(rootHash(), worldStateStorage, preimageStorage);
+  public Hash frontierRootHash() {
+    return rootHash();
   }
 
   @Override
@@ -125,13 +127,9 @@ private WorldStateAccount deserializeAccount(
   }
 
   private static Bytes serializeAccount(
-      final long nonce,
-      final Wei balance,
-      final Hash storageRoot,
-      final Hash codeHash,
-      final int version) {
+      final long nonce, final Wei balance, final Hash storageRoot, final Hash codeHash) {
     final StateTrieAccountValue accountValue =
-        new StateTrieAccountValue(nonce, balance, storageRoot, codeHash, version);
+        new StateTrieAccountValue(nonce, balance, storageRoot, codeHash);
     return RLP.encode(accountValue::writeTo);
   }
 
@@ -146,7 +144,7 @@ public Stream<StreamableAccount> streamAccounts(final Bytes32 startKeyHash, fina
         .map(
             entry -> {
               final Optional<Address> address = getAccountTrieKeyPreimage(entry.getKey());
-              final AccountState account =
+              final WorldStateAccount account =
                   deserializeAccount(
                       address.orElse(Address.ZERO), Hash.wrap(entry.getKey()), entry.getValue());
               return new StreamableAccount(address, account);
@@ -169,15 +167,17 @@ public final boolean equals(final Object other) {
   }
 
   @Override
-  public void persist(final Hash blockhash) {
+  public void persist(final BlockHeader blockHeader) {
     final WorldStateStorage.Updater stateUpdater = worldStateStorage.updater();
     // Store updated code
     for (final Bytes code : updatedAccountCode.values()) {
-      stateUpdater.putCode(code);
+      stateUpdater.putCode(null, code);
     }
     // Commit account storage tries
-    for (final MerklePatriciaTrie<Bytes32, Bytes> updatedStorage : updatedStorageTries.values()) {
-      updatedStorage.commit(stateUpdater::putAccountStorageTrieNode);
+    for (final MerkleTrie<Bytes32, Bytes> updatedStorage : updatedStorageTries.values()) {
+      updatedStorage.commit(
+          (location, hash, value) ->
+              stateUpdater.putAccountStorageTrieNode(null, location, hash, value));
     }
     // Commit account updates
     accountStateTrie.commit(stateUpdater::putAccountStateTrieNode);
@@ -214,7 +214,7 @@ private Optional<Address> getAccountTrieKeyPreimage(final Bytes32 trieKey) {
         .or(() -> preimageStorage.getAccountTrieKeyPreimage(trieKey));
   }
   // An immutable class that represents an individual account as stored in
-  // in the world state's underlying merkle patricia trie.
+  // the world state's underlying merkle patricia trie.
   protected class WorldStateAccount implements Account {
 
     private final Address address;
@@ -223,7 +223,7 @@ protected class WorldStateAccount implements Account {
     final StateTrieAccountValue accountValue;
 
     // Lazily initialized since we don't always access storage.
-    private volatile MerklePatriciaTrie<Bytes32, Bytes> storageTrie;
+    private volatile MerkleTrie<Bytes32, Bytes> storageTrie;
 
     private WorldStateAccount(
         final Address address, final Hash addressHash, final StateTrieAccountValue accountValue) {
@@ -233,8 +233,8 @@ private WorldStateAccount(
       this.accountValue = accountValue;
     }
 
-    private MerklePatriciaTrie<Bytes32, Bytes> storageTrie() {
-      final MerklePatriciaTrie<Bytes32, Bytes> updatedTrie = updatedStorageTries.get(address);
+    private MerkleTrie<Bytes32, Bytes> storageTrie() {
+      final MerkleTrie<Bytes32, Bytes> updatedTrie = updatedStorageTries.get(address);
       if (updatedTrie != null) {
         storageTrie = updatedTrie;
       }
@@ -279,7 +279,7 @@ public Bytes getCode() {
       if (codeHash.equals(Hash.EMPTY)) {
         return Bytes.EMPTY;
       }
-      return worldStateStorage.getCode(codeHash).orElse(Bytes.EMPTY);
+      return worldStateStorage.getCode(codeHash, null).orElse(Bytes.EMPTY);
     }
 
     @Override
@@ -292,18 +292,12 @@ public Hash getCodeHash() {
       return accountValue.getCodeHash();
     }
 
-    @Override
-    public int getVersion() {
-      return accountValue.getVersion();
-    }
-
     @Override
     public UInt256 getStorageValue(final UInt256 key) {
-      final Optional<Bytes> val = storageTrie().get(Hash.hash(key.toBytes()));
-      if (val.isEmpty()) {
-        return UInt256.ZERO;
-      }
-      return convertToUInt256(val.get());
+      return storageTrie()
+          .get(Hash.hash(key))
+          .map(DefaultMutableWorldState::convertToUInt256)
+          .orElse(UInt256.ZERO);
     }
 
     @Override
@@ -336,7 +330,6 @@ public String toString() {
       builder.append("balance=").append(getBalance()).append(", ");
       builder.append("storageRoot=").append(getStorageRoot()).append(", ");
       builder.append("codeHash=").append(getCodeHash()).append(", ");
-      builder.append("version=").append(getVersion());
       return builder.append("}").toString();
     }
   }
@@ -404,7 +397,7 @@ public void commit() {
         final Map<UInt256, UInt256> updatedStorage = updated.getUpdatedStorage();
         if (!updatedStorage.isEmpty()) {
           // Apply any storage updates
-          final MerklePatriciaTrie<Bytes32, Bytes> storageTrie =
+          final MerkleTrie<Bytes32, Bytes> storageTrie =
               freshState
                   ? wrapped.newAccountStorageTrie(Hash.EMPTY_TRIE_HASH)
                   : origin.storageTrie();
@@ -417,7 +410,7 @@ public void commit() {
 
           for (final Map.Entry<UInt256, UInt256> entry : entries) {
             final UInt256 value = entry.getValue();
-            final Hash keyHash = Hash.hash(entry.getKey().toBytes());
+            final Hash keyHash = Hash.hash(entry.getKey());
             if (value.isZero()) {
               storageTrie.remove(keyHash);
             } else {
@@ -433,12 +426,7 @@ public void commit() {
         wrapped.newAccountKeyPreimages.put(updated.getAddressHash(), updated.getAddress());
         // Lastly, save the new account.
         final Bytes account =
-            serializeAccount(
-                updated.getNonce(),
-                updated.getBalance(),
-                storageRoot,
-                codeHash,
-                updated.getVersion());
+            serializeAccount(updated.getNonce(), updated.getBalance(), storageRoot, codeHash);
 
         wrapped.accountStateTrie.put(updated.getAddressHash(), account);
       }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/DefaultWorldStateArchive.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/DefaultWorldStateArchive.java
index 7bbb25efdae..b530828db30 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/DefaultWorldStateArchive.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/DefaultWorldStateArchive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -15,13 +15,14 @@
  */
 package org.hyperledger.besu.ethereum.worldstate;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.WorldState;
 import org.hyperledger.besu.ethereum.proof.WorldStateProof;
 import org.hyperledger.besu.ethereum.proof.WorldStateProofProvider;
-import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.evm.worldstate.WorldState;
 
 import java.util.List;
 import java.util.Optional;
@@ -34,7 +35,7 @@ public class DefaultWorldStateArchive implements WorldStateArchive {
   private final WorldStatePreimageStorage preimageStorage;
   private final WorldStateProofProvider worldStateProof;
 
-  private static final Hash EMPTY_ROOT_HASH = Hash.wrap(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH);
+  private static final Hash EMPTY_ROOT_HASH = Hash.wrap(MerkleTrie.EMPTY_TRIE_NODE_HASH);
 
   public DefaultWorldStateArchive(
       final WorldStateStorage worldStateStorage, final WorldStatePreimageStorage preimageStorage) {
@@ -44,18 +45,24 @@ public DefaultWorldStateArchive(
   }
 
   @Override
-  public Optional<WorldState> get(final Hash rootHash) {
-    return getMutable(rootHash).map(state -> state);
+  public Optional<WorldState> get(final Hash rootHash, final Hash blockHash) {
+    return getMutable(rootHash, blockHash).map(state -> state);
   }
 
   @Override
-  public boolean isWorldStateAvailable(final Hash rootHash) {
-    return worldStateStorage.isWorldStateAvailable(rootHash);
+  public boolean isWorldStateAvailable(final Hash rootHash, final Hash blockHash) {
+    return worldStateStorage.isWorldStateAvailable(rootHash, blockHash);
   }
 
   @Override
-  public Optional<MutableWorldState> getMutable(final Hash rootHash) {
-    if (!worldStateStorage.isWorldStateAvailable(rootHash)) {
+  public Optional<MutableWorldState> getMutable(
+      final BlockHeader blockHeader, final boolean isPersistingState) {
+    return getMutable(blockHeader.getStateRoot(), blockHeader.getHash());
+  }
+
+  @Override
+  public Optional<MutableWorldState> getMutable(final Hash rootHash, final Hash blockHash) {
+    if (!worldStateStorage.isWorldStateAvailable(rootHash, blockHash)) {
       return Optional.empty();
     }
     return Optional.of(new DefaultMutableWorldState(rootHash, worldStateStorage, preimageStorage));
@@ -63,7 +70,12 @@ public Optional<MutableWorldState> getMutable(final Hash rootHash) {
 
   @Override
   public MutableWorldState getMutable() {
-    return getMutable(EMPTY_ROOT_HASH).get();
+    return getMutable(EMPTY_ROOT_HASH, null).get();
+  }
+
+  @Override
+  public void resetArchiveStateTo(final BlockHeader blockHeader) {
+    // ignore for forest
   }
 
   @Override
@@ -83,4 +95,9 @@ public Optional<WorldStateProof> getAccountProof(
       final List<UInt256> accountStorageKeys) {
     return worldStateProof.getAccountProof(worldStateRoot, accountAddress, accountStorageKeys);
   }
+
+  @Override
+  public void close() {
+    // no op
+  }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/FlatDbMode.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/FlatDbMode.java
new file mode 100644
index 00000000000..89be8acf229
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/FlatDbMode.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.worldstate;
+
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/**
+ * The FlatDbMode enum represents the different modes of the flat database. It has two modes:
+ * PARTIAL and FULL.
+ *
+ * <p>- PARTIAL: Not all the leaves are present inside the flat database. The trie serves as a
+ * fallback to retrieve missing data. The PARTIAL mode is primarily used for backward compatibility
+ * purposes, where the flat database may not have all the required data, and the trie is utilized to
+ * fill in the gaps.
+ *
+ * <p>- FULL: The flat database contains the complete representation of the world state, and there
+ * is no need for a fallback mechanism. The FULL mode represents a fully synchronized state where
+ * the flat database encompasses all the necessary data.
+ */
+public enum FlatDbMode {
+  NO_FLATTENED(Bytes.EMPTY),
+  PARTIAL(Bytes.of(0x00)),
+  FULL(Bytes.of(0x01));
+
+  final Bytes version;
+
+  FlatDbMode(final Bytes version) {
+    this.version = version;
+  }
+
+  public Bytes getVersion() {
+    return version;
+  }
+
+  public static FlatDbMode fromVersion(final Bytes version) {
+    return Stream.of(FlatDbMode.values())
+        .filter(mode -> mode.getVersion().equals(version))
+        .findFirst()
+        .orElseThrow(
+            () -> new IllegalArgumentException("Unknown flat DB mode version: " + version));
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/MarkSweepPruner.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/MarkSweepPruner.java
index e0ce5bb0594..136e8b01445 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/MarkSweepPruner.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/MarkSweepPruner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,11 +14,12 @@
  */
 package org.hyperledger.besu.ethereum.worldstate;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.rlp.RLP;
-import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie;
-import org.hyperledger.besu.ethereum.trie.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
 import org.hyperledger.besu.metrics.BesuMetricCategory;
 import org.hyperledger.besu.metrics.ObservableMetricsSystem;
 import org.hyperledger.besu.plugin.services.metrics.Counter;
@@ -41,14 +42,14 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Stopwatch;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MarkSweepPruner {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(MarkSweepPruner.class);
   private static final byte[] IN_USE = Bytes.of(1).toArrayUnsafe();
 
   private static final int DEFAULT_OPS_PER_TRANSACTION = 10_000;
@@ -195,15 +196,14 @@ public void sweepBefore(final long markedBlockNumber) {
     long prunedNodeCount = 0;
     WorldStateStorage.Updater updater = worldStateStorage.updater();
     for (long blockNumber = markedBlockNumber - 1; blockNumber >= 0; blockNumber--) {
-      final Hash candidateStateRootHash =
-          blockchain.getBlockHeader(blockNumber).get().getStateRoot();
-
-      if (!worldStateStorage.isWorldStateAvailable(candidateStateRootHash)) {
+      final BlockHeader blockHeader = blockchain.getBlockHeader(blockNumber).get();
+      final Hash candidateStateRootHash = blockHeader.getStateRoot();
+      if (!worldStateStorage.isWorldStateAvailable(candidateStateRootHash, null)) {
         break;
       }
 
       if (!isMarked(candidateStateRootHash)) {
-        updater.removeAccountStateTrieNode(candidateStateRootHash);
+        updater.removeAccountStateTrieNode(null, candidateStateRootHash);
         prunedNodeCount++;
         if (prunedNodeCount % operationsPerTransaction == 0) {
           updater.commit();
@@ -211,6 +211,7 @@ public void sweepBefore(final long markedBlockNumber) {
         }
       }
     }
+
     updater.commit();
     // Sweep non-state-root nodes
     prunedNodeCount += worldStateStorage.prune(this::isMarked);
@@ -237,7 +238,7 @@ private boolean isMarked(final byte[] key) {
     return pendingMarks.contains(Bytes32.wrap(key)) || markStorage.containsKey(key);
   }
 
-  private MerklePatriciaTrie<Bytes32, Bytes> createStateTrie(final Bytes32 rootHash) {
+  private MerkleTrie<Bytes32, Bytes> createStateTrie(final Bytes32 rootHash) {
     return new StoredMerklePatriciaTrie<>(
         worldStateStorage::getAccountStateTrieNode,
         rootHash,
@@ -245,9 +246,9 @@ private MerklePatriciaTrie<Bytes32, Bytes> createStateTrie(final Bytes32 rootHas
         Function.identity());
   }
 
-  private MerklePatriciaTrie<Bytes32, Bytes> createStorageTrie(final Bytes32 rootHash) {
+  private MerkleTrie<Bytes32, Bytes> createStorageTrie(final Bytes32 rootHash) {
     return new StoredMerklePatriciaTrie<>(
-        worldStateStorage::getAccountStorageTrieNode,
+        (location, hash) -> worldStateStorage.getAccountStorageTrieNode(null, location, hash),
         rootHash,
         Function.identity(),
         Function.identity());
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/PeerTrieNodeFinder.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/PeerTrieNodeFinder.java
new file mode 100644
index 00000000000..549157860bd
--- /dev/null
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/PeerTrieNodeFinder.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.worldstate;
+
+import org.hyperledger.besu.datatypes.Hash;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+public interface PeerTrieNodeFinder {
+
+  Optional<Bytes> getAccountStateTrieNode(final Bytes location, final Bytes32 nodeHash);
+
+  Optional<Bytes> getAccountStorageTrieNode(Hash accountHash, Bytes location, Bytes32 nodeHash);
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/Pruner.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/Pruner.java
index 75179d600bd..04949b55e12 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/Pruner.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/Pruner.java
@@ -16,10 +16,10 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.trie.MerkleTrieException;
 
 import java.util.concurrent.ExecutorService;
@@ -30,12 +30,12 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Pruner {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(Pruner.class);
 
   private final MarkSweepPruner pruningStrategy;
   private final Blockchain blockchain;
@@ -165,13 +165,13 @@ private void execute(final Runnable action) {
     try {
       executorService.execute(action);
     } catch (final MerkleTrieException mte) {
-      LOG.fatal(
+      LOG.error(
           "An unrecoverable error occurred while pruning. The database directory must be deleted and resynced.",
           mte);
       System.exit(1);
     } catch (final Exception e) {
       LOG.error(
-          "An unexpected error ocurred in the {} pruning phase: {}. Reattempting.",
+          "An unexpected error occurred in the {} pruning phase: {}. Reattempting.",
           getPruningPhase(),
           e.getMessage());
       pruningStrategy.clearMarks();
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/StateTrieAccountValue.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/StateTrieAccountValue.java
index dd3a99432f1..40c420f7518 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/StateTrieAccountValue.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/StateTrieAccountValue.java
@@ -16,29 +16,26 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.datatypes.AccountValue;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
 
 import java.util.Objects;
 
+import org.apache.tuweni.bytes.Bytes32;
+
 /** Represents the raw values associated with an account in the world state trie. */
-public class StateTrieAccountValue {
+public class StateTrieAccountValue implements AccountValue {
 
-  private final long nonce;
-  private final Wei balance;
-  private final Hash storageRoot;
-  private final Hash codeHash;
-  private final int version;
+  protected final long nonce;
+  protected final Wei balance;
+  protected final Hash storageRoot;
+  protected final Hash codeHash;
 
   public StateTrieAccountValue(
-      final long nonce,
-      final Wei balance,
-      final Hash storageRoot,
-      final Hash codeHash,
-      final int version) {
+      final long nonce, final Wei balance, final Hash storageRoot, final Hash codeHash) {
     checkNotNull(balance, "balance cannot be null");
     checkNotNull(storageRoot, "storageRoot cannot be null");
     checkNotNull(codeHash, "codeHash cannot be null");
@@ -46,7 +43,6 @@ public StateTrieAccountValue(
     this.balance = balance;
     this.storageRoot = storageRoot;
     this.codeHash = codeHash;
-    this.version = version;
   }
 
   /**
@@ -54,6 +50,7 @@ public StateTrieAccountValue(
    *
    * @return the account nonce.
    */
+  @Override
   public long getNonce() {
     return nonce;
   }
@@ -63,6 +60,7 @@ public long getNonce() {
    *
    * @return the balance, in Wei, of the account.
    */
+  @Override
   public Wei getBalance() {
     return balance;
   }
@@ -72,6 +70,7 @@ public Wei getBalance() {
    *
    * @return the hash of the root node of the storage trie.
    */
+  @Override
   public Hash getStorageRoot() {
     return storageRoot;
   }
@@ -81,26 +80,17 @@ public Hash getStorageRoot() {
    *
    * @return the hash of the account code (which may be {@link Hash#EMPTY}).
    */
+  @Override
   public Hash getCodeHash() {
     return codeHash;
   }
 
-  /**
-   * The version of the EVM bytecode associated with this account.
-   *
-   * @return the version of the account code.
-   */
-  public int getVersion() {
-    return version;
-  }
-
   @Override
   public boolean equals(final Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
     final StateTrieAccountValue that = (StateTrieAccountValue) o;
     return nonce == that.nonce
-        && version == that.version
         && balance.equals(that.balance)
         && storageRoot.equals(that.storageRoot)
         && codeHash.equals(that.codeHash);
@@ -108,9 +98,10 @@ public boolean equals(final Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(nonce, balance, storageRoot, codeHash, version);
+    return Objects.hash(nonce, balance, storageRoot, codeHash);
   }
 
+  @Override
   public void writeTo(final RLPOutput out) {
     out.startList();
 
@@ -119,11 +110,6 @@ public void writeTo(final RLPOutput out) {
     out.writeBytes(storageRoot);
     out.writeBytes(codeHash);
 
-    if (version != Account.DEFAULT_VERSION) {
-      // version of zero is never written out.
-      out.writeIntScalar(version);
-    }
-
     out.endList();
   }
 
@@ -132,17 +118,23 @@ public static StateTrieAccountValue readFrom(final RLPInput in) {
 
     final long nonce = in.readLongScalar();
     final Wei balance = Wei.of(in.readUInt256Scalar());
-    final Hash storageRoot = Hash.wrap(in.readBytes32());
-    final Hash codeHash = Hash.wrap(in.readBytes32());
-    final int version;
-    if (!in.isEndOfCurrentList()) {
-      version = in.readIntScalar();
+    Bytes32 storageRoot;
+    Bytes32 codeHash;
+    if (in.nextIsNull()) {
+      storageRoot = Hash.EMPTY_TRIE_HASH;
+      in.skipNext();
+    } else {
+      storageRoot = in.readBytes32();
+    }
+    if (in.nextIsNull()) {
+      codeHash = Hash.EMPTY;
+      in.skipNext();
     } else {
-      version = Account.DEFAULT_VERSION;
+      codeHash = in.readBytes32();
     }
 
     in.leaveList();
 
-    return new StateTrieAccountValue(nonce, balance, storageRoot, codeHash, version);
+    return new StateTrieAccountValue(nonce, balance, Hash.wrap(storageRoot), Hash.wrap(codeHash));
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/WorldStateArchive.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/WorldStateArchive.java
index 1e28a9c08f7..c363655bd29 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/WorldStateArchive.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/WorldStateArchive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,34 +14,43 @@
  */
 package org.hyperledger.besu.ethereum.worldstate;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.WorldState;
 import org.hyperledger.besu.ethereum.proof.WorldStateProof;
-import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.evm.worldstate.WorldState;
 
+import java.io.Closeable;
 import java.util.List;
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.units.bigints.UInt256;
 
-public interface WorldStateArchive {
-  Hash EMPTY_ROOT_HASH = Hash.wrap(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH);
+public interface WorldStateArchive extends Closeable {
+  Hash EMPTY_ROOT_HASH = Hash.wrap(MerkleTrie.EMPTY_TRIE_NODE_HASH);
 
-  Optional<WorldState> get(final Hash rootHash);
+  Optional<WorldState> get(Hash rootHash, Hash blockHash);
 
-  boolean isWorldStateAvailable(final Hash rootHash);
+  boolean isWorldStateAvailable(Hash rootHash, Hash blockHash);
 
-  Optional<MutableWorldState> getMutable(final Hash rootHash);
+  Optional<MutableWorldState> getMutable(BlockHeader blockHeader, boolean isPersistingState);
+
+  Optional<MutableWorldState> getMutable(Hash rootHash, Hash blockHash);
 
   MutableWorldState getMutable();
 
-  Optional<Bytes> getNodeData(final Hash hash);
+  /**
+   * Resetting the archive cache and adding the new pivot as the only entry
+   *
+   * @param blockHeader new pivot block header
+   */
+  void resetArchiveStateTo(BlockHeader blockHeader);
+
+  Optional<Bytes> getNodeData(Hash hash);
 
   Optional<WorldStateProof> getAccountProof(
-      final Hash worldStateRoot,
-      final Address accountAddress,
-      final List<UInt256> accountStorageKeys);
+      Hash worldStateRoot, Address accountAddress, List<UInt256> accountStorageKeys);
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/WorldStatePreimageStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/WorldStatePreimageStorage.java
index 3d9196a48f3..fe8e1ac2ac5 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/WorldStatePreimageStorage.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/WorldStatePreimageStorage.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.worldstate;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 
 import java.util.Optional;
 
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/WorldStateStorage.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/WorldStateStorage.java
index 3efec2fe13d..87527ed75b5 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/WorldStateStorage.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/worldstate/WorldStateStorage.java
@@ -14,9 +14,11 @@
  */
 package org.hyperledger.besu.ethereum.worldstate;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
 import java.util.Optional;
 import java.util.function.Predicate;
 
@@ -25,21 +27,58 @@
 
 public interface WorldStateStorage {
 
-  Optional<Bytes> getCode(Bytes32 codeHash);
+  Optional<Bytes> getCode(Bytes32 codeHash, Hash accountHash);
 
   Optional<Bytes> getAccountStateTrieNode(Bytes location, Bytes32 nodeHash);
 
-  Optional<Bytes> getAccountStorageTrieNode(Bytes location, Bytes32 nodeHash);
+  Optional<Bytes> getAccountStorageTrieNode(Hash accountHash, Bytes location, Bytes32 nodeHash);
 
   Optional<Bytes> getNodeData(Bytes location, Bytes32 hash);
 
-  boolean isWorldStateAvailable(Bytes32 rootHash);
+  FlatDbMode getFlatDbMode();
+
+  boolean isWorldStateAvailable(Bytes32 rootHash, Hash blockHash);
 
   default boolean contains(final Bytes32 hash) {
     // we don't have location info
     return getNodeData(null, hash).isPresent();
   }
 
+  /**
+   * Streams flat accounts within a specified range.
+   *
+   * @param startKeyHash The start key hash of the range.
+   * @param endKeyHash The end key hash of the range.
+   * @param max The maximum number of entries to stream.
+   * @return A map of flat accounts. (Empty map in this default implementation)
+   */
+  default Map<Bytes32, Bytes> streamFlatAccounts(
+      final Bytes startKeyHash, final Bytes32 endKeyHash, final long max) {
+    return Collections.emptyMap();
+  }
+
+  /**
+   * Streams flat storages within a specified range.
+   *
+   * @param accountHash The account hash.
+   * @param startKeyHash The start key hash of the range.
+   * @param endKeyHash The end key hash of the range.
+   * @param max The maximum number of entries to stream.
+   * @return A map of flat storages. (Empty map in this default implementation)
+   */
+  default Map<Bytes32, Bytes> streamFlatStorages(
+      final Hash accountHash, final Bytes startKeyHash, final Bytes32 endKeyHash, final long max) {
+    return Collections.emptyMap();
+  }
+
+  DataStorageFormat getDataStorageFormat();
+
+  void clear();
+
+  void clearTrieLog();
+
+  void clearFlatDatabase();
+
   Updater updater();
 
   long prune(Predicate<byte[]> inUseCheck);
@@ -50,19 +89,22 @@ default boolean contains(final Bytes32 hash) {
 
   interface Updater {
 
-    Updater removeAccountStateTrieNode(Bytes32 nodeHash);
+    Updater putCode(Hash accountHash, Bytes32 nodeHash, Bytes code);
 
-    Updater putCode(Bytes32 nodeHash, Bytes code);
-
-    default Updater putCode(final Bytes code) {
+    default Updater putCode(final Hash accountHash, final Bytes code) {
       // Skip the hash calculation for empty code
       final Hash codeHash = code.size() == 0 ? Hash.EMPTY : Hash.hash(code);
-      return putCode(codeHash, code);
+      return putCode(accountHash, codeHash, code);
     }
 
+    Updater saveWorldState(Bytes blockHash, Bytes32 nodeHash, Bytes node);
+
     Updater putAccountStateTrieNode(Bytes location, Bytes32 nodeHash, Bytes node);
 
-    Updater putAccountStorageTrieNode(Bytes location, Bytes32 nodeHash, Bytes node);
+    Updater removeAccountStateTrieNode(Bytes location, Bytes32 nodeHash);
+
+    Updater putAccountStorageTrieNode(
+        Hash accountHash, Bytes location, Bytes32 nodeHash, Bytes node);
 
     void commit();
 
diff --git a/ethereum/core/src/main/resources/infura.json b/ethereum/core/src/main/resources/infura.json
index 1775579f290..90174cb0166 100644
--- a/ethereum/core/src/main/resources/infura.json
+++ b/ethereum/core/src/main/resources/infura.json
@@ -3,9 +3,7 @@
     "chainId": 1337,
     "homesteadBlock":0,
     "eip150Block":0,
-    "eip155Block":10,
-    "eip158Block":10,
-    "eip160Block":10
+    "eip158Block":10
   },
   "nonce": "0x0000000000000042",
   "alloc": {
diff --git a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/AddressHelpers.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/AddressHelpers.java
index cba006f3cdd..2bb725ee503 100644
--- a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/AddressHelpers.java
+++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/AddressHelpers.java
@@ -14,6 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.core;
 
+import org.hyperledger.besu.datatypes.Address;
+
 import java.math.BigInteger;
 
 public class AddressHelpers {
diff --git a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockDataGenerator.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockDataGenerator.java
index 98b10004c25..000d2e45e4c 100644
--- a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockDataGenerator.java
+++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockDataGenerator.java
@@ -15,13 +15,27 @@
 package org.hyperledger.besu.ethereum.core;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static java.util.stream.Collectors.toSet;
+import static java.util.stream.Collectors.toUnmodifiableList;
+import static java.util.stream.Collectors.toUnmodifiableSet;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
 
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.KeyPair;
 import org.hyperledger.besu.crypto.SecureRandomProvider;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.mainnet.BodyValidation;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.AccessListEntry;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.log.LogTopic;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 import org.hyperledger.besu.plugin.data.TransactionType;
 
 import java.math.BigInteger;
@@ -36,16 +50,16 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.OptionalLong;
 import java.util.Random;
 import java.util.Set;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
-import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import com.google.common.base.Supplier;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.units.bigints.UInt256;
@@ -61,6 +75,7 @@ public class BlockDataGenerator {
 
   private final Random random;
   private final KeyPairGenerator keyPairGenerator;
+  private final SignatureAlgorithm signatureAlgorithm = SignatureAlgorithmFactory.getInstance();
   private Supplier<BlockOptions> blockOptionsSupplier = BlockOptions::create;
 
   public BlockDataGenerator(final int seed) {
@@ -77,21 +92,24 @@ public void setBlockOptionsSupplier(final Supplier<BlockOptions> blockOptionsSup
   }
 
   private KeyPairGenerator createKeyPairGenerator(final long seed) {
-    final KeyPairGenerator keyPairGenerator;
+    final KeyPairGenerator localKeyPairGenerator;
     try {
-      keyPairGenerator = KeyPairGenerator.getInstance(SECP256K1.ALGORITHM, SECP256K1.PROVIDER);
+      localKeyPairGenerator =
+          KeyPairGenerator.getInstance(
+              SignatureAlgorithm.ALGORITHM, signatureAlgorithm.getProvider());
     } catch (final Exception e) {
       throw new RuntimeException(e);
     }
-    final ECGenParameterSpec ecGenParameterSpec = new ECGenParameterSpec(SECP256K1.CURVE_NAME);
+    final ECGenParameterSpec ecGenParameterSpec =
+        new ECGenParameterSpec(signatureAlgorithm.getCurveName());
     try {
       final SecureRandom secureRandom = SecureRandomProvider.createSecureRandom();
       secureRandom.setSeed(seed);
-      keyPairGenerator.initialize(ecGenParameterSpec, secureRandom);
+      localKeyPairGenerator.initialize(ecGenParameterSpec, secureRandom);
     } catch (final InvalidAlgorithmParameterException e) {
       throw new RuntimeException(e);
     }
-    return keyPairGenerator;
+    return localKeyPairGenerator;
   }
 
   /**
@@ -159,23 +177,22 @@ private List<Account> createRandomAccounts(
       final int count,
       final float percentContractAccounts,
       final float percentContractAccountsWithNonEmptyStorage) {
-    WorldUpdater updater = worldState.updater();
-    List<Account> accounts = new ArrayList<>(count);
+    final WorldUpdater updater = worldState.updater();
+    final List<Account> accounts = new ArrayList<>(count);
     for (int i = 0; i < count; i++) {
-      MutableAccount account = updater.getOrCreate(address()).getMutable();
+      final MutableAccount account = updater.getOrCreate(address()).getMutable();
       if (random.nextFloat() < percentContractAccounts) {
         // Some percentage of accounts are contract accounts
         account.setCode(bytesValue(5, 50));
-        account.setVersion(Account.DEFAULT_VERSION);
         if (random.nextFloat() < percentContractAccountsWithNonEmptyStorage) {
           // Add some storage for contract accounts
-          int storageValues = random.nextInt(20) + 10;
+          final int storageValues = random.nextInt(20) + 10;
           for (int j = 0; j < storageValues; j++) {
             account.setStorageValue(uint256(), uint256());
           }
         }
       }
-      account.setNonce(random.nextInt(10));
+      account.setNonce(random.nextLong());
       account.setBalance(Wei.of(positiveLong()));
 
       accounts.add(account);
@@ -186,14 +203,14 @@ private List<Account> createRandomAccounts(
   }
 
   public List<Block> blockSequence(final int count) {
-    final WorldStateArchive worldState = InMemoryStorageProvider.createInMemoryWorldStateArchive();
+    final WorldStateArchive worldState = createInMemoryWorldStateArchive();
     return blockSequence(count, worldState, Collections.emptyList(), Collections.emptyList());
   }
 
   public List<Block> blockSequence(final Block previousBlock, final int count) {
-    final WorldStateArchive worldState = InMemoryStorageProvider.createInMemoryWorldStateArchive();
-    Hash parentHash = previousBlock.getHeader().getHash();
-    long blockNumber = previousBlock.getHeader().getNumber() + 1;
+    final WorldStateArchive worldState = createInMemoryWorldStateArchive();
+    final Hash parentHash = previousBlock.getHeader().getHash();
+    final long blockNumber = previousBlock.getHeader().getNumber() + 1;
     return blockSequence(
         count,
         blockNumber,
@@ -266,28 +283,32 @@ public BlockHeader header(final long number, final BlockBody body, final BlockOp
     final int gasLimit = random.nextInt() & Integer.MAX_VALUE;
     final int gasUsed = Math.max(0, gasLimit - 1);
     final long blockNonce = random.nextLong();
-
-    return BlockHeaderBuilder.create()
-        .parentHash(options.getParentHash(hash()))
-        .ommersHash(BodyValidation.ommersHash(body.getOmmers()))
-        .coinbase(address())
-        .stateRoot(options.getStateRoot(hash()))
-        .transactionsRoot(BodyValidation.transactionsRoot(body.getTransactions()))
-        .receiptsRoot(options.getReceiptsRoot(hash()))
-        .logsBloom(options.getLogsBloom(logsBloom()))
-        .difficulty(options.getDifficulty(Difficulty.of(uint256(4))))
-        .number(number)
-        .gasLimit(gasLimit)
-        .gasUsed(options.getGasUsed(gasUsed))
-        .timestamp(
-            options
-                .getTimestamp()
-                .orElse(Instant.now().truncatedTo(ChronoUnit.SECONDS).getEpochSecond()))
-        .extraData(options.getExtraData(bytes32()))
-        .mixHash(hash())
-        .nonce(blockNonce)
-        .blockHeaderFunctions(options.getBlockHeaderFunctions(new MainnetBlockHeaderFunctions()))
-        .buildBlockHeader();
+    final BlockHeaderBuilder blockHeaderBuilder =
+        BlockHeaderBuilder.create()
+            .parentHash(options.getParentHash(hash()))
+            .ommersHash(BodyValidation.ommersHash(body.getOmmers()))
+            .coinbase(options.getCoinbase(address()))
+            .stateRoot(options.getStateRoot(hash()))
+            .transactionsRoot(BodyValidation.transactionsRoot(body.getTransactions()))
+            .receiptsRoot(options.getReceiptsRoot(hash()))
+            .logsBloom(options.getLogsBloom(logsBloom()))
+            .difficulty(options.getDifficulty(Difficulty.of(uint256(4))))
+            .number(number)
+            .gasLimit(gasLimit)
+            .gasUsed(options.getGasUsed(gasUsed))
+            .timestamp(
+                options
+                    .getTimestamp()
+                    .orElse(Instant.now().truncatedTo(ChronoUnit.SECONDS).getEpochSecond()))
+            .extraData(options.getExtraData(bytes32()))
+            .mixHash(hash())
+            .nonce(blockNonce)
+            .withdrawalsRoot(options.getWithdrawalsRoot(null))
+            .depositsRoot(options.getDepositsRoot(null))
+            .blockHeaderFunctions(
+                options.getBlockHeaderFunctions(new MainnetBlockHeaderFunctions()));
+    options.getBaseFee(Optional.of(Wei.of(uint256(2)))).ifPresent(blockHeaderBuilder::baseFee);
+    return blockHeaderBuilder.buildBlockHeader();
   }
 
   public BlockBody body() {
@@ -304,31 +325,132 @@ public BlockBody body(final BlockOptions options) {
     }
     final List<Transaction> defaultTxs = new ArrayList<>();
     if (options.hasTransactions()) {
-      defaultTxs.add(transaction());
-      defaultTxs.add(transaction());
+      defaultTxs.add(transaction(options.getTransactionTypes()));
+      defaultTxs.add(transaction(options.getTransactionTypes()));
     }
 
-    return new BlockBody(options.getTransactions(defaultTxs), ommers);
+    return new BlockBody(
+        options.getTransactions(defaultTxs),
+        ommers,
+        options.getWithdrawals(Optional.empty()),
+        options.getDeposits(Optional.empty()));
   }
 
   private BlockHeader ommer() {
     return header(positiveLong(), body(BlockOptions.create().hasOmmers(false)));
   }
 
+  private TransactionType transactionType() {
+    // TODO: when TransactionType.EIP4844 is fully supported, revert this.
+    return transactionType(
+        TransactionType.FRONTIER, TransactionType.ACCESS_LIST, TransactionType.EIP1559);
+  }
+
+  private TransactionType transactionType(final TransactionType... transactionTypes) {
+    return transactionTypes[random.nextInt(transactionTypes.length)];
+  }
+
   public Transaction transaction() {
-    return transaction(bytes32());
+    return transaction(transactionType());
+  }
+
+  public Transaction transaction(final TransactionType... transactionTypes) {
+    return transaction(transactionType(transactionTypes));
+  }
+
+  public Transaction transaction(final TransactionType transactionType) {
+    return transaction(transactionType, bytes32(), address());
   }
 
   public Transaction transaction(final Bytes payload) {
-    return transaction(payload, address());
+    return transaction(transactionType(), payload);
+  }
+
+  public Transaction transaction(final TransactionType transactionType, final Bytes payload) {
+    return transaction(transactionType, payload, address());
+  }
+
+  public Transaction transaction(
+      final TransactionType transactionType, final Bytes payload, final Address to) {
+    switch (transactionType) {
+      case FRONTIER:
+        return frontierTransaction(payload, to);
+      case EIP1559:
+        return eip1559Transaction(payload, to);
+      case ACCESS_LIST:
+        return accessListTransaction(payload, to);
+      case BLOB:
+        return blobTransaction(payload, to);
+      default:
+        throw new RuntimeException(
+            String.format(
+                "Developer Error. No random transaction generator defined for %s",
+                transactionType));
+    }
   }
 
-  public Transaction transaction(final Bytes payload, final Address to) {
+  private Transaction accessListTransaction(final Bytes payload, final Address to) {
+    return Transaction.builder()
+        .type(TransactionType.ACCESS_LIST)
+        .nonce(random.nextLong())
+        .gasPrice(Wei.wrap(bytesValue(4)))
+        .gasLimit(positiveLong())
+        .to(to)
+        .value(Wei.wrap(bytes32()))
+        .payload(payload)
+        .accessList(accessList())
+        .chainId(BigInteger.ONE)
+        .signAndBuild(generateKeyPair());
+  }
+
+  private List<AccessListEntry> accessList() {
+    final List<Address> accessedAddresses =
+        Stream.generate(this::address).limit(1L + random.nextInt(3)).collect(toUnmodifiableList());
+    final List<AccessListEntry> accessedStorage = new ArrayList<>();
+    for (int i = 0; i < accessedAddresses.size(); ++i) {
+      accessedStorage.add(
+          new AccessListEntry(
+              accessedAddresses.get(i),
+              Stream.generate(this::bytes32).limit(2L * i).collect(toUnmodifiableList())));
+    }
+    return accessedStorage;
+  }
+
+  private Transaction eip1559Transaction(final Bytes payload, final Address to) {
+    return Transaction.builder()
+        .type(TransactionType.EIP1559)
+        .nonce(random.nextLong())
+        .maxPriorityFeePerGas(Wei.wrap(bytesValue(4)))
+        .maxFeePerGas(Wei.wrap(bytesValue(4)))
+        .gasLimit(positiveLong())
+        .to(to)
+        .value(Wei.of(positiveLong()))
+        .payload(payload)
+        .chainId(BigInteger.ONE)
+        .signAndBuild(generateKeyPair());
+  }
+
+  private Transaction blobTransaction(final Bytes payload, final Address to) {
+    return Transaction.builder()
+        .type(TransactionType.BLOB)
+        .nonce(random.nextLong())
+        .maxPriorityFeePerGas(Wei.wrap(bytesValue(4)))
+        .maxFeePerGas(Wei.wrap(bytesValue(4)))
+        .gasLimit(positiveLong())
+        .to(to)
+        .value(Wei.of(positiveLong()))
+        .payload(payload)
+        .chainId(BigInteger.ONE)
+        .maxFeePerDataGas(Wei.of(1))
+        .versionedHashes(List.of(Hash.fromHexStringLenient("0x29")))
+        .signAndBuild(generateKeyPair());
+  }
+
+  private Transaction frontierTransaction(final Bytes payload, final Address to) {
     return Transaction.builder()
-        // TODO support more EIP-2718 types as they're added
         .type(TransactionType.FRONTIER)
-        .nonce(positiveLong())
-        .gasPrice(Wei.wrap(bytes32()))
+        .nonce(random.nextLong())
+        .gasPrice(Wei.wrap(bytesValue(4)))
         .gasLimit(positiveLong())
         .to(to)
         .value(Wei.wrap(bytes32()))
@@ -337,42 +459,58 @@ public Transaction transaction(final Bytes payload, final Address to) {
         .signAndBuild(generateKeyPair());
   }
 
+  public Set<Transaction> transactions(final int n, final TransactionType... transactionTypes) {
+    return Stream.generate(() -> transaction(transactionTypes))
+        .parallel()
+        .limit(n)
+        .collect(toUnmodifiableSet());
+  }
+
   public Set<Transaction> transactions(final int n) {
-    Wei gasPrice = Wei.wrap(bytes32());
-    long gasLimit = positiveLong();
-    Address to = address();
-    Wei value = Wei.wrap(bytes32());
-    int chainId = 1;
-    Bytes32 payload = bytes32();
-    final SECP256K1.Signature signature = SECP256K1.sign(payload, generateKeyPair());
-
-    final Set<Transaction> txs =
-        IntStream.range(0, n)
-            .parallel()
-            .mapToObj(
-                v ->
-                    new Transaction(
-                        v,
-                        gasPrice,
-                        gasLimit,
-                        Optional.of(to),
-                        value,
-                        signature,
-                        payload,
-                        to,
-                        Optional.of(BigInteger.valueOf(chainId))))
-            .collect(toSet());
-    return txs;
+    return transactions(
+        n,
+        new TransactionType[] {
+          TransactionType.FRONTIER, TransactionType.ACCESS_LIST, TransactionType.EIP1559
+        });
+  }
+
+  public Set<Transaction> transactionsWithAllTypes() {
+    return transactionsWithAllTypes(0);
+  }
+
+  public Set<Transaction> transactionsWithAllTypes(final int atLeast) {
+    checkArgument(atLeast >= 0);
+    final HashSet<TransactionType> remainingTransactionTypes =
+        new HashSet<>(
+            Set.of(
+                new TransactionType[] {
+                  TransactionType.FRONTIER, TransactionType.ACCESS_LIST, TransactionType.EIP1559
+                }));
+    final HashSet<Transaction> transactions = new HashSet<>();
+    while (transactions.size() < atLeast || !remainingTransactionTypes.isEmpty()) {
+      final Transaction newTransaction = transaction();
+      transactions.add(newTransaction);
+      remainingTransactionTypes.remove(newTransaction.getType());
+    }
+    return transactions;
   }
 
   public TransactionReceipt receipt(final long cumulativeGasUsed) {
     return new TransactionReceipt(
-        hash(), cumulativeGasUsed, Arrays.asList(log(), log()), Optional.empty());
+        transactionType(),
+        random.nextInt(2),
+        cumulativeGasUsed,
+        Arrays.asList(log(), log()),
+        Optional.empty());
   }
 
   public TransactionReceipt receipt(final Bytes revertReason) {
     return new TransactionReceipt(
-        hash(), positiveLong(), Arrays.asList(log(), log()), Optional.of(revertReason));
+        transactionType(),
+        random.nextInt(2),
+        positiveLong(),
+        Arrays.asList(log(), log()),
+        Optional.of(revertReason));
   }
 
   public TransactionReceipt receipt() {
@@ -380,7 +518,8 @@ public TransactionReceipt receipt() {
   }
 
   public TransactionReceipt receipt(final List<Log> logs) {
-    return new TransactionReceipt(hash(), positiveLong(), logs, Optional.empty());
+    return new TransactionReceipt(
+        transactionType(), random.nextInt(2), positiveLong(), logs, Optional.empty());
   }
 
   public UInt256 storageKey() {
@@ -417,7 +556,7 @@ private LogTopic logTopic() {
     return LogTopic.wrap(bytesValue(Bytes32.SIZE));
   }
 
-  private Bytes32 bytes32() {
+  public Bytes32 bytes32() {
     return Bytes32.wrap(bytes(Bytes32.SIZE));
   }
 
@@ -488,7 +627,7 @@ private byte[] bytes(final int size, final int zerofill) {
     return bytes;
   }
 
-  private SECP256K1.KeyPair generateKeyPair() {
+  public KeyPair generateKeyPair() {
     final java.security.KeyPair rawKeyPair = keyPairGenerator.generateKeyPair();
     final BCECPrivateKey privateKey = (BCECPrivateKey) rawKeyPair.getPrivate();
     final BCECPublicKey publicKey = (BCECPublicKey) rawKeyPair.getPublic();
@@ -502,8 +641,9 @@ private SECP256K1.KeyPair generateKeyPair() {
     final BigInteger publicKeyValue =
         new BigInteger(1, Arrays.copyOfRange(publicKeyBytes, 1, publicKeyBytes.length));
 
-    return new SECP256K1.KeyPair(
-        SECP256K1.PrivateKey.create(privateKeyValue), SECP256K1.PublicKey.create(publicKeyValue));
+    return new KeyPair(
+        signatureAlgorithm.createPrivateKey(privateKeyValue),
+        signatureAlgorithm.createPublicKey(publicKeyValue));
   }
 
   public static class BlockOptions {
@@ -513,6 +653,9 @@ public static class BlockOptions {
     private Optional<Difficulty> difficulty = Optional.empty();
     private final List<Transaction> transactions = new ArrayList<>();
     private final List<BlockHeader> ommers = new ArrayList<>();
+
+    private Optional<Optional<List<Withdrawal>>> withdrawals = Optional.empty();
+    private Optional<Optional<List<Deposit>>> deposits = Optional.empty();
     private Optional<Bytes> extraData = Optional.empty();
     private Optional<BlockHeaderFunctions> blockHeaderFunctions = Optional.empty();
     private Optional<Hash> receiptsRoot = Optional.empty();
@@ -521,6 +664,16 @@ public static class BlockOptions {
     private Optional<Long> timestamp = Optional.empty();
     private boolean hasOmmers = true;
     private boolean hasTransactions = true;
+    private TransactionType[] transactionTypes = {
+      TransactionType.FRONTIER, TransactionType.ACCESS_LIST, TransactionType.EIP1559
+    };
+    private Optional<Address> coinbase = Optional.empty();
+    private Optional<Optional<Wei>> maybeBaseFee = Optional.empty();
+
+    private Optional<Hash> withdrawalsRoot = Optional.empty();
+    private Optional<Hash> depositsRoot = Optional.empty();
+
+    private Optional<Optional<Wei>> maybeMaxFeePerDataGas = Optional.empty();
 
     public static BlockOptions create() {
       return new BlockOptions();
@@ -530,6 +683,10 @@ public List<Transaction> getTransactions(final List<Transaction> defaultValue) {
       return transactions.isEmpty() ? defaultValue : transactions;
     }
 
+    public TransactionType[] getTransactionTypes() {
+      return transactionTypes;
+    }
+
     public List<BlockHeader> getOmmers(final List<BlockHeader> defaultValue) {
       return ommers.isEmpty() ? defaultValue : ommers;
     }
@@ -574,6 +731,23 @@ public Optional<Long> getTimestamp() {
       return timestamp;
     }
 
+    public Hash getWithdrawalsRoot(final Hash defaultValue) {
+      return withdrawalsRoot.orElse(defaultValue);
+    }
+
+    public Optional<List<Withdrawal>> getWithdrawals(
+        final Optional<List<Withdrawal>> defaultValue) {
+      return withdrawals.orElse(defaultValue);
+    }
+
+    public Hash getDepositsRoot(final Hash defaultValue) {
+      return depositsRoot.orElse(defaultValue);
+    }
+
+    public Optional<List<Deposit>> getDeposits(final Optional<List<Deposit>> defaultValue) {
+      return deposits.orElse(defaultValue);
+    }
+
     public boolean hasTransactions() {
       return hasTransactions;
     }
@@ -596,6 +770,16 @@ public BlockOptions addTransaction(final Collection<Transaction> txs) {
       return addTransaction(txs.toArray(new Transaction[] {}));
     }
 
+    public BlockOptions setWithdrawals(final Optional<List<Withdrawal>> withdrawals) {
+      this.withdrawals = Optional.of(withdrawals);
+      return this;
+    }
+
+    public BlockOptions setDeposits(final Optional<List<Deposit>> deposits) {
+      this.deposits = Optional.of(deposits);
+      return this;
+    }
+
     public BlockOptions setBlockNumber(final long blockNumber) {
       this.blockNumber = OptionalLong.of(blockNumber);
       return this;
@@ -646,6 +830,11 @@ public BlockOptions hasTransactions(final boolean hasTransactions) {
       return this;
     }
 
+    public BlockOptions transactionTypes(final TransactionType... transactionTypes) {
+      this.transactionTypes = transactionTypes;
+      return this;
+    }
+
     public BlockOptions hasOmmers(final boolean hasOmmers) {
       this.hasOmmers = hasOmmers;
       return this;
@@ -655,5 +844,42 @@ public BlockOptions setTimestamp(final Long timestamp) {
       this.timestamp = Optional.of(timestamp);
       return this;
     }
+
+    public BlockOptions setCoinbase(final Address coinbase) {
+      this.coinbase = Optional.of(coinbase);
+      return this;
+    }
+
+    public Address getCoinbase(final Address defaultValue) {
+      return coinbase.orElse(defaultValue);
+    }
+
+    public Optional<Wei> getBaseFee(final Optional<Wei> defaultValue) {
+      return maybeBaseFee.orElse(defaultValue);
+    }
+
+    public BlockOptions setBaseFee(final Optional<Wei> baseFee) {
+      this.maybeBaseFee = Optional.of(baseFee);
+      return this;
+    }
+
+    public BlockOptions setWithdrawalsRoot(final Hash withdrawalsRoot) {
+      this.withdrawalsRoot = Optional.of(withdrawalsRoot);
+      return this;
+    }
+
+    public BlockOptions setDepositsRoot(final Hash depositsRoot) {
+      this.depositsRoot = Optional.of(depositsRoot);
+      return this;
+    }
+
+    public Optional<Wei> getMaxFeePerDataGas(final Optional<Wei> defaultValue) {
+      return maybeMaxFeePerDataGas.orElse(defaultValue);
+    }
+
+    public BlockOptions setMaxFeePerDataGas(final Optional<Wei> maxFeePerDataGas) {
+      this.maybeMaxFeePerDataGas = Optional.of(maxFeePerDataGas);
+      return this;
+    }
   }
 }
diff --git a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockHeaderTestFixture.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockHeaderTestFixture.java
index 7e09cf12741..d6778a2eaa4 100644
--- a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockHeaderTestFixture.java
+++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockHeaderTestFixture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,9 +14,16 @@
  */
 package org.hyperledger.besu.ethereum.core;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
+
+import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
 
 public class BlockHeaderTestFixture {
 
@@ -33,12 +40,16 @@ public class BlockHeaderTestFixture {
   private long number = 0;
 
   private long gasLimit = 0;
+  private Optional<Wei> baseFee = Optional.empty();
+  private Optional<Bytes32> prevRandao = Optional.empty();
   private long gasUsed = 0;
   private long timestamp = 0;
   private Bytes extraData = Bytes.EMPTY;
 
   private Hash mixHash = Hash.EMPTY;
   private long nonce = 0;
+  private Optional<Hash> withdrawalsRoot = Optional.empty();
+  private Optional<Hash> depositsRoot = Optional.empty();
   private BlockHeaderFunctions blockHeaderFunctions = new MainnetBlockHeaderFunctions();
 
   public BlockHeader buildHeader() {
@@ -54,10 +65,14 @@ public BlockHeader buildHeader() {
     builder.number(number);
     builder.gasLimit(gasLimit);
     builder.gasUsed(gasUsed);
+    baseFee.ifPresent(builder::baseFee);
+    prevRandao.ifPresent((builder::prevRandao));
     builder.timestamp(timestamp);
     builder.extraData(extraData);
     builder.mixHash(mixHash);
     builder.nonce(nonce);
+    withdrawalsRoot.ifPresent(builder::withdrawalsRoot);
+    depositsRoot.ifPresent(builder::depositsRoot);
     builder.blockHeaderFunctions(blockHeaderFunctions);
 
     return builder.buildBlockHeader();
@@ -118,6 +133,16 @@ public BlockHeaderTestFixture gasUsed(final long gasUsed) {
     return this;
   }
 
+  public BlockHeaderTestFixture baseFeePerGas(final Wei baseFee) {
+    this.baseFee = Optional.of(baseFee);
+    return this;
+  }
+
+  public BlockHeaderTestFixture prevRandao(final Bytes32 prevRandao) {
+    this.prevRandao = Optional.ofNullable(prevRandao);
+    return this;
+  }
+
   public BlockHeaderTestFixture timestamp(final long timestamp) {
     this.timestamp = timestamp;
     return this;
@@ -138,6 +163,16 @@ public BlockHeaderTestFixture nonce(final long nonce) {
     return this;
   }
 
+  public BlockHeaderTestFixture withdrawalsRoot(final Hash withdrawalsRoot) {
+    this.withdrawalsRoot = Optional.ofNullable(withdrawalsRoot);
+    return this;
+  }
+
+  public BlockHeaderTestFixture depositsRoot(final Hash depositsRoot) {
+    this.depositsRoot = Optional.ofNullable(depositsRoot);
+    return this;
+  }
+
   public BlockHeaderTestFixture blockHeaderFunctions(
       final BlockHeaderFunctions blockHeaderFunctions) {
     this.blockHeaderFunctions = blockHeaderFunctions;
diff --git a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockSyncTestUtils.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockSyncTestUtils.java
index af3027a1ffe..a2d3740de96 100644
--- a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockSyncTestUtils.java
+++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockSyncTestUtils.java
@@ -37,10 +37,9 @@ public static List<Block> firstBlocks(final int count) {
     try {
       temp.create();
       final Path blocks = temp.newFile().toPath();
+      final BlockHeaderFunctions blockHeaderFunctions = new MainnetBlockHeaderFunctions();
       BlockTestUtil.write1000Blocks(blocks);
-      try (final RawBlockIterator iterator =
-          new RawBlockIterator(
-              blocks, rlp -> BlockHeader.readFrom(rlp, new MainnetBlockHeaderFunctions()))) {
+      try (final RawBlockIterator iterator = new RawBlockIterator(blocks, blockHeaderFunctions)) {
         for (int i = 0; i < count; ++i) {
           result.add(iterator.next());
         }
diff --git a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockchainSetupUtil.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockchainSetupUtil.java
index 79e4b4bb161..5b9fc1fb01a 100644
--- a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockchainSetupUtil.java
+++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/BlockchainSetupUtil.java
@@ -15,24 +15,29 @@
 package org.hyperledger.besu.ethereum.core;
 
 import static org.assertj.core.util.Preconditions.checkArgument;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createBonsaiInMemoryWorldStateArchive;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
 import static org.mockito.Mockito.mock;
 
 import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.ethereum.ConsensusContext;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.chain.GenesisState;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.mainnet.BlockImportResult;
 import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
 import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.util.RawBlockIterator;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.testutil.BlockTestUtil;
 import org.hyperledger.besu.testutil.BlockTestUtil.ChainResources;
@@ -43,6 +48,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
 import com.google.common.base.Charsets;
 import com.google.common.io.Resources;
@@ -104,25 +110,27 @@ public int blockCount() {
     return blocks.size();
   }
 
-  public static BlockchainSetupUtil forTesting() {
-    return createForEthashChain(BlockTestUtil.getTestChainResources());
+  public static BlockchainSetupUtil forTesting(final DataStorageFormat storageFormat) {
+    return createForEthashChain(BlockTestUtil.getTestChainResources(), storageFormat);
   }
 
   public static BlockchainSetupUtil forMainnet() {
-    return createForEthashChain(BlockTestUtil.getMainnetResources());
+    return createForEthashChain(BlockTestUtil.getMainnetResources(), DataStorageFormat.FOREST);
   }
 
   public static BlockchainSetupUtil forOutdatedFork() {
-    return createForEthashChain(BlockTestUtil.getOutdatedForkResources());
+    return createForEthashChain(BlockTestUtil.getOutdatedForkResources(), DataStorageFormat.FOREST);
   }
 
   public static BlockchainSetupUtil forUpgradedFork() {
-    return createForEthashChain(BlockTestUtil.getUpgradedForkResources());
+    return createForEthashChain(BlockTestUtil.getUpgradedForkResources(), DataStorageFormat.FOREST);
   }
 
-  public static BlockchainSetupUtil createForEthashChain(final ChainResources chainResources) {
+  public static BlockchainSetupUtil createForEthashChain(
+      final ChainResources chainResources, final DataStorageFormat storageFormat) {
     return create(
         chainResources,
+        storageFormat,
         BlockchainSetupUtil::mainnetProtocolScheduleProvider,
         BlockchainSetupUtil::mainnetProtocolContextProvider,
         new EthScheduler(1, 1, 1, 1, new NoOpMetricsSystem()));
@@ -130,16 +138,27 @@ public static BlockchainSetupUtil createForEthashChain(final ChainResources chai
 
   private static ProtocolSchedule mainnetProtocolScheduleProvider(
       final GenesisConfigFile genesisConfigFile) {
-    return MainnetProtocolSchedule.fromConfig(genesisConfigFile.getConfigOptions());
+    return MainnetProtocolSchedule.fromConfig(
+        genesisConfigFile.getConfigOptions(), EvmConfiguration.DEFAULT);
   }
 
   private static ProtocolContext mainnetProtocolContextProvider(
       final MutableBlockchain blockchain, final WorldStateArchive worldStateArchive) {
-    return new ProtocolContext(blockchain, worldStateArchive, null);
+    return new ProtocolContext(
+        blockchain,
+        worldStateArchive,
+        new ConsensusContext() {
+          @Override
+          public <C extends ConsensusContext> C as(final Class<C> klass) {
+            return null;
+          }
+        },
+        Optional.empty());
   }
 
   private static BlockchainSetupUtil create(
       final ChainResources chainResources,
+      final DataStorageFormat storageFormat,
       final ProtocolScheduleProvider protocolScheduleProvider,
       final ProtocolContextProvider protocolContextProvider,
       final EthScheduler scheduler) {
@@ -153,7 +172,10 @@ private static BlockchainSetupUtil create(
 
       final GenesisState genesisState = GenesisState.fromJson(genesisJson, protocolSchedule);
       final MutableBlockchain blockchain = createInMemoryBlockchain(genesisState.getBlock());
-      final WorldStateArchive worldArchive = createInMemoryWorldStateArchive();
+      final WorldStateArchive worldArchive =
+          storageFormat == DataStorageFormat.BONSAI
+              ? createBonsaiInMemoryWorldStateArchive(blockchain)
+              : createInMemoryWorldStateArchive();
       final TransactionPool transactionPool = mock(TransactionPool.class);
 
       genesisState.writeStateTo(worldArchive.getMutable());
@@ -164,8 +186,7 @@ private static BlockchainSetupUtil create(
       final BlockHeaderFunctions blockHeaderFunctions =
           ScheduleBasedBlockHeaderFunctions.create(protocolSchedule);
       try (final RawBlockIterator iterator =
-          new RawBlockIterator(
-              blocksPath, rlp -> BlockHeader.readFrom(rlp, blockHeaderFunctions))) {
+          new RawBlockIterator(blocksPath, blockHeaderFunctions)) {
         while (iterator.hasNext()) {
           blocks.add(iterator.next());
         }
@@ -223,12 +244,11 @@ private void importBlocks(final List<Block> blocks) {
       if (block.getHeader().getNumber() == BlockHeader.GENESIS_BLOCK_NUMBER) {
         continue;
       }
-      final ProtocolSpec protocolSpec =
-          protocolSchedule.getByBlockNumber(block.getHeader().getNumber());
+      final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(block.getHeader());
       final BlockImporter blockImporter = protocolSpec.getBlockImporter();
-      final boolean result =
+      final BlockImportResult result =
           blockImporter.importBlock(protocolContext, block, HeaderValidationMode.FULL);
-      if (!result) {
+      if (!result.isImported()) {
         throw new IllegalStateException("Unable to import block " + block.getHeader().getNumber());
       }
     }
diff --git a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/ExecutionContextTestFixture.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/ExecutionContextTestFixture.java
index 15345b51589..bd3b77798ff 100644
--- a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/ExecutionContextTestFixture.java
+++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/ExecutionContextTestFixture.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.core;
 
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
 
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.config.StubGenesisConfigOptions;
@@ -25,19 +25,24 @@
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpecAdapters;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage;
+import org.hyperledger.besu.ethereum.storage.keyvalue.VariablesKeyValueStorage;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
 import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
 
 import java.math.BigInteger;
+import java.util.Optional;
 import java.util.function.Function;
 
 public class ExecutionContextTestFixture {
 
   private final Block genesis;
-  private final KeyValueStorage keyValueStorage;
+  private final KeyValueStorage blockchainKeyValueStorage;
+  private final KeyValueStorage variablesKeyValueStorage;
   private final MutableBlockchain blockchain;
   private final WorldStateArchive stateArchive;
 
@@ -46,20 +51,25 @@ public class ExecutionContextTestFixture {
   private static final GenesisConfigFile genesisConfigFile = GenesisConfigFile.mainnet();
 
   private ExecutionContextTestFixture(
-      final ProtocolSchedule protocolSchedule, final KeyValueStorage keyValueStorage) {
+      final ProtocolSchedule protocolSchedule,
+      final KeyValueStorage blockchainKeyValueStorage,
+      final KeyValueStorage variablesKeyValueStorage) {
     final GenesisState genesisState = GenesisState.fromConfig(genesisConfigFile, protocolSchedule);
     this.genesis = genesisState.getBlock();
-    this.keyValueStorage = keyValueStorage;
+    this.blockchainKeyValueStorage = blockchainKeyValueStorage;
+    this.variablesKeyValueStorage = variablesKeyValueStorage;
     this.blockchain =
         DefaultBlockchain.createMutable(
             genesis,
             new KeyValueStoragePrefixedKeyBlockchainStorage(
-                keyValueStorage, new MainnetBlockHeaderFunctions()),
+                blockchainKeyValueStorage,
+                new VariablesKeyValueStorage(variablesKeyValueStorage),
+                new MainnetBlockHeaderFunctions()),
             new NoOpMetricsSystem(),
             0);
     this.stateArchive = createInMemoryWorldStateArchive();
     this.protocolSchedule = protocolSchedule;
-    this.protocolContext = new ProtocolContext(blockchain, stateArchive, null);
+    this.protocolContext = new ProtocolContext(blockchain, stateArchive, null, Optional.empty());
     genesisState.writeStateTo(stateArchive.getMutable());
   }
 
@@ -75,8 +85,12 @@ public Block getGenesis() {
     return genesis;
   }
 
-  public KeyValueStorage getKeyValueStorage() {
-    return keyValueStorage;
+  public KeyValueStorage getBlockchainKeyValueStorage() {
+    return blockchainKeyValueStorage;
+  }
+
+  public KeyValueStorage getVariablesKeyValueStorage() {
+    return variablesKeyValueStorage;
   }
 
   public MutableBlockchain getBlockchain() {
@@ -96,12 +110,17 @@ public ProtocolContext getProtocolContext() {
   }
 
   public static class Builder {
-
-    private KeyValueStorage keyValueStorage;
+    private KeyValueStorage variablesKeyValueStorage;
+    private KeyValueStorage blockchainKeyValueStorage;
     private ProtocolSchedule protocolSchedule;
 
-    public Builder keyValueStorage(final KeyValueStorage keyValueStorage) {
-      this.keyValueStorage = keyValueStorage;
+    public Builder variablesKeyValueStorage(final KeyValueStorage keyValueStorage) {
+      this.variablesKeyValueStorage = keyValueStorage;
+      return this;
+    }
+
+    public Builder blockchainKeyValueStorage(final KeyValueStorage keyValueStorage) {
+      this.blockchainKeyValueStorage = keyValueStorage;
       return this;
     }
 
@@ -114,18 +133,22 @@ public ExecutionContextTestFixture build() {
       if (protocolSchedule == null) {
         protocolSchedule =
             new ProtocolScheduleBuilder(
-                    new StubGenesisConfigOptions().constantinopleFixBlock(0),
+                    new StubGenesisConfigOptions().petersburgBlock(0),
                     BigInteger.valueOf(42),
-                    Function.identity(),
+                    ProtocolSpecAdapters.create(0, Function.identity()),
                     new PrivacyParameters(),
                     false,
-                    genesisConfigFile.getConfigOptions().isQuorum())
+                    EvmConfiguration.DEFAULT)
                 .createProtocolSchedule();
       }
-      if (keyValueStorage == null) {
-        keyValueStorage = new InMemoryKeyValueStorage();
+      if (blockchainKeyValueStorage == null) {
+        blockchainKeyValueStorage = new InMemoryKeyValueStorage();
+      }
+      if (variablesKeyValueStorage == null) {
+        variablesKeyValueStorage = new InMemoryKeyValueStorage();
       }
-      return new ExecutionContextTestFixture(protocolSchedule, keyValueStorage);
+      return new ExecutionContextTestFixture(
+          protocolSchedule, variablesKeyValueStorage, blockchainKeyValueStorage);
     }
   }
 }
diff --git a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/InMemoryKeyValueStorageProvider.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/InMemoryKeyValueStorageProvider.java
new file mode 100644
index 00000000000..7c1dd689bcf
--- /dev/null
+++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/InMemoryKeyValueStorageProvider.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core;
+
+import org.hyperledger.besu.ethereum.bonsai.BonsaiWorldStateProvider;
+import org.hyperledger.besu.ethereum.bonsai.cache.CachedMerkleTrieLoader;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.chain.DefaultBlockchain;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.chain.VariablesStorage;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.privacy.storage.PrivateStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.privacy.storage.PrivateStateStorage;
+import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage;
+import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.storage.keyvalue.VariablesKeyValueStorage;
+import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.ethereum.worldstate.DefaultMutableWorldState;
+import org.hyperledger.besu.ethereum.worldstate.DefaultWorldStateArchive;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
+
+public class InMemoryKeyValueStorageProvider extends KeyValueStorageProvider {
+
+  public InMemoryKeyValueStorageProvider() {
+    super(
+        segmentIdentifier -> new InMemoryKeyValueStorage(),
+        new InMemoryKeyValueStorage(),
+        SEGMENT_ISOLATION_SUPPORTED,
+        SNAPSHOT_ISOLATION_UNSUPPORTED,
+        new NoOpMetricsSystem());
+  }
+
+  public static MutableBlockchain createInMemoryBlockchain(final Block genesisBlock) {
+    return createInMemoryBlockchain(genesisBlock, createInMemoryVariablesStorage());
+  }
+
+  public static MutableBlockchain createInMemoryBlockchain(
+      final Block genesisBlock, final VariablesStorage variablesStorage) {
+    return createInMemoryBlockchain(
+        genesisBlock, new MainnetBlockHeaderFunctions(), variablesStorage);
+  }
+
+  public static MutableBlockchain createInMemoryBlockchain(
+      final Block genesisBlock, final BlockHeaderFunctions blockHeaderFunctions) {
+    return createInMemoryBlockchain(
+        genesisBlock, blockHeaderFunctions, createInMemoryVariablesStorage());
+  }
+
+  public static MutableBlockchain createInMemoryBlockchain(
+      final Block genesisBlock,
+      final BlockHeaderFunctions blockHeaderFunctions,
+      final VariablesStorage variablesStorage) {
+    final InMemoryKeyValueStorage keyValueStorage = new InMemoryKeyValueStorage();
+    return DefaultBlockchain.createMutable(
+        genesisBlock,
+        new KeyValueStoragePrefixedKeyBlockchainStorage(
+            keyValueStorage, variablesStorage, blockHeaderFunctions),
+        new NoOpMetricsSystem(),
+        0);
+  }
+
+  public static DefaultWorldStateArchive createInMemoryWorldStateArchive() {
+    return new DefaultWorldStateArchive(
+        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage()),
+        new WorldStatePreimageKeyValueStorage(new InMemoryKeyValueStorage()));
+  }
+
+  public static BonsaiWorldStateProvider createBonsaiInMemoryWorldStateArchive(
+      final Blockchain blockchain) {
+    final InMemoryKeyValueStorageProvider inMemoryKeyValueStorageProvider =
+        new InMemoryKeyValueStorageProvider();
+    final CachedMerkleTrieLoader cachedMerkleTrieLoader =
+        new CachedMerkleTrieLoader(new NoOpMetricsSystem());
+    return new BonsaiWorldStateProvider(
+        inMemoryKeyValueStorageProvider,
+        blockchain,
+        cachedMerkleTrieLoader,
+        new NoOpMetricsSystem(),
+        null);
+  }
+
+  public static MutableWorldState createInMemoryWorldState() {
+    final InMemoryKeyValueStorageProvider provider = new InMemoryKeyValueStorageProvider();
+    return new DefaultMutableWorldState(
+        provider.createWorldStateStorage(DataStorageFormat.FOREST),
+        provider.createWorldStatePreimageStorage());
+  }
+
+  public static PrivateStateStorage createInMemoryPrivateStateStorage() {
+    return new PrivateStateKeyValueStorage(new InMemoryKeyValueStorage());
+  }
+
+  public static VariablesStorage createInMemoryVariablesStorage() {
+    return new VariablesKeyValueStorage(new InMemoryKeyValueStorage());
+  }
+}
diff --git a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/InMemoryStorageProvider.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/InMemoryStorageProvider.java
deleted file mode 100644
index 6f65e63e5b8..00000000000
--- a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/InMemoryStorageProvider.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core;
-
-import org.hyperledger.besu.ethereum.chain.BlockchainStorage;
-import org.hyperledger.besu.ethereum.chain.DefaultBlockchain;
-import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
-import org.hyperledger.besu.ethereum.privacy.storage.PrivateStateKeyValueStorage;
-import org.hyperledger.besu.ethereum.privacy.storage.PrivateStateStorage;
-import org.hyperledger.besu.ethereum.storage.StorageProvider;
-import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage;
-import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage;
-import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage;
-import org.hyperledger.besu.ethereum.worldstate.DefaultMutableWorldState;
-import org.hyperledger.besu.ethereum.worldstate.DefaultWorldStateArchive;
-import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
-import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
-import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier;
-import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
-
-public class InMemoryStorageProvider implements StorageProvider {
-
-  public static MutableBlockchain createInMemoryBlockchain(final Block genesisBlock) {
-    return createInMemoryBlockchain(genesisBlock, new MainnetBlockHeaderFunctions());
-  }
-
-  public static MutableBlockchain createInMemoryBlockchain(
-      final Block genesisBlock, final BlockHeaderFunctions blockHeaderFunctions) {
-    final InMemoryKeyValueStorage keyValueStorage = new InMemoryKeyValueStorage();
-    return DefaultBlockchain.createMutable(
-        genesisBlock,
-        new KeyValueStoragePrefixedKeyBlockchainStorage(keyValueStorage, blockHeaderFunctions),
-        new NoOpMetricsSystem(),
-        0);
-  }
-
-  public static DefaultWorldStateArchive createInMemoryWorldStateArchive() {
-    return new DefaultWorldStateArchive(
-        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage()),
-        new WorldStatePreimageKeyValueStorage(new InMemoryKeyValueStorage()));
-  }
-
-  public static MutableWorldState createInMemoryWorldState() {
-    final InMemoryStorageProvider provider = new InMemoryStorageProvider();
-    return new DefaultMutableWorldState(
-        provider.createWorldStateStorage(), provider.createWorldStatePreimageStorage());
-  }
-
-  public static PrivateStateStorage createInMemoryPrivateStateStorage() {
-    return new PrivateStateKeyValueStorage(new InMemoryKeyValueStorage());
-  }
-
-  @Override
-  public BlockchainStorage createBlockchainStorage(final ProtocolSchedule protocolSchedule) {
-    return new KeyValueStoragePrefixedKeyBlockchainStorage(
-        new InMemoryKeyValueStorage(), ScheduleBasedBlockHeaderFunctions.create(protocolSchedule));
-  }
-
-  @Override
-  public WorldStateStorage createWorldStateStorage() {
-    return new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
-  }
-
-  @Override
-  public WorldStatePreimageStorage createWorldStatePreimageStorage() {
-    return new WorldStatePreimageKeyValueStorage(new InMemoryKeyValueStorage());
-  }
-
-  @Override
-  public KeyValueStorage getStorageBySegmentIdentifier(final SegmentIdentifier segment) {
-    return new InMemoryKeyValueStorage();
-  }
-
-  @Override
-  public boolean isWorldStateIterable() {
-    return true;
-  }
-
-  @Override
-  public void close() {}
-}
diff --git a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/MessageFrameTestFixture.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/MessageFrameTestFixture.java
index 7b1703737cc..6a3165c5118 100644
--- a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/MessageFrameTestFixture.java
+++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/MessageFrameTestFixture.java
@@ -14,13 +14,17 @@
  */
 package org.hyperledger.besu.ethereum.core;
 
-import static org.hyperledger.besu.ethereum.vm.MessageFrame.DEFAULT_MAX_STACK_SIZE;
+import static org.hyperledger.besu.evm.frame.MessageFrame.DEFAULT_MAX_STACK_SIZE;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
-import org.hyperledger.besu.ethereum.vm.Code;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.operations.ReturnStack;
+import org.hyperledger.besu.ethereum.vm.CachingBlockHashLookup;
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.code.CodeV0;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -29,32 +33,30 @@
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
 
 public class MessageFrameTestFixture {
 
   public static final Address DEFAUT_ADDRESS = AddressHelpers.ofValue(244259721);
-  private final int maxStackSize = DEFAULT_MAX_STACK_SIZE;
+  private static final int maxStackSize = DEFAULT_MAX_STACK_SIZE;
 
   private MessageFrame.Type type = MessageFrame.Type.MESSAGE_CALL;
   private Deque<MessageFrame> messageFrameStack = new ArrayDeque<>();
   private Optional<Blockchain> blockchain = Optional.empty();
-  private Optional<WorldUpdater> worldState = Optional.empty();
-  private Gas initialGas = Gas.MAX_VALUE;
+  private Optional<WorldUpdater> worldUpdater = Optional.empty();
+  private long initialGas = Long.MAX_VALUE;
   private Address address = DEFAUT_ADDRESS;
   private Address sender = DEFAUT_ADDRESS;
   private Address originator = DEFAUT_ADDRESS;
   private Address contract = DEFAUT_ADDRESS;
-  private int contractAccountVersion = Account.DEFAULT_VERSION;
   private Wei gasPrice = Wei.ZERO;
   private Wei value = Wei.ZERO;
   private Bytes inputData = Bytes.EMPTY;
-  private Code code = new Code(Bytes.EMPTY);
-  private final List<Bytes32> stackItems = new ArrayList<>();
+  private Code code = CodeV0.EMPTY_CODE;
+  private final List<UInt256> stackItems = new ArrayList<>();
   private Optional<BlockHeader> blockHeader = Optional.empty();
   private int depth = 0;
   private Optional<BlockHashLookup> blockHashLookup = Optional.empty();
-  private ReturnStack returnStack = new ReturnStack();
   private ExecutionContextTestFixture executionContextTestFixture;
 
   public MessageFrameTestFixture type(final MessageFrame.Type type) {
@@ -62,7 +64,7 @@ public MessageFrameTestFixture type(final MessageFrame.Type type) {
     return this;
   }
 
-  public MessageFrameTestFixture messageFrameStack(final Deque<MessageFrame> messageFrameStack) {
+  MessageFrameTestFixture messageFrameStack(final Deque<MessageFrame> messageFrameStack) {
     this.messageFrameStack = messageFrameStack;
     return this;
   }
@@ -78,17 +80,17 @@ public MessageFrameTestFixture blockchain(final Blockchain blockchain) {
     return this;
   }
 
-  public MessageFrameTestFixture worldState(final WorldUpdater worldState) {
-    this.worldState = Optional.of(worldState);
+  public MessageFrameTestFixture worldUpdater(final WorldUpdater worldUpdater) {
+    this.worldUpdater = Optional.of(worldUpdater);
     return this;
   }
 
-  public MessageFrameTestFixture worldState(final MutableWorldState worldState) {
-    this.worldState = Optional.of(worldState.updater());
+  public MessageFrameTestFixture worldUpdater(final MutableWorldState worldState) {
+    this.worldUpdater = Optional.of(worldState.updater());
     return this;
   }
 
-  public MessageFrameTestFixture initialGas(final Gas initialGas) {
+  public MessageFrameTestFixture initialGas(final long initialGas) {
     this.initialGas = initialGas;
     return this;
   }
@@ -103,7 +105,7 @@ public MessageFrameTestFixture address(final Address address) {
     return this;
   }
 
-  public MessageFrameTestFixture originator(final Address originator) {
+  MessageFrameTestFixture originator(final Address originator) {
     this.originator = originator;
     return this;
   }
@@ -113,11 +115,6 @@ public MessageFrameTestFixture contract(final Address contract) {
     return this;
   }
 
-  public MessageFrameTestFixture contractAccountVersion(final int contractAccountVersion) {
-    this.contractAccountVersion = contractAccountVersion;
-    return this;
-  }
-
   public MessageFrameTestFixture gasPrice(final Wei gasPrice) {
     this.gasPrice = gasPrice;
     return this;
@@ -128,7 +125,7 @@ public MessageFrameTestFixture value(final Wei value) {
     return this;
   }
 
-  public MessageFrameTestFixture inputData(final Bytes inputData) {
+  MessageFrameTestFixture inputData(final Bytes inputData) {
     this.inputData = inputData;
     return this;
   }
@@ -148,7 +145,7 @@ public MessageFrameTestFixture depth(final int depth) {
     return this;
   }
 
-  public MessageFrameTestFixture pushStackItem(final Bytes32 item) {
+  public MessageFrameTestFixture pushStackItem(final UInt256 item) {
     stackItems.add(item);
     return this;
   }
@@ -158,21 +155,15 @@ public MessageFrameTestFixture blockHashLookup(final BlockHashLookup blockHashLo
     return this;
   }
 
-  public MessageFrameTestFixture returnStack(final ReturnStack returnStack) {
-    this.returnStack = returnStack;
-    return this;
-  }
-
   public MessageFrame build() {
-    final Blockchain blockchain = this.blockchain.orElseGet(this::createDefaultBlockchain);
-    final BlockHeader blockHeader =
-        this.blockHeader.orElseGet(() -> blockchain.getBlockHeader(0).get());
+    final Blockchain localBlockchain = this.blockchain.orElseGet(this::createDefaultBlockchain);
+    final BlockHeader localBlockHeader =
+        this.blockHeader.orElseGet(() -> localBlockchain.getBlockHeader(0).get());
     final MessageFrame frame =
         MessageFrame.builder()
             .type(type)
             .messageFrameStack(messageFrameStack)
-            .blockchain(blockchain)
-            .worldState(worldState.orElseGet(this::createDefaultWorldState))
+            .worldUpdater(worldUpdater.orElseGet(this::createDefaultWorldUpdater))
             .initialGas(initialGas)
             .address(address)
             .originator(originator)
@@ -182,22 +173,21 @@ public MessageFrame build() {
             .value(value)
             .apparentValue(value)
             .contract(contract)
-            .contractAccountVersion(contractAccountVersion)
             .code(code)
-            .blockHeader(blockHeader)
+            .blockValues(localBlockHeader)
             .depth(depth)
             .completer(c -> {})
-            .miningBeneficiary(blockHeader.getCoinbase())
+            .miningBeneficiary(localBlockHeader.getCoinbase())
             .blockHashLookup(
-                blockHashLookup.orElseGet(() -> new BlockHashLookup(blockHeader, blockchain)))
+                blockHashLookup.orElseGet(
+                    () -> new CachingBlockHashLookup(localBlockHeader, localBlockchain)))
             .maxStackSize(maxStackSize)
-            .returnStack(returnStack)
             .build();
     stackItems.forEach(frame::pushStackItem);
     return frame;
   }
 
-  private WorldUpdater createDefaultWorldState() {
+  private WorldUpdater createDefaultWorldUpdater() {
     return getOrCreateExecutionContextTestFixture().getStateArchive().getMutable().updater();
   }
 
diff --git a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/MilestoneStreamingProtocolSchedule.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/MilestoneStreamingProtocolSchedule.java
new file mode 100644
index 00000000000..ed30fee9a50
--- /dev/null
+++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/MilestoneStreamingProtocolSchedule.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.core;
+
+import org.hyperledger.besu.ethereum.mainnet.DefaultProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ScheduledProtocolSpec;
+
+import java.util.Comparator;
+import java.util.stream.Stream;
+
+public class MilestoneStreamingProtocolSchedule extends DefaultProtocolSchedule {
+
+  public MilestoneStreamingProtocolSchedule(final DefaultProtocolSchedule protocolSchedule) {
+    super(protocolSchedule);
+  }
+
+  public Stream<Long> streamMilestoneBlocks() {
+    return protocolSpecs.stream()
+        .sorted(Comparator.comparing(ScheduledProtocolSpec::milestone))
+        .map(ScheduledProtocolSpec::milestone);
+  }
+}
diff --git a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/MiningParametersTestBuilder.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/MiningParametersTestBuilder.java
deleted file mode 100644
index dfe50960630..00000000000
--- a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/MiningParametersTestBuilder.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public class MiningParametersTestBuilder {
-
-  private Address coinbase = AddressHelpers.ofValue(1);
-  private Wei minTransactionGasPrice = Wei.of(1000);
-  private Bytes extraData = Bytes.EMPTY;
-  private Boolean enabled = false;
-
-  public MiningParametersTestBuilder coinbase(final Address coinbase) {
-    this.coinbase = coinbase;
-    return this;
-  }
-
-  public MiningParametersTestBuilder minTransactionGasPrice(final Wei minTransactionGasPrice) {
-    this.minTransactionGasPrice = minTransactionGasPrice;
-    return this;
-  }
-
-  public MiningParametersTestBuilder extraData(final Bytes extraData) {
-    this.extraData = extraData;
-    return this;
-  }
-
-  public MiningParametersTestBuilder enabled(final Boolean enabled) {
-    this.enabled = enabled;
-    return this;
-  }
-
-  public MiningParameters build() {
-    return new MiningParameters(coinbase, minTransactionGasPrice, extraData, enabled);
-  }
-}
diff --git a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/NonBesuBlockHeader.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/NonBesuBlockHeader.java
index 86a0fdd1a94..e8c1b58c66b 100644
--- a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/NonBesuBlockHeader.java
+++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/NonBesuBlockHeader.java
@@ -14,10 +14,12 @@
  */
 package org.hyperledger.besu.ethereum.core;
 
-import org.hyperledger.besu.plugin.data.Address;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Quantity;
 import org.hyperledger.besu.plugin.data.BlockHeader;
-import org.hyperledger.besu.plugin.data.Hash;
-import org.hyperledger.besu.plugin.data.Quantity;
+
+import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
 
@@ -106,8 +108,23 @@ public long getNonce() {
     return 0;
   }
 
+  @Override
+  public Optional<? extends Hash> getWithdrawalsRoot() {
+    return Optional.empty();
+  }
+
+  @Override
+  public Optional<? extends Hash> getDepositsRoot() {
+    return Optional.empty();
+  }
+
   @Override
   public Hash getBlockHash() {
     return blockHash;
   }
+
+  @Override
+  public Optional<? extends Quantity> getExcessDataGas() {
+    return Optional.empty();
+  }
 }
diff --git a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/PrivateTransactionDataFixture.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/PrivateTransactionDataFixture.java
index 289c010a06f..a27c7ad0f89 100644
--- a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/PrivateTransactionDataFixture.java
+++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/PrivateTransactionDataFixture.java
@@ -15,8 +15,15 @@
 package org.hyperledger.besu.ethereum.core;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-
-import org.hyperledger.besu.crypto.SECP256K1;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.DEFAULT_PRIVACY;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.enclave.types.ReceiveResponse;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransactionWithMetadata;
@@ -33,6 +40,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 
@@ -44,13 +53,19 @@ public class PrivateTransactionDataFixture {
   public static final Wei DEFAULT_VALUE = Wei.of(0);
   public static final Address DEFAULT_SENDER =
       Address.fromHexString("0xfe3b557e8fb62b89f4916b721be55ceb828dbd73");
-  public static final BigInteger DEFAULT_CHAIN_ID = BigInteger.valueOf(2018);
-
-  public static final SECP256K1.KeyPair KEY_PAIR =
-      SECP256K1.KeyPair.create(
-          SECP256K1.PrivateKey.create(
-              new BigInteger(
-                  "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63", 16)));
+  public static final BigInteger DEFAULT_CHAIN_ID = BigInteger.valueOf(1337);
+
+  public static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+  public static final KeyPair KEY_PAIR =
+      SIGNATURE_ALGORITHM
+          .get()
+          .createKeyPair(
+              SIGNATURE_ALGORITHM
+                  .get()
+                  .createPrivateKey(
+                      new BigInteger(
+                          "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63", 16)));
 
   public static final Bytes32 VALID_BASE64_ENCLAVE_KEY =
       Bytes32.wrap(Bytes.fromBase64String("A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo="));
@@ -70,21 +85,20 @@ public class PrivateTransactionDataFixture {
   public static final Address VALID_CONTRACT_DEPLOYMENT_ADDRESS =
       Address.fromHexString("0x0bac79b78b9866ef11c989ad21a7fcf15f7a18d7");
 
-  public static Transaction privacyMarkerTransaction() {
-    return privacyMarkerTransaction(VALID_BASE64_ENCLAVE_KEY, Address.DEFAULT_PRIVACY);
+  public static Transaction privateMarkerTransaction() {
+    return privateMarkerTransaction(VALID_BASE64_ENCLAVE_KEY, DEFAULT_PRIVACY);
   }
 
-  public static Transaction privacyMarkerTransactionOnChain() {
-    return privacyMarkerTransaction(VALID_BASE64_ENCLAVE_KEY, Address.ONCHAIN_PRIVACY);
+  public static Transaction privateMarkerTransactionOnchain() {
+    return privateMarkerTransaction(VALID_BASE64_ENCLAVE_KEY, FLEXIBLE_PRIVACY);
   }
 
-  public static Transaction privacyMarkerTransactionOnChainAdd() {
-    return privacyMarkerTransaction(
-        Bytes.concatenate(VALID_BASE64_ENCLAVE_KEY, VALID_BASE64_ENCLAVE_KEY),
-        Address.ONCHAIN_PRIVACY);
+  public static Transaction privateMarkerTransactionOnchainAdd() {
+    return privateMarkerTransaction(
+        Bytes.concatenate(VALID_BASE64_ENCLAVE_KEY, VALID_BASE64_ENCLAVE_KEY), FLEXIBLE_PRIVACY);
   }
 
-  private static Transaction privacyMarkerTransaction(
+  private static Transaction privateMarkerTransaction(
       final Bytes transactionKey, final Address precompiledContractAddress) {
     return Transaction.builder()
         .type(TransactionType.FRONTIER)
diff --git a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/PrivateTransactionReceiptTestFixture.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/PrivateTransactionReceiptTestFixture.java
index 47a490a35ff..fc8485201fa 100644
--- a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/PrivateTransactionReceiptTestFixture.java
+++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/PrivateTransactionReceiptTestFixture.java
@@ -15,6 +15,7 @@
 package org.hyperledger.besu.ethereum.core;
 
 import org.hyperledger.besu.ethereum.privacy.PrivateTransactionReceipt;
+import org.hyperledger.besu.evm.log.Log;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/PrivateTransactionTestFixture.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/PrivateTransactionTestFixture.java
index 56b5d74386d..86788a959d4 100644
--- a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/PrivateTransactionTestFixture.java
+++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/PrivateTransactionTestFixture.java
@@ -14,10 +14,12 @@
  */
 package org.hyperledger.besu.ethereum.core;
 
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
-import org.hyperledger.besu.ethereum.privacy.Restriction;
 import org.hyperledger.besu.ethereum.privacy.VersionedPrivateTransaction;
+import org.hyperledger.besu.plugin.data.Restriction;
 
 import java.math.BigInteger;
 import java.util.List;
diff --git a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/ProtocolScheduleFixture.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/ProtocolScheduleFixture.java
index 4324caaea99..bd20bfa6ad0 100644
--- a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/ProtocolScheduleFixture.java
+++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/ProtocolScheduleFixture.java
@@ -22,6 +22,7 @@
 import org.hyperledger.besu.config.JsonGenesisConfigOptions;
 import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 
 import java.io.IOException;
 
@@ -33,7 +34,7 @@
 public class ProtocolScheduleFixture {
   public static final ProtocolSchedule MAINNET =
       MainnetProtocolSchedule.fromConfig(
-          getMainnetConfigOptions(), PrivacyParameters.DEFAULT, false);
+          getMainnetConfigOptions(), PrivacyParameters.DEFAULT, false, EvmConfiguration.DEFAULT);
 
   private static GenesisConfigOptions getMainnetConfigOptions() {
     // this method avoids reading all the alloc accounts when all we want is the "config" section
diff --git a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/TestCodeExecutor.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/TestCodeExecutor.java
deleted file mode 100644
index 501629f246f..00000000000
--- a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/TestCodeExecutor.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core;
-
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
-import org.hyperledger.besu.ethereum.mainnet.MainnetMessageCallProcessor;
-import org.hyperledger.besu.ethereum.mainnet.PrecompileContractRegistry;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
-import org.hyperledger.besu.ethereum.vm.Code;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.OperationTracer;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
-
-import java.math.BigInteger;
-import java.util.ArrayDeque;
-import java.util.Deque;
-import java.util.function.Consumer;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public class TestCodeExecutor {
-
-  private final ExecutionContextTestFixture fixture;
-  private final BlockHeader blockHeader = new BlockHeaderTestFixture().number(13).buildHeader();
-  private static final Address SENDER_ADDRESS = AddressHelpers.ofValue(244259721);
-
-  public TestCodeExecutor(final ProtocolSchedule protocolSchedule) {
-    fixture = ExecutionContextTestFixture.builder().protocolSchedule(protocolSchedule).build();
-  }
-
-  public MessageFrame executeCode(
-      final String code,
-      final int accountVersion,
-      final long gasLimit,
-      final Consumer<MutableAccount> accountSetup) {
-    final ProtocolSpec protocolSpec = fixture.getProtocolSchedule().getByBlockNumber(0);
-    final WorldUpdater worldState =
-        createInitialWorldState(accountSetup, fixture.getStateArchive());
-    final Deque<MessageFrame> messageFrameStack = new ArrayDeque<>();
-
-    final MainnetMessageCallProcessor messageCallProcessor =
-        new MainnetMessageCallProcessor(protocolSpec.getEvm(), new PrecompileContractRegistry());
-
-    final Transaction transaction =
-        Transaction.builder()
-            .value(Wei.ZERO)
-            .sender(SENDER_ADDRESS)
-            .signature(Signature.create(BigInteger.ONE, BigInteger.TEN, (byte) 1))
-            .gasLimit(gasLimit)
-            .to(SENDER_ADDRESS)
-            .payload(Bytes.EMPTY)
-            .gasPrice(Wei.ZERO)
-            .nonce(0)
-            .build();
-    final MessageFrame initialFrame =
-        new MessageFrameTestFixture()
-            .messageFrameStack(messageFrameStack)
-            .blockchain(fixture.getBlockchain())
-            .worldState(worldState)
-            .initialGas(Gas.of(gasLimit))
-            .address(SENDER_ADDRESS)
-            .originator(SENDER_ADDRESS)
-            .contract(SENDER_ADDRESS)
-            .contractAccountVersion(accountVersion)
-            .gasPrice(transaction.getGasPrice())
-            .inputData(transaction.getPayload())
-            .sender(SENDER_ADDRESS)
-            .value(transaction.getValue())
-            .code(new Code(Bytes.fromHexString(code)))
-            .blockHeader(blockHeader)
-            .depth(0)
-            .build();
-    messageFrameStack.addFirst(initialFrame);
-
-    while (!messageFrameStack.isEmpty()) {
-      messageCallProcessor.process(messageFrameStack.peekFirst(), OperationTracer.NO_TRACING);
-    }
-    return initialFrame;
-  }
-
-  private WorldUpdater createInitialWorldState(
-      final Consumer<MutableAccount> accountSetup, final WorldStateArchive stateArchive) {
-    final MutableWorldState initialWorldState = stateArchive.getMutable();
-
-    final WorldUpdater worldState = initialWorldState.updater();
-    final MutableAccount senderAccount =
-        worldState.getOrCreate(TestCodeExecutor.SENDER_ADDRESS).getMutable();
-    accountSetup.accept(senderAccount);
-    worldState.commit();
-    initialWorldState.persist(null);
-    return stateArchive.getMutable(initialWorldState.rootHash()).get().updater();
-  }
-}
diff --git a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/TransactionTestFixture.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/TransactionTestFixture.java
index 15a0968ee07..d766abf1017 100644
--- a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/TransactionTestFixture.java
+++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/TransactionTestFixture.java
@@ -14,21 +14,31 @@
  */
 package org.hyperledger.besu.ethereum.core;
 
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.AccessListEntry;
 import org.hyperledger.besu.plugin.data.TransactionType;
 
 import java.math.BigInteger;
+import java.util.List;
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
 
 public class TransactionTestFixture {
+  private static final Hash DEFAULT_VERSIONED_HASH =
+      Hash.wrap(
+          Bytes32.wrap(
+              Bytes.concatenate(Bytes.fromHexString("0x01"), Bytes.repeat((byte) 42, 31))));
 
   private TransactionType transactionType = TransactionType.FRONTIER;
 
   private long nonce = 0;
 
-  private Wei gasPrice = Wei.of(5);
+  private Optional<Wei> gasPrice = Optional.empty();
 
   private long gasLimit = 5000;
 
@@ -39,27 +49,52 @@ public class TransactionTestFixture {
 
   private Bytes payload = Bytes.EMPTY;
 
-  private Optional<BigInteger> chainId = Optional.of(BigInteger.valueOf(2018));
+  private Optional<BigInteger> chainId = Optional.of(BigInteger.valueOf(1337));
 
-  private Optional<Wei> gasPremium = Optional.empty();
-  private Optional<Wei> feeCap = Optional.empty();
+  private Optional<Wei> maxPriorityFeePerGas = Optional.empty();
+  private Optional<Wei> maxFeePerGas = Optional.empty();
+  private Optional<Wei> maxFeePerDataGas = Optional.empty();
+
+  private Optional<List<AccessListEntry>> accessListEntries = Optional.empty();
+  private Optional<List<Hash>> versionedHashes = Optional.empty();
+
+  private Optional<BigInteger> v = Optional.empty();
 
   public Transaction createTransaction(final KeyPair keys) {
     final Transaction.Builder builder = Transaction.builder();
     builder
         .type(transactionType)
         .gasLimit(gasLimit)
-        .gasPrice(gasPrice)
         .nonce(nonce)
         .payload(payload)
         .value(value)
         .sender(sender);
 
+    switch (transactionType) {
+      case FRONTIER:
+        builder.gasPrice(gasPrice.orElse(Wei.of(5000)));
+        break;
+      case ACCESS_LIST:
+        builder.gasPrice(gasPrice.orElse(Wei.of(5000)));
+        builder.accessList(accessListEntries.orElse(List.of()));
+        break;
+      case EIP1559:
+        builder.maxPriorityFeePerGas(maxPriorityFeePerGas.orElse(Wei.of(500)));
+        builder.maxFeePerGas(maxFeePerGas.orElse(Wei.of(5000)));
+        builder.accessList(accessListEntries.orElse(List.of()));
+        break;
+      case BLOB:
+        builder.maxPriorityFeePerGas(maxPriorityFeePerGas.orElse(Wei.of(500)));
+        builder.maxFeePerGas(maxFeePerGas.orElse(Wei.of(5000)));
+        builder.accessList(accessListEntries.orElse(List.of()));
+        builder.maxFeePerDataGas(maxFeePerDataGas.orElse(Wei.ONE));
+        builder.versionedHashes(versionedHashes.orElse(List.of(DEFAULT_VERSIONED_HASH)));
+        break;
+    }
+
     to.ifPresent(builder::to);
     chainId.ifPresent(builder::chainId);
-
-    gasPremium.ifPresent(builder::gasPremium);
-    feeCap.ifPresent(builder::feeCap);
+    v.ifPresent(builder::v);
 
     return builder.signAndBuild(keys);
   }
@@ -75,7 +110,7 @@ public TransactionTestFixture nonce(final long nonce) {
   }
 
   public TransactionTestFixture gasPrice(final Wei gasPrice) {
-    this.gasPrice = gasPrice;
+    this.gasPrice = Optional.ofNullable(gasPrice);
     return this;
   }
 
@@ -109,13 +144,33 @@ public TransactionTestFixture chainId(final Optional<BigInteger> chainId) {
     return this;
   }
 
-  public TransactionTestFixture gasPremium(final Optional<Wei> gasPremium) {
-    this.gasPremium = gasPremium;
+  public TransactionTestFixture maxPriorityFeePerGas(final Optional<Wei> maxPriorityFeePerGas) {
+    this.maxPriorityFeePerGas = maxPriorityFeePerGas;
+    return this;
+  }
+
+  public TransactionTestFixture maxFeePerGas(final Optional<Wei> maxFeePerGas) {
+    this.maxFeePerGas = maxFeePerGas;
+    return this;
+  }
+
+  public TransactionTestFixture maxFeePerDataGas(final Optional<Wei> maxFeePerDataGas) {
+    this.maxFeePerDataGas = maxFeePerDataGas;
+    return this;
+  }
+
+  public TransactionTestFixture accessList(final List<AccessListEntry> accessListEntries) {
+    this.accessListEntries = Optional.ofNullable(accessListEntries);
+    return this;
+  }
+
+  public TransactionTestFixture versionedHashes(final List<Hash> versionedHashes) {
+    this.versionedHashes = Optional.ofNullable(versionedHashes);
     return this;
   }
 
-  public TransactionTestFixture feeCap(final Optional<Wei> feeCap) {
-    this.feeCap = feeCap;
+  public TransactionTestFixture v(final Optional<BigInteger> v) {
+    this.v = v;
     return this;
   }
 }
diff --git a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/TrieGenerator.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/TrieGenerator.java
new file mode 100644
index 00000000000..9ee15e0775b
--- /dev/null
+++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/TrieGenerator.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+
+public class TrieGenerator {
+
+  public static MerkleTrie<Bytes, Bytes> generateTrie(
+      final WorldStateStorage worldStateStorage, final int nbAccounts) {
+    return generateTrie(
+        worldStateStorage,
+        IntStream.range(0, nbAccounts)
+            .mapToObj(operand -> Hash.wrap(Bytes32.leftPad(Bytes.of(operand + 1))))
+            .collect(Collectors.toList()));
+  }
+
+  public static MerkleTrie<Bytes, Bytes> generateTrie(
+      final WorldStateStorage worldStateStorage, final List<Hash> accounts) {
+    final MerkleTrie<Bytes, Bytes> accountStateTrie = emptyAccountStateTrie(worldStateStorage);
+    // Add some storage values
+    for (int i = 0; i < accounts.size(); i++) {
+      final WorldStateStorage.Updater updater = worldStateStorage.updater();
+      final MerkleTrie<Bytes, Bytes> storageTrie =
+          emptyStorageTrie(worldStateStorage, accounts.get(i));
+      writeStorageValue(updater, storageTrie, accounts.get(i), UInt256.ONE, UInt256.valueOf(2L));
+      writeStorageValue(
+          updater, storageTrie, accounts.get(i), UInt256.valueOf(2L), UInt256.valueOf(4L));
+      writeStorageValue(
+          updater, storageTrie, accounts.get(i), UInt256.valueOf(3L), UInt256.valueOf(6L));
+      int accountIndex = i;
+      storageTrie.commit(
+          (location, hash, value) ->
+              updater.putAccountStorageTrieNode(accounts.get(accountIndex), location, hash, value));
+      final Bytes code = Bytes32.leftPad(Bytes.of(i + 10));
+      final Hash codeHash = Hash.hash(code);
+      final StateTrieAccountValue accountValue =
+          new StateTrieAccountValue(1L, Wei.of(2L), Hash.wrap(storageTrie.getRootHash()), codeHash);
+      accountStateTrie.put(accounts.get(i), RLP.encode(accountValue::writeTo));
+      if (worldStateStorage instanceof BonsaiWorldStateKeyValueStorage) {
+        ((BonsaiWorldStateKeyValueStorage.Updater) updater)
+            .putAccountInfoState(accounts.get(i), RLP.encode(accountValue::writeTo));
+        updater.putCode(accounts.get(i), code);
+      }
+      accountStateTrie.commit(updater::putAccountStateTrieNode);
+      updater.putCode(codeHash, code);
+      // Persist updates
+      updater.commit();
+    }
+    return accountStateTrie;
+  }
+
+  private static void writeStorageValue(
+      final WorldStateStorage.Updater updater,
+      final MerkleTrie<Bytes, Bytes> storageTrie,
+      final Hash hash,
+      final UInt256 key,
+      final UInt256 value) {
+    final Hash keyHash = storageKeyHash(key);
+    final Bytes encodedValue = encodeStorageValue(value);
+    storageTrie.put(keyHash, encodeStorageValue(value));
+    if (updater instanceof BonsaiWorldStateKeyValueStorage.Updater) {
+      ((BonsaiWorldStateKeyValueStorage.Updater) updater)
+          .putStorageValueBySlotHash(hash, keyHash, encodedValue);
+    }
+  }
+
+  private static Hash storageKeyHash(final UInt256 storageKey) {
+    return Hash.hash(storageKey);
+  }
+
+  private static Bytes encodeStorageValue(final UInt256 storageValue) {
+    return RLP.encode(out -> out.writeBytes(storageValue.toMinimalBytes()));
+  }
+
+  public static MerkleTrie<Bytes, Bytes> emptyStorageTrie(
+      final WorldStateStorage worldStateStorage, final Hash accountHash) {
+    return new StoredMerklePatriciaTrie<>(
+        (location, hash) ->
+            worldStateStorage.getAccountStorageTrieNode(accountHash, location, hash),
+        b -> b,
+        b -> b);
+  }
+
+  public static MerkleTrie<Bytes, Bytes> emptyAccountStateTrie(
+      final WorldStateStorage worldStateStorage) {
+    return new StoredMerklePatriciaTrie<>(
+        worldStateStorage::getAccountStateTrieNode, b -> b, b -> b);
+  }
+}
diff --git a/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/VariablesStorageHelper.java b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/VariablesStorageHelper.java
new file mode 100644
index 00000000000..9744748ef1f
--- /dev/null
+++ b/ethereum/core/src/test-support/java/org/hyperledger/besu/ethereum/core/VariablesStorageHelper.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.CHAIN_HEAD_HASH;
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.FINALIZED_BLOCK_HASH;
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.FORK_HEADS;
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.SAFE_BLOCK_HASH;
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.SEQ_NO_STORE;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
+
+import java.util.EnumMap;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+public class VariablesStorageHelper {
+  public static final Bytes VARIABLES_PREFIX = Bytes.of(1);
+  public static final Hash SAMPLE_CHAIN_HEAD = Hash.fromHexStringLenient("0x01234");
+  public static final Hash SAMPLE_FINALIZED = Hash.fromHexStringLenient("0x56789");
+  public static final Hash SAMPLE_SAFE = Hash.fromHexStringLenient("0xabcde");
+  public static final Hash FORK1 = Hash.fromHexStringLenient("0xf1357");
+  public static final Hash FORK2 = Hash.fromHexStringLenient("0xf2468");
+  public static final Bytes SAMPLE_FORK_HEADS =
+      RLP.encode(o -> o.writeList(List.of(FORK1, FORK2), (val, out) -> out.writeBytes(val)));
+  public static final Bytes SAMPLE_ERN_SEQNO = Bytes.fromHexStringLenient("0xabc123");
+  public static final EnumSet<Keys> NOT_PREFIXED_KEYS = EnumSet.of(SEQ_NO_STORE);
+
+  public static Map<Keys, Bytes> getSampleVariableValues() {
+    final var variableValues = new EnumMap<Keys, Bytes>(Keys.class);
+    variableValues.put(CHAIN_HEAD_HASH, SAMPLE_CHAIN_HEAD);
+    variableValues.put(FINALIZED_BLOCK_HASH, SAMPLE_FINALIZED);
+    variableValues.put(SAFE_BLOCK_HASH, SAMPLE_SAFE);
+    variableValues.put(FORK_HEADS, SAMPLE_FORK_HEADS);
+    variableValues.put(SEQ_NO_STORE, SAMPLE_ERN_SEQNO);
+    return variableValues;
+  }
+
+  public static void assertNoVariablesInStorage(final KeyValueStorage kvStorage) {
+    assertThat(kvStorage.streamKeys()).isEmpty();
+  }
+
+  public static void assertVariablesPresentInVariablesStorage(
+      final KeyValueStorage kvVariables, final Map<Keys, Bytes> variableValues) {
+    assertVariablesPresentInStorage(kvVariables, Bytes.EMPTY, variableValues);
+  }
+
+  public static void assertVariablesPresentInBlockchainStorage(
+      final KeyValueStorage kvBlockchain, final Map<Keys, Bytes> variableValues) {
+    assertVariablesPresentInStorage(kvBlockchain, VARIABLES_PREFIX, variableValues);
+  }
+
+  public static void assertVariablesPresentInStorage(
+      final KeyValueStorage kvStorage, final Bytes prefix, final Map<Keys, Bytes> variableValues) {
+    variableValues.forEach(
+        (k, v) ->
+            assertThat(
+                    kvStorage.get(
+                        Bytes.concatenate(
+                                (NOT_PREFIXED_KEYS.contains(k) ? Bytes.EMPTY : prefix),
+                                k.getBytes())
+                            .toArrayUnsafe()))
+                .contains(v.toArrayUnsafe()));
+  }
+
+  public static void assertVariablesReturnedByBlockchainStorage(
+      final KeyValueStoragePrefixedKeyBlockchainStorage blockchainStorage,
+      final Map<Keys, Bytes> variableValues) {
+    variableValues.computeIfPresent(
+        CHAIN_HEAD_HASH,
+        (k, v) -> {
+          assertThat(blockchainStorage.getChainHead()).isPresent().contains(bytesToHash(v));
+          return v;
+        });
+
+    variableValues.computeIfPresent(
+        FINALIZED_BLOCK_HASH,
+        (k, v) -> {
+          assertThat(blockchainStorage.getFinalized()).isPresent().contains(bytesToHash(v));
+          return v;
+        });
+
+    variableValues.computeIfPresent(
+        SAFE_BLOCK_HASH,
+        (k, v) -> {
+          assertThat(blockchainStorage.getSafeBlock()).isPresent().contains(bytesToHash(v));
+          return v;
+        });
+
+    variableValues.computeIfPresent(
+        FORK_HEADS,
+        (k, v) -> {
+          assertThat(blockchainStorage.getForkHeads())
+              .containsExactlyElementsOf(
+                  RLP.input(v).readList(in -> bytesToHash(in.readBytes32())));
+          return v;
+        });
+  }
+
+  public static void populateBlockchainStorage(
+      final KeyValueStorage storage, final Map<Keys, Bytes> variableValues) {
+    populateStorage(storage, VARIABLES_PREFIX, variableValues);
+  }
+
+  public static void populateVariablesStorage(
+      final KeyValueStorage storage, final Map<Keys, Bytes> variableValues) {
+    populateStorage(storage, Bytes.EMPTY, variableValues);
+  }
+
+  public static void populateStorage(
+      final KeyValueStorage storage, final Bytes prefix, final Map<Keys, Bytes> variableValues) {
+    populateVariables(storage, prefix, variableValues);
+  }
+
+  public static void populateVariables(
+      final KeyValueStorage storage, final Bytes prefix, final Map<Keys, Bytes> variableValues) {
+    final var tx = storage.startTransaction();
+    variableValues.forEach(
+        (k, v) -> putVariable(tx, (NOT_PREFIXED_KEYS.contains(k) ? Bytes.EMPTY : prefix), k, v));
+    tx.commit();
+  }
+
+  public static void putVariable(
+      final KeyValueStorageTransaction tx, final Bytes prefix, final Keys key, final Bytes value) {
+    tx.put(Bytes.concatenate(prefix, key.getBytes()).toArrayUnsafe(), value.toArrayUnsafe());
+  }
+
+  public static Hash bytesToHash(final Bytes bytes) {
+    return Hash.wrap(Bytes32.wrap(bytes, 0));
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/BlockImportExceptionHandlingTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/BlockImportExceptionHandlingTest.java
new file mode 100644
index 00000000000..e1b4bc9b8e1
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/BlockImportExceptionHandlingTest.java
@@ -0,0 +1,258 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.bonsai.BonsaiWorldStateProvider;
+import org.hyperledger.besu.ethereum.bonsai.cache.CachedMerkleTrieLoader;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.bonsai.worldview.BonsaiWorldState;
+import org.hyperledger.besu.ethereum.chain.BadBlockManager;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.mainnet.AbstractBlockProcessor;
+import org.hyperledger.besu.ethereum.mainnet.BlockBodyValidator;
+import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
+import org.hyperledger.besu.ethereum.mainnet.BlockProcessor;
+import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockProcessor;
+import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.storage.StorageProvider;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.services.exception.StorageException;
+
+import java.util.Optional;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class BlockImportExceptionHandlingTest {
+
+  private final MainnetTransactionProcessor transactionProcessor =
+      mock(MainnetTransactionProcessor.class);
+  private final AbstractBlockProcessor.TransactionReceiptFactory transactionReceiptFactory =
+      mock(AbstractBlockProcessor.TransactionReceiptFactory.class);
+
+  private final ProtocolSchedule protocolSchedule = mock(ProtocolSchedule.class);
+  private final BlockProcessor blockProcessor =
+      new MainnetBlockProcessor(
+          transactionProcessor,
+          transactionReceiptFactory,
+          Wei.ZERO,
+          BlockHeader::getCoinbase,
+          true,
+          protocolSchedule);
+  private final BlockHeaderValidator blockHeaderValidator = mock(BlockHeaderValidator.class);
+  private final BlockBodyValidator blockBodyValidator = mock(BlockBodyValidator.class);
+  private final ProtocolContext protocolContext = mock(ProtocolContext.class);
+  private final ProtocolSpec protocolSpec = mock(ProtocolSpec.class);
+  protected final MutableBlockchain blockchain = mock(MutableBlockchain.class);
+  private final StorageProvider storageProvider = new InMemoryKeyValueStorageProvider();
+
+  private final WorldStateStorage worldStateStorage =
+      new BonsaiWorldStateKeyValueStorage(storageProvider, new NoOpMetricsSystem());
+
+  private CachedMerkleTrieLoader cachedMerkleTrieLoader;
+
+  private final WorldStateArchive worldStateArchive =
+      // contains a BonsaiWorldState which we need to spy on.
+      // do we need to also test with a DefaultWorldStateArchive?
+      spy(
+          new BonsaiWorldStateProvider(
+              storageProvider, blockchain, cachedMerkleTrieLoader, new NoOpMetricsSystem(), null));
+
+  private final BonsaiWorldState persisted =
+      spy(
+          new BonsaiWorldState(
+              (BonsaiWorldStateProvider) worldStateArchive,
+              (BonsaiWorldStateKeyValueStorage) worldStateStorage));
+
+  private final BadBlockManager badBlockManager = new BadBlockManager();
+
+  private MainnetBlockValidator mainnetBlockValidator;
+
+  @Before
+  public void setup() {
+    when(protocolContext.getBlockchain()).thenReturn(blockchain);
+    when(protocolContext.getWorldStateArchive()).thenReturn(worldStateArchive);
+    when(protocolSchedule.getByBlockHeader(any())).thenReturn(protocolSpec);
+    mainnetBlockValidator =
+        new MainnetBlockValidator(
+            blockHeaderValidator, blockBodyValidator, blockProcessor, badBlockManager);
+    cachedMerkleTrieLoader = new CachedMerkleTrieLoader(new NoOpMetricsSystem());
+  }
+
+  @Test
+  public void shouldNotBadBlockWhenInternalErrorDuringPersisting() {
+
+    Mockito.doThrow(new StorageException("database problem")).when(persisted).persist(any());
+    Mockito.doReturn(persisted).when(worldStateArchive).getMutable();
+    Mockito.doReturn(Optional.of(persisted)).when(worldStateArchive).getMutable(any(), any());
+
+    Block goodBlock =
+        new BlockDataGenerator()
+            .block(
+                BlockDataGenerator.BlockOptions.create()
+                    .setBlockNumber(0)
+                    .hasTransactions(false)
+                    .setBlockHeaderFunctions(new MainnetBlockHeaderFunctions()));
+
+    when(blockchain.getBlockHeader(any(Hash.class)))
+        .thenReturn(Optional.of(new BlockHeaderTestFixture().buildHeader()));
+    when(blockHeaderValidator.validateHeader(
+            any(BlockHeader.class),
+            any(BlockHeader.class),
+            eq(protocolContext),
+            eq(HeaderValidationMode.DETACHED_ONLY)))
+        .thenReturn(true);
+
+    when(blockBodyValidator.validateBody(
+            eq(protocolContext),
+            eq(goodBlock),
+            any(),
+            any(),
+            eq(HeaderValidationMode.DETACHED_ONLY)))
+        .thenReturn(true);
+    assertThat(badBlockManager.getBadBlocks()).isEmpty();
+    mainnetBlockValidator.validateAndProcessBlock(
+        protocolContext,
+        goodBlock,
+        HeaderValidationMode.DETACHED_ONLY,
+        HeaderValidationMode.DETACHED_ONLY);
+    assertThat(badBlockManager.getBadBlocks()).isEmpty();
+  }
+
+  @Test
+  public void shouldNotBadBlockWhenInternalErrorOnBlockLookup() {
+
+    Block goodBlock =
+        new BlockDataGenerator()
+            .block(
+                BlockDataGenerator.BlockOptions.create()
+                    .setBlockNumber(0)
+                    .hasTransactions(false)
+                    .setBlockHeaderFunctions(new MainnetBlockHeaderFunctions()));
+
+    when(blockchain.getBlockHeader(any(Hash.class)))
+        .thenThrow(new StorageException("database problem"));
+    when(blockHeaderValidator.validateHeader(
+            any(BlockHeader.class),
+            any(BlockHeader.class),
+            eq(protocolContext),
+            eq(HeaderValidationMode.DETACHED_ONLY)))
+        .thenReturn(true);
+
+    when(blockBodyValidator.validateBody(
+            eq(protocolContext),
+            eq(goodBlock),
+            any(),
+            any(),
+            eq(HeaderValidationMode.DETACHED_ONLY)))
+        .thenReturn(true);
+    assertThat(badBlockManager.getBadBlocks().size()).isEqualTo(0);
+    mainnetBlockValidator.validateAndProcessBlock(
+        protocolContext,
+        goodBlock,
+        HeaderValidationMode.DETACHED_ONLY,
+        HeaderValidationMode.DETACHED_ONLY);
+    assertThat(badBlockManager.getBadBlocks()).isEmpty();
+  }
+
+  @Test
+  public void shouldNotBadBlockWhenInternalErrorDuringValidateHeader() {
+
+    Block goodBlock =
+        new BlockDataGenerator()
+            .block(
+                BlockDataGenerator.BlockOptions.create()
+                    .setBlockNumber(0)
+                    .hasTransactions(false)
+                    .setBlockHeaderFunctions(new MainnetBlockHeaderFunctions()));
+
+    when(blockchain.getBlockHeader(any(Hash.class)))
+        .thenReturn(Optional.of(new BlockHeaderTestFixture().buildHeader()));
+    when(blockHeaderValidator.validateHeader(
+            any(BlockHeader.class),
+            any(BlockHeader.class),
+            eq(protocolContext),
+            eq(HeaderValidationMode.DETACHED_ONLY)))
+        .thenThrow(new StorageException("database problem"));
+
+    assertThat(badBlockManager.getBadBlocks()).isEmpty();
+    mainnetBlockValidator.validateAndProcessBlock(
+        protocolContext,
+        goodBlock,
+        HeaderValidationMode.DETACHED_ONLY,
+        HeaderValidationMode.DETACHED_ONLY);
+    assertThat(badBlockManager.getBadBlocks()).isEmpty();
+  }
+
+  @Test
+  public void shouldNotBadBlockWhenInternalErrorDuringValidateBody() {
+    Mockito.doNothing().when(persisted).persist(any());
+    Mockito.doReturn(persisted).when(worldStateArchive).getMutable();
+    Mockito.doReturn(Optional.of(persisted)).when(worldStateArchive).getMutable(any(), any());
+
+    Block goodBlock =
+        new BlockDataGenerator()
+            .block(
+                BlockDataGenerator.BlockOptions.create()
+                    .setBlockNumber(0)
+                    .hasTransactions(false)
+                    .setBlockHeaderFunctions(new MainnetBlockHeaderFunctions()));
+
+    when(blockchain.getBlockHeader(any(Hash.class)))
+        .thenReturn(Optional.of(new BlockHeaderTestFixture().buildHeader()));
+    when(blockHeaderValidator.validateHeader(
+            any(BlockHeader.class),
+            any(BlockHeader.class),
+            eq(protocolContext),
+            eq(HeaderValidationMode.DETACHED_ONLY)))
+        .thenReturn(true);
+
+    when(blockBodyValidator.validateBody(
+            eq(protocolContext),
+            eq(goodBlock),
+            any(),
+            any(),
+            eq(HeaderValidationMode.DETACHED_ONLY)))
+        .thenThrow(new StorageException("database problem"));
+    assertThat(badBlockManager.getBadBlocks()).isEmpty();
+    mainnetBlockValidator.validateAndProcessBlock(
+        protocolContext,
+        goodBlock,
+        HeaderValidationMode.DETACHED_ONLY,
+        HeaderValidationMode.DETACHED_ONLY);
+    assertThat(badBlockManager.getBadBlocks()).isEmpty();
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/MainnetBlockValidatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/MainnetBlockValidatorTest.java
index ca5be707d2b..dbee1a7ceaa 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/MainnetBlockValidatorTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/MainnetBlockValidatorTest.java
@@ -16,20 +16,20 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.BadBlockManager;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 import org.hyperledger.besu.ethereum.mainnet.BlockBodyValidator;
 import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
 import org.hyperledger.besu.ethereum.mainnet.BlockProcessor;
@@ -37,8 +37,6 @@
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.Optional;
 
 import org.junit.Before;
@@ -107,15 +105,16 @@ public void shouldDetectAndCacheInvalidBlocksWhenHeaderInvalid() {
 
   @Test
   public void shouldDetectAndCacheInvalidBlocksWhenParentWorldStateNotAvailable() {
-    when(blockchain.getBlockHeader(any(Hash.class)))
-        .thenReturn(Optional.of(new BlockHeaderTestFixture().buildHeader()));
+
+    final BlockHeader blockHeader = new BlockHeaderTestFixture().buildHeader();
+    when(blockchain.getBlockHeader(any(Hash.class))).thenReturn(Optional.of(blockHeader));
     when(blockHeaderValidator.validateHeader(
             any(BlockHeader.class),
             any(BlockHeader.class),
             eq(protocolContext),
             eq(HeaderValidationMode.DETACHED_ONLY)))
         .thenReturn(true);
-    when(worldStateArchive.getMutable(any(Hash.class))).thenReturn(Optional.empty());
+    when(worldStateArchive.getMutable(eq(blockHeader), anyBoolean())).thenReturn(Optional.empty());
 
     assertThat(badBlockManager.getBadBlocks().size()).isEqualTo(0);
     mainnetBlockValidator.validateAndProcessBlock(
@@ -128,30 +127,18 @@ public void shouldDetectAndCacheInvalidBlocksWhenParentWorldStateNotAvailable()
 
   @Test
   public void shouldDetectAndCacheInvalidBlocksWhenProcessBlockFailed() {
-    when(blockchain.getBlockHeader(any(Hash.class)))
-        .thenReturn(Optional.of(new BlockHeaderTestFixture().buildHeader()));
+    final BlockHeader blockHeader = new BlockHeaderTestFixture().buildHeader();
+    when(blockchain.getBlockHeader(any(Hash.class))).thenReturn(Optional.of(blockHeader));
     when(blockHeaderValidator.validateHeader(
             any(BlockHeader.class),
             any(BlockHeader.class),
             eq(protocolContext),
             eq(HeaderValidationMode.DETACHED_ONLY)))
         .thenReturn(true);
-    when(worldStateArchive.getMutable(any(Hash.class)))
+    when(worldStateArchive.getMutable(eq(blockHeader), anyBoolean()))
         .thenReturn(Optional.of(mock(MutableWorldState.class)));
     when(blockProcessor.processBlock(eq(blockchain), any(MutableWorldState.class), eq(badBlock)))
-        .thenReturn(
-            new BlockProcessor.Result() {
-              @SuppressWarnings("unchecked")
-              @Override
-              public List<TransactionReceipt> getReceipts() {
-                return Collections.EMPTY_LIST;
-              }
-
-              @Override
-              public boolean isSuccessful() {
-                return false;
-              }
-            });
+        .thenReturn(new BlockProcessingResult(Optional.empty()));
     assertThat(badBlockManager.getBadBlocks().size()).isEqualTo(0);
     mainnetBlockValidator.validateAndProcessBlock(
         protocolContext,
@@ -163,30 +150,18 @@ public boolean isSuccessful() {
 
   @Test
   public void shouldDetectAndCacheInvalidBlocksWhenBodyInvalid() {
-    when(blockchain.getBlockHeader(any(Hash.class)))
-        .thenReturn(Optional.of(new BlockHeaderTestFixture().buildHeader()));
+    final BlockHeader blockHeader = new BlockHeaderTestFixture().buildHeader();
+    when(blockchain.getBlockHeader(any(Hash.class))).thenReturn(Optional.of(blockHeader));
     when(blockHeaderValidator.validateHeader(
             any(BlockHeader.class),
             any(BlockHeader.class),
             eq(protocolContext),
             eq(HeaderValidationMode.DETACHED_ONLY)))
         .thenReturn(true);
-    when(worldStateArchive.getMutable(any(Hash.class)))
+    when(worldStateArchive.getMutable(eq(blockHeader), anyBoolean()))
         .thenReturn(Optional.of(mock(MutableWorldState.class)));
     when(blockProcessor.processBlock(eq(blockchain), any(MutableWorldState.class), eq(badBlock)))
-        .thenReturn(
-            new BlockProcessor.Result() {
-              @SuppressWarnings("unchecked")
-              @Override
-              public List<TransactionReceipt> getReceipts() {
-                return Collections.EMPTY_LIST;
-              }
-
-              @Override
-              public boolean isSuccessful() {
-                return true;
-              }
-            });
+        .thenReturn(new BlockProcessingResult(Optional.empty()));
     assertThat(badBlockManager.getBadBlocks().size()).isEqualTo(0);
     mainnetBlockValidator.validateAndProcessBlock(
         protocolContext,
@@ -198,30 +173,23 @@ public boolean isSuccessful() {
 
   @Test
   public void shouldNotCacheWhenValidBlocks() {
-    when(blockchain.getBlockHeader(any(Hash.class)))
-        .thenReturn(Optional.of(new BlockHeaderTestFixture().buildHeader()));
+
+    MutableWorldState mockWorldState = mock(MutableWorldState.class);
+
+    final BlockHeader blockHeader = new BlockHeaderTestFixture().buildHeader();
+    when(blockchain.getBlockHeader(any(Hash.class))).thenReturn(Optional.of(blockHeader));
     when(blockHeaderValidator.validateHeader(
             any(BlockHeader.class),
             any(BlockHeader.class),
             eq(protocolContext),
             eq(HeaderValidationMode.DETACHED_ONLY)))
         .thenReturn(true);
-    when(worldStateArchive.getMutable(any(Hash.class)))
-        .thenReturn(Optional.of(mock(MutableWorldState.class)));
+    when(worldStateArchive.getMutable(eq(blockHeader), anyBoolean()))
+        .thenReturn(Optional.of(mockWorldState));
+    when(worldStateArchive.getMutable(any(Hash.class), any(Hash.class)))
+        .thenReturn(Optional.of(mockWorldState));
     when(blockProcessor.processBlock(eq(blockchain), any(MutableWorldState.class), eq(badBlock)))
-        .thenReturn(
-            new BlockProcessor.Result() {
-              @SuppressWarnings("unchecked")
-              @Override
-              public List<TransactionReceipt> getReceipts() {
-                return Collections.EMPTY_LIST;
-              }
-
-              @Override
-              public boolean isSuccessful() {
-                return true;
-              }
-            });
+        .thenReturn(new BlockProcessingResult(Optional.empty()));
     when(blockBodyValidator.validateBody(
             eq(protocolContext),
             eq(badBlock),
@@ -255,4 +223,48 @@ public void shouldReturnBadBlockBasedOnTheHash() {
         HeaderValidationMode.DETACHED_ONLY);
     assertThat(badBlockManager.getBadBlock(badBlock.getHash())).containsSame(badBlock);
   }
+
+  @Test
+  public void when_shouldRecordBadBlockIsFalse_Expect_BlockNotAddedToBadBlockManager() {
+    when(blockchain.getBlockHeader(any(Hash.class)))
+        .thenReturn(Optional.of(new BlockHeaderTestFixture().buildHeader()));
+    mainnetBlockValidator.validateAndProcessBlock(
+        protocolContext,
+        badBlock,
+        HeaderValidationMode.DETACHED_ONLY,
+        HeaderValidationMode.DETACHED_ONLY,
+        false,
+        false);
+
+    assertThat(badBlockManager.getBadBlocks().size()).isEqualTo(0);
+  }
+
+  @Test
+  public void when_shouldRecordBadBlockIsTrue_Expect_BlockAddedToBadBlockManager() {
+    when(blockchain.getBlockHeader(any(Hash.class)))
+        .thenReturn(Optional.of(new BlockHeaderTestFixture().buildHeader()));
+    mainnetBlockValidator.validateAndProcessBlock(
+        protocolContext,
+        badBlock,
+        HeaderValidationMode.DETACHED_ONLY,
+        HeaderValidationMode.DETACHED_ONLY,
+        false,
+        true);
+
+    assertThat(badBlockManager.getBadBlocks().size()).isEqualTo(1);
+  }
+
+  @Test
+  public void when_shouldRecordBadBlockIsNotSet_Expect_BlockAddedToBadBlockManager() {
+    when(blockchain.getBlockHeader(any(Hash.class)))
+        .thenReturn(Optional.of(new BlockHeaderTestFixture().buildHeader()));
+    mainnetBlockValidator.validateAndProcessBlock(
+        protocolContext,
+        badBlock,
+        HeaderValidationMode.DETACHED_ONLY,
+        HeaderValidationMode.DETACHED_ONLY,
+        false);
+
+    assertThat(badBlockManager.getBadBlocks().size()).isEqualTo(1);
+  }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/AbstractIsolationTests.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/AbstractIsolationTests.java
new file mode 100644
index 00000000000..a441408c240
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/AbstractIsolationTests.java
@@ -0,0 +1,281 @@
+/*
+ * Copyright Hyperledger Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.bonsai;
+
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+
+import org.hyperledger.besu.config.GenesisAllocation;
+import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SECPPrivateKey;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.BlockProcessingResult;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.blockcreation.AbstractBlockCreator;
+import org.hyperledger.besu.ethereum.bonsai.cache.CachedMerkleTrieLoader;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.chain.GenesisState;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.core.SealableBlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
+import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolReplacementHandler;
+import org.hyperledger.besu.ethereum.eth.transactions.layered.EndLayer;
+import org.hyperledger.besu.ethereum.eth.transactions.layered.GasPricePrioritizedTransactions;
+import org.hyperledger.besu.ethereum.eth.transactions.layered.LayeredPendingTransactions;
+import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.storage.StorageProvider;
+import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
+import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProviderBuilder;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.services.BesuConfiguration;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBKeyValueStorageFactory;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBMetricsFactory;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.rules.TemporaryFolder;
+
+public abstract class AbstractIsolationTests {
+  protected BonsaiWorldStateProvider archive;
+  protected BonsaiWorldStateKeyValueStorage bonsaiWorldStateStorage;
+  protected ProtocolContext protocolContext;
+  final Function<String, KeyPair> asKeyPair =
+      key ->
+          SignatureAlgorithmFactory.getInstance()
+              .createKeyPair(SECPPrivateKey.create(Bytes32.fromHexString(key), "ECDSA"));
+  protected final ProtocolSchedule protocolSchedule =
+      MainnetProtocolSchedule.fromConfig(GenesisConfigFile.development().getConfigOptions());
+  protected final GenesisState genesisState =
+      GenesisState.fromConfig(GenesisConfigFile.development(), protocolSchedule);
+  protected final MutableBlockchain blockchain = createInMemoryBlockchain(genesisState.getBlock());
+
+  protected final TransactionPoolConfiguration poolConfiguration =
+      ImmutableTransactionPoolConfiguration.builder().txPoolMaxSize(100).build();
+
+  protected final TransactionPoolReplacementHandler transactionReplacementHandler =
+      new TransactionPoolReplacementHandler(poolConfiguration.getPriceBump());
+
+  protected final BiFunction<PendingTransaction, PendingTransaction, Boolean>
+      transactionReplacementTester =
+          (t1, t2) ->
+              transactionReplacementHandler.shouldReplace(
+                  t1, t2, protocolContext.getBlockchain().getChainHeadHeader());
+
+  protected TransactionPoolMetrics txPoolMetrics =
+      new TransactionPoolMetrics(new NoOpMetricsSystem());
+
+  protected final PendingTransactions sorter =
+      new LayeredPendingTransactions(
+          poolConfiguration,
+          new GasPricePrioritizedTransactions(
+              poolConfiguration,
+              new EndLayer(txPoolMetrics),
+              txPoolMetrics,
+              transactionReplacementTester));
+
+  protected final List<GenesisAllocation> accounts =
+      GenesisConfigFile.development()
+          .streamAllocations()
+          .filter(ga -> ga.getPrivateKey().isPresent())
+          .collect(Collectors.toList());
+
+  KeyPair sender1 = asKeyPair.apply(accounts.get(0).getPrivateKey().get());
+
+  @Rule public final TemporaryFolder tempData = new TemporaryFolder();
+
+  @Before
+  public void createStorage() {
+    bonsaiWorldStateStorage =
+        (BonsaiWorldStateKeyValueStorage)
+            createKeyValueStorageProvider().createWorldStateStorage(DataStorageFormat.BONSAI);
+    archive =
+        new BonsaiWorldStateProvider(
+            bonsaiWorldStateStorage,
+            blockchain,
+            Optional.of(16L),
+            new CachedMerkleTrieLoader(new NoOpMetricsSystem()),
+            new NoOpMetricsSystem(),
+            null);
+    var ws = archive.getMutable();
+    genesisState.writeStateTo(ws);
+    protocolContext = new ProtocolContext(blockchain, archive, null, Optional.empty());
+  }
+
+  // storage provider which uses a temporary directory based rocksdb
+  protected StorageProvider createKeyValueStorageProvider() {
+    try {
+      tempData.create();
+      return new KeyValueStorageProviderBuilder()
+          .withStorageFactory(
+              new RocksDBKeyValueStorageFactory(
+                  () ->
+                      new RocksDBFactoryConfiguration(
+                          1024 /* MAX_OPEN_FILES*/,
+                          4 /*BACKGROUND_THREAD_COUNT*/,
+                          8388608 /*CACHE_CAPACITY*/,
+                          false),
+                  Arrays.asList(KeyValueSegmentIdentifier.values()),
+                  2,
+                  RocksDBMetricsFactory.PUBLIC_ROCKS_DB_METRICS))
+          .withCommonConfiguration(
+              new BesuConfiguration() {
+
+                @Override
+                public Path getStoragePath() {
+                  return new File(tempData.getRoot().toString() + File.pathSeparator + "database")
+                      .toPath();
+                }
+
+                @Override
+                public Path getDataPath() {
+                  return tempData.getRoot().toPath();
+                }
+
+                @Override
+                public int getDatabaseVersion() {
+                  return 2;
+                }
+              })
+          .withMetricsSystem(new NoOpMetricsSystem())
+          .build();
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  static class TestBlockCreator extends AbstractBlockCreator {
+    private TestBlockCreator(
+        final Address coinbase,
+        final MiningBeneficiaryCalculator miningBeneficiaryCalculator,
+        final Supplier<Optional<Long>> targetGasLimitSupplier,
+        final ExtraDataCalculator extraDataCalculator,
+        final PendingTransactions pendingTransactions,
+        final ProtocolContext protocolContext,
+        final ProtocolSchedule protocolSchedule,
+        final Wei minTransactionGasPrice,
+        final Double minBlockOccupancyRatio,
+        final BlockHeader parentHeader) {
+      super(
+          coinbase,
+          miningBeneficiaryCalculator,
+          targetGasLimitSupplier,
+          extraDataCalculator,
+          pendingTransactions,
+          protocolContext,
+          protocolSchedule,
+          minTransactionGasPrice,
+          minBlockOccupancyRatio,
+          parentHeader,
+          Optional.empty());
+    }
+
+    static TestBlockCreator forHeader(
+        final BlockHeader parentHeader,
+        final ProtocolContext protocolContext,
+        final ProtocolSchedule protocolSchedule,
+        final PendingTransactions sorter) {
+      return new TestBlockCreator(
+          Address.ZERO,
+          __ -> Address.ZERO,
+          () -> Optional.of(30_000_000L),
+          __ -> Bytes.fromHexString("deadbeef"),
+          sorter,
+          protocolContext,
+          protocolSchedule,
+          Wei.of(1L),
+          0d,
+          parentHeader);
+    }
+
+    @Override
+    protected BlockHeader createFinalBlockHeader(final SealableBlockHeader sealableBlockHeader) {
+      return BlockHeaderBuilder.create()
+          .difficulty(Difficulty.ZERO)
+          .mixHash(Hash.ZERO)
+          .populateFrom(sealableBlockHeader)
+          .nonce(0L)
+          .blockHeaderFunctions(blockHeaderFunctions)
+          .buildBlockHeader();
+    }
+  }
+
+  protected Transaction burnTransaction(final KeyPair sender, final Long nonce, final Address to) {
+    return new TransactionTestFixture()
+        .sender(Address.extract(Hash.hash(sender.getPublicKey().getEncodedBytes())))
+        .to(Optional.of(to))
+        .value(Wei.of(1_000_000_000_000_000_000L))
+        .gasLimit(21_000L)
+        .nonce(nonce)
+        .createTransaction(sender);
+  }
+
+  protected Block forTransactions(final List<Transaction> transactions) {
+    return forTransactions(transactions, blockchain.getChainHeadHeader());
+  }
+
+  protected Block forTransactions(
+      final List<Transaction> transactions, final BlockHeader forHeader) {
+    return TestBlockCreator.forHeader(forHeader, protocolContext, protocolSchedule, sorter)
+        .createBlock(transactions, Collections.emptyList(), System.currentTimeMillis())
+        .getBlock();
+  }
+
+  protected BlockProcessingResult executeBlock(final MutableWorldState ws, final Block block) {
+    var res =
+        protocolSchedule
+            .getByBlockHeader(blockHeader(0))
+            .getBlockProcessor()
+            .processBlock(blockchain, ws, block);
+    blockchain.appendBlock(block, res.getReceipts());
+    return res;
+  }
+
+  private BlockHeader blockHeader(final long number) {
+    return new BlockHeaderTestFixture().number(number).buildHeader();
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/BonsaiSnapshotIsolationTests.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/BonsaiSnapshotIsolationTests.java
new file mode 100644
index 00000000000..384e667bda9
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/BonsaiSnapshotIsolationTests.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright Hyperledger Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.bonsai;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Block;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class BonsaiSnapshotIsolationTests extends AbstractIsolationTests {
+
+  @Test
+  public void ensureTruncateDoesNotCauseSegfault() {
+
+    var preTruncatedWorldState = archive.getMutable(genesisState.getBlock().getHeader(), false);
+    assertThat(preTruncatedWorldState)
+        .isPresent(); // really just assert that we have not segfaulted after truncating
+    bonsaiWorldStateStorage.clear();
+    var postTruncatedWorldState = archive.getMutable(genesisState.getBlock().getHeader(), false);
+    assertThat(postTruncatedWorldState).isEmpty();
+    // assert that trying to access pre-worldstate does not segfault after truncating
+    preTruncatedWorldState.get().get(Address.fromHexString(accounts.get(0).getAddress()));
+    assertThat(true).isTrue();
+  }
+
+  @Test
+  public void testIsolatedFromHead_behindHead() {
+    Address testAddress = Address.fromHexString("0xdeadbeef");
+    // assert we can mutate head without mutating the isolated snapshot
+    var isolated = archive.getMutable(genesisState.getBlock().getHeader(), false);
+
+    var firstBlock = forTransactions(List.of(burnTransaction(sender1, 0L, testAddress)));
+    var res = executeBlock(archive.getMutable(), firstBlock);
+
+    var isolated2 = archive.getMutable(firstBlock.getHeader(), false);
+    var secondBlock = forTransactions(List.of(burnTransaction(sender1, 1L, testAddress)));
+    var res2 = executeBlock(archive.getMutable(), secondBlock);
+
+    assertThat(res.isSuccessful()).isTrue();
+    assertThat(res2.isSuccessful()).isTrue();
+
+    assertThat(archive.getTrieLogManager().containWorldStateStorage(firstBlock.getHash())).isTrue();
+    assertThat(archive.getTrieLogManager().containWorldStateStorage(secondBlock.getHash()))
+        .isTrue();
+
+    assertThat(archive.getMutable().get(testAddress)).isNotNull();
+    assertThat(archive.getMutable().get(testAddress).getBalance())
+        .isEqualTo(Wei.of(2_000_000_000_000_000_000L));
+
+    assertThat(isolated.get().get(testAddress)).isNull();
+    assertThat(isolated.get().rootHash())
+        .isEqualTo(genesisState.getBlock().getHeader().getStateRoot());
+
+    assertThat(isolated2.get().get(testAddress)).isNotNull();
+    assertThat(isolated2.get().get(testAddress).getBalance())
+        .isEqualTo(Wei.of(1_000_000_000_000_000_000L));
+    assertThat(isolated2.get().rootHash()).isEqualTo(firstBlock.getHeader().getStateRoot());
+
+    try {
+      isolated.get().close();
+      isolated2.get().close();
+    } catch (Exception ex) {
+      throw new RuntimeException("failed to close isolated worldstates");
+    }
+  }
+
+  @Test
+  public void testSnapshotRollToTrieLogBlockHash() {
+    // assert we can roll a snapshot to a specific worldstate without mutating head
+    Address testAddress = Address.fromHexString("0xdeadbeef");
+
+    var block1 = forTransactions(List.of(burnTransaction(sender1, 0L, testAddress)));
+    var res = executeBlock(archive.getMutable(), block1);
+
+    var block2 = forTransactions(List.of(burnTransaction(sender1, 1L, testAddress)));
+    var res2 = executeBlock(archive.getMutable(), block2);
+
+    var block3 = forTransactions(List.of(burnTransaction(sender1, 2L, testAddress)));
+    var res3 = executeBlock(archive.getMutable(), block3);
+
+    assertThat(res.isSuccessful()).isTrue();
+    assertThat(res2.isSuccessful()).isTrue();
+    assertThat(res3.isSuccessful()).isTrue();
+
+    // roll chain and worldstate to block 2
+    blockchain.rewindToBlock(2L);
+    var block1State = archive.getMutable(null, block2.getHash());
+
+    // BonsaiWorldState should be at block 2
+    assertThat(block1State.get().get(testAddress)).isNotNull();
+    assertThat(block1State.get().get(testAddress).getBalance())
+        .isEqualTo(Wei.of(2_000_000_000_000_000_000L));
+    assertThat(block1State.get().rootHash()).isEqualTo(block2.getHeader().getStateRoot());
+
+    var isolatedRollForward = archive.getMutable(block3.getHeader(), false);
+
+    // we should be at block 3, one block ahead of BonsaiPersistatedWorldState
+    assertThat(isolatedRollForward.get().get(testAddress)).isNotNull();
+    assertThat(isolatedRollForward.get().get(testAddress).getBalance())
+        .isEqualTo(Wei.of(3_000_000_000_000_000_000L));
+    assertThat(isolatedRollForward.get().rootHash()).isEqualTo(block3.getHeader().getStateRoot());
+
+    // we should be at block 1, one block behind BonsaiPersistatedWorldState
+    var isolatedRollBack = archive.getMutable(block1.getHeader(), false);
+    assertThat(isolatedRollBack.get().get(testAddress)).isNotNull();
+    assertThat(isolatedRollBack.get().get(testAddress).getBalance())
+        .isEqualTo(Wei.of(1_000_000_000_000_000_000L));
+    assertThat(isolatedRollBack.get().rootHash()).isEqualTo(block1.getHeader().getStateRoot());
+
+    try {
+      isolatedRollForward.get().close();
+      isolatedRollBack.get().close();
+    } catch (Exception ex) {
+      throw new RuntimeException("failed to close isolated worldstates");
+    }
+  }
+
+  @Test
+  public void assertCloseDisposesOfStateWithoutCommitting() {
+    Address testAddress = Address.fromHexString("0xdeadbeef");
+
+    var head = archive.getMutable();
+
+    try (var shouldCloseSnapshot =
+        archive.getMutable(genesisState.getBlock().getHeader(), false).get()) {
+
+      var tx1 = burnTransaction(sender1, 0L, testAddress);
+      Block oneTx = forTransactions(List.of(tx1));
+
+      var res = executeBlock(shouldCloseSnapshot, oneTx);
+      assertThat(res.isSuccessful()).isTrue();
+      shouldCloseSnapshot.persist(oneTx.getHeader());
+
+      assertThat(shouldCloseSnapshot.get(testAddress)).isNotNull();
+      assertThat(shouldCloseSnapshot.get(testAddress).getBalance())
+          .isEqualTo(Wei.of(1_000_000_000_000_000_000L));
+
+    } catch (Exception e) {
+      // just a cheap way to close the snapshot worldstate and transactions
+    }
+
+    assertThat(head.get(testAddress)).isNull();
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateArchiveTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateArchiveTest.java
new file mode 100644
index 00000000000..eff31c523a9
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateArchiveTest.java
@@ -0,0 +1,286 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.bonsai;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage.WORLD_BLOCK_HASH_KEY;
+import static org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage.WORLD_ROOT_HASH_KEY;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.bonsai.cache.CachedMerkleTrieLoader;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.bonsai.trielog.TrieLogFactoryImpl;
+import org.hyperledger.besu.ethereum.bonsai.trielog.TrieLogLayer;
+import org.hyperledger.besu.ethereum.bonsai.trielog.TrieLogManager;
+import org.hyperledger.besu.ethereum.bonsai.worldview.BonsaiWorldState;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.storage.StorageProvider;
+import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
+import org.hyperledger.besu.plugin.services.storage.SnappableKeyValueStorage;
+
+import java.util.Optional;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class BonsaiWorldStateArchiveTest {
+
+  final BlockHeaderTestFixture blockBuilder = new BlockHeaderTestFixture();
+
+  @Mock Blockchain blockchain;
+
+  @Mock StorageProvider storageProvider;
+
+  @Mock SnappableKeyValueStorage keyValueStorage;
+
+  BonsaiWorldStateProvider bonsaiWorldStateArchive;
+
+  @Mock TrieLogManager trieLogManager;
+
+  @Before
+  public void setUp() {
+    when(storageProvider.getStorageBySegmentIdentifier(any(KeyValueSegmentIdentifier.class)))
+        .thenReturn(keyValueStorage);
+  }
+
+  @Test
+  public void testGetMutableReturnPersistedStateWhenNeeded() {
+    final BlockHeader chainHead = blockBuilder.number(0).buildHeader();
+
+    when(keyValueStorage.get(WORLD_ROOT_HASH_KEY))
+        .thenReturn(Optional.of(chainHead.getStateRoot().toArrayUnsafe()));
+    when(keyValueStorage.get(WORLD_BLOCK_HASH_KEY))
+        .thenReturn(Optional.of(chainHead.getHash().toArrayUnsafe()));
+    when(keyValueStorage.get(WORLD_ROOT_HASH_KEY))
+        .thenReturn(Optional.of(chainHead.getStateRoot().toArrayUnsafe()));
+    when(keyValueStorage.get(WORLD_BLOCK_HASH_KEY))
+        .thenReturn(Optional.of(chainHead.getHash().toArrayUnsafe()));
+    bonsaiWorldStateArchive =
+        new BonsaiWorldStateProvider(
+            trieLogManager,
+            new BonsaiWorldStateKeyValueStorage(storageProvider, new NoOpMetricsSystem()),
+            blockchain,
+            new CachedMerkleTrieLoader(new NoOpMetricsSystem()));
+
+    assertThat(bonsaiWorldStateArchive.getMutable(chainHead, true))
+        .containsInstanceOf(BonsaiWorldState.class);
+  }
+
+  @Test
+  public void testGetMutableReturnEmptyWhenLoadMoreThanLimitLayersBack() {
+    bonsaiWorldStateArchive =
+        new BonsaiWorldStateProvider(
+            new BonsaiWorldStateKeyValueStorage(storageProvider, new NoOpMetricsSystem()),
+            blockchain,
+            Optional.of(512L),
+            new CachedMerkleTrieLoader(new NoOpMetricsSystem()),
+            new NoOpMetricsSystem(),
+            null);
+    final BlockHeader blockHeader = blockBuilder.number(0).buildHeader();
+    final BlockHeader chainHead = blockBuilder.number(512).buildHeader();
+    when(blockchain.getChainHeadHeader()).thenReturn(chainHead);
+    assertThat(bonsaiWorldStateArchive.getMutable(blockHeader, false)).isEmpty();
+    verify(trieLogManager, Mockito.never()).getWorldState(any(Hash.class));
+  }
+
+  @Test
+  public void testGetMutableWhenLoadLessThanLimitLayersBack() {
+
+    bonsaiWorldStateArchive =
+        new BonsaiWorldStateProvider(
+            trieLogManager,
+            new BonsaiWorldStateKeyValueStorage(storageProvider, new NoOpMetricsSystem()),
+            blockchain,
+            new CachedMerkleTrieLoader(new NoOpMetricsSystem()));
+    final BlockHeader blockHeader = blockBuilder.number(0).buildHeader();
+    final BlockHeader chainHead = blockBuilder.number(511).buildHeader();
+    final BonsaiWorldState mockWorldState = mock(BonsaiWorldState.class);
+    when(mockWorldState.blockHash()).thenReturn(blockHeader.getHash());
+    when(mockWorldState.freeze()).thenReturn(mockWorldState);
+
+    when(trieLogManager.getMaxLayersToLoad()).thenReturn(Long.valueOf(512));
+    when(trieLogManager.getWorldState(blockHeader.getHash()))
+        .thenReturn(Optional.of(mockWorldState));
+    when(blockchain.getChainHeadHeader()).thenReturn(chainHead);
+    assertThat(bonsaiWorldStateArchive.getMutable(blockHeader, false))
+        .containsInstanceOf(BonsaiWorldState.class);
+  }
+
+  @SuppressWarnings({"unchecked", "rawtypes"})
+  @Test
+  public void testGetMutableWithStorageInconsistencyRollbackTheState() {
+
+    when(keyValueStorage.startTransaction()).thenReturn(mock(KeyValueStorageTransaction.class));
+    doAnswer(__ -> Optional.of(mock(TrieLogLayer.class)))
+        .when(trieLogManager)
+        .getTrieLogLayer(any(Hash.class));
+
+    var worldStateStorage =
+        new BonsaiWorldStateKeyValueStorage(storageProvider, new NoOpMetricsSystem());
+    bonsaiWorldStateArchive =
+        spy(
+            new BonsaiWorldStateProvider(
+                trieLogManager,
+                worldStateStorage,
+                blockchain,
+                new CachedMerkleTrieLoader(new NoOpMetricsSystem())));
+    final BlockHeader blockHeader = blockBuilder.number(0).buildHeader();
+
+    when(blockchain.getBlockHeader(eq(blockHeader.getHash()))).thenReturn(Optional.of(blockHeader));
+
+    assertThat(bonsaiWorldStateArchive.getMutable(null, blockHeader.getHash()))
+        .containsInstanceOf(BonsaiWorldState.class);
+
+    // verify is trying to get the trie log layer to rollback
+    verify(trieLogManager).getTrieLogLayer(Hash.ZERO);
+  }
+
+  @SuppressWarnings({"unchecked", "rawtypes"})
+  @Test
+  public void testGetMutableWithStorageConsistencyNotRollbackTheState() {
+
+    when(keyValueStorage.startTransaction()).thenReturn(mock(KeyValueStorageTransaction.class));
+
+    var worldStateStorage =
+        new BonsaiWorldStateKeyValueStorage(storageProvider, new NoOpMetricsSystem());
+    bonsaiWorldStateArchive =
+        spy(
+            new BonsaiWorldStateProvider(
+                trieLogManager,
+                worldStateStorage,
+                blockchain,
+                new CachedMerkleTrieLoader(new NoOpMetricsSystem())));
+
+    final BlockHeader blockHeader = blockBuilder.number(0).buildHeader();
+
+    when(blockchain.getBlockHeader(eq(blockHeader.getHash()))).thenReturn(Optional.of(blockHeader));
+    when(blockchain.getBlockHeader(eq(Hash.ZERO))).thenReturn(Optional.of(blockHeader));
+
+    assertThat(bonsaiWorldStateArchive.getMutable(null, blockHeader.getHash()))
+        .containsInstanceOf(BonsaiWorldState.class);
+
+    // verify is not trying to get the trie log layer to rollback when block is present
+    verify(trieLogManager, Mockito.never()).getTrieLogLayer(any());
+  }
+
+  @SuppressWarnings({"unchecked"})
+  @Test
+  public void testGetMutableWithStorageConsistencyToRollbackAndRollForwardTheState() {
+    when(keyValueStorage.startTransaction()).thenReturn(mock(KeyValueStorageTransaction.class));
+    final BlockHeader genesis = blockBuilder.number(0).buildHeader();
+    final BlockHeader blockHeaderChainA =
+        blockBuilder.number(1).timestamp(1).parentHash(genesis.getHash()).buildHeader();
+    final BlockHeader blockHeaderChainB =
+        blockBuilder.number(1).timestamp(2).parentHash(genesis.getHash()).buildHeader();
+
+    doAnswer(__ -> Optional.of(mock(TrieLogLayer.class)))
+        .when(trieLogManager)
+        .getTrieLogLayer(any(Hash.class));
+
+    var worldStateStorage =
+        new BonsaiWorldStateKeyValueStorage(storageProvider, new NoOpMetricsSystem());
+
+    bonsaiWorldStateArchive =
+        spy(
+            new BonsaiWorldStateProvider(
+                trieLogManager,
+                worldStateStorage,
+                blockchain,
+                new CachedMerkleTrieLoader(new NoOpMetricsSystem())));
+
+    // initial persisted state hash key
+    when(blockchain.getBlockHeader(eq(Hash.ZERO))).thenReturn(Optional.of(blockHeaderChainA));
+    when(blockchain.getBlockHeader(eq(blockHeaderChainB.getHash())))
+        .thenReturn(Optional.of(blockHeaderChainB));
+    when(blockchain.getBlockHeader(eq(genesis.getHash()))).thenReturn(Optional.of(genesis));
+
+    assertThat(bonsaiWorldStateArchive.getMutable(null, blockHeaderChainB.getHash()))
+        .containsInstanceOf(BonsaiWorldState.class);
+
+    // verify is trying to get the trie log layers to rollback and roll forward
+    verify(trieLogManager).getTrieLogLayer(eq(blockHeaderChainA.getHash()));
+    verify(trieLogManager).getTrieLogLayer(eq(blockHeaderChainB.getHash()));
+  }
+
+  @SuppressWarnings({"unchecked"})
+  @Test
+  // TODO: refactor to test original intent
+  @Ignore("needs refactor, getMutable(hash, hash) cannot trigger saveTrieLog")
+  public void testGetMutableWithRollbackNotOverrideTrieLogLayer() {
+    final KeyValueStorageTransaction keyValueStorageTransaction =
+        mock(KeyValueStorageTransaction.class);
+    when(keyValueStorage.startTransaction()).thenReturn(keyValueStorageTransaction);
+    final BlockHeader genesis = blockBuilder.number(0).buildHeader();
+    final BlockHeader blockHeaderChainA =
+        blockBuilder.number(1).timestamp(1).parentHash(genesis.getHash()).buildHeader();
+    final BlockHeader blockHeaderChainB =
+        blockBuilder.number(1).timestamp(2).parentHash(genesis.getHash()).buildHeader();
+
+    doAnswer(__ -> Optional.of(mock(TrieLogLayer.class)))
+        .when(trieLogManager)
+        .getTrieLogLayer(any(Hash.class));
+
+    bonsaiWorldStateArchive =
+        spy(
+            new BonsaiWorldStateProvider(
+                trieLogManager,
+                new BonsaiWorldStateKeyValueStorage(storageProvider, new NoOpMetricsSystem()),
+                blockchain,
+                new CachedMerkleTrieLoader(new NoOpMetricsSystem())));
+
+    // initial persisted state hash key
+    when(blockchain.getBlockHeader(eq(Hash.ZERO))).thenReturn(Optional.of(blockHeaderChainA));
+    // fake trie log layer
+    final BytesValueRLPOutput rlpLogBlockB = new BytesValueRLPOutput();
+    final TrieLogLayer trieLogLayerBlockB = new TrieLogLayer();
+    trieLogLayerBlockB.setBlockHash(blockHeaderChainB.getHash());
+    TrieLogFactoryImpl.writeTo(trieLogLayerBlockB, rlpLogBlockB);
+    when(keyValueStorage.get(blockHeaderChainB.getHash().toArrayUnsafe()))
+        .thenReturn(Optional.of(rlpLogBlockB.encoded().toArrayUnsafe()));
+
+    when(blockchain.getBlockHeader(eq(blockHeaderChainB.getHash())))
+        .thenReturn(Optional.of(blockHeaderChainB));
+    when(blockchain.getBlockHeader(eq(genesis.getHash()))).thenReturn(Optional.of(genesis));
+
+    assertThat(bonsaiWorldStateArchive.getMutable(null, blockHeaderChainB.getHash()))
+        .containsInstanceOf(BonsaiWorldState.class);
+
+    // verify is not persisting if already present
+    verify(keyValueStorageTransaction, never())
+        .put(eq(blockHeaderChainA.getHash().toArrayUnsafe()), any());
+    verify(keyValueStorageTransaction, never())
+        .put(eq(blockHeaderChainB.getHash().toArrayUnsafe()), any());
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateKeyValueStorageTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateKeyValueStorageTest.java
new file mode 100644
index 00000000000..a3314b2ee3b
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/BonsaiWorldStateKeyValueStorageTest.java
@@ -0,0 +1,417 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.bonsai;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage.WORLD_ROOT_HASH_KEY;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.StorageSlotKey;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.core.TrieGenerator;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.StorageEntriesCollector;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.worldstate.FlatDbMode;
+import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Optional;
+import java.util.TreeMap;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.mockito.Mockito;
+
+@RunWith(Parameterized.class)
+public class BonsaiWorldStateKeyValueStorageTest {
+
+  private final FlatDbMode flatDbMode;
+
+  public BonsaiWorldStateKeyValueStorageTest(final FlatDbMode flatDbMode) {
+    this.flatDbMode = flatDbMode;
+  }
+
+  @Parameterized.Parameters
+  public static Collection<Object[]> data() {
+    return Arrays.asList(new Object[][] {{FlatDbMode.FULL}, {FlatDbMode.PARTIAL}});
+  }
+
+  final BonsaiWorldStateKeyValueStorage storage = emptyStorage();
+
+  @Before
+  public void setUp() {
+    if (flatDbMode.equals(FlatDbMode.FULL)) {
+      storage.upgradeToFullFlatDbMode();
+    }
+  }
+
+  @Test
+  public void getCode_returnsEmpty() {
+    assertThat(storage.getCode(Hash.EMPTY, Hash.EMPTY)).contains(Bytes.EMPTY);
+  }
+
+  @Test
+  public void getAccountStateTrieNode_returnsEmptyNode() {
+    assertThat(storage.getAccountStateTrieNode(Bytes.EMPTY, MerkleTrie.EMPTY_TRIE_NODE_HASH))
+        .contains(MerkleTrie.EMPTY_TRIE_NODE);
+  }
+
+  @Test
+  public void getAccountStorageTrieNode_returnsEmptyNode() {
+    assertThat(
+            storage.getAccountStorageTrieNode(
+                Hash.EMPTY, Bytes.EMPTY, MerkleTrie.EMPTY_TRIE_NODE_HASH))
+        .contains(MerkleTrie.EMPTY_TRIE_NODE);
+  }
+
+  @Test
+  public void getNodeData_returnsEmptyValue() {
+    assertThat(storage.getNodeData(null, null)).isEmpty();
+  }
+
+  @Test
+  public void getNodeData_returnsEmptyNode() {
+    assertThat(storage.getNodeData(Bytes.EMPTY, MerkleTrie.EMPTY_TRIE_NODE_HASH)).isEmpty();
+  }
+
+  @Test
+  public void getCode_saveAndGetSpecialValues() {
+    storage
+        .updater()
+        .putCode(Hash.EMPTY, MerkleTrie.EMPTY_TRIE_NODE)
+        .putCode(Hash.EMPTY, Bytes.EMPTY)
+        .commit();
+
+    assertThat(storage.getCode(Hash.hash(MerkleTrie.EMPTY_TRIE_NODE), Hash.EMPTY))
+        .contains(MerkleTrie.EMPTY_TRIE_NODE);
+  }
+
+  @Test
+  public void getCode_saveAndGetRegularValue() {
+    final Bytes bytes = Bytes.fromHexString("0x123456");
+    storage.updater().putCode(Hash.EMPTY, bytes).commit();
+
+    assertThat(storage.getCode(Hash.hash(bytes), Hash.EMPTY)).contains(bytes);
+  }
+
+  @Test
+  public void getAccountStateTrieNode_saveAndGetSpecialValues() {
+    storage
+        .updater()
+        .putAccountStateTrieNode(
+            Bytes.EMPTY, Hash.hash(MerkleTrie.EMPTY_TRIE_NODE), MerkleTrie.EMPTY_TRIE_NODE)
+        .putAccountStateTrieNode(Bytes.EMPTY, Hash.hash(Bytes.EMPTY), Bytes.EMPTY)
+        .commit();
+
+    assertThat(storage.getAccountStateTrieNode(Bytes.EMPTY, MerkleTrie.EMPTY_TRIE_NODE_HASH))
+        .contains(MerkleTrie.EMPTY_TRIE_NODE);
+    assertThat(storage.getAccountStateTrieNode(Bytes.EMPTY, Hash.EMPTY)).contains(Bytes.EMPTY);
+  }
+
+  @Test
+  public void getAccountStateTrieNode_saveAndGetRegularValue() {
+    final Bytes location = Bytes.fromHexString("0x01");
+    final Bytes bytes = Bytes.fromHexString("0x123456");
+
+    storage.updater().putAccountStateTrieNode(location, Hash.hash(bytes), bytes).commit();
+
+    assertThat(storage.getAccountStateTrieNode(location, Hash.hash(bytes))).contains(bytes);
+  }
+
+  @Test
+  public void getAccountStorageTrieNode_saveAndGetSpecialValues() {
+
+    storage
+        .updater()
+        .putAccountStorageTrieNode(
+            Hash.EMPTY,
+            Bytes.EMPTY,
+            Hash.hash(MerkleTrie.EMPTY_TRIE_NODE),
+            MerkleTrie.EMPTY_TRIE_NODE)
+        .putAccountStorageTrieNode(Hash.EMPTY, Bytes.EMPTY, Hash.hash(Bytes.EMPTY), Bytes.EMPTY)
+        .commit();
+
+    assertThat(
+            storage.getAccountStorageTrieNode(
+                Hash.EMPTY, Bytes.EMPTY, Hash.hash(MerkleTrie.EMPTY_TRIE_NODE)))
+        .contains(MerkleTrie.EMPTY_TRIE_NODE);
+    assertThat(storage.getAccountStorageTrieNode(Hash.EMPTY, Bytes.EMPTY, Hash.EMPTY))
+        .contains(Bytes.EMPTY);
+  }
+
+  @Test
+  public void getAccountStorageTrieNode_saveAndGetRegularValue() {
+    final Hash accountHash = Hash.hash(Address.fromHexString("0x1"));
+    final Bytes location = Bytes.fromHexString("0x01");
+    final Bytes bytes = Bytes.fromHexString("0x123456");
+
+    storage
+        .updater()
+        .putAccountStorageTrieNode(accountHash, location, Hash.hash(bytes), bytes)
+        .commit();
+
+    assertThat(storage.getAccountStorageTrieNode(accountHash, location, Hash.hash(bytes)))
+        .contains(bytes);
+  }
+
+  @Test
+  public void getAccount_notLoadFromTrieWhenEmptyAndFlatDbFullMode() {
+    Assume.assumeTrue(flatDbMode == FlatDbMode.FULL);
+    final BonsaiWorldStateKeyValueStorage storage = spy(emptyStorage());
+
+    final MerkleTrie<Bytes, Bytes> trie = TrieGenerator.generateTrie(storage, 1);
+
+    final TreeMap<Bytes32, Bytes> accounts =
+        (TreeMap<Bytes32, Bytes>)
+            trie.entriesFrom(root -> StorageEntriesCollector.collectEntries(root, Hash.ZERO, 1));
+
+    // save world state root hash
+    final BonsaiWorldStateKeyValueStorage.BonsaiUpdater updater = storage.updater();
+    updater
+        .getTrieBranchStorageTransaction()
+        .put(WORLD_ROOT_HASH_KEY, trie.getRootHash().toArrayUnsafe());
+    updater.commit();
+
+    // remove flat database
+    storage.clearFlatDatabase();
+
+    storage.upgradeToFullFlatDbMode();
+
+    Mockito.reset(storage);
+
+    assertThat(storage.getAccount(Hash.wrap(accounts.firstKey()))).isEmpty();
+
+    verify(storage, times(0)).getAccountStateTrieNode(any(), eq(trie.getRootHash()));
+  }
+
+  @Test
+  public void getAccount_loadFromTrieWhenEmptyAndFlatDbPartialMode() {
+    Assume.assumeTrue(flatDbMode == FlatDbMode.PARTIAL);
+    final BonsaiWorldStateKeyValueStorage storage = spy(emptyStorage());
+    final MerkleTrie<Bytes, Bytes> trie = TrieGenerator.generateTrie(storage, 1);
+    final TreeMap<Bytes32, Bytes> accounts =
+        (TreeMap<Bytes32, Bytes>)
+            trie.entriesFrom(root -> StorageEntriesCollector.collectEntries(root, Hash.ZERO, 1));
+
+    // save world state root hash
+    final BonsaiWorldStateKeyValueStorage.BonsaiUpdater updater = storage.updater();
+    updater
+        .getTrieBranchStorageTransaction()
+        .put(WORLD_ROOT_HASH_KEY, trie.getRootHash().toArrayUnsafe());
+    updater.commit();
+
+    // remove flat database
+    storage.clearFlatDatabase();
+
+    Mockito.reset(storage);
+
+    assertThat(storage.getAccount(Hash.wrap(accounts.firstKey())))
+        .contains(accounts.firstEntry().getValue());
+
+    verify(storage, times(1)).getAccountStateTrieNode(any(), eq(trie.getRootHash()));
+  }
+
+  @Test
+  public void shouldUsePartialDBStrategyAfterDowngradingMode() {
+    Assume.assumeTrue(flatDbMode == FlatDbMode.PARTIAL);
+    final BonsaiWorldStateKeyValueStorage storage = spy(emptyStorage());
+
+    final MerkleTrie<Bytes, Bytes> trie = TrieGenerator.generateTrie(storage, 1);
+    final TreeMap<Bytes32, Bytes> accounts =
+        (TreeMap<Bytes32, Bytes>)
+            trie.entriesFrom(root -> StorageEntriesCollector.collectEntries(root, Hash.ZERO, 1));
+
+    // save world state root hash
+    final BonsaiWorldStateKeyValueStorage.BonsaiUpdater updater = storage.updater();
+    updater
+        .getTrieBranchStorageTransaction()
+        .put(WORLD_ROOT_HASH_KEY, trie.getRootHash().toArrayUnsafe());
+    updater.commit();
+
+    Mockito.reset(storage);
+
+    // remove flat database
+    storage.clearFlatDatabase();
+
+    storage.upgradeToFullFlatDbMode();
+    assertThat(storage.getAccount(Hash.wrap(accounts.firstKey()))).isEmpty();
+
+    storage.downgradeToPartialFlatDbMode();
+    assertThat(storage.getAccount(Hash.wrap(accounts.firstKey())))
+        .contains(accounts.firstEntry().getValue());
+  }
+
+  @Test
+  public void getStorage_loadFromTrieWhenEmptyWithPartialMode() {
+    Assume.assumeTrue(flatDbMode == FlatDbMode.PARTIAL);
+    final BonsaiWorldStateKeyValueStorage storage = spy(emptyStorage());
+    final MerkleTrie<Bytes, Bytes> trie = TrieGenerator.generateTrie(storage, 1);
+    final TreeMap<Bytes32, Bytes> accounts =
+        (TreeMap<Bytes32, Bytes>)
+            trie.entriesFrom(root -> StorageEntriesCollector.collectEntries(root, Hash.ZERO, 1));
+
+    final StateTrieAccountValue stateTrieAccountValue =
+        StateTrieAccountValue.readFrom(RLP.input(accounts.firstEntry().getValue()));
+
+    final StoredMerklePatriciaTrie<Bytes, Bytes> storageTrie =
+        new StoredMerklePatriciaTrie<>(
+            (location, hash) ->
+                storage.getAccountStorageTrieNode(Hash.wrap(accounts.firstKey()), location, hash),
+            stateTrieAccountValue.getStorageRoot(),
+            b -> b,
+            b -> b);
+
+    final TreeMap<Bytes32, Bytes> slots =
+        (TreeMap<Bytes32, Bytes>)
+            storageTrie.entriesFrom(
+                root -> StorageEntriesCollector.collectEntries(root, Hash.ZERO, 1));
+
+    // save world state root hash
+    final BonsaiWorldStateKeyValueStorage.BonsaiUpdater updater = storage.updater();
+    updater
+        .getTrieBranchStorageTransaction()
+        .put(WORLD_ROOT_HASH_KEY, trie.getRootHash().toArrayUnsafe());
+    updater.commit();
+
+    // remove flat database
+    storage.clearFlatDatabase();
+
+    assertThat(
+            storage.getStorageValueByStorageSlotKey(
+                Hash.wrap(accounts.firstKey()),
+                new StorageSlotKey(Hash.wrap(slots.firstKey()), Optional.empty())))
+        .map(Bytes::toShortHexString)
+        .contains(slots.firstEntry().getValue().toShortHexString());
+
+    verify(storage, times(2))
+        .getAccountStorageTrieNode(
+            eq(Hash.wrap(accounts.firstKey())), any(), eq(storageTrie.getRootHash()));
+  }
+
+  @Test
+  public void getStorage_loadFromTrieWhenEmptyWithFullMode() {
+    Assume.assumeTrue(flatDbMode == FlatDbMode.FULL);
+    final BonsaiWorldStateKeyValueStorage storage = spy(emptyStorage());
+    storage.upgradeToFullFlatDbMode();
+    final MerkleTrie<Bytes, Bytes> trie = TrieGenerator.generateTrie(storage, 1);
+
+    // save world state root hash
+    final BonsaiWorldStateKeyValueStorage.BonsaiUpdater updater = storage.updater();
+    updater
+        .getTrieBranchStorageTransaction()
+        .put(WORLD_ROOT_HASH_KEY, trie.getRootHash().toArrayUnsafe());
+    updater.commit();
+
+    // remove flat database
+    storage.clearFlatDatabase();
+  }
+
+  @Test
+  public void clear_reloadFlatDbStrategy() {
+    final BonsaiWorldStateKeyValueStorage storage = spy(emptyStorage());
+
+    // save world state root hash
+    final BonsaiWorldStateKeyValueStorage.BonsaiUpdater updater = storage.updater();
+    updater.putAccountInfoState(Hash.ZERO, Bytes32.random()).commit();
+
+    assertThat(storage.getAccount(Hash.ZERO)).isNotEmpty();
+
+    // clear
+    storage.clear();
+
+    assertThat(storage.getFlatDbReaderStrategy()).isNotNull();
+
+    assertThat(storage.getAccount(Hash.ZERO)).isEmpty();
+  }
+
+  @Test
+  public void reconcilesNonConflictingUpdaters() {
+    final Hash accountHashA = Hash.hash(Address.fromHexString("0x1"));
+    final Hash accountHashB = Hash.hash(Address.fromHexString("0x2"));
+    final Hash accountHashD = Hash.hash(Address.fromHexString("0x4"));
+    final Bytes bytesA = Bytes.fromHexString("0x12");
+    final Bytes bytesB = Bytes.fromHexString("0x1234");
+    final Bytes bytesC = Bytes.fromHexString("0x123456");
+
+    final BonsaiWorldStateKeyValueStorage.BonsaiUpdater updaterA = storage.updater();
+    final BonsaiWorldStateKeyValueStorage.BonsaiUpdater updaterB = storage.updater();
+
+    updaterA.putCode(accountHashA, bytesA);
+    updaterB.putCode(accountHashB, bytesA);
+    updaterB.putCode(accountHashB, bytesB);
+    updaterA.putCode(accountHashD, bytesC);
+
+    updaterA.commit();
+    updaterB.commit();
+
+    assertThat(storage.getCode(Hash.hash(bytesB), accountHashB)).contains(bytesB);
+    assertThat(storage.getCode(Hash.hash(bytesC), accountHashD)).contains(bytesC);
+  }
+
+  @Test
+  public void isWorldStateAvailable_defaultIsFalse() {
+    assertThat(emptyStorage().isWorldStateAvailable(UInt256.valueOf(1), Hash.EMPTY)).isFalse();
+  }
+
+  @Test
+  public void isWorldStateAvailable_StateAvailableByRootHash() {
+
+    final BonsaiWorldStateKeyValueStorage.BonsaiUpdater updater = storage.updater();
+    final Bytes rootHashKey = Bytes32.fromHexString("0x01");
+    updater.getTrieBranchStorageTransaction().put(WORLD_ROOT_HASH_KEY, rootHashKey.toArrayUnsafe());
+    updater.commit();
+    assertThat(storage.isWorldStateAvailable(Hash.wrap(Bytes32.wrap(rootHashKey)), Hash.EMPTY))
+        .isTrue();
+  }
+
+  @Test
+  public void isWorldStateAvailable_afterCallingSaveWorldstate() {
+
+    final BonsaiWorldStateKeyValueStorage.BonsaiUpdater updater = storage.updater();
+
+    final Bytes blockHash = Bytes32.fromHexString("0x01");
+    final Bytes32 nodeHashKey = Bytes32.fromHexString("0x02");
+    final Bytes nodeValue = Bytes32.fromHexString("0x03");
+
+    assertThat(storage.isWorldStateAvailable(Bytes32.wrap(nodeHashKey), Hash.EMPTY)).isFalse();
+
+    updater.saveWorldState(blockHash, nodeHashKey, nodeValue);
+    updater.commit();
+
+    assertThat(storage.isWorldStateAvailable(Bytes32.wrap(nodeHashKey), Hash.EMPTY)).isTrue();
+  }
+
+  private BonsaiWorldStateKeyValueStorage emptyStorage() {
+    return new BonsaiWorldStateKeyValueStorage(
+        new InMemoryKeyValueStorageProvider(), new NoOpMetricsSystem());
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/CachedMerkleTrieLoaderTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/CachedMerkleTrieLoaderTest.java
new file mode 100644
index 00000000000..00bd789288f
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/CachedMerkleTrieLoaderTest.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.bonsai;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.StorageSlotKey;
+import org.hyperledger.besu.ethereum.bonsai.cache.CachedMerkleTrieLoader;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.core.TrieGenerator;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.storage.StorageProvider;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.TrieIterator;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class CachedMerkleTrieLoaderTest {
+
+  private CachedMerkleTrieLoader merkleTrieLoader;
+  private final StorageProvider storageProvider = new InMemoryKeyValueStorageProvider();
+  private final BonsaiWorldStateKeyValueStorage inMemoryWorldState =
+      Mockito.spy(new BonsaiWorldStateKeyValueStorage(storageProvider, new NoOpMetricsSystem()));
+
+  final List<Address> accounts =
+      List.of(Address.fromHexString("0xdeadbeef"), Address.fromHexString("0xdeadbeee"));
+
+  private MerkleTrie<Bytes, Bytes> trie;
+
+  @Before
+  public void setup() {
+    trie =
+        TrieGenerator.generateTrie(
+            inMemoryWorldState, accounts.stream().map(Hash::hash).collect(Collectors.toList()));
+    merkleTrieLoader = new CachedMerkleTrieLoader(new NoOpMetricsSystem());
+  }
+
+  @Test
+  public void shouldAddAccountNodesInCacheDuringPreload() {
+    merkleTrieLoader.cacheAccountNodes(
+        inMemoryWorldState, Hash.wrap(trie.getRootHash()), accounts.get(0));
+
+    final BonsaiWorldStateKeyValueStorage emptyStorage =
+        new BonsaiWorldStateKeyValueStorage(
+            new InMemoryKeyValueStorageProvider(), new NoOpMetricsSystem());
+    StoredMerklePatriciaTrie<Bytes, Bytes> cachedTrie =
+        new StoredMerklePatriciaTrie<>(
+            (location, hash) ->
+                merkleTrieLoader.getAccountStateTrieNode(emptyStorage, location, hash),
+            trie.getRootHash(),
+            Function.identity(),
+            Function.identity());
+
+    final Hash hashAccountZero = Hash.hash(accounts.get(0));
+    assertThat(cachedTrie.get(hashAccountZero)).isEqualTo(trie.get(hashAccountZero));
+  }
+
+  @Test
+  public void shouldAddStorageNodesInCacheDuringPreload() {
+    final Hash hashAccountZero = Hash.hash(accounts.get(0));
+    final StateTrieAccountValue stateTrieAccountValue =
+        StateTrieAccountValue.readFrom(RLP.input(trie.get(hashAccountZero).orElseThrow()));
+    final StoredMerklePatriciaTrie<Bytes, Bytes> storageTrie =
+        new StoredMerklePatriciaTrie<>(
+            (location, hash) ->
+                inMemoryWorldState.getAccountStorageTrieNode(hashAccountZero, location, hash),
+            stateTrieAccountValue.getStorageRoot(),
+            Function.identity(),
+            Function.identity());
+    final List<Bytes> originalSlots = new ArrayList<>();
+    storageTrie.visitLeafs(
+        (keyHash, node) -> {
+          merkleTrieLoader.cacheStorageNodes(
+              inMemoryWorldState,
+              accounts.get(0),
+              new StorageSlotKey(Hash.wrap(keyHash), Optional.empty()));
+          originalSlots.add(node.getEncodedBytes());
+          return TrieIterator.State.CONTINUE;
+        });
+
+    final List<Bytes> cachedSlots = new ArrayList<>();
+    final BonsaiWorldStateKeyValueStorage emptyStorage =
+        new BonsaiWorldStateKeyValueStorage(
+            new InMemoryKeyValueStorageProvider(), new NoOpMetricsSystem());
+    final StoredMerklePatriciaTrie<Bytes, Bytes> cachedTrie =
+        new StoredMerklePatriciaTrie<>(
+            (location, hash) ->
+                merkleTrieLoader.getAccountStorageTrieNode(
+                    emptyStorage, hashAccountZero, location, hash),
+            stateTrieAccountValue.getStorageRoot(),
+            Function.identity(),
+            Function.identity());
+    cachedTrie.visitLeafs(
+        (keyHash, node) -> {
+          cachedSlots.add(node.getEncodedBytes());
+          return TrieIterator.State.CONTINUE;
+        });
+    assertThat(originalSlots).isNotEmpty();
+    assertThat(originalSlots).isEqualTo(cachedSlots);
+  }
+
+  @Test
+  public void shouldFallbackWhenAccountNodesIsNotInCache() {
+    final StoredMerklePatriciaTrie<Bytes, Bytes> cachedTrie =
+        new StoredMerklePatriciaTrie<>(
+            (location, hash) ->
+                merkleTrieLoader.getAccountStateTrieNode(inMemoryWorldState, location, hash),
+            trie.getRootHash(),
+            Function.identity(),
+            Function.identity());
+    final Hash hashAccountZero = Hash.hash(accounts.get(0));
+    assertThat(cachedTrie.get(hashAccountZero)).isEqualTo(trie.get(hashAccountZero));
+  }
+
+  @Test
+  public void shouldFallbackWhenStorageNodesIsNotInCache() {
+    final Hash hashAccountZero = Hash.hash(accounts.get(0));
+    final StateTrieAccountValue stateTrieAccountValue =
+        StateTrieAccountValue.readFrom(RLP.input(trie.get(hashAccountZero).orElseThrow()));
+    final StoredMerklePatriciaTrie<Bytes, Bytes> storageTrie =
+        new StoredMerklePatriciaTrie<>(
+            (location, hash) ->
+                inMemoryWorldState.getAccountStorageTrieNode(hashAccountZero, location, hash),
+            stateTrieAccountValue.getStorageRoot(),
+            Function.identity(),
+            Function.identity());
+    final List<Bytes> originalSlots = new ArrayList<>();
+    storageTrie.visitLeafs(
+        (keyHash, node) -> {
+          originalSlots.add(node.getEncodedBytes());
+          return TrieIterator.State.CONTINUE;
+        });
+
+    final List<Bytes> cachedSlots = new ArrayList<>();
+    final StoredMerklePatriciaTrie<Bytes, Bytes> cachedTrie =
+        new StoredMerklePatriciaTrie<>(
+            (location, hash) ->
+                merkleTrieLoader.getAccountStorageTrieNode(
+                    inMemoryWorldState, hashAccountZero, location, hash),
+            stateTrieAccountValue.getStorageRoot(),
+            Function.identity(),
+            Function.identity());
+    cachedTrie.visitLeafs(
+        (keyHash, node) -> {
+          cachedSlots.add(node.getEncodedBytes());
+          return TrieIterator.State.CONTINUE;
+        });
+    assertThat(originalSlots).isNotEmpty();
+    assertThat(originalSlots).isEqualTo(cachedSlots);
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/LogRollingTests.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/LogRollingTests.java
index c06b225e096..c6cc9b58c8f 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/LogRollingTests.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/LogRollingTests.java
@@ -17,16 +17,30 @@
 package org.hyperledger.besu.ethereum.bonsai;
 
 import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
+import static org.mockito.Mockito.mock;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.bonsai.cache.CachedMerkleTrieLoader;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.bonsai.trielog.TrieLogFactoryImpl;
+import org.hyperledger.besu.ethereum.bonsai.trielog.TrieLogLayer;
+import org.hyperledger.besu.ethereum.bonsai.worldview.BonsaiWorldState;
+import org.hyperledger.besu.ethereum.bonsai.worldview.BonsaiWorldStateUpdateAccumulator;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
 import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
 
 import java.util.Optional;
@@ -36,33 +50,86 @@
 import org.apache.tuweni.units.bigints.UInt256;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class LogRollingTests {
 
-  private BonsaiWorldStateArchive archive;
+  private BonsaiWorldStateProvider archive;
+
+  private InMemoryKeyValueStorageProvider provider;
   private InMemoryKeyValueStorage accountStorage;
   private InMemoryKeyValueStorage codeStorage;
   private InMemoryKeyValueStorage storageStorage;
   private InMemoryKeyValueStorage trieBranchStorage;
   private InMemoryKeyValueStorage trieLogStorage;
 
-  private BonsaiWorldStateArchive secondArchive;
+  private InMemoryKeyValueStorageProvider secondProvider;
+  private BonsaiWorldStateProvider secondArchive;
   private InMemoryKeyValueStorage secondAccountStorage;
   private InMemoryKeyValueStorage secondCodeStorage;
   private InMemoryKeyValueStorage secondStorageStorage;
   private InMemoryKeyValueStorage secondTrieBranchStorage;
   private InMemoryKeyValueStorage secondTrieLogStorage;
+  private final Blockchain blockchain = mock(Blockchain.class);
 
   private static final Address addressOne =
       Address.fromHexString("0x1111111111111111111111111111111111111111");
 
-  private static final Hash hashOne = Hash.hash(Bytes.of(1));
-  private static final Hash hashTwo = Hash.hash(Bytes.of(2));
+  private static final BlockHeader headerOne =
+      new BlockHeader(
+          Hash.ZERO,
+          Hash.EMPTY_LIST_HASH,
+          Address.ZERO,
+          Hash.fromHexString("0x0ecfa454ddfe6b740f4af7b7f4c61b5c6bac2854efd2b07b27b1f53dba9bb46c"),
+          Hash.EMPTY_TRIE_HASH,
+          Hash.EMPTY_LIST_HASH,
+          LogsBloomFilter.builder().build(),
+          Difficulty.ONE,
+          1,
+          0,
+          0,
+          0,
+          Bytes.EMPTY,
+          Wei.ZERO,
+          Hash.ZERO,
+          0,
+          null,
+          null,
+          null,
+          new MainnetBlockHeaderFunctions());
+  private static final BlockHeader headerTwo =
+      new BlockHeader(
+          headerOne.getHash(),
+          Hash.EMPTY_LIST_HASH,
+          Address.ZERO,
+          Hash.fromHexString("0x5b675f79cd11ba67266161d79a8d5be3ac330dfbb76300a4f15d76b610b18193"),
+          Hash.EMPTY_TRIE_HASH,
+          Hash.EMPTY_LIST_HASH,
+          LogsBloomFilter.builder().build(),
+          Difficulty.ONE,
+          1,
+          0,
+          0,
+          0,
+          Bytes.EMPTY,
+          Wei.ZERO,
+          Hash.ZERO,
+          0,
+          null,
+          null,
+          null,
+          new MainnetBlockHeaderFunctions());
 
   @Before
   public void createStorage() {
-    final InMemoryStorageProvider provider = new InMemoryStorageProvider();
-    archive = new BonsaiWorldStateArchive(provider);
+    provider = new InMemoryKeyValueStorageProvider();
+    final CachedMerkleTrieLoader cachedMerkleTrieLoader =
+        new CachedMerkleTrieLoader(new NoOpMetricsSystem());
+    archive =
+        new BonsaiWorldStateProvider(
+            provider, blockchain, cachedMerkleTrieLoader, new NoOpMetricsSystem(), null);
     accountStorage =
         (InMemoryKeyValueStorage)
             provider.getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.ACCOUNT_INFO_STATE);
@@ -80,36 +147,43 @@ public void createStorage() {
         (InMemoryKeyValueStorage)
             provider.getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.TRIE_LOG_STORAGE);
 
-    final InMemoryStorageProvider secondProvider = new InMemoryStorageProvider();
-    secondArchive = new BonsaiWorldStateArchive(secondProvider);
+    secondProvider = new InMemoryKeyValueStorageProvider();
+    final CachedMerkleTrieLoader secondOptimizedMerkleTrieLoader =
+        new CachedMerkleTrieLoader(new NoOpMetricsSystem());
+    secondArchive =
+        new BonsaiWorldStateProvider(
+            secondProvider,
+            blockchain,
+            secondOptimizedMerkleTrieLoader,
+            new NoOpMetricsSystem(),
+            null);
     secondAccountStorage =
         (InMemoryKeyValueStorage)
-            provider.getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.ACCOUNT_INFO_STATE);
+            secondProvider.getStorageBySegmentIdentifier(
+                KeyValueSegmentIdentifier.ACCOUNT_INFO_STATE);
     secondCodeStorage =
         (InMemoryKeyValueStorage)
-            provider.getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.CODE_STORAGE);
+            secondProvider.getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.CODE_STORAGE);
     secondStorageStorage =
         (InMemoryKeyValueStorage)
-            provider.getStorageBySegmentIdentifier(
+            secondProvider.getStorageBySegmentIdentifier(
                 KeyValueSegmentIdentifier.ACCOUNT_STORAGE_STORAGE);
     secondTrieBranchStorage =
         (InMemoryKeyValueStorage)
-            provider.getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.TRIE_BRANCH_STORAGE);
+            secondProvider.getStorageBySegmentIdentifier(
+                KeyValueSegmentIdentifier.TRIE_BRANCH_STORAGE);
     secondTrieLogStorage =
         (InMemoryKeyValueStorage)
-            provider.getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.TRIE_LOG_STORAGE);
+            secondProvider.getStorageBySegmentIdentifier(
+                KeyValueSegmentIdentifier.TRIE_LOG_STORAGE);
   }
 
   @Test
   public void simpleRollForwardTest() {
-    final BonsaiPersistedWorldState worldState =
-        new BonsaiPersistedWorldState(
-            archive,
-            accountStorage,
-            codeStorage,
-            storageStorage,
-            trieBranchStorage,
-            trieLogStorage);
+
+    final BonsaiWorldState worldState =
+        new BonsaiWorldState(
+            archive, new BonsaiWorldStateKeyValueStorage(provider, new NoOpMetricsSystem()));
     final WorldUpdater updater = worldState.updater();
 
     final MutableAccount mutableAccount =
@@ -117,23 +191,19 @@ public void simpleRollForwardTest() {
     mutableAccount.setCode(Bytes.of(0, 1, 2));
     mutableAccount.setStorageValue(UInt256.ONE, UInt256.ONE);
     updater.commit();
-    worldState.persist(hashOne);
+    worldState.persist(headerOne);
 
-    final BonsaiPersistedWorldState secondWorldState =
-        new BonsaiPersistedWorldState(
+    final BonsaiWorldState secondWorldState =
+        new BonsaiWorldState(
             secondArchive,
-            secondAccountStorage,
-            secondCodeStorage,
-            secondStorageStorage,
-            secondTrieBranchStorage,
-            secondTrieLogStorage);
-    final BonsaiWorldStateUpdater secondUpdater =
-        (BonsaiWorldStateUpdater) secondWorldState.updater();
+            new BonsaiWorldStateKeyValueStorage(secondProvider, new NoOpMetricsSystem()));
+    final BonsaiWorldStateUpdateAccumulator secondUpdater =
+        (BonsaiWorldStateUpdateAccumulator) secondWorldState.updater();
 
-    final Optional<byte[]> value = trieLogStorage.get(hashOne.toArrayUnsafe());
+    final Optional<byte[]> value = trieLogStorage.get(headerOne.getHash().toArrayUnsafe());
 
     final TrieLogLayer layer =
-        TrieLogLayer.readFrom(new BytesValueRLPInput(Bytes.wrap(value.get()), false));
+        TrieLogFactoryImpl.readFrom(new BytesValueRLPInput(Bytes.wrap(value.get()), false));
 
     secondUpdater.rollForward(layer);
     secondUpdater.commit();
@@ -142,6 +212,9 @@ public void simpleRollForwardTest() {
     assertKeyValueStorageEqual(accountStorage, secondAccountStorage);
     assertKeyValueStorageEqual(codeStorage, secondCodeStorage);
     assertKeyValueStorageEqual(storageStorage, secondStorageStorage);
+    final KeyValueStorageTransaction tx = trieBranchStorage.startTransaction();
+    tx.remove(BonsaiWorldStateKeyValueStorage.WORLD_BLOCK_HASH_KEY);
+    tx.commit();
     assertKeyValueStorageEqual(trieBranchStorage, secondTrieBranchStorage);
     // trie logs won't be the same, we shouldn't generate logs on rolls.
     assertKeyValueSubset(trieLogStorage, secondTrieLogStorage);
@@ -150,14 +223,9 @@ public void simpleRollForwardTest() {
 
   @Test
   public void rollForwardTwice() {
-    final BonsaiPersistedWorldState worldState =
-        new BonsaiPersistedWorldState(
-            archive,
-            accountStorage,
-            codeStorage,
-            storageStorage,
-            trieBranchStorage,
-            trieLogStorage);
+    final BonsaiWorldState worldState =
+        new BonsaiWorldState(
+            archive, new BonsaiWorldStateKeyValueStorage(provider, new NoOpMetricsSystem()));
 
     final WorldUpdater updater = worldState.updater();
     final MutableAccount mutableAccount =
@@ -166,32 +234,28 @@ public void rollForwardTwice() {
     mutableAccount.setStorageValue(UInt256.ONE, UInt256.ONE);
     updater.commit();
 
-    worldState.persist(hashOne);
+    worldState.persist(headerOne);
 
     final WorldUpdater updater2 = worldState.updater();
     final MutableAccount mutableAccount2 = updater2.getAccount(addressOne).getMutable();
     mutableAccount2.setStorageValue(UInt256.ONE, UInt256.valueOf(2));
     updater2.commit();
 
-    worldState.persist(hashTwo);
+    worldState.persist(headerTwo);
 
-    final BonsaiPersistedWorldState secondWorldState =
-        new BonsaiPersistedWorldState(
+    final BonsaiWorldState secondWorldState =
+        new BonsaiWorldState(
             secondArchive,
-            secondAccountStorage,
-            secondCodeStorage,
-            secondStorageStorage,
-            secondTrieBranchStorage,
-            secondTrieLogStorage);
-    final BonsaiWorldStateUpdater secondUpdater =
-        (BonsaiWorldStateUpdater) secondWorldState.updater();
-
-    final TrieLogLayer layerOne = getTrieLogLayer(trieLogStorage, hashOne);
+            new BonsaiWorldStateKeyValueStorage(secondProvider, new NoOpMetricsSystem()));
+    final BonsaiWorldStateUpdateAccumulator secondUpdater =
+        (BonsaiWorldStateUpdateAccumulator) secondWorldState.updater();
+
+    final TrieLogLayer layerOne = getTrieLogLayer(trieLogStorage, headerOne.getHash());
     secondUpdater.rollForward(layerOne);
     secondUpdater.commit();
     secondWorldState.persist(null);
 
-    final TrieLogLayer layerTwo = getTrieLogLayer(trieLogStorage, hashTwo);
+    final TrieLogLayer layerTwo = getTrieLogLayer(trieLogStorage, headerTwo.getHash());
     secondUpdater.rollForward(layerTwo);
     secondUpdater.commit();
     secondWorldState.persist(null);
@@ -199,6 +263,9 @@ public void rollForwardTwice() {
     assertKeyValueStorageEqual(accountStorage, secondAccountStorage);
     assertKeyValueStorageEqual(codeStorage, secondCodeStorage);
     assertKeyValueStorageEqual(storageStorage, secondStorageStorage);
+    final KeyValueStorageTransaction tx = trieBranchStorage.startTransaction();
+    tx.remove(BonsaiWorldStateKeyValueStorage.WORLD_BLOCK_HASH_KEY);
+    tx.commit();
     assertKeyValueStorageEqual(trieBranchStorage, secondTrieBranchStorage);
     // trie logs won't be the same, we shouldn't generate logs on rolls.
     assertKeyValueSubset(trieLogStorage, secondTrieLogStorage);
@@ -207,14 +274,9 @@ public void rollForwardTwice() {
 
   @Test
   public void rollBackOnce() {
-    final BonsaiPersistedWorldState worldState =
-        new BonsaiPersistedWorldState(
-            archive,
-            accountStorage,
-            codeStorage,
-            storageStorage,
-            trieBranchStorage,
-            trieLogStorage);
+    final BonsaiWorldState worldState =
+        new BonsaiWorldState(
+            archive, new BonsaiWorldStateKeyValueStorage(provider, new NoOpMetricsSystem()));
 
     final WorldUpdater updater = worldState.updater();
     final MutableAccount mutableAccount =
@@ -223,30 +285,26 @@ public void rollBackOnce() {
     mutableAccount.setStorageValue(UInt256.ONE, UInt256.ONE);
     updater.commit();
 
-    worldState.persist(hashOne);
+    worldState.persist(headerOne);
 
     final WorldUpdater updater2 = worldState.updater();
     final MutableAccount mutableAccount2 = updater2.getAccount(addressOne).getMutable();
     mutableAccount2.setStorageValue(UInt256.ONE, UInt256.valueOf(2));
     updater2.commit();
 
-    worldState.persist(hashTwo);
-    final BonsaiWorldStateUpdater firstRollbackUpdater =
-        (BonsaiWorldStateUpdater) worldState.updater();
+    worldState.persist(headerTwo);
+    final BonsaiWorldStateUpdateAccumulator firstRollbackUpdater =
+        (BonsaiWorldStateUpdateAccumulator) worldState.updater();
 
-    final TrieLogLayer layerTwo = getTrieLogLayer(trieLogStorage, hashTwo);
+    final TrieLogLayer layerTwo = getTrieLogLayer(trieLogStorage, headerTwo.getHash());
     firstRollbackUpdater.rollBack(layerTwo);
 
-    worldState.persist(hashTwo);
+    worldState.persist(headerOne);
 
-    final BonsaiPersistedWorldState secondWorldState =
-        new BonsaiPersistedWorldState(
+    final BonsaiWorldState secondWorldState =
+        new BonsaiWorldState(
             secondArchive,
-            secondAccountStorage,
-            secondCodeStorage,
-            secondStorageStorage,
-            secondTrieBranchStorage,
-            secondTrieLogStorage);
+            new BonsaiWorldStateKeyValueStorage(secondProvider, new NoOpMetricsSystem()));
 
     final WorldUpdater secondUpdater = secondWorldState.updater();
     final MutableAccount secondMutableAccount =
@@ -260,6 +318,9 @@ public void rollBackOnce() {
     assertKeyValueStorageEqual(accountStorage, secondAccountStorage);
     assertKeyValueStorageEqual(codeStorage, secondCodeStorage);
     assertKeyValueStorageEqual(storageStorage, secondStorageStorage);
+    final KeyValueStorageTransaction tx = trieBranchStorage.startTransaction();
+    tx.remove(BonsaiWorldStateKeyValueStorage.WORLD_BLOCK_HASH_KEY);
+    tx.commit();
     assertKeyValueStorageEqual(trieBranchStorage, secondTrieBranchStorage);
     // trie logs won't be the same, we don't delete the roll back log
     assertKeyValueSubset(trieLogStorage, secondTrieLogStorage);
@@ -269,7 +330,7 @@ public void rollBackOnce() {
   private TrieLogLayer getTrieLogLayer(final InMemoryKeyValueStorage storage, final Bytes key) {
     return storage
         .get(key.toArrayUnsafe())
-        .map(bytes -> TrieLogLayer.readFrom(new BytesValueRLPInput(Bytes.wrap(bytes), false)))
+        .map(bytes -> TrieLogFactoryImpl.readFrom(new BytesValueRLPInput(Bytes.wrap(bytes), false)))
         .get();
   }
 
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/RollingImport.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/RollingImport.java
index 1bbc0aee480..98e991574d8 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/RollingImport.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/RollingImport.java
@@ -18,10 +18,16 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
+import org.hyperledger.besu.ethereum.bonsai.cache.CachedMerkleTrieLoader;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.bonsai.trielog.TrieLogFactoryImpl;
+import org.hyperledger.besu.ethereum.bonsai.trielog.TrieLogLayer;
+import org.hyperledger.besu.ethereum.bonsai.worldview.BonsaiWorldState;
+import org.hyperledger.besu.ethereum.bonsai.worldview.BonsaiWorldStateUpdateAccumulator;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
 import org.hyperledger.besu.util.io.RollingFileReader;
 
@@ -38,8 +44,15 @@ public static void main(final String[] arg) throws IOException {
     final RollingFileReader reader =
         new RollingFileReader((i, c) -> Path.of(String.format(arg[0] + "-%04d.rdat", i)), false);
 
-    final InMemoryStorageProvider provider = new InMemoryStorageProvider();
-    final BonsaiWorldStateArchive archive = new BonsaiWorldStateArchive(provider);
+    final InMemoryKeyValueStorageProvider provider = new InMemoryKeyValueStorageProvider();
+    final CachedMerkleTrieLoader cachedMerkleTrieLoader =
+        new CachedMerkleTrieLoader(new NoOpMetricsSystem());
+    final BonsaiWorldStateProvider archive =
+        new BonsaiWorldStateProvider(
+            provider, null, cachedMerkleTrieLoader, new NoOpMetricsSystem(), null);
+    final BonsaiWorldState bonsaiState =
+        new BonsaiWorldState(
+            archive, new BonsaiWorldStateKeyValueStorage(provider, new NoOpMetricsSystem()));
     final InMemoryKeyValueStorage accountStorage =
         (InMemoryKeyValueStorage)
             provider.getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.ACCOUNT_INFO_STATE);
@@ -56,14 +69,6 @@ public static void main(final String[] arg) throws IOException {
     final InMemoryKeyValueStorage trieLogStorage =
         (InMemoryKeyValueStorage)
             provider.getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.TRIE_LOG_STORAGE);
-    final BonsaiPersistedWorldState bonsaiState =
-        new BonsaiPersistedWorldState(
-            archive,
-            accountStorage,
-            codeStorage,
-            storageStorage,
-            trieBranchStorage,
-            trieLogStorage);
 
     int count = 0;
     while (!reader.isDone()) {
@@ -73,11 +78,12 @@ public static void main(final String[] arg) throws IOException {
           continue;
         }
         final TrieLogLayer layer =
-            TrieLogLayer.readFrom(new BytesValueRLPInput(Bytes.wrap(bytes), false));
-        final BonsaiWorldStateUpdater updater = (BonsaiWorldStateUpdater) bonsaiState.updater();
+            TrieLogFactoryImpl.readFrom(new BytesValueRLPInput(Bytes.wrap(bytes), false));
+        final BonsaiWorldStateUpdateAccumulator updater =
+            (BonsaiWorldStateUpdateAccumulator) bonsaiState.updater();
         updater.rollForward(layer);
         updater.commit();
-        bonsaiState.persist(Hash.wrap(layer.getBlockHash()));
+        bonsaiState.persist(null);
         if (count % 10000 == 0) {
           System.out.println(". - " + count);
         } else if (count % 100 == 0) {
@@ -101,11 +107,12 @@ public static void main(final String[] arg) throws IOException {
         reader.seek(count);
         final byte[] bytes = reader.readBytes();
         final TrieLogLayer layer =
-            TrieLogLayer.readFrom(new BytesValueRLPInput(Bytes.wrap(bytes), false));
-        final BonsaiWorldStateUpdater updater = (BonsaiWorldStateUpdater) bonsaiState.updater();
+            TrieLogFactoryImpl.readFrom(new BytesValueRLPInput(Bytes.wrap(bytes), false));
+        final BonsaiWorldStateUpdateAccumulator updater =
+            (BonsaiWorldStateUpdateAccumulator) bonsaiState.updater();
         updater.rollBack(layer);
         updater.commit();
-        bonsaiState.persist(Hash.wrap(layer.getBlockHash()));
+        bonsaiState.persist(null);
         if (count % 10000 == 0) {
           System.out.println(". - " + count);
         } else if (count % 100 == 0) {
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogFactoryTests.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogFactoryTests.java
new file mode 100644
index 00000000000..7f0c6f6f6cb
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogFactoryTests.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.bonsai.trielog;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.StorageSlotKey;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
+import org.hyperledger.besu.plugin.services.trielogs.TrieLog;
+import org.hyperledger.besu.plugin.services.trielogs.TrieLogFactory;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TrieLogFactoryTests {
+
+  final BlockchainSetupUtil setup = BlockchainSetupUtil.forTesting(DataStorageFormat.BONSAI);
+
+  final Address accountFixture = Address.fromHexString("0xdeadbeef");
+
+  final BlockHeader headerFixture =
+      new BlockHeaderTestFixture()
+          .parentHash(setup.getGenesisState().getBlock().getHash())
+          .coinbase(Address.ZERO)
+          .buildHeader();
+
+  final TrieLogLayer trieLogFixture =
+      new TrieLogLayer()
+          .setBlockHash(headerFixture.getBlockHash())
+          .addAccountChange(
+              accountFixture,
+              null,
+              new StateTrieAccountValue(0, Wei.fromEth(1), Hash.EMPTY, Hash.EMPTY))
+          .addCodeChange(
+              Address.ZERO,
+              null,
+              Bytes.fromHexString("0xfeeddeadbeef"),
+              headerFixture.getBlockHash())
+          .addStorageChange(Address.ZERO, new StorageSlotKey(UInt256.ZERO), null, UInt256.ONE);
+
+  @Test
+  public void testSerializeDeserializeAreEqual() {
+
+    TrieLogFactory factory = new TrieLogFactoryImpl();
+    byte[] rlp = factory.serialize(trieLogFixture);
+
+    TrieLog layer = factory.deserialize(rlp);
+    assertThat(layer).isEqualTo(trieLogFixture);
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogLayerTests.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogLayerTests.java
new file mode 100644
index 00000000000..4dedd8e2b08
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogLayerTests.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.bonsai.trielog;
+
+import org.hyperledger.besu.datatypes.AccountValue;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.StorageSlotKey;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.assertj.core.api.Assertions;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TrieLogLayerTests {
+  private TrieLogLayer trieLogLayer;
+  private TrieLogLayer otherTrieLogLayer;
+
+  @Before
+  public void setUp() {
+    trieLogLayer = new TrieLogLayer();
+    otherTrieLogLayer = new TrieLogLayer();
+  }
+
+  @Test
+  public void testStorageSlotKeyEquivalence() {
+    StorageSlotKey key = new StorageSlotKey(UInt256.ZERO);
+    StorageSlotKey otherKey = new StorageSlotKey(UInt256.ZERO);
+
+    Assertions.assertThat(key).isEqualTo(otherKey);
+    Assertions.assertThat(key.hashCode()).isEqualTo(otherKey.hashCode());
+  }
+
+  @Test
+  public void testAddAccountChange() {
+    Address address = Address.fromHexString("0x00");
+    StateTrieAccountValue oldValue = new StateTrieAccountValue(0, Wei.ZERO, Hash.EMPTY, Hash.EMPTY);
+    StateTrieAccountValue newValue =
+        new StateTrieAccountValue(1, Wei.fromEth(1), Hash.EMPTY, Hash.EMPTY);
+
+    Address otherAddress = Address.fromHexString("0x000000");
+    StateTrieAccountValue otherOldValue =
+        new StateTrieAccountValue(0, Wei.ZERO, Hash.EMPTY, Hash.EMPTY);
+    StateTrieAccountValue otherNewValue =
+        new StateTrieAccountValue(1, Wei.fromEth(1), Hash.EMPTY, Hash.EMPTY);
+
+    trieLogLayer.addAccountChange(address, oldValue, newValue);
+    otherTrieLogLayer.addAccountChange(otherAddress, otherOldValue, otherNewValue);
+
+    Assertions.assertThat(trieLogLayer).isEqualTo(otherTrieLogLayer);
+
+    Optional<AccountValue> priorAccount = trieLogLayer.getPriorAccount(address);
+    Assertions.assertThat(priorAccount).isPresent();
+    Assertions.assertThat(priorAccount.get()).isEqualTo(oldValue);
+
+    Optional<AccountValue> updatedAccount = trieLogLayer.getAccount(address);
+    Assertions.assertThat(updatedAccount).isPresent();
+    Assertions.assertThat(updatedAccount.get()).isEqualTo(newValue);
+  }
+
+  @Test
+  public void testAddCodeChange() {
+    Address address = Address.fromHexString("0xdeadbeef");
+    Bytes oldValue = Bytes.fromHexString("0x00");
+    Bytes newValue = Bytes.fromHexString("0x01030307");
+    Hash blockHash = Hash.fromHexStringLenient("0xfeedbeef02dead");
+
+    Address otherAddress = Address.fromHexString("0x0000deadbeef");
+    Bytes otherOldValue = Bytes.fromHexString("0x00");
+    Bytes otherNewValue = Bytes.fromHexString("0x01030307");
+    Hash otherBlockHash = Hash.fromHexStringLenient("0x00feedbeef02dead");
+
+    trieLogLayer.addCodeChange(address, oldValue, newValue, blockHash);
+    otherTrieLogLayer.addCodeChange(otherAddress, otherOldValue, otherNewValue, otherBlockHash);
+
+    Assertions.assertThat(trieLogLayer).isEqualTo(otherTrieLogLayer);
+
+    Optional<Bytes> priorCode = trieLogLayer.getPriorCode(address);
+    Assertions.assertThat(priorCode).isPresent();
+    Assertions.assertThat(priorCode.get()).isEqualTo(oldValue);
+
+    Optional<Bytes> updatedCode = trieLogLayer.getCode(address);
+    Assertions.assertThat(updatedCode).isPresent();
+    Assertions.assertThat(updatedCode.get()).isEqualTo(newValue);
+  }
+
+  @Test
+  public void testAddStorageChange() {
+    Address address = Address.fromHexString("0x00");
+    UInt256 oldValue = UInt256.ZERO;
+    UInt256 newValue = UInt256.ONE;
+    UInt256 slot = UInt256.ONE;
+    StorageSlotKey storageSlotKey = new StorageSlotKey(slot);
+
+    Address otherAddress = Address.fromHexString("0x000000");
+    UInt256 otherOldValue = UInt256.ZERO;
+    UInt256 otherNewValue = UInt256.ONE;
+    UInt256 otherSlot = UInt256.ONE;
+    StorageSlotKey otherStorageSlotKey = new StorageSlotKey(otherSlot);
+
+    trieLogLayer.addStorageChange(address, storageSlotKey, oldValue, newValue);
+    otherTrieLogLayer.addStorageChange(
+        otherAddress, otherStorageSlotKey, otherOldValue, otherNewValue);
+
+    Assertions.assertThat(trieLogLayer).isEqualTo(otherTrieLogLayer);
+
+    Optional<UInt256> priorStorageValue =
+        trieLogLayer.getPriorStorageByStorageSlotKey(address, storageSlotKey);
+    Assertions.assertThat(priorStorageValue).isPresent();
+    Assertions.assertThat(priorStorageValue.get()).isEqualTo(oldValue);
+
+    Optional<UInt256> updatedStorageValue =
+        trieLogLayer.getStorageByStorageSlotKey(address, storageSlotKey);
+    Assertions.assertThat(updatedStorageValue).isPresent();
+    Assertions.assertThat(updatedStorageValue.get()).isEqualTo(newValue);
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogManagerTests.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogManagerTests.java
new file mode 100644
index 00000000000..9ab0cff2a22
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/bonsai/trielog/TrieLogManagerTests.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.bonsai.trielog;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.bonsai.BonsaiWorldStateProvider;
+import org.hyperledger.besu.ethereum.bonsai.cache.CachedWorldStorageManager;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.bonsai.worldview.BonsaiWorldState;
+import org.hyperledger.besu.ethereum.bonsai.worldview.BonsaiWorldStateUpdateAccumulator;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TrieLogManagerTests {
+
+  BlockHeader blockHeader = new BlockHeaderTestFixture().buildHeader();
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  BonsaiWorldState bonsaiWorldState;
+
+  @Mock BonsaiWorldStateKeyValueStorage bonsaiWorldStateKeyValueStorage;
+  @Mock BonsaiWorldState worldState;
+  @Mock BonsaiWorldStateProvider archive;
+  @Mock Blockchain blockchain;
+  BonsaiWorldStateUpdateAccumulator bonsaiUpdater =
+      spy(new BonsaiWorldStateUpdateAccumulator(worldState, (__, ___) -> {}, (__, ___) -> {}));
+
+  TrieLogManager trieLogManager;
+
+  @Before
+  public void setup() {
+    trieLogManager =
+        new CachedWorldStorageManager(
+            archive,
+            blockchain,
+            bonsaiWorldStateKeyValueStorage,
+            new NoOpMetricsSystem(),
+            512,
+            null);
+  }
+
+  @Test
+  public void testSaveTrieLogEvent() {
+    AtomicBoolean eventFired = new AtomicBoolean(false);
+    trieLogManager.subscribe(
+        layer -> {
+          assertThat(layer).isNotNull();
+          eventFired.set(true);
+        });
+    trieLogManager.saveTrieLog(bonsaiUpdater, Hash.ZERO, blockHeader, bonsaiWorldState);
+
+    assertThat(eventFired.get()).isTrue();
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/chain/ChainDataPrunerTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/chain/ChainDataPrunerTest.java
new file mode 100644
index 00000000000..00d0797d39b
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/chain/ChainDataPrunerTest.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.chain;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage;
+import org.hyperledger.besu.ethereum.storage.keyvalue.VariablesKeyValueStorage;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
+
+import java.util.List;
+import java.util.concurrent.AbstractExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Test;
+
+public class ChainDataPrunerTest {
+
+  @Test
+  public void singleChainPruning() {
+    final BlockDataGenerator gen = new BlockDataGenerator();
+    final BlockchainStorage blockchainStorage =
+        new KeyValueStoragePrefixedKeyBlockchainStorage(
+            new InMemoryKeyValueStorage(),
+            new VariablesKeyValueStorage(new InMemoryKeyValueStorage()),
+            new MainnetBlockHeaderFunctions());
+    final ChainDataPruner chainDataPruner =
+        new ChainDataPruner(
+            blockchainStorage,
+            new ChainDataPrunerStorage(new InMemoryKeyValueStorage()),
+            512,
+            0,
+            new BlockingExecutor());
+    Block genesisBlock = gen.genesisBlock();
+    final MutableBlockchain blockchain =
+        DefaultBlockchain.createMutable(
+            genesisBlock, blockchainStorage, new NoOpMetricsSystem(), 0);
+    blockchain.observeBlockAdded(chainDataPruner);
+
+    // Generate & Import 1000 blocks
+    gen.blockSequence(genesisBlock, 1000)
+        .forEach(
+            blk -> {
+              blockchain.appendBlock(blk, gen.receipts(blk));
+              long number = blk.getHeader().getNumber();
+              if (number <= 512) {
+                // No prune happened
+                assertThat(blockchain.getBlockHeader(1)).isPresent();
+              } else {
+                // Prune number - 512 only
+                assertThat(blockchain.getBlockHeader(number - 512)).isEmpty();
+                assertThat(blockchain.getBlockHeader(number - 511)).isPresent();
+              }
+            });
+  }
+
+  @Test
+  public void forkPruning() {
+    final BlockDataGenerator gen = new BlockDataGenerator();
+    final BlockchainStorage blockchainStorage =
+        new KeyValueStoragePrefixedKeyBlockchainStorage(
+            new InMemoryKeyValueStorage(),
+            new VariablesKeyValueStorage(new InMemoryKeyValueStorage()),
+            new MainnetBlockHeaderFunctions());
+    final ChainDataPruner chainDataPruner =
+        new ChainDataPruner(
+            blockchainStorage,
+            new ChainDataPrunerStorage(new InMemoryKeyValueStorage()),
+            512,
+            0,
+            new BlockingExecutor());
+    Block genesisBlock = gen.genesisBlock();
+    final MutableBlockchain blockchain =
+        DefaultBlockchain.createMutable(
+            genesisBlock, blockchainStorage, new NoOpMetricsSystem(), 0);
+    blockchain.observeBlockAdded(chainDataPruner);
+
+    List<Block> canonicalChain = gen.blockSequence(genesisBlock, 1000);
+    List<Block> forkChain = gen.blockSequence(genesisBlock, 16);
+    for (Block blk : forkChain) {
+      blockchain.storeBlock(blk, gen.receipts(blk));
+    }
+    for (int i = 0; i < 512; i++) {
+      Block blk = canonicalChain.get(i);
+      blockchain.appendBlock(blk, gen.receipts(blk));
+    }
+    // No prune happened
+    assertThat(blockchain.getBlockByHash(canonicalChain.get(0).getHash())).isPresent();
+    assertThat(blockchain.getBlockByHash(forkChain.get(0).getHash())).isPresent();
+    for (int i = 512; i < 527; i++) {
+      final int index = i;
+      Block blk = canonicalChain.get(i);
+      blockchain.appendBlock(blk, gen.receipts(blk));
+      // Prune block on canonical chain and fork for i - 512 only
+      assertThat(blockchain.getBlockByHash(canonicalChain.get(index - 512).getHash())).isEmpty();
+      assertThat(blockchain.getBlockByHash(canonicalChain.get(i - 511).getHash())).isPresent();
+      assertThat(blockchain.getBlockByHash(canonicalChain.get(index - 512).getHash())).isEmpty();
+      assertThat(blockchain.getBlockByHash(forkChain.get(i - 511).getHash())).isPresent();
+    }
+  }
+
+  protected static class BlockingExecutor extends AbstractExecutorService {
+    @Override
+    public void shutdown() {}
+
+    @NotNull
+    @Override
+    public List<Runnable> shutdownNow() {
+      return List.of();
+    }
+
+    @Override
+    public boolean isShutdown() {
+      return true;
+    }
+
+    @Override
+    public boolean isTerminated() {
+      return true;
+    }
+
+    @Override
+    public boolean awaitTermination(final long timeout, final @NotNull TimeUnit unit) {
+      return true;
+    }
+
+    @Override
+    public void execute(final @NotNull Runnable command) {
+      command.run();
+    }
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/chain/DefaultBlockchainTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/chain/DefaultBlockchainTest.java
index 99775819c6f..b3523e1d9b7 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/chain/DefaultBlockchainTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/chain/DefaultBlockchainTest.java
@@ -17,17 +17,18 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.LogWithMetadata;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage;
+import org.hyperledger.besu.ethereum.storage.keyvalue.VariablesKeyValueStorage;
 import org.hyperledger.besu.metrics.MetricsSystemFactory;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
@@ -52,8 +53,10 @@ public void initializeNew() {
     final BlockDataGenerator gen = new BlockDataGenerator();
 
     final KeyValueStorage kvStore = new InMemoryKeyValueStorage();
+    final KeyValueStorage kvStoreVariables = new InMemoryKeyValueStorage();
     final Block genesisBlock = gen.genesisBlock();
-    final DefaultBlockchain blockchain = createMutableBlockchain(kvStore, genesisBlock);
+    final DefaultBlockchain blockchain =
+        createMutableBlockchain(kvStore, kvStoreVariables, genesisBlock);
 
     assertBlockDataIsStored(blockchain, genesisBlock, Collections.emptyList());
     assertBlockIsHead(blockchain, genesisBlock);
@@ -67,11 +70,13 @@ public void initializeExisting() {
 
     // Write to kv store
     final KeyValueStorage kvStore = new InMemoryKeyValueStorage();
+    final KeyValueStorage kvStoreVariables = new InMemoryKeyValueStorage();
     final Block genesisBlock = gen.genesisBlock();
-    createMutableBlockchain(kvStore, genesisBlock);
+    createMutableBlockchain(kvStore, kvStoreVariables, genesisBlock);
 
     // Initialize a new blockchain store with kvStore that already contains data
-    final DefaultBlockchain blockchain = createMutableBlockchain(kvStore, genesisBlock);
+    final DefaultBlockchain blockchain =
+        createMutableBlockchain(kvStore, kvStoreVariables, genesisBlock);
 
     assertBlockDataIsStored(blockchain, genesisBlock, Collections.emptyList());
     assertBlockIsHead(blockchain, genesisBlock);
@@ -85,28 +90,34 @@ public void initializeExistingWithWrongGenesisBlock() {
 
     // Write to kv store
     final KeyValueStorage kvStore = new InMemoryKeyValueStorage();
+    final KeyValueStorage kvStoreVariables = new InMemoryKeyValueStorage();
     final Block genesisBlock = gen.genesisBlock();
-    createMutableBlockchain(kvStore, genesisBlock);
+    createMutableBlockchain(kvStore, kvStoreVariables, genesisBlock);
 
     // Initialize a new blockchain store with same kvStore, but different genesis block
-    assertThatThrownBy(() -> createMutableBlockchain(kvStore, gen.genesisBlock()))
+    assertThatThrownBy(
+            () ->
+                createMutableBlockchain(
+                    kvStore, kvStoreVariables, gen.genesisBlock(), "/test/path"))
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessageContaining(
-            "Supplied genesis block does not match stored chain data.\n"
-                + "Please specify a different data directory with --data-path or specify the original genesis file with --genesis-file.");
+            "Supplied genesis block does not match chain data stored in /test/path.\n"
+                + "Please specify a different data directory with --data-path, specify the original genesis file with "
+                + "--genesis-file or supply a testnet/mainnet option with --network.");
   }
 
   @Test
   public void initializeReadOnly_withGenesisBlock() {
     final BlockDataGenerator gen = new BlockDataGenerator();
     final KeyValueStorage kvStore = new InMemoryKeyValueStorage();
+    final KeyValueStorage kvStoreVariables = new InMemoryKeyValueStorage();
     final Block genesisBlock = gen.genesisBlock();
 
     // Write genesis block to storage
-    createMutableBlockchain(kvStore, genesisBlock);
+    createMutableBlockchain(kvStore, kvStoreVariables, genesisBlock);
 
     // Create read only chain
-    final Blockchain blockchain = createBlockchain(kvStore);
+    final Blockchain blockchain = createBlockchain(kvStore, kvStoreVariables);
 
     assertBlockDataIsStored(blockchain, genesisBlock, Collections.emptyList());
     assertBlockIsHead(blockchain, genesisBlock);
@@ -117,12 +128,14 @@ public void initializeReadOnly_withGenesisBlock() {
   public void initializeReadOnly_withSmallChain() {
     final BlockDataGenerator gen = new BlockDataGenerator();
     final KeyValueStorage kvStore = new InMemoryKeyValueStorage();
+    final KeyValueStorage kvStoreVariables = new InMemoryKeyValueStorage();
     final List<Block> blocks = gen.blockSequence(10);
     final List<List<TransactionReceipt>> blockReceipts = new ArrayList<>(blocks.size());
     blockReceipts.add(Collections.emptyList());
 
     // Write small chain to storage
-    final MutableBlockchain mutableBlockchain = createMutableBlockchain(kvStore, blocks.get(0));
+    final MutableBlockchain mutableBlockchain =
+        createMutableBlockchain(kvStore, kvStoreVariables, blocks.get(0));
     for (int i = 1; i < blocks.size(); i++) {
       final Block block = blocks.get(i);
       final List<TransactionReceipt> receipts = gen.receipts(block);
@@ -131,7 +144,7 @@ public void initializeReadOnly_withSmallChain() {
     }
 
     // Create read only chain
-    final Blockchain blockchain = createBlockchain(kvStore);
+    final Blockchain blockchain = createBlockchain(kvStore, kvStoreVariables);
 
     for (int i = 0; i < blocks.size(); i++) {
       assertBlockDataIsStored(blockchain, blocks.get(i), blockReceipts.get(i));
@@ -147,12 +160,14 @@ public void initializeReadOnly_withGiantDifficultyAndLiveMetrics() {
     gen.setBlockOptionsSupplier(
         () -> BlockOptions.create().setDifficulty(Difficulty.of(Long.MAX_VALUE)));
     final KeyValueStorage kvStore = new InMemoryKeyValueStorage();
+    final KeyValueStorage kvStoreVariables = new InMemoryKeyValueStorage();
     final List<Block> blocks = gen.blockSequence(10);
     final List<List<TransactionReceipt>> blockReceipts = new ArrayList<>(blocks.size());
     blockReceipts.add(Collections.emptyList());
 
     // Write small chain to storage
-    final MutableBlockchain mutableBlockchain = createMutableBlockchain(kvStore, blocks.get(0));
+    final MutableBlockchain mutableBlockchain =
+        createMutableBlockchain(kvStore, kvStoreVariables, blocks.get(0));
     for (int i = 1; i < blocks.size(); i++) {
       final Block block = blocks.get(i);
       final List<TransactionReceipt> receipts = gen.receipts(block);
@@ -163,7 +178,7 @@ public void initializeReadOnly_withGiantDifficultyAndLiveMetrics() {
     // Create read only chain
     final Blockchain blockchain =
         DefaultBlockchain.create(
-            createStorage(kvStore),
+            createStorage(kvStore, kvStoreVariables),
             MetricsSystemFactory.create(MetricsConfiguration.builder().enabled(true).build()),
             0);
 
@@ -178,8 +193,8 @@ public void initializeReadOnly_withGiantDifficultyAndLiveMetrics() {
   @Test
   public void initializeReadOnly_emptyStorage() {
     final KeyValueStorage kvStore = new InMemoryKeyValueStorage();
-
-    assertThatThrownBy(() -> createBlockchain(kvStore))
+    final KeyValueStorage kvStoreVariables = new InMemoryKeyValueStorage();
+    assertThatThrownBy(() -> createBlockchain(kvStore, kvStoreVariables))
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessageContaining("Cannot create Blockchain from empty storage");
   }
@@ -189,8 +204,10 @@ public void appendBlock() {
     final BlockDataGenerator gen = new BlockDataGenerator();
 
     final KeyValueStorage kvStore = new InMemoryKeyValueStorage();
+    final KeyValueStorage kvStoreVariables = new InMemoryKeyValueStorage();
     final Block genesisBlock = gen.genesisBlock();
-    final DefaultBlockchain blockchain = createMutableBlockchain(kvStore, genesisBlock);
+    final DefaultBlockchain blockchain =
+        createMutableBlockchain(kvStore, kvStoreVariables, genesisBlock);
 
     final BlockDataGenerator.BlockOptions options =
         new BlockDataGenerator.BlockOptions()
@@ -212,28 +229,33 @@ public void appendBlock() {
     assertThat(blockchain.getForks()).isEmpty();
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void appendUnconnectedBlock() {
     final BlockDataGenerator gen = new BlockDataGenerator();
 
     final KeyValueStorage kvStore = new InMemoryKeyValueStorage();
+    final KeyValueStorage kvStoreVariables = new InMemoryKeyValueStorage();
     final Block genesisBlock = gen.genesisBlock();
-    final DefaultBlockchain blockchain = createMutableBlockchain(kvStore, genesisBlock);
+    final DefaultBlockchain blockchain =
+        createMutableBlockchain(kvStore, kvStoreVariables, genesisBlock);
 
     final BlockDataGenerator.BlockOptions options =
         new BlockDataGenerator.BlockOptions().setBlockNumber(1L).setParentHash(Hash.ZERO);
     final Block newBlock = gen.block(options);
     final List<TransactionReceipt> receipts = gen.receipts(newBlock);
-    blockchain.appendBlock(newBlock, receipts);
+    assertThatThrownBy(() -> blockchain.appendBlock(newBlock, receipts))
+        .isInstanceOf(IllegalArgumentException.class);
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void appendBlockWithMismatchedReceipts() {
     final BlockDataGenerator gen = new BlockDataGenerator();
 
     final KeyValueStorage kvStore = new InMemoryKeyValueStorage();
+    final KeyValueStorage kvStoreVariables = new InMemoryKeyValueStorage();
     final Block genesisBlock = gen.genesisBlock();
-    final DefaultBlockchain blockchain = createMutableBlockchain(kvStore, genesisBlock);
+    final DefaultBlockchain blockchain =
+        createMutableBlockchain(kvStore, kvStoreVariables, genesisBlock);
 
     final BlockDataGenerator.BlockOptions options =
         new BlockDataGenerator.BlockOptions()
@@ -242,7 +264,8 @@ public void appendBlockWithMismatchedReceipts() {
     final Block newBlock = gen.block(options);
     final List<TransactionReceipt> receipts = gen.receipts(newBlock);
     receipts.add(gen.receipt());
-    blockchain.appendBlock(newBlock, receipts);
+    assertThatThrownBy(() -> blockchain.appendBlock(newBlock, receipts))
+        .isInstanceOf(IllegalArgumentException.class);
   }
 
   @Test
@@ -253,7 +276,9 @@ public void createSmallChain() {
         chain.stream().map(gen::receipts).collect(Collectors.toList());
 
     final KeyValueStorage kvStore = new InMemoryKeyValueStorage();
-    final DefaultBlockchain blockchain = createMutableBlockchain(kvStore, chain.get(0));
+    final KeyValueStorage kvStoreVariables = new InMemoryKeyValueStorage();
+    final DefaultBlockchain blockchain =
+        createMutableBlockchain(kvStore, kvStoreVariables, chain.get(0));
     for (int i = 1; i < chain.size(); i++) {
       blockchain.appendBlock(chain.get(i), blockReceipts.get(i));
     }
@@ -278,7 +303,9 @@ public void appendBlockWithReorgToChainAtEqualHeight() {
     final List<List<TransactionReceipt>> blockReceipts =
         chain.stream().map(gen::receipts).collect(Collectors.toList());
     final KeyValueStorage kvStore = new InMemoryKeyValueStorage();
-    final DefaultBlockchain blockchain = createMutableBlockchain(kvStore, chain.get(0));
+    final KeyValueStorage kvStoreVariables = new InMemoryKeyValueStorage();
+    final DefaultBlockchain blockchain =
+        createMutableBlockchain(kvStore, kvStoreVariables, chain.get(0));
 
     // Listen to block events and add the Logs here
     List<LogWithMetadata> logsWithMetadata = new ArrayList<>();
@@ -355,7 +382,9 @@ public void appendBlockWithReorgToShorterChain() {
     final List<List<TransactionReceipt>> blockReceipts =
         chain.stream().map(gen::receipts).collect(Collectors.toList());
     final KeyValueStorage kvStore = new InMemoryKeyValueStorage();
-    final DefaultBlockchain blockchain = createMutableBlockchain(kvStore, chain.get(0));
+    final KeyValueStorage kvStoreVariables = new InMemoryKeyValueStorage();
+    final DefaultBlockchain blockchain =
+        createMutableBlockchain(kvStore, kvStoreVariables, chain.get(0));
     // Listen to block events and add the Logs here
     List<LogWithMetadata> logsWithMetadata = new ArrayList<>();
     blockchain.observeBlockAdded(event -> logsWithMetadata.addAll(event.getLogsWithMetadata()));
@@ -474,7 +503,9 @@ public void appendBlockWithReorgToLongerChain() {
     final List<List<TransactionReceipt>> blockReceipts =
         chain.stream().map(gen::receipts).collect(Collectors.toList());
     final KeyValueStorage kvStore = new InMemoryKeyValueStorage();
-    final DefaultBlockchain blockchain = createMutableBlockchain(kvStore, chain.get(0));
+    final KeyValueStorage kvStoreVariables = new InMemoryKeyValueStorage();
+    final DefaultBlockchain blockchain =
+        createMutableBlockchain(kvStore, kvStoreVariables, chain.get(0));
     // Listen to block events and add the Logs here
     List<LogWithMetadata> logsWithMetadata = new ArrayList<>();
     blockchain.observeBlockAdded(event -> logsWithMetadata.addAll(event.getLogsWithMetadata()));
@@ -584,7 +615,9 @@ public void reorgWithOverlappingTransactions() {
     final List<List<TransactionReceipt>> blockReceipts =
         chain.stream().map(gen::receipts).collect(Collectors.toList());
     final KeyValueStorage kvStore = new InMemoryKeyValueStorage();
-    final DefaultBlockchain blockchain = createMutableBlockchain(kvStore, chain.get(0));
+    final KeyValueStorage kvStoreVariables = new InMemoryKeyValueStorage();
+    final DefaultBlockchain blockchain =
+        createMutableBlockchain(kvStore, kvStoreVariables, chain.get(0));
     // Listen to block events and add the Logs here
     List<LogWithMetadata> logsWithMetadata = new ArrayList<>();
     blockchain.observeBlockAdded(event -> logsWithMetadata.addAll(event.getLogsWithMetadata()));
@@ -655,7 +688,9 @@ public void rewindChain() {
     final List<List<TransactionReceipt>> blockReceipts =
         chain.stream().map(gen::receipts).collect(Collectors.toList());
     final KeyValueStorage kvStore = new InMemoryKeyValueStorage();
-    final DefaultBlockchain blockchain = createMutableBlockchain(kvStore, chain.get(0));
+    final KeyValueStorage kvStoreVariables = new InMemoryKeyValueStorage();
+    final DefaultBlockchain blockchain =
+        createMutableBlockchain(kvStore, kvStoreVariables, chain.get(0));
     for (int i = 1; i < chain.size(); i++) {
       blockchain.appendBlock(chain.get(i), blockReceipts.get(i));
     }
@@ -694,7 +729,9 @@ public void appendBlockForFork() {
     final List<List<TransactionReceipt>> blockReceipts =
         chain.stream().map(gen::receipts).collect(Collectors.toList());
     final KeyValueStorage kvStore = new InMemoryKeyValueStorage();
-    final DefaultBlockchain blockchain = createMutableBlockchain(kvStore, chain.get(0));
+    final KeyValueStorage kvStoreVariables = new InMemoryKeyValueStorage();
+    final DefaultBlockchain blockchain =
+        createMutableBlockchain(kvStore, kvStoreVariables, chain.get(0));
     // Listen to block events and add the Logs here
     List<LogWithMetadata> logsWithMetadata = new ArrayList<>();
     blockchain.observeBlockAdded(event -> logsWithMetadata.addAll(event.getLogsWithMetadata()));
@@ -779,8 +816,10 @@ public void appendBlockForFork() {
   public void blockAddedObserver_removeNonexistentObserver() {
     final BlockDataGenerator gen = new BlockDataGenerator();
     final KeyValueStorage kvStore = new InMemoryKeyValueStorage();
+    final KeyValueStorage kvStoreVariables = new InMemoryKeyValueStorage();
     final Block genesisBlock = gen.genesisBlock();
-    final DefaultBlockchain blockchain = createMutableBlockchain(kvStore, genesisBlock);
+    final DefaultBlockchain blockchain =
+        createMutableBlockchain(kvStore, kvStoreVariables, genesisBlock);
 
     assertThat(blockchain.removeObserver(7)).isFalse();
   }
@@ -790,8 +829,10 @@ public void blockAddedObserver_addRemoveSingle() {
     final BlockDataGenerator gen = new BlockDataGenerator();
 
     final KeyValueStorage kvStore = new InMemoryKeyValueStorage();
+    final KeyValueStorage kvStoreVariables = new InMemoryKeyValueStorage();
     final Block genesisBlock = gen.genesisBlock();
-    final DefaultBlockchain blockchain = createMutableBlockchain(kvStore, genesisBlock);
+    final DefaultBlockchain blockchain =
+        createMutableBlockchain(kvStore, kvStoreVariables, genesisBlock);
 
     final long observerId = blockchain.observeBlockAdded(__ -> {});
     assertThat(blockchain.observerCount()).isEqualTo(1);
@@ -800,15 +841,18 @@ public void blockAddedObserver_addRemoveSingle() {
     assertThat(blockchain.observerCount()).isEqualTo(0);
   }
 
-  @Test(expected = NullPointerException.class)
+  @Test
   public void blockAddedObserver_nullObserver() {
     final BlockDataGenerator gen = new BlockDataGenerator();
 
     final KeyValueStorage kvStore = new InMemoryKeyValueStorage();
+    final KeyValueStorage kvStoreVariables = new InMemoryKeyValueStorage();
     final Block genesisBlock = gen.genesisBlock();
-    final DefaultBlockchain blockchain = createMutableBlockchain(kvStore, genesisBlock);
+    final DefaultBlockchain blockchain =
+        createMutableBlockchain(kvStore, kvStoreVariables, genesisBlock);
 
-    blockchain.observeBlockAdded(null);
+    assertThatThrownBy(() -> blockchain.observeBlockAdded(null))
+        .isInstanceOf(NullPointerException.class);
   }
 
   @Test
@@ -816,8 +860,10 @@ public void blockAddedObserver_addRemoveMultiple() {
     final BlockDataGenerator gen = new BlockDataGenerator();
 
     final KeyValueStorage kvStore = new InMemoryKeyValueStorage();
+    final KeyValueStorage kvStoreVariables = new InMemoryKeyValueStorage();
     final Block genesisBlock = gen.genesisBlock();
-    final DefaultBlockchain blockchain = createMutableBlockchain(kvStore, genesisBlock);
+    final DefaultBlockchain blockchain =
+        createMutableBlockchain(kvStore, kvStoreVariables, genesisBlock);
 
     final long observerId1 = blockchain.observeBlockAdded(__ -> {});
     assertThat(blockchain.observerCount()).isEqualTo(1);
@@ -843,8 +889,10 @@ public void blockAddedObserver_invokedSingle() {
     final BlockDataGenerator gen = new BlockDataGenerator();
 
     final KeyValueStorage kvStore = new InMemoryKeyValueStorage();
+    final KeyValueStorage kvStoreVariables = new InMemoryKeyValueStorage();
     final Block genesisBlock = gen.genesisBlock();
-    final DefaultBlockchain blockchain = createMutableBlockchain(kvStore, genesisBlock);
+    final DefaultBlockchain blockchain =
+        createMutableBlockchain(kvStore, kvStoreVariables, genesisBlock);
 
     final BlockDataGenerator.BlockOptions options =
         new BlockDataGenerator.BlockOptions()
@@ -866,8 +914,10 @@ public void blockAddedObserver_invokedMultiple() {
     final BlockDataGenerator gen = new BlockDataGenerator();
 
     final KeyValueStorage kvStore = new InMemoryKeyValueStorage();
+    final KeyValueStorage kvStoreVariables = new InMemoryKeyValueStorage();
     final Block genesisBlock = gen.genesisBlock();
-    final DefaultBlockchain blockchain = createMutableBlockchain(kvStore, genesisBlock);
+    final DefaultBlockchain blockchain =
+        createMutableBlockchain(kvStore, kvStoreVariables, genesisBlock);
 
     final BlockDataGenerator.BlockOptions options =
         new BlockDataGenerator.BlockOptions()
@@ -940,19 +990,40 @@ private void assertTotalDifficultiesAreConsistent(final Blockchain blockchain, f
     assertThat(blockchain.getChainHead().getTotalDifficulty()).isEqualTo(td);
   }
 
-  private BlockchainStorage createStorage(final KeyValueStorage kvStore) {
+  private BlockchainStorage createStorage(
+      final KeyValueStorage kvStoreChain, final KeyValueStorage kvStorageVariables) {
     return new KeyValueStoragePrefixedKeyBlockchainStorage(
-        kvStore, new MainnetBlockHeaderFunctions());
+        kvStoreChain,
+        new VariablesKeyValueStorage(kvStorageVariables),
+        new MainnetBlockHeaderFunctions());
+  }
+
+  private DefaultBlockchain createMutableBlockchain(
+      final KeyValueStorage kvStore,
+      final KeyValueStorage kvStorageVariables,
+      final Block genesisBlock) {
+    return (DefaultBlockchain)
+        DefaultBlockchain.createMutable(
+            genesisBlock, createStorage(kvStore, kvStorageVariables), new NoOpMetricsSystem(), 0);
   }
 
   private DefaultBlockchain createMutableBlockchain(
-      final KeyValueStorage kvStore, final Block genesisBlock) {
+      final KeyValueStorage kvStore,
+      final KeyValueStorage kvStorageVariables,
+      final Block genesisBlock,
+      final String dataDirectory) {
     return (DefaultBlockchain)
         DefaultBlockchain.createMutable(
-            genesisBlock, createStorage(kvStore), new NoOpMetricsSystem(), 0);
+            genesisBlock,
+            createStorage(kvStore, kvStorageVariables),
+            new NoOpMetricsSystem(),
+            0,
+            dataDirectory);
   }
 
-  private Blockchain createBlockchain(final KeyValueStorage kvStore) {
-    return DefaultBlockchain.create(createStorage(kvStore), new NoOpMetricsSystem(), 0);
+  private Blockchain createBlockchain(
+      final KeyValueStorage kvStore, final KeyValueStorage kvStorageVariables) {
+    return DefaultBlockchain.create(
+        createStorage(kvStore, kvStorageVariables), new NoOpMetricsSystem(), 0);
   }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/chain/GenesisStateTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/chain/GenesisStateTest.java
index 8fe73db01f1..16347e80bbc 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/chain/GenesisStateTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/chain/GenesisStateTest.java
@@ -16,23 +16,20 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.ProtocolScheduleFixture;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.evm.account.Account;
 
 import com.google.common.base.Charsets;
 import com.google.common.io.Resources;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.units.bigints.UInt256;
 import org.bouncycastle.util.encoders.Hex;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 public final class GenesisStateTest {
@@ -48,16 +45,6 @@ public final class GenesisStateTest {
   private static final String EXPECTED_CODE =
       "0x608060405260043610610116577c01000000000000000000000000000000000000000000000000000000006000350463025e7c278114610158578063173825d91461019e57806320ea8d86146101d15780632f54bf6e146101fb5780633411c81c14610242578063547415251461027b5780637065cb48146102c1578063784547a7146102f45780638b51d13f1461031e5780639ace38c214610348578063a0e67e2b14610415578063a8abe69a1461047a578063b5dc40c3146104ba578063b77bf600146104e4578063ba51a6df146104f9578063c01a8c8414610523578063c64274741461054d578063d74f8edd14610615578063dc8452cd1461062a578063e20056e61461063f578063ee22610b1461067a575b60003411156101565760408051348152905133917fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c919081900360200190a25b005b34801561016457600080fd5b506101826004803603602081101561017b57600080fd5b50356106a4565b60408051600160a060020a039092168252519081900360200190f35b3480156101aa57600080fd5b50610156600480360360208110156101c157600080fd5b5035600160a060020a03166106cc565b3480156101dd57600080fd5b50610156600480360360208110156101f457600080fd5b503561083c565b34801561020757600080fd5b5061022e6004803603602081101561021e57600080fd5b5035600160a060020a03166108f6565b604080519115158252519081900360200190f35b34801561024e57600080fd5b5061022e6004803603604081101561026557600080fd5b5080359060200135600160a060020a031661090b565b34801561028757600080fd5b506102af6004803603604081101561029e57600080fd5b50803515159060200135151561092b565b60408051918252519081900360200190f35b3480156102cd57600080fd5b50610156600480360360208110156102e457600080fd5b5035600160a060020a0316610997565b34801561030057600080fd5b5061022e6004803603602081101561031757600080fd5b5035610abc565b34801561032a57600080fd5b506102af6004803603602081101561034157600080fd5b5035610b43565b34801561035457600080fd5b506103726004803603602081101561036b57600080fd5b5035610bb2565b6040518085600160a060020a0316600160a060020a031681526020018481526020018060200183151515158152602001828103825284818151815260200191508051906020019080838360005b838110156103d75781810151838201526020016103bf565b50505050905090810190601f1680156104045780820380516001836020036101000a031916815260200191505b509550505050505060405180910390f35b34801561042157600080fd5b5061042a610c70565b60408051602080825283518183015283519192839290830191858101910280838360005b8381101561046657818101518382015260200161044e565b505050509050019250505060405180910390f35b34801561048657600080fd5b5061042a6004803603608081101561049d57600080fd5b508035906020810135906040810135151590606001351515610cd3565b3480156104c657600080fd5b5061042a600480360360208110156104dd57600080fd5b5035610e04565b3480156104f057600080fd5b506102af610f75565b34801561050557600080fd5b506101566004803603602081101561051c57600080fd5b5035610f7b565b34801561052f57600080fd5b506101566004803603602081101561054657600080fd5b5035610ffa565b34801561055957600080fd5b506102af6004803603606081101561057057600080fd5b600160a060020a03823516916020810135918101906060810160408201356401000000008111156105a057600080fd5b8201836020820111156105b257600080fd5b803590602001918460018302840111640100000000831117156105d457600080fd5b91908080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920191909152509295506110c5945050505050565b34801561062157600080fd5b506102af6110e4565b34801561063657600080fd5b506102af6110e9565b34801561064b57600080fd5b506101566004803603604081101561066257600080fd5b50600160a060020a03813581169160200135166110ef565b34801561068657600080fd5b506101566004803603602081101561069d57600080fd5b5035611289565b60038054829081106106b257fe5b600091825260209091200154600160a060020a0316905081565b3330146106d857600080fd5b600160a060020a038116600090815260026020526040902054819060ff16151561070157600080fd5b600160a060020a0382166000908152600260205260408120805460ff191690555b600354600019018110156107d75782600160a060020a031660038281548110151561074957fe5b600091825260209091200154600160a060020a031614156107cf5760038054600019810190811061077657fe5b60009182526020909120015460038054600160a060020a03909216918390811061079c57fe5b9060005260206000200160006101000a815481600160a060020a030219169083600160a060020a031602179055506107d7565b600101610722565b506003805460001901906107eb9082611557565b5060035460045411156108045760035461080490610f7b565b604051600160a060020a038316907f8001553a916ef2f495d26a907cc54d96ed840d7bda71e73194bf5a9df7a76b9090600090a25050565b3360008181526002602052604090205460ff16151561085a57600080fd5b60008281526001602090815260408083203380855292529091205483919060ff16151561088657600080fd5b600084815260208190526040902060030154849060ff16156108a757600080fd5b6000858152600160209081526040808320338085529252808320805460ff191690555187927ff6a317157440607f36269043eb55f1287a5a19ba2216afeab88cd46cbcfb88e991a35050505050565b60026020526000908152604090205460ff1681565b600160209081526000928352604080842090915290825290205460ff1681565b6000805b60055481101561099057838015610958575060008181526020819052604090206003015460ff16155b8061097c575082801561097c575060008181526020819052604090206003015460ff165b15610988576001820191505b60010161092f565b5092915050565b3330146109a357600080fd5b600160a060020a038116600090815260026020526040902054819060ff16156109cb57600080fd5b81600160a060020a03811615156109e157600080fd5b600380549050600101600454603282111580156109fe5750818111155b8015610a0957508015155b8015610a1457508115155b1515610a1f57600080fd5b600160a060020a038516600081815260026020526040808220805460ff1916600190811790915560038054918201815583527fc2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b01805473ffffffffffffffffffffffffffffffffffffffff191684179055517ff39e6e1eb0edcf53c221607b54b00cd28f3196fed0a24994dc308b8f611b682d9190a25050505050565b600080805b600354811015610b3b5760008481526001602052604081206003805491929184908110610aea57fe5b6000918252602080832090910154600160a060020a0316835282019290925260400190205460ff1615610b1e576001820191505b600454821415610b3357600192505050610b3e565b600101610ac1565b50505b919050565b6000805b600354811015610bac5760008381526001602052604081206003805491929184908110610b7057fe5b6000918252602080832090910154600160a060020a0316835282019290925260400190205460ff1615610ba4576001820191505b600101610b47565b50919050565b6000602081815291815260409081902080546001808301546002808501805487516101009582161595909502600019011691909104601f8101889004880284018801909652858352600160a060020a0390931695909491929190830182828015610c5d5780601f10610c3257610100808354040283529160200191610c5d565b820191906000526020600020905b815481529060010190602001808311610c4057829003601f168201915b5050506003909301549192505060ff1684565b60606003805480602002602001604051908101604052809291908181526020018280548015610cc857602002820191906000526020600020905b8154600160a060020a03168152600190910190602001808311610caa575b505050505090505b90565b606080600554604051908082528060200260200182016040528015610d02578160200160208202803883390190505b5090506000805b600554811015610d8457858015610d32575060008181526020819052604090206003015460ff16155b80610d565750848015610d56575060008181526020819052604090206003015460ff165b15610d7c57808383815181101515610d6a57fe5b60209081029091010152600191909101905b600101610d09565b878703604051908082528060200260200182016040528015610db0578160200160208202803883390190505b5093508790505b86811015610df9578281815181101515610dcd57fe5b9060200190602002015184898303815181101515610de757fe5b60209081029091010152600101610db7565b505050949350505050565b606080600380549050604051908082528060200260200182016040528015610e36578160200160208202803883390190505b5090506000805b600354811015610eee5760008581526001602052604081206003805491929184908110610e6657fe5b6000918252602080832090910154600160a060020a0316835282019290925260400190205460ff1615610ee6576003805482908110610ea157fe5b6000918252602090912001548351600160a060020a0390911690849084908110610ec757fe5b600160a060020a03909216602092830290910190910152600191909101905b600101610e3d565b81604051908082528060200260200182016040528015610f18578160200160208202803883390190505b509350600090505b81811015610f6d578281815181101515610f3657fe5b906020019060200201518482815181101515610f4e57fe5b600160a060020a03909216602092830290910190910152600101610f20565b505050919050565b60055481565b333014610f8757600080fd5b6003548160328211801590610f9c5750818111155b8015610fa757508015155b8015610fb257508115155b1515610fbd57600080fd5b60048390556040805184815290517fa3f1ee9126a074d9326c682f561767f710e927faa811f7a99829d49dc421797a9181900360200190a1505050565b3360008181526002602052604090205460ff16151561101857600080fd5b6000828152602081905260409020548290600160a060020a0316151561103d57600080fd5b60008381526001602090815260408083203380855292529091205484919060ff161561106857600080fd5b6000858152600160208181526040808420338086529252808420805460ff1916909317909255905187927f4a504a94899432a9846e1aa406dceb1bcfd538bb839071d49d1e5e23f5be30ef91a36110be85611289565b5050505050565b60006110d2848484611444565b90506110dd81610ffa565b9392505050565b603281565b60045481565b3330146110fb57600080fd5b600160a060020a038216600090815260026020526040902054829060ff16151561112457600080fd5b600160a060020a038216600090815260026020526040902054829060ff161561114c57600080fd5b82600160a060020a038116151561116257600080fd5b60005b6003548110156111ee5785600160a060020a031660038281548110151561118857fe5b600091825260209091200154600160a060020a031614156111e657846003828154811015156111b357fe5b9060005260206000200160006101000a815481600160a060020a030219169083600160a060020a031602179055506111ee565b600101611165565b50600160a060020a03808616600081815260026020526040808220805460ff1990811690915593881682528082208054909416600117909355915190917f8001553a916ef2f495d26a907cc54d96ed840d7bda71e73194bf5a9df7a76b9091a2604051600160a060020a038516907ff39e6e1eb0edcf53c221607b54b00cd28f3196fed0a24994dc308b8f611b682d90600090a25050505050565b3360008181526002602052604090205460ff1615156112a757600080fd5b60008281526001602090815260408083203380855292529091205483919060ff1615156112d357600080fd5b600084815260208190526040902060030154849060ff16156112f457600080fd5b6112fd85610abc565b156110be576000858152602081815260409182902060038101805460ff19166001908117909155815481830154600280850180548851601f6000199783161561010002979097019091169290920494850187900487028201870190975283815293956113cf95600160a060020a039093169491939283908301828280156113c55780601f1061139a576101008083540402835291602001916113c5565b820191906000526020600020905b8154815290600101906020018083116113a857829003601f168201915b5050505050611534565b156114045760405186907f33e13ecb54c3076d8e8bb8c2881800a4d972b792045ffae98fdf46df365fed7590600090a261143c565b60405186907f526441bb6c1aba3c9a4a6ca1d6545da9c2333c8c48343ef398eb858d72b7923690600090a260038101805460ff191690555b505050505050565b600083600160a060020a038116151561145c57600080fd5b60055460408051608081018252600160a060020a0388811682526020808301898152838501898152600060608601819052878152808452959095208451815473ffffffffffffffffffffffffffffffffffffffff1916941693909317835551600183015592518051949650919390926114dc926002850192910190611580565b50606091909101516003909101805460ff191691151591909117905560058054600101905560405182907fc0ba8fe4b176c1714197d43b9cc6bcf797a4a7461c5fe8d0ef6e184ae7601e5190600090a2509392505050565b6000806040516020840160008287838a8c6187965a03f198975050505050505050565b81548183558181111561157b5760008381526020902061157b9181019083016115fe565b505050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106115c157805160ff19168380011785556115ee565b828001600101855582156115ee579182015b828111156115ee5782518255916020019190600101906115d3565b506115fa9291506115fe565b5090565b610cd091905b808211156115fa576000815560010161160456fea165627a7a7230582070d3c680a2cf749f81772e7fffa2883f27a13c65fcfff32190d7585b0c6f0ce40029";
 
-  @BeforeClass
-  public static void initialize() {
-    ExperimentalEIPs.eip1559Enabled = false;
-  }
-
-  @AfterClass
-  public static void reset() {
-    ExperimentalEIPs.eip1559Enabled = ExperimentalEIPs.EIP1559_ENABLED_DEFAULT_VALUE;
-  }
-
   @Test
   public void createFromJsonWithAllocs() throws Exception {
     final GenesisState genesisState =
@@ -74,7 +61,7 @@ public void createFromJsonWithAllocs() throws Exception {
     assertThat(header.getOmmersHash()).isEqualTo(Hash.EMPTY_LIST_HASH);
     assertThat(header.getExtraData()).isEqualTo(Bytes.EMPTY);
     assertThat(header.getParentHash()).isEqualTo(Hash.ZERO);
-    final MutableWorldState worldState = InMemoryStorageProvider.createInMemoryWorldState();
+    final MutableWorldState worldState = InMemoryKeyValueStorageProvider.createInMemoryWorldState();
     genesisState.writeStateTo(worldState);
     final Account first =
         worldState.get(Address.fromHexString("0x0000000000000000000000000000000000000001"));
@@ -101,8 +88,8 @@ public void createFromJsonNoAllocs() throws Exception {
     assertThat(header.getParentHash()).isEqualTo(Hash.ZERO);
   }
 
-  private void assertContractInvariants(
-      final String sourceFile, final String blockHash, final int version) throws Exception {
+  private void assertContractInvariants(final String sourceFile, final String blockHash)
+      throws Exception {
     final GenesisState genesisState =
         GenesisState.fromJson(
             Resources.toString(GenesisStateTest.class.getResource(sourceFile), Charsets.UTF_8),
@@ -110,12 +97,11 @@ private void assertContractInvariants(
     final BlockHeader header = genesisState.getBlock().getHeader();
     assertThat(header.getHash()).isEqualTo(Hash.fromHexString(blockHash));
 
-    final MutableWorldState worldState = InMemoryStorageProvider.createInMemoryWorldState();
+    final MutableWorldState worldState = InMemoryKeyValueStorageProvider.createInMemoryWorldState();
     genesisState.writeStateTo(worldState);
     final Account contract =
         worldState.get(Address.fromHexString("0x3850000000000000000000000000000000000000"));
     assertThat(contract.getCode()).isEqualTo(Bytes.fromHexString(EXPECTED_CODE));
-    assertThat(contract.getVersion()).isEqualTo(version);
     assertStorageValue(
         contract,
         "c2575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85d",
@@ -129,13 +115,7 @@ private void assertContractInvariants(
   @Test
   public void createFromJsonWithContract() throws Exception {
     assertContractInvariants(
-        "genesis3.json", "0xe7fd8db206dcaf066b7c97b8a42a0abc18653613560748557ab44868652a78b6", 0);
-  }
-
-  @Test
-  public void createFromJsonWithVersion() throws Exception {
-    assertContractInvariants(
-        "genesis4.json", "0x3224ddae856381f5fb67492b4561ecbc0cb1e9e50e6cf3238f6e049fe95a8604", 1);
+        "genesis3.json", "0xe7fd8db206dcaf066b7c97b8a42a0abc18653613560748557ab44868652a78b6");
   }
 
   @Test
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/AccountTransactionOrderTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/AccountTransactionOrderTest.java
index 61c1754bf2e..ef30a275c30 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/AccountTransactionOrderTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/AccountTransactionOrderTest.java
@@ -16,7 +16,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
 
 import java.util.stream.Stream;
 
@@ -24,7 +25,7 @@
 
 public class AccountTransactionOrderTest {
 
-  private static final KeyPair KEYS = KeyPair.generate();
+  private static final KeyPair KEYS = SignatureAlgorithmFactory.getInstance().generateKeyPair();
 
   private final Transaction transaction1 = transaction(1);
   private final Transaction transaction2 = transaction(2);
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/BlockValueCalculatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/BlockValueCalculatorTest.java
new file mode 100644
index 00000000000..2d2b4c75f2b
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/BlockValueCalculatorTest.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright Contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.plugin.data.TransactionType;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.Test;
+
+public class BlockValueCalculatorTest {
+
+  @Test
+  public void shouldCalculateZeroBlockValueForEmptyTransactions() {
+    final long baseFee = 15;
+    final BlockHeader blockHeader =
+        new BlockHeaderTestFixture()
+            .prevRandao(Bytes32.random())
+            .baseFeePerGas(Wei.of(baseFee))
+            .buildHeader();
+    final Block block =
+        new Block(blockHeader, new BlockBody(Collections.emptyList(), Collections.emptyList()));
+    Wei blockValue =
+        new BlockValueCalculator()
+            .calculateBlockValue(new BlockWithReceipts(block, Collections.emptyList()));
+    assertThat(blockValue).isEqualTo(Wei.ZERO);
+  }
+
+  @Test
+  public void shouldCalculateCorrectBlockValue() {
+    // Generate block with three transactions
+    final long baseFee = 15;
+    final long maxFee = 20;
+    final Transaction tx1 =
+        new TransactionTestFixture()
+            .maxPriorityFeePerGas(Optional.of(Wei.of(1)))
+            .maxFeePerGas(Optional.of(Wei.of(maxFee)))
+            .type(TransactionType.EIP1559)
+            .createTransaction(SignatureAlgorithmFactory.getInstance().generateKeyPair());
+    final Transaction tx2 =
+        new TransactionTestFixture()
+            .maxPriorityFeePerGas(Optional.of(Wei.of(2)))
+            .maxFeePerGas(Optional.of(Wei.of(maxFee)))
+            .type(TransactionType.EIP1559)
+            .createTransaction(SignatureAlgorithmFactory.getInstance().generateKeyPair());
+    final Transaction tx3 =
+        new TransactionTestFixture()
+            .maxPriorityFeePerGas(Optional.of(Wei.of(10)))
+            .maxFeePerGas(Optional.of(Wei.of(maxFee)))
+            .type(TransactionType.EIP1559)
+            .createTransaction(SignatureAlgorithmFactory.getInstance().generateKeyPair());
+    final TransactionReceipt receipt1 =
+        new TransactionReceipt(Hash.EMPTY_TRIE_HASH, 71, Collections.emptyList(), Optional.empty());
+    final TransactionReceipt receipt2 =
+        new TransactionReceipt(
+            Hash.EMPTY_TRIE_HASH, 143, Collections.emptyList(), Optional.empty());
+    final TransactionReceipt receipt3 =
+        new TransactionReceipt(
+            Hash.EMPTY_TRIE_HASH, 214, Collections.emptyList(), Optional.empty());
+    final BlockHeader blockHeader =
+        new BlockHeaderTestFixture()
+            .prevRandao(Bytes32.random())
+            .baseFeePerGas(Wei.of(baseFee))
+            .buildHeader();
+    final Block block =
+        new Block(blockHeader, new BlockBody(List.of(tx1, tx2, tx3), Collections.emptyList()));
+    Wei blockValue =
+        new BlockValueCalculator()
+            .calculateBlockValue(
+                new BlockWithReceipts(block, List.of(receipt1, receipt2, receipt3)));
+    // Block value = 71 * 1 + (143-71) * 2 + (214-143) * 5 = 1427
+    assertThat(blockValue).isEqualTo(Wei.of(570L));
+  }
+
+  @Test
+  public void shouldCalculateCorrectBlockValueExceedingLong() {
+    // Generate a block with one overpriced transaction where the resulting block value exceeds long
+    final long baseFee = 7L;
+    final long maxFee = 1L << 60L;
+    final Transaction tx1 =
+        new TransactionTestFixture()
+            .maxPriorityFeePerGas(Optional.of(Wei.of(maxFee - baseFee)))
+            .maxFeePerGas(Optional.of(Wei.of(maxFee)))
+            .type(TransactionType.EIP1559)
+            .createTransaction(SignatureAlgorithmFactory.getInstance().generateKeyPair());
+    final TransactionReceipt receipt1 =
+        new TransactionReceipt(
+            Hash.EMPTY_TRIE_HASH, 21000L, Collections.emptyList(), Optional.empty());
+    final BlockHeader blockHeader =
+        new BlockHeaderTestFixture()
+            .prevRandao(Bytes32.random())
+            .baseFeePerGas(Wei.of(baseFee))
+            .buildHeader();
+    final Block block =
+        new Block(blockHeader, new BlockBody(List.of(tx1), Collections.emptyList()));
+    Wei blockValue =
+        new BlockValueCalculator()
+            .calculateBlockValue(new BlockWithReceipts(block, List.of(receipt1)));
+    // Block value =~ max_long * 2
+    assertThat(blockValue).isGreaterThan(Wei.of(Long.MAX_VALUE));
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/HashTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/HashTest.java
deleted file mode 100644
index f43a59be76c..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/HashTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.Test;
-
-public class HashTest {
-
-  @Test
-  public void shouldGetExpectedValueForEmptyHash() {
-    assertThat(Hash.EMPTY)
-        .isEqualTo(
-            Hash.fromHexString("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"));
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogTest.java
index 60a1a080f0e..854ab2aadd7 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogTest.java
@@ -17,6 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.evm.log.Log;
 
 import org.junit.Test;
 
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogsBloomFilterTestCaseSpec.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogsBloomFilterTestCaseSpec.java
index ba41c9c883a..d12433564a3 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogsBloomFilterTestCaseSpec.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogsBloomFilterTestCaseSpec.java
@@ -15,6 +15,7 @@
 package org.hyperledger.besu.ethereum.core;
 
 import org.hyperledger.besu.ethereum.vm.LogMock;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
 
 import java.util.List;
 
@@ -50,7 +51,9 @@ public List<LogMock> getLogs() {
     return logs;
   }
 
-  /** @return - 2048-bit representation of each log entry, except data, of each transaction. */
+  /**
+   * @return - 2048-bit representation of each log entry, except data, of each transaction.
+   */
   public LogsBloomFilter getLogsBloomFilter() {
     return logsBloomFilter;
   }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionBuilderTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionBuilderTest.java
index 45a8f9c5911..a4ffbb27948 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionBuilderTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionBuilderTest.java
@@ -17,26 +17,62 @@
 
 import static java.util.stream.Collectors.toUnmodifiableSet;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.fail;
 
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.AccessListEntry;
 import org.hyperledger.besu.plugin.data.TransactionType;
 
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Optional;
 import java.util.Set;
+import java.util.function.Supplier;
 import java.util.stream.Stream;
 
+import com.google.common.base.Suppliers;
 import org.junit.Test;
 
 public class TransactionBuilderTest {
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+  private static final KeyPair senderKeys = SIGNATURE_ALGORITHM.get().generateKeyPair();
 
   @Test
   public void guessTypeCanGuessAllTypes() {
+    final BlockDataGenerator gen = new BlockDataGenerator();
     final Transaction.Builder frontierBuilder = Transaction.builder();
-    final Transaction.Builder eip1559Builder = Transaction.builder().feeCap(Wei.of(5));
+    final Transaction.Builder eip1559Builder = Transaction.builder().maxFeePerGas(Wei.of(5));
+    final Transaction.Builder accessListBuilder =
+        Transaction.builder()
+            .accessList(List.of(new AccessListEntry(gen.address(), List.of(gen.bytes32()))));
 
     final Set<TransactionType> guessedTypes =
-        Stream.of(frontierBuilder, eip1559Builder)
-            .map(transactionBuilder -> transactionBuilder.guessType().build().getType())
+        Stream.of(frontierBuilder, eip1559Builder, accessListBuilder)
+            .map(transactionBuilder -> transactionBuilder.guessType().getTransactionType())
             .collect(toUnmodifiableSet());
 
-    assertThat(guessedTypes).containsExactlyInAnyOrder(TransactionType.values());
+    assertThat(guessedTypes)
+        .containsExactlyInAnyOrder(
+            new TransactionType[] {
+              TransactionType.FRONTIER, TransactionType.ACCESS_LIST, TransactionType.EIP1559
+            });
+  }
+
+  @Test
+  public void zeroBlobTransactionIsInvalid() {
+    try {
+      new TransactionTestFixture()
+          .type(TransactionType.BLOB)
+          .chainId(Optional.of(BigInteger.ONE))
+          .versionedHashes(List.of())
+          .createTransaction(senderKeys);
+      fail();
+    } catch (IllegalArgumentException iea) {
+      assertThat(iea).hasMessage("Blob transaction must have at least one blob");
+    }
   }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionEIP1559Test.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionEIP1559Test.java
deleted file mode 100644
index c30d15ffb58..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionEIP1559Test.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
-import org.hyperledger.besu.ethereum.rlp.RLP;
-import org.hyperledger.besu.ethereum.rlp.RLPInput;
-import org.hyperledger.besu.plugin.data.TransactionType;
-
-import java.lang.reflect.Field;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.After;
-import org.junit.Test;
-
-public class TransactionEIP1559Test {
-  private final RLPInput legacyRLPInput =
-      RLP.input(
-          Bytes.fromHexString(
-              "0xf901fc8032830138808080b901ae60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b561ca0c5689ed1ad124753d54576dfb4b571465a41900a1dff4058d8adf16f752013d0a01221cbd70ec28c94a3b55ec771bcbc70778d6ee0b51ca7ea9514594c861b1884"));
-  private final Wei expectedGasPremium = Wei.of(527);
-  private final Wei expectedFeeCap = Wei.of(369);
-
-  @After
-  public void reset() {
-    ExperimentalEIPs.eip1559Enabled = ExperimentalEIPs.EIP1559_ENABLED_DEFAULT_VALUE;
-  }
-
-  @Test
-  public void givenLegacyTransaction_assertThatRlpEncodingWorks() {
-    final Transaction legacyTransaction = Transaction.readFrom(legacyRLPInput);
-    assertThat(legacyTransaction.getType()).isEqualTo(TransactionType.FRONTIER);
-  }
-
-  @Test
-  public void givenEIP1559Transaction_assertThatRlpDecodingWorks() {
-    ExperimentalEIPs.eip1559Enabled = true;
-    final Transaction legacyTransaction = Transaction.readFrom(legacyRLPInput);
-    set(legacyTransaction, "transactionType", TransactionType.EIP1559);
-    set(legacyTransaction, "gasPrice", null);
-    set(legacyTransaction, "gasPremium", expectedGasPremium);
-    set(legacyTransaction, "feeCap", expectedFeeCap);
-    final BytesValueRLPOutput rlpOutput = new BytesValueRLPOutput();
-    legacyTransaction.writeTo(rlpOutput);
-    final Transaction eip1559Transaction =
-        Transaction.readFrom(new BytesValueRLPInput(rlpOutput.encoded(), false));
-    assertThat(legacyTransaction.getType()).isEqualTo(TransactionType.EIP1559);
-    assertThat(eip1559Transaction.getGasPremium()).hasValue(expectedGasPremium);
-    assertThat(eip1559Transaction.getFeeCap()).hasValue(expectedFeeCap);
-    assertThat(eip1559Transaction.getGasPrice()).isEqualByComparingTo(Wei.ZERO);
-  }
-
-  private void set(final Object object, final String fieldName, final Object fieldValue) {
-    try {
-      final Field field = object.getClass().getDeclaredField(fieldName);
-      field.setAccessible(true);
-      field.set(object, fieldValue);
-    } catch (Exception e) {
-      System.err.println(e.getMessage());
-    }
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionGoQuorumTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionGoQuorumTest.java
deleted file mode 100644
index 37f4219e7e3..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionGoQuorumTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.config.GoQuorumOptions;
-import org.hyperledger.besu.ethereum.rlp.RLP;
-import org.hyperledger.besu.ethereum.rlp.RLPInput;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class TransactionGoQuorumTest {
-
-  private static final RLPInput ETHEREUM_PUBLIC_TX_RLP =
-      toRLP(
-          "0xf901fc8032830138808080b901ae60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b561ca0c5689ed1ad124753d54576dfb4b571465a41900a1dff4058d8adf16f752013d0a01221cbd70ec28c94a3b55ec771bcbc70778d6ee0b51ca7ea9514594c861b1884");
-  private static final RLPInput GOQUORUM_PRIVATE_TX_RLP_V37 =
-      toRLP(
-          "0xf88d0b808347b7608080b840290a80a37d198ff06abe189b638ff53ac8a8dc51a0aff07609d2aa75342783ae493b3e3c6b564c0eebe49284b05a0726fb33087b9e0231d349ea0c7b5661c8c525a07144db7045a395e608cda6ab051c86cc4fb42e319960b82087f3b26f0cbc3c2da00223ac129b22aec7a6c2ace3c3ef39c5eaaa54070fd82d8ee2140b0e70b1dca9");
-  private static final RLPInput GOQUORUM_PRIVATE_TX_RLP_V38 =
-      toRLP(
-          "0xf88d0b808347b7608080b840290a80a37d198ff06abe189b638ff53ac8a8dc51a0aff07609d2aa75342783ae493b3e3c6b564c0eebe49284b05a0726fb33087b9e0231d349ea0c7b5661c8c526a07144db7045a395e608cda6ab051c86cc4fb42e319960b82087f3b26f0cbc3c2da00223ac129b22aec7a6c2ace3c3ef39c5eaaa54070fd82d8ee2140b0e70b1dca9");
-
-  @BeforeClass
-  public static void beforeClass() {
-    GoQuorumOptions.goquorumCompatibilityMode = true;
-  }
-
-  @AfterClass
-  public static void afterClass() {
-    GoQuorumOptions.goquorumCompatibilityMode =
-        GoQuorumOptions.GOQUORUM_COMPATIBILITY_MODE_DEFAULT_VALUE;
-  }
-
-  @Test
-  public void givenPublicTransaction_assertThatIsGoQuorumFlagIsFalse() {
-    Transaction transaction = Transaction.readFrom(ETHEREUM_PUBLIC_TX_RLP);
-    assertThat(transaction.isGoQuorumPrivateTransaction()).isFalse();
-  }
-
-  @Test
-  public void givenGoQuorumTransactionV37_assertThatIsGoQuorumFlagIsTrue() {
-    Transaction transaction = Transaction.readFrom(GOQUORUM_PRIVATE_TX_RLP_V37);
-
-    assertThat(transaction.getV()).isEqualTo(37);
-    assertThat(transaction.isGoQuorumPrivateTransaction()).isTrue();
-  }
-
-  @Test
-  public void givenGoQuorumTransactionV38_assertThatIsGoQuorumFlagIsTrue() {
-    Transaction transaction = Transaction.readFrom(GOQUORUM_PRIVATE_TX_RLP_V38);
-
-    assertThat(transaction.getV()).isEqualTo(38);
-    assertThat(transaction.isGoQuorumPrivateTransaction()).isTrue();
-  }
-
-  private static RLPInput toRLP(final String bytes) {
-    return RLP.input(Bytes.fromHexString(bytes));
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionIntegrationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionIntegrationTest.java
index e5b9d987560..da914033bd5 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionIntegrationTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionIntegrationTest.java
@@ -16,6 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionTest.java
deleted file mode 100644
index c7d92a8d6df..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionTest.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
-
-import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionValidator;
-import org.hyperledger.besu.ethereum.referencetests.ReferenceTestProtocolSchedules;
-import org.hyperledger.besu.ethereum.rlp.RLP;
-import org.hyperledger.besu.testutil.JsonTestParameters;
-
-import java.util.Collection;
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class TransactionTest {
-
-  private static final ReferenceTestProtocolSchedules REFERENCE_TEST_PROTOCOL_SCHEDULES =
-      ReferenceTestProtocolSchedules.create();
-
-  private static MainnetTransactionValidator transactionValidator(final String name) {
-    return REFERENCE_TEST_PROTOCOL_SCHEDULES
-        .getByName(name)
-        .getByBlockNumber(0)
-        .getTransactionValidator();
-  }
-
-  private final TransactionTestCaseSpec spec;
-
-  private static final String TEST_CONFIG_FILE_DIR_PATH = "TransactionTests/";
-
-  @Parameters(name = "Name: {0}")
-  public static Collection<Object[]> getTestParametersForConfig() {
-    return JsonTestParameters.create(TransactionTestCaseSpec.class)
-        // ignore tests that expect transactions with large gasLimits to properly decode
-        .ignore("TransactionWithGasLimitOverflow(2|63)", "TransactionWithGasLimitxPriceOverflow$")
-        // Nonce is tracked with type long, large valued nonces can't currently be decoded
-        .ignore("TransactionWithHighNonce256")
-        .generator((name, spec, collector) -> collector.add(name, spec, true))
-        .generate(TEST_CONFIG_FILE_DIR_PATH);
-  }
-
-  public TransactionTest(
-      final String name, final TransactionTestCaseSpec spec, final boolean runTest) {
-    this.spec = spec;
-    assumeTrue("Test " + name + " was ignored", runTest);
-  }
-
-  @Test
-  public void frontier() {
-    milestone("Frontier");
-  }
-
-  @Test
-  public void homestead() {
-    milestone("Homestead");
-  }
-
-  @Test
-  public void eIP150() {
-    milestone("EIP150");
-  }
-
-  @Test
-  public void eIP158() {
-    milestone("EIP158");
-  }
-
-  @Test
-  public void byzantium() {
-    milestone("Byzantium");
-  }
-
-  @Test
-  public void constantinople() {
-    milestone("Constantinople");
-  }
-
-  @Test
-  public void constantinopleFix() {
-    milestone("ConstantinopleFix");
-  }
-
-  public void milestone(final String milestone) {
-
-    final TransactionTestCaseSpec.Expectation expected = spec.expectation(milestone);
-
-    try {
-      final Bytes rlp = spec.getRlp();
-
-      // Test transaction deserialization (will throw an exception if it fails).
-      final Transaction transaction = Transaction.readFrom(RLP.input(rlp));
-      if (!transactionValidator(milestone).validate(transaction, Optional.empty()).isValid()) {
-        throw new RuntimeException(String.format("Transaction is invalid %s", transaction));
-      }
-
-      // Test rlp encoding
-      final Bytes actualRlp = RLP.encode(transaction::writeTo);
-      assertThat(expected.isSucceeds()).isTrue();
-
-      assertThat(actualRlp).isEqualTo(rlp);
-
-      assertThat(transaction.getSender()).isEqualTo(expected.getSender());
-      assertThat(transaction.getHash()).isEqualTo(expected.getHash());
-    } catch (final Exception e) {
-      assertThat(expected.isSucceeds()).isFalse();
-    }
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionTestCaseSpec.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionTestCaseSpec.java
deleted file mode 100644
index 09ec304d0ea..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/TransactionTestCaseSpec.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.tuweni.bytes.Bytes;
-
-/** A Transaction test case specification. */
-@JsonIgnoreProperties({"_info"})
-public class TransactionTestCaseSpec {
-
-  public static class Expectation {
-
-    private final Hash hash;
-
-    private final Address sender;
-
-    private final boolean succeeds;
-
-    Expectation(
-        @JsonProperty("hash") final String hash, @JsonProperty("sender") final String sender) {
-      this.succeeds = hash != null && sender != null;
-      if (succeeds) {
-        this.hash = Hash.fromHexString(hash);
-        this.sender = Address.fromHexString(sender);
-      } else {
-        this.hash = null;
-        this.sender = null;
-      }
-    }
-
-    public boolean isSucceeds() {
-      return this.succeeds;
-    }
-
-    public Hash getHash() {
-      return this.hash;
-    }
-
-    public Address getSender() {
-      return this.sender;
-    }
-  }
-
-  private final HashMap<String, Expectation> expectations;
-
-  private final Bytes rlp;
-
-  @SuppressWarnings("unchecked")
-  @JsonCreator
-  public TransactionTestCaseSpec(final Map<String, Object> props) {
-    expectations = new HashMap<>();
-    for (final Map.Entry<String, Object> entry : props.entrySet()) {
-      if ("rlp".equals(entry.getKey())) continue;
-
-      final Map<String, Object> expectation = (Map<String, Object>) entry.getValue();
-      expectations.put(
-          entry.getKey(),
-          new Expectation((String) expectation.get("hash"), (String) expectation.get("sender")));
-    }
-
-    Bytes parsedRlp = null;
-    try {
-      parsedRlp = Bytes.fromHexString(props.get("rlp").toString());
-    } catch (final IllegalArgumentException e) {
-      // Some test cases include rlp "hex strings" with invalid characters
-      // In this case, just set rlp to null
-    }
-    this.rlp = parsedRlp;
-  }
-
-  public Bytes getRlp() {
-    return rlp;
-  }
-
-  public Expectation expectation(final String milestone) {
-    final Expectation expectation = expectations.get(milestone);
-
-    if (expectation == null) {
-      throw new IllegalStateException("Expectation for milestone " + milestone + " not found");
-    }
-
-    return expectation;
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/DepositDecoderTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/DepositDecoderTest.java
new file mode 100644
index 00000000000..5939611c5e9
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/DepositDecoderTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core.encoding;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.BLSPublicKey;
+import org.hyperledger.besu.datatypes.BLSSignature;
+import org.hyperledger.besu.datatypes.GWei;
+import org.hyperledger.besu.ethereum.core.Deposit;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.log.LogTopic;
+
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt64;
+import org.junit.jupiter.api.Test;
+
+class DepositDecoderTest {
+  @Test
+  void shouldDecodeDeposit() {
+    final Deposit expectedDeposit =
+        new Deposit(
+            BLSPublicKey.fromHexString(
+                "0xb10a4a15bf67b328c9b101d09e5c6ee6672978fdad9ef0d9e2ceffaee99223555d8601f0cb3bcc4ce1af9864779a416e"),
+            Bytes32.fromHexString(
+                "0x0017a7fcf06faf493d30bbe2632ea7c2383cd86825e12797165de7aa35589483"),
+            GWei.of(32000000000L),
+            BLSSignature.fromHexString(
+                "0xa889db8300194050a2636c92a95bc7160515867614b7971a9500cdb62f9c0890217d2901c3241f86fac029428fc106930606154bd9e406d7588934a5f15b837180b17194d6e44bd6de23e43b163dfe12e369dcc75a3852cd997963f158217eb5"),
+            UInt64.ONE);
+
+    final Deposit deposit =
+        DepositDecoder.decodeOpaqueBytes(
+            Bytes.fromHexString(
+                "0xf8bbb0b10a4a15bf67b328c9b101d09e5c6ee6672978fdad9ef0d9e2ceffaee99223555d8601f0cb3bcc4ce1af9864779a416ea00017a7fcf06faf493d30bbe2632ea7c2383cd86825e12797165de7aa35589483850773594000b860a889db8300194050a2636c92a95bc7160515867614b7971a9500cdb62f9c0890217d2901c3241f86fac029428fc106930606154bd9e406d7588934a5f15b837180b17194d6e44bd6de23e43b163dfe12e369dcc75a3852cd997963f158217eb501"));
+
+    assertThat(deposit).isEqualTo(expectedDeposit);
+  }
+
+  @Test
+  void shouldDecodeDepositFromLog() {
+    final Address address = Address.fromHexString("0x00000000219ab540356cbb839cbe05303d7705fa");
+    final List<LogTopic> topics =
+        List.of(
+            LogTopic.fromHexString(
+                "0x649bbc62d0e31342afea4e5cd82d4049e7e1ee912fc0889aa790803be39038c5"));
+    final Bytes data =
+        Bytes.fromHexString(
+            "0x00000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000030b10a4a15bf67b328c9b101d09e5c6ee6672978fdad9ef0d9e2ceffaee99223555d8601f0cb3bcc4ce1af9864779a416e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200017a7fcf06faf493d30bbe2632ea7c2383cd86825e12797165de7aa35589483000000000000000000000000000000000000000000000000000000000000000800405973070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060a889db8300194050a2636c92a95bc7160515867614b7971a9500cdb62f9c0890217d2901c3241f86fac029428fc106930606154bd9e406d7588934a5f15b837180b17194d6e44bd6de23e43b163dfe12e369dcc75a3852cd997963f158217eb500000000000000000000000000000000000000000000000000000000000000083f3d080000000000000000000000000000000000000000000000000000000000");
+
+    final Log log = new Log(address, data, topics);
+    final Deposit deposit = DepositDecoder.decodeFromLog(log);
+
+    final Deposit expectedDeposit =
+        new Deposit(
+            BLSPublicKey.fromHexString(
+                "0xb10a4a15bf67b328c9b101d09e5c6ee6672978fdad9ef0d9e2ceffaee99223555d8601f0cb3bcc4ce1af9864779a416e"),
+            Bytes32.fromHexString(
+                "0x0017a7fcf06faf493d30bbe2632ea7c2383cd86825e12797165de7aa35589483"),
+            GWei.of(32000000000L),
+            BLSSignature.fromHexString(
+                "0xa889db8300194050a2636c92a95bc7160515867614b7971a9500cdb62f9c0890217d2901c3241f86fac029428fc106930606154bd9e406d7588934a5f15b837180b17194d6e44bd6de23e43b163dfe12e369dcc75a3852cd997963f158217eb5"),
+            UInt64.valueOf(539967));
+
+    assertThat(deposit).isEqualTo(expectedDeposit);
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/DepositEncoderTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/DepositEncoderTest.java
new file mode 100644
index 00000000000..b0d15607cba
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/DepositEncoderTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core.encoding;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.BLSPublicKey;
+import org.hyperledger.besu.datatypes.BLSSignature;
+import org.hyperledger.besu.datatypes.GWei;
+import org.hyperledger.besu.ethereum.core.Deposit;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt64;
+import org.junit.jupiter.api.Test;
+
+class DepositEncoderTest {
+  @Test
+  void shouldEncodeDeposit() {
+    final Deposit deposit =
+        new Deposit(
+            BLSPublicKey.fromHexString(
+                "0xb10a4a15bf67b328c9b101d09e5c6ee6672978fdad9ef0d9e2ceffaee99223555d8601f0cb3bcc4ce1af9864779a416e"),
+            Bytes32.fromHexString(
+                "0x0017a7fcf06faf493d30bbe2632ea7c2383cd86825e12797165de7aa35589483"),
+            GWei.of(32000000000L),
+            BLSSignature.fromHexString(
+                "0xa889db8300194050a2636c92a95bc7160515867614b7971a9500cdb62f9c0890217d2901c3241f86fac029428fc106930606154bd9e406d7588934a5f15b837180b17194d6e44bd6de23e43b163dfe12e369dcc75a3852cd997963f158217eb5"),
+            UInt64.ONE);
+
+    final Bytes encoded = DepositEncoder.encodeOpaqueBytes(deposit);
+
+    assertThat(encoded)
+        .isEqualTo(
+            Bytes.fromHexString(
+                "0xf8bbb0b10a4a15bf67b328c9b101d09e5c6ee6672978fdad9ef0d9e2ceffaee99223555d8601f0cb3bcc4ce1af9864779a416ea00017a7fcf06faf493d30bbe2632ea7c2383cd86825e12797165de7aa35589483850773594000b860a889db8300194050a2636c92a95bc7160515867614b7971a9500cdb62f9c0890217d2901c3241f86fac029428fc106930606154bd9e406d7588934a5f15b837180b17194d6e44bd6de23e43b163dfe12e369dcc75a3852cd997963f158217eb501"));
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/TransactionDecoderTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/TransactionDecoderTest.java
new file mode 100644
index 00000000000..4b762a3b553
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/TransactionDecoderTest.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core.encoding;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hyperledger.besu.evm.account.Account.MAX_NONCE;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPException;
+
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class TransactionDecoderTest {
+
+  private static final String FRONTIER_TX_RLP =
+      "0xf901fc8032830138808080b901ae60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b561ca0c5689ed1ad124753d54576dfb4b571465a41900a1dff4058d8adf16f752013d0a01221cbd70ec28c94a3b55ec771bcbc70778d6ee0b51ca7ea9514594c861b1884";
+  private static final String EIP1559_TX_RLP =
+      "0xb8a902f8a686796f6c6f7632800285012a05f20082753094000000000000000000000000000000000000aaaa8080f838f794000000000000000000000000000000000000aaaae1a0000000000000000000000000000000000000000000000000000000000000000001a00c1d69648e348fe26155b45de45004f0e4195f6352d8f0935bc93e98a3e2a862a060064e5b9765c0ac74223b0cf49635c59ae0faf82044fd17bcc68a549ade6f95";
+  private static final String NONCE_64_BIT_MAX_MINUS_2_TX_RLP =
+      "0xf86788fffffffffffffffe0182520894095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a01fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804";
+
+  @Test
+  void decodeFrontierNominalCase() {
+    final Transaction transaction =
+        TransactionDecoder.decodeForWire(RLP.input(Bytes.fromHexString(FRONTIER_TX_RLP)));
+    assertThat(transaction).isNotNull();
+    assertThat(transaction.getGasPrice().get()).isEqualByComparingTo(Wei.of(50L));
+    assertThat(transaction.getMaxPriorityFeePerGas()).isEmpty();
+    assertThat(transaction.getMaxFeePerGas()).isEmpty();
+  }
+
+  @Test
+  void decodeEIP1559NominalCase() {
+    final Transaction transaction =
+        TransactionDecoder.decodeForWire(RLP.input(Bytes.fromHexString(EIP1559_TX_RLP)));
+    assertThat(transaction).isNotNull();
+    assertThat(transaction.getMaxPriorityFeePerGas()).hasValue(Wei.of(2L));
+    assertThat(transaction.getMaxFeePerGas()).hasValue(Wei.of(new BigInteger("5000000000", 10)));
+  }
+
+  @Test
+  void doesNotDecodeEIP1559WithLargeMaxFeePerGasOrLargeMaxPriorityFeePerGas() {
+    final String txWithBigFees =
+        "0x02f84e0101a1648a5f8b2dcad5ea5ba6b720ff069c1d87c21a4a6a5b3766b39e2c2792367bb066a1ffa5ffaf5b0560d3a9fb186c2ede2ae6751bc0b4fef9107cf36389630b6196a38805800180c0010203";
+    assertThatThrownBy(
+            () -> TransactionDecoder.decodeOpaqueBytes(Bytes.fromHexString(txWithBigFees)))
+        .isInstanceOf(RLPException.class);
+  }
+
+  @Test
+  void shouldDecodeWithHighNonce() {
+    final Transaction transaction =
+        TransactionDecoder.decodeForWire(
+            RLP.input(Bytes.fromHexString(NONCE_64_BIT_MAX_MINUS_2_TX_RLP)));
+    assertThat(transaction).isNotNull();
+    assertThat(transaction.getNonce()).isEqualTo(MAX_NONCE - 1);
+  }
+
+  private static Collection<Object[]> dataTransactionSize() {
+    return Arrays.asList(
+        new Object[][] {
+          {FRONTIER_TX_RLP, "FRONTIER_TX_RLP"},
+          {EIP1559_TX_RLP, "EIP1559_TX_RLP"},
+          {NONCE_64_BIT_MAX_MINUS_2_TX_RLP, "NONCE_64_BIT_MAX_MINUS_2_TX_RLP"}
+        });
+  }
+
+  @ParameterizedTest(name = "[{index}] {1}")
+  @MethodSource("dataTransactionSize")
+  void shouldCalculateCorrectTransactionSize(final String rlp_tx, final String ignoredName) {
+    // Create bytes from String
+    final Bytes bytes = Bytes.fromHexString(rlp_tx);
+    // Decode bytes into a transaction
+    final Transaction transaction = TransactionDecoder.decodeForWire(RLP.input(bytes));
+    // Bytes size should be equal to transaction size
+    assertThat(transaction.getSize()).isEqualTo(bytes.size());
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/TransactionEncoderTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/TransactionEncoderTest.java
new file mode 100644
index 00000000000..738004c8464
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/TransactionEncoderTest.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core.encoding;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Test;
+
+class TransactionEncoderTest {
+  private static final String FRONTIER_TX_RLP =
+      "0xf901fc8032830138808080b901ae60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b561ca0c5689ed1ad124753d54576dfb4b571465a41900a1dff4058d8adf16f752013d0a01221cbd70ec28c94a3b55ec771bcbc70778d6ee0b51ca7ea9514594c861b1884";
+  private static final String EIP1559_TX_RLP =
+      "0xb8a902f8a686796f6c6f7632800285012a05f20082753094000000000000000000000000000000000000aaaa8080f838f794000000000000000000000000000000000000aaaae1a0000000000000000000000000000000000000000000000000000000000000000001a00c1d69648e348fe26155b45de45004f0e4195f6352d8f0935bc93e98a3e2a862a060064e5b9765c0ac74223b0cf49635c59ae0faf82044fd17bcc68a549ade6f95";
+  private static final String NONCE_64_BIT_MAX_MINUS_2_TX_RLP =
+      "0xf86788fffffffffffffffe0182520894095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a01fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804";
+
+  @Test
+  void encodeFrontierTxNominalCase() {
+    final Transaction transaction =
+        TransactionDecoder.decodeForWire(RLP.input(Bytes.fromHexString(FRONTIER_TX_RLP)));
+    final BytesValueRLPOutput output = new BytesValueRLPOutput();
+    TransactionEncoder.encodeForWire(transaction, output);
+    assertThat(output.encoded().toHexString()).isEqualTo(FRONTIER_TX_RLP);
+  }
+
+  @Test
+  void encodeEIP1559TxNominalCase() {
+    final Transaction transaction =
+        TransactionDecoder.decodeForWire(RLP.input(Bytes.fromHexString(EIP1559_TX_RLP)));
+    final BytesValueRLPOutput output = new BytesValueRLPOutput();
+    TransactionEncoder.encodeForWire(transaction, output);
+    assertThat(output.encoded().toHexString()).isEqualTo(EIP1559_TX_RLP);
+  }
+
+  @Test
+  void blockWithLegacyAndEIP2930TransactionsRoundTrips() {
+    final BlockDataGenerator gen = new BlockDataGenerator();
+
+    final Block block =
+        gen.block(
+            BlockDataGenerator.BlockOptions.create()
+                .addTransaction(gen.transactionsWithAllTypes().toArray(new Transaction[] {})));
+
+    assertThat(
+            Block.readFrom(
+                RLP.input(RLP.encode(block::writeTo)), new MainnetBlockHeaderFunctions()))
+        .isEqualTo(block);
+  }
+
+  @Test
+  void shouldEncodeWithHighNonce() {
+    final Transaction transaction =
+        TransactionDecoder.decodeForWire(
+            RLP.input(Bytes.fromHexString(NONCE_64_BIT_MAX_MINUS_2_TX_RLP)));
+    final BytesValueRLPOutput output = new BytesValueRLPOutput();
+    TransactionEncoder.encodeForWire(transaction, output);
+    assertThat(output.encoded().toHexString()).isEqualTo(NONCE_64_BIT_MAX_MINUS_2_TX_RLP);
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/TransactionRLPDecoderTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/TransactionRLPDecoderTest.java
deleted file mode 100644
index 7170539a5e7..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/TransactionRLPDecoderTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core.encoding;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.config.GoQuorumOptions;
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.rlp.RLP;
-import org.hyperledger.besu.ethereum.rlp.RLPInput;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-
-public class TransactionRLPDecoderTest {
-
-  private static final String FRONTIER_TX_RLP =
-      "0xf901fc8032830138808080b901ae60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b561ca0c5689ed1ad124753d54576dfb4b571465a41900a1dff4058d8adf16f752013d0a01221cbd70ec28c94a3b55ec771bcbc70778d6ee0b51ca7ea9514594c861b1884";
-  private static final String EIP1559_TX_RLP =
-      "0xf902028032830138808080b901ae60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b5682020f8201711ca0c5689ed1ad124753d54576dfb4b571465a41900a1dff4058d8adf16f752013d0a01221cbd70ec28c94a3b55ec771bcbc70778d6ee0b51ca7ea9514594c861b1884";
-  private static final String GOQUORUM_PRIVATE_TX_RLP =
-      "0xf88d0b808347b7608080b840290a80a37d198ff06abe189b638ff53ac8a8dc51a0aff07609d2aa75342783ae493b3e3c6b564c0eebe49284b05a0726fb33087b9e0231d349ea0c7b5661c8c526a07144db7045a395e608cda6ab051c86cc4fb42e319960b82087f3b26f0cbc3c2da00223ac129b22aec7a6c2ace3c3ef39c5eaaa54070fd82d8ee2140b0e70b1dca9";
-
-  @Test
-  public void decodeGoQuorumPrivateTransactionRlp() {
-    GoQuorumOptions.goquorumCompatibilityMode = true;
-    RLPInput input = RLP.input(Bytes.fromHexString(GOQUORUM_PRIVATE_TX_RLP));
-
-    final Transaction transaction = TransactionRLPDecoder.decode(input);
-    assertThat(transaction).isNotNull();
-    assertThat(transaction.getV()).isEqualTo(38);
-    assertThat(transaction.getSender())
-        .isEqualByComparingTo(Address.fromHexString("0xed9d02e382b34818e88b88a309c7fe71e65f419d"));
-    GoQuorumOptions.goquorumCompatibilityMode =
-        GoQuorumOptions.GOQUORUM_COMPATIBILITY_MODE_DEFAULT_VALUE;
-  }
-
-  @Test
-  public void decodeFrontierNominalCase() {
-    final Transaction transaction =
-        TransactionRLPDecoder.decode(RLP.input(Bytes.fromHexString(FRONTIER_TX_RLP)));
-    assertThat(transaction).isNotNull();
-    assertThat(transaction.getGasPrice()).isEqualByComparingTo(Wei.of(50L));
-    assertThat(transaction.getGasPremium()).isEmpty();
-    assertThat(transaction.getFeeCap()).isEmpty();
-  }
-
-  @Test
-  public void decodeEIP1559NominalCase() {
-    ExperimentalEIPs.eip1559Enabled = true;
-    final Transaction transaction =
-        TransactionRLPDecoder.decode(RLP.input(Bytes.fromHexString(EIP1559_TX_RLP)));
-    assertThat(transaction).isNotNull();
-    assertThat(transaction.getGasPremium()).hasValue(Wei.of(527L));
-    assertThat(transaction.getFeeCap()).hasValue(Wei.of(369L));
-    ExperimentalEIPs.eip1559Enabled = ExperimentalEIPs.EIP1559_ENABLED_DEFAULT_VALUE;
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/TransactionRLPEncoderTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/TransactionRLPEncoderTest.java
deleted file mode 100644
index b5d95d03601..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/TransactionRLPEncoderTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core.encoding;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
-import org.hyperledger.besu.ethereum.rlp.RLP;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-public class TransactionRLPEncoderTest {
-  private static final String FRONTIER_TX_RLP =
-      "0xf901fc8032830138808080b901ae60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b561ca0c5689ed1ad124753d54576dfb4b571465a41900a1dff4058d8adf16f752013d0a01221cbd70ec28c94a3b55ec771bcbc70778d6ee0b51ca7ea9514594c861b1884";
-  private static final String EIP1559_TX_RLP =
-      "0xf902028032830138808080b901ae60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b5682020f8201711ca0c5689ed1ad124753d54576dfb4b571465a41900a1dff4058d8adf16f752013d0a01221cbd70ec28c94a3b55ec771bcbc70778d6ee0b51ca7ea9514594c861b1884";
-
-  @Test
-  public void encodeFrontierTxNominalCase() {
-    final Transaction transaction =
-        TransactionRLPDecoder.decode(RLP.input(Bytes.fromHexString(FRONTIER_TX_RLP)));
-    final BytesValueRLPOutput output = new BytesValueRLPOutput();
-    TransactionRLPEncoder.encode(transaction, output);
-    assertThat(FRONTIER_TX_RLP).isEqualTo(output.encoded().toHexString());
-  }
-
-  @Test
-  public void encodeEIP1559TxNominalCase() {
-    ExperimentalEIPs.eip1559Enabled = true;
-    final Transaction transaction =
-        TransactionRLPDecoder.decode(RLP.input(Bytes.fromHexString(EIP1559_TX_RLP)));
-    final BytesValueRLPOutput output = new BytesValueRLPOutput();
-    TransactionRLPEncoder.encode(transaction, output);
-    assertThat(
-            "0xf902028080830138808080b901ae60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b5682020f8201711ca0c5689ed1ad124753d54576dfb4b571465a41900a1dff4058d8adf16f752013d0a01221cbd70ec28c94a3b55ec771bcbc70778d6ee0b51ca7ea9514594c861b1884")
-        .isEqualTo(output.encoded().toHexString());
-    ExperimentalEIPs.eip1559Enabled = ExperimentalEIPs.EIP1559_ENABLED_DEFAULT_VALUE;
-  }
-
-  @Test
-  public void encodeEIP1559TxFailureNotEnabled() {
-    ExperimentalEIPs.eip1559Enabled = false;
-    assertThatThrownBy(
-            () ->
-                TransactionRLPEncoder.encode(
-                    TransactionRLPDecoder.decode(RLP.input(Bytes.fromHexString(EIP1559_TX_RLP))),
-                    new BytesValueRLPOutput()))
-        .isInstanceOf(RuntimeException.class)
-        .hasMessageContaining("EIP-1559 feature flag");
-    ExperimentalEIPs.eip1559Enabled = ExperimentalEIPs.EIP1559_ENABLED_DEFAULT_VALUE;
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/WithdrawalDecoderTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/WithdrawalDecoderTest.java
new file mode 100644
index 00000000000..a23bf24cff8
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/WithdrawalDecoderTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core.encoding;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.GWei;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt64;
+import org.junit.jupiter.api.Test;
+
+class WithdrawalDecoderTest {
+
+  @Test
+  void shouldDecodeWithdrawalForZeroCase() {
+    Withdrawal withdrawal =
+        WithdrawalDecoder.decodeOpaqueBytes(
+            Bytes.fromHexString(WithdrawalEncoderTest.WITHDRAWAL_ZERO_CASE));
+    assertThat(withdrawal.getIndex()).isEqualTo(UInt64.ZERO);
+    assertThat(withdrawal.getValidatorIndex()).isEqualTo(UInt64.ZERO);
+    assertThat(withdrawal.getAddress()).isEqualTo(Address.ZERO);
+    assertThat(withdrawal.getAmount()).isEqualTo(GWei.ZERO);
+  }
+
+  @Test
+  void shouldDecodeWithdrawalForMaxValue() {
+    Withdrawal withdrawal =
+        WithdrawalDecoder.decodeOpaqueBytes(
+            Bytes.fromHexString(WithdrawalEncoderTest.WITHDRAWAL_MAX_VALUE));
+    assertThat(withdrawal.getIndex()).isEqualTo(UInt64.MAX_VALUE);
+    assertThat(withdrawal.getValidatorIndex()).isEqualTo(UInt64.MAX_VALUE);
+    assertThat(withdrawal.getAddress()).isEqualTo(WithdrawalEncoderTest.MAX_ADDRESS);
+    assertThat(withdrawal.getAmount()).isEqualTo(GWei.MAX_GWEI);
+  }
+
+  @Test
+  void shouldDecodeWithdrawal() {
+    final Withdrawal expectedWithdrawal =
+        new Withdrawal(
+            UInt64.valueOf(3), UInt64.valueOf(1), Address.fromHexString("0xdeadbeef"), GWei.of(5));
+    final Withdrawal withdrawal =
+        WithdrawalDecoder.decodeOpaqueBytes(
+            Bytes.fromHexString("0xd803019400000000000000000000000000000000deadbeef05"));
+
+    assertThat(withdrawal).isEqualTo(expectedWithdrawal);
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/WithdrawalEncoderTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/WithdrawalEncoderTest.java
new file mode 100644
index 00000000000..3c80cd78712
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/encoding/WithdrawalEncoderTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core.encoding;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.GWei;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt64;
+import org.junit.jupiter.api.Test;
+
+class WithdrawalEncoderTest {
+  public static final String WITHDRAWAL_ZERO_CASE =
+      "0xd8808094000000000000000000000000000000000000000080";
+  public static final String WITHDRAWAL_MAX_VALUE =
+      "0xf088ffffffffffffffff88ffffffffffffffff94ffffffffffffffffffffffffffffffffffffffff88ffffffffffffffff";
+  public static final Address MAX_ADDRESS =
+      Address.fromHexString(Bytes.repeat((byte) 0xff, 20).toHexString());
+
+  @Test
+  void shouldEncodeWithdrawalForZeroCase() {
+    final Withdrawal withdrawal = new Withdrawal(UInt64.ZERO, UInt64.ZERO, Address.ZERO, GWei.ZERO);
+    final Bytes bytes = WithdrawalEncoder.encodeOpaqueBytes(withdrawal);
+    assertThat(bytes.toHexString()).isEqualTo(WITHDRAWAL_ZERO_CASE);
+  }
+
+  @Test
+  void shouldEncodeWithdrawalForMaxValues() {
+    final Withdrawal withdrawal =
+        new Withdrawal(UInt64.MAX_VALUE, UInt64.MAX_VALUE, MAX_ADDRESS, GWei.MAX_GWEI);
+    final Bytes bytes = WithdrawalEncoder.encodeOpaqueBytes(withdrawal);
+    assertThat(bytes.toHexString()).isEqualTo(WITHDRAWAL_MAX_VALUE);
+  }
+
+  @Test
+  void shouldEncode() {
+    final UInt64 index = UInt64.valueOf(3);
+    final UInt64 validatorIndex = UInt64.valueOf(1);
+    final Address address = Address.fromHexString("0xdeadbeef");
+    final GWei amount = GWei.of(5);
+    final Withdrawal withdrawal = new Withdrawal(index, validatorIndex, address, amount);
+    final Bytes encoded = WithdrawalEncoder.encodeOpaqueBytes(withdrawal);
+
+    assertThat(encoded)
+        .isEqualTo(Bytes.fromHexString("0xd803019400000000000000000000000000000000deadbeef05"));
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/feemarket/BaseFeeMarketBaseFeeTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/feemarket/BaseFeeMarketBaseFeeTest.java
new file mode 100644
index 00000000000..81580cf529c
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/feemarket/BaseFeeMarketBaseFeeTest.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core.feemarket;
+
+import static com.google.common.base.Preconditions.checkState;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Charsets;
+import com.google.common.io.Resources;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class BaseFeeMarketBaseFeeTest {
+
+  private final BaseFeeMarket baseFeeMarket = FeeMarket.london(0);
+
+  @Parameters
+  public static Collection<Object[]> data() {
+    try {
+      final List<Object[]> data = new ArrayList<>();
+      final String testFilePath = "basefee-test.json";
+      final URL testFileUrl = BaseFeeMarketBaseFeeTest.class.getResource(testFilePath);
+      checkState(testFileUrl != null, "Cannot find test file " + testFilePath);
+      final String testSuiteJson = Resources.toString(testFileUrl, Charsets.UTF_8);
+      final ObjectMapper objectMapper = new ObjectMapper();
+      final BaseFeeMarketBaseFeeTestCase[] testCases =
+          objectMapper.readValue(testSuiteJson, BaseFeeMarketBaseFeeTestCase[].class);
+      for (final BaseFeeMarketBaseFeeTestCase testCase : testCases) {
+        data.add(
+            new Object[] {
+              testCase.parentBaseFee,
+              testCase.parentGasUsed,
+              testCase.parentTargetGasUsed,
+              testCase.expectedBaseFee
+            });
+      }
+      return data;
+    } catch (final Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private final Wei parentBaseFee;
+  private final long parentGasUsed;
+  private final long parentTargetGasUsed;
+  private final Wei expectedBaseFee;
+
+  public BaseFeeMarketBaseFeeTest(
+      final Wei parentBaseFee,
+      final long parentGasUsed,
+      final long parentTargetGasUsed,
+      final Wei expectedBaseFee) {
+    this.parentBaseFee = parentBaseFee;
+    this.parentGasUsed = parentGasUsed;
+    this.parentTargetGasUsed = parentTargetGasUsed;
+    this.expectedBaseFee = expectedBaseFee;
+  }
+
+  @Test
+  @Ignore("Need to have spec frozen to define correct values")
+  public void assertThatBaseFeeIsCorrect() {
+    assertThat(baseFeeMarket.computeBaseFee(0L, parentBaseFee, parentGasUsed, parentTargetGasUsed))
+        .isEqualTo(expectedBaseFee);
+  }
+
+  @SuppressWarnings("unused")
+  private static class BaseFeeMarketBaseFeeTestCase {
+
+    private Wei parentBaseFee;
+    private long parentGasUsed;
+    private long parentTargetGasUsed;
+    private Wei expectedBaseFee;
+
+    public void setParentBaseFee(final Wei parentBaseFee) {
+      this.parentBaseFee = parentBaseFee;
+    }
+
+    public void setParentGasUsed(final long parentGasUsed) {
+      this.parentGasUsed = parentGasUsed;
+    }
+
+    public void setParentTargetGasUsed(final long parentTargetGasUsed) {
+      this.parentTargetGasUsed = parentTargetGasUsed;
+    }
+
+    public void setExpectedBaseFee(final Wei expectedBaseFee) {
+      this.expectedBaseFee = expectedBaseFee;
+    }
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/feemarket/BaseFeeMarketTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/feemarket/BaseFeeMarketTest.java
new file mode 100644
index 00000000000..e92617f4b74
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/feemarket/BaseFeeMarketTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core.feemarket;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+
+import org.junit.Test;
+
+public class BaseFeeMarketTest {
+
+  private static final long FORK_BLOCK = 783L;
+  private final BaseFeeMarket baseFeeMarket = FeeMarket.london(FORK_BLOCK);
+  private static final long TARGET_GAS_USED = 10000000L;
+
+  @Test
+  public void assertThatBaseFeeDecreasesWhenBelowTargetGasUsed() {
+    assertThat(
+            baseFeeMarket.computeBaseFee(
+                FORK_BLOCK + 1,
+                baseFeeMarket.getInitialBasefee(),
+                TARGET_GAS_USED - 1000000L,
+                TARGET_GAS_USED))
+        .isLessThan(baseFeeMarket.getInitialBasefee())
+        .isEqualTo(Wei.of(987500000L));
+  }
+
+  @Test
+  public void assertThatBaseFeeIncreasesWhenAboveTargetGasUsed() {
+    assertThat(
+            baseFeeMarket.computeBaseFee(
+                FORK_BLOCK + 1,
+                baseFeeMarket.getInitialBasefee(),
+                TARGET_GAS_USED + 1000000L,
+                TARGET_GAS_USED))
+        .isGreaterThan(baseFeeMarket.getInitialBasefee())
+        .isEqualTo(Wei.of(1012500000L));
+  }
+
+  @Test
+  public void givenForkBlock_whenBaseFeeValidationMode_thenReturnsInitial() {
+    assertThat(baseFeeMarket.baseFeeValidationMode(FORK_BLOCK))
+        .isEqualTo(BaseFeeMarket.ValidationMode.INITIAL);
+  }
+
+  @Test
+  public void givenNotForkBlock_whenBaseFeeValidationMode_thenReturnsOngoing() {
+    assertThat(baseFeeMarket.baseFeeValidationMode(FORK_BLOCK + 1))
+        .isEqualTo(BaseFeeMarket.ValidationMode.ONGOING);
+  }
+
+  @Test
+  public void givenForkBlock_whenGasLimitValidationMode_thenReturnsInitial() {
+    assertThat(baseFeeMarket.gasLimitValidationMode(FORK_BLOCK))
+        .isEqualTo(BaseFeeMarket.ValidationMode.INITIAL);
+  }
+
+  @Test
+  public void givenNotForkBlock_whenGasLimitValidationMode_thenReturnsOngoing() {
+    assertThat(baseFeeMarket.gasLimitValidationMode(FORK_BLOCK + 1))
+        .isEqualTo(BaseFeeMarket.ValidationMode.ONGOING);
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/feemarket/CoinbaseFeePriceCalculatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/feemarket/CoinbaseFeePriceCalculatorTest.java
new file mode 100644
index 00000000000..c653f763870
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/feemarket/CoinbaseFeePriceCalculatorTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core.feemarket;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Wei;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Optional;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class CoinbaseFeePriceCalculatorTest {
+
+  private static final CoinbaseFeePriceCalculator FRONTIER_CALCULATOR =
+      CoinbaseFeePriceCalculator.frontier();
+  private static final CoinbaseFeePriceCalculator EIP_1559_CALCULATOR =
+      CoinbaseFeePriceCalculator.eip1559();
+
+  private final CoinbaseFeePriceCalculator coinbaseFeePriceCalculator;
+  private final long coinbaseFee;
+  private final Wei transactionGasPrice;
+  private final Optional<Wei> baseFee;
+  private final Wei expectedPrice;
+
+  public CoinbaseFeePriceCalculatorTest(
+      final CoinbaseFeePriceCalculator coinbaseFeePriceCalculator,
+      final long coinbaseFee,
+      final Wei transactionGasPrice,
+      final Optional<Wei> baseFee,
+      final Wei expectedPrice) {
+    this.coinbaseFeePriceCalculator = coinbaseFeePriceCalculator;
+    this.coinbaseFee = coinbaseFee;
+    this.transactionGasPrice = transactionGasPrice;
+    this.baseFee = baseFee;
+    this.expectedPrice = expectedPrice;
+  }
+
+  @Parameterized.Parameters
+  public static Collection<Object[]> data() {
+    return Arrays.asList(
+        new Object[][] {
+          // legacy transaction must return gas price * gas
+          {FRONTIER_CALCULATOR, 100L, Wei.of(10L), Optional.empty(), Wei.of(1000L)},
+          // EIP-1559 must return gas * (gas price - base fee)
+          {EIP_1559_CALCULATOR, 100L, Wei.of(10L), Optional.of(Wei.of(4L)), Wei.of(600L)},
+          // Negative transaction gas price case
+          // {EIP_1559_CALCULATOR, Gas.of(100), Wei.of(95L), Optional.of(100L), Wei.of(-500L)}
+        });
+  }
+
+  @Test
+  public void assertThatCalculatorWorks() {
+    assertThat(coinbaseFeePriceCalculator.price(coinbaseFee, transactionGasPrice, baseFee))
+        .isEqualByComparingTo(expectedPrice);
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/feemarket/TransactionPriceCalculatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/feemarket/TransactionPriceCalculatorTest.java
new file mode 100644
index 00000000000..3caa7234908
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/feemarket/TransactionPriceCalculatorTest.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core.feemarket;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.plugin.data.TransactionType.ACCESS_LIST;
+import static org.hyperledger.besu.plugin.data.TransactionType.EIP1559;
+import static org.hyperledger.besu.plugin.data.TransactionType.FRONTIER;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.plugin.data.TransactionType;
+
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Optional;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class TransactionPriceCalculatorTest {
+
+  private static final TransactionPriceCalculator FRONTIER_CALCULATOR =
+      TransactionPriceCalculator.frontier();
+  private static final TransactionPriceCalculator EIP_1559_CALCULATOR =
+      TransactionPriceCalculator.eip1559();
+
+  private final TransactionPriceCalculator transactionPriceCalculator;
+  private final TransactionType transactionType;
+  private final Wei gasPrice;
+  private final Wei maxPriorityFeePerGas;
+  private final Wei maxFeePerGas;
+  private final Optional<Wei> baseFee;
+  private final Wei expectedPrice;
+
+  public TransactionPriceCalculatorTest(
+      final TransactionPriceCalculator transactionPriceCalculator,
+      final TransactionType transactionType,
+      final Wei gasPrice,
+      final Wei maxPriorityFeePerGas,
+      final Wei maxFeePerGas,
+      final Optional<Wei> baseFee,
+      final Wei expectedPrice) {
+    this.transactionPriceCalculator = transactionPriceCalculator;
+    this.transactionType = transactionType;
+    this.gasPrice = gasPrice;
+    this.maxPriorityFeePerGas = maxPriorityFeePerGas;
+    this.maxFeePerGas = maxFeePerGas;
+    this.baseFee = baseFee;
+    this.expectedPrice = expectedPrice;
+  }
+
+  @Parameterized.Parameters
+  public static Collection<Object[]> data() {
+    return Arrays.asList(
+        new Object[][] {
+          // legacy transaction must return gas price
+          {FRONTIER_CALCULATOR, FRONTIER, Wei.of(578L), null, null, Optional.empty(), Wei.of(578L)},
+          // legacy transaction zero price
+          {FRONTIER_CALCULATOR, FRONTIER, Wei.ZERO, null, null, Optional.empty(), Wei.ZERO},
+          // ACCESSLIST transaction must return gas price
+          {
+            FRONTIER_CALCULATOR,
+            ACCESS_LIST,
+            Wei.of(578L),
+            null,
+            null,
+            Optional.empty(),
+            Wei.of(578L)
+          },
+          // legacy transaction must return gas price
+          {
+            EIP_1559_CALCULATOR,
+            FRONTIER,
+            Wei.of(578L),
+            null,
+            null,
+            Optional.of(Wei.of(150L)),
+            Wei.of(578L)
+          },
+          // london legacy transaction zero price
+          {EIP_1559_CALCULATOR, FRONTIER, Wei.ZERO, null, null, Optional.of(Wei.ZERO), Wei.ZERO},
+          // ACCESSLIST transaction must return gas price
+          {
+            EIP_1559_CALCULATOR,
+            ACCESS_LIST,
+            Wei.of(578L),
+            null,
+            null,
+            Optional.of(Wei.of(150L)),
+            Wei.of(578L)
+          },
+          // EIP-1559 must return maxPriorityFeePerGas + base fee
+          {
+            EIP_1559_CALCULATOR,
+            EIP1559,
+            null,
+            Wei.of(100L),
+            Wei.of(300L),
+            Optional.of(Wei.of(150L)),
+            Wei.of(250L)
+          },
+          // EIP-1559 must return fee cap
+          {
+            EIP_1559_CALCULATOR,
+            EIP1559,
+            null,
+            Wei.of(100L),
+            Wei.of(300L),
+            Optional.of(Wei.of(250L)),
+            Wei.of(300L)
+          },
+          // EIP-1559 transaction zero price
+          {EIP_1559_CALCULATOR, EIP1559, null, Wei.ZERO, Wei.ZERO, Optional.of(Wei.ZERO), Wei.ZERO}
+        });
+  }
+
+  @Test
+  public void assertThatCalculatorWorks() {
+    assertThat(
+            transactionPriceCalculator.price(
+                Transaction.builder()
+                    .type(transactionType)
+                    .accessList(transactionType == ACCESS_LIST ? Collections.emptyList() : null)
+                    .gasPrice(gasPrice)
+                    .maxPriorityFeePerGas(maxPriorityFeePerGas)
+                    .maxFeePerGas(maxFeePerGas)
+                    .chainId(BigInteger.ONE)
+                    .build(),
+                baseFee))
+        .isEqualByComparingTo(expectedPrice);
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/fees/CoinbaseFeePriceCalculatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/fees/CoinbaseFeePriceCalculatorTest.java
deleted file mode 100644
index 9962f21c2ae..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/fees/CoinbaseFeePriceCalculatorTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core.fees;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Wei;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Optional;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-public class CoinbaseFeePriceCalculatorTest {
-
-  private static final CoinbaseFeePriceCalculator FRONTIER_CALCULATOR =
-      CoinbaseFeePriceCalculator.frontier();
-  private static final CoinbaseFeePriceCalculator EIP_1559_CALCULATOR =
-      CoinbaseFeePriceCalculator.eip1559();
-
-  private final CoinbaseFeePriceCalculator coinbaseFeePriceCalculator;
-  private final Gas coinbaseFee;
-  private final Wei transactionGasPrice;
-  private final Optional<Long> baseFee;
-  private final Wei expectedPrice;
-
-  public CoinbaseFeePriceCalculatorTest(
-      final CoinbaseFeePriceCalculator coinbaseFeePriceCalculator,
-      final Gas coinbaseFee,
-      final Wei transactionGasPrice,
-      final Optional<Long> baseFee,
-      final Wei expectedPrice) {
-    this.coinbaseFeePriceCalculator = coinbaseFeePriceCalculator;
-    this.coinbaseFee = coinbaseFee;
-    this.transactionGasPrice = transactionGasPrice;
-    this.baseFee = baseFee;
-    this.expectedPrice = expectedPrice;
-  }
-
-  @Parameterized.Parameters
-  public static Collection<Object[]> data() {
-    return Arrays.asList(
-        new Object[][] {
-          // legacy transaction must return gas price * gas
-          {FRONTIER_CALCULATOR, Gas.of(100), Wei.of(10L), Optional.empty(), Wei.of(1000L)},
-          // EIP-1559 must return gas * (gas price - base fee)
-          {EIP_1559_CALCULATOR, Gas.of(100), Wei.of(10L), Optional.of(4L), Wei.of(600L)},
-          // Negative transaction gas price case
-          // {EIP_1559_CALCULATOR, Gas.of(100), Wei.of(95L), Optional.of(100L), Wei.of(-500L)}
-        });
-  }
-
-  @Test
-  public void assertThatCalculatorWorks() {
-    assertThat(coinbaseFeePriceCalculator.price(coinbaseFee, transactionGasPrice, baseFee))
-        .isEqualByComparingTo(expectedPrice);
-  }
-
-  @Before
-  public void setUp() {
-    ExperimentalEIPs.eip1559Enabled = true;
-  }
-
-  @After
-  public void reset() {
-    ExperimentalEIPs.eip1559Enabled = ExperimentalEIPs.EIP1559_ENABLED_DEFAULT_VALUE;
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/fees/EIP1559BaseFeeTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/fees/EIP1559BaseFeeTest.java
deleted file mode 100644
index bd80db4996d..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/fees/EIP1559BaseFeeTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core.fees;
-
-import static com.google.common.base.Preconditions.checkState;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Charsets;
-import com.google.common.io.Resources;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class EIP1559BaseFeeTest {
-
-  private final EIP1559 eip1559 = new EIP1559(0);
-
-  @Parameters
-  public static Collection<Object[]> data() {
-    try {
-      final List<Object[]> data = new ArrayList<>();
-      final String testFilePath = "basefee-test.json";
-      final URL testFileUrl = EIP1559BaseFeeTest.class.getResource(testFilePath);
-      checkState(testFileUrl != null, "Cannot find test file " + testFilePath);
-      final String testSuiteJson = Resources.toString(testFileUrl, Charsets.UTF_8);
-      final ObjectMapper objectMapper = new ObjectMapper();
-      final Eip1559BaseFeeTestCase[] testCases =
-          objectMapper.readValue(testSuiteJson, Eip1559BaseFeeTestCase[].class);
-      for (final Eip1559BaseFeeTestCase testCase : testCases) {
-        data.add(
-            new Object[] {
-              testCase.parentBaseFee,
-              testCase.parentGasUsed,
-              testCase.parentTargetGasUsed,
-              testCase.expectedBaseFee
-            });
-      }
-      return data;
-    } catch (final Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  private final long parentBaseFee;
-  private final long parentGasUsed;
-  private final long parentTargetGasUsed;
-  private final long expectedBaseFee;
-
-  public EIP1559BaseFeeTest(
-      final long parentBaseFee,
-      final long parentGasUsed,
-      final long parentTargetGasUsed,
-      final long expectedBaseFee) {
-    this.parentBaseFee = parentBaseFee;
-    this.parentGasUsed = parentGasUsed;
-    this.parentTargetGasUsed = parentTargetGasUsed;
-    this.expectedBaseFee = expectedBaseFee;
-  }
-
-  @Before
-  public void setUp() {
-    ExperimentalEIPs.eip1559Enabled = true;
-  }
-
-  @After
-  public void reset() {
-    ExperimentalEIPs.eip1559Enabled = ExperimentalEIPs.EIP1559_ENABLED_DEFAULT_VALUE;
-  }
-
-  @Test
-  @Ignore("Need to have spec frozen to define correct values")
-  public void assertThatBaseFeeIsCorrect() {
-    assertThat(eip1559.computeBaseFee(0L, parentBaseFee, parentGasUsed, parentTargetGasUsed))
-        .isEqualTo(expectedBaseFee);
-  }
-
-  private static class Eip1559BaseFeeTestCase {
-
-    private long parentBaseFee;
-    private long parentGasUsed;
-    private long parentTargetGasUsed;
-    private long expectedBaseFee;
-
-    public Eip1559BaseFeeTestCase() {}
-
-    public Eip1559BaseFeeTestCase(
-        final long parentBaseFee,
-        final long parentGasUsed,
-        final long parentTargetGasUsed,
-        final long expectedBaseFee) {
-      this.parentBaseFee = parentBaseFee;
-      this.parentGasUsed = parentGasUsed;
-      this.parentTargetGasUsed = parentTargetGasUsed;
-      this.expectedBaseFee = expectedBaseFee;
-    }
-
-    public long getParentBaseFee() {
-      return parentBaseFee;
-    }
-
-    public long getParentGasUsed() {
-      return parentGasUsed;
-    }
-
-    public long getParentTargetGasUsed() {
-      return parentTargetGasUsed;
-    }
-
-    public long getExpectedBaseFee() {
-      return expectedBaseFee;
-    }
-
-    public void setParentBaseFee(final long parentBaseFee) {
-      this.parentBaseFee = parentBaseFee;
-    }
-
-    public void setParentGasUsed(final long parentGasUsed) {
-      this.parentGasUsed = parentGasUsed;
-    }
-
-    public void setParentTargetGasUsed(final long parentTargetGasUsed) {
-      this.parentTargetGasUsed = parentTargetGasUsed;
-    }
-
-    public void setExpectedBaseFee(final long expectedBaseFee) {
-      this.expectedBaseFee = expectedBaseFee;
-    }
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/fees/EIP1559Test.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/fees/EIP1559Test.java
deleted file mode 100644
index d7131a04c47..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/fees/EIP1559Test.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core.fees;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class EIP1559Test {
-
-  private static final long FORK_BLOCK = 783L;
-  private final EIP1559 eip1559 = new EIP1559(FORK_BLOCK);
-  private final FeeMarket feeMarket = FeeMarket.eip1559();
-  private static final long TARGET_GAS_USED = 10000000L;
-
-  @Before
-  public void setUp() {
-    ExperimentalEIPs.eip1559Enabled = true;
-  }
-
-  @After
-  public void reset() {
-    ExperimentalEIPs.eip1559Enabled = ExperimentalEIPs.EIP1559_ENABLED_DEFAULT_VALUE;
-  }
-
-  @Test
-  public void assertThatBaseFeeDecreasesWhenBelowTargetGasUsed() {
-    assertThat(
-            eip1559.computeBaseFee(
-                FORK_BLOCK,
-                feeMarket.getInitialBasefee(),
-                TARGET_GAS_USED - 1000000L,
-                TARGET_GAS_USED))
-        .isLessThan(feeMarket.getInitialBasefee())
-        .isEqualTo(987500000L);
-  }
-
-  @Test
-  public void assertThatBaseFeeIncreasesWhenAboveTargetGasUsed() {
-    assertThat(
-            eip1559.computeBaseFee(
-                FORK_BLOCK,
-                feeMarket.getInitialBasefee(),
-                TARGET_GAS_USED + 1000000L,
-                TARGET_GAS_USED))
-        .isGreaterThan(feeMarket.getInitialBasefee())
-        .isEqualTo(1012500000L);
-  }
-
-  @Test
-  public void givenBlockAfterFork_whenIsEIP1559_returnsTrue() {
-    assertThat(eip1559.isEIP1559(FORK_BLOCK + 1)).isTrue();
-  }
-
-  @Test
-  public void givenBlockABeforeFork_whenIsEIP1559_returnsFalse() {
-    assertThat(eip1559.isEIP1559(FORK_BLOCK - 1)).isFalse();
-  }
-
-  @Test
-  public void givenForkBlock_whenIsForkBlock_thenReturnsTrue() {
-    assertThat(eip1559.isForkBlock(FORK_BLOCK)).isTrue();
-  }
-
-  @Test
-  public void givenNotForkBlock_whenIsForkBlock_thenReturnsFalse() {
-    assertThat(eip1559.isForkBlock(FORK_BLOCK + 1)).isFalse();
-  }
-
-  @Test
-  public void getForkBlock() {
-    assertThat(eip1559.getForkBlock()).isEqualTo(FORK_BLOCK);
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/fees/TransactionGasBudgetCalculatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/fees/TransactionGasBudgetCalculatorTest.java
deleted file mode 100644
index bedddca0e1f..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/fees/TransactionGasBudgetCalculatorTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core.fees;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.plugin.data.TransactionType;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-public class TransactionGasBudgetCalculatorTest {
-
-  private static final TransactionGasBudgetCalculator FRONTIER_CALCULATOR =
-      TransactionGasBudgetCalculator.frontier();
-
-  private final TransactionGasBudgetCalculator gasBudgetCalculator;
-  private final boolean isEIP1559;
-  private final long transactionGasLimit;
-  private final long blockNumber;
-  private final long blockHeaderGasLimit;
-  private final long gasUsed;
-  private final boolean expectedHasBudget;
-
-  public TransactionGasBudgetCalculatorTest(
-      final TransactionGasBudgetCalculator gasBudgetCalculator,
-      final boolean isEIP1559,
-      final long transactionGasLimit,
-      final long blockNumber,
-      final long blockHeaderGasLimit,
-      final long gasUsed,
-      final boolean expectedHasBudget) {
-    this.gasBudgetCalculator = gasBudgetCalculator;
-    this.isEIP1559 = isEIP1559;
-    this.transactionGasLimit = transactionGasLimit;
-    this.blockNumber = blockNumber;
-    this.blockHeaderGasLimit = blockHeaderGasLimit;
-    this.gasUsed = gasUsed;
-    this.expectedHasBudget = expectedHasBudget;
-  }
-
-  @Parameterized.Parameters
-  public static Collection<Object[]> data() {
-
-    return Arrays.asList(
-        new Object[][] {
-          {FRONTIER_CALCULATOR, false, 5L, 1L, 10L, 0L, true},
-          {FRONTIER_CALCULATOR, false, 11L, 1L, 10L, 0L, false},
-          {FRONTIER_CALCULATOR, false, 5L, 1L, 10L, 6L, false},
-        });
-  }
-
-  @BeforeClass
-  public static void initialize() {
-    ExperimentalEIPs.eip1559Enabled = true;
-  }
-
-  @AfterClass
-  public static void tearDown() {
-    ExperimentalEIPs.eip1559Enabled = ExperimentalEIPs.EIP1559_ENABLED_DEFAULT_VALUE;
-  }
-
-  @Test
-  public void assertThatCalculatorWorks() {
-    assertThat(
-            gasBudgetCalculator.hasBudget(
-                transaction(isEIP1559, transactionGasLimit),
-                blockNumber,
-                blockHeaderGasLimit,
-                gasUsed))
-        .isEqualTo(expectedHasBudget);
-  }
-
-  private Transaction transaction(final boolean isEIP1559, final long gasLimit) {
-    final Transaction transaction = mock(Transaction.class);
-    if (isEIP1559) {
-      when(transaction.getType()).thenReturn(TransactionType.EIP1559);
-    } else {
-      when(transaction.getType()).thenReturn(TransactionType.FRONTIER);
-    }
-    when(transaction.getGasLimit()).thenReturn(gasLimit);
-    return transaction;
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/fees/TransactionPriceCalculatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/fees/TransactionPriceCalculatorTest.java
deleted file mode 100644
index c5ccf8022ea..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/fees/TransactionPriceCalculatorTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.core.fees;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.plugin.data.TransactionType;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Optional;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-public class TransactionPriceCalculatorTest {
-
-  private static final TransactionPriceCalculator FRONTIER_CALCULATOR =
-      TransactionPriceCalculator.frontier();
-  private static final TransactionPriceCalculator EIP_1559_CALCULATOR =
-      TransactionPriceCalculator.eip1559();
-
-  private final TransactionPriceCalculator transactionPriceCalculator;
-  private final Wei gasPrice;
-  private final Wei gasPremium;
-  private final Wei feeCap;
-  private final Optional<Long> baseFee;
-  private final Wei expectedPrice;
-
-  public TransactionPriceCalculatorTest(
-      final TransactionPriceCalculator transactionPriceCalculator,
-      final Wei gasPrice,
-      final Wei gasPremium,
-      final Wei feeCap,
-      final Optional<Long> baseFee,
-      final Wei expectedPrice) {
-    this.transactionPriceCalculator = transactionPriceCalculator;
-    this.gasPrice = gasPrice;
-    this.gasPremium = gasPremium;
-    this.feeCap = feeCap;
-    this.baseFee = baseFee;
-    this.expectedPrice = expectedPrice;
-  }
-
-  @Parameterized.Parameters
-  public static Collection<Object[]> data() {
-    return Arrays.asList(
-        new Object[][] {
-          // legacy transaction must return gas price
-          {FRONTIER_CALCULATOR, Wei.of(578L), null, null, Optional.empty(), Wei.of(578L)},
-          // EIP-1559 must return gas premium + base fee
-          {EIP_1559_CALCULATOR, null, Wei.of(100L), Wei.of(300L), Optional.of(150L), Wei.of(250L)},
-          // EIP-1559 must return fee cap
-          {EIP_1559_CALCULATOR, null, Wei.of(100L), Wei.of(300L), Optional.of(250L), Wei.of(300L)}
-        });
-  }
-
-  @Test
-  public void assertThatCalculatorWorks() {
-    assertThat(
-            transactionPriceCalculator.price(
-                Transaction.builder()
-                    .type(TransactionType.EIP1559)
-                    .gasPrice(gasPrice)
-                    .gasPremium(gasPremium)
-                    .feeCap(feeCap)
-                    .build(),
-                baseFee))
-        .isEqualByComparingTo(expectedPrice);
-  }
-
-  @Before
-  public void setUp() {
-    ExperimentalEIPs.eip1559Enabled = true;
-  }
-
-  @After
-  public void reset() {
-    ExperimentalEIPs.eip1559Enabled = ExperimentalEIPs.EIP1559_ENABLED_DEFAULT_VALUE;
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/difficulty/fixed/FixedProtocolScheduleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/difficulty/fixed/FixedProtocolScheduleTest.java
index 4204a5e4d76..d78092792cd 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/difficulty/fixed/FixedProtocolScheduleTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/difficulty/fixed/FixedProtocolScheduleTest.java
@@ -20,6 +20,7 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 
 import org.junit.Test;
 
@@ -29,7 +30,8 @@ public class FixedProtocolScheduleTest {
   public void reportedDifficultyForAllBlocksIsAFixedValue() {
 
     final ProtocolSchedule schedule =
-        FixedDifficultyProtocolSchedule.create(GenesisConfigFile.development().getConfigOptions());
+        FixedDifficultyProtocolSchedule.create(
+            GenesisConfigFile.development().getConfigOptions(), EvmConfiguration.DEFAULT);
 
     final BlockHeaderTestFixture headerBuilder = new BlockHeaderTestFixture();
 
@@ -37,23 +39,27 @@ public void reportedDifficultyForAllBlocksIsAFixedValue() {
 
     assertThat(
             schedule
-                .getByBlockNumber(0)
+                .getByBlockHeader(blockHeader(0))
                 .getDifficultyCalculator()
                 .nextDifficulty(1, parentHeader, null))
         .isEqualTo(FixedDifficultyCalculators.DEFAULT_DIFFICULTY);
 
     assertThat(
             schedule
-                .getByBlockNumber(500)
+                .getByBlockHeader(blockHeader(500))
                 .getDifficultyCalculator()
                 .nextDifficulty(1, parentHeader, null))
         .isEqualTo(FixedDifficultyCalculators.DEFAULT_DIFFICULTY);
 
     assertThat(
             schedule
-                .getByBlockNumber(500_000)
+                .getByBlockHeader(blockHeader(500_000))
                 .getDifficultyCalculator()
                 .nextDifficulty(1, parentHeader, null))
         .isEqualTo(FixedDifficultyCalculators.DEFAULT_DIFFICULTY);
   }
+
+  private BlockHeader blockHeader(final long number) {
+    return new BlockHeaderTestFixture().number(number).buildHeader();
+  }
 }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/ForkIdBackwardCompatibilityTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/forkid/ForkIdBackwardCompatibilityTest.java
similarity index 83%
rename from ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/ForkIdBackwardCompatibilityTest.java
rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/forkid/ForkIdBackwardCompatibilityTest.java
index b057f607da9..a7dbbbe6854 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/ForkIdBackwardCompatibilityTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/forkid/ForkIdBackwardCompatibilityTest.java
@@ -12,29 +12,27 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.eth;
+package org.hyperledger.besu.ethereum.forkid;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.eth.ForkIdTestUtil.GenesisHash;
-import static org.hyperledger.besu.ethereum.eth.ForkIdTestUtil.mockBlockchain;
-
-import org.hyperledger.besu.ethereum.eth.manager.ForkId;
-import org.hyperledger.besu.ethereum.eth.manager.ForkIdManager;
+import static org.hyperledger.besu.ethereum.forkid.ForkIdTestUtil.GenesisHash;
+import static org.hyperledger.besu.ethereum.forkid.ForkIdTestUtil.mockBlockchain;
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @RunWith(Parameterized.class)
 public class ForkIdBackwardCompatibilityTest {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(ForkIdBackwardCompatibilityTest.class);
 
   private final String name;
   private final String genesisHash;
@@ -117,11 +115,13 @@ public static Collection<Object[]> data() {
   public void assertBackwardCompatibilityWorks() {
     LOG.info("Running test case {}", name);
     final ForkIdManager forkIdManager =
-        new ForkIdManager(mockBlockchain(genesisHash, head), forks, legacyEth64);
+        new ForkIdManager(
+            mockBlockchain(genesisHash, head, 0), forks, Collections.emptyList(), legacyEth64);
     final ForkId legacyForkId =
         legacyEth64
-            ? new LegacyForkIdManager(mockBlockchain(genesisHash, head), forks).getLatestForkId()
+            ? new LegacyForkIdManager(mockBlockchain(genesisHash, head, 0), forks).getLatestForkId()
             : null;
-    assertThat(forkIdManager.computeForkId()).isEqualTo(legacyEth64 ? legacyForkId : wantForkId);
+    assertThat(forkIdManager.getForkIdForChainHead())
+        .isEqualTo(legacyEth64 ? legacyForkId : wantForkId);
   }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/forkid/ForkIdTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/forkid/ForkIdTest.java
new file mode 100644
index 00000000000..6a4a4503b7f
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/forkid/ForkIdTest.java
@@ -0,0 +1,693 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.forkid;
+
+import static com.google.common.primitives.Longs.asList;
+import static java.util.Collections.emptyList;
+import static java.util.Optional.empty;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.forkid.ForkIdTestUtil.mockBlockchain;
+import static org.hyperledger.besu.ethereum.forkid.ForkIdTestUtil.wantPeerCheck;
+
+import org.hyperledger.besu.ethereum.forkid.ForkIdTestUtil.ForkIds;
+import org.hyperledger.besu.ethereum.forkid.ForkIdTestUtil.GenesisHash;
+import org.hyperledger.besu.ethereum.forkid.ForkIdTestUtil.Network;
+import org.hyperledger.besu.ethereum.forkid.ForkIdTestUtil.PeerCheckCase;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@RunWith(Parameterized.class)
+public class ForkIdTest {
+  private static final Logger LOG = LoggerFactory.getLogger(ForkIdTest.class);
+
+  @Parameters(name = "{index}: {0}")
+  public static Collection<Object[]> data() {
+    return Arrays.asList(
+        new Object[][] {
+          // Mainnet test cases
+          {
+            "Mainnet // Unsynced",
+            Network.MAINNET,
+            0L,
+            0L,
+            ForkIdTestUtil.wantForkId("0xfc64ec04", 1150000L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          {
+            "Mainnet // First Homestead block",
+            Network.MAINNET,
+            1150000L,
+            0L,
+            ForkIdTestUtil.wantForkId("0x97c2c34c", 1920000L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          {
+            "Mainnet // Last Homestead block",
+            Network.MAINNET,
+            1919999L,
+            0L,
+            ForkIdTestUtil.wantForkId("0x97c2c34c", 1920000L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          {
+            "Mainnet // First DAO block",
+            Network.MAINNET,
+            1920000L,
+            0L,
+            ForkIdTestUtil.wantForkId("0x91d1f948", 2463000L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          {
+            "Mainnet // Last DAO block",
+            Network.MAINNET,
+            2462999L,
+            0L,
+            ForkIdTestUtil.wantForkId("0x91d1f948", 2463000L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          {
+            "Mainnet // First Tangerine block",
+            Network.MAINNET,
+            2463000L,
+            0L,
+            ForkIdTestUtil.wantForkId("0x7a64da13", 2675000L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          {
+            "Mainnet // Last Tangerine block",
+            Network.MAINNET,
+            2674999L,
+            0L,
+            ForkIdTestUtil.wantForkId("0x7a64da13", 2675000L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          {
+            "Mainnet // First Spurious block",
+            Network.MAINNET,
+            2675000L,
+            0L,
+            ForkIdTestUtil.wantForkId("0x3edd5b10", 4370000L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          {
+            "Mainnet // Last Spurious block",
+            Network.MAINNET,
+            4369999L,
+            0L,
+            ForkIdTestUtil.wantForkId("0x3edd5b10", 4370000L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          {
+            "Mainnet // First Byzantium block",
+            Network.MAINNET,
+            4370000L,
+            0L,
+            ForkIdTestUtil.wantForkId("0xa00bc324", 7280000L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          {
+            "Mainnet // Last Byzantium block",
+            Network.MAINNET,
+            7279999L,
+            0L,
+            ForkIdTestUtil.wantForkId("0xa00bc324", 7280000L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          {
+            "Mainnet // First and last Constantinople, first Petersburg block",
+            Network.MAINNET,
+            7280000L,
+            0L,
+            ForkIdTestUtil.wantForkId("0x668db0af", 9069000L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          {
+            "Mainnet // Last Petersburg block",
+            Network.MAINNET,
+            9068999L,
+            0L,
+            ForkIdTestUtil.wantForkId("0x668db0af", 9069000L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          {
+            "Mainnet // First Istanbul block",
+            Network.MAINNET,
+            9069000L,
+            0L,
+            ForkIdTestUtil.wantForkId("0x879d6e30", 9200000L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          {
+            "Mainnet // Last Istanbul block",
+            Network.MAINNET,
+            9199999L,
+            0L,
+            ForkIdTestUtil.wantForkId("0x879d6e30", 9200000L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          {
+            "Mainnet // First Muir Glacier block",
+            Network.MAINNET,
+            9200000L,
+            0L,
+            ForkIdTestUtil.wantForkId("0xe029e991", 12244000L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          {
+            "Mainnet // Last Muir Glacier block",
+            Network.MAINNET,
+            12243999L,
+            0L,
+            ForkIdTestUtil.wantForkId("0xe029e991", 12244000L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          {
+            "Mainnet // First Berlin block",
+            Network.MAINNET,
+            12244000L,
+            0L,
+            ForkIdTestUtil.wantForkId("0x0eb440f6", 12965000L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          {
+            "Mainnet // Last Berlin block",
+            Network.MAINNET,
+            12964999L,
+            0L,
+            ForkIdTestUtil.wantForkId("0x0eb440f6", 12965000L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          {
+            "Mainnet // First London block",
+            Network.MAINNET,
+            12965000L,
+            0L,
+            ForkIdTestUtil.wantForkId("0xb715077d", 13773000L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          {
+            "Mainnet // Last London block",
+            Network.MAINNET,
+            13772999L,
+            0L,
+            ForkIdTestUtil.wantForkId("0xb715077d", 13773000L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          {
+            "Mainnet // First Arrow Glacier block",
+            Network.MAINNET,
+            13773000L,
+            0L,
+            ForkIdTestUtil.wantForkId("0x20c327fc", 15050000L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          {
+            "Mainnet // First Gray Glacier block",
+            Network.MAINNET,
+            15050000L,
+            0L,
+            ForkIdTestUtil.wantForkId("0xf0afd0e3", 0L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          {
+            "Mainnet // Future Gray Glacier block",
+            Network.MAINNET,
+            20000000L,
+            0L,
+            ForkIdTestUtil.wantForkId("0xf0afd0e3", 0L),
+            Optional.of(ForkIds.MAINNET),
+            empty()
+          },
+          // Fork ID test cases with block number and timestamp based forks
+          // Withdrawals test cases
+          {
+            "Mainnet Withdrawals // First Merge Start block",
+            Network.MAINNET_WITH_SHANGHAI,
+            18000000L,
+            0L,
+            ForkIdTestUtil.wantForkId("0x4fb8a872", 1668000000L),
+            Optional.of(ForkIdTestUtil.ForkIds.WITHDRAWALS),
+            empty()
+          },
+          {
+            "Mainnet Withdrawals // Last Merge Start block",
+            Network.MAINNET_WITH_SHANGHAI,
+            20000000L,
+            0L,
+            ForkIdTestUtil.wantForkId("0x4fb8a872", 1668000000L),
+            Optional.of(ForkIdTestUtil.ForkIds.WITHDRAWALS),
+            empty()
+          },
+          {
+            "Mainnet Withdrawals // First Shanghai block",
+            Network.MAINNET_WITH_SHANGHAI,
+            20000000L,
+            1668000000L,
+            ForkIdTestUtil.wantForkId("0xc1fdf181", 0L),
+            Optional.of(ForkIdTestUtil.ForkIds.WITHDRAWALS),
+            empty()
+          },
+          {
+            "Mainnet Withdrawals // Last Shanghai block",
+            Network.MAINNET_WITH_SHANGHAI,
+            20100000L,
+            2669000000L,
+            ForkIdTestUtil.wantForkId("0xc1fdf181", 0L),
+            Optional.of(ForkIdTestUtil.ForkIds.WITHDRAWALS),
+            empty()
+          },
+          // Sepolia test cases
+          {
+            "Sepolia // mergenetsplit block",
+            Network.SEPOLIA,
+            0L,
+            0L,
+            ForkIdTestUtil.wantForkId("0xfe3366e7", 1735371L),
+            Optional.of(ForkIds.SEPOLIA),
+            empty()
+          },
+          {
+            "Sepolia // Shanghai",
+            Network.SEPOLIA,
+            1735371L,
+            0L,
+            ForkIdTestUtil.wantForkId("0xb96cbd13", 1677557088L),
+            Optional.of(ForkIds.SEPOLIA),
+            empty()
+          },
+          {
+            "Sepolia // Future",
+            Network.SEPOLIA,
+            1735372L,
+            1677557088L,
+            ForkIdTestUtil.wantForkId("0xf7f9bc08", 0L),
+            Optional.of(ForkIds.SEPOLIA),
+            empty()
+          },
+          // Goerli test cases
+          {
+            "Goerli  // Unsynced, last Frontier, Homestead, Tangerine, Spurious, Byzantium, Constantinople and first Petersburg block",
+            Network.GOERLI,
+            0L,
+            0L,
+            ForkIdTestUtil.wantForkId("0xa3f5ab08", 1561651L),
+            Optional.of(ForkIds.GOERLI),
+            empty()
+          },
+          {
+            "Goerli // Last Petersburg block",
+            Network.GOERLI,
+            1561650L,
+            0L,
+            ForkIdTestUtil.wantForkId("0xa3f5ab08", 1561651L),
+            Optional.of(ForkIds.GOERLI),
+            empty()
+          },
+          {
+            "Goerli // First Istanbul block",
+            Network.GOERLI,
+            1561651L,
+            0L,
+            ForkIdTestUtil.wantForkId("0xc25efa5c", 0L),
+            Optional.of(ForkIds.GOERLI),
+            empty()
+          },
+          {
+            "Goerli // Future Istanbul block",
+            Network.GOERLI,
+            2000000L,
+            0L,
+            ForkIdTestUtil.wantForkId("0xc25efa5c", 0L),
+            Optional.of(ForkIds.GOERLI),
+            empty()
+          },
+          // Private network test cases
+          {
+            "Private // Unsynced",
+            Network.PRIVATE,
+            0L,
+            0L,
+            ForkIdTestUtil.wantForkId("0x190a55ad", 0L),
+            empty(),
+            empty()
+          },
+          {
+            "Private // First block",
+            Network.PRIVATE,
+            1L,
+            0L,
+            ForkIdTestUtil.wantForkId("0x190a55ad", 0L),
+            empty(),
+            empty()
+          },
+          {
+            "Private // Future block",
+            Network.PRIVATE,
+            1000000L,
+            0L,
+            ForkIdTestUtil.wantForkId("0x190a55ad", 0L),
+            empty(),
+            empty()
+          },
+          // Peer check cases
+          {
+            "check1PetersburgWithRemoteAnnouncingTheSame",
+            Network.MAINNET,
+            7987396L,
+            0L,
+            empty(),
+            empty(),
+            wantPeerCheck("0x668db0af", 0L, true)
+          },
+          {
+            "check2PetersburgWithRemoteAnnouncingTheSameAndNextFork",
+            Network.MAINNET,
+            7987396L,
+            0L,
+            empty(),
+            empty(),
+            wantPeerCheck("0x668db0af", Long.MAX_VALUE, true)
+          },
+          {
+            "check3ByzantiumAwareOfPetersburgRemoteUnawareOfPetersburg",
+            Network.MAINNET,
+            7279999L,
+            0L,
+            empty(),
+            empty(),
+            wantPeerCheck("0xa00bc324", 0L, true)
+          },
+          {
+            "check4ByzantiumAwareOfPetersburgRemoteAwareOfPetersburg",
+            Network.MAINNET,
+            7987396L,
+            0L,
+            empty(),
+            empty(),
+            wantPeerCheck("0xa00bc324", 7280000L, true)
+          },
+          {
+            "check5ByzantiumAwareOfPetersburgRemoteAnnouncingUnknownFork",
+            Network.MAINNET,
+            7279999L,
+            0L,
+            empty(),
+            empty(),
+            wantPeerCheck("0xa00bc324", Long.MAX_VALUE, true)
+          },
+          {
+            "check6PetersburgWithRemoteAnnouncingByzantiumAwareOfPetersburg",
+            Network.MAINNET,
+            7987396L,
+            0L,
+            empty(),
+            empty(),
+            wantPeerCheck("0x668db0af", 7280000L, true)
+          },
+          {
+            "check7PetersburgWithRemoteAnnouncingSpuriousAwareOfByzantiumRemoteMayNeedUpdate",
+            Network.MAINNET,
+            7987396L,
+            0L,
+            empty(),
+            empty(),
+            wantPeerCheck("0x3edd5b10", 4370000L, true)
+          },
+          {
+            "check8ByzantiumWithRemoteAnnouncingPetersburgLocalOutOfSync",
+            Network.MAINNET,
+            727999L,
+            0L,
+            empty(),
+            empty(),
+            wantPeerCheck("0x668db0af", 0L, true)
+          },
+          {
+            "check9SpuriousWithRemoteAnnouncingByzantiumRemoteUnawareOfPetersburg",
+            Network.MAINNET,
+            4369999L,
+            0L,
+            empty(),
+            empty(),
+            wantPeerCheck("0xa00bc324", 0L, true)
+          },
+          {
+            "check10PetersburgWithRemoteAnnouncingByzantiumRemoteUnawareOfAdditionalForks",
+            Network.network(
+                GenesisHash.MAINNET,
+                asList(1150000L, 1920000L, 2463000L, 2675000L, 4370000L, 7280000L),
+                emptyList()),
+            7987396L,
+            0L,
+            empty(),
+            empty(),
+            wantPeerCheck("0xa00bc324", 0L, false)
+          },
+          {
+            "check11PetersburgWithRemoteAnnouncingPetersburgAndFutureForkLocalNeedsUpdate",
+            Network.network(
+                GenesisHash.MAINNET,
+                asList(1150000L, 1920000L, 2463000L, 2675000L, 4370000L, 7280000L),
+                emptyList()),
+            7987396L,
+            0L,
+            empty(),
+            empty(),
+            wantPeerCheck("0x5cddc0e1", 0L, false)
+          },
+          {
+            "check12ByzantiumWithRemoteAnnouncingPetersburgAndFutureForkLocalNeedsUpdate",
+            ForkIdTestUtil.Network.network(
+                GenesisHash.MAINNET,
+                asList(1150000L, 1920000L, 2463000L, 2675000L, 4370000L, 7280000L),
+                emptyList()),
+            7279999L,
+            0L,
+            empty(),
+            empty(),
+            wantPeerCheck("0x5cddc0e1", 0L, false)
+          },
+          // Timestamp based peer check cases adapted from EIP-6122 test cases
+          {
+            "withdrawalsCheck1ShanghaiWithRemoteAnnouncingTheSame",
+            Network.MAINNET_WITH_SHANGHAI,
+            20000000L,
+            1668000001L,
+            empty(),
+            empty(),
+            wantPeerCheck("0xc1fdf181", 0L, true)
+          },
+          {
+            "withdrawalsCheck2ShanghaiWithRemoteAnnouncingSameAndNextFork",
+            Network.MAINNET_WITH_SHANGHAI,
+            20000000L,
+            1668000001L,
+            empty(),
+            empty(),
+            wantPeerCheck("0xc1fdf181", Long.MAX_VALUE, true)
+          },
+          {
+            "withdrawalsCheck3ByzantiumWithRemoteAnnouncingByzantiumNotAwareOfPetersburg",
+            Network.MAINNET_WITH_SHANGHAI,
+            7279999L,
+            1667999999L,
+            empty(),
+            empty(),
+            wantPeerCheck("0xa00bc324", 0L, true)
+          },
+          {
+            "withdrawalsCheck4ByzantiumWithRemoteAnnouncingByzantiumAwareOfPetersburg",
+            Network.MAINNET_WITH_SHANGHAI,
+            7279999L,
+            1667999999L,
+            empty(),
+            empty(),
+            wantPeerCheck("0xa00bc324", 7280000L, true)
+          },
+          {
+            "withdrawalsCheck5ByzantiumWithRemoteAnnouncingByzantiumAwareOfUnknownFork",
+            Network.MAINNET_WITH_SHANGHAI,
+            7279999L,
+            1667999999L,
+            empty(),
+            empty(),
+            wantPeerCheck("0xa00bc324", Long.MAX_VALUE, true)
+          },
+          {
+            "withdrawalsCheck6ExactlyShanghaiWithRemoteAnnouncingByzantiumAwareOfPetersburgRemoteOutOfSync",
+            Network.MAINNET_WITH_SHANGHAI,
+            20000000L,
+            1668000000L,
+            empty(),
+            empty(),
+            wantPeerCheck("0xa00bc324", 7280000L, true)
+          },
+          {
+            "withdrawalsCheck7ShanghaiWithRemoteAnnouncingByzantiumAwareOfPetersburgRemoteOutOfSync",
+            Network.MAINNET_WITH_SHANGHAI,
+            20000000L,
+            1668000001L,
+            empty(),
+            empty(),
+            wantPeerCheck("0xa00bc324", 7280000L, true)
+          },
+          {
+            "withdrawalsCheck8ShanghaiWithRemoteAnnouncingSpuriousAwareOfByzantium",
+            Network.MAINNET_WITH_SHANGHAI,
+            20000000L,
+            1668000001L,
+            empty(),
+            empty(),
+            wantPeerCheck("0x3edd5b10", 4370000, true)
+          },
+          {
+            "withdrawalsCheck9ByzantiumWithRemoteAnnouncingPetersburgLocalOutOfSync",
+            Network.MAINNET_WITH_SHANGHAI,
+            7279999L,
+            1667999999L,
+            empty(),
+            empty(),
+            wantPeerCheck("0x668db0af", 4370000, true)
+          },
+          {
+            "withdrawalsCheck10SpuriousWithRemoteAnnouncingByzantiumNotAwareOfPetersburgLocalOutOfSync",
+            Network.MAINNET_WITH_SHANGHAI,
+            4369999L,
+            1667999999L,
+            empty(),
+            empty(),
+            wantPeerCheck("0xa00bc324", 0L, true)
+          },
+          {
+            "withdrawalsCheck11ShanghaiWithRemoteAnnouncingByzantiumUnawareOfAdditionalForksRemoteNeedsUpdate",
+            Network.MAINNET_WITH_SHANGHAI,
+            20000000L,
+            1668000001L,
+            empty(),
+            empty(),
+            wantPeerCheck("0xa00bc324", 0L, false)
+          },
+          {
+            "withdrawalsCheck12ShanghaiAndNotAwareOfAdditionalForksWithRemoteAnnouncingPetersburgAndUnknownFork",
+            Network.MAINNET_WITH_SHANGHAI,
+            20000000L,
+            1668000001L,
+            empty(),
+            empty(),
+            wantPeerCheck("0x5cddc0e1", 0L, false)
+          },
+          {
+            "withdrawalsCheck14ShanghaiWithRemoteAnnouncingUnknownFork",
+            Network.MAINNET_WITH_SHANGHAI,
+            88888888L,
+            1668000001L,
+            empty(),
+            empty(),
+            wantPeerCheck("0xf0afd0e3", 88888888L, false)
+          },
+          {
+            "withdrawalsCheck15ShanghaiWithRemoteInByzantiumAnnouncingUnknownFork",
+            Network.MAINNET_WITH_SHANGHAI,
+            88888888L,
+            1668000001L,
+            empty(),
+            empty(),
+            wantPeerCheck("0xa00bc324", 7279999L, false)
+          }
+        });
+  }
+
+  private final String name;
+  private final Network network;
+  private final long head;
+  private final long time;
+  private final Optional<ForkId> wantForkId;
+  private final Optional<List<ForkId>> wantForkIds;
+  private final Optional<PeerCheckCase> wantPeerCheckCase;
+
+  @Test
+  public void test() {
+    LOG.info("Running test case {}", name);
+    final ForkIdManager forkIdManager =
+        new ForkIdManager(
+            mockBlockchain(network.hash, head, time),
+            network.blockForks,
+            network.timestampForks,
+            false);
+    wantForkId.ifPresent(
+        forkId -> assertThat(forkIdManager.getForkIdForChainHead()).isEqualTo(forkId));
+    wantForkIds.ifPresent(
+        forkIds -> assertThat(forkIdManager.getAllForkIds()).containsExactlyElementsOf(forkIds));
+    wantPeerCheckCase.ifPresent(
+        peerCheckCase ->
+            assertThat(
+                    forkIdManager.peerCheck(
+                        new ForkId(
+                            Bytes.fromHexString(peerCheckCase.forkIdHash),
+                            peerCheckCase.forkIdNext)))
+                .isEqualTo(peerCheckCase.want));
+  }
+
+  public ForkIdTest(
+      final String name,
+      final ForkIdTestUtil.Network network,
+      final long head,
+      final long time,
+      final Optional<ForkId> wantForkId,
+      final Optional<List<ForkId>> wantForkIds,
+      final Optional<PeerCheckCase> wantPeerCheckCase) {
+    this.name = name;
+    this.network = network;
+    this.head = head;
+    this.time = time;
+    this.wantForkId = wantForkId;
+    this.wantForkIds = wantForkIds;
+    this.wantPeerCheckCase = wantPeerCheckCase;
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/forkid/ForkIdTestUtil.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/forkid/ForkIdTestUtil.java
new file mode 100644
index 00000000000..d88d0fcd027
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/forkid/ForkIdTestUtil.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.forkid;
+
+import static java.util.Collections.emptyList;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.LongSupplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import com.google.common.collect.Streams;
+import org.apache.tuweni.bytes.Bytes;
+
+public class ForkIdTestUtil {
+
+  public static Blockchain mockBlockchain(
+      final String genesisHash, final long chainHeight, final long timestamp) {
+    return mockBlockchain(genesisHash, () -> chainHeight, timestamp);
+  }
+
+  public static Blockchain mockBlockchain(
+      final String genesisHash, final LongSupplier chainHeightSupplier, final long timestamp) {
+    final Blockchain mockchain = mock(Blockchain.class);
+    final BlockHeader mockHeader = mock(BlockHeader.class);
+    final Block block = new Block(mockHeader, null);
+    final BlockHeader mockChainHeadHeader = mock(BlockHeader.class);
+    when(mockchain.getGenesisBlock()).thenReturn(block);
+    when(mockchain.getChainHeadBlockNumber()).thenReturn(chainHeightSupplier.getAsLong());
+    when(mockHeader.getHash()).thenReturn(Hash.fromHexString(genesisHash));
+    when(mockchain.getChainHeadHeader()).thenReturn(mockChainHeadHeader);
+    when(mockChainHeadHeader.getNumber()).thenReturn(chainHeightSupplier.getAsLong());
+    when(mockChainHeadHeader.getTimestamp()).thenReturn(timestamp);
+    return mockchain;
+  }
+
+  public static class GenesisHash {
+    public static final String MAINNET =
+        "0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3";
+    public static final String SEPOLIA =
+        "0x25a5cc106eea7138acab33231d7160d69cb777ee0c2c553fcddf5138993e6dd9";
+    public static final String GOERLI =
+        "0xbf7e331f7f7c1dd2e05159666b3bf8bc7a8a3a9eb1d518969eab529dd9b88c1a";
+    public static final String PRIVATE =
+        "0x0000000000000000000000000000000000000000000000000000000000000000";
+  }
+
+  public static class Forks {
+    public static final List<Long> MAINNET =
+        Arrays.asList(
+            1920000L, 1150000L, 2463000L, 2675000L, 2675000L, 4370000L, 7280000L, 7280000L,
+            9069000L, 9200000L, 12244000L, 12965000L, 13773000L, 15050000L);
+    public static final List<Long> SEPOLIA_BLOCKNUMBERS =
+        Arrays.asList(0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 1735371L);
+
+    public static final List<Long> SEPOLIA_TIMESTAMPS = Arrays.asList(1677557088L);
+
+    public static final List<Long> GOERLI = Arrays.asList(0L, 0L, 0L, 0L, 0L, 0L, 0L, 1561651L);
+    public static final List<Long> PRIVATE = Arrays.asList(0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L);
+
+    public static final List<Long> MAINNET_WITH_SHANGHAI_BLOCKS =
+        Streams.concat(MAINNET.stream(), Stream.of(18000000L)).collect(Collectors.toList());
+
+    public static final List<Long> MAINNET_WITH_SHANGHAI_TIMESTAMPS = List.of(1668000000L);
+  }
+
+  public static class ForkIds {
+    public static final List<ForkId> MAINNET =
+        Arrays.asList(
+            new ForkId(
+                Bytes.fromHexString("0xfc64ec04"), 1150000L), // Unsynced / last Frontier block
+            new ForkId(Bytes.fromHexString("0x97c2c34c"), 1920000L), // First Homestead block
+            new ForkId(Bytes.fromHexString("0x91d1f948"), 2463000L), // First DAO block
+            new ForkId(Bytes.fromHexString("0x7a64da13"), 2675000L), // First Tangerine block
+            new ForkId(Bytes.fromHexString("0x3edd5b10"), 4370000L), // First Spurious block
+            new ForkId(Bytes.fromHexString("0xa00bc324"), 7280000L), // First Byzantium block
+            new ForkId(Bytes.fromHexString("0x668db0af"), 9069000L), // First Petersburg block
+            new ForkId(Bytes.fromHexString("0x879d6e30"), 9200000L), // First Istanbul block
+            new ForkId(Bytes.fromHexString("0xe029e991"), 12244000L), // First Muir Glacier block
+            new ForkId(Bytes.fromHexString("0x0eb440f6"), 12965000L), // First Berlin block
+            new ForkId(Bytes.fromHexString("0xb715077d"), 13773000L), // First London block
+            new ForkId(Bytes.fromHexString("0x20c327fc"), 15050000L), // First Arrow Glacier block
+            new ForkId(Bytes.fromHexString("0xf0afd0e3"), 0L)); // First Gray Glacier block
+    public static final List<ForkId> SEPOLIA =
+        Arrays.asList(
+            new ForkId(Bytes.fromHexString("0xfe3366e7"), 1735371L),
+            new ForkId(Bytes.fromHexString("0xb96cbd13"), 1677557088L),
+            new ForkId(Bytes.fromHexString("0xf7f9bc08"), 0L)); // First Shanghai block (timestamp)
+    public static final List<ForkId> GOERLI =
+        Arrays.asList(
+            new ForkId(Bytes.fromHexString("0xa3f5ab08"), 1561651L),
+            new ForkId(Bytes.fromHexString("0xc25efa5c"), 0L));
+
+    public static final List<ForkId> WITHDRAWALS =
+        Arrays.asList(
+            new ForkId(
+                Bytes.fromHexString("0xfc64ec04"), 1150000L), // Unsynced / last Frontier block
+            new ForkId(Bytes.fromHexString("0x97c2c34c"), 1920000L), // First Homestead block
+            new ForkId(Bytes.fromHexString("0x91d1f948"), 2463000L), // First DAO block
+            new ForkId(Bytes.fromHexString("0x7a64da13"), 2675000L), // First Tangerine block
+            new ForkId(Bytes.fromHexString("0x3edd5b10"), 4370000L), // First Spurious block
+            new ForkId(Bytes.fromHexString("0xa00bc324"), 7280000L), // First Byzantium block
+            new ForkId(Bytes.fromHexString("0x668db0af"), 9069000L), // First Petersburg block
+            new ForkId(Bytes.fromHexString("0x879d6e30"), 9200000L), // First Istanbul block
+            new ForkId(Bytes.fromHexString("0xe029e991"), 12244000L), // First Muir Glacier block
+            new ForkId(Bytes.fromHexString("0x0eb440f6"), 12965000L), // First Berlin block
+            new ForkId(Bytes.fromHexString("0xb715077d"), 13773000L), // First London block
+            new ForkId(Bytes.fromHexString("0x20c327fc"), 15050000L), // First Arrow Glacier block
+            new ForkId(Bytes.fromHexString("0xf0afd0e3"), 18000000L), // First Arrow Glacier block
+            new ForkId(Bytes.fromHexString("0x4fb8a872"), 1668000000L), // First Merge Start block
+            new ForkId(Bytes.fromHexString("0xc1fdf181"), 0L) // First Shanghai block
+            );
+  }
+
+  public static class Network {
+    public static final Network MAINNET = network(GenesisHash.MAINNET, Forks.MAINNET, emptyList());
+    public static final Network SEPOLIA =
+        network(GenesisHash.SEPOLIA, Forks.SEPOLIA_BLOCKNUMBERS, Forks.SEPOLIA_TIMESTAMPS);
+    public static final Network GOERLI = network(GenesisHash.GOERLI, Forks.GOERLI, emptyList());
+    public static final Network PRIVATE = network(GenesisHash.PRIVATE, Forks.PRIVATE, emptyList());
+
+    public static final Network MAINNET_WITH_SHANGHAI =
+        network(
+            GenesisHash.MAINNET,
+            Forks.MAINNET_WITH_SHANGHAI_BLOCKS,
+            Forks.MAINNET_WITH_SHANGHAI_TIMESTAMPS);
+
+    public final String hash;
+    public final List<Long> blockForks;
+    public final List<Long> timestampForks;
+
+    public Network(
+        final String hash, final List<Long> blockForks, final List<Long> timestampForks) {
+      this.hash = hash;
+      this.blockForks = blockForks;
+      this.timestampForks = timestampForks;
+    }
+
+    public static Network network(
+        final String hash, final List<Long> blockForks, final List<Long> timestampForks) {
+      return new Network(hash, blockForks, timestampForks);
+    }
+  }
+
+  public static class PeerCheckCase {
+    public final String forkIdHash;
+    public final long forkIdNext;
+    public final boolean want;
+
+    public PeerCheckCase(final String forkIdHash, final long forkIdNext, final boolean want) {
+      this.forkIdHash = forkIdHash;
+      this.forkIdNext = forkIdNext;
+      this.want = want;
+    }
+  }
+
+  public static ForkId forkId(final String hash, final long next) {
+    return new ForkId(Bytes.fromHexString(hash), next);
+  }
+
+  public static Optional<ForkId> wantForkId(final String hash, final long next) {
+    return Optional.of(forkId(hash, next));
+  }
+
+  public static Optional<PeerCheckCase> wantPeerCheck(
+      final String hash, final long next, final boolean want) {
+    return Optional.of(new PeerCheckCase(hash, next, want));
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/LegacyForkIdManager.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/forkid/LegacyForkIdManager.java
similarity index 95%
rename from ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/LegacyForkIdManager.java
rename to ethereum/core/src/test/java/org/hyperledger/besu/ethereum/forkid/LegacyForkIdManager.java
index e3404196ceb..325fd41c812 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/LegacyForkIdManager.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/forkid/LegacyForkIdManager.java
@@ -12,11 +12,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.eth;
+package org.hyperledger.besu.ethereum.forkid;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.eth.manager.ForkId;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 
 import java.util.ArrayList;
@@ -38,7 +37,7 @@ public LegacyForkIdManager(final Blockchain blockchain, final List<Long> forks)
     this.forks =
         forks.stream().filter(fork -> fork > 0).distinct().collect(Collectors.toUnmodifiableList());
     createForkIds();
-  };
+  }
 
   public List<ForkId> getForkAndHashList() {
     return this.forkAndHashList;
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/AbstractBlockProcessorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/AbstractBlockProcessorTest.java
new file mode 100644
index 00000000000..867bfeb7e5f
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/AbstractBlockProcessorTest.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyMap;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.GWei;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+import org.hyperledger.besu.ethereum.referencetests.ReferenceTestBlockchain;
+import org.hyperledger.besu.ethereum.referencetests.ReferenceTestWorldState;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.units.bigints.UInt64;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+abstract class AbstractBlockProcessorTest {
+
+  @Mock private MainnetTransactionProcessor transactionProcessor;
+  @Mock private AbstractBlockProcessor.TransactionReceiptFactory transactionReceiptFactory;
+  @Mock private ProtocolSchedule protocolSchedule;
+  @Mock private ProtocolSpec protocolSpec;
+  @Mock private WithdrawalsProcessor withdrawalsProcessor;
+
+  final Blockchain blockchain = new ReferenceTestBlockchain();
+  final MutableWorldState worldState = ReferenceTestWorldState.create(emptyMap());
+  final BlockHeader emptyBlockHeader =
+      new BlockHeaderTestFixture()
+          .transactionsRoot(Hash.EMPTY_LIST_HASH)
+          .ommersHash(Hash.EMPTY_LIST_HASH)
+          .buildHeader();
+  private TestBlockProcessor blockProcessor;
+
+  @BeforeEach
+  void baseSetup() {
+    lenient().when(protocolSchedule.getByBlockHeader(any())).thenReturn(protocolSpec);
+    blockProcessor =
+        new TestBlockProcessor(
+            transactionProcessor,
+            transactionReceiptFactory,
+            Wei.ZERO,
+            BlockHeader::getCoinbase,
+            true,
+            protocolSchedule);
+  }
+
+  @Test
+  void withProcessorAndEmptyWithdrawals_WithdrawalsAreNotProcessed() {
+    when(protocolSpec.getWithdrawalsProcessor()).thenReturn(Optional.empty());
+    blockProcessor.processBlock(
+        blockchain,
+        worldState,
+        emptyBlockHeader,
+        emptyList(),
+        emptyList(),
+        Optional.empty(),
+        Optional.empty(),
+        null);
+    verify(withdrawalsProcessor, never()).processWithdrawals(any(), any());
+  }
+
+  @Test
+  void withNoProcessorAndEmptyWithdrawals_WithdrawalsAreNotProcessed() {
+    when(protocolSpec.getWithdrawalsProcessor()).thenReturn(Optional.empty());
+    blockProcessor.processBlock(
+        blockchain,
+        worldState,
+        emptyBlockHeader,
+        emptyList(),
+        emptyList(),
+        Optional.empty(),
+        Optional.empty(),
+        null);
+    verify(withdrawalsProcessor, never()).processWithdrawals(any(), any());
+  }
+
+  @Test
+  void withProcessorAndWithdrawals_WithdrawalsAreProcessed() {
+    when(protocolSpec.getWithdrawalsProcessor()).thenReturn(Optional.of(withdrawalsProcessor));
+    final List<Withdrawal> withdrawals =
+        List.of(new Withdrawal(UInt64.ONE, UInt64.ONE, Address.fromHexString("0x1"), GWei.ONE));
+    blockProcessor.processBlock(
+        blockchain,
+        worldState,
+        emptyBlockHeader,
+        emptyList(),
+        emptyList(),
+        Optional.of(withdrawals),
+        Optional.empty(),
+        null);
+    verify(withdrawalsProcessor).processWithdrawals(eq(withdrawals), any());
+  }
+
+  @Test
+  void withNoProcessorAndWithdrawals_WithdrawalsAreNotProcessed() {
+    when(protocolSpec.getWithdrawalsProcessor()).thenReturn(Optional.empty());
+
+    final List<Withdrawal> withdrawals =
+        List.of(new Withdrawal(UInt64.ONE, UInt64.ONE, Address.fromHexString("0x1"), GWei.ONE));
+    blockProcessor.processBlock(
+        blockchain,
+        worldState,
+        emptyBlockHeader,
+        emptyList(),
+        emptyList(),
+        Optional.of(withdrawals),
+        Optional.empty(),
+        null);
+    verify(withdrawalsProcessor, never()).processWithdrawals(any(), any());
+  }
+
+  private static class TestBlockProcessor extends AbstractBlockProcessor {
+
+    protected TestBlockProcessor(
+        final MainnetTransactionProcessor transactionProcessor,
+        final TransactionReceiptFactory transactionReceiptFactory,
+        final Wei blockReward,
+        final MiningBeneficiaryCalculator miningBeneficiaryCalculator,
+        final boolean skipZeroBlockRewards,
+        final ProtocolSchedule protocolSchedule) {
+      super(
+          transactionProcessor,
+          transactionReceiptFactory,
+          blockReward,
+          miningBeneficiaryCalculator,
+          skipZeroBlockRewards,
+          protocolSchedule);
+    }
+
+    @Override
+    boolean rewardCoinbase(
+        final MutableWorldState worldState,
+        final BlockHeader header,
+        final List<BlockHeader> ommers,
+        final boolean skipZeroBlockRewards) {
+      return false;
+    }
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/BaseFeeBlockBodyValidatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/BaseFeeBlockBodyValidatorTest.java
new file mode 100644
index 00000000000..a8ad3424f0f
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/BaseFeeBlockBodyValidatorTest.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.plugin.data.TransactionType;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class BaseFeeBlockBodyValidatorTest {
+
+  private static final KeyPair keyPair = SignatureAlgorithmFactory.getInstance().generateKeyPair();
+
+  @Mock ProtocolSpec protocolSpec;
+  @Mock ProtocolSchedule protocolSchedule;
+  @Mock Block block;
+  @Mock BlockHeader blockHeader;
+
+  BaseFeeBlockBodyValidator blockBodyValidator;
+
+  @Before
+  public void setup() {
+    when(protocolSpec.getFeeMarket()).thenReturn(FeeMarket.london(0L));
+
+    when(protocolSchedule.getByBlockHeader(any())).thenReturn(protocolSpec);
+
+    when(block.getHeader()).thenReturn(blockHeader);
+
+    blockBodyValidator = new BaseFeeBlockBodyValidator(protocolSchedule);
+  }
+
+  @Test
+  public void BlockBodyValidatorSucceed() {
+    when(blockHeader.getBaseFee()).thenReturn(Optional.of(Wei.of(10L)));
+    when(block.getBody())
+        .thenReturn(
+            new BlockBody(
+                List.of(
+                    // eip1559 transaction
+                    new TransactionTestFixture()
+                        .maxFeePerGas(Optional.of(Wei.of(10L)))
+                        .maxPriorityFeePerGas(Optional.of(Wei.of(1L)))
+                        .type(TransactionType.EIP1559)
+                        .createTransaction(keyPair),
+                    // frontier transaction
+                    new TransactionTestFixture().gasPrice(Wei.of(10L)).createTransaction(keyPair)),
+                Collections.emptyList()));
+
+    assertThat(blockBodyValidator.validateTransactionGasPrice(block)).isTrue();
+  }
+
+  @Test
+  public void BlockBodyValidatorFail_GasPrice() {
+    when(blockHeader.getBaseFee()).thenReturn(Optional.of(Wei.of(10L)));
+    when(block.getBody())
+        .thenReturn(
+            new BlockBody(
+                List.of(
+                    // underpriced frontier transaction
+                    new TransactionTestFixture().gasPrice(Wei.of(9L)).createTransaction(keyPair)),
+                Collections.emptyList()));
+
+    assertThat(blockBodyValidator.validateTransactionGasPrice(block)).isFalse();
+  }
+
+  @Test
+  public void BlockBodyValidatorFail_MaxFeePerGas() {
+    when(blockHeader.getBaseFee()).thenReturn(Optional.of(Wei.of(10L)));
+    when(block.getBody())
+        .thenReturn(
+            new BlockBody(
+                List.of(
+                    // underpriced eip1559 transaction
+                    new TransactionTestFixture()
+                        .maxFeePerGas(Optional.of(Wei.of(1L)))
+                        .maxPriorityFeePerGas(Optional.of(Wei.of(10L)))
+                        .type(TransactionType.EIP1559)
+                        .createTransaction(keyPair)),
+                Collections.emptyList()));
+
+    assertThat(blockBodyValidator.validateTransactionGasPrice(block)).isFalse();
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/BodyValidationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/BodyValidationTest.java
index 8e33b2b95bf..9e2876e7fb7 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/BodyValidationTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/BodyValidationTest.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 
@@ -46,4 +47,24 @@ public void calculateOmmersHash() throws IOException {
       Assertions.assertThat(header.getOmmersHash()).isEqualTo(ommersHash);
     }
   }
+
+  @Test
+  public void calculateWithdrawalsRoot() throws IOException {
+    for (final int block : Arrays.asList(4156, 12691)) {
+      final BlockHeader header = ValidationTestUtils.readHeader(block);
+      final BlockBody body = ValidationTestUtils.readBody(block);
+      final Bytes32 withdrawalsRoot = BodyValidation.withdrawalsRoot(body.getWithdrawals().get());
+      Assertions.assertThat(header.getWithdrawalsRoot()).hasValue(Hash.wrap(withdrawalsRoot));
+    }
+  }
+
+  @Test
+  public void calculateDepositsRoot() throws IOException {
+    for (final int block : Arrays.asList(123, 124)) {
+      final BlockHeader header = ValidationTestUtils.readHeader(block);
+      final BlockBody body = ValidationTestUtils.readBody(block);
+      final Bytes32 depositsRoot = BodyValidation.depositsRoot(body.getDeposits().get());
+      Assertions.assertThat(header.getDepositsRoot()).hasValue(Hash.wrap(depositsRoot));
+    }
+  }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/DefaultProtocolScheduleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/DefaultProtocolScheduleTest.java
new file mode 100644
index 00000000000..4d86f9070cf
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/DefaultProtocolScheduleTest.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.mainnet;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+
+import org.hyperledger.besu.config.StubGenesisConfigOptions;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+
+import java.math.BigInteger;
+import java.util.Optional;
+import java.util.function.Function;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Before;
+import org.junit.Test;
+
+public class DefaultProtocolScheduleTest {
+
+  private static final Optional<BigInteger> CHAIN_ID = Optional.of(BigInteger.ONE);
+  private static final BigInteger DEFAULT_CHAIN_ID = BigInteger.ONE;
+  private static final PrivacyParameters privacyParameters = new PrivacyParameters();
+  private static final EvmConfiguration evmConfiguration = EvmConfiguration.DEFAULT;
+  private ProtocolScheduleBuilder builder;
+  private StubGenesisConfigOptions config;
+
+  private final Function<ProtocolSpecBuilder, ProtocolSpecBuilder> modifier = Function.identity();
+
+  private final long FIRST_TIMESTAMP_FORK = 9991L;
+
+  @Before
+  public void setup() {
+    config = new StubGenesisConfigOptions();
+    config.chainId(DEFAULT_CHAIN_ID);
+    boolean isRevertReasonEnabled = false;
+    builder =
+        new ProtocolScheduleBuilder(
+            config,
+            DEFAULT_CHAIN_ID,
+            ProtocolSpecAdapters.create(FIRST_TIMESTAMP_FORK, modifier),
+            privacyParameters,
+            isRevertReasonEnabled,
+            evmConfiguration);
+  }
+
+  @Test
+  public void emptySchedule() {
+    final BlockHeader blockHeader = new BlockHeaderTestFixture().number(0L).buildHeader();
+    Assertions.assertThatThrownBy(
+            () -> new DefaultProtocolSchedule(CHAIN_ID).getByBlockHeader(blockHeader))
+        .hasMessage("At least 1 milestone must be provided to the protocol schedule");
+  }
+
+  @Test
+  public void conflictingSchedules() {
+    final ProtocolSpec spec1 = mock(ProtocolSpec.class);
+    final ProtocolSpec spec2 = mock(ProtocolSpec.class);
+
+    final DefaultProtocolSchedule protocolSchedule = new DefaultProtocolSchedule(CHAIN_ID);
+    protocolSchedule.putBlockNumberMilestone(0, spec1);
+    protocolSchedule.putBlockNumberMilestone(0, spec2);
+    assertThat(protocolSchedule.getByBlockHeader(header(0, 1L))).isSameAs(spec2);
+  }
+
+  @Test
+  public void given_conflictingTimestampSchedules_lastMilestoneOverwritesPrevious() {
+    final ProtocolSpec spec1 = mock(ProtocolSpec.class);
+    final ProtocolSpec spec2 = mock(ProtocolSpec.class);
+    final ProtocolSpec spec3 = mock(ProtocolSpec.class);
+
+    final DefaultProtocolSchedule protocolSchedule = new DefaultProtocolSchedule(CHAIN_ID);
+    protocolSchedule.putTimestampMilestone(0, spec1);
+    protocolSchedule.putTimestampMilestone(10, spec2);
+    protocolSchedule.putTimestampMilestone(10, spec3);
+    assertThat(protocolSchedule.getByBlockHeader(header(0, 10L))).isSameAs(spec3);
+  }
+
+  @Test
+  public void given_conflictingBlockNumberAndTimestampSchedules_lastMilestoneOverwritesPrevious() {
+    final ProtocolSpec spec1 = mock(ProtocolSpec.class);
+    final ProtocolSpec spec2 = mock(ProtocolSpec.class);
+    final ProtocolSpec spec3 = mock(ProtocolSpec.class);
+
+    final DefaultProtocolSchedule protocolSchedule = new DefaultProtocolSchedule(CHAIN_ID);
+    protocolSchedule.putBlockNumberMilestone(0, spec1);
+    protocolSchedule.putBlockNumberMilestone(10, spec2);
+    protocolSchedule.putTimestampMilestone(10, spec3);
+    assertThat(protocolSchedule.getByBlockHeader(header(10, 10L))).isSameAs(spec3);
+  }
+
+  @Test
+  public void getByBlockHeader_getLatestTimestampFork() {
+    config.grayGlacierBlock(0);
+    config.shanghaiTime(FIRST_TIMESTAMP_FORK);
+    config.cancunTime(FIRST_TIMESTAMP_FORK + 2);
+    final ProtocolSchedule schedule = builder.createProtocolSchedule();
+
+    assertThat(schedule.getByBlockHeader(header(2, FIRST_TIMESTAMP_FORK + 2)).getName())
+        .isEqualTo("Cancun");
+    assertThat(schedule.getByBlockHeader(header(3, FIRST_TIMESTAMP_FORK + 3)).getName())
+        .isEqualTo("Cancun");
+  }
+
+  @Test
+  public void getByBlockHeader_getIntermediateTimestampFork() {
+    config.grayGlacierBlock(0);
+    config.shanghaiTime(FIRST_TIMESTAMP_FORK);
+    config.cancunTime(FIRST_TIMESTAMP_FORK + 2);
+    final ProtocolSchedule schedule = builder.createProtocolSchedule();
+
+    assertThat(schedule.getByBlockHeader(header(2, FIRST_TIMESTAMP_FORK)).getName())
+        .isEqualTo("Shanghai");
+    assertThat(schedule.getByBlockHeader(header(3, FIRST_TIMESTAMP_FORK + 1)).getName())
+        .isEqualTo("Shanghai");
+  }
+
+  @Test
+  public void getByBlockHeader_getLatestBlockNumberFork() {
+    config.londonBlock(0);
+    config.grayGlacierBlock(100);
+    config.shanghaiTime(9992L);
+    final ProtocolSchedule schedule = builder.createProtocolSchedule();
+
+    assertThat(schedule.getByBlockHeader(header(100, 8881L)).getName()).isEqualTo("GrayGlacier");
+    assertThat(schedule.getByBlockHeader(header(200, 9991L)).getName()).isEqualTo("GrayGlacier");
+  }
+
+  @Test
+  public void getByBlockHeader_getIntermediateBlockNumberFork() {
+    config.berlinBlock(0);
+    config.londonBlock(50);
+    config.grayGlacierBlock(100);
+    config.shanghaiTime(9992L);
+    final ProtocolSchedule schedule = builder.createProtocolSchedule();
+
+    assertThat(schedule.getByBlockHeader(header(99, 8881L)).getName()).isEqualTo("London");
+  }
+
+  @Test
+  public void getByBlockHeader_getLatestBlockNumberForkWhenNoTimestampForks() {
+    config.magneto(0);
+    config.mystique(100);
+    final ProtocolSchedule schedule = builder.createProtocolSchedule();
+
+    assertThat(schedule.getByBlockHeader(header(100, Long.MAX_VALUE)).getName())
+        .isEqualTo("Mystique");
+    assertThat(schedule.getByBlockHeader(header(200, Long.MAX_VALUE)).getName())
+        .isEqualTo("Mystique");
+  }
+
+  @Test
+  public void getForNextBlockHeader_shouldGetHeaderForNextBlockNumber() {
+    final ProtocolSpec spec1 = mock(ProtocolSpec.class);
+    final ProtocolSpec spec2 = mock(ProtocolSpec.class);
+
+    final DefaultProtocolSchedule protocolSchedule = new DefaultProtocolSchedule(CHAIN_ID);
+    protocolSchedule.putBlockNumberMilestone(0, spec1);
+    protocolSchedule.putBlockNumberMilestone(10, spec2);
+
+    final BlockHeader blockHeader =
+        new BlockHeaderTestFixture().number(10L).timestamp(1L).buildHeader();
+    final BlockHeader blockHeaderSpy = spy(blockHeader);
+    final ProtocolSpec spec = protocolSchedule.getForNextBlockHeader(blockHeaderSpy, 2L);
+
+    assertThat(spec).isEqualTo(spec2);
+  }
+
+  @Test
+  public void getForNextBlockHeader_shouldGetHeaderForNextTimestamp() {
+    final ProtocolSpec spec1 = mock(ProtocolSpec.class);
+    final ProtocolSpec spec2 = mock(ProtocolSpec.class);
+
+    final DefaultProtocolSchedule protocolSchedule = new DefaultProtocolSchedule(CHAIN_ID);
+    protocolSchedule.putBlockNumberMilestone(0, spec1);
+    protocolSchedule.putTimestampMilestone(9992, spec2);
+
+    final BlockHeader blockHeader =
+        new BlockHeaderTestFixture().number(1001L).timestamp(9991L).buildHeader();
+    final BlockHeader blockHeaderSpy = spy(blockHeader);
+    final ProtocolSpec spec = protocolSchedule.getForNextBlockHeader(blockHeaderSpy, 9992L);
+
+    assertThat(spec).isEqualTo(spec2);
+  }
+
+  @Test
+  public void isOnMilestoneBoundary() {
+    config.berlinBlock(1L);
+    config.londonBlock(2L);
+    config.mergeNetSplitBlock(4L);
+    config.shanghaiTime(FIRST_TIMESTAMP_FORK);
+    config.cancunTime(9992L);
+    config.experimentalEipsTime(9994L);
+    final ProtocolSchedule protocolSchedule = builder.createProtocolSchedule();
+
+    assertThat(protocolSchedule.isOnMilestoneBoundary(header(0L, 0L))).isEqualTo(true);
+
+    // blockNumber schedule
+    assertThat(protocolSchedule.isOnMilestoneBoundary(header(0L, 8880L))).isEqualTo(true);
+    assertThat(protocolSchedule.isOnMilestoneBoundary(header(1L, 8881L))).isEqualTo(true);
+    assertThat(protocolSchedule.isOnMilestoneBoundary(header(2L, 8882L))).isEqualTo(true);
+    assertThat(protocolSchedule.isOnMilestoneBoundary(header(3L, 8883L))).isEqualTo(false);
+    assertThat(protocolSchedule.isOnMilestoneBoundary(header(4L, 8884L))).isEqualTo(true);
+
+    // timestamp schedule
+    assertThat(protocolSchedule.isOnMilestoneBoundary(header(10L, FIRST_TIMESTAMP_FORK)))
+        .isEqualTo(true);
+    assertThat(protocolSchedule.isOnMilestoneBoundary(header(12L, 9992L))).isEqualTo(true);
+    assertThat(protocolSchedule.isOnMilestoneBoundary(header(13L, 9993L))).isEqualTo(false);
+    assertThat(protocolSchedule.isOnMilestoneBoundary(header(14L, 9994L))).isEqualTo(true);
+  }
+
+  private BlockHeader header(final long number, final long timestamp) {
+    return new BlockHeaderTestFixture().number(number).timestamp(timestamp).buildHeader();
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/DepositsValidatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/DepositsValidatorTest.java
new file mode 100644
index 00000000000..09bd5a110b7
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/DepositsValidatorTest.java
@@ -0,0 +1,300 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.mainnet;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.BLSPublicKey;
+import org.hyperledger.besu.datatypes.BLSSignature;
+import org.hyperledger.besu.datatypes.GWei;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.Deposit;
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.log.LogTopic;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt64;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+public class DepositsValidatorTest {
+  private final BlockDataGenerator blockDataGenerator = new BlockDataGenerator();
+  private static Deposit DEPOSIT_1;
+  private static Deposit DEPOSIT_2;
+  private static Log LOG_1;
+  private static Log LOG_2;
+  private static Address DEPOSIT_CONTRACT_ADDRESS;
+
+  @BeforeAll
+  public static void setup() {
+    DEPOSIT_1 =
+        new Deposit(
+            BLSPublicKey.fromHexString(
+                "0xb10a4a15bf67b328c9b101d09e5c6ee6672978fdad9ef0d9e2ceffaee99223555d8601f0cb3bcc4ce1af9864779a416e"),
+            Bytes32.fromHexString(
+                "0x0017a7fcf06faf493d30bbe2632ea7c2383cd86825e12797165de7aa35589483"),
+            GWei.of(32000000000L),
+            BLSSignature.fromHexString(
+                "0xa889db8300194050a2636c92a95bc7160515867614b7971a9500cdb62f9c0890217d2901c3241f86fac029428fc106930606154bd9e406d7588934a5f15b837180b17194d6e44bd6de23e43b163dfe12e369dcc75a3852cd997963f158217eb5"),
+            UInt64.valueOf(539967));
+
+    DEPOSIT_2 =
+        new Deposit(
+            BLSPublicKey.fromHexString(
+                "0x8706d19a62f28a6a6549f96c5adaebac9124a61d44868ec94f6d2d707c6a2f82c9162071231dfeb40e24bfde4ffdf243"),
+            Bytes32.fromHexString(
+                "0x006a8dc800c6d8dd6977ef53264e2d030350f0145a91bcd167b4f1c3ea21b271"),
+            GWei.of(32000000000L),
+            BLSSignature.fromHexString(
+                "0x801b08ca107b623eca32ee9f9111b4e50eb9cfe19e38204b72de7dc04c5a5e00f61bab96f10842576f66020ce851083f1583dd9a6b73301bea6c245cf51f27cf96aeb018852c5f70bf485d16b957cfe49ca008913346b431e7653ae3ddb23b07"),
+            UInt64.valueOf(559887));
+
+    LOG_1 =
+        new Log(
+            Address.fromHexString("0x00000000219ab540356cbb839cbe05303d7705fa"),
+            Bytes.fromHexString(
+                "0x00000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000030b10a4a15bf67b328c9b101d09e5c6ee6672978fdad9ef0d9e2ceffaee99223555d8601f0cb3bcc4ce1af9864779a416e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200017a7fcf06faf493d30bbe2632ea7c2383cd86825e12797165de7aa35589483000000000000000000000000000000000000000000000000000000000000000800405973070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060a889db8300194050a2636c92a95bc7160515867614b7971a9500cdb62f9c0890217d2901c3241f86fac029428fc106930606154bd9e406d7588934a5f15b837180b17194d6e44bd6de23e43b163dfe12e369dcc75a3852cd997963f158217eb500000000000000000000000000000000000000000000000000000000000000083f3d080000000000000000000000000000000000000000000000000000000000"),
+            List.of(
+                LogTopic.fromHexString(
+                    "0x649bbc62d0e31342afea4e5cd82d4049e7e1ee912fc0889aa790803be39038c5")));
+
+    LOG_2 =
+        new Log(
+            Address.fromHexString("0x00000000219ab540356cbb839cbe05303d7705fa"),
+            Bytes.fromHexString(
+                "0x00000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000308706d19a62f28a6a6549f96c5adaebac9124a61d44868ec94f6d2d707c6a2f82c9162071231dfeb40e24bfde4ffdf243000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020006a8dc800c6d8dd6977ef53264e2d030350f0145a91bcd167b4f1c3ea21b271000000000000000000000000000000000000000000000000000000000000000800405973070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060801b08ca107b623eca32ee9f9111b4e50eb9cfe19e38204b72de7dc04c5a5e00f61bab96f10842576f66020ce851083f1583dd9a6b73301bea6c245cf51f27cf96aeb018852c5f70bf485d16b957cfe49ca008913346b431e7653ae3ddb23b0700000000000000000000000000000000000000000000000000000000000000080f8b080000000000000000000000000000000000000000000000000000000000"),
+            List.of(
+                LogTopic.fromHexString(
+                    "0x649bbc62d0e31342afea4e5cd82d4049e7e1ee912fc0889aa790803be39038c5")));
+    DEPOSIT_CONTRACT_ADDRESS = Address.fromHexString("0x00000000219ab540356cbb839cbe05303d7705fa");
+  }
+
+  @Test
+  public void validateProhibitedDeposits() {
+    final BlockDataGenerator.BlockOptions blockOptions =
+        BlockDataGenerator.BlockOptions.create().setDeposits(Optional.empty());
+    final Block block = blockDataGenerator.block(blockOptions);
+    assertThat(new DepositsValidator.ProhibitedDeposits().validateDeposits(block, null)).isTrue();
+  }
+
+  @Test
+  public void validateProhibitedDepositsRoot() {
+    final Block block = blockDataGenerator.block();
+    assertThat(new DepositsValidator.ProhibitedDeposits().validateDepositsRoot(block)).isTrue();
+  }
+
+  @Test
+  public void invalidateProhibitedDeposits() {
+    final BlockDataGenerator.BlockOptions blockOptions =
+        BlockDataGenerator.BlockOptions.create().setDeposits(Optional.of(List.of(DEPOSIT_1)));
+    final Block block = blockDataGenerator.block(blockOptions);
+    assertThat(new DepositsValidator.ProhibitedDeposits().validateDeposits(block, null)).isFalse();
+  }
+
+  @Test
+  public void invalidateProhibitedDepositsRoot() {
+    final BlockDataGenerator.BlockOptions blockOptions =
+        BlockDataGenerator.BlockOptions.create().setDepositsRoot(Hash.EMPTY_LIST_HASH);
+    final Block block = blockDataGenerator.block(blockOptions);
+    assertThat(new DepositsValidator.ProhibitedDeposits().validateDepositsRoot(block)).isFalse();
+  }
+
+  @Test
+  public void validateAllowedDeposits() {
+    final BlockDataGenerator.BlockOptions blockOptions =
+        BlockDataGenerator.BlockOptions.create()
+            .setDeposits(Optional.of(List.of(DEPOSIT_1, DEPOSIT_2)));
+    final Block block = blockDataGenerator.block(blockOptions);
+
+    final TransactionReceipt receipt =
+        new TransactionReceipt(null, 0L, List.of(LOG_1, LOG_2), Optional.empty());
+
+    assertThat(
+            new DepositsValidator.AllowedDeposits(DEPOSIT_CONTRACT_ADDRESS)
+                .validateDeposits(block, List.of(receipt)))
+        .isTrue();
+  }
+
+  @Test
+  public void validateAllowedDepositsSeparateReceipts() {
+    final BlockDataGenerator.BlockOptions blockOptions =
+        BlockDataGenerator.BlockOptions.create()
+            .setDeposits(Optional.of(List.of(DEPOSIT_1, DEPOSIT_2)));
+    final Block block = blockDataGenerator.block(blockOptions);
+
+    final TransactionReceipt receipt1 =
+        new TransactionReceipt(null, 0L, List.of(LOG_1), Optional.empty());
+    final TransactionReceipt receipt2 =
+        new TransactionReceipt(null, 0L, List.of(LOG_2), Optional.empty());
+
+    assertThat(
+            new DepositsValidator.AllowedDeposits(DEPOSIT_CONTRACT_ADDRESS)
+                .validateDeposits(block, List.of(receipt1, receipt2)))
+        .isTrue();
+  }
+
+  @Test
+  public void validateAllowedDepositsRoot() {
+    final BlockDataGenerator.BlockOptions blockOptions =
+        BlockDataGenerator.BlockOptions.create()
+            .setDeposits(Optional.of(Collections.emptyList()))
+            .setDepositsRoot(Hash.EMPTY_TRIE_HASH);
+    final Block block = blockDataGenerator.block(blockOptions);
+    assertThat(
+            new DepositsValidator.AllowedDeposits(DEPOSIT_CONTRACT_ADDRESS)
+                .validateDepositsRoot(block))
+        .isTrue();
+  }
+
+  @Test
+  public void invalidateAllowedDeposits() {
+    final BlockDataGenerator.BlockOptions blockOptions =
+        BlockDataGenerator.BlockOptions.create().setDeposits(Optional.of(List.of(DEPOSIT_1)));
+    final Block block = blockDataGenerator.block(blockOptions);
+
+    final TransactionReceipt receipt1 =
+        new TransactionReceipt(null, 0L, List.of(LOG_2), Optional.empty());
+
+    assertThat(
+            new DepositsValidator.AllowedDeposits(DEPOSIT_CONTRACT_ADDRESS)
+                .validateDeposits(block, List.of(receipt1)))
+        .isFalse();
+  }
+
+  @Test
+  public void invalidateAllowedDepositsMissingLogInReceipt() {
+    final BlockDataGenerator.BlockOptions blockOptions =
+        BlockDataGenerator.BlockOptions.create()
+            .setDeposits(Optional.of(List.of(DEPOSIT_1, DEPOSIT_2)));
+    final Block block = blockDataGenerator.block(blockOptions);
+
+    final TransactionReceipt receipt1 =
+        new TransactionReceipt(null, 0L, List.of(LOG_2), Optional.empty());
+
+    assertThat(
+            new DepositsValidator.AllowedDeposits(DEPOSIT_CONTRACT_ADDRESS)
+                .validateDeposits(block, List.of(receipt1)))
+        .isFalse();
+  }
+
+  @Test
+  public void invalidateAllowedDepositsExtraLogInReceipt() {
+    final BlockDataGenerator.BlockOptions blockOptions =
+        BlockDataGenerator.BlockOptions.create().setDeposits(Optional.of(List.of(DEPOSIT_1)));
+    final Block block = blockDataGenerator.block(blockOptions);
+
+    final TransactionReceipt receipt1 =
+        new TransactionReceipt(null, 0L, List.of(LOG_1, LOG_2), Optional.empty());
+
+    assertThat(
+            new DepositsValidator.AllowedDeposits(DEPOSIT_CONTRACT_ADDRESS)
+                .validateDeposits(block, List.of(receipt1)))
+        .isFalse();
+  }
+
+  @Test
+  public void invalidateAllowedDepositsWrongOrder() {
+    final BlockDataGenerator.BlockOptions blockOptions =
+        BlockDataGenerator.BlockOptions.create()
+            .setDeposits(Optional.of(List.of(DEPOSIT_1, DEPOSIT_2)));
+    final Block block = blockDataGenerator.block(blockOptions);
+
+    final TransactionReceipt receipt1 =
+        new TransactionReceipt(null, 0L, List.of(LOG_2, LOG_1), Optional.empty());
+
+    assertThat(
+            new DepositsValidator.AllowedDeposits(DEPOSIT_CONTRACT_ADDRESS)
+                .validateDeposits(block, List.of(receipt1)))
+        .isFalse();
+  }
+
+  @Test
+  public void invalidateAllowedDepositsMismatchContractAddress() {
+
+    final BlockDataGenerator.BlockOptions blockOptions =
+        BlockDataGenerator.BlockOptions.create()
+            .setDeposits(Optional.of(List.of(DEPOSIT_1, DEPOSIT_2)));
+    final Block block = blockDataGenerator.block(blockOptions);
+
+    final TransactionReceipt receipt1 =
+        new TransactionReceipt(null, 0L, List.of(LOG_1, LOG_2), Optional.empty());
+
+    assertThat(
+            new DepositsValidator.AllowedDeposits(Address.ZERO)
+                .validateDeposits(block, List.of(receipt1)))
+        .isFalse();
+  }
+
+  @Test
+  public void invalidateAllowedDepositsRoot() {
+    final BlockDataGenerator.BlockOptions blockOptions =
+        BlockDataGenerator.BlockOptions.create()
+            .setDeposits(Optional.of(Collections.emptyList()))
+            .setDepositsRoot(Hash.ZERO); // this is invalid it should be empty trie hash
+    final Block block = blockDataGenerator.block(blockOptions);
+    assertThat(
+            new DepositsValidator.AllowedDeposits(DEPOSIT_CONTRACT_ADDRESS)
+                .validateDepositsRoot(block))
+        .isFalse();
+  }
+
+  @Test
+  public void validateProhibitedDepositParams() {
+    final Optional<List<Deposit>> deposits = Optional.empty();
+    assertThat(new DepositsValidator.ProhibitedDeposits().validateDepositParameter(deposits))
+        .isTrue();
+  }
+
+  @Test
+  public void invalidateProhibitedDepositParams() {
+    final Optional<List<Deposit>> deposits = Optional.of(List.of(DEPOSIT_1, DEPOSIT_2));
+    assertThat(new DepositsValidator.ProhibitedDeposits().validateDepositParameter(deposits))
+        .isFalse();
+  }
+
+  @Test
+  public void validateAllowedDepositParams() {
+    final Optional<List<Deposit>> deposits = Optional.of(List.of(DEPOSIT_1, DEPOSIT_2));
+    assertThat(
+            new DepositsValidator.AllowedDeposits(DEPOSIT_CONTRACT_ADDRESS)
+                .validateDepositParameter(deposits))
+        .isTrue();
+
+    final Optional<List<Deposit>> emptyDeposits = Optional.of(List.of());
+    assertThat(
+            new DepositsValidator.AllowedDeposits(DEPOSIT_CONTRACT_ADDRESS)
+                .validateDepositParameter(emptyDeposits))
+        .isTrue();
+  }
+
+  @Test
+  public void invalidateAllowedDepositParams() {
+    final Optional<List<Deposit>> deposits = Optional.empty();
+    assertThat(
+            new DepositsValidator.AllowedDeposits(DEPOSIT_CONTRACT_ADDRESS)
+                .validateDepositParameter(deposits))
+        .isFalse();
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/DifficultyCalculatorTests.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/DifficultyCalculatorTests.java
deleted file mode 100644
index 53dff474071..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/DifficultyCalculatorTests.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-
-package org.hyperledger.besu.ethereum.mainnet;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.config.GenesisConfigFile;
-import org.hyperledger.besu.config.JsonUtil;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
-import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.LogsBloomFilter;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-import java.util.List;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.io.Resources;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.units.bigints.UInt256;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class DifficultyCalculatorTests {
-
-  private final String testFile;
-  private final ProtocolSchedule protocolSchedule;
-
-  public DifficultyCalculatorTests(final String testFile, final ProtocolSchedule protocolSchedule) {
-    this.testFile = testFile;
-    this.protocolSchedule = protocolSchedule;
-  }
-
-  @Parameters(name = "TestFile: {0}")
-  public static Collection<Object[]> getTestParametersForConfig() throws IOException {
-    return List.of(
-        new Object[] {
-          "/BasicTests/difficultyMainNetwork.json",
-          MainnetProtocolSchedule.fromConfig(GenesisConfigFile.mainnet().getConfigOptions())
-        },
-        new Object[] {
-          "/BasicTests/difficultyRopsten.json",
-          MainnetProtocolSchedule.fromConfig(
-              GenesisConfigFile.fromConfig(
-                      Resources.toString(
-                          GenesisConfigFile.class.getResource("/ropsten.json"),
-                          StandardCharsets.UTF_8))
-                  .getConfigOptions())
-        },
-        new Object[] {
-          "/BasicTests/difficultyFrontier.json",
-          MainnetProtocolSchedule.fromConfig(
-              GenesisConfigFile.fromConfig("{\"config\": {\"frontierBlock\":0}}")
-                  .getConfigOptions())
-        },
-        new Object[] {
-          "/BasicTests/difficultyHomestead.json",
-          MainnetProtocolSchedule.fromConfig(
-              GenesisConfigFile.fromConfig("{\"config\": {\"homesteadBlock\":0}}")
-                  .getConfigOptions())
-        },
-        new Object[] {
-          "/BasicTests/difficultyByzantium.json",
-          MainnetProtocolSchedule.fromConfig(
-              GenesisConfigFile.fromConfig("{\"config\": {\"byzantiumBlock\":0}}")
-                  .getConfigOptions())
-        },
-        new Object[] {
-          "/BasicTests/difficultyConstantinople.json",
-          MainnetProtocolSchedule.fromConfig(
-              GenesisConfigFile.fromConfig("{\"config\": {\"constantinopleBlock\":0}}")
-                  .getConfigOptions())
-        },
-        new Object[] {
-          "/BasicTests/difficultyEIP2384.json",
-          MainnetProtocolSchedule.fromConfig(
-              GenesisConfigFile.fromConfig("{\"config\":{\"muirGlacierBlock\":0}}")
-                  .getConfigOptions())
-        },
-        new Object[] {
-          "/BasicTests/difficultyEIP2384_random.json",
-          MainnetProtocolSchedule.fromConfig(
-              GenesisConfigFile.fromConfig("{\"config\":{\"muirGlacierBlock\":0}}")
-                  .getConfigOptions())
-        },
-        new Object[] {
-          "/BasicTests/difficultyEIP2384_random_to20M.json",
-          MainnetProtocolSchedule.fromConfig(
-              GenesisConfigFile.fromConfig("{\"config\":{\"muirGlacierBlock\":0}}")
-                  .getConfigOptions())
-        });
-  }
-
-  @Test
-  public void testDifficultyCalculation() throws IOException {
-    MainnetBlockHeaderFunctions blockHeaderFunctions = new MainnetBlockHeaderFunctions();
-    final ObjectNode testObject =
-        JsonUtil.objectNodeFromString(
-            Resources.toString(
-                DifficultyCalculatorTests.class.getResource(testFile), StandardCharsets.UTF_8));
-    final var fields = testObject.fields();
-    while (fields.hasNext()) {
-      final var entry = fields.next();
-      final JsonNode value = entry.getValue();
-      final long currentBlockNumber = extractLong(value, "currentBlockNumber");
-      final BlockHeader testHeader =
-          BlockHeaderBuilder.create()
-              .parentHash(Hash.EMPTY)
-              .coinbase(Address.ZERO)
-              .gasLimit(Long.MAX_VALUE)
-              .stateRoot(Hash.EMPTY)
-              .transactionsRoot(Hash.EMPTY)
-              .receiptsRoot(Hash.EMPTY)
-              .logsBloom(new LogsBloomFilter())
-              .gasUsed(0)
-              .extraData(Bytes.of())
-              .mixHash(Hash.EMPTY)
-              .nonce(0)
-              .blockHeaderFunctions(blockHeaderFunctions)
-              .timestamp(extractLong(value, "parentTimestamp"))
-              .difficulty(Difficulty.fromHexString(value.get("parentDifficulty").asText()))
-              .ommersHash(Hash.fromHexString(value.get("parentUncles").asText()))
-              .number(currentBlockNumber)
-              .buildBlockHeader();
-      final long currentTime = extractLong(value, "currentTimestamp");
-      final UInt256 currentDifficulty =
-          UInt256.fromHexString(value.get("currentDifficulty").asText());
-      final var spec = protocolSchedule.getByBlockNumber(currentBlockNumber);
-      final var calculator = spec.getDifficultyCalculator();
-      assertThat(UInt256.valueOf(calculator.nextDifficulty(currentTime, testHeader, null)))
-          .describedAs("File %s Test %s", testFile, entry.getKey())
-          .isEqualTo(currentDifficulty);
-    }
-  }
-
-  private long extractLong(final JsonNode node, final String name) {
-    return Long.decode(node.get(name).asText());
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolverTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolverTest.java
deleted file mode 100644
index 072da459ae3..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/EthHashSolverTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.util.Subscribers;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
-import com.google.common.base.Stopwatch;
-import com.google.common.collect.Lists;
-import org.apache.tuweni.units.bigints.UInt256;
-import org.junit.Test;
-
-public class EthHashSolverTest {
-
-  @Test
-  public void emptyHashRateAndWorkDefinitionIsReportedPriorToSolverStarting() {
-    final List<Long> noncesToTry = Arrays.asList(1L, 1L, 1L, 1L, 1L, 1L, 0L);
-    final EthHashSolver solver =
-        new EthHashSolver(
-            noncesToTry,
-            new EthHasher.Light(),
-            false,
-            Subscribers.none(),
-            new EpochCalculator.DefaultEpochCalculator());
-
-    assertThat(solver.hashesPerSecond()).isEqualTo(Optional.empty());
-    assertThat(solver.getWorkDefinition()).isEqualTo(Optional.empty());
-  }
-
-  @Test
-  public void hashRateIsProducedSuccessfully() throws InterruptedException, ExecutionException {
-    final List<Long> noncesToTry = Arrays.asList(1L, 1L, 1L, 1L, 1L, 1L, 0L);
-
-    final EthHasher hasher = mock(EthHasher.class);
-    doAnswer(
-            invocation -> {
-              final Object[] args = invocation.getArguments();
-              final byte[] headerHash = ((byte[]) args[0]);
-              final long nonce = ((long) args[1]);
-              headerHash[32] = (byte) (nonce & 0xFF);
-              return null;
-            })
-        .when(hasher)
-        .hash(any(), anyLong(), anyLong(), any(), any());
-
-    final EthHashSolver solver =
-        new EthHashSolver(
-            noncesToTry,
-            hasher,
-            false,
-            Subscribers.none(),
-            new EpochCalculator.DefaultEpochCalculator());
-
-    final Stopwatch operationTimer = Stopwatch.createStarted();
-    final EthHashSolverInputs inputs = new EthHashSolverInputs(UInt256.ONE, new byte[0], 5);
-    solver.solveFor(EthHashSolver.EthHashSolverJob.createFromInputs(inputs));
-    final double runtimeSeconds = operationTimer.elapsed(TimeUnit.NANOSECONDS) / 1e9;
-    final long worstCaseHashesPerSecond = (long) (noncesToTry.size() / runtimeSeconds);
-
-    final Optional<Long> hashesPerSecond = solver.hashesPerSecond();
-    assertThat(hashesPerSecond.isPresent()).isTrue();
-    assertThat(hashesPerSecond.get()).isGreaterThanOrEqualTo(worstCaseHashesPerSecond);
-
-    assertThat(solver.getWorkDefinition().isPresent()).isTrue();
-    assertThat(solver.getWorkDefinition().equals(Optional.of(inputs))).isTrue();
-  }
-
-  @Test
-  public void ifInvokedTwiceProducesCorrectAnswerForSecondInvocation()
-      throws InterruptedException, ExecutionException {
-
-    final EthHashSolverInputs firstInputs =
-        new EthHashSolverInputs(
-            UInt256.fromHexString(
-                "0x0083126e978d4fdf3b645a1cac083126e978d4fdf3b645a1cac083126e978d4f"),
-            new byte[] {
-              15, -114, -104, 87, -95, -36, -17, 120, 52, 1, 124, 61, -6, -66, 78, -27, -57, 118,
-              -18, -64, -103, -91, -74, -121, 42, 91, -14, -98, 101, 86, -43, -51
-            },
-            468);
-
-    final EthHashSolution expectedFirstOutput =
-        new EthHashSolution(
-            -6506032554016940193L,
-            Hash.fromHexString(
-                "0xc5e3c33c86d64d0641dd3c86e8ce4628fe0aac0ef7b4c087c5fcaa45d5046d90"),
-            firstInputs.getPrePowHash());
-
-    final EthHashSolverInputs secondInputs =
-        new EthHashSolverInputs(
-            UInt256.fromHexString(
-                "0x0083126e978d4fdf3b645a1cac083126e978d4fdf3b645a1cac083126e978d4f"),
-            new byte[] {
-              -62, 121, -81, -31, 55, -38, -68, 102, -32, 95, -94, -83, -3, -48, -122, -68, 14,
-              -125, -83, 84, -55, -23, -123, -57, -34, 25, -89, 23, 64, -9, -114, -3,
-            },
-            1);
-
-    final EthHashSolution expectedSecondOutput =
-        new EthHashSolution(
-            8855952212886464488L,
-            Hash.fromHexString(
-                "0x2adb0f375dd2d528689cb9e00473c3c9692737109d547130feafbefb2c6c5244"),
-            firstInputs.getPrePowHash());
-
-    // Nonces need to have a 0L inserted, as it is a "wasted" nonce in the solver.
-    final EthHashSolver solver =
-        new EthHashSolver(
-            Lists.newArrayList(expectedFirstOutput.getNonce(), 0L, expectedSecondOutput.getNonce()),
-            new EthHasher.Light(),
-            false,
-            Subscribers.none(),
-            new EpochCalculator.DefaultEpochCalculator());
-
-    EthHashSolution soln =
-        solver.solveFor(EthHashSolver.EthHashSolverJob.createFromInputs(firstInputs));
-    assertThat(soln.getMixHash()).isEqualTo(expectedFirstOutput.getMixHash());
-
-    soln = solver.solveFor(EthHashSolver.EthHashSolverJob.createFromInputs(secondInputs));
-    assertThat(soln.getMixHash()).isEqualTo(expectedSecondOutput.getMixHash());
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/EthHashTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/EthHashTest.java
index 025bed30dc9..1eda369deb9 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/EthHashTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/EthHashTest.java
@@ -14,19 +14,17 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.util.Arrays;
 
 import com.google.common.io.Resources;
 import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.assertj.core.api.Assertions;
 import org.bouncycastle.util.encoders.Hex;
 import org.junit.Test;
 
@@ -50,32 +48,28 @@ public void hashimotoLight() throws Exception {
     final long epoch = epochCalculator.cacheEpoch(blockNumber);
     final long datasetSize = EthHash.datasetSize(epoch);
     final long cacheSize = EthHash.cacheSize(epoch);
-    Assertions.assertThat(datasetSize).isEqualTo(1157627776);
-    Assertions.assertThat(cacheSize).isEqualTo(18087488);
+    assertThat(datasetSize).isEqualTo(1157627776);
+    assertThat(cacheSize).isEqualTo(18087488);
     final int[] cache = EthHash.mkCache((int) cacheSize, blockNumber, epochCalculator);
-    Assertions.assertThat(
-            Hash.wrap(
-                Bytes32.wrap(
-                    Arrays.copyOf(
-                        EthHash.hashimotoLight(
-                            datasetSize, cache, EthHash.hashHeader(header), header.getNonce()),
-                        32))))
-        .isEqualTo(header.getMixHash());
+    PoWSolution solution =
+        EthHash.hashimotoLight(datasetSize, cache, EthHash.hashHeader(header), header.getNonce());
+    assertThat(solution.getMixHash()).isEqualTo(header.getMixHash());
   }
 
   @Test
   public void hashimotoLightExample() {
     final int[] cache = EthHash.mkCache(1024, 1L, new EpochCalculator.DefaultEpochCalculator());
-    Assertions.assertThat(
-            Hex.toHexString(
-                EthHash.hashimotoLight(
-                    32 * 1024,
-                    cache,
-                    Hex.decode("c9149cc0386e689d789a1c2f3d5d169a61a6218ed30e74414dc736e442ef3d1f"),
-                    0L)))
-        .isEqualTo(
-            "e4073cffaef931d37117cefd9afd27ea0f1cad6a981dd2605c4a1ac97c519800"
-                + "d3539235ee2e6f8db665c0a72169f55b7f6c605712330b778ec3944f0eb5a557");
+    PoWSolution solution =
+        EthHash.hashimotoLight(
+            32 * 1024,
+            cache,
+            Bytes.fromHexString("c9149cc0386e689d789a1c2f3d5d169a61a6218ed30e74414dc736e442ef3d1f"),
+            0L);
+
+    assertThat(solution.getSolution().toHexString())
+        .isEqualTo("0xd3539235ee2e6f8db665c0a72169f55b7f6c605712330b778ec3944f0eb5a557");
+    assertThat(solution.getMixHash().toHexString())
+        .isEqualTo("0xe4073cffaef931d37117cefd9afd27ea0f1cad6a981dd2605c4a1ac97c519800");
   }
 
   @Test
@@ -86,7 +80,7 @@ public void prepareCache() {
     for (final int i : cache) {
       buffer.putInt(i);
     }
-    Assertions.assertThat(Hex.toHexString(buffer.array()))
+    assertThat(Hex.toHexString(buffer.array()))
         .isEqualTo(
             new StringBuilder()
                 .append(
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/IntrinsicGasTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/IntrinsicGasTest.java
index dac67b895ac..d0e4217d8e7 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/IntrinsicGasTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/IntrinsicGasTest.java
@@ -14,10 +14,11 @@
  */
 package org.hyperledger.besu.ethereum.mainnet;
 
-import org.hyperledger.besu.ethereum.core.Gas;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.rlp.RLP;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
+import org.hyperledger.besu.evm.gascalculator.FrontierGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.gascalculator.IstanbulGasCalculator;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -33,11 +34,11 @@
 public class IntrinsicGasTest {
 
   private final GasCalculator gasCalculator;
-  private final Gas expectedGas;
+  private final long expectedGas;
   private final String txRlp;
 
   public IntrinsicGasTest(
-      final GasCalculator gasCalculator, final Gas expectedGas, final String txRlp) {
+      final GasCalculator gasCalculator, final long expectedGas, final String txRlp) {
     this.gasCalculator = gasCalculator;
     this.expectedGas = expectedGas;
     this.txRlp = txRlp;
@@ -52,56 +53,56 @@ public static Collection<Object[]> data() {
           // EnoughGAS
           {
             frontier,
-            Gas.of(21952),
+            21952L,
             "0xf86d80018259d894095e7baea6a6c7c4c2dfeb977efac326af552d870a8e0358ac39584bc98a7c979f984b031ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a01fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
           },
           {
             istanbul,
-            Gas.of(21224),
+            21224L,
             "0xf86d80018259d894095e7baea6a6c7c4c2dfeb977efac326af552d870a8e0358ac39584bc98a7c979f984b031ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a01fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
           },
           // FirstZeroBytes
           {
             frontier,
-            Gas.of(21180),
+            21180L,
             "0xf87c80018261a894095e7baea6a6c7c4c2dfeb977efac326af552d870a9d00000000000000000000000000010000000000000000000000000000001ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a01fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
           },
           {
             istanbul,
-            Gas.of(21128),
+            21128L,
             "0xf87c80018261a894095e7baea6a6c7c4c2dfeb977efac326af552d870a9d00000000000000000000000000010000000000000000000000000000001ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a01fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
           },
           // LastZeroBytes
           {
             frontier,
-            Gas.of(21180),
+            21180L,
             "0xf87c80018261a894095e7baea6a6c7c4c2dfeb977efac326af552d870a9d01000000000000000000000000000000000000000000000000000000001ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a01fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
           },
           {
             istanbul,
-            Gas.of(21128),
+            21128L,
             "0xf87c80018261a894095e7baea6a6c7c4c2dfeb977efac326af552d870a9d01000000000000000000000000000000000000000000000000000000001ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a01fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
           },
           // NotEnoughGAS
           {
             frontier,
-            Gas.of(21952),
+            21952L,
             "0xf86d800182521c94095e7baea6a6c7c4c2dfeb977efac326af552d870a8e0358ac39584bc98a7c979f984b031ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a0efffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
           },
           {
             istanbul,
-            Gas.of(21224),
+            21224L,
             "0xf86d800182521c94095e7baea6a6c7c4c2dfeb977efac326af552d870a8e0358ac39584bc98a7c979f984b031ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a0efffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
           },
           // ZeroBytes
           {
             frontier,
-            Gas.of(21116),
+            21116L,
             "0xf87c80018261a894095e7baea6a6c7c4c2dfeb977efac326af552d870a9d00000000000000000000000000000000000000000000000000000000001ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a01fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
           },
           {
             istanbul,
-            Gas.of(21116),
+            21116L,
             "0xf87c80018261a894095e7baea6a6c7c4c2dfeb977efac326af552d870a9d00000000000000000000000000000000000000000000000000000000001ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a01fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
           },
         });
@@ -110,6 +111,8 @@ public static Collection<Object[]> data() {
   @Test
   public void validateGasCost() {
     Transaction t = Transaction.readFrom(RLP.input(Bytes.fromHexString(txRlp)));
-    Assertions.assertThat(gasCalculator.transactionIntrinsicGasCost(t)).isEqualTo(expectedGas);
+    Assertions.assertThat(
+            gasCalculator.transactionIntrinsicGasCost(t.getPayload(), t.isContractCreation()))
+        .isEqualTo(expectedGas);
   }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockBodyValidatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockBodyValidatorTest.java
new file mode 100644
index 00000000000..8543321b470
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockBodyValidatorTest.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet;
+
+import static java.util.Collections.emptyList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode.NONE;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.GWei;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions;
+import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.units.bigints.UInt64;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+class MainnetBlockBodyValidatorTest {
+  private final BlockDataGenerator blockDataGenerator = new BlockDataGenerator();
+  private final BlockchainSetupUtil blockchainSetupUtil = BlockchainSetupUtil.forMainnet();
+  private final List<Withdrawal> withdrawals =
+      List.of(new Withdrawal(UInt64.ONE, UInt64.ONE, Address.ZERO, GWei.ONE));
+
+  @Mock private ProtocolSchedule protocolSchedule;
+  @Mock private ProtocolSpec protocolSpec;
+  @Mock private WithdrawalsValidator withdrawalsValidator;
+  @Mock private DepositsValidator depositsValidator;
+
+  @Test
+  void validatesWithdrawals() {
+    final Block block =
+        blockDataGenerator.block(
+            new BlockOptions()
+                .setBlockNumber(1)
+                .setGasUsed(0)
+                .hasTransactions(false)
+                .hasOmmers(false)
+                .setReceiptsRoot(BodyValidation.receiptsRoot(emptyList()))
+                .setLogsBloom(LogsBloomFilter.empty())
+                .setParentHash(blockchainSetupUtil.getBlockchain().getChainHeadHash())
+                .setWithdrawals(Optional.of(withdrawals))
+                .setWithdrawalsRoot(BodyValidation.withdrawalsRoot(withdrawals)));
+    blockchainSetupUtil.getBlockchain().appendBlock(block, Collections.emptyList());
+
+    when(protocolSchedule.getByBlockHeader(any())).thenReturn(protocolSpec);
+    when(protocolSpec.getWithdrawalsValidator()).thenReturn(withdrawalsValidator);
+    when(protocolSpec.getDepositsValidator()).thenReturn(depositsValidator);
+    when(withdrawalsValidator.validateWithdrawals(Optional.of(withdrawals))).thenReturn(true);
+    when(withdrawalsValidator.validateWithdrawalsRoot(block)).thenReturn(true);
+    when(depositsValidator.validateDeposits(any(), any())).thenReturn(true);
+    when(depositsValidator.validateDepositsRoot(block)).thenReturn(true);
+
+    assertThat(
+            new MainnetBlockBodyValidator(protocolSchedule)
+                .validateBodyLight(
+                    blockchainSetupUtil.getProtocolContext(), block, emptyList(), NONE))
+        .isTrue();
+  }
+
+  @Test
+  void validationFailsIfWithdrawalsValidationFails() {
+    final Block block =
+        blockDataGenerator.block(
+            new BlockOptions()
+                .setBlockNumber(1)
+                .setGasUsed(0)
+                .hasTransactions(false)
+                .hasOmmers(false)
+                .setReceiptsRoot(BodyValidation.receiptsRoot(emptyList()))
+                .setLogsBloom(LogsBloomFilter.empty())
+                .setParentHash(blockchainSetupUtil.getBlockchain().getChainHeadHash())
+                .setWithdrawalsRoot(BodyValidation.withdrawalsRoot(withdrawals)));
+    blockchainSetupUtil.getBlockchain().appendBlock(block, Collections.emptyList());
+
+    when(protocolSchedule.getByBlockHeader(any())).thenReturn(protocolSpec);
+    when(protocolSpec.getWithdrawalsValidator()).thenReturn(withdrawalsValidator);
+    when(withdrawalsValidator.validateWithdrawals(Optional.empty())).thenReturn(false);
+
+    assertThat(
+            new MainnetBlockBodyValidator(protocolSchedule)
+                .validateBodyLight(
+                    blockchainSetupUtil.getProtocolContext(), block, emptyList(), NONE))
+        .isFalse();
+  }
+
+  @Test
+  void validationFailsIfWithdrawalsRootValidationFails() {
+    final Block block =
+        blockDataGenerator.block(
+            new BlockOptions()
+                .setBlockNumber(1)
+                .setGasUsed(0)
+                .hasTransactions(false)
+                .hasOmmers(false)
+                .setReceiptsRoot(BodyValidation.receiptsRoot(emptyList()))
+                .setLogsBloom(LogsBloomFilter.empty())
+                .setParentHash(blockchainSetupUtil.getBlockchain().getChainHeadHash())
+                .setWithdrawals(Optional.of(withdrawals)));
+    blockchainSetupUtil.getBlockchain().appendBlock(block, Collections.emptyList());
+
+    when(protocolSchedule.getByBlockHeader(any())).thenReturn(protocolSpec);
+    when(protocolSpec.getWithdrawalsValidator()).thenReturn(withdrawalsValidator);
+    when(withdrawalsValidator.validateWithdrawals(Optional.of(withdrawals))).thenReturn(true);
+    when(withdrawalsValidator.validateWithdrawalsRoot(block)).thenReturn(false);
+
+    assertThat(
+            new MainnetBlockBodyValidator(protocolSchedule)
+                .validateBodyLight(
+                    blockchainSetupUtil.getProtocolContext(), block, emptyList(), NONE))
+        .isFalse();
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderValidatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderValidatorTest.java
index 64fa57b8264..cfca6830dbb 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderValidatorTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockHeaderValidatorTest.java
@@ -20,8 +20,11 @@
 import org.hyperledger.besu.ethereum.ProtocolContext;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
 /** Tests for {@link MainnetBlockHeaderValidator}. */
+@RunWith(MockitoJUnitRunner.class)
 public final class MainnetBlockHeaderValidatorTest {
 
   @SuppressWarnings("unchecked")
@@ -30,7 +33,7 @@ public final class MainnetBlockHeaderValidatorTest {
   @Test
   public void validHeaderFrontier() throws Exception {
     final BlockHeaderValidator headerValidator =
-        MainnetBlockHeaderValidator.create()
+        MainnetBlockHeaderValidator.create(PoWHasher.ETHASH_LIGHT)
             .difficultyCalculator(MainnetDifficultyCalculators.FRONTIER)
             .build();
     assertThat(
@@ -45,7 +48,7 @@ public void validHeaderFrontier() throws Exception {
   @Test
   public void validHeaderHomestead() throws Exception {
     final BlockHeaderValidator headerValidator =
-        MainnetBlockHeaderValidator.create()
+        MainnetBlockHeaderValidator.create(PoWHasher.ETHASH_LIGHT)
             .difficultyCalculator(MainnetDifficultyCalculators.HOMESTEAD)
             .build();
     assertThat(
@@ -60,7 +63,7 @@ public void validHeaderHomestead() throws Exception {
   @Test
   public void invalidParentHash() throws Exception {
     final BlockHeaderValidator headerValidator =
-        MainnetBlockHeaderValidator.create()
+        MainnetBlockHeaderValidator.create(PoWHasher.ETHASH_LIGHT)
             .difficultyCalculator(MainnetDifficultyCalculators.FRONTIER)
             .build();
     assertThat(
@@ -75,7 +78,7 @@ public void invalidParentHash() throws Exception {
   @Test
   public void validHeaderByzantium() throws Exception {
     final BlockHeaderValidator headerValidator =
-        MainnetBlockHeaderValidator.create()
+        MainnetBlockHeaderValidator.create(PoWHasher.ETHASH_LIGHT)
             .difficultyCalculator(MainnetDifficultyCalculators.BYZANTIUM)
             .build();
     assertThat(
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockImporterTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockImporterTest.java
index d85006c72ce..28221791224 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockImporterTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockImporterTest.java
@@ -21,11 +21,11 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.BlockValidator;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -53,10 +53,12 @@ public void setup() {
   public void doNotImportBlockIfBlockchainAlreadyHasBlock() {
     when(blockchain.contains(hash)).thenReturn(true);
 
-    assertThat(
-            blockImporter.importBlock(
-                context, block, HeaderValidationMode.FULL, HeaderValidationMode.FULL))
-        .isTrue();
+    final BlockImportResult result =
+        blockImporter.importBlock(
+            context, block, HeaderValidationMode.FULL, HeaderValidationMode.FULL);
+
+    assertThat(result.isImported()).isTrue();
+
     verify(blockValidator, never())
         .validateAndProcessBlock(
             context, block, HeaderValidationMode.FULL, HeaderValidationMode.FULL);
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockProcessorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockProcessorTest.java
index 83d7ef97e71..6bd6978acb1 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockProcessorTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetBlockProcessorTest.java
@@ -17,26 +17,38 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptyMap;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.fees.TransactionGasBudgetCalculator;
 import org.hyperledger.besu.ethereum.referencetests.ReferenceTestBlockchain;
 import org.hyperledger.besu.ethereum.referencetests.ReferenceTestWorldState;
 
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-public class MainnetBlockProcessorTest {
+@ExtendWith(MockitoExtension.class)
+public class MainnetBlockProcessorTest extends AbstractBlockProcessorTest {
 
   private final MainnetTransactionProcessor transactionProcessor =
       mock(MainnetTransactionProcessor.class);
   private final AbstractBlockProcessor.TransactionReceiptFactory transactionReceiptFactory =
       mock(AbstractBlockProcessor.TransactionReceiptFactory.class);
+  private final ProtocolSchedule protocolSchedule = mock(ProtocolSchedule.class);
+  private final ProtocolSpec protocolSpec = mock(ProtocolSpec.class);
+
+  @BeforeEach
+  public void setup() {
+    when(protocolSchedule.getByBlockHeader(any())).thenReturn(protocolSpec);
+  }
 
   @Test
   public void noAccountCreatedWhenBlockRewardIsZeroAndSkipped() {
@@ -48,7 +60,7 @@ public void noAccountCreatedWhenBlockRewardIsZeroAndSkipped() {
             Wei.ZERO,
             BlockHeader::getCoinbase,
             true,
-            TransactionGasBudgetCalculator.frontier());
+            protocolSchedule);
 
     final MutableWorldState worldState = ReferenceTestWorldState.create(emptyMap());
     final Hash initialHash = worldState.rootHash();
@@ -74,7 +86,7 @@ public void accountCreatedWhenBlockRewardIsZeroAndNotSkipped() {
             Wei.ZERO,
             BlockHeader::getCoinbase,
             false,
-            TransactionGasBudgetCalculator.frontier());
+            protocolSchedule);
 
     final MutableWorldState worldState = ReferenceTestWorldState.create(emptyMap());
     final Hash initialHash = worldState.rootHash();
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistriesTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistriesTest.java
index c423ed8f03f..1b77fb3719d 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistriesTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetPrecompiledContractRegistriesTest.java
@@ -16,21 +16,25 @@
 package org.hyperledger.besu.ethereum.mainnet;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.DEFAULT_PRIVACY;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY;
 import static org.hyperledger.besu.ethereum.mainnet.MainnetPrecompiledContractRegistries.appendPrivacy;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-import org.hyperledger.besu.ethereum.mainnet.precompiles.privacy.OnChainPrivacyPrecompiledContract;
+import org.hyperledger.besu.ethereum.mainnet.precompiles.privacy.FlexiblePrivacyPrecompiledContract;
 import org.hyperledger.besu.ethereum.mainnet.precompiles.privacy.PrivacyPrecompiledContract;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.precompile.PrecompileContractRegistry;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class MainnetPrecompiledContractRegistriesTest {
   private final PrivacyParameters privacyParameters = mock(PrivacyParameters.class);
   private final GasCalculator gasCalculator = mock(GasCalculator.class);
@@ -40,42 +44,40 @@ public class MainnetPrecompiledContractRegistriesTest {
       new PrecompiledContractConfiguration(gasCalculator, privacyParameters);
 
   @Test
-  public void whenOnchainPrivacyGroupsNotEnabled_defaultPrivacyPrecompileIsInRegistry() {
-    when(privacyParameters.isOnchainPrivacyGroupsEnabled()).thenReturn(false);
+  public void whenFlexiblePrivacyGroupsNotEnabled_defaultPrivacyPrecompileIsInRegistry() {
+    when(privacyParameters.isFlexiblePrivacyGroupsEnabled()).thenReturn(false);
     when(privacyParameters.isEnabled()).thenReturn(true);
 
-    appendPrivacy(reg, config, Account.DEFAULT_VERSION);
+    appendPrivacy(reg, config);
     verify(privacyParameters).isEnabled();
-    verify(privacyParameters).isOnchainPrivacyGroupsEnabled();
+    verify(privacyParameters).isFlexiblePrivacyGroupsEnabled();
 
-    assertThat(reg.get(Address.DEFAULT_PRIVACY, Account.DEFAULT_VERSION))
-        .isInstanceOf(PrivacyPrecompiledContract.class);
-    assertThat(reg.get(Address.ONCHAIN_PRIVACY, Account.DEFAULT_VERSION)).isNull();
+    assertThat(reg.get(DEFAULT_PRIVACY)).isInstanceOf(PrivacyPrecompiledContract.class);
+    assertThat(reg.get(FLEXIBLE_PRIVACY)).isNull();
   }
 
   @Test
-  public void whenOnchainPrivacyGroupsEnabled_onchainPrivacyPrecompileIsInRegistry() {
-    when(privacyParameters.isOnchainPrivacyGroupsEnabled()).thenReturn(true);
+  public void whenFlexiblePrivacyGroupsEnabled_flexiblePrivacyPrecompileIsInRegistry() {
+    when(privacyParameters.isFlexiblePrivacyGroupsEnabled()).thenReturn(true);
     when(privacyParameters.isEnabled()).thenReturn(true);
 
-    appendPrivacy(reg, config, Account.DEFAULT_VERSION);
+    appendPrivacy(reg, config);
     verify(privacyParameters).isEnabled();
-    verify(privacyParameters).isOnchainPrivacyGroupsEnabled();
+    verify(privacyParameters).isFlexiblePrivacyGroupsEnabled();
 
-    assertThat(reg.get(Address.ONCHAIN_PRIVACY, Account.DEFAULT_VERSION))
-        .isInstanceOf(OnChainPrivacyPrecompiledContract.class);
-    assertThat(reg.get(Address.DEFAULT_PRIVACY, Account.DEFAULT_VERSION)).isNull();
+    assertThat(reg.get(FLEXIBLE_PRIVACY)).isInstanceOf(FlexiblePrivacyPrecompiledContract.class);
+    assertThat(reg.get(DEFAULT_PRIVACY)).isNull();
   }
 
   @Test
   public void whenPrivacyNotEnabled_noPrivacyPrecompileInRegistry() {
     when(privacyParameters.isEnabled()).thenReturn(false);
 
-    appendPrivacy(reg, config, Account.DEFAULT_VERSION);
+    appendPrivacy(reg, config);
     verify(privacyParameters).isEnabled();
     verifyNoMoreInteractions(privacyParameters);
 
-    assertThat(reg.get(Address.ONCHAIN_PRIVACY, Account.DEFAULT_VERSION)).isNull();
-    assertThat(reg.get(Address.DEFAULT_PRIVACY, Account.DEFAULT_VERSION)).isNull();
+    assertThat(reg.get(FLEXIBLE_PRIVACY)).isNull();
+    assertThat(reg.get(DEFAULT_PRIVACY)).isNull();
   }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolScheduleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolScheduleTest.java
index 23b2c64386b..7c4b1bde529 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolScheduleTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolScheduleTest.java
@@ -15,7 +15,10 @@
 package org.hyperledger.besu.ethereum.mainnet;
 
 import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.ProtocolScheduleFixture;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 
 import java.nio.charset.StandardCharsets;
 
@@ -28,85 +31,89 @@ public class MainnetProtocolScheduleTest {
   @Test
   public void shouldReturnDefaultProtocolSpecsWhenCustomNumbersAreNotUsed() {
     final ProtocolSchedule sched = ProtocolScheduleFixture.MAINNET;
-    Assertions.assertThat(sched.getByBlockNumber(1L).getName()).isEqualTo("Frontier");
-    Assertions.assertThat(sched.getByBlockNumber(1_150_000L).getName()).isEqualTo("Homestead");
-    Assertions.assertThat(sched.getByBlockNumber(1_920_000L).getName())
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(1L)).getName()).isEqualTo("Frontier");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(1_150_000L)).getName())
+        .isEqualTo("Homestead");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(1_920_000L)).getName())
         .isEqualTo("DaoRecoveryInit");
-    Assertions.assertThat(sched.getByBlockNumber(1_920_001L).getName())
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(1_920_001L)).getName())
         .isEqualTo("DaoRecoveryTransition");
-    Assertions.assertThat(sched.getByBlockNumber(1_920_010L).getName()).isEqualTo("Homestead");
-    Assertions.assertThat(sched.getByBlockNumber(2_463_000L).getName())
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(1_920_010L)).getName())
+        .isEqualTo("Homestead");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(2_463_000L)).getName())
         .isEqualTo("TangerineWhistle");
-    Assertions.assertThat(sched.getByBlockNumber(2_675_000L).getName()).isEqualTo("SpuriousDragon");
-    Assertions.assertThat(sched.getByBlockNumber(4_730_000L).getName()).isEqualTo("Byzantium");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(2_675_000L)).getName())
+        .isEqualTo("SpuriousDragon");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(4_730_000L)).getName())
+        .isEqualTo("Byzantium");
     // Constantinople was originally scheduled for 7_080_000, but postponed
-    Assertions.assertThat(sched.getByBlockNumber(7_080_000L).getName()).isEqualTo("Byzantium");
-    Assertions.assertThat(sched.getByBlockNumber(7_280_000L).getName())
-        .isEqualTo("ConstantinopleFix");
-    Assertions.assertThat(sched.getByBlockNumber(9_069_000L).getName()).isEqualTo("Istanbul");
-    Assertions.assertThat(sched.getByBlockNumber(9_200_000L).getName()).isEqualTo("MuirGlacier");
-    Assertions.assertThat(sched.getByBlockNumber(Long.MAX_VALUE).getName())
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(7_080_000L)).getName())
+        .isEqualTo("Byzantium");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(7_280_000L)).getName())
+        .isEqualTo("Petersburg");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(9_069_000L)).getName())
+        .isEqualTo("Istanbul");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(9_200_000L)).getName())
         .isEqualTo("MuirGlacier");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(12_244_000L)).getName())
+        .isEqualTo("Berlin");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(12_965_000L)).getName())
+        .isEqualTo("London");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(13_773_000L)).getName())
+        .isEqualTo("ArrowGlacier");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(15_050_000L)).getName())
+        .isEqualTo("GrayGlacier");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(Long.MAX_VALUE)).getName())
+        .isEqualTo("GrayGlacier");
   }
 
   @Test
   public void shouldOnlyUseFrontierWhenEmptyJsonConfigIsUsed() {
     final ProtocolSchedule sched =
-        MainnetProtocolSchedule.fromConfig(GenesisConfigFile.fromConfig("{}").getConfigOptions());
-    Assertions.assertThat(sched.getByBlockNumber(1L).getName()).isEqualTo("Frontier");
-    Assertions.assertThat(sched.getByBlockNumber(Long.MAX_VALUE).getName()).isEqualTo("Frontier");
+        MainnetProtocolSchedule.fromConfig(
+            GenesisConfigFile.fromConfig("{}").getConfigOptions(), EvmConfiguration.DEFAULT);
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(1L)).getName()).isEqualTo("Frontier");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(Long.MAX_VALUE)).getName())
+        .isEqualTo("Frontier");
   }
 
   @Test
   public void createFromConfigWithSettings() {
     final String json =
-        "{\"config\": {\"homesteadBlock\": 2, \"daoForkBlock\": 3, \"eip150Block\": 14, \"eip158Block\": 15, \"byzantiumBlock\": 16, \"constantinopleBlock\": 18, \"constantinopleFixBlock\": 19, \"chainId\":1234}}";
+        "{\"config\": {\"homesteadBlock\": 2, \"daoForkBlock\": 3, \"eip150Block\": 14, \"eip158Block\": 15, \"byzantiumBlock\": 16, \"constantinopleBlock\": 18, \"petersburgBlock\": 19, \"chainId\":1234}}";
     final ProtocolSchedule sched =
-        MainnetProtocolSchedule.fromConfig(GenesisConfigFile.fromConfig(json).getConfigOptions());
-    Assertions.assertThat(sched.getByBlockNumber(1).getName()).isEqualTo("Frontier");
-    Assertions.assertThat(sched.getByBlockNumber(2).getName()).isEqualTo("Homestead");
-    Assertions.assertThat(sched.getByBlockNumber(3).getName()).isEqualTo("DaoRecoveryInit");
-    Assertions.assertThat(sched.getByBlockNumber(4).getName()).isEqualTo("DaoRecoveryTransition");
-    Assertions.assertThat(sched.getByBlockNumber(13).getName()).isEqualTo("Homestead");
-    Assertions.assertThat(sched.getByBlockNumber(14).getName()).isEqualTo("TangerineWhistle");
-    Assertions.assertThat(sched.getByBlockNumber(15).getName()).isEqualTo("SpuriousDragon");
-    Assertions.assertThat(sched.getByBlockNumber(16).getName()).isEqualTo("Byzantium");
-    Assertions.assertThat(sched.getByBlockNumber(18).getName()).isEqualTo("Constantinople");
-    Assertions.assertThat(sched.getByBlockNumber(19).getName()).isEqualTo("ConstantinopleFix");
+        MainnetProtocolSchedule.fromConfig(
+            GenesisConfigFile.fromConfig(json).getConfigOptions(), EvmConfiguration.DEFAULT);
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(1)).getName()).isEqualTo("Frontier");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(2)).getName()).isEqualTo("Homestead");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(3)).getName())
+        .isEqualTo("DaoRecoveryInit");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(4)).getName())
+        .isEqualTo("DaoRecoveryTransition");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(13)).getName()).isEqualTo("Homestead");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(14)).getName())
+        .isEqualTo("TangerineWhistle");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(15)).getName())
+        .isEqualTo("SpuriousDragon");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(16)).getName()).isEqualTo("Byzantium");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(18)).getName())
+        .isEqualTo("Constantinople");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(19)).getName())
+        .isEqualTo("Petersburg");
   }
 
   @Test
   public void outOfOrderConstantinoplesFail() {
     final String json =
-        "{\"config\": {\"homesteadBlock\": 2, \"daoForkBlock\": 3, \"eip150Block\": 14, \"eip158Block\": 15, \"byzantiumBlock\": 16, \"constantinopleBlock\": 18, \"constantinopleFixBlock\": 17, \"chainId\":1234}}";
+        "{\"config\": {\"homesteadBlock\": 2, \"daoForkBlock\": 3, \"eip150Block\": 14, \"eip158Block\": 15, \"byzantiumBlock\": 16, \"constantinopleBlock\": 18, \"petersburgBlock\": 17, \"chainId\":1234}}";
     Assertions.assertThatExceptionOfType(RuntimeException.class)
         .describedAs(
-            "Genesis Config Error: 'ConstantinopleFix' is scheduled for block 17 but it must be on or after block 18.")
+            "Genesis Config Error: 'Petersburg' is scheduled for block 17 but it must be on or after block 18.")
         .isThrownBy(
             () ->
                 MainnetProtocolSchedule.fromConfig(
-                    GenesisConfigFile.fromConfig(json).getConfigOptions()));
-  }
-
-  @Test
-  public void shouldCreateRopstenConfig() throws Exception {
-    final ProtocolSchedule sched =
-        MainnetProtocolSchedule.fromConfig(
-            GenesisConfigFile.fromConfig(
-                    Resources.toString(
-                        this.getClass().getResource("/ropsten.json"), StandardCharsets.UTF_8))
-                .getConfigOptions());
-    Assertions.assertThat(sched.getByBlockNumber(0L).getName()).isEqualTo("TangerineWhistle");
-    Assertions.assertThat(sched.getByBlockNumber(1L).getName()).isEqualTo("TangerineWhistle");
-    Assertions.assertThat(sched.getByBlockNumber(10L).getName()).isEqualTo("SpuriousDragon");
-    Assertions.assertThat(sched.getByBlockNumber(1_700_000L).getName()).isEqualTo("Byzantium");
-    Assertions.assertThat(sched.getByBlockNumber(4_230_000L).getName()).isEqualTo("Constantinople");
-    Assertions.assertThat(sched.getByBlockNumber(4_939_394L).getName())
-        .isEqualTo("ConstantinopleFix");
-    Assertions.assertThat(sched.getByBlockNumber(6_485_846L).getName()).isEqualTo("Istanbul");
-    Assertions.assertThat(sched.getByBlockNumber(7_117_117L).getName()).isEqualTo("MuirGlacier");
-    Assertions.assertThat(sched.getByBlockNumber(Long.MAX_VALUE).getName())
-        .isEqualTo("MuirGlacier");
+                    GenesisConfigFile.fromConfig(json).getConfigOptions(),
+                    EvmConfiguration.DEFAULT));
   }
 
   @Test
@@ -116,29 +123,21 @@ public void shouldCreateGoerliConfig() throws Exception {
             GenesisConfigFile.fromConfig(
                     Resources.toString(
                         this.getClass().getResource("/goerli.json"), StandardCharsets.UTF_8))
-                .getConfigOptions());
-    Assertions.assertThat(sched.getByBlockNumber(0L).getName()).isEqualTo("ConstantinopleFix");
-    Assertions.assertThat(sched.getByBlockNumber(1_561_651L).getName()).isEqualTo("Istanbul");
-    Assertions.assertThat(sched.getByBlockNumber(Long.MAX_VALUE).getName()).isEqualTo("Istanbul");
+                .getConfigOptions(),
+            EvmConfiguration.DEFAULT);
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(0L)).getName())
+        .isEqualTo("Petersburg");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(1_561_651L)).getName())
+        .isEqualTo("Istanbul");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(4_460_644L)).getName())
+        .isEqualTo("Berlin");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(5_062_605L)).getName())
+        .isEqualTo("London");
+    Assertions.assertThat(sched.getByBlockHeader(blockHeader(Long.MAX_VALUE)).getName())
+        .isEqualTo("London");
   }
 
-  @Test
-  public void shouldCreateRinkebyConfig() throws Exception {
-    final ProtocolSchedule sched =
-        MainnetProtocolSchedule.fromConfig(
-            GenesisConfigFile.fromConfig(
-                    Resources.toString(
-                        this.getClass().getResource("/rinkeby.json"), StandardCharsets.UTF_8))
-                .getConfigOptions());
-    Assertions.assertThat(sched.getByBlockNumber(0L).getName()).isEqualTo("Frontier");
-    Assertions.assertThat(sched.getByBlockNumber(1L).getName()).isEqualTo("Homestead");
-    Assertions.assertThat(sched.getByBlockNumber(2L).getName()).isEqualTo("TangerineWhistle");
-    Assertions.assertThat(sched.getByBlockNumber(3L).getName()).isEqualTo("SpuriousDragon");
-    Assertions.assertThat(sched.getByBlockNumber(1_035_301L).getName()).isEqualTo("Byzantium");
-    Assertions.assertThat(sched.getByBlockNumber(3_660_663L).getName()).isEqualTo("Constantinople");
-    Assertions.assertThat(sched.getByBlockNumber(4_321_234L).getName())
-        .isEqualTo("ConstantinopleFix");
-    Assertions.assertThat(sched.getByBlockNumber(5_435_345L).getName()).isEqualTo("Istanbul");
-    Assertions.assertThat(sched.getByBlockNumber(Long.MAX_VALUE).getName()).isEqualTo("Istanbul");
+  private BlockHeader blockHeader(final long number) {
+    return new BlockHeaderTestFixture().number(number).buildHeader();
   }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessorTest.java
index 772981c54eb..ce555391570 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessorTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessorTest.java
@@ -16,21 +16,31 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.core.fees.CoinbaseFeePriceCalculator;
-import org.hyperledger.besu.ethereum.core.fees.TransactionPriceCalculator;
+import org.hyperledger.besu.ethereum.core.feemarket.CoinbaseFeePriceCalculator;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
 import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
 import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
+import org.hyperledger.besu.evm.account.EvmAccount;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.gascalculator.LondonGasCalculator;
+import org.hyperledger.besu.evm.processor.AbstractMessageProcessor;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
-import org.junit.Before;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.apache.tuweni.bytes.Bytes;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -42,9 +52,7 @@ public class MainnetTransactionProcessorTest {
 
   private static final int MAX_STACK_SIZE = 1024;
 
-  private MainnetTransactionProcessor transactionProcessor;
-
-  @Mock private GasCalculator gasCalculator;
+  private final GasCalculator gasCalculator = new LondonGasCalculator();
   @Mock private MainnetTransactionValidator transactionValidator;
   @Mock private AbstractMessageProcessor contractCreationProcessor;
   @Mock private AbstractMessageProcessor messageCallProcessor;
@@ -55,19 +63,80 @@ public class MainnetTransactionProcessorTest {
   @Mock private Transaction transaction;
   @Mock private BlockHashLookup blockHashLookup;
 
-  @Before
-  public void before() {
-    transactionProcessor =
-        new MainnetTransactionProcessor(
-            gasCalculator,
-            transactionValidator,
-            contractCreationProcessor,
-            messageCallProcessor,
-            false,
-            MAX_STACK_SIZE,
-            Account.DEFAULT_VERSION,
-            TransactionPriceCalculator.frontier(),
-            CoinbaseFeePriceCalculator.frontier());
+  @Mock private EvmAccount senderAccount;
+  @Mock private MutableAccount mutableSenderAccount;
+
+  MainnetTransactionProcessor createTransactionProcessor(final boolean warmCoinbase) {
+    return new MainnetTransactionProcessor(
+        gasCalculator,
+        transactionValidator,
+        contractCreationProcessor,
+        messageCallProcessor,
+        false,
+        warmCoinbase,
+        MAX_STACK_SIZE,
+        FeeMarket.legacy(),
+        CoinbaseFeePriceCalculator.frontier());
+  }
+
+  @Test
+  public void shouldWarmCoinbaseIfRequested() {
+    Optional<Address> toAddresss =
+        Optional.of(Address.fromHexString("0x2222222222222222222222222222222222222222"));
+    when(transaction.getTo()).thenReturn(toAddresss);
+    Address senderAddress = Address.fromHexString("0x5555555555555555555555555555555555555555");
+    Address coinbaseAddress = Address.fromHexString("0x4242424242424242424242424242424242424242");
+
+    when(senderAccount.getMutable()).thenReturn(mutableSenderAccount);
+    when(transaction.getHash()).thenReturn(Hash.EMPTY);
+    when(transaction.getPayload()).thenReturn(Bytes.EMPTY);
+    when(transaction.getSender()).thenReturn(senderAddress);
+    when(transaction.getValue()).thenReturn(Wei.ZERO);
+    when(transactionValidator.validate(any(), any(), any())).thenReturn(ValidationResult.valid());
+    when(transactionValidator.validateForSender(any(), any(), any()))
+        .thenReturn(ValidationResult.valid());
+    when(worldState.getOrCreate(any())).thenReturn(senderAccount);
+    when(worldState.getOrCreateSenderAccount(any())).thenReturn(senderAccount);
+    when(worldState.updater()).thenReturn(worldState);
+
+    AtomicBoolean coinbaseWarmed = new AtomicBoolean(false);
+    doAnswer(
+            invocation -> {
+              MessageFrame messageFrame = invocation.getArgument(0);
+              coinbaseWarmed.set(messageFrame.warmUpAddress(coinbaseAddress));
+              messageFrame.getMessageFrameStack().pop();
+              return null;
+            })
+        .when(messageCallProcessor)
+        .process(any(), any());
+
+    var transactionProcessor = createTransactionProcessor(true);
+    transactionProcessor.processTransaction(
+        blockchain,
+        worldState,
+        blockHeader,
+        transaction,
+        coinbaseAddress,
+        blockHashLookup,
+        false,
+        ImmutableTransactionValidationParams.builder().build(),
+        Wei.ZERO);
+
+    assertThat(coinbaseWarmed).isTrue();
+
+    transactionProcessor = createTransactionProcessor(false);
+    transactionProcessor.processTransaction(
+        blockchain,
+        worldState,
+        blockHeader,
+        transaction,
+        coinbaseAddress,
+        blockHashLookup,
+        false,
+        ImmutableTransactionValidationParams.builder().build(),
+        Wei.ZERO);
+
+    assertThat(coinbaseWarmed).isFalse();
   }
 
   @Test
@@ -78,6 +147,8 @@ public void shouldCallTransactionValidatorWithExpectedTransactionValidationParam
     final TransactionValidationParams expectedValidationParams =
         ImmutableTransactionValidationParams.builder().build();
 
+    var transactionProcessor = createTransactionProcessor(false);
+
     transactionProcessor.processTransaction(
         blockchain,
         worldState,
@@ -86,19 +157,21 @@ public void shouldCallTransactionValidatorWithExpectedTransactionValidationParam
         Address.fromHexString("1"),
         blockHashLookup,
         false,
-        ImmutableTransactionValidationParams.builder().build());
+        ImmutableTransactionValidationParams.builder().build(),
+        Wei.ZERO);
 
     assertThat(txValidationParamCaptor.getValue())
-        .isEqualToComparingFieldByField(expectedValidationParams);
+        .usingRecursiveComparison()
+        .isEqualTo(expectedValidationParams);
   }
 
   private ArgumentCaptor<TransactionValidationParams> transactionValidationParamCaptor() {
     final ArgumentCaptor<TransactionValidationParams> txValidationParamCaptor =
         ArgumentCaptor.forClass(TransactionValidationParams.class);
-    when(transactionValidator.validate(any(), any())).thenReturn(ValidationResult.valid());
+    when(transactionValidator.validate(any(), any(), any())).thenReturn(ValidationResult.valid());
     // returning invalid transaction to halt method execution
     when(transactionValidator.validateForSender(any(), any(), txValidationParamCaptor.capture()))
-        .thenReturn(ValidationResult.invalid(TransactionInvalidReason.INCORRECT_NONCE));
+        .thenReturn(ValidationResult.invalid(TransactionInvalidReason.NONCE_TOO_HIGH));
     return txValidationParamCaptor;
   }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidatorTest.java
index b43bb1a26a9..868c39d5370 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidatorTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidatorTest.java
@@ -15,33 +15,40 @@
 package org.hyperledger.besu.ethereum.mainnet;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.GAS_PRICE_MUST_BE_ZERO;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.GAS_PRICE_BELOW_CURRENT_BASE_FEE;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.INVALID_TRANSACTION_FORMAT;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.MAX_PRIORITY_FEE_PER_GAS_EXCEEDS_MAX_FEE_PER_GAS;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.UPFRONT_COST_EXCEEDS_BALANCE;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.GasLimitCalculator;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionFilter;
 import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.fees.TransactionPriceCalculator;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
 import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
 import org.hyperledger.besu.plugin.data.TransactionType;
 
 import java.math.BigInteger;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.Supplier;
 
-import org.junit.After;
+import com.google.common.base.Suppliers;
+import org.apache.tuweni.bytes.Bytes;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -51,37 +58,33 @@
 @RunWith(MockitoJUnitRunner.class)
 public class MainnetTransactionValidatorTest {
 
-  private static final KeyPair senderKeys = KeyPair.generate();
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+  private static final KeyPair senderKeys = SIGNATURE_ALGORITHM.get().generateKeyPair();
 
-  @Mock private GasCalculator gasCalculator;
+  private static final TransactionValidationParams transactionValidationParams =
+      TransactionValidationParams.processingBlockParams;
 
-  @Mock private TransactionPriceCalculator transactionPriceCalculator;
+  @Mock private GasCalculator gasCalculator;
 
   private final Transaction basicTransaction =
       new TransactionTestFixture()
           .chainId(Optional.of(BigInteger.ONE))
           .createTransaction(senderKeys);
 
-  private final boolean defaultGoQuorumCompatibilityMode = false;
-
-  @After
-  public void reset() {
-    ExperimentalEIPs.eip1559Enabled = ExperimentalEIPs.EIP1559_ENABLED_DEFAULT_VALUE;
-  }
-
   @Test
   public void shouldRejectTransactionIfIntrinsicGasExceedsGasLimit() {
     final MainnetTransactionValidator validator =
         new MainnetTransactionValidator(
-            gasCalculator, false, Optional.empty(), defaultGoQuorumCompatibilityMode);
+            gasCalculator, GasLimitCalculator.constant(), false, Optional.empty());
     final Transaction transaction =
         new TransactionTestFixture()
             .gasLimit(10)
             .chainId(Optional.empty())
             .createTransaction(senderKeys);
-    when(gasCalculator.transactionIntrinsicGasCost(transaction)).thenReturn(Gas.of(50));
+    when(gasCalculator.transactionIntrinsicGasCost(any(), anyBoolean())).thenReturn(50L);
 
-    assertThat(validator.validate(transaction, Optional.empty()))
+    assertThat(validator.validate(transaction, Optional.empty(), transactionValidationParams))
         .isEqualTo(
             ValidationResult.invalid(TransactionInvalidReason.INTRINSIC_GAS_EXCEEDS_GAS_LIMIT));
   }
@@ -90,8 +93,8 @@ public void shouldRejectTransactionIfIntrinsicGasExceedsGasLimit() {
   public void shouldRejectTransactionWhenTransactionHasChainIdAndValidatorDoesNot() {
     final MainnetTransactionValidator validator =
         new MainnetTransactionValidator(
-            gasCalculator, false, Optional.empty(), defaultGoQuorumCompatibilityMode);
-    assertThat(validator.validate(basicTransaction, Optional.empty()))
+            gasCalculator, GasLimitCalculator.constant(), false, Optional.empty());
+    assertThat(validator.validate(basicTransaction, Optional.empty(), transactionValidationParams))
         .isEqualTo(
             ValidationResult.invalid(
                 TransactionInvalidReason.REPLAY_PROTECTED_SIGNATURES_NOT_SUPPORTED));
@@ -102,10 +105,10 @@ public void shouldRejectTransactionWhenTransactionHasIncorrectChainId() {
     final MainnetTransactionValidator validator =
         new MainnetTransactionValidator(
             gasCalculator,
+            GasLimitCalculator.constant(),
             false,
-            Optional.of(BigInteger.valueOf(2)),
-            defaultGoQuorumCompatibilityMode);
-    assertThat(validator.validate(basicTransaction, Optional.empty()))
+            Optional.of(BigInteger.valueOf(2)));
+    assertThat(validator.validate(basicTransaction, Optional.empty(), transactionValidationParams))
         .isEqualTo(ValidationResult.invalid(TransactionInvalidReason.WRONG_CHAIN_ID));
   }
 
@@ -113,7 +116,7 @@ public void shouldRejectTransactionWhenTransactionHasIncorrectChainId() {
   public void shouldRejectTransactionWhenSenderAccountDoesNotExist() {
     final MainnetTransactionValidator validator =
         new MainnetTransactionValidator(
-            gasCalculator, false, Optional.of(BigInteger.ONE), defaultGoQuorumCompatibilityMode);
+            gasCalculator, GasLimitCalculator.constant(), false, Optional.of(BigInteger.ONE));
     assertThat(validator.validateForSender(basicTransaction, null, false))
         .isEqualTo(ValidationResult.invalid(TransactionInvalidReason.UPFRONT_COST_EXCEEDS_BALANCE));
   }
@@ -122,7 +125,7 @@ public void shouldRejectTransactionWhenSenderAccountDoesNotExist() {
   public void shouldRejectTransactionWhenTransactionNonceBelowAccountNonce() {
     final MainnetTransactionValidator validator =
         new MainnetTransactionValidator(
-            gasCalculator, false, Optional.of(BigInteger.ONE), defaultGoQuorumCompatibilityMode);
+            gasCalculator, GasLimitCalculator.constant(), false, Optional.of(BigInteger.ONE));
 
     final Account account = accountWithNonce(basicTransaction.getNonce() + 1);
     assertThat(validator.validateForSender(basicTransaction, account, false))
@@ -134,11 +137,11 @@ public void shouldRejectTransactionWhenTransactionNonceBelowAccountNonce() {
       shouldRejectTransactionWhenTransactionNonceAboveAccountNonceAndFutureNonceIsNotAllowed() {
     final MainnetTransactionValidator validator =
         new MainnetTransactionValidator(
-            gasCalculator, false, Optional.of(BigInteger.ONE), defaultGoQuorumCompatibilityMode);
+            gasCalculator, GasLimitCalculator.constant(), false, Optional.of(BigInteger.ONE));
 
     final Account account = accountWithNonce(basicTransaction.getNonce() - 1);
     assertThat(validator.validateForSender(basicTransaction, account, false))
-        .isEqualTo(ValidationResult.invalid(TransactionInvalidReason.INCORRECT_NONCE));
+        .isEqualTo(ValidationResult.invalid(TransactionInvalidReason.NONCE_TOO_HIGH));
   }
 
   @Test
@@ -146,7 +149,7 @@ public void shouldRejectTransactionWhenTransactionNonceBelowAccountNonce() {
       shouldAcceptTransactionWhenTransactionNonceAboveAccountNonceAndFutureNonceIsAllowed() {
     final MainnetTransactionValidator validator =
         new MainnetTransactionValidator(
-            gasCalculator, false, Optional.of(BigInteger.ONE), defaultGoQuorumCompatibilityMode);
+            gasCalculator, GasLimitCalculator.constant(), false, Optional.of(BigInteger.ONE));
 
     final Account account = accountWithNonce(basicTransaction.getNonce() - 1);
     assertThat(validator.validateForSender(basicTransaction, account, true))
@@ -157,24 +160,24 @@ public void shouldRejectTransactionWhenTransactionNonceBelowAccountNonce() {
   public void shouldRejectTransactionWhenNonceExceedsMaximumAllowedNonce() {
     final MainnetTransactionValidator validator =
         new MainnetTransactionValidator(
-            gasCalculator, false, Optional.of(BigInteger.ONE), defaultGoQuorumCompatibilityMode);
+            gasCalculator, GasLimitCalculator.constant(), false, Optional.of(BigInteger.ONE));
 
     final Transaction transaction =
         new TransactionTestFixture().nonce(11).createTransaction(senderKeys);
     final Account account = accountWithNonce(5);
 
     assertThat(validator.validateForSender(transaction, account, false))
-        .isEqualTo(ValidationResult.invalid(TransactionInvalidReason.INCORRECT_NONCE));
+        .isEqualTo(ValidationResult.invalid(TransactionInvalidReason.NONCE_TOO_HIGH));
   }
 
   @Test
   public void transactionWithNullSenderCanBeValidIfGasPriceAndValueIsZero() {
     final MainnetTransactionValidator validator =
         new MainnetTransactionValidator(
-            gasCalculator, false, Optional.of(BigInteger.ONE), defaultGoQuorumCompatibilityMode);
+            gasCalculator, GasLimitCalculator.constant(), false, Optional.of(BigInteger.ONE));
 
     final TransactionTestFixture builder = new TransactionTestFixture();
-    final KeyPair senderKeyPair = KeyPair.generate();
+    final KeyPair senderKeyPair = SIGNATURE_ALGORITHM.get().generateKeyPair();
     final Address arbitrarySender = Address.fromHexString("1");
     builder.gasPrice(Wei.ZERO).nonce(0).sender(arbitrarySender).value(Wei.ZERO);
 
@@ -182,11 +185,28 @@ public void transactionWithNullSenderCanBeValidIfGasPriceAndValueIsZero() {
         .isEqualTo(ValidationResult.valid());
   }
 
+  @Test
+  public void shouldRejectTransactionIfAccountIsNotEOA() {
+    final MainnetTransactionValidator validator =
+        new MainnetTransactionValidator(
+            gasCalculator, GasLimitCalculator.constant(), false, Optional.empty());
+    validator.setTransactionFilter(transactionFilter(false));
+
+    Account invalidEOA =
+        when(account(basicTransaction.getUpfrontCost(0L), basicTransaction.getNonce())
+                .getCodeHash())
+            .thenReturn(Hash.fromHexStringLenient("0xdeadbeef"))
+            .getMock();
+
+    assertThat(validator.validateForSender(basicTransaction, invalidEOA, true))
+        .isEqualTo(ValidationResult.invalid(TransactionInvalidReason.TX_SENDER_NOT_AUTHORIZED));
+  }
+
   @Test
   public void shouldRejectTransactionIfAccountIsNotPermitted() {
     final MainnetTransactionValidator validator =
         new MainnetTransactionValidator(
-            gasCalculator, false, Optional.empty(), defaultGoQuorumCompatibilityMode);
+            gasCalculator, GasLimitCalculator.constant(), false, Optional.empty());
     validator.setTransactionFilter(transactionFilter(false));
 
     assertThat(validator.validateForSender(basicTransaction, accountWithNonce(0), true))
@@ -197,13 +217,75 @@ public void shouldRejectTransactionIfAccountIsNotPermitted() {
   public void shouldAcceptValidTransactionIfAccountIsPermitted() {
     final MainnetTransactionValidator validator =
         new MainnetTransactionValidator(
-            gasCalculator, false, Optional.empty(), defaultGoQuorumCompatibilityMode);
+            gasCalculator, GasLimitCalculator.constant(), false, Optional.empty());
     validator.setTransactionFilter(transactionFilter(true));
 
     assertThat(validator.validateForSender(basicTransaction, accountWithNonce(0), true))
         .isEqualTo(ValidationResult.valid());
   }
 
+  @Test
+  public void shouldRejectTransactionWithMaxFeeTimesGasLimitGreaterThanBalance() {
+    final MainnetTransactionValidator validator =
+        new MainnetTransactionValidator(
+            gasCalculator, GasLimitCalculator.constant(), false, Optional.empty());
+    validator.setTransactionFilter(transactionFilter(true));
+
+    assertThat(
+            validator.validateForSender(
+                Transaction.builder()
+                    .type(TransactionType.EIP1559)
+                    .nonce(0)
+                    .maxPriorityFeePerGas(Wei.of(5))
+                    .maxFeePerGas(Wei.of(7))
+                    .gasLimit(15)
+                    .to(Address.ZERO)
+                    .value(Wei.of(0))
+                    .payload(Bytes.EMPTY)
+                    .chainId(BigInteger.ONE)
+                    .signAndBuild(new SECP256K1().generateKeyPair()),
+                account(Wei.of(100), 0),
+                true))
+        .isEqualTo(ValidationResult.invalid(UPFRONT_COST_EXCEEDS_BALANCE));
+  }
+
+  @Test
+  public void shouldRejectTransactionWithMaxPriorityFeeGreaterThanMaxFee() {
+    final MainnetTransactionValidator validator =
+        new MainnetTransactionValidator(
+            gasCalculator,
+            GasLimitCalculator.constant(),
+            FeeMarket.london(0L),
+            false,
+            Optional.of(BigInteger.ONE),
+            Set.of(
+                new TransactionType[] {
+                  TransactionType.FRONTIER, TransactionType.ACCESS_LIST, TransactionType.EIP1559
+                }),
+            Integer.MAX_VALUE);
+    validator.setTransactionFilter(transactionFilter(true));
+
+    final Transaction transaction =
+        Transaction.builder()
+            .type(TransactionType.EIP1559)
+            .nonce(0)
+            .maxPriorityFeePerGas(Wei.of(7))
+            .maxFeePerGas(Wei.of(4))
+            .gasLimit(15)
+            .to(Address.ZERO)
+            .value(Wei.of(0))
+            .payload(Bytes.EMPTY)
+            .chainId(BigInteger.ONE)
+            .signAndBuild(new SECP256K1().generateKeyPair());
+
+    final ValidationResult<TransactionInvalidReason> validationResult =
+        validator.validate(transaction, Optional.of(Wei.ONE), transactionValidationParams);
+    assertThat(validationResult)
+        .isEqualTo(ValidationResult.invalid(MAX_PRIORITY_FEE_PER_GAS_EXCEEDS_MAX_FEE_PER_GAS));
+    assertThat(validationResult.getErrorMessage())
+        .isEqualTo("max priority fee per gas cannot be greater than max fee per gas");
+  }
+
   @Test
   public void shouldPropagateCorrectStateChangeParamToTransactionFilter() {
     final ArgumentCaptor<Boolean> stateChangeLocalParamCaptor =
@@ -219,7 +301,7 @@ public void shouldPropagateCorrectStateChangeParamToTransactionFilter() {
 
     final MainnetTransactionValidator validator =
         new MainnetTransactionValidator(
-            gasCalculator, false, Optional.empty(), defaultGoQuorumCompatibilityMode);
+            gasCalculator, GasLimitCalculator.constant(), false, Optional.empty());
     validator.setTransactionFilter(transactionFilter);
 
     final TransactionValidationParams validationParams =
@@ -237,7 +319,7 @@ public void shouldNotCheckAccountPermissionIfBothValidationParamsCheckPermission
 
     final MainnetTransactionValidator validator =
         new MainnetTransactionValidator(
-            gasCalculator, false, Optional.empty(), defaultGoQuorumCompatibilityMode);
+            gasCalculator, GasLimitCalculator.constant(), false, Optional.empty());
     validator.setTransactionFilter(transactionFilter);
 
     final TransactionValidationParams validationParams =
@@ -251,134 +333,202 @@ public void shouldNotCheckAccountPermissionIfBothValidationParamsCheckPermission
     assertThat(validator.validateForSender(basicTransaction, accountWithNonce(0), validationParams))
         .isEqualTo(ValidationResult.valid());
 
-    verifyZeroInteractions(transactionFilter);
+    verifyNoInteractions(transactionFilter);
   }
 
   @Test
   public void shouldAcceptOnlyTransactionsInAcceptedTransactionTypes() {
-    ExperimentalEIPs.eip1559Enabled = true;
-
     final MainnetTransactionValidator frontierValidator =
         new MainnetTransactionValidator(
             gasCalculator,
-            Optional.of(transactionPriceCalculator),
+            GasLimitCalculator.constant(),
+            FeeMarket.legacy(),
             false,
-            Optional.empty(),
+            Optional.of(BigInteger.ONE),
             Set.of(TransactionType.FRONTIER),
-            defaultGoQuorumCompatibilityMode);
+            Integer.MAX_VALUE);
 
     final MainnetTransactionValidator eip1559Validator =
         new MainnetTransactionValidator(
             gasCalculator,
-            Optional.of(transactionPriceCalculator),
+            GasLimitCalculator.constant(),
+            FeeMarket.london(0L),
             false,
-            Optional.empty(),
+            Optional.of(BigInteger.ONE),
             Set.of(TransactionType.FRONTIER, TransactionType.EIP1559),
-            defaultGoQuorumCompatibilityMode);
+            Integer.MAX_VALUE);
 
     final Transaction transaction =
         new TransactionTestFixture()
             .type(TransactionType.EIP1559)
-            .gasPremium(Optional.of(Wei.of(3)))
-            .feeCap(Optional.of(Wei.of(6)))
+            .maxPriorityFeePerGas(Optional.of(Wei.of(3)))
+            .maxFeePerGas(Optional.of(Wei.of(6)))
             .gasLimit(21000)
-            .chainId(Optional.empty())
+            .chainId(Optional.of(BigInteger.ONE))
             .createTransaction(senderKeys);
 
-    when(transactionPriceCalculator.price(eq(transaction), any())).thenReturn(Wei.of(160000L));
-
-    assertThat(frontierValidator.validate(transaction, Optional.empty()))
-        .isEqualTo(ValidationResult.invalid(TransactionInvalidReason.INVALID_TRANSACTION_FORMAT));
+    assertThat(
+            frontierValidator.validate(transaction, Optional.empty(), transactionValidationParams))
+        .isEqualTo(ValidationResult.invalid(INVALID_TRANSACTION_FORMAT));
 
-    when(gasCalculator.transactionIntrinsicGasCost(transaction)).thenReturn(Gas.of(0));
+    when(gasCalculator.transactionIntrinsicGasCost(any(), anyBoolean())).thenReturn(0L);
 
-    assertThat(eip1559Validator.validate(transaction, Optional.of(1L)))
+    assertThat(
+            eip1559Validator.validate(
+                transaction, Optional.of(Wei.ONE), transactionValidationParams))
         .isEqualTo(ValidationResult.valid());
-
-    ExperimentalEIPs.eip1559Enabled = false;
   }
 
   @Test
   public void shouldRejectTransactionIfEIP1559TransactionGasPriceLessBaseFee() {
-    ExperimentalEIPs.eip1559Enabled = true;
     final MainnetTransactionValidator validator =
         new MainnetTransactionValidator(
             gasCalculator,
-            Optional.of(transactionPriceCalculator),
+            GasLimitCalculator.constant(),
+            FeeMarket.london(0L),
             false,
-            Optional.empty(),
+            Optional.of(BigInteger.ONE),
             Set.of(TransactionType.FRONTIER, TransactionType.EIP1559),
-            defaultGoQuorumCompatibilityMode);
+            Integer.MAX_VALUE);
     final Transaction transaction =
         new TransactionTestFixture()
             .type(TransactionType.EIP1559)
-            .gasPremium(Optional.of(Wei.of(1)))
-            .feeCap(Optional.of(Wei.of(1)))
-            .chainId(Optional.empty())
+            .maxPriorityFeePerGas(Optional.of(Wei.of(1)))
+            .maxFeePerGas(Optional.of(Wei.of(1)))
+            .chainId(Optional.of(BigInteger.ONE))
             .createTransaction(senderKeys);
-    final Optional<Long> basefee = Optional.of(150000L);
-    when(transactionPriceCalculator.price(transaction, basefee)).thenReturn(Wei.of(1));
-    assertThat(validator.validate(transaction, basefee))
-        .isEqualTo(ValidationResult.invalid(TransactionInvalidReason.INVALID_TRANSACTION_FORMAT));
-    ExperimentalEIPs.eip1559Enabled = false;
+    final Optional<Wei> basefee = Optional.of(Wei.of(150000L));
+    assertThat(validator.validate(transaction, basefee, transactionValidationParams))
+        .isEqualTo(ValidationResult.invalid(GAS_PRICE_BELOW_CURRENT_BASE_FEE));
   }
 
   @Test
-  public void shouldAcceptValidEIP1559() {
-    ExperimentalEIPs.eip1559Enabled = true;
+  public void shouldAcceptZeroGasPriceTransactionIfBaseFeeIsZero() {
+    final Optional<Wei> zeroBaseFee = Optional.of(Wei.ZERO);
     final MainnetTransactionValidator validator =
         new MainnetTransactionValidator(
             gasCalculator,
-            Optional.of(transactionPriceCalculator),
+            GasLimitCalculator.constant(),
+            FeeMarket.london(0L, zeroBaseFee),
             false,
-            Optional.empty(),
+            Optional.of(BigInteger.ONE),
             Set.of(TransactionType.FRONTIER, TransactionType.EIP1559),
-            defaultGoQuorumCompatibilityMode);
+            Integer.MAX_VALUE);
     final Transaction transaction =
         new TransactionTestFixture()
-            .gasPremium(Optional.of(Wei.of(1)))
-            .feeCap(Optional.of(Wei.of(1)))
-            .chainId(Optional.empty())
+            .type(TransactionType.EIP1559)
+            .maxPriorityFeePerGas(Optional.of(Wei.ZERO))
+            .maxFeePerGas(Optional.of(Wei.ZERO))
+            .chainId(Optional.of(BigInteger.ONE))
             .createTransaction(senderKeys);
-    final Optional<Long> basefee = Optional.of(150000L);
-    when(gasCalculator.transactionIntrinsicGasCost(transaction)).thenReturn(Gas.of(50));
 
-    assertThat(validator.validate(transaction, basefee)).isEqualTo(ValidationResult.valid());
-    ExperimentalEIPs.eip1559Enabled = false;
+    assertThat(validator.validate(transaction, zeroBaseFee, transactionValidationParams))
+        .isEqualTo(ValidationResult.valid());
   }
 
   @Test
-  public void goQuorumCompatibilityModeRejectNonZeroGasPrice() {
+  public void shouldAcceptValidEIP1559() {
     final MainnetTransactionValidator validator =
-        new MainnetTransactionValidator(gasCalculator, false, Optional.empty(), true);
+        new MainnetTransactionValidator(
+            gasCalculator,
+            GasLimitCalculator.constant(),
+            FeeMarket.london(0L),
+            false,
+            Optional.of(BigInteger.ONE),
+            Set.of(TransactionType.FRONTIER, TransactionType.EIP1559),
+            Integer.MAX_VALUE);
     final Transaction transaction =
         new TransactionTestFixture()
-            .gasPrice(Wei.ONE)
-            .chainId(Optional.empty())
+            .maxPriorityFeePerGas(Optional.of(Wei.of(1)))
+            .maxFeePerGas(Optional.of(Wei.of(150000L)))
+            .type(TransactionType.EIP1559)
+            .chainId(Optional.of(BigInteger.ONE))
             .createTransaction(senderKeys);
+    final Optional<Wei> basefee = Optional.of(Wei.of(150000L));
+    when(gasCalculator.transactionIntrinsicGasCost(any(), anyBoolean())).thenReturn(50L);
 
-    assertThat(validator.validate(transaction, Optional.empty()).isValid()).isFalse();
-    assertThat(validator.validate(transaction, Optional.empty()).getInvalidReason())
-        .isEqualTo(GAS_PRICE_MUST_BE_ZERO);
+    assertThat(validator.validate(transaction, basefee, transactionValidationParams))
+        .isEqualTo(ValidationResult.valid());
   }
 
   @Test
-  public void goQuorumCompatibilityModeSuccessZeroGasPrice() {
+  public void shouldValidate1559TransactionWithPriceLowerThanBaseFeeForTransactionPool() {
     final MainnetTransactionValidator validator =
-        new MainnetTransactionValidator(gasCalculator, false, Optional.empty(), true);
+        new MainnetTransactionValidator(
+            gasCalculator,
+            GasLimitCalculator.constant(),
+            FeeMarket.london(0L),
+            false,
+            Optional.of(BigInteger.ONE),
+            Set.of(TransactionType.FRONTIER, TransactionType.EIP1559),
+            Integer.MAX_VALUE);
     final Transaction transaction =
         new TransactionTestFixture()
-            .gasPrice(Wei.ZERO)
-            .chainId(Optional.empty())
+            .maxPriorityFeePerGas(Optional.of(Wei.of(1)))
+            .maxFeePerGas(Optional.of(Wei.of(1)))
+            .type(TransactionType.EIP1559)
+            .chainId(Optional.of(BigInteger.ONE))
+            .createTransaction(senderKeys);
+    when(gasCalculator.transactionIntrinsicGasCost(any(), anyBoolean())).thenReturn(50L);
+
+    assertThat(
+            validator.validate(
+                transaction, Optional.of(Wei.ONE), TransactionValidationParams.transactionPool()))
+        .isEqualTo(ValidationResult.valid());
+  }
+
+  @Test
+  public void shouldRejectTooLargeInitcode() {
+    final MainnetTransactionValidator validator =
+        new MainnetTransactionValidator(
+            gasCalculator,
+            GasLimitCalculator.constant(),
+            FeeMarket.london(0L),
+            false,
+            Optional.of(BigInteger.ONE),
+            Set.of(TransactionType.FRONTIER, TransactionType.EIP1559),
+            0xc000);
+
+    var bigPayload =
+        new TransactionTestFixture()
+            .payload(Bytes.fromHexString("0x" + "00".repeat(0xc001)))
+            .chainId(Optional.of(BigInteger.ONE))
             .createTransaction(senderKeys);
+    var validationResult =
+        validator.validate(bigPayload, Optional.empty(), transactionValidationParams);
+
+    assertThat(validationResult.isValid()).isFalse();
+    assertThat(validationResult.getInvalidReason())
+        .isEqualTo(TransactionInvalidReason.INITCODE_TOO_LARGE);
+    assertThat(validationResult.getErrorMessage())
+        .isEqualTo("Initcode size of 49153 exceeds maximum size of 49152");
+  }
 
-    when(gasCalculator.transactionIntrinsicGasCost(transaction)).thenReturn(Gas.of(50));
+  @Test
+  public void shouldAcceptTransactionWithAtLeastOneBlob() {
+    final MainnetTransactionValidator validator =
+        new MainnetTransactionValidator(
+            gasCalculator,
+            GasLimitCalculator.constant(),
+            FeeMarket.london(0L),
+            false,
+            Optional.of(BigInteger.ONE),
+            Set.of(TransactionType.FRONTIER, TransactionType.EIP1559, TransactionType.BLOB),
+            0xc000);
+
+    var blobTx =
+        new TransactionTestFixture()
+            .type(TransactionType.BLOB)
+            .chainId(Optional.of(BigInteger.ONE))
+            .createTransaction(senderKeys);
+    var validationResult =
+        validator.validate(blobTx, Optional.empty(), transactionValidationParams);
 
-    assertThat(validator.validate(transaction, Optional.empty()).isValid()).isTrue();
+    assertThat(validationResult.isValid()).isTrue();
   }
 
   private Account accountWithNonce(final long nonce) {
-    return account(basicTransaction.getUpfrontCost(), nonce);
+    return account(basicTransaction.getUpfrontCost(0L), nonce);
   }
 
   private Account account(final Wei balance, final long nonce) {
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/PoWSolverTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/PoWSolverTest.java
new file mode 100644
index 00000000000..510e78b8028
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/PoWSolverTest.java
@@ -0,0 +1,523 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.util.Subscribers;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import com.google.common.base.Stopwatch;
+import com.google.common.collect.Lists;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class PoWSolverTest {
+
+  @Test
+  public void emptyHashRateAndWorkDefinitionIsReportedPriorToSolverStarting() {
+    final List<Long> noncesToTry = Arrays.asList(1L, 1L, 1L, 1L, 1L, 1L, 0L);
+    final PoWSolver solver =
+        new PoWSolver(
+            noncesToTry,
+            PoWHasher.ETHASH_LIGHT,
+            false,
+            Subscribers.none(),
+            new EpochCalculator.DefaultEpochCalculator(),
+            1000,
+            8);
+
+    assertThat(solver.hashesPerSecond()).isEqualTo(Optional.empty());
+    assertThat(solver.getWorkDefinition()).isEqualTo(Optional.empty());
+  }
+
+  @Test
+  public void hashRateIsProducedSuccessfully() throws InterruptedException, ExecutionException {
+    final List<Long> noncesToTry = Arrays.asList(1L, 1L, 1L, 1L, 1L, 1L, 0L);
+
+    final PoWHasher hasher = mock(PoWHasher.class);
+    doAnswer(
+            invocation -> {
+              final Object[] args = invocation.getArguments();
+              final long nonce = ((long) args[0]);
+              final Bytes prePow = (Bytes) args[3];
+              PoWSolution solution =
+                  new PoWSolution(
+                      nonce,
+                      Hash.wrap(Bytes32.leftPad(Bytes.EMPTY)),
+                      Bytes32.rightPad(Bytes.of((byte) (nonce & 0xFF))),
+                      prePow);
+              return solution;
+            })
+        .when(hasher)
+        .hash(anyLong(), anyLong(), any(), any());
+
+    final PoWSolver solver =
+        new PoWSolver(
+            noncesToTry,
+            hasher,
+            false,
+            Subscribers.none(),
+            new EpochCalculator.DefaultEpochCalculator(),
+            1000,
+            8);
+
+    final Stopwatch operationTimer = Stopwatch.createStarted();
+    final PoWSolverInputs inputs = new PoWSolverInputs(UInt256.ONE, Bytes.EMPTY, 5);
+    solver.solveFor(PoWSolver.PoWSolverJob.createFromInputs(inputs));
+    final double runtimeSeconds = operationTimer.elapsed(TimeUnit.NANOSECONDS) / 1e9;
+    final long worstCaseHashesPerSecond = (long) (noncesToTry.size() / runtimeSeconds);
+
+    final Optional<Long> hashesPerSecond = solver.hashesPerSecond();
+    assertThat(hashesPerSecond.isPresent()).isTrue();
+    assertThat(hashesPerSecond.get()).isGreaterThanOrEqualTo(worstCaseHashesPerSecond);
+
+    assertThat(solver.getWorkDefinition().isPresent()).isTrue();
+    assertThat(solver.getWorkDefinition().equals(Optional.of(inputs))).isTrue();
+  }
+
+  @Test
+  public void ifInvokedTwiceProducesCorrectAnswerForSecondInvocation()
+      throws InterruptedException, ExecutionException {
+
+    final PoWSolverInputs firstInputs =
+        new PoWSolverInputs(
+            UInt256.fromHexString(
+                "0x0083126e978d4fdf3b645a1cac083126e978d4fdf3b645a1cac083126e978d4f"),
+            Bytes.wrap(
+                new byte[] {
+                  15, -114, -104, 87, -95, -36, -17, 120, 52, 1, 124, 61, -6, -66, 78, -27, -57,
+                  118, -18, -64, -103, -91, -74, -121, 42, 91, -14, -98, 101, 86, -43, -51
+                }),
+            468);
+
+    final PoWSolution expectedFirstOutput =
+        new PoWSolution(
+            -6506032554016940193L,
+            Hash.fromHexString(
+                "0xc5e3c33c86d64d0641dd3c86e8ce4628fe0aac0ef7b4c087c5fcaa45d5046d90"),
+            null,
+            firstInputs.getPrePowHash());
+
+    final PoWSolverInputs secondInputs =
+        new PoWSolverInputs(
+            UInt256.fromHexString(
+                "0x0083126e978d4fdf3b645a1cac083126e978d4fdf3b645a1cac083126e978d4f"),
+            Bytes.wrap(
+                new byte[] {
+                  -62, 121, -81, -31, 55, -38, -68, 102, -32, 95, -94, -83, -3, -48, -122, -68, 14,
+                  -125, -83, 84, -55, -23, -123, -57, -34, 25, -89, 23, 64, -9, -114, -3,
+                }),
+            1);
+
+    final PoWSolution expectedSecondOutput =
+        new PoWSolution(
+            8855952212886464488L,
+            Hash.fromHexString(
+                "0x2adb0f375dd2d528689cb9e00473c3c9692737109d547130feafbefb2c6c5244"),
+            null,
+            firstInputs.getPrePowHash());
+
+    // Nonces need to have a 0L inserted, as it is a "wasted" nonce in the solver.
+    final PoWSolver solver =
+        new PoWSolver(
+            Lists.newArrayList(expectedFirstOutput.getNonce(), 0L, expectedSecondOutput.getNonce()),
+            PoWHasher.ETHASH_LIGHT,
+            false,
+            Subscribers.none(),
+            new EpochCalculator.DefaultEpochCalculator(),
+            1000,
+            8);
+
+    PoWSolution soln = solver.solveFor(PoWSolver.PoWSolverJob.createFromInputs(firstInputs));
+    assertThat(soln.getMixHash()).isEqualTo(expectedFirstOutput.getMixHash());
+
+    soln = solver.solveFor(PoWSolver.PoWSolverJob.createFromInputs(secondInputs));
+    assertThat(soln.getMixHash()).isEqualTo(expectedSecondOutput.getMixHash());
+  }
+
+  @Test
+  public void canAcceptSolutionsSerially()
+      throws InterruptedException, ExecutionException, TimeoutException {
+
+    final PoWSolverInputs firstInputs =
+        new PoWSolverInputs(
+            UInt256.fromHexString(
+                "0x0083126e978d4fdf3b645a1cac083126e978d4fdf3b645a1cac083126e978d4f"),
+            Bytes.wrap(
+                new byte[] {
+                  15, -114, -104, 87, -95, -36, -17, 120, 52, 1, 124, 61, -6, -66, 78, -27, -57,
+                  118, -18, -64, -103, -91, -74, -121, 42, 91, -14, -98, 101, 86, -43, -51
+                }),
+            1);
+
+    final PoWSolution expectedFirstOutput =
+        new PoWSolution(
+            -6506032554016940193L,
+            Hash.fromHexString(
+                "0xc5e3c33c86d64d0641dd3c86e8ce4628fe0aac0ef7b4c087c5fcaa45d5046d90"),
+            null,
+            firstInputs.getPrePowHash());
+
+    final PoWSolverInputs secondInputs =
+        new PoWSolverInputs(
+            UInt256.fromHexString(
+                "0x0083126e978d4fdf3b645a1cac083126e978d4fdf3b645a1cac083126e978d4f"),
+            Bytes.wrap(
+                new byte[] {
+                  -62, 121, -81, -31, 55, -38, -68, 102, -32, 95, -94, -83, -3, -48, -122, -68, 14,
+                  -125, -83, 84, -55, -23, -123, -57, -34, 25, -89, 23, 64, -9, -114, -3,
+                }),
+            2);
+
+    final PoWSolution expectedSecondOutput =
+        new PoWSolution(
+            8855952212886464488L,
+            Hash.fromHexString(
+                "0x2adb0f375dd2d528689cb9e00473c3c9692737109d547130feafbefb2c6c5244"),
+            null,
+            secondInputs.getPrePowHash());
+
+    // Nonces need to have a 0L inserted, as it is a "wasted" nonce in the solver.
+    final PoWSolver solver =
+        new PoWSolver(
+            Lists.newArrayList(expectedFirstOutput.getNonce(), 0L, expectedSecondOutput.getNonce()),
+            PoWHasher.ETHASH_LIGHT,
+            true,
+            Subscribers.none(),
+            new EpochCalculator.DefaultEpochCalculator(),
+            1000,
+            8);
+
+    CompletableFuture<PoWSolution> soln1 = new CompletableFuture<>();
+    CompletableFuture<PoWSolution> soln2 = new CompletableFuture<>();
+    Thread powThread =
+        new Thread(
+            () -> {
+              try {
+                soln1.complete(
+                    solver.solveFor(PoWSolver.PoWSolverJob.createFromInputs(firstInputs)));
+                soln2.complete(
+                    solver.solveFor(PoWSolver.PoWSolverJob.createFromInputs(secondInputs)));
+              } catch (Exception e) {
+                soln1.completeExceptionally(e);
+                soln2.completeExceptionally(e);
+              }
+            });
+    powThread.start();
+    Thread.sleep(200);
+    assertThat(solver.submitSolution(expectedFirstOutput)).isTrue();
+    Thread.sleep(200);
+    assertThat(solver.submitSolution(expectedSecondOutput)).isTrue();
+
+    PoWSolution result1 = soln1.get(1, TimeUnit.SECONDS);
+    PoWSolution result2 = soln2.get(1, TimeUnit.SECONDS);
+
+    assertThat(result1.getMixHash()).isEqualTo(expectedFirstOutput.getMixHash());
+    assertThat(result2.getMixHash()).isEqualTo(expectedSecondOutput.getMixHash());
+  }
+
+  @Test
+  public void canAcceptSolutionsForMultipleJobs()
+      throws InterruptedException, ExecutionException, TimeoutException {
+
+    final PoWSolverInputs firstInputs =
+        new PoWSolverInputs(
+            UInt256.fromHexString(
+                "0x0083126e978d4fdf3b645a1cac083126e978d4fdf3b645a1cac083126e978d4f"),
+            Bytes.wrap(
+                new byte[] {
+                  15, -114, -104, 87, -95, -36, -17, 120, 52, 1, 124, 61, -6, -66, 78, -27, -57,
+                  118, -18, -64, -103, -91, -74, -121, 42, 91, -14, -98, 101, 86, -43, -51
+                }),
+            1);
+
+    final PoWSolution expectedFirstOutput =
+        new PoWSolution(
+            -6506032554016940193L,
+            Hash.fromHexString(
+                "0xc5e3c33c86d64d0641dd3c86e8ce4628fe0aac0ef7b4c087c5fcaa45d5046d90"),
+            null,
+            firstInputs.getPrePowHash());
+
+    final PoWSolverInputs secondInputs =
+        new PoWSolverInputs(
+            UInt256.fromHexString(
+                "0x0083126e978d4fdf3b645a1cac083126e978d4fdf3b645a1cac083126e978d4f"),
+            Bytes.wrap(
+                new byte[] {
+                  -62, 121, -81, -31, 55, -38, -68, 102, -32, 95, -94, -83, -3, -48, -122, -68, 14,
+                  -125, -83, 84, -55, -23, -123, -57, -34, 25, -89, 23, 64, -9, -114, -3,
+                }),
+            2);
+
+    final PoWSolution expectedSecondOutput =
+        new PoWSolution(
+            8855952212886464488L,
+            Hash.fromHexString(
+                "0x2adb0f375dd2d528689cb9e00473c3c9692737109d547130feafbefb2c6c5244"),
+            null,
+            secondInputs.getPrePowHash());
+
+    // Nonces need to have a 0L inserted, as it is a "wasted" nonce in the solver.
+    final PoWSolver solver =
+        new PoWSolver(
+            Lists.newArrayList(expectedFirstOutput.getNonce(), 0L, expectedSecondOutput.getNonce()),
+            PoWHasher.ETHASH_LIGHT,
+            true,
+            Subscribers.none(),
+            new EpochCalculator.DefaultEpochCalculator(),
+            10000,
+            8);
+
+    CompletableFuture<PoWSolution> soln1 = new CompletableFuture<>();
+    CompletableFuture<PoWSolution> soln2 = new CompletableFuture<>();
+    Thread powThread1 =
+        new Thread(
+            () -> {
+              try {
+                soln1.complete(
+                    solver.solveFor(PoWSolver.PoWSolverJob.createFromInputs(firstInputs)));
+              } catch (Exception e) {
+                soln1.completeExceptionally(e);
+                soln2.completeExceptionally(e);
+              }
+            });
+    powThread1.start();
+    Thread powThread2 =
+        new Thread(
+            () -> {
+              try {
+                soln2.complete(
+                    solver.solveFor(PoWSolver.PoWSolverJob.createFromInputs(secondInputs)));
+              } catch (Exception e) {
+                soln1.completeExceptionally(e);
+                soln2.completeExceptionally(e);
+              }
+            });
+    powThread2.start();
+    Thread.sleep(200);
+    assertThat(solver.submitSolution(expectedFirstOutput)).isTrue();
+    Thread.sleep(200);
+    assertThat(solver.submitSolution(expectedSecondOutput)).isTrue();
+
+    PoWSolution result1 = soln1.get(3, TimeUnit.SECONDS);
+    PoWSolution result2 = soln2.get(3, TimeUnit.SECONDS);
+
+    assertThat(result1.getMixHash()).isEqualTo(expectedFirstOutput.getMixHash());
+    assertThat(result2.getMixHash()).isEqualTo(expectedSecondOutput.getMixHash());
+  }
+
+  @Test
+  public void canAcceptAtMostOneSolution()
+      throws InterruptedException, ExecutionException, TimeoutException {
+
+    final PoWSolverInputs firstInputs =
+        new PoWSolverInputs(
+            UInt256.fromHexString(
+                "0x0083126e978d4fdf3b645a1cac083126e978d4fdf3b645a1cac083126e978d4f"),
+            Bytes.wrap(
+                new byte[] {
+                  15, -114, -104, 87, -95, -36, -17, 120, 52, 1, 124, 61, -6, -66, 78, -27, -57,
+                  118, -18, -64, -103, -91, -74, -121, 42, 91, -14, -98, 101, 86, -43, -51
+                }),
+            1);
+
+    final PoWSolution expectedFirstOutput =
+        new PoWSolution(
+            -6506032554016940193L,
+            Hash.fromHexString(
+                "0xc5e3c33c86d64d0641dd3c86e8ce4628fe0aac0ef7b4c087c5fcaa45d5046d90"),
+            null,
+            firstInputs.getPrePowHash());
+
+    final PoWSolverInputs secondInputs =
+        new PoWSolverInputs(
+            UInt256.fromHexString(
+                "0x0083126e978d4fdf3b645a1cac083126e978d4fdf3b645a1cac083126e978d4f"),
+            Bytes.wrap(
+                new byte[] {
+                  -62, 121, -81, -31, 55, -38, -68, 102, -32, 95, -94, -83, -3, -48, -122, -68, 14,
+                  -125, -83, 84, -55, -23, -123, -57, -34, 25, -89, 23, 64, -9, -114, -3,
+                }),
+            2);
+
+    final PoWSolution expectedSecondOutput =
+        new PoWSolution(
+            8855952212886464488L,
+            Hash.fromHexString(
+                "0x2adb0f375dd2d528689cb9e00473c3c9692737109d547130feafbefb2c6c5244"),
+            null,
+            secondInputs.getPrePowHash());
+
+    // Nonces need to have a 0L inserted, as it is a "wasted" nonce in the solver.
+    final PoWSolver solver =
+        new PoWSolver(
+            Lists.newArrayList(expectedFirstOutput.getNonce(), 0L, expectedSecondOutput.getNonce()),
+            PoWHasher.ETHASH_LIGHT,
+            true,
+            Subscribers.none(),
+            new EpochCalculator.DefaultEpochCalculator(),
+            1000,
+            8);
+
+    CompletableFuture<PoWSolution> soln1 = new CompletableFuture<>();
+    CompletableFuture<PoWSolution> soln2 = new CompletableFuture<>();
+    Thread powThread1 =
+        new Thread(
+            () -> {
+              try {
+                soln1.complete(
+                    solver.solveFor(PoWSolver.PoWSolverJob.createFromInputs(firstInputs)));
+              } catch (Exception e) {
+                soln1.completeExceptionally(e);
+                soln2.completeExceptionally(e);
+              }
+            });
+    powThread1.start();
+    Thread powThread2 =
+        new Thread(
+            () -> {
+              try {
+                soln2.complete(
+                    solver.solveFor(PoWSolver.PoWSolverJob.createFromInputs(secondInputs)));
+              } catch (Exception e) {
+                soln1.completeExceptionally(e);
+                soln2.completeExceptionally(e);
+              }
+            });
+    powThread2.start();
+    Thread.sleep(200);
+    assertThat(solver.submitSolution(expectedFirstOutput)).isTrue();
+    Thread.sleep(200);
+    assertThat(solver.submitSolution(expectedSecondOutput)).isTrue();
+    assertThat(solver.submitSolution(expectedSecondOutput)).isFalse();
+    assertThat(solver.submitSolution(expectedFirstOutput)).isFalse();
+
+    PoWSolution result1 = soln1.get(1, TimeUnit.SECONDS);
+    PoWSolution result2 = soln2.get(1, TimeUnit.SECONDS);
+
+    assertThat(result1.getMixHash()).isEqualTo(expectedFirstOutput.getMixHash());
+    assertThat(result2.getMixHash()).isEqualTo(expectedSecondOutput.getMixHash());
+  }
+
+  @Test
+  public void rejectsSolutionsForOldBlocks()
+      throws InterruptedException, ExecutionException, TimeoutException {
+
+    final PoWSolverInputs firstInputs =
+        new PoWSolverInputs(
+            UInt256.fromHexString(
+                "0x0083126e978d4fdf3b645a1cac083126e978d4fdf3b645a1cac083126e978d4f"),
+            Bytes.wrap(
+                new byte[] {
+                  15, -114, -104, 87, -95, -36, -17, 120, 52, 1, 124, 61, -6, -66, 78, -27, -57,
+                  118, -18, -64, -103, -91, -74, -121, 42, 91, -14, -98, 101, 86, -43, -51
+                }),
+            1);
+
+    final PoWSolution expectedFirstOutput =
+        new PoWSolution(
+            -6506032554016940193L,
+            Hash.fromHexString(
+                "0xc5e3c33c86d64d0641dd3c86e8ce4628fe0aac0ef7b4c087c5fcaa45d5046d90"),
+            null,
+            firstInputs.getPrePowHash());
+
+    final PoWSolverInputs secondInputs =
+        new PoWSolverInputs(
+            UInt256.fromHexString(
+                "0x0083126e978d4fdf3b645a1cac083126e978d4fdf3b645a1cac083126e978d4f"),
+            Bytes.wrap(
+                new byte[] {
+                  -62, 121, -81, -31, 55, -38, -68, 102, -32, 95, -94, -83, -3, -48, -122, -68, 14,
+                  -125, -83, 84, -55, -23, -123, -57, -34, 25, -89, 23, 64, -9, -114, -3,
+                }),
+            10);
+
+    final PoWSolution expectedSecondOutput =
+        new PoWSolution(
+            8855952212886464488L,
+            Hash.fromHexString(
+                "0x2adb0f375dd2d528689cb9e00473c3c9692737109d547130feafbefb2c6c5244"),
+            null,
+            secondInputs.getPrePowHash());
+
+    // Nonces need to have a 0L inserted, as it is a "wasted" nonce in the solver.
+    final PoWSolver solver =
+        new PoWSolver(
+            Lists.newArrayList(expectedFirstOutput.getNonce(), 0L, expectedSecondOutput.getNonce()),
+            PoWHasher.ETHASH_LIGHT,
+            true,
+            Subscribers.none(),
+            new EpochCalculator.DefaultEpochCalculator(),
+            1000,
+            8);
+
+    CompletableFuture<PoWSolution> soln1 = new CompletableFuture<>();
+    CompletableFuture<PoWSolution> soln2 = new CompletableFuture<>();
+    Thread powThread1 =
+        new Thread(
+            () -> {
+              try {
+                soln1.complete(
+                    solver.solveFor(PoWSolver.PoWSolverJob.createFromInputs(firstInputs)));
+              } catch (Exception e) {
+                soln1.completeExceptionally(e);
+              }
+            });
+    powThread1.start();
+    Thread.sleep(200);
+    Thread powThread2 =
+        new Thread(
+            () -> {
+              try {
+                soln2.complete(
+                    solver.solveFor(PoWSolver.PoWSolverJob.createFromInputs(secondInputs)));
+              } catch (Exception e) {
+                soln2.completeExceptionally(e);
+              }
+            });
+    powThread2.start();
+    Thread.sleep(200);
+    // we solve the head job, and still keep it as our reference as the block with the highest
+    // number.
+    assertThat(solver.submitSolution(expectedSecondOutput)).isTrue();
+    Thread.sleep(200);
+    assertThat(solver.submitSolution(expectedFirstOutput)).isFalse();
+
+    PoWSolution result2 = soln2.get(1, TimeUnit.SECONDS);
+
+    assertThat(result2.getMixHash()).isEqualTo(expectedSecondOutput.getMixHash());
+    powThread1.interrupt();
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/PrivacyBlockProcessorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/PrivacyBlockProcessorTest.java
index c7dcf105760..6f1796876e5 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/PrivacyBlockProcessorTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/PrivacyBlockProcessorTest.java
@@ -24,19 +24,17 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.enclave.Enclave;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.chain.TransactionLocation;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.PrivateTransactionDataFixture;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.core.WrappedEvmAccount;
+import org.hyperledger.besu.ethereum.privacy.PrivateStateGenesisAllocator;
 import org.hyperledger.besu.ethereum.privacy.PrivateStateRootResolver;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransactionProcessor;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivacyGroupHeadBlockMap;
@@ -45,6 +43,9 @@
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateStateStorage;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+import org.hyperledger.besu.evm.worldstate.WrappedEvmAccount;
 import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
 
 import java.util.Collections;
@@ -54,7 +55,10 @@
 import org.apache.tuweni.bytes.Bytes32;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class PrivacyBlockProcessorTest {
 
   private PrivacyBlockProcessor privacyBlockProcessor;
@@ -79,7 +83,9 @@ public void setUp() {
             enclave,
             privateStateStorage,
             privateWorldStateArchive,
-            new PrivateStateRootResolver(privateStateStorage));
+            new PrivateStateRootResolver(privateStateStorage),
+            new PrivateStateGenesisAllocator(
+                true, (privacyGroupId, blockNumber) -> Collections::emptyList));
     publicWorldStateArchive = mock(WorldStateArchive.class);
     privacyBlockProcessor.setPublicWorldStateArchive(publicWorldStateArchive);
   }
@@ -110,6 +116,8 @@ public void mustCopyPreviousPrivacyGroupBlockHeadMap() {
             eq(firstBlock.getHeader()),
             eq(firstBlock.getBody().getTransactions()),
             eq(firstBlock.getBody().getOmmers()),
+            eq(Optional.empty()),
+            eq(Optional.empty()),
             any());
     verify(blockProcessor)
         .processBlock(
@@ -118,10 +126,11 @@ public void mustCopyPreviousPrivacyGroupBlockHeadMap() {
             eq(secondBlock.getHeader()),
             eq(secondBlock.getBody().getTransactions()),
             eq(secondBlock.getBody().getOmmers()),
+            eq(Optional.empty()),
+            eq(Optional.empty()),
             any());
   }
 
-  @SuppressWarnings({"rawtypes", "unchecked"})
   @Test
   public void mustPerformRehydration() {
     final BlockDataGenerator blockDataGenerator = new BlockDataGenerator();
@@ -132,27 +141,28 @@ public void mustPerformRehydration() {
     final Block firstBlock =
         blockDataGenerator.block(
             BlockDataGenerator.BlockOptions.create()
-                .addTransaction(PrivateTransactionDataFixture.privacyMarkerTransactionOnChain()));
+                .addTransaction(PrivateTransactionDataFixture.privateMarkerTransactionOnchain()));
     final Block secondBlock =
         blockDataGenerator.block(
             BlockDataGenerator.BlockOptions.create()
                 .addTransaction(
-                    PrivateTransactionDataFixture.privacyMarkerTransactionOnChainAdd()));
+                    PrivateTransactionDataFixture.privateMarkerTransactionOnchainAdd()));
 
     when(enclave.receive(any()))
         .thenReturn(
             PrivateTransactionDataFixture.generateAddToGroupReceiveResponse(
                 PrivateTransactionDataFixture.privateTransactionBesu(),
-                PrivateTransactionDataFixture.privacyMarkerTransactionOnChain()));
+                PrivateTransactionDataFixture.privateMarkerTransactionOnchain()));
     when(blockchain.getTransactionLocation(any()))
         .thenReturn(Optional.of(new TransactionLocation(firstBlock.getHash(), 0)));
     when(blockchain.getBlockByHash(any())).thenReturn(Optional.of(firstBlock));
     when(blockchain.getBlockHeader(any())).thenReturn(Optional.of(firstBlock.getHeader()));
     final ProtocolSpec protocolSpec = mockProtocolSpec();
-    when(protocolSchedule.getByBlockNumber(anyLong())).thenReturn(protocolSpec);
-    when(publicWorldStateArchive.getMutable(any())).thenReturn(Optional.of(mutableWorldState));
+    when(protocolSchedule.getByBlockHeader(any())).thenReturn(protocolSpec);
+    when(publicWorldStateArchive.getMutable(any(), any()))
+        .thenReturn(Optional.of(mutableWorldState));
     final MutableWorldState mockPrivateStateArchive = mockPrivateStateArchive();
-    when(privateWorldStateArchive.getMutable(any()))
+    when(privateWorldStateArchive.getMutable(any(), any()))
         .thenReturn(Optional.of(mockPrivateStateArchive));
 
     final PrivacyGroupHeadBlockMap expected =
@@ -173,6 +183,8 @@ public void mustPerformRehydration() {
             eq(secondBlock.getHeader()),
             eq(secondBlock.getBody().getTransactions()),
             eq(secondBlock.getBody().getOmmers()),
+            eq(Optional.empty()),
+            eq(Optional.empty()),
             any());
   }
 
@@ -188,13 +200,12 @@ private MutableWorldState mockPrivateStateArchive() {
     return mockPrivateState;
   }
 
-  @SuppressWarnings("rawtypes")
   private ProtocolSpec mockProtocolSpec() {
     final ProtocolSpec protocolSpec = mock(ProtocolSpec.class);
     final MainnetTransactionProcessor mockPublicTransactionProcessor =
         mock(MainnetTransactionProcessor.class);
     when(mockPublicTransactionProcessor.processTransaction(
-            any(), any(), any(), any(), any(), any(), anyBoolean(), any()))
+            any(), any(), any(), any(), any(), any(), anyBoolean(), any(), any()))
         .thenReturn(
             TransactionProcessingResult.successful(
                 Collections.emptyList(), 0, 0, Bytes.EMPTY, ValidationResult.valid()));
@@ -202,7 +213,7 @@ private ProtocolSpec mockProtocolSpec() {
     final PrivateTransactionProcessor mockPrivateTransactionProcessor =
         mock(PrivateTransactionProcessor.class);
     when(mockPrivateTransactionProcessor.processTransaction(
-            any(), any(), any(), any(), any(), any(), any(), any(), any(), any()))
+            any(), any(), any(), any(), any(), any(), any(), any(), any()))
         .thenReturn(
             TransactionProcessingResult.successful(
                 Collections.emptyList(), 0, 0, Bytes.EMPTY, ValidationResult.valid()));
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilderTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilderTest.java
new file mode 100644
index 00000000000..c573902726f
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilderTest.java
@@ -0,0 +1,218 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.MilestoneStreamingProtocolSchedule;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+
+import java.math.BigInteger;
+import java.util.OptionalLong;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.stubbing.Answer;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ProtocolScheduleBuilderTest {
+  private final long PRE_SHANGHAI_TIMESTAMP = 1680488620L; // Mon, 03 Apr 2023 02:23:40 UTC
+  @Mock GenesisConfigOptions configOptions;
+  @Mock private Function<ProtocolSpecBuilder, ProtocolSpecBuilder> modifier;
+  private static final BigInteger CHAIN_ID = BigInteger.ONE;
+  private ProtocolScheduleBuilder builder;
+
+  @Before
+  public void setup() {
+    builder =
+        new ProtocolScheduleBuilder(
+            configOptions,
+            CHAIN_ID,
+            ProtocolSpecAdapters.create(0, Function.identity()),
+            new PrivacyParameters(),
+            false,
+            EvmConfiguration.DEFAULT);
+  }
+
+  @Test
+  public void createProtocolScheduleInOrder() {
+    when(configOptions.getHomesteadBlockNumber()).thenReturn(OptionalLong.of(1L));
+    when(configOptions.getDaoForkBlock()).thenReturn(OptionalLong.of(2L));
+    when(configOptions.getByzantiumBlockNumber()).thenReturn(OptionalLong.of(13L));
+    when(configOptions.getMergeNetSplitBlockNumber()).thenReturn(OptionalLong.of(15L));
+    when(configOptions.getShanghaiTime()).thenReturn(OptionalLong.of(PRE_SHANGHAI_TIMESTAMP + 1));
+    when(configOptions.getCancunTime()).thenReturn(OptionalLong.of(PRE_SHANGHAI_TIMESTAMP + 3));
+    final ProtocolSchedule protocolSchedule = builder.createProtocolSchedule();
+
+    assertThat(protocolSchedule.getChainId()).contains(CHAIN_ID);
+    assertThat(protocolSchedule.getByBlockHeader(blockHeader(0)).getName()).isEqualTo("Frontier");
+    assertThat(protocolSchedule.getByBlockHeader(blockHeader(1)).getName()).isEqualTo("Homestead");
+    assertThat(protocolSchedule.getByBlockHeader(blockHeader(2)).getName())
+        .isEqualTo("DaoRecoveryInit");
+    assertThat(protocolSchedule.getByBlockHeader(blockHeader(3)).getName())
+        .isEqualTo("DaoRecoveryTransition");
+    assertThat(protocolSchedule.getByBlockHeader(blockHeader(12)).getName()).isEqualTo("Homestead");
+    assertThat(protocolSchedule.getByBlockHeader(blockHeader(13)).getName()).isEqualTo("Byzantium");
+    assertThat(protocolSchedule.getByBlockHeader(blockHeader(14)).getName()).isEqualTo("Byzantium");
+    assertThat(protocolSchedule.getByBlockHeader(blockHeader(15)).getName()).isEqualTo("ParisFork");
+    assertThat(protocolSchedule.getByBlockHeader(blockHeader(50)).getName()).isEqualTo("ParisFork");
+    assertThat(
+            protocolSchedule
+                .getByBlockHeader(blockHeader(51, PRE_SHANGHAI_TIMESTAMP + 1))
+                .getName())
+        .isEqualTo("Shanghai");
+    assertThat(
+            protocolSchedule
+                .getByBlockHeader(blockHeader(52, PRE_SHANGHAI_TIMESTAMP + 2))
+                .getName())
+        .isEqualTo("Shanghai");
+    assertThat(
+            protocolSchedule
+                .getByBlockHeader(blockHeader(53, PRE_SHANGHAI_TIMESTAMP + 3))
+                .getName())
+        .isEqualTo("Cancun");
+    assertThat(
+            protocolSchedule
+                .getByBlockHeader(blockHeader(54, PRE_SHANGHAI_TIMESTAMP + 4))
+                .getName())
+        .isEqualTo("Cancun");
+  }
+
+  @Test
+  public void createProtocolScheduleOverlappingUsesLatestFork() {
+    when(configOptions.getHomesteadBlockNumber()).thenReturn(OptionalLong.of(0L));
+    when(configOptions.getByzantiumBlockNumber()).thenReturn(OptionalLong.of(0L));
+    final ProtocolSchedule protocolSchedule = builder.createProtocolSchedule();
+
+    assertThat(protocolSchedule.getChainId()).contains(CHAIN_ID);
+    assertThat(protocolSchedule.getByBlockHeader(blockHeader(0)).getName()).isEqualTo("Byzantium");
+    assertThat(protocolSchedule.getByBlockHeader(blockHeader(1)).getName()).isEqualTo("Byzantium");
+  }
+
+  @Test
+  public void createProtocolScheduleOutOfOrderThrows() {
+    when(configOptions.getDaoForkBlock()).thenReturn(OptionalLong.of(0L));
+    when(configOptions.getArrowGlacierBlockNumber()).thenReturn(OptionalLong.of(12L));
+    when(configOptions.getGrayGlacierBlockNumber()).thenReturn(OptionalLong.of(11L));
+    assertThatThrownBy(() -> builder.createProtocolSchedule())
+        .isInstanceOf(RuntimeException.class)
+        .hasMessage(
+            "Genesis Config Error: 'GrayGlacier' is scheduled for milestone 11 but it must be on or after milestone 12.");
+  }
+
+  @Test
+  public void createProtocolScheduleWithTimestampsOutOfOrderThrows() {
+    when(configOptions.getDaoForkBlock()).thenReturn(OptionalLong.of(0L));
+    when(configOptions.getShanghaiTime()).thenReturn(OptionalLong.of(3L));
+    when(configOptions.getCancunTime()).thenReturn(OptionalLong.of(2L));
+    assertThatThrownBy(() -> builder.createProtocolSchedule())
+        .isInstanceOf(RuntimeException.class)
+        .hasMessage(
+            "Genesis Config Error: 'Cancun' is scheduled for milestone 2 but it must be on or after milestone 3.");
+  }
+
+  @Test
+  public void modifierInsertedBetweenBlocksIsAppliedToLaterAndCreatesInterimMilestone() {
+    when(configOptions.getHomesteadBlockNumber()).thenReturn(OptionalLong.of(5L));
+
+    when(modifier.apply(any()))
+        .thenAnswer((Answer<ProtocolSpecBuilder>) invocation -> invocation.getArgument(0));
+
+    final MilestoneStreamingProtocolSchedule schedule = createScheduleModifiedAt(2);
+
+    // A default spec exists at 0 (frontier), then the spec as requested in config, then another
+    // added at the point at which the modifier is applied.
+    assertThat(schedule.streamMilestoneBlocks().collect(Collectors.toList()))
+        .containsExactly(0L, 2L, 5L);
+    assertThat(schedule.getByBlockHeader(blockHeader(0)).getName()).isEqualTo("Frontier");
+    assertThat(schedule.getByBlockHeader(blockHeader(2)).getName()).isEqualTo("Frontier");
+    assertThat(schedule.getByBlockHeader(blockHeader(5)).getName()).isEqualTo("Homestead");
+
+    verify(modifier, times(2)).apply(any());
+  }
+
+  @Test
+  public void modifierPastEndOfDefinedMilestonesGetsItsOwnMilestoneCreated() {
+    when(modifier.apply(any()))
+        .thenAnswer((Answer<ProtocolSpecBuilder>) invocation -> invocation.getArgument(0));
+
+    final MilestoneStreamingProtocolSchedule schedule = createScheduleModifiedAt(2);
+
+    // A default spec exists at 0 (frontier), then the spec as requested in config, then another
+    // added at the point at which the modifier is applied.
+    assertThat(schedule.streamMilestoneBlocks().collect(Collectors.toList()))
+        .containsExactly(0L, 2L);
+    assertThat(schedule.getByBlockHeader(blockHeader(0)).getName()).isEqualTo("Frontier");
+    assertThat(schedule.getByBlockHeader(blockHeader(2)).getName()).isEqualTo("Frontier");
+
+    verify(modifier, times(1)).apply(any());
+  }
+
+  @Test
+  public void modifierOnDefinedMilestoneIsAppliedButDoesNotGetAnExtraMilestoneCreated() {
+    when(configOptions.getHomesteadBlockNumber()).thenReturn(OptionalLong.of(5L));
+    when(modifier.apply(any()))
+        .thenAnswer((Answer<ProtocolSpecBuilder>) invocation -> invocation.getArgument(0));
+
+    final MilestoneStreamingProtocolSchedule schedule = createScheduleModifiedAt(5);
+
+    // A default spec exists at 0 (frontier), then the spec as requested in config, then another
+    // added at the point at which the modifier is applied.
+    assertThat(schedule.streamMilestoneBlocks().collect(Collectors.toList()))
+        .containsExactly(0L, 5L);
+    assertThat(schedule.getByBlockHeader(blockHeader(0)).getName()).isEqualTo("Frontier");
+    assertThat(schedule.getByBlockHeader(blockHeader(5)).getName()).isEqualTo("Homestead");
+    verify(modifier, times(1)).apply(any());
+  }
+
+  private MilestoneStreamingProtocolSchedule createScheduleModifiedAt(final int blockNumber) {
+    final ProtocolScheduleBuilder builder =
+        new ProtocolScheduleBuilder(
+            configOptions,
+            CHAIN_ID,
+            ProtocolSpecAdapters.create(blockNumber, modifier),
+            new PrivacyParameters(),
+            false,
+            EvmConfiguration.DEFAULT);
+
+    return new MilestoneStreamingProtocolSchedule(
+        (DefaultProtocolSchedule) builder.createProtocolSchedule());
+  }
+
+  private BlockHeader blockHeader(final long number) {
+    return new BlockHeaderTestFixture()
+        .number(number)
+        .timestamp(PRE_SHANGHAI_TIMESTAMP)
+        .buildHeader();
+  }
+
+  private BlockHeader blockHeader(final long number, final long timestamp) {
+    return new BlockHeaderTestFixture().number(number).timestamp(timestamp).buildHeader();
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleTest.java
deleted file mode 100644
index 9246103aef7..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-import java.math.BigInteger;
-import java.util.Optional;
-
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
-
-public class ProtocolScheduleTest {
-
-  private static final Optional<BigInteger> CHAIN_ID = Optional.of(BigInteger.ONE);
-
-  @SuppressWarnings("unchecked")
-  @Test
-  public void getByBlockNumber() {
-    final ProtocolSpec spec1 = mock(ProtocolSpec.class);
-    final ProtocolSpec spec2 = mock(ProtocolSpec.class);
-    final ProtocolSpec spec3 = mock(ProtocolSpec.class);
-    final ProtocolSpec spec4 = mock(ProtocolSpec.class);
-
-    final MutableProtocolSchedule schedule = new MutableProtocolSchedule(CHAIN_ID);
-    schedule.putMilestone(20, spec3);
-    schedule.putMilestone(0, spec1);
-    schedule.putMilestone(30, spec4);
-    schedule.putMilestone(10, spec2);
-
-    assertThat(schedule.getByBlockNumber(0)).isEqualTo(spec1);
-    assertThat(schedule.getByBlockNumber(15)).isEqualTo(spec2);
-    assertThat(schedule.getByBlockNumber(35)).isEqualTo(spec4);
-    assertThat(schedule.getByBlockNumber(105)).isEqualTo(spec4);
-  }
-
-  @Test
-  public void emptySchedule() {
-    Assertions.assertThatThrownBy(() -> new MutableProtocolSchedule(CHAIN_ID).getByBlockNumber(0))
-        .hasMessage("At least 1 milestone must be provided to the protocol schedule");
-  }
-
-  @SuppressWarnings("unchecked")
-  @Test
-  public void conflictingSchedules() {
-    final ProtocolSpec spec1 = mock(ProtocolSpec.class);
-    final ProtocolSpec spec2 = mock(ProtocolSpec.class);
-
-    final MutableProtocolSchedule protocolSchedule = new MutableProtocolSchedule(CHAIN_ID);
-    protocolSchedule.putMilestone(0, spec1);
-    protocolSchedule.putMilestone(0, spec2);
-    assertThat(protocolSchedule.getByBlockNumber(0)).isSameAs(spec2);
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecAdaptersTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecAdaptersTest.java
new file mode 100644
index 00000000000..7b01135148f
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecAdaptersTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2020 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Map;
+import java.util.function.Function;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ProtocolSpecAdaptersTest {
+
+  @Mock private Function<ProtocolSpecBuilder, ProtocolSpecBuilder> firstModifier;
+
+  @Mock private Function<ProtocolSpecBuilder, ProtocolSpecBuilder> secondModifier;
+
+  @Test
+  public void specAdapterFindsTheModifierBelowRequestedBlock() {
+
+    final ProtocolSpecAdapters adapters =
+        new ProtocolSpecAdapters(Map.of(3L, firstModifier, 5L, secondModifier));
+
+    assertThat(adapters.getModifierForBlock(3)).isEqualTo(firstModifier);
+    assertThat(adapters.getModifierForBlock(4)).isEqualTo(firstModifier);
+    assertThat(adapters.getModifierForBlock(5)).isEqualTo(secondModifier);
+    assertThat(adapters.getModifierForBlock(6)).isEqualTo(secondModifier);
+    assertThat(adapters.getModifierForBlock(0)).isEqualTo(Function.identity());
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/RefundSstoreGasTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/RefundSstoreGasTest.java
index 327d3a5f8af..06594c21913 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/RefundSstoreGasTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/RefundSstoreGasTest.java
@@ -19,9 +19,12 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
+import org.hyperledger.besu.evm.gascalculator.ConstantinopleGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.gascalculator.IstanbulGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.PetersburgGasCalculator;
+
+import java.util.function.Supplier;
 
 import org.apache.tuweni.units.bigints.UInt256;
 import org.assertj.core.api.Assertions;
@@ -40,71 +43,63 @@ public class RefundSstoreGasTest {
   @Parameters(name = "calculator: {0}, original: {2}, current: {3}, new: {4}")
   public static Object[][] scenarios() {
     final GasCalculator constantinople = new ConstantinopleGasCalculator();
-    final GasCalculator petersburg = new ConstantinopleFixGasCalculator();
+    final GasCalculator petersburg = new PetersburgGasCalculator();
     final GasCalculator istanbul = new IstanbulGasCalculator();
     return new Object[][] {
       // Zero no-op
-      {"constantinople", constantinople, ZERO, ZERO, ZERO, Gas.of(200), Gas.ZERO},
-      {"petersburg", petersburg, ZERO, ZERO, ZERO, Gas.of(5_000), Gas.ZERO},
-      {"istanbul", istanbul, ZERO, ZERO, ZERO, Gas.of(800), Gas.ZERO},
+      {"constantinople", constantinople, ZERO, ZERO, ZERO, 200L, 0L},
+      {"petersburg", petersburg, ZERO, ZERO, ZERO, 5_000L, 0L},
+      {"istanbul", istanbul, ZERO, ZERO, ZERO, 800L, 0L},
 
       // Zero fresh change
-      {"constantinople", constantinople, ZERO, ZERO, ONE, Gas.of(20_000), Gas.ZERO},
-      {"petersburg", petersburg, ZERO, ZERO, ONE, Gas.of(20_000), Gas.ZERO},
-      {"istanbul", istanbul, ZERO, ZERO, ONE, Gas.of(20_000), Gas.ZERO},
+      {"constantinople", constantinople, ZERO, ZERO, ONE, 20_000L, 0L},
+      {"petersburg", petersburg, ZERO, ZERO, ONE, 20_000L, 0L},
+      {"istanbul", istanbul, ZERO, ZERO, ONE, 20_000L, 0L},
 
       // Dirty, reset to zero
-      {"constantinople", constantinople, ZERO, ONE, ZERO, Gas.of(200), Gas.of(19_800)},
-      {"petersburg", petersburg, ZERO, ONE, ZERO, Gas.of(5_000), Gas.of(15_000)},
-      {"istanbul", istanbul, ZERO, ONE, ZERO, Gas.of(800), Gas.of(19_200)},
+      {"constantinople", constantinople, ZERO, ONE, ZERO, 200L, 19_800L},
+      {"petersburg", petersburg, ZERO, ONE, ZERO, 5_000L, 15_000L},
+      {"istanbul", istanbul, ZERO, ONE, ZERO, 800L, 19_200L},
 
       // Dirty, changed but not reset
-      {"constantinople", constantinople, ZERO, ONE, TWO, Gas.of(200), Gas.ZERO},
-      {"petersburg", petersburg, ZERO, ONE, TWO, Gas.of(5_000), Gas.ZERO},
-      {"istanbul", istanbul, ZERO, ONE, TWO, Gas.of(800), Gas.ZERO},
+      {"constantinople", constantinople, ZERO, ONE, TWO, 200L, 0L},
+      {"petersburg", petersburg, ZERO, ONE, TWO, 5_000L, 0L},
+      {"istanbul", istanbul, ZERO, ONE, TWO, 800L, 0L},
 
       // Dirty no-op
-      {"constantinople", constantinople, ZERO, ONE, ONE, Gas.of(200), Gas.ZERO},
-      {"petersburg", petersburg, ZERO, ONE, ONE, Gas.of(5_000), Gas.ZERO},
-      {"istanbul", istanbul, ZERO, ONE, ONE, Gas.of(800), Gas.ZERO},
+      {"constantinople", constantinople, ZERO, ONE, ONE, 200L, 0L},
+      {"petersburg", petersburg, ZERO, ONE, ONE, 5_000L, 0L},
+      {"istanbul", istanbul, ZERO, ONE, ONE, 800L, 0L},
 
       // Dirty, zero no-op
-      {"constantinople", constantinople, ONE, ZERO, ZERO, Gas.of(200), Gas.ZERO},
-      {"petersburg", petersburg, ONE, ZERO, ZERO, Gas.of(5_000), Gas.ZERO},
-      {"istanbul", istanbul, ONE, ZERO, ZERO, Gas.of(800), Gas.ZERO},
+      {"constantinople", constantinople, ONE, ZERO, ZERO, 200L, 0L},
+      {"petersburg", petersburg, ONE, ZERO, ZERO, 5_000L, 0L},
+      {"istanbul", istanbul, ONE, ZERO, ZERO, 800L, 0L},
 
       // Dirty, reset to non-zero
-      {
-        "constantinople",
-        constantinople,
-        ONE,
-        ZERO,
-        ONE,
-        Gas.of(200),
-        Gas.of(-15_000).plus(Gas.of(4_800))
-      },
-      {"petersburg", petersburg, ONE, ZERO, ONE, Gas.of(20_000), Gas.ZERO},
-      {"istanbul", istanbul, ONE, ZERO, ONE, Gas.of(800), Gas.of(-15_000).plus(Gas.of(4_200))},
+      {"constantinople", constantinople, ONE, ZERO, ONE, 200L, -15_000L + 4_800L},
+      {"petersburg", petersburg, ONE, ZERO, ONE, 20_000L, 0L},
+      {"istanbul", istanbul, ONE, ZERO, ONE, 800L, -15_000L + 4_200L},
 
       // Fresh change to zero
-      {"constantinople", constantinople, ONE, ONE, ZERO, Gas.of(5_000), Gas.of(15_000)},
-      {"petersburg", petersburg, ONE, ONE, ZERO, Gas.of(5_000), Gas.of(15_000)},
-      {"istanbul", istanbul, ONE, ONE, ZERO, Gas.of(5_000), Gas.of(15_000)},
+      {"constantinople", constantinople, ONE, ONE, ZERO, 5_000L, 15_000L},
+      {"petersburg", petersburg, ONE, ONE, ZERO, 5_000L, 15_000L},
+      {"istanbul", istanbul, ONE, ONE, ZERO, 5_000L, 15_000L},
 
       // Fresh change with all non-zero
-      {"constantinople", constantinople, ONE, ONE, TWO, Gas.of(5_000), Gas.ZERO},
-      {"petersburg", petersburg, ONE, ONE, TWO, Gas.of(5_000), Gas.ZERO},
-      {"istanbul", istanbul, ONE, ONE, TWO, Gas.of(5_000), Gas.ZERO},
+      {"constantinople", constantinople, ONE, ONE, TWO, 5_000L, 0L},
+      {"petersburg", petersburg, ONE, ONE, TWO, 5_000L, 0L},
+      {"istanbul", istanbul, ONE, ONE, TWO, 5_000L, 0L},
 
       // Dirty, clear originally set value
-      {"constantinople", constantinople, ONE, TWO, ZERO, Gas.of(200), Gas.of(15_000)},
-      {"petersburg", petersburg, ONE, TWO, ZERO, Gas.of(5_000), Gas.of(15_000)},
-      {"istanbul", istanbul, ONE, TWO, ZERO, Gas.of(800), Gas.of(15_000)},
+      {"constantinople", constantinople, ONE, TWO, ZERO, 200L, 15_000L},
+      {"petersburg", petersburg, ONE, TWO, ZERO, 5_000L, 15_000L},
+      {"istanbul", istanbul, ONE, TWO, ZERO, 800L, 15_000L},
 
       // Non-zero no-op
-      {"constantinople", constantinople, ONE, ONE, ONE, Gas.of(200), Gas.ZERO},
-      {"petersburg", petersburg, ONE, ONE, ONE, Gas.of(5_000), Gas.ZERO},
-      {"istanbul", istanbul, ONE, ONE, ONE, Gas.of(800), Gas.ZERO},
+      {"constantinople", constantinople, ONE, ONE, ONE, 200L, 0L},
+      {"petersburg", petersburg, ONE, ONE, ONE, 5_000L, 0L},
+      {"istanbul", istanbul, ONE, ONE, ONE, 800L, 0L},
     };
   }
 
@@ -123,29 +118,38 @@ public static Object[][] scenarios() {
   public UInt256 newValue;
 
   @Parameter(value = 5)
-  public Gas expectedGasCost;
+  public long expectedGasCost;
 
   @Parameter(value = 6)
-  public Gas expectedGasRefund;
+  public long expectedGasRefund;
+
+  private final Supplier<UInt256> mockSupplierForOriginalValue = mockSupplier();
+  private final Supplier<UInt256> mockSupplierCurrentValue = mockSupplier();
 
-  private final Account account = mock(Account.class);
+  @SuppressWarnings("unchecked")
+  private <T> Supplier<T> mockSupplier() {
+    return mock(Supplier.class);
+  }
 
   @Before
   public void setUp() {
-    when(account.getOriginalStorageValue(UInt256.ZERO)).thenReturn(originalValue);
-    when(account.getStorageValue(UInt256.ZERO)).thenReturn(currentValue);
+    when(mockSupplierForOriginalValue.get()).thenReturn(originalValue);
+    when(mockSupplierCurrentValue.get()).thenReturn(currentValue);
   }
 
   @Test
   public void shouldChargeCorrectGas() {
-    Assertions.assertThat(gasCalculator.calculateStorageCost(account, UInt256.ZERO, newValue))
+    Assertions.assertThat(
+            gasCalculator.calculateStorageCost(
+                newValue, mockSupplierCurrentValue, mockSupplierForOriginalValue))
         .isEqualTo(expectedGasCost);
   }
 
   @Test
   public void shouldRefundCorrectGas() {
     Assertions.assertThat(
-            gasCalculator.calculateStorageRefundAmount(account, UInt256.ZERO, newValue))
+            gasCalculator.calculateStorageRefundAmount(
+                newValue, mockSupplierCurrentValue, mockSupplierForOriginalValue))
         .isEqualTo(expectedGasRefund);
   }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/TargetingGasLimitCalculatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/TargetingGasLimitCalculatorTest.java
new file mode 100644
index 00000000000..bec65b731ed
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/TargetingGasLimitCalculatorTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2019 ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.mainnet.AbstractGasLimitSpecification.DEFAULT_MAX_GAS_LIMIT;
+import static org.hyperledger.besu.ethereum.mainnet.AbstractGasLimitSpecification.DEFAULT_MIN_GAS_LIMIT;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.mainnet.headervalidationrules.GasLimitRangeAndDeltaValidationRule;
+
+import org.junit.Test;
+
+public class TargetingGasLimitCalculatorTest {
+  private static final long ADJUSTMENT_FACTOR = 1024L;
+
+  @Test
+  public void verifyGasLimitIsIncreasedWithinLimits() {
+    FrontierTargetingGasLimitCalculator targetingGasLimitCalculator =
+        new FrontierTargetingGasLimitCalculator();
+    assertThat(targetingGasLimitCalculator.nextGasLimit(8_000_000L, 10_000_000L, 1L))
+        .isEqualTo(8_000_000L + ADJUSTMENT_FACTOR);
+  }
+
+  @Test
+  public void verifyGasLimitIsDecreasedWithinLimits() {
+    FrontierTargetingGasLimitCalculator targetingGasLimitCalculator =
+        new FrontierTargetingGasLimitCalculator();
+    assertThat(targetingGasLimitCalculator.nextGasLimit(12_000_000L, 10_000_000L, 1L))
+        .isEqualTo(12_000_000L - ADJUSTMENT_FACTOR);
+  }
+
+  @Test
+  public void verifyGasLimitReachesTarget() {
+    final long target = 10_000_000L;
+    final long offset = ADJUSTMENT_FACTOR / 2;
+    FrontierTargetingGasLimitCalculator targetingGasLimitCalculator =
+        new FrontierTargetingGasLimitCalculator();
+    assertThat(targetingGasLimitCalculator.nextGasLimit(target - offset, target, 1L))
+        .isEqualTo(target);
+    assertThat(targetingGasLimitCalculator.nextGasLimit(target + offset, target, 1L))
+        .isEqualTo(target);
+  }
+
+  @Test
+  public void verifyMinGasLimit() {
+    assertThat(AbstractGasLimitSpecification.isValidTargetGasLimit(DEFAULT_MIN_GAS_LIMIT - 1))
+        .isFalse();
+  }
+
+  @Test
+  public void verifyWithinGasLimitDelta() {
+    final long targetGasLimit = 10_000_000L;
+    final long currentGasLimit = 1024L * 1024L;
+    final FrontierTargetingGasLimitCalculator targetingGasLimitCalculator =
+        new FrontierTargetingGasLimitCalculator();
+    final GasLimitRangeAndDeltaValidationRule rule =
+        new GasLimitRangeAndDeltaValidationRule(DEFAULT_MIN_GAS_LIMIT, DEFAULT_MAX_GAS_LIMIT);
+
+    // parent
+    final BlockHeader parent = new BlockHeaderTestFixture().gasLimit(currentGasLimit).buildHeader();
+
+    // current
+    final long nextGasLimit =
+        targetingGasLimitCalculator.nextGasLimit(parent.getGasLimit(), targetGasLimit, 1L);
+    final BlockHeader header = new BlockHeaderTestFixture().gasLimit(nextGasLimit).buildHeader();
+
+    assertThat(rule.validate(header, parent)).isTrue();
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidationParamsTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidationParamsTest.java
index d00f105b4df..6e269b8a1bb 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidationParamsTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidationParamsTest.java
@@ -88,7 +88,7 @@ public void processingBlock() {
   public void transactionPool() {
     final TransactionValidationParams params = TransactionValidationParams.transactionPool();
     assertThat(params.isAllowFutureNonce()).isTrue();
-    assertThat(params.checkOnchainPermissions()).isFalse();
+    assertThat(params.checkOnchainPermissions()).isTrue();
     assertThat(params.checkLocalPermissions()).isTrue();
   }
 
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ValidationResultTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ValidationResultTest.java
index 27f37acb62b..22a27229f67 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ValidationResultTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ValidationResultTest.java
@@ -17,7 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 import org.junit.Test;
 
@@ -46,7 +46,7 @@ public void shouldRunIfValidActionWhenValid() {
   public void shouldNotRunIfValidActionWhenInvalid() {
     ValidationResult.invalid("foo").ifValid(action);
 
-    verifyZeroInteractions(action);
+    verifyNoInteractions(action);
   }
 
   @Test
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ValidationTestUtils.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ValidationTestUtils.java
index 25a74a518c9..98fbaa1734f 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ValidationTestUtils.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/ValidationTestUtils.java
@@ -17,12 +17,15 @@
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Deposit;
 import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Optional;
 
 import com.google.common.io.Resources;
 import org.apache.tuweni.bytes.Bytes;
@@ -52,7 +55,15 @@ public static BlockBody readBody(final long num) throws IOException {
     final List<Transaction> transactions = input.readList(Transaction::readFrom);
     final List<BlockHeader> ommers =
         input.readList(rlp -> BlockHeader.readFrom(rlp, new MainnetBlockHeaderFunctions()));
-    return new BlockBody(transactions, ommers);
+    final Optional<List<Withdrawal>> withdrawals =
+        input.isEndOfCurrentList()
+            ? Optional.empty()
+            : Optional.of(input.readList(Withdrawal::readFrom));
+    final Optional<List<Deposit>> deposits =
+        input.isEndOfCurrentList()
+            ? Optional.empty()
+            : Optional.of(input.readList(Deposit::readFrom));
+    return new BlockBody(transactions, ommers, withdrawals, deposits);
   }
 
   public static Block readBlock(final long num) throws IOException {
@@ -62,12 +73,6 @@ public static Block readBlock(final long num) throws IOException {
                 Resources.toByteArray(
                     EthHashTest.class.getResource(String.format("block_%d.blocks", num)))),
             false);
-    input.enterList();
-    final BlockHeader header = BlockHeader.readFrom(input, new MainnetBlockHeaderFunctions());
-    final List<Transaction> transactions = input.readList(Transaction::readFrom);
-    final List<BlockHeader> ommers =
-        input.readList(rlp -> BlockHeader.readFrom(rlp, new MainnetBlockHeaderFunctions()));
-    final BlockBody body = new BlockBody(transactions, ommers);
-    return new Block(header, body);
+    return Block.readFrom(input, new MainnetBlockHeaderFunctions());
   }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/WithdrawalsProcessorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/WithdrawalsProcessorTest.java
new file mode 100644
index 00000000000..db82d33e33c
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/WithdrawalsProcessorTest.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet;
+
+import static java.util.Map.entry;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.GWei;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.tuweni.units.bigints.UInt64;
+import org.junit.jupiter.api.Test;
+
+class WithdrawalsProcessorTest {
+
+  @Test
+  void shouldProcessEmptyWithdrawalsWithoutChangingWorldState() {
+    final MutableWorldState worldState =
+        createWorldStateWithAccounts(List.of(entry("0x1", 1), entry("0x2", 2), entry("0x3", 3)));
+    final MutableWorldState originalWorldState =
+        createWorldStateWithAccounts(List.of(entry("0x1", 1), entry("0x2", 2), entry("0x3", 3)));
+    final WorldUpdater updater = worldState.updater();
+
+    final WithdrawalsProcessor withdrawalsProcessor = new WithdrawalsProcessor();
+    withdrawalsProcessor.processWithdrawals(Collections.emptyList(), updater);
+
+    assertThat(worldState.get(Address.fromHexString("0x1")).getBalance()).isEqualTo(Wei.of(1));
+    assertThat(worldState.get(Address.fromHexString("0x2")).getBalance()).isEqualTo(Wei.of(2));
+    assertThat(worldState.get(Address.fromHexString("0x3")).getBalance()).isEqualTo(Wei.of(3));
+    assertThat(originalWorldState).isEqualTo(worldState);
+  }
+
+  @Test
+  void shouldProcessWithdrawalsUpdatingExistingAccountsBalance() {
+    final MutableWorldState worldState =
+        createWorldStateWithAccounts(List.of(entry("0x1", 1), entry("0x2", 2), entry("0x3", 3)));
+    final WorldUpdater updater = worldState.updater();
+
+    final List<Withdrawal> withdrawals =
+        List.of(
+            new Withdrawal(
+                UInt64.valueOf(100),
+                UInt64.valueOf(1000),
+                Address.fromHexString("0x1"),
+                GWei.of(100)),
+            new Withdrawal(
+                UInt64.valueOf(200),
+                UInt64.valueOf(2000),
+                Address.fromHexString("0x2"),
+                GWei.of(200)));
+    final WithdrawalsProcessor withdrawalsProcessor = new WithdrawalsProcessor();
+    withdrawalsProcessor.processWithdrawals(withdrawals, updater);
+
+    assertThat(worldState.get(Address.fromHexString("0x1")).getBalance())
+        .isEqualTo(GWei.of(100).getAsWei().add(1));
+    assertThat(worldState.get(Address.fromHexString("0x2")).getBalance())
+        .isEqualTo(GWei.of(200).getAsWei().add(2));
+    assertThat(worldState.get(Address.fromHexString("0x3")).getBalance()).isEqualTo(Wei.of(3));
+  }
+
+  @Test
+  void shouldProcessWithdrawalsUpdatingEmptyAccountsBalance() {
+    final MutableWorldState worldState = createWorldStateWithAccounts(Collections.emptyList());
+    final WorldUpdater updater = worldState.updater();
+
+    final List<Withdrawal> withdrawals =
+        List.of(
+            new Withdrawal(
+                UInt64.valueOf(100),
+                UInt64.valueOf(1000),
+                Address.fromHexString("0x1"),
+                GWei.of(100)),
+            new Withdrawal(
+                UInt64.valueOf(200),
+                UInt64.valueOf(2000),
+                Address.fromHexString("0x2"),
+                GWei.of(200)));
+    final WithdrawalsProcessor withdrawalsProcessor = new WithdrawalsProcessor();
+    withdrawalsProcessor.processWithdrawals(withdrawals, updater);
+
+    assertThat(worldState.get(Address.fromHexString("0x1")).getBalance())
+        .isEqualTo(GWei.of(100).getAsWei());
+    assertThat(worldState.get(Address.fromHexString("0x2")).getBalance())
+        .isEqualTo(GWei.of(200).getAsWei());
+  }
+
+  @Test
+  void shouldDeleteEmptyAccounts() {
+    final MutableWorldState worldState = createWorldStateWithAccounts(List.of(entry("0x1", 0)));
+    final WorldUpdater updater = worldState.updater();
+
+    final List<Withdrawal> withdrawals =
+        List.of(
+            new Withdrawal(
+                UInt64.valueOf(100), UInt64.valueOf(1000), Address.fromHexString("0x1"), GWei.ZERO),
+            new Withdrawal(
+                UInt64.valueOf(200),
+                UInt64.valueOf(2000),
+                Address.fromHexString("0x2"),
+                GWei.ZERO));
+    final WithdrawalsProcessor withdrawalsProcessor = new WithdrawalsProcessor();
+    withdrawalsProcessor.processWithdrawals(withdrawals, updater);
+
+    assertThat(worldState.get(Address.fromHexString("0x1"))).isNull();
+    assertThat(worldState.get(Address.fromHexString("0x2"))).isNull();
+  }
+
+  private MutableWorldState createWorldStateWithAccounts(
+      final List<Map.Entry<String, Integer>> accountBalances) {
+    final MutableWorldState worldState = InMemoryKeyValueStorageProvider.createInMemoryWorldState();
+    final WorldUpdater updater = worldState.updater();
+    accountBalances.forEach(
+        entry ->
+            updater.createAccount(
+                Address.fromHexString(entry.getKey()), 0, Wei.of(entry.getValue())));
+    updater.commit();
+    return worldState;
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/WithdrawalsValidatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/WithdrawalsValidatorTest.java
new file mode 100644
index 00000000000..4b96fd6c1ed
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/WithdrawalsValidatorTest.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.mainnet;
+
+import static java.util.Collections.emptyList;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+
+import java.util.Collections;
+import java.util.Optional;
+
+import org.junit.jupiter.api.Test;
+
+public class WithdrawalsValidatorTest {
+  private final BlockDataGenerator blockDataGenerator = new BlockDataGenerator();
+
+  @Test
+  public void validateProhibitedWithdrawals() {
+    assertThat(
+            new WithdrawalsValidator.ProhibitedWithdrawals().validateWithdrawals(Optional.empty()))
+        .isTrue();
+  }
+
+  @Test
+  public void validateProhibitedWithdrawalsRoot() {
+    final Block block = blockDataGenerator.block();
+    assertThat(new WithdrawalsValidator.ProhibitedWithdrawals().validateWithdrawalsRoot(block))
+        .isTrue();
+  }
+
+  @Test
+  public void invalidateProhibitedWithdrawals() {
+    assertThat(
+            new WithdrawalsValidator.ProhibitedWithdrawals()
+                .validateWithdrawals(Optional.of(emptyList())))
+        .isFalse();
+  }
+
+  @Test
+  public void invalidateProhibitedWithdrawalsRoot() {
+    final BlockDataGenerator.BlockOptions blockOptions =
+        BlockDataGenerator.BlockOptions.create().setWithdrawalsRoot(Hash.EMPTY_LIST_HASH);
+    final Block block = blockDataGenerator.block(blockOptions);
+    assertThat(new WithdrawalsValidator.ProhibitedWithdrawals().validateWithdrawalsRoot(block))
+        .isFalse();
+  }
+
+  @Test
+  public void validateAllowedWithdrawals() {
+    assertThat(
+            new WithdrawalsValidator.AllowedWithdrawals()
+                .validateWithdrawals(Optional.of(emptyList())))
+        .isTrue();
+  }
+
+  @Test
+  public void validateAllowedWithdrawalsRoot() {
+    final BlockDataGenerator.BlockOptions blockOptions =
+        BlockDataGenerator.BlockOptions.create()
+            .setWithdrawals(Optional.of(Collections.emptyList()))
+            .setWithdrawalsRoot(Hash.EMPTY_TRIE_HASH);
+    final Block block = blockDataGenerator.block(blockOptions);
+    assertThat(new WithdrawalsValidator.AllowedWithdrawals().validateWithdrawalsRoot(block))
+        .isTrue();
+  }
+
+  @Test
+  public void invalidateAllowedWithdrawals() {
+    assertThat(new WithdrawalsValidator.AllowedWithdrawals().validateWithdrawals(Optional.empty()))
+        .isFalse();
+  }
+
+  @Test
+  public void invalidateAllowedWithdrawalsRoot() {
+    final BlockDataGenerator.BlockOptions blockOptions =
+        BlockDataGenerator.BlockOptions.create()
+            .setWithdrawals(Optional.of(Collections.emptyList()))
+            .setWithdrawalsRoot(Hash.ZERO); // this is invalid it should be empty trie hash
+    final Block block = blockDataGenerator.block(blockOptions);
+    assertThat(new WithdrawalsValidator.AllowedWithdrawals().validateWithdrawalsRoot(block))
+        .isFalse();
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LondonFeeMarketTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LondonFeeMarketTest.java
new file mode 100644
index 00000000000..5c78e7f963f
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/feemarket/LondonFeeMarketTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet.feemarket;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
+import org.hyperledger.besu.plugin.data.TransactionType;
+
+import java.util.Optional;
+
+import org.junit.Test;
+
+public class LondonFeeMarketTest {
+
+  private static final KeyPair KEY_PAIR1 =
+      SignatureAlgorithmFactory.getInstance().generateKeyPair();
+
+  @Test
+  public void satisfiesFloorTxCost() {
+    final Transaction transaction =
+        new TransactionTestFixture()
+            .type(TransactionType.FRONTIER)
+            .gasPrice(Wei.of(7))
+            .createTransaction(KEY_PAIR1);
+
+    final LondonFeeMarket londonFeeMarket = new LondonFeeMarket(0);
+    assertThat(londonFeeMarket.satisfiesFloorTxFee(transaction)).isTrue();
+  }
+
+  @Test
+  public void maxFeePerGasLessThanMinimumBaseFee() {
+    final Transaction transaction =
+        new TransactionTestFixture()
+            .type(TransactionType.EIP1559)
+            .maxFeePerGas(Optional.of(Wei.of(6)))
+            .maxPriorityFeePerGas(Optional.of(Wei.of(0)))
+            .gasPrice(null)
+            .createTransaction(KEY_PAIR1);
+
+    final LondonFeeMarket londonFeeMarket = new LondonFeeMarket(0);
+    assertThat(londonFeeMarket.satisfiesFloorTxFee(transaction)).isFalse();
+  }
+
+  @Test
+  public void satisfiesFloorTxCostWhenBaseFeeInitialValueIsZero() {
+    final Transaction transaction =
+        new TransactionTestFixture()
+            .type(TransactionType.EIP1559)
+            .maxFeePerGas(Optional.of(Wei.ZERO))
+            .maxPriorityFeePerGas(Optional.of(Wei.ZERO))
+            .gasPrice(null)
+            .createTransaction(KEY_PAIR1);
+
+    final LondonFeeMarket londonFeeMarket = new LondonFeeMarket(0, Optional.of(Wei.ZERO));
+    assertThat(londonFeeMarket.satisfiesFloorTxFee(transaction)).isTrue();
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/feemarket/ZeroBaseFeeMarketTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/feemarket/ZeroBaseFeeMarketTest.java
new file mode 100644
index 00000000000..dbe35d19890
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/feemarket/ZeroBaseFeeMarketTest.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet.feemarket;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.DataGas;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
+import org.hyperledger.besu.plugin.data.TransactionType;
+
+import java.util.Optional;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class ZeroBaseFeeMarketTest {
+
+  private static final KeyPair KEY_PAIR1 =
+      SignatureAlgorithmFactory.getInstance().generateKeyPair();
+  private static final long FORK_BLOCK = 0;
+  private ZeroBaseFeeMarket zeroBaseFeeMarket;
+
+  @Before
+  public void setUp() throws Exception {
+    zeroBaseFeeMarket = new ZeroBaseFeeMarket(FORK_BLOCK);
+  }
+
+  @Test
+  public void getBasefeeMaxChangeDenominatorShouldUseLondonDefault() {
+    assertThat(zeroBaseFeeMarket.getBasefeeMaxChangeDenominator())
+        .isEqualTo(LondonFeeMarket.DEFAULT_BASEFEE_MAX_CHANGE_DENOMINATOR);
+  }
+
+  @Test
+  public void getInitialBasefeeShouldBeZero() {
+    assertThat(zeroBaseFeeMarket.getInitialBasefee()).isEqualTo(Wei.ZERO);
+  }
+
+  @Test
+  public void getSlackCoefficientShouldUseLondonDefault() {
+    assertThat(zeroBaseFeeMarket.getSlackCoefficient())
+        .isEqualTo(LondonFeeMarket.DEFAULT_SLACK_COEFFICIENT);
+  }
+
+  @Test
+  public void getTransactionPriceCalculatorShouldBeEIP1559() {
+    // only eip1559 will read the fee per gas values
+    final Transaction transaction =
+        new TransactionTestFixture()
+            .type(TransactionType.EIP1559)
+            .maxFeePerGas(Optional.of(Wei.of(8)))
+            .maxPriorityFeePerGas(Optional.of(Wei.of(8)))
+            .gasPrice(null)
+            .createTransaction(KEY_PAIR1);
+
+    assertThat(
+            zeroBaseFeeMarket
+                .getTransactionPriceCalculator()
+                .price(transaction, Optional.of(Wei.ZERO)))
+        .isEqualTo(Wei.of(8));
+  }
+
+  @Test
+  public void satisfiesFloorTxCostWhenGasFeeIsNonZero() {
+    final Transaction transaction =
+        new TransactionTestFixture()
+            .type(TransactionType.FRONTIER)
+            .gasPrice(Wei.of(7))
+            .createTransaction(KEY_PAIR1);
+    assertThat(zeroBaseFeeMarket.satisfiesFloorTxFee(transaction)).isTrue();
+  }
+
+  @Test
+  public void satisfiesFloorTxCostWhenGasFeeIsZero() {
+    final Transaction transaction =
+        new TransactionTestFixture()
+            .type(TransactionType.EIP1559)
+            .maxFeePerGas(Optional.of(Wei.ZERO))
+            .maxPriorityFeePerGas(Optional.of(Wei.ZERO))
+            .gasPrice(null)
+            .createTransaction(KEY_PAIR1);
+    assertThat(zeroBaseFeeMarket.satisfiesFloorTxFee(transaction)).isTrue();
+  }
+
+  @Test
+  public void computeBaseFeeReturnsZero() {
+    assertThat(zeroBaseFeeMarket.computeBaseFee(1L, Wei.of(8), 1L, 2L)).isEqualTo(Wei.ZERO);
+  }
+
+  @Test
+  public void baseFeeValidationModeShouldBeNoneWhenIsForkBlock() {
+    assertThat(zeroBaseFeeMarket.baseFeeValidationMode(FORK_BLOCK))
+        .isEqualTo(BaseFeeMarket.ValidationMode.NONE);
+  }
+
+  @Test
+  public void baseFeeValidationModeShouldBeNoneWhenIsNotForkBlock() {
+    assertThat(zeroBaseFeeMarket.baseFeeValidationMode(FORK_BLOCK + 1))
+        .isEqualTo(BaseFeeMarket.ValidationMode.NONE);
+  }
+
+  @Test
+  public void gasLimitValidationModeShouldBeInitialWhenIsForkBlock() {
+    assertThat(zeroBaseFeeMarket.gasLimitValidationMode(FORK_BLOCK))
+        .isEqualTo(BaseFeeMarket.ValidationMode.INITIAL);
+  }
+
+  @Test
+  public void gasLimitValidationModeShouldBeOngoingWhenIsNotForkBlock() {
+    assertThat(zeroBaseFeeMarket.gasLimitValidationMode(FORK_BLOCK + 1))
+        .isEqualTo(BaseFeeMarket.ValidationMode.ONGOING);
+  }
+
+  @Test
+  public void isBeforeForkBlockShouldBeTrue() {
+    final ZeroBaseFeeMarket zeroBaseFeeMarket = new ZeroBaseFeeMarket(10);
+    assertThat(zeroBaseFeeMarket.isBeforeForkBlock(9)).isTrue();
+  }
+
+  @Test
+  public void isBeforeForkBlockShouldBeFalse() {
+    final ZeroBaseFeeMarket zeroBaseFeeMarket = new ZeroBaseFeeMarket(10);
+    assertThat(zeroBaseFeeMarket.isBeforeForkBlock(10)).isFalse();
+    assertThat(zeroBaseFeeMarket.isBeforeForkBlock(11)).isFalse();
+  }
+
+  @Test
+  public void implementsDataFeedShouldReturnFalse() {
+    assertThat(zeroBaseFeeMarket.implementsDataFee()).isFalse();
+  }
+
+  @Test
+  public void dataPriceShouldReturnsZero() {
+    assertThat(zeroBaseFeeMarket.dataPrice(DataGas.ONE)).isEqualTo(Wei.ZERO);
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/AncestryValidationRuleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/AncestryValidationRuleTest.java
index 95ea0ffa67a..eb893661849 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/AncestryValidationRuleTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/AncestryValidationRuleTest.java
@@ -16,9 +16,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 import org.junit.Test;
 
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/BaseFeeMarketBlockHeaderGasPriceValidationRuleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/BaseFeeMarketBlockHeaderGasPriceValidationRuleTest.java
new file mode 100644
index 00000000000..6dca61e5040
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/BaseFeeMarketBlockHeaderGasPriceValidationRuleTest.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet.headervalidationrules;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.mainnet.headervalidationrules.EIP1559Helper.blockHeader;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.LondonFeeMarket;
+
+import java.util.Optional;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class BaseFeeMarketBlockHeaderGasPriceValidationRuleTest {
+
+  private static final long FORK_BLOCK = 800L;
+  private final BaseFeeMarket baseFeeMarket = new LondonFeeMarket(FORK_BLOCK);
+  private BaseFeeMarketBlockHeaderGasPriceValidationRule validationRule;
+  private final BaseFeeMarket feeMarket = FeeMarket.london(FORK_BLOCK);
+
+  @Before
+  public void setUp() {
+    validationRule = new BaseFeeMarketBlockHeaderGasPriceValidationRule(baseFeeMarket);
+  }
+
+  @Test
+  public void shouldTReturnFalseIfParentMissingBaseFeePostFork() {
+    assertThat(
+            validationRule.validate(
+                blockHeader(FORK_BLOCK - 1, 0, Optional.of(Wei.of(10_000L))),
+                blockHeader(FORK_BLOCK - 2, 0, Optional.empty())))
+        .isFalse();
+  }
+
+  @Test
+  public void shouldThrowIfMissingBaseFee() {
+    assertThat(
+            validationRule.validate(
+                blockHeader(FORK_BLOCK - 2, 0, Optional.empty()),
+                blockHeader(FORK_BLOCK - 1, 0, Optional.of(Wei.of(10_000L)))))
+        .isFalse();
+  }
+
+  @Test
+  public void shouldReturnTrueIfInitialBaseFeeAtForkBlock() {
+    assertThat(
+            validationRule.validate(
+                blockHeader(FORK_BLOCK, 0, Optional.of(feeMarket.getInitialBasefee())), null))
+        .isTrue();
+  }
+
+  @Test
+  public void shouldReturnFalseIfNotInitialBaseFeeAtForkBlock() {
+    assertThat(
+            validationRule.validate(
+                blockHeader(FORK_BLOCK, 0, Optional.of(feeMarket.getInitialBasefee().subtract(1L))),
+                null))
+        .isFalse();
+  }
+
+  @Test
+  public void shouldReturnIfNoBaseFeeAfterForkBlock() {
+    assertThat(
+            validationRule.validate(
+                blockHeader(FORK_BLOCK + 2, 0, Optional.empty()),
+                blockHeader(FORK_BLOCK + 1, 0, Optional.empty())))
+        .isFalse();
+  }
+
+  @Test
+  public void shouldReturnTrueIfCurrentBaseFeeEqualsExpected() {
+    assertThat(
+            validationRule.validate(
+                blockHeader(FORK_BLOCK + 2, 0, Optional.of(feeMarket.getInitialBasefee())),
+                blockHeader(FORK_BLOCK + 1, 0, Optional.of(feeMarket.getInitialBasefee()))))
+        .isTrue();
+  }
+
+  @Test
+  public void shouldReturnFalseIfCurrentBaseFeeDoesNotEqualExpected() {
+    assertThat(
+            validationRule.validate(
+                blockHeader(FORK_BLOCK + 2, 0, Optional.of(feeMarket.getInitialBasefee())),
+                blockHeader(FORK_BLOCK + 1, 0, Optional.of(feeMarket.getInitialBasefee()), 2)))
+        .isFalse();
+  }
+
+  @Test
+  public void shouldReturnTrueIfUsingZeroBaseFeeMarket() {
+    // covers scenario where chain is converted from a non-zero base fee to a zero base fee
+    final BaseFeeMarket zeroBaseFeeMarket = FeeMarket.zeroBaseFee(FORK_BLOCK);
+    final var validationRule =
+        new BaseFeeMarketBlockHeaderGasPriceValidationRule(zeroBaseFeeMarket);
+    assertThat(
+            validationRule.validate(
+                blockHeader(FORK_BLOCK + 2, 0, Optional.of(zeroBaseFeeMarket.getInitialBasefee())),
+                blockHeader(FORK_BLOCK + 1, 0, Optional.of(feeMarket.getInitialBasefee()), 2)))
+        .isTrue();
+  }
+
+  @Test
+  public void shouldReturnTrueIfUsingZeroBaseFeeMarketOnNonZeroLondonForkBlock() {
+    // syncing across a london fork where baseFee wasn't zeroed,
+    // but is now using a ZeroBaseFeeMarket
+    final BaseFeeMarket zeroBaseFeeMarket = FeeMarket.zeroBaseFee(FORK_BLOCK);
+    final var validationRule =
+        new BaseFeeMarketBlockHeaderGasPriceValidationRule(zeroBaseFeeMarket);
+    final Wei londonFeeMarketBaseFee = feeMarket.getInitialBasefee();
+    assertThat(
+            validationRule.validate(
+                blockHeader(FORK_BLOCK, 0, Optional.of(londonFeeMarketBaseFee)),
+                blockHeader(FORK_BLOCK - 1, 0, Optional.of(londonFeeMarketBaseFee))))
+        .isTrue();
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRuleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRuleTest.java
index 307a1c8779c..8ac7b158ea2 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRuleTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ConstantFieldValidationRuleTest.java
@@ -16,10 +16,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 import org.junit.Test;
 
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/EIP1559BlockHeaderGasPriceValidationRuleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/EIP1559BlockHeaderGasPriceValidationRuleTest.java
deleted file mode 100644
index b28cb6a444a..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/EIP1559BlockHeaderGasPriceValidationRuleTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet.headervalidationrules;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Java6Assertions.assertThatThrownBy;
-import static org.hyperledger.besu.ethereum.mainnet.headervalidationrules.EIP1559Helper.blockHeader;
-import static org.hyperledger.besu.ethereum.mainnet.headervalidationrules.EIP1559Helper.disableEIP1559;
-import static org.hyperledger.besu.ethereum.mainnet.headervalidationrules.EIP1559Helper.enableEIP1559;
-
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
-import org.hyperledger.besu.ethereum.core.fees.EIP1559;
-import org.hyperledger.besu.ethereum.core.fees.FeeMarket;
-
-import java.util.Optional;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class EIP1559BlockHeaderGasPriceValidationRuleTest {
-
-  private static final long FORK_BLOCK = 800L;
-  private final EIP1559 eip1559 = new EIP1559(FORK_BLOCK);
-  private EIP1559BlockHeaderGasPriceValidationRule validationRule;
-  private final FeeMarket feeMarket = FeeMarket.eip1559();
-
-  @Before
-  public void setUp() {
-    validationRule = new EIP1559BlockHeaderGasPriceValidationRule(eip1559);
-  }
-
-  @After
-  public void reset() {
-    ExperimentalEIPs.eip1559Enabled = ExperimentalEIPs.EIP1559_ENABLED_DEFAULT_VALUE;
-  }
-
-  @Test
-  public void eipActivationShouldBeGuardedProperly() {
-    disableEIP1559();
-    assertThatThrownBy(
-            () -> validationRule.validate(blockHeader(FORK_BLOCK - 1, 0, Optional.empty()), null))
-        .isInstanceOf(RuntimeException.class)
-        .hasMessageContaining("EIP-1559 is not enabled");
-  }
-
-  @Test
-  public void shouldReturnTrueBeforeFork() {
-    enableEIP1559();
-    assertThat(validationRule.validate(blockHeader(FORK_BLOCK - 1, 0, Optional.empty()), null))
-        .isTrue();
-    disableEIP1559();
-  }
-
-  @Test
-  public void shouldReturnTrueIfInitialBaseFeeAtForkBlock() {
-    enableEIP1559();
-    assertThat(
-            validationRule.validate(
-                blockHeader(FORK_BLOCK, 0, Optional.of(feeMarket.getInitialBasefee())), null))
-        .isTrue();
-    disableEIP1559();
-  }
-
-  @Test
-  public void shouldReturnFalseIfNotInitialBaseFeeAtForkBlock() {
-    enableEIP1559();
-    assertThat(
-            validationRule.validate(
-                blockHeader(FORK_BLOCK, 0, Optional.of(feeMarket.getInitialBasefee() - 1)), null))
-        .isFalse();
-    disableEIP1559();
-  }
-
-  @Test
-  public void shouldReturnIfNoBaseFeeAfterForkBlock() {
-    enableEIP1559();
-    assertThat(
-            validationRule.validate(
-                blockHeader(FORK_BLOCK + 2, 0, Optional.empty()),
-                blockHeader(FORK_BLOCK + 1, 0, Optional.empty())))
-        .isFalse();
-    disableEIP1559();
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/EIP1559Helper.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/EIP1559Helper.java
index c84c10bb65a..34bbc6c02c1 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/EIP1559Helper.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/EIP1559Helper.java
@@ -16,7 +16,7 @@
 
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 
 import java.util.Optional;
@@ -26,12 +26,12 @@
 public class EIP1559Helper {
 
   public static BlockHeader blockHeader(
-      final long number, final long gasUsed, final Optional<Long> baseFee) {
+      final long number, final long gasUsed, final Optional<Wei> baseFee) {
     return blockHeader(number, gasUsed, baseFee, 0);
   }
 
   public static BlockHeader blockHeader(
-      final long number, final long gasUsed, final Optional<Long> baseFee, final long gasLimit) {
+      final long number, final long gasUsed, final Optional<Wei> baseFee, final long gasLimit) {
     final BlockHeader mock = Mockito.mock(BlockHeader.class);
     when(mock.getNumber()).thenReturn(number);
     when(mock.getGasUsed()).thenReturn(gasUsed);
@@ -39,12 +39,4 @@ public static BlockHeader blockHeader(
     when(mock.getGasLimit()).thenReturn(gasLimit);
     return mock;
   }
-
-  public static void enableEIP1559() {
-    ExperimentalEIPs.eip1559Enabled = true;
-  }
-
-  public static void disableEIP1559() {
-    ExperimentalEIPs.eip1559Enabled = false;
-  }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitElasticityValidationRuleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitElasticityValidationRuleTest.java
new file mode 100644
index 00000000000..d707939fadd
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitElasticityValidationRuleTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet.headervalidationrules;
+
+import static java.lang.Long.MAX_VALUE;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.LondonFeeMarket;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Optional;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class GasLimitElasticityValidationRuleTest {
+
+  private static final Optional<BaseFeeMarket> baseFeeMarket = Optional.of(new LondonFeeMarket(10));
+
+  @Parameter public long headerGasLimit;
+
+  @Parameter(1)
+  public long parentGasLimit;
+
+  @Parameterized.Parameter(2)
+  public long headerNumber;
+
+  @Parameter(3)
+  public boolean expectedResult;
+
+  public GasLimitRangeAndDeltaValidationRule uut =
+      new GasLimitRangeAndDeltaValidationRule(5000, MAX_VALUE, baseFeeMarket);
+
+  @Parameters
+  public static Collection<Object[]> data() {
+    return Arrays.asList(
+        new Object[][] {
+          {20000000, 10000000, 10, true},
+          {20019530, 10000000, 10, true},
+          {20019531, 10000000, 10, false},
+          {19980470, 10000000, 10, true},
+          {19980469, 10000000, 10, false},
+          {20000000, 20000000, 11, true},
+          {20019530, 20000000, 11, true},
+          {20019531, 20000000, 11, false},
+          {19980470, 20000000, 11, true},
+          {19980469, 20000000, 11, false},
+          {40039061, 40000000, 11, true},
+          {40039062, 40000000, 11, false},
+          {39960939, 40000000, 11, true},
+          {39960938, 40000000, 11, false},
+          {4999, 40000000, 11, false}
+        });
+  }
+
+  @Test
+  public void test() {
+
+    final BlockHeaderTestFixture blockHeaderBuilder = new BlockHeaderTestFixture();
+
+    blockHeaderBuilder.number(headerNumber);
+    blockHeaderBuilder.gasLimit(headerGasLimit);
+    final BlockHeader header = blockHeaderBuilder.buildHeader();
+
+    blockHeaderBuilder.number(headerNumber - 1);
+    blockHeaderBuilder.gasLimit(parentGasLimit);
+    final BlockHeader parent = blockHeaderBuilder.buildHeader();
+
+    assertThat(uut.validate(header, parent)).isEqualTo(expectedResult);
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitElasticityValidationRuleZeroBaseFeeMarketTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitElasticityValidationRuleZeroBaseFeeMarketTest.java
new file mode 100644
index 00000000000..0f0766623de
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitElasticityValidationRuleZeroBaseFeeMarketTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet.headervalidationrules;
+
+import static java.lang.Long.MAX_VALUE;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.ZeroBaseFeeMarket;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Optional;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class GasLimitElasticityValidationRuleZeroBaseFeeMarketTest {
+
+  private static final Optional<BaseFeeMarket> zeroBaseFeeMarket =
+      Optional.of(new ZeroBaseFeeMarket(10));
+
+  @Parameter public long headerGasLimit;
+
+  @Parameter(1)
+  public long parentGasLimit;
+
+  @Parameter(2)
+  public long headerNumber;
+
+  @Parameter(3)
+  public boolean expectedResult;
+
+  public GasLimitRangeAndDeltaValidationRule uut =
+      new GasLimitRangeAndDeltaValidationRule(5000, MAX_VALUE, zeroBaseFeeMarket);
+
+  @Parameters
+  public static Collection<Object[]> data() {
+    return Arrays.asList(
+        new Object[][] {
+          {20000000, 10000000, 10, true},
+          {20019530, 10000000, 10, true},
+          {20019531, 10000000, 10, false},
+          {19980470, 10000000, 10, true},
+          {19980469, 10000000, 10, false},
+          {20000000, 20000000, 11, true},
+          {20019530, 20000000, 11, true},
+          {20019531, 20000000, 11, false},
+          {19980470, 20000000, 11, true},
+          {19980469, 20000000, 11, false},
+          {40039061, 40000000, 11, true},
+          {40039062, 40000000, 11, false},
+          {39960939, 40000000, 11, true},
+          {39960938, 40000000, 11, false},
+          {4999, 40000000, 11, false}
+        });
+  }
+
+  @Test
+  public void test() {
+
+    final BlockHeaderTestFixture blockHeaderBuilder = new BlockHeaderTestFixture();
+
+    blockHeaderBuilder.number(headerNumber);
+    blockHeaderBuilder.gasLimit(headerGasLimit);
+    final BlockHeader header = blockHeaderBuilder.buildHeader();
+
+    blockHeaderBuilder.number(headerNumber - 1);
+    blockHeaderBuilder.gasLimit(parentGasLimit);
+    final BlockHeader parent = blockHeaderBuilder.buildHeader();
+
+    assertThat(uut.validate(header, parent)).isEqualTo(expectedResult);
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRuleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRuleTest.java
index a10de9a25ca..bc17ace18e6 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRuleTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/GasLimitRangeAndDeltaValidationRuleTest.java
@@ -16,11 +16,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Optional;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -42,22 +44,39 @@ public class GasLimitRangeAndDeltaValidationRuleTest {
   @Parameter(3)
   public boolean expectedResult;
 
+  @Parameter(4)
+  public Optional<Wei> optionalBaseFee;
+
   @Parameters
   public static Collection<Object[]> data() {
     return Arrays.asList(
         new Object[][] {
-          {4096, 4096, new GasLimitRangeAndDeltaValidationRule(4095, 4097), true},
+          {4096, 4096, new GasLimitRangeAndDeltaValidationRule(4095, 4097), true, Optional.empty()},
           // In Range, no change = valid,
-          {4096, 4096, new GasLimitRangeAndDeltaValidationRule(4094, 4095), false},
+          {
+            4096, 4096, new GasLimitRangeAndDeltaValidationRule(4094, 4095), false, Optional.empty()
+          },
           // Out of Range, no change = invalid,
-          {4099, 4096, new GasLimitRangeAndDeltaValidationRule(4000, 4200), true},
+          {4099, 4096, new GasLimitRangeAndDeltaValidationRule(4000, 4200), true, Optional.empty()},
           // In Range, <1/1024 change = valid,
-          {4093, 4096, new GasLimitRangeAndDeltaValidationRule(4000, 4200), true},
+          {4093, 4096, new GasLimitRangeAndDeltaValidationRule(4000, 4200), true, Optional.empty()},
           // In Range, ,1/1024 change = valid,
-          {4092, 4096, new GasLimitRangeAndDeltaValidationRule(4000, 4200), false},
-          // In Range, >1/1024 change = invalid,
-          {4100, 4096, new GasLimitRangeAndDeltaValidationRule(4000, 4200), false}
-          // In Range, >1/1024 change = invalid,
+          {
+            4092, 4096, new GasLimitRangeAndDeltaValidationRule(4000, 4200), false, Optional.empty()
+          },
+          // In Range, == 1/1024 change = invalid,
+          {
+            4100, 4096, new GasLimitRangeAndDeltaValidationRule(4000, 4200), false, Optional.empty()
+          },
+          // In Range, == 1/1024 change = invalid,
+          {
+            4099,
+            4096,
+            new GasLimitRangeAndDeltaValidationRule(4000, 4200),
+            false,
+            Optional.of(Wei.of(10L))
+          }
+          // In Range, <1/1024 change, has basefee = invalid,
         });
   }
 
@@ -66,6 +85,7 @@ public void test() {
     final BlockHeaderTestFixture blockHeaderBuilder = new BlockHeaderTestFixture();
 
     blockHeaderBuilder.gasLimit(headerGasLimit);
+    optionalBaseFee.ifPresent(baseFee -> blockHeaderBuilder.baseFeePerGas(baseFee));
     final BlockHeader header = blockHeaderBuilder.buildHeader();
 
     blockHeaderBuilder.gasLimit(parentGasLimit);
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRuleTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRuleTest.java
index 6f380122f15..2622a362fa4 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRuleTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/headervalidationrules/ProofOfWorkValidationRuleTest.java
@@ -16,24 +16,27 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
 import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.ProtocolScheduleFixture;
 import org.hyperledger.besu.ethereum.mainnet.EpochCalculator;
+import org.hyperledger.besu.ethereum.mainnet.PoWHasher;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolution;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.mainnet.ValidationTestUtils;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
 
 import java.io.IOException;
 import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Optional;
 
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.units.bigints.UInt256;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -51,7 +54,9 @@ public ProofOfWorkValidationRuleTest(final long parentBlockNum, final long block
       throws IOException {
     blockHeader = ValidationTestUtils.readHeader(parentBlockNum);
     parentHeader = ValidationTestUtils.readHeader(blockNum);
-    validationRule = new ProofOfWorkValidationRule(new EpochCalculator.DefaultEpochCalculator());
+    validationRule =
+        new ProofOfWorkValidationRule(
+            new EpochCalculator.DefaultEpochCalculator(), PoWHasher.ETHASH_LIGHT);
   }
 
   @Parameters(name = "block {1}")
@@ -89,20 +94,16 @@ public void passesBlockWithOneValuedDifficulty() {
             .blockHeaderFunctions(mainnetBlockHashFunction())
             .timestamp(1);
     final BlockHeader preHeader = headerBuilder.buildBlockHeader();
-    final byte[] hashBuffer = new byte[64];
     final Hash headerHash = validationRule.hashHeader(preHeader);
 
-    ProofOfWorkValidationRule.HASHER.hash(
-        hashBuffer,
-        preHeader.getNonce(),
-        preHeader.getNumber(),
-        new EpochCalculator.DefaultEpochCalculator(),
-        headerHash.toArray());
+    PoWSolution solution =
+        PoWHasher.ETHASH_LIGHT.hash(
+            preHeader.getNonce(),
+            preHeader.getNumber(),
+            new EpochCalculator.DefaultEpochCalculator(),
+            headerHash);
 
-    final BlockHeader header =
-        headerBuilder
-            .mixHash(Hash.wrap(Bytes32.leftPad(Bytes.wrap(hashBuffer).slice(0, Bytes32.SIZE))))
-            .buildBlockHeader();
+    final BlockHeader header = headerBuilder.mixHash(solution.getMixHash()).buildBlockHeader();
 
     assertThat(validationRule.validate(header, parentHeader)).isTrue();
   }
@@ -120,8 +121,7 @@ public void failsWithVeryLargeDifficulty() {
 
   @Test
   public void failsWithMisMatchedMixHash() {
-    final Hash updateMixHash =
-        Hash.wrap(UInt256.fromBytes(blockHeader.getMixHash()).subtract(1L).toBytes());
+    final Hash updateMixHash = Hash.wrap(UInt256.fromBytes(blockHeader.getMixHash()).subtract(1L));
     final BlockHeader header =
         BlockHeaderBuilder.fromHeader(blockHeader)
             .mixHash(updateMixHash)
@@ -141,6 +141,61 @@ public void failsWithMisMatchedNonce() {
     assertThat(validationRule.validate(header, parentHeader)).isFalse();
   }
 
+  @Test
+  public void failsWithNonEip1559BlockAfterFork() {
+    final ProofOfWorkValidationRule proofOfWorkValidationRule =
+        new ProofOfWorkValidationRule(
+            new EpochCalculator.DefaultEpochCalculator(),
+            PoWHasher.ETHASH_LIGHT,
+            Optional.of(FeeMarket.london(0L)));
+
+    final BlockHeaderBuilder headerBuilder =
+        BlockHeaderBuilder.fromHeader(blockHeader)
+            .difficulty(Difficulty.ONE)
+            .blockHeaderFunctions(mainnetBlockHashFunction())
+            .timestamp(1);
+    final BlockHeader preHeader = headerBuilder.buildBlockHeader();
+    final Hash headerHash = validationRule.hashHeader(preHeader);
+
+    PoWSolution solution =
+        PoWHasher.ETHASH_LIGHT.hash(
+            preHeader.getNonce(),
+            preHeader.getNumber(),
+            new EpochCalculator.DefaultEpochCalculator(),
+            headerHash);
+
+    final BlockHeader header = headerBuilder.mixHash(solution.getMixHash()).buildBlockHeader();
+
+    assertThat(proofOfWorkValidationRule.validate(header, parentHeader)).isFalse();
+  }
+
+  @Test
+  public void failsWithEip1559BlockBeforeFork() {
+    final ProofOfWorkValidationRule proofOfWorkValidationRule =
+        new ProofOfWorkValidationRule(
+            new EpochCalculator.DefaultEpochCalculator(), PoWHasher.ETHASH_LIGHT);
+
+    final BlockHeaderBuilder headerBuilder =
+        BlockHeaderBuilder.fromHeader(blockHeader)
+            .difficulty(Difficulty.ONE)
+            .baseFee(Wei.of(10L))
+            .blockHeaderFunctions(mainnetBlockHashFunction())
+            .timestamp(1);
+    final BlockHeader preHeader = headerBuilder.buildBlockHeader();
+    final Hash headerHash = validationRule.hashHeader(preHeader);
+
+    PoWSolution solution =
+        PoWHasher.ETHASH_LIGHT.hash(
+            preHeader.getNonce(),
+            preHeader.getNumber(),
+            new EpochCalculator.DefaultEpochCalculator(),
+            headerHash);
+
+    final BlockHeader header = headerBuilder.mixHash(solution.getMixHash()).buildBlockHeader();
+
+    assertThat(proofOfWorkValidationRule.validate(header, parentHeader)).isFalse();
+  }
+
   private BlockHeaderFunctions mainnetBlockHashFunction() {
     final ProtocolSchedule protocolSchedule = ProtocolScheduleFixture.MAINNET;
     return ScheduleBasedBlockHeaderFunctions.create(protocolSchedule);
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AbstractPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AbstractPrecompiledContractTest.java
index 0161d32ec57..eb4cc5cc670 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AbstractPrecompiledContractTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AbstractPrecompiledContractTest.java
@@ -16,13 +16,12 @@
 
 package org.hyperledger.besu.ethereum.mainnet.precompiles;
 
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-import org.hyperledger.besu.ethereum.mainnet.IstanbulGasCalculator;
-import org.hyperledger.besu.ethereum.mainnet.PrecompileContractRegistry;
-import org.hyperledger.besu.ethereum.mainnet.PrecompiledContract;
 import org.hyperledger.besu.ethereum.mainnet.PrecompiledContractConfiguration;
+import org.hyperledger.besu.evm.gascalculator.IstanbulGasCalculator;
+import org.hyperledger.besu.evm.precompile.PrecompileContractRegistry;
+import org.hyperledger.besu.evm.precompile.PrecompiledContract;
 
 import java.util.function.Function;
 
@@ -37,6 +36,6 @@ public AbstractPrecompiledContractTest(
             .apply(
                 new PrecompiledContractConfiguration(
                     new IstanbulGasCalculator(), PrivacyParameters.DEFAULT))
-            .get(precompiledAddress, Account.DEFAULT_VERSION);
+            .get(precompiledAddress);
   }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLAKE2BFPrecompileContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLAKE2BFPrecompileContractTest.java
deleted file mode 100644
index 193ed281277..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLAKE2BFPrecompileContractTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.mainnet.ConstantinopleFixGasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-public class BLAKE2BFPrecompileContractTest {
-  private final BLAKE2BFPrecompileContract contract =
-      new BLAKE2BFPrecompileContract(new ConstantinopleFixGasCalculator());
-
-  public BLAKE2BFPrecompileContractTest() {}
-
-  private final MessageFrame messageFrame = mock(MessageFrame.class);
-
-  @Parameterized.Parameters
-  public static Object[][] parameters() {
-    return new Object[][] {
-      {
-        // https://tools.ietf.org/html/rfc7693#appendix-A
-        "0000000c48c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001",
-        "ba80a53f981c4d0d6a2797b69f12f6e94c212f14685ac4b74b12bb6fdbffa2d17d87c5392aab792dc252d5de4533cc9518d38aa8dbf1925ab92386edd4009923",
-        12
-      },
-      {
-        // https://tools.ietf.org/html/rfc7693#appendix-A, not final
-        "0000000c48c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000",
-        "75ab69d3190a562c51aef8d88f1c2775876944407270c42c9844252c26d2875298743e7f6d5ea2f2d3e8d226039cd31b4e426ac4f2d3d666a610c2116fde4735",
-        12
-      },
-      {
-        // as above, but 8 million rounds.
-        "007a120048c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001",
-        "6d2ce9e534d50e18ff866ae92d70cceba79bbcd14c63819fe48752c8aca87a4bb7dcc230d22a4047f0486cfcfb50a17b24b2899eb8fca370f22240adb5170189",
-        8_000_000
-      },
-      {
-        // empty
-        "", null, 0
-      },
-      {
-        // too long
-        "0000000c48c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b6162630000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000001",
-        null,
-        0
-      },
-      {
-        // too short
-        "0000000c48c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b616263000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000001",
-        null,
-        0
-      },
-      {
-        // bad final
-        "0000000c48c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000011",
-        null,
-        0
-      },
-    };
-  }
-
-  @Parameterized.Parameter public String input;
-
-  @Parameterized.Parameter(1)
-  public String expectedResult;
-
-  @Parameterized.Parameter(2)
-  public long expectedGasUsed;
-
-  @Test
-  public void shouldRunFCompression() {
-    final Bytes input = Bytes.fromHexString(this.input);
-    final Bytes expectedComputation =
-        expectedResult == null ? null : Bytes.fromHexString(expectedResult);
-    assertThat(contract.compute(input, messageFrame)).isEqualTo(expectedComputation);
-    assertThat(contract.gasRequirement(input)).isEqualTo(Gas.of(expectedGasUsed));
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1AddPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1AddPrecompiledContractTest.java
deleted file mode 100644
index 99230156788..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1AddPrecompiledContractTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.mainnet.MainnetPrecompiledContractRegistries;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.stream.Collectors;
-
-import com.google.common.io.CharStreams;
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.mockito.ArgumentCaptor;
-
-@RunWith(Parameterized.class)
-public class BLS12G1AddPrecompiledContractTest extends AbstractPrecompiledContractTest {
-
-  public BLS12G1AddPrecompiledContractTest() {
-    super(MainnetPrecompiledContractRegistries::berlin, Address.BLS12_G1ADD);
-  }
-
-  private final MessageFrame messageFrame = mock(MessageFrame.class);
-
-  @Parameterized.Parameters
-  public static Iterable<String[]> parameters() throws IOException {
-    return CharStreams.readLines(
-            new InputStreamReader(
-                BLS12G1AddPrecompiledContractTest.class.getResourceAsStream("g1_add.csv"), UTF_8))
-        .stream()
-        .map(line -> line.split(",", 4))
-        .collect(Collectors.toList());
-  }
-
-  @Parameterized.Parameter(0)
-  public String input;
-
-  @Parameterized.Parameter(1)
-  public String expectedResult;
-
-  @Parameterized.Parameter(2)
-  public String expectedGasUsed;
-
-  @Parameterized.Parameter(3)
-  public String notes;
-
-  @Test
-  public void shouldCalculate() {
-    if ("input".equals(input)) {
-      // skip the header row
-      return;
-    }
-    final Bytes input = Bytes.fromHexString(this.input);
-    final Bytes expectedComputation =
-        expectedResult == null ? null : Bytes.fromHexString(expectedResult);
-    final Bytes actualComputation = contract.compute(input, messageFrame);
-    if (actualComputation == null) {
-      final ArgumentCaptor<Bytes> revertReason = ArgumentCaptor.forClass(Bytes.class);
-      verify(messageFrame).setRevertReason(revertReason.capture());
-      assertThat(new String(revertReason.getValue().toArrayUnsafe(), UTF_8)).isEqualTo(notes);
-
-      assertThat(expectedComputation.size()).isZero();
-    } else {
-      assertThat(actualComputation).isEqualTo(expectedComputation);
-      assertThat(contract.gasRequirement(input)).isEqualTo(Gas.of(Long.parseLong(expectedGasUsed)));
-    }
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1MulPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1MulPrecompiledContractTest.java
deleted file mode 100644
index 94b9d35fbd6..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1MulPrecompiledContractTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.mainnet.MainnetPrecompiledContractRegistries;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.stream.Collectors;
-
-import com.google.common.io.CharStreams;
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.mockito.ArgumentCaptor;
-
-@RunWith(Parameterized.class)
-public class BLS12G1MulPrecompiledContractTest extends AbstractPrecompiledContractTest {
-
-  public BLS12G1MulPrecompiledContractTest() {
-    super(MainnetPrecompiledContractRegistries::berlin, Address.BLS12_G1MUL);
-  }
-
-  private final MessageFrame messageFrame = mock(MessageFrame.class);
-
-  @Parameterized.Parameters
-  public static Iterable<String[]> parameters() throws IOException {
-    return CharStreams.readLines(
-            new InputStreamReader(
-                BLS12G1MulPrecompiledContractTest.class.getResourceAsStream("g1_mul.csv"), UTF_8))
-        .stream()
-        .map(line -> line.split(",", 4))
-        .collect(Collectors.toList());
-  }
-
-  @Parameterized.Parameter(0)
-  public String input;
-
-  @Parameterized.Parameter(1)
-  public String expectedResult;
-
-  @Parameterized.Parameter(2)
-  public String expectedGasUsed;
-
-  @Parameterized.Parameter(3)
-  public String notes;
-
-  @Test
-  public void shouldCalculate() {
-    if ("input".equals(input)) {
-      // skip the header row
-      return;
-    }
-    final Bytes input = Bytes.fromHexString(this.input);
-    final Bytes expectedComputation =
-        expectedResult == null ? null : Bytes.fromHexString(expectedResult);
-    final Bytes actualComputation = contract.compute(input, messageFrame);
-    if (actualComputation == null) {
-      final ArgumentCaptor<Bytes> revertReason = ArgumentCaptor.forClass(Bytes.class);
-      verify(messageFrame).setRevertReason(revertReason.capture());
-      assertThat(new String(revertReason.getValue().toArrayUnsafe(), UTF_8)).isEqualTo(notes);
-
-      assertThat(expectedComputation.size()).isZero();
-    } else {
-      assertThat(actualComputation).isEqualTo(expectedComputation);
-      assertThat(contract.gasRequirement(input)).isEqualTo(Gas.of(Long.parseLong(expectedGasUsed)));
-    }
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1MultiExpPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1MultiExpPrecompiledContractTest.java
deleted file mode 100644
index 29d8414f13f..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1MultiExpPrecompiledContractTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.mainnet.MainnetPrecompiledContractRegistries;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.stream.Collectors;
-
-import com.google.common.io.CharStreams;
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.mockito.ArgumentCaptor;
-
-@RunWith(Parameterized.class)
-public class BLS12G1MultiExpPrecompiledContractTest extends AbstractPrecompiledContractTest {
-
-  public BLS12G1MultiExpPrecompiledContractTest() {
-    super(MainnetPrecompiledContractRegistries::berlin, Address.BLS12_G1MULTIEXP);
-  }
-
-  private final MessageFrame messageFrame = mock(MessageFrame.class);
-
-  @Parameterized.Parameters
-  public static Iterable<String[]> parameters() throws IOException {
-    return CharStreams.readLines(
-            new InputStreamReader(
-                BLS12G1MultiExpPrecompiledContractTest.class.getResourceAsStream("g1_multiexp.csv"),
-                UTF_8))
-        .stream()
-        .map(line -> line.split(",", 4))
-        .collect(Collectors.toList());
-  }
-
-  @Parameterized.Parameter(0)
-  public String input;
-
-  @Parameterized.Parameter(1)
-  public String expectedResult;
-
-  @Parameterized.Parameter(2)
-  public String expectedGasUsed;
-
-  @Parameterized.Parameter(3)
-  public String notes;
-
-  @Test
-  public void shouldCalculate() {
-    if ("input".equals(input)) {
-      // skip the header row
-      return;
-    }
-    final Bytes input = Bytes.fromHexString(this.input);
-    final Bytes expectedComputation =
-        expectedResult == null ? null : Bytes.fromHexString(expectedResult);
-    final Bytes actualComputation = contract.compute(input, messageFrame);
-    if (actualComputation == null) {
-      final ArgumentCaptor<Bytes> revertReason = ArgumentCaptor.forClass(Bytes.class);
-      verify(messageFrame).setRevertReason(revertReason.capture());
-      assertThat(new String(revertReason.getValue().toArrayUnsafe(), UTF_8)).isEqualTo(notes);
-
-      assertThat(expectedComputation.size()).isZero();
-    } else {
-      assertThat(actualComputation).isEqualTo(expectedComputation);
-      assertThat(contract.gasRequirement(input)).isEqualTo(Gas.of(Long.parseLong(expectedGasUsed)));
-    }
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2AddPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2AddPrecompiledContractTest.java
deleted file mode 100644
index 66e3b38564a..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2AddPrecompiledContractTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.mainnet.MainnetPrecompiledContractRegistries;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.stream.Collectors;
-
-import com.google.common.io.CharStreams;
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.mockito.ArgumentCaptor;
-
-@RunWith(Parameterized.class)
-public class BLS12G2AddPrecompiledContractTest extends AbstractPrecompiledContractTest {
-
-  public BLS12G2AddPrecompiledContractTest() {
-    super(MainnetPrecompiledContractRegistries::berlin, Address.BLS12_G2ADD);
-  }
-
-  private final MessageFrame messageFrame = mock(MessageFrame.class);
-
-  @Parameterized.Parameters
-  public static Iterable<String[]> parameters() throws IOException {
-    return CharStreams.readLines(
-            new InputStreamReader(
-                BLS12G2AddPrecompiledContractTest.class.getResourceAsStream("g2_add.csv"), UTF_8))
-        .stream()
-        .map(line -> line.split(",", 4))
-        .collect(Collectors.toList());
-  }
-
-  @Parameterized.Parameter(0)
-  public String input;
-
-  @Parameterized.Parameter(1)
-  public String expectedResult;
-
-  @Parameterized.Parameter(2)
-  public String expectedGasUsed;
-
-  @Parameterized.Parameter(3)
-  public String notes;
-
-  @Test
-  public void shouldCalculate() {
-    if ("input".equals(input)) {
-      // skip the header row
-      return;
-    }
-    final Bytes input = Bytes.fromHexString(this.input);
-    final Bytes expectedComputation =
-        expectedResult == null ? null : Bytes.fromHexString(expectedResult);
-    final Bytes actualComputation = contract.compute(input, messageFrame);
-    if (actualComputation == null) {
-      final ArgumentCaptor<Bytes> revertReason = ArgumentCaptor.forClass(Bytes.class);
-      verify(messageFrame).setRevertReason(revertReason.capture());
-      assertThat(new String(revertReason.getValue().toArrayUnsafe(), UTF_8)).isEqualTo(notes);
-
-      assertThat(expectedComputation.size()).isZero();
-    } else {
-      assertThat(actualComputation).isEqualTo(expectedComputation);
-      assertThat(contract.gasRequirement(input)).isEqualTo(Gas.of(Long.parseLong(expectedGasUsed)));
-    }
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2MulPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2MulPrecompiledContractTest.java
deleted file mode 100644
index a52872802d1..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2MulPrecompiledContractTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.mainnet.MainnetPrecompiledContractRegistries;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.stream.Collectors;
-
-import com.google.common.io.CharStreams;
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.mockito.ArgumentCaptor;
-
-@RunWith(Parameterized.class)
-public class BLS12G2MulPrecompiledContractTest extends AbstractPrecompiledContractTest {
-
-  public BLS12G2MulPrecompiledContractTest() {
-    super(MainnetPrecompiledContractRegistries::berlin, Address.BLS12_G2MUL);
-  }
-
-  private final MessageFrame messageFrame = mock(MessageFrame.class);
-
-  @Parameterized.Parameters
-  public static Iterable<String[]> parameters() throws IOException {
-    return CharStreams.readLines(
-            new InputStreamReader(
-                BLS12G2MulPrecompiledContractTest.class.getResourceAsStream("g2_mul.csv"), UTF_8))
-        .stream()
-        .map(line -> line.split(",", 4))
-        .collect(Collectors.toList());
-  }
-
-  @Parameterized.Parameter(0)
-  public String input;
-
-  @Parameterized.Parameter(1)
-  public String expectedResult;
-
-  @Parameterized.Parameter(2)
-  public String expectedGasUsed;
-
-  @Parameterized.Parameter(3)
-  public String notes;
-
-  @Test
-  public void shouldCalculate() {
-    if ("input".equals(input)) {
-      // skip the header row
-      return;
-    }
-    final Bytes input = Bytes.fromHexString(this.input);
-    final Bytes expectedComputation =
-        expectedResult == null ? null : Bytes.fromHexString(expectedResult);
-    final Bytes actualComputation = contract.compute(input, messageFrame);
-    if (actualComputation == null) {
-      final ArgumentCaptor<Bytes> revertReason = ArgumentCaptor.forClass(Bytes.class);
-      verify(messageFrame).setRevertReason(revertReason.capture());
-      assertThat(new String(revertReason.getValue().toArrayUnsafe(), UTF_8)).isEqualTo(notes);
-
-      assertThat(expectedComputation.size()).isZero();
-    } else {
-      assertThat(actualComputation).isEqualTo(expectedComputation);
-      assertThat(contract.gasRequirement(input)).isEqualTo(Gas.of(Long.parseLong(expectedGasUsed)));
-    }
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2MultiExpPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2MultiExpPrecompiledContractTest.java
deleted file mode 100644
index 8f6a24ef732..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2MultiExpPrecompiledContractTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.mainnet.MainnetPrecompiledContractRegistries;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.stream.Collectors;
-
-import com.google.common.io.CharStreams;
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.mockito.ArgumentCaptor;
-
-@RunWith(Parameterized.class)
-public class BLS12G2MultiExpPrecompiledContractTest extends AbstractPrecompiledContractTest {
-
-  public BLS12G2MultiExpPrecompiledContractTest() {
-    super(MainnetPrecompiledContractRegistries::berlin, Address.BLS12_G2MULTIEXP);
-  }
-
-  private final MessageFrame messageFrame = mock(MessageFrame.class);
-
-  @Parameterized.Parameters
-  public static Iterable<String[]> parameters() throws IOException {
-    return CharStreams.readLines(
-            new InputStreamReader(
-                BLS12G2MultiExpPrecompiledContractTest.class.getResourceAsStream("g2_multiexp.csv"),
-                UTF_8))
-        .stream()
-        .map(line -> line.split(",", 4))
-        .collect(Collectors.toList());
-  }
-
-  @Parameterized.Parameter(0)
-  public String input;
-
-  @Parameterized.Parameter(1)
-  public String expectedResult;
-
-  @Parameterized.Parameter(2)
-  public String expectedGasUsed;
-
-  @Parameterized.Parameter(3)
-  public String notes;
-
-  @Test
-  public void shouldCalculate() {
-    if ("input".equals(input)) {
-      // skip the header row
-      return;
-    }
-    final Bytes input = Bytes.fromHexString(this.input);
-    final Bytes expectedComputation =
-        expectedResult == null ? null : Bytes.fromHexString(expectedResult);
-    final Bytes actualComputation = contract.compute(input, messageFrame);
-    if (actualComputation == null) {
-      final ArgumentCaptor<Bytes> revertReason = ArgumentCaptor.forClass(Bytes.class);
-      verify(messageFrame).setRevertReason(revertReason.capture());
-      assertThat(new String(revertReason.getValue().toArrayUnsafe(), UTF_8)).isEqualTo(notes);
-
-      assertThat(expectedComputation.size()).isZero();
-    } else {
-      assertThat(actualComputation).isEqualTo(expectedComputation);
-      assertThat(contract.gasRequirement(input)).isEqualTo(Gas.of(Long.parseLong(expectedGasUsed)));
-    }
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12MapFp2ToG2PrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12MapFp2ToG2PrecompiledContractTest.java
deleted file mode 100644
index d985f27f220..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12MapFp2ToG2PrecompiledContractTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.mainnet.MainnetPrecompiledContractRegistries;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.stream.Collectors;
-
-import com.google.common.io.CharStreams;
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.mockito.ArgumentCaptor;
-
-@RunWith(Parameterized.class)
-public class BLS12MapFp2ToG2PrecompiledContractTest extends AbstractPrecompiledContractTest {
-
-  public BLS12MapFp2ToG2PrecompiledContractTest() {
-    super(MainnetPrecompiledContractRegistries::berlin, Address.BLS12_MAP_FP2_TO_G2);
-  }
-
-  private final MessageFrame messageFrame = mock(MessageFrame.class);
-
-  @Parameterized.Parameters
-  public static Iterable<String[]> parameters() throws IOException {
-    return CharStreams.readLines(
-            new InputStreamReader(
-                BLS12MapFp2ToG2PrecompiledContractTest.class.getResourceAsStream("fp2_to_g2.csv"),
-                UTF_8))
-        .stream()
-        .map(line -> line.split(",", 4))
-        .collect(Collectors.toList());
-  }
-
-  @Parameterized.Parameter(0)
-  public String input;
-
-  @Parameterized.Parameter(1)
-  public String expectedResult;
-
-  @Parameterized.Parameter(2)
-  public String expectedGasUsed;
-
-  @Parameterized.Parameter(3)
-  public String notes;
-
-  @Test
-  public void shouldCalculate() {
-    if ("input".equals(input)) {
-      // skip the header row
-      return;
-    }
-    final Bytes input = Bytes.fromHexString(this.input);
-    final Bytes expectedComputation =
-        expectedResult == null ? null : Bytes.fromHexString(expectedResult);
-    final Bytes actualComputation = contract.compute(input, messageFrame);
-    if (actualComputation == null) {
-      final ArgumentCaptor<Bytes> revertReason = ArgumentCaptor.forClass(Bytes.class);
-      verify(messageFrame).setRevertReason(revertReason.capture());
-      assertThat(new String(revertReason.getValue().toArrayUnsafe(), UTF_8)).isEqualTo(notes);
-
-      assertThat(expectedComputation.size()).isZero();
-    } else {
-      assertThat(actualComputation).isEqualTo(expectedComputation);
-      assertThat(contract.gasRequirement(input)).isEqualTo(Gas.of(Long.parseLong(expectedGasUsed)));
-    }
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12MapFpToG1PrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12MapFpToG1PrecompiledContractTest.java
deleted file mode 100644
index 83dfa8f3291..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12MapFpToG1PrecompiledContractTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.mainnet.MainnetPrecompiledContractRegistries;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.stream.Collectors;
-
-import com.google.common.io.CharStreams;
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.mockito.ArgumentCaptor;
-
-@RunWith(Parameterized.class)
-public class BLS12MapFpToG1PrecompiledContractTest extends AbstractPrecompiledContractTest {
-
-  public BLS12MapFpToG1PrecompiledContractTest() {
-    super(MainnetPrecompiledContractRegistries::berlin, Address.BLS12_MAP_FP_TO_G1);
-  }
-
-  private final MessageFrame messageFrame = mock(MessageFrame.class);
-
-  @Parameterized.Parameters
-  public static Iterable<String[]> parameters() throws IOException {
-    return CharStreams.readLines(
-            new InputStreamReader(
-                BLS12MapFpToG1PrecompiledContractTest.class.getResourceAsStream("fp_to_g1.csv"),
-                UTF_8))
-        .stream()
-        .map(line -> line.split(",", 4))
-        .collect(Collectors.toList());
-  }
-
-  @Parameterized.Parameter(0)
-  public String input;
-
-  @Parameterized.Parameter(1)
-  public String expectedResult;
-
-  @Parameterized.Parameter(2)
-  public String expectedGasUsed;
-
-  @Parameterized.Parameter(3)
-  public String notes;
-
-  @Test
-  public void shouldCalculate() {
-    if ("input".equals(input)) {
-      // skip the header row
-      return;
-    }
-    final Bytes input = Bytes.fromHexString(this.input);
-    final Bytes expectedComputation =
-        expectedResult == null ? null : Bytes.fromHexString(expectedResult);
-    final Bytes actualComputation = contract.compute(input, messageFrame);
-    if (actualComputation == null) {
-      final ArgumentCaptor<Bytes> revertReason = ArgumentCaptor.forClass(Bytes.class);
-      verify(messageFrame).setRevertReason(revertReason.capture());
-      assertThat(new String(revertReason.getValue().toArrayUnsafe(), UTF_8)).isEqualTo(notes);
-
-      assertThat(expectedComputation.size()).isZero();
-    } else {
-      assertThat(actualComputation).isEqualTo(expectedComputation);
-      assertThat(contract.gasRequirement(input)).isEqualTo(Gas.of(Long.parseLong(expectedGasUsed)));
-    }
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12PairingPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12PairingPrecompiledContractTest.java
deleted file mode 100644
index 32758c6f472..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12PairingPrecompiledContractTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.mainnet.MainnetPrecompiledContractRegistries;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.stream.Collectors;
-
-import com.google.common.collect.Streams;
-import com.google.common.io.CharStreams;
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.mockito.ArgumentCaptor;
-
-@RunWith(Parameterized.class)
-public class BLS12PairingPrecompiledContractTest extends AbstractPrecompiledContractTest {
-
-  public BLS12PairingPrecompiledContractTest() {
-    super(MainnetPrecompiledContractRegistries::berlin, Address.BLS12_PAIRING);
-  }
-
-  private final MessageFrame messageFrame = mock(MessageFrame.class);
-
-  @Parameterized.Parameters
-  public static Iterable<String[]> parameters() throws IOException {
-    return Streams.concat(
-            CharStreams.readLines(
-                new InputStreamReader(
-                    BLS12PairingPrecompiledContractTest.class.getResourceAsStream("pairing.csv"),
-                    UTF_8))
-                .stream(),
-            CharStreams.readLines(
-                new InputStreamReader(
-                    BLS12PairingPrecompiledContractTest.class.getResourceAsStream(
-                        "invalid_subgroup_for_pairing.csv"),
-                    UTF_8))
-                .stream())
-        .map(line -> line.split(",", 4))
-        .collect(Collectors.toList());
-  }
-
-  @Parameterized.Parameter(0)
-  public String input;
-
-  @Parameterized.Parameter(1)
-  public String expectedResult;
-
-  @Parameterized.Parameter(2)
-  public String expectedGasUsed;
-
-  @Parameterized.Parameter(3)
-  public String notes;
-
-  @Test
-  public void shouldCalculate() {
-    if ("input".equals(input)) {
-      // skip the header row
-      return;
-    }
-    final Bytes input = Bytes.fromHexString(this.input);
-    final Bytes expectedComputation =
-        expectedResult == null ? null : Bytes.fromHexString(expectedResult);
-    final Bytes actualComputation = contract.compute(input, messageFrame);
-    if (actualComputation == null) {
-      final ArgumentCaptor<Bytes> revertReason = ArgumentCaptor.forClass(Bytes.class);
-      verify(messageFrame).setRevertReason(revertReason.capture());
-      assertThat(new String(revertReason.getValue().toArrayUnsafe(), UTF_8)).isEqualTo(notes);
-
-      assertThat(expectedComputation.size()).isZero();
-    } else {
-      assertThat(actualComputation).isEqualTo(expectedComputation);
-      assertThat(contract.gasRequirement(input)).isEqualTo(Gas.of(Long.parseLong(expectedGasUsed)));
-    }
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/ECRECPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/ECRECPrecompiledContractTest.java
deleted file mode 100644
index 5501087b314..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/ECRECPrecompiledContractTest.java
+++ /dev/null
@@ -1,467 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-import org.hyperledger.besu.ethereum.mainnet.SpuriousDragonGasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class ECRECPrecompiledContractTest {
-
-  private final ECRECPrecompiledContract contract =
-      new ECRECPrecompiledContract(new SpuriousDragonGasCalculator());
-
-  public ECRECPrecompiledContractTest() {}
-
-  private final MessageFrame messageFrame = mock(MessageFrame.class);
-
-  @Parameters
-  public static Object[][] parameters() {
-    return new Object[][] {
-      {
-        "acb1c19ac0832320815b5e886c6b73ad7d6177853d44b026f2a7a9e11bb899fc000000000000000000000000000000000000000000000000000000000000001c89ea49159b334f9aebbf54481b69d000d285baa341899db355a4030f6838394e540e9f9fa17bef441e32d98d5f4554cfefdc6a56101352e4b92efafd0d9646e8",
-        null
-      },
-      {
-        "0x0049872459827432342344987245982743234234498724598274323423429943000000000000000000000000000000000000000000000000000000000000001be8359c341771db7f9ea3a662a1741d27775ce277961470028e054ed3285aab8e31f63eaac35c4e6178abbc2a1073040ac9bbb0b67f2bc89a2e9593ba9abe8c53",
-        "0x0c65a9d9ffc02c7c99e36e32ce0f950c7804ceda"
-      },
-      {
-        "0x82f3df49d3645876de6313df2bbe9fbce593f21341a7b03acdb9423bc171fcc9000000000000000000000000000000000000000000000000000000000000001cba13918f50da910f2d55a7ea64cf716ba31dad91856f45908dde900530377d8a112d60f36900d18eb8f9d3b4f85a697b545085614509e3520e4b762e35d0d6bd",
-        "0xc6e93f4c1920eaeaa1e699f76a7a8c18e3056074"
-      },
-      {
-        "0x0fcdd8f8c550589cbae6183bc40713beb8d11898a201d13d6d5e40bc9ebf221d000000000000000000000000000000000000000000000000000000000000001c3824317158d005cbe49614fa05798ea00f2ca9db302a5e92d55bcaecd33d33da3c7de48ebec95be7b5111a7812febed1421f839d4d480c98501b78666aefdcd3",
-        "0xfe26206ad0a5897a478dd046c56164553adaea20"
-      },
-      {
-        "0xeb9a6731fa269c24c2535aa00a4b31d7117a2791188120c71aacd97664d1cc16000000000000000000000000000000000000000000000000000000000000001c707c68dd904de055d735f9e5c4dfba46296ad38ff6ba8f0e5e3f4ae83243b84a5b1920d628abc74e4f3a09449011a9664ab9885f74fdc7628d417599207bde74",
-        "0x39c0f4fbcd41581d5b440a7c9f964b903037e09e"
-      },
-      {
-        "0xf3ae1d9176371dd31accd73bb6bbaee561a041f5ac291a548880e1abe7b19e38000000000000000000000000000000000000000000000000000000000000001b116bd86d971b70ed540dc7c13756a99ff17644ed433781a3ffcc7359541d02fc4a2358ffc21682ece870e633cc8537f04be4ff75a142ecd35a951fc95fd1de57",
-        "0x64849cfbf0353f2c80e2a1e558982f7c4738d9f1"
-      },
-      {
-        "0x69567625d007e5c915eadb8b768f008227d57f4951f9d5711dfc72a8af13d35f000000000000000000000000000000000000000000000000000000000000001ba3ef328e9f95b4a28d9b8c20f3e9fc939bf94ad3611b4e1aaabb442f1c40545f6f83fe2c067d7a35f9bcb655894d15cd6d95d5e05c9fad33b2efa67592c0a4fe",
-        "0x5026d2655bc28bee480b2f31934f0970e8acc647"
-      },
-      {
-        "0x5ecdd449eb48c111c596d6b41047547deb4bbb27eafa419d1d041d842f1d81cb000000000000000000000000000000000000000000000000000000000000001c7ee309958bcd2f7a8d0fa904f16358d7b1dd52dc653f62b0eba42eec74335a620bf25c9db104a22c77af694cdb56e115fe259eef0a5e7968698bad0a592f6a2d",
-        "0x24bf97810c294811aa8165c9a05717a7731342a0"
-      },
-      {
-        "0x9a996c7083b19106163161ad5117a11703507ac61cad659c5bb164cd9d368672000000000000000000000000000000000000000000000000000000000000001bffc032f93b534eec6f76d194821f9fa70de06f0aac391e7f105401b23ab1a23071b55820c93857ed7e079e72f65798b2d5afad4f999048c1a987152bc5dbf78a",
-        "0x9bdeac37b1bf31980c6e8cbc5bdfa38dacbc4c43"
-      },
-      {
-        "0xea3305a892449d8215a5c41c619a42aeef22f888ee1b2c370584a6eb9e16fa27000000000000000000000000000000000000000000000000000000000000001b8efcc5180b219820d57856f018a7de24b0c4c633dfae40a96a5110c4f94b947151f4320da2e79e2d5e5c0efaef659b60b7d3de1debb4e37853746395f9426f2b",
-        "0x9ded673711119881765005a33ef7bb1961bfe98d"
-      },
-      {
-        "0xebb2b43c1070b6000aaa866071de173a24dbdec57443b9467c1aa11c0090d20c000000000000000000000000000000000000000000000000000000000000001bb52ebd3ee958d6487d7a6d68faa5df32e8f34a4703201feb6ea7687c1abf5b28439215bef624ef3799919da5980f3793f6aa14fd6dc43df3c5c652a4e2f6149b",
-        "0xd4bbacccff27e6e8534d14cd8fcd665d455dddf2"
-      },
-      {
-        "0xb28e4662bf41c1043e06400119c6c7804dcea81b1e4e8555c9db5be41380b1d3000000000000000000000000000000000000000000000000000000000000001ca010458d4c545fca2831e8ee9eb7857955d083feba0080c0b58a1b94233650572bfb5978a642da7b7f255562c47404ee3ad236d9f0319413f2e5a69cfafec2cb",
-        "0x5b73664bd5ef270f91775d27f47e436d960aa853"
-      },
-      {
-        "0x694bace9fe95c0370ef0eb3c0c629186616e33469972ff6a7ecce90f3fe2ab2d000000000000000000000000000000000000000000000000000000000000001ca07e9497d29f7c9adae37b9a985c876b5b3ee6d21a9bc83cfcf27531cb5eb67879f317e2c145caaa798bb1b30fd96f32d843636559f195622f2fac69297f935a",
-        "0x200d8d10eab444331cb2a0802219771c11443205"
-      },
-      {
-        "0xc3964b44adfd407ce69ccae93c033b6418ab903c674e794681baadf3173e37c1000000000000000000000000000000000000000000000000000000000000001c28e8ff8b5d9e55740da1ab2f7cfb9b527509439b2a99117d40a2158501a5b4354cdda2112aa6a7e89019556011f50abec5c3ae48501a1594b831275a2f031999",
-        "0x4135437a672c7d48fefc4be43a26783fe030e9b7"
-      },
-      {
-        "0x0d56ee3eb6ecd6a949793c8afaa905550333dc9063bc58cdcace8a146f23b2af000000000000000000000000000000000000000000000000000000000000001cebdb65ebfd20803c364d393e4df95a3631d906d3ebeb7fae31bc5bdbf9297e6c5d4e7a93d40278c1c3ddd4659c58a0eeb01fa41a3ca78fdb184b4bf7b2e34af1",
-        "0xff2726d26e39daf03ae70b7f4cce693329e3a027"
-      },
-      {
-        "0x23fa3e10e5b041840a8bd9055e9f6aca4c9764b6b21658bd6f126e6cf821e963000000000000000000000000000000000000000000000000000000000000001c19552a6e36c2c2c8fa97534c8e0a0575420364acd73f9399a6a375cb6ab8685d619a8afcdc09d88344dce929d90eed48f9caef102acb28c632340386d168cd14",
-        "0x6c36670046a1f02fe217d95c5e78f5c84efd703e"
-      },
-      {
-        "0xe4e5120a2c41c1beac3a04fe7895fb93db7e53e33a4f279cf196ac8d12e4eccc000000000000000000000000000000000000000000000000000000000000001bc113be6e205a4851f4aa56b499aee3fe75389382fb7b4da2eb894537addf20980dac9e071a562749cce0ea9da2f4cac450509ec03ebcf23898c52b3375c29169",
-        "0x52d2883c39100d09a6b8d793e0f693fd7f2bac51"
-      },
-      {
-        "0x7b4ba1f9fd096f738c26df77a1a87a87153d5eb253a4622cc41ca1e57f678370000000000000000000000000000000000000000000000000000000000000001bbdb9a84a3eaea6f3a16bb084387c1dd1bf91c0be1300cc99ece1cf8d239d7e0d37f24155f143635a761427684207ffabfa00dda09d502056768a4e57e0f336c5",
-        "0xc65a2a9ef32f747865a119d1c044ad836a8f6d73"
-      },
-      {
-        "0x4c16d10f1bfbaa34814a39d017cdcc18590d08a52ee01be38b43742cf0f76ee9000000000000000000000000000000000000000000000000000000000000001c75d276f5646653753fdcec2ab92d27e58a59c614aab6cc3568834a4ef36819bd54bcaf3c605ed948a20e56cfe58c1595d727877b0bfa9b9b6553879ba0e08a2b",
-        "0x5cfe5b8bf54dee364ef6f411aac9bbb6eb051202"
-      },
-      {
-        "0x8e4ae0eb9cb54e2378b3d161eeedc36654269cd1bef02d68751cc1b0021b709f000000000000000000000000000000000000000000000000000000000000001c01f53df1ac64d831f7cb45bcf9037052162900e3d7fb4d62934112a8c4b257d50c0c36cc064d72ba8a3ba57b1d2eee88b0628907dfe2cf0088dbf69d89c2f1c7",
-        "0xf34405682c4deb55da399822373b632cf5ca25c0"
-      },
-      {
-        "0xb755e67b6ba34376ac93bc8f81b072df191aed5c5e1bc7131cf1556731fad13e000000000000000000000000000000000000000000000000000000000000001b61b542768763d72e298e93cf8635ac430c2155835c079eb508e47d0cff5fb1fa62fb0cf03fd42a35bd6ade27fd10ba4e22975a61c259e1e71664892cb9f89f6c",
-        "0x617c0e2ac02fd3e876fd5bd8581e73937df53c5d"
-      },
-      {
-        "0x361a00e41d8e97cb935320dad3ba8b071f198e4c2424a2dbe110ab59a9a74511000000000000000000000000000000000000000000000000000000000000001c703cb0a9ee3a332e5b53664ee0495a757fbf1c168971a618f0010a894e8f00152d0fd7a61bbcfde075675e868593ff695298cb1dd7640ebdccd2864bd4f5fd71",
-        "0x2b43183e036afb83fed9ad70f1bfadda5497dbba"
-      },
-      {
-        "0xff94a2c7dbfbb566784a5d0df05c461f050dbc826f622940ca96ea949f9e1a87000000000000000000000000000000000000000000000000000000000000001b66489a58f64e058f150ffdb7e22a0993f4299073fc2b0840b082850138990fb54fcaca68705d1108a555ed4733a959c8e302510098c80b5e3c9353b1a86a64de",
-        "0x81b6898913b2d49aec6e0bbcc8c192cff4d0eed8"
-      },
-      {
-        "0xf655a5caf4dba704f63f5e17e5a94535ea7d277f2b8f4d69951291319f5c2c1b000000000000000000000000000000000000000000000000000000000000001b66987335ff22966a6084e88a4dbdc96f2cfb126aba2f6a477c18bf0fb3c42f2a5f1ef94acf1184da542f3f7271032a931bfcf3afeb3a9dafca95d5aff68bdee5",
-        "0xb48bc9d6546fb5156954699062774443a7676986"
-      },
-      {
-        "0x19e7a1205c185da64a45bb5e04f35c54cd092b70bb1a1527f8372f1ae67b4bb7000000000000000000000000000000000000000000000000000000000000001becde2323e521681126ea23af56953a18166158919d3fa445e93fcf957f60185a4738fce3d006827c432e5f6c1b8d7e3450fb434172b6ab4d619fe49a09ed4b68",
-        "0x13cb19ae4e86177abfcc9d44139dcebb993ebdc1"
-      },
-      {
-        "0x42d1878efb373fb18df168ce9687fae3cf8c1afa3063fb15b44f309adae25894000000000000000000000000000000000000000000000000000000000000001b15439bd45f426bdab38723290e9691371196e2105bee21c9dc36f77b3797fb6849f66ca42c6a4d5dde4b2996f68082c930fa6466e16077b074a63551d0a36bd4",
-        "0x6d78fd01abb065be75ffeef89a9df8f87926daf1"
-      },
-      {
-        "0x91f5c73a9e6b54b896940478ac0995d6d757feb38790cfeeaa0ca0c4c0c72db7000000000000000000000000000000000000000000000000000000000000001b5d26a45936c8b69117451625649c356a7a40627635f60e038313afd5a9e8082323aa5968522ea56d32beff94e628e36ebc0ceb68cf89f7141175b3dca19e2446",
-        "0xd213383f34edd2a9d6e89dc6ed2bdedb2b875a3f"
-      },
-      {
-        "0x654643af5d8045129adcbd4e2fe3a0270eae3072765e952ae1a8d239905f1848000000000000000000000000000000000000000000000000000000000000001cb3fdc5124a4193b35ba4eee7a3a764ea3ef14b0bacc61ce0a32e52258c64a31b2f66dc6529567230fc420f48e650a589146a409b85cb7b7d1d25cd7782198873",
-        "0x0bcfc1ef1f89de5d6bcd354d797faf3047ace632"
-      },
-      {
-        "0xa3dcb3d6e954a0da9e57fef6322a489935535fb892eb60fc2aee0153207441f2000000000000000000000000000000000000000000000000000000000000001c58d31b5c643c2e2376e5420c250ab85ac58a730523449998d08c55ce7ef1a8871777e9f81e84fa66f656615e414b7f89e5800d429f618cf2fe88aa67631db651",
-        "0xe2faafdf582764fa4b65004ef676466552f4bfe3"
-      },
-      {
-        "0x98eec766a1da31be4aa5b56a3c1d388610a4a37f7b8ef17011c78c135c999783000000000000000000000000000000000000000000000000000000000000001c30a0d88c1733418d1248ffecf0b3585abde3999aa4c4b4496dce559a6a9cc1c81c1de713d501fef22da4bfd4afa7bbb65d0b2217ac03dbc3bc3c75156593a8f9",
-        "0xa32c72d11ac3723ad0129c6f395c7d118db9e5db"
-      },
-      {
-        "0xd646626db60c8f37f0d67df1f7795860dc97f70fb26e85b7dd67fdd8865d70a1000000000000000000000000000000000000000000000000000000000000001c3f4c0a2e4c038aac868040990b4334a6c007e8394837ef2b467ac417075b502e2b67b91a1a52df65501d16645b7835849f70aa50a72d25ab9baeda90528003f4",
-        "0x75cc7deb0bea00df88dc37a6a69038489b7a00da"
-      },
-      {
-        "0x4a3842955bc493c1478b8e5d091f5ea38b6e1fbfe29e2a76af6b642829a674d5000000000000000000000000000000000000000000000000000000000000001b9fdc9d14a459294ecdf918920dbc4f5bf957425563fcd2fcda6db19ef1ae37a144ec3663dbec38c0acb40623552b4062981c635842434e5529a6961eb468a815",
-        "0x8b38952f5858f58d8b448da2bfc7cd5f203d9874"
-      },
-      {
-        "0x1fa23790ba1f754c40131e8ebd40ad95e8c3f9ed32308395907bd9b6f451286d000000000000000000000000000000000000000000000000000000000000001cb9eb00b69db8a908c0fb24cf9a54fecd06b568efac82ffa38df3c0a088825f6002e574107158e2a83da1227343a536966fd4e92b298e473893ccbaf20ca3b479",
-        "0x01e86c2dc7888aaf69c067c3d81d3324b221ac4e"
-      },
-      {
-        "0x88f8b41d758a53d0065691f5c771b999c241508a26b6d49b0698f99675602372000000000000000000000000000000000000000000000000000000000000001b5f97bee8c1a2660617aa6d00b48cae9dc866e7dd92471a18e34f863841e4e7954a20c134006aa0a19fa7d1eecbdd3a7213029fc1b173157d2354a62e6add5a0a",
-        "0xd7f38f4cdbf5cde5a68111970cb377003f971dd6"
-      },
-      {
-        "0x85bced90e31303e32e094be2d0210d8ae7f4ff29a793bd3e5959fc86a79b2738000000000000000000000000000000000000000000000000000000000000001b04efc53658e9a47738a7078783dd6ef305b9912443fb6008451026e80a38a8f64d0abf58ef63bdf5ed576c6f0e99bdd3dc7f73f17549303222b144868bf17b58",
-        "0xb72b25e2dc98013d1e429180a95ce8d763b92ad3"
-      },
-      {
-        "0xb0df0e432f097fc53dfb8d14165a63a24313cff79254a7cbe554ab7eebd43bc6000000000000000000000000000000000000000000000000000000000000001bee9e7ad060f9c969b7d289c5006eb9b03cebb508af9e5647228d48030d1bf2c87d0d66c0cefaef9eb15617a891963d51bb1e19bc7cb33544e919c94bd2235ea6",
-        "0x270433b68a15b4979186f44c3594041e8f6fae80"
-      },
-      {
-        "0x70d6236cd7c57cb44dd1f99e20e785668b6cdead0b007458d0ed4e9655d7f990000000000000000000000000000000000000000000000000000000000000001bb262ec123fde934f67facf354ca12eb19b6b453a8bcd7beeb0566743fe4ed78607baec6194afcc4f66cb3c42518f0eda63e5f94df9121242e4e128133ede0024",
-        "0xa6182f0f4ceb72de969d20684f71660c2cd2ada0"
-      },
-      {
-        "0xabcbaaca73cafb7fbf215909dd5750ec1ded7a3e151ff830df92590fad8cbf30000000000000000000000000000000000000000000000000000000000000001c0168786a30ab53bff4fac2f46c7f2cad22e96c0e80be8c6f96f1bf987b134c726caf9c6b4fafb3689506f8ed360cb61be6529c4de87e1d9bf553f7f3734beb6a",
-        "0xecd91ebd69948e971744c52ceff54b5681c6d419"
-      },
-      {
-        "0x4e166b5f7df865f51522a4ccc9616a4d8c9b83df29dbde6dc96dc94a13e4a7e4000000000000000000000000000000000000000000000000000000000000001ba43b80dd0721a715082425bf9252322c4b61671102e860b7371871abe5bd6a5e5c8abaf399cb7e6f39405a0583031f73b40ef41963b3827f3d20d5103ccd3517",
-        "0x8cd8416864cc82c1061c00a2571e2b6ef1bc8f9f"
-      },
-      {
-        "0x515ac051195596523c6664ac8d8e48345ea5932cda58d22ac49339dc234127e1000000000000000000000000000000000000000000000000000000000000001ba780c9c0aea4501f09cf5a75d133e9c89386ffea400719dc82d9586975cfb6ab41adfa6195e155b7a2a7f598c32a754010d5ce98e967a2f812f77050e72d67cd",
-        "0xa91aefd1bddca65485567c7014ebf4b48917e3de"
-      },
-      {
-        "0x3c5ad848eecf1a48d12f17ee1ef6a4ee45f3c1ae7cb5b843fbf70d0f9b7b4a13000000000000000000000000000000000000000000000000000000000000001c50cad8bc91ef3924d32ce6194c79a6104686de2e2f0e67c3353262489aa7f6451532f54f6b99e8f4ce54377a86a515088bfe440eebec374402122c69fb691f5f",
-        "0xd5be345de0dd0d15d34899173b7c375d31140f24"
-      },
-      {
-        "0xfcde24b61bbd3ece34d2f7d99751e57e0d840cbcbd58fa1777a5e6be8f74bcd6000000000000000000000000000000000000000000000000000000000000001b378491f640df70d59dfba12f7135fec6e7b0ecd67bd07a29e3644f85071438ae0a737efc36831bd13576d2c517b2b4694181ee687f40732d428cc5478a8fa7f5",
-        "0xfe4701547b7dbaba4c0702f226dc48a2663e18bc"
-      },
-      {
-        "0x83326209a1fc9e7f4e111a20ed12e2ce6d0639e8eeeb75fe403a9bb180288a47000000000000000000000000000000000000000000000000000000000000001cad837bf4ac65dc6741fd911ecc41ce1d137e135540bd1035a06cc732d23b3fe243b3d70317177dd578027952eeb6e701280beb3685cb44a9cbc6685cd3149aa7",
-        "0x66036bc0f0fdcfbf8d814da7f3f16885132a43ec"
-      },
-      {
-        "0x4ab6fb0952a3e801814a72bdeb8630aeb9edce54f0b08c8284bc7efa0d737ff0000000000000000000000000000000000000000000000000000000000000001cc8fc37b1724ce16d169b4856fe2113ff305290859070a3cb5cfbb93f90a248e3382c9ca18fa7f926e914cf781999c2c8de6ea1fa4e8536030699005b45efce86",
-        "0xa4e7416ef65b74c3b61a1eee53a33eb1d2b51a63"
-      },
-      {
-        "0x80d7c38d08128721cb1d6b78f26b2f53b7bdcb2448a6d87668f4fe4e19cf5dcb000000000000000000000000000000000000000000000000000000000000001be5dc7cddccc9c61eac363691c6305420bc393a4ca17f1e10bc5192ff63b5d03f02536812a3fd90cc50208fc3b886efca921c520b4a66ef00d3228cf02fbad675",
-        "0xabb83304268fec4160d80e3e45d1376c0b458636"
-      },
-      {
-        "0x1e4c87808973dd4b705d20186d4daf911f7002006aeca1ae1a476ec23a3eb67b000000000000000000000000000000000000000000000000000000000000001b942c0416506f34ae4a5aff5bde5fbe4e093f4fca798e4d8be460a84c5cbe8a1a0fdc6113fa280b9c4e736147ccd5bf8d383353556692f27405e77344b7c9b253",
-        "0x78bbe6f432b755a9bc0bf9798ea82e2574d01930"
-      },
-      {
-        "0x5a174e433de66595c112432074d5d6fd07239edb8f3e1bc6b78814d4ce41cf22000000000000000000000000000000000000000000000000000000000000001c964fc2baba65aef4a47358132fd87ac92dbdf08e7fab49605293e43f47a76fac320d603d6e841fea09a4dd7b7bddb8b9c6bbb30b81893ee655bb8a16e3939d51",
-        "0xd309698bda9fbc6ba8f56ec71cd0fe50374ab147"
-      },
-      {
-        "0x390fe5599dcc23aabd594ae17f08b27a3f686f5a12d3ebd2624811738976e21a000000000000000000000000000000000000000000000000000000000000001c4d32732c7278ba4060cd00c4bbef14189604470147910f6f254cfe04bff7638346a2c66f0acc61b8a612d05ceddda4f2dd9ce79a7f36597bc74797d3d28d6cc7",
-        "0xf658c09eaa7cdf744e34b676a92de4cdbef19306"
-      },
-      {
-        "0xe0a1f6a2b34ed7cabe5829e4a0fb68989c8b520cb69376f4e6b754181cd02c4a000000000000000000000000000000000000000000000000000000000000001bcb22c52a26b97580036849796289293ff7e7016c13e948d99f2dfb5176d7ec01441aad675e9119fb30019f6c73adcdc4bcecb077c9164026230b5bf71cbbcbb2",
-        "0x4566e04fe531b85ad7103ac1d234e36fcc4c80c7"
-      },
-      {
-        "0x925023d3dde43d2691bacaa0202dad390a73acd5c67dbc3b73c8667696103cb2000000000000000000000000000000000000000000000000000000000000001c61cb8f8271a58b25ac3fe24e2b1a91b613a5e0da5fea8a27c4c4f38c46c7d74901be5ad35bbf74b5f23bcd03f5cb06dca74054738411e86fad9d985ee43d6003",
-        "0xe22dc594d5a836902a398fef392e4acae4eb64d8"
-      },
-      {
-        "0x809e822931959c627d36bf34ebc22415614f20c1b98839665187154233ab35c6000000000000000000000000000000000000000000000000000000000000001baa4df42f677f348f44151cfd059b3fc0e43468301acc0e32c68fe1175428308129eb46f79704e3169f336f7a269a026f43a316b7318198b9880fe25c069c4628",
-        "0x6825015903052024e1c39b5ec4686d8f17650623"
-      },
-      {
-        "0x3e84e7a38dd4802b3469a55ffeba8e3b09cd6f2d50c446b217ca943ed09c7143000000000000000000000000000000000000000000000000000000000000001bd10fcd30c21a2f7eae829e5445a7e8ac1f4d64ebb5e007c087b64e369e502a25101bbc6e6e3c2b8a0a7b0cc936be004570de3c58e6dcfa460507861aac2d7675",
-        "0xc19cb83c80aca377fe7d32114f0391c64fe5a043"
-      },
-      {
-        "0x4c6dcfab6ae4a6f8b9f812d361d7064ca6802a6d391a5e936c7e80b53723f172000000000000000000000000000000000000000000000000000000000000001ce680d9f9b0fbb6a7edba040c9e03415530b7d954910790ecda3892ab881a7a8a2ffa92fcb1824d6098f4ab4704630fac4f0f34dcc36795af6984f9302551fcfd",
-        "0x5f8e0630b06762a24670bd407f79bceee4ec0841"
-      },
-      {
-        "0x0c77a6a08a98cc812e7a5275421336d78cd6063747a3fa90385391df9f17d32f000000000000000000000000000000000000000000000000000000000000001bfa375b6bd93d3a73787ded81e2d470f511db2e127f950d63308d23a34d2eafc5594a8c4cb868f796a37b2a1c55eaea2d9fe6aa77d41c9f9b01a0ce240d605c1c",
-        "0x4caad3e55d7c8e67c3a9c0397d743b8cf207ce2f"
-      },
-      {
-        "0x131d7ad7d9ef2b50c379b4cc5d84df851d652d6012cbc612e600a7f99455b241000000000000000000000000000000000000000000000000000000000000001c90e090540445c5533d4391e7bf4e5b11d6985105bdb7944abdcee09753a4b3e0697d19c3b03c7433672132d175a991111be1ecae5ea0d236eb751355e628beeb",
-        "0x763f039273833269c26cfd79fe4713da5d74a45b"
-      },
-      {
-        "0x8370b9d2e6dd2d7ab1a0adf391a4f8380229de45fb017f812091b4226d7ebefc000000000000000000000000000000000000000000000000000000000000001ca7184b28a17f1fcb25953de968f5bf5c4b67ca115155f00cb4ee7c7a838d82cd44b55aa67acfd3fc8939b607eec5fe256f8098ab65db1c3db04c0efffff4c34c",
-        "0x014f31c9e429c69c270f4ccff594508abd520420"
-      },
-      {
-        "0xc9d7002487ee5026fadffeed13893e827378acfca9171b89817c53dee584d289000000000000000000000000000000000000000000000000000000000000001bb5a3c506e8c38cd916bf20c237906befc29ae91d5474700c66ed47263222a487116fc65be6ad78140feb2df974d4568cc5aade5bf78ce14ec0df274b0983aafa",
-        "0x6bafa3e7d355788ade4f5c3ce4ab865a490118da"
-      },
-      {
-        "0x8dac2bb0d2e8ba5923577b2b12a0b9eb6b1af5c35ac6ec381ecf8ace2de84172000000000000000000000000000000000000000000000000000000000000001c549c2c7d6f644a5a9df73dfb88cbf1902fb6ad2ce7de27b18560f58d11c1de6658ba07f35e5676c33e71c6fbabfa30c7654f997394a8c713f7eedd2da78b25d1",
-        "0xc7d1544579c6a0002966ca562923c5cfcb5e21d0"
-      },
-      {
-        "0xfd7bdacc8bf6f0901fbb76d18dd3a9580b88cbbe8c5c667feb497ab2ec1aaf60000000000000000000000000000000000000000000000000000000000000001b01fb675ce7c18d34abf4d21993a36bd3b213fbd29f5077d178a84f6f5dbf7c4422f1d63423dc3bb682eed2f3c96c9ecbde516f1e26364556ad9950e431217240",
-        "0xf18c3dbf2aca83afc71b520e8ac3d4d016fa9ec1"
-      },
-      {
-        "0xe24beed8117992ce468610a4c7ea3b8bbce67831d5459993ad80ef75ff74399f000000000000000000000000000000000000000000000000000000000000001c65d5763121e91655fa84d7ae74b422d61db272cc6584622673e9993af10f5d7f5181a54f089809da91d008fca5fb6d7af9bb41d064b839f7643881a70c124bae",
-        "0x22a09a6e7578d42f9af290f6417d2bc04ce3380f"
-      },
-      {
-        "0xd0490e2210e00722e024000245b28c5cb699c1597881a6e0dff13adfd7f00b7b000000000000000000000000000000000000000000000000000000000000001bc95aa8a187ed486f3f4a2c4fbc58b4f1e8fac5f6aad373ebce0d5e91d8e8bea67008db4c559da979b5b07a60890fd4cbe8db164d0102e395de7ea27aa5224fab",
-        "0x0431be799b7f179e4431ae1cb629c17edabdf917"
-      },
-      {
-        "0x96a49e2d7833c3dee1b5ba8da56088b3fc900ba28b80e1120341796271bbc8c7000000000000000000000000000000000000000000000000000000000000001b488f5bf61a104009d5b1c2102454199afb712742c4d563ce3dc6a1aaf5e177d7605652e31020e876ce65c1fd3f75ddbb163cb636065639b1f03e7b90c256e2f9",
-        "0x1ef26cd19e0b83e4f56c88b68293c1cd9444c684"
-      },
-      {
-        "0x5f764e0f288b12167977651452f233de59ed6163eb6b17796195c96c603e4313000000000000000000000000000000000000000000000000000000000000001b5bb97625154686b77f4c3480fa06e314798503d157c5db85a15218f076d19239052a96f028d44331020106277591db48c0b07e7c501c181a842ccdd20b3089a6",
-        "0xe04d0368b19ef078d6040abc1eac64869a510e8d"
-      },
-      {
-        "0x5d811d11af03c52f95907d5f8fe1cf9ca6d25e44031588a08673ee39fc720c29000000000000000000000000000000000000000000000000000000000000001c963a39edda9392c83b390b7540b6b901bf1bf0f678c59603c0b8ec02f41633945ce49973a3e15591eebe3ff1b677696c1609509e547ba84ad711e13aa229c5e3",
-        "0x730594bd0a7389acc19aad47741533abd0f19e81"
-      },
-      {
-        "0xed6b74c00def739b829b1d11f44190c075804414bcf78c30b6ea781d5f842b5d000000000000000000000000000000000000000000000000000000000000001c115e46eac1f6abaa48f4ed42713e8a10eb748d638331e83ab1f5b1aa672c3faa7f5892be39cfa345c785a369dd147d5c8bd79e37d4fc392782495231d52752aa",
-        "0x150e6c28a10d4b01ef1c5c733a2e5831fd75f684"
-      },
-      {
-        "0xbc80fc2f142d3c139a6bdddccfb8d793be4bfff086904e4016ef5fdf4f552186000000000000000000000000000000000000000000000000000000000000001b8b5fc96d3cd453c51bf480ca1f564c6a88e3310bd938993acd6f4d2e1fa30857640660bb208f15a9cbc3bb2c1de892dea23628040c84cd48bf035cf1440e6ff2",
-        "0xffb0f15492e9bb8dc8a8b3caf74cf30fbff51add"
-      },
-      {
-        "0xd14c00d0637bd1f80b8a29695375c4c4fbc25abeb0215190b937ac5d77138389000000000000000000000000000000000000000000000000000000000000001ceb7236075f80b65a43318e377fce6b4403a9fdf37e9d5e4563942625cba9603a67e8aae700ac3a877381cdcc71ddda0fbbf16a807e9f89ada558fef5b89c5eb5",
-        "0x5cba0a3e82a42466cbdd0cef06165f3936be541f"
-      },
-      {
-        "0x964f1ec157e2214d09985d8d96997cedf59d6c75c1e01f9b6038d841f9a02f41000000000000000000000000000000000000000000000000000000000000001b61154b748a60ab1171413ad6d8cf8bf3d21c5c8da5c5025385565cc685519ff45358e7cb911a227fc36ce4d14bb11144735e90ad80d074f59b453bf2d8273b6e",
-        "0xfc7eaab26c1dfbb2a112d34794e0ec67ce76d471"
-      },
-      {
-        "0xd98b755dd654a52b968830f43c01f7b312c87b210c614bb13b27f3a1c3be430a000000000000000000000000000000000000000000000000000000000000001b8d0eb91bf9a3e3c7dd67e1703acf6f7d558e8e4407b30bc8db31b8b3c29ef907188c479e1285d9d5e74ca4e863114e70de6cd66f381e0adb1b387829aca1191d",
-        "0xe157b225a52436ac28043a4940a300bca589d0d9"
-      },
-      {
-        "0xae7c9444d3777ab5966ce98a996cc590bd0560e5b7b4cf7c603c294e5f83ef64000000000000000000000000000000000000000000000000000000000000001b4462a10e115f9beb9a1ae7e1f9bc135ba18c3cb47d4562b63f34a2ffc3f0e104454e9de9b8f86ef018f185f6131cea90967c13377be39162fd70326cba74e088",
-        "0x726871df1a80253abcdc39b8efbb019485f0aa92"
-      },
-      {
-        "0x59d4a98ff7238c392d366f4e1b59c0e0f062b8069d6aa7217d4271e6e06ea1b7000000000000000000000000000000000000000000000000000000000000001c180b92c72691caa41d149d3c8c4b02d8e637d447fbf702f80353e1c89aade51b27d59ae0d0bad8148134e17744de8a1ed126a381b2ba0039336b815b093e8178",
-        "0xb70a82e0b8d80c113f31797bef325f9894e33d53"
-      },
-      {
-        "0x1d651cc72be8cafc2f831a5030188dc23bce6648be7045ff9eb3dad7f0d0458b000000000000000000000000000000000000000000000000000000000000001c15b9fcdba84fb454a47cbf830705a7fbb03bb8547cde5695338bab38213048505363b8bf99f730d497983ab0eb3986f9bb7750a98e2db08fc24f8e094c23f8e1",
-        "0x6f8763efc3d08828982d41e37a9be12d795d81db"
-      },
-      {
-        "0xeb3558fc388e8d245f892684fe0bd166bf5e1ec061f778436c36f7ba27fb5e88000000000000000000000000000000000000000000000000000000000000001cda01d3af46bfeb57e495ff722d0612132b66a3e2f7358e2d6a210ffa36a91c4671a5a1eeeb5f03f9b97fbd4076266a3aec7c2c64c13cf533298ea440e54aac04",
-        "0x85f54483bb76aaf73fa1ee8313de109f309aaf33"
-      },
-      {
-        "0x85543dcd0a1c590cfe63cc1c6e732a124b2138d4ebc7aa257ce4ff5ab7838a67000000000000000000000000000000000000000000000000000000000000001b737c920964ae5e15f3be8548774dd965f5b5af522f3e811cad247bda80c13e753bc58cb3f973fb67b3856a3a6f5aca1847ed06711ed722f11f8124c025adac1e",
-        "0xf1383ccac546c49072c73fb3a0a4da4ca54d4b30"
-      },
-      {
-        "0x334ea2be8566052b9c0f52fac3005b8fa96950dc17a2998f4ccc8a68b6f483a9000000000000000000000000000000000000000000000000000000000000001b5bb08f9a15c2deb532774b0e29d9782f7be619f57d15467d4282148eacf114d943c430c811c5979351ce3e77d1843e7677a1eeca350e3952958323ee5c5406e8",
-        "0xeaef2c85d19516bb3434a8bc364ecd270fba994c"
-      },
-      {
-        "0x9797b28b78d1a41f655e4670e797c4b4054b7aefa4c0b7cfabecfdedba772ab5000000000000000000000000000000000000000000000000000000000000001b8c69b0dc1f4fa557d658d9f2a2ae2a87abba4dc30a918c2249cc0df2cd520aed3f5012f755ad6320af14746a7531a70503200e5818a243e7d9d7389dcd47db08",
-        "0x7a3177965811818903f69d2202464de03d43b6c7"
-      },
-      {
-        "0x185faa83fbab6980289744d05f6fbac7a9eea9078ed82af38b2f542922a57355000000000000000000000000000000000000000000000000000000000000001b345a728c2c87c11adc137d19d1c7a3acc2195b7591fb7449b3fd9ef476b32a005df1738096a09ec334cbbc43bfbc42be19777d6583f82ea499f59f8ac652a879",
-        "0xc07d2a4f05c1617f3314e29e3dd98c083b9cc55c"
-      },
-      {
-        "0xc281aefd2405635d3229c7bd155abf3ae22abd2a6b60b9f6358aa3b349fe76de000000000000000000000000000000000000000000000000000000000000001b5bc6959194476096e223df55cefc3ca991e5886fe80751a5ad40b1ad9999d6045426b00332eceed4152c733e8dbeb04987718a458e4369bfc6c30e538a95641f",
-        "0x6722fa2ba638738b50b9cb45f4f7722ff8264b62"
-      },
-      {
-        "0x53fdbd4b17fa328ed653476b7ce5beaa9f6b99affe3e64cf6fd99dc440379878000000000000000000000000000000000000000000000000000000000000001b0960d87cebc136087ed15f005349b20dcef74ea4f234d1ce9e10fb9e5fb0e4ee28d0755d8a6c66eb49eddb6b3ea8061a4265b83052d5e4ef9c7b6a3cccbd0441",
-        "0x2c3bc458c2aa4e62ba5c4300cfcbc344da9ee93e"
-      },
-      {
-        "0x6edc1c049d2a86ca8fe892bf24a48dd3c5b630b03adb2a3b2855c1f7935264b9000000000000000000000000000000000000000000000000000000000000001b9a2f685a2089728baaf03c379703097d412504fd3399c2f79a18e1d13c07ee945c5da9bc00581bf2b1977dd5809683ec4e06a9a4a7a32561ec7aabbd54b04dbc",
-        "0xff6e669dee405c6dc021a7e1ba2f5feb96c97adf"
-      },
-      {
-        "0x65f6ec58597df636a59d070d48b29db68fc229801db026a4dce11e59ca6d23b1000000000000000000000000000000000000000000000000000000000000001b5bee25353248c9d12df421c3db9eb3141918e2a69f766d7f11edc1ba66852d205ca06336f49919bb3f45e81a463d96b0dd5071bf7edb7663e20e3fbc505e232c",
-        "0xba0093215db426d68708d1e95156ef0aaf90b588"
-      },
-      {
-        "0x3546335f92dbc0883248693660061db1cb8283d2dd1969f0260915983d7ce30b000000000000000000000000000000000000000000000000000000000000001c27b51e23abfab6a82bf3bf83c23b222a01ecfdadda3587b58d965eebfab7dc5a7b3006e95e02b19c2fdfcb85794bad59cd2708b43cf658e4696b292c95cb6fc8",
-        "0x130dc34dc7b806a3e7aa2a2b2db8cd9dec66fd89"
-      },
-      {
-        "0x237d94f90f917d6eaf1987353f5907950ed6c8136112f029494e0f769ccddbcf000000000000000000000000000000000000000000000000000000000000001b14919b0374173a158b04213c718d74573c438891cca416f9e198704d56320daf7ab172688fdf770b1553fd7ec4e27a9bb57a84374562734904b8ade0f31fdb41",
-        "0xd50240c7d2ae4a7c30ebd3948460581f72385732"
-      },
-      {
-        "0xf2c26852616ca8ca4fbefad89111e5326f2c78158e609488461ab8fe3bc6573c000000000000000000000000000000000000000000000000000000000000001c0ed26622b205d658331ccea6286cf5d623687047e61b81c7cccae5181eb1c4b827312bb9af5c55c23f75cc72b20ff10a301ac3023f5823757c0fc9c4b9f827a2",
-        "0x674fadf0fcf26febc6a21a70d27dbf2219d374dd"
-      },
-      {
-        "0xd238468a4cf3eb5939950c0dfd1ed56f13f61784ea1dcc4ec472470370f8e4fd000000000000000000000000000000000000000000000000000000000000001b059cc3c246d17f6b044b3b15ee1f3bffc59865701703c2b6e9a9e282d65e3771788c55359b3f9879245ede61f801a4bcaa18bd6a90216b952e06815a407bc7ef",
-        "0x8e76a1cd7db91aff5c8ed95f17148f9a8d4c81f6"
-      },
-      {
-        "0x5dafec9564fbff6371b45399a361407b8e0f11ae8b62b784e121974957db9ef9000000000000000000000000000000000000000000000000000000000000001c2a71af5be39a199bb3b668994f28be40de1c0f5d59fa7b193cb72d4d357073f42e21a423a8b3bc8443ec9a05af6f2bf709f23c98c2c6c3a4d728873000d0b3c3",
-        "0xeb10e6f82e42a18ad05f623ed291f7bba26c1166"
-      },
-      {
-        "0x8eef9ad23caf2ddfb868faa610cee0de186722d20c8d8bd15d8258fd278f4b81000000000000000000000000000000000000000000000000000000000000001b890ae7c25d8c93d9b232d664f46357bfc21b529b427d9f3c84fe1e24cb5eabe515146ea64479f18acfebad6f556437d826833650fab32f940f5eeeeff0865aea",
-        "0x6ed176182fdb30cc2d9f553179603ba45fadbc4f"
-      },
-      {
-        "0x7e38048ef47052bc73329abe12d51de302b690ec6e5c612a6dc545a16e578bdc000000000000000000000000000000000000000000000000000000000000001c1879fbfaeec45b117adfd62abc9fdc3ad575f1d7f09b388f02a2ad5ec37287504761f9cee67e6b6d75c6b53ddc966939df3f5f605083e8c93c06a64812b08ab7",
-        "0x45505cf5182b9bfaee12c1b5b3e3d09377567b5c"
-      },
-      {
-        "0x9981e530d595012980ad4f1cd860f6d524a2f34f6aa132932796cd4be96d6e5d000000000000000000000000000000000000000000000000000000000000001ce08be9670177846e05696271da3960eb617869935456a14f634c3f604543dff36f1b05d985d111ae7cdaf679f75e9151030e09f0c8148c6ce3e02c1847415002",
-        "0xcb69ddd0bf6c51348567444a93d8a3f9d995f363"
-      },
-      {
-        "0xcb7f1bf45f76e3dca564764290cbdaa64a7622fac589799a70199845682566b2000000000000000000000000000000000000000000000000000000000000001be6c9c8dc4b408518b89e5a048d36ad1426b3ace96b8518a5a9e88f286103758e0cd9a5ddac0f848eefb204dd403bffb063a718c8e1fca4c4ec94155269370b77",
-        "0xc97af81301f96ad50d9b7c64e322ef1527702278"
-      },
-      {
-        "0x21e69437899f6a37302b239fc0261c7ffabb970e8a48096475e998d2871f5bd2000000000000000000000000000000000000000000000000000000000000001b89501dd1567e56253ba097ffc663718fac90818e56ca6b393b69e9925162ce5a7262088cff050243662adfb2aac50143bf5aff60f904f2279d6f6cce5adbebdb",
-        "0xf00f8df597663bf073bcbf43f75d0e5b6caae7cb"
-      },
-      {
-        "0xf524d92f0d374b4d104786fb521265f6034cb6e2e6370d9d83464aaf8c87b0a6000000000000000000000000000000000000000000000000000000000000001b94332385b44da4cb31cc83c8d1caa85c99a85b58a812f9d3b8ab62e32c9dfc7e17f2b4d58e52bccb42bc069e8e6445a87deed25e094fe1cdce663623493c21c8",
-        "0x532f5d1695f4305a7193eecf7f17c4ae7fbd5c1c"
-      },
-      {
-        "0x739c5a643ca04c7bf21ea78cc89270a2d66662f1441879f6f0246a3b71416996000000000000000000000000000000000000000000000000000000000000001ba6f422a6fec65ac04fe923c8e7e92cd65a26b914f06124276dfdfb7ad396eb9b7613f03ab9c71d48af2c93d430a805cb9600991d92e76b504b63d55d7dd187a3",
-        "0x0b67296d0486d16d83f4f3ddb8e07a0a57c36631"
-      },
-      {
-        "0x33693f2a0c99ea981b5b11acd2c6bfbd58e43170c5a31f79b5a8eb3321858e71000000000000000000000000000000000000000000000000000000000000001b5b33ddf363736a3abd5a356eb610d2f9fd09ef6125fdcd4ff4c7775b39e87349225b33e5afebde52fe30eb987d72318e9cf095d892e7fbdcd9e5892786f49d1c",
-        "0xe5c7698dc89c75475d5d067e124696b81a0d53f5"
-      },
-      {
-        "0xdb9ffb31945e1cbe86910f30bf7129e276f0ed9d7cd623f7b74a245324ce9c82000000000000000000000000000000000000000000000000000000000000001c8b9f853439623cc3af1f15ba21c639bfb3d8ba8302fa9d1603587a537b32fcd1308adf297dde649d208fc0b323f3c36e9404ba6dc8a74510d4082c867fbe1205",
-        "0x988cfd3652a9bacc3debc441f02a8bac7913e048"
-      },
-      {
-        "0x3930cff06ebe66193b61bd2d099c001a4f1c8597276b6324ced78b401746ed82000000000000000000000000000000000000000000000000000000000000001be2f6e9aa05b5af82987c65c31c131c152e4fa58f6b52a140519b11654c3cc8970472559ab09821cfb51b6d0c96ca9e5421f78f98af0d4aa601c49a6ceb9d4a78",
-        "0xfcbbfb74050fee34c54f3b18a50d61a679f5f320"
-      },
-      {
-        "0xadf263dddf4ad5f323822773b76e64abc06230aec4bde5d8b7be5ea1193f2b6d000000000000000000000000000000000000000000000000000000000000001c8caf0f4834f493ade134f733cd97752b4b1f0a5c8ffee47b6ec05f46857557bf20de09970e1c57404cf7ca7efbcaa95c47d99a2eba76aa72bd1b44bb0486e368",
-        "0xe21d622e34869e656a1e28f278a6b8226082d153"
-      },
-      {
-        "0x9b3ef1d284641e6c3be8dddfcf29844b393729155edb1d146dd6023dd336dc46000000000000000000000000000000000000000000000000000000000000001ba08e0795bbf5850b36b4326bb104aa14a49d44eb18e31b034b1694c5bbbcfd9732580cd88ea1277b202c6d3a575e45fbb6b2e0a489b74343035bdeef5c32863a",
-        "0x7bbba2e9fca9f2ade01d6c9c0f63a12307e3fcfd"
-      },
-      {
-        "0x7eed0e79c71b7baf9b2598a7a53bcdbaffb985ec48e1560bf963aa631d5d8c92000000000000000000000000000000000000000000000000000000000000001b21a8126ccf776ed394576e3c50e10e489951886b7e8b1a9d640b5ab4c63253737f76e9955dc860d49295a3782130cabe694eb2ee34ef0dc3367b07b3efe9f3ac",
-        "0x6df661c685e9433e2f85961d15c1a1c3f2121417"
-      },
-      {
-        "0xead4ef63f6bd001593e8088cdd8ab3c0c35ba808bebb091f43240ecbd81db3b9000000000000000000000000000000000000000000000000000000000000001b30d5d51ab3a1987baf4fb41ad5a2467b4a4a1000c909d51caf389e191441634135d94ea50996b6db1b1182a2c28162058ae53c3ef52695e5cc6b17018039d90e",
-        "0xbf14cdbb0f88457c9e6225c0b87b0b0b3d38e953"
-      },
-      {
-        "0x0c24abcfa29ff1f068a19f2f1db51b6da6ab042ac0ea3d74c87465b2075377ff000000000000000000000000000000000000000000000000000000000000001b18e975c578187caeda96b6029a7ec7aa037757cfd182b5f8d71f872233c2264a6adbb4465a68fbf4a574071cc4973f5fd5e7b721c86cb7e0f47f595222e37289",
-        "0xcd6eb47247a12aea535d6fd96cad1f4c7bcb409c"
-      },
-      {
-        "0xda13687f911cf8ede5e0a4317d8b9bf691b56bc2f3f4e463c8c2eb1f61a54469000000000000000000000000000000000000000000000000000000000000001bf6e5df315197d9fe994fae7e05e33be4bd090f9533f36c6285b80478cd21c38533928bb06d48795a86c12f5ccb95758e891d8b1b2d62106e85ae36cb8414d56b",
-        "0x9765c8a57ade562c30166b7e18aef179a22da185"
-      },
-    };
-  }
-
-  @Parameter public String input;
-
-  @Parameter(1)
-  public String expectedResult;
-
-  @Test
-  public void shouldRecoverAddress() {
-    final Bytes input = Bytes.fromHexString(this.input);
-    final Bytes expected =
-        expectedResult == null ? Bytes.EMPTY : Bytes32.fromHexString(expectedResult);
-    assertThat(contract.compute(input, messageFrame)).isEqualTo(expected);
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/MODEXPPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/MODEXPPrecompiledContractTest.java
deleted file mode 100644
index 9f94b96c558..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/MODEXPPrecompiledContractTest.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.mainnet.BerlinGasCalculator;
-import org.hyperledger.besu.ethereum.mainnet.ByzantiumGasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
-import org.mockito.Mock;
-
-@RunWith(Parameterized.class)
-public class MODEXPPrecompiledContractTest {
-  @Mock private MessageFrame messageFrame;
-
-  private final BigIntegerModularExponentiationPrecompiledContract byzantiumContract =
-      new BigIntegerModularExponentiationPrecompiledContract(new ByzantiumGasCalculator());
-  private final BigIntegerModularExponentiationPrecompiledContract berlinContract =
-      new BigIntegerModularExponentiationPrecompiledContract(new BerlinGasCalculator());
-
-  public MODEXPPrecompiledContractTest() {}
-
-  @Parameters
-  public static Object[][] parameters() {
-    return new Object[][] {
-      {
-        "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
-        "0000000000000000000000000000000000000000000000000000000000000001",
-        13056L,
-        1360L
-      },
-      {
-        "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
-        "0000000000000000000000000000000000000000000000000000000000000000",
-        13056L,
-        1360L
-      },
-      {
-        "000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000040e09ad9675465c53a109fac66a445c91b292d2bb2c5268addb30cd82f80fcb0033ff97c80a5fc6f39193ae969c6ede6710a6b7ac27078a06d90ef1c72e5c85fb502fc9e1f6beb81516545975218075ec2af118cd8798df6e08a147c60fd6095ac2bb02c2908cf4dd7c81f11c289e4bce98f3553768f392a80ce22bf5c4f4a248c6b",
-        "60008f1614cc01dcfb6bfb09c625cf90b47d4468db81b5f8b7a39d42f332eab9b2da8f2d95311648a8f243f4bb13cfb3d8f7f2a3c014122ebb3ed41b02783adc",
-        204L,
-        200L
-      },
-      {
-        "000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000040e09ad9675465c53a109fac66a445c91b292d2bb2c5268addb30cd82f80fcb0033ff97c80a5fc6f39193ae969c6ede6710a6b7ac27078a06d90ef1c72e5c85fb503fc9e1f6beb81516545975218075ec2af118cd8798df6e08a147c60fd6095ac2bb02c2908cf4dd7c81f11c289e4bce98f3553768f392a80ce22bf5c4f4a248c6b",
-        "4834a46ba565db27903b1c720c9d593e84e4cbd6ad2e64b31885d944f68cd801f92225a8961c952ddf2797fa4701b330c85c4b363798100b921a1a22a46a7fec",
-        204L,
-        200L
-      },
-      {
-        "000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000040e09ad9675465c53a109fac66a445c91b292d2bb2c5268addb30cd82f80fcb0033ff97c80a5fc6f39193ae969c6ede6710a6b7ac27078a06d90ef1c72e5c85fb5010001fc9e1f6beb81516545975218075ec2af118cd8798df6e08a147c60fd6095ac2bb02c2908cf4dd7c81f11c289e4bce98f3553768f392a80ce22bf5c4f4a248c6b",
-        "c36d804180c35d4426b57b50c5bfcca5c01856d104564cd513b461d3c8b8409128a5573e416d0ebe38f5f736766d9dc27143e4da981dfa4d67f7dc474cbee6d2",
-        3276L,
-        341L
-      },
-      {
-        "000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080cad7d991a00047dd54d3399b6b0b937c718abddef7917c75b6681f40cc15e2be0003657d8d4c34167b2f0bbbca0ccaa407c2a6a07d50f1517a8f22979ce12a81dcaf707cc0cebfc0ce2ee84ee7f77c38b9281b9822a8d3de62784c089c9b18dcb9a2a5eecbede90ea788a862a9ddd9d609c2c52972d63e289e28f6a590ffbf5102e6d893b80aeed5e6e9ce9afa8a5d5675c93a32ac05554cb20e9951b2c140e3ef4e433068cf0fb73bc9f33af1853f64aa27a0028cbf570d7ac9048eae5dc7b28c87c31e5810f1e7fa2cda6adf9f1076dbc1ec1238560071e7efc4e9565c49be9e7656951985860a558a754594115830bcdb421f741408346dd5997bb01c287087",
-        "981dd99c3b113fae3e3eaa9435c0dc96779a23c12a53d1084b4f67b0b053a27560f627b873e3f16ad78f28c94f14b6392def26e4d8896c5e3c984e50fa0b3aa44f1da78b913187c6128baa9340b1e9c9a0fd02cb78885e72576da4a8f7e5a113e173a7a2889fde9d407bd9f06eb05bc8fc7b4229377a32941a02bf4edcc06d70",
-        665L,
-        200L
-      },
-      {
-        "000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080cad7d991a00047dd54d3399b6b0b937c718abddef7917c75b6681f40cc15e2be0003657d8d4c34167b2f0bbbca0ccaa407c2a6a07d50f1517a8f22979ce12a81dcaf707cc0cebfc0ce2ee84ee7f77c38b9281b9822a8d3de62784c089c9b18dcb9a2a5eecbede90ea788a862a9ddd9d609c2c52972d63e289e28f6a590ffbf5103e6d893b80aeed5e6e9ce9afa8a5d5675c93a32ac05554cb20e9951b2c140e3ef4e433068cf0fb73bc9f33af1853f64aa27a0028cbf570d7ac9048eae5dc7b28c87c31e5810f1e7fa2cda6adf9f1076dbc1ec1238560071e7efc4e9565c49be9e7656951985860a558a754594115830bcdb421f741408346dd5997bb01c287087",
-        "d89ceb68c32da4f6364978d62aaa40d7b09b59ec61eb3c0159c87ec3a91037f7dc6967594e530a69d049b64adfa39c8fa208ea970cfe4b7bcd359d345744405afe1cbf761647e32b3184c7fbe87cee8c6c7ff3b378faba6c68b83b6889cb40f1603ee68c56b4c03d48c595c826c041112dc941878f8c5be828154afd4a16311f",
-        665L,
-        200L
-      },
-      {
-        "000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000080cad7d991a00047dd54d3399b6b0b937c718abddef7917c75b6681f40cc15e2be0003657d8d4c34167b2f0bbbca0ccaa407c2a6a07d50f1517a8f22979ce12a81dcaf707cc0cebfc0ce2ee84ee7f77c38b9281b9822a8d3de62784c089c9b18dcb9a2a5eecbede90ea788a862a9ddd9d609c2c52972d63e289e28f6a590ffbf51010001e6d893b80aeed5e6e9ce9afa8a5d5675c93a32ac05554cb20e9951b2c140e3ef4e433068cf0fb73bc9f33af1853f64aa27a0028cbf570d7ac9048eae5dc7b28c87c31e5810f1e7fa2cda6adf9f1076dbc1ec1238560071e7efc4e9565c49be9e7656951985860a558a754594115830bcdb421f741408346dd5997bb01c287087",
-        "ad85e8ef13fd1dd46eae44af8b91ad1ccae5b7a1c92944f92a19f21b0b658139e0cabe9c1f679507c2de354bf2c91ebd965d1e633978a830d517d2f6f8dd5fd58065d58559de7e2334a878f8ec6992d9b9e77430d4764e863d77c0f87beede8f2f7f2ab2e7222f85cc9d98b8467f4bb72e87ef2882423ebdb6daf02dddac6db2",
-        10649L,
-        1365L
-      },
-      {
-        "000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000100c9130579f243e12451760976261416413742bd7c91d39ae087f46794062b8c239f2a74abf3918605a0e046a7890e049475ba7fbb78f5de6490bd22a710cc04d30088179a919d86c2da62cf37f59d8f258d2310d94c24891be2d7eeafaa32a8cb4b0cfe5f475ed778f45907dc8916a73f03635f233f7a77a00a3ec9ca6761a5bbd558a2318ecd0caa1c5016691523e7e1fa267dd35e70c66e84380bdcf7c0582f540174e572c41f81e93da0b757dff0b0fe23eb03aa19af0bdec3afb474216febaacb8d0381e631802683182b0fe72c28392539850650b70509f54980241dc175191a35d967288b532a7a8223ce2440d010615f70df269501944d4ec16fe4a3cb02d7a85909174757835187cb52e71934e6c07ef43b4c46fc30bbcd0bc72913068267c54a4aabebb493922492820babdeb7dc9b1558fcf7bd82c37c82d3147e455b623ab0efa752fe0b3a67ca6e4d126639e645a0bf417568adbb2a6a4eef62fa1fa29b2a5a43bebea1f82193a7dd98eb483d09bb595af1fa9c97c7f41f5649d976aee3e5e59e2329b43b13bea228d4a93f16ba139ccb511de521ffe747aa2eca664f7c9e33da59075cc335afcd2bf3ae09765f01ab5a7c3e3938ec168b74724b5074247d200d9970382f683d6059b94dbc336603d1dfee714e4b447ac2fa1d99ecb4961da2854e03795ed758220312d101e1e3d87d5313a6d052aebde75110363d",
-        "affc7507ea6d84751ec6b3f0d7b99dbcc263f33330e450d1b3ff0bc3d0874320bf4edd57debd587306988157958cb3cfd369cc0c9c198706f635c9e0f15d047df5cb44d03e2727f26b083c4ad8485080e1293f171c1ed52aef5993a5815c35108e848c951cf1e334490b4a539a139e57b68f44fee583306f5b85ffa57206b3ee5660458858534e5386b9584af3c7f67806e84c189d695e5eb96e1272d06ec2df5dc5fabc6e94b793718c60c36be0a4d031fc84cd658aa72294b2e16fc240aef70cb9e591248e38bd49c5a554d1afa01f38dab72733092f7555334bbef6c8c430119840492380aa95fa025dcf699f0a39669d812b0c6946b6091e6e235337b6f8",
-        1894L,
-        341L
-      },
-      {
-        "000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000100c9130579f243e12451760976261416413742bd7c91d39ae087f46794062b8c239f2a74abf3918605a0e046a7890e049475ba7fbb78f5de6490bd22a710cc04d30088179a919d86c2da62cf37f59d8f258d2310d94c24891be2d7eeafaa32a8cb4b0cfe5f475ed778f45907dc8916a73f03635f233f7a77a00a3ec9ca6761a5bbd558a2318ecd0caa1c5016691523e7e1fa267dd35e70c66e84380bdcf7c0582f540174e572c41f81e93da0b757dff0b0fe23eb03aa19af0bdec3afb474216febaacb8d0381e631802683182b0fe72c28392539850650b70509f54980241dc175191a35d967288b532a7a8223ce2440d010615f70df269501944d4ec16fe4a3cb03d7a85909174757835187cb52e71934e6c07ef43b4c46fc30bbcd0bc72913068267c54a4aabebb493922492820babdeb7dc9b1558fcf7bd82c37c82d3147e455b623ab0efa752fe0b3a67ca6e4d126639e645a0bf417568adbb2a6a4eef62fa1fa29b2a5a43bebea1f82193a7dd98eb483d09bb595af1fa9c97c7f41f5649d976aee3e5e59e2329b43b13bea228d4a93f16ba139ccb511de521ffe747aa2eca664f7c9e33da59075cc335afcd2bf3ae09765f01ab5a7c3e3938ec168b74724b5074247d200d9970382f683d6059b94dbc336603d1dfee714e4b447ac2fa1d99ecb4961da2854e03795ed758220312d101e1e3d87d5313a6d052aebde75110363d",
-        "1b280ecd6a6bf906b806d527c2a831e23b238f89da48449003a88ac3ac7150d6a5e9e6b3be4054c7da11dd1e470ec29a606f5115801b5bf53bc1900271d7c3ff3cd5ed790d1c219a9800437a689f2388ba1a11d68f6a8e5b74e9a3b1fac6ee85fc6afbac599f93c391f5dc82a759e3c6c0ab45ce3f5d25d9b0c1bf94cf701ea6466fc9a478dacc5754e593172b5111eeba88557048bceae401337cd4c1182ad9f700852bc8c99933a193f0b94cf1aedbefc48be3bc93ef5cb276d7c2d5462ac8bb0c8fe8923a1db2afe1c6b90d59c534994a6a633f0ead1d638fdc293486bb634ff2c8ec9e7297c04241a61c37e3ae95b11d53343d4ba2b4cc33d2cfa7eb705e",
-        1894L,
-        341L
-      },
-      {
-        "000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000100c9130579f243e12451760976261416413742bd7c91d39ae087f46794062b8c239f2a74abf3918605a0e046a7890e049475ba7fbb78f5de6490bd22a710cc04d30088179a919d86c2da62cf37f59d8f258d2310d94c24891be2d7eeafaa32a8cb4b0cfe5f475ed778f45907dc8916a73f03635f233f7a77a00a3ec9ca6761a5bbd558a2318ecd0caa1c5016691523e7e1fa267dd35e70c66e84380bdcf7c0582f540174e572c41f81e93da0b757dff0b0fe23eb03aa19af0bdec3afb474216febaacb8d0381e631802683182b0fe72c28392539850650b70509f54980241dc175191a35d967288b532a7a8223ce2440d010615f70df269501944d4ec16fe4a3cb010001d7a85909174757835187cb52e71934e6c07ef43b4c46fc30bbcd0bc72913068267c54a4aabebb493922492820babdeb7dc9b1558fcf7bd82c37c82d3147e455b623ab0efa752fe0b3a67ca6e4d126639e645a0bf417568adbb2a6a4eef62fa1fa29b2a5a43bebea1f82193a7dd98eb483d09bb595af1fa9c97c7f41f5649d976aee3e5e59e2329b43b13bea228d4a93f16ba139ccb511de521ffe747aa2eca664f7c9e33da59075cc335afcd2bf3ae09765f01ab5a7c3e3938ec168b74724b5074247d200d9970382f683d6059b94dbc336603d1dfee714e4b447ac2fa1d99ecb4961da2854e03795ed758220312d101e1e3d87d5313a6d052aebde75110363d",
-        "37843d7c67920b5f177372fa56e2a09117df585f81df8b300fba245b1175f488c99476019857198ed459ed8d9799c377330e49f4180c4bf8e8f66240c64f65ede93d601f957b95b83efdee1e1bfde74169ff77002eaf078c71815a9220c80b2e3b3ff22c2f358111d816ebf83c2999026b6de50bfc711ff68705d2f40b753424aefc9f70f08d908b5a20276ad613b4ab4309a3ea72f0c17ea9df6b3367d44fb3acab11c333909e02e81ea2ed404a712d3ea96bba87461720e2d98723e7acd0520ac1a5212dbedcd8dc0c1abf61d4719e319ff4758a774790b8d463cdfe131d1b2dcfee52d002694e98e720cb6ae7ccea353bc503269ba35f0f63bf8d7b672a76",
-        30310L,
-        5461L
-      },
-      {
-        "000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000200db34d0e438249c0ed685c949cc28776a05094e1c48691dc3f2dca5fc3356d2a0663bd376e4712839917eb9a19c670407e2c377a2de385a3ff3b52104f7f1f4e0c7bf7717fb913896693dc5edbb65b760ef1b00e42e9d8f9af17352385e1cd742c9b006c0f669995cb0bb21d28c0aced2892267637b6470d8cee0ab27fc5d42658f6e88240c31d6774aa60a7ebd25cd48b56d0da11209f1928e61005c6eb709f3e8e0aaf8d9b10f7d7e296d772264dc76897ccdddadc91efa91c1903b7232a9e4c3b941917b99a3bc0c26497dedc897c25750af60237aa67934a26a2bc491db3dcc677491944bc1f51d3e5d76b8d846a62db03dedd61ff508f91a56d71028125035c3a44cbb041497c83bf3e4ae2a9613a401cc721c547a2afa3b16a2969933d3626ed6d8a7428648f74122fd3f2a02a20758f7f693892c8fd798b39abac01d18506c45e71432639e9f9505719ee822f62ccbf47f6850f096ff77b5afaf4be7d772025791717dbe5abf9b3f40cff7d7aab6f67e38f62faf510747276e20a42127e7500c444f9ed92baf65ade9e836845e39c4316d9dce5f8e2c8083e2c0acbb95296e05e51aab13b6b8f53f06c9c4276e12b0671133218cc3ea907da3bd9a367096d9202128d14846cc2e20d56fc8473ecb07cecbfb8086919f3971926e7045b853d85a69d026195c70f9f7a823536e2a8f4b3e12e94d9b53a934353451094b8102df3143a0057457d75e8c708b6337a6f5a4fd1a06727acf9fb93e2993c62f3378b37d56c85e7b1e00f0145ebf8e4095bd723166293c60b6ac1252291ef65823c9e040ddad14969b3b340a4ef714db093a587c37766d68b8d6b5016e741587e7e6bf7e763b44f0247e64bae30f994d248bfd20541a333e5b225ef6a61199e301738b1e688f70ec1d7fb892c183c95dc543c3e12adf8a5e8b9ca9d04f9445cced3ab256f29e998e69efaa633a7b60e1db5a867924ccab0a171d9d6e1098dfa15acde9553de599eaa56490c8f411e4985111f3d40bddfc5e301edb01547b01a886550a61158f7e2033c59707789bf7c854181d0c2e2a42a93cf09209747d7082e147eb8544de25c3eb14f2e35559ea0c0f5877f2f3fc92132c0ae9da4e45b2f6c866a224ea6d1f28c05320e287750fbc647368d41116e528014cc1852e5531d53e4af938374daba6cee4baa821ed07117253bb3601ddd00d59a3d7fb2ef1f5a2fbba7c429f0cf9a5b3462410fd833a69118f8be9c559b1000cc608fd877fb43f8e65c2d1302622b944462579056874b387208d90623fcdaf93920ca7a9e4ba64ea208758222ad868501cc2c345e2d3a5ea2a17e5069248138c8a79c0251185d29ee73e5afab5354769142d2bf0cb6712727aa6bf84a6245fcdae66e4938d84d1b9dd09a884818622080ff5f98942fb20acd7e0c916c2d5ea7ce6f7e173315384518f",
-        "8a5aea5f50dcc03dc7a7a272b5aeebc040554dbc1ffe36753c4fc75f7ed5f6c2cc0de3a922bf96c78bf0643a73025ad21f45a4a5cadd717612c511ab2bff1190fe5f1ae05ba9f8fe3624de1de2a817da6072ddcdb933b50216811dbe6a9ca79d3a3c6b3a476b079fd0d05f04fb154e2dd3e5cb83b148a006f2bcbf0042efb2ae7b916ea81b27aac25c3bf9a8b6d35440062ad8eae34a83f3ffa2cc7b40346b62174a4422584f72f95316f6b2bee9ff232ba9739301c97c99a9ded26c45d72676eb856ad6ecc81d36a6de36d7f9dafafee11baa43a4b0d5e4ecffa7b9b7dcefd58c397dd373e6db4acd2b2c02717712e6289bed7c813b670c4a0c6735aa7f3b0f1ce556eae9fcc94b501b2c8781ba50a8c6220e8246371c3c7359fe4ef9da786ca7d98256754ca4e496be0a9174bedbecb384bdf470779186d6a833f068d2838a88d90ef3ad48ff963b67c39cc5a3ee123baf7bf3125f64e77af7f30e105d72c4b9b5b237ed251e4c122c6d8c1405e736299c3afd6db16a28c6a9cfa68241e53de4cd388271fe534a6a9b0dbea6171d170db1b89858468885d08fecbd54c8e471c3e25d48e97ba450b96d0d87e00ac732aaa0d3ce4309c1064bd8a4c0808a97e0143e43a24cfa847635125cd41c13e0574487963e9d725c01375db99c31da67b4cf65eff555f0c0ac416c727ff8d438ad7c42030551d68c2e7adda0abb1ca7c10",
-        5580L,
-        1365L
-      },
-      {
-        "000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000200db34d0e438249c0ed685c949cc28776a05094e1c48691dc3f2dca5fc3356d2a0663bd376e4712839917eb9a19c670407e2c377a2de385a3ff3b52104f7f1f4e0c7bf7717fb913896693dc5edbb65b760ef1b00e42e9d8f9af17352385e1cd742c9b006c0f669995cb0bb21d28c0aced2892267637b6470d8cee0ab27fc5d42658f6e88240c31d6774aa60a7ebd25cd48b56d0da11209f1928e61005c6eb709f3e8e0aaf8d9b10f7d7e296d772264dc76897ccdddadc91efa91c1903b7232a9e4c3b941917b99a3bc0c26497dedc897c25750af60237aa67934a26a2bc491db3dcc677491944bc1f51d3e5d76b8d846a62db03dedd61ff508f91a56d71028125035c3a44cbb041497c83bf3e4ae2a9613a401cc721c547a2afa3b16a2969933d3626ed6d8a7428648f74122fd3f2a02a20758f7f693892c8fd798b39abac01d18506c45e71432639e9f9505719ee822f62ccbf47f6850f096ff77b5afaf4be7d772025791717dbe5abf9b3f40cff7d7aab6f67e38f62faf510747276e20a42127e7500c444f9ed92baf65ade9e836845e39c4316d9dce5f8e2c8083e2c0acbb95296e05e51aab13b6b8f53f06c9c4276e12b0671133218cc3ea907da3bd9a367096d9202128d14846cc2e20d56fc8473ecb07cecbfb8086919f3971926e7045b853d85a69d026195c70f9f7a823536e2a8f4b3e12e94d9b53a934353451094b8103df3143a0057457d75e8c708b6337a6f5a4fd1a06727acf9fb93e2993c62f3378b37d56c85e7b1e00f0145ebf8e4095bd723166293c60b6ac1252291ef65823c9e040ddad14969b3b340a4ef714db093a587c37766d68b8d6b5016e741587e7e6bf7e763b44f0247e64bae30f994d248bfd20541a333e5b225ef6a61199e301738b1e688f70ec1d7fb892c183c95dc543c3e12adf8a5e8b9ca9d04f9445cced3ab256f29e998e69efaa633a7b60e1db5a867924ccab0a171d9d6e1098dfa15acde9553de599eaa56490c8f411e4985111f3d40bddfc5e301edb01547b01a886550a61158f7e2033c59707789bf7c854181d0c2e2a42a93cf09209747d7082e147eb8544de25c3eb14f2e35559ea0c0f5877f2f3fc92132c0ae9da4e45b2f6c866a224ea6d1f28c05320e287750fbc647368d41116e528014cc1852e5531d53e4af938374daba6cee4baa821ed07117253bb3601ddd00d59a3d7fb2ef1f5a2fbba7c429f0cf9a5b3462410fd833a69118f8be9c559b1000cc608fd877fb43f8e65c2d1302622b944462579056874b387208d90623fcdaf93920ca7a9e4ba64ea208758222ad868501cc2c345e2d3a5ea2a17e5069248138c8a79c0251185d29ee73e5afab5354769142d2bf0cb6712727aa6bf84a6245fcdae66e4938d84d1b9dd09a884818622080ff5f98942fb20acd7e0c916c2d5ea7ce6f7e173315384518f",
-        "5a2664252aba2d6e19d9600da582cdd1f09d7a890ac48e6b8da15ae7c6ff1856fc67a841ac2314d283ffa3ca81a0ecf7c27d89ef91a5a893297928f5da0245c99645676b481b7e20a566ee6a4f2481942bee191deec5544600bb2441fd0fb19e2ee7d801ad8911c6b7750affec367a4b29a22942c0f5f4744a4e77a8b654da2a82571037099e9c6d930794efe5cdca73c7b6c0844e386bdca8ea01b3d7807146bb81365e2cdc6475f8c23e0ff84463126189dc9789f72bbce2e3d2d114d728a272f1345122de23df54c922ec7a16e5c2a8f84da8871482bd258c20a7c09bbcd64c7a96a51029bbfe848736a6ba7bf9d931a9b7de0bcaf3635034d4958b20ae9ab3a95a147b0421dd5f7ebff46c971010ebfc4adbbe0ad94d5498c853e7142c450d8c71de4b2f84edbf8acd2e16d00c8115b150b1c30e553dbb82635e781379fe2a56360420ff7e9f70cc64c00aba7e26ed13c7c19622865ae07248daced36416080f35f8cc157a857ed70ea4f347f17d1bee80fa038abd6e39b1ba06b97264388b21364f7c56e192d4b62d9b161405f32ab1e2594e86243e56fcf2cb30d21adef15b9940f91af681da24328c883d892670c6aa47940867a81830a82b82716895db810df1b834640abefb7db2092dd92912cb9a735175bc447be40a503cf22dfe565b4ed7a3293ca0dfd63a507430b323ee248ec82e843b673c97ad730728cebc",
-        5580L,
-        1365L
-      },
-      {
-        "000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000200db34d0e438249c0ed685c949cc28776a05094e1c48691dc3f2dca5fc3356d2a0663bd376e4712839917eb9a19c670407e2c377a2de385a3ff3b52104f7f1f4e0c7bf7717fb913896693dc5edbb65b760ef1b00e42e9d8f9af17352385e1cd742c9b006c0f669995cb0bb21d28c0aced2892267637b6470d8cee0ab27fc5d42658f6e88240c31d6774aa60a7ebd25cd48b56d0da11209f1928e61005c6eb709f3e8e0aaf8d9b10f7d7e296d772264dc76897ccdddadc91efa91c1903b7232a9e4c3b941917b99a3bc0c26497dedc897c25750af60237aa67934a26a2bc491db3dcc677491944bc1f51d3e5d76b8d846a62db03dedd61ff508f91a56d71028125035c3a44cbb041497c83bf3e4ae2a9613a401cc721c547a2afa3b16a2969933d3626ed6d8a7428648f74122fd3f2a02a20758f7f693892c8fd798b39abac01d18506c45e71432639e9f9505719ee822f62ccbf47f6850f096ff77b5afaf4be7d772025791717dbe5abf9b3f40cff7d7aab6f67e38f62faf510747276e20a42127e7500c444f9ed92baf65ade9e836845e39c4316d9dce5f8e2c8083e2c0acbb95296e05e51aab13b6b8f53f06c9c4276e12b0671133218cc3ea907da3bd9a367096d9202128d14846cc2e20d56fc8473ecb07cecbfb8086919f3971926e7045b853d85a69d026195c70f9f7a823536e2a8f4b3e12e94d9b53a934353451094b81010001df3143a0057457d75e8c708b6337a6f5a4fd1a06727acf9fb93e2993c62f3378b37d56c85e7b1e00f0145ebf8e4095bd723166293c60b6ac1252291ef65823c9e040ddad14969b3b340a4ef714db093a587c37766d68b8d6b5016e741587e7e6bf7e763b44f0247e64bae30f994d248bfd20541a333e5b225ef6a61199e301738b1e688f70ec1d7fb892c183c95dc543c3e12adf8a5e8b9ca9d04f9445cced3ab256f29e998e69efaa633a7b60e1db5a867924ccab0a171d9d6e1098dfa15acde9553de599eaa56490c8f411e4985111f3d40bddfc5e301edb01547b01a886550a61158f7e2033c59707789bf7c854181d0c2e2a42a93cf09209747d7082e147eb8544de25c3eb14f2e35559ea0c0f5877f2f3fc92132c0ae9da4e45b2f6c866a224ea6d1f28c05320e287750fbc647368d41116e528014cc1852e5531d53e4af938374daba6cee4baa821ed07117253bb3601ddd00d59a3d7fb2ef1f5a2fbba7c429f0cf9a5b3462410fd833a69118f8be9c559b1000cc608fd877fb43f8e65c2d1302622b944462579056874b387208d90623fcdaf93920ca7a9e4ba64ea208758222ad868501cc2c345e2d3a5ea2a17e5069248138c8a79c0251185d29ee73e5afab5354769142d2bf0cb6712727aa6bf84a6245fcdae66e4938d84d1b9dd09a884818622080ff5f98942fb20acd7e0c916c2d5ea7ce6f7e173315384518f",
-        "bed8b970c4a34849fc6926b08e40e20b21c15ed68d18f228904878d4370b56322d0da5789da0318768a374758e6375bfe4641fca5285ec7171828922160f48f5ca7efbfee4d5148612c38ad683ae4e3c3a053d2b7c098cf2b34f2cb19146eadd53c86b2d7ccf3d83b2c370bfb840913ee3879b1057a6b4e07e110b6bcd5e958bc71a14798c91d518cc70abee264b0d25a4110962a764b364ac0b0dd1ee8abc8426d775ec0f22b7e47b32576afaf1b5a48f64573ed1c5c29f50ab412188d9685307323d990802b81dacc06c6e05a1e901830ba9fcc67688dc29c5e27bde0a6e845ca925f5454b6fb3747edfaa2a5820838fb759eadf57f7cb5cec57fc213ddd8a4298fa079c3c0f472b07fb15aa6a7f0a3780bd296ff6a62e58ef443870b02260bd4fd2bbc98255674b8e1f1f9f8d33c7170b0ebbea4523b695911abbf26e41885344823bd0587115fdd83b721a4e8457a31c9a84b3d3520a07e0e35df7f48e5a9d534d0ec7feef1ff74de6a11e7f93eab95175b6ce22c68d78a642ad642837897ec11349205d8593ac19300207572c38d29ca5dfa03bc14cdbc32153c80e5cc3e739403d34c75915e49beb43094cc6dcafb3665b305ddec9286934ae66ec6b777ca528728c851318eb0f207b39f1caaf96db6eeead6b55ed08f451939314577d42bcc9f97c0b52d0234f88fd07e4c1d7780fdebc025cfffcb572cb27a8c33963",
-        89292L,
-        21845L
-      },
-      {
-        "000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000400c5a1611f8be90071a43db23cc2fe01871cc4c0e8ab5743f6378e4fef77f7f6db0095c0727e20225beb665645403453e325ad5f9aeb9ba99bf3c148f63f9c07cf4fe8847ad5242d6b7d4499f93bd47056ddab8f7dee878fc2314f344dbee2a7c41a5d3db91eff372c730c2fdd3a141a4b61999e36d549b9870cf2f4e632c4d5df5f024f81c028000073a0ed8847cfb0593d36a47142f578f05ccbe28c0c06aeb1b1da027794c48db880278f79ba78ae64eedfea3c07d10e0562668d839749dc95f40467d15cf65b9cfc52c7c4bcef1cda3596dd52631aac942f146c7cebd46065131699ce8385b0db1874336747ee020a5698a3d1a1082665721e769567f579830f9d259cec1a836845109c21cf6b25da572512bf3c42fd4b96e43895589042ab60dd41f497db96aec102087fe784165bb45f942859268fd2ff6c012d9d00c02ba83eace047cc5f7b2c392c2955c58a49f0338d6fc58749c9db2155522ac17914ec216ad87f12e0ee95574613942fa615898c4d9e8a3be68cd6afa4e7a003dedbdf8edfee31162b174f965b20ae752ad89c967b3068b6f722c16b354456ba8e280f987c08e0a52d40a2e8f3a59b94d590aeef01879eb7a90b3ee7d772c839c85519cbeaddc0c193ec4874a463b53fcaea3271d80ebfb39b33489365fc039ae549a17a9ff898eea2f4cb27b8dbee4c17b998438575b2b8d107e4a0d66ba7fca85b41a58a8d51f191a35c856dfbe8aef2b00048a694bbccff832d23c8ca7a7ff0b6c0b3011d00b97c86c0628444d267c951d9e4fb8f83e154b8f74fb51aa16535e498235c5597dac9606ed0be3173a3836baa4e7d756ffe1e2879b415d3846bccd538c05b847785699aefde3e305decb600cd8fb0e7d8de5efc26971a6ad4e6d7a2d91474f1023a0ac4b78dc937da0ce607a45974d2cac1c33a2631ff7fe6144a3b2e5cf98b531a9627dea92c1dc82204d09db0439b6a11dd64b484e1263aa45fd9539b6020b55e3baece3986a8bffc1003406348f5c61265099ed43a766ee4f93f5f9c5abbc32a0fd3ac2b35b87f9ec26037d88275bd7dd0a54474995ee34ed3727f3f97c48db544b1980193a4b76a8a3ddab3591ce527f16d91882e67f0103b5cda53f7da54d489fc4ac08b6ab358a5a04aa9daa16219d50bd672a7cb804ed769d218807544e5993f1c27427104b349906a0b654df0bf69328afd3013fbe430155339c39f236df5557bf92f1ded7ff609a8502f49064ec3d1dbfb6c15d3a4c11a4f8acd12278cbf68acd5709463d12e3338a6eddb8c112f199645e23154a8e60879d2a654e3ed9296aa28f134168619691cd2c6b9e2eba4438381676173fc63c2588a3c5910dc149cf3760f0aa9fa9c3f5faa9162b0bf1aac9dd32b706a60ef53cbdb394b6b40222b5bc80eea82ba8958386672564cae3794f977871ab62337cf02e30049201ec12937e7ce79d0f55d9c810e20acf52212aca1d3888949e0e4830aad88d804161230eb89d4d329cc83570fe257217d2119134048dd2ed167646975fc7d77136919a049ea74cf08ddd2b896890bb24a0ba18094a22baa351bf29ad96c66bbb1a598f2ca391749620e62d61c3561a7d3653ccc8892c7b99baaf76bf836e2991cb06d6bc0514568ff0d1ec8bb4b3d6984f5eaefb17d3ea2893722375d3ddb8e389a8eef7d7d198f8e687d6a513983df906099f9a2d23f4f9dec6f8ef2f11fc0a21fac45353b94e00486f5e17d386af42502d09db33cf0cf28310e049c07e88682aeeb00cb833c5174266e62407a57583f1f88b304b7c6e0c84bbe1c0fd423072d37a5bd0aacf764229e5c7cd02473460ba3645cd8e8ae144065bf02d0dd238593d8e230354f67e0b2f23012c23274f80e3ee31e35e2606a4a3f31d94ab755e6d163cff52cbb36b6d0cc67ffc512aeed1dce4d7a0d70ce82f2baba12e8d514dc92a056f994adfb17b5b9712bd5186f27a2fda1f7039c5df2c8587fdc62f5627580c13234b55be4df3056050e2d1ef3218f0dd66cb05265fe1acfb0989d8213f2c19d1735a7cf3fa65d88dad5af52dc2bba22b7abf46c3bc77b5091baab9e8f0ddc4d5e581037de91a9f8dcbc69309be29cc815cf19a20a7585b8b3073edf51fc9baeb3e509b97fa4ecfd621e0fd57bd61cac1b895c03248ff12bdbc57509250df3517e8a3fe1d776836b34ab352b973d932ef708b14f7418f9eceb1d87667e61e3e758649cb083f01b133d37ab2f5afa96d6c84bcacf4efc3851ad308c1e7d9113624fce29fab460ab9d2a48d92cdb281103a5250ad44cb2ff6e67ac670c02fdafb3e0f1353953d6d7d5646ca1568dea55275a050ec501b7c6250444f7219f1ba7521ba3b93d089727ca5f3bbe0d6c1300b423377004954c5628fdb65770b18ced5c9b23a4a5a6d6ef25fe01b4ce278de0bcc4ed86e28a0a68818ffa40970128cf2c38740e80037984428c1bd5113f40ff47512ee6f4e4d8f9b8e8e1b3040d2928d003bd1c1329dc885302fbce9fa81c23b4dc49c7c82d29b52957847898676c89aa5d32b5b0e1c0d5a2b79a19d67562f407f19425687971a957375879d90c5f57c857136c17106c9ab1b99d80e69c8c954ed386493368884b55c939b8d64d26f643e800c56f90c01079d7c534e3b2b7ae352cefd3016da55f6a85eb803b85e2304915fd2001f77c74e28746293c46e4f5f0fd49cf988aafd0026b8e7a3bab2da5cdce1ea26c2e29ec03f4807fac432662b2d6c060be1c7be0e5489de69d0a6e03a4b9117f9244b34a0f1ecba89884f781c6320412413a00c4980287409a2a78c2cd7e65cecebbe4ec1c28cac4dd95f6998e78fc6f1392384331c9436aa10e10e2bf8ad2c4eafbcf276aa7bae64b74428911b3269c749338b0fc5075ad",
-        "d61fe4e3f32ac260915b5b03b78a86d11bfc41d973fce5b0cc59035cf8289a8a2e3878ea15fa46565b0d806e2f85b53873ea20ed653869b688adf83f3ef444535bf91598ff7e80f334fb782539b92f39f55310cc4b35349ab7b278346eda9bc37c0d8acd3557fae38197f412f8d9e57ce6a76b7205c23564cab06e5615be7c6f05c3d05ec690cba91da5e89d55b152ff8dd2157dc5458190025cf94b1ad98f7cbe64e9482faba95e6b33844afc640892872b44a9932096508f4a782a4805323808f23e54b6ff9b841dbfa87db3505ae4f687972c18ea0f0d0af89d36c1c2a5b14560c153c3fee406f5cf15cfd1c0bb45d767426d465f2f14c158495069d0c5955a00150707862ecaae30624ebacdd8ac33e4e6aab3ff90b6ba445a84689386b9e945d01823a65874444316e83767290fcff630d2477f49d5d8ffdd200e08ee1274270f86ed14c687895f6caf5ce528bd970c20d2408a9ba66216324c6a011ac4999098362dbd98a038129a2d40c8da6ab88318aa3046cb660327cc44236d9e5d2163bd0959062195c51ed93d0088b6f92051fc99050ece2538749165976233697ab4b610385366e5ce0b02ad6b61c168ecfbedcdf74278a38de340fd7a5fead8e588e294795f9b011e2e60377a89e25c90e145397cdeabc60fd32444a6b7642a611a83c464d8b8976666351b4865c37b02e6dc21dbcdf5f930341707b618cc0f03c3122646b3385c9df9f2ec730eec9d49e7dfc9153b6e6289da8c4f0ebea9ccc1b751948e3bb7171c9e4d57423b0eeeb79095c030cb52677b3f7e0b45c30f645391f3f9c957afa549c4e0b2465b03c67993cd200b1af01035962edbc4c9e89b31c82ac121987d6529dafdeef67a132dc04b6dc68e77f22862040b75e2ceb9ff16da0fca534e6db7bd12fa7b7f51b6c08c1e23dfcdb7acbd2da0b51c87ffbced065a612e9b1c8bba9b7e2d8d7a2f04fcc4aaf355b60d764879a76b5e16762d5f2f55d585d0c8e82df6940960cddfb72c91dfa71f6b4e1c6ca25dfc39a878e998a663c04fe29d5e83b9586d047b4d7ff70a9f0d44f127e7d741685ca75f11629128d916a0ffef4be586a30c4b70389cc746e84ebf177c01ee8a4511cfbb9d1ecf7f7b33c7dd8177896e10bbc82f838dcd6db7ac67de62bf46b6a640fb580c5d1d2708f3862e3d2b645d0d18e49ef088053e3a220adc0e033c2afcfe61c90e32151152eb3caaf746c5e377d541cafc6cbb0cc0fa48b5caf1728f2e1957f5addfc234f1a9d89e40d49356c9172d0561a695fce6dab1d412321bbf407f63766ffd7b6b3d79bcfa07991c5a9709849c1008689e3b47c50d613980bec239fb64185249d055b30375ccb4354d71fe4d05648fbf6c80634dfc3575f2f24abb714c1e4c95e8896763bf4316e954c7ad19e5780ab7a040ca6fb9271f90a8b22ae738daf6cb",
-        17868L,
-        5461L
-      },
-      {
-        "000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000400c5a1611f8be90071a43db23cc2fe01871cc4c0e8ab5743f6378e4fef77f7f6db0095c0727e20225beb665645403453e325ad5f9aeb9ba99bf3c148f63f9c07cf4fe8847ad5242d6b7d4499f93bd47056ddab8f7dee878fc2314f344dbee2a7c41a5d3db91eff372c730c2fdd3a141a4b61999e36d549b9870cf2f4e632c4d5df5f024f81c028000073a0ed8847cfb0593d36a47142f578f05ccbe28c0c06aeb1b1da027794c48db880278f79ba78ae64eedfea3c07d10e0562668d839749dc95f40467d15cf65b9cfc52c7c4bcef1cda3596dd52631aac942f146c7cebd46065131699ce8385b0db1874336747ee020a5698a3d1a1082665721e769567f579830f9d259cec1a836845109c21cf6b25da572512bf3c42fd4b96e43895589042ab60dd41f497db96aec102087fe784165bb45f942859268fd2ff6c012d9d00c02ba83eace047cc5f7b2c392c2955c58a49f0338d6fc58749c9db2155522ac17914ec216ad87f12e0ee95574613942fa615898c4d9e8a3be68cd6afa4e7a003dedbdf8edfee31162b174f965b20ae752ad89c967b3068b6f722c16b354456ba8e280f987c08e0a52d40a2e8f3a59b94d590aeef01879eb7a90b3ee7d772c839c85519cbeaddc0c193ec4874a463b53fcaea3271d80ebfb39b33489365fc039ae549a17a9ff898eea2f4cb27b8dbee4c17b998438575b2b8d107e4a0d66ba7fca85b41a58a8d51f191a35c856dfbe8aef2b00048a694bbccff832d23c8ca7a7ff0b6c0b3011d00b97c86c0628444d267c951d9e4fb8f83e154b8f74fb51aa16535e498235c5597dac9606ed0be3173a3836baa4e7d756ffe1e2879b415d3846bccd538c05b847785699aefde3e305decb600cd8fb0e7d8de5efc26971a6ad4e6d7a2d91474f1023a0ac4b78dc937da0ce607a45974d2cac1c33a2631ff7fe6144a3b2e5cf98b531a9627dea92c1dc82204d09db0439b6a11dd64b484e1263aa45fd9539b6020b55e3baece3986a8bffc1003406348f5c61265099ed43a766ee4f93f5f9c5abbc32a0fd3ac2b35b87f9ec26037d88275bd7dd0a54474995ee34ed3727f3f97c48db544b1980193a4b76a8a3ddab3591ce527f16d91882e67f0103b5cda53f7da54d489fc4ac08b6ab358a5a04aa9daa16219d50bd672a7cb804ed769d218807544e5993f1c27427104b349906a0b654df0bf69328afd3013fbe430155339c39f236df5557bf92f1ded7ff609a8502f49064ec3d1dbfb6c15d3a4c11a4f8acd12278cbf68acd5709463d12e3338a6eddb8c112f199645e23154a8e60879d2a654e3ed9296aa28f134168619691cd2c6b9e2eba4438381676173fc63c2588a3c5910dc149cf3760f0aa9fa9c3f5faa9162b0bf1aac9dd32b706a60ef53cbdb394b6b40222b5bc80eea82ba8958386672564cae3794f977871ab62337cf03e30049201ec12937e7ce79d0f55d9c810e20acf52212aca1d3888949e0e4830aad88d804161230eb89d4d329cc83570fe257217d2119134048dd2ed167646975fc7d77136919a049ea74cf08ddd2b896890bb24a0ba18094a22baa351bf29ad96c66bbb1a598f2ca391749620e62d61c3561a7d3653ccc8892c7b99baaf76bf836e2991cb06d6bc0514568ff0d1ec8bb4b3d6984f5eaefb17d3ea2893722375d3ddb8e389a8eef7d7d198f8e687d6a513983df906099f9a2d23f4f9dec6f8ef2f11fc0a21fac45353b94e00486f5e17d386af42502d09db33cf0cf28310e049c07e88682aeeb00cb833c5174266e62407a57583f1f88b304b7c6e0c84bbe1c0fd423072d37a5bd0aacf764229e5c7cd02473460ba3645cd8e8ae144065bf02d0dd238593d8e230354f67e0b2f23012c23274f80e3ee31e35e2606a4a3f31d94ab755e6d163cff52cbb36b6d0cc67ffc512aeed1dce4d7a0d70ce82f2baba12e8d514dc92a056f994adfb17b5b9712bd5186f27a2fda1f7039c5df2c8587fdc62f5627580c13234b55be4df3056050e2d1ef3218f0dd66cb05265fe1acfb0989d8213f2c19d1735a7cf3fa65d88dad5af52dc2bba22b7abf46c3bc77b5091baab9e8f0ddc4d5e581037de91a9f8dcbc69309be29cc815cf19a20a7585b8b3073edf51fc9baeb3e509b97fa4ecfd621e0fd57bd61cac1b895c03248ff12bdbc57509250df3517e8a3fe1d776836b34ab352b973d932ef708b14f7418f9eceb1d87667e61e3e758649cb083f01b133d37ab2f5afa96d6c84bcacf4efc3851ad308c1e7d9113624fce29fab460ab9d2a48d92cdb281103a5250ad44cb2ff6e67ac670c02fdafb3e0f1353953d6d7d5646ca1568dea55275a050ec501b7c6250444f7219f1ba7521ba3b93d089727ca5f3bbe0d6c1300b423377004954c5628fdb65770b18ced5c9b23a4a5a6d6ef25fe01b4ce278de0bcc4ed86e28a0a68818ffa40970128cf2c38740e80037984428c1bd5113f40ff47512ee6f4e4d8f9b8e8e1b3040d2928d003bd1c1329dc885302fbce9fa81c23b4dc49c7c82d29b52957847898676c89aa5d32b5b0e1c0d5a2b79a19d67562f407f19425687971a957375879d90c5f57c857136c17106c9ab1b99d80e69c8c954ed386493368884b55c939b8d64d26f643e800c56f90c01079d7c534e3b2b7ae352cefd3016da55f6a85eb803b85e2304915fd2001f77c74e28746293c46e4f5f0fd49cf988aafd0026b8e7a3bab2da5cdce1ea26c2e29ec03f4807fac432662b2d6c060be1c7be0e5489de69d0a6e03a4b9117f9244b34a0f1ecba89884f781c6320412413a00c4980287409a2a78c2cd7e65cecebbe4ec1c28cac4dd95f6998e78fc6f1392384331c9436aa10e10e2bf8ad2c4eafbcf276aa7bae64b74428911b3269c749338b0fc5075ad",
-        "5f9c70ec884926a89461056ad20ac4c30155e817f807e4d3f5bb743d789c83386762435c3627773fa77da5144451f2a8aad8adba88e0b669f5377c5e9bad70e45c86fe952b613f015a9953b8a5de5eaee4566acf98d41e327d93a35bd5cef4607d025e58951167957df4ff9b1627649d3943805472e5e293d3efb687cfd1e503faafeb2840a3e3b3f85d016051a58e1c9498aab72e63b748d834b31eb05d85dcde65e27834e266b85c75cc4ec0135135e0601cb93eeeb6e0010c8ceb65c4c319623c5e573a2c8c9fbbf7df68a930beb412d3f4dfd146175484f45d7afaa0d2e60684af9b34730f7c8438465ad3e1d0c3237336722f2aa51095bd5759f4b8ab4dda111b684aa3dac62a761722e7ae43495b7709933512c81c4e3c9133a51f7ce9f2b51fcec064f65779666960b4e45df3900f54311f5613e8012dd1b8efd359eda31a778264c72aa8bb419d862734d769076bce2810011989a45374e5c5d8729fec21427f0bf397eacbb4220f603cf463a4b0c94efd858ffd9768cd60d6ce68d755e0fbad007ce5c2223d70c7018345a102e4ab3c60a13a9e7794303156d4c2063e919f2153c13961fb324c80b240742f47773a7a8e25b3e3fb19b00ce839346c6eb3c732fbc6b888df0b1fe0a3d07b053a2e9402c267b2d62f794d8a2840526e3ade15ce2264496ccd7519571dfde47f7a4bb16292241c20b2be59f3f8fb4f6383f232d838c5a22d8c95b6834d9d2ca493f5a505ebe8899503b0e8f9b19e6e2dd81c1628b80016d02097e0134de51054c4e7674824d4d758760fc52377d2cad145e259aa2ffaf54139e1a66b1e0c1c191e32ac59474c6b526f5b3ba07d3e5ec286eddf531fcd5292869be58c9f22ef91026159f7cf9d05ef66b4299f4da48cc1635bf2243051d342d378a22c83390553e873713c0454ce5f3234397111ac3fe3207b86f0ed9fc025c81903e1748103692074f83824fda6341be4f95ff00b0a9a208c267e12fa01825054cc0513629bf3dbb56dc5b90d4316f87654a8be18227978ea0a8a522760cad620d0d14fd38920fb7321314062914275a5f99f677145a6979b156bd82ecd36f23f8e1273cc2759ecc0b2c69d94dad5211d1bed939dd87ed9e07b91d49713a6e16ade0a98aea789f04994e318e4ff2c8a188cd8d43aeb52c6daa3bc29b4af50ea82a247c5cd67b573b34cbadcc0a376d3bbd530d50367b42705d870f2e27a8197ef46070528bfe408360faa2ebb8bf76e9f388572842bcb119f4d84ee34ae31f5cc594f23705a49197b181fb78ed1ec99499c690f843a4d0cf2e226d118e9372271054fbabdcc5c92ae9fefaef0589cd0e722eaf30c1703ec4289c7fd81beaa8a455ccee5298e31e2080c10c366a6fcf56f7d13582ad0bcad037c612b710fc595b70fbefaaca23623b60c6c39b11beb8e5843b6b3dac60f",
-        17868L,
-        5461L
-      },
-      {
-        "000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000400c5a1611f8be90071a43db23cc2fe01871cc4c0e8ab5743f6378e4fef77f7f6db0095c0727e20225beb665645403453e325ad5f9aeb9ba99bf3c148f63f9c07cf4fe8847ad5242d6b7d4499f93bd47056ddab8f7dee878fc2314f344dbee2a7c41a5d3db91eff372c730c2fdd3a141a4b61999e36d549b9870cf2f4e632c4d5df5f024f81c028000073a0ed8847cfb0593d36a47142f578f05ccbe28c0c06aeb1b1da027794c48db880278f79ba78ae64eedfea3c07d10e0562668d839749dc95f40467d15cf65b9cfc52c7c4bcef1cda3596dd52631aac942f146c7cebd46065131699ce8385b0db1874336747ee020a5698a3d1a1082665721e769567f579830f9d259cec1a836845109c21cf6b25da572512bf3c42fd4b96e43895589042ab60dd41f497db96aec102087fe784165bb45f942859268fd2ff6c012d9d00c02ba83eace047cc5f7b2c392c2955c58a49f0338d6fc58749c9db2155522ac17914ec216ad87f12e0ee95574613942fa615898c4d9e8a3be68cd6afa4e7a003dedbdf8edfee31162b174f965b20ae752ad89c967b3068b6f722c16b354456ba8e280f987c08e0a52d40a2e8f3a59b94d590aeef01879eb7a90b3ee7d772c839c85519cbeaddc0c193ec4874a463b53fcaea3271d80ebfb39b33489365fc039ae549a17a9ff898eea2f4cb27b8dbee4c17b998438575b2b8d107e4a0d66ba7fca85b41a58a8d51f191a35c856dfbe8aef2b00048a694bbccff832d23c8ca7a7ff0b6c0b3011d00b97c86c0628444d267c951d9e4fb8f83e154b8f74fb51aa16535e498235c5597dac9606ed0be3173a3836baa4e7d756ffe1e2879b415d3846bccd538c05b847785699aefde3e305decb600cd8fb0e7d8de5efc26971a6ad4e6d7a2d91474f1023a0ac4b78dc937da0ce607a45974d2cac1c33a2631ff7fe6144a3b2e5cf98b531a9627dea92c1dc82204d09db0439b6a11dd64b484e1263aa45fd9539b6020b55e3baece3986a8bffc1003406348f5c61265099ed43a766ee4f93f5f9c5abbc32a0fd3ac2b35b87f9ec26037d88275bd7dd0a54474995ee34ed3727f3f97c48db544b1980193a4b76a8a3ddab3591ce527f16d91882e67f0103b5cda53f7da54d489fc4ac08b6ab358a5a04aa9daa16219d50bd672a7cb804ed769d218807544e5993f1c27427104b349906a0b654df0bf69328afd3013fbe430155339c39f236df5557bf92f1ded7ff609a8502f49064ec3d1dbfb6c15d3a4c11a4f8acd12278cbf68acd5709463d12e3338a6eddb8c112f199645e23154a8e60879d2a654e3ed9296aa28f134168619691cd2c6b9e2eba4438381676173fc63c2588a3c5910dc149cf3760f0aa9fa9c3f5faa9162b0bf1aac9dd32b706a60ef53cbdb394b6b40222b5bc80eea82ba8958386672564cae3794f977871ab62337cf010001e30049201ec12937e7ce79d0f55d9c810e20acf52212aca1d3888949e0e4830aad88d804161230eb89d4d329cc83570fe257217d2119134048dd2ed167646975fc7d77136919a049ea74cf08ddd2b896890bb24a0ba18094a22baa351bf29ad96c66bbb1a598f2ca391749620e62d61c3561a7d3653ccc8892c7b99baaf76bf836e2991cb06d6bc0514568ff0d1ec8bb4b3d6984f5eaefb17d3ea2893722375d3ddb8e389a8eef7d7d198f8e687d6a513983df906099f9a2d23f4f9dec6f8ef2f11fc0a21fac45353b94e00486f5e17d386af42502d09db33cf0cf28310e049c07e88682aeeb00cb833c5174266e62407a57583f1f88b304b7c6e0c84bbe1c0fd423072d37a5bd0aacf764229e5c7cd02473460ba3645cd8e8ae144065bf02d0dd238593d8e230354f67e0b2f23012c23274f80e3ee31e35e2606a4a3f31d94ab755e6d163cff52cbb36b6d0cc67ffc512aeed1dce4d7a0d70ce82f2baba12e8d514dc92a056f994adfb17b5b9712bd5186f27a2fda1f7039c5df2c8587fdc62f5627580c13234b55be4df3056050e2d1ef3218f0dd66cb05265fe1acfb0989d8213f2c19d1735a7cf3fa65d88dad5af52dc2bba22b7abf46c3bc77b5091baab9e8f0ddc4d5e581037de91a9f8dcbc69309be29cc815cf19a20a7585b8b3073edf51fc9baeb3e509b97fa4ecfd621e0fd57bd61cac1b895c03248ff12bdbc57509250df3517e8a3fe1d776836b34ab352b973d932ef708b14f7418f9eceb1d87667e61e3e758649cb083f01b133d37ab2f5afa96d6c84bcacf4efc3851ad308c1e7d9113624fce29fab460ab9d2a48d92cdb281103a5250ad44cb2ff6e67ac670c02fdafb3e0f1353953d6d7d5646ca1568dea55275a050ec501b7c6250444f7219f1ba7521ba3b93d089727ca5f3bbe0d6c1300b423377004954c5628fdb65770b18ced5c9b23a4a5a6d6ef25fe01b4ce278de0bcc4ed86e28a0a68818ffa40970128cf2c38740e80037984428c1bd5113f40ff47512ee6f4e4d8f9b8e8e1b3040d2928d003bd1c1329dc885302fbce9fa81c23b4dc49c7c82d29b52957847898676c89aa5d32b5b0e1c0d5a2b79a19d67562f407f19425687971a957375879d90c5f57c857136c17106c9ab1b99d80e69c8c954ed386493368884b55c939b8d64d26f643e800c56f90c01079d7c534e3b2b7ae352cefd3016da55f6a85eb803b85e2304915fd2001f77c74e28746293c46e4f5f0fd49cf988aafd0026b8e7a3bab2da5cdce1ea26c2e29ec03f4807fac432662b2d6c060be1c7be0e5489de69d0a6e03a4b9117f9244b34a0f1ecba89884f781c6320412413a00c4980287409a2a78c2cd7e65cecebbe4ec1c28cac4dd95f6998e78fc6f1392384331c9436aa10e10e2bf8ad2c4eafbcf276aa7bae64b74428911b3269c749338b0fc5075ad",
-        "5a0eb2bdf0ac1cae8e586689fa16cd4b07dfdedaec8a110ea1fdb059dd5253231b6132987598dfc6e11f86780428982d50cf68f67ae452622c3b336b537ef3298ca645e8f89ee39a26758206a5a3f6409afc709582f95274b57b71fae5c6b74619ae6f089a5393c5b79235d9caf699d23d88fb873f78379690ad8405e34c19f5257d596580c7a6a7206a3712825afe630c76b31cdb4a23e7f0632e10f14f4e282c81a66451a26f8df2a352b5b9f607a7198449d1b926e27036810368e691a74b91c61afa73d9d3b99453e7c8b50fd4f09c039a2f2feb5c419206694c31b92df1d9586140cb3417b38d0c503c7b508cc2ed12e813a1c795e9829eb39ee78eeaf360a169b491a1d4e419574e712402de9d48d54c1ae5e03739b7156615e8267e1fb0a897f067afd11fb33f6e24182d7aaaaa18fe5bc1982f20d6b871e5a398f0f6f718181d31ec225cfa9a0a70124ed9a70031bdf0c1c7829f708b6e17d50419ef361cf77d99c85f44607186c8d683106b8bd38a49b5d0fb503b397a83388c5678dcfcc737499d84512690701ed621a6f0172aecf037184ddf0f2453e4053024018e5ab2e30d6d5363b56e8b41509317c99042f517247474ab3abc848e00a07f69c254f46f2a05cf6ed84e5cc906a518fdcfdf2c61ce731f24c5264f1a25fc04934dc28aec112134dd523f70115074ca34e3807aa4cb925147f3a0ce152d323bd8c675ace446d0fd1ae30c4b57f0eb2c23884bc18f0964c0114796c5b6d080c3d89175665fbf63a6381a6a9da39ad070b645c8bb1779506da14439a9f5b5d481954764ea114fac688930bc68534d403cff4210673b6a6ff7ae416b7cd41404c3d3f282fcd193b86d0f54d0006c2a503b40d5c3930da980565b8f9630e9493a79d1c03e74e5f93ac8e4dc1a901ec5e3b3e57049124c7b72ea345aa359e782285d9e6a5c144a378111dd02c40855ff9c2be9b48425cb0b2fd62dc8678fd151121cf26a65e917d65d8e0dacfae108eb5508b601fb8ffa370be1f9a8b749a2d12eeab81f41079de87e2d777994fa4d28188c579ad327f9957fb7bdecec5c680844dd43cb57cf87aeb763c003e65011f73f8c63442df39a92b946a6bd968a1c1e4d5fa7d88476a68bd8e20e5b70a99259c7d3f85fb1b65cd2e93972e6264e74ebf289b8b6979b9b68a85cd5b360c1987f87235c3c845d62489e33acf85d53fa3561fe3a3aee18924588d9c6eba4edb7a4d106b31173e42929f6f0c48c80ce6a72d54eca7c0fe870068b7a7c89c63cdda593f5b32d3cb4ea8a32c39f00ab449155757172d66763ed9527019d6de6c9f2416aa6203f4d11c9ebee1e1d3845099e55504446448027212616167eb36035726daa7698b075286f5379cd3e93cb3e0cf4f9cb8d017facbb5550ed32d5ec5400ae57e47e2bf78d1eaeff9480cc765ceff39db500",
-        285900L,
-        87381L
-      }
-    };
-  }
-
-  @Parameter public String input;
-
-  @Parameter(1)
-  public String precompiledResult;
-
-  @Parameter(2)
-  public Long eip198Gas;
-
-  @Parameter(3)
-  public Long eip2565Gas;
-
-  @Test
-  public void testPrecompiledContract() {
-    final Bytes input = Bytes.fromHexString(this.input);
-    final Bytes expected = Bytes.fromHexString(precompiledResult);
-    assertThat(byzantiumContract.compute(input, messageFrame)).isEqualTo(expected);
-    assertThat(berlinContract.compute(input, messageFrame)).isEqualTo(expected);
-  }
-
-  @Test
-  public void testGasPrice() {
-    final Bytes input = Bytes.fromHexString(this.input);
-    assertThat(byzantiumContract.gasRequirement(input)).isEqualTo(Gas.of(eip198Gas));
-    assertThat(berlinContract.gasRequirement(input)).isEqualTo(Gas.of(eip2565Gas));
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/FlexiblePrivacyPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/FlexiblePrivacyPrecompiledContractTest.java
new file mode 100644
index 00000000000..3f4e650c81a
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/FlexiblePrivacyPrecompiledContractTest.java
@@ -0,0 +1,436 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet.precompiles.privacy;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hyperledger.besu.ethereum.core.PrivateTransactionDataFixture.versionedPrivateTransactionBesu;
+import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_IS_PERSISTING_PRIVATE_STATE;
+import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_PRIVATE_METADATA_UPDATER;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.enclave.Enclave;
+import org.hyperledger.besu.enclave.EnclaveClientException;
+import org.hyperledger.besu.enclave.EnclaveConfigurationException;
+import org.hyperledger.besu.enclave.types.ReceiveResponse;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
+import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+import org.hyperledger.besu.ethereum.privacy.PrivateStateGenesisAllocator;
+import org.hyperledger.besu.ethereum.privacy.PrivateStateRootResolver;
+import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
+import org.hyperledger.besu.ethereum.privacy.PrivateTransactionProcessor;
+import org.hyperledger.besu.ethereum.privacy.VersionedPrivateTransaction;
+import org.hyperledger.besu.ethereum.privacy.storage.PrivacyGroupHeadBlockMap;
+import org.hyperledger.besu.ethereum.privacy.storage.PrivateMetadataUpdater;
+import org.hyperledger.besu.ethereum.privacy.storage.PrivateStateStorage;
+import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
+import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.SpuriousDragonGasCalculator;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.precompile.PrecompiledContract;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.mockito.Mockito;
+
+public class FlexiblePrivacyPrecompiledContractTest {
+
+  @Rule public final TemporaryFolder temp = new TemporaryFolder();
+
+  private final Bytes privateTransactionLookupId = Bytes.random(32);
+  private final Bytes privateTransactionLookupId64 = Bytes.random(64);
+  private MessageFrame messageFrame;
+  private final String DEFAULT_OUTPUT = "0x01";
+  final String PAYLOAD_TEST_PRIVACY_GROUP_ID = "8lDVI66RZHIrBsolz6Kn88Rd+WsJ4hUjb4hsh29xW/o=";
+  private final WorldStateArchive worldStateArchive = mock(WorldStateArchive.class);
+  final PrivateStateStorage privateStateStorage = mock(PrivateStateStorage.class);
+  final PrivateStateRootResolver privateStateRootResolver =
+      new PrivateStateRootResolver(privateStateStorage);
+
+  PrivateStateGenesisAllocator privateStateGenesisAllocator =
+      mock(PrivateStateGenesisAllocator.class);
+
+  private PrivateTransactionProcessor mockPrivateTxProcessor(
+      final TransactionProcessingResult result) {
+    final PrivateTransactionProcessor mockPrivateTransactionProcessor =
+        mock(PrivateTransactionProcessor.class);
+    when(mockPrivateTransactionProcessor.processTransaction(
+            nullable(WorldUpdater.class),
+            nullable(WorldUpdater.class),
+            nullable(ProcessableBlockHeader.class),
+            nullable((Hash.class)),
+            nullable(PrivateTransaction.class),
+            nullable(Address.class),
+            nullable(OperationTracer.class),
+            nullable(BlockHashLookup.class),
+            nullable(Bytes.class)))
+        .thenReturn(result);
+
+    return mockPrivateTransactionProcessor;
+  }
+
+  @Before
+  public void setUp() {
+    final MutableWorldState mutableWorldState = mock(MutableWorldState.class);
+    when(mutableWorldState.updater()).thenReturn(mock(WorldUpdater.class));
+    when(worldStateArchive.getMutable()).thenReturn(mutableWorldState);
+    when(worldStateArchive.getMutable(any(), any())).thenReturn(Optional.of(mutableWorldState));
+
+    final PrivateStateStorage.Updater storageUpdater = mock(PrivateStateStorage.Updater.class);
+    when(privateStateStorage.getPrivacyGroupHeadBlockMap(any()))
+        .thenReturn(Optional.of(PrivacyGroupHeadBlockMap.empty()));
+    when(privateStateStorage.getPrivateBlockMetadata(any(), any())).thenReturn(Optional.empty());
+    when(storageUpdater.putPrivateBlockMetadata(
+            nullable(Bytes32.class), nullable(Bytes32.class), any()))
+        .thenReturn(storageUpdater);
+    when(storageUpdater.putPrivacyGroupHeadBlockMap(nullable(Bytes32.class), any()))
+        .thenReturn(storageUpdater);
+    when(storageUpdater.putTransactionReceipt(
+            nullable(Bytes32.class), nullable(Bytes32.class), any()))
+        .thenReturn(storageUpdater);
+    when(privateStateStorage.updater()).thenReturn(storageUpdater);
+
+    messageFrame = mock(MessageFrame.class);
+    final BlockDataGenerator blockGenerator = new BlockDataGenerator();
+    final Block genesis = blockGenerator.genesisBlock();
+    final Block block =
+        blockGenerator.block(
+            new BlockDataGenerator.BlockOptions().setParentHash(genesis.getHeader().getHash()));
+    when(messageFrame.getBlockValues()).thenReturn(block.getHeader());
+    final PrivateMetadataUpdater privateMetadataUpdater = mock(PrivateMetadataUpdater.class);
+    final PrivacyGroupHeadBlockMap privacyGroupHeadBlockMap = mock(PrivacyGroupHeadBlockMap.class);
+    when(messageFrame.getContextVariable(KEY_PRIVATE_METADATA_UPDATER))
+        .thenReturn(privateMetadataUpdater);
+    when(messageFrame.hasContextVariable(KEY_PRIVATE_METADATA_UPDATER)).thenReturn(true);
+    when(messageFrame.getContextVariable(KEY_IS_PERSISTING_PRIVATE_STATE, false)).thenReturn(false);
+    when(privateMetadataUpdater.getPrivacyGroupHeadBlockMap()).thenReturn(privacyGroupHeadBlockMap);
+  }
+
+  @Test
+  public void testPayloadFoundInEnclaveWith32ByteResult() {
+    final Enclave enclave = mock(Enclave.class);
+    final FlexiblePrivacyPrecompiledContract contract = buildPrivacyPrecompiledContract(enclave);
+    final List<Log> logs = new ArrayList<>();
+    contract.setPrivateTransactionProcessor(
+        mockPrivateTxProcessor(
+            TransactionProcessingResult.successful(
+                logs, 0, 0, Bytes.fromHexString(DEFAULT_OUTPUT), null)));
+
+    final VersionedPrivateTransaction versionedPrivateTransaction =
+        versionedPrivateTransactionBesu();
+    final byte[] payload = convertVersionedPrivateTransactionToBytes(versionedPrivateTransaction);
+    final String privateFrom =
+        versionedPrivateTransaction.getPrivateTransaction().getPrivateFrom().toBase64String();
+
+    final ReceiveResponse response =
+        new ReceiveResponse(payload, PAYLOAD_TEST_PRIVACY_GROUP_ID, privateFrom);
+    when(enclave.receive(any())).thenReturn(response);
+
+    final FlexiblePrivacyPrecompiledContract contractSpy = spy(contract);
+    Mockito.doReturn(true)
+        .when(contractSpy)
+        .canExecute(any(), any(), any(), any(), any(), any(), any(), any());
+
+    final PrecompiledContract.PrecompileContractResult result =
+        contractSpy.computePrecompile(privateTransactionLookupId, messageFrame);
+    final Bytes actual = result.getOutput();
+
+    assertThat(actual).isEqualTo(Bytes.fromHexString(DEFAULT_OUTPUT));
+  }
+
+  @Test
+  public void testPayloadFoundInEnclaveWith64ByteResult() {
+    final Enclave enclave = mock(Enclave.class);
+    final FlexiblePrivacyPrecompiledContract contract = buildPrivacyPrecompiledContract(enclave);
+    final List<Log> logs = new ArrayList<>();
+    contract.setPrivateTransactionProcessor(
+        mockPrivateTxProcessor(
+            TransactionProcessingResult.successful(
+                logs, 0, 0, Bytes.fromHexString(DEFAULT_OUTPUT), null)));
+
+    final VersionedPrivateTransaction versionedPrivateTransaction =
+        versionedPrivateTransactionBesu();
+    final byte[] payload = convertVersionedPrivateTransactionToBytes(versionedPrivateTransaction);
+    final String privateFrom =
+        versionedPrivateTransaction.getPrivateTransaction().getPrivateFrom().toBase64String();
+
+    final ReceiveResponse response =
+        new ReceiveResponse(payload, PAYLOAD_TEST_PRIVACY_GROUP_ID, privateFrom);
+    when(enclave.receive(any())).thenReturn(response);
+
+    final FlexiblePrivacyPrecompiledContract contractSpy = spy(contract);
+    Mockito.doReturn(true)
+        .when(contractSpy)
+        .canExecute(any(), any(), any(), any(), any(), any(), any(), any());
+
+    final PrecompiledContract.PrecompileContractResult result =
+        contractSpy.computePrecompile(privateTransactionLookupId64, messageFrame);
+    final Bytes actual = result.getOutput();
+
+    assertThat(actual).isEqualTo(Bytes.fromHexString(DEFAULT_OUTPUT));
+  }
+
+  @Test
+  public void testPayloadNotFoundInEnclave() {
+    final Enclave enclave = mock(Enclave.class);
+    final PrivacyPrecompiledContract contract = buildPrivacyPrecompiledContract(enclave);
+
+    when(enclave.receive(any(String.class))).thenThrow(EnclaveClientException.class);
+
+    final PrecompiledContract.PrecompileContractResult result =
+        contract.computePrecompile(privateTransactionLookupId, messageFrame);
+    final Bytes actual = result.getOutput();
+
+    assertThat(actual).isEqualTo(Bytes.EMPTY);
+  }
+
+  @Test
+  public void testPayloadNull() {
+    final Enclave enclave = mock(Enclave.class);
+    final PrivacyPrecompiledContract contract = buildPrivacyPrecompiledContract(enclave);
+
+    final PrecompiledContract.PrecompileContractResult result =
+        contract.computePrecompile(null, messageFrame);
+    final Bytes actual = result.getOutput();
+
+    assertThat(actual).isEqualTo(Bytes.EMPTY);
+  }
+
+  @Test
+  public void testPayloadLessThan32Bytes() {
+    final Enclave enclave = mock(Enclave.class);
+    final PrivacyPrecompiledContract contract = buildPrivacyPrecompiledContract(enclave);
+
+    final PrecompiledContract.PrecompileContractResult result =
+        contract.computePrecompile(privateTransactionLookupId.slice(10), messageFrame);
+    final Bytes actual = result.getOutput();
+
+    assertThat(actual).isEqualTo(Bytes.EMPTY);
+  }
+
+  @Test
+  public void testPayloadMoreThan32LessThan64Bytes() {
+    final Enclave enclave = mock(Enclave.class);
+    final PrivacyPrecompiledContract contract = buildPrivacyPrecompiledContract(enclave);
+
+    final PrecompiledContract.PrecompileContractResult result =
+        contract.computePrecompile(privateTransactionLookupId64.slice(40), messageFrame);
+    final Bytes actual = result.getOutput();
+
+    assertThat(actual).isEqualTo(Bytes.EMPTY);
+  }
+
+  @Test
+  public void testEnclaveDown() {
+    final Enclave enclave = mock(Enclave.class);
+    final PrivacyPrecompiledContract contract = buildPrivacyPrecompiledContract(enclave);
+
+    when(enclave.receive(any(String.class))).thenThrow(new RuntimeException());
+
+    assertThatThrownBy(() -> contract.computePrecompile(privateTransactionLookupId, messageFrame))
+        .isInstanceOf(RuntimeException.class);
+  }
+
+  @Test
+  public void testEnclaveBelowRequiredVersion() {
+    final Enclave enclave = mock(Enclave.class);
+    final FlexiblePrivacyPrecompiledContract contract = buildPrivacyPrecompiledContract(enclave);
+    final VersionedPrivateTransaction versionedPrivateTransaction =
+        versionedPrivateTransactionBesu();
+    final byte[] payload = convertVersionedPrivateTransactionToBytes(versionedPrivateTransaction);
+
+    final ReceiveResponse responseWithoutSenderKey =
+        new ReceiveResponse(payload, PAYLOAD_TEST_PRIVACY_GROUP_ID, null);
+    when(enclave.receive(eq(privateTransactionLookupId.toBase64String())))
+        .thenReturn(responseWithoutSenderKey);
+
+    assertThatThrownBy(() -> contract.computePrecompile(privateTransactionLookupId, messageFrame))
+        .isInstanceOf(EnclaveConfigurationException.class)
+        .hasMessage("Incompatible Orion version. Orion version must be 1.6.0 or greater.");
+  }
+
+  @Test
+  public void testPayloadNotMatchingPrivateFrom() {
+    final Enclave enclave = mock(Enclave.class);
+    final FlexiblePrivacyPrecompiledContract contract = buildPrivacyPrecompiledContract(enclave);
+    final VersionedPrivateTransaction versionedPrivateTransaction =
+        versionedPrivateTransactionBesu();
+    final byte[] payload = convertVersionedPrivateTransactionToBytes(versionedPrivateTransaction);
+
+    final String wrongSenderKey = Bytes.random(32).toBase64String();
+    final ReceiveResponse responseWithWrongSenderKey =
+        new ReceiveResponse(payload, PAYLOAD_TEST_PRIVACY_GROUP_ID, wrongSenderKey);
+    when(enclave.receive(eq(privateTransactionLookupId.toBase64String())))
+        .thenReturn(responseWithWrongSenderKey);
+
+    final PrecompiledContract.PrecompileContractResult result =
+        contract.computePrecompile(privateTransactionLookupId, messageFrame);
+    final Bytes actual = result.getOutput();
+
+    assertThat(actual).isEqualTo(Bytes.EMPTY);
+  }
+
+  @Test
+  public void testPrivateFromNotMemberOfGroup() {
+    // array length too big
+    assertThatComputeReturnsEmptyGivenContractMembershipQueryReturns(
+        Bytes.concatenate(
+            // offset
+            Bytes32.fromHexStringLenient("0x0"),
+            // array length
+            Bytes32.fromHexStringLenient("0x1"),
+            // offset
+            Bytes32.fromHexStringLenient("0x0"),
+            // member public key size
+            Bytes32.fromHexStringLenient("0x20"),
+            // first array content
+            Bytes32.fromHexStringLenient("0x1")));
+  }
+
+  @Test
+  public void testInvalidResponseToMembershipQuery() {
+    // response shorter than empty array response
+    assertThatComputeReturnsEmptyGivenContractMembershipQueryReturns(
+        Bytes32.fromHexStringLenient("0x0"));
+
+    // array length too big
+    assertThatComputeReturnsEmptyGivenContractMembershipQueryReturns(
+        Bytes.concatenate(
+            // offset to start of array
+            Bytes32.fromHexStringLenient("0x0"),
+            // array length
+            Bytes32.fromHexStringLenient("0x2"),
+            // offset
+            Bytes32.fromHexStringLenient("0x0"),
+            // member public key size
+            Bytes32.fromHexStringLenient("0x20"),
+            // first array content
+            Bytes32.fromHexStringLenient("0x1")));
+  }
+
+  private void assertThatComputeReturnsEmptyGivenContractMembershipQueryReturns(
+      final Bytes memberList) {
+    final Enclave enclave = mock(Enclave.class);
+    final FlexiblePrivacyPrecompiledContract contract = buildPrivacyPrecompiledContract(enclave);
+
+    final List<Log> logs = new ArrayList<>();
+    contract.setPrivateTransactionProcessor(
+        mockPrivateTxProcessor(
+            TransactionProcessingResult.successful(logs, 0, 0, memberList, null)));
+
+    final FlexiblePrivacyPrecompiledContract contractSpy = spy(contract);
+    Mockito.doReturn(false).when(contractSpy).isContractLocked(any(), any());
+    Mockito.doReturn(true)
+        .when(contractSpy)
+        .flexiblePrivacyGroupVersionMatches(any(), any(), any());
+
+    final VersionedPrivateTransaction privateTransaction = versionedPrivateTransactionBesu();
+    final byte[] payload = convertVersionedPrivateTransactionToBytes(privateTransaction);
+    final String privateFrom =
+        privateTransaction.getPrivateTransaction().getPrivateFrom().toBase64String();
+
+    final ReceiveResponse response =
+        new ReceiveResponse(payload, PAYLOAD_TEST_PRIVACY_GROUP_ID, privateFrom);
+    when(enclave.receive(any(String.class))).thenReturn(response);
+
+    final PrecompiledContract.PrecompileContractResult result =
+        contractSpy.computePrecompile(privateTransactionLookupId, messageFrame);
+    final Bytes actual = result.getOutput();
+
+    assertThat(actual).isEqualTo(Bytes.EMPTY);
+  }
+
+  @Test
+  public void testInvalidPrivateTransaction() {
+    final Enclave enclave = mock(Enclave.class);
+
+    final FlexiblePrivacyPrecompiledContract contract =
+        new FlexiblePrivacyPrecompiledContract(
+            new SpuriousDragonGasCalculator(),
+            enclave,
+            worldStateArchive,
+            privateStateRootResolver,
+            privateStateGenesisAllocator);
+
+    contract.setPrivateTransactionProcessor(
+        mockPrivateTxProcessor(
+            TransactionProcessingResult.invalid(
+                ValidationResult.invalid(TransactionInvalidReason.NONCE_TOO_HIGH))));
+
+    final FlexiblePrivacyPrecompiledContract contractSpy = spy(contract);
+    Mockito.doReturn(true)
+        .when(contractSpy)
+        .canExecute(any(), any(), any(), any(), any(), any(), any(), any());
+
+    final VersionedPrivateTransaction privateTransaction = versionedPrivateTransactionBesu();
+    final byte[] payload = convertVersionedPrivateTransactionToBytes(privateTransaction);
+    final String privateFrom =
+        privateTransaction.getPrivateTransaction().getPrivateFrom().toBase64String();
+
+    final ReceiveResponse response =
+        new ReceiveResponse(payload, PAYLOAD_TEST_PRIVACY_GROUP_ID, privateFrom);
+
+    when(enclave.receive(any(String.class))).thenReturn(response);
+
+    final PrecompiledContract.PrecompileContractResult result =
+        contractSpy.computePrecompile(privateTransactionLookupId, messageFrame);
+    final Bytes actual = result.getOutput();
+
+    assertThat(actual).isEqualTo(Bytes.EMPTY);
+  }
+
+  private byte[] convertVersionedPrivateTransactionToBytes(
+      final VersionedPrivateTransaction privateTransaction) {
+    final BytesValueRLPOutput bytesValueRLPOutput = new BytesValueRLPOutput();
+    privateTransaction.writeTo(bytesValueRLPOutput);
+
+    return bytesValueRLPOutput.encoded().toBase64String().getBytes(UTF_8);
+  }
+
+  private FlexiblePrivacyPrecompiledContract buildPrivacyPrecompiledContract(
+      final Enclave enclave) {
+    return new FlexiblePrivacyPrecompiledContract(
+        new SpuriousDragonGasCalculator(),
+        enclave,
+        worldStateArchive,
+        privateStateRootResolver,
+        privateStateGenesisAllocator);
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/OnChainPrivacyPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/OnChainPrivacyPrecompiledContractTest.java
deleted file mode 100644
index e0cfa83d7e0..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/OnChainPrivacyPrecompiledContractTest.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.mainnet.precompiles.privacy;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.hyperledger.besu.ethereum.core.PrivateTransactionDataFixture.versionedPrivateTransactionBesu;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.enclave.Enclave;
-import org.hyperledger.besu.enclave.EnclaveClientException;
-import org.hyperledger.besu.enclave.EnclaveConfigurationException;
-import org.hyperledger.besu.enclave.types.ReceiveResponse;
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Log;
-import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.mainnet.SpuriousDragonGasCalculator;
-import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
-import org.hyperledger.besu.ethereum.privacy.PrivateStateRootResolver;
-import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
-import org.hyperledger.besu.ethereum.privacy.PrivateTransactionProcessor;
-import org.hyperledger.besu.ethereum.privacy.VersionedPrivateTransaction;
-import org.hyperledger.besu.ethereum.privacy.storage.PrivacyGroupHeadBlockMap;
-import org.hyperledger.besu.ethereum.privacy.storage.PrivateMetadataUpdater;
-import org.hyperledger.besu.ethereum.privacy.storage.PrivateStateStorage;
-import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
-import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
-import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.OperationTracer;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.mockito.Mockito;
-
-public class OnChainPrivacyPrecompiledContractTest {
-
-  @Rule public final TemporaryFolder temp = new TemporaryFolder();
-
-  private final Bytes privateTransactionLookupId = Bytes.random(32);
-  private MessageFrame messageFrame;
-  private Blockchain blockchain;
-  private final String DEFAULT_OUTPUT = "0x01";
-  final String PAYLOAD_TEST_PRIVACY_GROUP_ID = "8lDVI66RZHIrBsolz6Kn88Rd+WsJ4hUjb4hsh29xW/o=";
-  private final WorldStateArchive worldStateArchive = mock(WorldStateArchive.class);
-  final PrivateStateStorage privateStateStorage = mock(PrivateStateStorage.class);
-  final PrivateStateRootResolver privateStateRootResolver =
-      new PrivateStateRootResolver(privateStateStorage);
-
-  private PrivateTransactionProcessor mockPrivateTxProcessor(
-      final TransactionProcessingResult result) {
-    final PrivateTransactionProcessor mockPrivateTransactionProcessor =
-        mock(PrivateTransactionProcessor.class);
-    when(mockPrivateTransactionProcessor.processTransaction(
-            nullable(Blockchain.class),
-            nullable(WorldUpdater.class),
-            nullable(WorldUpdater.class),
-            nullable(ProcessableBlockHeader.class),
-            nullable((Hash.class)),
-            nullable(PrivateTransaction.class),
-            nullable(Address.class),
-            nullable(OperationTracer.class),
-            nullable(BlockHashLookup.class),
-            nullable(Bytes.class)))
-        .thenReturn(result);
-
-    return mockPrivateTransactionProcessor;
-  }
-
-  @Before
-  public void setUp() {
-    final MutableWorldState mutableWorldState = mock(MutableWorldState.class);
-    when(mutableWorldState.updater()).thenReturn(mock(WorldUpdater.class));
-    when(worldStateArchive.getMutable()).thenReturn(mutableWorldState);
-    when(worldStateArchive.getMutable(any())).thenReturn(Optional.of(mutableWorldState));
-
-    final PrivateStateStorage.Updater storageUpdater = mock(PrivateStateStorage.Updater.class);
-    when(privateStateStorage.getPrivacyGroupHeadBlockMap(any()))
-        .thenReturn(Optional.of(PrivacyGroupHeadBlockMap.empty()));
-    when(privateStateStorage.getPrivateBlockMetadata(any(), any())).thenReturn(Optional.empty());
-    when(storageUpdater.putPrivateBlockMetadata(
-            nullable(Bytes32.class), nullable(Bytes32.class), any()))
-        .thenReturn(storageUpdater);
-    when(storageUpdater.putPrivacyGroupHeadBlockMap(nullable(Bytes32.class), any()))
-        .thenReturn(storageUpdater);
-    when(storageUpdater.putTransactionReceipt(
-            nullable(Bytes32.class), nullable(Bytes32.class), any()))
-        .thenReturn(storageUpdater);
-    when(privateStateStorage.updater()).thenReturn(storageUpdater);
-
-    messageFrame = mock(MessageFrame.class);
-    blockchain = mock(Blockchain.class);
-    final BlockDataGenerator blockGenerator = new BlockDataGenerator();
-    final Block genesis = blockGenerator.genesisBlock();
-    final Block block =
-        blockGenerator.block(
-            new BlockDataGenerator.BlockOptions().setParentHash(genesis.getHeader().getHash()));
-    when(blockchain.getGenesisBlock()).thenReturn(genesis);
-    when(blockchain.getBlockByHash(block.getHash())).thenReturn(Optional.of(block));
-    when(blockchain.getBlockByHash(genesis.getHash())).thenReturn(Optional.of(genesis));
-    when(messageFrame.getBlockchain()).thenReturn(blockchain);
-    when(messageFrame.getBlockHeader()).thenReturn(block.getHeader());
-    final PrivateMetadataUpdater privateMetadataUpdater = mock(PrivateMetadataUpdater.class);
-    final PrivacyGroupHeadBlockMap privacyGroupHeadBlockMap = mock(PrivacyGroupHeadBlockMap.class);
-    when(messageFrame.getPrivateMetadataUpdater()).thenReturn(privateMetadataUpdater);
-    when(privateMetadataUpdater.getPrivacyGroupHeadBlockMap()).thenReturn(privacyGroupHeadBlockMap);
-  }
-
-  @Test
-  public void testPayloadFoundInEnclave() {
-    final Enclave enclave = mock(Enclave.class);
-    final OnChainPrivacyPrecompiledContract contract = buildPrivacyPrecompiledContract(enclave);
-    final List<Log> logs = new ArrayList<>();
-    contract.setPrivateTransactionProcessor(
-        mockPrivateTxProcessor(
-            TransactionProcessingResult.successful(
-                logs, 0, 0, Bytes.fromHexString(DEFAULT_OUTPUT), null)));
-
-    final VersionedPrivateTransaction versionedPrivateTransaction =
-        versionedPrivateTransactionBesu();
-    final byte[] payload = convertVersionedPrivateTransactionToBytes(versionedPrivateTransaction);
-    final String privateFrom =
-        versionedPrivateTransaction.getPrivateTransaction().getPrivateFrom().toBase64String();
-
-    final ReceiveResponse response =
-        new ReceiveResponse(payload, PAYLOAD_TEST_PRIVACY_GROUP_ID, privateFrom);
-    when(enclave.receive(any())).thenReturn(response);
-
-    final OnChainPrivacyPrecompiledContract contractSpy = spy(contract);
-    Mockito.doNothing().when(contractSpy).maybeInjectDefaultManagementAndProxy(any(), any(), any());
-    Mockito.doReturn(true)
-        .when(contractSpy)
-        .canExecute(any(), any(), any(), any(), any(), any(), any(), any(), any(), any());
-
-    final Bytes actual = contractSpy.compute(privateTransactionLookupId, messageFrame);
-
-    assertThat(actual).isEqualTo(Bytes.fromHexString(DEFAULT_OUTPUT));
-  }
-
-  @Test
-  public void testPayloadNotFoundInEnclave() {
-    final Enclave enclave = mock(Enclave.class);
-    final PrivacyPrecompiledContract contract = buildPrivacyPrecompiledContract(enclave);
-
-    when(enclave.receive(any(String.class))).thenThrow(EnclaveClientException.class);
-
-    final Bytes expected = contract.compute(privateTransactionLookupId, messageFrame);
-    assertThat(expected).isEqualTo(Bytes.EMPTY);
-  }
-
-  @Test(expected = RuntimeException.class)
-  public void testEnclaveDown() {
-    final Enclave enclave = mock(Enclave.class);
-    final PrivacyPrecompiledContract contract = buildPrivacyPrecompiledContract(enclave);
-
-    when(enclave.receive(any(String.class))).thenThrow(new RuntimeException());
-
-    contract.compute(privateTransactionLookupId, messageFrame);
-  }
-
-  @Test
-  public void testEnclaveBelowRequiredVersion() {
-    final Enclave enclave = mock(Enclave.class);
-    final OnChainPrivacyPrecompiledContract contract = buildPrivacyPrecompiledContract(enclave);
-    final VersionedPrivateTransaction versionedPrivateTransaction =
-        versionedPrivateTransactionBesu();
-    final byte[] payload = convertVersionedPrivateTransactionToBytes(versionedPrivateTransaction);
-
-    final ReceiveResponse responseWithoutSenderKey =
-        new ReceiveResponse(payload, PAYLOAD_TEST_PRIVACY_GROUP_ID, null);
-    when(enclave.receive(eq(privateTransactionLookupId.toBase64String())))
-        .thenReturn(responseWithoutSenderKey);
-
-    assertThatThrownBy(() -> contract.compute(privateTransactionLookupId, messageFrame))
-        .isInstanceOf(EnclaveConfigurationException.class)
-        .hasMessage("Incompatible Orion version. Orion version must be 1.6.0 or greater.");
-  }
-
-  @Test
-  public void testPayloadNotMatchingPrivateFrom() {
-    final Enclave enclave = mock(Enclave.class);
-    final OnChainPrivacyPrecompiledContract contract = buildPrivacyPrecompiledContract(enclave);
-    final VersionedPrivateTransaction versionedPrivateTransaction =
-        versionedPrivateTransactionBesu();
-    final byte[] payload = convertVersionedPrivateTransactionToBytes(versionedPrivateTransaction);
-
-    final String wrongSenderKey = Bytes.random(32).toBase64String();
-    final ReceiveResponse responseWithWrongSenderKey =
-        new ReceiveResponse(payload, PAYLOAD_TEST_PRIVACY_GROUP_ID, wrongSenderKey);
-    when(enclave.receive(eq(privateTransactionLookupId.toBase64String())))
-        .thenReturn(responseWithWrongSenderKey);
-
-    final Bytes expected = contract.compute(privateTransactionLookupId, messageFrame);
-    assertThat(expected).isEqualTo(Bytes.EMPTY);
-  }
-
-  @Test
-  public void testPrivateFromNotMemberOfGroup() {
-    final Enclave enclave = mock(Enclave.class);
-    final OnChainPrivacyPrecompiledContract contract = buildPrivacyPrecompiledContract(enclave);
-    final OnChainPrivacyPrecompiledContract contractSpy = spy(contract);
-    Mockito.doNothing().when(contractSpy).maybeInjectDefaultManagementAndProxy(any(), any(), any());
-    Mockito.doReturn(false)
-        .when(contractSpy)
-        .isContractLocked(any(), any(), any(), any(), any(), any(), any());
-    Mockito.doReturn(true)
-        .when(contractSpy)
-        .onChainPrivacyGroupVersionMatches(any(), any(), any(), any(), any(), any(), any(), any());
-    final TransactionProcessingResult mockResult = mock(TransactionProcessingResult.class);
-    Mockito.doReturn(mockResult)
-        .when(contractSpy)
-        .simulateTransaction(any(), any(), any(), any(), any(), any(), any(), any());
-    Mockito.doReturn(Arrays.asList(Bytes.ofUnsignedInt(1L)))
-        .when(contractSpy)
-        .getMembersFromResult(any());
-
-    final VersionedPrivateTransaction privateTransaction = versionedPrivateTransactionBesu();
-    final byte[] payload = convertVersionedPrivateTransactionToBytes(privateTransaction);
-    final String privateFrom =
-        privateTransaction.getPrivateTransaction().getPrivateFrom().toBase64String();
-
-    final ReceiveResponse response =
-        new ReceiveResponse(payload, PAYLOAD_TEST_PRIVACY_GROUP_ID, privateFrom);
-    when(enclave.receive(any(String.class))).thenReturn(response);
-
-    final Bytes actual = contractSpy.compute(privateTransactionLookupId, messageFrame);
-
-    assertThat(actual).isEqualTo(Bytes.EMPTY);
-  }
-
-  @Test
-  public void testInvalidPrivateTransaction() {
-    final Enclave enclave = mock(Enclave.class);
-
-    final OnChainPrivacyPrecompiledContract contract =
-        new OnChainPrivacyPrecompiledContract(
-            new SpuriousDragonGasCalculator(),
-            enclave,
-            worldStateArchive,
-            privateStateRootResolver);
-
-    contract.setPrivateTransactionProcessor(
-        mockPrivateTxProcessor(
-            TransactionProcessingResult.invalid(
-                ValidationResult.invalid(TransactionInvalidReason.INCORRECT_NONCE))));
-
-    final OnChainPrivacyPrecompiledContract contractSpy = spy(contract);
-    Mockito.doNothing().when(contractSpy).maybeInjectDefaultManagementAndProxy(any(), any(), any());
-    Mockito.doReturn(true)
-        .when(contractSpy)
-        .canExecute(any(), any(), any(), any(), any(), any(), any(), any(), any(), any());
-
-    final VersionedPrivateTransaction privateTransaction = versionedPrivateTransactionBesu();
-    final byte[] payload = convertVersionedPrivateTransactionToBytes(privateTransaction);
-    final String privateFrom =
-        privateTransaction.getPrivateTransaction().getPrivateFrom().toBase64String();
-
-    final ReceiveResponse response =
-        new ReceiveResponse(payload, PAYLOAD_TEST_PRIVACY_GROUP_ID, privateFrom);
-
-    when(enclave.receive(any(String.class))).thenReturn(response);
-
-    final Bytes actual = contractSpy.compute(privateTransactionLookupId, messageFrame);
-
-    assertThat(actual).isEqualTo(Bytes.EMPTY);
-  }
-
-  private byte[] convertVersionedPrivateTransactionToBytes(
-      final VersionedPrivateTransaction privateTransaction) {
-    final BytesValueRLPOutput bytesValueRLPOutput = new BytesValueRLPOutput();
-    privateTransaction.writeTo(bytesValueRLPOutput);
-
-    return bytesValueRLPOutput.encoded().toBase64String().getBytes(UTF_8);
-  }
-
-  private OnChainPrivacyPrecompiledContract buildPrivacyPrecompiledContract(final Enclave enclave) {
-    return new OnChainPrivacyPrecompiledContract(
-        new SpuriousDragonGasCalculator(), enclave, worldStateArchive, privateStateRootResolver);
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPluginPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPluginPrecompiledContractTest.java
new file mode 100644
index 00000000000..b8081492a58
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPluginPrecompiledContractTest.java
@@ -0,0 +1,213 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.mainnet.precompiles.privacy;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.core.PrivateTransactionDataFixture.privateTransactionBesu;
+import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_IS_PERSISTING_PRIVATE_STATE;
+import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_PRIVATE_METADATA_UPDATER;
+import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_TRANSACTION;
+import static org.hyperledger.besu.ethereum.privacy.PrivateTransaction.readFrom;
+import static org.hyperledger.besu.ethereum.privacy.PrivateTransaction.serialize;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.enclave.EnclaveFactory;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.InMemoryPrivacyStorageProvider;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
+import org.hyperledger.besu.ethereum.privacy.PrivateTransactionProcessor;
+import org.hyperledger.besu.ethereum.privacy.storage.PrivacyGroupHeadBlockMap;
+import org.hyperledger.besu.ethereum.privacy.storage.PrivateMetadataUpdater;
+import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.SpuriousDragonGasCalculator;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.precompile.PrecompiledContract;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+import org.hyperledger.besu.plugin.data.PrivacyGenesis;
+import org.hyperledger.besu.plugin.services.PrivacyPluginService;
+import org.hyperledger.besu.plugin.services.privacy.PrivacyGroupAuthProvider;
+import org.hyperledger.besu.plugin.services.privacy.PrivacyGroupGenesisProvider;
+import org.hyperledger.besu.plugin.services.privacy.PrivacyPluginPayloadProvider;
+import org.hyperledger.besu.plugin.services.privacy.PrivateMarkerTransactionFactory;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Before;
+import org.junit.Test;
+
+public class PrivacyPluginPrecompiledContractTest {
+  private final String DEFAULT_OUTPUT = "0x01";
+
+  MessageFrame messageFrame;
+
+  PrivacyPluginPrecompiledContract contract;
+
+  @Before
+  public void setup() {
+    messageFrame = mock(MessageFrame.class);
+
+    final BlockDataGenerator blockGenerator = new BlockDataGenerator();
+    final Block genesis = blockGenerator.genesisBlock();
+    final Block block =
+        blockGenerator.block(
+            new BlockDataGenerator.BlockOptions().setParentHash(genesis.getHeader().getHash()));
+
+    when(messageFrame.getContextVariable(KEY_IS_PERSISTING_PRIVATE_STATE, false)).thenReturn(false);
+    when(messageFrame.hasContextVariable(KEY_PRIVATE_METADATA_UPDATER)).thenReturn(true);
+    when(messageFrame.getContextVariable(KEY_PRIVATE_METADATA_UPDATER))
+        .thenReturn(mock(PrivateMetadataUpdater.class));
+    when(messageFrame.getBlockValues()).thenReturn(block.getHeader());
+
+    final PrivateMetadataUpdater privateMetadataUpdater = mock(PrivateMetadataUpdater.class);
+    when(messageFrame.hasContextVariable(KEY_PRIVATE_METADATA_UPDATER)).thenReturn(true);
+    when(messageFrame.getContextVariable(KEY_PRIVATE_METADATA_UPDATER))
+        .thenReturn(privateMetadataUpdater);
+    when(privateMetadataUpdater.getPrivacyGroupHeadBlockMap())
+        .thenReturn(PrivacyGroupHeadBlockMap.empty());
+
+    contract =
+        new PrivacyPluginPrecompiledContract(
+            new SpuriousDragonGasCalculator(),
+            new PrivacyParameters.Builder()
+                .setEnabled(true)
+                .setPrivacyPluginEnabled(true)
+                .setStorageProvider(new InMemoryPrivacyStorageProvider())
+                .setPrivacyService(
+                    new PrivacyPluginService() {
+                      @Override
+                      public void setPayloadProvider(final PrivacyPluginPayloadProvider provider) {}
+
+                      @Override
+                      public PrivacyPluginPayloadProvider getPayloadProvider() {
+                        return new PrivacyPluginPayloadProvider() {
+                          @Override
+                          public Bytes generateMarkerPayload(
+                              final org.hyperledger.besu.plugin.data.PrivateTransaction
+                                  privateTransaction,
+                              final String privacyUserId) {
+                            return serialize(privateTransaction).encoded();
+                          }
+
+                          @Override
+                          public Optional<org.hyperledger.besu.plugin.data.PrivateTransaction>
+                              getPrivateTransactionFromPayload(
+                                  final org.hyperledger.besu.plugin.data.Transaction transaction) {
+                            final BytesValueRLPInput bytesValueRLPInput =
+                                new BytesValueRLPInput(transaction.getPayload(), false);
+                            return Optional.of(readFrom(bytesValueRLPInput));
+                          }
+                        };
+                      }
+
+                      @Override
+                      public void setPrivacyGroupAuthProvider(
+                          final PrivacyGroupAuthProvider privacyGroupAuthProvider) {}
+
+                      @Override
+                      public PrivacyGroupAuthProvider getPrivacyGroupAuthProvider() {
+                        return (privacyGroupId, privacyUserId, blockNumber) -> true;
+                      }
+
+                      @Override
+                      public void setPrivacyGroupGenesisProvider(
+                          final PrivacyGroupGenesisProvider privacyGroupAuthProvider) {}
+
+                      @Override
+                      public PrivacyGroupGenesisProvider getPrivacyGroupGenesisProvider() {
+                        return (privacyGroupId, blockNumber) ->
+                            (PrivacyGenesis) Collections::emptyList;
+                      }
+
+                      @Override
+                      public PrivateMarkerTransactionFactory getPrivateMarkerTransactionFactory() {
+                        return null;
+                      }
+
+                      @Override
+                      public void setPrivateMarkerTransactionFactory(
+                          final PrivateMarkerTransactionFactory privateMarkerTransactionFactory) {}
+                    })
+                .setEnclaveFactory(mock(EnclaveFactory.class))
+                .build());
+  }
+
+  @Test
+  public void testPayloadFoundInPayloadOfMarker() {
+    final List<Log> logs = new ArrayList<>();
+    contract.setPrivateTransactionProcessor(
+        mockPrivateTxProcessor(
+            TransactionProcessingResult.successful(
+                logs, 0, 0, Bytes.fromHexString(DEFAULT_OUTPUT), null)));
+
+    final PrivateTransaction privateTransaction = privateTransactionBesu();
+
+    final Bytes payload = convertPrivateTransactionToBytes(privateTransaction);
+
+    final Transaction transaction =
+        Transaction.builder().payload(payload).gasPrice(Wei.ZERO).build();
+
+    when(messageFrame.getContextVariable(KEY_TRANSACTION)).thenReturn(transaction);
+
+    final PrecompiledContract.PrecompileContractResult result =
+        contract.computePrecompile(payload, messageFrame);
+    final Bytes actual = result.getOutput();
+
+    assertThat(actual).isEqualTo(Bytes.fromHexString(DEFAULT_OUTPUT));
+  }
+
+  private Bytes convertPrivateTransactionToBytes(final PrivateTransaction privateTransaction) {
+    final BytesValueRLPOutput bytesValueRLPOutput = new BytesValueRLPOutput();
+    privateTransaction.writeTo(bytesValueRLPOutput);
+
+    return bytesValueRLPOutput.encoded();
+  }
+
+  private PrivateTransactionProcessor mockPrivateTxProcessor(
+      final TransactionProcessingResult result) {
+    final PrivateTransactionProcessor mockPrivateTransactionProcessor =
+        mock(PrivateTransactionProcessor.class);
+    when(mockPrivateTransactionProcessor.processTransaction(
+            nullable(WorldUpdater.class),
+            nullable(WorldUpdater.class),
+            nullable(ProcessableBlockHeader.class),
+            nullable((Hash.class)),
+            nullable(PrivateTransaction.class),
+            nullable(Address.class),
+            nullable(OperationTracer.class),
+            nullable(BlockHashLookup.class),
+            nullable(Bytes.class)))
+        .thenReturn(result);
+
+    return mockPrivateTransactionProcessor;
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContractTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContractTest.java
index 4c44fe36793..81d9d7e20cb 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContractTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContractTest.java
@@ -19,6 +19,8 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.hyperledger.besu.ethereum.core.PrivateTransactionDataFixture.VALID_BASE64_ENCLAVE_KEY;
 import static org.hyperledger.besu.ethereum.core.PrivateTransactionDataFixture.privateTransactionBesu;
+import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_IS_PERSISTING_PRIVATE_STATE;
+import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_PRIVATE_METADATA_UPDATER;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.nullable;
@@ -26,22 +28,20 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.enclave.Enclave;
 import org.hyperledger.besu.enclave.EnclaveClientException;
 import org.hyperledger.besu.enclave.EnclaveConfigurationException;
 import org.hyperledger.besu.enclave.types.PrivacyGroup;
 import org.hyperledger.besu.enclave.types.ReceiveResponse;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Log;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.mainnet.SpuriousDragonGasCalculator;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+import org.hyperledger.besu.ethereum.privacy.PrivateStateGenesisAllocator;
 import org.hyperledger.besu.ethereum.privacy.PrivateStateRootResolver;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransactionProcessor;
@@ -53,9 +53,13 @@
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
 import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.OperationTracer;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.SpuriousDragonGasCalculator;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.precompile.PrecompiledContract;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -64,19 +68,16 @@
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
+@SuppressWarnings("MockNotUsedInProduction")
 public class PrivacyPrecompiledContractTest {
 
-  @Rule public final TemporaryFolder temp = new TemporaryFolder();
-
   private final String actual = "Test String";
   private final Bytes privateTransactionLookupId = Bytes.wrap(actual.getBytes(UTF_8));
   private MessageFrame messageFrame;
-  private Blockchain blockchain;
+  private final Blockchain blockchain = mock(Blockchain.class);
   private final String DEFAULT_OUTPUT = "0x01";
   final String PAYLOAD_TEST_PRIVACY_GROUP_ID = "8lDVI66RZHIrBsolz6Kn88Rd+WsJ4hUjb4hsh29xW/o=";
   private final WorldStateArchive worldStateArchive = mock(WorldStateArchive.class);
@@ -85,12 +86,15 @@ public class PrivacyPrecompiledContractTest {
   final PrivateStateRootResolver privateStateRootResolver =
       new PrivateStateRootResolver(privateStateStorage);
 
+  final PrivateStateGenesisAllocator privateStateGenesisAllocator =
+      new PrivateStateGenesisAllocator(
+          false, (privacyGroupId, blockNumber) -> Collections::emptyList);
+
   private PrivateTransactionProcessor mockPrivateTxProcessor(
       final TransactionProcessingResult result) {
     final PrivateTransactionProcessor mockPrivateTransactionProcessor =
         mock(PrivateTransactionProcessor.class);
     when(mockPrivateTransactionProcessor.processTransaction(
-            nullable(Blockchain.class),
             nullable(WorldUpdater.class),
             nullable(WorldUpdater.class),
             nullable(ProcessableBlockHeader.class),
@@ -105,12 +109,12 @@ private PrivateTransactionProcessor mockPrivateTxProcessor(
     return mockPrivateTransactionProcessor;
   }
 
-  @Before
+  @BeforeEach
   public void setUp() {
     final MutableWorldState mutableWorldState = mock(MutableWorldState.class);
     when(mutableWorldState.updater()).thenReturn(mock(WorldUpdater.class));
     when(worldStateArchive.getMutable()).thenReturn(mutableWorldState);
-    when(worldStateArchive.getMutable(any())).thenReturn(Optional.of(mutableWorldState));
+    when(worldStateArchive.getMutable(any(), any())).thenReturn(Optional.of(mutableWorldState));
 
     when(privateMetadataUpdater.getPrivacyGroupHeadBlockMap())
         .thenReturn(PrivacyGroupHeadBlockMap.empty());
@@ -118,7 +122,6 @@ public void setUp() {
         .thenReturn(new PrivateBlockMetadata(Collections.emptyList()));
 
     messageFrame = mock(MessageFrame.class);
-    blockchain = mock(Blockchain.class);
     final BlockDataGenerator blockGenerator = new BlockDataGenerator();
     final Block genesis = blockGenerator.genesisBlock();
     final Block block =
@@ -127,10 +130,12 @@ public void setUp() {
     when(blockchain.getGenesisBlock()).thenReturn(genesis);
     when(blockchain.getBlockByHash(block.getHash())).thenReturn(Optional.of(block));
     when(blockchain.getBlockByHash(genesis.getHash())).thenReturn(Optional.of(genesis));
-    when(messageFrame.getBlockchain()).thenReturn(blockchain);
-    when(messageFrame.getBlockHeader()).thenReturn(block.getHeader());
+    when(messageFrame.getBlockValues()).thenReturn(block.getHeader());
     final PrivateMetadataUpdater privateMetadataUpdater = mock(PrivateMetadataUpdater.class);
-    when(messageFrame.getPrivateMetadataUpdater()).thenReturn(privateMetadataUpdater);
+    when(messageFrame.getContextVariable(KEY_IS_PERSISTING_PRIVATE_STATE, false)).thenReturn(false);
+    when(messageFrame.hasContextVariable(KEY_PRIVATE_METADATA_UPDATER)).thenReturn(true);
+    when(messageFrame.getContextVariable(KEY_PRIVATE_METADATA_UPDATER))
+        .thenReturn(privateMetadataUpdater);
     when(privateMetadataUpdater.getPrivacyGroupHeadBlockMap())
         .thenReturn(PrivacyGroupHeadBlockMap.empty());
   }
@@ -161,7 +166,9 @@ public void testPayloadFoundInEnclave() {
         new ReceiveResponse(payload, PAYLOAD_TEST_PRIVACY_GROUP_ID, privateFrom);
     when(enclave.receive(any(String.class))).thenReturn(response);
 
-    final Bytes actual = contract.compute(privateTransactionLookupId, messageFrame);
+    final PrecompiledContract.PrecompileContractResult result =
+        contract.computePrecompile(privateTransactionLookupId, messageFrame);
+    final Bytes actual = result.getOutput();
 
     assertThat(actual).isEqualTo(Bytes.fromHexString(DEFAULT_OUTPUT));
   }
@@ -173,18 +180,22 @@ public void testPayloadNotFoundInEnclave() {
 
     when(enclave.receive(any(String.class))).thenThrow(EnclaveClientException.class);
 
-    final Bytes expected = contract.compute(privateTransactionLookupId, messageFrame);
-    assertThat(expected).isEqualTo(Bytes.EMPTY);
+    final PrecompiledContract.PrecompileContractResult result =
+        contract.computePrecompile(privateTransactionLookupId, messageFrame);
+    final Bytes actual = result.getOutput();
+
+    assertThat(actual).isEqualTo(Bytes.EMPTY);
   }
 
-  @Test(expected = RuntimeException.class)
+  @Test
   public void testEnclaveDown() {
     final Enclave enclave = mock(Enclave.class);
     final PrivacyPrecompiledContract contract = buildPrivacyPrecompiledContract(enclave);
 
     when(enclave.receive(any(String.class))).thenThrow(new RuntimeException());
 
-    contract.compute(privateTransactionLookupId, messageFrame);
+    assertThatThrownBy(() -> contract.computePrecompile(privateTransactionLookupId, messageFrame))
+        .isInstanceOf(RuntimeException.class);
   }
 
   @Test
@@ -199,7 +210,7 @@ public void testEnclaveBelowRequiredVersion() {
     when(enclave.receive(eq(privateTransactionLookupId.toBase64String())))
         .thenReturn(responseWithoutSenderKey);
 
-    assertThatThrownBy(() -> contract.compute(privateTransactionLookupId, messageFrame))
+    assertThatThrownBy(() -> contract.computePrecompile(privateTransactionLookupId, messageFrame))
         .isInstanceOf(EnclaveConfigurationException.class)
         .hasMessage("Incompatible Orion version. Orion version must be 1.6.0 or greater.");
   }
@@ -234,8 +245,11 @@ public void testPayloadNotMatchingPrivateFrom() {
     when(enclave.receive(eq(privateTransactionLookupId.toBase64String())))
         .thenReturn(responseWithWrongSenderKey);
 
-    final Bytes expected = contract.compute(privateTransactionLookupId, messageFrame);
-    assertThat(expected).isEqualTo(Bytes.EMPTY);
+    final PrecompiledContract.PrecompileContractResult result =
+        contract.computePrecompile(privateTransactionLookupId, messageFrame);
+    final Bytes actual = result.getOutput();
+
+    assertThat(actual).isEqualTo(Bytes.EMPTY);
   }
 
   @Test
@@ -263,7 +277,9 @@ public void testPrivateFromNotMemberOfGroup() {
         new ReceiveResponse(payload, PAYLOAD_TEST_PRIVACY_GROUP_ID, privateFrom);
     when(enclave.receive(any(String.class))).thenReturn(response);
 
-    final Bytes actual = contract.compute(privateTransactionLookupId, messageFrame);
+    final PrecompiledContract.PrecompileContractResult result =
+        contract.computePrecompile(privateTransactionLookupId, messageFrame);
+    final Bytes actual = result.getOutput();
 
     assertThat(actual).isEqualTo(Bytes.fromHexString(DEFAULT_OUTPUT));
   }
@@ -284,12 +300,14 @@ public void testInvalidPrivateTransaction() {
             new SpuriousDragonGasCalculator(),
             enclave,
             worldStateArchive,
-            privateStateRootResolver);
+            privateStateRootResolver,
+            privateStateGenesisAllocator,
+            "RestrictedPrivacyTest");
 
     contract.setPrivateTransactionProcessor(
         mockPrivateTxProcessor(
             TransactionProcessingResult.invalid(
-                ValidationResult.invalid(TransactionInvalidReason.INCORRECT_NONCE))));
+                ValidationResult.invalid(TransactionInvalidReason.NONCE_TOO_HIGH))));
 
     final PrivateTransaction privateTransaction = privateTransactionBesu();
     final byte[] payload = convertPrivateTransactionToBytes(privateTransaction);
@@ -300,7 +318,9 @@ public void testInvalidPrivateTransaction() {
 
     when(enclave.receive(any(String.class))).thenReturn(response);
 
-    final Bytes actual = contract.compute(privateTransactionLookupId, messageFrame);
+    final PrecompiledContract.PrecompileContractResult result =
+        contract.computePrecompile(privateTransactionLookupId, messageFrame);
+    final Bytes actual = result.getOutput();
 
     assertThat(actual).isEqualTo(Bytes.EMPTY);
   }
@@ -308,14 +328,17 @@ public void testInvalidPrivateTransaction() {
   @Test
   public void testSimulatedPublicTransactionIsSkipped() {
     final PrivacyPrecompiledContract emptyContract =
-        new PrivacyPrecompiledContract(null, null, null, null);
+        new PrivacyPrecompiledContract(null, null, null, null, null, null);
 
     // A simulated public transaction doesn't contain a PrivateMetadataUpdater
     final MessageFrame frame = mock(MessageFrame.class);
-    when(frame.getPrivateMetadataUpdater()).thenReturn(null);
+    when(frame.getContextVariable(KEY_PRIVATE_METADATA_UPDATER)).thenReturn(null);
+
+    final PrecompiledContract.PrecompileContractResult result =
+        emptyContract.computePrecompile(null, frame);
+    final Bytes actual = result.getOutput();
 
-    final Bytes result = emptyContract.compute(null, frame);
-    assertThat(result).isEqualTo(Bytes.EMPTY);
+    assertThat(actual).isEqualTo(Bytes.EMPTY);
   }
 
   private byte[] convertPrivateTransactionToBytes(final PrivateTransaction privateTransaction) {
@@ -327,6 +350,11 @@ private byte[] convertPrivateTransactionToBytes(final PrivateTransaction private
 
   private PrivacyPrecompiledContract buildPrivacyPrecompiledContract(final Enclave enclave) {
     return new PrivacyPrecompiledContract(
-        new SpuriousDragonGasCalculator(), enclave, worldStateArchive, privateStateRootResolver);
+        new SpuriousDragonGasCalculator(),
+        enclave,
+        worldStateArchive,
+        privateStateRootResolver,
+        privateStateGenesisAllocator,
+        "PrivacyTests");
   }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/ChainHeadPrivateNonceProviderTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/ChainHeadPrivateNonceProviderTest.java
index fb578cb5eab..870b0924e9d 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/ChainHeadPrivateNonceProviderTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/ChainHeadPrivateNonceProviderTest.java
@@ -20,13 +20,13 @@
 import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.WorldState;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.worldstate.WorldState;
 
 import java.util.Optional;
 
@@ -34,11 +34,14 @@
 import org.apache.tuweni.bytes.Bytes32;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class ChainHeadPrivateNonceProviderTest {
   private static final Bytes32 PRIVACY_GROUP_ID =
       Bytes32.wrap(Bytes.fromBase64String("DyAOiF/ynpc+JXa2YAGB0bCitSlOMNm+ShmB/7M6C4w="));
-  private static final Address ADDRESS = Address.fromHexString("55");;
+  private static final Address ADDRESS = Address.fromHexString("55");
 
   private Account account;
   private WorldState worldState;
@@ -67,7 +70,8 @@ public void setUp() {
   public void determineNonceForPrivacyGroupRequestWhenPrivateStateDoesNotExist() {
     when(privateStateRootResolver.resolveLastStateRoot(any(Bytes32.class), any(Hash.class)))
         .thenReturn(Hash.ZERO);
-    when(privateWorldStateArchive.get(any(Hash.class))).thenReturn(Optional.empty());
+    when(privateWorldStateArchive.get(any(Hash.class), any(Hash.class)))
+        .thenReturn(Optional.empty());
 
     final long nonce = privateNonceProvider.getNonce(ADDRESS, PRIVACY_GROUP_ID);
 
@@ -80,7 +84,8 @@ public void determineNonceForPrivacyGroupRequestWhenAccountExists() {
     when(worldState.get(any(Address.class))).thenReturn(account);
     when(privateStateRootResolver.resolveLastStateRoot(any(Bytes32.class), any(Hash.class)))
         .thenReturn(Hash.ZERO);
-    when(privateWorldStateArchive.get(any(Hash.class))).thenReturn(Optional.of(worldState));
+    when(privateWorldStateArchive.get(any(Hash.class), any(Hash.class)))
+        .thenReturn(Optional.of(worldState));
 
     final long nonce = privateNonceProvider.getNonce(ADDRESS, PRIVACY_GROUP_ID);
 
@@ -91,8 +96,8 @@ public void determineNonceForPrivacyGroupRequestWhenAccountExists() {
   public void determineNonceForPrivacyGroupRequestWhenAccountDoesNotExist() {
     when(privateStateRootResolver.resolveLastStateRoot(any(Bytes32.class), any(Hash.class)))
         .thenReturn(Hash.ZERO);
-    when(privateWorldStateArchive.get(any(Hash.class))).thenReturn(Optional.of(worldState));
-    when(account.getNonce()).thenReturn(4L);
+    when(privateWorldStateArchive.get(any(Hash.class), any(Hash.class)))
+        .thenReturn(Optional.of(worldState));
 
     final long nonce = privateNonceProvider.getNonce(ADDRESS, PRIVACY_GROUP_ID);
 
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/DefaultPrivacyControllerTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/DefaultPrivacyControllerTest.java
deleted file mode 100644
index da516bbef4d..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/DefaultPrivacyControllerTest.java
+++ /dev/null
@@ -1,523 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.privacy;
-
-import static com.google.common.collect.Lists.newArrayList;
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.INCORRECT_PRIVATE_NONCE;
-import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.PRIVATE_NONCE_TOO_LOW;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyList;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.crypto.SECP256K1;
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.enclave.Enclave;
-import org.hyperledger.besu.enclave.EnclaveServerException;
-import org.hyperledger.besu.enclave.types.PrivacyGroup;
-import org.hyperledger.besu.enclave.types.ReceiveResponse;
-import org.hyperledger.besu.enclave.types.SendResponse;
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Log;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
-import org.hyperledger.besu.ethereum.privacy.markertransaction.FixedKeySigningPrivateMarkerTransactionFactory;
-import org.hyperledger.besu.ethereum.privacy.storage.PrivacyGroupHeadBlockMap;
-import org.hyperledger.besu.ethereum.privacy.storage.PrivateStateStorage;
-import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
-import org.hyperledger.besu.ethereum.transaction.CallParameter;
-import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
-import org.hyperledger.orion.testutil.OrionKeyUtils;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.io.Base64;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
-
-@RunWith(MockitoJUnitRunner.class)
-public class DefaultPrivacyControllerTest {
-
-  private static final String TRANSACTION_KEY = "93Ky7lXwFkMc7+ckoFgUMku5bpr9tz4zhmWmk9RlNng=";
-  private static final KeyPair KEY_PAIR =
-      KeyPair.create(
-          SECP256K1.PrivateKey.create(
-              new BigInteger(
-                  "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63", 16)));
-  private static final byte[] PAYLOAD = new byte[0];
-  private static final List<String> PRIVACY_GROUP_ADDRESSES = newArrayList("8f2a", "fb23");
-  private static final String PRIVACY_GROUP_NAME = "pg_name";
-  private static final String PRIVACY_GROUP_DESCRIPTION = "pg_desc";
-  private static final String ENCLAVE_PUBLIC_KEY = "A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
-  private static final String ENCLAVE_KEY2 = "Ko2bVqD+nNlNYL5EE7y3IdOnviftjiizpjRt+HTuFBs=";
-  private static final String PRIVACY_GROUP_ID = "DyAOiF/ynpc+JXa2YAGB0bCitSlOMNm+ShmB/7M6C4w=";
-  private static final ArrayList<Log> LOGS = new ArrayList<>();
-  private static final String MOCK_TRANSACTION_SIMULATOR_RESULT_OUTPUT_BYTES_PREFIX =
-      "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002";
-  private static final PrivacyGroup PANTHEON_PRIVACY_GROUP =
-      new PrivacyGroup("", PrivacyGroup.Type.PANTHEON, "", "", emptyList());
-  private static final PrivacyGroup ONCHAIN_PRIVACY_GROUP =
-      new PrivacyGroup("", PrivacyGroup.Type.ONCHAIN, "", "", Arrays.asList(ENCLAVE_PUBLIC_KEY));
-
-  private PrivacyController privacyController;
-  private PrivacyController brokenPrivacyController;
-  private PrivateTransactionValidator privateTransactionValidator;
-  private Enclave enclave;
-  private String enclavePublicKey;
-  private PrivateNonceProvider privateNonceProvider;
-  private PrivateStateRootResolver privateStateRootResolver;
-  private PrivateTransactionSimulator privateTransactionSimulator;
-  private PrivateWorldStateReader privateWorldStateReader;
-  private Blockchain blockchain;
-  private PrivateStateStorage privateStateStorage;
-
-  private static final Transaction PUBLIC_TRANSACTION =
-      Transaction.builder()
-          .nonce(0)
-          .gasPrice(Wei.of(1000))
-          .gasLimit(3000000)
-          .to(Address.fromHexString("0x627306090abab3a6e1400e9345bc60c78a8bef57"))
-          .value(Wei.ZERO)
-          .payload(Base64.decode(TRANSACTION_KEY))
-          .sender(Address.fromHexString("0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"))
-          .chainId(BigInteger.valueOf(2018))
-          .signAndBuild(KEY_PAIR);
-
-  private Enclave mockEnclave() {
-    final Enclave mockEnclave = mock(Enclave.class);
-    final SendResponse response = new SendResponse(TRANSACTION_KEY);
-    final ReceiveResponse receiveResponse =
-        new ReceiveResponse(new byte[0], PRIVACY_GROUP_ID, null);
-    when(mockEnclave.send(anyString(), anyString(), anyList())).thenReturn(response);
-    when(mockEnclave.send(anyString(), anyString(), anyString())).thenReturn(response);
-    when(mockEnclave.receive(any(), any())).thenReturn(receiveResponse);
-    return mockEnclave;
-  }
-
-  private Enclave brokenMockEnclave() {
-    final Enclave mockEnclave = mock(Enclave.class);
-    when(mockEnclave.send(anyString(), anyString(), anyList()))
-        .thenThrow(EnclaveServerException.class);
-    return mockEnclave;
-  }
-
-  private PrivateTransactionValidator mockPrivateTransactionValidator() {
-    final PrivateTransactionValidator validator = mock(PrivateTransactionValidator.class);
-    when(validator.validate(any(), any(), anyBoolean())).thenReturn(ValidationResult.valid());
-    return validator;
-  }
-
-  @Before
-  public void setUp() throws Exception {
-    blockchain = mock(Blockchain.class);
-    privateTransactionSimulator = mock(PrivateTransactionSimulator.class);
-    privateStateStorage = mock(PrivateStateStorage.class);
-    privateNonceProvider = mock(ChainHeadPrivateNonceProvider.class);
-    privateStateRootResolver = mock(PrivateStateRootResolver.class);
-    when(privateNonceProvider.getNonce(any(), any())).thenReturn(1L);
-
-    privateWorldStateReader = mock(PrivateWorldStateReader.class);
-
-    enclavePublicKey = OrionKeyUtils.loadKey("orion_key_0.pub");
-    privateTransactionValidator = mockPrivateTransactionValidator();
-    enclave = mockEnclave();
-
-    privacyController =
-        new DefaultPrivacyController(
-            blockchain,
-            privateStateStorage,
-            enclave,
-            privateTransactionValidator,
-            new FixedKeySigningPrivateMarkerTransactionFactory(
-                Address.DEFAULT_PRIVACY, (address) -> 0, KEY_PAIR),
-            privateTransactionSimulator,
-            privateNonceProvider,
-            privateWorldStateReader,
-            privateStateRootResolver);
-    brokenPrivacyController =
-        new DefaultPrivacyController(
-            blockchain,
-            privateStateStorage,
-            brokenMockEnclave(),
-            privateTransactionValidator,
-            new FixedKeySigningPrivateMarkerTransactionFactory(
-                Address.DEFAULT_PRIVACY, (address) -> 0, KEY_PAIR),
-            privateTransactionSimulator,
-            privateNonceProvider,
-            privateWorldStateReader,
-            privateStateRootResolver);
-  }
-
-  @Test
-  public void sendsValidLegacyTransaction() {
-    final PrivateTransaction transaction = buildLegacyPrivateTransaction(1);
-
-    final String privateTransactionLookupId =
-        privacyController.sendTransaction(transaction, ENCLAVE_PUBLIC_KEY, Optional.empty());
-
-    final ValidationResult<TransactionInvalidReason> validationResult =
-        privacyController.validatePrivateTransaction(transaction, ENCLAVE_PUBLIC_KEY);
-
-    final Transaction markerTransaction =
-        privacyController.createPrivacyMarkerTransaction(privateTransactionLookupId, transaction);
-
-    assertThat(validationResult).isEqualTo(ValidationResult.valid());
-    assertThat(markerTransaction.contractAddress()).isEqualTo(PUBLIC_TRANSACTION.contractAddress());
-    assertThat(markerTransaction.getPayload()).isEqualTo(PUBLIC_TRANSACTION.getPayload());
-    assertThat(markerTransaction.getNonce()).isEqualTo(PUBLIC_TRANSACTION.getNonce());
-    assertThat(markerTransaction.getSender()).isEqualTo(PUBLIC_TRANSACTION.getSender());
-    assertThat(markerTransaction.getValue()).isEqualTo(PUBLIC_TRANSACTION.getValue());
-    verify(enclave)
-        .send(anyString(), eq(ENCLAVE_PUBLIC_KEY), eq(List.of(ENCLAVE_PUBLIC_KEY, ENCLAVE_KEY2)));
-  }
-
-  @Test
-  public void sendValidBesuTransaction() {
-    final PrivateTransaction transaction = buildBesuPrivateTransaction(1);
-
-    final String privateTransactionLookupId =
-        privacyController.sendTransaction(
-            transaction, ENCLAVE_PUBLIC_KEY, Optional.of(PANTHEON_PRIVACY_GROUP));
-
-    final ValidationResult<TransactionInvalidReason> validationResult =
-        privacyController.validatePrivateTransaction(transaction, ENCLAVE_PUBLIC_KEY);
-
-    final Transaction markerTransaction =
-        privacyController.createPrivacyMarkerTransaction(privateTransactionLookupId, transaction);
-
-    assertThat(validationResult).isEqualTo(ValidationResult.valid());
-    assertThat(markerTransaction.contractAddress()).isEqualTo(PUBLIC_TRANSACTION.contractAddress());
-    assertThat(markerTransaction.getPayload()).isEqualTo(PUBLIC_TRANSACTION.getPayload());
-    assertThat(markerTransaction.getNonce()).isEqualTo(PUBLIC_TRANSACTION.getNonce());
-    assertThat(markerTransaction.getSender()).isEqualTo(PUBLIC_TRANSACTION.getSender());
-    assertThat(markerTransaction.getValue()).isEqualTo(PUBLIC_TRANSACTION.getValue());
-    verify(enclave).send(anyString(), eq(ENCLAVE_PUBLIC_KEY), eq(PRIVACY_GROUP_ID));
-  }
-
-  @Test
-  public void findOnChainPrivacyGroups() {
-    final List<String> privacyGroupAddresses = newArrayList(ENCLAVE_PUBLIC_KEY, ENCLAVE_KEY2);
-
-    final PrivacyGroup privacyGroup =
-        new PrivacyGroup(
-            PRIVACY_GROUP_ID, PrivacyGroup.Type.ONCHAIN, "", "", privacyGroupAddresses);
-
-    final PrivacyGroupHeadBlockMap privacyGroupHeadBlockMap =
-        new PrivacyGroupHeadBlockMap(
-            Map.of(Bytes32.wrap(Bytes.fromBase64String(PRIVACY_GROUP_ID)), Hash.ZERO));
-    when(privateStateStorage.getPrivacyGroupHeadBlockMap(any()))
-        .thenReturn(Optional.of(privacyGroupHeadBlockMap));
-
-    when(privateTransactionSimulator.process(any(), any()))
-        .thenReturn(
-            Optional.of(
-                new TransactionProcessingResult(
-                    TransactionProcessingResult.Status.SUCCESSFUL,
-                    emptyList(),
-                    0,
-                    0,
-                    Bytes.fromHexString(
-                        MOCK_TRANSACTION_SIMULATOR_RESULT_OUTPUT_BYTES_PREFIX
-                            + Bytes.fromBase64String(ENCLAVE_PUBLIC_KEY).toUnprefixedHexString()
-                            + Bytes.fromBase64String(ENCLAVE_KEY2).toUnprefixedHexString()),
-                    ValidationResult.valid(),
-                    Optional.empty())));
-
-    final List<PrivacyGroup> privacyGroups =
-        privacyController.findOnChainPrivacyGroupByMembers(
-            privacyGroupAddresses, ENCLAVE_PUBLIC_KEY);
-    assertThat(privacyGroups).hasSize(1);
-    assertThat(privacyGroups.get(0)).isEqualToComparingFieldByField(privacyGroup);
-    verify(privateStateStorage).getPrivacyGroupHeadBlockMap(any());
-    verify(privateTransactionSimulator).process(any(), any());
-  }
-
-  @Test
-  public void sendTransactionWhenEnclaveFailsThrowsEnclaveError() {
-    assertThatExceptionOfType(EnclaveServerException.class)
-        .isThrownBy(
-            () ->
-                brokenPrivacyController.sendTransaction(
-                    buildLegacyPrivateTransaction(), ENCLAVE_PUBLIC_KEY, Optional.empty()));
-  }
-
-  @Test
-  public void validateTransactionWithTooLowNonceReturnsError() {
-    when(privateTransactionValidator.validate(any(), any(), anyBoolean()))
-        .thenReturn(ValidationResult.invalid(PRIVATE_NONCE_TOO_LOW));
-
-    final PrivateTransaction transaction = buildLegacyPrivateTransaction(0);
-    final ValidationResult<TransactionInvalidReason> validationResult =
-        privacyController.validatePrivateTransaction(transaction, ENCLAVE_PUBLIC_KEY);
-    assertThat(validationResult).isEqualTo(ValidationResult.invalid(PRIVATE_NONCE_TOO_LOW));
-  }
-
-  @Test
-  public void validateTransactionWithIncorrectNonceReturnsError() {
-    when(privateTransactionValidator.validate(any(), any(), anyBoolean()))
-        .thenReturn(ValidationResult.invalid(INCORRECT_PRIVATE_NONCE));
-
-    final PrivateTransaction transaction = buildLegacyPrivateTransaction(2);
-
-    final ValidationResult<TransactionInvalidReason> validationResult =
-        privacyController.validatePrivateTransaction(transaction, ENCLAVE_PUBLIC_KEY);
-    assertThat(validationResult).isEqualTo(ValidationResult.invalid(INCORRECT_PRIVATE_NONCE));
-  }
-
-  @Test
-  public void retrievesTransaction() {
-    when(enclave.receive(anyString(), anyString()))
-        .thenReturn(new ReceiveResponse(PAYLOAD, PRIVACY_GROUP_ID, null));
-
-    final ReceiveResponse receiveResponse =
-        privacyController.retrieveTransaction(TRANSACTION_KEY, ENCLAVE_PUBLIC_KEY);
-
-    assertThat(receiveResponse.getPayload()).isEqualTo(PAYLOAD);
-    assertThat(receiveResponse.getPrivacyGroupId()).isEqualTo(PRIVACY_GROUP_ID);
-    verify(enclave).receive(TRANSACTION_KEY, enclavePublicKey);
-  }
-
-  @Test
-  public void createsPrivacyGroup() {
-    final PrivacyGroup enclavePrivacyGroupResponse =
-        new PrivacyGroup(
-            PRIVACY_GROUP_ID,
-            PrivacyGroup.Type.PANTHEON,
-            PRIVACY_GROUP_NAME,
-            PRIVACY_GROUP_DESCRIPTION,
-            PRIVACY_GROUP_ADDRESSES);
-    when(enclave.createPrivacyGroup(any(), any(), any(), any()))
-        .thenReturn(enclavePrivacyGroupResponse);
-
-    final PrivacyGroup privacyGroup =
-        privacyController.createPrivacyGroup(
-            PRIVACY_GROUP_ADDRESSES,
-            PRIVACY_GROUP_NAME,
-            PRIVACY_GROUP_DESCRIPTION,
-            ENCLAVE_PUBLIC_KEY);
-
-    assertThat(privacyGroup).isEqualToComparingFieldByField(enclavePrivacyGroupResponse);
-    verify(enclave)
-        .createPrivacyGroup(
-            PRIVACY_GROUP_ADDRESSES,
-            enclavePublicKey,
-            PRIVACY_GROUP_NAME,
-            PRIVACY_GROUP_DESCRIPTION);
-  }
-
-  @Test
-  public void deletesPrivacyGroup() {
-    when(enclave.deletePrivacyGroup(anyString(), anyString())).thenReturn(PRIVACY_GROUP_ID);
-
-    final String deletedPrivacyGroupId =
-        privacyController.deletePrivacyGroup(PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY);
-
-    assertThat(deletedPrivacyGroupId).isEqualTo(PRIVACY_GROUP_ID);
-    verify(enclave).deletePrivacyGroup(PRIVACY_GROUP_ID, enclavePublicKey);
-  }
-
-  @Test
-  public void findsPrivacyGroup() {
-    final PrivacyGroup privacyGroup =
-        new PrivacyGroup(
-            PRIVACY_GROUP_ID,
-            PrivacyGroup.Type.PANTHEON,
-            PRIVACY_GROUP_NAME,
-            PRIVACY_GROUP_DESCRIPTION,
-            PRIVACY_GROUP_ADDRESSES);
-    when(enclave.findPrivacyGroup(any())).thenReturn(new PrivacyGroup[] {privacyGroup});
-
-    final PrivacyGroup[] privacyGroups =
-        privacyController.findOffChainPrivacyGroupByMembers(
-            PRIVACY_GROUP_ADDRESSES, ENCLAVE_PUBLIC_KEY);
-    assertThat(privacyGroups).hasSize(1);
-    assertThat(privacyGroups[0]).isEqualToComparingFieldByField(privacyGroup);
-    verify(enclave).findPrivacyGroup(PRIVACY_GROUP_ADDRESSES);
-  }
-
-  @Test
-  public void determinesNonceForEeaRequest() {
-    final Address address = Address.fromHexString("55");
-    final long reportedNonce = 8L;
-    final PrivacyGroup[] returnedGroups =
-        new PrivacyGroup[] {
-          new PrivacyGroup(
-              PRIVACY_GROUP_ID,
-              PrivacyGroup.Type.LEGACY,
-              "Group1_Name",
-              "Group1_Desc",
-              emptyList()),
-        };
-
-    when(enclave.findPrivacyGroup(any())).thenReturn(returnedGroups);
-    when(privateNonceProvider.getNonce(any(Address.class), any(Bytes32.class))).thenReturn(8L);
-
-    final long nonce =
-        privacyController.determineEeaNonce(
-            ENCLAVE_PUBLIC_KEY, new String[] {ENCLAVE_KEY2}, address, ENCLAVE_PUBLIC_KEY);
-
-    assertThat(nonce).isEqualTo(reportedNonce);
-    verify(enclave)
-        .findPrivacyGroup(
-            argThat((m) -> m.containsAll(newArrayList(ENCLAVE_PUBLIC_KEY, ENCLAVE_KEY2))));
-  }
-
-  @Test
-  public void determineNonceForEeaRequestWithNoMatchingGroupReturnsZero() {
-    final long reportedNonce = 0L;
-    final Address address = Address.fromHexString("55");
-    final PrivacyGroup[] returnedGroups = new PrivacyGroup[0];
-
-    when(enclave.findPrivacyGroup(any())).thenReturn(returnedGroups);
-
-    final long nonce =
-        privacyController.determineEeaNonce(
-            "privateFrom", new String[] {"first", "second"}, address, ENCLAVE_PUBLIC_KEY);
-
-    assertThat(nonce).isEqualTo(reportedNonce);
-    verify(enclave)
-        .findPrivacyGroup(
-            argThat((m) -> m.containsAll(newArrayList("first", "second", "privateFrom"))));
-  }
-
-  @Test
-  public void determineNonceForEeaRequestWithMoreThanOneMatchingGroupThrowsException() {
-    final Address address = Address.fromHexString("55");
-    final PrivacyGroup[] returnedGroups =
-        new PrivacyGroup[] {
-          new PrivacyGroup(
-              "Group1", PrivacyGroup.Type.LEGACY, "Group1_Name", "Group1_Desc", emptyList()),
-          new PrivacyGroup(
-              "Group2", PrivacyGroup.Type.LEGACY, "Group2_Name", "Group2_Desc", emptyList()),
-        };
-
-    when(enclave.findPrivacyGroup(any())).thenReturn(returnedGroups);
-
-    assertThatExceptionOfType(RuntimeException.class)
-        .isThrownBy(
-            () ->
-                privacyController.determineEeaNonce(
-                    "privateFrom", new String[] {"first", "second"}, address, ENCLAVE_PUBLIC_KEY));
-  }
-
-  @Test
-  public void simulatingPrivateTransactionWorks() {
-    final CallParameter callParameter = mock(CallParameter.class);
-    when(privateTransactionSimulator.process(any(), any(), any(long.class)))
-        .thenReturn(
-            Optional.of(
-                TransactionProcessingResult.successful(
-                    LOGS, 0, 0, Bytes.EMPTY, ValidationResult.valid())));
-    final Optional<TransactionProcessingResult> result =
-        privacyController.simulatePrivateTransaction(
-            "Group1", ENCLAVE_PUBLIC_KEY, callParameter, 1);
-    assertThat(result.isPresent()).isTrue();
-  }
-
-  @Test
-  public void canCreatePrivacyMarkerTransactionForOnChainPrivacy() {
-    final PrivateTransaction transaction = buildBesuPrivateTransaction(0);
-
-    final String privateTransactionLookupId =
-        privacyController.sendTransaction(
-            transaction, ENCLAVE_PUBLIC_KEY, Optional.of(ONCHAIN_PRIVACY_GROUP));
-
-    final Transaction onChainPrivacyMarkerTransaction =
-        privacyController.createPrivacyMarkerTransaction(
-            privateTransactionLookupId, transaction, Address.ONCHAIN_PRIVACY);
-
-    assertThat(onChainPrivacyMarkerTransaction.contractAddress())
-        .isEqualTo(PUBLIC_TRANSACTION.contractAddress());
-    assertThat(onChainPrivacyMarkerTransaction.getPayload())
-        .isEqualTo(PUBLIC_TRANSACTION.getPayload());
-    assertThat(onChainPrivacyMarkerTransaction.getNonce()).isEqualTo(PUBLIC_TRANSACTION.getNonce());
-    assertThat(onChainPrivacyMarkerTransaction.getSender())
-        .isEqualTo(PUBLIC_TRANSACTION.getSender());
-    assertThat(onChainPrivacyMarkerTransaction.getValue()).isEqualTo(PUBLIC_TRANSACTION.getValue());
-    assertThat(onChainPrivacyMarkerTransaction.getTo().get()).isEqualTo(Address.ONCHAIN_PRIVACY);
-    verify(enclave)
-        .send(anyString(), eq(ENCLAVE_PUBLIC_KEY), eq(singletonList(ENCLAVE_PUBLIC_KEY)));
-  }
-
-  @Test
-  public void getContractCodeCallsPrivateWorldStateReader() {
-    final Hash blockHash = Hash.ZERO;
-    final Address contractAddress = Address.ZERO;
-    final Bytes contractCode = Bytes.fromBase64String("ZXhhbXBsZQ==");
-
-    when(privateWorldStateReader.getContractCode(
-            eq(PRIVACY_GROUP_ID), eq(blockHash), eq(contractAddress)))
-        .thenReturn(Optional.of(contractCode));
-
-    assertThat(
-            privacyController.getContractCode(
-                PRIVACY_GROUP_ID, contractAddress, blockHash, ENCLAVE_PUBLIC_KEY))
-        .isPresent()
-        .hasValue(contractCode);
-  }
-
-  private static PrivateTransaction buildLegacyPrivateTransaction() {
-    return buildLegacyPrivateTransaction(0);
-  }
-
-  private static PrivateTransaction buildLegacyPrivateTransaction(final long nonce) {
-    return buildPrivateTransaction(nonce)
-        .privateFrom(Base64.decode(ENCLAVE_PUBLIC_KEY))
-        .privateFor(newArrayList(Base64.decode(ENCLAVE_PUBLIC_KEY), Base64.decode(ENCLAVE_KEY2)))
-        .signAndBuild(KEY_PAIR);
-  }
-
-  private static PrivateTransaction buildBesuPrivateTransaction(final long nonce) {
-
-    return buildPrivateTransaction(nonce)
-        .privateFrom(Bytes.fromBase64String(ENCLAVE_PUBLIC_KEY))
-        .privacyGroupId(Bytes.fromBase64String(PRIVACY_GROUP_ID))
-        .signAndBuild(KEY_PAIR);
-  }
-
-  private static PrivateTransaction.Builder buildPrivateTransaction(final long nonce) {
-    return PrivateTransaction.builder()
-        .nonce(nonce)
-        .gasPrice(Wei.of(1000))
-        .gasLimit(3000000)
-        .to(Address.fromHexString("0x627306090abab3a6e1400e9345bc60c78a8bef57"))
-        .value(Wei.ZERO)
-        .payload(Bytes.fromHexString("0x"))
-        .sender(Address.fromHexString("0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"))
-        .chainId(BigInteger.valueOf(2018))
-        .restriction(Restriction.RESTRICTED);
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/FlexiblePrivacyControllerTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/FlexiblePrivacyControllerTest.java
new file mode 100644
index 00000000000..3e94052334c
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/FlexiblePrivacyControllerTest.java
@@ -0,0 +1,406 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.privacy;
+
+import static java.util.Collections.emptyList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.PRIVATE_NONCE_TOO_HIGH;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.PRIVATE_NONCE_TOO_LOW;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.enclave.Enclave;
+import org.hyperledger.besu.enclave.EnclaveServerException;
+import org.hyperledger.besu.enclave.types.PrivacyGroup;
+import org.hyperledger.besu.enclave.types.ReceiveResponse;
+import org.hyperledger.besu.enclave.types.SendResponse;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+import org.hyperledger.besu.ethereum.privacy.group.FlexibleGroupManagement;
+import org.hyperledger.besu.ethereum.privacy.storage.PrivacyGroupHeadBlockMap;
+import org.hyperledger.besu.ethereum.privacy.storage.PrivateBlockMetadata;
+import org.hyperledger.besu.ethereum.privacy.storage.PrivateStateStorage;
+import org.hyperledger.besu.ethereum.privacy.storage.PrivateTransactionMetadata;
+import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
+import org.hyperledger.besu.plugin.data.Restriction;
+import org.hyperledger.enclave.testutil.EnclaveKeyUtils;
+
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.io.Base64;
+import org.assertj.core.api.Assertions;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class FlexiblePrivacyControllerTest {
+
+  private static final String ADDRESS1 = "A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
+  private static final String ADDRESS2 = "Ko2bVqD+nNlNYL5EE7y3IdOnviftjiizpjRt+HTuFBs=";
+  private static final String PRIVACY_GROUP_ID = "DyAOiF/ynpc+JXa2YAGB0bCitSlOMNm+ShmB/7M6C4w=";
+  private static final String KEY = "C2bVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
+  private static final String HEX_STRING_32BYTES_VALUE1 =
+      "0x0000000000000000000000000000000000000000000000000000000000000001";
+
+  private FlexiblePrivacyController privacyController;
+  private PrivateTransactionValidator privateTransactionValidator;
+  private PrivateNonceProvider privateNonceProvider;
+  private PrivateStateRootResolver privateStateRootResolver;
+  private PrivateTransactionSimulator privateTransactionSimulator;
+  private PrivateWorldStateReader privateWorldStateReader;
+  private Blockchain blockchain;
+  private PrivateStateStorage privateStateStorage;
+  private Enclave enclave;
+  private String enclavePublicKey;
+  private FlexiblePrivacyController brokenPrivacyController;
+  private static final byte[] PAYLOAD = new byte[0];
+  private static final String TRANSACTION_KEY = "93Ky7lXwFkMc7+ckoFgUMku5bpr9tz4zhmWmk9RlNng=";
+
+  private static final List<String> PRIVACY_GROUP_ADDRESSES = List.of(ADDRESS1, ADDRESS2);
+  private static final Bytes SIMULATOR_RESULT =
+      Bytes.fromHexString(
+          "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000020035695b4cc4b0941e60551d7a19cf30603db5bfc23e5ac43a56f57f25f75486a00000000000000000000000000000000000000000000000000000000000000202a8d9b56a0fe9cd94d60be4413bcb721d3a7be27ed8e28b3a6346df874ee141b");
+  private static final PrivacyGroup EXPECTED_PRIVACY_GROUP =
+      new PrivacyGroup(
+          PRIVACY_GROUP_ID, PrivacyGroup.Type.FLEXIBLE, "", "", PRIVACY_GROUP_ADDRESSES);
+
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+  private static final KeyPair KEY_PAIR =
+      SIGNATURE_ALGORITHM
+          .get()
+          .createKeyPair(
+              SIGNATURE_ALGORITHM
+                  .get()
+                  .createPrivateKey(
+                      new BigInteger(
+                          "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63", 16)));
+
+  @Before
+  public void setUp() throws Exception {
+    blockchain = mock(Blockchain.class);
+    privateTransactionSimulator = mock(PrivateTransactionSimulator.class);
+    privateStateStorage = mock(PrivateStateStorage.class);
+    privateNonceProvider = mock(ChainHeadPrivateNonceProvider.class);
+    privateStateRootResolver = mock(PrivateStateRootResolver.class);
+
+    privateWorldStateReader = mock(PrivateWorldStateReader.class);
+
+    privateTransactionValidator = mockPrivateTransactionValidator();
+    enclave = mockEnclave();
+
+    enclavePublicKey = EnclaveKeyUtils.loadKey("enclave_key_0.pub");
+
+    privacyController =
+        new FlexiblePrivacyController(
+            blockchain,
+            privateStateStorage,
+            enclave,
+            privateTransactionValidator,
+            privateTransactionSimulator,
+            privateNonceProvider,
+            privateWorldStateReader,
+            privateStateRootResolver);
+    brokenPrivacyController =
+        new FlexiblePrivacyController(
+            blockchain,
+            privateStateStorage,
+            brokenMockEnclave(),
+            privateTransactionValidator,
+            privateTransactionSimulator,
+            privateNonceProvider,
+            privateWorldStateReader,
+            privateStateRootResolver);
+  }
+
+  @Test
+  public void createsPayload() {
+    final PrivateTransaction privateTransaction = buildPrivateTransaction(1).signAndBuild(KEY_PAIR);
+    final SendResponse key = new SendResponse(KEY);
+    when(enclave.send(any(), any(), anyList())).thenReturn(key);
+    final String payload =
+        privacyController.createPrivateMarkerTransactionPayload(
+            privateTransaction, ADDRESS1, Optional.of(EXPECTED_PRIVACY_GROUP));
+    assertThat(payload).isNotNull().isEqualTo(KEY);
+  }
+
+  @Test
+  public void createsPayloadForAdding() {
+    mockingForCreatesPayloadForAdding();
+    final PrivateTransaction privateTransaction =
+        buildPrivateTransaction(1)
+            .payload(FlexibleGroupManagement.ADD_PARTICIPANTS_METHOD_SIGNATURE)
+            .to(PrivacyParameters.FLEXIBLE_PRIVACY_PROXY)
+            .signAndBuild(KEY_PAIR);
+    final String payload =
+        privacyController.createPrivateMarkerTransactionPayload(
+            privateTransaction, ADDRESS1, Optional.of(EXPECTED_PRIVACY_GROUP));
+    assertThat(payload)
+        .isNotNull()
+        .isEqualTo(
+            Bytes.concatenate(Bytes.fromBase64String(KEY), Bytes.fromBase64String(KEY))
+                .toBase64String());
+  }
+
+  @Test
+  public void verifiesGroupContainsUserId() {
+    final FlexiblePrivacyGroupContract flexiblePrivacyGroupContract =
+        mock(FlexiblePrivacyGroupContract.class);
+    when(flexiblePrivacyGroupContract.getPrivacyGroupByIdAndBlockNumber(any(), any()))
+        .thenReturn(Optional.of(EXPECTED_PRIVACY_GROUP));
+    privacyController.setFlexiblePrivacyGroupContract(flexiblePrivacyGroupContract);
+    privacyController.verifyPrivacyGroupContainsPrivacyUserId(PRIVACY_GROUP_ID, ADDRESS1);
+  }
+
+  @Test
+  public void findFlexiblePrivacyGroups() {
+    mockingForFindPrivacyGroupByMembers();
+    mockingForFindPrivacyGroupById();
+
+    final List<PrivacyGroup> privacyGroups =
+        List.of(privacyController.findPrivacyGroupByMembers(PRIVACY_GROUP_ADDRESSES, ADDRESS1));
+    assertThat(privacyGroups).hasSize(1);
+    assertThat(privacyGroups.get(0)).usingRecursiveComparison().isEqualTo(EXPECTED_PRIVACY_GROUP);
+    verify(privateStateStorage).getPrivacyGroupHeadBlockMap(any());
+    verify(privateTransactionSimulator).process(any(), any());
+  }
+
+  @Test
+  public void createsPrivacyGroup() {
+    Assertions.assertThatThrownBy(
+            () -> privacyController.createPrivacyGroup(Collections.emptyList(), "", "", ADDRESS1))
+        .isInstanceOf(PrivacyConfigurationNotSupportedException.class)
+        .hasMessageContaining("Method not supported when using flexible privacy");
+  }
+
+  @Test
+  public void deletesPrivacyGroup() {
+    Assertions.assertThatThrownBy(
+            () -> privacyController.deletePrivacyGroup(PRIVACY_GROUP_ID, ADDRESS1))
+        .isInstanceOf(PrivacyConfigurationNotSupportedException.class)
+        .hasMessageContaining("Method not supported when using flexible privacy");
+  }
+
+  @Test
+  public void sendTransactionWhenEnclaveFailsThrowsEnclaveError() {
+    final TransactionProcessingResult transactionProcessingResult =
+        new TransactionProcessingResult(
+            TransactionProcessingResult.Status.SUCCESSFUL,
+            Collections.emptyList(),
+            0,
+            0,
+            Bytes32.ZERO,
+            ValidationResult.valid(),
+            Optional.empty());
+    when(privateTransactionSimulator.process(any(), any()))
+        .thenReturn(Optional.of(transactionProcessingResult));
+    Assertions.setMaxStackTraceElementsDisplayed(500);
+    assertThatExceptionOfType(EnclaveServerException.class)
+        .isThrownBy(
+            () ->
+                brokenPrivacyController.createPrivateMarkerTransactionPayload(
+                    buildPrivateTransaction(0).signAndBuild(KEY_PAIR),
+                    ADDRESS1,
+                    Optional.of(EXPECTED_PRIVACY_GROUP)));
+  }
+
+  @Test
+  public void validateTransactionWithTooLowNonceReturnsError() {
+    when(privateTransactionValidator.validate(any(), any(), anyBoolean()))
+        .thenReturn(ValidationResult.invalid(PRIVATE_NONCE_TOO_LOW));
+
+    final PrivateTransaction transaction = buildPrivateTransaction(0).build();
+    final ValidationResult<TransactionInvalidReason> validationResult =
+        privacyController.validatePrivateTransaction(transaction, ADDRESS1);
+    assertThat(validationResult).isEqualTo(ValidationResult.invalid(PRIVATE_NONCE_TOO_LOW));
+  }
+
+  @Test
+  public void validateTransactionWithIncorrectNonceReturnsError() {
+    when(privateTransactionValidator.validate(any(), any(), anyBoolean()))
+        .thenReturn(ValidationResult.invalid(PRIVATE_NONCE_TOO_HIGH));
+
+    final PrivateTransaction transaction = buildPrivateTransaction(2).build();
+
+    final ValidationResult<TransactionInvalidReason> validationResult =
+        privacyController.validatePrivateTransaction(transaction, ADDRESS1);
+    assertThat(validationResult).isEqualTo(ValidationResult.invalid(PRIVATE_NONCE_TOO_HIGH));
+  }
+
+  @Test
+  public void retrievesTransaction() {
+    when(enclave.receive(anyString(), anyString()))
+        .thenReturn(new ReceiveResponse(PAYLOAD, PRIVACY_GROUP_ID, null));
+
+    final ReceiveResponse receiveResponse =
+        privacyController.retrieveTransaction(TRANSACTION_KEY, ADDRESS1);
+
+    assertThat(receiveResponse.getPayload()).isEqualTo(PAYLOAD);
+    assertThat(receiveResponse.getPrivacyGroupId()).isEqualTo(PRIVACY_GROUP_ID);
+    verify(enclave).receive(TRANSACTION_KEY, enclavePublicKey);
+  }
+
+  @Test
+  public void findsPrivacyGroupById() {
+    final PrivacyGroup privacyGroup =
+        new PrivacyGroup(
+            PRIVACY_GROUP_ID, PrivacyGroup.Type.FLEXIBLE, "", "", PRIVACY_GROUP_ADDRESSES);
+    mockingForFindPrivacyGroupById();
+
+    final Optional<PrivacyGroup> privacyGroupFound =
+        privacyController.findPrivacyGroupByGroupId(PRIVACY_GROUP_ID, ADDRESS1);
+    assertThat(privacyGroupFound).isPresent();
+    assertThat(privacyGroupFound.get()).usingRecursiveComparison().isEqualTo(privacyGroup);
+  }
+
+  @Test
+  public void findsPrivacyGroupByIdEmpty() {
+    when(privateTransactionSimulator.process(any(), any())).thenReturn(Optional.empty());
+
+    final Optional<PrivacyGroup> privacyGroupFound =
+        privacyController.findPrivacyGroupByGroupId(PRIVACY_GROUP_ID, ADDRESS1);
+    assertThat(privacyGroupFound).isEmpty();
+  }
+
+  private Enclave brokenMockEnclave() {
+    final Enclave mockEnclave = mock(Enclave.class);
+    when(mockEnclave.send(anyString(), anyString(), anyList()))
+        .thenThrow(EnclaveServerException.class);
+    return mockEnclave;
+  }
+
+  private static PrivateTransaction.Builder buildPrivateTransaction(final long nonce) {
+    return PrivateTransaction.builder()
+        .nonce(nonce)
+        .gasPrice(Wei.of(1000))
+        .gasLimit(3000000)
+        .to(Address.fromHexString("0x627306090abab3a6e1400e9345bc60c78a8bef57"))
+        .value(Wei.ZERO)
+        .payload(Bytes.fromHexString("0x00"))
+        .sender(Address.fromHexString("0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"))
+        .chainId(BigInteger.valueOf(1337))
+        .restriction(Restriction.RESTRICTED)
+        .privateFrom(Base64.decode(ADDRESS1))
+        .privacyGroupId(Base64.decode(PRIVACY_GROUP_ID));
+  }
+
+  private Enclave mockEnclave() {
+    final Enclave mockEnclave = mock(Enclave.class);
+    return mockEnclave;
+  }
+
+  private PrivateTransactionValidator mockPrivateTransactionValidator() {
+    final PrivateTransactionValidator validator = mock(PrivateTransactionValidator.class);
+    return validator;
+  }
+
+  private void mockingForFindPrivacyGroupByMembers() {
+    final PrivacyGroupHeadBlockMap privacyGroupHeadBlockMap =
+        new PrivacyGroupHeadBlockMap(
+            Map.of(Bytes32.wrap(Bytes.fromBase64String(PRIVACY_GROUP_ID)), Hash.ZERO));
+    when(privateStateStorage.getPrivacyGroupHeadBlockMap(any()))
+        .thenReturn(Optional.of(privacyGroupHeadBlockMap));
+  }
+
+  private void mockingForFindPrivacyGroupById() {
+    when(privateTransactionSimulator.process(any(), any()))
+        .thenReturn(
+            Optional.of(
+                new TransactionProcessingResult(
+                    TransactionProcessingResult.Status.SUCCESSFUL,
+                    emptyList(),
+                    0,
+                    0,
+                    SIMULATOR_RESULT,
+                    ValidationResult.valid(),
+                    Optional.empty())));
+  }
+
+  private void mockingForCreatesPayloadForAdding() {
+    final SendResponse key = new SendResponse(KEY);
+    when(enclave.send(any(), any(), anyList())).thenReturn(key);
+    final Map<Bytes32, Hash> bytes32HashMap = new HashMap<>();
+    final Bytes32 pgBytes = Bytes32.wrap(Base64.decode(PRIVACY_GROUP_ID));
+    bytes32HashMap.put(pgBytes, Hash.ZERO);
+    when(blockchain.getChainHeadHash()).thenReturn(Hash.ZERO);
+    final Optional<PrivacyGroupHeadBlockMap> privacyGroupHeadBlockMap =
+        Optional.of(new PrivacyGroupHeadBlockMap(bytes32HashMap));
+    when(privateStateStorage.getPrivacyGroupHeadBlockMap(Hash.ZERO))
+        .thenReturn(privacyGroupHeadBlockMap);
+    final List<PrivateTransactionMetadata> privateTransactionMetadata =
+        List.of(new PrivateTransactionMetadata(Hash.ZERO, Hash.ZERO));
+    final PrivateBlockMetadata privateBlockMetadata =
+        new PrivateBlockMetadata(privateTransactionMetadata);
+    when(privateStateStorage.getPrivateBlockMetadata(any(), eq(pgBytes)))
+        .thenReturn(Optional.of(privateBlockMetadata));
+    final BlockHeader blockHeaderMock = mock(BlockHeader.class);
+    final Optional<BlockHeader> maybeBlockHeader = Optional.of(blockHeaderMock);
+    when(blockchain.getBlockHeader(any())).thenReturn(maybeBlockHeader);
+    final Hash hash0x01 = Hash.fromHexString(HEX_STRING_32BYTES_VALUE1);
+    when(blockHeaderMock.getParentHash()).thenReturn(hash0x01);
+    when(privateStateStorage.getPrivacyGroupHeadBlockMap(hash0x01)).thenReturn(Optional.empty());
+    final Transaction transaction =
+        Transaction.builder()
+            .gasLimit(0)
+            .gasPrice(Wei.ZERO)
+            .nonce(0)
+            .payload(Bytes.fromHexString(HEX_STRING_32BYTES_VALUE1))
+            .value(Wei.ZERO)
+            .to(null)
+            .guessType()
+            .signAndBuild(KEY_PAIR);
+    when(blockchain.getTransactionByHash(any())).thenReturn(Optional.ofNullable(transaction));
+    final PrivateTransactionWithMetadata privateTransactionWithMetadata =
+        new PrivateTransactionWithMetadata(
+            buildPrivateTransaction(3).signAndBuild(KEY_PAIR),
+            new PrivateTransactionMetadata(Hash.ZERO, Hash.ZERO));
+    final BytesValueRLPOutput bytesValueRLPOutput = new BytesValueRLPOutput();
+    privateTransactionWithMetadata.writeTo(bytesValueRLPOutput);
+    final byte[] txPayload =
+        bytesValueRLPOutput.encoded().toBase64String().getBytes(StandardCharsets.UTF_8);
+    when(enclave.receive(any(), any()))
+        .thenReturn(new ReceiveResponse(txPayload, PRIVACY_GROUP_ID, ADDRESS2));
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/FlexibleUtilTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/FlexibleUtilTest.java
new file mode 100644
index 00000000000..64d074c7e5d
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/FlexibleUtilTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.privacy;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class FlexibleUtilTest {
+
+  private static final String EXPECTED_EC_PARTICIPANT_1 =
+      "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAES8nC4qT/KdoAoTSF3qs/47DUsDihyVbWiRjZAiyvqp9eSDkqV1RzlM+58oOwnpFRwvWNZM+AxMVxT+MvxdsqMA==";
+
+  private static final String EXPECTED_EC_PARTICIPANT_2 =
+      "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEXIgZqRA25V+3nN+Do6b5r0jiUunub6ubjPhqwHpPxP44uUYh9RKCQNRnsqCJ9PjeTnC8R3ieJk7HWAlycU1bug==";
+
+  @Test
+  public void testGetParticipantsFromParameter() {
+    final String parameterNaCl =
+        "llol7wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACADVpW0zEsJQeYFUdehnPMGA9tb/CPlrEOlb1fyX3VIagAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgKo2bVqD+nNlNYL5EE7y3IdOnviftjiizpjRt+HTuFBs=";
+    final String expectedNaClParticipant1 = "A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
+    final String expectedNaClParticipant2 = "Ko2bVqD+nNlNYL5EE7y3IdOnviftjiizpjRt+HTuFBs=";
+
+    List<String> actualParticipants =
+        FlexibleUtil.getParticipantsFromParameter(Bytes.fromBase64String(parameterNaCl));
+
+    assertThat(actualParticipants).hasSize(2);
+    assertThat(actualParticipants.get(0)).isEqualTo(expectedNaClParticipant1);
+    assertThat(actualParticipants.get(1)).isEqualTo(expectedNaClParticipant2);
+
+    final String parameterEC =
+        "llol7wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFswWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARLycLipP8p2gChNIXeqz/jsNSwOKHJVtaJGNkCLK+qn15IOSpXVHOUz7nyg7CekVHC9Y1kz4DExXFP4y/F2yowAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABFyIGakQNuVft5zfg6Om+a9I4lLp7m+rm4z4asB6T8T+OLlGIfUSgkDUZ7KgifT43k5wvEd4niZOx1gJcnFNW7oAAAAAAA==";
+
+    actualParticipants =
+        FlexibleUtil.getParticipantsFromParameter(Bytes.fromBase64String(parameterEC));
+
+    assertThat(actualParticipants).hasSize(2);
+    assertThat(actualParticipants.get(0)).isEqualTo(EXPECTED_EC_PARTICIPANT_1);
+    assertThat(actualParticipants.get(1)).isEqualTo(EXPECTED_EC_PARTICIPANT_2);
+
+    final String parameterEC2 =
+        "llol7wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABbMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAES8nC4qT/KdoAoTSF3qs/47DUsDihyVbWiRjZAiyvqp9eSDkqV1RzlM+58oOwnpFRwvWNZM+AxMVxT+MvxdsqMAAAAAAA";
+
+    actualParticipants =
+        FlexibleUtil.getParticipantsFromParameter(Bytes.fromBase64String(parameterEC2));
+
+    assertThat(actualParticipants).hasSize(1);
+    assertThat(actualParticipants.get(0)).isEqualTo(EXPECTED_EC_PARTICIPANT_1);
+  }
+
+  @Test
+  public void testDecodeList() {
+    final Bytes rlpEncodedOneParticipant =
+        Bytes.fromBase64String(
+            "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFswWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARLycLipP8p2gChNIXeqz/jsNSwOKHJVtaJGNkCLK+qn15IOSpXVHOUz7nyg7CekVHC9Y1kz4DExXFP4y/F2yowAAAAAAA=");
+
+    List<String> actualParticipants = FlexibleUtil.decodeList(rlpEncodedOneParticipant);
+
+    assertThat(actualParticipants).isEqualTo(Arrays.asList(EXPECTED_EC_PARTICIPANT_1));
+
+    final Bytes wrongBytes =
+        Bytes.fromBase64String(
+            "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==");
+
+    actualParticipants = FlexibleUtil.decodeList(wrongBytes);
+    assertThat(actualParticipants).isEmpty();
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/MultiTenancyPrivacyControllerOnchainTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/MultiTenancyPrivacyControllerOnchainTest.java
index f2b2f47d3bc..012da9c3508 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/MultiTenancyPrivacyControllerOnchainTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/MultiTenancyPrivacyControllerOnchainTest.java
@@ -15,22 +15,20 @@
 package org.hyperledger.besu.ethereum.privacy;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.enclave.Enclave;
-import org.hyperledger.besu.enclave.types.PrivacyGroup;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Log;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.transaction.CallParameter;
+import org.hyperledger.besu.evm.log.Log;
 
-import java.math.BigInteger;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
@@ -46,28 +44,14 @@ public class MultiTenancyPrivacyControllerOnchainTest {
   private static final String ENCLAVE_PUBLIC_KEY2 = "OnviftjiizpjRt+HTuFBsKo2bVqD+nNlNYL5EE7y3Id=";
   private static final String PRIVACY_GROUP_ID = "nNlNYL5EE7y3IdM=";
   private static final ArrayList<Log> LOGS = new ArrayList<>();
-  private static final PrivacyGroup ONCHAIN_PRIVACY_GROUP =
-      new PrivacyGroup("", PrivacyGroup.Type.ONCHAIN, "", "", List.of(ENCLAVE_PUBLIC_KEY1));
 
   private final PrivacyController privacyController = mock(PrivacyController.class);
-  private final Enclave enclave = mock(Enclave.class);
-  private final OnchainPrivacyGroupContract onchainPrivacyGroupContract =
-      mock(OnchainPrivacyGroupContract.class);
 
   private MultiTenancyPrivacyController multiTenancyPrivacyController;
 
   @Before
   public void setup() {
-    when(onchainPrivacyGroupContract.getPrivacyGroupByIdAndBlockNumber(
-            PRIVACY_GROUP_ID, Optional.of(1L)))
-        .thenReturn(Optional.of(ONCHAIN_PRIVACY_GROUP));
-
-    multiTenancyPrivacyController =
-        new MultiTenancyPrivacyController(
-            privacyController,
-            Optional.of(BigInteger.valueOf(2018)),
-            enclave,
-            Optional.of(onchainPrivacyGroupContract));
+    multiTenancyPrivacyController = new MultiTenancyPrivacyController(privacyController);
   }
 
   @Test
@@ -88,12 +72,20 @@ public void simulatePrivateTransactionSucceedsForPresentEnclaveKey() {
     assertThat(result.get().getValidationResult().isValid()).isTrue();
   }
 
-  @Test(expected = MultiTenancyValidationException.class)
+  @Test
   public void simulatePrivateTransactionFailsForAbsentEnclaveKey() {
-    multiTenancyPrivacyController.simulatePrivateTransaction(
-        PRIVACY_GROUP_ID,
-        ENCLAVE_PUBLIC_KEY2,
-        new CallParameter(Address.ZERO, Address.ZERO, 0, Wei.ZERO, Wei.ZERO, Bytes.EMPTY),
-        1);
+    doThrow(
+            new MultiTenancyValidationException(
+                "Privacy group must contain the enclave public key"))
+        .when(privacyController)
+        .verifyPrivacyGroupContainsPrivacyUserId(
+            PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY2, Optional.of(1L));
+    final CallParameter callParams =
+        new CallParameter(Address.ZERO, Address.ZERO, 0, Wei.ZERO, Wei.ZERO, Bytes.EMPTY);
+    assertThatThrownBy(
+            () ->
+                multiTenancyPrivacyController.simulatePrivateTransaction(
+                    PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY2, callParams, 1))
+        .isInstanceOf(MultiTenancyValidationException.class);
   }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/MultiTenancyPrivacyControllerTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/MultiTenancyPrivacyControllerTest.java
index b872613ebcd..3909501556d 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/MultiTenancyPrivacyControllerTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/MultiTenancyPrivacyControllerTest.java
@@ -17,23 +17,20 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.enclave.Enclave;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.enclave.types.PrivacyGroup;
-import org.hyperledger.besu.enclave.types.ReceiveResponse;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Log;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.transaction.CallParameter;
+import org.hyperledger.besu.evm.log.Log;
 
-import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -56,152 +53,96 @@ public class MultiTenancyPrivacyControllerTest {
   private static final ArrayList<Log> LOGS = new ArrayList<>();
   private static final PrivacyGroup PANTHEON_PRIVACY_GROUP =
       new PrivacyGroup("", PrivacyGroup.Type.PANTHEON, "", "", Collections.emptyList());
-  private static final PrivacyGroup PANTHEON_GROUP_WITH_ENCLAVE_KEY_1 =
-      new PrivacyGroup(
-          PRIVACY_GROUP_ID, PrivacyGroup.Type.PANTHEON, "", "", List.of(ENCLAVE_PUBLIC_KEY1));
 
   @Mock private PrivacyController privacyController;
-  @Mock private Enclave enclave;
 
   private MultiTenancyPrivacyController multiTenancyPrivacyController;
 
   @Before
   public void setup() {
-    multiTenancyPrivacyController =
-        new MultiTenancyPrivacyController(
-            privacyController, Optional.of(BigInteger.valueOf(2018)), enclave, false);
+    multiTenancyPrivacyController = new MultiTenancyPrivacyController(privacyController);
   }
 
   @Test
   public void
-      sendsEeaTransactionWithMatchingPrivateFromAndEnclavePublicKeyAndProducesSuccessfulResponse() {
+      sendsEeaTransactionWithMatchingPrivateFromAndPrivacyUserIdAndProducesSuccessfulResponse() {
     final PrivateTransaction transaction =
         PrivateTransaction.builder()
             .privateFrom(Bytes.fromBase64String(ENCLAVE_PUBLIC_KEY1))
             .build();
 
-    when(privacyController.sendTransaction(
+    when(privacyController.createPrivateMarkerTransactionPayload(
             transaction, ENCLAVE_PUBLIC_KEY1, Optional.of(PANTHEON_PRIVACY_GROUP)))
         .thenReturn(ENCLAVE_KEY);
 
     final String enclaveKey =
-        multiTenancyPrivacyController.sendTransaction(
+        multiTenancyPrivacyController.createPrivateMarkerTransactionPayload(
             transaction, ENCLAVE_PUBLIC_KEY1, Optional.of(PANTHEON_PRIVACY_GROUP));
     assertThat(enclaveKey).isEqualTo(ENCLAVE_KEY);
     verify(privacyController)
-        .sendTransaction(transaction, ENCLAVE_PUBLIC_KEY1, Optional.of(PANTHEON_PRIVACY_GROUP));
+        .createPrivateMarkerTransactionPayload(
+            transaction, ENCLAVE_PUBLIC_KEY1, Optional.of(PANTHEON_PRIVACY_GROUP));
   }
 
   @Test
-  public void
-      sendsBesuTransactionWithEnclavePublicKeyInPrivacyGroupAndProducesSuccessfulResponse() {
+  public void sendsBesuTransactionWithPrivacyUserIdInPrivacyGroupAndProducesSuccessfulResponse() {
     final PrivateTransaction transaction =
         PrivateTransaction.builder()
             .privateFrom(Bytes.fromBase64String(ENCLAVE_PUBLIC_KEY1))
             .privacyGroupId(Bytes.fromBase64String(PRIVACY_GROUP_ID))
             .build();
 
-    final PrivacyGroup privacyGroupWithEnclavePublicKey =
+    final PrivacyGroup privacyGroupWithPrivacyUserId =
         new PrivacyGroup(
             PRIVACY_GROUP_ID,
             PrivacyGroup.Type.PANTHEON,
             "",
             "",
             List.of(ENCLAVE_PUBLIC_KEY1, ENCLAVE_PUBLIC_KEY2));
-    when(privacyController.sendTransaction(
-            transaction, ENCLAVE_PUBLIC_KEY1, Optional.of(privacyGroupWithEnclavePublicKey)))
+    when(privacyController.createPrivateMarkerTransactionPayload(
+            transaction, ENCLAVE_PUBLIC_KEY1, Optional.of(privacyGroupWithPrivacyUserId)))
         .thenReturn(ENCLAVE_KEY);
-    when(enclave.retrievePrivacyGroup(PRIVACY_GROUP_ID))
-        .thenReturn(privacyGroupWithEnclavePublicKey);
 
     final String response =
-        multiTenancyPrivacyController.sendTransaction(
-            transaction, ENCLAVE_PUBLIC_KEY1, Optional.of(privacyGroupWithEnclavePublicKey));
+        multiTenancyPrivacyController.createPrivateMarkerTransactionPayload(
+            transaction, ENCLAVE_PUBLIC_KEY1, Optional.of(privacyGroupWithPrivacyUserId));
     assertThat(response).isEqualTo(ENCLAVE_KEY);
     verify(privacyController)
-        .sendTransaction(
-            transaction, ENCLAVE_PUBLIC_KEY1, Optional.of(privacyGroupWithEnclavePublicKey));
-    verify(enclave).retrievePrivacyGroup(PRIVACY_GROUP_ID);
-  }
-
-  @Test
-  public void sendEeaTransactionFailsWithValidationExceptionWhenPrivateFromDoesNotMatch() {
-    final PrivateTransaction transaction =
-        PrivateTransaction.builder()
-            .privateFrom(Bytes.fromBase64String(ENCLAVE_PUBLIC_KEY2))
-            .build();
-
-    assertThatThrownBy(
-            () ->
-                multiTenancyPrivacyController.sendTransaction(
-                    transaction, ENCLAVE_PUBLIC_KEY1, Optional.empty()))
-        .isInstanceOf(MultiTenancyValidationException.class)
-        .hasMessage("Transaction privateFrom must match enclave public key");
-
-    verify(privacyController, never())
-        .sendTransaction(transaction, ENCLAVE_PUBLIC_KEY1, Optional.empty());
-  }
-
-  @Test
-  public void sendBesuTransactionFailsWithValidationExceptionWhenPrivateFromDoesNotMatch() {
-    final PrivateTransaction transaction =
-        PrivateTransaction.builder()
-            .privateFrom(Bytes.fromBase64String(ENCLAVE_PUBLIC_KEY2))
-            .privacyGroupId(Bytes.fromBase64String(PRIVACY_GROUP_ID))
-            .build();
-
-    assertThatThrownBy(
-            () ->
-                multiTenancyPrivacyController.sendTransaction(
-                    transaction, ENCLAVE_PUBLIC_KEY1, Optional.of(PANTHEON_PRIVACY_GROUP)))
-        .isInstanceOf(MultiTenancyValidationException.class)
-        .hasMessage("Transaction privateFrom must match enclave public key");
-
-    verify(privacyController, never())
-        .sendTransaction(transaction, ENCLAVE_PUBLIC_KEY1, Optional.of(PANTHEON_PRIVACY_GROUP));
+        .createPrivateMarkerTransactionPayload(
+            transaction, ENCLAVE_PUBLIC_KEY1, Optional.of(privacyGroupWithPrivacyUserId));
   }
 
   @Test
   public void
-      sendBesuTransactionFailsWithValidationExceptionWhenPrivacyGroupDoesNotContainEnclavePublicKey() {
+      sendBesuTransactionFailsWithValidationExceptionWhenPrivacyGroupDoesNotContainPrivacyUserId() {
     final PrivateTransaction transaction =
         PrivateTransaction.builder()
             .privateFrom(Bytes.fromBase64String(ENCLAVE_PUBLIC_KEY1))
             .privacyGroupId(Bytes.fromBase64String(PRIVACY_GROUP_ID))
             .build();
 
-    final PrivacyGroup privacyGroupWithoutEnclavePublicKey =
+    final PrivacyGroup privacyGroupWithoutPrivacyUserId =
         new PrivacyGroup(
             PRIVACY_GROUP_ID, PrivacyGroup.Type.PANTHEON, "", "", List.of(ENCLAVE_PUBLIC_KEY2));
-    when(enclave.retrievePrivacyGroup(PRIVACY_GROUP_ID))
-        .thenReturn(privacyGroupWithoutEnclavePublicKey);
+
+    doThrow(
+            new MultiTenancyValidationException(
+                "Privacy group must contain the enclave public key"))
+        .when(privacyController)
+        .verifyPrivacyGroupContainsPrivacyUserId(PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY1);
 
     assertThatThrownBy(
             () ->
-                multiTenancyPrivacyController.sendTransaction(
+                multiTenancyPrivacyController.createPrivateMarkerTransactionPayload(
                     transaction,
                     ENCLAVE_PUBLIC_KEY1,
-                    Optional.of(privacyGroupWithoutEnclavePublicKey)))
+                    Optional.of(privacyGroupWithoutPrivacyUserId)))
         .isInstanceOf(MultiTenancyValidationException.class)
         .hasMessage("Privacy group must contain the enclave public key");
 
     verify(privacyController, never())
-        .sendTransaction(
-            transaction, ENCLAVE_PUBLIC_KEY1, Optional.of(privacyGroupWithoutEnclavePublicKey));
-  }
-
-  @Test
-  public void retrieveTransactionDelegatesToPrivacyController() {
-    final ReceiveResponse delegateRetrieveResponse =
-        new ReceiveResponse(new byte[] {}, PRIVACY_GROUP_ID, ENCLAVE_KEY);
-    when(privacyController.retrieveTransaction(ENCLAVE_KEY, ENCLAVE_PUBLIC_KEY1))
-        .thenReturn(delegateRetrieveResponse);
-
-    final ReceiveResponse multiTenancyRetrieveResponse =
-        multiTenancyPrivacyController.retrieveTransaction(ENCLAVE_KEY, ENCLAVE_PUBLIC_KEY1);
-    assertThat(multiTenancyRetrieveResponse)
-        .isEqualToComparingFieldByField(delegateRetrieveResponse);
-    verify(privacyController).retrieveTransaction(ENCLAVE_KEY, ENCLAVE_PUBLIC_KEY1);
+        .createPrivateMarkerTransactionPayload(
+            transaction, ENCLAVE_PUBLIC_KEY1, Optional.of(privacyGroupWithoutPrivacyUserId));
   }
 
   @Test
@@ -218,22 +159,13 @@ public void createPrivacyGroupDelegatesToPrivacyController() {
     final PrivacyGroup privacyGroup =
         multiTenancyPrivacyController.createPrivacyGroup(
             addresses, "name", "description", ENCLAVE_PUBLIC_KEY1);
-    assertThat(privacyGroup).isEqualToComparingFieldByField(delegatePrivacyGroup);
+    assertThat(privacyGroup).usingRecursiveComparison().isEqualTo(delegatePrivacyGroup);
     verify(privacyController)
         .createPrivacyGroup(addresses, "name", "description", ENCLAVE_PUBLIC_KEY1);
   }
 
   @Test
-  public void deletesPrivacyGroupWhenEnclavePublicKeyInPrivacyGroup() {
-    final PrivacyGroup privacyGroupWithEnclavePublicKey =
-        new PrivacyGroup(
-            PRIVACY_GROUP_ID,
-            PrivacyGroup.Type.PANTHEON,
-            "",
-            "",
-            List.of(ENCLAVE_PUBLIC_KEY1, ENCLAVE_PUBLIC_KEY2));
-    when(enclave.retrievePrivacyGroup(PRIVACY_GROUP_ID))
-        .thenReturn(privacyGroupWithEnclavePublicKey);
+  public void deletesPrivacyGroupWhenPrivacyUserIdInPrivacyGroup() {
     when(privacyController.deletePrivacyGroup(PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY1))
         .thenReturn(ENCLAVE_PUBLIC_KEY1);
 
@@ -245,12 +177,12 @@ public void deletesPrivacyGroupWhenEnclavePublicKeyInPrivacyGroup() {
 
   @Test
   public void
-      deletePrivacyGroupFailsWithValidationExceptionWhenPrivacyGroupDoesNotContainEnclavePublicKey() {
-    final PrivacyGroup privacyGroupWithoutEnclavePublicKey =
-        new PrivacyGroup(
-            PRIVACY_GROUP_ID, PrivacyGroup.Type.PANTHEON, "", "", List.of(ENCLAVE_PUBLIC_KEY2));
-    when(enclave.retrievePrivacyGroup(PRIVACY_GROUP_ID))
-        .thenReturn(privacyGroupWithoutEnclavePublicKey);
+      deletePrivacyGroupFailsWithValidationExceptionWhenPrivacyGroupDoesNotContainPrivacyUserId() {
+    doThrow(
+            new MultiTenancyValidationException(
+                "Privacy group must contain the enclave public key"))
+        .when(privacyController)
+        .verifyPrivacyGroupContainsPrivacyUserId(PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY1);
 
     assertThatThrownBy(
             () ->
@@ -261,7 +193,7 @@ public void deletesPrivacyGroupWhenEnclavePublicKeyInPrivacyGroup() {
   }
 
   @Test
-  public void findsPrivacyGroupWhenEnclavePublicKeyInAddresses() {
+  public void findsPrivacyGroupWhenPrivacyUserIdInAddresses() {
     final List<String> addresses = List.of(ENCLAVE_PUBLIC_KEY1, ENCLAVE_PUBLIC_KEY2);
     final PrivacyGroup privacyGroup =
         new PrivacyGroup(
@@ -270,90 +202,50 @@ public void findsPrivacyGroupWhenEnclavePublicKeyInAddresses() {
             "",
             "",
             List.of(ENCLAVE_PUBLIC_KEY1, ENCLAVE_PUBLIC_KEY2));
-    when(privacyController.findOffChainPrivacyGroupByMembers(addresses, ENCLAVE_PUBLIC_KEY1))
+    when(privacyController.findPrivacyGroupByMembers(addresses, ENCLAVE_PUBLIC_KEY1))
         .thenReturn(new PrivacyGroup[] {privacyGroup});
 
     final PrivacyGroup[] privacyGroups =
-        multiTenancyPrivacyController.findOffChainPrivacyGroupByMembers(
-            addresses, ENCLAVE_PUBLIC_KEY1);
+        multiTenancyPrivacyController.findPrivacyGroupByMembers(addresses, ENCLAVE_PUBLIC_KEY1);
     assertThat(privacyGroups).hasSize(1);
-    assertThat(privacyGroups[0]).isEqualToComparingFieldByField(privacyGroup);
-    verify(privacyController).findOffChainPrivacyGroupByMembers(addresses, ENCLAVE_PUBLIC_KEY1);
+    assertThat(privacyGroups[0]).usingRecursiveComparison().isEqualTo(privacyGroup);
+    verify(privacyController).findPrivacyGroupByMembers(addresses, ENCLAVE_PUBLIC_KEY1);
   }
 
   @Test
-  public void findPrivacyGroupFailsWithValidationExceptionWhenEnclavePublicKeyNotInAddresses() {
+  public void findPrivacyGroupFailsWithValidationExceptionWhenPrivacyUserIdNotInAddresses() {
     final List<String> addresses = List.of(ENCLAVE_PUBLIC_KEY2);
 
     assertThatThrownBy(
             () ->
-                multiTenancyPrivacyController.findOffChainPrivacyGroupByMembers(
+                multiTenancyPrivacyController.findPrivacyGroupByMembers(
                     addresses, ENCLAVE_PUBLIC_KEY1))
         .isInstanceOf(MultiTenancyValidationException.class)
         .hasMessage("Privacy group addresses must contain the enclave public key");
   }
 
   @Test
-  public void determinesEeaNonceWhenPrivateFromMatchesEnclavePublicKey() {
-    final String[] privateFor = {ENCLAVE_PUBLIC_KEY2};
-    when(privacyController.determineEeaNonce(
-            ENCLAVE_PUBLIC_KEY1, privateFor, Address.ZERO, ENCLAVE_PUBLIC_KEY1))
-        .thenReturn(10L);
-
-    final long nonce =
-        multiTenancyPrivacyController.determineEeaNonce(
-            ENCLAVE_PUBLIC_KEY1, privateFor, Address.ZERO, ENCLAVE_PUBLIC_KEY1);
-    assertThat(nonce).isEqualTo(10);
-    verify(privacyController)
-        .determineEeaNonce(ENCLAVE_PUBLIC_KEY1, privateFor, Address.ZERO, ENCLAVE_PUBLIC_KEY1);
-  }
-
-  @Test
-  public void
-      determineEeaNonceFailsWithValidationExceptionWhenPrivateFromDoesNotMatchEnclavePublicKey() {
-    final String[] privateFor = {ENCLAVE_PUBLIC_KEY2};
-    assertThatThrownBy(
-            () ->
-                multiTenancyPrivacyController.determineEeaNonce(
-                    ENCLAVE_PUBLIC_KEY2, privateFor, Address.ZERO, ENCLAVE_PUBLIC_KEY1))
-        .isInstanceOf(MultiTenancyValidationException.class)
-        .hasMessage("Transaction privateFrom must match enclave public key");
-  }
-
-  @Test
-  public void determineBesuNonceWhenEnclavePublicKeyInPrivacyGroup() {
-    final PrivacyGroup privacyGroupWithEnclavePublicKey =
-        new PrivacyGroup(
-            PRIVACY_GROUP_ID,
-            PrivacyGroup.Type.PANTHEON,
-            "",
-            "",
-            List.of(ENCLAVE_PUBLIC_KEY1, ENCLAVE_PUBLIC_KEY2));
-    when(enclave.retrievePrivacyGroup(PRIVACY_GROUP_ID))
-        .thenReturn(privacyGroupWithEnclavePublicKey);
-    when(privacyController.determineBesuNonce(Address.ZERO, PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY1))
+  public void determineBesuNonceWhenPrivacyUserIdInPrivacyGroup() {
+    when(privacyController.determineNonce(Address.ZERO, PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY1))
         .thenReturn(10L);
 
     final long nonce =
-        multiTenancyPrivacyController.determineBesuNonce(
+        multiTenancyPrivacyController.determineNonce(
             Address.ZERO, PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY1);
     assertThat(nonce).isEqualTo(10);
-    verify(privacyController)
-        .determineBesuNonce(Address.ZERO, PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY1);
+    verify(privacyController).determineNonce(Address.ZERO, PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY1);
   }
 
   @Test
-  public void
-      determineBesuNonceFailsWithValidationExceptionWhenEnclavePublicKeyNotInPrivacyGroup() {
-    final PrivacyGroup privacyGroupWithoutEnclavePublicKey =
-        new PrivacyGroup(
-            PRIVACY_GROUP_ID, PrivacyGroup.Type.PANTHEON, "", "", List.of(ENCLAVE_PUBLIC_KEY2));
-    when(enclave.retrievePrivacyGroup(PRIVACY_GROUP_ID))
-        .thenReturn(privacyGroupWithoutEnclavePublicKey);
-
+  public void determineBesuNonceFailsWithValidationExceptionWhenPrivacyUserIdNotInPrivacyGroup() {
+    doThrow(
+            new MultiTenancyValidationException(
+                "Privacy group must contain the enclave public key"))
+        .when(privacyController)
+        .verifyPrivacyGroupContainsPrivacyUserId(PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY1);
     assertThatThrownBy(
             () ->
-                multiTenancyPrivacyController.determineBesuNonce(
+                multiTenancyPrivacyController.determineNonce(
                     Address.ZERO, PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY1))
         .isInstanceOf(MultiTenancyValidationException.class)
         .hasMessage("Privacy group must contain the enclave public key");
@@ -361,8 +253,6 @@ public void determineBesuNonceWhenEnclavePublicKeyInPrivacyGroup() {
 
   @Test
   public void simulatePrivateTransactionWorksForValidEnclaveKey() {
-    when(enclave.retrievePrivacyGroup(PRIVACY_GROUP_ID))
-        .thenReturn(PANTHEON_GROUP_WITH_ENCLAVE_KEY_1);
     when(privacyController.simulatePrivateTransaction(any(), any(), any(), any(long.class)))
         .thenReturn(
             Optional.of(
@@ -375,15 +265,18 @@ public void simulatePrivateTransactionWorksForValidEnclaveKey() {
             new CallParameter(Address.ZERO, Address.ZERO, 0, Wei.ZERO, Wei.ZERO, Bytes.EMPTY),
             1);
 
-    assertThat(result.isPresent()).isTrue();
+    assertThat(result).isPresent();
     assertThat(result.get().getValidationResult().isValid()).isTrue();
   }
 
   @Test
   public void simulatePrivateTransactionFailsForInvalidEnclaveKey() {
-    when(enclave.retrievePrivacyGroup(PRIVACY_GROUP_ID))
-        .thenReturn(PANTHEON_GROUP_WITH_ENCLAVE_KEY_1);
-
+    doThrow(
+            new MultiTenancyValidationException(
+                "Privacy group must contain the enclave public key"))
+        .when(privacyController)
+        .verifyPrivacyGroupContainsPrivacyUserId(
+            PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY2, Optional.of(1L));
     assertThatThrownBy(
             () ->
                 multiTenancyPrivacyController.simulatePrivateTransaction(
@@ -399,8 +292,6 @@ public void simulatePrivateTransactionFailsForInvalidEnclaveKey() {
   public void getContractCodeWorksForValidEnclaveKey() {
     final Bytes contractCode = Bytes.fromBase64String("ZXhhbXBsZQ==");
 
-    when(enclave.retrievePrivacyGroup(PRIVACY_GROUP_ID))
-        .thenReturn(PANTHEON_GROUP_WITH_ENCLAVE_KEY_1);
     when(privacyController.getContractCode(any(), any(), any(), any()))
         .thenReturn(Optional.of(contractCode));
 
@@ -413,8 +304,11 @@ public void getContractCodeWorksForValidEnclaveKey() {
 
   @Test
   public void getContractCodeFailsForInvalidEnclaveKey() {
-    when(enclave.retrievePrivacyGroup(PRIVACY_GROUP_ID))
-        .thenReturn(PANTHEON_GROUP_WITH_ENCLAVE_KEY_1);
+    doThrow(
+            new MultiTenancyValidationException(
+                "Privacy group must contain the enclave public key"))
+        .when(privacyController)
+        .verifyPrivacyGroupContainsPrivacyUserId(PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY2);
 
     assertThatThrownBy(
             () ->
@@ -425,21 +319,19 @@ public void getContractCodeFailsForInvalidEnclaveKey() {
 
   @Test
   public void verifyPrivacyGroupMatchesEnclaveKeySucceeds() {
-    when(enclave.retrievePrivacyGroup(PRIVACY_GROUP_ID))
-        .thenReturn(PANTHEON_GROUP_WITH_ENCLAVE_KEY_1);
-
-    multiTenancyPrivacyController.verifyPrivacyGroupContainsEnclavePublicKey(
+    multiTenancyPrivacyController.verifyPrivacyGroupContainsPrivacyUserId(
         PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY1);
-
-    verify(enclave).retrievePrivacyGroup(eq(PRIVACY_GROUP_ID));
   }
 
-  @Test(expected = MultiTenancyValidationException.class)
+  @Test
   public void verifyPrivacyGroupDoesNotMatchEnclaveKeyThrowsException() {
-    when(enclave.retrievePrivacyGroup(PRIVACY_GROUP_ID))
-        .thenReturn(PANTHEON_GROUP_WITH_ENCLAVE_KEY_1);
-
-    multiTenancyPrivacyController.verifyPrivacyGroupContainsEnclavePublicKey(
-        PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY2);
+    doThrow(MultiTenancyValidationException.class)
+        .when(privacyController)
+        .verifyPrivacyGroupContainsPrivacyUserId(PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY2);
+    assertThatThrownBy(
+            () ->
+                multiTenancyPrivacyController.verifyPrivacyGroupContainsPrivacyUserId(
+                    PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY2))
+        .isInstanceOf(MultiTenancyValidationException.class);
   }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateMetadataUpdaterTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateMetadataUpdaterTest.java
index f610c5a6b1c..8f2d9340a1d 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateMetadataUpdaterTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateMetadataUpdaterTest.java
@@ -18,8 +18,8 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.InMemoryPrivacyStorageProvider;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivacyGroupHeadBlockMap;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateBlockMetadata;
@@ -32,7 +32,10 @@
 import org.apache.tuweni.bytes.Bytes32;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class PrivateMetadataUpdaterTest {
 
   private PrivateMetadataUpdater updater;
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateStateGenesisAllocatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateStateGenesisAllocatorTest.java
new file mode 100644
index 00000000000..d44be21cddf
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateStateGenesisAllocatorTest.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.privacy;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.DEFAULT_FLEXIBLE_PRIVACY_MANAGEMENT;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.FLEXIBLE_PRIVACY_PROXY;
+import static org.hyperledger.besu.ethereum.privacy.group.FlexibleGroupManagement.DEFAULT_GROUP_MANAGEMENT_RUNTIME_BYTECODE;
+import static org.hyperledger.besu.ethereum.privacy.group.FlexibleGroupManagement.PROXY_RUNTIME_BYTECODE;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Quantity;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+import org.hyperledger.besu.plugin.data.PrivacyGenesis;
+import org.hyperledger.besu.plugin.data.PrivacyGenesisAccount;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.Test;
+
+public class PrivateStateGenesisAllocatorTest {
+  public static final Hash EMPTY_ROOT_HASH = Hash.wrap(MerkleTrie.EMPTY_TRIE_NODE_HASH);
+
+  private final MutableWorldState worldState =
+      InMemoryKeyValueStorageProvider.createInMemoryWorldState();
+
+  final WorldUpdater updater = worldState.updater();
+
+  Address genesisAddress = Address.fromHexString("0x1000000000000000000000000000000000000001");
+
+  PrivacyGenesis privacyGenesis =
+      () ->
+          List.of(
+              new PrivacyGenesisAccount() {
+                @Override
+                public Address getAddress() {
+                  return genesisAddress;
+                }
+
+                @Override
+                public Map<UInt256, UInt256> getStorage() {
+                  return Collections.emptyMap();
+                }
+
+                @Override
+                public Long getNonce() {
+                  return 0L;
+                }
+
+                @Override
+                public Quantity getBalance() {
+                  return Wei.ONE;
+                }
+
+                @Override
+                public Bytes getCode() {
+                  return Bytes.fromHexString("0x42");
+                }
+              });
+
+  @Test
+  public void whenOnchainDisabledAndNoAccountsProvidedNoGenesisIsApplied() {
+    PrivateStateGenesisAllocator privateStateGenesisAllocator =
+        new PrivateStateGenesisAllocator(
+            false, (privacyGroupId, blockNumber) -> Collections::emptyList);
+
+    privateStateGenesisAllocator.applyGenesisToPrivateWorldState(
+        worldState, updater, Bytes.EMPTY, 0);
+
+    assertThat(worldState.frontierRootHash()).isEqualTo(EMPTY_ROOT_HASH);
+  }
+
+  @Test
+  public void whenOnchainEnabledAndNoAccountsProvidedPrivacyManagementContractIsApplied() {
+    PrivateStateGenesisAllocator privateStateGenesisAllocator =
+        new PrivateStateGenesisAllocator(
+            true, (privacyGroupId, blockNumber) -> Collections::emptyList);
+
+    privateStateGenesisAllocator.applyGenesisToPrivateWorldState(
+        worldState, updater, Bytes.EMPTY, 0);
+
+    assertThat(worldState.frontierRootHash()).isNotEqualTo(EMPTY_ROOT_HASH);
+
+    assertManagementContractApplied();
+  }
+
+  @Test
+  public void whenOnchainEnabledAndAccountsProvidedPrivacyManagementContractAndGenesisIsApplied() {
+    PrivateStateGenesisAllocator privateStateGenesisAllocator =
+        new PrivateStateGenesisAllocator(true, (privacyGroupId, blockNumber) -> privacyGenesis);
+
+    privateStateGenesisAllocator.applyGenesisToPrivateWorldState(
+        worldState, updater, Bytes.EMPTY, 0);
+
+    assertThat(worldState.frontierRootHash()).isNotEqualTo(EMPTY_ROOT_HASH);
+
+    assertManagementContractApplied();
+    assertGenesisAccountApplied();
+  }
+
+  @Test
+  public void whenOnchainDisabledAndAccountsProvidedPrivacyManagementContractAndGenesisIsApplied() {
+    PrivateStateGenesisAllocator privateStateGenesisAllocator =
+        new PrivateStateGenesisAllocator(false, (privacyGroupId, blockNumber) -> privacyGenesis);
+
+    privateStateGenesisAllocator.applyGenesisToPrivateWorldState(
+        worldState, updater, Bytes.EMPTY, 0);
+
+    assertThat(worldState.frontierRootHash()).isNotEqualTo(EMPTY_ROOT_HASH);
+
+    assertThat(worldState.get(FLEXIBLE_PRIVACY_PROXY)).isEqualTo(null);
+
+    assertGenesisAccountApplied();
+  }
+
+  private void assertGenesisAccountApplied() {
+    Account genesisAccount = worldState.get(genesisAddress);
+
+    assertThat(genesisAccount.getCode()).isEqualTo(Bytes.fromHexString("0x42"));
+    assertThat(genesisAccount.getBalance()).isEqualTo(Wei.ONE);
+  }
+
+  private void assertManagementContractApplied() {
+    Account managementProxy = worldState.get(FLEXIBLE_PRIVACY_PROXY);
+    assertThat(managementProxy.getCode()).isEqualTo(PROXY_RUNTIME_BYTECODE);
+    assertThat(managementProxy.getStorageValue(UInt256.ZERO))
+        .isEqualTo(UInt256.fromBytes(DEFAULT_FLEXIBLE_PRIVACY_MANAGEMENT));
+
+    Account managementContract = worldState.get(DEFAULT_FLEXIBLE_PRIVACY_MANAGEMENT);
+    assertThat(managementContract.getCode()).isEqualTo(DEFAULT_GROUP_MANAGEMENT_RUNTIME_BYTECODE);
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateStateRootResolverTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateStateRootResolverTest.java
index ac0e583e33b..3428d74f04c 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateStateRootResolverTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateStateRootResolverTest.java
@@ -16,11 +16,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivacyGroupHeadBlockMap;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateBlockMetadata;
@@ -55,7 +55,8 @@ public class PrivateStateRootResolverTest {
 
   @BeforeClass
   public static void setupClass() {
-    BLOCKCHAIN = InMemoryStorageProvider.createInMemoryBlockchain(BLOCK_GENERATOR.genesisBlock());
+    BLOCKCHAIN =
+        InMemoryKeyValueStorageProvider.createInMemoryBlockchain(BLOCK_GENERATOR.genesisBlock());
     for (int i = 1; i <= 69; i++) {
       final BlockDataGenerator.BlockOptions options =
           new BlockDataGenerator.BlockOptions()
@@ -69,7 +70,7 @@ public static void setupClass() {
 
   @Before
   public void setUp() {
-    privateStateStorage = InMemoryStorageProvider.createInMemoryPrivateStateStorage();
+    privateStateStorage = InMemoryKeyValueStorageProvider.createInMemoryPrivateStateStorage();
   }
 
   @Test
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionLocatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionLocatorTest.java
index 295c699df47..246325806e8 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionLocatorTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionLocatorTest.java
@@ -25,13 +25,13 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.enclave.Enclave;
 import org.hyperledger.besu.enclave.EnclaveClientException;
 import org.hyperledger.besu.enclave.types.ReceiveResponse;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.chain.TransactionLocation;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.PrivateTransactionDataFixture;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivacyGroupHeadBlockMap;
@@ -77,7 +77,7 @@ public void whenPmtDoesNotExistReturnEmpty() {
 
   @Test
   public void locateLegacyPrivateTransactionSentToOffchainPrivacyGroup() {
-    final Transaction pmt = PrivateTransactionDataFixture.privacyMarkerTransaction();
+    final Transaction pmt = PrivateTransactionDataFixture.privateMarkerTransaction();
     final PrivateTransaction privateTransaction = privateTransactionLegacy();
 
     final ExecutedPrivateTransaction expectedPrivateTx =
@@ -91,7 +91,7 @@ public void locateLegacyPrivateTransactionSentToOffchainPrivacyGroup() {
 
   @Test
   public void locateBesuPrivateTransactionSentToOffchainPrivacyGroup() {
-    final Transaction pmt = PrivateTransactionDataFixture.privacyMarkerTransaction();
+    final Transaction pmt = PrivateTransactionDataFixture.privateMarkerTransaction();
     final PrivateTransaction privateTransaction = privateTransactionBesu();
 
     final ExecutedPrivateTransaction expectedPrivateTx =
@@ -125,8 +125,8 @@ private ExecutedPrivateTransaction createExecutedPrivateTransaction(
   }
 
   @Test
-  public void locateBesuPrivateTransactionSentToOnchainPrivacyGroup() {
-    final Transaction pmt = PrivateTransactionDataFixture.privacyMarkerTransactionOnChain();
+  public void locateBesuPrivateTransactionSentToFlexiblePrivacyGroup() {
+    final Transaction pmt = PrivateTransactionDataFixture.privateMarkerTransactionOnchain();
     final PrivateTransaction privateTransaction = privateTransactionBesu();
 
     final ExecutedPrivateTransaction expectedPrivateTx =
@@ -159,8 +159,8 @@ private ExecutedPrivateTransaction createExecutedPrivateTransactionWithVersion(
   }
 
   @Test
-  public void locateBesuPrivateTransactionFromAddBlobSentToOnchainPrivacyGroup() {
-    final Transaction pmt = PrivateTransactionDataFixture.privacyMarkerTransactionOnChain();
+  public void locateBesuPrivateTransactionFromAddBlobSentToFlexiblePrivacyGroup() {
+    final Transaction pmt = PrivateTransactionDataFixture.privateMarkerTransactionOnchain();
     final PrivateTransaction privateTransaction = privateTransactionBesu();
 
     final ExecutedPrivateTransaction expectedPrivateTx =
@@ -174,7 +174,7 @@ public void locateBesuPrivateTransactionFromAddBlobSentToOnchainPrivacyGroup() {
 
   @Test
   public void locatePrivateTransactionWithNoEntryOnPGHeadBlockMap() {
-    final Transaction pmt = PrivateTransactionDataFixture.privacyMarkerTransactionOnChain();
+    final Transaction pmt = PrivateTransactionDataFixture.privateMarkerTransactionOnchain();
     final PrivateTransaction privateTransaction = privateTransactionBesu();
 
     createExecutedPrivateTransactionFromAddBlob(pmt, privateTransaction);
@@ -190,7 +190,7 @@ public void locatePrivateTransactionWithNoEntryOnPGHeadBlockMap() {
 
   @Test
   public void locateBesuPrivateTransactionNotFoundInAddBlob() {
-    final Transaction pmt = PrivateTransactionDataFixture.privacyMarkerTransactionOnChain();
+    final Transaction pmt = PrivateTransactionDataFixture.privateMarkerTransactionOnchain();
     final PrivateTransaction privateTransaction = privateTransactionBesu();
 
     createExecutedPrivateTransactionFromAddBlob(pmt, privateTransaction);
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionTest.java
index db0bd20e7ba..78b0dc8e935 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionTest.java
@@ -15,10 +15,14 @@
 package org.hyperledger.besu.ethereum.privacy;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hyperledger.besu.plugin.data.Restriction.RESTRICTED;
+import static org.hyperledger.besu.plugin.data.Restriction.UNRESTRICTED;
 
-import org.hyperledger.besu.crypto.SECP256K1;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.rlp.RLPException;
@@ -26,6 +30,8 @@
 import java.math.BigInteger;
 import java.util.Optional;
 
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import com.google.common.collect.Lists;
 import org.apache.tuweni.bytes.Bytes;
 import org.junit.Test;
@@ -88,6 +94,9 @@ public class PrivateTransactionTest {
           + "b5bfc23e5ac43a56f57f25f75486ae1a02a8d9b56a0fe9cd94d60be4413bcb7"
           + "21d3a7be27ed8e28b3a6346df874ee141b8a72657374726963746564";
 
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+
   private static final PrivateTransaction VALID_PRIVATE_TRANSACTION =
       new PrivateTransaction(
           0L,
@@ -98,12 +107,14 @@ public class PrivateTransactionTest {
           Wei.of(
               new BigInteger(
                   "115792089237316195423570985008687907853269984665640564039457584007913129639935")),
-          SECP256K1.Signature.create(
-              new BigInteger(
-                  "32886959230931919120748662916110619501838190146643992583529828535682419954515"),
-              new BigInteger(
-                  "14473701025599600909210599917245952381483216609124029382871721729679842002948"),
-              Byte.valueOf("0")),
+          SIGNATURE_ALGORITHM
+              .get()
+              .createSignature(
+                  new BigInteger(
+                      "32886959230931919120748662916110619501838190146643992583529828535682419954515"),
+                  new BigInteger(
+                      "14473701025599600909210599917245952381483216609124029382871721729679842002948"),
+                  Byte.valueOf("0")),
           Bytes.fromHexString("0x"),
           Address.wrap(Bytes.fromHexString("0x8411b12666f68ef74cace3615c9d5a377729d03f")),
           Optional.empty(),
@@ -113,7 +124,7 @@ public class PrivateTransactionTest {
                   Bytes.fromBase64String("A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo="),
                   Bytes.fromBase64String("Ko2bVqD+nNlNYL5EE7y3IdOnviftjiizpjRt+HTuFBs="))),
           Optional.empty(),
-          Restriction.RESTRICTED);
+          RESTRICTED);
 
   private static final PrivateTransaction VALID_PRIVATE_TRANSACTION_PRIVACY_GROUP =
       new PrivateTransaction(
@@ -125,19 +136,47 @@ public class PrivateTransactionTest {
           Wei.of(
               new BigInteger(
                   "115792089237316195423570985008687907853269984665640564039457584007913129639935")),
-          SECP256K1.Signature.create(
-              new BigInteger(
-                  "32886959230931919120748662916110619501838190146643992583529828535682419954515"),
+          SIGNATURE_ALGORITHM
+              .get()
+              .createSignature(
+                  new BigInteger(
+                      "32886959230931919120748662916110619501838190146643992583529828535682419954515"),
+                  new BigInteger(
+                      "14473701025599600909210599917245952381483216609124029382871721729679842002948"),
+                  Byte.valueOf("0")),
+          Bytes.fromHexString("0x"),
+          Address.wrap(Bytes.fromHexString("0x8411b12666f68ef74cace3615c9d5a377729d03f")),
+          Optional.empty(),
+          Bytes.fromBase64String("A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo="),
+          Optional.empty(),
+          Optional.of(Bytes.fromBase64String("DyAOiF/ynpc+JXa2YAGB0bCitSlOMNm+ShmB/7M6C4w=")),
+          RESTRICTED);
+
+  private static final PrivateTransaction VALID_UNRESTRICTED_PRIVATE_TRANSACTION_PRIVACY_GROUP =
+      new PrivateTransaction(
+          0L,
+          Wei.of(1),
+          21000L,
+          Optional.of(
+              Address.wrap(Bytes.fromHexString("0x095e7baea6a6c7c4c2dfeb977efac326af552d87"))),
+          Wei.of(
               new BigInteger(
-                  "14473701025599600909210599917245952381483216609124029382871721729679842002948"),
-              Byte.valueOf("0")),
+                  "115792089237316195423570985008687907853269984665640564039457584007913129639935")),
+          SIGNATURE_ALGORITHM
+              .get()
+              .createSignature(
+                  new BigInteger(
+                      "32886959230931919120748662916110619501838190146643992583529828535682419954515"),
+                  new BigInteger(
+                      "14473701025599600909210599917245952381483216609124029382871721729679842002948"),
+                  Byte.valueOf("0")),
           Bytes.fromHexString("0x"),
           Address.wrap(Bytes.fromHexString("0x8411b12666f68ef74cace3615c9d5a377729d03f")),
           Optional.empty(),
           Bytes.fromBase64String("A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo="),
           Optional.empty(),
           Optional.of(Bytes.fromBase64String("DyAOiF/ynpc+JXa2YAGB0bCitSlOMNm+ShmB/7M6C4w=")),
-          Restriction.RESTRICTED);
+          UNRESTRICTED);
 
   private static final PrivateTransaction VALID_SIGNED_PRIVATE_TRANSACTION =
       PrivateTransaction.builder()
@@ -164,13 +203,17 @@ public class PrivateTransactionTest {
           .privateFor(
               Lists.newArrayList(
                   Bytes.fromBase64String("Ko2bVqD+nNlNYL5EE7y3IdOnviftjiizpjRt+HTuFBs=")))
-          .restriction(Restriction.RESTRICTED)
+          .restriction(RESTRICTED)
           .signAndBuild(
-              SECP256K1.KeyPair.create(
-                  SECP256K1.PrivateKey.create(
-                      new BigInteger(
-                          "853d7f0010fd86d0d7811c1f9d968ea89a24484a8127b4a483ddf5d2cfec766d",
-                          16))));
+              SIGNATURE_ALGORITHM
+                  .get()
+                  .createKeyPair(
+                      SIGNATURE_ALGORITHM
+                          .get()
+                          .createPrivateKey(
+                              new BigInteger(
+                                  "853d7f0010fd86d0d7811c1f9d968ea89a24484a8127b4a483ddf5d2cfec766d",
+                                  16))));
 
   private static final PrivateTransaction VALID_SIGNED_PRIVATE_TRANSACTION_LARGE_CHAINID =
       PrivateTransaction.builder()
@@ -197,31 +240,35 @@ public class PrivateTransactionTest {
           .privateFor(
               Lists.newArrayList(
                   Bytes.fromBase64String("Ko2bVqD+nNlNYL5EE7y3IdOnviftjiizpjRt+HTuFBs=")))
-          .restriction(Restriction.RESTRICTED)
+          .restriction(RESTRICTED)
           .signAndBuild(
-              SECP256K1.KeyPair.create(
-                  SECP256K1.PrivateKey.create(
-                      new BigInteger(
-                          "853d7f0010fd86d0d7811c1f9d968ea89a24484a8127b4a483ddf5d2cfec766d",
-                          16))));
+              SIGNATURE_ALGORITHM
+                  .get()
+                  .createKeyPair(
+                      SIGNATURE_ALGORITHM
+                          .get()
+                          .createPrivateKey(
+                              new BigInteger(
+                                  "853d7f0010fd86d0d7811c1f9d968ea89a24484a8127b4a483ddf5d2cfec766d",
+                                  16))));
 
   @Test
   public void testWriteTo() {
-    BytesValueRLPOutput bvrlpo = new BytesValueRLPOutput();
+    final BytesValueRLPOutput bvrlpo = new BytesValueRLPOutput();
     VALID_PRIVATE_TRANSACTION.writeTo(bvrlpo);
     assertThat(bvrlpo.encoded().toString()).isEqualTo(VALID_PRIVATE_TRANSACTION_RLP);
   }
 
   @Test
   public void testWriteTo_privacyGroup() {
-    BytesValueRLPOutput bvrlpo = new BytesValueRLPOutput();
+    final BytesValueRLPOutput bvrlpo = new BytesValueRLPOutput();
     VALID_PRIVATE_TRANSACTION_PRIVACY_GROUP.writeTo(bvrlpo);
     assertThat(bvrlpo.encoded().toString()).isEqualTo(VALID_PRIVATE_TRANSACTION_RLP_PRIVACY_GROUP);
   }
 
   @Test
   public void testWriteToWithLargeChainId() {
-    BytesValueRLPOutput bvrlpo = new BytesValueRLPOutput();
+    final BytesValueRLPOutput bvrlpo = new BytesValueRLPOutput();
     VALID_SIGNED_PRIVATE_TRANSACTION_LARGE_CHAINID.writeTo(bvrlpo);
     assertThat(bvrlpo.encoded().toString())
         .isEqualTo(VALID_SIGNED_PRIVATE_TRANSACTION_LARGE_CHAINID_RLP);
@@ -229,14 +276,14 @@ public void testWriteToWithLargeChainId() {
 
   @Test
   public void testSignedWriteTo() {
-    BytesValueRLPOutput bvrlpo = new BytesValueRLPOutput();
+    final BytesValueRLPOutput bvrlpo = new BytesValueRLPOutput();
     VALID_SIGNED_PRIVATE_TRANSACTION.writeTo(bvrlpo);
     assertThat(bvrlpo.encoded().toString()).isEqualTo(VALID_SIGNED_PRIVATE_TRANSACTION_RLP);
   }
 
   @Test
   public void testReadFrom() {
-    PrivateTransaction p =
+    final PrivateTransaction p =
         PrivateTransaction.readFrom(
             new BytesValueRLPInput(Bytes.fromHexString(VALID_PRIVATE_TRANSACTION_RLP), false));
 
@@ -245,7 +292,7 @@ public void testReadFrom() {
 
   @Test
   public void testReadFrom_privacyGroup() {
-    PrivateTransaction p =
+    final PrivateTransaction p =
         PrivateTransaction.readFrom(
             new BytesValueRLPInput(
                 Bytes.fromHexString(VALID_PRIVATE_TRANSACTION_RLP_PRIVACY_GROUP), false));
@@ -255,7 +302,7 @@ public void testReadFrom_privacyGroup() {
 
   @Test
   public void testSignedReadFrom() {
-    PrivateTransaction p =
+    final PrivateTransaction p =
         PrivateTransaction.readFrom(
             new BytesValueRLPInput(
                 Bytes.fromHexString(VALID_SIGNED_PRIVATE_TRANSACTION_RLP), false));
@@ -263,14 +310,16 @@ public void testSignedReadFrom() {
     assertThat(p).isEqualTo(VALID_SIGNED_PRIVATE_TRANSACTION);
   }
 
-  @Test(expected = RLPException.class)
+  @Test
   public void testReadFromInvalid() {
-    PrivateTransaction.readFrom(new BytesValueRLPInput(Bytes.fromHexString(INVALID_RLP), false));
+    final BytesValueRLPInput input =
+        new BytesValueRLPInput(Bytes.fromHexString(INVALID_RLP), false);
+    assertThatThrownBy(() -> PrivateTransaction.readFrom(input)).isInstanceOf(RLPException.class);
   }
 
   @Test
   public void testReadFromWithLargeChainId() {
-    PrivateTransaction p =
+    final PrivateTransaction p =
         PrivateTransaction.readFrom(
             new BytesValueRLPInput(
                 Bytes.fromHexString(VALID_SIGNED_PRIVATE_TRANSACTION_LARGE_CHAINID_RLP), false));
@@ -278,24 +327,35 @@ public void testReadFromWithLargeChainId() {
     assertThat(p).isEqualTo(VALID_SIGNED_PRIVATE_TRANSACTION_LARGE_CHAINID);
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testBuildInvalidPrivateTransactionThrowsException() {
-    PrivateTransaction.builder()
-        .nonce(0)
-        .gasPrice(Wei.of(1000))
-        .gasLimit(3000000)
-        .to(Address.fromHexString("0x627306090abab3a6e1400e9345bc60c78a8bef57"))
-        .value(Wei.ZERO)
-        .payload(Bytes.fromHexString("0x"))
-        .sender(Address.fromHexString("0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"))
-        .chainId(BigInteger.valueOf(2018))
-        .privacyGroupId(Bytes.fromBase64String("DyAOiF/ynpc+JXa2YAGB0bCitSlOMNm+ShmB/7M6C4w="))
-        .privateFrom(Bytes.fromBase64String("A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo="))
-        .privateFor(
-            Lists.newArrayList(
-                Bytes.fromBase64String("A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo="),
-                Bytes.fromBase64String("Ko2bVqD+nNlNYL5EE7y3IdOnviftjiizpjRt+HTuFBs=")))
-        .restriction(Restriction.RESTRICTED)
-        .build();
+    final PrivateTransaction.Builder privateTransactionBuilder =
+        PrivateTransaction.builder()
+            .nonce(0)
+            .gasPrice(Wei.of(1000))
+            .gasLimit(3000000)
+            .to(Address.fromHexString("0x627306090abab3a6e1400e9345bc60c78a8bef57"))
+            .value(Wei.ZERO)
+            .payload(Bytes.fromHexString("0x"))
+            .sender(Address.fromHexString("0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"))
+            .chainId(BigInteger.valueOf(1337))
+            .privacyGroupId(Bytes.fromBase64String("DyAOiF/ynpc+JXa2YAGB0bCitSlOMNm+ShmB/7M6C4w="))
+            .privateFrom(Bytes.fromBase64String("A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo="))
+            .privateFor(
+                Lists.newArrayList(
+                    Bytes.fromBase64String("A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo="),
+                    Bytes.fromBase64String("Ko2bVqD+nNlNYL5EE7y3IdOnviftjiizpjRt+HTuFBs=")))
+            .restriction(RESTRICTED);
+    assertThatThrownBy(privateTransactionBuilder::build)
+        .isInstanceOf(IllegalArgumentException.class);
+  }
+
+  @Test
+  public void testRestrictionSerialization() {
+    final BytesValueRLPOutput bvrlpo = new BytesValueRLPOutput();
+    VALID_UNRESTRICTED_PRIVATE_TRANSACTION_PRIVACY_GROUP.writeTo(bvrlpo);
+
+    final BytesValueRLPInput rlp = new BytesValueRLPInput(bvrlpo.encoded(), false);
+    assertThat(PrivateTransaction.readFrom(rlp).getRestriction()).isEqualTo(UNRESTRICTED);
   }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionValidatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionValidatorTest.java
index bba98ce5b13..eefd11e5724 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionValidatorTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateTransactionValidatorTest.java
@@ -15,18 +15,18 @@
 package org.hyperledger.besu.ethereum.privacy;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.INCORRECT_PRIVATE_NONCE;
 import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.INVALID_SIGNATURE;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.PRIVATE_NONCE_TOO_HIGH;
 import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.PRIVATE_NONCE_TOO_LOW;
-import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.PRIVATE_UNIMPLEMENTED_TRANSACTION_TYPE;
 import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.PRIVATE_VALUE_NOT_ZERO;
 import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.REPLAY_PROTECTED_SIGNATURES_NOT_SUPPORTED;
 import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.WRONG_CHAIN_ID;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.PrivateTransactionTestFixture;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
 import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
 
@@ -35,11 +35,15 @@
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class PrivateTransactionValidatorTest {
 
-  private static final KeyPair senderKeys = KeyPair.generate();
+  private static final KeyPair senderKeys =
+      SignatureAlgorithmFactory.getInstance().generateKeyPair();
 
   private PrivateTransactionValidator validator;
 
@@ -66,7 +70,7 @@ public void transactionWithNonceLowerThanAccountNonceShouldAlwaysReturnLowNonceE
     final ValidationResult<TransactionInvalidReason> validationResult =
         validator.validate(privateTransactionWithNonce(3L), 2L, false);
 
-    assertThat(validationResult).isEqualTo(ValidationResult.invalid(INCORRECT_PRIVATE_NONCE));
+    assertThat(validationResult).isEqualTo(ValidationResult.invalid(PRIVATE_NONCE_TOO_HIGH));
   }
 
   @Test
@@ -135,30 +139,6 @@ public void transactionWithNonZeroValueShouldReturnValueNotZeroError() {
     assertThat(validationResult).isEqualTo(ValidationResult.invalid(PRIVATE_VALUE_NOT_ZERO));
   }
 
-  @Test
-  public void
-      transactionWithUnrestrictedTransactionTypeShouldReturnUnimplementedTransactionTypeError() {
-    validator = new PrivateTransactionValidator(Optional.of(BigInteger.ONE));
-
-    final ValidationResult<TransactionInvalidReason> validationResult =
-        validator.validate(privateTransactionWithRestriction(Restriction.UNRESTRICTED), 0L, false);
-
-    assertThat(validationResult)
-        .isEqualTo(ValidationResult.invalid(PRIVATE_UNIMPLEMENTED_TRANSACTION_TYPE));
-  }
-
-  @Test
-  public void
-      transactionWithUnsupportedTransactionTypeShouldReturnUnimplementedTransactionTypeError() {
-    validator = new PrivateTransactionValidator(Optional.of(BigInteger.ONE));
-
-    final ValidationResult<TransactionInvalidReason> validationResult =
-        validator.validate(privateTransactionWithRestriction(Restriction.UNSUPPORTED), 0L, false);
-
-    assertThat(validationResult)
-        .isEqualTo(ValidationResult.invalid(PRIVATE_UNIMPLEMENTED_TRANSACTION_TYPE));
-  }
-
   private PrivateTransaction privateTransactionWithNonce(final long nonce) {
     return new PrivateTransactionTestFixture()
         .nonce(nonce)
@@ -175,10 +155,4 @@ private PrivateTransaction privateTransactionWithChainId(final int chainId) {
   private PrivateTransaction privateTransactionWithValue(final long value) {
     return new PrivateTransactionTestFixture().value(Wei.of(value)).createTransaction(senderKeys);
   }
-
-  private PrivateTransaction privateTransactionWithRestriction(final Restriction restriction) {
-    return new PrivateTransactionTestFixture()
-        .restriction(restriction)
-        .createTransaction(senderKeys);
-  }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateWorldStateReaderTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateWorldStateReaderTest.java
index a476b441387..475ddb33c9c 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateWorldStateReaderTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/PrivateWorldStateReaderTest.java
@@ -17,18 +17,19 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hyperledger.besu.ethereum.core.PrivateTransactionDataFixture.generatePrivateBlockMetadata;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.PrivateTransactionReceiptTestFixture;
-import org.hyperledger.besu.ethereum.core.WorldState;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateBlockMetadata;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateStateStorage;
 import org.hyperledger.besu.ethereum.privacy.storage.PrivateTransactionMetadata;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.worldstate.WorldState;
 
 import java.util.List;
 import java.util.Optional;
@@ -81,7 +82,7 @@ public void absentPrivateWorldStateReturnsEmpty() {
 
     when(privateStateRootResolver.resolveLastStateRoot(eq(privacyGroupBytes), eq(blockHash)))
         .thenReturn(stateRootHash);
-    when(privateWorldStateArchive.get(eq(stateRootHash))).thenReturn(Optional.empty());
+    when(privateWorldStateArchive.get(eq(stateRootHash), any())).thenReturn(Optional.empty());
 
     final Optional<Bytes> maybecontractCode =
         privateWorldStateReader.getContractCode(PRIVACY_GROUP_ID, blockHash, contractAddress);
@@ -96,7 +97,7 @@ public void absentAccountReturnsEmpty() {
 
     when(privateStateRootResolver.resolveLastStateRoot(eq(privacyGroupBytes), eq(blockHash)))
         .thenReturn(stateRootHash);
-    when(privateWorldStateArchive.get(eq(stateRootHash)))
+    when(privateWorldStateArchive.get(eq(stateRootHash), any()))
         .thenReturn(Optional.of(privateWorldState));
     when(privateWorldState.get(eq(contractAddress))).thenReturn(null);
 
@@ -113,7 +114,7 @@ public void existingAccountWithEmptyCodeReturnsEmpty() {
 
     when(privateStateRootResolver.resolveLastStateRoot(eq(privacyGroupBytes), eq(blockHash)))
         .thenReturn(stateRootHash);
-    when(privateWorldStateArchive.get(eq(stateRootHash)))
+    when(privateWorldStateArchive.get(eq(stateRootHash), any()))
         .thenReturn(Optional.of(privateWorldState));
     when(privateWorldState.get(eq(contractAddress))).thenReturn(contractAccount);
     when(contractAccount.getCode()).thenReturn(null);
@@ -128,7 +129,7 @@ public void existingAccountWithEmptyCodeReturnsEmpty() {
   public void existingAccountWithCodeReturnsExpectedBytes() {
     when(privateStateRootResolver.resolveLastStateRoot(eq(PRIVACY_GROUP_ID_BYTES), eq(blockHash)))
         .thenReturn(stateRootHash);
-    when(privateWorldStateArchive.get(eq(stateRootHash)))
+    when(privateWorldStateArchive.get(eq(stateRootHash), any()))
         .thenReturn(Optional.of(privateWorldState));
     when(privateWorldState.get(eq(contractAddress))).thenReturn(contractAccount);
     when(contractAccount.getCode()).thenReturn(contractCode);
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/RestrictedDefaultPrivacyControllerTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/RestrictedDefaultPrivacyControllerTest.java
new file mode 100644
index 00000000000..a793d0b139f
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/RestrictedDefaultPrivacyControllerTest.java
@@ -0,0 +1,296 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.privacy;
+
+import static com.google.common.collect.Lists.newArrayList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.PRIVATE_NONCE_TOO_HIGH;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.PRIVATE_NONCE_TOO_LOW;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.enclave.Enclave;
+import org.hyperledger.besu.enclave.EnclaveServerException;
+import org.hyperledger.besu.enclave.types.PrivacyGroup;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+import org.hyperledger.besu.ethereum.privacy.storage.PrivateStateStorage;
+import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.ethereum.transaction.CallParameter;
+import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.plugin.data.Restriction;
+import org.hyperledger.enclave.testutil.EnclaveKeyUtils;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.io.Base64;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class RestrictedDefaultPrivacyControllerTest {
+
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+  private static final KeyPair KEY_PAIR =
+      SIGNATURE_ALGORITHM
+          .get()
+          .createKeyPair(
+              SIGNATURE_ALGORITHM
+                  .get()
+                  .createPrivateKey(
+                      new BigInteger(
+                          "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63", 16)));
+  private static final List<String> PRIVACY_GROUP_ADDRESSES = newArrayList("8f2a", "fb23");
+  private static final String PRIVACY_GROUP_NAME = "pg_name";
+  private static final String PRIVACY_GROUP_DESCRIPTION = "pg_desc";
+  private static final String ENCLAVE_PUBLIC_KEY = "A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=";
+  private static final String ENCLAVE_KEY2 = "Ko2bVqD+nNlNYL5EE7y3IdOnviftjiizpjRt+HTuFBs=";
+  private static final String PRIVACY_GROUP_ID = "DyAOiF/ynpc+JXa2YAGB0bCitSlOMNm+ShmB/7M6C4w=";
+  private static final ArrayList<Log> LOGS = new ArrayList<>();
+
+  private RestrictedDefaultPrivacyController privacyController;
+  private PrivacyController brokenPrivacyController;
+  private PrivateTransactionValidator privateTransactionValidator;
+  private Enclave enclave;
+  private String enclavePublicKey;
+  private PrivateNonceProvider privateNonceProvider;
+  private PrivateStateRootResolver privateStateRootResolver;
+  private PrivateTransactionSimulator privateTransactionSimulator;
+  private PrivateWorldStateReader privateWorldStateReader;
+  private Blockchain blockchain;
+  private PrivateStateStorage privateStateStorage;
+
+  private Enclave mockEnclave() {
+    final Enclave mockEnclave = mock(Enclave.class);
+    return mockEnclave;
+  }
+
+  private Enclave brokenMockEnclave() {
+    final Enclave mockEnclave = mock(Enclave.class);
+    when(mockEnclave.send(anyString(), anyString(), anyList()))
+        .thenThrow(EnclaveServerException.class);
+    return mockEnclave;
+  }
+
+  private PrivateTransactionValidator mockPrivateTransactionValidator() {
+    final PrivateTransactionValidator validator = mock(PrivateTransactionValidator.class);
+    when(validator.validate(any(), any(), anyBoolean())).thenReturn(ValidationResult.valid());
+    return validator;
+  }
+
+  @Before
+  public void setUp() throws Exception {
+    blockchain = mock(Blockchain.class);
+    privateTransactionSimulator = mock(PrivateTransactionSimulator.class);
+    privateStateStorage = mock(PrivateStateStorage.class);
+    privateNonceProvider = mock(ChainHeadPrivateNonceProvider.class);
+    privateStateRootResolver = mock(PrivateStateRootResolver.class);
+    when(privateNonceProvider.getNonce(any(), any())).thenReturn(1L);
+
+    privateWorldStateReader = mock(PrivateWorldStateReader.class);
+
+    enclavePublicKey = EnclaveKeyUtils.loadKey("enclave_key_0.pub");
+    privateTransactionValidator = mockPrivateTransactionValidator();
+    enclave = mockEnclave();
+
+    privacyController =
+        new RestrictedDefaultPrivacyController(
+            blockchain,
+            privateStateStorage,
+            enclave,
+            privateTransactionValidator,
+            privateTransactionSimulator,
+            privateNonceProvider,
+            privateWorldStateReader,
+            privateStateRootResolver);
+    brokenPrivacyController =
+        new RestrictedDefaultPrivacyController(
+            blockchain,
+            privateStateStorage,
+            brokenMockEnclave(),
+            privateTransactionValidator,
+            privateTransactionSimulator,
+            privateNonceProvider,
+            privateWorldStateReader,
+            privateStateRootResolver);
+  }
+
+  @Test
+  public void sendTransactionWhenEnclaveFailsThrowsEnclaveError() {
+    assertThatExceptionOfType(EnclaveServerException.class)
+        .isThrownBy(
+            () ->
+                brokenPrivacyController.createPrivateMarkerTransactionPayload(
+                    buildLegacyPrivateTransaction(), ENCLAVE_PUBLIC_KEY, Optional.empty()));
+  }
+
+  @Test
+  public void validateTransactionWithTooLowNonceReturnsError() {
+    when(privateTransactionValidator.validate(any(), any(), anyBoolean()))
+        .thenReturn(ValidationResult.invalid(PRIVATE_NONCE_TOO_LOW));
+
+    final PrivateTransaction transaction = buildLegacyPrivateTransaction(0);
+    final ValidationResult<TransactionInvalidReason> validationResult =
+        privacyController.validatePrivateTransaction(transaction, ENCLAVE_PUBLIC_KEY);
+    assertThat(validationResult).isEqualTo(ValidationResult.invalid(PRIVATE_NONCE_TOO_LOW));
+  }
+
+  @Test
+  public void validateTransactionWithIncorrectNonceReturnsError() {
+    when(privateTransactionValidator.validate(any(), any(), anyBoolean()))
+        .thenReturn(ValidationResult.invalid(PRIVATE_NONCE_TOO_HIGH));
+
+    final PrivateTransaction transaction = buildLegacyPrivateTransaction(2);
+
+    final ValidationResult<TransactionInvalidReason> validationResult =
+        privacyController.validatePrivateTransaction(transaction, ENCLAVE_PUBLIC_KEY);
+    assertThat(validationResult).isEqualTo(ValidationResult.invalid(PRIVATE_NONCE_TOO_HIGH));
+  }
+
+  @Test
+  public void createsPrivacyGroup() {
+    final PrivacyGroup enclavePrivacyGroupResponse =
+        new PrivacyGroup(
+            PRIVACY_GROUP_ID,
+            PrivacyGroup.Type.PANTHEON,
+            PRIVACY_GROUP_NAME,
+            PRIVACY_GROUP_DESCRIPTION,
+            PRIVACY_GROUP_ADDRESSES);
+    when(enclave.createPrivacyGroup(any(), any(), any(), any()))
+        .thenReturn(enclavePrivacyGroupResponse);
+
+    final PrivacyGroup privacyGroup =
+        privacyController.createPrivacyGroup(
+            PRIVACY_GROUP_ADDRESSES,
+            PRIVACY_GROUP_NAME,
+            PRIVACY_GROUP_DESCRIPTION,
+            ENCLAVE_PUBLIC_KEY);
+
+    assertThat(privacyGroup).usingRecursiveComparison().isEqualTo(enclavePrivacyGroupResponse);
+    verify(enclave)
+        .createPrivacyGroup(
+            PRIVACY_GROUP_ADDRESSES,
+            enclavePublicKey,
+            PRIVACY_GROUP_NAME,
+            PRIVACY_GROUP_DESCRIPTION);
+  }
+
+  @Test
+  public void deletesPrivacyGroup() {
+    when(enclave.deletePrivacyGroup(anyString(), anyString())).thenReturn(PRIVACY_GROUP_ID);
+
+    final String deletedPrivacyGroupId =
+        privacyController.deletePrivacyGroup(PRIVACY_GROUP_ID, ENCLAVE_PUBLIC_KEY);
+
+    assertThat(deletedPrivacyGroupId).isEqualTo(PRIVACY_GROUP_ID);
+    verify(enclave).deletePrivacyGroup(PRIVACY_GROUP_ID, enclavePublicKey);
+  }
+
+  @Test
+  public void findsPrivacyGroup() {
+    final PrivacyGroup privacyGroup =
+        new PrivacyGroup(
+            PRIVACY_GROUP_ID,
+            PrivacyGroup.Type.PANTHEON,
+            PRIVACY_GROUP_NAME,
+            PRIVACY_GROUP_DESCRIPTION,
+            PRIVACY_GROUP_ADDRESSES);
+    when(enclave.findPrivacyGroup(any())).thenReturn(new PrivacyGroup[] {privacyGroup});
+
+    final PrivacyGroup[] privacyGroups =
+        privacyController.findPrivacyGroupByMembers(PRIVACY_GROUP_ADDRESSES, ENCLAVE_PUBLIC_KEY);
+    assertThat(privacyGroups).hasSize(1);
+    assertThat(privacyGroups[0]).usingRecursiveComparison().isEqualTo(privacyGroup);
+    verify(enclave).findPrivacyGroup(PRIVACY_GROUP_ADDRESSES);
+  }
+
+  @Test
+  public void simulatingPrivateTransactionWorks() {
+    final CallParameter callParameter = mock(CallParameter.class);
+    when(privateTransactionSimulator.process(any(), any(), any(long.class)))
+        .thenReturn(
+            Optional.of(
+                TransactionProcessingResult.successful(
+                    LOGS, 0, 0, Bytes.EMPTY, ValidationResult.valid())));
+    final Optional<TransactionProcessingResult> result =
+        privacyController.simulatePrivateTransaction(
+            "Group1", ENCLAVE_PUBLIC_KEY, callParameter, 1);
+    assertThat(result.isPresent()).isTrue();
+  }
+
+  @Test
+  public void getContractCodeCallsPrivateWorldStateReader() {
+    final Hash blockHash = Hash.ZERO;
+    final Address contractAddress = Address.ZERO;
+    final Bytes contractCode = Bytes.fromBase64String("ZXhhbXBsZQ==");
+
+    when(privateWorldStateReader.getContractCode(
+            eq(PRIVACY_GROUP_ID), eq(blockHash), eq(contractAddress)))
+        .thenReturn(Optional.of(contractCode));
+
+    assertThat(
+            privacyController.getContractCode(
+                PRIVACY_GROUP_ID, contractAddress, blockHash, ENCLAVE_PUBLIC_KEY))
+        .isPresent()
+        .hasValue(contractCode);
+  }
+
+  private static PrivateTransaction buildLegacyPrivateTransaction() {
+    return buildLegacyPrivateTransaction(0);
+  }
+
+  private static PrivateTransaction buildLegacyPrivateTransaction(final long nonce) {
+    return buildPrivateTransaction(nonce)
+        .privateFrom(Base64.decode(ENCLAVE_PUBLIC_KEY))
+        .privateFor(newArrayList(Base64.decode(ENCLAVE_PUBLIC_KEY), Base64.decode(ENCLAVE_KEY2)))
+        .signAndBuild(KEY_PAIR);
+  }
+
+  private static PrivateTransaction.Builder buildPrivateTransaction(final long nonce) {
+    return PrivateTransaction.builder()
+        .nonce(nonce)
+        .gasPrice(Wei.of(1000))
+        .gasLimit(3000000)
+        .to(Address.fromHexString("0x627306090abab3a6e1400e9345bc60c78a8bef57"))
+        .value(Wei.ZERO)
+        .payload(Bytes.fromHexString("0x"))
+        .sender(Address.fromHexString("0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"))
+        .chainId(BigInteger.valueOf(1337))
+        .restriction(Restriction.RESTRICTED);
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/markertransaction/FixedKeySigningPrivateMarkerTransactionFactoryTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/markertransaction/FixedKeySigningPrivateMarkerTransactionFactoryTest.java
index b39faa7787b..48c6e33bbb8 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/markertransaction/FixedKeySigningPrivateMarkerTransactionFactoryTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/markertransaction/FixedKeySigningPrivateMarkerTransactionFactoryTest.java
@@ -16,62 +16,67 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.Util;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
+import org.hyperledger.besu.plugin.data.TransactionType;
 
-import java.util.Base64;
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class FixedKeySigningPrivateMarkerTransactionFactoryTest {
 
-  private final PrivateTransaction privTransaction = mock(PrivateTransaction.class);
-
-  private final Wei gasPrice = Wei.of(100);
-  private final long gasLimit = 500;
-  private final Wei value = Wei.ZERO;
-  private final long providedNonce = 100;
-  private final String enclaveKey = "enclaveKey";
-
-  @Before
-  public void setup() {
-    when(privTransaction.getGasPrice()).thenReturn(gasPrice);
-    when(privTransaction.getGasLimit()).thenReturn(gasLimit);
-    when(privTransaction.getValue()).thenReturn(value);
-  }
-
   @Test
   public void createsFullyPopulatedPrivateMarkerTransactionUsingProvidedNonce() {
+    final PrivateTransaction privTransaction = mock(PrivateTransaction.class);
 
-    final KeyPair signingKeys = KeyPair.generate();
+    final Wei gasPrice = Wei.of(100);
+    final long gasLimit = 500;
+
+    final long providedNonce = 100;
+    final String enclaveKey = "pmtLookupKey";
+
+    final KeyPair signingKeys = SignatureAlgorithmFactory.getInstance().generateKeyPair();
     final Address precompiledAddress = Address.fromHexString("1");
 
     final FixedKeySigningPrivateMarkerTransactionFactory factory =
-        new FixedKeySigningPrivateMarkerTransactionFactory(
-            precompiledAddress, (address) -> providedNonce, signingKeys);
+        new FixedKeySigningPrivateMarkerTransactionFactory(signingKeys);
+
+    final Transaction unsignedPrivateMarkerTransaction =
+        new Transaction.Builder()
+            .type(TransactionType.FRONTIER)
+            .nonce(providedNonce)
+            .gasPrice(gasPrice)
+            .gasLimit(gasLimit)
+            .to(precompiledAddress)
+            .value(Wei.ZERO)
+            .payload(Bytes.fromBase64String(enclaveKey))
+            .build();
 
-    final Transaction transaction = factory.create(enclaveKey, privTransaction);
+    final Transaction transaction =
+        Transaction.readFrom(factory.create(unsignedPrivateMarkerTransaction, privTransaction, ""));
 
     assertThat(transaction.getNonce()).isEqualTo(providedNonce);
-    assertThat(transaction.getGasLimit()).isEqualTo(privTransaction.getGasLimit());
-    assertThat(transaction.getGasPrice()).isEqualTo(privTransaction.getGasPrice());
-    assertThat(transaction.getValue()).isEqualTo(privTransaction.getValue());
+    assertThat(transaction.getGasLimit()).isEqualTo(gasLimit);
+    assertThat(transaction.getGasPrice().get()).isEqualTo(gasPrice);
+    assertThat(transaction.getValue()).isEqualTo(Wei.ZERO);
     assertThat(transaction.getSender())
         .isEqualTo(Util.publicKeyToAddress(signingKeys.getPublicKey()));
     assertThat(transaction.getTo()).isEqualTo(Optional.of(precompiledAddress));
-    assertThat(transaction.getPayload())
-        .isEqualTo(Bytes.wrap(Base64.getDecoder().decode(enclaveKey)));
+    assertThat(transaction.getPayload()).isEqualTo(Bytes.fromBase64String(enclaveKey));
 
-    final Transaction nextTransaction = factory.create("enclaveKey", privTransaction);
+    final Transaction nextTransaction =
+        Transaction.readFrom(factory.create(unsignedPrivateMarkerTransaction, privTransaction, ""));
     assertThat(nextTransaction.getSender()).isEqualTo(transaction.getSender());
   }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/markertransaction/RandomSigningPrivateMarkerTransactionFactoryTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/markertransaction/RandomSigningPrivateMarkerTransactionFactoryTest.java
index f9026ba5412..7eeea0ed6ea 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/markertransaction/RandomSigningPrivateMarkerTransactionFactoryTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/markertransaction/RandomSigningPrivateMarkerTransactionFactoryTest.java
@@ -16,54 +16,61 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.privacy.PrivateTransaction;
+import org.hyperledger.besu.plugin.data.TransactionType;
 
-import java.util.Base64;
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class RandomSigningPrivateMarkerTransactionFactoryTest {
 
-  private final PrivateTransaction privTransaction = mock(PrivateTransaction.class);
+  @Test
+  public void producedTransactionHasZeroNonceAndDifferentSendThanPrior() {
 
-  private final Wei gasPrice = Wei.of(100);
-  private final long gasLimit = 500;
-  private final Wei value = Wei.ZERO;
-  private final String enclaveKey = "enclaveKey";
+    final PrivateTransaction privTransaction = mock(PrivateTransaction.class);
 
-  @Before
-  public void setup() {
-    when(privTransaction.getGasPrice()).thenReturn(gasPrice);
-    when(privTransaction.getGasLimit()).thenReturn(gasLimit);
-    when(privTransaction.getValue()).thenReturn(value);
-  }
+    final Wei gasPrice = Wei.of(100);
+    final long gasLimit = 500;
+    final String enclaveKey = "enclaveKey";
+    final long providedNonce = 0;
 
-  @Test
-  public void producedTransactionHasZeroNonceAndDifferentSendThanPrior() {
     final Address precompiledAddress = Address.fromHexString("1");
 
+    final Transaction unsignedPrivateMarkerTransaction =
+        new Transaction.Builder()
+            .type(TransactionType.FRONTIER)
+            .nonce(providedNonce)
+            .gasPrice(gasPrice)
+            .gasLimit(gasLimit)
+            .to(precompiledAddress)
+            .value(Wei.ZERO)
+            .payload(Bytes.fromBase64String(enclaveKey))
+            .build();
+
     final RandomSigningPrivateMarkerTransactionFactory factory =
-        new RandomSigningPrivateMarkerTransactionFactory(precompiledAddress);
+        new RandomSigningPrivateMarkerTransactionFactory();
 
-    final Transaction transaction = factory.create(enclaveKey, privTransaction);
+    final Transaction transaction =
+        Transaction.readFrom(factory.create(unsignedPrivateMarkerTransaction, privTransaction, ""));
 
     assertThat(transaction.getNonce()).isEqualTo(0);
-    assertThat(transaction.getGasLimit()).isEqualTo(privTransaction.getGasLimit());
-    assertThat(transaction.getGasPrice()).isEqualTo(privTransaction.getGasPrice());
-    assertThat(transaction.getValue()).isEqualTo(privTransaction.getValue());
+    assertThat(transaction.getGasLimit()).isEqualTo(gasLimit);
+    assertThat(transaction.getGasPrice().get()).isEqualTo(gasPrice);
+    assertThat(transaction.getValue()).isEqualTo(Wei.ZERO);
     assertThat(transaction.getTo()).isEqualTo(Optional.of(precompiledAddress));
-    assertThat(transaction.getPayload())
-        .isEqualTo(Bytes.wrap(Base64.getDecoder().decode(enclaveKey)));
+    assertThat(transaction.getPayload()).isEqualTo(Bytes.fromBase64String(enclaveKey));
 
-    final Transaction nextTransaction = factory.create("enclaveKey", privTransaction);
+    final Transaction nextTransaction =
+        Transaction.readFrom(factory.create(unsignedPrivateMarkerTransaction, privTransaction, ""));
     assertThat(nextTransaction.getSender()).isNotEqualTo(transaction.getSender());
   }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/storage/migration/PrivateStorageMigrationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/storage/migration/PrivateStorageMigrationTest.java
index c3f0b31bcdc..b17bcddab72 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/storage/migration/PrivateStorageMigrationTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/privacy/storage/migration/PrivateStorageMigrationTest.java
@@ -16,27 +16,28 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.hyperledger.besu.ethereum.core.PrivateTransactionDataFixture.privacyMarkerTransaction;
+import static org.hyperledger.besu.ethereum.core.PrivacyParameters.DEFAULT_PRIVACY;
+import static org.hyperledger.besu.ethereum.core.PrivateTransactionDataFixture.privateMarkerTransaction;
 import static org.hyperledger.besu.ethereum.privacy.PrivateStateRootResolver.EMPTY_ROOT_HASH;
 import static org.hyperledger.besu.ethereum.privacy.storage.PrivateStateKeyValueStorage.SCHEMA_VERSION_1_0_0;
 import static org.hyperledger.besu.ethereum.privacy.storage.PrivateStateKeyValueStorage.SCHEMA_VERSION_1_4_0;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.mainnet.AbstractBlockProcessor.TransactionReceiptFactory;
 import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
 import org.hyperledger.besu.ethereum.mainnet.MiningBeneficiaryCalculator;
@@ -77,7 +78,7 @@ public class PrivateStorageMigrationTest {
   private static final String PRIVACY_GROUP_ID = "tJw12cPM6EZRF5zfHv2zLePL0cqlaDjLn0x1T/V0yzE=";
   public static final Bytes32 PRIVACY_GROUP_BYTES =
       Bytes32.wrap(Bytes.fromBase64String(PRIVACY_GROUP_ID));
-  private static final Address PRIVACY_ADDRESS = Address.DEFAULT_PRIVACY;
+  private static final Address PRIVACY_ADDRESS = DEFAULT_PRIVACY;
 
   @Mock private Blockchain blockchain;
   @Mock private ProtocolSchedule protocolSchedule;
@@ -101,7 +102,7 @@ public void setUp() {
     privateStateStorage = new PrivateStateKeyValueStorage(kvStorage);
     privateStateRootResolver = new PrivateStateRootResolver(privateStateStorage);
 
-    lenient().when(protocolSchedule.getByBlockNumber(anyLong())).thenReturn(protocolSpec);
+    lenient().when(protocolSchedule.getByBlockHeader(any())).thenReturn(protocolSpec);
     lenient().when(protocolSpec.getTransactionProcessor()).thenReturn(transactionProcessor);
     lenient()
         .when(protocolSpec.getTransactionReceiptFactory())
@@ -125,6 +126,7 @@ public void setUp() {
   }
 
   @Test
+  @SuppressWarnings("DirectInvocationOnMock")
   public void privateGroupHeadBlocKMapIsCopiedFromPreviousBlocks() {
     mockBlockchainWithZeroTransactions();
 
@@ -146,8 +148,8 @@ public void privateGroupHeadBlocKMapIsCopiedFromPreviousBlocks() {
 
   @Test
   public void successfulMigrationBumpsSchemaVersion() {
-    final Transaction privacyMarkerTransaction = createPrivacyMarkerTransaction();
-    mockBlockchainWithPrivacyMarkerTransaction(privacyMarkerTransaction);
+    final Transaction privateMarkerTransaction = createPrivateMarkerTransaction();
+    mockBlockchainWithPrivateMarkerTransaction(privateMarkerTransaction);
     assertThat(privateStateStorage.getSchemaVersion()).isEqualTo(SCHEMA_VERSION_1_0_0);
 
     migration.migratePrivateStorage();
@@ -157,8 +159,8 @@ public void successfulMigrationBumpsSchemaVersion() {
 
   @Test
   public void failedMigrationThrowsErrorAndDoesNotBumpSchemaVersion() {
-    final Transaction privacyMarkerTransaction = createPrivacyMarkerTransaction();
-    mockBlockchainWithPrivacyMarkerTransaction(privacyMarkerTransaction);
+    final Transaction privateMarkerTransaction = createPrivateMarkerTransaction();
+    mockBlockchainWithPrivateMarkerTransaction(privateMarkerTransaction);
     final Hash rootHashOtherThanZero = Hash.wrap(Bytes32.fromHexStringLenient("1"));
     createPrivacyGroupHeadBlockInitialMapAndMetadata(PRIVACY_GROUP_BYTES, rootHashOtherThanZero);
 
@@ -184,9 +186,10 @@ public void migrationInBlockchainWithZeroPMTsDoesNotReprocessAnyBlocks() {
   }
 
   @Test
+  @SuppressWarnings("DirectInvocationOnMock")
   public void migrationReprocessBlocksWithPMT() {
-    final Transaction privacyMarkerTransaction = createPrivacyMarkerTransaction();
-    mockBlockchainWithPrivacyMarkerTransaction(privacyMarkerTransaction);
+    final Transaction privateMarkerTransaction = createPrivateMarkerTransaction();
+    mockBlockchainWithPrivateMarkerTransaction(privateMarkerTransaction);
     final Block blockWithPMT = blockchain.getBlockByNumber(1L).orElseThrow();
 
     migration.migratePrivateStorage();
@@ -207,7 +210,7 @@ public void migrationReprocessBlocksWithPMT() {
   public void migrationOnlyProcessRequiredTransactions() {
     final List<Transaction> transactions = new ArrayList<>();
     transactions.add(publicTransaction());
-    transactions.add(createPrivacyMarkerTransaction());
+    transactions.add(createPrivateMarkerTransaction());
     transactions.add(publicTransaction());
 
     mockBlockchainWithTransactionsInABlock(transactions);
@@ -239,10 +242,10 @@ private PrivacyGroupHeadBlockMap createPrivacyGroupHeadBlockInitialMapAndMetadat
     return existingPgHeadMap;
   }
 
-  private Transaction createPrivacyMarkerTransaction() {
-    final Transaction privacyMarkerTransaction = privacyMarkerTransaction();
-    mockBlockchainWithPrivacyMarkerTransaction(privacyMarkerTransaction);
-    return privacyMarkerTransaction;
+  private Transaction createPrivateMarkerTransaction() {
+    final Transaction privateMarkerTransaction = privateMarkerTransaction();
+    mockBlockchainWithPrivateMarkerTransaction(privateMarkerTransaction);
+    return privateMarkerTransaction;
   }
 
   private void mockBlockchainWithZeroTransactions() {
@@ -264,7 +267,7 @@ private void mockBlockchainWithZeroTransactions() {
         .thenReturn(Optional.of(EMPTY_ROOT_HASH));
   }
 
-  private void mockBlockchainWithPrivacyMarkerTransaction(final Transaction transaction) {
+  private void mockBlockchainWithPrivateMarkerTransaction(final Transaction transaction) {
     final BlockDataGenerator blockDataGenerator = new BlockDataGenerator();
 
     final Block genesis = blockDataGenerator.genesisBlock();
@@ -297,11 +300,13 @@ private void mockBlockchainWithTransactionsInABlock(final List<Transaction> tran
   }
 
   private void mockBlockInBlockchain(final Block block) {
-    when(blockchain.getBlockByNumber(block.getHeader().getNumber())).thenReturn(Optional.of(block));
-    when(blockchain.getBlockHeader(block.getHash())).thenReturn(Optional.of(block.getHeader()));
-    when(blockchain.getBlockBody(block.getHash())).thenReturn(Optional.of(block.getBody()));
+    final BlockHeader blockHeader = block.getHeader();
+    final Hash blockHash = block.getHash();
+    when(blockchain.getBlockByNumber(blockHeader.getNumber())).thenReturn(Optional.of(block));
+    when(blockchain.getBlockHeader(blockHash)).thenReturn(Optional.of(blockHeader));
+    when(blockchain.getBlockBody(blockHash)).thenReturn(Optional.of(block.getBody()));
 
-    when(publicWorldStateArchive.getMutable(block.getHeader().getStateRoot()))
+    when(publicWorldStateArchive.getMutable(blockHeader.getStateRoot(), blockHash))
         .thenReturn(Optional.of(publicMutableWorldState));
   }
 
@@ -319,7 +324,7 @@ private Transaction publicTransaction() {
         .value(Wei.ZERO)
         .payload(Bytes.EMPTY)
         .sender(Address.fromHexString("0xfe3b557e8fb62b89f4916b721be55ceb828dbd73"))
-        .chainId(BigInteger.valueOf(2018))
-        .signAndBuild(KeyPair.generate());
+        .chainId(BigInteger.valueOf(1337))
+        .signAndBuild(SignatureAlgorithmFactory.getInstance().generateKeyPair());
   }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/proof/WorldStateProofProviderTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/proof/WorldStateProofProviderTest.java
index 921c924d3a5..a6269f9bb24 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/proof/WorldStateProofProviderTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/proof/WorldStateProofProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -16,13 +16,13 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage;
-import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie;
-import org.hyperledger.besu.ethereum.trie.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
 import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
 import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
@@ -67,8 +67,9 @@ public void getProofWhenWorldStateNotAvailable() {
 
   @Test
   public void getProofWhenWorldStateAvailable() {
-    final MerklePatriciaTrie<Bytes32, Bytes> worldStateTrie = emptyWorldStateTrie();
-    final MerklePatriciaTrie<Bytes32, Bytes> storageTrie = emptyStorageTrie();
+    final Hash addressHash = Hash.hash(address);
+    final MerkleTrie<Bytes32, Bytes> worldStateTrie = emptyWorldStateTrie(addressHash);
+    final MerkleTrie<Bytes32, Bytes> storageTrie = emptyStorageTrie();
 
     final WorldStateStorage.Updater updater = worldStateStorage.updater();
 
@@ -77,14 +78,14 @@ public void getProofWhenWorldStateAvailable() {
     writeStorageValue(storageTrie, UInt256.valueOf(2L), UInt256.valueOf(4L));
     writeStorageValue(storageTrie, UInt256.valueOf(3L), UInt256.valueOf(6L));
     // Save to Storage
-    storageTrie.commit(updater::putAccountStorageTrieNode);
+    storageTrie.commit(
+        (location, hash, value) ->
+            updater.putAccountStorageTrieNode(addressHash, location, hash, value));
 
     // Define account value
-    final Hash addressHash = Hash.hash(address);
     final Hash codeHash = Hash.hash(Bytes.fromHexString("0x1122"));
     final StateTrieAccountValue accountValue =
-        new StateTrieAccountValue(
-            1L, Wei.of(2L), Hash.wrap(storageTrie.getRootHash()), codeHash, 0);
+        new StateTrieAccountValue(1L, Wei.of(2L), Hash.wrap(storageTrie.getRootHash()), codeHash);
     // Save to storage
     worldStateTrie.put(addressHash, RLP.encode(accountValue::writeTo));
     worldStateTrie.commit(updater::putAccountStateTrieNode);
@@ -120,7 +121,7 @@ public void getProofWhenWorldStateAvailable() {
 
   @Test
   public void getProofWhenStateTrieAccountUnavailable() {
-    final MerklePatriciaTrie<Bytes32, Bytes> worldStateTrie = emptyWorldStateTrie();
+    final MerkleTrie<Bytes32, Bytes> worldStateTrie = emptyWorldStateTrie(null);
 
     final Optional<WorldStateProof> accountProof =
         worldStateProofProvider.getAccountProof(
@@ -130,27 +131,28 @@ public void getProofWhenStateTrieAccountUnavailable() {
   }
 
   private void writeStorageValue(
-      final MerklePatriciaTrie<Bytes32, Bytes> storageTrie,
-      final UInt256 key,
-      final UInt256 value) {
+      final MerkleTrie<Bytes32, Bytes> storageTrie, final UInt256 key, final UInt256 value) {
     storageTrie.put(storageKeyHash(key), encodeStorageValue(value));
   }
 
   private Bytes32 storageKeyHash(final UInt256 storageKey) {
-    return Hash.hash(storageKey.toBytes());
+    return Hash.hash(storageKey);
   }
 
   private Bytes encodeStorageValue(final UInt256 storageValue) {
     return RLP.encode(out -> out.writeBytes(storageValue.toMinimalBytes()));
   }
 
-  private MerklePatriciaTrie<Bytes32, Bytes> emptyStorageTrie() {
+  private MerkleTrie<Bytes32, Bytes> emptyStorageTrie() {
     return new StoredMerklePatriciaTrie<>(
         worldStateStorage::getAccountStateTrieNode, b -> b, b -> b);
   }
 
-  private MerklePatriciaTrie<Bytes32, Bytes> emptyWorldStateTrie() {
+  private MerkleTrie<Bytes32, Bytes> emptyWorldStateTrie(final Hash accountHash) {
     return new StoredMerklePatriciaTrie<>(
-        worldStateStorage::getAccountStorageTrieNode, b -> b, b -> b);
+        (location, hash) ->
+            worldStateStorage.getAccountStorageTrieNode(accountHash, location, hash),
+        b -> b,
+        b -> b);
   }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/proof/WorldStateRangeProofProviderTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/proof/WorldStateRangeProofProviderTest.java
new file mode 100644
index 00000000000..e09e041b354
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/proof/WorldStateRangeProofProviderTest.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.proof;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.TrieGenerator;
+import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.RangeStorageEntriesCollector;
+import org.hyperledger.besu.ethereum.trie.TrieIterator;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.Before;
+import org.junit.Test;
+
+public class WorldStateRangeProofProviderTest {
+
+  private static final Hash MAX_RANGE =
+      Hash.fromHexString("0x0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
+
+  private static final WorldStateStorage worldStateStorage =
+      new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+
+  private static WorldStateProofProvider worldStateProofProvider;
+
+  @Before
+  public void setup() {
+    worldStateProofProvider = new WorldStateProofProvider(worldStateStorage);
+  }
+
+  @Test
+  public void rangeProofValidationNominalCase() {
+    final MerkleTrie<Bytes, Bytes> accountStateTrie =
+        TrieGenerator.generateTrie(worldStateStorage, 15);
+    // collect accounts in range
+    final RangeStorageEntriesCollector collector =
+        RangeStorageEntriesCollector.createCollector(Hash.ZERO, MAX_RANGE, 10, Integer.MAX_VALUE);
+    final TrieIterator<Bytes> visitor = RangeStorageEntriesCollector.createVisitor(collector);
+    final TreeMap<Bytes32, Bytes> accounts =
+        (TreeMap<Bytes32, Bytes>)
+            accountStateTrie.entriesFrom(
+                root ->
+                    RangeStorageEntriesCollector.collectEntries(
+                        collector, visitor, root, Hash.ZERO));
+    // generate the proof
+    final List<Bytes> proofs =
+        worldStateProofProvider.getAccountProofRelatedNodes(
+            Hash.wrap(accountStateTrie.getRootHash()), Hash.ZERO);
+    proofs.addAll(
+        worldStateProofProvider.getAccountProofRelatedNodes(
+            Hash.wrap(accountStateTrie.getRootHash()), accounts.lastKey()));
+
+    // validate the range proof
+    boolean isValidRangeProof =
+        worldStateProofProvider.isValidRangeProof(
+            Bytes32.ZERO, accounts.lastKey(), accountStateTrie.getRootHash(), proofs, accounts);
+    assertThat(isValidRangeProof).isTrue();
+  }
+
+  @Test
+  public void rangeProofValidationMissingAccount() {
+    MerkleTrie<Bytes, Bytes> accountStateTrie = TrieGenerator.generateTrie(worldStateStorage, 15);
+    // collect accounts in range
+    final RangeStorageEntriesCollector collector =
+        RangeStorageEntriesCollector.createCollector(Hash.ZERO, MAX_RANGE, 10, Integer.MAX_VALUE);
+    final TrieIterator<Bytes> visitor = RangeStorageEntriesCollector.createVisitor(collector);
+    final TreeMap<Bytes32, Bytes> accounts =
+        (TreeMap<Bytes32, Bytes>)
+            accountStateTrie.entriesFrom(
+                root ->
+                    RangeStorageEntriesCollector.collectEntries(
+                        collector, visitor, root, Hash.ZERO));
+
+    // generate the proof
+    final List<Bytes> proofs =
+        worldStateProofProvider.getAccountProofRelatedNodes(
+            Hash.wrap(accountStateTrie.getRootHash()), Hash.ZERO);
+    proofs.addAll(
+        worldStateProofProvider.getAccountProofRelatedNodes(
+            Hash.wrap(accountStateTrie.getRootHash()), accounts.lastKey()));
+
+    // remove an account
+    final Iterator<Map.Entry<Bytes32, Bytes>> iterator = accounts.entrySet().iterator();
+    int i = 0;
+    while (iterator.hasNext()) {
+      iterator.next();
+      i++;
+      if (i == 7) iterator.remove();
+    }
+    // validate the range proof
+    boolean isValidRangeProof =
+        worldStateProofProvider.isValidRangeProof(
+            Bytes32.ZERO, accounts.lastKey(), accountStateTrie.getRootHash(), proofs, accounts);
+    assertThat(isValidRangeProof).isFalse();
+  }
+
+  @Test
+  public void rangeProofValidationNoMonotonicIncreasing() {
+    MerkleTrie<Bytes, Bytes> accountStateTrie = TrieGenerator.generateTrie(worldStateStorage, 15);
+
+    // generate the invalid proof
+    final RangeStorageEntriesCollector collector =
+        RangeStorageEntriesCollector.createCollector(Hash.ZERO, MAX_RANGE, 12, Integer.MAX_VALUE);
+    final TrieIterator<Bytes> invalidVisitor =
+        RangeStorageEntriesCollector.createVisitor(collector);
+    final TreeMap<Bytes32, Bytes> accounts =
+        (TreeMap<Bytes32, Bytes>)
+            accountStateTrie.entriesFrom(
+                root ->
+                    RangeStorageEntriesCollector.collectEntries(
+                        collector, invalidVisitor, root, Hash.ZERO));
+    final List<Bytes> proofs =
+        worldStateProofProvider.getAccountProofRelatedNodes(
+            Hash.wrap(accountStateTrie.getRootHash()), Hash.ZERO);
+    proofs.addAll(
+        worldStateProofProvider.getAccountProofRelatedNodes(
+            Hash.wrap(accountStateTrie.getRootHash()), accounts.lastKey()));
+
+    accounts.remove(Hash.ZERO);
+
+    accounts.putIfAbsent(Hash.ZERO, Bytes.EMPTY);
+    // validate the range proof
+    boolean isValidRangeProof =
+        worldStateProofProvider.isValidRangeProof(
+            Bytes32.ZERO,
+            accounts.lastKey(),
+            accountStateTrie.getRootHash(),
+            new ArrayList<>(),
+            accounts);
+    assertThat(isValidRangeProof).isFalse();
+  }
+
+  @Test
+  public void rangeProofValidationEmptyProof() {
+    MerkleTrie<Bytes, Bytes> accountStateTrie = TrieGenerator.generateTrie(worldStateStorage, 15);
+
+    // generate the invalid proof
+    final RangeStorageEntriesCollector collector =
+        RangeStorageEntriesCollector.createCollector(Hash.ZERO, MAX_RANGE, 15, Integer.MAX_VALUE);
+    final TrieIterator<Bytes> invalidVisitor =
+        RangeStorageEntriesCollector.createVisitor(collector);
+    final TreeMap<Bytes32, Bytes> accounts =
+        (TreeMap<Bytes32, Bytes>)
+            accountStateTrie.entriesFrom(
+                root ->
+                    RangeStorageEntriesCollector.collectEntries(
+                        collector, invalidVisitor, root, Hash.ZERO));
+
+    // validate the range proof
+    boolean isValidRangeProof =
+        worldStateProofProvider.isValidRangeProof(
+            Bytes32.ZERO,
+            accounts.lastKey(),
+            accountStateTrie.getRootHash(),
+            new ArrayList<>(),
+            accounts);
+    assertThat(isValidRangeProof).isTrue();
+  }
+
+  @Test
+  public void rangeProofValidationInvalidEmptyProof() {
+    MerkleTrie<Bytes, Bytes> accountStateTrie = TrieGenerator.generateTrie(worldStateStorage, 15);
+
+    // generate the invalid proof
+    final RangeStorageEntriesCollector collector =
+        RangeStorageEntriesCollector.createCollector(Hash.ZERO, MAX_RANGE, 9, Integer.MAX_VALUE);
+    final TrieIterator<Bytes> invalidVisitor =
+        RangeStorageEntriesCollector.createVisitor(collector);
+    final TreeMap<Bytes32, Bytes> accounts =
+        (TreeMap<Bytes32, Bytes>)
+            accountStateTrie.entriesFrom(
+                root ->
+                    RangeStorageEntriesCollector.collectEntries(
+                        collector, invalidVisitor, root, Hash.ZERO));
+
+    // validate the range proof
+    boolean isValidRangeProof =
+        worldStateProofProvider.isValidRangeProof(
+            Bytes32.ZERO,
+            accounts.lastKey(),
+            accountStateTrie.getRootHash(),
+            new ArrayList<>(),
+            accounts);
+    assertThat(isValidRangeProof).isFalse();
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStoragePrefixedKeyBlockchainStorageTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStoragePrefixedKeyBlockchainStorageTest.java
new file mode 100644
index 00000000000..1e89581a095
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStoragePrefixedKeyBlockchainStorageTest.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.storage.keyvalue;
+
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.CHAIN_HEAD_HASH;
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.FINALIZED_BLOCK_HASH;
+import static org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys.SAFE_BLOCK_HASH;
+import static org.hyperledger.besu.ethereum.core.VariablesStorageHelper.SAMPLE_CHAIN_HEAD;
+import static org.hyperledger.besu.ethereum.core.VariablesStorageHelper.assertNoVariablesInStorage;
+import static org.hyperledger.besu.ethereum.core.VariablesStorageHelper.assertVariablesPresentInVariablesStorage;
+import static org.hyperledger.besu.ethereum.core.VariablesStorageHelper.assertVariablesReturnedByBlockchainStorage;
+import static org.hyperledger.besu.ethereum.core.VariablesStorageHelper.getSampleVariableValues;
+import static org.hyperledger.besu.ethereum.core.VariablesStorageHelper.populateBlockchainStorage;
+import static org.hyperledger.besu.ethereum.core.VariablesStorageHelper.populateVariablesStorage;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+
+import org.hyperledger.besu.ethereum.chain.VariablesStorage;
+import org.hyperledger.besu.ethereum.chain.VariablesStorage.Keys;
+import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
+import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
+
+import java.util.Map;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class KeyValueStoragePrefixedKeyBlockchainStorageTest {
+  private final BlockHeaderFunctions blockHeaderFunctions = mock(BlockHeaderFunctions.class);
+  private KeyValueStorage kvBlockchain;
+  private KeyValueStorage kvVariables;
+  private VariablesStorage variablesStorage;
+  private Map<Keys, Bytes> variableValues;
+
+  @BeforeEach
+  public void setup() {
+    kvBlockchain = new InMemoryKeyValueStorage();
+    kvVariables = new InMemoryKeyValueStorage();
+    variablesStorage = new VariablesKeyValueStorage(kvVariables);
+    variableValues = getSampleVariableValues();
+  }
+
+  @Test
+  public void migrationToVariablesStorage() {
+    populateBlockchainStorage(kvBlockchain, variableValues);
+
+    assertNoVariablesInStorage(kvVariables);
+
+    final var blockchainStorage =
+        new KeyValueStoragePrefixedKeyBlockchainStorage(
+            kvBlockchain, variablesStorage, blockHeaderFunctions);
+
+    assertNoVariablesInStorage(kvBlockchain);
+    assertVariablesPresentInVariablesStorage(kvVariables, variableValues);
+
+    assertVariablesReturnedByBlockchainStorage(blockchainStorage, variableValues);
+  }
+
+  @Test
+  public void migrationToVariablesStorageWhenSomeVariablesDoNotExist() {
+    variableValues.remove(FINALIZED_BLOCK_HASH);
+    variableValues.remove(SAFE_BLOCK_HASH);
+    populateBlockchainStorage(kvBlockchain, variableValues);
+
+    assertNoVariablesInStorage(kvVariables);
+
+    final var blockchainStorage =
+        new KeyValueStoragePrefixedKeyBlockchainStorage(
+            kvBlockchain, variablesStorage, blockHeaderFunctions);
+
+    assertNoVariablesInStorage(kvBlockchain);
+    assertVariablesPresentInVariablesStorage(kvVariables, variableValues);
+
+    assertVariablesReturnedByBlockchainStorage(blockchainStorage, variableValues);
+  }
+
+  @Test
+  public void doesNothingIfVariablesAlreadyMigrated() {
+    populateVariablesStorage(kvVariables, variableValues);
+
+    assertNoVariablesInStorage(kvBlockchain);
+
+    final var blockchainStorage =
+        new KeyValueStoragePrefixedKeyBlockchainStorage(
+            kvBlockchain, variablesStorage, blockHeaderFunctions);
+
+    assertNoVariablesInStorage(kvBlockchain);
+    assertVariablesPresentInVariablesStorage(kvVariables, variableValues);
+
+    assertVariablesReturnedByBlockchainStorage(blockchainStorage, variableValues);
+  }
+
+  @Test
+  public void failIfInconsistencyDetectedDuringVariablesMigration() {
+    populateBlockchainStorage(kvBlockchain, variableValues);
+    // create and inconsistency putting a different chain head in variables storage
+    variableValues.put(CHAIN_HEAD_HASH, SAMPLE_CHAIN_HEAD.shiftLeft(1));
+    populateVariablesStorage(kvVariables, variableValues);
+    assertThrows(
+        IllegalStateException.class,
+        () ->
+            new KeyValueStoragePrefixedKeyBlockchainStorage(
+                kvBlockchain, variablesStorage, blockHeaderFunctions));
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStorageWorldStateStorageTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStorageWorldStateStorageTest.java
index 8dfb871b979..994964b2982 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStorageWorldStateStorageTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStorageWorldStateStorageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -16,9 +16,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage.Updater;
-import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
 import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
 
 import org.apache.tuweni.bytes.Bytes;
@@ -30,23 +30,22 @@ public class KeyValueStorageWorldStateStorageTest {
   @Test
   public void getCode_returnsEmpty() {
     final WorldStateKeyValueStorage storage = emptyStorage();
-    assertThat(storage.getCode(Hash.EMPTY)).contains(Bytes.EMPTY);
+    assertThat(storage.getCode(Hash.EMPTY, null)).contains(Bytes.EMPTY);
   }
 
   @Test
   public void getAccountStateTrieNode_returnsEmptyNode() {
     final WorldStateKeyValueStorage storage = emptyStorage();
-    assertThat(
-            storage.getAccountStateTrieNode(Bytes.EMPTY, MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH))
-        .contains(MerklePatriciaTrie.EMPTY_TRIE_NODE);
+    assertThat(storage.getAccountStateTrieNode(Bytes.EMPTY, MerkleTrie.EMPTY_TRIE_NODE_HASH))
+        .contains(MerkleTrie.EMPTY_TRIE_NODE);
   }
 
   @Test
   public void getAccountStorageTrieNode_returnsEmptyNode() {
     final WorldStateKeyValueStorage storage = emptyStorage();
     assertThat(
-            storage.getAccountStorageTrieNode(Bytes.EMPTY, MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH))
-        .contains(MerklePatriciaTrie.EMPTY_TRIE_NODE);
+            storage.getAccountStorageTrieNode(null, Bytes.EMPTY, MerkleTrie.EMPTY_TRIE_NODE_HASH))
+        .contains(MerkleTrie.EMPTY_TRIE_NODE);
   }
 
   @Test
@@ -58,27 +57,27 @@ public void getNodeData_returnsEmptyValue() {
   @Test
   public void getNodeData_returnsEmptyNode() {
     final WorldStateKeyValueStorage storage = emptyStorage();
-    assertThat(storage.getNodeData(Bytes.EMPTY, MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH))
-        .contains(MerklePatriciaTrie.EMPTY_TRIE_NODE);
+    assertThat(storage.getNodeData(Bytes.EMPTY, MerkleTrie.EMPTY_TRIE_NODE_HASH))
+        .contains(MerkleTrie.EMPTY_TRIE_NODE);
   }
 
   @Test
   public void getCode_saveAndGetSpecialValues() {
     final WorldStateKeyValueStorage storage = emptyStorage();
-    storage.updater().putCode(MerklePatriciaTrie.EMPTY_TRIE_NODE).putCode(Bytes.EMPTY).commit();
+    storage.updater().putCode(null, MerkleTrie.EMPTY_TRIE_NODE).putCode(null, Bytes.EMPTY).commit();
 
-    assertThat(storage.getCode(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH))
-        .contains(MerklePatriciaTrie.EMPTY_TRIE_NODE);
-    assertThat(storage.getCode(Hash.EMPTY)).contains(Bytes.EMPTY);
+    assertThat(storage.getCode(MerkleTrie.EMPTY_TRIE_NODE_HASH, null))
+        .contains(MerkleTrie.EMPTY_TRIE_NODE);
+    assertThat(storage.getCode(Hash.EMPTY, null)).contains(Bytes.EMPTY);
   }
 
   @Test
   public void getCode_saveAndGetRegularValue() {
     final Bytes bytes = Bytes.fromHexString("0x123456");
     final WorldStateKeyValueStorage storage = emptyStorage();
-    storage.updater().putCode(bytes).commit();
+    storage.updater().putCode(null, bytes).commit();
 
-    assertThat(storage.getCode(Hash.hash(bytes))).contains(bytes);
+    assertThat(storage.getCode(Hash.hash(bytes), null)).contains(bytes);
   }
 
   @Test
@@ -87,13 +86,12 @@ public void getAccountStateTrieNode_saveAndGetSpecialValues() {
     storage
         .updater()
         .putAccountStateTrieNode(
-            null, Hash.hash(MerklePatriciaTrie.EMPTY_TRIE_NODE), MerklePatriciaTrie.EMPTY_TRIE_NODE)
+            null, Hash.hash(MerkleTrie.EMPTY_TRIE_NODE), MerkleTrie.EMPTY_TRIE_NODE)
         .putAccountStateTrieNode(null, Hash.hash(Bytes.EMPTY), Bytes.EMPTY)
         .commit();
 
-    assertThat(
-            storage.getAccountStateTrieNode(Bytes.EMPTY, MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH))
-        .contains(MerklePatriciaTrie.EMPTY_TRIE_NODE);
+    assertThat(storage.getAccountStateTrieNode(Bytes.EMPTY, MerkleTrie.EMPTY_TRIE_NODE_HASH))
+        .contains(MerkleTrie.EMPTY_TRIE_NODE);
     assertThat(storage.getAccountStateTrieNode(Bytes.EMPTY, Hash.EMPTY)).contains(Bytes.EMPTY);
   }
 
@@ -112,21 +110,22 @@ public void getAccountStorageTrieNode_saveAndGetSpecialValues() {
     storage
         .updater()
         .putAccountStorageTrieNode(
-            null, Hash.hash(MerklePatriciaTrie.EMPTY_TRIE_NODE), MerklePatriciaTrie.EMPTY_TRIE_NODE)
-        .putAccountStorageTrieNode(null, Hash.hash(Bytes.EMPTY), Bytes.EMPTY)
+            null, null, Hash.hash(MerkleTrie.EMPTY_TRIE_NODE), MerkleTrie.EMPTY_TRIE_NODE)
+        .putAccountStorageTrieNode(null, null, Hash.hash(Bytes.EMPTY), Bytes.EMPTY)
         .commit();
 
     assertThat(
-            storage.getAccountStorageTrieNode(Bytes.EMPTY, MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH))
-        .contains(MerklePatriciaTrie.EMPTY_TRIE_NODE);
-    assertThat(storage.getAccountStorageTrieNode(Bytes.EMPTY, Hash.EMPTY)).contains(Bytes.EMPTY);
+            storage.getAccountStorageTrieNode(null, Bytes.EMPTY, MerkleTrie.EMPTY_TRIE_NODE_HASH))
+        .contains(MerkleTrie.EMPTY_TRIE_NODE);
+    assertThat(storage.getAccountStorageTrieNode(null, Bytes.EMPTY, Hash.EMPTY))
+        .contains(Bytes.EMPTY);
   }
 
   @Test
   public void getAccountStorageTrieNode_saveAndGetRegularValue() {
     final Bytes bytes = Bytes.fromHexString("0x123456");
     final WorldStateKeyValueStorage storage = emptyStorage();
-    storage.updater().putAccountStorageTrieNode(null, Hash.hash(bytes), bytes).commit();
+    storage.updater().putAccountStorageTrieNode(null, null, Hash.hash(bytes), bytes).commit();
 
     assertThat(storage.getAccountStateTrieNode(Bytes.EMPTY, Hash.hash(bytes))).contains(bytes);
   }
@@ -137,12 +136,12 @@ public void getNodeData_saveAndGetSpecialValues() {
     storage
         .updater()
         .putAccountStorageTrieNode(
-            null, Hash.hash(MerklePatriciaTrie.EMPTY_TRIE_NODE), MerklePatriciaTrie.EMPTY_TRIE_NODE)
-        .putAccountStorageTrieNode(null, Hash.hash(Bytes.EMPTY), Bytes.EMPTY)
+            null, null, Hash.hash(MerkleTrie.EMPTY_TRIE_NODE), MerkleTrie.EMPTY_TRIE_NODE)
+        .putAccountStorageTrieNode(null, null, Hash.hash(Bytes.EMPTY), Bytes.EMPTY)
         .commit();
 
-    assertThat(storage.getNodeData(Bytes.EMPTY, MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH))
-        .contains(MerklePatriciaTrie.EMPTY_TRIE_NODE);
+    assertThat(storage.getNodeData(Bytes.EMPTY, MerkleTrie.EMPTY_TRIE_NODE_HASH))
+        .contains(MerkleTrie.EMPTY_TRIE_NODE);
     assertThat(storage.getNodeData(Bytes.EMPTY, Hash.EMPTY)).contains(Bytes.EMPTY);
   }
 
@@ -150,7 +149,7 @@ public void getNodeData_saveAndGetSpecialValues() {
   public void getNodeData_saveAndGetRegularValue() {
     final Bytes bytes = Bytes.fromHexString("0x123456");
     final WorldStateKeyValueStorage storage = emptyStorage();
-    storage.updater().putAccountStorageTrieNode(null, Hash.hash(bytes), bytes).commit();
+    storage.updater().putAccountStorageTrieNode(null, null, Hash.hash(bytes), bytes).commit();
 
     assertThat(storage.getNodeData(null, Hash.hash(bytes))).contains(bytes);
   }
@@ -165,27 +164,27 @@ public void reconcilesNonConflictingUpdaters() {
     final Updater updaterA = storage.updater();
     final Updater updaterB = storage.updater();
 
-    updaterA.putCode(bytesA);
-    updaterB.putCode(bytesA);
-    updaterB.putCode(bytesB);
-    updaterA.putCode(bytesC);
+    updaterA.putCode(null, bytesA);
+    updaterB.putCode(null, bytesA);
+    updaterB.putCode(null, bytesB);
+    updaterA.putCode(null, bytesC);
 
     updaterA.commit();
     updaterB.commit();
 
-    assertThat(storage.getCode(Hash.hash(bytesA))).contains(bytesA);
-    assertThat(storage.getCode(Hash.hash(bytesB))).contains(bytesB);
-    assertThat(storage.getCode(Hash.hash(bytesC))).contains(bytesC);
+    assertThat(storage.getCode(Hash.hash(bytesA), null)).contains(bytesA);
+    assertThat(storage.getCode(Hash.hash(bytesB), null)).contains(bytesB);
+    assertThat(storage.getCode(Hash.hash(bytesC), null)).contains(bytesC);
   }
 
   @Test
   public void isWorldStateAvailable_defaultIsFalse() {
-    assertThat(emptyStorage().isWorldStateAvailable(UInt256.valueOf(1).toBytes())).isFalse();
+    assertThat(emptyStorage().isWorldStateAvailable(UInt256.valueOf(1), null)).isFalse();
   }
 
   @Test
   public void isWorldStateAvailable_emptyTrieStateAlwaysAvailable() {
-    assertThat(emptyStorage().isWorldStateAvailable(Hash.EMPTY_TRIE_HASH)).isTrue();
+    assertThat(emptyStorage().isWorldStateAvailable(Hash.EMPTY_TRIE_HASH, null)).isTrue();
   }
 
   private WorldStateKeyValueStorage emptyStorage() {
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorTest.java
index 9ebd9fc3f97..5f955441d2b 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorTest.java
@@ -20,32 +20,39 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.EvmAccount;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
+import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.Difficulty;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
 import org.hyperledger.besu.ethereum.mainnet.ImmutableTransactionValidationParams;
 import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult.Status;
-import org.hyperledger.besu.ethereum.vm.OperationTracer;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+import org.hyperledger.besu.plugin.data.TransactionType;
 
+import java.math.BigInteger;
 import java.util.Optional;
 
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import org.apache.tuweni.bytes.Bytes;
 import org.junit.Before;
 import org.junit.Test;
@@ -57,25 +64,26 @@
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class TransactionSimulatorTest {
 
-  private static final SECP256K1.Signature FAKE_SIGNATURE =
-      SECP256K1.Signature.create(SECP256K1.HALF_CURVE_ORDER, SECP256K1.HALF_CURVE_ORDER, (byte) 0);
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+  private static final BigInteger HALF_CURVE_ORDER = SIGNATURE_ALGORITHM.get().getHalfCurveOrder();
+  private static final SECPSignature FAKE_SIGNATURE =
+      SIGNATURE_ALGORITHM.get().createSignature(HALF_CURVE_ORDER, HALF_CURVE_ORDER, (byte) 0);
 
   private static final Address DEFAULT_FROM =
       Address.fromHexString("0x0000000000000000000000000000000000000000");
 
-  private static final Hash DEFAULT_BLOCK_HEADER_HASH =
-      Hash.fromHexString("0x0000000000000000000000000000000000000000000000000000000000000001");
-
   private TransactionSimulator transactionSimulator;
 
   @Mock private Blockchain blockchain;
   @Mock private WorldStateArchive worldStateArchive;
   @Mock private MutableWorldState worldState;
-  @Mock private WorldUpdater worldUpdater;
   @Mock private ProtocolSchedule protocolSchedule;
   @Mock private ProtocolSpec protocolSpec;
   @Mock private MainnetTransactionProcessor transactionProcessor;
 
+  private final BlockHeaderTestFixture blockHeaderTestFixture = new BlockHeaderTestFixture();
+
   @Before
   public void setUp() {
     this.transactionSimulator =
@@ -96,11 +104,15 @@ public void shouldReturnEmptyWhenBlockDoesNotExist() {
   public void shouldReturnSuccessfulResultWhenProcessingIsSuccessful() {
     final CallParameter callParameter = legacyTransactionCallParameter();
 
-    mockBlockchainForBlockHeader(Hash.ZERO, 1L);
-    mockWorldStateForAccount(Hash.ZERO, callParameter.getFrom(), 1L);
+    final BlockHeader blockHeader =
+        blockHeaderTestFixture.number(1L).stateRoot(Hash.ZERO).buildHeader();
+
+    mockBlockchainForBlockHeader(blockHeader);
+    mockWorldStateForAccount(blockHeader, callParameter.getFrom(), 1L);
 
     final Transaction expectedTransaction =
         Transaction.builder()
+            .type(TransactionType.FRONTIER)
             .nonce(1L)
             .gasPrice(callParameter.getGasPrice())
             .gasLimit(callParameter.getGasLimit())
@@ -110,7 +122,7 @@ public void shouldReturnSuccessfulResultWhenProcessingIsSuccessful() {
             .payload(callParameter.getPayload())
             .signature(FAKE_SIGNATURE)
             .build();
-    mockProcessorStatusForTransaction(1L, expectedTransaction, Status.SUCCESSFUL);
+    mockProcessorStatusForTransaction(expectedTransaction, Status.SUCCESSFUL);
 
     final Optional<TransactionSimulatorResult> result =
         transactionSimulator.process(callParameter, 1L);
@@ -120,16 +132,20 @@ public void shouldReturnSuccessfulResultWhenProcessingIsSuccessful() {
   }
 
   @Test
-  public void shouldIncreaseBalanceAccountWhenExceedingBalanceAllowed() {
-    final CallParameter callParameter = legacyTransactionCallParameter();
+  public void shouldSetGasPriceToZeroWhenExceedingBalanceAllowed() {
+    final CallParameter callParameter = legacyTransactionCallParameter(Wei.ONE);
+
+    final BlockHeader blockHeader =
+        blockHeaderTestFixture.number(1L).stateRoot(Hash.ZERO).buildHeader();
 
-    mockBlockchainForBlockHeader(Hash.ZERO, 1L);
-    mockWorldStateForAccount(Hash.ZERO, callParameter.getFrom(), 1L);
+    mockBlockchainForBlockHeader(blockHeader);
+    mockWorldStateForAccount(blockHeader, callParameter.getFrom(), 1L);
 
     final Transaction expectedTransaction =
         Transaction.builder()
+            .type(TransactionType.FRONTIER)
             .nonce(1L)
-            .gasPrice(callParameter.getGasPrice())
+            .gasPrice(Wei.ZERO)
             .gasLimit(callParameter.getGasLimit())
             .to(callParameter.getTo())
             .sender(callParameter.getFrom())
@@ -138,10 +154,42 @@ public void shouldIncreaseBalanceAccountWhenExceedingBalanceAllowed() {
             .signature(FAKE_SIGNATURE)
             .build();
 
-    mockProcessorStatusForTransaction(1L, expectedTransaction, Status.SUCCESSFUL);
+    mockProcessorStatusForTransaction(expectedTransaction, Status.SUCCESSFUL);
+
+    transactionSimulator.process(
+        callParameter,
+        ImmutableTransactionValidationParams.builder().isAllowExceedingBalance(true).build(),
+        OperationTracer.NO_TRACING,
+        1L);
+
+    verifyTransactionWasProcessed(expectedTransaction);
+  }
+
+  @Test
+  public void shouldSetFeePerGasToZeroWhenExceedingBalanceAllowed() {
+    final CallParameter callParameter = eip1559TransactionCallParameter(Wei.ONE, Wei.ONE);
+
+    final BlockHeader blockHeader = mockBlockHeader(Hash.ZERO, 1L, Wei.ONE);
 
-    final MutableAccount mutableAccount =
-        mockWorldUpdaterForAccount(Hash.ZERO, callParameter.getFrom());
+    mockBlockchainForBlockHeader(blockHeader);
+    mockWorldStateForAccount(blockHeader, callParameter.getFrom(), 1L);
+
+    final Transaction expectedTransaction =
+        Transaction.builder()
+            .type(TransactionType.EIP1559)
+            .chainId(BigInteger.ONE)
+            .nonce(1L)
+            .gasLimit(callParameter.getGasLimit())
+            .maxFeePerGas(Wei.ZERO)
+            .maxPriorityFeePerGas(Wei.ZERO)
+            .to(callParameter.getTo())
+            .sender(callParameter.getFrom())
+            .value(callParameter.getValue())
+            .payload(callParameter.getPayload())
+            .signature(FAKE_SIGNATURE)
+            .build();
+
+    mockProcessorStatusForTransaction(expectedTransaction, Status.SUCCESSFUL);
 
     transactionSimulator.process(
         callParameter,
@@ -149,18 +197,22 @@ public void shouldIncreaseBalanceAccountWhenExceedingBalanceAllowed() {
         OperationTracer.NO_TRACING,
         1L);
 
-    verify(mutableAccount).incrementBalance(Wei.of(Long.MAX_VALUE));
+    verifyTransactionWasProcessed(expectedTransaction);
   }
 
   @Test
-  public void shouldNotIncreaseBalanceAccountWhenExceedingBalanceIsNotAllowed() {
-    final CallParameter callParameter = legacyTransactionCallParameter();
+  public void shouldNotSetGasPriceToZeroWhenExceedingBalanceIsNotAllowed() {
+    final CallParameter callParameter = legacyTransactionCallParameter(Wei.ONE);
+
+    final BlockHeader blockHeader =
+        blockHeaderTestFixture.number(1L).stateRoot(Hash.ZERO).buildHeader();
 
-    mockBlockchainForBlockHeader(Hash.ZERO, 1L);
-    mockWorldStateForAccount(Hash.ZERO, callParameter.getFrom(), 1L);
+    mockBlockchainForBlockHeader(blockHeader);
+    mockWorldStateForAccount(blockHeader, callParameter.getFrom(), 1L);
 
     final Transaction expectedTransaction =
         Transaction.builder()
+            .type(TransactionType.FRONTIER)
             .nonce(1L)
             .gasPrice(callParameter.getGasPrice())
             .gasLimit(callParameter.getGasLimit())
@@ -171,10 +223,42 @@ public void shouldNotIncreaseBalanceAccountWhenExceedingBalanceIsNotAllowed() {
             .signature(FAKE_SIGNATURE)
             .build();
 
-    mockProcessorStatusForTransaction(1L, expectedTransaction, Status.SUCCESSFUL);
+    mockProcessorStatusForTransaction(expectedTransaction, Status.SUCCESSFUL);
+
+    transactionSimulator.process(
+        callParameter,
+        ImmutableTransactionValidationParams.builder().isAllowExceedingBalance(false).build(),
+        OperationTracer.NO_TRACING,
+        1L);
+
+    verifyTransactionWasProcessed(expectedTransaction);
+  }
+
+  @Test
+  public void shouldNotSetFeePerGasToZeroWhenExceedingBalanceIsNotAllowed() {
+    final CallParameter callParameter = eip1559TransactionCallParameter(Wei.ONE, Wei.ONE);
+
+    final BlockHeader blockHeader = mockBlockHeader(Hash.ZERO, 1L, Wei.ONE);
+
+    mockBlockchainForBlockHeader(blockHeader);
+    mockWorldStateForAccount(blockHeader, callParameter.getFrom(), 1L);
+
+    final Transaction expectedTransaction =
+        Transaction.builder()
+            .type(TransactionType.EIP1559)
+            .chainId(BigInteger.ONE)
+            .nonce(1L)
+            .gasLimit(callParameter.getGasLimit())
+            .maxFeePerGas(callParameter.getMaxFeePerGas().orElseThrow())
+            .maxPriorityFeePerGas(callParameter.getMaxPriorityFeePerGas().orElseThrow())
+            .to(callParameter.getTo())
+            .sender(callParameter.getFrom())
+            .value(callParameter.getValue())
+            .payload(callParameter.getPayload())
+            .signature(FAKE_SIGNATURE)
+            .build();
 
-    final MutableAccount mutableAccount =
-        mockWorldUpdaterForAccount(Hash.ZERO, callParameter.getFrom());
+    mockProcessorStatusForTransaction(expectedTransaction, Status.SUCCESSFUL);
 
     transactionSimulator.process(
         callParameter,
@@ -182,18 +266,22 @@ public void shouldNotIncreaseBalanceAccountWhenExceedingBalanceIsNotAllowed() {
         OperationTracer.NO_TRACING,
         1L);
 
-    verifyNoInteractions(mutableAccount);
+    verifyTransactionWasProcessed(expectedTransaction);
   }
 
   @Test
   public void shouldUseDefaultValuesWhenMissingOptionalFields() {
     final CallParameter callParameter = legacyTransactionCallParameter();
 
-    mockBlockchainForBlockHeader(Hash.ZERO, 1L);
-    mockWorldStateForAccount(Hash.ZERO, Address.fromHexString("0x0"), 1L);
+    final BlockHeader blockHeader =
+        blockHeaderTestFixture.number(1L).stateRoot(Hash.ZERO).buildHeader();
+
+    mockBlockchainForBlockHeader(blockHeader);
+    mockWorldStateForAccount(blockHeader, Address.fromHexString("0x0"), 1L);
 
     final Transaction expectedTransaction =
         Transaction.builder()
+            .type(TransactionType.FRONTIER)
             .nonce(1L)
             .gasPrice(Wei.ZERO)
             .gasLimit(0L)
@@ -203,7 +291,7 @@ public void shouldUseDefaultValuesWhenMissingOptionalFields() {
             .payload(Bytes.EMPTY)
             .signature(FAKE_SIGNATURE)
             .build();
-    mockProcessorStatusForTransaction(1L, expectedTransaction, Status.SUCCESSFUL);
+    mockProcessorStatusForTransaction(expectedTransaction, Status.SUCCESSFUL);
 
     transactionSimulator.process(callParameter, 1L);
 
@@ -214,11 +302,15 @@ public void shouldUseDefaultValuesWhenMissingOptionalFields() {
   public void shouldUseZeroNonceWhenAccountDoesNotExist() {
     final CallParameter callParameter = legacyTransactionCallParameter();
 
-    mockBlockchainForBlockHeader(Hash.ZERO, 1L);
-    mockWorldStateForAbsentAccount(Hash.ZERO);
+    final BlockHeader blockHeader =
+        blockHeaderTestFixture.number(1L).stateRoot(Hash.ZERO).buildHeader();
+
+    mockBlockchainForBlockHeader(blockHeader);
+    mockWorldStateForAbsentAccount(blockHeader);
 
     final Transaction expectedTransaction =
         Transaction.builder()
+            .type(TransactionType.FRONTIER)
             .nonce(0L)
             .gasPrice(Wei.ZERO)
             .gasLimit(0L)
@@ -228,7 +320,7 @@ public void shouldUseZeroNonceWhenAccountDoesNotExist() {
             .payload(Bytes.EMPTY)
             .signature(FAKE_SIGNATURE)
             .build();
-    mockProcessorStatusForTransaction(1L, expectedTransaction, Status.SUCCESSFUL);
+    mockProcessorStatusForTransaction(expectedTransaction, Status.SUCCESSFUL);
 
     transactionSimulator.process(callParameter, 1L);
 
@@ -239,11 +331,15 @@ public void shouldUseZeroNonceWhenAccountDoesNotExist() {
   public void shouldReturnFailureResultWhenProcessingFails() {
     final CallParameter callParameter = legacyTransactionCallParameter();
 
-    mockBlockchainForBlockHeader(Hash.ZERO, 1L);
-    mockWorldStateForAccount(Hash.ZERO, Address.fromHexString("0x0"), 1L);
+    final BlockHeader blockHeader =
+        blockHeaderTestFixture.number(1L).stateRoot(Hash.ZERO).buildHeader();
+
+    mockBlockchainForBlockHeader(blockHeader);
+    mockWorldStateForAccount(blockHeader, Address.fromHexString("0x0"), 1L);
 
     final Transaction expectedTransaction =
         Transaction.builder()
+            .type(TransactionType.FRONTIER)
             .nonce(1L)
             .gasPrice(callParameter.getGasPrice())
             .gasLimit(callParameter.getGasLimit())
@@ -253,7 +349,7 @@ public void shouldReturnFailureResultWhenProcessingFails() {
             .payload(callParameter.getPayload())
             .signature(FAKE_SIGNATURE)
             .build();
-    mockProcessorStatusForTransaction(1L, expectedTransaction, Status.FAILED);
+    mockProcessorStatusForTransaction(expectedTransaction, Status.FAILED);
 
     final Optional<TransactionSimulatorResult> result =
         transactionSimulator.process(callParameter, 1L);
@@ -276,11 +372,15 @@ public void shouldReturnEmptyWhenBlockDoesNotExistByHash() {
   public void shouldReturnSuccessfulResultWhenProcessingIsSuccessfulByHash() {
     final CallParameter callParameter = legacyTransactionCallParameter();
 
-    mockBlockchainForBlockHeader(Hash.ZERO, 1L, DEFAULT_BLOCK_HEADER_HASH);
-    mockWorldStateForAccount(Hash.ZERO, callParameter.getFrom(), 1L);
+    final BlockHeader blockHeader =
+        blockHeaderTestFixture.number(1L).stateRoot(Hash.ZERO).buildHeader();
+
+    mockBlockchainForBlockHeader(blockHeader);
+    mockWorldStateForAccount(blockHeader, callParameter.getFrom(), 1L);
 
     final Transaction expectedTransaction =
         Transaction.builder()
+            .type(TransactionType.FRONTIER)
             .nonce(1L)
             .gasPrice(callParameter.getGasPrice())
             .gasLimit(callParameter.getGasLimit())
@@ -290,10 +390,10 @@ public void shouldReturnSuccessfulResultWhenProcessingIsSuccessfulByHash() {
             .payload(callParameter.getPayload())
             .signature(FAKE_SIGNATURE)
             .build();
-    mockProcessorStatusForTransaction(1L, expectedTransaction, Status.SUCCESSFUL);
+    mockProcessorStatusForTransaction(expectedTransaction, Status.SUCCESSFUL);
 
     final Optional<TransactionSimulatorResult> result =
-        transactionSimulator.process(callParameter, DEFAULT_BLOCK_HEADER_HASH);
+        transactionSimulator.process(callParameter, blockHeader.getBlockHash());
 
     assertThat(result.get().isSuccessful()).isTrue();
     verifyTransactionWasProcessed(expectedTransaction);
@@ -303,11 +403,15 @@ public void shouldReturnSuccessfulResultWhenProcessingIsSuccessfulByHash() {
   public void shouldUseDefaultValuesWhenMissingOptionalFieldsByHash() {
     final CallParameter callParameter = legacyTransactionCallParameter();
 
-    mockBlockchainForBlockHeader(Hash.ZERO, 1L, DEFAULT_BLOCK_HEADER_HASH);
-    mockWorldStateForAccount(Hash.ZERO, Address.fromHexString("0x0"), 1L);
+    final BlockHeader blockHeader =
+        blockHeaderTestFixture.number(1L).stateRoot(Hash.ZERO).buildHeader();
+
+    mockBlockchainForBlockHeader(blockHeader);
+    mockWorldStateForAccount(blockHeader, Address.fromHexString("0x0"), 1L);
 
     final Transaction expectedTransaction =
         Transaction.builder()
+            .type(TransactionType.FRONTIER)
             .nonce(1L)
             .gasPrice(Wei.ZERO)
             .gasLimit(0L)
@@ -317,9 +421,9 @@ public void shouldUseDefaultValuesWhenMissingOptionalFieldsByHash() {
             .payload(Bytes.EMPTY)
             .signature(FAKE_SIGNATURE)
             .build();
-    mockProcessorStatusForTransaction(1L, expectedTransaction, Status.SUCCESSFUL);
+    mockProcessorStatusForTransaction(expectedTransaction, Status.SUCCESSFUL);
 
-    transactionSimulator.process(callParameter, DEFAULT_BLOCK_HEADER_HASH);
+    transactionSimulator.process(callParameter, blockHeader.getBlockHash());
 
     verifyTransactionWasProcessed(expectedTransaction);
   }
@@ -328,11 +432,15 @@ public void shouldUseDefaultValuesWhenMissingOptionalFieldsByHash() {
   public void shouldUseZeroNonceWhenAccountDoesNotExistByHash() {
     final CallParameter callParameter = legacyTransactionCallParameter();
 
-    mockBlockchainForBlockHeader(Hash.ZERO, 1L, DEFAULT_BLOCK_HEADER_HASH);
-    mockWorldStateForAbsentAccount(Hash.ZERO);
+    final BlockHeader blockHeader =
+        blockHeaderTestFixture.number(1L).stateRoot(Hash.ZERO).buildHeader();
+
+    mockBlockchainForBlockHeader(blockHeader);
+    mockWorldStateForAbsentAccount(blockHeader);
 
     final Transaction expectedTransaction =
         Transaction.builder()
+            .type(TransactionType.FRONTIER)
             .nonce(0L)
             .gasPrice(Wei.ZERO)
             .gasLimit(0L)
@@ -342,9 +450,9 @@ public void shouldUseZeroNonceWhenAccountDoesNotExistByHash() {
             .payload(Bytes.EMPTY)
             .signature(FAKE_SIGNATURE)
             .build();
-    mockProcessorStatusForTransaction(1L, expectedTransaction, Status.SUCCESSFUL);
+    mockProcessorStatusForTransaction(expectedTransaction, Status.SUCCESSFUL);
 
-    transactionSimulator.process(callParameter, DEFAULT_BLOCK_HEADER_HASH);
+    transactionSimulator.process(callParameter, blockHeader.getBlockHash());
 
     verifyTransactionWasProcessed(expectedTransaction);
   }
@@ -353,11 +461,15 @@ public void shouldUseZeroNonceWhenAccountDoesNotExistByHash() {
   public void shouldReturnFailureResultWhenProcessingFailsByHash() {
     final CallParameter callParameter = legacyTransactionCallParameter();
 
-    mockBlockchainForBlockHeader(Hash.ZERO, 1L, DEFAULT_BLOCK_HEADER_HASH);
-    mockWorldStateForAccount(Hash.ZERO, Address.fromHexString("0x0"), 1L);
+    final BlockHeader blockHeader =
+        blockHeaderTestFixture.number(1L).stateRoot(Hash.ZERO).buildHeader();
+
+    mockBlockchainForBlockHeader(blockHeader);
+    mockWorldStateForAccount(blockHeader, Address.fromHexString("0x0"), 1L);
 
     final Transaction expectedTransaction =
         Transaction.builder()
+            .type(TransactionType.FRONTIER)
             .nonce(1L)
             .gasPrice(callParameter.getGasPrice())
             .gasLimit(callParameter.getGasLimit())
@@ -367,10 +479,10 @@ public void shouldReturnFailureResultWhenProcessingFailsByHash() {
             .payload(callParameter.getPayload())
             .signature(FAKE_SIGNATURE)
             .build();
-    mockProcessorStatusForTransaction(1L, expectedTransaction, Status.FAILED);
+    mockProcessorStatusForTransaction(expectedTransaction, Status.FAILED);
 
     final Optional<TransactionSimulatorResult> result =
-        transactionSimulator.process(callParameter, DEFAULT_BLOCK_HEADER_HASH);
+        transactionSimulator.process(callParameter, blockHeader.getBlockHash());
 
     assertThat(result.get().isSuccessful()).isFalse();
     verifyTransactionWasProcessed(expectedTransaction);
@@ -380,23 +492,26 @@ public void shouldReturnFailureResultWhenProcessingFailsByHash() {
   public void shouldReturnSuccessfulResultWhenEip1559TransactionProcessingIsSuccessful() {
     final CallParameter callParameter = eip1559TransactionCallParameter();
 
-    mockBlockchainForBlockHeader(Hash.ZERO, 1L);
-    mockWorldStateForAccount(Hash.ZERO, callParameter.getFrom(), 1L);
+    final BlockHeader blockHeader = mockBlockHeader(Hash.ZERO, 1L, Wei.ONE);
+
+    mockBlockchainForBlockHeader(blockHeader);
+    mockWorldStateForAccount(blockHeader, callParameter.getFrom(), 1L);
 
     final Transaction expectedTransaction =
         Transaction.builder()
+            .type(TransactionType.EIP1559)
+            .chainId(BigInteger.ONE)
             .nonce(1L)
-            .gasPrice(callParameter.getGasPrice())
             .gasLimit(callParameter.getGasLimit())
-            .feeCap(callParameter.getFeeCap().orElseThrow())
-            .gasPremium(callParameter.getGasPremium().orElseThrow())
+            .maxFeePerGas(callParameter.getMaxFeePerGas().orElseThrow())
+            .maxPriorityFeePerGas(callParameter.getMaxPriorityFeePerGas().orElseThrow())
             .to(callParameter.getTo())
             .sender(callParameter.getFrom())
             .value(callParameter.getValue())
             .payload(callParameter.getPayload())
             .signature(FAKE_SIGNATURE)
             .build();
-    mockProcessorStatusForTransaction(1L, expectedTransaction, Status.SUCCESSFUL);
+    mockProcessorStatusForTransaction(expectedTransaction, Status.SUCCESSFUL);
 
     final Optional<TransactionSimulatorResult> result =
         transactionSimulator.process(callParameter, 1L);
@@ -406,46 +521,49 @@ public void shouldReturnSuccessfulResultWhenEip1559TransactionProcessingIsSucces
   }
 
   private void mockWorldStateForAccount(
-      final Hash stateRoot, final Address address, final long nonce) {
+      final BlockHeader blockHeader, final Address address, final long nonce) {
     final Account account = mock(Account.class);
     when(account.getNonce()).thenReturn(nonce);
-    when(worldStateArchive.getMutable(eq(stateRoot))).thenReturn(Optional.of(worldState));
-    when(worldState.get(eq(address))).thenReturn(account);
-  }
-
-  private void mockWorldStateForAbsentAccount(final Hash stateRoot) {
-    when(worldStateArchive.getMutable(eq(stateRoot))).thenReturn(Optional.of(worldState));
-    when(worldState.get(any())).thenReturn(null);
+    when(worldStateArchive.getMutable(eq(blockHeader), anyBoolean()))
+        .thenReturn(Optional.of(worldState));
+    final WorldUpdater updater = mock(WorldUpdater.class);
+    when(updater.get(address)).thenReturn(account);
+    when(worldState.updater()).thenReturn(updater);
   }
 
-  private MutableAccount mockWorldUpdaterForAccount(final Hash stateRoot, final Address address) {
-    final EvmAccount account = mock(EvmAccount.class);
-    final MutableAccount mutableAccount = mock(MutableAccount.class);
-    when(worldStateArchive.getMutable(eq(stateRoot))).thenReturn(Optional.of(worldState));
-    when(worldState.updater()).thenReturn(worldUpdater);
-    when(worldUpdater.getOrCreate(eq(address))).thenReturn(account);
-    when(account.getMutable()).thenReturn(mutableAccount);
-    return mutableAccount;
+  private void mockWorldStateForAbsentAccount(final BlockHeader blockHeader) {
+    when(worldStateArchive.getMutable(eq(blockHeader), anyBoolean()))
+        .thenReturn(Optional.of(worldState));
+    final WorldUpdater updater = mock(WorldUpdater.class);
+    when(updater.get(any())).thenReturn(null);
+    when(worldState.updater()).thenReturn(updater);
   }
 
-  private void mockBlockchainForBlockHeader(final Hash stateRoot, final long blockNumber) {
-    mockBlockchainForBlockHeader(stateRoot, blockNumber, Hash.ZERO);
+  private BlockHeader mockBlockHeader(
+      final Hash stateRoot, final long blockNumber, final Wei baseFee) {
+    return blockHeaderTestFixture
+        .stateRoot(stateRoot)
+        .number(blockNumber)
+        .baseFeePerGas(baseFee)
+        .difficulty(Difficulty.ONE)
+        .buildHeader();
   }
 
-  private void mockBlockchainForBlockHeader(
-      final Hash stateRoot, final long blockNumber, final Hash headerHash) {
-    final BlockHeader blockHeader = mock(BlockHeader.class);
-    when(blockHeader.getStateRoot()).thenReturn(stateRoot);
-    when(blockHeader.getNumber()).thenReturn(blockNumber);
-    when(blockchain.getBlockHeader(blockNumber)).thenReturn(Optional.of(blockHeader));
-    when(blockchain.getBlockHeader(headerHash)).thenReturn(Optional.of(blockHeader));
+  private void mockBlockchainForBlockHeader(final BlockHeader blockHeader) {
+    when(blockchain.getBlockHeader(blockHeader.getNumber())).thenReturn(Optional.of(blockHeader));
+    when(blockchain.getBlockHeader(blockHeader.getBlockHash()))
+        .thenReturn(Optional.of(blockHeader));
   }
 
   private void mockProcessorStatusForTransaction(
-      final long blockNumber, final Transaction transaction, final Status status) {
-    when(protocolSchedule.getByBlockNumber(eq(blockNumber))).thenReturn(protocolSpec);
+      final Transaction transaction, final Status status) {
+    final BlockHeaderFunctions blockHeaderFunctions = mock(BlockHeaderFunctions.class);
+    when(protocolSchedule.getChainId()).thenReturn(Optional.of(BigInteger.ONE));
+    when(protocolSchedule.getByBlockHeader(any())).thenReturn(protocolSpec);
     when(protocolSpec.getTransactionProcessor()).thenReturn(transactionProcessor);
     when(protocolSpec.getMiningBeneficiaryCalculator()).thenReturn(BlockHeader::getCoinbase);
+    when(protocolSpec.getBlockHeaderFunctions()).thenReturn(blockHeaderFunctions);
+    when(protocolSpec.getFeeMarket()).thenReturn(FeeMarket.london(0));
 
     final TransactionProcessingResult result = mock(TransactionProcessingResult.class);
     switch (status) {
@@ -459,35 +577,63 @@ private void mockProcessorStatusForTransaction(
     }
 
     when(transactionProcessor.processTransaction(
-            any(), any(), any(), eq(transaction), any(), any(), anyBoolean(), any(), any()))
+            any(),
+            any(),
+            any(),
+            eq(transaction),
+            any(),
+            any(),
+            anyBoolean(),
+            any(),
+            any(),
+            any(Wei.class)))
         .thenReturn(result);
   }
 
   private void verifyTransactionWasProcessed(final Transaction expectedTransaction) {
     verify(transactionProcessor)
         .processTransaction(
-            any(), any(), any(), eq(expectedTransaction), any(), any(), anyBoolean(), any(), any());
+            any(),
+            any(),
+            any(),
+            eq(expectedTransaction),
+            any(),
+            any(),
+            anyBoolean(),
+            any(),
+            any(),
+            any(Wei.class));
   }
 
   private CallParameter legacyTransactionCallParameter() {
+    return legacyTransactionCallParameter(Wei.ZERO);
+  }
+
+  private CallParameter legacyTransactionCallParameter(final Wei gasPrice) {
     return new CallParameter(
         Address.fromHexString("0x0"),
         Address.fromHexString("0x0"),
         0,
-        Wei.of(0),
+        gasPrice,
         Wei.of(0),
         Bytes.EMPTY);
   }
 
   private CallParameter eip1559TransactionCallParameter() {
+    return eip1559TransactionCallParameter(Wei.ZERO, Wei.ZERO);
+  }
+
+  private CallParameter eip1559TransactionCallParameter(
+      final Wei maxFeePerGas, final Wei maxPriorityFeePerGas) {
     return new CallParameter(
         Address.fromHexString("0x0"),
         Address.fromHexString("0x0"),
         0,
         Wei.of(0),
-        Optional.of(Wei.of(0)),
-        Optional.of(Wei.of(0)),
+        Optional.of(maxFeePerGas),
+        Optional.of(maxPriorityFeePerGas),
         Wei.of(0),
-        Bytes.EMPTY);
+        Bytes.EMPTY,
+        Optional.empty());
   }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/util/BlockchainUtilParameterizedTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/util/BlockchainUtilParameterizedTest.java
index 35f95f48b74..742469b0840 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/util/BlockchainUtilParameterizedTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/util/BlockchainUtilParameterizedTest.java
@@ -22,7 +22,7 @@
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 
 import java.util.ArrayList;
@@ -60,7 +60,7 @@ public BlockchainUtilParameterizedTest(final int commonAncestorHeight) {
   @BeforeClass
   public static void setupClass() {
     genesisBlock = blockDataGenerator.genesisBlock();
-    localBlockchain = InMemoryStorageProvider.createInMemoryBlockchain(genesisBlock);
+    localBlockchain = InMemoryKeyValueStorageProvider.createInMemoryBlockchain(genesisBlock);
     // Setup local chain.
     for (int i = 1; i <= chainHeight; i++) {
       final BlockDataGenerator.BlockOptions options =
@@ -75,7 +75,7 @@ public static void setupClass() {
 
   @Before
   public void setup() {
-    remoteBlockchain = InMemoryStorageProvider.createInMemoryBlockchain(genesisBlock);
+    remoteBlockchain = InMemoryKeyValueStorageProvider.createInMemoryBlockchain(genesisBlock);
 
     commonHeader = genesisBlock.getHeader();
     for (long i = 1; i <= commonAncestorHeight; i++) {
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/util/RawBlockIteratorTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/util/RawBlockIteratorTest.java
index 8461d7c120a..91b5d023c29 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/util/RawBlockIteratorTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/util/RawBlockIteratorTest.java
@@ -19,6 +19,7 @@
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
@@ -77,14 +78,11 @@ public void readsBlocksWithInitialCapacity(
       }
     }
     writer.close();
-
+    final BlockHeaderFunctions blockHeaderFunctions = new MainnetBlockHeaderFunctions();
     // Read blocks
     final int initialCapacity = initialCapacityFromBlockSize.apply(firstSerializedBlock.length);
     final RawBlockIterator iterator =
-        new RawBlockIterator(
-            blocksFile.toPath(),
-            rlp -> BlockHeader.readFrom(rlp, new MainnetBlockHeaderFunctions()),
-            initialCapacity);
+        new RawBlockIterator(blocksFile.toPath(), blockHeaderFunctions, initialCapacity);
 
     // Read blocks and check that they match
     for (int i = 0; i < blockCount; i++) {
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/AbstractRetryingTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/AbstractRetryingTest.java
index ec48a7e785b..bbb7eb4c590 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/AbstractRetryingTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/AbstractRetryingTest.java
@@ -14,8 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.vm;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.core.LoggerContext;
+import org.hyperledger.besu.util.LogConfigurator;
+
 import org.junit.Before;
 import org.junit.Test;
 
@@ -58,10 +58,10 @@ public void resetLoggingToOriginalConfiguration() {
   public void execution() {
     try {
       runTest();
-    } catch (final AssertionError e) {
+    } catch (final RuntimeException | AssertionError e) {
       if (!"trace".equalsIgnoreCase(originalRootLogLevel)
           || !"trace".equalsIgnoreCase(originalEvmLogLevel)) {
-        // try again, this time with more logging so we can capture more information.
+        // try again, this time with more logging, so we can capture more information.
         System.setProperty("root.log.level", "trace");
         System.setProperty("evm.log.level", "trace");
         resetLogging();
@@ -73,7 +73,7 @@ public void execution() {
   }
 
   private void resetLogging() {
-    ((LoggerContext) LogManager.getContext(false)).reconfigure();
+    LogConfigurator.reconfigure();
   }
 
   /** Subclasses should implement this method to run the actual JUnit test. */
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/AddressTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/AddressTest.java
index df3d86f2869..b496bb5f6ce 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/AddressTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/AddressTest.java
@@ -15,8 +15,9 @@
 package org.hyperledger.besu.ethereum.vm;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.junit.Test;
@@ -50,18 +51,21 @@ public void accountAddressHashCode() {
     assertThat(addr2.hashCode()).isEqualTo(addr.hashCode());
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void invalidAccountAddress() {
-    Address.wrap(Bytes.fromHexString("0x00101010"));
+    final Bytes bytes = Bytes.fromHexString("0x00101010");
+    assertThatThrownBy(() -> Address.wrap(bytes)).isInstanceOf(IllegalArgumentException.class);
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void tooShortAccountAddress() {
-    Address.fromHexStringStrict("0x00101010");
+    assertThatThrownBy(() -> Address.fromHexStringStrict("0x00101010"))
+        .isInstanceOf(IllegalArgumentException.class);
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void nullAccountAddress() {
-    Address.fromHexStringStrict(null);
+    assertThatThrownBy(() -> Address.fromHexStringStrict(null))
+        .isInstanceOf(IllegalArgumentException.class);
   }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/BlockHashLookupTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/BlockHashLookupTest.java
deleted file mode 100644
index 65777d57d5b..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/BlockHashLookupTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm;
-
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
-
-import java.util.Optional;
-
-import org.assertj.core.api.Assertions;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class BlockHashLookupTest {
-
-  private static final int CURRENT_BLOCK_NUMBER = 256;
-  private final Blockchain blockchain = mock(Blockchain.class);
-  private final BlockHeader[] headers = new BlockHeader[CURRENT_BLOCK_NUMBER];
-  private BlockHashLookup lookup;
-
-  @Before
-  public void setUp() {
-    BlockHeader parentHeader = null;
-    for (int i = 0; i < headers.length; i++) {
-      final BlockHeader header = createHeader(i, parentHeader);
-      when(blockchain.getBlockHeader(header.getHash())).thenReturn(Optional.of(header));
-      headers[i] = header;
-      parentHeader = headers[i];
-    }
-    lookup =
-        new BlockHashLookup(
-            createHeader(CURRENT_BLOCK_NUMBER, headers[headers.length - 1]), blockchain);
-  }
-
-  @After
-  public void verifyBlocksNeverLookedUpByNumber() {
-    // Looking up the block by number is incorrect because it always uses the canonical chain even
-    // if the block being imported is on a fork.
-    verify(blockchain, never()).getBlockHeader(anyLong());
-  }
-
-  @Test
-  public void shouldGetHashOfImmediateParent() {
-    assertHashForBlockNumber(CURRENT_BLOCK_NUMBER - 1);
-  }
-
-  @Test
-  public void shouldGetHashOfGenesisBlock() {
-    assertHashForBlockNumber(0);
-  }
-
-  @Test
-  public void shouldGetHashForRecentBlockAfterOlderBlock() {
-    assertHashForBlockNumber(10);
-    assertHashForBlockNumber(CURRENT_BLOCK_NUMBER - 1);
-  }
-
-  @Test
-  public void shouldReturnEmptyHashWhenRequestedBlockNotOnChain() {
-    Assertions.assertThat(lookup.getBlockHash(CURRENT_BLOCK_NUMBER + 20)).isEqualTo(Hash.ZERO);
-  }
-
-  @Test
-  public void shouldReturnEmptyHashWhenParentBlockNotOnChain() {
-    final BlockHashLookup lookupWithUnavailableParent =
-        new BlockHashLookup(
-            new BlockHeaderTestFixture().number(CURRENT_BLOCK_NUMBER + 20).buildHeader(),
-            blockchain);
-    Assertions.assertThat(lookupWithUnavailableParent.getBlockHash(CURRENT_BLOCK_NUMBER))
-        .isEqualTo(Hash.ZERO);
-  }
-
-  @Test
-  public void shouldGetParentHashFromCurrentBlock() {
-    assertHashForBlockNumber(CURRENT_BLOCK_NUMBER - 1);
-    verifyZeroInteractions(blockchain);
-  }
-
-  @Test
-  public void shouldCacheBlockHashesWhileIteratingBackToPreviousHeader() {
-    assertHashForBlockNumber(CURRENT_BLOCK_NUMBER - 4);
-    assertHashForBlockNumber(CURRENT_BLOCK_NUMBER - 1);
-    verify(blockchain).getBlockHeader(headers[CURRENT_BLOCK_NUMBER - 1].getHash());
-    verify(blockchain).getBlockHeader(headers[CURRENT_BLOCK_NUMBER - 2].getHash());
-    verify(blockchain).getBlockHeader(headers[CURRENT_BLOCK_NUMBER - 3].getHash());
-    verifyNoMoreInteractions(blockchain);
-  }
-
-  private void assertHashForBlockNumber(final int blockNumber) {
-    Assertions.assertThat(lookup.getBlockHash(blockNumber))
-        .isEqualTo(headers[blockNumber].getHash());
-  }
-
-  private BlockHeader createHeader(final int blockNumber, final BlockHeader parentHeader) {
-    return new BlockHeaderTestFixture()
-        .number(blockNumber)
-        .parentHash(parentHeader != null ? parentHeader.getHash() : Hash.EMPTY)
-        .buildHeader();
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/CachingBlockHashLookupTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/CachingBlockHashLookupTest.java
new file mode 100644
index 00000000000..0be54cc6389
--- /dev/null
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/CachingBlockHashLookupTest.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.vm;
+
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+
+import java.util.Optional;
+
+import org.assertj.core.api.Assertions;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class CachingBlockHashLookupTest {
+
+  private static final int CURRENT_BLOCK_NUMBER = 256;
+  private final Blockchain blockchain = mock(Blockchain.class);
+  private final BlockHeader[] headers = new BlockHeader[CURRENT_BLOCK_NUMBER];
+  private BlockHashLookup lookup;
+
+  @Before
+  public void setUp() {
+    BlockHeader parentHeader = null;
+    for (int i = 0; i < headers.length; i++) {
+      final BlockHeader header = createHeader(i, parentHeader);
+      when(blockchain.getBlockHeader(header.getHash())).thenReturn(Optional.of(header));
+      headers[i] = header;
+      parentHeader = headers[i];
+    }
+    lookup =
+        new CachingBlockHashLookup(
+            createHeader(CURRENT_BLOCK_NUMBER, headers[headers.length - 1]), blockchain);
+  }
+
+  @After
+  public void verifyBlocksNeverLookedUpByNumber() {
+    // Looking up the block by number is incorrect because it always uses the canonical chain even
+    // if the block being imported is on a fork.
+    verify(blockchain, never()).getBlockHeader(anyLong());
+  }
+
+  @Test
+  public void shouldGetHashOfImmediateParent() {
+    assertHashForBlockNumber(CURRENT_BLOCK_NUMBER - 1);
+  }
+
+  @Test
+  public void shouldGetHashOfGenesisBlock() {
+    assertHashForBlockNumber(0);
+  }
+
+  @Test
+  public void shouldGetHashForRecentBlockAfterOlderBlock() {
+    assertHashForBlockNumber(10);
+    assertHashForBlockNumber(CURRENT_BLOCK_NUMBER - 1);
+  }
+
+  @Test
+  public void shouldReturnEmptyHashWhenRequestedBlockNotOnchain() {
+    Assertions.assertThat(lookup.apply(CURRENT_BLOCK_NUMBER + 20L)).isEqualTo(Hash.ZERO);
+  }
+
+  @Test
+  public void shouldReturnEmptyHashWhenParentBlockNotOnchain() {
+    final BlockHashLookup lookupWithUnavailableParent =
+        new CachingBlockHashLookup(
+            new BlockHeaderTestFixture().number(CURRENT_BLOCK_NUMBER + 20).buildHeader(),
+            blockchain);
+    Assertions.assertThat(lookupWithUnavailableParent.apply((long) CURRENT_BLOCK_NUMBER))
+        .isEqualTo(Hash.ZERO);
+  }
+
+  @Test
+  public void shouldGetParentHashFromCurrentBlock() {
+    assertHashForBlockNumber(CURRENT_BLOCK_NUMBER - 1);
+    verifyNoInteractions(blockchain);
+  }
+
+  @Test
+  public void shouldCacheBlockHashesWhileIteratingBackToPreviousHeader() {
+    assertHashForBlockNumber(CURRENT_BLOCK_NUMBER - 4);
+    assertHashForBlockNumber(CURRENT_BLOCK_NUMBER - 1);
+    verify(blockchain).getBlockHeader(headers[CURRENT_BLOCK_NUMBER - 1].getHash());
+    verify(blockchain).getBlockHeader(headers[CURRENT_BLOCK_NUMBER - 2].getHash());
+    verify(blockchain).getBlockHeader(headers[CURRENT_BLOCK_NUMBER - 3].getHash());
+    verifyNoMoreInteractions(blockchain);
+  }
+
+  private void assertHashForBlockNumber(final int blockNumber) {
+    Assertions.assertThat(lookup.apply((long) blockNumber))
+        .isEqualTo(headers[blockNumber].getHash());
+  }
+
+  private BlockHeader createHeader(final int blockNumber, final BlockHeader parentHeader) {
+    return new BlockHeaderTestFixture()
+        .number(blockNumber)
+        .parentHash(parentHeader != null ? parentHeader.getHash() : Hash.EMPTY)
+        .buildHeader();
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/DebugOperationTracerTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/DebugOperationTracerTest.java
index 262e83bd149..2a8516c3c9c 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/DebugOperationTracerTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/DebugOperationTracerTest.java
@@ -18,21 +18,24 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Gas;
 import org.hyperledger.besu.ethereum.core.MessageFrameTestFixture;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.core.WrappedEvmAccount;
 import org.hyperledger.besu.ethereum.debug.TraceFrame;
 import org.hyperledger.besu.ethereum.debug.TraceOptions;
 import org.hyperledger.besu.ethereum.referencetests.ReferenceTestBlockchain;
-import org.hyperledger.besu.ethereum.vm.Operation.OperationResult;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.operation.AbstractOperation;
+import org.hyperledger.besu.evm.operation.Operation;
+import org.hyperledger.besu.evm.operation.Operation.OperationResult;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+import org.hyperledger.besu.evm.worldstate.WrappedEvmAccount;
 
 import java.util.Map;
-import java.util.Optional;
 import java.util.TreeMap;
 
 import org.apache.tuweni.bytes.Bytes32;
@@ -47,17 +50,17 @@
 public class DebugOperationTracerTest {
 
   private static final int DEPTH = 4;
-  private static final Gas INITIAL_GAS = Gas.of(1000);
+  private static final long INITIAL_GAS = 1000L;
 
   @Mock private WorldUpdater worldUpdater;
 
   // @Mock private OperationTracer.ExecuteOperation executeOperationAction;
 
   private final Operation anOperation =
-      new AbstractOperation(0x02, "MUL", 2, 1, false, 1, null) {
+      new AbstractOperation(0x02, "MUL", 2, 1, null) {
         @Override
         public OperationResult execute(final MessageFrame frame, final EVM evm) {
-          return new OperationResult(Optional.of(Gas.of(20)), Optional.empty());
+          return new OperationResult(20L, null);
         }
       };
 
@@ -95,9 +98,9 @@ public void shouldRecordRemainingGas() {
   @Test
   public void shouldRecordStackWhenEnabled() {
     final MessageFrame frame = validMessageFrame();
-    final Bytes32 stackItem1 = Bytes32.fromHexString("0x01");
-    final Bytes32 stackItem2 = Bytes32.fromHexString("0x02");
-    final Bytes32 stackItem3 = Bytes32.fromHexString("0x03");
+    final UInt256 stackItem1 = UInt256.fromHexString("0x01");
+    final UInt256 stackItem2 = UInt256.fromHexString("0x02");
+    final UInt256 stackItem3 = UInt256.fromHexString("0x03");
     frame.pushStackItem(stackItem1);
     frame.pushStackItem(stackItem2);
     frame.pushStackItem(stackItem3);
@@ -119,9 +122,9 @@ public void shouldRecordMemoryWhenEnabled() {
     final Bytes32 word1 = Bytes32.fromHexString("0x01");
     final Bytes32 word2 = Bytes32.fromHexString("0x02");
     final Bytes32 word3 = Bytes32.fromHexString("0x03");
-    frame.writeMemory(UInt256.ZERO, UInt256.valueOf(32), word1);
-    frame.writeMemory(UInt256.valueOf(32), UInt256.valueOf(32), word2);
-    frame.writeMemory(UInt256.valueOf(64), UInt256.valueOf(32), word3);
+    frame.writeMemory(0, 32, word1);
+    frame.writeMemory(32, 32, word2);
+    frame.writeMemory(64, 32, word3);
     final TraceFrame traceFrame = traceFrame(frame, new TraceOptions(false, true, false));
     assertThat(traceFrame.getMemory()).isPresent();
     assertThat(traceFrame.getMemory().get()).containsExactly(word1, word2, word3);
@@ -140,7 +143,7 @@ public void shouldRecordStorageWhenEnabled() {
     final Map<UInt256, UInt256> updatedStorage = setupStorageForCapture(frame);
     final TraceFrame traceFrame = traceFrame(frame, new TraceOptions(true, false, false));
     assertThat(traceFrame.getStorage()).isPresent();
-    assertThat(traceFrame.getStorage().get()).isEqualTo(updatedStorage);
+    assertThat(traceFrame.getStorage()).contains(updatedStorage);
   }
 
   @Test
@@ -157,11 +160,8 @@ public void shouldCaptureFrameWhenExceptionalHaltOccurs() {
 
     final DebugOperationTracer tracer =
         new DebugOperationTracer(new TraceOptions(true, true, true));
-    tracer.traceExecution(
-        frame,
-        () ->
-            new OperationResult(
-                Optional.of(Gas.of(50)), Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS)));
+    tracer.tracePostExecution(
+        frame, new OperationResult(50L, ExceptionalHaltReason.INSUFFICIENT_GAS));
 
     final TraceFrame traceFrame = getOnlyTraceFrame(tracer);
     assertThat(traceFrame.getExceptionalHaltReason())
@@ -175,7 +175,9 @@ private TraceFrame traceFrame(final MessageFrame frame) {
 
   private TraceFrame traceFrame(final MessageFrame frame, final TraceOptions traceOptions) {
     final DebugOperationTracer tracer = new DebugOperationTracer(traceOptions);
-    tracer.traceExecution(frame, () -> anOperation.execute(frame, null));
+    tracer.tracePreExecution(frame);
+    OperationResult operationResult = anOperation.execute(frame, null);
+    tracer.tracePostExecution(frame, operationResult);
     return getOnlyTraceFrame(tracer);
   }
 
@@ -196,7 +198,7 @@ private MessageFrameTestFixture validMessageFrameBuilder() {
     final ReferenceTestBlockchain blockchain = new ReferenceTestBlockchain(blockHeader.getNumber());
     return new MessageFrameTestFixture()
         .initialGas(INITIAL_GAS)
-        .worldState(worldUpdater)
+        .worldUpdater(worldUpdater)
         .gasPrice(Wei.of(25))
         .blockHeader(blockHeader)
         .blockchain(blockchain)
@@ -216,9 +218,9 @@ private Map<UInt256, UInt256> setupStorageForCapture(final MessageFrame frame) {
     final Bytes32 word1 = Bytes32.fromHexString("0x01");
     final Bytes32 word2 = Bytes32.fromHexString("0x02");
     final Bytes32 word3 = Bytes32.fromHexString("0x03");
-    frame.writeMemory(UInt256.ZERO, UInt256.valueOf(32), word1);
-    frame.writeMemory(UInt256.valueOf(32), UInt256.valueOf(32), word2);
-    frame.writeMemory(UInt256.valueOf(64), UInt256.valueOf(32), word3);
+    frame.writeMemory(0, 32, word1);
+    frame.writeMemory(32, 32, word2);
+    frame.writeMemory(64, 32, word3);
     return updatedStorage;
   }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/EVMTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/EVMTest.java
deleted file mode 100644
index b842549f268..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/EVMTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.anyByte;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.ethereum.mainnet.FrontierGasCalculator;
-import org.hyperledger.besu.ethereum.vm.operations.StopOperation;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-@RunWith(MockitoJUnitRunner.class)
-public class EVMTest {
-
-  private static final int CONTRACT_ACCOUNT_VERSION = 1;
-  @Mock private OperationRegistry operationRegistry;
-  private final GasCalculator gasCalculator = new FrontierGasCalculator();
-  private EVM evm;
-
-  @Before
-  public void setup() {
-    evm = new EVM(operationRegistry, gasCalculator);
-  }
-
-  @Test
-  public void assertThatEndOfScriptNotExplicitlySetInCodeReturnsAVirtualOperation() {
-    final Code code = new Code(Bytes.fromHexString("0x60203560003555606035604035556000"));
-    final Operation operation =
-        evm.operationAtOffset(code, CONTRACT_ACCOUNT_VERSION, code.getSize());
-    assertThat(operation).isNotNull();
-    assertThat(operation.isVirtualOperation()).isTrue();
-  }
-
-  @Test
-  public void assertThatEndOfScriptExplicitlySetInCodeDoesNotReturnAVirtualOperation() {
-    final Code code = new Code(Bytes.fromHexString("0x6020356000355560603560403555600000"));
-    when(operationRegistry.get(anyByte(), eq(CONTRACT_ACCOUNT_VERSION)))
-        .thenReturn(new StopOperation(gasCalculator));
-    final Operation operation =
-        evm.operationAtOffset(code, CONTRACT_ACCOUNT_VERSION, code.getSize() - 1);
-    assertThat(operation).isNotNull();
-    assertThat(operation.isVirtualOperation()).isFalse();
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/EstimateGasOperationTracerTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/EstimateGasOperationTracerTest.java
index ceb731455e9..5f87706c5cc 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/EstimateGasOperationTracerTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/EstimateGasOperationTracerTest.java
@@ -17,15 +17,20 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
-import org.hyperledger.besu.ethereum.core.Gas;
 import org.hyperledger.besu.ethereum.core.MessageFrameTestFixture;
-import org.hyperledger.besu.ethereum.vm.OperationTracer.ExecuteOperation;
-import org.hyperledger.besu.ethereum.vm.operations.CallCodeOperation;
-import org.hyperledger.besu.ethereum.vm.operations.SStoreOperation;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.operation.CallCodeOperation;
+import org.hyperledger.besu.evm.operation.Operation.OperationResult;
+import org.hyperledger.besu.evm.operation.SStoreOperation;
+import org.hyperledger.besu.evm.tracing.EstimateGasOperationTracer;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class EstimateGasOperationTracerTest {
 
   private EstimateGasOperationTracer operationTracer;
@@ -40,51 +45,51 @@ public void setUp() {
   @Test
   public void shouldDetectChangeInDepthDuringExecution() {
 
-    final ExecuteOperation noExecutionOperation = mock(ExecuteOperation.class);
+    final OperationResult testResult = new OperationResult(6, null);
 
-    assertThat(operationTracer.getMaxDepth()).isEqualTo(0);
+    assertThat(operationTracer.getMaxDepth()).isZero();
 
     final MessageFrame firstFrame = messageFrameTestFixture.depth(0).build();
-    operationTracer.traceExecution(firstFrame, noExecutionOperation);
-    assertThat(operationTracer.getMaxDepth()).isEqualTo(0);
+    operationTracer.tracePostExecution(firstFrame, testResult);
+    assertThat(operationTracer.getMaxDepth()).isZero();
 
     final MessageFrame secondFrame = messageFrameTestFixture.depth(1).build();
-    operationTracer.traceExecution(secondFrame, noExecutionOperation);
+    operationTracer.tracePostExecution(secondFrame, testResult);
     assertThat(operationTracer.getMaxDepth()).isEqualTo(1);
 
     final MessageFrame thirdFrame = messageFrameTestFixture.depth(1).build();
-    operationTracer.traceExecution(thirdFrame, noExecutionOperation);
+    operationTracer.tracePostExecution(thirdFrame, testResult);
     assertThat(operationTracer.getMaxDepth()).isEqualTo(1);
 
     final MessageFrame fourthFrame = messageFrameTestFixture.depth(2).build();
-    operationTracer.traceExecution(fourthFrame, noExecutionOperation);
+    operationTracer.tracePostExecution(fourthFrame, testResult);
     assertThat(operationTracer.getMaxDepth()).isEqualTo(2);
 
     final MessageFrame fifthFrame = messageFrameTestFixture.depth(0).build();
-    operationTracer.traceExecution(fifthFrame, noExecutionOperation);
+    operationTracer.tracePostExecution(fifthFrame, testResult);
     assertThat(operationTracer.getMaxDepth()).isEqualTo(2);
   }
 
   @Test
   public void shouldDetectMinimumGasRemainingForSStoreOperation() {
 
-    final ExecuteOperation noExecutionOperation = mock(ExecuteOperation.class);
-    final Gas minimumGasRemaining = Gas.of(2300);
+    final OperationResult testResult = new OperationResult(6, null);
+    final long minimumGasRemaining = 2300L;
 
-    assertThat(operationTracer.getStipendNeeded()).isEqualTo(Gas.ZERO);
+    assertThat(operationTracer.getStipendNeeded()).isZero();
 
     final MessageFrame firstFrame = messageFrameTestFixture.build();
     firstFrame.setCurrentOperation(mock(CallCodeOperation.class));
-    operationTracer.traceExecution(firstFrame, noExecutionOperation);
-    assertThat(operationTracer.getStipendNeeded()).isEqualTo(Gas.ZERO);
+    operationTracer.tracePostExecution(firstFrame, testResult);
+    assertThat(operationTracer.getStipendNeeded()).isZero();
 
     final MessageFrame secondFrame = messageFrameTestFixture.build();
     secondFrame.setCurrentOperation(
         new SStoreOperation(mock(GasCalculator.class), minimumGasRemaining));
-    operationTracer.traceExecution(secondFrame, noExecutionOperation);
+    operationTracer.tracePostExecution(secondFrame, testResult);
     assertThat(operationTracer.getStipendNeeded()).isEqualTo(minimumGasRemaining);
 
-    operationTracer.traceExecution(secondFrame, noExecutionOperation);
+    operationTracer.tracePostExecution(secondFrame, testResult);
     assertThat(operationTracer.getStipendNeeded()).isEqualTo(minimumGasRemaining);
   }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTestTools.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTestTools.java
deleted file mode 100644
index 4bd907bd830..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTestTools.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Log;
-import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.WorldState;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
-import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
-import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
-import org.hyperledger.besu.ethereum.referencetests.GeneralStateTestCaseEipSpec;
-import org.hyperledger.besu.ethereum.referencetests.GeneralStateTestCaseSpec;
-import org.hyperledger.besu.ethereum.referencetests.ReferenceTestBlockchain;
-import org.hyperledger.besu.ethereum.referencetests.ReferenceTestProtocolSchedules;
-import org.hyperledger.besu.ethereum.rlp.RLP;
-import org.hyperledger.besu.ethereum.worldstate.DefaultMutableWorldState;
-import org.hyperledger.besu.testutil.JsonTestParameters;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-public class GeneralStateReferenceTestTools {
-  private static final ReferenceTestProtocolSchedules REFERENCE_TEST_PROTOCOL_SCHEDULES =
-      ReferenceTestProtocolSchedules.create();
-  private static final List<String> SPECS_PRIOR_TO_DELETING_EMPTY_ACCOUNTS =
-      Arrays.asList("Frontier", "Homestead", "EIP150");
-
-  private static MainnetTransactionProcessor transactionProcessor(final String name) {
-    return REFERENCE_TEST_PROTOCOL_SCHEDULES
-        .getByName(name)
-        .getByBlockNumber(0)
-        .getTransactionProcessor();
-  }
-
-  private static final List<String> EIPS_TO_RUN;
-
-  static {
-    final String eips =
-        System.getProperty(
-            "test.ethereum.state.eips",
-            "Frontier,Homestead,EIP150,EIP158,Byzantium,Constantinople,ConstantinopleFix,Istanbul,Berlin");
-    EIPS_TO_RUN = Arrays.asList(eips.split(","));
-  }
-
-  private static final JsonTestParameters<?, ?> params =
-      JsonTestParameters.create(GeneralStateTestCaseSpec.class, GeneralStateTestCaseEipSpec.class)
-          .generator(
-              (testName, stateSpec, collector) -> {
-                final String prefix = testName + "-";
-                for (final Map.Entry<String, List<GeneralStateTestCaseEipSpec>> entry :
-                    stateSpec.finalStateSpecs().entrySet()) {
-                  final String eip = entry.getKey();
-                  final boolean runTest = EIPS_TO_RUN.contains(eip);
-                  final List<GeneralStateTestCaseEipSpec> eipSpecs = entry.getValue();
-                  if (eipSpecs.size() == 1) {
-                    collector.add(prefix + eip, eipSpecs.get(0), runTest);
-                  } else {
-                    for (int i = 0; i < eipSpecs.size(); i++) {
-                      collector.add(prefix + eip + '[' + i + ']', eipSpecs.get(i), runTest);
-                    }
-                  }
-                }
-              });
-
-  static {
-    if (EIPS_TO_RUN.isEmpty()) {
-      params.ignoreAll();
-    }
-
-    // Known incorrect test.
-    params.ignore(
-        "RevertPrecompiledTouch(_storage)?-(EIP158|Byzantium|Constantinople|ConstantinopleFix)");
-
-    // Gas integer value is too large to construct a valid transaction.
-    params.ignore("OverflowGasRequire");
-
-    // Consumes a huge amount of memory
-    params.ignore("static_Call1MB1024Calldepth-\\w");
-    params.ignore("ShanghaiLove_.*");
-
-    // Don't do time consuming tests
-    params.ignore("CALLBlake2f_MaxRounds.*");
-
-    // Berlin isn't finalized
-    if (!ExperimentalEIPs.berlinEnabled) {
-      params.ignore(".*[_-]Berlin");
-    }
-  }
-
-  public static Collection<Object[]> generateTestParametersForConfig(final String[] filePath) {
-    return params.generate(filePath);
-  }
-
-  public static void executeTest(final GeneralStateTestCaseEipSpec spec) {
-    final BlockHeader blockHeader = spec.getBlockHeader();
-    final WorldState initialWorldState = spec.getInitialWorldState();
-    final Transaction transaction = spec.getTransaction();
-
-    final MutableWorldState worldState = new DefaultMutableWorldState(initialWorldState);
-    // Several of the GeneralStateTests check if the transaction could potentially
-    // consume more gas than is left for the block it's attempted to be included in.
-    // This check is performed within the `BlockImporter` rather than inside the
-    // `TransactionProcessor`, so these tests are skipped.
-    if (transaction.getGasLimit() > blockHeader.getGasLimit() - blockHeader.getGasUsed()) {
-      return;
-    }
-
-    final MainnetTransactionProcessor processor = transactionProcessor(spec.getFork());
-    final WorldUpdater worldStateUpdater = worldState.updater();
-    final ReferenceTestBlockchain blockchain = new ReferenceTestBlockchain(blockHeader.getNumber());
-    final TransactionProcessingResult result =
-        processor.processTransaction(
-            blockchain,
-            worldStateUpdater,
-            blockHeader,
-            transaction,
-            blockHeader.getCoinbase(),
-            new BlockHashLookup(blockHeader, blockchain),
-            false,
-            TransactionValidationParams.processingBlock());
-    final Account coinbase = worldStateUpdater.getOrCreate(spec.getBlockHeader().getCoinbase());
-    if (coinbase != null && coinbase.isEmpty() && shouldClearEmptyAccounts(spec.getFork())) {
-      worldStateUpdater.deleteAccount(coinbase.getAddress());
-    }
-    worldStateUpdater.commit();
-
-    // Check the world state root hash.
-    final Hash expectedRootHash = spec.getExpectedRootHash();
-    assertThat(worldState.rootHash())
-        .withFailMessage("Unexpected world state root hash; computed state: %s", worldState)
-        .isEqualTo(expectedRootHash);
-
-    // Check the logs.
-    final Hash expectedLogsHash = spec.getExpectedLogsHash();
-    final List<Log> logs = result.getLogs();
-    assertThat(Hash.hash(RLP.encode(out -> out.writeList(logs, Log::writeTo))))
-        .withFailMessage("Unmatched logs hash. Generated logs: %s", logs)
-        .isEqualTo(expectedLogsHash);
-  }
-
-  private static boolean shouldClearEmptyAccounts(final String eip) {
-    return !SPECS_PRIOR_TO_DELETING_EMPTY_ACCOUNTS.contains(eip);
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/LogMock.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/LogMock.java
index 86c25f3c4fc..a097f53ab19 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/LogMock.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/LogMock.java
@@ -14,9 +14,9 @@
  */
 package org.hyperledger.besu.ethereum.vm;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Log;
-import org.hyperledger.besu.ethereum.core.LogTopic;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.log.LogTopic;
 
 import java.util.Arrays;
 import java.util.stream.Collectors;
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/MemoryTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/MemoryTest.java
index 1ba0935554b..a8aeec62ab5 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/MemoryTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/MemoryTest.java
@@ -16,10 +16,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.google.common.base.Strings;
+import org.hyperledger.besu.evm.frame.Memory;
+
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
 import org.junit.Test;
 
 public class MemoryTest {
@@ -32,7 +32,7 @@ public class MemoryTest {
 
   @Test
   public void shouldSetAndGetMemoryByWord() {
-    final UInt256 index = UInt256.valueOf(20);
+    final int index = 20;
     final Bytes32 value = Bytes32.fromHexString("0xABCDEF");
     memory.setWord(index, value);
     assertThat(memory.getWord(index)).isEqualTo(value);
@@ -41,59 +41,59 @@ public void shouldSetAndGetMemoryByWord() {
   @Test
   public void shouldSetMemoryWhenLengthEqualToSourceLength() {
     final Bytes value = Bytes.concatenate(WORD1, WORD2, WORD3);
-    memory.setBytes(UInt256.ZERO, UInt256.valueOf(value.size()), value);
-    assertThat(memory.getWord(UInt256.ZERO)).isEqualTo(WORD1);
-    assertThat(memory.getWord(UInt256.valueOf(32))).isEqualTo(WORD2);
-    assertThat(memory.getWord(UInt256.valueOf(64))).isEqualTo(WORD3);
+    memory.setBytes(0, value.size(), value);
+    assertThat(memory.getWord(0)).isEqualTo(WORD1);
+    assertThat(memory.getWord(32)).isEqualTo(WORD2);
+    assertThat(memory.getWord(64)).isEqualTo(WORD3);
   }
 
   @Test
   public void shouldSetMemoryWhenLengthLessThanSourceLength() {
     final Bytes value = Bytes.concatenate(WORD1, WORD2, WORD3);
-    memory.setBytes(UInt256.ZERO, UInt256.valueOf(64), value);
-    assertThat(memory.getWord(UInt256.ZERO)).isEqualTo(WORD1);
-    assertThat(memory.getWord(UInt256.valueOf(32))).isEqualTo(WORD2);
-    assertThat(memory.getWord(UInt256.valueOf(64))).isEqualTo(Bytes32.ZERO);
+    memory.setBytes(0, 64, value);
+    assertThat(memory.getWord(0)).isEqualTo(WORD1);
+    assertThat(memory.getWord(32)).isEqualTo(WORD2);
+    assertThat(memory.getWord(64)).isEqualTo(Bytes32.ZERO);
   }
 
   @Test
   public void shouldSetMemoryWhenLengthGreaterThanSourceLength() {
     final Bytes value = Bytes.concatenate(WORD1, WORD2);
-    memory.setBytes(UInt256.ZERO, UInt256.valueOf(96), value);
-    assertThat(memory.getWord(UInt256.ZERO)).isEqualTo(WORD1);
-    assertThat(memory.getWord(UInt256.valueOf(32))).isEqualTo(WORD2);
-    assertThat(memory.getWord(UInt256.valueOf(64))).isEqualTo(Bytes32.ZERO);
+    memory.setBytes(0, 96, value);
+    assertThat(memory.getWord(0)).isEqualTo(WORD1);
+    assertThat(memory.getWord(32)).isEqualTo(WORD2);
+    assertThat(memory.getWord(64)).isEqualTo(Bytes32.ZERO);
   }
 
   @Test
   public void shouldClearMemoryAfterSourceDataWhenLengthGreaterThanSourceLength() {
-    memory.setWord(UInt256.valueOf(64), WORD3);
-    memory.setWord(UInt256.valueOf(96), WORD4);
-    assertThat(memory.getWord(UInt256.valueOf(64))).isEqualTo(WORD3);
-    assertThat(memory.getWord(UInt256.valueOf(96))).isEqualTo(WORD4);
+    memory.setWord(64, WORD3);
+    memory.setWord(96, WORD4);
+    assertThat(memory.getWord(64)).isEqualTo(WORD3);
+    assertThat(memory.getWord(96)).isEqualTo(WORD4);
 
     final Bytes value = Bytes.concatenate(WORD1, WORD2);
-    memory.setBytes(UInt256.ZERO, UInt256.valueOf(96), value);
-    assertThat(memory.getWord(UInt256.ZERO)).isEqualTo(WORD1);
-    assertThat(memory.getWord(UInt256.valueOf(32))).isEqualTo(WORD2);
-    assertThat(memory.getWord(UInt256.valueOf(64))).isEqualTo(Bytes32.ZERO);
-    assertThat(memory.getWord(UInt256.valueOf(96))).isEqualTo(WORD4);
+    memory.setBytes(0, 96, value);
+    assertThat(memory.getWord(0)).isEqualTo(WORD1);
+    assertThat(memory.getWord(32)).isEqualTo(WORD2);
+    assertThat(memory.getWord(64)).isEqualTo(Bytes32.ZERO);
+    assertThat(memory.getWord(96)).isEqualTo(WORD4);
   }
 
   @Test
   public void shouldClearMemoryAfterSourceDataWhenLengthGreaterThanSourceLengthWithMemoryOffset() {
-    memory.setWord(UInt256.valueOf(64), WORD3);
-    memory.setWord(UInt256.valueOf(96), WORD4);
-    assertThat(memory.getWord(UInt256.valueOf(64))).isEqualTo(WORD3);
-    assertThat(memory.getWord(UInt256.valueOf(96))).isEqualTo(WORD4);
+    memory.setWord(64, WORD3);
+    memory.setWord(96, WORD4);
+    assertThat(memory.getWord(64)).isEqualTo(WORD3);
+    assertThat(memory.getWord(96)).isEqualTo(WORD4);
 
     final Bytes value = Bytes.concatenate(WORD1, WORD2);
-    memory.setBytes(UInt256.valueOf(10), UInt256.valueOf(96), value);
-    assertThat(memory.getWord(UInt256.valueOf(10))).isEqualTo(WORD1);
-    assertThat(memory.getWord(UInt256.valueOf(42))).isEqualTo(WORD2);
-    assertThat(memory.getWord(UInt256.valueOf(74))).isEqualTo(Bytes32.ZERO);
+    memory.setBytes(10, 96, value);
+    assertThat(memory.getWord(10)).isEqualTo(WORD1);
+    assertThat(memory.getWord(42)).isEqualTo(WORD2);
+    assertThat(memory.getWord(74)).isEqualTo(Bytes32.ZERO);
     // Word 4 got partially cleared because of the starting offset.
-    assertThat(memory.getWord(UInt256.valueOf(106)))
+    assertThat(memory.getWord(106))
         .isEqualTo(
             Bytes32.fromHexString(
                 "0x4444444444444444444444444444444444444444444400000000000000000000"));
@@ -101,53 +101,127 @@ public void shouldClearMemoryAfterSourceDataWhenLengthGreaterThanSourceLengthWit
 
   @Test
   public void shouldClearMemoryAfterSourceDataWhenSourceOffsetPlusLengthGreaterThanSourceLength() {
-    memory.setWord(UInt256.valueOf(64), WORD3);
-    assertThat(memory.getWord(UInt256.valueOf(64))).isEqualTo(WORD3);
+    memory.setWord(64, WORD3);
+    assertThat(memory.getWord(64)).isEqualTo(WORD3);
 
     final Bytes value = Bytes.concatenate(WORD1, WORD2);
-    memory.setBytes(UInt256.ZERO, UInt256.valueOf(32), UInt256.valueOf(64), value);
-    assertThat(memory.getWord(UInt256.ZERO)).isEqualTo(WORD2);
-    assertThat(memory.getWord(UInt256.valueOf(32))).isEqualTo(Bytes32.ZERO);
-    assertThat(memory.getWord(UInt256.valueOf(64))).isEqualTo(WORD3);
+    memory.setBytes(0, 32, 64, value);
+    assertThat(memory.getWord(0)).isEqualTo(WORD2);
+    assertThat(memory.getWord(32)).isEqualTo(Bytes32.ZERO);
+    assertThat(memory.getWord(64)).isEqualTo(WORD3);
   }
 
   @Test
   public void shouldClearMemoryWhenSourceOffsetIsGreaterThanSourceLength() {
-    memory.setWord(UInt256.valueOf(64), WORD3);
-    assertThat(memory.getWord(UInt256.valueOf(64))).isEqualTo(WORD3);
+    memory.setWord(64, WORD3);
+    assertThat(memory.getWord(64)).isEqualTo(WORD3);
 
     final Bytes value = Bytes.concatenate(WORD1, WORD2);
-    memory.setBytes(UInt256.ZERO, UInt256.valueOf(94), UInt256.valueOf(64), value);
-    assertThat(memory.getWord(UInt256.ZERO)).isEqualTo(Bytes32.ZERO);
-    assertThat(memory.getWord(UInt256.valueOf(32))).isEqualTo(Bytes32.ZERO);
-    assertThat(memory.getWord(UInt256.valueOf(64))).isEqualTo(WORD3);
+    memory.setBytes(0, 94, 64, value);
+    assertThat(memory.getWord(0)).isEqualTo(Bytes32.ZERO);
+    assertThat(memory.getWord(32)).isEqualTo(Bytes32.ZERO);
+    assertThat(memory.getWord(64)).isEqualTo(WORD3);
   }
 
   @Test
   public void shouldClearMemoryWhenSourceDataIsEmpty() {
-    memory.setWord(UInt256.valueOf(64), WORD3);
-    assertThat(memory.getWord(UInt256.valueOf(64))).isEqualTo(WORD3);
+    memory.setWord(64, WORD3);
+    assertThat(memory.getWord(64)).isEqualTo(WORD3);
 
-    memory.setBytes(UInt256.ZERO, UInt256.valueOf(96), Bytes.EMPTY);
+    memory.setBytes(0, 96, Bytes.EMPTY);
 
-    assertThat(memory.getWord(UInt256.ZERO)).isEqualTo(Bytes32.ZERO);
-    assertThat(memory.getWord(UInt256.valueOf(32))).isEqualTo(Bytes32.ZERO);
-    assertThat(memory.getWord(UInt256.valueOf(64))).isEqualTo(Bytes32.ZERO);
+    assertThat(memory.getWord(0)).isEqualTo(Bytes32.ZERO);
+    assertThat(memory.getWord(32)).isEqualTo(Bytes32.ZERO);
+    assertThat(memory.getWord(64)).isEqualTo(Bytes32.ZERO);
   }
 
   @Test
   public void shouldClearMemoryWhenSourceDataIsEmptyWithSourceOffset() {
-    memory.setWord(UInt256.valueOf(64), WORD3);
-    assertThat(memory.getWord(UInt256.valueOf(64))).isEqualTo(WORD3);
+    memory.setWord(64, WORD3);
+    assertThat(memory.getWord(64)).isEqualTo(WORD3);
 
-    memory.setBytes(UInt256.ZERO, UInt256.ZERO, UInt256.valueOf(96), Bytes.EMPTY);
+    memory.setBytes(0, 0, 96, Bytes.EMPTY);
 
-    assertThat(memory.getWord(UInt256.ZERO)).isEqualTo(Bytes32.ZERO);
-    assertThat(memory.getWord(UInt256.valueOf(32))).isEqualTo(Bytes32.ZERO);
-    assertThat(memory.getWord(UInt256.valueOf(64))).isEqualTo(Bytes32.ZERO);
+    assertThat(memory.getWord(0)).isEqualTo(Bytes32.ZERO);
+    assertThat(memory.getWord(32)).isEqualTo(Bytes32.ZERO);
+    assertThat(memory.getWord(64)).isEqualTo(Bytes32.ZERO);
   }
 
   private static Bytes32 fillBytes32(final long value) {
-    return Bytes32.fromHexString(Strings.repeat(Long.toString(value), 64));
+    return Bytes32.fromHexString(Long.toString(value).repeat(64));
+  }
+
+  @Test
+  public void shouldSetMemoryRightAlignedWhenLengthEqualToSourceLength() {
+    final Bytes value = Bytes.concatenate(WORD1, WORD2, WORD3);
+    memory.setBytesRightAligned(0, value.size(), value);
+    assertThat(memory.getWord(0)).isEqualTo(WORD1);
+    assertThat(memory.getWord(32)).isEqualTo(WORD2);
+    assertThat(memory.getWord(64)).isEqualTo(WORD3);
+  }
+
+  @Test
+  public void shouldSetMemoryRightAlignedWhenLengthLessThanSourceLength() {
+    final Bytes value = Bytes.concatenate(WORD1, WORD2, WORD3);
+    memory.setBytesRightAligned(0, 64, value);
+    assertThat(memory.getWord(0)).isEqualTo(WORD1);
+    assertThat(memory.getWord(32)).isEqualTo(WORD2);
+    assertThat(memory.getWord(64)).isEqualTo(Bytes32.ZERO);
+  }
+
+  @Test
+  public void shouldSetMemoryRightAlignedWhenLengthGreaterThanSourceLength() {
+    final Bytes value = Bytes.concatenate(WORD1, WORD2);
+    memory.setBytesRightAligned(0, 96, value);
+    assertThat(memory.getWord(0)).isEqualTo(Bytes32.ZERO);
+    assertThat(memory.getWord(32)).isEqualTo(WORD1);
+    assertThat(memory.getWord(64)).isEqualTo(WORD2);
+  }
+
+  @Test
+  public void shouldClearMemoryRightAlignedAfterSourceDataWhenLengthGreaterThanSourceLength() {
+    memory.setWord(64, WORD3);
+    memory.setWord(96, WORD4);
+    assertThat(memory.getWord(64)).isEqualTo(WORD3);
+    assertThat(memory.getWord(96)).isEqualTo(WORD4);
+
+    final Bytes value = Bytes.concatenate(WORD1, WORD2);
+    memory.setBytesRightAligned(0, 96, value);
+    assertThat(memory.getWord(0)).isEqualTo(Bytes32.ZERO);
+    assertThat(memory.getWord(32)).isEqualTo(WORD1);
+    assertThat(memory.getWord(64)).isEqualTo(WORD2);
+    assertThat(memory.getWord(96)).isEqualTo(WORD4);
+  }
+
+  @Test
+  public void
+      shouldClearMemoryRightAlignedAfterSourceDataWhenLengthGreaterThanSourceLengthWithMemoryOffset() {
+    memory.setWord(64, WORD3);
+    memory.setWord(96, WORD4);
+    assertThat(memory.getWord(64)).isEqualTo(WORD3);
+    assertThat(memory.getWord(96)).isEqualTo(WORD4);
+
+    final Bytes value = Bytes.concatenate(WORD1, WORD2);
+    memory.setBytesRightAligned(10, 96, value);
+    assertThat(memory.getWord(10)).isEqualTo(Bytes32.ZERO);
+    assertThat(memory.getWord(42)).isEqualTo(WORD1);
+    assertThat(memory.getWord(74)).isEqualTo(WORD2);
+    // Word 4 got partially set because of the starting offset.
+    assertThat(memory.getWord(96))
+        .isEqualTo(
+            Bytes32.fromHexString(
+                "0x2222222222222222222244444444444444444444444444444444444444444444"));
+  }
+
+  @Test
+  public void shouldClearMemoryRightAlignedWhenSourceDataIsEmpty() {
+    memory.setWord(64, WORD3);
+    assertThat(memory.getWord(64)).isEqualTo(WORD3);
+
+    memory.setBytesRightAligned(0, 96, Bytes.EMPTY);
+
+    assertThat(memory.getWord(0)).isEqualTo(Bytes32.ZERO);
+    assertThat(memory.getWord(32)).isEqualTo(Bytes32.ZERO);
+    assertThat(memory.getWord(64)).isEqualTo(Bytes32.ZERO);
   }
 }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/OperandStackTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/OperandStackTest.java
deleted file mode 100644
index 58749c41135..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/OperandStackTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.ethereum.vm.FixedStack.OverflowException;
-import org.hyperledger.besu.ethereum.vm.FixedStack.UnderflowException;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.junit.Test;
-
-public class OperandStackTest {
-
-  @Test
-  public void construction() {
-    final OperandStack stack = new OperandStack(1);
-    assertThat(stack.size()).isEqualTo(0);
-  }
-
-  @Test(expected = IllegalArgumentException.class)
-  public void construction_NegativeMaximumSize() {
-    new OperandStack(-1);
-  }
-
-  @Test(expected = OverflowException.class)
-  public void push_StackOverflow() {
-    final OperandStack stack = new OperandStack(1);
-    stack.push(Bytes32.fromHexString("0x01"));
-    stack.push(Bytes32.fromHexString("0x02"));
-  }
-
-  @Test(expected = UnderflowException.class)
-  public void pop_StackUnderflow() {
-    final OperandStack stack = new OperandStack(1);
-    stack.pop();
-  }
-
-  @Test
-  public void pushPop() {
-    final OperandStack stack = new OperandStack(1);
-    stack.push(Bytes32.fromHexString("0x01"));
-    assertThat(stack.size()).isEqualTo(1);
-    assertThat(stack.pop()).isEqualTo(Bytes32.fromHexString("0x01"));
-  }
-
-  @Test(expected = IndexOutOfBoundsException.class)
-  public void get_NegativeOffset() {
-    final OperandStack stack = new OperandStack(1);
-    stack.get(-1);
-  }
-
-  @Test(expected = IndexOutOfBoundsException.class)
-  public void get_IndexGreaterThanSize() {
-    final OperandStack stack = new OperandStack(1);
-    stack.push(Bytes32.fromHexString("0x01"));
-    stack.get(2);
-  }
-
-  @Test
-  public void get() {
-    final OperandStack stack = new OperandStack(3);
-    stack.push(Bytes32.fromHexString("0x01"));
-    stack.push(Bytes32.fromHexString("0x02"));
-    stack.push(Bytes32.fromHexString("0x03"));
-    assertThat(stack.size()).isEqualTo(3);
-    assertThat(stack.get(0)).isEqualTo(Bytes32.fromHexString("0x03"));
-    assertThat(stack.get(1)).isEqualTo(Bytes32.fromHexString("0x02"));
-    assertThat(stack.get(2)).isEqualTo(Bytes32.fromHexString("0x01"));
-  }
-
-  @Test(expected = IndexOutOfBoundsException.class)
-  public void set_NegativeOffset() {
-    final OperandStack stack = new OperandStack(1);
-    stack.get(-1);
-  }
-
-  @Test(expected = IndexOutOfBoundsException.class)
-  public void set_IndexGreaterThanSize() {
-    final OperandStack stack = new OperandStack(1);
-    stack.push(Bytes32.fromHexString("0x01"));
-    stack.get(2);
-  }
-
-  @Test
-  public void set() {
-    final OperandStack stack = new OperandStack(3);
-    stack.push(Bytes32.fromHexString("0x01"));
-    stack.push(Bytes32.fromHexString("0x02"));
-    stack.push(Bytes32.fromHexString("0x03"));
-    stack.set(2, Bytes32.fromHexString("0x04"));
-    assertThat(stack.size()).isEqualTo(3);
-    assertThat(stack.get(0)).isEqualTo(Bytes32.fromHexString("0x03"));
-    assertThat(stack.get(1)).isEqualTo(Bytes32.fromHexString("0x02"));
-    assertThat(stack.get(2)).isEqualTo(Bytes32.fromHexString("0x04"));
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/VMReferenceTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/VMReferenceTest.java
deleted file mode 100644
index 1dc5c1bf85b..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/VMReferenceTest.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
-
-import org.hyperledger.besu.ethereum.chain.BadBlockManager;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.PrivacyParameters;
-import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSpecs;
-import org.hyperledger.besu.ethereum.mainnet.MutableProtocolSchedule;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
-import org.hyperledger.besu.ethereum.privacy.PrivateTransactionValidator;
-import org.hyperledger.besu.ethereum.referencetests.EnvironmentInformation;
-import org.hyperledger.besu.ethereum.referencetests.ReferenceTestBlockchain;
-import org.hyperledger.besu.ethereum.referencetests.VMReferenceTestCaseSpec;
-import org.hyperledger.besu.ethereum.vm.operations.ReturnStack;
-import org.hyperledger.besu.ethereum.worldstate.DefaultMutableWorldState;
-import org.hyperledger.besu.testutil.JsonTestParameters;
-
-import java.math.BigInteger;
-import java.util.ArrayDeque;
-import java.util.Collection;
-import java.util.Optional;
-import java.util.OptionalInt;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/** The VM operation testing framework entry point. */
-@RunWith(Parameterized.class)
-public class VMReferenceTest extends AbstractRetryingTest {
-
-  /** The path where all of the VM test configuration files live. */
-  private static final String[] TEST_CONFIG_FILE_DIR_PATHS = {
-    "VMTests/vmArithmeticTest",
-    "VMTests/vmBitwiseLogicOperation",
-    "VMTests/vmBlockInfoTest",
-    "VMTests/vmEnvironmentalInfo",
-    "VMTests/vmIOandFlowOperations",
-    "VMTests/vmLogTest",
-    //    "VMTests/vmPerformance",
-    "VMTests/vmPushDupSwapTest",
-    "VMTests/vmRandomTest",
-    "VMTests/vmSha3Test",
-    "VMTests/vmTests",
-    "VMTests/vmSystemOperations"
-  };
-
-  // The ignored test cases fall into two categories:
-  //
-  // 1. Incorrect Test Cases: The VMTests have known bugs with accessing
-  // non-existent accounts. This corresponds to test cases involving
-  // the BALANCE, EXTCODESIZE, EXTCODECOPY, and SELFDESTRUCT operations.
-  //
-  // 2. Test Cases for CALL, CALLCODE, and CALLCREATE: The VMTests do not
-  // fully test these operations and the mocking does not add much value.
-  // Additionally, the GeneralStateTests provide coverage of these
-  // operations so the proper functionality does get tested somewhere.
-  private static final String[] IGNORED_TESTS = {
-    "push32AndSuicide", "suicide", "suicide0", "suicideNotExistingAccount", "suicideSendEtherToMe",
-  };
-  private static final Optional<BigInteger> CHAIN_ID = Optional.of(BigInteger.ONE);
-
-  private final VMReferenceTestCaseSpec spec;
-
-  @Parameters(name = "Name: {0}")
-  public static Collection<Object[]> getTestParametersForConfig() {
-    return JsonTestParameters.create(VMReferenceTestCaseSpec.class)
-        .ignore(IGNORED_TESTS)
-        .generate(TEST_CONFIG_FILE_DIR_PATHS);
-  }
-
-  public VMReferenceTest(
-      final String name, final VMReferenceTestCaseSpec spec, final boolean runTest) {
-    this.spec = spec;
-    assumeTrue("Test " + name + " was ignored", runTest);
-  }
-
-  @Override
-  protected void runTest() {
-    final MutableWorldState worldState = new DefaultMutableWorldState(spec.getInitialWorldState());
-    final EnvironmentInformation execEnv = spec.getExec();
-
-    final ProtocolSpec protocolSpec =
-        MainnetProtocolSpecs.frontierDefinition(OptionalInt.empty(), OptionalInt.empty(), false)
-            .privacyParameters(PrivacyParameters.DEFAULT)
-            .privateTransactionValidatorBuilder(() -> new PrivateTransactionValidator(CHAIN_ID))
-            .badBlocksManager(new BadBlockManager())
-            .build(new MutableProtocolSchedule(CHAIN_ID));
-
-    final ReturnStack returnStack = new ReturnStack();
-
-    final ReferenceTestBlockchain blockchain =
-        new ReferenceTestBlockchain(execEnv.getBlockHeader().getNumber());
-    final MessageFrame frame =
-        MessageFrame.builder()
-            .type(MessageFrame.Type.MESSAGE_CALL)
-            .messageFrameStack(new ArrayDeque<>())
-            .blockchain(blockchain)
-            .worldState(worldState.updater())
-            .initialGas(spec.getExec().getGas())
-            .contract(execEnv.getAccountAddress())
-            .address(execEnv.getAccountAddress())
-            .originator(execEnv.getOriginAddress())
-            .gasPrice(execEnv.getGasPrice())
-            .inputData(execEnv.getData())
-            .sender(execEnv.getCallerAddress())
-            .value(execEnv.getValue())
-            .apparentValue(execEnv.getValue())
-            .code(execEnv.getCode())
-            .blockHeader(execEnv.getBlockHeader())
-            .depth(execEnv.getDepth())
-            .contractAccountVersion(execEnv.getVersion())
-            .completer(c -> {})
-            .miningBeneficiary(execEnv.getBlockHeader().getCoinbase())
-            .blockHashLookup(new BlockHashLookup(execEnv.getBlockHeader(), blockchain))
-            .maxStackSize(MessageFrame.DEFAULT_MAX_STACK_SIZE)
-            .returnStack(returnStack)
-            .build();
-
-    // This is normally set inside the containing message executing the code.
-    frame.setState(MessageFrame.State.CODE_EXECUTING);
-
-    protocolSpec.getEvm().runToHalt(frame, OperationTracer.NO_TRACING);
-
-    if (spec.isExceptionHaltExpected()) {
-      assertThat(frame.getState() == MessageFrame.State.EXCEPTIONAL_HALT)
-          .withFailMessage("VM should have exceptionally halted")
-          .isTrue();
-    } else {
-      // This is normally performed when the message processor executing the VM
-      // executes to completion successfully.
-      frame.getWorldState().commit();
-
-      assertThat(frame.getState() == MessageFrame.State.EXCEPTIONAL_HALT)
-          .withFailMessage(
-              "VM should not have exceptionally halted with " + frame.getExceptionalHaltReason())
-          .isFalse();
-      assertThat(frame.getOutputData())
-          .withFailMessage("VM output differs")
-          .isEqualTo(spec.getOut());
-      assertThat(worldState.rootHash())
-          .withFailMessage("Final world state differs")
-          .isEqualTo(spec.getFinalWorldState().rootHash());
-
-      final Gas actualGas = frame.getRemainingGas();
-      final Gas expectedGas = spec.getFinalGas();
-      final Gas difference =
-          (expectedGas.compareTo(actualGas) > 0)
-              ? expectedGas.minus(actualGas)
-              : actualGas.minus(expectedGas);
-      assertThat(actualGas)
-          .withFailMessage("Final gas does not match, with difference of %s", difference)
-          .isEqualTo(expectedGas);
-    }
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/BeginSubOperationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/BeginSubOperationTest.java
deleted file mode 100644
index 902f34d64df..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/BeginSubOperationTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive;
-import static org.mockito.Mockito.mock;
-
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.MessageFrameTestFixture;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.mainnet.IstanbulGasCalculator;
-import org.hyperledger.besu.ethereum.vm.Code;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Operation.OperationResult;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.junit.Before;
-import org.junit.Test;
-
-public class BeginSubOperationTest {
-
-  private static final IstanbulGasCalculator gasCalculator = new IstanbulGasCalculator();
-
-  private static final int CURRENT_PC = 1;
-  private static final Gas BEGIN_SUB_GAS_COST = Gas.of(2);
-
-  private Blockchain blockchain;
-  private Address address;
-  private WorldUpdater worldStateUpdater;
-
-  private MessageFrameTestFixture createMessageFrameBuilder(final Gas initialGas) {
-    final BlockHeader blockHeader = new BlockHeaderTestFixture().buildHeader();
-    return new MessageFrameTestFixture()
-        .address(address)
-        .worldState(worldStateUpdater)
-        .blockHeader(blockHeader)
-        .blockchain(blockchain)
-        .initialGas(initialGas);
-  }
-
-  @Before
-  public void init() {
-    blockchain = mock(Blockchain.class);
-
-    address = Address.fromHexString("0x18675309");
-
-    final WorldStateArchive worldStateArchive = createInMemoryWorldStateArchive();
-
-    worldStateUpdater = worldStateArchive.getMutable().updater();
-    worldStateUpdater.getOrCreate(address).getMutable().setBalance(Wei.of(1));
-    worldStateUpdater.commit();
-  }
-
-  @Test
-  public void shouldCalculateGasPrice() {
-
-    final BeginSubOperation operation = new BeginSubOperation(gasCalculator);
-    final MessageFrame frame =
-        createMessageFrameBuilder(Gas.of(100)).returnStack(new ReturnStack()).build();
-    frame.setPC(CURRENT_PC);
-    final OperationResult result = operation.execute(frame, null);
-    assertThat(result.getGasCost()).contains(BEGIN_SUB_GAS_COST);
-  }
-
-  @Test
-  public void shouldHaltWithInvalidSubRoutineEntryWhenBeginSubIsExecuted() {
-    final BeginSubOperation operation = new BeginSubOperation(gasCalculator);
-    final MessageFrame frame =
-        createMessageFrameBuilder(Gas.of(100))
-            .pushStackItem(Bytes32.fromHexString("0x04"))
-            .code(new Code(Bytes.fromHexString("0x6104005c")))
-            .returnStack(new ReturnStack())
-            .build();
-    frame.setPC(CURRENT_PC);
-    final OperationResult result = operation.execute(frame, null);
-
-    assertThat(result.getHaltReason()).contains(ExceptionalHaltReason.INVALID_SUB_ROUTINE_ENTRY);
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/BlockHashOperationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/BlockHashOperationTest.java
deleted file mode 100644
index 961e2a49e40..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/BlockHashOperationTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.MessageFrameTestFixture;
-import org.hyperledger.besu.ethereum.mainnet.FrontierGasCalculator;
-import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import com.google.common.base.Strings;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-import org.junit.After;
-import org.junit.Test;
-
-public class BlockHashOperationTest {
-
-  private static final int MAXIMUM_COMPLETE_BLOCKS_BEHIND = 256;
-  private final BlockHashLookup blockHashLookup = mock(BlockHashLookup.class);
-  private final BlockHashOperation blockHashOperation =
-      new BlockHashOperation(new FrontierGasCalculator());
-
-  @After
-  public void verifyNoUnexpectedHashLookups() {
-    verifyNoMoreInteractions(blockHashLookup);
-  }
-
-  @Test
-  public void shouldReturnZeroWhenArgIsBiggerThanALong() {
-    assertBlockHash(Bytes32.fromHexString(Strings.repeat("F", 64)), Bytes32.ZERO, 100);
-  }
-
-  @Test
-  public void shouldReturnZeroWhenCurrentBlockIsGenesis() {
-    assertBlockHash(Bytes32.ZERO, Bytes32.ZERO, BlockHeader.GENESIS_BLOCK_NUMBER);
-  }
-
-  @Test
-  public void shouldReturnZeroWhenRequestedBlockAheadOfCurrent() {
-    assertBlockHash(250, Bytes32.ZERO, 100);
-  }
-
-  @Test
-  public void shouldReturnZeroWhenRequestedBlockTooFarBehindCurrent() {
-    final int requestedBlock = 10;
-    // Our block is the one after the chain head (it's a new block), hence the + 1.
-    final int importingBlockNumber = MAXIMUM_COMPLETE_BLOCKS_BEHIND + requestedBlock + 1;
-    assertBlockHash(requestedBlock, Bytes32.ZERO, importingBlockNumber);
-  }
-
-  @Test
-  public void shouldReturnZeroWhenRequestedBlockGreaterThanImportingBlock() {
-    assertBlockHash(101, Bytes32.ZERO, 100);
-  }
-
-  @Test
-  public void shouldReturnZeroWhenRequestedBlockEqualToImportingBlock() {
-    assertBlockHash(100, Bytes32.ZERO, 100);
-  }
-
-  @Test
-  public void shouldReturnBlockHashUsingLookupFromFrameWhenItIsWithinTheAllowedRange() {
-    final Hash blockHash = Hash.hash(Bytes.fromHexString("0x1293487297"));
-    when(blockHashLookup.getBlockHash(100)).thenReturn(blockHash);
-    assertBlockHash(100, blockHash, 200);
-    verify(blockHashLookup).getBlockHash(100);
-  }
-
-  private void assertBlockHash(
-      final long requestedBlock, final Bytes32 expectedOutput, final long currentBlockNumber) {
-    assertBlockHash(UInt256.valueOf(requestedBlock).toBytes(), expectedOutput, currentBlockNumber);
-  }
-
-  private void assertBlockHash(
-      final Bytes32 input, final Bytes32 expectedOutput, final long currentBlockNumber) {
-    final MessageFrame frame =
-        new MessageFrameTestFixture()
-            .blockHashLookup(blockHashLookup)
-            .blockHeader(new BlockHeaderTestFixture().number(currentBlockNumber).buildHeader())
-            .pushStackItem(input)
-            .build();
-    blockHashOperation.execute(frame, null);
-    final Bytes32 result = frame.popStackItem();
-    assertThat(result).isEqualTo(expectedOutput);
-    assertThat(frame.stackSize()).isZero();
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ChainIdOperationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ChainIdOperationTest.java
deleted file mode 100644
index 890ec20cb72..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ChainIdOperationTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.mainnet.ConstantinopleGasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Operation.OperationResult;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mockito;
-
-@RunWith(Parameterized.class)
-public class ChainIdOperationTest {
-
-  private final Bytes32 chainId;
-  private final int expectedGas;
-  private final MessageFrame messageFrame = mock(MessageFrame.class);
-  private final ChainIdOperation operation;
-
-  @Parameters(name = "chainId: {0}, expectedGas: {1}")
-  public static Object[][] params() {
-    return new Object[][] {
-      {"0x01", 2},
-      {"0x03", 2},
-      {"0x04", 2},
-      {"0x05", 2},
-    };
-  }
-
-  public ChainIdOperationTest(final String chainIdString, final int expectedGas) {
-    chainId = Bytes32.fromHexString(chainIdString);
-    this.expectedGas = expectedGas;
-    operation = new ChainIdOperation(new ConstantinopleGasCalculator(), chainId);
-    when(messageFrame.getRemainingGas()).thenReturn(Gas.of(100));
-  }
-
-  @SuppressWarnings("ResultOfMethodCallIgnored")
-  @Test
-  public void shouldReturnChainId() {
-    final ArgumentCaptor<Bytes32> arg = ArgumentCaptor.forClass(Bytes32.class);
-    when(messageFrame.getRemainingGas()).thenReturn(Gas.of(100));
-    operation.execute(messageFrame, null);
-    Mockito.verify(messageFrame).getRemainingGas();
-    Mockito.verify(messageFrame).pushStackItem(arg.capture());
-    Mockito.verifyNoMoreInteractions(messageFrame);
-    assertThat(arg.getValue()).isEqualTo(chainId);
-  }
-
-  @Test
-  public void shouldCalculateGasPrice() {
-    final OperationResult result = operation.execute(messageFrame, null);
-    assertThat(result.getGasCost()).contains(Gas.of(expectedGas));
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ConstantinopleSStoreOperationGasCostTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ConstantinopleSStoreOperationGasCostTest.java
deleted file mode 100644
index 657c091dd88..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ConstantinopleSStoreOperationGasCostTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.config.StubGenesisConfigOptions;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.TestCodeExecutor;
-import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.MessageFrame.State;
-
-import org.apache.tuweni.units.bigints.UInt256;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class ConstantinopleSStoreOperationGasCostTest {
-
-  private static final ProtocolSchedule protocolSchedule =
-      MainnetProtocolSchedule.fromConfig(new StubGenesisConfigOptions().constantinopleBlock(0));
-
-  @Parameters(name = "Code: {0}, Original: {1}")
-  public static Object[][] scenarios() {
-    // Tests specified in EIP-1283.
-    return new Object[][] {
-      {"0x60006000556000600055", 0, 412, 0},
-      {"0x60006000556001600055", 0, 20212, 0},
-      {"0x60016000556000600055", 0, 20212, 19800},
-      {"0x60016000556002600055", 0, 20212, 0},
-      {"0x60016000556001600055", 0, 20212, 0},
-      {"0x60006000556000600055", 1, 5212, 15000},
-      {"0x60006000556001600055", 1, 5212, 4800},
-      {"0x60006000556002600055", 1, 5212, 0},
-      {"0x60026000556003600055", 1, 5212, 0},
-      {"0x60026000556001600055", 1, 5212, 4800},
-      {"0x60026000556002600055", 1, 5212, 0},
-      {"0x60016000556000600055", 1, 5212, 15000},
-      {"0x60016000556002600055", 1, 5212, 0},
-      {"0x60016000556001600055", 1, 412, 0},
-      {"0x600160005560006000556001600055", 0, 40218, 19800},
-      {"0x600060005560016000556000600055", 1, 10218, 19800},
-      {"0x60026000556000600055", 1, 5212, 15000},
-    };
-  }
-
-  private TestCodeExecutor codeExecutor;
-
-  @Parameter public String code;
-
-  @Parameter(value = 1)
-  public int originalValue;
-
-  @Parameter(value = 2)
-  public int expectedGasUsed;
-
-  @Parameter(value = 3)
-  public int expectedGasRefund;
-
-  @Before
-  public void setUp() {
-    codeExecutor = new TestCodeExecutor(protocolSchedule);
-  }
-
-  @Test
-  public void shouldCalculateGasAccordingToEip1283() {
-    final long gasLimit = 1_000_000;
-    final MessageFrame frame =
-        codeExecutor.executeCode(
-            code,
-            Account.DEFAULT_VERSION,
-            gasLimit,
-            account -> account.setStorageValue(UInt256.ZERO, UInt256.valueOf(originalValue)));
-    assertThat(frame.getState()).isEqualTo(State.COMPLETED_SUCCESS);
-    assertThat(frame.getRemainingGas()).isEqualTo(Gas.of(gasLimit - expectedGasUsed));
-    assertThat(frame.getGasRefund()).isEqualTo(Gas.of(expectedGasRefund));
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/Create2OperationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/Create2OperationTest.java
deleted file mode 100644
index 48ab3907c0b..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/Create2OperationTest.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
-import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.core.WrappedEvmAccount;
-import org.hyperledger.besu.ethereum.mainnet.ConstantinopleGasCalculator;
-import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
-import org.hyperledger.besu.ethereum.vm.Code;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Operation.OperationResult;
-
-import java.util.ArrayDeque;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class Create2OperationTest {
-
-  private final String sender;
-  private final String salt;
-  private final String code;
-  private final String expectedAddress;
-  private final int expectedGas;
-  private MessageFrame messageFrame;
-  private final WorldUpdater worldUpdater = mock(WorldUpdater.class);
-  private final WrappedEvmAccount account = mock(WrappedEvmAccount.class);
-  private final MutableAccount mutableAccount = mock(MutableAccount.class);
-  private final Create2Operation operation =
-      new Create2Operation(new ConstantinopleGasCalculator());
-
-  @Parameters(name = "sender: {0}, salt: {1}, code: {2}")
-  public static Object[][] params() {
-    return new Object[][] {
-      {
-        "0x0000000000000000000000000000000000000000",
-        "0x0000000000000000000000000000000000000000000000000000000000000000",
-        "0x00",
-        "0x4D1A2e2bB4F88F0250f26Ffff098B0b30B26BF38",
-        32006
-      },
-      {
-        "0xdeadbeef00000000000000000000000000000000",
-        "0x0000000000000000000000000000000000000000000000000000000000000000",
-        "0x00",
-        "0xB928f69Bb1D91Cd65274e3c79d8986362984fDA3",
-        32006
-      },
-      {
-        "0xdeadbeef00000000000000000000000000000000",
-        "0x000000000000000000000000feed000000000000000000000000000000000000",
-        "0x00",
-        "0xD04116cDd17beBE565EB2422F2497E06cC1C9833",
-        32006
-      },
-      {
-        "0x0000000000000000000000000000000000000000",
-        "0x0000000000000000000000000000000000000000000000000000000000000000",
-        "0xdeadbeef",
-        "0x70f2b2914A2a4b783FaEFb75f459A580616Fcb5e",
-        32006
-      },
-      {
-        "0x00000000000000000000000000000000deadbeef",
-        "0x00000000000000000000000000000000000000000000000000000000cafebabe",
-        "0xdeadbeef",
-        "0x60f3f640a8508fC6a86d45DF051962668E1e8AC7",
-        32006
-      },
-      {
-        "0x00000000000000000000000000000000deadbeef",
-        "0x00000000000000000000000000000000000000000000000000000000cafebabe",
-        "0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
-        "0x1d8bfDC5D46DC4f61D6b6115972536eBE6A8854C",
-        32012
-      },
-      {
-        "0x0000000000000000000000000000000000000000",
-        "0x0000000000000000000000000000000000000000000000000000000000000000",
-        "0x",
-        "0xE33C0C7F7df4809055C3ebA6c09CFe4BaF1BD9e0",
-        32000
-      }
-    };
-  }
-
-  public Create2OperationTest(
-      final String sender,
-      final String salt,
-      final String code,
-      final String expectedAddress,
-      final int expectedGas) {
-    this.sender = sender;
-    this.salt = salt;
-    this.code = code;
-    this.expectedAddress = expectedAddress;
-    this.expectedGas = expectedGas;
-  }
-
-  @Before
-  public void setUp() {
-    final Bytes32 memoryOffset = Bytes32.fromHexString("0xFF");
-    final Bytes codeBytes = Bytes.fromHexString(code);
-    final UInt256 memoryLength = UInt256.valueOf(codeBytes.size());
-    when(account.getMutable()).thenReturn(mutableAccount);
-    messageFrame =
-        MessageFrame.builder()
-            .type(MessageFrame.Type.CONTRACT_CREATION)
-            .contract(Address.ZERO)
-            .inputData(Bytes.EMPTY)
-            .sender(Address.fromHexString(sender))
-            .value(Wei.ZERO)
-            .apparentValue(Wei.ZERO)
-            .code(new Code(codeBytes))
-            .depth(1)
-            .completer(__ -> {})
-            .contractAccountVersion(0)
-            .address(Address.fromHexString(sender))
-            .blockHashLookup(mock(BlockHashLookup.class))
-            .blockHeader(mock(ProcessableBlockHeader.class))
-            .blockchain(mock(Blockchain.class))
-            .gasPrice(Wei.ZERO)
-            .messageFrameStack(new ArrayDeque<>())
-            .miningBeneficiary(Address.ZERO)
-            .originator(Address.ZERO)
-            .initialGas(Gas.of(100000))
-            .worldState(worldUpdater)
-            .build();
-    messageFrame.pushStackItem(Bytes32.fromHexString(salt));
-    messageFrame.pushStackItem(memoryLength.toBytes());
-    messageFrame.pushStackItem(memoryOffset);
-    messageFrame.pushStackItem(Bytes32.ZERO);
-    messageFrame.expandMemory(UInt256.ZERO, UInt256.valueOf(500));
-    messageFrame.writeMemory(
-        UInt256.fromBytes(memoryOffset), UInt256.valueOf(code.length()), codeBytes);
-
-    when(mutableAccount.getBalance()).thenReturn(Wei.ZERO);
-    when(worldUpdater.getAccount(any())).thenReturn(account);
-    when(worldUpdater.updater()).thenReturn(worldUpdater);
-  }
-
-  @Test
-  public void shouldCalculateAddress() {
-    final Address targetContractAddress = operation.targetContractAddress(messageFrame);
-    assertThat(targetContractAddress).isEqualTo(Address.fromHexString(expectedAddress));
-  }
-
-  @Test
-  public void shouldCalculateGasPrice() {
-    final OperationResult result = operation.execute(messageFrame, null);
-    assertThat(result.getHaltReason()).isEmpty();
-    assertThat(result.getGasCost()).contains(Gas.of(expectedGas));
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeHashOperationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeHashOperationTest.java
deleted file mode 100644
index 853dce8db41..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ExtCodeHashOperationTest.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive;
-import static org.mockito.Mockito.mock;
-
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.AddressHelpers;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.MessageFrameTestFixture;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.mainnet.ConstantinopleGasCalculator;
-import org.hyperledger.besu.ethereum.mainnet.IstanbulGasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Operation.OperationResult;
-import org.hyperledger.besu.ethereum.vm.Words;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-import org.junit.Test;
-
-public class ExtCodeHashOperationTest {
-
-  private static final Address REQUESTED_ADDRESS = AddressHelpers.ofValue(22222222);
-
-  private final Blockchain blockchain = mock(Blockchain.class);
-
-  private final WorldStateArchive worldStateArchive = createInMemoryWorldStateArchive();
-  private final WorldUpdater worldStateUpdater = worldStateArchive.getMutable().updater();
-
-  private final ExtCodeHashOperation operation =
-      new ExtCodeHashOperation(new ConstantinopleGasCalculator());
-  private final ExtCodeHashOperation operationIstanbul =
-      new ExtCodeHashOperation(new IstanbulGasCalculator());
-
-  @Test
-  public void shouldCharge400Gas() {
-    final OperationResult result = operation.execute(createMessageFrame(REQUESTED_ADDRESS), null);
-    assertThat(result.getGasCost()).contains(Gas.of(400));
-  }
-
-  @Test
-  public void istanbulShouldCharge700Gas() {
-    final OperationResult result =
-        operationIstanbul.execute(createMessageFrame(REQUESTED_ADDRESS), null);
-    assertThat(result.getGasCost()).contains(Gas.of(700));
-  }
-
-  @Test
-  public void shouldReturnZeroWhenAccountDoesNotExist() {
-    final Bytes32 result = executeOperation(REQUESTED_ADDRESS);
-    assertThat(result).isEqualTo(Bytes32.ZERO);
-  }
-
-  @Test
-  public void shouldReturnHashOfEmptyDataWhenAccountExistsButDoesNotHaveCode() {
-    worldStateUpdater.getOrCreate(REQUESTED_ADDRESS).getMutable().setBalance(Wei.of(1));
-    assertThat(executeOperation(REQUESTED_ADDRESS)).isEqualTo(Hash.EMPTY);
-  }
-
-  @Test
-  public void shouldReturnZeroWhenAccountExistsButIsEmpty() {
-    worldStateUpdater.getOrCreate(REQUESTED_ADDRESS);
-    assertThat(executeOperation(REQUESTED_ADDRESS)).isEqualTo(Bytes32.ZERO);
-  }
-
-  @Test
-  public void shouldReturnZeroWhenPrecompiledContractHasNoBalance() {
-    assertThat(executeOperation(Address.ECREC)).isEqualTo(Bytes32.ZERO);
-  }
-
-  @Test
-  public void shouldReturnEmptyCodeHashWhenPrecompileHasBalance() {
-    // Sending money to a precompile causes it to exist in the world state archive.
-    worldStateUpdater.getOrCreate(Address.ECREC).getMutable().setBalance(Wei.of(10));
-    assertThat(executeOperation(Address.ECREC)).isEqualTo(Hash.EMPTY);
-  }
-
-  @Test
-  public void shouldGetHashOfAccountCodeWhenCodeIsPresent() {
-    final Bytes code = Bytes.fromHexString("0xabcdef");
-    final MutableAccount account = worldStateUpdater.getOrCreate(REQUESTED_ADDRESS).getMutable();
-    account.setCode(code);
-    account.setVersion(Account.DEFAULT_VERSION);
-    assertThat(executeOperation(REQUESTED_ADDRESS)).isEqualTo(Hash.hash(code));
-  }
-
-  @Test
-  public void shouldZeroOutLeftMostBitsToGetAddress() {
-    // If EXTCODEHASH of A is X, then EXTCODEHASH of A + 2**160 is X.
-    final Bytes code = Bytes.fromHexString("0xabcdef");
-    final MutableAccount account = worldStateUpdater.getOrCreate(REQUESTED_ADDRESS).getMutable();
-    account.setCode(code);
-    account.setVersion(Account.DEFAULT_VERSION);
-    final Bytes32 value =
-        UInt256.fromBytes(Words.fromAddress(REQUESTED_ADDRESS))
-            .add(UInt256.valueOf(2).pow(UInt256.valueOf(160)))
-            .toBytes();
-    final MessageFrame frame = createMessageFrame(value);
-    operation.execute(frame, null);
-    assertThat(frame.getStackItem(0)).isEqualTo(Hash.hash(code));
-  }
-
-  private Bytes32 executeOperation(final Address requestedAddress) {
-    final MessageFrame frame = createMessageFrame(requestedAddress);
-    operation.execute(frame, null);
-    return frame.getStackItem(0);
-  }
-
-  private MessageFrame createMessageFrame(final Address requestedAddress) {
-    final Bytes32 stackItem = Words.fromAddress(requestedAddress);
-    return createMessageFrame(stackItem);
-  }
-
-  private MessageFrame createMessageFrame(final Bytes32 stackItem) {
-    final BlockHeader blockHeader = new BlockHeaderTestFixture().buildHeader();
-    final MessageFrame frame =
-        new MessageFrameTestFixture()
-            .worldState(worldStateUpdater)
-            .blockHeader(blockHeader)
-            .blockchain(blockchain)
-            .build();
-
-    frame.pushStackItem(stackItem);
-    return frame;
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/JumpOperationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/JumpOperationTest.java
deleted file mode 100644
index 8a06ead4658..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/JumpOperationTest.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive;
-import static org.mockito.Mockito.mock;
-
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.MessageFrameTestFixture;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.mainnet.IstanbulGasCalculator;
-import org.hyperledger.besu.ethereum.vm.Code;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Operation.OperationResult;
-import org.hyperledger.besu.ethereum.vm.OperationRegistry;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.junit.Before;
-import org.junit.Test;
-
-public class JumpOperationTest {
-
-  private static final IstanbulGasCalculator gasCalculator = new IstanbulGasCalculator();
-
-  private static final int CURRENT_PC = 1;
-
-  private Blockchain blockchain;
-  private Address address;
-  private WorldUpdater worldStateUpdater;
-  private EVM evm;
-
-  private MessageFrameTestFixture createMessageFrameBuilder(final Gas initialGas) {
-    final BlockHeader blockHeader = new BlockHeaderTestFixture().buildHeader();
-    return new MessageFrameTestFixture()
-        .address(address)
-        .worldState(worldStateUpdater)
-        .blockHeader(blockHeader)
-        .blockchain(blockchain)
-        .initialGas(initialGas);
-  }
-
-  @Before
-  public void init() {
-    blockchain = mock(Blockchain.class);
-
-    address = Address.fromHexString("0x18675309");
-
-    final WorldStateArchive worldStateArchive = createInMemoryWorldStateArchive();
-
-    worldStateUpdater = worldStateArchive.getMutable().updater();
-    worldStateUpdater.getOrCreate(address).getMutable().setBalance(Wei.of(1));
-    worldStateUpdater.commit();
-
-    final OperationRegistry registry = new OperationRegistry();
-    registry.put(new JumpOperation(gasCalculator), 0);
-    registry.put(new JumpDestOperation(gasCalculator), 0);
-    evm = new EVM(registry, gasCalculator);
-  }
-
-  @Test
-  public void shouldJumpWhenLocationIsJumpDest() {
-    final JumpOperation operation = new JumpOperation(gasCalculator);
-    final MessageFrame frame =
-        createMessageFrameBuilder(Gas.of(10_000))
-            .pushStackItem(Bytes32.fromHexString("0x03"))
-            .code(new Code(Bytes.fromHexString("0x6003565b00")))
-            .build();
-    frame.setPC(CURRENT_PC);
-
-    final OperationResult result = operation.execute(frame, evm);
-    assertThat(result.getHaltReason()).isEmpty();
-  }
-
-  @Test
-  public void shouldJumpWhenLocationIsJumpDestAndAtEndOfCode() {
-    final JumpOperation operation = new JumpOperation(gasCalculator);
-    final MessageFrame frame =
-        createMessageFrameBuilder(Gas.of(10_000))
-            .pushStackItem(Bytes32.fromHexString("0x03"))
-            .code(new Code(Bytes.fromHexString("0x6003565b")))
-            .build();
-    frame.setPC(CURRENT_PC);
-
-    final OperationResult result = operation.execute(frame, evm);
-    assertThat(result.getHaltReason()).isEmpty();
-  }
-
-  @Test
-  public void shouldHaltWithInvalidJumDestinationWhenLocationIsOutsideOfCodeRange() {
-    final JumpOperation operation = new JumpOperation(gasCalculator);
-    final MessageFrame frameDestinationGreaterThanCodeSize =
-        createMessageFrameBuilder(Gas.of(100))
-            .pushStackItem(Bytes32.fromHexString("0xFFFFFFFF"))
-            .code(new Code(Bytes.fromHexString("0x6801000000000000000c565b00")))
-            .build();
-    frameDestinationGreaterThanCodeSize.setPC(CURRENT_PC);
-
-    final OperationResult result = operation.execute(frameDestinationGreaterThanCodeSize, null);
-    assertThat(result.getHaltReason()).contains(ExceptionalHaltReason.INVALID_JUMP_DESTINATION);
-
-    final MessageFrame frameDestinationEqualsToCodeSize =
-        createMessageFrameBuilder(Gas.of(100))
-            .pushStackItem(Bytes32.fromHexString("0x04"))
-            .code(new Code(Bytes.fromHexString("0x60045600")))
-            .returnStack(new ReturnStack())
-            .build();
-    frameDestinationEqualsToCodeSize.setPC(CURRENT_PC);
-
-    final OperationResult result2 = operation.execute(frameDestinationEqualsToCodeSize, null);
-    assertThat(result2.getHaltReason()).contains(ExceptionalHaltReason.INVALID_JUMP_DESTINATION);
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/JumpSubOperationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/JumpSubOperationTest.java
deleted file mode 100644
index cb070c5986e..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/JumpSubOperationTest.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive;
-import static org.mockito.Mockito.mock;
-
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.MessageFrameTestFixture;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.mainnet.IstanbulGasCalculator;
-import org.hyperledger.besu.ethereum.vm.Code;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Operation.OperationResult;
-import org.hyperledger.besu.ethereum.vm.OperationRegistry;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
-
-import java.util.stream.IntStream;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.junit.Before;
-import org.junit.Test;
-
-public class JumpSubOperationTest {
-
-  private static final IstanbulGasCalculator gasCalculator = new IstanbulGasCalculator();
-
-  private static final int CURRENT_PC = 1;
-  private static final Gas JUMP_SUB_GAS_COST = Gas.of(10);
-
-  private Blockchain blockchain;
-  private Address address;
-  private WorldUpdater worldStateUpdater;
-  private EVM evm;
-
-  private MessageFrameTestFixture createMessageFrameBuilder(final Gas initialGas) {
-    final BlockHeader blockHeader = new BlockHeaderTestFixture().buildHeader();
-    return new MessageFrameTestFixture()
-        .address(address)
-        .worldState(worldStateUpdater)
-        .blockHeader(blockHeader)
-        .blockchain(blockchain)
-        .initialGas(initialGas);
-  }
-
-  @Before
-  public void init() {
-    blockchain = mock(Blockchain.class);
-
-    address = Address.fromHexString("0x18675309");
-
-    final WorldStateArchive worldStateArchive = createInMemoryWorldStateArchive();
-
-    worldStateUpdater = worldStateArchive.getMutable().updater();
-    worldStateUpdater.getOrCreate(address).getMutable().setBalance(Wei.of(1));
-    worldStateUpdater.commit();
-
-    final OperationRegistry registry = new OperationRegistry();
-    registry.put(new BeginSubOperation(gasCalculator), 0);
-    registry.put(new JumpSubOperation(gasCalculator), 0);
-    registry.put(new ReturnOperation(gasCalculator), 0);
-    evm = new EVM(registry, gasCalculator);
-  }
-
-  @Test
-  public void shouldCalculateGasPrice() {
-
-    final JumpSubOperation operation = new JumpSubOperation(gasCalculator);
-    final MessageFrame frame =
-        createMessageFrameBuilder(Gas.of(100))
-            .pushStackItem(Bytes32.fromHexString("0x04"))
-            .code(new Code(Bytes.fromHexString("0x60045e005c5d")))
-            .returnStack(new ReturnStack())
-            .build();
-    frame.setPC(CURRENT_PC);
-
-    final OperationResult result = operation.execute(frame, evm);
-    assertThat(result.getHaltReason()).isEmpty();
-    assertThat(result.getGasCost()).contains(JUMP_SUB_GAS_COST);
-  }
-
-  @Test
-  public void shouldHaltWithInvalidJumpDestinationWhenLocationIsNotBeginSub() {
-    final JumpSubOperation operation = new JumpSubOperation(gasCalculator);
-    final MessageFrame frame =
-        createMessageFrameBuilder(Gas.of(100))
-            .pushStackItem(Bytes32.fromHexString("0x05"))
-            .code(new Code(Bytes.fromHexString("0x60045e005c5d")))
-            .returnStack(new ReturnStack())
-            .build();
-    frame.setPC(CURRENT_PC);
-
-    final OperationResult result = operation.execute(frame, evm);
-    assertThat(result.getHaltReason()).contains(ExceptionalHaltReason.INVALID_JUMP_DESTINATION);
-  }
-
-  @Test
-  public void shouldJumpWhenLocationIsBeginSub() {
-    final JumpSubOperation operation = new JumpSubOperation(gasCalculator);
-    final MessageFrame frame =
-        createMessageFrameBuilder(Gas.of(100))
-            .pushStackItem(Bytes32.fromHexString("0x04"))
-            .code(new Code(Bytes.fromHexString("0x60045e005c5d")))
-            .returnStack(new ReturnStack())
-            .build();
-    frame.setPC(CURRENT_PC);
-
-    final OperationResult result = operation.execute(frame, evm);
-    assertThat(result.getHaltReason()).isEmpty();
-    assertThat(frame.popReturnStackItem()).isEqualTo(CURRENT_PC + 1);
-  }
-
-  @Test
-  public void shouldJumpWhenLocationIsBeginSubAndAtEndOfCode() {
-    final JumpSubOperation operation = new JumpSubOperation(gasCalculator);
-    final MessageFrame frame =
-        createMessageFrameBuilder(Gas.of(100))
-            .pushStackItem(Bytes32.fromHexString("0x04"))
-            .code(new Code(Bytes.fromHexString("0x60045e005c")))
-            .returnStack(new ReturnStack())
-            .build();
-    frame.setPC(CURRENT_PC);
-
-    final OperationResult result = operation.execute(frame, evm);
-    assertThat(result.getHaltReason()).isEmpty();
-    assertThat(frame.popReturnStackItem()).isEqualTo(CURRENT_PC + 1);
-  }
-
-  @Test
-  public void shouldHaltWithInvalidJumpDestinationWhenLocationIsWayOutsideOfCodeRange() {
-    final JumpSubOperation operation = new JumpSubOperation(gasCalculator);
-    final MessageFrame frameDestinationGreaterThanCodeSize =
-        createMessageFrameBuilder(Gas.of(100))
-            .pushStackItem(Bytes32.fromHexString("0xFFFFFFFF"))
-            .code(new Code(Bytes.fromHexString("0x6801000000000000000c5e005c60115e5d5c5d")))
-            .returnStack(new ReturnStack())
-            .build();
-    frameDestinationGreaterThanCodeSize.setPC(CURRENT_PC);
-
-    final OperationResult result = operation.execute(frameDestinationGreaterThanCodeSize, evm);
-    assertThat(result.getHaltReason()).contains(ExceptionalHaltReason.INVALID_JUMP_DESTINATION);
-  }
-
-  @Test
-  public void shouldHaltWithInvalidJumpDestinationWhenLocationIsJustOutsideOfCodeRange() {
-    final JumpSubOperation operation = new JumpSubOperation(gasCalculator);
-    final MessageFrame frameDestinationEqualsToCodeSize =
-        createMessageFrameBuilder(Gas.of(100))
-            .pushStackItem(Bytes32.fromHexString("0x05"))
-            .code(new Code(Bytes.fromHexString("0x60045e005c")))
-            .returnStack(new ReturnStack())
-            .build();
-    frameDestinationEqualsToCodeSize.setPC(CURRENT_PC);
-
-    final OperationResult result2 = operation.execute(frameDestinationEqualsToCodeSize, evm);
-    assertThat(result2.getHaltReason()).contains(ExceptionalHaltReason.INVALID_JUMP_DESTINATION);
-  }
-
-  @Test
-  public void shouldHaltWithInsufficientStackItemsWhenLocationIsNotAvailable() {
-    final JumpSubOperation operation = new JumpSubOperation(gasCalculator);
-    final MessageFrame frame =
-        createMessageFrameBuilder(Gas.of(100)).returnStack(new ReturnStack()).build();
-    frame.setPC(CURRENT_PC);
-
-    final OperationResult result = operation.execute(frame, null);
-    assertThat(result.getHaltReason()).contains(ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS);
-  }
-
-  @Test
-  public void shouldHaltWithTooManyStackItemsWhenReturnStackIsFull() {
-    final JumpSubOperation operation = new JumpSubOperation(gasCalculator);
-    final ReturnStack returnStack = new ReturnStack();
-    final MessageFrame frame =
-        createMessageFrameBuilder(Gas.of(100)).returnStack(returnStack).build();
-    frame.setPC(CURRENT_PC);
-
-    assertThat(frame.isReturnStackFull()).isFalse();
-
-    IntStream.range(0, 1023).forEach(frame::pushReturnStackItem);
-    assertThat(frame.isReturnStackFull()).isTrue();
-    assertThat(returnStack.size()).isEqualTo(1023);
-    final OperationResult result = operation.execute(frame, null);
-    assertThat(result.getHaltReason()).contains(ExceptionalHaltReason.TOO_MANY_STACK_ITEMS);
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ReturnSubOperationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ReturnSubOperationTest.java
deleted file mode 100644
index 599df153b87..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ReturnSubOperationTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive;
-import static org.mockito.Mockito.mock;
-
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.MessageFrameTestFixture;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.mainnet.IstanbulGasCalculator;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Operation.OperationResult;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class ReturnSubOperationTest {
-
-  private static final IstanbulGasCalculator gasCalculator = new IstanbulGasCalculator();
-
-  private static final int CURRENT_PC = 1;
-  private static final Gas RETURN_SUB_GAS_COST = Gas.of(5);
-
-  private Blockchain blockchain;
-  private Address address;
-  private WorldUpdater worldStateUpdater;
-
-  private MessageFrameTestFixture createMessageFrameBuilder(final Gas initialGas) {
-    final BlockHeader blockHeader = new BlockHeaderTestFixture().buildHeader();
-    return new MessageFrameTestFixture()
-        .address(address)
-        .worldState(worldStateUpdater)
-        .blockHeader(blockHeader)
-        .blockchain(blockchain)
-        .initialGas(initialGas);
-  }
-
-  @Before
-  public void init() {
-    blockchain = mock(Blockchain.class);
-
-    address = Address.fromHexString("0x18675309");
-
-    final WorldStateArchive worldStateArchive = createInMemoryWorldStateArchive();
-
-    worldStateUpdater = worldStateArchive.getMutable().updater();
-    worldStateUpdater.getOrCreate(address).getMutable().setBalance(Wei.of(1));
-    worldStateUpdater.commit();
-  }
-
-  @Test
-  public void shouldCalculateGasPrice() {
-
-    final ReturnSubOperation operation = new ReturnSubOperation(gasCalculator);
-    final MessageFrame frame =
-        createMessageFrameBuilder(Gas.of(1)).returnStack(new ReturnStack()).build();
-    frame.setPC(CURRENT_PC);
-    final OperationResult result = operation.execute(frame, null);
-    assertThat(result.getGasCost()).contains(RETURN_SUB_GAS_COST);
-  }
-
-  @Test
-  public void shouldHaltWithInvalidRetSubWhenReturnStackIsEmpty() {
-    final ReturnSubOperation operation = new ReturnSubOperation(gasCalculator);
-    final MessageFrame frame =
-        createMessageFrameBuilder(Gas.of(100)).returnStack(new ReturnStack()).build();
-    frame.setPC(CURRENT_PC);
-    final OperationResult result = operation.execute(frame, null);
-
-    assertThat(result.getHaltReason()).contains(ExceptionalHaltReason.INVALID_RETSUB);
-  }
-
-  @Test
-  public void shouldReturnToTheLastLocation() {
-    final int RETURN_LOCATION = 0;
-    final ReturnSubOperation operation = new ReturnSubOperation(gasCalculator);
-    final ReturnStack returnStack = new ReturnStack();
-    final MessageFrame frame =
-        createMessageFrameBuilder(Gas.of(100)).returnStack(returnStack).build();
-    frame.setPC(CURRENT_PC);
-    returnStack.push(RETURN_LOCATION);
-    final OperationResult result = operation.execute(frame, null);
-    assertThat(result.getHaltReason()).isNotPresent();
-    assertThat(frame.getPC()).isEqualTo(RETURN_LOCATION);
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/RevertOperationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/RevertOperationTest.java
deleted file mode 100644
index 6e71867a504..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/RevertOperationTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.mainnet.ConstantinopleGasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt256;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
-
-@RunWith(MockitoJUnitRunner.class)
-public class RevertOperationTest {
-
-  @Mock private MessageFrame messageFrame;
-  private final RevertOperation operation = new RevertOperation(new ConstantinopleGasCalculator());
-
-  private final Bytes revertReasonBytes = Bytes.fromHexString("726576657274206d657373616765");
-
-  @Before
-  public void setUp() {
-    when(messageFrame.popStackItem())
-        .thenReturn(Bytes32.fromHexString("0x00"))
-        .thenReturn(Bytes32.fromHexString("0x0e"));
-    final UInt256 uint256_14 = UInt256.valueOf(0x0e);
-    when(messageFrame.readMemory(UInt256.ZERO, uint256_14)).thenReturn(revertReasonBytes);
-    when(messageFrame.memoryWordSize()).thenReturn(UInt256.ZERO);
-    when(messageFrame.calculateMemoryExpansion(any(), any())).thenReturn(uint256_14);
-    when(messageFrame.getRemainingGas()).thenReturn(Gas.of(10_000));
-  }
-
-  @Test
-  public void shouldReturnReason() {
-    final ArgumentCaptor<Bytes> arg = ArgumentCaptor.forClass(Bytes.class);
-    operation.execute(messageFrame, null);
-    Mockito.verify(messageFrame).setRevertReason(arg.capture());
-    assertThat(arg.getValue()).isEqualTo(revertReasonBytes);
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/SStoreOperationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/SStoreOperationTest.java
deleted file mode 100644
index 52e9d7cca8d..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/SStoreOperationTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive;
-import static org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason.INSUFFICIENT_GAS;
-import static org.mockito.Mockito.mock;
-
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.MessageFrameTestFixture;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.mainnet.ConstantinopleGasCalculator;
-import org.hyperledger.besu.ethereum.vm.ExceptionalHaltReason;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Operation.OperationResult;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
-
-import java.util.Arrays;
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-public class SStoreOperationTest {
-
-  private final Gas minimumGasAvailable;
-  private final Gas initialGas;
-  private final Gas remainingGas;
-  private final Optional<ExceptionalHaltReason> expectedHalt;
-
-  private static final GasCalculator gasCalculator = new ConstantinopleGasCalculator();
-
-  private static final Object[][] testData = {
-    {
-      SStoreOperation.FRONTIER_MINIMUM, Gas.of(200), Gas.of(200), null,
-    },
-    {
-      SStoreOperation.EIP_1706_MINIMUM, Gas.of(200), Gas.of(200), INSUFFICIENT_GAS,
-    },
-    {
-      SStoreOperation.FRONTIER_MINIMUM, Gas.of(10_000), Gas.of(10_000), null,
-    },
-    {
-      SStoreOperation.EIP_1706_MINIMUM, Gas.of(10_000), Gas.of(10_000), null,
-    },
-    {
-      SStoreOperation.FRONTIER_MINIMUM, Gas.of(10_000), Gas.of(200), null,
-    },
-    {
-      SStoreOperation.EIP_1706_MINIMUM, Gas.of(10_000), Gas.of(200), INSUFFICIENT_GAS,
-    },
-  };
-
-  public SStoreOperationTest(
-      final Gas minimumGasAvailable,
-      final Gas initialGas,
-      final Gas remainingGas,
-      final ExceptionalHaltReason expectedHalt) {
-    this.minimumGasAvailable = minimumGasAvailable;
-    this.initialGas = initialGas;
-    this.remainingGas = remainingGas;
-    this.expectedHalt = Optional.ofNullable(expectedHalt);
-  }
-
-  @Parameterized.Parameters(
-      name = "{index}: minimum gas {0}, initial gas {1}, remaining gas {2}, expected halt {3}")
-  public static Iterable<Object[]> data() {
-    return Arrays.asList(testData);
-  }
-
-  private MessageFrame createMessageFrame(
-      final Address address, final Gas initialGas, final Gas remainingGas) {
-    final Blockchain blockchain = mock(Blockchain.class);
-
-    final WorldStateArchive worldStateArchive = createInMemoryWorldStateArchive();
-    final WorldUpdater worldStateUpdater = worldStateArchive.getMutable().updater();
-    final BlockHeader blockHeader = new BlockHeaderTestFixture().buildHeader();
-    final MessageFrame frame =
-        new MessageFrameTestFixture()
-            .address(address)
-            .worldState(worldStateUpdater)
-            .blockHeader(blockHeader)
-            .blockchain(blockchain)
-            .initialGas(initialGas)
-            .build();
-    worldStateUpdater.getOrCreate(address).getMutable().setBalance(Wei.of(1));
-    worldStateUpdater.commit();
-    frame.setGasRemaining(remainingGas);
-
-    return frame;
-  }
-
-  @Test
-  public void storeOperation() {
-    final SStoreOperation operation = new SStoreOperation(gasCalculator, minimumGasAvailable);
-    final MessageFrame frame =
-        createMessageFrame(Address.fromHexString("0x18675309"), initialGas, remainingGas);
-    frame.pushStackItem(Bytes32.ZERO);
-    frame.pushStackItem(Bytes32.fromHexString("0x01"));
-
-    final OperationResult result = operation.execute(frame, null);
-    assertThat(result.getHaltReason()).isEqualTo(expectedHalt);
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/SarOperationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/SarOperationTest.java
deleted file mode 100644
index ef89da19337..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/SarOperationTest.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.mainnet.SpuriousDragonGasCalculator;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Arrays;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-public class SarOperationTest {
-
-  private final String number;
-  private final String shift;
-  private final String expectedResult;
-
-  private final GasCalculator gasCalculator = new SpuriousDragonGasCalculator();
-  private final SarOperation operation = new SarOperation(gasCalculator);
-
-  private static final String[][] testData = {
-    {
-      "0x0000000000000000000000000000000000000000000000000000000000000001",
-      "0x00",
-      "0x0000000000000000000000000000000000000000000000000000000000000001"
-    },
-    {
-      "0x0000000000000000000000000000000000000000000000000000000000000001",
-      "0x01",
-      "0x0000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "0x0000000000000000000000000000000000000000000000000000000000000002",
-      "0x01",
-      "0x0000000000000000000000000000000000000000000000000000000000000001"
-    },
-    {
-      "0x0000000000000000000000000000000000000000000000000000000000000004",
-      "0x01",
-      "0x0000000000000000000000000000000000000000000000000000000000000002"
-    },
-    {
-      "0x000000000000000000000000000000000000000000000000000000000000000f",
-      "0x01",
-      "0x0000000000000000000000000000000000000000000000000000000000000007"
-    },
-    {
-      "0x0000000000000000000000000000000000000000000000000000000000000008",
-      "0x01",
-      "0x0000000000000000000000000000000000000000000000000000000000000004"
-    },
-    {
-      "0x8000000000000000000000000000000000000000000000000000000000000000",
-      "0x01",
-      "0xc000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "0x8000000000000000000000000000000000000000000000000000000000000000",
-      "0xff",
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-    },
-    {
-      "0x8000000000000000000000000000000000000000000000000000000000000000",
-      "0x100",
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-    },
-    {
-      "0x8000000000000000000000000000000000000000000000000000000000000000",
-      "0x101",
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-    },
-    {
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-      "0x0",
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-    },
-    {
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-      "0x01",
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-    },
-    {
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-      "0xff",
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-    },
-    {
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-      "0x100",
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-    },
-    {
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x01",
-      "0x0000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "0x4000000000000000000000000000000000000000000000000000000000000000",
-      "0xfe",
-      "0x0000000000000000000000000000000000000000000000000000000000000001"
-    },
-    {
-      "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-      "0xf8",
-      "0x000000000000000000000000000000000000000000000000000000000000007f"
-    },
-    {
-      "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-      "0xfe",
-      "0x0000000000000000000000000000000000000000000000000000000000000001"
-    },
-    {
-      "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-      "0xff",
-      "0x0000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-      "0x100",
-      "0x0000000000000000000000000000000000000000000000000000000000000000"
-    },
-  };
-
-  @Parameterized.Parameters(name = "{index}: {0}, {1}, {2}")
-  public static Iterable<Object[]> data() {
-    return Arrays.asList((Object[][]) testData);
-  }
-
-  public SarOperationTest(final String number, final String shift, final String expectedResult) {
-    this.number = number;
-    this.shift = shift;
-    this.expectedResult = expectedResult;
-  }
-
-  @Test
-  public void shiftOperation() {
-    final MessageFrame frame = mock(MessageFrame.class);
-    when(frame.stackSize()).thenReturn(2);
-    when(frame.getRemainingGas()).thenReturn(Gas.of(100));
-    when(frame.popStackItem())
-        .thenReturn(Bytes32.fromHexStringLenient(shift))
-        .thenReturn(Bytes32.fromHexString(number));
-    operation.execute(frame, null);
-    verify(frame).pushStackItem(Bytes32.fromHexString(expectedResult));
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ShlOperationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ShlOperationTest.java
deleted file mode 100644
index 86a597dcf37..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ShlOperationTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.mainnet.SpuriousDragonGasCalculator;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Arrays;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-public class ShlOperationTest {
-
-  private final String number;
-  private final String shift;
-  private final String expectedResult;
-
-  private final GasCalculator gasCalculator = new SpuriousDragonGasCalculator();
-  private final ShlOperation operation = new ShlOperation(gasCalculator);
-
-  private static final String[][] testData = {
-    {
-      "0x0000000000000000000000000000000000000000000000000000000000000001",
-      "0x00",
-      "0x0000000000000000000000000000000000000000000000000000000000000001"
-    },
-    {
-      "0x0000000000000000000000000000000000000000000000000000000000000001",
-      "0x01",
-      "0x0000000000000000000000000000000000000000000000000000000000000002"
-    },
-    {
-      "0x0000000000000000000000000000000000000000000000000000000000000002",
-      "0x01",
-      "0x0000000000000000000000000000000000000000000000000000000000000004"
-    },
-    {
-      "0x0000000000000000000000000000000000000000000000000000000000000004",
-      "0x01",
-      "0x0000000000000000000000000000000000000000000000000000000000000008"
-    },
-    {
-      "0x000000000000000000000000000000000000000000000000000000000000000f",
-      "0x01",
-      "0x000000000000000000000000000000000000000000000000000000000000001e"
-    },
-    {
-      "0x0000000000000000000000000000000000000000000000000000000000000008",
-      "0x01",
-      "0x0000000000000000000000000000000000000000000000000000000000000010"
-    },
-    {
-      "0x0000000000000000000000000000000000000000000000000000000000000001",
-      "0x100",
-      "0x0000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-      "0x01",
-      "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
-    },
-    {
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x01",
-      "0x0000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-      "0x01",
-      "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
-    }
-  };
-
-  @Parameterized.Parameters(name = "{index}: {0}, {1}, {2}")
-  public static Iterable<Object[]> data() {
-    return Arrays.asList((Object[][]) testData);
-  }
-
-  public ShlOperationTest(final String number, final String shift, final String expectedResult) {
-    this.number = number;
-    this.shift = shift;
-    this.expectedResult = expectedResult;
-  }
-
-  @Test
-  public void shiftOperation() {
-    final MessageFrame frame = mock(MessageFrame.class);
-    when(frame.stackSize()).thenReturn(2);
-    when(frame.getRemainingGas()).thenReturn(Gas.of(100));
-    when(frame.popStackItem())
-        .thenReturn(Bytes32.fromHexStringLenient(shift))
-        .thenReturn(Bytes32.fromHexString(number));
-    operation.execute(frame, null);
-    verify(frame).pushStackItem(Bytes32.fromHexString(expectedResult));
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ShrOperationTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ShrOperationTest.java
deleted file mode 100644
index 10adea61aab..00000000000
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/operations/ShrOperationTest.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.vm.operations;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.mainnet.SpuriousDragonGasCalculator;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-
-import java.util.Arrays;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-public class ShrOperationTest {
-  private final String number;
-  private final String shift;
-  private final String expectedResult;
-
-  private final GasCalculator gasCalculator = new SpuriousDragonGasCalculator();
-  private final ShrOperation operation = new ShrOperation(gasCalculator);
-
-  private static final String[][] testData = {
-    {
-      "0x0000000000000000000000000000000000000000000000000000000000000001",
-      "0x00",
-      "0x0000000000000000000000000000000000000000000000000000000000000001"
-    },
-    {
-      "0x0000000000000000000000000000000000000000000000000000000000000001",
-      "0x01",
-      "0x0000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "0x0000000000000000000000000000000000000000000000000000000000000002",
-      "0x01",
-      "0x0000000000000000000000000000000000000000000000000000000000000001"
-    },
-    {
-      "0x0000000000000000000000000000000000000000000000000000000000000004",
-      "0x01",
-      "0x0000000000000000000000000000000000000000000000000000000000000002"
-    },
-    {
-      "0x000000000000000000000000000000000000000000000000000000000000000f",
-      "0x01",
-      "0x0000000000000000000000000000000000000000000000000000000000000007"
-    },
-    {
-      "0x0000000000000000000000000000000000000000000000000000000000000008",
-      "0x01",
-      "0x0000000000000000000000000000000000000000000000000000000000000004"
-    },
-    {
-      "0x8000000000000000000000000000000000000000000000000000000000000000",
-      "0xff",
-      "0x0000000000000000000000000000000000000000000000000000000000000001"
-    },
-    {
-      "0x8000000000000000000000000000000000000000000000000000000000000000",
-      "0x100",
-      "0x0000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "0x8000000000000000000000000000000000000000000000000000000000000000",
-      "0x101",
-      "0x0000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-      "0x0",
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-    },
-    {
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-      "0x01",
-      "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-    },
-    {
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-      "0xff",
-      "0x0000000000000000000000000000000000000000000000000000000000000001"
-    },
-    {
-      "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-      "0x100",
-      "0x0000000000000000000000000000000000000000000000000000000000000000"
-    },
-    {
-      "0x0000000000000000000000000000000000000000000000000000000000000000",
-      "0x01",
-      "0x0000000000000000000000000000000000000000000000000000000000000000"
-    },
-  };
-
-  @Parameterized.Parameters(name = "{index}: {0}, {1}, {2}")
-  public static Iterable<Object[]> data() {
-    return Arrays.asList((Object[][]) testData);
-  }
-
-  public ShrOperationTest(final String number, final String shift, final String expectedResult) {
-    this.number = number;
-    this.shift = shift;
-    this.expectedResult = expectedResult;
-  }
-
-  @Test
-  public void shiftOperation() {
-    final MessageFrame frame = mock(MessageFrame.class);
-    when(frame.stackSize()).thenReturn(2);
-    when(frame.getRemainingGas()).thenReturn(Gas.of(100));
-    when(frame.popStackItem())
-        .thenReturn(Bytes32.fromHexStringLenient(shift))
-        .thenReturn(Bytes32.fromHexString(number));
-    operation.execute(frame, null);
-    verify(frame).pushStackItem(Bytes32.fromHexString(expectedResult));
-  }
-}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/DefaultMutableWorldStateTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/DefaultMutableWorldStateTest.java
index 032d6097a49..d69beaa7951 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/DefaultMutableWorldStateTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/DefaultMutableWorldStateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -15,21 +15,20 @@
 package org.hyperledger.besu.ethereum.worldstate;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldState;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldState;
 
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.AccountStorageEntry;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldState;
-import org.hyperledger.besu.ethereum.core.WorldState.StreamableAccount;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
 import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage;
 import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage;
-import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.evm.account.AccountStorageEntry;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.worldstate.WorldState;
+import org.hyperledger.besu.evm.worldstate.WorldState.StreamableAccount;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
 import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
 
@@ -67,10 +66,10 @@ private static MutableWorldState createEmpty() {
   @Test
   public void rootHash_Empty() {
     final MutableWorldState worldState = createEmpty();
-    assertThat(worldState.rootHash()).isEqualTo(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH);
+    assertThat(worldState.rootHash()).isEqualTo(MerkleTrie.EMPTY_TRIE_NODE_HASH);
 
     worldState.persist(null);
-    assertThat(worldState.rootHash()).isEqualTo(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH);
+    assertThat(worldState.rootHash()).isEqualTo(MerkleTrie.EMPTY_TRIE_NODE_HASH);
   }
 
   @Test
@@ -98,10 +97,10 @@ public void removeAccount_AccountDoesNotExist() {
     final WorldUpdater updater = worldState.updater();
     updater.deleteAccount(ADDRESS);
     updater.commit();
-    assertThat(worldState.rootHash()).isEqualTo(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH);
+    assertThat(worldState.rootHash()).isEqualTo(MerkleTrie.EMPTY_TRIE_NODE_HASH);
 
     worldState.persist(null);
-    assertThat(worldState.rootHash()).isEqualTo(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH);
+    assertThat(worldState.rootHash()).isEqualTo(MerkleTrie.EMPTY_TRIE_NODE_HASH);
   }
 
   @Test
@@ -111,10 +110,10 @@ public void removeAccount_UpdatedAccount() {
     updater.createAccount(ADDRESS).getMutable().setBalance(Wei.of(100000));
     updater.deleteAccount(ADDRESS);
     updater.commit();
-    assertThat(worldState.rootHash()).isEqualTo(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH);
+    assertThat(worldState.rootHash()).isEqualTo(MerkleTrie.EMPTY_TRIE_NODE_HASH);
 
     worldState.persist(null);
-    assertThat(worldState.rootHash()).isEqualTo(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH);
+    assertThat(worldState.rootHash()).isEqualTo(MerkleTrie.EMPTY_TRIE_NODE_HASH);
   }
 
   @Test
@@ -125,7 +124,7 @@ public void removeAccount_AccountExists() {
     updater.createAccount(ADDRESS).getMutable().setBalance(Wei.of(100000));
     updater.commit();
     assertThat(worldState.get(ADDRESS)).isNotNull();
-    assertThat(worldState.rootHash()).isNotEqualTo(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH);
+    assertThat(worldState.rootHash()).isNotEqualTo(MerkleTrie.EMPTY_TRIE_NODE_HASH);
 
     // Delete account
     updater = worldState.updater();
@@ -135,7 +134,7 @@ public void removeAccount_AccountExists() {
     updater.commit();
     assertThat(updater.get(ADDRESS)).isNull();
 
-    assertThat(worldState.rootHash()).isEqualTo(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH);
+    assertThat(worldState.rootHash()).isEqualTo(MerkleTrie.EMPTY_TRIE_NODE_HASH);
   }
 
   @Test
@@ -147,7 +146,7 @@ public void removeAccount_AccountExistsAndIsPersisted() {
     updater.commit();
     worldState.persist(null);
     assertThat(worldState.get(ADDRESS)).isNotNull();
-    assertThat(worldState.rootHash()).isNotEqualTo(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH);
+    assertThat(worldState.rootHash()).isNotEqualTo(MerkleTrie.EMPTY_TRIE_NODE_HASH);
 
     // Delete account
     updater = worldState.updater();
@@ -161,7 +160,7 @@ public void removeAccount_AccountExistsAndIsPersisted() {
     worldState.persist(null);
     assertThat(updater.get(ADDRESS)).isNull();
 
-    assertThat(worldState.rootHash()).isEqualTo(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH);
+    assertThat(worldState.rootHash()).isEqualTo(MerkleTrie.EMPTY_TRIE_NODE_HASH);
   }
 
   @Test
@@ -234,7 +233,7 @@ public void streamAccounts_multipleAccounts() {
         .hasValue(accountAIsFirst ? accountB.getAddress() : accountA.getAddress());
 
     // Get second account
-    final Bytes32 startHashForSecondAccount = UInt256.fromBytes(startHash).add(1L).toBytes();
+    final Bytes32 startHashForSecondAccount = UInt256.fromBytes(startHash).add(1L);
     final List<StreamableAccount> secondAccount =
         worldState.streamAccounts(startHashForSecondAccount, 100).collect(Collectors.toList());
     assertThat(secondAccount.size()).isEqualTo(1L);
@@ -264,12 +263,12 @@ public void commitAndPersist() {
     assertThat(worldState.get(ADDRESS).getBalance()).isEqualTo(newBalance);
 
     // Check that storage is empty before persisting
-    assertThat(kvWorldStateStorage.isWorldStateAvailable(worldState.rootHash())).isFalse();
+    assertThat(kvWorldStateStorage.isWorldStateAvailable(worldState.rootHash(), null)).isFalse();
 
     // Persist and re-run assertions
     worldState.persist(null);
 
-    assertThat(kvWorldStateStorage.isWorldStateAvailable(worldState.rootHash())).isTrue();
+    assertThat(kvWorldStateStorage.isWorldStateAvailable(worldState.rootHash(), null)).isTrue();
     assertThat(worldState.rootHash()).isEqualTo(expectedRootHash);
     assertThat(worldState.get(ADDRESS)).isNotNull();
     assertThat(worldState.get(ADDRESS).getBalance()).isEqualTo(newBalance);
@@ -476,7 +475,7 @@ public void clearStorage_AfterPersisting() {
     updater.commit();
     worldState.persist(null);
     assertThat(worldState.get(ADDRESS)).isNotNull();
-    assertThat(worldState.rootHash()).isNotEqualTo(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH);
+    assertThat(worldState.rootHash()).isNotEqualTo(MerkleTrie.EMPTY_TRIE_NODE_HASH);
 
     // Clear storage
     account = updater.getAccount(ADDRESS).getMutable();
@@ -579,11 +578,9 @@ public void replaceAccountCode() {
     final MutableAccount account = updater.createAccount(ADDRESS).getMutable();
     account.setBalance(Wei.of(100000));
     account.setCode(Bytes.of(1, 2, 3));
-    account.setVersion(Account.DEFAULT_VERSION);
     account.setCode(Bytes.of(3, 2, 1));
     updater.commit();
     assertThat(worldState.get(ADDRESS).getCode()).isEqualTo(Bytes.of(3, 2, 1));
-    assertThat(worldState.get(ADDRESS).getVersion()).isEqualTo(Account.DEFAULT_VERSION);
     assertThat(worldState.rootHash())
         .isEqualTo(
             Hash.fromHexString(
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/MarkSweepPrunerTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/MarkSweepPrunerTest.java
index e975734b8c7..107a74be968 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/MarkSweepPrunerTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/MarkSweepPrunerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -15,25 +15,25 @@
 package org.hyperledger.besu.ethereum.worldstate;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.spy;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
-import org.hyperledger.besu.ethereum.core.WorldState;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage;
 import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage;
-import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie;
-import org.hyperledger.besu.ethereum.trie.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.evm.worldstate.WorldState;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
 
@@ -42,6 +42,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -49,13 +50,16 @@
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.InOrder;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class MarkSweepPrunerTest {
 
   private final BlockDataGenerator gen = new BlockDataGenerator();
   private final NoOpMetricsSystem metricsSystem = new NoOpMetricsSystem();
-  private final Map<Bytes, byte[]> hashValueStore = spy(new HashMap<>());
+  private final Map<Bytes, Optional<byte[]>> hashValueStore = spy(new HashMap<>());
   private final InMemoryKeyValueStorage stateStorage = new TestInMemoryStorage(hashValueStore);
   private final WorldStateStorage worldStateStorage =
       spy(new WorldStateKeyValueStorage(stateStorage));
@@ -87,8 +91,9 @@ public void mark_marksAllExpectedNodes() {
     pruner.sweepBefore(markBlock.getNumber());
 
     // Assert that the block we marked is still present and all accounts are accessible
-    assertThat(worldStateArchive.get(markBlock.getStateRoot())).isPresent();
-    final WorldState markedState = worldStateArchive.get(markBlock.getStateRoot()).get();
+    assertThat(worldStateArchive.get(markBlock.getStateRoot(), markBlock.getHash())).isPresent();
+    final WorldState markedState =
+        worldStateArchive.get(markBlock.getStateRoot(), markBlock.getHash()).get();
     // Traverse accounts and make sure all are accessible
     final int expectedAccounts = numAccounts * markBlockNumber;
     final long accounts = markedState.streamAccounts(Bytes32.ZERO, expectedAccounts * 2).count();
@@ -104,12 +109,12 @@ public void mark_marksAllExpectedNodes() {
       if (curHeader.getNumber() == markBlock.getNumber()) {
         continue;
       }
-      assertThat(worldStateArchive.get(curHeader.getStateRoot())).isEmpty();
+      assertThat(worldStateArchive.get(curHeader.getStateRoot(), curHeader.getHash())).isEmpty();
     }
 
     // Check that storage contains only the values we expect
     assertThat(hashValueStore.size()).isEqualTo(expectedNodes.size());
-    assertThat(hashValueStore.values())
+    assertThat(hashValueStore.values().stream().map(Optional::get))
         .containsExactlyInAnyOrderElementsOf(
             expectedNodes.stream().map(Bytes::toArrayUnsafe).collect(Collectors.toSet()));
   }
@@ -189,8 +194,9 @@ public void sweepBefore_shouldNotRemoveMarkedStateRoots() {
   private void generateBlockchainData(final int numBlocks, final int numAccounts) {
     Block parentBlock = blockchain.getChainHeadBlock();
     for (int i = 0; i < numBlocks; i++) {
+      final BlockHeader parentHeader = parentBlock.getHeader();
       final MutableWorldState worldState =
-          worldStateArchive.getMutable(parentBlock.getHeader().getStateRoot()).get();
+          worldStateArchive.getMutable(parentHeader.getStateRoot(), parentHeader.getHash()).get();
       gen.createRandomContractAccountsWithNonEmptyStorage(worldState, numAccounts);
       final Hash stateRoot = worldState.rootHash();
 
@@ -198,7 +204,7 @@ private void generateBlockchainData(final int numBlocks, final int numAccounts)
           gen.block(
               BlockOptions.create()
                   .setStateRoot(stateRoot)
-                  .setBlockNumber(parentBlock.getHeader().getNumber() + 1L)
+                  .setBlockNumber(parentHeader.getNumber() + 1L)
                   .setParentHash(parentBlock.getHash()));
       final List<TransactionReceipt> receipts = gen.receipts(block);
       blockchain.appendBlock(block, receipts);
@@ -214,7 +220,7 @@ private Set<Bytes> collectWorldStateNodes(final Hash stateRootHash) {
 
   private Set<Bytes> collectWorldStateNodes(final Hash stateRootHash, final Set<Bytes> collector) {
     final List<Hash> storageRoots = new ArrayList<>();
-    final MerklePatriciaTrie<Bytes32, Bytes> stateTrie = createStateTrie(stateRootHash);
+    final MerkleTrie<Bytes32, Bytes> stateTrie = createStateTrie(stateRootHash);
 
     // Collect storage roots and code
     stateTrie
@@ -233,25 +239,24 @@ private Set<Bytes> collectWorldStateNodes(final Hash stateRootHash, final Set<By
     collectTrieNodes(stateTrie, collector);
     // Collect storage nodes
     for (Hash storageRoot : storageRoots) {
-      final MerklePatriciaTrie<Bytes32, Bytes> storageTrie = createStorageTrie(storageRoot);
+      final MerkleTrie<Bytes32, Bytes> storageTrie = createStorageTrie(storageRoot);
       collectTrieNodes(storageTrie, collector);
     }
 
     return collector;
   }
 
-  private void collectTrieNodes(
-      final MerklePatriciaTrie<Bytes32, Bytes> trie, final Set<Bytes> collector) {
+  private void collectTrieNodes(final MerkleTrie<Bytes32, Bytes> trie, final Set<Bytes> collector) {
     final Bytes32 rootHash = trie.getRootHash();
     trie.visitAll(
         (node) -> {
           if (node.isReferencedByHash() || node.getHash().equals(rootHash)) {
-            collector.add(node.getRlp());
+            collector.add(node.getEncodedBytes());
           }
         });
   }
 
-  private MerklePatriciaTrie<Bytes32, Bytes> createStateTrie(final Bytes32 rootHash) {
+  private MerkleTrie<Bytes32, Bytes> createStateTrie(final Bytes32 rootHash) {
     return new StoredMerklePatriciaTrie<>(
         worldStateStorage::getAccountStateTrieNode,
         rootHash,
@@ -259,9 +264,9 @@ private MerklePatriciaTrie<Bytes32, Bytes> createStateTrie(final Bytes32 rootHas
         Function.identity());
   }
 
-  private MerklePatriciaTrie<Bytes32, Bytes> createStorageTrie(final Bytes32 rootHash) {
+  private MerkleTrie<Bytes32, Bytes> createStorageTrie(final Bytes32 rootHash) {
     return new StoredMerklePatriciaTrie<>(
-        worldStateStorage::getAccountStorageTrieNode,
+        (location, hash) -> worldStateStorage.getAccountStorageTrieNode(null, location, hash),
         rootHash,
         Function.identity(),
         Function.identity());
@@ -270,7 +275,7 @@ private MerklePatriciaTrie<Bytes32, Bytes> createStorageTrie(final Bytes32 rootH
   // Proxy class so that we have access to the constructor that takes our own map
   private static class TestInMemoryStorage extends InMemoryKeyValueStorage {
 
-    public TestInMemoryStorage(final Map<Bytes, byte[]> hashValueStore) {
+    public TestInMemoryStorage(final Map<Bytes, Optional<byte[]>> hashValueStore) {
       super(hashValueStore);
     }
   }
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/PrunerTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/PrunerTest.java
index ae31a5e57ea..fa90bf6a8e2 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/PrunerTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/PrunerTest.java
@@ -20,6 +20,7 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.chain.BlockchainStorage;
 import org.hyperledger.besu.ethereum.chain.DefaultBlockchain;
@@ -27,10 +28,10 @@
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage;
+import org.hyperledger.besu.ethereum.storage.keyvalue.VariablesKeyValueStorage;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
 import org.hyperledger.besu.testutil.MockExecutorService;
@@ -60,7 +61,9 @@ public class PrunerTest {
   public void shouldMarkCorrectBlockAndSweep() throws ExecutionException, InterruptedException {
     final BlockchainStorage blockchainStorage =
         new KeyValueStoragePrefixedKeyBlockchainStorage(
-            new InMemoryKeyValueStorage(), new MainnetBlockHeaderFunctions());
+            new InMemoryKeyValueStorage(),
+            new VariablesKeyValueStorage(new InMemoryKeyValueStorage()),
+            new MainnetBlockHeaderFunctions());
     final MutableBlockchain blockchain =
         DefaultBlockchain.createMutable(genesisBlock, blockchainStorage, metricsSystem, 0);
 
@@ -81,7 +84,9 @@ public void shouldMarkCorrectBlockAndSweep() throws ExecutionException, Interrup
   public void shouldOnlySweepAfterBlockConfirmationPeriodAndRetentionPeriodEnds() {
     final BlockchainStorage blockchainStorage =
         new KeyValueStoragePrefixedKeyBlockchainStorage(
-            new InMemoryKeyValueStorage(), new MainnetBlockHeaderFunctions());
+            new InMemoryKeyValueStorage(),
+            new VariablesKeyValueStorage(new InMemoryKeyValueStorage()),
+            new MainnetBlockHeaderFunctions());
     final MutableBlockchain blockchain =
         DefaultBlockchain.createMutable(genesisBlock, blockchainStorage, metricsSystem, 0);
 
@@ -107,7 +112,9 @@ public void shouldOnlySweepAfterBlockConfirmationPeriodAndRetentionPeriodEnds()
   public void abortsPruningWhenFullyMarkedBlockNoLongerOnCanonicalChain() {
     final BlockchainStorage blockchainStorage =
         new KeyValueStoragePrefixedKeyBlockchainStorage(
-            new InMemoryKeyValueStorage(), new MainnetBlockHeaderFunctions());
+            new InMemoryKeyValueStorage(),
+            new VariablesKeyValueStorage(new InMemoryKeyValueStorage()),
+            new MainnetBlockHeaderFunctions());
     final MutableBlockchain blockchain =
         DefaultBlockchain.createMutable(genesisBlock, blockchainStorage, metricsSystem, 0);
 
@@ -177,7 +184,9 @@ public void shouldRejectInvalidArguments() {
   public void shouldCleanUpPruningStrategyOnShutdown() throws InterruptedException {
     final BlockchainStorage blockchainStorage =
         new KeyValueStoragePrefixedKeyBlockchainStorage(
-            new InMemoryKeyValueStorage(), new MainnetBlockHeaderFunctions());
+            new InMemoryKeyValueStorage(),
+            new VariablesKeyValueStorage(new InMemoryKeyValueStorage()),
+            new MainnetBlockHeaderFunctions());
     final MutableBlockchain blockchain =
         DefaultBlockchain.createMutable(genesisBlock, blockchainStorage, metricsSystem, 0);
 
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/StateTrieAccountValueTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/StateTrieAccountValueTest.java
index de31ee1d36d..4ffc499f0d3 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/StateTrieAccountValueTest.java
+++ b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/worldstate/StateTrieAccountValueTest.java
@@ -16,8 +16,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 
@@ -27,50 +27,22 @@
 public class StateTrieAccountValueTest {
 
   @Test
-  public void roundTripMainNetAccountValueVersionZero() {
+  public void roundTripMainNetAccountValue() {
     final long nonce = 0;
     final Wei balance = Wei.ZERO;
     // Have the storageRoot and codeHash as different values to ensure the encode / decode
     // doesn't cross the values over.
     final Hash storageRoot = Hash.EMPTY_TRIE_HASH;
     final Hash codeHash = Hash.EMPTY_LIST_HASH;
-    final int version = 0;
 
-    roundTripMainNetAccountValue(nonce, balance, storageRoot, codeHash, version);
-  }
-
-  @Test
-  public void roundTripMainNetAccountValueVersionNotZero() {
-    final long nonce = 0;
-    final Wei balance = Wei.ZERO;
-    final Hash storageRoot = Hash.EMPTY_TRIE_HASH;
-    final Hash codeHash = Hash.EMPTY_LIST_HASH;
-    final int version = 1;
-
-    roundTripMainNetAccountValue(nonce, balance, storageRoot, codeHash, version);
-  }
-
-  @Test
-  public void roundTripMainNetAccountValueMax() {
-    final long nonce = (Long.MAX_VALUE >> 1);
-    final Wei balance =
-        Wei.fromHexString("0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF");
-    final Hash storageRoot = Hash.EMPTY_TRIE_HASH;
-    final Hash codeHash = Hash.EMPTY_LIST_HASH;
-    final int version = Integer.MAX_VALUE;
-
-    roundTripMainNetAccountValue(nonce, balance, storageRoot, codeHash, version);
+    roundTripMainNetAccountValue(nonce, balance, storageRoot, codeHash);
   }
 
   private void roundTripMainNetAccountValue(
-      final long nonce,
-      final Wei balance,
-      final Hash storageRoot,
-      final Hash codeHash,
-      final int version) {
+      final long nonce, final Wei balance, final Hash storageRoot, final Hash codeHash) {
 
     StateTrieAccountValue accountValue =
-        new StateTrieAccountValue(nonce, balance, storageRoot, codeHash, version);
+        new StateTrieAccountValue(nonce, balance, storageRoot, codeHash);
     Bytes encoded = RLP.encode(accountValue::writeTo);
     final RLPInput in = RLP.input(encoded);
     StateTrieAccountValue roundTripAccountValue = StateTrieAccountValue.readFrom(in);
@@ -79,6 +51,5 @@ private void roundTripMainNetAccountValue(
     assertThat(balance).isEqualTo(roundTripAccountValue.getBalance());
     assertThat(storageRoot).isEqualTo(roundTripAccountValue.getStorageRoot());
     assertThat(codeHash).isEqualTo(roundTripAccountValue.getCodeHash());
-    assertThat(version).isEqualTo(roundTripAccountValue.getVersion());
   }
 }
diff --git a/ethereum/core/src/test/resources/log4j2.xml b/ethereum/core/src/test/resources/log4j2.xml
deleted file mode 100644
index 3465f7ef823..00000000000
--- a/ethereum/core/src/test/resources/log4j2.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN" monitorInterval="30">
-    <Properties>
-        <Property name="root.log.level">INFO</Property>
-    </Properties>
-    <Appenders>
-        <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSSZZZ} | %t | %-5level | %c{1} | %msg%n" />
-        </Console>
-    </Appenders>
-    <Loggers>
-        <Root level="${sys:root.log.level}">
-            <AppenderRef ref="Console" />
-        </Root>
-    </Loggers>
-</Configuration>
diff --git a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis1.json b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis1.json
index 4e2e5739b2c..5005c8d6c2e 100644
--- a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis1.json
+++ b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis1.json
@@ -1,8 +1,6 @@
 {
   "config": {
     "chainId": 15,
-    "homesteadBlock": 0,
-    "eip155Block": 0,
     "eip158Block": 0
   },
   "alloc": {
diff --git a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis2.json b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis2.json
index f9775cc0c8b..b7ed04352c3 100644
--- a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis2.json
+++ b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis2.json
@@ -1,8 +1,6 @@
 {
   "config": {
     "chainId": 15,
-    "homesteadBlock": 0,
-    "eip155Block": 0,
     "eip158Block": 0
   },
   "coinbase": "0x0000000000000000000000000000000000000000",
diff --git a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis3.json b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis3.json
index 05d71204c80..2168a9db942 100644
--- a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis3.json
+++ b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis3.json
@@ -3,8 +3,6 @@
     "chainId": 385,
     "homesteadBlock": 1,
     "eip150Block": 2,
-    "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-    "eip155Block": 3,
     "eip158Block": 3,
     "byzantiumBlock": 4,
     "clique": {
diff --git a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis4.json b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis4.json
index 084b95d1696..3713fb40e69 100644
--- a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis4.json
+++ b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/chain/genesis4.json
@@ -3,8 +3,6 @@
     "chainId": 385,
     "homesteadBlock": 1,
     "eip150Block": 2,
-    "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-    "eip155Block": 3,
     "eip158Block": 3,
     "byzantiumBlock": 4,
     "clique": {
diff --git a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/core/fees/basefee-test.json b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/core/feemarket/basefee-test.json
similarity index 100%
rename from ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/core/fees/basefee-test.json
rename to ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/core/feemarket/basefee-test.json
diff --git a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_123.blocks b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_123.blocks
new file mode 100644
index 00000000000..a6ab1417874
Binary files /dev/null and b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_123.blocks differ
diff --git a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_124.blocks b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_124.blocks
new file mode 100644
index 00000000000..b8d909bde95
Binary files /dev/null and b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_124.blocks differ
diff --git a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_12691.blocks b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_12691.blocks
new file mode 100644
index 00000000000..c9ea4b42166
Binary files /dev/null and b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_12691.blocks differ
diff --git a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_4156.blocks b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_4156.blocks
new file mode 100644
index 00000000000..cededa7da1c
Binary files /dev/null and b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/block_4156.blocks differ
diff --git a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/manyJumps.hex b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/manyJumps.hex
new file mode 100644
index 00000000000..89b26c5d0e6
--- /dev/null
+++ b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/manyJumps.hex
@@ -0,0 +1 @@
+0x6003565b0063606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f806003565b00606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f80
\ No newline at end of file
diff --git a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTest.java.template b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTest.java.template
deleted file mode 100644
index 3ea73375748..00000000000
--- a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTest.java.template
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.hyperledger.besu.ethereum.vm.blockchain;
-
-import static org.hyperledger.besu.ethereum.vm.BlockchainReferenceTestTools.executeTest;
-import static org.hyperledger.besu.ethereum.vm.BlockchainReferenceTestTools.generateTestParametersForConfig;
-
-import org.hyperledger.besu.ethereum.referencetests.BlockchainReferenceTestCaseSpec;
-
-import java.util.Collection;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import static org.junit.Assume.assumeTrue;
-
-/** The blockchain test operation testing framework entry point. */
-@RunWith(Parameterized.class)
-public class %%TESTS_NAME%% {
-
-  private static final String[] TEST_CONFIG_FILE_DIR_PATH = new String[] {%%TESTS_FILE%%};
-
-  @Parameters(name = "Name: {0}")
-  public static Collection<Object[]> getTestParametersForConfig() {
-    return generateTestParametersForConfig(TEST_CONFIG_FILE_DIR_PATH);
-  }
-
-  private final BlockchainReferenceTestCaseSpec spec;
-
-  public %%TESTS_NAME%%(
-      final String name,
-      final BlockchainReferenceTestCaseSpec spec,
-      final boolean runTest) {
-    this.spec = spec;
-    assumeTrue("Test " + name + " was ignored", runTest);
-  }
-
-  @Test
-  public void execution() {
-    executeTest(spec);
-  }
-}
diff --git a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTest.java.template b/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTest.java.template
deleted file mode 100644
index 14017832077..00000000000
--- a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTest.java.template
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.hyperledger.besu.ethereum.vm.generalstate;
-
-import static org.hyperledger.besu.ethereum.vm.GeneralStateReferenceTestTools.executeTest;
-import static org.hyperledger.besu.ethereum.vm.GeneralStateReferenceTestTools.generateTestParametersForConfig;
-
-import org.hyperledger.besu.ethereum.referencetests.GeneralStateTestCaseEipSpec;
-
-import java.util.Collection;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import static org.junit.Assume.assumeTrue;
-
-/** The general state test operation testing framework entry point. */
-@RunWith(Parameterized.class)
-public class %%TESTS_NAME%% {
-
-  private static final String[] TEST_CONFIG_FILE_DIR_PATH = new String[] {%%TESTS_FILE%%};
-
-  @Parameters(name = "Name: {0}")
-  public static Collection<Object[]> getTestParametersForConfig() {
-    return generateTestParametersForConfig(TEST_CONFIG_FILE_DIR_PATH);
-  }
-
-  private final GeneralStateTestCaseEipSpec spec;
-
-  public %%TESTS_NAME%%(
-      final String name,
-      final GeneralStateTestCaseEipSpec spec,
-      final boolean runTest) {
-    this.spec = spec;
-    assumeTrue("Test " + name + " was ignored", runTest);
-  }
-
-  @Test
-  public void execution() {
-    executeTest(spec);
-  }
-}
diff --git a/ethereum/eth/build.gradle b/ethereum/eth/build.gradle
index a8db24751be..0f68fc521d3 100644
--- a/ethereum/eth/build.gradle
+++ b/ethereum/eth/build.gradle
@@ -27,31 +27,45 @@ jar {
   }
 }
 
+configurations { testArtifacts }
+task testJar(type: Jar) {
+  archiveBaseName = "${project.name}-test"
+  from sourceSets.test.output
+}
+
 dependencies {
+  api 'org.slf4j:slf4j-api'
+  api project(':util')
+
   annotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess'
   implementation project(':config')
+  implementation project(':datatypes')
   implementation project(':ethereum:core')
   implementation project(':ethereum:p2p')
   implementation project(':ethereum:permissioning')
   implementation project(':ethereum:rlp')
   implementation project(':ethereum:trie')
+  implementation project(':evm')
   implementation project(':metrics:core')
   implementation project(':services:kvstore')
   implementation project(':services:pipeline')
   implementation project(':services:tasks')
+  implementation project(':util')
 
   implementation 'com.google.guava:guava'
   implementation 'io.vertx:vertx-core'
-  implementation 'org.apache.tuweni:bytes'
-  implementation 'org.apache.tuweni:units'
+  implementation 'org.apache.commons:commons-lang3'
+  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-units'
+  implementation 'org.apache.tuweni:tuweni-rlp'
 
   annotationProcessor "org.immutables:value"
   implementation "org.immutables:value-annotations"
 
   testImplementation project(':config')
   testImplementation project(path: ':config', configuration: 'testSupportArtifacts')
-  testImplementation project(':crypto')
-  testImplementation project(path: ':crypto', configuration: 'testSupportArtifacts')
+  testImplementation project(':crypto:services')
+  testImplementation project(path: ':crypto:services', configuration: 'testSupportArtifacts')
   testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts')
   testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
   testImplementation project(':ethereum:mock-p2p')
@@ -59,14 +73,29 @@ dependencies {
   testImplementation project(path: ':metrics:core', configuration: 'testSupportArtifacts')
   testImplementation project(':testutil')
 
+  testImplementation 'com.fasterxml.jackson.core:jackson-databind'
   testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.awaitility:awaitility'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.mockito:mockito-core'
+  testImplementation 'org.mockito:mockito-junit-jupiter'
+  testImplementation 'org.openjdk.jol:jol-core'
+
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
+
+  testSupportImplementation 'junit:junit'
+  testSupportImplementation 'org.mockito:mockito-core'
+  testSupportImplementation project(':testutil')
+  testSupportImplementation project(path: ':ethereum:core', configuration: 'testArtifacts')
+  testSupportImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
 
   jmhImplementation project(':besu')
   jmhImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
   jmhImplementation project(':plugins:rocksdb')
+}
 
-  integrationTestImplementation project(path: ':config', configuration: 'testSupportArtifacts')
+artifacts {
+  testArtifacts testJar
+  testSupportArtifacts testSupportJar
 }
diff --git a/ethereum/eth/src/jmh/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloaderBenchmark.java b/ethereum/eth/src/jmh/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloaderBenchmark.java
index fcd63a210e2..5f7cbcdc8df 100644
--- a/ethereum/eth/src/jmh/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloaderBenchmark.java
+++ b/ethereum/eth/src/jmh/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloaderBenchmark.java
@@ -14,16 +14,16 @@
  */
 package org.hyperledger.besu.ethereum.eth.sync.worldstate;
 
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
 import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_BACKGROUND_THREAD_COUNT;
 import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_CACHE_CAPACITY;
-import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_BACKGROUND_COMPACTIONS;
+import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_IS_HIGH_SPEC;
 import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_OPEN_FILES;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
@@ -32,9 +32,13 @@
 import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer.Responder;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncState;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate.FastWorldStateDownloader;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate.NodeDataRequest;
 import org.hyperledger.besu.ethereum.storage.StorageProvider;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProviderBuilder;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
 import org.hyperledger.besu.metrics.ObservableMetricsSystem;
@@ -43,8 +47,7 @@
 import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBMetricsFactory;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration;
 import org.hyperledger.besu.services.BesuConfigurationImpl;
-import org.hyperledger.besu.services.tasks.CachingTaskCollection;
-import org.hyperledger.besu.services.tasks.FlatFileTaskCollection;
+import org.hyperledger.besu.services.tasks.InMemoryTasksPriorityQueues;
 
 import java.nio.file.Path;
 import java.time.Clock;
@@ -76,7 +79,7 @@ public class WorldStateDownloaderBenchmark {
   private WorldStateStorage worldStateStorage;
   private RespondingEthPeer peer;
   private Responder responder;
-  private CachingTaskCollection<NodeDataRequest> pendingRequests;
+  private InMemoryTasksPriorityQueues<NodeDataRequest> pendingRequests;
   private StorageProvider storageProvider;
   private EthProtocolManager ethProtocolManager;
 
@@ -102,17 +105,11 @@ public void setUpUnchangedState() {
 
     final StorageProvider storageProvider =
         createKeyValueStorageProvider(tempDir, tempDir.resolve("database"));
-    worldStateStorage = storageProvider.createWorldStateStorage();
-
-    pendingRequests =
-        new CachingTaskCollection<>(
-            new FlatFileTaskCollection<>(
-                tempDir.resolve("fastsync"),
-                NodeDataRequest::serialize,
-                NodeDataRequest::deserialize),
-            0);
+    worldStateStorage = storageProvider.createWorldStateStorage(DataStorageFormat.FOREST);
+
+    pendingRequests = new InMemoryTasksPriorityQueues<>();
     worldStateDownloader =
-        new WorldStateDownloader(
+        new FastWorldStateDownloader(
             ethContext,
             worldStateStorage,
             pendingRequests,
@@ -146,7 +143,8 @@ public void tearDown() throws Exception {
 
   @Benchmark
   public Optional<Bytes> downloadWorldState() {
-    final CompletableFuture<Void> result = worldStateDownloader.run(blockHeader);
+    final CompletableFuture<Void> result =
+        worldStateDownloader.run(null, new FastSyncState(blockHeader));
     if (result.isDone()) {
       throw new IllegalStateException("World state download was already complete");
     }
@@ -167,9 +165,9 @@ private StorageProvider createKeyValueStorageProvider(final Path dataDir, final
                 () ->
                     new RocksDBFactoryConfiguration(
                         DEFAULT_MAX_OPEN_FILES,
-                        DEFAULT_MAX_BACKGROUND_COMPACTIONS,
                         DEFAULT_BACKGROUND_THREAD_COUNT,
-                        DEFAULT_CACHE_CAPACITY),
+                        DEFAULT_CACHE_CAPACITY,
+                        DEFAULT_IS_HIGH_SPEC),
                 Arrays.asList(KeyValueSegmentIdentifier.values()),
                 RocksDBMetricsFactory.PUBLIC_ROCKS_DB_METRICS))
         .withCommonConfiguration(new BesuConfigurationImpl(dataDir, dbDir))
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/consensus/merge/ForkchoiceEvent.java b/ethereum/eth/src/main/java/org/hyperledger/besu/consensus/merge/ForkchoiceEvent.java
new file mode 100644
index 00000000000..bc38cd38808
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/consensus/merge/ForkchoiceEvent.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge;
+
+import org.hyperledger.besu.datatypes.Hash;
+
+/** The Forkchoice event. */
+public class ForkchoiceEvent {
+
+  private final Hash headBlockHash;
+  private final Hash safeBlockHash;
+  private final Hash finalizedBlockHash;
+
+  /**
+   * Instantiates a new Forkchoice event.
+   *
+   * @param headBlockHash the head block hash
+   * @param safeBlockHash the safe block hash
+   * @param finalizedBlockHash the finalized block hash
+   */
+  public ForkchoiceEvent(
+      final Hash headBlockHash, final Hash safeBlockHash, final Hash finalizedBlockHash) {
+    this.headBlockHash = headBlockHash;
+    this.finalizedBlockHash = finalizedBlockHash;
+    this.safeBlockHash = safeBlockHash;
+  }
+
+  /**
+   * Has valid finalized block hash.
+   *
+   * @return the boolean
+   */
+  public boolean hasValidFinalizedBlockHash() {
+    return !finalizedBlockHash.equals(Hash.ZERO);
+  }
+
+  /**
+   * Has valid safe block hash
+   *
+   * @return boolean
+   */
+  public boolean hasValidSafeBlockHash() {
+    return !safeBlockHash.equals(Hash.ZERO);
+  }
+
+  /**
+   * Gets head block hash.
+   *
+   * @return the head block hash
+   */
+  public Hash getHeadBlockHash() {
+    return headBlockHash;
+  }
+
+  /**
+   * Gets finalized block hash.
+   *
+   * @return the finalized block hash
+   */
+  public Hash getFinalizedBlockHash() {
+    return finalizedBlockHash;
+  }
+
+  /**
+   * Gets safe block hash.
+   *
+   * @return the safe block hash
+   */
+  public Hash getSafeBlockHash() {
+    return safeBlockHash;
+  }
+
+  @Override
+  public String toString() {
+    return "ForkchoiceEvent{"
+        + "headBlockHash="
+        + headBlockHash
+        + ", safeBlockHash="
+        + safeBlockHash
+        + ", finalizedBlockHash="
+        + finalizedBlockHash
+        + ", safeBlockHash="
+        + safeBlockHash
+        + '}';
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/consensus/merge/MergeStateHandler.java b/ethereum/eth/src/main/java/org/hyperledger/besu/consensus/merge/MergeStateHandler.java
new file mode 100644
index 00000000000..d668e13698e
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/consensus/merge/MergeStateHandler.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ *  the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.consensus.merge;
+
+import org.hyperledger.besu.ethereum.core.Difficulty;
+
+import java.util.Optional;
+
+/** The interface Merge state handler. */
+public interface MergeStateHandler {
+
+  /**
+   * Merge state changed.
+   *
+   * @param isPoS the is PoS
+   * @param priorState the prior state
+   * @param difficultyStoppedAt the difficulty stopped at
+   */
+  void mergeStateChanged(
+      final boolean isPoS,
+      final Optional<Boolean> priorState,
+      final Optional<Difficulty> difficultyStoppedAt);
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/consensus/merge/UnverifiedForkchoiceListener.java b/ethereum/eth/src/main/java/org/hyperledger/besu/consensus/merge/UnverifiedForkchoiceListener.java
new file mode 100644
index 00000000000..ccbe8949baa
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/consensus/merge/UnverifiedForkchoiceListener.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ *  the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.consensus.merge;
+
+/** The interface Unverified forkchoice listener. */
+public interface UnverifiedForkchoiceListener {
+
+  /**
+   * On new unverified forkchoice event.
+   *
+   * @param event the event
+   */
+  void onNewUnverifiedForkchoice(final ForkchoiceEvent event);
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/EthProtocol.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/EthProtocol.java
index d652a8acd8f..e633d3b99ce 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/EthProtocol.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/EthProtocol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright contributors to Hyperledger Besu
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -20,50 +20,37 @@
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.Set;
 
 /**
- * Eth protocol messages as defined in
- * https://github.com/ethereum/wiki/wiki/Ethereum-Wire-Protocol#new-model-syncing-pv62}
+ * Eth protocol messages as defined in <a
+ * href="https://github.com/ethereum/devp2p/blob/master/caps/eth.md">Ethereum Wire Protocol
+ * (ETH)</a>}
  */
 public class EthProtocol implements SubProtocol {
   public static final String NAME = "eth";
-  public static final Capability ETH62 = Capability.create(NAME, EthVersion.V62);
-  public static final Capability ETH63 = Capability.create(NAME, EthVersion.V63);
-  public static final Capability ETH64 = Capability.create(NAME, EthVersion.V64);
-  public static final Capability ETH65 = Capability.create(NAME, EthVersion.V65);
-
   private static final EthProtocol INSTANCE = new EthProtocol();
+  public static final Capability ETH62 = Capability.create(NAME, EthProtocolVersion.V62);
+  public static final Capability ETH63 = Capability.create(NAME, EthProtocolVersion.V63);
+  public static final Capability ETH64 = Capability.create(NAME, EthProtocolVersion.V64);
+  public static final Capability ETH65 = Capability.create(NAME, EthProtocolVersion.V65);
+  public static final Capability ETH66 = Capability.create(NAME, EthProtocolVersion.V66);
+  public static final Capability ETH67 = Capability.create(NAME, EthProtocolVersion.V67);
+  public static final Capability ETH68 = Capability.create(NAME, EthProtocolVersion.V68);
 
-  private static final List<Integer> eth62Messages =
-      Arrays.asList(
-          EthPV62.STATUS,
-          EthPV62.NEW_BLOCK_HASHES,
-          EthPV62.TRANSACTIONS,
-          EthPV62.GET_BLOCK_HEADERS,
-          EthPV62.BLOCK_HEADERS,
-          EthPV62.GET_BLOCK_BODIES,
-          EthPV62.BLOCK_BODIES,
-          EthPV62.NEW_BLOCK);
-
-  private static final List<Integer> eth63Messages = new ArrayList<>(eth62Messages);
-
-  static {
-    eth63Messages.addAll(
-        Arrays.asList(
-            EthPV63.GET_NODE_DATA, EthPV63.NODE_DATA, EthPV63.GET_RECEIPTS, EthPV63.RECEIPTS));
-  }
-
-  private static final List<Integer> eth65Messages = new ArrayList<>(eth63Messages);
-
-  static {
-    eth65Messages.addAll(
-        Arrays.asList(
-            EthPV65.NEW_POOLED_TRANSACTION_HASHES,
+  public static boolean requestIdCompatible(final int code) {
+    return Set.of(
+            EthPV62.GET_BLOCK_HEADERS,
+            EthPV62.BLOCK_HEADERS,
+            EthPV62.GET_BLOCK_BODIES,
+            EthPV62.BLOCK_BODIES,
             EthPV65.GET_POOLED_TRANSACTIONS,
-            EthPV65.POOLED_TRANSACTIONS));
+            EthPV65.POOLED_TRANSACTIONS,
+            EthPV63.GET_NODE_DATA,
+            EthPV63.NODE_DATA,
+            EthPV63.GET_RECEIPTS,
+            EthPV63.RECEIPTS)
+        .contains(code);
   }
 
   @Override
@@ -74,11 +61,14 @@ public String getName() {
   @Override
   public int messageSpace(final int protocolVersion) {
     switch (protocolVersion) {
-      case EthVersion.V62:
+      case EthProtocolVersion.V62:
         return 8;
-      case EthVersion.V63:
-      case EthVersion.V64:
-      case EthVersion.V65:
+      case EthProtocolVersion.V63:
+      case EthProtocolVersion.V64:
+      case EthProtocolVersion.V65:
+      case EthProtocolVersion.V66:
+      case EthProtocolVersion.V67:
+      case EthProtocolVersion.V68:
         // same number of messages in each range, eth65 defines messages in the middle of the
         // range defined by eth63 and eth64 defines no new ranges.
         return 17;
@@ -89,17 +79,7 @@ public int messageSpace(final int protocolVersion) {
 
   @Override
   public boolean isValidMessageCode(final int protocolVersion, final int code) {
-    switch (protocolVersion) {
-      case EthVersion.V62:
-        return eth62Messages.contains(code);
-      case EthVersion.V63:
-      case EthVersion.V64:
-        return eth63Messages.contains(code);
-      case EthVersion.V65:
-        return eth65Messages.contains(code);
-      default:
-        return false;
-    }
+    return EthProtocolVersion.getSupportedMessages(protocolVersion).contains(code);
   }
 
   @Override
@@ -144,10 +124,7 @@ public static EthProtocol get() {
     return INSTANCE;
   }
 
-  public static class EthVersion {
-    public static final int V62 = 62;
-    public static final int V63 = 63;
-    public static final int V64 = 64;
-    public static final int V65 = 65;
+  public static boolean isEth66Compatible(final Capability capability) {
+    return NAME.equals(capability.getName()) && capability.getVersion() >= ETH66.getVersion();
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/EthProtocolConfiguration.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/EthProtocolConfiguration.java
index c211b59131d..73834831eff 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/EthProtocolConfiguration.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/EthProtocolConfiguration.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.eth;
 
+import org.hyperledger.besu.util.number.ByteUnits;
 import org.hyperledger.besu.util.number.PositiveNumber;
 
 import java.util.Objects;
@@ -22,54 +23,62 @@
 
 public class EthProtocolConfiguration {
 
+  public static final int DEFAULT_MAX_MESSAGE_SIZE = 10 * ByteUnits.MEGABYTE;
   public static final int DEFAULT_MAX_GET_BLOCK_HEADERS = 192;
   public static final int DEFAULT_MAX_GET_BLOCK_BODIES = 128;
   public static final int DEFAULT_MAX_GET_RECEIPTS = 256;
   public static final int DEFAULT_MAX_GET_NODE_DATA = 384;
   public static final int DEFAULT_MAX_GET_POOLED_TRANSACTIONS = 256;
-  public static final boolean DEFAULT_ETH_65_ENABLED = true;
   public static final boolean DEFAULT_LEGACY_ETH_64_FORK_ID_ENABLED = false;
+  public static final int DEFAULT_MAX_CAPABILITY = Integer.MAX_VALUE;
+  public static final int DEFAULT_MIN_CAPABILITY = 0;
+  // Limit the size of p2p messages (in bytes)
+  private final int maxMessageSize;
 
+  // These options impose limits on the max number of elements returned when responding to
+  // peers' p2p RPC requests
   private final int maxGetBlockHeaders;
   private final int maxGetBlockBodies;
   private final int maxGetReceipts;
   private final int maxGetNodeData;
   private final int maxGetPooledTransactions;
-  private final boolean eth65Enabled;
   private final boolean legacyEth64ForkIdEnabled;
+  private final int maxEthCapability;
+  private final int minEthCapability;
 
-  public EthProtocolConfiguration(
+  private EthProtocolConfiguration(
+      final int maxMessageSize,
       final int maxGetBlockHeaders,
       final int maxGetBlockBodies,
       final int maxGetReceipts,
       final int maxGetNodeData,
       final int maxGetPooledTransactions,
-      final boolean eth65Enabled,
-      final boolean legacyEth64ForkIdEnabled) {
+      final boolean legacyEth64ForkIdEnabled,
+      final int maxEthCapability,
+      final int minEthCapability) {
+    this.maxMessageSize = maxMessageSize;
     this.maxGetBlockHeaders = maxGetBlockHeaders;
     this.maxGetBlockBodies = maxGetBlockBodies;
     this.maxGetReceipts = maxGetReceipts;
     this.maxGetNodeData = maxGetNodeData;
     this.maxGetPooledTransactions = maxGetPooledTransactions;
-    this.eth65Enabled = eth65Enabled;
     this.legacyEth64ForkIdEnabled = legacyEth64ForkIdEnabled;
+    this.maxEthCapability = maxEthCapability;
+    this.minEthCapability = minEthCapability;
   }
 
   public static EthProtocolConfiguration defaultConfig() {
-    return new EthProtocolConfiguration(
-        DEFAULT_MAX_GET_BLOCK_HEADERS,
-        DEFAULT_MAX_GET_BLOCK_BODIES,
-        DEFAULT_MAX_GET_RECEIPTS,
-        DEFAULT_MAX_GET_NODE_DATA,
-        DEFAULT_MAX_GET_POOLED_TRANSACTIONS,
-        DEFAULT_ETH_65_ENABLED,
-        DEFAULT_LEGACY_ETH_64_FORK_ID_ENABLED);
+    return builder().build();
   }
 
   public static Builder builder() {
     return new Builder();
   }
 
+  public int getMaxMessageSize() {
+    return maxMessageSize;
+  }
+
   public int getMaxGetBlockHeaders() {
     return maxGetBlockHeaders;
   }
@@ -90,14 +99,18 @@ public int getMaxGetPooledTransactions() {
     return maxGetPooledTransactions;
   }
 
-  public boolean isEth65Enabled() {
-    return eth65Enabled;
-  }
-
   public boolean isLegacyEth64ForkIdEnabled() {
     return legacyEth64ForkIdEnabled;
   }
 
+  public int getMaxEthCapability() {
+    return maxEthCapability;
+  }
+
+  public int getMinEthCapability() {
+    return minEthCapability;
+  }
+
   @Override
   public boolean equals(final Object o) {
     if (this == o) {
@@ -131,6 +144,9 @@ public String toString() {
   }
 
   public static class Builder {
+    private PositiveNumber maxMessageSize =
+        PositiveNumber.fromInt(EthProtocolConfiguration.DEFAULT_MAX_MESSAGE_SIZE);
+
     private PositiveNumber maxGetBlockHeaders =
         PositiveNumber.fromInt(EthProtocolConfiguration.DEFAULT_MAX_GET_BLOCK_HEADERS);
 
@@ -146,37 +162,70 @@ public static class Builder {
     private PositiveNumber maxGetPooledTransactions =
         PositiveNumber.fromInt(EthProtocolConfiguration.DEFAULT_MAX_GET_POOLED_TRANSACTIONS);
 
-    private boolean eth65Enabled = EthProtocolConfiguration.DEFAULT_ETH_65_ENABLED;
     private boolean legacyEth64ForkIdEnabled =
         EthProtocolConfiguration.DEFAULT_LEGACY_ETH_64_FORK_ID_ENABLED;
 
+    private int maxEthCapability = EthProtocolConfiguration.DEFAULT_MAX_CAPABILITY;
+
+    private int minEthCapability = EthProtocolConfiguration.DEFAULT_MIN_CAPABILITY;
+
+    public Builder maxMessageSize(final PositiveNumber maxMessageSize) {
+      this.maxMessageSize = maxMessageSize;
+      return this;
+    }
+
+    public Builder maxMessageSize(final int maxMessageSize) {
+      this.maxMessageSize = PositiveNumber.fromInt(maxMessageSize);
+      return this;
+    }
+
     public Builder maxGetBlockHeaders(final PositiveNumber maxGetBlockHeaders) {
       this.maxGetBlockHeaders = maxGetBlockHeaders;
       return this;
     }
 
+    public Builder maxGetBlockHeaders(final int maxGetBlockHeaders) {
+      this.maxGetBlockHeaders = PositiveNumber.fromInt(maxGetBlockHeaders);
+      return this;
+    }
+
     public Builder maxGetBlockBodies(final PositiveNumber maxGetBlockBodies) {
       this.maxGetBlockBodies = maxGetBlockBodies;
       return this;
     }
 
+    public Builder maxGetBlockBodies(final int maxGetBlockBodies) {
+      this.maxGetBlockBodies = PositiveNumber.fromInt(maxGetBlockBodies);
+      return this;
+    }
+
     public Builder maxGetReceipts(final PositiveNumber maxGetReceipts) {
       this.maxGetReceipts = maxGetReceipts;
       return this;
     }
 
+    public Builder maxGetReceipts(final int maxGetReceipts) {
+      this.maxGetReceipts = PositiveNumber.fromInt(maxGetReceipts);
+      return this;
+    }
+
     public Builder maxGetNodeData(final PositiveNumber maxGetNodeData) {
       this.maxGetNodeData = maxGetNodeData;
       return this;
     }
 
+    public Builder maxGetNodeData(final int maxGetNodeData) {
+      this.maxGetNodeData = PositiveNumber.fromInt(maxGetNodeData);
+      return this;
+    }
+
     public Builder maxGetPooledTransactions(final PositiveNumber maxGetPooledTransactions) {
       this.maxGetPooledTransactions = maxGetPooledTransactions;
       return this;
     }
 
-    public Builder eth65Enabled(final boolean eth65Enabled) {
-      this.eth65Enabled = eth65Enabled;
+    public Builder maxGetPooledTransactions(final int maxGetPooledTransactions) {
+      this.maxGetPooledTransactions = PositiveNumber.fromInt(maxGetPooledTransactions);
       return this;
     }
 
@@ -185,15 +234,27 @@ public Builder legacyEth64ForkIdEnabled(final boolean legacyEth64ForkIdEnabled)
       return this;
     }
 
+    public Builder maxEthCapability(final int maxEthCapability) {
+      this.maxEthCapability = maxEthCapability;
+      return this;
+    }
+
+    public Builder minEthCapability(final int minEthCapability) {
+      this.minEthCapability = minEthCapability;
+      return this;
+    }
+
     public EthProtocolConfiguration build() {
       return new EthProtocolConfiguration(
+          maxMessageSize.getValue(),
           maxGetBlockHeaders.getValue(),
           maxGetBlockBodies.getValue(),
           maxGetReceipts.getValue(),
           maxGetNodeData.getValue(),
           maxGetPooledTransactions.getValue(),
-          eth65Enabled,
-          legacyEth64ForkIdEnabled);
+          legacyEth64ForkIdEnabled,
+          maxEthCapability,
+          minEthCapability);
     }
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/EthProtocolVersion.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/EthProtocolVersion.java
new file mode 100644
index 00000000000..9e2d1184cf8
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/EthProtocolVersion.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth;
+
+import org.hyperledger.besu.ethereum.eth.messages.EthPV62;
+import org.hyperledger.besu.ethereum.eth.messages.EthPV63;
+import org.hyperledger.besu.ethereum.eth.messages.EthPV65;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Eth protocol messages as defined in <a
+ * href="https://github.com/ethereum/devp2p/blob/master/caps/eth.md">Ethereum Wire Protocol
+ * (ETH)</a>}
+ */
+public class EthProtocolVersion {
+  public static final int V62 = 62;
+  public static final int V63 = 63;
+  public static final int V64 = 64;
+  public static final int V65 = 65;
+  public static final int V66 = 66;
+  public static final int V67 = 67;
+  public static final int V68 = 68;
+
+  /** eth/62 (2015) */
+  private static final List<Integer> eth62Messages =
+      List.of(
+          EthPV62.STATUS,
+          EthPV62.NEW_BLOCK_HASHES,
+          EthPV62.TRANSACTIONS,
+          EthPV62.GET_BLOCK_HEADERS,
+          EthPV62.BLOCK_HEADERS,
+          EthPV62.GET_BLOCK_BODIES,
+          EthPV62.BLOCK_BODIES,
+          EthPV62.NEW_BLOCK);
+
+  /**
+   * eth/63 (2016)
+   *
+   * <p>Version 63 added the GetNodeData, NodeData, GetReceipts and Receipts messages which allow
+   * synchronizing transaction execution results.
+   */
+  private static final List<Integer> eth63Messages =
+      List.of(
+          EthPV62.STATUS,
+          EthPV62.NEW_BLOCK_HASHES,
+          EthPV62.TRANSACTIONS,
+          EthPV62.GET_BLOCK_HEADERS,
+          EthPV62.BLOCK_HEADERS,
+          EthPV62.GET_BLOCK_BODIES,
+          EthPV62.BLOCK_BODIES,
+          EthPV62.NEW_BLOCK,
+          EthPV63.GET_NODE_DATA,
+          EthPV63.NODE_DATA,
+          EthPV63.GET_RECEIPTS,
+          EthPV63.RECEIPTS);
+  /**
+   * eth/65 (EIP-2464, January 2020)
+   *
+   * <p>Version 65 improved transaction exchange, introducing three additional messages:
+   * NewPooledTransactionHashes, GetPooledTransactions, and PooledTransactions.
+   */
+  private static final List<Integer> eth65Messages =
+      List.of(
+          EthPV62.STATUS,
+          EthPV62.NEW_BLOCK_HASHES,
+          EthPV62.TRANSACTIONS,
+          EthPV62.GET_BLOCK_HEADERS,
+          EthPV62.BLOCK_HEADERS,
+          EthPV62.GET_BLOCK_BODIES,
+          EthPV62.BLOCK_BODIES,
+          EthPV62.NEW_BLOCK,
+          EthPV63.GET_NODE_DATA,
+          EthPV63.NODE_DATA,
+          EthPV63.GET_RECEIPTS,
+          EthPV63.RECEIPTS,
+          EthPV65.NEW_POOLED_TRANSACTION_HASHES,
+          EthPV65.GET_POOLED_TRANSACTIONS,
+          EthPV65.POOLED_TRANSACTIONS);
+
+  /**
+   * eth/67 (EIP-4938, March 2022)
+   *
+   * <p>Version 67 removed the GetNodeData and NodeData messages.
+   */
+  private static final List<Integer> eth67Messages =
+      List.of(
+          EthPV62.STATUS,
+          EthPV62.NEW_BLOCK_HASHES,
+          EthPV62.TRANSACTIONS,
+          EthPV62.GET_BLOCK_HEADERS,
+          EthPV62.BLOCK_HEADERS,
+          EthPV62.GET_BLOCK_BODIES,
+          EthPV62.BLOCK_BODIES,
+          EthPV62.NEW_BLOCK,
+          EthPV63.GET_RECEIPTS,
+          EthPV63.RECEIPTS,
+          EthPV65.NEW_POOLED_TRANSACTION_HASHES,
+          EthPV65.GET_POOLED_TRANSACTIONS,
+          EthPV65.POOLED_TRANSACTIONS);
+
+  /**
+   * Returns a list of integers containing the supported messages given the protocol version
+   *
+   * @param protocolVersion the protocol version
+   * @return a list containing the codes of supported messages
+   */
+  public static List<Integer> getSupportedMessages(final int protocolVersion) {
+    switch (protocolVersion) {
+      case EthProtocolVersion.V62:
+        return eth62Messages;
+      case EthProtocolVersion.V63:
+      case EthProtocolVersion.V64:
+        return eth63Messages;
+      case EthProtocolVersion.V65:
+      case EthProtocolVersion.V66:
+        return eth65Messages;
+      case EthProtocolVersion.V67:
+      case EthProtocolVersion.V68:
+        return eth67Messages;
+      default:
+        return Collections.emptyList();
+    }
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/SnapProtocol.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/SnapProtocol.java
new file mode 100644
index 00000000000..3fcac882419
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/SnapProtocol.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth;
+
+import org.hyperledger.besu.ethereum.eth.messages.snap.SnapV1;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol;
+
+import java.util.List;
+
+/**
+ * Snap protocol messages as defined in https://github.com/ethereum/devp2p/blob/master/caps/snap.md}
+ */
+public class SnapProtocol implements SubProtocol {
+  public static final String NAME = "snap";
+  public static final Capability SNAP1 = Capability.create(NAME, SnapVersion.V1);
+
+  private static final SnapProtocol INSTANCE = new SnapProtocol();
+
+  private static final List<Integer> snap1Messages =
+      List.of(
+          SnapV1.GET_ACCOUNT_RANGE,
+          SnapV1.ACCOUNT_RANGE,
+          SnapV1.GET_STORAGE_RANGE,
+          SnapV1.STORAGE_RANGE,
+          SnapV1.GET_BYTECODES,
+          SnapV1.BYTECODES,
+          SnapV1.GET_TRIE_NODES,
+          SnapV1.TRIE_NODES);
+
+  @Override
+  public String getName() {
+    return NAME;
+  }
+
+  @Override
+  public int messageSpace(final int protocolVersion) {
+    switch (protocolVersion) {
+      case SnapVersion.V1:
+        return 17;
+      default:
+        return 0;
+    }
+  }
+
+  @Override
+  public boolean isValidMessageCode(final int protocolVersion, final int code) {
+    switch (protocolVersion) {
+      case SnapVersion.V1:
+        return snap1Messages.contains(code);
+      default:
+        return false;
+    }
+  }
+
+  @Override
+  public String messageName(final int protocolVersion, final int code) {
+    switch (code) {
+      case SnapV1.GET_ACCOUNT_RANGE:
+        return "GetAccountRange";
+      case SnapV1.ACCOUNT_RANGE:
+        return "AccountRange";
+      case SnapV1.GET_STORAGE_RANGE:
+        return "GetStorageRange";
+      case SnapV1.STORAGE_RANGE:
+        return "StorageRange";
+      case SnapV1.GET_BYTECODES:
+        return "GetBytecodes";
+      case SnapV1.BYTECODES:
+        return "Bytecodes";
+      case SnapV1.GET_TRIE_NODES:
+        return "GetTrieNodes";
+      case SnapV1.TRIE_NODES:
+        return "TrieNodes";
+      default:
+        return INVALID_MESSAGE_NAME;
+    }
+  }
+
+  public static SnapProtocol get() {
+    return INSTANCE;
+  }
+
+  public static class SnapVersion {
+    public static final int V1 = 1;
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/encoding/TransactionAnnouncementDecoder.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/encoding/TransactionAnnouncementDecoder.java
new file mode 100644
index 00000000000..3d8df28f57f
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/encoding/TransactionAnnouncementDecoder.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.encoding;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.eth.EthProtocolVersion;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionAnnouncement;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
+import org.hyperledger.besu.ethereum.rlp.RLPException;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.plugin.data.TransactionType;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class TransactionAnnouncementDecoder {
+
+  @FunctionalInterface
+  public interface Decoder {
+    List<TransactionAnnouncement> decode(RLPInput input);
+  }
+
+  /**
+   * Returns the correct decoder given an Eth Capability
+   *
+   * <p>See <a href="https://eips.ethereum.org/EIPS/eip-5793">EIP-5793</a>
+   *
+   * @param capability the version of the eth protocol
+   * @return the correct decoder
+   */
+  public static Decoder getDecoder(final Capability capability) {
+    if (capability.getVersion() >= EthProtocolVersion.V68) {
+      return TransactionAnnouncementDecoder::decodeForEth68;
+    } else {
+      return TransactionAnnouncementDecoder::decodeForEth66;
+    }
+  }
+  /**
+   * Decode the list of transactions in the NewPooledTransactionHashesMessage
+   *
+   * @param input input used to decode the NewPooledTransactionHashesMessage before Eth/68
+   *     <p>format: [hash_0: B_32, hash_1: B_32, ...]
+   * @return the list of TransactionAnnouncement decoded from the message. Only hash is present.
+   *     size and type will return an Optional.empty()
+   */
+  private static List<TransactionAnnouncement> decodeForEth66(final RLPInput input) {
+    final List<Hash> hashes = input.readList(rlp -> Hash.wrap(rlp.readBytes32()));
+    return hashes.stream().map(TransactionAnnouncement::new).collect(Collectors.toList());
+  }
+
+  /**
+   * Decode the list of transactions in the NewPooledTransactionHashesMessage
+   *
+   * @param input input used to decode the NewPooledTransactionHashesMessage after Eth/68
+   *     <p>format: [[type_0: B_1, type_1: B_1, ...], [size_0: P, size_1: P, ...], ...]
+   * @return the list of TransactionAnnouncement decoded from the message with size, type and hash
+   */
+  private static List<TransactionAnnouncement> decodeForEth68(final RLPInput input) {
+    input.enterList();
+
+    final List<TransactionType> types = new ArrayList<>();
+    final byte[] bytes = input.readBytes().toArray();
+    for (final byte b : bytes) {
+      types.add(b == 0 ? TransactionType.FRONTIER : TransactionType.of(b));
+    }
+
+    List<Long> sizes =
+        input.readList(
+            in -> {
+              // for backward compatibility with previous Besu implementation be lenient and support
+              // also unsigned int with leading zeros.
+              // ToDo: this could be replaced with the simpler `RLPInput::readUnsignedIntScalar`
+              // after some months it has been released, since most of the Besus
+              // will be using the new implementation.
+              final Bytes intBytes = in.readBytes();
+              if (intBytes.size() > 4) {
+                throw new RLPException(
+                    "Expected max 4 bytes for unsigned int, but got " + intBytes.size() + " bytes");
+              }
+              return intBytes.toLong();
+            });
+
+    final List<Hash> hashes = input.readList(rlp -> Hash.wrap(rlp.readBytes32()));
+    input.leaveList();
+    if (!(types.size() == hashes.size() && hashes.size() == sizes.size())) {
+      throw new RLPException("Hashes, sizes and types must have the same number of elements");
+    }
+    return TransactionAnnouncement.create(types, sizes, hashes);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/encoding/TransactionAnnouncementEncoder.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/encoding/TransactionAnnouncementEncoder.java
new file mode 100644
index 00000000000..93ff06c9351
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/encoding/TransactionAnnouncementEncoder.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.encoding;
+
+import static org.hyperledger.besu.ethereum.core.Transaction.toHashList;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.EthProtocolVersion;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.plugin.data.TransactionType;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.tuweni.bytes.Bytes;
+
+public class TransactionAnnouncementEncoder {
+
+  @FunctionalInterface
+  public interface Encoder {
+    Bytes encode(List<Transaction> transaction);
+  }
+
+  /**
+   * Returns the correct encoder given an Eth Capability
+   *
+   * <p>See <a href="https://eips.ethereum.org/EIPS/eip-5793">EIP-5793</a>
+   *
+   * @param capability the version of the eth protocol
+   * @return the correct encoder
+   */
+  public static Encoder getEncoder(final Capability capability) {
+    if (capability.getVersion() >= EthProtocolVersion.V68) {
+      return TransactionAnnouncementEncoder::encodeForEth68;
+    } else {
+      return TransactionAnnouncementEncoder::encodeForEth66;
+    }
+  }
+
+  /**
+   * Encode a list of hashes for the NewPooledTransactionHashesMessage using the Eth/66
+   *
+   * <p>format: [hash_0: B_32, hash_1: B_32, ...]
+   *
+   * @param transactions the list to encode
+   * @return the encoded value. The message data will contain only the transaction hashes
+   */
+  private static Bytes encodeForEth66(final List<Transaction> transactions) {
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    out.writeList(toHashList(transactions), (h, w) -> w.writeBytes(h));
+    return out.encoded();
+  }
+
+  /**
+   * Encode a list of transactions for the NewPooledTransactionHashesMessage using the Eth/68
+   *
+   * <p>format: [[type_0: B_1, type_1: B_1, ...], [size_0: P, size_1: P, ...], ...]
+   *
+   * @param transactions the list to encode
+   * @return the encoded value. The message data will contain hashes, types and sizes.
+   */
+  private static Bytes encodeForEth68(final List<Transaction> transactions) {
+    final List<Integer> sizes = new ArrayList<>(transactions.size());
+    final byte[] types = new byte[transactions.size()];
+    final List<Hash> hashes = new ArrayList<>(transactions.size());
+
+    for (int i = 0; i < transactions.size(); i++) {
+      final TransactionType type = transactions.get(i).getType();
+      types[i] = type == TransactionType.FRONTIER ? 0x00 : type.getSerializedType();
+      sizes.add(transactions.get(i).getSize());
+      hashes.add(transactions.get(i).getHash());
+    }
+
+    return encodeForEth68(types, sizes, hashes);
+  }
+
+  @VisibleForTesting
+  public static Bytes encodeForEth68(
+      final List<TransactionType> types, final List<Integer> sizes, final List<Hash> hashes) {
+
+    final byte[] byteTypes = new byte[types.size()];
+    for (int i = 0; i < types.size(); i++) {
+      final TransactionType type = types.get(i);
+      byteTypes[i] = type == TransactionType.FRONTIER ? 0x00 : type.getSerializedType();
+    }
+    return encodeForEth68(byteTypes, sizes, hashes);
+  }
+
+  @VisibleForTesting
+  public static Bytes encodeForEth68(
+      final byte[] types, final List<Integer> sizes, final List<Hash> hashes) {
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    // Check if lists have the same size
+    if (!(types.length == hashes.size() && hashes.size() == sizes.size())) {
+      throw new IllegalArgumentException(
+          "Hashes, sizes and types must have the same number of elements");
+    }
+    out.startList();
+    out.writeBytes(Bytes.wrap((types)));
+    out.writeList(sizes, (h, w) -> w.writeUnsignedInt(h));
+    out.writeList(hashes, (h, w) -> w.writeBytes(h));
+    out.endList();
+    return out.encoded();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/ChainState.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/ChainState.java
index 98733ba6b06..6dd4b77bf43 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/ChainState.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/ChainState.java
@@ -14,9 +14,9 @@
  */
 package org.hyperledger.besu.ethereum.eth.manager;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.util.Subscribers;
 
 import com.google.common.base.MoreObjects;
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthContext.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthContext.java
index 44094811dd8..b33fda3bc64 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthContext.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthContext.java
@@ -14,16 +14,31 @@
  */
 package org.hyperledger.besu.ethereum.eth.manager;
 
+import java.util.Optional;
+
 public class EthContext {
 
   private final EthPeers ethPeers;
   private final EthMessages ethMessages;
+  private final Optional<EthMessages> snapMessages;
   private final EthScheduler scheduler;
 
+  public EthContext(
+      final EthPeers ethPeers,
+      final EthMessages ethMessages,
+      final EthMessages snapMessages,
+      final EthScheduler scheduler) {
+    this.ethPeers = ethPeers;
+    this.ethMessages = ethMessages;
+    this.snapMessages = Optional.of(snapMessages);
+    this.scheduler = scheduler;
+  }
+
   public EthContext(
       final EthPeers ethPeers, final EthMessages ethMessages, final EthScheduler scheduler) {
     this.ethPeers = ethPeers;
     this.ethMessages = ethMessages;
+    this.snapMessages = Optional.empty();
     this.scheduler = scheduler;
   }
 
@@ -35,6 +50,10 @@ public EthMessages getEthMessages() {
     return ethMessages;
   }
 
+  public Optional<EthMessages> getSnapMessages() {
+    return snapMessages;
+  }
+
   public EthScheduler getScheduler() {
     return scheduler;
   }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthMessages.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthMessages.java
index 896409cccee..fbaa6fbc310 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthMessages.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthMessages.java
@@ -14,30 +14,72 @@
  */
 package org.hyperledger.besu.ethereum.eth.manager;
 
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 import org.hyperledger.besu.util.Subscribers;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 
+import com.google.common.annotations.VisibleForTesting;
+
 public class EthMessages {
   private final Map<Integer, Subscribers<MessageCallback>> listenersByCode =
       new ConcurrentHashMap<>();
+  private final Map<Integer, MessageResponseConstructor> messageResponseConstructorsByCode =
+      new ConcurrentHashMap<>();
+
+  public Optional<MessageData> dispatch(final EthMessage ethMessage) {
+    final int code = ethMessage.getData().getCode();
+
+    // trigger arbitrary side-effecting listeners
+    Optional.ofNullable(listenersByCode.get(code))
+        .ifPresent(
+            listeners -> listeners.forEach(messageCallback -> messageCallback.exec(ethMessage)));
+
+    return Optional.ofNullable(messageResponseConstructorsByCode.get(code))
+        .map(
+            messageResponseConstructor ->
+                messageResponseConstructor.response(ethMessage.getData()));
+  }
 
-  void dispatch(final EthMessage message) {
-    final Subscribers<MessageCallback> listeners = listenersByCode.get(message.getData().getCode());
-    if (listeners == null) {
-      return;
+  public long subscribe(final int messageCode, final MessageCallback callback) {
+    return listenersByCode
+        .computeIfAbsent(messageCode, key -> Subscribers.create())
+        .subscribe(callback);
+  }
+
+  public void unsubscribe(final long subscriptionId, final int messageCode) {
+    if (listenersByCode.containsKey(messageCode)) {
+      listenersByCode.get(messageCode).unsubscribe(subscriptionId);
+      if (listenersByCode.get(messageCode).getSubscriberCount() < 1) {
+        listenersByCode.remove(messageCode);
+      }
     }
+  }
 
-    listeners.forEach(callback -> callback.exec(message));
+  public void registerResponseConstructor(
+      final int messageCode, final MessageResponseConstructor messageResponseConstructor) {
+    messageResponseConstructorsByCode.put(messageCode, messageResponseConstructor);
   }
 
-  public void subscribe(final int messageCode, final MessageCallback callback) {
-    listenersByCode.computeIfAbsent(messageCode, key -> Subscribers.create()).subscribe(callback);
+  @VisibleForTesting
+  public List<Integer> messageCodesHandled() {
+    List<Integer> retval = new ArrayList<>();
+    retval.addAll(messageResponseConstructorsByCode.keySet());
+    retval.addAll(listenersByCode.keySet());
+    return retval;
   }
 
   @FunctionalInterface
   public interface MessageCallback {
     void exec(EthMessage message);
   }
+
+  @FunctionalInterface
+  public interface MessageResponseConstructor {
+    MessageData response(MessageData message);
+  }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeer.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeer.java
index 66c08c21f3e..aae6296ca38 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeer.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeer.java
@@ -16,8 +16,11 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.eth.EthProtocol;
+import org.hyperledger.besu.ethereum.eth.SnapProtocol;
 import org.hyperledger.besu.ethereum.eth.messages.EthPV62;
 import org.hyperledger.besu.ethereum.eth.messages.EthPV63;
 import org.hyperledger.besu.ethereum.eth.messages.EthPV65;
@@ -26,12 +29,18 @@
 import org.hyperledger.besu.ethereum.eth.messages.GetNodeDataMessage;
 import org.hyperledger.besu.ethereum.eth.messages.GetPooledTransactionsMessage;
 import org.hyperledger.besu.ethereum.eth.messages.GetReceiptsMessage;
+import org.hyperledger.besu.ethereum.eth.messages.snap.GetAccountRangeMessage;
+import org.hyperledger.besu.ethereum.eth.messages.snap.GetByteCodesMessage;
+import org.hyperledger.besu.ethereum.eth.messages.snap.GetStorageRangeMessage;
+import org.hyperledger.besu.ethereum.eth.messages.snap.GetTrieNodesMessage;
+import org.hyperledger.besu.ethereum.eth.messages.snap.SnapV1;
 import org.hyperledger.besu.ethereum.eth.peervalidation.PeerValidator;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
+import org.hyperledger.besu.plugin.services.permissioning.NodeMessagePermissioningProvider;
 
 import java.time.Clock;
 import java.util.Collections;
@@ -39,44 +48,77 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
+import javax.annotation.Nonnull;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class EthPeer {
-  private static final Logger LOG = LogManager.getLogger();
+public class EthPeer implements Comparable<EthPeer> {
+  private static final Logger LOG = LoggerFactory.getLogger(EthPeer.class);
 
   private static final int MAX_OUTSTANDING_REQUESTS = 5;
 
-  private final PeerConnection connection;
+  private PeerConnection connection;
 
   private final int maxTrackedSeenBlocks = 300;
 
-  private final Set<Hash> knownBlocks;
+  private final Set<Hash> knownBlocks =
+      Collections.newSetFromMap(
+          Collections.synchronizedMap(
+              new LinkedHashMap<>(16, 0.75f, true) {
+                @Override
+                protected boolean removeEldestEntry(final Map.Entry<Hash, Boolean> eldest) {
+                  return size() > maxTrackedSeenBlocks;
+                }
+              }));
+  private final Bytes localNodeId;
+
+  private Optional<BlockHeader> checkpointHeader = Optional.empty();
+
   private final String protocolName;
+  private final int maxMessageSize;
   private final Clock clock;
-  private final ChainState chainHeadState;
-  private final AtomicBoolean statusHasBeenSentToPeer = new AtomicBoolean(false);
+  private final List<NodeMessagePermissioningProvider> permissioningProviders;
+  private final ChainState chainHeadState = new ChainState();
+  private final AtomicBoolean readyForRequests = new AtomicBoolean(false);
   private final AtomicBoolean statusHasBeenReceivedFromPeer = new AtomicBoolean(false);
+  private final AtomicBoolean fullyValidated = new AtomicBoolean(false);
   private final AtomicInteger lastProtocolVersion = new AtomicInteger(0);
 
   private volatile long lastRequestTimestamp = 0;
-  private final RequestManager headersRequestManager = new RequestManager(this);
-  private final RequestManager bodiesRequestManager = new RequestManager(this);
-  private final RequestManager receiptsRequestManager = new RequestManager(this);
-  private final RequestManager nodeDataRequestManager = new RequestManager(this);
-  private final RequestManager pooledTransactionsRequestManager = new RequestManager(this);
+
+  private final Map<String, Map<Integer, RequestManager>> requestManagers;
 
   private final AtomicReference<Consumer<EthPeer>> onStatusesExchanged = new AtomicReference<>();
   private final PeerReputation reputation = new PeerReputation();
-  private final Map<PeerValidator, Boolean> validationStatus = new HashMap<>();
+  private final Map<PeerValidator, Boolean> validationStatus = new ConcurrentHashMap<>();
+  private final Bytes id;
+
+  private static final Map<Integer, Integer> roundMessages;
+
+  static {
+    roundMessages = new HashMap<>();
+    roundMessages.put(EthPV62.BLOCK_HEADERS, EthPV62.GET_BLOCK_HEADERS);
+    roundMessages.put(EthPV62.BLOCK_BODIES, EthPV62.GET_BLOCK_BODIES);
+    roundMessages.put(EthPV63.RECEIPTS, EthPV63.GET_RECEIPTS);
+    roundMessages.put(EthPV63.NODE_DATA, EthPV63.GET_NODE_DATA);
+    roundMessages.put(EthPV65.POOLED_TRANSACTIONS, EthPV65.GET_POOLED_TRANSACTIONS);
+
+    roundMessages.put(SnapV1.ACCOUNT_RANGE, SnapV1.GET_ACCOUNT_RANGE);
+    roundMessages.put(SnapV1.STORAGE_RANGE, SnapV1.GET_STORAGE_RANGE);
+    roundMessages.put(SnapV1.BYTECODES, SnapV1.GET_BYTECODES);
+    roundMessages.put(SnapV1.TRIE_NODES, SnapV1.GET_TRIE_NODES);
+  }
 
   @VisibleForTesting
   public EthPeer(
@@ -84,24 +126,58 @@ public EthPeer(
       final String protocolName,
       final Consumer<EthPeer> onStatusesExchanged,
       final List<PeerValidator> peerValidators,
-      final Clock clock) {
+      final int maxMessageSize,
+      final Clock clock,
+      final List<NodeMessagePermissioningProvider> permissioningProviders,
+      final Bytes localNodeId) {
     this.connection = connection;
     this.protocolName = protocolName;
+    this.maxMessageSize = maxMessageSize;
     this.clock = clock;
-    knownBlocks =
-        Collections.newSetFromMap(
-            Collections.synchronizedMap(
-                new LinkedHashMap<Hash, Boolean>(16, 0.75f, true) {
-                  @Override
-                  protected boolean removeEldestEntry(final Map.Entry<Hash, Boolean> eldest) {
-                    return size() > maxTrackedSeenBlocks;
-                  }
-                }));
-    this.chainHeadState = new ChainState();
+    this.permissioningProviders = permissioningProviders;
     this.onStatusesExchanged.set(onStatusesExchanged);
-    for (final PeerValidator peerValidator : peerValidators) {
-      validationStatus.put(peerValidator, false);
-    }
+    peerValidators.forEach(peerValidator -> validationStatus.put(peerValidator, false));
+    fullyValidated.set(peerValidators.isEmpty());
+
+    this.requestManagers = new ConcurrentHashMap<>();
+    this.localNodeId = localNodeId;
+    this.id = connection.getPeer().getId();
+
+    initEthRequestManagers();
+    initSnapRequestManagers();
+  }
+
+  private void initEthRequestManagers() {
+    final boolean supportsRequestId =
+        getAgreedCapabilities().stream().anyMatch(EthProtocol::isEth66Compatible);
+    // eth protocol
+    requestManagers.put(
+        protocolName,
+        Map.ofEntries(
+            Map.entry(
+                EthPV62.GET_BLOCK_HEADERS,
+                new RequestManager(this, supportsRequestId, protocolName)),
+            Map.entry(
+                EthPV62.GET_BLOCK_BODIES,
+                new RequestManager(this, supportsRequestId, protocolName)),
+            Map.entry(
+                EthPV63.GET_RECEIPTS, new RequestManager(this, supportsRequestId, protocolName)),
+            Map.entry(
+                EthPV63.GET_NODE_DATA, new RequestManager(this, supportsRequestId, protocolName)),
+            Map.entry(
+                EthPV65.GET_POOLED_TRANSACTIONS,
+                new RequestManager(this, supportsRequestId, protocolName))));
+  }
+
+  private void initSnapRequestManagers() {
+    // snap protocol
+    requestManagers.put(
+        SnapProtocol.NAME,
+        Map.ofEntries(
+            Map.entry(SnapV1.GET_ACCOUNT_RANGE, new RequestManager(this, true, SnapProtocol.NAME)),
+            Map.entry(SnapV1.GET_STORAGE_RANGE, new RequestManager(this, true, SnapProtocol.NAME)),
+            Map.entry(SnapV1.GET_BYTECODES, new RequestManager(this, true, SnapProtocol.NAME)),
+            Map.entry(SnapV1.GET_TRIE_NODES, new RequestManager(this, true, SnapProtocol.NAME))));
   }
 
   public void markValidated(final PeerValidator validator) {
@@ -109,6 +185,7 @@ public void markValidated(final PeerValidator validator) {
       throw new IllegalArgumentException("Attempt to update unknown validation status");
     }
     validationStatus.put(validator, true);
+    fullyValidated.set(validationStatus.values().stream().allMatch(b -> b));
   }
 
   /**
@@ -117,12 +194,7 @@ public void markValidated(final PeerValidator validator) {
    * @return {@code true} if all peer validation logic has run and successfully validated this peer
    */
   public boolean isFullyValidated() {
-    for (final Boolean isValid : validationStatus.values()) {
-      if (!isValid) {
-        return false;
-      }
-    }
-    return true;
+    return fullyValidated.get();
   }
 
   public boolean isDisconnected() {
@@ -143,30 +215,84 @@ public void recordRequestTimeout(final int requestCode) {
   }
 
   public void recordUselessResponse(final String requestType) {
-    LOG.debug("Received useless response for {} from peer {}", requestType, this);
+    LOG.debug("Received useless response for request type {} from peer {}", requestType, this);
     reputation.recordUselessResponse(System.currentTimeMillis()).ifPresent(this::disconnect);
   }
 
+  public void recordUsefulResponse() {
+    reputation.recordUsefulResponse();
+  }
+
   public void disconnect(final DisconnectReason reason) {
     connection.disconnect(reason);
   }
 
   public RequestManager.ResponseStream send(final MessageData messageData) throws PeerNotConnected {
-    switch (messageData.getCode()) {
-      case EthPV62.GET_BLOCK_HEADERS:
-        return sendRequest(headersRequestManager, messageData);
-      case EthPV62.GET_BLOCK_BODIES:
-        return sendRequest(bodiesRequestManager, messageData);
-      case EthPV63.GET_RECEIPTS:
-        return sendRequest(receiptsRequestManager, messageData);
-      case EthPV63.GET_NODE_DATA:
-        return sendRequest(nodeDataRequestManager, messageData);
-      case EthPV65.GET_POOLED_TRANSACTIONS:
-        return sendRequest(pooledTransactionsRequestManager, messageData);
-      default:
-        connection.sendForProtocol(protocolName, messageData);
-        return null;
+    return send(messageData, this.protocolName);
+  }
+
+  public RequestManager.ResponseStream send(
+      final MessageData messageData, final String protocolName) throws PeerNotConnected {
+    return send(messageData, protocolName, this.connection);
+  }
+
+  /**
+   * This method is only used for sending the status message, as it is possible that we have
+   * multiple connections to the same peer at that time.
+   *
+   * @param messageData the data to send
+   * @param protocolName the protocol to use for sending
+   * @param connectionToUse the connection to use for sending
+   * @return the response stream from the peer
+   * @throws PeerNotConnected if the peer is not connected
+   */
+  public RequestManager.ResponseStream send(
+      final MessageData messageData,
+      final String protocolName,
+      final PeerConnection connectionToUse)
+      throws PeerNotConnected {
+    if (connectionToUse.getAgreedCapabilities().stream()
+        .noneMatch(capability -> capability.getName().equalsIgnoreCase(protocolName))) {
+      LOG.debug("Protocol {} unavailable for this peer {}", protocolName, this);
+      return null;
+    }
+    if (permissioningProviders.stream()
+        .anyMatch(
+            p -> !p.isMessagePermitted(connectionToUse.getRemoteEnode(), messageData.getCode()))) {
+      LOG.info(
+          "Permissioning blocked sending of message code {} to {}", messageData.getCode(), this);
+      if (LOG.isDebugEnabled()) {
+        LOG.debug(
+            "Permissioning blocked by providers {}",
+            permissioningProviders.stream()
+                .filter(
+                    p ->
+                        !p.isMessagePermitted(
+                            connectionToUse.getRemoteEnode(), messageData.getCode())));
+      }
+      return null;
     }
+    // Check message size is within limits
+    if (messageData.getSize() > maxMessageSize) {
+      // This is a bug or else a misconfiguration of the max message size.
+      LOG.error(
+          "Sending {} message to peer ({}) which exceeds local message size limit of {} bytes.  Message code: {}, Message Size: {}",
+          protocolName,
+          this,
+          maxMessageSize,
+          messageData.getCode(),
+          messageData.getSize());
+    }
+
+    if (requestManagers.containsKey(protocolName)) {
+      final Map<Integer, RequestManager> managers = this.requestManagers.get(protocolName);
+      if (managers.containsKey(messageData.getCode())) {
+        return sendRequest(managers.get(messageData.getCode()), messageData);
+      }
+    }
+
+    connectionToUse.sendForProtocol(protocolName, messageData);
+    return null;
   }
 
   public RequestManager.ResponseStream getHeadersByHash(
@@ -174,7 +300,9 @@ public RequestManager.ResponseStream getHeadersByHash(
       throws PeerNotConnected {
     final GetBlockHeadersMessage message =
         GetBlockHeadersMessage.create(hash, maxHeaders, skip, reverse);
-    return sendRequest(headersRequestManager, message);
+    final RequestManager requestManager =
+        requestManagers.get(protocolName).get(EthPV62.GET_BLOCK_HEADERS);
+    return sendRequest(requestManager, message);
   }
 
   public RequestManager.ResponseStream getHeadersByNumber(
@@ -182,148 +310,199 @@ public RequestManager.ResponseStream getHeadersByNumber(
       throws PeerNotConnected {
     final GetBlockHeadersMessage message =
         GetBlockHeadersMessage.create(blockNumber, maxHeaders, skip, reverse);
-    return sendRequest(headersRequestManager, message);
-  }
-
-  private RequestManager.ResponseStream sendRequest(
-      final RequestManager requestManager, final MessageData messageData) throws PeerNotConnected {
-    lastRequestTimestamp = clock.millis();
-    return requestManager.dispatchRequest(
-        () -> connection.sendForProtocol(protocolName, messageData));
+    return sendRequest(requestManagers.get(protocolName).get(EthPV62.GET_BLOCK_HEADERS), message);
   }
 
   public RequestManager.ResponseStream getBodies(final List<Hash> blockHashes)
       throws PeerNotConnected {
     final GetBlockBodiesMessage message = GetBlockBodiesMessage.create(blockHashes);
-    return sendRequest(bodiesRequestManager, message);
+    return sendRequest(requestManagers.get(protocolName).get(EthPV62.GET_BLOCK_BODIES), message);
   }
 
   public RequestManager.ResponseStream getReceipts(final List<Hash> blockHashes)
       throws PeerNotConnected {
     final GetReceiptsMessage message = GetReceiptsMessage.create(blockHashes);
-    return sendRequest(receiptsRequestManager, message);
+    return sendRequest(requestManagers.get(protocolName).get(EthPV63.GET_RECEIPTS), message);
   }
 
   public RequestManager.ResponseStream getNodeData(final Iterable<Hash> nodeHashes)
       throws PeerNotConnected {
     final GetNodeDataMessage message = GetNodeDataMessage.create(nodeHashes);
-    return sendRequest(nodeDataRequestManager, message);
+    return sendRequest(requestManagers.get(protocolName).get(EthPV63.GET_NODE_DATA), message);
   }
 
   public RequestManager.ResponseStream getPooledTransactions(final List<Hash> hashes)
       throws PeerNotConnected {
     final GetPooledTransactionsMessage message = GetPooledTransactionsMessage.create(hashes);
-    return sendRequest(pooledTransactionsRequestManager, message);
+    return sendRequest(
+        requestManagers.get(protocolName).get(EthPV65.GET_POOLED_TRANSACTIONS), message);
+  }
+
+  public RequestManager.ResponseStream getSnapAccountRange(
+      final Hash stateRoot, final Bytes32 startKeyHash, final Bytes32 endKeyHash)
+      throws PeerNotConnected {
+    final GetAccountRangeMessage getAccountRangeMessage =
+        GetAccountRangeMessage.create(stateRoot, startKeyHash, endKeyHash);
+    getAccountRangeMessage.setRootHash(Optional.of(stateRoot));
+    return sendRequest(
+        requestManagers.get(SnapProtocol.NAME).get(SnapV1.GET_ACCOUNT_RANGE),
+        getAccountRangeMessage);
+  }
+
+  public RequestManager.ResponseStream getSnapStorageRange(
+      final Hash stateRoot,
+      final List<Bytes32> accountHashes,
+      final Bytes32 startKeyHash,
+      final Bytes32 endKeyHash)
+      throws PeerNotConnected {
+    final GetStorageRangeMessage getStorageRangeMessage =
+        GetStorageRangeMessage.create(stateRoot, accountHashes, startKeyHash, endKeyHash);
+    getStorageRangeMessage.setRootHash(Optional.of(stateRoot));
+    return sendRequest(
+        requestManagers.get(SnapProtocol.NAME).get(SnapV1.GET_STORAGE_RANGE),
+        getStorageRangeMessage);
   }
 
-  boolean validateReceivedMessage(final EthMessage message) {
+  public RequestManager.ResponseStream getSnapBytecode(
+      final Hash stateRoot, final List<Bytes32> codeHashes) throws PeerNotConnected {
+    final GetByteCodesMessage getByteCodes = GetByteCodesMessage.create(codeHashes);
+    getByteCodes.setRootHash(Optional.of(stateRoot));
+    return sendRequest(
+        requestManagers.get(SnapProtocol.NAME).get(SnapV1.GET_BYTECODES), getByteCodes);
+  }
+
+  public RequestManager.ResponseStream getSnapTrieNode(
+      final Hash stateRoot, final List<List<Bytes>> paths) throws PeerNotConnected {
+    final GetTrieNodesMessage getTrieNodes = GetTrieNodesMessage.create(stateRoot, paths);
+    getTrieNodes.setRootHash(Optional.of(stateRoot));
+    return sendRequest(
+        requestManagers.get(SnapProtocol.NAME).get(SnapV1.GET_TRIE_NODES), getTrieNodes);
+  }
+
+  private RequestManager.ResponseStream sendRequest(
+      final RequestManager requestManager, final MessageData messageData) throws PeerNotConnected {
+    lastRequestTimestamp = clock.millis();
+    return requestManager.dispatchRequest(
+        msgData -> connection.sendForProtocol(requestManager.getProtocolName(), msgData),
+        messageData);
+  }
+
+  public boolean validateReceivedMessage(final EthMessage message, final String protocolName) {
     checkArgument(message.getPeer().equals(this), "Mismatched message sent to peer for dispatch");
-    switch (message.getData().getCode()) {
-      case EthPV62.BLOCK_HEADERS:
-        if (headersRequestManager.outstandingRequests() == 0) {
-          LOG.warn("Unsolicited headers received.");
-          return false;
-        }
-        break;
-      case EthPV62.BLOCK_BODIES:
-        if (bodiesRequestManager.outstandingRequests() == 0) {
-          LOG.warn("Unsolicited bodies received.");
-          return false;
-        }
-        break;
-      case EthPV63.RECEIPTS:
-        if (receiptsRequestManager.outstandingRequests() == 0) {
-          LOG.warn("Unsolicited receipts received.");
-          return false;
-        }
-        break;
-      case EthPV63.NODE_DATA:
-        if (nodeDataRequestManager.outstandingRequests() == 0) {
-          LOG.warn("Unsolicited node data received.");
-          return false;
-        }
-        break;
-      case EthPV65.POOLED_TRANSACTIONS:
-        if (pooledTransactionsRequestManager.outstandingRequests() == 0) {
-          LOG.warn("Unsolicited pooling transactions received.");
-          return false;
-        }
-        break;
-      default:
-        // Nothing to do
-    }
-    return true;
+    return getRequestManager(protocolName, message.getData().getCode())
+        .map(requestManager -> requestManager.outstandingRequests() != 0)
+        .orElse(true);
   }
 
   /**
    * Routes messages originating from this peer to listeners.
    *
-   * @param message the message to dispatch
+   * @param ethMessage the Eth message to dispatch
+   * @param protocolName Specific protocol name if needed
    */
-  void dispatch(final EthMessage message) {
-    checkArgument(message.getPeer().equals(this), "Mismatched message sent to peer for dispatch");
-    switch (message.getData().getCode()) {
-      case EthPV62.BLOCK_HEADERS:
-        reputation.resetTimeoutCount(EthPV62.GET_BLOCK_HEADERS);
-        headersRequestManager.dispatchResponse(message);
-        break;
-      case EthPV62.BLOCK_BODIES:
-        reputation.resetTimeoutCount(EthPV62.GET_BLOCK_BODIES);
-        bodiesRequestManager.dispatchResponse(message);
-        break;
-      case EthPV63.RECEIPTS:
-        reputation.resetTimeoutCount(EthPV63.GET_RECEIPTS);
-        receiptsRequestManager.dispatchResponse(message);
-        break;
-      case EthPV63.NODE_DATA:
-        reputation.resetTimeoutCount(EthPV63.GET_NODE_DATA);
-        nodeDataRequestManager.dispatchResponse(message);
-        break;
-      case EthPV65.POOLED_TRANSACTIONS:
-        reputation.resetTimeoutCount(EthPV65.GET_POOLED_TRANSACTIONS);
-        pooledTransactionsRequestManager.dispatchResponse(message);
-        break;
-      default:
-        // Nothing to do
+  Optional<RequestManager> dispatch(final EthMessage ethMessage, final String protocolName) {
+    checkArgument(
+        ethMessage.getPeer().equals(this), "Mismatched Eth message sent to peer for dispatch");
+    final int messageCode = ethMessage.getData().getCode();
+    reputation.resetTimeoutCount(messageCode);
+
+    Optional<RequestManager> requestManager = getRequestManager(protocolName, messageCode);
+    requestManager.ifPresentOrElse(
+        localRequestManager -> localRequestManager.dispatchResponse(ethMessage),
+        () -> {
+          LOG.trace(
+              "Message {} not expected has just been received for protocol {}, peer {} ",
+              messageCode,
+              protocolName,
+              this);
+        });
+    return requestManager;
+  }
+
+  /**
+   * Routes messages originating from this peer to listeners.
+   *
+   * @param ethMessage the Eth message to dispatch
+   */
+  void dispatch(final EthMessage ethMessage) {
+    dispatch(ethMessage, protocolName);
+  }
+
+  private Optional<RequestManager> getRequestManager(final String protocolName, final int code) {
+    if (requestManagers.containsKey(protocolName)) {
+      final Map<Integer, RequestManager> managers = requestManagers.get(protocolName);
+      final Integer requestCode = roundMessages.getOrDefault(code, -1);
+      if (managers.containsKey(requestCode)) {
+        return Optional.of(managers.get(requestCode));
+      }
     }
+    return Optional.empty();
   }
 
   public Map<Integer, AtomicInteger> timeoutCounts() {
     return reputation.timeoutCounts();
   }
 
+  public PeerReputation getReputation() {
+    return reputation;
+  }
+
   void handleDisconnect() {
-    headersRequestManager.close();
-    bodiesRequestManager.close();
-    receiptsRequestManager.close();
-    nodeDataRequestManager.close();
-    pooledTransactionsRequestManager.close();
+    LOG.debug("handleDisconnect - EthPeer {}", this);
+
+    requestManagers.forEach(
+        (protocolName, map) -> map.forEach((code, requestManager) -> requestManager.close()));
   }
 
   public void registerKnownBlock(final Hash hash) {
     knownBlocks.add(hash);
   }
 
-  public void registerStatusSent() {
-    statusHasBeenSentToPeer.set(true);
-    maybeExecuteStatusesExchangedCallback();
+  public void registerStatusSent(final PeerConnection connection) {
+    synchronized (this) {
+      connection.setStatusSent();
+      maybeExecuteStatusesExchangedCallback(connection);
+    }
   }
 
   public void registerStatusReceived(
-      final Hash hash, final Difficulty td, final int protocolVersion) {
+      final Hash hash,
+      final Difficulty td,
+      final int protocolVersion,
+      final PeerConnection connection) {
     chainHeadState.statusReceived(hash, td);
     lastProtocolVersion.set(protocolVersion);
     statusHasBeenReceivedFromPeer.set(true);
-    maybeExecuteStatusesExchangedCallback();
+    synchronized (this) {
+      connection.setStatusReceived();
+      maybeExecuteStatusesExchangedCallback(connection);
+    }
   }
 
-  private void maybeExecuteStatusesExchangedCallback() {
-    if (readyForRequests()) {
-      final Consumer<EthPeer> callback = onStatusesExchanged.getAndSet(null);
-      if (callback == null) {
-        return;
+  private void maybeExecuteStatusesExchangedCallback(final PeerConnection newConnection) {
+    synchronized (this) {
+      if (newConnection.getStatusExchanged()) {
+        if (!this.connection.equals(newConnection)) {
+          if (readyForRequests.get()) {
+            // We have two connections that are ready for requests, figure out which connection to
+            // keep
+            if (compareDuplicateConnections(this.connection, newConnection) > 0) {
+              LOG.trace("Changed connection from {} to {}", this.connection, newConnection);
+              this.connection = newConnection;
+            }
+          } else {
+            // use the new connection for now, as it is ready for requests, which the "old" one is
+            // not
+            this.connection = newConnection;
+          }
+        }
+        readyForRequests.set(true);
+        final Consumer<EthPeer> peerConsumer = onStatusesExchanged.getAndSet(null);
+        if (peerConsumer != null) {
+          LOG.trace("Status message exchange successful. {}", this);
+          peerConsumer.accept(this);
+        }
       }
-      callback.accept(this);
     }
   }
 
@@ -333,7 +512,7 @@ private void maybeExecuteStatusesExchangedCallback() {
    * @return true if the peer is ready to accept requests for data.
    */
   public boolean readyForRequests() {
-    return statusHasBeenSentToPeer.get() && statusHasBeenReceivedFromPeer.get();
+    return readyForRequests.get();
   }
 
   /**
@@ -341,19 +520,10 @@ public boolean readyForRequests() {
    *
    * @return true if the peer has sent its initial status message to us.
    */
-  public boolean statusHasBeenReceived() {
+  boolean statusHasBeenReceived() {
     return statusHasBeenReceivedFromPeer.get();
   }
 
-  /**
-   * Return true if we have sent a status message to this peer.
-   *
-   * @return true if we have sent a status message to this peer.
-   */
-  public boolean statusHasBeenSentToPeer() {
-    return statusHasBeenSentToPeer.get();
-  }
-
   public boolean hasSeenBlock(final Hash hash) {
     return knownBlocks.contains(hash);
   }
@@ -389,11 +559,10 @@ public void registerHeight(final Hash blockHash, final long height) {
   }
 
   public int outstandingRequests() {
-    return headersRequestManager.outstandingRequests()
-        + bodiesRequestManager.outstandingRequests()
-        + receiptsRequestManager.outstandingRequests()
-        + nodeDataRequestManager.outstandingRequests()
-        + pooledTransactionsRequestManager.outstandingRequests();
+    return requestManagers.values().stream()
+        .flatMap(m -> m.values().stream())
+        .mapToInt(RequestManager::outstandingRequests)
+        .sum();
   }
 
   public long getLastRequestTimestamp() {
@@ -416,9 +585,84 @@ public Bytes nodeId() {
     return connection.getPeerInfo().getNodeId();
   }
 
+  public boolean hasSupportForMessage(final int messageCode) {
+    return getAgreedCapabilities().stream()
+        .anyMatch(cap -> EthProtocol.get().isValidMessageCode(cap.getVersion(), messageCode));
+  }
+
   @Override
   public String toString() {
-    return nodeId().toString().substring(0, 20) + "...";
+    return String.format(
+        "PeerId %s, reputation %s, validated? %s, disconnected? %s, client: %s, connection %s, enode %s",
+        nodeId(),
+        reputation,
+        isFullyValidated(),
+        isDisconnected(),
+        connection.getPeerInfo().getClientId(),
+        connection,
+        connection.getPeer().getEnodeURLString());
+  }
+
+  @Nonnull
+  public String getShortNodeId() {
+    return nodeId().toString().substring(0, 20);
+  }
+
+  @Override
+  public int compareTo(final @Nonnull EthPeer ethPeer) {
+    final int repCompare = this.reputation.compareTo(ethPeer.reputation);
+    if (repCompare != 0) return repCompare;
+
+    final int headStateCompare =
+        Long.compare(
+            this.chainHeadState.getBestBlock().getNumber(),
+            ethPeer.chainHeadState.getBestBlock().getNumber());
+    if (headStateCompare != 0) return headStateCompare;
+
+    return getConnection().getPeerInfo().compareTo(ethPeer.getConnection().getPeerInfo());
+  }
+
+  public void setCheckpointHeader(final BlockHeader header) {
+    checkpointHeader = Optional.of(header);
+  }
+
+  public Optional<BlockHeader> getCheckpointHeader() {
+    return checkpointHeader;
+  }
+
+  public Bytes getId() {
+    return id;
+  }
+
+  /**
+   * Compares two connections to the same peer to determine which connection should be kept
+   *
+   * @param a The first connection
+   * @param b The second connection
+   * @return A negative value if {@code a} should be kept, a positive value is {@code b} should be
+   *     kept
+   */
+  private int compareDuplicateConnections(final PeerConnection a, final PeerConnection b) {
+
+    if (a.isDisconnected() != b.isDisconnected()) {
+      // One connection has failed - prioritize the one that hasn't failed
+      return a.isDisconnected() ? 1 : -1;
+    }
+
+    final Bytes peerId = a.getPeer().getId();
+    // peerId is the id of the other node
+    if (a.inboundInitiated() != b.inboundInitiated()) {
+      // If we have connections initiated in different directions, keep the connection initiated
+      // by the node with the lower id
+      if (localNodeId.compareTo(peerId) < 0) {
+        return a.inboundInitiated() ? 1 : -1;
+      } else {
+        return a.inboundInitiated() ? -1 : 1;
+      }
+    }
+    // Otherwise, keep older connection
+    LOG.trace("comparing timestamps " + a.getInitiatedAt() + " with " + b.getInitiatedAt());
+    return a.getInitiatedAt() < b.getInitiatedAt() ? -1 : 1;
   }
 
   @FunctionalInterface
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeers.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeers.java
index 02ad3a19790..da5dc4cff8a 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeers.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthPeers.java
@@ -16,89 +16,233 @@
 
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer.DisconnectCallback;
 import org.hyperledger.besu.ethereum.eth.peervalidation.PeerValidator;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.p2p.peers.Peer;
+import org.hyperledger.besu.ethereum.p2p.rlpx.RlpxAgent;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage;
 import org.hyperledger.besu.metrics.BesuMetricCategory;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.plugin.services.permissioning.NodeMessagePermissioningProvider;
 import org.hyperledger.besu.util.Subscribers;
 
 import java.time.Clock;
-import java.util.ArrayList;
+import java.time.Duration;
 import java.util.Collection;
 import java.util.Comparator;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ExecutionException;
 import java.util.function.Predicate;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.RemovalNotification;
+import org.apache.tuweni.bytes.Bytes;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class EthPeers {
+  private static final Logger LOG = LoggerFactory.getLogger(EthPeers.class);
   public static final Comparator<EthPeer> TOTAL_DIFFICULTY =
       Comparator.comparing(((final EthPeer p) -> p.chainState().getEstimatedTotalDifficulty()));
 
   public static final Comparator<EthPeer> CHAIN_HEIGHT =
       Comparator.comparing(((final EthPeer p) -> p.chainState().getEstimatedHeight()));
 
-  public static final Comparator<EthPeer> BEST_CHAIN = TOTAL_DIFFICULTY.thenComparing(CHAIN_HEIGHT);
+  public static final Comparator<EthPeer> HEAVIEST_CHAIN =
+      TOTAL_DIFFICULTY.thenComparing(CHAIN_HEIGHT);
 
   public static final Comparator<EthPeer> LEAST_TO_MOST_BUSY =
       Comparator.comparing(EthPeer::outstandingRequests)
           .thenComparing(EthPeer::getLastRequestTimestamp);
+  public static final int NODE_ID_LENGTH = 64;
+
+  private final Map<Bytes, EthPeer> completeConnections = new ConcurrentHashMap<>();
 
-  private final Map<PeerConnection, EthPeer> connections = new ConcurrentHashMap<>();
+  private final Cache<PeerConnection, EthPeer> incompleteConnections =
+      CacheBuilder.newBuilder()
+          .expireAfterWrite(Duration.ofSeconds(20L))
+          .concurrencyLevel(1)
+          .removalListener(this::onCacheRemoval)
+          .build();
   private final String protocolName;
   private final Clock clock;
+  private final List<NodeMessagePermissioningProvider> permissioningProviders;
+  private final int maxMessageSize;
   private final Subscribers<ConnectCallback> connectCallbacks = Subscribers.create();
   private final Subscribers<DisconnectCallback> disconnectCallbacks = Subscribers.create();
-  private final Collection<PendingPeerRequest> pendingRequests = new ArrayList<>();
+  private final Collection<PendingPeerRequest> pendingRequests = new CopyOnWriteArrayList<>();
+  private final int peerLowerBound;
+  private final int peerUpperBound;
+  private final int maxRemotelyInitiatedConnections;
+  private final Boolean randomPeerPriority;
+  private final Bytes nodeIdMask = Bytes.random(NODE_ID_LENGTH);
+  private final Supplier<ProtocolSpec> currentProtocolSpecSupplier;
+
+  private Comparator<EthPeer> bestPeerComparator;
+  private final Bytes localNodeId;
+  private RlpxAgent rlpxAgent;
 
-  public EthPeers(final String protocolName, final Clock clock, final MetricsSystem metricsSystem) {
+  private final Counter connectedPeersCounter;
+
+  public EthPeers(
+      final String protocolName,
+      final Supplier<ProtocolSpec> currentProtocolSpecSupplier,
+      final Clock clock,
+      final MetricsSystem metricsSystem,
+      final int maxMessageSize,
+      final List<NodeMessagePermissioningProvider> permissioningProviders,
+      final Bytes localNodeId,
+      final int peerLowerBound,
+      final int peerUpperBound,
+      final int maxRemotelyInitiatedConnections,
+      final Boolean randomPeerPriority) {
     this.protocolName = protocolName;
+    this.currentProtocolSpecSupplier = currentProtocolSpecSupplier;
     this.clock = clock;
+    this.permissioningProviders = permissioningProviders;
+    this.maxMessageSize = maxMessageSize;
+    this.bestPeerComparator = HEAVIEST_CHAIN;
+    this.localNodeId = localNodeId;
+    this.peerLowerBound = peerLowerBound;
+    this.peerUpperBound = peerUpperBound;
+    this.maxRemotelyInitiatedConnections = maxRemotelyInitiatedConnections;
+    this.randomPeerPriority = randomPeerPriority;
+    LOG.trace(
+        "MaxPeers: {}, Lower Bound: {}, Max Remote: {}",
+        peerUpperBound,
+        peerLowerBound,
+        maxRemotelyInitiatedConnections);
+    metricsSystem.createIntegerGauge(
+        BesuMetricCategory.ETHEREUM,
+        "peer_count",
+        "The current number of peers connected",
+        () -> (int) streamAvailablePeers().filter(p -> p.readyForRequests()).count());
     metricsSystem.createIntegerGauge(
         BesuMetricCategory.PEERS,
         "pending_peer_requests_current",
         "Number of peer requests currently pending because peers are busy",
         pendingRequests::size);
+    metricsSystem.createIntegerGauge(
+        BesuMetricCategory.ETHEREUM,
+        "peer_limit",
+        "The maximum number of peers this node allows to connect",
+        () -> peerUpperBound);
+    connectedPeersCounter =
+        metricsSystem.createCounter(
+            BesuMetricCategory.PEERS, "connected_total", "Total number of peers connected");
+  }
+
+  public void registerNewConnection(
+      final PeerConnection newConnection, final List<PeerValidator> peerValidators) {
+    final Bytes id = newConnection.getPeer().getId();
+    synchronized (this) {
+      EthPeer ethPeer = completeConnections.get(id);
+      if (ethPeer == null) {
+        final Optional<EthPeer> peerInList =
+            incompleteConnections.asMap().values().stream()
+                .filter(p -> p.getId().equals(id))
+                .findFirst();
+        ethPeer =
+            peerInList.orElse(
+                new EthPeer(
+                    newConnection,
+                    protocolName,
+                    this::ethPeerStatusExchanged,
+                    peerValidators,
+                    maxMessageSize,
+                    clock,
+                    permissioningProviders,
+                    localNodeId));
+      }
+      incompleteConnections.put(newConnection, ethPeer);
+    }
   }
 
-  void registerConnection(
-      final PeerConnection peerConnection, final List<PeerValidator> peerValidators) {
-    final EthPeer peer =
-        new EthPeer(
-            peerConnection, protocolName, this::invokeConnectionCallbacks, peerValidators, clock);
-    connections.putIfAbsent(peerConnection, peer);
+  public int getPeerLowerBound() {
+    return peerLowerBound;
   }
 
-  void registerDisconnect(final PeerConnection connection) {
-    final EthPeer peer = connections.remove(connection);
-    if (peer != null) {
-      disconnectCallbacks.forEach(callback -> callback.onDisconnect(peer));
-      peer.handleDisconnect();
-      abortPendingRequestsAssignedToDisconnectedPeers();
+  @NotNull
+  private List<PeerConnection> getIncompleteConnections(final Bytes id) {
+    return incompleteConnections.asMap().keySet().stream()
+        .filter(nrc -> nrc.getPeer().getId().equals(id))
+        .collect(Collectors.toList());
+  }
+
+  public boolean registerDisconnect(final PeerConnection connection) {
+    final Bytes id = connection.getPeer().getId();
+    final EthPeer peer = completeConnections.get(id);
+    return registerDisconnect(id, peer, connection);
+  }
+
+  private boolean registerDisconnect(
+      final Bytes id, final EthPeer peer, final PeerConnection connection) {
+    incompleteConnections.invalidate(connection);
+    boolean removed = false;
+    if (peer != null && peer.getConnection().equals(connection)) {
+      if (!peerHasIncompleteConnection(id)) {
+        removed = completeConnections.remove(id, peer);
+        disconnectCallbacks.forEach(callback -> callback.onDisconnect(peer));
+        peer.handleDisconnect();
+        abortPendingRequestsAssignedToDisconnectedPeers();
+        LOG.debug("Disconnected EthPeer {}", peer);
+      }
     }
     reattemptPendingPeerRequests();
+    return removed;
+  }
+
+  private boolean peerHasIncompleteConnection(final Bytes id) {
+    return getIncompleteConnections(id).stream().anyMatch(conn -> !conn.isDisconnected());
   }
 
   private void abortPendingRequestsAssignedToDisconnectedPeers() {
     synchronized (this) {
-      pendingRequests.stream()
-          .filter(
-              pendingPeerRequest ->
-                  pendingPeerRequest.getAssignedPeer().map(EthPeer::isDisconnected).orElse(false))
-          .forEach(PendingPeerRequest::abort);
+      for (final PendingPeerRequest request : pendingRequests) {
+        if (request.getAssignedPeer().map(EthPeer::isDisconnected).orElse(false)) {
+          request.abort();
+        }
+      }
+    }
+  }
+
+  public EthPeer peer(final PeerConnection connection) {
+    try {
+      return incompleteConnections.get(
+          connection, () -> completeConnections.get(connection.getPeer().getId()));
+    } catch (final ExecutionException e) {
+      throw new RuntimeException(e);
     }
   }
 
-  public EthPeer peer(final PeerConnection peerConnection) {
-    return connections.get(peerConnection);
+  public EthPeer peer(final Bytes peerId) {
+    return completeConnections.get(peerId);
   }
 
   public PendingPeerRequest executePeerRequest(
       final PeerRequest request, final long minimumBlockNumber, final Optional<EthPeer> peer) {
+    final long actualMinBlockNumber;
+    if (minimumBlockNumber > 0 && currentProtocolSpecSupplier.get().isPoS()) {
+      // if on PoS do not enforce a min block number, since the estimated chain height of the remote
+      // peer is not updated anymore.
+      actualMinBlockNumber = 0;
+    } else {
+      actualMinBlockNumber = minimumBlockNumber;
+    }
     final PendingPeerRequest pendingPeerRequest =
-        new PendingPeerRequest(this, request, minimumBlockNumber, peer);
+        new PendingPeerRequest(this, request, actualMinBlockNumber, peer);
     synchronized (this) {
       if (!pendingPeerRequest.attemptExecution()) {
         pendingRequests.add(pendingPeerRequest);
@@ -107,16 +251,29 @@ public PendingPeerRequest executePeerRequest(
     return pendingPeerRequest;
   }
 
-  public void dispatchMessage(final EthPeer peer, final EthMessage ethMessage) {
-    peer.dispatch(ethMessage);
-    if (peer.hasAvailableRequestCapacity()) {
+  public void dispatchMessage(
+      final EthPeer peer, final EthMessage ethMessage, final String protocolName) {
+    final Optional<RequestManager> maybeRequestManager = peer.dispatch(ethMessage, protocolName);
+    if (maybeRequestManager.isPresent() && peer.hasAvailableRequestCapacity()) {
       reattemptPendingPeerRequests();
     }
   }
 
-  private void reattemptPendingPeerRequests() {
+  public void dispatchMessage(final EthPeer peer, final EthMessage ethMessage) {
+    dispatchMessage(peer, ethMessage, protocolName);
+  }
+
+  @VisibleForTesting
+  void reattemptPendingPeerRequests() {
     synchronized (this) {
-      pendingRequests.removeIf(PendingPeerRequest::attemptExecution);
+      final List<EthPeer> peers = streamAvailablePeers().collect(Collectors.toList());
+      final Iterator<PendingPeerRequest> iterator = pendingRequests.iterator();
+      while (iterator.hasNext() && peers.stream().anyMatch(EthPeer::hasAvailableRequestCapacity)) {
+        final PendingPeerRequest request = iterator.next();
+        if (request.attemptExecution()) {
+          pendingRequests.remove(request);
+        }
+      }
     }
   }
 
@@ -133,31 +290,113 @@ public void subscribeDisconnect(final DisconnectCallback callback) {
   }
 
   public int peerCount() {
-    return connections.size();
+    removeDisconnectedPeers();
+    return completeConnections.size();
+  }
+
+  public int getMaxPeers() {
+    return peerUpperBound;
   }
 
   public Stream<EthPeer> streamAllPeers() {
-    return connections.values().stream();
+    return completeConnections.values().stream();
+  }
+
+  private void removeDisconnectedPeers() {
+    completeConnections
+        .values()
+        .forEach(
+            ep -> {
+              if (ep.isDisconnected()) {
+                registerDisconnect(ep.getId(), ep, ep.getConnection());
+              }
+            });
   }
 
   public Stream<EthPeer> streamAvailablePeers() {
-    return streamAllPeers().filter(EthPeer::readyForRequests);
+    return streamAllPeers()
+        .filter(EthPeer::readyForRequests)
+        .filter(peer -> !peer.isDisconnected());
   }
 
   public Stream<EthPeer> streamBestPeers() {
-    return streamAvailablePeers().sorted(BEST_CHAIN.reversed());
+    return streamAvailablePeers().sorted(getBestChainComparator().reversed());
   }
 
   public Optional<EthPeer> bestPeer() {
-    return streamAvailablePeers().max(BEST_CHAIN);
+    return streamAvailablePeers().max(getBestChainComparator());
   }
 
   public Optional<EthPeer> bestPeerWithHeightEstimate() {
-    return bestPeerMatchingCriteria(p -> p.chainState().hasEstimatedHeight());
+    return bestPeerMatchingCriteria(
+        p -> p.isFullyValidated() && p.chainState().hasEstimatedHeight());
   }
 
   public Optional<EthPeer> bestPeerMatchingCriteria(final Predicate<EthPeer> matchesCriteria) {
-    return streamAvailablePeers().filter(matchesCriteria::test).max(BEST_CHAIN);
+    return streamAvailablePeers().filter(matchesCriteria).max(getBestChainComparator());
+  }
+
+  public void setBestChainComparator(final Comparator<EthPeer> comparator) {
+    LOG.info("Updating the default best peer comparator");
+    bestPeerComparator = comparator;
+  }
+
+  public Comparator<EthPeer> getBestChainComparator() {
+    return bestPeerComparator;
+  }
+
+  public void setRlpxAgent(final RlpxAgent rlpxAgent) {
+    this.rlpxAgent = rlpxAgent;
+  }
+
+  public Stream<PeerConnection> getAllActiveConnections() {
+    return completeConnections.values().stream()
+        .map(EthPeer::getConnection)
+        .filter(c -> !c.isDisconnected());
+  }
+
+  public Stream<PeerConnection> getAllConnections() {
+    return Stream.concat(
+            completeConnections.values().stream().map(EthPeer::getConnection),
+            incompleteConnections.asMap().keySet().stream())
+        .distinct()
+        .filter(c -> !c.isDisconnected());
+  }
+
+  public boolean shouldConnect(final Peer peer, final boolean inbound) {
+    if (peerCount() >= peerUpperBound) {
+      return false;
+    }
+    final Bytes id = peer.getId();
+    final EthPeer ethPeer = completeConnections.get(id);
+    if (ethPeer != null && !ethPeer.isDisconnected()) {
+      return false;
+    }
+    final List<PeerConnection> incompleteConnections = getIncompleteConnections(id);
+    if (!incompleteConnections.isEmpty()) {
+      if (incompleteConnections.stream()
+          .anyMatch(c -> !c.isDisconnected() && (!inbound || (inbound && c.inboundInitiated())))) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  public void disconnectWorstUselessPeer() {
+    streamAvailablePeers()
+        .sorted(getBestChainComparator())
+        .findFirst()
+        .ifPresent(
+            peer -> {
+              LOG.atDebug()
+                  .setMessage(
+                      "disconnecting peer {}. Waiting for better peers. Current {} of max {}")
+                  .addArgument(peer)
+                  .addArgument(this::peerCount)
+                  .addArgument(this::getMaxPeers)
+                  .log();
+              peer.disconnect(DisconnectMessage.DisconnectReason.USELESS_PEER);
+            });
   }
 
   @FunctionalInterface
@@ -167,12 +406,173 @@ public interface ConnectCallback {
 
   @Override
   public String toString() {
+    if (completeConnections.isEmpty()) {
+      return "0 EthPeers {}";
+    }
     final String connectionsList =
-        connections.values().stream().map(EthPeer::toString).collect(Collectors.joining(","));
-    return "EthPeers{connections=" + connectionsList + '}';
+        completeConnections.values().stream()
+            .sorted()
+            .map(EthPeer::toString)
+            .collect(Collectors.joining(", \n"));
+    return completeConnections.size() + " EthPeers {\n" + connectionsList + '}';
+  }
+
+  private void ethPeerStatusExchanged(final EthPeer peer) {
+    if (addPeerToEthPeers(peer)) {
+      connectedPeersCounter.inc();
+      connectCallbacks.forEach(cb -> cb.onPeerConnected(peer));
+    }
+  }
+
+  private int comparePeerPriorities(final EthPeer p1, final EthPeer p2) {
+    final PeerConnection a = p1.getConnection();
+    final PeerConnection b = p2.getConnection();
+    final boolean aCanExceedPeerLimits = canExceedPeerLimits(a);
+    final boolean bCanExceedPeerLimits = canExceedPeerLimits(b);
+    if (aCanExceedPeerLimits && !bCanExceedPeerLimits) {
+      return -1;
+    } else if (bCanExceedPeerLimits && !aCanExceedPeerLimits) {
+      return 1;
+    } else {
+      return randomPeerPriority
+          ? compareByMaskedNodeId(a, b)
+          : compareConnectionInitiationTimes(a, b);
+    }
+  }
+
+  private boolean canExceedPeerLimits(final PeerConnection a) {
+    if (rlpxAgent == null) {
+      return true;
+    }
+    return rlpxAgent.canExceedConnectionLimits(a.getPeer());
+  }
+
+  private int compareConnectionInitiationTimes(final PeerConnection a, final PeerConnection b) {
+    return Math.toIntExact(a.getInitiatedAt() - b.getInitiatedAt());
+  }
+
+  private int compareByMaskedNodeId(final PeerConnection a, final PeerConnection b) {
+    return a.getPeer().getId().xor(nodeIdMask).compareTo(b.getPeer().getId().xor(nodeIdMask));
+  }
+
+  private void enforceRemoteConnectionLimits() {
+    if (!shouldLimitRemoteConnections() || peerCount() < maxRemotelyInitiatedConnections) {
+      // Nothing to do
+      return;
+    }
+
+    getActivePrioritizedPeers()
+        .filter(p -> p.getConnection().inboundInitiated())
+        .filter(p -> !canExceedPeerLimits(p.getConnection()))
+        .skip(maxRemotelyInitiatedConnections)
+        .forEach(
+            conn -> {
+              LOG.trace(
+                  "Too many remotely initiated connections. Disconnect low-priority connection: {}, maxRemote={}",
+                  conn,
+                  maxRemotelyInitiatedConnections);
+              conn.disconnect(DisconnectMessage.DisconnectReason.TOO_MANY_PEERS);
+            });
+  }
+
+  private Stream<EthPeer> getActivePrioritizedPeers() {
+    return completeConnections.values().stream()
+        .filter(p -> !p.isDisconnected())
+        .sorted(this::comparePeerPriorities);
+  }
+
+  private void enforceConnectionLimits() {
+    if (peerCount() < peerUpperBound) {
+      // Nothing to do - we're under our limits
+      return;
+    }
+    getActivePrioritizedPeers()
+        .filter(p -> !p.isDisconnected())
+        .skip(peerUpperBound)
+        .map(EthPeer::getConnection)
+        .filter(c -> !canExceedPeerLimits(c))
+        .forEach(
+            conn -> {
+              LOG.trace(
+                  "Too many connections. Disconnect low-priority connection: {}, maxConnections={}",
+                  conn,
+                  peerUpperBound);
+              conn.disconnect(DisconnectMessage.DisconnectReason.TOO_MANY_PEERS);
+            });
+  }
+
+  private boolean remoteConnectionLimitReached() {
+    return shouldLimitRemoteConnections()
+        && countUntrustedRemotelyInitiatedConnections() >= maxRemotelyInitiatedConnections;
+  }
+
+  private boolean shouldLimitRemoteConnections() {
+    return maxRemotelyInitiatedConnections < peerUpperBound;
   }
 
-  private void invokeConnectionCallbacks(final EthPeer peer) {
-    connectCallbacks.forEach(cb -> cb.onPeerConnected(peer));
+  private long countUntrustedRemotelyInitiatedConnections() {
+    return completeConnections.values().stream()
+        .map(ep -> ep.getConnection())
+        .filter(c -> c.inboundInitiated())
+        .filter(c -> !c.isDisconnected())
+        .filter(conn -> !canExceedPeerLimits(conn))
+        .count();
+  }
+
+  private void onCacheRemoval(
+      final RemovalNotification<PeerConnection, EthPeer> removalNotification) {
+    if (removalNotification.wasEvicted()) {
+      final PeerConnection peerConnectionRemoved = removalNotification.getKey();
+      final PeerConnection peerConnectionOfEthPeer = removalNotification.getValue().getConnection();
+      if (!peerConnectionRemoved.equals(peerConnectionOfEthPeer)) {
+        // If this connection is not the connection of the EthPeer by now we can disconnect
+        peerConnectionRemoved.disconnect(DisconnectMessage.DisconnectReason.ALREADY_CONNECTED);
+      }
+    }
+  }
+
+  private boolean addPeerToEthPeers(final EthPeer peer) {
+    // We have a connection to a peer that is on the right chain and is willing to connect to us.
+    // Figure out whether we want to keep this peer and add it to the EthPeers connections.
+    if (completeConnections.containsValue(peer)) {
+      return false;
+    }
+    final PeerConnection connection = peer.getConnection();
+    final Bytes id = peer.getId();
+    if (!randomPeerPriority) {
+      // Disconnect if too many peers
+      if (!canExceedPeerLimits(connection) && peerCount() >= peerUpperBound) {
+        LOG.trace(
+            "Too many peers. Disconnect connection: {}, max connections {}",
+            connection,
+            peerUpperBound);
+        connection.disconnect(DisconnectMessage.DisconnectReason.TOO_MANY_PEERS);
+        return false;
+      }
+      // Disconnect if too many remotely-initiated connections
+      if (connection.inboundInitiated()
+          && !canExceedPeerLimits(connection)
+          && remoteConnectionLimitReached()) {
+        LOG.trace(
+            "Too many remotely-initiated connections. Disconnect incoming connection: {}, maxRemote={}",
+            connection,
+            maxRemotelyInitiatedConnections);
+        connection.disconnect(DisconnectMessage.DisconnectReason.TOO_MANY_PEERS);
+        return false;
+      }
+      final boolean added = (completeConnections.putIfAbsent(id, peer) == null);
+      if (added) {
+        LOG.trace("Added peer {} with connection {} to completeConnections", id, connection);
+      } else {
+        LOG.trace("Did not add peer {} with connection {} to completeConnections", id, connection);
+      }
+      return added;
+    } else {
+      // randomPeerPriority! Add the peer and if there are too many connections fix it
+      completeConnections.putIfAbsent(id, peer);
+      enforceRemoteConnectionLimits();
+      enforceConnectionLimits();
+      return completeConnections.containsKey(id);
+    }
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolLogger.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolLogger.java
new file mode 100644
index 00000000000..0b57488b193
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolLogger.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright Contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.manager;
+
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class EthProtocolLogger {
+  private static final Logger LOG = LoggerFactory.getLogger(EthProtocolLogger.class);
+
+  public static void logProcessMessage(final Capability cap, final int code) {
+    LOG.trace("Process message {}, {}", cap, code);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManager.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManager.java
index 352c22631e7..76db3bf2d29 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManager.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright contributors to Hyperledger Besu
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -16,11 +16,11 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.chain.MinedBlockObserver;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.eth.EthProtocol;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
 import org.hyperledger.besu.ethereum.eth.messages.EthPV62;
@@ -28,30 +28,41 @@
 import org.hyperledger.besu.ethereum.eth.peervalidation.PeerValidator;
 import org.hyperledger.besu.ethereum.eth.peervalidation.PeerValidatorRunner;
 import org.hyperledger.besu.ethereum.eth.sync.BlockBroadcaster;
+import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
+import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.forkid.ForkId;
+import org.hyperledger.besu.ethereum.forkid.ForkIdManager;
 import org.hyperledger.besu.ethereum.p2p.network.ProtocolManager;
+import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
 import org.hyperledger.besu.ethereum.rlp.RLPException;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableList;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class EthProtocolManager implements ProtocolManager, MinedBlockObserver {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(EthProtocolManager.class);
 
   private final EthScheduler scheduler;
   private final CountDownLatch shutdown;
@@ -67,6 +78,7 @@ public class EthProtocolManager implements ProtocolManager, MinedBlockObserver {
   private final Blockchain blockchain;
   private final BlockBroadcaster blockBroadcaster;
   private final List<PeerValidator> peerValidators;
+  private final Optional<MergePeerFilter> mergePeerFilter;
 
   public EthProtocolManager(
       final Blockchain blockchain,
@@ -78,16 +90,17 @@ public EthProtocolManager(
       final EthMessages ethMessages,
       final EthContext ethContext,
       final List<PeerValidator> peerValidators,
-      final boolean fastSyncEnabled,
+      final Optional<MergePeerFilter> mergePeerFilter,
+      final SynchronizerConfiguration synchronizerConfiguration,
       final EthScheduler scheduler,
       final ForkIdManager forkIdManager) {
     this.networkId = networkId;
     this.peerValidators = peerValidators;
     this.scheduler = scheduler;
     this.blockchain = blockchain;
-
+    this.mergePeerFilter = mergePeerFilter;
     this.shutdown = new CountDownLatch(1);
-    genesisHash = blockchain.getBlockHashByNumber(0L).get();
+    this.genesisHash = blockchain.getBlockHashByNumber(0L).orElse(Hash.ZERO);
 
     this.forkIdManager = forkIdManager;
 
@@ -98,7 +111,7 @@ public EthProtocolManager(
     this.blockBroadcaster = new BlockBroadcaster(ethContext);
 
     supportedCapabilities =
-        calculateCapabilities(fastSyncEnabled, ethereumWireProtocolConfiguration.isEth65Enabled());
+        calculateCapabilities(synchronizerConfiguration, ethereumWireProtocolConfiguration);
 
     // Run validators
     for (final PeerValidator peerValidator : this.peerValidators) {
@@ -125,7 +138,8 @@ public EthProtocolManager(
       final EthMessages ethMessages,
       final EthContext ethContext,
       final List<PeerValidator> peerValidators,
-      final boolean fastSyncEnabled,
+      final Optional<MergePeerFilter> mergePeerFilter,
+      final SynchronizerConfiguration synchronizerConfiguration,
       final EthScheduler scheduler) {
     this(
         blockchain,
@@ -137,11 +151,13 @@ public EthProtocolManager(
         ethMessages,
         ethContext,
         peerValidators,
-        fastSyncEnabled,
+        mergePeerFilter,
+        synchronizerConfiguration,
         scheduler,
         new ForkIdManager(
             blockchain,
             Collections.emptyList(),
+            Collections.emptyList(),
             ethereumWireProtocolConfiguration.isLegacyEth64ForkIdEnabled()));
   }
 
@@ -155,9 +171,11 @@ public EthProtocolManager(
       final EthMessages ethMessages,
       final EthContext ethContext,
       final List<PeerValidator> peerValidators,
-      final boolean fastSyncEnabled,
+      final Optional<MergePeerFilter> mergePeerFilter,
+      final SynchronizerConfiguration synchronizerConfiguration,
       final EthScheduler scheduler,
-      final List<Long> forks) {
+      final List<Long> blockNumberForks,
+      final List<Long> timestampForks) {
     this(
         blockchain,
         networkId,
@@ -168,10 +186,14 @@ public EthProtocolManager(
         ethMessages,
         ethContext,
         peerValidators,
-        fastSyncEnabled,
+        mergePeerFilter,
+        synchronizerConfiguration,
         scheduler,
         new ForkIdManager(
-            blockchain, forks, ethereumWireProtocolConfiguration.isLegacyEth64ForkIdEnabled()));
+            blockchain,
+            blockNumberForks,
+            timestampForks,
+            ethereumWireProtocolConfiguration.isLegacyEth64ForkIdEnabled()));
   }
 
   public EthContext ethContext() {
@@ -188,18 +210,38 @@ public String getSupportedProtocol() {
   }
 
   private List<Capability> calculateCapabilities(
-      final boolean fastSyncEnabled, final boolean eth65Enabled) {
-    final ImmutableList.Builder<Capability> capabilities = ImmutableList.builder();
-    if (!fastSyncEnabled) {
+      final SynchronizerConfiguration synchronizerConfiguration,
+      final EthProtocolConfiguration ethProtocolConfiguration) {
+    final List<Capability> capabilities = new ArrayList<>();
+
+    if (SyncMode.isFullSync(synchronizerConfiguration.getSyncMode())) {
       capabilities.add(EthProtocol.ETH62);
     }
     capabilities.add(EthProtocol.ETH63);
     capabilities.add(EthProtocol.ETH64);
-    if (eth65Enabled) {
-      capabilities.add(EthProtocol.ETH65);
+    capabilities.add(EthProtocol.ETH65);
+    capabilities.add(EthProtocol.ETH66);
+
+    // Version 67 removes the GetNodeData and NodeData
+    // Fast sync depends on GetNodeData and NodeData
+    // see https://eips.ethereum.org/EIPS/eip-4938
+    if (!Objects.equals(SyncMode.FAST, synchronizerConfiguration.getSyncMode())) {
+      capabilities.add(EthProtocol.ETH67);
+      capabilities.add(EthProtocol.ETH68);
     }
 
-    return capabilities.build();
+    capabilities.removeIf(cap -> cap.getVersion() > ethProtocolConfiguration.getMaxEthCapability());
+    capabilities.removeIf(cap -> cap.getVersion() < ethProtocolConfiguration.getMinEthCapability());
+
+    return Collections.unmodifiableList(capabilities);
+  }
+
+  @Override
+  public int getHighestProtocolVersion() {
+    return getSupportedCapabilities().stream()
+        .max(Comparator.comparing(Capability::getVersion))
+        .map(Capability::getVersion)
+        .orElse(0);
   }
 
   @Override
@@ -230,53 +272,93 @@ public void processMessage(final Capability cap, final Message message) {
     checkArgument(
         getSupportedCapabilities().contains(cap),
         "Unsupported capability passed to processMessage(): " + cap);
-    LOG.trace("Process message {}, {}", cap, message.getData().getCode());
-    final EthPeer peer = ethPeers.peer(message.getConnection());
-    if (peer == null) {
+    final MessageData messageData = message.getData();
+    final int code = messageData.getCode();
+    EthProtocolLogger.logProcessMessage(cap, code);
+    final EthPeer ethPeer = ethPeers.peer(message.getConnection());
+    if (ethPeer == null) {
       LOG.debug(
-          "Ignoring message received from unknown peer connection: " + message.getConnection());
+          "Ignoring message received from unknown peer connection: {}", message.getConnection());
       return;
     }
 
     // Handle STATUS processing
-    if (message.getData().getCode() == EthPV62.STATUS) {
-      handleStatusMessage(peer, message.getData());
+    if (code == EthPV62.STATUS) {
+      handleStatusMessage(ethPeer, message);
       return;
-    } else if (!peer.statusHasBeenReceived()) {
+    } else if (!ethPeer.statusHasBeenReceived()) {
       // Peers are required to send status messages before any other message type
       LOG.debug(
-          "{} requires a Status ({}) message to be sent first.  Instead, received message {}.  Disconnecting from {}.",
+          "{} requires a Status ({}) message to be sent first.  Instead, received message {} (BREACH_OF_PROTOCOL).  Disconnecting from {}.",
           this.getClass().getSimpleName(),
           EthPV62.STATUS,
-          message.getData().getCode(),
-          peer);
-      peer.disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
+          code,
+          ethPeer);
+      ethPeer.disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
       return;
     }
 
-    // Dispatch eth message
-    final EthMessage ethMessage = new EthMessage(peer, message.getData());
-    if (!peer.validateReceivedMessage(ethMessage)) {
-      LOG.debug("Unsolicited message received from, disconnecting: {}", peer);
-      peer.disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
+    if (this.mergePeerFilter.isPresent()) {
+      if (this.mergePeerFilter.get().disconnectIfGossipingBlocks(message, ethPeer)) {
+        LOG.debug("Post-merge disconnect: peer still gossiping blocks {}", ethPeer);
+        handleDisconnect(ethPeer.getConnection(), DisconnectReason.SUBPROTOCOL_TRIGGERED, false);
+        return;
+      }
+    }
+
+    final EthMessage ethMessage = new EthMessage(ethPeer, messageData);
+
+    if (!ethPeer.validateReceivedMessage(ethMessage, getSupportedProtocol())) {
+      LOG.debug(
+          "Unsolicited message received (BREACH_OF_PROTOCOL), disconnecting from EthPeer: {}",
+          ethPeer);
+      ethPeer.disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
       return;
     }
-    ethPeers.dispatchMessage(peer, ethMessage);
-    ethMessages.dispatch(ethMessage);
+
+    // This will handle responses
+    ethPeers.dispatchMessage(ethPeer, ethMessage, getSupportedProtocol());
+
+    // This will handle requests
+    Optional<MessageData> maybeResponseData = Optional.empty();
+    try {
+      if (EthProtocol.isEth66Compatible(cap) && EthProtocol.requestIdCompatible(code)) {
+        final Map.Entry<BigInteger, MessageData> requestIdAndEthMessage =
+            ethMessage.getData().unwrapMessageData();
+        maybeResponseData =
+            ethMessages
+                .dispatch(new EthMessage(ethPeer, requestIdAndEthMessage.getValue()))
+                .map(responseData -> responseData.wrapMessageData(requestIdAndEthMessage.getKey()));
+      } else {
+        maybeResponseData = ethMessages.dispatch(ethMessage);
+      }
+    } catch (final RLPException e) {
+      LOG.debug(
+          "Received malformed message {} (BREACH_OF_PROTOCOL), disconnecting: {}",
+          messageData.getData(),
+          ethPeer,
+          e);
+
+      ethPeer.disconnect(DisconnectMessage.DisconnectReason.BREACH_OF_PROTOCOL);
+    }
+    maybeResponseData.ifPresent(
+        responseData -> {
+          try {
+            ethPeer.send(responseData, getSupportedProtocol());
+          } catch (final PeerNotConnected __) {
+            // Peer disconnected before we could respond - nothing to do
+          }
+        });
   }
 
   @Override
   public void handleNewConnection(final PeerConnection connection) {
-    ethPeers.registerConnection(connection, peerValidators);
+    ethPeers.registerNewConnection(connection, peerValidators);
     final EthPeer peer = ethPeers.peer(connection);
-    if (peer.statusHasBeenSentToPeer()) {
-      return;
-    }
 
     final Capability cap = connection.capability(getSupportedProtocol());
-    final ForkId latestForkId = cap.getVersion() >= 64 ? forkIdManager.computeForkId() : null;
-    // TODO: look to consolidate code below if possible
-    // making status non-final and implementing it above would be one way.
+    final ForkId latestForkId =
+        cap.getVersion() >= 64 ? forkIdManager.getForkIdForChainHead() : null;
     final StatusMessage status =
         StatusMessage.create(
             cap.getVersion(),
@@ -286,12 +368,26 @@ public void handleNewConnection(final PeerConnection connection) {
             genesisHash,
             latestForkId);
     try {
-      LOG.debug("Sending status message to {}.", peer);
-      peer.send(status);
-      peer.registerStatusSent();
+      LOG.trace("Sending status message to {} for connection {}.", peer.getId(), connection);
+      peer.send(status, getSupportedProtocol(), connection);
+      peer.registerStatusSent(connection);
     } catch (final PeerNotConnected peerNotConnected) {
       // Nothing to do.
     }
+    LOG.trace("{}", ethPeers);
+  }
+
+  @Override
+  public boolean shouldConnect(final Peer peer, final boolean incoming) {
+    if (peer.getForkId().map(forkId -> forkIdManager.peerCheck(forkId)).orElse(true)) {
+      LOG.trace("ForkId OK or not available");
+      if (ethPeers.shouldConnect(peer, incoming)) {
+        LOG.trace("EthPeers should connect is TRUE");
+        return true;
+      }
+    }
+    LOG.trace("Should connect in EthProtocolManager returns false");
+    return false;
   }
 
   @Override
@@ -299,48 +395,58 @@ public void handleDisconnect(
       final PeerConnection connection,
       final DisconnectReason reason,
       final boolean initiatedByPeer) {
-    ethPeers.registerDisconnect(connection);
-    if (initiatedByPeer) {
+    if (ethPeers.registerDisconnect(connection)) {
       LOG.debug(
-          "Peer requested to be disconnected ({}), {} peers left: {}",
-          reason,
-          ethPeers.peerCount(),
-          ethPeers);
-    } else {
-      LOG.debug(
-          "Disconnecting from peer ({}), {} peers left: {}",
+          "Disconnect - {} - {} - {} - {} peers left\n{}",
+          initiatedByPeer ? "Inbound" : "Outbound",
           reason,
+          connection.getPeer().getId(),
           ethPeers.peerCount(),
           ethPeers);
     }
   }
 
-  private void handleStatusMessage(final EthPeer peer, final MessageData data) {
-    final StatusMessage status = StatusMessage.readFrom(data);
+  private void handleStatusMessage(final EthPeer peer, final Message message) {
+    final StatusMessage status = StatusMessage.readFrom(message.getData());
+    final ForkId forkId = status.forkId();
+    peer.getConnection().getPeer().setForkId(forkId);
     try {
       if (!status.networkId().equals(networkId)) {
-        LOG.debug("Disconnecting from peer with mismatched network id: {}", status.networkId());
+        LOG.debug("Mismatched network id: {}, EthPeer {}", status.networkId(), peer);
         peer.disconnect(DisconnectReason.SUBPROTOCOL_TRIGGERED);
-      } else if (!forkIdManager.peerCheck(status.forkId()) && status.protocolVersion() > 63) {
+      } else if (!forkIdManager.peerCheck(forkId) && status.protocolVersion() > 63) {
         LOG.debug(
-            "Disconnecting from peer with matching network id ({}), but non-matching fork id: {}",
+            "{} has matching network id ({}), but non-matching fork id: {}",
+            peer,
             networkId,
-            status.forkId());
+            forkId);
         peer.disconnect(DisconnectReason.SUBPROTOCOL_TRIGGERED);
       } else if (forkIdManager.peerCheck(status.genesisHash())) {
         LOG.debug(
-            "Disconnecting from peer with matching network id ({}), but non-matching genesis hash: {}",
+            "{} has matching network id ({}), but non-matching genesis hash: {}",
+            peer,
             networkId,
             status.genesisHash());
         peer.disconnect(DisconnectReason.SUBPROTOCOL_TRIGGERED);
+      } else if (mergePeerFilter.isPresent()
+          && mergePeerFilter.get().disconnectIfPoW(status, peer)) {
+        LOG.debug("Post-merge disconnect: peer still PoW {}", peer);
+        handleDisconnect(peer.getConnection(), DisconnectReason.SUBPROTOCOL_TRIGGERED, false);
       } else {
-        LOG.debug("Received status message from {}: {}", peer, status);
+        LOG.debug(
+            "Received status message from {}: {} with connection {}",
+            peer,
+            status,
+            message.getConnection());
         peer.registerStatusReceived(
-            status.bestHash(), status.totalDifficulty(), status.protocolVersion());
+            status.bestHash(),
+            status.totalDifficulty(),
+            status.protocolVersion(),
+            message.getConnection());
       }
     } catch (final RLPException e) {
-      LOG.debug("Unable to parse status message, disconnecting from peer.", e);
-      // Parsing errors can happen when clients broadcast network ids outside of the int range,
+      LOG.debug("Unable to parse status message from peer {}.", peer, e);
+      // Parsing errors can happen when clients broadcast network ids outside the int range,
       // So just disconnect with "subprotocol" error rather than "breach of protocol".
       peer.disconnect(DisconnectReason.SUBPROTOCOL_TRIGGERED);
     }
@@ -358,4 +464,11 @@ public void blockMined(final Block block) {
                         "Unable to get total difficulty from blockchain for mined block."));
     blockBroadcaster.propagate(block, totalDifficulty);
   }
+
+  public List<Bytes> getForkIdAsBytesList() {
+    final ForkId chainHeadForkId = forkIdManager.getForkIdForChainHead();
+    return chainHeadForkId == null
+        ? Collections.emptyList()
+        : chainHeadForkId.getForkIdAsBytesList();
+  }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthScheduler.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthScheduler.java
index 54b99ff43ba..91818b9f5e2 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthScheduler.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthScheduler.java
@@ -37,16 +37,16 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class EthScheduler {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(EthScheduler.class);
 
   private final Duration defaultTimeout = Duration.ofSeconds(5);
   private final AtomicBoolean stopped = new AtomicBoolean(false);
   private final CountDownLatch shutdown = new CountDownLatch(1);
-  private static final int TX_WORKER_CAPACITY = 1000000;
+  private static final int TX_WORKER_CAPACITY = 1_000;
 
   protected final ExecutorService syncWorkerExecutor;
   protected final ScheduledExecutorService scheduler;
@@ -72,18 +72,20 @@ public EthScheduler(
       final MetricsSystem metricsSystem) {
     this(
         MonitoredExecutors.newFixedThreadPool(
-            EthScheduler.class.getSimpleName() + "-Workers", syncWorkerCount, metricsSystem),
+            EthScheduler.class.getSimpleName() + "-Workers", 1, syncWorkerCount, metricsSystem),
         MonitoredExecutors.newScheduledThreadPool(
             EthScheduler.class.getSimpleName() + "-Timer", 1, metricsSystem),
         MonitoredExecutors.newBoundedThreadPool(
             EthScheduler.class.getSimpleName() + "-Transactions",
+            1,
             txWorkerCount,
             txWorkerQueueSize,
             metricsSystem),
         MonitoredExecutors.newCachedThreadPool(
             EthScheduler.class.getSimpleName() + "-Services", metricsSystem),
-        MonitoredExecutors.newFixedThreadPool(
+        MonitoredExecutors.newBoundedThreadPool(
             EthScheduler.class.getSimpleName() + "-Computation",
+            1,
             computationWorkerCount,
             metricsSystem));
   }
@@ -177,7 +179,7 @@ public CompletableFuture<Void> scheduleFutureTask(
   public ScheduledFuture<?> scheduleFutureTaskWithFixedDelay(
       final Runnable command, final Duration initialDelay, final Duration duration) {
     return scheduler.scheduleWithFixedDelay(
-        command::run, initialDelay.toMillis(), duration.toMillis(), TimeUnit.MILLISECONDS);
+        command, initialDelay.toMillis(), duration.toMillis(), TimeUnit.MILLISECONDS);
   }
 
   public <T> CompletableFuture<T> scheduleFutureTask(
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthServer.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthServer.java
index 2455aac9894..03301803da6 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthServer.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/EthServer.java
@@ -14,10 +14,10 @@
  */
 package org.hyperledger.besu.ethereum.eth.manager;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
@@ -35,26 +35,18 @@
 import org.hyperledger.besu.ethereum.eth.messages.PooledTransactionsMessage;
 import org.hyperledger.besu.ethereum.eth.messages.ReceiptsMessage;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
-import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
-import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
-import org.hyperledger.besu.ethereum.rlp.RLPException;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
-import com.google.common.collect.Lists;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
 
 class EthServer {
-  private static final Logger LOG = LogManager.getLogger();
-
   private final Blockchain blockchain;
   private final WorldStateArchive worldStateArchive;
   private final TransactionPool transactionPool;
@@ -72,116 +64,67 @@ class EthServer {
     this.transactionPool = transactionPool;
     this.ethMessages = ethMessages;
     this.ethereumWireProtocolConfiguration = ethereumWireProtocolConfiguration;
-    this.setupListeners();
-  }
-
-  private void setupListeners() {
-    ethMessages.subscribe(EthPV62.GET_BLOCK_HEADERS, this::handleGetBlockHeaders);
-    ethMessages.subscribe(EthPV62.GET_BLOCK_BODIES, this::handleGetBlockBodies);
-    ethMessages.subscribe(EthPV63.GET_RECEIPTS, this::handleGetReceipts);
-    ethMessages.subscribe(EthPV63.GET_NODE_DATA, this::handleGetNodeData);
-    if (ethereumWireProtocolConfiguration.isEth65Enabled()) {
-      ethMessages.subscribe(EthPV65.GET_POOLED_TRANSACTIONS, this::handleGetPooledTransactions);
-    }
-  }
-
-  private void handleGetBlockHeaders(final EthMessage message) {
-    LOG.trace("Responding to GET_BLOCK_HEADERS request");
-    try {
-      final MessageData response =
-          constructGetHeadersResponse(
-              blockchain,
-              message.getData(),
-              ethereumWireProtocolConfiguration.getMaxGetBlockHeaders());
-      message.getPeer().send(response);
-    } catch (final RLPException e) {
-      LOG.debug(
-          "Received malformed GET_BLOCK_HEADERS message, disconnecting: {}", message.getPeer(), e);
-      message.getPeer().disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
-    } catch (final PeerNotConnected peerNotConnected) {
-      // Peer disconnected before we could respond - nothing to do
-    }
+    this.registerResponseConstructors();
   }
 
-  private void handleGetBlockBodies(final EthMessage message) {
-    LOG.trace("Responding to GET_BLOCK_BODIES request");
-    try {
-      final MessageData response =
-          constructGetBodiesResponse(
-              blockchain,
-              message.getData(),
-              ethereumWireProtocolConfiguration.getMaxGetBlockBodies());
-      message.getPeer().send(response);
-    } catch (final RLPException e) {
-      LOG.debug(
-          "Received malformed GET_BLOCK_BODIES message, disconnecting: {}", message.getPeer(), e);
-      message.getPeer().disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
-    } catch (final PeerNotConnected peerNotConnected) {
-      // Peer disconnected before we could respond - nothing to do
-    }
-  }
+  private void registerResponseConstructors() {
+    final int maxMessageSize = ethereumWireProtocolConfiguration.getMaxMessageSize();
 
-  private void handleGetReceipts(final EthMessage message) {
-    LOG.trace("Responding to GET_RECEIPTS request");
-    try {
-      final MessageData response =
-          constructGetReceiptsResponse(
-              blockchain, message.getData(), ethereumWireProtocolConfiguration.getMaxGetReceipts());
-      message.getPeer().send(response);
-    } catch (final RLPException e) {
-      LOG.debug("Received malformed GET_RECEIPTS message, disconnecting: {}", message.getPeer(), e);
-      message.getPeer().disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
-    } catch (final PeerNotConnected peerNotConnected) {
-      // Peer disconnected before we could respond - nothing to do
-    }
-  }
-
-  private void handleGetNodeData(final EthMessage message) {
-    LOG.trace("Responding to GET_NODE_DATA request");
-    try {
-      final MessageData response =
-          constructGetNodeDataResponse(
-              worldStateArchive,
-              message.getData(),
-              ethereumWireProtocolConfiguration.getMaxGetNodeData());
-      message.getPeer().send(response);
-    } catch (final RLPException e) {
-      LOG.debug(
-          "Received malformed GET_NODE_DATA message, disconnecting: {}", message.getPeer(), e);
-      message.getPeer().disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
-    } catch (final PeerNotConnected peerNotConnected) {
-      // Peer disconnected before we could respond - nothing to do
-    }
-  }
-
-  private void handleGetPooledTransactions(final EthMessage message) {
-    LOG.trace("Responding to GET_POOLED_TRANSACTIONS request");
-    try {
-      final MessageData response =
-          constructGetPooledTransactionsResponse(
-              transactionPool,
-              message.getData(),
-              ethereumWireProtocolConfiguration.getMaxGetPooledTransactions());
-      message.getPeer().send(response);
-    } catch (final RLPException e) {
-      LOG.debug(
-          "Received malformed GET_POOLED_TRANSACTIONS message, disconnecting: {}",
-          message.getPeer(),
-          e);
-      message.getPeer().disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
-    } catch (final PeerNotConnected peerNotConnected) {
-      // Peer disconnected before we could respond - nothing to do
-    }
+    ethMessages.registerResponseConstructor(
+        EthPV62.GET_BLOCK_HEADERS,
+        messageData ->
+            constructGetHeadersResponse(
+                blockchain,
+                messageData,
+                ethereumWireProtocolConfiguration.getMaxGetBlockHeaders(),
+                maxMessageSize));
+    ethMessages.registerResponseConstructor(
+        EthPV62.GET_BLOCK_BODIES,
+        messageData ->
+            constructGetBodiesResponse(
+                blockchain,
+                messageData,
+                ethereumWireProtocolConfiguration.getMaxGetBlockBodies(),
+                maxMessageSize));
+    ethMessages.registerResponseConstructor(
+        EthPV63.GET_RECEIPTS,
+        messageData ->
+            constructGetReceiptsResponse(
+                blockchain,
+                messageData,
+                ethereumWireProtocolConfiguration.getMaxGetReceipts(),
+                maxMessageSize));
+    ethMessages.registerResponseConstructor(
+        EthPV63.GET_NODE_DATA,
+        messageData ->
+            constructGetNodeDataResponse(
+                worldStateArchive,
+                messageData,
+                ethereumWireProtocolConfiguration.getMaxGetNodeData(),
+                maxMessageSize));
+    ethMessages.registerResponseConstructor(
+        EthPV65.GET_POOLED_TRANSACTIONS,
+        messageData ->
+            constructGetPooledTransactionsResponse(
+                transactionPool,
+                messageData,
+                ethereumWireProtocolConfiguration.getMaxGetPooledTransactions(),
+                maxMessageSize));
   }
 
   static MessageData constructGetHeadersResponse(
-      final Blockchain blockchain, final MessageData message, final int requestLimit) {
+      final Blockchain blockchain,
+      final MessageData message,
+      final int requestLimit,
+      final int maxMessageSize) {
+    // Extract parameters from request
     final GetBlockHeadersMessage getHeaders = GetBlockHeadersMessage.readFrom(message);
     final Optional<Hash> hash = getHeaders.hash();
     final int skip = getHeaders.skip();
     final int maxHeaders = Math.min(requestLimit, getHeaders.maxHeaders());
     final boolean reversed = getHeaders.reverse();
     final BlockHeader firstHeader;
+    // Query first header by hash or number depending on request arguments
     if (hash.isPresent()) {
       final Hash startHash = hash.get();
       firstHeader = blockchain.getBlockHeader(startHash).orElse(null);
@@ -189,34 +132,58 @@ static MessageData constructGetHeadersResponse(
       final long firstNumber = getHeaders.blockNumber().getAsLong();
       firstHeader = blockchain.getBlockHeader(firstNumber).orElse(null);
     }
-    final Collection<BlockHeader> resp;
+
+    // The initial header was not found, nothing to return
     if (firstHeader == null) {
-      resp = Collections.emptyList();
-    } else {
-      resp = Lists.newArrayList(firstHeader);
-      final long numberDelta = reversed ? -(skip + 1) : (skip + 1);
-      for (int i = 1; i < maxHeaders; i++) {
-        final long blockNumber = firstHeader.getNumber() + i * numberDelta;
-        if (blockNumber < BlockHeader.GENESIS_BLOCK_NUMBER) {
-          break;
-        }
-        final Optional<BlockHeader> maybeHeader = blockchain.getBlockHeader(blockNumber);
-        if (maybeHeader.isPresent()) {
-          resp.add(maybeHeader.get());
-        } else {
-          break;
-        }
+      return BlockHeadersMessage.create(Collections.emptyList());
+    }
+
+    // Encode the first header
+    int responseSizeEstimate = RLP.MAX_PREFIX_SIZE;
+    final BytesValueRLPOutput rlp = new BytesValueRLPOutput();
+    rlp.startList();
+    final Bytes firstEncodedHeader = RLP.encode(firstHeader::writeTo);
+    if (responseSizeEstimate + firstEncodedHeader.size() > maxMessageSize) {
+      return BlockHeadersMessage.create(Collections.emptyList());
+    }
+    responseSizeEstimate += firstEncodedHeader.size();
+    rlp.writeRaw(firstEncodedHeader);
+    // Collect and encode the remaining headers
+    final long numberDelta = reversed ? -(skip + 1) : (skip + 1);
+    for (int i = 1; i < maxHeaders; i++) {
+      final long blockNumber = firstHeader.getNumber() + i * numberDelta;
+      if (blockNumber < BlockHeader.GENESIS_BLOCK_NUMBER) {
+        break;
       }
+      final Optional<BlockHeader> maybeHeader = blockchain.getBlockHeader(blockNumber);
+      if (maybeHeader.isEmpty()) {
+        break;
+      }
+      final BytesValueRLPOutput headerRlp = new BytesValueRLPOutput();
+      maybeHeader.get().writeTo(headerRlp);
+      final int encodedSize = headerRlp.encodedSize();
+      if (responseSizeEstimate + encodedSize > maxMessageSize) {
+        break;
+      }
+      responseSizeEstimate += encodedSize;
+      rlp.writeRaw(headerRlp.encoded());
     }
-    return BlockHeadersMessage.create(resp);
+    rlp.endList();
+
+    return BlockHeadersMessage.createUnsafe(rlp.encoded());
   }
 
   static MessageData constructGetBodiesResponse(
-      final Blockchain blockchain, final MessageData message, final int requestLimit) {
+      final Blockchain blockchain,
+      final MessageData message,
+      final int requestLimit,
+      final int maxMessageSize) {
     final GetBlockBodiesMessage getBlockBodiesMessage = GetBlockBodiesMessage.readFrom(message);
     final Iterable<Hash> hashes = getBlockBodiesMessage.hashes();
 
-    final Collection<BlockBody> bodies = new ArrayList<>();
+    int responseSizeEstimate = RLP.MAX_PREFIX_SIZE;
+    final BytesValueRLPOutput rlp = new BytesValueRLPOutput();
+    rlp.startList();
     int count = 0;
     for (final Hash hash : hashes) {
       if (count >= requestLimit) {
@@ -224,20 +191,35 @@ static MessageData constructGetBodiesResponse(
       }
       count++;
       final Optional<BlockBody> maybeBody = blockchain.getBlockBody(hash);
-      if (!maybeBody.isPresent()) {
+      if (maybeBody.isEmpty()) {
         continue;
       }
-      bodies.add(maybeBody.get());
+
+      final BlockBody body = maybeBody.get();
+      final BytesValueRLPOutput bodyOutput = new BytesValueRLPOutput();
+      body.writeWrappedBodyTo(bodyOutput);
+      final int encodedSize = bodyOutput.encodedSize();
+      if (responseSizeEstimate + encodedSize > maxMessageSize) {
+        break;
+      }
+      responseSizeEstimate += encodedSize;
+      rlp.writeRaw(bodyOutput.encoded());
     }
-    return BlockBodiesMessage.create(bodies);
+    rlp.endList();
+    return BlockBodiesMessage.createUnsafe(rlp.encoded());
   }
 
   static MessageData constructGetReceiptsResponse(
-      final Blockchain blockchain, final MessageData message, final int requestLimit) {
+      final Blockchain blockchain,
+      final MessageData message,
+      final int requestLimit,
+      final int maxMessageSize) {
     final GetReceiptsMessage getReceipts = GetReceiptsMessage.readFrom(message);
     final Iterable<Hash> hashes = getReceipts.hashes();
 
-    final List<List<TransactionReceipt>> receipts = new ArrayList<>();
+    int responseSizeEstimate = RLP.MAX_PREFIX_SIZE;
+    final BytesValueRLPOutput rlp = new BytesValueRLPOutput();
+    rlp.startList();
     int count = 0;
     for (final Hash hash : hashes) {
       if (count >= requestLimit) {
@@ -245,21 +227,38 @@ static MessageData constructGetReceiptsResponse(
       }
       count++;
       final Optional<List<TransactionReceipt>> maybeReceipts = blockchain.getTxReceipts(hash);
-      if (!maybeReceipts.isPresent()) {
+      if (maybeReceipts.isEmpty()) {
         continue;
       }
-      receipts.add(maybeReceipts.get());
+      final BytesValueRLPOutput encodedReceipts = new BytesValueRLPOutput();
+      encodedReceipts.startList();
+      maybeReceipts.get().forEach(r -> r.writeTo(encodedReceipts));
+      encodedReceipts.endList();
+      final int encodedSize = encodedReceipts.encodedSize();
+      if (responseSizeEstimate + encodedSize > maxMessageSize) {
+        break;
+      }
+
+      responseSizeEstimate += encodedSize;
+      rlp.writeRaw(encodedReceipts.encoded());
     }
-    return ReceiptsMessage.create(receipts);
+    rlp.endList();
+
+    return ReceiptsMessage.createUnsafe(rlp.encoded());
   }
 
   static MessageData constructGetPooledTransactionsResponse(
-      final TransactionPool transactionPool, final MessageData message, final int requestLimit) {
+      final TransactionPool transactionPool,
+      final MessageData message,
+      final int requestLimit,
+      final int maxMessageSize) {
     final GetPooledTransactionsMessage getPooledTransactions =
         GetPooledTransactionsMessage.readFrom(message);
     final Iterable<Hash> hashes = getPooledTransactions.pooledTransactions();
 
-    final List<Transaction> tx = new ArrayList<>();
+    int responseSizeEstimate = RLP.MAX_PREFIX_SIZE;
+    final BytesValueRLPOutput rlp = new BytesValueRLPOutput();
+    rlp.startList();
     int count = 0;
     for (final Hash hash : hashes) {
       if (count >= requestLimit) {
@@ -270,19 +269,32 @@ static MessageData constructGetPooledTransactionsResponse(
       if (maybeTx.isEmpty()) {
         continue;
       }
-      tx.add(maybeTx.get());
+      final BytesValueRLPOutput txRlp = new BytesValueRLPOutput();
+      maybeTx.get().writeTo(txRlp);
+      final int encodedSize = txRlp.encodedSize();
+      if (responseSizeEstimate + encodedSize > maxMessageSize) {
+        break;
+      }
+
+      responseSizeEstimate += encodedSize;
+      rlp.writeRaw(txRlp.encoded());
     }
-    return PooledTransactionsMessage.create(tx);
+    rlp.endList();
+
+    return PooledTransactionsMessage.createUnsafe(rlp.encoded());
   }
 
   static MessageData constructGetNodeDataResponse(
       final WorldStateArchive worldStateArchive,
       final MessageData message,
-      final int requestLimit) {
+      final int requestLimit,
+      final int maxMessageSize) {
     final GetNodeDataMessage getNodeDataMessage = GetNodeDataMessage.readFrom(message);
     final Iterable<Hash> hashes = getNodeDataMessage.hashes();
 
-    final List<Bytes> nodeData = new ArrayList<>();
+    int responseSizeEstimate = RLP.MAX_PREFIX_SIZE;
+    final BytesValueRLPOutput rlp = new BytesValueRLPOutput();
+    rlp.startList();
     int count = 0;
     for (final Hash hash : hashes) {
       if (count >= requestLimit) {
@@ -290,8 +302,23 @@ static MessageData constructGetNodeDataResponse(
       }
       count++;
 
-      worldStateArchive.getNodeData(hash).ifPresent(nodeData::add);
+      final Optional<Bytes> maybeNodeData = worldStateArchive.getNodeData(hash);
+      if (maybeNodeData.isEmpty()) {
+        continue;
+      }
+
+      final BytesValueRLPOutput rlpNodeData = new BytesValueRLPOutput();
+      rlpNodeData.writeBytes(maybeNodeData.get());
+      final int encodedSize = rlpNodeData.encodedSize();
+      if (responseSizeEstimate + encodedSize > maxMessageSize) {
+        break;
+      }
+
+      responseSizeEstimate += encodedSize;
+      rlp.writeRaw(rlpNodeData.encoded());
     }
-    return NodeDataMessage.create(nodeData);
+    rlp.endList();
+
+    return NodeDataMessage.createUnsafe(rlp.encoded());
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/ForkIdManager.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/ForkIdManager.java
deleted file mode 100644
index d8846f3a627..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/ForkIdManager.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.manager;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.rlp.RLPInput;
-import org.hyperledger.besu.util.EndianUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.LongSupplier;
-import java.util.stream.Collectors;
-import java.util.zip.CRC32;
-
-import com.google.common.annotations.VisibleForTesting;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-
-public class ForkIdManager {
-
-  private final Hash genesisHash;
-  private final List<ForkId> forkAndHashList;
-
-  private final List<Long> forks;
-  private final LongSupplier chainHeadSupplier;
-  private final long forkNext;
-  private final boolean onlyZerosForkBlocks;
-  private final long highestKnownFork;
-  private Bytes genesisHashCrc;
-  private final boolean legacyEth64;
-
-  public ForkIdManager(
-      final Blockchain blockchain, final List<Long> nonFilteredForks, final boolean legacyEth64) {
-    checkNotNull(blockchain);
-    checkNotNull(nonFilteredForks);
-    this.chainHeadSupplier = blockchain::getChainHeadBlockNumber;
-    this.genesisHash = blockchain.getGenesisBlock().getHash();
-    this.forkAndHashList = new ArrayList<>();
-    this.legacyEth64 = legacyEth64;
-    this.forks =
-        nonFilteredForks.stream()
-            .filter(fork -> fork > 0L)
-            .distinct()
-            .sorted()
-            .collect(Collectors.toUnmodifiableList());
-    this.onlyZerosForkBlocks = nonFilteredForks.stream().allMatch(value -> 0L == value);
-    this.forkNext = createForkIds();
-    this.highestKnownFork = !forks.isEmpty() ? forks.get(forks.size() - 1) : 0L;
-  }
-
-  public ForkId computeForkId() {
-    if (legacyEth64) {
-      return forkAndHashList.isEmpty() ? null : forkAndHashList.get(forkAndHashList.size() - 1);
-    }
-    final long head = chainHeadSupplier.getAsLong();
-    for (final ForkId forkId : forkAndHashList) {
-      if (head < forkId.getNext()) {
-        return forkId;
-      }
-    }
-    return forkAndHashList.isEmpty()
-        ? new ForkId(genesisHashCrc, 0)
-        : forkAndHashList.get(forkAndHashList.size() - 1);
-  }
-
-  @VisibleForTesting
-  List<ForkId> getForkAndHashList() {
-    return this.forkAndHashList;
-  }
-
-  public static ForkId readFrom(final RLPInput in) {
-    in.enterList();
-    final Bytes hash = in.readBytes();
-    final Bytes next = in.readBytes();
-    in.leaveList();
-    return new ForkId(hash, next);
-  }
-
-  /**
-   * EIP-2124 behaviour
-   *
-   * @param forkId to be validated.
-   * @return boolean (peer valid (true) or invalid (false))
-   */
-  boolean peerCheck(final ForkId forkId) {
-    if (forkId == null || onlyZerosForkBlocks) {
-      return true; // Another method must be used to validate (i.e. genesis hash)
-    }
-    // Run the fork checksum validation rule set:
-    //   1. If local and remote FORK_CSUM matches, connect.
-    //        The two nodes are in the same fork state currently. They might know
-    //        of differing future forks, but that's not relevant until the fork
-    //        triggers (might be postponed, nodes might be updated to match).
-    //   2. If the remote FORK_CSUM is a subset of the local past forks and the
-    //      remote FORK_NEXT matches with the locally following fork block number,
-    //      connect.
-    //        Remote node is currently syncing. It might eventually diverge from
-    //        us, but at this current point in time we don't have enough information.
-    //   3. If the remote FORK_CSUM is a superset of the local past forks and can
-    //      be completed with locally known future forks, connect.
-    //        Local node is currently syncing. It might eventually diverge from
-    //        the remote, but at this current point in time we don't have enough
-    //        information.
-    //   4. Reject in all other cases.
-    if (!isHashKnown(forkId.getHash())) {
-      return false;
-    }
-    return chainHeadSupplier.getAsLong() < forkNext
-        || (isForkKnown(forkId.getNext())
-            && isRemoteAwareOfPresent(forkId.getHash(), forkId.getNext()));
-  }
-
-  /**
-   * Non EIP-2124 behaviour
-   *
-   * @param peerGenesisHash Hash to be validated.
-   * @return boolean
-   */
-  public boolean peerCheck(final Bytes32 peerGenesisHash) {
-    return !peerGenesisHash.equals(genesisHash);
-  }
-
-  private boolean isHashKnown(final Bytes forkHash) {
-    return forkAndHashList.stream().map(ForkId::getHash).anyMatch(hash -> hash.equals(forkHash));
-  }
-
-  private boolean isForkKnown(final Long nextFork) {
-    return highestKnownFork < nextFork
-        || forkAndHashList.stream().map(ForkId::getNext).anyMatch(fork -> fork.equals(nextFork));
-  }
-
-  private boolean isRemoteAwareOfPresent(final Bytes forkHash, final Long nextFork) {
-    for (final ForkId j : forkAndHashList) {
-      if (forkHash.equals(j.getHash())) {
-        if (nextFork.equals(j.getNext())) {
-          return true;
-        } else if (j.getNext() == 0L) {
-          return highestKnownFork <= nextFork; // Remote aware of an additional future fork
-        } else {
-          return false;
-        }
-      }
-    }
-    return false;
-  }
-
-  private long createForkIds() {
-    final CRC32 crc = new CRC32();
-    crc.update(genesisHash.toArray());
-    genesisHashCrc = getCurrentCrcHash(crc);
-    final List<Bytes> forkHashes = new ArrayList<>(List.of(genesisHashCrc));
-    forks.forEach(
-        fork -> {
-          updateCrc(crc, fork);
-          forkHashes.add(getCurrentCrcHash(crc));
-        });
-
-    // This loop is for all the fork hashes that have an associated "next fork"
-    for (int i = 0; i < forks.size(); i++) {
-      forkAndHashList.add(new ForkId(forkHashes.get(i), forks.get(i)));
-    }
-    long forkNext = 0;
-    if (!forks.isEmpty()) {
-      forkNext = forkAndHashList.get(forkAndHashList.size() - 1).getNext();
-      forkAndHashList.add(new ForkId(forkHashes.get(forkHashes.size() - 1), 0));
-    }
-    return forkNext;
-  }
-
-  private static void updateCrc(final CRC32 crc, final Long block) {
-    final byte[] byteRepresentationFork = EndianUtils.longToBigEndian(block);
-    crc.update(byteRepresentationFork, 0, byteRepresentationFork.length);
-  }
-
-  private static Bytes getCurrentCrcHash(final CRC32 crc) {
-    return Bytes.ofUnsignedInt(crc.getValue());
-  }
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/MergePeerFilter.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/MergePeerFilter.java
new file mode 100644
index 00000000000..5cb58466623
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/MergePeerFilter.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ *  the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.eth.manager;
+
+import org.hyperledger.besu.consensus.merge.ForkchoiceEvent;
+import org.hyperledger.besu.consensus.merge.MergeStateHandler;
+import org.hyperledger.besu.consensus.merge.UnverifiedForkchoiceListener;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.eth.messages.EthPV62;
+import org.hyperledger.besu.ethereum.eth.messages.StatusMessage;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
+
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.StampedLock;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class MergePeerFilter implements MergeStateHandler, UnverifiedForkchoiceListener {
+
+  private Optional<Difficulty> powTerminalDifficulty = Optional.of(Difficulty.MAX_VALUE);
+  private final StampedLock powTerminalDifficultyLock = new StampedLock();
+  private final AtomicBoolean finalized = new AtomicBoolean(false);
+  private static final Logger LOG = LoggerFactory.getLogger(MergePeerFilter.class);
+
+  public boolean disconnectIfPoW(final StatusMessage status, final EthPeer peer) {
+    long lockStamp = this.powTerminalDifficultyLock.readLock();
+    try {
+      if (this.powTerminalDifficulty.isPresent()
+          && status.totalDifficulty().greaterThan(this.powTerminalDifficulty.get())) {
+        LOG.debug(
+            "Disconnecting peer with difficulty {}, likely still on PoW chain",
+            status.totalDifficulty());
+        peer.disconnect(DisconnectReason.SUBPROTOCOL_TRIGGERED);
+        return true;
+      } else {
+        return false;
+      }
+    } finally {
+      this.powTerminalDifficultyLock.unlockRead(lockStamp);
+    }
+  }
+
+  public boolean disconnectIfGossipingBlocks(final Message message, final EthPeer peer) {
+    final int code = message.getData().getCode();
+    if (isFinalized() && (code == EthPV62.NEW_BLOCK || code == EthPV62.NEW_BLOCK_HASHES)) {
+      LOG.debug("disconnecting peer for sending new blocks after transition to PoS");
+      peer.disconnect(DisconnectReason.SUBPROTOCOL_TRIGGERED);
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  private boolean isFinalized() {
+    return this.finalized.get();
+  }
+
+  @Override
+  public void onNewUnverifiedForkchoice(final ForkchoiceEvent event) {
+    if (event
+        .hasValidFinalizedBlockHash()) { // forkchoices send finalized as 0 after ttd, but before an
+      // epoch is
+      // finalized
+      this.finalized.set(true);
+    }
+  }
+
+  @Override
+  public void mergeStateChanged(
+      final boolean isPoS,
+      final Optional<Boolean> oldState,
+      final Optional<Difficulty> difficultyStoppedAt) {
+    if (isPoS && difficultyStoppedAt.isPresent()) {
+      LOG.debug("terminal difficulty set to {}", difficultyStoppedAt.get().getValue());
+      long lockStamp = this.powTerminalDifficultyLock.writeLock();
+      try {
+        this.powTerminalDifficulty = difficultyStoppedAt;
+      } finally {
+        this.powTerminalDifficultyLock.unlockWrite(lockStamp);
+      }
+    }
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/MonitoredExecutors.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/MonitoredExecutors.java
index f48a6bd6ce9..bf2389c1a85 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/MonitoredExecutors.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/MonitoredExecutors.java
@@ -38,8 +38,12 @@
 public class MonitoredExecutors {
 
   public static ExecutorService newFixedThreadPool(
-      final String name, final int workerCount, final MetricsSystem metricsSystem) {
-    return newFixedThreadPool(name, workerCount, new LinkedBlockingQueue<>(), metricsSystem);
+      final String name,
+      final int minWorkerCount,
+      final int workerCount,
+      final MetricsSystem metricsSystem) {
+    return newFixedThreadPool(
+        name, minWorkerCount, workerCount, new LinkedBlockingQueue<>(), metricsSystem);
   }
 
   public static ExecutorService newBoundedThreadPool(
@@ -47,16 +51,27 @@ public static ExecutorService newBoundedThreadPool(
       final int workerCount,
       final int queueSize,
       final MetricsSystem metricsSystem) {
+    return newBoundedThreadPool(name, 1, workerCount, queueSize, metricsSystem);
+  }
+
+  public static ExecutorService newBoundedThreadPool(
+      final String name,
+      final int minWorkerCount,
+      final int maxWorkerCount,
+      final int queueSize,
+      final MetricsSystem metricsSystem) {
     return newFixedThreadPool(
         name,
-        workerCount,
+        minWorkerCount,
+        maxWorkerCount,
         new BoundedQueue(queueSize, toMetricName(name), metricsSystem),
         metricsSystem);
   }
 
-  public static ExecutorService newFixedThreadPool(
+  private static ExecutorService newFixedThreadPool(
       final String name,
-      final int workerCount,
+      final int minWorkerCount,
+      final int maxWorkerCount,
       final BlockingQueue<Runnable> workingQueue,
       final MetricsSystem metricsSystem) {
     return newMonitoredExecutor(
@@ -64,10 +79,10 @@ public static ExecutorService newFixedThreadPool(
         metricsSystem,
         (rejectedExecutionHandler, threadFactory) ->
             new ThreadPoolExecutor(
-                workerCount,
-                workerCount,
-                0L,
-                TimeUnit.MILLISECONDS,
+                minWorkerCount,
+                maxWorkerCount,
+                60L,
+                TimeUnit.SECONDS,
                 workingQueue,
                 threadFactory,
                 rejectedExecutionHandler));
@@ -75,12 +90,17 @@ public static ExecutorService newFixedThreadPool(
 
   public static ExecutorService newCachedThreadPool(
       final String name, final MetricsSystem metricsSystem) {
+    return newCachedThreadPool(name, 0, metricsSystem);
+  }
+
+  public static ExecutorService newCachedThreadPool(
+      final String name, final int corePoolSize, final MetricsSystem metricsSystem) {
     return newMonitoredExecutor(
         name,
         metricsSystem,
         (rejectedExecutionHandler, threadFactory) ->
             new ThreadPoolExecutor(
-                0,
+                corePoolSize,
                 Integer.MAX_VALUE,
                 60L,
                 TimeUnit.SECONDS,
@@ -98,6 +118,11 @@ public static ScheduledExecutorService newScheduledThreadPool(
             new ScheduledThreadPoolExecutor(corePoolSize, threadFactory, rejectedExecutionHandler));
   }
 
+  public static ExecutorService newSingleThreadExecutor(
+      final String name, final MetricsSystem metricsSystem) {
+    return newFixedThreadPool(name, 1, 1, metricsSystem);
+  }
+
   private static <T extends ThreadPoolExecutor> T newMonitoredExecutor(
       final String name,
       final MetricsSystem metricsSystem,
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/PeerReputation.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/PeerReputation.java
index 060c902d519..0c2edf226ed 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/PeerReputation.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/PeerReputation.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.eth.manager;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
+import static com.google.common.base.Preconditions.checkArgument;
 
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
 
@@ -26,26 +26,49 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
+import javax.annotation.Nonnull;
 
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class PeerReputation {
-  private static final Logger LOG = getLogger();
-  private static final int TIMEOUT_THRESHOLD = 3;
-  private static final int USELESS_RESPONSE_THRESHOLD = 5;
+public class PeerReputation implements Comparable<PeerReputation> {
   static final long USELESS_RESPONSE_WINDOW_IN_MILLIS =
       TimeUnit.MILLISECONDS.convert(1, TimeUnit.MINUTES);
+  static final int DEFAULT_MAX_SCORE = 150;
+  static final int DEFAULT_INITIAL_SCORE = 100;
+  private static final Logger LOG = LoggerFactory.getLogger(PeerReputation.class);
+  private static final int TIMEOUT_THRESHOLD = 3;
+  private static final int USELESS_RESPONSE_THRESHOLD = 5;
 
   private final ConcurrentMap<Integer, AtomicInteger> timeoutCountByRequestType =
       new ConcurrentHashMap<>();
   private final Queue<Long> uselessResponseTimes = new ConcurrentLinkedQueue<>();
 
+  private static final int SMALL_ADJUSTMENT = 1;
+  private static final int LARGE_ADJUSTMENT = 10;
+
+  private int score;
+
+  private final int maxScore;
+
+  public PeerReputation() {
+    this(DEFAULT_INITIAL_SCORE, DEFAULT_MAX_SCORE);
+  }
+
+  public PeerReputation(final int initialScore, final int maxScore) {
+    checkArgument(initialScore <= maxScore, "Inital score must be less than or equal to max score");
+    this.maxScore = maxScore;
+    this.score = initialScore;
+  }
+
   public Optional<DisconnectReason> recordRequestTimeout(final int requestCode) {
     final int newTimeoutCount = getOrCreateTimeoutCount(requestCode).incrementAndGet();
     if (newTimeoutCount >= TIMEOUT_THRESHOLD) {
       LOG.debug("Disconnection triggered by repeated timeouts");
+      score -= LARGE_ADJUSTMENT;
       return Optional.of(DisconnectReason.TIMEOUT);
     } else {
+      score -= SMALL_ADJUSTMENT;
       return Optional.empty();
     }
   }
@@ -68,14 +91,36 @@ public Optional<DisconnectReason> recordUselessResponse(final long timestamp) {
       uselessResponseTimes.poll();
     }
     if (uselessResponseTimes.size() >= USELESS_RESPONSE_THRESHOLD) {
+      score -= LARGE_ADJUSTMENT;
       LOG.debug("Disconnection triggered by exceeding useless response threshold");
       return Optional.of(DisconnectReason.USELESS_PEER);
     } else {
+      score -= SMALL_ADJUSTMENT;
       return Optional.empty();
     }
   }
 
+  public void recordUsefulResponse() {
+    if (score < maxScore) {
+      score = Math.min(maxScore, score + SMALL_ADJUSTMENT);
+    }
+  }
+
   private boolean shouldRemove(final Long timestamp, final long currentTimestamp) {
     return timestamp != null && timestamp + USELESS_RESPONSE_WINDOW_IN_MILLIS < currentTimestamp;
   }
+
+  @Override
+  public String toString() {
+    return String.format("PeerReputation " + score);
+  }
+
+  @Override
+  public int compareTo(final @Nonnull PeerReputation otherReputation) {
+    return Integer.compare(this.score, otherReputation.score);
+  }
+
+  public int getScore() {
+    return score;
+  }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/PendingPeerRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/PendingPeerRequest.java
index 57b0d9b5cc1..120b32bdfe3 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/PendingPeerRequest.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/PendingPeerRequest.java
@@ -52,18 +52,18 @@ public boolean attemptExecution() {
     if (result.isDone()) {
       return true;
     }
-    final Optional<EthPeer> leastBusySuitablePeer = getLeastBusySuitablePeer();
-    if (!leastBusySuitablePeer.isPresent()) {
+    final Optional<EthPeer> maybePeer = getPeerToUse();
+    if (maybePeer.isEmpty()) {
       // No peers have the required height.
       result.completeExceptionally(new NoAvailablePeersException());
       return true;
     } else {
-      // At least one peer has the required height, but we not be able to use it if it's busy
-      final Optional<EthPeer> selectedPeer =
-          leastBusySuitablePeer.filter(EthPeer::hasAvailableRequestCapacity);
+      // At least one peer has the required height, but we are not able to use it if it's busy
+      final Optional<EthPeer> maybePeerWithCapacity =
+          maybePeer.filter(EthPeer::hasAvailableRequestCapacity);
 
-      selectedPeer.ifPresent(this::sendRequest);
-      return selectedPeer.isPresent();
+      maybePeerWithCapacity.ifPresent(this::sendRequest);
+      return maybePeerWithCapacity.isPresent();
     }
   }
 
@@ -79,8 +79,9 @@ private synchronized void sendRequest(final EthPeer peer) {
     }
   }
 
-  private Optional<EthPeer> getLeastBusySuitablePeer() {
-    return peer.isPresent()
+  private Optional<EthPeer> getPeerToUse() {
+    // return the assigned peer if still valid, otherwise switch to another peer
+    return peer.filter(p -> !p.isDisconnected()).isPresent()
         ? peer
         : ethPeers
             .streamAvailablePeers()
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/RequestManager.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/RequestManager.java
index dcbc1a36e32..8d163aeed80 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/RequestManager.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/RequestManager.java
@@ -16,43 +16,88 @@
 
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage;
+import org.hyperledger.besu.ethereum.rlp.RLPException;
 
-import java.util.ArrayList;
+import java.math.BigInteger;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class RequestManager {
-  private final AtomicLong responseStreamId = new AtomicLong(0L);
-  private final Map<Long, ResponseStream> responseStreams = new ConcurrentHashMap<>();
+
+  private static final Logger LOG = LoggerFactory.getLogger(RequestManager.class);
+  private final AtomicLong requestIdCounter =
+      new AtomicLong(1); // some clients have issues encoding zero
+  private final Map<BigInteger, ResponseStream> responseStreams = new ConcurrentHashMap<>();
   private final EthPeer peer;
+  private final boolean supportsRequestId;
+  private final String protocolName;
 
   private final AtomicInteger outstandingRequests = new AtomicInteger(0);
 
-  public RequestManager(final EthPeer peer) {
+  public RequestManager(
+      final EthPeer peer, final boolean supportsRequestId, final String protocolName) {
     this.peer = peer;
+    this.supportsRequestId = supportsRequestId;
+    this.protocolName = protocolName;
   }
 
   public int outstandingRequests() {
     return outstandingRequests.get();
   }
 
-  public ResponseStream dispatchRequest(final RequestSender sender) throws PeerNotConnected {
+  public String getProtocolName() {
+    return protocolName;
+  }
+
+  public ResponseStream dispatchRequest(final RequestSender sender, final MessageData messageData)
+      throws PeerNotConnected {
     outstandingRequests.incrementAndGet();
-    final ResponseStream stream = createStream();
-    sender.send();
+    final BigInteger requestId = BigInteger.valueOf(requestIdCounter.getAndIncrement());
+    final ResponseStream stream = createStream(requestId);
+    sender.send(supportsRequestId ? messageData.wrapMessageData(requestId) : messageData);
     return stream;
   }
 
-  public void dispatchResponse(final EthMessage message) {
-    final Collection<ResponseStream> streams = new ArrayList<>(responseStreams.values());
+  public void dispatchResponse(final EthMessage ethMessage) {
+    final Collection<ResponseStream> streams = List.copyOf(responseStreams.values());
     final int count = outstandingRequests.decrementAndGet();
+    try {
+      if (supportsRequestId) {
+        // If there's a requestId, find the specific stream it belongs to
+        final Map.Entry<BigInteger, MessageData> requestIdAndEthMessage =
+            ethMessage.getData().unwrapMessageData();
+        Optional.ofNullable(responseStreams.get(requestIdAndEthMessage.getKey()))
+            .ifPresentOrElse(
+                responseStream -> responseStream.processMessage(requestIdAndEthMessage.getValue()),
+                // Consider incorrect requestIds to be a useless response; too
+                // many of these and we will disconnect.
+                () -> peer.recordUselessResponse("Request ID incorrect"));
+
+      } else {
+        // otherwise iterate through all of them
+        streams.forEach(stream -> stream.processMessage(ethMessage.getData()));
+      }
+    } catch (final RLPException e) {
+      LOG.debug(
+          "Received malformed message {} (BREACH_OF_PROTOCOL), disconnecting: {}",
+          ethMessage.getData(),
+          peer,
+          e);
+
+      peer.disconnect(DisconnectMessage.DisconnectReason.BREACH_OF_PROTOCOL);
+    }
 
-    streams.forEach(s -> s.processMessage(message.getData()));
     if (count == 0) {
       // No possibility of any remaining outstanding messages
       closeOutstandingStreams(streams);
@@ -63,10 +108,9 @@ public void close() {
     closeOutstandingStreams(responseStreams.values());
   }
 
-  private ResponseStream createStream() {
-    final long listenerId = nextStreamId();
-    final ResponseStream stream = new ResponseStream(peer, () -> deregisterStream(listenerId));
-    responseStreams.put(listenerId, stream);
+  private ResponseStream createStream(final BigInteger requestId) {
+    final ResponseStream stream = new ResponseStream(peer, () -> deregisterStream(requestId));
+    responseStreams.put(requestId, stream);
     return stream;
   }
 
@@ -75,17 +119,13 @@ private void closeOutstandingStreams(final Collection<ResponseStream> outstandin
     outstandingStreams.forEach(ResponseStream::close);
   }
 
-  private void deregisterStream(final long id) {
+  private void deregisterStream(final BigInteger id) {
     responseStreams.remove(id);
   }
 
-  private long nextStreamId() {
-    return responseStreamId.incrementAndGet();
-  }
-
   @FunctionalInterface
   public interface RequestSender {
-    void send() throws PeerNotConnected;
+    void send(final MessageData messageData) throws PeerNotConnected;
   }
 
   @FunctionalInterface
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/exceptions/IncompleteResultsException.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/exceptions/IncompleteResultsException.java
index 33d5079d44d..1a7ceae2709 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/exceptions/IncompleteResultsException.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/exceptions/IncompleteResultsException.java
@@ -19,4 +19,8 @@ public class IncompleteResultsException extends EthTaskException {
   public IncompleteResultsException() {
     super(FailureReason.INCOMPLETE_RESULTS);
   }
+
+  public IncompleteResultsException(final String message) {
+    super(message, FailureReason.INCOMPLETE_RESULTS);
+  }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/GetAccountRangeFromPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/GetAccountRangeFromPeerTask.java
new file mode 100644
index 00000000000..c52758eeb94
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/GetAccountRangeFromPeerTask.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.manager.snap;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.PendingPeerRequest;
+import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerRequestTask;
+import org.hyperledger.besu.ethereum.eth.messages.snap.AccountRangeMessage;
+import org.hyperledger.besu.ethereum.eth.messages.snap.SnapV1;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class GetAccountRangeFromPeerTask
+    extends AbstractPeerRequestTask<AccountRangeMessage.AccountRangeData> {
+
+  private static final Logger LOG = LoggerFactory.getLogger(GetAccountRangeFromPeerTask.class);
+
+  private final Bytes32 startKeyHash;
+  private final Bytes32 endKeyHash;
+  private final BlockHeader blockHeader;
+
+  private GetAccountRangeFromPeerTask(
+      final EthContext ethContext,
+      final Bytes32 startKeyHash,
+      final Bytes32 endKeyHash,
+      final BlockHeader blockHeader,
+      final MetricsSystem metricsSystem) {
+    super(ethContext, SnapV1.ACCOUNT_RANGE, metricsSystem);
+    this.startKeyHash = startKeyHash;
+    this.endKeyHash = endKeyHash;
+    this.blockHeader = blockHeader;
+  }
+
+  public static GetAccountRangeFromPeerTask forAccountRange(
+      final EthContext ethContext,
+      final Bytes32 startKeyHash,
+      final Bytes32 endKeyHash,
+      final BlockHeader blockHeader,
+      final MetricsSystem metricsSystem) {
+    return new GetAccountRangeFromPeerTask(
+        ethContext, startKeyHash, endKeyHash, blockHeader, metricsSystem);
+  }
+
+  @Override
+  protected PendingPeerRequest sendRequest() {
+    return sendRequestToPeer(
+        peer -> {
+          LOG.trace(
+              "Requesting account range [{} ,{}] for state root {} from peer {} .",
+              startKeyHash,
+              endKeyHash,
+              blockHeader.getStateRoot(),
+              peer);
+          return peer.getSnapAccountRange(blockHeader.getStateRoot(), startKeyHash, endKeyHash);
+        },
+        blockHeader.getNumber());
+  }
+
+  @Override
+  protected Optional<AccountRangeMessage.AccountRangeData> processResponse(
+      final boolean streamClosed, final MessageData message, final EthPeer peer) {
+
+    if (streamClosed) {
+      // We don't record this as a useless response because it's impossible to know if a peer has
+      // the data we're requesting.
+      return Optional.empty();
+    }
+    final AccountRangeMessage accountRangeMessage = AccountRangeMessage.readFrom(message);
+    final AccountRangeMessage.AccountRangeData accountRangeData =
+        accountRangeMessage.accountData(true);
+    return Optional.of(accountRangeData);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/GetBytecodeFromPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/GetBytecodeFromPeerTask.java
new file mode 100644
index 00000000000..357157484a0
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/GetBytecodeFromPeerTask.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.manager.snap;
+
+import static java.util.Collections.emptyMap;
+import static org.slf4j.LoggerFactory.getLogger;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.PendingPeerRequest;
+import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerRequestTask;
+import org.hyperledger.besu.ethereum.eth.messages.snap.ByteCodesMessage;
+import org.hyperledger.besu.ethereum.eth.messages.snap.SnapV1;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import kotlin.collections.ArrayDeque;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+
+public class GetBytecodeFromPeerTask extends AbstractPeerRequestTask<Map<Bytes32, Bytes>> {
+
+  private static final Logger LOG = getLogger(GetBytecodeFromPeerTask.class);
+
+  private final List<Bytes32> codeHashes;
+  private final BlockHeader blockHeader;
+
+  private GetBytecodeFromPeerTask(
+      final EthContext ethContext,
+      final List<Bytes32> codeHashes,
+      final BlockHeader blockHeader,
+      final MetricsSystem metricsSystem) {
+    super(ethContext, SnapV1.STORAGE_RANGE, metricsSystem);
+    this.codeHashes = codeHashes;
+    this.blockHeader = blockHeader;
+  }
+
+  public static GetBytecodeFromPeerTask forBytecode(
+      final EthContext ethContext,
+      final List<Bytes32> codeHashes,
+      final BlockHeader blockHeader,
+      final MetricsSystem metricsSystem) {
+    return new GetBytecodeFromPeerTask(ethContext, codeHashes, blockHeader, metricsSystem);
+  }
+
+  @Override
+  protected PendingPeerRequest sendRequest() {
+    return sendRequestToPeer(
+        peer -> {
+          LOG.trace("Requesting {} Bytecodes from {} .", codeHashes.size(), peer);
+          return peer.getSnapBytecode(blockHeader.getStateRoot(), codeHashes);
+        },
+        blockHeader.getNumber());
+  }
+
+  @Override
+  protected Optional<Map<Bytes32, Bytes>> processResponse(
+      final boolean streamClosed, final MessageData message, final EthPeer peer) {
+
+    if (streamClosed) {
+      // We don't record this as a useless response because it's impossible to know if a peer has
+      // the data we're requesting.
+      return Optional.of(emptyMap());
+    }
+    final ByteCodesMessage byteCodesMessage = ByteCodesMessage.readFrom(message);
+    final ArrayDeque<Bytes> bytecodes = byteCodesMessage.bytecodes(true).codes();
+    if (bytecodes.size() > codeHashes.size()) {
+      // Can't be the response to our request
+      return Optional.empty();
+    }
+    return mapCodeByHash(bytecodes);
+  }
+
+  private Optional<Map<Bytes32, Bytes>> mapCodeByHash(final ArrayDeque<Bytes> bytecodes) {
+    final Map<Bytes32, Bytes> codeByHash = new HashMap<>();
+    for (int i = 0; i < bytecodes.size(); i++) {
+      final Hash hash = Hash.hash(bytecodes.get(i));
+      if (codeHashes.get(i).equals(hash)) {
+        codeByHash.put(hash, bytecodes.get(i));
+      }
+    }
+    return Optional.of(codeByHash);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/GetStorageRangeFromPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/GetStorageRangeFromPeerTask.java
new file mode 100644
index 00000000000..48b3426ae42
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/GetStorageRangeFromPeerTask.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.manager.snap;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.PendingPeerRequest;
+import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerRequestTask;
+import org.hyperledger.besu.ethereum.eth.messages.snap.SnapV1;
+import org.hyperledger.besu.ethereum.eth.messages.snap.StorageRangeMessage;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class GetStorageRangeFromPeerTask
+    extends AbstractPeerRequestTask<StorageRangeMessage.SlotRangeData> {
+
+  private static final Logger LOG = LoggerFactory.getLogger(GetStorageRangeFromPeerTask.class);
+
+  private final List<Bytes32> accountHashes;
+  private final Bytes32 startKeyHash;
+  private final Bytes32 endKeyHash;
+  private final BlockHeader blockHeader;
+
+  private GetStorageRangeFromPeerTask(
+      final EthContext ethContext,
+      final List<Bytes32> accountHashes,
+      final Bytes32 startKeyHash,
+      final Bytes32 endKeyHash,
+      final BlockHeader blockHeader,
+      final MetricsSystem metricsSystem) {
+    super(ethContext, SnapV1.STORAGE_RANGE, metricsSystem);
+    this.accountHashes = accountHashes;
+    this.startKeyHash = startKeyHash;
+    this.endKeyHash = endKeyHash;
+    this.blockHeader = blockHeader;
+  }
+
+  public static GetStorageRangeFromPeerTask forStorageRange(
+      final EthContext ethContext,
+      final List<Bytes32> accountHashes,
+      final Bytes32 startKeyHash,
+      final Bytes32 endKeyHash,
+      final BlockHeader blockHeader,
+      final MetricsSystem metricsSystem) {
+    return new GetStorageRangeFromPeerTask(
+        ethContext, accountHashes, startKeyHash, endKeyHash, blockHeader, metricsSystem);
+  }
+
+  @Override
+  protected PendingPeerRequest sendRequest() {
+    return sendRequestToPeer(
+        peer -> {
+          LOG.trace(
+              "Requesting storage range [{} ,{}] for {} accounts from peer {} .",
+              startKeyHash,
+              endKeyHash,
+              accountHashes.size(),
+              peer);
+          return peer.getSnapStorageRange(
+              blockHeader.getStateRoot(), accountHashes, startKeyHash, endKeyHash);
+        },
+        blockHeader.getNumber());
+  }
+
+  @Override
+  protected Optional<StorageRangeMessage.SlotRangeData> processResponse(
+      final boolean streamClosed, final MessageData message, final EthPeer peer) {
+
+    if (streamClosed) {
+      // We don't record this as a useless response because it's impossible to know if a peer has
+      // the data we're requesting.
+      return Optional.empty();
+    }
+
+    return Optional.of(StorageRangeMessage.readFrom(message).slotsData(true));
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/GetTrieNodeFromPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/GetTrieNodeFromPeerTask.java
new file mode 100644
index 00000000000..56c7d9a2357
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/GetTrieNodeFromPeerTask.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.manager.snap;
+
+import static java.util.Collections.emptyMap;
+import static org.slf4j.LoggerFactory.getLogger;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.PendingPeerRequest;
+import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerRequestTask;
+import org.hyperledger.besu.ethereum.eth.messages.snap.SnapV1;
+import org.hyperledger.besu.ethereum.eth.messages.snap.TrieNodesMessage;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import com.google.common.collect.Lists;
+import kotlin.collections.ArrayDeque;
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+
+public class GetTrieNodeFromPeerTask extends AbstractPeerRequestTask<Map<Bytes, Bytes>> {
+
+  private static final Logger LOG = getLogger(GetTrieNodeFromPeerTask.class);
+
+  private final List<List<Bytes>> paths;
+  private final BlockHeader blockHeader;
+
+  private GetTrieNodeFromPeerTask(
+      final EthContext ethContext,
+      final List<List<Bytes>> paths,
+      final BlockHeader blockHeader,
+      final MetricsSystem metricsSystem) {
+    super(ethContext, SnapV1.TRIE_NODES, metricsSystem);
+    this.paths = paths;
+    this.blockHeader = blockHeader;
+  }
+
+  public static GetTrieNodeFromPeerTask forTrieNodes(
+      final EthContext ethContext,
+      final Map<Bytes, List<Bytes>> paths,
+      final BlockHeader blockHeader,
+      final MetricsSystem metricsSystem) {
+    return new GetTrieNodeFromPeerTask(
+        ethContext,
+        paths.entrySet().stream()
+            .map(entry -> Lists.asList(entry.getKey(), entry.getValue().toArray(new Bytes[0])))
+            .collect(Collectors.toList()),
+        blockHeader,
+        metricsSystem);
+  }
+
+  @Override
+  protected PendingPeerRequest sendRequest() {
+    return sendRequestToPeer(
+        peer -> {
+          LOG.trace("Requesting {} trie nodes from peer {}", paths.size(), peer);
+          return peer.getSnapTrieNode(blockHeader.getStateRoot(), paths);
+        },
+        blockHeader.getNumber());
+  }
+
+  @Override
+  protected Optional<Map<Bytes, Bytes>> processResponse(
+      final boolean streamClosed, final MessageData message, final EthPeer peer) {
+    if (streamClosed) {
+      // We don't record this as a useless response because it's impossible to know if a peer has
+      // the data we're requesting.
+      return Optional.of(emptyMap());
+    }
+    final TrieNodesMessage trieNodes = TrieNodesMessage.readFrom(message);
+    final ArrayDeque<Bytes> nodes = trieNodes.nodes(true);
+    return mapNodeDataByPath(nodes);
+  }
+
+  private Optional<Map<Bytes, Bytes>> mapNodeDataByPath(final ArrayDeque<Bytes> nodeData) {
+    final Map<Bytes, Bytes> nodeDataByPath = new HashMap<>();
+    paths.forEach(
+        list -> {
+          int i = 1;
+          if (!nodeData.isEmpty() && i == list.size()) {
+            Bytes bytes = nodeData.removeFirst();
+            nodeDataByPath.put(list.get(0), bytes);
+          } else {
+            while (!nodeData.isEmpty() && i < list.size()) {
+              Bytes bytes = nodeData.removeFirst();
+              nodeDataByPath.put(Bytes.concatenate(list.get(0), list.get(i)), bytes);
+              i++;
+            }
+          }
+        });
+    return Optional.of(nodeDataByPath);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/RetryingGetAccountRangeFromPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/RetryingGetAccountRangeFromPeerTask.java
new file mode 100644
index 00000000000..7512bdd03a9
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/RetryingGetAccountRangeFromPeerTask.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.manager.snap;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.task.AbstractRetryingPeerTask;
+import org.hyperledger.besu.ethereum.eth.manager.task.EthTask;
+import org.hyperledger.besu.ethereum.eth.messages.snap.AccountRangeMessage;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import org.apache.tuweni.bytes.Bytes32;
+
+public class RetryingGetAccountRangeFromPeerTask
+    extends AbstractRetryingPeerTask<AccountRangeMessage.AccountRangeData> {
+
+  private final EthContext ethContext;
+  private final Bytes32 startKeyHash;
+  private final Bytes32 endKeyHash;
+  private final BlockHeader blockHeader;
+  private final MetricsSystem metricsSystem;
+
+  private RetryingGetAccountRangeFromPeerTask(
+      final EthContext ethContext,
+      final Bytes32 startKeyHash,
+      final Bytes32 endKeyHash,
+      final BlockHeader blockHeader,
+      final MetricsSystem metricsSystem) {
+    super(
+        ethContext, 4, data -> data.accounts().isEmpty() && data.proofs().isEmpty(), metricsSystem);
+    this.ethContext = ethContext;
+    this.startKeyHash = startKeyHash;
+    this.endKeyHash = endKeyHash;
+    this.blockHeader = blockHeader;
+    this.metricsSystem = metricsSystem;
+  }
+
+  public static EthTask<AccountRangeMessage.AccountRangeData> forAccountRange(
+      final EthContext ethContext,
+      final Bytes32 startKeyHash,
+      final Bytes32 endKeyHash,
+      final BlockHeader blockHeader,
+      final MetricsSystem metricsSystem) {
+    return new RetryingGetAccountRangeFromPeerTask(
+        ethContext, startKeyHash, endKeyHash, blockHeader, metricsSystem);
+  }
+
+  @Override
+  protected CompletableFuture<AccountRangeMessage.AccountRangeData> executePeerTask(
+      final Optional<EthPeer> assignedPeer) {
+    final GetAccountRangeFromPeerTask task =
+        GetAccountRangeFromPeerTask.forAccountRange(
+            ethContext, startKeyHash, endKeyHash, blockHeader, metricsSystem);
+    assignedPeer.ifPresent(task::assignPeer);
+    return executeSubTask(task::run)
+        .thenApply(
+            peerResult -> {
+              result.complete(peerResult.getResult());
+              return peerResult.getResult();
+            });
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/RetryingGetBytecodeFromPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/RetryingGetBytecodeFromPeerTask.java
new file mode 100644
index 00000000000..7d23ec944d3
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/RetryingGetBytecodeFromPeerTask.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.manager.snap;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.task.AbstractRetryingPeerTask;
+import org.hyperledger.besu.ethereum.eth.manager.task.EthTask;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+public class RetryingGetBytecodeFromPeerTask extends AbstractRetryingPeerTask<Map<Bytes32, Bytes>> {
+
+  private final EthContext ethContext;
+  private final List<Bytes32> codeHashes;
+  private final BlockHeader blockHeader;
+  private final MetricsSystem metricsSystem;
+
+  private RetryingGetBytecodeFromPeerTask(
+      final EthContext ethContext,
+      final List<Bytes32> codeHashes,
+      final BlockHeader blockHeader,
+      final MetricsSystem metricsSystem) {
+    super(ethContext, 4, Map::isEmpty, metricsSystem);
+    this.ethContext = ethContext;
+    this.codeHashes = codeHashes;
+    this.blockHeader = blockHeader;
+    this.metricsSystem = metricsSystem;
+  }
+
+  public static EthTask<Map<Bytes32, Bytes>> forByteCode(
+      final EthContext ethContext,
+      final List<Bytes32> codeHashes,
+      final BlockHeader blockHeader,
+      final MetricsSystem metricsSystem) {
+    return new RetryingGetBytecodeFromPeerTask(ethContext, codeHashes, blockHeader, metricsSystem);
+  }
+
+  @Override
+  protected CompletableFuture<Map<Bytes32, Bytes>> executePeerTask(
+      final Optional<EthPeer> assignedPeer) {
+    final GetBytecodeFromPeerTask task =
+        GetBytecodeFromPeerTask.forBytecode(ethContext, codeHashes, blockHeader, metricsSystem);
+    assignedPeer.ifPresent(task::assignPeer);
+    return executeSubTask(task::run)
+        .thenApply(
+            peerResult -> {
+              result.complete(peerResult.getResult());
+              return peerResult.getResult();
+            });
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/RetryingGetStorageRangeFromPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/RetryingGetStorageRangeFromPeerTask.java
new file mode 100644
index 00000000000..7a095de9292
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/RetryingGetStorageRangeFromPeerTask.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.manager.snap;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.task.AbstractRetryingPeerTask;
+import org.hyperledger.besu.ethereum.eth.manager.task.EthTask;
+import org.hyperledger.besu.ethereum.eth.messages.snap.StorageRangeMessage;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import org.apache.tuweni.bytes.Bytes32;
+
+public class RetryingGetStorageRangeFromPeerTask
+    extends AbstractRetryingPeerTask<StorageRangeMessage.SlotRangeData> {
+
+  private final EthContext ethContext;
+  private final List<Bytes32> accountHashes;
+  private final Bytes32 startKeyHash;
+  private final Bytes32 endKeyHash;
+  private final BlockHeader blockHeader;
+  private final MetricsSystem metricsSystem;
+
+  private RetryingGetStorageRangeFromPeerTask(
+      final EthContext ethContext,
+      final List<Bytes32> accountHashes,
+      final Bytes32 startKeyHash,
+      final Bytes32 endKeyHash,
+      final BlockHeader blockHeader,
+      final MetricsSystem metricsSystem) {
+    super(ethContext, 4, data -> data.proofs().isEmpty() && data.slots().isEmpty(), metricsSystem);
+    this.ethContext = ethContext;
+    this.accountHashes = accountHashes;
+    this.startKeyHash = startKeyHash;
+    this.endKeyHash = endKeyHash;
+    this.blockHeader = blockHeader;
+    this.metricsSystem = metricsSystem;
+  }
+
+  public static EthTask<StorageRangeMessage.SlotRangeData> forStorageRange(
+      final EthContext ethContext,
+      final List<Bytes32> accountHashes,
+      final Bytes32 startKeyHash,
+      final Bytes32 endKeyHash,
+      final BlockHeader blockHeader,
+      final MetricsSystem metricsSystem) {
+    return new RetryingGetStorageRangeFromPeerTask(
+        ethContext, accountHashes, startKeyHash, endKeyHash, blockHeader, metricsSystem);
+  }
+
+  @Override
+  protected CompletableFuture<StorageRangeMessage.SlotRangeData> executePeerTask(
+      final Optional<EthPeer> assignedPeer) {
+    final GetStorageRangeFromPeerTask task =
+        GetStorageRangeFromPeerTask.forStorageRange(
+            ethContext, accountHashes, startKeyHash, endKeyHash, blockHeader, metricsSystem);
+    assignedPeer.ifPresent(task::assignPeer);
+    return executeSubTask(task::run)
+        .thenApply(
+            peerResult -> {
+              result.complete(peerResult.getResult());
+              return peerResult.getResult();
+            });
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/RetryingGetTrieNodeFromPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/RetryingGetTrieNodeFromPeerTask.java
new file mode 100644
index 00000000000..ebfd8856898
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/RetryingGetTrieNodeFromPeerTask.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.manager.snap;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.task.AbstractRetryingPeerTask;
+import org.hyperledger.besu.ethereum.eth.manager.task.EthTask;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class RetryingGetTrieNodeFromPeerTask extends AbstractRetryingPeerTask<Map<Bytes, Bytes>> {
+
+  private final EthContext ethContext;
+  private final Map<Bytes, List<Bytes>> paths;
+  private final BlockHeader blockHeader;
+  private final MetricsSystem metricsSystem;
+
+  private RetryingGetTrieNodeFromPeerTask(
+      final EthContext ethContext,
+      final Map<Bytes, List<Bytes>> paths,
+      final BlockHeader blockHeader,
+      final MetricsSystem metricsSystem) {
+    super(ethContext, 4, Map::isEmpty, metricsSystem);
+    this.ethContext = ethContext;
+    this.paths = paths;
+    this.blockHeader = blockHeader;
+    this.metricsSystem = metricsSystem;
+  }
+
+  public static EthTask<Map<Bytes, Bytes>> forTrieNodes(
+      final EthContext ethContext,
+      final Map<Bytes, List<Bytes>> paths,
+      final BlockHeader blockHeader,
+      final MetricsSystem metricsSystem) {
+    return new RetryingGetTrieNodeFromPeerTask(ethContext, paths, blockHeader, metricsSystem);
+  }
+
+  @Override
+  protected CompletableFuture<Map<Bytes, Bytes>> executePeerTask(
+      final Optional<EthPeer> assignedPeer) {
+    final GetTrieNodeFromPeerTask task =
+        GetTrieNodeFromPeerTask.forTrieNodes(ethContext, paths, blockHeader, metricsSystem);
+    assignedPeer.ifPresent(task::assignPeer);
+    return executeSubTask(task::run)
+        .thenApply(
+            peerResult -> {
+              result.complete(peerResult.getResult());
+              return peerResult.getResult();
+            });
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/SnapProtocolManager.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/SnapProtocolManager.java
new file mode 100644
index 00000000000..de2cb280c8c
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/SnapProtocolManager.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.manager.snap;
+
+import org.hyperledger.besu.ethereum.eth.SnapProtocol;
+import org.hyperledger.besu.ethereum.eth.manager.EthMessage;
+import org.hyperledger.besu.ethereum.eth.manager.EthMessages;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
+import org.hyperledger.besu.ethereum.eth.peervalidation.PeerValidator;
+import org.hyperledger.besu.ethereum.p2p.network.ProtocolManager;
+import org.hyperledger.besu.ethereum.p2p.peers.Peer;
+import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractSnapMessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
+import org.hyperledger.besu.ethereum.rlp.RLPException;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+
+import java.math.BigInteger;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import com.google.common.collect.ImmutableList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SnapProtocolManager implements ProtocolManager {
+  private static final Logger LOG = LoggerFactory.getLogger(SnapProtocolManager.class);
+
+  private final List<Capability> supportedCapabilities;
+  private final EthPeers ethPeers;
+  private final EthMessages snapMessages;
+
+  public SnapProtocolManager(
+      final List<PeerValidator> peerValidators,
+      final EthPeers ethPeers,
+      final EthMessages snapMessages,
+      final WorldStateArchive worldStateArchive) {
+    this.ethPeers = ethPeers;
+    this.snapMessages = snapMessages;
+    this.supportedCapabilities = calculateCapabilities();
+    new SnapServer(snapMessages, worldStateArchive);
+  }
+
+  private List<Capability> calculateCapabilities() {
+    final ImmutableList.Builder<Capability> capabilities = ImmutableList.builder();
+    capabilities.add(SnapProtocol.SNAP1);
+
+    return capabilities.build();
+  }
+
+  @Override
+  public String getSupportedProtocol() {
+    return SnapProtocol.NAME;
+  }
+
+  @Override
+  public List<Capability> getSupportedCapabilities() {
+    return supportedCapabilities;
+  }
+
+  @Override
+  public void stop() {}
+
+  @Override
+  public void awaitStop() throws InterruptedException {}
+
+  /**
+   * This function is called by the P2P framework when an "SNAP message has been received.
+   *
+   * @param cap The capability under which the message was transmitted.
+   * @param message The message to be decoded.
+   */
+  @Override
+  public void processMessage(final Capability cap, final Message message) {
+    final MessageData messageData = AbstractSnapMessageData.create(message);
+    final int code = messageData.getCode();
+    LOG.trace("Process snap message {}, {}", cap, code);
+    final EthPeer ethPeer = ethPeers.peer(message.getConnection());
+    if (ethPeer == null) {
+      LOG.debug(
+          "Ignoring message received from unknown peer connection: " + message.getConnection());
+      return;
+    }
+    final EthMessage ethMessage = new EthMessage(ethPeer, messageData);
+    if (!ethPeer.validateReceivedMessage(ethMessage, getSupportedProtocol())) {
+      LOG.debug("Unsolicited message received from, disconnecting: {}", ethPeer);
+      ethPeer.disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
+      return;
+    }
+
+    // This will handle responses
+    ethPeers.dispatchMessage(ethPeer, ethMessage, getSupportedProtocol());
+
+    // This will handle requests
+    Optional<MessageData> maybeResponseData = Optional.empty();
+    try {
+      final Map.Entry<BigInteger, MessageData> requestIdAndEthMessage =
+          ethMessage.getData().unwrapMessageData();
+      maybeResponseData =
+          snapMessages
+              .dispatch(new EthMessage(ethPeer, requestIdAndEthMessage.getValue()))
+              .map(responseData -> responseData.wrapMessageData(requestIdAndEthMessage.getKey()));
+    } catch (final RLPException e) {
+      LOG.debug(
+          "Received malformed message {} , disconnecting: {}", messageData.getData(), ethPeer, e);
+      ethPeer.disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
+    }
+    maybeResponseData.ifPresent(
+        responseData -> {
+          try {
+            ethPeer.send(responseData, getSupportedProtocol());
+          } catch (final PeerConnection.PeerNotConnected error) {
+            // Peer disconnected before we could respond - nothing to do
+            LOG.trace(
+                "Peer disconnected before we could respond - nothing to do " + error.getMessage());
+          }
+        });
+  }
+
+  @Override
+  public void handleNewConnection(final PeerConnection connection) {}
+
+  @Override
+  public boolean shouldConnect(final Peer peer, final boolean incoming) {
+    return false; // EthManager is taking care of this for now
+  }
+
+  @Override
+  public void handleDisconnect(
+      final PeerConnection connection,
+      final DisconnectReason reason,
+      final boolean initiatedByPeer) {}
+
+  @Override
+  public int getHighestProtocolVersion() {
+    return getSupportedCapabilities().stream()
+        .max(Comparator.comparing(Capability::getVersion))
+        .map(Capability::getVersion)
+        .orElse(0);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/SnapServer.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/SnapServer.java
new file mode 100644
index 00000000000..17fb0a246cb
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/snap/SnapServer.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.manager.snap;
+
+import org.hyperledger.besu.ethereum.eth.manager.EthMessages;
+import org.hyperledger.besu.ethereum.eth.messages.snap.AccountRangeMessage;
+import org.hyperledger.besu.ethereum.eth.messages.snap.ByteCodesMessage;
+import org.hyperledger.besu.ethereum.eth.messages.snap.SnapV1;
+import org.hyperledger.besu.ethereum.eth.messages.snap.StorageRangeMessage;
+import org.hyperledger.besu.ethereum.eth.messages.snap.TrieNodesMessage;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+
+import java.util.HashMap;
+
+import kotlin.collections.ArrayDeque;
+
+@SuppressWarnings("unused")
+class SnapServer {
+
+  private final EthMessages snapMessages;
+  private final WorldStateArchive worldStateArchive;
+
+  SnapServer(final EthMessages snapMessages, final WorldStateArchive worldStateArchive) {
+    this.snapMessages = snapMessages;
+    this.worldStateArchive = worldStateArchive;
+    this.registerResponseConstructors();
+  }
+
+  private void registerResponseConstructors() {
+    snapMessages.registerResponseConstructor(
+        SnapV1.GET_ACCOUNT_RANGE,
+        messageData -> constructGetAccountRangeResponse(worldStateArchive, messageData));
+    snapMessages.registerResponseConstructor(
+        SnapV1.GET_STORAGE_RANGE,
+        messageData -> constructGetStorageRangeResponse(worldStateArchive, messageData));
+    snapMessages.registerResponseConstructor(
+        SnapV1.GET_BYTECODES,
+        messageData -> constructGetBytecodesResponse(worldStateArchive, messageData));
+    snapMessages.registerResponseConstructor(
+        SnapV1.GET_TRIE_NODES,
+        messageData -> constructGetTrieNodesResponse(worldStateArchive, messageData));
+  }
+
+  private MessageData constructGetAccountRangeResponse(
+      final WorldStateArchive worldStateArchive, final MessageData message) {
+    // TODO implement
+    return AccountRangeMessage.create(new HashMap<>(), new ArrayDeque<>());
+  }
+
+  private MessageData constructGetStorageRangeResponse(
+      final WorldStateArchive worldStateArchive, final MessageData message) {
+    // TODO implement
+    return StorageRangeMessage.create(new ArrayDeque<>(), new ArrayDeque<>());
+  }
+
+  private MessageData constructGetBytecodesResponse(
+      final WorldStateArchive worldStateArchive, final MessageData message) {
+    // TODO implement
+    return ByteCodesMessage.create(new ArrayDeque<>());
+  }
+
+  private MessageData constructGetTrieNodesResponse(
+      final WorldStateArchive worldStateArchive, final MessageData message) {
+    return TrieNodesMessage.create(new ArrayDeque<>());
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractGetHeadersFromPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractGetHeadersFromPeerTask.java
index 6bcdb176e50..e7180715b03 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractGetHeadersFromPeerTask.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractGetHeadersFromPeerTask.java
@@ -31,14 +31,14 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Retrieves a sequence of headers from a peer. */
 public abstract class AbstractGetHeadersFromPeerTask
     extends AbstractPeerRequestTask<List<BlockHeader>> {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractGetHeadersFromPeerTask.class);
 
   private final ProtocolSchedule protocolSchedule;
   protected final int count;
@@ -74,27 +74,33 @@ protected Optional<List<BlockHeader>> processResponse(
     final List<BlockHeader> headers = headersMessage.getHeaders(protocolSchedule);
     if (headers.isEmpty()) {
       // Message contains no data - nothing to do
+      LOG.debug("headers.isEmpty. Peer: {}", peer);
       return Optional.empty();
     }
     if (headers.size() > count) {
       // Too many headers - this isn't our response
+      LOG.debug("headers.size()>count. Peer: {}", peer);
       return Optional.empty();
     }
 
     final BlockHeader firstHeader = headers.get(0);
     if (!matchesFirstHeader(firstHeader)) {
       // This isn't our message - nothing to do
+      LOG.debug("!matchesFirstHeader. Peer: {}", peer);
       return Optional.empty();
     }
 
-    final List<BlockHeader> headersList = new ArrayList<>();
+    final List<BlockHeader> headersList = new ArrayList<>(headers.size());
     headersList.add(firstHeader);
     BlockHeader prevBlockHeader = firstHeader;
+    updatePeerChainState(peer, firstHeader);
     final int expectedDelta = reverse ? -(skip + 1) : (skip + 1);
+    BlockHeader header = null;
     for (int i = 1; i < headers.size(); i++) {
-      final BlockHeader header = headers.get(i);
+      header = headers.get(i);
       if (header.getNumber() != prevBlockHeader.getNumber() + expectedDelta) {
         // Skip doesn't match, this isn't our data
+        LOG.debug("header not matching the expected number. Peer: {}", peer);
         return Optional.empty();
       }
       // if headers are supposed to be sequential check if a chain is formed
@@ -103,8 +109,8 @@ protected Optional<List<BlockHeader>> processResponse(
         final BlockHeader child = reverse ? prevBlockHeader : header;
         if (!parent.getHash().equals(child.getParentHash())) {
           LOG.debug(
-              "Sequential headers must form a chain through hashes, disconnecting peer: {}",
-              peer.toString());
+              "Sequential headers must form a chain through hashes (BREACH_OF_PROTOCOL), disconnecting peer: {}",
+              peer);
           peer.disconnect(DisconnectMessage.DisconnectReason.BREACH_OF_PROTOCOL);
           return Optional.empty();
         }
@@ -112,10 +118,28 @@ protected Optional<List<BlockHeader>> processResponse(
       prevBlockHeader = header;
       headersList.add(header);
     }
+    // if we have received more than one header we have to update the chain state with the last
+    // header as well, as the header with the highest block number can be the first or the last
+    // header.
+    if (headers.size() > 1) {
+      updatePeerChainState(peer, header);
+    }
 
-    LOG.debug("Received {} of {} headers requested from peer.", headersList.size(), count);
+    LOG.debug("Received {} of {} headers requested from peer {}", headersList.size(), count, peer);
     return Optional.of(headersList);
   }
 
+  private void updatePeerChainState(final EthPeer peer, final BlockHeader blockHeader) {
+    if (blockHeader.getNumber() > peer.chainState().getEstimatedHeight()) {
+      LOG.atTrace()
+          .setMessage("Updating chain state for peer {} to block header {}")
+          .addArgument(peer::getShortNodeId)
+          .addArgument(blockHeader::toLogString)
+          .log();
+      peer.chainState().update(blockHeader);
+    }
+    LOG.trace("Peer chain state {}", peer.chainState());
+  }
+
   protected abstract boolean matchesFirstHeader(BlockHeader firstHeader);
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractPeerRequestTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractPeerRequestTask.java
index fe6b5e856e5..01123c528a9 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractPeerRequestTask.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractPeerRequestTask.java
@@ -31,11 +31,11 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeoutException;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class AbstractPeerRequestTask<R> extends AbstractPeerTask<R> {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractPeerRequestTask.class);
   private static final Duration DEFAULT_TIMEOUT = Duration.ofSeconds(5);
 
   private Duration timeout = DEFAULT_TIMEOUT;
@@ -101,10 +101,15 @@ private void handleMessage(
     }
     try {
       final Optional<R> result = processResponse(streamClosed, message, peer);
-      result.ifPresent(promise::complete);
+      result.ifPresent(
+          r -> {
+            promise.complete(r);
+            peer.recordUsefulResponse();
+          });
     } catch (final RLPException e) {
       // Peer sent us malformed data - disconnect
       LOG.debug("Disconnecting with BREACH_OF_PROTOCOL due to malformed message: {}", peer, e);
+      LOG.trace("Message data: {}", message.getData());
       peer.disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
       promise.completeExceptionally(new PeerBreachedProtocolException());
     }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractRetryingPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractRetryingPeerTask.java
index 7c6b74164e5..cf48d69847d 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractRetryingPeerTask.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractRetryingPeerTask.java
@@ -29,8 +29,8 @@
 import java.util.concurrent.TimeoutException;
 import java.util.function.Predicate;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A task that will retry a fixed number of times before completing the associated CompletableFuture
@@ -41,7 +41,7 @@
  */
 public abstract class AbstractRetryingPeerTask<T> extends AbstractEthTask<T> {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractRetryingPeerTask.class);
   private final EthContext ethContext;
   private final int maxRetries;
   private final Predicate<T> isEmptyResponse;
@@ -71,13 +71,17 @@ public void assignPeer(final EthPeer peer) {
     assignedPeer = Optional.of(peer);
   }
 
+  public Optional<EthPeer> getAssignedPeer() {
+    return assignedPeer;
+  }
+
   @Override
   protected void executeTask() {
     if (result.isDone()) {
       // Return if task is done
       return;
     }
-    if (retryCount > maxRetries) {
+    if (retryCount >= maxRetries) {
       result.completeExceptionally(new MaxRetriesReachedException());
       return;
     }
@@ -89,7 +93,7 @@ protected void executeTask() {
               if (error != null) {
                 handleTaskError(error);
               } else {
-                // If we get a partial success reset the retry counter.
+                // If we get a partial success, reset the retry counter.
                 if (!isEmptyResponse.test(peerResult)) {
                   retryCount = 0;
                 }
@@ -100,7 +104,7 @@ protected void executeTask() {
 
   protected abstract CompletableFuture<T> executePeerTask(Optional<EthPeer> assignedPeer);
 
-  private void handleTaskError(final Throwable error) {
+  protected void handleTaskError(final Throwable error) {
     final Throwable cause = ExceptionUtils.rootCause(error);
     if (!isRetryableError(cause)) {
       // Complete exceptionally
@@ -109,8 +113,10 @@ private void handleTaskError(final Throwable error) {
     }
 
     if (cause instanceof NoAvailablePeersException) {
-      LOG.info("No peers available, waiting for peers: {}", ethContext.getEthPeers().peerCount());
-      // Wait for new peer to connect
+      LOG.debug(
+          "No useful peer found, wait max 5 seconds for new peer to connect: current peers {}",
+          ethContext.getEthPeers().peerCount());
+
       final WaitForPeerTask waitTask = WaitForPeerTask.create(ethContext, metricsSystem);
       executeSubTask(
           () ->
@@ -133,13 +139,22 @@ private void handleTaskError(final Throwable error) {
                 .scheduleFutureTask(this::executeTaskTimed, Duration.ofSeconds(1)));
   }
 
-  private boolean isRetryableError(final Throwable error) {
-    final boolean isPeerError =
-        error instanceof PeerBreachedProtocolException
-            || error instanceof PeerDisconnectedException
-            || error instanceof NoAvailablePeersException;
+  protected boolean isRetryableError(final Throwable error) {
+    return error instanceof TimeoutException || (!assignedPeer.isPresent() && isPeerFailure(error));
+  }
+
+  protected boolean isPeerFailure(final Throwable error) {
+    return error instanceof PeerBreachedProtocolException
+        || error instanceof PeerDisconnectedException
+        || error instanceof NoAvailablePeersException;
+  }
+
+  protected EthContext getEthContext() {
+    return ethContext;
+  }
 
-    return error instanceof TimeoutException || (!assignedPeer.isPresent() && isPeerError);
+  protected MetricsSystem getMetricsSystem() {
+    return metricsSystem;
   }
 
   public int getRetryCount() {
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractRetryingSwitchingPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractRetryingSwitchingPeerTask.java
new file mode 100644
index 00000000000..ccb3bdc7ebc
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractRetryingSwitchingPeerTask.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.manager.task;
+
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
+import org.hyperledger.besu.ethereum.eth.manager.exceptions.NoAvailablePeersException;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeoutException;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public abstract class AbstractRetryingSwitchingPeerTask<T> extends AbstractRetryingPeerTask<T> {
+
+  private static final Logger LOG =
+      LoggerFactory.getLogger(AbstractRetryingSwitchingPeerTask.class);
+
+  private final Set<EthPeer> triedPeers = new HashSet<>();
+  private final Set<EthPeer> failedPeers = new HashSet<>();
+
+  protected AbstractRetryingSwitchingPeerTask(
+      final EthContext ethContext,
+      final MetricsSystem metricsSystem,
+      final Predicate<T> isEmptyResponse,
+      final int maxRetries) {
+    super(ethContext, maxRetries, isEmptyResponse, metricsSystem);
+  }
+
+  @Override
+  public void assignPeer(final EthPeer peer) {
+    super.assignPeer(peer);
+    triedPeers.add(peer);
+  }
+
+  protected abstract CompletableFuture<T> executeTaskOnCurrentPeer(final EthPeer peer);
+
+  @Override
+  protected CompletableFuture<T> executePeerTask(final Optional<EthPeer> assignedPeer) {
+
+    final Optional<EthPeer> maybePeer =
+        assignedPeer
+            .filter(u -> getRetryCount() == 1) // first try with the assigned peer if present
+            .map(Optional::of)
+            .orElseGet(this::selectNextPeer); // otherwise, select a new one from the pool
+
+    if (maybePeer.isEmpty()) {
+      LOG.atTrace()
+          .setMessage("No peer found to try to execute task at attempt {}, tried peers {}")
+          .addArgument(this::getRetryCount)
+          .addArgument(triedPeers)
+          .log();
+      final var ex = new NoAvailablePeersException();
+      return CompletableFuture.failedFuture(ex);
+    }
+
+    final EthPeer peerToUse = maybePeer.get();
+    assignPeer(peerToUse);
+
+    LOG.atTrace()
+        .setMessage("Trying to execute task on peer {}, attempt {}")
+        .addArgument(this::getAssignedPeer)
+        .addArgument(this::getRetryCount)
+        .log();
+
+    return executeTaskOnCurrentPeer(peerToUse)
+        .thenApply(
+            peerResult -> {
+              LOG.atTrace()
+                  .setMessage("Got result {} from peer {}, attempt {}")
+                  .addArgument(peerResult)
+                  .addArgument(peerToUse)
+                  .addArgument(this::getRetryCount)
+                  .log();
+              result.complete(peerResult);
+              return peerResult;
+            });
+  }
+
+  @Override
+  protected void handleTaskError(final Throwable error) {
+    if (isPeerFailure(error)) {
+      getAssignedPeer().ifPresent(peer -> failedPeers.add(peer));
+    }
+    super.handleTaskError(error);
+  }
+
+  @Override
+  protected boolean isRetryableError(final Throwable error) {
+    return error instanceof TimeoutException || isPeerFailure(error);
+  }
+
+  private Optional<EthPeer> selectNextPeer() {
+    final Optional<EthPeer> maybeNextPeer = remainingPeersToTry().findFirst();
+
+    if (maybeNextPeer.isEmpty()) {
+      // tried all the peers, restart from the best one but excluding the failed ones
+      refreshPeers();
+      triedPeers.retainAll(failedPeers);
+      return remainingPeersToTry().findFirst();
+    }
+
+    return maybeNextPeer;
+  }
+
+  private Stream<EthPeer> remainingPeersToTry() {
+    return getEthContext()
+        .getEthPeers()
+        .streamBestPeers()
+        .filter(peer -> !triedPeers.contains(peer));
+  }
+
+  private void refreshPeers() {
+    final EthPeers peers = getEthContext().getEthPeers();
+    // If we are at max connections, then refresh peers disconnecting one of the failed peers,
+    // or the least useful
+
+    if (peers.peerCount() >= peers.getMaxPeers()) {
+      failedPeers.stream()
+          .filter(peer -> !peer.isDisconnected())
+          .findAny()
+          .or(() -> peers.streamAvailablePeers().sorted(peers.getBestChainComparator()).findFirst())
+          .ifPresent(
+              peer -> {
+                LOG.atDebug()
+                    .setMessage(
+                        "Refresh peers disconnecting peer {}. Waiting for better peers. Current {} of max {}")
+                    .addArgument(peer)
+                    .addArgument(peers::peerCount)
+                    .addArgument(peers::getMaxPeers)
+                    .log();
+                peer.disconnect(DisconnectReason.USELESS_PEER);
+              });
+    }
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/BufferedGetPooledTransactionsFromPeerFetcher.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/BufferedGetPooledTransactionsFromPeerFetcher.java
index 8332ccaa88d..215202f8341 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/BufferedGetPooledTransactionsFromPeerFetcher.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/BufferedGetPooledTransactionsFromPeerFetcher.java
@@ -14,64 +14,118 @@
  */
 package org.hyperledger.besu.ethereum.eth.manager.task;
 
-import static org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration.MAX_PENDING_TRANSACTIONS;
+import static org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration.DEFAULT_MAX_PENDING_TRANSACTIONS;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactionsMessageProcessor;
+import org.hyperledger.besu.ethereum.eth.transactions.PeerTransactionTracker;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Queue;
+import java.util.concurrent.ScheduledFuture;
 
 import com.google.common.collect.EvictingQueue;
 import com.google.common.collect.Queues;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @SuppressWarnings("UnstableApiUsage")
 public class BufferedGetPooledTransactionsFromPeerFetcher {
-
+  private static final Logger LOG =
+      LoggerFactory.getLogger(BufferedGetPooledTransactionsFromPeerFetcher.class);
   private static final int MAX_HASHES = 256;
 
+  private final TransactionPool transactionPool;
+  private final PeerTransactionTracker transactionTracker;
+  private final EthContext ethContext;
+  private final TransactionPoolMetrics metrics;
+  private final String metricLabel;
+  private final ScheduledFuture<?> scheduledFuture;
   private final EthPeer peer;
-  private final PendingTransactionsMessageProcessor processor;
   private final Queue<Hash> txAnnounces;
 
   public BufferedGetPooledTransactionsFromPeerFetcher(
-      final EthPeer peer, final PendingTransactionsMessageProcessor processor) {
+      final EthContext ethContext,
+      final ScheduledFuture<?> scheduledFuture,
+      final EthPeer peer,
+      final TransactionPool transactionPool,
+      final PeerTransactionTracker transactionTracker,
+      final TransactionPoolMetrics metrics,
+      final String metricLabel) {
+    this.ethContext = ethContext;
+    this.scheduledFuture = scheduledFuture;
     this.peer = peer;
-    this.processor = processor;
-    this.txAnnounces = Queues.synchronizedQueue(EvictingQueue.create(MAX_PENDING_TRANSACTIONS));
+    this.transactionPool = transactionPool;
+    this.transactionTracker = transactionTracker;
+    this.metrics = metrics;
+    this.metricLabel = metricLabel;
+    this.txAnnounces =
+        Queues.synchronizedQueue(EvictingQueue.create(DEFAULT_MAX_PENDING_TRANSACTIONS));
+  }
+
+  public ScheduledFuture<?> getScheduledFuture() {
+    return scheduledFuture;
   }
 
   public void requestTransactions() {
-    for (List<Hash> txAnnounces = getTxAnnounces();
-        !txAnnounces.isEmpty();
-        txAnnounces = getTxAnnounces()) {
+    List<Hash> txHashesAnnounced;
+    while (!(txHashesAnnounced = getTxHashesAnnounced()).isEmpty()) {
       final GetPooledTransactionsFromPeerTask task =
           GetPooledTransactionsFromPeerTask.forHashes(
-              processor.getEthContext(), txAnnounces, processor.getMetricsSystem());
+              ethContext, txHashesAnnounced, metrics.getMetricsSystem());
       task.assignPeer(peer);
-      processor
-          .getEthContext()
+      ethContext
           .getScheduler()
           .scheduleSyncWorkerTask(task)
           .thenAccept(
-              result -> processor.getTransactionPool().addRemoteTransactions(result.getResult()));
+              result -> {
+                List<Transaction> retrievedTransactions = result.getResult();
+                transactionTracker.markTransactionsAsSeen(peer, retrievedTransactions);
+
+                LOG.atTrace()
+                    .setMessage("Got {} transactions of {} hashes requested from peer {}")
+                    .addArgument(retrievedTransactions::size)
+                    .addArgument(task.getTransactionHashes()::size)
+                    .addArgument(peer)
+                    .log();
+
+                transactionPool.addRemoteTransactions(retrievedTransactions);
+              });
     }
   }
 
-  public void addHash(final Hash hash) {
-    txAnnounces.add(hash);
+  public void addHashes(final Collection<Hash> hashes) {
+    txAnnounces.addAll(hashes);
   }
 
-  private List<Hash> getTxAnnounces() {
-    List<Hash> retrieved = new ArrayList<>();
-    while (retrieved.size() < MAX_HASHES && !txAnnounces.isEmpty()) {
-      final Hash txAnnounce = txAnnounces.poll();
-      if (processor.getTransactionPool().getTransactionByHash(txAnnounce).isEmpty()) {
-        retrieved.add(txAnnounce);
+  private List<Hash> getTxHashesAnnounced() {
+    final List<Hash> toRetrieve = new ArrayList<>(MAX_HASHES);
+    int discarded = 0;
+    while (toRetrieve.size() < MAX_HASHES && !txAnnounces.isEmpty()) {
+      final Hash txHashAnnounced = txAnnounces.poll();
+      if (!transactionTracker.hasSeenTransaction(txHashAnnounced)) {
+        toRetrieve.add(txHashAnnounced);
+      } else {
+        discarded++;
       }
     }
-    return retrieved;
+
+    final int alreadySeenCount = discarded;
+    metrics.incrementAlreadySeenTransactions(metricLabel, alreadySeenCount);
+    LOG.atTrace()
+        .setMessage(
+            "Transaction hashes to request from peer {}, fresh count {}, already seen count {}")
+        .addArgument(peer)
+        .addArgument(toRetrieve::size)
+        .addArgument(alreadySeenCount)
+        .log();
+
+    return toRetrieve;
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBlockFromPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBlockFromPeerTask.java
index 99fc3e8a014..c352fbc3009 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBlockFromPeerTask.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBlockFromPeerTask.java
@@ -14,9 +14,9 @@
  */
 package org.hyperledger.besu.ethereum.eth.manager.task;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.exceptions.IncompleteResultsException;
@@ -24,24 +24,25 @@
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Downloads a block from a peer. Will complete exceptionally if block cannot be downloaded. */
 public class GetBlockFromPeerTask extends AbstractPeerTask<Block> {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(GetBlockFromPeerTask.class);
 
   private final ProtocolSchedule protocolSchedule;
-  private final Hash hash;
+  private final Optional<Hash> hash;
   private final long blockNumber;
   private final MetricsSystem metricsSystem;
 
   protected GetBlockFromPeerTask(
       final ProtocolSchedule protocolSchedule,
       final EthContext ethContext,
-      final Hash hash,
+      final Optional<Hash> hash,
       final long blockNumber,
       final MetricsSystem metricsSystem) {
     super(ethContext, metricsSystem);
@@ -54,7 +55,7 @@ protected GetBlockFromPeerTask(
   public static GetBlockFromPeerTask create(
       final ProtocolSchedule protocolSchedule,
       final EthContext ethContext,
-      final Hash hash,
+      final Optional<Hash> hash,
       final long blockNumber,
       final MetricsSystem metricsSystem) {
     return new GetBlockFromPeerTask(protocolSchedule, ethContext, hash, blockNumber, metricsSystem);
@@ -62,25 +63,33 @@ public static GetBlockFromPeerTask create(
 
   @Override
   protected void executeTask() {
+    final String blockIdentifier = blockNumber + " (" + hash + ")";
     LOG.debug(
         "Downloading block {} from peer {}.",
-        hash,
+        blockIdentifier,
         assignedPeer.map(EthPeer::toString).orElse("<any>"));
     downloadHeader()
         .thenCompose(this::completeBlock)
         .whenComplete(
             (r, t) -> {
               if (t != null) {
-                LOG.info(
-                    "Failed to download block {} from peer {}.",
-                    hash,
-                    assignedPeer.map(EthPeer::toString).orElse("<any>"));
+                LOG.debug(
+                    "Failed to download block {} from peer {} with message '{}' and cause '{}'",
+                    blockIdentifier,
+                    assignedPeer.map(EthPeer::toString).orElse("<any>"),
+                    t.getMessage(),
+                    t.getCause());
                 result.completeExceptionally(t);
               } else if (r.getResult().isEmpty()) {
-                LOG.info("Failed to download block {} from peer {}.", hash, r.getPeer());
+                r.getPeer().recordUselessResponse("Download block returned an empty result");
+                LOG.debug(
+                    "Failed to download block {} from peer {} with empty result.",
+                    blockIdentifier,
+                    r.getPeer());
                 result.completeExceptionally(new IncompleteResultsException());
               } else {
-                LOG.debug("Successfully downloaded block {} from peer {}.", hash, r.getPeer());
+                LOG.debug(
+                    "Successfully downloaded block {} from peer {}.", blockIdentifier, r.getPeer());
                 result.complete(new PeerTaskResult<>(r.getPeer(), r.getResult().get(0)));
               }
             });
@@ -89,9 +98,16 @@ protected void executeTask() {
   private CompletableFuture<PeerTaskResult<List<BlockHeader>>> downloadHeader() {
     return executeSubTask(
         () -> {
-          final AbstractGetHeadersFromPeerTask task =
-              GetHeadersFromPeerByHashTask.forSingleHash(
-                  protocolSchedule, ethContext, hash, blockNumber, metricsSystem);
+          final AbstractGetHeadersFromPeerTask task;
+          task =
+              hash.map(
+                      value ->
+                          GetHeadersFromPeerByHashTask.forSingleHash(
+                              protocolSchedule, ethContext, value, blockNumber, metricsSystem))
+                  .orElseGet(
+                      () ->
+                          GetHeadersFromPeerByNumberTask.forSingleNumber(
+                              protocolSchedule, ethContext, blockNumber, metricsSystem));
           assignedPeer.ifPresent(task::assignPeer);
           return task.run();
         });
@@ -100,6 +116,7 @@ private CompletableFuture<PeerTaskResult<List<BlockHeader>>> downloadHeader() {
   private CompletableFuture<PeerTaskResult<List<Block>>> completeBlock(
       final PeerTaskResult<List<BlockHeader>> headerResult) {
     if (headerResult.getResult().isEmpty()) {
+      LOG.debug("header result is empty.");
       return CompletableFuture.failedFuture(new IncompleteResultsException());
     }
 
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBodiesFromPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBodiesFromPeerTask.java
index 93a85080720..9e1df148c12 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBodiesFromPeerTask.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBodiesFromPeerTask.java
@@ -16,11 +16,13 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.core.Deposit;
 import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.PendingPeerRequest;
@@ -40,13 +42,13 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Requests bodies from a peer by header, matches up headers to bodies, and returns blocks. */
 public class GetBodiesFromPeerTask extends AbstractPeerRequestTask<List<Block>> {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(GetBodiesFromPeerTask.class);
 
   private final ProtocolSchedule protocolSchedule;
   private final List<BlockHeader> headers;
@@ -65,7 +67,7 @@ private GetBodiesFromPeerTask(
     headers.forEach(
         (header) -> {
           final BodyIdentifier bodyId = new BodyIdentifier(header);
-          bodyToHeaders.putIfAbsent(bodyId, new ArrayList<>());
+          bodyToHeaders.putIfAbsent(bodyId, new ArrayList<>(headers.size()));
           bodyToHeaders.get(bodyId).add(header);
         });
   }
@@ -82,6 +84,11 @@ public static GetBodiesFromPeerTask forHeaders(
   protected PendingPeerRequest sendRequest() {
     final List<Hash> blockHashes =
         headers.stream().map(BlockHeader::getHash).collect(Collectors.toList());
+    LOG.atTrace()
+        .setMessage("Requesting {} bodies with hashes {}.")
+        .addArgument(blockHashes.size())
+        .addArgument(blockHashes)
+        .log();
     final long minimumRequiredBlockNumber = headers.get(headers.size() - 1).getNumber();
 
     return sendRequestToPeer(
@@ -106,63 +113,91 @@ protected Optional<List<Block>> processResponse(
     final List<BlockBody> bodies = bodiesMessage.bodies(protocolSchedule);
     if (bodies.size() == 0) {
       // Message contains no data - nothing to do
+      LOG.debug("Message contains no data. Peer: {}", peer);
       return Optional.empty();
     } else if (bodies.size() > headers.size()) {
       // Message doesn't match our request - nothing to do
+      LOG.debug("Message doesn't match our request. Peer: {}", peer);
       return Optional.empty();
     }
 
-    final List<Block> blocks = new ArrayList<>();
+    final List<Block> blocks = new ArrayList<>(headers.size());
     for (final BlockBody body : bodies) {
       final List<BlockHeader> headers = bodyToHeaders.get(new BodyIdentifier(body));
       if (headers == null) {
         // This message contains unrelated bodies - exit
+        LOG.debug("This message contains unrelated bodies. Peer: {}", peer);
         return Optional.empty();
       }
       headers.forEach(h -> blocks.add(new Block(h, body)));
       // Clear processed headers
       headers.clear();
     }
+    LOG.atTrace()
+        .setMessage("Associated {} bodies with {} headers to get {} blocks with these hashes: {}")
+        .addArgument(bodies.size())
+        .addArgument(headers.size())
+        .addArgument(blocks.size())
+        .addArgument(() -> blocks.stream().map(Block::toLogString).toList())
+        .log();
     return Optional.of(blocks);
   }
 
-  private static class BodyIdentifier {
+  static class BodyIdentifier {
     private final Bytes32 transactionsRoot;
     private final Bytes32 ommersHash;
-
-    public BodyIdentifier(final Bytes32 transactionsRoot, final Bytes32 ommersHash) {
+    private final Bytes32 withdrawalsRoot;
+    private final Bytes32 depositsRoot;
+
+    public BodyIdentifier(
+        final Bytes32 transactionsRoot,
+        final Bytes32 ommersHash,
+        final Bytes32 withdrawalsRoot,
+        final Bytes32 depositsRoot) {
       this.transactionsRoot = transactionsRoot;
       this.ommersHash = ommersHash;
+      this.withdrawalsRoot = withdrawalsRoot;
+      this.depositsRoot = depositsRoot;
     }
 
     public BodyIdentifier(final BlockBody body) {
-      this(body.getTransactions(), body.getOmmers());
+      this(body.getTransactions(), body.getOmmers(), body.getWithdrawals(), body.getDeposits());
     }
 
-    public BodyIdentifier(final List<Transaction> transactions, final List<BlockHeader> ommers) {
-      this(BodyValidation.transactionsRoot(transactions), BodyValidation.ommersHash(ommers));
+    public BodyIdentifier(
+        final List<Transaction> transactions,
+        final List<BlockHeader> ommers,
+        final Optional<List<Withdrawal>> withdrawals,
+        final Optional<List<Deposit>> deposits) {
+      this(
+          BodyValidation.transactionsRoot(transactions),
+          BodyValidation.ommersHash(ommers),
+          withdrawals.map(BodyValidation::withdrawalsRoot).orElse(null),
+          deposits.map(BodyValidation::depositsRoot).orElse(null));
     }
 
     public BodyIdentifier(final BlockHeader header) {
-      this(header.getTransactionsRoot(), header.getOmmersHash());
+      this(
+          header.getTransactionsRoot(),
+          header.getOmmersHash(),
+          header.getWithdrawalsRoot().orElse(null),
+          header.getDepositsRoot().orElse(null));
     }
 
     @Override
     public boolean equals(final Object o) {
-      if (this == o) {
-        return true;
-      }
-      if (o == null || getClass() != o.getClass()) {
-        return false;
-      }
-      final BodyIdentifier that = (BodyIdentifier) o;
+      if (this == o) return true;
+      if (o == null || getClass() != o.getClass()) return false;
+      BodyIdentifier that = (BodyIdentifier) o;
       return Objects.equals(transactionsRoot, that.transactionsRoot)
-          && Objects.equals(ommersHash, that.ommersHash);
+          && Objects.equals(ommersHash, that.ommersHash)
+          && Objects.equals(withdrawalsRoot, that.withdrawalsRoot)
+          && Objects.equals(depositsRoot, that.depositsRoot);
     }
 
     @Override
     public int hashCode() {
-      return Objects.hash(transactionsRoot, ommersHash);
+      return Objects.hash(transactionsRoot, ommersHash, withdrawalsRoot, depositsRoot);
     }
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByHashTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByHashTask.java
index 5c4363c6181..521d7fd398c 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByHashTask.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByHashTask.java
@@ -16,20 +16,20 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.PendingPeerRequest;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Retrieves a sequence of headers from a peer. */
 public class GetHeadersFromPeerByHashTask extends AbstractGetHeadersFromPeerTask {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(GetHeadersFromPeerByHashTask.class);
 
   private final Hash referenceHash;
   private final long minimumRequiredBlockNumber;
@@ -119,7 +119,11 @@ public static AbstractGetHeadersFromPeerTask forSingleHash(
   protected PendingPeerRequest sendRequest() {
     return sendRequestToPeer(
         peer -> {
-          LOG.debug("Requesting {} headers from peer {}.", count, peer);
+          LOG.debug(
+              "Requesting {} headers (hash {}...) from peer {}.",
+              count,
+              referenceHash.slice(0, 6),
+              peer);
           return peer.getHeadersByHash(referenceHash, count, skip, reverse);
         },
         minimumRequiredBlockNumber);
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTask.java
index ff20aefc817..3ad01aa34a9 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTask.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTask.java
@@ -21,12 +21,12 @@
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Retrieves a sequence of headers from a peer. */
 public class GetHeadersFromPeerByNumberTask extends AbstractGetHeadersFromPeerTask {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(GetHeadersFromPeerByNumberTask.class);
 
   private final long blockNumber;
 
@@ -77,7 +77,8 @@ public static AbstractGetHeadersFromPeerTask forSingleNumber(
   protected PendingPeerRequest sendRequest() {
     return sendRequestToPeer(
         peer -> {
-          LOG.debug("Requesting {} headers from peer {}.", count, peer);
+          LOG.debug(
+              "Requesting {} headers (blockNumber {}) from peer {}.", count, blockNumber, peer);
           return peer.getHeadersByNumber(blockNumber, count, skip, reverse);
         },
         blockNumber);
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetNodeDataFromPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetNodeDataFromPeerTask.java
index 6f4ba2aec54..c5d01632281 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetNodeDataFromPeerTask.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetNodeDataFromPeerTask.java
@@ -16,7 +16,7 @@
 
 import static java.util.Collections.emptyMap;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.PendingPeerRequest;
@@ -33,13 +33,13 @@
 import java.util.Optional;
 import java.util.Set;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class GetNodeDataFromPeerTask extends AbstractPeerRequestTask<Map<Hash, Bytes>> {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(GetNodeDataFromPeerTask.class);
 
   private final Set<Hash> hashes;
   private final long pivotBlockNumber;
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetPooledTransactionsFromPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetPooledTransactionsFromPeerTask.java
index cf8825f955e..ca3c90af5f1 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetPooledTransactionsFromPeerTask.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetPooledTransactionsFromPeerTask.java
@@ -16,7 +16,7 @@
 
 import static java.util.Collections.emptyList;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
@@ -30,19 +30,20 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class GetPooledTransactionsFromPeerTask extends AbstractPeerRequestTask<List<Transaction>> {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG =
+      LoggerFactory.getLogger(GetPooledTransactionsFromPeerTask.class);
 
   private final List<Hash> hashes;
 
   private GetPooledTransactionsFromPeerTask(
       final EthContext ethContext, final List<Hash> hashes, final MetricsSystem metricsSystem) {
     super(ethContext, EthPV65.GET_POOLED_TRANSACTIONS, metricsSystem);
-    this.hashes = new ArrayList<>(hashes);
+    this.hashes = List.copyOf(hashes);
   }
 
   public static GetPooledTransactionsFromPeerTask forHashes(
@@ -50,6 +51,10 @@ public static GetPooledTransactionsFromPeerTask forHashes(
     return new GetPooledTransactionsFromPeerTask(ethContext, hashes, metricsSystem);
   }
 
+  public List<Hash> getTransactionHashes() {
+    return hashes;
+  }
+
   @Override
   protected PendingPeerRequest sendRequest() {
     return sendRequestToPeer(
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetReceiptsFromPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetReceiptsFromPeerTask.java
index 33211d6e93e..dace85a202b 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetReceiptsFromPeerTask.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/GetReceiptsFromPeerTask.java
@@ -18,8 +18,8 @@
 import static java.util.stream.Collectors.toList;
 import static org.hyperledger.besu.ethereum.mainnet.BodyValidation.receiptsRoot;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
@@ -36,12 +36,12 @@
 import java.util.Map;
 import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class GetReceiptsFromPeerTask
     extends AbstractPeerRequestTask<Map<BlockHeader, List<TransactionReceipt>>> {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(GetReceiptsFromPeerTask.class);
 
   private final Collection<BlockHeader> blockHeaders;
   private final Map<Hash, List<BlockHeader>> headersByReceiptsRoot = new HashMap<>();
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetBlockFromPeersTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetBlockFromPeersTask.java
new file mode 100644
index 00000000000..f7266f9c88e
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetBlockFromPeersTask.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.manager.task;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.exceptions.IncompleteResultsException;
+import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RetryingGetBlockFromPeersTask
+    extends AbstractRetryingSwitchingPeerTask<AbstractPeerTask.PeerTaskResult<Block>> {
+
+  private static final Logger LOG = LoggerFactory.getLogger(RetryingGetBlockFromPeersTask.class);
+
+  private final ProtocolSchedule protocolSchedule;
+  private final Optional<Hash> maybeBlockHash;
+  private final long blockNumber;
+
+  protected RetryingGetBlockFromPeersTask(
+      final EthContext ethContext,
+      final ProtocolSchedule protocolSchedule,
+      final MetricsSystem metricsSystem,
+      final int maxRetries,
+      final Optional<Hash> maybeBlockHash,
+      final long blockNumber) {
+    super(ethContext, metricsSystem, Objects::isNull, maxRetries);
+    this.protocolSchedule = protocolSchedule;
+    this.maybeBlockHash = maybeBlockHash;
+    this.blockNumber = blockNumber;
+  }
+
+  public static RetryingGetBlockFromPeersTask create(
+      final ProtocolSchedule protocolSchedule,
+      final EthContext ethContext,
+      final MetricsSystem metricsSystem,
+      final int maxRetries,
+      final Optional<Hash> maybeHash,
+      final long blockNumber) {
+    return new RetryingGetBlockFromPeersTask(
+        ethContext, protocolSchedule, metricsSystem, maxRetries, maybeHash, blockNumber);
+  }
+
+  @Override
+  protected CompletableFuture<PeerTaskResult<Block>> executeTaskOnCurrentPeer(
+      final EthPeer currentPeer) {
+    final GetBlockFromPeerTask getBlockTask =
+        GetBlockFromPeerTask.create(
+            protocolSchedule, getEthContext(), maybeBlockHash, blockNumber, getMetricsSystem());
+    getBlockTask.assignPeer(currentPeer);
+
+    return executeSubTask(getBlockTask::run)
+        .thenApply(
+            peerResult -> {
+              LOG.atDebug()
+                  .setMessage("Got block {} from peer {}, attempt {}")
+                  .addArgument(peerResult.getResult()::toLogString)
+                  .addArgument(peerResult.getPeer())
+                  .addArgument(this::getRetryCount)
+                  .log();
+              result.complete(peerResult);
+              return peerResult;
+            });
+  }
+
+  @Override
+  protected boolean isRetryableError(final Throwable error) {
+    return super.isRetryableError(error) || error instanceof IncompleteResultsException;
+  }
+
+  @Override
+  protected void handleTaskError(final Throwable error) {
+    if (getRetryCount() < getMaxRetries()) {
+      LOG.atDebug()
+          .setMessage("Failed to get block {} from peer {}, attempt {}, retrying later")
+          .addArgument(this::logBlockNumberMaybeHash)
+          .addArgument(this::getAssignedPeer)
+          .addArgument(this::getRetryCount)
+          .log();
+    } else {
+      LOG.atDebug()
+          .setMessage("Failed to get block {} after {} retries")
+          .addArgument(this::logBlockNumberMaybeHash)
+          .addArgument(this::getRetryCount)
+          .log();
+    }
+    super.handleTaskError(error);
+  }
+
+  private String logBlockNumberMaybeHash() {
+    return blockNumber + maybeBlockHash.map(h -> " (" + h.toHexString() + ")").orElse("");
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetBlocksFromPeersTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetBlocksFromPeersTask.java
new file mode 100644
index 00000000000..0e663ffe24d
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetBlocksFromPeersTask.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.manager.task;
+
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.exceptions.IncompleteResultsException;
+import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RetryingGetBlocksFromPeersTask
+    extends AbstractRetryingSwitchingPeerTask<PeerTaskResult<List<Block>>> {
+
+  private static final Logger LOG = LoggerFactory.getLogger(RetryingGetBlocksFromPeersTask.class);
+
+  private final ProtocolSchedule protocolSchedule;
+  private final List<BlockHeader> headers;
+
+  protected RetryingGetBlocksFromPeersTask(
+      final EthContext ethContext,
+      final ProtocolSchedule protocolSchedule,
+      final MetricsSystem metricsSystem,
+      final int maxRetries,
+      final List<BlockHeader> headers) {
+    super(ethContext, metricsSystem, Objects::isNull, maxRetries);
+    this.protocolSchedule = protocolSchedule;
+    this.headers = headers;
+  }
+
+  public static RetryingGetBlocksFromPeersTask forHeaders(
+      final ProtocolSchedule protocolSchedule,
+      final EthContext ethContext,
+      final MetricsSystem metricsSystem,
+      final int maxRetries,
+      final List<BlockHeader> headers) {
+    return new RetryingGetBlocksFromPeersTask(
+        ethContext, protocolSchedule, metricsSystem, maxRetries, headers);
+  }
+
+  @Override
+  protected CompletableFuture<PeerTaskResult<List<Block>>> executeTaskOnCurrentPeer(
+      final EthPeer currentPeer) {
+    final GetBodiesFromPeerTask getBodiesTask =
+        GetBodiesFromPeerTask.forHeaders(
+            protocolSchedule, getEthContext(), headers, getMetricsSystem());
+    getBodiesTask.assignPeer(currentPeer);
+
+    return executeSubTask(getBodiesTask::run)
+        .thenApply(
+            peerResult -> {
+              LOG.atDebug()
+                  .setMessage("Got {} blocks from peer {}, attempt {}")
+                  .addArgument(peerResult.getResult()::size)
+                  .addArgument(peerResult.getPeer())
+                  .addArgument(this::getRetryCount)
+                  .log();
+
+              if (peerResult.getResult().isEmpty()) {
+                currentPeer.recordUselessResponse("GetBodiesFromPeerTask");
+                throw new IncompleteResultsException(
+                    "No blocks returned by peer " + currentPeer.getShortNodeId());
+              }
+
+              result.complete(peerResult);
+              return peerResult;
+            });
+  }
+
+  @Override
+  protected boolean isRetryableError(final Throwable error) {
+    return super.isRetryableError(error) || error instanceof IncompleteResultsException;
+  }
+
+  @Override
+  protected void handleTaskError(final Throwable error) {
+    if (getRetryCount() < getMaxRetries()) {
+      LOG.atDebug()
+          .setMessage("Failed to get {} blocks from peer {}, attempt {}, retrying later")
+          .addArgument(headers::size)
+          .addArgument(this::getAssignedPeer)
+          .addArgument(this::getRetryCount)
+          .log();
+    } else {
+      LOG.debug("Failed to get {} blocks after {} retries", headers.size(), getRetryCount());
+    }
+    super.handleTaskError(error);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetHeadersEndingAtFromPeerByHashTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetHeadersEndingAtFromPeerByHashTask.java
new file mode 100644
index 00000000000..5b5b0cef359
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetHeadersEndingAtFromPeerByHashTask.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.eth.manager.task;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.exceptions.IncompleteResultsException;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RetryingGetHeadersEndingAtFromPeerByHashTask
+    extends AbstractRetryingSwitchingPeerTask<List<BlockHeader>> {
+  private static final Logger LOG =
+      LoggerFactory.getLogger(RetryingGetHeadersEndingAtFromPeerByHashTask.class);
+
+  private final Hash referenceHash;
+  private final ProtocolSchedule protocolSchedule;
+  private final long minimumRequiredBlockNumber;
+  private final int count;
+
+  @VisibleForTesting
+  RetryingGetHeadersEndingAtFromPeerByHashTask(
+      final ProtocolSchedule protocolSchedule,
+      final EthContext ethContext,
+      final Hash referenceHash,
+      final long minimumRequiredBlockNumber,
+      final int count,
+      final MetricsSystem metricsSystem,
+      final int maxRetries) {
+    super(ethContext, metricsSystem, List::isEmpty, maxRetries);
+    this.protocolSchedule = protocolSchedule;
+    this.minimumRequiredBlockNumber = minimumRequiredBlockNumber;
+    this.count = count;
+    checkNotNull(referenceHash);
+    this.referenceHash = referenceHash;
+  }
+
+  public static RetryingGetHeadersEndingAtFromPeerByHashTask endingAtHash(
+      final ProtocolSchedule protocolSchedule,
+      final EthContext ethContext,
+      final Hash referenceHash,
+      final long minimumRequiredBlockNumber,
+      final int count,
+      final MetricsSystem metricsSystem,
+      final int maxRetries) {
+    return new RetryingGetHeadersEndingAtFromPeerByHashTask(
+        protocolSchedule,
+        ethContext,
+        referenceHash,
+        minimumRequiredBlockNumber,
+        count,
+        metricsSystem,
+        maxRetries);
+  }
+
+  @Override
+  protected CompletableFuture<List<BlockHeader>> executeTaskOnCurrentPeer(
+      final EthPeer currentPeer) {
+    final AbstractGetHeadersFromPeerTask task =
+        GetHeadersFromPeerByHashTask.endingAtHash(
+            protocolSchedule,
+            getEthContext(),
+            referenceHash,
+            minimumRequiredBlockNumber,
+            count,
+            getMetricsSystem());
+    task.assignPeer(currentPeer);
+    return executeSubTask(task::run)
+        .thenApply(
+            peerResult -> {
+              LOG.trace(
+                  "Got {} block headers by hash {} from peer {} has result {}",
+                  count,
+                  referenceHash,
+                  currentPeer,
+                  peerResult.getResult());
+              if (peerResult.getResult().isEmpty()) {
+                currentPeer.recordUselessResponse("GetHeadersFromPeerByHashTask");
+                throw new IncompleteResultsException(
+                    "No block headers for hash "
+                        + referenceHash
+                        + " returned by peer "
+                        + currentPeer.getShortNodeId());
+              }
+              result.complete(peerResult.getResult());
+              return peerResult.getResult();
+            });
+  }
+
+  @Override
+  protected boolean isRetryableError(final Throwable error) {
+    return super.isRetryableError(error) || error instanceof IncompleteResultsException;
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetNodeDataFromPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetNodeDataFromPeerTask.java
index bb7140d650c..16040e963ae 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetNodeDataFromPeerTask.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetNodeDataFromPeerTask.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.eth.manager.task;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
@@ -40,7 +40,7 @@ private RetryingGetNodeDataFromPeerTask(
       final Collection<Hash> hashes,
       final long pivotBlockNumber,
       final MetricsSystem metricsSystem) {
-    super(ethContext, 3, data -> false, metricsSystem);
+    super(ethContext, 4, data -> false, metricsSystem);
     this.ethContext = ethContext;
     this.hashes = new HashSet<>(hashes);
     this.pivotBlockNumber = pivotBlockNumber;
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeerTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeerTask.java
index 0234f41ab76..44ced57e7ba 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeerTask.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeerTask.java
@@ -18,12 +18,12 @@
 import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Wait for a single new peer to connect. */
 public class WaitForPeerTask extends AbstractEthTask<Void> {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(WaitForPeerTask.class);
 
   private final EthContext ethContext;
   private volatile Long peerListenerId;
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeersTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeersTask.java
index 628b1f3cab7..b0d40770293 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeersTask.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeersTask.java
@@ -18,12 +18,12 @@
 import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Waits for some number of peers to connect. */
 public class WaitForPeersTask extends AbstractEthTask<Void> {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(WaitForPeersTask.class);
 
   private final int targetPeerCount;
   private final EthContext ethContext;
@@ -45,13 +45,13 @@ public static WaitForPeersTask create(
   protected void executeTask() {
     final EthPeers ethPeers = ethContext.getEthPeers();
     if (ethPeers.peerCount() >= targetPeerCount) {
-      // We already hit our target
+      LOG.debug("We already hit our target of at least {} peers connected", targetPeerCount);
       result.complete(null);
       return;
     }
 
     LOG.info(
-        "Waiting for {} peers to connect. {} peers currently connected.",
+        "Waiting for {} total peers to connect. {} peers currently connected.",
         targetPeerCount,
         ethPeers.peerCount());
     // Listen for peer connections and complete task when we hit our target
@@ -60,11 +60,14 @@ protected void executeTask() {
             (peer) -> {
               final int peerCount = ethPeers.peerCount();
               if (peerCount >= targetPeerCount) {
-                LOG.info("Finished waiting for {} peers to connect.", targetPeerCount);
+                LOG.debug("Complete: {} peers connected.", targetPeerCount);
                 // We hit our target
                 result.complete(null);
               } else {
-                LOG.info("Waiting for {} peers to connect.", targetPeerCount - peerCount);
+                LOG.debug(
+                    "Waiting for {} total peers to connect. {} peers currently connected.",
+                    targetPeerCount,
+                    peerCount);
               }
             });
   }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/BlockBodiesMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/BlockBodiesMessage.java
index 8d4dd31ec73..a5798f678f8 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/BlockBodiesMessage.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/BlockBodiesMessage.java
@@ -43,10 +43,21 @@ public static BlockBodiesMessage readFrom(final MessageData message) {
 
   public static BlockBodiesMessage create(final Iterable<BlockBody> bodies) {
     final BytesValueRLPOutput tmp = new BytesValueRLPOutput();
-    tmp.writeList(bodies, BlockBody::writeTo);
+    tmp.writeList(bodies, BlockBody::writeWrappedBodyTo);
     return new BlockBodiesMessage(tmp.encoded());
   }
 
+  /**
+   * Create a message with raw, already encoded body data. No checks are performed to validate the
+   * rlp-encoded data.
+   *
+   * @param data An rlp-encoded list of block bodies
+   * @return A new BlockBodiesMessage
+   */
+  public static BlockBodiesMessage createUnsafe(final Bytes data) {
+    return new BlockBodiesMessage(data);
+  }
+
   private BlockBodiesMessage(final Bytes data) {
     super(data);
   }
@@ -60,6 +71,6 @@ public List<BlockBody> bodies(final ProtocolSchedule protocolSchedule) {
     final BlockHeaderFunctions blockHeaderFunctions =
         ScheduleBasedBlockHeaderFunctions.create(protocolSchedule);
     return new BytesValueRLPInput(data, false)
-        .readList(rlp -> BlockBody.readFrom(rlp, blockHeaderFunctions));
+        .readList(rlp -> BlockBody.readWrappedBodyFrom(rlp, blockHeaderFunctions, true));
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/BlockHeadersMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/BlockHeadersMessage.java
index ad8c55fdccf..c89d13c3d1a 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/BlockHeadersMessage.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/BlockHeadersMessage.java
@@ -56,6 +56,17 @@ public static BlockHeadersMessage create(final Iterable<BlockHeader> headers) {
     return new BlockHeadersMessage(tmp.encoded());
   }
 
+  /**
+   * Create a message with raw, already encoded data. No checks are performed to validate the
+   * rlp-encoded data.
+   *
+   * @param data An rlp-encoded list of headers
+   * @return A new BlockHeadersMessage
+   */
+  public static BlockHeadersMessage createUnsafe(final Bytes data) {
+    return new BlockHeadersMessage(data);
+  }
+
   private BlockHeadersMessage(final Bytes data) {
     super(data);
   }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockBodiesMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockBodiesMessage.java
index 79e724b8df5..addd57c572e 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockBodiesMessage.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockBodiesMessage.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.eth.messages;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockHeadersMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockHeadersMessage.java
index 9fafb6aab26..4d091cbd2b4 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockHeadersMessage.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockHeadersMessage.java
@@ -16,7 +16,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
@@ -74,20 +74,20 @@ public int getCode() {
   }
 
   /**
-   * Returns the block number that the message requests or {@link OptionalLong#EMPTY} if the request
-   * specifies a block hash.
+   * Returns the block number that the message requests or {@link OptionalLong#empty()} if the
+   * request specifies a block hash.
    *
-   * @return Block Number Requested or {@link OptionalLong#EMPTY}
+   * @return Block Number Requested or {@link OptionalLong#empty()}
    */
   public OptionalLong blockNumber() {
     return getBlockHeadersData().blockNumber;
   }
 
   /**
-   * Returns the block hash that the message requests or {@link Optional#EMPTY} if the request
+   * Returns the block hash that the message requests or {@link Optional#empty()} if the request
    * specifies a block number.
    *
-   * @return Block Hash Requested or {@link Optional#EMPTY}
+   * @return Block Hash Requested or {@link Optional#empty()}
    */
   public Optional<Hash> hash() {
     return getBlockHeadersData().blockHash;
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetNodeDataMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetNodeDataMessage.java
index 9cde9de8ae7..679ecc15a24 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetNodeDataMessage.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetNodeDataMessage.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.eth.messages;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetPooledTransactionsMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetPooledTransactionsMessage.java
index f6bd159e00a..dda2890499a 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetPooledTransactionsMessage.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetPooledTransactionsMessage.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.eth.messages;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetReceiptsMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetReceiptsMessage.java
index 4c33cf54e03..ad0d2b3c4a5 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetReceiptsMessage.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/GetReceiptsMessage.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.eth.messages;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/LimitedTransactionsMessages.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/LimitedTransactionsMessages.java
index 9673b1f87a9..7136a60ad26 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/LimitedTransactionsMessages.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/LimitedTransactionsMessages.java
@@ -44,18 +44,15 @@ public static LimitedTransactionsMessages createLimited(
     for (final Transaction transaction : transactions) {
       final BytesValueRLPOutput encodedTransaction = new BytesValueRLPOutput();
       transaction.writeTo(encodedTransaction);
-      Bytes encodedBytes = encodedTransaction.encoded();
-      // Break if individual transaction size exceeds limit
-      if (encodedBytes.size() > LIMIT && (messageSize != 0)) {
+      final Bytes encodedBytes = encodedTransaction.encoded();
+      if (messageSize != 0 // always at least one message
+          && messageSize + encodedBytes.size() > LIMIT) {
         break;
       }
       message.writeRaw(encodedBytes);
       includedTransactions.add(transaction);
       // Check if last transaction to add to the message
       messageSize += encodedBytes.size();
-      if (messageSize > LIMIT) {
-        break;
-      }
     }
     message.endList();
     return new LimitedTransactionsMessages(
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/NewBlockHashesMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/NewBlockHashesMessage.java
index 0b8ad26738d..ec781f8f518 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/NewBlockHashesMessage.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/NewBlockHashesMessage.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.eth.messages;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
@@ -78,8 +78,8 @@ public Iterator<NewBlockHashesMessage.NewBlockHash> getNewHashes() {
   }
 
   @Override
-  public String toString() {
-    return String.format("NewBlockHashesMessage: [%s]", Iterators.toString(getNewHashes()));
+  public String toStringDecoded() {
+    return Iterators.toString(getNewHashes());
   }
 
   public static final class NewBlockHash {
@@ -103,7 +103,7 @@ public Hash hash() {
 
     @Override
     public String toString() {
-      return String.format("New Block Hash [%d: %s]", number, hash);
+      return number() + " (" + hash() + ")";
     }
 
     @Override
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/NewPooledTransactionHashesMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/NewPooledTransactionHashesMessage.java
index 24bcfb6d212..89c58452424 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/NewPooledTransactionHashesMessage.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/NewPooledTransactionHashesMessage.java
@@ -14,23 +14,32 @@
  */
 package org.hyperledger.besu.ethereum.eth.messages;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import static org.hyperledger.besu.ethereum.eth.encoding.TransactionAnnouncementDecoder.getDecoder;
+import static org.hyperledger.besu.ethereum.eth.encoding.TransactionAnnouncementEncoder.getEncoder;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionAnnouncement;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLP;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
+import com.google.common.annotations.VisibleForTesting;
 import org.apache.tuweni.bytes.Bytes;
 
-public final class NewPooledTransactionHashesMessage extends AbstractMessageData {
-
+public class NewPooledTransactionHashesMessage extends AbstractMessageData {
   private static final int MESSAGE_CODE = EthPV65.NEW_POOLED_TRANSACTION_HASHES;
-  private List<Hash> pendingTransactions;
+  private List<TransactionAnnouncement> pendingTransactions;
+  private final Capability capability;
 
-  NewPooledTransactionHashesMessage(final Bytes rlp) {
+  @VisibleForTesting
+  public NewPooledTransactionHashesMessage(final Bytes rlp, final Capability capability) {
     super(rlp);
+    this.capability = capability;
   }
 
   @Override
@@ -38,13 +47,15 @@ public int getCode() {
     return MESSAGE_CODE;
   }
 
-  public static NewPooledTransactionHashesMessage create(final List<Hash> pendingTransactions) {
-    final BytesValueRLPOutput out = new BytesValueRLPOutput();
-    out.writeList(pendingTransactions, (h, w) -> w.writeBytes(h));
-    return new NewPooledTransactionHashesMessage(out.encoded());
+  public static NewPooledTransactionHashesMessage create(
+      final List<Transaction> pendingTransactions, final Capability capability) {
+    return new NewPooledTransactionHashesMessage(
+        getEncoder(capability).encode(pendingTransactions), capability);
   }
 
-  public static NewPooledTransactionHashesMessage readFrom(final MessageData message) {
+  public static NewPooledTransactionHashesMessage readFrom(
+      final MessageData message, final Capability capability) {
+
     if (message instanceof NewPooledTransactionHashesMessage) {
       return (NewPooledTransactionHashesMessage) message;
     }
@@ -54,15 +65,19 @@ public static NewPooledTransactionHashesMessage readFrom(final MessageData messa
           String.format(
               "Message has code %d and thus is not a NewPooledTransactionHashesMessage.", code));
     }
-
-    return new NewPooledTransactionHashesMessage(message.getData());
+    return new NewPooledTransactionHashesMessage(message.getData(), capability);
   }
 
-  public List<Hash> pendingTransactions() {
+  public List<TransactionAnnouncement> pendingTransactions() {
     if (pendingTransactions == null) {
-      final BytesValueRLPInput in = new BytesValueRLPInput(getData(), false);
-      pendingTransactions = in.readList(rlp -> Hash.wrap(rlp.readBytes32()));
+      pendingTransactions = getDecoder(capability).decode(RLP.input(data));
     }
     return pendingTransactions;
   }
+
+  public List<Hash> pendingTransactionHashes() {
+    return pendingTransactions().stream()
+        .map(TransactionAnnouncement::getHash)
+        .collect(Collectors.toUnmodifiableList());
+  }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/NodeDataMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/NodeDataMessage.java
index b242707d712..8ab5d62e3e8 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/NodeDataMessage.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/NodeDataMessage.java
@@ -47,6 +47,17 @@ public static NodeDataMessage create(final Iterable<Bytes> nodeData) {
     return new NodeDataMessage(tmp.encoded());
   }
 
+  /**
+   * Create a message with raw, already encoded data. No checks are performed to validate the
+   * rlp-encoded data.
+   *
+   * @param data An rlp-encoded list of node data
+   * @return A new NodeDataMessage
+   */
+  public static NodeDataMessage createUnsafe(final Bytes data) {
+    return new NodeDataMessage(data);
+  }
+
   private NodeDataMessage(final Bytes data) {
     super(data);
   }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/PooledTransactionsMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/PooledTransactionsMessage.java
index d89c12e7189..ae06cd30a16 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/PooledTransactionsMessage.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/PooledTransactionsMessage.java
@@ -45,6 +45,17 @@ public static PooledTransactionsMessage create(final List<Transaction> transacti
     return new PooledTransactionsMessage(out.encoded());
   }
 
+  /**
+   * Create a message with raw, already encoded data. No checks are performed to validate the
+   * rlp-encoded data.
+   *
+   * @param data An rlp-encoded list of transactions
+   * @return A new PooledTransactionsMessage
+   */
+  public static PooledTransactionsMessage createUnsafe(final Bytes data) {
+    return new PooledTransactionsMessage(data);
+  }
+
   public static PooledTransactionsMessage readFrom(final MessageData message) {
     if (message instanceof PooledTransactionsMessage) {
       return (PooledTransactionsMessage) message;
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/ReceiptsMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/ReceiptsMessage.java
index 32ede7535bb..9d9ed2cc7f1 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/ReceiptsMessage.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/ReceiptsMessage.java
@@ -53,6 +53,17 @@ public static ReceiptsMessage create(final List<List<TransactionReceipt>> receip
     return new ReceiptsMessage(tmp.encoded());
   }
 
+  /**
+   * Create a message with raw, already encoded data. No checks are performed to validate the
+   * rlp-encoded data.
+   *
+   * @param data An rlp-encoded list of sets of receipts
+   * @return A new ReceiptsMessage
+   */
+  public static ReceiptsMessage createUnsafe(final Bytes data) {
+    return new ReceiptsMessage(data);
+  }
+
   private ReceiptsMessage(final Bytes data) {
     super(data);
   }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/StatusMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/StatusMessage.java
index ef4319bd18c..9e8af4b0e57 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/StatusMessage.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/StatusMessage.java
@@ -14,9 +14,9 @@
  */
 package org.hyperledger.besu.ethereum.eth.messages;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.eth.manager.ForkId;
+import org.hyperledger.besu.ethereum.forkid.ForkId;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
@@ -215,5 +215,28 @@ public static EthStatus readFrom(final RLPInput in) {
       return new EthStatus(
           protocolVersion, networkId, totalDifficulty, bestHash, genesisHash, forkId);
     }
+
+    @Override
+    public String toString() {
+      return "{"
+          + "protocolVersion="
+          + protocolVersion
+          + ", networkId="
+          + networkId
+          + ", totalDifficulty="
+          + totalDifficulty
+          + ", bestHash="
+          + bestHash
+          + ", genesisHash="
+          + genesisHash
+          + ", forkId="
+          + forkId
+          + '}';
+    }
+  }
+
+  @Override
+  public String toStringDecoded() {
+    return status().toString();
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/AccountRangeMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/AccountRangeMessage.java
new file mode 100644
index 00000000000..417bbd27fcd
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/AccountRangeMessage.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.messages.snap;
+
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractSnapMessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
+
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.TreeMap;
+
+import com.google.common.collect.Maps;
+import kotlin.collections.ArrayDeque;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.immutables.value.Value;
+
+public final class AccountRangeMessage extends AbstractSnapMessageData {
+
+  public AccountRangeMessage(final Bytes data) {
+    super(data);
+  }
+
+  public static AccountRangeMessage readFrom(final MessageData message) {
+    if (message instanceof AccountRangeMessage) {
+      return (AccountRangeMessage) message;
+    }
+    final int code = message.getCode();
+    if (code != SnapV1.ACCOUNT_RANGE) {
+      throw new IllegalArgumentException(
+          String.format("Message has code %d and thus is not a AccountRangeMessage.", code));
+    }
+    return new AccountRangeMessage(message.getData());
+  }
+
+  public static AccountRangeMessage create(
+      final Map<Bytes32, Bytes> accounts, final List<Bytes> proof) {
+    return create(Optional.empty(), accounts, proof);
+  }
+
+  public static AccountRangeMessage create(
+      final Optional<BigInteger> requestId,
+      final Map<Bytes32, Bytes> accounts,
+      final List<Bytes> proof) {
+    final BytesValueRLPOutput tmp = new BytesValueRLPOutput();
+    tmp.startList();
+    requestId.ifPresent(tmp::writeBigIntegerScalar);
+    tmp.writeList(
+        accounts.entrySet(),
+        (entry, rlpOutput) -> {
+          rlpOutput.startList();
+          rlpOutput.writeBytes(entry.getKey());
+          rlpOutput.writeRLPBytes(entry.getValue());
+          rlpOutput.endList();
+        });
+    tmp.writeList(proof, (bytes, rlpOutput) -> rlpOutput.writeBytes(bytes));
+    tmp.endList();
+    return new AccountRangeMessage(tmp.encoded());
+  }
+
+  @Override
+  protected Bytes wrap(final BigInteger requestId) {
+    final AccountRangeData accountData = accountData(false);
+    return create(Optional.of(requestId), accountData.accounts(), accountData.proofs()).getData();
+  }
+
+  @Override
+  public int getCode() {
+    return SnapV1.ACCOUNT_RANGE;
+  }
+
+  public AccountRangeData accountData(final boolean withRequestId) {
+    final TreeMap<Bytes32, Bytes> accounts = new TreeMap<>();
+    final ArrayDeque<Bytes> proofs = new ArrayDeque<>();
+    final RLPInput input = new BytesValueRLPInput(data, false);
+    input.enterList();
+
+    if (withRequestId) input.skipNext();
+
+    input
+        .readList(
+            rlpInput -> {
+              rlpInput.enterList();
+              Map.Entry<Bytes32, Bytes> entry =
+                  Maps.immutableEntry(rlpInput.readBytes32(), toFullAccount(rlpInput.readAsRlp()));
+              rlpInput.leaveList();
+              return entry;
+            })
+        .forEach(entry -> accounts.put(entry.getKey(), entry.getValue()));
+
+    input.enterList();
+    while (!input.isEndOfCurrentList()) {
+      proofs.add(input.readBytes());
+    }
+    input.leaveList();
+
+    input.leaveList();
+    return ImmutableAccountRangeData.builder().accounts(accounts).proofs(proofs).build();
+  }
+
+  private Bytes toFullAccount(final RLPInput rlpInput) {
+    final StateTrieAccountValue accountValue = StateTrieAccountValue.readFrom(rlpInput);
+
+    final BytesValueRLPOutput rlpOutput = new BytesValueRLPOutput();
+    rlpOutput.startList();
+    rlpOutput.writeLongScalar(accountValue.getNonce()); // nonce
+    rlpOutput.writeUInt256Scalar(accountValue.getBalance()); // balance
+    rlpOutput.writeBytes(accountValue.getStorageRoot());
+    rlpOutput.writeBytes(accountValue.getCodeHash());
+    rlpOutput.endList();
+
+    return rlpOutput.encoded();
+  }
+
+  @Value.Immutable
+  public interface AccountRangeData {
+
+    TreeMap<Bytes32, Bytes> accounts();
+
+    ArrayDeque<Bytes> proofs();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/ByteCodesMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/ByteCodesMessage.java
new file mode 100644
index 00000000000..b86fcdb41ae
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/ByteCodesMessage.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.messages.snap;
+
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractSnapMessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Optional;
+
+import kotlin.collections.ArrayDeque;
+import org.apache.tuweni.bytes.Bytes;
+import org.immutables.value.Value;
+
+public final class ByteCodesMessage extends AbstractSnapMessageData {
+
+  public ByteCodesMessage(final Bytes data) {
+    super(data);
+  }
+
+  public static ByteCodesMessage readFrom(final MessageData message) {
+    if (message instanceof ByteCodesMessage) {
+      return (ByteCodesMessage) message;
+    }
+    final int code = message.getCode();
+    if (code != SnapV1.BYTECODES) {
+      throw new IllegalArgumentException(
+          String.format("Message has code %d and thus is not a ByteCodesMessage.", code));
+    }
+    return new ByteCodesMessage(message.getData());
+  }
+
+  public static ByteCodesMessage create(final List<Bytes> codes) {
+    return create(Optional.empty(), codes);
+  }
+
+  public static ByteCodesMessage create(
+      final Optional<BigInteger> requestId, final List<Bytes> codes) {
+    final BytesValueRLPOutput tmp = new BytesValueRLPOutput();
+    tmp.startList();
+    requestId.ifPresent(tmp::writeBigIntegerScalar);
+    tmp.writeList(codes, (code, rlpOutput) -> rlpOutput.writeBytes(code));
+    tmp.endList();
+    return new ByteCodesMessage(tmp.encoded());
+  }
+
+  @Override
+  protected Bytes wrap(final BigInteger requestId) {
+    final ByteCodes bytecodes = bytecodes(false);
+    return create(Optional.of(requestId), bytecodes.codes()).getData();
+  }
+
+  @Override
+  public int getCode() {
+    return SnapV1.BYTECODES;
+  }
+
+  public ByteCodes bytecodes(final boolean withRequestId) {
+    final ArrayDeque<Bytes> codes = new ArrayDeque<>();
+    final RLPInput input = new BytesValueRLPInput(data, false);
+    input.enterList();
+    if (withRequestId) input.skipNext();
+    input.enterList();
+    while (!input.isEndOfCurrentList()) {
+      codes.add(input.readBytes());
+    }
+    input.leaveList();
+    input.leaveList();
+    return ImmutableByteCodes.builder().codes(codes).build();
+  }
+
+  @Value.Immutable
+  public interface ByteCodes {
+
+    ArrayDeque<Bytes> codes();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetAccountRangeMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetAccountRangeMessage.java
new file mode 100644
index 00000000000..66aae554d48
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetAccountRangeMessage.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.messages.snap;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractSnapMessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+
+import java.math.BigInteger;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.immutables.value.Value;
+
+public final class GetAccountRangeMessage extends AbstractSnapMessageData {
+
+  public GetAccountRangeMessage(final Bytes data) {
+    super(data);
+  }
+
+  public static GetAccountRangeMessage readFrom(final MessageData message) {
+    if (message instanceof GetAccountRangeMessage) {
+      return (GetAccountRangeMessage) message;
+    }
+    final int code = message.getCode();
+    if (code != SnapV1.GET_ACCOUNT_RANGE) {
+      throw new IllegalArgumentException(
+          String.format("Message has code %d and thus is not a GetAccountRangeMessage.", code));
+    }
+    return new GetAccountRangeMessage(message.getData());
+  }
+
+  public static GetAccountRangeMessage create(
+      final Hash worldStateRootHash, final Bytes32 startKeyHash, final Bytes32 endKeyHash) {
+    final BytesValueRLPOutput tmp = new BytesValueRLPOutput();
+    tmp.startList();
+    tmp.writeBytes(worldStateRootHash);
+    tmp.writeBytes(startKeyHash);
+    tmp.writeBytes(endKeyHash);
+    tmp.writeBigIntegerScalar(SIZE_REQUEST);
+    tmp.endList();
+    return new GetAccountRangeMessage(tmp.encoded());
+  }
+
+  @Override
+  protected Bytes wrap(final BigInteger requestId) {
+    final Range range = range(false);
+    final BytesValueRLPOutput tmp = new BytesValueRLPOutput();
+    tmp.startList();
+    tmp.writeBigIntegerScalar(requestId);
+    tmp.writeBytes(range.worldStateRootHash());
+    tmp.writeBytes(range.startKeyHash());
+    tmp.writeBytes(range.endKeyHash());
+    tmp.writeBigIntegerScalar(range.responseBytes());
+    tmp.endList();
+    return tmp.encoded();
+  }
+
+  @Override
+  public int getCode() {
+    return SnapV1.GET_ACCOUNT_RANGE;
+  }
+
+  public Range range(final boolean withRequestId) {
+    final RLPInput input = new BytesValueRLPInput(data, false);
+    input.enterList();
+    if (withRequestId) input.skipNext();
+    final Hash worldStateRootHash = Hash.wrap(Bytes32.wrap(input.readBytes32()));
+    final ImmutableRange range =
+        ImmutableRange.builder()
+            .worldStateRootHash(getRootHash().orElse(worldStateRootHash))
+            .startKeyHash(Hash.wrap(Bytes32.wrap(input.readBytes32())))
+            .endKeyHash(Hash.wrap(Bytes32.wrap(input.readBytes32())))
+            .responseBytes(input.readBigIntegerScalar())
+            .build();
+    input.leaveList();
+    return range;
+  }
+
+  @Value.Immutable
+  public interface Range {
+
+    Hash worldStateRootHash();
+
+    Hash startKeyHash();
+
+    Hash endKeyHash();
+
+    BigInteger responseBytes();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetByteCodesMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetByteCodesMessage.java
new file mode 100644
index 00000000000..25302084d1b
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetByteCodesMessage.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.messages.snap;
+
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractSnapMessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.immutables.value.Value;
+
+public final class GetByteCodesMessage extends AbstractSnapMessageData {
+
+  public GetByteCodesMessage(final Bytes data) {
+    super(data);
+  }
+
+  public static GetByteCodesMessage readFrom(final MessageData message) {
+    if (message instanceof GetByteCodesMessage) {
+      return (GetByteCodesMessage) message;
+    }
+    final int code = message.getCode();
+    if (code != SnapV1.GET_BYTECODES) {
+      throw new IllegalArgumentException(
+          String.format("Message has code %d and thus is not a GetByteCodesMessage.", code));
+    }
+    return new GetByteCodesMessage(message.getData());
+  }
+
+  public static GetByteCodesMessage create(final List<Bytes32> codeHashes) {
+    return create(Optional.empty(), codeHashes);
+  }
+
+  public static GetByteCodesMessage create(
+      final Optional<BigInteger> requestId, final List<Bytes32> codeHashes) {
+    final BytesValueRLPOutput tmp = new BytesValueRLPOutput();
+    tmp.startList();
+    requestId.ifPresent(tmp::writeBigIntegerScalar);
+    tmp.writeList(codeHashes, (hash, rlpOutput) -> rlpOutput.writeBytes(hash));
+    tmp.writeBigIntegerScalar(SIZE_REQUEST);
+    tmp.endList();
+    return new GetByteCodesMessage(tmp.encoded());
+  }
+
+  @Override
+  protected Bytes wrap(final BigInteger requestId) {
+    return create(Optional.of(requestId), codeHashes(false).hashes()).getData();
+  }
+
+  @Override
+  public int getCode() {
+    return SnapV1.GET_BYTECODES;
+  }
+
+  public CodeHashes codeHashes(final boolean withRequestId) {
+    final List<Bytes32> hashes = new ArrayList<>();
+    final BigInteger responseBytes;
+    final RLPInput input = new BytesValueRLPInput(data, false);
+    input.enterList();
+    if (withRequestId) input.skipNext();
+    input.enterList();
+    while (!input.isEndOfCurrentList()) {
+      hashes.add(input.readBytes32());
+    }
+    input.leaveList();
+    responseBytes = input.readBigIntegerScalar();
+    input.leaveList();
+    return ImmutableCodeHashes.builder().hashes(hashes).responseBytes(responseBytes).build();
+  }
+
+  @Value.Immutable
+  public interface CodeHashes {
+
+    List<Bytes32> hashes();
+
+    BigInteger responseBytes();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetStorageRangeMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetStorageRangeMessage.java
new file mode 100644
index 00000000000..fe27f9eb5b1
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetStorageRangeMessage.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.messages.snap;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractSnapMessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Optional;
+import javax.annotation.Nullable;
+
+import kotlin.collections.ArrayDeque;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.immutables.value.Value;
+
+public final class GetStorageRangeMessage extends AbstractSnapMessageData {
+
+  public GetStorageRangeMessage(final Bytes data) {
+    super(data);
+  }
+
+  public static GetStorageRangeMessage readFrom(final MessageData message) {
+    if (message instanceof GetStorageRangeMessage) {
+      return (GetStorageRangeMessage) message;
+    }
+    final int code = message.getCode();
+    if (code != SnapV1.GET_STORAGE_RANGE) {
+      throw new IllegalArgumentException(
+          String.format("Message has code %d and thus is not a GetStorageRangeMessage.", code));
+    }
+    return new GetStorageRangeMessage(message.getData());
+  }
+
+  public static GetStorageRangeMessage create(
+      final Hash worldStateRootHash,
+      final List<Bytes32> accountHashes,
+      final Bytes32 startKeyHash,
+      final Bytes32 endKeyHash) {
+    return create(Optional.empty(), worldStateRootHash, accountHashes, startKeyHash, endKeyHash);
+  }
+
+  public static GetStorageRangeMessage create(
+      final Optional<BigInteger> requestId,
+      final Hash worldStateRootHash,
+      final List<Bytes32> accountHashes,
+      final Bytes32 startKeyHash,
+      final Bytes32 endKeyHash) {
+    final BytesValueRLPOutput tmp = new BytesValueRLPOutput();
+    tmp.startList();
+    requestId.ifPresent(tmp::writeBigIntegerScalar);
+    tmp.writeBytes(worldStateRootHash);
+    tmp.writeList(accountHashes, (hash, rlpOutput) -> rlpOutput.writeBytes(hash));
+    tmp.writeBytes(startKeyHash);
+    tmp.writeBytes(endKeyHash);
+    tmp.writeBigIntegerScalar(SIZE_REQUEST);
+    tmp.endList();
+    return new GetStorageRangeMessage(tmp.encoded());
+  }
+
+  @Override
+  protected Bytes wrap(final BigInteger requestId) {
+    final StorageRange range = range(false);
+    return create(
+            Optional.of(requestId),
+            range.worldStateRootHash(),
+            range.hashes(),
+            range.startKeyHash(),
+            range.endKeyHash())
+        .getData();
+  }
+
+  @Override
+  public int getCode() {
+    return SnapV1.GET_STORAGE_RANGE;
+  }
+
+  public StorageRange range(final boolean withRequestId) {
+    final ArrayDeque<Bytes32> hashes = new ArrayDeque<>();
+    final RLPInput input = new BytesValueRLPInput(data, false);
+    input.enterList();
+    if (withRequestId) input.skipNext();
+    final Hash worldStateRootHash = Hash.wrap(Bytes32.wrap(input.readBytes32()));
+    final ImmutableStorageRange.Builder range =
+        ImmutableStorageRange.builder()
+            .worldStateRootHash(getRootHash().orElse(worldStateRootHash));
+    input.enterList();
+    while (!input.isEndOfCurrentList()) {
+      hashes.add(input.readBytes32());
+    }
+    range.hashes(hashes);
+    input.leaveList();
+
+    if (input.nextIsNull()) {
+      input.skipNext();
+      range.startKeyHash(Hash.ZERO);
+    } else {
+      range.startKeyHash(Hash.wrap(Bytes32.wrap(input.readBytes32())));
+    }
+    if (input.nextIsNull()) {
+      input.skipNext();
+      range.endKeyHash(Hash.ZERO);
+    } else {
+      range.endKeyHash(Hash.wrap(Bytes32.wrap(input.readBytes32())));
+    }
+    range.responseBytes(input.readBigIntegerScalar());
+    input.leaveList();
+    return range.build();
+  }
+
+  @Value.Immutable
+  public interface StorageRange {
+
+    Hash worldStateRootHash();
+
+    ArrayDeque<Bytes32> hashes();
+
+    Hash startKeyHash();
+
+    @Nullable
+    Hash endKeyHash();
+
+    BigInteger responseBytes();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetTrieNodesMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetTrieNodesMessage.java
new file mode 100644
index 00000000000..1d184231edf
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetTrieNodesMessage.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.messages.snap;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractSnapMessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.immutables.value.Value;
+
+public final class GetTrieNodesMessage extends AbstractSnapMessageData {
+
+  public GetTrieNodesMessage(final Bytes data) {
+    super(data);
+  }
+
+  public static GetTrieNodesMessage readFrom(final MessageData message) {
+    if (message instanceof GetTrieNodesMessage) {
+      return (GetTrieNodesMessage) message;
+    }
+    final int code = message.getCode();
+    if (code != SnapV1.GET_TRIE_NODES) {
+      throw new IllegalArgumentException(
+          String.format("Message has code %d and thus is not a GetTrieNodes.", code));
+    }
+    return new GetTrieNodesMessage(message.getData());
+  }
+
+  public static GetTrieNodesMessage create(
+      final Hash worldStateRootHash, final List<List<Bytes>> requests) {
+    return create(Optional.empty(), worldStateRootHash, requests);
+  }
+
+  public static GetTrieNodesMessage create(
+      final Optional<BigInteger> requestId,
+      final Hash worldStateRootHash,
+      final List<List<Bytes>> paths) {
+    final BytesValueRLPOutput tmp = new BytesValueRLPOutput();
+    tmp.startList();
+    requestId.ifPresent(tmp::writeBigIntegerScalar);
+    tmp.writeBytes(worldStateRootHash);
+    tmp.writeList(
+        paths,
+        (path, rlpOutput) ->
+            rlpOutput.writeList(path, (b, subRlpOutput) -> subRlpOutput.writeBytes(b)));
+    tmp.writeBigIntegerScalar(SIZE_REQUEST);
+    tmp.endList();
+    return new GetTrieNodesMessage(tmp.encoded());
+  }
+
+  @Override
+  protected Bytes wrap(final BigInteger requestId) {
+    final TrieNodesPaths paths = paths(false);
+    return create(Optional.of(requestId), paths.worldStateRootHash(), paths.paths()).getData();
+  }
+
+  @Override
+  public int getCode() {
+    return SnapV1.GET_TRIE_NODES;
+  }
+
+  public TrieNodesPaths paths(final boolean withRequestId) {
+    final RLPInput input = new BytesValueRLPInput(data, false);
+    input.enterList();
+    if (withRequestId) input.skipNext();
+    final ImmutableTrieNodesPaths.Builder paths =
+        ImmutableTrieNodesPaths.builder()
+            .worldStateRootHash(Hash.wrap(Bytes32.wrap(input.readBytes32())))
+            .paths(input.readList(rlpInput -> rlpInput.readList(RLPInput::readBytes)))
+            .responseBytes(input.readBigIntegerScalar());
+    input.leaveList();
+    return paths.build();
+  }
+
+  @Value.Immutable
+  public interface TrieNodesPaths {
+
+    Hash worldStateRootHash();
+
+    List<List<Bytes>> paths();
+
+    BigInteger responseBytes();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/SnapV1.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/SnapV1.java
new file mode 100644
index 00000000000..219d81031ce
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/SnapV1.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.messages.snap;
+
+public final class SnapV1 {
+
+  public static final int GET_ACCOUNT_RANGE = 0x00;
+  public static final int ACCOUNT_RANGE = 0x01;
+  public static final int GET_STORAGE_RANGE = 0x02;
+  public static final int STORAGE_RANGE = 0x03;
+  public static final int GET_BYTECODES = 0x04;
+  public static final int BYTECODES = 0x05;
+  public static final int GET_TRIE_NODES = 0x06;
+  public static final int TRIE_NODES = 0x07;
+
+  private SnapV1() {
+    // Holder for constants only
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/StorageRangeMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/StorageRangeMessage.java
new file mode 100644
index 00000000000..ab4a353fea2
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/StorageRangeMessage.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.messages.snap;
+
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractSnapMessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Optional;
+import java.util.TreeMap;
+
+import kotlin.collections.ArrayDeque;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.immutables.value.Value;
+
+public final class StorageRangeMessage extends AbstractSnapMessageData {
+
+  public StorageRangeMessage(final Bytes data) {
+    super(data);
+  }
+
+  public static StorageRangeMessage readFrom(final MessageData message) {
+    if (message instanceof StorageRangeMessage) {
+      return (StorageRangeMessage) message;
+    }
+    final int code = message.getCode();
+    if (code != SnapV1.STORAGE_RANGE) {
+      throw new IllegalArgumentException(
+          String.format("Message has code %d and thus is not a StorageRangeMessage.", code));
+    }
+    return new StorageRangeMessage(message.getData());
+  }
+
+  public static StorageRangeMessage create(
+      final ArrayDeque<TreeMap<Bytes32, Bytes>> slots, final List<Bytes> proof) {
+    return create(Optional.empty(), slots, proof);
+  }
+
+  public static StorageRangeMessage create(
+      final Optional<BigInteger> requestId,
+      final ArrayDeque<TreeMap<Bytes32, Bytes>> slots,
+      final List<Bytes> proof) {
+    final BytesValueRLPOutput tmp = new BytesValueRLPOutput();
+    tmp.startList();
+    requestId.ifPresent(tmp::writeBigIntegerScalar);
+    tmp.writeList(
+        slots,
+        (accountList, accountRlpOutput) ->
+            accountRlpOutput.writeList(
+                accountList.entrySet(),
+                (entry, slotRlpOutput) -> {
+                  slotRlpOutput.startList();
+                  slotRlpOutput.writeBytes(entry.getKey());
+                  slotRlpOutput.writeBytes(entry.getValue());
+                  slotRlpOutput.endList();
+                }));
+    tmp.writeList(proof, (bytes, rlpOutput) -> rlpOutput.writeBytes(bytes));
+    tmp.endList();
+    return new StorageRangeMessage(tmp.encoded());
+  }
+
+  @Override
+  protected Bytes wrap(final BigInteger requestId) {
+    final SlotRangeData slotsData = slotsData(false);
+    return create(Optional.of(requestId), slotsData.slots(), slotsData.proofs()).getData();
+  }
+
+  @Override
+  public int getCode() {
+    return SnapV1.STORAGE_RANGE;
+  }
+
+  public SlotRangeData slotsData(final boolean withRequestId) {
+    final ArrayDeque<TreeMap<Bytes32, Bytes>> slots = new ArrayDeque<>();
+    final ArrayDeque<Bytes> proofs = new ArrayDeque<>();
+    final RLPInput input = new BytesValueRLPInput(data, false);
+    input.enterList();
+
+    if (withRequestId) input.skipNext();
+
+    input.readList(
+        accountRlpInput -> {
+          slots.add(new TreeMap<>());
+          return accountRlpInput.readList(
+              slotRlpInput -> {
+                slotRlpInput.enterList();
+                slots.last().put(slotRlpInput.readBytes32(), slotRlpInput.readBytes());
+                slotRlpInput.leaveList();
+                return Void.TYPE; // we don't need the response
+              });
+        });
+
+    input.enterList();
+    while (!input.isEndOfCurrentList()) {
+      proofs.add(input.readBytes());
+    }
+    input.leaveList();
+
+    input.leaveList();
+    return ImmutableSlotRangeData.builder().slots(slots).proofs(proofs).build();
+  }
+
+  @Value.Immutable
+  public interface SlotRangeData {
+
+    ArrayDeque<TreeMap<Bytes32, Bytes>> slots();
+
+    ArrayDeque<Bytes> proofs();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/TrieNodesMessage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/TrieNodesMessage.java
new file mode 100644
index 00000000000..15208e7b420
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/messages/snap/TrieNodesMessage.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.messages.snap;
+
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractSnapMessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Optional;
+
+import kotlin.collections.ArrayDeque;
+import org.apache.tuweni.bytes.Bytes;
+
+public final class TrieNodesMessage extends AbstractSnapMessageData {
+
+  public TrieNodesMessage(final Bytes data) {
+    super(data);
+  }
+
+  public static TrieNodesMessage readFrom(final MessageData message) {
+    if (message instanceof TrieNodesMessage) {
+      return (TrieNodesMessage) message;
+    }
+    final int code = message.getCode();
+    if (code != SnapV1.TRIE_NODES) {
+      throw new IllegalArgumentException(
+          String.format("Message has code %d and thus is not a TrieNodes.", code));
+    }
+    return new TrieNodesMessage(message.getData());
+  }
+
+  public static TrieNodesMessage create(final List<Bytes> nodes) {
+    return create(Optional.empty(), nodes);
+  }
+
+  public static TrieNodesMessage create(
+      final Optional<BigInteger> requestId, final List<Bytes> nodes) {
+    final BytesValueRLPOutput tmp = new BytesValueRLPOutput();
+    tmp.startList();
+    requestId.ifPresent(tmp::writeBigIntegerScalar);
+    tmp.writeList(nodes, (node, rlpOutput) -> rlpOutput.writeBytes(node));
+    tmp.endList();
+    return new TrieNodesMessage(tmp.encoded());
+  }
+
+  @Override
+  protected Bytes wrap(final BigInteger requestId) {
+    final List<Bytes> nodes = nodes(false);
+    return create(Optional.of(requestId), nodes).getData();
+  }
+
+  @Override
+  public int getCode() {
+    return SnapV1.TRIE_NODES;
+  }
+
+  public ArrayDeque<Bytes> nodes(final boolean withRequestId) {
+    final ArrayDeque<Bytes> trieNodes = new ArrayDeque<>();
+    final RLPInput input = new BytesValueRLPInput(data, false);
+    input.enterList();
+    if (withRequestId) input.skipNext();
+    input.enterList();
+    while (!input.isEndOfCurrentList()) {
+      trieNodes.add(input.readBytes());
+    }
+    input.leaveList();
+    input.leaveList();
+    return trieNodes;
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/AbstractPeerBlockValidator.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/AbstractPeerBlockValidator.java
index 85062282a3b..55c3dd89e56 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/AbstractPeerBlockValidator.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/AbstractPeerBlockValidator.java
@@ -30,11 +30,11 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 abstract class AbstractPeerBlockValidator implements PeerValidator {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractPeerBlockValidator.class);
   static long DEFAULT_CHAIN_HEIGHT_ESTIMATION_BUFFER = 10L;
 
   private final ProtocolSchedule protocolSchedule;
@@ -78,7 +78,7 @@ public CompletableFuture<Boolean> validatePeer(
               if (err != null) {
                 // Mark peer as invalid on error
                 LOG.debug(
-                    "Peer {} is invalid because required block block ({}) is unavailable: {}",
+                    "Peer {} is invalid because required block ({}) is unavailable: {}",
                     ethPeer,
                     blockNumber,
                     err.toString());
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/CheckpointBlocksPeerValidator.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/CheckpointBlocksPeerValidator.java
new file mode 100644
index 00000000000..2e36566d209
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/CheckpointBlocksPeerValidator.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.peervalidation;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+public class CheckpointBlocksPeerValidator extends RequiredBlocksPeerValidator {
+
+  public CheckpointBlocksPeerValidator(
+      final ProtocolSchedule protocolSchedule,
+      final MetricsSystem metricsSystem,
+      final long blockNumber,
+      final Hash hash,
+      final long chainHeightEstimationBuffer) {
+    super(protocolSchedule, metricsSystem, blockNumber, hash, chainHeightEstimationBuffer);
+  }
+
+  public CheckpointBlocksPeerValidator(
+      final ProtocolSchedule protocolSchedule,
+      final MetricsSystem metricsSystem,
+      final long blockNumber,
+      final Hash hash) {
+    this(
+        protocolSchedule, metricsSystem, blockNumber, hash, DEFAULT_CHAIN_HEIGHT_ESTIMATION_BUFFER);
+  }
+
+  @Override
+  boolean validateBlockHeader(final EthPeer ethPeer, final BlockHeader header) {
+    final boolean valid = super.validateBlockHeader(ethPeer, header);
+    if (valid) {
+      ethPeer.setCheckpointHeader(header);
+    }
+    return valid;
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/ClassicForkPeerValidator.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/ClassicForkPeerValidator.java
index 0d585c40f38..2958ec8e551 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/ClassicForkPeerValidator.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/ClassicForkPeerValidator.java
@@ -20,11 +20,11 @@
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ClassicForkPeerValidator extends AbstractPeerBlockValidator {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(ClassicForkPeerValidator.class);
 
   ClassicForkPeerValidator(
       final ProtocolSchedule protocolSchedule,
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/DaoForkPeerValidator.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/DaoForkPeerValidator.java
index 9585daaecb8..d038ad0e9a9 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/DaoForkPeerValidator.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/DaoForkPeerValidator.java
@@ -20,11 +20,11 @@
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DaoForkPeerValidator extends AbstractPeerBlockValidator {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(DaoForkPeerValidator.class);
 
   DaoForkPeerValidator(
       final ProtocolSchedule protocolSchedule,
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/PeerValidatorRunner.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/PeerValidatorRunner.java
index 01635f98c77..a2afdaf5551 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/PeerValidatorRunner.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/PeerValidatorRunner.java
@@ -19,11 +19,11 @@
 
 import java.time.Duration;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PeerValidatorRunner {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PeerValidatorRunner.class);
   protected final EthContext ethContext;
   private final PeerValidator peerValidator;
 
@@ -65,7 +65,7 @@ protected void disconnectPeer(final EthPeer ethPeer) {
   }
 
   protected void scheduleNextCheck(final EthPeer ethPeer) {
-    Duration timeout = peerValidator.nextValidationCheckTimeout(ethPeer);
+    final Duration timeout = peerValidator.nextValidationCheckTimeout(ethPeer);
     ethContext.getScheduler().scheduleFutureTask(() -> checkPeer(ethPeer), timeout);
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/RequiredBlocksPeerValidator.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/RequiredBlocksPeerValidator.java
index 0a15d6a3601..de5a6f359fa 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/RequiredBlocksPeerValidator.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/peervalidation/RequiredBlocksPeerValidator.java
@@ -16,21 +16,21 @@
  */
 package org.hyperledger.besu.ethereum.eth.peervalidation;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class RequiredBlocksPeerValidator extends AbstractPeerBlockValidator {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(RequiredBlocksPeerValidator.class);
 
   private final Hash hash;
 
-  RequiredBlocksPeerValidator(
+  public RequiredBlocksPeerValidator(
       final ProtocolSchedule protocolSchedule,
       final MetricsSystem metricsSystem,
       final long blockNumber,
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/BlockBroadcaster.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/BlockBroadcaster.java
index 75b96ed7ea1..1bf55b01f81 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/BlockBroadcaster.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/BlockBroadcaster.java
@@ -21,11 +21,11 @@
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.util.Subscribers;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class BlockBroadcaster {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(BlockBroadcaster.class);
 
   private final EthContext ethContext;
   private final Subscribers<BlockPropagatedSubscriber> blockPropagatedSubscribers =
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/BlockPropagationManager.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/BlockPropagationManager.java
index 1d7b841f166..2e9e13b45db 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/BlockPropagationManager.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/BlockPropagationManager.java
@@ -14,20 +14,25 @@
  */
 package org.hyperledger.besu.ethereum.eth.sync;
 
+import static org.hyperledger.besu.util.FutureUtils.exceptionallyCompose;
+
+import org.hyperledger.besu.consensus.merge.ForkchoiceEvent;
+import org.hyperledger.besu.consensus.merge.UnverifiedForkchoiceListener;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.BadBlockManager;
 import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
 import org.hyperledger.besu.ethereum.chain.BlockAddedEvent.EventType;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthMessage;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
-import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerTask;
-import org.hyperledger.besu.ethereum.eth.manager.task.GetBlockFromPeerTask;
+import org.hyperledger.besu.ethereum.eth.manager.task.RetryingGetBlockFromPeersTask;
 import org.hyperledger.besu.ethereum.eth.messages.EthPV62;
 import org.hyperledger.besu.ethereum.eth.messages.NewBlockHashesMessage;
 import org.hyperledger.besu.ethereum.eth.messages.NewBlockHashesMessage.NewBlockHash;
@@ -43,26 +48,30 @@
 import org.hyperledger.besu.ethereum.rlp.RLPException;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
+import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Range;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class BlockPropagationManager {
-  private static final Logger LOG = LogManager.getLogger();
-
+public class BlockPropagationManager implements UnverifiedForkchoiceListener {
+  private static final Logger LOG = LoggerFactory.getLogger(BlockPropagationManager.class);
   private final SynchronizerConfiguration config;
   private final ProtocolSchedule protocolSchedule;
   private final ProtocolContext protocolContext;
@@ -72,10 +81,12 @@ public class BlockPropagationManager {
   private final BlockBroadcaster blockBroadcaster;
 
   private final AtomicBoolean started = new AtomicBoolean(false);
-
-  private final Set<Hash> requestedBlocks = Collections.newSetFromMap(new ConcurrentHashMap<>());
-  private final Set<Hash> importingBlocks = Collections.newSetFromMap(new ConcurrentHashMap<>());
+  private final ProcessingBlocksManager processingBlocksManager;
   private final PendingBlocksManager pendingBlocksManager;
+  private final Duration getBlockTimeoutMillis;
+  private Optional<Long> onBlockAddedSId = Optional.empty();
+  private Optional<Long> newBlockSId;
+  private Optional<Long> newBlockHashesSId;
 
   BlockPropagationManager(
       final SynchronizerConfiguration config,
@@ -86,6 +97,28 @@ public class BlockPropagationManager {
       final PendingBlocksManager pendingBlocksManager,
       final MetricsSystem metricsSystem,
       final BlockBroadcaster blockBroadcaster) {
+    this(
+        config,
+        protocolSchedule,
+        protocolContext,
+        ethContext,
+        syncState,
+        pendingBlocksManager,
+        metricsSystem,
+        blockBroadcaster,
+        new ProcessingBlocksManager());
+  }
+
+  BlockPropagationManager(
+      final SynchronizerConfiguration config,
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final EthContext ethContext,
+      final SyncState syncState,
+      final PendingBlocksManager pendingBlocksManager,
+      final MetricsSystem metricsSystem,
+      final BlockBroadcaster blockBroadcaster,
+      final ProcessingBlocksManager processingBlocksManager) {
     this.config = config;
     this.protocolSchedule = protocolSchedule;
     this.protocolContext = protocolContext;
@@ -94,6 +127,10 @@ public class BlockPropagationManager {
     this.blockBroadcaster = blockBroadcaster;
     this.syncState = syncState;
     this.pendingBlocksManager = pendingBlocksManager;
+    this.syncState.subscribeTTDReached(this::reactToTTDReachedEvent);
+    this.getBlockTimeoutMillis =
+        Duration.ofMillis(config.getPropagationManagerGetBlockTimeoutMillis());
+    this.processingBlocksManager = processingBlocksManager;
   }
 
   public void start() {
@@ -105,28 +142,96 @@ public void start() {
     }
   }
 
+  public void stop() {
+    if (started.get()) {
+      clearListeners();
+      started.set(false);
+    } else {
+      LOG.debug("Attempted to stop when we are not even running...");
+    }
+  }
+
+  public boolean isRunning() {
+    return started.get();
+  }
+
   private void setupListeners() {
-    protocolContext.getBlockchain().observeBlockAdded(this::onBlockAdded);
-    ethContext.getEthMessages().subscribe(EthPV62.NEW_BLOCK, this::handleNewBlockFromNetwork);
-    ethContext
-        .getEthMessages()
-        .subscribe(EthPV62.NEW_BLOCK_HASHES, this::handleNewBlockHashesFromNetwork);
+    onBlockAddedSId =
+        Optional.of(protocolContext.getBlockchain().observeBlockAdded(this::onBlockAdded));
+    newBlockSId =
+        Optional.of(
+            ethContext
+                .getEthMessages()
+                .subscribe(EthPV62.NEW_BLOCK, this::handleNewBlockFromNetwork));
+    newBlockHashesSId =
+        Optional.of(
+            ethContext
+                .getEthMessages()
+                .subscribe(EthPV62.NEW_BLOCK_HASHES, this::handleNewBlockHashesFromNetwork));
+  }
+
+  private void clearListeners() {
+    onBlockAddedSId.ifPresent(id -> protocolContext.getBlockchain().removeObserver(id));
+    newBlockSId.ifPresent(id -> ethContext.getEthMessages().unsubscribe(id, EthPV62.NEW_BLOCK));
+    newBlockHashesSId.ifPresent(
+        id -> ethContext.getEthMessages().unsubscribe(id, EthPV62.NEW_BLOCK_HASHES));
+    onBlockAddedSId = Optional.empty();
+    newBlockSId = Optional.empty();
+    newBlockHashesSId = Optional.empty();
   }
 
   private void onBlockAdded(final BlockAddedEvent blockAddedEvent) {
     // Check to see if any of our pending blocks are now ready for import
     final Block newBlock = blockAddedEvent.getBlock();
+    LOG.atTrace()
+        .setMessage("Block added event type {} for block {}. Current status {}")
+        .addArgument(blockAddedEvent::getEventType)
+        .addArgument(newBlock::toLogString)
+        .addArgument(this)
+        .log();
+
+    // If there is no children to process, maybe try non announced blocks
+    if (!maybeProcessPendingChildrenBlocks(newBlock)) {
+      LOG.atTrace()
+          .setMessage("There are no pending blocks ready to import for block {}")
+          .addArgument(newBlock::toLogString)
+          .log();
+      maybeProcessNonAnnouncedBlocks(newBlock);
+    }
 
+    if (blockAddedEvent.getEventType().equals(EventType.HEAD_ADVANCED)) {
+      final long head = protocolContext.getBlockchain().getChainHeadBlockNumber();
+      final long cutoff = head + config.getBlockPropagationRange().lowerEndpoint();
+      pendingBlocksManager.purgeBlocksOlderThan(cutoff);
+    }
+  }
+
+  /**
+   * Process pending Children if any
+   *
+   * @param block the block to process the children
+   * @return true if block has any pending child
+   */
+  private boolean maybeProcessPendingChildrenBlocks(final Block block) {
     final List<Block> readyForImport;
     synchronized (pendingBlocksManager) {
       // Remove block from pendingBlocks list
-      pendingBlocksManager.deregisterPendingBlock(newBlock);
+      pendingBlocksManager.deregisterPendingBlock(block);
 
       // Import any pending blocks that are children of the newly added block
-      readyForImport = pendingBlocksManager.childrenOf(newBlock.getHash());
+      readyForImport = pendingBlocksManager.childrenOf(block.getHash());
     }
 
     if (!readyForImport.isEmpty()) {
+
+      LOG.atTrace()
+          .setMessage("Ready to import pending blocks found [{}] for block {}")
+          .addArgument(
+              () ->
+                  readyForImport.stream().map(Block::toLogString).collect(Collectors.joining(", ")))
+          .addArgument(block::toLogString)
+          .log();
+
       final Supplier<CompletableFuture<List<Block>>> importBlocksTask =
           PersistBlockTask.forUnorderedBlocks(
               protocolSchedule,
@@ -141,15 +246,44 @@ private void onBlockAdded(final BlockAddedEvent blockAddedEvent) {
           .whenComplete(
               (r, t) -> {
                 if (r != null) {
-                  LOG.info("Imported {} pending blocks", r.size());
+                  LOG.info(
+                      "Imported {} pending blocks: {}",
+                      r.size(),
+                      r.stream().map(b -> b.getHeader().getNumber()).collect(Collectors.toList()));
+                }
+                if (t != null) {
+                  LOG.error("Error importing pending blocks", t);
                 }
               });
     }
+    return !readyForImport.isEmpty();
+  }
 
-    if (blockAddedEvent.getEventType().equals(EventType.HEAD_ADVANCED)) {
-      final long head = protocolContext.getBlockchain().getChainHeadBlockNumber();
-      final long cutoff = head + config.getBlockPropagationRange().lowerEndpoint();
-      pendingBlocksManager.purgeBlocksOlderThan(cutoff);
+  private void maybeProcessNonAnnouncedBlocks(final Block newBlock) {
+    final long localHeadBlockNumber = protocolContext.getBlockchain().getChainHeadBlockNumber();
+
+    if (newBlock.getHeader().getNumber() > localHeadBlockNumber) {
+      pendingBlocksManager
+          .lowestAnnouncedBlock()
+          .map(ProcessableBlockHeader::getNumber)
+          .ifPresent(
+              minAnnouncedBlockNumber -> {
+                final long distance = minAnnouncedBlockNumber - localHeadBlockNumber;
+                LOG.trace(
+                    "Found lowest announced block {} with distance {}",
+                    minAnnouncedBlockNumber,
+                    distance);
+
+                final long firstNonAnnouncedBlockNumber = newBlock.getHeader().getNumber() + 1;
+
+                if (distance < config.getBlockPropagationRange().upperEndpoint()
+                    && minAnnouncedBlockNumber > firstNonAnnouncedBlockNumber) {
+
+                  if (processingBlocksManager.addNonAnnouncedBlocks(firstNonAnnouncedBlockNumber)) {
+                    retrieveNonAnnouncedBlock(firstNonAnnouncedBlockNumber);
+                  }
+                }
+              });
     }
   }
 
@@ -158,6 +292,13 @@ private void handleNewBlockFromNetwork(final EthMessage message) {
     final NewBlockMessage newBlockMessage = NewBlockMessage.readFrom(message.getData());
     try {
       final Block block = newBlockMessage.block(protocolSchedule);
+      LOG.atTrace()
+          .setMessage("New block from network {} from peer {}. Current status {}")
+          .addArgument(block::toLogString)
+          .addArgument(message::getPeer)
+          .addArgument(this)
+          .log();
+
       final Difficulty totalDifficulty = newBlockMessage.totalDifficulty(protocolSchedule);
 
       message.getPeer().chainState().updateForAnnouncedBlock(block.getHeader(), totalDifficulty);
@@ -167,19 +308,34 @@ private void handleNewBlockFromNetwork(final EthMessage message) {
       final long bestChainHeight = syncState.bestChainHeight(localChainHeight);
       if (!shouldImportBlockAtHeight(
           block.getHeader().getNumber(), localChainHeight, bestChainHeight)) {
+        LOG.atTrace()
+            .setMessage(
+                "Do not import new block from network {}, current chain heights are: local {}, best {}")
+            .addArgument(block::toLogString)
+            .addArgument(localChainHeight)
+            .addArgument(bestChainHeight)
+            .log();
         return;
       }
       if (pendingBlocksManager.contains(block.getHash())) {
+        LOG.atTrace()
+            .setMessage("New block from network {} is already pending")
+            .addArgument(block::toLogString)
+            .log();
         return;
       }
       if (blockchain.contains(block.getHash())) {
+        LOG.atTrace()
+            .setMessage("New block from network {} is already present")
+            .addArgument(block::toLogString)
+            .log();
         return;
       }
 
       importOrSavePendingBlock(block, message.getPeer().nodeId());
     } catch (final RLPException e) {
       LOG.debug(
-          "Malformed NEW_BLOCK message received from peer, disconnecting: {}",
+          "Malformed NEW_BLOCK message received from peer (BREACH_OF_PROTOCOL), disconnecting: {}",
           message.getPeer(),
           e);
       message.getPeer().disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
@@ -194,6 +350,13 @@ private void handleNewBlockHashesFromNetwork(final EthMessage message) {
       // Register announced blocks
       final List<NewBlockHash> announcedBlocks =
           Lists.newArrayList(newBlockHashesMessage.getNewHashes());
+      LOG.atTrace()
+          .setMessage("New block hashes from network {} from peer {}. Current status {}")
+          .addArgument(() -> toLogString(announcedBlocks))
+          .addArgument(message::getPeer)
+          .addArgument(this)
+          .log();
+
       for (final NewBlockHash announcedBlock : announcedBlocks) {
         message.getPeer().registerKnownBlock(announcedBlock.hash());
         message.getPeer().registerHeight(announcedBlock.hash(), announcedBlock.number());
@@ -210,47 +373,183 @@ private void handleNewBlockHashesFromNetwork(final EthMessage message) {
       // Filter for blocks we don't yet know about
       final List<NewBlockHash> newBlocks = new ArrayList<>();
       for (final NewBlockHash announcedBlock : relevantAnnouncements) {
-        if (requestedBlocks.contains(announcedBlock.hash())) {
-          continue;
-        }
         if (pendingBlocksManager.contains(announcedBlock.hash())) {
+          LOG.trace("New block hash from network {} is already pending", announcedBlock);
           continue;
         }
-        if (importingBlocks.contains(announcedBlock.hash())) {
+        if (processingBlocksManager.alreadyImporting(announcedBlock.hash())) {
+          LOG.trace("New block hash from network {} is already importing", announcedBlock);
           continue;
         }
         if (blockchain.contains(announcedBlock.hash())) {
+          LOG.trace("New block hash from network {} was already imported", announcedBlock);
           continue;
         }
-        if (requestedBlocks.add(announcedBlock.hash())) {
+        if (processingBlocksManager.addRequestedBlock(announcedBlock.hash())) {
           newBlocks.add(announcedBlock);
+        } else {
+          LOG.trace("New block hash from network {} was already requested", announcedBlock);
         }
       }
 
       // Process known blocks we care about
       for (final NewBlockHash newBlock : newBlocks) {
-        processAnnouncedBlock(message.getPeer(), newBlock)
-            .whenComplete((r, t) -> requestedBlocks.remove(newBlock.hash()));
+        processAnnouncedBlock(message.getPeer(), newBlock);
       }
     } catch (final RLPException e) {
       LOG.debug(
-          "Malformed NEW_BLOCK_HASHES message received from peer, disconnecting: {}",
+          "Malformed NEW_BLOCK_HASHES message received from peer (BREACH_OF_PROTOCOL), disconnecting: {}",
           message.getPeer(),
           e);
       message.getPeer().disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
     }
   }
 
+  private CompletableFuture<Block> retrieveNonAnnouncedBlock(final long blockNumber) {
+    LOG.trace("Retrieve non announced block {} from peers", blockNumber);
+    return getBlockFromPeers(Optional.empty(), blockNumber, Optional.empty());
+  }
+
   private CompletableFuture<Block> processAnnouncedBlock(
-      final EthPeer peer, final NewBlockHash newBlock) {
-    final AbstractPeerTask<Block> getBlockTask =
-        GetBlockFromPeerTask.create(
-                protocolSchedule, ethContext, newBlock.hash(), newBlock.number(), metricsSystem)
-            .assignPeer(peer);
+      final EthPeer peer, final NewBlockHash blockHash) {
+    LOG.trace("Retrieve announced block by header {} from peers", blockHash);
+    return getBlockFromPeers(Optional.of(peer), blockHash.number(), Optional.of(blockHash.hash()));
+  }
 
-    return getBlockTask
-        .run()
-        .thenCompose((r) -> importOrSavePendingBlock(r.getResult(), peer.nodeId()));
+  private void requestParentBlock(final Block block) {
+    final BlockHeader blockHeader = block.getHeader();
+    if (processingBlocksManager.addRequestedBlock(blockHeader.getParentHash())) {
+      retrieveParentBlock(blockHeader);
+    } else {
+      LOG.debug("Parent block with hash {} is already requested", blockHeader.getParentHash());
+    }
+  }
+
+  private CompletableFuture<Block> retrieveParentBlock(final BlockHeader blockHeader) {
+    final long targetParentBlockNumber = blockHeader.getNumber() - 1L;
+    final Hash targetParentBlockHash = blockHeader.getParentHash();
+    LOG.info("Retrieving parent {} of block {}", targetParentBlockHash, blockHeader.toLogString());
+    return getBlockFromPeers(
+        Optional.empty(), targetParentBlockNumber, Optional.of(targetParentBlockHash));
+  }
+
+  private CompletableFuture<Block> getBlockFromPeers(
+      final Optional<EthPeer> preferredPeer,
+      final long blockNumber,
+      final Optional<Hash> maybeBlockHash) {
+    return repeatableGetBlockFromPeer(preferredPeer, blockNumber, maybeBlockHash)
+        .whenComplete(
+            (block, throwable) -> {
+              if (block != null) {
+                LOG.atDebug()
+                    .setMessage("Successfully retrieved block {}")
+                    .addArgument(block::toLogString)
+                    .log();
+                processingBlocksManager.registerReceivedBlock(block);
+              } else {
+                if (throwable != null) {
+                  LOG.warn(
+                      "Failed to retrieve block "
+                          + logBlockNumberMaybeHash(blockNumber, maybeBlockHash),
+                      throwable);
+                } else {
+                  // this could happen if we give up at some point since we find that it make no
+                  // sense to retry
+                  LOG.atDebug()
+                      .setMessage("Block {} not retrieved")
+                      .addArgument(() -> logBlockNumberMaybeHash(blockNumber, maybeBlockHash))
+                      .log();
+                }
+                processingBlocksManager.registerFailedGetBlock(blockNumber, maybeBlockHash);
+              }
+            });
+  }
+
+  private CompletableFuture<Block> repeatableGetBlockFromPeer(
+      final Optional<EthPeer> preferredPeer,
+      final long blockNumber,
+      final Optional<Hash> maybeBlockHash) {
+    return exceptionallyCompose(
+            scheduleGetBlockFromPeers(preferredPeer, blockNumber, maybeBlockHash),
+            handleGetBlockErrors(blockNumber, maybeBlockHash))
+        .thenCompose(r -> maybeRepeatGetBlock(blockNumber, maybeBlockHash));
+  }
+
+  private Function<Throwable, CompletionStage<Block>> handleGetBlockErrors(
+      final long blockNumber, final Optional<Hash> maybeBlockHash) {
+    return throwable -> {
+      LOG.atDebug()
+          .setMessage("Temporary failure retrieving block {} from peers with error {}")
+          .addArgument(() -> logBlockNumberMaybeHash(blockNumber, maybeBlockHash))
+          .addArgument(throwable)
+          .log();
+      return CompletableFuture.completedFuture(null);
+    };
+  }
+
+  private CompletableFuture<Block> maybeRepeatGetBlock(
+      final long blockNumber, final Optional<Hash> maybeBlockHash) {
+    final MutableBlockchain blockchain = protocolContext.getBlockchain();
+    final Optional<Block> maybeBlock =
+        maybeBlockHash
+            .map(hash -> blockchain.getBlockByHash(hash))
+            .orElseGet(() -> blockchain.getBlockByNumber(blockNumber));
+
+    // check if we got this block by other means
+    if (maybeBlock.isPresent()) {
+      final Block block = maybeBlock.get();
+      LOG.atDebug()
+          .setMessage("No need to retry to get block {} since it is already present")
+          .addArgument(block::toLogString)
+          .log();
+      return CompletableFuture.completedFuture(block);
+    }
+
+    final long localChainHeight = blockchain.getChainHeadBlockNumber();
+    final long bestChainHeight = syncState.bestChainHeight(localChainHeight);
+    if (!shouldImportBlockAtHeight(blockNumber, localChainHeight, bestChainHeight)) {
+      LOG.atDebug()
+          .setMessage("Not retrying to get block {} since we are too far from local chain head {}")
+          .addArgument(() -> logBlockNumberMaybeHash(blockNumber, maybeBlockHash))
+          .addArgument(blockchain.getChainHead()::toLogString)
+          .log();
+      return CompletableFuture.completedFuture(null);
+    }
+
+    LOG.atDebug()
+        .setMessage("Retrying to get block {}")
+        .addArgument(() -> logBlockNumberMaybeHash(blockNumber, maybeBlockHash))
+        .log();
+
+    return ethContext
+        .getScheduler()
+        .scheduleSyncWorkerTask(
+            () -> repeatableGetBlockFromPeer(Optional.empty(), blockNumber, maybeBlockHash));
+  }
+
+  private CompletableFuture<Block> scheduleGetBlockFromPeers(
+      final Optional<EthPeer> maybePreferredPeer,
+      final long blockNumber,
+      final Optional<Hash> maybeBlockHash) {
+    final RetryingGetBlockFromPeersTask getBlockTask =
+        RetryingGetBlockFromPeersTask.create(
+            protocolSchedule,
+            ethContext,
+            metricsSystem,
+            Math.max(1, ethContext.getEthPeers().peerCount()),
+            maybeBlockHash,
+            blockNumber);
+    maybePreferredPeer.ifPresent(getBlockTask::assignPeer);
+
+    var future =
+        ethContext
+            .getScheduler()
+            .scheduleSyncWorkerTask(getBlockTask::run)
+            .thenCompose(r -> importOrSavePendingBlock(r.getResult(), r.getPeer().nodeId()));
+
+    ethContext.getScheduler().failAfterTimeout(future, getBlockTimeoutMillis);
+
+    return future;
   }
 
   private void broadcastBlock(final Block block, final BlockHeader parent) {
@@ -268,27 +567,34 @@ CompletableFuture<Block> importOrSavePendingBlock(final Block block, final Bytes
     // Synchronize to avoid race condition where block import event fires after the
     // blockchain.contains() check and before the block is registered, causing onBlockAdded() to be
     // invoked for the parent of this block before we are able to register it.
-    synchronized (pendingBlocksManager) {
-      if (!protocolContext.getBlockchain().contains(block.getHeader().getParentHash())) {
-        // Block isn't connected to local chain, save it to pending blocks collection
-        if (pendingBlocksManager.registerPendingBlock(block, nodeId)) {
-          LOG.info(
-              "Saving announced block {} ({}) for future import",
-              block.getHeader().getNumber(),
-              block.getHash());
-        }
-        return CompletableFuture.completedFuture(block);
+    LOG.atTrace()
+        .setMessage("Import or save pending block {}")
+        .addArgument(block::toLogString)
+        .log();
+
+    if (!protocolContext.getBlockchain().contains(block.getHeader().getParentHash())) {
+      // Block isn't connected to local chain, save it to pending blocks collection
+      if (savePendingBlock(block, nodeId)) {
+        // if block is saved as pending, try to resolve it
+        maybeProcessPendingBlocks(block);
       }
+      return CompletableFuture.completedFuture(block);
     }
 
-    if (!importingBlocks.add(block.getHash())) {
-      // We're already importing this block.
+    if (!processingBlocksManager.addImportingBlock(block.getHash())) {
+      LOG.atTrace()
+          .setMessage("We're already importing this block {}")
+          .addArgument(block::toLogString)
+          .log();
       return CompletableFuture.completedFuture(block);
     }
 
     if (protocolContext.getBlockchain().contains(block.getHash())) {
-      // We've already imported this block.
-      importingBlocks.remove(block.getHash());
+      LOG.atTrace()
+          .setMessage("We've already imported this block {}")
+          .addArgument(block::toLogString)
+          .log();
+      processingBlocksManager.registerBlockImportDone(block.getHash());
       return CompletableFuture.completedFuture(block);
     }
 
@@ -300,10 +606,8 @@ CompletableFuture<Block> importOrSavePendingBlock(final Block block, final Bytes
                 () ->
                     new IllegalArgumentException(
                         "Incapable of retrieving header from non-existent parent of "
-                            + block.getHeader().getNumber()
-                            + "."));
-    final ProtocolSpec protocolSpec =
-        protocolSchedule.getByBlockNumber(block.getHeader().getNumber());
+                            + block.toLogString()));
+    final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(block.getHeader());
     final BlockHeaderValidator blockHeaderValidator = protocolSpec.getBlockHeaderValidator();
     final BadBlockManager badBlockManager = protocolSpec.getBadBlocksManager();
     return ethContext
@@ -314,6 +618,48 @@ CompletableFuture<Block> importOrSavePendingBlock(final Block block, final Bytes
                     blockHeaderValidator, block, parent, badBlockManager));
   }
 
+  /**
+   * Save the given block.
+   *
+   * @param block the block to track
+   * @param nodeId node that sent the block
+   * @return true if the block was added (was not previously present)
+   */
+  private boolean savePendingBlock(final Block block, final Bytes nodeId) {
+    synchronized (pendingBlocksManager) {
+      if (pendingBlocksManager.registerPendingBlock(block, nodeId)) {
+        LOG.info(
+            "Saved announced block for future import {} - {} saved block(s)",
+            block.toLogString(),
+            pendingBlocksManager.size());
+        return true;
+      }
+      return false;
+    }
+  }
+
+  /**
+   * Try to request the lowest ancestor for the given pending block or process the descendants if
+   * the ancestor is already in the chain
+   */
+  private void maybeProcessPendingBlocks(final Block block) {
+    // Try to get the lowest ancestor pending for this block, so we can import it
+    final Optional<Block> lowestPending = pendingBlocksManager.pendingAncestorBlockOf(block);
+    if (lowestPending.isPresent()) {
+      final Block lowestPendingBlock = lowestPending.get();
+      // If the parent of the lowest ancestor is not in the chain, request it.
+      if (!protocolContext
+          .getBlockchain()
+          .contains(lowestPendingBlock.getHeader().getParentHash())) {
+        requestParentBlock(lowestPendingBlock);
+      } else {
+        LOG.trace("Parent block is already in the chain");
+        // if the parent is already imported, process its children
+        maybeProcessPendingChildrenBlocks(lowestPendingBlock);
+      }
+    }
+  }
+
   private CompletableFuture<Block> validateAndProcessPendingBlock(
       final BlockHeaderValidator blockHeaderValidator,
       final Block block,
@@ -324,12 +670,11 @@ private CompletableFuture<Block> validateAndProcessPendingBlock(
       ethContext.getScheduler().scheduleSyncWorkerTask(() -> broadcastBlock(block, parent));
       return runImportTask(block);
     } else {
-      importingBlocks.remove(block.getHash());
-      badBlockManager.addBadBlock(block);
+      processingBlocksManager.registerBlockImportDone(block.getHash());
+      badBlockManager.addBadBlock(block, Optional.empty());
       LOG.warn(
-          "Failed to import announced block {} ({}).",
-          block.getHeader().getNumber(),
-          block.getHash());
+          "Added to bad block manager for invalid header, failed to import announced block {}",
+          block.toLogString());
       return CompletableFuture.completedFuture(block);
     }
   }
@@ -347,12 +692,9 @@ private CompletableFuture<Block> runImportTask(final Block block) {
         .run()
         .whenComplete(
             (result, throwable) -> {
-              importingBlocks.remove(block.getHash());
+              processingBlocksManager.registerBlockImportDone(block.getHash());
               if (throwable != null) {
-                LOG.warn(
-                    "Failed to import announced block {} ({}).",
-                    block.getHeader().getNumber(),
-                    block.getHash());
+                LOG.warn("Failed to import announced block {}", block.toLogString());
               }
             });
   }
@@ -366,4 +708,89 @@ private boolean shouldImportBlockAtHeight(
     return importRange.contains(distanceFromLocalHead)
         && importRange.contains(distanceFromBestPeer);
   }
+
+  private String toLogString(final Collection<NewBlockHash> newBlockHashs) {
+    return newBlockHashs.stream()
+        .map(NewBlockHash::toString)
+        .collect(Collectors.joining(", ", "[", "]"));
+  }
+
+  private void reactToTTDReachedEvent(final boolean ttdReached) {
+    if (started.get() && ttdReached) {
+      LOG.info("Block propagation was running, then ttd reached");
+    } else if (!started.get()) {
+      start();
+    }
+  }
+
+  @Override
+  public String toString() {
+    return "BlockPropagationManager{"
+        + processingBlocksManager
+        + ", pendingBlocksManager="
+        + pendingBlocksManager
+        + '}';
+  }
+
+  private String logBlockNumberMaybeHash(
+      final long blockNumber, final Optional<Hash> maybeBlockHash) {
+    return blockNumber + maybeBlockHash.map(h -> " (" + h + ")").orElse("");
+  }
+
+  @Override
+  public void onNewUnverifiedForkchoice(final ForkchoiceEvent event) {
+    if (event.hasValidFinalizedBlockHash()) {
+      stop();
+    }
+  }
+
+  static class ProcessingBlocksManager {
+    private final Set<Hash> importingBlocks = Collections.newSetFromMap(new ConcurrentHashMap<>());
+    private final Set<Hash> requestedBlocks = Collections.newSetFromMap(new ConcurrentHashMap<>());
+    private final Set<Long> requestedNonAnnouncedBlocks =
+        Collections.newSetFromMap(new ConcurrentHashMap<>());
+
+    boolean addRequestedBlock(final Hash hash) {
+      return requestedBlocks.add(hash);
+    }
+
+    public boolean addNonAnnouncedBlocks(final long blockNumber) {
+      return requestedNonAnnouncedBlocks.add(blockNumber);
+    }
+
+    public boolean alreadyImporting(final Hash hash) {
+      return importingBlocks.contains(hash);
+    }
+
+    public synchronized void registerReceivedBlock(final Block block) {
+      requestedBlocks.remove(block.getHash());
+      requestedNonAnnouncedBlocks.remove(block.getHeader().getNumber());
+    }
+
+    public synchronized void registerFailedGetBlock(
+        final long blockNumber, final Optional<Hash> maybeBlockHash) {
+      requestedNonAnnouncedBlocks.remove(blockNumber);
+      maybeBlockHash.ifPresent(requestedBlocks::remove);
+    }
+
+    public boolean addImportingBlock(final Hash hash) {
+      return importingBlocks.add(hash);
+    }
+
+    public void registerBlockImportDone(final Hash hash) {
+      importingBlocks.remove(hash);
+    }
+
+    @Override
+    public synchronized String toString() {
+      return "ProcessingBlocksManager{"
+          + "importingBlocks="
+          + importingBlocks
+          + ", requestedBlocks="
+          + requestedBlocks
+          + ", requestedNonAnnouncedBlocks="
+          + requestedNonAnnouncedBlocks
+          + '}';
+    }
+  }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/ChainHeadTracker.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/ChainHeadTracker.java
index de306ad6f78..d871b07a6e0 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/ChainHeadTracker.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/ChainHeadTracker.java
@@ -14,11 +14,9 @@
  */
 package org.hyperledger.besu.ethereum.eth.sync;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
-
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeers.ConnectCallback;
@@ -29,11 +27,12 @@
 
 import java.util.function.Supplier;
 
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ChainHeadTracker implements ConnectCallback {
 
-  private static final Logger LOG = getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(ChainHeadTracker.class);
 
   private final EthContext ethContext;
   private final ProtocolSchedule protocolSchedule;
@@ -67,7 +66,7 @@ public static void trackChainHeadForPeers(
 
   @Override
   public void onPeerConnected(final EthPeer peer) {
-    LOG.debug("Requesting chain head info for {}", peer);
+    LOG.debug("Requesting chain head info from {}", peer);
     GetHeadersFromPeerByHashTask.forSingleHash(
             protocolSchedule,
             ethContext,
@@ -82,9 +81,18 @@ public void onPeerConnected(final EthPeer peer) {
                 final BlockHeader chainHeadHeader = peerResult.getResult().get(0);
                 peer.chainState().update(chainHeadHeader);
                 trailingPeerLimiter.enforceTrailingPeerLimit();
+                LOG.atDebug()
+                    .setMessage("Retrieved chain head info {} from {}")
+                    .addArgument(
+                        () ->
+                            chainHeadHeader.getNumber()
+                                + " ("
+                                + chainHeadHeader.getBlockHash()
+                                + ")")
+                    .addArgument(peer)
+                    .log();
               } else {
-                LOG.debug(
-                    "Failed to retrieve chain head information. Disconnecting " + peer, error);
+                LOG.debug("Failed to retrieve chain head info. Disconnecting {}", peer, error);
                 peer.disconnect(DisconnectReason.USELESS_PEER);
               }
             });
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderFetcher.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderFetcher.java
deleted file mode 100644
index dbb3215b60d..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderFetcher.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync;
-
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
-import static java.util.concurrent.CompletableFuture.completedFuture;
-
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.eth.manager.EthContext;
-import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
-import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult;
-import org.hyperledger.besu.ethereum.eth.manager.task.GetHeadersFromPeerByHashTask;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-public class CheckpointHeaderFetcher {
-  private static final Logger LOG = LogManager.getLogger();
-
-  private final SynchronizerConfiguration syncConfig;
-  private final ProtocolSchedule protocolSchedule;
-  private final EthContext ethContext;
-  // The checkpoint we're aiming to reach at the end of this sync.
-  private final Optional<BlockHeader> finalCheckpointHeader;
-  private final MetricsSystem metricsSystem;
-
-  public CheckpointHeaderFetcher(
-      final SynchronizerConfiguration syncConfig,
-      final ProtocolSchedule protocolSchedule,
-      final EthContext ethContext,
-      final Optional<BlockHeader> finalCheckpointHeader,
-      final MetricsSystem metricsSystem) {
-    this.syncConfig = syncConfig;
-    this.protocolSchedule = protocolSchedule;
-    this.ethContext = ethContext;
-    this.finalCheckpointHeader = finalCheckpointHeader;
-    this.metricsSystem = metricsSystem;
-  }
-
-  public CompletableFuture<List<BlockHeader>> getNextCheckpointHeaders(
-      final EthPeer peer, final BlockHeader previousCheckpointHeader) {
-    final int skip = syncConfig.getDownloaderChainSegmentSize() - 1;
-    final int maximumHeaderRequestSize = syncConfig.getDownloaderHeaderRequestSize();
-    final long previousCheckpointNumber = previousCheckpointHeader.getNumber();
-
-    final int additionalHeaderCount;
-    if (finalCheckpointHeader.isPresent()) {
-      final BlockHeader targetHeader = finalCheckpointHeader.get();
-      final long blocksUntilTarget = targetHeader.getNumber() - previousCheckpointNumber;
-      if (blocksUntilTarget <= 0) {
-        return completedFuture(emptyList());
-      }
-      final long maxHeadersToRequest = blocksUntilTarget / (skip + 1);
-      additionalHeaderCount = (int) Math.min(maxHeadersToRequest, maximumHeaderRequestSize);
-      if (additionalHeaderCount == 0) {
-        return completedFuture(singletonList(targetHeader));
-      }
-    } else {
-      additionalHeaderCount = maximumHeaderRequestSize;
-    }
-
-    return requestHeaders(peer, previousCheckpointHeader, additionalHeaderCount, skip);
-  }
-
-  private CompletableFuture<List<BlockHeader>> requestHeaders(
-      final EthPeer peer,
-      final BlockHeader referenceHeader,
-      final int headerCount,
-      final int skip) {
-    LOG.debug(
-        "Requesting {} checkpoint headers, starting from {}, {} blocks apart",
-        headerCount,
-        referenceHeader.getNumber(),
-        skip);
-    return GetHeadersFromPeerByHashTask.startingAtHash(
-            protocolSchedule,
-            ethContext,
-            referenceHeader.getHash(),
-            referenceHeader.getNumber(),
-            // + 1 because lastHeader will be returned as well.
-            headerCount + 1,
-            skip,
-            metricsSystem)
-        .assignPeer(peer)
-        .run()
-        .thenApply(PeerTaskResult::getResult)
-        .thenApply(headers -> stripExistingCheckpointHeader(referenceHeader, headers));
-  }
-
-  private List<BlockHeader> stripExistingCheckpointHeader(
-      final BlockHeader lastHeader, final List<BlockHeader> headers) {
-    if (!headers.isEmpty() && headers.get(0).equals(lastHeader)) {
-      return headers.subList(1, headers.size());
-    }
-    return headers;
-  }
-
-  public boolean nextCheckpointEndsAtChainHead(
-      final EthPeer peer, final BlockHeader previousCheckpointHeader) {
-    if (finalCheckpointHeader.isPresent()) {
-      return false;
-    }
-    final int skip = syncConfig.getDownloaderChainSegmentSize() - 1;
-    final long peerEstimatedHeight = peer.chainState().getEstimatedHeight();
-    final long previousCheckpointNumber = previousCheckpointHeader.getNumber();
-    return previousCheckpointNumber + skip >= peerEstimatedHeight;
-  }
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderValidationStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderValidationStep.java
deleted file mode 100644
index f309aba8111..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderValidationStep.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync;
-
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.eth.sync.tasks.exceptions.InvalidBlockException;
-import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
-
-import java.util.function.Function;
-import java.util.stream.Stream;
-
-public class CheckpointHeaderValidationStep
-    implements Function<CheckpointRangeHeaders, Stream<BlockHeader>> {
-
-  private final ProtocolSchedule protocolSchedule;
-  private final ProtocolContext protocolContext;
-  private final ValidationPolicy validationPolicy;
-
-  public CheckpointHeaderValidationStep(
-      final ProtocolSchedule protocolSchedule,
-      final ProtocolContext protocolContext,
-      final ValidationPolicy validationPolicy) {
-    this.protocolSchedule = protocolSchedule;
-    this.protocolContext = protocolContext;
-    this.validationPolicy = validationPolicy;
-  }
-
-  @Override
-  public Stream<BlockHeader> apply(final CheckpointRangeHeaders checkpointRangeHeaders) {
-    final BlockHeader rangeStart = checkpointRangeHeaders.getCheckpointRange().getStart();
-    final BlockHeader firstHeaderToImport = checkpointRangeHeaders.getFirstHeaderToImport();
-
-    if (isValid(rangeStart, firstHeaderToImport)) {
-      return checkpointRangeHeaders.getHeadersToImport().stream();
-    } else {
-      final String rangeEndDescription;
-      if (checkpointRangeHeaders.getCheckpointRange().hasEnd()) {
-        final BlockHeader rangeEnd = checkpointRangeHeaders.getCheckpointRange().getEnd();
-        rangeEndDescription =
-            String.format("#%d (%s)", rangeEnd.getNumber(), rangeEnd.getBlockHash());
-      } else {
-        rangeEndDescription = "chain head";
-      }
-      final String errorMessage =
-          String.format(
-              "Invalid checkpoint headers.  Headers downloaded between #%d (%s) and %s do not connect at #%d (%s)",
-              rangeStart.getNumber(),
-              rangeStart.getHash(),
-              rangeEndDescription,
-              firstHeaderToImport.getNumber(),
-              firstHeaderToImport.getHash());
-      throw new InvalidBlockException(
-          errorMessage, firstHeaderToImport.getNumber(), firstHeaderToImport.getHash());
-    }
-  }
-
-  private boolean isValid(final BlockHeader expectedParent, final BlockHeader firstHeaderToImport) {
-    final ProtocolSpec protocolSpec =
-        protocolSchedule.getByBlockNumber(firstHeaderToImport.getNumber());
-    final BlockHeaderValidator validator = protocolSpec.getBlockHeaderValidator();
-    return validator.validateHeader(
-        firstHeaderToImport,
-        expectedParent,
-        protocolContext,
-        validationPolicy.getValidationModeForNextBlock());
-  }
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRange.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRange.java
deleted file mode 100644
index fcb94568273..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRange.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync;
-
-import static java.lang.Math.toIntExact;
-
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
-
-import java.util.Objects;
-import java.util.Optional;
-
-import com.google.common.base.MoreObjects;
-
-public class CheckpointRange {
-
-  private final EthPeer syncTarget;
-  private final BlockHeader start;
-  private final Optional<BlockHeader> end;
-
-  public CheckpointRange(final EthPeer syncTarget, final BlockHeader start) {
-    this.syncTarget = syncTarget;
-    this.start = start;
-    this.end = Optional.empty();
-  }
-
-  public CheckpointRange(final EthPeer syncTarget, final BlockHeader start, final BlockHeader end) {
-    this.syncTarget = syncTarget;
-    this.start = start;
-    this.end = Optional.of(end);
-  }
-
-  public EthPeer getSyncTarget() {
-    return syncTarget;
-  }
-
-  public BlockHeader getStart() {
-    return start;
-  }
-
-  public boolean hasEnd() {
-    return end.isPresent();
-  }
-
-  public BlockHeader getEnd() {
-    return end.get();
-  }
-
-  public int getSegmentLengthExclusive() {
-    return toIntExact(end.get().getNumber() - start.getNumber() - 1);
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    final CheckpointRange that = (CheckpointRange) o;
-    return Objects.equals(syncTarget, that.syncTarget)
-        && Objects.equals(start, that.start)
-        && Objects.equals(end, that.end);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(syncTarget, start, end);
-  }
-
-  @Override
-  public String toString() {
-    return MoreObjects.toStringHelper(this)
-        .add("syncTarget", syncTarget)
-        .add("start", start)
-        .add("end", end)
-        .toString();
-  }
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRangeHeaders.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRangeHeaders.java
deleted file mode 100644
index b32310f14fc..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRangeHeaders.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-
-import java.util.List;
-import java.util.Objects;
-
-import com.google.common.base.MoreObjects;
-
-public class CheckpointRangeHeaders {
-  private final CheckpointRange checkpointRange;
-  private final List<BlockHeader> headersToImport;
-
-  public CheckpointRangeHeaders(
-      final CheckpointRange checkpointRange, final List<BlockHeader> headersToImport) {
-    checkArgument(!headersToImport.isEmpty(), "Must have at least one header to import");
-    this.checkpointRange = checkpointRange;
-    this.headersToImport = headersToImport;
-  }
-
-  public CheckpointRange getCheckpointRange() {
-    return checkpointRange;
-  }
-
-  public List<BlockHeader> getHeadersToImport() {
-    return headersToImport;
-  }
-
-  public BlockHeader getFirstHeaderToImport() {
-    return headersToImport.get(0);
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    final CheckpointRangeHeaders that = (CheckpointRangeHeaders) o;
-    return Objects.equals(checkpointRange, that.checkpointRange)
-        && Objects.equals(headersToImport, that.headersToImport);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(checkpointRange, headersToImport);
-  }
-
-  @Override
-  public String toString() {
-    return MoreObjects.toStringHelper(this)
-        .add("checkpointRange", checkpointRange)
-        .add("headersToImport", headersToImport)
-        .toString();
-  }
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRangeSource.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRangeSource.java
deleted file mode 100644
index 6b30c3fc4fc..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRangeSource.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync;
-
-import static java.util.Collections.emptyList;
-import static java.util.concurrent.CompletableFuture.completedFuture;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
-import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
-
-import java.time.Duration;
-import java.util.ArrayDeque;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Optional;
-import java.util.Queue;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeoutException;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-public class CheckpointRangeSource implements Iterator<CheckpointRange> {
-  private static final Logger LOG = LogManager.getLogger();
-  private static final Duration RETRY_DELAY_DURATION = Duration.ofSeconds(2);
-
-  private final CheckpointHeaderFetcher checkpointFetcher;
-  private final SyncTargetChecker syncTargetChecker;
-  private final EthPeer peer;
-  private final EthScheduler ethScheduler;
-  private final int checkpointTimeoutsPermitted;
-  private final Duration newHeaderWaitDuration;
-
-  private final Queue<CheckpointRange> retrievedRanges = new ArrayDeque<>();
-  private BlockHeader lastRangeEnd;
-  private boolean reachedEndOfCheckpoints = false;
-  private Optional<CompletableFuture<List<BlockHeader>>> pendingCheckpointsRequest =
-      Optional.empty();
-  private int requestFailureCount = 0;
-
-  public CheckpointRangeSource(
-      final CheckpointHeaderFetcher checkpointFetcher,
-      final SyncTargetChecker syncTargetChecker,
-      final EthScheduler ethScheduler,
-      final EthPeer peer,
-      final BlockHeader commonAncestor,
-      final int checkpointTimeoutsPermitted) {
-    this(
-        checkpointFetcher,
-        syncTargetChecker,
-        ethScheduler,
-        peer,
-        commonAncestor,
-        checkpointTimeoutsPermitted,
-        Duration.ofSeconds(5));
-  }
-
-  CheckpointRangeSource(
-      final CheckpointHeaderFetcher checkpointFetcher,
-      final SyncTargetChecker syncTargetChecker,
-      final EthScheduler ethScheduler,
-      final EthPeer peer,
-      final BlockHeader commonAncestor,
-      final int checkpointTimeoutsPermitted,
-      final Duration newHeaderWaitDuration) {
-    this.checkpointFetcher = checkpointFetcher;
-    this.syncTargetChecker = syncTargetChecker;
-    this.ethScheduler = ethScheduler;
-    this.peer = peer;
-    this.lastRangeEnd = commonAncestor;
-    this.checkpointTimeoutsPermitted = checkpointTimeoutsPermitted;
-    this.newHeaderWaitDuration = newHeaderWaitDuration;
-  }
-
-  @Override
-  public boolean hasNext() {
-    return !retrievedRanges.isEmpty()
-        || (requestFailureCount < checkpointTimeoutsPermitted
-            && syncTargetChecker.shouldContinueDownloadingFromSyncTarget(peer, lastRangeEnd)
-            && !reachedEndOfCheckpoints);
-  }
-
-  @Override
-  public CheckpointRange next() {
-    if (!retrievedRanges.isEmpty()) {
-      return retrievedRanges.poll();
-    }
-    if (pendingCheckpointsRequest.isPresent()) {
-      return getCheckpointRangeFromPendingRequest();
-    }
-    if (reachedEndOfCheckpoints) {
-      return null;
-    }
-    if (checkpointFetcher.nextCheckpointEndsAtChainHead(peer, lastRangeEnd)) {
-      reachedEndOfCheckpoints = true;
-      return new CheckpointRange(peer, lastRangeEnd);
-    }
-    pendingCheckpointsRequest = Optional.of(getNextCheckpointHeaders());
-    return getCheckpointRangeFromPendingRequest();
-  }
-
-  private CompletableFuture<List<BlockHeader>> getNextCheckpointHeaders() {
-    return checkpointFetcher
-        .getNextCheckpointHeaders(peer, lastRangeEnd)
-        .exceptionally(
-            error -> {
-              LOG.debug("Failed to retrieve checkpoint headers", error);
-              return emptyList();
-            })
-        .thenCompose(
-            checkpoints -> checkpoints.isEmpty() ? pauseBriefly() : completedFuture(checkpoints));
-  }
-
-  /**
-   * Pause after failing to get new checkpoints to prevent requesting new checkpoint headers in a
-   * tight loop.
-   *
-   * @return a future that after the pause completes with an empty list.
-   */
-  private CompletableFuture<List<BlockHeader>> pauseBriefly() {
-    return ethScheduler.scheduleFutureTask(
-        () -> completedFuture(emptyList()), RETRY_DELAY_DURATION);
-  }
-
-  private CheckpointRange getCheckpointRangeFromPendingRequest() {
-    final CompletableFuture<List<BlockHeader>> pendingRequest = pendingCheckpointsRequest.get();
-    try {
-      final List<BlockHeader> newCheckpointHeaders =
-          pendingRequest.get(newHeaderWaitDuration.toMillis(), MILLISECONDS);
-      pendingCheckpointsRequest = Optional.empty();
-      if (newCheckpointHeaders.isEmpty()) {
-        requestFailureCount++;
-      } else {
-        requestFailureCount = 0;
-      }
-      for (final BlockHeader checkpointHeader : newCheckpointHeaders) {
-        retrievedRanges.add(new CheckpointRange(peer, lastRangeEnd, checkpointHeader));
-        lastRangeEnd = checkpointHeader;
-      }
-      return retrievedRanges.poll();
-    } catch (final InterruptedException e) {
-      LOG.trace("Interrupted while waiting for new checkpoint headers", e);
-      return null;
-    } catch (final ExecutionException e) {
-      LOG.debug("Failed to retrieve new checkpoint headers", e);
-      pendingCheckpointsRequest = Optional.empty();
-      requestFailureCount++;
-      return null;
-    } catch (final TimeoutException e) {
-      return null;
-    }
-  }
-
-  public interface SyncTargetChecker {
-    boolean shouldContinueDownloadingFromSyncTarget(EthPeer peer, BlockHeader lastCheckpointHeader);
-  }
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DefaultSynchronizer.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DefaultSynchronizer.java
index fdd229c7117..2f98c1a8314 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DefaultSynchronizer.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DefaultSynchronizer.java
@@ -16,43 +16,62 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import org.hyperledger.besu.consensus.merge.ForkchoiceEvent;
+import org.hyperledger.besu.consensus.merge.UnverifiedForkchoiceListener;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.bonsai.BonsaiWorldStateProvider;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
-import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastDownloaderFactory;
+import org.hyperledger.besu.ethereum.eth.sync.checkpointsync.CheckpointDownloaderFactory;
 import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncDownloader;
-import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncException;
 import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncState;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate.FastDownloaderFactory;
 import org.hyperledger.besu.ethereum.eth.sync.fullsync.FullSyncDownloader;
+import org.hyperledger.besu.ethereum.eth.sync.fullsync.SyncTerminationCondition;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapDownloaderFactory;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.context.SnapSyncStatePersistenceManager;
 import org.hyperledger.besu.ethereum.eth.sync.state.PendingBlocksManager;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.storage.StorageProvider;
 import org.hyperledger.besu.ethereum.worldstate.Pruner;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
 import org.hyperledger.besu.metrics.BesuMetricCategory;
 import org.hyperledger.besu.plugin.data.SyncStatus;
 import org.hyperledger.besu.plugin.services.BesuEvents.SyncStatusListener;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
-import org.hyperledger.besu.util.ExceptionUtils;
+import org.hyperledger.besu.util.log.FramedLogMessage;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.nio.file.Path;
 import java.time.Clock;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Supplier;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class DefaultSynchronizer implements Synchronizer {
+public class DefaultSynchronizer implements Synchronizer, UnverifiedForkchoiceListener {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(DefaultSynchronizer.class);
 
   private final Optional<Pruner> maybePruner;
   private final SyncState syncState;
   private final AtomicBoolean running = new AtomicBoolean(false);
-  private final BlockPropagationManager blockPropagationManager;
-  private final Optional<FastSyncDownloader> fastSyncDownloader;
-  private final FullSyncDownloader fullSyncDownloader;
+  private final Optional<BlockPropagationManager> blockPropagationManager;
+  private final Supplier<Optional<FastSyncDownloader<?>>> fastSyncFactory;
+  private Optional<FastSyncDownloader<?>> fastSyncDownloader;
+  private final Optional<FullSyncDownloader> fullSyncDownloader;
+  private final ProtocolContext protocolContext;
+  private final PivotBlockSelector pivotBlockSelector;
+  private final SyncTerminationCondition terminationCondition;
 
   public DefaultSynchronizer(
       final SynchronizerConfiguration syncConfig,
@@ -64,10 +83,16 @@ public DefaultSynchronizer(
       final EthContext ethContext,
       final SyncState syncState,
       final Path dataDirectory,
+      final StorageProvider storageProvider,
       final Clock clock,
-      final MetricsSystem metricsSystem) {
+      final MetricsSystem metricsSystem,
+      final SyncTerminationCondition terminationCondition,
+      final PivotBlockSelector pivotBlockSelector) {
     this.maybePruner = maybePruner;
     this.syncState = syncState;
+    this.pivotBlockSelector = pivotBlockSelector;
+    this.protocolContext = protocolContext;
+    this.terminationCondition = terminationCondition;
 
     ChainHeadTracker.trackChainHeadForPeers(
         ethContext,
@@ -77,30 +102,80 @@ public DefaultSynchronizer(
         metricsSystem);
 
     this.blockPropagationManager =
-        new BlockPropagationManager(
-            syncConfig,
-            protocolSchedule,
-            protocolContext,
-            ethContext,
-            syncState,
-            new PendingBlocksManager(syncConfig),
-            metricsSystem,
-            blockBroadcaster);
+        terminationCondition.shouldStopDownload()
+            ? Optional.empty()
+            : Optional.of(
+                new BlockPropagationManager(
+                    syncConfig,
+                    protocolSchedule,
+                    protocolContext,
+                    ethContext,
+                    syncState,
+                    new PendingBlocksManager(syncConfig),
+                    metricsSystem,
+                    blockBroadcaster));
 
     this.fullSyncDownloader =
-        new FullSyncDownloader(
-            syncConfig, protocolSchedule, protocolContext, ethContext, syncState, metricsSystem);
-    this.fastSyncDownloader =
-        FastDownloaderFactory.create(
-            syncConfig,
-            dataDirectory,
-            protocolSchedule,
-            protocolContext,
-            metricsSystem,
-            ethContext,
-            worldStateStorage,
-            syncState,
-            clock);
+        terminationCondition.shouldStopDownload()
+            ? Optional.empty()
+            : Optional.of(
+                new FullSyncDownloader(
+                    syncConfig,
+                    protocolSchedule,
+                    protocolContext,
+                    ethContext,
+                    syncState,
+                    metricsSystem,
+                    terminationCondition));
+
+    if (SyncMode.FAST.equals(syncConfig.getSyncMode())) {
+      this.fastSyncFactory =
+          () ->
+              FastDownloaderFactory.create(
+                  pivotBlockSelector,
+                  syncConfig,
+                  dataDirectory,
+                  protocolSchedule,
+                  protocolContext,
+                  metricsSystem,
+                  ethContext,
+                  worldStateStorage,
+                  syncState,
+                  clock);
+    } else if (SyncMode.X_CHECKPOINT.equals(syncConfig.getSyncMode())) {
+      this.fastSyncFactory =
+          () ->
+              CheckpointDownloaderFactory.createCheckpointDownloader(
+                  new SnapSyncStatePersistenceManager(storageProvider),
+                  pivotBlockSelector,
+                  syncConfig,
+                  dataDirectory,
+                  protocolSchedule,
+                  protocolContext,
+                  metricsSystem,
+                  ethContext,
+                  worldStateStorage,
+                  syncState,
+                  clock);
+    } else {
+      this.fastSyncFactory =
+          () ->
+              SnapDownloaderFactory.createSnapDownloader(
+                  new SnapSyncStatePersistenceManager(storageProvider),
+                  pivotBlockSelector,
+                  syncConfig,
+                  dataDirectory,
+                  protocolSchedule,
+                  protocolContext,
+                  metricsSystem,
+                  ethContext,
+                  worldStateStorage,
+                  syncState,
+                  clock);
+    }
+
+    // create a non-resync fast sync downloader:
+    this.fastSyncDownloader = this.fastSyncFactory.get();
 
     metricsSystem.createLongGauge(
         BesuMetricCategory.ETHEREUM,
@@ -117,29 +192,31 @@ public DefaultSynchronizer(
   private TrailingPeerRequirements calculateTrailingPeerRequirements() {
     return fastSyncDownloader
         .flatMap(FastSyncDownloader::calculateTrailingPeerRequirements)
-        .orElseGet(fullSyncDownloader::calculateTrailingPeerRequirements);
+        .orElse(
+            fullSyncDownloader
+                .map(FullSyncDownloader::calculateTrailingPeerRequirements)
+                .orElse(TrailingPeerRequirements.UNRESTRICTED));
   }
 
   @Override
-  public void start() {
+  public CompletableFuture<Void> start() {
     if (running.compareAndSet(false, true)) {
       LOG.info("Starting synchronizer.");
-      blockPropagationManager.start();
-      if (fastSyncDownloader.isPresent()) {
-        fastSyncDownloader
-            .get()
-            .start()
-            .whenComplete(this::handleFastSyncResult)
-            .exceptionally(
-                ex -> {
-                  LOG.warn("Exiting FastSync process");
-                  System.exit(0);
-                  return null;
-                });
+      blockPropagationManager.ifPresent(
+          manager -> {
+            if (!manager.isRunning()) {
+              manager.start();
+            }
+          });
 
+      CompletableFuture<Void> future;
+      if (fastSyncDownloader.isPresent()) {
+        future = fastSyncDownloader.get().start().thenCompose(this::handleSyncResult);
       } else {
-        startFullSync();
+        syncState.markInitialSyncPhaseAsDone();
+        future = startFullSync();
       }
+      return future.thenApply(this::finalizeSync);
     } else {
       throw new IllegalStateException("Attempt to start an already started synchronizer.");
     }
@@ -150,8 +227,14 @@ public void stop() {
     if (running.compareAndSet(true, false)) {
       LOG.info("Stopping synchronizer");
       fastSyncDownloader.ifPresent(FastSyncDownloader::stop);
-      fullSyncDownloader.stop();
+      fullSyncDownloader.ifPresent(FullSyncDownloader::stop);
       maybePruner.ifPresent(Pruner::stop);
+      blockPropagationManager.ifPresent(
+          manager -> {
+            if (manager.isRunning()) {
+              manager.stop();
+            }
+          });
     }
   }
 
@@ -162,31 +245,41 @@ public void awaitStop() throws InterruptedException {
     }
   }
 
-  private void handleFastSyncResult(final FastSyncState result, final Throwable error) {
+  private CompletableFuture<Void> handleSyncResult(final FastSyncState result) {
     if (!running.get()) {
       // We've been shutdown which will have triggered the fast sync future to complete
-      return;
+      return CompletableFuture.completedFuture(null);
     }
     fastSyncDownloader.ifPresent(FastSyncDownloader::deleteFastSyncState);
-    final Throwable rootCause = ExceptionUtils.rootCause(error);
-    if (rootCause instanceof FastSyncException) {
-      LOG.error(
-          "Fast sync failed ({}), please try again.", ((FastSyncException) rootCause).getError());
-      throw new FastSyncException(rootCause);
-    } else if (error != null) {
-      LOG.error("Fast sync failed, please try again.", error);
-      throw new FastSyncException(error);
+    result
+        .getPivotBlockHeader()
+        .ifPresent(
+            blockHeader -> protocolContext.getWorldStateArchive().resetArchiveStateTo(blockHeader));
+    LOG.info(
+        "Sync completed successfully with pivot block {}",
+        result.getPivotBlockNumber().getAsLong());
+    pivotBlockSelector.close();
+    syncState.markInitialSyncPhaseAsDone();
+
+    if (terminationCondition.shouldContinueDownload()) {
+      return startFullSync();
     } else {
-      LOG.info(
-          "Fast sync completed successfully with pivot block {}",
-          result.getPivotBlockNumber().getAsLong());
+      syncState.setReachedTerminalDifficulty(true);
+      return CompletableFuture.completedFuture(null);
     }
-    startFullSync();
   }
 
-  private void startFullSync() {
+  private CompletableFuture<Void> startFullSync() {
     maybePruner.ifPresent(Pruner::start);
-    fullSyncDownloader.start();
+    return fullSyncDownloader
+        .map(FullSyncDownloader::start)
+        .orElse(CompletableFuture.completedFuture(null))
+        .thenRun(
+            () -> {
+              if (terminationCondition.shouldStopDownload()) {
+                syncState.setReachedTerminalDifficulty(true);
+              }
+            });
   }
 
   @Override
@@ -197,6 +290,62 @@ public Optional<SyncStatus> getSyncStatus() {
     return syncState.syncStatus();
   }
 
+  @Override
+  public boolean resyncWorldState() {
+    // if sync is running currently, stop it and delete the fast sync state
+    if (fastSyncDownloader.isPresent() && running.get()) {
+      stop();
+      fastSyncDownloader.get().deleteFastSyncState();
+    }
+    // recreate fast sync with resync and start
+    this.syncState.markInitialSyncRestart();
+    this.syncState.markResyncNeeded();
+    this.fastSyncDownloader = this.fastSyncFactory.get();
+    start();
+    return true;
+  }
+
+  @Override
+  public boolean healWorldState(
+      final Optional<Address> maybeAccountToRepair, final Bytes location) {
+    // recreate fast sync with resync and start
+    if (fastSyncDownloader.isPresent() && running.get()) {
+      stop();
+      fastSyncDownloader.get().deleteFastSyncState();
+    }
+
+    LOG.atDebug()
+        .setMessage("heal stacktrace: \n{}")
+        .addArgument(
+            () -> {
+              var sw = new StringWriter();
+              new Exception().printStackTrace(new PrintWriter(sw, true));
+              return sw.toString();
+            })
+        .log();
+
+    final List<String> lines = new ArrayList<>();
+    lines.add("Besu has identified a problem with its worldstate database.");
+    lines.add("Your node will fetch the correct data from peers to repair the problem.");
+    lines.add("Starting the sync pipeline...");
+    LOG.atInfo().setMessage(FramedLogMessage.generate(lines)).log();
+
+    this.syncState.markInitialSyncRestart();
+    this.syncState.markResyncNeeded();
+    maybeAccountToRepair.ifPresent(
+        address -> {
+          if (this.protocolContext.getWorldStateArchive() instanceof BonsaiWorldStateProvider) {
+            ((BonsaiWorldStateProvider) this.protocolContext.getWorldStateArchive())
+                .prepareStateHealing(
+                    org.hyperledger.besu.datatypes.Address.wrap(address), location);
+          }
+          this.syncState.markAccountToRepair(maybeAccountToRepair);
+        });
+    this.fastSyncDownloader = this.fastSyncFactory.get();
+    start();
+    return true;
+  }
+
   @Override
   public long subscribeSyncStatus(final SyncStatusListener listener) {
     checkNotNull(listener);
@@ -222,4 +371,20 @@ public long subscribeInSync(final InSyncListener listener, final long syncTolera
   public boolean unsubscribeInSync(final long listenerId) {
     return syncState.unsubscribeSyncStatus(listenerId);
   }
+
+  private Void finalizeSync(final Void unused) {
+    LOG.info("Stopping block propagation.");
+    blockPropagationManager.ifPresent(BlockPropagationManager::stop);
+    LOG.info("Stopping the pruner.");
+    maybePruner.ifPresent(Pruner::stop);
+    running.set(false);
+    return null;
+  }
+
+  @Override
+  public void onNewUnverifiedForkchoice(final ForkchoiceEvent event) {
+    if (this.blockPropagationManager.isPresent()) {
+      this.blockPropagationManager.get().onNewUnverifiedForkchoice(event);
+    }
+  }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DownloadHeadersStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DownloadHeadersStep.java
index 9c1500af85b..6e404305823 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DownloadHeadersStep.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DownloadHeadersStep.java
@@ -22,6 +22,8 @@
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult;
 import org.hyperledger.besu.ethereum.eth.manager.task.GetHeadersFromPeerByHashTask;
+import org.hyperledger.besu.ethereum.eth.sync.range.RangeHeaders;
+import org.hyperledger.besu.ethereum.eth.sync.range.SyncTargetRange;
 import org.hyperledger.besu.ethereum.eth.sync.tasks.DownloadHeaderSequenceTask;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
@@ -32,12 +34,12 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DownloadHeadersStep
-    implements Function<CheckpointRange, CompletableFuture<CheckpointRangeHeaders>> {
-  private static final Logger LOG = LogManager.getLogger();
+    implements Function<SyncTargetRange, CompletableFuture<RangeHeaders>> {
+  private static final Logger LOG = LoggerFactory.getLogger(DownloadHeadersStep.class);
   private final ProtocolSchedule protocolSchedule;
   private final ProtocolContext protocolContext;
   private final EthContext ethContext;
@@ -61,22 +63,21 @@ public DownloadHeadersStep(
   }
 
   @Override
-  public CompletableFuture<CheckpointRangeHeaders> apply(final CheckpointRange checkpointRange) {
+  public CompletableFuture<RangeHeaders> apply(final SyncTargetRange checkpointRange) {
     final CompletableFuture<List<BlockHeader>> taskFuture = downloadHeaders(checkpointRange);
-    final CompletableFuture<CheckpointRangeHeaders> processedFuture =
+    final CompletableFuture<RangeHeaders> processedFuture =
         taskFuture.thenApply(headers -> processHeaders(checkpointRange, headers));
     FutureUtils.propagateCancellation(processedFuture, taskFuture);
     return processedFuture;
   }
 
-  private CompletableFuture<List<BlockHeader>> downloadHeaders(
-      final CheckpointRange checkpointRange) {
-    if (checkpointRange.hasEnd()) {
+  private CompletableFuture<List<BlockHeader>> downloadHeaders(final SyncTargetRange range) {
+    if (range.hasEnd()) {
       LOG.debug(
           "Downloading headers for range {} to {}",
-          checkpointRange.getStart().getNumber(),
-          checkpointRange.getEnd().getNumber());
-      if (checkpointRange.getSegmentLengthExclusive() == 0) {
+          range.getStart().getNumber(),
+          range.getEnd().getNumber());
+      if (range.getSegmentLengthExclusive() == 0) {
         // There are no extra headers to download.
         return completedFuture(emptyList());
       }
@@ -84,38 +85,38 @@ private CompletableFuture<List<BlockHeader>> downloadHeaders(
               protocolSchedule,
               protocolContext,
               ethContext,
-              checkpointRange.getEnd(),
-              checkpointRange.getSegmentLengthExclusive(),
+              range.getEnd(),
+              range.getSegmentLengthExclusive(),
               validationPolicy,
               metricsSystem)
           .run();
     } else {
-      LOG.debug("Downloading headers starting from {}", checkpointRange.getStart().getNumber());
+      LOG.debug("Downloading headers starting from {}", range.getStart().getNumber());
       return GetHeadersFromPeerByHashTask.startingAtHash(
               protocolSchedule,
               ethContext,
-              checkpointRange.getStart().getHash(),
-              checkpointRange.getStart().getNumber(),
+              range.getStart().getHash(),
+              range.getStart().getNumber(),
               headerRequestSize,
               metricsSystem)
-          .assignPeer(checkpointRange.getSyncTarget())
+          .assignPeer(range.getSyncTarget())
           .run()
           .thenApply(PeerTaskResult::getResult);
     }
   }
 
-  private CheckpointRangeHeaders processHeaders(
-      final CheckpointRange checkpointRange, final List<BlockHeader> headers) {
+  private RangeHeaders processHeaders(
+      final SyncTargetRange checkpointRange, final List<BlockHeader> headers) {
     if (checkpointRange.hasEnd()) {
       final List<BlockHeader> headersToImport = new ArrayList<>(headers);
       headersToImport.add(checkpointRange.getEnd());
-      return new CheckpointRangeHeaders(checkpointRange, headersToImport);
+      return new RangeHeaders(checkpointRange, headersToImport);
     } else {
       List<BlockHeader> headersToImport = headers;
       if (!headers.isEmpty() && headers.get(0).equals(checkpointRange.getStart())) {
         headersToImport = headers.subList(1, headers.size());
       }
-      return new CheckpointRangeHeaders(checkpointRange, headersToImport);
+      return new RangeHeaders(checkpointRange, headersToImport);
     }
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DownloadPipelineFactory.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DownloadPipelineFactory.java
index f83fd125b63..f8dff31d6b6 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DownloadPipelineFactory.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/DownloadPipelineFactory.java
@@ -14,9 +14,13 @@
  */
 package org.hyperledger.besu.ethereum.eth.sync;
 
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncTarget;
 import org.hyperledger.besu.services.pipeline.Pipeline;
 
+import java.util.concurrent.CompletionStage;
+
 public interface DownloadPipelineFactory {
 
   /**
@@ -27,4 +31,7 @@ public interface DownloadPipelineFactory {
    * @return the created but not yet started pipeline.
    */
   Pipeline<?> createDownloadPipelineForSyncTarget(SyncTarget target);
+
+  CompletionStage<Void> startPipeline(
+      EthScheduler scheduler, SyncState syncState, SyncTarget syncTarget, Pipeline<?> pipeline);
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/PipelineChainDownloader.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/PipelineChainDownloader.java
index 183793ac8ad..d1c3d008830 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/PipelineChainDownloader.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/PipelineChainDownloader.java
@@ -31,17 +31,16 @@
 import org.hyperledger.besu.util.ExceptionUtils;
 
 import java.time.Duration;
-import java.util.Optional;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PipelineChainDownloader implements ChainDownloader {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PipelineChainDownloader.class);
   static final Duration PAUSE_AFTER_ERROR_DURATION = Duration.ofSeconds(2);
   private final SyncState syncState;
   private final SyncTargetManager syncTargetManager;
@@ -98,7 +97,7 @@ private CompletableFuture<Void> performDownload() {
 
   private CompletableFuture<Void> selectSyncTargetAndDownload() {
     return syncTargetManager
-        .findSyncTarget(Optional.empty())
+        .findSyncTarget()
         .thenCompose(this::startDownloadForSyncTarget)
         .thenRun(pipelineCompleteCounter::inc);
   }
@@ -106,10 +105,11 @@ private CompletableFuture<Void> selectSyncTargetAndDownload() {
   private CompletionStage<Void> repeatUnlessDownloadComplete(
       @SuppressWarnings("unused") final Void result) {
     syncState.clearSyncTarget();
-    if (syncTargetManager.shouldContinueDownloading()) {
+    if (syncTargetManager.shouldContinueDownloading()
+        && !syncState.hasReachedTerminalDifficulty().orElse(Boolean.FALSE)) {
       return performDownload();
     } else {
-      LOG.info("Chain download complete");
+      LOG.info("PipelineChain download complete");
       return completedFuture(null);
     }
   }
@@ -118,14 +118,12 @@ private CompletionStage<Void> handleFailedDownload(final Throwable error) {
     pipelineErrorCounter.inc();
     if (ExceptionUtils.rootCause(error) instanceof InvalidBlockException) {
       LOG.warn(
-          "Invalid block detected.  Disconnecting from sync target. {}",
+          "Invalid block detected (BREACH_OF_PROTOCOL). Disconnecting from sync target. {}",
           ExceptionUtils.rootCause(error).getMessage());
       syncState.disconnectSyncTarget(DisconnectReason.BREACH_OF_PROTOCOL);
     }
 
-    if (!cancelled.get()
-        && syncTargetManager.shouldContinueDownloading()
-        && !(ExceptionUtils.rootCause(error) instanceof CancellationException)) {
+    if (!cancelled.get() && syncTargetManager.shouldContinueDownloading()) {
       logDownloadFailure("Chain download failed. Restarting after short delay.", error);
       // Allowing the normal looping logic to retry after a brief delay.
       return scheduler.scheduleFutureTask(() -> completedFuture(null), PAUSE_AFTER_ERROR_DURATION);
@@ -138,9 +136,10 @@ private CompletionStage<Void> handleFailedDownload(final Throwable error) {
 
   private void logDownloadFailure(final String message, final Throwable error) {
     final Throwable rootCause = ExceptionUtils.rootCause(error);
-    if (rootCause instanceof CancellationException || rootCause instanceof InterruptedException) {
-      LOG.trace(message, error);
-    } else if (rootCause instanceof EthTaskException) {
+    if (rootCause instanceof CancellationException
+        || rootCause instanceof InterruptedException
+        || rootCause instanceof EthTaskException
+        || rootCause instanceof IllegalArgumentException) {
       LOG.debug(message, error);
     } else if (rootCause instanceof InvalidBlockException) {
       LOG.warn(message, error);
@@ -150,12 +149,23 @@ private void logDownloadFailure(final String message, final Throwable error) {
   }
 
   private synchronized CompletionStage<Void> startDownloadForSyncTarget(final SyncTarget target) {
-    if (cancelled.get()) {
+    if (cancelled.get() || syncState.hasReachedTerminalDifficulty().orElse(Boolean.FALSE)) {
       return CompletableFuture.failedFuture(
           new CancellationException("Chain download was cancelled"));
     }
+    if (!syncTargetManager.shouldContinueDownloading()) {
+      return CompletableFuture.completedFuture(null);
+    }
+
     syncState.setSyncTarget(target.peer(), target.commonAncestor());
+    LOG.atDebug()
+        .setMessage("Starting download pipeline for sync target {}, common ancestor {} ({})")
+        .addArgument(target)
+        .addArgument(() -> target.commonAncestor().getNumber())
+        .addArgument(() -> target.commonAncestor().getBlockHash())
+        .log();
     currentDownloadPipeline = downloadPipelineFactory.createDownloadPipelineForSyncTarget(target);
-    return scheduler.startPipeline(currentDownloadPipeline);
+    return downloadPipelineFactory.startPipeline(
+        scheduler, syncState, target, currentDownloadPipeline);
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/PivotBlockSelector.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/PivotBlockSelector.java
new file mode 100644
index 00000000000..b19727cb4d0
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/PivotBlockSelector.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync;
+
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncState;
+
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+public interface PivotBlockSelector {
+
+  Optional<FastSyncState> selectNewPivotBlock();
+
+  CompletableFuture<Void> prepareRetry();
+
+  default void close() {
+    // do nothing by default
+  }
+
+  default long getMinRequiredBlockNumber() {
+    return 0L;
+  }
+
+  long getBestChainHeight();
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/SyncMode.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/SyncMode.java
index f61eacf3df8..7aaa1ba07e3 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/SyncMode.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/SyncMode.java
@@ -14,18 +14,34 @@
  */
 package org.hyperledger.besu.ethereum.eth.sync;
 
+import java.util.EnumSet;
+
+import org.apache.commons.lang3.StringUtils;
+
 public enum SyncMode {
   // Fully validate all blocks as they sync
   FULL,
   // Perform light validation on older blocks, and switch to full validation for more recent blocks
-  FAST;
+  FAST,
+  // Perform snapsync
+  X_SNAP,
+  // Perform snapsync but starting from a checkpoint instead of starting from genesis
+  X_CHECKPOINT;
 
-  public static SyncMode fromString(final String str) {
-    for (final SyncMode mode : SyncMode.values()) {
-      if (mode.name().equalsIgnoreCase(str)) {
-        return mode;
-      }
+  public String normalize() {
+    if (this.toString().startsWith("X_")) {
+      // removes X_ at the beginning
+      return StringUtils.capitalize(this.toString().substring(2).toLowerCase());
     }
-    return null;
+
+    return StringUtils.capitalize(this.toString().toLowerCase());
+  }
+
+  public static boolean isFullSync(final SyncMode syncMode) {
+    return !EnumSet.of(SyncMode.FAST, SyncMode.X_SNAP, SyncMode.X_CHECKPOINT).contains(syncMode);
+  }
+
+  public static boolean isCheckpointSync(final SyncMode syncMode) {
+    return syncMode.equals(X_CHECKPOINT);
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/SyncTargetManager.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/SyncTargetManager.java
index 4a8f6f2c194..c231d13af35 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/SyncTargetManager.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/SyncTargetManager.java
@@ -29,12 +29,12 @@
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class SyncTargetManager {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(SyncTargetManager.class);
 
   private final SynchronizerConfiguration config;
   private final ProtocolSchedule protocolSchedule;
@@ -55,14 +55,7 @@ protected SyncTargetManager(
     this.metricsSystem = metricsSystem;
   }
 
-  public CompletableFuture<SyncTarget> findSyncTarget(
-      final Optional<SyncTarget> currentSyncTarget) {
-    return currentSyncTarget
-        .map(CompletableFuture::completedFuture) // Return an existing sync target if present
-        .orElseGet(this::selectNewSyncTarget);
-  }
-
-  private CompletableFuture<SyncTarget> selectNewSyncTarget() {
+  public CompletableFuture<SyncTarget> findSyncTarget() {
     return selectBestAvailableSyncTarget()
         .thenCompose(
             maybeBestPeer -> {
@@ -89,7 +82,7 @@ private CompletableFuture<SyncTarget> selectNewSyncTarget() {
                             return waitForPeerAndThenSetSyncTarget();
                           }
                           final SyncTarget syncTarget = new SyncTarget(bestPeer, target);
-                          LOG.info(
+                          LOG.debug(
                               "Found common ancestor with peer {} at block {}",
                               bestPeer,
                               target.getNumber());
@@ -113,7 +106,7 @@ protected Optional<SyncTarget> finalizeSelectedSyncTarget(final SyncTarget syncT
   protected abstract CompletableFuture<Optional<EthPeer>> selectBestAvailableSyncTarget();
 
   private CompletableFuture<SyncTarget> waitForPeerAndThenSetSyncTarget() {
-    return waitForNewPeer().handle((r, t) -> r).thenCompose((r) -> selectNewSyncTarget());
+    return waitForNewPeer().handle((r, t) -> r).thenCompose((r) -> findSyncTarget());
   }
 
   private CompletableFuture<?> waitForNewPeer() {
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/SynchronizerConfiguration.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/SynchronizerConfiguration.java
index dbf85a2394f..ee542b1b0f7 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/SynchronizerConfiguration.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/SynchronizerConfiguration.java
@@ -17,6 +17,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncConfiguration;
 import org.hyperledger.besu.services.tasks.CachingTaskCollection;
 
 import java.util.concurrent.TimeUnit;
@@ -46,6 +47,10 @@ public class SynchronizerConfiguration {
   public static final int DEFAULT_COMPUTATION_PARALLELISM = 2;
   public static final int DEFAULT_WORLD_STATE_TASK_CACHE_SIZE =
       CachingTaskCollection.DEFAULT_CACHE_SIZE;
+  public static final long DEFAULT_PROPAGATION_MANAGER_GET_BLOCK_TIMEOUT_MILLIS =
+      TimeUnit.SECONDS.toMillis(60);
+
+  public static final boolean DEFAULT_CHECKPOINT_POST_MERGE_ENABLED = false;
 
   // Fast sync config
   private final int fastSyncPivotDistance;
@@ -56,12 +61,18 @@ public class SynchronizerConfiguration {
   private final int worldStateMaxRequestsWithoutProgress;
   private final int worldStateTaskCacheSize;
 
+  // Snapsync
+  private final SnapSyncConfiguration snapSyncConfiguration;
+
   // Block propagation config
   private final Range<Long> blockPropagationRange;
 
   // General config
   private final SyncMode syncMode;
 
+  // Near head Checkpoint sync
+  private final boolean checkpointPostMergeEnabled;
+
   // Downloader config
   private final long downloaderChangeTargetThresholdByHeight;
   private final UInt256 downloaderChangeTargetThresholdByTd;
@@ -73,6 +84,7 @@ public class SynchronizerConfiguration {
   private final int computationParallelism;
   private final int maxTrailingPeers;
   private final long worldStateMinMillisBeforeStalling;
+  private final long propagationManagerGetBlockTimeoutMillis;
 
   private SynchronizerConfiguration(
       final int fastSyncPivotDistance,
@@ -83,6 +95,7 @@ private SynchronizerConfiguration(
       final int worldStateMaxRequestsWithoutProgress,
       final long worldStateMinMillisBeforeStalling,
       final int worldStateTaskCacheSize,
+      final SnapSyncConfiguration snapSyncConfiguration,
       final Range<Long> blockPropagationRange,
       final SyncMode syncMode,
       final long downloaderChangeTargetThresholdByHeight,
@@ -93,7 +106,9 @@ private SynchronizerConfiguration(
       final int downloaderParallelism,
       final int transactionsParallelism,
       final int computationParallelism,
-      final int maxTrailingPeers) {
+      final int maxTrailingPeers,
+      final long propagationManagerGetBlockTimeoutMillis,
+      final boolean checkpointPostMergeEnabled) {
     this.fastSyncPivotDistance = fastSyncPivotDistance;
     this.fastSyncFullValidationRate = fastSyncFullValidationRate;
     this.fastSyncMinimumPeerCount = fastSyncMinimumPeerCount;
@@ -102,6 +117,7 @@ private SynchronizerConfiguration(
     this.worldStateMaxRequestsWithoutProgress = worldStateMaxRequestsWithoutProgress;
     this.worldStateMinMillisBeforeStalling = worldStateMinMillisBeforeStalling;
     this.worldStateTaskCacheSize = worldStateTaskCacheSize;
+    this.snapSyncConfiguration = snapSyncConfiguration;
     this.blockPropagationRange = blockPropagationRange;
     this.syncMode = syncMode;
     this.downloaderChangeTargetThresholdByHeight = downloaderChangeTargetThresholdByHeight;
@@ -113,6 +129,8 @@ private SynchronizerConfiguration(
     this.transactionsParallelism = transactionsParallelism;
     this.computationParallelism = computationParallelism;
     this.maxTrailingPeers = maxTrailingPeers;
+    this.propagationManagerGetBlockTimeoutMillis = propagationManagerGetBlockTimeoutMillis;
+    this.checkpointPostMergeEnabled = checkpointPostMergeEnabled;
   }
 
   public static Builder builder() {
@@ -128,11 +146,24 @@ public SyncMode getSyncMode() {
     return syncMode;
   }
 
+  public boolean isCheckpointPostMergeEnabled() {
+    return checkpointPostMergeEnabled;
+  }
+
+  /**
+   * All the configuration related to snapsync
+   *
+   * @return snapsync configuration
+   */
+  public SnapSyncConfiguration getSnapSyncConfiguration() {
+    return snapSyncConfiguration;
+  }
+
   /**
    * The range of block numbers (relative to the current chain head and the best network block) that
    * are considered appropriate to import as new blocks are announced on the network.
    *
-   * @return the range of blocks considered valid to import from the network, relative to the the
+   * @return the range of blocks considered valid to import from the network, relative to the
    *     current chain head.
    */
   public Range<Long> getBlockPropagationRange() {
@@ -219,6 +250,10 @@ public int getMaxTrailingPeers() {
     return maxTrailingPeers;
   }
 
+  public long getPropagationManagerGetBlockTimeoutMillis() {
+    return propagationManagerGetBlockTimeoutMillis;
+  }
+
   public static class Builder {
     private SyncMode syncMode = SyncMode.FULL;
     private int fastSyncMinimumPeerCount = DEFAULT_FAST_SYNC_MINIMUM_PEERS;
@@ -231,6 +266,7 @@ public static class Builder {
     private int downloaderHeaderRequestSize = DEFAULT_DOWNLOADER_HEADER_REQUEST_SIZE;
     private int downloaderCheckpointTimeoutsPermitted =
         DEFAULT_DOWNLOADER_CHECKPOINT_TIMEOUTS_PERMITTED;
+    private SnapSyncConfiguration snapSyncConfiguration = SnapSyncConfiguration.getDefault();
     private int downloaderChainSegmentSize = DEFAULT_DOWNLOADER_CHAIN_SEGMENT_SIZE;
     private int downloaderParallelism = DEFAULT_DOWNLOADER_PARALLELISM;
     private int transactionsParallelism = DEFAULT_TRANSACTIONS_PARALLELISM;
@@ -244,6 +280,10 @@ public static class Builder {
     private long worldStateMinMillisBeforeStalling = DEFAULT_WORLD_STATE_MIN_MILLIS_BEFORE_STALLING;
     private int worldStateTaskCacheSize = DEFAULT_WORLD_STATE_TASK_CACHE_SIZE;
 
+    private long propagationManagerGetBlockTimeoutMillis =
+        DEFAULT_PROPAGATION_MANAGER_GET_BLOCK_TIMEOUT_MILLIS;
+    private boolean checkpointPostMergeEnabled = DEFAULT_CHECKPOINT_POST_MERGE_ENABLED;
+
     public Builder fastSyncPivotDistance(final int distance) {
       fastSyncPivotDistance = distance;
       return this;
@@ -254,6 +294,11 @@ public Builder fastSyncFullValidationRate(final float rate) {
       return this;
     }
 
+    public Builder snapSyncConfiguration(final SnapSyncConfiguration snapSyncConfiguration) {
+      this.snapSyncConfiguration = snapSyncConfiguration;
+      return this;
+    }
+
     public Builder syncMode(final SyncMode mode) {
       this.syncMode = mode;
       return this;
@@ -350,6 +395,17 @@ public Builder maxTrailingPeers(final int maxTailingPeers) {
       return this;
     }
 
+    public Builder propagationManagerGetBlockTimeoutMillis(
+        final long propagationManagerGetBlockTimeoutMillis) {
+      this.propagationManagerGetBlockTimeoutMillis = propagationManagerGetBlockTimeoutMillis;
+      return this;
+    }
+
+    public Builder checkpointPostMergeEnabled(final boolean checkpointPostMergeEnabled) {
+      this.checkpointPostMergeEnabled = checkpointPostMergeEnabled;
+      return this;
+    }
+
     public SynchronizerConfiguration build() {
       return new SynchronizerConfiguration(
           fastSyncPivotDistance,
@@ -360,6 +416,7 @@ public SynchronizerConfiguration build() {
           worldStateMaxRequestsWithoutProgress,
           worldStateMinMillisBeforeStalling,
           worldStateTaskCacheSize,
+          snapSyncConfiguration,
           blockPropagationRange,
           syncMode,
           downloaderChangeTargetThresholdByHeight,
@@ -370,7 +427,9 @@ public SynchronizerConfiguration build() {
           downloaderParallelism,
           transactionsParallelism,
           computationParallelism,
-          maxTrailingPeers);
+          maxTrailingPeers,
+          propagationManagerGetBlockTimeoutMillis,
+          checkpointPostMergeEnabled);
     }
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/TrailingPeerLimiter.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/TrailingPeerLimiter.java
index 5807e90eab1..3804f1507ba 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/TrailingPeerLimiter.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/TrailingPeerLimiter.java
@@ -14,8 +14,6 @@
  */
 package org.hyperledger.besu.ethereum.eth.sync;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
-
 import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
 import org.hyperledger.besu.ethereum.chain.BlockAddedObserver;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
@@ -27,11 +25,12 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TrailingPeerLimiter implements BlockAddedObserver {
 
-  private static final Logger LOG = getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(TrailingPeerLimiter.class);
 
   private static final Comparator<EthPeer> BY_CHAIN_HEIGHT =
       Comparator.comparing(peer -> peer.chainState().getEstimatedHeight());
@@ -66,7 +65,7 @@ public void enforceTrailingPeerLimit() {
     while (!trailingPeers.isEmpty() && trailingPeers.size() > maxTrailingPeers) {
       final EthPeer peerToDisconnect = trailingPeers.remove(0);
       LOG.debug("Enforcing trailing peers limit by disconnecting {}", peerToDisconnect);
-      peerToDisconnect.disconnect(DisconnectReason.TOO_MANY_PEERS);
+      peerToDisconnect.disconnect(DisconnectReason.USELESS_PEER);
     }
   }
 
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardChain.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardChain.java
new file mode 100644
index 00000000000..ee4718b0613
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardChain.java
@@ -0,0 +1,257 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.eth.sync.backwardsync;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.storage.StorageProvider;
+import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Queue;
+
+import org.slf4j.Logger;
+
+public class BackwardChain {
+  private static final Logger LOG = getLogger(BackwardChain.class);
+
+  private static final String FIRST_STORED_ANCESTOR_KEY = "firstStoredAncestor";
+  private static final String LAST_STORED_PIVOT_KEY = "lastStoredPivot";
+
+  private final GenericKeyValueStorageFacade<Hash, BlockHeader> headers;
+  private final GenericKeyValueStorageFacade<Hash, Block> blocks;
+  private final GenericKeyValueStorageFacade<Hash, Hash> chainStorage;
+  private final GenericKeyValueStorageFacade<String, BlockHeader> sessionDataStorage;
+  private Optional<BlockHeader> firstStoredAncestor;
+  private Optional<BlockHeader> lastStoredPivot;
+  private final Queue<Hash> hashesToAppend = new ArrayDeque<>();
+
+  public BackwardChain(
+      final GenericKeyValueStorageFacade<Hash, BlockHeader> headersStorage,
+      final GenericKeyValueStorageFacade<Hash, Block> blocksStorage,
+      final GenericKeyValueStorageFacade<Hash, Hash> chainStorage,
+      final GenericKeyValueStorageFacade<String, BlockHeader> sessionDataStorage) {
+    this.headers = headersStorage;
+    this.blocks = blocksStorage;
+    this.chainStorage = chainStorage;
+    this.sessionDataStorage = sessionDataStorage;
+    firstStoredAncestor =
+        sessionDataStorage
+            .get(FIRST_STORED_ANCESTOR_KEY)
+            .map(
+                header -> {
+                  LOG.atDebug()
+                      .setMessage(FIRST_STORED_ANCESTOR_KEY + " loaded from storage with value {}")
+                      .addArgument(header::toLogString)
+                      .log();
+                  return header;
+                });
+    lastStoredPivot =
+        sessionDataStorage
+            .get(LAST_STORED_PIVOT_KEY)
+            .map(
+                header -> {
+                  LOG.atDebug()
+                      .setMessage(LAST_STORED_PIVOT_KEY + " loaded from storage with value {}")
+                      .addArgument(header::toLogString)
+                      .log();
+                  return header;
+                });
+  }
+
+  public static BackwardChain from(
+      final StorageProvider storageProvider, final BlockHeaderFunctions blockHeaderFunctions) {
+    return new BackwardChain(
+        new GenericKeyValueStorageFacade<>(
+            Hash::toArrayUnsafe,
+            BlocksHeadersConvertor.of(blockHeaderFunctions),
+            storageProvider.getStorageBySegmentIdentifier(
+                KeyValueSegmentIdentifier.BACKWARD_SYNC_HEADERS)),
+        new GenericKeyValueStorageFacade<>(
+            Hash::toArrayUnsafe,
+            BlocksConvertor.of(blockHeaderFunctions),
+            storageProvider.getStorageBySegmentIdentifier(
+                KeyValueSegmentIdentifier.BACKWARD_SYNC_BLOCKS)),
+        new GenericKeyValueStorageFacade<>(
+            Hash::toArrayUnsafe,
+            new HashConvertor(),
+            storageProvider.getStorageBySegmentIdentifier(
+                KeyValueSegmentIdentifier.BACKWARD_SYNC_CHAIN)),
+        // using BACKWARD_SYNC_CHAIN that contains the sequence of the work to do,
+        // to also store the session data that will be used to resume
+        // the backward sync from where it was left before the restart
+        new GenericKeyValueStorageFacade<>(
+            key -> key.getBytes(StandardCharsets.UTF_8),
+            BlocksHeadersConvertor.of(blockHeaderFunctions),
+            storageProvider.getStorageBySegmentIdentifier(
+                KeyValueSegmentIdentifier.BACKWARD_SYNC_CHAIN)));
+  }
+
+  public synchronized Optional<BlockHeader> getFirstAncestorHeader() {
+    return firstStoredAncestor;
+  }
+
+  public synchronized List<BlockHeader> getFirstNAncestorHeaders(final int size) {
+    List<BlockHeader> result = new ArrayList<>(size);
+    Optional<BlockHeader> it = firstStoredAncestor;
+    while (it.isPresent() && result.size() < size) {
+      result.add(it.get());
+      it = chainStorage.get(it.get().getHash()).flatMap(headers::get);
+    }
+    return result;
+  }
+
+  public synchronized void prependAncestorsHeader(final BlockHeader blockHeader) {
+    prependAncestorsHeader(blockHeader, false);
+  }
+
+  public synchronized void prependAncestorsHeader(
+      final BlockHeader blockHeader, final boolean alreadyStored) {
+    if (!alreadyStored) {
+      headers.put(blockHeader.getHash(), blockHeader);
+    }
+
+    if (firstStoredAncestor.isEmpty()) {
+      updateLastStoredPivot(Optional.of(blockHeader));
+    } else {
+      final BlockHeader firstHeader = firstStoredAncestor.get();
+      chainStorage.put(blockHeader.getHash(), firstHeader.getHash());
+      LOG.atDebug()
+          .setMessage("Added header {} to backward chain led by pivot {} on height {}")
+          .addArgument(blockHeader::toLogString)
+          .addArgument(() -> lastStoredPivot.orElseThrow().toLogString())
+          .addArgument(firstHeader::getNumber)
+          .log();
+    }
+
+    updateFirstStoredAncestor(Optional.of(blockHeader));
+  }
+
+  private void updateFirstStoredAncestor(final Optional<BlockHeader> maybeHeader) {
+    maybeHeader.ifPresentOrElse(
+        header -> sessionDataStorage.put(FIRST_STORED_ANCESTOR_KEY, header),
+        () -> sessionDataStorage.drop(FIRST_STORED_ANCESTOR_KEY));
+    firstStoredAncestor = maybeHeader;
+  }
+
+  private void updateLastStoredPivot(final Optional<BlockHeader> maybeHeader) {
+    maybeHeader.ifPresentOrElse(
+        header -> sessionDataStorage.put(LAST_STORED_PIVOT_KEY, header),
+        () -> sessionDataStorage.drop(LAST_STORED_PIVOT_KEY));
+    lastStoredPivot = maybeHeader;
+  }
+
+  public synchronized Optional<Block> getPivot() {
+    if (lastStoredPivot.isEmpty()) {
+      return Optional.empty();
+    }
+    return blocks.get(lastStoredPivot.get().getHash());
+  }
+
+  public synchronized void dropFirstHeader() {
+    if (firstStoredAncestor.isEmpty()) {
+      return;
+    }
+    headers.drop(firstStoredAncestor.get().getHash());
+    final Optional<Hash> hash = chainStorage.get(firstStoredAncestor.get().getHash());
+    chainStorage.drop(firstStoredAncestor.get().getHash());
+    updateFirstStoredAncestor(hash.flatMap(headers::get));
+    if (firstStoredAncestor.isEmpty()) {
+      updateLastStoredPivot(Optional.empty());
+    }
+  }
+
+  public synchronized void appendTrustedBlock(final Block newPivot) {
+    LOG.atDebug().setMessage("Appending trusted block {}").addArgument(newPivot::toLogString).log();
+    headers.put(newPivot.getHash(), newPivot.getHeader());
+    blocks.put(newPivot.getHash(), newPivot);
+    if (lastStoredPivot.isEmpty()) {
+      updateFirstStoredAncestor(Optional.of(newPivot.getHeader()));
+    } else {
+      if (newPivot.getHeader().getParentHash().equals(lastStoredPivot.get().getHash())) {
+        LOG.atDebug()
+            .setMessage("Added block {} to backward chain led by pivot {} on height {}")
+            .addArgument(newPivot::toLogString)
+            .addArgument(lastStoredPivot.get()::toLogString)
+            .addArgument(firstStoredAncestor.get()::getNumber)
+            .log();
+        chainStorage.put(lastStoredPivot.get().getHash(), newPivot.getHash());
+      } else {
+        updateFirstStoredAncestor(Optional.of(newPivot.getHeader()));
+        LOG.atDebug()
+            .setMessage("Re-pivoting to new target block {}")
+            .addArgument(newPivot::toLogString)
+            .log();
+      }
+    }
+    updateLastStoredPivot(Optional.of(newPivot.getHeader()));
+  }
+
+  public synchronized boolean isTrusted(final Hash hash) {
+    return blocks.get(hash).isPresent();
+  }
+
+  public synchronized Block getTrustedBlock(final Hash hash) {
+    return blocks.get(hash).orElseThrow();
+  }
+
+  public synchronized void clear() {
+    blocks.clear();
+    headers.clear();
+    chainStorage.clear();
+    sessionDataStorage.clear();
+    firstStoredAncestor = Optional.empty();
+    lastStoredPivot = Optional.empty();
+    hashesToAppend.clear();
+  }
+
+  public synchronized Optional<Hash> getDescendant(final Hash blockHash) {
+    return chainStorage.get(blockHash);
+  }
+
+  public synchronized Optional<Block> getBlock(final Hash hash) {
+    return blocks.get(hash);
+  }
+
+  public synchronized Optional<BlockHeader> getHeader(final Hash hash) {
+    return headers.get(hash);
+  }
+
+  public synchronized void addNewHash(final Hash newBlockHash) {
+    if (hashesToAppend.contains(newBlockHash)) {
+      return;
+    }
+    this.hashesToAppend.add(newBlockHash);
+  }
+
+  public synchronized Optional<Hash> getFirstHashToAppend() {
+    return Optional.ofNullable(hashesToAppend.peek());
+  }
+
+  public synchronized void removeFromHashToAppend(final Hash hashToRemove) {
+    if (hashesToAppend.contains(hashToRemove)) {
+      hashesToAppend.remove(hashToRemove);
+    }
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncAlgorithm.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncAlgorithm.java
new file mode 100644
index 00000000000..731291dc1ea
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncAlgorithm.java
@@ -0,0 +1,185 @@
+/*
+ *
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.eth.sync.backwardsync;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.task.WaitForPeersTask;
+import org.hyperledger.besu.plugin.services.BesuEvents;
+
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.slf4j.Logger;
+
+public class BackwardSyncAlgorithm implements BesuEvents.InitialSyncCompletionListener {
+  private static final Logger LOG = getLogger(BackwardSyncAlgorithm.class);
+
+  private final BackwardSyncContext context;
+  private final FinalBlockConfirmation finalBlockConfirmation;
+  private final AtomicReference<CountDownLatch> latch =
+      new AtomicReference<>(new CountDownLatch(1));
+  private volatile boolean finished = false;
+
+  public BackwardSyncAlgorithm(
+      final BackwardSyncContext context, final FinalBlockConfirmation finalBlockConfirmation) {
+    this.context = context;
+    this.finalBlockConfirmation = finalBlockConfirmation;
+  }
+
+  public CompletableFuture<Void> executeBackwardsSync(final Void unused) {
+    final CompletableFuture<Void> nextStep = pickNextStep();
+    if (finished) {
+      return nextStep;
+    }
+    return nextStep.thenCompose(this::executeBackwardsSync);
+  }
+
+  public CompletableFuture<Void> pickNextStep() {
+    final Optional<Hash> firstHash = context.getBackwardChain().getFirstHashToAppend();
+    if (firstHash.isPresent()) {
+      return executeSyncStep(firstHash.get())
+          .thenAccept(
+              result -> {
+                LOG.atDebug()
+                    .setMessage("Backward sync target block is {}")
+                    .addArgument(result::toLogString)
+                    .log();
+                context.getBackwardChain().removeFromHashToAppend(firstHash.get());
+                context.getStatus().updateTargetHeight(result.getHeader().getNumber());
+              });
+    }
+    if (!context.isReady()) {
+      return waitForReady();
+    }
+    final Optional<BlockHeader> maybeFirstAncestorHeader =
+        context.getBackwardChain().getFirstAncestorHeader();
+    if (maybeFirstAncestorHeader.isEmpty()) {
+      this.finished = true;
+      LOG.info("Current backward sync session is done");
+      context.getBackwardChain().clear();
+      return CompletableFuture.completedFuture(null);
+    }
+
+    final MutableBlockchain blockchain = context.getProtocolContext().getBlockchain();
+    final BlockHeader firstAncestorHeader = maybeFirstAncestorHeader.get();
+    final BlockHeader chainHeader = blockchain.getChainHeadHeader();
+    if (blockchain.contains(firstAncestorHeader.getHash())
+        && firstAncestorHeader.getNumber() <= chainHeader.getNumber()) {
+      return executeProcessKnownAncestors();
+    }
+
+    if (chainHeader.getNumber() > firstAncestorHeader.getNumber()) {
+      LOG.atDebug()
+          .setMessage("Backward reached below current chain head {} : {}")
+          .addArgument(() -> blockchain.getChainHead().toLogString())
+          .addArgument(firstAncestorHeader::toLogString)
+          .log();
+    }
+
+    if (finalBlockConfirmation.ancestorHeaderReached(firstAncestorHeader)) {
+      LOG.atDebug()
+          .setMessage("Backward sync reached ancestor header with {}, starting forward sync")
+          .addArgument(firstAncestorHeader::toLogString)
+          .log();
+      return executeForwardAsync();
+    }
+
+    return executeBackwardAsync(firstAncestorHeader);
+  }
+
+  @VisibleForTesting
+  public CompletableFuture<Void> executeProcessKnownAncestors() {
+    return new ProcessKnownAncestorsStep(context, context.getBackwardChain()).executeAsync();
+  }
+
+  @VisibleForTesting
+  public CompletableFuture<Block> executeSyncStep(final Hash hash) {
+    return new SyncStepStep(context, context.getBackwardChain()).executeAsync(hash);
+  }
+
+  @VisibleForTesting
+  protected CompletableFuture<Void> executeBackwardAsync(final BlockHeader firstHeader) {
+    return new BackwardSyncStep(context, context.getBackwardChain()).executeAsync(firstHeader);
+  }
+
+  @VisibleForTesting
+  protected CompletableFuture<Void> executeForwardAsync() {
+    return new ForwardSyncStep(context, context.getBackwardChain()).executeAsync();
+  }
+
+  @VisibleForTesting
+  protected CompletableFuture<Void> waitForReady() {
+    final long idTTD = context.getSyncState().subscribeTTDReached(reached -> countDownIfReady());
+    final long idIS = context.getSyncState().subscribeCompletionReached(this);
+    return CompletableFuture.runAsync(() -> checkReadiness(idTTD, idIS));
+  }
+
+  private void checkReadiness(final long idTTD, final long idIS) {
+    try {
+      if (!context.isReady()) {
+        LOG.debug("Waiting for preconditions...");
+        final boolean await = latch.get().await(2, TimeUnit.MINUTES);
+        if (await) {
+          LOG.debug("Preconditions meet, ensure at least one peer is connected");
+          waitForPeers(1).get();
+        }
+      }
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw new BackwardSyncException(
+          "Wait for TTD preconditions interrupted (" + e.getMessage() + ")");
+    } catch (ExecutionException e) {
+      throw new BackwardSyncException(
+          "Error while waiting for at least one connected peer (" + e.getMessage() + ")", true);
+    } finally {
+      context.getSyncState().unsubscribeTTDReached(idTTD);
+      context.getSyncState().unsubscribeInitialConditionReached(idIS);
+    }
+  }
+
+  private void countDownIfReady() {
+    if (context.isReady()) {
+      latch.get().countDown();
+    }
+  }
+
+  private CompletableFuture<Void> waitForPeers(final int count) {
+    final WaitForPeersTask waitForPeersTask =
+        WaitForPeersTask.create(context.getEthContext(), count, context.getMetricsSystem());
+    return waitForPeersTask.run();
+  }
+
+  @Override
+  public void onInitialSyncCompleted() {
+    countDownIfReady();
+  }
+
+  @Override
+  public void onInitialSyncRestart() {
+    latch.set(new CountDownLatch(1));
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncContext.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncContext.java
new file mode 100644
index 00000000000..fc02409ce78
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncContext.java
@@ -0,0 +1,448 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.backwardsync;
+
+import static org.hyperledger.besu.util.FutureUtils.exceptionallyCompose;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.BlockValidator;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.util.Subscribers;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicReference;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class BackwardSyncContext {
+  private static final Logger LOG = LoggerFactory.getLogger(BackwardSyncContext.class);
+  public static final int BATCH_SIZE = 200;
+  private static final int DEFAULT_MAX_RETRIES = 20;
+  private static final long MILLIS_DELAY_BETWEEN_PROGRESS_LOG = 10_000L;
+  private static final long DEFAULT_MILLIS_BETWEEN_RETRIES = 5000;
+
+  protected final ProtocolContext protocolContext;
+  private final ProtocolSchedule protocolSchedule;
+  private final EthContext ethContext;
+  private final MetricsSystem metricsSystem;
+  private final SyncState syncState;
+  private final AtomicReference<Status> currentBackwardSyncStatus = new AtomicReference<>();
+  private final BackwardChain backwardChain;
+  private int batchSize = BATCH_SIZE;
+  private final int maxRetries;
+  private final long millisBetweenRetries = DEFAULT_MILLIS_BETWEEN_RETRIES;
+  private final Subscribers<BadChainListener> badChainListeners = Subscribers.create();
+
+  public BackwardSyncContext(
+      final ProtocolContext protocolContext,
+      final ProtocolSchedule protocolSchedule,
+      final MetricsSystem metricsSystem,
+      final EthContext ethContext,
+      final SyncState syncState,
+      final BackwardChain backwardChain) {
+    this(
+        protocolContext,
+        protocolSchedule,
+        metricsSystem,
+        ethContext,
+        syncState,
+        backwardChain,
+        DEFAULT_MAX_RETRIES);
+  }
+
+  public BackwardSyncContext(
+      final ProtocolContext protocolContext,
+      final ProtocolSchedule protocolSchedule,
+      final MetricsSystem metricsSystem,
+      final EthContext ethContext,
+      final SyncState syncState,
+      final BackwardChain backwardChain,
+      final int maxRetries) {
+
+    this.protocolContext = protocolContext;
+    this.protocolSchedule = protocolSchedule;
+    this.ethContext = ethContext;
+    this.metricsSystem = metricsSystem;
+    this.syncState = syncState;
+    this.backwardChain = backwardChain;
+    this.maxRetries = maxRetries;
+  }
+
+  public synchronized boolean isSyncing() {
+    return Optional.ofNullable(currentBackwardSyncStatus.get())
+        .map(status -> status.currentFuture.isDone())
+        .orElse(Boolean.FALSE);
+  }
+
+  public synchronized void maybeUpdateTargetHeight(final Hash headHash) {
+    if (!Hash.ZERO.equals(headHash)) {
+      Optional<Status> maybeCurrentStatus = Optional.ofNullable(currentBackwardSyncStatus.get());
+      maybeCurrentStatus.ifPresent(
+          status ->
+              backwardChain
+                  .getBlock(headHash)
+                  .ifPresent(
+                      block -> {
+                        LOG.atTrace()
+                            .setMessage("updateTargetHeight to {}")
+                            .addArgument(block::toLogString)
+                            .log();
+                        status.updateTargetHeight(block.getHeader().getNumber());
+                      }));
+    }
+  }
+
+  public synchronized CompletableFuture<Void> syncBackwardsUntil(final Hash newBlockHash) {
+    if (!isTrusted(newBlockHash)) {
+      backwardChain.addNewHash(newBlockHash);
+    }
+
+    final Status status = getOrStartSyncSession();
+    backwardChain
+        .getBlock(newBlockHash)
+        .ifPresent(
+            newTargetBlock -> status.updateTargetHeight(newTargetBlock.getHeader().getNumber()));
+    return status.currentFuture;
+  }
+
+  public synchronized CompletableFuture<Void> syncBackwardsUntil(final Block newPivot) {
+    if (!isTrusted(newPivot.getHash())) {
+      backwardChain.appendTrustedBlock(newPivot);
+    }
+
+    final Status status = getOrStartSyncSession();
+    status.updateTargetHeight(newPivot.getHeader().getNumber());
+    return status.currentFuture;
+  }
+
+  private Status getOrStartSyncSession() {
+    Optional<Status> maybeCurrentStatus = Optional.ofNullable(this.currentBackwardSyncStatus.get());
+    return maybeCurrentStatus.orElseGet(
+        () -> {
+          LOG.info("Starting a new backward sync session");
+          Status newStatus = new Status(prepareBackwardSyncFutureWithRetry());
+          this.currentBackwardSyncStatus.set(newStatus);
+          return newStatus;
+        });
+  }
+
+  private boolean isTrusted(final Hash hash) {
+    if (backwardChain.isTrusted(hash)) {
+      LOG.atDebug()
+          .setMessage(
+              "Not fetching or appending hash {} to backward sync since it is present in successors")
+          .addArgument(hash::toHexString)
+          .log();
+      return true;
+    }
+    return false;
+  }
+
+  private CompletableFuture<Void> prepareBackwardSyncFutureWithRetry() {
+    return prepareBackwardSyncFutureWithRetry(maxRetries)
+        .handle(
+            (unused, throwable) -> {
+              this.currentBackwardSyncStatus.set(null);
+              if (throwable != null) {
+                LOG.info("Current backward sync session failed, it will be restarted");
+                throw extractBackwardSyncException(throwable)
+                    .orElse(new BackwardSyncException(throwable));
+              }
+              return null;
+            });
+  }
+
+  private CompletableFuture<Void> prepareBackwardSyncFutureWithRetry(final int retries) {
+    if (retries == 0) {
+      return CompletableFuture.failedFuture(
+          new BackwardSyncException("Max number of retries " + maxRetries + " reached"));
+    }
+
+    return exceptionallyCompose(
+        prepareBackwardSyncFuture(),
+        throwable -> {
+          processException(throwable);
+          return ethContext
+              .getScheduler()
+              .scheduleFutureTask(
+                  () -> prepareBackwardSyncFutureWithRetry(retries - 1),
+                  Duration.ofMillis(millisBetweenRetries));
+        });
+  }
+
+  @VisibleForTesting
+  protected void processException(final Throwable throwable) {
+    extractBackwardSyncException(throwable)
+        .ifPresentOrElse(
+            backwardSyncException -> {
+              if (backwardSyncException.shouldRestart()) {
+                LOG.debug(
+                    "Backward sync failed ({}). Current Peers: {}. Retrying in {} milliseconds",
+                    throwable.getMessage(),
+                    ethContext.getEthPeers().peerCount(),
+                    millisBetweenRetries);
+              } else {
+                LOG.atDebug()
+                    .setMessage("Not recoverable backward sync exception {}")
+                    .addArgument(throwable::getMessage)
+                    .log();
+                throw backwardSyncException;
+              }
+            },
+            () -> {
+              LOG.debug(
+                  "Backward sync failed ({}). Current Peers: {}. Retrying in {} milliseconds",
+                  throwable.getMessage(),
+                  ethContext.getEthPeers().peerCount(),
+                  millisBetweenRetries);
+              LOG.debug("Exception details:", throwable);
+            });
+  }
+
+  private Optional<BackwardSyncException> extractBackwardSyncException(final Throwable throwable) {
+    Throwable currentCause = throwable;
+
+    while (currentCause != null) {
+      if (currentCause instanceof BackwardSyncException) {
+        return Optional.of((BackwardSyncException) currentCause);
+      }
+      currentCause = currentCause.getCause();
+    }
+    return Optional.empty();
+  }
+
+  @VisibleForTesting
+  CompletableFuture<Void> prepareBackwardSyncFuture() {
+    final MutableBlockchain blockchain = getProtocolContext().getBlockchain();
+    return new BackwardSyncAlgorithm(
+            this,
+            FinalBlockConfirmation.confirmationChain(
+                FinalBlockConfirmation.genesisConfirmation(blockchain),
+                FinalBlockConfirmation.ancestorConfirmation(blockchain)))
+        .executeBackwardsSync(null);
+  }
+
+  public ProtocolSchedule getProtocolSchedule() {
+    return protocolSchedule;
+  }
+
+  public EthContext getEthContext() {
+    return ethContext;
+  }
+
+  public MetricsSystem getMetricsSystem() {
+    return metricsSystem;
+  }
+
+  public ProtocolContext getProtocolContext() {
+    return protocolContext;
+  }
+
+  public BlockValidator getBlockValidator(final BlockHeader blockHeader) {
+    return protocolSchedule.getByBlockHeader(blockHeader).getBlockValidator();
+  }
+
+  public BlockValidator getBlockValidatorForBlock(final Block block) {
+    return getBlockValidator(block.getHeader());
+  }
+
+  public boolean isReady() {
+    LOG.debug(
+        "checking if BWS is ready: ttd reached {}, initial sync done {}",
+        syncState.hasReachedTerminalDifficulty().orElse(Boolean.FALSE),
+        syncState.isInitialSyncPhaseDone());
+    return syncState.hasReachedTerminalDifficulty().orElse(Boolean.FALSE)
+        && syncState.isInitialSyncPhaseDone();
+  }
+
+  public void subscribeBadChainListener(final BadChainListener badChainListener) {
+    badChainListeners.subscribe(badChainListener);
+  }
+
+  // In rare case when we request too many headers/blocks we get response that does not contain all
+  // data, and we might want to retry with smaller batch size
+  public int getBatchSize() {
+    return batchSize;
+  }
+
+  public void halveBatchSize() {
+    this.batchSize = batchSize / 2 + 1;
+  }
+
+  public void resetBatchSize() {
+    this.batchSize = BATCH_SIZE;
+  }
+
+  protected Void saveBlock(final Block block) {
+    LOG.atTrace().setMessage("Going to validate block {}").addArgument(block::toLogString).log();
+    var optResult =
+        this.getBlockValidatorForBlock(block)
+            .validateAndProcessBlock(
+                this.getProtocolContext(),
+                block,
+                HeaderValidationMode.FULL,
+                HeaderValidationMode.NONE);
+    if (optResult.isSuccessful()) {
+      LOG.atTrace()
+          .setMessage("Block {} was validated, going to import it")
+          .addArgument(block::toLogString)
+          .log();
+      optResult.getYield().get().getWorldState().persist(block.getHeader());
+      this.getProtocolContext()
+          .getBlockchain()
+          .appendBlock(block, optResult.getYield().get().getReceipts());
+      possiblyMoveHead(block);
+      logBlockImportProgress(block.getHeader().getNumber());
+    } else {
+      emitBadChainEvent(block);
+      throw new BackwardSyncException(
+          "Cannot save block "
+              + block.toLogString()
+              + " because of "
+              + optResult.errorMessage.orElseThrow());
+    }
+
+    return null;
+  }
+
+  @VisibleForTesting
+  protected void possiblyMoveHead(final Block lastSavedBlock) {
+    final MutableBlockchain blockchain = getProtocolContext().getBlockchain();
+
+    if (blockchain.getChainHead().getHash().equals(lastSavedBlock.getHash())) {
+      LOG.atDebug()
+          .setMessage("Head is already properly set to {}")
+          .addArgument(lastSavedBlock::toLogString)
+          .log();
+      return;
+    }
+
+    LOG.atDebug()
+        .setMessage("Rewinding head to last saved block {}")
+        .addArgument(lastSavedBlock::toLogString)
+        .log();
+    blockchain.rewindToBlock(lastSavedBlock.getHash());
+  }
+
+  public SyncState getSyncState() {
+    return syncState;
+  }
+
+  public synchronized BackwardChain getBackwardChain() {
+    return backwardChain;
+  }
+
+  public Status getStatus() {
+    return currentBackwardSyncStatus.get();
+  }
+
+  private void emitBadChainEvent(final Block badBlock) {
+    final List<Block> badBlockDescendants = new ArrayList<>();
+    final List<BlockHeader> badBlockHeaderDescendants = new ArrayList<>();
+
+    Optional<Hash> descendant = backwardChain.getDescendant(badBlock.getHash());
+
+    while (descendant.isPresent()) {
+      final Optional<Block> block = backwardChain.getBlock(descendant.get());
+      if (block.isPresent()) {
+        badBlockDescendants.add(block.get());
+      } else {
+        backwardChain.getHeader(descendant.get()).ifPresent(badBlockHeaderDescendants::add);
+      }
+
+      descendant = backwardChain.getDescendant(descendant.get());
+    }
+
+    badChainListeners.forEach(
+        listener -> listener.onBadChain(badBlock, badBlockDescendants, badBlockHeaderDescendants));
+  }
+
+  private void logBlockImportProgress(final long currImportedHeight) {
+    final Status currentStatus = getStatus();
+    final long targetHeight = currentStatus.getTargetChainHeight();
+    final long initialHeight = currentStatus.getInitialChainHeight();
+    final long estimatedTotal = targetHeight - initialHeight;
+    final long imported = currImportedHeight - initialHeight;
+
+    final float completedPercentage = 100.0f * imported / estimatedTotal;
+
+    if (completedPercentage < 100.0f) {
+      if (currentStatus.progressLogDue()) {
+        LOG.info(
+            String.format(
+                "Backward sync phase 2 of 2, %.2f%% completed, imported %d blocks of at least %d (current head %d, target head %d). Peers: %d",
+                completedPercentage,
+                imported,
+                estimatedTotal,
+                currImportedHeight,
+                currentStatus.getTargetChainHeight(),
+                getEthContext().getEthPeers().peerCount()));
+      }
+    } else {
+      LOG.info(
+          String.format(
+              "Backward sync phase 2 of 2 completed, imported a total of %d blocks. Peers: %d",
+              imported, getEthContext().getEthPeers().peerCount()));
+    }
+  }
+
+  class Status {
+    private final CompletableFuture<Void> currentFuture;
+    private final long initialChainHeight;
+    private long targetChainHeight;
+
+    private long lastLogAt = 0;
+
+    public Status(final CompletableFuture<Void> currentFuture) {
+      this.currentFuture = currentFuture;
+      this.initialChainHeight = protocolContext.getBlockchain().getChainHeadBlockNumber();
+    }
+
+    public void updateTargetHeight(final long newTargetHeight) {
+      targetChainHeight = newTargetHeight;
+    }
+
+    public boolean progressLogDue() {
+      final long now = System.currentTimeMillis();
+      if (now - lastLogAt > MILLIS_DELAY_BETWEEN_PROGRESS_LOG) {
+        lastLogAt = now;
+        return true;
+      }
+      return false;
+    }
+
+    public long getTargetChainHeight() {
+      return targetChainHeight;
+    }
+
+    public long getInitialChainHeight() {
+      return initialChainHeight;
+    }
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncException.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncException.java
new file mode 100644
index 00000000000..9464a911ede
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncException.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.backwardsync;
+
+public class BackwardSyncException extends RuntimeException {
+
+  private final boolean restartable;
+
+  public BackwardSyncException(final String message) {
+    this(message, false);
+  }
+
+  public BackwardSyncException(final Throwable error) {
+    this(error, false);
+  }
+
+  public BackwardSyncException(final String message, final boolean restartable) {
+    super(message);
+    this.restartable = restartable;
+  }
+
+  public BackwardSyncException(final Throwable error, final boolean restartable) {
+    super(error);
+    this.restartable = restartable;
+  }
+
+  public boolean shouldRestart() {
+    return restartable;
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncStep.java
new file mode 100644
index 00000000000..10315a60102
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncStep.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.backwardsync;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.task.RetryingGetHeadersEndingAtFromPeerByHashTask;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class BackwardSyncStep {
+  private static final Logger LOG = LoggerFactory.getLogger(BackwardSyncStep.class);
+  private final BackwardSyncContext context;
+  private final BackwardChain backwardChain;
+
+  public BackwardSyncStep(final BackwardSyncContext context, final BackwardChain backwardChain) {
+    this.context = context;
+    this.backwardChain = backwardChain;
+  }
+
+  public CompletableFuture<Void> executeAsync(final BlockHeader firstHeader) {
+    return CompletableFuture.supplyAsync(() -> firstHeader)
+        .thenApply(this::possibleRestoreOldNodes)
+        .thenCompose(this::requestHeaders)
+        .thenApply(this::saveHeaders);
+  }
+
+  @VisibleForTesting
+  protected Hash possibleRestoreOldNodes(final BlockHeader firstAncestor) {
+    Hash lastHash = firstAncestor.getParentHash();
+    Optional<BlockHeader> iterator = backwardChain.getHeader(lastHash);
+    while (iterator.isPresent()) {
+      backwardChain.prependAncestorsHeader(iterator.get(), true);
+      lastHash = iterator.get().getParentHash();
+      iterator = backwardChain.getHeader(lastHash);
+    }
+    return lastHash;
+  }
+
+  @VisibleForTesting
+  protected CompletableFuture<List<BlockHeader>> requestHeaders(final Hash hash) {
+    final Optional<BlockHeader> blockHeader =
+        context.getProtocolContext().getBlockchain().getBlockHeader(hash);
+    if (blockHeader.isPresent()) {
+      LOG.debug(
+          "Hash {} already present in local blockchain no need to request headers to peers", hash);
+      return CompletableFuture.completedFuture(List.of(blockHeader.get()));
+    }
+
+    final int batchSize = context.getBatchSize();
+    LOG.debug("Requesting headers for hash {}, with batch size {}", hash, batchSize);
+
+    final RetryingGetHeadersEndingAtFromPeerByHashTask
+        retryingGetHeadersEndingAtFromPeerByHashTask =
+            RetryingGetHeadersEndingAtFromPeerByHashTask.endingAtHash(
+                context.getProtocolSchedule(),
+                context.getEthContext(),
+                hash,
+                0,
+                batchSize,
+                context.getMetricsSystem(),
+                context.getEthContext().getEthPeers().peerCount());
+    return context
+        .getEthContext()
+        .getScheduler()
+        .scheduleSyncWorkerTask(retryingGetHeadersEndingAtFromPeerByHashTask::run)
+        .thenApply(
+            blockHeaders -> {
+              LOG.atDebug()
+                  .setMessage("Got headers {} -> {}")
+                  .addArgument(blockHeaders.get(0)::getNumber)
+                  .addArgument(blockHeaders.get(blockHeaders.size() - 1)::getNumber)
+                  .log();
+              return blockHeaders;
+            });
+  }
+
+  @VisibleForTesting
+  protected Void saveHeader(final BlockHeader blockHeader) {
+    backwardChain.prependAncestorsHeader(blockHeader);
+    return null;
+  }
+
+  @VisibleForTesting
+  protected Void saveHeaders(final List<BlockHeader> blockHeaders) {
+    for (BlockHeader blockHeader : blockHeaders) {
+      saveHeader(blockHeader);
+    }
+
+    if (!blockHeaders.isEmpty()) {
+      logProgress(blockHeaders.get(blockHeaders.size() - 1).getNumber());
+    }
+    return null;
+  }
+
+  private void logProgress(final long currLowestDownloadedHeight) {
+    final long targetHeight = context.getStatus().getTargetChainHeight();
+    final long initialHeight = context.getStatus().getInitialChainHeight();
+    final long estimatedTotal = targetHeight - initialHeight;
+    final long downloaded = targetHeight - currLowestDownloadedHeight;
+
+    final float completedPercentage = 100.0f * downloaded / estimatedTotal;
+
+    if (completedPercentage < 100.0f) {
+      if (context.getStatus().progressLogDue()) {
+        LOG.info(
+            String.format(
+                "Backward sync phase 1 of 2, %.2f%% completed, downloaded %d headers of at least %d. Peers: %d",
+                completedPercentage,
+                downloaded,
+                estimatedTotal,
+                context.getEthContext().getEthPeers().peerCount()));
+      }
+    } else {
+      LOG.info(
+          String.format(
+              "Backward sync phase 1 of 2 completed, downloaded a total of %d headers. Peers: %d",
+              downloaded, context.getEthContext().getEthPeers().peerCount()));
+    }
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BadChainListener.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BadChainListener.java
new file mode 100644
index 00000000000..1e88f6d659c
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BadChainListener.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.backwardsync;
+
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.List;
+
+public interface BadChainListener {
+  void onBadChain(
+      final Block badBlock,
+      final List<Block> badBlockDescendants,
+      final List<BlockHeader> badBlockHeaderDescendants);
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BlocksConvertor.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BlocksConvertor.java
new file mode 100644
index 00000000000..dc17914345d
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BlocksConvertor.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.eth.sync.backwardsync;
+
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class BlocksConvertor implements ValueConvertor<Block> {
+  private final BlockHeaderFunctions blockHeaderFunctions;
+
+  public BlocksConvertor(final BlockHeaderFunctions blockHeaderFunctions) {
+    this.blockHeaderFunctions = blockHeaderFunctions;
+  }
+
+  public static ValueConvertor<Block> of(final BlockHeaderFunctions blockHeaderFunctions) {
+    return new BlocksConvertor(blockHeaderFunctions);
+  }
+
+  @Override
+  public Block fromBytes(final byte[] bytes) {
+
+    final RLPInput input = RLP.input(Bytes.wrap(bytes));
+    return Block.readFrom(input, blockHeaderFunctions);
+  }
+
+  @Override
+  public byte[] toBytes(final Block value) {
+    return value.toRlp().toArrayUnsafe();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BlocksHeadersConvertor.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BlocksHeadersConvertor.java
new file mode 100644
index 00000000000..0655ec0a938
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BlocksHeadersConvertor.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.eth.sync.backwardsync;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class BlocksHeadersConvertor implements ValueConvertor<BlockHeader> {
+  private final BlockHeaderFunctions blockHeaderFunctions;
+
+  public BlocksHeadersConvertor(final BlockHeaderFunctions blockHeaderFunctions) {
+    this.blockHeaderFunctions = blockHeaderFunctions;
+  }
+
+  public static ValueConvertor<BlockHeader> of(final BlockHeaderFunctions blockHeaderFunctions) {
+    return new BlocksHeadersConvertor(blockHeaderFunctions);
+  }
+
+  @Override
+  public BlockHeader fromBytes(final byte[] bytes) {
+    return BlockHeader.readFrom(RLP.input(Bytes.wrap(bytes)), blockHeaderFunctions);
+  }
+
+  @Override
+  public byte[] toBytes(final BlockHeader value) {
+    BytesValueRLPOutput output = new BytesValueRLPOutput();
+    value.writeTo(output);
+    return output.encoded().toArrayUnsafe();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/FinalBlockConfirmation.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/FinalBlockConfirmation.java
new file mode 100644
index 00000000000..078220c535e
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/FinalBlockConfirmation.java
@@ -0,0 +1,62 @@
+/*
+ *
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.eth.sync.backwardsync;
+
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.Arrays;
+
+public interface FinalBlockConfirmation {
+  boolean ancestorHeaderReached(final BlockHeader firstHeader);
+
+  static FinalBlockConfirmation genesisConfirmation(final MutableBlockchain blockchain) {
+    final BlockHeader genesisBlockHeader = blockchain.getBlockHeader(0).orElseThrow();
+    return firstHeader -> {
+      if (firstHeader.getNumber() > 0) {
+        return false;
+      }
+
+      if (!genesisBlockHeader.getHash().equals(firstHeader.getHash())) {
+        throw new BackwardSyncException(
+            "Should have reached header "
+                + genesisBlockHeader.toLogString()
+                + " but reached "
+                + firstHeader.toLogString());
+      }
+      return true;
+    };
+  }
+
+  static FinalBlockConfirmation ancestorConfirmation(final MutableBlockchain blockchain) {
+    return firstHeader ->
+        blockchain.contains(firstHeader.getParentHash())
+            && blockchain.getChainHeadBlockNumber() + 1 >= firstHeader.getNumber();
+  }
+
+  static FinalBlockConfirmation confirmationChain(final FinalBlockConfirmation... confirmations) {
+    return firstHeader -> {
+      return Arrays.stream(confirmations)
+          .reduce(
+              false,
+              (aBoolean, confirmation2) ->
+                  aBoolean || confirmation2.ancestorHeaderReached(firstHeader),
+              (aBoolean, aBoolean2) -> aBoolean || aBoolean2);
+    };
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/ForwardSyncStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/ForwardSyncStep.java
new file mode 100644
index 00000000000..c71a97a5f49
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/ForwardSyncStep.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.backwardsync;
+
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerTask;
+import org.hyperledger.besu.ethereum.eth.manager.task.RetryingGetBlocksFromPeersTask;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ForwardSyncStep {
+
+  private static final Logger LOG = LoggerFactory.getLogger(ForwardSyncStep.class);
+  private final BackwardSyncContext context;
+  private final BackwardChain backwardChain;
+
+  public ForwardSyncStep(final BackwardSyncContext context, final BackwardChain backwardChain) {
+    this.context = context;
+    this.backwardChain = backwardChain;
+  }
+
+  public CompletableFuture<Void> executeAsync() {
+    return CompletableFuture.supplyAsync(
+            () -> backwardChain.getFirstNAncestorHeaders(context.getBatchSize()))
+        .thenCompose(this::possibleRequestBodies);
+  }
+
+  @VisibleForTesting
+  public CompletableFuture<Void> possibleRequestBodies(final List<BlockHeader> blockHeaders) {
+    if (blockHeaders.isEmpty()) {
+      return CompletableFuture.completedFuture(null);
+    } else {
+      LOG.atDebug()
+          .setMessage("Requesting {} blocks {}->{} ({})")
+          .addArgument(blockHeaders::size)
+          .addArgument(() -> blockHeaders.get(0).getNumber())
+          .addArgument(() -> blockHeaders.get(blockHeaders.size() - 1).getNumber())
+          .addArgument(() -> blockHeaders.get(0).getHash().toHexString())
+          .log();
+      return requestBodies(blockHeaders)
+          .thenApply(this::saveBlocks)
+          .exceptionally(
+              throwable -> {
+                context.halveBatchSize();
+                LOG.atDebug()
+                    .setMessage(
+                        "Getting {} blocks from peers failed with reason {}, reducing batch size to {}")
+                    .addArgument(blockHeaders::size)
+                    .addArgument(throwable::getMessage)
+                    .addArgument(context::getBatchSize)
+                    .log();
+                return null;
+              });
+    }
+  }
+
+  @VisibleForTesting
+  protected CompletableFuture<List<Block>> requestBodies(final List<BlockHeader> blockHeaders) {
+    final RetryingGetBlocksFromPeersTask getBodiesFromPeerTask =
+        RetryingGetBlocksFromPeersTask.forHeaders(
+            context.getProtocolSchedule(),
+            context.getEthContext(),
+            context.getMetricsSystem(),
+            context.getEthContext().getEthPeers().peerCount(),
+            blockHeaders);
+
+    final CompletableFuture<AbstractPeerTask.PeerTaskResult<List<Block>>> run =
+        getBodiesFromPeerTask.run();
+    return run.thenApply(AbstractPeerTask.PeerTaskResult::getResult)
+        .thenApply(
+            blocks -> {
+              LOG.debug("Got {} blocks from peers", blocks.size());
+              blocks.sort(Comparator.comparing(block -> block.getHeader().getNumber()));
+              return blocks;
+            });
+  }
+
+  @VisibleForTesting
+  protected Void saveBlocks(final List<Block> blocks) {
+    if (blocks.isEmpty()) {
+      context.halveBatchSize();
+      LOG.debug("No blocks to save, reducing batch size to {}", context.getBatchSize());
+      return null;
+    }
+
+    for (Block block : blocks) {
+      final Optional<BlockHeader> parent =
+          context
+              .getProtocolContext()
+              .getBlockchain()
+              .getBlockHeader(block.getHeader().getParentHash());
+
+      if (parent.isEmpty()) {
+        context.halveBatchSize();
+        LOG.atDebug()
+            .setMessage(
+                "Parent block {} not found, while saving block {}, reducing batch size to {}")
+            .addArgument(block.getHeader().getParentHash())
+            .addArgument(block::toLogString)
+            .addArgument(context::getBatchSize)
+            .log();
+        return null;
+      } else {
+        context.saveBlock(block);
+      }
+    }
+
+    if (blocks.size() == context.getBatchSize()) {
+      // reset the batch size only if we got a full batch
+      context.resetBatchSize();
+    }
+    return null;
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/GenericKeyValueStorageFacade.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/GenericKeyValueStorageFacade.java
new file mode 100644
index 00000000000..c6c929d0d26
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/GenericKeyValueStorageFacade.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.eth.sync.backwardsync;
+
+import org.hyperledger.besu.plugin.services.exception.StorageException;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+public class GenericKeyValueStorageFacade<K, V> implements Closeable {
+  protected final KeyValueStorage storage;
+  private final KeyConvertor<K> keyConvertor;
+  private final ValueConvertor<V> valueConvertor;
+
+  public GenericKeyValueStorageFacade(
+      final KeyConvertor<K> keyConvertor,
+      final ValueConvertor<V> valueConvertor,
+      final KeyValueStorage storageBySegmentIdentifier) {
+    this.keyConvertor = keyConvertor;
+    this.valueConvertor = valueConvertor;
+    this.storage = storageBySegmentIdentifier;
+  }
+
+  public Optional<V> get(final K key) {
+    return storage.get(keyConvertor.toBytes(key)).map(valueConvertor::fromBytes);
+  }
+
+  public Optional<V> get(final byte[] key) {
+    return storage.get(key).map(valueConvertor::fromBytes);
+  }
+
+  public void put(final K key, final V value) {
+    final KeyValueStorageTransaction keyValueStorageTransaction = storage.startTransaction();
+    keyValueStorageTransaction.put(keyConvertor.toBytes(key), valueConvertor.toBytes(value));
+    keyValueStorageTransaction.commit();
+  }
+
+  public void put(final byte[] key, final V value) {
+    final KeyValueStorageTransaction keyValueStorageTransaction = storage.startTransaction();
+    keyValueStorageTransaction.put(key, valueConvertor.toBytes(value));
+    keyValueStorageTransaction.commit();
+  }
+
+  public void putAll(
+      final Consumer<KeyValueStorageTransaction> keyValueStorageTransactionConsumer) {
+    final KeyValueStorageTransaction keyValueStorageTransaction = storage.startTransaction();
+    keyValueStorageTransactionConsumer.accept(keyValueStorageTransaction);
+    keyValueStorageTransaction.commit();
+  }
+
+  public void drop(final K key) {
+    storage.tryDelete(keyConvertor.toBytes(key));
+  }
+
+  public void clear() {
+    storage.clear();
+  }
+
+  @Override
+  public void close() throws IOException {
+    storage.close();
+  }
+
+  public void putAll(final Map<K, V> map) {
+    final KeyValueStorageTransaction keyValueStorageTransaction = storage.startTransaction();
+    for (Map.Entry<K, V> entry : map.entrySet()) {
+      keyValueStorageTransaction.put(
+          keyConvertor.toBytes(entry.getKey()), valueConvertor.toBytes(entry.getValue()));
+    }
+    keyValueStorageTransaction.commit();
+  }
+
+  public Stream<V> streamValuesFromKeysThat(final Predicate<byte[]> returnCondition)
+      throws StorageException {
+    return storage.getAllValuesFromKeysThat(returnCondition).stream()
+        .map(valueConvertor::fromBytes);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/HashConvertor.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/HashConvertor.java
new file mode 100644
index 00000000000..98fe808894b
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/HashConvertor.java
@@ -0,0 +1,34 @@
+/*
+ *
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.eth.sync.backwardsync;
+
+import org.hyperledger.besu.datatypes.Hash;
+
+import org.apache.tuweni.bytes.Bytes32;
+
+public class HashConvertor implements ValueConvertor<Hash> {
+  @Override
+  public Hash fromBytes(final byte[] bytes) {
+    return Hash.wrap(Bytes32.wrap(bytes));
+  }
+
+  @Override
+  public byte[] toBytes(final Hash value) {
+    return value.toArrayUnsafe();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/KeyConvertor.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/KeyConvertor.java
new file mode 100644
index 00000000000..bf7ed0c482f
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/KeyConvertor.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.eth.sync.backwardsync;
+
+public interface KeyConvertor<T> {
+  byte[] toBytes(final T key);
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/ProcessKnownAncestorsStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/ProcessKnownAncestorsStep.java
new file mode 100644
index 00000000000..77fb01524ba
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/ProcessKnownAncestorsStep.java
@@ -0,0 +1,86 @@
+/*
+ *
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.eth.sync.backwardsync;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.slf4j.Logger;
+
+public class ProcessKnownAncestorsStep {
+  private static final Logger LOG = getLogger(ProcessKnownAncestorsStep.class);
+
+  private final BackwardSyncContext context;
+  private final BackwardChain backwardChain;
+
+  public ProcessKnownAncestorsStep(
+      final BackwardSyncContext backwardSyncContext, final BackwardChain backwardChain) {
+    this.context = backwardSyncContext;
+    this.backwardChain = backwardChain;
+  }
+
+  public CompletableFuture<Void> executeAsync() {
+    return CompletableFuture.runAsync(this::processKnownAncestors);
+  }
+
+  @VisibleForTesting
+  protected void processKnownAncestors() {
+    while (backwardChain.getFirstAncestorHeader().isPresent()) {
+      BlockHeader header = backwardChain.getFirstAncestorHeader().orElseThrow();
+      final long chainHeadBlockNumber =
+          context.getProtocolContext().getBlockchain().getChainHeadBlockNumber();
+      boolean isFirstUnProcessedHeader = true;
+      if (context.getProtocolContext().getBlockchain().contains(header.getHash())
+          && header.getNumber() <= chainHeadBlockNumber) {
+        LOG.atDebug()
+            .setMessage("Block {} is already imported, we can ignore it for the sync process")
+            .addArgument(header::toLogString)
+            .log();
+        backwardChain.dropFirstHeader();
+        isFirstUnProcessedHeader = false;
+      } else if (context.getProtocolContext().getBlockchain().contains(header.getParentHash())) {
+        final boolean isTrustedBlock = backwardChain.isTrusted(header.getHash());
+        final Optional<Block> block =
+            isTrustedBlock
+                ? Optional.of(backwardChain.getTrustedBlock(header.getHash()))
+                : context.getProtocolContext().getBlockchain().getBlockByHash(header.getHash());
+        if (block.isPresent()) {
+          LOG.atDebug().setMessage("Importing block {}").addArgument(header::toLogString).log();
+          context.saveBlock(block.get());
+          if (isTrustedBlock) {
+            backwardChain.dropFirstHeader();
+            isFirstUnProcessedHeader = false;
+          }
+        }
+      }
+      if (isFirstUnProcessedHeader) {
+        LOG.atDebug()
+            .setMessage("First unprocessed header is {}")
+            .addArgument(header::toLogString)
+            .log();
+        return;
+      }
+    }
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/SyncStepStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/SyncStepStep.java
new file mode 100644
index 00000000000..78586030516
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/SyncStepStep.java
@@ -0,0 +1,72 @@
+/*
+ *
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.eth.sync.backwardsync;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerTask;
+import org.hyperledger.besu.ethereum.eth.manager.task.RetryingGetBlockFromPeersTask;
+
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import org.slf4j.Logger;
+
+public class SyncStepStep {
+  private static final Logger LOG = getLogger(SyncStepStep.class);
+
+  public static final int UNUSED = -1;
+  private final BackwardSyncContext context;
+  private final BackwardChain backwardChain;
+
+  public SyncStepStep(final BackwardSyncContext context, final BackwardChain backwardChain) {
+    this.context = context;
+    this.backwardChain = backwardChain;
+  }
+
+  public CompletableFuture<Block> executeAsync(final Hash hash) {
+    return CompletableFuture.supplyAsync(() -> hash)
+        .thenCompose(this::requestBlock)
+        .thenApply(this::saveBlock);
+  }
+
+  private CompletableFuture<Block> requestBlock(final Hash targetHash) {
+    LOG.atDebug().setMessage("Fetching block by hash {} from peers").addArgument(targetHash).log();
+    final RetryingGetBlockFromPeersTask getBlockTask =
+        RetryingGetBlockFromPeersTask.create(
+            context.getProtocolSchedule(),
+            context.getEthContext(),
+            context.getMetricsSystem(),
+            context.getEthContext().getEthPeers().peerCount(),
+            Optional.of(targetHash),
+            UNUSED);
+    return context
+        .getEthContext()
+        .getScheduler()
+        .scheduleSyncWorkerTask(getBlockTask::run)
+        .thenApply(AbstractPeerTask.PeerTaskResult::getResult);
+  }
+
+  private Block saveBlock(final Block block) {
+    LOG.atDebug().setMessage("Appending fetched block {}").addArgument(block::toLogString).log();
+    backwardChain.appendTrustedBlock(block);
+    return block;
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/ValueConvertor.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/ValueConvertor.java
new file mode 100644
index 00000000000..a6054e14530
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/ValueConvertor.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.eth.sync.backwardsync;
+
+public interface ValueConvertor<V> {
+  V fromBytes(final byte[] bytes);
+
+  byte[] toBytes(final V value);
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckpointBlockImportStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckpointBlockImportStep.java
new file mode 100644
index 00000000000..de5076900cd
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckpointBlockImportStep.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.checkpointsync;
+
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.checkpoint.Checkpoint;
+
+import java.util.Optional;
+import java.util.function.Consumer;
+
+public class CheckpointBlockImportStep implements Consumer<Optional<BlockWithReceipts>> {
+
+  private final CheckpointSource checkpointSource;
+  private final Checkpoint checkpoint;
+  private final MutableBlockchain blockchain;
+
+  public CheckpointBlockImportStep(
+      final CheckpointSource checkpointSource,
+      final Checkpoint checkpoint,
+      final MutableBlockchain blockchain) {
+    this.checkpointSource = checkpointSource;
+    this.checkpoint = checkpoint;
+    this.blockchain = blockchain;
+  }
+
+  @Override
+  public void accept(final Optional<BlockWithReceipts> maybeBlock) {
+    maybeBlock.ifPresent(
+        block -> {
+          blockchain.unsafeImportBlock(
+              block.getBlock(),
+              block.getReceipts(),
+              block.getHash().equals(checkpoint.blockHash())
+                  ? Optional.of(checkpoint.totalDifficulty())
+                  : Optional.empty());
+          checkpointSource.setLastHeaderDownloaded(Optional.of(block.getHeader()));
+          if (!checkpointSource.hasNext()) {
+            blockchain.unsafeSetChainHead(
+                checkpointSource.getCheckpoint(), checkpoint.totalDifficulty());
+          }
+        });
+    checkpointSource.notifyTaskAvailable();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckpointDownloadBlockStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckpointDownloadBlockStep.java
new file mode 100644
index 00000000000..8fbe8127b26
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckpointDownloadBlockStep.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.checkpointsync;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult;
+import org.hyperledger.besu.ethereum.eth.manager.task.GetBlockFromPeerTask;
+import org.hyperledger.besu.ethereum.eth.manager.task.GetReceiptsFromPeerTask;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.checkpoint.Checkpoint;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+public class CheckpointDownloadBlockStep {
+
+  private final ProtocolSchedule protocolSchedule;
+  private final EthContext ethContext;
+  private final Checkpoint checkpoint;
+  private final MetricsSystem metricsSystem;
+
+  public CheckpointDownloadBlockStep(
+      final ProtocolSchedule protocolSchedule,
+      final EthContext ethContext,
+      final Checkpoint checkpoint,
+      final MetricsSystem metricsSystem) {
+    this.protocolSchedule = protocolSchedule;
+    this.ethContext = ethContext;
+    this.checkpoint = checkpoint;
+    this.metricsSystem = metricsSystem;
+  }
+
+  public CompletableFuture<Optional<BlockWithReceipts>> downloadBlock(final Hash hash) {
+    final GetBlockFromPeerTask getBlockFromPeerTask =
+        GetBlockFromPeerTask.create(
+            protocolSchedule,
+            ethContext,
+            Optional.of(hash),
+            checkpoint.blockNumber(),
+            metricsSystem);
+    return getBlockFromPeerTask
+        .run()
+        .thenCompose(this::downloadReceipts)
+        .exceptionally(throwable -> Optional.empty());
+  }
+
+  private CompletableFuture<Optional<BlockWithReceipts>> downloadReceipts(
+      final PeerTaskResult<Block> peerTaskResult) {
+    final Block block = peerTaskResult.getResult();
+    final GetReceiptsFromPeerTask getReceiptsFromPeerTask =
+        GetReceiptsFromPeerTask.forHeaders(ethContext, List.of(block.getHeader()), metricsSystem);
+    return getReceiptsFromPeerTask
+        .run()
+        .thenCompose(
+            receiptTaskResult -> {
+              final Optional<List<TransactionReceipt>> transactionReceipts =
+                  Optional.ofNullable(receiptTaskResult.getResult().get(block.getHeader()));
+              return CompletableFuture.completedFuture(
+                  transactionReceipts.map(receipts -> new BlockWithReceipts(block, receipts)));
+            })
+        .exceptionally(throwable -> Optional.empty());
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckpointDownloaderFactory.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckpointDownloaderFactory.java
new file mode 100644
index 00000000000..5be64317e29
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckpointDownloaderFactory.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.checkpointsync;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.sync.PivotBlockSelector;
+import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
+import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncActions;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncDownloader;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncState;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncStateStorage;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapDownloaderFactory;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncDownloader;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncProcessState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapWorldStateDownloader;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.context.SnapSyncStatePersistenceManager;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldStateDownloader;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.trie.CompactEncoding;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.services.tasks.InMemoryTasksPriorityQueues;
+
+import java.nio.file.Path;
+import java.time.Clock;
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CheckpointDownloaderFactory extends SnapDownloaderFactory {
+
+  private static final Logger LOG = LoggerFactory.getLogger(CheckpointDownloaderFactory.class);
+
+  @SuppressWarnings("UnusedVariable")
+  public static Optional<FastSyncDownloader<?>> createCheckpointDownloader(
+      final SnapSyncStatePersistenceManager snapContext,
+      final PivotBlockSelector pivotBlockSelector,
+      final SynchronizerConfiguration syncConfig,
+      final Path dataDirectory,
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final MetricsSystem metricsSystem,
+      final EthContext ethContext,
+      final WorldStateStorage worldStateStorage,
+      final SyncState syncState,
+      final Clock clock) {
+
+    final Path fastSyncDataDirectory = dataDirectory.resolve(FAST_SYNC_FOLDER);
+    final FastSyncStateStorage fastSyncStateStorage =
+        new FastSyncStateStorage(fastSyncDataDirectory);
+
+    if (SyncMode.isFullSync(syncConfig.getSyncMode())) {
+      if (fastSyncStateStorage.isFastSyncInProgress()) {
+        throw new IllegalStateException(
+            "Unable to change the sync mode when snap sync is incomplete, please restart with checkpoint sync mode");
+      } else {
+        return Optional.empty();
+      }
+    }
+
+    ensureDirectoryExists(fastSyncDataDirectory.toFile());
+
+    final FastSyncState fastSyncState =
+        fastSyncStateStorage.loadState(ScheduleBasedBlockHeaderFunctions.create(protocolSchedule));
+
+    if (syncState.isResyncNeeded()) {
+      snapContext.clear();
+      syncState
+          .getAccountToRepair()
+          .ifPresent(
+              address ->
+                  snapContext.addAccountsToBeRepaired(
+                      CompactEncoding.bytesToPath(Hash.hash(address))));
+    } else if (fastSyncState.getPivotBlockHeader().isEmpty()
+        && protocolContext.getBlockchain().getChainHeadBlockNumber()
+            != BlockHeader.GENESIS_BLOCK_NUMBER) {
+      LOG.info(
+          "Checkpoint sync was requested, but cannot be enabled because the local blockchain is not empty.");
+      return Optional.empty();
+    }
+
+    final FastSyncActions fastSyncActions;
+    if (syncState.getCheckpoint().isEmpty()) {
+      LOG.warn("Unable to find a valid checkpoint configuration. The genesis will be used");
+      fastSyncActions =
+          new FastSyncActions(
+              syncConfig,
+              worldStateStorage,
+              protocolSchedule,
+              protocolContext,
+              ethContext,
+              syncState,
+              pivotBlockSelector,
+              metricsSystem);
+    } else {
+      if (!syncState.isResyncNeeded()) {
+        LOG.info(
+            "Checkpoint sync start with block {} and hash {}",
+            syncState.getCheckpoint().get().blockNumber(),
+            syncState.getCheckpoint().get().blockHash());
+      }
+      fastSyncActions =
+          new CheckpointSyncActions(
+              syncConfig,
+              worldStateStorage,
+              protocolSchedule,
+              protocolContext,
+              ethContext,
+              syncState,
+              pivotBlockSelector,
+              metricsSystem);
+    }
+
+    final SnapSyncProcessState snapSyncState =
+        new SnapSyncProcessState(
+            fastSyncStateStorage.loadState(
+                ScheduleBasedBlockHeaderFunctions.create(protocolSchedule)));
+
+    final InMemoryTasksPriorityQueues<SnapDataRequest> snapTaskCollection =
+        createSnapWorldStateDownloaderTaskCollection();
+    final WorldStateDownloader snapWorldStateDownloader =
+        new SnapWorldStateDownloader(
+            ethContext,
+            snapContext,
+            protocolContext,
+            worldStateStorage,
+            snapTaskCollection,
+            syncConfig.getSnapSyncConfiguration(),
+            syncConfig.getWorldStateRequestParallelism(),
+            syncConfig.getWorldStateMaxRequestsWithoutProgress(),
+            syncConfig.getWorldStateMinMillisBeforeStalling(),
+            clock,
+            metricsSystem);
+    final FastSyncDownloader<SnapDataRequest> fastSyncDownloader =
+        new SnapSyncDownloader(
+            fastSyncActions,
+            worldStateStorage,
+            snapWorldStateDownloader,
+            fastSyncStateStorage,
+            snapTaskCollection,
+            fastSyncDataDirectory,
+            snapSyncState);
+    syncState.setWorldStateDownloadStatus(snapWorldStateDownloader);
+    return Optional.of(fastSyncDownloader);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckpointSource.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckpointSource.java
new file mode 100644
index 00000000000..2f3fa2f4306
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckpointSource.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.checkpointsync;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+
+import java.util.Iterator;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class CheckpointSource implements Iterator<Hash> {
+
+  private final SyncState syncState;
+  private final BlockHeader checkpoint;
+  private final int nbBlocks;
+  private Optional<BlockHeader> lastHeaderDownloaded;
+
+  private final AtomicBoolean isDownloading = new AtomicBoolean(false);
+
+  public CheckpointSource(
+      final SyncState syncState, final BlockHeader blockHeader, final int nbBlocks) {
+    this.syncState = syncState;
+    this.checkpoint = blockHeader;
+    this.nbBlocks = nbBlocks;
+    this.lastHeaderDownloaded = Optional.empty();
+  }
+
+  @Override
+  public boolean hasNext() {
+    return syncState.getLocalChainHeight() == 0
+        && lastHeaderDownloaded
+            .map(blockHeader -> blockHeader.getNumber() > (checkpoint.getNumber() - nbBlocks))
+            .orElse(true);
+  }
+
+  @Override
+  public synchronized Hash next() {
+    isDownloading.getAndSet(true);
+    return lastHeaderDownloaded
+        .map(ProcessableBlockHeader::getParentHash)
+        .orElse(checkpoint.getHash());
+  }
+
+  public synchronized void notifyTaskAvailable() {
+    isDownloading.getAndSet(false);
+    notifyAll();
+  }
+
+  public BlockHeader getCheckpoint() {
+    return checkpoint;
+  }
+
+  public void setLastHeaderDownloaded(final Optional<BlockHeader> lastHeaderDownloaded) {
+    this.lastHeaderDownloaded = lastHeaderDownloaded;
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckpointSyncActions.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckpointSyncActions.java
new file mode 100644
index 00000000000..8159ccdaa02
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckpointSyncActions.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.checkpointsync;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.sync.ChainDownloader;
+import org.hyperledger.besu.ethereum.eth.sync.PivotBlockSelector;
+import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncActions;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncState;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+public class CheckpointSyncActions extends FastSyncActions {
+  public CheckpointSyncActions(
+      final SynchronizerConfiguration syncConfig,
+      final WorldStateStorage worldStateStorage,
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final EthContext ethContext,
+      final SyncState syncState,
+      final PivotBlockSelector pivotBlockSelector,
+      final MetricsSystem metricsSystem) {
+    super(
+        syncConfig,
+        worldStateStorage,
+        protocolSchedule,
+        protocolContext,
+        ethContext,
+        syncState,
+        pivotBlockSelector,
+        metricsSystem);
+  }
+
+  @Override
+  public ChainDownloader createChainDownloader(final FastSyncState currentState) {
+    return CheckpointSyncChainDownloader.create(
+        syncConfig,
+        worldStateStorage,
+        protocolSchedule,
+        protocolContext,
+        ethContext,
+        syncState,
+        metricsSystem,
+        currentState);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckpointSyncChainDownloader.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckpointSyncChainDownloader.java
new file mode 100644
index 00000000000..854972c39fd
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckpointSyncChainDownloader.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */ package org.hyperledger.besu.ethereum.eth.sync.checkpointsync;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.sync.ChainDownloader;
+import org.hyperledger.besu.ethereum.eth.sync.PipelineChainDownloader;
+import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncChainDownloader;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncState;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncTargetManager;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+public class CheckpointSyncChainDownloader extends FastSyncChainDownloader {
+
+  public static ChainDownloader create(
+      final SynchronizerConfiguration config,
+      final WorldStateStorage worldStateStorage,
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final EthContext ethContext,
+      final SyncState syncState,
+      final MetricsSystem metricsSystem,
+      final FastSyncState fastSyncState) {
+
+    final FastSyncTargetManager syncTargetManager =
+        new FastSyncTargetManager(
+            config,
+            worldStateStorage,
+            protocolSchedule,
+            protocolContext,
+            ethContext,
+            metricsSystem,
+            fastSyncState);
+
+    return new PipelineChainDownloader(
+        syncState,
+        syncTargetManager,
+        new CheckpointSyncDownloadPipelineFactory(
+            config, protocolSchedule, protocolContext, ethContext, fastSyncState, metricsSystem),
+        ethContext.getScheduler(),
+        metricsSystem);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckpointSyncDownloadPipelineFactory.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckpointSyncDownloadPipelineFactory.java
new file mode 100644
index 00000000000..8c853717f5c
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckpointSyncDownloadPipelineFactory.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.checkpointsync;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncDownloadPipelineFactory;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncState;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.checkpoint.Checkpoint;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncTarget;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.services.pipeline.Pipeline;
+import org.hyperledger.besu.services.pipeline.PipelineBuilder;
+
+import java.util.concurrent.CompletionStage;
+
+public class CheckpointSyncDownloadPipelineFactory extends FastSyncDownloadPipelineFactory {
+
+  public CheckpointSyncDownloadPipelineFactory(
+      final SynchronizerConfiguration syncConfig,
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final EthContext ethContext,
+      final FastSyncState fastSyncState,
+      final MetricsSystem metricsSystem) {
+    super(syncConfig, protocolSchedule, protocolContext, ethContext, fastSyncState, metricsSystem);
+  }
+
+  @Override
+  public CompletionStage<Void> startPipeline(
+      final EthScheduler scheduler,
+      final SyncState syncState,
+      final SyncTarget syncTarget,
+      final Pipeline<?> pipeline) {
+    return scheduler
+        .startPipeline(createDownloadCheckPointPipeline(syncState, syncTarget))
+        .thenCompose(unused -> scheduler.startPipeline(pipeline));
+  }
+
+  protected Pipeline<Hash> createDownloadCheckPointPipeline(
+      final SyncState syncState, final SyncTarget target) {
+
+    final Checkpoint checkpoint = syncState.getCheckpoint().orElseThrow();
+
+    final BlockHeader checkpointBlockHeader = target.peer().getCheckpointHeader().orElseThrow();
+    final CheckpointSource checkPointSource =
+        new CheckpointSource(
+            syncState,
+            checkpointBlockHeader,
+            protocolSchedule
+                .getByBlockHeader(checkpointBlockHeader)
+                .getBlockHeaderFunctions()
+                .getCheckPointWindowSize(checkpointBlockHeader));
+
+    final CheckpointBlockImportStep checkPointBlockImportStep =
+        new CheckpointBlockImportStep(
+            checkPointSource, checkpoint, protocolContext.getBlockchain());
+
+    final CheckpointDownloadBlockStep checkPointDownloadBlockStep =
+        new CheckpointDownloadBlockStep(protocolSchedule, ethContext, checkpoint, metricsSystem);
+
+    return PipelineBuilder.createPipelineFrom(
+            "fetchCheckpoints",
+            checkPointSource,
+            1,
+            metricsSystem.createLabelledCounter(
+                BesuMetricCategory.SYNCHRONIZER,
+                "chain_download_pipeline_processed_total",
+                "Number of header process by each chain download pipeline stage",
+                "step",
+                "action"),
+            true,
+            "checkpointSync")
+        .thenProcessAsyncOrdered("downloadBlock", checkPointDownloadBlockStep::downloadBlock, 1)
+        .andFinishWith("importBlock", checkPointBlockImportStep);
+  }
+
+  @Override
+  protected BlockHeader getCommonAncestor(final SyncTarget target) {
+    return target
+        .peer()
+        .getCheckpointHeader()
+        .filter(checkpoint -> checkpoint.getNumber() > target.commonAncestor().getNumber())
+        .orElse(target.commonAncestor());
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastDownloaderFactory.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastDownloaderFactory.java
deleted file mode 100644
index 7a81f2fac16..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastDownloaderFactory.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync.fastsync;
-
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.eth.manager.EthContext;
-import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
-import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
-import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
-import org.hyperledger.besu.ethereum.eth.sync.worldstate.NodeDataRequest;
-import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldStateDownloader;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
-import org.hyperledger.besu.metrics.BesuMetricCategory;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
-import org.hyperledger.besu.services.tasks.CachingTaskCollection;
-import org.hyperledger.besu.services.tasks.FlatFileTaskCollection;
-
-import java.io.File;
-import java.nio.file.Path;
-import java.time.Clock;
-import java.util.Optional;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-public class FastDownloaderFactory {
-
-  private static final String FAST_SYNC_FOLDER = "fastsync";
-
-  private static final Logger LOG = LogManager.getLogger();
-
-  public static Optional<FastSyncDownloader> create(
-      final SynchronizerConfiguration syncConfig,
-      final Path dataDirectory,
-      final ProtocolSchedule protocolSchedule,
-      final ProtocolContext protocolContext,
-      final MetricsSystem metricsSystem,
-      final EthContext ethContext,
-      final WorldStateStorage worldStateStorage,
-      final SyncState syncState,
-      final Clock clock) {
-
-    final Path fastSyncDataDirectory = dataDirectory.resolve(FAST_SYNC_FOLDER);
-    final FastSyncStateStorage fastSyncStateStorage =
-        new FastSyncStateStorage(fastSyncDataDirectory);
-
-    if (syncConfig.getSyncMode() != SyncMode.FAST) {
-      if (fastSyncStateStorage.isFastSyncInProgress()) {
-        throw new IllegalStateException(
-            "Unable to change the sync mode when fast sync is incomplete, please restart with fast sync mode");
-      } else {
-        return Optional.empty();
-      }
-    }
-
-    ensureDirectoryExists(fastSyncDataDirectory.toFile());
-
-    final FastSyncState fastSyncState =
-        fastSyncStateStorage.loadState(ScheduleBasedBlockHeaderFunctions.create(protocolSchedule));
-    if (fastSyncState.getPivotBlockHeader().isEmpty()
-        && protocolContext.getBlockchain().getChainHeadBlockNumber()
-            != BlockHeader.GENESIS_BLOCK_NUMBER) {
-      LOG.info(
-          "Fast sync was requested, but cannot be enabled because the local blockchain is not empty.");
-      return Optional.empty();
-    }
-
-    final CachingTaskCollection<NodeDataRequest> taskCollection =
-        createWorldStateDownloaderTaskCollection(
-            getStateQueueDirectory(dataDirectory),
-            metricsSystem,
-            syncConfig.getWorldStateTaskCacheSize());
-    final WorldStateDownloader worldStateDownloader =
-        new WorldStateDownloader(
-            ethContext,
-            worldStateStorage,
-            taskCollection,
-            syncConfig.getWorldStateHashCountPerRequest(),
-            syncConfig.getWorldStateRequestParallelism(),
-            syncConfig.getWorldStateMaxRequestsWithoutProgress(),
-            syncConfig.getWorldStateMinMillisBeforeStalling(),
-            clock,
-            metricsSystem);
-    final FastSyncDownloader fastSyncDownloader =
-        new FastSyncDownloader(
-            new FastSyncActions(
-                syncConfig,
-                protocolSchedule,
-                protocolContext,
-                ethContext,
-                syncState,
-                metricsSystem),
-            worldStateDownloader,
-            fastSyncStateStorage,
-            taskCollection,
-            fastSyncDataDirectory,
-            fastSyncState);
-    syncState.setWorldStateDownloadStatus(worldStateDownloader);
-    return Optional.of(fastSyncDownloader);
-  }
-
-  private static Path getStateQueueDirectory(final Path dataDirectory) {
-    final Path queueDataDir = getFastSyncDataDirectory(dataDirectory).resolve("statequeue");
-    ensureDirectoryExists(queueDataDir.toFile());
-    return queueDataDir;
-  }
-
-  private static Path getFastSyncDataDirectory(final Path dataDirectory) {
-    final Path fastSyncDataDir = dataDirectory.resolve(FAST_SYNC_FOLDER);
-    ensureDirectoryExists(fastSyncDataDir.toFile());
-    return fastSyncDataDir;
-  }
-
-  private static void ensureDirectoryExists(final File dir) {
-    if (!dir.mkdirs() && !dir.isDirectory()) {
-      throw new IllegalStateException("Unable to create directory: " + dir.getAbsolutePath());
-    }
-  }
-
-  private static CachingTaskCollection<NodeDataRequest> createWorldStateDownloaderTaskCollection(
-      final Path dataDirectory,
-      final MetricsSystem metricsSystem,
-      final int worldStateTaskCacheSize) {
-    final CachingTaskCollection<NodeDataRequest> taskCollection =
-        new CachingTaskCollection<>(
-            new FlatFileTaskCollection<>(
-                dataDirectory, NodeDataRequest::serialize, NodeDataRequest::deserialize),
-            worldStateTaskCacheSize);
-
-    metricsSystem.createLongGauge(
-        BesuMetricCategory.SYNCHRONIZER,
-        "world_state_pending_requests_current",
-        "Number of pending requests for fast sync world state download",
-        taskCollection::size);
-
-    metricsSystem.createIntegerGauge(
-        BesuMetricCategory.SYNCHRONIZER,
-        "world_state_pending_requests_cache_size",
-        "Pending request cache size for fast sync world state download",
-        taskCollection::cacheSize);
-
-    return taskCollection;
-  }
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastImportBlocksStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastImportBlocksStep.java
index bb4f9e5f764..c2297faa199 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastImportBlocksStep.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastImportBlocksStep.java
@@ -15,42 +15,55 @@
 package org.hyperledger.besu.ethereum.eth.sync.fastsync;
 
 import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockImporter;
 import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.sync.ValidationPolicy;
 import org.hyperledger.besu.ethereum.eth.sync.tasks.exceptions.InvalidBlockException;
+import org.hyperledger.besu.ethereum.mainnet.BlockImportResult;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 
 import java.util.List;
+import java.util.OptionalLong;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import com.google.common.annotations.VisibleForTesting;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class FastImportBlocksStep implements Consumer<List<BlockWithReceipts>> {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(FastImportBlocksStep.class);
+  private static final long PRINT_DELAY = TimeUnit.SECONDS.toMillis(30L);
+
   private final ProtocolSchedule protocolSchedule;
-  private final ProtocolContext protocolContext;
+  protected final ProtocolContext protocolContext;
   private final ValidationPolicy headerValidationPolicy;
   private final ValidationPolicy ommerValidationPolicy;
   private final EthContext ethContext;
+  private long accumulatedTime = 0L;
+  private OptionalLong logStartBlock = OptionalLong.empty();
+  private final BlockHeader pivotHeader;
 
   public FastImportBlocksStep(
       final ProtocolSchedule protocolSchedule,
       final ProtocolContext protocolContext,
       final ValidationPolicy headerValidationPolicy,
       final ValidationPolicy ommerValidationPolicy,
-      final EthContext ethContext) {
+      final EthContext ethContext,
+      final BlockHeader pivotHeader) {
     this.protocolSchedule = protocolSchedule;
     this.protocolContext = protocolContext;
     this.headerValidationPolicy = headerValidationPolicy;
     this.ommerValidationPolicy = ommerValidationPolicy;
     this.ethContext = ethContext;
+    this.pivotHeader = pivotHeader;
   }
 
   @Override
   public void accept(final List<BlockWithReceipts> blocksWithReceipts) {
+    final long startTime = System.nanoTime();
     for (final BlockWithReceipts blockWithReceipts : blocksWithReceipts) {
       if (!importBlock(blockWithReceipts)) {
         throw new InvalidBlockException(
@@ -58,25 +71,58 @@ public void accept(final List<BlockWithReceipts> blocksWithReceipts) {
             blockWithReceipts.getHeader().getNumber(),
             blockWithReceipts.getHash());
       }
+      LOG.atTrace()
+          .setMessage("Imported block {}")
+          .addArgument(blockWithReceipts.getBlock()::toLogString)
+          .log();
+    }
+    if (logStartBlock.isEmpty()) {
+      logStartBlock = OptionalLong.of(blocksWithReceipts.get(0).getNumber());
     }
-    final long firstBlock = blocksWithReceipts.get(0).getNumber();
     final long lastBlock = blocksWithReceipts.get(blocksWithReceipts.size() - 1).getNumber();
     int peerCount = -1; // ethContext is not available in tests
     if (ethContext != null && ethContext.getEthPeers().peerCount() >= 0) {
       peerCount = ethContext.getEthPeers().peerCount();
     }
-    LOG.info(
-        "Completed importing chain segment {} to {}, Peers: {}", firstBlock, lastBlock, peerCount);
+    final long endTime = System.nanoTime();
+
+    accumulatedTime += TimeUnit.MILLISECONDS.convert(endTime - startTime, TimeUnit.NANOSECONDS);
+    if (accumulatedTime > PRINT_DELAY) {
+      final long blocksPercent = getBlocksPercent(lastBlock, pivotHeader.getNumber());
+      LOG.info(
+          "Block import progress: {} of {} ({}%)",
+          lastBlock, pivotHeader.getNumber(), blocksPercent);
+      LOG.debug(
+          "Completed importing chain segment {} to {} ({} blocks in {}ms), Peer count: {}",
+          logStartBlock.getAsLong(),
+          lastBlock,
+          lastBlock - logStartBlock.getAsLong() + 1,
+          accumulatedTime,
+          peerCount);
+      accumulatedTime = 0L;
+      logStartBlock = OptionalLong.empty();
+    }
+  }
+
+  @VisibleForTesting
+  protected static long getBlocksPercent(final long lastBlock, final long totalBlocks) {
+    if (totalBlocks == 0) {
+      return 0;
+    }
+    final long blocksPercent = (100 * lastBlock / totalBlocks);
+    return blocksPercent;
   }
 
-  private boolean importBlock(final BlockWithReceipts blockWithReceipts) {
+  protected boolean importBlock(final BlockWithReceipts blockWithReceipts) {
     final BlockImporter importer =
-        protocolSchedule.getByBlockNumber(blockWithReceipts.getNumber()).getBlockImporter();
-    return importer.fastImportBlock(
-        protocolContext,
-        blockWithReceipts.getBlock(),
-        blockWithReceipts.getReceipts(),
-        headerValidationPolicy.getValidationModeForNextBlock(),
-        ommerValidationPolicy.getValidationModeForNextBlock());
+        protocolSchedule.getByBlockHeader(blockWithReceipts.getHeader()).getBlockImporter();
+    final BlockImportResult blockImportResult =
+        importer.fastImportBlock(
+            protocolContext,
+            blockWithReceipts.getBlock(),
+            blockWithReceipts.getReceipts(),
+            headerValidationPolicy.getValidationModeForNextBlock(),
+            ommerValidationPolicy.getValidationModeForNextBlock());
+    return blockImportResult.isImported();
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncActions.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncActions.java
index e0cfa6c4399..d7d3523538b 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncActions.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncActions.java
@@ -15,55 +15,60 @@
 package org.hyperledger.besu.ethereum.eth.sync.fastsync;
 
 import static java.util.concurrent.CompletableFuture.completedFuture;
-import static org.hyperledger.besu.util.FutureUtils.exceptionallyCompose;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
-import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.task.WaitForPeersTask;
 import org.hyperledger.besu.ethereum.eth.sync.ChainDownloader;
+import org.hyperledger.besu.ethereum.eth.sync.PivotBlockSelector;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.ethereum.eth.sync.tasks.RetryingGetHeaderFromPeerByHashTask;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
 import org.hyperledger.besu.metrics.BesuMetricCategory;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.plugin.services.metrics.Counter;
-import org.hyperledger.besu.util.ExceptionUtils;
 
 import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class FastSyncActions {
 
-  private static final Logger LOG = LogManager.getLogger();
-  private final SynchronizerConfiguration syncConfig;
-  private final ProtocolSchedule protocolSchedule;
-  private final ProtocolContext protocolContext;
-  private final EthContext ethContext;
-  private final SyncState syncState;
-  private final MetricsSystem metricsSystem;
-  private final Counter pivotBlockSelectionCounter;
-  private final AtomicLong pivotBlockGauge = new AtomicLong(0);
+  private static final Logger LOG = LoggerFactory.getLogger(FastSyncActions.class);
+  protected final SynchronizerConfiguration syncConfig;
+  protected final WorldStateStorage worldStateStorage;
+  protected final ProtocolSchedule protocolSchedule;
+  protected final ProtocolContext protocolContext;
+  protected final EthContext ethContext;
+  protected final SyncState syncState;
+  protected final PivotBlockSelector pivotBlockSelector;
+  protected final MetricsSystem metricsSystem;
+  protected final Counter pivotBlockSelectionCounter;
+  protected final AtomicLong pivotBlockGauge = new AtomicLong(0);
 
   public FastSyncActions(
       final SynchronizerConfiguration syncConfig,
+      final WorldStateStorage worldStateStorage,
       final ProtocolSchedule protocolSchedule,
       final ProtocolContext protocolContext,
       final EthContext ethContext,
       final SyncState syncState,
+      final PivotBlockSelector pivotBlockSelector,
       final MetricsSystem metricsSystem) {
     this.syncConfig = syncConfig;
+    this.worldStateStorage = worldStateStorage;
     this.protocolSchedule = protocolSchedule;
     this.protocolContext = protocolContext;
     this.ethContext = ethContext;
     this.syncState = syncState;
+    this.pivotBlockSelector = pivotBlockSelector;
     this.metricsSystem = metricsSystem;
 
     pivotBlockSelectionCounter =
@@ -78,126 +83,121 @@ public FastSyncActions(
         pivotBlockGauge::get);
   }
 
-  public CompletableFuture<FastSyncState> waitForSuitablePeers(final FastSyncState fastSyncState) {
-    if (fastSyncState.hasPivotBlockHeader()) {
-      return waitForAnyPeer().thenApply(ignore -> fastSyncState);
-    }
-
-    LOG.debug("Waiting for at least {} peers.", syncConfig.getFastSyncMinimumPeerCount());
-    return waitForPeers(syncConfig.getFastSyncMinimumPeerCount())
-        .thenApply(successfulWaitResult -> fastSyncState);
-  }
-
-  public <T> CompletableFuture<T> scheduleFutureTask(
-      final Supplier<CompletableFuture<T>> future, final Duration duration) {
-    return ethContext.getScheduler().scheduleFutureTask(future, duration);
+  public SyncState getSyncState() {
+    return syncState;
   }
 
-  private CompletableFuture<Void> waitForAnyPeer() {
-    final CompletableFuture<Void> waitForPeerResult =
-        ethContext.getScheduler().timeout(WaitForPeersTask.create(ethContext, 1, metricsSystem));
-    return exceptionallyCompose(
-        waitForPeerResult,
-        throwable -> {
-          if (ExceptionUtils.rootCause(throwable) instanceof TimeoutException) {
-            return waitForAnyPeer();
-          }
-          return CompletableFuture.failedFuture(throwable);
-        });
-  }
-
-  private CompletableFuture<Void> waitForPeers(final int count) {
-    final WaitForPeersTask waitForPeersTask =
-        WaitForPeersTask.create(ethContext, count, metricsSystem);
-    return waitForPeersTask.run();
+  public long getBestChainHeight() {
+    return pivotBlockSelector.getBestChainHeight();
   }
 
   public CompletableFuture<FastSyncState> selectPivotBlock(final FastSyncState fastSyncState) {
     return fastSyncState.hasPivotBlockHeader()
         ? completedFuture(fastSyncState)
-        : selectPivotBlockFromPeers();
+        : selectNewPivotBlock();
   }
 
-  private CompletableFuture<FastSyncState> selectPivotBlockFromPeers() {
-    return ethContext
-        .getEthPeers()
-        .bestPeerMatchingCriteria(this::canPeerDeterminePivotBlock)
-        // Only select a pivot block number when we have a minimum number of height estimates
-        .filter(
-            peer -> {
-              final long peerCount = countPeersThatCanDeterminePivotBlock();
-              final int minPeerCount = syncConfig.getFastSyncMinimumPeerCount();
-              if (peerCount < minPeerCount) {
-                LOG.info(
-                    "Waiting for valid peers with chain height information.  {} / {} required peers currently available.",
-                    peerCount,
-                    minPeerCount);
-                return false;
-              }
-              return true;
-            })
-        .map(
-            peer -> {
-              final long pivotBlockNumber =
-                  peer.chainState().getEstimatedHeight() - syncConfig.getFastSyncPivotDistance();
-              if (pivotBlockNumber <= BlockHeader.GENESIS_BLOCK_NUMBER) {
-                // Peer's chain isn't long enough, return an empty value so we can try again.
-                LOG.info("Waiting for peers with sufficient chain height");
-                return null;
-              }
-              LOG.info("Selecting block number {} as fast sync pivot block.", pivotBlockNumber);
-              pivotBlockSelectionCounter.inc();
-              pivotBlockGauge.set(pivotBlockNumber);
-              return completedFuture(new FastSyncState(pivotBlockNumber));
-            })
-        .orElseGet(this::retrySelectPivotBlockAfterDelay);
-  }
+  private CompletableFuture<FastSyncState> selectNewPivotBlock() {
 
-  private long countPeersThatCanDeterminePivotBlock() {
-    return ethContext
-        .getEthPeers()
-        .streamAvailablePeers()
-        .filter(this::canPeerDeterminePivotBlock)
-        .count();
+    return pivotBlockSelector
+        .selectNewPivotBlock()
+        .map(CompletableFuture::completedFuture)
+        .orElseGet(this::retrySelectPivotBlockAfterDelay);
   }
 
-  private boolean canPeerDeterminePivotBlock(final EthPeer peer) {
-    return peer.chainState().hasEstimatedHeight() && peer.isFullyValidated();
+  <T> CompletableFuture<T> scheduleFutureTask(
+      final Supplier<CompletableFuture<T>> future, final Duration duration) {
+    return ethContext.getScheduler().scheduleFutureTask(future, duration);
   }
 
   private CompletableFuture<FastSyncState> retrySelectPivotBlockAfterDelay() {
     return ethContext
         .getScheduler()
-        .scheduleFutureTask(
-            () ->
-                waitForPeers(syncConfig.getFastSyncMinimumPeerCount())
-                    .thenCompose(ignore -> selectPivotBlockFromPeers()),
-            Duration.ofSeconds(5));
+        .scheduleFutureTask(pivotBlockSelector::prepareRetry, Duration.ofSeconds(5))
+        .thenCompose(ignore -> selectNewPivotBlock());
   }
 
   public CompletableFuture<FastSyncState> downloadPivotBlockHeader(
       final FastSyncState currentState) {
-    if (currentState.getPivotBlockHeader().isPresent()) {
+    return internalDownloadPivotBlockHeader(currentState).thenApply(this::updateStats);
+  }
+
+  private CompletableFuture<FastSyncState> internalDownloadPivotBlockHeader(
+      final FastSyncState currentState) {
+    if (currentState.hasPivotBlockHeader()) {
+      LOG.debug("Initial sync state {} already contains the block header", currentState);
       return completedFuture(currentState);
     }
-    return new PivotBlockRetriever(
-            protocolSchedule,
-            ethContext,
-            metricsSystem,
-            currentState.getPivotBlockNumber().getAsLong(),
-            syncConfig.getFastSyncMinimumPeerCount(),
-            syncConfig.getFastSyncPivotDistance())
-        .downloadPivotBlockHeader();
+
+    return waitForPeers(1)
+        .thenCompose(
+            unused ->
+                currentState
+                    .getPivotBlockHash()
+                    .map(this::downloadPivotBlockHeader)
+                    .orElseGet(
+                        () ->
+                            new PivotBlockRetriever(
+                                    protocolSchedule,
+                                    ethContext,
+                                    metricsSystem,
+                                    currentState.getPivotBlockNumber().getAsLong(),
+                                    syncConfig.getFastSyncMinimumPeerCount(),
+                                    syncConfig.getFastSyncPivotDistance())
+                                .downloadPivotBlockHeader()));
+  }
+
+  private FastSyncState updateStats(final FastSyncState fastSyncState) {
+    pivotBlockSelectionCounter.inc();
+    fastSyncState
+        .getPivotBlockHeader()
+        .ifPresent(blockHeader -> pivotBlockGauge.set(blockHeader.getNumber()));
+    return fastSyncState;
   }
 
   public ChainDownloader createChainDownloader(final FastSyncState currentState) {
     return FastSyncChainDownloader.create(
         syncConfig,
+        worldStateStorage,
         protocolSchedule,
         protocolContext,
         ethContext,
         syncState,
         metricsSystem,
-        currentState.getPivotBlockHeader().get());
+        currentState);
+  }
+
+  private CompletableFuture<FastSyncState> downloadPivotBlockHeader(final Hash hash) {
+    LOG.debug("Downloading pivot block header by hash {}", hash);
+    return RetryingGetHeaderFromPeerByHashTask.byHash(
+            protocolSchedule,
+            ethContext,
+            hash,
+            pivotBlockSelector.getMinRequiredBlockNumber(),
+            metricsSystem)
+        .getHeader()
+        .whenComplete(
+            (blockHeader, throwable) -> {
+              if (throwable != null) {
+                LOG.debug("Error downloading block header by hash {}", hash);
+              } else {
+                LOG.atDebug()
+                    .setMessage("Successfully downloaded pivot block header by hash {}")
+                    .addArgument(blockHeader::toLogString)
+                    .log();
+              }
+            })
+        .thenApply(FastSyncState::new);
+  }
+
+  public boolean isBlockchainBehind(final long blockNumber) {
+    return protocolContext.getBlockchain().getChainHeadHeader().getNumber() < blockNumber;
+  }
+
+  private CompletableFuture<Void> waitForPeers(final int count) {
+
+    final WaitForPeersTask waitForPeersTask =
+        WaitForPeersTask.create(ethContext, count, metricsSystem);
+    return waitForPeersTask.run();
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncChainDownloader.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncChainDownloader.java
index 19ab1d6c112..c4034cb87a0 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncChainDownloader.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncChainDownloader.java
@@ -15,37 +15,43 @@
 package org.hyperledger.besu.ethereum.eth.sync.fastsync;
 
 import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.sync.ChainDownloader;
 import org.hyperledger.besu.ethereum.eth.sync.PipelineChainDownloader;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
 public class FastSyncChainDownloader {
 
-  private FastSyncChainDownloader() {}
+  protected FastSyncChainDownloader() {}
 
   public static ChainDownloader create(
       final SynchronizerConfiguration config,
+      final WorldStateStorage worldStateStorage,
       final ProtocolSchedule protocolSchedule,
       final ProtocolContext protocolContext,
       final EthContext ethContext,
       final SyncState syncState,
       final MetricsSystem metricsSystem,
-      final BlockHeader pivotBlockHeader) {
+      final FastSyncState fastSyncState) {
 
     final FastSyncTargetManager syncTargetManager =
         new FastSyncTargetManager(
-            config, protocolSchedule, protocolContext, ethContext, metricsSystem, pivotBlockHeader);
-
+            config,
+            worldStateStorage,
+            protocolSchedule,
+            protocolContext,
+            ethContext,
+            metricsSystem,
+            fastSyncState);
     return new PipelineChainDownloader(
         syncState,
         syncTargetManager,
         new FastSyncDownloadPipelineFactory(
-            config, protocolSchedule, protocolContext, ethContext, pivotBlockHeader, metricsSystem),
+            config, protocolSchedule, protocolContext, ethContext, fastSyncState, metricsSystem),
         ethContext.getScheduler(),
         metricsSystem);
   }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncDownloadPipelineFactory.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncDownloadPipelineFactory.java
index 4e40a4971d8..206b76c09a5 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncDownloadPipelineFactory.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncDownloadPipelineFactory.java
@@ -25,14 +25,17 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
-import org.hyperledger.besu.ethereum.eth.sync.CheckpointHeaderFetcher;
-import org.hyperledger.besu.ethereum.eth.sync.CheckpointHeaderValidationStep;
-import org.hyperledger.besu.ethereum.eth.sync.CheckpointRange;
-import org.hyperledger.besu.ethereum.eth.sync.CheckpointRangeSource;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
 import org.hyperledger.besu.ethereum.eth.sync.DownloadBodiesStep;
 import org.hyperledger.besu.ethereum.eth.sync.DownloadHeadersStep;
 import org.hyperledger.besu.ethereum.eth.sync.DownloadPipelineFactory;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.fullsync.SyncTerminationCondition;
+import org.hyperledger.besu.ethereum.eth.sync.range.RangeHeadersFetcher;
+import org.hyperledger.besu.ethereum.eth.sync.range.RangeHeadersValidationStep;
+import org.hyperledger.besu.ethereum.eth.sync.range.SyncTargetRange;
+import org.hyperledger.besu.ethereum.eth.sync.range.SyncTargetRangeSource;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncTarget;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.metrics.BesuMetricCategory;
@@ -42,31 +45,31 @@
 import org.hyperledger.besu.services.pipeline.Pipeline;
 import org.hyperledger.besu.services.pipeline.PipelineBuilder;
 
-import java.util.Optional;
+import java.util.concurrent.CompletionStage;
 
 public class FastSyncDownloadPipelineFactory implements DownloadPipelineFactory {
-  private final SynchronizerConfiguration syncConfig;
-  private final ProtocolSchedule protocolSchedule;
-  private final ProtocolContext protocolContext;
-  private final EthContext ethContext;
-  private final BlockHeader pivotBlockHeader;
-  private final MetricsSystem metricsSystem;
-  private final FastSyncValidationPolicy attachedValidationPolicy;
-  private final FastSyncValidationPolicy detachedValidationPolicy;
-  private final FastSyncValidationPolicy ommerValidationPolicy;
+  protected final SynchronizerConfiguration syncConfig;
+  protected final ProtocolSchedule protocolSchedule;
+  protected final ProtocolContext protocolContext;
+  protected final EthContext ethContext;
+  protected final FastSyncState fastSyncState;
+  protected final MetricsSystem metricsSystem;
+  protected final FastSyncValidationPolicy attachedValidationPolicy;
+  protected final FastSyncValidationPolicy detachedValidationPolicy;
+  protected final FastSyncValidationPolicy ommerValidationPolicy;
 
   public FastSyncDownloadPipelineFactory(
       final SynchronizerConfiguration syncConfig,
       final ProtocolSchedule protocolSchedule,
       final ProtocolContext protocolContext,
       final EthContext ethContext,
-      final BlockHeader pivotBlockHeader,
+      final FastSyncState fastSyncState,
       final MetricsSystem metricsSystem) {
     this.syncConfig = syncConfig;
     this.protocolSchedule = protocolSchedule;
     this.protocolContext = protocolContext;
     this.ethContext = ethContext;
-    this.pivotBlockHeader = pivotBlockHeader;
+    this.fastSyncState = fastSyncState;
     this.metricsSystem = metricsSystem;
     final LabelledMetric<Counter> fastSyncValidationCounter =
         metricsSystem.createLabelledCounter(
@@ -95,23 +98,30 @@ public FastSyncDownloadPipelineFactory(
   }
 
   @Override
-  public Pipeline<CheckpointRange> createDownloadPipelineForSyncTarget(final SyncTarget target) {
+  public CompletionStage<Void> startPipeline(
+      final EthScheduler scheduler,
+      final SyncState syncState,
+      final SyncTarget syncTarget,
+      final Pipeline<?> pipeline) {
+    return scheduler.startPipeline(pipeline);
+  }
+
+  @Override
+  public Pipeline<SyncTargetRange> createDownloadPipelineForSyncTarget(final SyncTarget target) {
+
     final int downloaderParallelism = syncConfig.getDownloaderParallelism();
     final int headerRequestSize = syncConfig.getDownloaderHeaderRequestSize();
     final int singleHeaderBufferSize = headerRequestSize * downloaderParallelism;
-    final CheckpointRangeSource checkpointRangeSource =
-        new CheckpointRangeSource(
-            new CheckpointHeaderFetcher(
-                syncConfig,
-                protocolSchedule,
-                ethContext,
-                Optional.of(pivotBlockHeader),
-                metricsSystem),
+    final SyncTargetRangeSource checkpointRangeSource =
+        new SyncTargetRangeSource(
+            new RangeHeadersFetcher(
+                syncConfig, protocolSchedule, ethContext, fastSyncState, metricsSystem),
             this::shouldContinueDownloadingFromPeer,
             ethContext.getScheduler(),
             target.peer(),
-            target.commonAncestor(),
-            syncConfig.getDownloaderCheckpointTimeoutsPermitted());
+            getCommonAncestor(target),
+            syncConfig.getDownloaderCheckpointTimeoutsPermitted(),
+            SyncTerminationCondition.never());
     final DownloadHeadersStep downloadHeadersStep =
         new DownloadHeadersStep(
             protocolSchedule,
@@ -120,9 +130,8 @@ public Pipeline<CheckpointRange> createDownloadPipelineForSyncTarget(final SyncT
             detachedValidationPolicy,
             headerRequestSize,
             metricsSystem);
-    final CheckpointHeaderValidationStep validateHeadersJoinUpStep =
-        new CheckpointHeaderValidationStep(
-            protocolSchedule, protocolContext, detachedValidationPolicy);
+    final RangeHeadersValidationStep validateHeadersJoinUpStep =
+        new RangeHeadersValidationStep(protocolSchedule, protocolContext, detachedValidationPolicy);
     final DownloadBodiesStep downloadBodiesStep =
         new DownloadBodiesStep(protocolSchedule, ethContext, metricsSystem);
     final DownloadReceiptsStep downloadReceiptsStep =
@@ -133,7 +142,8 @@ public Pipeline<CheckpointRange> createDownloadPipelineForSyncTarget(final SyncT
             protocolContext,
             attachedValidationPolicy,
             ommerValidationPolicy,
-            ethContext);
+            ethContext,
+            fastSyncState.getPivotBlockHeader().get());
 
     return PipelineBuilder.createPipelineFrom(
             "fetchCheckpoints",
@@ -144,7 +154,9 @@ public Pipeline<CheckpointRange> createDownloadPipelineForSyncTarget(final SyncT
                 "chain_download_pipeline_processed_total",
                 "Number of entries process by each chain download pipeline stage",
                 "step",
-                "action"))
+                "action"),
+            true,
+            "fastSync")
         .thenProcessAsyncOrdered("downloadHeaders", downloadHeadersStep, downloaderParallelism)
         .thenFlatMap("validateHeadersJoin", validateHeadersJoinUpStep, singleHeaderBufferSize)
         .inBatches(headerRequestSize)
@@ -153,9 +165,13 @@ public Pipeline<CheckpointRange> createDownloadPipelineForSyncTarget(final SyncT
         .andFinishWith("importBlock", importBlockStep);
   }
 
-  private boolean shouldContinueDownloadingFromPeer(
-      final EthPeer peer, final BlockHeader lastCheckpointHeader) {
-    return !peer.isDisconnected()
-        && lastCheckpointHeader.getNumber() < pivotBlockHeader.getNumber();
+  protected BlockHeader getCommonAncestor(final SyncTarget syncTarget) {
+    return syncTarget.commonAncestor();
+  }
+
+  protected boolean shouldContinueDownloadingFromPeer(
+      final EthPeer peer, final BlockHeader lastRoundHeader) {
+    final BlockHeader pivotBlockHeader = fastSyncState.getPivotBlockHeader().get();
+    return !peer.isDisconnected() && lastRoundHeader.getNumber() < pivotBlockHeader.getNumber();
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncDownloader.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncDownloader.java
index f5455309d6d..b73daa28301 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncDownloader.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncDownloader.java
@@ -16,11 +16,13 @@
 
 import static org.hyperledger.besu.util.FutureUtils.exceptionallyCompose;
 
+import org.hyperledger.besu.ethereum.eth.manager.exceptions.MaxRetriesReachedException;
 import org.hyperledger.besu.ethereum.eth.sync.ChainDownloader;
 import org.hyperledger.besu.ethereum.eth.sync.TrailingPeerRequirements;
-import org.hyperledger.besu.ethereum.eth.sync.worldstate.NodeDataRequest;
 import org.hyperledger.besu.ethereum.eth.sync.worldstate.StalledDownloadException;
 import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldStateDownloader;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
 import org.hyperledger.besu.services.tasks.TaskCollection;
 import org.hyperledger.besu.util.ExceptionUtils;
 
@@ -31,34 +33,39 @@
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Function;
 
 import com.google.common.io.MoreFiles;
 import com.google.common.io.RecursiveDeleteOption;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class FastSyncDownloader {
+public class FastSyncDownloader<REQUEST> {
 
   private static final Duration FAST_SYNC_RETRY_DELAY = Duration.ofSeconds(5);
 
-  private static final Logger LOG = LogManager.getLogger();
-  private final FastSyncActions fastSyncActions;
+  private static final Logger LOG = LoggerFactory.getLogger(FastSyncDownloader.class);
+  private final WorldStateStorage worldStateStorage;
   private final WorldStateDownloader worldStateDownloader;
-  private final FastSyncStateStorage fastSyncStateStorage;
-  private final TaskCollection<NodeDataRequest> taskCollection;
+  private final TaskCollection<REQUEST> taskCollection;
   private final Path fastSyncDataDirectory;
-  private final FastSyncState initialFastSyncState;
   private volatile Optional<TrailingPeerRequirements> trailingPeerRequirements = Optional.empty();
   private final AtomicBoolean running = new AtomicBoolean(false);
 
+  protected final FastSyncActions fastSyncActions;
+  protected final FastSyncStateStorage fastSyncStateStorage;
+  protected FastSyncState initialFastSyncState;
+
   public FastSyncDownloader(
       final FastSyncActions fastSyncActions,
+      final WorldStateStorage worldStateStorage,
       final WorldStateDownloader worldStateDownloader,
       final FastSyncStateStorage fastSyncStateStorage,
-      final TaskCollection<NodeDataRequest> taskCollection,
+      final TaskCollection<REQUEST> taskCollection,
       final Path fastSyncDataDirectory,
       final FastSyncState initialFastSyncState) {
     this.fastSyncActions = fastSyncActions;
+    this.worldStateStorage = worldStateStorage;
     this.worldStateDownloader = worldStateDownloader;
     this.fastSyncStateStorage = fastSyncStateStorage;
     this.taskCollection = taskCollection;
@@ -70,34 +77,51 @@ public CompletableFuture<FastSyncState> start() {
     if (!running.compareAndSet(false, true)) {
       throw new IllegalStateException("FastSyncDownloader already running");
     }
+    LOG.info("Starting sync");
     return start(initialFastSyncState);
   }
 
-  private CompletableFuture<FastSyncState> start(final FastSyncState fastSyncState) {
-    LOG.info("Starting fast sync.");
+  protected CompletableFuture<FastSyncState> start(final FastSyncState fastSyncState) {
+    if (worldStateStorage.getDataStorageFormat().equals(DataStorageFormat.BONSAI)) {
+      LOG.info("Clearing bonsai flat account db");
+      worldStateStorage.clearFlatDatabase();
+      worldStateStorage.clearTrieLog();
+    }
+    LOG.debug("Start sync with initial sync state {}", fastSyncState);
+    return findPivotBlock(fastSyncState, fss -> downloadChainAndWorldState(fastSyncActions, fss));
+  }
+
+  public CompletableFuture<FastSyncState> findPivotBlock(
+      final FastSyncState fastSyncState,
+      final Function<FastSyncState, CompletableFuture<FastSyncState>> onNewPivotBlock) {
     return exceptionallyCompose(
-        fastSyncActions
-            .waitForSuitablePeers(fastSyncState)
+        CompletableFuture.completedFuture(fastSyncState)
             .thenCompose(fastSyncActions::selectPivotBlock)
             .thenCompose(fastSyncActions::downloadPivotBlockHeader)
             .thenApply(this::updateMaxTrailingPeers)
             .thenApply(this::storeState)
-            .thenCompose(this::downloadChainAndWorldState),
+            .thenCompose(onNewPivotBlock),
         this::handleFailure);
   }
 
-  private CompletableFuture<FastSyncState> handleFailure(final Throwable error) {
+  protected CompletableFuture<FastSyncState> handleFailure(final Throwable error) {
     trailingPeerRequirements = Optional.empty();
-    if (ExceptionUtils.rootCause(error) instanceof FastSyncException) {
+    Throwable rootCause = ExceptionUtils.rootCause(error);
+    if (rootCause instanceof FastSyncException) {
+      return CompletableFuture.failedFuture(error);
+    } else if (rootCause instanceof StalledDownloadException) {
+      LOG.debug("Stalled sync re-pivoting to newer block.");
+      return start(FastSyncState.EMPTY_SYNC_STATE);
+    } else if (rootCause instanceof CancellationException) {
       return CompletableFuture.failedFuture(error);
-    } else if (ExceptionUtils.rootCause(error) instanceof StalledDownloadException) {
-      LOG.warn(
-          "Fast sync was unable to download the world state. Retrying with a new pivot block.");
+    } else if (rootCause instanceof MaxRetriesReachedException) {
+      LOG.debug(
+          "A download operation reached the max number of retries, re-pivoting to newer block");
       return start(FastSyncState.EMPTY_SYNC_STATE);
     } else {
       LOG.error(
-          "Encountered an unexpected error during fast sync. Restarting fast sync in "
-              + FAST_SYNC_RETRY_DELAY
+          "Encountered an unexpected error during fast sync. Restarting sync in "
+              + FAST_SYNC_RETRY_DELAY.getSeconds()
               + " seconds.",
           error);
       return fastSyncActions.scheduleFutureTask(
@@ -108,6 +132,7 @@ private CompletableFuture<FastSyncState> handleFailure(final Throwable error) {
   public void stop() {
     synchronized (this) {
       if (running.compareAndSet(true, false)) {
+        LOG.info("Stopping fast sync");
         // Cancelling the world state download will also cause the chain download to be cancelled.
         worldStateDownloader.cancel();
       }
@@ -128,7 +153,7 @@ public void deleteFastSyncState() {
     }
   }
 
-  private FastSyncState updateMaxTrailingPeers(final FastSyncState state) {
+  protected FastSyncState updateMaxTrailingPeers(final FastSyncState state) {
     if (state.getPivotBlockNumber().isPresent()) {
       trailingPeerRequirements =
           Optional.of(new TrailingPeerRequirements(state.getPivotBlockNumber().getAsLong(), 0));
@@ -138,13 +163,13 @@ private FastSyncState updateMaxTrailingPeers(final FastSyncState state) {
     return state;
   }
 
-  private FastSyncState storeState(final FastSyncState state) {
+  protected FastSyncState storeState(final FastSyncState state) {
     fastSyncStateStorage.storeState(state);
     return state;
   }
 
-  private CompletableFuture<FastSyncState> downloadChainAndWorldState(
-      final FastSyncState currentState) {
+  protected CompletableFuture<FastSyncState> downloadChainAndWorldState(
+      final FastSyncActions fastSyncActions, final FastSyncState currentState) {
     // Synchronized ensures that stop isn't called while we're in the process of starting a
     // world state and chain download. If it did we might wind up starting a new download
     // after the stop method had called cancel.
@@ -154,7 +179,7 @@ private CompletableFuture<FastSyncState> downloadChainAndWorldState(
             new CancellationException("FastSyncDownloader stopped"));
       }
       final CompletableFuture<Void> worldStateFuture =
-          worldStateDownloader.run(currentState.getPivotBlockHeader().get());
+          worldStateDownloader.run(fastSyncActions, currentState);
       final ChainDownloader chainDownloader = fastSyncActions.createChainDownloader(currentState);
       final CompletableFuture<Void> chainFuture = chainDownloader.start();
 
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncState.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncState.java
index 342cf74a093..2f0af520edf 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncState.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncState.java
@@ -14,33 +14,48 @@
  */
 package org.hyperledger.besu.ethereum.eth.sync.fastsync;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 
 import java.util.Objects;
 import java.util.Optional;
 import java.util.OptionalLong;
 
-import com.google.common.base.MoreObjects;
-
 public class FastSyncState {
 
-  public static FastSyncState EMPTY_SYNC_STATE =
-      new FastSyncState(OptionalLong.empty(), Optional.empty());
+  public static final FastSyncState EMPTY_SYNC_STATE = new FastSyncState();
+
+  private OptionalLong pivotBlockNumber;
+  private Optional<Hash> pivotBlockHash;
+  private Optional<BlockHeader> pivotBlockHeader;
 
-  private final OptionalLong pivotBlockNumber;
-  private final Optional<BlockHeader> pivotBlockHeader;
+  public FastSyncState() {
+    pivotBlockNumber = OptionalLong.empty();
+    pivotBlockHash = Optional.empty();
+    pivotBlockHeader = Optional.empty();
+  }
 
   public FastSyncState(final long pivotBlockNumber) {
-    this(OptionalLong.of(pivotBlockNumber), Optional.empty());
+    this(OptionalLong.of(pivotBlockNumber), Optional.empty(), Optional.empty());
+  }
+
+  public FastSyncState(final Hash pivotBlockHash) {
+    this(OptionalLong.empty(), Optional.of(pivotBlockHash), Optional.empty());
   }
 
   public FastSyncState(final BlockHeader pivotBlockHeader) {
-    this(OptionalLong.of(pivotBlockHeader.getNumber()), Optional.of(pivotBlockHeader));
+    this(
+        OptionalLong.of(pivotBlockHeader.getNumber()),
+        Optional.of(pivotBlockHeader.getHash()),
+        Optional.of(pivotBlockHeader));
   }
 
-  private FastSyncState(
-      final OptionalLong pivotBlockNumber, final Optional<BlockHeader> pivotBlockHeader) {
+  protected FastSyncState(
+      final OptionalLong pivotBlockNumber,
+      final Optional<Hash> pivotBlockHash,
+      final Optional<BlockHeader> pivotBlockHeader) {
     this.pivotBlockNumber = pivotBlockNumber;
+    this.pivotBlockHash = pivotBlockHash;
     this.pivotBlockHeader = pivotBlockHeader;
   }
 
@@ -48,6 +63,10 @@ public OptionalLong getPivotBlockNumber() {
     return pivotBlockNumber;
   }
 
+  public Optional<Hash> getPivotBlockHash() {
+    return pivotBlockHash;
+  }
+
   public Optional<BlockHeader> getPivotBlockHeader() {
     return pivotBlockHeader;
   }
@@ -56,29 +75,40 @@ public boolean hasPivotBlockHeader() {
     return pivotBlockHeader.isPresent();
   }
 
+  public boolean hasPivotBlockHash() {
+    return pivotBlockHash.isPresent();
+  }
+
+  public void setCurrentHeader(final BlockHeader header) {
+    pivotBlockNumber = OptionalLong.of(header.getNumber());
+    pivotBlockHash = Optional.of(header.getHash());
+    pivotBlockHeader = Optional.of(header);
+  }
+
   @Override
   public boolean equals(final Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    final FastSyncState that = (FastSyncState) o;
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    FastSyncState that = (FastSyncState) o;
     return Objects.equals(pivotBlockNumber, that.pivotBlockNumber)
+        && Objects.equals(pivotBlockHash, that.pivotBlockHash)
         && Objects.equals(pivotBlockHeader, that.pivotBlockHeader);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(pivotBlockNumber, pivotBlockHeader);
+    return Objects.hash(pivotBlockNumber, pivotBlockHash, pivotBlockHeader);
   }
 
   @Override
   public String toString() {
-    return MoreObjects.toStringHelper(this)
-        .add("pivotBlockNumber", pivotBlockNumber)
-        .add("pivotBlockHeader", pivotBlockHeader)
-        .toString();
+    return "FastSyncState{"
+        + "pivotBlockNumber="
+        + pivotBlockNumber
+        + ", pivotBlockHash="
+        + pivotBlockHash
+        + ", pivotBlockHeader="
+        + pivotBlockHeader
+        + '}';
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncStateStorage.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncStateStorage.java
index 9a98d2b0e6b..253e2466169 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncStateStorage.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncStateStorage.java
@@ -24,9 +24,9 @@
 import java.nio.file.Path;
 
 import com.google.common.io.Files;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Supports persisting fast sync state to disk to enable resuming after a restart.
@@ -37,7 +37,7 @@
  * block header we want to continue with that pivot block so the world state downloaded matches up.
  */
 public class FastSyncStateStorage {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(FastSyncStateStorage.class);
   private static final String PIVOT_BLOCK_HEADER_FILENAME = "pivotBlockHeader.rlp";
   private final File pivotBlockHeaderFile;
 
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncTargetManager.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncTargetManager.java
index a3245aa61e6..11dc8c1af61 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncTargetManager.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncTargetManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -16,61 +16,92 @@
 
 import static java.util.concurrent.CompletableFuture.completedFuture;
 import static org.hyperledger.besu.ethereum.eth.sync.fastsync.PivotBlockRetriever.MAX_QUERY_RETRIES_PER_PEER;
+import static org.hyperledger.besu.ethereum.util.LogUtil.throttledLog;
 
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
 import org.hyperledger.besu.ethereum.eth.sync.SyncTargetManager;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
 import org.hyperledger.besu.ethereum.eth.sync.tasks.RetryingGetHeaderFromPeerByNumberTask;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-class FastSyncTargetManager extends SyncTargetManager {
-  private static final Logger LOG = LogManager.getLogger();
+public class FastSyncTargetManager extends SyncTargetManager {
+  private static final Logger LOG = LoggerFactory.getLogger(FastSyncTargetManager.class);
 
+  private final WorldStateStorage worldStateStorage;
   private final ProtocolSchedule protocolSchedule;
   private final ProtocolContext protocolContext;
   private final EthContext ethContext;
   private final MetricsSystem metricsSystem;
-  private final BlockHeader pivotBlockHeader;
+  private final FastSyncState fastSyncState;
+  private final AtomicBoolean logDebug = new AtomicBoolean(true);
+  private final AtomicBoolean logInfo = new AtomicBoolean(true);
+  private final int logDebugRepeatDelay = 15;
+  private final int logInfoRepeatDelay = 120;
 
   public FastSyncTargetManager(
       final SynchronizerConfiguration config,
+      final WorldStateStorage worldStateStorage,
       final ProtocolSchedule protocolSchedule,
       final ProtocolContext protocolContext,
       final EthContext ethContext,
       final MetricsSystem metricsSystem,
-      final BlockHeader pivotBlockHeader) {
+      final FastSyncState fastSyncState) {
     super(config, protocolSchedule, protocolContext, ethContext, metricsSystem);
+    this.worldStateStorage = worldStateStorage;
     this.protocolSchedule = protocolSchedule;
     this.protocolContext = protocolContext;
     this.ethContext = ethContext;
     this.metricsSystem = metricsSystem;
-    this.pivotBlockHeader = pivotBlockHeader;
+    this.fastSyncState = fastSyncState;
   }
 
   @Override
   protected CompletableFuture<Optional<EthPeer>> selectBestAvailableSyncTarget() {
-    final Optional<EthPeer> maybeBestPeer = ethContext.getEthPeers().bestPeerWithHeightEstimate();
-    if (!maybeBestPeer.isPresent()) {
-      LOG.info("No sync target, waiting for peers: {}", ethContext.getEthPeers().peerCount());
+    final BlockHeader pivotBlockHeader = fastSyncState.getPivotBlockHeader().get();
+    final EthPeers ethPeers = ethContext.getEthPeers();
+    final Optional<EthPeer> maybeBestPeer = ethPeers.bestPeerWithHeightEstimate();
+    if (maybeBestPeer.isEmpty()) {
+      throttledLog(
+          LOG::debug,
+          String.format(
+              "Unable to find sync target. Currently checking %d peers for usefulness. Pivot block: %d",
+              ethContext.getEthPeers().peerCount(), pivotBlockHeader.getNumber()),
+          logDebug,
+          logDebugRepeatDelay);
+      throttledLog(
+          LOG::info,
+          String.format(
+              "Unable to find sync target. Currently checking %d peers for usefulness.",
+              ethContext.getEthPeers().peerCount()),
+          logInfo,
+          logInfoRepeatDelay);
       return completedFuture(Optional.empty());
     } else {
       final EthPeer bestPeer = maybeBestPeer.get();
       if (bestPeer.chainState().getEstimatedHeight() < pivotBlockHeader.getNumber()) {
         LOG.info(
-            "No sync target with sufficient chain height, waiting for peers: {}",
-            ethContext.getEthPeers().peerCount());
+            "Best peer {} has chain height {} below pivotBlock height {}. Waiting for better peers. Current {} of max {}",
+            maybeBestPeer.map(EthPeer::getShortNodeId).orElse("none"),
+            maybeBestPeer.map(p -> p.chainState().getEstimatedHeight()).orElse(-1L),
+            pivotBlockHeader.getNumber(),
+            ethPeers.peerCount(),
+            ethPeers.getMaxPeers());
+        ethPeers.disconnectWorstUselessPeer();
         return completedFuture(Optional.empty());
       } else {
         return confirmPivotBlockHeader(bestPeer);
@@ -79,6 +110,7 @@ protected CompletableFuture<Optional<EthPeer>> selectBestAvailableSyncTarget() {
   }
 
   private CompletableFuture<Optional<EthPeer>> confirmPivotBlockHeader(final EthPeer bestPeer) {
+    final BlockHeader pivotBlockHeader = fastSyncState.getPivotBlockHeader().get();
     final RetryingGetHeaderFromPeerByNumberTask task =
         RetryingGetHeaderFromPeerByNumberTask.forSingleNumber(
             protocolSchedule,
@@ -90,19 +122,27 @@ private CompletableFuture<Optional<EthPeer>> confirmPivotBlockHeader(final EthPe
     return ethContext
         .getScheduler()
         .timeout(task)
-        .thenApply(
+        .thenCompose(
             result -> {
               if (peerHasDifferentPivotBlock(result)) {
-                LOG.warn(
-                    "Best peer has wrong pivot block (#{}) expecting {} but received {}.  Disconnect: {}",
-                    pivotBlockHeader.getNumber(),
-                    pivotBlockHeader.getHash(),
-                    result.size() == 1 ? result.get(0).getHash() : "invalid response",
-                    bestPeer);
-                bestPeer.disconnect(DisconnectReason.USELESS_PEER);
-                return Optional.<EthPeer>empty();
+                if (!hasPivotChanged(pivotBlockHeader)) {
+                  // if the pivot block has not changed, then warn and disconnect this peer
+                  LOG.warn(
+                      "Best peer has wrong pivot block (#{}) expecting {} but received {}.  Disconnect: {}",
+                      pivotBlockHeader.getNumber(),
+                      pivotBlockHeader.getHash(),
+                      result.size() == 1 ? result.get(0).getHash() : "invalid response",
+                      bestPeer);
+                  bestPeer.disconnect(DisconnectReason.USELESS_PEER);
+                  return CompletableFuture.completedFuture(Optional.<EthPeer>empty());
+                }
+                LOG.debug(
+                    "Retrying best peer {} with new pivot block {}",
+                    bestPeer.getShortNodeId(),
+                    pivotBlockHeader.toLogString());
+                return confirmPivotBlockHeader(bestPeer);
               } else {
-                return Optional.of(bestPeer);
+                return CompletableFuture.completedFuture(Optional.of(bestPeer));
               }
             })
         .exceptionally(
@@ -112,12 +152,31 @@ private CompletableFuture<Optional<EthPeer>> confirmPivotBlockHeader(final EthPe
             });
   }
 
+  private boolean hasPivotChanged(final BlockHeader requestedPivot) {
+    return fastSyncState
+        .getPivotBlockHash()
+        .filter(currentPivotHash -> requestedPivot.getBlockHash().equals(currentPivotHash))
+        .isEmpty();
+  }
+
   private boolean peerHasDifferentPivotBlock(final List<BlockHeader> result) {
+    final BlockHeader pivotBlockHeader = fastSyncState.getPivotBlockHeader().get();
     return result.size() != 1 || !result.get(0).equals(pivotBlockHeader);
   }
 
   @Override
   public boolean shouldContinueDownloading() {
-    return !protocolContext.getBlockchain().getChainHeadHash().equals(pivotBlockHeader.getHash());
+    final BlockHeader pivotBlockHeader = fastSyncState.getPivotBlockHeader().get();
+    boolean isValidChainHead =
+        protocolContext.getBlockchain().getChainHeadHash().equals(pivotBlockHeader.getHash());
+    if (!isValidChainHead) {
+      if (protocolContext.getBlockchain().contains(pivotBlockHeader.getHash())) {
+        protocolContext.getBlockchain().rewindToBlock(pivotBlockHeader.getHash());
+      } else {
+        return true;
+      }
+    }
+    return !worldStateStorage.isWorldStateAvailable(
+        pivotBlockHeader.getStateRoot(), pivotBlockHeader.getBlockHash());
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockConfirmer.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockConfirmer.java
index 4f64636f544..1253dbb17c1 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockConfirmer.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockConfirmer.java
@@ -36,9 +36,9 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This task will query {@code numberOfPeersToQuery} peers for a particular block number. If any
@@ -47,7 +47,7 @@
  * distinct peers all return matching block headers for the specified block number.
  */
 class PivotBlockConfirmer {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PivotBlockConfirmer.class);
 
   private final EthContext ethContext;
   private final MetricsSystem metricsSystem;
@@ -79,7 +79,6 @@ class PivotBlockConfirmer {
     this.protocolSchedule = protocolSchedule;
     this.ethContext = ethContext;
     this.metricsSystem = metricsSystem;
-
     this.pivotBlockNumber = pivotBlockNumber;
     this.numberOfPeersToQuery = numberOfPeersToQuery;
     this.numberOfRetriesPerPeer = numberOfRetriesPerPeer;
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockRetriever.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockRetriever.java
index d5d5d8401c0..e20bb16799c 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockRetriever.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockRetriever.java
@@ -26,8 +26,8 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This task attempts to find a non-controversial pivot block by confirming the pivot block number
@@ -38,8 +38,8 @@
  */
 public class PivotBlockRetriever {
 
-  private static final Logger LOG = LogManager.getLogger();
-  public static final int MAX_QUERY_RETRIES_PER_PEER = 3;
+  private static final Logger LOG = LoggerFactory.getLogger(PivotBlockRetriever.class);
+  public static final int MAX_QUERY_RETRIES_PER_PEER = 4;
   private static final int DEFAULT_MAX_PIVOT_BLOCK_RESETS = 250;
   private static final int SUSPICIOUS_NUMBER_OF_RETRIES = 5;
 
@@ -53,6 +53,7 @@ public class PivotBlockRetriever {
   private final int maxPivotBlockResets;
   // How far to push back the pivot block when we retry on pivot disagreement
   private final long pivotBlockNumberResetDelta;
+
   // The current pivot block number, gets pushed back if peers disagree on the pivot block
   AtomicLong pivotBlockNumber;
 
@@ -72,7 +73,6 @@ public class PivotBlockRetriever {
     this.protocolSchedule = protocolSchedule;
     this.ethContext = ethContext;
     this.metricsSystem = metricsSystem;
-
     this.pivotBlockNumber = new AtomicLong(pivotBlockNumber);
     this.peersToQuery = peersToQuery;
     this.pivotBlockNumberResetDelta = pivotBlockNumberResetDelta;
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotSelectorFromPeers.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotSelectorFromPeers.java
new file mode 100644
index 00000000000..9999f991ec3
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotSelectorFromPeers.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.task.WaitForPeersTask;
+import org.hyperledger.besu.ethereum.eth.sync.PivotBlockSelector;
+import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.TrailingPeerLimiter;
+import org.hyperledger.besu.ethereum.eth.sync.TrailingPeerRequirements;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PivotSelectorFromPeers implements PivotBlockSelector {
+
+  private static final Logger LOG = LoggerFactory.getLogger(PivotSelectorFromPeers.class);
+
+  private final EthContext ethContext;
+  private final SynchronizerConfiguration syncConfig;
+  private final SyncState syncState;
+  private final MetricsSystem metricsSystem;
+
+  public PivotSelectorFromPeers(
+      final EthContext ethContext,
+      final SynchronizerConfiguration syncConfig,
+      final SyncState syncState,
+      final MetricsSystem metricsSystem) {
+    this.ethContext = ethContext;
+    this.syncConfig = syncConfig;
+    this.syncState = syncState;
+    this.metricsSystem = metricsSystem;
+  }
+
+  @Override
+  public Optional<FastSyncState> selectNewPivotBlock() {
+    return selectBestPeer().flatMap(this::fromBestPeer);
+  }
+
+  @Override
+  public CompletableFuture<Void> prepareRetry() {
+    final TrailingPeerLimiter trailingPeerLimiter =
+        new TrailingPeerLimiter(
+            ethContext.getEthPeers(),
+            () ->
+                new TrailingPeerRequirements(
+                    conservativelyEstimatedPivotBlock(), syncConfig.getMaxTrailingPeers()));
+    trailingPeerLimiter.enforceTrailingPeerLimit();
+
+    return waitForPeers(syncConfig.getFastSyncMinimumPeerCount());
+  }
+
+  @Override
+  public long getBestChainHeight() {
+    return syncState.bestChainHeight();
+  }
+
+  private Optional<FastSyncState> fromBestPeer(final EthPeer peer) {
+    final long pivotBlockNumber =
+        peer.chainState().getEstimatedHeight() - syncConfig.getFastSyncPivotDistance();
+    if (pivotBlockNumber <= BlockHeader.GENESIS_BLOCK_NUMBER) {
+      // Peer's chain isn't long enough, return an empty value, so we can try again.
+      LOG.info("Waiting for peers with sufficient chain height");
+      return Optional.empty();
+    }
+    LOG.info("Selecting block number {} as fast sync pivot block.", pivotBlockNumber);
+    return Optional.of(new FastSyncState(pivotBlockNumber));
+  }
+
+  private Optional<EthPeer> selectBestPeer() {
+    return ethContext
+        .getEthPeers()
+        .bestPeerMatchingCriteria(this::canPeerDeterminePivotBlock)
+        // Only select a pivot block number when we have a minimum number of height estimates
+        .filter(unused -> enoughFastSyncPeersArePresent());
+  }
+
+  private boolean enoughFastSyncPeersArePresent() {
+    final long peerCount = countPeersThatCanDeterminePivotBlock();
+    final int minPeerCount = syncConfig.getFastSyncMinimumPeerCount();
+    if (peerCount < minPeerCount) {
+      LOG.info(
+          "Waiting for valid peers with chain height information.  {} / {} required peers currently available.",
+          peerCount,
+          minPeerCount);
+      return false;
+    }
+    return true;
+  }
+
+  private long countPeersThatCanDeterminePivotBlock() {
+    return ethContext
+        .getEthPeers()
+        .streamAvailablePeers()
+        .filter(this::canPeerDeterminePivotBlock)
+        .count();
+  }
+
+  private boolean canPeerDeterminePivotBlock(final EthPeer peer) {
+    LOG.debug(
+        "peer {} hasEstimatedHeight {} isFullyValidated? {}",
+        peer.getShortNodeId(),
+        peer.chainState().hasEstimatedHeight(),
+        peer.isFullyValidated());
+    return peer.chainState().hasEstimatedHeight() && peer.isFullyValidated();
+  }
+
+  private long conservativelyEstimatedPivotBlock() {
+    final long estimatedNextPivot =
+        syncState.getLocalChainHeight() + syncConfig.getFastSyncPivotDistance();
+    return Math.min(syncState.bestChainHeight(), estimatedNextPivot);
+  }
+
+  private CompletableFuture<Void> waitForPeers(final int count) {
+    final WaitForPeersTask waitForPeersTask =
+        WaitForPeersTask.create(ethContext, count, metricsSystem);
+    return waitForPeersTask.run();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotSelectorFromSafeBlock.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotSelectorFromSafeBlock.java
new file mode 100644
index 00000000000..052bee29fa3
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotSelectorFromSafeBlock.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync;
+
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.consensus.merge.ForkchoiceEvent;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.task.WaitForPeersTask;
+import org.hyperledger.besu.ethereum.eth.sync.PivotBlockSelector;
+import org.hyperledger.besu.ethereum.eth.sync.tasks.RetryingGetHeaderFromPeerByHashTask;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Supplier;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PivotSelectorFromSafeBlock implements PivotBlockSelector {
+
+  private static final Logger LOG = LoggerFactory.getLogger(PivotSelectorFromSafeBlock.class);
+  private final ProtocolContext protocolContext;
+  private final ProtocolSchedule protocolSchedule;
+  private final EthContext ethContext;
+  private final MetricsSystem metricsSystem;
+  private final GenesisConfigOptions genesisConfig;
+  private final Supplier<Optional<ForkchoiceEvent>> forkchoiceStateSupplier;
+  private final Runnable cleanupAction;
+
+  private long lastNoFcuReceivedInfoLog = System.currentTimeMillis();
+  private static final long NO_FCU_RECEIVED_LOGGING_THRESHOLD = 60000L;
+  private volatile Optional<BlockHeader> maybeCachedHeadBlockHeader = Optional.empty();
+
+  public PivotSelectorFromSafeBlock(
+      final ProtocolContext protocolContext,
+      final ProtocolSchedule protocolSchedule,
+      final EthContext ethContext,
+      final MetricsSystem metricsSystem,
+      final GenesisConfigOptions genesisConfig,
+      final Supplier<Optional<ForkchoiceEvent>> forkchoiceStateSupplier,
+      final Runnable cleanupAction) {
+    this.protocolContext = protocolContext;
+    this.protocolSchedule = protocolSchedule;
+    this.ethContext = ethContext;
+    this.metricsSystem = metricsSystem;
+    this.genesisConfig = genesisConfig;
+    this.forkchoiceStateSupplier = forkchoiceStateSupplier;
+    this.cleanupAction = cleanupAction;
+  }
+
+  @Override
+  public Optional<FastSyncState> selectNewPivotBlock() {
+    final Optional<ForkchoiceEvent> maybeForkchoice = forkchoiceStateSupplier.get();
+    if (maybeForkchoice.isPresent() && maybeForkchoice.get().hasValidSafeBlockHash()) {
+      return Optional.of(selectLastSafeBlockAsPivot(maybeForkchoice.get().getSafeBlockHash()));
+    }
+    if (lastNoFcuReceivedInfoLog + NO_FCU_RECEIVED_LOGGING_THRESHOLD < System.currentTimeMillis()) {
+      lastNoFcuReceivedInfoLog = System.currentTimeMillis();
+      LOG.info(
+          "Waiting for consensus client, this may be because your consensus client is still syncing");
+    }
+    LOG.debug("No finalized block hash announced yet");
+    return Optional.empty();
+  }
+
+  @Override
+  public CompletableFuture<Void> prepareRetry() {
+    // nothing to do
+    return CompletableFuture.completedFuture(null);
+  }
+
+  private FastSyncState selectLastSafeBlockAsPivot(final Hash safeHash) {
+    LOG.debug("Returning safe block hash {} as pivot", safeHash);
+    return new FastSyncState(safeHash);
+  }
+
+  @Override
+  public void close() {
+    cleanupAction.run();
+  }
+
+  @Override
+  public long getMinRequiredBlockNumber() {
+    return genesisConfig.getTerminalBlockNumber().orElse(0L);
+  }
+
+  @Override
+  public long getBestChainHeight() {
+    final long localChainHeight = protocolContext.getBlockchain().getChainHeadBlockNumber();
+
+    return Math.max(
+        forkchoiceStateSupplier
+            .get()
+            .map(ForkchoiceEvent::getHeadBlockHash)
+            .map(
+                headBlockHash ->
+                    maybeCachedHeadBlockHeader
+                        .filter(
+                            cachedBlockHeader -> cachedBlockHeader.getHash().equals(headBlockHash))
+                        .map(BlockHeader::getNumber)
+                        .orElseGet(
+                            () -> {
+                              LOG.debug(
+                                  "Downloading chain head block header by hash {}", headBlockHash);
+                              try {
+                                return waitForPeers(1)
+                                    .thenCompose(unused -> downloadBlockHeader(headBlockHash))
+                                    .thenApply(
+                                        blockHeader -> {
+                                          maybeCachedHeadBlockHeader = Optional.of(blockHeader);
+                                          return blockHeader.getNumber();
+                                        })
+                                    .get();
+                              } catch (Throwable t) {
+                                LOG.debug(
+                                    "Error trying to download chain head block header by hash {}",
+                                    headBlockHash,
+                                    t);
+                              }
+                              return null;
+                            }))
+            .orElse(0L),
+        localChainHeight);
+  }
+
+  private CompletableFuture<BlockHeader> downloadBlockHeader(final Hash hash) {
+    return RetryingGetHeaderFromPeerByHashTask.byHash(
+            protocolSchedule, ethContext, hash, 0, metricsSystem)
+        .getHeader()
+        .whenComplete(
+            (blockHeader, throwable) -> {
+              if (throwable != null) {
+                LOG.debug("Error downloading block header by hash {}", hash);
+              } else {
+                LOG.atDebug()
+                    .setMessage("Successfully downloaded pivot block header by hash {}")
+                    .addArgument(blockHeader::toLogString)
+                    .log();
+              }
+            });
+  }
+
+  private CompletableFuture<Void> waitForPeers(final int count) {
+
+    final WaitForPeersTask waitForPeersTask =
+        WaitForPeersTask.create(ethContext, count, metricsSystem);
+    return waitForPeersTask.run();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/checkpoint/Checkpoint.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/checkpoint/Checkpoint.java
new file mode 100644
index 00000000000..46f8e3d39df
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/checkpoint/Checkpoint.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync.checkpoint;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+
+import org.immutables.value.Value;
+
+@Value.Immutable
+public interface Checkpoint {
+
+  long blockNumber();
+
+  Hash blockHash();
+
+  Difficulty totalDifficulty();
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/AccountTrieNodeDataRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/AccountTrieNodeDataRequest.java
new file mode 100644
index 00000000000..90aa59c045a
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/AccountTrieNodeDataRequest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+import org.hyperledger.besu.ethereum.trie.CompactEncoding;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.worldstate.FlatDbMode;
+import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage.Updater;
+
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+class AccountTrieNodeDataRequest extends TrieNodeDataRequest {
+
+  AccountTrieNodeDataRequest(final Hash hash, final Optional<Bytes> location) {
+    super(RequestType.ACCOUNT_TRIE_NODE, hash, location);
+  }
+
+  @Override
+  protected void doPersist(final Updater updater) {
+    updater.putAccountStateTrieNode(getLocation().orElse(Bytes.EMPTY), getHash(), getData());
+  }
+
+  @Override
+  public Optional<Bytes> getExistingData(final WorldStateStorage worldStateStorage) {
+    return getLocation()
+        .flatMap(
+            location ->
+                worldStateStorage
+                    .getAccountStateTrieNode(location, getHash())
+                    .filter(data -> Hash.hash(data).equals(getHash())));
+  }
+
+  @Override
+  protected NodeDataRequest createChildNodeDataRequest(
+      final Hash childHash, final Optional<Bytes> location) {
+    return createAccountDataRequest(childHash, location);
+  }
+
+  @Override
+  protected Stream<NodeDataRequest> getRequestsFromTrieNodeValue(
+      final WorldStateStorage worldStateStorage,
+      final Optional<Bytes> location,
+      final Bytes path,
+      final Bytes value) {
+    final Stream.Builder<NodeDataRequest> builder = Stream.builder();
+    final StateTrieAccountValue accountValue = StateTrieAccountValue.readFrom(RLP.input(value));
+
+    final Optional<Hash> accountHash =
+        Optional.of(
+            Hash.wrap(
+                Bytes32.wrap(
+                    CompactEncoding.pathToBytes(
+                        Bytes.concatenate(getLocation().orElse(Bytes.EMPTY), path)))));
+    if (!worldStateStorage.getFlatDbMode().equals(FlatDbMode.NO_FLATTENED)) {
+      ((BonsaiWorldStateKeyValueStorage.Updater) worldStateStorage.updater())
+          .putAccountInfoState(accountHash.get(), value)
+          .commit();
+    }
+
+    // Add code, if appropriate
+    if (!accountValue.getCodeHash().equals(Hash.EMPTY)) {
+      builder.add(createCodeRequest(accountValue.getCodeHash(), accountHash));
+    }
+    // Add storage, if appropriate
+    if (!accountValue.getStorageRoot().equals(MerkleTrie.EMPTY_TRIE_NODE_HASH)) {
+      // If storage is non-empty queue download
+
+      final NodeDataRequest storageNode =
+          createStorageDataRequest(accountValue.getStorageRoot(), accountHash, Optional.empty());
+      builder.add(storageNode);
+    }
+    return builder.build();
+  }
+
+  @Override
+  protected void writeTo(final RLPOutput out) {
+    out.startList();
+    out.writeByte(getRequestType().getValue());
+    out.writeBytes(getHash());
+    getLocation().ifPresent(out::writeBytes);
+    out.endList();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/CodeNodeDataRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/CodeNodeDataRequest.java
new file mode 100644
index 00000000000..0a8672ef795
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/CodeNodeDataRequest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage.Updater;
+
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+
+class CodeNodeDataRequest extends NodeDataRequest {
+
+  final Optional<Hash> accountHash;
+
+  CodeNodeDataRequest(final Hash hash, final Optional<Hash> accountHash) {
+    super(RequestType.CODE, hash);
+    this.accountHash = accountHash;
+  }
+
+  @Override
+  protected void doPersist(final Updater updater) {
+    updater.putCode(accountHash.orElse(Hash.EMPTY), getHash(), getData());
+  }
+
+  @Override
+  public Stream<NodeDataRequest> getChildRequests(final WorldStateStorage worldStateStorage) {
+    // Code nodes have nothing further to download
+    return Stream.empty();
+  }
+
+  @Override
+  public Optional<Bytes> getExistingData(final WorldStateStorage worldStateStorage) {
+    return worldStateStorage
+        .getCode(getHash(), accountHash.orElse(Hash.EMPTY))
+        .filter(codeBytes -> Hash.hash(codeBytes).equals(getHash()));
+  }
+
+  public Optional<Hash> getAccountHash() {
+    return accountHash;
+  }
+
+  @Override
+  protected void writeTo(final RLPOutput out) {
+    out.startList();
+    out.writeByte(getRequestType().getValue());
+    out.writeBytes(getHash());
+    getAccountHash().ifPresent(out::writeBytes);
+    out.endList();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/CompleteTaskStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/CompleteTaskStep.java
new file mode 100644
index 00000000000..5536a50c8ef
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/CompleteTaskStep.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldDownloadState;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.metrics.RunnableTimedCounter;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.services.tasks.Task;
+
+import java.util.concurrent.TimeUnit;
+import java.util.function.LongSupplier;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CompleteTaskStep {
+  private static final Logger LOG = LoggerFactory.getLogger(CompleteTaskStep.class);
+  private final RunnableTimedCounter completedRequestsCounter;
+  private final Counter retriedRequestsCounter;
+  private final LongSupplier worldStatePendingRequestsCurrentSupplier;
+
+  public CompleteTaskStep(
+      final MetricsSystem metricsSystem,
+      final LongSupplier worldStatePendingRequestsCurrentSupplier) {
+    this.worldStatePendingRequestsCurrentSupplier = worldStatePendingRequestsCurrentSupplier;
+    completedRequestsCounter =
+        new RunnableTimedCounter(
+            metricsSystem.createCounter(
+                BesuMetricCategory.SYNCHRONIZER,
+                "world_state_completed_requests_total",
+                "Total number of node data requests completed as part of fast sync world state download"),
+            this::displayWorldStateSyncProgress,
+            1,
+            TimeUnit.MINUTES);
+    retriedRequestsCounter =
+        metricsSystem.createCounter(
+            BesuMetricCategory.SYNCHRONIZER,
+            "world_state_retried_requests_total",
+            "Total number of node data requests repeated as part of fast sync world state download");
+  }
+
+  public void markAsCompleteOrFailed(
+      final BlockHeader header,
+      final WorldDownloadState<NodeDataRequest> downloadState,
+      final Task<NodeDataRequest> task) {
+    if (task.getData().getData() != null) {
+      completedRequestsCounter.inc();
+      task.markCompleted();
+      downloadState.checkCompletion(header);
+    } else {
+      retriedRequestsCounter.inc();
+      task.markFailed();
+      // Marking the task as failed will add it back to the queue so make sure any threads
+      // waiting to read from the queue are notified.
+      downloadState.notifyTaskAvailable();
+    }
+  }
+
+  private void displayWorldStateSyncProgress() {
+    LOG.info(
+        "Downloaded {} world state nodes. At least {} nodes remaining.",
+        getCompletedRequests(),
+        worldStatePendingRequestsCurrentSupplier.getAsLong());
+  }
+
+  long getCompletedRequests() {
+    return completedRequestsCounter.get();
+  }
+
+  long getPendingRequests() {
+    return worldStatePendingRequestsCurrentSupplier.getAsLong();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/FastDownloaderFactory.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/FastDownloaderFactory.java
new file mode 100644
index 00000000000..467dc0a53d0
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/FastDownloaderFactory.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.sync.PivotBlockSelector;
+import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
+import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncActions;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncDownloader;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncState;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncStateStorage;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldStateDownloader;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.services.tasks.InMemoryTasksPriorityQueues;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.Clock;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class FastDownloaderFactory {
+
+  protected static final String FAST_SYNC_FOLDER = "fastsync";
+
+  private static final Logger LOG = LoggerFactory.getLogger(FastDownloaderFactory.class);
+
+  public static Optional<FastSyncDownloader<?>> create(
+      final PivotBlockSelector pivotBlockSelector,
+      final SynchronizerConfiguration syncConfig,
+      final Path dataDirectory,
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final MetricsSystem metricsSystem,
+      final EthContext ethContext,
+      final WorldStateStorage worldStateStorage,
+      final SyncState syncState,
+      final Clock clock) {
+
+    final Path fastSyncDataDirectory = dataDirectory.resolve(FAST_SYNC_FOLDER);
+    final FastSyncStateStorage fastSyncStateStorage =
+        new FastSyncStateStorage(fastSyncDataDirectory);
+
+    if (SyncMode.isFullSync(syncConfig.getSyncMode())) {
+      if (fastSyncStateStorage.isFastSyncInProgress()) {
+        throw new IllegalStateException(
+            "Unable to change the sync mode when fast sync is incomplete, please restart with fast sync mode");
+      } else {
+        return Optional.empty();
+      }
+    }
+
+    ensureDirectoryExists(fastSyncDataDirectory.toFile());
+
+    final FastSyncState fastSyncState =
+        fastSyncStateStorage.loadState(ScheduleBasedBlockHeaderFunctions.create(protocolSchedule));
+
+    if (!syncState.isResyncNeeded()
+        && fastSyncState.getPivotBlockHeader().isEmpty()
+        && protocolContext.getBlockchain().getChainHeadBlockNumber()
+            != BlockHeader.GENESIS_BLOCK_NUMBER) {
+      LOG.info(
+          "Fast sync was requested, but cannot be enabled because the local blockchain is not empty.");
+      return Optional.empty();
+    }
+
+    if (worldStateStorage instanceof BonsaiWorldStateKeyValueStorage) {
+      worldStateStorage.clearFlatDatabase();
+    } else {
+      final Path queueDataDir = fastSyncDataDirectory.resolve("statequeue");
+      if (queueDataDir.toFile().exists()) {
+        LOG.warn(
+            "Fast sync is picking up after old fast sync version. Pruning the world state and starting from scratch.");
+        clearOldFastSyncWorldStateData(worldStateStorage, queueDataDir);
+      }
+    }
+    final InMemoryTasksPriorityQueues<NodeDataRequest> taskCollection =
+        createWorldStateDownloaderTaskCollection(
+            metricsSystem, syncConfig.getWorldStateTaskCacheSize());
+    final WorldStateDownloader worldStateDownloader =
+        new FastWorldStateDownloader(
+            ethContext,
+            worldStateStorage,
+            taskCollection,
+            syncConfig.getWorldStateHashCountPerRequest(),
+            syncConfig.getWorldStateRequestParallelism(),
+            syncConfig.getWorldStateMaxRequestsWithoutProgress(),
+            syncConfig.getWorldStateMinMillisBeforeStalling(),
+            clock,
+            metricsSystem);
+    final FastSyncDownloader<NodeDataRequest> fastSyncDownloader =
+        new FastSyncDownloader<>(
+            new FastSyncActions(
+                syncConfig,
+                worldStateStorage,
+                protocolSchedule,
+                protocolContext,
+                ethContext,
+                syncState,
+                pivotBlockSelector,
+                metricsSystem),
+            worldStateStorage,
+            worldStateDownloader,
+            fastSyncStateStorage,
+            taskCollection,
+            fastSyncDataDirectory,
+            fastSyncState);
+    syncState.setWorldStateDownloadStatus(worldStateDownloader);
+    return Optional.of(fastSyncDownloader);
+  }
+
+  private static void clearOldFastSyncWorldStateData(
+      final WorldStateStorage worldStateStorage, final Path queueDataDir) {
+    worldStateStorage.clear();
+    try (final Stream<Path> stream = Files.list(queueDataDir); ) {
+      stream.forEach(FastDownloaderFactory::deleteFile);
+      deleteFile(queueDataDir);
+    } catch (IOException e) {
+      throw new IllegalStateException(e);
+    }
+  }
+
+  private static void deleteFile(final Path f) {
+    try {
+      Files.delete(f);
+    } catch (IOException e) {
+      throw new IllegalStateException(e);
+    }
+  }
+
+  protected static void ensureDirectoryExists(final File dir) {
+    if (!dir.mkdirs() && !dir.isDirectory()) {
+      throw new IllegalStateException("Unable to create directory: " + dir.getAbsolutePath());
+    }
+  }
+
+  private static InMemoryTasksPriorityQueues<NodeDataRequest>
+      createWorldStateDownloaderTaskCollection(
+          final MetricsSystem metricsSystem, final int worldStateTaskCacheSize) {
+    final InMemoryTasksPriorityQueues<NodeDataRequest> taskCollection =
+        new InMemoryTasksPriorityQueues<>();
+
+    metricsSystem.createLongGauge(
+        BesuMetricCategory.SYNCHRONIZER,
+        "world_state_pending_requests_current",
+        "Number of pending requests for fast sync world state download",
+        taskCollection::size);
+
+    metricsSystem.createIntegerGauge(
+        BesuMetricCategory.SYNCHRONIZER,
+        "world_state_pending_requests_cache_size",
+        "Pending request cache size for fast sync world state download",
+        () -> worldStateTaskCacheSize);
+
+    return taskCollection;
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/FastWorldDownloadState.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/FastWorldDownloadState.java
new file mode 100644
index 00000000000..0703c93ef89
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/FastWorldDownloadState.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldDownloadState;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage.Updater;
+import org.hyperledger.besu.services.tasks.InMemoryTasksPriorityQueues;
+
+import java.time.Clock;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class FastWorldDownloadState extends WorldDownloadState<NodeDataRequest> {
+  private static final Logger LOG = LoggerFactory.getLogger(FastWorldDownloadState.class);
+
+  public FastWorldDownloadState(
+      final WorldStateStorage worldStateStorage,
+      final InMemoryTasksPriorityQueues<NodeDataRequest> pendingRequests,
+      final int maxRequestsWithoutProgress,
+      final long minMillisBeforeStalling,
+      final Clock clock) {
+    super(
+        worldStateStorage,
+        pendingRequests,
+        maxRequestsWithoutProgress,
+        minMillisBeforeStalling,
+        clock);
+  }
+
+  @Override
+  public synchronized boolean checkCompletion(final BlockHeader header) {
+    if (!internalFuture.isDone() && pendingRequests.allTasksCompleted()) {
+      if (rootNodeData == null) {
+        enqueueRequest(
+            NodeDataRequest.createAccountDataRequest(
+                header.getStateRoot(), Optional.of(Bytes.EMPTY)));
+        return false;
+      }
+      final Updater updater = worldStateStorage.updater();
+      updater.saveWorldState(header.getHash(), header.getStateRoot(), rootNodeData);
+      updater.commit();
+
+      internalFuture.complete(null);
+      // THere are no more inputs to process so make sure we wake up any threads waiting to dequeue
+      // so they can give up waiting.
+      notifyAll();
+      LOG.info("Finished downloading world state from peers");
+      return true;
+    } else {
+      return false;
+    }
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/FastWorldStateDownloadProcess.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/FastWorldStateDownloadProcess.java
new file mode 100644
index 00000000000..1b27a23b1f6
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/FastWorldStateDownloadProcess.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.hyperledger.besu.services.pipeline.PipelineBuilder.createPipelineFrom;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.eth.sync.worldstate.TaskQueueIterator;
+import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldStateDownloadProcess;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
+import org.hyperledger.besu.services.pipeline.Pipe;
+import org.hyperledger.besu.services.pipeline.Pipeline;
+import org.hyperledger.besu.services.pipeline.PipelineBuilder;
+import org.hyperledger.besu.services.pipeline.WritePipe;
+import org.hyperledger.besu.services.tasks.Task;
+import org.hyperledger.besu.util.ExceptionUtils;
+
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CompletableFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class FastWorldStateDownloadProcess implements WorldStateDownloadProcess {
+  private static final Logger LOG = LoggerFactory.getLogger(FastWorldStateDownloadProcess.class);
+  private final Pipeline<Task<NodeDataRequest>> fetchDataPipeline;
+  private final Pipeline<Task<NodeDataRequest>> completionPipeline;
+  private final WritePipe<Task<NodeDataRequest>> requestsToComplete;
+
+  private FastWorldStateDownloadProcess(
+      final Pipeline<Task<NodeDataRequest>> fetchDataPipeline,
+      final Pipeline<Task<NodeDataRequest>> completionPipeline,
+      final WritePipe<Task<NodeDataRequest>> requestsToComplete) {
+    this.fetchDataPipeline = fetchDataPipeline;
+    this.completionPipeline = completionPipeline;
+    this.requestsToComplete = requestsToComplete;
+  }
+
+  public static Builder builder() {
+    return new Builder();
+  }
+
+  @Override
+  public CompletableFuture<Void> start(final EthScheduler ethScheduler) {
+    final CompletableFuture<Void> fetchDataFuture = ethScheduler.startPipeline(fetchDataPipeline);
+    final CompletableFuture<Void> completionFuture = ethScheduler.startPipeline(completionPipeline);
+
+    fetchDataFuture.whenComplete(
+        (result, error) -> {
+          if (error != null) {
+            if (!(ExceptionUtils.rootCause(error) instanceof CancellationException)) {
+              LOG.error("Pipeline failed", error);
+            }
+            completionPipeline.abort();
+          } else {
+            // No more data to fetch, so propagate the pipe closure onto the completion pipe.
+            requestsToComplete.close();
+          }
+        });
+
+    completionFuture.exceptionally(
+        error -> {
+          if (!(ExceptionUtils.rootCause(error) instanceof CancellationException)) {
+            LOG.error("Pipeline failed", error);
+          }
+          fetchDataPipeline.abort();
+          return null;
+        });
+    return completionFuture;
+  }
+
+  @Override
+  public void abort() {
+    fetchDataPipeline.abort();
+    completionPipeline.abort();
+  }
+
+  public static class Builder {
+
+    private int hashCountPerRequest;
+    private int maxOutstandingRequests;
+    private LoadLocalDataStep loadLocalDataStep;
+    private FastWorldDownloadState downloadState;
+    private MetricsSystem metricsSystem;
+    private RequestDataStep requestDataStep;
+    private BlockHeader pivotBlockHeader;
+    private PersistDataStep persistDataStep;
+    private CompleteTaskStep completeTaskStep;
+
+    public Builder hashCountPerRequest(final int hashCountPerRequest) {
+      this.hashCountPerRequest = hashCountPerRequest;
+      return this;
+    }
+
+    public Builder maxOutstandingRequests(final int maxOutstandingRequests) {
+      this.maxOutstandingRequests = maxOutstandingRequests;
+      return this;
+    }
+
+    public Builder loadLocalDataStep(final LoadLocalDataStep loadLocalDataStep) {
+      this.loadLocalDataStep = loadLocalDataStep;
+      return this;
+    }
+
+    public Builder requestDataStep(final RequestDataStep requestDataStep) {
+      this.requestDataStep = requestDataStep;
+      return this;
+    }
+
+    public Builder persistDataStep(final PersistDataStep persistDataStep) {
+      this.persistDataStep = persistDataStep;
+      return this;
+    }
+
+    public Builder completeTaskStep(final CompleteTaskStep completeTaskStep) {
+      this.completeTaskStep = completeTaskStep;
+      return this;
+    }
+
+    public Builder downloadState(final FastWorldDownloadState downloadState) {
+      this.downloadState = downloadState;
+      return this;
+    }
+
+    public Builder pivotBlockHeader(final BlockHeader pivotBlockHeader) {
+      this.pivotBlockHeader = pivotBlockHeader;
+      return this;
+    }
+
+    public Builder metricsSystem(final MetricsSystem metricsSystem) {
+      this.metricsSystem = metricsSystem;
+      return this;
+    }
+
+    public FastWorldStateDownloadProcess build() {
+      checkNotNull(loadLocalDataStep);
+      checkNotNull(requestDataStep);
+      checkNotNull(persistDataStep);
+      checkNotNull(completeTaskStep);
+      checkNotNull(downloadState);
+      checkNotNull(pivotBlockHeader);
+      checkNotNull(metricsSystem);
+
+      // Room for the requests we expect to do in parallel plus some buffer but not unlimited.
+      final int bufferCapacity = hashCountPerRequest * 2;
+      final LabelledMetric<Counter> outputCounter =
+          metricsSystem.createLabelledCounter(
+              BesuMetricCategory.SYNCHRONIZER,
+              "world_state_pipeline_processed_total",
+              "Number of entries processed by each world state download pipeline stage",
+              "step",
+              "action");
+
+      final Pipeline<Task<NodeDataRequest>> completionPipeline =
+          PipelineBuilder.<Task<NodeDataRequest>>createPipeline(
+                  "requestDataAvailable", bufferCapacity, outputCounter, true, "node_data_request")
+              .andFinishWith(
+                  "requestCompleteTask",
+                  task ->
+                      completeTaskStep.markAsCompleteOrFailed(
+                          pivotBlockHeader, downloadState, task));
+
+      final Pipe<Task<NodeDataRequest>> requestsToComplete = completionPipeline.getInputPipe();
+      final Pipeline<Task<NodeDataRequest>> fetchDataPipeline =
+          createPipelineFrom(
+                  "requestDequeued",
+                  new TaskQueueIterator<>(downloadState),
+                  bufferCapacity,
+                  outputCounter,
+                  true,
+                  "world_state_download")
+              .thenFlatMapInParallel(
+                  "requestLoadLocalData",
+                  task -> loadLocalDataStep.loadLocalData(task, requestsToComplete),
+                  3,
+                  bufferCapacity)
+              .inBatches(hashCountPerRequest)
+              .thenProcessAsync(
+                  "batchDownloadData",
+                  requestTasks ->
+                      requestDataStep.requestData(requestTasks, pivotBlockHeader, downloadState),
+                  maxOutstandingRequests)
+              .thenProcess(
+                  "batchPersistData",
+                  tasks -> persistDataStep.persist(tasks, pivotBlockHeader, downloadState))
+              .andFinishWith(
+                  "batchDataDownloaded", tasks -> tasks.forEach(requestsToComplete::put));
+
+      return new FastWorldStateDownloadProcess(
+          fetchDataPipeline, completionPipeline, requestsToComplete);
+    }
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/FastWorldStateDownloader.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/FastWorldStateDownloader.java
new file mode 100644
index 00000000000..4bdbae71cee
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/FastWorldStateDownloader.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncActions;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncState;
+import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldStateDownloader;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.services.tasks.InMemoryTasksPriorityQueues;
+
+import java.time.Clock;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
+import java.util.function.IntSupplier;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class FastWorldStateDownloader implements WorldStateDownloader {
+  private static final Logger LOG = LoggerFactory.getLogger(FastWorldStateDownloader.class);
+
+  private final long minMillisBeforeStalling;
+  private final Clock clock;
+  private final MetricsSystem metricsSystem;
+
+  private final EthContext ethContext;
+  private final InMemoryTasksPriorityQueues<NodeDataRequest> taskCollection;
+  private final int hashCountPerRequest;
+  private final int maxOutstandingRequests;
+  private final int maxNodeRequestsWithoutProgress;
+  private final WorldStateStorage worldStateStorage;
+
+  private final AtomicReference<FastWorldDownloadState> downloadState = new AtomicReference<>();
+
+  private Optional<CompleteTaskStep> maybeCompleteTask = Optional.empty();
+
+  public FastWorldStateDownloader(
+      final EthContext ethContext,
+      final WorldStateStorage worldStateStorage,
+      final InMemoryTasksPriorityQueues<NodeDataRequest> taskCollection,
+      final int hashCountPerRequest,
+      final int maxOutstandingRequests,
+      final int maxNodeRequestsWithoutProgress,
+      final long minMillisBeforeStalling,
+      final Clock clock,
+      final MetricsSystem metricsSystem) {
+    this.ethContext = ethContext;
+    this.worldStateStorage = worldStateStorage;
+    this.taskCollection = taskCollection;
+    this.hashCountPerRequest = hashCountPerRequest;
+    this.maxOutstandingRequests = maxOutstandingRequests;
+    this.maxNodeRequestsWithoutProgress = maxNodeRequestsWithoutProgress;
+    this.minMillisBeforeStalling = minMillisBeforeStalling;
+    this.clock = clock;
+    this.metricsSystem = metricsSystem;
+
+    metricsSystem.createIntegerGauge(
+        BesuMetricCategory.SYNCHRONIZER,
+        "world_state_node_requests_since_last_progress_current",
+        "Number of world state requests made since the last time new data was returned",
+        downloadStateValue(FastWorldDownloadState::getRequestsSinceLastProgress));
+
+    metricsSystem.createIntegerGauge(
+        BesuMetricCategory.SYNCHRONIZER,
+        "world_state_inflight_requests_current",
+        "Number of in progress requests for world state data",
+        downloadStateValue(FastWorldDownloadState::getOutstandingTaskCount));
+  }
+
+  private IntSupplier downloadStateValue(final Function<FastWorldDownloadState, Integer> getter) {
+    return () -> {
+      final FastWorldDownloadState state = this.downloadState.get();
+      return state != null ? getter.apply(state) : 0;
+    };
+  }
+
+  @Override
+  public CompletableFuture<Void> run(
+      final FastSyncActions fastSyncActions, final FastSyncState fastSyncState) {
+    synchronized (this) {
+      final FastWorldDownloadState oldDownloadState = this.downloadState.get();
+      if (oldDownloadState != null && oldDownloadState.isDownloading()) {
+        final CompletableFuture<Void> failed = new CompletableFuture<>();
+        failed.completeExceptionally(
+            new IllegalStateException(
+                "Cannot run an already running " + this.getClass().getSimpleName()));
+        return failed;
+      }
+
+      Optional<BlockHeader> checkNull = Optional.of(fastSyncState.getPivotBlockHeader().get());
+      if (checkNull.isEmpty()) {
+        LOG.error("Pivot Block not present");
+        final CompletableFuture<Void> failed = new CompletableFuture<>();
+        failed.completeExceptionally(new NullPointerException("Pivot Block not present"));
+        return failed;
+      }
+
+      final BlockHeader header = fastSyncState.getPivotBlockHeader().get();
+      final Hash stateRoot = header.getStateRoot();
+      if (worldStateStorage.isWorldStateAvailable(stateRoot, header.getHash())) {
+        LOG.info(
+            "World state already available for block {} ({}). State root {}",
+            header.getNumber(),
+            header.getHash(),
+            stateRoot);
+        return CompletableFuture.completedFuture(null);
+      }
+      LOG.info(
+          "Begin downloading world state from peers for block {} ({}). State root {}",
+          header.getNumber(),
+          header.getHash(),
+          stateRoot);
+
+      final FastWorldDownloadState newDownloadState =
+          new FastWorldDownloadState(
+              worldStateStorage,
+              taskCollection,
+              maxNodeRequestsWithoutProgress,
+              minMillisBeforeStalling,
+              clock);
+      this.downloadState.set(newDownloadState);
+
+      if (!newDownloadState.downloadWasResumed()) {
+        // Only queue the root node if we're starting a new download from scratch
+        newDownloadState.enqueueRequest(
+            NodeDataRequest.createAccountDataRequest(stateRoot, Optional.of(Bytes.EMPTY)));
+      }
+
+      maybeCompleteTask = Optional.of(new CompleteTaskStep(metricsSystem, taskCollection::size));
+      final FastWorldStateDownloadProcess downloadProcess =
+          FastWorldStateDownloadProcess.builder()
+              .hashCountPerRequest(hashCountPerRequest)
+              .maxOutstandingRequests(maxOutstandingRequests)
+              .loadLocalDataStep(new LoadLocalDataStep(worldStateStorage, metricsSystem))
+              .requestDataStep(new RequestDataStep(ethContext, metricsSystem))
+              .persistDataStep(new PersistDataStep(worldStateStorage))
+              .completeTaskStep(maybeCompleteTask.get())
+              .downloadState(newDownloadState)
+              .pivotBlockHeader(header)
+              .metricsSystem(metricsSystem)
+              .build();
+
+      newDownloadState.setWorldStateDownloadProcess(downloadProcess);
+
+      return newDownloadState.startDownload(downloadProcess, ethContext.getScheduler());
+    }
+  }
+
+  @Override
+  public void cancel() {
+    synchronized (this) {
+      final FastWorldDownloadState downloadState = this.downloadState.get();
+      if (downloadState != null) {
+        downloadState.getDownloadFuture().cancel(true);
+      }
+    }
+  }
+
+  @Override
+  public Optional<Long> getPulledStates() {
+    return maybeCompleteTask.map(CompleteTaskStep::getCompletedRequests);
+  }
+
+  @Override
+  public Optional<Long> getKnownStates() {
+    return maybeCompleteTask.map(task -> task.getCompletedRequests() + task.getPendingRequests());
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/LoadLocalDataStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/LoadLocalDataStep.java
new file mode 100644
index 00000000000..f56780f5259
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/LoadLocalDataStep.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate;
+
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.services.pipeline.Pipe;
+import org.hyperledger.besu.services.tasks.Task;
+
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class LoadLocalDataStep {
+
+  private final WorldStateStorage worldStateStorage;
+  private final Counter existingNodeCounter;
+
+  public LoadLocalDataStep(
+      final WorldStateStorage worldStateStorage, final MetricsSystem metricsSystem) {
+    this.worldStateStorage = worldStateStorage;
+    existingNodeCounter =
+        metricsSystem.createCounter(
+            BesuMetricCategory.SYNCHRONIZER,
+            "world_state_existing_nodes_total",
+            "Total number of node data requests completed using existing data");
+  }
+
+  public Stream<Task<NodeDataRequest>> loadLocalData(
+      final Task<NodeDataRequest> task, final Pipe<Task<NodeDataRequest>> completedTasks) {
+    final NodeDataRequest request = task.getData();
+    final Optional<Bytes> existingData = request.getExistingData(worldStateStorage);
+    if (existingData.isPresent()) {
+      existingNodeCounter.inc();
+      request.setData(existingData.get());
+      request.setRequiresPersisting(false);
+      final WorldStateStorage.Updater updater = worldStateStorage.updater();
+      request.persist(updater);
+      updater.commit();
+
+      completedTasks.put(task);
+      return Stream.empty();
+    }
+    return Stream.of(task);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/NodeDataRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/NodeDataRequest.java
new file mode 100644
index 00000000000..2ff8429316e
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/NodeDataRequest.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldStateDownloaderException;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.services.tasks.TasksPriorityProvider;
+
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public abstract class NodeDataRequest implements TasksPriorityProvider {
+  private static final Logger LOG = LoggerFactory.getLogger(NodeDataRequest.class);
+  public static final int MAX_CHILDREN = 16;
+
+  private final RequestType requestType;
+  private final Hash hash;
+  private Bytes data;
+  private boolean requiresPersisting = true;
+  private final Optional<Bytes> location;
+  private Optional<NodeDataRequest> possibleParent = Optional.empty();
+  private final AtomicInteger pendingChildren = new AtomicInteger(0);
+  private int depth = 0;
+  private long priority;
+
+  protected NodeDataRequest(
+      final RequestType requestType, final Hash hash, final Optional<Bytes> location) {
+    this.requestType = requestType;
+    this.hash = hash;
+    this.location = location;
+  }
+
+  protected NodeDataRequest(final RequestType requestType, final Hash hash) {
+    this.requestType = requestType;
+    this.hash = hash;
+    this.location = Optional.empty();
+  }
+
+  public static AccountTrieNodeDataRequest createAccountDataRequest(
+      final Hash hash, final Optional<Bytes> location) {
+    return new AccountTrieNodeDataRequest(hash, location);
+  }
+
+  public static StorageTrieNodeDataRequest createStorageDataRequest(
+      final Hash hash, final Optional<Hash> accountHash, final Optional<Bytes> location) {
+    return new StorageTrieNodeDataRequest(hash, accountHash, location);
+  }
+
+  public static CodeNodeDataRequest createCodeRequest(
+      final Hash hash, final Optional<Hash> accountHash) {
+    return new CodeNodeDataRequest(hash, accountHash);
+  }
+
+  public static Bytes serialize(final NodeDataRequest request) {
+    return RLP.encode(request::writeTo);
+  }
+
+  public RequestType getRequestType() {
+    return requestType;
+  }
+
+  public Hash getHash() {
+    return hash;
+  }
+
+  public Bytes getData() {
+    return data;
+  }
+
+  public NodeDataRequest setData(final Bytes data) {
+    this.data = data;
+    return this;
+  }
+
+  public Optional<Bytes> getLocation() {
+    return location;
+  }
+
+  public NodeDataRequest setRequiresPersisting(final boolean requiresPersisting) {
+    this.requiresPersisting = requiresPersisting;
+    return this;
+  }
+
+  public final void persist(final WorldStateStorage.Updater updater) {
+    if (pendingChildren.get() > 0) {
+      return; // we do nothing. Our last child will eventually persist us.
+    }
+    if (requiresPersisting) {
+      checkNotNull(getData(), "Must set data before node can be persisted.");
+      doPersist(updater);
+    }
+    possibleParent.ifPresentOrElse(
+        parent -> parent.saveParent(updater), () -> LOG.warn("Missing a parent for {}", this.hash));
+  }
+
+  private void saveParent(final WorldStateStorage.Updater updater) {
+    if (pendingChildren.decrementAndGet() == 0) {
+      persist(updater);
+    }
+  }
+
+  private int incrementChildren() {
+    return pendingChildren.incrementAndGet();
+  }
+
+  protected abstract void writeTo(final RLPOutput out);
+
+  protected abstract void doPersist(final WorldStateStorage.Updater updater);
+
+  public abstract Stream<NodeDataRequest> getChildRequests(WorldStateStorage worldStateStorage);
+
+  public abstract Optional<Bytes> getExistingData(final WorldStateStorage worldStateStorage);
+
+  protected void registerParent(final NodeDataRequest parent) {
+    if (this.possibleParent.isPresent()) {
+      throw new WorldStateDownloaderException("Cannot set parent twice");
+    }
+    this.possibleParent = Optional.of(parent);
+    this.depth = parent.depth + 1;
+    this.priority = parent.priority * MAX_CHILDREN + parent.incrementChildren();
+  }
+
+  @Override
+  public long getPriority() {
+    return priority;
+  }
+
+  @Override
+  public int getDepth() {
+    return depth;
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/PersistDataStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/PersistDataStep.java
new file mode 100644
index 00000000000..94592b98d81
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/PersistDataStep.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldDownloadState;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage.Updater;
+import org.hyperledger.besu.services.tasks.Task;
+
+import java.util.List;
+
+public class PersistDataStep {
+  private final WorldStateStorage worldStateStorage;
+
+  public PersistDataStep(final WorldStateStorage worldStateStorage) {
+    this.worldStateStorage = worldStateStorage;
+  }
+
+  public List<Task<NodeDataRequest>> persist(
+      final List<Task<NodeDataRequest>> tasks,
+      final BlockHeader blockHeader,
+      final WorldDownloadState<NodeDataRequest> downloadState) {
+    final Updater updater = worldStateStorage.updater();
+    tasks.stream()
+        .map(
+            task -> {
+              enqueueChildren(task, downloadState);
+              return task;
+            })
+        .map(Task::getData)
+        .filter(request -> request.getData() != null)
+        .forEach(
+            request -> {
+              if (isRootState(blockHeader, request)) {
+                downloadState.setRootNodeData(request.getData());
+              } else {
+                request.persist(updater);
+              }
+            });
+    updater.commit();
+    return tasks;
+  }
+
+  private boolean isRootState(final BlockHeader blockHeader, final NodeDataRequest request) {
+    return request.getHash().equals(blockHeader.getStateRoot());
+  }
+
+  private void enqueueChildren(
+      final Task<NodeDataRequest> task, final WorldDownloadState<NodeDataRequest> downloadState) {
+    final NodeDataRequest request = task.getData();
+    downloadState.enqueueRequests(request.getChildRequests(worldStateStorage));
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/RequestDataStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/RequestDataStep.java
new file mode 100644
index 00000000000..e4325b967f5
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/RequestDataStep.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.exceptions.EthTaskException;
+import org.hyperledger.besu.ethereum.eth.manager.task.EthTask;
+import org.hyperledger.besu.ethereum.eth.manager.task.RetryingGetNodeDataFromPeerTask;
+import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldDownloadState;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.services.tasks.Task;
+import org.hyperledger.besu.util.ExceptionUtils;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeoutException;
+import java.util.function.BiFunction;
+import java.util.stream.Collectors;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RequestDataStep {
+  private static final Logger LOG = LoggerFactory.getLogger(RequestDataStep.class);
+  private final BiFunction<List<Hash>, Long, EthTask<Map<Hash, Bytes>>> getNodeDataTaskFactory;
+
+  public RequestDataStep(final EthContext ethContext, final MetricsSystem metricsSystem) {
+    this(
+        (hashes, pivotBlockNumber) ->
+            RetryingGetNodeDataFromPeerTask.forHashes(
+                ethContext, hashes, pivotBlockNumber, metricsSystem));
+  }
+
+  RequestDataStep(
+      final BiFunction<List<Hash>, Long, EthTask<Map<Hash, Bytes>>> getNodeDataTaskFactory) {
+    this.getNodeDataTaskFactory = getNodeDataTaskFactory;
+  }
+
+  public CompletableFuture<List<Task<NodeDataRequest>>> requestData(
+      final List<Task<NodeDataRequest>> requestTasks,
+      final BlockHeader blockHeader,
+      final WorldDownloadState<NodeDataRequest> downloadState) {
+    final List<Hash> hashes =
+        requestTasks.stream()
+            .map(Task::getData)
+            .map(NodeDataRequest::getHash)
+            .distinct()
+            .collect(Collectors.toList());
+    return sendRequest(blockHeader, hashes, downloadState)
+        .thenApply(
+            data -> {
+              for (final Task<NodeDataRequest> task : requestTasks) {
+                final NodeDataRequest request = task.getData();
+                final Bytes matchingData = data.get(request.getHash());
+                if (matchingData != null) {
+                  request.setData(matchingData);
+                }
+              }
+              return requestTasks;
+            });
+  }
+
+  private CompletableFuture<Map<Hash, Bytes>> sendRequest(
+      final BlockHeader blockHeader,
+      final List<Hash> hashes,
+      final WorldDownloadState<NodeDataRequest> downloadState) {
+    final EthTask<Map<Hash, Bytes>> task =
+        getNodeDataTaskFactory.apply(hashes, blockHeader.getNumber());
+    downloadState.addOutstandingTask(task);
+    return task.run()
+        .handle(
+            (result, error) -> {
+              downloadState.removeOutstandingTask(task);
+              if (error != null) {
+                final Throwable rootCause = ExceptionUtils.rootCause(error);
+                if (!(rootCause instanceof TimeoutException
+                    || rootCause instanceof InterruptedException
+                    || rootCause instanceof CancellationException
+                    || rootCause instanceof EthTaskException)) {
+                  LOG.debug("GetNodeDataRequest failed", error);
+                }
+                return Collections.emptyMap();
+              }
+              downloadState.requestComplete(!result.isEmpty());
+              return result;
+            });
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/RequestType.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/RequestType.java
new file mode 100644
index 00000000000..3629e0a615f
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/RequestType.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate;
+
+public enum RequestType {
+  ACCOUNT_TRIE_NODE((byte) 1),
+  STORAGE_TRIE_NODE((byte) 2),
+  CODE((byte) 3);
+
+  private final byte value;
+
+  RequestType(final byte value) {
+    this.value = value;
+  }
+
+  public byte getValue() {
+    return value;
+  }
+
+  public static RequestType fromValue(final byte value) {
+    switch (value) {
+      case (byte) 1:
+        return ACCOUNT_TRIE_NODE;
+      case (byte) 2:
+        return STORAGE_TRIE_NODE;
+      case (byte) 3:
+        return CODE;
+      default:
+        throw new IllegalArgumentException("Invalid value supplied");
+    }
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/StorageTrieNodeDataRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/StorageTrieNodeDataRequest.java
new file mode 100644
index 00000000000..a46faa06a67
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/StorageTrieNodeDataRequest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+import org.hyperledger.besu.ethereum.trie.CompactEncoding;
+import org.hyperledger.besu.ethereum.worldstate.FlatDbMode;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage.Updater;
+
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.rlp.RLP;
+
+class StorageTrieNodeDataRequest extends TrieNodeDataRequest {
+
+  final Optional<Hash> accountHash;
+
+  StorageTrieNodeDataRequest(
+      final Hash hash, final Optional<Hash> accountHash, final Optional<Bytes> location) {
+    super(RequestType.STORAGE_TRIE_NODE, hash, location);
+    this.accountHash = accountHash;
+  }
+
+  @Override
+  protected void doPersist(final Updater updater) {
+    updater.putAccountStorageTrieNode(
+        accountHash.orElse(Hash.EMPTY), getLocation().orElse(Bytes.EMPTY), getHash(), getData());
+  }
+
+  @Override
+  public Optional<Bytes> getExistingData(final WorldStateStorage worldStateStorage) {
+    return getAccountHash()
+        .flatMap(
+            accountHash ->
+                getLocation()
+                    .flatMap(
+                        location ->
+                            worldStateStorage
+                                .getAccountStorageTrieNode(accountHash, location, getHash())
+                                .filter(data -> Hash.hash(data).equals(getHash()))));
+  }
+
+  @Override
+  protected NodeDataRequest createChildNodeDataRequest(
+      final Hash childHash, final Optional<Bytes> location) {
+    return NodeDataRequest.createStorageDataRequest(childHash, getAccountHash(), location);
+  }
+
+  @Override
+  protected Stream<NodeDataRequest> getRequestsFromTrieNodeValue(
+      final WorldStateStorage worldStateStorage,
+      final Optional<Bytes> location,
+      final Bytes path,
+      final Bytes value) {
+    if (!worldStateStorage.getFlatDbMode().equals(FlatDbMode.NO_FLATTENED)) {
+      ((BonsaiWorldStateKeyValueStorage.Updater) worldStateStorage.updater())
+          .putStorageValueBySlotHash(
+              accountHash.get(),
+              getSlotHash(location, path),
+              Bytes32.leftPad(RLP.decodeValue(value)))
+          .commit();
+    }
+
+    return Stream.empty();
+  }
+
+  public Optional<Hash> getAccountHash() {
+    return accountHash;
+  }
+
+  @Override
+  protected void writeTo(final RLPOutput out) {
+    out.startList();
+    out.writeByte(getRequestType().getValue());
+    out.writeBytes(getHash());
+    getAccountHash().ifPresent(out::writeBytes);
+    getLocation().ifPresent(out::writeBytes);
+    out.endList();
+  }
+
+  private Hash getSlotHash(final Optional<Bytes> location, final Bytes path) {
+    return Hash.wrap(
+        Bytes32.wrap(
+            CompactEncoding.pathToBytes(Bytes.concatenate(location.orElse(Bytes.EMPTY), path))));
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/TrieNodeDataRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/TrieNodeDataRequest.java
new file mode 100644
index 00000000000..2761db14329
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/TrieNodeDataRequest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.trie.Node;
+import org.hyperledger.besu.ethereum.trie.patricia.TrieNodeDecoder;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+
+abstract class TrieNodeDataRequest extends NodeDataRequest {
+
+  protected TrieNodeDataRequest(
+      final RequestType requestType, final Hash hash, final Optional<Bytes> location) {
+    super(requestType, hash, location);
+  }
+
+  @Override
+  public Stream<NodeDataRequest> getChildRequests(final WorldStateStorage worldStateStorage) {
+    if (getData() == null) {
+      // If this node hasn't been downloaded yet, we can't return any child data
+      return Stream.empty();
+    }
+
+    final List<Node<Bytes>> nodes =
+        TrieNodeDecoder.decodeNodes(getLocation().orElse(Bytes.EMPTY), getData());
+    return nodes.stream()
+        .flatMap(
+            node -> {
+              if (nodeIsHashReferencedDescendant(node)) {
+                return Stream.of(
+                    createChildNodeDataRequest(Hash.wrap(node.getHash()), node.getLocation()));
+              } else {
+                return node.getValue()
+                    .map(
+                        value ->
+                            getRequestsFromTrieNodeValue(
+                                worldStateStorage, node.getLocation(), node.getPath(), value))
+                    .orElseGet(Stream::empty);
+              }
+            })
+        .peek(request -> request.registerParent(this));
+  }
+
+  private boolean nodeIsHashReferencedDescendant(final Node<Bytes> node) {
+    return !Objects.equals(node.getHash(), getHash()) && node.isReferencedByHash();
+  }
+
+  protected abstract NodeDataRequest createChildNodeDataRequest(
+      final Hash childHash, final Optional<Bytes> location);
+
+  protected abstract Stream<NodeDataRequest> getRequestsFromTrieNodeValue(
+      final WorldStateStorage worldStateStorage,
+      final Optional<Bytes> location,
+      final Bytes path,
+      final Bytes value);
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/BetterSyncTargetEvaluator.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/BetterSyncTargetEvaluator.java
index d7c8f6e9332..68aa5ec95f8 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/BetterSyncTargetEvaluator.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/BetterSyncTargetEvaluator.java
@@ -40,7 +40,7 @@ public boolean shouldSwitchSyncTarget(final EthPeer currentSyncTarget) {
     return maybeBestPeer
         .map(
             bestPeer -> {
-              if (EthPeers.BEST_CHAIN.compare(bestPeer, currentSyncTarget) <= 0) {
+              if (ethPeers.getBestChainComparator().compare(bestPeer, currentSyncTarget) <= 0) {
                 // Our current target is better or equal to the best peer
                 return false;
               }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FlexibleBlockHashTerminalCondition.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FlexibleBlockHashTerminalCondition.java
new file mode 100644
index 00000000000..d0ef7c64fcb
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FlexibleBlockHashTerminalCondition.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fullsync;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+
+public class FlexibleBlockHashTerminalCondition implements SyncTerminationCondition {
+  private Hash blockHash;
+  private final Blockchain blockchain;
+
+  public FlexibleBlockHashTerminalCondition(final Hash blockHash, final Blockchain blockchain) {
+    this.blockHash = blockHash;
+    this.blockchain = blockchain;
+  }
+
+  public synchronized void setBlockHash(final Hash blockHash) {
+    this.blockHash = blockHash;
+  }
+
+  @Override
+  public synchronized boolean getAsBoolean() {
+    return blockchain.contains(blockHash);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullImportBlockStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullImportBlockStep.java
index 1d583a85b5c..a43646d4a54 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullImportBlockStep.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullImportBlockStep.java
@@ -19,44 +19,49 @@
 import org.hyperledger.besu.ethereum.core.BlockImporter;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.sync.tasks.exceptions.InvalidBlockException;
+import org.hyperledger.besu.ethereum.mainnet.BlockImportResult;
 import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 
 import java.time.Instant;
 import java.util.function.Consumer;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class FullImportBlockStep implements Consumer<Block> {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(FullImportBlockStep.class);
   private final ProtocolSchedule protocolSchedule;
   private final ProtocolContext protocolContext;
   private final EthContext ethContext;
   private long gasAccumulator = 0;
   private long lastReportMillis = 0;
+  private final SyncTerminationCondition fullSyncTerminationCondition;
 
   public FullImportBlockStep(
       final ProtocolSchedule protocolSchedule,
       final ProtocolContext protocolContext,
-      final EthContext ethContext) {
+      final EthContext ethContext,
+      final SyncTerminationCondition syncTerminationCondition) {
     this.protocolSchedule = protocolSchedule;
     this.protocolContext = protocolContext;
     this.ethContext = ethContext;
+    this.fullSyncTerminationCondition = syncTerminationCondition;
   }
 
   @Override
   public void accept(final Block block) {
+    if (fullSyncTerminationCondition.shouldStopDownload()) {
+      LOG.debug("Not importing another block, because terminal condition was reached.");
+      return;
+    }
     final long blockNumber = block.getHeader().getNumber();
     final String blockHash = block.getHash().toHexString();
-    final String shortHash =
-        String.format(
-            "%s..%s",
-            blockHash.substring(0, 6),
-            blockHash.substring(blockHash.length() - 4, blockHash.length()));
     final BlockImporter importer =
-        protocolSchedule.getByBlockNumber(blockNumber).getBlockImporter();
-    if (!importer.importBlock(protocolContext, block, HeaderValidationMode.SKIP_DETACHED)) {
+        protocolSchedule.getByBlockHeader(block.getHeader()).getBlockImporter();
+    final BlockImportResult blockImportResult =
+        importer.importBlock(protocolContext, block, HeaderValidationMode.SKIP_DETACHED);
+    if (!blockImportResult.isImported()) {
       throw new InvalidBlockException("Failed to import block", blockNumber, block.getHash());
     }
     gasAccumulator += block.getHeader().getGasUsed();
@@ -64,7 +69,7 @@ public void accept(final Block block) {
     if (ethContext != null && ethContext.getEthPeers().peerCount() >= 0) {
       peerCount = ethContext.getEthPeers().peerCount();
     }
-    if (blockNumber % 200 == 0) {
+    if (blockNumber % 200 == 0 || LOG.isTraceEnabled()) {
       final long nowMilli = Instant.now().toEpochMilli();
       final long deltaMilli = nowMilli - lastReportMillis;
       final String mgps =
@@ -74,7 +79,7 @@ public void accept(final Block block) {
       LOG.info(
           "Import reached block {} ({}), {} Mg/s, Peers: {}",
           blockNumber,
-          shortHash,
+          blockHash,
           mgps,
           peerCount);
       lastReportMillis = nowMilli;
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloader.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloader.java
index 9ae54249a11..f4a70116269 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloader.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloader.java
@@ -32,17 +32,28 @@ public static ChainDownloader create(
       final ProtocolContext protocolContext,
       final EthContext ethContext,
       final SyncState syncState,
-      final MetricsSystem metricsSystem) {
+      final MetricsSystem metricsSystem,
+      final SyncTerminationCondition terminationCondition) {
 
     final FullSyncTargetManager syncTargetManager =
         new FullSyncTargetManager(
-            config, protocolSchedule, protocolContext, ethContext, metricsSystem);
+            config,
+            protocolSchedule,
+            protocolContext,
+            ethContext,
+            metricsSystem,
+            terminationCondition);
 
     return new PipelineChainDownloader(
         syncState,
         syncTargetManager,
         new FullSyncDownloadPipelineFactory(
-            config, protocolSchedule, protocolContext, ethContext, metricsSystem),
+            config,
+            protocolSchedule,
+            protocolContext,
+            ethContext,
+            metricsSystem,
+            terminationCondition),
         ethContext.getScheduler(),
         metricsSystem);
   }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncDownloadPipelineFactory.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncDownloadPipelineFactory.java
index 075ca19ccd0..27f50eead83 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncDownloadPipelineFactory.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncDownloadPipelineFactory.java
@@ -18,14 +18,16 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
-import org.hyperledger.besu.ethereum.eth.sync.CheckpointHeaderFetcher;
-import org.hyperledger.besu.ethereum.eth.sync.CheckpointHeaderValidationStep;
-import org.hyperledger.besu.ethereum.eth.sync.CheckpointRangeSource;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
 import org.hyperledger.besu.ethereum.eth.sync.DownloadBodiesStep;
 import org.hyperledger.besu.ethereum.eth.sync.DownloadHeadersStep;
 import org.hyperledger.besu.ethereum.eth.sync.DownloadPipelineFactory;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
 import org.hyperledger.besu.ethereum.eth.sync.ValidationPolicy;
+import org.hyperledger.besu.ethereum.eth.sync.range.RangeHeadersFetcher;
+import org.hyperledger.besu.ethereum.eth.sync.range.RangeHeadersValidationStep;
+import org.hyperledger.besu.ethereum.eth.sync.range.SyncTargetRangeSource;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncTarget;
 import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
@@ -34,9 +36,13 @@
 import org.hyperledger.besu.services.pipeline.Pipeline;
 import org.hyperledger.besu.services.pipeline.PipelineBuilder;
 
-import java.util.Optional;
+import java.util.concurrent.CompletionStage;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class FullSyncDownloadPipelineFactory implements DownloadPipelineFactory {
+  private static final Logger LOG = LoggerFactory.getLogger(FullSyncDownloadPipelineFactory.class);
 
   private final SynchronizerConfiguration syncConfig;
   private final ProtocolSchedule protocolSchedule;
@@ -46,35 +52,47 @@ public class FullSyncDownloadPipelineFactory implements DownloadPipelineFactory
   private final ValidationPolicy detachedValidationPolicy =
       () -> HeaderValidationMode.DETACHED_ONLY;
   private final BetterSyncTargetEvaluator betterSyncTargetEvaluator;
+  private final SyncTerminationCondition fullSyncTerminationCondition;
 
   public FullSyncDownloadPipelineFactory(
       final SynchronizerConfiguration syncConfig,
       final ProtocolSchedule protocolSchedule,
       final ProtocolContext protocolContext,
       final EthContext ethContext,
-      final MetricsSystem metricsSystem) {
+      final MetricsSystem metricsSystem,
+      final SyncTerminationCondition syncTerminationCondition) {
     this.syncConfig = syncConfig;
     this.protocolSchedule = protocolSchedule;
     this.protocolContext = protocolContext;
     this.ethContext = ethContext;
     this.metricsSystem = metricsSystem;
+    this.fullSyncTerminationCondition = syncTerminationCondition;
     betterSyncTargetEvaluator = new BetterSyncTargetEvaluator(syncConfig, ethContext.getEthPeers());
   }
 
+  @Override
+  public CompletionStage<Void> startPipeline(
+      final EthScheduler scheduler,
+      final SyncState syncState,
+      final SyncTarget syncTarget,
+      final Pipeline<?> pipeline) {
+    return scheduler.startPipeline(pipeline);
+  }
+
   @Override
   public Pipeline<?> createDownloadPipelineForSyncTarget(final SyncTarget target) {
     final int downloaderParallelism = syncConfig.getDownloaderParallelism();
     final int headerRequestSize = syncConfig.getDownloaderHeaderRequestSize();
     final int singleHeaderBufferSize = headerRequestSize * downloaderParallelism;
-    final CheckpointRangeSource checkpointRangeSource =
-        new CheckpointRangeSource(
-            new CheckpointHeaderFetcher(
-                syncConfig, protocolSchedule, ethContext, Optional.empty(), metricsSystem),
+    final SyncTargetRangeSource checkpointRangeSource =
+        new SyncTargetRangeSource(
+            new RangeHeadersFetcher(syncConfig, protocolSchedule, ethContext, metricsSystem),
             this::shouldContinueDownloadingFromPeer,
             ethContext.getScheduler(),
             target.peer(),
             target.commonAncestor(),
-            syncConfig.getDownloaderCheckpointTimeoutsPermitted());
+            syncConfig.getDownloaderCheckpointTimeoutsPermitted(),
+            fullSyncTerminationCondition);
     final DownloadHeadersStep downloadHeadersStep =
         new DownloadHeadersStep(
             protocolSchedule,
@@ -83,14 +101,14 @@ public Pipeline<?> createDownloadPipelineForSyncTarget(final SyncTarget target)
             detachedValidationPolicy,
             headerRequestSize,
             metricsSystem);
-    final CheckpointHeaderValidationStep validateHeadersJoinUpStep =
-        new CheckpointHeaderValidationStep(
-            protocolSchedule, protocolContext, detachedValidationPolicy);
+    final RangeHeadersValidationStep validateHeadersJoinUpStep =
+        new RangeHeadersValidationStep(protocolSchedule, protocolContext, detachedValidationPolicy);
     final DownloadBodiesStep downloadBodiesStep =
         new DownloadBodiesStep(protocolSchedule, ethContext, metricsSystem);
     final ExtractTxSignaturesStep extractTxSignaturesStep = new ExtractTxSignaturesStep();
     final FullImportBlockStep importBlockStep =
-        new FullImportBlockStep(protocolSchedule, protocolContext, ethContext);
+        new FullImportBlockStep(
+            protocolSchedule, protocolContext, ethContext, fullSyncTerminationCondition);
 
     return PipelineBuilder.createPipelineFrom(
             "fetchCheckpoints",
@@ -101,7 +119,9 @@ public Pipeline<?> createDownloadPipelineForSyncTarget(final SyncTarget target)
                 "chain_download_pipeline_processed_total",
                 "Number of entries process by each chain download pipeline stage",
                 "step",
-                "action"))
+                "action"),
+            true,
+            "fullSync")
         .thenProcessAsyncOrdered("downloadHeaders", downloadHeadersStep, downloaderParallelism)
         .thenFlatMap("validateHeadersJoin", validateHeadersJoinUpStep, singleHeaderBufferSize)
         .inBatches(headerRequestSize)
@@ -112,10 +132,19 @@ public Pipeline<?> createDownloadPipelineForSyncTarget(final SyncTarget target)
 
   private boolean shouldContinueDownloadingFromPeer(
       final EthPeer peer, final BlockHeader lastCheckpointHeader) {
+    final boolean shouldTerminate = fullSyncTerminationCondition.shouldStopDownload();
     final boolean caughtUpToPeer =
         peer.chainState().getEstimatedHeight() <= lastCheckpointHeader.getNumber();
-    return !peer.isDisconnected()
-        && !caughtUpToPeer
-        && !betterSyncTargetEvaluator.shouldSwitchSyncTarget(peer);
+    final boolean isDisconnected = peer.isDisconnected();
+    final boolean shouldSwitchSyncTarget = betterSyncTargetEvaluator.shouldSwitchSyncTarget(peer);
+    LOG.debug(
+        "shouldTerminate {}, shouldContinueDownloadingFromPeer? {}, disconnected {}, caughtUp {}, shouldSwitchSyncTarget {}",
+        shouldTerminate,
+        peer,
+        isDisconnected,
+        caughtUpToPeer,
+        shouldSwitchSyncTarget);
+
+    return !shouldTerminate && !isDisconnected && !caughtUpToPeer && !shouldSwitchSyncTarget;
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncDownloader.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncDownloader.java
index e716573ee5e..4484c194460 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncDownloader.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncDownloader.java
@@ -23,12 +23,14 @@
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import java.util.concurrent.CompletableFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class FullSyncDownloader {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(FullSyncDownloader.class);
   private final ChainDownloader chainDownloader;
   private final SynchronizerConfiguration syncConfig;
   private final ProtocolContext protocolContext;
@@ -40,19 +42,26 @@ public FullSyncDownloader(
       final ProtocolContext protocolContext,
       final EthContext ethContext,
       final SyncState syncState,
-      final MetricsSystem metricsSystem) {
+      final MetricsSystem metricsSystem,
+      final SyncTerminationCondition terminationCondition) {
     this.syncConfig = syncConfig;
     this.protocolContext = protocolContext;
     this.syncState = syncState;
 
     this.chainDownloader =
         FullSyncChainDownloader.create(
-            syncConfig, protocolSchedule, protocolContext, ethContext, syncState, metricsSystem);
+            syncConfig,
+            protocolSchedule,
+            protocolContext,
+            ethContext,
+            syncState,
+            metricsSystem,
+            terminationCondition);
   }
 
-  public void start() {
+  public CompletableFuture<Void> start() {
     LOG.info("Starting full sync.");
-    chainDownloader.start();
+    return chainDownloader.start();
   }
 
   public void stop() {
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncTargetManager.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncTargetManager.java
index 400957b0fb6..43c2cfa19c5 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncTargetManager.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncTargetManager.java
@@ -31,24 +31,27 @@
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class FullSyncTargetManager extends SyncTargetManager {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(FullSyncTargetManager.class);
   private final ProtocolContext protocolContext;
   private final EthContext ethContext;
+  private final SyncTerminationCondition terminationCondition;
 
   FullSyncTargetManager(
       final SynchronizerConfiguration config,
       final ProtocolSchedule protocolSchedule,
       final ProtocolContext protocolContext,
       final EthContext ethContext,
-      final MetricsSystem metricsSystem) {
+      final MetricsSystem metricsSystem,
+      final SyncTerminationCondition terminationCondition) {
     super(config, protocolSchedule, protocolContext, ethContext, metricsSystem);
     this.protocolContext = protocolContext;
     this.ethContext = ethContext;
+    this.terminationCondition = terminationCondition;
   }
 
   @Override
@@ -56,13 +59,14 @@ protected Optional<SyncTarget> finalizeSelectedSyncTarget(final SyncTarget syncT
     final BlockHeader commonAncestor = syncTarget.commonAncestor();
     if (protocolContext
         .getWorldStateArchive()
-        .isWorldStateAvailable(commonAncestor.getStateRoot())) {
+        .isWorldStateAvailable(commonAncestor.getStateRoot(), commonAncestor.getHash())) {
       return Optional.of(syncTarget);
     } else {
       LOG.warn(
-          "Disconnecting {} because world state is not available at common ancestor at block {}",
+          "Disconnecting {} because world state is not available at common ancestor at block {} ({})",
           syncTarget.peer(),
-          commonAncestor.getNumber());
+          commonAncestor.getNumber(),
+          commonAncestor.getHash());
       syncTarget.peer().disconnect(DisconnectReason.USELESS_PEER);
       return Optional.empty();
     }
@@ -72,18 +76,26 @@ protected Optional<SyncTarget> finalizeSelectedSyncTarget(final SyncTarget syncT
   protected CompletableFuture<Optional<EthPeer>> selectBestAvailableSyncTarget() {
     final Optional<EthPeer> maybeBestPeer = ethContext.getEthPeers().bestPeerWithHeightEstimate();
     if (!maybeBestPeer.isPresent()) {
-      LOG.info("No sync target, waiting for peers: {}", ethContext.getEthPeers().peerCount());
+      LOG.info(
+          "Unable to find sync target. Currently checking {} peers for usefulness",
+          ethContext.getEthPeers().peerCount());
       return completedFuture(Optional.empty());
     } else {
       final EthPeer bestPeer = maybeBestPeer.get();
       if (isSyncTargetReached(bestPeer)) {
         // We're caught up to our best peer, try again when a new peer connects
         LOG.debug(
-            "Caught up to best peer: {}, Peers: {}",
-            bestPeer.chainState().getEstimatedHeight(),
+            "Caught up to best peer: {}, chain state: {}. Current peers: {}",
+            bestPeer,
+            bestPeer.chainState(),
             ethContext.getEthPeers().peerCount());
         return completedFuture(Optional.empty());
       }
+      LOG.debug(
+          "Best peer: {}, chain state: {}. Current peers: {}",
+          bestPeer,
+          bestPeer.chainState(),
+          ethContext.getEthPeers().peerCount());
       return completedFuture(maybeBestPeer);
     }
   }
@@ -96,6 +108,6 @@ private boolean isSyncTargetReached(final EthPeer peer) {
 
   @Override
   public boolean shouldContinueDownloading() {
-    return true;
+    return terminationCondition.shouldContinueDownload();
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/SyncTerminationCondition.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/SyncTerminationCondition.java
new file mode 100644
index 00000000000..3a3c8aface1
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/SyncTerminationCondition.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fullsync;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+
+import java.util.function.BooleanSupplier;
+
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** return true when termination condition is fullfilled and the full sync should stop */
+public interface SyncTerminationCondition extends BooleanSupplier {
+
+  default boolean shouldContinueDownload() {
+    return !shouldStopDownload();
+  }
+
+  default boolean shouldStopDownload() {
+    return getAsBoolean();
+  }
+
+  /**
+   * When we want full sync to continue forever (for instance when we don't want to merge)
+   *
+   * @return always false therefore continues forever *
+   */
+  static SyncTerminationCondition never() {
+    return () -> false;
+  }
+
+  /**
+   * When we want full sync to finish after reaching a difficulty. For instance when we merge on
+   * total terminal difficulty.
+   *
+   * @param targetDifficulty target difficulty to reach
+   * @param blockchain blockchain to reach the difficulty on
+   * @return true when blockchain reaches difficulty
+   */
+  static SyncTerminationCondition difficulty(
+      final UInt256 targetDifficulty, final Blockchain blockchain) {
+    return difficulty(Difficulty.of(targetDifficulty), blockchain);
+  }
+
+  /**
+   * When we want full sync to finish after reaching a difficulty. For instance when we merge on
+   * total terminal difficulty.
+   *
+   * @param targetDifficulty target difficulty to reach
+   * @param blockchain blockchain to reach the difficulty on*
+   * @return true when blockchain reaches difficulty
+   */
+  static SyncTerminationCondition difficulty(
+      final Difficulty targetDifficulty, final Blockchain blockchain) {
+    return () ->
+        blockchain.getChainHead().getTotalDifficulty().greaterOrEqualThan(targetDifficulty);
+  }
+
+  /**
+   * When we want the full sync to finish on a target hash. For instance when we reach a merge
+   * checkpoint.
+   *
+   * @param blockHash target hash to look for
+   * @param blockchain blockchain to reach the difficulty on
+   * @return true when blockchain contains target hash (target hash can be changed)
+   */
+  static FlexibleBlockHashTerminalCondition blockHash(
+      final Hash blockHash, final Blockchain blockchain) {
+    return new FlexibleBlockHashTerminalCondition(blockHash, blockchain);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/range/RangeHeaders.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/range/RangeHeaders.java
new file mode 100644
index 00000000000..bff5ceeffac
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/range/RangeHeaders.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.range;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import com.google.common.base.MoreObjects;
+
+public class RangeHeaders {
+
+  private final SyncTargetRange range;
+  private final List<BlockHeader> headersToImport;
+
+  public RangeHeaders(
+      final SyncTargetRange checkpointRange, final List<BlockHeader> headersToImport) {
+    this.range = checkpointRange;
+    this.headersToImport = headersToImport;
+  }
+
+  public SyncTargetRange getRange() {
+    return range;
+  }
+
+  public List<BlockHeader> getHeadersToImport() {
+    return headersToImport;
+  }
+
+  public Optional<BlockHeader> getFirstHeaderToImport() {
+    return headersToImport.size() > 0 ? Optional.of(headersToImport.get(0)) : Optional.empty();
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    final RangeHeaders that = (RangeHeaders) o;
+    return Objects.equals(range, that.range)
+        && Objects.equals(headersToImport, that.headersToImport);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(range, headersToImport);
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("range", range)
+        .add("headersToImport", headersToImport)
+        .toString();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/range/RangeHeadersFetcher.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/range/RangeHeadersFetcher.java
new file mode 100644
index 00000000000..68e7d193b99
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/range/RangeHeadersFetcher.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.range;
+
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static java.util.concurrent.CompletableFuture.completedFuture;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult;
+import org.hyperledger.besu.ethereum.eth.manager.task.GetHeadersFromPeerByHashTask;
+import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncState;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RangeHeadersFetcher {
+  private static final Logger LOG = LoggerFactory.getLogger(RangeHeadersFetcher.class);
+
+  private final SynchronizerConfiguration syncConfig;
+  private final ProtocolSchedule protocolSchedule;
+  private final EthContext ethContext;
+  // The range we're aiming to reach at the end of this sync.
+  private final FastSyncState fastSyncState;
+  private final MetricsSystem metricsSystem;
+
+  public RangeHeadersFetcher(
+      final SynchronizerConfiguration syncConfig,
+      final ProtocolSchedule protocolSchedule,
+      final EthContext ethContext,
+      final MetricsSystem metricsSystem) {
+    this(syncConfig, protocolSchedule, ethContext, new FastSyncState(), metricsSystem);
+  }
+
+  public RangeHeadersFetcher(
+      final SynchronizerConfiguration syncConfig,
+      final ProtocolSchedule protocolSchedule,
+      final EthContext ethContext,
+      final FastSyncState fastSyncState,
+      final MetricsSystem metricsSystem) {
+    this.syncConfig = syncConfig;
+    this.protocolSchedule = protocolSchedule;
+    this.ethContext = ethContext;
+    this.fastSyncState = fastSyncState;
+    this.metricsSystem = metricsSystem;
+  }
+
+  public CompletableFuture<List<BlockHeader>> getNextRangeHeaders(
+      final EthPeer peer, final BlockHeader previousRangeHeader) {
+    final int skip = syncConfig.getDownloaderChainSegmentSize() - 1;
+    final int maximumHeaderRequestSize = syncConfig.getDownloaderHeaderRequestSize();
+    final long previousRangeNumber = previousRangeHeader.getNumber();
+
+    final int additionalHeaderCount;
+    final Optional<BlockHeader> finalRangeHeader = fastSyncState.getPivotBlockHeader();
+    if (finalRangeHeader.isPresent()) {
+      final BlockHeader targetHeader = finalRangeHeader.get();
+      final long blocksUntilTarget = targetHeader.getNumber() - previousRangeNumber;
+      if (blocksUntilTarget <= 0) {
+        return completedFuture(emptyList());
+      }
+      final long maxHeadersToRequest = blocksUntilTarget / (skip + 1);
+      additionalHeaderCount = (int) Math.min(maxHeadersToRequest, maximumHeaderRequestSize);
+      if (additionalHeaderCount == 0) {
+        return completedFuture(singletonList(targetHeader));
+      }
+    } else {
+      additionalHeaderCount = maximumHeaderRequestSize;
+    }
+
+    return requestHeaders(peer, previousRangeHeader, additionalHeaderCount, skip);
+  }
+
+  private CompletableFuture<List<BlockHeader>> requestHeaders(
+      final EthPeer peer,
+      final BlockHeader referenceHeader,
+      final int headerCount,
+      final int skip) {
+    LOG.debug(
+        "Requesting {} range headers, starting from {}, {} blocks apart",
+        headerCount,
+        referenceHeader.getNumber(),
+        skip);
+    return GetHeadersFromPeerByHashTask.startingAtHash(
+            protocolSchedule,
+            ethContext,
+            referenceHeader.getHash(),
+            referenceHeader.getNumber(),
+            // + 1 because lastHeader will be returned as well.
+            headerCount + 1,
+            skip,
+            metricsSystem)
+        .assignPeer(peer)
+        .run()
+        .thenApply(PeerTaskResult::getResult)
+        .thenApply(headers -> stripExistingRangeHeaders(referenceHeader, headers));
+  }
+
+  private List<BlockHeader> stripExistingRangeHeaders(
+      final BlockHeader lastHeader, final List<BlockHeader> headers) {
+    if (!headers.isEmpty() && headers.get(0).equals(lastHeader)) {
+      return headers.subList(1, headers.size());
+    }
+    return headers;
+  }
+
+  public boolean nextRangeEndsAtChainHead(
+      final EthPeer peer, final BlockHeader previousRangeHeader) {
+    final Optional<BlockHeader> finalRangeHeader = fastSyncState.getPivotBlockHeader();
+    if (finalRangeHeader.isPresent()) {
+      return false;
+    }
+    final int skip = syncConfig.getDownloaderChainSegmentSize() - 1;
+    final long peerEstimatedHeight = peer.chainState().getEstimatedHeight();
+    final long previousRangeNumber = previousRangeHeader.getNumber();
+    return previousRangeNumber + skip >= peerEstimatedHeight;
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/range/RangeHeadersValidationStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/range/RangeHeadersValidationStep.java
new file mode 100644
index 00000000000..80530286da4
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/range/RangeHeadersValidationStep.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.range;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.sync.ValidationPolicy;
+import org.hyperledger.besu.ethereum.eth.sync.tasks.exceptions.InvalidBlockException;
+import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+public class RangeHeadersValidationStep implements Function<RangeHeaders, Stream<BlockHeader>> {
+
+  private final ProtocolSchedule protocolSchedule;
+  private final ProtocolContext protocolContext;
+  private final ValidationPolicy validationPolicy;
+
+  public RangeHeadersValidationStep(
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final ValidationPolicy validationPolicy) {
+    this.protocolSchedule = protocolSchedule;
+    this.protocolContext = protocolContext;
+    this.validationPolicy = validationPolicy;
+  }
+
+  @Override
+  public Stream<BlockHeader> apply(final RangeHeaders rangeHeaders) {
+    final BlockHeader rangeStart = rangeHeaders.getRange().getStart();
+
+    return rangeHeaders
+        .getFirstHeaderToImport()
+        .map(
+            firstHeader -> {
+              if (isValid(rangeStart, firstHeader)) {
+                return rangeHeaders.getHeadersToImport().stream();
+              } else {
+                final String rangeEndDescription;
+                if (rangeHeaders.getRange().hasEnd()) {
+                  final BlockHeader rangeEnd = rangeHeaders.getRange().getEnd();
+                  rangeEndDescription =
+                      String.format("#%d (%s)", rangeEnd.getNumber(), rangeEnd.getBlockHash());
+                } else {
+                  rangeEndDescription = "chain head";
+                }
+                final String errorMessage =
+                    String.format(
+                        "Invalid range headers.  Headers downloaded between #%d (%s) and %s do not connect at #%d (%s)",
+                        rangeStart.getNumber(),
+                        rangeStart.getHash(),
+                        rangeEndDescription,
+                        firstHeader.getNumber(),
+                        firstHeader.getHash());
+                throw new InvalidBlockException(
+                    errorMessage, firstHeader.getNumber(), firstHeader.getHash());
+              }
+            })
+        .orElse(Stream.empty());
+  }
+
+  private boolean isValid(final BlockHeader expectedParent, final BlockHeader firstHeaderToImport) {
+    final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(firstHeaderToImport);
+    final BlockHeaderValidator validator = protocolSpec.getBlockHeaderValidator();
+    return validator.validateHeader(
+        firstHeaderToImport,
+        expectedParent,
+        protocolContext,
+        validationPolicy.getValidationModeForNextBlock());
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/range/SyncTargetRange.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/range/SyncTargetRange.java
new file mode 100644
index 00000000000..6b359934710
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/range/SyncTargetRange.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.range;
+
+import static java.lang.Math.toIntExact;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+
+import java.util.Objects;
+import java.util.Optional;
+
+import com.google.common.base.MoreObjects;
+
+public class SyncTargetRange {
+
+  private final EthPeer syncTarget;
+  private final BlockHeader start;
+  private final Optional<BlockHeader> end;
+
+  public SyncTargetRange(final EthPeer syncTarget, final BlockHeader start) {
+    this.syncTarget = syncTarget;
+    this.start = start;
+    this.end = Optional.empty();
+  }
+
+  public SyncTargetRange(final EthPeer syncTarget, final BlockHeader start, final BlockHeader end) {
+    this.syncTarget = syncTarget;
+    this.start = start;
+    this.end = Optional.of(end);
+  }
+
+  public EthPeer getSyncTarget() {
+    return syncTarget;
+  }
+
+  public BlockHeader getStart() {
+    return start;
+  }
+
+  public boolean hasEnd() {
+    return end.isPresent();
+  }
+
+  public BlockHeader getEnd() {
+    return end.get();
+  }
+
+  public int getSegmentLengthExclusive() {
+    return toIntExact(end.get().getNumber() - start.getNumber() - 1);
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    final SyncTargetRange that = (SyncTargetRange) o;
+    return Objects.equals(syncTarget, that.syncTarget)
+        && Objects.equals(start, that.start)
+        && Objects.equals(end, that.end);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(syncTarget, start, end);
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("syncTarget", syncTarget)
+        .add("start", start)
+        .add("end", end)
+        .toString();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/range/SyncTargetRangeSource.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/range/SyncTargetRangeSource.java
new file mode 100644
index 00000000000..fbeac02f406
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/range/SyncTargetRangeSource.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.range;
+
+import static java.util.Collections.emptyList;
+import static java.util.concurrent.CompletableFuture.completedFuture;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.eth.sync.fullsync.SyncTerminationCondition;
+
+import java.time.Duration;
+import java.util.ArrayDeque;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
+import java.util.Queue;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SyncTargetRangeSource implements Iterator<SyncTargetRange> {
+  private static final Logger LOG = LoggerFactory.getLogger(SyncTargetRangeSource.class);
+  private static final Duration RETRY_DELAY_DURATION = Duration.ofSeconds(2);
+
+  private final RangeHeadersFetcher fetcher;
+  private final SyncTargetChecker syncTargetChecker;
+  private final EthPeer peer;
+  private final EthScheduler ethScheduler;
+  private final int rangeTimeoutsPermitted;
+  private final Duration newHeaderWaitDuration;
+  private final SyncTerminationCondition terminationCondition;
+
+  private final Queue<SyncTargetRange> retrievedRanges = new ArrayDeque<>();
+  private BlockHeader lastRangeEnd;
+  private boolean reachedEndOfRanges = false;
+  private Optional<CompletableFuture<List<BlockHeader>>> pendingRequests = Optional.empty();
+  private int requestFailureCount = 0;
+
+  public SyncTargetRangeSource(
+      final RangeHeadersFetcher fetcher,
+      final SyncTargetChecker syncTargetChecker,
+      final EthScheduler ethScheduler,
+      final EthPeer peer,
+      final BlockHeader commonAncestor,
+      final int rangeTimeoutsPermitted,
+      final SyncTerminationCondition terminationCondition) {
+    this(
+        fetcher,
+        syncTargetChecker,
+        ethScheduler,
+        peer,
+        commonAncestor,
+        rangeTimeoutsPermitted,
+        Duration.ofSeconds(5),
+        terminationCondition);
+  }
+
+  public SyncTargetRangeSource(
+      final RangeHeadersFetcher fetcher,
+      final SyncTargetChecker syncTargetChecker,
+      final EthScheduler ethScheduler,
+      final EthPeer peer,
+      final BlockHeader commonAncestor,
+      final int rangeTimeoutsPermitted,
+      final Duration newHeaderWaitDuration,
+      final SyncTerminationCondition terminationCondition) {
+    this.fetcher = fetcher;
+    this.syncTargetChecker = syncTargetChecker;
+    this.ethScheduler = ethScheduler;
+    this.peer = peer;
+    this.lastRangeEnd = commonAncestor;
+    this.rangeTimeoutsPermitted = rangeTimeoutsPermitted;
+    this.newHeaderWaitDuration = newHeaderWaitDuration;
+    this.terminationCondition = terminationCondition;
+  }
+
+  @Override
+  public boolean hasNext() {
+    return terminationCondition.shouldContinueDownload()
+        && (!retrievedRanges.isEmpty()
+            || (requestFailureCount < rangeTimeoutsPermitted
+                && syncTargetChecker.shouldContinueDownloadingFromSyncTarget(peer, lastRangeEnd)
+                && !reachedEndOfRanges));
+  }
+
+  @Override
+  public SyncTargetRange next() {
+    if (!retrievedRanges.isEmpty()) {
+      return retrievedRanges.poll();
+    }
+    if (pendingRequests.isPresent()) {
+      return getRangeFromPendingRequest();
+    }
+    if (reachedEndOfRanges) {
+      return null;
+    }
+    if (fetcher.nextRangeEndsAtChainHead(peer, lastRangeEnd)) {
+      reachedEndOfRanges = true;
+      return new SyncTargetRange(peer, lastRangeEnd);
+    }
+    pendingRequests = Optional.of(getNextRangeHeaders());
+    return getRangeFromPendingRequest();
+  }
+
+  private CompletableFuture<List<BlockHeader>> getNextRangeHeaders() {
+    return fetcher
+        .getNextRangeHeaders(peer, lastRangeEnd)
+        .exceptionally(
+            error -> {
+              LOG.debug("Failed to retrieve range headers", error);
+              return emptyList();
+            })
+        .thenCompose(range -> range.isEmpty() ? pauseBriefly() : completedFuture(range));
+  }
+
+  /**
+   * Pause after failing to get new range to prevent requesting new range headers in a tight loop.
+   *
+   * @return a future that after the pause completes with an empty list.
+   */
+  private CompletableFuture<List<BlockHeader>> pauseBriefly() {
+    return ethScheduler.scheduleFutureTask(
+        () -> completedFuture(emptyList()), RETRY_DELAY_DURATION);
+  }
+
+  private SyncTargetRange getRangeFromPendingRequest() {
+    final CompletableFuture<List<BlockHeader>> pendingRequest = this.pendingRequests.get();
+    try {
+      final List<BlockHeader> newHeaders =
+          pendingRequest.get(newHeaderWaitDuration.toMillis(), MILLISECONDS);
+      this.pendingRequests = Optional.empty();
+      if (newHeaders.isEmpty()) {
+        requestFailureCount++;
+      } else {
+        requestFailureCount = 0;
+      }
+      for (final BlockHeader header : newHeaders) {
+        retrievedRanges.add(new SyncTargetRange(peer, lastRangeEnd, header));
+        lastRangeEnd = header;
+      }
+      return retrievedRanges.poll();
+    } catch (final InterruptedException e) {
+      LOG.trace("Interrupted while waiting for new range headers", e);
+      return null;
+    } catch (final ExecutionException e) {
+      LOG.debug("Failed to retrieve new range headers", e);
+      this.pendingRequests = Optional.empty();
+      requestFailureCount++;
+      return null;
+    } catch (final TimeoutException e) {
+      return null;
+    }
+  }
+
+  public interface SyncTargetChecker {
+    boolean shouldContinueDownloadingFromSyncTarget(EthPeer peer, BlockHeader lastRangeHeader);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/CompleteTaskStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/CompleteTaskStep.java
new file mode 100644
index 00000000000..202853ce28f
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/CompleteTaskStep.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.heal.TrieNodeHealingRequest;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.services.tasks.Task;
+
+public class CompleteTaskStep {
+  private final SnapSyncProcessState snapSyncState;
+  private final Counter completedRequestsCounter;
+  private final Counter retriedRequestsCounter;
+
+  public CompleteTaskStep(
+      final SnapSyncProcessState snapSyncState, final MetricsSystem metricsSystem) {
+    this.snapSyncState = snapSyncState;
+    completedRequestsCounter =
+        metricsSystem.createCounter(
+            BesuMetricCategory.SYNCHRONIZER,
+            "snap_world_state_completed_requests_total",
+            "Total number of node data requests completed as part of snap sync world state download");
+    retriedRequestsCounter =
+        metricsSystem.createCounter(
+            BesuMetricCategory.SYNCHRONIZER,
+            "snap_world_state_retried_requests_total",
+            "Total number of node data requests repeated as part of snap sync world state download");
+  }
+
+  public synchronized void markAsCompleteOrFailed(
+      final SnapWorldDownloadState downloadState, final Task<SnapDataRequest> task) {
+    if (task.getData().isResponseReceived()
+        || (task.getData() instanceof TrieNodeHealingRequest
+            && task.getData().isExpired(snapSyncState))) {
+      completedRequestsCounter.inc();
+      task.markCompleted();
+      downloadState.checkCompletion(snapSyncState.getPivotBlockHeader().orElseThrow());
+    } else {
+      retriedRequestsCounter.inc();
+      task.markFailed();
+    }
+    downloadState.notifyTaskAvailable();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/DynamicPivotBlockSelector.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/DynamicPivotBlockSelector.java
new file mode 100644
index 00000000000..1e3d6bb2a5e
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/DynamicPivotBlockSelector.java
@@ -0,0 +1,215 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncActions;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncState;
+
+import java.time.Duration;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.BiConsumer;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * DynamicPivotBlockSelector is responsible for dynamically selecting the pivot block for Snapsync.
+ * It uses an algorithm to find the most suitable pivot block based on the current network
+ * conditions.
+ */
+public class DynamicPivotBlockSelector {
+
+  private static final Duration DEFAULT_CHECK_INTERVAL = Duration.ofSeconds(60);
+  public static final BiConsumer<BlockHeader, Boolean> doNothingOnPivotChange = (___, __) -> {};
+
+  private static final Logger LOG = LoggerFactory.getLogger(DynamicPivotBlockSelector.class);
+
+  private final AtomicBoolean isTimeToCheckAgain = new AtomicBoolean(true);
+
+  private final EthContext ethContext;
+  private final FastSyncActions syncActions;
+
+  private final SnapSyncProcessState syncState;
+  private final int pivotBlockWindowValidity;
+  private final int pivotBlockDistanceBeforeCaching;
+
+  private Optional<BlockHeader> lastPivotBlockFound;
+
+  public DynamicPivotBlockSelector(
+      final EthContext ethContext,
+      final FastSyncActions fastSyncActions,
+      final SnapSyncProcessState fastSyncState,
+      final int pivotBlockWindowValidity,
+      final int pivotBlockDistanceBeforeCaching) {
+    this.ethContext = ethContext;
+    this.syncActions = fastSyncActions;
+    this.syncState = fastSyncState;
+    this.pivotBlockWindowValidity = pivotBlockWindowValidity;
+    this.pivotBlockDistanceBeforeCaching = pivotBlockDistanceBeforeCaching;
+    this.lastPivotBlockFound = Optional.empty();
+  }
+
+  public void check(final BiConsumer<BlockHeader, Boolean> onNewPivotBlock) {
+    if (isTimeToCheckAgain.compareAndSet(true, false)) {
+      AtomicBoolean delayNextCheck = new AtomicBoolean(false);
+
+      syncState
+          .getPivotBlockNumber()
+          .ifPresent(
+              currentPivotBlockNumber -> {
+                final long bestChainHeight = syncActions.getBestChainHeight();
+                final long distanceNextPivotBlock =
+                    bestChainHeight
+                        - lastPivotBlockFound
+                            .map(ProcessableBlockHeader::getNumber)
+                            .orElse(currentPivotBlockNumber);
+
+                final CompletableFuture<Void> searchForNewPivot;
+
+                if (distanceNextPivotBlock > pivotBlockDistanceBeforeCaching) {
+                  LOG.atDebug()
+                      .setMessage(
+                          "Searching for a new pivot: current pivot {} best chain height {} distance next pivot {} last pivot block found {}")
+                      .addArgument(currentPivotBlockNumber)
+                      .addArgument(bestChainHeight)
+                      .addArgument(distanceNextPivotBlock)
+                      .addArgument(this::logLastPivotBlockFound)
+                      .log();
+
+                  searchForNewPivot =
+                      CompletableFuture.completedFuture(FastSyncState.EMPTY_SYNC_STATE)
+                          .thenCompose(syncActions::selectPivotBlock)
+                          .thenCompose(
+                              fss -> {
+                                if (isSamePivotBlock(fss)) {
+                                  LOG.atDebug()
+                                      .setMessage(
+                                          "New pivot {} is equal to last found {}, nothing to do")
+                                      .addArgument(fss::getPivotBlockHash)
+                                      .addArgument(this::logLastPivotBlockFound)
+                                      .log();
+                                  return CompletableFuture.completedFuture(null);
+                                }
+                                return downloadNewPivotBlock(fss);
+                              })
+                          .whenComplete(
+                              (unused, throwable) -> {
+                                if (throwable != null) {
+                                  LOG.debug("Error while searching for a new pivot", throwable);
+                                }
+                              });
+                } else {
+                  searchForNewPivot = CompletableFuture.completedFuture(null);
+                }
+
+                try {
+                  searchForNewPivot
+                      .thenRun(
+                          () -> {
+                            final long distance = bestChainHeight - currentPivotBlockNumber;
+                            if (distance > pivotBlockWindowValidity) {
+                              LOG.atDebug()
+                                  .setMessage(
+                                      "Switch to new pivot: current pivot {} is distant {} from current best chain height {} last pivot block found {}")
+                                  .addArgument(currentPivotBlockNumber)
+                                  .addArgument(distance)
+                                  .addArgument(bestChainHeight)
+                                  .addArgument(this::logLastPivotBlockFound)
+                                  .log();
+                              switchToNewPivotBlock(onNewPivotBlock);
+                            }
+                            // delay next check only if we are successful
+                            delayNextCheck.set(true);
+                          })
+                      .get();
+                } catch (InterruptedException | ExecutionException e) {
+                  LOG.debug("Exception while searching for new pivot", e);
+                }
+              });
+
+      scheduleNextCheck(delayNextCheck.get());
+    }
+  }
+
+  private CompletableFuture<Void> downloadNewPivotBlock(final FastSyncState fss) {
+    return syncActions
+        .downloadPivotBlockHeader(fss)
+        .thenAccept(
+            fssWithHeader -> {
+              lastPivotBlockFound = fssWithHeader.getPivotBlockHeader();
+              LOG.atDebug()
+                  .setMessage("Found new pivot block {}")
+                  .addArgument(this::logLastPivotBlockFound)
+                  .log();
+            })
+        .orTimeout(5, TimeUnit.MINUTES);
+  }
+
+  private boolean isSamePivotBlock(final FastSyncState fss) {
+    return lastPivotBlockFound.isPresent()
+        && fss.hasPivotBlockHash()
+        && lastPivotBlockFound.get().getHash().equals(fss.getPivotBlockHash().get());
+  }
+
+  private void scheduleNextCheck(final boolean delayNextCheck) {
+    if (delayNextCheck) {
+      ethContext
+          .getScheduler()
+          .scheduleFutureTask(
+              () -> {
+                LOG.debug("Is time to check the pivot again");
+                isTimeToCheckAgain.set(true);
+              },
+              DEFAULT_CHECK_INTERVAL);
+    } else {
+      isTimeToCheckAgain.set(true);
+    }
+  }
+
+  public void switchToNewPivotBlock(final BiConsumer<BlockHeader, Boolean> onSwitchDone) {
+    lastPivotBlockFound.ifPresentOrElse(
+        blockHeader -> {
+          if (syncState.getPivotBlockHeader().filter(blockHeader::equals).isEmpty()) {
+            LOG.atDebug()
+                .setMessage("Setting new pivot block {} with state root {}")
+                .addArgument(blockHeader::toLogString)
+                .addArgument(blockHeader.getStateRoot())
+                .log();
+            syncState.setCurrentHeader(blockHeader);
+            lastPivotBlockFound = Optional.empty();
+          }
+          onSwitchDone.accept(blockHeader, true);
+        },
+        () -> onSwitchDone.accept(syncState.getPivotBlockHeader().orElseThrow(), false));
+  }
+
+  public boolean isBlockchainBehind() {
+    return syncState
+        .getPivotBlockHeader()
+        .map(pivot -> syncActions.isBlockchainBehind(pivot.getNumber()))
+        .orElse(false);
+  }
+
+  private String logLastPivotBlockFound() {
+    return lastPivotBlockFound.map(BlockHeader::toLogString).orElse("empty");
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/LoadLocalDataStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/LoadLocalDataStep.java
new file mode 100644
index 00000000000..5264eac2b50
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/LoadLocalDataStep.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.heal.TrieNodeHealingRequest;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.services.pipeline.Pipe;
+import org.hyperledger.besu.services.tasks.Task;
+
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class LoadLocalDataStep {
+
+  private final WorldStateStorage worldStateStorage;
+  private final SnapWorldDownloadState downloadState;
+  private final SnapSyncProcessState snapSyncState;
+
+  private final SnapSyncConfiguration snapSyncConfiguration;
+  private final Counter existingNodeCounter;
+
+  public LoadLocalDataStep(
+      final WorldStateStorage worldStateStorage,
+      final SnapWorldDownloadState downloadState,
+      final SnapSyncConfiguration snapSyncConfiguration,
+      final MetricsSystem metricsSystem,
+      final SnapSyncProcessState snapSyncState) {
+    this.worldStateStorage = worldStateStorage;
+    this.downloadState = downloadState;
+    this.snapSyncConfiguration = snapSyncConfiguration;
+    existingNodeCounter =
+        metricsSystem.createCounter(
+            BesuMetricCategory.SYNCHRONIZER,
+            "snap_world_state_existing_trie_nodes_total",
+            "Total number of node data requests completed using existing data");
+    this.snapSyncState = snapSyncState;
+  }
+
+  public Stream<Task<SnapDataRequest>> loadLocalDataTrieNode(
+      final Task<SnapDataRequest> task, final Pipe<Task<SnapDataRequest>> completedTasks) {
+    final TrieNodeHealingRequest request = (TrieNodeHealingRequest) task.getData();
+    // check if node is already stored in the worldstate
+    if (snapSyncState.hasPivotBlockHeader()) {
+      Optional<Bytes> existingData = request.getExistingData(downloadState, worldStateStorage);
+      if (existingData.isPresent()) {
+        existingNodeCounter.inc();
+        request.setData(existingData.get());
+        request.setRequiresPersisting(false);
+        final WorldStateStorage.Updater updater = worldStateStorage.updater();
+        request.persist(
+            worldStateStorage, updater, downloadState, snapSyncState, snapSyncConfiguration);
+        updater.commit();
+        downloadState.enqueueRequests(request.getRootStorageRequests(worldStateStorage));
+        completedTasks.put(task);
+        return Stream.empty();
+      }
+    }
+    return Stream.of(task);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/PersistDataStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/PersistDataStep.java
new file mode 100644
index 00000000000..6a39f648716
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/PersistDataStep.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.heal.TrieNodeHealingRequest;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.services.tasks.Task;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+public class PersistDataStep {
+
+  private final SnapSyncProcessState snapSyncState;
+  private final WorldStateStorage worldStateStorage;
+  private final SnapWorldDownloadState downloadState;
+
+  private final SnapSyncConfiguration snapSyncConfiguration;
+
+  public PersistDataStep(
+      final SnapSyncProcessState snapSyncState,
+      final WorldStateStorage worldStateStorage,
+      final SnapWorldDownloadState downloadState,
+      final SnapSyncConfiguration snapSyncConfiguration) {
+    this.snapSyncState = snapSyncState;
+    this.worldStateStorage = worldStateStorage;
+    this.downloadState = downloadState;
+    this.snapSyncConfiguration = snapSyncConfiguration;
+  }
+
+  public List<Task<SnapDataRequest>> persist(final List<Task<SnapDataRequest>> tasks) {
+    final WorldStateStorage.Updater updater = worldStateStorage.updater();
+    for (Task<SnapDataRequest> task : tasks) {
+      if (task.getData().isResponseReceived()) {
+        // enqueue child requests
+        final Stream<SnapDataRequest> childRequests =
+            task.getData().getChildRequests(downloadState, worldStateStorage, snapSyncState);
+        if (!(task.getData() instanceof TrieNodeHealingRequest)) {
+          enqueueChildren(childRequests);
+        } else {
+          if (!task.getData().isExpired(snapSyncState)) {
+            enqueueChildren(childRequests);
+          } else {
+            continue;
+          }
+        }
+
+        // persist nodes
+        final int persistedNodes =
+            task.getData()
+                .persist(
+                    worldStateStorage,
+                    updater,
+                    downloadState,
+                    snapSyncState,
+                    snapSyncConfiguration);
+        if (persistedNodes > 0) {
+          if (task.getData() instanceof TrieNodeHealingRequest) {
+            downloadState.getMetricsManager().notifyTrieNodesHealed(persistedNodes);
+          } else {
+            downloadState.getMetricsManager().notifyNodesGenerated(persistedNodes);
+          }
+        }
+      }
+    }
+    updater.commit();
+    return tasks;
+  }
+
+  /**
+   * This method will heal the local flat database if necessary and persist it
+   *
+   * @param tasks range to heal and/or persist
+   * @return completed tasks
+   */
+  public List<Task<SnapDataRequest>> healFlatDatabase(final List<Task<SnapDataRequest>> tasks) {
+    final BonsaiWorldStateKeyValueStorage.Updater updater =
+        (BonsaiWorldStateKeyValueStorage.Updater) worldStateStorage.updater();
+    for (Task<SnapDataRequest> task : tasks) {
+      // heal and/or persist
+      task.getData()
+          .persist(worldStateStorage, updater, downloadState, snapSyncState, snapSyncConfiguration);
+      // enqueue child requests, these will be the right part of the ranges to complete if we have
+      // not healed all the range
+      enqueueChildren(
+          task.getData().getChildRequests(downloadState, worldStateStorage, snapSyncState));
+    }
+    updater.commit();
+    return tasks;
+  }
+
+  public Task<SnapDataRequest> persist(final Task<SnapDataRequest> task) {
+    return persist(List.of(task)).get(0);
+  }
+
+  public Task<SnapDataRequest> healFlatDatabase(final Task<SnapDataRequest> task) {
+    return healFlatDatabase(List.of(task)).get(0);
+  }
+
+  private void enqueueChildren(final Stream<SnapDataRequest> childRequests) {
+    downloadState.enqueueRequests(childRequests);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/RangeManager.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/RangeManager.java
new file mode 100644
index 00000000000..83f58c10fbf
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/RangeManager.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.trie.InnerNodeDiscoveryManager;
+import org.hyperledger.besu.ethereum.trie.MerkleTrieException;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
+
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.TreeMap;
+import java.util.function.Function;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+/**
+ * This class helps to generate ranges according to several parameters (the start and the end of the
+ * range, its size)
+ */
+public class RangeManager {
+
+  public static final Hash MIN_RANGE = Hash.wrap(Bytes32.ZERO);
+  public static final Hash MAX_RANGE =
+      Hash.fromHexString("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
+
+  private RangeManager() {}
+
+  public static int getRangeCount(
+      final Bytes32 min, final Bytes32 max, final TreeMap<Bytes32, Bytes> items) {
+    if (min.equals(MIN_RANGE) && max.equals(MAX_RANGE)) {
+      return MAX_RANGE
+          .toUnsignedBigInteger()
+          .divide(items.lastKey().toUnsignedBigInteger().subtract(min.toUnsignedBigInteger()))
+          .intValue();
+    }
+    return 1;
+  }
+
+  public static Map<Bytes32, Bytes32> generateAllRanges(final int sizeRange) {
+    if (sizeRange == 1) {
+      return Map.ofEntries(Map.entry(MIN_RANGE, MAX_RANGE));
+    }
+    return generateRanges(
+        MIN_RANGE.toUnsignedBigInteger(), MAX_RANGE.toUnsignedBigInteger(), sizeRange);
+  }
+
+  /**
+   * Generate a range
+   *
+   * @param min start of the range in bytes
+   * @param max the max end of the range in bytes
+   * @param nbRange number of ranges
+   * @return the start and end of the generated range
+   */
+  public static Map<Bytes32, Bytes32> generateRanges(
+      final Bytes32 min, final Bytes32 max, final int nbRange) {
+    return generateRanges(min.toUnsignedBigInteger(), max.toUnsignedBigInteger(), nbRange);
+  }
+
+  /**
+   * Generate a range
+   *
+   * @param min start of the range
+   * @param max the max end of the range
+   * @param nbRange number of ranges
+   * @return the start and end of the generated range
+   */
+  public static Map<Bytes32, Bytes32> generateRanges(
+      final BigInteger min, final BigInteger max, final int nbRange) {
+    final BigInteger rangeSize = max.subtract(min).divide(BigInteger.valueOf(nbRange));
+    final TreeMap<Bytes32, Bytes32> ranges = new TreeMap<>();
+    if (min.compareTo(max) > 0) {
+      return ranges;
+    }
+    if (min.equals(max) || nbRange == 1) {
+      ranges.put(format(min), format(max));
+      return ranges;
+    }
+    BigInteger currentStart = min;
+    BigInteger currentEnd = min;
+    while (max.subtract(currentEnd).compareTo(rangeSize) > 0) {
+      currentEnd = currentStart.add(rangeSize);
+      ranges.put(format(currentStart), format(currentEnd));
+      currentStart = currentStart.add(rangeSize).add(BigInteger.ONE);
+    }
+    if (max.subtract(currentEnd).compareTo(BigInteger.ZERO) > 0) {
+      currentEnd = currentStart.add(max.subtract(currentEnd)).subtract(BigInteger.ONE);
+      ranges.put(format(currentStart), format(currentEnd));
+    }
+    return ranges;
+  }
+
+  /**
+   * Helps to create a new range according to the last data obtained. This happens when a peer
+   * doesn't return all of the data in a range.
+   *
+   * @param worldstateRootHash the root hash
+   * @param proofs proof received
+   * @param endKeyHash the end of the range initially wanted
+   * @param receivedKeys the last key received
+   * @return begin of the new range
+   */
+  public static Optional<Bytes32> findNewBeginElementInRange(
+      final Bytes32 worldstateRootHash,
+      final List<Bytes> proofs,
+      final TreeMap<Bytes32, Bytes> receivedKeys,
+      final Bytes32 endKeyHash) {
+    if (receivedKeys.isEmpty() || receivedKeys.lastKey().compareTo(endKeyHash) >= 0) {
+      return Optional.empty();
+    } else {
+      final Map<Bytes32, Bytes> proofsEntries = new HashMap<>();
+      for (Bytes proof : proofs) {
+        proofsEntries.put(Hash.hash(proof), proof);
+      }
+      final StoredMerklePatriciaTrie<Bytes, Bytes> storageTrie =
+          new StoredMerklePatriciaTrie<>(
+              new InnerNodeDiscoveryManager<>(
+                  (location, key) -> Optional.ofNullable(proofsEntries.get(key)),
+                  Function.identity(),
+                  Function.identity(),
+                  receivedKeys.lastKey(),
+                  endKeyHash,
+                  false),
+              worldstateRootHash);
+
+      try {
+        storageTrie.visitAll(bytesNode -> {});
+      } catch (MerkleTrieException e) {
+        return Optional.of(InnerNodeDiscoveryManager.decodePath(e.getLocation()));
+      }
+      return Optional.empty();
+    }
+  }
+
+  private static Bytes32 format(final BigInteger data) {
+    return Bytes32.leftPad(Bytes.of(data.toByteArray()).trimLeadingZeros());
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/RequestDataStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/RequestDataStep.java
new file mode 100644
index 00000000000..f78ffe3af9a
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/RequestDataStep.java
@@ -0,0 +1,298 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.snap.RetryingGetAccountRangeFromPeerTask;
+import org.hyperledger.besu.ethereum.eth.manager.snap.RetryingGetBytecodeFromPeerTask;
+import org.hyperledger.besu.ethereum.eth.manager.snap.RetryingGetStorageRangeFromPeerTask;
+import org.hyperledger.besu.ethereum.eth.manager.snap.RetryingGetTrieNodeFromPeerTask;
+import org.hyperledger.besu.ethereum.eth.manager.task.EthTask;
+import org.hyperledger.besu.ethereum.eth.messages.snap.AccountRangeMessage;
+import org.hyperledger.besu.ethereum.eth.messages.snap.StorageRangeMessage;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.AccountRangeDataRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.BytecodeRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.StorageRangeDataRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.heal.AccountFlatDatabaseHealingRangeRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.heal.StorageFlatDatabaseHealingRangeRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.heal.TrieNodeHealingRequest;
+import org.hyperledger.besu.ethereum.proof.WorldStateProofProvider;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.services.tasks.Task;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+
+import com.google.common.collect.Lists;
+import kotlin.collections.ArrayDeque;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+public class RequestDataStep {
+
+  private final WorldStateStorage worldStateStorage;
+  private final SnapSyncProcessState fastSyncState;
+  private final SnapWorldDownloadState downloadState;
+  private final SnapSyncConfiguration snapSyncConfiguration;
+  private final MetricsSystem metricsSystem;
+  private final EthContext ethContext;
+  private final WorldStateProofProvider worldStateProofProvider;
+
+  public RequestDataStep(
+      final EthContext ethContext,
+      final WorldStateStorage worldStateStorage,
+      final SnapSyncProcessState fastSyncState,
+      final SnapWorldDownloadState downloadState,
+      final SnapSyncConfiguration snapSyncConfiguration,
+      final MetricsSystem metricsSystem) {
+    this.worldStateStorage = worldStateStorage;
+    this.fastSyncState = fastSyncState;
+    this.downloadState = downloadState;
+    this.snapSyncConfiguration = snapSyncConfiguration;
+    this.metricsSystem = metricsSystem;
+    this.ethContext = ethContext;
+    this.worldStateProofProvider = new WorldStateProofProvider(worldStateStorage);
+  }
+
+  public CompletableFuture<Task<SnapDataRequest>> requestAccount(
+      final Task<SnapDataRequest> requestTask) {
+
+    final BlockHeader blockHeader = fastSyncState.getPivotBlockHeader().get();
+    final AccountRangeDataRequest accountDataRequest =
+        (AccountRangeDataRequest) requestTask.getData();
+    final EthTask<AccountRangeMessage.AccountRangeData> getAccountTask =
+        RetryingGetAccountRangeFromPeerTask.forAccountRange(
+            ethContext,
+            accountDataRequest.getStartKeyHash(),
+            accountDataRequest.getEndKeyHash(),
+            blockHeader,
+            metricsSystem);
+    downloadState.addOutstandingTask(getAccountTask);
+    return getAccountTask
+        .run()
+        .handle(
+            (response, error) -> {
+              if (response != null) {
+                downloadState.removeOutstandingTask(getAccountTask);
+                accountDataRequest.setRootHash(blockHeader.getStateRoot());
+                accountDataRequest.addResponse(
+                    worldStateProofProvider, response.accounts(), response.proofs());
+              }
+              return requestTask;
+            });
+  }
+
+  public CompletableFuture<List<Task<SnapDataRequest>>> requestStorage(
+      final List<Task<SnapDataRequest>> requestTasks) {
+    final List<Bytes32> accountHashes =
+        requestTasks.stream()
+            .map(Task::getData)
+            .map(StorageRangeDataRequest.class::cast)
+            .map(StorageRangeDataRequest::getAccountHash)
+            .collect(Collectors.toList());
+    final BlockHeader blockHeader = fastSyncState.getPivotBlockHeader().get();
+    final Bytes32 minRange =
+        requestTasks.size() == 1
+            ? ((StorageRangeDataRequest) requestTasks.get(0).getData()).getStartKeyHash()
+            : RangeManager.MIN_RANGE;
+    final Bytes32 maxRange =
+        requestTasks.size() == 1
+            ? ((StorageRangeDataRequest) requestTasks.get(0).getData()).getEndKeyHash()
+            : RangeManager.MAX_RANGE;
+    final EthTask<StorageRangeMessage.SlotRangeData> getStorageRangeTask =
+        RetryingGetStorageRangeFromPeerTask.forStorageRange(
+            ethContext, accountHashes, minRange, maxRange, blockHeader, metricsSystem);
+    downloadState.addOutstandingTask(getStorageRangeTask);
+    return getStorageRangeTask
+        .run()
+        .handle(
+            (response, error) -> {
+              if (response != null) {
+                downloadState.removeOutstandingTask(getStorageRangeTask);
+                for (int i = 0; i < response.slots().size(); i++) {
+                  final StorageRangeDataRequest request =
+                      (StorageRangeDataRequest) requestTasks.get(i).getData();
+                  request.setRootHash(blockHeader.getStateRoot());
+                  request.addResponse(
+                      downloadState,
+                      worldStateProofProvider,
+                      response.slots().get(i),
+                      i < response.slots().size() - 1 ? new ArrayDeque<>() : response.proofs());
+                }
+              }
+              return requestTasks;
+            });
+  }
+
+  public CompletableFuture<List<Task<SnapDataRequest>>> requestCode(
+      final List<Task<SnapDataRequest>> requestTasks) {
+    final List<Bytes32> codeHashes =
+        requestTasks.stream()
+            .map(Task::getData)
+            .map(BytecodeRequest.class::cast)
+            .map(BytecodeRequest::getCodeHash)
+            .distinct()
+            .collect(Collectors.toList());
+    final BlockHeader blockHeader = fastSyncState.getPivotBlockHeader().get();
+    final EthTask<Map<Bytes32, Bytes>> getByteCodeTask =
+        RetryingGetBytecodeFromPeerTask.forByteCode(
+            ethContext, codeHashes, blockHeader, metricsSystem);
+    downloadState.addOutstandingTask(getByteCodeTask);
+    return getByteCodeTask
+        .run()
+        .handle(
+            (response, error) -> {
+              if (response != null) {
+                downloadState.removeOutstandingTask(getByteCodeTask);
+                for (Task<SnapDataRequest> requestTask : requestTasks) {
+                  final BytecodeRequest request = (BytecodeRequest) requestTask.getData();
+                  request.setRootHash(blockHeader.getStateRoot());
+                  if (response.containsKey(request.getCodeHash())) {
+                    request.setCode(response.get(request.getCodeHash()));
+                  }
+                }
+              }
+              return requestTasks;
+            });
+  }
+
+  public CompletableFuture<List<Task<SnapDataRequest>>> requestTrieNodeByPath(
+      final List<Task<SnapDataRequest>> requestTasks) {
+
+    final BlockHeader blockHeader = fastSyncState.getPivotBlockHeader().get();
+    final Map<Bytes, List<Bytes>> message = new HashMap<>();
+    requestTasks.stream()
+        .map(Task::getData)
+        .map(TrieNodeHealingRequest.class::cast)
+        .map(TrieNodeHealingRequest::getTrieNodePath)
+        .forEach(
+            path -> {
+              final List<Bytes> bytes =
+                  message.computeIfAbsent(path.get(0), k -> Lists.newArrayList());
+              if (path.size() > 1) {
+                bytes.add(path.get(1));
+              }
+            });
+    final EthTask<Map<Bytes, Bytes>> getTrieNodeFromPeerTask =
+        RetryingGetTrieNodeFromPeerTask.forTrieNodes(
+            ethContext, message, blockHeader, metricsSystem);
+    downloadState.addOutstandingTask(getTrieNodeFromPeerTask);
+    return getTrieNodeFromPeerTask
+        .run()
+        .handle(
+            (response, error) -> {
+              if (response != null) {
+                downloadState.removeOutstandingTask(getTrieNodeFromPeerTask);
+                for (final Task<SnapDataRequest> task : requestTasks) {
+                  final TrieNodeHealingRequest request = (TrieNodeHealingRequest) task.getData();
+                  final Bytes matchingData = response.get(request.getPathId());
+                  if (matchingData != null) {
+                    request.setData(matchingData);
+                  }
+                }
+              }
+              return requestTasks;
+            });
+  }
+
+  /**
+   * Retrieves local accounts from the flat database and generates the necessary proof, updates the
+   * data request with the retrieved information, and returns the modified data request task.
+   *
+   * @param requestTask request data to fill
+   * @return data request with local accounts
+   */
+  public CompletableFuture<Task<SnapDataRequest>> requestLocalFlatAccounts(
+      final Task<SnapDataRequest> requestTask) {
+
+    final AccountFlatDatabaseHealingRangeRequest accountDataRequest =
+        (AccountFlatDatabaseHealingRangeRequest) requestTask.getData();
+    final BlockHeader blockHeader = fastSyncState.getPivotBlockHeader().get();
+
+    // retrieve accounts from flat database
+    final TreeMap<Bytes32, Bytes> accounts =
+        (TreeMap<Bytes32, Bytes>)
+            worldStateStorage.streamFlatAccounts(
+                accountDataRequest.getStartKeyHash(),
+                accountDataRequest.getEndKeyHash(),
+                snapSyncConfiguration.getLocalFlatAccountCountToHealPerRequest());
+    final List<Bytes> proofs = new ArrayList<>();
+    if (!accounts.isEmpty()) {
+      // generate range proof if accounts are present
+      proofs.addAll(
+          worldStateProofProvider.getAccountProofRelatedNodes(
+              blockHeader.getStateRoot(), accounts.firstKey()));
+      proofs.addAll(
+          worldStateProofProvider.getAccountProofRelatedNodes(
+              blockHeader.getStateRoot(), accounts.lastKey()));
+    }
+
+    accountDataRequest.setRootHash(blockHeader.getStateRoot());
+    accountDataRequest.addLocalData(worldStateProofProvider, accounts, new ArrayDeque<>(proofs));
+
+    return CompletableFuture.completedFuture(requestTask);
+  }
+
+  /**
+   * Retrieves local storage slots from the flat database and generates the necessary proof, updates
+   * the data request with the retrieved information, and returns the modified data request task.
+   *
+   * @param requestTask request data to fill
+   * @return data request with local slots
+   */
+  public CompletableFuture<Task<SnapDataRequest>> requestLocalFlatStorages(
+      final Task<SnapDataRequest> requestTask) {
+
+    final StorageFlatDatabaseHealingRangeRequest storageDataRequest =
+        (StorageFlatDatabaseHealingRangeRequest) requestTask.getData();
+    final BlockHeader blockHeader = fastSyncState.getPivotBlockHeader().get();
+
+    storageDataRequest.setRootHash(blockHeader.getStateRoot());
+
+    // retrieve slots from flat database
+    final TreeMap<Bytes32, Bytes> slots =
+        (TreeMap<Bytes32, Bytes>)
+            worldStateStorage.streamFlatStorages(
+                storageDataRequest.getAccountHash(),
+                storageDataRequest.getStartKeyHash(),
+                storageDataRequest.getEndKeyHash(),
+                snapSyncConfiguration.getLocalFlatStorageCountToHealPerRequest());
+    final List<Bytes> proofs = new ArrayList<>();
+    if (!slots.isEmpty()) {
+      // generate range proof if slots are present
+      proofs.addAll(
+          worldStateProofProvider.getStorageProofRelatedNodes(
+              storageDataRequest.getStorageRoot(),
+              storageDataRequest.getAccountHash(),
+              slots.firstKey()));
+      proofs.addAll(
+          worldStateProofProvider.getStorageProofRelatedNodes(
+              storageDataRequest.getStorageRoot(),
+              storageDataRequest.getAccountHash(),
+              slots.lastKey()));
+    }
+    storageDataRequest.addLocalData(worldStateProofProvider, slots, new ArrayDeque<>(proofs));
+
+    return CompletableFuture.completedFuture(requestTask);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/RequestType.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/RequestType.java
new file mode 100644
index 00000000000..6b7e932e000
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/RequestType.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+public enum RequestType {
+  ACCOUNT_RANGE((byte) 1),
+  STORAGE_RANGE((byte) 2),
+  BYTECODES((byte) 3),
+  TRIE_NODE((byte) 4);
+
+  private final byte value;
+
+  RequestType(final byte value) {
+    this.value = value;
+  }
+
+  public byte getValue() {
+    return value;
+  }
+
+  public static RequestType fromValue(final byte value) {
+    switch (value) {
+      case (byte) 1:
+        return ACCOUNT_RANGE;
+      case (byte) 2:
+        return STORAGE_RANGE;
+      case (byte) 3:
+        return BYTECODES;
+      case (byte) 4:
+        return TRIE_NODE;
+      default:
+        throw new IllegalArgumentException("Invalid value supplied");
+    }
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapDownloaderFactory.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapDownloaderFactory.java
new file mode 100644
index 00000000000..ffea38d3950
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapDownloaderFactory.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.sync.PivotBlockSelector;
+import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
+import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncActions;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncDownloader;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncState;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncStateStorage;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate.FastDownloaderFactory;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.context.SnapSyncStatePersistenceManager;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldStateDownloader;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.trie.CompactEncoding;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.services.tasks.InMemoryTasksPriorityQueues;
+
+import java.nio.file.Path;
+import java.time.Clock;
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SnapDownloaderFactory extends FastDownloaderFactory {
+
+  private static final Logger LOG = LoggerFactory.getLogger(SnapDownloaderFactory.class);
+
+  public static Optional<FastSyncDownloader<?>> createSnapDownloader(
+      final SnapSyncStatePersistenceManager snapContext,
+      final PivotBlockSelector pivotBlockSelector,
+      final SynchronizerConfiguration syncConfig,
+      final Path dataDirectory,
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final MetricsSystem metricsSystem,
+      final EthContext ethContext,
+      final WorldStateStorage worldStateStorage,
+      final SyncState syncState,
+      final Clock clock) {
+
+    final Path fastSyncDataDirectory = dataDirectory.resolve(FAST_SYNC_FOLDER);
+    final FastSyncStateStorage fastSyncStateStorage =
+        new FastSyncStateStorage(fastSyncDataDirectory);
+
+    if (SyncMode.isFullSync(syncConfig.getSyncMode())) {
+      if (fastSyncStateStorage.isFastSyncInProgress()) {
+        throw new IllegalStateException(
+            "Unable to change the sync mode when snap sync is incomplete, please restart with snap sync mode");
+      } else {
+        return Optional.empty();
+      }
+    }
+
+    ensureDirectoryExists(fastSyncDataDirectory.toFile());
+
+    final FastSyncState fastSyncState =
+        fastSyncStateStorage.loadState(ScheduleBasedBlockHeaderFunctions.create(protocolSchedule));
+    if (syncState.isResyncNeeded()) {
+      snapContext.clear();
+      syncState
+          .getAccountToRepair()
+          .ifPresent(
+              address ->
+                  snapContext.addAccountsToBeRepaired(
+                      CompactEncoding.bytesToPath(Hash.hash(address))));
+    } else if (fastSyncState.getPivotBlockHeader().isEmpty()
+        && protocolContext.getBlockchain().getChainHeadBlockNumber()
+            != BlockHeader.GENESIS_BLOCK_NUMBER) {
+      LOG.info(
+          "Snap sync was requested, but cannot be enabled because the local blockchain is not empty.");
+      return Optional.empty();
+    }
+
+    final SnapSyncProcessState snapSyncState =
+        new SnapSyncProcessState(
+            fastSyncStateStorage.loadState(
+                ScheduleBasedBlockHeaderFunctions.create(protocolSchedule)));
+
+    final InMemoryTasksPriorityQueues<SnapDataRequest> snapTaskCollection =
+        createSnapWorldStateDownloaderTaskCollection();
+    final WorldStateDownloader snapWorldStateDownloader =
+        new SnapWorldStateDownloader(
+            ethContext,
+            snapContext,
+            protocolContext,
+            worldStateStorage,
+            snapTaskCollection,
+            syncConfig.getSnapSyncConfiguration(),
+            syncConfig.getWorldStateRequestParallelism(),
+            syncConfig.getWorldStateMaxRequestsWithoutProgress(),
+            syncConfig.getWorldStateMinMillisBeforeStalling(),
+            clock,
+            metricsSystem);
+    final FastSyncDownloader<SnapDataRequest> fastSyncDownloader =
+        new SnapSyncDownloader(
+            new FastSyncActions(
+                syncConfig,
+                worldStateStorage,
+                protocolSchedule,
+                protocolContext,
+                ethContext,
+                syncState,
+                pivotBlockSelector,
+                metricsSystem),
+            worldStateStorage,
+            snapWorldStateDownloader,
+            fastSyncStateStorage,
+            snapTaskCollection,
+            fastSyncDataDirectory,
+            snapSyncState);
+    syncState.setWorldStateDownloadStatus(snapWorldStateDownloader);
+    return Optional.of(fastSyncDownloader);
+  }
+
+  protected static InMemoryTasksPriorityQueues<SnapDataRequest>
+      createSnapWorldStateDownloaderTaskCollection() {
+    return new InMemoryTasksPriorityQueues<>();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapSyncConfiguration.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapSyncConfiguration.java
new file mode 100644
index 00000000000..6358590395b
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapSyncConfiguration.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import org.immutables.value.Value;
+
+@Value.Immutable
+public class SnapSyncConfiguration {
+
+  // we use 126 and not the max value (128) to avoid sending requests that will be refused
+  public static final int DEFAULT_PIVOT_BLOCK_WINDOW_VALIDITY = 126;
+  public static final int DEFAULT_PIVOT_BLOCK_DISTANCE_BEFORE_CACHING = 60;
+
+  public static final int DEFAULT_STORAGE_COUNT_PER_REQUEST =
+      384; // The default number of storage entries to download from peers per request.
+  public static final int DEFAULT_BYTECODE_COUNT_PER_REQUEST =
+      84; // The default number of code entries to download from peers per request.
+  public static final int DEFAULT_TRIENODE_COUNT_PER_REQUEST =
+      384; // The default number of trienode entries to download from peers per request.
+
+  public static final int DEFAULT_LOCAL_FLAT_ACCOUNT_COUNT_TO_HEAL_PER_REQUEST =
+      128; // The default number of flat accounts entries to verify and heal per request.
+
+  public static final int DEFAULT_LOCAL_FLAT_STORAGE_COUNT_TO_HEAL_PER_REQUEST =
+      1024; // The default number of flat slots entries to verify and heal per request.
+
+  public static final Boolean DEFAULT_IS_FLAT_DB_HEALING_ENABLED = Boolean.FALSE;
+
+  public static SnapSyncConfiguration getDefault() {
+    return ImmutableSnapSyncConfiguration.builder().build();
+  }
+
+  @Value.Default
+  public int getPivotBlockWindowValidity() {
+    return DEFAULT_PIVOT_BLOCK_WINDOW_VALIDITY;
+  }
+
+  @Value.Default
+  public int getPivotBlockDistanceBeforeCaching() {
+    return DEFAULT_PIVOT_BLOCK_DISTANCE_BEFORE_CACHING;
+  }
+
+  @Value.Default
+  public int getStorageCountPerRequest() {
+    return DEFAULT_STORAGE_COUNT_PER_REQUEST;
+  }
+
+  @Value.Default
+  public int getBytecodeCountPerRequest() {
+    return DEFAULT_BYTECODE_COUNT_PER_REQUEST;
+  }
+
+  @Value.Default
+  public int getTrienodeCountPerRequest() {
+    return DEFAULT_TRIENODE_COUNT_PER_REQUEST;
+  }
+
+  @Value.Default
+  public int getLocalFlatAccountCountToHealPerRequest() {
+    return DEFAULT_LOCAL_FLAT_ACCOUNT_COUNT_TO_HEAL_PER_REQUEST;
+  }
+
+  @Value.Default
+  public int getLocalFlatStorageCountToHealPerRequest() {
+    return DEFAULT_LOCAL_FLAT_STORAGE_COUNT_TO_HEAL_PER_REQUEST;
+  }
+
+  @Value.Default
+  public Boolean isFlatDbHealingEnabled() {
+    return DEFAULT_IS_FLAT_DB_HEALING_ENABLED;
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapSyncDownloader.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapSyncDownloader.java
new file mode 100644
index 00000000000..ac409513156
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapSyncDownloader.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncActions;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncDownloader;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncState;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncStateStorage;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldStateDownloader;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.services.tasks.TaskCollection;
+
+import java.nio.file.Path;
+import java.util.concurrent.CompletableFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SnapSyncDownloader extends FastSyncDownloader<SnapDataRequest> {
+
+  private static final Logger LOG = LoggerFactory.getLogger(SnapSyncDownloader.class);
+
+  public SnapSyncDownloader(
+      final FastSyncActions fastSyncActions,
+      final WorldStateStorage worldStateStorage,
+      final WorldStateDownloader worldStateDownloader,
+      final FastSyncStateStorage fastSyncStateStorage,
+      final TaskCollection<SnapDataRequest> taskCollection,
+      final Path fastSyncDataDirectory,
+      final FastSyncState initialFastSyncState) {
+    super(
+        fastSyncActions,
+        worldStateStorage,
+        worldStateDownloader,
+        fastSyncStateStorage,
+        taskCollection,
+        fastSyncDataDirectory,
+        initialFastSyncState);
+  }
+
+  @Override
+  protected CompletableFuture<FastSyncState> start(final FastSyncState fastSyncState) {
+    LOG.debug("Start snap sync with initial sync state {}", fastSyncState);
+    return findPivotBlock(fastSyncState, fss -> downloadChainAndWorldState(fastSyncActions, fss));
+  }
+
+  @Override
+  protected FastSyncState storeState(final FastSyncState fastSyncState) {
+    initialFastSyncState = fastSyncState;
+    fastSyncStateStorage.storeState(fastSyncState);
+    return new SnapSyncProcessState(fastSyncState);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapSyncProcessState.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapSyncProcessState.java
new file mode 100644
index 00000000000..344631763aa
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapSyncProcessState.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import org.hyperledger.besu.ethereum.core.SealableBlockHeader;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Represents the state of the SnapSync process, including the current progress, healing status, and
+ * other relevant information.
+ */
+public class SnapSyncProcessState extends FastSyncState {
+  private static final Logger LOG = LoggerFactory.getLogger(SnapSyncProcessState.class);
+
+  private boolean isHealTrieInProgress;
+  private boolean isHealFlatDatabaseInProgress;
+  private boolean isWaitingBlockchain;
+
+  public SnapSyncProcessState(final FastSyncState fastSyncState) {
+    super(
+        fastSyncState.getPivotBlockNumber(),
+        fastSyncState.getPivotBlockHash(),
+        fastSyncState.getPivotBlockHeader());
+  }
+
+  public boolean isHealTrieInProgress() {
+    return isHealTrieInProgress;
+  }
+
+  public void setHealTrieStatus(final boolean healTrieStatus) {
+    isHealTrieInProgress = healTrieStatus;
+  }
+
+  public boolean isHealFlatDatabaseInProgress() {
+    return isHealFlatDatabaseInProgress;
+  }
+
+  public void setHealFlatDatabaseInProgress(final boolean healFlatDatabaseInProgress) {
+    isHealFlatDatabaseInProgress = healFlatDatabaseInProgress;
+  }
+
+  public boolean isWaitingBlockchain() {
+    return isWaitingBlockchain;
+  }
+
+  public void setWaitingBlockchain(final boolean waitingBlockchain) {
+    LOG.debug("Set waiting blockchain to {}", waitingBlockchain);
+    isWaitingBlockchain = waitingBlockchain;
+  }
+
+  public boolean isExpired(final SnapDataRequest request) {
+    return getPivotBlockHeader()
+        .map(SealableBlockHeader::getStateRoot)
+        .filter(hash -> hash.equals(request.getRootHash()))
+        .isEmpty();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapWorldDownloadState.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapWorldDownloadState.java
new file mode 100644
index 00000000000..3abd1b0d5ec
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapWorldDownloadState.java
@@ -0,0 +1,410 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest.createAccountFlatHealingRangeRequest;
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest.createAccountTrieNodeDataRequest;
+
+import org.hyperledger.besu.ethereum.chain.BlockAddedObserver;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.context.SnapSyncStatePersistenceManager;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.AccountRangeDataRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.BytecodeRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.StorageRangeDataRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.heal.AccountFlatDatabaseHealingRangeRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.heal.StorageFlatDatabaseHealingRangeRequest;
+import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldDownloadState;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.ethereum.worldstate.FlatDbMode;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.services.tasks.InMemoryTaskQueue;
+import org.hyperledger.besu.services.tasks.InMemoryTasksPriorityQueues;
+import org.hyperledger.besu.services.tasks.Task;
+import org.hyperledger.besu.services.tasks.TaskCollection;
+
+import java.time.Clock;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.OptionalLong;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SnapWorldDownloadState extends WorldDownloadState<SnapDataRequest> {
+
+  private static final Logger LOG = LoggerFactory.getLogger(SnapWorldDownloadState.class);
+
+  protected final InMemoryTaskQueue<SnapDataRequest> pendingAccountRequests =
+      new InMemoryTaskQueue<>();
+  protected final InMemoryTaskQueue<SnapDataRequest> pendingStorageRequests =
+      new InMemoryTaskQueue<>();
+  protected final InMemoryTaskQueue<SnapDataRequest> pendingLargeStorageRequests =
+      new InMemoryTaskQueue<>();
+  protected final InMemoryTaskQueue<SnapDataRequest> pendingCodeRequests =
+      new InMemoryTaskQueue<>();
+  protected final InMemoryTasksPriorityQueues<SnapDataRequest> pendingTrieNodeRequests =
+      new InMemoryTasksPriorityQueues<>();
+
+  protected final InMemoryTasksPriorityQueues<SnapDataRequest>
+      pendingAccountFlatDatabaseHealingRequests = new InMemoryTasksPriorityQueues<>();
+
+  protected final InMemoryTasksPriorityQueues<SnapDataRequest>
+      pendingStorageFlatDatabaseHealingRequests = new InMemoryTasksPriorityQueues<>();
+  private HashSet<Bytes> accountsToBeRepaired = new HashSet<>();
+  private DynamicPivotBlockSelector pivotBlockSelector;
+
+  private final SnapSyncStatePersistenceManager snapContext;
+  private final SnapSyncProcessState snapSyncState;
+
+  // blockchain
+  private final Blockchain blockchain;
+  private OptionalLong blockObserverId;
+
+  // metrics around the snapsync
+  private final SnapsyncMetricsManager metricsManager;
+
+  public SnapWorldDownloadState(
+      final WorldStateStorage worldStateStorage,
+      final SnapSyncStatePersistenceManager snapContext,
+      final Blockchain blockchain,
+      final SnapSyncProcessState snapSyncState,
+      final InMemoryTasksPriorityQueues<SnapDataRequest> pendingRequests,
+      final int maxRequestsWithoutProgress,
+      final long minMillisBeforeStalling,
+      final SnapsyncMetricsManager metricsManager,
+      final Clock clock) {
+    super(
+        worldStateStorage,
+        pendingRequests,
+        maxRequestsWithoutProgress,
+        minMillisBeforeStalling,
+        clock);
+    this.snapContext = snapContext;
+    this.blockchain = blockchain;
+    this.snapSyncState = snapSyncState;
+    this.metricsManager = metricsManager;
+    this.blockObserverId = OptionalLong.empty();
+    metricsManager
+        .getMetricsSystem()
+        .createLongGauge(
+            BesuMetricCategory.SYNCHRONIZER,
+            "snap_world_state_pending_account_requests_current",
+            "Number of account pending requests for snap sync world state download",
+            pendingAccountRequests::size);
+    metricsManager
+        .getMetricsSystem()
+        .createLongGauge(
+            BesuMetricCategory.SYNCHRONIZER,
+            "snap_world_state_pending_storage_requests_current",
+            "Number of storage pending requests for snap sync world state download",
+            pendingStorageRequests::size);
+    metricsManager
+        .getMetricsSystem()
+        .createLongGauge(
+            BesuMetricCategory.SYNCHRONIZER,
+            "snap_world_state_pending_big_storage_requests_current",
+            "Number of storage pending requests for snap sync world state download",
+            pendingLargeStorageRequests::size);
+    metricsManager
+        .getMetricsSystem()
+        .createLongGauge(
+            BesuMetricCategory.SYNCHRONIZER,
+            "snap_world_state_pending_code_requests_current",
+            "Number of code pending requests for snap sync world state download",
+            pendingCodeRequests::size);
+    metricsManager
+        .getMetricsSystem()
+        .createLongGauge(
+            BesuMetricCategory.SYNCHRONIZER,
+            "snap_world_state_pending_trie_node_requests_current",
+            "Number of trie node pending requests for snap sync world state download",
+            pendingTrieNodeRequests::size);
+  }
+
+  @Override
+  public synchronized void notifyTaskAvailable() {
+    notifyAll();
+  }
+
+  @Override
+  protected synchronized void markAsStalled(final int maxNodeRequestRetries) {
+    // TODO retry when mark as stalled
+  }
+
+  @Override
+  public synchronized boolean checkCompletion(final BlockHeader header) {
+
+    if (!internalFuture.isDone()
+        && pendingAccountRequests.allTasksCompleted()
+        && pendingCodeRequests.allTasksCompleted()
+        && pendingStorageRequests.allTasksCompleted()
+        && pendingLargeStorageRequests.allTasksCompleted()
+        && pendingTrieNodeRequests.allTasksCompleted()
+        && pendingAccountFlatDatabaseHealingRequests.allTasksCompleted()
+        && pendingStorageFlatDatabaseHealingRequests.allTasksCompleted()) {
+      if (!snapSyncState.isHealTrieInProgress()) {
+        startTrieHeal();
+      } else if (pivotBlockSelector.isBlockchainBehind()) {
+        LOG.info("Pausing world state download while waiting for sync to complete");
+        if (blockObserverId.isEmpty())
+          blockObserverId = OptionalLong.of(blockchain.observeBlockAdded(getBlockAddedListener()));
+        snapSyncState.setWaitingBlockchain(true);
+      } else if (!snapSyncState.isHealFlatDatabaseInProgress()
+          && worldStateStorage.getFlatDbMode().equals(FlatDbMode.FULL)) {
+        // only doing a flat db heal for bonsai
+        startFlatDatabaseHeal(header);
+      } else {
+        final WorldStateStorage.Updater updater = worldStateStorage.updater();
+        updater.saveWorldState(header.getHash(), header.getStateRoot(), rootNodeData);
+        updater.commit();
+        metricsManager.notifySnapSyncCompleted();
+        snapContext.clear();
+        internalFuture.complete(null);
+
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  @Override
+  protected synchronized void cleanupQueues() {
+    super.cleanupQueues();
+    pendingAccountRequests.clear();
+    pendingStorageRequests.clear();
+    pendingLargeStorageRequests.clear();
+    pendingCodeRequests.clear();
+    pendingTrieNodeRequests.clear();
+  }
+
+  public synchronized void startTrieHeal() {
+    snapContext.clearAccountRangeTasks();
+    snapSyncState.setHealTrieStatus(true);
+    // try to find new pivot block before healing
+    pivotBlockSelector.switchToNewPivotBlock(
+        (blockHeader, newPivotBlockFound) -> {
+          snapContext.clearAccountRangeTasks();
+          LOG.info(
+              "Running world state heal process from peers with pivot block {}",
+              blockHeader.getNumber());
+          enqueueRequest(
+              createAccountTrieNodeDataRequest(
+                  blockHeader.getStateRoot(), Bytes.EMPTY, accountsToBeRepaired));
+        });
+  }
+
+  public synchronized void reloadTrieHeal() {
+    worldStateStorage.clearFlatDatabase();
+    worldStateStorage.clearTrieLog();
+    pendingTrieNodeRequests.clear();
+    pendingCodeRequests.clear();
+    snapSyncState.setHealTrieStatus(false);
+    checkCompletion(snapSyncState.getPivotBlockHeader().orElseThrow());
+  }
+
+  public synchronized void startFlatDatabaseHeal(final BlockHeader header) {
+    LOG.info("Running flat database heal process");
+    snapSyncState.setHealFlatDatabaseInProgress(true);
+    final Map<Bytes32, Bytes32> ranges = RangeManager.generateAllRanges(16);
+    ranges.forEach(
+        (key, value) ->
+            enqueueRequest(
+                createAccountFlatHealingRangeRequest(header.getStateRoot(), key, value)));
+  }
+
+  public boolean isBonsaiStorageFormat() {
+    return worldStateStorage.getDataStorageFormat().equals(DataStorageFormat.BONSAI);
+  }
+
+  @Override
+  public synchronized void enqueueRequest(final SnapDataRequest request) {
+    if (!internalFuture.isDone()) {
+      if (request instanceof BytecodeRequest) {
+        pendingCodeRequests.add(request);
+      } else if (request instanceof StorageRangeDataRequest) {
+        if (!((StorageRangeDataRequest) request).getStartKeyHash().equals(RangeManager.MIN_RANGE)) {
+          pendingLargeStorageRequests.add(request);
+        } else {
+          pendingStorageRequests.add(request);
+        }
+      } else if (request instanceof AccountRangeDataRequest) {
+        pendingAccountRequests.add(request);
+      } else if (request instanceof AccountFlatDatabaseHealingRangeRequest) {
+        pendingAccountFlatDatabaseHealingRequests.add(request);
+      } else if (request instanceof StorageFlatDatabaseHealingRangeRequest) {
+        pendingStorageFlatDatabaseHealingRequests.add(request);
+      } else {
+        pendingTrieNodeRequests.add(request);
+      }
+      notifyAll();
+    }
+  }
+
+  public synchronized void setAccountsToBeRepaired(final HashSet<Bytes> accountsToBeRepaired) {
+    this.accountsToBeRepaired = accountsToBeRepaired;
+  }
+
+  /**
+   * Adds an account to the list of accounts to be repaired during the healing process. If the
+   * account is not already in the list, it is added to both the snap context and the internal set
+   * of accounts to be repaired.
+   *
+   * @param account The account to be added for repair.
+   */
+  public synchronized void addAccountsToBeRepaired(final Bytes account) {
+    if (!accountsToBeRepaired.contains(account)) {
+      snapContext.addAccountsToBeRepaired(account);
+      accountsToBeRepaired.add(account);
+    }
+  }
+
+  public HashSet<Bytes> getAccountsToBeRepaired() {
+    return accountsToBeRepaired;
+  }
+
+  @Override
+  public synchronized void enqueueRequests(final Stream<SnapDataRequest> requests) {
+    if (!internalFuture.isDone()) {
+      requests.forEach(this::enqueueRequest);
+    }
+  }
+
+  public synchronized Task<SnapDataRequest> dequeueRequestBlocking(
+      final List<TaskCollection<SnapDataRequest>> queueDependencies,
+      final TaskCollection<SnapDataRequest> queue,
+      final Consumer<Void> unBlocked) {
+    boolean isWaiting = false;
+    while (!internalFuture.isDone()) {
+      while (queueDependencies.stream()
+          .map(TaskCollection::allTasksCompleted)
+          .anyMatch(Predicate.isEqual(false))) {
+        try {
+          isWaiting = true;
+          wait();
+        } catch (final InterruptedException e) {
+          Thread.currentThread().interrupt();
+          return null;
+        }
+      }
+      if (isWaiting) {
+        unBlocked.accept(null);
+      }
+      isWaiting = false;
+      Task<SnapDataRequest> task = queue.remove();
+      if (task != null) {
+        return task;
+      }
+
+      try {
+        wait();
+      } catch (final InterruptedException e) {
+        Thread.currentThread().interrupt();
+        return null;
+      }
+    }
+    return null;
+  }
+
+  public synchronized Task<SnapDataRequest> dequeueAccountRequestBlocking() {
+    return dequeueRequestBlocking(
+        List.of(pendingStorageRequests, pendingLargeStorageRequests, pendingCodeRequests),
+        pendingAccountRequests,
+        unused -> snapContext.updatePersistedTasks(pendingAccountRequests.asList()));
+  }
+
+  public synchronized Task<SnapDataRequest> dequeueLargeStorageRequestBlocking() {
+    return dequeueRequestBlocking(Collections.emptyList(), pendingLargeStorageRequests, __ -> {});
+  }
+
+  public synchronized Task<SnapDataRequest> dequeueStorageRequestBlocking() {
+    return dequeueRequestBlocking(Collections.emptyList(), pendingStorageRequests, __ -> {});
+  }
+
+  public synchronized Task<SnapDataRequest> dequeueCodeRequestBlocking() {
+    return dequeueRequestBlocking(List.of(pendingStorageRequests), pendingCodeRequests, __ -> {});
+  }
+
+  public synchronized Task<SnapDataRequest> dequeueTrieNodeRequestBlocking() {
+    return dequeueRequestBlocking(
+        List.of(pendingAccountRequests, pendingStorageRequests, pendingLargeStorageRequests),
+        pendingTrieNodeRequests,
+        __ -> {});
+  }
+
+  public synchronized Task<SnapDataRequest> dequeueAccountFlatDatabaseHealingRequestBlocking() {
+    return dequeueRequestBlocking(
+        List.of(
+            pendingAccountRequests,
+            pendingStorageRequests,
+            pendingLargeStorageRequests,
+            pendingTrieNodeRequests,
+            pendingStorageFlatDatabaseHealingRequests),
+        pendingAccountFlatDatabaseHealingRequests,
+        __ -> {});
+  }
+
+  public synchronized Task<SnapDataRequest> dequeueStorageFlatDatabaseHealingRequestBlocking() {
+    return dequeueRequestBlocking(
+        List.of(
+            pendingAccountRequests,
+            pendingStorageRequests,
+            pendingLargeStorageRequests,
+            pendingTrieNodeRequests),
+        pendingStorageFlatDatabaseHealingRequests,
+        __ -> {});
+  }
+
+  public SnapsyncMetricsManager getMetricsManager() {
+    return metricsManager;
+  }
+
+  public void setPivotBlockSelector(final DynamicPivotBlockSelector pivotBlockSelector) {
+    this.pivotBlockSelector = pivotBlockSelector;
+  }
+
+  public BlockAddedObserver getBlockAddedListener() {
+    return addedBlockContext -> {
+      if (snapSyncState.isWaitingBlockchain()) {
+        // if we receive a new pivot block we can restart the heal
+        pivotBlockSelector.check(
+            (____, isNewPivotBlock) -> {
+              if (isNewPivotBlock) {
+                snapSyncState.setWaitingBlockchain(false);
+              }
+            });
+        // if we are close to the head we can also restart the heal and finish snapsync
+        if (!pivotBlockSelector.isBlockchainBehind()) {
+          snapSyncState.setWaitingBlockchain(false);
+        }
+        if (!snapSyncState.isWaitingBlockchain()) {
+          blockObserverId.ifPresent(blockchain::removeObserver);
+          blockObserverId = OptionalLong.empty();
+          reloadTrieHeal();
+        }
+      }
+    };
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapWorldStateDownloadProcess.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapWorldStateDownloadProcess.java
new file mode 100644
index 00000000000..c8afc582b72
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapWorldStateDownloadProcess.java
@@ -0,0 +1,457 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.DynamicPivotBlockSelector.doNothingOnPivotChange;
+import static org.hyperledger.besu.services.pipeline.PipelineBuilder.createPipelineFrom;
+
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.BytecodeRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.ethereum.eth.sync.worldstate.TaskQueueIterator;
+import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldStateDownloadProcess;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
+import org.hyperledger.besu.services.pipeline.Pipe;
+import org.hyperledger.besu.services.pipeline.Pipeline;
+import org.hyperledger.besu.services.pipeline.PipelineBuilder;
+import org.hyperledger.besu.services.pipeline.WritePipe;
+import org.hyperledger.besu.services.tasks.Task;
+import org.hyperledger.besu.util.ExceptionUtils;
+
+import java.util.List;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CompletableFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SnapWorldStateDownloadProcess implements WorldStateDownloadProcess {
+
+  private static final Logger LOG = LoggerFactory.getLogger(SnapWorldStateDownloadProcess.class);
+  private final Pipeline<Task<SnapDataRequest>> completionPipeline;
+  private final Pipeline<Task<SnapDataRequest>> fetchAccountPipeline;
+  private final Pipeline<Task<SnapDataRequest>> fetchStorageDataPipeline;
+  private final Pipeline<Task<SnapDataRequest>> fetchLargeStorageDataPipeline;
+  private final Pipeline<Task<SnapDataRequest>> fetchCodePipeline;
+  private final Pipeline<Task<SnapDataRequest>> trieHealingPipeline;
+
+  private final Pipeline<Task<SnapDataRequest>> flatAccountHealingPipeline;
+
+  private final Pipeline<Task<SnapDataRequest>> flatStorageHealingPipeline;
+
+  private final WritePipe<Task<SnapDataRequest>> requestsToComplete;
+
+  private SnapWorldStateDownloadProcess(
+      final Pipeline<Task<SnapDataRequest>> fetchAccountPipeline,
+      final Pipeline<Task<SnapDataRequest>> fetchStorageDataPipeline,
+      final Pipeline<Task<SnapDataRequest>> fetchLargeStorageDataPipeline,
+      final Pipeline<Task<SnapDataRequest>> fetchCodePipeline,
+      final Pipeline<Task<SnapDataRequest>> trieHealingPipeline,
+      final Pipeline<Task<SnapDataRequest>> flatAccountHealingPipeline,
+      final Pipeline<Task<SnapDataRequest>> flatStorageHealingPipeline,
+      final Pipeline<Task<SnapDataRequest>> completionPipeline,
+      final WritePipe<Task<SnapDataRequest>> requestsToComplete) {
+    this.fetchStorageDataPipeline = fetchStorageDataPipeline;
+    this.fetchAccountPipeline = fetchAccountPipeline;
+    this.fetchLargeStorageDataPipeline = fetchLargeStorageDataPipeline;
+    this.fetchCodePipeline = fetchCodePipeline;
+    this.trieHealingPipeline = trieHealingPipeline;
+    this.flatAccountHealingPipeline = flatAccountHealingPipeline;
+    this.flatStorageHealingPipeline = flatStorageHealingPipeline;
+    this.completionPipeline = completionPipeline;
+    this.requestsToComplete = requestsToComplete;
+  }
+
+  public static Builder builder() {
+    return new Builder();
+  }
+
+  @Override
+  public CompletableFuture<Void> start(final EthScheduler ethScheduler) {
+    final CompletableFuture<Void> fetchAccountFuture =
+        ethScheduler.startPipeline(fetchAccountPipeline);
+    final CompletableFuture<Void> fetchStorageFuture =
+        ethScheduler.startPipeline(fetchStorageDataPipeline);
+    final CompletableFuture<Void> fetchLargeStorageFuture =
+        ethScheduler.startPipeline(fetchLargeStorageDataPipeline);
+    final CompletableFuture<Void> fetchCodeFuture = ethScheduler.startPipeline(fetchCodePipeline);
+    final CompletableFuture<Void> trieHealingFuture =
+        ethScheduler.startPipeline(trieHealingPipeline);
+    final CompletableFuture<Void> flatAccountHealingFuture =
+        ethScheduler.startPipeline(flatAccountHealingPipeline);
+    final CompletableFuture<Void> flatStorageHealingFuture =
+        ethScheduler.startPipeline(flatStorageHealingPipeline);
+    final CompletableFuture<Void> completionFuture = ethScheduler.startPipeline(completionPipeline);
+
+    fetchAccountFuture
+        .thenCombine(fetchStorageFuture, (unused, unused2) -> null)
+        .thenCombine(fetchLargeStorageFuture, (unused, unused2) -> null)
+        .thenCombine(fetchCodeFuture, (unused, unused2) -> null)
+        .thenCombine(trieHealingFuture, (unused, unused2) -> null)
+        .thenCombine(flatAccountHealingFuture, (unused, unused2) -> null)
+        .thenCombine(flatStorageHealingFuture, (unused, unused2) -> null)
+        .whenComplete(
+            (result, error) -> {
+              if (error != null) {
+                if (!(ExceptionUtils.rootCause(error) instanceof CancellationException)) {
+                  LOG.error("Pipeline failed", error);
+                }
+                completionPipeline.abort();
+              } else {
+                // No more data to fetch, so propagate the pipe closure onto the completion pipe.
+                requestsToComplete.close();
+              }
+            });
+
+    completionFuture.exceptionally(
+        error -> {
+          if (!(ExceptionUtils.rootCause(error) instanceof CancellationException)) {
+            LOG.error("Pipeline failed", error);
+          }
+          fetchAccountPipeline.abort();
+          fetchStorageDataPipeline.abort();
+          fetchLargeStorageDataPipeline.abort();
+          fetchCodePipeline.abort();
+          trieHealingPipeline.abort();
+          flatAccountHealingPipeline.abort();
+          flatStorageHealingPipeline.abort();
+          return null;
+        });
+    return completionFuture;
+  }
+
+  @Override
+  public void abort() {
+    fetchAccountPipeline.abort();
+    fetchStorageDataPipeline.abort();
+    fetchLargeStorageDataPipeline.abort();
+    fetchCodePipeline.abort();
+    trieHealingPipeline.abort();
+    flatAccountHealingPipeline.abort();
+    flatStorageHealingPipeline.abort();
+    completionPipeline.abort();
+  }
+
+  public static class Builder {
+
+    private SnapSyncConfiguration snapSyncConfiguration;
+    private int maxOutstandingRequests;
+    private SnapWorldDownloadState downloadState;
+    private MetricsSystem metricsSystem;
+    private LoadLocalDataStep loadLocalDataStep;
+    private RequestDataStep requestDataStep;
+    private SnapSyncProcessState snapSyncState;
+    private PersistDataStep persistDataStep;
+    private CompleteTaskStep completeTaskStep;
+    private DynamicPivotBlockSelector pivotBlockManager;
+
+    public Builder configuration(final SnapSyncConfiguration snapSyncConfiguration) {
+      this.snapSyncConfiguration = snapSyncConfiguration;
+      return this;
+    }
+
+    public Builder dynamicPivotBlockSelector(
+        final DynamicPivotBlockSelector dynamicPivotBlockSelector) {
+      this.pivotBlockManager = dynamicPivotBlockSelector;
+      return this;
+    }
+
+    public Builder maxOutstandingRequests(final int maxOutstandingRequests) {
+      this.maxOutstandingRequests = maxOutstandingRequests;
+      return this;
+    }
+
+    public Builder loadLocalDataStep(final LoadLocalDataStep loadLocalDataStep) {
+      this.loadLocalDataStep = loadLocalDataStep;
+      return this;
+    }
+
+    public Builder requestDataStep(final RequestDataStep requestDataStep) {
+      this.requestDataStep = requestDataStep;
+      return this;
+    }
+
+    public Builder persistDataStep(final PersistDataStep persistDataStep) {
+      this.persistDataStep = persistDataStep;
+      return this;
+    }
+
+    public Builder completeTaskStep(final CompleteTaskStep completeTaskStep) {
+      this.completeTaskStep = completeTaskStep;
+      return this;
+    }
+
+    public Builder downloadState(final SnapWorldDownloadState downloadState) {
+      this.downloadState = downloadState;
+      return this;
+    }
+
+    public Builder fastSyncState(final SnapSyncProcessState fastSyncState) {
+      this.snapSyncState = fastSyncState;
+      return this;
+    }
+
+    public Builder metricsSystem(final MetricsSystem metricsSystem) {
+      this.metricsSystem = metricsSystem;
+      return this;
+    }
+
+    public SnapWorldStateDownloadProcess build() {
+      checkNotNull(loadLocalDataStep);
+      checkNotNull(requestDataStep);
+      checkNotNull(persistDataStep);
+      checkNotNull(completeTaskStep);
+      checkNotNull(downloadState);
+      checkNotNull(snapSyncState);
+      checkNotNull(metricsSystem);
+
+      // Room for the requests we expect to do in parallel plus some buffer but not unlimited.
+      final int bufferCapacity = snapSyncConfiguration.getTrienodeCountPerRequest() * 2;
+      final LabelledMetric<Counter> outputCounter =
+          metricsSystem.createLabelledCounter(
+              BesuMetricCategory.SYNCHRONIZER,
+              "snap_world_state_pipeline_processed_total",
+              "Number of entries processed by each world state download pipeline stage",
+              "step",
+              "action");
+
+      final Pipeline<Task<SnapDataRequest>> completionPipeline =
+          PipelineBuilder.<Task<SnapDataRequest>>createPipeline(
+                  "requestDataAvailable", bufferCapacity, outputCounter, true, "node_data_request")
+              .andFinishWith(
+                  "requestCompleteTask",
+                  task -> completeTaskStep.markAsCompleteOrFailed(downloadState, task));
+
+      final Pipe<Task<SnapDataRequest>> requestsToComplete = completionPipeline.getInputPipe();
+
+      final Pipeline<Task<SnapDataRequest>> fetchAccountDataPipeline =
+          createPipelineFrom(
+                  "dequeueAccountRequestBlocking",
+                  new TaskQueueIterator<>(
+                      downloadState, () -> downloadState.dequeueAccountRequestBlocking()),
+                  bufferCapacity,
+                  outputCounter,
+                  true,
+                  "world_state_download")
+              .thenProcess(
+                  "checkNewPivotBlock-Account",
+                  tasks -> {
+                    pivotBlockManager.check(doNothingOnPivotChange);
+                    return tasks;
+                  })
+              .thenProcessAsync(
+                  "batchDownloadAccountData",
+                  requestTask -> requestDataStep.requestAccount(requestTask),
+                  maxOutstandingRequests)
+              .thenProcess("batchPersistAccountData", task -> persistDataStep.persist(task))
+              .andFinishWith("batchAccountDataDownloaded", requestsToComplete::put);
+
+      final Pipeline<Task<SnapDataRequest>> fetchStorageDataPipeline =
+          createPipelineFrom(
+                  "dequeueStorageRequestBlocking",
+                  new TaskQueueIterator<>(
+                      downloadState, () -> downloadState.dequeueStorageRequestBlocking()),
+                  bufferCapacity,
+                  outputCounter,
+                  true,
+                  "world_state_download")
+              .inBatches(snapSyncConfiguration.getStorageCountPerRequest())
+              .thenProcess(
+                  "checkNewPivotBlock-Storage",
+                  tasks -> {
+                    pivotBlockManager.check(doNothingOnPivotChange);
+                    return tasks;
+                  })
+              .thenProcessAsyncOrdered(
+                  "batchDownloadStorageData",
+                  requestTask -> requestDataStep.requestStorage(requestTask),
+                  maxOutstandingRequests)
+              .thenProcess("batchPersistStorageData", task -> persistDataStep.persist(task))
+              .andFinishWith(
+                  "batchStorageDataDownloaded",
+                  tasks -> {
+                    tasks.forEach(requestsToComplete::put);
+                  });
+
+      final Pipeline<Task<SnapDataRequest>> fetchLargeStorageDataPipeline =
+          createPipelineFrom(
+                  "dequeueLargeStorageRequestBlocking",
+                  new TaskQueueIterator<>(
+                      downloadState, () -> downloadState.dequeueLargeStorageRequestBlocking()),
+                  bufferCapacity,
+                  outputCounter,
+                  true,
+                  "world_state_download")
+              .thenProcess(
+                  "checkNewPivotBlock-LargeStorage",
+                  tasks -> {
+                    pivotBlockManager.check(doNothingOnPivotChange);
+                    return tasks;
+                  })
+              .thenProcessAsyncOrdered(
+                  "batchDownloadLargeStorageData",
+                  requestTask -> requestDataStep.requestStorage(List.of(requestTask)),
+                  maxOutstandingRequests)
+              .thenProcess(
+                  "batchPersistLargeStorageData",
+                  task -> {
+                    persistDataStep.persist(task);
+                    return task;
+                  })
+              .andFinishWith(
+                  "batchLargeStorageDataDownloaded",
+                  tasks -> tasks.forEach(requestsToComplete::put));
+
+      final Pipeline<Task<SnapDataRequest>> fetchCodePipeline =
+          createPipelineFrom(
+                  "dequeueCodeRequestBlocking",
+                  new TaskQueueIterator<>(
+                      downloadState, () -> downloadState.dequeueCodeRequestBlocking()),
+                  bufferCapacity,
+                  outputCounter,
+                  true,
+                  "code_blocks_download_pipeline")
+              .inBatches(
+                  snapSyncConfiguration.getBytecodeCountPerRequest() * 2,
+                  tasks ->
+                      snapSyncConfiguration.getBytecodeCountPerRequest()
+                          - (int)
+                              tasks.stream()
+                                  .map(Task::getData)
+                                  .map(BytecodeRequest.class::cast)
+                                  .map(BytecodeRequest::getCodeHash)
+                                  .distinct()
+                                  .count())
+              .thenProcess(
+                  "checkNewPivotBlock-Code",
+                  tasks -> {
+                    pivotBlockManager.check(
+                        (blockHeader, newBlockFound) ->
+                            reloadHealWhenNeeded(snapSyncState, downloadState, newBlockFound));
+                    return tasks;
+                  })
+              .thenProcessAsyncOrdered(
+                  "batchDownloadCodeData",
+                  tasks -> requestDataStep.requestCode(tasks),
+                  maxOutstandingRequests)
+              .thenProcess(
+                  "batchPersistCodeData",
+                  tasks -> {
+                    persistDataStep.persist(tasks);
+                    return tasks;
+                  })
+              .andFinishWith(
+                  "batchCodeDataDownloaded", tasks -> tasks.forEach(requestsToComplete::put));
+
+      final Pipeline<Task<SnapDataRequest>> trieHealingPipeline =
+          createPipelineFrom(
+                  "requestTrieNodeDequeued",
+                  new TaskQueueIterator<>(
+                      downloadState, () -> downloadState.dequeueTrieNodeRequestBlocking()),
+                  bufferCapacity,
+                  outputCounter,
+                  true,
+                  "world_state_heal")
+              .thenFlatMapInParallel(
+                  "requestLoadLocalTrieNodeData",
+                  task -> loadLocalDataStep.loadLocalDataTrieNode(task, requestsToComplete),
+                  3,
+                  bufferCapacity)
+              .inBatches(snapSyncConfiguration.getTrienodeCountPerRequest())
+              .thenProcess(
+                  "checkNewPivotBlock-TrieNode",
+                  tasks -> {
+                    pivotBlockManager.check(
+                        (blockHeader, newBlockFound) ->
+                            reloadHealWhenNeeded(snapSyncState, downloadState, newBlockFound));
+                    return tasks;
+                  })
+              .thenProcessAsync(
+                  "batchDownloadTrieNodeData",
+                  tasks -> requestDataStep.requestTrieNodeByPath(tasks),
+                  maxOutstandingRequests)
+              .thenProcess(
+                  "batchPersistTrieNodeData",
+                  tasks -> {
+                    persistDataStep.persist(tasks);
+                    return tasks;
+                  })
+              .andFinishWith(
+                  "batchTrieNodeDataDownloaded", tasks -> tasks.forEach(requestsToComplete::put));
+
+      final Pipeline<Task<SnapDataRequest>> accountFlatDatabaseHealingPipeline =
+          createPipelineFrom(
+                  "dequeueFlatAccountRequestBlocking",
+                  new TaskQueueIterator<>(
+                      downloadState,
+                      () -> downloadState.dequeueAccountFlatDatabaseHealingRequestBlocking()),
+                  bufferCapacity,
+                  outputCounter,
+                  true,
+                  "world_state_heal")
+              .thenProcessAsync(
+                  "batchDownloadFlatAccountData",
+                  requestTask -> requestDataStep.requestLocalFlatAccounts(requestTask),
+                  maxOutstandingRequests)
+              .thenProcess(
+                  "batchHealAndPersistFlatAccountData",
+                  task -> persistDataStep.healFlatDatabase(task))
+              .andFinishWith("batchFlatAccountDataDownloaded", requestsToComplete::put);
+
+      final Pipeline<Task<SnapDataRequest>> storageFlatDatabaseHealingPipeline =
+          createPipelineFrom(
+                  "dequeueFlatStorageRequestBlocking",
+                  new TaskQueueIterator<>(
+                      downloadState,
+                      () -> downloadState.dequeueStorageFlatDatabaseHealingRequestBlocking()),
+                  bufferCapacity,
+                  outputCounter,
+                  true,
+                  "world_state_heal")
+              .thenProcessAsyncOrdered(
+                  "batchDownloadFlatStorageData",
+                  requestTask -> requestDataStep.requestLocalFlatStorages(requestTask),
+                  maxOutstandingRequests)
+              .thenProcess(
+                  "batchHealAndPersistFlatStorageData",
+                  task -> persistDataStep.healFlatDatabase(task))
+              .andFinishWith("batchFlatStorageDataDownloaded", requestsToComplete::put);
+
+      return new SnapWorldStateDownloadProcess(
+          fetchAccountDataPipeline,
+          fetchStorageDataPipeline,
+          fetchLargeStorageDataPipeline,
+          fetchCodePipeline,
+          trieHealingPipeline,
+          accountFlatDatabaseHealingPipeline,
+          storageFlatDatabaseHealingPipeline,
+          completionPipeline,
+          requestsToComplete);
+    }
+  }
+
+  private static void reloadHealWhenNeeded(
+      final SnapSyncProcessState snapSyncState,
+      final SnapWorldDownloadState downloadState,
+      final boolean newBlockFound) {
+    if (snapSyncState.isHealTrieInProgress() && newBlockFound) {
+      downloadState.reloadTrieHeal();
+    }
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapWorldStateDownloader.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapWorldStateDownloader.java
new file mode 100644
index 00000000000..ca2afbab347
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapWorldStateDownloader.java
@@ -0,0 +1,255 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapsyncMetricsManager.Step.DOWNLOAD;
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest.createAccountRangeDataRequest;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncActions;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.context.SnapSyncStatePersistenceManager;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.AccountRangeDataRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldStateDownloader;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.services.tasks.InMemoryTasksPriorityQueues;
+
+import java.time.Clock;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
+import java.util.function.IntSupplier;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SnapWorldStateDownloader implements WorldStateDownloader {
+
+  private static final Logger LOG = LoggerFactory.getLogger(SnapWorldStateDownloader.class);
+  private final long minMillisBeforeStalling;
+  private final Clock clock;
+  private final MetricsSystem metricsSystem;
+
+  private final EthContext ethContext;
+  private final SnapSyncStatePersistenceManager snapContext;
+  private final InMemoryTasksPriorityQueues<SnapDataRequest> snapTaskCollection;
+  private final SnapSyncConfiguration snapSyncConfiguration;
+  private final int maxOutstandingRequests;
+  private final int maxNodeRequestsWithoutProgress;
+  private final ProtocolContext protocolContext;
+  private final WorldStateStorage worldStateStorage;
+
+  private final AtomicReference<SnapWorldDownloadState> downloadState = new AtomicReference<>();
+
+  public SnapWorldStateDownloader(
+      final EthContext ethContext,
+      final SnapSyncStatePersistenceManager snapContext,
+      final ProtocolContext protocolContext,
+      final WorldStateStorage worldStateStorage,
+      final InMemoryTasksPriorityQueues<SnapDataRequest> snapTaskCollection,
+      final SnapSyncConfiguration snapSyncConfiguration,
+      final int maxOutstandingRequests,
+      final int maxNodeRequestsWithoutProgress,
+      final long minMillisBeforeStalling,
+      final Clock clock,
+      final MetricsSystem metricsSystem) {
+    this.ethContext = ethContext;
+    this.protocolContext = protocolContext;
+    this.worldStateStorage = worldStateStorage;
+    this.snapContext = snapContext;
+    this.snapTaskCollection = snapTaskCollection;
+    this.snapSyncConfiguration = snapSyncConfiguration;
+    this.maxOutstandingRequests = maxOutstandingRequests;
+    this.maxNodeRequestsWithoutProgress = maxNodeRequestsWithoutProgress;
+    this.minMillisBeforeStalling = minMillisBeforeStalling;
+    this.clock = clock;
+    this.metricsSystem = metricsSystem;
+
+    metricsSystem.createIntegerGauge(
+        BesuMetricCategory.SYNCHRONIZER,
+        "snap_world_state_node_requests_since_last_progress_current",
+        "Number of world state requests made since the last time new data was returned",
+        downloadStateValue(SnapWorldDownloadState::getRequestsSinceLastProgress));
+
+    metricsSystem.createIntegerGauge(
+        BesuMetricCategory.SYNCHRONIZER,
+        "snap_world_state_inflight_requests_current",
+        "Number of in progress requests for world state data",
+        downloadStateValue(SnapWorldDownloadState::getOutstandingTaskCount));
+  }
+
+  private IntSupplier downloadStateValue(final Function<SnapWorldDownloadState, Integer> getter) {
+    return () -> {
+      final SnapWorldDownloadState state = this.downloadState.get();
+      return state != null ? getter.apply(state) : 0;
+    };
+  }
+
+  @Override
+  public CompletableFuture<Void> run(
+      final FastSyncActions fastSyncActions, final FastSyncState fastSyncState) {
+    synchronized (this) {
+      final SnapWorldDownloadState oldDownloadState = this.downloadState.get();
+      if (oldDownloadState != null && oldDownloadState.isDownloading()) {
+        final CompletableFuture<Void> failed = new CompletableFuture<>();
+        failed.completeExceptionally(
+            new IllegalStateException(
+                "Cannot run an already running " + this.getClass().getSimpleName()));
+        return failed;
+      }
+
+      final SnapSyncProcessState snapSyncState = (SnapSyncProcessState) fastSyncState;
+      final BlockHeader header = fastSyncState.getPivotBlockHeader().get();
+      final Hash stateRoot = header.getStateRoot();
+      LOG.info(
+          "Downloading world state from peers for pivot block {}. State root {} pending requests {}",
+          header.toLogString(),
+          stateRoot,
+          snapTaskCollection.size());
+
+      final SnapsyncMetricsManager snapsyncMetricsManager =
+          new SnapsyncMetricsManager(metricsSystem, ethContext);
+
+      final SnapWorldDownloadState newDownloadState =
+          new SnapWorldDownloadState(
+              worldStateStorage,
+              snapContext,
+              protocolContext.getBlockchain(),
+              snapSyncState,
+              snapTaskCollection,
+              maxNodeRequestsWithoutProgress,
+              minMillisBeforeStalling,
+              snapsyncMetricsManager,
+              clock);
+
+      final Map<Bytes32, Bytes32> ranges = RangeManager.generateAllRanges(16);
+      snapsyncMetricsManager.initRange(ranges);
+
+      final List<AccountRangeDataRequest> currentAccountRange =
+          snapContext.getCurrentAccountRange();
+      final HashSet<Bytes> inconsistentAccounts = snapContext.getAccountsToBeRepaired();
+
+      if (!currentAccountRange.isEmpty()) { // continue to download worldstate ranges
+        newDownloadState.setAccountsToBeRepaired(inconsistentAccounts);
+        snapContext
+            .getCurrentAccountRange()
+            .forEach(
+                snapDataRequest -> {
+                  snapsyncMetricsManager.notifyRangeProgress(
+                      DOWNLOAD, snapDataRequest.getStartKeyHash(), snapDataRequest.getEndKeyHash());
+                  newDownloadState.enqueueRequest(snapDataRequest);
+                });
+      } else if (!snapContext.getAccountsToBeRepaired().isEmpty()) { // restart only the heal step
+        snapSyncState.setHealTrieStatus(true);
+        worldStateStorage.clearFlatDatabase();
+        worldStateStorage.clearTrieLog();
+        newDownloadState.setAccountsToBeRepaired(inconsistentAccounts);
+        newDownloadState.enqueueRequest(
+            SnapDataRequest.createAccountTrieNodeDataRequest(
+                stateRoot, Bytes.EMPTY, snapContext.getAccountsToBeRepaired()));
+      } else {
+        // start from scratch
+        worldStateStorage.clear();
+        // we have to upgrade to full flat db mode if we are in bonsai mode
+        if (worldStateStorage.getDataStorageFormat().equals(DataStorageFormat.BONSAI)
+            && snapSyncConfiguration.isFlatDbHealingEnabled()) {
+          ((BonsaiWorldStateKeyValueStorage) worldStateStorage).upgradeToFullFlatDbMode();
+        }
+        ranges.forEach(
+            (key, value) ->
+                newDownloadState.enqueueRequest(
+                    createAccountRangeDataRequest(stateRoot, key, value)));
+      }
+
+      Optional<CompleteTaskStep> maybeCompleteTask =
+          Optional.of(new CompleteTaskStep(snapSyncState, metricsSystem));
+
+      final DynamicPivotBlockSelector dynamicPivotBlockManager =
+          new DynamicPivotBlockSelector(
+              ethContext,
+              fastSyncActions,
+              snapSyncState,
+              snapSyncConfiguration.getPivotBlockWindowValidity(),
+              snapSyncConfiguration.getPivotBlockDistanceBeforeCaching());
+
+      SnapWorldStateDownloadProcess downloadProcess =
+          SnapWorldStateDownloadProcess.builder()
+              .configuration(snapSyncConfiguration)
+              .maxOutstandingRequests(maxOutstandingRequests)
+              .dynamicPivotBlockSelector(dynamicPivotBlockManager)
+              .loadLocalDataStep(
+                  new LoadLocalDataStep(
+                      worldStateStorage,
+                      newDownloadState,
+                      snapSyncConfiguration,
+                      metricsSystem,
+                      snapSyncState))
+              .requestDataStep(
+                  new RequestDataStep(
+                      ethContext,
+                      worldStateStorage,
+                      snapSyncState,
+                      newDownloadState,
+                      snapSyncConfiguration,
+                      metricsSystem))
+              .persistDataStep(
+                  new PersistDataStep(
+                      snapSyncState, worldStateStorage, newDownloadState, snapSyncConfiguration))
+              .completeTaskStep(maybeCompleteTask.get())
+              .downloadState(newDownloadState)
+              .fastSyncState(snapSyncState)
+              .metricsSystem(metricsSystem)
+              .build();
+
+      newDownloadState.setPivotBlockSelector(dynamicPivotBlockManager);
+
+      return newDownloadState.startDownload(downloadProcess, ethContext.getScheduler());
+    }
+  }
+
+  @Override
+  public void cancel() {
+    synchronized (this) {
+      final SnapWorldDownloadState downloadState = this.downloadState.get();
+      if (downloadState != null) {
+        downloadState.getDownloadFuture().cancel(true);
+      }
+    }
+  }
+
+  @Override
+  public Optional<Long> getPulledStates() {
+    return Optional.empty();
+  }
+
+  @Override
+  public Optional<Long> getKnownStates() {
+    return Optional.empty();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapsyncMetricsManager.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapsyncMetricsManager.java
new file mode 100644
index 00000000000..25af2e4262e
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapsyncMetricsManager.java
@@ -0,0 +1,245 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import static io.netty.util.internal.ObjectUtil.checkNonEmpty;
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapsyncMetricsManager.Step.HEAL_TRIE;
+
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.math.MathContext;
+import java.math.RoundingMode;
+import java.time.Duration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** Manages the metrics related to the SnapSync process. */
+public class SnapsyncMetricsManager {
+
+  private static final Logger LOG = LoggerFactory.getLogger(SnapsyncMetricsManager.class);
+  private static final long PRINT_DELAY = TimeUnit.MINUTES.toMillis(1);
+
+  private final MetricsSystem metricsSystem;
+  private final EthContext ethContext;
+
+  /** Represents the progress status of the snapsync process. */
+  private final AtomicReference<BigDecimal> percentageProgress;
+
+  /**
+   * Represents the number of accounts downloaded during the initial step of the snapsync process.
+   */
+  private final AtomicLong nbAccountsDownloaded;
+
+  /** Represents the number of slots downloaded during the initial step of the snapsync process. */
+  private final AtomicLong nbSlotsDownloaded;
+
+  /** Represents the number of code entries downloaded. */
+  private final AtomicLong nbCodes;
+
+  /**
+   * Represents the number of trie nodes generated during the initial step of the snapsync process.
+   */
+  private final AtomicLong nbTrieNodesGenerated;
+
+  /** Represents the number of flat accounts healed during the healing process. */
+  private final AtomicLong nbFlatAccountsHealed;
+
+  /** Represents the number of flat slots healed during the healing process. */
+  private final AtomicLong nbFlatSlotsHealed;
+
+  /** Represents the number of trie nodes healed during the healing process. */
+  private final AtomicLong nbTrieNodesHealed;
+
+  private long startSyncTime;
+
+  private final Map<Bytes32, BigInteger> lastRangeIndex = new HashMap<>();
+
+  private long lastNotifyTimestamp;
+
+  public SnapsyncMetricsManager(final MetricsSystem metricsSystem, final EthContext ethContext) {
+    this.metricsSystem = metricsSystem;
+    this.ethContext = ethContext;
+    percentageProgress = new AtomicReference<>(new BigDecimal(0));
+    nbAccountsDownloaded = new AtomicLong(0);
+    nbSlotsDownloaded = new AtomicLong(0);
+    nbCodes = new AtomicLong(0);
+    nbTrieNodesGenerated = new AtomicLong(0);
+    nbFlatAccountsHealed = new AtomicLong(0);
+    nbFlatSlotsHealed = new AtomicLong(0);
+    nbTrieNodesHealed = new AtomicLong(0);
+    metricsSystem.createLongGauge(
+        BesuMetricCategory.SYNCHRONIZER,
+        "snap_world_state_generated_nodes_total",
+        "Total number of data nodes generated as part of snap sync world state download",
+        nbTrieNodesGenerated::get);
+    metricsSystem.createLongGauge(
+        BesuMetricCategory.SYNCHRONIZER,
+        "snap_world_state_healed_nodes_total",
+        "Total number of data nodes healed as part of snap sync world state heal process",
+        nbTrieNodesHealed::get);
+    metricsSystem.createLongGauge(
+        BesuMetricCategory.SYNCHRONIZER,
+        "snap_world_state_accounts_total",
+        "Total number of accounts downloaded as part of snap sync world state",
+        nbAccountsDownloaded::get);
+    metricsSystem.createLongGauge(
+        BesuMetricCategory.SYNCHRONIZER,
+        "snap_world_state_slots_total",
+        "Total number of slots downloaded as part of snap sync world state",
+        nbSlotsDownloaded::get);
+    metricsSystem.createLongGauge(
+        BesuMetricCategory.SYNCHRONIZER,
+        "snap_world_state_flat_accounts_healed_total",
+        "Total number of accounts healed in the flat database as part of snap sync world state",
+        nbFlatAccountsHealed::get);
+    metricsSystem.createLongGauge(
+        BesuMetricCategory.SYNCHRONIZER,
+        "snap_world_state_flat_slots_healed_total",
+        "Total number of slots healed in the flat database as part of snap sync world state",
+        nbFlatSlotsHealed::get);
+    metricsSystem.createLongGauge(
+        BesuMetricCategory.SYNCHRONIZER,
+        "snap_world_state_codes_total",
+        "Total number of codes downloaded as part of snap sync world state",
+        nbCodes::get);
+  }
+
+  public void initRange(final Map<Bytes32, Bytes32> ranges) {
+    for (Map.Entry<Bytes32, Bytes32> entry : ranges.entrySet()) {
+      this.lastRangeIndex.put(entry.getValue(), entry.getKey().toUnsignedBigInteger());
+    }
+    this.startSyncTime = System.currentTimeMillis();
+    this.lastNotifyTimestamp = startSyncTime;
+  }
+
+  public void notifyRangeProgress(
+      final Step step, final Bytes32 startKeyHash, final Bytes32 endKeyHash) {
+    checkNonEmpty(lastRangeIndex, "snapsync range collection");
+    if (lastRangeIndex.containsKey(endKeyHash)) {
+      final BigInteger lastPos = lastRangeIndex.get(endKeyHash);
+      final BigInteger newPos = startKeyHash.toUnsignedBigInteger();
+      percentageProgress.getAndAccumulate(
+          BigDecimal.valueOf(100)
+              .multiply(new BigDecimal(newPos.subtract(lastPos)))
+              .divide(
+                  new BigDecimal(RangeManager.MAX_RANGE.toUnsignedBigInteger()),
+                  MathContext.DECIMAL32),
+          BigDecimal::add);
+      lastRangeIndex.put(endKeyHash, newPos);
+      print(step);
+    }
+  }
+
+  public void notifyAccountsDownloaded(final long nbAccounts) {
+    this.nbAccountsDownloaded.getAndAdd(nbAccounts);
+  }
+
+  public void notifySlotsDownloaded(final long nbSlots) {
+    this.nbSlotsDownloaded.getAndAdd(nbSlots);
+  }
+
+  public void notifyCodeDownloaded() {
+    this.nbCodes.getAndIncrement();
+  }
+
+  public void notifyNodesGenerated(final long nbNodes) {
+    this.nbTrieNodesGenerated.getAndAdd(nbNodes);
+  }
+
+  public void notifyTrieNodesHealed(final long nbNodes) {
+    this.nbTrieNodesHealed.getAndAdd(nbNodes);
+    print(HEAL_TRIE);
+  }
+
+  private void print(final Step step) {
+    final long now = System.currentTimeMillis();
+    if (now - lastNotifyTimestamp >= PRINT_DELAY) {
+      lastNotifyTimestamp = now;
+      int peerCount = -1; // ethContext is not available in tests
+      if (ethContext != null && ethContext.getEthPeers().peerCount() >= 0) {
+        peerCount = ethContext.getEthPeers().peerCount();
+      }
+      switch (step) {
+        case DOWNLOAD -> {
+          LOG.debug(
+              "Worldstate {} in progress accounts={}, slots={}, codes={}, nodes={}",
+              step.message,
+              nbAccountsDownloaded,
+              nbSlotsDownloaded,
+              nbCodes,
+              nbTrieNodesGenerated);
+          LOG.info(
+              "Worldstate {} progress: {}%, Peer count: {}",
+              step.message, percentageProgress.get().setScale(2, RoundingMode.HALF_UP), peerCount);
+        }
+        case HEAL_FLAT -> {
+          LOG.debug(
+              "Worldstate {} in progress accounts={}, slots={}",
+              step.message,
+              nbFlatAccountsHealed,
+              nbFlatSlotsHealed);
+          LOG.info(
+              "Worldstate {} progress: {}%, Peer count: {}",
+              step.message, percentageProgress.get().setScale(2, RoundingMode.HALF_UP), peerCount);
+        }
+        case HEAL_TRIE -> {
+          LOG.info(
+              "Healed {} world state trie nodes, Peer count: {}",
+              nbTrieNodesHealed.get(),
+              peerCount);
+        }
+      }
+    }
+  }
+
+  public void notifySnapSyncCompleted() {
+    final Duration duration = Duration.ofMillis(System.currentTimeMillis() - startSyncTime);
+    LOG.info(
+        "Finished worldstate snapsync with nodes {} (healed={}) duration {}{}:{},{}.",
+        nbTrieNodesGenerated.addAndGet(nbTrieNodesHealed.get()),
+        nbTrieNodesHealed,
+        duration.toHoursPart() > 0 ? (duration.toHoursPart() + ":") : "",
+        duration.toMinutesPart(),
+        duration.toSecondsPart(),
+        duration.toMillisPart());
+  }
+
+  public MetricsSystem getMetricsSystem() {
+    return metricsSystem;
+  }
+
+  public enum Step {
+    DOWNLOAD("download"),
+    HEAL_TRIE("trie node healing"),
+    HEAL_FLAT("flat database healing");
+
+    final String message;
+
+    Step(final String message) {
+      this.message = message;
+    }
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/StackTrie.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/StackTrie.java
new file mode 100644
index 00000000000..fd6acde3754
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/StackTrie.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.trie.CommitVisitor;
+import org.hyperledger.besu.ethereum.trie.InnerNodeDiscoveryManager;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.Node;
+import org.hyperledger.besu.ethereum.trie.NodeUpdater;
+import org.hyperledger.besu.ethereum.trie.SnapPutVisitor;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.TreeMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Function;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.immutables.value.Value;
+
+/**
+ * StackTrie represents a stack-based Merkle Patricia Trie used in the context of snapsync
+ * synchronization. It allows adding elements, retrieving elements, and committing the trie changes
+ * to a node updater and flat database updater. The trie operates on a stack of segments and commits
+ * the changes once the number of segments reaches a threshold. It utilizes proofs and keys to build
+ * and update the trie structure.
+ */
+public class StackTrie {
+
+  private final Bytes32 rootHash;
+  private final AtomicInteger nbSegments;
+  private final int maxSegments;
+  private final Bytes32 startKeyHash;
+  private final Map<Bytes32, TaskElement> elements;
+  private final AtomicLong elementsCount;
+
+  public StackTrie(final Hash rootHash, final Bytes32 startKeyHash) {
+    this(rootHash, 1, 1, startKeyHash);
+  }
+
+  public StackTrie(
+      final Hash rootHash,
+      final int nbSegments,
+      final int maxSegments,
+      final Bytes32 startKeyHash) {
+    this.rootHash = rootHash;
+    this.nbSegments = new AtomicInteger(nbSegments);
+    this.maxSegments = maxSegments;
+    this.startKeyHash = startKeyHash;
+    this.elements = new LinkedHashMap<>();
+    this.elementsCount = new AtomicLong();
+  }
+
+  public void addElement(
+      final Bytes32 taskIdentifier, final List<Bytes> proofs, final TreeMap<Bytes32, Bytes> keys) {
+    this.elementsCount.addAndGet(keys.size());
+    this.elements.put(
+        taskIdentifier, ImmutableTaskElement.builder().proofs(proofs).keys(keys).build());
+  }
+
+  public TaskElement getElement(final Bytes32 taskIdentifier) {
+    return this.elements.get(taskIdentifier);
+  }
+
+  public AtomicLong getElementsCount() {
+    return elementsCount;
+  }
+
+  public void commit(final NodeUpdater nodeUpdater) {
+    commit((key, value) -> {}, nodeUpdater);
+  }
+
+  public void commit(final FlatDatabaseUpdater flatDatabaseUpdater, final NodeUpdater nodeUpdater) {
+
+    if (nbSegments.decrementAndGet() <= 0 && !elements.isEmpty()) {
+
+      final List<Bytes> proofs = new ArrayList<>();
+      final TreeMap<Bytes32, Bytes> keys = new TreeMap<>();
+
+      elements
+          .values()
+          .forEach(
+              taskElement -> {
+                proofs.addAll(taskElement.proofs());
+                keys.putAll(taskElement.keys());
+              });
+
+      final Map<Bytes32, Bytes> proofsEntries = new HashMap<>();
+      for (Bytes proof : proofs) {
+        proofsEntries.put(Hash.hash(proof), proof);
+      }
+
+      final InnerNodeDiscoveryManager<Bytes> snapStoredNodeFactory =
+          new InnerNodeDiscoveryManager<>(
+              (location, hash) -> Optional.ofNullable(proofsEntries.get(hash)),
+              Function.identity(),
+              Function.identity(),
+              startKeyHash,
+              keys.lastKey(),
+              true);
+
+      final MerkleTrie<Bytes, Bytes> trie =
+          new StoredMerklePatriciaTrie<>(
+              snapStoredNodeFactory, proofs.isEmpty() ? MerkleTrie.EMPTY_TRIE_NODE_HASH : rootHash);
+
+      for (Map.Entry<Bytes32, Bytes> entry : keys.entrySet()) {
+        trie.put(entry.getKey(), new SnapPutVisitor<>(snapStoredNodeFactory, entry.getValue()));
+      }
+
+      keys.forEach(flatDatabaseUpdater::update);
+
+      trie.commit(
+          nodeUpdater,
+          (new CommitVisitor<>(nodeUpdater) {
+            @Override
+            public void maybeStoreNode(final Bytes location, final Node<Bytes> node) {
+              if (!node.isHealNeeded()) {
+                super.maybeStoreNode(location, node);
+              }
+            }
+          }));
+    }
+  }
+
+  public boolean addSegment() {
+    if (nbSegments.get() > maxSegments) {
+      return false;
+    } else {
+      nbSegments.incrementAndGet();
+      return true;
+    }
+  }
+
+  public interface FlatDatabaseUpdater {
+
+    static FlatDatabaseUpdater noop() {
+      return (key, value) -> {};
+    }
+
+    void update(final Bytes32 key, final Bytes value);
+  }
+
+  @Value.Immutable
+  public abstract static class TaskElement {
+
+    @Value.Default
+    public List<Bytes> proofs() {
+      return new ArrayList<>();
+    }
+
+    @Value.Default
+    public TreeMap<Bytes32, Bytes> keys() {
+      return new TreeMap<>();
+    }
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/context/SnapSyncStatePersistenceManager.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/context/SnapSyncStatePersistenceManager.java
new file mode 100644
index 00000000000..d038c3d4ba3
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/context/SnapSyncStatePersistenceManager.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync.context;
+
+import org.hyperledger.besu.ethereum.eth.sync.backwardsync.GenericKeyValueStorageFacade;
+import org.hyperledger.besu.ethereum.eth.sync.backwardsync.ValueConvertor;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.AccountRangeDataRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.ethereum.storage.StorageProvider;
+import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/**
+ * Manages the persistence of the SnapSync state, allowing it to be saved and retrieved from the
+ * database. The SnapSync state includes the current progress, downloaded data, and other relevant
+ * information needed to resume SnapSync from where it left off after a client restart.
+ */
+public class SnapSyncStatePersistenceManager {
+
+  private final byte[] SNAP_ACCOUNT_TO_BE_REPAIRED_INDEX =
+      "snapInconsistentAccountsStorageIndex".getBytes(StandardCharsets.UTF_8);
+
+  private final GenericKeyValueStorageFacade<BigInteger, AccountRangeDataRequest>
+      accountRangeToDownload;
+  private final GenericKeyValueStorageFacade<BigInteger, Bytes> healContext;
+
+  public SnapSyncStatePersistenceManager(final StorageProvider storageProvider) {
+    this.accountRangeToDownload =
+        new GenericKeyValueStorageFacade<>(
+            BigInteger::toByteArray,
+            new ValueConvertor<>() {
+              @Override
+              public AccountRangeDataRequest fromBytes(final byte[] bytes) {
+                return AccountRangeDataRequest.deserialize(
+                    new BytesValueRLPInput(Bytes.of(bytes), false));
+              }
+
+              @Override
+              public byte[] toBytes(final AccountRangeDataRequest value) {
+                return value.serialize().toArrayUnsafe();
+              }
+            },
+            storageProvider.getStorageBySegmentIdentifier(
+                KeyValueSegmentIdentifier.SNAPSYNC_MISSING_ACCOUNT_RANGE));
+    this.healContext =
+        new GenericKeyValueStorageFacade<>(
+            BigInteger::toByteArray,
+            new ValueConvertor<>() {
+              @Override
+              public Bytes fromBytes(final byte[] bytes) {
+                return Bytes.of(bytes);
+              }
+
+              @Override
+              public byte[] toBytes(final Bytes value) {
+                return value.toArrayUnsafe();
+              }
+            },
+            storageProvider.getStorageBySegmentIdentifier(
+                KeyValueSegmentIdentifier.SNAPSYNC_ACCOUNT_TO_FIX));
+  }
+
+  /**
+   * Persists the current account range tasks to the database.
+   *
+   * @param accountRangeDataRequests The current account range tasks to persist.
+   */
+  public void updatePersistedTasks(final List<? extends SnapDataRequest> accountRangeDataRequests) {
+    accountRangeToDownload.clear();
+    accountRangeToDownload.putAll(
+        keyValueStorageTransaction ->
+            IntStream.range(0, accountRangeDataRequests.size())
+                .forEach(
+                    index ->
+                        keyValueStorageTransaction.put(
+                            BigInteger.valueOf(index).toByteArray(),
+                            ((AccountRangeDataRequest) accountRangeDataRequests.get(index))
+                                .serialize()
+                                .toArrayUnsafe())));
+  }
+
+  /**
+   * Persists the current accounts to be repaired in the database.
+   *
+   * @param accountsToBeRepaired The current list of accounts to persist.
+   */
+  public void addAccountsToBeRepaired(final Bytes accountsToBeRepaired) {
+    final BigInteger index =
+        healContext
+            .get(SNAP_ACCOUNT_TO_BE_REPAIRED_INDEX)
+            .map(bytes -> new BigInteger(bytes.toArrayUnsafe()).add(BigInteger.ONE))
+            .orElse(BigInteger.ZERO);
+    healContext.putAll(
+        keyValueStorageTransaction -> {
+          keyValueStorageTransaction.put(SNAP_ACCOUNT_TO_BE_REPAIRED_INDEX, index.toByteArray());
+          keyValueStorageTransaction.put(index.toByteArray(), accountsToBeRepaired.toArrayUnsafe());
+        });
+  }
+
+  public List<AccountRangeDataRequest> getCurrentAccountRange() {
+    return accountRangeToDownload
+        .streamValuesFromKeysThat(bytes -> true)
+        .collect(Collectors.toList());
+  }
+
+  public HashSet<Bytes> getAccountsToBeRepaired() {
+    return healContext
+        .streamValuesFromKeysThat(notEqualsTo(SNAP_ACCOUNT_TO_BE_REPAIRED_INDEX))
+        .collect(Collectors.toCollection(HashSet::new));
+  }
+
+  public void clearAccountRangeTasks() {
+    accountRangeToDownload.clear();
+  }
+
+  public void clear() {
+    accountRangeToDownload.clear();
+    healContext.clear();
+  }
+
+  public void close() throws IOException {
+    accountRangeToDownload.close();
+    healContext.close();
+  }
+
+  private Predicate<byte[]> notEqualsTo(final byte[] name) {
+    return key -> !Arrays.equals(key, name);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/AccountRangeDataRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/AccountRangeDataRequest.java
new file mode 100644
index 00000000000..a1a6bc63da4
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/AccountRangeDataRequest.java
@@ -0,0 +1,240 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync.request;
+
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.RangeManager.MAX_RANGE;
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.RangeManager.MIN_RANGE;
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.RangeManager.findNewBeginElementInRange;
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.RequestType.ACCOUNT_RANGE;
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapsyncMetricsManager.Step.DOWNLOAD;
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.StackTrie.FlatDatabaseUpdater.noop;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncProcessState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapWorldDownloadState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.StackTrie;
+import org.hyperledger.besu.ethereum.proof.WorldStateProofProvider;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.ethereum.trie.NodeUpdater;
+import org.hyperledger.besu.ethereum.worldstate.FlatDbMode;
+import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage.Updater;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.TreeMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
+import com.google.common.annotations.VisibleForTesting;
+import kotlin.collections.ArrayDeque;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** Returns a list of accounts and the merkle proofs of an entire range */
+public class AccountRangeDataRequest extends SnapDataRequest {
+
+  private static final Logger LOG = LoggerFactory.getLogger(AccountRangeDataRequest.class);
+
+  private final Bytes32 startKeyHash;
+  private final Bytes32 endKeyHash;
+  private final Optional<Bytes32> startStorageRange;
+  private final Optional<Bytes32> endStorageRange;
+
+  private final StackTrie stackTrie;
+  private Optional<Boolean> isProofValid;
+
+  protected AccountRangeDataRequest(
+      final Hash rootHash,
+      final Bytes32 startKeyHash,
+      final Bytes32 endKeyHash,
+      final Optional<Bytes32> startStorageRange,
+      final Optional<Bytes32> endStorageRange) {
+    super(ACCOUNT_RANGE, rootHash);
+    this.startKeyHash = startKeyHash;
+    this.endKeyHash = endKeyHash;
+    this.startStorageRange = startStorageRange;
+    this.endStorageRange = endStorageRange;
+    this.isProofValid = Optional.empty();
+    this.stackTrie = new StackTrie(rootHash, startKeyHash);
+    LOG.trace(
+        "create get account range data request with root hash={} from {} to {}",
+        rootHash,
+        startKeyHash,
+        endKeyHash);
+  }
+
+  protected AccountRangeDataRequest(
+      final Hash rootHash, final Bytes32 startKeyHash, final Bytes32 endKeyHash) {
+    this(rootHash, startKeyHash, endKeyHash, Optional.empty(), Optional.empty());
+  }
+
+  protected AccountRangeDataRequest(
+      final Hash rootHash,
+      final Hash accountHash,
+      final Bytes32 startStorageRange,
+      final Bytes32 endStorageRange) {
+    this(
+        rootHash,
+        accountHash,
+        accountHash,
+        Optional.of(startStorageRange),
+        Optional.of(endStorageRange));
+  }
+
+  @Override
+  protected int doPersist(
+      final WorldStateStorage worldStateStorage,
+      final Updater updater,
+      final SnapWorldDownloadState downloadState,
+      final SnapSyncProcessState snapSyncState,
+      final SnapSyncConfiguration snapSyncConfiguration) {
+
+    if (startStorageRange.isPresent() && endStorageRange.isPresent()) {
+      // not store the new account if we just want to complete the account thanks to another
+      // rootHash
+      return 0;
+    }
+
+    // search incomplete nodes in the range
+    final AtomicInteger nbNodesSaved = new AtomicInteger();
+    final NodeUpdater nodeUpdater =
+        (location, hash, value) -> {
+          updater.putAccountStateTrieNode(location, hash, value);
+          nbNodesSaved.getAndIncrement();
+        };
+
+    StackTrie.FlatDatabaseUpdater flatDatabaseUpdater = noop();
+    if (worldStateStorage.getFlatDbMode().equals(FlatDbMode.FULL)) {
+      // we have a flat DB only with Bonsai
+      flatDatabaseUpdater =
+          (key, value) ->
+              ((BonsaiWorldStateKeyValueStorage.BonsaiUpdater) updater)
+                  .putAccountInfoState(Hash.wrap(key), value);
+    }
+    stackTrie.commit(flatDatabaseUpdater, nodeUpdater);
+
+    downloadState.getMetricsManager().notifyAccountsDownloaded(stackTrie.getElementsCount().get());
+
+    return nbNodesSaved.get();
+  }
+
+  public void addResponse(
+      final WorldStateProofProvider worldStateProofProvider,
+      final TreeMap<Bytes32, Bytes> accounts,
+      final ArrayDeque<Bytes> proofs) {
+    if (!accounts.isEmpty() || !proofs.isEmpty()) {
+      if (!worldStateProofProvider.isValidRangeProof(
+          startKeyHash, endKeyHash, getRootHash(), proofs, accounts)) {
+        isProofValid = Optional.of(false);
+      } else {
+        stackTrie.addElement(startKeyHash, proofs, accounts);
+        isProofValid = Optional.of(true);
+      }
+    }
+  }
+
+  @Override
+  public boolean isResponseReceived() {
+    return isProofValid.orElse(false);
+  }
+
+  @Override
+  public Stream<SnapDataRequest> getChildRequests(
+      final SnapWorldDownloadState downloadState,
+      final WorldStateStorage worldStateStorage,
+      final SnapSyncProcessState snapSyncState) {
+    final List<SnapDataRequest> childRequests = new ArrayList<>();
+
+    final StackTrie.TaskElement taskElement = stackTrie.getElement(startKeyHash);
+    // new request is added if the response does not match all the requested range
+    findNewBeginElementInRange(getRootHash(), taskElement.proofs(), taskElement.keys(), endKeyHash)
+        .ifPresentOrElse(
+            missingRightElement -> {
+              downloadState
+                  .getMetricsManager()
+                  .notifyRangeProgress(DOWNLOAD, missingRightElement, endKeyHash);
+              childRequests.add(
+                  createAccountRangeDataRequest(getRootHash(), missingRightElement, endKeyHash));
+            },
+            () ->
+                downloadState
+                    .getMetricsManager()
+                    .notifyRangeProgress(DOWNLOAD, endKeyHash, endKeyHash));
+
+    // find missing storages and code
+    for (Map.Entry<Bytes32, Bytes> account : taskElement.keys().entrySet()) {
+      final StateTrieAccountValue accountValue =
+          StateTrieAccountValue.readFrom(RLP.input(account.getValue()));
+      if (!accountValue.getStorageRoot().equals(Hash.EMPTY_TRIE_HASH)) {
+        childRequests.add(
+            createStorageRangeDataRequest(
+                getRootHash(),
+                account.getKey(),
+                accountValue.getStorageRoot(),
+                startStorageRange.orElse(MIN_RANGE),
+                endStorageRange.orElse(MAX_RANGE)));
+      }
+      if (!accountValue.getCodeHash().equals(Hash.EMPTY)) {
+        childRequests.add(
+            createBytecodeRequest(account.getKey(), getRootHash(), accountValue.getCodeHash()));
+      }
+    }
+    return childRequests.stream();
+  }
+
+  public Bytes32 getStartKeyHash() {
+    return startKeyHash;
+  }
+
+  public Bytes32 getEndKeyHash() {
+    return endKeyHash;
+  }
+
+  @VisibleForTesting
+  public TreeMap<Bytes32, Bytes> getAccounts() {
+    return stackTrie.getElement(startKeyHash).keys();
+  }
+
+  public Bytes serialize() {
+    return RLP.encode(
+        out -> {
+          out.startList();
+          out.writeByte(getRequestType().getValue());
+          out.writeBytes(getRootHash());
+          out.writeBytes(getStartKeyHash());
+          out.writeBytes(getEndKeyHash());
+          out.endList();
+        });
+  }
+
+  public static AccountRangeDataRequest deserialize(final RLPInput in) {
+    in.enterList();
+    in.skipNext(); // skip request type
+    final Hash rootHash = Hash.wrap(in.readBytes32());
+    final Bytes32 startKeyHash = in.readBytes32();
+    final Bytes32 endKeyHash = in.readBytes32();
+    in.leaveList();
+    return createAccountRangeDataRequest(rootHash, startKeyHash, endKeyHash);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/BytecodeRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/BytecodeRequest.java
new file mode 100644
index 00000000000..96673d6f874
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/BytecodeRequest.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync.request;
+
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.RequestType.BYTECODES;
+import static org.slf4j.LoggerFactory.getLogger;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncProcessState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapWorldDownloadState;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage.Updater;
+
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.slf4j.Logger;
+
+/** Returns a list of bytecodes */
+public class BytecodeRequest extends SnapDataRequest {
+
+  private static final Logger LOG = getLogger(BytecodeRequest.class);
+
+  private final Bytes32 accountHash;
+  private final Bytes32 codeHash;
+
+  private Bytes code;
+
+  protected BytecodeRequest(
+      final Hash rootHash, final Bytes32 accountHash, final Bytes32 codeHash) {
+    super(BYTECODES, rootHash);
+    LOG.trace("create get bytecode data request for {} with root hash={}", accountHash, rootHash);
+    this.accountHash = accountHash;
+    this.codeHash = codeHash;
+    this.code = Bytes.EMPTY;
+  }
+
+  @Override
+  protected int doPersist(
+      final WorldStateStorage worldStateStorage,
+      final Updater updater,
+      final SnapWorldDownloadState downloadState,
+      final SnapSyncProcessState snapSyncState,
+      final SnapSyncConfiguration snapSyncConfiguration) {
+    updater.putCode(Hash.wrap(accountHash), code);
+    downloadState.getMetricsManager().notifyCodeDownloaded();
+    return possibleParent
+        .map(
+            trieNodeDataRequest ->
+                trieNodeDataRequest.saveParent(
+                        worldStateStorage,
+                        updater,
+                        downloadState,
+                        snapSyncState,
+                        snapSyncConfiguration)
+                    + 1)
+        .orElse(1);
+  }
+
+  @Override
+  public boolean isResponseReceived() {
+    return !code.isEmpty();
+  }
+
+  @Override
+  public Stream<SnapDataRequest> getChildRequests(
+      final SnapWorldDownloadState downloadState,
+      final WorldStateStorage worldStateStorage,
+      final SnapSyncProcessState snapSyncState) {
+    return Stream.empty();
+  }
+
+  public Bytes32 getAccountHash() {
+    return accountHash;
+  }
+
+  public Bytes32 getCodeHash() {
+    return codeHash;
+  }
+
+  public void setCode(final Bytes code) {
+    this.code = code;
+  }
+
+  @Override
+  public long getPriority() {
+    return 0;
+  }
+
+  @Override
+  public int getDepth() {
+    return 0;
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/SnapDataRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/SnapDataRequest.java
new file mode 100644
index 00000000000..76d2d9fe596
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/SnapDataRequest.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync.request;
+
+import static org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate.NodeDataRequest.MAX_CHILDREN;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.RequestType;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncProcessState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapWorldDownloadState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.heal.AccountFlatDatabaseHealingRangeRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.heal.AccountTrieNodeHealingRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.heal.StorageFlatDatabaseHealingRangeRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.heal.StorageTrieNodeHealingRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.heal.TrieNodeHealingRequest;
+import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldStateDownloaderException;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.services.tasks.TasksPriorityProvider;
+
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+public abstract class SnapDataRequest implements TasksPriorityProvider {
+
+  protected Optional<TrieNodeHealingRequest> possibleParent = Optional.empty();
+  protected int depth;
+  protected long priority;
+  protected final AtomicInteger pendingChildren = new AtomicInteger(0);
+
+  private final RequestType requestType;
+  private Hash rootHash;
+
+  protected SnapDataRequest(final RequestType requestType, final Hash originalRootHash) {
+    this.requestType = requestType;
+    this.rootHash = originalRootHash;
+  }
+
+  public static AccountRangeDataRequest createAccountRangeDataRequest(
+      final Hash rootHash, final Bytes32 startKeyHash, final Bytes32 endKeyHash) {
+    return new AccountRangeDataRequest(rootHash, startKeyHash, endKeyHash);
+  }
+
+  public static AccountFlatDatabaseHealingRangeRequest createAccountFlatHealingRangeRequest(
+      final Hash rootHash, final Bytes32 startKeyHash, final Bytes32 endKeyHash) {
+    return new AccountFlatDatabaseHealingRangeRequest(rootHash, startKeyHash, endKeyHash);
+  }
+
+  public static StorageFlatDatabaseHealingRangeRequest createStorageFlatHealingRangeRequest(
+      final Hash rootHash,
+      final Bytes32 accountHash,
+      final Bytes32 storageRoot,
+      final Bytes32 startKeyHash,
+      final Bytes32 endKeyHash) {
+    return new StorageFlatDatabaseHealingRangeRequest(
+        rootHash, accountHash, storageRoot, startKeyHash, endKeyHash);
+  }
+
+  public static AccountRangeDataRequest createAccountDataRequest(
+      final Hash rootHash,
+      final Hash accountHash,
+      final Bytes32 startStorageRange,
+      final Bytes32 endStorageRange) {
+    return new AccountRangeDataRequest(rootHash, accountHash, startStorageRange, endStorageRange);
+  }
+
+  public static StorageRangeDataRequest createStorageRangeDataRequest(
+      final Hash rootHash,
+      final Bytes32 accountHash,
+      final Bytes32 storageRoot,
+      final Bytes32 startKeyHash,
+      final Bytes32 endKeyHash) {
+    return new StorageRangeDataRequest(
+        rootHash, accountHash, storageRoot, startKeyHash, endKeyHash);
+  }
+
+  public static AccountTrieNodeHealingRequest createAccountTrieNodeDataRequest(
+      final Hash hash, final Bytes location, final HashSet<Bytes> inconsistentAccounts) {
+    return new AccountTrieNodeHealingRequest(hash, hash, location, inconsistentAccounts);
+  }
+
+  public static AccountTrieNodeHealingRequest createAccountTrieNodeDataRequest(
+      final Hash hash,
+      final Hash rootHash,
+      final Bytes location,
+      final HashSet<Bytes> inconsistentAccounts) {
+    return new AccountTrieNodeHealingRequest(hash, rootHash, location, inconsistentAccounts);
+  }
+
+  public static StorageTrieNodeHealingRequest createStorageTrieNodeDataRequest(
+      final Hash hash, final Hash accountHash, final Hash rootHash, final Bytes location) {
+    return new StorageTrieNodeHealingRequest(hash, accountHash, rootHash, location);
+  }
+
+  public static BytecodeRequest createBytecodeRequest(
+      final Bytes32 accountHash, final Hash rootHash, final Bytes32 codeHash) {
+    return new BytecodeRequest(rootHash, accountHash, codeHash);
+  }
+
+  public int persist(
+      final WorldStateStorage worldStateStorage,
+      final WorldStateStorage.Updater updater,
+      final SnapWorldDownloadState downloadState,
+      final SnapSyncProcessState snapSyncState,
+      final SnapSyncConfiguration snapSyncConfiguration) {
+    return doPersist(
+        worldStateStorage, updater, downloadState, snapSyncState, snapSyncConfiguration);
+  }
+
+  protected abstract int doPersist(
+      final WorldStateStorage worldStateStorage,
+      final WorldStateStorage.Updater updater,
+      final SnapWorldDownloadState downloadState,
+      final SnapSyncProcessState snapSyncState,
+      final SnapSyncConfiguration snapSyncConfiguration);
+
+  public abstract boolean isResponseReceived();
+
+  public boolean isExpired(final SnapSyncProcessState snapSyncState) {
+    return false;
+  }
+
+  public abstract Stream<SnapDataRequest> getChildRequests(
+      final SnapWorldDownloadState downloadState,
+      final WorldStateStorage worldStateStorage,
+      final SnapSyncProcessState snapSyncState);
+
+  public void registerParent(final TrieNodeHealingRequest parent) {
+    if (this.possibleParent.isPresent()) {
+      throw new WorldStateDownloaderException("Cannot set parent twice");
+    }
+    this.possibleParent = Optional.of(parent);
+    this.depth = parent.depth + 1;
+    this.priority = parent.priority * MAX_CHILDREN + parent.incrementChildren();
+  }
+
+  protected int incrementChildren() {
+    return pendingChildren.incrementAndGet();
+  }
+
+  protected int saveParent(
+      final WorldStateStorage worldStateStorage,
+      final WorldStateStorage.Updater updater,
+      final SnapWorldDownloadState downloadState,
+      final SnapSyncProcessState snapSyncState,
+      final SnapSyncConfiguration snapSyncConfiguration) {
+    if (pendingChildren.decrementAndGet() == 0) {
+      return persist(
+          worldStateStorage, updater, downloadState, snapSyncState, snapSyncConfiguration);
+    }
+    return 0;
+  }
+
+  public void clear() {}
+
+  public RequestType getRequestType() {
+    return requestType;
+  }
+
+  public Hash getRootHash() {
+    return rootHash;
+  }
+
+  public void setRootHash(final Hash rootHash) {
+    this.rootHash = rootHash;
+  }
+
+  @Override
+  public long getPriority() {
+    return 0;
+  }
+
+  @Override
+  public int getDepth() {
+    return 0;
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/StorageRangeDataRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/StorageRangeDataRequest.java
new file mode 100644
index 00000000000..58c1702cbf5
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/StorageRangeDataRequest.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync.request;
+
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.RangeManager.MAX_RANGE;
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.RangeManager.MIN_RANGE;
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.RangeManager.findNewBeginElementInRange;
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.RangeManager.getRangeCount;
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.RequestType.STORAGE_RANGE;
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.StackTrie.FlatDatabaseUpdater.noop;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.RangeManager;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncProcessState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapWorldDownloadState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.StackTrie;
+import org.hyperledger.besu.ethereum.proof.WorldStateProofProvider;
+import org.hyperledger.besu.ethereum.trie.CompactEncoding;
+import org.hyperledger.besu.ethereum.trie.NodeUpdater;
+import org.hyperledger.besu.ethereum.worldstate.FlatDbMode;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage.Updater;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.TreeMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
+import com.google.common.annotations.VisibleForTesting;
+import kotlin.collections.ArrayDeque;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.rlp.RLP;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** Returns a list of storages and the merkle proofs of an entire range */
+public class StorageRangeDataRequest extends SnapDataRequest {
+
+  private static final Logger LOG = LoggerFactory.getLogger(StorageRangeDataRequest.class);
+
+  private final Hash accountHash;
+  private final Bytes32 storageRoot;
+  private final Bytes32 startKeyHash;
+  private final Bytes32 endKeyHash;
+
+  private StackTrie stackTrie;
+  private Optional<Boolean> isProofValid;
+
+  protected StorageRangeDataRequest(
+      final Hash rootHash,
+      final Bytes32 accountHash,
+      final Bytes32 storageRoot,
+      final Bytes32 startKeyHash,
+      final Bytes32 endKeyHash) {
+    super(STORAGE_RANGE, rootHash);
+    this.accountHash = Hash.wrap(accountHash);
+    this.storageRoot = storageRoot;
+    this.startKeyHash = startKeyHash;
+    this.endKeyHash = endKeyHash;
+    this.isProofValid = Optional.empty();
+    addStackTrie(Optional.empty());
+    LOG.trace(
+        "create get storage range data request for account {} with root hash={} from {} to {}",
+        accountHash,
+        rootHash,
+        startKeyHash,
+        endKeyHash);
+  }
+
+  @Override
+  protected int doPersist(
+      final WorldStateStorage worldStateStorage,
+      final Updater updater,
+      final SnapWorldDownloadState downloadState,
+      final SnapSyncProcessState snapSyncState,
+      final SnapSyncConfiguration snapSyncConfiguration) {
+
+    // search incomplete nodes in the range
+    final AtomicInteger nbNodesSaved = new AtomicInteger();
+    final NodeUpdater nodeUpdater =
+        (location, hash, value) -> {
+          updater.putAccountStorageTrieNode(accountHash, location, hash, value);
+        };
+
+    StackTrie.FlatDatabaseUpdater flatDatabaseUpdater = noop();
+    if (worldStateStorage.getFlatDbMode().equals(FlatDbMode.FULL)) {
+      // we have a flat DB only with Bonsai
+      flatDatabaseUpdater =
+          (key, value) ->
+              ((BonsaiWorldStateKeyValueStorage.Updater) updater)
+                  .putStorageValueBySlotHash(
+                      accountHash, Hash.wrap(key), Bytes32.leftPad(RLP.decodeValue(value)));
+    }
+
+    stackTrie.commit(flatDatabaseUpdater, nodeUpdater);
+
+    downloadState.getMetricsManager().notifySlotsDownloaded(stackTrie.getElementsCount().get());
+
+    return nbNodesSaved.get();
+  }
+
+  public void addResponse(
+      final SnapWorldDownloadState downloadState,
+      final WorldStateProofProvider worldStateProofProvider,
+      final TreeMap<Bytes32, Bytes> slots,
+      final ArrayDeque<Bytes> proofs) {
+    if (!slots.isEmpty() || !proofs.isEmpty()) {
+      if (!worldStateProofProvider.isValidRangeProof(
+          startKeyHash, endKeyHash, storageRoot, proofs, slots)) {
+        downloadState.enqueueRequest(
+            createAccountDataRequest(
+                getRootHash(), Hash.wrap(accountHash), startKeyHash, endKeyHash));
+        isProofValid = Optional.of(false);
+      } else {
+        stackTrie.addElement(startKeyHash, proofs, slots);
+        isProofValid = Optional.of(true);
+      }
+    }
+  }
+
+  @Override
+  public boolean isResponseReceived() {
+    return isProofValid.isPresent();
+  }
+
+  @Override
+  public boolean isExpired(final SnapSyncProcessState snapSyncState) {
+    return snapSyncState.isExpired(this);
+  }
+
+  @Override
+  public Stream<SnapDataRequest> getChildRequests(
+      final SnapWorldDownloadState downloadState,
+      final WorldStateStorage worldStateStorage,
+      final SnapSyncProcessState snapSyncState) {
+    final List<SnapDataRequest> childRequests = new ArrayList<>();
+
+    if (!isProofValid.orElse(false)) {
+      return Stream.empty();
+    }
+
+    final StackTrie.TaskElement taskElement = stackTrie.getElement(startKeyHash);
+
+    findNewBeginElementInRange(storageRoot, taskElement.proofs(), taskElement.keys(), endKeyHash)
+        .ifPresent(
+            missingRightElement -> {
+              final int nbRanges = getRangeCount(startKeyHash, endKeyHash, taskElement.keys());
+              RangeManager.generateRanges(missingRightElement, endKeyHash, nbRanges)
+                  .forEach(
+                      (key, value) -> {
+                        final StorageRangeDataRequest storageRangeDataRequest =
+                            createStorageRangeDataRequest(
+                                getRootHash(), accountHash, storageRoot, key, value);
+                        storageRangeDataRequest.addStackTrie(Optional.of(stackTrie));
+                        childRequests.add(storageRangeDataRequest);
+                      });
+              if (startKeyHash.equals(MIN_RANGE) && endKeyHash.equals(MAX_RANGE)) {
+                // need to heal this account storage
+                downloadState.addAccountsToBeRepaired(CompactEncoding.bytesToPath(accountHash));
+              }
+            });
+
+    return childRequests.stream();
+  }
+
+  public Bytes32 getAccountHash() {
+    return accountHash;
+  }
+
+  public Bytes32 getStorageRoot() {
+    return storageRoot;
+  }
+
+  public TreeMap<Bytes32, Bytes> getSlots() {
+    return stackTrie.getElement(startKeyHash).keys();
+  }
+
+  public Bytes32 getStartKeyHash() {
+    return startKeyHash;
+  }
+
+  public Bytes32 getEndKeyHash() {
+    return endKeyHash;
+  }
+
+  @VisibleForTesting
+  public void setProofValid(final boolean isProofValid) {
+    this.isProofValid = Optional.of(isProofValid);
+  }
+
+  public void addStackTrie(final Optional<StackTrie> maybeStackTrie) {
+    stackTrie =
+        maybeStackTrie
+            .filter(StackTrie::addSegment)
+            .orElse(new StackTrie(Hash.wrap(getStorageRoot()), 1, 3, startKeyHash));
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/heal/AccountFlatDatabaseHealingRangeRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/heal/AccountFlatDatabaseHealingRangeRequest.java
new file mode 100644
index 00000000000..c96b39e44c6
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/heal/AccountFlatDatabaseHealingRangeRequest.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync.request.heal;
+
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.RangeManager.MAX_RANGE;
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.RangeManager.MIN_RANGE;
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapsyncMetricsManager.Step.HEAL_FLAT;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.RangeManager;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.RequestType;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncProcessState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapWorldDownloadState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.ethereum.proof.WorldStateProofProvider;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.trie.CompactEncoding;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.RangeStorageEntriesCollector;
+import org.hyperledger.besu.ethereum.trie.TrieIterator;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.TreeMap;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import kotlin.collections.ArrayDeque;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+/**
+ * The AccountFlatDatabaseHealingRangeRequest class represents a request to heal a range of account
+ * in the flat databases. It encapsulates the necessary information to identify the range and
+ * initiate the healing process.
+ */
+public class AccountFlatDatabaseHealingRangeRequest extends SnapDataRequest {
+
+  private final Bytes32 startKeyHash;
+  private final Bytes32 endKeyHash;
+  private TreeMap<Bytes32, Bytes> existingAccounts;
+
+  private TreeMap<Bytes32, Bytes> removedAccounts;
+  private boolean isProofValid;
+
+  public AccountFlatDatabaseHealingRangeRequest(
+      final Hash originalRootHash, final Bytes32 startKeyHash, final Bytes32 endKeyHash) {
+    super(RequestType.ACCOUNT_RANGE, originalRootHash);
+    this.startKeyHash = startKeyHash;
+    this.endKeyHash = endKeyHash;
+    this.existingAccounts = new TreeMap<>();
+    this.removedAccounts = new TreeMap<>();
+    this.isProofValid = false;
+  }
+
+  @Override
+  public Stream<SnapDataRequest> getChildRequests(
+      final SnapWorldDownloadState downloadState,
+      final WorldStateStorage worldStateStorage,
+      final SnapSyncProcessState snapSyncState) {
+    final List<SnapDataRequest> childRequests = new ArrayList<>();
+    if (!existingAccounts.isEmpty()) {
+      // new request is added if the response does not match all the requested range
+      RangeManager.generateRanges(
+              existingAccounts.lastKey().toUnsignedBigInteger().add(BigInteger.ONE),
+              endKeyHash.toUnsignedBigInteger(),
+              1)
+          .forEach(
+              (key, value) -> {
+                downloadState.getMetricsManager().notifyRangeProgress(HEAL_FLAT, key, endKeyHash);
+                final AccountFlatDatabaseHealingRangeRequest storageRangeDataRequest =
+                    createAccountFlatHealingRangeRequest(getRootHash(), key, value);
+                childRequests.add(storageRangeDataRequest);
+              });
+    } else {
+      downloadState.getMetricsManager().notifyRangeProgress(HEAL_FLAT, endKeyHash, endKeyHash);
+    }
+
+    Stream.of(existingAccounts.entrySet(), removedAccounts.entrySet())
+        .flatMap(Collection::stream)
+        .forEach(
+            account -> {
+              if (downloadState
+                  .getAccountsToBeRepaired()
+                  .contains(CompactEncoding.bytesToPath(account.getKey()))) {
+                final StateTrieAccountValue accountValue =
+                    StateTrieAccountValue.readFrom(RLP.input(account.getValue()));
+                childRequests.add(
+                    createStorageFlatHealingRangeRequest(
+                        getRootHash(),
+                        account.getKey(),
+                        accountValue.getStorageRoot(),
+                        MIN_RANGE,
+                        MAX_RANGE));
+              }
+            });
+    return childRequests.stream();
+  }
+
+  public Bytes32 getStartKeyHash() {
+    return startKeyHash;
+  }
+
+  public Bytes32 getEndKeyHash() {
+    return endKeyHash;
+  }
+
+  @Override
+  public boolean isResponseReceived() {
+    return true;
+  }
+
+  public void addLocalData(
+      final WorldStateProofProvider worldStateProofProvider,
+      final TreeMap<Bytes32, Bytes> accounts,
+      final ArrayDeque<Bytes> proofs) {
+    if (!accounts.isEmpty() && !proofs.isEmpty()) {
+      // very proof in order to check if the local flat database is valid or not
+      isProofValid =
+          worldStateProofProvider.isValidRangeProof(
+              startKeyHash, endKeyHash, getRootHash(), proofs, accounts);
+      this.existingAccounts = accounts;
+    }
+  }
+
+  @Override
+  protected int doPersist(
+      final WorldStateStorage worldStateStorage,
+      final WorldStateStorage.Updater updater,
+      final SnapWorldDownloadState downloadState,
+      final SnapSyncProcessState snapSyncState,
+      final SnapSyncConfiguration syncConfig) {
+
+    if (!isProofValid) { // if proof is not valid we need to fix the flat database
+
+      final BonsaiWorldStateKeyValueStorage.Updater bonsaiUpdater =
+          (BonsaiWorldStateKeyValueStorage.Updater) updater;
+
+      final MerkleTrie<Bytes, Bytes> accountTrie =
+          new StoredMerklePatriciaTrie<>(
+              worldStateStorage::getAccountStateTrieNode,
+              getRootHash(),
+              Function.identity(),
+              Function.identity());
+
+      // retrieve the data from the trie in order to know what to fix in the flat database
+      final RangeStorageEntriesCollector collector =
+          RangeStorageEntriesCollector.createCollector(
+              startKeyHash,
+              existingAccounts.isEmpty() ? endKeyHash : existingAccounts.lastKey(),
+              existingAccounts.isEmpty()
+                  ? syncConfig.getLocalFlatAccountCountToHealPerRequest()
+                  : Integer.MAX_VALUE,
+              Integer.MAX_VALUE);
+
+      // put all flat accounts in the list, and gradually keep only those that are not in the trie
+      // to remove and heal them.
+      removedAccounts = new TreeMap<>(existingAccounts);
+
+      final TrieIterator<Bytes> visitor = RangeStorageEntriesCollector.createVisitor(collector);
+      existingAccounts =
+          (TreeMap<Bytes32, Bytes>)
+              accountTrie.entriesFrom(
+                  root ->
+                      RangeStorageEntriesCollector.collectEntries(
+                          collector, visitor, root, startKeyHash));
+
+      // doing the fix
+      existingAccounts.forEach(
+          (key, value) -> {
+            if (removedAccounts.containsKey(key)) {
+              removedAccounts.remove(key);
+            } else {
+              final Hash accountHash = Hash.wrap(key);
+              // if the account was missing in the flat db we need to heal the storage
+              downloadState.addAccountsToBeRepaired(CompactEncoding.bytesToPath(accountHash));
+              bonsaiUpdater.putAccountInfoState(accountHash, value);
+            }
+          });
+
+      removedAccounts.forEach(
+          (key, value) -> {
+            final Hash accountHash = Hash.wrap(key);
+            // if the account was removed we will have to heal the storage
+            downloadState.addAccountsToBeRepaired(CompactEncoding.bytesToPath(accountHash));
+            bonsaiUpdater.removeAccountInfoState(accountHash);
+          });
+    }
+    return existingAccounts.size() + removedAccounts.size();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/heal/AccountTrieNodeHealingRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/heal/AccountTrieNodeHealingRequest.java
new file mode 100644
index 00000000000..07089b20878
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/heal/AccountTrieNodeHealingRequest.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync.request.heal;
+
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest.createAccountTrieNodeDataRequest;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncProcessState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapWorldDownloadState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.trie.CompactEncoding;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.worldstate.FlatDbMode;
+import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+/** Represents a healing request for an account trie node. */
+public class AccountTrieNodeHealingRequest extends TrieNodeHealingRequest {
+
+  private final HashSet<Bytes> inconsistentAccounts;
+
+  public AccountTrieNodeHealingRequest(
+      final Hash hash,
+      final Hash originalRootHash,
+      final Bytes location,
+      final HashSet<Bytes> inconsistentAccounts) {
+    super(hash, originalRootHash, location);
+    this.inconsistentAccounts = inconsistentAccounts;
+  }
+
+  @Override
+  protected int doPersist(
+      final WorldStateStorage worldStateStorage,
+      final WorldStateStorage.Updater updater,
+      final SnapWorldDownloadState downloadState,
+      final SnapSyncProcessState snapSyncState,
+      final SnapSyncConfiguration snapSyncConfiguration) {
+    if (isRoot()) {
+      downloadState.setRootNodeData(data);
+    }
+    updater.putAccountStateTrieNode(getLocation(), getNodeHash(), data);
+    return 1;
+  }
+
+  @Override
+  public Optional<Bytes> getExistingData(
+      final SnapWorldDownloadState downloadState, final WorldStateStorage worldStateStorage) {
+    return worldStateStorage
+        .getAccountStateTrieNode(getLocation(), getNodeHash())
+        .filter(data -> !getLocation().isEmpty());
+  }
+
+  @Override
+  protected SnapDataRequest createChildNodeDataRequest(final Hash childHash, final Bytes location) {
+    return createAccountTrieNodeDataRequest(
+        childHash, getRootHash(), location, getSubLocation(location));
+  }
+
+  private HashSet<Bytes> getSubLocation(final Bytes location) {
+    final HashSet<Bytes> foundAccountsToHeal = new HashSet<>();
+    for (Bytes account : inconsistentAccounts) {
+      if (account.commonPrefixLength(location) == location.size()) {
+        foundAccountsToHeal.add(account);
+      }
+    }
+    return foundAccountsToHeal;
+  }
+
+  @Override
+  public Stream<SnapDataRequest> getRootStorageRequests(final WorldStateStorage worldStateStorage) {
+    final List<SnapDataRequest> requests = new ArrayList<>();
+    final StoredMerklePatriciaTrie<Bytes, Bytes> accountTrie =
+        new StoredMerklePatriciaTrie<>(
+            worldStateStorage::getAccountStateTrieNode,
+            Hash.hash(data),
+            getLocation(),
+            Function.identity(),
+            Function.identity());
+    for (Bytes account : inconsistentAccounts) {
+      final Bytes32 accountHash = Bytes32.wrap(CompactEncoding.pathToBytes(account));
+      accountTrie
+          .getPath(
+              Bytes.wrap(
+                  account.toArrayUnsafe(),
+                  getLocation().size(),
+                  account.size() - getLocation().size()))
+          .map(RLP::input)
+          .map(StateTrieAccountValue::readFrom)
+          .ifPresent(
+              stateTrieAccountValue -> {
+                // an account need a heal step
+                requests.add(
+                    createStorageTrieNodeDataRequest(
+                        stateTrieAccountValue.getStorageRoot(),
+                        Hash.wrap(accountHash),
+                        getRootHash(),
+                        Bytes.EMPTY));
+              });
+    }
+    return requests.stream();
+  }
+
+  @Override
+  protected Stream<SnapDataRequest> getRequestsFromTrieNodeValue(
+      final WorldStateStorage worldStateStorage,
+      final Bytes location,
+      final Bytes path,
+      final Bytes value) {
+    final Stream.Builder<SnapDataRequest> builder = Stream.builder();
+    final StateTrieAccountValue accountValue = StateTrieAccountValue.readFrom(RLP.input(value));
+
+    // Retrieve account hash
+    final Hash accountHash =
+        Hash.wrap(
+            Bytes32.wrap(CompactEncoding.pathToBytes(Bytes.concatenate(getLocation(), path))));
+
+    // update the flat db only for bonsai
+    if (!worldStateStorage.getFlatDbMode().equals(FlatDbMode.NO_FLATTENED)) {
+      ((BonsaiWorldStateKeyValueStorage.Updater) worldStateStorage.updater())
+          .putAccountInfoState(accountHash, value)
+          .commit();
+    }
+
+    // Add code, if appropriate
+    if (!accountValue.getCodeHash().equals(Hash.EMPTY)) {
+      builder.add(createBytecodeRequest(accountHash, getRootHash(), accountValue.getCodeHash()));
+    }
+    // Add storage, if appropriate
+    if (!accountValue.getStorageRoot().equals(MerkleTrie.EMPTY_TRIE_NODE_HASH)) {
+      // If we detect an account storage we fill it with snapsync before completing with a heal
+      final SnapDataRequest storageTrieRequest =
+          createStorageTrieNodeDataRequest(
+              accountValue.getStorageRoot(), accountHash, getRootHash(), Bytes.EMPTY);
+      builder.add(storageTrieRequest);
+    }
+    return builder.build();
+  }
+
+  @Override
+  public List<Bytes> getTrieNodePath() {
+    return List.of(CompactEncoding.encode(getLocation()));
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/heal/StorageFlatDatabaseHealingRangeRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/heal/StorageFlatDatabaseHealingRangeRequest.java
new file mode 100644
index 00000000000..45380e49985
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/heal/StorageFlatDatabaseHealingRangeRequest.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync.request.heal;
+
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.RangeManager.getRangeCount;
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.RequestType.STORAGE_RANGE;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.RangeManager;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncProcessState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapWorldDownloadState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.ethereum.proof.WorldStateProofProvider;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.RangeStorageEntriesCollector;
+import org.hyperledger.besu.ethereum.trie.TrieIterator;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import kotlin.collections.ArrayDeque;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.rlp.RLP;
+
+/**
+ * The StorageFlatDatabaseHealingRangeRequest class represents a request to heal a range of storage
+ * in the flat databases. It encapsulates the necessary information to identify the range and
+ * initiate the healing process.
+ */
+public class StorageFlatDatabaseHealingRangeRequest extends SnapDataRequest {
+
+  private final Hash accountHash;
+  private final Bytes32 storageRoot;
+  private final Bytes32 startKeyHash;
+  private final Bytes32 endKeyHash;
+  private TreeMap<Bytes32, Bytes> slots;
+  private boolean isProofValid;
+
+  public StorageFlatDatabaseHealingRangeRequest(
+      final Hash rootHash,
+      final Bytes32 accountHash,
+      final Bytes32 storageRoot,
+      final Bytes32 startKeyHash,
+      final Bytes32 endKeyHash) {
+    super(STORAGE_RANGE, rootHash);
+    this.accountHash = Hash.wrap(accountHash);
+    this.storageRoot = storageRoot;
+    this.startKeyHash = startKeyHash;
+    this.endKeyHash = endKeyHash;
+    this.isProofValid = false;
+  }
+
+  @Override
+  public Stream<SnapDataRequest> getChildRequests(
+      final SnapWorldDownloadState downloadState,
+      final WorldStateStorage worldStateStorage,
+      final SnapSyncProcessState snapSyncState) {
+    final List<SnapDataRequest> childRequests = new ArrayList<>();
+    if (!slots.isEmpty()) {
+      // new request is added if the response does not match all the requested range
+      final int nbRanges = getRangeCount(startKeyHash, endKeyHash, slots);
+      RangeManager.generateRanges(
+              slots.lastKey().toUnsignedBigInteger().add(BigInteger.ONE),
+              endKeyHash.toUnsignedBigInteger(),
+              nbRanges)
+          .forEach(
+              (key, value) -> {
+                final StorageFlatDatabaseHealingRangeRequest storageRangeDataRequest =
+                    createStorageFlatHealingRangeRequest(
+                        getRootHash(), accountHash, storageRoot, key, value);
+                childRequests.add(storageRangeDataRequest);
+              });
+    }
+    return childRequests.stream();
+  }
+
+  public Hash getAccountHash() {
+    return accountHash;
+  }
+
+  public Bytes32 getStorageRoot() {
+    return storageRoot;
+  }
+
+  public Bytes32 getStartKeyHash() {
+    return startKeyHash;
+  }
+
+  public Bytes32 getEndKeyHash() {
+    return endKeyHash;
+  }
+
+  @Override
+  public boolean isResponseReceived() {
+    return true;
+  }
+
+  public void addLocalData(
+      final WorldStateProofProvider worldStateProofProvider,
+      final TreeMap<Bytes32, Bytes> slots,
+      final ArrayDeque<Bytes> proofs) {
+    if (!slots.isEmpty() && !proofs.isEmpty()) {
+      // very proof in order to check if the local flat database is valid or not
+      isProofValid =
+          worldStateProofProvider.isValidRangeProof(
+              startKeyHash, endKeyHash, storageRoot, proofs, slots);
+    }
+    this.slots = slots;
+  }
+
+  @Override
+  protected int doPersist(
+      final WorldStateStorage worldStateStorage,
+      final WorldStateStorage.Updater updater,
+      final SnapWorldDownloadState downloadState,
+      final SnapSyncProcessState snapSyncState,
+      final SnapSyncConfiguration snapSyncConfiguration) {
+
+    if (!isProofValid) {
+      // If the proof is not valid, it indicates that the flat database needs to be fixed.
+
+      final BonsaiWorldStateKeyValueStorage.Updater bonsaiUpdater =
+          (BonsaiWorldStateKeyValueStorage.Updater) updater;
+
+      final MerkleTrie<Bytes, Bytes> storageTrie =
+          new StoredMerklePatriciaTrie<>(
+              (location, hash) ->
+                  worldStateStorage.getAccountStorageTrieNode(accountHash, location, hash),
+              storageRoot,
+              Function.identity(),
+              Function.identity());
+
+      Map<Bytes32, Bytes> remainingKeys = new TreeMap<>(slots);
+
+      // Retrieve the data from the trie in order to know what needs to be fixed in the flat
+      // database
+      final RangeStorageEntriesCollector collector =
+          RangeStorageEntriesCollector.createCollector(
+              startKeyHash,
+              slots.isEmpty() ? endKeyHash : slots.lastKey(),
+              slots.isEmpty()
+                  ? snapSyncConfiguration.getLocalFlatStorageCountToHealPerRequest()
+                  : Integer.MAX_VALUE,
+              Integer.MAX_VALUE);
+      final TrieIterator<Bytes> visitor = RangeStorageEntriesCollector.createVisitor(collector);
+      slots =
+          (TreeMap<Bytes32, Bytes>)
+              storageTrie.entriesFrom(
+                  root ->
+                      RangeStorageEntriesCollector.collectEntries(
+                          collector, visitor, root, startKeyHash));
+
+      // Perform the fix by updating the flat database
+      slots.forEach(
+          (key, value) -> {
+            if (remainingKeys.containsKey(key)) {
+              remainingKeys.remove(key);
+            } else {
+              bonsaiUpdater.putStorageValueBySlotHash(
+                  accountHash, Hash.wrap(key), Bytes32.leftPad(RLP.decodeValue(value)));
+            }
+          });
+      remainingKeys.forEach(
+          (key, value) -> bonsaiUpdater.removeStorageValueBySlotHash(accountHash, Hash.wrap(key)));
+    }
+    return slots.size();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/heal/StorageTrieNodeHealingRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/heal/StorageTrieNodeHealingRequest.java
new file mode 100644
index 00000000000..092925b955d
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/heal/StorageTrieNodeHealingRequest.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync.request.heal;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncProcessState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapWorldDownloadState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.ethereum.trie.CompactEncoding;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.worldstate.FlatDbMode;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage.Updater;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.rlp.RLP;
+
+/** Represents a healing request for a storage trie node. */
+public class StorageTrieNodeHealingRequest extends TrieNodeHealingRequest {
+
+  final Hash accountHash;
+
+  public StorageTrieNodeHealingRequest(
+      final Hash nodeHash, final Hash accountHash, final Hash rootHash, final Bytes location) {
+    super(nodeHash, rootHash, location);
+    this.accountHash = accountHash;
+  }
+
+  @Override
+  protected int doPersist(
+      final WorldStateStorage worldStateStorage,
+      final Updater updater,
+      final SnapWorldDownloadState downloadState,
+      final SnapSyncProcessState snapSyncState,
+      final SnapSyncConfiguration snapSyncConfiguration) {
+    updater.putAccountStorageTrieNode(getAccountHash(), getLocation(), getNodeHash(), data);
+    return 1;
+  }
+
+  @Override
+  public Optional<Bytes> getExistingData(
+      final SnapWorldDownloadState downloadState, final WorldStateStorage worldStateStorage) {
+    Optional<Bytes> accountStorageTrieNode =
+        worldStateStorage.getAccountStorageTrieNode(
+            getAccountHash(),
+            getLocation(),
+            null); // push null to not check the hash in the getAccountStorageTrieNode method
+    if (accountStorageTrieNode.isPresent()) {
+      return accountStorageTrieNode
+          .filter(node -> Hash.hash(node).equals(getNodeHash()))
+          .or(
+              () -> { // if we have a storage in database but not the good one we will need to fix
+                // the account later
+                downloadState.addAccountsToBeRepaired(
+                    CompactEncoding.bytesToPath(getAccountHash()));
+                return Optional.empty();
+              });
+    } else {
+      if (getNodeHash().equals(MerkleTrie.EMPTY_TRIE_NODE_HASH)) {
+        return Optional.of(MerkleTrie.EMPTY_TRIE_NODE);
+      }
+      return Optional.empty();
+    }
+  }
+
+  @Override
+  protected SnapDataRequest createChildNodeDataRequest(final Hash childHash, final Bytes location) {
+    return SnapDataRequest.createStorageTrieNodeDataRequest(
+        childHash, getAccountHash(), getRootHash(), location);
+  }
+
+  @Override
+  protected Stream<SnapDataRequest> getRequestsFromTrieNodeValue(
+      final WorldStateStorage worldStateStorage,
+      final Bytes location,
+      final Bytes path,
+      final Bytes value) {
+    if (!worldStateStorage.getFlatDbMode().equals(FlatDbMode.NO_FLATTENED)) {
+      ((BonsaiWorldStateKeyValueStorage.Updater) worldStateStorage.updater())
+          .putStorageValueBySlotHash(
+              accountHash, getSlotHash(location, path), Bytes32.leftPad(RLP.decodeValue(value)))
+          .commit();
+    }
+    return Stream.empty();
+  }
+
+  public Hash getAccountHash() {
+    return accountHash;
+  }
+
+  private Hash getSlotHash(final Bytes location, final Bytes path) {
+    return Hash.wrap(Bytes32.wrap(CompactEncoding.pathToBytes(Bytes.concatenate(location, path))));
+  }
+
+  @Override
+  public List<Bytes> getTrieNodePath() {
+    return List.of(accountHash, CompactEncoding.encode(getLocation()));
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/heal/TrieNodeHealingRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/heal/TrieNodeHealingRequest.java
new file mode 100644
index 00000000000..2cb8ee3ca8a
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/heal/TrieNodeHealingRequest.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync.request.heal;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.hyperledger.besu.ethereum.eth.sync.snapsync.RequestType.TRIE_NODE;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncProcessState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapWorldDownloadState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.ethereum.trie.Node;
+import org.hyperledger.besu.ethereum.trie.patricia.TrieNodeDecoder;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.services.tasks.TasksPriorityProvider;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+public abstract class TrieNodeHealingRequest extends SnapDataRequest
+    implements TasksPriorityProvider {
+
+  private final Bytes32 nodeHash;
+  private final Bytes location;
+  protected Bytes data;
+
+  protected boolean requiresPersisting = true;
+
+  protected TrieNodeHealingRequest(final Hash nodeHash, final Hash rootHash, final Bytes location) {
+    super(TRIE_NODE, rootHash);
+    this.nodeHash = nodeHash;
+    this.location = location;
+    this.data = Bytes.EMPTY;
+  }
+
+  @Override
+  public int persist(
+      final WorldStateStorage worldStateStorage,
+      final WorldStateStorage.Updater updater,
+      final SnapWorldDownloadState downloadState,
+      final SnapSyncProcessState snapSyncState,
+      final SnapSyncConfiguration snapSyncConfiguration) {
+    if (isExpired(snapSyncState) || pendingChildren.get() > 0) {
+      // we do nothing. Our last child will eventually persist us.
+      return 0;
+    }
+    int saved = 0;
+    if (requiresPersisting) {
+      checkNotNull(data, "Must set data before node can be persisted.");
+      saved =
+          doPersist(
+              worldStateStorage, updater, downloadState, snapSyncState, snapSyncConfiguration);
+    }
+    if (possibleParent.isPresent()) {
+      return possibleParent
+              .get()
+              .saveParent(
+                  worldStateStorage, updater, downloadState, snapSyncState, snapSyncConfiguration)
+          + saved;
+    }
+    return saved;
+  }
+
+  @Override
+  public Stream<SnapDataRequest> getChildRequests(
+      final SnapWorldDownloadState downloadState,
+      final WorldStateStorage worldStateStorage,
+      final SnapSyncProcessState snapSyncState) {
+    if (!isResponseReceived()) {
+      // If this node hasn't been downloaded yet, we can't return any child data
+      return Stream.empty();
+    }
+
+    final List<Node<Bytes>> nodes = TrieNodeDecoder.decodeNodes(location, data);
+    return nodes.stream()
+        .flatMap(
+            node -> {
+              if (nodeIsHashReferencedDescendant(node)) {
+                return Stream.of(
+                    createChildNodeDataRequest(
+                        Hash.wrap(node.getHash()), node.getLocation().orElse(Bytes.EMPTY)));
+              } else {
+                return node.getValue()
+                    .map(
+                        value ->
+                            getRequestsFromTrieNodeValue(
+                                worldStateStorage,
+                                node.getLocation().orElse(Bytes.EMPTY),
+                                node.getPath(),
+                                value))
+                    .orElseGet(Stream::empty);
+              }
+            })
+        .peek(request -> request.registerParent(this));
+  }
+
+  public boolean isRoot() {
+    return possibleParent.isEmpty();
+  }
+
+  @Override
+  public boolean isResponseReceived() {
+    return !data.isEmpty() && Hash.hash(data).equals(getNodeHash());
+  }
+
+  @Override
+  public boolean isExpired(final SnapSyncProcessState snapSyncState) {
+    return snapSyncState.isExpired(this);
+  }
+
+  public boolean isRequiresPersisting() {
+    return requiresPersisting;
+  }
+
+  public Bytes32 getNodeHash() {
+    return nodeHash;
+  }
+
+  public Bytes getLocation() {
+    return location;
+  }
+
+  @Override
+  public int getDepth() {
+    return depth;
+  }
+
+  @Override
+  public long getPriority() {
+    return priority;
+  }
+
+  public Bytes getPathId() {
+    return Bytes.concatenate(new ArrayList<>(getTrieNodePath()));
+  }
+
+  public void setData(final Bytes data) {
+    this.data = data;
+  }
+
+  public void setRequiresPersisting(final boolean requiresPersisting) {
+    this.requiresPersisting = requiresPersisting;
+  }
+
+  private boolean nodeIsHashReferencedDescendant(final Node<Bytes> node) {
+    return !Objects.equals(node.getHash(), nodeHash) && node.isReferencedByHash();
+  }
+
+  public abstract Optional<Bytes> getExistingData(
+      final SnapWorldDownloadState downloadState, final WorldStateStorage worldStateStorage);
+
+  public abstract List<Bytes> getTrieNodePath();
+
+  protected abstract SnapDataRequest createChildNodeDataRequest(
+      final Hash childHash, final Bytes location);
+
+  public Stream<SnapDataRequest> getRootStorageRequests(final WorldStateStorage worldStateStorage) {
+    return Stream.empty();
+  }
+
+  protected abstract Stream<SnapDataRequest> getRequestsFromTrieNodeValue(
+      final WorldStateStorage worldStateStorage,
+      final Bytes location,
+      final Bytes path,
+      final Bytes value);
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/InSyncTracker.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/InSyncTracker.java
index 9e7032d4de6..5b7189cf787 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/InSyncTracker.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/InSyncTracker.java
@@ -101,7 +101,7 @@ static InSyncState fromInSync(final boolean inSync) {
     }
 
     public void ifKnown(final Consumer<Boolean> handler) {
-      inSync.ifPresent(handler::accept);
+      inSync.ifPresent(handler);
     }
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/PendingBlocksManager.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/PendingBlocksManager.java
index 84fb7274791..cb0584ea029 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/PendingBlocksManager.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/PendingBlocksManager.java
@@ -16,16 +16,19 @@
 
 import static java.util.Collections.newSetFromMap;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
 import org.hyperledger.besu.ethereum.eth.sync.state.cache.ImmutablePendingBlock;
 import org.hyperledger.besu.ethereum.eth.sync.state.cache.PendingBlockCache;
 
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
@@ -105,6 +108,10 @@ public boolean contains(final Hash blockHash) {
     return pendingBlocks.containsKey(blockHash);
   }
 
+  public int size() {
+    return pendingBlocks.size();
+  }
+
   public List<Block> childrenOf(final Hash parentBlock) {
     final Set<Hash> blocksByParent = pendingBlocksByParentHash.get(parentBlock);
     if (blocksByParent == null || blocksByParent.size() == 0) {
@@ -116,4 +123,40 @@ public List<Block> childrenOf(final Hash parentBlock) {
         .map(ImmutablePendingBlock::block)
         .collect(Collectors.toList());
   }
+
+  public Optional<BlockHeader> lowestAnnouncedBlock() {
+    return pendingBlocks.values().stream()
+        .map(ImmutablePendingBlock::block)
+        .map(Block::getHeader)
+        .min(Comparator.comparing(BlockHeader::getNumber));
+  }
+
+  /**
+   * Get the lowest pending ancestor block saved for a block
+   *
+   * @param block target block
+   * @return An optional with the lowest ancestor pending block
+   */
+  public Optional<Block> pendingAncestorBlockOf(final Block block) {
+    Block ancestor = block;
+    int ancestorLevel = 0;
+    while (pendingBlocks.containsKey(ancestor.getHeader().getParentHash())
+        && ancestorLevel++ < pendingBlocks.size()) {
+      ancestor = pendingBlocks.get(ancestor.getHeader().getParentHash()).block();
+    }
+    return Optional.of(ancestor);
+  }
+
+  @Override
+  public String toString() {
+    return "PendingBlocksManager{"
+        + "pendingBlocks ["
+        + pendingBlocks.values().stream()
+            .map(ImmutablePendingBlock::block)
+            .map(b -> b.getHeader().getNumber() + " (" + b.getHash() + ")")
+            .collect(Collectors.joining(", "))
+        + "], pendingBlocksByParentHash="
+        + pendingBlocksByParentHash
+        + '}';
+  }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/SyncState.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/SyncState.java
index 8b166a6b567..80d2506e5aa 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/SyncState.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/SyncState.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.eth.sync.state;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.chain.ChainHead;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
@@ -23,10 +24,13 @@
 import org.hyperledger.besu.ethereum.eth.manager.ChainHeadEstimate;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.checkpoint.Checkpoint;
 import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldStateDownloadStatus;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
 import org.hyperledger.besu.plugin.data.SyncStatus;
+import org.hyperledger.besu.plugin.services.BesuEvents.InitialSyncCompletionListener;
 import org.hyperledger.besu.plugin.services.BesuEvents.SyncStatusListener;
+import org.hyperledger.besu.plugin.services.BesuEvents.TTDReachedListener;
 import org.hyperledger.besu.util.Subscribers;
 
 import java.util.Map;
@@ -42,14 +46,36 @@ public class SyncState {
   private final AtomicLong inSyncSubscriberId = new AtomicLong();
   private final Map<Long, InSyncTracker> inSyncTrackers = new ConcurrentHashMap<>();
   private final Subscribers<SyncStatusListener> syncStatusListeners = Subscribers.create();
+  private final Subscribers<TTDReachedListener> ttdReachedListeners = Subscribers.create();
+
+  private final Subscribers<InitialSyncCompletionListener> completionListenerSubscribers =
+      Subscribers.create();
+
   private volatile long chainHeightListenerId;
   private volatile Optional<SyncTarget> syncTarget = Optional.empty();
   private Optional<WorldStateDownloadStatus> worldStateDownloadStatus = Optional.empty();
   private Optional<Long> newPeerListenerId;
+  private Optional<Boolean> reachedTerminalDifficulty = Optional.empty();
+  private final Optional<Checkpoint> checkpoint;
+  private volatile boolean isInitialSyncPhaseDone;
+
+  private volatile boolean isResyncNeeded;
+
+  private Optional<Address> maybeAccountToRepair = Optional.empty();
 
   public SyncState(final Blockchain blockchain, final EthPeers ethPeers) {
+    this(blockchain, ethPeers, false, Optional.empty());
+  }
+
+  public SyncState(
+      final Blockchain blockchain,
+      final EthPeers ethPeers,
+      final boolean hasInitialSyncPhase,
+      final Optional<Checkpoint> checkpoint) {
     this.blockchain = blockchain;
     this.ethPeers = ethPeers;
+    isInitialSyncPhaseDone = !hasInitialSyncPhase;
+
     blockchain.observeBlockAdded(
         event -> {
           if (event.isNewCanonicalHead()) {
@@ -67,6 +93,7 @@ public SyncState(final Blockchain blockchain, final EthPeers ethPeers) {
                     checkInSync();
                   }
                 }));
+    this.checkpoint = checkpoint;
   }
 
   /**
@@ -108,10 +135,26 @@ public long subscribeSyncStatus(final SyncStatusListener listener) {
     return syncStatusListeners.subscribe(listener);
   }
 
+  public long subscribeTTDReached(final TTDReachedListener listener) {
+    return ttdReachedListeners.subscribe(listener);
+  }
+
+  public long subscribeCompletionReached(final InitialSyncCompletionListener listener) {
+    return completionListenerSubscribers.subscribe(listener);
+  }
+
   public boolean unsubscribeSyncStatus(final long listenerId) {
     return syncStatusListeners.unsubscribe(listenerId);
   }
 
+  public boolean unsubscribeTTDReached(final long listenerId) {
+    return ttdReachedListeners.unsubscribe(listenerId);
+  }
+
+  public boolean unsubscribeInitialConditionReached(final long listenerId) {
+    return completionListenerSubscribers.unsubscribe(listenerId);
+  }
+
   public Optional<SyncStatus> syncStatus() {
     return syncStatus(syncTarget);
   }
@@ -138,14 +181,28 @@ public boolean isInSync(final long syncTolerance) {
         getLocalChainHead(), getSyncTargetChainHead(), getBestPeerChainHead(), syncTolerance);
   }
 
+  public void setReachedTerminalDifficulty(final boolean stoppedAtTerminalDifficulty) {
+    this.reachedTerminalDifficulty = Optional.of(stoppedAtTerminalDifficulty);
+    ttdReachedListeners.forEach(listener -> listener.onTTDReached(stoppedAtTerminalDifficulty));
+  }
+
+  public Optional<Boolean> hasReachedTerminalDifficulty() {
+    if (isInitialSyncPhaseDone) {
+      return reachedTerminalDifficulty;
+    }
+    return Optional.of(Boolean.FALSE);
+  }
+
   private boolean isInSync(
       final ChainHead localChain,
       final Optional<ChainHeadEstimate> syncTargetChain,
       final Optional<ChainHeadEstimate> bestPeerChain,
       final long syncTolerance) {
-    // Sync target may be temporarily empty while we switch sync targets during a sync, so
-    // check both the sync target and our best peer to determine if we're in sync or not
-    return isInSync(localChain, syncTargetChain, syncTolerance)
+    return isInitialSyncPhaseDone
+        && reachedTerminalDifficulty.orElse(true)
+        // Sync target may be temporarily empty while we switch sync targets during a sync, so
+        // check both the sync target and our best peer to determine if we're in sync or not
+        && isInSync(localChain, syncTargetChain, syncTolerance)
         && isInSync(localChain, bestPeerChain, syncTolerance);
   }
 
@@ -219,6 +276,10 @@ private void addEstimatedHeightListener(final SyncTarget target) {
         target.addPeerChainEstimatedHeightListener(estimatedHeight -> checkInSync());
   }
 
+  public long getLocalChainHeight() {
+    return blockchain.getChainHeadBlockNumber();
+  }
+
   public long bestChainHeight() {
     final long localChainHeight = blockchain.getChainHeadBlockNumber();
     return bestChainHeight(localChainHeight);
@@ -250,4 +311,39 @@ private synchronized void checkInSync() {
         .forEach(
             (syncTracker) -> syncTracker.checkState(localChain, syncTargetChain, bestPeerChain));
   }
+
+  public Optional<Checkpoint> getCheckpoint() {
+    return checkpoint;
+  }
+
+  public boolean isInitialSyncPhaseDone() {
+    return isInitialSyncPhaseDone;
+  }
+
+  public void markInitialSyncPhaseAsDone() {
+    isInitialSyncPhaseDone = true;
+    isResyncNeeded = false;
+    completionListenerSubscribers.forEach(InitialSyncCompletionListener::onInitialSyncCompleted);
+  }
+
+  public boolean isResyncNeeded() {
+    return isResyncNeeded;
+  }
+
+  public void markResyncNeeded() {
+    isResyncNeeded = true;
+  }
+
+  public Optional<Address> getAccountToRepair() {
+    return maybeAccountToRepair;
+  }
+
+  public void markAccountToRepair(final Optional<Address> address) {
+    maybeAccountToRepair = address;
+  }
+
+  public void markInitialSyncRestart() {
+    isInitialSyncPhaseDone = false;
+    completionListenerSubscribers.forEach(InitialSyncCompletionListener::onInitialSyncRestart);
+  }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/cache/PendingBlockCache.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/cache/PendingBlockCache.java
index c568eaf01a3..710b83ecbb8 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/cache/PendingBlockCache.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/state/cache/PendingBlockCache.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.eth.sync.state.cache;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 
 import java.util.Comparator;
 import java.util.List;
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/CompleteBlocksTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/CompleteBlocksTask.java
index 0fc3fc9d6d2..6e04833b644 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/CompleteBlocksTask.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/CompleteBlocksTask.java
@@ -19,10 +19,10 @@
 import static java.util.concurrent.CompletableFuture.completedFuture;
 import static java.util.stream.Collectors.toMap;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult;
@@ -32,24 +32,26 @@
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Given a set of headers, "completes" them by repeatedly requesting additional data (bodies) needed
  * to create the blocks that correspond to the supplied headers.
  */
 public class CompleteBlocksTask extends AbstractRetryingPeerTask<List<Block>> {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(CompleteBlocksTask.class);
 
   private static final int MIN_SIZE_INCOMPLETE_LIST = 1;
-  private static final int DEFAULT_RETRIES = 3;
+  private static final int DEFAULT_RETRIES = 4;
 
   private final EthContext ethContext;
   private final ProtocolSchedule protocolSchedule;
@@ -74,12 +76,39 @@ private CompleteBlocksTask(
     this.blocks =
         headers.stream()
             .filter(this::hasEmptyBody)
-            .collect(toMap(BlockHeader::getNumber, header -> new Block(header, BlockBody.empty())));
+            .collect(
+                toMap(
+                    BlockHeader::getNumber,
+                    header ->
+                        new Block(
+                            header,
+                            createEmptyBodyBasedOnProtocolSchedule(protocolSchedule, header))));
+  }
+
+  @NotNull
+  private BlockBody createEmptyBodyBasedOnProtocolSchedule(
+      final ProtocolSchedule protocolSchedule, final BlockHeader header) {
+    return new BlockBody(
+        Collections.emptyList(),
+        Collections.emptyList(),
+        isWithdrawalsEnabled(protocolSchedule, header)
+            ? Optional.of(Collections.emptyList())
+            : Optional.empty(),
+        Optional.empty());
+  }
+
+  private boolean isWithdrawalsEnabled(
+      final ProtocolSchedule protocolSchedule, final BlockHeader header) {
+    return protocolSchedule.getByBlockHeader(header).getWithdrawalsProcessor().isPresent();
   }
 
   private boolean hasEmptyBody(final BlockHeader header) {
     return header.getOmmersHash().equals(Hash.EMPTY_LIST_HASH)
-        && header.getTransactionsRoot().equals(Hash.EMPTY_TRIE_HASH);
+        && header.getTransactionsRoot().equals(Hash.EMPTY_TRIE_HASH)
+        && header
+            .getWithdrawalsRoot()
+            .map(wsRoot -> wsRoot.equals(Hash.EMPTY_TRIE_HASH))
+            .orElse(true);
   }
 
   public static CompleteBlocksTask forHeaders(
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DetermineCommonAncestorTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DetermineCommonAncestorTask.java
index 23f95a973f8..91aa6e5ff8d 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DetermineCommonAncestorTask.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DetermineCommonAncestorTask.java
@@ -30,8 +30,8 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Finds the common ancestor with the given peer. It is assumed that the peer will at least share
@@ -40,7 +40,7 @@
  * cases this node's genesis block will be returned.
  */
 public class DetermineCommonAncestorTask extends AbstractEthTask<BlockHeader> {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(DetermineCommonAncestorTask.class);
   private final EthContext ethContext;
   private final ProtocolSchedule protocolSchedule;
   private final ProtocolContext protocolContext;
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DownloadHeaderSequenceTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DownloadHeaderSequenceTask.java
index 13948a0e1a1..23e26ff8922 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DownloadHeaderSequenceTask.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DownloadHeaderSequenceTask.java
@@ -17,11 +17,11 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.util.Arrays.asList;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.BadBlockManager;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.task.AbstractGetHeadersFromPeerTask;
@@ -45,16 +45,16 @@
 import java.util.concurrent.CompletableFuture;
 
 import com.google.common.primitives.Ints;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Retrieves a sequence of headers, sending out requests repeatedly until all headers are fulfilled.
  * Validates headers as they are received.
  */
 public class DownloadHeaderSequenceTask extends AbstractRetryingPeerTask<List<BlockHeader>> {
-  private static final Logger LOG = LogManager.getLogger();
-  private static final int DEFAULT_RETRIES = 3;
+  private static final Logger LOG = LoggerFactory.getLogger(DownloadHeaderSequenceTask.class);
+  private static final int DEFAULT_RETRIES = 4;
 
   private final EthContext ethContext;
   private final ProtocolContext protocolContext;
@@ -199,7 +199,7 @@ private CompletableFuture<List<BlockHeader>> processHeaders(
               child =
                   (headerIndex == segmentLength - 1) ? referenceHeader : headers[headerIndex + 1];
             }
-            final ProtocolSpec protocolSpec = protocolSchedule.getByBlockNumber(child.getNumber());
+            final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(child);
             final BadBlockManager badBlockManager = protocolSpec.getBadBlocksManager();
 
             if (!validateHeader(child, header)) {
@@ -212,7 +212,7 @@ private CompletableFuture<List<BlockHeader>> processHeaders(
                   GetBlockFromPeerTask.create(
                           protocolSchedule,
                           ethContext,
-                          child.getHash(),
+                          Optional.of(child.getHash()),
                           child.getNumber(),
                           metricsSystem)
                       .assignPeer(headersResult.getPeer());
@@ -222,12 +222,13 @@ private CompletableFuture<List<BlockHeader>> processHeaders(
                   .whenComplete(
                       (blockPeerTaskResult, error) -> {
                         if (error == null && blockPeerTaskResult.getResult() != null) {
-                          badBlockManager.addBadBlock(blockPeerTaskResult.getResult());
+                          badBlockManager.addBadBlock(
+                              blockPeerTaskResult.getResult(), Optional.ofNullable(error));
                         }
-                        headersResult.getPeer().disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
                         LOG.debug(
-                            "Received invalid headers from peer, disconnecting from: {}",
+                            "Received invalid headers from peer (BREACH_OF_PROTOCOL), disconnecting from: {}",
                             headersResult.getPeer());
+                        headersResult.getPeer().disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
                         future.completeExceptionally(
                             new InvalidBlockException(
                                 "Header failed validation.",
@@ -257,7 +258,7 @@ private boolean validateHeader(final BlockHeader child, final BlockHeader header
       return false;
     }
 
-    final ProtocolSpec protocolSpec = protocolSchedule.getByBlockNumber(child.getNumber());
+    final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(child);
     final BlockHeaderValidator blockHeaderValidator = protocolSpec.getBlockHeaderValidator();
     return blockHeaderValidator.validateHeader(
         child, header, protocolContext, validationPolicy.getValidationModeForNextBlock());
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/GetReceiptsForHeadersTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/GetReceiptsForHeadersTask.java
index 94955c1e4db..699bf9c4b17 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/GetReceiptsForHeadersTask.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/GetReceiptsForHeadersTask.java
@@ -18,8 +18,8 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptyMap;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
@@ -35,14 +35,14 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Given a set of headers, repeatedly requests the receipts for those blocks. */
 public class GetReceiptsForHeadersTask
     extends AbstractRetryingPeerTask<Map<BlockHeader, List<TransactionReceipt>>> {
-  private static final Logger LOG = LogManager.getLogger();
-  private static final int DEFAULT_RETRIES = 3;
+  private static final Logger LOG = LoggerFactory.getLogger(GetReceiptsForHeadersTask.class);
+  private static final int DEFAULT_RETRIES = 4;
 
   private final EthContext ethContext;
 
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/PersistBlockTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/PersistBlockTask.java
index 205f9888a5a..8c8e7aad3fb 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/PersistBlockTask.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/PersistBlockTask.java
@@ -22,6 +22,7 @@
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.task.AbstractEthTask;
 import org.hyperledger.besu.ethereum.eth.sync.tasks.exceptions.InvalidBlockException;
+import org.hyperledger.besu.ethereum.mainnet.BlockImportResult;
 import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
@@ -33,19 +34,19 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Supplier;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PersistBlockTask extends AbstractEthTask<Block> {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PersistBlockTask.class);
 
   private final ProtocolSchedule protocolSchedule;
   private final ProtocolContext protocolContext;
   private final EthContext ethContext;
   private final Block block;
   private final HeaderValidationMode validateHeaders;
-  private boolean blockImported;
+  private BlockImportResult blockImportResult;
 
   private PersistBlockTask(
       final ProtocolSchedule protocolSchedule,
@@ -60,7 +61,7 @@ private PersistBlockTask(
     this.ethContext = ethContext;
     this.block = block;
     this.validateHeaders = headerValidationMode;
-    blockImported = false;
+    blockImportResult = new BlockImportResult(false);
   }
 
   public static PersistBlockTask create(
@@ -193,11 +194,14 @@ public static Supplier<CompletableFuture<List<Block>>> forUnorderedBlocks(
   @Override
   protected void executeTask() {
     try {
-      final ProtocolSpec protocolSpec =
-          protocolSchedule.getByBlockNumber(block.getHeader().getNumber());
+      final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(block.getHeader());
       final BlockImporter blockImporter = protocolSpec.getBlockImporter();
-      blockImported = blockImporter.importBlock(protocolContext, block, validateHeaders);
-      if (!blockImported) {
+      LOG.atDebug()
+          .setMessage("Running import task for block {}")
+          .addArgument(block::toLogString)
+          .log();
+      blockImportResult = blockImporter.importBlock(protocolContext, block, validateHeaders);
+      if (!blockImportResult.isImported()) {
         result.completeExceptionally(
             new InvalidBlockException(
                 "Failed to import block", block.getHeader().getNumber(), block.getHash()));
@@ -211,19 +215,26 @@ protected void executeTask() {
 
   @Override
   protected void cleanup() {
-    if (blockImported) {
-      final double timeInS = getTaskTimeInSec();
-      LOG.info(
-          String.format(
-              "Imported #%,d / %d tx / %d om / %,d (%01.1f%%) gas / (%s) in %01.3fs. Peers: %d",
-              block.getHeader().getNumber(),
-              block.getBody().getTransactions().size(),
-              block.getBody().getOmmers().size(),
-              block.getHeader().getGasUsed(),
-              (block.getHeader().getGasUsed() * 100.0) / block.getHeader().getGasLimit(),
-              block.getHash().toHexString(),
-              timeInS,
-              ethContext.getEthPeers().peerCount()));
+    final double timeInS = getTaskTimeInSec();
+    switch (blockImportResult.getStatus()) {
+      case IMPORTED:
+        LOG.info(
+            String.format(
+                "Imported #%,d / %d tx / %d om / %,d (%01.1f%%) gas / (%s) in %01.3fs. Peers: %d",
+                block.getHeader().getNumber(),
+                block.getBody().getTransactions().size(),
+                block.getBody().getOmmers().size(),
+                block.getHeader().getGasUsed(),
+                (block.getHeader().getGasUsed() * 100.0) / block.getHeader().getGasLimit(),
+                block.getHash().toHexString(),
+                timeInS,
+                ethContext.getEthPeers().peerCount()));
+        break;
+      case ALREADY_IMPORTED:
+        LOG.info("Block {} is already imported", block.toLogString());
+        break;
+      default:
+        break;
     }
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/RetryingGetHeaderFromPeerByHashTask.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/RetryingGetHeaderFromPeerByHashTask.java
new file mode 100644
index 00000000000..c36599e6354
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/RetryingGetHeaderFromPeerByHashTask.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.tasks;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.exceptions.IncompleteResultsException;
+import org.hyperledger.besu.ethereum.eth.manager.task.AbstractGetHeadersFromPeerTask;
+import org.hyperledger.besu.ethereum.eth.manager.task.AbstractRetryingSwitchingPeerTask;
+import org.hyperledger.besu.ethereum.eth.manager.task.GetHeadersFromPeerByHashTask;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RetryingGetHeaderFromPeerByHashTask
+    extends AbstractRetryingSwitchingPeerTask<List<BlockHeader>> {
+  private static final Logger LOG =
+      LoggerFactory.getLogger(RetryingGetHeaderFromPeerByHashTask.class);
+  private final Hash referenceHash;
+  private final ProtocolSchedule protocolSchedule;
+  private final long minimumRequiredBlockNumber;
+
+  @VisibleForTesting
+  RetryingGetHeaderFromPeerByHashTask(
+      final ProtocolSchedule protocolSchedule,
+      final EthContext ethContext,
+      final Hash referenceHash,
+      final long minimumRequiredBlockNumber,
+      final MetricsSystem metricsSystem,
+      final int maxRetries) {
+    super(ethContext, metricsSystem, List::isEmpty, maxRetries);
+    this.protocolSchedule = protocolSchedule;
+    this.minimumRequiredBlockNumber = minimumRequiredBlockNumber;
+    checkNotNull(referenceHash);
+    this.referenceHash = referenceHash;
+  }
+
+  public static RetryingGetHeaderFromPeerByHashTask byHash(
+      final ProtocolSchedule protocolSchedule,
+      final EthContext ethContext,
+      final Hash referenceHash,
+      final long minimumRequiredBlockNumber,
+      final MetricsSystem metricsSystem) {
+    return new RetryingGetHeaderFromPeerByHashTask(
+        protocolSchedule,
+        ethContext,
+        referenceHash,
+        minimumRequiredBlockNumber,
+        metricsSystem,
+        ethContext.getEthPeers().peerCount());
+  }
+
+  @Override
+  protected CompletableFuture<List<BlockHeader>> executeTaskOnCurrentPeer(final EthPeer peer) {
+    final AbstractGetHeadersFromPeerTask task =
+        GetHeadersFromPeerByHashTask.forSingleHash(
+            protocolSchedule,
+            getEthContext(),
+            referenceHash,
+            minimumRequiredBlockNumber,
+            getMetricsSystem());
+    task.assignPeer(peer);
+    return executeSubTask(task::run)
+        .thenApply(
+            peerResult -> {
+              LOG.debug(
+                  "Get block header by hash {} from peer {} has result {}",
+                  referenceHash,
+                  peer,
+                  peerResult.getResult());
+              if (peerResult.getResult().isEmpty()) {
+                throw new IncompleteResultsException(
+                    "No block header for hash "
+                        + referenceHash
+                        + " returned by peer "
+                        + peer.getShortNodeId());
+              }
+              result.complete(peerResult.getResult());
+              return peerResult.getResult();
+            });
+  }
+
+  @Override
+  protected boolean isRetryableError(final Throwable error) {
+    return super.isRetryableError(error) || error instanceof IncompleteResultsException;
+  }
+
+  public CompletableFuture<BlockHeader> getHeader() {
+    return run().thenApply(singletonList -> singletonList.get(0));
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/exceptions/InvalidBlockException.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/exceptions/InvalidBlockException.java
index 20dfbf7b3a9..e53ce3e86e2 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/exceptions/InvalidBlockException.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/tasks/exceptions/InvalidBlockException.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.eth.sync.tasks.exceptions;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 
 public class InvalidBlockException extends RuntimeException {
 
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/AccountTrieNodeDataRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/AccountTrieNodeDataRequest.java
deleted file mode 100644
index 8d0d0ccfd35..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/AccountTrieNodeDataRequest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync.worldstate;
-
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.rlp.RLP;
-import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie;
-import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage.Updater;
-
-import java.util.Optional;
-import java.util.stream.Stream;
-
-import org.apache.tuweni.bytes.Bytes;
-
-class AccountTrieNodeDataRequest extends TrieNodeDataRequest {
-
-  AccountTrieNodeDataRequest(final Hash hash) {
-    super(RequestType.ACCOUNT_TRIE_NODE, hash);
-  }
-
-  @Override
-  protected void doPersist(final Updater updater) {
-    updater.putAccountStateTrieNode(null, getHash(), getData());
-  }
-
-  @Override
-  public Optional<Bytes> getExistingData(final WorldStateStorage worldStateStorage) {
-    return worldStateStorage.getAccountStateTrieNode(null, getHash());
-  }
-
-  @Override
-  protected NodeDataRequest createChildNodeDataRequest(final Hash childHash) {
-    return createAccountDataRequest(childHash);
-  }
-
-  @Override
-  protected Stream<NodeDataRequest> getRequestsFromTrieNodeValue(final Bytes value) {
-    final Stream.Builder<NodeDataRequest> builder = Stream.builder();
-    final StateTrieAccountValue accountValue = StateTrieAccountValue.readFrom(RLP.input(value));
-    // Add code, if appropriate
-    if (!accountValue.getCodeHash().equals(Hash.EMPTY)) {
-      builder.add(createCodeRequest(accountValue.getCodeHash()));
-    }
-    // Add storage, if appropriate
-    if (!accountValue.getStorageRoot().equals(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH)) {
-      // If storage is non-empty queue download
-      final NodeDataRequest storageNode = createStorageDataRequest(accountValue.getStorageRoot());
-      builder.add(storageNode);
-    }
-    return builder.build();
-  }
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/CodeNodeDataRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/CodeNodeDataRequest.java
deleted file mode 100644
index d17668ecc0d..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/CodeNodeDataRequest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync.worldstate;
-
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage.Updater;
-
-import java.util.Optional;
-import java.util.stream.Stream;
-
-import org.apache.tuweni.bytes.Bytes;
-
-class CodeNodeDataRequest extends NodeDataRequest {
-
-  CodeNodeDataRequest(final Hash hash) {
-    super(RequestType.CODE, hash);
-  }
-
-  @Override
-  protected void doPersist(final Updater updater) {
-    updater.putCode(getHash(), getData());
-  }
-
-  @Override
-  public Stream<NodeDataRequest> getChildRequests() {
-    // Code nodes have nothing further to download
-    return Stream.empty();
-  }
-
-  @Override
-  public Optional<Bytes> getExistingData(final WorldStateStorage worldStateStorage) {
-    return worldStateStorage.getCode(getHash());
-  }
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/CompleteTaskStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/CompleteTaskStep.java
deleted file mode 100644
index 4760e93761f..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/CompleteTaskStep.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync.worldstate;
-
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
-import org.hyperledger.besu.metrics.BesuMetricCategory;
-import org.hyperledger.besu.metrics.RunnableCounter;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
-import org.hyperledger.besu.plugin.services.metrics.Counter;
-import org.hyperledger.besu.services.tasks.Task;
-
-import java.text.DecimalFormat;
-import java.util.function.LongSupplier;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-public class CompleteTaskStep {
-  private static final Logger LOG = LogManager.getLogger();
-  private static final int DISPLAY_PROGRESS_STEP = 100000;
-  private final WorldStateStorage worldStateStorage;
-  private final RunnableCounter completedRequestsCounter;
-  private final Counter retriedRequestsCounter;
-  private final LongSupplier worldStatePendingRequestsCurrentSupplier;
-  private final DecimalFormat doubleFormatter = new DecimalFormat("#.##");
-
-  public CompleteTaskStep(
-      final WorldStateStorage worldStateStorage,
-      final MetricsSystem metricsSystem,
-      final LongSupplier worldStatePendingRequestsCurrentSupplier) {
-    this.worldStateStorage = worldStateStorage;
-    this.worldStatePendingRequestsCurrentSupplier = worldStatePendingRequestsCurrentSupplier;
-    completedRequestsCounter =
-        new RunnableCounter(
-            metricsSystem.createCounter(
-                BesuMetricCategory.SYNCHRONIZER,
-                "world_state_completed_requests_total",
-                "Total number of node data requests completed as part of fast sync world state download"),
-            this::displayWorldStateSyncProgress,
-            DISPLAY_PROGRESS_STEP);
-    retriedRequestsCounter =
-        metricsSystem.createCounter(
-            BesuMetricCategory.SYNCHRONIZER,
-            "world_state_retried_requests_total",
-            "Total number of node data requests repeated as part of fast sync world state download");
-  }
-
-  public void markAsCompleteOrFailed(
-      final BlockHeader header,
-      final WorldDownloadState downloadState,
-      final Task<NodeDataRequest> task) {
-    if (task.getData().getData() != null) {
-      enqueueChildren(task, header, downloadState);
-      completedRequestsCounter.inc();
-      task.markCompleted();
-      downloadState.checkCompletion(worldStateStorage, header);
-    } else {
-      retriedRequestsCounter.inc();
-      task.markFailed();
-      // Marking the task as failed will add it back to the queue so make sure any threads
-      // waiting to read from the queue are notified.
-      downloadState.notifyTaskAvailable();
-    }
-  }
-
-  private void displayWorldStateSyncProgress() {
-    LOG.info(
-        "Downloaded {} world state nodes. At least {} nodes remaining. Estimated World State completion: {} %.",
-        getCompletedRequests(),
-        worldStatePendingRequestsCurrentSupplier.getAsLong(),
-        doubleFormatter.format(computeWorldStateSyncProgress() * 100.0));
-  }
-
-  public double computeWorldStateSyncProgress() {
-    final double pendingRequests = getPendingRequests();
-    final double completedRequests = getCompletedRequests();
-    return completedRequests / (completedRequests + pendingRequests);
-  }
-
-  long getCompletedRequests() {
-    return completedRequestsCounter.get();
-  }
-
-  long getPendingRequests() {
-    return worldStatePendingRequestsCurrentSupplier.getAsLong();
-  }
-
-  private void enqueueChildren(
-      final Task<NodeDataRequest> task,
-      final BlockHeader blockHeader,
-      final WorldDownloadState downloadState) {
-    final NodeDataRequest request = task.getData();
-    // Only queue rootnode children if we started from scratch
-    if (!downloadState.downloadWasResumed() || !isRootState(blockHeader, request)) {
-      downloadState.enqueueRequests(request.getChildRequests());
-    }
-  }
-
-  private boolean isRootState(final BlockHeader blockHeader, final NodeDataRequest request) {
-    return request.getHash().equals(blockHeader.getStateRoot());
-  }
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/LoadLocalDataStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/LoadLocalDataStep.java
deleted file mode 100644
index 98e9715db42..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/LoadLocalDataStep.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync.worldstate;
-
-import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
-import org.hyperledger.besu.metrics.BesuMetricCategory;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
-import org.hyperledger.besu.plugin.services.metrics.Counter;
-import org.hyperledger.besu.services.pipeline.Pipe;
-import org.hyperledger.besu.services.tasks.Task;
-
-import java.util.Optional;
-import java.util.stream.Stream;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public class LoadLocalDataStep {
-
-  private final WorldStateStorage worldStateStorage;
-  private final Counter existingNodeCounter;
-
-  public LoadLocalDataStep(
-      final WorldStateStorage worldStateStorage, final MetricsSystem metricsSystem) {
-    this.worldStateStorage = worldStateStorage;
-    existingNodeCounter =
-        metricsSystem.createCounter(
-            BesuMetricCategory.SYNCHRONIZER,
-            "world_state_existing_nodes_total",
-            "Total number of node data requests completed using existing data");
-  }
-
-  public Stream<Task<NodeDataRequest>> loadLocalData(
-      final Task<NodeDataRequest> task, final Pipe<Task<NodeDataRequest>> completedTasks) {
-    final NodeDataRequest request = task.getData();
-    final Optional<Bytes> existingData = request.getExistingData(worldStateStorage);
-    if (existingData.isPresent()) {
-      existingNodeCounter.inc();
-      request.setData(existingData.get());
-      request.setRequiresPersisting(false);
-      completedTasks.put(task);
-      return Stream.empty();
-    }
-    return Stream.of(task);
-  }
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/NodeDataRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/NodeDataRequest.java
deleted file mode 100644
index 346636c388f..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/NodeDataRequest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync.worldstate;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.rlp.RLP;
-import org.hyperledger.besu.ethereum.rlp.RLPInput;
-import org.hyperledger.besu.ethereum.rlp.RLPOutput;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
-
-import java.util.Optional;
-import java.util.stream.Stream;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public abstract class NodeDataRequest {
-  private final RequestType requestType;
-  private final Hash hash;
-  private Bytes data;
-  private boolean requiresPersisting = true;
-
-  protected NodeDataRequest(final RequestType requestType, final Hash hash) {
-    this.requestType = requestType;
-    this.hash = hash;
-  }
-
-  public static AccountTrieNodeDataRequest createAccountDataRequest(final Hash hash) {
-    return new AccountTrieNodeDataRequest(hash);
-  }
-
-  public static StorageTrieNodeDataRequest createStorageDataRequest(final Hash hash) {
-    return new StorageTrieNodeDataRequest(hash);
-  }
-
-  public static CodeNodeDataRequest createCodeRequest(final Hash hash) {
-    return new CodeNodeDataRequest(hash);
-  }
-
-  public static Bytes serialize(final NodeDataRequest request) {
-    return RLP.encode(request::writeTo);
-  }
-
-  public static NodeDataRequest deserialize(final Bytes encoded) {
-    final RLPInput in = RLP.input(encoded);
-    in.enterList();
-    final RequestType requestType = RequestType.fromValue(in.readByte());
-    final Hash hash = Hash.wrap(in.readBytes32());
-    in.leaveList();
-
-    final NodeDataRequest deserialized;
-    switch (requestType) {
-      case ACCOUNT_TRIE_NODE:
-        deserialized = createAccountDataRequest(hash);
-        break;
-      case STORAGE_TRIE_NODE:
-        deserialized = createStorageDataRequest(hash);
-        break;
-      case CODE:
-        deserialized = createCodeRequest(hash);
-        break;
-      default:
-        throw new IllegalArgumentException(
-            "Unable to deserialize provided data into a valid "
-                + NodeDataRequest.class.getSimpleName());
-    }
-
-    return deserialized;
-  }
-
-  private void writeTo(final RLPOutput out) {
-    out.startList();
-    out.writeByte(requestType.getValue());
-    out.writeBytes(hash);
-    out.endList();
-  }
-
-  public RequestType getRequestType() {
-    return requestType;
-  }
-
-  public Hash getHash() {
-    return hash;
-  }
-
-  public Bytes getData() {
-    return data;
-  }
-
-  public NodeDataRequest setData(final Bytes data) {
-    this.data = data;
-    return this;
-  }
-
-  public NodeDataRequest setRequiresPersisting(final boolean requiresPersisting) {
-    this.requiresPersisting = requiresPersisting;
-    return this;
-  }
-
-  public final void persist(final WorldStateStorage.Updater updater) {
-    if (requiresPersisting) {
-      checkNotNull(getData(), "Must set data before node can be persisted.");
-      doPersist(updater);
-    }
-  }
-
-  protected abstract void doPersist(final WorldStateStorage.Updater updater);
-
-  public abstract Stream<NodeDataRequest> getChildRequests();
-
-  public abstract Optional<Bytes> getExistingData(final WorldStateStorage worldStateStorage);
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/PersistDataStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/PersistDataStep.java
deleted file mode 100644
index 7c7b2a0c86d..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/PersistDataStep.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync.worldstate;
-
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage.Updater;
-import org.hyperledger.besu.services.tasks.Task;
-
-import java.util.List;
-
-public class PersistDataStep {
-  private final WorldStateStorage worldStateStorage;
-
-  public PersistDataStep(final WorldStateStorage worldStateStorage) {
-    this.worldStateStorage = worldStateStorage;
-  }
-
-  public List<Task<NodeDataRequest>> persist(
-      final List<Task<NodeDataRequest>> tasks,
-      final BlockHeader blockHeader,
-      final WorldDownloadState downloadState) {
-    final Updater updater = worldStateStorage.updater();
-    tasks.stream()
-        .map(Task::getData)
-        .filter(request -> request.getData() != null)
-        .forEach(
-            request -> {
-              if (isRootState(blockHeader, request)) {
-                downloadState.setRootNodeData(request.getData());
-              } else {
-                request.persist(updater);
-              }
-            });
-    updater.commit();
-    return tasks;
-  }
-
-  private boolean isRootState(final BlockHeader blockHeader, final NodeDataRequest request) {
-    return request.getHash().equals(blockHeader.getStateRoot());
-  }
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/RequestDataStep.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/RequestDataStep.java
deleted file mode 100644
index 8d02a2ce813..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/RequestDataStep.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync.worldstate;
-
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.eth.manager.EthContext;
-import org.hyperledger.besu.ethereum.eth.manager.exceptions.EthTaskException;
-import org.hyperledger.besu.ethereum.eth.manager.task.EthTask;
-import org.hyperledger.besu.ethereum.eth.manager.task.RetryingGetNodeDataFromPeerTask;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
-import org.hyperledger.besu.services.tasks.Task;
-import org.hyperledger.besu.util.ExceptionUtils;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeoutException;
-import java.util.function.BiFunction;
-import java.util.stream.Collectors;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-
-public class RequestDataStep {
-  private static final Logger LOG = LogManager.getLogger();
-  private final BiFunction<List<Hash>, Long, EthTask<Map<Hash, Bytes>>> getNodeDataTaskFactory;
-
-  public RequestDataStep(final EthContext ethContext, final MetricsSystem metricsSystem) {
-    this(
-        (hashes, pivotBlockNumber) ->
-            RetryingGetNodeDataFromPeerTask.forHashes(
-                ethContext, hashes, pivotBlockNumber, metricsSystem));
-  }
-
-  RequestDataStep(
-      final BiFunction<List<Hash>, Long, EthTask<Map<Hash, Bytes>>> getNodeDataTaskFactory) {
-    this.getNodeDataTaskFactory = getNodeDataTaskFactory;
-  }
-
-  public CompletableFuture<List<Task<NodeDataRequest>>> requestData(
-      final List<Task<NodeDataRequest>> requestTasks,
-      final BlockHeader blockHeader,
-      final WorldDownloadState downloadState) {
-    final List<Hash> hashes =
-        requestTasks.stream()
-            .map(Task::getData)
-            .map(NodeDataRequest::getHash)
-            .distinct()
-            .collect(Collectors.toList());
-    return sendRequest(blockHeader, hashes, downloadState)
-        .thenApply(
-            data -> {
-              for (final Task<NodeDataRequest> task : requestTasks) {
-                final NodeDataRequest request = task.getData();
-                final Bytes matchingData = data.get(request.getHash());
-                if (matchingData != null) {
-                  request.setData(matchingData);
-                }
-              }
-              return requestTasks;
-            });
-  }
-
-  private CompletableFuture<Map<Hash, Bytes>> sendRequest(
-      final BlockHeader blockHeader,
-      final List<Hash> hashes,
-      final WorldDownloadState downloadState) {
-    final EthTask<Map<Hash, Bytes>> task =
-        getNodeDataTaskFactory.apply(hashes, blockHeader.getNumber());
-    downloadState.addOutstandingTask(task);
-    return task.run()
-        .handle(
-            (result, error) -> {
-              downloadState.removeOutstandingTask(task);
-              if (error != null) {
-                final Throwable rootCause = ExceptionUtils.rootCause(error);
-                if (!(rootCause instanceof TimeoutException
-                    || rootCause instanceof InterruptedException
-                    || rootCause instanceof CancellationException
-                    || rootCause instanceof EthTaskException)) {
-                  LOG.debug("GetNodeDataRequest failed", error);
-                }
-                return Collections.emptyMap();
-              }
-              downloadState.requestComplete(!result.isEmpty());
-              return result;
-            });
-  }
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/RequestType.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/RequestType.java
deleted file mode 100644
index e0b9005eb4c..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/RequestType.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync.worldstate;
-
-public enum RequestType {
-  ACCOUNT_TRIE_NODE((byte) 1),
-  STORAGE_TRIE_NODE((byte) 2),
-  CODE((byte) 3);
-
-  private final byte value;
-
-  RequestType(final byte value) {
-    this.value = value;
-  }
-
-  public byte getValue() {
-    return value;
-  }
-
-  public static RequestType fromValue(final byte value) {
-    switch (value) {
-      case (byte) 1:
-        return ACCOUNT_TRIE_NODE;
-      case (byte) 2:
-        return STORAGE_TRIE_NODE;
-      case (byte) 3:
-        return CODE;
-      default:
-        throw new IllegalArgumentException("Invalid value supplied");
-    }
-  }
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/StorageTrieNodeDataRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/StorageTrieNodeDataRequest.java
deleted file mode 100644
index d18527152e9..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/StorageTrieNodeDataRequest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync.worldstate;
-
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage.Updater;
-
-import java.util.Optional;
-import java.util.stream.Stream;
-
-import org.apache.tuweni.bytes.Bytes;
-
-class StorageTrieNodeDataRequest extends TrieNodeDataRequest {
-
-  StorageTrieNodeDataRequest(final Hash hash) {
-    super(RequestType.STORAGE_TRIE_NODE, hash);
-  }
-
-  @Override
-  protected void doPersist(final Updater updater) {
-    updater.putAccountStorageTrieNode(null, getHash(), getData());
-  }
-
-  @Override
-  public Optional<Bytes> getExistingData(final WorldStateStorage worldStateStorage) {
-    return worldStateStorage.getAccountStorageTrieNode(null, getHash());
-  }
-
-  @Override
-  protected NodeDataRequest createChildNodeDataRequest(final Hash childHash) {
-    return NodeDataRequest.createStorageDataRequest(childHash);
-  }
-
-  @Override
-  protected Stream<NodeDataRequest> getRequestsFromTrieNodeValue(final Bytes value) {
-    // Nothing to do for terminal storage node
-    return Stream.empty();
-  }
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/TaskQueueIterator.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/TaskQueueIterator.java
index fb8753b30f8..bb46901c09d 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/TaskQueueIterator.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/TaskQueueIterator.java
@@ -15,14 +15,25 @@
 package org.hyperledger.besu.ethereum.eth.sync.worldstate;
 
 import org.hyperledger.besu.services.tasks.Task;
+import org.hyperledger.besu.services.tasks.TasksPriorityProvider;
 
 import java.util.Iterator;
+import java.util.function.Supplier;
 
-class TaskQueueIterator implements Iterator<Task<NodeDataRequest>> {
+public class TaskQueueIterator<REQUEST extends TasksPriorityProvider>
+    implements Iterator<Task<REQUEST>> {
 
-  private final WorldDownloadState downloadState;
+  private final WorldDownloadState<? super REQUEST> downloadState;
+  private final Supplier<Task<REQUEST>> supplier;
 
-  public TaskQueueIterator(final WorldDownloadState downloadState) {
+  public TaskQueueIterator(final WorldDownloadState<REQUEST> downloadState) {
+    this(downloadState, downloadState::dequeueRequestBlocking);
+  }
+
+  public TaskQueueIterator(
+      final WorldDownloadState<? super REQUEST> downloadState,
+      final Supplier<Task<REQUEST>> supplier) {
+    this.supplier = supplier;
     this.downloadState = downloadState;
   }
 
@@ -32,7 +43,7 @@ public boolean hasNext() {
   }
 
   @Override
-  public Task<NodeDataRequest> next() {
-    return downloadState.dequeueRequestBlocking();
+  public Task<REQUEST> next() {
+    return supplier.get();
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/TrieNodeDataRequest.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/TrieNodeDataRequest.java
deleted file mode 100644
index 96c5339bcfc..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/TrieNodeDataRequest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync.worldstate;
-
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.trie.Node;
-import org.hyperledger.besu.ethereum.trie.TrieNodeDecoder;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Stream;
-
-import org.apache.tuweni.bytes.Bytes;
-
-abstract class TrieNodeDataRequest extends NodeDataRequest {
-
-  TrieNodeDataRequest(final RequestType kind, final Hash hash) {
-    super(kind, hash);
-  }
-
-  @Override
-  public Stream<NodeDataRequest> getChildRequests() {
-    if (getData() == null) {
-      // If this node hasn't been downloaded yet, we can't return any child data
-      return Stream.empty();
-    }
-
-    final List<Node<Bytes>> nodes = TrieNodeDecoder.decodeNodes(null, getData());
-    return nodes.stream()
-        .flatMap(
-            node -> {
-              if (nodeIsHashReferencedDescendant(node)) {
-                return Stream.of(createChildNodeDataRequest(Hash.wrap(node.getHash())));
-              } else {
-                return node.getValue()
-                    .map(this::getRequestsFromTrieNodeValue)
-                    .orElseGet(Stream::empty);
-              }
-            });
-  }
-
-  private boolean nodeIsHashReferencedDescendant(final Node<Bytes> node) {
-    return !Objects.equals(node.getHash(), getHash()) && node.isReferencedByHash();
-  }
-
-  protected abstract NodeDataRequest createChildNodeDataRequest(final Hash childHash);
-
-  protected abstract Stream<NodeDataRequest> getRequestsFromTrieNodeValue(final Bytes value);
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldDownloadState.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldDownloadState.java
index df3371c8305..8f53921f4dd 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldDownloadState.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldDownloadState.java
@@ -18,9 +18,9 @@
 import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
 import org.hyperledger.besu.ethereum.eth.manager.task.EthTask;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage.Updater;
-import org.hyperledger.besu.services.tasks.CachingTaskCollection;
+import org.hyperledger.besu.services.tasks.InMemoryTasksPriorityQueues;
 import org.hyperledger.besu.services.tasks.Task;
+import org.hyperledger.besu.services.tasks.TasksPriorityProvider;
 import org.hyperledger.besu.util.ExceptionUtils;
 
 import java.time.Clock;
@@ -31,33 +31,38 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Stream;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-class WorldDownloadState {
-  private static final Logger LOG = LogManager.getLogger();
+public abstract class WorldDownloadState<REQUEST extends TasksPriorityProvider> {
+  private static final Logger LOG = LoggerFactory.getLogger(WorldDownloadState.class);
 
-  private final boolean downloadWasResumed;
-  private final CachingTaskCollection<NodeDataRequest> pendingRequests;
-  private final int maxRequestsWithoutProgress;
+  private boolean downloadWasResumed;
+  protected final InMemoryTasksPriorityQueues<REQUEST> pendingRequests;
+
+  protected final int maxRequestsWithoutProgress;
   private final Clock clock;
   private final Set<EthTask<?>> outstandingRequests =
       Collections.newSetFromMap(new ConcurrentHashMap<>());
-  private final CompletableFuture<Void> internalFuture;
-  private final CompletableFuture<Void> downloadFuture;
+  protected CompletableFuture<Void> internalFuture;
+  private CompletableFuture<Void> downloadFuture;
   // Volatile so monitoring can access it without having to synchronize.
-  private volatile int requestsSinceLastProgress = 0;
+  protected volatile int requestsSinceLastProgress = 0;
   private final long minMillisBeforeStalling;
   private volatile long timestampOfLastProgress;
-  private Bytes rootNodeData;
-  private WorldStateDownloadProcess worldStateDownloadProcess;
+  protected Bytes rootNodeData;
+
+  protected final WorldStateStorage worldStateStorage;
+  protected WorldStateDownloadProcess worldStateDownloadProcess;
 
   public WorldDownloadState(
-      final CachingTaskCollection<NodeDataRequest> pendingRequests,
+      final WorldStateStorage worldStateStorage,
+      final InMemoryTasksPriorityQueues<REQUEST> pendingRequests,
       final int maxRequestsWithoutProgress,
       final long minMillisBeforeStalling,
       final Clock clock) {
+    this.worldStateStorage = worldStateStorage;
     this.minMillisBeforeStalling = minMillisBeforeStalling;
     this.timestampOfLastProgress = clock.millis();
     this.downloadWasResumed = !pendingRequests.isEmpty();
@@ -77,6 +82,23 @@ public WorldDownloadState(
         });
   }
 
+  public void reset() {
+    this.timestampOfLastProgress = clock.millis();
+    this.requestsSinceLastProgress = 0;
+    this.downloadWasResumed = true;
+    this.internalFuture = new CompletableFuture<>();
+    this.downloadFuture = new CompletableFuture<>();
+    this.internalFuture.whenComplete(this::cleanup);
+    this.downloadFuture.exceptionally(
+        error -> {
+          // Propagate cancellation back to our internal future.
+          if (error instanceof CancellationException) {
+            this.internalFuture.cancel(true);
+          }
+          return null;
+        });
+  }
+
   private synchronized void cleanup(final Void result, final Throwable error) {
     // Handle cancellations
     if (internalFuture.isCancelled()) {
@@ -86,10 +108,8 @@ private synchronized void cleanup(final Void result, final Throwable error) {
         LOG.info("World state download failed. ", error);
       }
     }
-    for (final EthTask<?> outstandingRequest : outstandingRequests) {
-      outstandingRequest.cancel();
-    }
-    pendingRequests.clear();
+
+    cleanupQueues();
 
     if (error != null) {
       if (worldStateDownloadProcess != null) {
@@ -101,6 +121,13 @@ private synchronized void cleanup(final Void result, final Throwable error) {
     }
   }
 
+  protected synchronized void cleanupQueues() {
+    for (final EthTask<?> outstandingRequest : outstandingRequests) {
+      outstandingRequest.cancel();
+    }
+    pendingRequests.clear();
+  }
+
   public boolean downloadWasResumed() {
     return downloadWasResumed;
   }
@@ -121,23 +148,23 @@ public CompletableFuture<Void> getDownloadFuture() {
     return downloadFuture;
   }
 
-  public synchronized void enqueueRequest(final NodeDataRequest request) {
+  public synchronized void enqueueRequest(final REQUEST request) {
     if (!internalFuture.isDone()) {
       pendingRequests.add(request);
       notifyAll();
     }
   }
 
-  public synchronized void enqueueRequests(final Stream<NodeDataRequest> requests) {
+  public synchronized void enqueueRequests(final Stream<REQUEST> requests) {
     if (!internalFuture.isDone()) {
       requests.forEach(pendingRequests::add);
       notifyAll();
     }
   }
 
-  public synchronized Task<NodeDataRequest> dequeueRequestBlocking() {
+  public synchronized Task<REQUEST> dequeueRequestBlocking() {
     while (!internalFuture.isDone()) {
-      final Task<NodeDataRequest> task = pendingRequests.remove();
+      Task<REQUEST> task = pendingRequests.remove();
       if (task != null) {
         return task;
       }
@@ -155,7 +182,8 @@ public synchronized void setRootNodeData(final Bytes rootNodeData) {
     this.rootNodeData = rootNodeData;
   }
 
-  public synchronized void requestComplete(final boolean madeProgress) {
+  public synchronized void requestComplete(
+      final boolean madeProgress, final long minMillisBeforeStalling) {
     if (madeProgress) {
       requestsSinceLastProgress = 0;
       timestampOfLastProgress = clock.millis();
@@ -168,49 +196,28 @@ public synchronized void requestComplete(final boolean madeProgress) {
     }
   }
 
+  public synchronized void requestComplete(final boolean madeProgress) {
+    requestComplete(madeProgress, minMillisBeforeStalling);
+  }
+
   public int getRequestsSinceLastProgress() {
     return requestsSinceLastProgress;
   }
 
-  private synchronized void markAsStalled(final int maxNodeRequestRetries) {
+  protected synchronized void markAsStalled(final int maxNodeRequestRetries) {
     final String message =
         "Download stalled due to too many failures to retrieve node data (>"
             + maxNodeRequestRetries
             + " requests without making progress)";
+
     final WorldStateDownloaderException e = new StalledDownloadException(message);
     internalFuture.completeExceptionally(e);
   }
 
-  public synchronized boolean checkCompletion(
-      final WorldStateStorage worldStateStorage, final BlockHeader header) {
-    if (!internalFuture.isDone() && pendingRequests.allTasksCompleted()) {
-      if (rootNodeData == null) {
-        enqueueRequest(NodeDataRequest.createAccountDataRequest(header.getStateRoot()));
-        return false;
-      }
-      final Updater updater = worldStateStorage.updater();
-      updater.putAccountStateTrieNode(null, header.getStateRoot(), rootNodeData);
-      updater.commit();
-      internalFuture.complete(null);
-      // THere are no more inputs to process so make sure we wake up any threads waiting to dequeue
-      // so they can give up waiting.
-      notifyAll();
-      LOG.info("Finished downloading world state from peers");
-      return true;
-    } else {
-      return false;
-    }
-  }
-
   public synchronized boolean isDownloading() {
     return !internalFuture.isDone();
   }
 
-  public synchronized void setWorldStateDownloadProcess(
-      final WorldStateDownloadProcess worldStateDownloadProcess) {
-    this.worldStateDownloadProcess = worldStateDownloadProcess;
-  }
-
   public synchronized void notifyTaskAvailable() {
     notifyAll();
   }
@@ -233,4 +240,11 @@ public CompletableFuture<Void> startDownload(
         });
     return downloadFuture;
   }
+
+  public void setWorldStateDownloadProcess(
+      final WorldStateDownloadProcess worldStateDownloadProcess) {
+    this.worldStateDownloadProcess = worldStateDownloadProcess;
+  }
+
+  public abstract boolean checkCompletion(final BlockHeader header);
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloadProcess.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloadProcess.java
index 69f07c1c091..9c35ccd24d1 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloadProcess.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloadProcess.java
@@ -14,231 +14,13 @@
  */
 package org.hyperledger.besu.ethereum.eth.sync.worldstate;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.hyperledger.besu.services.pipeline.PipelineBuilder.createPipelineFrom;
-
-import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
-import org.hyperledger.besu.metrics.BesuMetricCategory;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
-import org.hyperledger.besu.plugin.services.metrics.Counter;
-import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
-import org.hyperledger.besu.services.pipeline.Pipe;
-import org.hyperledger.besu.services.pipeline.Pipeline;
-import org.hyperledger.besu.services.pipeline.PipelineBuilder;
-import org.hyperledger.besu.services.pipeline.WritePipe;
-import org.hyperledger.besu.services.tasks.Task;
-import org.hyperledger.besu.util.ExceptionUtils;
 
-import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-/**
- * Establishes the pipelines required for downloading world state. This involves:
- *
- * <pre>
- *                                ---------------------------
- *                                | Load from Pending Queue |
- *                                ---------------------------
- *                                             |
- *                                             |
- *                                ---------------------------
- *                                |  Is Available Locally?  |
- *                                ---------------------------
- *                             Yes             |             No
- *                    ---------------------------------------------------
- *                    |                                                 |
- *                    |                                                 |
- *                    |                                         ------------------
- *                    |                                         | Create Batches |
- *                    |                                         ------------------
- *                    |                                                 |
- *                    |                                                 |
- *                    |                                       ------------------------
- *                    |                                       |  Request From Peers  |
- *                    |                                       ------------------------
- *                    |                                                 |
- *                    |                                                 |
- *                    |                                         ------------------
- *                    |                                         |  Persist Data  |
- *                    |                                         ------------------
- *                    |                                                 |
- *                    |                                                 |
- *                    ---------------------------------------------------
- *                                             |
- *                                             |
- *                                   ----------------------
- *                                   |  Enqueue Children  |
- *                                   | and Mark Complete  |
- *                                   ----------------------
- * </pre>
- */
-public class WorldStateDownloadProcess {
-  private static final Logger LOG = LogManager.getLogger();
-  private final Pipeline<Task<NodeDataRequest>> fetchDataPipeline;
-  private final Pipeline<Task<NodeDataRequest>> completionPipeline;
-  private final WritePipe<Task<NodeDataRequest>> requestsToComplete;
-
-  private WorldStateDownloadProcess(
-      final Pipeline<Task<NodeDataRequest>> fetchDataPipeline,
-      final Pipeline<Task<NodeDataRequest>> completionPipeline,
-      final WritePipe<Task<NodeDataRequest>> requestsToComplete) {
-    this.fetchDataPipeline = fetchDataPipeline;
-    this.completionPipeline = completionPipeline;
-    this.requestsToComplete = requestsToComplete;
-  }
-
-  public static Builder builder() {
-    return new Builder();
-  }
-
-  public CompletableFuture<Void> start(final EthScheduler ethScheduler) {
-    final CompletableFuture<Void> fetchDataFuture = ethScheduler.startPipeline(fetchDataPipeline);
-    final CompletableFuture<Void> completionFuture = ethScheduler.startPipeline(completionPipeline);
-
-    fetchDataFuture.whenComplete(
-        (result, error) -> {
-          if (error != null) {
-            if (!(ExceptionUtils.rootCause(error) instanceof CancellationException)) {
-              LOG.error("Pipeline failed", error);
-            }
-            completionPipeline.abort();
-          } else {
-            // No more data to fetch, so propagate the pipe closure onto the completion pipe.
-            requestsToComplete.close();
-          }
-        });
-
-    completionFuture.exceptionally(
-        error -> {
-          if (!(ExceptionUtils.rootCause(error) instanceof CancellationException)) {
-            LOG.error("Pipeline failed", error);
-          }
-          fetchDataPipeline.abort();
-          return null;
-        });
-    return completionFuture;
-  }
-
-  public void abort() {
-    fetchDataPipeline.abort();
-    completionPipeline.abort();
-  }
-
-  public static class Builder {
-
-    private int hashCountPerRequest;
-    private int maxOutstandingRequests;
-    private LoadLocalDataStep loadLocalDataStep;
-    private WorldDownloadState downloadState;
-    private MetricsSystem metricsSystem;
-    private RequestDataStep requestDataStep;
-    private BlockHeader pivotBlockHeader;
-    private PersistDataStep persistDataStep;
-    private CompleteTaskStep completeTaskStep;
-
-    public Builder hashCountPerRequest(final int hashCountPerRequest) {
-      this.hashCountPerRequest = hashCountPerRequest;
-      return this;
-    }
-
-    public Builder maxOutstandingRequests(final int maxOutstandingRequests) {
-      this.maxOutstandingRequests = maxOutstandingRequests;
-      return this;
-    }
-
-    public Builder loadLocalDataStep(final LoadLocalDataStep loadLocalDataStep) {
-      this.loadLocalDataStep = loadLocalDataStep;
-      return this;
-    }
-
-    public Builder requestDataStep(final RequestDataStep requestDataStep) {
-      this.requestDataStep = requestDataStep;
-      return this;
-    }
-
-    public Builder persistDataStep(final PersistDataStep persistDataStep) {
-      this.persistDataStep = persistDataStep;
-      return this;
-    }
-
-    public Builder completeTaskStep(final CompleteTaskStep completeTaskStep) {
-      this.completeTaskStep = completeTaskStep;
-      return this;
-    }
-
-    public Builder downloadState(final WorldDownloadState downloadState) {
-      this.downloadState = downloadState;
-      return this;
-    }
-
-    public Builder pivotBlockHeader(final BlockHeader pivotBlockHeader) {
-      this.pivotBlockHeader = pivotBlockHeader;
-      return this;
-    }
-
-    public Builder metricsSystem(final MetricsSystem metricsSystem) {
-      this.metricsSystem = metricsSystem;
-      return this;
-    }
-
-    public WorldStateDownloadProcess build() {
-      checkNotNull(loadLocalDataStep);
-      checkNotNull(requestDataStep);
-      checkNotNull(persistDataStep);
-      checkNotNull(completeTaskStep);
-      checkNotNull(downloadState);
-      checkNotNull(pivotBlockHeader);
-      checkNotNull(metricsSystem);
-
-      // Room for the requests we expect to do in parallel plus some buffer but not unlimited.
-      final int bufferCapacity = hashCountPerRequest * 2;
-      final LabelledMetric<Counter> outputCounter =
-          metricsSystem.createLabelledCounter(
-              BesuMetricCategory.SYNCHRONIZER,
-              "world_state_pipeline_processed_total",
-              "Number of entries processed by each world state download pipeline stage",
-              "step",
-              "action");
-
-      final Pipeline<Task<NodeDataRequest>> completionPipeline =
-          PipelineBuilder.<Task<NodeDataRequest>>createPipeline(
-                  "requestDataAvailable", bufferCapacity, outputCounter)
-              .andFinishWith(
-                  "requestCompleteTask",
-                  task ->
-                      completeTaskStep.markAsCompleteOrFailed(
-                          pivotBlockHeader, downloadState, task));
+public interface WorldStateDownloadProcess {
 
-      final Pipe<Task<NodeDataRequest>> requestsToComplete = completionPipeline.getInputPipe();
-      final Pipeline<Task<NodeDataRequest>> fetchDataPipeline =
-          createPipelineFrom(
-                  "requestDequeued",
-                  new TaskQueueIterator(downloadState),
-                  bufferCapacity,
-                  outputCounter)
-              .thenFlatMapInParallel(
-                  "requestLoadLocalData",
-                  task -> loadLocalDataStep.loadLocalData(task, requestsToComplete),
-                  3,
-                  bufferCapacity)
-              .inBatches(hashCountPerRequest)
-              .thenProcessAsync(
-                  "batchDownloadData",
-                  requestTasks ->
-                      requestDataStep.requestData(requestTasks, pivotBlockHeader, downloadState),
-                  maxOutstandingRequests)
-              .thenProcess(
-                  "batchPersistData",
-                  tasks -> persistDataStep.persist(tasks, pivotBlockHeader, downloadState))
-              .andFinishWith(
-                  "batchDataDownloaded", tasks -> tasks.forEach(requestsToComplete::put));
+  CompletableFuture<Void> start(final EthScheduler ethScheduler);
 
-      return new WorldStateDownloadProcess(
-          fetchDataPipeline, completionPipeline, requestsToComplete);
-    }
-  }
+  void abort();
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloadStatus.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloadStatus.java
index 2e88f46c65c..9c38b0e18b8 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloadStatus.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloadStatus.java
@@ -20,7 +20,7 @@
 
 public interface WorldStateDownloadStatus {
 
-  public Optional<Long> getPulledStates();
+  Optional<Long> getPulledStates();
 
-  public Optional<Long> getKnownStates();
+  Optional<Long> getKnownStates();
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloader.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloader.java
index e0e988bd0ce..1a4f888a61c 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloader.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloader.java
@@ -14,155 +14,15 @@
  */
 package org.hyperledger.besu.ethereum.eth.sync.worldstate;
 
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.eth.manager.EthContext;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
-import org.hyperledger.besu.metrics.BesuMetricCategory;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
-import org.hyperledger.besu.services.tasks.CachingTaskCollection;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncActions;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncState;
 
-import java.time.Clock;
-import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Function;
-import java.util.function.IntSupplier;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+public interface WorldStateDownloader extends WorldStateDownloadStatus {
 
-public class WorldStateDownloader implements WorldStateDownloadStatus {
-  private static final Logger LOG = LogManager.getLogger();
+  CompletableFuture<Void> run(
+      final FastSyncActions fastSyncActions, final FastSyncState fastSyncState);
 
-  private final long minMillisBeforeStalling;
-  private final Clock clock;
-  private final MetricsSystem metricsSystem;
-
-  private final EthContext ethContext;
-  private final CachingTaskCollection<NodeDataRequest> taskCollection;
-  private final int hashCountPerRequest;
-  private final int maxOutstandingRequests;
-  private final int maxNodeRequestsWithoutProgress;
-  private final WorldStateStorage worldStateStorage;
-
-  private final AtomicReference<WorldDownloadState> downloadState = new AtomicReference<>();
-
-  private Optional<CompleteTaskStep> maybeCompleteTask = Optional.empty();
-
-  public WorldStateDownloader(
-      final EthContext ethContext,
-      final WorldStateStorage worldStateStorage,
-      final CachingTaskCollection<NodeDataRequest> taskCollection,
-      final int hashCountPerRequest,
-      final int maxOutstandingRequests,
-      final int maxNodeRequestsWithoutProgress,
-      final long minMillisBeforeStalling,
-      final Clock clock,
-      final MetricsSystem metricsSystem) {
-    this.ethContext = ethContext;
-    this.worldStateStorage = worldStateStorage;
-    this.taskCollection = taskCollection;
-    this.hashCountPerRequest = hashCountPerRequest;
-    this.maxOutstandingRequests = maxOutstandingRequests;
-    this.maxNodeRequestsWithoutProgress = maxNodeRequestsWithoutProgress;
-    this.minMillisBeforeStalling = minMillisBeforeStalling;
-    this.clock = clock;
-    this.metricsSystem = metricsSystem;
-
-    metricsSystem.createIntegerGauge(
-        BesuMetricCategory.SYNCHRONIZER,
-        "world_state_node_requests_since_last_progress_current",
-        "Number of world state requests made since the last time new data was returned",
-        downloadStateValue(WorldDownloadState::getRequestsSinceLastProgress));
-
-    metricsSystem.createIntegerGauge(
-        BesuMetricCategory.SYNCHRONIZER,
-        "world_state_inflight_requests_current",
-        "Number of in progress requests for world state data",
-        downloadStateValue(WorldDownloadState::getOutstandingTaskCount));
-  }
-
-  private IntSupplier downloadStateValue(final Function<WorldDownloadState, Integer> getter) {
-    return () -> {
-      final WorldDownloadState state = this.downloadState.get();
-      return state != null ? getter.apply(state) : 0;
-    };
-  }
-
-  public CompletableFuture<Void> run(final BlockHeader header) {
-    synchronized (this) {
-      final WorldDownloadState oldDownloadState = this.downloadState.get();
-      if (oldDownloadState != null && oldDownloadState.isDownloading()) {
-        final CompletableFuture<Void> failed = new CompletableFuture<>();
-        failed.completeExceptionally(
-            new IllegalStateException(
-                "Cannot run an already running " + this.getClass().getSimpleName()));
-        return failed;
-      }
-
-      final Hash stateRoot = header.getStateRoot();
-      if (worldStateStorage.isWorldStateAvailable(stateRoot)) {
-        LOG.info(
-            "World state already available for block {} ({}). State root {}",
-            header.getNumber(),
-            header.getHash(),
-            stateRoot);
-        return CompletableFuture.completedFuture(null);
-      }
-      LOG.info(
-          "Begin downloading world state from peers for block {} ({}). State root {}",
-          header.getNumber(),
-          header.getHash(),
-          stateRoot);
-
-      final WorldDownloadState newDownloadState =
-          new WorldDownloadState(
-              taskCollection, maxNodeRequestsWithoutProgress, minMillisBeforeStalling, clock);
-      this.downloadState.set(newDownloadState);
-
-      if (!newDownloadState.downloadWasResumed()) {
-        // Only queue the root node if we're starting a new download from scratch
-        newDownloadState.enqueueRequest(NodeDataRequest.createAccountDataRequest(stateRoot));
-      }
-
-      maybeCompleteTask =
-          Optional.of(new CompleteTaskStep(worldStateStorage, metricsSystem, taskCollection::size));
-      final WorldStateDownloadProcess downloadProcess =
-          WorldStateDownloadProcess.builder()
-              .hashCountPerRequest(hashCountPerRequest)
-              .maxOutstandingRequests(maxOutstandingRequests)
-              .loadLocalDataStep(new LoadLocalDataStep(worldStateStorage, metricsSystem))
-              .requestDataStep(new RequestDataStep(ethContext, metricsSystem))
-              .persistDataStep(new PersistDataStep(worldStateStorage))
-              .completeTaskStep(maybeCompleteTask.get())
-              .downloadState(newDownloadState)
-              .pivotBlockHeader(header)
-              .metricsSystem(metricsSystem)
-              .build();
-
-      newDownloadState.setWorldStateDownloadProcess(downloadProcess);
-
-      return newDownloadState.startDownload(downloadProcess, ethContext.getScheduler());
-    }
-  }
-
-  public void cancel() {
-    synchronized (this) {
-      final WorldDownloadState downloadState = this.downloadState.get();
-      if (downloadState != null) {
-        downloadState.getDownloadFuture().cancel(true);
-      }
-    }
-  }
-
-  @Override
-  public Optional<Long> getPulledStates() {
-    return maybeCompleteTask.map(CompleteTaskStep::getCompletedRequests);
-  }
-
-  @Override
-  public Optional<Long> getKnownStates() {
-    return maybeCompleteTask.map(task -> task.getCompletedRequests() + task.getPendingRequests());
-  }
+  void cancel();
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/DisabledPendingTransactions.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/DisabledPendingTransactions.java
new file mode 100644
index 00000000000..da77f6f3196
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/DisabledPendingTransactions.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.evm.account.Account;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.OptionalLong;
+
+/** This is a no-op implementation, that is used when the txpool is disabled */
+public class DisabledPendingTransactions implements PendingTransactions {
+
+  @Override
+  public void reset() {}
+
+  @Override
+  public void evictOldTransactions() {}
+
+  @Override
+  public List<Transaction> getLocalTransactions() {
+    return List.of();
+  }
+
+  @Override
+  public TransactionAddedResult addRemoteTransaction(
+      final Transaction transaction, final Optional<Account> maybeSenderAccount) {
+    return TransactionAddedResult.DISABLED;
+  }
+
+  @Override
+  public TransactionAddedResult addLocalTransaction(
+      final Transaction transaction, final Optional<Account> maybeSenderAccount) {
+    return TransactionAddedResult.DISABLED;
+  }
+
+  @Override
+  public void selectTransactions(final TransactionSelector selector) {}
+
+  @Override
+  public long maxSize() {
+    return 0;
+  }
+
+  @Override
+  public int size() {
+    return 0;
+  }
+
+  @Override
+  public boolean containsTransaction(final Transaction transaction) {
+    return false;
+  }
+
+  @Override
+  public Optional<Transaction> getTransactionByHash(final Hash transactionHash) {
+    return Optional.empty();
+  }
+
+  @Override
+  public Collection<PendingTransaction> getPendingTransactions() {
+    return List.of();
+  }
+
+  @Override
+  public long subscribePendingTransactions(final PendingTransactionAddedListener listener) {
+    return 0;
+  }
+
+  @Override
+  public void unsubscribePendingTransactions(final long id) {}
+
+  @Override
+  public long subscribeDroppedTransactions(final PendingTransactionDroppedListener listener) {
+    return 0;
+  }
+
+  @Override
+  public void unsubscribeDroppedTransactions(final long id) {}
+
+  @Override
+  public OptionalLong getNextNonceForSender(final Address sender) {
+    return OptionalLong.empty();
+  }
+
+  @Override
+  public void manageBlockAdded(
+      final BlockHeader blockHeader,
+      final List<Transaction> confirmedTransactions,
+      final List<Transaction> reorgTransactions,
+      final FeeMarket feeMarket) {}
+
+  @Override
+  public String toTraceLog() {
+    return "Disabled";
+  }
+
+  @Override
+  public String logStats() {
+    return "Disabled";
+  }
+
+  @Override
+  public boolean isLocalSender(final Address sender) {
+    return false;
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/NewPooledTransactionHashesMessageHandler.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/NewPooledTransactionHashesMessageHandler.java
new file mode 100644
index 00000000000..ab909eada13
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/NewPooledTransactionHashesMessageHandler.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions;
+
+import static java.time.Instant.now;
+
+import org.hyperledger.besu.ethereum.eth.EthProtocol;
+import org.hyperledger.besu.ethereum.eth.manager.EthMessage;
+import org.hyperledger.besu.ethereum.eth.manager.EthMessages;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.eth.messages.NewPooledTransactionHashesMessage;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+class NewPooledTransactionHashesMessageHandler implements EthMessages.MessageCallback {
+
+  private final NewPooledTransactionHashesMessageProcessor transactionsMessageProcessor;
+  private final EthScheduler scheduler;
+  private final Duration txMsgKeepAlive;
+  private final AtomicBoolean isEnabled = new AtomicBoolean(false);
+
+  public NewPooledTransactionHashesMessageHandler(
+      final EthScheduler scheduler,
+      final NewPooledTransactionHashesMessageProcessor transactionsMessageProcessor,
+      final int txMsgKeepAliveSeconds) {
+    this.scheduler = scheduler;
+    this.transactionsMessageProcessor = transactionsMessageProcessor;
+    this.txMsgKeepAlive = Duration.ofSeconds(txMsgKeepAliveSeconds);
+  }
+
+  @Override
+  public void exec(final EthMessage message) {
+    final Capability capability = message.getPeer().getConnection().capability(EthProtocol.NAME);
+    final NewPooledTransactionHashesMessage transactionsMessage =
+        NewPooledTransactionHashesMessage.readFrom(message.getData(), capability);
+    final Instant startedAt = now();
+    if (isEnabled.get()) {
+      scheduler.scheduleTxWorkerTask(
+          () ->
+              transactionsMessageProcessor.processNewPooledTransactionHashesMessage(
+                  message.getPeer(), transactionsMessage, startedAt, txMsgKeepAlive));
+    }
+  }
+
+  public void setEnabled() {
+    isEnabled.set(true);
+  }
+
+  public void setDisabled() {
+    isEnabled.set(false);
+  }
+
+  public boolean isEnabled() {
+    return isEnabled.get();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/NewPooledTransactionHashesMessageProcessor.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/NewPooledTransactionHashesMessageProcessor.java
new file mode 100644
index 00000000000..4717e2d9e1d
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/NewPooledTransactionHashesMessageProcessor.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions;
+
+import static java.time.Instant.now;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.task.BufferedGetPooledTransactionsFromPeerFetcher;
+import org.hyperledger.besu.ethereum.eth.messages.NewPooledTransactionHashesMessage;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
+import org.hyperledger.besu.ethereum.rlp.RLPException;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
+import java.util.stream.Collectors;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class NewPooledTransactionHashesMessageProcessor {
+
+  private static final Logger LOG =
+      LoggerFactory.getLogger(NewPooledTransactionHashesMessageProcessor.class);
+
+  static final String METRIC_LABEL = "new_pooled_transaction_hashes";
+
+  private final ConcurrentHashMap<EthPeer, BufferedGetPooledTransactionsFromPeerFetcher>
+      scheduledTasks;
+
+  private final PeerTransactionTracker transactionTracker;
+  private final TransactionPool transactionPool;
+  private final TransactionPoolConfiguration transactionPoolConfiguration;
+  private final EthContext ethContext;
+  private final TransactionPoolMetrics metrics;
+
+  public NewPooledTransactionHashesMessageProcessor(
+      final PeerTransactionTracker transactionTracker,
+      final TransactionPool transactionPool,
+      final TransactionPoolConfiguration transactionPoolConfiguration,
+      final EthContext ethContext,
+      final TransactionPoolMetrics metrics) {
+    this.transactionTracker = transactionTracker;
+    this.transactionPool = transactionPool;
+    this.transactionPoolConfiguration = transactionPoolConfiguration;
+    this.ethContext = ethContext;
+    this.metrics = metrics;
+    metrics.initExpiredMessagesCounter(METRIC_LABEL);
+    this.scheduledTasks = new ConcurrentHashMap<>();
+  }
+
+  void processNewPooledTransactionHashesMessage(
+      final EthPeer peer,
+      final NewPooledTransactionHashesMessage transactionsMessage,
+      final Instant startedAt,
+      final Duration keepAlive) {
+    // Check if message is not expired.
+    if (startedAt.plus(keepAlive).isAfter(now())) {
+      this.processNewPooledTransactionHashesMessage(peer, transactionsMessage);
+    } else {
+      metrics.incrementExpiredMessages(METRIC_LABEL);
+    }
+  }
+
+  @SuppressWarnings("UnstableApiUsage")
+  private void processNewPooledTransactionHashesMessage(
+      final EthPeer peer, final NewPooledTransactionHashesMessage transactionsMessage) {
+    try {
+      final List<Hash> incomingTransactionHashes = transactionsMessage.pendingTransactionHashes();
+
+      LOG.atTrace()
+          .setMessage(
+              "Received pooled transaction hashes message from {}, incoming hashes {}, incoming list {}")
+          .addArgument(peer)
+          .addArgument(incomingTransactionHashes::size)
+          .addArgument(incomingTransactionHashes)
+          .log();
+
+      final BufferedGetPooledTransactionsFromPeerFetcher bufferedTask =
+          scheduledTasks.computeIfAbsent(
+              peer,
+              ethPeer -> {
+                final ScheduledFuture<?> scheduledFuture =
+                    ethContext
+                        .getScheduler()
+                        .scheduleFutureTaskWithFixedDelay(
+                            new FetcherCreatorTask(peer),
+                            transactionPoolConfiguration.getEth65TrxAnnouncedBufferingPeriod(),
+                            transactionPoolConfiguration.getEth65TrxAnnouncedBufferingPeriod());
+
+                return new BufferedGetPooledTransactionsFromPeerFetcher(
+                    ethContext,
+                    scheduledFuture,
+                    peer,
+                    transactionPool,
+                    transactionTracker,
+                    metrics,
+                    METRIC_LABEL);
+              });
+
+      bufferedTask.addHashes(
+          incomingTransactionHashes.stream()
+              .filter(hash -> transactionPool.getTransactionByHash(hash).isEmpty())
+              .collect(Collectors.toList()));
+    } catch (final RLPException ex) {
+      if (peer != null) {
+        LOG.debug(
+            "Malformed pooled transaction hashes message received (BREACH_OF_PROTOCOL), disconnecting: {}",
+            peer,
+            ex);
+        LOG.trace("Message data: {}", transactionsMessage.getData());
+        peer.disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
+      }
+    }
+  }
+
+  public class FetcherCreatorTask implements Runnable {
+    final EthPeer peer;
+
+    public FetcherCreatorTask(final EthPeer peer) {
+      this.peer = peer;
+    }
+
+    @Override
+    public void run() {
+      if (peer != null) {
+        if (peer.isDisconnected()) {
+          scheduledTasks.remove(peer).getScheduledFuture().cancel(true);
+        } else if (peer.hasAvailableRequestCapacity()) {
+          scheduledTasks.get(peer).requestTransactions();
+        }
+      }
+    }
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/NewPooledTransactionHashesMessageSender.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/NewPooledTransactionHashesMessageSender.java
new file mode 100644
index 00000000000..2071226b605
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/NewPooledTransactionHashesMessageSender.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions;
+
+import static org.hyperledger.besu.ethereum.core.Transaction.toHashList;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.EthProtocol;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.messages.NewPooledTransactionHashesMessage;
+import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
+
+import java.util.List;
+
+import com.google.common.collect.Iterables;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+class NewPooledTransactionHashesMessageSender {
+  private static final Logger LOG =
+      LoggerFactory.getLogger(NewPooledTransactionHashesMessageSender.class);
+  private static final int MAX_TRANSACTIONS_HASHES = 4096;
+
+  private final PeerTransactionTracker transactionTracker;
+
+  public NewPooledTransactionHashesMessageSender(final PeerTransactionTracker transactionTracker) {
+    this.transactionTracker = transactionTracker;
+  }
+
+  public void sendTransactionHashesToPeer(final EthPeer peer) {
+    final Capability capability = peer.getConnection().capability(EthProtocol.NAME);
+    for (final List<Transaction> txBatch :
+        Iterables.partition(
+            transactionTracker.claimTransactionsToSendToPeer(peer), MAX_TRANSACTIONS_HASHES)) {
+      try {
+        final List<Hash> txHashes = toHashList(txBatch);
+        LOG.atTrace()
+            .setMessage(
+                "Sending transaction hashes to peer {}, transaction hashes count {}, list {}")
+            .addArgument(peer)
+            .addArgument(txHashes::size)
+            .addArgument(txHashes)
+            .log();
+
+        final NewPooledTransactionHashesMessage message =
+            NewPooledTransactionHashesMessage.create(txBatch, capability);
+        peer.send(message);
+      } catch (final PeerNotConnected unused) {
+        break;
+      }
+    }
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PeerPendingTransactionTracker.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PeerPendingTransactionTracker.java
deleted file mode 100644
index 43dd04a8326..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PeerPendingTransactionTracker.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.transactions;
-
-import static java.util.Collections.emptySet;
-
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
-import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-
-public class PeerPendingTransactionTracker implements EthPeer.DisconnectCallback {
-  private static final int MAX_TRACKED_SEEN_TRANSACTIONS = 10_000;
-  private final Map<EthPeer, Set<Hash>> seenTransactions = new ConcurrentHashMap<>();
-  private final Map<EthPeer, Set<Hash>> transactionsToSend = new ConcurrentHashMap<>();
-  private final PendingTransactions pendingTransactions;
-
-  public PeerPendingTransactionTracker(final PendingTransactions pendingTransactions) {
-    this.pendingTransactions = pendingTransactions;
-  }
-
-  public synchronized void markTransactionsHashesAsSeen(
-      final EthPeer peer, final Collection<Hash> transactions) {
-    final Set<Hash> seenTransactionsForPeer = getOrCreateSeenTransactionsForPeer(peer);
-    transactions.stream().forEach(seenTransactionsForPeer::add);
-  }
-
-  public synchronized void addToPeerSendQueue(final EthPeer peer, final Hash hash) {
-    if (!hasPeerSeenTransaction(peer, hash)) {
-      transactionsToSend.computeIfAbsent(peer, key -> createTransactionsSet()).add(hash);
-    }
-  }
-
-  public Iterable<EthPeer> getEthPeersWithUnsentTransactions() {
-    return transactionsToSend.keySet();
-  }
-
-  public synchronized Set<Hash> claimTransactionsToSendToPeer(final EthPeer peer) {
-    final Set<Hash> transactionsToSend = this.transactionsToSend.remove(peer);
-    if (transactionsToSend != null) {
-      markTransactionsHashesAsSeen(
-          peer,
-          transactionsToSend.stream()
-              .filter(h -> pendingTransactions.getTransactionByHash(h).isPresent())
-              .collect(Collectors.toSet()));
-      return transactionsToSend;
-    } else {
-      return emptySet();
-    }
-  }
-
-  public boolean isPeerSupported(final EthPeer peer, final Capability capability) {
-    return peer.getAgreedCapabilities().contains(capability);
-  }
-
-  private Set<Hash> getOrCreateSeenTransactionsForPeer(final EthPeer peer) {
-    return seenTransactions.computeIfAbsent(peer, key -> createTransactionsSet());
-  }
-
-  private boolean hasPeerSeenTransaction(final EthPeer peer, final Hash hash) {
-    final Set<Hash> seenTransactionsForPeer = seenTransactions.get(peer);
-    return seenTransactionsForPeer != null && seenTransactionsForPeer.contains(hash);
-  }
-
-  private <T> Set<T> createTransactionsSet() {
-    return Collections.newSetFromMap(
-        new LinkedHashMap<T, Boolean>(1 << 4, 0.75f, true) {
-          @Override
-          protected boolean removeEldestEntry(final Map.Entry<T, Boolean> eldest) {
-            return size() > MAX_TRACKED_SEEN_TRANSACTIONS;
-          }
-        });
-  }
-
-  @Override
-  public void onDisconnect(final EthPeer peer) {
-    seenTransactions.remove(peer);
-    transactionsToSend.remove(peer);
-  }
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PeerTransactionTracker.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PeerTransactionTracker.java
index 4e517b26b3e..fc6b0f1d819 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PeerTransactionTracker.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PeerTransactionTracker.java
@@ -15,8 +15,9 @@
 package org.hyperledger.besu.ethereum.eth.transactions;
 
 import static java.util.Collections.emptySet;
+import static org.hyperledger.besu.ethereum.core.Transaction.toHashList;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 
@@ -28,14 +29,24 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 public class PeerTransactionTracker implements EthPeer.DisconnectCallback {
-  private static final int MAX_TRACKED_SEEN_TRANSACTIONS = 10_000;
+  private static final int MAX_TRACKED_SEEN_TRANSACTIONS = 100_000;
   private final Map<EthPeer, Set<Hash>> seenTransactions = new ConcurrentHashMap<>();
   private final Map<EthPeer, Set<Transaction>> transactionsToSend = new ConcurrentHashMap<>();
 
+  public void reset() {
+    seenTransactions.clear();
+    transactionsToSend.clear();
+  }
+
   public synchronized void markTransactionsAsSeen(
       final EthPeer peer, final Collection<Transaction> transactions) {
+    markTransactionHashesAsSeen(peer, toHashList(transactions));
+  }
+
+  public synchronized void markTransactionHashesAsSeen(
+      final EthPeer peer, final Collection<Hash> txHashes) {
     final Set<Hash> seenTransactionsForPeer = getOrCreateSeenTransactionsForPeer(peer);
-    transactions.stream().map(Transaction::getHash).forEach(seenTransactionsForPeer::add);
+    seenTransactionsForPeer.addAll(txHashes);
   }
 
   public synchronized void addToPeerSendQueue(final EthPeer peer, final Transaction transaction) {
@@ -58,19 +69,26 @@ public synchronized Set<Transaction> claimTransactionsToSendToPeer(final EthPeer
     }
   }
 
+  public boolean hasSeenTransaction(final Hash txHash) {
+    return seenTransactions.values().stream().anyMatch(seen -> seen.contains(txHash));
+  }
+
   private Set<Hash> getOrCreateSeenTransactionsForPeer(final EthPeer peer) {
     return seenTransactions.computeIfAbsent(peer, key -> createTransactionsSet());
   }
 
-  private boolean hasPeerSeenTransaction(final EthPeer peer, final Transaction transaction) {
+  boolean hasPeerSeenTransaction(final EthPeer peer, final Transaction transaction) {
+    return hasPeerSeenTransaction(peer, transaction.getHash());
+  }
+
+  boolean hasPeerSeenTransaction(final EthPeer peer, final Hash txHash) {
     final Set<Hash> seenTransactionsForPeer = seenTransactions.get(peer);
-    return seenTransactionsForPeer != null
-        && seenTransactionsForPeer.contains(transaction.getHash());
+    return seenTransactionsForPeer != null && seenTransactionsForPeer.contains(txHash);
   }
 
   private <T> Set<T> createTransactionsSet() {
     return Collections.newSetFromMap(
-        new LinkedHashMap<T, Boolean>(1 << 4, 0.75f, true) {
+        new LinkedHashMap<>(1 << 4, 0.75f, true) {
           @Override
           protected boolean removeEldestEntry(final Map.Entry<T, Boolean> eldest) {
             return size() > MAX_TRACKED_SEEN_TRANSACTIONS;
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransaction.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransaction.java
new file mode 100644
index 00000000000..656dc2c802c
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransaction.java
@@ -0,0 +1,231 @@
+/*
+ * Copyright Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.evm.AccessListEntry;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * Tracks the additional metadata associated with transactions to enable prioritization for mining
+ * and deciding which transactions to drop when the transaction pool reaches its size limit.
+ */
+public abstract class PendingTransaction {
+  static final int NOT_INITIALIZED = -1;
+  static final int FRONTIER_BASE_MEMORY_SIZE = 944;
+  static final int ACCESS_LIST_BASE_MEMORY_SIZE = 944;
+  static final int EIP1559_BASE_MEMORY_SIZE = 1056;
+  static final int OPTIONAL_TO_MEMORY_SIZE = 92;
+  static final int PAYLOAD_BASE_MEMORY_SIZE = 32;
+  static final int ACCESS_LIST_STORAGE_KEY_MEMORY_SIZE = 32;
+  static final int ACCESS_LIST_ENTRY_BASE_MEMORY_SIZE = 128;
+  static final int OPTIONAL_ACCESS_LIST_MEMORY_SIZE = 24;
+  static final int PENDING_TRANSACTION_MEMORY_SIZE = 40;
+  private static final AtomicLong TRANSACTIONS_ADDED = new AtomicLong();
+  private final Transaction transaction;
+  private final long addedAt;
+  private final long sequence; // Allows prioritization based on order transactions are added
+
+  private int memorySize = NOT_INITIALIZED;
+
+  protected PendingTransaction(final Transaction transaction, final long addedAt) {
+    this.transaction = transaction;
+    this.addedAt = addedAt;
+    this.sequence = TRANSACTIONS_ADDED.getAndIncrement();
+  }
+
+  public Transaction getTransaction() {
+    return transaction;
+  }
+
+  public Wei getGasPrice() {
+    return transaction.getGasPrice().orElse(Wei.ZERO);
+  }
+
+  public long getSequence() {
+    return sequence;
+  }
+
+  public long getNonce() {
+    return transaction.getNonce();
+  }
+
+  public Address getSender() {
+    return transaction.getSender();
+  }
+
+  public abstract boolean isReceivedFromLocalSource();
+
+  public Hash getHash() {
+    return transaction.getHash();
+  }
+
+  public long getAddedAt() {
+    return addedAt;
+  }
+
+  public int memorySize() {
+    if (memorySize == NOT_INITIALIZED) {
+      memorySize = computeMemorySize();
+    }
+    return memorySize;
+  }
+
+  private int computeMemorySize() {
+    return switch (transaction.getType()) {
+          case FRONTIER -> computeFrontierMemorySize();
+          case ACCESS_LIST -> computeAccessListMemorySize();
+          case EIP1559 -> computeEIP1559MemorySize();
+          case BLOB -> computeBlobMemorySize();
+        }
+        + PENDING_TRANSACTION_MEMORY_SIZE;
+  }
+
+  private int computeFrontierMemorySize() {
+    return FRONTIER_BASE_MEMORY_SIZE + computePayloadMemorySize() + computeToMemorySize();
+  }
+
+  private int computeAccessListMemorySize() {
+    return ACCESS_LIST_BASE_MEMORY_SIZE
+        + computePayloadMemorySize()
+        + computeToMemorySize()
+        + computeAccessListEntriesMemorySize();
+  }
+
+  private int computeEIP1559MemorySize() {
+    return EIP1559_BASE_MEMORY_SIZE
+        + computePayloadMemorySize()
+        + computeToMemorySize()
+        + computeAccessListEntriesMemorySize();
+  }
+
+  private int computeBlobMemorySize() {
+    // ToDo 4844: adapt for blobs
+    return computeEIP1559MemorySize();
+  }
+
+  private int computePayloadMemorySize() {
+    return PAYLOAD_BASE_MEMORY_SIZE + transaction.getPayload().size();
+  }
+
+  private int computeToMemorySize() {
+    if (transaction.getTo().isPresent()) {
+      return OPTIONAL_TO_MEMORY_SIZE;
+    }
+    return 0;
+  }
+
+  private int computeAccessListEntriesMemorySize() {
+    return transaction
+        .getAccessList()
+        .map(
+            al -> {
+              int totalSize = OPTIONAL_ACCESS_LIST_MEMORY_SIZE;
+              totalSize += al.size() * ACCESS_LIST_ENTRY_BASE_MEMORY_SIZE;
+              totalSize +=
+                  al.stream().map(AccessListEntry::getStorageKeys).mapToInt(List::size).sum()
+                      * ACCESS_LIST_STORAGE_KEY_MEMORY_SIZE;
+              return totalSize;
+            })
+        .orElse(0);
+  }
+
+  public static List<Transaction> toTransactionList(
+      final Collection<PendingTransaction> transactionsInfo) {
+    return transactionsInfo.stream().map(PendingTransaction::getTransaction).toList();
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+
+    PendingTransaction that = (PendingTransaction) o;
+
+    return sequence == that.sequence;
+  }
+
+  @Override
+  public int hashCode() {
+    return 31 * (int) (sequence ^ (sequence >>> 32));
+  }
+
+  @Override
+  public String toString() {
+    return "Hash="
+        + transaction.getHash().toShortHexString()
+        + ", nonce="
+        + transaction.getNonce()
+        + ", sender="
+        + transaction.getSender().toShortHexString()
+        + ", addedAt="
+        + addedAt
+        + ", sequence="
+        + sequence
+        + '}';
+  }
+
+  public String toTraceLog() {
+    return "{sequence: "
+        + sequence
+        + ", addedAt: "
+        + addedAt
+        + ", "
+        + transaction.toTraceLog()
+        + "}";
+  }
+
+  public static class Local extends PendingTransaction {
+
+    public Local(final Transaction transaction, final long addedAt) {
+      super(transaction, addedAt);
+    }
+
+    public Local(final Transaction transaction) {
+      this(transaction, System.currentTimeMillis());
+    }
+
+    @Override
+    public boolean isReceivedFromLocalSource() {
+      return true;
+    }
+  }
+
+  public static class Remote extends PendingTransaction {
+
+    public Remote(final Transaction transaction, final long addedAt) {
+      super(transaction, addedAt);
+    }
+
+    public Remote(final Transaction transaction) {
+      this(transaction, System.currentTimeMillis());
+    }
+
+    @Override
+    public boolean isReceivedFromLocalSource() {
+      return false;
+    }
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionAddedListener.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionAddedListener.java
new file mode 100644
index 00000000000..6e8adee7108
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionAddedListener.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions;
+
+import org.hyperledger.besu.ethereum.core.Transaction;
+
+@FunctionalInterface
+public interface PendingTransactionAddedListener {
+
+  void onTransactionAdded(Transaction transaction);
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionListener.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionListener.java
deleted file mode 100644
index d925b6311a0..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionListener.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.transactions;
-
-import org.hyperledger.besu.ethereum.core.Transaction;
-
-@FunctionalInterface
-public interface PendingTransactionListener {
-
-  void onTransactionAdded(Transaction transaction);
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionSender.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionSender.java
deleted file mode 100644
index 46c7d8ad1b5..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionSender.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.transactions;
-
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.eth.EthProtocol;
-import org.hyperledger.besu.ethereum.eth.manager.EthContext;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool.TransactionBatchAddedListener;
-
-class PendingTransactionSender implements TransactionBatchAddedListener {
-
-  private final PeerPendingTransactionTracker transactionTracker;
-  private final PendingTransactionsMessageSender transactionsMessageSender;
-  private final EthContext ethContext;
-
-  public PendingTransactionSender(
-      final PeerPendingTransactionTracker transactionTracker,
-      final PendingTransactionsMessageSender transactionsMessageSender,
-      final EthContext ethContext) {
-    this.transactionTracker = transactionTracker;
-    this.transactionsMessageSender = transactionsMessageSender;
-    this.ethContext = ethContext;
-  }
-
-  @Override
-  public void onTransactionsAdded(final Iterable<Transaction> transactions) {
-    ethContext
-        .getEthPeers()
-        .streamAvailablePeers()
-        .filter(peer -> transactionTracker.isPeerSupported(peer, EthProtocol.ETH65))
-        .forEach(
-            peer ->
-                transactions.forEach(
-                    transaction ->
-                        transactionTracker.addToPeerSendQueue(peer, transaction.getHash())));
-    ethContext
-        .getScheduler()
-        .scheduleSyncWorkerTask(transactionsMessageSender::sendTransactionsToPeers);
-  }
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactions.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactions.java
index 83029707957..b8474d3d50b 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactions.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,455 +14,80 @@
  */
 package org.hyperledger.besu.ethereum.eth.transactions;
 
-import static java.util.Comparator.comparing;
-import static org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionAddedStatus.ADDED;
-import static org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionAddedStatus.ALREADY_KNOWN;
-import static org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionAddedStatus.REJECTED_UNDERPRICED_REPLACEMENT;
-
-import org.hyperledger.besu.ethereum.core.AccountTransactionOrder;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
-import org.hyperledger.besu.metrics.BesuMetricCategory;
-import org.hyperledger.besu.plugin.data.TransactionType;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
-import org.hyperledger.besu.plugin.services.metrics.Counter;
-import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
-import org.hyperledger.besu.util.Subscribers;
-import org.hyperledger.besu.util.number.Percentage;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.plugin.data.TransactionSelectionResult;
 
-import java.time.Clock;
-import java.time.Instant;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
+import java.util.Collection;
 import java.util.List;
-import java.util.Map;
-import java.util.NavigableSet;
 import java.util.Optional;
 import java.util.OptionalLong;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.EvictingQueue;
-
-/**
- * Holds the current set of pending transactions with the ability to iterate them based on priority
- * for mining or look-up by hash.
- *
- * <p>This class is safe for use across multiple threads.
- */
-public class PendingTransactions {
-
-  private final int maxTransactionRetentionHours;
-  private final Clock clock;
-
-  private final EvictingQueue<Hash> newPooledHashes;
-  private final Map<Hash, TransactionInfo> pendingTransactions = new ConcurrentHashMap<>();
-  private final NavigableSet<TransactionInfo> prioritizedTransactions =
-      new TreeSet<>(
-          comparing(TransactionInfo::isReceivedFromLocalSource)
-              .thenComparing(TransactionInfo::getGasPrice)
-              .thenComparing(TransactionInfo::getSequence)
-              .reversed());
-  private final Map<Address, TransactionsForSenderInfo> transactionsBySender =
-      new ConcurrentHashMap<>();
-
-  private final Subscribers<PendingTransactionListener> pendingTransactionSubscribers =
-      Subscribers.create();
-
-  private final Subscribers<PendingTransactionDroppedListener> transactionDroppedListeners =
-      Subscribers.create();
-
-  private final LabelledMetric<Counter> transactionRemovedCounter;
-  private final Counter localTransactionAddedCounter;
-  private final Counter remoteTransactionAddedCounter;
-  private final Counter localTransactionHashesAddedCounter;
-
-  private final long maxPendingTransactions;
-  private final TransactionPoolReplacementHandler transactionReplacementHandler;
-  private final Supplier<BlockHeader> chainHeadHeaderSupplier;
-
-  public PendingTransactions(
-      final int maxTransactionRetentionHours,
-      final int maxPendingTransactions,
-      final int maxPooledTransactionHashes,
-      final Clock clock,
-      final MetricsSystem metricsSystem,
-      final Supplier<BlockHeader> chainHeadHeaderSupplier,
-      final Percentage priceBump) {
-    this.maxTransactionRetentionHours = maxTransactionRetentionHours;
-    this.maxPendingTransactions = maxPendingTransactions;
-    this.clock = clock;
-    this.newPooledHashes = EvictingQueue.create(maxPooledTransactionHashes);
-    this.chainHeadHeaderSupplier = chainHeadHeaderSupplier;
-    this.transactionReplacementHandler = new TransactionPoolReplacementHandler(priceBump);
-    final LabelledMetric<Counter> transactionAddedCounter =
-        metricsSystem.createLabelledCounter(
-            BesuMetricCategory.TRANSACTION_POOL,
-            "transactions_added_total",
-            "Count of transactions added to the transaction pool",
-            "source");
-    localTransactionAddedCounter = transactionAddedCounter.labels("local");
-    remoteTransactionAddedCounter = transactionAddedCounter.labels("remote");
-    localTransactionHashesAddedCounter = transactionAddedCounter.labels("pool");
-
-    transactionRemovedCounter =
-        metricsSystem.createLabelledCounter(
-            BesuMetricCategory.TRANSACTION_POOL,
-            "transactions_removed_total",
-            "Count of transactions removed from the transaction pool",
-            "source",
-            "operation");
-  }
-
-  public void evictOldTransactions() {
-    final Instant removeTransactionsBefore =
-        clock.instant().minus(maxTransactionRetentionHours, ChronoUnit.HOURS);
-
-    pendingTransactions.values().stream()
-        .filter(transaction -> transaction.getAddedToPoolAt().isBefore(removeTransactionsBefore))
-        .forEach(transaction -> removeTransaction(transaction.getTransaction()));
-  }
-
-  List<Transaction> getLocalTransactions() {
-    return pendingTransactions.values().stream()
-        .filter(TransactionInfo::isReceivedFromLocalSource)
-        .map(TransactionInfo::getTransaction)
-        .collect(Collectors.toList());
-  }
-
-  public boolean addRemoteTransaction(final Transaction transaction) {
-    final TransactionInfo transactionInfo =
-        new TransactionInfo(transaction, false, clock.instant());
-    final TransactionAddedStatus transactionAddedStatus = addTransaction(transactionInfo);
-    final boolean added = transactionAddedStatus.equals(ADDED);
-    if (added) {
-      remoteTransactionAddedCounter.inc();
-    }
-    return added;
-  }
-
-  boolean addTransactionHash(final Hash transactionHash) {
-    final boolean hashAdded;
-    synchronized (newPooledHashes) {
-      hashAdded = newPooledHashes.add(transactionHash);
-    }
-    if (hashAdded) {
-      localTransactionHashesAddedCounter.inc();
-    }
-    return hashAdded;
-  }
-
-  @VisibleForTesting
-  public TransactionAddedStatus addLocalTransaction(final Transaction transaction) {
-    final TransactionAddedStatus transactionAdded =
-        addTransaction(new TransactionInfo(transaction, true, clock.instant()));
-    if (transactionAdded.equals(ADDED)) {
-      localTransactionAddedCounter.inc();
-    }
-    return transactionAdded;
-  }
-
-  void removeTransaction(final Transaction transaction) {
-    doRemoveTransaction(transaction, false);
-    notifyTransactionDropped(transaction);
-  }
-
-  void transactionAddedToBlock(final Transaction transaction) {
-    doRemoveTransaction(transaction, true);
-  }
-
-  private void doRemoveTransaction(final Transaction transaction, final boolean addedToBlock) {
-    synchronized (prioritizedTransactions) {
-      final TransactionInfo removedTransactionInfo =
-          pendingTransactions.remove(transaction.getHash());
-      if (removedTransactionInfo != null) {
-        prioritizedTransactions.remove(removedTransactionInfo);
-        removeTransactionTrackedBySenderAndNonce(transaction);
-        incrementTransactionRemovedCounter(
-            removedTransactionInfo.isReceivedFromLocalSource(), addedToBlock);
-      }
-    }
-  }
-
-  private void incrementTransactionRemovedCounter(
-      final boolean receivedFromLocalSource, final boolean addedToBlock) {
-    final String location = receivedFromLocalSource ? "local" : "remote";
-    final String operation = addedToBlock ? "addedToBlock" : "dropped";
-    transactionRemovedCounter.labels(location, operation).inc();
-  }
-
-  public void selectTransactions(final TransactionSelector selector) {
-    synchronized (prioritizedTransactions) {
-      final List<Transaction> transactionsToRemove = new ArrayList<>();
-      final Map<Address, AccountTransactionOrder> accountTransactions = new HashMap<>();
-      for (final TransactionInfo transactionInfo : prioritizedTransactions) {
-        final AccountTransactionOrder accountTransactionOrder =
-            accountTransactions.computeIfAbsent(
-                transactionInfo.getSender(), this::createSenderTransactionOrder);
-
-        for (final Transaction transactionToProcess :
-            accountTransactionOrder.transactionsToProcess(transactionInfo.getTransaction())) {
-          final TransactionSelectionResult result =
-              selector.evaluateTransaction(transactionToProcess);
-          switch (result) {
-            case DELETE_TRANSACTION_AND_CONTINUE:
-              transactionsToRemove.add(transactionToProcess);
-              break;
-            case CONTINUE:
-              break;
-            case COMPLETE_OPERATION:
-              transactionsToRemove.forEach(this::removeTransaction);
-              return;
-            default:
-              throw new RuntimeException("Illegal value for TransactionSelectionResult.");
-          }
-        }
-      }
-      transactionsToRemove.forEach(this::removeTransaction);
-    }
-  }
-
-  private AccountTransactionOrder createSenderTransactionOrder(final Address address) {
-    return new AccountTransactionOrder(
-        transactionsBySender.get(address).getTransactionsInfos().values().stream()
-            .map(TransactionInfo::getTransaction));
-  }
 
-  private TransactionAddedStatus addTransaction(final TransactionInfo transactionInfo) {
-    Optional<Transaction> droppedTransaction = Optional.empty();
-    synchronized (prioritizedTransactions) {
-      if (pendingTransactions.containsKey(transactionInfo.getHash())) {
-        return ALREADY_KNOWN;
-      }
+public interface PendingTransactions {
 
-      final TransactionAddedStatus transactionAddedStatus =
-          addTransactionForSenderAndNonce(transactionInfo);
-      if (!transactionAddedStatus.equals(ADDED)) {
-        return transactionAddedStatus;
-      }
-      prioritizedTransactions.add(transactionInfo);
-      pendingTransactions.put(transactionInfo.getHash(), transactionInfo);
-      tryEvictTransactionHash(transactionInfo.getHash());
+  void reset();
 
-      if (pendingTransactions.size() > maxPendingTransactions) {
-        final TransactionInfo toRemove = prioritizedTransactions.last();
-        doRemoveTransaction(toRemove.getTransaction(), false);
-        droppedTransaction = Optional.of(toRemove.getTransaction());
-      }
-    }
-    notifyTransactionAdded(transactionInfo.getTransaction());
-    droppedTransaction.ifPresent(this::notifyTransactionDropped);
-    return ADDED;
-  }
+  void evictOldTransactions();
 
-  private TransactionAddedStatus addTransactionForSenderAndNonce(
-      final TransactionInfo transactionInfo) {
-    final TransactionInfo existingTransaction =
-        getTrackedTransactionBySenderAndNonce(transactionInfo);
-    if (existingTransaction != null) {
-      if (existingTransaction.transaction.getType().equals(TransactionType.FRONTIER)
-          && !transactionReplacementHandler.shouldReplace(
-              existingTransaction, transactionInfo, chainHeadHeaderSupplier.get())) {
-        return REJECTED_UNDERPRICED_REPLACEMENT;
-      }
-      removeTransaction(existingTransaction.getTransaction());
-    }
-    trackTransactionBySenderAndNonce(transactionInfo);
-    return ADDED;
-  }
+  List<Transaction> getLocalTransactions();
 
-  private void trackTransactionBySenderAndNonce(final TransactionInfo transactionInfo) {
-    final TransactionsForSenderInfo transactionsForSenderInfo =
-        transactionsBySender.computeIfAbsent(
-            transactionInfo.getSender(), key -> new TransactionsForSenderInfo());
-    transactionsForSenderInfo.addTransactionToTrack(transactionInfo.getNonce(), transactionInfo);
-  }
+  TransactionAddedResult addRemoteTransaction(
+      Transaction transaction, Optional<Account> maybeSenderAccount);
 
-  private void removeTransactionTrackedBySenderAndNonce(final Transaction transaction) {
-    Optional.ofNullable(transactionsBySender.get(transaction.getSender()))
-        .ifPresent(
-            transactionsForSender -> {
-              transactionsForSender.getTransactionsInfos().remove(transaction.getNonce());
-              if (transactionsForSender.getTransactionsInfos().isEmpty()) {
-                transactionsBySender.remove(transaction.getSender());
-                transactionsForSender.updateGaps();
-              }
-            });
-  }
+  TransactionAddedResult addLocalTransaction(
+      Transaction transaction, Optional<Account> maybeSenderAccount);
 
-  private TransactionInfo getTrackedTransactionBySenderAndNonce(
-      final TransactionInfo transactionInfo) {
-    final TransactionsForSenderInfo transactionsForSenderInfo =
-        transactionsBySender.computeIfAbsent(
-            transactionInfo.getSender(), key -> new TransactionsForSenderInfo());
-    return transactionsForSenderInfo.getTransactionsInfos().get(transactionInfo.getNonce());
-  }
+  void selectTransactions(TransactionSelector selector);
 
-  private void notifyTransactionAdded(final Transaction transaction) {
-    pendingTransactionSubscribers.forEach(listener -> listener.onTransactionAdded(transaction));
-  }
+  long maxSize();
 
-  private void notifyTransactionDropped(final Transaction transaction) {
-    transactionDroppedListeners.forEach(listener -> listener.onTransactionDropped(transaction));
-  }
+  int size();
 
-  public long maxSize() {
-    return maxPendingTransactions;
-  }
+  boolean containsTransaction(Transaction transaction);
 
-  public int size() {
-    return pendingTransactions.size();
-  }
+  Optional<Transaction> getTransactionByHash(Hash transactionHash);
 
-  public boolean containsTransaction(final Hash transactionHash) {
-    return pendingTransactions.containsKey(transactionHash);
-  }
+  Collection<PendingTransaction> getPendingTransactions();
 
-  public Optional<Transaction> getTransactionByHash(final Hash transactionHash) {
-    return Optional.ofNullable(pendingTransactions.get(transactionHash))
-        .map(TransactionInfo::getTransaction);
-  }
+  long subscribePendingTransactions(PendingTransactionAddedListener listener);
 
-  public Set<TransactionInfo> getTransactionInfo() {
-    return new HashSet<>(pendingTransactions.values());
-  }
+  void unsubscribePendingTransactions(long id);
 
-  long subscribePendingTransactions(final PendingTransactionListener listener) {
-    return pendingTransactionSubscribers.subscribe(listener);
-  }
+  long subscribeDroppedTransactions(PendingTransactionDroppedListener listener);
 
-  void unsubscribePendingTransactions(final long id) {
-    pendingTransactionSubscribers.unsubscribe(id);
-  }
+  void unsubscribeDroppedTransactions(long id);
 
-  long subscribeDroppedTransactions(final PendingTransactionDroppedListener listener) {
-    return transactionDroppedListeners.subscribe(listener);
-  }
+  OptionalLong getNextNonceForSender(Address sender);
 
-  void unsubscribeDroppedTransactions(final long id) {
-    transactionDroppedListeners.unsubscribe(id);
-  }
+  void manageBlockAdded(
+      BlockHeader blockHeader,
+      List<Transaction> confirmedTransactions,
+      final List<Transaction> reorgTransactions,
+      FeeMarket feeMarket);
 
-  public OptionalLong getNextNonceForSender(final Address sender) {
-    final TransactionsForSenderInfo transactionsForSenderInfo = transactionsBySender.get(sender);
-    if (transactionsForSenderInfo == null
-        || transactionsForSenderInfo.getTransactionsInfos().isEmpty()) {
-      return OptionalLong.empty();
-    } else {
-      final OptionalLong maybeNextGap = transactionsForSenderInfo.maybeNextGap();
-      return maybeNextGap.isEmpty()
-          ? OptionalLong.of(transactionsForSenderInfo.getTransactionsInfos().lastKey() + 1)
-          : maybeNextGap;
-    }
-  }
+  String toTraceLog();
 
-  public void tryEvictTransactionHash(final Hash hash) {
-    synchronized (newPooledHashes) {
-      newPooledHashes.remove(hash);
-    }
-  }
+  String logStats();
 
-  List<Hash> getNewPooledHashes() {
-    synchronized (newPooledHashes) {
-      return List.copyOf(newPooledHashes);
-    }
+  default List<Transaction> signalInvalidAndGetDependentTransactions(
+      final Transaction transaction) {
+    // ToDo: remove when the legacy tx pool is removed
+    return List.of();
   }
 
-  /**
-   * Tracks the additional metadata associated with transactions to enable prioritization for mining
-   * and deciding which transactions to drop when the transaction pool reaches its size limit.
-   */
-  public static class TransactionInfo {
-
-    private static final AtomicLong TRANSACTIONS_ADDED = new AtomicLong();
-    private final Transaction transaction;
-    private final boolean receivedFromLocalSource;
-    private final Instant addedToPoolAt;
-    private final long sequence; // Allows prioritization based on order transactions are added
-
-    public TransactionInfo(
-        final Transaction transaction,
-        final boolean receivedFromLocalSource,
-        final Instant addedToPoolAt) {
-      this.transaction = transaction;
-      this.receivedFromLocalSource = receivedFromLocalSource;
-      this.addedToPoolAt = addedToPoolAt;
-      this.sequence = TRANSACTIONS_ADDED.getAndIncrement();
-    }
-
-    public Transaction getTransaction() {
-      return transaction;
-    }
-
-    public Wei getGasPrice() {
-      return transaction.getGasPrice();
-    }
-
-    public long getSequence() {
-      return sequence;
-    }
-
-    public long getNonce() {
-      return transaction.getNonce();
-    }
-
-    public Address getSender() {
-      return transaction.getSender();
-    }
-
-    public boolean isReceivedFromLocalSource() {
-      return receivedFromLocalSource;
-    }
-
-    public Hash getHash() {
-      return transaction.getHash();
-    }
-
-    public Instant getAddedToPoolAt() {
-      return addedToPoolAt;
-    }
+  default void signalInvalidAndRemoveDependentTransactions(final Transaction transaction) {
+    // ToDo: remove when the legacy tx pool is removed
+    // no-op
   }
 
-  public enum TransactionSelectionResult {
-    DELETE_TRANSACTION_AND_CONTINUE,
-    CONTINUE,
-    COMPLETE_OPERATION
-  }
+  boolean isLocalSender(Address sender);
 
   @FunctionalInterface
-  public interface TransactionSelector {
-
-    TransactionSelectionResult evaluateTransaction(final Transaction transaction);
-  }
-
-  public enum TransactionAddedStatus {
-    ALREADY_KNOWN(TransactionInvalidReason.TRANSACTION_ALREADY_KNOWN),
-    REJECTED_UNDERPRICED_REPLACEMENT(TransactionInvalidReason.TRANSACTION_REPLACEMENT_UNDERPRICED),
-    ADDED();
-
-    private final Optional<TransactionInvalidReason> invalidReason;
-
-    TransactionAddedStatus() {
-      this.invalidReason = Optional.empty();
-    }
-
-    TransactionAddedStatus(final TransactionInvalidReason invalidReason) {
-      this.invalidReason = Optional.of(invalidReason);
-    }
-
-    public Optional<TransactionInvalidReason> getInvalidReason() {
-      return invalidReason;
-    }
+  interface TransactionSelector {
+    TransactionSelectionResult evaluateTransaction(Transaction transaction);
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsMessageHandler.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsMessageHandler.java
deleted file mode 100644
index db6270992c3..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsMessageHandler.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.transactions;
-
-import static java.time.Instant.now;
-
-import org.hyperledger.besu.ethereum.eth.manager.EthMessage;
-import org.hyperledger.besu.ethereum.eth.manager.EthMessages;
-import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
-import org.hyperledger.besu.ethereum.eth.messages.NewPooledTransactionHashesMessage;
-
-import java.time.Duration;
-import java.time.Instant;
-
-class PendingTransactionsMessageHandler implements EthMessages.MessageCallback {
-
-  private final PendingTransactionsMessageProcessor transactionsMessageProcessor;
-  private final EthScheduler scheduler;
-  private final Duration txMsgKeepAlive;
-
-  public PendingTransactionsMessageHandler(
-      final EthScheduler scheduler,
-      final PendingTransactionsMessageProcessor transactionsMessageProcessor,
-      final int txMsgKeepAliveSeconds) {
-    this.scheduler = scheduler;
-    this.transactionsMessageProcessor = transactionsMessageProcessor;
-    this.txMsgKeepAlive = Duration.ofSeconds(txMsgKeepAliveSeconds);
-  }
-
-  @Override
-  public void exec(final EthMessage message) {
-    final NewPooledTransactionHashesMessage transactionsMessage =
-        NewPooledTransactionHashesMessage.readFrom(message.getData());
-    final Instant startedAt = now();
-    scheduler.scheduleTxWorkerTask(
-        () ->
-            transactionsMessageProcessor.processNewPooledTransactionHashesMessage(
-                message.getPeer(), transactionsMessage, startedAt, txMsgKeepAlive));
-  }
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsMessageProcessor.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsMessageProcessor.java
deleted file mode 100644
index 3c6bde13f99..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsMessageProcessor.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.transactions;
-
-import static java.time.Instant.now;
-import static org.apache.logging.log4j.LogManager.getLogger;
-
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.eth.manager.EthContext;
-import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
-import org.hyperledger.besu.ethereum.eth.manager.task.BufferedGetPooledTransactionsFromPeerFetcher;
-import org.hyperledger.besu.ethereum.eth.messages.NewPooledTransactionHashesMessage;
-import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
-import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
-import org.hyperledger.besu.ethereum.rlp.RLPException;
-import org.hyperledger.besu.metrics.RunnableCounter;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
-import org.hyperledger.besu.plugin.services.metrics.Counter;
-
-import java.time.Duration;
-import java.time.Instant;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.logging.log4j.Logger;
-
-public class PendingTransactionsMessageProcessor {
-
-  private static final int SKIPPED_MESSAGES_LOGGING_THRESHOLD = 1000;
-  private static final long SYNC_TOLERANCE = 100L;
-
-  private static final Logger LOG = getLogger();
-
-  private final ConcurrentHashMap<EthPeer, BufferedGetPooledTransactionsFromPeerFetcher>
-      scheduledTasks;
-
-  private final PeerPendingTransactionTracker transactionTracker;
-  private final Counter totalSkippedTransactionsMessageCounter;
-  private final TransactionPool transactionPool;
-  private final TransactionPoolConfiguration transactionPoolConfiguration;
-  private final EthContext ethContext;
-  private final MetricsSystem metricsSystem;
-  private final SyncState syncState;
-
-  public PendingTransactionsMessageProcessor(
-      final PeerPendingTransactionTracker transactionTracker,
-      final TransactionPool transactionPool,
-      final TransactionPoolConfiguration transactionPoolConfiguration,
-      final Counter metricsCounter,
-      final EthContext ethContext,
-      final MetricsSystem metricsSystem,
-      final SyncState syncState) {
-    this.transactionTracker = transactionTracker;
-    this.transactionPool = transactionPool;
-    this.transactionPoolConfiguration = transactionPoolConfiguration;
-    this.ethContext = ethContext;
-    this.metricsSystem = metricsSystem;
-    this.syncState = syncState;
-    this.totalSkippedTransactionsMessageCounter =
-        new RunnableCounter(
-            metricsCounter,
-            () ->
-                LOG.warn(
-                    "{} expired transaction messages have been skipped.",
-                    SKIPPED_MESSAGES_LOGGING_THRESHOLD),
-            SKIPPED_MESSAGES_LOGGING_THRESHOLD);
-    this.scheduledTasks = new ConcurrentHashMap<>();
-  }
-
-  void processNewPooledTransactionHashesMessage(
-      final EthPeer peer,
-      final NewPooledTransactionHashesMessage transactionsMessage,
-      final Instant startedAt,
-      final Duration keepAlive) {
-    // Check if message not expired.
-    if (startedAt.plus(keepAlive).isAfter(now())) {
-      this.processNewPooledTransactionHashesMessage(peer, transactionsMessage);
-    } else {
-      totalSkippedTransactionsMessageCounter.inc();
-    }
-  }
-
-  @SuppressWarnings("UnstableApiUsage")
-  private void processNewPooledTransactionHashesMessage(
-      final EthPeer peer, final NewPooledTransactionHashesMessage transactionsMessage) {
-    try {
-      LOG.trace("Received pooled transaction hashes message from {}", peer);
-
-      transactionTracker.markTransactionsHashesAsSeen(
-          peer, transactionsMessage.pendingTransactions());
-      if (syncState.isInSync(SYNC_TOLERANCE)) {
-        final BufferedGetPooledTransactionsFromPeerFetcher bufferedTask =
-            scheduledTasks.computeIfAbsent(
-                peer,
-                ethPeer -> {
-                  ethContext
-                      .getScheduler()
-                      .scheduleFutureTask(
-                          new FetcherCreatorTask(peer),
-                          transactionPoolConfiguration.getEth65TrxAnnouncedBufferingPeriod());
-                  return new BufferedGetPooledTransactionsFromPeerFetcher(peer, this);
-                });
-
-        for (final Hash hash : transactionsMessage.pendingTransactions()) {
-          if (transactionPool.getTransactionByHash(hash).isEmpty()
-              && transactionPool.addTransactionHash(hash)) {
-            bufferedTask.addHash(hash);
-          }
-        }
-      }
-    } catch (final RLPException ex) {
-      if (peer != null) {
-        LOG.debug(
-            "Malformed pooled transaction hashes message received, disconnecting: {}", peer, ex);
-        peer.disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
-      }
-    }
-  }
-
-  public TransactionPool getTransactionPool() {
-    return transactionPool;
-  }
-
-  public EthContext getEthContext() {
-    return ethContext;
-  }
-
-  public MetricsSystem getMetricsSystem() {
-    return metricsSystem;
-  }
-
-  public class FetcherCreatorTask implements Runnable {
-    final EthPeer peer;
-
-    public FetcherCreatorTask(final EthPeer peer) {
-      this.peer = peer;
-    }
-
-    @Override
-    public void run() {
-      if (peer != null) {
-        final BufferedGetPooledTransactionsFromPeerFetcher fetcher = scheduledTasks.remove(peer);
-        if (!peer.isDisconnected()) {
-          fetcher.requestTransactions();
-        }
-      }
-    }
-  }
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsMessageSender.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsMessageSender.java
deleted file mode 100644
index 3f165aa7bce..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsMessageSender.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.transactions;
-
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
-import org.hyperledger.besu.ethereum.eth.messages.NewPooledTransactionHashesMessage;
-import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected;
-
-import java.util.List;
-import java.util.stream.StreamSupport;
-
-import com.google.common.collect.Iterables;
-
-class PendingTransactionsMessageSender {
-
-  private final PeerPendingTransactionTracker transactionTracker;
-
-  public PendingTransactionsMessageSender(final PeerPendingTransactionTracker transactionTracker) {
-    this.transactionTracker = transactionTracker;
-  }
-
-  public void sendTransactionsToPeers() {
-    StreamSupport.stream(transactionTracker.getEthPeersWithUnsentTransactions().spliterator(), true)
-        .parallel()
-        .forEach(this::sendTransactionsToPeer);
-  }
-
-  private void sendTransactionsToPeer(final EthPeer peer) {
-    for (final List<Hash> hashes :
-        Iterables.partition(
-            transactionTracker.claimTransactionsToSendToPeer(peer),
-            TransactionPoolConfiguration.MAX_PENDING_TRANSACTIONS_HASHES)) {
-      try {
-        peer.send(NewPooledTransactionHashesMessage.create(hashes));
-      } catch (final PeerNotConnected __) {
-        break;
-      }
-    }
-  }
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionAddedResult.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionAddedResult.java
new file mode 100644
index 00000000000..d2ca53ae91c
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionAddedResult.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions;
+
+import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
+
+import java.util.Objects;
+import java.util.Optional;
+
+public final class TransactionAddedResult {
+  private enum Status {
+    INVALID,
+    REPLACED,
+    DROPPED,
+    TRY_NEXT_LAYER,
+    ADDED,
+    INTERNAL_ERROR
+  }
+
+  public static final TransactionAddedResult ALREADY_KNOWN =
+      new TransactionAddedResult(TransactionInvalidReason.TRANSACTION_ALREADY_KNOWN);
+  public static final TransactionAddedResult REJECTED_UNDERPRICED_REPLACEMENT =
+      new TransactionAddedResult(TransactionInvalidReason.TRANSACTION_REPLACEMENT_UNDERPRICED);
+  public static final TransactionAddedResult NONCE_TOO_FAR_IN_FUTURE_FOR_SENDER =
+      new TransactionAddedResult(TransactionInvalidReason.NONCE_TOO_FAR_IN_FUTURE_FOR_SENDER);
+  public static final TransactionAddedResult LOWER_NONCE_INVALID_TRANSACTION_KNOWN =
+      new TransactionAddedResult(TransactionInvalidReason.LOWER_NONCE_INVALID_TRANSACTION_EXISTS);
+
+  public static final TransactionAddedResult ADDED = new TransactionAddedResult(Status.ADDED);
+  public static final TransactionAddedResult TRY_NEXT_LAYER =
+      new TransactionAddedResult(Status.TRY_NEXT_LAYER);
+
+  public static final TransactionAddedResult DROPPED = new TransactionAddedResult(Status.DROPPED);
+
+  public static final TransactionAddedResult INTERNAL_ERROR =
+      new TransactionAddedResult(Status.INTERNAL_ERROR);
+  public static final TransactionAddedResult DISABLED =
+      new TransactionAddedResult(TransactionInvalidReason.TX_POOL_DISABLED);
+
+  private final Optional<TransactionInvalidReason> rejectReason;
+
+  private final Optional<PendingTransaction> replacedTransaction;
+
+  private final Status status;
+
+  private TransactionAddedResult(final PendingTransaction replacedTransaction) {
+    this.replacedTransaction = Optional.of(replacedTransaction);
+    this.rejectReason = Optional.empty();
+    this.status = Status.REPLACED;
+  }
+
+  private TransactionAddedResult(final TransactionInvalidReason rejectReason) {
+    this.replacedTransaction = Optional.empty();
+    this.rejectReason = Optional.of(rejectReason);
+    this.status = Status.INVALID;
+  }
+
+  private TransactionAddedResult(final Status status) {
+    this.replacedTransaction = Optional.empty();
+    this.rejectReason = Optional.empty();
+    this.status = status;
+  }
+
+  public boolean isSuccess() {
+    return !isRejected() && status != Status.INTERNAL_ERROR;
+  }
+
+  public boolean isRejected() {
+    return status == Status.INVALID;
+  }
+
+  public boolean isReplacement() {
+    return replacedTransaction.isPresent();
+  }
+
+  public Optional<TransactionInvalidReason> maybeInvalidReason() {
+    return rejectReason;
+  }
+
+  public Optional<PendingTransaction> maybeReplacedTransaction() {
+    return replacedTransaction;
+  }
+
+  public static TransactionAddedResult createForReplacement(
+      final PendingTransaction replacedTransaction) {
+    return new TransactionAddedResult(replacedTransaction);
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    TransactionAddedResult that = (TransactionAddedResult) o;
+    return Objects.equals(rejectReason, that.rejectReason)
+        && Objects.equals(replacedTransaction, that.replacedTransaction)
+        && status == that.status;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(rejectReason, replacedTransaction, status);
+  }
+
+  @Override
+  public String toString() {
+    return "TransactionAddedResult{"
+        + "rejectReason="
+        + rejectReason
+        + ", replacedTransaction="
+        + replacedTransaction
+        + ", status="
+        + status
+        + '}';
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionAnnouncement.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionAnnouncement.java
new file mode 100644
index 00000000000..1533a6bdbe4
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionAnnouncement.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.plugin.data.TransactionType;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+public class TransactionAnnouncement {
+  private final Hash hash;
+  private final Optional<TransactionType> type;
+  private final Optional<Long> size;
+
+  public TransactionAnnouncement(final Hash hash) {
+    this.hash = checkNotNull(hash, "Hash cannot be null");
+    this.type = Optional.empty();
+    this.size = Optional.empty();
+  }
+
+  public TransactionAnnouncement(final Transaction transaction) {
+    this(
+        checkNotNull(transaction, "Transaction cannot be null").getHash(),
+        transaction.getType(),
+        (long) transaction.getSize());
+  }
+
+  public TransactionAnnouncement(final Hash hash, final TransactionType type, final Long size) {
+    this.hash = checkNotNull(hash, "Hash cannot be null");
+    this.type = Optional.of(checkNotNull(type, "Type cannot be null"));
+    this.size = Optional.of(checkNotNull(size, "Size cannot be null"));
+  }
+
+  public Hash getHash() {
+    return hash;
+  }
+
+  public Optional<TransactionType> getType() {
+    return type;
+  }
+
+  public Optional<Long> getSize() {
+    return size;
+  }
+
+  public static List<TransactionAnnouncement> create(
+      final List<TransactionType> types, final List<Long> sizes, final List<Hash> hashes) {
+    // Check if lists have the same size
+    if (!(types.size() == hashes.size() && hashes.size() == sizes.size())) {
+      throw new IllegalArgumentException(
+          "Hashes, sizes and types must have the same number of elements");
+    }
+    final List<TransactionAnnouncement> transactions = new ArrayList<>(hashes.size());
+    for (int i = 0; i < hashes.size(); i++) {
+      transactions.add(new TransactionAnnouncement(hashes.get(i), types.get(i), sizes.get(i)));
+    }
+    return transactions;
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    final TransactionAnnouncement that = (TransactionAnnouncement) o;
+    return Objects.equals(size, that.size)
+        && Objects.equals(type, that.type)
+        && Objects.equals(hash, that.hash);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(hash, size, type);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionBroadcaster.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionBroadcaster.java
new file mode 100644
index 00000000000..583f90f9dc6
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionBroadcaster.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions;
+
+import static org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction.toTransactionList;
+import static org.hyperledger.besu.plugin.data.TransactionType.BLOB;
+
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.messages.EthPV65;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool.TransactionBatchAddedListener;
+import org.hyperledger.besu.plugin.data.TransactionType;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TransactionBroadcaster implements TransactionBatchAddedListener {
+  private static final Logger LOG = LoggerFactory.getLogger(TransactionBroadcaster.class);
+
+  private static final EnumSet<TransactionType> ANNOUNCE_HASH_ONLY_TX_TYPES = EnumSet.of(BLOB);
+
+  private static final Boolean HASH_ONLY_BROADCAST = Boolean.TRUE;
+  private static final Boolean FULL_BROADCAST = Boolean.FALSE;
+
+  private final PeerTransactionTracker transactionTracker;
+  private final TransactionsMessageSender transactionsMessageSender;
+  private final NewPooledTransactionHashesMessageSender newPooledTransactionHashesMessageSender;
+  private final EthContext ethContext;
+
+  public TransactionBroadcaster(
+      final EthContext ethContext,
+      final PeerTransactionTracker transactionTracker,
+      final TransactionsMessageSender transactionsMessageSender,
+      final NewPooledTransactionHashesMessageSender newPooledTransactionHashesMessageSender) {
+    this.transactionTracker = transactionTracker;
+    this.transactionsMessageSender = transactionsMessageSender;
+    this.newPooledTransactionHashesMessageSender = newPooledTransactionHashesMessageSender;
+    this.ethContext = ethContext;
+  }
+
+  public void relayTransactionPoolTo(
+      final EthPeer peer, final Collection<PendingTransaction> pendingTransactions) {
+    if (!pendingTransactions.isEmpty()) {
+      if (peer.hasSupportForMessage(EthPV65.NEW_POOLED_TRANSACTION_HASHES)) {
+        sendTransactionHashes(toTransactionList(pendingTransactions), List.of(peer));
+      } else {
+        sendFullTransactions(toTransactionList(pendingTransactions), List.of(peer));
+      }
+    }
+  }
+
+  @Override
+  public void onTransactionsAdded(final Collection<Transaction> transactions) {
+    final int currPeerCount = ethContext.getEthPeers().peerCount();
+    if (currPeerCount == 0) {
+      return;
+    }
+
+    final int numPeersToSendFullTransactions = (int) Math.ceil(Math.sqrt(currPeerCount));
+
+    final Map<Boolean, List<Transaction>> transactionByBroadcastMode =
+        transactions.stream()
+            .collect(
+                Collectors.partitioningBy(
+                    tx -> ANNOUNCE_HASH_ONLY_TX_TYPES.contains(tx.getType())));
+
+    final List<EthPeer> sendOnlyFullTransactionPeers = new ArrayList<>(currPeerCount);
+    final List<EthPeer> sendOnlyHashPeers = new ArrayList<>(currPeerCount);
+    final List<EthPeer> sendMixedPeers = new ArrayList<>(currPeerCount);
+
+    ethContext
+        .getEthPeers()
+        .streamAvailablePeers()
+        .forEach(
+            peer -> {
+              if (peer.hasSupportForMessage(EthPV65.NEW_POOLED_TRANSACTION_HASHES)) {
+                sendOnlyHashPeers.add(peer);
+              } else {
+                sendOnlyFullTransactionPeers.add(peer);
+              }
+            });
+
+    if (sendOnlyFullTransactionPeers.size() < numPeersToSendFullTransactions) {
+      final int delta =
+          Math.min(
+              numPeersToSendFullTransactions - sendOnlyFullTransactionPeers.size(),
+              sendOnlyHashPeers.size());
+
+      Collections.shuffle(sendOnlyHashPeers);
+
+      // move peers from the mixed list to reach the required size for full transaction peers
+      movePeersBetweenLists(sendOnlyHashPeers, sendMixedPeers, delta);
+    }
+
+    LOG.atTrace()
+        .setMessage(
+            "Sending full transactions to {} peers, transaction hashes only to {} peers and mixed to {} peers."
+                + " Peers w/o eth/65 {}, peers with eth/65 {}")
+        .addArgument(sendOnlyFullTransactionPeers::size)
+        .addArgument(sendOnlyHashPeers::size)
+        .addArgument(sendMixedPeers::size)
+        .addArgument(sendOnlyFullTransactionPeers)
+        .addArgument(() -> sendOnlyHashPeers.toString() + sendMixedPeers.toString())
+        .log();
+
+    sendToFullTransactionsPeers(
+        transactionByBroadcastMode.get(FULL_BROADCAST), sendOnlyFullTransactionPeers);
+
+    sendToOnlyHashPeers(transactionByBroadcastMode, sendOnlyHashPeers);
+
+    sendToMixedPeers(transactionByBroadcastMode, sendMixedPeers);
+  }
+
+  private void sendToFullTransactionsPeers(
+      final List<Transaction> fullBroadcastTransactions, final List<EthPeer> fullTransactionPeers) {
+    sendFullTransactions(fullBroadcastTransactions, fullTransactionPeers);
+  }
+
+  private void sendToOnlyHashPeers(
+      final Map<Boolean, List<Transaction>> txsByHashOnlyBroadcast,
+      final List<EthPeer> hashOnlyPeers) {
+    final List<Transaction> allTransactions =
+        txsByHashOnlyBroadcast.values().stream().flatMap(List::stream).collect(Collectors.toList());
+
+    sendTransactionHashes(allTransactions, hashOnlyPeers);
+  }
+
+  private void sendToMixedPeers(
+      final Map<Boolean, List<Transaction>> txsByHashOnlyBroadcast,
+      final List<EthPeer> mixedPeers) {
+    sendFullTransactions(txsByHashOnlyBroadcast.get(FULL_BROADCAST), mixedPeers);
+    sendTransactionHashes(txsByHashOnlyBroadcast.get(HASH_ONLY_BROADCAST), mixedPeers);
+  }
+
+  private void sendFullTransactions(
+      final List<Transaction> transactions, final List<EthPeer> fullTransactionPeers) {
+    if (!transactions.isEmpty()) {
+      fullTransactionPeers.forEach(
+          peer -> {
+            transactions.forEach(
+                transaction -> transactionTracker.addToPeerSendQueue(peer, transaction));
+            ethContext
+                .getScheduler()
+                .scheduleSyncWorkerTask(
+                    () -> transactionsMessageSender.sendTransactionsToPeer(peer));
+          });
+    }
+  }
+
+  private void sendTransactionHashes(
+      final List<Transaction> transactions, final List<EthPeer> transactionHashPeers) {
+    if (!transactions.isEmpty()) {
+      transactionHashPeers.stream()
+          .forEach(
+              peer -> {
+                transactions.forEach(
+                    transaction -> transactionTracker.addToPeerSendQueue(peer, transaction));
+                ethContext
+                    .getScheduler()
+                    .scheduleSyncWorkerTask(
+                        () ->
+                            newPooledTransactionHashesMessageSender.sendTransactionHashesToPeer(
+                                peer));
+              });
+    }
+  }
+
+  private void movePeersBetweenLists(
+      final List<EthPeer> sourceList, final List<EthPeer> destinationList, final int num) {
+
+    final int stopIndex = sourceList.size() - num;
+    for (int i = sourceList.size() - 1; i >= stopIndex; i--) {
+      destinationList.add(sourceList.remove(i));
+    }
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPool.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPool.java
index 78c2cbab42b..7b16d8717d6 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPool.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPool.java
@@ -14,45 +14,66 @@
  */
 package org.hyperledger.besu.ethereum.eth.transactions;
 
-import static java.util.Collections.singletonList;
-import static org.apache.logging.log4j.LogManager.getLogger;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.CHAIN_HEAD_NOT_AVAILABLE;
 import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.CHAIN_HEAD_WORLD_STATE_NOT_AVAILABLE;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.INTERNAL_ERROR;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.TRANSACTION_ALREADY_KNOWN;
 
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
 import org.hyperledger.besu.ethereum.chain.BlockAddedObserver;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Account;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.fees.BaseFee;
-import org.hyperledger.besu.ethereum.core.fees.EIP1559;
-import org.hyperledger.besu.ethereum.core.fees.TransactionPriceCalculator;
-import org.hyperledger.besu.ethereum.eth.EthProtocol;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
-import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionAddedStatus;
 import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionValidator;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
-import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.ethereum.trie.MerkleTrieException;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.fluent.SimpleAccount;
 import org.hyperledger.besu.plugin.data.TransactionType;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
-import org.hyperledger.besu.plugin.services.metrics.Counter;
-import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
-
+import org.hyperledger.besu.util.Subscribers;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashSet;
+import java.util.Comparator;
+import java.util.IntSummaryStatistics;
+import java.util.List;
 import java.util.Optional;
-import java.util.Set;
-
-import org.apache.logging.log4j.Logger;
+import java.util.OptionalLong;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Maintains the set of pending transactions received from JSON-RPC or other nodes. Transactions are
@@ -62,178 +83,279 @@
  * <p>This class is safe for use across multiple threads.
  */
 public class TransactionPool implements BlockAddedObserver {
-
-  private static final Logger LOG = getLogger();
-
-  private static final long SYNC_TOLERANCE = 100L;
-  private static final String REMOTE = "remote";
-  private static final String LOCAL = "local";
-  private final PendingTransactions pendingTransactions;
+  private static final Logger LOG = LoggerFactory.getLogger(TransactionPool.class);
+  private static final Logger LOG_FOR_REPLAY = LoggerFactory.getLogger("LOG_FOR_REPLAY");
+  private final Supplier<PendingTransactions> pendingTransactionsSupplier;
+  private volatile PendingTransactions pendingTransactions;
   private final ProtocolSchedule protocolSchedule;
   private final ProtocolContext protocolContext;
-  private final TransactionBatchAddedListener transactionBatchAddedListener;
-  private final Optional<TransactionBatchAddedListener> pendingTransactionBatchAddedListener;
-  private final SyncState syncState;
-  private final Wei minTransactionGasPrice;
-  private final LabelledMetric<Counter> duplicateTransactionCounter;
-  private final PeerTransactionTracker peerTransactionTracker;
-  private final Optional<PeerPendingTransactionTracker> maybePeerPendingTransactionTracker;
-  private final Optional<EIP1559> eip1559;
-  private final TransactionPriceCalculator frontierPriceCalculator =
-      TransactionPriceCalculator.frontier();
-  private final TransactionPriceCalculator eip1559PriceCalculator =
-      TransactionPriceCalculator.eip1559();
+  private final EthContext ethContext;
+  private final TransactionBroadcaster transactionBroadcaster;
+  private final MiningParameters miningParameters;
+  private final TransactionPoolMetrics metrics;
   private final TransactionPoolConfiguration configuration;
+  private final AtomicBoolean isPoolEnabled = new AtomicBoolean(false);
+  private final PendingTransactionsListenersProxy pendingTransactionsListenersProxy =
+      new PendingTransactionsListenersProxy();
+  private volatile OptionalLong subscribeConnectId = OptionalLong.empty();
+  private final SaveRestoreManager saveRestoreManager = new SaveRestoreManager();
 
   public TransactionPool(
-      final PendingTransactions pendingTransactions,
+      final Supplier<PendingTransactions> pendingTransactionsSupplier,
       final ProtocolSchedule protocolSchedule,
       final ProtocolContext protocolContext,
-      final TransactionBatchAddedListener transactionBatchAddedListener,
-      final Optional<TransactionBatchAddedListener> pendingTransactionBatchAddedListener,
-      final SyncState syncState,
+      final TransactionBroadcaster transactionBroadcaster,
       final EthContext ethContext,
-      final PeerTransactionTracker peerTransactionTracker,
-      final Optional<PeerPendingTransactionTracker> maybePeerPendingTransactionTracker,
-      final Wei minTransactionGasPrice,
-      final MetricsSystem metricsSystem,
-      final Optional<EIP1559> eip1559,
+      final MiningParameters miningParameters,
+      final TransactionPoolMetrics metrics,
       final TransactionPoolConfiguration configuration) {
-    this.pendingTransactions = pendingTransactions;
+    this.pendingTransactionsSupplier = pendingTransactionsSupplier;
     this.protocolSchedule = protocolSchedule;
     this.protocolContext = protocolContext;
-    this.transactionBatchAddedListener = transactionBatchAddedListener;
-    this.pendingTransactionBatchAddedListener = pendingTransactionBatchAddedListener;
-    this.syncState = syncState;
-    this.peerTransactionTracker = peerTransactionTracker;
-    this.maybePeerPendingTransactionTracker = maybePeerPendingTransactionTracker;
-    this.minTransactionGasPrice = minTransactionGasPrice;
-    this.eip1559 = eip1559;
+    this.ethContext = ethContext;
+    this.transactionBroadcaster = transactionBroadcaster;
+    this.miningParameters = miningParameters;
+    this.metrics = metrics;
     this.configuration = configuration;
-
-    duplicateTransactionCounter =
-        metricsSystem.createLabelledCounter(
-            BesuMetricCategory.TRANSACTION_POOL,
-            "transactions_duplicates_total",
-            "Total number of duplicate transactions received",
-            "source");
-
-    ethContext.getEthPeers().subscribeConnect(this::handleConnect);
+    initLogForReplay();
   }
 
-  void handleConnect(final EthPeer peer) {
-    pendingTransactions
-        .getLocalTransactions()
-        .forEach(transaction -> peerTransactionTracker.addToPeerSendQueue(peer, transaction));
-
-    maybePeerPendingTransactionTracker
-        .filter(
-            peerPendingTransactionTracker ->
-                peerPendingTransactionTracker.isPeerSupported(peer, EthProtocol.ETH65))
-        .ifPresent(
-            peerPendingTransactionTracker ->
-                pendingTransactions
-                    .getNewPooledHashes()
-                    .forEach(hash -> peerPendingTransactionTracker.addToPeerSendQueue(peer, hash)));
+  private void initLogForReplay() {
+    LOG_FOR_REPLAY
+        .atTrace()
+        .setMessage("{},{},{},{}")
+        .addArgument(() -> getChainHeadBlockHeader().map(BlockHeader::getNumber).orElse(0L))
+        .addArgument(
+            () ->
+                getChainHeadBlockHeader()
+                    .flatMap(BlockHeader::getBaseFee)
+                    .map(Wei::getAsBigInteger)
+                    .orElse(BigInteger.ZERO))
+        .addArgument(() -> getChainHeadBlockHeader().map(BlockHeader::getGasUsed).orElse(0L))
+        .addArgument(() -> getChainHeadBlockHeader().map(BlockHeader::getGasLimit).orElse(0L))
+        .log();
   }
 
-  public boolean addTransactionHash(final Hash transactionHash) {
-    return pendingTransactions.addTransactionHash(transactionHash);
+  @VisibleForTesting
+  void handleConnect(final EthPeer peer) {
+    transactionBroadcaster.relayTransactionPoolTo(
+        peer, pendingTransactions.getPendingTransactions());
   }
 
-  public ValidationResult<TransactionInvalidReason> addLocalTransaction(
+  public ValidationResult<TransactionInvalidReason> addTransactionViaApi(
       final Transaction transaction) {
-    if (transaction.getType().equals(TransactionType.FRONTIER)
-        && (!ExperimentalEIPs.eip1559Enabled || this.eip1559.isEmpty())) {
-      final Wei transactionGasPrice = minTransactionGasPrice(transaction);
-      if (transactionGasPrice.compareTo(minTransactionGasPrice) < 0) {
-        return ValidationResult.invalid(TransactionInvalidReason.GAS_PRICE_TOO_LOW);
-      }
-      if (!configuration.getTxFeeCap().isZero()
-          && transactionGasPrice.compareTo(configuration.getTxFeeCap()) > 0) {
-        return ValidationResult.invalid(TransactionInvalidReason.TX_FEECAP_EXCEEDED);
+
+    if (configuration.getDisableLocalTransactions()) {
+      final var result = addRemoteTransaction(transaction);
+      if (result.isValid()) {
+        transactionBroadcaster.onTransactionsAdded(List.of(transaction));
       }
+      return result;
     }
+    return addLocalTransaction(transaction);
+  }
+
+  ValidationResult<TransactionInvalidReason> addLocalTransaction(final Transaction transaction) {
+    final ValidationResultAndAccount validationResult = validateLocalTransaction(transaction);
+
+    if (validationResult.result.isValid()) {
 
-    final ValidationResult<TransactionInvalidReason> validationResult =
-        validateTransaction(transaction);
-    if (validationResult.isValid()) {
-      final TransactionAddedStatus transactionAddedStatus =
-          pendingTransactions.addLocalTransaction(transaction);
-      if (!transactionAddedStatus.equals(TransactionAddedStatus.ADDED)) {
-        duplicateTransactionCounter.labels(LOCAL).inc();
-        return ValidationResult.invalid(transactionAddedStatus.getInvalidReason().orElseThrow());
+      final TransactionAddedResult transactionAddedResult =
+          pendingTransactions.addLocalTransaction(transaction, validationResult.maybeAccount);
+
+      if (transactionAddedResult.isRejected()) {
+        final var rejectReason =
+            transactionAddedResult
+                .maybeInvalidReason()
+                .orElseGet(
+                    () -> {
+                      LOG.warn("Missing invalid reason for status {}", transactionAddedResult);
+                      return INTERNAL_ERROR;
+                    });
+        return ValidationResult.invalid(rejectReason);
       }
-      final Collection<Transaction> txs = singletonList(transaction);
-      transactionBatchAddedListener.onTransactionsAdded(txs);
-      pendingTransactionBatchAddedListener.ifPresent(it -> it.onTransactionsAdded(txs));
+
+      transactionBroadcaster.onTransactionsAdded(List.of(transaction));
+    } else {
+      metrics.incrementRejected(true, validationResult.result.getInvalidReason(), "txpool");
     }
 
-    return validationResult;
+    return validationResult.result;
+  }
+
+  private Optional<Wei> getMaxGasPrice(final Transaction transaction) {
+    return transaction.getGasPrice().map(Optional::of).orElse(transaction.getMaxFeePerGas());
+  }
+
+  private boolean isMaxGasPriceBelowConfiguredMinGasPrice(final Transaction transaction) {
+    return getMaxGasPrice(transaction)
+        .map(g -> g.lessThan(miningParameters.getMinTransactionGasPrice()))
+        .orElse(true);
+  }
+
+  private Stream<Transaction> sortedBySenderAndNonce(final Collection<Transaction> transactions) {
+    return transactions.stream()
+        .sorted(Comparator.comparing(Transaction::getSender).thenComparing(Transaction::getNonce));
   }
 
   public void addRemoteTransactions(final Collection<Transaction> transactions) {
-    if (!syncState.isInSync(SYNC_TOLERANCE)) {
-      return;
+    final long started = System.currentTimeMillis();
+    final int initialCount = transactions.size();
+    final List<Transaction> addedTransactions = new ArrayList<>(initialCount);
+    LOG.debug("Adding {} remote transactions", initialCount);
+
+    sortedBySenderAndNonce(transactions)
+        .forEach(
+            transaction -> {
+              final var result = addRemoteTransaction(transaction);
+              if (result.isValid()) {
+                addedTransactions.add(transaction);
+              }
+            });
+
+    LOG_FOR_REPLAY
+        .atTrace()
+        .setMessage("S,{}")
+        .addArgument(() -> pendingTransactions.logStats())
+        .log();
+
+    LOG.atDebug()
+        .setMessage(
+            "Added {} transactions to the pool in {}ms, {} not added, current pool stats {}")
+        .addArgument(addedTransactions::size)
+        .addArgument(() -> System.currentTimeMillis() - started)
+        .addArgument(() -> initialCount - addedTransactions.size())
+        .addArgument(pendingTransactions::logStats)
+        .log();
+
+    if (!addedTransactions.isEmpty()) {
+      transactionBroadcaster.onTransactionsAdded(addedTransactions);
     }
-    final Set<Transaction> addedTransactions = new HashSet<>();
-    for (final Transaction transaction : transactions) {
-      pendingTransactions.tryEvictTransactionHash(transaction.getHash());
-      if (pendingTransactions.containsTransaction(transaction.getHash())) {
-        // We already have this transaction, don't even validate it.
-        duplicateTransactionCounter.labels(REMOTE).inc();
-        continue;
-      }
-      final Wei transactionGasPrice = minTransactionGasPrice(transaction);
-      if (transactionGasPrice.compareTo(minTransactionGasPrice) < 0) {
-        continue;
-      }
-      final ValidationResult<TransactionInvalidReason> validationResult =
-          validateTransaction(transaction);
-      if (validationResult.isValid()) {
-        final boolean added = pendingTransactions.addRemoteTransaction(transaction);
-        if (added) {
-          addedTransactions.add(transaction);
-        } else {
-          duplicateTransactionCounter.labels(REMOTE).inc();
-        }
+  }
+
+  private ValidationResult<TransactionInvalidReason> addRemoteTransaction(
+      final Transaction transaction) {
+    if (pendingTransactions.containsTransaction(transaction)) {
+      LOG.atTrace()
+          .setMessage("Discard already present transaction {}")
+          .addArgument(transaction::toTraceLog)
+          .log();
+      // We already have this transaction, don't even validate it.
+      metrics.incrementRejected(false, TRANSACTION_ALREADY_KNOWN, "txpool");
+      return ValidationResult.invalid(TRANSACTION_ALREADY_KNOWN);
+    }
+
+    final ValidationResultAndAccount validationResult = validateRemoteTransaction(transaction);
+
+    if (validationResult.result.isValid()) {
+      final TransactionAddedResult status =
+          pendingTransactions.addRemoteTransaction(transaction, validationResult.maybeAccount);
+      if (status.isSuccess()) {
+        LOG.atTrace()
+            .setMessage("Added remote transaction {}")
+            .addArgument(transaction::toTraceLog)
+            .log();
       } else {
-        LOG.trace(
-            "Validation failed ({}) for transaction {}. Discarding.",
-            validationResult.getInvalidReason(),
-            transaction);
+        final var rejectReason =
+            status
+                .maybeInvalidReason()
+                .orElseGet(
+                    () -> {
+                      LOG.warn("Missing invalid reason for status {}", status);
+                      return INTERNAL_ERROR;
+                    });
+        LOG.atTrace()
+            .setMessage("Transaction {} rejected reason {}")
+            .addArgument(transaction::toTraceLog)
+            .addArgument(rejectReason)
+            .log();
+        metrics.incrementRejected(false, rejectReason, "txpool");
+        return ValidationResult.invalid(rejectReason);
       }
+    } else {
+      LOG.atTrace()
+          .setMessage("Discard invalid transaction {}, reason {}")
+          .addArgument(transaction::toTraceLog)
+          .addArgument(validationResult.result::getInvalidReason)
+          .log();
+      metrics.incrementRejected(false, validationResult.result.getInvalidReason(), "txpool");
+      pendingTransactions.signalInvalidAndRemoveDependentTransactions(transaction);
     }
-    if (!addedTransactions.isEmpty()) {
-      transactionBatchAddedListener.onTransactionsAdded(addedTransactions);
-    }
+
+    return validationResult.result;
   }
 
-  public long subscribePendingTransactions(final PendingTransactionListener listener) {
-    return pendingTransactions.subscribePendingTransactions(listener);
+  public long subscribePendingTransactions(final PendingTransactionAddedListener listener) {
+    return pendingTransactionsListenersProxy.onAddedListeners.subscribe(listener);
   }
 
   public void unsubscribePendingTransactions(final long id) {
-    pendingTransactions.unsubscribePendingTransactions(id);
+    pendingTransactionsListenersProxy.onAddedListeners.unsubscribe(id);
   }
 
   public long subscribeDroppedTransactions(final PendingTransactionDroppedListener listener) {
-    return pendingTransactions.subscribeDroppedTransactions(listener);
+    return pendingTransactionsListenersProxy.onDroppedListeners.subscribe(listener);
   }
 
   public void unsubscribeDroppedTransactions(final long id) {
-    pendingTransactions.unsubscribeDroppedTransactions(id);
+    pendingTransactionsListenersProxy.onDroppedListeners.unsubscribe(id);
   }
 
   @Override
   public void onBlockAdded(final BlockAddedEvent event) {
-    event.getAddedTransactions().forEach(pendingTransactions::transactionAddedToBlock);
-    addRemoteTransactions(event.getRemovedTransactions());
+    if (isPoolEnabled.get()) {
+      LOG.trace("Block added event {}", event);
+      if (event.getEventType().equals(BlockAddedEvent.EventType.HEAD_ADVANCED)
+          || event.getEventType().equals(BlockAddedEvent.EventType.CHAIN_REORG)) {
+
+        pendingTransactions.manageBlockAdded(
+            event.getBlock().getHeader(),
+            event.getAddedTransactions(),
+            event.getRemovedTransactions(),
+            protocolSchedule.getByBlockHeader(event.getBlock().getHeader()).getFeeMarket());
+        reAddTransactions(event.getRemovedTransactions());
+      }
+    }
+  }
+
+  private void reAddTransactions(final List<Transaction> reAddTransactions) {
+    if (!reAddTransactions.isEmpty()) {
+      var txsByOrigin =
+          reAddTransactions.stream()
+              .collect(
+                  Collectors.partitioningBy(
+                      tx ->
+                          configuration.getDisableLocalTransactions()
+                              ? false
+                              : pendingTransactions.isLocalSender(tx.getSender())));
+      var reAddLocalTxs = txsByOrigin.get(true);
+      var reAddRemoteTxs = txsByOrigin.get(false);
+      if (!reAddLocalTxs.isEmpty()) {
+        logReAddedTransactions(reAddLocalTxs, "local");
+        sortedBySenderAndNonce(reAddLocalTxs).forEach(this::addLocalTransaction);
+      }
+      if (!reAddRemoteTxs.isEmpty()) {
+        logReAddedTransactions(reAddRemoteTxs, "remote");
+        addRemoteTransactions(reAddRemoteTxs);
+      }
+    }
+  }
+
+  private static void logReAddedTransactions(
+      final List<Transaction> reAddedTxs, final String source) {
+    LOG.atTrace()
+        .setMessage("Re-adding {} {} transactions from a block event: {}")
+        .addArgument(reAddedTxs::size)
+        .addArgument(source)
+        .addArgument(
+            () ->
+                reAddedTxs.stream().map(Transaction::toTraceLog).collect(Collectors.joining("; ")))
+        .log();
   }
 
   private MainnetTransactionValidator getTransactionValidator() {
     return protocolSchedule
-        .getByBlockNumber(protocolContext.getBlockchain().getChainHeadBlockNumber())
+        .getByBlockHeader(protocolContext.getBlockchain().getChainHeadHeader())
         .getTransactionValidator();
   }
 
@@ -241,63 +363,376 @@ public PendingTransactions getPendingTransactions() {
     return pendingTransactions;
   }
 
-  private ValidationResult<TransactionInvalidReason> validateTransaction(
-      final Transaction transaction) {
-    final BlockHeader chainHeadBlockHeader = getChainHeadBlockHeader();
+  private ValidationResultAndAccount validateLocalTransaction(final Transaction transaction) {
+    return validateTransaction(transaction, true);
+  }
+
+  private ValidationResultAndAccount validateRemoteTransaction(final Transaction transaction) {
+    return validateTransaction(transaction, false);
+  }
+
+  private ValidationResultAndAccount validateTransaction(
+      final Transaction transaction, final boolean isLocal) {
+
+    final BlockHeader chainHeadBlockHeader = getChainHeadBlockHeader().orElse(null);
+    if (chainHeadBlockHeader == null) {
+      LOG.atTrace()
+          .setMessage("rejecting transaction {} due to chain head not available yet")
+          .addArgument(transaction::getHash)
+          .log();
+      return ValidationResultAndAccount.invalid(CHAIN_HEAD_NOT_AVAILABLE);
+    }
+
+    final FeeMarket feeMarket =
+        protocolSchedule.getByBlockHeader(chainHeadBlockHeader).getFeeMarket();
+
+    final TransactionInvalidReason priceInvalidReason =
+        validatePrice(transaction, isLocal, feeMarket);
+    if (priceInvalidReason != null) {
+      return ValidationResultAndAccount.invalid(priceInvalidReason);
+    }
+
     final ValidationResult<TransactionInvalidReason> basicValidationResult =
-        getTransactionValidator().validate(transaction, chainHeadBlockHeader.getBaseFee());
+        getTransactionValidator()
+            .validate(
+                transaction,
+                chainHeadBlockHeader.getBaseFee(),
+                TransactionValidationParams.transactionPool());
     if (!basicValidationResult.isValid()) {
-      return basicValidationResult;
+      return new ValidationResultAndAccount(basicValidationResult);
     }
 
+    if (isLocal
+        && strictReplayProtectionShouldBeEnforceLocally(chainHeadBlockHeader)
+        && transaction.getChainId().isEmpty()) {
+      // Strict replay protection is enabled but the tx is not replay-protected
+      return ValidationResultAndAccount.invalid(
+          TransactionInvalidReason.REPLAY_PROTECTED_SIGNATURE_REQUIRED);
+    }
     if (transaction.getGasLimit() > chainHeadBlockHeader.getGasLimit()) {
-      return ValidationResult.invalid(
+      return ValidationResultAndAccount.invalid(
           TransactionInvalidReason.EXCEEDS_BLOCK_GAS_LIMIT,
           String.format(
               "Transaction gas limit of %s exceeds block gas limit of %s",
               transaction.getGasLimit(), chainHeadBlockHeader.getGasLimit()));
     }
+    if (transaction.getType().equals(TransactionType.EIP1559) && !feeMarket.implementsBaseFee()) {
+      return ValidationResultAndAccount.invalid(
+          TransactionInvalidReason.INVALID_TRANSACTION_FORMAT,
+          "EIP-1559 transaction are not allowed yet");
+    }
 
-    return protocolContext
-        .getWorldStateArchive()
-        .get(chainHeadBlockHeader.getStateRoot())
-        .map(
-            worldState -> {
-              final Account senderAccount = worldState.get(transaction.getSender());
-              return getTransactionValidator()
-                  .validateForSender(
-                      transaction, senderAccount, TransactionValidationParams.transactionPool());
-            })
-        .orElseGet(() -> ValidationResult.invalid(CHAIN_HEAD_WORLD_STATE_NOT_AVAILABLE));
+    try (final var worldState =
+        protocolContext
+            .getWorldStateArchive()
+            .getMutable(chainHeadBlockHeader, false)
+            .orElseThrow()) {
+      final Account senderAccount = worldState.get(transaction.getSender());
+      return new ValidationResultAndAccount(
+          senderAccount,
+          getTransactionValidator()
+              .validateForSender(
+                  transaction, senderAccount, TransactionValidationParams.transactionPool()));
+    } catch (MerkleTrieException ex) {
+      LOG.debug(
+          "MerkleTrieException while validating transaction for sender {}",
+          transaction.getSender());
+      return ValidationResultAndAccount.invalid(CHAIN_HEAD_WORLD_STATE_NOT_AVAILABLE);
+    } catch (Exception ex) {
+      return ValidationResultAndAccount.invalid(CHAIN_HEAD_WORLD_STATE_NOT_AVAILABLE);
+    }
+  }
+
+  private TransactionInvalidReason validatePrice(
+      final Transaction transaction, final boolean isLocal, final FeeMarket feeMarket) {
+
+    if (isLocal) {
+      if (!configuration.getTxFeeCap().isZero()
+          && getMaxGasPrice(transaction).get().greaterThan(configuration.getTxFeeCap())) {
+        return TransactionInvalidReason.TX_FEECAP_EXCEEDED;
+      }
+      // allow local transactions to be below minGas as long as we are mining
+      // or at least gas price is above the configured floor
+      if ((!miningParameters.isMiningEnabled()
+              && isMaxGasPriceBelowConfiguredMinGasPrice(transaction))
+          || !feeMarket.satisfiesFloorTxFee(transaction)) {
+        return TransactionInvalidReason.GAS_PRICE_TOO_LOW;
+      }
+    } else {
+      if (isMaxGasPriceBelowConfiguredMinGasPrice(transaction)) {
+        LOG.atTrace()
+            .setMessage("Discard transaction {} below min gas price {}")
+            .addArgument(transaction::toTraceLog)
+            .addArgument(miningParameters::getMinTransactionGasPrice)
+            .log();
+        return TransactionInvalidReason.GAS_PRICE_TOO_LOW;
+      }
+    }
+    return null;
+  }
+
+  private boolean strictReplayProtectionShouldBeEnforceLocally(
+      final BlockHeader chainHeadBlockHeader) {
+    return configuration.getStrictTransactionReplayProtectionEnabled()
+        && protocolSchedule.getChainId().isPresent()
+        && transactionReplaySupportedAtBlock(chainHeadBlockHeader);
+  }
+
+  private boolean transactionReplaySupportedAtBlock(final BlockHeader blockHeader) {
+    return protocolSchedule.getByBlockHeader(blockHeader).isReplayProtectionSupported();
   }
 
   public Optional<Transaction> getTransactionByHash(final Hash hash) {
     return pendingTransactions.getTransactionByHash(hash);
   }
 
-  private BlockHeader getChainHeadBlockHeader() {
+  private Optional<BlockHeader> getChainHeadBlockHeader() {
     final MutableBlockchain blockchain = protocolContext.getBlockchain();
-    return blockchain.getBlockHeader(blockchain.getChainHeadHash()).get();
+    return blockchain.getBlockHeader(blockchain.getChainHeadHash());
   }
 
   public interface TransactionBatchAddedListener {
 
-    void onTransactionsAdded(Iterable<Transaction> transactions);
+    void onTransactionsAdded(Collection<Transaction> transactions);
+  }
+
+  private static class ValidationResultAndAccount {
+    final ValidationResult<TransactionInvalidReason> result;
+    final Optional<Account> maybeAccount;
+
+    ValidationResultAndAccount(
+        final Account account, final ValidationResult<TransactionInvalidReason> result) {
+      this.result = result;
+      this.maybeAccount =
+          Optional.ofNullable(account)
+              .map(
+                  acct -> new SimpleAccount(acct.getAddress(), acct.getNonce(), acct.getBalance()));
+    }
+
+    ValidationResultAndAccount(final ValidationResult<TransactionInvalidReason> result) {
+      this.result = result;
+      this.maybeAccount = Optional.empty();
+    }
+
+    static ValidationResultAndAccount invalid(
+        final TransactionInvalidReason reason, final String message) {
+      return new ValidationResultAndAccount(ValidationResult.invalid(reason, message));
+    }
+
+    static ValidationResultAndAccount invalid(final TransactionInvalidReason reason) {
+      return new ValidationResultAndAccount(ValidationResult.invalid(reason));
+    }
   }
 
-  private Wei minTransactionGasPrice(final Transaction transaction) {
-    // EIP-1559 enablement guard block
-    if (!ExperimentalEIPs.eip1559Enabled || this.eip1559.isEmpty()) {
-      return frontierPriceCalculator.price(transaction, Optional.empty());
+  public CompletableFuture<Void> setEnabled() {
+    if (!isEnabled()) {
+      pendingTransactions = pendingTransactionsSupplier.get();
+      pendingTransactionsListenersProxy.subscribe();
+      isPoolEnabled.set(true);
+      subscribeConnectId =
+          OptionalLong.of(ethContext.getEthPeers().subscribeConnect(this::handleConnect));
+      return saveRestoreManager
+          .loadFromDisk()
+          .exceptionally(
+              t -> {
+                LOG.error("Error while restoring transaction pool from disk", t);
+                return null;
+              });
     }
+    return CompletableFuture.completedFuture(null);
+  }
+
+  public CompletableFuture<Void> setDisabled() {
+    if (isEnabled()) {
+      isPoolEnabled.set(false);
+      subscribeConnectId.ifPresent(ethContext.getEthPeers()::unsubscribeConnect);
+      pendingTransactionsListenersProxy.unsubscribe();
+      final PendingTransactions pendingTransactionsToSave = pendingTransactions;
+      pendingTransactions = new DisabledPendingTransactions();
+      return saveRestoreManager
+          .saveToDisk(pendingTransactionsToSave)
+          .exceptionally(
+              t -> {
+                LOG.error("Error while saving transaction pool to disk", t);
+                return null;
+              });
+    }
+    return CompletableFuture.completedFuture(null);
+  }
 
-    final BlockHeader chainHeadBlockHeader = getChainHeadBlockHeader();
-    // Compute transaction price using EIP-1559 rules if chain head is after fork
-    if (this.eip1559.get().isEIP1559(chainHeadBlockHeader.getNumber())) {
-      return BaseFee.minTransactionPriceInNextBlock(
-          transaction, eip1559PriceCalculator, chainHeadBlockHeader::getBaseFee);
-    } else { // Use frontier rules otherwise
-      return frontierPriceCalculator.price(transaction, Optional.empty());
+  public boolean isEnabled() {
+    return isPoolEnabled.get();
+  }
+
+  class PendingTransactionsListenersProxy {
+    private final Subscribers<PendingTransactionAddedListener> onAddedListeners =
+        Subscribers.create();
+    private final Subscribers<PendingTransactionDroppedListener> onDroppedListeners =
+        Subscribers.create();
+
+    private volatile long onAddedListenerId;
+    private volatile long onDroppedListenerId;
+
+    void subscribe() {
+      onAddedListenerId = pendingTransactions.subscribePendingTransactions(this::onAdded);
+      onDroppedListenerId = pendingTransactions.subscribeDroppedTransactions(this::onDropped);
+    }
+
+    void unsubscribe() {
+      pendingTransactions.unsubscribePendingTransactions(onAddedListenerId);
+      pendingTransactions.unsubscribeDroppedTransactions(onDroppedListenerId);
+    }
+
+    private void onDropped(final Transaction transaction) {
+      onDroppedListeners.forEach(listener -> listener.onTransactionDropped(transaction));
+    }
+
+    private void onAdded(final Transaction transaction) {
+      onAddedListeners.forEach(listener -> listener.onTransactionAdded(transaction));
+    }
+  }
+
+  class SaveRestoreManager {
+    private final Lock diskAccessLock = new ReentrantLock();
+    private final AtomicReference<CompletableFuture<Void>> writeInProgress =
+        new AtomicReference<>(CompletableFuture.completedFuture(null));
+    private final AtomicReference<CompletableFuture<Void>> readInProgress =
+        new AtomicReference<>(CompletableFuture.completedFuture(null));
+    private final AtomicBoolean isCancelled = new AtomicBoolean(false);
+
+    CompletableFuture<Void> saveToDisk(final PendingTransactions pendingTransactionsToSave) {
+      return serializeAndDedupOperation(
+          () -> executeSaveToDisk(pendingTransactionsToSave), writeInProgress);
+    }
+
+    CompletableFuture<Void> loadFromDisk() {
+      return serializeAndDedupOperation(this::executeLoadFromDisk, readInProgress);
+    }
+
+    private CompletableFuture<Void> serializeAndDedupOperation(
+        final Runnable operation,
+        final AtomicReference<CompletableFuture<Void>> operationInProgress) {
+      if (configuration.getEnableSaveRestore()) {
+        try {
+          if (diskAccessLock.tryLock(1, TimeUnit.MINUTES)) {
+            try {
+              if (!operationInProgress.get().isDone()) {
+                isCancelled.set(true);
+                try {
+                  operationInProgress.get().get();
+                } catch (ExecutionException ee) {
+                  // nothing to do
+                }
+              }
+
+              isCancelled.set(false);
+              operationInProgress.set(CompletableFuture.runAsync(operation));
+              return operationInProgress.get();
+            } catch (InterruptedException ie) {
+              isCancelled.set(false);
+            } finally {
+              diskAccessLock.unlock();
+            }
+          } else {
+            CompletableFuture.failedFuture(
+                new TimeoutException("Timeout waiting for disk access lock"));
+          }
+        } catch (InterruptedException ie) {
+          return CompletableFuture.failedFuture(ie);
+        }
+      }
+      return CompletableFuture.completedFuture(null);
+    }
+
+    private void executeSaveToDisk(final PendingTransactions pendingTransactionsToSave) {
+      final File saveFile = configuration.getSaveFile();
+      try (final BufferedWriter bw =
+          new BufferedWriter(new FileWriter(saveFile, StandardCharsets.US_ASCII))) {
+        final var allTxs = pendingTransactionsToSave.getPendingTransactions();
+        LOG.info("Saving {} transactions to file {}", allTxs.size(), saveFile);
+
+        final long savedTxs =
+            allTxs.parallelStream()
+                .takeWhile(unused -> !isCancelled.get())
+                .map(
+                    ptx -> {
+                      final BytesValueRLPOutput rlp = new BytesValueRLPOutput();
+                      ptx.getTransaction().writeTo(rlp);
+                      return (ptx.isReceivedFromLocalSource() ? "l" : "r")
+                          + rlp.encoded().toBase64String();
+                    })
+                .mapToInt(
+                    line -> {
+                      synchronized (bw) {
+                        try {
+                          bw.write(line);
+                          bw.newLine();
+                        } catch (IOException e) {
+                          throw new RuntimeException(e);
+                        }
+                      }
+                      return 1;
+                    })
+                .sum();
+        if (isCancelled.get()) {
+          LOG.info(
+              "Saved {} transactions to file {}, before operation was cancelled",
+              savedTxs,
+              saveFile);
+        } else {
+          LOG.info("Saved {} transactions to file {}", savedTxs, saveFile);
+        }
+      } catch (IOException e) {
+        LOG.error("Error while saving txpool content to disk", e);
+      }
+    }
+
+    private void executeLoadFromDisk() {
+      if (configuration.getEnableSaveRestore()) {
+        final File saveFile = configuration.getSaveFile();
+        if (saveFile.exists()) {
+          LOG.info("Loading transaction pool content from file {}", saveFile);
+          try (final BufferedReader br =
+              new BufferedReader(new FileReader(saveFile, StandardCharsets.US_ASCII))) {
+            final IntSummaryStatistics stats =
+                br.lines()
+                    .takeWhile(unused -> !isCancelled.get())
+                    .mapToInt(
+                        line -> {
+                          final boolean isLocal = line.charAt(0) == 'l';
+                          final Transaction tx =
+                              Transaction.readFrom(Bytes.fromBase64String(line.substring(1)));
+
+                          final ValidationResult<TransactionInvalidReason> result;
+                          if (isLocal && !configuration.getDisableLocalTransactions()) {
+                            result = addLocalTransaction(tx);
+                          } else {
+                            result = addRemoteTransaction(tx);
+                          }
+
+                          return result.isValid() ? 1 : 0;
+                        })
+                    .summaryStatistics();
+
+            if (isCancelled.get()) {
+              LOG.info(
+                  "Added {} transactions of {} loaded from file {}, before operation was cancelled",
+                  stats.getSum(),
+                  stats.getCount(),
+                  saveFile);
+            } else {
+              LOG.info(
+                  "Added {} transactions of {} loaded from file {}",
+                  stats.getSum(),
+                  stats.getCount(),
+                  saveFile);
+            }
+          } catch (IOException e) {
+            LOG.error("Error while saving txpool content to disk", e);
+          }
+        }
+        saveFile.delete();
+      }
     }
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolConfiguration.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolConfiguration.java
index 2401278c3d6..ddcb06f8a9d 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolConfiguration.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolConfiguration.java
@@ -14,9 +14,10 @@
  */
 package org.hyperledger.besu.ethereum.eth.transactions;
 
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.util.number.Percentage;
 
+import java.io.File;
 import java.time.Duration;
 
 import org.immutables.value.Value;
@@ -24,24 +25,39 @@
 @Value.Immutable
 @Value.Style(allParameters = true)
 public interface TransactionPoolConfiguration {
+  String DEFAULT_SAVE_FILE_NAME = "txpool.dump";
   int DEFAULT_TX_MSG_KEEP_ALIVE = 60;
-  int MAX_PENDING_TRANSACTIONS = 4096;
-  int MAX_PENDING_TRANSACTIONS_HASHES = 4096;
+  int DEFAULT_MAX_PENDING_TRANSACTIONS = 4096;
+  float DEFAULT_LIMIT_TX_POOL_BY_ACCOUNT_PERCENTAGE = 0.001f; // 0.1%
   int DEFAULT_TX_RETENTION_HOURS = 13;
+  boolean DEFAULT_STRICT_TX_REPLAY_PROTECTION_ENABLED = false;
   Percentage DEFAULT_PRICE_BUMP = Percentage.fromInt(10);
   Wei DEFAULT_RPC_TX_FEE_CAP = Wei.fromEth(1);
   Duration ETH65_TRX_ANNOUNCED_BUFFERING_PERIOD = Duration.ofMillis(500);
+  boolean DEFAULT_DISABLE_LOCAL_TXS = false;
+  boolean DEFAULT_ENABLE_SAVE_RESTORE = false;
+
+  File DEFAULT_SAVE_FILE = new File(DEFAULT_SAVE_FILE_NAME);
+  long DEFAULT_PENDING_TRANSACTIONS_LAYER_MAX_CAPACITY_BYTES = 50_000_000L;
+  int DEFAULT_MAX_PRIORITIZED_TRANSACTIONS = 2000;
+  int DEFAULT_MAX_FUTURE_BY_SENDER = 200;
+  boolean DEFAULT_LAYERED_TX_POOL_ENABLED = false;
 
   TransactionPoolConfiguration DEFAULT = ImmutableTransactionPoolConfiguration.builder().build();
 
   @Value.Default
   default int getTxPoolMaxSize() {
-    return MAX_PENDING_TRANSACTIONS;
+    return DEFAULT_MAX_PENDING_TRANSACTIONS;
   }
 
   @Value.Default
-  default int getPooledTransactionHashesSize() {
-    return MAX_PENDING_TRANSACTIONS_HASHES;
+  default float getTxPoolLimitByAccountPercentage() {
+    return DEFAULT_LIMIT_TX_POOL_BY_ACCOUNT_PERCENTAGE;
+  }
+
+  @Value.Derived
+  default int getTxPoolMaxFutureTransactionByAccount() {
+    return (int) Math.ceil(getTxPoolLimitByAccountPercentage() * getTxPoolMaxSize());
   }
 
   @Value.Default
@@ -68,4 +84,44 @@ default Duration getEth65TrxAnnouncedBufferingPeriod() {
   default Wei getTxFeeCap() {
     return DEFAULT_RPC_TX_FEE_CAP;
   }
+
+  @Value.Default
+  default Boolean getStrictTransactionReplayProtectionEnabled() {
+    return DEFAULT_STRICT_TX_REPLAY_PROTECTION_ENABLED;
+  }
+
+  @Value.Default
+  default Boolean getDisableLocalTransactions() {
+    return DEFAULT_DISABLE_LOCAL_TXS;
+  }
+
+  @Value.Default
+  default Boolean getEnableSaveRestore() {
+    return DEFAULT_ENABLE_SAVE_RESTORE;
+  }
+
+  @Value.Default
+  default File getSaveFile() {
+    return DEFAULT_SAVE_FILE;
+  }
+
+  @Value.Default
+  default Boolean getLayeredTxPoolEnabled() {
+    return DEFAULT_LAYERED_TX_POOL_ENABLED;
+  }
+
+  @Value.Default
+  default long getPendingTransactionsLayerMaxCapacityBytes() {
+    return DEFAULT_PENDING_TRANSACTIONS_LAYER_MAX_CAPACITY_BYTES;
+  }
+
+  @Value.Default
+  default int getMaxPrioritizedTransactions() {
+    return DEFAULT_MAX_PRIORITIZED_TRANSACTIONS;
+  }
+
+  @Value.Default
+  default int getMaxFutureBySender() {
+    return DEFAULT_MAX_FUTURE_BY_SENDER;
+  }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolEvictionService.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolEvictionService.java
new file mode 100644
index 00000000000..58d575f326f
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolEvictionService.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions;
+
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+
+import io.vertx.core.Vertx;
+
+public class TransactionPoolEvictionService {
+  private final Vertx vertx;
+  private final TransactionPool transactionPool;
+  private Optional<Long> timerId = Optional.empty();
+
+  public TransactionPoolEvictionService(final Vertx vertx, final TransactionPool transactionPool) {
+    this.vertx = vertx;
+    this.transactionPool = transactionPool;
+  }
+
+  public void start() {
+    assert (!timerId.isPresent());
+    timerId =
+        Optional.of(
+            vertx.setPeriodic(
+                TimeUnit.MINUTES.toMillis(1),
+                id -> {
+                  if (transactionPool.isEnabled()) {
+                    transactionPool.getPendingTransactions().evictOldTransactions();
+                  }
+                }));
+  }
+
+  public void stop() {
+    if (timerId.isPresent()) {
+      vertx.cancelTimer(timerId.get());
+      timerId = Optional.empty();
+    }
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolFactory.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolFactory.java
index d9bad361bad..16a05922864 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolFactory.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolFactory.java
@@ -14,23 +14,35 @@
  */
 package org.hyperledger.besu.ethereum.eth.transactions;
 
-import static com.google.common.base.Preconditions.checkState;
-
 import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.fees.EIP1559;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.messages.EthPV62;
 import org.hyperledger.besu.ethereum.eth.messages.EthPV65;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.ethereum.eth.transactions.layered.AbstractPrioritizedTransactions;
+import org.hyperledger.besu.ethereum.eth.transactions.layered.BaseFeePrioritizedTransactions;
+import org.hyperledger.besu.ethereum.eth.transactions.layered.EndLayer;
+import org.hyperledger.besu.ethereum.eth.transactions.layered.GasPricePrioritizedTransactions;
+import org.hyperledger.besu.ethereum.eth.transactions.layered.LayeredPendingTransactions;
+import org.hyperledger.besu.ethereum.eth.transactions.layered.ReadyTransactions;
+import org.hyperledger.besu.ethereum.eth.transactions.layered.SparseTransactions;
+import org.hyperledger.besu.ethereum.eth.transactions.sorter.AbstractPendingTransactionsSorter;
+import org.hyperledger.besu.ethereum.eth.transactions.sorter.BaseFeePendingTransactionsSorter;
+import org.hyperledger.besu.ethereum.eth.transactions.sorter.GasPricePendingTransactionsSorter;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+import org.hyperledger.besu.plugin.services.BesuEvents;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
 import java.time.Clock;
-import java.util.Optional;
+import java.util.function.BiFunction;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TransactionPoolFactory {
+  private static final Logger LOG = LoggerFactory.getLogger(TransactionPoolFactory.class);
 
   public static TransactionPool createTransactionPool(
       final ProtocolSchedule protocolSchedule,
@@ -39,129 +51,241 @@ public static TransactionPool createTransactionPool(
       final Clock clock,
       final MetricsSystem metricsSystem,
       final SyncState syncState,
-      final Wei minTransactionGasPrice,
-      final TransactionPoolConfiguration transactionPoolConfiguration,
-      final boolean eth65Enabled,
-      final Optional<EIP1559> eip1559) {
-
-    final PendingTransactions pendingTransactions =
-        new PendingTransactions(
-            transactionPoolConfiguration.getPendingTxRetentionPeriod(),
-            transactionPoolConfiguration.getTxPoolMaxSize(),
-            transactionPoolConfiguration.getPooledTransactionHashesSize(),
-            clock,
-            metricsSystem,
-            protocolContext.getBlockchain()::getChainHeadHeader,
-            transactionPoolConfiguration.getPriceBump());
+      final MiningParameters miningParameters,
+      final TransactionPoolConfiguration transactionPoolConfiguration) {
+
+    final TransactionPoolMetrics metrics = new TransactionPoolMetrics(metricsSystem);
 
     final PeerTransactionTracker transactionTracker = new PeerTransactionTracker();
     final TransactionsMessageSender transactionsMessageSender =
         new TransactionsMessageSender(transactionTracker);
 
-    final Optional<PeerPendingTransactionTracker> pendingTransactionTracker =
-        eth65Enabled
-            ? Optional.of(new PeerPendingTransactionTracker(pendingTransactions))
-            : Optional.empty();
-    final Optional<PendingTransactionsMessageSender> pendingTransactionsMessageSender =
-        eth65Enabled
-            ? Optional.of(new PendingTransactionsMessageSender(pendingTransactionTracker.get()))
-            : Optional.empty();
+    final NewPooledTransactionHashesMessageSender newPooledTransactionHashesMessageSender =
+        new NewPooledTransactionHashesMessageSender(transactionTracker);
 
     return createTransactionPool(
         protocolSchedule,
         protocolContext,
         ethContext,
-        metricsSystem,
+        clock,
+        metrics,
         syncState,
-        minTransactionGasPrice,
+        miningParameters,
         transactionPoolConfiguration,
-        pendingTransactions,
         transactionTracker,
         transactionsMessageSender,
-        pendingTransactionTracker,
-        pendingTransactionsMessageSender,
-        eth65Enabled,
-        eip1559);
+        newPooledTransactionHashesMessageSender);
   }
 
   static TransactionPool createTransactionPool(
       final ProtocolSchedule protocolSchedule,
       final ProtocolContext protocolContext,
       final EthContext ethContext,
-      final MetricsSystem metricsSystem,
+      final Clock clock,
+      final TransactionPoolMetrics metrics,
       final SyncState syncState,
-      final Wei minTransactionGasPrice,
+      final MiningParameters miningParameters,
       final TransactionPoolConfiguration transactionPoolConfiguration,
-      final PendingTransactions pendingTransactions,
       final PeerTransactionTracker transactionTracker,
       final TransactionsMessageSender transactionsMessageSender,
-      final Optional<PeerPendingTransactionTracker> pendingTransactionTracker,
-      final Optional<PendingTransactionsMessageSender> pendingTransactionsMessageSender,
-      final boolean eth65Enabled,
-      final Optional<EIP1559> eip1559) {
-    checkState(
-        eth65Enabled == pendingTransactionTracker.isPresent(),
-        "Pending transaction tracker is present iff eth/65 is enabled.");
-    checkState(
-        eth65Enabled == pendingTransactionsMessageSender.isPresent(),
-        "Pending transaction message sender is present iff eth/65 is enabled.");
+      final NewPooledTransactionHashesMessageSender newPooledTransactionHashesMessageSender) {
+
     final TransactionPool transactionPool =
         new TransactionPool(
-            pendingTransactions,
+            () ->
+                createPendingTransactions(
+                    protocolSchedule,
+                    protocolContext,
+                    clock,
+                    metrics,
+                    transactionPoolConfiguration),
             protocolSchedule,
             protocolContext,
-            new TransactionSender(transactionTracker, transactionsMessageSender, ethContext),
-            eth65Enabled
-                ? Optional.of(
-                    new PendingTransactionSender(
-                        pendingTransactionTracker.get(),
-                        pendingTransactionsMessageSender.get(),
-                        ethContext))
-                : Optional.empty(),
-            syncState,
+            new TransactionBroadcaster(
+                ethContext,
+                transactionTracker,
+                transactionsMessageSender,
+                newPooledTransactionHashesMessageSender),
             ethContext,
-            transactionTracker,
-            pendingTransactionTracker,
-            minTransactionGasPrice,
-            metricsSystem,
-            eip1559,
+            miningParameters,
+            metrics,
             transactionPoolConfiguration);
+
     final TransactionsMessageHandler transactionsMessageHandler =
         new TransactionsMessageHandler(
             ethContext.getScheduler(),
-            new TransactionsMessageProcessor(
+            new TransactionsMessageProcessor(transactionTracker, transactionPool, metrics),
+            transactionPoolConfiguration.getTxMessageKeepAliveSeconds());
+
+    final NewPooledTransactionHashesMessageHandler pooledTransactionsMessageHandler =
+        new NewPooledTransactionHashesMessageHandler(
+            ethContext.getScheduler(),
+            new NewPooledTransactionHashesMessageProcessor(
                 transactionTracker,
                 transactionPool,
-                metricsSystem.createCounter(
-                    BesuMetricCategory.TRANSACTION_POOL,
-                    "transactions_messages_skipped_total",
-                    "Total number of transactions messages skipped by the processor.")),
+                transactionPoolConfiguration,
+                ethContext,
+                metrics),
             transactionPoolConfiguration.getTxMessageKeepAliveSeconds());
-    ethContext.getEthMessages().subscribe(EthPV62.TRANSACTIONS, transactionsMessageHandler);
-    if (eth65Enabled) {
-      final PendingTransactionsMessageHandler pooledTransactionsMessageHandler =
-          new PendingTransactionsMessageHandler(
-              ethContext.getScheduler(),
-              new PendingTransactionsMessageProcessor(
-                  pendingTransactionTracker.get(),
-                  transactionPool,
-                  transactionPoolConfiguration,
-                  metricsSystem.createCounter(
-                      BesuMetricCategory.TRANSACTION_POOL,
-                      "pending_transactions_messages_skipped_total",
-                      "Total number of pending transactions messages skipped by the processor."),
-                  ethContext,
-                  metricsSystem,
-                  syncState),
-              transactionPoolConfiguration.getTxMessageKeepAliveSeconds());
-      ethContext
-          .getEthMessages()
-          .subscribe(EthPV65.NEW_POOLED_TRANSACTION_HASHES, pooledTransactionsMessageHandler);
-      ethContext.getEthPeers().subscribeDisconnect(pendingTransactionTracker.get());
+
+    subscribeTransactionHandlers(
+        protocolContext,
+        ethContext,
+        transactionTracker,
+        transactionPool,
+        transactionsMessageHandler,
+        pooledTransactionsMessageHandler);
+
+    if (syncState.isInitialSyncPhaseDone()) {
+      LOG.info("Enabling transaction pool");
+      pooledTransactionsMessageHandler.setEnabled();
+      transactionsMessageHandler.setEnabled();
+      transactionPool.setEnabled();
+    } else {
+      LOG.info("Transaction pool disabled while initial sync in progress");
     }
 
-    protocolContext.getBlockchain().observeBlockAdded(transactionPool);
-    ethContext.getEthPeers().subscribeDisconnect(transactionTracker);
+    syncState.subscribeCompletionReached(
+        new BesuEvents.InitialSyncCompletionListener() {
+          @Override
+          public void onInitialSyncCompleted() {
+            LOG.info("Enabling transaction handling following initial sync");
+            transactionTracker.reset();
+            transactionPool.setEnabled();
+            transactionsMessageHandler.setEnabled();
+            pooledTransactionsMessageHandler.setEnabled();
+          }
+
+          @Override
+          public void onInitialSyncRestart() {
+            LOG.info("Disabling transaction handling during re-sync");
+            pooledTransactionsMessageHandler.setDisabled();
+            transactionsMessageHandler.setDisabled();
+            transactionPool.setDisabled();
+          }
+        });
+
     return transactionPool;
   }
+
+  private static void subscribeTransactionHandlers(
+      final ProtocolContext protocolContext,
+      final EthContext ethContext,
+      final PeerTransactionTracker transactionTracker,
+      final TransactionPool transactionPool,
+      final TransactionsMessageHandler transactionsMessageHandler,
+      final NewPooledTransactionHashesMessageHandler pooledTransactionsMessageHandler) {
+    ethContext.getEthPeers().subscribeDisconnect(transactionTracker);
+    protocolContext.getBlockchain().observeBlockAdded(transactionPool);
+    ethContext.getEthMessages().subscribe(EthPV62.TRANSACTIONS, transactionsMessageHandler);
+    ethContext
+        .getEthMessages()
+        .subscribe(EthPV65.NEW_POOLED_TRANSACTION_HASHES, pooledTransactionsMessageHandler);
+  }
+
+  private static PendingTransactions createPendingTransactions(
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final Clock clock,
+      final TransactionPoolMetrics metrics,
+      final TransactionPoolConfiguration transactionPoolConfiguration) {
+
+    boolean isFeeMarketImplementBaseFee =
+        protocolSchedule.anyMatch(
+            scheduledSpec -> scheduledSpec.spec().getFeeMarket().implementsBaseFee());
+
+    if (transactionPoolConfiguration.getLayeredTxPoolEnabled()) {
+      LOG.info("Using layered transaction pool");
+      return createLayeredPendingTransactions(
+          protocolSchedule,
+          protocolContext,
+          metrics,
+          transactionPoolConfiguration,
+          isFeeMarketImplementBaseFee);
+    } else {
+      return createPendingTransactionSorter(
+          protocolContext,
+          clock,
+          metrics.getMetricsSystem(),
+          transactionPoolConfiguration,
+          isFeeMarketImplementBaseFee);
+    }
+  }
+
+  private static AbstractPendingTransactionsSorter createPendingTransactionSorter(
+      final ProtocolContext protocolContext,
+      final Clock clock,
+      final MetricsSystem metricsSystem,
+      final TransactionPoolConfiguration transactionPoolConfiguration,
+      final boolean isFeeMarketImplementBaseFee) {
+    if (isFeeMarketImplementBaseFee) {
+      return new BaseFeePendingTransactionsSorter(
+          transactionPoolConfiguration,
+          clock,
+          metricsSystem,
+          protocolContext.getBlockchain()::getChainHeadHeader);
+    } else {
+      return new GasPricePendingTransactionsSorter(
+          transactionPoolConfiguration,
+          clock,
+          metricsSystem,
+          protocolContext.getBlockchain()::getChainHeadHeader);
+    }
+  }
+
+  private static PendingTransactions createLayeredPendingTransactions(
+      final ProtocolSchedule protocolSchedule,
+      final ProtocolContext protocolContext,
+      final TransactionPoolMetrics metrics,
+      final TransactionPoolConfiguration transactionPoolConfiguration,
+      final boolean isFeeMarketImplementBaseFee) {
+
+    final TransactionPoolReplacementHandler transactionReplacementHandler =
+        new TransactionPoolReplacementHandler(transactionPoolConfiguration.getPriceBump());
+
+    final BiFunction<PendingTransaction, PendingTransaction, Boolean> transactionReplacementTester =
+        (t1, t2) ->
+            transactionReplacementHandler.shouldReplace(
+                t1, t2, protocolContext.getBlockchain().getChainHeadHeader());
+
+    final EndLayer endLayer = new EndLayer(metrics);
+
+    final SparseTransactions sparseTransactions =
+        new SparseTransactions(
+            transactionPoolConfiguration, endLayer, metrics, transactionReplacementTester);
+
+    final ReadyTransactions readyTransactions =
+        new ReadyTransactions(
+            transactionPoolConfiguration,
+            sparseTransactions,
+            metrics,
+            transactionReplacementTester);
+
+    final AbstractPrioritizedTransactions pendingTransactionsSorter;
+    if (isFeeMarketImplementBaseFee) {
+      final BaseFeeMarket baseFeeMarket =
+          (BaseFeeMarket)
+              protocolSchedule
+                  .getByBlockHeader(protocolContext.getBlockchain().getChainHeadHeader())
+                  .getFeeMarket();
+
+      pendingTransactionsSorter =
+          new BaseFeePrioritizedTransactions(
+              transactionPoolConfiguration,
+              protocolContext.getBlockchain()::getChainHeadHeader,
+              readyTransactions,
+              metrics,
+              transactionReplacementTester,
+              baseFeeMarket);
+    } else {
+      pendingTransactionsSorter =
+          new GasPricePrioritizedTransactions(
+              transactionPoolConfiguration,
+              readyTransactions,
+              metrics,
+              transactionReplacementTester);
+    }
+
+    return new LayeredPendingTransactions(transactionPoolConfiguration, pendingTransactionsSorter);
+  }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolMetrics.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolMetrics.java
new file mode 100644
index 00000000000..30ddb9db3db
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolMetrics.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions;
+
+import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.metrics.RunnableCounter;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.plugin.services.metrics.LabelledGauge;
+import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.DoubleSupplier;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TransactionPoolMetrics {
+  private static final Logger LOG = LoggerFactory.getLogger(TransactionPoolMetrics.class);
+  public static final String ADDED_COUNTER_NAME = "added_total";
+  public static final String REMOVED_COUNTER_NAME = "removed_total";
+  public static final String REJECTED_COUNTER_NAME = "rejected_total";
+  public static final String EXPIRED_MESSAGES_COUNTER_NAME = "messages_expired_total";
+  private static final int SKIPPED_MESSAGES_LOGGING_THRESHOLD = 1000;
+  private final MetricsSystem metricsSystem;
+  private final LabelledMetric<Counter> addedCounter;
+  private final LabelledMetric<Counter> removedCounter;
+  private final LabelledMetric<Counter> rejectedCounter;
+  private final LabelledGauge spaceUsed;
+  private final LabelledGauge transactionCount;
+  private final LabelledGauge uniqueSenderCount;
+  private final LabelledMetric<Counter> expiredMessagesCounter;
+  private final Map<String, RunnableCounter> expiredMessagesRunnableCounters = new HashMap<>();
+  private final LabelledMetric<Counter> alreadySeenTransactionsCounter;
+
+  public TransactionPoolMetrics(final MetricsSystem metricsSystem) {
+    this.metricsSystem = metricsSystem;
+
+    addedCounter =
+        metricsSystem.createLabelledCounter(
+            BesuMetricCategory.TRANSACTION_POOL,
+            ADDED_COUNTER_NAME,
+            "Count of transactions added to the transaction pool",
+            "source",
+            "layer");
+
+    removedCounter =
+        metricsSystem.createLabelledCounter(
+            BesuMetricCategory.TRANSACTION_POOL,
+            REMOVED_COUNTER_NAME,
+            "Count of transactions removed from the transaction pool",
+            "source",
+            "operation",
+            "layer");
+
+    rejectedCounter =
+        metricsSystem.createLabelledCounter(
+            BesuMetricCategory.TRANSACTION_POOL,
+            REJECTED_COUNTER_NAME,
+            "Count of transactions not accepted to the transaction pool",
+            "source",
+            "reason",
+            "layer");
+
+    spaceUsed =
+        metricsSystem.createLabelledGauge(
+            BesuMetricCategory.TRANSACTION_POOL,
+            "space_used",
+            "The amount of space used by the transactions in the layer",
+            "layer");
+
+    transactionCount =
+        metricsSystem.createLabelledGauge(
+            BesuMetricCategory.TRANSACTION_POOL,
+            "number_of_transactions",
+            "The number of transactions currently present in the layer",
+            "layer");
+
+    uniqueSenderCount =
+        metricsSystem.createLabelledGauge(
+            BesuMetricCategory.TRANSACTION_POOL,
+            "unique_senders",
+            "The number of senders with at least one transaction currently present in the layer",
+            "layer");
+
+    expiredMessagesCounter =
+        metricsSystem.createLabelledCounter(
+            BesuMetricCategory.TRANSACTION_POOL,
+            EXPIRED_MESSAGES_COUNTER_NAME,
+            "Total number of received transaction pool messages expired and not processed.",
+            "message");
+
+    alreadySeenTransactionsCounter =
+        metricsSystem.createLabelledCounter(
+            BesuMetricCategory.TRANSACTION_POOL,
+            "remote_transactions_already_seen_total",
+            "Total number of received transactions already seen",
+            "message");
+  }
+
+  public MetricsSystem getMetricsSystem() {
+    return metricsSystem;
+  }
+
+  public void initSpaceUsed(final DoubleSupplier spaceUsedSupplier, final String layer) {
+    spaceUsed.labels(spaceUsedSupplier, layer);
+  }
+
+  public void initTransactionCount(
+      final DoubleSupplier transactionCountSupplier, final String layer) {
+    transactionCount.labels(transactionCountSupplier, layer);
+  }
+
+  public void initUniqueSenderCount(
+      final DoubleSupplier uniqueSenderCountSupplier, final String layer) {
+    uniqueSenderCount.labels(uniqueSenderCountSupplier, layer);
+  }
+
+  public void initExpiredMessagesCounter(final String message) {
+    expiredMessagesRunnableCounters.put(
+        message,
+        new RunnableCounter(
+            expiredMessagesCounter.labels(message),
+            () ->
+                LOG.warn(
+                    "{} expired {} messages have been skipped.",
+                    SKIPPED_MESSAGES_LOGGING_THRESHOLD,
+                    message),
+            SKIPPED_MESSAGES_LOGGING_THRESHOLD));
+  }
+
+  public void incrementAdded(final boolean receivedFromLocalSource, final String layer) {
+    addedCounter.labels(location(receivedFromLocalSource), layer).inc();
+  }
+
+  public void incrementRemoved(
+      final boolean receivedFromLocalSource, final String operation, final String layer) {
+    removedCounter.labels(location(receivedFromLocalSource), operation, layer).inc();
+  }
+
+  public void incrementRejected(
+      final boolean receivedFromLocalSource,
+      final TransactionInvalidReason rejectReason,
+      final String layer) {
+    rejectedCounter.labels(location(receivedFromLocalSource), rejectReason.name(), layer).inc();
+  }
+
+  public void incrementExpiredMessages(final String message) {
+    expiredMessagesCounter.labels(message).inc();
+  }
+
+  public void incrementAlreadySeenTransactions(final String message, final long count) {
+    alreadySeenTransactionsCounter.labels(message).inc(count);
+  }
+
+  private String location(final boolean receivedFromLocalSource) {
+    return receivedFromLocalSource ? "local" : "remote";
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolReplacementHandler.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolReplacementHandler.java
index 95309f8df36..6e2138798ea 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolReplacementHandler.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolReplacementHandler.java
@@ -17,7 +17,6 @@
 import static java.util.Arrays.asList;
 
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionInfo;
 import org.hyperledger.besu.util.number.Percentage;
 
 import java.util.List;
@@ -28,7 +27,10 @@ public class TransactionPoolReplacementHandler {
   private final List<TransactionPoolReplacementRule> rules;
 
   public TransactionPoolReplacementHandler(final Percentage priceBump) {
-    this(asList(new TransactionReplacementByPriceRule(priceBump)));
+    this(
+        asList(
+            new TransactionReplacementByGasPriceRule(priceBump),
+            new TransactionReplacementByFeeMarketRule(priceBump)));
   }
 
   @VisibleForTesting
@@ -37,15 +39,17 @@ public TransactionPoolReplacementHandler(final Percentage priceBump) {
   }
 
   public boolean shouldReplace(
-      final TransactionInfo existingTransactionInfo,
-      final TransactionInfo newTransactionInfo,
+      final PendingTransaction existingPendingTransaction,
+      final PendingTransaction newPendingTransaction,
       final BlockHeader chainHeadHeader) {
-    assert existingTransactionInfo != null;
-    return newTransactionInfo != null
+    assert existingPendingTransaction != null;
+    return newPendingTransaction != null
         && rules.stream()
             .anyMatch(
                 rule ->
                     rule.shouldReplace(
-                        existingTransactionInfo, newTransactionInfo, chainHeadHeader.getBaseFee()));
+                        existingPendingTransaction,
+                        newPendingTransaction,
+                        chainHeadHeader.getBaseFee()));
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolReplacementRule.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolReplacementRule.java
index 527b4f14cbb..abf42b38b6c 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolReplacementRule.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolReplacementRule.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.eth.transactions;
 
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionInfo;
+import org.hyperledger.besu.datatypes.Wei;
 
 import java.util.Optional;
 
@@ -22,7 +22,11 @@
 public interface TransactionPoolReplacementRule {
 
   boolean shouldReplace(
-      TransactionInfo existingTransactionInfo,
-      TransactionInfo newTransactionInfo,
-      Optional<Long> baseFee);
+      PendingTransaction existingPendingTransaction,
+      PendingTransaction newPendingTransaction,
+      Optional<Wei> baseFee);
+
+  default boolean isNotGasPriced(final PendingTransaction tInfo) {
+    return tInfo.getTransaction().getType().supports1559FeeMarket();
+  }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionReplacementByFeeMarketRule.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionReplacementByFeeMarketRule.java
new file mode 100644
index 00000000000..e89cc4600cd
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionReplacementByFeeMarketRule.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.feemarket.TransactionPriceCalculator;
+import org.hyperledger.besu.util.number.Percentage;
+
+import java.util.Optional;
+
+public class TransactionReplacementByFeeMarketRule implements TransactionPoolReplacementRule {
+
+  private static final TransactionPriceCalculator FRONTIER_CALCULATOR =
+      TransactionPriceCalculator.frontier();
+  private static final TransactionPriceCalculator EIP1559_CALCULATOR =
+      TransactionPriceCalculator.eip1559();
+  private final Percentage priceBump;
+
+  public TransactionReplacementByFeeMarketRule(final Percentage priceBump) {
+    this.priceBump = priceBump;
+  }
+
+  @Override
+  public boolean shouldReplace(
+      final PendingTransaction existingPendingTransaction,
+      final PendingTransaction newPendingTransaction,
+      final Optional<Wei> maybeBaseFee) {
+
+    // bail early if basefee is absent or neither transaction supports 1559 fee market
+    if (maybeBaseFee.isEmpty()
+        || !(isNotGasPriced(existingPendingTransaction) || isNotGasPriced(newPendingTransaction))) {
+      return false;
+    }
+
+    Wei newEffPrice = priceOf(newPendingTransaction.getTransaction(), maybeBaseFee);
+    Wei newEffPriority =
+        newPendingTransaction.getTransaction().getEffectivePriorityFeePerGas(maybeBaseFee);
+
+    // bail early if price is not strictly positive
+    if (newEffPrice.equals(Wei.ZERO)) {
+      return false;
+    }
+
+    Wei curEffPrice = priceOf(existingPendingTransaction.getTransaction(), maybeBaseFee);
+    Wei curEffPriority =
+        existingPendingTransaction.getTransaction().getEffectivePriorityFeePerGas(maybeBaseFee);
+
+    if (isBumpedBy(curEffPrice, newEffPrice, priceBump)) {
+      // if effective price is bumped by percent:
+      // replace if new effective priority is >= current effective priority
+      return newEffPriority.compareTo(curEffPriority) >= 0;
+    } else if (curEffPrice.equals(newEffPrice)) {
+      // elsif new effective price is equal to current effective price:
+      // replace if the new effective priority is bumped by priceBump relative to current priority
+      return isBumpedBy(curEffPriority, newEffPriority, priceBump);
+    }
+    return false;
+  }
+
+  private Wei priceOf(final Transaction transaction, final Optional<Wei> maybeBaseFee) {
+    final TransactionPriceCalculator transactionPriceCalculator =
+        transaction.getType().supports1559FeeMarket() ? EIP1559_CALCULATOR : FRONTIER_CALCULATOR;
+    return transactionPriceCalculator.price(transaction, maybeBaseFee);
+  }
+
+  private boolean isBumpedBy(final Wei val, final Wei bumpVal, final Percentage percent) {
+    return val.multiply(percent.getValue() + 100L).compareTo(bumpVal.multiply(100L)) < 0;
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionReplacementByGasPriceRule.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionReplacementByGasPriceRule.java
new file mode 100644
index 00000000000..541980aefcf
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionReplacementByGasPriceRule.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.util.number.Percentage;
+
+import java.util.Optional;
+
+public class TransactionReplacementByGasPriceRule implements TransactionPoolReplacementRule {
+  private final Percentage priceBump;
+
+  public TransactionReplacementByGasPriceRule(final Percentage priceBump) {
+    this.priceBump = priceBump;
+  }
+
+  @Override
+  public boolean shouldReplace(
+      final PendingTransaction existingPendingTransaction,
+      final PendingTransaction newPendingTransaction,
+      final Optional<Wei> baseFee) {
+    assert existingPendingTransaction.getTransaction() != null
+        && newPendingTransaction.getTransaction() != null;
+
+    // return false if either transaction supports 1559 fee market
+    if (isNotGasPriced(existingPendingTransaction) || isNotGasPriced(newPendingTransaction)) {
+      return false;
+    }
+
+    final Wei replacementThreshold =
+        existingPendingTransaction.getGasPrice().multiply(100 + priceBump.getValue()).divide(100);
+    return newPendingTransaction.getGasPrice().compareTo(replacementThreshold) > 0;
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionReplacementByPriceRule.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionReplacementByPriceRule.java
deleted file mode 100644
index 56eaaf7d57d..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionReplacementByPriceRule.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.transactions;
-
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.fees.TransactionPriceCalculator;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionInfo;
-import org.hyperledger.besu.plugin.data.TransactionType;
-import org.hyperledger.besu.util.number.Percentage;
-
-import java.util.Optional;
-
-public class TransactionReplacementByPriceRule implements TransactionPoolReplacementRule {
-  private static final TransactionPriceCalculator FRONTIER_CALCULATOR =
-      TransactionPriceCalculator.frontier();
-  private static final TransactionPriceCalculator EIP1559_CALCULATOR =
-      TransactionPriceCalculator.eip1559();
-  private final Percentage priceBump;
-
-  public TransactionReplacementByPriceRule(final Percentage priceBump) {
-    this.priceBump = priceBump;
-  }
-
-  @Override
-  public boolean shouldReplace(
-      final TransactionInfo existingTransactionInfo,
-      final TransactionInfo newTransactionInfo,
-      final Optional<Long> baseFee) {
-    assert existingTransactionInfo.getTransaction() != null
-        && newTransactionInfo.getTransaction() != null;
-    final Wei replacementThreshold =
-        priceOf(existingTransactionInfo.getTransaction(), baseFee)
-            .multiply(100 + priceBump.getValue())
-            .divide(100);
-    return priceOf(newTransactionInfo.getTransaction(), baseFee).compareTo(replacementThreshold)
-        > 0;
-  }
-
-  private Wei priceOf(final Transaction transaction, final Optional<Long> baseFee) {
-    final TransactionPriceCalculator transactionPriceCalculator =
-        transaction.getType().equals(TransactionType.EIP1559)
-            ? EIP1559_CALCULATOR
-            : FRONTIER_CALCULATOR;
-    return transactionPriceCalculator.price(transaction, baseFee);
-  }
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionSender.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionSender.java
deleted file mode 100644
index 84be2ef231e..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionSender.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.transactions;
-
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.eth.manager.EthContext;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool.TransactionBatchAddedListener;
-
-class TransactionSender implements TransactionBatchAddedListener {
-
-  private final PeerTransactionTracker transactionTracker;
-  private final TransactionsMessageSender transactionsMessageSender;
-  private final EthContext ethContext;
-
-  public TransactionSender(
-      final PeerTransactionTracker transactionTracker,
-      final TransactionsMessageSender transactionsMessageSender,
-      final EthContext ethContext) {
-    this.transactionTracker = transactionTracker;
-    this.transactionsMessageSender = transactionsMessageSender;
-    this.ethContext = ethContext;
-  }
-
-  @Override
-  public void onTransactionsAdded(final Iterable<Transaction> transactions) {
-    ethContext
-        .getEthPeers()
-        .streamAvailablePeers()
-        .forEach(
-            peer ->
-                transactions.forEach(
-                    transaction -> transactionTracker.addToPeerSendQueue(peer, transaction)));
-    ethContext
-        .getScheduler()
-        .scheduleSyncWorkerTask(transactionsMessageSender::sendTransactionsToPeers);
-  }
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsForSenderInfo.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsForSenderInfo.java
deleted file mode 100644
index 0d0c0378cd3..00000000000
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsForSenderInfo.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.hyperledger.besu.ethereum.eth.transactions;
-
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionInfo;
-
-import java.util.Iterator;
-import java.util.NavigableMap;
-import java.util.OptionalLong;
-import java.util.PriorityQueue;
-import java.util.Queue;
-import java.util.TreeMap;
-import java.util.stream.LongStream;
-
-class TransactionsForSenderInfo {
-  private final NavigableMap<Long, PendingTransactions.TransactionInfo> transactionsInfos;
-  private final Queue<Long> gaps = new PriorityQueue<>();
-
-  TransactionsForSenderInfo() {
-    transactionsInfos = new TreeMap<>();
-  }
-
-  void addTransactionToTrack(
-      final long nonce, final PendingTransactions.TransactionInfo transactionInfo) {
-    synchronized (transactionsInfos) {
-      if (!transactionsInfos.isEmpty()) {
-        final long highestNonce = transactionsInfos.lastKey();
-        if (nonce > (highestNonce + 1)) {
-          LongStream.range(highestNonce + 1, nonce).forEach(gaps::add);
-        }
-      }
-      transactionsInfos.put(nonce, transactionInfo);
-    }
-  }
-
-  void updateGaps() {
-    synchronized (transactionsInfos) {
-      final Iterator<Long> nonceIterator = transactionsInfos.keySet().iterator();
-      long previousNonce = -1;
-      while (nonceIterator.hasNext()) {
-        final long currentNonce = nonceIterator.next();
-        LongStream.range(previousNonce + 1, currentNonce).forEach(gaps::add);
-        previousNonce = currentNonce;
-      }
-    }
-  }
-
-  NavigableMap<Long, TransactionInfo> getTransactionsInfos() {
-    return transactionsInfos;
-  }
-
-  OptionalLong maybeNextGap() {
-    synchronized (transactionsInfos) {
-      return gaps.isEmpty() ? OptionalLong.empty() : OptionalLong.of(gaps.poll());
-    }
-  }
-}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageHandler.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageHandler.java
index 372778fc2c2..3160d1a9c58 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageHandler.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageHandler.java
@@ -23,12 +23,14 @@
 
 import java.time.Duration;
 import java.time.Instant;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 class TransactionsMessageHandler implements EthMessages.MessageCallback {
 
   private final TransactionsMessageProcessor transactionsMessageProcessor;
   private final EthScheduler scheduler;
   private final Duration txMsgKeepAlive;
+  private final AtomicBoolean isEnabled = new AtomicBoolean(false);
 
   public TransactionsMessageHandler(
       final EthScheduler scheduler,
@@ -43,9 +45,23 @@ public TransactionsMessageHandler(
   public void exec(final EthMessage message) {
     final TransactionsMessage transactionsMessage = TransactionsMessage.readFrom(message.getData());
     final Instant startedAt = now();
-    scheduler.scheduleTxWorkerTask(
-        () ->
-            transactionsMessageProcessor.processTransactionsMessage(
-                message.getPeer(), transactionsMessage, startedAt, txMsgKeepAlive));
+    if (isEnabled.get()) {
+      scheduler.scheduleTxWorkerTask(
+          () ->
+              transactionsMessageProcessor.processTransactionsMessage(
+                  message.getPeer(), transactionsMessage, startedAt, txMsgKeepAlive));
+    }
+  }
+
+  public void setDisabled() {
+    isEnabled.set(false);
+  }
+
+  public void setEnabled() {
+    isEnabled.set(true);
+  }
+
+  public boolean isEnabled() {
+    return isEnabled.get();
   }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageProcessor.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageProcessor.java
index 5fdb5d40886..aee229990a3 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageProcessor.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageProcessor.java
@@ -15,46 +15,39 @@
 package org.hyperledger.besu.ethereum.eth.transactions;
 
 import static java.time.Instant.now;
-import static org.apache.logging.log4j.LogManager.getLogger;
+import static org.hyperledger.besu.ethereum.core.Transaction.toHashList;
 
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.ethereum.eth.messages.TransactionsMessage;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
 import org.hyperledger.besu.ethereum.rlp.RLPException;
-import org.hyperledger.besu.metrics.RunnableCounter;
-import org.hyperledger.besu.plugin.services.metrics.Counter;
 
 import java.time.Duration;
 import java.time.Instant;
+import java.util.Collection;
 import java.util.List;
-import java.util.Set;
+import java.util.stream.Collectors;
 
-import com.google.common.collect.Sets;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class TransactionsMessageProcessor {
-
-  private static final int SKIPPED_MESSAGES_LOGGING_THRESHOLD = 1000;
-  private static final Logger LOG = getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(TransactionsMessageProcessor.class);
+  static final String METRIC_LABEL = "transactions";
   private final PeerTransactionTracker transactionTracker;
   private final TransactionPool transactionPool;
-  private final Counter totalSkippedTransactionsMessageCounter;
+
+  private final TransactionPoolMetrics metrics;
 
   public TransactionsMessageProcessor(
       final PeerTransactionTracker transactionTracker,
       final TransactionPool transactionPool,
-      final Counter metricsCounter) {
+      final TransactionPoolMetrics metrics) {
     this.transactionTracker = transactionTracker;
     this.transactionPool = transactionPool;
-    this.totalSkippedTransactionsMessageCounter =
-        new RunnableCounter(
-            metricsCounter,
-            () ->
-                LOG.warn(
-                    "{} expired transaction messages have been skipped.",
-                    SKIPPED_MESSAGES_LOGGING_THRESHOLD),
-            SKIPPED_MESSAGES_LOGGING_THRESHOLD);
+    this.metrics = metrics;
+    metrics.initExpiredMessagesCounter(METRIC_LABEL);
   }
 
   void processTransactionsMessage(
@@ -62,28 +55,51 @@ void processTransactionsMessage(
       final TransactionsMessage transactionsMessage,
       final Instant startedAt,
       final Duration keepAlive) {
-    // Check if message not expired.
+    // Check if message is not expired.
     if (startedAt.plus(keepAlive).isAfter(now())) {
       this.processTransactionsMessage(peer, transactionsMessage);
     } else {
-      totalSkippedTransactionsMessageCounter.inc();
+      metrics.incrementExpiredMessages(METRIC_LABEL);
     }
   }
 
   private void processTransactionsMessage(
       final EthPeer peer, final TransactionsMessage transactionsMessage) {
     try {
-      LOG.trace("Received transactions message from {}", peer);
+      final List<Transaction> incomingTransactions = transactionsMessage.transactions();
+      final Collection<Transaction> freshTransactions = skipSeenTransactions(incomingTransactions);
+
+      transactionTracker.markTransactionsAsSeen(peer, incomingTransactions);
+
+      metrics.incrementAlreadySeenTransactions(
+          METRIC_LABEL, incomingTransactions.size() - freshTransactions.size());
+      LOG.atTrace()
+          .setMessage(
+              "Received transactions message from {}, incoming transactions {}, incoming list {}"
+                  + ", fresh transactions {}, fresh list {}")
+          .addArgument(peer)
+          .addArgument(incomingTransactions::size)
+          .addArgument(() -> toHashList(incomingTransactions))
+          .addArgument(freshTransactions::size)
+          .addArgument(() -> toHashList(freshTransactions))
+          .log();
+
+      transactionPool.addRemoteTransactions(freshTransactions);
 
-      final List<Transaction> readTransactions = transactionsMessage.transactions();
-      final Set<Transaction> transactions = Sets.newHashSet(readTransactions);
-      transactionTracker.markTransactionsAsSeen(peer, transactions);
-      transactionPool.addRemoteTransactions(transactions);
     } catch (final RLPException ex) {
       if (peer != null) {
-        LOG.debug("Malformed transaction message received, disconnecting: {}", peer, ex);
+        LOG.debug(
+            "Malformed transaction message received (BREACH_OF_PROTOCOL), disconnecting: {}",
+            peer,
+            ex);
         peer.disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
       }
     }
   }
+
+  private Collection<Transaction> skipSeenTransactions(final List<Transaction> inTransactions) {
+    return inTransactions.stream()
+        .filter(tx -> !transactionTracker.hasSeenTransaction(tx.getHash()))
+        .collect(Collectors.toUnmodifiableList());
+  }
 }
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageSender.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageSender.java
index a0e6eacc41a..eb0eb538e4b 100644
--- a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageSender.java
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageSender.java
@@ -14,6 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.eth.transactions;
 
+import static org.hyperledger.besu.ethereum.core.Transaction.toHashList;
+
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.ethereum.eth.messages.LimitedTransactionsMessages;
@@ -22,11 +24,11 @@
 import java.util.Set;
 import java.util.stream.StreamSupport;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class TransactionsMessageSender {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(TransactionsMessageSender.class);
 
   private final PeerTransactionTracker transactionTracker;
 
@@ -40,12 +42,22 @@ public void sendTransactionsToPeers() {
         .forEach(this::sendTransactionsToPeer);
   }
 
-  private void sendTransactionsToPeer(final EthPeer peer) {
+  void sendTransactionsToPeer(final EthPeer peer) {
     final Set<Transaction> allTxToSend = transactionTracker.claimTransactionsToSendToPeer(peer);
     while (!allTxToSend.isEmpty()) {
       final LimitedTransactionsMessages limitedTransactionsMessages =
           LimitedTransactionsMessages.createLimited(allTxToSend);
-      LOG.trace("Sending transactions to peer {} TRANSACTIONS count {}", peer, allTxToSend.size());
+      final Set<Transaction> includedTransactions =
+          limitedTransactionsMessages.getIncludedTransactions();
+      LOG.atTrace()
+          .setMessage(
+              "Sending transactions to peer {} all transactions count {}, "
+                  + "single message transactions {}, single message list {}")
+          .addArgument(peer)
+          .addArgument(allTxToSend::size)
+          .addArgument(includedTransactions::size)
+          .addArgument(() -> toHashList(includedTransactions))
+          .log();
       allTxToSend.removeAll(limitedTransactionsMessages.getIncludedTransactions());
       try {
         peer.send(limitedTransactionsMessages.getTransactionsMessage());
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/AbstractPrioritizedTransactions.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/AbstractPrioritizedTransactions.java
new file mode 100644
index 00000000000..3d47ad6efd8
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/AbstractPrioritizedTransactions.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.layered;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
+
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.function.BiFunction;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+public abstract class AbstractPrioritizedTransactions extends AbstractSequentialTransactionsLayer {
+  protected final TreeSet<PendingTransaction> orderByFee;
+
+  public AbstractPrioritizedTransactions(
+      final TransactionPoolConfiguration poolConfig,
+      final TransactionsLayer prioritizedTransactions,
+      final TransactionPoolMetrics metrics,
+      final BiFunction<PendingTransaction, PendingTransaction, Boolean>
+          transactionReplacementTester) {
+    super(poolConfig, prioritizedTransactions, transactionReplacementTester, metrics);
+    this.orderByFee = new TreeSet<>(this::compareByFee);
+  }
+
+  @Override
+  public void reset() {
+    super.reset();
+    orderByFee.clear();
+  }
+
+  @Override
+  public String name() {
+    return "prioritized";
+  }
+
+  @Override
+  protected TransactionAddedResult canAdd(
+      final PendingTransaction pendingTransaction, final int gap) {
+    final var senderTxs = txsBySender.get(pendingTransaction.getSender());
+
+    if (hasExpectedNonce(senderTxs, pendingTransaction, gap) && hasPriority(pendingTransaction)) {
+
+      return TransactionAddedResult.ADDED;
+    }
+
+    return TransactionAddedResult.TRY_NEXT_LAYER;
+  }
+
+  @Override
+  protected void internalAdd(
+      final NavigableMap<Long, PendingTransaction> senderTxs, final PendingTransaction addedTx) {
+    orderByFee.add(addedTx);
+  }
+
+  @Override
+  protected void internalReplaced(final PendingTransaction replacedTx) {
+    orderByFee.remove(replacedTx);
+  }
+
+  private boolean hasPriority(final PendingTransaction pendingTransaction) {
+    if (orderByFee.size() < poolConfig.getMaxPrioritizedTransactions()) {
+      return true;
+    }
+    return compareByFee(pendingTransaction, orderByFee.first()) > 0;
+  }
+
+  @Override
+  protected int maxTransactionsNumber() {
+    return poolConfig.getMaxPrioritizedTransactions();
+  }
+
+  @Override
+  protected PendingTransaction getEvictable() {
+    return orderByFee.first();
+  }
+
+  protected abstract int compareByFee(final PendingTransaction pt1, final PendingTransaction pt2);
+
+  @Override
+  protected void internalRemove(
+      final NavigableMap<Long, PendingTransaction> senderTxs,
+      final PendingTransaction removedTx,
+      final RemovalReason removalReason) {
+    orderByFee.remove(removedTx);
+  }
+
+  @Override
+  public PendingTransaction promote(final Predicate<PendingTransaction> promotionFilter) {
+    return null;
+  }
+
+  @Override
+  public Stream<PendingTransaction> stream() {
+    return orderByFee.descendingSet().stream();
+  }
+
+  @Override
+  protected long cacheFreeSpace() {
+    return Integer.MAX_VALUE;
+  }
+
+  @Override
+  protected void internalConsistencyCheck(
+      final Map<Address, TreeMap<Long, PendingTransaction>> prevLayerTxsBySender) {
+    super.internalConsistencyCheck(prevLayerTxsBySender);
+
+    final var controlOrderByFee = new TreeSet<>(this::compareByFee);
+    controlOrderByFee.addAll(pendingTransactions.values());
+
+    final var itControl = controlOrderByFee.iterator();
+    final var itCurrent = orderByFee.iterator();
+
+    while (itControl.hasNext()) {
+      assert itControl.next().equals(itCurrent.next())
+          : "orderByFee does not match pendingTransactions";
+    }
+
+    assert itCurrent.hasNext() == false : "orderByFee has more elements that pendingTransactions";
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/AbstractSequentialTransactionsLayer.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/AbstractSequentialTransactionsLayer.java
new file mode 100644
index 00000000000..7b1915020b0
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/AbstractSequentialTransactionsLayer.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.layered;
+
+import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.EVICTED;
+import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.FOLLOW_INVALIDATED;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
+
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.OptionalLong;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.function.BiFunction;
+
+public abstract class AbstractSequentialTransactionsLayer extends AbstractTransactionsLayer {
+
+  public AbstractSequentialTransactionsLayer(
+      final TransactionPoolConfiguration poolConfig,
+      final TransactionsLayer nextLayer,
+      final BiFunction<PendingTransaction, PendingTransaction, Boolean>
+          transactionReplacementTester,
+      final TransactionPoolMetrics metrics) {
+    super(poolConfig, nextLayer, transactionReplacementTester, metrics);
+  }
+
+  @Override
+  public void remove(final PendingTransaction invalidatedTx, final RemovalReason reason) {
+    nextLayer.remove(invalidatedTx, reason);
+
+    final var senderTxs = txsBySender.get(invalidatedTx.getSender());
+    final long invalidNonce = invalidatedTx.getNonce();
+    if (senderTxs != null && invalidNonce <= senderTxs.lastKey()) {
+      // on sequential layers we need to push to next layer all the txs following the invalid one,
+      // even if it belongs to a previous layer
+
+      if (senderTxs.remove(invalidNonce) != null) {
+        // invalid tx removed in this layer
+        processRemove(senderTxs, invalidatedTx.getTransaction(), reason);
+      }
+
+      // push following to next layer
+      pushDown(senderTxs, invalidNonce, 1);
+
+      if (senderTxs.isEmpty()) {
+        txsBySender.remove(invalidatedTx.getSender());
+      }
+    }
+  }
+
+  private void pushDown(
+      final NavigableMap<Long, PendingTransaction> senderTxs,
+      final long afterNonce,
+      final int gap) {
+    senderTxs.tailMap(afterNonce, false).values().stream().toList().stream()
+        .peek(
+            txToRemove -> {
+              senderTxs.remove(txToRemove.getNonce());
+              processRemove(senderTxs, txToRemove.getTransaction(), FOLLOW_INVALIDATED);
+            })
+        .forEach(followingTx -> nextLayer.add(followingTx, gap));
+  }
+
+  @Override
+  protected boolean gapsAllowed() {
+    return false;
+  }
+
+  @Override
+  protected void internalConfirmed(
+      final NavigableMap<Long, PendingTransaction> senderTxs,
+      final Address sender,
+      final long maxConfirmedNonce,
+      final PendingTransaction highestNonceRemovedTx) {
+    // no -op
+  }
+
+  @Override
+  protected void internalEvict(
+      final NavigableMap<Long, PendingTransaction> senderTxs, final PendingTransaction evictedTx) {
+    internalRemove(senderTxs, evictedTx, EVICTED);
+  }
+
+  @Override
+  public OptionalLong getNextNonceFor(final Address sender) {
+    final OptionalLong nextLayerRes = nextLayer.getNextNonceFor(sender);
+    if (nextLayerRes.isEmpty()) {
+      final var senderTxs = txsBySender.get(sender);
+      if (senderTxs != null) {
+        return OptionalLong.of(senderTxs.lastKey() + 1);
+      }
+    }
+    return nextLayerRes;
+  }
+
+  @Override
+  public OptionalLong getCurrentNonceFor(final Address sender) {
+    final var senderTxs = txsBySender.get(sender);
+    if (senderTxs != null) {
+      return OptionalLong.of(senderTxs.firstKey());
+    }
+    return nextLayer.getCurrentNonceFor(sender);
+  }
+
+  @Override
+  protected void internalNotifyAdded(
+      final NavigableMap<Long, PendingTransaction> senderTxs,
+      final PendingTransaction pendingTransaction) {
+    // no-op
+  }
+
+  protected boolean hasExpectedNonce(
+      final NavigableMap<Long, PendingTransaction> senderTxs,
+      final PendingTransaction pendingTransaction,
+      final long gap) {
+    if (senderTxs == null) {
+      return gap == 0;
+    }
+
+    // true if prepend or append
+    return (senderTxs.lastKey() + 1) == pendingTransaction.getNonce()
+        || (senderTxs.firstKey() - 1) == pendingTransaction.getNonce();
+  }
+
+  @Override
+  protected void internalConsistencyCheck(
+      final Map<Address, TreeMap<Long, PendingTransaction>> prevLayerTxsBySender) {
+    txsBySender.values().stream()
+        .filter(senderTxs -> senderTxs.size() > 1)
+        .map(NavigableMap::entrySet)
+        .map(Set::iterator)
+        .forEach(
+            itNonce -> {
+              PendingTransaction firstTx = itNonce.next().getValue();
+
+              prevLayerTxsBySender.computeIfPresent(
+                  firstTx.getSender(),
+                  (sender, txsByNonce) -> {
+                    assert txsByNonce.lastKey() + 1 == firstTx.getNonce()
+                        : "first nonce is not sequential with previous layer last nonce";
+                    return txsByNonce;
+                  });
+
+              long prevNonce = firstTx.getNonce();
+
+              while (itNonce.hasNext()) {
+                final long currNonce = itNonce.next().getKey();
+                assert prevNonce + 1 == currNonce : "non sequential nonce";
+                prevNonce = currNonce;
+              }
+            });
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/AbstractTransactionsLayer.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/AbstractTransactionsLayer.java
new file mode 100644
index 00000000000..b7fea830a7b
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/AbstractTransactionsLayer.java
@@ -0,0 +1,592 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.layered;
+
+import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.ADDED;
+import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.ALREADY_KNOWN;
+import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.REJECTED_UNDERPRICED_REPLACEMENT;
+import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.TRY_NEXT_LAYER;
+import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.CONFIRMED;
+import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.CROSS_LAYER_REPLACED;
+import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.EVICTED;
+import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.PROMOTED;
+import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.REPLACED;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactionAddedListener;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactionDroppedListener;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.util.Subscribers;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.TreeMap;
+import java.util.function.BiFunction;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public abstract class AbstractTransactionsLayer implements TransactionsLayer {
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractTransactionsLayer.class);
+  private static final NavigableMap<Long, PendingTransaction> EMPTY_SENDER_TXS = new TreeMap<>();
+  protected final TransactionPoolConfiguration poolConfig;
+  protected final TransactionsLayer nextLayer;
+  protected final BiFunction<PendingTransaction, PendingTransaction, Boolean>
+      transactionReplacementTester;
+  protected final TransactionPoolMetrics metrics;
+  protected final Map<Hash, PendingTransaction> pendingTransactions = new HashMap<>();
+  protected final Map<Address, NavigableMap<Long, PendingTransaction>> txsBySender =
+      new HashMap<>();
+  private final Subscribers<PendingTransactionAddedListener> onAddedListeners =
+      Subscribers.create();
+  private final Subscribers<PendingTransactionDroppedListener> onDroppedListeners =
+      Subscribers.create();
+  private OptionalLong nextLayerOnAddedListenerId = OptionalLong.empty();
+  private OptionalLong nextLayerOnDroppedListenerId = OptionalLong.empty();
+  protected long spaceUsed = 0;
+
+  public AbstractTransactionsLayer(
+      final TransactionPoolConfiguration poolConfig,
+      final TransactionsLayer nextLayer,
+      final BiFunction<PendingTransaction, PendingTransaction, Boolean>
+          transactionReplacementTester,
+      final TransactionPoolMetrics metrics) {
+    this.poolConfig = poolConfig;
+    this.nextLayer = nextLayer;
+    this.transactionReplacementTester = transactionReplacementTester;
+    this.metrics = metrics;
+    metrics.initSpaceUsed(this::getLayerSpaceUsed, name());
+    metrics.initTransactionCount(pendingTransactions::size, name());
+    metrics.initUniqueSenderCount(txsBySender::size, name());
+  }
+
+  protected abstract boolean gapsAllowed();
+
+  @Override
+  public void reset() {
+    pendingTransactions.clear();
+    txsBySender.clear();
+    spaceUsed = 0;
+    nextLayer.reset();
+  }
+
+  @Override
+  public Optional<Transaction> getByHash(final Hash transactionHash) {
+    final var currLayerTx = pendingTransactions.get(transactionHash);
+    if (currLayerTx == null) {
+      return nextLayer.getByHash(transactionHash);
+    }
+    return Optional.of(currLayerTx.getTransaction());
+  }
+
+  @Override
+  public boolean contains(final Transaction transaction) {
+    return pendingTransactions.containsKey(transaction.getHash())
+        || nextLayer.contains(transaction);
+  }
+
+  @Override
+  public List<PendingTransaction> getAll() {
+    final List<PendingTransaction> allNextLayers = nextLayer.getAll();
+    final List<PendingTransaction> allTxs =
+        new ArrayList<>(pendingTransactions.size() + allNextLayers.size());
+    allTxs.addAll(pendingTransactions.values());
+    allTxs.addAll(allNextLayers);
+    return allTxs;
+  }
+
+  @Override
+  public long getCumulativeUsedSpace() {
+    return getLayerSpaceUsed() + nextLayer.getCumulativeUsedSpace();
+  }
+
+  protected long getLayerSpaceUsed() {
+    return spaceUsed;
+  }
+
+  protected abstract TransactionAddedResult canAdd(
+      final PendingTransaction pendingTransaction, final int gap);
+
+  @Override
+  public TransactionAddedResult add(final PendingTransaction pendingTransaction, final int gap) {
+
+    // is replacing an existing one?
+    TransactionAddedResult addStatus = maybeReplaceTransaction(pendingTransaction);
+    if (addStatus == null) {
+      addStatus = canAdd(pendingTransaction, gap);
+    }
+
+    if (addStatus.equals(TRY_NEXT_LAYER)) {
+      return addToNextLayer(pendingTransaction, gap);
+    }
+
+    if (addStatus.isSuccess()) {
+      processAdded(pendingTransaction);
+      addStatus.maybeReplacedTransaction().ifPresent(this::replaced);
+
+      nextLayer.notifyAdded(pendingTransaction);
+
+      if (!maybeFull()) {
+        // if there is space try to see if the added tx filled some gaps
+        tryFillGap(addStatus, pendingTransaction);
+      }
+
+      notifyTransactionAdded(pendingTransaction);
+    } else {
+      final var rejectReason = addStatus.maybeInvalidReason().orElseThrow();
+      metrics.incrementRejected(false, rejectReason, name());
+      LOG.atTrace()
+          .setMessage("Transaction {} rejected reason {}")
+          .addArgument(pendingTransaction::toTraceLog)
+          .addArgument(rejectReason)
+          .log();
+    }
+
+    return addStatus;
+  }
+
+  private boolean maybeFull() {
+    final long cacheFreeSpace = cacheFreeSpace();
+    final int overflowTxsCount = pendingTransactions.size() - maxTransactionsNumber();
+    if (cacheFreeSpace < 0 || overflowTxsCount > 0) {
+      LOG.atDebug()
+          .setMessage("Layer full: {}")
+          .addArgument(
+              () ->
+                  cacheFreeSpace < 0
+                      ? "need to free " + (-cacheFreeSpace) + " space"
+                      : "need to evict " + overflowTxsCount + " transaction(s)")
+          .log();
+
+      evict(-cacheFreeSpace, overflowTxsCount);
+      return true;
+    }
+    return false;
+  }
+
+  private void tryFillGap(
+      final TransactionAddedResult addStatus, final PendingTransaction pendingTransaction) {
+    // it makes sense to fill gaps only if the add is not a replacement and this layer does not
+    // allow gaps
+    if (!addStatus.isReplacement() && !gapsAllowed()) {
+      final PendingTransaction promotedTx =
+          nextLayer.promoteFor(pendingTransaction.getSender(), pendingTransaction.getNonce());
+      if (promotedTx != null) {
+        processAdded(promotedTx);
+        if (!maybeFull()) {
+          tryFillGap(ADDED, promotedTx);
+        }
+      }
+    }
+  }
+
+  @Override
+  public void notifyAdded(final PendingTransaction pendingTransaction) {
+    final Address sender = pendingTransaction.getSender();
+    final var senderTxs = txsBySender.get(sender);
+    if (senderTxs != null) {
+      if (senderTxs.firstKey() < pendingTransaction.getNonce()) {
+        // in the case the world state has been updated but the confirmed txs have not yet been
+        // processed
+        confirmed(sender, pendingTransaction.getNonce());
+      } else if (senderTxs.firstKey() == pendingTransaction.getNonce()) {
+        // it is a cross layer replacement, namely added to a previous layer
+        final PendingTransaction replacedTx = senderTxs.pollFirstEntry().getValue();
+        processRemove(senderTxs, replacedTx.getTransaction(), CROSS_LAYER_REPLACED);
+
+        if (senderTxs.isEmpty()) {
+          txsBySender.remove(sender);
+        }
+      } else {
+        internalNotifyAdded(senderTxs, pendingTransaction);
+      }
+    }
+    nextLayer.notifyAdded(pendingTransaction);
+  }
+
+  protected abstract void internalNotifyAdded(
+      final NavigableMap<Long, PendingTransaction> senderTxs,
+      final PendingTransaction pendingTransaction);
+
+  @Override
+  public PendingTransaction promoteFor(final Address sender, final long nonce) {
+    final var senderTxs = txsBySender.get(sender);
+    if (senderTxs != null) {
+      long expectedNonce = nonce + 1;
+      if (senderTxs.firstKey() == expectedNonce) {
+        final PendingTransaction promotedTx = senderTxs.pollFirstEntry().getValue();
+        processRemove(senderTxs, promotedTx.getTransaction(), PROMOTED);
+        metrics.incrementRemoved(promotedTx.isReceivedFromLocalSource(), "promoted", name());
+
+        if (senderTxs.isEmpty()) {
+          txsBySender.remove(sender);
+        }
+        return promotedTx;
+      }
+    }
+    return nextLayer.promoteFor(sender, nonce);
+  }
+
+  private TransactionAddedResult addToNextLayer(
+      final PendingTransaction pendingTransaction, final int distance) {
+    return addToNextLayer(
+        txsBySender.getOrDefault(pendingTransaction.getSender(), EMPTY_SENDER_TXS),
+        pendingTransaction,
+        distance);
+  }
+
+  private TransactionAddedResult addToNextLayer(
+      final NavigableMap<Long, PendingTransaction> senderTxs,
+      final PendingTransaction pendingTransaction,
+      final int distance) {
+    final int nextLayerDistance;
+    if (senderTxs.isEmpty()) {
+      nextLayerDistance = distance;
+    } else {
+      nextLayerDistance = (int) (pendingTransaction.getNonce() - (senderTxs.lastKey() + 1));
+    }
+    return nextLayer.add(pendingTransaction, nextLayerDistance);
+  }
+
+  private void processAdded(final PendingTransaction addedTx) {
+    pendingTransactions.put(addedTx.getHash(), addedTx);
+    final var senderTxs = txsBySender.computeIfAbsent(addedTx.getSender(), s -> new TreeMap<>());
+    senderTxs.put(addedTx.getNonce(), addedTx);
+    increaseSpaceUsed(addedTx);
+    metrics.incrementAdded(addedTx.isReceivedFromLocalSource(), name());
+    internalAdd(senderTxs, addedTx);
+  }
+
+  protected abstract void internalAdd(
+      final NavigableMap<Long, PendingTransaction> senderTxs, final PendingTransaction addedTx);
+
+  protected abstract int maxTransactionsNumber();
+
+  private void evict(final long spaceToFree, final int txsToEvict) {
+    final var evictableTx = getEvictable();
+    if (evictableTx != null) {
+      final var lessReadySender = evictableTx.getSender();
+      final var lessReadySenderTxs = txsBySender.get(lessReadySender);
+
+      long evictedSize = 0;
+      int evictedCount = 0;
+      PendingTransaction lastTx;
+      // lastTx must never be null, because the sender have at least the lessReadyTx
+      while ((evictedSize < spaceToFree || txsToEvict > evictedCount)
+          && !lessReadySenderTxs.isEmpty()) {
+        lastTx = lessReadySenderTxs.pollLastEntry().getValue();
+        processEvict(lessReadySenderTxs, lastTx);
+        ++evictedCount;
+        evictedSize += lastTx.memorySize();
+        // evicted can always be added to the next layer
+        addToNextLayer(lessReadySenderTxs, lastTx, 0);
+      }
+
+      if (lessReadySenderTxs.isEmpty()) {
+        txsBySender.remove(lessReadySender);
+      }
+
+      final long newSpaceToFree = spaceToFree - evictedSize;
+      final int newTxsToEvict = txsToEvict - evictedCount;
+
+      if ((newSpaceToFree > 0 || newTxsToEvict > 0) && !txsBySender.isEmpty()) {
+        // try next less valuable sender
+        evict(newSpaceToFree, newTxsToEvict);
+      }
+    }
+  }
+
+  protected void replaced(final PendingTransaction replacedTx) {
+    pendingTransactions.remove(replacedTx.getHash());
+    decreaseSpaceUsed(replacedTx);
+    metrics.incrementRemoved(replacedTx.isReceivedFromLocalSource(), REPLACED.label(), name());
+    internalReplaced(replacedTx);
+  }
+
+  protected abstract void internalReplaced(final PendingTransaction replacedTx);
+
+  private TransactionAddedResult maybeReplaceTransaction(final PendingTransaction incomingTx) {
+
+    final var existingTxs = txsBySender.get(incomingTx.getSender());
+
+    if (existingTxs != null) {
+      final var existingReadyTx = existingTxs.get(incomingTx.getNonce());
+      if (existingReadyTx != null) {
+
+        if (existingReadyTx.getHash().equals(incomingTx.getHash())) {
+          return ALREADY_KNOWN;
+        }
+
+        if (!transactionReplacementTester.apply(existingReadyTx, incomingTx)) {
+          return REJECTED_UNDERPRICED_REPLACEMENT;
+        }
+        return TransactionAddedResult.createForReplacement(existingReadyTx);
+      }
+    }
+    return null;
+  }
+
+  protected PendingTransaction processRemove(
+      final NavigableMap<Long, PendingTransaction> senderTxs,
+      final Transaction transaction,
+      final RemovalReason removalReason) {
+    final PendingTransaction removedTx = pendingTransactions.remove(transaction.getHash());
+    if (removedTx != null) {
+      decreaseSpaceUsed(removedTx);
+      metrics.incrementRemoved(
+          removedTx.isReceivedFromLocalSource(), removalReason.label(), name());
+      internalRemove(senderTxs, removedTx, removalReason);
+    }
+    return removedTx;
+  }
+
+  protected PendingTransaction processEvict(
+      final NavigableMap<Long, PendingTransaction> senderTxs, final PendingTransaction evictedTx) {
+    final PendingTransaction removedTx = pendingTransactions.remove(evictedTx.getHash());
+    if (removedTx != null) {
+      decreaseSpaceUsed(evictedTx);
+      metrics.incrementRemoved(evictedTx.isReceivedFromLocalSource(), EVICTED.label(), name());
+      internalEvict(senderTxs, removedTx);
+    }
+    return removedTx;
+  }
+
+  protected abstract void internalEvict(
+      final NavigableMap<Long, PendingTransaction> lessReadySenderTxs,
+      final PendingTransaction evictedTx);
+
+  @Override
+  public final void blockAdded(
+      final FeeMarket feeMarket,
+      final BlockHeader blockHeader,
+      final Map<Address, Long> maxConfirmedNonceBySender) {
+    LOG.atDebug()
+        .setMessage("Managing new added block {}")
+        .addArgument(blockHeader::toLogString)
+        .log();
+
+    nextLayer.blockAdded(feeMarket, blockHeader, maxConfirmedNonceBySender);
+    maxConfirmedNonceBySender.forEach(this::confirmed);
+    internalBlockAdded(blockHeader, feeMarket);
+  }
+
+  protected abstract void internalBlockAdded(
+      final BlockHeader blockHeader, final FeeMarket feeMarket);
+
+  final void promoteTransactions() {
+    int freeSlots = maxTransactionsNumber() - pendingTransactions.size();
+
+    while (cacheFreeSpace() > 0 && freeSlots > 0) {
+      final var promotedTx = nextLayer.promote(this::promotionFilter);
+      if (promotedTx != null) {
+        processAdded(promotedTx);
+        --freeSlots;
+      } else {
+        break;
+      }
+    }
+  }
+
+  private void confirmed(final Address sender, final long maxConfirmedNonce) {
+    final var senderTxs = txsBySender.get(sender);
+
+    if (senderTxs != null) {
+      final var confirmedTxs = senderTxs.headMap(maxConfirmedNonce, true);
+      final var highestNonceRemovedTx =
+          confirmedTxs.isEmpty() ? null : confirmedTxs.lastEntry().getValue();
+
+      final var itConfirmedTxs = confirmedTxs.values().iterator();
+      while (itConfirmedTxs.hasNext()) {
+        final var confirmedTx = itConfirmedTxs.next();
+        itConfirmedTxs.remove();
+        processRemove(senderTxs, confirmedTx.getTransaction(), CONFIRMED);
+
+        metrics.incrementRemoved(confirmedTx.isReceivedFromLocalSource(), "confirmed", name());
+        LOG.atTrace()
+            .setMessage("Removed confirmed pending transactions {}")
+            .addArgument(confirmedTx::toTraceLog)
+            .log();
+      }
+
+      if (senderTxs.isEmpty()) {
+        txsBySender.remove(sender);
+      } else {
+        internalConfirmed(senderTxs, sender, maxConfirmedNonce, highestNonceRemovedTx);
+      }
+    }
+
+    promoteTransactions();
+  }
+
+  protected abstract void internalConfirmed(
+      final NavigableMap<Long, PendingTransaction> senderTxs,
+      final Address sender,
+      final long maxConfirmedNonce,
+      final PendingTransaction highestNonceRemovedTx);
+
+  protected abstract void internalRemove(
+      final NavigableMap<Long, PendingTransaction> senderTxs,
+      final PendingTransaction pendingTransaction,
+      final RemovalReason removalReason);
+
+  protected abstract PendingTransaction getEvictable();
+
+  protected void increaseSpaceUsed(final PendingTransaction pendingTransaction) {
+    spaceUsed += pendingTransaction.memorySize();
+  }
+
+  protected void decreaseSpaceUsed(final PendingTransaction pendingTransaction) {
+    spaceUsed -= pendingTransaction.memorySize();
+  }
+
+  protected abstract long cacheFreeSpace();
+
+  protected abstract boolean promotionFilter(PendingTransaction pendingTransaction);
+
+  @Override
+  public List<Transaction> getAllLocal() {
+    final var localTxs =
+        pendingTransactions.values().stream()
+            .filter(PendingTransaction::isReceivedFromLocalSource)
+            .map(PendingTransaction::getTransaction)
+            .collect(Collectors.toCollection(ArrayList::new));
+    localTxs.addAll(nextLayer.getAllLocal());
+    return localTxs;
+  }
+
+  Stream<PendingTransaction> stream(final Address sender) {
+    return txsBySender.getOrDefault(sender, EMPTY_SENDER_TXS).values().stream();
+  }
+
+  @Override
+  public List<PendingTransaction> getAllFor(final Address sender) {
+    return Stream.concat(stream(sender), nextLayer.getAllFor(sender).stream()).toList();
+  }
+
+  abstract Stream<PendingTransaction> stream();
+
+  @Override
+  public int count() {
+    return pendingTransactions.size() + nextLayer.count();
+  }
+
+  protected void notifyTransactionAdded(final PendingTransaction pendingTransaction) {
+    onAddedListeners.forEach(
+        listener -> listener.onTransactionAdded(pendingTransaction.getTransaction()));
+  }
+
+  protected void notifyTransactionDropped(final PendingTransaction pendingTransaction) {
+    onDroppedListeners.forEach(
+        listener -> listener.onTransactionDropped(pendingTransaction.getTransaction()));
+  }
+
+  @Override
+  public long subscribeToAdded(final PendingTransactionAddedListener listener) {
+    nextLayerOnAddedListenerId = OptionalLong.of(nextLayer.subscribeToAdded(listener));
+    return onAddedListeners.subscribe(listener);
+  }
+
+  @Override
+  public void unsubscribeFromAdded(final long id) {
+    nextLayerOnAddedListenerId.ifPresent(nextLayer::unsubscribeFromAdded);
+    onAddedListeners.unsubscribe(id);
+  }
+
+  @Override
+  public long subscribeToDropped(final PendingTransactionDroppedListener listener) {
+    nextLayerOnDroppedListenerId = OptionalLong.of(nextLayer.subscribeToDropped(listener));
+    return onDroppedListeners.subscribe(listener);
+  }
+
+  @Override
+  public void unsubscribeFromDropped(final long id) {
+    nextLayerOnDroppedListenerId.ifPresent(nextLayer::unsubscribeFromDropped);
+    onDroppedListeners.unsubscribe(id);
+  }
+
+  @Override
+  public String logStats() {
+    return internalLogStats() + " | " + nextLayer.logStats();
+  }
+
+  @Override
+  public String logSender(final Address sender) {
+    final var senderTxs = txsBySender.get(sender);
+    return name()
+        + "["
+        + (Objects.isNull(senderTxs) ? "Empty" : senderTxs.keySet())
+        + "] "
+        + nextLayer.logSender(sender);
+  }
+
+  protected abstract String internalLogStats();
+
+  boolean consistencyCheck(
+      final Map<Address, TreeMap<Long, PendingTransaction>> prevLayerTxsBySender) {
+    final BinaryOperator<PendingTransaction> noMergeExpected =
+        (a, b) -> {
+          throw new IllegalArgumentException();
+        };
+    final var controlTxsBySender =
+        pendingTransactions.values().stream()
+            .collect(
+                Collectors.groupingBy(
+                    PendingTransaction::getSender,
+                    Collectors.toMap(
+                        PendingTransaction::getNonce,
+                        Function.identity(),
+                        noMergeExpected,
+                        TreeMap::new)));
+
+    assert txsBySender.equals(controlTxsBySender)
+        : "pendingTransactions and txsBySender do not contain the same txs";
+
+    assert pendingTransactions.values().stream().mapToInt(PendingTransaction::memorySize).sum()
+            == spaceUsed
+        : "space used does not match";
+
+    internalConsistencyCheck(prevLayerTxsBySender);
+
+    if (nextLayer instanceof AbstractTransactionsLayer) {
+      txsBySender.forEach(
+          (sender, txsByNonce) ->
+              prevLayerTxsBySender
+                  .computeIfAbsent(sender, s -> new TreeMap<>())
+                  .putAll(txsByNonce));
+      return ((AbstractTransactionsLayer) nextLayer).consistencyCheck(prevLayerTxsBySender);
+    }
+    return true;
+  }
+
+  protected abstract void internalConsistencyCheck(
+      final Map<Address, TreeMap<Long, PendingTransaction>> prevLayerTxsBySender);
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/BaseFeePrioritizedTransactions.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/BaseFeePrioritizedTransactions.java
new file mode 100644
index 00000000000..e95d431bc6d
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/BaseFeePrioritizedTransactions.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.layered;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+
+import java.util.Comparator;
+import java.util.Optional;
+import java.util.function.BiFunction;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Holds the current set of pending transactions with the ability to iterate them based on priority
+ * for mining or look-up by hash.
+ *
+ * <p>This class is safe for use across multiple threads.
+ */
+public class BaseFeePrioritizedTransactions extends AbstractPrioritizedTransactions {
+
+  private static final Logger LOG = LoggerFactory.getLogger(BaseFeePrioritizedTransactions.class);
+  private Optional<Wei> nextBlockBaseFee;
+
+  public BaseFeePrioritizedTransactions(
+      final TransactionPoolConfiguration poolConfig,
+      final Supplier<BlockHeader> chainHeadHeaderSupplier,
+      final TransactionsLayer nextLayer,
+      final TransactionPoolMetrics metrics,
+      final BiFunction<PendingTransaction, PendingTransaction, Boolean>
+          transactionReplacementTester,
+      final BaseFeeMarket baseFeeMarket) {
+    super(poolConfig, nextLayer, metrics, transactionReplacementTester);
+    this.nextBlockBaseFee =
+        Optional.of(calculateNextBlockBaseFee(baseFeeMarket, chainHeadHeaderSupplier.get()));
+  }
+
+  @Override
+  protected int compareByFee(final PendingTransaction pt1, final PendingTransaction pt2) {
+    return Comparator.comparing(
+            (PendingTransaction pendingTransaction) ->
+                pendingTransaction.getTransaction().getEffectivePriorityFeePerGas(nextBlockBaseFee))
+        .thenComparing(
+            (PendingTransaction pendingTransaction) ->
+                pendingTransaction.getTransaction().getMaxGasPrice())
+        .thenComparing(Comparator.comparing(PendingTransaction::getNonce).reversed())
+        .thenComparing(PendingTransaction::getSequence)
+        .compare(pt1, pt2);
+  }
+
+  @Override
+  protected void internalBlockAdded(final BlockHeader blockHeader, final FeeMarket feeMarket) {
+    final BaseFeeMarket baseFeeMarket = (BaseFeeMarket) feeMarket;
+    final Wei newNextBlockBaseFee = calculateNextBlockBaseFee(baseFeeMarket, blockHeader);
+
+    LOG.atTrace()
+        .setMessage("Updating base fee from {} to {}")
+        .addArgument(nextBlockBaseFee.get()::toHumanReadableString)
+        .addArgument(newNextBlockBaseFee::toHumanReadableString)
+        .log();
+
+    nextBlockBaseFee = Optional.of(newNextBlockBaseFee);
+    orderByFee.clear();
+    orderByFee.addAll(pendingTransactions.values());
+  }
+
+  private Wei calculateNextBlockBaseFee(
+      final BaseFeeMarket baseFeeMarket, final BlockHeader blockHeader) {
+    return baseFeeMarket.computeBaseFee(
+        blockHeader.getNumber() + 1,
+        blockHeader.getBaseFee().orElse(Wei.ZERO),
+        blockHeader.getGasUsed(),
+        baseFeeMarket.targetGasUsed(blockHeader));
+  }
+
+  @Override
+  protected boolean promotionFilter(final PendingTransaction pendingTransaction) {
+    return nextBlockBaseFee
+        .map(
+            baseFee ->
+                pendingTransaction
+                    .getTransaction()
+                    .getEffectiveGasPrice(nextBlockBaseFee)
+                    .greaterOrEqualThan(baseFee))
+        .orElse(false);
+  }
+
+  @Override
+  protected String internalLogStats() {
+
+    if (orderByFee.isEmpty()) {
+      return "Basefee Prioritized: Empty";
+    }
+
+    final var baseFeePartition =
+        stream()
+            .map(PendingTransaction::getTransaction)
+            .collect(
+                Collectors.partitioningBy(
+                    tx -> tx.getMaxGasPrice().greaterOrEqualThan(nextBlockBaseFee.get()),
+                    Collectors.counting()));
+    final Transaction highest = orderByFee.last().getTransaction();
+    final Transaction lowest = orderByFee.first().getTransaction();
+
+    return "Basefee Prioritized: "
+        + "count: "
+        + pendingTransactions.size()
+        + ", space used: "
+        + spaceUsed
+        + ", unique senders: "
+        + txsBySender.size()
+        + ", highest priority tx: [max fee: "
+        + highest.getMaxGasPrice().toHumanReadableString()
+        + ", curr prio fee: "
+        + highest.getEffectivePriorityFeePerGas(nextBlockBaseFee).toHumanReadableString()
+        + ", hash: "
+        + highest.getHash()
+        + "], lowest priority tx: [max fee: "
+        + lowest.getMaxGasPrice().toHumanReadableString()
+        + ", curr prio fee: "
+        + lowest.getEffectivePriorityFeePerGas(nextBlockBaseFee).toHumanReadableString()
+        + ", hash: "
+        + lowest.getHash()
+        + "], next block base fee: "
+        + nextBlockBaseFee.get().toHumanReadableString()
+        + ", above next base fee: "
+        + baseFeePartition.get(true)
+        + ", below next base fee: "
+        + baseFeePartition.get(false);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/EndLayer.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/EndLayer.java
new file mode 100644
index 00000000000..9a18e4937ea
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/EndLayer.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.layered;
+
+import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.DROPPED;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactionAddedListener;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactionDroppedListener;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.util.Subscribers;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.function.Predicate;
+
+public class EndLayer implements TransactionsLayer {
+
+  private final TransactionPoolMetrics metrics;
+  private final Subscribers<PendingTransactionAddedListener> onAddedListeners =
+      Subscribers.create();
+
+  private final Subscribers<PendingTransactionDroppedListener> onDroppedListeners =
+      Subscribers.create();
+
+  private long droppedCount = 0;
+
+  public EndLayer(final TransactionPoolMetrics metrics) {
+    this.metrics = metrics;
+  }
+
+  @Override
+  public String name() {
+    return "end";
+  }
+
+  @Override
+  public void reset() {
+    droppedCount = 0;
+  }
+
+  @Override
+  public Optional<Transaction> getByHash(final Hash transactionHash) {
+    return Optional.empty();
+  }
+
+  @Override
+  public boolean contains(final Transaction transaction) {
+    return false;
+  }
+
+  @Override
+  public List<PendingTransaction> getAll() {
+    return List.of();
+  }
+
+  @Override
+  public TransactionAddedResult add(final PendingTransaction pendingTransaction, final int gap) {
+    notifyTransactionDropped(pendingTransaction);
+    metrics.incrementRemoved(
+        pendingTransaction.isReceivedFromLocalSource(), DROPPED.label(), name());
+    ++droppedCount;
+    return TransactionAddedResult.DROPPED;
+  }
+
+  @Override
+  public void remove(final PendingTransaction pendingTransaction, final RemovalReason reason) {}
+
+  @Override
+  public void blockAdded(
+      final FeeMarket feeMarket,
+      final BlockHeader blockHeader,
+      final Map<Address, Long> maxConfirmedNonceBySender) {
+    // no-op
+  }
+
+  @Override
+  public List<Transaction> getAllLocal() {
+    return List.of();
+  }
+
+  @Override
+  public int count() {
+    return 0;
+  }
+
+  @Override
+  public OptionalLong getNextNonceFor(final Address sender) {
+    return OptionalLong.empty();
+  }
+
+  @Override
+  public OptionalLong getCurrentNonceFor(final Address sender) {
+    return OptionalLong.empty();
+  }
+
+  @Override
+  public PendingTransaction promote(final Predicate<PendingTransaction> promotionFilter) {
+    return null;
+  }
+
+  @Override
+  public long subscribeToAdded(final PendingTransactionAddedListener listener) {
+    return onAddedListeners.subscribe(listener);
+  }
+
+  @Override
+  public void unsubscribeFromAdded(final long id) {
+    onAddedListeners.unsubscribe(id);
+  }
+
+  @Override
+  public long subscribeToDropped(final PendingTransactionDroppedListener listener) {
+    return onDroppedListeners.subscribe(listener);
+  }
+
+  @Override
+  public void unsubscribeFromDropped(final long id) {
+    onDroppedListeners.unsubscribe(id);
+  }
+
+  protected void notifyTransactionDropped(final PendingTransaction pendingTransaction) {
+    onDroppedListeners.forEach(
+        listener -> listener.onTransactionDropped(pendingTransaction.getTransaction()));
+  }
+
+  @Override
+  public PendingTransaction promoteFor(final Address sender, final long nonce) {
+    return null;
+  }
+
+  @Override
+  public void notifyAdded(final PendingTransaction pendingTransaction) {
+    // no-op
+  }
+
+  @Override
+  public long getCumulativeUsedSpace() {
+    return 0;
+  }
+
+  @Override
+  public String logStats() {
+    return "Dropped: " + droppedCount;
+  }
+
+  @Override
+  public String logSender(final Address sender) {
+    return "";
+  }
+
+  @Override
+  public List<PendingTransaction> getAllFor(final Address sender) {
+    return List.of();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/GasPricePrioritizedTransactions.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/GasPricePrioritizedTransactions.java
new file mode 100644
index 00000000000..725b5138d34
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/GasPricePrioritizedTransactions.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.layered;
+
+import static java.util.Comparator.comparing;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+
+import java.util.function.BiFunction;
+
+/**
+ * Holds the current set of pending transactions with the ability to iterate them based on priority
+ * for mining or look-up by hash.
+ *
+ * <p>This class is safe for use across multiple threads.
+ */
+public class GasPricePrioritizedTransactions extends AbstractPrioritizedTransactions {
+
+  public GasPricePrioritizedTransactions(
+      final TransactionPoolConfiguration poolConfig,
+      final TransactionsLayer nextLayer,
+      final TransactionPoolMetrics metrics,
+      final BiFunction<PendingTransaction, PendingTransaction, Boolean>
+          transactionReplacementTester) {
+    super(poolConfig, nextLayer, metrics, transactionReplacementTester);
+  }
+
+  @Override
+  protected int compareByFee(final PendingTransaction pt1, final PendingTransaction pt2) {
+    return comparing(PendingTransaction::isReceivedFromLocalSource)
+        .thenComparing(PendingTransaction::getGasPrice)
+        .thenComparing(PendingTransaction::getSequence)
+        .compare(pt1, pt2);
+  }
+
+  @Override
+  protected void internalBlockAdded(final BlockHeader blockHeader, final FeeMarket feeMarket) {
+    // no-op
+  }
+
+  @Override
+  protected boolean promotionFilter(final PendingTransaction pendingTransaction) {
+    return true;
+  }
+
+  @Override
+  public String internalLogStats() {
+    if (orderByFee.isEmpty()) {
+      return "GasPrice Prioritized: Empty";
+    }
+
+    return "GasPrice Prioritized: "
+        + "count: "
+        + pendingTransactions.size()
+        + " space used: "
+        + spaceUsed
+        + " unique senders: "
+        + txsBySender.size()
+        + ", highest fee tx: "
+        + orderByFee.last().getTransaction().getGasPrice().get().toHumanReadableString()
+        + ", lowest fee tx: "
+        + orderByFee.first().getTransaction().getGasPrice().get().toHumanReadableString();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/LayeredPendingTransactions.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/LayeredPendingTransactions.java
new file mode 100644
index 00000000000..0a802a7dd7d
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/LayeredPendingTransactions.java
@@ -0,0 +1,558 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.layered;
+
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.mapping;
+import static java.util.stream.Collectors.reducing;
+import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.ALREADY_KNOWN;
+import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.INTERNAL_ERROR;
+import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.NONCE_TOO_FAR_IN_FUTURE_FOR_SENDER;
+import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.INVALIDATED;
+import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.RECONCILED;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactionAddedListener;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactionDroppedListener;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.account.AccountState;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+
+import kotlin.ranges.LongRange;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LayeredPendingTransactions implements PendingTransactions {
+  private static final Logger LOG = LoggerFactory.getLogger(LayeredPendingTransactions.class);
+  private static final Logger LOG_FOR_REPLAY = LoggerFactory.getLogger("LOG_FOR_REPLAY");
+  private final TransactionPoolConfiguration poolConfig;
+  private final Set<Address> localSenders = new HashSet<>();
+  private final AbstractPrioritizedTransactions prioritizedTransactions;
+
+  public LayeredPendingTransactions(
+      final TransactionPoolConfiguration poolConfig,
+      final AbstractPrioritizedTransactions prioritizedTransactions) {
+    this.poolConfig = poolConfig;
+    this.prioritizedTransactions = prioritizedTransactions;
+  }
+
+  @Override
+  public synchronized void reset() {
+    prioritizedTransactions.reset();
+  }
+
+  @Override
+  public synchronized TransactionAddedResult addRemoteTransaction(
+      final Transaction transaction, final Optional<Account> maybeSenderAccount) {
+
+    return addTransaction(new PendingTransaction.Remote(transaction), maybeSenderAccount);
+  }
+
+  @Override
+  public synchronized TransactionAddedResult addLocalTransaction(
+      final Transaction transaction, final Optional<Account> maybeSenderAccount) {
+
+    final TransactionAddedResult addedResult =
+        addTransaction(new PendingTransaction.Local(transaction), maybeSenderAccount);
+    if (addedResult.isSuccess()) {
+      localSenders.add(transaction.getSender());
+    }
+    return addedResult;
+  }
+
+  TransactionAddedResult addTransaction(
+      final PendingTransaction pendingTransaction, final Optional<Account> maybeSenderAccount) {
+
+    final long stateSenderNonce = maybeSenderAccount.map(AccountState::getNonce).orElse(0L);
+
+    logTransactionForReplayAdd(pendingTransaction, stateSenderNonce);
+
+    if (hasAccountNonceDisparity(pendingTransaction, stateSenderNonce)) {
+      reconcileSender(pendingTransaction.getSender(), stateSenderNonce);
+    }
+
+    final long nonceDistance = pendingTransaction.getNonce() - stateSenderNonce;
+
+    final TransactionAddedResult nonceChecksResult =
+        nonceChecks(pendingTransaction, stateSenderNonce, nonceDistance);
+    if (nonceChecksResult != null) {
+      return nonceChecksResult;
+    }
+
+    try {
+      return prioritizedTransactions.add(pendingTransaction, (int) nonceDistance);
+    } catch (final Throwable throwable) {
+      return reconcileAndRetryAdd(
+          pendingTransaction, stateSenderNonce, (int) nonceDistance, throwable);
+    }
+  }
+
+  private TransactionAddedResult reconcileAndRetryAdd(
+      final PendingTransaction pendingTransaction,
+      final long stateSenderNonce,
+      final int nonceDistance,
+      final Throwable throwable) {
+    // in case something unexpected happened, log this sender txs, force a reconcile and retry
+    // another time
+    // ToDo: demote to debug when Layered TxPool is out of preview
+    LOG.warn(
+        "Unexpected error {} when adding transaction {}, current sender status {}",
+        throwable,
+        pendingTransaction.toTraceLog(),
+        prioritizedTransactions.logSender(pendingTransaction.getSender()));
+    LOG.warn("Stack trace", throwable);
+    reconcileSender(pendingTransaction.getSender(), stateSenderNonce);
+    try {
+      return prioritizedTransactions.add(pendingTransaction, nonceDistance);
+    } catch (final Throwable throwable2) {
+      LOG.warn(
+          "Unexpected error {} when adding transaction {}, current sender status {}",
+          throwable,
+          pendingTransaction.toTraceLog(),
+          prioritizedTransactions.logSender(pendingTransaction.getSender()));
+      LOG.warn("Stack trace", throwable);
+      return INTERNAL_ERROR;
+    }
+  }
+
+  /**
+   * Detect a disparity between account nonce has seen by the world state and the txpool, that could
+   * happen during the small amount of time during block import when the world state is updated
+   * while the txpool still does not process the confirmed txs, or when there is a reorg and the
+   * sender nonce goes back.
+   *
+   * @param pendingTransaction the incoming transaction to check
+   * @param stateSenderNonce account nonce from the world state
+   * @return false if the nonce for the sender has seen by the txpool matches the value of the
+   *     account nonce in the world state, true if they differ
+   */
+  private boolean hasAccountNonceDisparity(
+      final PendingTransaction pendingTransaction, final long stateSenderNonce) {
+    final OptionalLong maybeTxPoolSenderNonce =
+        prioritizedTransactions.getCurrentNonceFor(pendingTransaction.getSender());
+    if (maybeTxPoolSenderNonce.isPresent()) {
+      final long txPoolSenderNonce = maybeTxPoolSenderNonce.getAsLong();
+      if (stateSenderNonce != txPoolSenderNonce) {
+        LOG.atDebug()
+            .setMessage(
+                "Nonce disparity detected when adding pending transaction {}. "
+                    + "Account nonce from world state is {} while current txpool nonce is {}")
+            .addArgument(pendingTransaction::toTraceLog)
+            .addArgument(stateSenderNonce)
+            .addArgument(txPoolSenderNonce)
+            .log();
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Rebuild the txpool for a sender according to the specified nonce. This is used in case the
+   * account nonce has seen by the txpool is not the correct one (see {@link
+   * LayeredPendingTransactions#hasAccountNonceDisparity(PendingTransaction, long)} for when this
+   * could happen). It works by removing all the txs for the sender and re-adding them using the
+   * passed nonce.
+   *
+   * @param sender the sender for which rebuild the txpool
+   * @param stateSenderNonce the world state account nonce to use in the txpool for the sender
+   */
+  private void reconcileSender(final Address sender, final long stateSenderNonce) {
+    final var existingSenderTxs = prioritizedTransactions.getAllFor(sender);
+    if (existingSenderTxs.isEmpty()) {
+      LOG.debug("Sender {} has no transactions to reconcile", sender);
+      return;
+    }
+
+    LOG.atDebug()
+        .setMessage("Sender {} with nonce {} has {} transaction(s) to reconcile {}")
+        .addArgument(sender)
+        .addArgument(stateSenderNonce)
+        .addArgument(existingSenderTxs::size)
+        .addArgument(() -> prioritizedTransactions.logSender(sender))
+        .log();
+
+    final var reAddTxs = new ArrayDeque<PendingTransaction>(existingSenderTxs.size());
+
+    // it is more performant to invalidate backward
+    for (int i = existingSenderTxs.size() - 1; i >= 0; --i) {
+      final var ptx = existingSenderTxs.get(i);
+      prioritizedTransactions.remove(ptx, RECONCILED);
+      if (ptx.getNonce() >= stateSenderNonce) {
+        reAddTxs.addFirst(ptx);
+      }
+    }
+
+    if (!reAddTxs.isEmpty()) {
+      // re-add all the previous txs
+      final long lowestNonce = reAddTxs.getFirst().getNonce();
+      final int newNonceDistance = (int) Math.max(0, lowestNonce - stateSenderNonce);
+
+      reAddTxs.forEach(ptx -> prioritizedTransactions.add(ptx, newNonceDistance));
+    }
+
+    LOG.atDebug()
+        .setMessage("Sender {} with nonce {} status after reconciliation {}")
+        .addArgument(sender)
+        .addArgument(stateSenderNonce)
+        .addArgument(() -> prioritizedTransactions.logSender(sender))
+        .log();
+  }
+
+  private void logTransactionForReplayAdd(
+      final PendingTransaction pendingTransaction, final long senderNonce) {
+    // csv fields: sequence, addedAt, sender, sender_nonce, nonce, type, hash, rlp
+    LOG_FOR_REPLAY
+        .atTrace()
+        .setMessage("T,{},{},{},{},{},{},{},{}")
+        .addArgument(pendingTransaction.getSequence())
+        .addArgument(pendingTransaction.getAddedAt())
+        .addArgument(pendingTransaction.getSender())
+        .addArgument(senderNonce)
+        .addArgument(pendingTransaction.getNonce())
+        .addArgument(pendingTransaction.getTransaction().getType())
+        .addArgument(pendingTransaction::getHash)
+        .addArgument(
+            () -> {
+              final BytesValueRLPOutput rlp = new BytesValueRLPOutput();
+              pendingTransaction.getTransaction().writeTo(rlp);
+              return rlp.encoded().toHexString();
+            })
+        .log();
+  }
+
+  private void logTransactionForReplayDelete(final PendingTransaction pendingTransaction) {
+    // csv fields: sequence, addedAt, sender, nonce, type, hash, rlp
+    LOG_FOR_REPLAY
+        .atTrace()
+        .setMessage("D,{},{},{},{},{},{},{}")
+        .addArgument(pendingTransaction.getSequence())
+        .addArgument(pendingTransaction.getAddedAt())
+        .addArgument(pendingTransaction.getSender())
+        .addArgument(pendingTransaction.getNonce())
+        .addArgument(pendingTransaction.getTransaction().getType())
+        .addArgument(pendingTransaction::getHash)
+        .addArgument(
+            () -> {
+              final BytesValueRLPOutput rlp = new BytesValueRLPOutput();
+              pendingTransaction.getTransaction().writeTo(rlp);
+              return rlp.encoded().toHexString();
+            })
+        .log();
+  }
+
+  private TransactionAddedResult nonceChecks(
+      final PendingTransaction pendingTransaction,
+      final long senderNonce,
+      final long nonceDistance) {
+    if (nonceDistance < 0) {
+      LOG.atTrace()
+          .setMessage("Drop already confirmed transaction {}, since current sender nonce is {}")
+          .addArgument(pendingTransaction::toTraceLog)
+          .addArgument(senderNonce)
+          .log();
+      return ALREADY_KNOWN;
+    } else if (nonceDistance >= poolConfig.getMaxFutureBySender()) {
+      LOG.atTrace()
+          .setMessage(
+              "Drop too much in the future transaction {}, since current sender nonce is {}")
+          .addArgument(pendingTransaction::toTraceLog)
+          .addArgument(senderNonce)
+          .log();
+      return NONCE_TOO_FAR_IN_FUTURE_FOR_SENDER;
+    }
+    return null;
+  }
+
+  @Override
+  public void evictOldTransactions() {}
+
+  @Override
+  public synchronized List<Transaction> getLocalTransactions() {
+    return prioritizedTransactions.getAllLocal();
+  }
+
+  @Override
+  public synchronized boolean isLocalSender(final Address sender) {
+    return localSenders.contains(sender);
+  }
+
+  @Override
+  // There's a small edge case here we could encounter.
+  // When we pass an upgrade block that has a new transaction type, we start allowing transactions
+  // of that new type into our pool.
+  // If we then reorg to a block lower than the upgrade block height _and_ we create a block, that
+  // block could end up with transactions of the new type.
+  // This seems like it would be very rare but worth it to document that we don't handle that case
+  // right now.
+  public synchronized void selectTransactions(
+      final PendingTransactions.TransactionSelector selector) {
+    final List<PendingTransaction> invalidTransactions = new ArrayList<>();
+    final Set<Hash> alreadyChecked = new HashSet<>();
+    final Set<Address> skipSenders = new HashSet<>();
+    final AtomicBoolean completed = new AtomicBoolean(false);
+
+    prioritizedTransactions.stream()
+        .takeWhile(unused -> !completed.get())
+        .filter(highPrioPendingTx -> !skipSenders.contains(highPrioPendingTx.getSender()))
+        .peek(this::logSenderTxs)
+        .forEach(
+            highPrioPendingTx ->
+                prioritizedTransactions.stream(highPrioPendingTx.getSender())
+                    .takeWhile(
+                        candidatePendingTx ->
+                            !skipSenders.contains(candidatePendingTx.getSender())
+                                && !completed.get())
+                    .filter(
+                        candidatePendingTx ->
+                            !alreadyChecked.contains(candidatePendingTx.getHash())
+                                && candidatePendingTx.getNonce() <= highPrioPendingTx.getNonce())
+                    .forEach(
+                        candidatePendingTx -> {
+                          alreadyChecked.add(candidatePendingTx.getHash());
+                          final var res =
+                              selector.evaluateTransaction(candidatePendingTx.getTransaction());
+
+                          LOG.atTrace()
+                              .setMessage("Selection result {} for transaction {}")
+                              .addArgument(res)
+                              .addArgument(candidatePendingTx::toTraceLog)
+                              .log();
+
+                          if (res.discard()) {
+                            invalidTransactions.add(candidatePendingTx);
+                            logTransactionForReplayDelete(candidatePendingTx);
+                          }
+
+                          if (res.stop()) {
+                            completed.set(true);
+                          }
+
+                          if (!res.selected()) {
+                            // avoid processing other txs from this sender if this one is skipped
+                            // since the following will not be selected due to the nonce gap
+                            skipSenders.add(candidatePendingTx.getSender());
+                            LOG.trace("Skipping tx from sender {}", candidatePendingTx.getSender());
+                          }
+                        }));
+
+    invalidTransactions.forEach(
+        invalidTx -> prioritizedTransactions.remove(invalidTx, INVALIDATED));
+  }
+
+  private void logSenderTxs(final PendingTransaction highPrioPendingTx) {
+    LOG.atTrace()
+        .setMessage("highPrioPendingTx {}, senderTxs {}")
+        .addArgument(highPrioPendingTx::toTraceLog)
+        .addArgument(
+            () ->
+                prioritizedTransactions.stream(highPrioPendingTx.getSender())
+                    .map(PendingTransaction::toTraceLog)
+                    .collect(Collectors.joining(", ")))
+        .log();
+  }
+
+  @Override
+  public long maxSize() {
+    return -1;
+  }
+
+  @Override
+  public synchronized int size() {
+    return prioritizedTransactions.count();
+  }
+
+  @Override
+  public synchronized boolean containsTransaction(final Transaction transaction) {
+    return prioritizedTransactions.contains(transaction);
+  }
+
+  @Override
+  public synchronized Optional<Transaction> getTransactionByHash(final Hash transactionHash) {
+    return prioritizedTransactions.getByHash(transactionHash);
+  }
+
+  @Override
+  public synchronized List<PendingTransaction> getPendingTransactions() {
+    return prioritizedTransactions.getAll();
+  }
+
+  @Override
+  public long subscribePendingTransactions(final PendingTransactionAddedListener listener) {
+    return prioritizedTransactions.subscribeToAdded(listener);
+  }
+
+  @Override
+  public void unsubscribePendingTransactions(final long id) {
+    prioritizedTransactions.unsubscribeFromAdded(id);
+  }
+
+  @Override
+  public long subscribeDroppedTransactions(final PendingTransactionDroppedListener listener) {
+    return prioritizedTransactions.subscribeToDropped(listener);
+  }
+
+  @Override
+  public void unsubscribeDroppedTransactions(final long id) {
+    prioritizedTransactions.unsubscribeFromDropped(id);
+  }
+
+  @Override
+  public OptionalLong getNextNonceForSender(final Address sender) {
+    return prioritizedTransactions.getNextNonceFor(sender);
+  }
+
+  @Override
+  public synchronized void manageBlockAdded(
+      final BlockHeader blockHeader,
+      final List<Transaction> confirmedTransactions,
+      final List<Transaction> reorgTransactions,
+      final FeeMarket feeMarket) {
+    LOG.atTrace()
+        .setMessage("Managing new added block {}")
+        .addArgument(blockHeader::toLogString)
+        .log();
+
+    final var maxConfirmedNonceBySender = maxNonceBySender(confirmedTransactions);
+
+    final var reorgNonceRangeBySender = nonceRangeBySender(reorgTransactions);
+
+    try {
+      prioritizedTransactions.blockAdded(feeMarket, blockHeader, maxConfirmedNonceBySender);
+    } catch (final Throwable throwable) {
+      LOG.warn(
+          "Unexpected error {} when managing added block {}, maxNonceBySender {}, reorgNonceRangeBySender {}",
+          throwable,
+          blockHeader.toLogString(),
+          maxConfirmedNonceBySender,
+          reorgTransactions);
+      LOG.warn("Stack trace", throwable);
+    }
+
+    logBlockHeaderForReplay(blockHeader, maxConfirmedNonceBySender, reorgNonceRangeBySender);
+  }
+
+  private void logBlockHeaderForReplay(
+      final BlockHeader blockHeader,
+      final Map<Address, Long> maxConfirmedNonceBySender,
+      final Map<Address, LongRange> reorgNonceRangeBySender) {
+    // block number, block hash, sender, max nonce ..., rlp
+    LOG_FOR_REPLAY
+        .atTrace()
+        .setMessage("B,{},{},{},R,{},{}")
+        .addArgument(blockHeader.getNumber())
+        .addArgument(blockHeader.getBlockHash())
+        .addArgument(
+            () ->
+                maxConfirmedNonceBySender.entrySet().stream()
+                    .map(e -> e.getKey().toHexString() + "," + e.getValue())
+                    .collect(Collectors.joining(",")))
+        .addArgument(
+            () ->
+                reorgNonceRangeBySender.entrySet().stream()
+                    .map(
+                        e ->
+                            e.getKey().toHexString()
+                                + ","
+                                + e.getValue().getStart()
+                                + ","
+                                + e.getValue().getEndInclusive())
+                    .collect(Collectors.joining(",")))
+        .addArgument(
+            () -> {
+              final BytesValueRLPOutput rlp = new BytesValueRLPOutput();
+              blockHeader.writeTo(rlp);
+              return rlp.encoded().toHexString();
+            })
+        .log();
+  }
+
+  private Map<Address, Long> maxNonceBySender(final List<Transaction> confirmedTransactions) {
+    return confirmedTransactions.stream()
+        .collect(
+            groupingBy(
+                Transaction::getSender, mapping(Transaction::getNonce, reducing(0L, Math::max))));
+  }
+
+  private Map<Address, LongRange> nonceRangeBySender(
+      final List<Transaction> confirmedTransactions) {
+
+    class MutableLongRange {
+      long start = Long.MAX_VALUE;
+      long end = 0;
+
+      void update(final long nonce) {
+        if (nonce < start) {
+          start = nonce;
+        }
+        if (nonce > end) {
+          end = nonce;
+        }
+      }
+
+      MutableLongRange combine(final MutableLongRange other) {
+        update(other.start);
+        update(other.end);
+        return this;
+      }
+
+      LongRange toImmutable() {
+        return new LongRange(start, end);
+      }
+    }
+
+    return confirmedTransactions.stream()
+        .collect(
+            groupingBy(
+                Transaction::getSender,
+                mapping(
+                    Transaction::getNonce,
+                    Collector.of(
+                        MutableLongRange::new,
+                        MutableLongRange::update,
+                        MutableLongRange::combine,
+                        MutableLongRange::toImmutable))));
+  }
+
+  @Override
+  public synchronized String toTraceLog() {
+    return "";
+  }
+
+  @Override
+  public synchronized String logStats() {
+    return prioritizedTransactions.logStats();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/ReadyTransactions.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/ReadyTransactions.java
new file mode 100644
index 00000000000..6527031c917
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/ReadyTransactions.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.layered;
+
+import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.PROMOTED;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+
+import java.util.Comparator;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.NavigableSet;
+import java.util.Optional;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.function.BiFunction;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class ReadyTransactions extends AbstractSequentialTransactionsLayer {
+
+  private final NavigableSet<PendingTransaction> orderByMaxFee =
+      new TreeSet<>(
+          Comparator.comparing((PendingTransaction pt) -> pt.getTransaction().getMaxGasPrice())
+              .thenComparing(PendingTransaction::getSequence));
+
+  public ReadyTransactions(
+      final TransactionPoolConfiguration poolConfig,
+      final TransactionsLayer nextLayer,
+      final TransactionPoolMetrics metrics,
+      final BiFunction<PendingTransaction, PendingTransaction, Boolean>
+          transactionReplacementTester) {
+    super(poolConfig, nextLayer, transactionReplacementTester, metrics);
+  }
+
+  @Override
+  public String name() {
+    return "ready";
+  }
+
+  @Override
+  public void reset() {
+    super.reset();
+    orderByMaxFee.clear();
+  }
+
+  @Override
+  protected long cacheFreeSpace() {
+    return poolConfig.getPendingTransactionsLayerMaxCapacityBytes() - getLayerSpaceUsed();
+  }
+
+  @Override
+  protected TransactionAddedResult canAdd(
+      final PendingTransaction pendingTransaction, final int gap) {
+    final var senderTxs = txsBySender.get(pendingTransaction.getSender());
+
+    if (hasExpectedNonce(senderTxs, pendingTransaction, gap)) {
+      return TransactionAddedResult.ADDED;
+    }
+
+    return TransactionAddedResult.TRY_NEXT_LAYER;
+  }
+
+  @Override
+  protected void internalAdd(
+      final NavigableMap<Long, PendingTransaction> senderTxs,
+      final PendingTransaction pendingTransaction) {
+    if (senderTxs.firstKey() == pendingTransaction.getNonce()) {
+      // replace previous if exists
+      if (senderTxs.size() > 1) {
+        final PendingTransaction secondTx = senderTxs.get(pendingTransaction.getNonce() + 1);
+        orderByMaxFee.remove(secondTx);
+      }
+      orderByMaxFee.add(pendingTransaction);
+    }
+  }
+
+  @Override
+  protected int maxTransactionsNumber() {
+    return Integer.MAX_VALUE;
+  }
+
+  @Override
+  protected void internalRemove(
+      final NavigableMap<Long, PendingTransaction> senderTxs,
+      final PendingTransaction removedTx,
+      final RemovalReason removalReason) {
+    orderByMaxFee.remove(removedTx);
+    if (!senderTxs.isEmpty()) {
+      orderByMaxFee.add(senderTxs.firstEntry().getValue());
+    }
+  }
+
+  @Override
+  protected void internalReplaced(final PendingTransaction replacedTx) {
+    orderByMaxFee.remove(replacedTx);
+  }
+
+  @Override
+  protected void internalBlockAdded(final BlockHeader blockHeader, final FeeMarket feeMarket) {
+    // no-op
+  }
+
+  @Override
+  protected PendingTransaction getEvictable() {
+    return orderByMaxFee.first();
+  }
+
+  @Override
+  protected boolean promotionFilter(final PendingTransaction pendingTransaction) {
+    return true;
+  }
+
+  @Override
+  public Stream<PendingTransaction> stream() {
+    return orderByMaxFee.descendingSet().stream()
+        .map(PendingTransaction::getSender)
+        .flatMap(sender -> txsBySender.get(sender).values().stream());
+  }
+
+  @Override
+  public PendingTransaction promote(final Predicate<PendingTransaction> promotionFilter) {
+
+    final var maybePromotedTx =
+        orderByMaxFee.descendingSet().stream()
+            .filter(candidateTx -> promotionFilter.test(candidateTx))
+            .findFirst();
+
+    return maybePromotedTx
+        .map(
+            promotedTx -> {
+              final var senderTxs = txsBySender.get(promotedTx.getSender());
+              // we always promote the first tx of a sender, so remove the first entry
+              senderTxs.pollFirstEntry();
+              processRemove(senderTxs, promotedTx.getTransaction(), PROMOTED);
+
+              // now that we have space, promote from the next layer
+              promoteTransactions();
+
+              if (senderTxs.isEmpty()) {
+                txsBySender.remove(promotedTx.getSender());
+              }
+              return promotedTx;
+            })
+        .orElse(null);
+  }
+
+  @Override
+  public String internalLogStats() {
+    if (orderByMaxFee.isEmpty()) {
+      return "Ready: Empty";
+    }
+
+    final Transaction top = orderByMaxFee.last().getTransaction();
+    final Transaction last = orderByMaxFee.first().getTransaction();
+
+    return "Ready: "
+        + "count="
+        + pendingTransactions.size()
+        + ", space used: "
+        + spaceUsed
+        + ", unique senders: "
+        + txsBySender.size()
+        + ", top by max fee[max fee:"
+        + top.getMaxGasPrice().toHumanReadableString()
+        + ", hash: "
+        + top.getHash()
+        + "], last by max fee [max fee: "
+        + last.getMaxGasPrice().toHumanReadableString()
+        + ", hash: "
+        + last.getHash()
+        + "]";
+  }
+
+  @Override
+  protected void internalConsistencyCheck(
+      final Map<Address, TreeMap<Long, PendingTransaction>> prevLayerTxsBySender) {
+    super.internalConsistencyCheck(prevLayerTxsBySender);
+
+    final var minNonceBySender =
+        pendingTransactions.values().stream()
+            .collect(
+                Collectors.groupingBy(
+                    PendingTransaction::getSender,
+                    Collectors.minBy(Comparator.comparingLong(PendingTransaction::getNonce))));
+
+    final var controlOrderByMaxFee = new TreeSet<>(orderByMaxFee.comparator());
+    controlOrderByMaxFee.addAll(minNonceBySender.values().stream().map(Optional::get).toList());
+
+    final var itControl = controlOrderByMaxFee.iterator();
+    final var itCurrent = orderByMaxFee.iterator();
+
+    while (itControl.hasNext()) {
+      assert itControl.next().equals(itCurrent.next())
+          : "orderByMaxFee does not match pendingTransactions";
+    }
+
+    assert itCurrent.hasNext() == false
+        : "orderByMaxFee has more elements than pendingTransactions";
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/SparseTransactions.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/SparseTransactions.java
new file mode 100644
index 00000000000..00248dcf4ef
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/SparseTransactions.java
@@ -0,0 +1,384 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.layered;
+
+import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.INVALIDATED;
+import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.PROMOTED;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.NavigableSet;
+import java.util.Objects;
+import java.util.OptionalLong;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.function.BiFunction;
+import java.util.function.Predicate;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+public class SparseTransactions extends AbstractTransactionsLayer {
+  private final NavigableSet<PendingTransaction> sparseEvictionOrder =
+      new TreeSet<>(Comparator.comparing(PendingTransaction::getSequence));
+  private final Map<Address, Integer> gapBySender = new HashMap<>();
+  private final List<Set<Address>> orderByGap;
+
+  public SparseTransactions(
+      final TransactionPoolConfiguration poolConfig,
+      final TransactionsLayer nextLayer,
+      final TransactionPoolMetrics metrics,
+      final BiFunction<PendingTransaction, PendingTransaction, Boolean>
+          transactionReplacementTester) {
+    super(poolConfig, nextLayer, transactionReplacementTester, metrics);
+    orderByGap = new ArrayList<>(poolConfig.getMaxFutureBySender());
+    IntStream.range(0, poolConfig.getMaxFutureBySender())
+        .forEach(i -> orderByGap.add(new HashSet<>()));
+  }
+
+  @Override
+  public String name() {
+    return "sparse";
+  }
+
+  @Override
+  protected long cacheFreeSpace() {
+    return poolConfig.getPendingTransactionsLayerMaxCapacityBytes() - getLayerSpaceUsed();
+  }
+
+  @Override
+  protected boolean gapsAllowed() {
+    return true;
+  }
+
+  @Override
+  public void reset() {
+    super.reset();
+    sparseEvictionOrder.clear();
+    gapBySender.clear();
+    orderByGap.forEach(Set::clear);
+  }
+
+  @Override
+  protected TransactionAddedResult canAdd(
+      final PendingTransaction pendingTransaction, final int gap) {
+    gapBySender.compute(
+        pendingTransaction.getSender(),
+        (sender, currGap) -> {
+          if (currGap == null) {
+            orderByGap.get(gap).add(sender);
+            return gap;
+          }
+          if (pendingTransaction.getNonce() < txsBySender.get(sender).firstKey()) {
+            orderByGap.get(currGap).remove(sender);
+            orderByGap.get(gap).add(sender);
+            return gap;
+          }
+          return currGap;
+        });
+
+    return TransactionAddedResult.ADDED;
+  }
+
+  @Override
+  protected void internalAdd(
+      final NavigableMap<Long, PendingTransaction> senderTxs, final PendingTransaction addedTx) {
+    sparseEvictionOrder.add(addedTx);
+  }
+
+  @Override
+  protected int maxTransactionsNumber() {
+    return Integer.MAX_VALUE;
+  }
+
+  @Override
+  protected void internalReplaced(final PendingTransaction replacedTx) {
+    sparseEvictionOrder.remove(replacedTx);
+  }
+
+  @Override
+  protected void internalBlockAdded(final BlockHeader blockHeader, final FeeMarket feeMarket) {}
+
+  @Override
+  public PendingTransaction promote(final Predicate<PendingTransaction> promotionFilter) {
+    final PendingTransaction promotedTx =
+        orderByGap.get(0).stream()
+            .map(txsBySender::get)
+            .map(NavigableMap::values)
+            .flatMap(Collection::stream)
+            .filter(promotionFilter)
+            .findFirst()
+            .orElse(null);
+
+    if (promotedTx != null) {
+      final Address sender = promotedTx.getSender();
+      final var senderTxs = txsBySender.get(sender);
+      senderTxs.pollFirstEntry();
+      processRemove(senderTxs, promotedTx.getTransaction(), PROMOTED);
+      if (senderTxs.isEmpty()) {
+        txsBySender.remove(sender);
+        orderByGap.get(0).remove(sender);
+        gapBySender.remove(sender);
+      } else {
+        final long firstNonce = senderTxs.firstKey();
+        final int newGap = (int) (firstNonce - (promotedTx.getNonce() + 1));
+        if (newGap != 0) {
+          updateGap(sender, 0, newGap);
+        }
+      }
+    }
+
+    return promotedTx;
+  }
+
+  @Override
+  public void remove(final PendingTransaction invalidatedTx, final RemovalReason reason) {
+
+    final var senderTxs = txsBySender.get(invalidatedTx.getSender());
+    if (senderTxs != null && senderTxs.containsKey(invalidatedTx.getNonce())) {
+      // gaps are allowed here then just remove
+      senderTxs.remove(invalidatedTx.getNonce());
+      processRemove(senderTxs, invalidatedTx.getTransaction(), reason);
+      if (senderTxs.isEmpty()) {
+        txsBySender.remove(invalidatedTx.getSender());
+      }
+    } else {
+      nextLayer.remove(invalidatedTx, reason);
+    }
+  }
+
+  @Override
+  protected void internalConfirmed(
+      final NavigableMap<Long, PendingTransaction> senderTxs,
+      final Address sender,
+      final long maxConfirmedNonce,
+      final PendingTransaction highestNonceRemovedTx) {
+
+    if (highestNonceRemovedTx != null) {
+      final int currGap = gapBySender.get(sender);
+      final int newGap = (int) (senderTxs.firstKey() - (highestNonceRemovedTx.getNonce() + 1));
+      if (currGap != newGap) {
+        updateGap(sender, currGap, newGap);
+      }
+    } else {
+      final int currGap = gapBySender.get(sender);
+      final int newGap = (int) (senderTxs.firstKey() - (maxConfirmedNonce + 1));
+      if (newGap < currGap) {
+        updateGap(sender, currGap, newGap);
+      }
+    }
+  }
+
+  @Override
+  protected void internalEvict(
+      final NavigableMap<Long, PendingTransaction> lessReadySenderTxs,
+      final PendingTransaction evictedTx) {
+    sparseEvictionOrder.remove(evictedTx);
+
+    if (lessReadySenderTxs.isEmpty()) {
+      deleteGap(evictedTx.getSender());
+    }
+  }
+
+  @Override
+  protected void internalRemove(
+      final NavigableMap<Long, PendingTransaction> senderTxs,
+      final PendingTransaction removedTx,
+      final RemovalReason removalReason) {
+
+    sparseEvictionOrder.remove(removedTx);
+
+    final Address sender = removedTx.getSender();
+
+    if (senderTxs != null && !senderTxs.isEmpty()) {
+      final int deltaGap = (int) (senderTxs.firstKey() - removedTx.getNonce());
+      if (deltaGap > 0) {
+        final int currGap = gapBySender.get(sender);
+        final int newGap;
+        if (removalReason.equals(INVALIDATED)) {
+          newGap = currGap + deltaGap;
+        } else {
+          newGap = deltaGap - 1;
+        }
+        if (currGap != newGap) {
+          updateGap(sender, currGap, newGap);
+        }
+      }
+
+    } else {
+      deleteGap(sender);
+    }
+  }
+
+  private void deleteGap(final Address sender) {
+    orderByGap.get(gapBySender.remove(sender)).remove(sender);
+  }
+
+  @Override
+  protected PendingTransaction getEvictable() {
+    return sparseEvictionOrder.first();
+  }
+
+  @Override
+  protected boolean promotionFilter(final PendingTransaction pendingTransaction) {
+    return false;
+  }
+
+  @Override
+  public Stream<PendingTransaction> stream() {
+    return sparseEvictionOrder.descendingSet().stream();
+  }
+
+  @Override
+  public OptionalLong getNextNonceFor(final Address sender) {
+    final Integer gap = gapBySender.get(sender);
+    if (gap != null && gap == 0) {
+      final var senderTxs = txsBySender.get(sender);
+      var currNonce = senderTxs.firstKey();
+      for (final var nextNonce : senderTxs.keySet()) {
+        if (nextNonce > currNonce + 1) {
+          break;
+        }
+        currNonce = nextNonce;
+      }
+      return OptionalLong.of(currNonce + 1);
+    }
+    return OptionalLong.empty();
+  }
+
+  @Override
+  public OptionalLong getCurrentNonceFor(final Address sender) {
+    final var senderTxs = txsBySender.get(sender);
+    if (senderTxs != null) {
+      final var gap = gapBySender.get(sender);
+      return OptionalLong.of(senderTxs.firstKey() - gap);
+    }
+    return nextLayer.getCurrentNonceFor(sender);
+  }
+
+  @Override
+  protected void internalNotifyAdded(
+      final NavigableMap<Long, PendingTransaction> senderTxs,
+      final PendingTransaction pendingTransaction) {
+    final Address sender = pendingTransaction.getSender();
+    final Integer currGap = gapBySender.get(sender);
+    if (currGap != null) {
+      final int newGap = (int) (senderTxs.firstKey() - (pendingTransaction.getNonce() + 1));
+      if (newGap < currGap) {
+        updateGap(sender, currGap, newGap);
+      }
+    }
+  }
+
+  @Override
+  public String logSender(final Address sender) {
+    final var senderTxs = txsBySender.get(sender);
+    return name()
+        + "["
+        + (Objects.isNull(senderTxs)
+            ? "Empty"
+            : "gap(" + gapBySender.get(sender) + ") " + senderTxs.keySet())
+        + "] "
+        + nextLayer.logSender(sender);
+  }
+
+  @Override
+  public String internalLogStats() {
+    if (sparseEvictionOrder.isEmpty()) {
+      return "Sparse: Empty";
+    }
+
+    final Transaction newest = sparseEvictionOrder.last().getTransaction();
+    final Transaction oldest = sparseEvictionOrder.first().getTransaction();
+
+    return "Sparse: "
+        + "count="
+        + pendingTransactions.size()
+        + ", space used: "
+        + spaceUsed
+        + ", unique senders: "
+        + txsBySender.size()
+        + ", oldest [gap: "
+        + gapBySender.get(oldest.getSender())
+        + ", max fee:"
+        + oldest.getMaxGasPrice().toHumanReadableString()
+        + ", hash: "
+        + oldest.getHash()
+        + "], newest [gap: "
+        + gapBySender.get(newest.getSender())
+        + ", max fee: "
+        + newest.getMaxGasPrice().toHumanReadableString()
+        + ", hash: "
+        + newest.getHash()
+        + "]";
+  }
+
+  private void updateGap(final Address sender, final int currGap, final int newGap) {
+    orderByGap.get(currGap).remove(sender);
+    orderByGap.get(newGap).add(sender);
+    gapBySender.put(sender, newGap);
+  }
+
+  @Override
+  protected void internalConsistencyCheck(
+      final Map<Address, TreeMap<Long, PendingTransaction>> prevLayerTxsBySender) {
+    txsBySender.values().stream()
+        .filter(senderTxs -> senderTxs.size() > 1)
+        .map(NavigableMap::entrySet)
+        .map(Set::iterator)
+        .forEach(
+            itNonce -> {
+              PendingTransaction firstTx = itNonce.next().getValue();
+
+              prevLayerTxsBySender.computeIfPresent(
+                  firstTx.getSender(),
+                  (sender, txsByNonce) -> {
+                    final long prevLayerMaxNonce = txsByNonce.lastKey();
+                    assert prevLayerMaxNonce < firstTx.getNonce()
+                        : "first nonce is not greater than previous layer last nonce";
+
+                    final int gap = (int) (firstTx.getNonce() - (prevLayerMaxNonce + 1));
+                    assert gapBySender.get(firstTx.getSender()).equals(gap) : "gap mismatch";
+                    assert orderByGap.get(gap).contains(firstTx.getSender())
+                        : "orderByGap sender not found";
+
+                    return txsByNonce;
+                  });
+
+              long prevNonce = firstTx.getNonce();
+
+              while (itNonce.hasNext()) {
+                final long currNonce = itNonce.next().getKey();
+                assert prevNonce < currNonce : "non incremental nonce";
+                prevNonce = currNonce;
+              }
+            });
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/TransactionsLayer.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/TransactionsLayer.java
new file mode 100644
index 00000000000..9c85dac1096
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/TransactionsLayer.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.layered;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactionAddedListener;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactionDroppedListener;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.function.Predicate;
+
+public interface TransactionsLayer {
+
+  String name();
+
+  void reset();
+
+  Optional<Transaction> getByHash(Hash transactionHash);
+
+  boolean contains(Transaction transaction);
+
+  List<PendingTransaction> getAll();
+
+  TransactionAddedResult add(PendingTransaction pendingTransaction, int gap);
+
+  void remove(PendingTransaction pendingTransaction, RemovalReason reason);
+
+  void blockAdded(
+      FeeMarket feeMarket,
+      BlockHeader blockHeader,
+      final Map<Address, Long> maxConfirmedNonceBySender);
+
+  List<Transaction> getAllLocal();
+
+  int count();
+
+  OptionalLong getNextNonceFor(Address sender);
+
+  /**
+   * Get the sender nonce has seen by this and the following layers
+   *
+   * @param sender the sender for which retrieve the txpool
+   * @return either the sender nonce or empty if the sender is unknown to this or the following
+   *     layers
+   */
+  OptionalLong getCurrentNonceFor(Address sender);
+
+  PendingTransaction promote(Predicate<PendingTransaction> promotionFilter);
+
+  long subscribeToAdded(PendingTransactionAddedListener listener);
+
+  void unsubscribeFromAdded(long id);
+
+  long subscribeToDropped(PendingTransactionDroppedListener listener);
+
+  void unsubscribeFromDropped(long id);
+
+  PendingTransaction promoteFor(Address sender, long nonce);
+
+  void notifyAdded(PendingTransaction pendingTransaction);
+
+  long getCumulativeUsedSpace();
+
+  String logStats();
+
+  String logSender(Address sender);
+
+  List<PendingTransaction> getAllFor(Address sender);
+
+  enum RemovalReason {
+    CONFIRMED,
+    CROSS_LAYER_REPLACED,
+    EVICTED,
+    DROPPED,
+    FOLLOW_INVALIDATED,
+    INVALIDATED,
+    PROMOTED,
+    REPLACED,
+    RECONCILED;
+
+    private final String label;
+
+    RemovalReason() {
+      this.label = name().toLowerCase();
+    }
+
+    public String label() {
+      return label;
+    }
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/package-info.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/package-info.java
new file mode 100644
index 00000000000..fbc9da9fe57
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/layered/package-info.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * This implements a new transaction pool (txpool for brevity), with the main goal to better manage
+ * nonce gaps, i.e. the possibility that the list of transactions that we see for a sender could not
+ * be in order neither contiguous, that could happen just of the way there are broadcast on the p2p
+ * network or intentionally to try to spam the txpool with non-executable transactions (transactions
+ * that could not be included in a future block), so the goal is to try to keep in the pool
+ * transactions that could be selected for a future block proposal, and at the same time, without
+ * penalizing legitimate unordered transactions, that are only temporary non-executable.
+ *
+ * <p>It is disabled by default, to enable use the option {@code Xlayered-tx-pool=true}
+ *
+ * <p>The main idea is to organize the txpool in an arbitrary number of layers, where each layer has
+ * specific rules and constraints that determine if a transaction belong or not to that layer and
+ * also the way transactions move across layers.
+ *
+ * <p>Some design choices that apply to all layers are that a transaction can only be in one layer
+ * at any time, and that layers are chained by priority, so the first layer has the transactions
+ * that are candidate for a block proposal, and the last layer basically is where transactions are
+ * dropped. Layers are meant to be added and removed in case of specific future needs. When adding a
+ * new transaction, it is first tried on the first layer, if it is not accepted then the next one is
+ * tried and so on. Layers could be limited by transaction number of by space, and when a layer if
+ * full, it overflows to the next one and so on, instead when some space is freed, usually when
+ * transactions are removed since confirmed in a block, transactions from the next layer are
+ * promoted until there is space.
+ *
+ * <p>The current implementation is based on 3 layers, plus the last one that just drop every
+ * transaction when the previous layers are full. The 3 layers are, in order:
+ *
+ * <ul>
+ *   <li>Prioritized
+ *   <li>Ready
+ *   <li>Sparse
+ * </ul>
+ *
+ * <p>Prioritized: This is where candidate transactions are selected for creating a new block.
+ * Transactions ordered by the effective priority fee, and it is limited by size, 2000 by default,
+ * to reduce the overhead of the sorting and because that number is enough to fill any block, at the
+ * current gas limit. Does not allow nonce gaps, and the first transaction for each sender must be
+ * the next one for that sender. Eviction is done removing the transaction with the higher nonce for
+ * the sender of the less valuable transaction, to avoid creating nonce gaps, evicted transactions
+ * go into the next layer Ready.
+ *
+ * <p>Ready: Similar to the Prioritized, it does not allow nonce gaps, and the first transaction for
+ * each sender must be the next one for that sender, but it is limited by space instead of count,
+ * thus allowing many more transactions, think about this layer like a buffer for the Prioritized.
+ * Since it is meant to keep ten to hundreds of thousand of transactions, it does not have a full
+ * ordering, like the previous, but only the first transaction for each sender is ordered using a
+ * stable value that is the max fee per gas. Eviction is the same as the Prioritized, and evicted
+ * transaction go into the next layer Sparse.
+ *
+ * <p>Sparse: This is the first layer where nonce gaps are allowed and where the first transaction
+ * for a sender could not be the next expected one for that sender. The main purpose of this layer
+ * is to act as a purgatory for temporary unordered and/or non-contiguous transactions, so that they
+ * could become ready asap the missing transactions arrive, or they are eventually evicted. It also
+ * keeps the less valuable ready transactions, that are evicted from the previous layer. It is
+ * limited by space, and eviction select the oldest transaction first, that is sent to the End Layer
+ * that just drop it. When promoting to the prev layer Ready, only transactions that will not create
+ * nonce gaps are selected, for that we need to keep track of the nonce distance for each sender. So
+ * we can say that is ordered by nonce distance for promotion.
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.layered;
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/AbstractPendingTransactionsSorter.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/AbstractPendingTransactionsSorter.java
new file mode 100644
index 00000000000..83424ae22fd
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/AbstractPendingTransactionsSorter.java
@@ -0,0 +1,553 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.sorter;
+
+import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.ADDED;
+import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.ALREADY_KNOWN;
+import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.LOWER_NONCE_INVALID_TRANSACTION_KNOWN;
+import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.NONCE_TOO_FAR_IN_FUTURE_FOR_SENDER;
+import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.REJECTED_UNDERPRICED_REPLACEMENT;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.AccountTransactionOrder;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactionAddedListener;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactionDroppedListener;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolReplacementHandler;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.account.AccountState;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.data.TransactionSelectionResult;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
+import org.hyperledger.besu.util.Subscribers;
+
+import java.time.Clock;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.Set;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Holds the current set of pending transactions with the ability to iterate them based on priority
+ * for mining or look-up by hash.
+ *
+ * <p>This class is safe for use across multiple threads.
+ */
+public abstract class AbstractPendingTransactionsSorter implements PendingTransactions {
+  private static final int DEFAULT_LOWEST_INVALID_KNOWN_NONCE_CACHE = 10_000;
+  private static final Logger LOG =
+      LoggerFactory.getLogger(AbstractPendingTransactionsSorter.class);
+
+  protected final Clock clock;
+  protected final TransactionPoolConfiguration poolConfig;
+
+  protected final Object lock = new Object();
+  protected final Map<Hash, PendingTransaction> pendingTransactions;
+
+  protected final Map<Address, PendingTransactionsForSender> transactionsBySender =
+      new ConcurrentHashMap<>();
+
+  protected final LowestInvalidNonceCache lowestInvalidKnownNonceCache =
+      new LowestInvalidNonceCache(DEFAULT_LOWEST_INVALID_KNOWN_NONCE_CACHE);
+  protected final Subscribers<PendingTransactionAddedListener> pendingTransactionSubscribers =
+      Subscribers.create();
+
+  protected final Subscribers<PendingTransactionDroppedListener> transactionDroppedListeners =
+      Subscribers.create();
+
+  protected final LabelledMetric<Counter> transactionRemovedCounter;
+  protected final Counter localTransactionAddedCounter;
+  protected final Counter remoteTransactionAddedCounter;
+
+  protected final TransactionPoolReplacementHandler transactionReplacementHandler;
+  protected final Supplier<BlockHeader> chainHeadHeaderSupplier;
+
+  private final Set<Address> localSenders;
+
+  public AbstractPendingTransactionsSorter(
+      final TransactionPoolConfiguration poolConfig,
+      final Clock clock,
+      final MetricsSystem metricsSystem,
+      final Supplier<BlockHeader> chainHeadHeaderSupplier) {
+    this.poolConfig = poolConfig;
+    this.pendingTransactions = new ConcurrentHashMap<>(poolConfig.getTxPoolMaxSize());
+    this.localSenders =
+        poolConfig.getDisableLocalTransactions() ? Set.of() : ConcurrentHashMap.newKeySet();
+    this.clock = clock;
+    this.chainHeadHeaderSupplier = chainHeadHeaderSupplier;
+    this.transactionReplacementHandler =
+        new TransactionPoolReplacementHandler(poolConfig.getPriceBump());
+    final LabelledMetric<Counter> transactionAddedCounter =
+        metricsSystem.createLabelledCounter(
+            BesuMetricCategory.TRANSACTION_POOL,
+            "transactions_added_total",
+            "Count of transactions added to the transaction pool",
+            "source");
+    localTransactionAddedCounter = transactionAddedCounter.labels("local");
+    remoteTransactionAddedCounter = transactionAddedCounter.labels("remote");
+
+    transactionRemovedCounter =
+        metricsSystem.createLabelledCounter(
+            BesuMetricCategory.TRANSACTION_POOL,
+            "transactions_removed_total",
+            "Count of transactions removed from the transaction pool",
+            "source",
+            "operation");
+
+    metricsSystem.createIntegerGauge(
+        BesuMetricCategory.TRANSACTION_POOL,
+        "transactions",
+        "Current size of the transaction pool",
+        pendingTransactions::size);
+  }
+
+  @Override
+  public void reset() {
+    pendingTransactions.clear();
+    transactionsBySender.clear();
+    lowestInvalidKnownNonceCache.reset();
+  }
+
+  @Override
+  public void evictOldTransactions() {
+    final long removeTransactionsBefore =
+        clock
+            .instant()
+            .minus(poolConfig.getPendingTxRetentionPeriod(), ChronoUnit.HOURS)
+            .toEpochMilli();
+
+    pendingTransactions.values().stream()
+        .filter(transaction -> transaction.getAddedAt() < removeTransactionsBefore)
+        .forEach(
+            transactionInfo -> {
+              LOG.atTrace()
+                  .setMessage("Evicted {} due to age")
+                  .addArgument(transactionInfo::toTraceLog)
+                  .log();
+              removeTransaction(transactionInfo.getTransaction());
+            });
+  }
+
+  @Override
+  public List<Transaction> getLocalTransactions() {
+    return pendingTransactions.values().stream()
+        .filter(PendingTransaction::isReceivedFromLocalSource)
+        .map(PendingTransaction::getTransaction)
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  public TransactionAddedResult addRemoteTransaction(
+      final Transaction transaction, final Optional<Account> maybeSenderAccount) {
+
+    if (lowestInvalidKnownNonceCache.hasInvalidLowerNonce(transaction)) {
+      LOG.atDebug()
+          .setMessage(
+              "Dropping transaction {} since the sender has an invalid transaction with lower nonce")
+          .addArgument(transaction::toTraceLog)
+          .log();
+      return LOWER_NONCE_INVALID_TRANSACTION_KNOWN;
+    }
+
+    final PendingTransaction pendingTransaction =
+        new PendingTransaction.Remote(transaction, clock.millis());
+    final TransactionAddedResult transactionAddedStatus =
+        addTransaction(pendingTransaction, maybeSenderAccount);
+    if (transactionAddedStatus.equals(ADDED)) {
+      lowestInvalidKnownNonceCache.registerValidTransaction(transaction);
+      remoteTransactionAddedCounter.inc();
+    }
+    return transactionAddedStatus;
+  }
+
+  @Override
+  public TransactionAddedResult addLocalTransaction(
+      final Transaction transaction, final Optional<Account> maybeSenderAccount) {
+    final TransactionAddedResult transactionAdded =
+        addTransaction(
+            new PendingTransaction.Local(transaction, clock.millis()), maybeSenderAccount);
+    if (transactionAdded.equals(ADDED)) {
+      localSenders.add(transaction.getSender());
+      localTransactionAddedCounter.inc();
+    }
+    return transactionAdded;
+  }
+
+  void removeTransaction(final Transaction transaction) {
+    removeTransaction(transaction, false);
+    notifyTransactionDropped(transaction);
+  }
+
+  @Override
+  public void manageBlockAdded(
+      final BlockHeader blockHeader,
+      final List<Transaction> confirmedTransactions,
+      final List<Transaction> reorgTransactions,
+      final FeeMarket feeMarket) {
+    synchronized (lock) {
+      confirmedTransactions.forEach(this::transactionAddedToBlock);
+      manageBlockAdded(blockHeader);
+    }
+  }
+
+  protected abstract void manageBlockAdded(final BlockHeader blockHeader);
+
+  public void transactionAddedToBlock(final Transaction transaction) {
+    removeTransaction(transaction, true);
+    lowestInvalidKnownNonceCache.registerValidTransaction(transaction);
+  }
+
+  private void incrementTransactionRemovedCounter(
+      final boolean receivedFromLocalSource, final boolean addedToBlock) {
+    final String location = receivedFromLocalSource ? "local" : "remote";
+    final String operation = addedToBlock ? "addedToBlock" : "dropped";
+    transactionRemovedCounter.labels(location, operation).inc();
+  }
+
+  // There's a small edge case here we could encounter.
+  // When we pass an upgrade block that has a new transaction type, we start allowing transactions
+  // of that new type into our pool.
+  // If we then reorg to a block lower than the upgrade block height _and_ we create a block, that
+  // block could end up with transactions of the new type.
+  // This seems like it would be very rare but worth it to document that we don't handle that case
+  // right now.
+  @Override
+  public void selectTransactions(final TransactionSelector selector) {
+    synchronized (lock) {
+      final Set<Transaction> transactionsToRemove = new HashSet<>();
+      final Map<Address, AccountTransactionOrder> accountTransactions = new HashMap<>();
+      final Iterator<PendingTransaction> prioritizedTransactions = prioritizedTransactions();
+      while (prioritizedTransactions.hasNext()) {
+        final PendingTransaction highestPriorityPendingTransaction = prioritizedTransactions.next();
+        final AccountTransactionOrder accountTransactionOrder =
+            accountTransactions.computeIfAbsent(
+                highestPriorityPendingTransaction.getSender(), this::createSenderTransactionOrder);
+
+        for (final Transaction transactionToProcess :
+            accountTransactionOrder.transactionsToProcess(
+                highestPriorityPendingTransaction.getTransaction())) {
+          final TransactionSelectionResult result =
+              selector.evaluateTransaction(transactionToProcess);
+
+          if (result.discard()) {
+            transactionsToRemove.add(transactionToProcess);
+            transactionsToRemove.addAll(
+                signalInvalidAndGetDependentTransactions(transactionToProcess));
+          }
+
+          if (result.stop()) {
+            transactionsToRemove.forEach(this::removeTransaction);
+            return;
+          }
+        }
+      }
+      transactionsToRemove.forEach(this::removeTransaction);
+    }
+  }
+
+  private AccountTransactionOrder createSenderTransactionOrder(final Address address) {
+    return new AccountTransactionOrder(
+        transactionsBySender
+            .get(address)
+            .streamPendingTransactions()
+            .map(PendingTransaction::getTransaction));
+  }
+
+  private TransactionAddedResult addTransactionForSenderAndNonce(
+      final PendingTransaction pendingTransaction, final Optional<Account> maybeSenderAccount) {
+
+    PendingTransactionsForSender pendingTxsForSender =
+        transactionsBySender.computeIfAbsent(
+            pendingTransaction.getSender(),
+            address -> new PendingTransactionsForSender(maybeSenderAccount));
+
+    PendingTransaction existingPendingTx =
+        pendingTxsForSender.getPendingTransactionForNonce(pendingTransaction.getNonce());
+
+    final Optional<Transaction> maybeReplacedTransaction;
+    if (existingPendingTx != null) {
+      if (!transactionReplacementHandler.shouldReplace(
+          existingPendingTx, pendingTransaction, chainHeadHeaderSupplier.get())) {
+        LOG.atTrace()
+            .setMessage("Reject underpriced transaction replacement {}")
+            .addArgument(pendingTransaction::toTraceLog)
+            .log();
+        return REJECTED_UNDERPRICED_REPLACEMENT;
+      }
+      LOG.atTrace()
+          .setMessage("Replace existing transaction {}, with new transaction {}")
+          .addArgument(existingPendingTx::toTraceLog)
+          .addArgument(pendingTransaction::toTraceLog)
+          .log();
+      maybeReplacedTransaction = Optional.of(existingPendingTx.getTransaction());
+    } else {
+      maybeReplacedTransaction = Optional.empty();
+    }
+
+    pendingTxsForSender.updateSenderAccount(maybeSenderAccount);
+    pendingTxsForSender.trackPendingTransaction(pendingTransaction);
+    LOG.atTrace()
+        .setMessage("Tracked transaction by sender {}")
+        .addArgument(pendingTxsForSender::toTraceLog)
+        .log();
+    maybeReplacedTransaction.ifPresent(this::removeTransaction);
+    return ADDED;
+  }
+
+  private void removePendingTransactionBySenderAndNonce(
+      final PendingTransaction pendingTransaction) {
+    final Transaction transaction = pendingTransaction.getTransaction();
+    Optional.ofNullable(transactionsBySender.get(transaction.getSender()))
+        .ifPresent(
+            pendingTxsForSender -> {
+              pendingTxsForSender.removeTrackedPendingTransaction(pendingTransaction);
+              if (pendingTxsForSender.transactionCount() == 0) {
+                LOG.trace(
+                    "Removing sender {} from transactionBySender since no more tracked transactions",
+                    transaction.getSender());
+                transactionsBySender.remove(transaction.getSender());
+              } else {
+                LOG.atTrace()
+                    .setMessage("Tracked transaction by sender {} after the removal of {}")
+                    .addArgument(pendingTxsForSender::toTraceLog)
+                    .addArgument(transaction::toTraceLog)
+                    .log();
+              }
+            });
+  }
+
+  private void notifyTransactionAdded(final Transaction transaction) {
+    pendingTransactionSubscribers.forEach(listener -> listener.onTransactionAdded(transaction));
+  }
+
+  private void notifyTransactionDropped(final Transaction transaction) {
+    transactionDroppedListeners.forEach(listener -> listener.onTransactionDropped(transaction));
+  }
+
+  @Override
+  public long maxSize() {
+    return poolConfig.getTxPoolMaxSize();
+  }
+
+  @Override
+  public int size() {
+    return pendingTransactions.size();
+  }
+
+  @Override
+  public boolean containsTransaction(final Transaction transaction) {
+    return pendingTransactions.containsKey(transaction.getHash());
+  }
+
+  @Override
+  public Optional<Transaction> getTransactionByHash(final Hash transactionHash) {
+    return Optional.ofNullable(pendingTransactions.get(transactionHash))
+        .map(PendingTransaction::getTransaction);
+  }
+
+  @Override
+  public List<PendingTransaction> getPendingTransactions() {
+    return new ArrayList<>(pendingTransactions.values());
+  }
+
+  @Override
+  public long subscribePendingTransactions(final PendingTransactionAddedListener listener) {
+    return pendingTransactionSubscribers.subscribe(listener);
+  }
+
+  @Override
+  public void unsubscribePendingTransactions(final long id) {
+    pendingTransactionSubscribers.unsubscribe(id);
+  }
+
+  @Override
+  public long subscribeDroppedTransactions(final PendingTransactionDroppedListener listener) {
+    return transactionDroppedListeners.subscribe(listener);
+  }
+
+  @Override
+  public void unsubscribeDroppedTransactions(final long id) {
+    transactionDroppedListeners.unsubscribe(id);
+  }
+
+  @Override
+  public OptionalLong getNextNonceForSender(final Address sender) {
+    final PendingTransactionsForSender pendingTransactionsForSender =
+        transactionsBySender.get(sender);
+    return pendingTransactionsForSender == null
+        ? OptionalLong.empty()
+        : pendingTransactionsForSender.maybeNextNonce();
+  }
+
+  private void removeTransaction(final Transaction transaction, final boolean addedToBlock) {
+    synchronized (lock) {
+      final PendingTransaction removedPendingTx = pendingTransactions.remove(transaction.getHash());
+      if (removedPendingTx != null) {
+        removePrioritizedTransaction(removedPendingTx);
+        removePendingTransactionBySenderAndNonce(removedPendingTx);
+        incrementTransactionRemovedCounter(
+            removedPendingTx.isReceivedFromLocalSource(), addedToBlock);
+      }
+    }
+  }
+
+  protected abstract void removePrioritizedTransaction(PendingTransaction removedPendingTx);
+
+  protected abstract Iterator<PendingTransaction> prioritizedTransactions();
+
+  protected abstract void prioritizeTransaction(final PendingTransaction pendingTransaction);
+
+  private TransactionAddedResult addTransaction(
+      final PendingTransaction pendingTransaction, final Optional<Account> maybeSenderAccount) {
+    final Transaction transaction = pendingTransaction.getTransaction();
+    synchronized (lock) {
+      if (pendingTransactions.containsKey(pendingTransaction.getHash())) {
+        LOG.atTrace()
+            .setMessage("Already known transaction {}")
+            .addArgument(pendingTransaction::toTraceLog)
+            .log();
+        return ALREADY_KNOWN;
+      }
+
+      if (transaction.getNonce() - maybeSenderAccount.map(AccountState::getNonce).orElse(0L)
+          >= poolConfig.getTxPoolMaxFutureTransactionByAccount()) {
+        LOG.atTrace()
+            .setMessage(
+                "Transaction {} not added because nonce too far in the future for sender {}")
+            .addArgument(transaction::toTraceLog)
+            .addArgument(
+                () ->
+                    maybeSenderAccount
+                        .map(Account::getAddress)
+                        .map(Address::toString)
+                        .orElse("unknown"))
+            .log();
+        return NONCE_TOO_FAR_IN_FUTURE_FOR_SENDER;
+      }
+
+      final TransactionAddedResult transactionAddedStatus =
+          addTransactionForSenderAndNonce(pendingTransaction, maybeSenderAccount);
+
+      if (!transactionAddedStatus.equals(ADDED)) {
+        return transactionAddedStatus;
+      }
+
+      pendingTransactions.put(pendingTransaction.getHash(), pendingTransaction);
+      prioritizeTransaction(pendingTransaction);
+
+      if (pendingTransactions.size() > poolConfig.getTxPoolMaxSize()) {
+        evictLessPriorityTransactions();
+      }
+    }
+    notifyTransactionAdded(pendingTransaction.getTransaction());
+    return ADDED;
+  }
+
+  protected abstract PendingTransaction getLeastPriorityTransaction();
+
+  private void evictLessPriorityTransactions() {
+    final PendingTransaction leastPriorityTx = getLeastPriorityTransaction();
+    // evict all txs for the sender with nonce >= the least priority one to avoid gaps
+    final var pendingTxsForSender = transactionsBySender.get(leastPriorityTx.getSender());
+    final var txsToEvict = pendingTxsForSender.getPendingTransactions(leastPriorityTx.getNonce());
+
+    // remove backward to avoid gaps
+    for (int i = txsToEvict.size() - 1; i >= 0; i--) {
+      removeTransaction(txsToEvict.get(i).getTransaction());
+    }
+  }
+
+  @Override
+  public String logStats() {
+    return "Pending " + pendingTransactions.size();
+  }
+
+  @Override
+  public String toTraceLog() {
+    synchronized (lock) {
+      StringBuilder sb =
+          new StringBuilder(
+              "Prioritized transactions { "
+                  + StreamSupport.stream(
+                          Spliterators.spliteratorUnknownSize(
+                              prioritizedTransactions(), Spliterator.ORDERED),
+                          false)
+                      .map(PendingTransaction::toTraceLog)
+                      .collect(Collectors.joining("; "))
+                  + " }");
+
+      return sb.toString();
+    }
+  }
+
+  @Override
+  public List<Transaction> signalInvalidAndGetDependentTransactions(final Transaction transaction) {
+    final long invalidNonce = lowestInvalidKnownNonceCache.registerInvalidTransaction(transaction);
+
+    PendingTransactionsForSender txsForSender = transactionsBySender.get(transaction.getSender());
+    if (txsForSender != null) {
+      return txsForSender
+          .streamPendingTransactions()
+          .filter(pendingTx -> pendingTx.getTransaction().getNonce() > invalidNonce)
+          .peek(
+              pendingTx ->
+                  LOG.atTrace()
+                      .setMessage(
+                          "Transaction {} invalid since there is a lower invalid nonce {} for the sender")
+                      .addArgument(pendingTx::toTraceLog)
+                      .addArgument(invalidNonce)
+                      .log())
+          .map(PendingTransaction::getTransaction)
+          .collect(Collectors.toList());
+    }
+    return List.of();
+  }
+
+  @Override
+  public void signalInvalidAndRemoveDependentTransactions(final Transaction transaction) {
+    synchronized (lock) {
+      signalInvalidAndGetDependentTransactions(transaction).forEach(this::removeTransaction);
+    }
+  }
+
+  @Override
+  public boolean isLocalSender(final Address sender) {
+    return poolConfig.getDisableLocalTransactions() ? false : localSenders.contains(sender);
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/BaseFeePendingTransactionsSorter.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/BaseFeePendingTransactionsSorter.java
new file mode 100644
index 00000000000..aeeb2b3e469
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/BaseFeePendingTransactionsSorter.java
@@ -0,0 +1,301 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.sorter;
+
+import static java.util.Comparator.comparing;
+import static java.util.stream.Collectors.toUnmodifiableList;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.time.Clock;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.NavigableSet;
+import java.util.NoSuchElementException;
+import java.util.Optional;
+import java.util.TreeSet;
+import java.util.function.Supplier;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Holds the current set of pending transactions with the ability to iterate them based on priority
+ * for mining or look-up by hash.
+ *
+ * <p>This class is safe for use across multiple threads.
+ */
+public class BaseFeePendingTransactionsSorter extends AbstractPendingTransactionsSorter {
+
+  private static final Logger LOG = LoggerFactory.getLogger(BaseFeePendingTransactionsSorter.class);
+
+  private Optional<Wei> baseFee;
+
+  public BaseFeePendingTransactionsSorter(
+      final TransactionPoolConfiguration poolConfig,
+      final Clock clock,
+      final MetricsSystem metricsSystem,
+      final Supplier<BlockHeader> chainHeadHeaderSupplier) {
+    super(poolConfig, clock, metricsSystem, chainHeadHeaderSupplier);
+    this.baseFee = chainHeadHeaderSupplier.get().getBaseFee();
+  }
+
+  /**
+   * See this post for an explainer about these data structures:
+   * https://hackmd.io/@adietrichs/1559-transaction-sorting
+   */
+  private final NavigableSet<PendingTransaction> prioritizedTransactionsStaticRange =
+      new TreeSet<>(
+          comparing(PendingTransaction::isReceivedFromLocalSource)
+              .thenComparing(
+                  pendingTx ->
+                      pendingTx
+                          .getTransaction()
+                          .getMaxPriorityFeePerGas()
+                          // just in case we attempt to compare non-1559 transaction
+                          .orElse(Wei.ZERO)
+                          .getAsBigInteger()
+                          .longValue())
+              .thenComparing(PendingTransaction::getAddedAt)
+              .thenComparing(PendingTransaction::getSequence)
+              .reversed());
+
+  private final NavigableSet<PendingTransaction> prioritizedTransactionsDynamicRange =
+      new TreeSet<>(
+          comparing(PendingTransaction::isReceivedFromLocalSource)
+              .thenComparing(
+                  pendingTx ->
+                      pendingTx
+                          .getTransaction()
+                          .getMaxFeePerGas()
+                          .map(maxFeePerGas -> maxFeePerGas.getAsBigInteger().longValue())
+                          .orElse(pendingTx.getGasPrice().toLong()))
+              .thenComparing(PendingTransaction::getAddedAt)
+              .thenComparing(PendingTransaction::getSequence)
+              .reversed());
+
+  @Override
+  public void reset() {
+    super.reset();
+    prioritizedTransactionsStaticRange.clear();
+    prioritizedTransactionsDynamicRange.clear();
+  }
+
+  @Override
+  public void manageBlockAdded(final BlockHeader blockHeader) {
+    blockHeader.getBaseFee().ifPresent(this::updateBaseFee);
+  }
+
+  @Override
+  protected void removePrioritizedTransaction(final PendingTransaction removedPendingTx) {
+    if (prioritizedTransactionsDynamicRange.remove(removedPendingTx)) {
+      LOG.atTrace()
+          .setMessage("Removed dynamic range transaction {}")
+          .addArgument(removedPendingTx::toTraceLog)
+          .log();
+    } else {
+      removedPendingTx
+          .getTransaction()
+          .getMaxPriorityFeePerGas()
+          .ifPresent(
+              __ -> {
+                if (prioritizedTransactionsStaticRange.remove(removedPendingTx)) {
+                  LOG.atTrace()
+                      .setMessage("Removed static range transaction {}")
+                      .addArgument(removedPendingTx::toTraceLog)
+                      .log();
+                }
+              });
+    }
+  }
+
+  @Override
+  protected Iterator<PendingTransaction> prioritizedTransactions() {
+    return new Iterator<>() {
+      final Iterator<PendingTransaction> staticRangeIterable =
+          prioritizedTransactionsStaticRange.iterator();
+      final Iterator<PendingTransaction> dynamicRangeIterable =
+          prioritizedTransactionsDynamicRange.iterator();
+
+      Optional<PendingTransaction> currentStaticRangeTransaction =
+          getNextOptional(staticRangeIterable);
+      Optional<PendingTransaction> currentDynamicRangeTransaction =
+          getNextOptional(dynamicRangeIterable);
+
+      @Override
+      public boolean hasNext() {
+        return currentStaticRangeTransaction.isPresent()
+            || currentDynamicRangeTransaction.isPresent();
+      }
+
+      @Override
+      public PendingTransaction next() {
+        if (currentStaticRangeTransaction.isEmpty() && currentDynamicRangeTransaction.isEmpty()) {
+          throw new NoSuchElementException("Tried to iterate past end of iterator.");
+        } else if (currentStaticRangeTransaction.isEmpty()) {
+          // only dynamic range txs left
+          final PendingTransaction best = currentDynamicRangeTransaction.get();
+          currentDynamicRangeTransaction = getNextOptional(dynamicRangeIterable);
+          return best;
+        } else if (currentDynamicRangeTransaction.isEmpty()) {
+          // only static range txs left
+          final PendingTransaction best = currentStaticRangeTransaction.get();
+          currentStaticRangeTransaction = getNextOptional(staticRangeIterable);
+          return best;
+        } else {
+          // there are both static and dynamic txs remaining, so we need to compare them by their
+          // effective priority fees
+          final Wei dynamicRangeEffectivePriorityFee =
+              currentDynamicRangeTransaction
+                  .get()
+                  .getTransaction()
+                  .getEffectivePriorityFeePerGas(baseFee);
+          final Wei staticRangeEffectivePriorityFee =
+              currentStaticRangeTransaction
+                  .get()
+                  .getTransaction()
+                  .getEffectivePriorityFeePerGas(baseFee);
+          final PendingTransaction best;
+          if (dynamicRangeEffectivePriorityFee.compareTo(staticRangeEffectivePriorityFee) > 0) {
+            best = currentDynamicRangeTransaction.get();
+            currentDynamicRangeTransaction = getNextOptional(dynamicRangeIterable);
+          } else {
+            best = currentStaticRangeTransaction.get();
+            currentStaticRangeTransaction = getNextOptional(staticRangeIterable);
+          }
+          return best;
+        }
+      }
+
+      private Optional<PendingTransaction> getNextOptional(
+          final Iterator<PendingTransaction> pendingTxsIterator) {
+        return pendingTxsIterator.hasNext()
+            ? Optional.of(pendingTxsIterator.next())
+            : Optional.empty();
+      }
+    };
+  }
+
+  @Override
+  protected void prioritizeTransaction(final PendingTransaction pendingTransaction) {
+    // check if it's in static or dynamic range
+    final String kind;
+    if (isInStaticRange(pendingTransaction.getTransaction(), baseFee)) {
+      kind = "static";
+      prioritizedTransactionsStaticRange.add(pendingTransaction);
+    } else {
+      kind = "dynamic";
+      prioritizedTransactionsDynamicRange.add(pendingTransaction);
+    }
+    LOG.atTrace()
+        .setMessage("Adding {} to pending transactions, range type {}")
+        .addArgument(pendingTransaction::toTraceLog)
+        .addArgument(kind)
+        .log();
+  }
+
+  @Override
+  protected PendingTransaction getLeastPriorityTransaction() {
+    final var lastStatic =
+        prioritizedTransactionsStaticRange.isEmpty()
+            ? null
+            : prioritizedTransactionsStaticRange.last();
+    final var lastDynamic =
+        prioritizedTransactionsDynamicRange.isEmpty()
+            ? null
+            : prioritizedTransactionsDynamicRange.last();
+
+    if (lastDynamic == null) {
+      return lastStatic;
+    }
+    if (lastStatic == null) {
+      return lastDynamic;
+    }
+
+    final Comparator<PendingTransaction> compareByValue =
+        Comparator.comparing(
+            txInfo ->
+                txInfo.getTransaction().getEffectivePriorityFeePerGas(baseFee).getAsBigInteger());
+
+    return compareByValue.compare(lastStatic, lastDynamic) < 0 ? lastStatic : lastDynamic;
+  }
+
+  private boolean isInStaticRange(final Transaction transaction, final Optional<Wei> baseFee) {
+    return transaction
+        .getMaxPriorityFeePerGas()
+        .map(
+            maxPriorityFeePerGas ->
+                transaction.getEffectivePriorityFeePerGas(baseFee).compareTo(maxPriorityFeePerGas)
+                    >= 0)
+        .orElse(
+            // non-eip-1559 txs can't be in static range
+            false);
+  }
+
+  public void updateBaseFee(final Wei newBaseFee) {
+    LOG.atTrace()
+        .setMessage("Updating base fee from {} to {}")
+        .addArgument(this.baseFee)
+        .addArgument(newBaseFee::toShortHexString)
+        .log();
+    if (this.baseFee.orElse(Wei.ZERO).equals(newBaseFee)) {
+      return;
+    }
+    synchronized (lock) {
+      final boolean baseFeeIncreased = newBaseFee.compareTo(this.baseFee.orElse(Wei.ZERO)) > 0;
+      this.baseFee = Optional.of(newBaseFee);
+      if (baseFeeIncreased) {
+        // base fee increases can only cause transactions to go from static to dynamic range
+        prioritizedTransactionsStaticRange.stream()
+            .filter(
+                // these are the transactions whose effective priority fee have now dropped
+                // below their max priority fee
+                pendingTx -> !isInStaticRange(pendingTx.getTransaction(), baseFee))
+            .collect(toUnmodifiableList())
+            .forEach(
+                pendingTx -> {
+                  LOG.atTrace()
+                      .setMessage("Moving {} from static to dynamic gas fee paradigm")
+                      .addArgument(pendingTx::toTraceLog)
+                      .log();
+                  prioritizedTransactionsStaticRange.remove(pendingTx);
+                  prioritizedTransactionsDynamicRange.add(pendingTx);
+                });
+      } else {
+        // base fee decreases can only cause transactions to go from dynamic to static range
+        prioritizedTransactionsDynamicRange.stream()
+            .filter(
+                // these are the transactions whose effective priority fee are now above their
+                // max priority fee
+                pendingTx -> isInStaticRange(pendingTx.getTransaction(), baseFee))
+            .collect(toUnmodifiableList())
+            .forEach(
+                pendingTx -> {
+                  LOG.atTrace()
+                      .setMessage("Moving {} from dynamic to static gas fee paradigm")
+                      .addArgument(pendingTx::toTraceLog)
+                      .log();
+                  prioritizedTransactionsDynamicRange.remove(pendingTx);
+                  prioritizedTransactionsStaticRange.add(pendingTx);
+                });
+      }
+    }
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/GasPricePendingTransactionsSorter.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/GasPricePendingTransactionsSorter.java
new file mode 100644
index 00000000000..29b3406b059
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/GasPricePendingTransactionsSorter.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.sorter;
+
+import static java.util.Comparator.comparing;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.time.Clock;
+import java.util.Iterator;
+import java.util.NavigableSet;
+import java.util.TreeSet;
+import java.util.function.Supplier;
+
+/**
+ * Holds the current set of pending transactions with the ability to iterate them based on priority
+ * for mining or look-up by hash.
+ *
+ * <p>This class is safe for use across multiple threads.
+ */
+public class GasPricePendingTransactionsSorter extends AbstractPendingTransactionsSorter {
+
+  private final NavigableSet<PendingTransaction> prioritizedTransactions =
+      new TreeSet<>(
+          comparing(PendingTransaction::isReceivedFromLocalSource)
+              .thenComparing(PendingTransaction::getGasPrice)
+              .thenComparing(PendingTransaction::getAddedAt)
+              .thenComparing(PendingTransaction::getSequence)
+              .reversed());
+
+  public GasPricePendingTransactionsSorter(
+      final TransactionPoolConfiguration poolConfig,
+      final Clock clock,
+      final MetricsSystem metricsSystem,
+      final Supplier<BlockHeader> chainHeadHeaderSupplier) {
+    super(poolConfig, clock, metricsSystem, chainHeadHeaderSupplier);
+  }
+
+  @Override
+  public void reset() {
+    super.reset();
+    prioritizedTransactions.clear();
+  }
+
+  @Override
+  public void manageBlockAdded(final BlockHeader blockHeader) {
+    // nothing to do
+  }
+
+  @Override
+  protected Iterator<PendingTransaction> prioritizedTransactions() {
+    return prioritizedTransactions.iterator();
+  }
+
+  @Override
+  protected void prioritizeTransaction(final PendingTransaction pendingTx) {
+    prioritizedTransactions.add(pendingTx);
+  }
+
+  @Override
+  protected void removePrioritizedTransaction(final PendingTransaction removedPendingTx) {
+    prioritizedTransactions.remove(removedPendingTx);
+  }
+
+  @Override
+  protected PendingTransaction getLeastPriorityTransaction() {
+    return prioritizedTransactions.last();
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/LowestInvalidNonceCache.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/LowestInvalidNonceCache.java
new file mode 100644
index 00000000000..ca4c3902047
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/LowestInvalidNonceCache.java
@@ -0,0 +1,211 @@
+/*
+ * Copyright Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.sorter;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.core.Transaction;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.NavigableSet;
+import java.util.TreeSet;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+class LowestInvalidNonceCache {
+  private static final Logger LOG = LoggerFactory.getLogger(LowestInvalidNonceCache.class);
+
+  private final int maxSize;
+  private final Map<Address, InvalidNonceStatus> lowestInvalidKnownNonceBySender;
+  private final NavigableSet<InvalidNonceStatus> evictionOrder = new TreeSet<>();
+
+  public LowestInvalidNonceCache(final int maxSize) {
+    this.maxSize = maxSize;
+    this.lowestInvalidKnownNonceBySender = new HashMap<>(maxSize);
+  }
+
+  synchronized long registerInvalidTransaction(final Transaction transaction) {
+    final Address sender = transaction.getSender();
+    final long invalidNonce = transaction.getNonce();
+    final InvalidNonceStatus currStatus = lowestInvalidKnownNonceBySender.get(sender);
+    if (currStatus == null) {
+      final InvalidNonceStatus newStatus = new InvalidNonceStatus(sender, invalidNonce);
+      addInvalidNonceStatus(newStatus);
+      LOG.trace("Added invalid nonce status {}, cache status {}", newStatus, this);
+      return invalidNonce;
+    }
+
+    updateInvalidNonceStatus(
+        currStatus,
+        status -> {
+          if (invalidNonce < currStatus.nonce) {
+            currStatus.updateNonce(invalidNonce);
+          } else {
+            currStatus.newHit();
+          }
+        });
+    LOG.trace("Updated invalid nonce status {}, cache status {}", currStatus, this);
+
+    return currStatus.nonce;
+  }
+
+  synchronized void registerValidTransaction(final Transaction transaction) {
+    final InvalidNonceStatus currStatus =
+        lowestInvalidKnownNonceBySender.get(transaction.getSender());
+    if (currStatus != null) {
+      evictionOrder.remove(currStatus);
+      lowestInvalidKnownNonceBySender.remove(transaction.getSender());
+      LOG.trace(
+          "Valid transaction, removed invalid nonce status {}, cache status {}", currStatus, this);
+    }
+  }
+
+  synchronized boolean hasInvalidLowerNonce(final Transaction transaction) {
+    final InvalidNonceStatus currStatus =
+        lowestInvalidKnownNonceBySender.get(transaction.getSender());
+    if (currStatus != null && transaction.getNonce() > currStatus.nonce) {
+      updateInvalidNonceStatus(currStatus, status -> status.newHit());
+      LOG.trace("New hit for invalid nonce status {}, cache status {}", currStatus, this);
+      return true;
+    }
+    return false;
+  }
+
+  private void updateInvalidNonceStatus(
+      final InvalidNonceStatus status, final Consumer<InvalidNonceStatus> updateAction) {
+    evictionOrder.remove(status);
+    updateAction.accept(status);
+    evictionOrder.add(status);
+  }
+
+  private void addInvalidNonceStatus(final InvalidNonceStatus newStatus) {
+    if (lowestInvalidKnownNonceBySender.size() >= maxSize) {
+      final InvalidNonceStatus statusToEvict = evictionOrder.pollFirst();
+      lowestInvalidKnownNonceBySender.remove(statusToEvict.address);
+      LOG.trace("Evicted invalid nonce status {}, cache status {}", statusToEvict, this);
+    }
+    lowestInvalidKnownNonceBySender.put(newStatus.address, newStatus);
+    evictionOrder.add(newStatus);
+  }
+
+  synchronized String toTraceLog() {
+    return "by eviction order "
+        + StreamSupport.stream(evictionOrder.spliterator(), false)
+            .map(InvalidNonceStatus::toString)
+            .collect(Collectors.joining("; "));
+  }
+
+  @Override
+  public String toString() {
+    return "LowestInvalidNonceCache{"
+        + "maxSize: "
+        + maxSize
+        + ", currentSize: "
+        + lowestInvalidKnownNonceBySender.size()
+        + ", evictionOrder: [size: "
+        + evictionOrder.size()
+        + ", first evictable: "
+        + evictionOrder.first()
+        + "]"
+        + '}';
+  }
+
+  public void reset() {
+    lowestInvalidKnownNonceBySender.clear();
+    evictionOrder.clear();
+  }
+
+  private static class InvalidNonceStatus implements Comparable<InvalidNonceStatus> {
+
+    final Address address;
+    long nonce;
+    long hits;
+    long lastUpdate;
+
+    InvalidNonceStatus(final Address address, final long nonce) {
+      this.address = address;
+      this.nonce = nonce;
+      this.hits = 1L;
+      this.lastUpdate = System.currentTimeMillis();
+    }
+
+    void updateNonce(final long nonce) {
+      this.nonce = nonce;
+      newHit();
+    }
+
+    void newHit() {
+      this.hits++;
+      this.lastUpdate = System.currentTimeMillis();
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+
+      InvalidNonceStatus that = (InvalidNonceStatus) o;
+
+      return address.equals(that.address);
+    }
+
+    @Override
+    public int hashCode() {
+      return address.hashCode();
+    }
+
+    /**
+     * An InvalidNonceStatus is smaller than another when it has fewer hits and was last access
+     * earlier, the address is the last tiebreaker
+     *
+     * @param o the object to be compared.
+     * @return 0 if they are equal, negative if this is smaller, positive if this is greater
+     */
+    @Override
+    public int compareTo(final InvalidNonceStatus o) {
+      final int cmpHits = Long.compare(this.hits, o.hits);
+      if (cmpHits != 0) {
+        return cmpHits;
+      }
+      final int cmpLastUpdate = Long.compare(this.lastUpdate, o.lastUpdate);
+      if (cmpLastUpdate != 0) {
+        return cmpLastUpdate;
+      }
+      return this.address.compareTo(o.address);
+    }
+
+    @Override
+    public String toString() {
+      return "{"
+          + "address="
+          + address
+          + ", nonce="
+          + nonce
+          + ", hits="
+          + hits
+          + ", lastUpdate="
+          + lastUpdate
+          + '}';
+    }
+  }
+}
diff --git a/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/PendingTransactionsForSender.java b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/PendingTransactionsForSender.java
new file mode 100644
index 00000000000..f4cd95cba21
--- /dev/null
+++ b/ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/PendingTransactionsForSender.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.sorter;
+
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.evm.account.Account;
+
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class PendingTransactionsForSender {
+  private final NavigableMap<Long, PendingTransaction> pendingTransactions;
+  private OptionalLong nextGap = OptionalLong.empty();
+
+  private Optional<Account> maybeSenderAccount;
+
+  public PendingTransactionsForSender(final Optional<Account> maybeSenderAccount) {
+    this.pendingTransactions = new TreeMap<>();
+    this.maybeSenderAccount = maybeSenderAccount;
+  }
+
+  public void trackPendingTransaction(final PendingTransaction pendingTransaction) {
+    final long nonce = pendingTransaction.getNonce();
+    synchronized (pendingTransactions) {
+      if (!pendingTransactions.isEmpty()) {
+        final long expectedNext = pendingTransactions.lastKey() + 1;
+        if (nonce > (expectedNext) && nextGap.isEmpty()) {
+          nextGap = OptionalLong.of(expectedNext);
+        }
+      }
+      pendingTransactions.put(nonce, pendingTransaction);
+      if (nonce == nextGap.orElse(-1)) {
+        findGap();
+      }
+    }
+  }
+
+  public void removeTrackedPendingTransaction(final PendingTransaction pendingTransaction) {
+    // check the value when removing, because it could have been replaced
+    if (pendingTransactions.remove(pendingTransaction.getNonce(), pendingTransaction)) {
+      synchronized (pendingTransactions) {
+        if (!pendingTransactions.isEmpty()
+            && pendingTransaction.getNonce() != pendingTransactions.firstKey()) {
+          findGap();
+        }
+      }
+    }
+  }
+
+  public void updateSenderAccount(final Optional<Account> maybeSenderAccount) {
+    this.maybeSenderAccount = maybeSenderAccount;
+  }
+
+  public long getSenderAccountNonce() {
+    return maybeSenderAccount.map(Account::getNonce).orElse(0L);
+  }
+
+  public Optional<Account> getSenderAccount() {
+    return maybeSenderAccount;
+  }
+
+  private void findGap() {
+    // find first gap
+    long expectedValue = pendingTransactions.firstKey();
+    for (final Long nonce : pendingTransactions.keySet()) {
+      if (expectedValue == nonce) {
+        // no gap, keep moving
+        expectedValue++;
+      } else {
+        nextGap = OptionalLong.of(expectedValue);
+        return;
+      }
+    }
+    nextGap = OptionalLong.empty();
+  }
+
+  public OptionalLong maybeNextNonce() {
+    if (pendingTransactions.isEmpty()) {
+      return OptionalLong.empty();
+    } else {
+      return nextGap.isEmpty() ? OptionalLong.of(pendingTransactions.lastKey() + 1) : nextGap;
+    }
+  }
+
+  public Optional<PendingTransaction> maybeLastPendingTransaction() {
+    return Optional.ofNullable(pendingTransactions.lastEntry()).map(Map.Entry::getValue);
+  }
+
+  public int transactionCount() {
+    return pendingTransactions.size();
+  }
+
+  public List<PendingTransaction> getPendingTransactions(final long startingNonce) {
+    return List.copyOf(pendingTransactions.tailMap(startingNonce).values());
+  }
+
+  public Stream<PendingTransaction> streamPendingTransactions() {
+    return pendingTransactions.values().stream();
+  }
+
+  public PendingTransaction getPendingTransactionForNonce(final long nonce) {
+    return pendingTransactions.get(nonce);
+  }
+
+  public String toTraceLog() {
+    return "{"
+        + "senderAccount "
+        + maybeSenderAccount
+        + ", pendingTransactions "
+        + pendingTransactions.entrySet().stream()
+            .map(e -> "(" + e.getKey() + ")" + e.getValue().toTraceLog())
+            .collect(Collectors.joining("; "))
+        + ", nextGap "
+        + nextGap
+        + '}';
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/DeterministicEthScheduler.java b/ethereum/eth/src/test-support/java/org/hyperledger/besu/ethereum/eth/manager/DeterministicEthScheduler.java
similarity index 100%
rename from ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/DeterministicEthScheduler.java
rename to ethereum/eth/src/test-support/java/org/hyperledger/besu/ethereum/eth/manager/DeterministicEthScheduler.java
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/MockPeerConnection.java b/ethereum/eth/src/test-support/java/org/hyperledger/besu/ethereum/eth/manager/MockPeerConnection.java
similarity index 86%
rename from ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/MockPeerConnection.java
rename to ethereum/eth/src/test-support/java/org/hyperledger/besu/ethereum/eth/manager/MockPeerConnection.java
index 6e737d55fe3..c8c28c1d566 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/MockPeerConnection.java
+++ b/ethereum/eth/src/test-support/java/org/hyperledger/besu/ethereum/eth/manager/MockPeerConnection.java
@@ -15,7 +15,7 @@
 package org.hyperledger.besu.ethereum.eth.manager;
 
 import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
@@ -40,6 +40,8 @@ public class MockPeerConnection implements PeerConnection {
   private final Peer peer;
   private final PeerInfo peerInfo;
   private Optional<DisconnectReason> disconnectReason = Optional.empty();
+  private boolean statusSent;
+  private boolean statusReceived;
 
   public MockPeerConnection(final Set<Capability> caps, final PeerSendHandler onSend) {
     this.caps = caps;
@@ -47,7 +49,7 @@ public MockPeerConnection(final Set<Capability> caps, final PeerSendHandler onSe
     this.nodeId = Peer.randomId();
     this.peer =
         DefaultPeer.fromEnodeURL(
-            EnodeURL.builder()
+            EnodeURLImpl.builder()
                 .ipAddress("127.0.0.1")
                 .nodeId(nodeId)
                 .discoveryAndListeningPorts(30303)
@@ -111,11 +113,36 @@ public InetSocketAddress getRemoteAddress() {
     throw new UnsupportedOperationException();
   }
 
+  @Override
+  public long getInitiatedAt() {
+    return 0;
+  }
+
+  @Override
+  public boolean inboundInitiated() {
+    return false;
+  }
+
   @Override
   public boolean isDisconnected() {
     return disconnected;
   }
 
+  @Override
+  public void setStatusSent() {
+    this.statusSent = true;
+  }
+
+  @Override
+  public void setStatusReceived() {
+    this.statusReceived = true;
+  }
+
+  @Override
+  public boolean getStatusExchanged() {
+    return statusSent && statusReceived;
+  }
+
   @FunctionalInterface
   public interface PeerSendHandler {
     void exec(Capability cap, MessageData msg, PeerConnection connection);
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/MockScheduledExecutor.java b/ethereum/eth/src/test-support/java/org/hyperledger/besu/ethereum/eth/manager/MockScheduledExecutor.java
similarity index 96%
rename from ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/MockScheduledExecutor.java
rename to ethereum/eth/src/test-support/java/org/hyperledger/besu/ethereum/eth/manager/MockScheduledExecutor.java
index 39ed3940310..4ae15152397 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/MockScheduledExecutor.java
+++ b/ethereum/eth/src/test-support/java/org/hyperledger/besu/ethereum/eth/manager/MockScheduledExecutor.java
@@ -25,7 +25,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-class MockScheduledExecutor extends MockExecutorService implements ScheduledExecutorService {
+public class MockScheduledExecutor extends MockExecutorService implements ScheduledExecutorService {
 
   @Override
   public ScheduledFuture<?> schedule(
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/EthPeerTestUtil.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/EthPeerTestUtil.java
new file mode 100644
index 00000000000..aae559040fa
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/EthPeerTestUtil.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth;
+
+import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
+import org.hyperledger.besu.ethereum.p2p.peers.Peer;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class EthPeerTestUtil {
+
+  public static EnodeURLImpl.Builder enodeBuilder() {
+    return EnodeURLImpl.builder().ipAddress("127.0.0.1").useDefaultPorts().nodeId(Peer.randomId());
+  }
+
+  public static Peer createPeer(final Bytes nodeId) {
+    return DefaultPeer.fromEnodeURL(enodeBuilder().nodeId(nodeId).build());
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/EthProtocolTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/EthProtocolTest.java
new file mode 100644
index 00000000000..4555ad3d9d1
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/EthProtocolTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
+
+import org.junit.Test;
+
+public class EthProtocolTest {
+
+  @Test
+  public void eth66CheckShouldReturnTrueForCompatibleProtocols() {
+    assertThat(EthProtocol.isEth66Compatible(EthProtocol.ETH66)).isTrue();
+    assertThat(EthProtocol.isEth66Compatible(EthProtocol.ETH67)).isTrue();
+  }
+
+  @Test
+  public void eth66CheckShouldReturnFalseForIncompatibleProtocols() {
+    assertThat(EthProtocol.isEth66Compatible(EthProtocol.ETH62)).isFalse();
+    assertThat(EthProtocol.isEth66Compatible(EthProtocol.ETH63)).isFalse();
+    assertThat(EthProtocol.isEth66Compatible(EthProtocol.ETH64)).isFalse();
+    assertThat(EthProtocol.isEth66Compatible(EthProtocol.ETH65)).isFalse();
+
+    assertThat(EthProtocol.isEth66Compatible(Capability.create("IBF", 1))).isFalse();
+    assertThat(EthProtocol.isEth66Compatible(Capability.create("istanbul", 66))).isFalse();
+    assertThat(EthProtocol.isEth66Compatible(Capability.create("istanbul", 100))).isFalse();
+  }
+
+  @Test
+  public void eth66CheckWithNullNameReturnsFalse() {
+    assertThat(EthProtocol.isEth66Compatible(Capability.create(null, 1))).isFalse();
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/ForkIdTestUtil.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/ForkIdTestUtil.java
deleted file mode 100644
index c0712df0a9c..00000000000
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/ForkIdTestUtil.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.eth.manager.ForkId;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.LongSupplier;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public class ForkIdTestUtil {
-
-  public static Blockchain mockBlockchain(final String genesisHash, final long chainHeight) {
-    return mockBlockchain(genesisHash, () -> chainHeight);
-  }
-
-  public static Blockchain mockBlockchain(
-      final String genesisHash, final LongSupplier chainHeightSupplier) {
-    final Blockchain mockchain = mock(Blockchain.class);
-    final BlockHeader mockHeader = mock(BlockHeader.class);
-    final Block block = new Block(mockHeader, null);
-    when(mockchain.getGenesisBlock()).thenReturn(block);
-    when(mockchain.getChainHeadBlockNumber()).thenReturn(chainHeightSupplier.getAsLong());
-    when(mockHeader.getHash()).thenReturn(Hash.fromHexString(genesisHash));
-    return mockchain;
-  }
-
-  public static class GenesisHash {
-    public static final String MAINNET =
-        "0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3";
-    public static final String ROPSTEN =
-        "0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d";
-    public static final String RINKEBY =
-        "0x6341fd3daf94b748c72ced5a5b26028f2474f5f00d824504e4fa37a75767e177";
-    public static final String GOERLI =
-        "0xbf7e331f7f7c1dd2e05159666b3bf8bc7a8a3a9eb1d518969eab529dd9b88c1a";
-    public static final String PRIVATE =
-        "0x0000000000000000000000000000000000000000000000000000000000000000";
-  }
-
-  public static class Forks {
-    public static final List<Long> MAINNET =
-        Arrays.asList(
-            1920000L, 1150000L, 2463000L, 2675000L, 2675000L, 4370000L, 7280000L, 7280000L,
-            9069000L, 9200000L);
-    public static final List<Long> ROPSTEN =
-        Arrays.asList(0L, 0L, 10L, 1700000L, 4230000L, 4939394L, 6485846L, 7117117L);
-    public static final List<Long> RINKEBY =
-        Arrays.asList(1L, 2L, 3L, 3L, 1035301L, 3660663L, 4321234L, 5435345L);
-    public static final List<Long> GOERLI = Arrays.asList(0L, 0L, 0L, 0L, 0L, 0L, 0L, 1561651L);
-    public static final List<Long> PRIVATE = Arrays.asList(0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L);
-  }
-
-  public static class ForkIds {
-    public static final List<ForkId> MAINNET =
-        Arrays.asList(
-            new ForkId(Bytes.fromHexString("0xfc64ec04"), 1150000L), // Unsynced
-            new ForkId(Bytes.fromHexString("0x97c2c34c"), 1920000L), // First Homestead block
-            new ForkId(Bytes.fromHexString("0x91d1f948"), 2463000L), // First DAO block
-            new ForkId(Bytes.fromHexString("0x7a64da13"), 2675000L), // First Tangerine block
-            new ForkId(Bytes.fromHexString("0x3edd5b10"), 4370000L), // First Spurious block
-            new ForkId(Bytes.fromHexString("0xa00bc324"), 7280000L), // First Byzantium block
-            new ForkId(Bytes.fromHexString("0x668db0af"), 9069000L),
-            new ForkId(Bytes.fromHexString("0x879d6e30"), 9200000L),
-            new ForkId(Bytes.fromHexString("0xe029e991"), 0L));
-    public static final List<ForkId> ROPSTEN =
-        Arrays.asList(
-            new ForkId(Bytes.fromHexString("0x30c7ddbc"), 10L),
-            new ForkId(Bytes.fromHexString("0x63760190"), 1700000L),
-            new ForkId(Bytes.fromHexString("0x3ea159c7"), 4230000L),
-            new ForkId(Bytes.fromHexString("0x97b544f3"), 4939394L),
-            new ForkId(Bytes.fromHexString("0xd6e2149b"), 6485846L),
-            new ForkId(Bytes.fromHexString("0x4bc66396"), 7117117L),
-            new ForkId(Bytes.fromHexString("0x6727ef90"), 0L));
-    public static final List<ForkId> RINKEBY =
-        Arrays.asList(
-            new ForkId(Bytes.fromHexString("0x3b8e0691"), 1L),
-            new ForkId(Bytes.fromHexString("0x60949295"), 2L),
-            new ForkId(Bytes.fromHexString("0x8bde40dd"), 3L),
-            new ForkId(Bytes.fromHexString("0xcb3a64bb"), 1035301L),
-            new ForkId(Bytes.fromHexString("0x8d748b57"), 3660663L),
-            new ForkId(Bytes.fromHexString("0xe49cab14"), 4321234L),
-            new ForkId(Bytes.fromHexString("0xafec6b27"), 5435345L),
-            new ForkId(Bytes.fromHexString("0xcbdb8838"), 0L));
-    public static final List<ForkId> GOERLI =
-        Arrays.asList(
-            new ForkId(Bytes.fromHexString("0xa3f5ab08"), 1561651L),
-            new ForkId(Bytes.fromHexString("0xc25efa5c"), 0L));
-  }
-
-  public static class Network {
-    public static final Network MAINNET = network(GenesisHash.MAINNET, Forks.MAINNET);
-    public static final Network ROPSTEN = network(GenesisHash.ROPSTEN, Forks.ROPSTEN);
-    public static final Network RINKEBY = network(GenesisHash.RINKEBY, Forks.RINKEBY);
-    public static final Network GOERLI = network(GenesisHash.GOERLI, Forks.GOERLI);
-    public static final Network PRIVATE = network(GenesisHash.PRIVATE, Forks.PRIVATE);
-    public final String hash;
-    public final List<Long> forks;
-
-    public Network(final String hash, final List<Long> forks) {
-      this.hash = hash;
-      this.forks = forks;
-    }
-
-    public static Network network(final String hash, final List<Long> forks) {
-      return new Network(hash, forks);
-    }
-  }
-
-  public static class PeerCheckCase {
-    public final String forkIdHash;
-    public final long forkIdNext;
-    public final boolean want;
-
-    public PeerCheckCase(final String forkIdHash, final long forkIdNext, final boolean want) {
-      this.forkIdHash = forkIdHash;
-      this.forkIdNext = forkIdNext;
-      this.want = want;
-    }
-  }
-
-  public static ForkId forkId(final String hash, final long next) {
-    return new ForkId(Bytes.fromHexString(hash), next);
-  }
-
-  public static Optional<ForkId> wantForkId(final String hash, final long next) {
-    return Optional.of(forkId(hash, next));
-  }
-
-  public static Optional<PeerCheckCase> wantPeerCheck(
-      final String hash, final long next, final boolean want) {
-    return Optional.of(new PeerCheckCase(hash, next, want));
-  }
-}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ChainStateTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ChainStateTest.java
index b8113ea5232..7b9c209f140 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ChainStateTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ChainStateTest.java
@@ -18,13 +18,14 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.ChainHead;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 
 import org.junit.Test;
 
@@ -312,7 +313,9 @@ public void observersNotInformedWhenHeightLowers() {
   public void chainIsBetterThan_chainStateIsLighterAndShorter() {
     final ChainState chainState = new ChainState();
     updateChainState(chainState, Difficulty.of(50), 50);
-    final ChainHead chainHead = new ChainHead(Hash.ZERO, Difficulty.of(100), 100);
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getHash()).thenReturn(Hash.ZERO);
+    final ChainHead chainHead = new ChainHead(blockHeader, Difficulty.of(100), 100);
 
     assertThat(chainState.chainIsBetterThan(chainHead)).isFalse();
   }
@@ -321,7 +324,9 @@ public void chainIsBetterThan_chainStateIsLighterAndShorter() {
   public void chainIsBetterThan_chainStateIsHeavierAndShorter() {
     final ChainState chainState = new ChainState();
     updateChainState(chainState, Difficulty.of(100), 50);
-    final ChainHead chainHead = new ChainHead(Hash.ZERO, Difficulty.of(50), 100);
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getHash()).thenReturn(Hash.ZERO);
+    final ChainHead chainHead = new ChainHead(blockHeader, Difficulty.of(50), 100);
 
     assertThat(chainState.chainIsBetterThan(chainHead)).isTrue();
   }
@@ -330,7 +335,9 @@ public void chainIsBetterThan_chainStateIsHeavierAndShorter() {
   public void chainIsBetterThan_chainStateIsLighterAndTaller() {
     final ChainState chainState = new ChainState();
     updateChainState(chainState, Difficulty.of(50), 100);
-    final ChainHead chainHead = new ChainHead(Hash.ZERO, Difficulty.of(100), 50);
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getHash()).thenReturn(Hash.ZERO);
+    final ChainHead chainHead = new ChainHead(blockHeader, Difficulty.of(100), 50);
 
     assertThat(chainState.chainIsBetterThan(chainHead)).isTrue();
   }
@@ -339,7 +346,9 @@ public void chainIsBetterThan_chainStateIsLighterAndTaller() {
   public void chainIsBetterThan_chainStateIsHeavierAndTaller() {
     final ChainState chainState = new ChainState();
     updateChainState(chainState, Difficulty.of(100), 100);
-    final ChainHead chainHead = new ChainHead(Hash.ZERO, Difficulty.of(50), 50);
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getHash()).thenReturn(Hash.ZERO);
+    final ChainHead chainHead = new ChainHead(blockHeader, Difficulty.of(50), 50);
 
     assertThat(chainState.chainIsBetterThan(chainHead)).isTrue();
   }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EIP2124Test.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EIP2124Test.java
deleted file mode 100644
index 6922005004e..00000000000
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EIP2124Test.java
+++ /dev/null
@@ -1,619 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.manager;
-
-import static com.google.common.primitives.Longs.asList;
-import static java.util.Optional.empty;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.eth.ForkIdTestUtil.mockBlockchain;
-import static org.hyperledger.besu.ethereum.eth.ForkIdTestUtil.wantPeerCheck;
-
-import org.hyperledger.besu.ethereum.eth.ForkIdTestUtil;
-import org.hyperledger.besu.ethereum.eth.ForkIdTestUtil.ForkIds;
-import org.hyperledger.besu.ethereum.eth.ForkIdTestUtil.GenesisHash;
-import org.hyperledger.besu.ethereum.eth.ForkIdTestUtil.Network;
-import org.hyperledger.besu.ethereum.eth.ForkIdTestUtil.PeerCheckCase;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class EIP2124Test {
-  private static final Logger LOG = LogManager.getLogger();
-
-  @Parameters(name = "{index}: {0}")
-  public static Collection<Object[]> data() {
-    return Arrays.asList(
-        new Object[][] {
-          // Mainnet test cases
-          {
-            "Mainnet // Unsynced",
-            Network.MAINNET,
-            0L,
-            ForkIdTestUtil.wantForkId("0xfc64ec04", 1150000L),
-            Optional.of(ForkIds.MAINNET),
-            empty()
-          },
-          {
-            "Mainnet // First Homestead block",
-            Network.MAINNET,
-            1150000L,
-            ForkIdTestUtil.wantForkId("0x97c2c34c", 1920000L),
-            Optional.of(ForkIds.MAINNET),
-            empty()
-          },
-          {
-            "Mainnet // Last Homestead block",
-            Network.MAINNET,
-            1919999L,
-            ForkIdTestUtil.wantForkId("0x97c2c34c", 1920000L),
-            Optional.of(ForkIds.MAINNET),
-            empty()
-          },
-          {
-            "Mainnet // First DAO block",
-            Network.MAINNET,
-            1920000L,
-            ForkIdTestUtil.wantForkId("0x91d1f948", 2463000L),
-            Optional.of(ForkIds.MAINNET),
-            empty()
-          },
-          {
-            "Mainnet // Last DAO block",
-            Network.MAINNET,
-            2462999L,
-            ForkIdTestUtil.wantForkId("0x91d1f948", 2463000L),
-            Optional.of(ForkIds.MAINNET),
-            empty()
-          },
-          {
-            "Mainnet // First Tangerine block",
-            Network.MAINNET,
-            2463000L,
-            ForkIdTestUtil.wantForkId("0x7a64da13", 2675000L),
-            Optional.of(ForkIds.MAINNET),
-            empty()
-          },
-          {
-            "Mainnet // Last Tangerine block",
-            Network.MAINNET,
-            2674999L,
-            ForkIdTestUtil.wantForkId("0x7a64da13", 2675000L),
-            Optional.of(ForkIds.MAINNET),
-            empty()
-          },
-          {
-            "Mainnet // First Spurious block",
-            Network.MAINNET,
-            2675000L,
-            ForkIdTestUtil.wantForkId("0x3edd5b10", 4370000L),
-            Optional.of(ForkIds.MAINNET),
-            empty()
-          },
-          {
-            "Mainnet // Last Spurious block",
-            Network.MAINNET,
-            4369999L,
-            ForkIdTestUtil.wantForkId("0x3edd5b10", 4370000L),
-            Optional.of(ForkIds.MAINNET),
-            empty()
-          },
-          {
-            "Mainnet // First Byzantium block",
-            Network.MAINNET,
-            4370000L,
-            ForkIdTestUtil.wantForkId("0xa00bc324", 7280000L),
-            Optional.of(ForkIds.MAINNET),
-            empty()
-          },
-          {
-            "Mainnet // Last Byzantium block",
-            Network.MAINNET,
-            7279999L,
-            ForkIdTestUtil.wantForkId("0xa00bc324", 7280000L),
-            Optional.of(ForkIds.MAINNET),
-            empty()
-          },
-          {
-            "Mainnet // First and last Constantinople, first Petersburg block",
-            Network.MAINNET,
-            7280000L,
-            ForkIdTestUtil.wantForkId("0x668db0af", 9069000L),
-            Optional.of(ForkIds.MAINNET),
-            empty()
-          },
-          {
-            "Mainnet // Last Petersburg block",
-            Network.MAINNET,
-            9068999L,
-            ForkIdTestUtil.wantForkId("0x668db0af", 9069000L),
-            Optional.of(ForkIds.MAINNET),
-            empty()
-          },
-          {
-            "Mainnet // First Istanbul and first Muir Glacier block",
-            Network.MAINNET,
-            9069000L,
-            ForkIdTestUtil.wantForkId("0x879d6e30", 9200000L),
-            Optional.of(ForkIds.MAINNET),
-            empty()
-          },
-          {
-            "Mainnet // Last Istanbul and first Muir Glacier block",
-            Network.MAINNET,
-            9199999L,
-            ForkIdTestUtil.wantForkId("0x879d6e30", 9200000L),
-            Optional.of(ForkIds.MAINNET),
-            empty()
-          },
-          {
-            "Mainnet // First Muir Glacier block",
-            Network.MAINNET,
-            9200000L,
-            ForkIdTestUtil.wantForkId("0xe029e991", 0L),
-            Optional.of(ForkIds.MAINNET),
-            empty()
-          },
-          {
-            "Mainnet // Future Muir Glacier block",
-            Network.MAINNET,
-            10000000L,
-            ForkIdTestUtil.wantForkId("0xe029e991", 0L),
-            Optional.of(ForkIds.MAINNET),
-            empty()
-          },
-          // Ropsten test cases
-          {
-            "Ropsten // Unsynced, last Frontier, Homestead and first Tangerine block",
-            Network.ROPSTEN,
-            0L,
-            ForkIdTestUtil.wantForkId("0x30c7ddbc", 10L),
-            Optional.of(ForkIds.ROPSTEN),
-            empty()
-          },
-          {
-            "Ropsten // Last Tangerine block",
-            Network.ROPSTEN,
-            9L,
-            ForkIdTestUtil.wantForkId("0x30c7ddbc", 10L),
-            Optional.of(ForkIds.ROPSTEN),
-            empty()
-          },
-          {
-            "Ropsten // First Spurious block",
-            Network.ROPSTEN,
-            10L,
-            ForkIdTestUtil.wantForkId("0x63760190", 1700000L),
-            Optional.of(ForkIds.ROPSTEN),
-            empty()
-          },
-          {
-            "Ropsten // Last Spurious block",
-            Network.ROPSTEN,
-            1699999L,
-            ForkIdTestUtil.wantForkId("0x63760190", 1700000L),
-            Optional.of(ForkIds.ROPSTEN),
-            empty()
-          },
-          {
-            "Ropsten // First Byzantium block",
-            Network.ROPSTEN,
-            1700000L,
-            ForkIdTestUtil.wantForkId("0x3ea159c7", 4230000L),
-            Optional.of(ForkIds.ROPSTEN),
-            empty()
-          },
-          {
-            "Ropsten // First Byzantium block",
-            Network.ROPSTEN,
-            4229999L,
-            ForkIdTestUtil.wantForkId("0x3ea159c7", 4230000L),
-            Optional.of(ForkIds.ROPSTEN),
-            empty()
-          },
-          {
-            "Ropsten // First Constantinople block",
-            Network.ROPSTEN,
-            4230000L,
-            ForkIdTestUtil.wantForkId("0x97b544f3", 4939394L),
-            Optional.of(ForkIds.ROPSTEN),
-            empty()
-          },
-          {
-            "Ropsten // Last Constantinople block",
-            Network.ROPSTEN,
-            4939393L,
-            ForkIdTestUtil.wantForkId("0x97b544f3", 4939394L),
-            Optional.of(ForkIds.ROPSTEN),
-            empty()
-          },
-          {
-            "Ropsten // First Petersburg block",
-            Network.ROPSTEN,
-            4939394L,
-            ForkIdTestUtil.wantForkId("0xd6e2149b", 6485846L),
-            Optional.of(ForkIds.ROPSTEN),
-            empty()
-          },
-          {
-            "Ropsten // Last Petersburg block",
-            Network.ROPSTEN,
-            6485845L,
-            ForkIdTestUtil.wantForkId("0xd6e2149b", 6485846L),
-            Optional.of(ForkIds.ROPSTEN),
-            empty()
-          },
-          {
-            "Ropsten // First Istanbul block",
-            Network.ROPSTEN,
-            6485846L,
-            ForkIdTestUtil.wantForkId("0x4bc66396", 7117117L),
-            Optional.of(ForkIds.ROPSTEN),
-            empty()
-          },
-          {
-            "Ropsten // Last Istanbul block",
-            Network.ROPSTEN,
-            7117116L,
-            ForkIdTestUtil.wantForkId("0x4bc66396", 7117117L),
-            Optional.of(ForkIds.ROPSTEN),
-            empty()
-          },
-          {
-            "Ropsten // First Muir Glacier block",
-            Network.ROPSTEN,
-            7117117L,
-            ForkIdTestUtil.wantForkId("0x6727ef90", 0L),
-            Optional.of(ForkIds.ROPSTEN),
-            empty()
-          },
-          {
-            "Ropsten // Future",
-            Network.ROPSTEN,
-            7500000L,
-            ForkIdTestUtil.wantForkId("0x6727ef90", 0L),
-            Optional.of(ForkIds.ROPSTEN),
-            empty()
-          },
-          // Rinkeby test cases
-          {
-            "Rinkeby // Unsynced, last Frontier block",
-            Network.RINKEBY,
-            0L,
-            ForkIdTestUtil.wantForkId("0x3b8e0691", 1L),
-            Optional.of(ForkIds.RINKEBY),
-            empty()
-          },
-          {
-            "Rinkeby // First and last Homestead block",
-            Network.RINKEBY,
-            1L,
-            ForkIdTestUtil.wantForkId("0x60949295", 2L),
-            Optional.of(ForkIds.RINKEBY),
-            empty()
-          },
-          {
-            "Rinkeby // First and last Tangerine block",
-            Network.RINKEBY,
-            2L,
-            ForkIdTestUtil.wantForkId("0x8bde40dd", 3L),
-            Optional.of(ForkIds.RINKEBY),
-            empty()
-          },
-          {
-            "Rinkeby // First Spurious block",
-            Network.RINKEBY,
-            3L,
-            ForkIdTestUtil.wantForkId("0xcb3a64bb", 1035301L),
-            Optional.of(ForkIds.RINKEBY),
-            empty()
-          },
-          {
-            "Rinkeby // Last Spurious block",
-            Network.RINKEBY,
-            1035300L,
-            ForkIdTestUtil.wantForkId("0xcb3a64bb", 1035301L),
-            Optional.of(ForkIds.RINKEBY),
-            empty()
-          },
-          {
-            "Rinkeby // First Byzantium block",
-            Network.RINKEBY,
-            1035301L,
-            ForkIdTestUtil.wantForkId("0x8d748b57", 3660663L),
-            Optional.of(ForkIds.RINKEBY),
-            empty()
-          },
-          {
-            "Rinkeby // Last Byzantium block",
-            Network.RINKEBY,
-            3660662L,
-            ForkIdTestUtil.wantForkId("0x8d748b57", 3660663L),
-            Optional.of(ForkIds.RINKEBY),
-            empty()
-          },
-          {
-            "Rinkeby // First Constantinople block",
-            Network.RINKEBY,
-            3660663L,
-            ForkIdTestUtil.wantForkId("0xe49cab14", 4321234L),
-            Optional.of(ForkIds.RINKEBY),
-            empty()
-          },
-          {
-            "Rinkeby // Last Constantinople block",
-            Network.RINKEBY,
-            4321233L,
-            ForkIdTestUtil.wantForkId("0xe49cab14", 4321234L),
-            Optional.of(ForkIds.RINKEBY),
-            empty()
-          },
-          {
-            "Rinkeby // First Petersburg block",
-            Network.RINKEBY,
-            4321234L,
-            ForkIdTestUtil.wantForkId("0xafec6b27", 5435345L),
-            Optional.of(ForkIds.RINKEBY),
-            empty()
-          },
-          {
-            "Rinkeby // Last Petersburg block",
-            Network.RINKEBY,
-            5435344L,
-            ForkIdTestUtil.wantForkId("0xafec6b27", 5435345L),
-            Optional.of(ForkIds.RINKEBY),
-            empty()
-          },
-          {
-            "Rinkeby // First Istanbul block",
-            Network.RINKEBY,
-            5435345L,
-            ForkIdTestUtil.wantForkId("0xcbdb8838", 0L),
-            Optional.of(ForkIds.RINKEBY),
-            empty()
-          },
-          {
-            "Rinkeby // Future Istanbul block",
-            Network.RINKEBY,
-            6000000L,
-            ForkIdTestUtil.wantForkId("0xcbdb8838", 0L),
-            Optional.of(ForkIds.RINKEBY),
-            empty()
-          },
-          // Goerli test cases
-          {
-            "Goerli  // Unsynced, last Frontier, Homestead, Tangerine, Spurious, Byzantium, Constantinople and first Petersburg block",
-            Network.GOERLI,
-            0L,
-            ForkIdTestUtil.wantForkId("0xa3f5ab08", 1561651L),
-            Optional.of(ForkIds.GOERLI),
-            empty()
-          },
-          {
-            "Goerli // Last Petersburg block",
-            Network.GOERLI,
-            1561650L,
-            ForkIdTestUtil.wantForkId("0xa3f5ab08", 1561651L),
-            Optional.of(ForkIds.GOERLI),
-            empty()
-          },
-          {
-            "Goerli // First Istanbul block",
-            Network.GOERLI,
-            1561651L,
-            ForkIdTestUtil.wantForkId("0xc25efa5c", 0L),
-            Optional.of(ForkIds.GOERLI),
-            empty()
-          },
-          {
-            "Goerli // Future Istanbul block",
-            Network.GOERLI,
-            2000000L,
-            ForkIdTestUtil.wantForkId("0xc25efa5c", 0L),
-            Optional.of(ForkIds.GOERLI),
-            empty()
-          },
-          // Private network test cases
-          {
-            "Private // Unsynced",
-            Network.PRIVATE,
-            0L,
-            ForkIdTestUtil.wantForkId("0x190a55ad", 0L),
-            empty(),
-            empty()
-          },
-          {
-            "Private // First block",
-            Network.PRIVATE,
-            1L,
-            ForkIdTestUtil.wantForkId("0x190a55ad", 0L),
-            empty(),
-            empty()
-          },
-          {
-            "Private // Future block",
-            Network.PRIVATE,
-            1000000L,
-            ForkIdTestUtil.wantForkId("0x190a55ad", 0L),
-            empty(),
-            empty()
-          },
-          // Peer check cases
-          {
-            "check1PetersburgWithRemoteAnnouncingTheSame",
-            Network.MAINNET,
-            7987396L,
-            empty(),
-            empty(),
-            wantPeerCheck("0x668db0af", 0L, true)
-          },
-          {
-            "check2PetersburgWithRemoteAnnouncingTheSameAndNextFork",
-            Network.MAINNET,
-            7987396L,
-            empty(),
-            empty(),
-            wantPeerCheck("0x668db0af", Long.MAX_VALUE, true)
-          },
-          {
-            "check3ByzantiumAwareOfPetersburgRemoteUnawareOfPetersburg",
-            Network.MAINNET,
-            7279999L,
-            empty(),
-            empty(),
-            wantPeerCheck("0xa00bc324", 0L, true)
-          },
-          {
-            "check4ByzantiumAwareOfPetersburgRemoteAwareOfPetersburg",
-            Network.MAINNET,
-            7987396L,
-            empty(),
-            empty(),
-            wantPeerCheck("0xa00bc324", 7280000L, true)
-          },
-          {
-            "check5ByzantiumAwareOfPetersburgRemoteAnnouncingUnknownFork",
-            Network.MAINNET,
-            7279999L,
-            empty(),
-            empty(),
-            wantPeerCheck("0xa00bc324", Long.MAX_VALUE, true)
-          },
-          {
-            "check6PetersburgWithRemoteAnnouncingByzantiumAwareOfPetersburg",
-            Network.MAINNET,
-            7987396L,
-            empty(),
-            empty(),
-            wantPeerCheck("0x668db0af", 7280000L, true)
-          },
-          {
-            "check7PetersburgWithRemoteAnnouncingSpuriousAwareOfByzantiumRemoteMayNeedUpdate",
-            Network.MAINNET,
-            7987396L,
-            empty(),
-            empty(),
-            wantPeerCheck("0x3edd5b10", 4370000L, true)
-          },
-          {
-            "check8ByzantiumWithRemoteAnnouncingPetersburgLocalOutOfSync",
-            Network.MAINNET,
-            727999L,
-            empty(),
-            empty(),
-            wantPeerCheck("0x668db0af", 0L, true)
-          },
-          {
-            "check9SpuriousWithRemoteAnnouncingByzantiumRemoteUnawareOfPetersburg",
-            Network.MAINNET,
-            4369999L,
-            empty(),
-            empty(),
-            wantPeerCheck("0xa00bc324", 0L, true)
-          },
-          {
-            "check10PetersburgWithRemoteAnnouncingByzantiumRemoteUnawareOfAdditionalForks",
-            Network.network(
-                GenesisHash.MAINNET,
-                asList(1150000L, 1920000L, 2463000L, 2675000L, 4370000L, 7280000L)),
-            7987396L,
-            empty(),
-            empty(),
-            wantPeerCheck("0xa00bc324", 0L, false)
-          },
-          {
-            "check11PetersburgWithRemoteAnnouncingPetersburgAndFutureForkLocalNeedsUpdate",
-            Network.network(
-                GenesisHash.MAINNET,
-                asList(1150000L, 1920000L, 2463000L, 2675000L, 4370000L, 7280000L)),
-            7987396L,
-            empty(),
-            empty(),
-            wantPeerCheck("0x5cddc0e1", 0L, false)
-          },
-          {
-            "check12ByzantiumWithRemoteAnnouncingPetersburgAndFutureForkLocalNeedsUpdate",
-            ForkIdTestUtil.Network.network(
-                GenesisHash.MAINNET,
-                asList(1150000L, 1920000L, 2463000L, 2675000L, 4370000L, 7280000L)),
-            7279999L,
-            empty(),
-            empty(),
-            wantPeerCheck("0x5cddc0e1", 0L, false)
-          },
-          {
-            "check13ByzantiumWithRemoteAnnouncingRinkebyPetersburg",
-            Network.network(
-                GenesisHash.MAINNET,
-                asList(1150000L, 1920000L, 2463000L, 2675000L, 4370000L, 7280000L)),
-            7987396L,
-            empty(),
-            empty(),
-            wantPeerCheck("0xafec6b27", 0L, false)
-          }
-        });
-  }
-
-  private final String name;
-  private final Network network;
-  private final long head;
-  private final Optional<ForkId> wantForkId;
-  private final Optional<List<ForkId>> wantForkIds;
-  private final Optional<PeerCheckCase> wantPeerCheckCase;
-
-  @Test
-  public void test() {
-    LOG.info("Running test case {}", name);
-    final ForkIdManager forkIdManager =
-        new ForkIdManager(mockBlockchain(network.hash, head), network.forks, false);
-    wantForkId.ifPresent(forkId -> assertThat(forkIdManager.computeForkId()).isEqualTo(forkId));
-    wantForkIds.ifPresent(
-        forkIds ->
-            assertThat(forkIdManager.getForkAndHashList()).containsExactlyElementsOf(forkIds));
-    wantPeerCheckCase.ifPresent(
-        peerCheckCase ->
-            assertThat(
-                    forkIdManager.peerCheck(
-                        new ForkId(
-                            Bytes.fromHexString(peerCheckCase.forkIdHash),
-                            peerCheckCase.forkIdNext)))
-                .isEqualTo(peerCheckCase.want));
-  }
-
-  public EIP2124Test(
-      final String name,
-      final ForkIdTestUtil.Network network,
-      final long head,
-      final Optional<ForkId> wantForkId,
-      final Optional<List<ForkId>> wantForkIds,
-      final Optional<PeerCheckCase> wantPeerCheckCase) {
-    this.name = name;
-    this.network = network;
-    this.head = head;
-    this.wantForkId = wantForkId;
-    this.wantForkIds = wantForkIds;
-    this.wantPeerCheckCase = wantPeerCheckCase;
-  }
-}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthContextTestUtil.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthContextTestUtil.java
deleted file mode 100644
index da1f481eba7..00000000000
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthContextTestUtil.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.manager;
-
-import org.hyperledger.besu.ethereum.eth.manager.DeterministicEthScheduler.TimeoutPolicy;
-import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.testutil.TestClock;
-
-public class EthContextTestUtil {
-
-  private static final String PROTOCOL_NAME = "ETH";
-
-  public static EthContext createTestEthContext(final TimeoutPolicy timeoutPolicy) {
-    return new EthContext(
-        new EthPeers(PROTOCOL_NAME, TestClock.fixed(), new NoOpMetricsSystem()),
-        new EthMessages(),
-        new DeterministicEthScheduler(timeoutPolicy));
-  }
-}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthPeerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthPeerTest.java
index a1a30f35229..0b7c850cbf7 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthPeerTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthPeerTest.java
@@ -18,10 +18,15 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-import org.hyperledger.besu.ethereum.eth.EthProtocol;
+import org.hyperledger.besu.ethereum.eth.EthPeerTestUtil;
+import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
 import org.hyperledger.besu.ethereum.eth.messages.BlockBodiesMessage;
 import org.hyperledger.besu.ethereum.eth.messages.BlockHeadersMessage;
 import org.hyperledger.besu.ethereum.eth.messages.NodeDataMessage;
@@ -31,6 +36,9 @@
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.PingMessage;
+import org.hyperledger.besu.plugin.services.permissioning.NodeMessagePermissioningProvider;
 import org.hyperledger.besu.testutil.TestClock;
 
 import java.util.Arrays;
@@ -43,11 +51,16 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.apache.tuweni.bytes.Bytes;
 import org.junit.Test;
 
 public class EthPeerTest {
   private static final BlockDataGenerator gen = new BlockDataGenerator();
   private final TestClock clock = new TestClock();
+  private static final Bytes NODE_ID = Bytes.random(64);
+  private static final Bytes NODE_ID_ZERO =
+      Bytes.fromHexString(
+          "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010");
 
   @Test
   public void getHeadersStream() throws PeerNotConnected {
@@ -324,6 +337,46 @@ public void isFullyValidated_multipleValidators_fullyValidated() {
     assertThat(peer.isFullyValidated()).isTrue();
   }
 
+  @Test
+  public void message_permissioning_any_false_permission_preventsMessageFromSendingToPeer()
+      throws PeerNotConnected {
+    NodeMessagePermissioningProvider trueProvider = mock(NodeMessagePermissioningProvider.class);
+    NodeMessagePermissioningProvider falseProvider = mock(NodeMessagePermissioningProvider.class);
+    when(trueProvider.isMessagePermitted(any(), anyInt())).thenReturn(true);
+    when(falseProvider.isMessagePermitted(any(), anyInt())).thenReturn(false);
+
+    // use failOnSend callback
+    final EthPeer peer =
+        createPeer(Collections.emptyList(), List.of(falseProvider, trueProvider), getFailOnSend());
+    peer.send(PingMessage.get());
+  }
+
+  @Test
+  public void compareTo_withSameNodeId() {
+    final EthPeer peer1 = createPeerWithPeerInfo(NODE_ID);
+    final EthPeer peer2 = createPeerWithPeerInfo(NODE_ID);
+    assertThat(peer1.compareTo(peer2)).isEqualTo(0);
+    assertThat(peer2.compareTo(peer1)).isEqualTo(0);
+  }
+
+  @Test
+  public void compareTo_withDifferentNodeId() {
+    final EthPeer peer1 = createPeerWithPeerInfo(NODE_ID);
+    final EthPeer peer2 = createPeerWithPeerInfo(NODE_ID_ZERO);
+    assertThat(peer1.compareTo(peer2)).isEqualTo(1);
+    assertThat(peer2.compareTo(peer1)).isEqualTo(-1);
+  }
+
+  @Test
+  public void recordUsefulResponse() {
+    final EthPeer peer = createPeer();
+    peer.recordUselessResponse("bodies");
+    final EthPeer peer2 = createPeer();
+    peer2.recordUselessResponse("bodies");
+    peer.recordUsefulResponse();
+    assertThat(peer.getReputation().compareTo(peer2.getReputation())).isGreaterThan(0);
+  }
+
   private void messageStream(
       final ResponseStreamSupplier getStream,
       final MessageData targetMessage,
@@ -402,18 +455,80 @@ private void messageStream(
   }
 
   private EthPeer createPeer() {
-    return createPeer(Collections.emptyList());
+    return createPeer(Collections.emptyList(), Collections.emptyList());
   }
 
   private EthPeer createPeer(final PeerValidator... peerValidators) {
-    return createPeer(Arrays.asList(peerValidators));
+    return createPeer(Arrays.asList(peerValidators), Collections.emptyList());
   }
 
   private EthPeer createPeer(final List<PeerValidator> peerValidators) {
-    final Set<Capability> caps = new HashSet<>(singletonList(EthProtocol.ETH63));
-    final PeerConnection peerConnection = new MockPeerConnection(caps);
+    return createPeer(peerValidators, Collections.emptyList());
+  }
+
+  private EthPeer createPeerWithPeerInfo(final Bytes nodeId) {
+    final PeerConnection peerConnection = mock(PeerConnection.class);
+    // Use a non-eth protocol name to ensure that EthPeer with sub-protocols such as Istanbul
+    // that extend the sub-protocol work correctly
+    PeerInfo peerInfo = new PeerInfo(1, "clientId", Collections.emptyList(), 30303, nodeId);
+    when(peerConnection.getPeerInfo()).thenReturn(peerInfo);
+    when(peerConnection.getPeer()).thenReturn(EthPeerTestUtil.createPeer(peerInfo.getNodeId()));
+
     final Consumer<EthPeer> onPeerReady = (peer) -> {};
-    return new EthPeer(peerConnection, EthProtocol.NAME, onPeerReady, peerValidators, clock);
+    return new EthPeer(
+        peerConnection,
+        "foo",
+        onPeerReady,
+        Collections.emptyList(),
+        EthProtocolConfiguration.DEFAULT_MAX_MESSAGE_SIZE,
+        clock,
+        Collections.emptyList(),
+        Bytes.random(64));
+  }
+
+  private MockPeerConnection.PeerSendHandler getFailOnSend() {
+    return (cap, message, conn) -> {
+      fail("should not call send");
+    };
+  }
+
+  private MockPeerConnection.PeerSendHandler getNoOpSend() {
+    return (cap, msg, conn) -> {};
+  }
+
+  private EthPeer createPeer(
+      final List<PeerValidator> peerValidators,
+      final List<NodeMessagePermissioningProvider> permissioningProviders) {
+    return createPeer(peerValidators, permissioningProviders, getNoOpSend());
+  }
+
+  private EthPeer createPeer(
+      final List<PeerValidator> peerValidators,
+      final List<NodeMessagePermissioningProvider> permissioningProviders,
+      final MockPeerConnection.PeerSendHandler onSend) {
+
+    final PeerConnection peerConnection = getPeerConnection(onSend);
+    final Consumer<EthPeer> onPeerReady = (peer) -> {};
+    // Use a non-eth protocol name to ensure that EthPeer with sub-protocols such as Istanbul
+    // that extend the sub-protocol work correctly
+    return new EthPeer(
+        peerConnection,
+        "foo",
+        onPeerReady,
+        peerValidators,
+        EthProtocolConfiguration.DEFAULT_MAX_MESSAGE_SIZE,
+        clock,
+        permissioningProviders,
+        Bytes.random(64));
+  }
+
+  private PeerConnection getPeerConnection(final MockPeerConnection.PeerSendHandler onSend) {
+    // Use a non-eth protocol name to ensure that EthPeer with sub-protocols such as Istanbul
+    // that extend the sub-protocol work correctly
+    final Set<Capability> caps =
+        new HashSet<>(Collections.singletonList(Capability.create("foo", 63)));
+
+    return new MockPeerConnection(caps, onSend);
   }
 
   @FunctionalInterface
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthPeersTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthPeersTest.java
index 4ad19d4d801..375cfbd387b 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthPeersTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthPeersTest.java
@@ -20,18 +20,20 @@
 import static org.assertj.core.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.eth.manager.exceptions.NoAvailablePeersException;
 import org.hyperledger.besu.ethereum.eth.manager.exceptions.PeerDisconnectedException;
 import org.hyperledger.besu.ethereum.eth.messages.NodeDataMessage;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection.PeerNotConnected;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
 
+import java.util.Collections;
 import java.util.Optional;
 import java.util.OptionalLong;
 import java.util.concurrent.CancellationException;
@@ -39,6 +41,7 @@
 
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.stubbing.Answer;
 
 public class EthPeersTest {
 
@@ -68,10 +71,10 @@ public void comparesPeersWithHeightAndTd() {
     assertThat(EthPeers.CHAIN_HEIGHT.compare(peerA, peerB)).isGreaterThan(0);
     assertThat(EthPeers.TOTAL_DIFFICULTY.compare(peerA, peerB)).isLessThan(0);
 
-    assertThat(EthPeers.BEST_CHAIN.compare(peerA, peerB)).isLessThan(0);
-    assertThat(EthPeers.BEST_CHAIN.compare(peerB, peerA)).isGreaterThan(0);
-    assertThat(EthPeers.BEST_CHAIN.compare(peerA, peerA)).isEqualTo(0);
-    assertThat(EthPeers.BEST_CHAIN.compare(peerB, peerB)).isEqualTo(0);
+    assertThat(EthPeers.HEAVIEST_CHAIN.compare(peerA, peerB)).isLessThan(0);
+    assertThat(EthPeers.HEAVIEST_CHAIN.compare(peerB, peerA)).isGreaterThan(0);
+    assertThat(EthPeers.HEAVIEST_CHAIN.compare(peerA, peerA)).isEqualTo(0);
+    assertThat(EthPeers.HEAVIEST_CHAIN.compare(peerB, peerB)).isEqualTo(0);
 
     assertThat(ethProtocolManager.ethContext().getEthPeers().bestPeer()).contains(peerB);
     assertThat(ethProtocolManager.ethContext().getEthPeers().bestPeerWithHeightEstimate())
@@ -96,10 +99,10 @@ public void comparesPeersWithTdAndNoHeight() {
     assertThat(EthPeers.CHAIN_HEIGHT.compare(peerA, peerB)).isEqualTo(0);
     assertThat(EthPeers.TOTAL_DIFFICULTY.compare(peerA, peerB)).isGreaterThan(0);
 
-    assertThat(EthPeers.BEST_CHAIN.compare(peerA, peerB)).isGreaterThan(0);
-    assertThat(EthPeers.BEST_CHAIN.compare(peerB, peerA)).isLessThan(0);
-    assertThat(EthPeers.BEST_CHAIN.compare(peerA, peerA)).isEqualTo(0);
-    assertThat(EthPeers.BEST_CHAIN.compare(peerB, peerB)).isEqualTo(0);
+    assertThat(EthPeers.HEAVIEST_CHAIN.compare(peerA, peerB)).isGreaterThan(0);
+    assertThat(EthPeers.HEAVIEST_CHAIN.compare(peerB, peerA)).isLessThan(0);
+    assertThat(EthPeers.HEAVIEST_CHAIN.compare(peerA, peerA)).isEqualTo(0);
+    assertThat(EthPeers.HEAVIEST_CHAIN.compare(peerB, peerB)).isEqualTo(0);
 
     assertThat(ethProtocolManager.ethContext().getEthPeers().bestPeer()).contains(peerA);
     assertThat(ethProtocolManager.ethContext().getEthPeers().bestPeerWithHeightEstimate())
@@ -156,7 +159,7 @@ public void shouldFailWithNoAvailablePeersWhenNoPeersConnected() {
     final PendingPeerRequest pendingRequest =
         ethPeers.executePeerRequest(peerRequest, 10, Optional.empty());
 
-    verifyZeroInteractions(peerRequest);
+    verifyNoInteractions(peerRequest);
     assertRequestFailure(pendingRequest, NoAvailablePeersException.class);
   }
 
@@ -166,7 +169,7 @@ public void shouldFailWhenNoPeerWithSufficientHeight() {
     final PendingPeerRequest pendingRequest =
         ethPeers.executePeerRequest(peerRequest, 200, Optional.empty());
 
-    verifyZeroInteractions(peerRequest);
+    verifyNoInteractions(peerRequest);
     assertRequestFailure(pendingRequest, NoAvailablePeersException.class);
   }
 
@@ -180,7 +183,7 @@ public void shouldFailWhenAllPeersWithSufficientHeightHaveDisconnected() throws
     final PendingPeerRequest pendingRequest =
         ethPeers.executePeerRequest(peerRequest, 200, Optional.empty());
 
-    verifyZeroInteractions(peerRequest);
+    verifyNoInteractions(peerRequest);
     assertNotDone(pendingRequest);
 
     suitablePeer.disconnect(DisconnectReason.TOO_MANY_PEERS);
@@ -204,7 +207,7 @@ public void shouldDelayExecutionUntilPeerHasCapacity() throws Exception {
 
     final PendingPeerRequest pendingRequest =
         ethPeers.executePeerRequest(peerRequest, 100, Optional.empty());
-    verifyZeroInteractions(peerRequest);
+    verifyNoInteractions(peerRequest);
 
     freeUpCapacity(peer.getEthPeer());
 
@@ -222,7 +225,7 @@ public void shouldDelayExecutionUntilPeerWithSufficientHeightHasCapacity() throw
 
     final PendingPeerRequest pendingRequest =
         ethPeers.executePeerRequest(peerRequest, 100, Optional.empty());
-    verifyZeroInteractions(peerRequest);
+    verifyNoInteractions(peerRequest);
 
     freeUpCapacity(peer.getEthPeer());
 
@@ -237,13 +240,13 @@ public void shouldNotExecuteAbortedRequest() throws Exception {
 
     final PendingPeerRequest pendingRequest =
         ethPeers.executePeerRequest(peerRequest, 100, Optional.empty());
-    verifyZeroInteractions(peerRequest);
+    verifyNoInteractions(peerRequest);
 
     pendingRequest.abort();
 
     freeUpCapacity(peer.getEthPeer());
 
-    verifyZeroInteractions(peerRequest);
+    verifyNoInteractions(peerRequest);
     assertRequestFailure(pendingRequest, CancellationException.class);
   }
 
@@ -264,6 +267,88 @@ public void shouldFailRequestWithBusyDisconnectedAssignedPeer() throws Exception
     assertRequestFailure(pendingRequest, CancellationException.class);
   }
 
+  @Test
+  public void shouldNotFailWhenAttemptExecutionDisconnectSamePeer() throws PeerNotConnected {
+    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 1000);
+    final EthPeer ethPeer = spy(peer.getEthPeer());
+
+    // Force request to be added to pending request list
+    when(ethPeer.hasAvailableRequestCapacity()).thenReturn(false);
+
+    final PendingPeerRequest pendingPeerRequest =
+        ethPeers.executePeerRequest(peerRequest, 10, Optional.of(ethPeer));
+
+    // Force Request Attempt to cause the peer to disconnect
+    when(ethPeer.hasAvailableRequestCapacity())
+        .thenAnswer(
+            (Answer<Boolean>)
+                invocation -> {
+                  // Force Disconnect only on the first execution
+                  if (!peer.getPeerConnection().isDisconnected()) {
+                    peer.disconnect(DisconnectReason.UNKNOWN); // Force Peer to disconnect
+                  }
+                  return true;
+                });
+
+    // Sent Pending Requests
+    ethPeers.reattemptPendingPeerRequests();
+
+    // Request should be aborted.
+    assertRequestFailure(pendingPeerRequest, CancellationException.class);
+
+    // Mock works
+    assertThat(peer.getEthPeer().isDisconnected()).isTrue(); // peer is disconnected
+  }
+
+  @Test
+  public void shouldNotFailWhenAttemptExecutionDisconnectAnotherPeer() throws PeerNotConnected {
+    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 1000);
+    final EthPeer ethPeer = spy(peer.getEthPeer());
+
+    // Force request to be added to pending request list
+    when(ethPeer.hasAvailableRequestCapacity()).thenReturn(false);
+
+    final PendingPeerRequest pendingPeerRequest =
+        ethPeers.executePeerRequest(peerRequest, 10, Optional.of(ethPeer));
+
+    final RespondingEthPeer peerToDisconnect =
+        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 1000);
+
+    // Force Request Attempt to cause the peer to disconnect
+    when(ethPeer.hasAvailableRequestCapacity())
+        .thenAnswer(
+            (Answer<Boolean>)
+                invocation -> {
+                  // Force Disconnect only on the first execution
+                  if (!peerToDisconnect.getPeerConnection().isDisconnected()) {
+                    peerToDisconnect.disconnect(
+                        DisconnectReason.UNKNOWN); // Force Peer to disconnect
+                  }
+                  return true;
+                });
+
+    // Sent Pending Requests
+    ethPeers.reattemptPendingPeerRequests();
+
+    // Request Should Execute
+    assertRequestSuccessful(pendingPeerRequest);
+
+    // Mock works
+    assertThat(peerToDisconnect.getEthPeer().isDisconnected()).isTrue(); // peer is disconnected
+  }
+
+  @Test
+  public void toString_hasExpectedInfo() {
+    assertThat(ethPeers.toString()).isEqualTo("0 EthPeers {}");
+
+    final EthPeer peerA =
+        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, Difficulty.of(50), 20)
+            .getEthPeer();
+    ethPeers.registerNewConnection(peerA.getConnection(), Collections.emptyList());
+    assertThat(ethPeers.toString()).contains("1 EthPeers {");
+    assertThat(ethPeers.toString()).contains(peerA.getShortNodeId());
+  }
+
   private void freeUpCapacity(final EthPeer ethPeer) {
     ethPeers.dispatchMessage(ethPeer, new EthMessage(ethPeer, NodeDataMessage.create(emptyList())));
   }
@@ -301,7 +386,7 @@ private void assertNotDone(final PendingPeerRequest pendingRequest) {
     final Consumer<Throwable> onError = mock(Consumer.class);
     pendingRequest.then(onSuccess, onError);
 
-    verifyZeroInteractions(onSuccess);
-    verifyZeroInteractions(onError);
+    verifyNoInteractions(onSuccess);
+    verifyNoInteractions(onError);
   }
 }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManagerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManagerTest.java
index 3d58519a5af..6fc31a33961 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManagerTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright contributors to Hyperledger Besu
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -15,14 +15,19 @@
 package org.hyperledger.besu.ethereum.eth.manager;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.consensus.merge.ForkchoiceEvent;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
@@ -32,13 +37,13 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.ProtocolScheduleFixture;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.eth.EthProtocol;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
+import org.hyperledger.besu.ethereum.eth.EthProtocolVersion;
 import org.hyperledger.besu.ethereum.eth.manager.MockPeerConnection.PeerSendHandler;
 import org.hyperledger.besu.ethereum.eth.messages.BlockBodiesMessage;
 import org.hyperledger.besu.ethereum.eth.messages.BlockHeadersMessage;
@@ -53,22 +58,28 @@
 import org.hyperledger.besu.ethereum.eth.messages.ReceiptsMessage;
 import org.hyperledger.besu.ethereum.eth.messages.StatusMessage;
 import org.hyperledger.besu.ethereum.eth.messages.TransactionsMessage;
+import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
+import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolFactory;
+import org.hyperledger.besu.ethereum.forkid.ForkIdManager;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.DefaultMessage;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.testutil.TestClock;
 
 import java.math.BigInteger;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -86,6 +97,7 @@
 import com.google.common.collect.Lists;
 import org.apache.tuweni.bytes.Bytes;
 import org.awaitility.Awaitility;
+import org.awaitility.core.ConditionFactory;
 import org.awaitility.core.ConditionTimeoutException;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -105,7 +117,8 @@ public final class EthProtocolManagerTest {
   @BeforeClass
   public static void setup() {
     gen = new BlockDataGenerator(0);
-    final BlockchainSetupUtil blockchainSetupUtil = BlockchainSetupUtil.forTesting();
+    final BlockchainSetupUtil blockchainSetupUtil =
+        BlockchainSetupUtil.forTesting(DataStorageFormat.FOREST);
     blockchainSetupUtil.importAllBlocks();
     blockchain = blockchainSetupUtil.getBlockchain();
     transactionPool = blockchainSetupUtil.getTransactionPool();
@@ -114,10 +127,30 @@ public static void setup() {
     assertThat(blockchainSetupUtil.getMaxBlockNumber()).isGreaterThanOrEqualTo(20L);
   }
 
+  @Test
+  public void handleMalformedRequestIdMessage() {
+    try (final EthProtocolManager ethManager =
+        EthProtocolManagerTestUtil.create(
+            protocolSchedule,
+            blockchain,
+            () -> false,
+            protocolContext.getWorldStateArchive(),
+            transactionPool,
+            EthProtocolConfiguration.defaultConfig())) {
+      // this is a non-request id message, but we'll be processing it with eth66, make sure we
+      // disconnect the peer gracefully
+      final MessageData messageData = GetBlockHeadersMessage.create(1, 1, 0, false);
+      final MockPeerConnection peer = setupPeer(ethManager, (cap, msg, conn) -> {});
+      ethManager.processMessage(EthProtocol.ETH66, new DefaultMessage(peer, messageData));
+      assertThat(peer.isDisconnected()).isTrue();
+    }
+  }
+
   @Test
   public void disconnectOnUnsolicitedMessage() {
     try (final EthProtocolManager ethManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             () -> false,
             protocolContext.getWorldStateArchive(),
@@ -135,6 +168,7 @@ public void disconnectOnUnsolicitedMessage() {
   public void disconnectOnFailureToSendStatusMessage() {
     try (final EthProtocolManager ethManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             () -> false,
             protocolContext.getWorldStateArchive(),
@@ -153,6 +187,7 @@ public void disconnectOnFailureToSendStatusMessage() {
   public void disconnectOnWrongChainId() {
     try (final EthProtocolManager ethManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             () -> false,
             protocolContext.getWorldStateArchive(),
@@ -166,7 +201,7 @@ public void disconnectOnWrongChainId() {
       // Send status message with wrong chain
       final StatusMessage statusMessage =
           StatusMessage.create(
-              EthProtocol.EthVersion.V63,
+              EthProtocolVersion.V63,
               BigInteger.valueOf(2222),
               blockchain.getChainHead().getTotalDifficulty(),
               blockchain.getChainHeadHash(),
@@ -178,10 +213,81 @@ public void disconnectOnWrongChainId() {
     }
   }
 
+  @Test
+  public void disconnectNewPoWPeers() {
+    final MergePeerFilter mergePeerFilter = new MergePeerFilter();
+    try (final EthProtocolManager ethManager =
+        EthProtocolManagerTestUtil.create(
+            protocolSchedule,
+            blockchain,
+            protocolContext.getWorldStateArchive(),
+            transactionPool,
+            EthProtocolConfiguration.defaultConfig(),
+            Optional.of(mergePeerFilter))) {
+
+      final MockPeerConnection workPeer = setupPeer(ethManager, (cap, msg, conn) -> {});
+      final MockPeerConnection stakePeer = setupPeer(ethManager, (cap, msg, conn) -> {});
+
+      final StatusMessage workPeerStatus =
+          StatusMessage.create(
+              EthProtocolVersion.V63,
+              BigInteger.ONE,
+              blockchain.getChainHead().getTotalDifficulty().add(20),
+              blockchain.getChainHeadHash(),
+              blockchain.getBlockHeader(BlockHeader.GENESIS_BLOCK_NUMBER).get().getHash());
+
+      final StatusMessage stakePeerStatus =
+          StatusMessage.create(
+              EthProtocolVersion.V63,
+              BigInteger.ONE,
+              blockchain.getChainHead().getTotalDifficulty(),
+              blockchain.getChainHeadHash(),
+              blockchain.getBlockHeader(BlockHeader.GENESIS_BLOCK_NUMBER).get().getHash());
+
+      ethManager.processMessage(EthProtocol.ETH63, new DefaultMessage(stakePeer, stakePeerStatus));
+
+      mergePeerFilter.mergeStateChanged(
+          true, Optional.empty(), Optional.of(blockchain.getChainHead().getTotalDifficulty()));
+      mergePeerFilter.onNewUnverifiedForkchoice(
+          new ForkchoiceEvent(Hash.EMPTY, Hash.EMPTY, Hash.hash(Bytes.of(1))));
+      mergePeerFilter.onNewUnverifiedForkchoice(
+          new ForkchoiceEvent(Hash.EMPTY, Hash.EMPTY, Hash.hash(Bytes.of(2))));
+
+      ethManager.processMessage(EthProtocol.ETH63, new DefaultMessage(workPeer, workPeerStatus));
+      assertThat(workPeer.isDisconnected()).isTrue();
+      assertThat(workPeer.getDisconnectReason()).isPresent();
+      assertThat(workPeer.getDisconnectReason())
+          .get()
+          .isEqualTo(DisconnectReason.SUBPROTOCOL_TRIGGERED);
+      assertThat(stakePeer.isDisconnected()).isFalse();
+    }
+  }
+
+  @Test
+  public void doNotDisconnectOnLargeMessageWithinLimits() {
+    try (final EthProtocolManager ethManager =
+        EthProtocolManagerTestUtil.create(
+            protocolSchedule,
+            blockchain,
+            () -> false,
+            protocolContext.getWorldStateArchive(),
+            transactionPool,
+            EthProtocolConfiguration.defaultConfig())) {
+      final MessageData messageData = mock(MessageData.class);
+      when(messageData.getSize()).thenReturn(EthProtocolConfiguration.DEFAULT_MAX_MESSAGE_SIZE);
+      when(messageData.getCode()).thenReturn(EthPV62.TRANSACTIONS);
+      final MockPeerConnection peer = setupPeer(ethManager, (cap, msg, conn) -> {});
+
+      ethManager.processMessage(EthProtocol.ETH63, new DefaultMessage(peer, messageData));
+      assertThat(peer.isDisconnected()).isFalse();
+    }
+  }
+
   @Test
   public void disconnectOnWrongGenesisHash() {
     try (final EthProtocolManager ethManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             () -> false,
             protocolContext.getWorldStateArchive(),
@@ -195,7 +301,7 @@ public void disconnectOnWrongGenesisHash() {
       // Send status message with wrong chain
       final StatusMessage statusMessage =
           StatusMessage.create(
-              EthProtocol.EthVersion.V63,
+              EthProtocolVersion.V63,
               BigInteger.ONE,
               blockchain.getChainHead().getTotalDifficulty(),
               gen.hash(),
@@ -207,10 +313,11 @@ public void disconnectOnWrongGenesisHash() {
     }
   }
 
-  @Test(expected = ConditionTimeoutException.class)
+  @Test
   public void doNotDisconnectOnValidMessage() {
     try (final EthProtocolManager ethManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             () -> false,
             protocolContext.getWorldStateArchive(),
@@ -220,10 +327,10 @@ public void doNotDisconnectOnValidMessage() {
           GetBlockBodiesMessage.create(Collections.singletonList(gen.hash()));
       final MockPeerConnection peer = setupPeer(ethManager, (cap, msg, conn) -> {});
       ethManager.processMessage(EthProtocol.ETH63, new DefaultMessage(peer, messageData));
-      Awaitility.await()
-          .catchUncaughtExceptions()
-          .atMost(200, TimeUnit.MILLISECONDS)
-          .until(peer::isDisconnected);
+      final ConditionFactory waitDisconnect =
+          Awaitility.await().catchUncaughtExceptions().atMost(200, TimeUnit.MILLISECONDS);
+      assertThatThrownBy(() -> waitDisconnect.until(peer::isDisconnected))
+          .isInstanceOf(ConditionTimeoutException.class);
     }
   }
 
@@ -232,6 +339,7 @@ public void respondToGetHeaders() throws ExecutionException, InterruptedExceptio
     final CompletableFuture<Void> done = new CompletableFuture<>();
     try (final EthProtocolManager ethManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             () -> false,
             protocolContext.getWorldStateArchive(),
@@ -251,7 +359,7 @@ public void respondToGetHeaders() throws ExecutionException, InterruptedExceptio
             final BlockHeadersMessage headersMsg = BlockHeadersMessage.readFrom(message);
             final List<BlockHeader> headers =
                 Lists.newArrayList(headersMsg.getHeaders(protocolSchedule));
-            assertThat(headers.size()).isEqualTo(blockCount);
+            assertThat(headers).hasSize(blockCount);
             for (int i = 0; i < blockCount; i++) {
               assertThat(headers.get(i).getNumber()).isEqualTo(startBlock + i);
             }
@@ -267,13 +375,16 @@ public void respondToGetHeaders() throws ExecutionException, InterruptedExceptio
   public void respondToGetHeadersWithinLimits() throws ExecutionException, InterruptedException {
     final CompletableFuture<Void> done = new CompletableFuture<>();
     final int limit = 5;
+    final EthProtocolConfiguration config =
+        EthProtocolConfiguration.builder().maxGetBlockHeaders(limit).build();
     try (final EthProtocolManager ethManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             () -> false,
             protocolContext.getWorldStateArchive(),
             transactionPool,
-            new EthProtocolConfiguration(limit, limit, limit, limit, limit, true, false))) {
+            config)) {
       final long startBlock = 5L;
       final int blockCount = 10;
       final MessageData messageData =
@@ -288,7 +399,7 @@ public void respondToGetHeadersWithinLimits() throws ExecutionException, Interru
             final BlockHeadersMessage headersMsg = BlockHeadersMessage.readFrom(message);
             final List<BlockHeader> headers =
                 Lists.newArrayList(headersMsg.getHeaders(protocolSchedule));
-            assertThat(headers.size()).isEqualTo(limit);
+            assertThat(headers).hasSize(limit);
             for (int i = 0; i < limit; i++) {
               assertThat(headers.get(i).getNumber()).isEqualTo(startBlock + i);
             }
@@ -305,6 +416,7 @@ public void respondToGetHeadersReversed() throws ExecutionException, Interrupted
     final CompletableFuture<Void> done = new CompletableFuture<>();
     try (final EthProtocolManager ethManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             () -> false,
             protocolContext.getWorldStateArchive(),
@@ -324,7 +436,7 @@ public void respondToGetHeadersReversed() throws ExecutionException, Interrupted
             final BlockHeadersMessage headersMsg = BlockHeadersMessage.readFrom(message);
             final List<BlockHeader> headers =
                 Lists.newArrayList(headersMsg.getHeaders(protocolSchedule));
-            assertThat(headers.size()).isEqualTo(blockCount);
+            assertThat(headers).hasSize(blockCount);
             for (int i = 0; i < blockCount; i++) {
               assertThat(headers.get(i).getNumber()).isEqualTo(endBlock - i);
             }
@@ -341,6 +453,7 @@ public void respondToGetHeadersWithSkip() throws ExecutionException, Interrupted
     final CompletableFuture<Void> done = new CompletableFuture<>();
     try (final EthProtocolManager ethManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             () -> false,
             protocolContext.getWorldStateArchive(),
@@ -362,7 +475,7 @@ public void respondToGetHeadersWithSkip() throws ExecutionException, Interrupted
             final BlockHeadersMessage headersMsg = BlockHeadersMessage.readFrom(message);
             final List<BlockHeader> headers =
                 Lists.newArrayList(headersMsg.getHeaders(protocolSchedule));
-            assertThat(headers.size()).isEqualTo(blockCount);
+            assertThat(headers).hasSize(blockCount);
             for (int i = 0; i < blockCount; i++) {
               assertThat(headers.get(i).getNumber()).isEqualTo(startBlock + i * (skip + 1));
             }
@@ -380,6 +493,7 @@ public void respondToGetHeadersReversedWithSkip()
     final CompletableFuture<Void> done = new CompletableFuture<>();
     try (final EthProtocolManager ethManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             () -> false,
             protocolContext.getWorldStateArchive(),
@@ -401,7 +515,7 @@ public void respondToGetHeadersReversedWithSkip()
             final BlockHeadersMessage headersMsg = BlockHeadersMessage.readFrom(message);
             final List<BlockHeader> headers =
                 Lists.newArrayList(headersMsg.getHeaders(protocolSchedule));
-            assertThat(headers.size()).isEqualTo(blockCount);
+            assertThat(headers).hasSize(blockCount);
             for (int i = 0; i < blockCount; i++) {
               assertThat(headers.get(i).getNumber()).isEqualTo(endBlock - i * (skip + 1));
             }
@@ -418,7 +532,7 @@ private MockPeerConnection setupPeer(
     final MockPeerConnection peer = setupPeerWithoutStatusExchange(ethManager, onSend);
     final StatusMessage statusMessage =
         StatusMessage.create(
-            EthProtocol.EthVersion.V63,
+            EthProtocolVersion.V63,
             BigInteger.ONE,
             blockchain.getChainHead().getTotalDifficulty(),
             blockchain.getChainHeadHash(),
@@ -440,6 +554,7 @@ public void respondToGetHeadersPartial() throws ExecutionException, InterruptedE
     final CompletableFuture<Void> done = new CompletableFuture<>();
     try (final EthProtocolManager ethManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             () -> false,
             protocolContext.getWorldStateArchive(),
@@ -460,7 +575,7 @@ public void respondToGetHeadersPartial() throws ExecutionException, InterruptedE
             final BlockHeadersMessage headersMsg = BlockHeadersMessage.readFrom(message);
             final List<BlockHeader> headers =
                 Lists.newArrayList(headersMsg.getHeaders(protocolSchedule));
-            assertThat(headers.size()).isEqualTo(2);
+            assertThat(headers).hasSize(2);
             for (int i = 0; i < 2; i++) {
               assertThat(headers.get(i).getNumber()).isEqualTo(startBlock + i);
             }
@@ -477,6 +592,7 @@ public void respondToGetHeadersEmpty() throws ExecutionException, InterruptedExc
     final CompletableFuture<Void> done = new CompletableFuture<>();
     try (final EthProtocolManager ethManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             () -> false,
             protocolContext.getWorldStateArchive(),
@@ -497,7 +613,7 @@ public void respondToGetHeadersEmpty() throws ExecutionException, InterruptedExc
             final BlockHeadersMessage headersMsg = BlockHeadersMessage.readFrom(message);
             final List<BlockHeader> headers =
                 Lists.newArrayList(headersMsg.getHeaders(protocolSchedule));
-            assertThat(headers.size()).isEqualTo(0);
+            assertThat(headers).isEmpty();
             done.complete(null);
           };
       final PeerConnection peer = setupPeer(ethManager, onSend);
@@ -511,6 +627,7 @@ public void respondToGetBodies() throws ExecutionException, InterruptedException
     final CompletableFuture<Void> done = new CompletableFuture<>();
     try (final EthProtocolManager ethManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             () -> false,
             protocolContext.getWorldStateArchive(),
@@ -541,7 +658,7 @@ public void respondToGetBodies() throws ExecutionException, InterruptedException
             final BlockBodiesMessage blocksMessage = BlockBodiesMessage.readFrom(message);
             final List<BlockBody> bodies =
                 Lists.newArrayList(blocksMessage.bodies(protocolSchedule));
-            assertThat(bodies.size()).isEqualTo(blockCount);
+            assertThat(bodies).hasSize(blockCount);
             for (int i = 0; i < blockCount; i++) {
               assertThat(expectedBlocks[i].getBody()).isEqualTo(bodies.get(i));
             }
@@ -559,13 +676,16 @@ public void respondToGetBodies() throws ExecutionException, InterruptedException
   public void respondToGetBodiesWithinLimits() throws ExecutionException, InterruptedException {
     final CompletableFuture<Void> done = new CompletableFuture<>();
     final int limit = 5;
+    final EthProtocolConfiguration config =
+        EthProtocolConfiguration.builder().maxGetBlockBodies(limit).build();
     try (final EthProtocolManager ethManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             () -> false,
             protocolContext.getWorldStateArchive(),
             transactionPool,
-            new EthProtocolConfiguration(limit, limit, limit, limit, limit, true, false))) {
+            config)) {
       // Setup blocks query
       final int blockCount = 10;
       final long startBlock = blockchain.getChainHeadBlockNumber() - blockCount;
@@ -590,7 +710,7 @@ public void respondToGetBodiesWithinLimits() throws ExecutionException, Interrup
             final BlockBodiesMessage blocksMessage = BlockBodiesMessage.readFrom(message);
             final List<BlockBody> bodies =
                 Lists.newArrayList(blocksMessage.bodies(protocolSchedule));
-            assertThat(bodies.size()).isEqualTo(limit);
+            assertThat(bodies).hasSize(limit);
             for (int i = 0; i < limit; i++) {
               assertThat(expectedBlocks[i].getBody()).isEqualTo(bodies.get(i));
             }
@@ -609,6 +729,7 @@ public void respondToGetBodiesPartial() throws ExecutionException, InterruptedEx
     final CompletableFuture<Void> done = new CompletableFuture<>();
     try (final EthProtocolManager ethManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             () -> false,
             protocolContext.getWorldStateArchive(),
@@ -634,7 +755,7 @@ public void respondToGetBodiesPartial() throws ExecutionException, InterruptedEx
             final BlockBodiesMessage blocksMessage = BlockBodiesMessage.readFrom(message);
             final List<BlockBody> bodies =
                 Lists.newArrayList(blocksMessage.bodies(protocolSchedule));
-            assertThat(bodies.size()).isEqualTo(1);
+            assertThat(bodies).hasSize(1);
             assertThat(expectedBlock.getBody()).isEqualTo(bodies.get(0));
             done.complete(null);
           };
@@ -651,6 +772,7 @@ public void respondToGetReceipts() throws ExecutionException, InterruptedExcepti
     final CompletableFuture<Void> done = new CompletableFuture<>();
     try (final EthProtocolManager ethManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             () -> false,
             protocolContext.getWorldStateArchive(),
@@ -679,7 +801,7 @@ public void respondToGetReceipts() throws ExecutionException, InterruptedExcepti
             final ReceiptsMessage receiptsMessage = ReceiptsMessage.readFrom(message);
             final List<List<TransactionReceipt>> receipts =
                 Lists.newArrayList(receiptsMessage.receipts());
-            assertThat(receipts.size()).isEqualTo(blockCount);
+            assertThat(receipts).hasSize(blockCount);
             for (int i = 0; i < blockCount; i++) {
               assertThat(expectedReceipts.get(i)).isEqualTo(receipts.get(i));
             }
@@ -697,13 +819,16 @@ public void respondToGetReceipts() throws ExecutionException, InterruptedExcepti
   public void respondToGetReceiptsWithinLimits() throws ExecutionException, InterruptedException {
     final CompletableFuture<Void> done = new CompletableFuture<>();
     final int limit = 5;
+    final EthProtocolConfiguration config =
+        EthProtocolConfiguration.builder().maxGetReceipts(limit).build();
     try (final EthProtocolManager ethManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             () -> false,
             protocolContext.getWorldStateArchive(),
             transactionPool,
-            new EthProtocolConfiguration(limit, limit, limit, limit, limit, true, false))) {
+            config)) {
       // Setup blocks query
       final int blockCount = 10;
       final long startBlock = blockchain.getChainHeadBlockNumber() - blockCount;
@@ -727,7 +852,7 @@ public void respondToGetReceiptsWithinLimits() throws ExecutionException, Interr
             final ReceiptsMessage receiptsMessage = ReceiptsMessage.readFrom(message);
             final List<List<TransactionReceipt>> receipts =
                 Lists.newArrayList(receiptsMessage.receipts());
-            assertThat(receipts.size()).isEqualTo(limit);
+            assertThat(receipts).hasSize(limit);
             for (int i = 0; i < limit; i++) {
               assertThat(expectedReceipts.get(i)).isEqualTo(receipts.get(i));
             }
@@ -746,6 +871,7 @@ public void respondToGetReceiptsPartial() throws ExecutionException, Interrupted
     final CompletableFuture<Void> done = new CompletableFuture<>();
     try (final EthProtocolManager ethManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             () -> false,
             protocolContext.getWorldStateArchive(),
@@ -771,7 +897,7 @@ public void respondToGetReceiptsPartial() throws ExecutionException, Interrupted
             final ReceiptsMessage receiptsMessage = ReceiptsMessage.readFrom(message);
             final List<List<TransactionReceipt>> receipts =
                 Lists.newArrayList(receiptsMessage.receipts());
-            assertThat(receipts.size()).isEqualTo(1);
+            assertThat(receipts).hasSize(1);
             assertThat(expectedReceipts).isEqualTo(receipts.get(0));
             done.complete(null);
           };
@@ -790,6 +916,7 @@ public void respondToGetNodeData() throws Exception {
 
     try (final EthProtocolManager ethManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             () -> false,
             protocolContext.getWorldStateArchive(),
@@ -819,7 +946,7 @@ public void respondToGetNodeData() throws Exception {
             assertThat(message.getCode()).isEqualTo(EthPV63.NODE_DATA);
             final NodeDataMessage receiptsMessage = NodeDataMessage.readFrom(message);
             final List<Bytes> nodeData = receiptsMessage.nodeData();
-            assertThat(nodeData.size()).isEqualTo(blockCount);
+            assertThat(nodeData).hasSize(blockCount);
             for (int i = 0; i < blockCount; i++) {
               assertThat(expectedResults.get(i)).isEqualTo(nodeData.get(i));
             }
@@ -837,6 +964,7 @@ public void respondToGetNodeData() throws Exception {
   public void newBlockMinedSendsNewBlockMessageToAllPeers() {
     try (final EthProtocolManager ethManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             () -> false,
             protocolContext.getWorldStateArchive(),
@@ -886,7 +1014,7 @@ public void newBlockMinedSendsNewBlockMessageToAllPeers() {
         assertThat(msg.totalDifficulty(protocolSchdeule)).isEqualTo(expectedTotalDifficulty);
       }
 
-      assertThat(receivingPeerCaptor.getAllValues().containsAll(peers)).isTrue();
+      assertThat(receivingPeerCaptor.getAllValues()).containsAll(peers);
     }
   }
 
@@ -907,6 +1035,7 @@ public void shouldSuccessfullyRespondToGetHeadersRequestLessThanZero()
     final CompletableFuture<Void> done = new CompletableFuture<>();
     try (final EthProtocolManager ethManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             () -> false,
             protocolContext.getWorldStateArchive(),
@@ -928,7 +1057,7 @@ public void shouldSuccessfullyRespondToGetHeadersRequestLessThanZero()
             final BlockHeadersMessage headersMsg = BlockHeadersMessage.readFrom(message);
             final List<BlockHeader> headers =
                 Lists.newArrayList(headersMsg.getHeaders(protocolSchedule));
-            assertThat(headers.size()).isEqualTo(receivedBlockCount);
+            assertThat(headers).hasSize(receivedBlockCount);
             for (int i = 0; i < receivedBlockCount; i++) {
               assertThat(headers.get(i).getNumber()).isEqualTo(receivedBlockCount - 1 - i);
             }
@@ -940,7 +1069,7 @@ public void shouldSuccessfullyRespondToGetHeadersRequestLessThanZero()
       ethManager.handleNewConnection(peer);
       final StatusMessage statusMessage =
           StatusMessage.create(
-              EthProtocol.EthVersion.V63,
+              EthProtocolVersion.V63,
               BigInteger.ONE,
               blockchain.getChainHead().getTotalDifficulty(),
               blockchain.getChainHeadHash(),
@@ -972,6 +1101,7 @@ public void transactionMessagesGoToTheCorrectExecutor() {
 
     try (final EthProtocolManager ethManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             ethScheduler,
             protocolContext.getWorldStateArchive(),
@@ -980,25 +1110,130 @@ public void transactionMessagesGoToTheCorrectExecutor() {
       // Create a transaction pool.  This has a side effect of registering a listener for the
       // transactions message.
       TransactionPoolFactory.createTransactionPool(
-          protocolSchedule,
-          protocolContext,
-          ethManager.ethContext(),
-          TestClock.fixed(),
-          metricsSystem,
-          mock(SyncState.class),
-          Wei.ZERO,
-          TransactionPoolConfiguration.DEFAULT,
-          true,
-          Optional.empty());
+              protocolSchedule,
+              protocolContext,
+              ethManager.ethContext(),
+              TestClock.system(ZoneId.systemDefault()),
+              metricsSystem,
+              new SyncState(blockchain, ethManager.ethContext().getEthPeers()),
+              new MiningParameters.Builder().minTransactionGasPrice(Wei.ZERO).build(),
+              TransactionPoolConfiguration.DEFAULT)
+          .setEnabled();
 
       // Send just a transaction message.
       final PeerConnection peer = setupPeer(ethManager, (cap, msg, connection) -> {});
       ethManager.processMessage(EthProtocol.ETH63, new DefaultMessage(peer, transactionMessage));
 
       // Verify the regular message executor and scheduled executor got nothing to execute.
-      verifyZeroInteractions(worker, scheduled);
+      verifyNoInteractions(worker, scheduled);
       // Verify our transactions executor got something to execute.
       verify(transactions).execute(any());
     }
   }
+
+  @Test
+  public void forkIdForChainHeadMayBeNull() {
+    final EthScheduler ethScheduler = mock(EthScheduler.class);
+    try (final EthProtocolManager ethManager =
+        EthProtocolManagerTestUtil.create(
+            protocolSchedule,
+            blockchain,
+            ethScheduler,
+            protocolContext.getWorldStateArchive(),
+            transactionPool,
+            EthProtocolConfiguration.defaultConfig(),
+            new ForkIdManager(
+                blockchain, Collections.emptyList(), Collections.emptyList(), true))) {
+
+      assertThat(ethManager.getForkIdAsBytesList()).isEmpty();
+    }
+  }
+
+  @Test
+  public void shouldUseRightCapabilityDependingOnSyncMode() {
+    assertHighestCapability(SyncMode.X_SNAP, EthProtocol.ETH68);
+    assertHighestCapability(SyncMode.FULL, EthProtocol.ETH68);
+    assertHighestCapability(SyncMode.X_CHECKPOINT, EthProtocol.ETH68);
+    /* Eth67 does not support fast sync, see EIP-4938 */
+    assertHighestCapability(SyncMode.FAST, EthProtocol.ETH66);
+  }
+
+  @Test
+  public void shouldRespectFlagForMaxCapability() {
+
+    // Test with max capability = 65. should respect flag
+    final EthProtocolConfiguration configuration =
+        EthProtocolConfiguration.builder().maxEthCapability(EthProtocolVersion.V65).build();
+
+    assertHighestCapability(SyncMode.X_SNAP, EthProtocol.ETH65, configuration);
+    assertHighestCapability(SyncMode.FULL, EthProtocol.ETH65, configuration);
+    assertHighestCapability(SyncMode.X_CHECKPOINT, EthProtocol.ETH65, configuration);
+    /* Eth67 does not support fast sync, see EIP-4938 */
+    assertHighestCapability(SyncMode.FAST, EthProtocol.ETH65, configuration);
+  }
+
+  @Test
+  public void shouldRespectFlagForMinCapability() {
+
+    // If min cap = v64, should not contain v63
+    final EthProtocolConfiguration configuration =
+        EthProtocolConfiguration.builder().minEthCapability(EthProtocolVersion.V64).build();
+
+    final EthProtocolManager ethManager = createEthManager(SyncMode.X_SNAP, configuration);
+
+    assertThat(ethManager.getSupportedCapabilities()).contains(EthProtocol.ETH64);
+    assertThat(ethManager.getSupportedCapabilities()).doesNotContain(EthProtocol.ETH63);
+  }
+
+  @Test
+  public void shouldRespectProtocolForMaxCapabilityIfFlagGreaterThanProtocol() {
+
+    // Test with max capability = 67. should respect protocol
+    final EthProtocolConfiguration configuration =
+        EthProtocolConfiguration.builder().maxEthCapability(EthProtocolVersion.V67).build();
+
+    assertHighestCapability(SyncMode.X_SNAP, EthProtocol.ETH67, configuration);
+    assertHighestCapability(SyncMode.FULL, EthProtocol.ETH67, configuration);
+    assertHighestCapability(SyncMode.X_CHECKPOINT, EthProtocol.ETH67, configuration);
+    /* Eth67 does not support fast sync, see EIP-4938 */
+    assertHighestCapability(SyncMode.FAST, EthProtocol.ETH66, configuration);
+  }
+
+  private void assertHighestCapability(final SyncMode syncMode, final Capability capability) {
+    assertHighestCapability(syncMode, capability, EthProtocolConfiguration.defaultConfig());
+  }
+
+  private void assertHighestCapability(
+      final SyncMode syncMode,
+      final Capability capability,
+      final EthProtocolConfiguration ethProtocolConfiguration) {
+
+    final EthProtocolManager ethManager = createEthManager(syncMode, ethProtocolConfiguration);
+
+    assertThat(capability.getVersion()).isEqualTo(ethManager.getHighestProtocolVersion());
+  }
+
+  private EthProtocolManager createEthManager(
+      final SyncMode syncMode, final EthProtocolConfiguration ethProtocolConfiguration) {
+    final SynchronizerConfiguration syncConfig = mock(SynchronizerConfiguration.class);
+    when(syncConfig.getSyncMode()).thenReturn(syncMode);
+    try (final EthProtocolManager ethManager =
+        new EthProtocolManager(
+            blockchain,
+            BigInteger.ONE,
+            mock(WorldStateArchive.class),
+            transactionPool,
+            ethProtocolConfiguration,
+            mock(EthPeers.class),
+            mock(EthMessages.class),
+            mock(EthContext.class),
+            Collections.emptyList(),
+            Optional.empty(),
+            syncConfig,
+            mock(EthScheduler.class),
+            mock(ForkIdManager.class))) {
+
+      return ethManager;
+    }
+  }
 }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManagerTestUtil.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManagerTestUtil.java
index eaa4a945c41..8bfb9db92e4 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManagerTestUtil.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthProtocolManagerTestUtil.java
@@ -15,7 +15,7 @@
 package org.hyperledger.besu.ethereum.eth.manager;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
 import static org.mockito.Mockito.mock;
 
 import org.hyperledger.besu.config.GenesisConfigFile;
@@ -28,28 +28,37 @@
 import org.hyperledger.besu.ethereum.eth.EthProtocol;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
 import org.hyperledger.besu.ethereum.eth.manager.DeterministicEthScheduler.TimeoutPolicy;
+import org.hyperledger.besu.ethereum.eth.manager.snap.SnapProtocolManager;
 import org.hyperledger.besu.ethereum.eth.peervalidation.PeerValidator;
+import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.forkid.ForkIdManager;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.DefaultMessage;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.testutil.TestClock;
 
 import java.math.BigInteger;
 import java.util.Collections;
+import java.util.Optional;
 import java.util.OptionalLong;
 
+import org.apache.tuweni.bytes.Bytes;
+
 public class EthProtocolManagerTestUtil {
 
   public static EthProtocolManager create(
+      final ProtocolSchedule protocolSchedule,
       final Blockchain blockchain,
       final TimeoutPolicy timeoutPolicy,
       final WorldStateArchive worldStateArchive,
       final TransactionPool transactionPool,
       final EthProtocolConfiguration ethereumWireProtocolConfiguration) {
     return create(
+        protocolSchedule,
         blockchain,
         new DeterministicEthScheduler(timeoutPolicy),
         worldStateArchive,
@@ -57,6 +66,47 @@ public static EthProtocolManager create(
         ethereumWireProtocolConfiguration);
   }
 
+  public static EthProtocolManager create(
+      final ProtocolSchedule protocolSchedule,
+      final Blockchain blockchain,
+      final WorldStateArchive worldStateArchive,
+      final TransactionPool transactionPool,
+      final EthProtocolConfiguration ethereumWireProtocolConfiguration,
+      final Optional<MergePeerFilter> mergePeerFilter) {
+
+    final EthPeers peers =
+        new EthPeers(
+            EthProtocol.NAME,
+            () -> protocolSchedule.getByBlockHeader(blockchain.getChainHeadHeader()),
+            TestClock.fixed(),
+            new NoOpMetricsSystem(),
+            EthProtocolConfiguration.DEFAULT_MAX_MESSAGE_SIZE,
+            Collections.emptyList(),
+            Bytes.random(64),
+            25,
+            25,
+            25,
+            false);
+    final EthMessages messages = new EthMessages();
+    final EthScheduler ethScheduler = new DeterministicEthScheduler(TimeoutPolicy.NEVER_TIMEOUT);
+    final EthContext ethContext = new EthContext(peers, messages, ethScheduler);
+
+    return new EthProtocolManager(
+        blockchain,
+        BigInteger.ONE,
+        worldStateArchive,
+        transactionPool,
+        ethereumWireProtocolConfiguration,
+        peers,
+        messages,
+        ethContext,
+        Collections.emptyList(),
+        mergePeerFilter,
+        mock(SynchronizerConfiguration.class),
+        ethScheduler,
+        new ForkIdManager(blockchain, Collections.emptyList(), Collections.emptyList(), false));
+  }
+
   public static EthProtocolManager create(
       final Blockchain blockchain,
       final EthScheduler ethScheduler,
@@ -66,6 +116,29 @@ public static EthProtocolManager create(
       final EthPeers ethPeers,
       final EthMessages ethMessages,
       final EthContext ethContext) {
+    return create(
+        blockchain,
+        ethScheduler,
+        worldStateArchive,
+        transactionPool,
+        ethereumWireProtocolConfiguration,
+        ethPeers,
+        ethMessages,
+        ethContext,
+        new ForkIdManager(blockchain, Collections.emptyList(), Collections.emptyList(), false));
+  }
+
+  public static EthProtocolManager create(
+      final Blockchain blockchain,
+      final EthScheduler ethScheduler,
+      final WorldStateArchive worldStateArchive,
+      final TransactionPool transactionPool,
+      final EthProtocolConfiguration ethereumWireProtocolConfiguration,
+      final EthPeers ethPeers,
+      final EthMessages ethMessages,
+      final EthContext ethContext,
+      final ForkIdManager forkIdManager) {
+
     final BigInteger networkId = BigInteger.ONE;
     return new EthProtocolManager(
         blockchain,
@@ -77,21 +150,27 @@ public static EthProtocolManager create(
         ethMessages,
         ethContext,
         Collections.emptyList(),
-        false,
+        Optional.empty(),
+        mock(SynchronizerConfiguration.class),
         ethScheduler,
-        new ForkIdManager(blockchain, Collections.emptyList(), false));
+        forkIdManager);
   }
 
   public static EthProtocolManager create(final Blockchain blockchain) {
-    return create(blockchain, new DeterministicEthScheduler(TimeoutPolicy.NEVER_TIMEOUT));
+    return create(
+        ProtocolScheduleFixture.MAINNET,
+        blockchain,
+        new DeterministicEthScheduler(TimeoutPolicy.NEVER_TIMEOUT));
   }
 
   public static EthProtocolManager create(
+      final ProtocolSchedule protocolSchedule,
       final Blockchain blockchain,
       final WorldStateArchive worldStateArchive,
       final TransactionPool transactionPool,
       final EthProtocolConfiguration ethProtocolConfiguration) {
     return create(
+        protocolSchedule,
         blockchain,
         new DeterministicEthScheduler(TimeoutPolicy.NEVER_TIMEOUT),
         worldStateArchive,
@@ -104,17 +183,31 @@ public static EthProtocolManager create(final EthScheduler ethScheduler) {
     final GenesisConfigFile config = GenesisConfigFile.mainnet();
     final GenesisState genesisState = GenesisState.fromConfig(config, protocolSchedule);
     final Blockchain blockchain = createInMemoryBlockchain(genesisState.getBlock());
-    return create(blockchain, ethScheduler);
+    return create(protocolSchedule, blockchain, ethScheduler);
   }
 
   public static EthProtocolManager create(
+      final ProtocolSchedule protocolSchedule,
       final Blockchain blockchain,
       final EthScheduler ethScheduler,
       final WorldStateArchive worldStateArchive,
       final TransactionPool transactionPool,
       final EthProtocolConfiguration configuration) {
-    EthPeers peers = new EthPeers(EthProtocol.NAME, TestClock.fixed(), new NoOpMetricsSystem());
-    EthMessages messages = new EthMessages();
+
+    final EthPeers peers =
+        new EthPeers(
+            EthProtocol.NAME,
+            () -> protocolSchedule.getByBlockHeader(blockchain.getChainHeadHeader()),
+            TestClock.fixed(),
+            new NoOpMetricsSystem(),
+            EthProtocolConfiguration.DEFAULT_MAX_MESSAGE_SIZE,
+            Collections.emptyList(),
+            Bytes.random(64),
+            25,
+            25,
+            25,
+            false);
+    final EthMessages messages = new EthMessages();
 
     return create(
         blockchain,
@@ -128,14 +221,64 @@ public static EthProtocolManager create(
   }
 
   public static EthProtocolManager create(
-      final Blockchain blockchain, final EthScheduler ethScheduler) {
-    EthPeers peers = new EthPeers(EthProtocol.NAME, TestClock.fixed(), new NoOpMetricsSystem());
-    EthMessages messages = new EthMessages();
+      final ProtocolSchedule protocolSchedule,
+      final Blockchain blockchain,
+      final EthScheduler ethScheduler,
+      final WorldStateArchive worldStateArchive,
+      final TransactionPool transactionPool,
+      final EthProtocolConfiguration configuration,
+      final ForkIdManager forkIdManager) {
+
+    final EthPeers peers =
+        new EthPeers(
+            EthProtocol.NAME,
+            () -> protocolSchedule.getByBlockHeader(blockchain.getChainHeadHeader()),
+            TestClock.fixed(),
+            new NoOpMetricsSystem(),
+            EthProtocolConfiguration.DEFAULT_MAX_MESSAGE_SIZE,
+            Collections.emptyList(),
+            Bytes.random(64),
+            25,
+            25,
+            25,
+            false);
+    final EthMessages messages = new EthMessages();
 
     return create(
         blockchain,
         ethScheduler,
-        BlockchainSetupUtil.forTesting().getWorldArchive(),
+        worldStateArchive,
+        transactionPool,
+        configuration,
+        peers,
+        messages,
+        new EthContext(peers, messages, ethScheduler),
+        forkIdManager);
+  }
+
+  public static EthProtocolManager create(
+      final ProtocolSchedule protocolSchedule,
+      final Blockchain blockchain,
+      final EthScheduler ethScheduler) {
+    final EthPeers peers =
+        new EthPeers(
+            EthProtocol.NAME,
+            () -> protocolSchedule.getByBlockHeader(blockchain.getChainHeadHeader()),
+            TestClock.fixed(),
+            new NoOpMetricsSystem(),
+            EthProtocolConfiguration.DEFAULT_MAX_MESSAGE_SIZE,
+            Collections.emptyList(),
+            Bytes.random(64),
+            25,
+            25,
+            25,
+            false);
+    final EthMessages messages = new EthMessages();
+
+    return create(
+        blockchain,
+        ethScheduler,
+        BlockchainSetupUtil.forTesting(DataStorageFormat.FOREST).getWorldArchive(),
         mock(TransactionPool.class),
         EthProtocolConfiguration.defaultConfig(),
         peers,
@@ -274,6 +417,17 @@ public static RespondingEthPeer createPeer(
         .build();
   }
 
+  public static RespondingEthPeer createPeer(
+      final EthProtocolManager ethProtocolManager,
+      final SnapProtocolManager snapProtocolManager,
+      final long estimatedHeight) {
+    return RespondingEthPeer.builder()
+        .ethProtocolManager(ethProtocolManager)
+        .estimatedHeight(estimatedHeight)
+        .snapProtocolManager(snapProtocolManager)
+        .build();
+  }
+
   public static RespondingEthPeer createPeer(
       final EthProtocolManager ethProtocolManager,
       final long estimatedHeight,
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthServerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthServerTest.java
index bd7c2f87eeb..4a4aeac2eb3 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthServerTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/EthServerTest.java
@@ -14,87 +14,393 @@
  */
 package org.hyperledger.besu.ethereum.eth.manager;
 
-import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
+import org.hyperledger.besu.ethereum.eth.messages.BlockBodiesMessage;
+import org.hyperledger.besu.ethereum.eth.messages.BlockHeadersMessage;
+import org.hyperledger.besu.ethereum.eth.messages.GetBlockBodiesMessage;
+import org.hyperledger.besu.ethereum.eth.messages.GetBlockHeadersMessage;
 import org.hyperledger.besu.ethereum.eth.messages.GetNodeDataMessage;
+import org.hyperledger.besu.ethereum.eth.messages.GetPooledTransactionsMessage;
+import org.hyperledger.besu.ethereum.eth.messages.GetReceiptsMessage;
 import org.hyperledger.besu.ethereum.eth.messages.NodeDataMessage;
+import org.hyperledger.besu.ethereum.eth.messages.PooledTransactionsMessage;
+import org.hyperledger.besu.ethereum.eth.messages.ReceiptsMessage;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
 import org.junit.Test;
 
 public class EthServerTest {
 
-  private static final Bytes VALUE1 = Bytes.of(1);
-  private static final Bytes VALUE2 = Bytes.of(2);
-  private static final Bytes VALUE3 = Bytes.of(3);
-  private static final Hash HASH1 = Hash.hash(VALUE1);
-  private static final Hash HASH2 = Hash.hash(VALUE2);
-  private static final Hash HASH3 = Hash.hash(VALUE3);
+  private final BlockDataGenerator dataGenerator = new BlockDataGenerator(0);
   private final Blockchain blockchain = mock(Blockchain.class);
   private final WorldStateArchive worldStateArchive = mock(WorldStateArchive.class);
   private final TransactionPool transactionPool = mock(TransactionPool.class);
   private final EthPeer ethPeer = mock(EthPeer.class);
   private final EthMessages ethMessages = new EthMessages();
 
-  @Before
-  public void setUp() {
-    new EthServer(
-        blockchain,
-        worldStateArchive,
-        transactionPool,
-        ethMessages,
-        new EthProtocolConfiguration(2, 2, 2, 2, 2, true, false));
+  @Test
+  public void shouldHandleDataBeingUnavailableWhenRespondingToNodeDataRequests() {
+    final Map<Hash, Bytes> nodeData = setupNodeData(1);
+    setupEthServer();
+
+    final List<Hash> hashes = new ArrayList<>(nodeData.keySet());
+    hashes.add(dataGenerator.hash()); // Add unknown hash
+    final List<Bytes> expectedResult = new ArrayList<>(nodeData.values());
+
+    assertThat(ethMessages.dispatch(new EthMessage(ethPeer, GetNodeDataMessage.create(hashes))))
+        .contains(NodeDataMessage.create(expectedResult));
+  }
+
+  @Test
+  public void shouldLimitNumberOfResponsesToNodeDataRequests() {
+    final int limit = 2;
+    final Map<Hash, Bytes> nodeData = setupNodeData(3);
+    setupEthServer(b -> b.maxGetNodeData(limit));
+
+    final List<Hash> hashes = new ArrayList<>(nodeData.keySet());
+    final List<Bytes> expectedResult =
+        hashes.stream().limit(limit).map(nodeData::get).collect(Collectors.toList());
+
+    assertThat(ethMessages.dispatch(new EthMessage(ethPeer, GetNodeDataMessage.create(hashes))))
+        .contains(NodeDataMessage.create(expectedResult));
+  }
+
+  @Test
+  public void shouldLimitTheNumberOfNodeDataResponsesLookedUpNotTheNumberReturned() {
+    final Map<Hash, Bytes> nodeData = setupNodeData(2);
+    setupEthServer(b -> b.maxGetNodeData(2));
+
+    final List<Hash> knownHashes = new ArrayList<>(nodeData.keySet());
+    final List<Hash> hashes =
+        List.of(
+            knownHashes.get(0),
+            dataGenerator.hash(), // Insert a hash that will return an empty response
+            knownHashes.get(1));
+    final List<Bytes> expectedResult = singletonList(nodeData.get(knownHashes.get(0)));
+
+    assertThat(ethMessages.dispatch(new EthMessage(ethPeer, GetNodeDataMessage.create(hashes))))
+        .contains(NodeDataMessage.create(expectedResult));
+  }
+
+  @Test
+  public void shouldLimitNodeDataByMessageSize() {
+    final Map<Hash, Bytes> nodeData = setupNodeData(10);
+    final List<Hash> hashes = new ArrayList<>(nodeData.keySet());
+    int sizeLimit = RLP.MAX_PREFIX_SIZE;
+    final List<Bytes> expectedResult = new ArrayList<>();
+    for (int i = 0; i < 4; i++) {
+      final Bytes data = nodeData.get(hashes.get(i));
+      expectedResult.add(data);
+      sizeLimit += calculateRlpEncodedSize(data);
+    }
+
+    final int messageSizeLimit = sizeLimit;
+    setupEthServer(b -> b.maxMessageSize(messageSizeLimit));
+
+    assertThat(ethMessages.dispatch(new EthMessage(ethPeer, GetNodeDataMessage.create(hashes))))
+        .contains(NodeDataMessage.create(expectedResult));
+  }
+
+  @Test
+  public void shouldLimitBlockHeadersByMessageSize() {
+    final List<Block> blocks = setupBlocks(10);
+    final List<BlockHeader> expectedHeaders = new ArrayList<>();
+    int sizeLimit = RLP.MAX_PREFIX_SIZE;
+    for (int i = 0; i < 4; i++) {
+      final BlockHeader header = blocks.get(i).getHeader();
+      sizeLimit += calculateRlpEncodedSize(header);
+      expectedHeaders.add(header);
+    }
+
+    final int msgSizeLimit = sizeLimit;
+    setupEthServer(b -> b.maxMessageSize(msgSizeLimit));
+
+    // Request all blocks, which will exceed the limit
+    final BlockHeader firstHeader = blocks.get(0).getHeader();
+    final GetBlockHeadersMessage headersMsg =
+        GetBlockHeadersMessage.create(firstHeader.getHash(), blocks.size(), 0, false);
+    final EthMessage ethMsg = new EthMessage(ethPeer, headersMsg);
+
+    // Check response
+    final BlockHeadersMessage expectedMsg = BlockHeadersMessage.create(expectedHeaders);
+    final Optional<MessageData> result = ethMessages.dispatch(ethMsg);
+    assertThat(result).contains(expectedMsg);
+  }
+
+  @Test
+  public void shouldLimitBlockHeadersByCount() {
+    final int blockCount = 10;
+    final int limit = 6;
+    final List<Block> blocks = setupBlocks(blockCount);
+    final List<BlockHeader> expectedHeaders =
+        blocks.stream().limit(limit).map(Block::getHeader).collect(Collectors.toList());
+
+    setupEthServer(b -> b.maxGetBlockHeaders(limit));
+
+    // Request all blocks, which will exceed the limit
+    final BlockHeader firstHeader = blocks.get(0).getHeader();
+    final GetBlockHeadersMessage headersMsg =
+        GetBlockHeadersMessage.create(firstHeader.getHash(), blocks.size(), 0, false);
+    final EthMessage ethMsg = new EthMessage(ethPeer, headersMsg);
+
+    // Check response
+    final BlockHeadersMessage expectedMsg = BlockHeadersMessage.create(expectedHeaders);
+    final Optional<MessageData> result = ethMessages.dispatch(ethMsg);
+    assertThat(result).contains(expectedMsg);
+  }
+
+  @Test
+  public void shouldLimitBlockBodiesByMessageSize() {
+    final List<Block> blocks = setupBlocks(10);
+    final List<BlockBody> expectedBodies = new ArrayList<>();
+    int sizeLimit = RLP.MAX_PREFIX_SIZE;
+    for (int i = 0; i < 4; i++) {
+      final BlockBody body = blocks.get(i).getBody();
+      sizeLimit += calculateRlpEncodedSize(body);
+      expectedBodies.add(body);
+    }
+
+    final int msgSizeLimit = sizeLimit;
+    setupEthServer(b -> b.maxMessageSize(msgSizeLimit));
+
+    // Request all blocks, which will exceed the limit
+    final List<Hash> blockHashes = blocks.stream().map(Block::getHash).collect(Collectors.toList());
+    final GetBlockBodiesMessage bodiesMsg = GetBlockBodiesMessage.create(blockHashes);
+    final EthMessage ethMsg = new EthMessage(ethPeer, bodiesMsg);
+
+    // Check response
+    final BlockBodiesMessage expectedMsg = BlockBodiesMessage.create(expectedBodies);
+    final Optional<MessageData> result = ethMessages.dispatch(ethMsg);
+    assertThat(result).contains(expectedMsg);
+  }
+
+  @Test
+  public void shouldLimitBlockBodiesByCount() {
+    final int blockCount = 10;
+    final int limit = 6;
+    final List<Block> blocks = setupBlocks(blockCount);
+    final List<BlockBody> expectedBodies =
+        blocks.stream().limit(limit).map(Block::getBody).collect(Collectors.toList());
+
+    setupEthServer(b -> b.maxGetBlockBodies(limit));
+
+    // Request all blocks, which will exceed the limit
+    final List<Hash> blockHashes = blocks.stream().map(Block::getHash).collect(Collectors.toList());
+    final GetBlockBodiesMessage bodiesMsg = GetBlockBodiesMessage.create(blockHashes);
+    final EthMessage ethMsg = new EthMessage(ethPeer, bodiesMsg);
+
+    // Check response
+    final BlockBodiesMessage expectedMsg = BlockBodiesMessage.create(expectedBodies);
+    final Optional<MessageData> result = ethMessages.dispatch(ethMsg);
+    assertThat(result).contains(expectedMsg);
   }
 
   @Test
-  public void shouldRespondToNodeDataRequests() throws Exception {
-    when(worldStateArchive.getNodeData(HASH1)).thenReturn(Optional.of(VALUE1));
-    when(worldStateArchive.getNodeData(HASH2)).thenReturn(Optional.of(VALUE2));
-    ethMessages.dispatch(new EthMessage(ethPeer, GetNodeDataMessage.create(asList(HASH1, HASH2))));
+  public void shouldLimitTxReceiptsByMessageSize() {
+    final Map<Hash, List<TransactionReceipt>> receiptsByHash = setupBlockReceipts(10);
+    final List<Hash> hashes = new ArrayList<>(receiptsByHash.keySet());
+    final List<List<TransactionReceipt>> expectedResults = new ArrayList<>();
+    int sizeLimit = RLP.MAX_PREFIX_SIZE;
+    for (int i = 0; i < 4; i++) {
+      final List<TransactionReceipt> receipts = receiptsByHash.get(hashes.get(i));
+      sizeLimit += calculateRlpEncodedSize(receipts);
+      expectedResults.add(receipts);
+    }
+
+    final int msgSizeLimit = sizeLimit;
+    setupEthServer(b -> b.maxMessageSize(msgSizeLimit));
 
-    verify(ethPeer).send(NodeDataMessage.create(asList(VALUE1, VALUE2)));
+    // Request all records, which will exceed the limit
+    final GetReceiptsMessage bodiesMsg = GetReceiptsMessage.create(hashes);
+    final EthMessage ethMsg = new EthMessage(ethPeer, bodiesMsg);
+
+    // Check response
+    final ReceiptsMessage expectedMsg = ReceiptsMessage.create(expectedResults);
+    final Optional<MessageData> result = ethMessages.dispatch(ethMsg);
+    assertThat(result).contains(expectedMsg);
   }
 
   @Test
-  public void shouldHandleDataBeingUnavailableWhenRespondingToNodeDataRequests() throws Exception {
-    when(worldStateArchive.getNodeData(HASH1)).thenReturn(Optional.of(VALUE1));
-    when(worldStateArchive.getNodeData(HASH2)).thenReturn(Optional.empty());
-    ethMessages.dispatch(new EthMessage(ethPeer, GetNodeDataMessage.create(asList(HASH1, HASH2))));
+  public void shouldLimitTxReceiptsByCount() {
+    final int limit = 6;
+    final Map<Hash, List<TransactionReceipt>> receiptsByHash = setupBlockReceipts(10);
+    final List<Hash> hashes = new ArrayList<>(receiptsByHash.keySet());
+    final List<List<TransactionReceipt>> expectedResults =
+        receiptsByHash.values().stream().limit(limit).collect(Collectors.toList());
+
+    setupEthServer(b -> b.maxGetReceipts(limit));
 
-    verify(ethPeer).send(NodeDataMessage.create(singletonList(VALUE1)));
+    // Request all records, which will exceed the limit
+    final GetReceiptsMessage bodiesMsg = GetReceiptsMessage.create(hashes);
+    final EthMessage ethMsg = new EthMessage(ethPeer, bodiesMsg);
+
+    // Check response
+    final ReceiptsMessage expectedMsg = ReceiptsMessage.create(expectedResults);
+    final Optional<MessageData> result = ethMessages.dispatch(ethMsg);
+    assertThat(result).contains(expectedMsg);
   }
 
   @Test
-  public void shouldLimitNumberOfResponsesToNodeDataRequests() throws Exception {
-    when(worldStateArchive.getNodeData(HASH1)).thenReturn(Optional.of(VALUE1));
-    when(worldStateArchive.getNodeData(HASH2)).thenReturn(Optional.of(VALUE2));
-    ethMessages.dispatch(
-        new EthMessage(ethPeer, GetNodeDataMessage.create(asList(HASH1, HASH2, HASH3))));
+  public void shouldLimitTransactionsByMessageSize() {
+    final List<Transaction> transactions = setupTransactions(10);
+    final List<Transaction> expectedResult = new ArrayList<>();
+    int sizeLimit = RLP.MAX_PREFIX_SIZE;
+    for (int i = 0; i < 4; i++) {
+      final Transaction tx = transactions.get(i);
+      sizeLimit += calculateRlpEncodedSize(tx);
+      expectedResult.add(tx);
+    }
+
+    final int msgSizeLimit = sizeLimit;
+    setupEthServer(b -> b.maxMessageSize(msgSizeLimit));
+
+    // Request all hashes, which will exceed the limit
+    final List<Hash> hashes =
+        transactions.stream().map(Transaction::getHash).collect(Collectors.toList());
+    final GetPooledTransactionsMessage msgData = GetPooledTransactionsMessage.create(hashes);
+    final EthMessage ethMsg = new EthMessage(ethPeer, msgData);
 
-    verify(ethPeer).send(NodeDataMessage.create(asList(VALUE1, VALUE2)));
+    // Check response
+    final PooledTransactionsMessage expectedMsg = PooledTransactionsMessage.create(expectedResult);
+    final Optional<MessageData> result = ethMessages.dispatch(ethMsg);
+    assertThat(result).contains(expectedMsg);
   }
 
   @Test
-  public void shouldLimitTheNumberOfNodeDataResponsesLookedUpNotTheNumberReturned()
-      throws Exception {
-    when(worldStateArchive.getNodeData(HASH1)).thenReturn(Optional.of(VALUE1));
-    when(worldStateArchive.getNodeData(HASH2)).thenReturn(Optional.empty());
-    when(worldStateArchive.getNodeData(HASH3)).thenReturn(Optional.of(VALUE3));
-    ethMessages.dispatch(
-        new EthMessage(ethPeer, GetNodeDataMessage.create(asList(HASH1, HASH2, HASH3))));
-
-    verify(ethPeer).send(NodeDataMessage.create(singletonList(VALUE1)));
+  public void shouldLimitTransactionsByCount() {
+    final int limit = 6;
+    final List<Transaction> transactions = setupTransactions(10);
+    final List<Transaction> expectedResult =
+        transactions.stream().limit(limit).collect(Collectors.toList());
+
+    setupEthServer(b -> b.maxGetPooledTransactions(limit));
+
+    // Request all hashes, which will exceed the limit
+    final List<Hash> hashes =
+        transactions.stream().map(Transaction::getHash).collect(Collectors.toList());
+    final GetPooledTransactionsMessage msgData = GetPooledTransactionsMessage.create(hashes);
+    final EthMessage ethMsg = new EthMessage(ethPeer, msgData);
+
+    // Check response
+    final PooledTransactionsMessage expectedMsg = PooledTransactionsMessage.create(expectedResult);
+    final Optional<MessageData> result = ethMessages.dispatch(ethMsg);
+    assertThat(result).contains(expectedMsg);
+  }
+
+  private void setupEthServer() {
+    setupEthServer(Function.identity());
+  }
+
+  private void setupEthServer(
+      final Function<EthProtocolConfiguration.Builder, EthProtocolConfiguration.Builder>
+          configModifier) {
+    final EthProtocolConfiguration.Builder configBuilder = EthProtocolConfiguration.builder();
+    final EthProtocolConfiguration ethConfig = configModifier.apply(configBuilder).build();
+
+    new EthServer(blockchain, worldStateArchive, transactionPool, ethMessages, ethConfig);
+  }
+
+  private Map<Hash, Bytes> setupNodeData(final int count) {
+    // Return empty value unless otherwise specified
+    when(worldStateArchive.getNodeData(any())).thenReturn(Optional.empty());
+
+    final Map<Hash, Bytes> nodeDataByHash = new HashMap<>();
+    for (int i = 0; i < count; i++) {
+      final Hash hash = dataGenerator.hash();
+      final Bytes data = dataGenerator.bytesValue(10, 30);
+      when(worldStateArchive.getNodeData(hash)).thenReturn(Optional.of(data));
+      nodeDataByHash.put(hash, data);
+    }
+
+    return nodeDataByHash;
+  }
+
+  private List<Block> setupBlocks(final int count) {
+    final List<Block> blocks = dataGenerator.blockSequence(count);
+    for (Block block : blocks) {
+      when(blockchain.getBlockBody(block.getHash())).thenReturn(Optional.of(block.getBody()));
+      when(blockchain.getBlockHeader(block.getHash())).thenReturn(Optional.of(block.getHeader()));
+      when(blockchain.getBlockHeader(block.getHeader().getNumber()))
+          .thenReturn(Optional.of(block.getHeader()));
+    }
+
+    return blocks;
+  }
+
+  private Map<Hash, List<TransactionReceipt>> setupBlockReceipts(final int count) {
+    final Map<Hash, List<TransactionReceipt>> txReceiptsByHash = new HashMap<>();
+    final List<Block> blocks = dataGenerator.blockSequence(count);
+    for (Block block : blocks) {
+      final List<TransactionReceipt> receipts = dataGenerator.receipts(block);
+      when(blockchain.getTxReceipts(block.getHash())).thenReturn(Optional.of(receipts));
+      txReceiptsByHash.put(block.getHash(), receipts);
+    }
+
+    return txReceiptsByHash;
+  }
+
+  private List<Transaction> setupTransactions(final int count) {
+    List<Transaction> txs =
+        Stream.generate(dataGenerator::transaction).limit(count).collect(Collectors.toList());
+
+    for (Transaction tx : txs) {
+      when(transactionPool.getTransactionByHash(tx.getHash())).thenReturn(Optional.of(tx));
+    }
+
+    return txs;
+  }
+
+  private int calculateRlpEncodedSize(final BlockBody blockBody) {
+    return RLP.encode(blockBody::writeWrappedBodyTo).size();
+  }
+
+  private int calculateRlpEncodedSize(final BlockHeader header) {
+    return RLP.encode(header::writeTo).size();
+  }
+
+  private int calculateRlpEncodedSize(final Transaction tx) {
+    return RLP.encode(tx::writeTo).size();
+  }
+
+  private int calculateRlpEncodedSize(final Bytes data) {
+    final BytesValueRLPOutput rlp = new BytesValueRLPOutput();
+    rlp.writeBytes(data);
+    return rlp.encodedSize();
+  }
+
+  private int calculateRlpEncodedSize(final List<TransactionReceipt> receipts) {
+    final BytesValueRLPOutput rlp = new BytesValueRLPOutput();
+    rlp.startList();
+    receipts.forEach(r -> r.writeTo(rlp));
+    rlp.endList();
+    return rlp.encodedSize();
   }
 }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/PeerReputationTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/PeerReputationTest.java
index 1371f64c34a..1fa5b47b96f 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/PeerReputationTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/PeerReputationTest.java
@@ -24,7 +24,14 @@
 
 public class PeerReputationTest {
 
-  private final PeerReputation reputation = new PeerReputation();
+  private static final int INITIAL_SCORE = 25;
+  private static final int MAX_SCORE = 50;
+  private final PeerReputation reputation = new PeerReputation(INITIAL_SCORE, MAX_SCORE);
+
+  @Test(expected = java.lang.IllegalArgumentException.class)
+  public void shouldThrowOnInvalidInitialScore() {
+    new PeerReputation(2, 1);
+  }
 
   @Test
   public void shouldOnlyDisconnectWhenTimeoutLimitReached() {
@@ -80,4 +87,18 @@ public void shouldDiscardEmptyResponseRecordsAfterTimeWindowElapses() {
                 1001 + PeerReputation.USELESS_RESPONSE_WINDOW_IN_MILLIS + 1))
         .isEmpty();
   }
+
+  @Test
+  public void shouldIncreaseScore() {
+    reputation.recordUsefulResponse();
+    assertThat(reputation.getScore()).isGreaterThan(INITIAL_SCORE);
+  }
+
+  @Test
+  public void shouldNotIncreaseScoreOverMax() {
+    for (int i = 0; i <= MAX_SCORE + 1; i++) {
+      reputation.recordUsefulResponse();
+    }
+    assertThat(reputation.getScore()).isEqualTo(MAX_SCORE);
+  }
 }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/RequestManagerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/RequestManagerTest.java
index 28f87c45982..7ab55f8e088 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/RequestManagerTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/RequestManagerTest.java
@@ -17,10 +17,13 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.hyperledger.besu.ethereum.eth.EthProtocol;
+import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.testutil.TestClock;
 
 import java.util.ArrayList;
@@ -29,6 +32,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Consumer;
 
 import org.apache.tuweni.bytes.Bytes;
@@ -36,79 +40,89 @@
 
 public class RequestManagerTest {
 
+  private final AtomicLong requestIdCounter = new AtomicLong(1);
+
   @Test
   public void dispatchesMessagesReceivedAfterRegisteringCallback() throws Exception {
-    final EthPeer peer = createPeer();
-    final RequestManager requestManager = new RequestManager(peer);
-
-    final AtomicInteger sendCount = new AtomicInteger(0);
-    final RequestManager.RequestSender sender = sendCount::incrementAndGet;
-    final List<MessageData> receivedMessages = new ArrayList<>();
-    final AtomicInteger closedCount = new AtomicInteger(0);
-    final RequestManager.ResponseCallback responseHandler =
-        (closed, msg, p) -> {
-          if (closed) {
-            closedCount.incrementAndGet();
-          } else {
-            receivedMessages.add(msg);
-          }
-        };
-
-    // Send request
-    final RequestManager.ResponseStream stream = requestManager.dispatchRequest(sender);
-    assertThat(sendCount.get()).isEqualTo(1);
-    stream.then(responseHandler);
-
-    // Dispatch message
-    final EthMessage mockMessage = mockMessage(peer);
-    requestManager.dispatchResponse(mockMessage);
-
-    // Response handler should get message
-    assertThat(receivedMessages.size()).isEqualTo(1);
-    assertThat(receivedMessages.get(0)).isEqualTo(mockMessage.getData());
-    assertThat(closedCount.get()).isEqualTo(1);
+    for (final boolean supportsRequestId : List.of(true, false)) {
+      final EthPeer peer = createPeer();
+      final RequestManager requestManager =
+          new RequestManager(peer, supportsRequestId, EthProtocol.NAME);
+
+      final AtomicInteger sendCount = new AtomicInteger(0);
+      final RequestManager.RequestSender sender = __ -> sendCount.incrementAndGet();
+      final List<MessageData> receivedMessages = new ArrayList<>();
+      final AtomicInteger closedCount = new AtomicInteger(0);
+      final RequestManager.ResponseCallback responseHandler =
+          (closed, msg, p) -> {
+            if (closed) {
+              closedCount.incrementAndGet();
+            } else {
+              receivedMessages.add(msg);
+            }
+          };
+
+      // Send request
+      final RequestManager.ResponseStream stream =
+          requestManager.dispatchRequest(sender, new RawMessage(0x01, Bytes.EMPTY));
+      assertThat(sendCount.get()).isEqualTo(1);
+      stream.then(responseHandler);
+
+      // Dispatch message
+      final EthMessage mockMessage = mockMessage(peer, supportsRequestId);
+      requestManager.dispatchResponse(mockMessage);
+
+      // Response handler should get message
+      assertThat(receivedMessages).hasSize(1);
+      assertResponseCorrect(receivedMessages.get(0), mockMessage, supportsRequestId);
+      assertThat(closedCount.get()).isEqualTo(1);
+    }
   }
 
   @Test
   public void dispatchesMessagesReceivedBeforeRegisteringCallback() throws Exception {
-    final EthPeer peer = createPeer();
-    final RequestManager requestManager = new RequestManager(peer);
-
-    final AtomicInteger sendCount = new AtomicInteger(0);
-    final RequestManager.RequestSender sender = sendCount::incrementAndGet;
-    final List<MessageData> receivedMessages = new ArrayList<>();
-    final AtomicInteger closedCount = new AtomicInteger(0);
-    final RequestManager.ResponseCallback responseHandler =
-        (closed, msg, p) -> {
-          if (closed) {
-            closedCount.incrementAndGet();
-          } else {
-            receivedMessages.add(msg);
-          }
-        };
-
-    // Send request
-    final RequestManager.ResponseStream stream = requestManager.dispatchRequest(sender);
-    assertThat(sendCount.get()).isEqualTo(1);
-
-    // Dispatch message
-    final EthMessage mockMessage = mockMessage(peer);
-    requestManager.dispatchResponse(mockMessage);
-
-    // Response handler should get message
-    stream.then(responseHandler);
-    assertThat(receivedMessages.size()).isEqualTo(1);
-    assertThat(receivedMessages.get(0)).isEqualTo(mockMessage.getData());
-    assertThat(closedCount.get()).isEqualTo(1);
+    for (final boolean supportsRequestId : List.of(true, false)) {
+      final EthPeer peer = createPeer();
+      final RequestManager requestManager =
+          new RequestManager(peer, supportsRequestId, EthProtocol.NAME);
+
+      final AtomicInteger sendCount = new AtomicInteger(0);
+      final RequestManager.RequestSender sender = __ -> sendCount.incrementAndGet();
+      final List<MessageData> receivedMessages = new ArrayList<>();
+      final AtomicInteger closedCount = new AtomicInteger(0);
+      final RequestManager.ResponseCallback responseHandler =
+          (closed, msg, p) -> {
+            if (closed) {
+              closedCount.incrementAndGet();
+            } else {
+              receivedMessages.add(msg);
+            }
+          };
+
+      // Send request
+      final RequestManager.ResponseStream stream =
+          requestManager.dispatchRequest(sender, new RawMessage(0x01, Bytes.EMPTY));
+      assertThat(sendCount.get()).isEqualTo(1);
+
+      // Dispatch message
+      final EthMessage mockMessage = mockMessage(peer, supportsRequestId);
+      requestManager.dispatchResponse(mockMessage);
+
+      // Response handler should get message
+      stream.then(responseHandler);
+      assertThat(receivedMessages).hasSize(1);
+      assertResponseCorrect(receivedMessages.get(0), mockMessage, supportsRequestId);
+      assertThat(closedCount.get()).isEqualTo(1);
+    }
   }
 
   @Test
   public void dispatchesMessagesReceivedBeforeAndAfterRegisteringCallback() throws Exception {
     final EthPeer peer = createPeer();
-    final RequestManager requestManager = new RequestManager(peer);
+    final RequestManager requestManager = new RequestManager(peer, false, EthProtocol.NAME);
 
     final AtomicInteger sendCount = new AtomicInteger(0);
-    final RequestManager.RequestSender sender = sendCount::incrementAndGet;
+    final RequestManager.RequestSender sender = __ -> sendCount.incrementAndGet();
     final List<MessageData> receivedMessages = new ArrayList<>();
     final AtomicInteger closedCount = new AtomicInteger(0);
     final RequestManager.ResponseCallback responseHandler =
@@ -121,38 +135,39 @@ public void dispatchesMessagesReceivedBeforeAndAfterRegisteringCallback() throws
         };
 
     // Send 2 requests so we can receive 2 messages before closing
-    final RequestManager.ResponseStream stream = requestManager.dispatchRequest(sender);
+    final RequestManager.ResponseStream stream =
+        requestManager.dispatchRequest(sender, new RawMessage(0x01, Bytes.EMPTY));
     assertThat(sendCount.get()).isEqualTo(1);
-    requestManager.dispatchRequest(sender);
+    requestManager.dispatchRequest(sender, new RawMessage(0x01, Bytes.EMPTY));
     assertThat(sendCount.get()).isEqualTo(2);
 
     // Dispatch first message
-    EthMessage mockMessage = mockMessage(peer);
+    EthMessage mockMessage = mockMessage(peer, false);
     requestManager.dispatchResponse(mockMessage);
 
     // Response handler should get messages sent before it is registered
     stream.then(responseHandler);
-    assertThat(receivedMessages.size()).isEqualTo(1);
-    assertThat(receivedMessages.get(0)).isEqualTo(mockMessage.getData());
-    assertThat(closedCount.get()).isEqualTo(0);
+    assertThat(receivedMessages).hasSize(1);
+    assertResponseCorrect(receivedMessages.get(0), mockMessage, false);
+    assertThat(closedCount.get()).isZero();
 
     // Dispatch second message
-    mockMessage = mockMessage(peer);
+    mockMessage = mockMessage(peer, false);
     requestManager.dispatchResponse(mockMessage);
 
     // Response handler should get messages sent after it is registered
-    assertThat(receivedMessages.size()).isEqualTo(2);
-    assertThat(receivedMessages.get(1)).isEqualTo(mockMessage.getData());
+    assertThat(receivedMessages).hasSize(2);
+    assertResponseCorrect(receivedMessages.get(1), mockMessage, false);
     assertThat(closedCount.get()).isEqualTo(1);
   }
 
   @Test
-  public void dispatchesMessagesToMultipleStreams() throws Exception {
+  public void dispatchesMessagesToMultipleStreamsIfNoRequestId() throws Exception {
     final EthPeer peer = createPeer();
-    final RequestManager requestManager = new RequestManager(peer);
+    final RequestManager requestManager = new RequestManager(peer, false, EthProtocol.NAME);
 
     final AtomicInteger sendCount = new AtomicInteger(0);
-    final RequestManager.RequestSender sender = sendCount::incrementAndGet;
+    final RequestManager.RequestSender sender = __ -> sendCount.incrementAndGet();
 
     final List<MessageData> receivedMessagesA = new ArrayList<>();
     final AtomicInteger closedCountA = new AtomicInteger(0);
@@ -176,43 +191,110 @@ public void dispatchesMessagesToMultipleStreams() throws Exception {
         };
 
     // Send request
-    final RequestManager.ResponseStream streamA = requestManager.dispatchRequest(sender);
-    final RequestManager.ResponseStream streamB = requestManager.dispatchRequest(sender);
+    final RequestManager.ResponseStream streamA =
+        requestManager.dispatchRequest(sender, new RawMessage(0x01, Bytes.EMPTY));
+    final RequestManager.ResponseStream streamB =
+        requestManager.dispatchRequest(sender, new RawMessage(0x01, Bytes.EMPTY));
     assertThat(sendCount.get()).isEqualTo(2);
     streamA.then(responseHandlerA);
 
     // Dispatch message
-    EthMessage mockMessage = mockMessage(peer);
+    EthMessage mockMessage = mockMessage(peer, false);
     requestManager.dispatchResponse(mockMessage);
 
     // Response handler A should get message
-    assertThat(receivedMessagesA.size()).isEqualTo(1);
-    assertThat(receivedMessagesA.get(0)).isEqualTo(mockMessage.getData());
-    assertThat(closedCountA.get()).isEqualTo(0);
+    assertThat(receivedMessagesA).hasSize(1);
+    assertResponseCorrect(receivedMessagesA.get(0), mockMessage, false);
+    assertThat(closedCountA.get()).isZero();
 
     streamB.then(responseHandlerB);
 
     // Response handler B should get message
-    assertThat(receivedMessagesB.size()).isEqualTo(1);
-    assertThat(receivedMessagesB.get(0)).isEqualTo(mockMessage.getData());
-    assertThat(closedCountB.get()).isEqualTo(0);
+    assertThat(receivedMessagesB).hasSize(1);
+    assertResponseCorrect(receivedMessagesB.get(0), mockMessage, false);
+    assertThat(closedCountB.get()).isZero();
 
     // Dispatch second message
-    mockMessage = mockMessage(peer);
+    mockMessage = mockMessage(peer, false);
     requestManager.dispatchResponse(mockMessage);
 
     // Response handler A should get message
-    assertThat(receivedMessagesA.size()).isEqualTo(2);
-    assertThat(receivedMessagesA.get(1)).isEqualTo(mockMessage.getData());
+    assertThat(receivedMessagesA).hasSize(2);
+    assertResponseCorrect(receivedMessagesA.get(1), mockMessage, false);
     assertThat(closedCountA.get()).isEqualTo(1);
     // Response handler B should get message
-    assertThat(receivedMessagesB.size()).isEqualTo(2);
-    assertThat(receivedMessagesB.get(1)).isEqualTo(mockMessage.getData());
+    assertThat(receivedMessagesB).hasSize(2);
+    assertResponseCorrect(receivedMessagesB.get(1), mockMessage, false);
     assertThat(closedCountB.get()).isEqualTo(1);
   }
 
-  private EthMessage mockMessage(final EthPeer peer) {
-    return new EthMessage(peer, new RawMessage(1, Bytes.EMPTY));
+  @Test
+  public void dispatchesMessagesToSingleStreamIfRequestId() throws Exception {
+    final EthPeer peer = createPeer();
+    final RequestManager requestManager = new RequestManager(peer, true, EthProtocol.NAME);
+
+    final AtomicInteger sendCount = new AtomicInteger(0);
+    final RequestManager.RequestSender sender = __ -> sendCount.incrementAndGet();
+
+    final List<MessageData> receivedMessagesA = new ArrayList<>();
+    final AtomicInteger closedCountA = new AtomicInteger(0);
+    final RequestManager.ResponseCallback responseHandlerA =
+        (closed, msg, p) -> {
+          if (closed) {
+            closedCountA.incrementAndGet();
+          } else {
+            receivedMessagesA.add(msg);
+          }
+        };
+    final List<MessageData> receivedMessagesB = new ArrayList<>();
+    final AtomicInteger closedCountB = new AtomicInteger(0);
+    final RequestManager.ResponseCallback responseHandlerB =
+        (closed, msg, p) -> {
+          if (closed) {
+            closedCountB.incrementAndGet();
+          } else {
+            receivedMessagesB.add(msg);
+          }
+        };
+
+    // Send request
+    final RequestManager.ResponseStream streamA =
+        requestManager.dispatchRequest(sender, new RawMessage(0x01, Bytes.EMPTY));
+    final RequestManager.ResponseStream streamB =
+        requestManager.dispatchRequest(sender, new RawMessage(0x01, Bytes.EMPTY));
+    assertThat(sendCount.get()).isEqualTo(2);
+
+    streamA.then(responseHandlerA);
+    streamB.then(responseHandlerB);
+
+    // Dispatch message
+    final EthMessage mockMessage = mockMessage(peer, true);
+    requestManager.dispatchResponse(mockMessage);
+
+    // Only handler A or B should get message
+    assertThat(receivedMessagesA.size() + receivedMessagesB.size()).isEqualTo(1);
+  }
+
+  private EthMessage mockMessage(final EthPeer peer, final boolean supportsRequestId) {
+    if (!supportsRequestId) {
+      return new EthMessage(peer, new RawMessage(1, Bytes.EMPTY));
+    }
+    final BytesValueRLPOutput rlpOutput = new BytesValueRLPOutput();
+    rlpOutput.startList();
+    final long requestId = requestIdCounter.getAndIncrement();
+    rlpOutput.writeLongScalar(requestId);
+    rlpOutput.writeBytes(Bytes.EMPTY);
+    rlpOutput.endList();
+    return new EthMessage(peer, new RawMessage(1, rlpOutput.encoded()));
+  }
+
+  private void assertResponseCorrect(
+      final MessageData response, final EthMessage mockMessage, final boolean supportsRequestId) {
+    assertThat(response)
+        .isEqualTo(
+            (supportsRequestId
+                ? mockMessage.getData().unwrapMessageData().getValue()
+                : mockMessage.getData()));
   }
 
   private EthPeer createPeer() {
@@ -220,6 +302,38 @@ private EthPeer createPeer() {
     final PeerConnection peerConnection = new MockPeerConnection(caps);
     final Consumer<EthPeer> onPeerReady = (peer) -> {};
     return new EthPeer(
-        peerConnection, EthProtocol.NAME, onPeerReady, Collections.emptyList(), TestClock.fixed());
+        peerConnection,
+        EthProtocol.NAME,
+        onPeerReady,
+        Collections.emptyList(),
+        EthProtocolConfiguration.DEFAULT_MAX_MESSAGE_SIZE,
+        TestClock.fixed(),
+        Collections.emptyList(),
+        Bytes.random(64));
+  }
+
+  @Test
+  public void disconnectsPeerOnBadMessage() throws Exception {
+    for (final boolean supportsRequestId : List.of(true, false)) {
+      final EthPeer peer = createPeer();
+      final RequestManager requestManager =
+          new RequestManager(peer, supportsRequestId, EthProtocol.NAME);
+
+      requestManager
+          .dispatchRequest(
+              messageData -> RLP.input(messageData.getData()).nextSize(),
+              new RawMessage(0x01, Bytes.EMPTY))
+          .then(
+              (closed, msg, p) -> {
+                if (!closed) {
+                  RLP.input(msg.getData()).skipNext();
+                }
+              });
+      final EthMessage mockMessage =
+          new EthMessage(peer, new RawMessage(1, Bytes.of(0x81, 0x82, 0x83, 0x84)));
+
+      requestManager.dispatchResponse(mockMessage);
+      assertThat(peer.isDisconnected()).isTrue();
+    }
   }
 }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/RespondingEthPeer.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/RespondingEthPeer.java
index e07cbcaf4d5..abb0d05a4f9 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/RespondingEthPeer.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/RespondingEthPeer.java
@@ -16,18 +16,20 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
 import static org.mockito.Mockito.mock;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 import org.hyperledger.besu.ethereum.eth.EthProtocol;
+import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
+import org.hyperledger.besu.ethereum.eth.manager.snap.SnapProtocolManager;
 import org.hyperledger.besu.ethereum.eth.messages.BlockBodiesMessage;
 import org.hyperledger.besu.ethereum.eth.messages.BlockHeadersMessage;
 import org.hyperledger.besu.ethereum.eth.messages.EthPV62;
@@ -67,14 +69,17 @@ public class RespondingEthPeer {
   private final EthPeer ethPeer;
   private final BlockingQueue<OutgoingMessage> outgoingMessages;
   private final EthProtocolManager ethProtocolManager;
+  private final Optional<SnapProtocolManager> snapProtocolManager;
   private final MockPeerConnection peerConnection;
 
   private RespondingEthPeer(
       final EthProtocolManager ethProtocolManager,
+      final Optional<SnapProtocolManager> snapProtocolManager,
       final MockPeerConnection peerConnection,
       final EthPeer ethPeer,
       final BlockingQueue<OutgoingMessage> outgoingMessages) {
     this.ethProtocolManager = ethProtocolManager;
+    this.snapProtocolManager = snapProtocolManager;
     this.peerConnection = peerConnection;
     this.ethPeer = ethPeer;
     this.outgoingMessages = outgoingMessages;
@@ -112,6 +117,7 @@ public static Builder builder() {
 
   private static RespondingEthPeer create(
       final EthProtocolManager ethProtocolManager,
+      final Optional<SnapProtocolManager> snapProtocolManager,
       final Hash chainHeadHash,
       final Difficulty totalDifficulty,
       final OptionalLong estimatedHeight,
@@ -123,13 +129,14 @@ private static RespondingEthPeer create(
     final MockPeerConnection peerConnection =
         new MockPeerConnection(
             caps, (cap, msg, conn) -> outgoingMessages.add(new OutgoingMessage(cap, msg)));
-    ethPeers.registerConnection(peerConnection, peerValidators);
+    ethPeers.registerNewConnection(peerConnection, peerValidators);
     final EthPeer peer = ethPeers.peer(peerConnection);
-    peer.registerStatusReceived(chainHeadHash, totalDifficulty, 63);
+    peer.registerStatusReceived(chainHeadHash, totalDifficulty, 63, peerConnection);
     estimatedHeight.ifPresent(height -> peer.chainState().update(chainHeadHash, height));
-    peer.registerStatusSent();
+    peer.registerStatusSent(peerConnection);
 
-    return new RespondingEthPeer(ethProtocolManager, peerConnection, peer, outgoingMessages);
+    return new RespondingEthPeer(
+        ethProtocolManager, snapProtocolManager, peerConnection, peer, outgoingMessages);
   }
 
   public EthPeer getEthPeer() {
@@ -182,7 +189,9 @@ public void respondTimes(final Responder responder, final int maxCycles) {
     }
   }
 
-  /** @return True if any requests were processed */
+  /**
+   * @return True if any requests were processed
+   */
   public boolean respond(final Responder responder) {
     // Respond to queued messages
     final List<OutgoingMessage> currentMessages = new ArrayList<>();
@@ -196,9 +205,16 @@ public boolean respond(final Responder responder) {
   private void respondToMessage(final Responder responder, final OutgoingMessage msg) {
     final Optional<MessageData> maybeResponse = responder.respond(msg.capability, msg.messageData);
     maybeResponse.ifPresent(
-        (response) ->
+        (response) -> {
+          if (ethProtocolManager.getSupportedCapabilities().contains(msg.capability)) {
             ethProtocolManager.processMessage(
-                msg.capability, new DefaultMessage(peerConnection, response)));
+                msg.capability, new DefaultMessage(peerConnection, response));
+          } else
+            snapProtocolManager.ifPresent(
+                protocolManager ->
+                    protocolManager.processMessage(
+                        msg.capability, new DefaultMessage(peerConnection, response)));
+        });
   }
 
   public Optional<MessageData> peekNextOutgoingRequest() {
@@ -246,23 +262,27 @@ public static Responder blockchainResponder(
       final Blockchain blockchain,
       final WorldStateArchive worldStateArchive,
       final TransactionPool transactionPool) {
+    final int maxMsgSize = EthProtocolConfiguration.DEFAULT_MAX_MESSAGE_SIZE;
     return (cap, msg) -> {
       MessageData response = null;
       switch (msg.getCode()) {
         case EthPV62.GET_BLOCK_HEADERS:
-          response = EthServer.constructGetHeadersResponse(blockchain, msg, 200);
+          response = EthServer.constructGetHeadersResponse(blockchain, msg, 200, maxMsgSize);
           break;
         case EthPV62.GET_BLOCK_BODIES:
-          response = EthServer.constructGetBodiesResponse(blockchain, msg, 200);
+          response = EthServer.constructGetBodiesResponse(blockchain, msg, 200, maxMsgSize);
           break;
         case EthPV63.GET_RECEIPTS:
-          response = EthServer.constructGetReceiptsResponse(blockchain, msg, 200);
+          response = EthServer.constructGetReceiptsResponse(blockchain, msg, 200, maxMsgSize);
           break;
         case EthPV63.GET_NODE_DATA:
-          response = EthServer.constructGetNodeDataResponse(worldStateArchive, msg, 200);
+          response =
+              EthServer.constructGetNodeDataResponse(worldStateArchive, msg, 200, maxMsgSize);
           break;
         case EthPV65.GET_POOLED_TRANSACTIONS:
-          response = EthServer.constructGetPooledTransactionsResponse(transactionPool, msg, 200);
+          response =
+              EthServer.constructGetPooledTransactionsResponse(
+                  transactionPool, msg, 200, maxMsgSize);
       }
       return Optional.ofNullable(response);
     };
@@ -371,6 +391,7 @@ public static Responder emptyResponder() {
 
   public static class Builder {
     private EthProtocolManager ethProtocolManager;
+    private Optional<SnapProtocolManager> snapProtocolManager = Optional.empty();
     private Hash chainHeadHash = gen.hash();
     private Difficulty totalDifficulty = Difficulty.of(1000L);
     private OptionalLong estimatedHeight = OptionalLong.of(1000L);
@@ -380,7 +401,12 @@ public RespondingEthPeer build() {
       checkNotNull(ethProtocolManager, "Must configure EthProtocolManager");
 
       return RespondingEthPeer.create(
-          ethProtocolManager, chainHeadHash, totalDifficulty, estimatedHeight, peerValidators);
+          ethProtocolManager,
+          snapProtocolManager,
+          chainHeadHash,
+          totalDifficulty,
+          estimatedHeight,
+          peerValidators);
     }
 
     public Builder ethProtocolManager(final EthProtocolManager ethProtocolManager) {
@@ -389,6 +415,12 @@ public Builder ethProtocolManager(final EthProtocolManager ethProtocolManager) {
       return this;
     }
 
+    public Builder snapProtocolManager(final SnapProtocolManager snapProtocolManager) {
+      checkNotNull(snapProtocolManager);
+      this.snapProtocolManager = Optional.of(snapProtocolManager);
+      return this;
+    }
+
     public Builder chainHeadHash(final Hash chainHeadHash) {
       checkNotNull(chainHeadHash);
       this.chainHeadHash = chainHeadHash;
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/AbstractMessageTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/AbstractMessageTaskTest.java
index 333ae2c7c3d..ab4a87bc738 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/AbstractMessageTaskTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/AbstractMessageTaskTest.java
@@ -17,10 +17,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.spy;
 
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.eth.EthProtocol;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
 import org.hyperledger.besu.ethereum.eth.manager.DeterministicEthScheduler;
@@ -38,16 +39,19 @@
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolFactory;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.testutil.TestClock;
 
-import java.util.Optional;
+import java.time.ZoneId;
+import java.util.Collections;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.apache.tuweni.bytes.Bytes;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -57,6 +61,7 @@
  * @param <R> The type of data returned from the network
  */
 public abstract class AbstractMessageTaskTest<T, R> {
+  protected static final int MAX_PEERS = 5;
   protected static Blockchain blockchain;
   protected static ProtocolSchedule protocolSchedule;
   protected static ProtocolContext protocolContext;
@@ -70,12 +75,12 @@ public abstract class AbstractMessageTaskTest<T, R> {
 
   @BeforeClass
   public static void setup() {
-    final BlockchainSetupUtil blockchainSetupUtil = BlockchainSetupUtil.forTesting();
+    final BlockchainSetupUtil blockchainSetupUtil =
+        BlockchainSetupUtil.forTesting(DataStorageFormat.FOREST);
     blockchainSetupUtil.importAllBlocks();
     blockchain = blockchainSetupUtil.getBlockchain();
     protocolSchedule = blockchainSetupUtil.getProtocolSchedule();
     protocolContext = blockchainSetupUtil.getProtocolContext();
-
     assertThat(blockchainSetupUtil.getMaxBlockNumber()).isGreaterThanOrEqualTo(20L);
   }
 
@@ -83,7 +88,21 @@ public static void setup() {
   public void setupTest() {
     peersDoTimeout = new AtomicBoolean(false);
     peerCountToTimeout = new AtomicInteger(0);
-    ethPeers = spy(new EthPeers(EthProtocol.NAME, TestClock.fixed(), metricsSystem));
+    ethPeers =
+        spy(
+            new EthPeers(
+                EthProtocol.NAME,
+                () -> protocolSchedule.getByBlockHeader(blockchain.getChainHeadHeader()),
+                TestClock.fixed(),
+                metricsSystem,
+                EthProtocolConfiguration.DEFAULT_MAX_MESSAGE_SIZE,
+                Collections.emptyList(),
+                Bytes.random(64),
+                MAX_PEERS,
+                MAX_PEERS,
+                MAX_PEERS,
+                false));
+
     final EthMessages ethMessages = new EthMessages();
     final EthScheduler ethScheduler =
         new DeterministicEthScheduler(
@@ -95,13 +114,11 @@ public void setupTest() {
             protocolSchedule,
             protocolContext,
             ethContext,
-            TestClock.fixed(),
+            TestClock.system(ZoneId.systemDefault()),
             metricsSystem,
             syncState,
-            Wei.of(1),
-            TransactionPoolConfiguration.DEFAULT,
-            true,
-            Optional.empty());
+            new MiningParameters.Builder().minTransactionGasPrice(Wei.ONE).build(),
+            TransactionPoolConfiguration.DEFAULT);
     ethProtocolManager =
         EthProtocolManagerTestUtil.create(
             blockchain,
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/PeerMessageTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/PeerMessageTaskTest.java
index a2eb657d438..dceb4d623b5 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/PeerMessageTaskTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/PeerMessageTaskTest.java
@@ -16,19 +16,28 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.hyperledger.besu.ethereum.eth.EthProtocol;
+import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
+import org.hyperledger.besu.ethereum.eth.manager.MockPeerConnection;
 import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.exceptions.EthTaskException;
 import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerTask;
 import org.hyperledger.besu.ethereum.eth.manager.task.EthTask;
+import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
+import org.hyperledger.besu.testutil.TestClock;
 import org.hyperledger.besu.util.ExceptionUtils;
 
+import java.util.Collections;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
 
+import org.apache.tuweni.bytes.Bytes;
 import org.junit.Test;
 
 /**
@@ -147,4 +156,18 @@ protected void assertResultMatchesExpectation(
   }
 
   protected abstract void assertPartialResultMatchesExpectation(T requestedData, T partialResponse);
+
+  protected EthPeer createPeer() {
+    final PeerConnection peerConnection = new MockPeerConnection(Set.of(EthProtocol.ETH66));
+    final Consumer<EthPeer> onPeerReady = (peer) -> {};
+    return new EthPeer(
+        peerConnection,
+        EthProtocol.NAME,
+        onPeerReady,
+        Collections.emptyList(),
+        EthProtocolConfiguration.DEFAULT_MAX_MESSAGE_SIZE,
+        TestClock.fixed(),
+        Collections.emptyList(),
+        Bytes.random(64));
+  }
 }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/RetryingMessageTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/RetryingMessageTaskTest.java
index d9c4989186e..b69e316398e 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/RetryingMessageTaskTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/RetryingMessageTaskTest.java
@@ -26,6 +26,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
+import org.junit.Before;
 import org.junit.Test;
 
 /**
@@ -34,11 +35,12 @@
  * @param <T> The type of data being requested from the network
  */
 public abstract class RetryingMessageTaskTest<T> extends AbstractMessageTaskTest<T, T> {
+  protected static final int DEFAULT_MAX_RETRIES = 4;
+  protected int maxRetries;
 
-  protected final int maxRetries;
-
-  protected RetryingMessageTaskTest() {
-    this.maxRetries = 3;
+  @Before
+  public void resetMaxRetries() {
+    this.maxRetries = DEFAULT_MAX_RETRIES;
   }
 
   @Override
@@ -76,8 +78,8 @@ public void failsWhenPeerReturnsPartialResultThenStops() {
     respondingPeer.respond(partialResponder);
     assertThat(future.isDone()).isFalse();
 
-    // Respond max times with no data
-    respondingPeer.respondTimes(emptyResponder, maxRetries);
+    // Respond max times - 1 with no data
+    respondingPeer.respondTimes(emptyResponder, maxRetries - 1);
     assertThat(future).isNotDone();
 
     // Next retry should fail
@@ -205,14 +207,14 @@ public void failsWhenPeersSendEmptyResponses() {
 
     assertThat(future.isDone()).isFalse();
 
-    // Respond max times
-    respondingPeer.respondTimes(responder, maxRetries);
-    assertThat(future.isDone()).isFalse();
+    // Respond max times - 1
+    respondingPeer.respondTimes(responder, maxRetries - 1);
+    assertThat(future).isNotDone();
 
     // Next retry should fail
     respondingPeer.respond(responder);
-    assertThat(future.isDone()).isTrue();
-    assertThat(future.isCompletedExceptionally()).isTrue();
+    assertThat(future).isDone();
+    assertThat(future).isCompletedExceptionally();
     assertThatThrownBy(future::get).hasCauseInstanceOf(MaxRetriesReachedException.class);
   }
 }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/RetryingSwitchingPeerMessageTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/RetryingSwitchingPeerMessageTaskTest.java
new file mode 100644
index 00000000000..e7c953f0935
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/ethtaskutils/RetryingSwitchingPeerMessageTaskTest.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.manager.ethtaskutils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
+import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.exceptions.MaxRetriesReachedException;
+import org.hyperledger.besu.ethereum.eth.manager.task.EthTask;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+import org.junit.Test;
+
+/**
+ * Tests ethTasks that request data from the network, and retry until all of the data is received.
+ *
+ * @param <T> The type of data being requested from the network
+ */
+public abstract class RetryingSwitchingPeerMessageTaskTest<T> extends RetryingMessageTaskTest<T> {
+  protected Optional<EthPeer> responsivePeer = Optional.empty();
+
+  @Override
+  protected void assertResultMatchesExpectation(
+      final T requestedData, final T response, final EthPeer respondingPeer) {
+    assertThat(response).isEqualTo(requestedData);
+    responsivePeer.ifPresent(rp -> assertThat(rp).isEqualByComparingTo(respondingPeer));
+  }
+
+  @Test
+  public void completesWhenBestPeerEmptyAndSecondPeerIsResponsive()
+      throws ExecutionException, InterruptedException {
+    // Setup first unresponsive peer
+    final RespondingEthPeer firstPeer =
+        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 10);
+
+    // Setup second responsive peer
+    final RespondingEthPeer secondPeer =
+        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 9);
+
+    // Execute task and wait for response
+    final T requestedData = generateDataToBeRequested();
+    final EthTask<T> task = createTask(requestedData);
+    final CompletableFuture<T> future = task.run();
+
+    // First peer is not responsive
+    firstPeer.respond(RespondingEthPeer.emptyResponder());
+    // Second peer is responsive
+    secondPeer.respondTimes(
+        RespondingEthPeer.blockchainResponder(
+            blockchain, protocolContext.getWorldStateArchive(), transactionPool),
+        2);
+
+    responsivePeer = Optional.of(secondPeer.getEthPeer());
+
+    assertThat(future.isDone()).isTrue();
+    assertResultMatchesExpectation(requestedData, future.get(), secondPeer.getEthPeer());
+  }
+
+  @Test
+  public void completesWhenBestPeerTimeoutsAndSecondPeerIsResponsive()
+      throws ExecutionException, InterruptedException {
+    // Setup first unresponsive peer
+    final RespondingEthPeer firstPeer =
+        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 10);
+
+    // Setup second responsive peer
+    final RespondingEthPeer secondPeer =
+        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 9);
+
+    // Execute task and wait for response
+    final T requestedData = generateDataToBeRequested();
+    final EthTask<T> task = createTask(requestedData);
+    final CompletableFuture<T> future = task.run();
+
+    // First peer timeouts
+    peerCountToTimeout.set(1);
+    firstPeer.respondTimes(
+        RespondingEthPeer.blockchainResponder(
+            blockchain, protocolContext.getWorldStateArchive(), transactionPool),
+        2);
+    // Second peer is responsive
+    secondPeer.respondTimes(
+        RespondingEthPeer.blockchainResponder(
+            blockchain, protocolContext.getWorldStateArchive(), transactionPool),
+        2);
+
+    responsivePeer = Optional.of(secondPeer.getEthPeer());
+
+    assertThat(future.isDone()).isTrue();
+    assertResultMatchesExpectation(requestedData, future.get(), secondPeer.getEthPeer());
+  }
+
+  @Test
+  public void failsWhenAllPeersFail() {
+    // Setup first unresponsive peer
+    final RespondingEthPeer firstPeer =
+        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 10);
+
+    // Setup second unresponsive peer
+    final RespondingEthPeer secondPeer =
+        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 9);
+
+    // Execute task and wait for response
+    final T requestedData = generateDataToBeRequested();
+    final EthTask<T> task = createTask(requestedData);
+    final CompletableFuture<T> future = task.run();
+
+    for (int i = 0; i < maxRetries && !future.isDone(); i++) {
+      // First peer is unresponsive
+      firstPeer.respondWhile(RespondingEthPeer.emptyResponder(), firstPeer::hasOutstandingRequests);
+      // Second peer is unresponsive
+      secondPeer.respondWhile(
+          RespondingEthPeer.emptyResponder(), secondPeer::hasOutstandingRequests);
+    }
+
+    assertThat(future.isDone()).isTrue();
+    assertThat(future.isCompletedExceptionally()).isTrue();
+    assertThatThrownBy(future::get).hasCauseInstanceOf(MaxRetriesReachedException.class);
+  }
+
+  @Test
+  public void disconnectAPeerWhenAllPeersTried() {
+    maxRetries = MAX_PEERS + 1;
+    final int numPeers = MAX_PEERS;
+    final List<RespondingEthPeer> respondingPeers = new ArrayList<>(numPeers);
+    for (int i = 0; i < numPeers; i++) {
+      respondingPeers.add(EthProtocolManagerTestUtil.createPeer(ethProtocolManager, numPeers - i));
+    }
+
+    // Execute task and wait for response
+    final T requestedData = generateDataToBeRequested();
+    final EthTask<T> task = createTask(requestedData);
+    task.run();
+
+    respondingPeers.forEach(
+        respondingPeer ->
+            respondingPeer.respondWhile(
+                RespondingEthPeer.emptyResponder(), respondingPeer::hasOutstandingRequests));
+
+    assertThat(respondingPeers.get(numPeers - 1).getEthPeer().isDisconnected()).isTrue();
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractRetryingPeerTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractRetryingPeerTaskTest.java
new file mode 100644
index 00000000000..90b407f2fce
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractRetryingPeerTaskTest.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.manager.task;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
+
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.exceptions.MaxRetriesReachedException;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class AbstractRetryingPeerTaskTest {
+
+  @Mock EthContext ethContext;
+  MetricsSystem metricsSystem = new NoOpMetricsSystem();
+
+  @Test
+  public void shouldSuccessAtFirstTryIfNoTaskFailures()
+      throws InterruptedException, ExecutionException {
+    final int maxRetries = 2;
+    TaskThatFailsSometimes task = new TaskThatFailsSometimes(0, maxRetries);
+    CompletableFuture<Boolean> result = task.run();
+    assertThat(result.get()).isTrue();
+    assertThat(task.executions).isEqualTo(1);
+  }
+
+  @Test
+  public void shouldSuccessIfTaskFailOnlyOnce() throws InterruptedException, ExecutionException {
+    final int maxRetries = 2;
+    TaskThatFailsSometimes task = new TaskThatFailsSometimes(1, maxRetries);
+    CompletableFuture<Boolean> result = task.run();
+    assertThat(result.get()).isTrue();
+    assertThat(task.executions).isEqualTo(2);
+  }
+
+  @Test
+  public void shouldFailAfterMaxRetriesExecutions() throws InterruptedException {
+    final int maxRetries = 2;
+    TaskThatFailsSometimes task = new TaskThatFailsSometimes(maxRetries, maxRetries);
+    CompletableFuture<Boolean> result = task.run();
+    assertThat(result.isCompletedExceptionally()).isTrue();
+    assertThat(task.executions).isEqualTo(maxRetries);
+    try {
+      result.get();
+    } catch (ExecutionException ee) {
+      assertThat(ee).hasCauseExactlyInstanceOf(MaxRetriesReachedException.class);
+      return;
+    }
+    failBecauseExceptionWasNotThrown(MaxRetriesReachedException.class);
+  }
+
+  private class TaskThatFailsSometimes extends AbstractRetryingPeerTask<Boolean> {
+    final int initialFailures;
+    int executions = 0;
+    int failures = 0;
+
+    protected TaskThatFailsSometimes(final int initialFailures, final int maxRetries) {
+      super(ethContext, maxRetries, Objects::isNull, metricsSystem);
+      this.initialFailures = initialFailures;
+    }
+
+    @Override
+    protected CompletableFuture<Boolean> executePeerTask(final Optional<EthPeer> assignedPeer) {
+      executions++;
+      if (failures < initialFailures) {
+        failures++;
+        return CompletableFuture.completedFuture(null);
+      } else {
+        result.complete(Boolean.TRUE);
+        return CompletableFuture.completedFuture(Boolean.TRUE);
+      }
+    }
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/BufferedGetPooledTransactionsFromPeerFetcherTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/BufferedGetPooledTransactionsFromPeerFetcherTest.java
index fab46ebd98f..2f4049aa7e1 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/BufferedGetPooledTransactionsFromPeerFetcherTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/BufferedGetPooledTransactionsFromPeerFetcherTest.java
@@ -14,8 +14,9 @@
  */
 package org.hyperledger.besu.ethereum.eth.manager.task;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -23,27 +24,26 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactionsMessageProcessor;
+import org.hyperledger.besu.ethereum.eth.transactions.PeerTransactionTracker;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
-import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
+import org.hyperledger.besu.metrics.StubMetricsSystem;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
+import io.netty.util.concurrent.ScheduledFuture;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
@@ -51,51 +51,63 @@
 public class BufferedGetPooledTransactionsFromPeerFetcherTest {
 
   @Mock EthPeer ethPeer;
-  @Mock PendingTransactionsMessageProcessor processor;
   @Mock TransactionPool transactionPool;
   @Mock EthContext ethContext;
   @Mock EthScheduler ethScheduler;
 
-  @InjectMocks BufferedGetPooledTransactionsFromPeerFetcher fetcher;
-
-  private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
-
   private final BlockDataGenerator generator = new BlockDataGenerator();
 
+  private BufferedGetPooledTransactionsFromPeerFetcher fetcher;
+  private StubMetricsSystem metricsSystem;
+  private PeerTransactionTracker transactionTracker;
+
   @Before
   public void setup() {
-    when(processor.getTransactionPool()).thenReturn(transactionPool);
-    when(processor.getMetricsSystem()).thenReturn(metricsSystem);
-    when(processor.getEthContext()).thenReturn(ethContext);
+    metricsSystem = new StubMetricsSystem();
+    transactionTracker = new PeerTransactionTracker();
     when(ethContext.getScheduler()).thenReturn(ethScheduler);
+    ScheduledFuture<?> mock = mock(ScheduledFuture.class);
+    fetcher =
+        new BufferedGetPooledTransactionsFromPeerFetcher(
+            ethContext,
+            mock,
+            ethPeer,
+            transactionPool,
+            transactionTracker,
+            new TransactionPoolMetrics(metricsSystem),
+            "new_pooled_transaction_hashes");
   }
 
   @Test
   public void requestTransactionShouldStartTaskWhenUnknownTransaction() {
 
-    final Hash hash = generator.transaction().getHash();
-    final List<Transaction> taskResult = Collections.singletonList(Transaction.builder().build());
+    final Transaction transaction = generator.transaction();
+    final Hash hash = transaction.getHash();
+    final List<Transaction> taskResult = List.of(transaction);
     final AbstractPeerTask.PeerTaskResult<List<Transaction>> peerTaskResult =
         new AbstractPeerTask.PeerTaskResult<>(ethPeer, taskResult);
     when(ethScheduler.scheduleSyncWorkerTask(any(GetPooledTransactionsFromPeerTask.class)))
         .thenReturn(CompletableFuture.completedFuture(peerTaskResult));
 
-    fetcher.addHash(hash);
+    fetcher.addHashes(List.of(hash));
     fetcher.requestTransactions();
 
     verify(ethScheduler).scheduleSyncWorkerTask(any(GetPooledTransactionsFromPeerTask.class));
     verifyNoMoreInteractions(ethScheduler);
 
     verify(transactionPool, times(1)).addRemoteTransactions(taskResult);
+    assertThat(transactionTracker.hasSeenTransaction(hash)).isTrue();
   }
 
   @Test
   public void requestTransactionShouldSplitRequestIntoSeveralTasks() {
-    for (int i = 0; i < 257; i++) {
-      fetcher.addHash(generator.transaction().getHash());
-    }
+    fetcher.addHashes(
+        IntStream.range(0, 257)
+            .mapToObj(unused -> generator.transaction().getHash())
+            .collect(Collectors.toList()));
+
     final AbstractPeerTask.PeerTaskResult<List<Transaction>> peerTaskResult =
-        new AbstractPeerTask.PeerTaskResult<>(ethPeer, new ArrayList<>());
+        new AbstractPeerTask.PeerTaskResult<>(ethPeer, List.of());
     when(ethScheduler.scheduleSyncWorkerTask(any(GetPooledTransactionsFromPeerTask.class)))
         .thenReturn(CompletableFuture.completedFuture(peerTaskResult));
 
@@ -107,16 +119,20 @@ public void requestTransactionShouldSplitRequestIntoSeveralTasks() {
   }
 
   @Test
-  public void requestTransactionShouldNotStartTaskWhenTransactionAlreadyInPool() {
+  public void requestTransactionShouldNotStartTaskWhenTransactionAlreadySeen() {
 
-    final Hash hash = generator.transaction().getHash();
-    when(transactionPool.getTransactionByHash(hash))
-        .thenReturn(Optional.of(Transaction.builder().build()));
+    final Transaction transaction = generator.transaction();
+    final Hash hash = transaction.getHash();
+    transactionTracker.markTransactionHashesAsSeen(ethPeer, List.of(hash));
 
-    fetcher.addHash(hash);
+    fetcher.addHashes(List.of(hash));
     fetcher.requestTransactions();
 
     verifyNoInteractions(ethScheduler);
-    verify(transactionPool, never()).addRemoteTransactions(anyList());
+    verify(transactionPool, never()).addRemoteTransactions(List.of(transaction));
+    assertThat(
+            metricsSystem.getCounterValue(
+                "remote_transactions_already_seen_total", "new_pooled_transaction_hashes"))
+        .isEqualTo(1);
   }
 }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBlockFromPeerTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBlockFromPeerTaskTest.java
index 7f0d84fc760..7cdcd3c7071 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBlockFromPeerTaskTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBlockFromPeerTaskTest.java
@@ -26,6 +26,7 @@
 import org.hyperledger.besu.ethereum.eth.manager.exceptions.EthTaskException;
 import org.hyperledger.besu.util.ExceptionUtils;
 
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicReference;
@@ -47,7 +48,11 @@ protected Block generateDataToBeRequested() {
   @Override
   protected EthTask<AbstractPeerTask.PeerTaskResult<Block>> createTask(final Block requestedData) {
     return GetBlockFromPeerTask.create(
-        protocolSchedule, ethContext, requestedData.getHash(), BLOCK_NUMBER, metricsSystem);
+        protocolSchedule,
+        ethContext,
+        Optional.of(requestedData.getHash()),
+        BLOCK_NUMBER,
+        metricsSystem);
   }
 
   @Override
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBodiesFromPeerTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBodiesFromPeerTaskTest.java
index 3178afbe3cb..09e4f972e4e 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBodiesFromPeerTaskTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetBodiesFromPeerTaskTest.java
@@ -14,17 +14,29 @@
  */
 package org.hyperledger.besu.ethereum.eth.manager.task;
 
+import static java.util.Collections.emptyList;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.BLSPublicKey;
+import org.hyperledger.besu.datatypes.BLSSignature;
+import org.hyperledger.besu.datatypes.GWei;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Deposit;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
 import org.hyperledger.besu.ethereum.eth.manager.ethtaskutils.PeerMessageTaskTest;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt64;
+import org.junit.Test;
+
 public class GetBodiesFromPeerTaskTest extends PeerMessageTaskTest<List<Block>> {
 
   @Override
@@ -56,4 +68,46 @@ protected void assertPartialResultMatchesExpectation(
       assertThat(requestedData).contains(block);
     }
   }
+
+  @Test
+  public void assertBodyIdentifierUsesWithdrawalsToGenerateBodyIdentifiers() {
+    final Withdrawal withdrawal =
+        new Withdrawal(UInt64.ONE, UInt64.ONE, Address.fromHexString("0x1"), GWei.ONE);
+
+    // Empty body block
+    final BlockBody emptyBodyBlock = BlockBody.empty();
+    // Block with no tx, no ommers, 1 withdrawal
+    final BlockBody bodyBlockWithWithdrawal =
+        new BlockBody(emptyList(), emptyList(), Optional.of(List.of(withdrawal)), Optional.empty());
+
+    assertThat(
+            new GetBodiesFromPeerTask.BodyIdentifier(emptyBodyBlock)
+                .equals(new GetBodiesFromPeerTask.BodyIdentifier(bodyBlockWithWithdrawal)))
+        .isFalse();
+  }
+
+  @Test
+  public void assertBodyIdentifierUsesDepositsToGenerateBodyIdentifiers() {
+    final Deposit deposit =
+        new Deposit(
+            BLSPublicKey.fromHexString(
+                "0xb10a4a15bf67b328c9b101d09e5c6ee6672978fdad9ef0d9e2ceffaee99223555d8601f0cb3bcc4ce1af9864779a416e"),
+            Bytes32.fromHexString(
+                "0x0017a7fcf06faf493d30bbe2632ea7c2383cd86825e12797165de7aa35589483"),
+            GWei.of(32000000000L),
+            BLSSignature.fromHexString(
+                "0xa889db8300194050a2636c92a95bc7160515867614b7971a9500cdb62f9c0890217d2901c3241f86fac029428fc106930606154bd9e406d7588934a5f15b837180b17194d6e44bd6de23e43b163dfe12e369dcc75a3852cd997963f158217eb5"),
+            UInt64.ONE);
+
+    // Empty body block
+    final BlockBody emptyBodyBlock = BlockBody.empty();
+    // Block with no tx, no ommers, 1 deposit
+    final BlockBody bodyBlockWithDeposit =
+        new BlockBody(emptyList(), emptyList(), Optional.empty(), Optional.of(List.of(deposit)));
+
+    assertThat(
+            new GetBodiesFromPeerTask.BodyIdentifier(emptyBodyBlock)
+                .equals(new GetBodiesFromPeerTask.BodyIdentifier(bodyBlockWithDeposit)))
+        .isFalse();
+  }
 }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByHashTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByHashTaskTest.java
index 80b223a06e0..6d6881c01ff 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByHashTaskTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByHashTaskTest.java
@@ -17,14 +17,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
 import static org.hyperledger.besu.ethereum.referencetests.ReferenceTestBlockchain.generateTestBlockHash;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
 
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
+import org.hyperledger.besu.ethereum.eth.manager.MockPeerConnection;
 import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.ethtaskutils.PeerMessageTaskTest;
 import org.hyperledger.besu.ethereum.eth.messages.BlockHeadersMessage;
@@ -41,12 +39,10 @@
 import org.hamcrest.MatcherAssert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class GetHeadersFromPeerByHashTaskTest extends PeerMessageTaskTest<List<BlockHeader>> {
-  @Mock private EthPeer peerMock;
 
   @Override
   protected void assertPartialResultMatchesExpectation(
@@ -153,6 +149,8 @@ public void checkThatSequentialHeadersFormingAChainWorks() {
         new BlockHeaderTestFixture().number(2).parentHash(block1.getHash()).buildHeader();
     final List<BlockHeader> headers = Arrays.asList(block1, block2);
 
+    final EthPeer peer = createPeer();
+
     final AbstractGetHeadersFromPeerTask task =
         new GetHeadersFromPeerByHashTask(
             protocolSchedule,
@@ -164,23 +162,26 @@ public void checkThatSequentialHeadersFormingAChainWorks() {
             false,
             metricsSystem);
     final Optional<List<BlockHeader>> optionalBlockHeaders =
-        task.processResponse(false, BlockHeadersMessage.create(headers), peerMock);
+        task.processResponse(false, BlockHeadersMessage.create(headers), peer);
     assertThat(optionalBlockHeaders).isNotNull();
     assertThat(optionalBlockHeaders).isPresent();
     final List<BlockHeader> blockHeaders = optionalBlockHeaders.get();
     MatcherAssert.assertThat(blockHeaders, hasSize(2));
-    verify(peerMock, times(0)).disconnect(any());
+    assertThat(peer.chainState().getEstimatedHeight()).isEqualTo(2);
+    assertThat(peer.isDisconnected()).isFalse();
   }
 
   @Test
   public void checkThatSequentialHeadersNotFormingAChainFails() {
     final int startNumber = 1;
-
     final BlockHeader block1 =
         new BlockHeaderTestFixture().number(1).parentHash(generateTestBlockHash(0)).buildHeader();
     final BlockHeader block2 =
         new BlockHeaderTestFixture().number(2).parentHash(generateTestBlockHash(1)).buildHeader();
     final List<BlockHeader> headers = Arrays.asList(block1, block2);
+
+    final EthPeer peer = createPeer();
+
     final AbstractGetHeadersFromPeerTask task =
         new GetHeadersFromPeerByHashTask(
             protocolSchedule,
@@ -192,9 +193,11 @@ public void checkThatSequentialHeadersNotFormingAChainFails() {
             false,
             metricsSystem);
     final Optional<List<BlockHeader>> optionalBlockHeaders =
-        task.processResponse(false, BlockHeadersMessage.create(headers), peerMock);
+        task.processResponse(false, BlockHeadersMessage.create(headers), peer);
     assertThat(optionalBlockHeaders).isNotNull();
     assertThat(optionalBlockHeaders).isEmpty();
-    verify(peerMock).disconnect(DisconnectMessage.DisconnectReason.BREACH_OF_PROTOCOL);
+    assertThat(peer.isDisconnected()).isTrue();
+    assertThat(((MockPeerConnection) peer.getConnection()).getDisconnectReason().get())
+        .isEqualTo(DisconnectMessage.DisconnectReason.BREACH_OF_PROTOCOL);
   }
 }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTaskTest.java
index bec1062c720..ea6c290bdb9 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTaskTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetHeadersFromPeerByNumberTaskTest.java
@@ -17,14 +17,12 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
 import static org.hyperledger.besu.ethereum.referencetests.ReferenceTestBlockchain.generateTestBlockHash;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
 
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
+import org.hyperledger.besu.ethereum.eth.manager.MockPeerConnection;
 import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.ethtaskutils.PeerMessageTaskTest;
 import org.hyperledger.besu.ethereum.eth.messages.BlockHeadersMessage;
@@ -41,13 +39,10 @@
 import org.hamcrest.MatcherAssert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class GetHeadersFromPeerByNumberTaskTest extends PeerMessageTaskTest<List<BlockHeader>> {
-  @Mock private EthPeer peerMock;
-
   @Override
   protected void assertPartialResultMatchesExpectation(
       final List<BlockHeader> requestedData, final List<BlockHeader> partialResponse) {
@@ -138,16 +133,20 @@ public void checkThatSequentialHeadersFormingAChainWorks() {
     final BlockHeader block2 =
         new BlockHeaderTestFixture().number(2).parentHash(block1.getHash()).buildHeader();
     final List<BlockHeader> headers = Arrays.asList(block1, block2);
+
+    final EthPeer peer = createPeer();
+
     final AbstractGetHeadersFromPeerTask task =
         new GetHeadersFromPeerByNumberTask(
             protocolSchedule, ethContext, block1.getNumber(), 2, 0, false, metricsSystem);
     final Optional<List<BlockHeader>> optionalBlockHeaders =
-        task.processResponse(false, BlockHeadersMessage.create(headers), peerMock);
+        task.processResponse(false, BlockHeadersMessage.create(headers), peer);
     assertThat(optionalBlockHeaders).isNotNull();
     assertThat(optionalBlockHeaders).isPresent();
     final List<BlockHeader> blockHeaders = optionalBlockHeaders.get();
     MatcherAssert.assertThat(blockHeaders, hasSize(2));
-    verify(peerMock, times(0)).disconnect(any());
+    assertThat(peer.isDisconnected()).isFalse();
+    assertThat(peer.chainState().getEstimatedHeight()).isEqualTo(2);
   }
 
   @Test
@@ -158,13 +157,18 @@ public void checkThatSequentialHeadersNotFormingAChainFails() {
     final BlockHeader block2 =
         new BlockHeaderTestFixture().number(2).parentHash(generateTestBlockHash(1)).buildHeader();
     final List<BlockHeader> headers = Arrays.asList(block1, block2);
+
+    final EthPeer peer = createPeer();
+
     final AbstractGetHeadersFromPeerTask task =
         new GetHeadersFromPeerByNumberTask(
             protocolSchedule, ethContext, block1.getNumber(), 2, 0, false, metricsSystem);
     final Optional<List<BlockHeader>> optionalBlockHeaders =
-        task.processResponse(false, BlockHeadersMessage.create(headers), peerMock);
+        task.processResponse(false, BlockHeadersMessage.create(headers), peer);
     assertThat(optionalBlockHeaders).isNotNull();
     assertThat(optionalBlockHeaders).isEmpty();
-    verify(peerMock).disconnect(DisconnectMessage.DisconnectReason.BREACH_OF_PROTOCOL);
+    assertThat(peer.isDisconnected()).isTrue();
+    assertThat(((MockPeerConnection) peer.getConnection()).getDisconnectReason().get())
+        .isEqualTo(DisconnectMessage.DisconnectReason.BREACH_OF_PROTOCOL);
   }
 }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetNodeDataFromPeerTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetNodeDataFromPeerTaskTest.java
index cdafb8dc6cd..d74ce3a835c 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetNodeDataFromPeerTaskTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetNodeDataFromPeerTaskTest.java
@@ -17,8 +17,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hyperledger.besu.ethereum.core.BlockHeader.GENESIS_BLOCK_NUMBER;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.ethtaskutils.PeerMessageTaskTest;
 
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetPooledTransactionsFromPeerTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetPooledTransactionsFromPeerTaskTest.java
index df1f290c12f..760e481bc6b 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetPooledTransactionsFromPeerTaskTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/GetPooledTransactionsFromPeerTaskTest.java
@@ -16,13 +16,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.crypto.SECP256K1;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.ethtaskutils.PeerMessageTaskTest;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionAddedStatus;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
@@ -41,7 +42,7 @@ public class GetPooledTransactionsFromPeerTaskTest extends PeerMessageTaskTest<L
   protected List<Transaction> generateDataToBeRequested() {
 
     final List<Transaction> requestedData = new ArrayList<>();
-    SECP256K1.KeyPair keyPair = SECP256K1.KeyPair.generate();
+    KeyPair keyPair = SignatureAlgorithmFactory.getInstance().generateKeyPair();
     for (int i = 0; i < 3; i++) {
       Transaction tx =
           new TransactionTestFixture()
@@ -49,8 +50,8 @@ protected List<Transaction> generateDataToBeRequested() {
               .gasLimit(100000)
               .chainId(Optional.empty())
               .createTransaction(keyPair);
-      assertThat(transactionPool.getPendingTransactions().addLocalTransaction(tx))
-          .isEqualTo(TransactionAddedStatus.ADDED);
+      assertThat(transactionPool.getPendingTransactions().addLocalTransaction(tx, Optional.empty()))
+          .isEqualTo(TransactionAddedResult.ADDED);
       requestedData.add(tx);
     }
     return requestedData;
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetBlockFromPeersTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetBlockFromPeersTaskTest.java
new file mode 100644
index 00000000000..9e900287b1f
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetBlockFromPeersTaskTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.manager.task;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.core.BlockHeader.GENESIS_BLOCK_NUMBER;
+import static org.mockito.Mockito.mock;
+
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.ethtaskutils.RetryingSwitchingPeerMessageTaskTest;
+import org.hyperledger.besu.ethereum.eth.manager.task.AbstractPeerTask.PeerTaskResult;
+
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class RetryingGetBlockFromPeersTaskTest
+    extends RetryingSwitchingPeerMessageTaskTest<PeerTaskResult<Block>> {
+
+  @Override
+  protected void assertResultMatchesExpectation(
+      final PeerTaskResult<Block> requestedData,
+      final PeerTaskResult<Block> response,
+      final EthPeer respondingPeer) {
+    assertThat(response.getResult()).isEqualTo(requestedData.getResult());
+  }
+
+  @Override
+  protected PeerTaskResult<Block> generateDataToBeRequested() {
+    final Block block = blockchain.getBlockByNumber(10).get();
+    return new PeerTaskResult<>(mock(EthPeer.class), block);
+  }
+
+  @Override
+  protected RetryingGetBlockFromPeersTask createTask(final PeerTaskResult<Block> requestedData) {
+    return RetryingGetBlockFromPeersTask.create(
+        protocolSchedule,
+        ethContext,
+        metricsSystem,
+        maxRetries,
+        Optional.of(requestedData.getResult().getHash()),
+        GENESIS_BLOCK_NUMBER);
+  }
+
+  @Test
+  @Override
+  @Ignore("GetBlock could not return partial response")
+  public void failsWhenPeerReturnsPartialResultThenStops() {}
+
+  @Override
+  @Test
+  @Ignore("GetBlock could not return partial response")
+  public void completesWhenPeerReturnsPartialResult()
+      throws ExecutionException, InterruptedException {
+    super.completesWhenPeerReturnsPartialResult();
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetNodeDataFromPeerTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetNodeDataFromPeerTaskTest.java
index c38468737aa..586bf2aa22d 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetNodeDataFromPeerTaskTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/RetryingGetNodeDataFromPeerTaskTest.java
@@ -17,8 +17,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hyperledger.besu.ethereum.core.BlockHeader.GENESIS_BLOCK_NUMBER;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
 import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.ethtaskutils.RetryingMessageTaskTest;
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/SnapProtocolManagerTestUtil.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/SnapProtocolManagerTestUtil.java
new file mode 100644
index 00000000000..68bd4e4e5a1
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/SnapProtocolManagerTestUtil.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.manager.task;
+
+import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
+import org.hyperledger.besu.ethereum.eth.manager.EthMessages;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
+import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.snap.SnapProtocolManager;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+
+import java.util.Collections;
+
+public class SnapProtocolManagerTestUtil {
+
+  public static SnapProtocolManager create(final EthPeers ethPeers) {
+    return create(
+        BlockchainSetupUtil.forTesting(DataStorageFormat.FOREST).getWorldArchive(), ethPeers);
+  }
+
+  public static SnapProtocolManager create(
+      final WorldStateArchive worldStateArchive, final EthPeers ethPeers) {
+
+    EthMessages messages = new EthMessages();
+
+    return new SnapProtocolManager(Collections.emptyList(), ethPeers, messages, worldStateArchive);
+  }
+
+  public static SnapProtocolManager create(
+      final WorldStateArchive worldStateArchive,
+      final EthPeers ethPeers,
+      final EthMessages snapMessages) {
+    return new SnapProtocolManager(
+        Collections.emptyList(), ethPeers, snapMessages, worldStateArchive);
+  }
+
+  public static RespondingEthPeer createPeer(
+      final EthProtocolManager ethProtocolManager,
+      final SnapProtocolManager snapProtocolManager,
+      final long estimatedHeight) {
+    return RespondingEthPeer.builder()
+        .ethProtocolManager(ethProtocolManager)
+        .snapProtocolManager(snapProtocolManager)
+        .estimatedHeight(estimatedHeight)
+        .build();
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeerTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeerTaskTest.java
index c00f9efdd6a..3690723f24c 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeerTaskTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeerTaskTest.java
@@ -32,7 +32,7 @@
 public class WaitForPeerTaskTest {
   private EthProtocolManager ethProtocolManager;
   private EthContext ethContext;
-  private final MetricsSystem metricsSystem = new NoOpMetricsSystem();;
+  private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
 
   @Before
   public void setupTest() {
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeersTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeersTaskTest.java
index 16283f77461..275026473a5 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeersTaskTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/manager/task/WaitForPeersTaskTest.java
@@ -32,7 +32,7 @@
 public class WaitForPeersTaskTest {
   private EthProtocolManager ethProtocolManager;
   private EthContext ethContext;
-  private final MetricsSystem metricsSystem = new NoOpMetricsSystem();;
+  private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
 
   @Before
   public void setupTest() {
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/BlockBodiesMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/BlockBodiesMessageTest.java
index 915630930f7..c305d5fcbb1 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/BlockBodiesMessageTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/BlockBodiesMessageTest.java
@@ -14,17 +14,24 @@
  */
 package org.hyperledger.besu.ethereum.eth.messages;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.difficulty.fixed.FixedDifficultyProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPException;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -35,11 +42,21 @@
 import com.google.common.io.Resources;
 import org.apache.tuweni.bytes.Bytes;
 import org.assertj.core.api.Assertions;
+import org.junit.Before;
 import org.junit.Test;
 
 /** Tests for {@link BlockBodiesMessage}. */
 public final class BlockBodiesMessageTest {
 
+  private ProtocolSchedule protocolSchedule;
+
+  @Before
+  public void setup() {
+    protocolSchedule =
+        FixedDifficultyProtocolSchedule.create(
+            GenesisConfigFile.development().getConfigOptions(), false, EvmConfiguration.DEFAULT);
+  }
+
   @Test
   public void blockBodiesRoundTrip() throws IOException {
     final List<BlockBody> bodies = new ArrayList<>();
@@ -64,14 +81,37 @@ public void blockBodiesRoundTrip() throws IOException {
     final MessageData initialMessage = BlockBodiesMessage.create(bodies);
     final MessageData raw = new RawMessage(EthPV62.BLOCK_BODIES, initialMessage.getData());
     final BlockBodiesMessage message = BlockBodiesMessage.readFrom(raw);
-    final Iterator<BlockBody> readBodies =
-        message
-            .bodies(
-                FixedDifficultyProtocolSchedule.create(
-                    GenesisConfigFile.development().getConfigOptions(), false))
-            .iterator();
+    final Iterator<BlockBody> readBodies = message.bodies(protocolSchedule).iterator();
     for (int i = 0; i < 50; ++i) {
       Assertions.assertThat(readBodies.next()).isEqualTo(bodies.get(i));
     }
   }
+
+  @Test
+  public void shouldEncodeEmptyBlocksInBlockBodiesMessage() {
+    final Bytes bytes = Bytes.fromHexString("0xc2c0c0");
+    final MessageData raw = new RawMessage(EthPV62.BLOCK_BODIES, bytes);
+    final BlockBodiesMessage message = BlockBodiesMessage.readFrom(raw);
+    final List<BlockBody> bodies = message.bodies(protocolSchedule);
+    bodies.forEach(blockBody -> Assertions.assertThat(blockBody.isEmpty()).isTrue());
+  }
+
+  @Test
+  public void shouldNotThrowRLPExceptionIfAllowedEmptyBody() {
+    final Bytes bytes = Bytes.fromHexString("0xc0");
+    final BlockBody empty = BlockBody.readWrappedBodyFrom(RLP.input(bytes), null, true);
+    Assertions.assertThat(empty.isEmpty()).isTrue();
+  }
+
+  @Test
+  public void shouldThrowRLPExceptionIfNotAllowedEmptyBody() {
+    final Bytes bytes = Bytes.fromHexString("0xc0");
+    final BlockHeaderFunctions blockHeaderFunctions =
+        ScheduleBasedBlockHeaderFunctions.create(protocolSchedule);
+    assertThrows(
+        RLPException.class,
+        () -> {
+          BlockBody.readWrappedBodyFrom(RLP.input(bytes), blockHeaderFunctions, false);
+        });
+  }
 }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/BlockHeadersMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/BlockHeadersMessageTest.java
index 87a78847655..697313c26d3 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/BlockHeadersMessageTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/BlockHeadersMessageTest.java
@@ -23,6 +23,7 @@
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -60,7 +61,9 @@ public void blockHeadersRoundTrip() throws IOException {
     final List<BlockHeader> readHeaders =
         message.getHeaders(
             FixedDifficultyProtocolSchedule.create(
-                GenesisConfigFile.development().getConfigOptions(), false));
+                GenesisConfigFile.development().getConfigOptions(),
+                false,
+                EvmConfiguration.DEFAULT));
 
     for (int i = 0; i < 50; ++i) {
       Assertions.assertThat(readHeaders.get(i)).isEqualTo(headers.get(i));
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockBodiesMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockBodiesMessageTest.java
index 937588de634..d9a27cf22ed 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockBodiesMessageTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockBodiesMessageTest.java
@@ -14,8 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.eth.messages;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage;
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockHeadersMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockHeadersMessageTest.java
index 4eafc47f589..0e0aaf71dd8 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockHeadersMessageTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetBlockHeadersMessageTest.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.eth.messages;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage;
 
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetNodeDataMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetNodeDataMessageTest.java
index 4a7582d7d79..8e335acbfa0 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetNodeDataMessageTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetNodeDataMessageTest.java
@@ -14,8 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.eth.messages;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage;
 
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetPooledTransactionsMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetPooledTransactionsMessageTest.java
index b0610304d20..32d0443a7bb 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetPooledTransactionsMessageTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetPooledTransactionsMessageTest.java
@@ -17,7 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage;
 
 import java.util.Arrays;
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetReceiptsMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetReceiptsMessageTest.java
index e48f1ee5e18..c6f41c27dfa 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetReceiptsMessageTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/GetReceiptsMessageTest.java
@@ -14,8 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.eth.messages;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage;
 
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/LimitedTransactionsMessagesTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/LimitedTransactionsMessagesTest.java
index 31c34a00b15..e6ee599596d 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/LimitedTransactionsMessagesTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/LimitedTransactionsMessagesTest.java
@@ -21,7 +21,10 @@
 
 import java.util.HashSet;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.junit.Test;
@@ -29,6 +32,7 @@
 public class LimitedTransactionsMessagesTest {
 
   private static final int TX_PAYLOAD_LIMIT = LimitedTransactionsMessages.LIMIT - 180;
+  private static final int MAX_ADDITIONAL_BYTES = 5;
   private final BlockDataGenerator generator = new BlockDataGenerator();
   private final Set<Transaction> sampleTxs = generator.transactions(1);
   private final TransactionsMessage sampleTransactionMessages =
@@ -38,61 +42,71 @@ public class LimitedTransactionsMessagesTest {
 
   @Test
   public void createLimited() {
-    final Set<Transaction> txs = generator.transactions(6000);
-    final LimitedTransactionsMessages firstMessage = LimitedTransactionsMessages.createLimited(txs);
-    assertThat(firstMessage.getIncludedTransactions().size()).isBetween(4990, 5250);
+    final Set<Transaction> transactions = generator.transactions(6000);
+    final Set<Transaction> remainingTransactions = new HashSet<>(transactions);
+
+    final LimitedTransactionsMessages firstMessage =
+        LimitedTransactionsMessages.createLimited(remainingTransactions);
+    remainingTransactions.removeAll(firstMessage.getIncludedTransactions());
 
-    txs.removeAll(firstMessage.getIncludedTransactions());
-    assertThat(txs.size()).isBetween(700, 800);
     final LimitedTransactionsMessages secondMessage =
-        LimitedTransactionsMessages.createLimited(txs);
-    assertThat(secondMessage.getIncludedTransactions().size()).isBetween(700, 800);
-    txs.removeAll(secondMessage.getIncludedTransactions());
-    assertThat(txs.size()).isEqualTo(0);
-    assertThat(
-            firstMessage.getTransactionsMessage().getSize()
-                + secondMessage.getTransactionsMessage().getSize())
-        .isLessThan(2 * LimitedTransactionsMessages.LIMIT);
+        LimitedTransactionsMessages.createLimited(remainingTransactions);
+    remainingTransactions.removeAll(secondMessage.getIncludedTransactions());
+
+    assertThat(remainingTransactions.size()).isEqualTo(0);
+    List.of(firstMessage, secondMessage).stream()
+        .map(message -> message.getTransactionsMessage().getSize())
+        .forEach(
+            messageSize ->
+                assertThat(messageSize)
+                    .isLessThan(LimitedTransactionsMessages.LIMIT + MAX_ADDITIONAL_BYTES));
+
+    final Set<Transaction> includedTransactions = new HashSet<>();
+    includedTransactions.addAll(firstMessage.getIncludedTransactions());
+    includedTransactions.addAll(secondMessage.getIncludedTransactions());
+    assertThat(includedTransactions)
+        .containsExactlyInAnyOrder(transactions.toArray(new Transaction[] {}));
   }
 
   @Test
   public void createLimitedWithTransactionsJustUnderTheLimit() {
-    final Set<Transaction> txs = new HashSet<>();
-    txs.add(generator.transaction(Bytes.wrap(new byte[TX_PAYLOAD_LIMIT])));
-    txs.add(generator.transaction(Bytes.wrap(new byte[TX_PAYLOAD_LIMIT])));
-    txs.add(generator.transaction(Bytes.wrap(new byte[TX_PAYLOAD_LIMIT])));
-    final LimitedTransactionsMessages firstMessage = LimitedTransactionsMessages.createLimited(txs);
-    assertThat(firstMessage.getIncludedTransactions().size()).isEqualTo(2);
-    txs.removeAll(firstMessage.getIncludedTransactions());
-    assertThat(txs.size()).isEqualTo(1);
-    final LimitedTransactionsMessages secondMessage =
-        LimitedTransactionsMessages.createLimited(txs);
-    assertThat(secondMessage.getIncludedTransactions().size()).isEqualTo(1);
-    txs.removeAll(secondMessage.getIncludedTransactions());
-    assertThat(txs.size()).isEqualTo(0);
+    final Set<Transaction> transactions =
+        Stream.generate(() -> generator.transaction(Bytes.wrap(new byte[TX_PAYLOAD_LIMIT])))
+            .limit(3)
+            .collect(Collectors.toUnmodifiableSet());
+    final Set<Transaction> remainingTransactions = new HashSet<>(transactions);
+    final Set<Transaction> includedTransactions = new HashSet<>();
+    while (!remainingTransactions.isEmpty()) {
+      final LimitedTransactionsMessages message =
+          LimitedTransactionsMessages.createLimited(remainingTransactions);
+      includedTransactions.addAll(message.getIncludedTransactions());
+      assertThat(message.getIncludedTransactions().size()).isEqualTo(1);
+      remainingTransactions.removeAll(message.getIncludedTransactions());
+    }
+    assertThat(includedTransactions)
+        .containsExactlyInAnyOrder(transactions.toArray(new Transaction[] {}));
   }
 
   @Test
   public void createLimitedWithTransactionsJustUnderAndJustOverTheLimit() {
-    final Set<Transaction> txs = new LinkedHashSet<>();
-
-    txs.add(generator.transaction(Bytes.wrap(new byte[TX_PAYLOAD_LIMIT])));
-    // ensure the next transaction exceed the limit TX_PAYLOAD_LIMIT + 100
-    txs.add(generator.transaction(Bytes.wrap(new byte[TX_PAYLOAD_LIMIT + 100])));
-    txs.add(generator.transaction(Bytes.wrap(new byte[TX_PAYLOAD_LIMIT])));
-    final LimitedTransactionsMessages firstMessage = LimitedTransactionsMessages.createLimited(txs);
-    assertThat(firstMessage.getIncludedTransactions().size()).isEqualTo(1);
-    txs.removeAll(firstMessage.getIncludedTransactions());
-    assertThat(txs.size()).isEqualTo(2);
-    final LimitedTransactionsMessages secondMessage =
-        LimitedTransactionsMessages.createLimited(txs);
-    assertThat(secondMessage.getIncludedTransactions().size()).isEqualTo(1);
-    txs.removeAll(secondMessage.getIncludedTransactions());
-    assertThat(txs.size()).isEqualTo(1);
-    final LimitedTransactionsMessages thirdMessage = LimitedTransactionsMessages.createLimited(txs);
-    assertThat(thirdMessage.getIncludedTransactions().size()).isEqualTo(1);
-    txs.removeAll(thirdMessage.getIncludedTransactions());
-    assertThat(txs.size()).isEqualTo(0);
+    final Set<Transaction> transactions =
+        Set.of(
+            generator.transaction(Bytes.wrap(new byte[TX_PAYLOAD_LIMIT])),
+            // ensure the next transaction exceed the limit TX_PAYLOAD_LIMIT + 100
+            generator.transaction(Bytes.wrap(new byte[TX_PAYLOAD_LIMIT + 100])),
+            generator.transaction(Bytes.wrap(new byte[TX_PAYLOAD_LIMIT])));
+    final Set<Transaction> remainingTransactions = new LinkedHashSet<>(transactions);
+
+    final Set<Transaction> includedTransactions = new HashSet<>();
+    while (!remainingTransactions.isEmpty()) {
+      final LimitedTransactionsMessages message =
+          LimitedTransactionsMessages.createLimited(remainingTransactions);
+      includedTransactions.addAll(message.getIncludedTransactions());
+      assertThat(message.getIncludedTransactions().size()).isEqualTo(1);
+      remainingTransactions.removeAll(message.getIncludedTransactions());
+    }
+    assertThat(includedTransactions)
+        .containsExactlyInAnyOrder(transactions.toArray(new Transaction[] {}));
   }
 
   @Test
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/MessageWrapperTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/MessageWrapperTest.java
new file mode 100644
index 00000000000..9fef76a8eb7
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/MessageWrapperTest.java
@@ -0,0 +1,400 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.messages;
+
+import static java.math.BigInteger.TWO;
+import static java.util.Collections.singletonList;
+import static java.util.stream.Collectors.toUnmodifiableList;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.hyperledger.besu.ethereum.core.Transaction.REPLAY_PROTECTED_V_BASE;
+import static org.hyperledger.besu.ethereum.core.Transaction.REPLAY_PROTECTED_V_MIN;
+import static org.hyperledger.besu.ethereum.core.Transaction.REPLAY_UNPROTECTED_V_BASE;
+import static org.hyperledger.besu.ethereum.core.Transaction.REPLAY_UNPROTECTED_V_BASE_PLUS_1;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.LogWithMetadata;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.ethereum.rlp.RLPException;
+import org.hyperledger.besu.evm.log.LogTopic;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
+import org.hyperledger.besu.plugin.data.TransactionType;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Test;
+
+public class MessageWrapperTest {
+
+  private static final ObjectMapper objectMapper = new ObjectMapper();
+
+  @Test
+  public void GetBlockHeaders() throws IOException {
+    final var testJson = parseTestFile("GetBlockHeadersPacket66.json");
+    final Bytes expected = Bytes.fromHexString(testJson.get("rlp").asText());
+    final GetBlockHeadersMessage getBlockHeadersMessage =
+        GetBlockHeadersMessage.create(
+            Hash.fromHexString(
+                "0x00000000000000000000000000000000000000000000000000000000deadc0de"),
+            5,
+            5,
+            false);
+    final Bytes actual = getBlockHeadersMessage.wrapMessageData(BigInteger.valueOf(1111)).getData();
+    assertThat(actual).isEqualTo(expected);
+  }
+
+  @Test
+  public void GetBlockHeaders1() throws IOException {
+    final var testJson = parseTestFile("GetBlockHeadersPacket66-1.json");
+    final Bytes expected = Bytes.fromHexString(testJson.get("rlp").asText());
+    final GetBlockHeadersMessage getBlockHeadersMessage =
+        GetBlockHeadersMessage.create(9999, 5, 5, false);
+    final Bytes actual = getBlockHeadersMessage.wrapMessageData(BigInteger.valueOf(1111)).getData();
+    assertThat(actual).isEqualTo(expected);
+  }
+
+  @Test
+  public void BlockHeaders() throws IOException {
+    final var testJson = parseTestFile("BlockHeadersPacket66.json");
+    final Bytes expected = Bytes.fromHexString(testJson.get("rlp").asText());
+    final BlockHeadersMessage blockHeadersMessage =
+        BlockHeadersMessage.create(
+            Arrays.asList(
+                objectMapper.treeToValue(
+                    testJson.get("data").get("BlockHeadersPacket"), TestBlockHeader[].class)));
+    final Bytes actual = blockHeadersMessage.wrapMessageData(BigInteger.valueOf(1111)).getData();
+    assertThat(actual).isEqualTo(expected);
+  }
+
+  @Test
+  public void GetBlockBodies() throws IOException {
+    final var testJson = parseTestFile("GetBlockBodiesPacket66.json");
+    final Bytes expected = Bytes.fromHexString(testJson.get("rlp").asText());
+    final GetBlockBodiesMessage getBlockBodiesMessage =
+        GetBlockBodiesMessage.create(
+            Stream.of(
+                    "0x00000000000000000000000000000000000000000000000000000000deadc0de",
+                    "0x00000000000000000000000000000000000000000000000000000000feedbeef")
+                .map(Hash::fromHexString)
+                .collect(toUnmodifiableList()));
+    final Bytes actual = getBlockBodiesMessage.wrapMessageData(BigInteger.valueOf(1111)).getData();
+    assertThat(actual).isEqualTo(expected);
+  }
+
+  @Test
+  public void BlockBodies() throws IOException {
+    final var testJson = parseTestFile("BlockBodiesPacket66.json");
+    final Bytes expected = Bytes.fromHexString(testJson.get("rlp").asText());
+    final BlockBodiesMessage blockBodiesMessage =
+        BlockBodiesMessage.create(
+            Arrays.asList(
+                objectMapper.treeToValue(
+                    testJson.get("data").get("BlockBodiesPacket"), TestBlockBody[].class)));
+    final Bytes actual = blockBodiesMessage.wrapMessageData(BigInteger.valueOf(1111)).getData();
+    assertThat(actual).isEqualTo(expected);
+  }
+
+  @Test
+  public void GetNodeData() throws IOException {
+    final var testJson = parseTestFile("GetNodeDataPacket66.json");
+    final Bytes expected = Bytes.fromHexString(testJson.get("rlp").asText());
+    final GetNodeDataMessage getNodeDataMessage =
+        GetNodeDataMessage.create(
+            Stream.of(
+                    "0x00000000000000000000000000000000000000000000000000000000deadc0de",
+                    "0x00000000000000000000000000000000000000000000000000000000feedbeef")
+                .map(Hash::fromHexString)
+                .collect(toUnmodifiableList()));
+    final Bytes actual = getNodeDataMessage.wrapMessageData(BigInteger.valueOf(1111)).getData();
+    assertThat(actual).isEqualTo(expected);
+  }
+
+  @Test
+  public void NodeData() throws IOException {
+    final var testJson = parseTestFile("NodeDataPacket66.json");
+    final Bytes expected = Bytes.fromHexString(testJson.get("rlp").asText());
+    final NodeDataMessage nodeDataMessage =
+        NodeDataMessage.create(
+            Stream.of("0xdeadc0de", "0xfeedbeef")
+                .map(Bytes::fromHexString)
+                .collect(toUnmodifiableList()));
+    final Bytes actual = nodeDataMessage.wrapMessageData(BigInteger.valueOf(1111)).getData();
+    assertThat(actual).isEqualTo(expected);
+  }
+
+  @Test
+  public void GetReceipts() throws IOException {
+    final var testJson = parseTestFile("GetReceiptsPacket66.json");
+    final Bytes expected = Bytes.fromHexString(testJson.get("rlp").asText());
+    final GetReceiptsMessage getReceiptsMessage =
+        GetReceiptsMessage.create(
+            Stream.of(
+                    "0x00000000000000000000000000000000000000000000000000000000deadc0de",
+                    "0x00000000000000000000000000000000000000000000000000000000feedbeef")
+                .map(Hash::fromHexString)
+                .collect(toUnmodifiableList()));
+    final Bytes actual = getReceiptsMessage.wrapMessageData(BigInteger.valueOf(1111)).getData();
+    assertThat(actual).isEqualTo(expected);
+  }
+
+  @Test
+  public void Receipts() throws IOException {
+    final var testJson = parseTestFile("ReceiptsPacket66.json");
+    final Bytes expected = Bytes.fromHexString(testJson.get("rlp").asText());
+    final ReceiptsMessage receiptsMessage =
+        ReceiptsMessage.create(
+            singletonList(
+                singletonList(
+                    new TransactionReceipt(
+                        TransactionType.FRONTIER,
+                        0,
+                        1,
+                        singletonList(
+                            new LogWithMetadata(
+                                0,
+                                0,
+                                Hash.ZERO,
+                                Hash.ZERO,
+                                0,
+                                Address.fromHexString("0x11"),
+                                Bytes.fromHexString("0x0100ff"),
+                                Stream.of(
+                                        "0x000000000000000000000000000000000000000000000000000000000000dead",
+                                        "0x000000000000000000000000000000000000000000000000000000000000beef")
+                                    .map(LogTopic::fromHexString)
+                                    .collect(toUnmodifiableList()),
+                                false)),
+                        LogsBloomFilter.fromHexString(
+                            "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"),
+                        Optional.empty()))));
+    final Bytes actual = receiptsMessage.wrapMessageData(BigInteger.valueOf(1111)).getData();
+    assertThat(actual).isEqualTo(expected);
+  }
+
+  @Test
+  public void GetPooledTransactions() throws IOException {
+    final var testJson = parseTestFile("GetPooledTransactionsPacket66.json");
+    final Bytes expected = Bytes.fromHexString(testJson.get("rlp").asText());
+    final GetPooledTransactionsMessage getPooledTransactionsMessage =
+        GetPooledTransactionsMessage.create(
+            Stream.of(
+                    "0x00000000000000000000000000000000000000000000000000000000deadc0de",
+                    "0x00000000000000000000000000000000000000000000000000000000feedbeef")
+                .map(Hash::fromHexString)
+                .collect(toUnmodifiableList()));
+    final Bytes actual =
+        getPooledTransactionsMessage.wrapMessageData(BigInteger.valueOf(1111)).getData();
+    assertThat(actual).isEqualTo(expected);
+  }
+
+  @Test
+  public void PooledTransactions() throws IOException {
+    final var testJson = parseTestFile("PooledTransactionsPacket66.json");
+    final Bytes expected = Bytes.fromHexString(testJson.get("rlp").asText());
+    final PooledTransactionsMessage pooledTransactionsMessage =
+        PooledTransactionsMessage.create(
+            Arrays.asList(
+                objectMapper.treeToValue(
+                    testJson.get("data").get("PooledTransactionsPacket"),
+                    TestTransaction[].class)));
+    final Bytes actual =
+        pooledTransactionsMessage.wrapMessageData(BigInteger.valueOf(1111)).getData();
+    assertThat(actual).isEqualTo(expected);
+  }
+
+  @Test
+  public void readFromExpectsListWrappingBodyFields() {
+    // BodiesMessages broadcast bodies in this format
+    // [[txs],[ommers],[withdrawals]]
+    // 0xc3c0c0c0
+    final BytesValueRLPInput bytesValueRLPInput =
+        new BytesValueRLPInput(Bytes.fromHexString("0xc3c0c0c0"), false);
+    final BlockBody blockBodyDecodefromRLP =
+        BlockBody.readWrappedBodyFrom(bytesValueRLPInput, new MainnetBlockHeaderFunctions());
+
+    assertThat(blockBodyDecodefromRLP)
+        .isEqualTo(
+            new BlockBody(
+                Collections.emptyList(),
+                Collections.emptyList(),
+                Optional.of(Collections.emptyList()),
+                Optional.empty()));
+  }
+
+  @Test
+  public void readBodyFieldsExpectsNoListWrappingBodyFields() {
+    // rlps of blocks contains block data in this format
+    // [[blockheader],[txs],[ommers],[withdrawals]]
+    // 0xc4c0c0c0c0
+    final BytesValueRLPInput bytesValueRLPInput =
+        new BytesValueRLPInput(Bytes.fromHexString("0xc4c0c0c0c0"), false);
+    // Enters the initial
+    bytesValueRLPInput.enterList();
+    // skips block header list
+    bytesValueRLPInput.enterList();
+    bytesValueRLPInput.leaveList();
+
+    final BlockBody blockBodyDecodefromRLP =
+        BlockBody.readFrom(bytesValueRLPInput, new MainnetBlockHeaderFunctions());
+
+    assertThat(blockBodyDecodefromRLP)
+        .isEqualTo(
+            new BlockBody(
+                Collections.emptyList(),
+                Collections.emptyList(),
+                Optional.of(Collections.emptyList()),
+                Optional.empty()));
+  }
+
+  @Test
+  public void readBodyFieldsThrowsIfThereIsListWrappingBodyFields() {
+    // [[txs],[ommers],[withdrawals]]
+    // 0xc3c0c0c0
+    final BytesValueRLPInput bytesValueRLPInput =
+        new BytesValueRLPInput(Bytes.fromHexString("0xc3c0c0c0"), false);
+
+    assertThrows(
+        RLPException.class,
+        () -> BlockBody.readFrom(bytesValueRLPInput, new MainnetBlockHeaderFunctions()));
+  }
+
+  private static class TestTransaction extends Transaction {
+
+    @JsonCreator
+    public TestTransaction(
+        @JsonProperty("nonce") final String nonce,
+        @JsonProperty("gasPrice") final String gasPrice,
+        @JsonProperty("gas") final String gasLimit,
+        @JsonProperty("to") final String to,
+        @JsonProperty("value") final String value,
+        @JsonProperty("input") final String data,
+        @JsonProperty("v") final String v,
+        @JsonProperty("r") final String r,
+        @JsonProperty("s") final String s,
+        @JsonProperty("hash") final String __) {
+
+      super(
+          Bytes.fromHexStringLenient(nonce).toLong(),
+          Wei.fromHexString(gasPrice),
+          Long.decode(gasLimit),
+          Address.fromHexString(to),
+          Wei.fromHexString(value),
+          new SECP256K1()
+              .createSignature(
+                  new BigInteger(r.substring(2), 16),
+                  new BigInteger(s.substring(2), 16),
+                  recIdAndChainId(Byte.decode(v)).getKey()),
+          Bytes.fromHexString(data),
+          recIdAndChainId(Byte.decode(v)).getValue(),
+          Optional.empty());
+    }
+  }
+
+  private static Map.Entry<Byte, Optional<BigInteger>> recIdAndChainId(final Byte vByte) {
+    final BigInteger v = BigInteger.valueOf(vByte);
+    final byte recId;
+    Optional<BigInteger> chainId = Optional.empty();
+    if (v.equals(REPLAY_UNPROTECTED_V_BASE) || v.equals(REPLAY_UNPROTECTED_V_BASE_PLUS_1)) {
+      recId = v.subtract(REPLAY_UNPROTECTED_V_BASE).byteValueExact();
+    } else if (v.compareTo(REPLAY_PROTECTED_V_MIN) > 0) {
+      chainId = Optional.of(v.subtract(REPLAY_PROTECTED_V_BASE).divide(TWO));
+      recId = v.subtract(TWO.multiply(chainId.get()).add(REPLAY_PROTECTED_V_BASE)).byteValueExact();
+    } else {
+      throw new RuntimeException(
+          String.format("An unsupported encoded `v` value of %s was found", v));
+    }
+    return Map.entry(recId, chainId);
+  }
+
+  public static class TestBlockBody extends BlockBody {
+    @JsonCreator
+    public TestBlockBody(
+        @JsonProperty("Transactions") final List<TestTransaction> transactions,
+        @JsonProperty("Uncles") final List<TestBlockHeader> uncles) {
+      super(
+          transactions.stream().collect(toUnmodifiableList()),
+          uncles.stream().collect(toUnmodifiableList()));
+    }
+  }
+
+  public static class TestBlockHeader extends BlockHeader {
+
+    @JsonCreator
+    public TestBlockHeader(
+        @JsonProperty("parentHash") final String parentHash,
+        @JsonProperty("sha3Uncles") final String uncleHash,
+        @JsonProperty("miner") final String coinbase,
+        @JsonProperty("stateRoot") final String stateRoot,
+        @JsonProperty("transactionsRoot") final String transactionsTrie,
+        @JsonProperty("receiptsRoot") final String receiptTrie,
+        @JsonProperty("logsBloom") final String bloom,
+        @JsonProperty("difficulty") final String difficulty,
+        @JsonProperty("number") final String number,
+        @JsonProperty("gasLimit") final String gasLimit,
+        @JsonProperty("gasUsed") final String gasUsed,
+        @JsonProperty("timestamp") final String timestamp,
+        @JsonProperty("extraData") final String extraData,
+        @JsonProperty("mixHash") final String mixHash,
+        @JsonProperty("nonce") final String nonce,
+        @JsonProperty("hash") final String __) {
+      super(
+          Hash.fromHexString(parentHash),
+          Hash.fromHexString(uncleHash),
+          Address.fromHexString(coinbase),
+          Hash.fromHexString(stateRoot),
+          Hash.fromHexString(transactionsTrie),
+          Hash.fromHexString(receiptTrie),
+          LogsBloomFilter.fromHexString(bloom),
+          Difficulty.fromHexString(difficulty),
+          Long.decode(number),
+          Long.decode(gasLimit),
+          Long.decode(gasUsed),
+          Long.decode(timestamp),
+          Bytes.fromHexString(extraData),
+          null,
+          Hash.fromHexString(mixHash),
+          Bytes.fromHexStringLenient(nonce).toLong(),
+          null,
+          null,
+          null,
+          new MainnetBlockHeaderFunctions());
+    }
+  }
+
+  private JsonNode parseTestFile(final String filename) throws IOException {
+    return objectMapper.readTree(this.getClass().getResource("/" + filename));
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/NewPooledTransactionHashesMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/NewPooledTransactionHashesMessageTest.java
index 88a9ec3aebe..44af7d869b6 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/NewPooledTransactionHashesMessageTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/NewPooledTransactionHashesMessageTest.java
@@ -16,25 +16,29 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.hyperledger.besu.ethereum.core.Transaction.toHashList;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.EthProtocol;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage;
 
-import java.util.Arrays;
 import java.util.List;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
 import org.junit.Test;
 
 public class NewPooledTransactionHashesMessageTest {
 
   @Test
   public void roundTripNewPooledTransactionHashesMessage() {
-    List<Hash> hashes = Arrays.asList(Hash.wrap(Bytes32.random()));
-    final NewPooledTransactionHashesMessage msg = NewPooledTransactionHashesMessage.create(hashes);
+    final List<Transaction> transactions = List.of(new BlockDataGenerator().transaction());
+    final NewPooledTransactionHashesMessage msg =
+        NewPooledTransactionHashesMessage.create(transactions, EthProtocol.ETH66);
     assertThat(msg.getCode()).isEqualTo(EthPV65.NEW_POOLED_TRANSACTION_HASHES);
-    assertThat(msg.pendingTransactions()).isEqualTo(hashes);
+    final List<Hash> pendingHashes = msg.pendingTransactionHashes();
+    assertThat(pendingHashes).isEqualTo(toHashList(transactions));
   }
 
   @Test
@@ -42,6 +46,6 @@ public void readFromMessageWithWrongCodeThrows() {
     final RawMessage rawMsg = new RawMessage(EthPV62.BLOCK_HEADERS, Bytes.of(0));
 
     assertThatExceptionOfType(IllegalArgumentException.class)
-        .isThrownBy(() -> NewPooledTransactionHashesMessage.readFrom(rawMsg));
+        .isThrownBy(() -> NewPooledTransactionHashesMessage.readFrom(rawMsg, EthProtocol.ETH66));
   }
 }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/PooledTransactionsMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/PooledTransactionsMessageTest.java
index 252ae1e1c85..46ebf147172 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/PooledTransactionsMessageTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/PooledTransactionsMessageTest.java
@@ -17,9 +17,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage;
 import org.hyperledger.besu.plugin.data.TransactionType;
 
@@ -42,7 +42,7 @@ public void roundTripPooledTransactionsMessage() {
                 .gasPrice(Wei.of(2))
                 .value(Wei.of(1337))
                 .payload(Bytes.EMPTY)
-                .signAndBuild(SECP256K1.KeyPair.generate()));
+                .signAndBuild(SignatureAlgorithmFactory.getInstance().generateKeyPair()));
     final PooledTransactionsMessage msg = PooledTransactionsMessage.create(tx);
     assertThat(msg.getCode()).isEqualTo(EthPV65.POOLED_TRANSACTIONS);
     assertThat(msg.transactions()).isEqualTo(tx);
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/StatusMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/StatusMessageTest.java
index 592f356b031..8458c990768 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/StatusMessageTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/StatusMessageTest.java
@@ -16,10 +16,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.eth.EthProtocol;
-import org.hyperledger.besu.ethereum.eth.manager.ForkId;
+import org.hyperledger.besu.ethereum.eth.EthProtocolVersion;
+import org.hyperledger.besu.ethereum.forkid.ForkId;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 
 import java.math.BigInteger;
@@ -33,7 +33,7 @@ public class StatusMessageTest {
 
   @Test
   public void getters() {
-    final int version = EthProtocol.EthVersion.V62;
+    final int version = EthProtocolVersion.V62;
     final BigInteger networkId = BigInteger.ONE;
     final Difficulty td = Difficulty.of(1000L);
     final Hash bestHash = randHash(1L);
@@ -50,7 +50,7 @@ public void getters() {
 
   @Test
   public void serializeDeserialize() {
-    final int version = EthProtocol.EthVersion.V62;
+    final int version = EthProtocolVersion.V62;
     final BigInteger networkId = BigInteger.ONE;
     final Difficulty td = Difficulty.of(1000L);
     final Hash bestHash = randHash(1L);
@@ -70,7 +70,7 @@ public void serializeDeserialize() {
 
   @Test
   public void serializeDeserializeWithForkId() {
-    final int version = EthProtocol.EthVersion.V64;
+    final int version = EthProtocolVersion.V64;
     final BigInteger networkId = BigInteger.ONE;
     final Difficulty td = Difficulty.of(1000L);
     final Hash bestHash = randHash(1L);
@@ -90,6 +90,25 @@ public void serializeDeserializeWithForkId() {
     assertThat(copy.forkId()).isEqualTo(forkId);
   }
 
+  @Test
+  public void toStringDecodedHasExpectedInfo() {
+    final int version = EthProtocolVersion.V64;
+    final BigInteger networkId = BigInteger.ONE;
+    final Difficulty td = Difficulty.of(1000L);
+    final Hash bestHash = randHash(1L);
+    final Hash genesisHash = randHash(2L);
+    final ForkId forkId = new ForkId(Bytes.fromHexString("0xa00bc334"), 0L);
+
+    final MessageData msg =
+        StatusMessage.create(version, networkId, td, bestHash, genesisHash, forkId);
+
+    final StatusMessage copy = new StatusMessage(msg.getData());
+    final String copyToStringDecoded = copy.toStringDecoded();
+
+    assertThat(copyToStringDecoded).contains("bestHash=" + bestHash);
+    assertThat(copyToStringDecoded).contains("genesisHash=" + genesisHash);
+  }
+
   private Hash randHash(final long seed) {
     final Random random = new Random(seed);
     final byte[] bytes = new byte[32];
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/AccountRangeMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/AccountRangeMessageTest.java
new file mode 100644
index 00000000000..bfb76576fed
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/AccountRangeMessageTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.messages.snap;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+public final class AccountRangeMessageTest {
+
+  @Test
+  public void roundTripTest() {
+    final Map<Bytes32, Bytes> keys = new HashMap<>();
+    final StateTrieAccountValue accountValue =
+        new StateTrieAccountValue(1L, Wei.of(2L), Hash.EMPTY_TRIE_HASH, Hash.EMPTY);
+    keys.put(Hash.wrap(Bytes32.leftPad(Bytes.of(1))), RLP.encode(accountValue::writeTo));
+
+    final List<Bytes> proofs = new ArrayList<>();
+    proofs.add(Bytes32.random());
+
+    // Perform round-trip transformation
+    final MessageData initialMessage = AccountRangeMessage.create(keys, proofs);
+    final MessageData raw = new RawMessage(SnapV1.ACCOUNT_RANGE, initialMessage.getData());
+
+    final AccountRangeMessage message = AccountRangeMessage.readFrom(raw);
+
+    // check match originals.
+    final AccountRangeMessage.AccountRangeData range = message.accountData(false);
+    Assertions.assertThat(range.accounts()).isEqualTo(keys);
+    Assertions.assertThat(range.proofs()).isEqualTo(proofs);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/BytecodeMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/BytecodeMessageTest.java
new file mode 100644
index 00000000000..28b8b6883c8
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/BytecodeMessageTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.messages.snap;
+
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+public final class BytecodeMessageTest {
+
+  @Test
+  public void roundTripTest() {
+
+    final List<Bytes> codes = new ArrayList<>();
+    final int hashCount = 20;
+    for (int i = 0; i < hashCount; ++i) {
+      codes.add(Bytes32.random());
+    }
+
+    // Perform round-trip transformation
+    final MessageData initialMessage = ByteCodesMessage.create(codes);
+    final MessageData raw = new RawMessage(SnapV1.BYTECODES, initialMessage.getData());
+
+    final ByteCodesMessage message = ByteCodesMessage.readFrom(raw);
+
+    // check match originals.
+    final ByteCodesMessage.ByteCodes response = message.bytecodes(false);
+    Assertions.assertThat(response.codes()).isEqualTo(codes);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetAccountRangeMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetAccountRangeMessageTest.java
new file mode 100644
index 00000000000..c56629149db
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetAccountRangeMessageTest.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.messages.snap;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.RangeManager;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractSnapMessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+public final class GetAccountRangeMessageTest {
+
+  @Test
+  public void roundTripTest() {
+    final Hash rootHash = Hash.wrap(Bytes32.random());
+    final Hash startKeyHash = RangeManager.MIN_RANGE;
+    final Hash endKeyHash = RangeManager.MAX_RANGE;
+
+    // Perform round-trip transformation
+    final MessageData initialMessage =
+        GetAccountRangeMessage.create(rootHash, startKeyHash, endKeyHash);
+    final MessageData raw = new RawMessage(SnapV1.GET_ACCOUNT_RANGE, initialMessage.getData());
+
+    final GetAccountRangeMessage message = GetAccountRangeMessage.readFrom(raw);
+
+    // check match originals.
+    final GetAccountRangeMessage.Range range = message.range(false);
+    Assertions.assertThat(range.worldStateRootHash()).isEqualTo(rootHash);
+    Assertions.assertThat(range.startKeyHash()).isEqualTo(startKeyHash);
+    Assertions.assertThat(range.responseBytes()).isEqualTo(AbstractSnapMessageData.SIZE_REQUEST);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetBytecodeMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetBytecodeMessageTest.java
new file mode 100644
index 00000000000..39f16882094
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetBytecodeMessageTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.messages.snap;
+
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractSnapMessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+public final class GetBytecodeMessageTest {
+
+  @Test
+  public void roundTripTest() {
+
+    final List<Bytes32> hashes = new ArrayList<>();
+    final int hashCount = 20;
+    for (int i = 0; i < hashCount; ++i) {
+      hashes.add(Bytes32.random());
+    }
+
+    // Perform round-trip transformation
+    final MessageData initialMessage = GetByteCodesMessage.create(hashes);
+    final MessageData raw = new RawMessage(SnapV1.GET_BYTECODES, initialMessage.getData());
+
+    final GetByteCodesMessage message = GetByteCodesMessage.readFrom(raw);
+
+    // check match originals.
+    final GetByteCodesMessage.CodeHashes codeHashes = message.codeHashes(false);
+    Assertions.assertThat(codeHashes.hashes()).isEqualTo(hashes);
+    Assertions.assertThat(codeHashes.responseBytes())
+        .isEqualTo(AbstractSnapMessageData.SIZE_REQUEST);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetStorageRangeMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetStorageRangeMessageTest.java
new file mode 100644
index 00000000000..49a43f94124
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetStorageRangeMessageTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.messages.snap;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.RangeManager;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractSnapMessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage;
+
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+public final class GetStorageRangeMessageTest {
+
+  @Test
+  public void roundTripTest() {
+    final Hash rootHash = Hash.wrap(Bytes32.random());
+    final List<Bytes32> accountKeys = List.of(Bytes32.random());
+    final Hash startKeyHash = RangeManager.MIN_RANGE;
+    final Hash endKeyHash = RangeManager.MAX_RANGE;
+
+    // Perform round-trip transformation
+    final MessageData initialMessage =
+        GetStorageRangeMessage.create(rootHash, accountKeys, startKeyHash, endKeyHash);
+    final MessageData raw = new RawMessage(SnapV1.GET_STORAGE_RANGE, initialMessage.getData());
+
+    final GetStorageRangeMessage message = GetStorageRangeMessage.readFrom(raw);
+
+    // check match originals.
+    final GetStorageRangeMessage.StorageRange range = message.range(false);
+    Assertions.assertThat(range.worldStateRootHash()).isEqualTo(rootHash);
+    Assertions.assertThat(range.hashes()).isEqualTo(accountKeys);
+    Assertions.assertThat(range.startKeyHash()).isEqualTo(startKeyHash);
+    Assertions.assertThat(range.responseBytes()).isEqualTo(AbstractSnapMessageData.SIZE_REQUEST);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetTrieNodeMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetTrieNodeMessageTest.java
new file mode 100644
index 00000000000..67447005c87
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/GetTrieNodeMessageTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.messages.snap;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractSnapMessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+public final class GetTrieNodeMessageTest {
+
+  @Test
+  public void roundTripTest() {
+    final Hash rootHash = Hash.wrap(Bytes32.random());
+    final List<Bytes> paths = new ArrayList<>();
+    final int hashCount = 20;
+    for (int i = 0; i < hashCount; ++i) {
+      paths.add(Bytes32.random());
+    }
+
+    // Perform round-trip transformation
+    final MessageData initialMessage = GetTrieNodesMessage.create(rootHash, List.of(paths));
+    final MessageData raw = new RawMessage(SnapV1.GET_TRIE_NODES, initialMessage.getData());
+
+    final GetTrieNodesMessage message = GetTrieNodesMessage.readFrom(raw);
+
+    // check match originals.
+    final GetTrieNodesMessage.TrieNodesPaths response = message.paths(false);
+    Assertions.assertThat(response.worldStateRootHash()).isEqualTo(rootHash);
+    Assertions.assertThat(response.paths()).contains(paths);
+    Assertions.assertThat(response.responseBytes()).isEqualTo(AbstractSnapMessageData.SIZE_REQUEST);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/StorageRangeMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/StorageRangeMessageTest.java
new file mode 100644
index 00000000000..c3272d1139f
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/StorageRangeMessageTest.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.messages.snap;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.TreeMap;
+
+import kotlin.collections.ArrayDeque;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+public final class StorageRangeMessageTest {
+
+  @Test
+  public void roundTripTest() {
+
+    final ArrayDeque<TreeMap<Bytes32, Bytes>> keys = new ArrayDeque<>();
+    final TreeMap<Bytes32, Bytes> storage = new TreeMap<>();
+    storage.put(Hash.wrap(Bytes32.leftPad(Bytes.of(1))), Bytes32.random());
+    keys.add(storage);
+
+    final List<Bytes> proofs = new ArrayList<>();
+    proofs.add(Bytes32.random());
+
+    // Perform round-trip transformation
+    final MessageData initialMessage = StorageRangeMessage.create(keys, proofs);
+    final MessageData raw = new RawMessage(SnapV1.STORAGE_RANGE, initialMessage.getData());
+
+    final StorageRangeMessage message = StorageRangeMessage.readFrom(raw);
+
+    // check match originals.
+    final StorageRangeMessage.SlotRangeData range = message.slotsData(false);
+    Assertions.assertThat(range.slots()).isEqualTo(keys);
+    Assertions.assertThat(range.proofs()).isEqualTo(proofs);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/TrieNodeMessageTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/TrieNodeMessageTest.java
new file mode 100644
index 00000000000..02481e7e1b2
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/messages/snap/TrieNodeMessageTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.messages.snap;
+
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import kotlin.collections.ArrayDeque;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+public final class TrieNodeMessageTest {
+
+  @Test
+  public void roundTripTest() {
+    final List<Bytes> nodes = new ArrayList<>();
+    final int hashCount = 20;
+    for (int i = 0; i < hashCount; ++i) {
+      nodes.add(Bytes32.random());
+    }
+
+    // Perform round-trip transformation
+    final MessageData initialMessage = TrieNodesMessage.create(nodes);
+    final MessageData raw = new RawMessage(SnapV1.TRIE_NODES, initialMessage.getData());
+
+    final TrieNodesMessage message = TrieNodesMessage.readFrom(raw);
+
+    // check match originals.
+    final ArrayDeque<Bytes> response = message.nodes(false);
+    Assertions.assertThat(response).isEqualTo(nodes);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/peervalidation/RequiredBlocksPeerValidatorTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/peervalidation/RequiredBlocksPeerValidatorTest.java
index 1054613b9c4..eab13c3df22 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/peervalidation/RequiredBlocksPeerValidatorTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/peervalidation/RequiredBlocksPeerValidatorTest.java
@@ -18,10 +18,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.ProtocolScheduleFixture;
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/AbstractBlockPropagationManagerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/AbstractBlockPropagationManagerTest.java
new file mode 100644
index 00000000000..25ff8ab4b46
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/AbstractBlockPropagationManagerTest.java
@@ -0,0 +1,1005 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.consensus.merge.ForkchoiceEvent;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.ConsensusContext;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.BadBlockManager;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.BlockImporter;
+import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthMessages;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer.Responder;
+import org.hyperledger.besu.ethereum.eth.messages.EthPV62;
+import org.hyperledger.besu.ethereum.eth.messages.NewBlockHashesMessage;
+import org.hyperledger.besu.ethereum.eth.messages.NewBlockMessage;
+import org.hyperledger.besu.ethereum.eth.sync.BlockPropagationManager.ProcessingBlocksManager;
+import org.hyperledger.besu.ethereum.eth.sync.state.PendingBlocksManager;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.testutil.TestClock;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Supplier;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+public abstract class AbstractBlockPropagationManagerTest {
+
+  private static final Bytes NODE_ID_1 = Bytes.fromHexString("0x00");
+
+  protected BlockchainSetupUtil blockchainUtil;
+  protected ProtocolSchedule protocolSchedule;
+  protected ProtocolContext protocolContext;
+  protected MutableBlockchain blockchain;
+  protected BlockBroadcaster blockBroadcaster;
+  protected EthProtocolManager ethProtocolManager;
+  protected BlockPropagationManager blockPropagationManager;
+  protected SynchronizerConfiguration syncConfig;
+  protected final PendingBlocksManager pendingBlocksManager =
+      spy(
+          new PendingBlocksManager(
+              SynchronizerConfiguration.builder().blockPropagationRange(-10, 30).build()));
+  protected final ProcessingBlocksManager processingBlocksManager =
+      spy(new ProcessingBlocksManager());
+  protected SyncState syncState;
+  protected final MetricsSystem metricsSystem = new NoOpMetricsSystem();
+  private final Hash finalizedHash = Hash.fromHexStringLenient("0x1337");
+
+  protected void setup(final DataStorageFormat dataStorageFormat) {
+    blockchainUtil = BlockchainSetupUtil.forTesting(dataStorageFormat);
+    blockchain = blockchainUtil.getBlockchain();
+    protocolSchedule = blockchainUtil.getProtocolSchedule();
+    final ProtocolContext tempProtocolContext = blockchainUtil.getProtocolContext();
+    protocolContext =
+        new ProtocolContext(
+            blockchain,
+            tempProtocolContext.getWorldStateArchive(),
+            tempProtocolContext.getConsensusContext(ConsensusContext.class),
+            Optional.empty());
+    ethProtocolManager =
+        EthProtocolManagerTestUtil.create(
+            protocolSchedule,
+            blockchain,
+            blockchainUtil.getWorldArchive(),
+            blockchainUtil.getTransactionPool(),
+            EthProtocolConfiguration.defaultConfig());
+    syncConfig = SynchronizerConfiguration.builder().blockPropagationRange(-3, 5).build();
+    syncState = new SyncState(blockchain, ethProtocolManager.ethContext().getEthPeers());
+    blockBroadcaster = mock(BlockBroadcaster.class);
+    blockPropagationManager =
+        new BlockPropagationManager(
+            syncConfig,
+            protocolSchedule,
+            protocolContext,
+            ethProtocolManager.ethContext(),
+            syncState,
+            pendingBlocksManager,
+            metricsSystem,
+            blockBroadcaster,
+            processingBlocksManager);
+  }
+
+  @Test
+  public void importsAnnouncedBlocks_aheadOfChainInOrder() {
+    blockchainUtil.importFirstBlocks(2);
+    final Block nextBlock = blockchainUtil.getBlock(2);
+    final Block nextNextBlock = blockchainUtil.getBlock(3);
+
+    // Sanity check
+    assertThat(blockchain.contains(nextBlock.getHash())).isFalse();
+    assertThat(blockchain.contains(nextNextBlock.getHash())).isFalse();
+
+    blockPropagationManager.start();
+
+    // Setup additional peer for best peers list
+    EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+    // Setup peer and messages
+    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+    final NewBlockHashesMessage nextAnnouncement =
+        NewBlockHashesMessage.create(
+            Collections.singletonList(
+                new NewBlockHashesMessage.NewBlockHash(
+                    nextBlock.getHash(), nextBlock.getHeader().getNumber())));
+    final NewBlockHashesMessage nextNextAnnouncement =
+        NewBlockHashesMessage.create(
+            Collections.singletonList(
+                new NewBlockHashesMessage.NewBlockHash(
+                    nextNextBlock.getHash(), nextNextBlock.getHeader().getNumber())));
+    final Responder responder = RespondingEthPeer.blockchainResponder(getFullBlockchain());
+
+    // Broadcast first message
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, nextAnnouncement);
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+    // Broadcast second message
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, nextNextAnnouncement);
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+
+    assertThat(blockchain.contains(nextBlock.getHash())).isTrue();
+    assertThat(blockchain.contains(nextNextBlock.getHash())).isTrue();
+  }
+
+  @Test
+  public void importsAnnouncedBlocks_aheadOfChainOutOfOrder() {
+    blockchainUtil.importFirstBlocks(2);
+    final Block nextBlock = blockchainUtil.getBlock(2);
+    final Block nextNextBlock = blockchainUtil.getBlock(3);
+
+    // Sanity check
+    assertThat(blockchain.contains(nextBlock.getHash())).isFalse();
+    assertThat(blockchain.contains(nextNextBlock.getHash())).isFalse();
+
+    blockPropagationManager.start();
+
+    // Setup peer and messages
+    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+    final NewBlockHashesMessage nextAnnouncement =
+        NewBlockHashesMessage.create(
+            Collections.singletonList(
+                new NewBlockHashesMessage.NewBlockHash(
+                    nextBlock.getHash(), nextBlock.getHeader().getNumber())));
+    final NewBlockHashesMessage nextNextAnnouncement =
+        NewBlockHashesMessage.create(
+            Collections.singletonList(
+                new NewBlockHashesMessage.NewBlockHash(
+                    nextNextBlock.getHash(), nextNextBlock.getHeader().getNumber())));
+    final Responder responder = RespondingEthPeer.blockchainResponder(getFullBlockchain());
+
+    // Broadcast second message first
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, nextNextAnnouncement);
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+    // Broadcast first message
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, nextAnnouncement);
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+
+    assertThat(blockchain.contains(nextBlock.getHash())).isTrue();
+    assertThat(blockchain.contains(nextNextBlock.getHash())).isTrue();
+  }
+
+  @Test
+  public void importsAnnouncedNewBlocks_aheadOfChainInOrder() {
+    blockchainUtil.importFirstBlocks(2);
+    final Block nextBlock = blockchainUtil.getBlock(2);
+    final Block nextNextBlock = blockchainUtil.getBlock(3);
+
+    // Sanity check
+    assertThat(blockchain.contains(nextBlock.getHash())).isFalse();
+    assertThat(blockchain.contains(nextNextBlock.getHash())).isFalse();
+
+    blockPropagationManager.start();
+
+    // Setup peer and messages
+    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+    final NewBlockMessage nextAnnouncement =
+        NewBlockMessage.create(
+            nextBlock, getFullBlockchain().getTotalDifficultyByHash(nextBlock.getHash()).get());
+    final NewBlockMessage nextNextAnnouncement =
+        NewBlockMessage.create(
+            nextNextBlock,
+            getFullBlockchain().getTotalDifficultyByHash(nextNextBlock.getHash()).get());
+    final Responder responder = RespondingEthPeer.blockchainResponder(getFullBlockchain());
+
+    // Broadcast first message
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, nextAnnouncement);
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+    // Broadcast second message
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, nextNextAnnouncement);
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+
+    assertThat(blockchain.contains(nextBlock.getHash())).isTrue();
+    assertThat(blockchain.contains(nextNextBlock.getHash())).isTrue();
+  }
+
+  @Test
+  public void importsAnnouncedNewBlocks_aheadOfChainOutOfOrder() {
+    blockchainUtil.importFirstBlocks(2);
+    final Block nextBlock = blockchainUtil.getBlock(2);
+    final Block nextNextBlock = blockchainUtil.getBlock(3);
+
+    // Sanity check
+    assertThat(blockchain.contains(nextBlock.getHash())).isFalse();
+    assertThat(blockchain.contains(nextNextBlock.getHash())).isFalse();
+
+    blockPropagationManager.start();
+
+    // Setup peer and messages
+    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+    final NewBlockMessage nextAnnouncement =
+        NewBlockMessage.create(
+            nextBlock, getFullBlockchain().getTotalDifficultyByHash(nextBlock.getHash()).get());
+    final NewBlockMessage nextNextAnnouncement =
+        NewBlockMessage.create(
+            nextNextBlock,
+            getFullBlockchain().getTotalDifficultyByHash(nextNextBlock.getHash()).get());
+    final Responder responder = RespondingEthPeer.blockchainResponder(getFullBlockchain());
+
+    // Broadcast second message first
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, nextNextAnnouncement);
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+    // Broadcast first message
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, nextAnnouncement);
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+
+    assertThat(blockchain.contains(nextBlock.getHash())).isTrue();
+    assertThat(blockchain.contains(nextNextBlock.getHash())).isTrue();
+  }
+
+  @Test
+  public void importsMixedOutOfOrderMessages() {
+    blockchainUtil.importFirstBlocks(2);
+    final Block block1 = blockchainUtil.getBlock(2);
+    final Block block2 = blockchainUtil.getBlock(3);
+    final Block block3 = blockchainUtil.getBlock(4);
+    final Block block4 = blockchainUtil.getBlock(5);
+
+    // Sanity check
+    assertThat(blockchain.contains(block1.getHash())).isFalse();
+    assertThat(blockchain.contains(block2.getHash())).isFalse();
+    assertThat(blockchain.contains(block3.getHash())).isFalse();
+    assertThat(blockchain.contains(block4.getHash())).isFalse();
+
+    blockPropagationManager.start();
+
+    // Setup peer and messages
+    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+    final NewBlockHashesMessage block1Msg =
+        NewBlockHashesMessage.create(
+            Collections.singletonList(
+                new NewBlockHashesMessage.NewBlockHash(
+                    block1.getHash(), block1.getHeader().getNumber())));
+    final NewBlockMessage block2Msg =
+        NewBlockMessage.create(
+            block2, getFullBlockchain().getTotalDifficultyByHash(block2.getHash()).get());
+    final NewBlockHashesMessage block3Msg =
+        NewBlockHashesMessage.create(
+            Collections.singletonList(
+                new NewBlockHashesMessage.NewBlockHash(
+                    block3.getHash(), block3.getHeader().getNumber())));
+    final NewBlockMessage block4Msg =
+        NewBlockMessage.create(
+            block4, getFullBlockchain().getTotalDifficultyByHash(block4.getHash()).get());
+    final Responder responder = RespondingEthPeer.blockchainResponder(getFullBlockchain());
+
+    // Broadcast older blocks
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, block3Msg);
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, block4Msg);
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, block2Msg);
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+    // Broadcast first block
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, block1Msg);
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+
+    assertThat(blockchain.contains(block1.getHash())).isTrue();
+    assertThat(blockchain.contains(block2.getHash())).isTrue();
+    assertThat(blockchain.contains(block3.getHash())).isTrue();
+    assertThat(blockchain.contains(block4.getHash())).isTrue();
+  }
+
+  @Test
+  public void handlesDuplicateAnnouncements() {
+
+    final ProtocolSchedule stubProtocolSchedule = spy(protocolSchedule);
+    final ProtocolSpec stubProtocolSpec = spy(protocolSchedule.getByBlockHeader(blockHeader(2)));
+    final BlockImporter stubBlockImporter = spy(stubProtocolSpec.getBlockImporter());
+    doReturn(stubProtocolSpec).when(stubProtocolSchedule).getByBlockHeader(any());
+    doReturn(stubBlockImporter).when(stubProtocolSpec).getBlockImporter();
+    final BlockPropagationManager blockPropagationManager =
+        new BlockPropagationManager(
+            syncConfig,
+            stubProtocolSchedule,
+            protocolContext,
+            ethProtocolManager.ethContext(),
+            syncState,
+            pendingBlocksManager,
+            metricsSystem,
+            blockBroadcaster);
+
+    blockchainUtil.importFirstBlocks(2);
+    final Block nextBlock = blockchainUtil.getBlock(2);
+
+    // Sanity check
+    assertThat(blockchain.contains(nextBlock.getHash())).isFalse();
+
+    blockPropagationManager.start();
+
+    // Setup peer and messages
+    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+    final NewBlockHashesMessage newBlockHash =
+        NewBlockHashesMessage.create(
+            Collections.singletonList(
+                new NewBlockHashesMessage.NewBlockHash(
+                    nextBlock.getHash(), nextBlock.getHeader().getNumber())));
+    final NewBlockMessage newBlock =
+        NewBlockMessage.create(
+            nextBlock, getFullBlockchain().getTotalDifficultyByHash(nextBlock.getHash()).get());
+    final Responder responder = RespondingEthPeer.blockchainResponder(getFullBlockchain());
+
+    // Broadcast first message
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, newBlock);
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+    // Broadcast duplicate
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, newBlockHash);
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+    // Broadcast duplicate
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, newBlock);
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+
+    assertThat(blockchain.contains(nextBlock.getHash())).isTrue();
+    verify(stubBlockImporter, times(1)).importBlock(eq(protocolContext), eq(nextBlock), any());
+  }
+
+  @Test
+  public void handlesPendingDuplicateAnnouncements() {
+    final ProtocolSchedule stubProtocolSchedule = spy(protocolSchedule);
+    final ProtocolSpec stubProtocolSpec = spy(protocolSchedule.getByBlockHeader(blockHeader(2)));
+    final BlockImporter stubBlockImporter = spy(stubProtocolSpec.getBlockImporter());
+    doReturn(stubProtocolSpec).when(stubProtocolSchedule).getByBlockHeader(any());
+    doReturn(stubBlockImporter).when(stubProtocolSpec).getBlockImporter();
+    final BlockPropagationManager blockPropagationManager =
+        new BlockPropagationManager(
+            syncConfig,
+            stubProtocolSchedule,
+            protocolContext,
+            ethProtocolManager.ethContext(),
+            syncState,
+            pendingBlocksManager,
+            metricsSystem,
+            blockBroadcaster);
+    blockchainUtil.importFirstBlocks(2);
+    final Block nextBlock = blockchainUtil.getBlock(2);
+
+    // Sanity check
+    assertThat(blockchain.contains(nextBlock.getHash())).isFalse();
+
+    blockPropagationManager.start();
+
+    // Setup peer and messages
+    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+    final NewBlockHashesMessage newBlockHash =
+        NewBlockHashesMessage.create(
+            Collections.singletonList(
+                new NewBlockHashesMessage.NewBlockHash(
+                    nextBlock.getHash(), nextBlock.getHeader().getNumber())));
+    final NewBlockMessage newBlock =
+        NewBlockMessage.create(
+            nextBlock, getFullBlockchain().getTotalDifficultyByHash(nextBlock.getHash()).get());
+
+    // Broadcast messages
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, newBlock);
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, newBlockHash);
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, newBlock);
+    // Respond
+    final Responder responder = RespondingEthPeer.blockchainResponder(getFullBlockchain());
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+
+    assertThat(blockchain.contains(nextBlock.getHash())).isTrue();
+    verify(stubBlockImporter, times(1)).importBlock(eq(protocolContext), eq(nextBlock), any());
+  }
+
+  @Test
+  public void ignoresFutureNewBlockHashAnnouncement() {
+    blockchainUtil.importFirstBlocks(2);
+    final Block futureBlock = blockchainUtil.getBlock(11);
+
+    // Sanity check
+    assertThat(blockchain.contains(futureBlock.getHash())).isFalse();
+
+    blockPropagationManager.start();
+
+    // Setup peer and messages
+    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+    final NewBlockHashesMessage futureAnnouncement =
+        NewBlockHashesMessage.create(
+            Collections.singletonList(
+                new NewBlockHashesMessage.NewBlockHash(
+                    futureBlock.getHash(), futureBlock.getHeader().getNumber())));
+
+    // Broadcast
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, futureAnnouncement);
+    final Responder responder = RespondingEthPeer.blockchainResponder(getFullBlockchain());
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+
+    assertThat(blockchain.contains(futureBlock.getHash())).isFalse();
+  }
+
+  @Test
+  public void ignoresFutureNewBlockAnnouncement() {
+    blockchainUtil.importFirstBlocks(2);
+    final Block futureBlock = blockchainUtil.getBlock(11);
+
+    // Sanity check
+    assertThat(blockchain.contains(futureBlock.getHash())).isFalse();
+
+    blockPropagationManager.start();
+
+    // Setup peer and messages
+    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+    final NewBlockMessage futureAnnouncement =
+        NewBlockMessage.create(
+            futureBlock, getFullBlockchain().getTotalDifficultyByHash(futureBlock.getHash()).get());
+
+    // Broadcast
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, futureAnnouncement);
+    final Responder responder = RespondingEthPeer.blockchainResponder(getFullBlockchain());
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+
+    assertThat(blockchain.contains(futureBlock.getHash())).isFalse();
+  }
+
+  @Test
+  public void ignoresOldNewBlockHashAnnouncement() {
+    final BlockDataGenerator gen = new BlockDataGenerator();
+    blockchainUtil.importFirstBlocks(10);
+    final Block blockOne = blockchainUtil.getBlock(1);
+    final Block oldBlock = gen.nextBlock(blockOne);
+
+    // Sanity check
+    assertThat(blockchain.contains(oldBlock.getHash())).isFalse();
+
+    final BlockPropagationManager propManager = spy(blockPropagationManager);
+    propManager.start();
+
+    // Setup peer and messages
+    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+    final NewBlockHashesMessage oldAnnouncement =
+        NewBlockHashesMessage.create(
+            Collections.singletonList(
+                new NewBlockHashesMessage.NewBlockHash(
+                    oldBlock.getHash(), oldBlock.getHeader().getNumber())));
+
+    // Broadcast
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, oldAnnouncement);
+    final Responder responder = RespondingEthPeer.blockchainResponder(getFullBlockchain());
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+
+    verify(propManager, times(0)).importOrSavePendingBlock(any(), any(Bytes.class));
+    assertThat(blockchain.contains(oldBlock.getHash())).isFalse();
+  }
+
+  @Test
+  public void ignoresOldNewBlockAnnouncement() {
+    final BlockDataGenerator gen = new BlockDataGenerator();
+    blockchainUtil.importFirstBlocks(10);
+    final Block blockOne = blockchainUtil.getBlock(1);
+    final Block oldBlock = gen.nextBlock(blockOne);
+
+    // Sanity check
+    assertThat(blockchain.contains(oldBlock.getHash())).isFalse();
+
+    final BlockPropagationManager propManager = spy(blockPropagationManager);
+    propManager.start();
+
+    // Setup peer and messages
+    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+    final NewBlockMessage oldAnnouncement = NewBlockMessage.create(oldBlock, Difficulty.ZERO);
+
+    // Broadcast
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, oldAnnouncement);
+    final Responder responder = RespondingEthPeer.blockchainResponder(getFullBlockchain());
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+
+    verify(propManager, times(0)).importOrSavePendingBlock(any(), any(Bytes.class));
+    assertThat(blockchain.contains(oldBlock.getHash())).isFalse();
+  }
+
+  @Test
+  public void purgesOldBlocks() {
+    final int oldBlocksToImport = 3;
+    syncConfig =
+        SynchronizerConfiguration.builder().blockPropagationRange(-oldBlocksToImport, 5).build();
+    final BlockPropagationManager blockPropagationManager =
+        new BlockPropagationManager(
+            syncConfig,
+            protocolSchedule,
+            protocolContext,
+            ethProtocolManager.ethContext(),
+            syncState,
+            pendingBlocksManager,
+            metricsSystem,
+            blockBroadcaster);
+
+    final BlockDataGenerator gen = new BlockDataGenerator();
+    // Import some blocks
+    blockchainUtil.importFirstBlocks(5);
+    // Set up test block next to head, that should eventually be purged
+    final Block blockToPurge =
+        gen.block(BlockOptions.create().setBlockNumber(blockchain.getChainHeadBlockNumber()));
+
+    blockPropagationManager.start();
+    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+    final NewBlockMessage blockAnnouncementMsg =
+        NewBlockMessage.create(blockToPurge, Difficulty.ZERO);
+
+    // Broadcast
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, blockAnnouncementMsg);
+    final Responder responder = RespondingEthPeer.blockchainResponder(getFullBlockchain());
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+
+    // Check that we pushed our block into the pending collection
+    assertThat(blockchain.contains(blockToPurge.getHash())).isFalse();
+    assertThat(pendingBlocksManager.contains(blockToPurge.getHash())).isTrue();
+
+    // Import blocks until we bury the target block far enough to be cleaned up
+    for (int i = 0; i < oldBlocksToImport; i++) {
+      blockchainUtil.importBlockAtIndex((int) blockchain.getChainHeadBlockNumber() + 1);
+
+      assertThat(blockchain.contains(blockToPurge.getHash())).isFalse();
+      assertThat(pendingBlocksManager.contains(blockToPurge.getHash())).isTrue();
+    }
+
+    // Import again to trigger cleanup
+    blockchainUtil.importBlockAtIndex((int) blockchain.getChainHeadBlockNumber() + 1);
+    assertThat(blockchain.contains(blockToPurge.getHash())).isFalse();
+    assertThat(pendingBlocksManager.contains(blockToPurge.getHash())).isFalse();
+  }
+
+  @Test
+  public void updatesChainHeadWhenNewBlockMessageReceived() {
+    blockchainUtil.importFirstBlocks(2);
+    final Block nextBlock = blockchainUtil.getBlock(2);
+
+    blockPropagationManager.start();
+
+    // Setup peer and messages
+    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+    final Difficulty parentTotalDifficulty =
+        getFullBlockchain().getTotalDifficultyByHash(nextBlock.getHeader().getParentHash()).get();
+    final Difficulty totalDifficulty =
+        getFullBlockchain().getTotalDifficultyByHash(nextBlock.getHash()).get();
+    final NewBlockMessage nextAnnouncement = NewBlockMessage.create(nextBlock, totalDifficulty);
+
+    // Broadcast message
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, nextAnnouncement);
+    final Responder responder = RespondingEthPeer.blockchainResponder(getFullBlockchain());
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+
+    assertThat(peer.getEthPeer().chainState().getBestBlock().getHash())
+        .isEqualTo(nextBlock.getHeader().getParentHash());
+    assertThat(peer.getEthPeer().chainState().getEstimatedHeight())
+        .isEqualTo(nextBlock.getHeader().getNumber() - 1);
+    assertThat(peer.getEthPeer().chainState().getBestBlock().getTotalDifficulty())
+        .isEqualTo(parentTotalDifficulty);
+  }
+
+  @SuppressWarnings("unchecked")
+  @Test
+  public void shouldNotImportBlocksThatAreAlreadyBeingImported() {
+    final EthScheduler ethScheduler = mock(EthScheduler.class);
+    when(ethScheduler.scheduleSyncWorkerTask(any(Supplier.class)))
+        .thenReturn(new CompletableFuture<>());
+    final EthContext ethContext =
+        new EthContext(
+            new EthPeers(
+                "eth",
+                () -> protocolSchedule.getByBlockHeader(blockchain.getChainHeadHeader()),
+                TestClock.fixed(),
+                metricsSystem,
+                EthProtocolConfiguration.DEFAULT_MAX_MESSAGE_SIZE,
+                Collections.emptyList(),
+                Bytes.random(64),
+                25,
+                25,
+                25,
+                false),
+            new EthMessages(),
+            ethScheduler);
+    final BlockPropagationManager blockPropagationManager =
+        new BlockPropagationManager(
+            syncConfig,
+            protocolSchedule,
+            protocolContext,
+            ethContext,
+            syncState,
+            pendingBlocksManager,
+            metricsSystem,
+            blockBroadcaster);
+
+    blockchainUtil.importFirstBlocks(2);
+    final Block nextBlock = blockchainUtil.getBlock(2);
+
+    blockPropagationManager.importOrSavePendingBlock(nextBlock, NODE_ID_1);
+    blockPropagationManager.importOrSavePendingBlock(nextBlock, NODE_ID_1);
+
+    verify(ethScheduler, times(1)).scheduleSyncWorkerTask(any(Supplier.class));
+  }
+
+  @Test
+  public void shouldRequestLowestAnnouncedPendingBlockParent() {
+    // test if block propagation manager can recover if one block is missed
+
+    blockchainUtil.importFirstBlocks(2);
+    final List<Block> blocks = blockchainUtil.getBlocks().subList(2, 4);
+
+    blockPropagationManager.start();
+
+    // Create peer and responder
+    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+    final Responder responder = RespondingEthPeer.blockchainResponder(getFullBlockchain());
+
+    // skip first block then create messages from blocklist
+    blocks.stream()
+        .skip(1)
+        .map(this::createNewBlockHashMessage)
+        .forEach(
+            message -> { // Broadcast new block hash message
+              EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, message);
+            });
+
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+
+    // assert all blocks were imported
+    blocks.forEach(
+        block -> {
+          assertThat(blockchain.contains(block.getHash())).isTrue();
+        });
+  }
+
+  @Test
+  public void shouldRequestLowestAnnouncedPendingBlockParent_twoMissingBlocks() {
+    // test if block propagation manager can recover if one block is missed
+    blockchainUtil.importFirstBlocks(2);
+    final List<Block> blocks = blockchainUtil.getBlocks().subList(2, 6);
+
+    blockPropagationManager.start();
+
+    // Create peer and responder
+    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+    final Responder responder = RespondingEthPeer.blockchainResponder(getFullBlockchain());
+
+    // skip two block then create messages from blocklist
+    blocks.stream()
+        .skip(2)
+        .map(this::createNewBlockHashMessage)
+        .forEach(
+            message -> { // Broadcast new block hash message
+              EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, message);
+            });
+
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+
+    // assert all blocks were imported
+    blocks.forEach(
+        block -> {
+          assertThat(blockchain.contains(block.getHash())).isTrue();
+        });
+  }
+
+  private NewBlockHashesMessage createNewBlockHashMessage(final Block block) {
+    return NewBlockHashesMessage.create(
+        Collections.singletonList(
+            new NewBlockHashesMessage.NewBlockHash(
+                block.getHash(), block.getHeader().getNumber())));
+  }
+
+  @Test
+  public void verifyBroadcastBlockInvocation() {
+    blockchainUtil.importFirstBlocks(2);
+    final Block block = blockchainUtil.getBlock(2);
+    blockPropagationManager.start();
+
+    // Setup peer and messages
+    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+
+    final Difficulty totalDifficulty =
+        getFullBlockchain().getTotalDifficultyByHash(block.getHash()).get();
+    final NewBlockMessage newBlockMessage = NewBlockMessage.create(block, totalDifficulty);
+
+    // Broadcast message
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, newBlockMessage);
+
+    final Responder responder = RespondingEthPeer.blockchainResponder(getFullBlockchain());
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+
+    verify(blockBroadcaster, times(1)).propagate(block, totalDifficulty);
+  }
+
+  @SuppressWarnings("unchecked")
+  @Test
+  public void shouldDetectAndCacheInvalidBlocks() {
+    final EthScheduler ethScheduler = mock(EthScheduler.class);
+    when(ethScheduler.scheduleSyncWorkerTask(any(Supplier.class)))
+        .thenAnswer(
+            new Answer<Object>() {
+              @Override
+              public Object answer(final InvocationOnMock invocation) throws Throwable {
+                return invocation.getArgument(0, Supplier.class).get();
+              }
+            });
+
+    final EthContext ethContext =
+        new EthContext(
+            new EthPeers(
+                "eth",
+                () -> protocolSchedule.getByBlockHeader(blockchain.getChainHeadHeader()),
+                TestClock.fixed(),
+                metricsSystem,
+                EthProtocolConfiguration.DEFAULT_MAX_MESSAGE_SIZE,
+                Collections.emptyList(),
+                Bytes.random(64),
+                25,
+                25,
+                25,
+                false),
+            new EthMessages(),
+            ethScheduler);
+    final BlockPropagationManager blockPropagationManager =
+        new BlockPropagationManager(
+            syncConfig,
+            protocolSchedule,
+            protocolContext,
+            ethContext,
+            syncState,
+            pendingBlocksManager,
+            metricsSystem,
+            blockBroadcaster);
+
+    blockchainUtil.importFirstBlocks(2);
+    final Block firstBlock = blockchainUtil.getBlock(1);
+    final BadBlockManager badBlocksManager =
+        protocolSchedule.getByBlockHeader(blockHeader(1)).getBadBlocksManager();
+    final Block badBlock =
+        new BlockDataGenerator()
+            .block(
+                BlockDataGenerator.BlockOptions.create()
+                    .setBlockNumber(1)
+                    .setParentHash(firstBlock.getHash())
+                    .setBlockHeaderFunctions(new MainnetBlockHeaderFunctions()));
+
+    assertThat(badBlocksManager.getBadBlocks()).isEmpty();
+    blockPropagationManager.importOrSavePendingBlock(badBlock, NODE_ID_1);
+    assertThat(badBlocksManager.getBadBlocks().size()).isEqualTo(1);
+
+    verify(ethScheduler, times(1)).scheduleSyncWorkerTask(any(Supplier.class));
+  }
+
+  @Test
+  public void shouldTryWithAnotherPeerWhenFailedDownloadingBlock() {
+    blockchainUtil.importFirstBlocks(2);
+    final Block nextBlock = blockchainUtil.getBlock(2);
+
+    // Sanity check
+    assertThat(blockchain.contains(nextBlock.getHash())).isFalse();
+
+    blockPropagationManager.start();
+
+    // Setup peer and messages
+    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+    final RespondingEthPeer secondPeer =
+        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 2);
+
+    // Pretend the second peer is busier, so the first is selected a first
+    when(spy(secondPeer.getEthPeer()).outstandingRequests()).thenReturn(1);
+
+    final NewBlockHashesMessage nextAnnouncement =
+        NewBlockHashesMessage.create(
+            Collections.singletonList(
+                new NewBlockHashesMessage.NewBlockHash(
+                    nextBlock.getHash(), nextBlock.getHeader().getNumber())));
+
+    // Broadcast first message
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, nextAnnouncement);
+    peer.respondWhile(RespondingEthPeer.emptyResponder(), peer::hasOutstandingRequests);
+    secondPeer.respondWhile(
+        RespondingEthPeer.blockchainResponder(getFullBlockchain()),
+        secondPeer::hasOutstandingRequests);
+
+    assertThat(blockchain.contains(nextBlock.getHash())).isTrue();
+  }
+
+  @Test
+  public void shouldThrowErrorWhenNoValidPeerAvailable() {
+    blockchainUtil.importFirstBlocks(2);
+    final Block nextBlock = blockchainUtil.getBlock(2);
+
+    // Sanity check
+    assertThat(blockchain.contains(nextBlock.getHash())).isFalse();
+
+    blockPropagationManager.start();
+
+    // Setup peer and messages
+    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+    final RespondingEthPeer secondPeer =
+        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+
+    final NewBlockHashesMessage nextAnnouncement =
+        NewBlockHashesMessage.create(
+            Collections.singletonList(
+                new NewBlockHashesMessage.NewBlockHash(
+                    nextBlock.getHash(), nextBlock.getHeader().getNumber())));
+
+    // Broadcast first message
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, nextAnnouncement);
+    peer.respondWhile(RespondingEthPeer.emptyResponder(), peer::hasOutstandingRequests);
+    secondPeer.respondWhile(RespondingEthPeer.emptyResponder(), secondPeer::hasOutstandingRequests);
+
+    assertThat(blockchain.contains(nextBlock.getHash())).isFalse();
+  }
+
+  @Test
+  public void shouldStopWhenFinalized() {
+    blockPropagationManager.start();
+    // syncState.setReachedTerminalDifficulty(true);
+    blockPropagationManager.onNewUnverifiedForkchoice(
+        new ForkchoiceEvent(null, null, this.finalizedHash));
+    assertThat(blockPropagationManager.isRunning()).isFalse();
+    assertThat(ethProtocolManager.ethContext().getEthMessages().messageCodesHandled())
+        .doesNotContain(EthPV62.NEW_BLOCK_HASHES, EthPV62.NEW_BLOCK);
+  }
+
+  @Test
+  public void shouldRestartWhenTTDReachedReturnsFalseAfterFinalizing() {
+    blockPropagationManager.start();
+    syncState.setReachedTerminalDifficulty(true);
+    blockPropagationManager.onNewUnverifiedForkchoice(
+        new ForkchoiceEvent(null, null, this.finalizedHash));
+    assertThat(blockPropagationManager.isRunning()).isFalse();
+    syncState.setReachedTerminalDifficulty(false);
+    assertThat(blockPropagationManager.isRunning()).isTrue();
+  }
+
+  @Test
+  public void shouldNotListenToNewBlockHashesAnnouncementsWhenTTDReachedAndFinal() {
+    blockchainUtil.importFirstBlocks(2);
+    final Block nextBlock = blockchainUtil.getBlock(2);
+
+    // Sanity check
+    assertThat(blockchain.contains(nextBlock.getHash())).isFalse();
+
+    blockPropagationManager.start();
+
+    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+    final NewBlockHashesMessage nextAnnouncement =
+        NewBlockHashesMessage.create(
+            Collections.singletonList(
+                new NewBlockHashesMessage.NewBlockHash(
+                    nextBlock.getHash(), nextBlock.getHeader().getNumber())));
+    final Responder responder = RespondingEthPeer.blockchainResponder(getFullBlockchain());
+
+    syncState.setReachedTerminalDifficulty(true);
+    blockPropagationManager.onNewUnverifiedForkchoice(
+        new ForkchoiceEvent(null, null, this.finalizedHash));
+    // Broadcast message
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, nextAnnouncement);
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+
+    assertThat(blockPropagationManager.isRunning()).isFalse();
+    assertThat(blockchain.contains(nextBlock.getHash())).isFalse();
+  }
+
+  @Test
+  public void shouldNotListenToNewBlockAnnouncementsWhenTTDReachedAndFinal() {
+    blockchainUtil.importFirstBlocks(2);
+    final Block nextBlock = blockchainUtil.getBlock(2);
+
+    // Sanity check
+    assertThat(blockchain.contains(nextBlock.getHash())).isFalse();
+
+    blockPropagationManager.start();
+
+    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+    final NewBlockMessage nextAnnouncement =
+        NewBlockMessage.create(
+            nextBlock, getFullBlockchain().getTotalDifficultyByHash(nextBlock.getHash()).get());
+    final Responder responder = RespondingEthPeer.blockchainResponder(getFullBlockchain());
+
+    syncState.setReachedTerminalDifficulty(true);
+    blockPropagationManager.onNewUnverifiedForkchoice(
+        new ForkchoiceEvent(null, null, this.finalizedHash));
+    // Broadcast message
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, nextAnnouncement);
+    peer.respondWhile(responder, peer::hasOutstandingRequests);
+
+    assertThat(blockPropagationManager.isRunning()).isFalse();
+    assertThat(blockchain.contains(nextBlock.getHash())).isFalse();
+  }
+
+  @Test
+  public void shouldNotListenToBlockAddedEventsWhenTTDReachedAndFinal() {
+    blockchainUtil.importFirstBlocks(2);
+
+    blockPropagationManager.start();
+
+    syncState.setReachedTerminalDifficulty(true);
+    blockPropagationManager.onNewUnverifiedForkchoice(
+        new ForkchoiceEvent(null, null, this.finalizedHash));
+    blockchainUtil.importBlockAtIndex(2);
+
+    assertThat(blockPropagationManager.isRunning()).isFalse();
+    verifyNoInteractions(pendingBlocksManager);
+  }
+
+  @Test
+  public void shouldRequestBlockFromOtherPeersIfFirstPeerFails() {
+    blockchainUtil.importFirstBlocks(2);
+    final Block nextBlock = blockchainUtil.getBlock(2);
+
+    // Sanity check
+    assertThat(blockchain.contains(nextBlock.getHash())).isFalse();
+
+    blockPropagationManager.start();
+
+    final RespondingEthPeer firstPeer =
+        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+    final NewBlockHashesMessage nextAnnouncement =
+        NewBlockHashesMessage.create(
+            Collections.singletonList(
+                new NewBlockHashesMessage.NewBlockHash(
+                    nextBlock.getHash(), nextBlock.getHeader().getNumber())));
+
+    // Broadcast message and peer fail to respond
+    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, firstPeer, nextAnnouncement);
+    firstPeer.respondWhile(RespondingEthPeer.emptyResponder(), firstPeer::hasOutstandingRequests);
+
+    assertThat(blockchain.contains(nextBlock.getHash())).isFalse();
+
+    // second peer responds
+    final RespondingEthPeer secondPeer =
+        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
+    final Responder goodResponder = RespondingEthPeer.blockchainResponder(getFullBlockchain());
+
+    secondPeer.respondWhile(goodResponder, secondPeer::hasOutstandingRequests);
+
+    assertThat(blockchain.contains(nextBlock.getHash())).isTrue();
+    verify(processingBlocksManager).addRequestedBlock(nextBlock.getHash());
+    verify(processingBlocksManager).addImportingBlock(nextBlock.getHash());
+    verify(processingBlocksManager).registerReceivedBlock(nextBlock);
+    verify(processingBlocksManager).registerBlockImportDone(nextBlock.getHash());
+  }
+
+  public abstract Blockchain getFullBlockchain();
+
+  private BlockHeader blockHeader(final long number) {
+    return new BlockHeaderTestFixture().number(number).buildHeader();
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/BlockBroadcasterTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/BlockBroadcasterTest.java
index 05c036de91f..da8f269b89d 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/BlockBroadcasterTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/BlockBroadcasterTest.java
@@ -34,7 +34,7 @@
 import java.util.Collections;
 import java.util.stream.Stream;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BlockBroadcasterTest {
 
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/BlockPropagationManagerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/BlockPropagationManagerTest.java
deleted file mode 100644
index 68c618a365b..00000000000
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/BlockPropagationManagerTest.java
+++ /dev/null
@@ -1,698 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.chain.BadBlockManager;
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions;
-import org.hyperledger.besu.ethereum.core.BlockImporter;
-import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
-import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
-import org.hyperledger.besu.ethereum.eth.manager.EthContext;
-import org.hyperledger.besu.ethereum.eth.manager.EthMessages;
-import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
-import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
-import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
-import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
-import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
-import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer.Responder;
-import org.hyperledger.besu.ethereum.eth.messages.NewBlockHashesMessage;
-import org.hyperledger.besu.ethereum.eth.messages.NewBlockMessage;
-import org.hyperledger.besu.ethereum.eth.sync.state.PendingBlocksManager;
-import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
-import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
-import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
-import org.hyperledger.besu.testutil.TestClock;
-
-import java.util.Collections;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Supplier;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
-public class BlockPropagationManagerTest {
-
-  private static final Bytes NODE_ID_1 = Bytes.fromHexString("0x00");
-
-  private static Blockchain fullBlockchain;
-
-  private BlockchainSetupUtil blockchainUtil;
-  private ProtocolSchedule protocolSchedule;
-  private ProtocolContext protocolContext;
-  private MutableBlockchain blockchain;
-  private BlockBroadcaster blockBroadcaster;
-  private EthProtocolManager ethProtocolManager;
-  private BlockPropagationManager blockPropagationManager;
-  private SynchronizerConfiguration syncConfig;
-  private final PendingBlocksManager pendingBlocksManager =
-      new PendingBlocksManager(
-          SynchronizerConfiguration.builder().blockPropagationRange(-10, 30).build());
-  private SyncState syncState;
-  private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
-
-  @BeforeClass
-  public static void setupSuite() {
-    fullBlockchain = BlockchainSetupUtil.forTesting().importAllBlocks();
-  }
-
-  @Before
-  public void setup() {
-    blockchainUtil = BlockchainSetupUtil.forTesting();
-    blockchain = blockchainUtil.getBlockchain();
-    protocolSchedule = blockchainUtil.getProtocolSchedule();
-    final ProtocolContext tempProtocolContext = blockchainUtil.getProtocolContext();
-    protocolContext =
-        new ProtocolContext(
-            blockchain,
-            tempProtocolContext.getWorldStateArchive(),
-            tempProtocolContext.getConsensusState(Object.class));
-    ethProtocolManager =
-        EthProtocolManagerTestUtil.create(
-            blockchain,
-            blockchainUtil.getWorldArchive(),
-            blockchainUtil.getTransactionPool(),
-            EthProtocolConfiguration.defaultConfig());
-    syncConfig = SynchronizerConfiguration.builder().blockPropagationRange(-3, 5).build();
-    syncState = new SyncState(blockchain, ethProtocolManager.ethContext().getEthPeers());
-    blockBroadcaster = mock(BlockBroadcaster.class);
-    blockPropagationManager =
-        new BlockPropagationManager(
-            syncConfig,
-            protocolSchedule,
-            protocolContext,
-            ethProtocolManager.ethContext(),
-            syncState,
-            pendingBlocksManager,
-            metricsSystem,
-            blockBroadcaster);
-  }
-
-  @Test
-  public void importsAnnouncedBlocks_aheadOfChainInOrder() {
-    blockchainUtil.importFirstBlocks(2);
-    final Block nextBlock = blockchainUtil.getBlock(2);
-    final Block nextNextBlock = blockchainUtil.getBlock(3);
-
-    // Sanity check
-    assertThat(blockchain.contains(nextBlock.getHash())).isFalse();
-    assertThat(blockchain.contains(nextNextBlock.getHash())).isFalse();
-
-    blockPropagationManager.start();
-
-    // Setup peer and messages
-    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
-    final NewBlockHashesMessage nextAnnouncement =
-        NewBlockHashesMessage.create(
-            Collections.singletonList(
-                new NewBlockHashesMessage.NewBlockHash(
-                    nextBlock.getHash(), nextBlock.getHeader().getNumber())));
-    final NewBlockHashesMessage nextNextAnnouncement =
-        NewBlockHashesMessage.create(
-            Collections.singletonList(
-                new NewBlockHashesMessage.NewBlockHash(
-                    nextNextBlock.getHash(), nextNextBlock.getHeader().getNumber())));
-    final Responder responder = RespondingEthPeer.blockchainResponder(fullBlockchain);
-
-    // Broadcast first message
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, nextAnnouncement);
-    peer.respondWhile(responder, peer::hasOutstandingRequests);
-    // Broadcast second message
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, nextNextAnnouncement);
-    peer.respondWhile(responder, peer::hasOutstandingRequests);
-
-    assertThat(blockchain.contains(nextBlock.getHash())).isTrue();
-    assertThat(blockchain.contains(nextNextBlock.getHash())).isTrue();
-  }
-
-  @Test
-  public void importsAnnouncedBlocks_aheadOfChainOutOfOrder() {
-    blockchainUtil.importFirstBlocks(2);
-    final Block nextBlock = blockchainUtil.getBlock(2);
-    final Block nextNextBlock = blockchainUtil.getBlock(3);
-
-    // Sanity check
-    assertThat(blockchain.contains(nextBlock.getHash())).isFalse();
-    assertThat(blockchain.contains(nextNextBlock.getHash())).isFalse();
-
-    blockPropagationManager.start();
-
-    // Setup peer and messages
-    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
-    final NewBlockHashesMessage nextAnnouncement =
-        NewBlockHashesMessage.create(
-            Collections.singletonList(
-                new NewBlockHashesMessage.NewBlockHash(
-                    nextBlock.getHash(), nextBlock.getHeader().getNumber())));
-    final NewBlockHashesMessage nextNextAnnouncement =
-        NewBlockHashesMessage.create(
-            Collections.singletonList(
-                new NewBlockHashesMessage.NewBlockHash(
-                    nextNextBlock.getHash(), nextNextBlock.getHeader().getNumber())));
-    final Responder responder = RespondingEthPeer.blockchainResponder(fullBlockchain);
-
-    // Broadcast second message first
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, nextNextAnnouncement);
-    peer.respondWhile(responder, peer::hasOutstandingRequests);
-    // Broadcast first message
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, nextAnnouncement);
-    peer.respondWhile(responder, peer::hasOutstandingRequests);
-
-    assertThat(blockchain.contains(nextBlock.getHash())).isTrue();
-    assertThat(blockchain.contains(nextNextBlock.getHash())).isTrue();
-  }
-
-  @Test
-  public void importsAnnouncedNewBlocks_aheadOfChainInOrder() {
-    blockchainUtil.importFirstBlocks(2);
-    final Block nextBlock = blockchainUtil.getBlock(2);
-    final Block nextNextBlock = blockchainUtil.getBlock(3);
-
-    // Sanity check
-    assertThat(blockchain.contains(nextBlock.getHash())).isFalse();
-    assertThat(blockchain.contains(nextNextBlock.getHash())).isFalse();
-
-    blockPropagationManager.start();
-
-    // Setup peer and messages
-    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
-    final NewBlockMessage nextAnnouncement =
-        NewBlockMessage.create(
-            nextBlock, fullBlockchain.getTotalDifficultyByHash(nextBlock.getHash()).get());
-    final NewBlockMessage nextNextAnnouncement =
-        NewBlockMessage.create(
-            nextNextBlock, fullBlockchain.getTotalDifficultyByHash(nextNextBlock.getHash()).get());
-    final Responder responder = RespondingEthPeer.blockchainResponder(fullBlockchain);
-
-    // Broadcast first message
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, nextAnnouncement);
-    peer.respondWhile(responder, peer::hasOutstandingRequests);
-    // Broadcast second message
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, nextNextAnnouncement);
-    peer.respondWhile(responder, peer::hasOutstandingRequests);
-
-    assertThat(blockchain.contains(nextBlock.getHash())).isTrue();
-    assertThat(blockchain.contains(nextNextBlock.getHash())).isTrue();
-  }
-
-  @Test
-  public void importsAnnouncedNewBlocks_aheadOfChainOutOfOrder() {
-    blockchainUtil.importFirstBlocks(2);
-    final Block nextBlock = blockchainUtil.getBlock(2);
-    final Block nextNextBlock = blockchainUtil.getBlock(3);
-
-    // Sanity check
-    assertThat(blockchain.contains(nextBlock.getHash())).isFalse();
-    assertThat(blockchain.contains(nextNextBlock.getHash())).isFalse();
-
-    blockPropagationManager.start();
-
-    // Setup peer and messages
-    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
-    final NewBlockMessage nextAnnouncement =
-        NewBlockMessage.create(
-            nextBlock, fullBlockchain.getTotalDifficultyByHash(nextBlock.getHash()).get());
-    final NewBlockMessage nextNextAnnouncement =
-        NewBlockMessage.create(
-            nextNextBlock, fullBlockchain.getTotalDifficultyByHash(nextNextBlock.getHash()).get());
-    final Responder responder = RespondingEthPeer.blockchainResponder(fullBlockchain);
-
-    // Broadcast second message first
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, nextNextAnnouncement);
-    peer.respondWhile(responder, peer::hasOutstandingRequests);
-    // Broadcast first message
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, nextAnnouncement);
-    peer.respondWhile(responder, peer::hasOutstandingRequests);
-
-    assertThat(blockchain.contains(nextBlock.getHash())).isTrue();
-    assertThat(blockchain.contains(nextNextBlock.getHash())).isTrue();
-  }
-
-  @Test
-  public void importsMixedOutOfOrderMessages() {
-    blockchainUtil.importFirstBlocks(2);
-    final Block block1 = blockchainUtil.getBlock(2);
-    final Block block2 = blockchainUtil.getBlock(3);
-    final Block block3 = blockchainUtil.getBlock(4);
-    final Block block4 = blockchainUtil.getBlock(5);
-
-    // Sanity check
-    assertThat(blockchain.contains(block1.getHash())).isFalse();
-    assertThat(blockchain.contains(block2.getHash())).isFalse();
-    assertThat(blockchain.contains(block3.getHash())).isFalse();
-    assertThat(blockchain.contains(block4.getHash())).isFalse();
-
-    blockPropagationManager.start();
-
-    // Setup peer and messages
-    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
-    final NewBlockHashesMessage block1Msg =
-        NewBlockHashesMessage.create(
-            Collections.singletonList(
-                new NewBlockHashesMessage.NewBlockHash(
-                    block1.getHash(), block1.getHeader().getNumber())));
-    final NewBlockMessage block2Msg =
-        NewBlockMessage.create(
-            block2, fullBlockchain.getTotalDifficultyByHash(block2.getHash()).get());
-    final NewBlockHashesMessage block3Msg =
-        NewBlockHashesMessage.create(
-            Collections.singletonList(
-                new NewBlockHashesMessage.NewBlockHash(
-                    block3.getHash(), block3.getHeader().getNumber())));
-    final NewBlockMessage block4Msg =
-        NewBlockMessage.create(
-            block4, fullBlockchain.getTotalDifficultyByHash(block4.getHash()).get());
-    final Responder responder = RespondingEthPeer.blockchainResponder(fullBlockchain);
-
-    // Broadcast older blocks
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, block3Msg);
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, block4Msg);
-    peer.respondWhile(responder, peer::hasOutstandingRequests);
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, block2Msg);
-    peer.respondWhile(responder, peer::hasOutstandingRequests);
-    // Broadcast first block
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, block1Msg);
-    peer.respondWhile(responder, peer::hasOutstandingRequests);
-
-    assertThat(blockchain.contains(block1.getHash())).isTrue();
-    assertThat(blockchain.contains(block2.getHash())).isTrue();
-    assertThat(blockchain.contains(block3.getHash())).isTrue();
-    assertThat(blockchain.contains(block4.getHash())).isTrue();
-  }
-
-  @Test
-  public void handlesDuplicateAnnouncements() {
-    final ProtocolSchedule stubProtocolSchedule = spy(protocolSchedule);
-    final ProtocolSpec stubProtocolSpec = spy(protocolSchedule.getByBlockNumber(2));
-    final BlockImporter stubBlockImporter = spy(stubProtocolSpec.getBlockImporter());
-    doReturn(stubProtocolSpec).when(stubProtocolSchedule).getByBlockNumber(anyLong());
-    doReturn(stubBlockImporter).when(stubProtocolSpec).getBlockImporter();
-    final BlockPropagationManager blockPropagationManager =
-        new BlockPropagationManager(
-            syncConfig,
-            stubProtocolSchedule,
-            protocolContext,
-            ethProtocolManager.ethContext(),
-            syncState,
-            pendingBlocksManager,
-            metricsSystem,
-            blockBroadcaster);
-
-    blockchainUtil.importFirstBlocks(2);
-    final Block nextBlock = blockchainUtil.getBlock(2);
-
-    // Sanity check
-    assertThat(blockchain.contains(nextBlock.getHash())).isFalse();
-
-    blockPropagationManager.start();
-
-    // Setup peer and messages
-    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
-    final NewBlockHashesMessage newBlockHash =
-        NewBlockHashesMessage.create(
-            Collections.singletonList(
-                new NewBlockHashesMessage.NewBlockHash(
-                    nextBlock.getHash(), nextBlock.getHeader().getNumber())));
-    final NewBlockMessage newBlock =
-        NewBlockMessage.create(
-            nextBlock, fullBlockchain.getTotalDifficultyByHash(nextBlock.getHash()).get());
-    final Responder responder = RespondingEthPeer.blockchainResponder(fullBlockchain);
-
-    // Broadcast first message
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, newBlock);
-    peer.respondWhile(responder, peer::hasOutstandingRequests);
-    // Broadcast duplicate
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, newBlockHash);
-    peer.respondWhile(responder, peer::hasOutstandingRequests);
-    // Broadcast duplicate
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, newBlock);
-    peer.respondWhile(responder, peer::hasOutstandingRequests);
-
-    assertThat(blockchain.contains(nextBlock.getHash())).isTrue();
-    verify(stubBlockImporter, times(1)).importBlock(eq(protocolContext), eq(nextBlock), any());
-  }
-
-  @Test
-  public void handlesPendingDuplicateAnnouncements() {
-    final ProtocolSchedule stubProtocolSchedule = spy(protocolSchedule);
-    final ProtocolSpec stubProtocolSpec = spy(protocolSchedule.getByBlockNumber(2));
-    final BlockImporter stubBlockImporter = spy(stubProtocolSpec.getBlockImporter());
-    doReturn(stubProtocolSpec).when(stubProtocolSchedule).getByBlockNumber(anyLong());
-    doReturn(stubBlockImporter).when(stubProtocolSpec).getBlockImporter();
-    final BlockPropagationManager blockPropagationManager =
-        new BlockPropagationManager(
-            syncConfig,
-            stubProtocolSchedule,
-            protocolContext,
-            ethProtocolManager.ethContext(),
-            syncState,
-            pendingBlocksManager,
-            metricsSystem,
-            blockBroadcaster);
-    blockchainUtil.importFirstBlocks(2);
-    final Block nextBlock = blockchainUtil.getBlock(2);
-
-    // Sanity check
-    assertThat(blockchain.contains(nextBlock.getHash())).isFalse();
-
-    blockPropagationManager.start();
-
-    // Setup peer and messages
-    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
-    final NewBlockHashesMessage newBlockHash =
-        NewBlockHashesMessage.create(
-            Collections.singletonList(
-                new NewBlockHashesMessage.NewBlockHash(
-                    nextBlock.getHash(), nextBlock.getHeader().getNumber())));
-    final NewBlockMessage newBlock =
-        NewBlockMessage.create(
-            nextBlock, fullBlockchain.getTotalDifficultyByHash(nextBlock.getHash()).get());
-
-    // Broadcast messages
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, newBlock);
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, newBlockHash);
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, newBlock);
-    // Respond
-    final Responder responder = RespondingEthPeer.blockchainResponder(fullBlockchain);
-    peer.respondWhile(responder, peer::hasOutstandingRequests);
-
-    assertThat(blockchain.contains(nextBlock.getHash())).isTrue();
-    verify(stubBlockImporter, times(1)).importBlock(eq(protocolContext), eq(nextBlock), any());
-  }
-
-  @Test
-  public void ignoresFutureNewBlockHashAnnouncement() {
-    blockchainUtil.importFirstBlocks(2);
-    final Block futureBlock = blockchainUtil.getBlock(11);
-
-    // Sanity check
-    assertThat(blockchain.contains(futureBlock.getHash())).isFalse();
-
-    blockPropagationManager.start();
-
-    // Setup peer and messages
-    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
-    final NewBlockHashesMessage futureAnnouncement =
-        NewBlockHashesMessage.create(
-            Collections.singletonList(
-                new NewBlockHashesMessage.NewBlockHash(
-                    futureBlock.getHash(), futureBlock.getHeader().getNumber())));
-
-    // Broadcast
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, futureAnnouncement);
-    final Responder responder = RespondingEthPeer.blockchainResponder(fullBlockchain);
-    peer.respondWhile(responder, peer::hasOutstandingRequests);
-
-    assertThat(blockchain.contains(futureBlock.getHash())).isFalse();
-  }
-
-  @Test
-  public void ignoresFutureNewBlockAnnouncement() {
-    blockchainUtil.importFirstBlocks(2);
-    final Block futureBlock = blockchainUtil.getBlock(11);
-
-    // Sanity check
-    assertThat(blockchain.contains(futureBlock.getHash())).isFalse();
-
-    blockPropagationManager.start();
-
-    // Setup peer and messages
-    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
-    final NewBlockMessage futureAnnouncement =
-        NewBlockMessage.create(
-            futureBlock, fullBlockchain.getTotalDifficultyByHash(futureBlock.getHash()).get());
-
-    // Broadcast
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, futureAnnouncement);
-    final Responder responder = RespondingEthPeer.blockchainResponder(fullBlockchain);
-    peer.respondWhile(responder, peer::hasOutstandingRequests);
-
-    assertThat(blockchain.contains(futureBlock.getHash())).isFalse();
-  }
-
-  @Test
-  public void ignoresOldNewBlockHashAnnouncement() {
-    final BlockDataGenerator gen = new BlockDataGenerator();
-    blockchainUtil.importFirstBlocks(10);
-    final Block blockOne = blockchainUtil.getBlock(1);
-    final Block oldBlock = gen.nextBlock(blockOne);
-
-    // Sanity check
-    assertThat(blockchain.contains(oldBlock.getHash())).isFalse();
-
-    final BlockPropagationManager propManager = spy(blockPropagationManager);
-    propManager.start();
-
-    // Setup peer and messages
-    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
-    final NewBlockHashesMessage oldAnnouncement =
-        NewBlockHashesMessage.create(
-            Collections.singletonList(
-                new NewBlockHashesMessage.NewBlockHash(
-                    oldBlock.getHash(), oldBlock.getHeader().getNumber())));
-
-    // Broadcast
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, oldAnnouncement);
-    final Responder responder = RespondingEthPeer.blockchainResponder(fullBlockchain);
-    peer.respondWhile(responder, peer::hasOutstandingRequests);
-
-    verify(propManager, times(0)).importOrSavePendingBlock(any(), any(Bytes.class));
-    assertThat(blockchain.contains(oldBlock.getHash())).isFalse();
-  }
-
-  @Test
-  public void ignoresOldNewBlockAnnouncement() {
-    final BlockDataGenerator gen = new BlockDataGenerator();
-    blockchainUtil.importFirstBlocks(10);
-    final Block blockOne = blockchainUtil.getBlock(1);
-    final Block oldBlock = gen.nextBlock(blockOne);
-
-    // Sanity check
-    assertThat(blockchain.contains(oldBlock.getHash())).isFalse();
-
-    final BlockPropagationManager propManager = spy(blockPropagationManager);
-    propManager.start();
-
-    // Setup peer and messages
-    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
-    final NewBlockMessage oldAnnouncement = NewBlockMessage.create(oldBlock, Difficulty.ZERO);
-
-    // Broadcast
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, oldAnnouncement);
-    final Responder responder = RespondingEthPeer.blockchainResponder(fullBlockchain);
-    peer.respondWhile(responder, peer::hasOutstandingRequests);
-
-    verify(propManager, times(0)).importOrSavePendingBlock(any(), any(Bytes.class));
-    assertThat(blockchain.contains(oldBlock.getHash())).isFalse();
-  }
-
-  @Test
-  public void purgesOldBlocks() {
-    final int oldBlocksToImport = 3;
-    syncConfig =
-        SynchronizerConfiguration.builder().blockPropagationRange(-oldBlocksToImport, 5).build();
-    final BlockPropagationManager blockPropagationManager =
-        new BlockPropagationManager(
-            syncConfig,
-            protocolSchedule,
-            protocolContext,
-            ethProtocolManager.ethContext(),
-            syncState,
-            pendingBlocksManager,
-            metricsSystem,
-            blockBroadcaster);
-
-    final BlockDataGenerator gen = new BlockDataGenerator();
-    // Import some blocks
-    blockchainUtil.importFirstBlocks(5);
-    // Set up test block next to head, that should eventually be purged
-    final Block blockToPurge =
-        gen.block(BlockOptions.create().setBlockNumber(blockchain.getChainHeadBlockNumber()));
-
-    blockPropagationManager.start();
-    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
-    final NewBlockMessage blockAnnouncementMsg =
-        NewBlockMessage.create(blockToPurge, Difficulty.ZERO);
-
-    // Broadcast
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, blockAnnouncementMsg);
-    final Responder responder = RespondingEthPeer.blockchainResponder(fullBlockchain);
-    peer.respondWhile(responder, peer::hasOutstandingRequests);
-
-    // Check that we pushed our block into the pending collection
-    assertThat(blockchain.contains(blockToPurge.getHash())).isFalse();
-    assertThat(pendingBlocksManager.contains(blockToPurge.getHash())).isTrue();
-
-    // Import blocks until we bury the target block far enough to be cleaned up
-    for (int i = 0; i < oldBlocksToImport; i++) {
-      blockchainUtil.importBlockAtIndex((int) blockchain.getChainHeadBlockNumber() + 1);
-
-      assertThat(blockchain.contains(blockToPurge.getHash())).isFalse();
-      assertThat(pendingBlocksManager.contains(blockToPurge.getHash())).isTrue();
-    }
-
-    // Import again to trigger cleanup
-    blockchainUtil.importBlockAtIndex((int) blockchain.getChainHeadBlockNumber() + 1);
-    assertThat(blockchain.contains(blockToPurge.getHash())).isFalse();
-    assertThat(pendingBlocksManager.contains(blockToPurge.getHash())).isFalse();
-  }
-
-  @Test
-  public void updatesChainHeadWhenNewBlockMessageReceived() {
-    blockchainUtil.importFirstBlocks(2);
-    final Block nextBlock = blockchainUtil.getBlock(2);
-
-    blockPropagationManager.start();
-
-    // Setup peer and messages
-    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
-    final Difficulty parentTotalDifficulty =
-        fullBlockchain.getTotalDifficultyByHash(nextBlock.getHeader().getParentHash()).get();
-    final Difficulty totalDifficulty =
-        fullBlockchain.getTotalDifficultyByHash(nextBlock.getHash()).get();
-    final NewBlockMessage nextAnnouncement = NewBlockMessage.create(nextBlock, totalDifficulty);
-
-    // Broadcast message
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, nextAnnouncement);
-    final Responder responder = RespondingEthPeer.blockchainResponder(fullBlockchain);
-    peer.respondWhile(responder, peer::hasOutstandingRequests);
-
-    assertThat(peer.getEthPeer().chainState().getBestBlock().getHash())
-        .isEqualTo(nextBlock.getHeader().getParentHash());
-    assertThat(peer.getEthPeer().chainState().getEstimatedHeight())
-        .isEqualTo(nextBlock.getHeader().getNumber() - 1);
-    assertThat(peer.getEthPeer().chainState().getBestBlock().getTotalDifficulty())
-        .isEqualTo(parentTotalDifficulty);
-  }
-
-  @SuppressWarnings("unchecked")
-  @Test
-  public void shouldNotImportBlocksThatAreAlreadyBeingImported() {
-    final EthScheduler ethScheduler = mock(EthScheduler.class);
-    when(ethScheduler.scheduleSyncWorkerTask(any(Supplier.class)))
-        .thenReturn(new CompletableFuture<>());
-    final EthContext ethContext =
-        new EthContext(
-            new EthPeers("eth", TestClock.fixed(), metricsSystem), new EthMessages(), ethScheduler);
-    final BlockPropagationManager blockPropagationManager =
-        new BlockPropagationManager(
-            syncConfig,
-            protocolSchedule,
-            protocolContext,
-            ethContext,
-            syncState,
-            pendingBlocksManager,
-            metricsSystem,
-            blockBroadcaster);
-
-    blockchainUtil.importFirstBlocks(2);
-    final Block nextBlock = blockchainUtil.getBlock(2);
-
-    blockPropagationManager.importOrSavePendingBlock(nextBlock, NODE_ID_1);
-    blockPropagationManager.importOrSavePendingBlock(nextBlock, NODE_ID_1);
-
-    verify(ethScheduler, times(1)).scheduleSyncWorkerTask(any(Supplier.class));
-  }
-
-  @Test
-  public void verifyBroadcastBlockInvocation() {
-    blockchainUtil.importFirstBlocks(2);
-    final Block block = blockchainUtil.getBlock(2);
-    blockPropagationManager.start();
-
-    // Setup peer and messages
-    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 0);
-
-    final Difficulty totalDifficulty =
-        fullBlockchain.getTotalDifficultyByHash(block.getHash()).get();
-    final NewBlockMessage newBlockMessage = NewBlockMessage.create(block, totalDifficulty);
-
-    // Broadcast message
-    EthProtocolManagerTestUtil.broadcastMessage(ethProtocolManager, peer, newBlockMessage);
-
-    final Responder responder = RespondingEthPeer.blockchainResponder(fullBlockchain);
-    peer.respondWhile(responder, peer::hasOutstandingRequests);
-
-    verify(blockBroadcaster, times(1)).propagate(block, totalDifficulty);
-  }
-
-  @SuppressWarnings("unchecked")
-  @Test
-  public void shouldDetectAndCacheInvalidBlocks() {
-    final EthScheduler ethScheduler = mock(EthScheduler.class);
-    when(ethScheduler.scheduleSyncWorkerTask(any(Supplier.class)))
-        .thenAnswer(
-            new Answer<Object>() {
-              @Override
-              public Object answer(final InvocationOnMock invocation) throws Throwable {
-                return invocation.getArgument(0, Supplier.class).get();
-              }
-            });
-    final EthContext ethContext =
-        new EthContext(
-            new EthPeers("eth", TestClock.fixed(), metricsSystem), new EthMessages(), ethScheduler);
-    final BlockPropagationManager blockPropagationManager =
-        new BlockPropagationManager(
-            syncConfig,
-            protocolSchedule,
-            protocolContext,
-            ethContext,
-            syncState,
-            pendingBlocksManager,
-            metricsSystem,
-            blockBroadcaster);
-
-    blockchainUtil.importFirstBlocks(2);
-    final Block firstBlock = blockchainUtil.getBlock(1);
-    final BadBlockManager badBlocksManager =
-        protocolSchedule.getByBlockNumber(1).getBadBlocksManager();
-    final Block badBlock =
-        new BlockDataGenerator()
-            .block(
-                BlockDataGenerator.BlockOptions.create()
-                    .setBlockNumber(1)
-                    .setParentHash(firstBlock.getHash())
-                    .setBlockHeaderFunctions(new MainnetBlockHeaderFunctions()));
-
-    assertThat(badBlocksManager.getBadBlocks()).isEmpty();
-    blockPropagationManager.importOrSavePendingBlock(badBlock, NODE_ID_1);
-    assertThat(badBlocksManager.getBadBlocks().size()).isEqualTo(1);
-
-    verify(ethScheduler, times(1)).scheduleSyncWorkerTask(any(Supplier.class));
-  }
-}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/BonsaiBlockPropagationManagerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/BonsaiBlockPropagationManagerTest.java
new file mode 100644
index 00000000000..7bd4d2bbbc4
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/BonsaiBlockPropagationManagerTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync;
+
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+
+public class BonsaiBlockPropagationManagerTest extends AbstractBlockPropagationManagerTest {
+
+  private static Blockchain fullBlockchain;
+
+  @BeforeAll
+  public static void setupSuite() {
+    fullBlockchain = BlockchainSetupUtil.forTesting(DataStorageFormat.BONSAI).importAllBlocks();
+  }
+
+  @BeforeEach
+  public void setup() {
+    setup(DataStorageFormat.BONSAI);
+  }
+
+  @Override
+  public Blockchain getFullBlockchain() {
+    return fullBlockchain;
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/ChainHeadTrackerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/ChainHeadTrackerTest.java
index b1723f23a96..4cde3fd7edc 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/ChainHeadTrackerTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/ChainHeadTrackerTest.java
@@ -17,10 +17,10 @@
 import static org.mockito.Mockito.mock;
 
 import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.difficulty.fixed.FixedDifficultyProtocolSchedule;
 import org.hyperledger.besu.ethereum.eth.manager.ChainState;
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
@@ -28,38 +28,65 @@
 import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer.Responder;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 
+import java.util.stream.Stream;
+
 import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.ArgumentsProvider;
+import org.junit.jupiter.params.provider.ArgumentsSource;
 
 public class ChainHeadTrackerTest {
 
-  private final BlockchainSetupUtil blockchainSetupUtil = BlockchainSetupUtil.forTesting();
-  private final MutableBlockchain blockchain = blockchainSetupUtil.getBlockchain();
-  private final EthProtocolManager ethProtocolManager =
-      EthProtocolManagerTestUtil.create(blockchain);
-  private final RespondingEthPeer respondingPeer =
-      RespondingEthPeer.builder()
-          .ethProtocolManager(ethProtocolManager)
-          .chainHeadHash(blockchain.getChainHeadHash())
-          .totalDifficulty(blockchain.getChainHead().getTotalDifficulty())
-          .estimatedHeight(0)
-          .build();
+  private BlockchainSetupUtil blockchainSetupUtil;
+  private MutableBlockchain blockchain;
+  private EthProtocolManager ethProtocolManager;
+  private RespondingEthPeer respondingPeer;
+  private ChainHeadTracker chainHeadTracker;
+
   private final ProtocolSchedule protocolSchedule =
       FixedDifficultyProtocolSchedule.create(
-          GenesisConfigFile.development().getConfigOptions(), false);
+          GenesisConfigFile.development().getConfigOptions(), false, EvmConfiguration.DEFAULT);
 
   private final TrailingPeerLimiter trailingPeerLimiter = mock(TrailingPeerLimiter.class);
-  private final ChainHeadTracker chainHeadTracker =
-      new ChainHeadTracker(
-          ethProtocolManager.ethContext(),
-          protocolSchedule,
-          trailingPeerLimiter,
-          new NoOpMetricsSystem());
-
-  @Test
-  public void shouldRequestHeaderChainHeadWhenNewPeerConnects() {
+
+  static class ChainHeadTrackerTestArguments implements ArgumentsProvider {
+    @Override
+    public Stream<? extends Arguments> provideArguments(final ExtensionContext context) {
+      return Stream.of(
+          Arguments.of(DataStorageFormat.BONSAI), Arguments.of(DataStorageFormat.FOREST));
+    }
+  }
+
+  public void setup(final DataStorageFormat storageFormat) {
+    blockchainSetupUtil = BlockchainSetupUtil.forTesting(storageFormat);
+    blockchain = blockchainSetupUtil.getBlockchain();
+    ethProtocolManager = EthProtocolManagerTestUtil.create(blockchain);
+    respondingPeer =
+        RespondingEthPeer.builder()
+            .ethProtocolManager(ethProtocolManager)
+            .chainHeadHash(blockchain.getChainHeadHash())
+            .totalDifficulty(blockchain.getChainHead().getTotalDifficulty())
+            .estimatedHeight(0)
+            .build();
+    chainHeadTracker =
+        new ChainHeadTracker(
+            ethProtocolManager.ethContext(),
+            protocolSchedule,
+            trailingPeerLimiter,
+            new NoOpMetricsSystem());
+  }
+
+  @ParameterizedTest
+  @ArgumentsSource(ChainHeadTrackerTestArguments.class)
+  public void shouldRequestHeaderChainHeadWhenNewPeerConnects(
+      final DataStorageFormat storageFormat) {
+    setup(storageFormat);
     final Responder responder =
         RespondingEthPeer.blockchainResponder(
             blockchainSetupUtil.getBlockchain(),
@@ -75,8 +102,11 @@ public void shouldRequestHeaderChainHeadWhenNewPeerConnects() {
         .isEqualTo(blockchain.getChainHeadBlockNumber());
   }
 
-  @Test
-  public void shouldIgnoreHeadersIfChainHeadHasAlreadyBeenUpdatedWhileWaiting() {
+  @ParameterizedTest
+  @ArgumentsSource(ChainHeadTrackerTestArguments.class)
+  public void shouldIgnoreHeadersIfChainHeadHasAlreadyBeenUpdatedWhileWaiting(
+      final DataStorageFormat storageFormat) {
+    setup(storageFormat);
     final Responder responder =
         RespondingEthPeer.blockchainResponder(
             blockchainSetupUtil.getBlockchain(),
@@ -92,8 +122,10 @@ public void shouldIgnoreHeadersIfChainHeadHasAlreadyBeenUpdatedWhileWaiting() {
     Assertions.assertThat(chainHeadState().getEstimatedHeight()).isZero();
   }
 
-  @Test
-  public void shouldCheckTrialingPeerLimits() {
+  @ParameterizedTest
+  @ArgumentsSource(ChainHeadTrackerTestArguments.class)
+  public void shouldCheckTrialingPeerLimits(final DataStorageFormat storageFormat) {
+    setup(storageFormat);
     final Responder responder =
         RespondingEthPeer.blockchainResponder(
             blockchainSetupUtil.getBlockchain(),
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderFetcherTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderFetcherTest.java
deleted file mode 100644
index 6e194775f82..00000000000
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderFetcherTest.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync;
-
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
-import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
-import org.hyperledger.besu.ethereum.eth.manager.EthContext;
-import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
-import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
-import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
-import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer.Responder;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
-
-@RunWith(MockitoJUnitRunner.class)
-public class CheckpointHeaderFetcherTest {
-
-  private static final int SEGMENT_SIZE = 5;
-  private static Blockchain blockchain;
-  private static ProtocolSchedule protocolSchedule;
-  private static ProtocolContext protocolContext;
-  private static final MetricsSystem metricsSystem = new NoOpMetricsSystem();
-  private static TransactionPool transactionPool;
-  private EthProtocolManager ethProtocolManager;
-  private Responder responder;
-  private RespondingEthPeer respondingPeer;
-
-  @BeforeClass
-  public static void setUpClass() {
-    final BlockchainSetupUtil blockchainSetupUtil = BlockchainSetupUtil.forTesting();
-    blockchainSetupUtil.importAllBlocks();
-    blockchain = blockchainSetupUtil.getBlockchain();
-    transactionPool = blockchainSetupUtil.getTransactionPool();
-    protocolSchedule = blockchainSetupUtil.getProtocolSchedule();
-    protocolContext = blockchainSetupUtil.getProtocolContext();
-  }
-
-  @Before
-  public void setUpTest() {
-    ethProtocolManager =
-        EthProtocolManagerTestUtil.create(
-            blockchain,
-            () -> false,
-            protocolContext.getWorldStateArchive(),
-            transactionPool,
-            EthProtocolConfiguration.defaultConfig());
-    responder =
-        RespondingEthPeer.blockchainResponder(
-            blockchain, protocolContext.getWorldStateArchive(), transactionPool);
-    respondingPeer =
-        EthProtocolManagerTestUtil.createPeer(
-            ethProtocolManager, blockchain.getChainHeadBlockNumber());
-  }
-
-  @Test
-  public void shouldRequestHeadersFromPeerAndExcludeExistingHeader() {
-    final CheckpointHeaderFetcher checkpointHeaderFetcher =
-        createCheckpointHeaderFetcher(Optional.empty());
-
-    final CompletableFuture<List<BlockHeader>> result =
-        checkpointHeaderFetcher.getNextCheckpointHeaders(respondingPeer.getEthPeer(), header(1));
-
-    assertThat(result).isNotDone();
-
-    respondingPeer.respond(responder);
-
-    assertThat(result).isCompletedWithValue(asList(header(6), header(11), header(16)));
-  }
-
-  @Test
-  public void shouldNotRequestHeadersBeyondTargetWhenTargetIsMultipleOfSegmentSize() {
-    final CheckpointHeaderFetcher checkpointHeaderFetcher =
-        createCheckpointHeaderFetcher(Optional.of(header(11)));
-
-    final CompletableFuture<List<BlockHeader>> result =
-        checkpointHeaderFetcher.getNextCheckpointHeaders(respondingPeer.getEthPeer(), header(1));
-
-    respondingPeer.respond(responder);
-
-    assertThat(result).isCompletedWithValue(asList(header(6), header(11)));
-  }
-
-  @Test
-  public void shouldNotRequestHeadersBeyondTargetWhenTargetIsNotAMultipleOfSegmentSize() {
-    final CheckpointHeaderFetcher checkpointHeaderFetcher =
-        createCheckpointHeaderFetcher(Optional.of(header(15)));
-
-    final CompletableFuture<List<BlockHeader>> result =
-        checkpointHeaderFetcher.getNextCheckpointHeaders(respondingPeer.getEthPeer(), header(1));
-
-    respondingPeer.respond(responder);
-
-    assertThat(result).isCompletedWithValue(asList(header(6), header(11)));
-  }
-
-  @Test
-  public void shouldReturnOnlyTargetHeaderWhenLastHeaderIsTheCheckpointBeforeTarget() {
-    final CheckpointHeaderFetcher checkpointHeaderFetcher =
-        createCheckpointHeaderFetcher(Optional.of(header(15)));
-
-    final CompletableFuture<List<BlockHeader>> result =
-        checkpointHeaderFetcher.getNextCheckpointHeaders(respondingPeer.getEthPeer(), header(11));
-
-    assertThat(result).isCompletedWithValue(singletonList(header(15)));
-  }
-
-  @Test
-  public void shouldReturnEmptyListWhenLastHeaderIsTarget() {
-    final CheckpointHeaderFetcher checkpointHeaderFetcher =
-        createCheckpointHeaderFetcher(Optional.of(header(15)));
-
-    final CompletableFuture<List<BlockHeader>> result =
-        checkpointHeaderFetcher.getNextCheckpointHeaders(respondingPeer.getEthPeer(), header(15));
-    assertThat(result).isCompletedWithValue(emptyList());
-  }
-
-  @Test
-  public void shouldReturnEmptyListWhenLastHeaderIsAfterTarget() {
-    final CheckpointHeaderFetcher checkpointHeaderFetcher =
-        createCheckpointHeaderFetcher(Optional.of(header(15)));
-
-    final CompletableFuture<List<BlockHeader>> result =
-        checkpointHeaderFetcher.getNextCheckpointHeaders(respondingPeer.getEthPeer(), header(16));
-    assertThat(result).isCompletedWithValue(emptyList());
-  }
-
-  @Test
-  public void nextCheckpointShouldEndAtChainHeadWhenNextCheckpointHeaderIsAfterHead() {
-    final long remoteChainHeight = blockchain.getChainHeadBlockNumber();
-    final CheckpointHeaderFetcher checkpointHeaderFetcher =
-        createCheckpointHeaderFetcher(Optional.empty());
-
-    assertThat(
-            checkpointHeaderFetcher.nextCheckpointEndsAtChainHead(
-                respondingPeer.getEthPeer(), header(remoteChainHeight - SEGMENT_SIZE + 1)))
-        .isTrue();
-  }
-
-  @Test
-  public void nextCheckpointShouldNotEndAtChainHeadWhenAFinalCheckpointHeaderIsSpecified() {
-    final long remoteChainHeight = blockchain.getChainHeadBlockNumber();
-    final CheckpointHeaderFetcher checkpointHeaderFetcher =
-        createCheckpointHeaderFetcher(Optional.of(header(remoteChainHeight)));
-
-    assertThat(
-            checkpointHeaderFetcher.nextCheckpointEndsAtChainHead(
-                respondingPeer.getEthPeer(), header(remoteChainHeight - SEGMENT_SIZE + 1)))
-        .isFalse();
-  }
-
-  @Test
-  public void shouldReturnRemoteChainHeadWhenNextCheckpointHeaderIsTheRemoteHead() {
-    final long remoteChainHeight = blockchain.getChainHeadBlockNumber();
-    final CheckpointHeaderFetcher checkpointHeaderFetcher =
-        createCheckpointHeaderFetcher(Optional.empty());
-
-    assertThat(
-            checkpointHeaderFetcher.nextCheckpointEndsAtChainHead(
-                respondingPeer.getEthPeer(), header(remoteChainHeight - SEGMENT_SIZE)))
-        .isFalse();
-
-    final CompletableFuture<List<BlockHeader>> result =
-        checkpointHeaderFetcher.getNextCheckpointHeaders(
-            respondingPeer.getEthPeer(), header(remoteChainHeight - SEGMENT_SIZE));
-
-    respondingPeer.respond(responder);
-
-    assertThat(result).isCompletedWithValue(singletonList(header(remoteChainHeight)));
-  }
-
-  private CheckpointHeaderFetcher createCheckpointHeaderFetcher(
-      final Optional<BlockHeader> targetHeader) {
-    final EthContext ethContext = ethProtocolManager.ethContext();
-    return new CheckpointHeaderFetcher(
-        SynchronizerConfiguration.builder()
-            .downloaderChainSegmentSize(SEGMENT_SIZE)
-            .downloaderHeadersRequestSize(3)
-            .build(),
-        protocolSchedule,
-        ethContext,
-        targetHeader,
-        metricsSystem);
-  }
-
-  private BlockHeader header(final long blockNumber) {
-    return blockchain.getBlockHeader(blockNumber).get();
-  }
-}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderValidationStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderValidationStepTest.java
deleted file mode 100644
index 53fa96bab0a..00000000000
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointHeaderValidationStepTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync;
-
-import static java.util.Arrays.asList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode.DETACHED_ONLY;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
-import org.hyperledger.besu.ethereum.eth.sync.tasks.exceptions.InvalidBlockException;
-import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
-
-import java.util.stream.Stream;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-@RunWith(MockitoJUnitRunner.class)
-public class CheckpointHeaderValidationStepTest {
-  @Mock private ProtocolSchedule protocolSchedule;
-  @Mock private ProtocolSpec protocolSpec;
-  @Mock private ProtocolContext protocolContext;
-  @Mock private BlockHeaderValidator headerValidator;
-  @Mock private ValidationPolicy validationPolicy;
-  @Mock private EthPeer syncTarget;
-  private final BlockDataGenerator gen = new BlockDataGenerator();
-  private CheckpointHeaderValidationStep validationStep;
-
-  private final BlockHeader checkpointStart = gen.header(10);
-  private final BlockHeader checkpointEnd = gen.header(13);
-  private final BlockHeader firstHeader = gen.header(11);
-  private final CheckpointRangeHeaders rangeHeaders =
-      new CheckpointRangeHeaders(
-          new CheckpointRange(syncTarget, checkpointStart, checkpointEnd),
-          asList(firstHeader, gen.header(12), checkpointEnd));
-
-  @Before
-  public void setUp() {
-    when(protocolSchedule.getByBlockNumber(anyLong())).thenReturn(protocolSpec);
-    when(protocolSpec.getBlockHeaderValidator()).thenReturn(headerValidator);
-    when(validationPolicy.getValidationModeForNextBlock()).thenReturn(DETACHED_ONLY);
-
-    validationStep =
-        new CheckpointHeaderValidationStep(protocolSchedule, protocolContext, validationPolicy);
-  }
-
-  @Test
-  public void shouldValidateFirstHeaderAgainstCheckpointStartHeader() {
-    when(headerValidator.validateHeader(
-            firstHeader, checkpointStart, protocolContext, DETACHED_ONLY))
-        .thenReturn(true);
-    final Stream<BlockHeader> result = validationStep.apply(rangeHeaders);
-
-    verify(protocolSchedule).getByBlockNumber(firstHeader.getNumber());
-    verify(validationPolicy).getValidationModeForNextBlock();
-    verify(headerValidator)
-        .validateHeader(firstHeader, checkpointStart, protocolContext, DETACHED_ONLY);
-    verifyNoMoreInteractions(headerValidator, validationPolicy);
-
-    assertThat(result).containsExactlyElementsOf(rangeHeaders.getHeadersToImport());
-  }
-
-  @Test
-  public void shouldThrowExceptionWhenValidationFails() {
-    when(headerValidator.validateHeader(
-            firstHeader, checkpointStart, protocolContext, DETACHED_ONLY))
-        .thenReturn(false);
-    assertThatThrownBy(() -> validationStep.apply(rangeHeaders))
-        .isInstanceOf(InvalidBlockException.class)
-        .hasMessageContaining(
-            "Invalid checkpoint headers.  Headers downloaded between #"
-                + checkpointStart.getNumber()
-                + " ("
-                + checkpointStart.getHash()
-                + ") and #"
-                + checkpointEnd.getNumber()
-                + " ("
-                + checkpointEnd.getHash()
-                + ") do not connect at #"
-                + firstHeader.getNumber()
-                + " ("
-                + firstHeader.getHash()
-                + ")");
-  }
-}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRangeSourceTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRangeSourceTest.java
deleted file mode 100644
index 3493a94885d..00000000000
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/CheckpointRangeSourceTest.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync;
-
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singletonList;
-import static java.util.concurrent.CompletableFuture.completedFuture;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
-import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
-import org.hyperledger.besu.ethereum.eth.manager.exceptions.NoAvailablePeersException;
-
-import java.time.Duration;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeoutException;
-import java.util.function.Supplier;
-
-import org.junit.Test;
-
-public class CheckpointRangeSourceTest {
-
-  private static final int CHECKPOINT_TIMEOUTS_PERMITTED = 3;
-  private static final Duration RETRY_DELAY_DURATION = Duration.ofSeconds(2);
-  private final EthPeer peer = mock(EthPeer.class);
-  private final CheckpointHeaderFetcher checkpointFetcher = mock(CheckpointHeaderFetcher.class);
-  private final CheckpointRangeSource.SyncTargetChecker syncTargetChecker =
-      mock(CheckpointRangeSource.SyncTargetChecker.class);
-  private final EthScheduler ethScheduler = mock(EthScheduler.class);
-
-  private final BlockHeader commonAncestor = header(10);
-  private final CheckpointRangeSource source =
-      new CheckpointRangeSource(
-          checkpointFetcher,
-          syncTargetChecker,
-          ethScheduler,
-          peer,
-          commonAncestor,
-          CHECKPOINT_TIMEOUTS_PERMITTED,
-          Duration.ofMillis(1));
-
-  @Test
-  public void shouldHaveNextWhenNoCheckpointsLoadedButSyncTargetCheckerSaysToContinue() {
-    when(syncTargetChecker.shouldContinueDownloadingFromSyncTarget(peer, commonAncestor))
-        .thenReturn(true);
-    assertThat(source).hasNext();
-  }
-
-  @Test
-  public void shouldHaveNextWhenMoreCheckpointsAreLoadedRegardlessOfSyncTargetChecker() {
-    when(checkpointFetcher.getNextCheckpointHeaders(peer, commonAncestor))
-        .thenReturn(completedFuture(asList(header(15), header(20))));
-    when(syncTargetChecker.shouldContinueDownloadingFromSyncTarget(peer, commonAncestor))
-        .thenReturn(false);
-
-    source.next();
-    verify(checkpointFetcher).getNextCheckpointHeaders(peer, commonAncestor);
-
-    assertThat(source).hasNext();
-  }
-
-  @Test
-  public void shouldNotHaveNextWhenNoCheckpointsLoadedAndSyncTargetCheckerReturnsFalse() {
-    // e.g. when a better sync target is available
-    when(syncTargetChecker.shouldContinueDownloadingFromSyncTarget(peer, commonAncestor))
-        .thenReturn(false);
-    assertThat(source).isExhausted();
-  }
-
-  @Test
-  public void shouldNotHaveNextWhenNoMoreCheckpointsAvailableAndRetryLimitReached() {
-    when(syncTargetChecker.shouldContinueDownloadingFromSyncTarget(any(), any())).thenReturn(true);
-    when(checkpointFetcher.getNextCheckpointHeaders(peer, commonAncestor))
-        .thenReturn(CompletableFuture.failedFuture(new TimeoutException()));
-
-    for (int i = 1; i <= CHECKPOINT_TIMEOUTS_PERMITTED; i++) {
-      assertThat(source).hasNext();
-      assertThat(source.next()).isNull();
-      verify(checkpointFetcher, times(i)).getNextCheckpointHeaders(peer, commonAncestor);
-    }
-
-    // Too many timeouts, give up on this sync target.
-    assertThat(source).isExhausted();
-  }
-
-  @Test
-  public void shouldConsiderHeaderRequestFailedIfNoNewHeadersReturned() {
-    when(syncTargetChecker.shouldContinueDownloadingFromSyncTarget(any(), any())).thenReturn(true);
-    when(checkpointFetcher.getNextCheckpointHeaders(peer, commonAncestor))
-        .thenReturn(completedFuture(emptyList()));
-
-    for (int i = 1; i <= CHECKPOINT_TIMEOUTS_PERMITTED; i++) {
-      assertThat(source).hasNext();
-      assertThat(source.next()).isNull();
-      verify(checkpointFetcher, times(i)).getNextCheckpointHeaders(peer, commonAncestor);
-    }
-
-    // Too many timeouts, give up on this sync target.
-    assertThat(source).isExhausted();
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  public void shouldDelayBeforeRetryingRequestForCheckpointHeadersAfterEmptyResponse() {
-    when(syncTargetChecker.shouldContinueDownloadingFromSyncTarget(any(), any())).thenReturn(true);
-    when(checkpointFetcher.getNextCheckpointHeaders(peer, commonAncestor))
-        .thenReturn(completedFuture(emptyList()));
-
-    assertThat(source.next()).isNull();
-    verify(checkpointFetcher).getNextCheckpointHeaders(peer, commonAncestor);
-    verify(ethScheduler).scheduleFutureTask(any(Supplier.class), eq(RETRY_DELAY_DURATION));
-  }
-
-  @Test
-  @SuppressWarnings("unchecked")
-  public void shouldDelayBeforeRetryingRequestForCheckpointHeadersAfterFailure() {
-    when(syncTargetChecker.shouldContinueDownloadingFromSyncTarget(any(), any())).thenReturn(true);
-    when(checkpointFetcher.getNextCheckpointHeaders(peer, commonAncestor))
-        .thenReturn(CompletableFuture.failedFuture(new RuntimeException("Nope")));
-
-    assertThat(source.next()).isNull();
-    verify(checkpointFetcher).getNextCheckpointHeaders(peer, commonAncestor);
-    verify(ethScheduler).scheduleFutureTask(any(Supplier.class), eq(RETRY_DELAY_DURATION));
-  }
-
-  @Test
-  public void shouldResetCheckpointFailureCountWhenMoreCheckpointsReceived() {
-    when(syncTargetChecker.shouldContinueDownloadingFromSyncTarget(any(), any())).thenReturn(true);
-    when(checkpointFetcher.getNextCheckpointHeaders(any(), any()))
-        .thenReturn(CompletableFuture.failedFuture(new TimeoutException()))
-        .thenReturn(CompletableFuture.failedFuture(new TimeoutException()))
-        .thenReturn(completedFuture(singletonList(header(15))))
-        .thenReturn(CompletableFuture.failedFuture(new TimeoutException()));
-
-    assertThat(source.next()).isNull(); // Fail
-    assertThat(source.next()).isNull(); // Fail
-    assertThat(source.next()).isNotNull(); // Succeed
-    assertThat(source.next()).isNull(); // Fail
-    assertThat(source.next()).isNull(); // Fail
-
-    // Failure count should have been reset by the success so limit hasn't been reached.
-    assertThat(source).hasNext();
-  }
-
-  @Test
-  public void shouldRequestMoreHeadersWhenCurrentSetHasRunOut() {
-    when(checkpointFetcher.getNextCheckpointHeaders(peer, commonAncestor))
-        .thenReturn(completedFuture(asList(header(15), header(20))));
-
-    when(checkpointFetcher.getNextCheckpointHeaders(peer, header(20)))
-        .thenReturn(completedFuture(asList(header(25), header(30))));
-
-    assertThat(source.next()).isEqualTo(new CheckpointRange(peer, commonAncestor, header(15)));
-    verify(checkpointFetcher).getNextCheckpointHeaders(peer, commonAncestor);
-    verify(checkpointFetcher).nextCheckpointEndsAtChainHead(peer, commonAncestor);
-
-    assertThat(source.next()).isEqualTo(new CheckpointRange(peer, header(15), header(20)));
-    verifyNoMoreInteractions(checkpointFetcher);
-
-    assertThat(source.next()).isEqualTo(new CheckpointRange(peer, header(20), header(25)));
-    verify(checkpointFetcher).getNextCheckpointHeaders(peer, header(20));
-    verify(checkpointFetcher).nextCheckpointEndsAtChainHead(peer, header(20));
-
-    assertThat(source.next()).isEqualTo(new CheckpointRange(peer, header(25), header(30)));
-    verifyNoMoreInteractions(checkpointFetcher);
-  }
-
-  @Test
-  public void shouldReturnCheckpointsFromExistingBatch() {
-    when(checkpointFetcher.getNextCheckpointHeaders(peer, commonAncestor))
-        .thenReturn(completedFuture(asList(header(15), header(20))));
-
-    assertThat(source.next()).isEqualTo(new CheckpointRange(peer, commonAncestor, header(15)));
-    assertThat(source.next()).isEqualTo(new CheckpointRange(peer, header(15), header(20)));
-  }
-
-  @Test
-  public void shouldReturnNullIfNewHeadersNotAvailableInTime() {
-    when(checkpointFetcher.getNextCheckpointHeaders(peer, commonAncestor))
-        .thenReturn(new CompletableFuture<>());
-
-    assertThat(source.next()).isNull();
-  }
-
-  @Test
-  public void shouldNotRequestMoreHeadersIfOriginalRequestStillInProgress() {
-    when(checkpointFetcher.getNextCheckpointHeaders(peer, commonAncestor))
-        .thenReturn(new CompletableFuture<>());
-
-    assertThat(source.next()).isNull();
-    verify(checkpointFetcher).getNextCheckpointHeaders(peer, commonAncestor);
-    verify(checkpointFetcher).nextCheckpointEndsAtChainHead(peer, commonAncestor);
-
-    assertThat(source.next()).isNull();
-    verifyNoMoreInteractions(checkpointFetcher);
-  }
-
-  @Test
-  public void shouldReturnCheckpointsOnceHeadersRequestCompletes() {
-    final CompletableFuture<List<BlockHeader>> future = new CompletableFuture<>();
-    when(checkpointFetcher.getNextCheckpointHeaders(peer, commonAncestor)).thenReturn(future);
-
-    assertThat(source.next()).isNull();
-    verify(checkpointFetcher).getNextCheckpointHeaders(peer, commonAncestor);
-
-    future.complete(asList(header(15), header(20)));
-    assertThat(source.next()).isEqualTo(new CheckpointRange(peer, commonAncestor, header(15)));
-  }
-
-  @Test
-  public void shouldSendNewRequestIfRequestForHeadersFails() {
-    when(checkpointFetcher.getNextCheckpointHeaders(peer, commonAncestor))
-        .thenReturn(CompletableFuture.failedFuture(new NoAvailablePeersException()))
-        .thenReturn(completedFuture(asList(header(15), header(20))));
-
-    // Returns null when the first request fails
-    assertThat(source.next()).isNull();
-    verify(checkpointFetcher).getNextCheckpointHeaders(peer, commonAncestor);
-
-    // Then retries
-    assertThat(source.next()).isEqualTo(new CheckpointRange(peer, commonAncestor, header(15)));
-    verify(checkpointFetcher, times(2)).getNextCheckpointHeaders(peer, commonAncestor);
-  }
-
-  @Test
-  public void shouldReturnUnboundedCheckpointRangeWhenNextCheckpointEndsAtChainHead() {
-    when(syncTargetChecker.shouldContinueDownloadingFromSyncTarget(peer, commonAncestor))
-        .thenReturn(true);
-    when(checkpointFetcher.nextCheckpointEndsAtChainHead(peer, commonAncestor)).thenReturn(true);
-
-    assertThat(source).hasNext();
-    assertThat(source.next()).isEqualTo(new CheckpointRange(peer, commonAncestor));
-
-    // Once we've sent an open-ended range we shouldn't have any more ranges.
-    assertThat(source).isExhausted();
-    assertThat(source.next()).isNull();
-  }
-
-  private BlockHeader header(final int number) {
-    return new BlockHeaderTestFixture().number(number).buildHeader();
-  }
-}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/DownloadHeadersStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/DownloadHeadersStepTest.java
index 069d460fbe7..b9d8eec0216 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/DownloadHeadersStepTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/DownloadHeadersStepTest.java
@@ -26,8 +26,11 @@
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
 import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
+import org.hyperledger.besu.ethereum.eth.sync.range.RangeHeaders;
+import org.hyperledger.besu.ethereum.eth.sync.range.SyncTargetRange;
 import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 
 import java.util.ArrayList;
@@ -35,9 +38,9 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class DownloadHeadersStepTest {
 
@@ -49,18 +52,18 @@ public class DownloadHeadersStepTest {
   private final EthPeer syncTarget = mock(EthPeer.class);
   private EthProtocolManager ethProtocolManager;
   private DownloadHeadersStep downloader;
-  private CheckpointRange checkpointRange;
+  private SyncTargetRange checkpointRange;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUpClass() {
-    final BlockchainSetupUtil setupUtil = BlockchainSetupUtil.forTesting();
+    final BlockchainSetupUtil setupUtil = BlockchainSetupUtil.forTesting(DataStorageFormat.FOREST);
     setupUtil.importFirstBlocks(20);
     protocolSchedule = setupUtil.getProtocolSchedule();
     protocolContext = setupUtil.getProtocolContext();
     blockchain = protocolContext.getBlockchain();
   }
 
-  @Before
+  @BeforeEach
   public void setUp() {
     ethProtocolManager = EthProtocolManagerTestUtil.create(blockchain);
     downloader =
@@ -73,27 +76,27 @@ public void setUp() {
             new NoOpMetricsSystem());
 
     checkpointRange =
-        new CheckpointRange(
+        new SyncTargetRange(
             syncTarget, blockchain.getBlockHeader(1).get(), blockchain.getBlockHeader(10).get());
   }
 
   @Test
   public void shouldRetrieveHeadersForCheckpointRange() {
     final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 1000);
-    final CompletableFuture<CheckpointRangeHeaders> result = downloader.apply(checkpointRange);
+    final CompletableFuture<RangeHeaders> result = downloader.apply(checkpointRange);
 
     peer.respond(blockchainResponder(blockchain));
 
     // The start of the range should have been imported as part of the previous batch hence 2-10.
     assertThat(result)
-        .isCompletedWithValue(new CheckpointRangeHeaders(checkpointRange, headersFromChain(2, 10)));
+        .isCompletedWithValue(new RangeHeaders(checkpointRange, headersFromChain(2, 10)));
   }
 
   @Test
   public void shouldCancelRequestToPeerWhenReturnedFutureIsCancelled() {
     final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 1000);
 
-    final CompletableFuture<CheckpointRangeHeaders> result = this.downloader.apply(checkpointRange);
+    final CompletableFuture<RangeHeaders> result = this.downloader.apply(checkpointRange);
 
     result.cancel(true);
 
@@ -106,28 +109,28 @@ public void shouldCancelRequestToPeerWhenReturnedFutureIsCancelled() {
 
   @Test
   public void shouldReturnOnlyEndHeaderWhenCheckpointRangeHasLengthOfOne() {
-    final CheckpointRange checkpointRange =
-        new CheckpointRange(
+    final SyncTargetRange checkpointRange =
+        new SyncTargetRange(
             syncTarget, blockchain.getBlockHeader(3).get(), blockchain.getBlockHeader(4).get());
 
-    final CompletableFuture<CheckpointRangeHeaders> result = this.downloader.apply(checkpointRange);
+    final CompletableFuture<RangeHeaders> result = this.downloader.apply(checkpointRange);
 
     assertThat(result)
-        .isCompletedWithValue(new CheckpointRangeHeaders(checkpointRange, headersFromChain(4, 4)));
+        .isCompletedWithValue(new RangeHeaders(checkpointRange, headersFromChain(4, 4)));
   }
 
   @Test
   public void shouldGetRemainingHeadersWhenRangeHasNoEnd() {
     final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 1000);
-    final CheckpointRange checkpointRange =
-        new CheckpointRange(peer.getEthPeer(), blockchain.getBlockHeader(3).get());
+    final SyncTargetRange checkpointRange =
+        new SyncTargetRange(peer.getEthPeer(), blockchain.getBlockHeader(3).get());
 
-    final CompletableFuture<CheckpointRangeHeaders> result = this.downloader.apply(checkpointRange);
+    final CompletableFuture<RangeHeaders> result = this.downloader.apply(checkpointRange);
 
     peer.respond(blockchainResponder(blockchain));
 
     assertThat(result)
-        .isCompletedWithValue(new CheckpointRangeHeaders(checkpointRange, headersFromChain(4, 19)));
+        .isCompletedWithValue(new RangeHeaders(checkpointRange, headersFromChain(4, 19)));
   }
 
   private List<BlockHeader> headersFromChain(final long startNumber, final long endNumber) {
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/ForestBlockPropagationManagerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/ForestBlockPropagationManagerTest.java
new file mode 100644
index 00000000000..000958b1fac
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/ForestBlockPropagationManagerTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync;
+
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+
+public class ForestBlockPropagationManagerTest extends AbstractBlockPropagationManagerTest {
+
+  private static Blockchain fullBlockchain;
+
+  @BeforeAll
+  public static void setupSuite() {
+    fullBlockchain = BlockchainSetupUtil.forTesting(DataStorageFormat.FOREST).importAllBlocks();
+  }
+
+  @BeforeEach
+  public void setup() {
+    setup(DataStorageFormat.FOREST);
+  }
+
+  @Override
+  public Blockchain getFullBlockchain() {
+    return fullBlockchain;
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/PipelineChainDownloaderTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/PipelineChainDownloaderTest.java
index 392a9889c34..babacfc5e0f 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/PipelineChainDownloaderTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/PipelineChainDownloaderTest.java
@@ -22,8 +22,8 @@
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.ethereum.core.BlockHeader;
@@ -37,19 +37,19 @@
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.services.pipeline.Pipeline;
 
-import java.util.Optional;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.function.Supplier;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class PipelineChainDownloaderTest {
 
   @Mock private SyncTargetManager syncTargetManager;
@@ -62,11 +62,13 @@ public class PipelineChainDownloaderTest {
   @Mock private SyncState syncState;
   private final BlockHeader commonAncestor = new BlockHeaderTestFixture().buildHeader();
   private SyncTarget syncTarget;
+  private SyncTarget syncTarget2;
   private PipelineChainDownloader chainDownloader;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     syncTarget = new SyncTarget(peer1, commonAncestor);
+    syncTarget2 = new SyncTarget(peer2, commonAncestor);
     chainDownloader =
         new PipelineChainDownloader(
             syncState,
@@ -74,42 +76,40 @@ public void setUp() {
             downloadPipelineFactory,
             scheduler,
             new NoOpMetricsSystem());
-
-    immediatelyCompletePauseAfterError();
   }
 
   @Test
   public void shouldSelectSyncTargetWhenStarted() {
-    when(syncTargetManager.findSyncTarget(Optional.empty())).thenReturn(new CompletableFuture<>());
+    when(syncTargetManager.findSyncTarget()).thenReturn(new CompletableFuture<>());
     chainDownloader.start();
 
-    verify(syncTargetManager).findSyncTarget(Optional.empty());
+    verify(syncTargetManager).findSyncTarget();
   }
 
   @Test
   public void shouldStartChainDownloadWhenTargetSelected() {
     final CompletableFuture<SyncTarget> selectTargetFuture = new CompletableFuture<>();
-    when(syncTargetManager.findSyncTarget(Optional.empty())).thenReturn(selectTargetFuture);
-    expectPipelineCreation(syncTarget, downloadPipeline);
-    when(scheduler.startPipeline(downloadPipeline)).thenReturn(new CompletableFuture<>());
+    when(syncTargetManager.findSyncTarget()).thenReturn(selectTargetFuture);
+    when(syncTargetManager.shouldContinueDownloading()).thenReturn(true);
+    expectPipelineCreation(syncTarget, downloadPipeline, new CompletableFuture<>());
     chainDownloader.start();
-    verifyZeroInteractions(downloadPipelineFactory);
+    verifyNoInteractions(downloadPipelineFactory);
 
     selectTargetFuture.complete(syncTarget);
 
     verify(downloadPipelineFactory).createDownloadPipelineForSyncTarget(syncTarget);
-    verify(scheduler).startPipeline(downloadPipeline);
+    verify(downloadPipelineFactory)
+        .startPipeline(scheduler, syncState, syncTarget, downloadPipeline);
   }
 
   @Test
   public void shouldUpdateSyncStateWhenTargetSelected() {
     final CompletableFuture<SyncTarget> selectTargetFuture = new CompletableFuture<>();
-    when(syncTargetManager.findSyncTarget(Optional.empty())).thenReturn(selectTargetFuture);
-    expectPipelineCreation(syncTarget, downloadPipeline);
-    when(scheduler.startPipeline(downloadPipeline)).thenReturn(new CompletableFuture<>());
+    when(syncTargetManager.findSyncTarget()).thenReturn(selectTargetFuture);
+    when(syncTargetManager.shouldContinueDownloading()).thenReturn(true);
+    expectPipelineCreation(syncTarget, downloadPipeline, new CompletableFuture<>());
     chainDownloader.start();
-    verifyZeroInteractions(downloadPipelineFactory);
-
+    verifyNoInteractions(downloadPipelineFactory);
     selectTargetFuture.complete(syncTarget);
 
     verify(syncState).setSyncTarget(peer1, commonAncestor);
@@ -117,30 +117,31 @@ public void shouldUpdateSyncStateWhenTargetSelected() {
 
   @Test
   public void shouldRetryWhenSyncTargetSelectionFailsAndSyncTargetManagerShouldContinue() {
+    immediatelyCompletePauseAfterError();
     final CompletableFuture<SyncTarget> selectTargetFuture = new CompletableFuture<>();
     when(syncTargetManager.shouldContinueDownloading()).thenReturn(true);
-    when(syncTargetManager.findSyncTarget(Optional.empty()))
+    when(syncTargetManager.findSyncTarget())
         .thenReturn(selectTargetFuture)
         .thenReturn(new CompletableFuture<>());
     chainDownloader.start();
 
-    verify(syncTargetManager).findSyncTarget(Optional.empty());
+    verify(syncTargetManager).findSyncTarget();
 
     selectTargetFuture.completeExceptionally(new RuntimeException("Nope"));
 
-    verify(syncTargetManager, times(2)).findSyncTarget(Optional.empty());
+    verify(syncTargetManager, times(2)).findSyncTarget();
   }
 
   @Test
   public void shouldBeCompleteWhenSyncTargetSelectionFailsAndSyncTargetManagerShouldNotContinue() {
     final CompletableFuture<SyncTarget> selectTargetFuture = new CompletableFuture<>();
     when(syncTargetManager.shouldContinueDownloading()).thenReturn(false);
-    when(syncTargetManager.findSyncTarget(Optional.empty()))
+    when(syncTargetManager.findSyncTarget())
         .thenReturn(selectTargetFuture)
         .thenReturn(new CompletableFuture<>());
     final CompletableFuture<Void> result = chainDownloader.start();
 
-    verify(syncTargetManager).findSyncTarget(Optional.empty());
+    verify(syncTargetManager).findSyncTarget();
 
     final RuntimeException exception = new RuntimeException("Nope");
     selectTargetFuture.completeExceptionally(exception);
@@ -150,15 +151,15 @@ public void shouldBeCompleteWhenSyncTargetSelectionFailsAndSyncTargetManagerShou
 
   @Test
   public void shouldBeCompleteWhenPipelineCompletesAndSyncTargetManagerShouldNotContinue() {
-    final CompletableFuture<Void> pipelineFuture = expectPipelineStarted(syncTarget);
+    final CompletableFuture<Void> pipelineFuture = new CompletableFuture<>();
+    when(syncTargetManager.findSyncTarget()).thenReturn(completedFuture(syncTarget));
     final CompletableFuture<Void> result = chainDownloader.start();
 
-    verify(syncTargetManager).findSyncTarget(Optional.empty());
+    verify(syncTargetManager).findSyncTarget();
 
-    when(syncTargetManager.shouldContinueDownloading()).thenReturn(false);
     pipelineFuture.complete(null);
 
-    verify(syncTargetManager).shouldContinueDownloading();
+    verify(syncTargetManager, Mockito.times(2)).shouldContinueDownloading();
     verify(syncState).clearSyncTarget();
     verifyNoMoreInteractions(syncTargetManager);
     assertThat(result).isCompleted();
@@ -171,8 +172,7 @@ public void shouldSelectNewSyncTargetWhenPipelineCompletesIfSyncTargetManagerSho
 
     final CompletableFuture<Void> result = chainDownloader.start();
 
-    final SyncTarget syncTarget2 = new SyncTarget(peer2, commonAncestor);
-    verify(syncTargetManager).findSyncTarget(Optional.empty());
+    verify(syncTargetManager).findSyncTarget();
 
     // Setup expectation for second time round.
     expectPipelineStarted(syncTarget2, downloadPipeline2);
@@ -180,13 +180,14 @@ public void shouldSelectNewSyncTargetWhenPipelineCompletesIfSyncTargetManagerSho
     pipelineFuture.complete(null);
     assertThat(result).isNotDone();
 
-    verify(syncTargetManager, times(2)).findSyncTarget(Optional.empty());
+    verify(syncTargetManager, times(2)).findSyncTarget();
     assertThat(result).isNotDone();
   }
 
   @Test
   public void shouldNotNestExceptionHandling() {
     when(syncTargetManager.shouldContinueDownloading())
+        .thenReturn(true)
         .thenReturn(true) // Allow continuing after first successful download
         .thenReturn(false); // But not after finding the second sync target fails
 
@@ -195,15 +196,15 @@ public void shouldNotNestExceptionHandling() {
 
     final CompletableFuture<Void> result = chainDownloader.start();
 
-    verify(syncTargetManager).findSyncTarget(Optional.empty());
+    verify(syncTargetManager).findSyncTarget();
 
     // Setup expectation for second call
-    when(syncTargetManager.findSyncTarget(Optional.empty())).thenReturn(findSecondSyncTargetFuture);
+    when(syncTargetManager.findSyncTarget()).thenReturn(findSecondSyncTargetFuture);
 
     pipelineFuture.complete(null);
     assertThat(result).isNotDone();
 
-    verify(syncTargetManager, times(2)).findSyncTarget(Optional.empty());
+    verify(syncTargetManager, times(2)).findSyncTarget();
     assertThat(result).isNotDone();
 
     final RuntimeException exception = new RuntimeException("Nope");
@@ -213,24 +214,24 @@ public void shouldNotNestExceptionHandling() {
     // Should only need to check if it should continue twice.
     // We'll wind up doing this check more than necessary if we keep wrapping additional exception
     // handlers when restarting the sequence which wastes memory.
-    verify(syncTargetManager, times(2)).shouldContinueDownloading();
+    verify(syncTargetManager, times(3)).shouldContinueDownloading();
   }
 
   @Test
   public void shouldNotStartDownloadIfCancelledWhileSelectingSyncTarget() {
     final CompletableFuture<SyncTarget> selectSyncTargetFuture = new CompletableFuture<>();
     lenient().when(syncTargetManager.shouldContinueDownloading()).thenReturn(true);
-    when(syncTargetManager.findSyncTarget(Optional.empty())).thenReturn(selectSyncTargetFuture);
+    when(syncTargetManager.findSyncTarget()).thenReturn(selectSyncTargetFuture);
 
     final CompletableFuture<Void> result = chainDownloader.start();
-    verify(syncTargetManager).findSyncTarget(Optional.empty());
+    verify(syncTargetManager).findSyncTarget();
 
     chainDownloader.cancel();
     // Note the future doesn't complete until all activity has come to a stop.
     assertThat(result).isNotDone();
 
     selectSyncTargetFuture.complete(syncTarget);
-    verifyZeroInteractions(downloadPipelineFactory);
+    verifyNoInteractions(downloadPipelineFactory);
     assertCancelled(result);
   }
 
@@ -240,8 +241,10 @@ public void shouldAbortPipelineIfCancelledAfterDownloadStarts() {
     final CompletableFuture<Void> pipelineFuture = expectPipelineStarted(syncTarget);
 
     final CompletableFuture<Void> result = chainDownloader.start();
-    verify(syncTargetManager).findSyncTarget(Optional.empty());
+    verify(syncTargetManager).findSyncTarget();
     verify(downloadPipelineFactory).createDownloadPipelineForSyncTarget(syncTarget);
+    verify(downloadPipelineFactory)
+        .startPipeline(scheduler, syncState, syncTarget, downloadPipeline);
 
     chainDownloader.cancel();
     // Pipeline is aborted immediately.
@@ -254,6 +257,34 @@ public void shouldAbortPipelineIfCancelledAfterDownloadStarts() {
     assertCancelled(result);
   }
 
+  @Test
+  public void shouldRetryIfNotCancelledAndPipelineTaskThrowsException() {
+    immediatelyCompletePauseAfterError();
+    when(syncTargetManager.shouldContinueDownloading()).thenReturn(true);
+
+    final CompletableFuture<Void> pipelineFuture1 = new CompletableFuture<>();
+    final CompletableFuture<Void> pipelineFuture2 = new CompletableFuture<>();
+
+    when(syncTargetManager.findSyncTarget())
+        .thenReturn(completedFuture(syncTarget))
+        .thenReturn(completedFuture(syncTarget2));
+
+    expectPipelineCreation(syncTarget2, downloadPipeline2, pipelineFuture2);
+
+    final CompletableFuture<Void> result = chainDownloader.start();
+
+    // A task in the pipeline is cancelled, causing the pipeline to abort.
+    final Exception taskException =
+        new RuntimeException(
+            "Async operation failed", new ExecutionException(new CancellationException()));
+    pipelineFuture1.completeExceptionally(taskException);
+
+    // Second time round, there are no task errors in the pipeline, and the download can complete.
+    pipelineFuture2.complete(null);
+
+    assertThat(result).isDone();
+  }
+
   @Test
   public void shouldDisconnectSyncTargetOnInvalidBlockException_finishedDownloading_cancelled() {
     testInvalidBlockHandling(true, true);
@@ -278,13 +309,12 @@ public void shouldDisconnectSyncTargetOnInvalidBlockException_notFinishedDownloa
   public void testInvalidBlockHandling(
       final boolean isFinishedDownloading, final boolean isCancelled) {
     final CompletableFuture<SyncTarget> selectTargetFuture = new CompletableFuture<>();
-    when(syncTargetManager.shouldContinueDownloading()).thenReturn(isFinishedDownloading);
-    when(syncTargetManager.findSyncTarget(Optional.empty()))
+    when(syncTargetManager.findSyncTarget())
         .thenReturn(selectTargetFuture)
         .thenReturn(new CompletableFuture<>());
 
     chainDownloader.start();
-    verify(syncTargetManager).findSyncTarget(Optional.empty());
+    verify(syncTargetManager).findSyncTarget();
     if (isCancelled) {
       chainDownloader.cancel();
     }
@@ -300,17 +330,20 @@ private CompletableFuture<Void> expectPipelineStarted(final SyncTarget syncTarge
   private CompletableFuture<Void> expectPipelineStarted(
       final SyncTarget syncTarget, final Pipeline<?> pipeline) {
     final CompletableFuture<Void> pipelineFuture = new CompletableFuture<>();
-    when(syncTargetManager.findSyncTarget(Optional.empty()))
-        .thenReturn(completedFuture(syncTarget));
-    expectPipelineCreation(syncTarget, pipeline);
-    when(scheduler.startPipeline(pipeline)).thenReturn(pipelineFuture);
+    when(syncTargetManager.findSyncTarget()).thenReturn(completedFuture(syncTarget));
+    expectPipelineCreation(syncTarget, pipeline, pipelineFuture);
     return pipelineFuture;
   }
 
   @SuppressWarnings({"unchecked", "rawtypes"}) // Mockito really doesn't like Pipeline<?>
-  private void expectPipelineCreation(final SyncTarget syncTarget, final Pipeline<?> pipeline) {
+  private void expectPipelineCreation(
+      final SyncTarget syncTarget,
+      final Pipeline<?> pipeline,
+      final CompletableFuture<Void> completableFuture) {
     when(downloadPipelineFactory.createDownloadPipelineForSyncTarget(syncTarget))
         .thenReturn((Pipeline) pipeline);
+    when(downloadPipelineFactory.startPipeline(scheduler, syncState, syncTarget, pipeline))
+        .thenReturn(completableFuture);
   }
 
   private void assertExceptionallyCompletedWith(
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/RangeHeadersFetcherTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/RangeHeadersFetcherTest.java
new file mode 100644
index 00000000000..d0ffe91db98
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/RangeHeadersFetcherTest.java
@@ -0,0 +1,227 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
+import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
+import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer.Responder;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncState;
+import org.hyperledger.besu.ethereum.eth.sync.range.RangeHeadersFetcher;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class RangeHeadersFetcherTest {
+
+  private static final int SEGMENT_SIZE = 5;
+  private static Blockchain blockchain;
+  private static ProtocolSchedule protocolSchedule;
+  private static ProtocolContext protocolContext;
+  private static final MetricsSystem metricsSystem = new NoOpMetricsSystem();
+  private static TransactionPool transactionPool;
+  private EthProtocolManager ethProtocolManager;
+  private Responder responder;
+  private RespondingEthPeer respondingPeer;
+
+  @BeforeClass
+  public static void setUpClass() {
+    final BlockchainSetupUtil blockchainSetupUtil =
+        BlockchainSetupUtil.forTesting(DataStorageFormat.FOREST);
+    blockchainSetupUtil.importAllBlocks();
+    blockchain = blockchainSetupUtil.getBlockchain();
+    transactionPool = blockchainSetupUtil.getTransactionPool();
+    protocolSchedule = blockchainSetupUtil.getProtocolSchedule();
+    protocolContext = blockchainSetupUtil.getProtocolContext();
+  }
+
+  @Before
+  public void setUpTest() {
+    ethProtocolManager =
+        EthProtocolManagerTestUtil.create(
+            protocolSchedule,
+            blockchain,
+            () -> false,
+            protocolContext.getWorldStateArchive(),
+            transactionPool,
+            EthProtocolConfiguration.defaultConfig());
+    responder =
+        RespondingEthPeer.blockchainResponder(
+            blockchain, protocolContext.getWorldStateArchive(), transactionPool);
+    respondingPeer =
+        EthProtocolManagerTestUtil.createPeer(
+            ethProtocolManager, blockchain.getChainHeadBlockNumber());
+  }
+
+  @Test
+  public void shouldRequestHeadersFromPeerAndExcludeExistingHeader() {
+    final RangeHeadersFetcher rangeHeaderFetcher = createRangeHeaderFetcher();
+
+    final CompletableFuture<List<BlockHeader>> result =
+        rangeHeaderFetcher.getNextRangeHeaders(respondingPeer.getEthPeer(), header(1));
+
+    assertThat(result).isNotDone();
+
+    respondingPeer.respond(responder);
+
+    assertThat(result).isCompletedWithValue(asList(header(6), header(11), header(16)));
+  }
+
+  @Test
+  public void shouldNotRequestHeadersBeyondTargetWhenTargetIsMultipleOfSegmentSize() {
+    final RangeHeadersFetcher rangeHeaderFetcher = createRangeHeaderFetcher(header(11));
+
+    final CompletableFuture<List<BlockHeader>> result =
+        rangeHeaderFetcher.getNextRangeHeaders(respondingPeer.getEthPeer(), header(1));
+
+    respondingPeer.respond(responder);
+
+    assertThat(result).isCompletedWithValue(asList(header(6), header(11)));
+  }
+
+  @Test
+  public void shouldNotRequestHeadersBeyondTargetWhenTargetIsNotAMultipleOfSegmentSize() {
+    final RangeHeadersFetcher rangeHeaderFetcher = createRangeHeaderFetcher(header(15));
+
+    final CompletableFuture<List<BlockHeader>> result =
+        rangeHeaderFetcher.getNextRangeHeaders(respondingPeer.getEthPeer(), header(1));
+
+    respondingPeer.respond(responder);
+
+    assertThat(result).isCompletedWithValue(asList(header(6), header(11)));
+  }
+
+  @Test
+  public void shouldReturnOnlyTargetHeaderWhenLastHeaderIsTheRangeBeforeTarget() {
+    final RangeHeadersFetcher rangeHeaderFetcher = createRangeHeaderFetcher(header(15));
+
+    final CompletableFuture<List<BlockHeader>> result =
+        rangeHeaderFetcher.getNextRangeHeaders(respondingPeer.getEthPeer(), header(11));
+
+    assertThat(result).isCompletedWithValue(singletonList(header(15)));
+  }
+
+  @Test
+  public void shouldReturnEmptyListWhenLastHeaderIsTarget() {
+    final RangeHeadersFetcher rangeHeaderFetcher = createRangeHeaderFetcher(header(15));
+
+    final CompletableFuture<List<BlockHeader>> result =
+        rangeHeaderFetcher.getNextRangeHeaders(respondingPeer.getEthPeer(), header(15));
+    assertThat(result).isCompletedWithValue(emptyList());
+  }
+
+  @Test
+  public void shouldReturnEmptyListWhenLastHeaderIsAfterTarget() {
+    final RangeHeadersFetcher rangeHeaderFetcher = createRangeHeaderFetcher(header(15));
+
+    final CompletableFuture<List<BlockHeader>> result =
+        rangeHeaderFetcher.getNextRangeHeaders(respondingPeer.getEthPeer(), header(16));
+    assertThat(result).isCompletedWithValue(emptyList());
+  }
+
+  @Test
+  public void nextRangeShouldEndAtChainHeadWhenNextRangeHeaderIsAfterHead() {
+    final long remoteChainHeight = blockchain.getChainHeadBlockNumber();
+    final RangeHeadersFetcher rangeHeaderFetcher = createRangeHeaderFetcher();
+
+    assertThat(
+            rangeHeaderFetcher.nextRangeEndsAtChainHead(
+                respondingPeer.getEthPeer(), header(remoteChainHeight - SEGMENT_SIZE + 1)))
+        .isTrue();
+  }
+
+  @Test
+  public void nextRangeShouldNotEndAtChainHeadWhenAFinalRangeHeaderIsSpecified() {
+    final long remoteChainHeight = blockchain.getChainHeadBlockNumber();
+    final RangeHeadersFetcher rangeHeaderFetcher =
+        createRangeHeaderFetcher(header(remoteChainHeight));
+
+    assertThat(
+            rangeHeaderFetcher.nextRangeEndsAtChainHead(
+                respondingPeer.getEthPeer(), header(remoteChainHeight - SEGMENT_SIZE + 1)))
+        .isFalse();
+  }
+
+  @Test
+  public void shouldReturnRemoteChainHeadWhenNextRangeHeaderIsTheRemoteHead() {
+    final long remoteChainHeight = blockchain.getChainHeadBlockNumber();
+    final RangeHeadersFetcher rangeHeaderFetcher = createRangeHeaderFetcher();
+
+    assertThat(
+            rangeHeaderFetcher.nextRangeEndsAtChainHead(
+                respondingPeer.getEthPeer(), header(remoteChainHeight - SEGMENT_SIZE)))
+        .isFalse();
+
+    final CompletableFuture<List<BlockHeader>> result =
+        rangeHeaderFetcher.getNextRangeHeaders(
+            respondingPeer.getEthPeer(), header(remoteChainHeight - SEGMENT_SIZE));
+
+    respondingPeer.respond(responder);
+
+    assertThat(result).isCompletedWithValue(singletonList(header(remoteChainHeight)));
+  }
+
+  private RangeHeadersFetcher createRangeHeaderFetcher() {
+    final EthContext ethContext = ethProtocolManager.ethContext();
+    return new RangeHeadersFetcher(
+        SynchronizerConfiguration.builder()
+            .downloaderChainSegmentSize(SEGMENT_SIZE)
+            .downloaderHeadersRequestSize(3)
+            .build(),
+        protocolSchedule,
+        ethContext,
+        metricsSystem);
+  }
+
+  private RangeHeadersFetcher createRangeHeaderFetcher(final BlockHeader targetHeader) {
+    final EthContext ethContext = ethProtocolManager.ethContext();
+    return new RangeHeadersFetcher(
+        SynchronizerConfiguration.builder()
+            .downloaderChainSegmentSize(SEGMENT_SIZE)
+            .downloaderHeadersRequestSize(3)
+            .build(),
+        protocolSchedule,
+        ethContext,
+        new FastSyncState(targetHeader),
+        metricsSystem);
+  }
+
+  private BlockHeader header(final long blockNumber) {
+    return blockchain.getBlockHeader(blockNumber).get();
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/RangeHeadersValidationStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/RangeHeadersValidationStepTest.java
new file mode 100644
index 00000000000..cc2fb2120a2
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/RangeHeadersValidationStepTest.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync;
+
+import static java.util.Arrays.asList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode.DETACHED_ONLY;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.sync.range.RangeHeaders;
+import org.hyperledger.besu.ethereum.eth.sync.range.RangeHeadersValidationStep;
+import org.hyperledger.besu.ethereum.eth.sync.range.SyncTargetRange;
+import org.hyperledger.besu.ethereum.eth.sync.tasks.exceptions.InvalidBlockException;
+import org.hyperledger.besu.ethereum.mainnet.BlockHeaderValidator;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class RangeHeadersValidationStepTest {
+  @Mock private ProtocolSchedule protocolSchedule;
+  @Mock private ProtocolSpec protocolSpec;
+  @Mock private ProtocolContext protocolContext;
+  @Mock private BlockHeaderValidator headerValidator;
+  @Mock private ValidationPolicy validationPolicy;
+  @Mock private EthPeer syncTarget;
+
+  private final BlockDataGenerator gen = new BlockDataGenerator();
+  private RangeHeadersValidationStep validationStep;
+
+  private final BlockHeader rangeStart = gen.header(10);
+  private final BlockHeader rangeEnd = gen.header(13);
+  private final BlockHeader firstHeader = gen.header(11);
+  private final RangeHeaders rangeHeaders =
+      new RangeHeaders(
+          new SyncTargetRange(syncTarget, rangeStart, rangeEnd),
+          asList(firstHeader, gen.header(12), rangeEnd));
+
+  public void setUp() {
+    when(protocolSchedule.getByBlockHeader(any(BlockHeader.class))).thenReturn(protocolSpec);
+    when(protocolSpec.getBlockHeaderValidator()).thenReturn(headerValidator);
+    when(validationPolicy.getValidationModeForNextBlock()).thenReturn(DETACHED_ONLY);
+
+    validationStep =
+        new RangeHeadersValidationStep(protocolSchedule, protocolContext, validationPolicy);
+  }
+
+  @Test
+  public void shouldValidateFirstHeaderAgainstRangeStartHeader() {
+    setUp();
+    when(headerValidator.validateHeader(firstHeader, rangeStart, protocolContext, DETACHED_ONLY))
+        .thenReturn(true);
+    final Stream<BlockHeader> result = validationStep.apply(rangeHeaders);
+
+    verify(protocolSchedule).getByBlockHeader(firstHeader);
+    verify(validationPolicy).getValidationModeForNextBlock();
+    verify(headerValidator).validateHeader(firstHeader, rangeStart, protocolContext, DETACHED_ONLY);
+    verifyNoMoreInteractions(headerValidator, validationPolicy);
+
+    assertThat(result).containsExactlyElementsOf(rangeHeaders.getHeadersToImport());
+  }
+
+  @Test
+  public void shouldThrowExceptionWhenValidationFails() {
+    setUp();
+    when(headerValidator.validateHeader(firstHeader, rangeStart, protocolContext, DETACHED_ONLY))
+        .thenReturn(false);
+    assertThatThrownBy(() -> validationStep.apply(rangeHeaders))
+        .isInstanceOf(InvalidBlockException.class)
+        .hasMessageContaining(
+            "Invalid range headers.  Headers downloaded between #"
+                + rangeStart.getNumber()
+                + " ("
+                + rangeStart.getHash()
+                + ") and #"
+                + rangeEnd.getNumber()
+                + " ("
+                + rangeEnd.getHash()
+                + ") do not connect at #"
+                + firstHeader.getNumber()
+                + " ("
+                + firstHeader.getHash()
+                + ")");
+  }
+
+  @Test
+  public void acceptResponseWithNoHeadersAndNoSetUp() {
+    // don't run the setUp
+    validationStep =
+        new RangeHeadersValidationStep(protocolSchedule, protocolContext, validationPolicy);
+    var emptyRangeHeaders =
+        new RangeHeaders(new SyncTargetRange(syncTarget, rangeStart, rangeEnd), List.of());
+
+    final Stream<BlockHeader> result = validationStep.apply(emptyRangeHeaders);
+    assertThat(result).isEmpty();
+
+    verifyNoMoreInteractions(
+        protocolSchedule,
+        protocolSpec,
+        protocolContext,
+        headerValidator,
+        validationPolicy,
+        syncTarget);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/SyncTargetRangeSourceTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/SyncTargetRangeSourceTest.java
new file mode 100644
index 00000000000..9766b812641
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/SyncTargetRangeSourceTest.java
@@ -0,0 +1,270 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static java.util.concurrent.CompletableFuture.completedFuture;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.eth.manager.exceptions.NoAvailablePeersException;
+import org.hyperledger.besu.ethereum.eth.sync.fullsync.SyncTerminationCondition;
+import org.hyperledger.besu.ethereum.eth.sync.range.RangeHeadersFetcher;
+import org.hyperledger.besu.ethereum.eth.sync.range.SyncTargetRange;
+import org.hyperledger.besu.ethereum.eth.sync.range.SyncTargetRangeSource;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeoutException;
+import java.util.function.Supplier;
+
+import org.junit.jupiter.api.Test;
+
+public class SyncTargetRangeSourceTest {
+
+  private static final int CHECKPOINT_TIMEOUTS_PERMITTED = 3;
+  private static final Duration RETRY_DELAY_DURATION = Duration.ofSeconds(2);
+  private final EthPeer peer = mock(EthPeer.class);
+  private final RangeHeadersFetcher rangeHeaders = mock(RangeHeadersFetcher.class);
+  private final SyncTargetRangeSource.SyncTargetChecker syncTargetChecker =
+      mock(SyncTargetRangeSource.SyncTargetChecker.class);
+  private final EthScheduler ethScheduler = mock(EthScheduler.class);
+
+  private final BlockHeader commonAncestor = header(10);
+  private final SyncTargetRangeSource source =
+      new SyncTargetRangeSource(
+          rangeHeaders,
+          syncTargetChecker,
+          ethScheduler,
+          peer,
+          commonAncestor,
+          CHECKPOINT_TIMEOUTS_PERMITTED,
+          Duration.ofMillis(1),
+          SyncTerminationCondition.never());
+
+  @Test
+  public void shouldHaveNextWhenNoCheckpointsLoadedButSyncTargetCheckerSaysToContinue() {
+    when(syncTargetChecker.shouldContinueDownloadingFromSyncTarget(peer, commonAncestor))
+        .thenReturn(true);
+    assertThat(source).hasNext();
+  }
+
+  @Test
+  public void shouldHaveNextWhenMoreCheckpointsAreLoadedRegardlessOfSyncTargetChecker() {
+    when(rangeHeaders.getNextRangeHeaders(peer, commonAncestor))
+        .thenReturn(completedFuture(asList(header(15), header(20))));
+    when(syncTargetChecker.shouldContinueDownloadingFromSyncTarget(peer, commonAncestor))
+        .thenReturn(false);
+
+    source.next();
+    verify(rangeHeaders).getNextRangeHeaders(peer, commonAncestor);
+
+    assertThat(source).hasNext();
+  }
+
+  @Test
+  public void shouldNotHaveNextWhenNoCheckpointsLoadedAndSyncTargetCheckerReturnsFalse() {
+    // e.g. when a better sync target is available
+    when(syncTargetChecker.shouldContinueDownloadingFromSyncTarget(peer, commonAncestor))
+        .thenReturn(false);
+    assertThat(source).isExhausted();
+  }
+
+  @Test
+  public void shouldNotHaveNextWhenNoMoreCheckpointsAvailableAndRetryLimitReached() {
+    when(syncTargetChecker.shouldContinueDownloadingFromSyncTarget(any(), any())).thenReturn(true);
+    when(rangeHeaders.getNextRangeHeaders(peer, commonAncestor))
+        .thenReturn(CompletableFuture.failedFuture(new TimeoutException()));
+
+    for (int i = 1; i <= CHECKPOINT_TIMEOUTS_PERMITTED; i++) {
+      assertThat(source).hasNext();
+      assertThat(source.next()).isNull();
+      verify(rangeHeaders, times(i)).getNextRangeHeaders(peer, commonAncestor);
+    }
+
+    // Too many timeouts, give up on this sync target.
+    assertThat(source).isExhausted();
+  }
+
+  @Test
+  public void shouldConsiderHeaderRequestFailedIfNoNewHeadersReturned() {
+    when(syncTargetChecker.shouldContinueDownloadingFromSyncTarget(any(), any())).thenReturn(true);
+    when(rangeHeaders.getNextRangeHeaders(peer, commonAncestor))
+        .thenReturn(completedFuture(emptyList()));
+
+    for (int i = 1; i <= CHECKPOINT_TIMEOUTS_PERMITTED; i++) {
+      assertThat(source).hasNext();
+      assertThat(source.next()).isNull();
+      verify(rangeHeaders, times(i)).getNextRangeHeaders(peer, commonAncestor);
+    }
+
+    // Too many timeouts, give up on this sync target.
+    assertThat(source).isExhausted();
+  }
+
+  @Test
+  @SuppressWarnings("unchecked")
+  public void shouldDelayBeforeRetryingRequestForCheckpointHeadersAfterEmptyResponse() {
+    when(syncTargetChecker.shouldContinueDownloadingFromSyncTarget(any(), any())).thenReturn(true);
+    when(rangeHeaders.getNextRangeHeaders(peer, commonAncestor))
+        .thenReturn(completedFuture(emptyList()));
+
+    assertThat(source.next()).isNull();
+    verify(rangeHeaders).getNextRangeHeaders(peer, commonAncestor);
+    verify(ethScheduler).scheduleFutureTask(any(Supplier.class), eq(RETRY_DELAY_DURATION));
+  }
+
+  @Test
+  @SuppressWarnings("unchecked")
+  public void shouldDelayBeforeRetryingRequestForCheckpointHeadersAfterFailure() {
+    when(syncTargetChecker.shouldContinueDownloadingFromSyncTarget(any(), any())).thenReturn(true);
+    when(rangeHeaders.getNextRangeHeaders(peer, commonAncestor))
+        .thenReturn(CompletableFuture.failedFuture(new RuntimeException("Nope")));
+
+    assertThat(source.next()).isNull();
+    verify(rangeHeaders).getNextRangeHeaders(peer, commonAncestor);
+    verify(ethScheduler).scheduleFutureTask(any(Supplier.class), eq(RETRY_DELAY_DURATION));
+  }
+
+  @Test
+  public void shouldResetCheckpointFailureCountWhenMoreCheckpointsReceived() {
+    when(syncTargetChecker.shouldContinueDownloadingFromSyncTarget(any(), any())).thenReturn(true);
+    when(rangeHeaders.getNextRangeHeaders(any(), any()))
+        .thenReturn(CompletableFuture.failedFuture(new TimeoutException()))
+        .thenReturn(CompletableFuture.failedFuture(new TimeoutException()))
+        .thenReturn(completedFuture(singletonList(header(15))))
+        .thenReturn(CompletableFuture.failedFuture(new TimeoutException()));
+
+    assertThat(source.next()).isNull(); // Fail
+    assertThat(source.next()).isNull(); // Fail
+    assertThat(source.next()).isNotNull(); // Succeed
+    assertThat(source.next()).isNull(); // Fail
+    assertThat(source.next()).isNull(); // Fail
+
+    // Failure count should have been reset by the success so limit hasn't been reached.
+    assertThat(source).hasNext();
+  }
+
+  @Test
+  public void shouldRequestMoreHeadersWhenCurrentSetHasRunOut() {
+    when(rangeHeaders.getNextRangeHeaders(peer, commonAncestor))
+        .thenReturn(completedFuture(asList(header(15), header(20))));
+
+    when(rangeHeaders.getNextRangeHeaders(peer, header(20)))
+        .thenReturn(completedFuture(asList(header(25), header(30))));
+
+    assertThat(source.next()).isEqualTo(new SyncTargetRange(peer, commonAncestor, header(15)));
+    verify(rangeHeaders).getNextRangeHeaders(peer, commonAncestor);
+    verify(rangeHeaders).nextRangeEndsAtChainHead(peer, commonAncestor);
+
+    assertThat(source.next()).isEqualTo(new SyncTargetRange(peer, header(15), header(20)));
+    verifyNoMoreInteractions(rangeHeaders);
+
+    assertThat(source.next()).isEqualTo(new SyncTargetRange(peer, header(20), header(25)));
+    verify(rangeHeaders).getNextRangeHeaders(peer, header(20));
+    verify(rangeHeaders).nextRangeEndsAtChainHead(peer, header(20));
+
+    assertThat(source.next()).isEqualTo(new SyncTargetRange(peer, header(25), header(30)));
+    verifyNoMoreInteractions(rangeHeaders);
+  }
+
+  @Test
+  public void shouldReturnCheckpointsFromExistingBatch() {
+    when(rangeHeaders.getNextRangeHeaders(peer, commonAncestor))
+        .thenReturn(completedFuture(asList(header(15), header(20))));
+
+    assertThat(source.next()).isEqualTo(new SyncTargetRange(peer, commonAncestor, header(15)));
+    assertThat(source.next()).isEqualTo(new SyncTargetRange(peer, header(15), header(20)));
+  }
+
+  @Test
+  public void shouldReturnNullIfNewHeadersNotAvailableInTime() {
+    when(rangeHeaders.getNextRangeHeaders(peer, commonAncestor))
+        .thenReturn(new CompletableFuture<>());
+
+    assertThat(source.next()).isNull();
+  }
+
+  @Test
+  public void shouldNotRequestMoreHeadersIfOriginalRequestStillInProgress() {
+    when(rangeHeaders.getNextRangeHeaders(peer, commonAncestor))
+        .thenReturn(new CompletableFuture<>());
+
+    assertThat(source.next()).isNull();
+    verify(rangeHeaders).getNextRangeHeaders(peer, commonAncestor);
+    verify(rangeHeaders).nextRangeEndsAtChainHead(peer, commonAncestor);
+
+    assertThat(source.next()).isNull();
+    verifyNoMoreInteractions(rangeHeaders);
+  }
+
+  @Test
+  public void shouldReturnCheckpointsOnceHeadersRequestCompletes() {
+    final CompletableFuture<List<BlockHeader>> future = new CompletableFuture<>();
+    when(rangeHeaders.getNextRangeHeaders(peer, commonAncestor)).thenReturn(future);
+
+    assertThat(source.next()).isNull();
+    verify(rangeHeaders).getNextRangeHeaders(peer, commonAncestor);
+
+    future.complete(asList(header(15), header(20)));
+    assertThat(source.next()).isEqualTo(new SyncTargetRange(peer, commonAncestor, header(15)));
+  }
+
+  @Test
+  public void shouldSendNewRequestIfRequestForHeadersFails() {
+    when(rangeHeaders.getNextRangeHeaders(peer, commonAncestor))
+        .thenReturn(CompletableFuture.failedFuture(new NoAvailablePeersException()))
+        .thenReturn(completedFuture(asList(header(15), header(20))));
+
+    // Returns null when the first request fails
+    assertThat(source.next()).isNull();
+    verify(rangeHeaders).getNextRangeHeaders(peer, commonAncestor);
+
+    // Then retries
+    assertThat(source.next()).isEqualTo(new SyncTargetRange(peer, commonAncestor, header(15)));
+    verify(rangeHeaders, times(2)).getNextRangeHeaders(peer, commonAncestor);
+  }
+
+  @Test
+  public void shouldReturnUnboundedCheckpointRangeWhenNextCheckpointEndsAtChainHead() {
+    when(syncTargetChecker.shouldContinueDownloadingFromSyncTarget(peer, commonAncestor))
+        .thenReturn(true);
+    when(rangeHeaders.nextRangeEndsAtChainHead(peer, commonAncestor)).thenReturn(true);
+
+    assertThat(source).hasNext();
+    assertThat(source.next()).isEqualTo(new SyncTargetRange(peer, commonAncestor));
+
+    // Once we've sent an open-ended range we shouldn't have any more ranges.
+    assertThat(source).isExhausted();
+    assertThat(source.next()).isNull();
+  }
+
+  private BlockHeader header(final int number) {
+    return new BlockHeaderTestFixture().number(number).buildHeader();
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/TrailingPeerLimiterTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/TrailingPeerLimiterTest.java
index d9479a9d718..9bcac6f0a9a 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/TrailingPeerLimiterTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/TrailingPeerLimiterTest.java
@@ -22,12 +22,12 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.eth.manager.ChainState;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
@@ -37,8 +37,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TrailingPeerLimiterTest {
 
@@ -54,7 +54,7 @@ public class TrailingPeerLimiterTest {
               new TrailingPeerRequirements(
                   CHAIN_HEAD - TRAILING_PEER_BLOCKS_BEHIND_THRESHOLD, MAX_TRAILING_PEERS));
 
-  @Before
+  @BeforeEach
   public void setUp() {
     when(ethPeers.streamAvailablePeers()).then(invocation -> peers.stream());
   }
@@ -145,7 +145,7 @@ private void assertDisconnections(final EthPeer... disconnectedPeers) {
     final List<EthPeer> disconnected = asList(disconnectedPeers);
     for (final EthPeer peer : peers) {
       if (disconnected.contains(peer)) {
-        verify(peer).disconnect(DisconnectReason.TOO_MANY_PEERS);
+        verify(peer).disconnect(DisconnectReason.USELESS_PEER);
       } else {
         verify(peer, never()).disconnect(any(DisconnectReason.class));
       }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncAlgSpec.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncAlgSpec.java
new file mode 100644
index 00000000000..f53b32cd54f
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncAlgSpec.java
@@ -0,0 +1,329 @@
+/*
+ *
+ *  * Copyright Hyperledger Besu Contributors.
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ *  * the License. You may obtain a copy of the License at
+ *  *
+ *  * http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ *  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ *  * specific language governing permissions and limitations under the License.
+ *  *
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.eth.sync.backwardsync;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.plugin.services.BesuEvents;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Nonnull;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class BackwardSyncAlgSpec {
+
+  public static final int REMOTE_HEIGHT = 50;
+  public static final int LOCAL_HEIGHT = 25;
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  BackwardSyncContext context;
+
+  private MutableBlockchain remoteBlockchain;
+  private MutableBlockchain localBlockchain;
+  @Captor ArgumentCaptor<BesuEvents.TTDReachedListener> ttdCaptor;
+  @Captor ArgumentCaptor<BesuEvents.InitialSyncCompletionListener> completionCaptor;
+
+  @InjectMocks BackwardSyncAlgorithm algorithm;
+  @Mock private Hash hash;
+
+  private static final BlockDataGenerator blockDataGenerator = new BlockDataGenerator();
+  private Block genesisBlock;
+
+  @Before
+  public void setUp() throws Exception {
+    BlockDataGenerator blockDataGenerator = new BlockDataGenerator();
+    genesisBlock = blockDataGenerator.genesisBlock();
+    remoteBlockchain = createInMemoryBlockchain(genesisBlock);
+    localBlockchain = createInMemoryBlockchain(genesisBlock);
+
+    for (int i = 1; i <= REMOTE_HEIGHT; i++) {
+      final BlockDataGenerator.BlockOptions options =
+          new BlockDataGenerator.BlockOptions()
+              .setBlockNumber(i)
+              .setParentHash(remoteBlockchain.getBlockHashByNumber(i - 1).orElseThrow());
+      final Block block = blockDataGenerator.block(options);
+      final List<TransactionReceipt> receipts = blockDataGenerator.receipts(block);
+
+      remoteBlockchain.appendBlock(block, receipts);
+      if (i <= LOCAL_HEIGHT) {
+        localBlockchain.appendBlock(block, receipts);
+      }
+    }
+
+    algorithm =
+        Mockito.spy(
+            new BackwardSyncAlgorithm(
+                context,
+                FinalBlockConfirmation.confirmationChain(
+                    FinalBlockConfirmation.genesisConfirmation(localBlockchain),
+                    FinalBlockConfirmation.ancestorConfirmation(localBlockchain))));
+    when(context.getProtocolContext().getBlockchain()).thenReturn(localBlockchain);
+  }
+
+  @Test
+  public void shouldWaitWhenNotReady() throws Exception {
+    doReturn(false).when(context).isReady();
+    when(context.getSyncState().isInitialSyncPhaseDone()).thenReturn(Boolean.TRUE);
+    when(context.getSyncState().subscribeTTDReached(any())).thenReturn(88L);
+    when(context.getSyncState().subscribeCompletionReached(any())).thenReturn(99L);
+
+    final CompletableFuture<Void> voidCompletableFuture = algorithm.waitForReady();
+
+    verify(context.getSyncState()).subscribeTTDReached(ttdCaptor.capture());
+    verify(context.getSyncState()).subscribeCompletionReached(completionCaptor.capture());
+    verify(context.getSyncState(), never()).unsubscribeTTDReached(anyLong());
+    assertThat(voidCompletableFuture).isNotCompleted();
+
+    ttdCaptor.getValue().onTTDReached(true);
+    completionCaptor.getValue().onInitialSyncCompleted();
+
+    Thread.sleep(100);
+
+    assertThat(voidCompletableFuture).isNotCompleted();
+  }
+
+  @Test
+  public void shouldNotWaitWhenReady() throws Exception {
+    doReturn(true).when(context).isReady();
+
+    when(context.getSyncState().subscribeTTDReached(any())).thenReturn(88L);
+    when(context.getSyncState().subscribeCompletionReached(any())).thenReturn(99L);
+
+    final CompletableFuture<Void> voidCompletableFuture = algorithm.waitForReady();
+    voidCompletableFuture.get(1, TimeUnit.SECONDS);
+    assertThat(voidCompletableFuture).isCompleted();
+
+    verify(context.getSyncState()).subscribeTTDReached(ttdCaptor.capture());
+
+    verify(context.getSyncState()).unsubscribeTTDReached(88L);
+    verify(context.getSyncState()).unsubscribeInitialConditionReached(99L);
+  }
+
+  @Test
+  public void shouldAwokeWhenTTDReachedAndReady() throws Exception {
+    doReturn(false).when(context).isReady();
+
+    when(context.getSyncState().subscribeTTDReached(any())).thenReturn(88L);
+    when(context.getSyncState().subscribeCompletionReached(any())).thenReturn(99L);
+    when(context.getEthContext().getEthPeers().peerCount()).thenReturn(1);
+
+    final CompletableFuture<Void> voidCompletableFuture = algorithm.waitForReady();
+
+    Thread.sleep(50);
+    assertThat(voidCompletableFuture).isNotCompleted();
+    verify(context.getSyncState()).subscribeTTDReached(ttdCaptor.capture());
+
+    doReturn(true).when(context).isReady();
+    Thread.sleep(50);
+    assertThat(voidCompletableFuture).isNotCompleted();
+
+    ttdCaptor.getValue().onTTDReached(true);
+
+    voidCompletableFuture.get(100, TimeUnit.MILLISECONDS);
+    assertThat(voidCompletableFuture).isCompleted();
+
+    verify(context.getSyncState()).unsubscribeTTDReached(88L);
+    verify(context.getSyncState()).unsubscribeInitialConditionReached(99L);
+  }
+
+  @Test
+  public void shouldAwokeWhenConditionReachedAndReady() throws Exception {
+    doReturn(false).when(context).isReady();
+
+    when(context.getSyncState().subscribeTTDReached(any())).thenReturn(88L);
+    when(context.getSyncState().subscribeCompletionReached(any())).thenReturn(99L);
+    when(context.getEthContext().getEthPeers().peerCount()).thenReturn(1);
+
+    final CompletableFuture<Void> voidCompletableFuture = algorithm.waitForReady();
+    Thread.sleep(50);
+
+    verify(context.getSyncState()).subscribeCompletionReached(completionCaptor.capture());
+    assertThat(voidCompletableFuture).isNotCompleted();
+
+    doReturn(true).when(context).isReady();
+    Thread.sleep(50);
+    assertThat(voidCompletableFuture).isNotCompleted();
+
+    completionCaptor.getValue().onInitialSyncCompleted();
+
+    voidCompletableFuture.get(100, TimeUnit.MILLISECONDS);
+    assertThat(voidCompletableFuture).isCompleted();
+
+    verify(context.getSyncState()).unsubscribeTTDReached(88L);
+    verify(context.getSyncState()).unsubscribeInitialConditionReached(99L);
+  }
+
+  @Test
+  public void shouldFinishWhenWorkIsDone() {
+    doReturn(true).when(context).isReady();
+    final CompletableFuture<Void> completableFuture = algorithm.pickNextStep();
+    assertThat(completableFuture.isDone()).isTrue();
+  }
+
+  @Test
+  public void shouldSyncWhenThereIsUnprocessedHash() {
+    final BackwardChain backwardChain = createBackwardChain(LOCAL_HEIGHT, LOCAL_HEIGHT + 10);
+    doReturn(backwardChain).when(context).getBackwardChain();
+    backwardChain.addNewHash(hash);
+    doReturn(CompletableFuture.completedFuture(null)).when(algorithm).executeSyncStep(hash);
+
+    algorithm.pickNextStep();
+    verify(algorithm).executeSyncStep(hash);
+  }
+
+  @Test
+  public void shouldWaitForReadyWhenNotReady() {
+    final BackwardChain backwardChain = createBackwardChain(LOCAL_HEIGHT, LOCAL_HEIGHT + 10);
+    doReturn(backwardChain).when(context).getBackwardChain();
+    doReturn(false).when(context).isReady();
+    doReturn(CompletableFuture.completedFuture(null)).when(algorithm).waitForReady();
+
+    final CompletableFuture<Void> nextStep = algorithm.pickNextStep();
+    verify(algorithm).waitForReady();
+    assertThat(nextStep).isCompleted();
+  }
+
+  @Test
+  public void shouldRunProcessKnownAncestorsWhenOnLocalHeight() {
+    doReturn(true).when(context).isReady();
+    final BackwardChain backwardChain = createBackwardChain(LOCAL_HEIGHT, LOCAL_HEIGHT + 10);
+    doReturn(backwardChain).when(context).getBackwardChain();
+    doReturn(CompletableFuture.completedFuture(null))
+        .when(algorithm)
+        .executeProcessKnownAncestors();
+
+    algorithm.pickNextStep();
+    verify(algorithm).executeProcessKnownAncestors();
+  }
+
+  @Test
+  public void shouldRunForwardStepWhenOnLocalHeightPlusOne() {
+    doReturn(true).when(context).isReady();
+    final BackwardChain backwardChain = createBackwardChain(LOCAL_HEIGHT + 1, LOCAL_HEIGHT + 10);
+    doReturn(backwardChain).when(context).getBackwardChain();
+    doReturn(CompletableFuture.completedFuture(null)).when(algorithm).executeForwardAsync();
+
+    algorithm.pickNextStep();
+    verify(algorithm).executeForwardAsync();
+  }
+
+  @Test
+  public void shouldRunBackwardStepWhenNotOnLocalHeight() {
+    doReturn(true).when(context).isReady();
+    final BackwardChain backwardChain = createBackwardChain(LOCAL_HEIGHT + 3, LOCAL_HEIGHT + 10);
+    doReturn(backwardChain).when(context).getBackwardChain();
+    doReturn(CompletableFuture.completedFuture(null)).when(algorithm).executeBackwardAsync(any());
+
+    algorithm.pickNextStep();
+    verify(algorithm).executeBackwardAsync(any());
+  }
+
+  @Test
+  public void shouldStartForwardSyncIfGenesisIsReached() {
+    doReturn(true).when(context).isReady();
+    final MutableBlockchain otherLocalBlockchain = createForkedBlockchain(genesisBlock);
+    when(context.getProtocolContext().getBlockchain()).thenReturn(otherLocalBlockchain);
+
+    final BackwardChain backwardChain = createBackwardChain(0, 1);
+    doReturn(backwardChain).when(context).getBackwardChain();
+    doReturn(CompletableFuture.completedFuture(null))
+        .when(algorithm)
+        .executeProcessKnownAncestors();
+
+    algorithm.pickNextStep();
+    verify(algorithm).executeProcessKnownAncestors();
+  }
+
+  @Test
+  public void shouldFailIfADifferentGenesisIsReached() {
+    doReturn(true).when(context).isReady();
+    final BlockDataGenerator.BlockOptions otherGenesisOptions =
+        new BlockDataGenerator.BlockOptions()
+            .setBlockNumber(0)
+            .setExtraData(Bytes.of("Other genesis".getBytes(StandardCharsets.UTF_8)));
+    final Block otherGenesis = blockDataGenerator.genesisBlock(otherGenesisOptions);
+    final MutableBlockchain otherLocalBlockchain = createForkedBlockchain(otherGenesis);
+    when(context.getProtocolContext().getBlockchain()).thenReturn(otherLocalBlockchain);
+
+    final BackwardChain backwardChain = createBackwardChain(0, 1);
+    doReturn(backwardChain).when(context).getBackwardChain();
+    algorithm =
+        Mockito.spy(
+            new BackwardSyncAlgorithm(
+                context, FinalBlockConfirmation.genesisConfirmation(otherLocalBlockchain)));
+    assertThatThrownBy(() -> algorithm.pickNextStep())
+        .isInstanceOf(BackwardSyncException.class)
+        .hasMessageContaining("Should have reached header");
+  }
+
+  private MutableBlockchain createForkedBlockchain(final Block genesisBlock) {
+    final MutableBlockchain otherLocalBlockchain = createInMemoryBlockchain(genesisBlock);
+    final BlockDataGenerator.BlockOptions options =
+        new BlockDataGenerator.BlockOptions()
+            .setBlockNumber(1)
+            .setParentHash(genesisBlock.getHash())
+            .setExtraData(Bytes.of("Fork of block 1".getBytes(StandardCharsets.UTF_8)));
+    final Block block = blockDataGenerator.block(options);
+    final List<TransactionReceipt> receipts = blockDataGenerator.receipts(block);
+
+    otherLocalBlockchain.appendBlock(block, receipts);
+    return otherLocalBlockchain;
+  }
+
+  private BackwardChain createBackwardChain(final int from, final int until) {
+
+    BackwardChain backwardChain = BackwardSyncContextTest.inMemoryBackwardChain();
+    for (int i = until; i > from; --i) {
+      backwardChain.prependAncestorsHeader(getBlockByNumber(i - 1).getHeader());
+    }
+    return backwardChain;
+  }
+
+  @Nonnull
+  private Block getBlockByNumber(final int number) {
+    return remoteBlockchain.getBlockByNumber(number).orElseThrow();
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncContextTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncContextTest.java
new file mode 100644
index 00000000000..7c744c6b520
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncContextTest.java
@@ -0,0 +1,362 @@
+/*
+ *
+ *  * Copyright Hyperledger Besu Contributors.
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ *  * the License. You may obtain a copy of the License at
+ *  *
+ *  * http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ *  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ *  * specific language governing permissions and limitations under the License.
+ *  *
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.eth.sync.backwardsync;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.StubGenesisConfigOptions;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.BlockProcessingOutputs;
+import org.hyperledger.besu.ethereum.BlockProcessingResult;
+import org.hyperledger.besu.ethereum.BlockValidator;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
+import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.referencetests.ReferenceTestWorldState;
+import org.hyperledger.besu.plugin.data.TransactionType;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import javax.annotation.Nonnull;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class BackwardSyncContextTest {
+
+  public static final int REMOTE_HEIGHT = 50;
+  public static final int LOCAL_HEIGHT = 25;
+  public static final int UNCLE_HEIGHT = 25 - 3;
+
+  public static final int NUM_OF_RETRIES = 100;
+
+  private BackwardSyncContext context;
+
+  private MutableBlockchain remoteBlockchain;
+  private RespondingEthPeer peer;
+  private MutableBlockchain localBlockchain;
+  private static final BlockDataGenerator blockDataGenerator = new BlockDataGenerator();
+
+  @Spy
+  private ProtocolSchedule protocolSchedule =
+      MainnetProtocolSchedule.fromConfig(new StubGenesisConfigOptions());
+
+  @Spy
+  private ProtocolSpec protocolSpec =
+      protocolSchedule.getByBlockHeader(blockDataGenerator.header(0L));
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  private ProtocolContext protocolContext;
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  private MetricsSystem metricsSystem;
+
+  @Mock private BlockValidator blockValidator;
+  @Mock private SyncState syncState;
+  private BackwardChain backwardChain;
+  private Block uncle;
+  private Block genesisBlock;
+
+  @Before
+  public void setup() {
+    when(protocolSpec.getBlockValidator()).thenReturn(blockValidator);
+    doReturn(protocolSpec).when(protocolSchedule).getByBlockHeader(any());
+    genesisBlock = blockDataGenerator.genesisBlock();
+    remoteBlockchain = createInMemoryBlockchain(genesisBlock);
+    localBlockchain = createInMemoryBlockchain(genesisBlock);
+
+    for (int i = 1; i <= REMOTE_HEIGHT; i++) {
+      final Hash parentHash = remoteBlockchain.getBlockHashByNumber(i - 1).orElseThrow();
+      final BlockDataGenerator.BlockOptions options =
+          new BlockDataGenerator.BlockOptions().setBlockNumber(i).setParentHash(parentHash);
+      final Block block = blockDataGenerator.block(options);
+      final List<TransactionReceipt> receipts = blockDataGenerator.receipts(block);
+
+      remoteBlockchain.appendBlock(block, receipts);
+      if (i <= LOCAL_HEIGHT) {
+        if (i == UNCLE_HEIGHT) {
+          uncle =
+              createUncle(
+                  i, localBlockchain.getBlockByNumber(LOCAL_HEIGHT - 4).orElseThrow().getHash());
+          localBlockchain.appendBlock(uncle, blockDataGenerator.receipts(uncle));
+          localBlockchain.rewindToBlock(i - 1);
+        }
+        localBlockchain.appendBlock(block, receipts);
+      }
+    }
+    when(protocolContext.getBlockchain()).thenReturn(localBlockchain);
+    EthProtocolManager ethProtocolManager = EthProtocolManagerTestUtil.create();
+
+    peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager);
+    EthContext ethContext = ethProtocolManager.ethContext();
+
+    when(blockValidator.validateAndProcessBlock(any(), any(), any(), any()))
+        .thenAnswer(
+            invocation -> {
+              final Object[] arguments = invocation.getArguments();
+              Block block = (Block) arguments[1];
+              return new BlockProcessingResult(
+                  Optional.of(
+                      new BlockProcessingOutputs(
+                          new ReferenceTestWorldState(), blockDataGenerator.receipts(block))));
+            });
+
+    backwardChain = inMemoryBackwardChain();
+    backwardChain.appendTrustedBlock(
+        remoteBlockchain.getBlockByNumber(LOCAL_HEIGHT + 1).orElseThrow());
+    backwardChain.appendTrustedBlock(
+        remoteBlockchain.getBlockByNumber(LOCAL_HEIGHT + 2).orElseThrow());
+    backwardChain.appendTrustedBlock(
+        remoteBlockchain.getBlockByNumber(LOCAL_HEIGHT + 3).orElseThrow());
+    backwardChain.appendTrustedBlock(
+        remoteBlockchain.getBlockByNumber(LOCAL_HEIGHT + 4).orElseThrow());
+    context =
+        spy(
+            new BackwardSyncContext(
+                protocolContext,
+                protocolSchedule,
+                metricsSystem,
+                ethContext,
+                syncState,
+                backwardChain,
+                NUM_OF_RETRIES));
+    doReturn(true).when(context).isReady();
+    doReturn(2).when(context).getBatchSize();
+  }
+
+  private Block createUncle(final int i, final Hash parentHash) {
+    final BlockDataGenerator.BlockOptions options =
+        new BlockDataGenerator.BlockOptions()
+            .setBlockNumber(i)
+            .setParentHash(parentHash)
+            .transactionTypes(TransactionType.ACCESS_LIST);
+    final Block block = blockDataGenerator.block(options);
+    return block;
+  }
+
+  public static BackwardChain inMemoryBackwardChain() {
+    final GenericKeyValueStorageFacade<Hash, BlockHeader> headersStorage =
+        new GenericKeyValueStorageFacade<>(
+            Hash::toArrayUnsafe,
+            new BlocksHeadersConvertor(new MainnetBlockHeaderFunctions()),
+            new InMemoryKeyValueStorage());
+    final GenericKeyValueStorageFacade<Hash, Block> blocksStorage =
+        new GenericKeyValueStorageFacade<>(
+            Hash::toArrayUnsafe,
+            new BlocksConvertor(new MainnetBlockHeaderFunctions()),
+            new InMemoryKeyValueStorage());
+    final GenericKeyValueStorageFacade<Hash, Hash> chainStorage =
+        new GenericKeyValueStorageFacade<>(
+            Hash::toArrayUnsafe, new HashConvertor(), new InMemoryKeyValueStorage());
+    final GenericKeyValueStorageFacade<String, BlockHeader> sessionDataStorage =
+        new GenericKeyValueStorageFacade<>(
+            key -> key.getBytes(StandardCharsets.UTF_8),
+            BlocksHeadersConvertor.of(new MainnetBlockHeaderFunctions()),
+            new InMemoryKeyValueStorage());
+    return new BackwardChain(headersStorage, blocksStorage, chainStorage, sessionDataStorage);
+  }
+
+  @Test
+  public void shouldSyncUntilHash() throws Exception {
+    final Hash hash = getBlockByNumber(REMOTE_HEIGHT).getHash();
+    final CompletableFuture<Void> future = context.syncBackwardsUntil(hash);
+
+    respondUntilFutureIsDone(future);
+
+    future.get();
+    assertThat(localBlockchain.getChainHeadBlock()).isEqualTo(remoteBlockchain.getChainHeadBlock());
+  }
+
+  @Test
+  public void shouldSyncUntilRemoteBranch() throws Exception {
+
+    final CompletableFuture<Void> future =
+        context.syncBackwardsUntil(getBlockByNumber(REMOTE_HEIGHT));
+
+    respondUntilFutureIsDone(future);
+
+    future.get();
+    assertThat(localBlockchain.getChainHeadBlock()).isEqualTo(remoteBlockchain.getChainHeadBlock());
+  }
+
+  @Test
+  public void shouldAddExpectedBlock() throws Exception {
+
+    final CompletableFuture<Void> future =
+        context.syncBackwardsUntil(getBlockByNumber(REMOTE_HEIGHT - 1));
+
+    final CompletableFuture<Void> secondFuture =
+        context.syncBackwardsUntil(getBlockByNumber(REMOTE_HEIGHT));
+
+    assertThat(future).isSameAs(secondFuture);
+
+    respondUntilFutureIsDone(future);
+
+    secondFuture.get();
+    assertThat(localBlockchain.getChainHeadBlock()).isEqualTo(remoteBlockchain.getChainHeadBlock());
+  }
+
+  private void respondUntilFutureIsDone(final CompletableFuture<Void> future) {
+    final RespondingEthPeer.Responder responder =
+        RespondingEthPeer.blockchainResponder(remoteBlockchain);
+
+    peer.respondWhileOtherThreadsWork(responder, () -> !future.isDone());
+  }
+
+  @Nonnull
+  private Block getBlockByNumber(final int number) {
+    return remoteBlockchain.getBlockByNumber(number).orElseThrow();
+  }
+
+  @Test
+  public void shouldMoveHead() {
+    final Block lastSavedBlock = localBlockchain.getBlockByNumber(4).orElseThrow();
+    context.possiblyMoveHead(lastSavedBlock);
+
+    assertThat(localBlockchain.getChainHeadBlock().getHeader().getNumber()).isEqualTo(4);
+  }
+
+  @Test
+  public void shouldNotMoveHeadWhenAlreadyHead() {
+    final Block lastSavedBlock = localBlockchain.getBlockByNumber(25).orElseThrow();
+    context.possiblyMoveHead(lastSavedBlock);
+
+    assertThat(localBlockchain.getChainHeadBlock().getHeader().getNumber()).isEqualTo(25);
+  }
+
+  @Test
+  public void shouldUpdateTargetHeightWhenStatusPresent() {
+    // Given
+    BlockHeader blockHeader = Mockito.mock(BlockHeader.class);
+    when(blockHeader.getParentHash()).thenReturn(Hash.fromHexStringLenient("0x41"));
+    when(blockHeader.getHash()).thenReturn(Hash.fromHexStringLenient("0x42"));
+    when(blockHeader.getNumber()).thenReturn(42L);
+    Block unknownBlock = Mockito.mock(Block.class);
+    when(unknownBlock.getHeader()).thenReturn(blockHeader);
+    when(unknownBlock.getHash()).thenReturn(Hash.fromHexStringLenient("0x42"));
+    when(unknownBlock.toRlp()).thenReturn(Bytes.EMPTY);
+    context.syncBackwardsUntil(unknownBlock); // set the status
+    assertThat(context.getStatus().getTargetChainHeight()).isEqualTo(42);
+    final Hash backwardChainHash =
+        remoteBlockchain.getBlockByNumber(LOCAL_HEIGHT + 4).get().getHash();
+    final Block backwardChainBlock = backwardChain.getTrustedBlock(backwardChainHash);
+
+    // When
+    context.maybeUpdateTargetHeight(backwardChainBlock.getHash());
+
+    // Then
+    assertThat(context.getStatus().getTargetChainHeight()).isEqualTo(29);
+  }
+
+  @Test
+  public void shouldProcessExceptionsCorrectly() {
+    assertThatThrownBy(
+            () ->
+                context.processException(
+                    new RuntimeException(new BackwardSyncException("shouldThrow"))))
+        .isInstanceOf(BackwardSyncException.class)
+        .hasMessageContaining("shouldThrow");
+    context.processException(
+        new RuntimeException(new BackwardSyncException("shouldNotThrow", true)));
+    context.processException(new RuntimeException(new RuntimeException("shouldNotThrow")));
+  }
+
+  @Test
+  public void shouldEmitBadChainEvent() {
+    Block block = Mockito.mock(Block.class);
+    BlockHeader blockHeader = Mockito.mock(BlockHeader.class);
+    when(block.getHash()).thenReturn(Hash.fromHexStringLenient("0x42"));
+    when(blockHeader.getHash()).thenReturn(Hash.fromHexStringLenient("0x42"));
+    BadChainListener badChainListener = Mockito.mock(BadChainListener.class);
+    context.subscribeBadChainListener(badChainListener);
+
+    BlockHeader childBlockHeader =
+        remoteBlockchain.getBlockByNumber(LOCAL_HEIGHT + 2).get().getHeader();
+    BlockHeader grandChildBlockHeader =
+        remoteBlockchain.getBlockByNumber(LOCAL_HEIGHT + 1).get().getHeader();
+
+    backwardChain.clear();
+    backwardChain.prependAncestorsHeader(grandChildBlockHeader);
+    backwardChain.prependAncestorsHeader(childBlockHeader);
+    backwardChain.prependAncestorsHeader(blockHeader);
+
+    doReturn(blockValidator).when(context).getBlockValidatorForBlock(any());
+    BlockProcessingResult result = new BlockProcessingResult("custom error");
+    doReturn(result).when(blockValidator).validateAndProcessBlock(any(), any(), any(), any());
+
+    assertThatThrownBy(() -> context.saveBlock(block))
+        .isInstanceOf(BackwardSyncException.class)
+        .hasMessageContaining("custom error");
+
+    verify(badChainListener)
+        .onBadChain(
+            block, Collections.emptyList(), List.of(childBlockHeader, grandChildBlockHeader));
+  }
+
+  @Test
+  public void shouldFailAfterMaxNumberOfRetries() {
+    doReturn(CompletableFuture.failedFuture(new Exception()))
+        .when(context)
+        .prepareBackwardSyncFuture();
+
+    final var syncFuture = context.syncBackwardsUntil(Hash.ZERO);
+
+    try {
+      syncFuture.get();
+    } catch (final Throwable throwable) {
+      if (throwable instanceof ExecutionException) {
+        BackwardSyncException backwardSyncException = (BackwardSyncException) throwable.getCause();
+        assertThat(backwardSyncException.getMessage())
+            .contains("Max number of retries " + NUM_OF_RETRIES + " reached");
+      }
+    }
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncStepTest.java
new file mode 100644
index 00000000000..9ddcaf7b8cb
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/BackwardSyncStepTest.java
@@ -0,0 +1,269 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.backwardsync;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.StubGenesisConfigOptions;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.ethereum.eth.manager.DeterministicEthScheduler;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
+import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.exceptions.MaxRetriesReachedException;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import javax.annotation.Nonnull;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class BackwardSyncStepTest {
+
+  public static final int REMOTE_HEIGHT = 50;
+  public static final int LOCAL_HEIGHT = 25;
+  private static final BlockDataGenerator blockDataGenerator = new BlockDataGenerator();
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  private BackwardSyncContext context;
+
+  private final ProtocolSchedule protocolSchedule =
+      MainnetProtocolSchedule.fromConfig(new StubGenesisConfigOptions());
+
+  private final DeterministicEthScheduler ethScheduler = new DeterministicEthScheduler();
+
+  private MutableBlockchain localBlockchain;
+  private MutableBlockchain remoteBlockchain;
+  private RespondingEthPeer peer;
+  GenericKeyValueStorageFacade<Hash, BlockHeader> headersStorage;
+  GenericKeyValueStorageFacade<Hash, Block> blocksStorage;
+  GenericKeyValueStorageFacade<Hash, Hash> chainStorage;
+  GenericKeyValueStorageFacade<String, BlockHeader> sessionDataStorage;
+
+  @Before
+  public void setup() {
+    headersStorage =
+        new GenericKeyValueStorageFacade<>(
+            Hash::toArrayUnsafe,
+            new BlocksHeadersConvertor(new MainnetBlockHeaderFunctions()),
+            new InMemoryKeyValueStorage());
+    blocksStorage =
+        new GenericKeyValueStorageFacade<>(
+            Hash::toArrayUnsafe,
+            new BlocksConvertor(new MainnetBlockHeaderFunctions()),
+            new InMemoryKeyValueStorage());
+    chainStorage =
+        new GenericKeyValueStorageFacade<>(
+            Hash::toArrayUnsafe, new HashConvertor(), new InMemoryKeyValueStorage());
+    sessionDataStorage =
+        new GenericKeyValueStorageFacade<>(
+            key -> key.getBytes(StandardCharsets.UTF_8),
+            new BlocksHeadersConvertor(new MainnetBlockHeaderFunctions()),
+            new InMemoryKeyValueStorage());
+
+    Block genesisBlock = blockDataGenerator.genesisBlock();
+    remoteBlockchain = createInMemoryBlockchain(genesisBlock);
+    localBlockchain = spy(createInMemoryBlockchain(genesisBlock));
+
+    for (int i = 1; i <= REMOTE_HEIGHT; i++) {
+      final BlockDataGenerator.BlockOptions options =
+          new BlockDataGenerator.BlockOptions()
+              .setBlockNumber(i)
+              .setParentHash(remoteBlockchain.getBlockHashByNumber(i - 1).orElseThrow());
+      final Block block = blockDataGenerator.block(options);
+      final List<TransactionReceipt> receipts = blockDataGenerator.receipts(block);
+
+      remoteBlockchain.appendBlock(block, receipts);
+      if (i <= LOCAL_HEIGHT) {
+        localBlockchain.appendBlock(block, receipts);
+      }
+    }
+
+    when(context.getProtocolContext().getBlockchain()).thenReturn(localBlockchain);
+    when(context.getProtocolSchedule()).thenReturn(protocolSchedule);
+    when(context.getBatchSize()).thenReturn(5);
+
+    EthProtocolManager ethProtocolManager = EthProtocolManagerTestUtil.create(ethScheduler);
+
+    peer =
+        RespondingEthPeer.builder()
+            .ethProtocolManager(ethProtocolManager)
+            .estimatedHeight(REMOTE_HEIGHT)
+            .build();
+    EthContext ethContext = ethProtocolManager.ethContext();
+    when(context.getEthContext()).thenReturn(ethContext);
+  }
+
+  @Test
+  public void shouldFindHeaderWhenRequested() throws Exception {
+    final BackwardChain backwardChain = createBackwardChain(LOCAL_HEIGHT + 3);
+    when(context.getBatchSize()).thenReturn(5);
+    BackwardSyncStep step = spy(new BackwardSyncStep(context, backwardChain));
+
+    final RespondingEthPeer.Responder responder =
+        RespondingEthPeer.blockchainResponder(remoteBlockchain);
+
+    final CompletableFuture<Void> future =
+        step.executeAsync(backwardChain.getFirstAncestorHeader().orElseThrow());
+    peer.respondWhileOtherThreadsWork(responder, () -> !future.isDone());
+    future.get();
+  }
+
+  @Test
+  public void shouldFindHashToSync() {
+
+    final BackwardChain backwardChain = createBackwardChain(REMOTE_HEIGHT - 4, REMOTE_HEIGHT);
+    BackwardSyncStep step = new BackwardSyncStep(context, backwardChain);
+    final Hash hash =
+        step.possibleRestoreOldNodes(backwardChain.getFirstAncestorHeader().orElseThrow());
+    assertThat(hash).isEqualTo(getBlockByNumber(REMOTE_HEIGHT - 4).getHeader().getParentHash());
+  }
+
+  @Test
+  public void shouldRequestHeaderWhenAsked() throws Exception {
+    BackwardSyncStep step = new BackwardSyncStep(context, createBackwardChain(REMOTE_HEIGHT - 1));
+    final Block lookingForBlock = getBlockByNumber(REMOTE_HEIGHT - 2);
+
+    final RespondingEthPeer.Responder responder =
+        RespondingEthPeer.blockchainResponder(remoteBlockchain);
+
+    final CompletableFuture<List<BlockHeader>> future =
+        step.requestHeaders(lookingForBlock.getHeader().getHash());
+    peer.respondWhileOtherThreadsWork(responder, () -> !future.isDone());
+
+    final BlockHeader blockHeader = future.get().get(0);
+    assertThat(blockHeader).isEqualTo(lookingForBlock.getHeader());
+  }
+
+  @Test
+  public void shouldNotRequestHeaderIfAlreadyPresent() throws Exception {
+    BackwardSyncStep step = new BackwardSyncStep(context, createBackwardChain(REMOTE_HEIGHT - 1));
+    final Block lookingForBlock = getBlockByNumber(LOCAL_HEIGHT);
+
+    final CompletableFuture<List<BlockHeader>> future =
+        step.requestHeaders(lookingForBlock.getHeader().getHash());
+
+    verify(localBlockchain).getBlockHeader(lookingForBlock.getHash());
+    verify(context, never()).getEthContext();
+    final BlockHeader blockHeader = future.get().get(0);
+    assertThat(blockHeader).isEqualTo(lookingForBlock.getHeader());
+  }
+
+  @Test
+  public void shouldRequestHeaderBeforeCurrentHeight() throws Exception {
+    extendBlockchain(REMOTE_HEIGHT + 1, context.getProtocolContext().getBlockchain());
+
+    BackwardSyncStep step = new BackwardSyncStep(context, createBackwardChain(REMOTE_HEIGHT - 1));
+    final Block lookingForBlock = getBlockByNumber(REMOTE_HEIGHT - 2);
+
+    final RespondingEthPeer.Responder responder =
+        RespondingEthPeer.blockchainResponder(remoteBlockchain);
+
+    final CompletableFuture<List<BlockHeader>> future =
+        step.requestHeaders(lookingForBlock.getHeader().getHash());
+    peer.respondWhileOtherThreadsWork(responder, () -> !future.isDone());
+
+    final BlockHeader blockHeader = future.get().get(0);
+    assertThat(blockHeader).isEqualTo(lookingForBlock.getHeader());
+  }
+
+  @Test
+  public void shouldThrowWhenResponseIsEmptyWhenRequestingHeader() {
+    BackwardSyncStep step = new BackwardSyncStep(context, createBackwardChain(REMOTE_HEIGHT - 1));
+    final Block lookingForBlock = getBlockByNumber(REMOTE_HEIGHT - 2);
+
+    final RespondingEthPeer.Responder responder = RespondingEthPeer.emptyResponder();
+
+    final CompletableFuture<List<BlockHeader>> future =
+        step.requestHeaders(lookingForBlock.getHeader().getHash());
+    peer.respondWhileOtherThreadsWork(responder, () -> !future.isDone());
+
+    assertThatThrownBy(future::get).cause().isInstanceOf(MaxRetriesReachedException.class);
+  }
+
+  @Test
+  public void shouldSaveHeaderDelegatesProperly() {
+    final BackwardChain chain = Mockito.mock(BackwardChain.class);
+    final BlockHeader header = Mockito.mock(BlockHeader.class);
+
+    BackwardSyncStep step = new BackwardSyncStep(context, chain);
+
+    step.saveHeader(header);
+
+    verify(chain).prependAncestorsHeader(header);
+  }
+
+  private BackwardChain createBackwardChain(final int from, final int until) {
+    BackwardChain chain = createBackwardChain(until);
+    for (int i = until; i > from; --i) {
+      chain.prependAncestorsHeader(getBlockByNumber(i - 1).getHeader());
+    }
+    return chain;
+  }
+
+  @Nonnull
+  private BackwardChain createBackwardChain(final int number) {
+    final BackwardChain backwardChain =
+        new BackwardChain(headersStorage, blocksStorage, chainStorage, sessionDataStorage);
+    backwardChain.appendTrustedBlock(remoteBlockchain.getBlockByNumber(number).orElseThrow());
+    return backwardChain;
+  }
+
+  @Nonnull
+  private Block getBlockByNumber(final int number) {
+    return remoteBlockchain.getBlockByNumber(number).orElseThrow();
+  }
+
+  private void extendBlockchain(final int newHeight, final MutableBlockchain blockchain) {
+    final long currentHeight = blockchain.getChainHeadBlockNumber();
+
+    final long blocksToBuild = newHeight - currentHeight;
+
+    for (long i = currentHeight + 1; i <= currentHeight + blocksToBuild; i++) {
+      final BlockDataGenerator.BlockOptions options =
+          new BlockDataGenerator.BlockOptions()
+              .setBlockNumber(i)
+              .setParentHash(blockchain.getBlockHashByNumber(i - 1).orElseThrow());
+      final Block block = blockDataGenerator.block(options);
+      final List<TransactionReceipt> receipts = blockDataGenerator.receipts(block);
+
+      blockchain.appendBlock(block, receipts);
+    }
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/ChainForTestCreator.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/ChainForTestCreator.java
new file mode 100644
index 00000000000..0d0b50858be
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/ChainForTestCreator.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.backwardsync;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import javax.annotation.Nonnull;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class ChainForTestCreator {
+
+  public static BlockHeader prepareHeader(final long number, final Optional<String> message) {
+    final Address testAddress =
+        Address.fromHexString(message.orElse(String.format("%02X", number)));
+    final Bytes testMessage = Bytes.fromHexString(String.format("%02X", number));
+    final Log testLog = new Log(testAddress, testMessage, List.of());
+    return new BlockHeader(
+        Hash.EMPTY,
+        Hash.EMPTY,
+        Address.ZERO,
+        Hash.EMPTY,
+        Hash.EMPTY,
+        Hash.EMPTY,
+        LogsBloomFilter.builder().insertLog(testLog).build(),
+        Difficulty.ZERO,
+        number,
+        0,
+        0,
+        0,
+        Bytes.EMPTY,
+        null,
+        Hash.EMPTY,
+        0,
+        null,
+        null,
+        null,
+        new MainnetBlockHeaderFunctions());
+  }
+
+  public static BlockHeader prepareWrongParentHash(final BlockHeader blockHeader) {
+    BlockHeader fakeHeader =
+        prepareHeader(blockHeader.getNumber(), Optional.of("111111111111111111111111"));
+    return new BlockHeader(
+        fakeHeader.getHash(),
+        blockHeader.getOmmersHash(),
+        blockHeader.getCoinbase(),
+        blockHeader.getStateRoot(),
+        blockHeader.getTransactionsRoot(),
+        blockHeader.getReceiptsRoot(),
+        blockHeader.getLogsBloom(),
+        blockHeader.getDifficulty(),
+        blockHeader.getNumber(),
+        blockHeader.getGasLimit(),
+        blockHeader.getGasUsed(),
+        blockHeader.getTimestamp(),
+        blockHeader.getExtraData(),
+        blockHeader.getBaseFee().orElse(null),
+        blockHeader.getMixHash(),
+        blockHeader.getNonce(),
+        blockHeader.getWithdrawalsRoot().orElse(null),
+        blockHeader.getExcessDataGas().orElse(null),
+        blockHeader.getDepositsRoot().orElse(null),
+        new MainnetBlockHeaderFunctions());
+  }
+
+  public static List<Block> prepareChain(final int elements, final long height) {
+    List<Block> blockList = new ArrayList<>(elements);
+
+    blockList.add(createEmptyBlock(height));
+
+    for (int i = 1; i < elements; i++) {
+      blockList.add(createEmptyBlock(blockList.get(i - 1)));
+    }
+    return blockList;
+  }
+
+  public static Block createEmptyBlock(final Long height) {
+    return new Block(prepareEmptyHeader(height), new BlockBody(List.of(), List.of()));
+  }
+
+  private static Block createEmptyBlock(final Block parent) {
+    return new Block(prepareEmptyHeader(parent.getHeader()), new BlockBody(List.of(), List.of()));
+  }
+
+  private static BlockHeader prepareEmptyHeader(final Long number) {
+    return prepareHeader(number, Optional.empty());
+  }
+
+  @Nonnull
+  private static BlockHeader prepareEmptyHeader(final BlockHeader parent) {
+    return new BlockHeader(
+        parent.getHash(),
+        Hash.EMPTY_TRIE_HASH,
+        Address.ZERO,
+        Hash.EMPTY_TRIE_HASH,
+        Hash.EMPTY_TRIE_HASH,
+        Hash.EMPTY_TRIE_HASH,
+        LogsBloomFilter.builder().build(),
+        Difficulty.ONE,
+        parent.getNumber() + 1,
+        0,
+        0,
+        0,
+        Bytes.EMPTY,
+        Wei.ZERO,
+        Hash.EMPTY,
+        0,
+        null,
+        null,
+        null,
+        new MainnetBlockHeaderFunctions());
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/ForwardSyncStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/ForwardSyncStepTest.java
new file mode 100644
index 00000000000..cf03c676ad9
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/ForwardSyncStepTest.java
@@ -0,0 +1,215 @@
+/*
+ *
+ *  * Copyright Hyperledger Besu Contributors.
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ *  * the License. You may obtain a copy of the License at
+ *  *
+ *  * http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ *  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ *  * specific language governing permissions and limitations under the License.
+ *  *
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.eth.sync.backwardsync;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.StubGenesisConfigOptions;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.BlockProcessingOutputs;
+import org.hyperledger.besu.ethereum.BlockProcessingResult;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
+import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.referencetests.ReferenceTestWorldState;
+import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import javax.annotation.Nonnull;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class ForwardSyncStepTest {
+
+  public static final int REMOTE_HEIGHT = 50;
+  public static final int LOCAL_HEIGHT = 25;
+  private static final BlockDataGenerator blockDataGenerator = new BlockDataGenerator();
+
+  @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+  private BackwardSyncContext context;
+
+  private MutableBlockchain remoteBlockchain;
+  private RespondingEthPeer peer;
+
+  private final ProtocolSchedule protocolSchedule =
+      MainnetProtocolSchedule.fromConfig(new StubGenesisConfigOptions());
+  private MutableBlockchain localBlockchain;
+  GenericKeyValueStorageFacade<Hash, BlockHeader> headersStorage;
+  GenericKeyValueStorageFacade<Hash, Block> blocksStorage;
+  GenericKeyValueStorageFacade<Hash, Hash> chainStorage;
+  GenericKeyValueStorageFacade<String, BlockHeader> sessionDataStorage;
+
+  @Before
+  public void setup() {
+    headersStorage =
+        new GenericKeyValueStorageFacade<>(
+            Hash::toArrayUnsafe,
+            new BlocksHeadersConvertor(new MainnetBlockHeaderFunctions()),
+            new InMemoryKeyValueStorage());
+    blocksStorage =
+        new GenericKeyValueStorageFacade<>(
+            Hash::toArrayUnsafe,
+            new BlocksConvertor(new MainnetBlockHeaderFunctions()),
+            new InMemoryKeyValueStorage());
+    chainStorage =
+        new GenericKeyValueStorageFacade<>(
+            Hash::toArrayUnsafe, new HashConvertor(), new InMemoryKeyValueStorage());
+    sessionDataStorage =
+        new GenericKeyValueStorageFacade<>(
+            key -> key.getBytes(StandardCharsets.UTF_8),
+            new BlocksHeadersConvertor(new MainnetBlockHeaderFunctions()),
+            new InMemoryKeyValueStorage());
+
+    Block genesisBlock = blockDataGenerator.genesisBlock();
+    remoteBlockchain = createInMemoryBlockchain(genesisBlock);
+    localBlockchain = createInMemoryBlockchain(genesisBlock);
+
+    for (int i = 1; i <= REMOTE_HEIGHT; i++) {
+      final BlockDataGenerator.BlockOptions options =
+          new BlockDataGenerator.BlockOptions()
+              .setBlockNumber(i)
+              .setParentHash(remoteBlockchain.getBlockHashByNumber(i - 1).orElseThrow());
+      final Block block = blockDataGenerator.block(options);
+      final List<TransactionReceipt> receipts = blockDataGenerator.receipts(block);
+
+      remoteBlockchain.appendBlock(block, receipts);
+      if (i <= LOCAL_HEIGHT) {
+        localBlockchain.appendBlock(block, receipts);
+      }
+    }
+
+    when(context.getProtocolContext().getBlockchain()).thenReturn(localBlockchain);
+    when(context.getProtocolSchedule()).thenReturn(protocolSchedule);
+    when(context.getBatchSize()).thenReturn(2);
+    EthProtocolManager ethProtocolManager = EthProtocolManagerTestUtil.create();
+
+    peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager);
+    EthContext ethContext = ethProtocolManager.ethContext();
+    when(context.getEthContext()).thenReturn(ethContext);
+
+    when(context
+            .getBlockValidatorForBlock(any())
+            .validateAndProcessBlock(any(), any(), any(), any()))
+        .thenAnswer(
+            invocation -> {
+              final Object[] arguments = invocation.getArguments();
+              Block block = (Block) arguments[1];
+              return new BlockProcessingResult(
+                  Optional.of(
+                      new BlockProcessingOutputs(
+                          new ReferenceTestWorldState(), blockDataGenerator.receipts(block))));
+            });
+  }
+
+  @Test
+  public void shouldExecuteForwardSyncWhenPossible() throws Exception {
+    final BackwardChain backwardChain = createBackwardChain(LOCAL_HEIGHT, LOCAL_HEIGHT + 3);
+    ForwardSyncStep step = new ForwardSyncStep(context, backwardChain);
+
+    final RespondingEthPeer.Responder responder =
+        RespondingEthPeer.blockchainResponder(remoteBlockchain);
+
+    final CompletableFuture<Void> completableFuture = step.executeAsync();
+
+    peer.respondWhile(
+        responder,
+        () -> {
+          try {
+            Thread.sleep(5);
+          } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+          }
+          return !completableFuture.isDone();
+        });
+
+    completableFuture.get();
+  }
+
+  @Test
+  public void shouldNotRequestWhenNull() {
+    ForwardSyncStep phase = new ForwardSyncStep(context, null);
+    final CompletableFuture<Void> completableFuture =
+        phase.possibleRequestBodies(Collections.emptyList());
+    assertThat(completableFuture.isDone()).isTrue();
+
+    final CompletableFuture<Void> completableFuture1 =
+        phase.possibleRequestBodies(Collections.emptyList());
+    assertThat(completableFuture1.isDone()).isTrue();
+  }
+
+  @Test
+  public void shouldFindBlockWhenRequested() throws Exception {
+    ForwardSyncStep step =
+        new ForwardSyncStep(context, createBackwardChain(LOCAL_HEIGHT + 1, LOCAL_HEIGHT + 3));
+
+    final RespondingEthPeer.Responder responder =
+        RespondingEthPeer.blockchainResponder(remoteBlockchain);
+
+    final CompletableFuture<List<Block>> future =
+        step.requestBodies(List.of(getBlockByNumber(LOCAL_HEIGHT + 1).getHeader()));
+    peer.respondWhile(responder, () -> !future.isDone());
+    final List<Block> blocks = future.get();
+    Assertions.assertThat(blocks)
+        .hasSize(1)
+        .containsExactlyInAnyOrder(getBlockByNumber(LOCAL_HEIGHT + 1));
+  }
+
+  private BackwardChain createBackwardChain(final int from, final int until) {
+    BackwardChain chain = backwardChainFromBlock(until);
+    for (int i = until; i > from; --i) {
+      chain.prependAncestorsHeader(getBlockByNumber(i - 1).getHeader());
+    }
+    return chain;
+  }
+
+  @Nonnull
+  private BackwardChain backwardChainFromBlock(final int number) {
+    final BackwardChain backwardChain =
+        new BackwardChain(headersStorage, blocksStorage, chainStorage, sessionDataStorage);
+    backwardChain.appendTrustedBlock(remoteBlockchain.getBlockByNumber(number).orElseThrow());
+    return backwardChain;
+  }
+
+  @Nonnull
+  private Block getBlockByNumber(final int number) {
+    return remoteBlockchain.getBlockByNumber(number).orElseThrow();
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/InMemoryBackwardChainTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/InMemoryBackwardChainTest.java
new file mode 100644
index 00000000000..405e06d1d35
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/backwardsync/InMemoryBackwardChainTest.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.backwardsync;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.hyperledger.besu.ethereum.eth.sync.backwardsync.ChainForTestCreator.prepareChain;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.storage.StorageProvider;
+import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Optional;
+import javax.annotation.Nonnull;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class InMemoryBackwardChainTest {
+
+  public static final int HEIGHT = 20_000;
+  public static final int ELEMENTS = 20;
+  private List<Block> blocks;
+
+  GenericKeyValueStorageFacade<Hash, BlockHeader> headersStorage;
+  GenericKeyValueStorageFacade<Hash, Block> blocksStorage;
+  GenericKeyValueStorageFacade<Hash, Hash> chainStorage;
+  GenericKeyValueStorageFacade<String, BlockHeader> sessionDataStorage;
+
+  @Before
+  public void prepareData() {
+    headersStorage =
+        new GenericKeyValueStorageFacade<>(
+            Hash::toArrayUnsafe,
+            new BlocksHeadersConvertor(new MainnetBlockHeaderFunctions()),
+            new InMemoryKeyValueStorage());
+    blocksStorage =
+        new GenericKeyValueStorageFacade<>(
+            Hash::toArrayUnsafe,
+            new BlocksConvertor(new MainnetBlockHeaderFunctions()),
+            new InMemoryKeyValueStorage());
+    chainStorage =
+        new GenericKeyValueStorageFacade<>(
+            Hash::toArrayUnsafe, new HashConvertor(), new InMemoryKeyValueStorage());
+    sessionDataStorage =
+        new GenericKeyValueStorageFacade<>(
+            key -> key.getBytes(StandardCharsets.UTF_8),
+            new BlocksHeadersConvertor(new MainnetBlockHeaderFunctions()),
+            new InMemoryKeyValueStorage());
+
+    blocks = prepareChain(ELEMENTS, HEIGHT);
+  }
+
+  @Test
+  public void shouldReturnFirstHeaderCorrectly() {
+    BackwardChain backwardChain = createChainFromBlock(blocks.get(blocks.size() - 1));
+    backwardChain.prependAncestorsHeader(blocks.get(blocks.size() - 2).getHeader());
+    backwardChain.prependAncestorsHeader(blocks.get(blocks.size() - 3).getHeader());
+    backwardChain.prependAncestorsHeader(blocks.get(blocks.size() - 4).getHeader());
+    BlockHeader firstHeader = backwardChain.getFirstAncestorHeader().orElseThrow();
+    assertThat(firstHeader).isEqualTo(blocks.get(blocks.size() - 4).getHeader());
+  }
+
+  @Nonnull
+  private BackwardChain createChainFromBlock(final Block pivot) {
+    final BackwardChain backwardChain =
+        new BackwardChain(headersStorage, blocksStorage, chainStorage, sessionDataStorage);
+    backwardChain.appendTrustedBlock(pivot);
+    return backwardChain;
+  }
+
+  @Test
+  public void shouldSaveHeadersWhenHeightAndHashMatches() {
+    BackwardChain backwardChain = createChainFromBlock(blocks.get(blocks.size() - 1));
+    backwardChain.prependAncestorsHeader(blocks.get(blocks.size() - 2).getHeader());
+    backwardChain.prependAncestorsHeader(blocks.get(blocks.size() - 3).getHeader());
+    backwardChain.prependAncestorsHeader(blocks.get(blocks.size() - 4).getHeader());
+    BlockHeader firstHeader = backwardChain.getFirstAncestorHeader().orElseThrow();
+    assertThat(firstHeader).isEqualTo(blocks.get(blocks.size() - 4).getHeader());
+  }
+
+  @Test
+  public void shouldDropFromTheEnd() {
+
+    BackwardChain backwardChain = createChainFromBlock(blocks.get(blocks.size() - 1));
+    backwardChain.prependAncestorsHeader(blocks.get(blocks.size() - 2).getHeader());
+    backwardChain.prependAncestorsHeader(blocks.get(blocks.size() - 3).getHeader());
+
+    BlockHeader firstHeader = backwardChain.getFirstAncestorHeader().orElseThrow();
+    assertThat(firstHeader).isEqualTo(blocks.get(blocks.size() - 3).getHeader());
+
+    backwardChain.dropFirstHeader();
+
+    firstHeader = backwardChain.getFirstAncestorHeader().orElseThrow();
+    assertThat(firstHeader).isEqualTo(blocks.get(blocks.size() - 2).getHeader());
+
+    backwardChain.dropFirstHeader();
+
+    firstHeader = backwardChain.getFirstAncestorHeader().orElseThrow();
+    assertThat(firstHeader).isEqualTo(blocks.get(blocks.size() - 1).getHeader());
+  }
+
+  @Test
+  public void shouldCreateChainFromScheduleAndFunctions() {
+    final StorageProvider provider = new InMemoryKeyValueStorageProvider();
+    BlockHeaderFunctions functions = new MainnetBlockHeaderFunctions();
+
+    final BackwardChain chain = BackwardChain.from(provider, functions);
+    assertThat(chain).isNotNull();
+
+    chain.clear();
+  }
+
+  @Test
+  public void shouldAddHeaderToQueue() {
+    BackwardChain backwardChain = createChainFromBlock(blocks.get(3));
+    Optional<Hash> firstHash = backwardChain.getFirstHashToAppend();
+    assertThat(firstHash).isNotPresent();
+    backwardChain.addNewHash(blocks.get(7).getHash());
+    backwardChain.addNewHash(blocks.get(9).getHash());
+    backwardChain.addNewHash(blocks.get(9).getHash());
+    backwardChain.addNewHash(blocks.get(11).getHash());
+
+    firstHash = backwardChain.getFirstHashToAppend();
+    assertThat(firstHash).isPresent();
+    assertThat(firstHash.orElseThrow()).isEqualTo(blocks.get(7).getHash());
+    backwardChain.removeFromHashToAppend(firstHash.get());
+    firstHash = backwardChain.getFirstHashToAppend();
+    assertThat(firstHash).isPresent();
+    assertThat(firstHash.orElseThrow()).isEqualTo(blocks.get(9).getHash());
+    backwardChain.removeFromHashToAppend(firstHash.get());
+    firstHash = backwardChain.getFirstHashToAppend();
+    assertThat(firstHash).isPresent();
+    assertThat(firstHash.orElseThrow()).isEqualTo(blocks.get(11).getHash());
+    backwardChain.removeFromHashToAppend(firstHash.get());
+  }
+
+  @Test
+  public void shouldChangeFirstAncestorIfPivotIsToFar() {
+    BackwardChain backwardChain = createChainFromBlock(blocks.get(3));
+    backwardChain.appendTrustedBlock(blocks.get(4));
+
+    Optional<BlockHeader> firstAncestorHeader = backwardChain.getFirstAncestorHeader();
+    assertThat(firstAncestorHeader).isPresent();
+    assertThat(firstAncestorHeader.orElseThrow()).isEqualTo(blocks.get(3).getHeader());
+    Optional<Block> pivot = backwardChain.getPivot();
+    assertThat(pivot).isPresent();
+    assertThat(pivot.orElseThrow()).isEqualTo(blocks.get(4));
+
+    backwardChain.appendTrustedBlock(blocks.get(7));
+
+    firstAncestorHeader = backwardChain.getFirstAncestorHeader();
+
+    assertThat(firstAncestorHeader).isPresent();
+    assertThat(firstAncestorHeader.orElseThrow()).isEqualTo(blocks.get(7).getHeader());
+    pivot = backwardChain.getPivot();
+    assertThat(pivot).isPresent();
+    assertThat(pivot.orElseThrow()).isEqualTo(blocks.get(7));
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckPointBlockImportStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckPointBlockImportStepTest.java
new file mode 100644
index 00000000000..1520edb0679
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckPointBlockImportStepTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.checkpointsync;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.ethereum.chain.DefaultBlockchain;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.checkpoint.Checkpoint;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage;
+import org.hyperledger.besu.ethereum.storage.keyvalue.VariablesKeyValueStorage;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Optional;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class CheckPointBlockImportStepTest {
+
+  private final CheckpointSource checkPointSource = mock(CheckpointSource.class);
+  private final Checkpoint checkpoint = mock(Checkpoint.class);
+  private MutableBlockchain blockchain;
+  private CheckpointBlockImportStep checkPointHeaderImportStep;
+  private KeyValueStoragePrefixedKeyBlockchainStorage blockchainStorage;
+
+  @Before
+  public void setup() {
+    blockchainStorage =
+        new KeyValueStoragePrefixedKeyBlockchainStorage(
+            new InMemoryKeyValueStorage(),
+            new VariablesKeyValueStorage(new InMemoryKeyValueStorage()),
+            new MainnetBlockHeaderFunctions());
+    blockchain =
+        DefaultBlockchain.createMutable(
+            generateBlock(0), blockchainStorage, mock(MetricsSystem.class), 0);
+    checkPointHeaderImportStep =
+        new CheckpointBlockImportStep(checkPointSource, checkpoint, blockchain);
+  }
+
+  @Test
+  public void shouldSaveNewHeader() {
+    when(checkPointSource.hasNext()).thenReturn(true);
+    assertThat(blockchainStorage.getBlockHash(1)).isEmpty();
+    final Block block = generateBlock(1);
+    checkPointHeaderImportStep.accept(Optional.of(new BlockWithReceipts(block, new ArrayList<>())));
+    assertThat(blockchainStorage.getBlockHash(1)).isPresent();
+  }
+
+  @Test
+  public void shouldSaveChainHeadForLastBlock() {
+    when(checkPointSource.hasNext()).thenReturn(false);
+    final Block block = generateBlock(2);
+    when(checkPointSource.getCheckpoint()).thenReturn(block.getHeader());
+    checkPointHeaderImportStep.accept(Optional.of(new BlockWithReceipts(block, new ArrayList<>())));
+    assertThat(blockchainStorage.getBlockHash(2)).isPresent();
+  }
+
+  private Block generateBlock(final int blockNumber) {
+    final BlockBody body = new BlockBody(Collections.emptyList(), Collections.emptyList());
+    return new Block(new BlockHeaderTestFixture().number(blockNumber).buildHeader(), body);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckPointSourceTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckPointSourceTest.java
new file mode 100644
index 00000000000..a7d86388219
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckPointSourceTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.checkpointsync;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+
+import java.util.Optional;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class CheckPointSourceTest {
+
+  private final SyncState syncState = mock(SyncState.class);
+  private CheckpointSource checkPointSource;
+
+  @Before
+  public void setup() {
+    checkPointSource = new CheckpointSource(syncState, header(12), 1);
+  }
+
+  @Test
+  public void shouldNotHasNextWhenChainHeightIsNotZero() {
+    when(syncState.getLocalChainHeight()).thenReturn(1L);
+    assertThat(checkPointSource.hasNext()).isFalse();
+  }
+
+  @Test
+  public void shouldHasNextWhenLocalChainIsZero() {
+    when(syncState.getLocalChainHeight()).thenReturn(0L);
+    assertThat(checkPointSource.hasNext()).isTrue();
+  }
+
+  @Test
+  public void shouldHasNextWhenMissingHeader() {
+    when(syncState.getLocalChainHeight()).thenReturn(0L);
+    checkPointSource.setLastHeaderDownloaded(Optional.of(header(12)));
+    assertThat(checkPointSource.hasNext()).isTrue();
+  }
+
+  @Test
+  public void shouldReturnCheckPointForFirstNext() {
+    assertThat(checkPointSource.next()).isEqualTo(checkPointSource.getCheckpoint().getHash());
+  }
+
+  @Test
+  public void shouldReturnParentHashForOtherNextCall() {
+    final BlockHeader header = header(12);
+    checkPointSource.setLastHeaderDownloaded(Optional.of(header));
+    assertThat(checkPointSource.next()).isEqualTo(header.getParentHash());
+  }
+
+  private BlockHeader header(final int number) {
+    return new BlockHeaderTestFixture().number(number).buildHeader();
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckPointSyncChainDownloaderTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckPointSyncChainDownloaderTest.java
new file mode 100644
index 00000000000..ddb15422559
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/checkpointsync/CheckPointSyncChainDownloaderTest.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.checkpointsync;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
+import org.hyperledger.besu.ethereum.eth.sync.ChainDownloader;
+import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncState;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.checkpoint.Checkpoint;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.checkpoint.ImmutableCheckpoint;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class CheckPointSyncChainDownloaderTest {
+
+  private final WorldStateStorage worldStateStorage = mock(WorldStateStorage.class);
+
+  protected ProtocolSchedule protocolSchedule;
+  protected EthProtocolManager ethProtocolManager;
+  protected EthContext ethContext;
+  protected ProtocolContext protocolContext;
+  private SyncState syncState;
+
+  protected MutableBlockchain localBlockchain;
+  private BlockchainSetupUtil otherBlockchainSetup;
+  protected Blockchain otherBlockchain;
+  private Checkpoint checkpoint;
+
+  @Parameters
+  public static Collection<Object[]> data() {
+    return Arrays.asList(new Object[][] {{DataStorageFormat.BONSAI}, {DataStorageFormat.FOREST}});
+  }
+
+  private final DataStorageFormat storageFormat;
+
+  public CheckPointSyncChainDownloaderTest(final DataStorageFormat storageFormat) {
+    this.storageFormat = storageFormat;
+  }
+
+  @Before
+  public void setup() {
+    when(worldStateStorage.isWorldStateAvailable(any(), any())).thenReturn(true);
+    final BlockchainSetupUtil localBlockchainSetup = BlockchainSetupUtil.forTesting(storageFormat);
+    localBlockchain = localBlockchainSetup.getBlockchain();
+    otherBlockchainSetup = BlockchainSetupUtil.forTesting(storageFormat);
+    otherBlockchain = otherBlockchainSetup.getBlockchain();
+    protocolSchedule = localBlockchainSetup.getProtocolSchedule();
+    protocolContext = localBlockchainSetup.getProtocolContext();
+    ethProtocolManager =
+        EthProtocolManagerTestUtil.create(
+            protocolSchedule,
+            localBlockchain,
+            new EthScheduler(1, 1, 1, 1, new NoOpMetricsSystem()));
+    ethContext = ethProtocolManager.ethContext();
+
+    final int blockNumber = 10;
+    checkpoint =
+        ImmutableCheckpoint.builder()
+            .blockNumber(blockNumber)
+            .blockHash(localBlockchainSetup.getBlocks().get(blockNumber).getHash())
+            .totalDifficulty(Difficulty.ONE)
+            .build();
+
+    syncState =
+        new SyncState(
+            protocolContext.getBlockchain(),
+            ethContext.getEthPeers(),
+            true,
+            Optional.of(checkpoint));
+  }
+
+  @After
+  public void tearDown() {
+    ethProtocolManager.stop();
+  }
+
+  private ChainDownloader downloader(
+      final SynchronizerConfiguration syncConfig, final long pivotBlockNumber) {
+    return CheckpointSyncChainDownloader.create(
+        syncConfig,
+        worldStateStorage,
+        protocolSchedule,
+        protocolContext,
+        ethContext,
+        syncState,
+        new NoOpMetricsSystem(),
+        new FastSyncState(otherBlockchain.getBlockHeader(pivotBlockNumber).get()));
+  }
+
+  @Test
+  public void shouldSyncToPivotBlockInMultipleSegments() {
+    otherBlockchainSetup.importFirstBlocks(30);
+
+    final RespondingEthPeer peer =
+        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, otherBlockchain);
+    final RespondingEthPeer.Responder responder =
+        RespondingEthPeer.blockchainResponder(otherBlockchain);
+
+    final SynchronizerConfiguration syncConfig =
+        SynchronizerConfiguration.builder()
+            .downloaderChainSegmentSize(5)
+            .downloaderHeadersRequestSize(3)
+            .build();
+    final long pivotBlockNumber = 25;
+    ethContext
+        .getEthPeers()
+        .streamAvailablePeers()
+        .forEach(
+            ethPeer -> {
+              ethPeer.setCheckpointHeader(
+                  otherBlockchainSetup.getBlocks().get((int) checkpoint.blockNumber()).getHeader());
+            });
+    final ChainDownloader downloader = downloader(syncConfig, pivotBlockNumber);
+    final CompletableFuture<Void> result = downloader.start();
+
+    peer.respondWhileOtherThreadsWork(responder, () -> !result.isDone());
+
+    assertThat(result).isCompleted();
+    assertThat(localBlockchain.getChainHeadBlockNumber()).isEqualTo(pivotBlockNumber);
+    assertThat(localBlockchain.getChainHeadHeader())
+        .isEqualTo(otherBlockchain.getBlockHeader(pivotBlockNumber).get());
+  }
+
+  @Test
+  public void shouldSyncToPivotBlockInSingleSegment() {
+    otherBlockchainSetup.importFirstBlocks(30);
+
+    final RespondingEthPeer peer =
+        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, otherBlockchain);
+    final RespondingEthPeer.Responder responder =
+        RespondingEthPeer.blockchainResponder(otherBlockchain);
+
+    final long pivotBlockNumber = 10;
+    final SynchronizerConfiguration syncConfig = SynchronizerConfiguration.builder().build();
+    ethContext
+        .getEthPeers()
+        .streamAvailablePeers()
+        .forEach(
+            ethPeer -> {
+              ethPeer.setCheckpointHeader(
+                  otherBlockchainSetup.getBlocks().get((int) checkpoint.blockNumber()).getHeader());
+            });
+    final ChainDownloader downloader = downloader(syncConfig, pivotBlockNumber);
+    final CompletableFuture<Void> result = downloader.start();
+
+    peer.respondWhileOtherThreadsWork(responder, () -> !result.isDone());
+
+    assertThat(result).isCompleted();
+    assertThat(localBlockchain.getChainHeadBlockNumber()).isEqualTo(pivotBlockNumber);
+    assertThat(localBlockchain.getChainHeadHeader())
+        .isEqualTo(otherBlockchain.getBlockHeader(pivotBlockNumber).get());
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/DownloadReceiptsStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/DownloadReceiptsStepTest.java
index 66718745f23..ec9313ed907 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/DownloadReceiptsStepTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/DownloadReceiptsStepTest.java
@@ -24,12 +24,14 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
 import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
+import org.hyperledger.besu.ethereum.core.ProtocolScheduleFixture;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
 import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 
 import java.util.List;
@@ -49,7 +51,7 @@ public class DownloadReceiptsStepTest {
 
   @BeforeClass
   public static void setUpClass() {
-    final BlockchainSetupUtil setupUtil = BlockchainSetupUtil.forTesting();
+    final BlockchainSetupUtil setupUtil = BlockchainSetupUtil.forTesting(DataStorageFormat.FOREST);
     setupUtil.importFirstBlocks(20);
     protocolContext = setupUtil.getProtocolContext();
     blockchain = setupUtil.getBlockchain();
@@ -60,6 +62,7 @@ public void setUp() {
     TransactionPool transactionPool = mock(TransactionPool.class);
     ethProtocolManager =
         EthProtocolManagerTestUtil.create(
+            ProtocolScheduleFixture.MAINNET,
             blockchain,
             () -> false,
             protocolContext.getWorldStateArchive(),
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastDownloaderFactoryTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastDownloaderFactoryTest.java
index 022a30e3d0e..7cdcd8d3dc4 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastDownloaderFactoryTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastDownloaderFactoryTest.java
@@ -15,6 +15,7 @@
 package org.hyperledger.besu.ethereum.eth.sync.fastsync;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
@@ -24,20 +25,23 @@
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.sync.PivotBlockSelector;
 import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate.FastDownloaderFactory;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
 import java.io.File;
-import java.nio.file.FileSystem;
+import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.spi.FileSystemProvider;
 import java.time.Clock;
 import java.util.Optional;
 
+import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -56,33 +60,39 @@ public class FastDownloaderFactoryTest {
   @Mock private SyncState syncState;
   @Mock private Clock clock;
   @Mock private Path dataDirectory;
+  @Mock private PivotBlockSelector pivotBlockSelector;
 
   @SuppressWarnings("unchecked")
-  @Test(expected = IllegalStateException.class)
-  public void shouldThrowIfSyncModeChangedWhileFastSyncIncomplete() throws NoSuchFieldException {
+  @Test
+  public void shouldThrowIfSyncModeChangedWhileFastSyncIncomplete() {
     initDataDirectory(true);
 
     when(syncConfig.getSyncMode()).thenReturn(SyncMode.FULL);
-    FastDownloaderFactory.create(
-        syncConfig,
-        dataDirectory,
-        protocolSchedule,
-        protocolContext,
-        metricsSystem,
-        ethContext,
-        worldStateStorage,
-        syncState,
-        clock);
+    assertThatThrownBy(
+            () ->
+                FastDownloaderFactory.create(
+                    pivotBlockSelector,
+                    syncConfig,
+                    dataDirectory,
+                    protocolSchedule,
+                    protocolContext,
+                    metricsSystem,
+                    ethContext,
+                    worldStateStorage,
+                    syncState,
+                    clock))
+        .isInstanceOf(IllegalStateException.class);
   }
 
   @SuppressWarnings({"unchecked", "rawtypes"})
   @Test
-  public void shouldNotThrowIfSyncModeChangedWhileFastSyncComplete() throws NoSuchFieldException {
+  public void shouldNotThrowIfSyncModeChangedWhileFastSyncComplete() {
     initDataDirectory(false);
 
     when(syncConfig.getSyncMode()).thenReturn(SyncMode.FULL);
     final Optional result =
         FastDownloaderFactory.create(
+            pivotBlockSelector,
             syncConfig,
             dataDirectory,
             protocolSchedule,
@@ -106,6 +116,7 @@ public void shouldNotThrowWhenFastSyncModeRequested() throws NoSuchFieldExceptio
 
     when(syncConfig.getSyncMode()).thenReturn(SyncMode.FAST);
     FastDownloaderFactory.create(
+        pivotBlockSelector,
         syncConfig,
         dataDirectory,
         protocolSchedule,
@@ -119,23 +130,76 @@ public void shouldNotThrowWhenFastSyncModeRequested() throws NoSuchFieldExceptio
     verify(mutableBlockchain).getChainHeadBlockNumber();
   }
 
-  private void initDataDirectory(final boolean isPivotBlockHeaderFileExist)
-      throws NoSuchFieldException {
+  @Test
+  public void shouldClearWorldStateDuringFastSyncWhenStateQueDirectoryExists() throws IOException {
+    when(syncConfig.getSyncMode()).thenReturn(SyncMode.FAST);
+    final MutableBlockchain mutableBlockchain = mock(MutableBlockchain.class);
+    when(mutableBlockchain.getChainHeadBlockNumber()).thenReturn(0L);
+    when(protocolContext.getBlockchain()).thenReturn(mutableBlockchain);
+
+    final Path dataDirectory = Files.createTempDirectory("fast-sync");
+    final Path stateQueueDir = dataDirectory.resolve("fastsync").resolve("statequeue");
+    final boolean mkdirs = stateQueueDir.toFile().mkdirs();
+    Files.createFile(stateQueueDir.resolve("taskToDelete"));
+    assertThat(mkdirs).isTrue();
+
+    assertThat(Files.exists(stateQueueDir)).isTrue();
+
+    FastDownloaderFactory.create(
+        pivotBlockSelector,
+        syncConfig,
+        dataDirectory,
+        protocolSchedule,
+        protocolContext,
+        metricsSystem,
+        ethContext,
+        worldStateStorage,
+        syncState,
+        clock);
+
+    verify(worldStateStorage).clear();
+    assertThat(Files.exists(stateQueueDir)).isFalse();
+  }
+
+  @Test
+  public void shouldCrashWhenStateQueueIsNotDirectory() throws IOException {
+    when(syncConfig.getSyncMode()).thenReturn(SyncMode.FAST);
+    final MutableBlockchain mutableBlockchain = mock(MutableBlockchain.class);
+    when(mutableBlockchain.getChainHeadBlockNumber()).thenReturn(0L);
+    when(protocolContext.getBlockchain()).thenReturn(mutableBlockchain);
+
+    final Path dataDirectory = Files.createTempDirectory("fast-sync");
+    final Path stateQueueDir = dataDirectory.resolve("fastsync").resolve("statequeue");
+    final boolean mkdirs = dataDirectory.resolve("fastsync").toFile().mkdirs();
+    Files.createFile(stateQueueDir);
+    assertThat(mkdirs).isTrue();
+
+    assertThat(Files.exists(stateQueueDir)).isTrue();
+    Assertions.assertThatThrownBy(
+            () ->
+                FastDownloaderFactory.create(
+                    pivotBlockSelector,
+                    syncConfig,
+                    dataDirectory,
+                    protocolSchedule,
+                    protocolContext,
+                    metricsSystem,
+                    ethContext,
+                    worldStateStorage,
+                    syncState,
+                    clock))
+        .isInstanceOf(IllegalStateException.class);
+  }
+
+  private void initDataDirectory(final boolean isPivotBlockHeaderFileExist) {
     final File pivotBlockHeaderFile = mock(File.class);
     when(pivotBlockHeaderFile.isFile()).thenReturn(isPivotBlockHeaderFileExist);
-    when(pivotBlockHeaderFile.isDirectory()).thenReturn(true);
 
     final File fastSyncDirFile = mock(File.class);
     when(fastSyncDirFile.isDirectory()).thenReturn(true);
 
-    final Path storagePath = mock(Path.class);
-    final FileSystem fileSystem = mock(FileSystem.class);
-    when(storagePath.getFileSystem()).thenReturn(fileSystem);
-    when(fileSystem.provider()).thenReturn(mock(FileSystemProvider.class));
-
     final Path pivotBlockHeaderPath = mock(Path.class);
     when(pivotBlockHeaderPath.toFile()).thenReturn(pivotBlockHeaderFile);
-    when(pivotBlockHeaderPath.resolve(anyString())).thenReturn(storagePath);
 
     final Path fastSyncDir = mock(Path.class);
     when(fastSyncDir.resolve(any(String.class))).thenReturn(pivotBlockHeaderPath);
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastImportBlocksPercentageCalculationTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastImportBlocksPercentageCalculationTest.java
new file mode 100644
index 00000000000..a68194abbe7
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastImportBlocksPercentageCalculationTest.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+public class FastImportBlocksPercentageCalculationTest {
+
+  @Test
+  public void blocksPercent_calculations() {
+    assertThat(FastImportBlocksStep.getBlocksPercent(1, 1)).isEqualByComparingTo(100l);
+    assertThat(FastImportBlocksStep.getBlocksPercent(1, 100)).isEqualByComparingTo(1l);
+    assertThat(FastImportBlocksStep.getBlocksPercent(0, 100)).isEqualByComparingTo(0l);
+    assertThat(FastImportBlocksStep.getBlocksPercent(99, 0)).isEqualByComparingTo(0l);
+    assertThat(FastImportBlocksStep.getBlocksPercent(1, 1000)).isEqualByComparingTo(0l);
+    assertThat(FastImportBlocksStep.getBlocksPercent(1, 10000)).isEqualByComparingTo(0l);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastImportBlocksStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastImportBlocksStepTest.java
index ddaedbab38a..448608df715 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastImportBlocksStepTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastImportBlocksStepTest.java
@@ -19,7 +19,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode.FULL;
 import static org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode.LIGHT;
-import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -27,22 +27,24 @@
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockImporter;
 import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
 import org.hyperledger.besu.ethereum.eth.sync.ValidationPolicy;
 import org.hyperledger.besu.ethereum.eth.sync.tasks.exceptions.InvalidBlockException;
+import org.hyperledger.besu.ethereum.mainnet.BlockImportResult;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class FastImportBlocksStepTest {
 
   @Mock private ProtocolSchedule protocolSchedule;
@@ -51,20 +53,26 @@ public class FastImportBlocksStepTest {
   @Mock private BlockImporter blockImporter;
   @Mock private ValidationPolicy validationPolicy;
   @Mock private ValidationPolicy ommerValidationPolicy;
+  @Mock private BlockHeader pivotHeader;
   private final BlockDataGenerator gen = new BlockDataGenerator();
 
   private FastImportBlocksStep importBlocksStep;
 
-  @Before
+  @BeforeEach
   public void setUp() {
-    when(protocolSchedule.getByBlockNumber(anyLong())).thenReturn(protocolSpec);
+    when(protocolSchedule.getByBlockHeader(any())).thenReturn(protocolSpec);
     when(protocolSpec.getBlockImporter()).thenReturn(blockImporter);
     when(validationPolicy.getValidationModeForNextBlock()).thenReturn(FULL);
     when(ommerValidationPolicy.getValidationModeForNextBlock()).thenReturn(LIGHT);
 
     importBlocksStep =
         new FastImportBlocksStep(
-            protocolSchedule, protocolContext, validationPolicy, ommerValidationPolicy, null);
+            protocolSchedule,
+            protocolContext,
+            validationPolicy,
+            ommerValidationPolicy,
+            null,
+            pivotHeader);
   }
 
   @Test
@@ -82,12 +90,12 @@ public void shouldImportBlocks() {
               blockWithReceipts.getReceipts(),
               FULL,
               LIGHT))
-          .thenReturn(true);
+          .thenReturn(new BlockImportResult(true));
     }
     importBlocksStep.accept(blocksWithReceipts);
 
     for (final BlockWithReceipts blockWithReceipts : blocksWithReceipts) {
-      verify(protocolSchedule).getByBlockNumber(blockWithReceipts.getNumber());
+      verify(protocolSchedule).getByBlockHeader(blockWithReceipts.getHeader());
     }
     verify(validationPolicy, times(blocks.size())).getValidationModeForNextBlock();
   }
@@ -99,7 +107,7 @@ public void shouldThrowExceptionWhenValidationFails() {
 
     when(blockImporter.fastImportBlock(
             protocolContext, block, blockWithReceipts.getReceipts(), FULL, LIGHT))
-        .thenReturn(false);
+        .thenReturn(new BlockImportResult(false));
     assertThatThrownBy(() -> importBlocksStep.accept(singletonList(blockWithReceipts)))
         .isInstanceOf(InvalidBlockException.class);
   }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncActionsTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncActionsTest.java
index 00985afeefb..7fdab1e0d3c 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncActionsTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncActionsTest.java
@@ -15,93 +15,125 @@
 package org.hyperledger.besu.ethereum.eth.sync.fastsync;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.consensus.merge.ForkchoiceEvent;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
 import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.ProtocolScheduleFixture;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
 import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
 import org.hyperledger.besu.ethereum.eth.peervalidation.PeerValidator;
+import org.hyperledger.besu.ethereum.eth.sync.PivotBlockSelector;
 import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
+import java.util.Optional;
 import java.util.OptionalLong;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
+@RunWith(Parameterized.class)
 public class FastSyncActionsTest {
 
-  private final BlockchainSetupUtil blockchainSetupUtil = BlockchainSetupUtil.forTesting();
   private final SynchronizerConfiguration.Builder syncConfigBuilder =
       new SynchronizerConfiguration.Builder().syncMode(SyncMode.FAST).fastSyncPivotDistance(1000);
 
-  private final FastSyncStateStorage fastSyncStateStorage = mock(FastSyncStateStorage.class);
+  private final WorldStateStorage worldStateStorage = mock(WorldStateStorage.class);
   private final AtomicInteger timeoutCount = new AtomicInteger(0);
   private SynchronizerConfiguration syncConfig = syncConfigBuilder.build();
   private FastSyncActions fastSyncActions;
   private EthProtocolManager ethProtocolManager;
+  private EthContext ethContext;
+  private EthPeers ethPeers;
   private MutableBlockchain blockchain;
+  private BlockchainSetupUtil blockchainSetupUtil;
+  private SyncState syncState;
+  private MetricsSystem metricsSystem;
+
+  @Parameterized.Parameters
+  public static Collection<Object[]> data() {
+    return Arrays.asList(new Object[][] {{DataStorageFormat.BONSAI}, {DataStorageFormat.FOREST}});
+  }
+
+  private final DataStorageFormat storageFormat;
+
+  public FastSyncActionsTest(final DataStorageFormat storageFormat) {
+    this.storageFormat = storageFormat;
+  }
 
   @Before
   public void setUp() {
+    blockchainSetupUtil = BlockchainSetupUtil.forTesting(storageFormat);
     blockchainSetupUtil.importAllBlocks();
     blockchain = blockchainSetupUtil.getBlockchain();
     ethProtocolManager =
         EthProtocolManagerTestUtil.create(
+            ProtocolScheduleFixture.MAINNET,
             blockchain,
             () -> timeoutCount.getAndDecrement() > 0,
             blockchainSetupUtil.getWorldArchive(),
             blockchainSetupUtil.getTransactionPool(),
             EthProtocolConfiguration.defaultConfig());
-    fastSyncActions = createFastSyncActions(syncConfig);
+    ethContext = ethProtocolManager.ethContext();
+    ethPeers = ethContext.getEthPeers();
+    syncState = new SyncState(blockchain, ethPeers);
+    metricsSystem = new NoOpMetricsSystem();
+    fastSyncActions =
+        createFastSyncActions(
+            syncConfig,
+            new PivotSelectorFromPeers(ethContext, syncConfig, syncState, metricsSystem));
   }
 
   @Test
   public void waitForPeersShouldSucceedIfEnoughPeersAreFound() {
     for (int i = 0; i < syncConfig.getFastSyncMinimumPeerCount(); i++) {
-      EthProtocolManagerTestUtil.createPeer(ethProtocolManager);
+      EthProtocolManagerTestUtil.createPeer(
+          ethProtocolManager, syncConfig.getFastSyncPivotDistance() + i + 1);
     }
     final CompletableFuture<FastSyncState> result =
-        fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE);
-    assertThat(result).isCompletedWithValue(FastSyncState.EMPTY_SYNC_STATE);
+        fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE);
+    assertThat(result).isCompletedWithValue(new FastSyncState(5));
   }
 
   @Test
-  public void waitForPeersShouldOnlyRequireOnePeerWhenPivotBlockIsAlreadySelected() {
+  public void returnTheSamePivotBlockIfAlreadySelected() {
     final BlockHeader pivotHeader = new BlockHeaderTestFixture().number(1024).buildHeader();
     final FastSyncState fastSyncState = new FastSyncState(pivotHeader);
-    final CompletableFuture<FastSyncState> result =
-        fastSyncActions.waitForSuitablePeers(fastSyncState);
-    assertThat(result).isNotDone();
-
-    EthProtocolManagerTestUtil.createPeer(ethProtocolManager);
+    final CompletableFuture<FastSyncState> result = fastSyncActions.selectPivotBlock(fastSyncState);
+    assertThat(result).isDone();
     assertThat(result).isCompletedWithValue(fastSyncState);
   }
 
   @Test
   public void selectPivotBlockShouldUseExistingPivotBlockIfAvailable() {
     final BlockHeader pivotHeader = new BlockHeaderTestFixture().number(1024).buildHeader();
-    when(fastSyncStateStorage.loadState(any(BlockHeaderFunctions.class)))
-        .thenReturn(new FastSyncState(pivotHeader));
     EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 5000);
 
     final CompletableFuture<FastSyncState> result =
@@ -115,7 +147,10 @@ public void selectPivotBlockShouldSelectBlockPivotDistanceFromBestPeer() {
     final int minPeers = 1;
     syncConfigBuilder.fastSyncMinimumPeerCount(minPeers);
     syncConfig = syncConfigBuilder.build();
-    fastSyncActions = createFastSyncActions(syncConfig);
+    fastSyncActions =
+        createFastSyncActions(
+            syncConfig,
+            new PivotSelectorFromPeers(ethContext, syncConfig, syncState, metricsSystem));
 
     EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 5000);
 
@@ -130,7 +165,10 @@ public void selectPivotBlockShouldConsiderTotalDifficultyWhenSelectingBestPeer()
     final int minPeers = 1;
     syncConfigBuilder.fastSyncMinimumPeerCount(minPeers);
     syncConfig = syncConfigBuilder.build();
-    fastSyncActions = createFastSyncActions(syncConfig);
+    fastSyncActions =
+        createFastSyncActions(
+            syncConfig,
+            new PivotSelectorFromPeers(ethContext, syncConfig, syncState, metricsSystem));
 
     EthProtocolManagerTestUtil.createPeer(ethProtocolManager, Difficulty.of(1000), 5500);
     EthProtocolManagerTestUtil.createPeer(ethProtocolManager, Difficulty.of(2000), 4000);
@@ -147,7 +185,10 @@ public void selectPivotBlockShouldWaitAndRetryUntilMinHeightEstimatesAreAvailabl
     final int minPeers = 2;
     syncConfigBuilder.fastSyncMinimumPeerCount(minPeers);
     syncConfig = syncConfigBuilder.build();
-    fastSyncActions = createFastSyncActions(syncConfig);
+    fastSyncActions =
+        createFastSyncActions(
+            syncConfig,
+            new PivotSelectorFromPeers(ethContext, syncConfig, syncState, metricsSystem));
 
     final CompletableFuture<FastSyncState> result =
         fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE);
@@ -172,7 +213,10 @@ public void selectPivotBlockShouldWaitAndRetryIfSufficientChainHeightEstimatesAr
     final int minPeers = 3;
     syncConfigBuilder.fastSyncMinimumPeerCount(minPeers);
     syncConfig = syncConfigBuilder.build();
-    fastSyncActions = createFastSyncActions(syncConfig);
+    fastSyncActions =
+        createFastSyncActions(
+            syncConfig,
+            new PivotSelectorFromPeers(ethContext, syncConfig, syncState, metricsSystem));
     final long minPivotHeight = syncConfig.getFastSyncPivotDistance() + 1L;
     EthProtocolManagerTestUtil.disableEthSchedulerAutoRun(ethProtocolManager);
 
@@ -217,7 +261,10 @@ public void selectPivotBlockShouldWaitAndRetryIfSufficientValidatedPeersUnavaila
     final PeerValidator validator = mock(PeerValidator.class);
     syncConfigBuilder.fastSyncMinimumPeerCount(minPeers);
     syncConfig = syncConfigBuilder.build();
-    fastSyncActions = createFastSyncActions(syncConfig);
+    fastSyncActions =
+        createFastSyncActions(
+            syncConfig,
+            new PivotSelectorFromPeers(ethContext, syncConfig, syncState, metricsSystem));
     final long minPivotHeight = syncConfig.getFastSyncPivotDistance() + 1L;
     EthProtocolManagerTestUtil.disableEthSchedulerAutoRun(ethProtocolManager);
 
@@ -242,7 +289,7 @@ public void selectPivotBlockShouldWaitAndRetryIfSufficientValidatedPeersUnavaila
     // Validate a subset of peers
     peers.subList(0, minPeers - 1).forEach(p -> p.getEthPeer().markValidated(validator));
 
-    // No pivot should be selected while only a subset of peers have height estimates
+    // No pivot should be selected while only a subset of peers has height estimates
     EthProtocolManagerTestUtil.runPendingFutures(ethProtocolManager);
     assertThat(result).isNotDone();
 
@@ -278,7 +325,10 @@ private void selectPivotBlockUsesBestPeerMatchingRequiredCriteria(
     final int peerCount = minPeers + 1;
     syncConfigBuilder.fastSyncMinimumPeerCount(minPeers);
     syncConfig = syncConfigBuilder.build();
-    fastSyncActions = createFastSyncActions(syncConfig);
+    fastSyncActions =
+        createFastSyncActions(
+            syncConfig,
+            new PivotSelectorFromPeers(ethContext, syncConfig, syncState, metricsSystem));
     final long minPivotHeight = syncConfig.getFastSyncPivotDistance() + 1L;
     EthProtocolManagerTestUtil.disableEthSchedulerAutoRun(ethProtocolManager);
 
@@ -324,7 +374,10 @@ public void selectPivotBlockShouldWaitAndRetryIfBestPeerChainIsShorterThanPivotD
     final int minPeers = 1;
     syncConfigBuilder.fastSyncMinimumPeerCount(minPeers);
     syncConfig = syncConfigBuilder.build();
-    fastSyncActions = createFastSyncActions(syncConfig);
+    fastSyncActions =
+        createFastSyncActions(
+            syncConfig,
+            new PivotSelectorFromPeers(ethContext, syncConfig, syncState, metricsSystem));
     final long pivotDistance = syncConfig.getFastSyncPivotDistance();
 
     EthProtocolManagerTestUtil.disableEthSchedulerAutoRun(ethProtocolManager);
@@ -375,7 +428,10 @@ public void downloadPivotBlockHeaderShouldUseExistingPivotBlockHeaderIfPresent()
   @Test
   public void downloadPivotBlockHeaderShouldRetrievePivotBlockHeader() {
     syncConfig = SynchronizerConfiguration.builder().fastSyncMinimumPeerCount(1).build();
-    fastSyncActions = createFastSyncActions(syncConfig);
+    fastSyncActions =
+        createFastSyncActions(
+            syncConfig,
+            new PivotSelectorFromPeers(ethContext, syncConfig, syncState, metricsSystem));
 
     final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 1001);
     final CompletableFuture<FastSyncState> result =
@@ -388,16 +444,56 @@ public void downloadPivotBlockHeaderShouldRetrievePivotBlockHeader() {
     assertThat(result).isCompletedWithValue(new FastSyncState(blockchain.getBlockHeader(1).get()));
   }
 
-  private FastSyncActions createFastSyncActions(final SynchronizerConfiguration syncConfig) {
+  @Test
+  public void downloadPivotBlockHeaderShouldRetrievePivotBlockHash() {
+    syncConfig = SynchronizerConfiguration.builder().fastSyncMinimumPeerCount(1).build();
+    GenesisConfigOptions genesisConfig = mock(GenesisConfigOptions.class);
+    when(genesisConfig.getTerminalBlockNumber()).thenReturn(OptionalLong.of(10L));
+
+    final Optional<ForkchoiceEvent> finalizedEvent =
+        Optional.of(
+            new ForkchoiceEvent(
+                null,
+                blockchain.getBlockHashByNumber(3L).get(),
+                blockchain.getBlockHashByNumber(2L).get()));
+
+    fastSyncActions =
+        createFastSyncActions(
+            syncConfig,
+            new PivotSelectorFromSafeBlock(
+                blockchainSetupUtil.getProtocolContext(),
+                blockchainSetupUtil.getProtocolSchedule(),
+                ethContext,
+                metricsSystem,
+                genesisConfig,
+                () -> finalizedEvent,
+                () -> {}));
+
+    final RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 1001);
+    final CompletableFuture<FastSyncState> result =
+        fastSyncActions.downloadPivotBlockHeader(
+            new FastSyncState(finalizedEvent.get().getSafeBlockHash()));
+    assertThat(result).isNotCompleted();
+
+    final RespondingEthPeer.Responder responder = RespondingEthPeer.blockchainResponder(blockchain);
+    peer.respond(responder);
+
+    assertThat(result).isCompletedWithValue(new FastSyncState(blockchain.getBlockHeader(3).get()));
+  }
+
+  private FastSyncActions createFastSyncActions(
+      final SynchronizerConfiguration syncConfig, final PivotBlockSelector pivotBlockSelector) {
     final ProtocolSchedule protocolSchedule = blockchainSetupUtil.getProtocolSchedule();
     final ProtocolContext protocolContext = blockchainSetupUtil.getProtocolContext();
     final EthContext ethContext = ethProtocolManager.ethContext();
     return new FastSyncActions(
         syncConfig,
+        worldStateStorage,
         protocolSchedule,
         protocolContext,
         ethContext,
-        new SyncState(blockchain, ethContext.getEthPeers()),
+        new SyncState(blockchain, ethContext.getEthPeers(), true, Optional.empty()),
+        pivotBlockSelector,
         new NoOpMetricsSystem());
   }
 }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncChainDownloaderTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncChainDownloaderTest.java
index 12650cdc1db..9f3031ab65d 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncChainDownloaderTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncChainDownloaderTest.java
@@ -15,8 +15,8 @@
 package org.hyperledger.besu.ethereum.eth.sync.fastsync;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode.LIGHT_SKIP_DETACHED;
 import static org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason.TOO_MANY_PEERS;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -35,18 +35,26 @@
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.locks.LockSupport;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 
+@RunWith(Parameterized.class)
 public class FastSyncChainDownloaderTest {
 
-  private final FastSyncValidationPolicy validationPolicy = mock(FastSyncValidationPolicy.class);
+  private final WorldStateStorage worldStateStorage = mock(WorldStateStorage.class);
 
   protected ProtocolSchedule protocolSchedule;
   protected EthProtocolManager ethProtocolManager;
@@ -58,19 +66,32 @@ public class FastSyncChainDownloaderTest {
   private BlockchainSetupUtil otherBlockchainSetup;
   protected Blockchain otherBlockchain;
 
+  @Parameters
+  public static Collection<Object[]> data() {
+    return Arrays.asList(new Object[][] {{DataStorageFormat.BONSAI}, {DataStorageFormat.FOREST}});
+  }
+
+  private final DataStorageFormat storageFormat;
+
+  public FastSyncChainDownloaderTest(final DataStorageFormat storageFormat) {
+    this.storageFormat = storageFormat;
+  }
+
   @Before
   public void setup() {
-    when(validationPolicy.getValidationModeForNextBlock()).thenReturn(LIGHT_SKIP_DETACHED);
-    final BlockchainSetupUtil localBlockchainSetup = BlockchainSetupUtil.forTesting();
+    when(worldStateStorage.isWorldStateAvailable(any(), any())).thenReturn(true);
+    final BlockchainSetupUtil localBlockchainSetup = BlockchainSetupUtil.forTesting(storageFormat);
     localBlockchain = localBlockchainSetup.getBlockchain();
-    otherBlockchainSetup = BlockchainSetupUtil.forTesting();
+    otherBlockchainSetup = BlockchainSetupUtil.forTesting(storageFormat);
     otherBlockchain = otherBlockchainSetup.getBlockchain();
 
     protocolSchedule = localBlockchainSetup.getProtocolSchedule();
     protocolContext = localBlockchainSetup.getProtocolContext();
     ethProtocolManager =
         EthProtocolManagerTestUtil.create(
-            localBlockchain, new EthScheduler(1, 1, 1, 1, new NoOpMetricsSystem()));
+            protocolSchedule,
+            localBlockchain,
+            new EthScheduler(1, 1, 1, 1, new NoOpMetricsSystem()));
 
     ethContext = ethProtocolManager.ethContext();
     syncState = new SyncState(protocolContext.getBlockchain(), ethContext.getEthPeers());
@@ -85,12 +106,13 @@ private ChainDownloader downloader(
       final SynchronizerConfiguration syncConfig, final long pivotBlockNumber) {
     return FastSyncChainDownloader.create(
         syncConfig,
+        worldStateStorage,
         protocolSchedule,
         protocolContext,
         ethContext,
         syncState,
         new NoOpMetricsSystem(),
-        otherBlockchain.getBlockHeader(pivotBlockNumber).get());
+        new FastSyncState(otherBlockchain.getBlockHeader(pivotBlockNumber).get()));
   }
 
   @Test
@@ -143,7 +165,7 @@ public void shouldSyncToPivotBlockInSingleSegment() {
 
   @Test
   public void recoversFromSyncTargetDisconnect() {
-    final BlockchainSetupUtil shorterChainUtil = BlockchainSetupUtil.forTesting();
+    final BlockchainSetupUtil shorterChainUtil = BlockchainSetupUtil.forTesting(storageFormat);
     final MutableBlockchain shorterChain = shorterChainUtil.getBlockchain();
 
     otherBlockchainSetup.importFirstBlocks(30);
@@ -155,7 +177,7 @@ public void recoversFromSyncTargetDisconnect() {
         EthProtocolManagerTestUtil.createPeer(ethProtocolManager, shorterChain);
     final RespondingEthPeer.Responder shorterResponder =
         RespondingEthPeer.blockchainResponder(shorterChain);
-    // Doesn't respond to requests for checkpoints unless it's starting from geneis
+    // Doesn't respond to requests for checkpoints unless it's starting from genesis
     // So the import can only make it as far as block 15 (3 checkpoints 5 blocks apart)
     final RespondingEthPeer.Responder shorterLimitedRangeResponder =
         RespondingEthPeer.targetedResponder(
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncDownloaderTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncDownloaderTest.java
index ee282c56005..4dc88df2ad1 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncDownloaderTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncDownloaderTest.java
@@ -16,7 +16,10 @@
 
 import static java.util.concurrent.CompletableFuture.completedFuture;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -27,28 +30,33 @@
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.eth.sync.ChainDownloader;
 import org.hyperledger.besu.ethereum.eth.sync.TrailingPeerRequirements;
-import org.hyperledger.besu.ethereum.eth.sync.worldstate.NodeDataRequest;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate.FastWorldStateDownloader;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate.NodeDataRequest;
 import org.hyperledger.besu.ethereum.eth.sync.worldstate.StalledDownloadException;
 import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldStateDownloader;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
 import org.hyperledger.besu.services.tasks.TaskCollection;
 
 import java.nio.file.Path;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
 import org.assertj.core.api.Assertions;
+import org.junit.Before;
 import org.junit.Test;
 
 public class FastSyncDownloaderTest {
 
-  private static final CompletableFuture<FastSyncState> COMPLETE =
-      completedFuture(FastSyncState.EMPTY_SYNC_STATE);
-
   @SuppressWarnings("unchecked")
   private final FastSyncActions fastSyncActions = mock(FastSyncActions.class);
 
-  private final WorldStateDownloader worldStateDownloader = mock(WorldStateDownloader.class);
+  private final WorldStateStorage worldStateStorage = mock(WorldStateStorage.class);
+
+  private final WorldStateDownloader worldStateDownloader = mock(FastWorldStateDownloader.class);
   private final FastSyncStateStorage storage = mock(FastSyncStateStorage.class);
 
   @SuppressWarnings("unchecked")
@@ -58,21 +66,27 @@ public class FastSyncDownloaderTest {
 
   private final Path fastSyncDataDirectory = null;
 
-  private final FastSyncDownloader downloader =
-      new FastSyncDownloader(
+  private final FastSyncDownloader<NodeDataRequest> downloader =
+      new FastSyncDownloader<>(
           fastSyncActions,
+          worldStateStorage,
           worldStateDownloader,
           storage,
           taskCollection,
           fastSyncDataDirectory,
           FastSyncState.EMPTY_SYNC_STATE);
 
+  @Before
+  public void setup() {
+    when(worldStateStorage.getDataStorageFormat()).thenReturn(DataStorageFormat.FOREST);
+    when(worldStateStorage.isWorldStateAvailable(any(), any())).thenReturn(true);
+  }
+
   @Test
   public void shouldCompleteFastSyncSuccessfully() {
     final FastSyncState selectPivotBlockState = new FastSyncState(50);
     final BlockHeader pivotBlockHeader = new BlockHeaderTestFixture().number(50).buildHeader();
     final FastSyncState downloadPivotBlockHeaderState = new FastSyncState(pivotBlockHeader);
-    when(fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE)).thenReturn(COMPLETE);
     when(fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE))
         .thenReturn(completedFuture(selectPivotBlockState));
     when(fastSyncActions.downloadPivotBlockHeader(selectPivotBlockState))
@@ -80,17 +94,19 @@ public void shouldCompleteFastSyncSuccessfully() {
     when(fastSyncActions.createChainDownloader(downloadPivotBlockHeaderState))
         .thenReturn(chainDownloader);
     when(chainDownloader.start()).thenReturn(completedFuture(null));
-    when(worldStateDownloader.run(pivotBlockHeader)).thenReturn(completedFuture(null));
+    when(worldStateDownloader.run(
+            any(FastSyncActions.class), eq(new FastSyncState(pivotBlockHeader))))
+        .thenReturn(completedFuture(null));
 
     final CompletableFuture<FastSyncState> result = downloader.start();
 
-    verify(fastSyncActions).waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE);
     verify(fastSyncActions).selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE);
     verify(fastSyncActions).downloadPivotBlockHeader(selectPivotBlockState);
     verify(storage).storeState(downloadPivotBlockHeaderState);
     verify(fastSyncActions).createChainDownloader(downloadPivotBlockHeaderState);
     verify(chainDownloader).start();
-    verify(worldStateDownloader).run(pivotBlockHeader);
+    verify(worldStateDownloader)
+        .run(any(FastSyncActions.class), eq(new FastSyncState(pivotBlockHeader)));
     verifyNoMoreInteractions(fastSyncActions, worldStateDownloader, storage);
     assertThat(result).isCompletedWithValue(downloadPivotBlockHeaderState);
   }
@@ -100,16 +116,18 @@ public void shouldResumeFastSync() {
     final BlockHeader pivotBlockHeader = new BlockHeaderTestFixture().number(50).buildHeader();
     final FastSyncState fastSyncState = new FastSyncState(pivotBlockHeader);
     final CompletableFuture<FastSyncState> complete = completedFuture(fastSyncState);
-    when(fastSyncActions.waitForSuitablePeers(fastSyncState)).thenReturn(complete);
     when(fastSyncActions.selectPivotBlock(fastSyncState)).thenReturn(complete);
     when(fastSyncActions.downloadPivotBlockHeader(fastSyncState)).thenReturn(complete);
     when(fastSyncActions.createChainDownloader(fastSyncState)).thenReturn(chainDownloader);
     when(chainDownloader.start()).thenReturn(completedFuture(null));
-    when(worldStateDownloader.run(pivotBlockHeader)).thenReturn(completedFuture(null));
+    when(worldStateDownloader.run(
+            any(FastSyncActions.class), eq(new FastSyncState(pivotBlockHeader))))
+        .thenReturn(completedFuture(null));
 
-    final FastSyncDownloader resumedDownloader =
-        new FastSyncDownloader(
+    final FastSyncDownloader<NodeDataRequest> resumedDownloader =
+        new FastSyncDownloader<>(
             fastSyncActions,
+            worldStateStorage,
             worldStateDownloader,
             storage,
             taskCollection,
@@ -118,34 +136,19 @@ public void shouldResumeFastSync() {
 
     final CompletableFuture<FastSyncState> result = resumedDownloader.start();
 
-    verify(fastSyncActions).waitForSuitablePeers(fastSyncState);
     verify(fastSyncActions).selectPivotBlock(fastSyncState);
     verify(fastSyncActions).downloadPivotBlockHeader(fastSyncState);
     verify(storage).storeState(fastSyncState);
     verify(fastSyncActions).createChainDownloader(fastSyncState);
     verify(chainDownloader).start();
-    verify(worldStateDownloader).run(pivotBlockHeader);
+    verify(worldStateDownloader)
+        .run(any(FastSyncActions.class), eq(new FastSyncState(pivotBlockHeader)));
     verifyNoMoreInteractions(fastSyncActions, worldStateDownloader, storage);
     assertThat(result).isCompletedWithValue(fastSyncState);
   }
 
-  @Test
-  public void shouldAbortIfWaitForSuitablePeersFails() {
-    when(fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE))
-        .thenReturn(
-            CompletableFuture.failedFuture(new FastSyncException(FastSyncError.UNEXPECTED_ERROR)));
-
-    final CompletableFuture<FastSyncState> result = downloader.start();
-
-    assertCompletedExceptionally(result, FastSyncError.UNEXPECTED_ERROR);
-
-    verify(fastSyncActions).waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE);
-    verifyNoMoreInteractions(fastSyncActions);
-  }
-
   @Test
   public void shouldAbortIfSelectPivotBlockFails() {
-    when(fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE)).thenReturn(COMPLETE);
     when(fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE))
         .thenThrow(new FastSyncException(FastSyncError.UNEXPECTED_ERROR));
 
@@ -153,7 +156,6 @@ public void shouldAbortIfSelectPivotBlockFails() {
 
     assertCompletedExceptionally(result, FastSyncError.UNEXPECTED_ERROR);
 
-    verify(fastSyncActions).waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE);
     verify(fastSyncActions).selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE);
     verifyNoMoreInteractions(fastSyncActions);
   }
@@ -165,7 +167,7 @@ public void shouldAbortIfWorldStateDownloadFails() {
     final FastSyncState selectPivotBlockState = new FastSyncState(50);
     final BlockHeader pivotBlockHeader = new BlockHeaderTestFixture().number(50).buildHeader();
     final FastSyncState downloadPivotBlockHeaderState = new FastSyncState(pivotBlockHeader);
-    when(fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE)).thenReturn(COMPLETE);
+
     when(fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE))
         .thenReturn(completedFuture(selectPivotBlockState));
     when(fastSyncActions.downloadPivotBlockHeader(selectPivotBlockState))
@@ -173,16 +175,18 @@ public void shouldAbortIfWorldStateDownloadFails() {
     when(fastSyncActions.createChainDownloader(downloadPivotBlockHeaderState))
         .thenReturn(chainDownloader);
     when(chainDownloader.start()).thenReturn(chainFuture);
-    when(worldStateDownloader.run(pivotBlockHeader)).thenReturn(worldStateFuture);
+    when(worldStateDownloader.run(
+            any(FastSyncActions.class), eq(new FastSyncState(pivotBlockHeader))))
+        .thenReturn(worldStateFuture);
 
     final CompletableFuture<FastSyncState> result = downloader.start();
 
-    verify(fastSyncActions).waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE);
     verify(fastSyncActions).selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE);
     verify(fastSyncActions).downloadPivotBlockHeader(selectPivotBlockState);
     verify(storage).storeState(downloadPivotBlockHeaderState);
     verify(fastSyncActions).createChainDownloader(downloadPivotBlockHeaderState);
-    verify(worldStateDownloader).run(pivotBlockHeader);
+    verify(worldStateDownloader)
+        .run(any(FastSyncActions.class), eq(new FastSyncState(pivotBlockHeader)));
     verifyNoMoreInteractions(fastSyncActions, worldStateDownloader, storage);
 
     assertThat(result).isNotDone();
@@ -201,7 +205,7 @@ public void shouldAbortIfChainDownloadFails() {
     final FastSyncState selectPivotBlockState = new FastSyncState(50);
     final BlockHeader pivotBlockHeader = new BlockHeaderTestFixture().number(50).buildHeader();
     final FastSyncState downloadPivotBlockHeaderState = new FastSyncState(pivotBlockHeader);
-    when(fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE)).thenReturn(COMPLETE);
+
     when(fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE))
         .thenReturn(completedFuture(selectPivotBlockState));
     when(fastSyncActions.downloadPivotBlockHeader(selectPivotBlockState))
@@ -209,15 +213,17 @@ public void shouldAbortIfChainDownloadFails() {
     when(fastSyncActions.createChainDownloader(downloadPivotBlockHeaderState))
         .thenReturn(chainDownloader);
     when(chainDownloader.start()).thenReturn(chainFuture);
-    when(worldStateDownloader.run(pivotBlockHeader)).thenReturn(worldStateFuture);
+    when(worldStateDownloader.run(
+            any(FastSyncActions.class), eq(new FastSyncState(pivotBlockHeader))))
+        .thenReturn(worldStateFuture);
 
     final CompletableFuture<FastSyncState> result = downloader.start();
 
-    verify(fastSyncActions).waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE);
     verify(fastSyncActions).selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE);
     verify(fastSyncActions).downloadPivotBlockHeader(selectPivotBlockState);
     verify(fastSyncActions).createChainDownloader(downloadPivotBlockHeaderState);
-    verify(worldStateDownloader).run(pivotBlockHeader);
+    verify(worldStateDownloader)
+        .run(any(FastSyncActions.class), eq(new FastSyncState(pivotBlockHeader)));
     verifyNoMoreInteractions(fastSyncActions);
     verifyNoMoreInteractions(worldStateDownloader);
 
@@ -228,6 +234,40 @@ public void shouldAbortIfChainDownloadFails() {
     assertThat(worldStateFuture).isCancelled();
   }
 
+  @Test
+  public void shouldAbortIfStopped() {
+    final FastSyncState selectPivotBlockState = new FastSyncState(50);
+    final BlockHeader pivotBlockHeader = new BlockHeaderTestFixture().number(50).buildHeader();
+    final FastSyncState downloadPivotBlockHeaderState = new FastSyncState(pivotBlockHeader);
+
+    when(fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE))
+        .thenReturn(completedFuture(selectPivotBlockState));
+    doAnswer(
+            invocation -> {
+              CompletableFuture<FastSyncState> future = new CompletableFuture<>();
+              Executors.newSingleThreadScheduledExecutor()
+                  .schedule(
+                      () -> future.complete(downloadPivotBlockHeaderState),
+                      500,
+                      TimeUnit.MILLISECONDS);
+              return future;
+            })
+        .when(fastSyncActions)
+        .downloadPivotBlockHeader(selectPivotBlockState);
+
+    final CompletableFuture<FastSyncState> result = downloader.start();
+    downloader.stop();
+
+    Throwable thrown = catchThrowable(() -> result.get());
+    assertThat(thrown).hasCauseExactlyInstanceOf(CancellationException.class);
+
+    verify(fastSyncActions).selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE);
+    verify(fastSyncActions).downloadPivotBlockHeader(selectPivotBlockState);
+    verify(storage).storeState(downloadPivotBlockHeaderState);
+    verify(worldStateDownloader).cancel();
+    verifyNoMoreInteractions(fastSyncActions, worldStateDownloader, storage);
+  }
+
   @Test
   public void shouldNotConsiderFastSyncCompleteIfOnlyWorldStateDownloadIsComplete() {
     final CompletableFuture<Void> chainFuture = new CompletableFuture<>();
@@ -235,7 +275,7 @@ public void shouldNotConsiderFastSyncCompleteIfOnlyWorldStateDownloadIsComplete(
     final FastSyncState selectPivotBlockState = new FastSyncState(50);
     final BlockHeader pivotBlockHeader = new BlockHeaderTestFixture().number(50).buildHeader();
     final FastSyncState downloadPivotBlockHeaderState = new FastSyncState(pivotBlockHeader);
-    when(fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE)).thenReturn(COMPLETE);
+
     when(fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE))
         .thenReturn(completedFuture(selectPivotBlockState));
     when(fastSyncActions.downloadPivotBlockHeader(selectPivotBlockState))
@@ -243,15 +283,17 @@ public void shouldNotConsiderFastSyncCompleteIfOnlyWorldStateDownloadIsComplete(
     when(fastSyncActions.createChainDownloader(downloadPivotBlockHeaderState))
         .thenReturn(chainDownloader);
     when(chainDownloader.start()).thenReturn(chainFuture);
-    when(worldStateDownloader.run(pivotBlockHeader)).thenReturn(worldStateFuture);
+    when(worldStateDownloader.run(
+            any(FastSyncActions.class), eq(new FastSyncState(pivotBlockHeader))))
+        .thenReturn(worldStateFuture);
 
     final CompletableFuture<FastSyncState> result = downloader.start();
 
-    verify(fastSyncActions).waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE);
     verify(fastSyncActions).selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE);
     verify(fastSyncActions).downloadPivotBlockHeader(selectPivotBlockState);
     verify(fastSyncActions).createChainDownloader(downloadPivotBlockHeaderState);
-    verify(worldStateDownloader).run(pivotBlockHeader);
+    verify(worldStateDownloader)
+        .run(any(FastSyncActions.class), eq(new FastSyncState(pivotBlockHeader)));
     verifyNoMoreInteractions(fastSyncActions);
     verifyNoMoreInteractions(worldStateDownloader);
 
@@ -268,7 +310,7 @@ public void shouldNotConsiderFastSyncCompleteIfOnlyChainDownloadIsComplete() {
     final FastSyncState selectPivotBlockState = new FastSyncState(50);
     final BlockHeader pivotBlockHeader = new BlockHeaderTestFixture().number(50).buildHeader();
     final FastSyncState downloadPivotBlockHeaderState = new FastSyncState(pivotBlockHeader);
-    when(fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE)).thenReturn(COMPLETE);
+
     when(fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE))
         .thenReturn(completedFuture(selectPivotBlockState));
     when(fastSyncActions.downloadPivotBlockHeader(selectPivotBlockState))
@@ -276,15 +318,17 @@ public void shouldNotConsiderFastSyncCompleteIfOnlyChainDownloadIsComplete() {
     when(fastSyncActions.createChainDownloader(downloadPivotBlockHeaderState))
         .thenReturn(chainDownloader);
     when(chainDownloader.start()).thenReturn(chainFuture);
-    when(worldStateDownloader.run(pivotBlockHeader)).thenReturn(worldStateFuture);
+    when(worldStateDownloader.run(
+            any(FastSyncActions.class), eq(new FastSyncState(pivotBlockHeader))))
+        .thenReturn(worldStateFuture);
 
     final CompletableFuture<FastSyncState> result = downloader.start();
 
-    verify(fastSyncActions).waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE);
     verify(fastSyncActions).selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE);
     verify(fastSyncActions).downloadPivotBlockHeader(selectPivotBlockState);
     verify(fastSyncActions).createChainDownloader(downloadPivotBlockHeaderState);
-    verify(worldStateDownloader).run(pivotBlockHeader);
+    verify(worldStateDownloader)
+        .run(any(FastSyncActions.class), eq(new FastSyncState(pivotBlockHeader)));
     verifyNoMoreInteractions(fastSyncActions);
     verifyNoMoreInteractions(worldStateDownloader);
 
@@ -309,8 +353,8 @@ public void shouldResetFastSyncStateAndRestartProcessIfWorldStateIsUnavailable()
     final FastSyncState downloadPivotBlockHeaderState = new FastSyncState(pivotBlockHeader);
     final FastSyncState secondDownloadPivotBlockHeaderState =
         new FastSyncState(secondPivotBlockHeader);
+
     // First attempt
-    when(fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE)).thenReturn(COMPLETE);
     when(fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE))
         .thenReturn(
             completedFuture(selectPivotBlockState), completedFuture(secondSelectPivotBlockState));
@@ -319,7 +363,9 @@ public void shouldResetFastSyncStateAndRestartProcessIfWorldStateIsUnavailable()
     when(fastSyncActions.createChainDownloader(downloadPivotBlockHeaderState))
         .thenReturn(chainDownloader);
     when(chainDownloader.start()).thenReturn(chainFuture);
-    when(worldStateDownloader.run(pivotBlockHeader)).thenReturn(firstWorldStateFuture);
+    when(worldStateDownloader.run(
+            any(FastSyncActions.class), eq(new FastSyncState(pivotBlockHeader))))
+        .thenReturn(firstWorldStateFuture);
 
     // Second attempt with new pivot block
     when(fastSyncActions.downloadPivotBlockHeader(secondSelectPivotBlockState))
@@ -328,16 +374,18 @@ public void shouldResetFastSyncStateAndRestartProcessIfWorldStateIsUnavailable()
     when(fastSyncActions.createChainDownloader(secondDownloadPivotBlockHeaderState))
         .thenReturn(secondChainDownloader);
     when(secondChainDownloader.start()).thenReturn(completedFuture(null));
-    when(worldStateDownloader.run(secondPivotBlockHeader)).thenReturn(secondWorldStateFuture);
+    when(worldStateDownloader.run(
+            any(FastSyncActions.class), eq(new FastSyncState(secondPivotBlockHeader))))
+        .thenReturn(secondWorldStateFuture);
 
     final CompletableFuture<FastSyncState> result = downloader.start();
 
-    verify(fastSyncActions).waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE);
     verify(fastSyncActions).selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE);
     verify(fastSyncActions).downloadPivotBlockHeader(selectPivotBlockState);
     verify(storage).storeState(downloadPivotBlockHeaderState);
     verify(fastSyncActions).createChainDownloader(downloadPivotBlockHeaderState);
-    verify(worldStateDownloader).run(pivotBlockHeader);
+    verify(worldStateDownloader)
+        .run(any(FastSyncActions.class), eq(new FastSyncState(pivotBlockHeader)));
     verifyNoMoreInteractions(fastSyncActions, worldStateDownloader, storage);
 
     assertThat(result).isNotDone();
@@ -348,12 +396,12 @@ public void shouldResetFastSyncStateAndRestartProcessIfWorldStateIsUnavailable()
     // A real chain downloader would cause the chainFuture to complete when cancel is called.
     chainFuture.completeExceptionally(new CancellationException());
 
-    verify(fastSyncActions, times(2)).waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE);
     verify(fastSyncActions, times(2)).selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE);
     verify(fastSyncActions).downloadPivotBlockHeader(secondSelectPivotBlockState);
     verify(storage).storeState(secondDownloadPivotBlockHeaderState);
     verify(fastSyncActions).createChainDownloader(secondDownloadPivotBlockHeaderState);
-    verify(worldStateDownloader).run(secondPivotBlockHeader);
+    verify(worldStateDownloader)
+        .run(any(FastSyncActions.class), eq(new FastSyncState(secondPivotBlockHeader)));
     verifyNoMoreInteractions(fastSyncActions, worldStateDownloader, storage);
 
     secondWorldStateFuture.complete(null);
@@ -376,8 +424,8 @@ public void shouldResetFastSyncStateAndRestartProcessIfANonFastSyncExceptionOccu
     final FastSyncState downloadPivotBlockHeaderState = new FastSyncState(pivotBlockHeader);
     final FastSyncState secondDownloadPivotBlockHeaderState =
         new FastSyncState(secondPivotBlockHeader);
+
     // First attempt
-    when(fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE)).thenReturn(COMPLETE);
     when(fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE))
         .thenReturn(
             completedFuture(selectPivotBlockState), completedFuture(secondSelectPivotBlockState));
@@ -386,7 +434,9 @@ public void shouldResetFastSyncStateAndRestartProcessIfANonFastSyncExceptionOccu
     when(fastSyncActions.createChainDownloader(downloadPivotBlockHeaderState))
         .thenReturn(chainDownloader);
     when(chainDownloader.start()).thenReturn(chainFuture);
-    when(worldStateDownloader.run(pivotBlockHeader)).thenReturn(firstWorldStateFuture);
+    when(worldStateDownloader.run(
+            any(FastSyncActions.class), eq(new FastSyncState(pivotBlockHeader))))
+        .thenReturn(firstWorldStateFuture);
     when(fastSyncActions.scheduleFutureTask(any(), any()))
         .thenAnswer(invocation -> ((Supplier) invocation.getArgument(0)).get());
 
@@ -397,16 +447,18 @@ public void shouldResetFastSyncStateAndRestartProcessIfANonFastSyncExceptionOccu
     when(fastSyncActions.createChainDownloader(secondDownloadPivotBlockHeaderState))
         .thenReturn(secondChainDownloader);
     when(secondChainDownloader.start()).thenReturn(completedFuture(null));
-    when(worldStateDownloader.run(secondPivotBlockHeader)).thenReturn(secondWorldStateFuture);
+    when(worldStateDownloader.run(
+            any(FastSyncActions.class), eq(new FastSyncState(secondPivotBlockHeader))))
+        .thenReturn(secondWorldStateFuture);
 
     final CompletableFuture<FastSyncState> result = downloader.start();
 
-    verify(fastSyncActions).waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE);
     verify(fastSyncActions).selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE);
     verify(fastSyncActions).downloadPivotBlockHeader(selectPivotBlockState);
     verify(storage).storeState(downloadPivotBlockHeaderState);
     verify(fastSyncActions).createChainDownloader(downloadPivotBlockHeaderState);
-    verify(worldStateDownloader).run(pivotBlockHeader);
+    verify(worldStateDownloader)
+        .run(any(FastSyncActions.class), eq(new FastSyncState(pivotBlockHeader)));
     verifyNoMoreInteractions(fastSyncActions, worldStateDownloader, storage);
 
     assertThat(result).isNotDone();
@@ -419,12 +471,12 @@ public void shouldResetFastSyncStateAndRestartProcessIfANonFastSyncExceptionOccu
     chainFuture.completeExceptionally(new CancellationException());
 
     verify(fastSyncActions).scheduleFutureTask(any(), any());
-    verify(fastSyncActions, times(2)).waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE);
     verify(fastSyncActions, times(2)).selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE);
     verify(fastSyncActions).downloadPivotBlockHeader(secondSelectPivotBlockState);
     verify(storage).storeState(secondDownloadPivotBlockHeaderState);
     verify(fastSyncActions).createChainDownloader(secondDownloadPivotBlockHeaderState);
-    verify(worldStateDownloader).run(secondPivotBlockHeader);
+    verify(worldStateDownloader)
+        .run(any(FastSyncActions.class), eq(new FastSyncState(secondPivotBlockHeader)));
     verifyNoMoreInteractions(fastSyncActions, worldStateDownloader, storage);
 
     secondWorldStateFuture.complete(null);
@@ -434,12 +486,7 @@ public void shouldResetFastSyncStateAndRestartProcessIfANonFastSyncExceptionOccu
 
   @Test
   public void shouldNotHaveTrailingPeerRequirementsBeforePivotBlockSelected() {
-    when(fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE))
-        .thenReturn(new CompletableFuture<>());
-
     downloader.start();
-
-    verify(fastSyncActions).waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE);
     Assertions.assertThat(downloader.calculateTrailingPeerRequirements()).isEmpty();
   }
 
@@ -448,7 +495,7 @@ public void shouldNotAllowPeersBeforePivotBlockOnceSelected() {
     final FastSyncState selectPivotBlockState = new FastSyncState(50);
     final BlockHeader pivotBlockHeader = new BlockHeaderTestFixture().number(50).buildHeader();
     final FastSyncState downloadPivotBlockHeaderState = new FastSyncState(pivotBlockHeader);
-    when(fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE)).thenReturn(COMPLETE);
+
     when(fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE))
         .thenReturn(completedFuture(selectPivotBlockState));
     when(fastSyncActions.downloadPivotBlockHeader(selectPivotBlockState))
@@ -456,7 +503,9 @@ public void shouldNotAllowPeersBeforePivotBlockOnceSelected() {
     when(fastSyncActions.createChainDownloader(downloadPivotBlockHeaderState))
         .thenReturn(chainDownloader);
     when(chainDownloader.start()).thenReturn(new CompletableFuture<>());
-    when(worldStateDownloader.run(pivotBlockHeader)).thenReturn(new CompletableFuture<>());
+    when(worldStateDownloader.run(
+            any(FastSyncActions.class), eq(new FastSyncState(pivotBlockHeader))))
+        .thenReturn(new CompletableFuture<>());
 
     downloader.start();
     Assertions.assertThat(downloader.calculateTrailingPeerRequirements())
@@ -468,7 +517,7 @@ public void shouldNotHaveTrailingPeerRequirementsAfterDownloadCompletes() {
     final FastSyncState selectPivotBlockState = new FastSyncState(50);
     final BlockHeader pivotBlockHeader = new BlockHeaderTestFixture().number(50).buildHeader();
     final FastSyncState downloadPivotBlockHeaderState = new FastSyncState(pivotBlockHeader);
-    when(fastSyncActions.waitForSuitablePeers(FastSyncState.EMPTY_SYNC_STATE)).thenReturn(COMPLETE);
+
     when(fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE))
         .thenReturn(completedFuture(selectPivotBlockState));
     when(fastSyncActions.downloadPivotBlockHeader(selectPivotBlockState))
@@ -476,7 +525,9 @@ public void shouldNotHaveTrailingPeerRequirementsAfterDownloadCompletes() {
     when(fastSyncActions.createChainDownloader(downloadPivotBlockHeaderState))
         .thenReturn(chainDownloader);
     when(chainDownloader.start()).thenReturn(completedFuture(null));
-    when(worldStateDownloader.run(pivotBlockHeader)).thenReturn(completedFuture(null));
+    when(worldStateDownloader.run(
+            any(FastSyncActions.class), eq(new FastSyncState(pivotBlockHeader))))
+        .thenReturn(completedFuture(null));
 
     final CompletableFuture<FastSyncState> result = downloader.start();
     assertThat(result).isDone();
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockConfirmerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockConfirmerTest.java
index 68753a3a2ec..741334643cb 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockConfirmerTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockConfirmerTest.java
@@ -32,9 +32,12 @@
 import org.hyperledger.besu.ethereum.eth.sync.fastsync.PivotBlockConfirmer.ContestedPivotBlockException;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -42,7 +45,11 @@
 import org.apache.tuweni.bytes.Bytes;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 
+@RunWith(Parameterized.class)
 public class PivotBlockConfirmerTest {
 
   private static final long PIVOT_BLOCK_NUMBER = 10;
@@ -57,9 +64,20 @@ public class PivotBlockConfirmerTest {
   private PivotBlockConfirmer pivotBlockConfirmer;
   private ProtocolSchedule protocolSchedule;
 
+  @Parameters
+  public static Collection<Object[]> data() {
+    return Arrays.asList(new Object[][] {{DataStorageFormat.BONSAI}, {DataStorageFormat.FOREST}});
+  }
+
+  private final DataStorageFormat storageFormat;
+
+  public PivotBlockConfirmerTest(final DataStorageFormat storageFormat) {
+    this.storageFormat = storageFormat;
+  }
+
   @Before
   public void setUp() {
-    final BlockchainSetupUtil blockchainSetupUtil = BlockchainSetupUtil.forTesting();
+    final BlockchainSetupUtil blockchainSetupUtil = BlockchainSetupUtil.forTesting(storageFormat);
     blockchainSetupUtil.importAllBlocks();
     blockchain = blockchainSetupUtil.getBlockchain();
     transactionPool = blockchainSetupUtil.getTransactionPool();
@@ -67,12 +85,13 @@ public void setUp() {
     protocolContext = blockchainSetupUtil.getProtocolContext();
     ethProtocolManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             timeout::get,
             blockchainSetupUtil.getWorldArchive(),
             transactionPool,
             EthProtocolConfiguration.defaultConfig());
-    pivotBlockConfirmer = createPivotBlockConfirmer(3, 1);
+    pivotBlockConfirmer = createPivotBlockConfirmer(3, 2);
   }
 
   private PivotBlockConfirmer createPivotBlockConfirmer(
@@ -90,7 +109,7 @@ private PivotBlockConfirmer createPivotBlockConfirmer(
 
   @Test
   public void completeSuccessfully() {
-    pivotBlockConfirmer = createPivotBlockConfirmer(2, 1);
+    pivotBlockConfirmer = createPivotBlockConfirmer(2, 2);
 
     final Responder responder =
         RespondingEthPeer.blockchainResponder(
@@ -119,7 +138,7 @@ public void completeSuccessfully() {
 
   @Test
   public void delayedResponse() {
-    pivotBlockConfirmer = createPivotBlockConfirmer(2, 1);
+    pivotBlockConfirmer = createPivotBlockConfirmer(2, 2);
 
     final Responder responder =
         RespondingEthPeer.blockchainResponder(
@@ -152,7 +171,7 @@ public void delayedResponse() {
 
   @Test
   public void peerTimesOutThenIsUnresponsive() {
-    pivotBlockConfirmer = createPivotBlockConfirmer(2, 1);
+    pivotBlockConfirmer = createPivotBlockConfirmer(2, 2);
 
     final Responder responder =
         RespondingEthPeer.blockchainResponder(
@@ -192,7 +211,7 @@ public void peerTimesOutThenIsUnresponsive() {
 
   @Test
   public void peerTimesOut() {
-    pivotBlockConfirmer = createPivotBlockConfirmer(2, 1);
+    pivotBlockConfirmer = createPivotBlockConfirmer(2, 2);
 
     final Responder responder =
         RespondingEthPeer.blockchainResponder(
@@ -232,7 +251,7 @@ public void peerTimesOut() {
 
   @Test
   public void peerUnresponsive() {
-    pivotBlockConfirmer = createPivotBlockConfirmer(2, 1);
+    pivotBlockConfirmer = createPivotBlockConfirmer(2, 2);
 
     final Responder responder =
         RespondingEthPeer.blockchainResponder(
@@ -274,7 +293,7 @@ public void peerUnresponsive() {
 
   @Test
   public void headerMismatch() {
-    pivotBlockConfirmer = createPivotBlockConfirmer(3, 1);
+    pivotBlockConfirmer = createPivotBlockConfirmer(3, 2);
 
     final Responder responderA =
         RespondingEthPeer.blockchainResponder(
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockRetrieverTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockRetrieverTest.java
index caa50338a12..80bc2b9d2a4 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockRetrieverTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockRetrieverTest.java
@@ -34,10 +34,13 @@
 import org.hyperledger.besu.ethereum.eth.peervalidation.PeerValidator;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.util.ExceptionUtils;
 
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -45,7 +48,11 @@
 import org.apache.tuweni.bytes.Bytes;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 
+@RunWith(Parameterized.class)
 public class PivotBlockRetrieverTest {
 
   private static final long PIVOT_BLOCK_NUMBER = 10;
@@ -60,9 +67,20 @@ public class PivotBlockRetrieverTest {
   private PivotBlockRetriever pivotBlockRetriever;
   private ProtocolSchedule protocolSchedule;
 
+  @Parameters
+  public static Collection<Object[]> data() {
+    return Arrays.asList(new Object[][] {{DataStorageFormat.BONSAI}, {DataStorageFormat.FOREST}});
+  }
+
+  private final DataStorageFormat storageFormat;
+
+  public PivotBlockRetrieverTest(final DataStorageFormat storageFormat) {
+    this.storageFormat = storageFormat;
+  }
+
   @Before
   public void setUp() {
-    final BlockchainSetupUtil blockchainSetupUtil = BlockchainSetupUtil.forTesting();
+    final BlockchainSetupUtil blockchainSetupUtil = BlockchainSetupUtil.forTesting(storageFormat);
     blockchainSetupUtil.importAllBlocks();
     blockchain = blockchainSetupUtil.getBlockchain();
     protocolSchedule = blockchainSetupUtil.getProtocolSchedule();
@@ -70,6 +88,7 @@ public void setUp() {
     transactionPool = blockchainSetupUtil.getTransactionPool();
     ethProtocolManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             blockchain,
             timeout::get,
             blockchainSetupUtil.getWorldArchive(),
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/CompleteTaskStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/CompleteTaskStepTest.java
new file mode 100644
index 00000000000..e24a3420269
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/CompleteTaskStepTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Test;
+
+public class CompleteTaskStepTest {
+
+  private static final Hash ROOT_HASH = Hash.hash(Bytes.of(1, 2, 3));
+  private final FastWorldDownloadState downloadState = mock(FastWorldDownloadState.class);
+  private final BlockHeader blockHeader =
+      new BlockHeaderTestFixture().stateRoot(ROOT_HASH).buildHeader();
+
+  private final CompleteTaskStep completeTaskStep =
+      new CompleteTaskStep(new NoOpMetricsSystem(), () -> 3);
+
+  @Test
+  public void shouldMarkTaskAsFailedIfItDoesNotHaveData() {
+    final StubTask task =
+        new StubTask(NodeDataRequest.createAccountDataRequest(ROOT_HASH, Optional.empty()));
+
+    completeTaskStep.markAsCompleteOrFailed(blockHeader, downloadState, task);
+
+    assertThat(task.isCompleted()).isFalse();
+    assertThat(task.isFailed()).isTrue();
+    verify(downloadState).notifyTaskAvailable();
+    verify(downloadState, never()).checkCompletion(blockHeader);
+  }
+
+  @Test
+  public void shouldMarkCompleteWhenTaskHasData() {
+    // Use an arbitrary but actually valid trie node to get children from.
+    final StubTask task = validTask();
+    completeTaskStep.markAsCompleteOrFailed(blockHeader, downloadState, task);
+
+    assertThat(task.isCompleted()).isTrue();
+    assertThat(task.isFailed()).isFalse();
+
+    verify(downloadState).checkCompletion(blockHeader);
+  }
+
+  private StubTask validTask() {
+    final Hash hash =
+        Hash.fromHexString("0x601a7b0d0267209790cf4c4d9e0cab11b26c537e2ade006412f48b070010e847");
+    final Bytes data =
+        Bytes.fromHexString(
+            "0xf85180808080a05ac6993e3fbca0bfbd30173396dd5c2412657fae0bad92e401d17b2aa9a3698f80808080a012f96a0812be538c302416dc6e8df19ce18f1cc7b06a3c7a16831d766c87a9b580808080808080");
+    final StubTask task =
+        new StubTask(NodeDataRequest.createAccountDataRequest(hash, Optional.empty()));
+    task.getData().setData(data);
+    return task;
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/FastWorldDownloadStateTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/FastWorldDownloadStateTest.java
new file mode 100644
index 00000000000..0a774292fd7
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/FastWorldDownloadStateTest.java
@@ -0,0 +1,237 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.eth.manager.task.EthTask;
+import org.hyperledger.besu.ethereum.eth.sync.worldstate.StalledDownloadException;
+import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldStateDownloadProcess;
+import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
+import org.hyperledger.besu.services.tasks.InMemoryTasksPriorityQueues;
+import org.hyperledger.besu.testutil.TestClock;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class FastWorldDownloadStateTest {
+
+  private static final Bytes ROOT_NODE_DATA = Bytes.of(1, 2, 3, 4);
+  private static final Hash ROOT_NODE_HASH = Hash.hash(ROOT_NODE_DATA);
+  private static final int MAX_REQUESTS_WITHOUT_PROGRESS = 10;
+  private static final long MIN_MILLIS_BEFORE_STALLING = 50_000;
+
+  private WorldStateStorage worldStateStorage;
+
+  private final BlockHeader header =
+      new BlockHeaderTestFixture().stateRoot(ROOT_NODE_HASH).buildHeader();
+  private final InMemoryTasksPriorityQueues<NodeDataRequest> pendingRequests =
+      new InMemoryTasksPriorityQueues<>();
+  private final WorldStateDownloadProcess worldStateDownloadProcess =
+      mock(WorldStateDownloadProcess.class);
+
+  private final TestClock clock = new TestClock();
+  private FastWorldDownloadState downloadState;
+
+  private CompletableFuture<Void> future;
+
+  @Parameterized.Parameters
+  public static Collection<Object[]> data() {
+    return Arrays.asList(new Object[][] {{DataStorageFormat.BONSAI}, {DataStorageFormat.FOREST}});
+  }
+
+  private final DataStorageFormat storageFormat;
+
+  public FastWorldDownloadStateTest(final DataStorageFormat storageFormat) {
+    this.storageFormat = storageFormat;
+  }
+
+  @Before
+  public void setUp() {
+    if (storageFormat == DataStorageFormat.BONSAI) {
+      worldStateStorage =
+          new BonsaiWorldStateKeyValueStorage(
+              new InMemoryKeyValueStorageProvider(), new NoOpMetricsSystem());
+    } else {
+      worldStateStorage = new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+    }
+    downloadState =
+        new FastWorldDownloadState(
+            worldStateStorage,
+            pendingRequests,
+            MAX_REQUESTS_WITHOUT_PROGRESS,
+            MIN_MILLIS_BEFORE_STALLING,
+            clock);
+    assertThat(downloadState.isDownloading()).isTrue();
+    downloadState.setRootNodeData(ROOT_NODE_DATA);
+    future = downloadState.getDownloadFuture();
+  }
+
+  @Test
+  public void shouldCompleteReturnedFutureWhenNoPendingTasksRemain() {
+    downloadState.checkCompletion(header);
+
+    assertThat(future).isCompleted();
+    assertThat(downloadState.isDownloading()).isFalse();
+  }
+
+  @Test
+  public void shouldStoreRootNodeBeforeReturnedFutureCompletes() {
+    final CompletableFuture<Void> postFutureChecks =
+        future.thenAccept(
+            result ->
+                assertThat(worldStateStorage.getAccountStateTrieNode(Bytes.EMPTY, ROOT_NODE_HASH))
+                    .contains(ROOT_NODE_DATA));
+
+    downloadState.checkCompletion(header);
+
+    assertThat(future).isCompleted();
+    assertThat(postFutureChecks).isCompleted();
+  }
+
+  @Test
+  public void shouldNotCompleteWhenThereArePendingTasks() {
+    pendingRequests.add(
+        NodeDataRequest.createAccountDataRequest(Hash.EMPTY_TRIE_HASH, Optional.empty()));
+
+    downloadState.checkCompletion(header);
+
+    assertThat(future).isNotDone();
+    assertThat(worldStateStorage.getAccountStateTrieNode(Bytes.EMPTY, ROOT_NODE_HASH)).isEmpty();
+    assertThat(downloadState.isDownloading()).isTrue();
+  }
+
+  @Test
+  public void shouldCancelOutstandingTasksWhenFutureIsCancelled() {
+    final EthTask<?> outstandingTask1 = mock(EthTask.class);
+    final EthTask<?> outstandingTask2 = mock(EthTask.class);
+    downloadState.addOutstandingTask(outstandingTask1);
+    downloadState.addOutstandingTask(outstandingTask2);
+
+    pendingRequests.add(
+        NodeDataRequest.createAccountDataRequest(Hash.EMPTY_TRIE_HASH, Optional.empty()));
+    pendingRequests.add(NodeDataRequest.createAccountDataRequest(Hash.EMPTY, Optional.empty()));
+    downloadState.setWorldStateDownloadProcess(worldStateDownloadProcess);
+
+    future.cancel(true);
+
+    verify(outstandingTask1).cancel();
+    verify(outstandingTask2).cancel();
+
+    assertThat(pendingRequests.isEmpty()).isTrue();
+    verify(worldStateDownloadProcess).abort();
+    assertThat(downloadState.isDownloading()).isFalse();
+  }
+
+  @Test
+  public void shouldResetRequestsSinceProgressCountWhenProgressIsMade() {
+    downloadState.requestComplete(false);
+    downloadState.requestComplete(false);
+
+    downloadState.requestComplete(true);
+    clock.stepMillis(MIN_MILLIS_BEFORE_STALLING + 1);
+
+    for (int i = 0; i < MAX_REQUESTS_WITHOUT_PROGRESS - 1; i++) {
+      downloadState.requestComplete(false);
+      assertThat(downloadState.getDownloadFuture()).isNotDone();
+    }
+
+    downloadState.requestComplete(false);
+    assertWorldStateStalled(downloadState);
+  }
+
+  @Test
+  public void shouldNotBeStalledWhenMaxRequestsReachedUntilMinimumTimeAlsoReached() {
+    for (int i = 0; i < MAX_REQUESTS_WITHOUT_PROGRESS; i++) {
+      downloadState.requestComplete(false);
+      assertThat(downloadState.getDownloadFuture()).isNotDone();
+    }
+
+    // Exceeding the requests without progress limit doesn't trigger stalled state
+    downloadState.requestComplete(false);
+    assertThat(downloadState.getDownloadFuture()).isNotDone();
+
+    // Until the minimum time has elapsed, then the next request with no progress marks as stalled
+    clock.stepMillis(MIN_MILLIS_BEFORE_STALLING + 1);
+    downloadState.requestComplete(false);
+    assertWorldStateStalled(downloadState);
+  }
+
+  @Test
+  public void shouldNotBeStalledIfMinimumTimeIsReachedButMaximumRequestsIsNot() {
+    clock.stepMillis(MIN_MILLIS_BEFORE_STALLING + 1);
+    downloadState.requestComplete(false);
+    assertThat(downloadState.getDownloadFuture()).isNotDone();
+  }
+
+  @Test
+  public void shouldResetTimeSinceProgressWhenProgressIsMade() {
+    // Enough time has progressed but the next request makes progress so we are not stalled.
+    clock.stepMillis(MIN_MILLIS_BEFORE_STALLING + 1);
+    downloadState.requestComplete(true);
+    assertThat(downloadState.getDownloadFuture()).isNotDone();
+
+    // We then reach the max number of requests without progress but the timer should have reset
+    for (int i = 0; i < MAX_REQUESTS_WITHOUT_PROGRESS; i++) {
+      downloadState.requestComplete(false);
+      assertThat(downloadState.getDownloadFuture()).isNotDone();
+    }
+    assertThat(downloadState.getDownloadFuture()).isNotDone();
+  }
+
+  @Test
+  public void shouldNotAddRequestsAfterDownloadIsCompleted() {
+    downloadState.checkCompletion(header);
+
+    downloadState.enqueueRequests(
+        Stream.of(
+            NodeDataRequest.createAccountDataRequest(Hash.EMPTY_TRIE_HASH, Optional.empty())));
+    downloadState.enqueueRequest(
+        NodeDataRequest.createAccountDataRequest(Hash.EMPTY_TRIE_HASH, Optional.empty()));
+
+    assertThat(pendingRequests.isEmpty()).isTrue();
+  }
+
+  private void assertWorldStateStalled(final FastWorldDownloadState state) {
+    final CompletableFuture<Void> future = state.getDownloadFuture();
+    assertThat(future).isCompletedExceptionally();
+    assertThatThrownBy(future::get)
+        .isInstanceOf(ExecutionException.class)
+        .hasRootCauseInstanceOf(StalledDownloadException.class);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/FastWorldStateDownloaderTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/FastWorldStateDownloaderTest.java
new file mode 100644
index 00000000000..fec755a8849
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/FastWorldStateDownloaderTest.java
@@ -0,0 +1,1041 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.core.ProtocolScheduleFixture;
+import org.hyperledger.besu.ethereum.eth.manager.DeterministicEthScheduler;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
+import org.hyperledger.besu.ethereum.eth.messages.EthPV63;
+import org.hyperledger.besu.ethereum.eth.messages.GetNodeDataMessage;
+import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncState;
+import org.hyperledger.besu.ethereum.eth.sync.worldstate.StalledDownloadException;
+import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldStateDownloader;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.Node;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.trie.patricia.TrieNodeDecoder;
+import org.hyperledger.besu.ethereum.worldstate.DefaultWorldStateArchive;
+import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage.Updater;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.account.AccountStorageEntry;
+import org.hyperledger.besu.evm.worldstate.WorldState;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
+import org.hyperledger.besu.services.tasks.InMemoryTasksPriorityQueues;
+import org.hyperledger.besu.testutil.MockExecutorService;
+import org.hyperledger.besu.testutil.TestClock;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.LockSupport;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.After;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.Timeout;
+
+@Ignore("PIE-1434 - Ignored while working to make test more reliable")
+public class FastWorldStateDownloaderTest {
+
+  @Rule public Timeout globalTimeout = Timeout.seconds(60); // 1 minute max per test
+
+  private static final Hash EMPTY_TRIE_ROOT = Hash.wrap(MerkleTrie.EMPTY_TRIE_NODE_HASH);
+
+  private final BlockDataGenerator dataGen = new BlockDataGenerator(1);
+  private final ExecutorService persistenceThread =
+      Executors.newCachedThreadPool(
+          new ThreadFactoryBuilder()
+              .setDaemon(true)
+              .setNameFormat(FastWorldStateDownloaderTest.class.getSimpleName() + "-persistence-%d")
+              .build());
+
+  final EthProtocolManager ethProtocolManager =
+      EthProtocolManagerTestUtil.create(new EthScheduler(1, 1, 1, 1, new NoOpMetricsSystem()));
+
+  @After
+  public void tearDown() throws Exception {
+    persistenceThread.shutdownNow();
+    assertThat(persistenceThread.awaitTermination(10, TimeUnit.SECONDS)).isTrue();
+    ethProtocolManager.stop();
+  }
+
+  @Test
+  public void downloadWorldStateFromPeers_onePeerOneWithManyRequestsOneAtATime() {
+    downloadAvailableWorldStateFromPeers(1, 50, 1, 1);
+  }
+
+  @Test
+  public void downloadWorldStateFromPeers_onePeerOneWithManyRequests() {
+    downloadAvailableWorldStateFromPeers(1, 50, 1, 10);
+  }
+
+  @Test
+  public void downloadWorldStateFromPeers_onePeerWithSingleRequest() {
+    downloadAvailableWorldStateFromPeers(1, 1, 100, 10);
+  }
+
+  @Test
+  public void downloadWorldStateFromPeers_largeStateFromMultiplePeers() {
+    downloadAvailableWorldStateFromPeers(5, 100, 10, 10);
+  }
+
+  @Test
+  public void downloadWorldStateFromPeers_smallStateFromMultiplePeers() {
+    downloadAvailableWorldStateFromPeers(5, 5, 1, 10);
+  }
+
+  @Test
+  public void downloadWorldStateFromPeers_singleRequestWithMultiplePeers() {
+    downloadAvailableWorldStateFromPeers(5, 1, 50, 50);
+  }
+
+  @Test
+  public void downloadEmptyWorldState() {
+
+    final BlockHeader header =
+        dataGen
+            .block(BlockOptions.create().setStateRoot(EMPTY_TRIE_ROOT).setBlockNumber(10))
+            .getHeader();
+
+    final FastSyncState fastSyncState = new FastSyncState(header);
+
+    // Create some peers
+    final List<RespondingEthPeer> peers =
+        Stream.generate(
+                () -> EthProtocolManagerTestUtil.createPeer(ethProtocolManager, header.getNumber()))
+            .limit(5)
+            .collect(Collectors.toList());
+
+    final InMemoryTasksPriorityQueues<NodeDataRequest> taskCollection =
+        new InMemoryTasksPriorityQueues<>();
+    final WorldStateStorage localStorage =
+        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+    final WorldStateDownloader downloader =
+        createDownloader(ethProtocolManager.ethContext(), localStorage, taskCollection);
+
+    final CompletableFuture<Void> future = downloader.run(null, fastSyncState);
+    assertThat(future).isDone();
+
+    // Peers should not have been queried
+    for (final RespondingEthPeer peer : peers) {
+      assertThat(peer.hasOutstandingRequests()).isFalse();
+    }
+  }
+
+  @Test
+  public void downloadAlreadyAvailableWorldState() {
+    // Setup existing state
+    final DefaultWorldStateArchive worldStateArchive = createInMemoryWorldStateArchive();
+    final MutableWorldState worldState = worldStateArchive.getMutable();
+
+    // Generate accounts and save corresponding state root
+    dataGen.createRandomAccounts(worldState, 20);
+    final Hash stateRoot = worldState.rootHash();
+    assertThat(stateRoot).isNotEqualTo(EMPTY_TRIE_ROOT); // Sanity check
+    final BlockHeader header =
+        dataGen.block(BlockOptions.create().setStateRoot(stateRoot).setBlockNumber(10)).getHeader();
+
+    // Create some peers
+    final List<RespondingEthPeer> peers =
+        Stream.generate(
+                () -> EthProtocolManagerTestUtil.createPeer(ethProtocolManager, header.getNumber()))
+            .limit(5)
+            .collect(Collectors.toList());
+
+    final InMemoryTasksPriorityQueues<NodeDataRequest> taskCollection =
+        new InMemoryTasksPriorityQueues<>();
+    final WorldStateDownloader downloader =
+        createDownloader(
+            ethProtocolManager.ethContext(),
+            worldStateArchive.getWorldStateStorage(),
+            taskCollection);
+
+    final FastSyncState fastSyncState = new FastSyncState(header);
+
+    final CompletableFuture<Void> future = downloader.run(null, fastSyncState);
+    assertThat(future).isDone();
+
+    // Peers should not have been queried because we already had the state
+    for (final RespondingEthPeer peer : peers) {
+      assertThat(peer.hasOutstandingRequests()).isFalse();
+    }
+  }
+
+  @Test
+  public void canRecoverFromTimeouts() {
+    final DeterministicEthScheduler.TimeoutPolicy timeoutPolicy =
+        DeterministicEthScheduler.TimeoutPolicy.timeoutXTimes(2);
+    final EthProtocolManager ethProtocolManager = EthProtocolManagerTestUtil.create(timeoutPolicy);
+    final MockExecutorService serviceExecutor =
+        ((DeterministicEthScheduler) ethProtocolManager.ethContext().getScheduler())
+            .mockServiceExecutor();
+    serviceExecutor.setAutoRun(false);
+
+    // Setup "remote" state
+    final WorldStateArchive remoteWorldStateArchive = createInMemoryWorldStateArchive();
+    final MutableWorldState remoteWorldState = remoteWorldStateArchive.getMutable();
+
+    // Generate accounts and save corresponding state root
+    final List<Account> accounts = dataGen.createRandomAccounts(remoteWorldState, 20);
+    final Hash stateRoot = remoteWorldState.rootHash();
+    assertThat(stateRoot).isNotEqualTo(EMPTY_TRIE_ROOT); // Sanity check
+    final BlockHeader header =
+        dataGen.block(BlockOptions.create().setStateRoot(stateRoot).setBlockNumber(10)).getHeader();
+
+    // Create some peers
+    final List<RespondingEthPeer> peers =
+        Stream.generate(
+                () -> EthProtocolManagerTestUtil.createPeer(ethProtocolManager, header.getNumber()))
+            .limit(5)
+            .collect(Collectors.toList());
+
+    final InMemoryTasksPriorityQueues<NodeDataRequest> taskCollection =
+        new InMemoryTasksPriorityQueues<>();
+    final WorldStateStorage localStorage =
+        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+    final WorldStateDownloader downloader =
+        createDownloader(ethProtocolManager.ethContext(), localStorage, taskCollection);
+
+    final FastSyncState fastSyncState = new FastSyncState(header);
+
+    final CompletableFuture<Void> result = downloader.run(null, fastSyncState);
+
+    serviceExecutor.runPendingFuturesInSeparateThreads(persistenceThread);
+
+    // Respond to node data requests
+    final RespondingEthPeer.Responder responder =
+        RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive);
+
+    respondUntilDone(peers, responder, result);
+
+    // Check that all expected account data was downloaded
+    final WorldStateArchive localWorldStateArchive =
+        new DefaultWorldStateArchive(localStorage, createPreimageStorage());
+    final WorldState localWorldState = localWorldStateArchive.get(stateRoot, null).get();
+    assertThat(result).isDone();
+    assertAccountsMatch(localWorldState, accounts);
+  }
+
+  @Test
+  public void handlesPartialResponsesFromNetwork() {
+    downloadAvailableWorldStateFromPeers(5, 100, 10, 10, this::respondPartially);
+  }
+
+  @Test
+  public void doesNotRequestKnownCodeFromNetwork() {
+    // Setup "remote" state
+    final WorldStateArchive remoteWorldStateArchive = createInMemoryWorldStateArchive();
+    final MutableWorldState remoteWorldState = remoteWorldStateArchive.getMutable();
+
+    // Generate accounts and save corresponding state root
+    final List<Account> accounts =
+        dataGen.createRandomContractAccountsWithNonEmptyStorage(remoteWorldState, 20);
+    final Hash stateRoot = remoteWorldState.rootHash();
+    final BlockHeader header =
+        dataGen.block(BlockOptions.create().setStateRoot(stateRoot).setBlockNumber(10)).getHeader();
+
+    // Create some peers
+    final List<RespondingEthPeer> peers =
+        Stream.generate(
+                () -> EthProtocolManagerTestUtil.createPeer(ethProtocolManager, header.getNumber()))
+            .limit(5)
+            .collect(Collectors.toList());
+
+    final InMemoryTasksPriorityQueues<NodeDataRequest> taskCollection =
+        new InMemoryTasksPriorityQueues<>();
+    final WorldStateStorage localStorage =
+        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+
+    // Seed local storage with some contract values
+    final Map<Bytes32, Bytes> knownCode = new HashMap<>();
+    accounts.subList(0, 5).forEach(a -> knownCode.put(a.getCodeHash(), a.getCode()));
+    final Updater localStorageUpdater = localStorage.updater();
+    knownCode.forEach((bytes32, code) -> localStorageUpdater.putCode(null, code));
+    localStorageUpdater.commit();
+
+    final WorldStateDownloader downloader =
+        createDownloader(ethProtocolManager.ethContext(), localStorage, taskCollection);
+
+    final FastSyncState fastSyncState = new FastSyncState(header);
+
+    final CompletableFuture<Void> result = downloader.run(null, fastSyncState);
+
+    // Respond to node data requests
+    final List<MessageData> sentMessages = new ArrayList<>();
+    final RespondingEthPeer.Responder blockChainResponder =
+        RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive);
+    final RespondingEthPeer.Responder responder =
+        RespondingEthPeer.wrapResponderWithCollector(blockChainResponder, sentMessages);
+
+    respondUntilDone(peers, responder, result);
+
+    // Check that known code was not requested
+    final List<Bytes32> requestedHashes =
+        sentMessages.stream()
+            .filter(m -> m.getCode() == EthPV63.GET_NODE_DATA)
+            .map(GetNodeDataMessage::readFrom)
+            .flatMap(m -> StreamSupport.stream(m.hashes().spliterator(), true))
+            .collect(Collectors.toList());
+    assertThat(requestedHashes.size()).isGreaterThan(0);
+    assertThat(Collections.disjoint(requestedHashes, knownCode.keySet())).isTrue();
+
+    // Check that all expected account data was downloaded
+    final WorldStateArchive localWorldStateArchive =
+        new DefaultWorldStateArchive(localStorage, createPreimageStorage());
+    final WorldState localWorldState = localWorldStateArchive.get(stateRoot, null).get();
+    assertThat(result).isDone();
+    assertAccountsMatch(localWorldState, accounts);
+  }
+
+  @Test
+  public void cancelDownloader() {
+    testCancellation(false);
+  }
+
+  @Test
+  public void cancelDownloaderFuture() {
+    testCancellation(true);
+  }
+
+  @SuppressWarnings("unchecked")
+  private void testCancellation(final boolean shouldCancelFuture) {
+    final EthProtocolManager ethProtocolManager = EthProtocolManagerTestUtil.create();
+    // Prevent the persistence service from running
+    final MockExecutorService serviceExecutor =
+        ((DeterministicEthScheduler) ethProtocolManager.ethContext().getScheduler())
+            .mockServiceExecutor();
+    serviceExecutor.setAutoRun(false);
+
+    // Setup "remote" state
+    final WorldStateArchive remoteWorldStateArchive = createInMemoryWorldStateArchive();
+    final MutableWorldState remoteWorldState = remoteWorldStateArchive.getMutable();
+
+    // Generate accounts and save corresponding state root
+    dataGen.createRandomContractAccountsWithNonEmptyStorage(remoteWorldState, 20);
+    final Hash stateRoot = remoteWorldState.rootHash();
+    final BlockHeader header =
+        dataGen.block(BlockOptions.create().setStateRoot(stateRoot).setBlockNumber(10)).getHeader();
+
+    // Create some peers
+    final List<RespondingEthPeer> peers =
+        Stream.generate(
+                () -> EthProtocolManagerTestUtil.createPeer(ethProtocolManager, header.getNumber()))
+            .limit(5)
+            .collect(Collectors.toList());
+
+    final InMemoryTasksPriorityQueues<NodeDataRequest> taskCollection =
+        new InMemoryTasksPriorityQueues<>();
+    final WorldStateStorage localStorage =
+        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+
+    final WorldStateDownloader downloader =
+        createDownloader(ethProtocolManager.ethContext(), localStorage, taskCollection);
+
+    final FastSyncState fastSyncState = new FastSyncState(header);
+
+    final CompletableFuture<Void> result = downloader.run(null, fastSyncState);
+
+    // Send a few responses
+    final RespondingEthPeer.Responder responder =
+        RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive);
+
+    for (int i = 0; i < 3; i++) {
+      for (final RespondingEthPeer peer : peers) {
+        peer.respond(responder);
+      }
+      giveOtherThreadsAGo();
+    }
+    assertThat(result.isDone()).isFalse(); // Sanity check
+
+    // Reset taskCollection so we can track interactions after the cancellation
+    reset(taskCollection);
+    if (shouldCancelFuture) {
+      result.cancel(true);
+    } else {
+      downloader.cancel();
+      assertThat(result).isCancelled();
+    }
+
+    // Send some more responses after cancelling
+    for (int i = 0; i < 3; i++) {
+      for (final RespondingEthPeer peer : peers) {
+        peer.respond(responder);
+      }
+      giveOtherThreadsAGo();
+    }
+
+    // Now allow the persistence service to run which should exit immediately
+    serviceExecutor.runPendingFutures();
+
+    verify(taskCollection, times(1)).clear();
+    verify(taskCollection, never()).remove();
+    verify(taskCollection, never()).add(any(NodeDataRequest.class));
+    // Target world state should not be available
+    assertThat(localStorage.isWorldStateAvailable(header.getStateRoot(), header.getHash()))
+        .isFalse();
+  }
+
+  @Test
+  public void doesNotRequestKnownAccountTrieNodesFromNetwork() {
+    // Setup "remote" state
+    final WorldStateStorage remoteStorage =
+        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+    final WorldStateArchive remoteWorldStateArchive =
+        new DefaultWorldStateArchive(remoteStorage, createPreimageStorage());
+    final MutableWorldState remoteWorldState = remoteWorldStateArchive.getMutable();
+
+    // Generate accounts and save corresponding state root
+    final List<Account> accounts =
+        dataGen.createRandomContractAccountsWithNonEmptyStorage(remoteWorldState, 20);
+    final Hash stateRoot = remoteWorldState.rootHash();
+    final BlockHeader header =
+        dataGen.block(BlockOptions.create().setStateRoot(stateRoot).setBlockNumber(10)).getHeader();
+
+    // Create some peers
+    final List<RespondingEthPeer> peers =
+        Stream.generate(
+                () -> EthProtocolManagerTestUtil.createPeer(ethProtocolManager, header.getNumber()))
+            .limit(5)
+            .collect(Collectors.toList());
+
+    final InMemoryTasksPriorityQueues<NodeDataRequest> taskCollection =
+        new InMemoryTasksPriorityQueues<>();
+    final WorldStateStorage localStorage =
+        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+
+    // Seed local storage with some trie node values
+    final Map<Bytes32, Bytes> allNodes =
+        collectTrieNodesToBeRequestedAfterRoot(remoteStorage, remoteWorldState.rootHash(), 5);
+    final Set<Bytes32> knownNodes = new HashSet<>();
+    final Set<Bytes32> unknownNodes = new HashSet<>();
+    assertThat(allNodes.size()).isGreaterThan(0); // Sanity check
+    final Updater localStorageUpdater = localStorage.updater();
+    final AtomicBoolean storeNode = new AtomicBoolean(true);
+    allNodes.forEach(
+        (nodeHash, node) -> {
+          if (storeNode.get()) {
+            localStorageUpdater.putAccountStateTrieNode(null, nodeHash, node);
+            knownNodes.add(nodeHash);
+          } else {
+            unknownNodes.add(nodeHash);
+          }
+          storeNode.set(!storeNode.get());
+        });
+    localStorageUpdater.commit();
+
+    final WorldStateDownloader downloader =
+        createDownloader(ethProtocolManager.ethContext(), localStorage, taskCollection);
+
+    final FastSyncState fastSyncState = new FastSyncState(header);
+
+    final CompletableFuture<Void> result = downloader.run(null, fastSyncState);
+
+    // Respond to node data requests
+    final List<MessageData> sentMessages = new ArrayList<>();
+    final RespondingEthPeer.Responder blockChainResponder =
+        RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive);
+    final RespondingEthPeer.Responder responder =
+        RespondingEthPeer.wrapResponderWithCollector(blockChainResponder, sentMessages);
+
+    respondUntilDone(peers, responder, result);
+
+    // Check that unknown trie nodes were requested
+    final List<Bytes32> requestedHashes =
+        sentMessages.stream()
+            .filter(m -> m.getCode() == EthPV63.GET_NODE_DATA)
+            .map(GetNodeDataMessage::readFrom)
+            .flatMap(m -> StreamSupport.stream(m.hashes().spliterator(), true))
+            .collect(Collectors.toList());
+    assertThat(requestedHashes.size()).isGreaterThan(0);
+    assertThat(requestedHashes).containsAll(unknownNodes);
+    assertThat(requestedHashes).doesNotContainAnyElementsOf(knownNodes);
+
+    // Check that all expected account data was downloaded
+    final WorldStateArchive localWorldStateArchive =
+        new DefaultWorldStateArchive(localStorage, createPreimageStorage());
+    final WorldState localWorldState = localWorldStateArchive.get(stateRoot, null).get();
+    assertThat(result).isDone();
+    assertAccountsMatch(localWorldState, accounts);
+  }
+
+  @Test
+  public void doesNotRequestKnownStorageTrieNodesFromNetwork() {
+    // Setup "remote" state
+    final WorldStateStorage remoteStorage =
+        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+    final WorldStateArchive remoteWorldStateArchive =
+        new DefaultWorldStateArchive(remoteStorage, createPreimageStorage());
+    final MutableWorldState remoteWorldState = remoteWorldStateArchive.getMutable();
+
+    // Generate accounts and save corresponding state root
+    final List<Account> accounts =
+        dataGen.createRandomContractAccountsWithNonEmptyStorage(remoteWorldState, 20);
+    final Hash stateRoot = remoteWorldState.rootHash();
+    final BlockHeader header =
+        dataGen.block(BlockOptions.create().setStateRoot(stateRoot).setBlockNumber(10)).getHeader();
+
+    // Create some peers
+    final List<RespondingEthPeer> peers =
+        Stream.generate(
+                () -> EthProtocolManagerTestUtil.createPeer(ethProtocolManager, header.getNumber()))
+            .limit(5)
+            .collect(Collectors.toList());
+
+    final InMemoryTasksPriorityQueues<NodeDataRequest> taskCollection =
+        new InMemoryTasksPriorityQueues<>();
+    final WorldStateStorage localStorage =
+        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+
+    // Seed local storage with some trie node values
+    final List<Bytes32> storageRootHashes =
+        new StoredMerklePatriciaTrie<>(
+                remoteStorage::getNodeData,
+                remoteWorldState.rootHash(),
+                Function.identity(),
+                Function.identity())
+            .entriesFrom(Bytes32.ZERO, 5).values().stream()
+                .map(RLP::input)
+                .map(StateTrieAccountValue::readFrom)
+                .map(StateTrieAccountValue::getStorageRoot)
+                .collect(Collectors.toList());
+    final Map<Bytes32, Bytes> allTrieNodes = new HashMap<>();
+    final Set<Bytes32> knownNodes = new HashSet<>();
+    final Set<Bytes32> unknownNodes = new HashSet<>();
+    for (final Bytes32 storageRootHash : storageRootHashes) {
+      allTrieNodes.putAll(
+          collectTrieNodesToBeRequestedAfterRoot(remoteStorage, storageRootHash, 5));
+    }
+    assertThat(allTrieNodes.size()).isGreaterThan(0); // Sanity check
+    final Updater localStorageUpdater = localStorage.updater();
+    boolean storeNode = true;
+    for (final Map.Entry<Bytes32, Bytes> entry : allTrieNodes.entrySet()) {
+      final Bytes32 hash = entry.getKey();
+      final Bytes data = entry.getValue();
+      if (storeNode) {
+        localStorageUpdater.putAccountStorageTrieNode(null, null, hash, data);
+        knownNodes.add(hash);
+      } else {
+        unknownNodes.add(hash);
+      }
+      storeNode = !storeNode;
+    }
+    localStorageUpdater.commit();
+
+    final WorldStateDownloader downloader =
+        createDownloader(ethProtocolManager.ethContext(), localStorage, taskCollection);
+
+    final FastSyncState fastSyncState = new FastSyncState(header);
+
+    final CompletableFuture<Void> result = downloader.run(null, fastSyncState);
+
+    // Respond to node data requests
+    final List<MessageData> sentMessages = new ArrayList<>();
+    final RespondingEthPeer.Responder blockChainResponder =
+        RespondingEthPeer.blockchainResponder(
+            mock(Blockchain.class), remoteWorldStateArchive, mock(TransactionPool.class));
+    final RespondingEthPeer.Responder responder =
+        RespondingEthPeer.wrapResponderWithCollector(blockChainResponder, sentMessages);
+
+    respondUntilDone(peers, responder, result);
+    // World state should be available by the time the result is complete
+    assertThat(localStorage.isWorldStateAvailable(stateRoot, header.getHash())).isTrue();
+
+    // Check that unknown trie nodes were requested
+    final List<Bytes32> requestedHashes =
+        sentMessages.stream()
+            .filter(m -> m.getCode() == EthPV63.GET_NODE_DATA)
+            .map(GetNodeDataMessage::readFrom)
+            .flatMap(m -> StreamSupport.stream(m.hashes().spliterator(), true))
+            .collect(Collectors.toList());
+    assertThat(requestedHashes.size()).isGreaterThan(0);
+    assertThat(requestedHashes).containsAll(unknownNodes);
+    assertThat(requestedHashes).doesNotContainAnyElementsOf(knownNodes);
+
+    // Check that all expected account data was downloaded
+    final WorldStateArchive localWorldStateArchive =
+        new DefaultWorldStateArchive(localStorage, createPreimageStorage());
+    final WorldState localWorldState = localWorldStateArchive.get(stateRoot, null).get();
+    assertThat(result).isDone();
+    assertAccountsMatch(localWorldState, accounts);
+  }
+
+  @Test
+  public void stalledDownloader() {
+    final EthProtocolManager ethProtocolManager =
+        EthProtocolManagerTestUtil.create(new EthScheduler(1, 1, 1, 1, new NoOpMetricsSystem()));
+
+    // Setup "remote" state
+    final WorldStateStorage remoteStorage =
+        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+    final WorldStateArchive remoteWorldStateArchive =
+        new DefaultWorldStateArchive(remoteStorage, createPreimageStorage());
+    final MutableWorldState remoteWorldState = remoteWorldStateArchive.getMutable();
+
+    // Generate accounts and save corresponding state root
+    dataGen.createRandomAccounts(remoteWorldState, 10);
+    final Hash stateRoot = remoteWorldState.rootHash();
+    assertThat(stateRoot).isNotEqualTo(EMPTY_TRIE_ROOT); // Sanity check
+    final BlockHeader header =
+        dataGen.block(BlockOptions.create().setStateRoot(stateRoot).setBlockNumber(10)).getHeader();
+
+    final InMemoryTasksPriorityQueues<NodeDataRequest> taskCollection =
+        new InMemoryTasksPriorityQueues<>();
+    final WorldStateStorage localStorage =
+        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+    final SynchronizerConfiguration syncConfig =
+        SynchronizerConfiguration.builder().worldStateMaxRequestsWithoutProgress(10).build();
+    final WorldStateDownloader downloader =
+        createDownloader(syncConfig, ethProtocolManager.ethContext(), localStorage, taskCollection);
+
+    // Create a peer that can respond
+    final RespondingEthPeer peer =
+        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, header.getNumber());
+
+    // Start downloader (with a state root that's not available anywhere
+
+    final CompletableFuture<Void> result =
+        downloader.run(
+            null,
+            new FastSyncState(
+                new BlockHeaderTestFixture()
+                    .stateRoot(Hash.hash(Bytes.of(1, 2, 3, 4)))
+                    .buildHeader()));
+
+    // A second run should return an error without impacting the first result
+    final CompletableFuture<?> secondResult = downloader.run(null, new FastSyncState(header));
+    assertThat(secondResult).isCompletedExceptionally();
+    assertThat(result).isNotCompletedExceptionally();
+
+    final RespondingEthPeer.Responder emptyResponder = RespondingEthPeer.emptyResponder();
+    peer.respondWhileOtherThreadsWork(emptyResponder, () -> !result.isDone());
+
+    assertThat(result).isCompletedExceptionally();
+    assertThatThrownBy(result::get).hasCauseInstanceOf(StalledDownloadException.class);
+
+    // Finally, check that when we restart the download with state that is available it works
+
+    final CompletableFuture<Void> retryResult = downloader.run(null, new FastSyncState(header));
+
+    final RespondingEthPeer.Responder responder =
+        RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive);
+    peer.respondWhileOtherThreadsWork(responder, () -> !retryResult.isDone());
+    assertThat(retryResult).isCompleted();
+  }
+
+  @Test
+  public void resumesFromNonEmptyQueue() {
+    // Setup "remote" state
+    final WorldStateStorage remoteStorage =
+        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+    final WorldStateArchive remoteWorldStateArchive =
+        new DefaultWorldStateArchive(remoteStorage, createPreimageStorage());
+    final MutableWorldState remoteWorldState = remoteWorldStateArchive.getMutable();
+
+    // Generate accounts and save corresponding state root
+    List<Account> accounts = dataGen.createRandomAccounts(remoteWorldState, 10);
+    final Hash stateRoot = remoteWorldState.rootHash();
+    assertThat(stateRoot).isNotEqualTo(EMPTY_TRIE_ROOT); // Sanity check
+    final BlockHeader header =
+        dataGen.block(BlockOptions.create().setStateRoot(stateRoot).setBlockNumber(10)).getHeader();
+
+    // Add some nodes to the taskCollection
+    final InMemoryTasksPriorityQueues<NodeDataRequest> taskCollection =
+        spy(new InMemoryTasksPriorityQueues<>());
+    List<Bytes32> queuedHashes = getFirstSetOfChildNodeRequests(remoteStorage, stateRoot);
+    assertThat(queuedHashes.size()).isGreaterThan(0); // Sanity check
+    for (Bytes32 bytes32 : queuedHashes) {
+      taskCollection.add(new AccountTrieNodeDataRequest(Hash.wrap(bytes32), Optional.empty()));
+    }
+    // Sanity check
+    for (final Bytes32 bytes32 : queuedHashes) {
+      final Hash hash = Hash.wrap(bytes32);
+      verify(taskCollection, times(1)).add(argThat((r) -> r.getHash().equals(hash)));
+    }
+
+    final WorldStateStorage localStorage =
+        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+    final SynchronizerConfiguration syncConfig =
+        SynchronizerConfiguration.builder().worldStateMaxRequestsWithoutProgress(10).build();
+    final WorldStateDownloader downloader =
+        createDownloader(syncConfig, ethProtocolManager.ethContext(), localStorage, taskCollection);
+
+    // Create a peer that can respond
+    final RespondingEthPeer peer =
+        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, header.getNumber());
+
+    // Respond to node data requests
+    final List<MessageData> sentMessages = new ArrayList<>();
+    final RespondingEthPeer.Responder blockChainResponder =
+        RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive);
+    final RespondingEthPeer.Responder responder =
+        RespondingEthPeer.wrapResponderWithCollector(blockChainResponder, sentMessages);
+
+    CompletableFuture<Void> result = downloader.run(null, new FastSyncState(header));
+    peer.respondWhileOtherThreadsWork(responder, () -> !result.isDone());
+    assertThat(localStorage.isWorldStateAvailable(stateRoot, header.getHash())).isTrue();
+
+    // Check that already enqueued trie nodes were requested
+    final List<Bytes32> requestedHashes =
+        sentMessages.stream()
+            .filter(m -> m.getCode() == EthPV63.GET_NODE_DATA)
+            .map(GetNodeDataMessage::readFrom)
+            .flatMap(m -> StreamSupport.stream(m.hashes().spliterator(), true))
+            .collect(Collectors.toList());
+    assertThat(requestedHashes.size()).isGreaterThan(0);
+    assertThat(requestedHashes).containsAll(queuedHashes);
+
+    // Check that already enqueued requests were not enqueued more than once
+    for (Bytes32 bytes32 : queuedHashes) {
+      final Hash hash = Hash.wrap(bytes32);
+      verify(taskCollection, times(1)).add(argThat((r) -> r.getHash().equals(hash)));
+    }
+
+    // Check that all expected account data was downloaded
+    assertThat(result).isDone();
+    final WorldStateArchive localWorldStateArchive =
+        new DefaultWorldStateArchive(localStorage, createPreimageStorage());
+    final WorldState localWorldState = localWorldStateArchive.get(stateRoot, null).get();
+    assertAccountsMatch(localWorldState, accounts);
+  }
+
+  /**
+   * Walks through trie represented by the given rootHash and returns hash-node pairs that would
+   * need to be requested from the network in order to reconstruct this trie, excluding the root
+   * node.
+   *
+   * @param storage Storage holding node data required to reconstitute the trie represented by
+   *     rootHash
+   * @param rootHash The hash of the root node of some trie
+   * @param maxNodes The maximum number of values to collect before returning
+   * @return A list of hash-node pairs
+   */
+  private Map<Bytes32, Bytes> collectTrieNodesToBeRequestedAfterRoot(
+      final WorldStateStorage storage, final Bytes32 rootHash, final int maxNodes) {
+    final Map<Bytes32, Bytes> trieNodes = new HashMap<>();
+
+    TrieNodeDecoder.breadthFirstDecoder(storage::getNodeData, rootHash)
+        .filter(n -> !Objects.equals(n.getHash(), rootHash))
+        .filter(Node::isReferencedByHash)
+        .limit(maxNodes)
+        .forEach((n) -> trieNodes.put(n.getHash(), n.getEncodedBytes()));
+
+    return trieNodes;
+  }
+
+  /**
+   * Returns the first set of node hashes that would need to be requested from the network after
+   * retrieving the root node in order to rebuild the trie represented by the given rootHash and
+   * storage.
+   *
+   * @param storage Storage holding node data required to reconstitute the trie represented by
+   *     rootHash
+   * @param rootHash The hash of the root node of some trie
+   * @return A list of node hashes
+   */
+  private List<Bytes32> getFirstSetOfChildNodeRequests(
+      final WorldStateStorage storage, final Bytes32 rootHash) {
+    final List<Bytes32> hashesToRequest = new ArrayList<>();
+
+    final Bytes rootNodeRlp = storage.getNodeData(Bytes.EMPTY, rootHash).get();
+    TrieNodeDecoder.decodeNodes(Bytes.EMPTY, rootNodeRlp).stream()
+        .filter(n -> !Objects.equals(n.getHash(), rootHash))
+        .filter(Node::isReferencedByHash)
+        .forEach((n) -> hashesToRequest.add(n.getHash()));
+
+    return hashesToRequest;
+  }
+
+  private void downloadAvailableWorldStateFromPeers(
+      final int peerCount,
+      final int accountCount,
+      final int hashesPerRequest,
+      final int maxOutstandingRequests) {
+    downloadAvailableWorldStateFromPeers(
+        peerCount, accountCount, hashesPerRequest, maxOutstandingRequests, this::respondFully);
+  }
+
+  private void downloadAvailableWorldStateFromPeers(
+      final int peerCount,
+      final int accountCount,
+      final int hashesPerRequest,
+      final int maxOutstandingRequests,
+      final NetworkResponder networkResponder) {
+    final int trailingPeerCount = 5;
+
+    // Setup "remote" state
+    final WorldStateStorage remoteStorage =
+        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+    final WorldStateArchive remoteWorldStateArchive =
+        new DefaultWorldStateArchive(remoteStorage, createPreimageStorage());
+    final MutableWorldState remoteWorldState = remoteWorldStateArchive.getMutable();
+
+    // Generate accounts and save corresponding state root
+    final List<Account> accounts = dataGen.createRandomAccounts(remoteWorldState, accountCount);
+    final Hash stateRoot = remoteWorldState.rootHash();
+    assertThat(stateRoot).isNotEqualTo(EMPTY_TRIE_ROOT); // Sanity check
+    final BlockHeader header =
+        dataGen.block(BlockOptions.create().setStateRoot(stateRoot).setBlockNumber(10)).getHeader();
+
+    // Generate more data that should not be downloaded
+    final List<Account> otherAccounts = dataGen.createRandomAccounts(remoteWorldState, 5);
+    final Hash otherStateRoot = remoteWorldState.rootHash();
+    final BlockHeader otherHeader =
+        dataGen
+            .block(BlockOptions.create().setStateRoot(otherStateRoot).setBlockNumber(11))
+            .getHeader();
+    assertThat(otherStateRoot).isNotEqualTo(stateRoot); // Sanity check
+
+    final InMemoryTasksPriorityQueues<NodeDataRequest> taskCollection =
+        new InMemoryTasksPriorityQueues<>();
+    final WorldStateStorage localStorage =
+        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+    final WorldStateArchive localWorldStateArchive =
+        new DefaultWorldStateArchive(localStorage, createPreimageStorage());
+    final SynchronizerConfiguration syncConfig =
+        SynchronizerConfiguration.builder()
+            .worldStateHashCountPerRequest(hashesPerRequest)
+            .worldStateRequestParallelism(maxOutstandingRequests)
+            .build();
+    final WorldStateDownloader downloader =
+        createDownloader(syncConfig, ethProtocolManager.ethContext(), localStorage, taskCollection);
+
+    // Create some peers that can respond
+    final List<RespondingEthPeer> usefulPeers =
+        Stream.generate(
+                () -> EthProtocolManagerTestUtil.createPeer(ethProtocolManager, header.getNumber()))
+            .limit(peerCount)
+            .collect(Collectors.toList());
+    // And some irrelevant peers
+    final List<RespondingEthPeer> trailingPeers =
+        Stream.generate(
+                () ->
+                    EthProtocolManagerTestUtil.createPeer(
+                        ethProtocolManager, header.getNumber() - 1L))
+            .limit(trailingPeerCount)
+            .collect(Collectors.toList());
+
+    // Start downloader
+    final CompletableFuture<?> result = downloader.run(null, new FastSyncState(header));
+    // A second run should return an error without impacting the first result
+    final CompletableFuture<?> secondResult = downloader.run(null, new FastSyncState(header));
+    assertThat(secondResult).isCompletedExceptionally();
+    assertThat(result).isNotCompletedExceptionally();
+
+    // Respond to node data requests
+    // Send one round of full responses, so that we can get multiple requests queued up
+    final RespondingEthPeer.Responder fullResponder =
+        RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive);
+    for (final RespondingEthPeer peer : usefulPeers) {
+      peer.respond(fullResponder);
+    }
+    // Respond to remaining queued requests in custom way
+    networkResponder.respond(usefulPeers, remoteWorldStateArchive, result);
+
+    // Check that trailing peers were not queried for data
+    for (final RespondingEthPeer trailingPeer : trailingPeers) {
+      assertThat(trailingPeer.hasOutstandingRequests()).isFalse();
+    }
+
+    // Check that all expected account data was downloaded
+    final WorldState localWorldState = localWorldStateArchive.get(stateRoot, null).get();
+    assertThat(result).isDone();
+    assertAccountsMatch(localWorldState, accounts);
+
+    // We shouldn't have any extra data locally
+    assertThat(localStorage.contains(otherHeader.getStateRoot())).isFalse();
+    for (final Account otherAccount : otherAccounts) {
+      assertThat(localWorldState.get(otherAccount.getAddress())).isNull();
+    }
+  }
+
+  private void respondFully(
+      final List<RespondingEthPeer> peers,
+      final WorldStateArchive remoteWorldStateArchive,
+      final CompletableFuture<?> downloaderFuture) {
+    final RespondingEthPeer.Responder responder =
+        RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive);
+    respondUntilDone(peers, responder, downloaderFuture);
+  }
+
+  private void respondPartially(
+      final List<RespondingEthPeer> peers,
+      final WorldStateArchive remoteWorldStateArchive,
+      final CompletableFuture<?> downloaderFuture) {
+    final RespondingEthPeer.Responder fullResponder =
+        RespondingEthPeer.blockchainResponder(
+            mock(Blockchain.class), remoteWorldStateArchive, mock(TransactionPool.class));
+    final RespondingEthPeer.Responder partialResponder =
+        RespondingEthPeer.partialResponder(
+            mock(Blockchain.class),
+            remoteWorldStateArchive,
+            mock(TransactionPool.class),
+            ProtocolScheduleFixture.MAINNET,
+            .5f);
+    final RespondingEthPeer.Responder emptyResponder = RespondingEthPeer.emptyResponder();
+
+    // Send a few partial responses
+    for (int i = 0; i < 5; i++) {
+      for (final RespondingEthPeer peer : peers) {
+        peer.respond(partialResponder);
+      }
+      giveOtherThreadsAGo();
+    }
+
+    // Downloader should not complete with partial responses
+    assertThat(downloaderFuture).isNotDone();
+
+    // Send a few empty responses
+    for (int i = 0; i < 3; i++) {
+      for (final RespondingEthPeer peer : peers) {
+        peer.respond(emptyResponder);
+      }
+      giveOtherThreadsAGo();
+    }
+
+    // Downloader should not complete with empty responses
+    assertThat(downloaderFuture).isNotDone();
+
+    respondUntilDone(peers, fullResponder, downloaderFuture);
+  }
+
+  private void assertAccountsMatch(
+      final WorldState worldState, final List<Account> expectedAccounts) {
+    for (final Account expectedAccount : expectedAccounts) {
+      final Account actualAccount = worldState.get(expectedAccount.getAddress());
+      assertThat(actualAccount).isNotNull();
+      // Check each field
+      assertThat(actualAccount.getNonce()).isEqualTo(expectedAccount.getNonce());
+      assertThat(actualAccount.getCode()).isEqualTo(expectedAccount.getCode());
+      assertThat(actualAccount.getBalance()).isEqualTo(expectedAccount.getBalance());
+
+      final Map<Bytes32, AccountStorageEntry> actualStorage =
+          actualAccount.storageEntriesFrom(Bytes32.ZERO, 500);
+      final Map<Bytes32, AccountStorageEntry> expectedStorage =
+          expectedAccount.storageEntriesFrom(Bytes32.ZERO, 500);
+      assertThat(actualStorage).isEqualTo(expectedStorage);
+    }
+  }
+
+  private WorldStateDownloader createDownloader(
+      final EthContext context,
+      final WorldStateStorage storage,
+      final InMemoryTasksPriorityQueues<NodeDataRequest> taskCollection) {
+    return createDownloader(
+        SynchronizerConfiguration.builder().build(), context, storage, taskCollection);
+  }
+
+  private WorldStateDownloader createDownloader(
+      final SynchronizerConfiguration config,
+      final EthContext context,
+      final WorldStateStorage storage,
+      final InMemoryTasksPriorityQueues<NodeDataRequest> taskCollection) {
+    return new FastWorldStateDownloader(
+        context,
+        storage,
+        taskCollection,
+        config.getWorldStateHashCountPerRequest(),
+        config.getWorldStateRequestParallelism(),
+        config.getWorldStateMaxRequestsWithoutProgress(),
+        config.getWorldStateMinMillisBeforeStalling(),
+        TestClock.fixed(),
+        new NoOpMetricsSystem());
+  }
+
+  private WorldStatePreimageStorage createPreimageStorage() {
+    return new WorldStatePreimageKeyValueStorage(new InMemoryKeyValueStorage());
+  }
+
+  private void respondUntilDone(
+      final List<RespondingEthPeer> peers,
+      final RespondingEthPeer.Responder responder,
+      final CompletableFuture<?> result) {
+    if (peers.size() == 1) {
+      // Use a blocking approach to waiting for the next message when we can.
+      peers.get(0).respondWhileOtherThreadsWork(responder, () -> !result.isDone());
+      return;
+    }
+    while (!result.isDone()) {
+      for (final RespondingEthPeer peer : peers) {
+        peer.respond(responder);
+      }
+      giveOtherThreadsAGo();
+    }
+  }
+
+  private void giveOtherThreadsAGo() {
+    LockSupport.parkNanos(200);
+  }
+
+  @FunctionalInterface
+  private interface NetworkResponder {
+    void respond(
+        final List<RespondingEthPeer> peers,
+        final WorldStateArchive remoteWorldStateArchive,
+        final CompletableFuture<?> downloaderFuture);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/LoadLocalDataStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/LoadLocalDataStepTest.java
new file mode 100644
index 00000000000..cb75570581e
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/LoadLocalDataStepTest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.metrics.noop.NoOpMetricsSystem.NO_OP_COUNTER;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.services.pipeline.Pipe;
+import org.hyperledger.besu.services.tasks.Task;
+
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class LoadLocalDataStepTest {
+
+  private static final Bytes DATA = Bytes.of(1, 2, 3);
+  private static final Hash HASH = Hash.hash(DATA);
+  private final WorldStateStorage worldStateStorage = mock(WorldStateStorage.class);
+  private final WorldStateStorage.Updater updater = mock(WorldStateStorage.Updater.class);
+
+  private final CodeNodeDataRequest request =
+      NodeDataRequest.createCodeRequest(HASH, Optional.empty());
+  private final Task<NodeDataRequest> task = new StubTask(request);
+
+  private final Pipe<Task<NodeDataRequest>> completedTasks =
+      new Pipe<>(10, NO_OP_COUNTER, NO_OP_COUNTER, NO_OP_COUNTER);
+  private final LoadLocalDataStep loadLocalDataStep =
+      new LoadLocalDataStep(worldStateStorage, new NoOpMetricsSystem());
+
+  @Test
+  public void shouldReturnStreamWithUnchangedTaskWhenDataNotPresent() {
+    final Stream<Task<NodeDataRequest>> output =
+        loadLocalDataStep.loadLocalData(task, completedTasks);
+
+    assertThat(completedTasks.poll()).isNull();
+    assertThat(output).containsExactly(task);
+  }
+
+  @Test
+  public void shouldReturnEmptyStreamAndSendTaskToCompletedPipeWhenDataIsPresent() {
+    when(worldStateStorage.getCode(HASH, Hash.EMPTY)).thenReturn(Optional.of(DATA));
+    when(worldStateStorage.updater()).thenReturn(updater);
+
+    final Stream<Task<NodeDataRequest>> output =
+        loadLocalDataStep.loadLocalData(task, completedTasks);
+
+    assertThat(completedTasks.poll()).isSameAs(task);
+    assertThat(request.getData()).isEqualTo(DATA);
+    assertThat(output).isEmpty();
+
+    verify(updater).commit();
+    Mockito.reset(updater);
+
+    // Should not require persisting.
+    request.persist(updater);
+    verifyNoInteractions(updater);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/NodeDataRequestTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/NodeDataRequestTest.java
new file mode 100644
index 00000000000..905d87d0e27
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/NodeDataRequestTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldStateDownloaderException;
+
+import java.util.Optional;
+
+import org.junit.Test;
+
+public class NodeDataRequestTest {
+
+  @Test
+  public void cannotAssignParentTwice() {
+    NodeDataRequest parent =
+        new StorageTrieNodeDataRequest(null, Optional.empty(), Optional.empty());
+    NodeDataRequest child =
+        new StorageTrieNodeDataRequest(null, Optional.empty(), Optional.empty());
+    child.registerParent(parent);
+    assertThatThrownBy(() -> child.registerParent(parent))
+        .isInstanceOf(WorldStateDownloaderException.class);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/PersistDataStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/PersistDataStepTest.java
new file mode 100644
index 00000000000..693623d4c7b
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/PersistDataStepTest.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.patricia.SimpleMerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.services.tasks.Task;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Test;
+
+public class PersistDataStepTest {
+
+  private final WorldStateStorage worldStateStorage =
+      new InMemoryKeyValueStorageProvider().createWorldStateStorage(DataStorageFormat.FOREST);
+  private final FastWorldDownloadState downloadState = mock(FastWorldDownloadState.class);
+
+  private final Bytes rootNodeData = Bytes.of(1, 1, 1, 1);
+  private final BlockHeader blockHeader =
+      new BlockHeaderTestFixture().stateRoot(Hash.hash(rootNodeData)).buildHeader();
+
+  private final PersistDataStep persistDataStep = new PersistDataStep(worldStateStorage);
+
+  @Test
+  public void shouldPersistDataWhenPresentWithoutChildren() {
+    final List<Task<NodeDataRequest>> tasks =
+        asList(
+            createTaskWithData(1, 2, 3),
+            createTaskWithData(4, 5, 6),
+            createTaskWithData(7, 8, 9),
+            createTaskWithData(10, 11, 12));
+
+    final List<Task<NodeDataRequest>> result =
+        persistDataStep.persist(tasks, blockHeader, downloadState);
+
+    assertThat(result).isSameAs(tasks);
+    assertDataPersisted(tasks);
+  }
+
+  @Test
+  public void shouldSkipPersistingTasksWithNoData() {
+    final Task<NodeDataRequest> withData = createTaskWithData(1, 2, 3);
+    final StubTask withoutData = createTaskWithoutData(4, 5, 6);
+    final List<Task<NodeDataRequest>> tasks = asList(withData, withoutData);
+
+    final List<Task<NodeDataRequest>> result =
+        persistDataStep.persist(tasks, blockHeader, downloadState);
+    assertThat(result).isSameAs(tasks);
+
+    assertThat(worldStateStorage.contains(withData.getData().getHash())).isTrue();
+    assertThat(worldStateStorage.contains(withoutData.getData().getHash())).isFalse();
+  }
+
+  @Test
+  public void shouldStoreRootNodeDataInDownloadStateInsteadOfPersisting() {
+    final Task<NodeDataRequest> rootNode = createTaskWithData(rootNodeData);
+    final List<Task<NodeDataRequest>> tasks = singletonList(rootNode);
+    final List<Task<NodeDataRequest>> result =
+        persistDataStep.persist(tasks, blockHeader, downloadState);
+    assertThat(result).isSameAs(tasks);
+
+    assertThat(worldStateStorage.contains(rootNode.getData().getHash())).isFalse();
+    verify(downloadState).setRootNodeData(rootNode.getData().getData());
+  }
+
+  private Task<NodeDataRequest> createTaskWithData(final int... bytes) {
+    return createTaskWithData(Bytes.of(bytes));
+  }
+
+  private Task<NodeDataRequest> createTaskWithData(final Bytes data) {
+    final StubTask task = createTaskWithoutData(data);
+    MerkleTrie<Bytes, String> trie =
+        new SimpleMerklePatriciaTrie<>(
+            value -> (value != null) ? Bytes.wrap(value.getBytes(StandardCharsets.UTF_8)) : null);
+    trie.put(data, "01");
+    task.getData().setData(trie.getValueWithProof(data).getProofRelatedNodes().get(0));
+    return task;
+  }
+
+  private StubTask createTaskWithoutData(final int... data) {
+    return createTaskWithoutData(Bytes.of(data));
+  }
+
+  private StubTask createTaskWithoutData(final Bytes data) {
+    final Hash hash = Hash.hash(data);
+    final AccountTrieNodeDataRequest request =
+        NodeDataRequest.createAccountDataRequest(hash, Optional.empty());
+    return new StubTask(request);
+  }
+
+  private void assertDataPersisted(final List<Task<NodeDataRequest>> tasks) {
+    tasks.forEach(
+        task ->
+            assertThat(worldStateStorage.getNodeData(null, task.getData().getHash()))
+                .isEqualTo(Optional.of(task.getData().getData())));
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/RequestDataStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/RequestDataStepTest.java
similarity index 96%
rename from ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/RequestDataStepTest.java
rename to ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/RequestDataStepTest.java
index 0998da44ce7..1173c6e5f77 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/RequestDataStepTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/RequestDataStepTest.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.eth.sync.worldstate;
+package org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyMap;
@@ -24,9 +24,9 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.eth.manager.task.EthTask;
 import org.hyperledger.besu.services.tasks.Task;
 
@@ -55,7 +55,7 @@ public class RequestDataStepTest {
   @SuppressWarnings("unchecked")
   private final EthTask<Map<Hash, Bytes>> ethTask = mock(EthTask.class);
 
-  private final WorldDownloadState downloadState = mock(WorldDownloadState.class);
+  private final FastWorldDownloadState downloadState = mock(FastWorldDownloadState.class);
   private final BlockHeader blockHeader =
       new BlockHeaderTestFixture().number(BLOCK_NUMBER).buildHeader();
   private final CompletableFuture<Map<Hash, Bytes>> getDataFuture = new CompletableFuture<>();
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/StubTask.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/StubTask.java
new file mode 100644
index 00000000000..4292387890d
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/worldstate/StubTask.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fastsync.worldstate;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.services.tasks.Task;
+
+import java.util.Optional;
+
+public class StubTask implements Task<NodeDataRequest> {
+
+  private final NodeDataRequest data;
+  private boolean completed = false;
+  private boolean failed = false;
+
+  public StubTask(final NodeDataRequest data) {
+    this.data = data;
+  }
+
+  public static StubTask forHash(final Hash hash) {
+    return new StubTask(NodeDataRequest.createCodeRequest(hash, Optional.empty()));
+  }
+
+  @Override
+  public NodeDataRequest getData() {
+    return data;
+  }
+
+  @Override
+  public void markCompleted() {
+    completed = true;
+  }
+
+  @Override
+  public void markFailed() {
+    failed = true;
+  }
+
+  public boolean isCompleted() {
+    return completed;
+  }
+
+  public boolean isFailed() {
+    return failed;
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/BetterSyncTargetEvaluatorTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/BetterSyncTargetEvaluatorTest.java
index c22ede83acd..c552f1033ae 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/BetterSyncTargetEvaluatorTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/BetterSyncTargetEvaluatorTest.java
@@ -18,8 +18,8 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.eth.manager.ChainState;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
@@ -28,6 +28,7 @@
 import java.util.Optional;
 
 import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.Before;
 import org.junit.Test;
 
 public class BetterSyncTargetEvaluatorTest {
@@ -46,6 +47,11 @@ public class BetterSyncTargetEvaluatorTest {
               .build(),
           ethPeers);
 
+  @Before
+  public void setupMocks() {
+    when(ethPeers.getBestChainComparator()).thenReturn(EthPeers.HEAVIEST_CHAIN);
+  }
+
   @Test
   public void shouldNotSwitchTargetsIfNoBestPeerIsAvailable() {
     when(ethPeers.bestPeer()).thenReturn(Optional.empty());
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullImportBlockStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullImportBlockStepTest.java
index 91e28984841..ddb8695b32f 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullImportBlockStepTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullImportBlockStepTest.java
@@ -16,15 +16,17 @@
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode.SKIP_DETACHED;
-import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockImporter;
 import org.hyperledger.besu.ethereum.eth.sync.tasks.exceptions.InvalidBlockException;
+import org.hyperledger.besu.ethereum.mainnet.BlockImportResult;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 
@@ -47,20 +49,23 @@ public class FullImportBlockStepTest {
 
   @Before
   public void setUp() {
-    when(protocolSchedule.getByBlockNumber(anyLong())).thenReturn(protocolSpec);
+    when(protocolSchedule.getByBlockHeader(any(BlockHeader.class))).thenReturn(protocolSpec);
     when(protocolSpec.getBlockImporter()).thenReturn(blockImporter);
 
-    importBlocksStep = new FullImportBlockStep(protocolSchedule, protocolContext, null);
+    importBlocksStep =
+        new FullImportBlockStep(
+            protocolSchedule, protocolContext, null, SyncTerminationCondition.never());
   }
 
   @Test
   public void shouldImportBlock() {
     final Block block = gen.block();
 
-    when(blockImporter.importBlock(protocolContext, block, SKIP_DETACHED)).thenReturn(true);
+    when(blockImporter.importBlock(protocolContext, block, SKIP_DETACHED))
+        .thenReturn(new BlockImportResult(true));
     importBlocksStep.accept(block);
 
-    verify(protocolSchedule).getByBlockNumber(block.getHeader().getNumber());
+    verify(protocolSchedule).getByBlockHeader(block.getHeader());
     verify(blockImporter).importBlock(protocolContext, block, SKIP_DETACHED);
   }
 
@@ -68,7 +73,8 @@ public void shouldImportBlock() {
   public void shouldThrowExceptionWhenValidationFails() {
     final Block block = gen.block();
 
-    when(blockImporter.importBlock(protocolContext, block, SKIP_DETACHED)).thenReturn(false);
+    when(blockImporter.importBlock(protocolContext, block, SKIP_DETACHED))
+        .thenReturn(new BlockImportResult(false));
     assertThatThrownBy(() -> importBlocksStep.accept(block))
         .isInstanceOf(InvalidBlockException.class);
   }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloaderForkTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloaderForkTest.java
index b87bea35690..cda6e900932 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloaderForkTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloaderForkTest.java
@@ -64,6 +64,7 @@ public void setupTest() {
     protocolContext = localBlockchainSetup.getProtocolContext();
     ethProtocolManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             localBlockchain,
             new EthScheduler(1, 1, 1, 1, new NoOpMetricsSystem()),
             localBlockchainSetup.getWorldArchive(),
@@ -80,7 +81,13 @@ public void tearDown() {
 
   private ChainDownloader downloader(final SynchronizerConfiguration syncConfig) {
     return FullSyncChainDownloader.create(
-        syncConfig, protocolSchedule, protocolContext, ethContext, syncState, metricsSystem);
+        syncConfig,
+        protocolSchedule,
+        protocolContext,
+        ethContext,
+        syncState,
+        metricsSystem,
+        SyncTerminationCondition.never());
   }
 
   private ChainDownloader downloader() {
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloaderTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloaderTest.java
index fb19a5daf36..f9c4cb1e9fa 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloaderTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloaderTest.java
@@ -16,7 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
 
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
@@ -42,10 +42,13 @@
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
@@ -55,7 +58,11 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 
+@RunWith(Parameterized.class)
 public class FullSyncChainDownloaderTest {
 
   protected ProtocolSchedule protocolSchedule;
@@ -71,18 +78,30 @@ public class FullSyncChainDownloaderTest {
   protected Blockchain otherBlockchain;
   private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
 
+  @Parameters
+  public static Collection<Object[]> data() {
+    return Arrays.asList(new Object[][] {{DataStorageFormat.BONSAI}, {DataStorageFormat.FOREST}});
+  }
+
+  private final DataStorageFormat storageFormat;
+
+  public FullSyncChainDownloaderTest(final DataStorageFormat storageFormat) {
+    this.storageFormat = storageFormat;
+  }
+
   @Before
   public void setupTest() {
     gen = new BlockDataGenerator();
-    localBlockchainSetup = BlockchainSetupUtil.forTesting();
+    localBlockchainSetup = BlockchainSetupUtil.forTesting(storageFormat);
     localBlockchain = localBlockchainSetup.getBlockchain();
-    otherBlockchainSetup = BlockchainSetupUtil.forTesting();
+    otherBlockchainSetup = BlockchainSetupUtil.forTesting(storageFormat);
     otherBlockchain = otherBlockchainSetup.getBlockchain();
 
     protocolSchedule = localBlockchainSetup.getProtocolSchedule();
     protocolContext = localBlockchainSetup.getProtocolContext();
     ethProtocolManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             localBlockchain,
             new EthScheduler(1, 1, 1, 1, new NoOpMetricsSystem()),
             localBlockchainSetup.getWorldArchive(),
@@ -99,7 +118,13 @@ public void tearDown() {
 
   private ChainDownloader downloader(final SynchronizerConfiguration syncConfig) {
     return FullSyncChainDownloader.create(
-        syncConfig, protocolSchedule, protocolContext, ethContext, syncState, metricsSystem);
+        syncConfig,
+        protocolSchedule,
+        protocolContext,
+        ethContext,
+        syncState,
+        metricsSystem,
+        SyncTerminationCondition.never());
   }
 
   private ChainDownloader downloader() {
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloaderTotalTerminalDifficultyTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloaderTotalTerminalDifficultyTest.java
new file mode 100644
index 00000000000..1ec29f6994f
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncChainDownloaderTotalTerminalDifficultyTest.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.fullsync;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
+import org.hyperledger.besu.ethereum.eth.sync.ChainDownloader;
+import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.concurrent.CompletableFuture;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class FullSyncChainDownloaderTotalTerminalDifficultyTest {
+
+  protected ProtocolSchedule protocolSchedule;
+  protected EthProtocolManager ethProtocolManager;
+  protected EthContext ethContext;
+  protected ProtocolContext protocolContext;
+  private SyncState syncState;
+
+  private BlockchainSetupUtil localBlockchainSetup;
+  protected MutableBlockchain localBlockchain;
+  private BlockchainSetupUtil otherBlockchainSetup;
+  protected Blockchain otherBlockchain;
+  private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
+  private static final Difficulty TARGET_TERMINAL_DIFFICULTY = Difficulty.of(1_000_000L);
+
+  @Parameters
+  public static Collection<Object[]> data() {
+    return Arrays.asList(new Object[][] {{DataStorageFormat.BONSAI}, {DataStorageFormat.FOREST}});
+  }
+
+  private final DataStorageFormat storageFormat;
+
+  public FullSyncChainDownloaderTotalTerminalDifficultyTest(final DataStorageFormat storageFormat) {
+    this.storageFormat = storageFormat;
+  }
+
+  @Before
+  public void setupTest() {
+    localBlockchainSetup = BlockchainSetupUtil.forTesting(storageFormat);
+    localBlockchain = localBlockchainSetup.getBlockchain();
+    otherBlockchainSetup = BlockchainSetupUtil.forTesting(storageFormat);
+    otherBlockchain = otherBlockchainSetup.getBlockchain();
+
+    protocolSchedule = localBlockchainSetup.getProtocolSchedule();
+    protocolContext = localBlockchainSetup.getProtocolContext();
+    ethProtocolManager =
+        EthProtocolManagerTestUtil.create(
+            protocolSchedule,
+            localBlockchain,
+            new EthScheduler(1, 1, 1, 1, new NoOpMetricsSystem()),
+            localBlockchainSetup.getWorldArchive(),
+            localBlockchainSetup.getTransactionPool(),
+            EthProtocolConfiguration.defaultConfig());
+    ethContext = ethProtocolManager.ethContext();
+    syncState = new SyncState(protocolContext.getBlockchain(), ethContext.getEthPeers());
+  }
+
+  @After
+  public void tearDown() {
+    ethProtocolManager.stop();
+  }
+
+  private ChainDownloader downloader(
+      final SynchronizerConfiguration syncConfig,
+      final SyncTerminationCondition terminalCondition) {
+    return FullSyncChainDownloader.create(
+        syncConfig,
+        protocolSchedule,
+        protocolContext,
+        ethContext,
+        syncState,
+        metricsSystem,
+        terminalCondition);
+  }
+
+  private SynchronizerConfiguration.Builder syncConfigBuilder() {
+    return SynchronizerConfiguration.builder();
+  }
+
+  @Test
+  public void syncsFullyAndStopsWhenTTDReached() {
+    otherBlockchainSetup.importFirstBlocks(30);
+    final long targetBlock = otherBlockchain.getChainHeadBlockNumber();
+    // Sanity check
+    assertThat(targetBlock).isGreaterThan(localBlockchain.getChainHeadBlockNumber());
+
+    final RespondingEthPeer peer =
+        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, otherBlockchain);
+    final RespondingEthPeer.Responder responder =
+        RespondingEthPeer.blockchainResponder(otherBlockchain);
+
+    final SynchronizerConfiguration syncConfig =
+        syncConfigBuilder().downloaderChainSegmentSize(1).downloaderParallelism(1).build();
+    final ChainDownloader downloader =
+        downloader(
+            syncConfig,
+            SyncTerminationCondition.difficulty(TARGET_TERMINAL_DIFFICULTY, localBlockchain));
+    final CompletableFuture<Void> future = downloader.start();
+
+    assertThat(future.isDone()).isFalse();
+
+    peer.respondWhileOtherThreadsWork(responder, () -> syncState.syncTarget().isEmpty());
+    assertThat(syncState.syncTarget()).isPresent();
+    assertThat(syncState.syncTarget().get().peer()).isEqualTo(peer.getEthPeer());
+
+    peer.respondWhileOtherThreadsWork(responder, () -> !future.isDone());
+
+    assertThat(localBlockchain.getChainHead().getTotalDifficulty())
+        .isGreaterThan(TARGET_TERMINAL_DIFFICULTY);
+
+    assertThat(future.isDone()).isTrue();
+  }
+
+  @Test
+  public void syncsFullyAndContinuesWhenTTDNotSpecified() {
+    otherBlockchainSetup.importFirstBlocks(30);
+    final long targetBlock = otherBlockchain.getChainHeadBlockNumber();
+    // Sanity check
+    assertThat(targetBlock).isGreaterThan(localBlockchain.getChainHeadBlockNumber());
+
+    final RespondingEthPeer peer =
+        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, otherBlockchain);
+    final RespondingEthPeer.Responder responder =
+        RespondingEthPeer.blockchainResponder(otherBlockchain);
+
+    final SynchronizerConfiguration syncConfig =
+        syncConfigBuilder().downloaderChainSegmentSize(1).downloaderParallelism(1).build();
+    final ChainDownloader downloader = downloader(syncConfig, SyncTerminationCondition.never());
+    final CompletableFuture<Void> future = downloader.start();
+
+    assertThat(future.isDone()).isFalse();
+
+    peer.respondWhileOtherThreadsWork(responder, () -> !syncState.syncTarget().isPresent());
+    assertThat(syncState.syncTarget()).isPresent();
+    assertThat(syncState.syncTarget().get().peer()).isEqualTo(peer.getEthPeer());
+
+    peer.respondWhileOtherThreadsWork(
+        responder, () -> localBlockchain.getChainHeadBlockNumber() < targetBlock);
+
+    assertThat(localBlockchain.getChainHeadBlockNumber()).isEqualTo(targetBlock);
+
+    assertThat(future.isDone()).isFalse();
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncDownloaderTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncDownloaderTest.java
index 05511a4ef48..65e81aafe32 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncDownloaderTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncDownloaderTest.java
@@ -29,13 +29,21 @@
 import org.hyperledger.besu.ethereum.eth.sync.TrailingPeerRequirements;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
+import java.util.Arrays;
+import java.util.Collection;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 
+@RunWith(Parameterized.class)
 public class FullSyncDownloaderTest {
 
   protected ProtocolSchedule protocolSchedule;
@@ -48,15 +56,27 @@ public class FullSyncDownloaderTest {
   protected MutableBlockchain localBlockchain;
   private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
 
+  @Parameters
+  public static Collection<Object[]> data() {
+    return Arrays.asList(new Object[][] {{DataStorageFormat.BONSAI}, {DataStorageFormat.FOREST}});
+  }
+
+  private final DataStorageFormat storageFormat;
+
+  public FullSyncDownloaderTest(final DataStorageFormat storageFormat) {
+    this.storageFormat = storageFormat;
+  }
+
   @Before
   public void setupTest() {
-    localBlockchainSetup = BlockchainSetupUtil.forTesting();
+    localBlockchainSetup = BlockchainSetupUtil.forTesting(storageFormat);
     localBlockchain = localBlockchainSetup.getBlockchain();
 
     protocolSchedule = localBlockchainSetup.getProtocolSchedule();
     protocolContext = localBlockchainSetup.getProtocolContext();
     ethProtocolManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             localBlockchain,
             new EthScheduler(1, 1, 1, 1, new NoOpMetricsSystem()),
             localBlockchainSetup.getWorldArchive(),
@@ -73,7 +93,13 @@ public void tearDown() {
 
   private FullSyncDownloader downloader(final SynchronizerConfiguration syncConfig) {
     return new FullSyncDownloader(
-        syncConfig, protocolSchedule, protocolContext, ethContext, syncState, metricsSystem);
+        syncConfig,
+        protocolSchedule,
+        protocolContext,
+        ethContext,
+        syncState,
+        metricsSystem,
+        SyncTerminationCondition.never());
   }
 
   @Test
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncTargetManagerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncTargetManagerTest.java
index a45aaea5dd7..29d9baca5e0 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncTargetManagerTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fullsync/FullSyncTargetManagerTest.java
@@ -21,6 +21,7 @@
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockchainSetupUtil;
 import org.hyperledger.besu.ethereum.core.Difficulty;
 import org.hyperledger.besu.ethereum.core.ProtocolScheduleFixture;
@@ -33,16 +34,22 @@
 import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncTarget;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
+@RunWith(Parameterized.class)
 public class FullSyncTargetManagerTest {
 
   private EthProtocolManager ethProtocolManager;
@@ -52,20 +59,32 @@ public class FullSyncTargetManagerTest {
   private RespondingEthPeer.Responder responder;
   private FullSyncTargetManager syncTargetManager;
 
+  @Parameterized.Parameters
+  public static Collection<Object[]> data() {
+    return Arrays.asList(new Object[][] {{DataStorageFormat.BONSAI}, {DataStorageFormat.FOREST}});
+  }
+
+  private final DataStorageFormat storageFormat;
+
+  public FullSyncTargetManagerTest(final DataStorageFormat storageFormat) {
+    this.storageFormat = storageFormat;
+  }
+
   @Before
   public void setup() {
-    final BlockchainSetupUtil otherBlockchainSetup = BlockchainSetupUtil.forTesting();
+    final BlockchainSetupUtil otherBlockchainSetup = BlockchainSetupUtil.forTesting(storageFormat);
     final Blockchain otherBlockchain = otherBlockchainSetup.getBlockchain();
     responder = RespondingEthPeer.blockchainResponder(otherBlockchain);
 
-    final BlockchainSetupUtil localBlockchainSetup = BlockchainSetupUtil.forTesting();
+    final BlockchainSetupUtil localBlockchainSetup = BlockchainSetupUtil.forTesting(storageFormat);
     localBlockchain = localBlockchainSetup.getBlockchain();
 
     final ProtocolSchedule protocolSchedule = ProtocolScheduleFixture.MAINNET;
     final ProtocolContext protocolContext =
-        new ProtocolContext(localBlockchain, localWorldState, null);
+        new ProtocolContext(localBlockchain, localWorldState, null, Optional.empty());
     ethProtocolManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             localBlockchain,
             new EthScheduler(1, 1, 1, 1, new NoOpMetricsSystem()),
             localWorldState,
@@ -80,7 +99,8 @@ public void setup() {
             protocolSchedule,
             protocolContext,
             ethContext,
-            new NoOpMetricsSystem());
+            new NoOpMetricsSystem(),
+            SyncTerminationCondition.never());
   }
 
   @After
@@ -90,12 +110,14 @@ public void tearDown() {
 
   @Test
   public void findSyncTarget_withHeightEstimates() {
-    when(localWorldState.isWorldStateAvailable(localBlockchain.getChainHeadHeader().getStateRoot()))
+    final BlockHeader chainHeadHeader = localBlockchain.getChainHeadHeader();
+    when(localWorldState.isWorldStateAvailable(
+            chainHeadHeader.getStateRoot(), chainHeadHeader.getHash()))
         .thenReturn(true);
     final RespondingEthPeer bestPeer =
         EthProtocolManagerTestUtil.createPeer(ethProtocolManager, Difficulty.MAX_VALUE, 4);
 
-    final CompletableFuture<SyncTarget> result = syncTargetManager.findSyncTarget(Optional.empty());
+    final CompletableFuture<SyncTarget> result = syncTargetManager.findSyncTarget();
     bestPeer.respond(responder);
 
     assertThat(result)
@@ -105,12 +127,14 @@ public void findSyncTarget_withHeightEstimates() {
 
   @Test
   public void findSyncTarget_noHeightEstimates() {
-    when(localWorldState.isWorldStateAvailable(localBlockchain.getChainHeadHeader().getStateRoot()))
+    final BlockHeader chainHeadHeader = localBlockchain.getChainHeadHeader();
+    when(localWorldState.isWorldStateAvailable(
+            chainHeadHeader.getStateRoot(), chainHeadHeader.getHash()))
         .thenReturn(true);
     final RespondingEthPeer bestPeer =
         EthProtocolManagerTestUtil.createPeer(ethProtocolManager, Difficulty.MAX_VALUE, 0);
 
-    final CompletableFuture<SyncTarget> result = syncTargetManager.findSyncTarget(Optional.empty());
+    final CompletableFuture<SyncTarget> result = syncTargetManager.findSyncTarget();
     bestPeer.respond(responder);
 
     assertThat(result).isNotCompleted();
@@ -118,12 +142,14 @@ public void findSyncTarget_noHeightEstimates() {
 
   @Test
   public void shouldDisconnectPeerIfWorldStateIsUnavailableForCommonAncestor() {
-    when(localWorldState.isWorldStateAvailable(localBlockchain.getChainHeadHeader().getStateRoot()))
+    final BlockHeader chainHeadHeader = localBlockchain.getChainHeadHeader();
+    when(localWorldState.isWorldStateAvailable(
+            chainHeadHeader.getStateRoot(), chainHeadHeader.getHash()))
         .thenReturn(false);
     final RespondingEthPeer bestPeer =
         EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 20);
 
-    final CompletableFuture<SyncTarget> result = syncTargetManager.findSyncTarget(Optional.empty());
+    final CompletableFuture<SyncTarget> result = syncTargetManager.findSyncTarget();
 
     bestPeer.respond(responder);
 
@@ -133,12 +159,14 @@ public void shouldDisconnectPeerIfWorldStateIsUnavailableForCommonAncestor() {
 
   @Test
   public void shouldAllowSyncTargetWhenIfWorldStateIsAvailableForCommonAncestor() {
-    when(localWorldState.isWorldStateAvailable(localBlockchain.getChainHeadHeader().getStateRoot()))
+    final BlockHeader chainHeadHeader = localBlockchain.getChainHeadHeader();
+    when(localWorldState.isWorldStateAvailable(
+            chainHeadHeader.getStateRoot(), chainHeadHeader.getHash()))
         .thenReturn(true);
     final RespondingEthPeer bestPeer =
         EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 20);
 
-    final CompletableFuture<SyncTarget> result = syncTargetManager.findSyncTarget(Optional.empty());
+    final CompletableFuture<SyncTarget> result = syncTargetManager.findSyncTarget();
 
     bestPeer.respond(responder);
 
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/CompleteTaskStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/CompleteTaskStepTest.java
new file mode 100644
index 00000000000..6a1f7c9d045
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/CompleteTaskStepTest.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.services.tasks.Task;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Before;
+import org.junit.Test;
+
+public class CompleteTaskStepTest {
+
+  private static final Hash HASH = Hash.hash(Bytes.of(1, 2, 3));
+
+  private final SnapSyncProcessState snapSyncState = mock(SnapSyncProcessState.class);
+  private final SnapWorldDownloadState downloadState = mock(SnapWorldDownloadState.class);
+
+  private final BlockHeader blockHeader =
+      new BlockHeaderTestFixture().stateRoot(HASH).buildHeader();
+
+  private final CompleteTaskStep completeTaskStep =
+      new CompleteTaskStep(snapSyncState, new NoOpMetricsSystem());
+
+  @Before
+  public void setup() {
+    when(snapSyncState.getPivotBlockHeader()).thenReturn(Optional.of(blockHeader));
+  }
+
+  @Test
+  public void shouldMarkAccountTrieNodeTaskAsFailedIfItDoesNotHaveData() {
+    final StubTask task =
+        new StubTask(
+            SnapDataRequest.createAccountTrieNodeDataRequest(HASH, Bytes.EMPTY, new HashSet<>()));
+
+    completeTaskStep.markAsCompleteOrFailed(downloadState, task);
+
+    assertThat(task.isCompleted()).isFalse();
+    assertThat(task.isFailed()).isTrue();
+    verify(downloadState).notifyTaskAvailable();
+    verify(downloadState, never()).checkCompletion(blockHeader);
+  }
+
+  @Test
+  public void shouldMarkAccountTrieNodeTaskCompleteIfItDoesNotHaveDataAndExpired() {
+    final StubTask task =
+        new StubTask(
+            SnapDataRequest.createAccountTrieNodeDataRequest(HASH, Bytes.EMPTY, new HashSet<>()));
+
+    when(snapSyncState.isExpired(any())).thenReturn(true);
+
+    completeTaskStep.markAsCompleteOrFailed(downloadState, task);
+
+    assertThat(task.isCompleted()).isTrue();
+    verify(downloadState).notifyTaskAvailable();
+    verify(downloadState).checkCompletion(blockHeader);
+  }
+
+  @Test
+  public void shouldMarkStorageTrieNodeTaskAsFailedIfItDoesNotHaveData() {
+    final StubTask task =
+        new StubTask(
+            SnapDataRequest.createStorageTrieNodeDataRequest(HASH, HASH, HASH, Bytes.EMPTY));
+
+    completeTaskStep.markAsCompleteOrFailed(downloadState, task);
+
+    assertThat(task.isCompleted()).isFalse();
+    assertThat(task.isFailed()).isTrue();
+
+    verify(downloadState, never()).checkCompletion(blockHeader);
+  }
+
+  @Test
+  public void shouldMarkStorageTrieNodeTaskCompleteIfItDoesNotHaveDataAndExpired() {
+    final StubTask task =
+        new StubTask(
+            SnapDataRequest.createStorageTrieNodeDataRequest(HASH, HASH, HASH, Bytes.EMPTY));
+
+    when(snapSyncState.isExpired(any())).thenReturn(true);
+
+    completeTaskStep.markAsCompleteOrFailed(downloadState, task);
+
+    assertThat(task.isCompleted()).isTrue();
+    assertThat(task.isFailed()).isFalse();
+
+    verify(downloadState).checkCompletion(blockHeader);
+  }
+
+  @Test
+  public void shouldMarkSnapsyncTaskCompleteWhenData() {
+    final List<Task<SnapDataRequest>> requests = TaskGenerator.createAccountRequest(true);
+    requests.stream()
+        .map(StubTask.class::cast)
+        .forEach(
+            snapDataRequestTask -> {
+              completeTaskStep.markAsCompleteOrFailed(downloadState, snapDataRequestTask);
+
+              assertThat(snapDataRequestTask.isCompleted()).isTrue();
+              assertThat(snapDataRequestTask.isFailed()).isFalse();
+            });
+    verify(downloadState, times(3)).checkCompletion(blockHeader);
+    verify(downloadState, times(3)).notifyTaskAvailable();
+  }
+
+  @Test
+  public void shouldMarkSnapsyncTaskAsFailedWhenNoData() {
+    final List<Task<SnapDataRequest>> requests = TaskGenerator.createAccountRequest(false);
+    requests.stream()
+        .map(StubTask.class::cast)
+        .forEach(
+            snapDataRequestTask -> {
+              completeTaskStep.markAsCompleteOrFailed(downloadState, snapDataRequestTask);
+
+              assertThat(snapDataRequestTask.isCompleted()).isFalse();
+              assertThat(snapDataRequestTask.isFailed()).isTrue();
+            });
+
+    verify(downloadState, times(3)).notifyTaskAvailable();
+    verify(downloadState, never()).checkCompletion(blockHeader);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/DynamicPivotBlockManagerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/DynamicPivotBlockManagerTest.java
new file mode 100644
index 00000000000..4e413f263f7
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/DynamicPivotBlockManagerTest.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import static java.util.concurrent.CompletableFuture.completedFuture;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.eth.manager.DeterministicEthScheduler;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncActions;
+import org.hyperledger.besu.ethereum.eth.sync.fastsync.FastSyncState;
+import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
+
+import java.util.OptionalLong;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class DynamicPivotBlockManagerTest {
+
+  private final SnapSyncProcessState snapSyncState = mock(SnapSyncProcessState.class);
+  private final FastSyncActions fastSyncActions = mock(FastSyncActions.class);
+  private final SyncState syncState = mock(SyncState.class);
+  private final EthContext ethContext = mock(EthContext.class);
+  private DynamicPivotBlockSelector dynamicPivotBlockManager;
+
+  @Before
+  public void setup() {
+    when(fastSyncActions.getSyncState()).thenReturn(syncState);
+    when(ethContext.getScheduler()).thenReturn(new DeterministicEthScheduler());
+    dynamicPivotBlockManager =
+        new DynamicPivotBlockSelector(
+            ethContext,
+            fastSyncActions,
+            snapSyncState,
+            SnapSyncConfiguration.DEFAULT_PIVOT_BLOCK_WINDOW_VALIDITY,
+            SnapSyncConfiguration.DEFAULT_PIVOT_BLOCK_DISTANCE_BEFORE_CACHING);
+  }
+
+  @Test
+  public void shouldNotSearchNewPivotBlockWhenCloseToTheHead() {
+
+    when(syncState.bestChainHeight()).thenReturn(1000L);
+
+    when(snapSyncState.getPivotBlockNumber()).thenReturn(OptionalLong.of(999));
+    dynamicPivotBlockManager.check(
+        (blockHeader, newBlockFound) -> assertThat(newBlockFound).isFalse());
+  }
+
+  @Test
+  public void shouldSearchNewPivotBlockWhenNotCloseToTheHead() {
+    final FastSyncState selectPivotBlockState = new FastSyncState(1090);
+    final BlockHeader pivotBlockHeader = new BlockHeaderTestFixture().number(1090).buildHeader();
+    final FastSyncState downloadPivotBlockHeaderState = new FastSyncState(pivotBlockHeader);
+    when(fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE))
+        .thenReturn(completedFuture(selectPivotBlockState));
+    when(fastSyncActions.downloadPivotBlockHeader(selectPivotBlockState))
+        .thenReturn(completedFuture(downloadPivotBlockHeaderState));
+
+    when(syncState.bestChainHeight()).thenReturn(1000L);
+
+    when(snapSyncState.getPivotBlockNumber()).thenReturn(OptionalLong.of(939));
+    dynamicPivotBlockManager.check(
+        (blockHeader, newBlockFound) -> assertThat(newBlockFound).isFalse());
+  }
+
+  @Test
+  public void shouldSwitchToNewPivotBlockWhenNeeded() {
+    final FastSyncState selectPivotBlockState = new FastSyncState(1060);
+    final BlockHeader pivotBlockHeader = new BlockHeaderTestFixture().number(1060).buildHeader();
+    final FastSyncState downloadPivotBlockHeaderState = new FastSyncState(pivotBlockHeader);
+    when(fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE))
+        .thenReturn(completedFuture(selectPivotBlockState));
+    when(fastSyncActions.downloadPivotBlockHeader(selectPivotBlockState))
+        .thenReturn(completedFuture(downloadPivotBlockHeaderState));
+    when(fastSyncActions.getBestChainHeight()).thenReturn(1000L);
+
+    when(snapSyncState.getPivotBlockNumber()).thenReturn(OptionalLong.of(939));
+    dynamicPivotBlockManager.check(
+        (blockHeader, newBlockFound) -> {
+          assertThat(blockHeader.getNumber()).isEqualTo(939);
+          assertThat(newBlockFound).isFalse();
+        });
+
+    when(fastSyncActions.getBestChainHeight()).thenReturn(1066L);
+
+    dynamicPivotBlockManager.check(
+        (blockHeader, newBlockFound) -> {
+          assertThat(blockHeader.getNumber()).isEqualTo(pivotBlockHeader.getNumber());
+          assertThat(newBlockFound).isTrue();
+        });
+
+    verify(snapSyncState).setCurrentHeader(pivotBlockHeader);
+  }
+
+  @Test
+  public void shouldSwitchToNewPivotOnlyOnce() {
+    final FastSyncState selectPivotBlockState = new FastSyncState(1060);
+    final BlockHeader pivotBlockHeader = new BlockHeaderTestFixture().number(1060).buildHeader();
+    final FastSyncState downloadPivotBlockHeaderState = new FastSyncState(pivotBlockHeader);
+    when(fastSyncActions.selectPivotBlock(FastSyncState.EMPTY_SYNC_STATE))
+        .thenReturn(completedFuture(selectPivotBlockState));
+    when(fastSyncActions.downloadPivotBlockHeader(selectPivotBlockState))
+        .thenReturn(completedFuture(downloadPivotBlockHeaderState));
+
+    when(syncState.bestChainHeight()).thenReturn(1066L);
+
+    dynamicPivotBlockManager.check(
+        (blockHeader, newBlockFound) -> {
+          assertThat(blockHeader.getNumber()).isEqualTo(pivotBlockHeader.getNumber());
+          assertThat(newBlockFound).isTrue();
+          dynamicPivotBlockManager.check(
+              (blockHeader1, aBoolean) -> {
+                assertThat(blockHeader1.getNumber()).isEqualTo(939);
+                assertThat(aBoolean).isFalse();
+              });
+        });
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/LoadLocalDataStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/LoadLocalDataStepTest.java
new file mode 100644
index 00000000000..a8562985365
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/LoadLocalDataStepTest.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.metrics.noop.NoOpMetricsSystem.NO_OP_COUNTER;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.heal.AccountTrieNodeHealingRequest;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.services.pipeline.Pipe;
+import org.hyperledger.besu.services.tasks.Task;
+
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class LoadLocalDataStepTest {
+
+  private static final Bytes DATA = Bytes.of(1, 2, 3);
+  private static final Hash HASH = Hash.hash(DATA);
+
+  private final BlockHeader blockHeader =
+      new BlockHeaderTestFixture().stateRoot(HASH).buildHeader();
+  private final AccountTrieNodeHealingRequest request =
+      SnapDataRequest.createAccountTrieNodeDataRequest(
+          HASH, Bytes.fromHexString("0x01"), new HashSet<>());
+  private final Task<SnapDataRequest> task = new StubTask(request);
+
+  private final Pipe<Task<SnapDataRequest>> completedTasks =
+      new Pipe<>(10, NO_OP_COUNTER, NO_OP_COUNTER, NO_OP_COUNTER);
+
+  private final SnapSyncProcessState snapSyncState = mock(SnapSyncProcessState.class);
+  private final SnapWorldDownloadState downloadState = mock(SnapWorldDownloadState.class);
+  private final WorldStateStorage worldStateStorage = mock(WorldStateStorage.class);
+  private final WorldStateStorage.Updater updater = mock(WorldStateStorage.Updater.class);
+
+  private final SnapSyncConfiguration snapSyncConfiguration = mock(SnapSyncConfiguration.class);
+
+  private final LoadLocalDataStep loadLocalDataStep =
+      new LoadLocalDataStep(
+          worldStateStorage,
+          downloadState,
+          snapSyncConfiguration,
+          new NoOpMetricsSystem(),
+          snapSyncState);
+
+  @Before
+  public void setup() {
+    when(snapSyncState.hasPivotBlockHeader()).thenReturn(true);
+    when(snapSyncState.getPivotBlockHeader()).thenReturn(Optional.of(blockHeader));
+  }
+
+  @Test
+  public void shouldReturnStreamWithUnchangedTaskWhenDataNotPresent() {
+
+    final Stream<Task<SnapDataRequest>> output =
+        loadLocalDataStep.loadLocalDataTrieNode(task, completedTasks);
+
+    assertThat(completedTasks.poll()).isNull();
+    assertThat(output).containsExactly(task);
+  }
+
+  @Test
+  public void shouldReturnStreamWithSameRootHashTaskWhenDataArePresent() {
+
+    task.getData().setRootHash(blockHeader.getStateRoot());
+
+    when(worldStateStorage.getAccountStateTrieNode(any(), any())).thenReturn(Optional.of(DATA));
+    when(worldStateStorage.updater()).thenReturn(mock(WorldStateStorage.Updater.class));
+
+    final BlockHeader newBlockHeader =
+        new BlockHeaderTestFixture().stateRoot(Hash.EMPTY).buildHeader();
+    when(snapSyncState.getPivotBlockHeader()).thenReturn(Optional.of(newBlockHeader));
+
+    loadLocalDataStep.loadLocalDataTrieNode(task, completedTasks);
+
+    assertThat(completedTasks.poll()).isEqualTo(task);
+    assertThat(task.getData().getRootHash()).isEqualTo(blockHeader.getStateRoot());
+  }
+
+  @Test
+  public void shouldReturnEmptyStreamAndSendTaskToCompletedPipeWhenDataIsPresent() {
+    when(worldStateStorage.getAccountStateTrieNode(any(), any())).thenReturn(Optional.of(DATA));
+    when(worldStateStorage.updater()).thenReturn(updater);
+
+    final Stream<Task<SnapDataRequest>> output =
+        loadLocalDataStep.loadLocalDataTrieNode(task, completedTasks);
+
+    assertThat(completedTasks.poll()).isSameAs(task);
+    assertThat(request.isResponseReceived()).isTrue();
+    assertThat(output).isEmpty();
+
+    verify(updater).commit();
+    Mockito.reset(updater);
+
+    // Should not require persisting.
+    request.persist(
+        worldStateStorage, updater, downloadState, snapSyncState, snapSyncConfiguration);
+    verifyNoInteractions(updater);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/PersistDataStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/PersistDataStepTest.java
new file mode 100644
index 00000000000..81e036af7b6
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/PersistDataStepTest.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.AccountRangeDataRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.BytecodeRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.StorageRangeDataRequest;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.services.tasks.Task;
+
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Before;
+import org.junit.Test;
+
+public class PersistDataStepTest {
+
+  private final WorldStateStorage worldStateStorage =
+      new InMemoryKeyValueStorageProvider().createWorldStateStorage(DataStorageFormat.FOREST);
+  private final SnapSyncProcessState snapSyncState = mock(SnapSyncProcessState.class);
+  private final SnapWorldDownloadState downloadState = mock(SnapWorldDownloadState.class);
+
+  private final SnapSyncConfiguration snapSyncConfiguration = mock(SnapSyncConfiguration.class);
+
+  private final PersistDataStep persistDataStep =
+      new PersistDataStep(snapSyncState, worldStateStorage, downloadState, snapSyncConfiguration);
+
+  @Before
+  public void setUp() {
+    when(downloadState.getMetricsManager()).thenReturn(mock(SnapsyncMetricsManager.class));
+  }
+
+  @Test
+  public void shouldPersistDataWhenPresent() {
+    final List<Task<SnapDataRequest>> tasks = TaskGenerator.createAccountRequest(true);
+    final List<Task<SnapDataRequest>> result = persistDataStep.persist(tasks);
+
+    assertThat(result).isSameAs(tasks);
+
+    assertDataPersisted(tasks);
+  }
+
+  @Test
+  public void shouldSkipPersistDataWhenNoData() {
+    final List<Task<SnapDataRequest>> tasks = TaskGenerator.createAccountRequest(false);
+    final List<Task<SnapDataRequest>> result = persistDataStep.persist(tasks);
+
+    assertThat(result).isSameAs(tasks);
+    assertThat(worldStateStorage.getNodeData(Bytes.EMPTY, tasks.get(0).getData().getRootHash()))
+        .isEmpty();
+  }
+
+  private void assertDataPersisted(final List<Task<SnapDataRequest>> tasks) {
+    tasks.forEach(
+        task -> {
+          if (task.getData() instanceof AccountRangeDataRequest) {
+            final AccountRangeDataRequest data = (AccountRangeDataRequest) task.getData();
+            StoredMerklePatriciaTrie<Bytes, Bytes> trie =
+                new StoredMerklePatriciaTrie<>(
+                    worldStateStorage::getAccountStateTrieNode, data.getRootHash(), b -> b, b -> b);
+            data.getAccounts().forEach((key, value) -> assertThat(trie.get(key)).isPresent());
+          } else if (task.getData() instanceof StorageRangeDataRequest) {
+            final StorageRangeDataRequest data = (StorageRangeDataRequest) task.getData();
+            final StoredMerklePatriciaTrie<Bytes, Bytes> trie =
+                new StoredMerklePatriciaTrie<>(
+                    (location, hash) ->
+                        worldStateStorage.getAccountStorageTrieNode(
+                            Hash.wrap(data.getAccountHash()), location, hash),
+                    data.getStorageRoot(),
+                    b -> b,
+                    b -> b);
+            data.getSlots().forEach((key, value) -> assertThat(trie.get(key)).isPresent());
+          } else if (task.getData() instanceof BytecodeRequest) {
+            final BytecodeRequest data = (BytecodeRequest) task.getData();
+            assertThat(
+                    worldStateStorage.getCode(data.getCodeHash(), Hash.wrap(data.getAccountHash())))
+                .isPresent();
+          } else {
+            fail("not expected message");
+          }
+        });
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/RangeManagerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/RangeManagerTest.java
new file mode 100644
index 00000000000..4e065c8ef22
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/RangeManagerTest.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.TrieGenerator;
+import org.hyperledger.besu.ethereum.proof.WorldStateProofProvider;
+import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.RangeStorageEntriesCollector;
+import org.hyperledger.besu.ethereum.trie.TrieIterator;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.TreeMap;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.Test;
+
+public final class RangeManagerTest {
+
+  @Test
+  public void testRemainingRangesEqualToOneWhenFirstRangeContainsMoreThanHalf() {
+    TreeMap<Bytes32, Bytes> items = new TreeMap<>();
+    items.put(Bytes32.repeat((byte) 0xbb), Bytes.wrap(new byte[] {0x03}));
+    int nbRanges =
+        RangeManager.getRangeCount(RangeManager.MIN_RANGE, RangeManager.MAX_RANGE, items);
+    assertThat(nbRanges).isEqualTo(1);
+  }
+
+  @Test
+  public void testRemainingRangesEqualToOneWhenFirstRangeContainsLessThanHalf() {
+    TreeMap<Bytes32, Bytes> items = new TreeMap<>();
+    items.put(Bytes32.repeat((byte) 0x77), Bytes.wrap(new byte[] {0x03}));
+    int nbRanges =
+        RangeManager.getRangeCount(RangeManager.MIN_RANGE, RangeManager.MAX_RANGE, items);
+    assertThat(nbRanges).isEqualTo(2);
+  }
+
+  @Test
+  public void testGenerateAllRangesWithSize1() {
+    final Map<Bytes32, Bytes32> expectedResult = new HashMap<>();
+    expectedResult.put(
+        Bytes32.fromHexString("0x0000000000000000000000000000000000000000000000000000000000000000"),
+        Bytes32.fromHexString(
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"));
+    final Map<Bytes32, Bytes32> ranges = RangeManager.generateAllRanges(1);
+    assertThat(ranges.size()).isEqualTo(1);
+    assertThat(ranges).isEqualTo(expectedResult);
+  }
+
+  @Test
+  public void testGenerateAllRangesWithSize3() {
+    final Map<Bytes32, Bytes32> expectedResult = new HashMap<>();
+    expectedResult.put(
+        Bytes32.fromHexString("0x0000000000000000000000000000000000000000000000000000000000000000"),
+        Bytes32.fromHexString(
+            "0x5555555555555555555555555555555555555555555555555555555555555555"));
+    expectedResult.put(
+        Bytes32.fromHexString("0x5555555555555555555555555555555555555555555555555555555555555556"),
+        Bytes32.fromHexString(
+            "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab"));
+    expectedResult.put(
+        Bytes32.fromHexString("0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaac"),
+        Bytes32.fromHexString(
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"));
+    final Map<Bytes32, Bytes32> ranges = RangeManager.generateAllRanges(3);
+    assertThat(ranges.size()).isEqualTo(3);
+    assertThat(ranges).isEqualTo(expectedResult);
+  }
+
+  @Test
+  public void testGenerateRangesWithSize3() {
+    final Map<Bytes32, Bytes32> expectedResult = new HashMap<>();
+    expectedResult.put(
+        Bytes32.fromHexString("0x0000000000000000000000000000000000000000000000000000000000000000"),
+        Bytes32.fromHexString(
+            "0x5555555555555555555555555555555555555555555555555555555555555555"));
+    expectedResult.put(
+        Bytes32.fromHexString("0x5555555555555555555555555555555555555555555555555555555555555556"),
+        Bytes32.fromHexString(
+            "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab"));
+    expectedResult.put(
+        Bytes32.fromHexString("0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaac"),
+        Bytes32.fromHexString(
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"));
+    final Map<Bytes32, Bytes32> ranges =
+        RangeManager.generateRanges(
+            Bytes32.fromHexString(
+                "0x0000000000000000000000000000000000000000000000000000000000000000"),
+            Bytes32.fromHexString(
+                "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"),
+            3);
+    assertThat(ranges.size()).isEqualTo(3);
+    assertThat(ranges).isEqualTo(expectedResult);
+  }
+
+  @Test
+  public void testFindNewBeginElement() {
+
+    final WorldStateStorage worldStateStorage =
+        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+
+    final MerkleTrie<Bytes, Bytes> accountStateTrie =
+        TrieGenerator.generateTrie(worldStateStorage, 15);
+
+    final RangeStorageEntriesCollector collector =
+        RangeStorageEntriesCollector.createCollector(
+            Hash.ZERO, RangeManager.MAX_RANGE, 10, Integer.MAX_VALUE);
+    final TrieIterator<Bytes> visitor = RangeStorageEntriesCollector.createVisitor(collector);
+    final TreeMap<Bytes32, Bytes> accounts =
+        (TreeMap<Bytes32, Bytes>)
+            accountStateTrie.entriesFrom(
+                root ->
+                    RangeStorageEntriesCollector.collectEntries(
+                        collector, visitor, root, Hash.ZERO));
+
+    final WorldStateProofProvider worldStateProofProvider =
+        new WorldStateProofProvider(worldStateStorage);
+
+    // generate the proof
+    final List<Bytes> proofs =
+        worldStateProofProvider.getAccountProofRelatedNodes(
+            Hash.wrap(accountStateTrie.getRootHash()), Hash.ZERO);
+    proofs.addAll(
+        worldStateProofProvider.getAccountProofRelatedNodes(
+            Hash.wrap(accountStateTrie.getRootHash()), accounts.lastKey()));
+
+    final Optional<Bytes32> newBeginElementInRange =
+        RangeManager.findNewBeginElementInRange(
+            accountStateTrie.getRootHash(), proofs, accounts, RangeManager.MAX_RANGE);
+
+    assertThat(newBeginElementInRange)
+        .contains(Bytes32.leftPad(Bytes.wrap(Bytes.ofUnsignedShort(0x0b))));
+  }
+
+  @Test
+  public void testFindNewBeginElementWhenNothingIsMissing() {
+
+    final WorldStateStorage worldStateStorage =
+        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+
+    final MerkleTrie<Bytes, Bytes> accountStateTrie =
+        TrieGenerator.generateTrie(worldStateStorage, 15);
+
+    final RangeStorageEntriesCollector collector =
+        RangeStorageEntriesCollector.createCollector(
+            Hash.ZERO, RangeManager.MAX_RANGE, 15, Integer.MAX_VALUE);
+    final TrieIterator<Bytes> visitor = RangeStorageEntriesCollector.createVisitor(collector);
+    final TreeMap<Bytes32, Bytes> accounts =
+        (TreeMap<Bytes32, Bytes>)
+            accountStateTrie.entriesFrom(
+                root ->
+                    RangeStorageEntriesCollector.collectEntries(
+                        collector, visitor, root, Hash.ZERO));
+
+    final WorldStateProofProvider worldStateProofProvider =
+        new WorldStateProofProvider(worldStateStorage);
+
+    // generate the proof
+    final List<Bytes> proofs =
+        worldStateProofProvider.getAccountProofRelatedNodes(
+            Hash.wrap(accountStateTrie.getRootHash()), Hash.ZERO);
+    proofs.addAll(
+        worldStateProofProvider.getAccountProofRelatedNodes(
+            Hash.wrap(accountStateTrie.getRootHash()), accounts.lastKey()));
+
+    final Optional<Bytes32> newBeginElementInRange =
+        RangeManager.findNewBeginElementInRange(
+            accountStateTrie.getRootHash(), proofs, accounts, RangeManager.MAX_RANGE);
+
+    assertThat(newBeginElementInRange).isEmpty();
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapWorldDownloadStateTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapWorldDownloadStateTest.java
new file mode 100644
index 00000000000..ac513ebd97e
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/SnapWorldDownloadStateTest.java
@@ -0,0 +1,418 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import static java.util.Collections.emptyList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
+import org.hyperledger.besu.ethereum.chain.BlockAddedObserver;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.eth.manager.task.EthTask;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.context.SnapSyncStatePersistenceManager;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.BytecodeRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.ethereum.eth.sync.worldstate.WorldStateDownloadProcess;
+import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
+import org.hyperledger.besu.services.tasks.InMemoryTasksPriorityQueues;
+import org.hyperledger.besu.testutil.TestClock;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.BiConsumer;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@SuppressWarnings("unchecked")
+@RunWith(Parameterized.class)
+public class SnapWorldDownloadStateTest {
+
+  private static final Bytes ROOT_NODE_DATA = Bytes.of(1, 2, 3, 4);
+  private static final Hash ROOT_NODE_HASH = Hash.hash(ROOT_NODE_DATA);
+  private static final int MAX_REQUESTS_WITHOUT_PROGRESS = 10;
+  private static final long MIN_MILLIS_BEFORE_STALLING = 50_000;
+
+  private WorldStateStorage worldStateStorage;
+  private final BlockHeader header =
+      new BlockHeaderTestFixture().stateRoot(ROOT_NODE_HASH).buildHeader();
+  private final InMemoryTasksPriorityQueues<SnapDataRequest> pendingRequests =
+      new InMemoryTasksPriorityQueues<>();
+  private final WorldStateDownloadProcess worldStateDownloadProcess =
+      mock(WorldStateDownloadProcess.class);
+  private final SnapSyncProcessState snapSyncState = mock(SnapSyncProcessState.class);
+  private final SnapSyncStatePersistenceManager snapContext =
+      mock(SnapSyncStatePersistenceManager.class);
+  private final SnapsyncMetricsManager metricsManager = mock(SnapsyncMetricsManager.class);
+  private final Blockchain blockchain = mock(Blockchain.class);
+  private final DynamicPivotBlockSelector dynamicPivotBlockManager =
+      mock(DynamicPivotBlockSelector.class);
+
+  private final TestClock clock = new TestClock();
+  private SnapWorldDownloadState downloadState;
+
+  private CompletableFuture<Void> future;
+
+  @Parameterized.Parameters
+  public static Collection<Object[]> data() {
+    return Arrays.asList(
+        new Object[][] {
+          {DataStorageFormat.BONSAI, true},
+          {DataStorageFormat.BONSAI, false},
+          {DataStorageFormat.FOREST, false}
+        });
+  }
+
+  private final DataStorageFormat storageFormat;
+  private final boolean isFlatDbHealingEnabled;
+
+  public SnapWorldDownloadStateTest(
+      final DataStorageFormat storageFormat, final boolean isFlatDbHealingEnabled) {
+    this.storageFormat = storageFormat;
+    this.isFlatDbHealingEnabled = isFlatDbHealingEnabled;
+  }
+
+  @Before
+  public void setUp() {
+
+    when(metricsManager.getMetricsSystem()).thenReturn(new NoOpMetricsSystem());
+
+    if (storageFormat == DataStorageFormat.BONSAI) {
+      worldStateStorage =
+          new BonsaiWorldStateKeyValueStorage(
+              new InMemoryKeyValueStorageProvider(), new NoOpMetricsSystem());
+    } else {
+      worldStateStorage = new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+    }
+    downloadState =
+        new SnapWorldDownloadState(
+            worldStateStorage,
+            snapContext,
+            blockchain,
+            snapSyncState,
+            pendingRequests,
+            MAX_REQUESTS_WITHOUT_PROGRESS,
+            MIN_MILLIS_BEFORE_STALLING,
+            metricsManager,
+            clock);
+    final DynamicPivotBlockSelector dynamicPivotBlockManager =
+        mock(DynamicPivotBlockSelector.class);
+    doAnswer(
+            invocation -> {
+              BiConsumer<BlockHeader, Boolean> callback = invocation.getArgument(0);
+              callback.accept(header, false);
+              return null;
+            })
+        .when(dynamicPivotBlockManager)
+        .switchToNewPivotBlock(any());
+    downloadState.setPivotBlockSelector(dynamicPivotBlockManager);
+    downloadState.setRootNodeData(ROOT_NODE_DATA);
+    future = downloadState.getDownloadFuture();
+    assertThat(downloadState.isDownloading()).isTrue();
+  }
+
+  @Test
+  public void shouldCompleteReturnedFutureWhenNoPendingTasksRemain() {
+    when(snapSyncState.isHealTrieInProgress()).thenReturn(true);
+    when(snapSyncState.isHealFlatDatabaseInProgress()).thenReturn(true);
+    downloadState.checkCompletion(header);
+
+    assertThat(future).isCompleted();
+    assertThat(downloadState.isDownloading()).isFalse();
+  }
+
+  @Test
+  public void shouldStartHealWhenNoSnapsyncPendingTasksRemain() {
+    when(snapSyncState.isHealTrieInProgress()).thenReturn(false);
+    when(snapSyncState.getPivotBlockHeader()).thenReturn(Optional.of(mock(BlockHeader.class)));
+    assertThat(downloadState.pendingTrieNodeRequests.isEmpty()).isTrue();
+
+    downloadState.checkCompletion(header);
+    assertThat(downloadState.isDownloading()).isTrue();
+    assertThat(downloadState.pendingTrieNodeRequests.isEmpty()).isFalse();
+  }
+
+  @Test
+  public void shouldStoreRootNodeBeforeReturnedFutureCompletes() {
+    when(snapSyncState.isHealTrieInProgress()).thenReturn(true);
+    when(snapSyncState.isHealFlatDatabaseInProgress()).thenReturn(true);
+    final CompletableFuture<Void> postFutureChecks =
+        future.thenAccept(
+            result ->
+                assertThat(worldStateStorage.getAccountStateTrieNode(Bytes.EMPTY, ROOT_NODE_HASH))
+                    .contains(ROOT_NODE_DATA));
+
+    downloadState.checkCompletion(header);
+
+    assertThat(future).isCompleted();
+    assertThat(postFutureChecks).isCompleted();
+  }
+
+  @Test
+  public void shouldNotCompleteWhenThereAreAccountPendingTasks() {
+    when(snapSyncState.isHealTrieInProgress()).thenReturn(false);
+    downloadState.pendingAccountRequests.add(
+        SnapDataRequest.createAccountDataRequest(
+            Hash.EMPTY_TRIE_HASH,
+            Hash.wrap(Bytes32.random()),
+            RangeManager.MIN_RANGE,
+            RangeManager.MAX_RANGE));
+
+    downloadState.checkCompletion(header);
+
+    assertThat(future).isNotDone();
+    assertThat(worldStateStorage.getAccountStateTrieNode(Bytes.EMPTY, ROOT_NODE_HASH)).isEmpty();
+    assertThat(downloadState.isDownloading()).isTrue();
+  }
+
+  @Test
+  public void shouldNotCompleteWhenThereAreStoragePendingTasks() {
+    when(snapSyncState.isHealTrieInProgress()).thenReturn(false);
+    downloadState.pendingStorageRequests.add(
+        SnapDataRequest.createStorageTrieNodeDataRequest(
+            Hash.EMPTY_TRIE_HASH, Hash.wrap(Bytes32.random()), Hash.EMPTY_TRIE_HASH, Bytes.EMPTY));
+
+    downloadState.checkCompletion(header);
+
+    assertThat(future).isNotDone();
+    assertThat(worldStateStorage.getAccountStateTrieNode(Bytes.EMPTY, ROOT_NODE_HASH)).isEmpty();
+    assertThat(downloadState.isDownloading()).isTrue();
+
+    downloadState.pendingLargeStorageRequests.add(
+        SnapDataRequest.createStorageTrieNodeDataRequest(
+            Hash.EMPTY_TRIE_HASH, Hash.wrap(Bytes32.random()), Hash.EMPTY_TRIE_HASH, Bytes.EMPTY));
+
+    downloadState.checkCompletion(header);
+
+    assertThat(future).isNotDone();
+    assertThat(worldStateStorage.getAccountStateTrieNode(Bytes.EMPTY, ROOT_NODE_HASH)).isEmpty();
+    assertThat(downloadState.isDownloading()).isTrue();
+  }
+
+  @Test
+  public void shouldNotCompleteWhenThereAreTriePendingTasks() {
+    when(snapSyncState.isHealTrieInProgress()).thenReturn(true);
+    downloadState.pendingTrieNodeRequests.add(
+        SnapDataRequest.createAccountTrieNodeDataRequest(
+            Hash.wrap(Bytes32.random()), Bytes.EMPTY, new HashSet<>()));
+
+    downloadState.checkCompletion(header);
+
+    assertThat(future).isNotDone();
+    assertThat(worldStateStorage.getAccountStateTrieNode(Bytes.EMPTY, ROOT_NODE_HASH)).isEmpty();
+    assertThat(downloadState.isDownloading()).isTrue();
+  }
+
+  @Test
+  public void shouldNotCompleteWhenThereAreFlatDBHealingPendingTasks() {
+    when(snapSyncState.isHealTrieInProgress()).thenReturn(true);
+    when(snapSyncState.isHealFlatDatabaseInProgress()).thenReturn(true);
+    downloadState.pendingAccountFlatDatabaseHealingRequests.add(
+        SnapDataRequest.createAccountFlatHealingRangeRequest(
+            Hash.wrap(Bytes32.random()), Bytes32.ZERO, Bytes32.ZERO));
+
+    downloadState.checkCompletion(header);
+
+    assertThat(future).isNotDone();
+    assertThat(worldStateStorage.getAccountStateTrieNode(Bytes.EMPTY, ROOT_NODE_HASH)).isEmpty();
+    assertThat(downloadState.isDownloading()).isTrue();
+  }
+
+  @Test
+  public void shouldCancelOutstandingTasksWhenFutureIsCancelled() {
+    final EthTask<?> outstandingTask1 = mock(EthTask.class);
+    final EthTask<?> outstandingTask2 = mock(EthTask.class);
+    downloadState.addOutstandingTask(outstandingTask1);
+    downloadState.addOutstandingTask(outstandingTask2);
+
+    downloadState.pendingAccountRequests.add(
+        SnapDataRequest.createAccountDataRequest(
+            Hash.EMPTY_TRIE_HASH,
+            Hash.wrap(Bytes32.random()),
+            RangeManager.MIN_RANGE,
+            RangeManager.MAX_RANGE));
+    downloadState.pendingStorageRequests.add(
+        SnapDataRequest.createStorageTrieNodeDataRequest(
+            Hash.EMPTY_TRIE_HASH, Hash.wrap(Bytes32.random()), Hash.EMPTY_TRIE_HASH, Bytes.EMPTY));
+    downloadState.setWorldStateDownloadProcess(worldStateDownloadProcess);
+
+    future.cancel(true);
+
+    verify(outstandingTask1).cancel();
+    verify(outstandingTask2).cancel();
+
+    assertThat(downloadState.pendingAccountRequests.isEmpty()).isTrue();
+    assertThat(downloadState.pendingStorageRequests.isEmpty()).isTrue();
+    verify(worldStateDownloadProcess).abort();
+    assertThat(downloadState.isDownloading()).isFalse();
+  }
+
+  @Test
+  public void shouldRestartHealWhenNewPivotBlock() {
+    when(snapSyncState.getPivotBlockHeader()).thenReturn(Optional.of(mock(BlockHeader.class)));
+    when(snapSyncState.isHealTrieInProgress()).thenReturn(false);
+    assertThat(downloadState.pendingTrieNodeRequests.isEmpty()).isTrue();
+    // start heal
+    downloadState.checkCompletion(header);
+    verify(snapSyncState).setHealTrieStatus(true);
+    assertThat(downloadState.pendingTrieNodeRequests.isEmpty()).isFalse();
+    // add useless requests
+    downloadState.pendingTrieNodeRequests.add(
+        BytecodeRequest.createAccountTrieNodeDataRequest(Hash.EMPTY, Bytes.EMPTY, new HashSet<>()));
+    downloadState.pendingCodeRequests.add(
+        BytecodeRequest.createBytecodeRequest(Bytes32.ZERO, Hash.EMPTY, Bytes32.ZERO));
+    // reload the heal
+    downloadState.reloadTrieHeal();
+    verify(snapSyncState).setHealTrieStatus(false);
+    assertThat(downloadState.pendingTrieNodeRequests.size()).isEqualTo(1);
+    assertThat(downloadState.pendingCodeRequests.isEmpty()).isTrue();
+  }
+
+  @Test
+  public void shouldWaitingBlockchainWhenTooBehind() {
+    when(snapSyncState.isHealTrieInProgress()).thenReturn(true);
+
+    downloadState.setPivotBlockSelector(dynamicPivotBlockManager);
+    when(dynamicPivotBlockManager.isBlockchainBehind()).thenReturn(true);
+
+    downloadState.checkCompletion(header);
+
+    downloadState.checkCompletion(header);
+
+    // should register only one time
+    verify(blockchain, times(1)).observeBlockAdded(any());
+    verify(snapSyncState, atLeastOnce()).setWaitingBlockchain(true);
+
+    assertThat(future).isNotDone();
+    assertThat(worldStateStorage.getAccountStateTrieNode(Bytes.EMPTY, ROOT_NODE_HASH)).isEmpty();
+    assertThat(downloadState.isDownloading()).isTrue();
+  }
+
+  @Test
+  public void shouldStopWaitingBlockchainWhenNewPivotBlockAvailable() {
+
+    when(snapSyncState.isHealTrieInProgress()).thenReturn(true);
+
+    downloadState.setPivotBlockSelector(dynamicPivotBlockManager);
+    when(dynamicPivotBlockManager.isBlockchainBehind()).thenReturn(true);
+
+    downloadState.checkCompletion(header);
+
+    verify(snapSyncState).setWaitingBlockchain(true);
+    when(snapSyncState.isWaitingBlockchain()).thenReturn(true);
+
+    final BlockHeaderTestFixture blockHeaderTestFixture = new BlockHeaderTestFixture();
+    final BlockHeader newPivotBlock = blockHeaderTestFixture.number(550L).buildHeader();
+    doAnswer(
+            invocation -> {
+              BiConsumer<BlockHeader, Boolean> callback =
+                  invocation.getArgument(0, BiConsumer.class);
+              callback.accept(newPivotBlock, true);
+              return null;
+            })
+        .when(dynamicPivotBlockManager)
+        .check(any());
+
+    final BlockAddedObserver blockAddedListener = downloadState.getBlockAddedListener();
+    blockAddedListener.onBlockAdded(
+        BlockAddedEvent.createForHeadAdvancement(
+            new Block(
+                new BlockHeaderTestFixture().number(500).buildHeader(),
+                new BlockBody(emptyList(), emptyList())),
+            Collections.emptyList(),
+            Collections.emptyList()));
+
+    verify(snapSyncState).setWaitingBlockchain(false);
+  }
+
+  @Test
+  public void shouldStopWaitingBlockchainWhenCloseToTheHead() {
+
+    when(snapSyncState.isHealTrieInProgress()).thenReturn(true);
+
+    downloadState.setPivotBlockSelector(dynamicPivotBlockManager);
+    when(dynamicPivotBlockManager.isBlockchainBehind()).thenReturn(true);
+
+    downloadState.checkCompletion(header);
+
+    verify(snapSyncState).setWaitingBlockchain(true);
+    when(snapSyncState.isWaitingBlockchain()).thenReturn(true);
+
+    when(dynamicPivotBlockManager.isBlockchainBehind()).thenReturn(false);
+    final BlockAddedObserver blockAddedListener = downloadState.getBlockAddedListener();
+    blockAddedListener.onBlockAdded(
+        BlockAddedEvent.createForHeadAdvancement(
+            new Block(
+                new BlockHeaderTestFixture().number(500).buildHeader(),
+                new BlockBody(emptyList(), emptyList())),
+            Collections.emptyList(),
+            Collections.emptyList()));
+
+    verify(snapSyncState).setWaitingBlockchain(false);
+  }
+
+  @Test
+  public void shouldCompleteReturnedFutureWhenNoPendingTasksRemainAndFlatDBHealNotNeeded() {
+    Assume.assumeTrue(
+        storageFormat == DataStorageFormat.FOREST
+            || (storageFormat == DataStorageFormat.BONSAI && !isFlatDbHealingEnabled));
+    when(snapSyncState.isHealTrieInProgress()).thenReturn(true);
+    downloadState.checkCompletion(header);
+
+    assertThat(future).isCompleted();
+    assertThat(downloadState.isDownloading()).isFalse();
+  }
+
+  @Test
+  public void shouldNotCompleteReturnedFutureWhenNoPendingTasksRemainAndFlatDBHealNeeded() {
+    Assume.assumeTrue(storageFormat == DataStorageFormat.BONSAI);
+    Assume.assumeTrue(isFlatDbHealingEnabled);
+    ((BonsaiWorldStateKeyValueStorage) worldStateStorage).upgradeToFullFlatDbMode();
+    when(snapSyncState.isHealTrieInProgress()).thenReturn(true);
+    downloadState.checkCompletion(header);
+
+    assertThat(future).isNotDone();
+    verify(snapSyncState).setHealFlatDatabaseInProgress(true);
+    assertThat(worldStateStorage.getAccountStateTrieNode(Bytes.EMPTY, ROOT_NODE_HASH)).isEmpty();
+    assertThat(downloadState.isDownloading()).isTrue();
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/StackTrieTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/StackTrieTest.java
new file mode 100644
index 00000000000..26e5cd5af42
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/StackTrieTest.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.TrieGenerator;
+import org.hyperledger.besu.ethereum.proof.WorldStateProofProvider;
+import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.RangeStorageEntriesCollector;
+import org.hyperledger.besu.ethereum.trie.TrieIterator;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
+
+import java.util.List;
+import java.util.TreeMap;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+public class StackTrieTest {
+
+  final Bytes32 lastAccount = RangeManager.MIN_RANGE;
+
+  @Test
+  public void shouldNotSaveTheRootWhenIncomplete() {
+
+    final int nbAccounts = 15;
+
+    final WorldStateStorage worldStateStorage =
+        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+
+    final WorldStateStorage recreatedWorldStateStorage =
+        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+
+    final MerkleTrie<Bytes, Bytes> accountStateTrie =
+        TrieGenerator.generateTrie(worldStateStorage, nbAccounts);
+
+    final StackTrie stackTrie =
+        new StackTrie(Hash.wrap(accountStateTrie.getRootHash()), 0, 256, lastAccount);
+    stackTrie.addSegment();
+
+    final RangeStorageEntriesCollector collector =
+        RangeStorageEntriesCollector.createCollector(
+            lastAccount, RangeManager.MAX_RANGE, 5, Integer.MAX_VALUE);
+    final TrieIterator<Bytes> visitor = RangeStorageEntriesCollector.createVisitor(collector);
+    final TreeMap<Bytes32, Bytes> accounts =
+        (TreeMap<Bytes32, Bytes>)
+            accountStateTrie.entriesFrom(
+                root ->
+                    RangeStorageEntriesCollector.collectEntries(
+                        collector, visitor, root, lastAccount));
+
+    final WorldStateProofProvider worldStateProofProvider =
+        new WorldStateProofProvider(worldStateStorage);
+
+    // generate the proof
+    final List<Bytes> proofs =
+        worldStateProofProvider.getAccountProofRelatedNodes(
+            Hash.wrap(accountStateTrie.getRootHash()), lastAccount);
+    proofs.addAll(
+        worldStateProofProvider.getAccountProofRelatedNodes(
+            Hash.wrap(accountStateTrie.getRootHash()), accounts.lastKey()));
+
+    stackTrie.addElement(Bytes32.random(), proofs, accounts);
+
+    final WorldStateStorage.Updater updater = recreatedWorldStateStorage.updater();
+    stackTrie.commit(updater::putAccountStateTrieNode);
+    updater.commit();
+
+    Assertions.assertThat(
+            recreatedWorldStateStorage.getAccountStateTrieNode(
+                Bytes.EMPTY, accountStateTrie.getRootHash()))
+        .isEmpty();
+  }
+
+  @Test
+  public void shouldSaveTheRootWhenComplete() {
+
+    final int nbAccounts = 15;
+
+    final WorldStateStorage worldStateStorage =
+        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+
+    final WorldStateStorage recreatedWorldStateStorage =
+        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+
+    final MerkleTrie<Bytes, Bytes> accountStateTrie =
+        TrieGenerator.generateTrie(worldStateStorage, nbAccounts);
+
+    final StackTrie stackTrie =
+        new StackTrie(Hash.wrap(accountStateTrie.getRootHash()), 0, 256, lastAccount);
+
+    for (int i = 0; i < nbAccounts; i += 5) {
+      stackTrie.addSegment();
+      final RangeStorageEntriesCollector collector =
+          RangeStorageEntriesCollector.createCollector(
+              lastAccount, RangeManager.MAX_RANGE, 5, Integer.MAX_VALUE);
+      final TrieIterator<Bytes> visitor = RangeStorageEntriesCollector.createVisitor(collector);
+      final TreeMap<Bytes32, Bytes> accounts =
+          (TreeMap<Bytes32, Bytes>)
+              accountStateTrie.entriesFrom(
+                  root ->
+                      RangeStorageEntriesCollector.collectEntries(
+                          collector, visitor, root, lastAccount));
+
+      final WorldStateProofProvider worldStateProofProvider =
+          new WorldStateProofProvider(worldStateStorage);
+
+      // generate the proof
+      final List<Bytes> proofs =
+          worldStateProofProvider.getAccountProofRelatedNodes(
+              Hash.wrap(accountStateTrie.getRootHash()), lastAccount);
+      proofs.addAll(
+          worldStateProofProvider.getAccountProofRelatedNodes(
+              Hash.wrap(accountStateTrie.getRootHash()), accounts.lastKey()));
+
+      stackTrie.addElement(Bytes32.random(), proofs, accounts);
+
+      final WorldStateStorage.Updater updater = recreatedWorldStateStorage.updater();
+      stackTrie.commit(updater::putAccountStateTrieNode);
+      updater.commit();
+    }
+
+    Assertions.assertThat(
+            worldStateStorage.getAccountStateTrieNode(Bytes.EMPTY, accountStateTrie.getRootHash()))
+        .isPresent();
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/StubTask.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/StubTask.java
new file mode 100644
index 00000000000..6c5dd72f3ae
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/StubTask.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.services.tasks.Task;
+
+public class StubTask implements Task<SnapDataRequest> {
+
+  private final SnapDataRequest data;
+  private boolean completed = false;
+  private boolean failed = false;
+
+  public StubTask(final SnapDataRequest data) {
+    this.data = data;
+  }
+
+  @Override
+  public SnapDataRequest getData() {
+    return data;
+  }
+
+  @Override
+  public void markCompleted() {
+    completed = true;
+  }
+
+  @Override
+  public void markFailed() {
+    failed = true;
+  }
+
+  public boolean isCompleted() {
+    return completed;
+  }
+
+  public boolean isFailed() {
+    return failed;
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/TaskGenerator.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/TaskGenerator.java
new file mode 100644
index 00000000000..64bda37ae88
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/TaskGenerator.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.core.TrieGenerator;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.AccountRangeDataRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.BytecodeRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.StorageRangeDataRequest;
+import org.hyperledger.besu.ethereum.proof.WorldStateProofProvider;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.RangeStorageEntriesCollector;
+import org.hyperledger.besu.ethereum.trie.TrieIterator;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
+import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.services.tasks.Task;
+
+import java.util.List;
+import java.util.TreeMap;
+
+import kotlin.collections.ArrayDeque;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+public class TaskGenerator {
+
+  public static List<Task<SnapDataRequest>> createAccountRequest(final boolean withData) {
+
+    final WorldStateStorage worldStateStorage =
+        new InMemoryKeyValueStorageProvider().createWorldStateStorage(DataStorageFormat.FOREST);
+
+    final WorldStateProofProvider worldStateProofProvider =
+        new WorldStateProofProvider(worldStateStorage);
+
+    final MerkleTrie<Bytes, Bytes> trie = TrieGenerator.generateTrie(worldStateStorage, 1);
+    final RangeStorageEntriesCollector collector =
+        RangeStorageEntriesCollector.createCollector(
+            Bytes32.ZERO, RangeManager.MAX_RANGE, 1, Integer.MAX_VALUE);
+    final TrieIterator<Bytes> visitor = RangeStorageEntriesCollector.createVisitor(collector);
+    final TreeMap<Bytes32, Bytes> accounts =
+        (TreeMap<Bytes32, Bytes>)
+            trie.entriesFrom(
+                root ->
+                    RangeStorageEntriesCollector.collectEntries(
+                        collector, visitor, root, Bytes32.ZERO));
+
+    final Hash rootHash = Hash.wrap(trie.getRootHash());
+
+    final AccountRangeDataRequest accountRangeDataRequest =
+        SnapDataRequest.createAccountRangeDataRequest(
+            rootHash, RangeManager.MIN_RANGE, RangeManager.MAX_RANGE);
+    if (withData) {
+      accountRangeDataRequest.addResponse(worldStateProofProvider, accounts, new ArrayDeque<>());
+    }
+
+    final StateTrieAccountValue stateTrieAccountValue =
+        StateTrieAccountValue.readFrom(RLP.input(accounts.firstEntry().getValue()));
+    final Hash accountHash = Hash.wrap(accounts.firstKey());
+
+    final StorageRangeDataRequest storageRangeDataRequest =
+        createStorageRangeDataRequest(
+            worldStateProofProvider,
+            worldStateStorage,
+            rootHash,
+            accountHash,
+            stateTrieAccountValue.getStorageRoot(),
+            withData);
+    final BytecodeRequest bytecodeRequest =
+        createBytecodeDataRequest(
+            worldStateStorage,
+            rootHash,
+            accountHash,
+            stateTrieAccountValue.getCodeHash(),
+            withData);
+
+    return List.of(
+        new StubTask(accountRangeDataRequest),
+        new StubTask(storageRangeDataRequest),
+        new StubTask(bytecodeRequest));
+  }
+
+  private static StorageRangeDataRequest createStorageRangeDataRequest(
+      final WorldStateProofProvider worldStateProofProvider,
+      final WorldStateStorage worldStateStorage,
+      final Hash rootHash,
+      final Hash accountHash,
+      final Bytes32 storageRoot,
+      final boolean withData) {
+
+    final RangeStorageEntriesCollector collector =
+        RangeStorageEntriesCollector.createCollector(
+            Bytes32.ZERO, RangeManager.MAX_RANGE, 100, Integer.MAX_VALUE);
+    final StoredMerklePatriciaTrie<Bytes, Bytes> storageTrie =
+        new StoredMerklePatriciaTrie<>(
+            (location, hash) ->
+                worldStateStorage.getAccountStorageTrieNode(accountHash, location, hash),
+            storageRoot,
+            b -> b,
+            b -> b);
+
+    final TrieIterator<Bytes> visitor = RangeStorageEntriesCollector.createVisitor(collector);
+    final TreeMap<Bytes32, Bytes> slots =
+        (TreeMap<Bytes32, Bytes>)
+            storageTrie.entriesFrom(
+                root ->
+                    RangeStorageEntriesCollector.collectEntries(
+                        collector, visitor, root, Bytes32.ZERO));
+
+    final StorageRangeDataRequest request =
+        SnapDataRequest.createStorageRangeDataRequest(
+            rootHash, accountHash, storageRoot, RangeManager.MIN_RANGE, RangeManager.MAX_RANGE);
+    if (withData) {
+      request.setProofValid(true);
+      request.addResponse(null, worldStateProofProvider, slots, new ArrayDeque<>());
+    }
+    return request;
+  }
+
+  private static BytecodeRequest createBytecodeDataRequest(
+      final WorldStateStorage worldStateStorage,
+      final Hash rootHash,
+      final Hash accountHash,
+      final Hash codeHash,
+      final boolean withData) {
+    final BytecodeRequest request =
+        SnapDataRequest.createBytecodeRequest(accountHash, rootHash, codeHash);
+    if (withData) {
+      request.setCode(worldStateStorage.getCode(codeHash, accountHash).get());
+    }
+    return request;
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/heal/AccountFlatDatabaseHealingRangeRequestTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/heal/AccountFlatDatabaseHealingRangeRequestTest.java
new file mode 100644
index 00000000000..f1063d9ed7a
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/heal/AccountFlatDatabaseHealingRangeRequestTest.java
@@ -0,0 +1,297 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync.request.heal;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.core.TrieGenerator;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.RangeManager;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncProcessState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapWorldDownloadState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapsyncMetricsManager;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.ethereum.proof.WorldStateProofProvider;
+import org.hyperledger.besu.ethereum.storage.StorageProvider;
+import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.trie.CompactEncoding;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.RangeStorageEntriesCollector;
+import org.hyperledger.besu.ethereum.trie.TrieIterator;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import kotlin.collections.ArrayDeque;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.assertj.core.api.Assertions;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class AccountFlatDatabaseHealingRangeRequestTest {
+
+  @Mock private SnapWorldDownloadState downloadState;
+  @Mock private SnapSyncProcessState snapSyncState;
+
+  @Before
+  public void setup() {
+    Mockito.when(downloadState.getMetricsManager())
+        .thenReturn(Mockito.mock(SnapsyncMetricsManager.class));
+    Mockito.when(downloadState.getAccountsToBeRepaired()).thenReturn(new HashSet<>());
+  }
+
+  @Test
+  public void shouldReturnChildRequests() {
+    final WorldStateStorage worldStateStorage =
+        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+    final WorldStateProofProvider proofProvider = new WorldStateProofProvider(worldStateStorage);
+    final MerkleTrie<Bytes, Bytes> accountStateTrie =
+        TrieGenerator.generateTrie(worldStateStorage, 15);
+
+    // Create a collector to gather account entries within a specific range
+    final RangeStorageEntriesCollector collector =
+        RangeStorageEntriesCollector.createCollector(
+            Hash.ZERO, RangeManager.MAX_RANGE, 10, Integer.MAX_VALUE);
+
+    // Create a visitor for the range collector
+    final TrieIterator<Bytes> visitor = RangeStorageEntriesCollector.createVisitor(collector);
+
+    // Collect the account entries within the specified range using the trie and range collector
+    final TreeMap<Bytes32, Bytes> accounts =
+        (TreeMap<Bytes32, Bytes>)
+            accountStateTrie.entriesFrom(
+                root ->
+                    RangeStorageEntriesCollector.collectEntries(
+                        collector, visitor, root, Hash.ZERO));
+
+    // Retrieve the proof related nodes for the account trie
+    final List<Bytes> proofs =
+        proofProvider.getAccountProofRelatedNodes(
+            Hash.wrap(accountStateTrie.getRootHash()), Hash.ZERO);
+    proofs.addAll(
+        proofProvider.getAccountProofRelatedNodes(
+            Hash.wrap(accountStateTrie.getRootHash()), accounts.lastKey()));
+
+    // Create a request for healing the flat database with a range from MIN_RANGE to MAX_RANGE
+    final AccountFlatDatabaseHealingRangeRequest request =
+        new AccountFlatDatabaseHealingRangeRequest(
+            Hash.EMPTY, RangeManager.MIN_RANGE, RangeManager.MAX_RANGE);
+    // Add local data to the request, including the proof provider, accounts TreeMap, and proofs as
+    // an ArrayDeque
+    request.addLocalData(proofProvider, accounts, new ArrayDeque<>(proofs));
+
+    // Verify that the start key hash of the snapDataRequest is greater than the last key in the
+    // accounts TreeMap
+    List<SnapDataRequest> childRequests =
+        request.getChildRequests(downloadState, worldStateStorage, snapSyncState).toList();
+    Assertions.assertThat(childRequests).hasSize(1);
+    AccountFlatDatabaseHealingRangeRequest snapDataRequest =
+        (AccountFlatDatabaseHealingRangeRequest) childRequests.get(0);
+    Assertions.assertThat(snapDataRequest.getStartKeyHash()).isGreaterThan(accounts.lastKey());
+
+    // Verify that we have storage healing request when the account need to be repaired
+    Mockito.when(downloadState.getAccountsToBeRepaired())
+        .thenReturn(
+            new HashSet<>(
+                accounts.keySet().stream()
+                    .map(CompactEncoding::bytesToPath)
+                    .collect(Collectors.toList())));
+    childRequests =
+        request.getChildRequests(downloadState, worldStateStorage, snapSyncState).toList();
+    Assertions.assertThat(childRequests).hasSizeGreaterThan(1);
+    Assertions.assertThat(childRequests)
+        .hasAtLeastOneElementOfType(AccountFlatDatabaseHealingRangeRequest.class);
+    Assertions.assertThat(childRequests)
+        .hasAtLeastOneElementOfType(StorageFlatDatabaseHealingRangeRequest.class);
+  }
+
+  @Test
+  public void shouldNotReturnChildRequestsWhenNoMoreAccounts() {
+    final WorldStateStorage worldStateStorage =
+        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
+    final WorldStateProofProvider proofProvider = new WorldStateProofProvider(worldStateStorage);
+    final MerkleTrie<Bytes, Bytes> accountStateTrie =
+        TrieGenerator.generateTrie(worldStateStorage, 15);
+
+    // Create a collector to gather account entries within a specific range
+    final RangeStorageEntriesCollector collector =
+        RangeStorageEntriesCollector.createCollector(
+            Hash.ZERO, RangeManager.MAX_RANGE, 15, Integer.MAX_VALUE);
+
+    // Create a visitor for the range collector
+    final TrieIterator<Bytes> visitor = RangeStorageEntriesCollector.createVisitor(collector);
+
+    // Collect the account entries within the specified range using the trie and range collector
+    final TreeMap<Bytes32, Bytes> accounts =
+        (TreeMap<Bytes32, Bytes>)
+            accountStateTrie.entriesFrom(
+                root ->
+                    RangeStorageEntriesCollector.collectEntries(
+                        collector, visitor, root, Hash.ZERO));
+
+    // Create a request for healing the flat database with no more accounts
+    final AccountFlatDatabaseHealingRangeRequest request =
+        new AccountFlatDatabaseHealingRangeRequest(
+            Hash.EMPTY, accounts.lastKey(), RangeManager.MAX_RANGE);
+
+    // Add local data to the request
+    request.addLocalData(proofProvider, new TreeMap<>(), new ArrayDeque<>());
+
+    // Verify that no child requests are returned from the request
+    final Stream<SnapDataRequest> childRequests =
+        request.getChildRequests(downloadState, worldStateStorage, snapSyncState);
+    Assertions.assertThat(childRequests).isEmpty();
+  }
+
+  @Test
+  public void doNotPersistWhenProofIsValid() {
+
+    final StorageProvider storageProvider = new InMemoryKeyValueStorageProvider();
+
+    final WorldStateStorage worldStateStorage =
+        new BonsaiWorldStateKeyValueStorage(storageProvider, new NoOpMetricsSystem());
+    final WorldStateProofProvider proofProvider = new WorldStateProofProvider(worldStateStorage);
+    final MerkleTrie<Bytes, Bytes> accountStateTrie =
+        TrieGenerator.generateTrie(worldStateStorage, 15);
+    // Create a collector to gather account entries within a specific range
+    final RangeStorageEntriesCollector collector =
+        RangeStorageEntriesCollector.createCollector(
+            Hash.ZERO, RangeManager.MAX_RANGE, 10, Integer.MAX_VALUE);
+
+    // Create a visitor for the range collector
+    final TrieIterator<Bytes> visitor = RangeStorageEntriesCollector.createVisitor(collector);
+
+    // Collect the account entries within the specified range using the trie and range collector
+    final TreeMap<Bytes32, Bytes> accounts =
+        (TreeMap<Bytes32, Bytes>)
+            accountStateTrie.entriesFrom(
+                root ->
+                    RangeStorageEntriesCollector.collectEntries(
+                        collector, visitor, root, Hash.ZERO));
+
+    // Retrieve the proof related nodes for the account trie
+    final List<Bytes> proofs =
+        proofProvider.getAccountProofRelatedNodes(
+            Hash.wrap(accountStateTrie.getRootHash()), Hash.ZERO);
+    proofs.addAll(
+        proofProvider.getAccountProofRelatedNodes(
+            Hash.wrap(accountStateTrie.getRootHash()), accounts.lastKey()));
+
+    // Create a request for healing the flat database with a range from MIN_RANGE to MAX_RANGE
+    final AccountFlatDatabaseHealingRangeRequest request =
+        new AccountFlatDatabaseHealingRangeRequest(
+            Hash.wrap(accountStateTrie.getRootHash()),
+            RangeManager.MIN_RANGE,
+            RangeManager.MAX_RANGE);
+    // Add local data to the request, including the proof provider, accounts TreeMap, and proofs as
+    // an ArrayDeque
+    request.addLocalData(proofProvider, accounts, new ArrayDeque<>(proofs));
+
+    WorldStateStorage.Updater updater = Mockito.spy(worldStateStorage.updater());
+    request.doPersist(
+        worldStateStorage,
+        updater,
+        downloadState,
+        snapSyncState,
+        SnapSyncConfiguration.getDefault());
+    Mockito.verifyNoInteractions(updater);
+  }
+
+  @Test
+  public void doHealAndPersistWhenProofIsInvalid() {
+
+    final StorageProvider storageProvider = new InMemoryKeyValueStorageProvider();
+
+    final WorldStateStorage worldStateStorage =
+        new BonsaiWorldStateKeyValueStorage(storageProvider, new NoOpMetricsSystem());
+    final WorldStateProofProvider proofProvider = new WorldStateProofProvider(worldStateStorage);
+    final MerkleTrie<Bytes, Bytes> accountStateTrie =
+        TrieGenerator.generateTrie(worldStateStorage, 15);
+    // Create a collector to gather account entries within a specific range
+    final RangeStorageEntriesCollector collector =
+        RangeStorageEntriesCollector.createCollector(
+            Hash.ZERO, RangeManager.MAX_RANGE, 15, Integer.MAX_VALUE);
+
+    // Create a visitor for the range collector
+    final TrieIterator<Bytes> visitor = RangeStorageEntriesCollector.createVisitor(collector);
+
+    // Collect the account entries within the specified range using the trie and range collector
+    final TreeMap<Bytes32, Bytes> accounts =
+        (TreeMap<Bytes32, Bytes>)
+            accountStateTrie.entriesFrom(
+                root ->
+                    RangeStorageEntriesCollector.collectEntries(
+                        collector, visitor, root, Hash.ZERO));
+
+    // Retrieve the proof related nodes for the account trie
+    final List<Bytes> proofs =
+        proofProvider.getAccountProofRelatedNodes(
+            Hash.wrap(accountStateTrie.getRootHash()), Hash.ZERO);
+    proofs.addAll(
+        proofProvider.getAccountProofRelatedNodes(
+            Hash.wrap(accountStateTrie.getRootHash()), accounts.lastKey()));
+
+    // Remove an account in the middle of the range
+    final Iterator<Map.Entry<Bytes32, Bytes>> iterator = accounts.entrySet().iterator();
+    Map.Entry<Bytes32, Bytes> removedAccount = null;
+    int i = 0;
+    while (iterator.hasNext()) {
+      if (i == 7) {
+        removedAccount = Map.Entry.copyOf(iterator.next());
+        iterator.remove();
+      } else {
+        iterator.next();
+      }
+      i++;
+    }
+
+    // Create a request for healing the flat database with a range from MIN_RANGE to MAX_RANGE
+    final AccountFlatDatabaseHealingRangeRequest request =
+        new AccountFlatDatabaseHealingRangeRequest(
+            Hash.wrap(accountStateTrie.getRootHash()),
+            RangeManager.MIN_RANGE,
+            RangeManager.MAX_RANGE);
+    // Add local data to the request, including the proof provider, accounts TreeMap, and proofs as
+    // an ArrayDeque
+    request.addLocalData(proofProvider, accounts, new ArrayDeque<>(proofs));
+
+    BonsaiWorldStateKeyValueStorage.Updater updater =
+        (BonsaiWorldStateKeyValueStorage.Updater) Mockito.spy(worldStateStorage.updater());
+    request.doPersist(
+        worldStateStorage,
+        updater,
+        downloadState,
+        snapSyncState,
+        SnapSyncConfiguration.getDefault());
+    // check add the missing account to the updater
+    Mockito.verify(updater)
+        .putAccountInfoState(Hash.wrap(removedAccount.getKey()), removedAccount.getValue());
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/heal/StorageFlatDatabaseHealingRangeRequestTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/heal/StorageFlatDatabaseHealingRangeRequestTest.java
new file mode 100644
index 00000000000..ded60664a99
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/snapsync/request/heal/StorageFlatDatabaseHealingRangeRequestTest.java
@@ -0,0 +1,325 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.sync.snapsync.request.heal;
+
+import static org.apache.tuweni.rlp.RLP.decodeValue;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.core.TrieGenerator;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.RangeManager;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncConfiguration;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapSyncProcessState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.SnapWorldDownloadState;
+import org.hyperledger.besu.ethereum.eth.sync.snapsync.request.SnapDataRequest;
+import org.hyperledger.besu.ethereum.proof.WorldStateProofProvider;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.storage.StorageProvider;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.RangeStorageEntriesCollector;
+import org.hyperledger.besu.ethereum.trie.TrieIterator;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
+import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import kotlin.collections.ArrayDeque;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.assertj.core.api.Assertions;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class StorageFlatDatabaseHealingRangeRequestTest {
+
+  @Mock private SnapWorldDownloadState downloadState;
+  @Mock private SnapSyncProcessState snapSyncState;
+
+  final List<Address> accounts =
+      List.of(
+          Address.fromHexString("0xdeadbeef"),
+          Address.fromHexString("0xdeadbeee"),
+          Address.fromHexString("0xdeadbeea"),
+          Address.fromHexString("0xdeadbeeb"));
+
+  private MerkleTrie<Bytes, Bytes> trie;
+  private BonsaiWorldStateKeyValueStorage worldStateStorage;
+  private WorldStateProofProvider proofProvider;
+  private Hash account0Hash;
+  private Hash account0StorageRoot;
+
+  @Before
+  public void setup() {
+    final StorageProvider storageProvider = new InMemoryKeyValueStorageProvider();
+    worldStateStorage =
+        new BonsaiWorldStateKeyValueStorage(storageProvider, new NoOpMetricsSystem());
+    proofProvider = new WorldStateProofProvider(worldStateStorage);
+    trie =
+        TrieGenerator.generateTrie(
+            worldStateStorage, accounts.stream().map(Hash::hash).collect(Collectors.toList()));
+    account0Hash = Hash.hash(accounts.get(0));
+    account0StorageRoot =
+        trie.get(account0Hash)
+            .map(RLP::input)
+            .map(StateTrieAccountValue::readFrom)
+            .map(StateTrieAccountValue::getStorageRoot)
+            .orElseThrow();
+  }
+
+  @Test
+  public void shouldReturnChildRequests() {
+
+    final StoredMerklePatriciaTrie<Bytes, Bytes> storageTrie =
+        new StoredMerklePatriciaTrie<>(
+            (location, hash) ->
+                worldStateStorage.getAccountStorageTrieNode(account0Hash, location, hash),
+            account0StorageRoot,
+            b -> b,
+            b -> b);
+
+    // Create a collector to gather slot entries within a specific range
+    final RangeStorageEntriesCollector collector =
+        RangeStorageEntriesCollector.createCollector(
+            Hash.ZERO, RangeManager.MAX_RANGE, 1, Integer.MAX_VALUE);
+
+    // Create a visitor for the range collector
+    final TrieIterator<Bytes> visitor = RangeStorageEntriesCollector.createVisitor(collector);
+
+    // Collect the slot entries within the specified range using the trie and range collector
+    final TreeMap<Bytes32, Bytes> slots =
+        (TreeMap<Bytes32, Bytes>)
+            storageTrie.entriesFrom(
+                root ->
+                    RangeStorageEntriesCollector.collectEntries(
+                        collector, visitor, root, Hash.ZERO));
+
+    // Retrieve the proof related nodes for the account trie
+    final List<Bytes> proofs =
+        proofProvider.getStorageProofRelatedNodes(
+            Hash.wrap(storageTrie.getRootHash()), account0Hash, slots.firstKey());
+    proofs.addAll(
+        proofProvider.getStorageProofRelatedNodes(
+            Hash.wrap(storageTrie.getRootHash()), account0Hash, slots.lastKey()));
+
+    // Create a request for healing the flat database with a range from MIN_RANGE to MAX_RANGE
+    final StorageFlatDatabaseHealingRangeRequest request =
+        new StorageFlatDatabaseHealingRangeRequest(
+            Hash.EMPTY,
+            account0Hash,
+            account0StorageRoot,
+            RangeManager.MIN_RANGE,
+            RangeManager.MAX_RANGE);
+    // Add local data to the request, including the proof provider, accounts TreeMap, and proofs as
+    // an ArrayDeque
+    request.addLocalData(proofProvider, slots, new ArrayDeque<>(proofs));
+
+    // Verify that the start key hash of the snapDataRequest is greater than the last key in the
+    // slots TreeMap
+    List<SnapDataRequest> childRequests =
+        request.getChildRequests(downloadState, worldStateStorage, snapSyncState).toList();
+    Assertions.assertThat(childRequests).hasSizeGreaterThan(1);
+    StorageFlatDatabaseHealingRangeRequest snapDataRequest =
+        (StorageFlatDatabaseHealingRangeRequest) childRequests.get(0);
+    Assertions.assertThat(snapDataRequest.getStartKeyHash()).isGreaterThan(slots.lastKey());
+  }
+
+  @Test
+  public void shouldNotReturnChildRequestsWhenNoMoreSlots() {
+
+    final StoredMerklePatriciaTrie<Bytes, Bytes> storageTrie =
+        new StoredMerklePatriciaTrie<>(
+            (location, hash) ->
+                worldStateStorage.getAccountStorageTrieNode(account0Hash, location, hash),
+            account0StorageRoot,
+            b -> b,
+            b -> b);
+
+    // Create a collector to gather slot entries within a specific range
+    final RangeStorageEntriesCollector collector =
+        RangeStorageEntriesCollector.createCollector(
+            Hash.ZERO, RangeManager.MAX_RANGE, Integer.MAX_VALUE, Integer.MAX_VALUE);
+
+    // Create a visitor for the range collector
+    final TrieIterator<Bytes> visitor = RangeStorageEntriesCollector.createVisitor(collector);
+
+    // Collect the slots entries within the specified range using the trie and range collector
+    final TreeMap<Bytes32, Bytes> slots =
+        (TreeMap<Bytes32, Bytes>)
+            storageTrie.entriesFrom(
+                root ->
+                    RangeStorageEntriesCollector.collectEntries(
+                        collector, visitor, root, Hash.ZERO));
+
+    // Create a request for healing the flat database with no more slots
+    final StorageFlatDatabaseHealingRangeRequest request =
+        new StorageFlatDatabaseHealingRangeRequest(
+            Hash.EMPTY, account0Hash, account0StorageRoot, slots.lastKey(), RangeManager.MAX_RANGE);
+
+    // Add local data to the request
+    request.addLocalData(proofProvider, new TreeMap<>(), new ArrayDeque<>());
+
+    // Verify that no child requests are returned from the request
+    final Stream<SnapDataRequest> childRequests =
+        request.getChildRequests(downloadState, worldStateStorage, snapSyncState);
+    Assertions.assertThat(childRequests).isEmpty();
+  }
+
+  @Test
+  public void doNotPersistWhenProofIsValid() {
+
+    final StoredMerklePatriciaTrie<Bytes, Bytes> storageTrie =
+        new StoredMerklePatriciaTrie<>(
+            (location, hash) ->
+                worldStateStorage.getAccountStorageTrieNode(account0Hash, location, hash),
+            account0StorageRoot,
+            b -> b,
+            b -> b);
+
+    // Create a collector to gather slots entries within a specific range
+    final RangeStorageEntriesCollector collector =
+        RangeStorageEntriesCollector.createCollector(
+            Hash.ZERO, RangeManager.MAX_RANGE, Integer.MAX_VALUE, Integer.MAX_VALUE);
+
+    // Create a visitor for the range collector
+    final TrieIterator<Bytes> visitor = RangeStorageEntriesCollector.createVisitor(collector);
+
+    // Collect the slot entries within the specified range using the trie and range collector
+    final TreeMap<Bytes32, Bytes> slots =
+        (TreeMap<Bytes32, Bytes>)
+            storageTrie.entriesFrom(
+                root ->
+                    RangeStorageEntriesCollector.collectEntries(
+                        collector, visitor, root, Hash.ZERO));
+
+    // Retrieve the proof related nodes for the account trie
+    final List<Bytes> proofs =
+        proofProvider.getStorageProofRelatedNodes(
+            Hash.wrap(storageTrie.getRootHash()), account0Hash, slots.firstKey());
+    proofs.addAll(
+        proofProvider.getStorageProofRelatedNodes(
+            Hash.wrap(storageTrie.getRootHash()), account0Hash, slots.lastKey()));
+
+    // Create a request for healing the flat database with a range from MIN_RANGE to MAX_RANGE
+    final StorageFlatDatabaseHealingRangeRequest request =
+        new StorageFlatDatabaseHealingRangeRequest(
+            Hash.wrap(trie.getRootHash()),
+            account0Hash,
+            Hash.wrap(storageTrie.getRootHash()),
+            RangeManager.MIN_RANGE,
+            RangeManager.MAX_RANGE);
+
+    // Add local data to the request
+    request.addLocalData(proofProvider, slots, new ArrayDeque<>(proofs));
+
+    WorldStateStorage.Updater updater = Mockito.spy(worldStateStorage.updater());
+    request.doPersist(
+        worldStateStorage,
+        updater,
+        downloadState,
+        snapSyncState,
+        SnapSyncConfiguration.getDefault());
+    Mockito.verifyNoInteractions(updater);
+  }
+
+  @Test
+  public void doHealAndPersistWhenProofIsInvalid() {
+
+    final StoredMerklePatriciaTrie<Bytes, Bytes> storageTrie =
+        new StoredMerklePatriciaTrie<>(
+            (location, hash) ->
+                worldStateStorage.getAccountStorageTrieNode(account0Hash, location, hash),
+            account0StorageRoot,
+            b -> b,
+            b -> b);
+
+    // Create a collector to gather slots entries within a specific range
+    final RangeStorageEntriesCollector collector =
+        RangeStorageEntriesCollector.createCollector(
+            Hash.ZERO, RangeManager.MAX_RANGE, Integer.MAX_VALUE, Integer.MAX_VALUE);
+
+    // Create a visitor for the range collector
+    final TrieIterator<Bytes> visitor = RangeStorageEntriesCollector.createVisitor(collector);
+
+    // Collect the slot entries within the specified range using the trie and range collector
+    final TreeMap<Bytes32, Bytes> slots =
+        (TreeMap<Bytes32, Bytes>)
+            storageTrie.entriesFrom(
+                root ->
+                    RangeStorageEntriesCollector.collectEntries(
+                        collector, visitor, root, Hash.ZERO));
+
+    // Retrieve the proof related nodes for the account trie
+    final List<Bytes> proofs =
+        proofProvider.getStorageProofRelatedNodes(
+            Hash.wrap(storageTrie.getRootHash()), account0Hash, slots.firstKey());
+    proofs.addAll(
+        proofProvider.getStorageProofRelatedNodes(
+            Hash.wrap(storageTrie.getRootHash()), account0Hash, slots.lastKey()));
+
+    // Remove a slot in the middle of the range
+    final Iterator<Map.Entry<Bytes32, Bytes>> iterator = slots.entrySet().iterator();
+    Map.Entry<Bytes32, Bytes> removedSlot = null;
+    int i = 0;
+    while (iterator.hasNext()) {
+      if (i == 1) {
+        removedSlot = Map.Entry.copyOf(iterator.next());
+        iterator.remove();
+      } else {
+        iterator.next();
+      }
+      i++;
+    }
+
+    // Create a request for healing the flat database with a range from MIN_RANGE to MAX_RANGE
+    final StorageFlatDatabaseHealingRangeRequest request =
+        new StorageFlatDatabaseHealingRangeRequest(
+            Hash.wrap(trie.getRootHash()),
+            account0Hash,
+            Hash.wrap(storageTrie.getRootHash()),
+            RangeManager.MIN_RANGE,
+            RangeManager.MAX_RANGE);
+    // Add local data to the request
+    request.addLocalData(proofProvider, slots, new ArrayDeque<>(proofs));
+
+    BonsaiWorldStateKeyValueStorage.Updater updater =
+        (BonsaiWorldStateKeyValueStorage.Updater) Mockito.spy(worldStateStorage.updater());
+    request.doPersist(
+        worldStateStorage,
+        updater,
+        downloadState,
+        snapSyncState,
+        SnapSyncConfiguration.getDefault());
+    // check add the missing slot to the updater
+    Mockito.verify(updater)
+        .putStorageValueBySlotHash(
+            account0Hash,
+            Hash.wrap(removedSlot.getKey()),
+            Bytes32.leftPad(decodeValue(removedSlot.getValue())));
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/state/PendingBlocksManagerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/state/PendingBlocksManagerTest.java
index 18e1315d56a..be61c8fa338 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/state/PendingBlocksManagerTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/state/PendingBlocksManagerTest.java
@@ -25,6 +25,7 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.junit.Before;
@@ -163,7 +164,8 @@ public void shouldPreventNodeFromFillingCache() {
     pendingBlocksManager.registerPendingBlock(childBlockFromNodeTwo, NODE_ID_2);
 
     // check blocks from node 1 in the cache (node 1 should replace the lowest priority block)
-    List<Block> pendingBlocksForParent = pendingBlocksManager.childrenOf(parentBlock.getHash());
+    final List<Block> pendingBlocksForParent =
+        pendingBlocksManager.childrenOf(parentBlock.getHash());
     for (int i = 0; i < nbBlocks; i++) {
       final Block foundBlock = childBlockFromNodeOne.poll();
       if (i != 0) {
@@ -236,7 +238,7 @@ public void shouldReplaceLowestPriorityBlockWhenCacheIsFull() {
 
     // check blocks in the cache
     // and verify remove the block with the lowest priority (BLOCK-2)
-    for (Block block : childBlockFromNodeOne) {
+    for (final Block block : childBlockFromNodeOne) {
       if (block.getHeader().getNumber() == 2) {
         assertThat(pendingBlocksManager.contains(block.getHash())).isFalse();
       } else {
@@ -245,4 +247,59 @@ public void shouldReplaceLowestPriorityBlockWhenCacheIsFull() {
     }
     assertThat(pendingBlocksManager.contains(reorgBlock.getHash())).isTrue();
   }
+
+  @Test
+  public void shouldReturnLowestBlockByNumber() {
+    final BlockDataGenerator gen = new BlockDataGenerator();
+    final Block parentBlock = gen.block();
+    final Block childBlock = gen.nextBlock(parentBlock);
+    final Block childBlock2 = gen.nextBlock(parentBlock);
+
+    pendingBlocksManager.registerPendingBlock(parentBlock, NODE_ID_1);
+    pendingBlocksManager.registerPendingBlock(childBlock, NODE_ID_1);
+    pendingBlocksManager.registerPendingBlock(childBlock2, NODE_ID_1);
+
+    assertThat(pendingBlocksManager.lowestAnnouncedBlock()).contains(parentBlock.getHeader());
+  }
+
+  @Test
+  public void shouldReturnLowestAncestorPendingBlock() {
+    final BlockDataGenerator gen = new BlockDataGenerator();
+    final Block parentBlock = gen.block();
+
+    final Block block = gen.nextBlock(parentBlock);
+    final Block child = gen.nextBlock(block);
+
+    final Block forkBlock = gen.nextBlock(parentBlock);
+    final Block forkChild = gen.nextBlock(forkBlock);
+
+    // register chain with one missing block
+    pendingBlocksManager.registerPendingBlock(block, NODE_ID_1);
+    pendingBlocksManager.registerPendingBlock(child, NODE_ID_1);
+
+    // Register fork with one missing parent
+    pendingBlocksManager.registerPendingBlock(forkBlock, NODE_ID_1);
+    pendingBlocksManager.registerPendingBlock(forkChild, NODE_ID_1);
+
+    // assert it is able to follow the chain
+    final Optional<Block> blockAncestor = pendingBlocksManager.pendingAncestorBlockOf(child);
+    assertThat(blockAncestor.get().getHeader().getHash()).isEqualTo(block.getHeader().getHash());
+
+    // assert it is able to follow the fork
+    final Optional<Block> forkAncestor = pendingBlocksManager.pendingAncestorBlockOf(forkChild);
+    assertThat(forkAncestor.get().getHeader().getHash()).isEqualTo(forkBlock.getHeader().getHash());
+
+    // Both forks result in the same parent
+    assertThat(forkAncestor.get().getHeader().getParentHash())
+        .isEqualTo(blockAncestor.get().getHeader().getParentHash());
+  }
+
+  @Test
+  public void shouldReturnLowestAncestorPendingBlock_sameBlock() {
+    final BlockDataGenerator gen = new BlockDataGenerator();
+    final Block block = gen.block();
+    pendingBlocksManager.registerPendingBlock(block, NODE_ID_1);
+    final Optional<Block> b = pendingBlocksManager.pendingAncestorBlockOf(block);
+    assertThat(b).contains(block);
+  }
 }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/state/SyncStateTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/state/SyncStateTest.java
index a2eef01ad81..be068067361 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/state/SyncStateTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/state/SyncStateTest.java
@@ -33,7 +33,7 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.core.Synchronizer.InSyncListener;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
@@ -78,7 +78,7 @@ public class SyncStateTest {
   private final Block genesisBlock =
       gen.genesisBlock(new BlockOptions().setDifficulty(Difficulty.ZERO));
   private final MutableBlockchain blockchain =
-      InMemoryStorageProvider.createInMemoryBlockchain(genesisBlock);
+      InMemoryKeyValueStorageProvider.createInMemoryBlockchain(genesisBlock);
 
   @Captor ArgumentCaptor<Optional<SyncStatus>> syncStatusCaptor;
 
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/CompleteBlocksTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/CompleteBlocksTaskTest.java
index c89cccd819d..2723740bd08 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/CompleteBlocksTaskTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/CompleteBlocksTaskTest.java
@@ -16,27 +16,43 @@
 
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.GWei;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.eth.manager.PeerRequest;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
+import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.ethtaskutils.RetryingMessageTaskTest;
+import org.hyperledger.besu.ethereum.eth.manager.exceptions.MaxRetriesReachedException;
 import org.hyperledger.besu.ethereum.eth.manager.task.EthTask;
+import org.hyperledger.besu.ethereum.eth.messages.GetBlockBodiesMessage;
+import org.hyperledger.besu.ethereum.mainnet.BodyValidation;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.mainnet.WithdrawalsProcessor;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
+import org.apache.tuweni.units.bigints.UInt64;
 import org.junit.Test;
-import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
 
 public class CompleteBlocksTaskTest extends RetryingMessageTaskTest<List<Block>> {
 
@@ -47,7 +63,7 @@ protected List<Block> generateDataToBeRequested() {
 
   protected List<Block> generateDataToBeRequested(final int nbBlock) {
     // Setup data to be requested and expected response
-    final List<Block> blocks = new ArrayList<>();
+    final List<Block> blocks = new ArrayList<>(nbBlock);
     for (long i = 0; i < nbBlock; i++) {
       final BlockHeader header = blockchain.getBlockHeader(10 + i).get();
       final BlockBody body = blockchain.getBlockBody(header.getHash()).get();
@@ -57,7 +73,7 @@ protected List<Block> generateDataToBeRequested(final int nbBlock) {
   }
 
   @Override
-  protected EthTask<List<Block>> createTask(final List<Block> requestedData) {
+  protected CompleteBlocksTask createTask(final List<Block> requestedData) {
     final List<BlockHeader> headersToComplete =
         requestedData.stream().map(Block::getHeader).collect(Collectors.toList());
     return CompleteBlocksTask.forHeaders(
@@ -79,49 +95,190 @@ public void shouldCompleteWithoutPeersWhenAllBlocksAreEmpty() {
     assertThat(task.run()).isCompletedWithValue(blocks);
   }
 
+  @Test
+  public void shouldCreateWithdrawalsAwareEmptyBlock_whenWithdrawalsAreEnabled() {
+    final ProtocolSchedule mockProtocolSchedule = Mockito.mock(ProtocolSchedule.class);
+    final ProtocolSpec mockParisSpec = Mockito.mock(ProtocolSpec.class);
+    final ProtocolSpec mockShanghaiSpec = Mockito.mock(ProtocolSpec.class);
+    final WithdrawalsProcessor mockWithdrawalsProcessor = Mockito.mock(WithdrawalsProcessor.class);
+
+    final BlockHeader header1 =
+        new BlockHeaderTestFixture().number(1).withdrawalsRoot(null).buildHeader();
+    final BlockHeader header2 =
+        new BlockHeaderTestFixture().number(2).withdrawalsRoot(Hash.EMPTY_TRIE_HASH).buildHeader();
+
+    when(mockProtocolSchedule.getByBlockHeader((eq(header1)))).thenReturn(mockParisSpec);
+    when(mockParisSpec.getWithdrawalsProcessor()).thenReturn(Optional.empty());
+    when(mockProtocolSchedule.getByBlockHeader((eq(header2)))).thenReturn(mockShanghaiSpec);
+    when(mockShanghaiSpec.getWithdrawalsProcessor())
+        .thenReturn(Optional.of(mockWithdrawalsProcessor));
+
+    final Block block1 =
+        new Block(
+            header1,
+            new BlockBody(
+                Collections.emptyList(),
+                Collections.emptyList(),
+                Optional.empty(),
+                Optional.empty()));
+    final Block block2 =
+        new Block(
+            header2,
+            new BlockBody(
+                Collections.emptyList(),
+                Collections.emptyList(),
+                Optional.of(Collections.emptyList()),
+                Optional.empty()));
+
+    final List<Block> expectedBlocks = asList(block1, block2);
+    final EthTask<List<Block>> task =
+        CompleteBlocksTask.forHeaders(
+            mockProtocolSchedule,
+            ethContext,
+            List.of(header1, header2),
+            maxRetries,
+            new NoOpMetricsSystem());
+    assertThat(task.run()).isCompletedWithValue(expectedBlocks);
+  }
+
+  @Test
+  public void shouldCompleteBlockThatOnlyContainsWithdrawals_whenWithdrawalsAreEnabled() {
+    final ProtocolSchedule mockProtocolSchedule = Mockito.mock(ProtocolSchedule.class);
+    final ProtocolSpec mockParisSpec = Mockito.mock(ProtocolSpec.class);
+    final ProtocolSpec mockShanghaiSpec = Mockito.mock(ProtocolSpec.class);
+    final WithdrawalsProcessor mockWithdrawalsProcessor = Mockito.mock(WithdrawalsProcessor.class);
+
+    final Withdrawal withdrawal =
+        new Withdrawal(UInt64.ONE, UInt64.ONE, Address.fromHexString("0x1"), GWei.ONE);
+    final List<Withdrawal> withdrawals = List.of(withdrawal);
+    final Hash withdrawalsRoot = BodyValidation.withdrawalsRoot(withdrawals);
+
+    final BlockHeader header1 = new BlockHeaderTestFixture().number(1).buildHeader();
+    final BlockHeader header2 =
+        new BlockHeaderTestFixture().number(2).withdrawalsRoot(withdrawalsRoot).buildHeader();
+    final BlockHeader header3 =
+        new BlockHeaderTestFixture().number(3).withdrawalsRoot(Hash.EMPTY_TRIE_HASH).buildHeader();
+
+    final Block block1 = new Block(header1, BlockBody.empty());
+    final Block block2 =
+        new Block(
+            header2,
+            new BlockBody(
+                Collections.emptyList(),
+                Collections.emptyList(),
+                Optional.of(withdrawals),
+                Optional.empty()));
+    final Block block3 =
+        new Block(
+            header3,
+            new BlockBody(
+                Collections.emptyList(),
+                Collections.emptyList(),
+                Optional.of(Collections.emptyList()),
+                Optional.empty()));
+    final List<Block> expected = asList(block1, block2, block3);
+
+    final RespondingEthPeer respondingPeer =
+        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 1000);
+    final RespondingEthPeer.Responder responder = responderForFakeBlocks(expected);
+
+    when(mockProtocolSchedule.getByBlockHeader((eq(header1)))).thenReturn(mockParisSpec);
+    when(mockParisSpec.getWithdrawalsProcessor()).thenReturn(Optional.empty());
+    when(mockProtocolSchedule.getByBlockHeader((eq(header3)))).thenReturn(mockShanghaiSpec);
+    when(mockShanghaiSpec.getWithdrawalsProcessor())
+        .thenReturn(Optional.of(mockWithdrawalsProcessor));
+
+    final EthTask<List<Block>> task =
+        CompleteBlocksTask.forHeaders(
+            mockProtocolSchedule,
+            ethContext,
+            List.of(header1, header2, header3),
+            maxRetries,
+            new NoOpMetricsSystem());
+
+    final CompletableFuture<List<Block>> runningTask = task.run();
+
+    assertThat(runningTask).isNotDone();
+    respondingPeer.respond(responder);
+    assertThat(runningTask).isCompletedWithValue(expected);
+  }
+
+  private RespondingEthPeer.Responder responderForFakeBlocks(final List<Block> blocks) {
+    final Blockchain mockBlockchain = spy(blockchain);
+    for (Block block : blocks) {
+      when(mockBlockchain.getBlockBody(block.getHash())).thenReturn(Optional.of(block.getBody()));
+    }
+
+    return RespondingEthPeer.blockchainResponder(mockBlockchain);
+  }
+
   @SuppressWarnings("unchecked")
   @Test
   public void shouldReduceTheBlockSegmentSizeAfterEachRetry() {
+    final RespondingEthPeer respondingPeer =
+        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 1000);
 
-    peerCountToTimeout.set(3);
     final List<Block> requestedData = generateDataToBeRequested(10);
 
-    final EthTask<List<Block>> task = createTask(requestedData);
+    final CompleteBlocksTask task = createTask(requestedData);
     final CompletableFuture<List<Block>> future = task.run();
 
-    ArgumentCaptor<Long> blockNumbersCaptor = ArgumentCaptor.forClass(Long.class);
+    final List<MessageData> messageCollector = new ArrayList<>(4);
 
-    verify(ethPeers, times(4))
-        .executePeerRequest(
-            any(PeerRequest.class), blockNumbersCaptor.capture(), any(Optional.class));
+    peerCountToTimeout.set(4);
+    // after 3 timeouts a peer is disconnected, so we need another peer to reach 4 retries
+    respondingPeer.respondTimes(
+        RespondingEthPeer.wrapResponderWithCollector(
+            RespondingEthPeer.emptyResponder(), messageCollector),
+        3);
+    final RespondingEthPeer respondingPeer2 =
+        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 1000);
+    respondingPeer2.respond(
+        RespondingEthPeer.wrapResponderWithCollector(
+            RespondingEthPeer.emptyResponder(), messageCollector));
 
-    assertThat(future.isDone()).isFalse();
-    assertThat(blockNumbersCaptor.getAllValues().get(0)).isEqualTo(19);
-    assertThat(blockNumbersCaptor.getAllValues().get(1)).isEqualTo(14);
-    assertThat(blockNumbersCaptor.getAllValues().get(2)).isEqualTo(13);
-    assertThat(blockNumbersCaptor.getAllValues().get(3)).isEqualTo(10);
+    assertThat(batchSize(messageCollector.get(0))).isEqualTo(10);
+    assertThat(batchSize(messageCollector.get(1))).isEqualTo(5);
+    assertThat(batchSize(messageCollector.get(2))).isEqualTo(4);
+    assertThat(batchSize(messageCollector.get(3))).isEqualTo(3);
+    assertThat(future.isCompletedExceptionally()).isTrue();
+    assertThatThrownBy(future::get).hasCauseInstanceOf(MaxRetriesReachedException.class);
   }
 
   @SuppressWarnings("unchecked")
   @Test
   public void shouldNotReduceTheBlockSegmentSizeIfOnlyOneBlockNeeded() {
+    final RespondingEthPeer respondingPeer =
+        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 1000);
 
-    peerCountToTimeout.set(3);
     final List<Block> requestedData = generateDataToBeRequested(1);
 
     final EthTask<List<Block>> task = createTask(requestedData);
     final CompletableFuture<List<Block>> future = task.run();
 
-    ArgumentCaptor<Long> blockNumbersCaptor = ArgumentCaptor.forClass(Long.class);
+    final List<MessageData> messageCollector = new ArrayList<>(4);
+
+    peerCountToTimeout.set(4);
+    // after 3 timeouts a peer is disconnected, so we need another peer to reach 4 retries
+    respondingPeer.respondTimes(
+        RespondingEthPeer.wrapResponderWithCollector(
+            RespondingEthPeer.emptyResponder(), messageCollector),
+        3);
+    final RespondingEthPeer respondingPeer2 =
+        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, 1000);
+    respondingPeer2.respond(
+        RespondingEthPeer.wrapResponderWithCollector(
+            RespondingEthPeer.emptyResponder(), messageCollector));
 
-    verify(ethPeers, times(4))
-        .executePeerRequest(
-            any(PeerRequest.class), blockNumbersCaptor.capture(), any(Optional.class));
+    assertThat(batchSize(messageCollector.get(0))).isEqualTo(1);
+    assertThat(batchSize(messageCollector.get(1))).isEqualTo(1);
+    assertThat(batchSize(messageCollector.get(2))).isEqualTo(1);
+    assertThat(batchSize(messageCollector.get(3))).isEqualTo(1);
+    assertThat(future.isCompletedExceptionally()).isTrue();
+    assertThatThrownBy(future::get).hasCauseInstanceOf(MaxRetriesReachedException.class);
+  }
 
-    assertThat(future.isDone()).isFalse();
-    assertThat(blockNumbersCaptor.getAllValues().get(0)).isEqualTo(10);
-    assertThat(blockNumbersCaptor.getAllValues().get(1)).isEqualTo(10);
-    assertThat(blockNumbersCaptor.getAllValues().get(2)).isEqualTo(10);
-    assertThat(blockNumbersCaptor.getAllValues().get(3)).isEqualTo(10);
+  private long batchSize(final MessageData msg) {
+    return ((GetBlockBodiesMessage) msg).hashes().spliterator().getExactSizeIfKnown();
   }
 }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskParameterizedTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskParameterizedTest.java
index e3101b85e73..74cddc5e569 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskParameterizedTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskParameterizedTest.java
@@ -15,8 +15,8 @@
 package org.hyperledger.besu.ethereum.eth.sync.tasks;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
 import static org.mockito.Mockito.mock;
 
 import org.hyperledger.besu.ethereum.ProtocolContext;
@@ -45,6 +45,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
@@ -144,6 +145,7 @@ public void searchesAgainstNetwork() {
     final WorldStateArchive worldStateArchive = createInMemoryWorldStateArchive();
     final EthProtocolManager ethProtocolManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             localBlockchain,
             worldStateArchive,
             mock(TransactionPool.class),
@@ -159,7 +161,7 @@ public void searchesAgainstNetwork() {
 
     final EthContext ethContext = ethProtocolManager.ethContext();
     final ProtocolContext protocolContext =
-        new ProtocolContext(localBlockchain, worldStateArchive, null);
+        new ProtocolContext(localBlockchain, worldStateArchive, null, Optional.empty());
 
     final EthTask<BlockHeader> task =
         DetermineCommonAncestorTask.create(
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskTest.java
index 6937e71a463..8e2fd6cbae0 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/DetermineCommonAncestorTaskTest.java
@@ -16,8 +16,8 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -42,6 +42,7 @@
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
 import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
 import org.hyperledger.besu.ethereum.eth.manager.exceptions.EthTaskException;
+import org.hyperledger.besu.ethereum.eth.manager.exceptions.EthTaskException.FailureReason;
 import org.hyperledger.besu.ethereum.eth.manager.task.EthTask;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
@@ -53,6 +54,7 @@
 import org.hyperledger.besu.util.ExceptionUtils;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -79,12 +81,14 @@ public void setup() {
     final WorldStateArchive worldStateArchive = createInMemoryWorldStateArchive();
     ethProtocolManager =
         EthProtocolManagerTestUtil.create(
+            protocolSchedule,
             localBlockchain,
             worldStateArchive,
             mock(TransactionPool.class),
             EthProtocolConfiguration.defaultConfig());
     ethContext = ethProtocolManager.ethContext();
-    protocolContext = new ProtocolContext(localBlockchain, worldStateArchive, null);
+    protocolContext =
+        new ProtocolContext(localBlockchain, worldStateArchive, null, Optional.empty());
   }
 
   @Test
@@ -117,8 +121,7 @@ public void shouldFailIfPeerDisconnects() {
     assertThat(failure.get()).isNotNull();
     final Throwable error = ExceptionUtils.rootCause(failure.get());
     assertThat(error).isInstanceOf(EthTaskException.class);
-    assertThat(((EthTaskException) error).reason())
-        .isEqualTo(EthTaskException.FailureReason.PEER_DISCONNECTED);
+    assertThat(((EthTaskException) error).reason()).isEqualTo(FailureReason.NO_AVAILABLE_PEERS);
   }
 
   @Test
@@ -164,7 +167,7 @@ public void calculateSkipInterval() {
     final long range = maximumPossibleCommonAncestorNumber - minimumPossibleCommonAncestorNumber;
     final int skipInterval =
         DetermineCommonAncestorTask.calculateSkipInterval(range, headerRequestSize);
-    final int count = DetermineCommonAncestorTask.calculateCount(range, skipInterval);
+    final int count = DetermineCommonAncestorTask.calculateCount((double) range, skipInterval);
 
     assertThat(count).isEqualTo(11);
     assertThat(skipInterval).isEqualTo(9);
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/GetReceiptsForHeadersTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/GetReceiptsForHeadersTaskTest.java
index bb80ec463ab..57d8270e04b 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/GetReceiptsForHeadersTaskTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/GetReceiptsForHeadersTaskTest.java
@@ -16,7 +16,7 @@
 
 import static java.util.Collections.emptyList;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.core.Hash.EMPTY_TRIE_HASH;
+import static org.hyperledger.besu.datatypes.Hash.EMPTY_TRIE_HASH;
 
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/PersistBlockTaskTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/PersistBlockTaskTest.java
index 1a3f2178e29..5498e96173d 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/PersistBlockTaskTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/tasks/PersistBlockTaskTest.java
@@ -29,10 +29,12 @@
 import org.hyperledger.besu.ethereum.eth.sync.tasks.exceptions.InvalidBlockException;
 import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -40,8 +42,11 @@
 import org.awaitility.Awaitility;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 import org.mockito.Mockito;
 
+@RunWith(Parameterized.class)
 public class PersistBlockTaskTest {
 
   private BlockchainSetupUtil blockchainUtil;
@@ -51,9 +56,20 @@ public class PersistBlockTaskTest {
   private MutableBlockchain blockchain;
   private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
 
+  @Parameterized.Parameters
+  public static Collection<Object[]> data() {
+    return Arrays.asList(new Object[][] {{DataStorageFormat.BONSAI}, {DataStorageFormat.FOREST}});
+  }
+
+  private final DataStorageFormat storageFormat;
+
+  public PersistBlockTaskTest(final DataStorageFormat storageFormat) {
+    this.storageFormat = storageFormat;
+  }
+
   @Before
   public void setup() {
-    blockchainUtil = BlockchainSetupUtil.forTesting();
+    blockchainUtil = BlockchainSetupUtil.forTesting(storageFormat);
     protocolSchedule = blockchainUtil.getProtocolSchedule();
     protocolContext = blockchainUtil.getProtocolContext();
     blockchain = blockchainUtil.getBlockchain();
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/CompleteTaskStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/CompleteTaskStepTest.java
deleted file mode 100644
index 00490eb192e..00000000000
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/CompleteTaskStepTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync.worldstate;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
-import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-
-import java.util.stream.Stream;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-
-public class CompleteTaskStepTest {
-
-  private static final Hash ROOT_HASH = Hash.hash(Bytes.of(1, 2, 3));
-  private final WorldStateStorage worldStateStorage = mock(WorldStateStorage.class);
-  private final WorldDownloadState downloadState = mock(WorldDownloadState.class);
-  private final BlockHeader blockHeader =
-      new BlockHeaderTestFixture().stateRoot(ROOT_HASH).buildHeader();
-
-  private final CompleteTaskStep completeTaskStep =
-      new CompleteTaskStep(worldStateStorage, new NoOpMetricsSystem(), () -> 3);
-
-  @SuppressWarnings("unchecked")
-  private final ArgumentCaptor<Stream<NodeDataRequest>> streamCaptor =
-      ArgumentCaptor.forClass(Stream.class);
-
-  @Test
-  public void shouldMarkTaskAsFailedIfItDoesNotHaveData() {
-    final StubTask task = new StubTask(NodeDataRequest.createAccountDataRequest(ROOT_HASH));
-
-    completeTaskStep.markAsCompleteOrFailed(blockHeader, downloadState, task);
-
-    assertThat(task.isCompleted()).isFalse();
-    assertThat(task.isFailed()).isTrue();
-    verify(downloadState).notifyTaskAvailable();
-    verify(downloadState, never()).checkCompletion(worldStateStorage, blockHeader);
-  }
-
-  @Test
-  public void shouldEnqueueChildrenAndMarkCompleteWhenTaskHasData() {
-    // Use an arbitrary but actually valid trie node to get children from.
-    final StubTask task = validTask();
-    completeTaskStep.markAsCompleteOrFailed(blockHeader, downloadState, task);
-
-    assertThat(task.isCompleted()).isTrue();
-    assertThat(task.isFailed()).isFalse();
-
-    verify(downloadState).enqueueRequests(streamCaptor.capture());
-    assertThat(streamCaptor.getValue())
-        .usingRecursiveFieldByFieldElementComparator()
-        .containsExactlyInAnyOrderElementsOf(() -> task.getData().getChildRequests().iterator());
-
-    verify(downloadState).checkCompletion(worldStateStorage, blockHeader);
-  }
-
-  @Test
-  public void shouldComputeWorldStateProgress() {
-    completeTaskStep.markAsCompleteOrFailed(blockHeader, downloadState, validTask());
-    // One task has been completed and there are 2 pending requests, progress should be 1/4 (25%)
-    assertThat(completeTaskStep.computeWorldStateSyncProgress()).isEqualTo(1.0 / 4.0);
-  }
-
-  private StubTask validTask() {
-    final Hash hash =
-        Hash.fromHexString("0x601a7b0d0267209790cf4c4d9e0cab11b26c537e2ade006412f48b070010e847");
-    final Bytes data =
-        Bytes.fromHexString(
-            "0xf85180808080a05ac6993e3fbca0bfbd30173396dd5c2412657fae0bad92e401d17b2aa9a3698f80808080a012f96a0812be538c302416dc6e8df19ce18f1cc7b06a3c7a16831d766c87a9b580808080808080");
-    final StubTask task = new StubTask(NodeDataRequest.createAccountDataRequest(hash));
-    task.getData().setData(data);
-    return task;
-  }
-}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/LoadLocalDataStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/LoadLocalDataStepTest.java
deleted file mode 100644
index 1df8bc6c259..00000000000
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/LoadLocalDataStepTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync.worldstate;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.metrics.noop.NoOpMetricsSystem.NO_OP_COUNTER;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
-import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.services.pipeline.Pipe;
-import org.hyperledger.besu.services.tasks.Task;
-
-import java.util.Optional;
-import java.util.stream.Stream;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-
-public class LoadLocalDataStepTest {
-
-  private static final Bytes DATA = Bytes.of(1, 2, 3);
-  private static final Hash HASH = Hash.hash(DATA);
-  private final WorldStateStorage worldStateStorage = mock(WorldStateStorage.class);
-  private final WorldStateStorage.Updater updater = mock(WorldStateStorage.Updater.class);
-
-  private final CodeNodeDataRequest request = NodeDataRequest.createCodeRequest(HASH);
-  private final Task<NodeDataRequest> task = new StubTask(request);
-
-  private final Pipe<Task<NodeDataRequest>> completedTasks =
-      new Pipe<>(10, NO_OP_COUNTER, NO_OP_COUNTER, NO_OP_COUNTER);
-  private final LoadLocalDataStep loadLocalDataStep =
-      new LoadLocalDataStep(worldStateStorage, new NoOpMetricsSystem());
-
-  @Test
-  public void shouldReturnStreamWithUnchangedTaskWhenDataNotPresent() {
-    final Stream<Task<NodeDataRequest>> output =
-        loadLocalDataStep.loadLocalData(task, completedTasks);
-
-    assertThat(completedTasks.poll()).isNull();
-    assertThat(output).containsExactly(task);
-  }
-
-  @Test
-  public void shouldReturnEmptyStreamAndSendTaskToCompletedPipeWhenDataIsPresent() {
-    when(worldStateStorage.getCode(HASH)).thenReturn(Optional.of(DATA));
-
-    final Stream<Task<NodeDataRequest>> output =
-        loadLocalDataStep.loadLocalData(task, completedTasks);
-
-    assertThat(completedTasks.poll()).isSameAs(task);
-    assertThat(request.getData()).isEqualTo(DATA);
-    assertThat(output).isEmpty();
-
-    // Should not require persisting.
-    request.persist(updater);
-    verifyZeroInteractions(updater);
-  }
-}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/NodeDataRequestTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/NodeDataRequestTest.java
deleted file mode 100644
index b22039de49c..00000000000
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/NodeDataRequestTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync.worldstate;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-
-import org.junit.Test;
-
-public class NodeDataRequestTest {
-
-  @Test
-  public void serializesAccountTrieNodeRequests() {
-    BlockDataGenerator gen = new BlockDataGenerator(0);
-    AccountTrieNodeDataRequest request = NodeDataRequest.createAccountDataRequest(gen.hash());
-    NodeDataRequest sedeRequest = serializeThenDeserialize(request);
-    assertRequestsEquals(sedeRequest, request);
-    assertThat(sedeRequest).isInstanceOf(AccountTrieNodeDataRequest.class);
-  }
-
-  @Test
-  public void serializesStorageTrieNodeRequests() {
-    BlockDataGenerator gen = new BlockDataGenerator(0);
-    StorageTrieNodeDataRequest request = NodeDataRequest.createStorageDataRequest(gen.hash());
-    NodeDataRequest sedeRequest = serializeThenDeserialize(request);
-    assertRequestsEquals(sedeRequest, request);
-    assertThat(sedeRequest).isInstanceOf(StorageTrieNodeDataRequest.class);
-  }
-
-  @Test
-  public void serializesCodeRequests() {
-    BlockDataGenerator gen = new BlockDataGenerator(0);
-    CodeNodeDataRequest request = NodeDataRequest.createCodeRequest(gen.hash());
-    NodeDataRequest sedeRequest = serializeThenDeserialize(request);
-    assertRequestsEquals(sedeRequest, request);
-    assertThat(sedeRequest).isInstanceOf(CodeNodeDataRequest.class);
-  }
-
-  private NodeDataRequest serializeThenDeserialize(final NodeDataRequest request) {
-    return NodeDataRequest.deserialize(NodeDataRequest.serialize(request));
-  }
-
-  private void assertRequestsEquals(final NodeDataRequest actual, final NodeDataRequest expected) {
-    assertThat(actual.getRequestType()).isEqualTo(expected.getRequestType());
-    assertThat(actual.getHash()).isEqualTo(expected.getHash());
-    assertThat(actual.getData()).isEqualTo(expected.getData());
-  }
-}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/PersistDataStepTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/PersistDataStepTest.java
deleted file mode 100644
index 9d37fe877cb..00000000000
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/PersistDataStepTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync.worldstate;
-
-import static java.util.Arrays.asList;
-import static java.util.Collections.singletonList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
-import org.hyperledger.besu.services.tasks.Task;
-
-import java.util.List;
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-
-public class PersistDataStepTest {
-
-  private final WorldStateStorage worldStateStorage =
-      new InMemoryStorageProvider().createWorldStateStorage();
-  private final WorldDownloadState downloadState = mock(WorldDownloadState.class);
-
-  private final Bytes rootNodeData = Bytes.of(1, 1, 1, 1);
-  private final BlockHeader blockHeader =
-      new BlockHeaderTestFixture().stateRoot(Hash.hash(rootNodeData)).buildHeader();
-
-  private final PersistDataStep persistDataStep = new PersistDataStep(worldStateStorage);
-
-  @Test
-  public void shouldPersistDataWhenPresent() {
-    final List<Task<NodeDataRequest>> tasks =
-        asList(
-            createTaskWithData(1, 2, 3),
-            createTaskWithData(4, 5, 6),
-            createTaskWithData(7, 8, 9),
-            createTaskWithData(10, 11, 12));
-
-    final List<Task<NodeDataRequest>> result =
-        persistDataStep.persist(tasks, blockHeader, downloadState);
-
-    assertThat(result).isSameAs(tasks);
-    assertDataPersisted(tasks);
-  }
-
-  @Test
-  public void shouldSkipPersistingTasksWithNoData() {
-    final Task<NodeDataRequest> withData = createTaskWithData(1, 2, 3);
-    final StubTask withoutData = createTaskWithoutData(4, 5, 6);
-    final List<Task<NodeDataRequest>> tasks = asList(withData, withoutData);
-
-    final List<Task<NodeDataRequest>> result =
-        persistDataStep.persist(tasks, blockHeader, downloadState);
-    assertThat(result).isSameAs(tasks);
-
-    assertThat(worldStateStorage.contains(withData.getData().getHash())).isTrue();
-    assertThat(worldStateStorage.contains(withoutData.getData().getHash())).isFalse();
-  }
-
-  @Test
-  public void shouldStoreRootNodeDataInDownloadStateInsteadOfPersisting() {
-    final Task<NodeDataRequest> rootNode = createTaskWithData(rootNodeData);
-    final List<Task<NodeDataRequest>> tasks = singletonList(rootNode);
-    final List<Task<NodeDataRequest>> result =
-        persistDataStep.persist(tasks, blockHeader, downloadState);
-    assertThat(result).isSameAs(tasks);
-
-    assertThat(worldStateStorage.contains(rootNode.getData().getHash())).isFalse();
-    verify(downloadState).setRootNodeData(rootNode.getData().getData());
-  }
-
-  private Task<NodeDataRequest> createTaskWithData(final int... bytes) {
-    return createTaskWithData(Bytes.of(bytes));
-  }
-
-  private Task<NodeDataRequest> createTaskWithData(final Bytes data) {
-    final StubTask task = createTaskWithoutData(data);
-    task.getData().setData(data);
-    return task;
-  }
-
-  private StubTask createTaskWithoutData(final int... data) {
-    return createTaskWithoutData(Bytes.of(data));
-  }
-
-  private StubTask createTaskWithoutData(final Bytes data) {
-    final Hash hash = Hash.hash(data);
-    final AccountTrieNodeDataRequest request = NodeDataRequest.createAccountDataRequest(hash);
-    return new StubTask(request);
-  }
-
-  private void assertDataPersisted(final List<Task<NodeDataRequest>> tasks) {
-    tasks.forEach(
-        task ->
-            assertThat(worldStateStorage.getNodeData(null, task.getData().getHash()))
-                .isEqualTo(Optional.of(task.getData().getData())));
-  }
-}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/StubTask.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/StubTask.java
deleted file mode 100644
index 4263395f8f2..00000000000
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/StubTask.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync.worldstate;
-
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.services.tasks.Task;
-
-public class StubTask implements Task<NodeDataRequest> {
-
-  private final NodeDataRequest data;
-  private boolean completed = false;
-  private boolean failed = false;
-
-  public StubTask(final NodeDataRequest data) {
-    this.data = data;
-  }
-
-  public static StubTask forHash(final Hash hash) {
-    return new StubTask(NodeDataRequest.createCodeRequest(hash));
-  }
-
-  @Override
-  public NodeDataRequest getData() {
-    return data;
-  }
-
-  @Override
-  public void markCompleted() {
-    completed = true;
-  }
-
-  @Override
-  public void markFailed() {
-    failed = true;
-  }
-
-  public boolean isCompleted() {
-    return completed;
-  }
-
-  public boolean isFailed() {
-    return failed;
-  }
-}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldDownloadStateTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldDownloadStateTest.java
deleted file mode 100644
index 1ed0bd329a1..00000000000
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldDownloadStateTest.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync.worldstate;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.eth.manager.task.EthTask;
-import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
-import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
-import org.hyperledger.besu.services.tasks.CachingTaskCollection;
-import org.hyperledger.besu.services.tasks.InMemoryTaskQueue;
-import org.hyperledger.besu.testutil.TestClock;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.stream.Stream;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
-import org.junit.Test;
-
-public class WorldDownloadStateTest {
-
-  private static final Bytes ROOT_NODE_DATA = Bytes.of(1, 2, 3, 4);
-  private static final Hash ROOT_NODE_HASH = Hash.hash(ROOT_NODE_DATA);
-  private static final int MAX_REQUESTS_WITHOUT_PROGRESS = 10;
-  private static final long MIN_MILLIS_BEFORE_STALLING = 50_000;
-
-  private final WorldStateStorage worldStateStorage =
-      new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
-
-  private final BlockHeader header =
-      new BlockHeaderTestFixture().stateRoot(ROOT_NODE_HASH).buildHeader();
-  private final CachingTaskCollection<NodeDataRequest> pendingRequests =
-      new CachingTaskCollection<>(new InMemoryTaskQueue<>());
-  private final WorldStateDownloadProcess worldStateDownloadProcess =
-      mock(WorldStateDownloadProcess.class);
-
-  private final TestClock clock = new TestClock();
-  private final WorldDownloadState downloadState =
-      new WorldDownloadState(
-          pendingRequests, MAX_REQUESTS_WITHOUT_PROGRESS, MIN_MILLIS_BEFORE_STALLING, clock);
-
-  private final CompletableFuture<Void> future = downloadState.getDownloadFuture();
-
-  @Before
-  public void setUp() {
-    downloadState.setRootNodeData(ROOT_NODE_DATA);
-    assertThat(downloadState.isDownloading()).isTrue();
-  }
-
-  @Test
-  public void shouldCompleteReturnedFutureWhenNoPendingTasksRemain() {
-    downloadState.checkCompletion(worldStateStorage, header);
-
-    assertThat(future).isCompleted();
-    assertThat(downloadState.isDownloading()).isFalse();
-  }
-
-  @Test
-  public void shouldStoreRootNodeBeforeReturnedFutureCompletes() {
-    final CompletableFuture<Void> postFutureChecks =
-        future.thenAccept(
-            result ->
-                assertThat(worldStateStorage.getAccountStateTrieNode(Bytes.EMPTY, ROOT_NODE_HASH))
-                    .contains(ROOT_NODE_DATA));
-
-    downloadState.checkCompletion(worldStateStorage, header);
-
-    assertThat(future).isCompleted();
-    assertThat(postFutureChecks).isCompleted();
-  }
-
-  @Test
-  public void shouldNotCompleteWhenThereArePendingTasks() {
-    pendingRequests.add(NodeDataRequest.createAccountDataRequest(Hash.EMPTY_TRIE_HASH));
-
-    downloadState.checkCompletion(worldStateStorage, header);
-
-    assertThat(future).isNotDone();
-    assertThat(worldStateStorage.getAccountStateTrieNode(Bytes.EMPTY, ROOT_NODE_HASH)).isEmpty();
-    assertThat(downloadState.isDownloading()).isTrue();
-  }
-
-  @Test
-  public void shouldCancelOutstandingTasksWhenFutureIsCancelled() {
-    final EthTask<?> outstandingTask1 = mock(EthTask.class);
-    final EthTask<?> outstandingTask2 = mock(EthTask.class);
-    downloadState.addOutstandingTask(outstandingTask1);
-    downloadState.addOutstandingTask(outstandingTask2);
-
-    pendingRequests.add(NodeDataRequest.createAccountDataRequest(Hash.EMPTY_TRIE_HASH));
-    pendingRequests.add(NodeDataRequest.createAccountDataRequest(Hash.EMPTY));
-    downloadState.setWorldStateDownloadProcess(worldStateDownloadProcess);
-
-    future.cancel(true);
-
-    verify(outstandingTask1).cancel();
-    verify(outstandingTask2).cancel();
-
-    assertThat(pendingRequests.isEmpty()).isTrue();
-    verify(worldStateDownloadProcess).abort();
-    assertThat(downloadState.isDownloading()).isFalse();
-  }
-
-  @Test
-  public void shouldResetRequestsSinceProgressCountWhenProgressIsMade() {
-    downloadState.requestComplete(false);
-    downloadState.requestComplete(false);
-
-    downloadState.requestComplete(true);
-    clock.stepMillis(MIN_MILLIS_BEFORE_STALLING + 1);
-
-    for (int i = 0; i < MAX_REQUESTS_WITHOUT_PROGRESS - 1; i++) {
-      downloadState.requestComplete(false);
-      assertThat(downloadState.getDownloadFuture()).isNotDone();
-    }
-
-    downloadState.requestComplete(false);
-    assertWorldStateStalled(downloadState);
-  }
-
-  @Test
-  public void shouldNotBeStalledWhenMaxRequestsReachedUntilMinimumTimeAlsoReached() {
-    for (int i = 0; i < MAX_REQUESTS_WITHOUT_PROGRESS; i++) {
-      downloadState.requestComplete(false);
-      assertThat(downloadState.getDownloadFuture()).isNotDone();
-    }
-
-    // Exceeding the requests without progress limit doesn't trigger stalled state
-    downloadState.requestComplete(false);
-    assertThat(downloadState.getDownloadFuture()).isNotDone();
-
-    // Until the minimum time has elapsed, then the next request with no progress marks as stalled
-    clock.stepMillis(MIN_MILLIS_BEFORE_STALLING + 1);
-    downloadState.requestComplete(false);
-    assertWorldStateStalled(downloadState);
-  }
-
-  @Test
-  public void shouldNotBeStalledIfMinimumTimeIsReachedButMaximumRequestsIsNot() {
-    clock.stepMillis(MIN_MILLIS_BEFORE_STALLING + 1);
-    downloadState.requestComplete(false);
-    assertThat(downloadState.getDownloadFuture()).isNotDone();
-  }
-
-  @Test
-  public void shouldResetTimeSinceProgressWhenProgressIsMade() {
-    // Enough time has progressed but the next request makes progress so we are not stalled.
-    clock.stepMillis(MIN_MILLIS_BEFORE_STALLING + 1);
-    downloadState.requestComplete(true);
-    assertThat(downloadState.getDownloadFuture()).isNotDone();
-
-    // We then reach the max number of requests without progress but the timer should have reset
-    for (int i = 0; i < MAX_REQUESTS_WITHOUT_PROGRESS; i++) {
-      downloadState.requestComplete(false);
-      assertThat(downloadState.getDownloadFuture()).isNotDone();
-    }
-    assertThat(downloadState.getDownloadFuture()).isNotDone();
-  }
-
-  @Test
-  public void shouldNotAddRequestsAfterDownloadIsCompleted() {
-    downloadState.checkCompletion(worldStateStorage, header);
-
-    downloadState.enqueueRequests(
-        Stream.of(NodeDataRequest.createAccountDataRequest(Hash.EMPTY_TRIE_HASH)));
-    downloadState.enqueueRequest(NodeDataRequest.createAccountDataRequest(Hash.EMPTY_TRIE_HASH));
-
-    assertThat(pendingRequests.isEmpty()).isTrue();
-  }
-
-  private void assertWorldStateStalled(final WorldDownloadState state) {
-    final CompletableFuture<Void> future = state.getDownloadFuture();
-    assertThat(future).isCompletedExceptionally();
-    assertThatThrownBy(future::get)
-        .isInstanceOf(ExecutionException.class)
-        .hasRootCauseInstanceOf(StalledDownloadException.class);
-  }
-}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloaderTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloaderTest.java
deleted file mode 100644
index 0bf4f51525f..00000000000
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/worldstate/WorldStateDownloaderTest.java
+++ /dev/null
@@ -1,1014 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.sync.worldstate;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.AccountStorageEntry;
-import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.ProtocolScheduleFixture;
-import org.hyperledger.besu.ethereum.core.WorldState;
-import org.hyperledger.besu.ethereum.eth.manager.DeterministicEthScheduler;
-import org.hyperledger.besu.ethereum.eth.manager.EthContext;
-import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
-import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
-import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
-import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
-import org.hyperledger.besu.ethereum.eth.messages.EthPV63;
-import org.hyperledger.besu.ethereum.eth.messages.GetNodeDataMessage;
-import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
-import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
-import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
-import org.hyperledger.besu.ethereum.rlp.RLP;
-import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage;
-import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage;
-import org.hyperledger.besu.ethereum.trie.MerklePatriciaTrie;
-import org.hyperledger.besu.ethereum.trie.Node;
-import org.hyperledger.besu.ethereum.trie.StoredMerklePatriciaTrie;
-import org.hyperledger.besu.ethereum.trie.TrieNodeDecoder;
-import org.hyperledger.besu.ethereum.worldstate.DefaultWorldStateArchive;
-import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
-import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
-import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage.Updater;
-import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
-import org.hyperledger.besu.services.tasks.CachingTaskCollection;
-import org.hyperledger.besu.services.tasks.InMemoryTaskQueue;
-import org.hyperledger.besu.testutil.MockExecutorService;
-import org.hyperledger.besu.testutil.TestClock;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.locks.LockSupport;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.Timeout;
-
-@Ignore("PIE-1434 - Ignored while working to make test more reliable")
-public class WorldStateDownloaderTest {
-
-  @Rule public Timeout globalTimeout = Timeout.seconds(60); // 1 minute max per test
-
-  private static final Hash EMPTY_TRIE_ROOT = Hash.wrap(MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH);
-
-  private final BlockDataGenerator dataGen = new BlockDataGenerator(1);
-  private final ExecutorService persistenceThread =
-      Executors.newCachedThreadPool(
-          new ThreadFactoryBuilder()
-              .setDaemon(true)
-              .setNameFormat(WorldStateDownloaderTest.class.getSimpleName() + "-persistence-%d")
-              .build());
-
-  final EthProtocolManager ethProtocolManager =
-      EthProtocolManagerTestUtil.create(new EthScheduler(1, 1, 1, 1, new NoOpMetricsSystem()));
-
-  @After
-  public void tearDown() throws Exception {
-    persistenceThread.shutdownNow();
-    assertThat(persistenceThread.awaitTermination(10, TimeUnit.SECONDS)).isTrue();
-    ethProtocolManager.stop();
-  }
-
-  @Test
-  public void downloadWorldStateFromPeers_onePeerOneWithManyRequestsOneAtATime() {
-    downloadAvailableWorldStateFromPeers(1, 50, 1, 1);
-  }
-
-  @Test
-  public void downloadWorldStateFromPeers_onePeerOneWithManyRequests() {
-    downloadAvailableWorldStateFromPeers(1, 50, 1, 10);
-  }
-
-  @Test
-  public void downloadWorldStateFromPeers_onePeerWithSingleRequest() {
-    downloadAvailableWorldStateFromPeers(1, 1, 100, 10);
-  }
-
-  @Test
-  public void downloadWorldStateFromPeers_largeStateFromMultiplePeers() {
-    downloadAvailableWorldStateFromPeers(5, 100, 10, 10);
-  }
-
-  @Test
-  public void downloadWorldStateFromPeers_smallStateFromMultiplePeers() {
-    downloadAvailableWorldStateFromPeers(5, 5, 1, 10);
-  }
-
-  @Test
-  public void downloadWorldStateFromPeers_singleRequestWithMultiplePeers() {
-    downloadAvailableWorldStateFromPeers(5, 1, 50, 50);
-  }
-
-  @Test
-  public void downloadEmptyWorldState() {
-    final BlockHeader header =
-        dataGen
-            .block(BlockOptions.create().setStateRoot(EMPTY_TRIE_ROOT).setBlockNumber(10))
-            .getHeader();
-
-    // Create some peers
-    final List<RespondingEthPeer> peers =
-        Stream.generate(
-                () -> EthProtocolManagerTestUtil.createPeer(ethProtocolManager, header.getNumber()))
-            .limit(5)
-            .collect(Collectors.toList());
-
-    final CachingTaskCollection<NodeDataRequest> taskCollection =
-        new CachingTaskCollection<>(new InMemoryTaskQueue<>());
-    final WorldStateStorage localStorage =
-        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
-    final WorldStateDownloader downloader =
-        createDownloader(ethProtocolManager.ethContext(), localStorage, taskCollection);
-
-    final CompletableFuture<Void> future = downloader.run(header);
-    assertThat(future).isDone();
-
-    // Peers should not have been queried
-    for (final RespondingEthPeer peer : peers) {
-      assertThat(peer.hasOutstandingRequests()).isFalse();
-    }
-  }
-
-  @Test
-  public void downloadAlreadyAvailableWorldState() {
-    // Setup existing state
-    final DefaultWorldStateArchive worldStateArchive = createInMemoryWorldStateArchive();
-    final MutableWorldState worldState = worldStateArchive.getMutable();
-
-    // Generate accounts and save corresponding state root
-    dataGen.createRandomAccounts(worldState, 20);
-    final Hash stateRoot = worldState.rootHash();
-    assertThat(stateRoot).isNotEqualTo(EMPTY_TRIE_ROOT); // Sanity check
-    final BlockHeader header =
-        dataGen.block(BlockOptions.create().setStateRoot(stateRoot).setBlockNumber(10)).getHeader();
-
-    // Create some peers
-    final List<RespondingEthPeer> peers =
-        Stream.generate(
-                () -> EthProtocolManagerTestUtil.createPeer(ethProtocolManager, header.getNumber()))
-            .limit(5)
-            .collect(Collectors.toList());
-
-    final CachingTaskCollection<NodeDataRequest> taskCollection =
-        new CachingTaskCollection<>(new InMemoryTaskQueue<>());
-    final WorldStateDownloader downloader =
-        createDownloader(
-            ethProtocolManager.ethContext(),
-            worldStateArchive.getWorldStateStorage(),
-            taskCollection);
-
-    final CompletableFuture<Void> future = downloader.run(header);
-    assertThat(future).isDone();
-
-    // Peers should not have been queried because we already had the state
-    for (final RespondingEthPeer peer : peers) {
-      assertThat(peer.hasOutstandingRequests()).isFalse();
-    }
-  }
-
-  @Test
-  public void canRecoverFromTimeouts() {
-    final DeterministicEthScheduler.TimeoutPolicy timeoutPolicy =
-        DeterministicEthScheduler.TimeoutPolicy.timeoutXTimes(2);
-    final EthProtocolManager ethProtocolManager = EthProtocolManagerTestUtil.create(timeoutPolicy);
-    final MockExecutorService serviceExecutor =
-        ((DeterministicEthScheduler) ethProtocolManager.ethContext().getScheduler())
-            .mockServiceExecutor();
-    serviceExecutor.setAutoRun(false);
-
-    // Setup "remote" state
-    final WorldStateArchive remoteWorldStateArchive = createInMemoryWorldStateArchive();
-    final MutableWorldState remoteWorldState = remoteWorldStateArchive.getMutable();
-
-    // Generate accounts and save corresponding state root
-    final List<Account> accounts = dataGen.createRandomAccounts(remoteWorldState, 20);
-    final Hash stateRoot = remoteWorldState.rootHash();
-    assertThat(stateRoot).isNotEqualTo(EMPTY_TRIE_ROOT); // Sanity check
-    final BlockHeader header =
-        dataGen.block(BlockOptions.create().setStateRoot(stateRoot).setBlockNumber(10)).getHeader();
-
-    // Create some peers
-    final List<RespondingEthPeer> peers =
-        Stream.generate(
-                () -> EthProtocolManagerTestUtil.createPeer(ethProtocolManager, header.getNumber()))
-            .limit(5)
-            .collect(Collectors.toList());
-
-    final CachingTaskCollection<NodeDataRequest> taskCollection =
-        new CachingTaskCollection<>(new InMemoryTaskQueue<>());
-    final WorldStateStorage localStorage =
-        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
-    final WorldStateDownloader downloader =
-        createDownloader(ethProtocolManager.ethContext(), localStorage, taskCollection);
-
-    final CompletableFuture<Void> result = downloader.run(header);
-
-    serviceExecutor.runPendingFuturesInSeparateThreads(persistenceThread);
-
-    // Respond to node data requests
-    final RespondingEthPeer.Responder responder =
-        RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive);
-
-    respondUntilDone(peers, responder, result);
-
-    // Check that all expected account data was downloaded
-    final WorldStateArchive localWorldStateArchive =
-        new DefaultWorldStateArchive(localStorage, createPreimageStorage());
-    final WorldState localWorldState = localWorldStateArchive.get(stateRoot).get();
-    assertThat(result).isDone();
-    assertAccountsMatch(localWorldState, accounts);
-  }
-
-  @Test
-  public void handlesPartialResponsesFromNetwork() {
-    downloadAvailableWorldStateFromPeers(5, 100, 10, 10, this::respondPartially);
-  }
-
-  @Test
-  public void doesNotRequestKnownCodeFromNetwork() {
-    // Setup "remote" state
-    final WorldStateArchive remoteWorldStateArchive = createInMemoryWorldStateArchive();
-    final MutableWorldState remoteWorldState = remoteWorldStateArchive.getMutable();
-
-    // Generate accounts and save corresponding state root
-    final List<Account> accounts =
-        dataGen.createRandomContractAccountsWithNonEmptyStorage(remoteWorldState, 20);
-    final Hash stateRoot = remoteWorldState.rootHash();
-    final BlockHeader header =
-        dataGen.block(BlockOptions.create().setStateRoot(stateRoot).setBlockNumber(10)).getHeader();
-
-    // Create some peers
-    final List<RespondingEthPeer> peers =
-        Stream.generate(
-                () -> EthProtocolManagerTestUtil.createPeer(ethProtocolManager, header.getNumber()))
-            .limit(5)
-            .collect(Collectors.toList());
-
-    final CachingTaskCollection<NodeDataRequest> taskCollection =
-        new CachingTaskCollection<>(new InMemoryTaskQueue<>());
-    final WorldStateStorage localStorage =
-        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
-
-    // Seed local storage with some contract values
-    final Map<Bytes32, Bytes> knownCode = new HashMap<>();
-    accounts.subList(0, 5).forEach(a -> knownCode.put(a.getCodeHash(), a.getCode()));
-    final Updater localStorageUpdater = localStorage.updater();
-    knownCode.forEach(localStorageUpdater::putCode);
-    localStorageUpdater.commit();
-
-    final WorldStateDownloader downloader =
-        createDownloader(ethProtocolManager.ethContext(), localStorage, taskCollection);
-
-    final CompletableFuture<Void> result = downloader.run(header);
-
-    // Respond to node data requests
-    final List<MessageData> sentMessages = new ArrayList<>();
-    final RespondingEthPeer.Responder blockChainResponder =
-        RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive);
-    final RespondingEthPeer.Responder responder =
-        RespondingEthPeer.wrapResponderWithCollector(blockChainResponder, sentMessages);
-
-    respondUntilDone(peers, responder, result);
-
-    // Check that known code was not requested
-    final List<Bytes32> requestedHashes =
-        sentMessages.stream()
-            .filter(m -> m.getCode() == EthPV63.GET_NODE_DATA)
-            .map(GetNodeDataMessage::readFrom)
-            .flatMap(m -> StreamSupport.stream(m.hashes().spliterator(), true))
-            .collect(Collectors.toList());
-    assertThat(requestedHashes.size()).isGreaterThan(0);
-    assertThat(Collections.disjoint(requestedHashes, knownCode.keySet())).isTrue();
-
-    // Check that all expected account data was downloaded
-    final WorldStateArchive localWorldStateArchive =
-        new DefaultWorldStateArchive(localStorage, createPreimageStorage());
-    final WorldState localWorldState = localWorldStateArchive.get(stateRoot).get();
-    assertThat(result).isDone();
-    assertAccountsMatch(localWorldState, accounts);
-  }
-
-  @Test
-  public void cancelDownloader() {
-    testCancellation(false);
-  }
-
-  @Test
-  public void cancelDownloaderFuture() {
-    testCancellation(true);
-  }
-
-  @SuppressWarnings("unchecked")
-  private void testCancellation(final boolean shouldCancelFuture) {
-    final EthProtocolManager ethProtocolManager = EthProtocolManagerTestUtil.create();
-    // Prevent the persistence service from running
-    final MockExecutorService serviceExecutor =
-        ((DeterministicEthScheduler) ethProtocolManager.ethContext().getScheduler())
-            .mockServiceExecutor();
-    serviceExecutor.setAutoRun(false);
-
-    // Setup "remote" state
-    final WorldStateArchive remoteWorldStateArchive = createInMemoryWorldStateArchive();
-    final MutableWorldState remoteWorldState = remoteWorldStateArchive.getMutable();
-
-    // Generate accounts and save corresponding state root
-    dataGen.createRandomContractAccountsWithNonEmptyStorage(remoteWorldState, 20);
-    final Hash stateRoot = remoteWorldState.rootHash();
-    final BlockHeader header =
-        dataGen.block(BlockOptions.create().setStateRoot(stateRoot).setBlockNumber(10)).getHeader();
-
-    // Create some peers
-    final List<RespondingEthPeer> peers =
-        Stream.generate(
-                () -> EthProtocolManagerTestUtil.createPeer(ethProtocolManager, header.getNumber()))
-            .limit(5)
-            .collect(Collectors.toList());
-
-    final CachingTaskCollection<NodeDataRequest> taskCollection =
-        spy(new CachingTaskCollection<>(new InMemoryTaskQueue<>()));
-    final WorldStateStorage localStorage =
-        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
-
-    final WorldStateDownloader downloader =
-        createDownloader(ethProtocolManager.ethContext(), localStorage, taskCollection);
-
-    final CompletableFuture<Void> result = downloader.run(header);
-
-    // Send a few responses
-    final RespondingEthPeer.Responder responder =
-        RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive);
-
-    for (int i = 0; i < 3; i++) {
-      for (final RespondingEthPeer peer : peers) {
-        peer.respond(responder);
-      }
-      giveOtherThreadsAGo();
-    }
-    assertThat(result.isDone()).isFalse(); // Sanity check
-
-    // Reset taskCollection so we can track interactions after the cancellation
-    reset(taskCollection);
-    if (shouldCancelFuture) {
-      result.cancel(true);
-    } else {
-      downloader.cancel();
-      assertThat(result).isCancelled();
-    }
-
-    // Send some more responses after cancelling
-    for (int i = 0; i < 3; i++) {
-      for (final RespondingEthPeer peer : peers) {
-        peer.respond(responder);
-      }
-      giveOtherThreadsAGo();
-    }
-
-    // Now allow the persistence service to run which should exit immediately
-    serviceExecutor.runPendingFutures();
-
-    verify(taskCollection, times(1)).clear();
-    verify(taskCollection, never()).remove();
-    verify(taskCollection, never()).add(any(NodeDataRequest.class));
-    // Target world state should not be available
-    assertThat(localStorage.isWorldStateAvailable(header.getStateRoot())).isFalse();
-  }
-
-  @Test
-  public void doesNotRequestKnownAccountTrieNodesFromNetwork() {
-    // Setup "remote" state
-    final WorldStateStorage remoteStorage =
-        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
-    final WorldStateArchive remoteWorldStateArchive =
-        new DefaultWorldStateArchive(remoteStorage, createPreimageStorage());
-    final MutableWorldState remoteWorldState = remoteWorldStateArchive.getMutable();
-
-    // Generate accounts and save corresponding state root
-    final List<Account> accounts =
-        dataGen.createRandomContractAccountsWithNonEmptyStorage(remoteWorldState, 20);
-    final Hash stateRoot = remoteWorldState.rootHash();
-    final BlockHeader header =
-        dataGen.block(BlockOptions.create().setStateRoot(stateRoot).setBlockNumber(10)).getHeader();
-
-    // Create some peers
-    final List<RespondingEthPeer> peers =
-        Stream.generate(
-                () -> EthProtocolManagerTestUtil.createPeer(ethProtocolManager, header.getNumber()))
-            .limit(5)
-            .collect(Collectors.toList());
-
-    final CachingTaskCollection<NodeDataRequest> taskCollection =
-        new CachingTaskCollection<>(new InMemoryTaskQueue<>());
-    final WorldStateStorage localStorage =
-        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
-
-    // Seed local storage with some trie node values
-    final Map<Bytes32, Bytes> allNodes =
-        collectTrieNodesToBeRequestedAfterRoot(remoteStorage, remoteWorldState.rootHash(), 5);
-    final Set<Bytes32> knownNodes = new HashSet<>();
-    final Set<Bytes32> unknownNodes = new HashSet<>();
-    assertThat(allNodes.size()).isGreaterThan(0); // Sanity check
-    final Updater localStorageUpdater = localStorage.updater();
-    final AtomicBoolean storeNode = new AtomicBoolean(true);
-    allNodes.forEach(
-        (nodeHash, node) -> {
-          if (storeNode.get()) {
-            localStorageUpdater.putAccountStateTrieNode(null, nodeHash, node);
-            knownNodes.add(nodeHash);
-          } else {
-            unknownNodes.add(nodeHash);
-          }
-          storeNode.set(!storeNode.get());
-        });
-    localStorageUpdater.commit();
-
-    final WorldStateDownloader downloader =
-        createDownloader(ethProtocolManager.ethContext(), localStorage, taskCollection);
-
-    final CompletableFuture<Void> result = downloader.run(header);
-
-    // Respond to node data requests
-    final List<MessageData> sentMessages = new ArrayList<>();
-    final RespondingEthPeer.Responder blockChainResponder =
-        RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive);
-    final RespondingEthPeer.Responder responder =
-        RespondingEthPeer.wrapResponderWithCollector(blockChainResponder, sentMessages);
-
-    respondUntilDone(peers, responder, result);
-
-    // Check that unknown trie nodes were requested
-    final List<Bytes32> requestedHashes =
-        sentMessages.stream()
-            .filter(m -> m.getCode() == EthPV63.GET_NODE_DATA)
-            .map(GetNodeDataMessage::readFrom)
-            .flatMap(m -> StreamSupport.stream(m.hashes().spliterator(), true))
-            .collect(Collectors.toList());
-    assertThat(requestedHashes.size()).isGreaterThan(0);
-    assertThat(requestedHashes).containsAll(unknownNodes);
-    assertThat(requestedHashes).doesNotContainAnyElementsOf(knownNodes);
-
-    // Check that all expected account data was downloaded
-    final WorldStateArchive localWorldStateArchive =
-        new DefaultWorldStateArchive(localStorage, createPreimageStorage());
-    final WorldState localWorldState = localWorldStateArchive.get(stateRoot).get();
-    assertThat(result).isDone();
-    assertAccountsMatch(localWorldState, accounts);
-  }
-
-  @Test
-  public void doesNotRequestKnownStorageTrieNodesFromNetwork() {
-    // Setup "remote" state
-    final WorldStateStorage remoteStorage =
-        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
-    final WorldStateArchive remoteWorldStateArchive =
-        new DefaultWorldStateArchive(remoteStorage, createPreimageStorage());
-    final MutableWorldState remoteWorldState = remoteWorldStateArchive.getMutable();
-
-    // Generate accounts and save corresponding state root
-    final List<Account> accounts =
-        dataGen.createRandomContractAccountsWithNonEmptyStorage(remoteWorldState, 20);
-    final Hash stateRoot = remoteWorldState.rootHash();
-    final BlockHeader header =
-        dataGen.block(BlockOptions.create().setStateRoot(stateRoot).setBlockNumber(10)).getHeader();
-
-    // Create some peers
-    final List<RespondingEthPeer> peers =
-        Stream.generate(
-                () -> EthProtocolManagerTestUtil.createPeer(ethProtocolManager, header.getNumber()))
-            .limit(5)
-            .collect(Collectors.toList());
-
-    final CachingTaskCollection<NodeDataRequest> taskCollection =
-        new CachingTaskCollection<>(new InMemoryTaskQueue<>());
-    final WorldStateStorage localStorage =
-        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
-
-    // Seed local storage with some trie node values
-    final List<Bytes32> storageRootHashes =
-        new StoredMerklePatriciaTrie<>(
-                remoteStorage::getNodeData,
-                remoteWorldState.rootHash(),
-                Function.identity(),
-                Function.identity())
-            .entriesFrom(Bytes32.ZERO, 5).values().stream()
-                .map(RLP::input)
-                .map(StateTrieAccountValue::readFrom)
-                .map(StateTrieAccountValue::getStorageRoot)
-                .collect(Collectors.toList());
-    final Map<Bytes32, Bytes> allTrieNodes = new HashMap<>();
-    final Set<Bytes32> knownNodes = new HashSet<>();
-    final Set<Bytes32> unknownNodes = new HashSet<>();
-    for (final Bytes32 storageRootHash : storageRootHashes) {
-      allTrieNodes.putAll(
-          collectTrieNodesToBeRequestedAfterRoot(remoteStorage, storageRootHash, 5));
-    }
-    assertThat(allTrieNodes.size()).isGreaterThan(0); // Sanity check
-    final Updater localStorageUpdater = localStorage.updater();
-    boolean storeNode = true;
-    for (final Map.Entry<Bytes32, Bytes> entry : allTrieNodes.entrySet()) {
-      final Bytes32 hash = entry.getKey();
-      final Bytes data = entry.getValue();
-      if (storeNode) {
-        localStorageUpdater.putAccountStorageTrieNode(null, hash, data);
-        knownNodes.add(hash);
-      } else {
-        unknownNodes.add(hash);
-      }
-      storeNode = !storeNode;
-    }
-    localStorageUpdater.commit();
-
-    final WorldStateDownloader downloader =
-        createDownloader(ethProtocolManager.ethContext(), localStorage, taskCollection);
-
-    final CompletableFuture<Void> result = downloader.run(header);
-
-    // Respond to node data requests
-    final List<MessageData> sentMessages = new ArrayList<>();
-    final RespondingEthPeer.Responder blockChainResponder =
-        RespondingEthPeer.blockchainResponder(
-            mock(Blockchain.class), remoteWorldStateArchive, mock(TransactionPool.class));
-    final RespondingEthPeer.Responder responder =
-        RespondingEthPeer.wrapResponderWithCollector(blockChainResponder, sentMessages);
-
-    respondUntilDone(peers, responder, result);
-    // World state should be available by the time the result is complete
-    assertThat(localStorage.isWorldStateAvailable(stateRoot)).isTrue();
-
-    // Check that unknown trie nodes were requested
-    final List<Bytes32> requestedHashes =
-        sentMessages.stream()
-            .filter(m -> m.getCode() == EthPV63.GET_NODE_DATA)
-            .map(GetNodeDataMessage::readFrom)
-            .flatMap(m -> StreamSupport.stream(m.hashes().spliterator(), true))
-            .collect(Collectors.toList());
-    assertThat(requestedHashes.size()).isGreaterThan(0);
-    assertThat(requestedHashes).containsAll(unknownNodes);
-    assertThat(requestedHashes).doesNotContainAnyElementsOf(knownNodes);
-
-    // Check that all expected account data was downloaded
-    final WorldStateArchive localWorldStateArchive =
-        new DefaultWorldStateArchive(localStorage, createPreimageStorage());
-    final WorldState localWorldState = localWorldStateArchive.get(stateRoot).get();
-    assertThat(result).isDone();
-    assertAccountsMatch(localWorldState, accounts);
-  }
-
-  @Test
-  public void stalledDownloader() {
-    final EthProtocolManager ethProtocolManager =
-        EthProtocolManagerTestUtil.create(new EthScheduler(1, 1, 1, 1, new NoOpMetricsSystem()));
-
-    // Setup "remote" state
-    final WorldStateStorage remoteStorage =
-        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
-    final WorldStateArchive remoteWorldStateArchive =
-        new DefaultWorldStateArchive(remoteStorage, createPreimageStorage());
-    final MutableWorldState remoteWorldState = remoteWorldStateArchive.getMutable();
-
-    // Generate accounts and save corresponding state root
-    dataGen.createRandomAccounts(remoteWorldState, 10);
-    final Hash stateRoot = remoteWorldState.rootHash();
-    assertThat(stateRoot).isNotEqualTo(EMPTY_TRIE_ROOT); // Sanity check
-    final BlockHeader header =
-        dataGen.block(BlockOptions.create().setStateRoot(stateRoot).setBlockNumber(10)).getHeader();
-
-    final CachingTaskCollection<NodeDataRequest> taskCollection =
-        new CachingTaskCollection<>(new InMemoryTaskQueue<>());
-    final WorldStateStorage localStorage =
-        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
-    final SynchronizerConfiguration syncConfig =
-        SynchronizerConfiguration.builder().worldStateMaxRequestsWithoutProgress(10).build();
-    final WorldStateDownloader downloader =
-        createDownloader(syncConfig, ethProtocolManager.ethContext(), localStorage, taskCollection);
-
-    // Create a peer that can respond
-    final RespondingEthPeer peer =
-        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, header.getNumber());
-
-    // Start downloader (with a state root that's not available anywhere
-    final CompletableFuture<?> result =
-        downloader.run(
-            new BlockHeaderTestFixture().stateRoot(Hash.hash(Bytes.of(1, 2, 3, 4))).buildHeader());
-    // A second run should return an error without impacting the first result
-    final CompletableFuture<?> secondResult = downloader.run(header);
-    assertThat(secondResult).isCompletedExceptionally();
-    assertThat(result).isNotCompletedExceptionally();
-
-    final RespondingEthPeer.Responder emptyResponder = RespondingEthPeer.emptyResponder();
-    peer.respondWhileOtherThreadsWork(emptyResponder, () -> !result.isDone());
-
-    assertThat(result).isCompletedExceptionally();
-    assertThatThrownBy(result::get).hasCauseInstanceOf(StalledDownloadException.class);
-
-    // Finally, check that when we restart the download with state that is available it works
-    final CompletableFuture<Void> retryResult = downloader.run(header);
-    final RespondingEthPeer.Responder responder =
-        RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive);
-    peer.respondWhileOtherThreadsWork(responder, () -> !retryResult.isDone());
-    assertThat(retryResult).isCompleted();
-  }
-
-  @Test
-  public void resumesFromNonEmptyQueue() {
-    // Setup "remote" state
-    final WorldStateStorage remoteStorage =
-        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
-    final WorldStateArchive remoteWorldStateArchive =
-        new DefaultWorldStateArchive(remoteStorage, createPreimageStorage());
-    final MutableWorldState remoteWorldState = remoteWorldStateArchive.getMutable();
-
-    // Generate accounts and save corresponding state root
-    List<Account> accounts = dataGen.createRandomAccounts(remoteWorldState, 10);
-    final Hash stateRoot = remoteWorldState.rootHash();
-    assertThat(stateRoot).isNotEqualTo(EMPTY_TRIE_ROOT); // Sanity check
-    final BlockHeader header =
-        dataGen.block(BlockOptions.create().setStateRoot(stateRoot).setBlockNumber(10)).getHeader();
-
-    // Add some nodes to the taskCollection
-    final CachingTaskCollection<NodeDataRequest> taskCollection =
-        spy(new CachingTaskCollection<>(new InMemoryTaskQueue<>()));
-    List<Bytes32> queuedHashes = getFirstSetOfChildNodeRequests(remoteStorage, stateRoot);
-    assertThat(queuedHashes.size()).isGreaterThan(0); // Sanity check
-    for (Bytes32 bytes32 : queuedHashes) {
-      taskCollection.add(new AccountTrieNodeDataRequest(Hash.wrap(bytes32)));
-    }
-    // Sanity check
-    for (final Bytes32 bytes32 : queuedHashes) {
-      final Hash hash = Hash.wrap(bytes32);
-      verify(taskCollection, times(1)).add(argThat((r) -> r.getHash().equals(hash)));
-    }
-
-    final WorldStateStorage localStorage =
-        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
-    final SynchronizerConfiguration syncConfig =
-        SynchronizerConfiguration.builder().worldStateMaxRequestsWithoutProgress(10).build();
-    final WorldStateDownloader downloader =
-        createDownloader(syncConfig, ethProtocolManager.ethContext(), localStorage, taskCollection);
-
-    // Create a peer that can respond
-    final RespondingEthPeer peer =
-        EthProtocolManagerTestUtil.createPeer(ethProtocolManager, header.getNumber());
-
-    // Respond to node data requests
-    final List<MessageData> sentMessages = new ArrayList<>();
-    final RespondingEthPeer.Responder blockChainResponder =
-        RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive);
-    final RespondingEthPeer.Responder responder =
-        RespondingEthPeer.wrapResponderWithCollector(blockChainResponder, sentMessages);
-
-    CompletableFuture<Void> result = downloader.run(header);
-    peer.respondWhileOtherThreadsWork(responder, () -> !result.isDone());
-    assertThat(localStorage.isWorldStateAvailable(stateRoot)).isTrue();
-
-    // Check that already enqueued trie nodes were requested
-    final List<Bytes32> requestedHashes =
-        sentMessages.stream()
-            .filter(m -> m.getCode() == EthPV63.GET_NODE_DATA)
-            .map(GetNodeDataMessage::readFrom)
-            .flatMap(m -> StreamSupport.stream(m.hashes().spliterator(), true))
-            .collect(Collectors.toList());
-    assertThat(requestedHashes.size()).isGreaterThan(0);
-    assertThat(requestedHashes).containsAll(queuedHashes);
-
-    // Check that already enqueued requests were not enqueued more than once
-    for (Bytes32 bytes32 : queuedHashes) {
-      final Hash hash = Hash.wrap(bytes32);
-      verify(taskCollection, times(1)).add(argThat((r) -> r.getHash().equals(hash)));
-    }
-
-    // Check that all expected account data was downloaded
-    assertThat(result).isDone();
-    final WorldStateArchive localWorldStateArchive =
-        new DefaultWorldStateArchive(localStorage, createPreimageStorage());
-    final WorldState localWorldState = localWorldStateArchive.get(stateRoot).get();
-    assertAccountsMatch(localWorldState, accounts);
-  }
-
-  /**
-   * Walks through trie represented by the given rootHash and returns hash-node pairs that would
-   * need to be requested from the network in order to reconstruct this trie, excluding the root
-   * node.
-   *
-   * @param storage Storage holding node data required to reconstitute the trie represented by
-   *     rootHash
-   * @param rootHash The hash of the root node of some trie
-   * @param maxNodes The maximum number of values to collect before returning
-   * @return A list of hash-node pairs
-   */
-  private Map<Bytes32, Bytes> collectTrieNodesToBeRequestedAfterRoot(
-      final WorldStateStorage storage, final Bytes32 rootHash, final int maxNodes) {
-    final Map<Bytes32, Bytes> trieNodes = new HashMap<>();
-
-    TrieNodeDecoder.breadthFirstDecoder(storage::getNodeData, rootHash)
-        .filter(n -> !Objects.equals(n.getHash(), rootHash))
-        .filter(Node::isReferencedByHash)
-        .limit(maxNodes)
-        .forEach((n) -> trieNodes.put(n.getHash(), n.getRlp()));
-
-    return trieNodes;
-  }
-
-  /**
-   * Returns the first set of node hashes that would need to be requested from the network after
-   * retrieving the root node in order to rebuild the trie represented by the given rootHash and
-   * storage.
-   *
-   * @param storage Storage holding node data required to reconstitute the trie represented by
-   *     rootHash
-   * @param rootHash The hash of the root node of some trie
-   * @return A list of node hashes
-   */
-  private List<Bytes32> getFirstSetOfChildNodeRequests(
-      final WorldStateStorage storage, final Bytes32 rootHash) {
-    final List<Bytes32> hashesToRequest = new ArrayList<>();
-
-    final Bytes rootNodeRlp = storage.getNodeData(Bytes.EMPTY, rootHash).get();
-    TrieNodeDecoder.decodeNodes(Bytes.EMPTY, rootNodeRlp).stream()
-        .filter(n -> !Objects.equals(n.getHash(), rootHash))
-        .filter(Node::isReferencedByHash)
-        .forEach((n) -> hashesToRequest.add(n.getHash()));
-
-    return hashesToRequest;
-  }
-
-  private void downloadAvailableWorldStateFromPeers(
-      final int peerCount,
-      final int accountCount,
-      final int hashesPerRequest,
-      final int maxOutstandingRequests) {
-    downloadAvailableWorldStateFromPeers(
-        peerCount, accountCount, hashesPerRequest, maxOutstandingRequests, this::respondFully);
-  }
-
-  private void downloadAvailableWorldStateFromPeers(
-      final int peerCount,
-      final int accountCount,
-      final int hashesPerRequest,
-      final int maxOutstandingRequests,
-      final NetworkResponder networkResponder) {
-    final int trailingPeerCount = 5;
-
-    // Setup "remote" state
-    final WorldStateStorage remoteStorage =
-        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
-    final WorldStateArchive remoteWorldStateArchive =
-        new DefaultWorldStateArchive(remoteStorage, createPreimageStorage());
-    final MutableWorldState remoteWorldState = remoteWorldStateArchive.getMutable();
-
-    // Generate accounts and save corresponding state root
-    final List<Account> accounts = dataGen.createRandomAccounts(remoteWorldState, accountCount);
-    final Hash stateRoot = remoteWorldState.rootHash();
-    assertThat(stateRoot).isNotEqualTo(EMPTY_TRIE_ROOT); // Sanity check
-    final BlockHeader header =
-        dataGen.block(BlockOptions.create().setStateRoot(stateRoot).setBlockNumber(10)).getHeader();
-
-    // Generate more data that should not be downloaded
-    final List<Account> otherAccounts = dataGen.createRandomAccounts(remoteWorldState, 5);
-    final Hash otherStateRoot = remoteWorldState.rootHash();
-    final BlockHeader otherHeader =
-        dataGen
-            .block(BlockOptions.create().setStateRoot(otherStateRoot).setBlockNumber(11))
-            .getHeader();
-    assertThat(otherStateRoot).isNotEqualTo(stateRoot); // Sanity check
-
-    final CachingTaskCollection<NodeDataRequest> taskCollection =
-        new CachingTaskCollection<>(new InMemoryTaskQueue<>());
-    final WorldStateStorage localStorage =
-        new WorldStateKeyValueStorage(new InMemoryKeyValueStorage());
-    final WorldStateArchive localWorldStateArchive =
-        new DefaultWorldStateArchive(localStorage, createPreimageStorage());
-    final SynchronizerConfiguration syncConfig =
-        SynchronizerConfiguration.builder()
-            .worldStateHashCountPerRequest(hashesPerRequest)
-            .worldStateRequestParallelism(maxOutstandingRequests)
-            .build();
-    final WorldStateDownloader downloader =
-        createDownloader(syncConfig, ethProtocolManager.ethContext(), localStorage, taskCollection);
-
-    // Create some peers that can respond
-    final List<RespondingEthPeer> usefulPeers =
-        Stream.generate(
-                () -> EthProtocolManagerTestUtil.createPeer(ethProtocolManager, header.getNumber()))
-            .limit(peerCount)
-            .collect(Collectors.toList());
-    // And some irrelevant peers
-    final List<RespondingEthPeer> trailingPeers =
-        Stream.generate(
-                () ->
-                    EthProtocolManagerTestUtil.createPeer(
-                        ethProtocolManager, header.getNumber() - 1L))
-            .limit(trailingPeerCount)
-            .collect(Collectors.toList());
-
-    // Start downloader
-    final CompletableFuture<?> result = downloader.run(header);
-    // A second run should return an error without impacting the first result
-    final CompletableFuture<?> secondResult = downloader.run(header);
-    assertThat(secondResult).isCompletedExceptionally();
-    assertThat(result).isNotCompletedExceptionally();
-
-    // Respond to node data requests
-    // Send one round of full responses, so that we can get multiple requests queued up
-    final RespondingEthPeer.Responder fullResponder =
-        RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive);
-    for (final RespondingEthPeer peer : usefulPeers) {
-      peer.respond(fullResponder);
-    }
-    // Respond to remaining queued requests in custom way
-    networkResponder.respond(usefulPeers, remoteWorldStateArchive, result);
-
-    // Check that trailing peers were not queried for data
-    for (final RespondingEthPeer trailingPeer : trailingPeers) {
-      assertThat(trailingPeer.hasOutstandingRequests()).isFalse();
-    }
-
-    // Check that all expected account data was downloaded
-    final WorldState localWorldState = localWorldStateArchive.get(stateRoot).get();
-    assertThat(result).isDone();
-    assertAccountsMatch(localWorldState, accounts);
-
-    // We shouldn't have any extra data locally
-    assertThat(localStorage.contains(otherHeader.getStateRoot())).isFalse();
-    for (final Account otherAccount : otherAccounts) {
-      assertThat(localWorldState.get(otherAccount.getAddress())).isNull();
-    }
-  }
-
-  private void respondFully(
-      final List<RespondingEthPeer> peers,
-      final WorldStateArchive remoteWorldStateArchive,
-      final CompletableFuture<?> downloaderFuture) {
-    final RespondingEthPeer.Responder responder =
-        RespondingEthPeer.blockchainResponder(mock(Blockchain.class), remoteWorldStateArchive);
-    respondUntilDone(peers, responder, downloaderFuture);
-  }
-
-  private void respondPartially(
-      final List<RespondingEthPeer> peers,
-      final WorldStateArchive remoteWorldStateArchive,
-      final CompletableFuture<?> downloaderFuture) {
-    final RespondingEthPeer.Responder fullResponder =
-        RespondingEthPeer.blockchainResponder(
-            mock(Blockchain.class), remoteWorldStateArchive, mock(TransactionPool.class));
-    final RespondingEthPeer.Responder partialResponder =
-        RespondingEthPeer.partialResponder(
-            mock(Blockchain.class),
-            remoteWorldStateArchive,
-            mock(TransactionPool.class),
-            ProtocolScheduleFixture.MAINNET,
-            .5f);
-    final RespondingEthPeer.Responder emptyResponder = RespondingEthPeer.emptyResponder();
-
-    // Send a few partial responses
-    for (int i = 0; i < 5; i++) {
-      for (final RespondingEthPeer peer : peers) {
-        peer.respond(partialResponder);
-      }
-      giveOtherThreadsAGo();
-    }
-
-    // Downloader should not complete with partial responses
-    assertThat(downloaderFuture).isNotDone();
-
-    // Send a few empty responses
-    for (int i = 0; i < 3; i++) {
-      for (final RespondingEthPeer peer : peers) {
-        peer.respond(emptyResponder);
-      }
-      giveOtherThreadsAGo();
-    }
-
-    // Downloader should not complete with empty responses
-    assertThat(downloaderFuture).isNotDone();
-
-    respondUntilDone(peers, fullResponder, downloaderFuture);
-  }
-
-  private void assertAccountsMatch(
-      final WorldState worldState, final List<Account> expectedAccounts) {
-    for (final Account expectedAccount : expectedAccounts) {
-      final Account actualAccount = worldState.get(expectedAccount.getAddress());
-      assertThat(actualAccount).isNotNull();
-      // Check each field
-      assertThat(actualAccount.getNonce()).isEqualTo(expectedAccount.getNonce());
-      assertThat(actualAccount.getCode()).isEqualTo(expectedAccount.getCode());
-      assertThat(actualAccount.getBalance()).isEqualTo(expectedAccount.getBalance());
-
-      final Map<Bytes32, AccountStorageEntry> actualStorage =
-          actualAccount.storageEntriesFrom(Bytes32.ZERO, 500);
-      final Map<Bytes32, AccountStorageEntry> expectedStorage =
-          expectedAccount.storageEntriesFrom(Bytes32.ZERO, 500);
-      assertThat(actualStorage).isEqualTo(expectedStorage);
-    }
-  }
-
-  private WorldStateDownloader createDownloader(
-      final EthContext context,
-      final WorldStateStorage storage,
-      final CachingTaskCollection<NodeDataRequest> taskCollection) {
-    return createDownloader(
-        SynchronizerConfiguration.builder().build(), context, storage, taskCollection);
-  }
-
-  private WorldStateDownloader createDownloader(
-      final SynchronizerConfiguration config,
-      final EthContext context,
-      final WorldStateStorage storage,
-      final CachingTaskCollection<NodeDataRequest> taskCollection) {
-    return new WorldStateDownloader(
-        context,
-        storage,
-        taskCollection,
-        config.getWorldStateHashCountPerRequest(),
-        config.getWorldStateRequestParallelism(),
-        config.getWorldStateMaxRequestsWithoutProgress(),
-        config.getWorldStateMinMillisBeforeStalling(),
-        TestClock.fixed(),
-        new NoOpMetricsSystem());
-  }
-
-  private WorldStatePreimageStorage createPreimageStorage() {
-    return new WorldStatePreimageKeyValueStorage(new InMemoryKeyValueStorage());
-  }
-
-  private void respondUntilDone(
-      final List<RespondingEthPeer> peers,
-      final RespondingEthPeer.Responder responder,
-      final CompletableFuture<?> result) {
-    if (peers.size() == 1) {
-      // Use a blocking approach to waiting for the next message when we can.
-      peers.get(0).respondWhileOtherThreadsWork(responder, () -> !result.isDone());
-      return;
-    }
-    while (!result.isDone()) {
-      for (final RespondingEthPeer peer : peers) {
-        peer.respond(responder);
-      }
-      giveOtherThreadsAGo();
-    }
-  }
-
-  private void giveOtherThreadsAGo() {
-    LockSupport.parkNanos(200);
-  }
-
-  @FunctionalInterface
-  private interface NetworkResponder {
-    void respond(
-        final List<RespondingEthPeer> peers,
-        final WorldStateArchive remoteWorldStateArchive,
-        final CompletableFuture<?> downloaderFuture);
-  }
-}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/AbstractTransactionPoolTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/AbstractTransactionPoolTest.java
new file mode 100644
index 00000000000..4312b63c329
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/AbstractTransactionPoolTest.java
@@ -0,0 +1,734 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.mainnet.ValidationResult.valid;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.EXCEEDS_BLOCK_GAS_LIMIT;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.GAS_PRICE_TOO_LOW;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.NONCE_TOO_FAR_IN_FUTURE_FOR_SENDER;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.NONCE_TOO_LOW;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.TRANSACTION_REPLACEMENT_UNDERPRICED;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.TX_FEECAP_EXCEEDED;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+import static org.mockito.quality.Strictness.LENIENT;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.ExecutionContextTestFixture;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
+import org.hyperledger.besu.ethereum.eth.messages.EthPV65;
+import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionValidator;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
+import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.math.BigInteger;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+
+@SuppressWarnings("unchecked")
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = LENIENT)
+public abstract class AbstractTransactionPoolTest {
+
+  protected static final int MAX_TRANSACTIONS = 5;
+  protected static final KeyPair KEY_PAIR1 =
+      SignatureAlgorithmFactory.getInstance().generateKeyPair();
+
+  private static final KeyPair KEY_PAIR2 =
+      SignatureAlgorithmFactory.getInstance().generateKeyPair();
+  @Mock protected MainnetTransactionValidator transactionValidator;
+  @Mock protected PendingTransactionAddedListener listener;
+  @Mock protected MiningParameters miningParameters;
+  @Mock protected TransactionsMessageSender transactionsMessageSender;
+  @Mock protected NewPooledTransactionHashesMessageSender newPooledTransactionHashesMessageSender;
+  @Mock protected ProtocolSpec protocolSpec;
+
+  protected ProtocolSchedule protocolSchedule;
+
+  protected final MetricsSystem metricsSystem = new NoOpMetricsSystem();
+  protected MutableBlockchain blockchain;
+  private TransactionBroadcaster transactionBroadcaster;
+
+  protected PendingTransactions transactions;
+  private final Transaction transaction1 = createTransaction(1);
+  private final Transaction transaction2 = createTransaction(2);
+
+  private final Transaction transactionOtherSender = createTransaction(1, KEY_PAIR2);
+  private ExecutionContextTestFixture executionContext;
+  protected ProtocolContext protocolContext;
+  protected TransactionPool transactionPool;
+  protected long blockGasLimit;
+  protected EthProtocolManager ethProtocolManager;
+  private EthContext ethContext;
+  private PeerTransactionTracker peerTransactionTracker;
+  private ArgumentCaptor<Runnable> syncTaskCapture;
+
+  protected abstract PendingTransactions createPendingTransactionsSorter();
+
+  protected abstract ExecutionContextTestFixture createExecutionContextTestFixture();
+
+  protected abstract FeeMarket getFeeMarket();
+
+  @BeforeEach
+  public void setUp() {
+    executionContext = createExecutionContextTestFixture();
+    protocolContext = executionContext.getProtocolContext();
+    blockchain = executionContext.getBlockchain();
+    transactions = spy(createPendingTransactionsSorter());
+    when(protocolSpec.getTransactionValidator()).thenReturn(transactionValidator);
+    when(protocolSpec.getFeeMarket()).thenReturn(getFeeMarket());
+    protocolSchedule = spy(executionContext.getProtocolSchedule());
+    doReturn(protocolSpec).when(protocolSchedule).getByBlockHeader(any());
+    blockGasLimit = blockchain.getChainHeadBlock().getHeader().getGasLimit();
+    ethProtocolManager = EthProtocolManagerTestUtil.create();
+    ethContext = spy(ethProtocolManager.ethContext());
+
+    final EthScheduler ethScheduler = mock(EthScheduler.class);
+    syncTaskCapture = ArgumentCaptor.forClass(Runnable.class);
+    doNothing().when(ethScheduler).scheduleSyncWorkerTask(syncTaskCapture.capture());
+    doReturn(ethScheduler).when(ethContext).getScheduler();
+
+    peerTransactionTracker = new PeerTransactionTracker();
+    transactionBroadcaster =
+        spy(
+            new TransactionBroadcaster(
+                ethContext,
+                peerTransactionTracker,
+                transactionsMessageSender,
+                newPooledTransactionHashesMessageSender));
+
+    transactionPool = createTransactionPool();
+    blockchain.observeBlockAdded(transactionPool);
+    when(miningParameters.getMinTransactionGasPrice()).thenReturn(Wei.of(2));
+  }
+
+  protected TransactionPool createTransactionPool() {
+    return createTransactionPool(b -> {});
+  }
+
+  protected TransactionPool createTransactionPool(
+      final Consumer<ImmutableTransactionPoolConfiguration.Builder> configConsumer) {
+    final ImmutableTransactionPoolConfiguration.Builder configBuilder =
+        ImmutableTransactionPoolConfiguration.builder();
+    configConsumer.accept(configBuilder);
+    final TransactionPoolConfiguration config = configBuilder.build();
+
+    final TransactionPool txPool =
+        new TransactionPool(
+            () -> transactions,
+            protocolSchedule,
+            protocolContext,
+            transactionBroadcaster,
+            ethContext,
+            miningParameters,
+            new TransactionPoolMetrics(metricsSystem),
+            config);
+
+    txPool.setEnabled();
+    return txPool;
+  }
+
+  @ParameterizedTest
+  @ValueSource(booleans = {true, false})
+  public void localTransactionHappyPath(final boolean disableLocalTxs) {
+    this.transactionPool = createTransactionPool(b -> b.disableLocalTransactions(disableLocalTxs));
+    final Transaction transaction = createTransaction(0);
+
+    givenTransactionIsValid(transaction);
+
+    assertTransactionViaApiValid(transaction, disableLocalTxs);
+  }
+
+  @ParameterizedTest
+  @ValueSource(booleans = {true, false})
+  public void shouldReturnExclusivelyLocalTransactionsWhenAppropriate(
+      final boolean disableLocalTxs) {
+    this.transactionPool = createTransactionPool(b -> b.disableLocalTransactions(disableLocalTxs));
+    final Transaction localTransaction0 = createTransaction(0);
+
+    givenTransactionIsValid(localTransaction0);
+    givenTransactionIsValid(transaction1);
+    givenTransactionIsValid(transaction2);
+
+    assertTransactionViaApiValid(localTransaction0, disableLocalTxs);
+    assertRemoteTransactionValid(transaction1);
+    assertRemoteTransactionValid(transaction2);
+
+    assertThat(transactions.size()).isEqualTo(3);
+    List<Transaction> localTransactions = transactions.getLocalTransactions();
+    assertThat(localTransactions.size()).isEqualTo(disableLocalTxs ? 0 : 1);
+  }
+
+  @Test
+  public void shouldRemoveTransactionsFromPendingListWhenIncludedInBlockOnchain() {
+    transactions.addRemoteTransaction(transaction1, Optional.empty());
+    assertTransactionPending(transaction1);
+    appendBlock(transaction1);
+
+    assertTransactionNotPending(transaction1);
+  }
+
+  @Test
+  public void shouldRemoveMultipleTransactionsAddedInOneBlock() {
+    transactions.addRemoteTransaction(transaction1, Optional.empty());
+    transactions.addRemoteTransaction(transaction2, Optional.empty());
+    appendBlock(transaction1, transaction2);
+
+    assertTransactionNotPending(transaction1);
+    assertTransactionNotPending(transaction2);
+    assertThat(transactions.size()).isZero();
+  }
+
+  @Test
+  public void shouldIgnoreUnknownTransactionsThatAreAddedInABlock() {
+    transactions.addRemoteTransaction(transaction1, Optional.empty());
+    appendBlock(transaction1, transaction2);
+
+    assertTransactionNotPending(transaction1);
+    assertTransactionNotPending(transaction2);
+    assertThat(transactions.size()).isZero();
+  }
+
+  @Test
+  public void shouldNotRemovePendingTransactionsWhenABlockAddedToAFork() {
+    transactions.addRemoteTransaction(transaction1, Optional.empty());
+    final BlockHeader commonParent = getHeaderForCurrentChainHead();
+    final Block canonicalHead = appendBlock(Difficulty.of(1000), commonParent);
+    appendBlock(Difficulty.ONE, commonParent, transaction1);
+
+    verifyChainHeadIs(canonicalHead);
+
+    assertTransactionPending(transaction1);
+  }
+
+  @Test
+  public void shouldRemovePendingTransactionsFromAllBlocksOnAForkWhenItBecomesTheCanonicalChain() {
+    transactions.addRemoteTransaction(transaction1, Optional.empty());
+    transactions.addRemoteTransaction(transaction2, Optional.empty());
+    final BlockHeader commonParent = getHeaderForCurrentChainHead();
+    final Block originalChainHead = appendBlock(Difficulty.of(1000), commonParent);
+
+    final Block forkBlock1 = appendBlock(Difficulty.ONE, commonParent, transaction1);
+    verifyChainHeadIs(originalChainHead);
+
+    final Block forkBlock2 = appendBlock(Difficulty.of(2000), forkBlock1.getHeader(), transaction2);
+    verifyChainHeadIs(forkBlock2);
+
+    assertTransactionNotPending(transaction1);
+    assertTransactionNotPending(transaction2);
+  }
+
+  @Test
+  public void shouldReAddTransactionsFromThePreviousCanonicalHeadWhenAReorgOccurs() {
+    givenTransactionIsValid(transaction1);
+    givenTransactionIsValid(transactionOtherSender);
+    transactions.addLocalTransaction(transaction1, Optional.empty());
+    transactions.addRemoteTransaction(transactionOtherSender, Optional.empty());
+    final BlockHeader commonParent = getHeaderForCurrentChainHead();
+    final Block originalFork1 = appendBlock(Difficulty.of(1000), commonParent, transaction1);
+    final Block originalFork2 =
+        appendBlock(Difficulty.ONE, originalFork1.getHeader(), transactionOtherSender);
+    assertTransactionNotPending(transaction1);
+    assertTransactionNotPending(transactionOtherSender);
+    assertThat(transactions.getLocalTransactions()).isEmpty();
+
+    final Block reorgFork1 = appendBlock(Difficulty.ONE, commonParent);
+    verifyChainHeadIs(originalFork2);
+
+    transactions.subscribePendingTransactions(listener);
+    final Block reorgFork2 = appendBlock(Difficulty.of(2000), reorgFork1.getHeader());
+    verifyChainHeadIs(reorgFork2);
+
+    assertTransactionPending(transaction1);
+    assertTransactionPending(transactionOtherSender);
+    assertThat(transactions.getLocalTransactions()).contains(transaction1);
+    assertThat(transactions.getLocalTransactions()).doesNotContain(transactionOtherSender);
+    verify(listener).onTransactionAdded(transaction1);
+    verify(listener).onTransactionAdded(transactionOtherSender);
+    verifyNoMoreInteractions(listener);
+  }
+
+  @Test
+  public void shouldNotReAddTransactionsThatAreInBothForksWhenReorgHappens() {
+    givenTransactionIsValid(transaction1);
+    givenTransactionIsValid(transaction2);
+    transactions.addRemoteTransaction(transaction1, Optional.empty());
+    transactions.addRemoteTransaction(transaction2, Optional.empty());
+    final BlockHeader commonParent = getHeaderForCurrentChainHead();
+    final Block originalFork1 = appendBlock(Difficulty.of(1000), commonParent, transaction1);
+    final Block originalFork2 =
+        appendBlock(Difficulty.ONE, originalFork1.getHeader(), transaction2);
+    assertTransactionNotPending(transaction1);
+    assertTransactionNotPending(transaction2);
+
+    final Block reorgFork1 = appendBlock(Difficulty.ONE, commonParent, transaction1);
+    verifyChainHeadIs(originalFork2);
+
+    final Block reorgFork2 = appendBlock(Difficulty.of(2000), reorgFork1.getHeader());
+    verifyChainHeadIs(reorgFork2);
+
+    assertTransactionNotPending(transaction1);
+    assertTransactionPending(transaction2);
+  }
+
+  @ParameterizedTest
+  @ValueSource(booleans = {true, false})
+  public void addLocalTransaction_strictReplayProtectionOn_txWithChainId_chainIdIsConfigured(
+      final boolean disableLocalTxs) {
+    protocolSupportsTxReplayProtection(1337, true);
+    transactionPool =
+        createTransactionPool(
+            b ->
+                b.strictTransactionReplayProtectionEnabled(true)
+                    .disableLocalTransactions(disableLocalTxs));
+    final Transaction tx = createTransaction(1);
+    givenTransactionIsValid(tx);
+
+    assertTransactionViaApiValid(tx, disableLocalTxs);
+  }
+
+  @Test
+  public void addRemoteTransactions_strictReplayProtectionOn_txWithChainId_chainIdIsConfigured() {
+    protocolSupportsTxReplayProtection(1337, true);
+    transactionPool = createTransactionPool(b -> b.strictTransactionReplayProtectionEnabled(true));
+    final Transaction tx = createTransaction(1);
+    givenTransactionIsValid(tx);
+
+    assertRemoteTransactionValid(tx);
+  }
+
+  @Test
+  public void shouldNotAddRemoteTransactionsWhenGasPriceBelowMinimum() {
+    final Transaction transaction = createTransaction(1, Wei.ONE);
+    transactionPool.addRemoteTransactions(singletonList(transaction));
+
+    assertTransactionNotPending(transaction);
+    verifyNoMoreInteractions(transactionValidator);
+  }
+
+  @Test
+  public void shouldNotAddRemoteTransactionsWhenThereIsAnLowestInvalidNonceForTheSender() {
+    givenTransactionIsValid(transaction2);
+    when(transactionValidator.validate(eq(transaction1), any(Optional.class), any()))
+        .thenReturn(ValidationResult.invalid(NONCE_TOO_LOW));
+
+    transactionPool.addRemoteTransactions(asList(transaction1, transaction2));
+
+    assertTransactionNotPending(transaction1);
+    assertTransactionNotPending(transaction2);
+    verify(transactionBroadcaster, never()).onTransactionsAdded(singletonList(transaction2));
+  }
+
+  @Test
+  public void shouldNotAddRemoteTransactionsThatAreInvalidAccordingToStateDependentChecks() {
+    givenTransactionIsValid(transaction1);
+    givenTransactionIsValid(transaction2);
+    when(transactionValidator.validateForSender(
+            eq(transaction2), eq(null), any(TransactionValidationParams.class)))
+        .thenReturn(ValidationResult.invalid(NONCE_TOO_LOW));
+    transactionPool.addRemoteTransactions(asList(transaction1, transaction2));
+
+    assertTransactionPending(transaction1);
+    assertTransactionNotPending(transaction2);
+    verify(transactionBroadcaster).onTransactionsAdded(singletonList(transaction1));
+    verify(transactionValidator).validate(eq(transaction1), any(Optional.class), any());
+    verify(transactionValidator)
+        .validateForSender(eq(transaction1), eq(null), any(TransactionValidationParams.class));
+    verify(transactionValidator).validate(eq(transaction2), any(Optional.class), any());
+    verify(transactionValidator).validateForSender(eq(transaction2), any(), any());
+    verifyNoMoreInteractions(transactionValidator);
+  }
+
+  @ParameterizedTest
+  @ValueSource(booleans = {true, false})
+  public void shouldAllowSequenceOfTransactionsWithIncreasingNonceFromSameSender(
+      final boolean disableLocalTxs) {
+    transactionPool = createTransactionPool(b -> b.disableLocalTransactions(disableLocalTxs));
+    final Transaction transaction1 = createTransaction(1);
+    final Transaction transaction2 = createTransaction(2);
+    final Transaction transaction3 = createTransaction(3);
+
+    givenTransactionIsValid(transaction1);
+    givenTransactionIsValid(transaction2);
+    givenTransactionIsValid(transaction3);
+
+    assertTransactionViaApiValid(transaction1, disableLocalTxs);
+    assertTransactionViaApiValid(transaction2, disableLocalTxs);
+    assertTransactionViaApiValid(transaction3, disableLocalTxs);
+  }
+
+  @Test
+  public void
+      shouldAllowSequenceOfTransactionsWithIncreasingNonceFromSameSenderWhenSentInBatchOutOfOrder() {
+    final Transaction transaction1 = createTransaction(1);
+    final Transaction transaction2 = createTransaction(2);
+    final Transaction transaction3 = createTransaction(3);
+
+    givenTransactionIsValid(transaction1);
+    givenTransactionIsValid(transaction2);
+    givenTransactionIsValid(transaction3);
+
+    assertRemoteTransactionValid(transaction3);
+    assertRemoteTransactionValid(transaction1);
+    assertRemoteTransactionValid(transaction2);
+  }
+
+  @Test
+  public void shouldDiscardRemoteTransactionThatAlreadyExistsBeforeValidation() {
+    doReturn(true).when(transactions).containsTransaction(transaction1);
+    transactionPool.addRemoteTransactions(singletonList(transaction1));
+
+    verify(transactions).containsTransaction(transaction1);
+    verifyNoInteractions(transactionValidator);
+  }
+
+  @Test
+  public void shouldNotNotifyBatchListenerWhenRemoteTransactionDoesNotReplaceExisting() {
+    final Transaction transaction1 = createTransaction(1, Wei.of(100));
+    final Transaction transaction2 = createTransaction(1, Wei.of(50));
+
+    givenTransactionIsValid(transaction1);
+    givenTransactionIsValid(transaction2);
+
+    assertRemoteTransactionValid(transaction1);
+    assertRemoteTransactionInvalid(transaction2);
+  }
+
+  @ParameterizedTest
+  @ValueSource(booleans = {true, false})
+  public void shouldNotNotifyBatchListenerWhenLocalTransactionDoesNotReplaceExisting(
+      final boolean disableLocalTxs) {
+    transactionPool = createTransactionPool(b -> b.disableLocalTransactions(disableLocalTxs));
+    final Transaction transaction1 = createTransaction(1, Wei.of(10));
+    final Transaction transaction2 = createTransaction(1, Wei.of(9));
+
+    givenTransactionIsValid(transaction1);
+    givenTransactionIsValid(transaction2);
+
+    assertTransactionViaApiValid(transaction1, disableLocalTxs);
+    assertTransactionViaApiInvalid(transaction2, TRANSACTION_REPLACEMENT_UNDERPRICED);
+  }
+
+  @Test
+  public void shouldRejectLocalTransactionsWhereGasLimitExceedBlockGasLimit() {
+    final Transaction transaction1 =
+        createBaseTransaction(0).gasLimit(blockGasLimit + 1).createTransaction(KEY_PAIR1);
+
+    givenTransactionIsValid(transaction1);
+
+    assertTransactionViaApiInvalid(transaction1, EXCEEDS_BLOCK_GAS_LIMIT);
+  }
+
+  @Test
+  public void shouldRejectRemoteTransactionsWhereGasLimitExceedBlockGasLimit() {
+    final Transaction transaction1 =
+        createBaseTransaction(0).gasLimit(blockGasLimit + 1).createTransaction(KEY_PAIR1);
+
+    givenTransactionIsValid(transaction1);
+
+    assertRemoteTransactionInvalid(transaction1);
+  }
+
+  @Test
+  public void shouldRejectRemoteTransactionsAnInvalidTransactionWithLowerNonceExists() {
+    final Transaction invalidTx =
+        createBaseTransaction(0).gasLimit(blockGasLimit + 1).createTransaction(KEY_PAIR1);
+
+    final Transaction nextTx = createTransaction(1);
+
+    givenTransactionIsValid(invalidTx);
+    givenTransactionIsValid(nextTx);
+
+    assertRemoteTransactionInvalid(invalidTx);
+    assertRemoteTransactionInvalid(nextTx);
+  }
+
+  @Test
+  public void shouldAcceptLocalTransactionsEvenIfAnInvalidTransactionWithLowerNonceExists() {
+    transactionPool = createTransactionPool(b -> b.disableLocalTransactions(false));
+    final Transaction invalidTx =
+        createBaseTransaction(0).gasLimit(blockGasLimit + 1).createTransaction(KEY_PAIR1);
+
+    final Transaction nextTx = createBaseTransaction(1).gasLimit(1).createTransaction(KEY_PAIR1);
+
+    givenTransactionIsValid(invalidTx);
+    givenTransactionIsValid(nextTx);
+
+    assertTransactionViaApiInvalid(invalidTx, EXCEEDS_BLOCK_GAS_LIMIT);
+    assertTransactionViaApiValid(nextTx, false);
+  }
+
+  @ParameterizedTest
+  @ValueSource(booleans = {true, false})
+  public void shouldRejectLocalTransactionsWhenNonceTooFarInFuture(final boolean disableLocalTxs) {
+    transactionPool = createTransactionPool(b -> b.disableLocalTransactions(disableLocalTxs));
+    final Transaction transaction1 = createTransaction(Integer.MAX_VALUE);
+
+    givenTransactionIsValid(transaction1);
+
+    assertTransactionViaApiInvalid(transaction1, NONCE_TOO_FAR_IN_FUTURE_FOR_SENDER);
+  }
+
+  @Test
+  public void shouldNotNotifyBatchListenerIfNoTransactionsAreAdded() {
+    transactionPool.addRemoteTransactions(emptyList());
+    verifyNoInteractions(transactionBroadcaster);
+  }
+
+  @Test
+  public void shouldSendPooledTransactionHashesIfPeerSupportsEth65() {
+    EthPeer peer = mock(EthPeer.class);
+    when(peer.hasSupportForMessage(EthPV65.NEW_POOLED_TRANSACTION_HASHES)).thenReturn(true);
+
+    givenTransactionIsValid(transaction1);
+    transactionPool.addLocalTransaction(transaction1);
+    transactionPool.handleConnect(peer);
+    syncTaskCapture.getValue().run();
+    verify(newPooledTransactionHashesMessageSender).sendTransactionHashesToPeer(peer);
+  }
+
+  @Test
+  public void shouldSendFullTransactionsIfPeerDoesNotSupportEth65() {
+    EthPeer peer = mock(EthPeer.class);
+    when(peer.hasSupportForMessage(EthPV65.NEW_POOLED_TRANSACTION_HASHES)).thenReturn(false);
+
+    givenTransactionIsValid(transaction1);
+    transactionPool.addLocalTransaction(transaction1);
+    transactionPool.handleConnect(peer);
+    syncTaskCapture.getValue().run();
+    verify(transactionsMessageSender).sendTransactionsToPeer(peer);
+  }
+
+  @Test
+  public void shouldSendFullTransactionPoolToNewlyConnectedPeer() {
+    final Transaction transactionLocal = createTransaction(1);
+    final Transaction transactionRemote = createTransaction(2);
+
+    givenTransactionIsValid(transactionLocal);
+    givenTransactionIsValid(transactionRemote);
+
+    transactionPool.addLocalTransaction(transactionLocal);
+    transactionPool.addRemoteTransactions(Collections.singletonList(transactionRemote));
+
+    RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager);
+
+    Set<Transaction> transactionsToSendToPeer =
+        peerTransactionTracker.claimTransactionsToSendToPeer(peer.getEthPeer());
+
+    assertThat(transactionsToSendToPeer).contains(transactionLocal, transactionRemote);
+  }
+
+  @Test
+  public void shouldCallValidatorWithExpectedValidationParameters() {
+    final ArgumentCaptor<TransactionValidationParams> txValidationParamCaptor =
+        ArgumentCaptor.forClass(TransactionValidationParams.class);
+
+    when(transactionValidator.validate(eq(transaction1), any(Optional.class), any()))
+        .thenReturn(valid());
+    when(transactionValidator.validateForSender(any(), any(), txValidationParamCaptor.capture()))
+        .thenReturn(valid());
+
+    final TransactionValidationParams expectedValidationParams =
+        TransactionValidationParams.transactionPool();
+
+    transactionPool.addLocalTransaction(transaction1);
+
+    assertThat(txValidationParamCaptor.getValue())
+        .usingRecursiveComparison()
+        .isEqualTo(expectedValidationParams);
+  }
+
+  @ParameterizedTest
+  @ValueSource(booleans = {true, false})
+  public void shouldIgnoreFeeCapIfSetZero(final boolean disableLocalTxs) {
+    final Wei twoEthers = Wei.fromEth(2);
+    transactionPool =
+        createTransactionPool(b -> b.txFeeCap(Wei.ZERO).disableLocalTransactions(disableLocalTxs));
+    final Transaction transaction = createTransaction(1, twoEthers.add(Wei.of(1)));
+
+    givenTransactionIsValid(transaction);
+
+    assertTransactionViaApiValid(transaction, disableLocalTxs);
+  }
+
+  @Test
+  public void shouldRejectLocalTransactionIfFeeCapExceeded() {
+    final Wei twoEthers = Wei.fromEth(2);
+    transactionPool =
+        createTransactionPool(b -> b.txFeeCap(twoEthers).disableLocalTransactions(false));
+
+    final Transaction transactionLocal = createTransaction(1, twoEthers.add(1));
+
+    givenTransactionIsValid(transactionLocal);
+
+    assertTransactionViaApiInvalid(transactionLocal, TX_FEECAP_EXCEEDED);
+  }
+
+  @ParameterizedTest
+  @ValueSource(booleans = {true, false})
+  public void shouldRejectZeroGasPriceLocalTransactionWhenNotMining(final boolean disableLocalTxs) {
+    transactionPool = createTransactionPool(b -> b.disableLocalTransactions(disableLocalTxs));
+    when(miningParameters.isMiningEnabled()).thenReturn(false);
+
+    final Transaction transaction = createTransaction(0, Wei.ZERO);
+
+    givenTransactionIsValid(transaction);
+
+    assertTransactionViaApiInvalid(transaction, GAS_PRICE_TOO_LOW);
+  }
+
+  private void assertTransactionPending(final Transaction t) {
+    assertThat(transactions.getTransactionByHash(t.getHash())).contains(t);
+  }
+
+  private void assertTransactionNotPending(final Transaction transaction) {
+    assertThat(transactions.getTransactionByHash(transaction.getHash())).isEmpty();
+  }
+
+  private void verifyChainHeadIs(final Block forkBlock2) {
+    assertThat(blockchain.getChainHeadHash()).isEqualTo(forkBlock2.getHash());
+  }
+
+  private void appendBlock(final Transaction... transactionsToAdd) {
+    appendBlock(Difficulty.ONE, getHeaderForCurrentChainHead(), transactionsToAdd);
+  }
+
+  private BlockHeader getHeaderForCurrentChainHead() {
+    return blockchain.getBlockHeader(blockchain.getChainHeadHash()).get();
+  }
+
+  protected abstract Block appendBlock(
+      final Difficulty difficulty,
+      final BlockHeader parentBlock,
+      final Transaction... transactionsToAdd);
+
+  protected abstract Transaction createTransaction(
+      final int transactionNumber, final Optional<BigInteger> maybeChainId);
+
+  protected abstract Transaction createTransaction(final int transactionNumber, final Wei maxPrice);
+
+  protected abstract TransactionTestFixture createBaseTransaction(final int transactionNumber);
+
+  private Transaction createTransaction(final int transactionNumber) {
+    return createTransaction(transactionNumber, Optional.of(BigInteger.ONE));
+  }
+
+  private Transaction createTransaction(final int transactionNumber, final KeyPair keyPair) {
+    return createBaseTransaction(transactionNumber).createTransaction(keyPair);
+  }
+
+  protected void protocolSupportsTxReplayProtection(
+      final long chainId, final boolean isSupportedAtCurrentBlock) {
+    when(protocolSpec.isReplayProtectionSupported()).thenReturn(isSupportedAtCurrentBlock);
+    when(protocolSchedule.getChainId()).thenReturn(Optional.of(BigInteger.valueOf(chainId)));
+  }
+
+  protected void givenTransactionIsValid(final Transaction transaction) {
+    when(transactionValidator.validate(eq(transaction), any(Optional.class), any()))
+        .thenReturn(valid());
+    when(transactionValidator.validateForSender(
+            eq(transaction), nullable(Account.class), any(TransactionValidationParams.class)))
+        .thenReturn(valid());
+  }
+
+  protected void assertTransactionViaApiInvalid(
+      final Transaction tx, final TransactionInvalidReason invalidReason) {
+    final ValidationResult<TransactionInvalidReason> result =
+        transactionPool.addTransactionViaApi(tx);
+
+    assertThat(result.isValid()).isFalse();
+    assertThat(result.getInvalidReason()).isEqualTo(invalidReason);
+    assertTransactionNotPending(tx);
+    verify(transactionBroadcaster, never()).onTransactionsAdded(singletonList(tx));
+  }
+
+  protected void assertTransactionViaApiValid(final Transaction tx, final boolean disableLocals) {
+    final ValidationResult<TransactionInvalidReason> result =
+        transactionPool.addTransactionViaApi(tx);
+
+    assertThat(result.isValid()).isTrue();
+    assertTransactionPending(tx);
+    verify(transactionBroadcaster).onTransactionsAdded(singletonList(tx));
+    if (disableLocals) {
+      assertThat(transactions.getLocalTransactions()).doesNotContain(tx);
+    } else {
+      assertThat(transactions.getLocalTransactions()).contains(tx);
+    }
+  }
+
+  protected void assertRemoteTransactionValid(final Transaction tx) {
+    transactionPool.addRemoteTransactions(List.of(tx));
+
+    verify(transactionBroadcaster).onTransactionsAdded(singletonList(tx));
+    assertTransactionPending(tx);
+    assertThat(transactions.getLocalTransactions()).doesNotContain(tx);
+  }
+
+  protected void assertRemoteTransactionInvalid(final Transaction tx) {
+    transactionPool.addRemoteTransactions(List.of(tx));
+
+    verify(transactionBroadcaster, never()).onTransactionsAdded(singletonList(tx));
+    assertTransactionNotPending(tx);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/AbstractTransactionsLayeredPendingTransactionsTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/AbstractTransactionsLayeredPendingTransactionsTest.java
new file mode 100644
index 00000000000..20e61b50d3f
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/AbstractTransactionsLayeredPendingTransactionsTest.java
@@ -0,0 +1,697 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.mainnet.ValidationResult.valid;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.EXCEEDS_BLOCK_GAS_LIMIT;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.GAS_PRICE_TOO_LOW;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.NONCE_TOO_FAR_IN_FUTURE_FOR_SENDER;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.NONCE_TOO_LOW;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.TRANSACTION_REPLACEMENT_UNDERPRICED;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.TX_FEECAP_EXCEEDED;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.ExecutionContextTestFixture;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
+import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
+import org.hyperledger.besu.ethereum.eth.messages.EthPV65;
+import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionValidator;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
+import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.math.BigInteger;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.BiFunction;
+import java.util.function.Consumer;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@SuppressWarnings("unchecked")
+@RunWith(MockitoJUnitRunner.class)
+public abstract class AbstractTransactionsLayeredPendingTransactionsTest {
+
+  protected static final KeyPair KEY_PAIR1 =
+      SignatureAlgorithmFactory.getInstance().generateKeyPair();
+
+  private static final KeyPair KEY_PAIR2 =
+      SignatureAlgorithmFactory.getInstance().generateKeyPair();
+  @Mock protected MainnetTransactionValidator transactionValidator;
+  @Mock protected PendingTransactionAddedListener listener;
+  @Mock protected MiningParameters miningParameters;
+  @Mock protected TransactionsMessageSender transactionsMessageSender;
+  @Mock protected NewPooledTransactionHashesMessageSender newPooledTransactionHashesMessageSender;
+  @Mock protected ProtocolSpec protocolSpec;
+
+  protected ProtocolSchedule protocolSchedule;
+
+  protected final MetricsSystem metricsSystem = new NoOpMetricsSystem();
+  protected MutableBlockchain blockchain;
+  private TransactionBroadcaster transactionBroadcaster;
+
+  protected PendingTransactions transactions;
+  private final Transaction transaction0 = createTransaction(0);
+  private final Transaction transaction1 = createTransaction(1);
+
+  private final Transaction transactionOtherSender = createTransaction(0, KEY_PAIR2);
+  private ExecutionContextTestFixture executionContext;
+  protected ProtocolContext protocolContext;
+  protected TransactionPool transactionPool;
+  protected TransactionPoolConfiguration poolConfig;
+  protected long blockGasLimit;
+  protected EthProtocolManager ethProtocolManager;
+  private EthContext ethContext;
+  private PeerTransactionTracker peerTransactionTracker;
+  private ArgumentCaptor<Runnable> syncTaskCapture;
+
+  protected abstract PendingTransactions createPendingTransactionsSorter(
+      final TransactionPoolConfiguration poolConfig,
+      BiFunction<PendingTransaction, PendingTransaction, Boolean> transactionReplacementTester);
+
+  protected abstract ExecutionContextTestFixture createExecutionContextTestFixture();
+
+  protected abstract FeeMarket getFeeMarket();
+
+  @Before
+  public void setUp() {
+    executionContext = createExecutionContextTestFixture();
+    protocolContext = executionContext.getProtocolContext();
+    blockchain = executionContext.getBlockchain();
+
+    when(protocolSpec.getTransactionValidator()).thenReturn(transactionValidator);
+    when(protocolSpec.getFeeMarket()).thenReturn(getFeeMarket());
+    protocolSchedule = spy(executionContext.getProtocolSchedule());
+    doReturn(protocolSpec).when(protocolSchedule).getByBlockHeader(any());
+    blockGasLimit = blockchain.getChainHeadBlock().getHeader().getGasLimit();
+    ethProtocolManager = EthProtocolManagerTestUtil.create();
+    ethContext = spy(ethProtocolManager.ethContext());
+
+    final EthScheduler ethScheduler = mock(EthScheduler.class);
+    syncTaskCapture = ArgumentCaptor.forClass(Runnable.class);
+    doNothing().when(ethScheduler).scheduleSyncWorkerTask(syncTaskCapture.capture());
+    doReturn(ethScheduler).when(ethContext).getScheduler();
+
+    peerTransactionTracker = new PeerTransactionTracker();
+
+    transactionPool = createTransactionPool();
+
+    blockchain.observeBlockAdded(transactionPool);
+    when(miningParameters.getMinTransactionGasPrice()).thenReturn(Wei.of(2));
+  }
+
+  protected TransactionPool createTransactionPool() {
+    return createTransactionPool(b -> {});
+  }
+
+  protected TransactionPool createTransactionPool(
+      final Consumer<ImmutableTransactionPoolConfiguration.Builder> configConsumer) {
+    final ImmutableTransactionPoolConfiguration.Builder configBuilder =
+        ImmutableTransactionPoolConfiguration.builder();
+    configConsumer.accept(configBuilder);
+    poolConfig = configBuilder.build();
+
+    final TransactionPoolReplacementHandler transactionReplacementHandler =
+        new TransactionPoolReplacementHandler(poolConfig.getPriceBump());
+
+    final BiFunction<PendingTransaction, PendingTransaction, Boolean> transactionReplacementTester =
+        (t1, t2) ->
+            transactionReplacementHandler.shouldReplace(
+                t1, t2, protocolContext.getBlockchain().getChainHeadHeader());
+
+    transactions = spy(createPendingTransactionsSorter(poolConfig, transactionReplacementTester));
+
+    transactionBroadcaster =
+        spy(
+            new TransactionBroadcaster(
+                ethContext,
+                peerTransactionTracker,
+                transactionsMessageSender,
+                newPooledTransactionHashesMessageSender));
+    final TransactionPool txPool =
+        new TransactionPool(
+            () -> transactions,
+            protocolSchedule,
+            protocolContext,
+            transactionBroadcaster,
+            ethContext,
+            miningParameters,
+            new TransactionPoolMetrics(metricsSystem),
+            poolConfig);
+    txPool.setEnabled();
+    return txPool;
+  }
+
+  @Test
+  public void localTransactionHappyPath() {
+    final Transaction transaction = createTransaction(0);
+
+    givenTransactionIsValid(transaction);
+
+    addAndAssertLocalTransactionValid(transaction);
+  }
+
+  @Test
+  public void shouldReturnExclusivelyLocalTransactionsWhenAppropriate() {
+    final Transaction localTransaction0 = createTransaction(0, KEY_PAIR2);
+
+    givenTransactionIsValid(localTransaction0);
+    givenTransactionIsValid(transaction0);
+    givenTransactionIsValid(transaction1);
+
+    addAndAssertLocalTransactionValid(localTransaction0);
+    addAndAssertRemoteTransactionValid(transaction0);
+    addAndAssertRemoteTransactionValid(transaction1);
+
+    assertThat(transactions.size()).isEqualTo(3);
+    List<Transaction> localTransactions = transactions.getLocalTransactions();
+    assertThat(localTransactions.size()).isEqualTo(1);
+  }
+
+  @Test
+  public void shouldRemoveTransactionsFromPendingListWhenIncludedInBlockOnchain() {
+    transactions.addRemoteTransaction(transaction0, Optional.empty());
+    assertTransactionPending(transaction0);
+    appendBlock(transaction0);
+
+    assertTransactionNotPending(transaction0);
+  }
+
+  @Test
+  public void shouldRemoveMultipleTransactionsAddedInOneBlock() {
+    transactions.addRemoteTransaction(transaction0, Optional.empty());
+    transactions.addRemoteTransaction(transaction1, Optional.empty());
+    appendBlock(transaction0, transaction1);
+
+    assertTransactionNotPending(transaction0);
+    assertTransactionNotPending(transaction1);
+    assertThat(transactions.size()).isZero();
+  }
+
+  @Test
+  public void shouldIgnoreUnknownTransactionsThatAreAddedInABlock() {
+    transactions.addRemoteTransaction(transaction0, Optional.empty());
+    appendBlock(transaction0, transaction1);
+
+    assertTransactionNotPending(transaction0);
+    assertTransactionNotPending(transaction1);
+    assertThat(transactions.size()).isZero();
+  }
+
+  @Test
+  public void shouldNotRemovePendingTransactionsWhenABlockAddedToAFork() {
+    transactions.addRemoteTransaction(transaction0, Optional.empty());
+    final BlockHeader commonParent = getHeaderForCurrentChainHead();
+    final Block canonicalHead = appendBlock(Difficulty.of(1000), commonParent);
+    appendBlock(Difficulty.ONE, commonParent, transaction0);
+
+    verifyChainHeadIs(canonicalHead);
+
+    assertTransactionPending(transaction0);
+  }
+
+  @Test
+  public void shouldRemovePendingTransactionsFromAllBlocksOnAForkWhenItBecomesTheCanonicalChain() {
+    transactions.addRemoteTransaction(transaction0, Optional.empty());
+    transactions.addRemoteTransaction(transaction1, Optional.empty());
+    final BlockHeader commonParent = getHeaderForCurrentChainHead();
+    final Block originalChainHead = appendBlock(Difficulty.of(1000), commonParent);
+
+    final Block forkBlock1 = appendBlock(Difficulty.ONE, commonParent, transaction0);
+    verifyChainHeadIs(originalChainHead);
+
+    final Block forkBlock2 = appendBlock(Difficulty.of(2000), forkBlock1.getHeader(), transaction1);
+    verifyChainHeadIs(forkBlock2);
+
+    assertTransactionNotPending(transaction0);
+    assertTransactionNotPending(transaction1);
+  }
+
+  @Test
+  public void shouldReAddTransactionsFromThePreviousCanonicalHeadWhenAReorgOccurs() {
+    givenTransactionIsValid(transaction0);
+    givenTransactionIsValid(transactionOtherSender);
+    transactions.addLocalTransaction(transaction0, Optional.empty());
+    transactions.addRemoteTransaction(transactionOtherSender, Optional.empty());
+    final BlockHeader commonParent = getHeaderForCurrentChainHead();
+    final Block originalFork1 = appendBlock(Difficulty.of(1000), commonParent, transaction0);
+    final Block originalFork2 =
+        appendBlock(Difficulty.ONE, originalFork1.getHeader(), transactionOtherSender);
+    assertTransactionNotPending(transaction0);
+    assertTransactionNotPending(transactionOtherSender);
+    assertThat(transactions.getLocalTransactions()).isEmpty();
+
+    final Block reorgFork1 = appendBlock(Difficulty.ONE, commonParent);
+    verifyChainHeadIs(originalFork2);
+
+    transactions.subscribePendingTransactions(listener);
+    final Block reorgFork2 = appendBlock(Difficulty.of(2000), reorgFork1.getHeader());
+    verifyChainHeadIs(reorgFork2);
+
+    assertTransactionPending(transaction0);
+    assertTransactionPending(transactionOtherSender);
+    assertThat(transactions.getLocalTransactions()).contains(transaction0);
+    assertThat(transactions.getLocalTransactions()).doesNotContain(transactionOtherSender);
+    verify(listener).onTransactionAdded(transaction0);
+    verify(listener).onTransactionAdded(transactionOtherSender);
+    verifyNoMoreInteractions(listener);
+  }
+
+  @Test
+  public void shouldNotReAddTransactionsThatAreInBothForksWhenReorgHappens() {
+    givenTransactionIsValid(transaction0);
+    givenTransactionIsValid(transaction1);
+    transactions.addRemoteTransaction(transaction0, Optional.empty());
+    transactions.addRemoteTransaction(transaction1, Optional.empty());
+    final BlockHeader commonParent = getHeaderForCurrentChainHead();
+    final Block originalFork1 = appendBlock(Difficulty.of(1000), commonParent, transaction0);
+    final Block originalFork2 =
+        appendBlock(Difficulty.ONE, originalFork1.getHeader(), transaction1);
+    assertTransactionNotPending(transaction0);
+    assertTransactionNotPending(transaction1);
+
+    final Block reorgFork1 = appendBlock(Difficulty.ONE, commonParent, transaction1);
+    verifyChainHeadIs(originalFork2);
+
+    final Block reorgFork2 = appendBlock(Difficulty.of(2000), reorgFork1.getHeader());
+    verifyChainHeadIs(reorgFork2);
+
+    assertTransactionPending(transaction0);
+    assertTransactionNotPending(transaction1);
+  }
+
+  @Test
+  public void addLocalTransaction_strictReplayProtectionOn_txWithChainId_chainIdIsConfigured() {
+    protocolSupportsTxReplayProtection(1337, true);
+    transactionPool = createTransactionPool(b -> b.strictTransactionReplayProtectionEnabled(true));
+    final Transaction tx = createTransaction(0);
+    givenTransactionIsValid(tx);
+
+    addAndAssertLocalTransactionValid(tx);
+  }
+
+  @Test
+  public void addRemoteTransactions_strictReplayProtectionOn_txWithChainId_chainIdIsConfigured() {
+    protocolSupportsTxReplayProtection(1337, true);
+    transactionPool = createTransactionPool(b -> b.strictTransactionReplayProtectionEnabled(true));
+    final Transaction tx = createTransaction(0);
+    givenTransactionIsValid(tx);
+
+    addAndAssertRemoteTransactionValid(tx);
+  }
+
+  @Test
+  public void shouldNotAddRemoteTransactionsWhenGasPriceBelowMinimum() {
+    final Transaction transaction = createTransaction(1, Wei.ONE);
+    transactionPool.addRemoteTransactions(singletonList(transaction));
+
+    assertTransactionNotPending(transaction);
+    verifyNoMoreInteractions(transactionValidator);
+  }
+
+  @Test
+  public void shouldNotAddRemoteTransactionsThatAreInvalidAccordingToStateDependentChecks() {
+    givenTransactionIsValid(transaction0);
+    givenTransactionIsValid(transaction1);
+    when(transactionValidator.validateForSender(
+            eq(transaction1), eq(null), any(TransactionValidationParams.class)))
+        .thenReturn(ValidationResult.invalid(NONCE_TOO_LOW));
+    transactionPool.addRemoteTransactions(asList(transaction0, transaction1));
+
+    assertTransactionPending(transaction0);
+    assertTransactionNotPending(transaction1);
+    verify(transactionBroadcaster).onTransactionsAdded(singletonList(transaction0));
+    verify(transactionValidator).validate(eq(transaction0), any(Optional.class), any());
+    verify(transactionValidator)
+        .validateForSender(eq(transaction0), eq(null), any(TransactionValidationParams.class));
+    verify(transactionValidator).validate(eq(transaction1), any(Optional.class), any());
+    verify(transactionValidator).validateForSender(eq(transaction1), any(), any());
+    verifyNoMoreInteractions(transactionValidator);
+  }
+
+  @Test
+  public void shouldAllowSequenceOfTransactionsWithIncreasingNonceFromSameSender() {
+    final Transaction transaction1 = createTransaction(0);
+    final Transaction transaction2 = createTransaction(1);
+    final Transaction transaction3 = createTransaction(2);
+
+    givenTransactionIsValid(transaction1);
+    givenTransactionIsValid(transaction2);
+    givenTransactionIsValid(transaction3);
+
+    addAndAssertLocalTransactionValid(transaction1);
+    addAndAssertLocalTransactionValid(transaction2);
+    addAndAssertLocalTransactionValid(transaction3);
+  }
+
+  @Test
+  public void
+      shouldAllowSequenceOfTransactionsWithIncreasingNonceFromSameSenderWhenSentInBatchOutOfOrder() {
+    final Transaction transaction1 = createTransaction(0);
+    final Transaction transaction2 = createTransaction(1);
+    final Transaction transaction3 = createTransaction(2);
+
+    givenTransactionIsValid(transaction1);
+    givenTransactionIsValid(transaction2);
+    givenTransactionIsValid(transaction3);
+
+    transactionPool.addRemoteTransactions(List.of(transaction3, transaction1, transaction2));
+    assertRemoteTransactionValid(transaction3);
+    assertRemoteTransactionValid(transaction1);
+    assertRemoteTransactionValid(transaction2);
+  }
+
+  @Test
+  public void shouldDiscardRemoteTransactionThatAlreadyExistsBeforeValidation() {
+    doReturn(true).when(transactions).containsTransaction(transaction0);
+    transactionPool.addRemoteTransactions(singletonList(transaction0));
+
+    verify(transactions).containsTransaction(transaction0);
+    verifyNoInteractions(transactionValidator);
+  }
+
+  @Test
+  public void shouldNotNotifyBatchListenerWhenRemoteTransactionDoesNotReplaceExisting() {
+    final Transaction transaction1 = createTransaction(0, Wei.of(100));
+    final Transaction transaction2 = createTransaction(0, Wei.of(50));
+
+    givenTransactionIsValid(transaction1);
+    givenTransactionIsValid(transaction2);
+
+    addAndAssertRemoteTransactionValid(transaction1);
+    addAndAssertRemoteTransactionInvalid(transaction2);
+  }
+
+  @Test
+  public void shouldNotNotifyBatchListenerWhenLocalTransactionDoesNotReplaceExisting() {
+    final Transaction transaction1 = createTransaction(0, Wei.of(10));
+    final Transaction transaction2 = createTransaction(0, Wei.of(9));
+
+    givenTransactionIsValid(transaction1);
+    givenTransactionIsValid(transaction2);
+
+    addAndAssertLocalTransactionValid(transaction1);
+    addAndAssertLocalTransactionInvalid(transaction2, TRANSACTION_REPLACEMENT_UNDERPRICED);
+  }
+
+  @Test
+  public void shouldRejectLocalTransactionsWhereGasLimitExceedBlockGasLimit() {
+    final Transaction transaction1 =
+        createBaseTransaction(0).gasLimit(blockGasLimit + 1).createTransaction(KEY_PAIR1);
+
+    givenTransactionIsValid(transaction1);
+
+    addAndAssertLocalTransactionInvalid(transaction1, EXCEEDS_BLOCK_GAS_LIMIT);
+  }
+
+  @Test
+  public void shouldRejectRemoteTransactionsWhereGasLimitExceedBlockGasLimit() {
+    final Transaction transaction1 =
+        createBaseTransaction(0).gasLimit(blockGasLimit + 1).createTransaction(KEY_PAIR1);
+
+    givenTransactionIsValid(transaction1);
+
+    addAndAssertRemoteTransactionInvalid(transaction1);
+  }
+
+  @Test
+  public void
+      shouldAcceptAsPostponedLocalTransactionsEvenIfAnInvalidTransactionWithLowerNonceExists() {
+    final Transaction invalidTx =
+        createBaseTransaction(0).gasLimit(blockGasLimit + 1).createTransaction(KEY_PAIR1);
+
+    final Transaction nextTx = createBaseTransaction(1).gasLimit(1).createTransaction(KEY_PAIR1);
+
+    givenTransactionIsValid(invalidTx);
+    givenTransactionIsValid(nextTx);
+
+    addAndAssertLocalTransactionInvalid(invalidTx, EXCEEDS_BLOCK_GAS_LIMIT);
+    final ValidationResult<TransactionInvalidReason> result =
+        transactionPool.addLocalTransaction(nextTx);
+
+    assertThat(result.isValid()).isTrue();
+  }
+
+  @Test
+  public void shouldRejectLocalTransactionsWhenNonceTooFarInFuture() {
+    final Transaction transaction1 = createTransaction(Integer.MAX_VALUE);
+
+    givenTransactionIsValid(transaction1);
+
+    addAndAssertLocalTransactionInvalid(transaction1, NONCE_TOO_FAR_IN_FUTURE_FOR_SENDER);
+  }
+
+  @Test
+  public void shouldNotNotifyBatchListenerIfNoTransactionsAreAdded() {
+    transactionPool.addRemoteTransactions(emptyList());
+    verifyNoInteractions(transactionBroadcaster);
+  }
+
+  @Test
+  public void shouldSendPooledTransactionHashesIfPeerSupportsEth65() {
+    EthPeer peer = mock(EthPeer.class);
+    when(peer.hasSupportForMessage(EthPV65.NEW_POOLED_TRANSACTION_HASHES)).thenReturn(true);
+
+    givenTransactionIsValid(transaction0);
+    transactionPool.addLocalTransaction(transaction0);
+    transactionPool.handleConnect(peer);
+    syncTaskCapture.getValue().run();
+    verify(newPooledTransactionHashesMessageSender).sendTransactionHashesToPeer(peer);
+  }
+
+  @Test
+  public void shouldSendFullTransactionsIfPeerDoesNotSupportEth65() {
+    EthPeer peer = mock(EthPeer.class);
+    when(peer.hasSupportForMessage(EthPV65.NEW_POOLED_TRANSACTION_HASHES)).thenReturn(false);
+
+    givenTransactionIsValid(transaction0);
+    transactionPool.addLocalTransaction(transaction0);
+    transactionPool.handleConnect(peer);
+    syncTaskCapture.getValue().run();
+    verify(transactionsMessageSender).sendTransactionsToPeer(peer);
+  }
+
+  @Test
+  public void shouldSendFullTransactionPoolToNewlyConnectedPeer() {
+    final Transaction transactionLocal = createTransaction(0);
+    final Transaction transactionRemote = createTransaction(1);
+
+    givenTransactionIsValid(transactionLocal);
+    givenTransactionIsValid(transactionRemote);
+
+    transactionPool.addLocalTransaction(transactionLocal);
+    transactionPool.addRemoteTransactions(Collections.singletonList(transactionRemote));
+
+    RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager);
+
+    Set<Transaction> transactionsToSendToPeer =
+        peerTransactionTracker.claimTransactionsToSendToPeer(peer.getEthPeer());
+
+    assertThat(transactionsToSendToPeer).contains(transactionLocal, transactionRemote);
+  }
+
+  @Test
+  public void shouldCallValidatorWithExpectedValidationParameters() {
+    final ArgumentCaptor<TransactionValidationParams> txValidationParamCaptor =
+        ArgumentCaptor.forClass(TransactionValidationParams.class);
+
+    when(transactionValidator.validate(eq(transaction0), any(Optional.class), any()))
+        .thenReturn(valid());
+    when(transactionValidator.validateForSender(any(), any(), txValidationParamCaptor.capture()))
+        .thenReturn(valid());
+
+    final TransactionValidationParams expectedValidationParams =
+        TransactionValidationParams.transactionPool();
+
+    transactionPool.addLocalTransaction(transaction0);
+
+    assertThat(txValidationParamCaptor.getValue())
+        .usingRecursiveComparison()
+        .isEqualTo(expectedValidationParams);
+  }
+
+  @Test
+  public void shouldIgnoreFeeCapIfSetZero() {
+    final Wei twoEthers = Wei.fromEth(2);
+    transactionPool = createTransactionPool(b -> b.txFeeCap(Wei.ZERO));
+    final Transaction transaction = createTransaction(0, twoEthers.add(Wei.of(1)));
+
+    givenTransactionIsValid(transaction);
+
+    addAndAssertLocalTransactionValid(transaction);
+  }
+
+  @Test
+  public void shouldRejectLocalTransactionIfFeeCapExceeded() {
+    final Wei twoEthers = Wei.fromEth(2);
+    transactionPool = createTransactionPool(b -> b.txFeeCap(twoEthers));
+
+    final Transaction transactionLocal = createTransaction(0, twoEthers.add(1));
+
+    givenTransactionIsValid(transactionLocal);
+
+    addAndAssertLocalTransactionInvalid(transactionLocal, TX_FEECAP_EXCEEDED);
+  }
+
+  @Test
+  public void shouldRejectZeroGasPriceTransactionWhenNotMining() {
+    when(miningParameters.isMiningEnabled()).thenReturn(false);
+
+    final Transaction transaction = createTransaction(0, Wei.ZERO);
+
+    givenTransactionIsValid(transaction);
+
+    addAndAssertLocalTransactionInvalid(transaction, GAS_PRICE_TOO_LOW);
+  }
+
+  private void assertTransactionPending(final Transaction t) {
+    assertThat(transactions.getTransactionByHash(t.getHash())).contains(t);
+  }
+
+  private void assertTransactionNotPending(final Transaction transaction) {
+    assertThat(transactions.getTransactionByHash(transaction.getHash())).isEmpty();
+  }
+
+  private void verifyChainHeadIs(final Block forkBlock2) {
+    assertThat(blockchain.getChainHeadHash()).isEqualTo(forkBlock2.getHash());
+  }
+
+  private void appendBlock(final Transaction... transactionsToAdd) {
+    appendBlock(Difficulty.ONE, getHeaderForCurrentChainHead(), transactionsToAdd);
+  }
+
+  private BlockHeader getHeaderForCurrentChainHead() {
+    return blockchain.getBlockHeader(blockchain.getChainHeadHash()).get();
+  }
+
+  protected abstract Block appendBlock(
+      final Difficulty difficulty,
+      final BlockHeader parentBlock,
+      final Transaction... transactionsToAdd);
+
+  protected abstract Transaction createTransaction(
+      final int nonce, final Optional<BigInteger> maybeChainId);
+
+  protected abstract Transaction createTransaction(final int nonce, final Wei maxPrice);
+
+  protected abstract TransactionTestFixture createBaseTransaction(final int nonce);
+
+  private Transaction createTransaction(final int nonce) {
+    return createTransaction(nonce, Optional.of(BigInteger.ONE));
+  }
+
+  private Transaction createTransaction(final int nonce, final KeyPair keyPair) {
+    return createBaseTransaction(nonce).createTransaction(keyPair);
+  }
+
+  protected void protocolSupportsTxReplayProtection(
+      final long chainId, final boolean isSupportedAtCurrentBlock) {
+    when(protocolSpec.isReplayProtectionSupported()).thenReturn(isSupportedAtCurrentBlock);
+    when(protocolSchedule.getChainId()).thenReturn(Optional.of(BigInteger.valueOf(chainId)));
+  }
+
+  protected void givenTransactionIsValid(final Transaction transaction) {
+    when(transactionValidator.validate(eq(transaction), any(Optional.class), any()))
+        .thenReturn(valid());
+    when(transactionValidator.validateForSender(
+            eq(transaction), nullable(Account.class), any(TransactionValidationParams.class)))
+        .thenReturn(valid());
+  }
+
+  protected void addAndAssertLocalTransactionInvalid(
+      final Transaction tx, final TransactionInvalidReason invalidReason) {
+    final ValidationResult<TransactionInvalidReason> result =
+        transactionPool.addLocalTransaction(tx);
+
+    assertThat(result.isValid()).isFalse();
+    assertThat(result.getInvalidReason()).isEqualTo(invalidReason);
+    assertTransactionNotPending(tx);
+    verify(transactionBroadcaster, never()).onTransactionsAdded(singletonList(tx));
+  }
+
+  protected void addAndAssertLocalTransactionValid(final Transaction tx) {
+    final ValidationResult<TransactionInvalidReason> result =
+        transactionPool.addLocalTransaction(tx);
+
+    assertThat(result.isValid()).isTrue();
+    assertTransactionPending(tx);
+    verify(transactionBroadcaster).onTransactionsAdded(singletonList(tx));
+    assertThat(transactions.getLocalTransactions()).contains(tx);
+  }
+
+  protected void addAndAssertRemoteTransactionValid(final Transaction tx) {
+    transactionPool.addRemoteTransactions(List.of(tx));
+
+    assertRemoteTransactionValid(tx);
+  }
+
+  protected void assertRemoteTransactionValid(final Transaction tx) {
+    verify(transactionBroadcaster)
+        .onTransactionsAdded(argThat((List<Transaction> list) -> list.contains(tx)));
+    assertTransactionPending(tx);
+    assertThat(transactions.getLocalTransactions()).doesNotContain(tx);
+  }
+
+  protected void addAndAssertRemoteTransactionInvalid(final Transaction tx) {
+    transactionPool.addRemoteTransactions(List.of(tx));
+
+    verify(transactionBroadcaster, never()).onTransactionsAdded(singletonList(tx));
+    assertTransactionNotPending(tx);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/NewPooledTransactionHashesMessageProcessorTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/NewPooledTransactionHashesMessageProcessorTest.java
new file mode 100644
index 00000000000..36c1a451d84
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/NewPooledTransactionHashesMessageProcessorTest.java
@@ -0,0 +1,542 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions;
+
+import static java.time.Duration.ofMillis;
+import static java.time.Duration.ofMinutes;
+import static java.time.Instant.now;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.eth.encoding.TransactionAnnouncementDecoder.getDecoder;
+import static org.hyperledger.besu.ethereum.eth.encoding.TransactionAnnouncementEncoder.getEncoder;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.EthProtocol;
+import org.hyperledger.besu.ethereum.eth.encoding.TransactionAnnouncementDecoder;
+import org.hyperledger.besu.ethereum.eth.encoding.TransactionAnnouncementEncoder;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.eth.messages.NewPooledTransactionHashesMessage;
+import org.hyperledger.besu.ethereum.eth.transactions.NewPooledTransactionHashesMessageProcessor.FetcherCreatorTask;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPException;
+import org.hyperledger.besu.metrics.StubMetricsSystem;
+import org.hyperledger.besu.plugin.data.TransactionType;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class NewPooledTransactionHashesMessageProcessorTest {
+
+  @Mock private TransactionPool transactionPool;
+  @Mock private TransactionPoolConfiguration transactionPoolConfiguration;
+  @Mock private PeerTransactionTracker transactionTracker;
+  @Mock private EthPeer peer1;
+  @Mock private EthContext ethContext;
+  @Mock private EthScheduler ethScheduler;
+
+  private final BlockDataGenerator generator = new BlockDataGenerator();
+
+  private final Transaction transaction1 = generator.transaction();
+  private final Transaction transaction2 = generator.transaction();
+  private final Transaction transaction3 = generator.transaction();
+  private final Hash hash1 = transaction1.getHash();
+  private final Hash hash2 = transaction2.getHash();
+  private final Hash hash3 = transaction3.getHash();
+  private final List<Transaction> transactionList =
+      List.of(transaction1, transaction2, transaction3);
+  private NewPooledTransactionHashesMessageProcessor messageHandler;
+  private StubMetricsSystem metricsSystem;
+
+  @Before
+  public void setup() {
+    metricsSystem = new StubMetricsSystem();
+    when(transactionPoolConfiguration.getEth65TrxAnnouncedBufferingPeriod())
+        .thenReturn(Duration.ofMillis(500));
+    messageHandler =
+        new NewPooledTransactionHashesMessageProcessor(
+            transactionTracker,
+            transactionPool,
+            transactionPoolConfiguration,
+            ethContext,
+            new TransactionPoolMetrics(metricsSystem));
+    when(ethContext.getScheduler()).thenReturn(ethScheduler);
+  }
+
+  @Test
+  public void shouldAddInitiatedRequestingTransactions() {
+
+    messageHandler.processNewPooledTransactionHashesMessage(
+        peer1,
+        NewPooledTransactionHashesMessage.create(transactionList, EthProtocol.ETH66),
+        now(),
+        ofMinutes(1));
+
+    verify(transactionPool).getTransactionByHash(hash1);
+    verify(transactionPool).getTransactionByHash(hash2);
+    verify(transactionPool).getTransactionByHash(hash3);
+    verifyNoMoreInteractions(transactionPool);
+  }
+
+  @Test
+  public void shouldNotAddAlreadyPresentTransactions() {
+
+    when(transactionPool.getTransactionByHash(hash1)).thenReturn(Optional.of(transaction1));
+    when(transactionPool.getTransactionByHash(hash2)).thenReturn(Optional.of(transaction2));
+
+    messageHandler.processNewPooledTransactionHashesMessage(
+        peer1,
+        NewPooledTransactionHashesMessage.create(transactionList, EthProtocol.ETH66),
+        now(),
+        ofMinutes(1));
+
+    verify(transactionPool).getTransactionByHash(hash1);
+    verify(transactionPool).getTransactionByHash(hash2);
+    verify(transactionPool).getTransactionByHash(hash3);
+    verifyNoMoreInteractions(transactionPool);
+  }
+
+  @Test
+  public void shouldAddInitiatedRequestingTransactionsWhenOutOfSync() {
+
+    messageHandler.processNewPooledTransactionHashesMessage(
+        peer1,
+        NewPooledTransactionHashesMessage.create(transactionList, EthProtocol.ETH66),
+        now(),
+        ofMinutes(1));
+    verify(transactionPool, times(3)).getTransactionByHash(any());
+  }
+
+  @Test
+  public void shouldNotMarkReceivedExpiredTransactionsAsSeen() {
+    messageHandler.processNewPooledTransactionHashesMessage(
+        peer1,
+        NewPooledTransactionHashesMessage.create(transactionList, EthProtocol.ETH66),
+        now().minus(ofMinutes(1)),
+        ofMillis(1));
+    verifyNoInteractions(transactionTracker);
+    assertThat(
+            metricsSystem.getCounterValue(
+                TransactionPoolMetrics.EXPIRED_MESSAGES_COUNTER_NAME,
+                NewPooledTransactionHashesMessageProcessor.METRIC_LABEL))
+        .isEqualTo(1);
+  }
+
+  @Test
+  public void shouldNotAddReceivedTransactionsToTransactionPoolIfExpired() {
+    messageHandler.processNewPooledTransactionHashesMessage(
+        peer1,
+        NewPooledTransactionHashesMessage.create(transactionList, EthProtocol.ETH66),
+        now().minus(ofMinutes(1)),
+        ofMillis(1));
+    verifyNoInteractions(transactionPool);
+    assertThat(
+            metricsSystem.getCounterValue(
+                TransactionPoolMetrics.EXPIRED_MESSAGES_COUNTER_NAME,
+                NewPooledTransactionHashesMessageProcessor.METRIC_LABEL))
+        .isEqualTo(1);
+  }
+
+  @Test
+  public void
+      shouldScheduleGetPooledTransactionsTaskWhenNewTransactionAddedFromPeerForTheFirstTime() {
+
+    final EthScheduler ethScheduler = mock(EthScheduler.class);
+    when(ethContext.getScheduler()).thenReturn(ethScheduler);
+
+    messageHandler.processNewPooledTransactionHashesMessage(
+        peer1,
+        NewPooledTransactionHashesMessage.create(
+            List.of(transaction1, transaction2), EthProtocol.ETH66),
+        now(),
+        ofMinutes(1));
+
+    verify(ethScheduler, times(1))
+        .scheduleFutureTaskWithFixedDelay(
+            any(FetcherCreatorTask.class), any(Duration.class), any(Duration.class));
+  }
+
+  @Test
+  public void shouldNotScheduleGetPooledTransactionsTaskTwice() {
+
+    messageHandler.processNewPooledTransactionHashesMessage(
+        peer1,
+        NewPooledTransactionHashesMessage.create(
+            Collections.singletonList(transaction1), EthProtocol.ETH66),
+        now(),
+        ofMinutes(1));
+
+    messageHandler.processNewPooledTransactionHashesMessage(
+        peer1,
+        NewPooledTransactionHashesMessage.create(
+            Collections.singletonList(transaction2), EthProtocol.ETH66),
+        now(),
+        ofMinutes(1));
+
+    verify(ethScheduler, times(1))
+        .scheduleFutureTaskWithFixedDelay(
+            any(FetcherCreatorTask.class), any(Duration.class), any(Duration.class));
+  }
+
+  @Test
+  public void shouldCreateAndDecodeForEth66() {
+
+    final List<TransactionAnnouncement> expectedAnnouncementList =
+        transactionList.stream().map(TransactionAnnouncement::new).toList();
+
+    final NewPooledTransactionHashesMessage message =
+        NewPooledTransactionHashesMessage.create(transactionList, EthProtocol.ETH66);
+
+    // for eth/66 the message should not contain size or type
+    message
+        .pendingTransactions()
+        .forEach(
+            t -> {
+              assertThat(t.getSize().isPresent()).isFalse();
+              assertThat(t.getType().isPresent()).isFalse();
+            });
+
+    // assert all transaction hashes are the same as announcement message
+    assertThat(message.pendingTransactionHashes())
+        .containsExactlyElementsOf(
+            expectedAnnouncementList.stream()
+                .map(TransactionAnnouncement::getHash)
+                .collect(Collectors.toList()));
+  }
+
+  @Test
+  public void shouldCreateAndDecodeForEth68() {
+    final List<TransactionAnnouncement> expectedTransactions =
+        transactionList.stream().map(TransactionAnnouncement::new).collect(Collectors.toList());
+
+    final NewPooledTransactionHashesMessage message =
+        NewPooledTransactionHashesMessage.create(transactionList, EthProtocol.ETH68);
+
+    final List<TransactionAnnouncement> announcementList = message.pendingTransactions();
+    assertThat(announcementList).containsExactlyElementsOf(expectedTransactions);
+  }
+
+  @Test
+  public void shouldThrowRLPExceptionIfIncorrectVersion() {
+
+    // message for Eth/68 with 66 data should throw RLPException
+    final NewPooledTransactionHashesMessage message66 =
+        new NewPooledTransactionHashesMessage(
+            getEncoder(EthProtocol.ETH68).encode(transactionList), EthProtocol.ETH66);
+    // assert RLPException
+    assertThrows(RLPException.class, message66::pendingTransactions);
+
+    // message for Eth/66 with 68 data should throw RLPException
+    final NewPooledTransactionHashesMessage message68 =
+        new NewPooledTransactionHashesMessage(
+            getEncoder(EthProtocol.ETH68).encode(transactionList), EthProtocol.ETH66);
+    // assert RLPException
+    assertThrows(RLPException.class, message68::pendingTransactions);
+  }
+
+  @Test
+  public void shouldEncodeTransactionsCorrectly_Eth68() {
+
+    final String expected =
+        "0xf86d83000102c3010203f863a00000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000002a00000000000000000000000000000000000000000000000000000000000000003";
+    final List<Hash> hashes =
+        List.of(
+            Hash.fromHexString(
+                "0x0000000000000000000000000000000000000000000000000000000000000001"),
+            Hash.fromHexString(
+                "0x0000000000000000000000000000000000000000000000000000000000000002"),
+            Hash.fromHexString(
+                "0x0000000000000000000000000000000000000000000000000000000000000003"));
+    final List<Integer> sizes = List.of(1, 2, 3);
+    final List<TransactionType> types =
+        List.of(TransactionType.FRONTIER, TransactionType.ACCESS_LIST, TransactionType.EIP1559);
+
+    final Bytes bytes = TransactionAnnouncementEncoder.encodeForEth68(types, sizes, hashes);
+    assertThat(expected).isEqualTo(bytes.toHexString());
+  }
+
+  @Test
+  public void shouldDecodeBytesCorrectly_Eth68() {
+    /*
+     * [
+     * "0x0000102"]
+     * ["0x01","0x02","0x03"],
+     * ["0x0000000000000000000000000000000000000000000000000000000000000001",
+     *  "0x0000000000000000000000000000000000000000000000000000000000000002",
+     *  "0x0000000000000000000000000000000000000000000000000000000000000003"]
+     * ]
+     */
+
+    final Bytes bytes =
+        Bytes.fromHexString(
+            "0xf86d83000102c3010203f863a00000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000002a00000000000000000000000000000000000000000000000000000000000000003");
+
+    final List<TransactionAnnouncement> announcementList =
+        getDecoder(EthProtocol.ETH68).decode(RLP.input(bytes));
+
+    final TransactionAnnouncement frontier = announcementList.get(0);
+    assertThat(frontier.getHash())
+        .isEqualTo(
+            Hash.fromHexString(
+                "0x0000000000000000000000000000000000000000000000000000000000000001"));
+    assertThat(frontier.getType()).hasValue(TransactionType.FRONTIER);
+    assertThat(frontier.getSize()).hasValue(1L);
+
+    final TransactionAnnouncement accessList = announcementList.get(1);
+    assertThat(accessList.getHash())
+        .isEqualTo(
+            Hash.fromHexString(
+                "0x0000000000000000000000000000000000000000000000000000000000000002"));
+    assertThat(accessList.getType()).hasValue(TransactionType.ACCESS_LIST);
+    assertThat(accessList.getSize()).hasValue(2L);
+
+    final TransactionAnnouncement eip1559 = announcementList.get(2);
+    assertThat(eip1559.getHash())
+        .isEqualTo(
+            Hash.fromHexString(
+                "0x0000000000000000000000000000000000000000000000000000000000000003"));
+    assertThat(eip1559.getType()).hasValue(TransactionType.EIP1559);
+    assertThat(eip1559.getSize()).hasValue(3L);
+  }
+
+  @Test
+  public void shouldDecodeBytesCorrectly_PreviousImplementations_Eth68() {
+    /*
+     * [
+     * "0x0000102"]
+     * ["0x00000001","0x00000002","0x00000003"],
+     * ["0x0000000000000000000000000000000000000000000000000000000000000001",
+     *  "0x0000000000000000000000000000000000000000000000000000000000000002",
+     *  "0x0000000000000000000000000000000000000000000000000000000000000003"]
+     * ]
+     */
+
+    final Bytes bytes =
+        Bytes.fromHexString(
+            "0xf87983000102cf840000000184000000028400000003f863a00000000000000000000000000000000000000000000000000000000000000001a00000000000000000000000000000000000000000000000000000000000000002a00000000000000000000000000000000000000000000000000000000000000003");
+
+    final List<TransactionAnnouncement> announcementList =
+        getDecoder(EthProtocol.ETH68).decode(RLP.input(bytes));
+
+    final TransactionAnnouncement frontier = announcementList.get(0);
+    assertThat(frontier.getHash())
+        .isEqualTo(
+            Hash.fromHexString(
+                "0x0000000000000000000000000000000000000000000000000000000000000001"));
+    assertThat(frontier.getType()).hasValue(TransactionType.FRONTIER);
+    assertThat(frontier.getSize()).hasValue(1L);
+
+    final TransactionAnnouncement accessList = announcementList.get(1);
+    assertThat(accessList.getHash())
+        .isEqualTo(
+            Hash.fromHexString(
+                "0x0000000000000000000000000000000000000000000000000000000000000002"));
+    assertThat(accessList.getType()).hasValue(TransactionType.ACCESS_LIST);
+    assertThat(accessList.getSize()).hasValue(2L);
+
+    final TransactionAnnouncement eip1559 = announcementList.get(2);
+    assertThat(eip1559.getHash())
+        .isEqualTo(
+            Hash.fromHexString(
+                "0x0000000000000000000000000000000000000000000000000000000000000003"));
+    assertThat(eip1559.getType()).hasValue(TransactionType.EIP1559);
+    assertThat(eip1559.getSize()).hasValue(3L);
+  }
+
+  @Test
+  public void shouldEncodeAndDecodeTransactionAnnouncement_Eth66() {
+    final Transaction t1 = generator.transaction(TransactionType.FRONTIER);
+    final Transaction t2 = generator.transaction(TransactionType.ACCESS_LIST);
+    final Transaction t3 = generator.transaction(TransactionType.EIP1559);
+    final List<Transaction> list = List.of(t1, t2, t3);
+    final Bytes bytes = getEncoder(EthProtocol.ETH66).encode(list);
+
+    final List<TransactionAnnouncement> announcementList =
+        getDecoder(EthProtocol.ETH66).decode(RLP.input(bytes));
+
+    for (int i = 0; i < announcementList.size(); i++) {
+      final TransactionAnnouncement announcement = announcementList.get(i);
+      assertThat(announcement.getHash()).isEqualTo(list.get(i).getHash());
+      assertThat(announcement.getType()).isEmpty();
+      assertThat(announcement.getType()).isEmpty();
+    }
+  }
+
+  @Test
+  public void shouldEncodeAndDecodeTransactionAnnouncement_Eth68() {
+    final Transaction t1 = generator.transaction(TransactionType.FRONTIER);
+    final Transaction t2 = generator.transaction(TransactionType.ACCESS_LIST);
+    final Transaction t3 = generator.transaction(TransactionType.EIP1559);
+
+    final List<Transaction> list = List.of(t1, t2, t3);
+    final Bytes bytes = getEncoder(EthProtocol.ETH68).encode(list);
+
+    final List<TransactionAnnouncement> announcementList =
+        getDecoder(EthProtocol.ETH68).decode(RLP.input(bytes));
+
+    assertThat(announcementList.size()).isEqualTo(list.size());
+
+    for (final Transaction transaction : list) {
+      final TransactionAnnouncement announcement = announcementList.get(list.indexOf(transaction));
+      assertThat(announcement.getHash()).isEqualTo(transaction.getHash());
+      assertThat(announcement.getType()).hasValue(transaction.getType());
+      assertThat(announcement.getSize()).hasValue((long) transaction.getSize());
+    }
+  }
+
+  @Test
+  public void shouldThrowInvalidArgumentExceptionWhenCreatingListsWithDifferentSizes() {
+    final Exception exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                TransactionAnnouncement.create(new ArrayList<>(), List.of(1L), new ArrayList<>()));
+    final String expectedMessage = "Hashes, sizes and types must have the same number of elements";
+    final String actualMessage = exception.getMessage();
+    assertThat(actualMessage).isEqualTo(expectedMessage);
+  }
+
+  @Test
+  public void shouldThrowInvalidArgumentExceptionWhenEncodingListsWithDifferentSizes() {
+    final Exception exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                TransactionAnnouncementEncoder.encodeForEth68(
+                    new ArrayList<>(), List.of(1), new ArrayList<>()));
+    final String expectedMessage = "Hashes, sizes and types must have the same number of elements";
+    final String actualMessage = exception.getMessage();
+    assertThat(actualMessage).isEqualTo(expectedMessage);
+  }
+
+  @Test
+  @SuppressWarnings("UnusedVariable")
+  public void shouldThrowRLPExceptionWhenDecodingListsWithDifferentSizes() {
+
+    // ["0x000102",[],["0x881699519a25b0e32db9b1ba9981f3fbec93fbc0726c3e096af89e5ada2b1351"]]
+    final Bytes invalidMessageBytes =
+        Bytes.fromHexString(
+            "0xe783000102c0e1a0881699519a25b0e32db9b1ba9981f3fbec93fbc0726c3e096af89e5ada2b1351");
+
+    final Exception exception =
+        assertThrows(
+            RLPException.class,
+            () ->
+                TransactionAnnouncementDecoder.getDecoder(EthProtocol.ETH68)
+                    .decode(RLP.input(invalidMessageBytes)));
+
+    final String expectedMessage = "Hashes, sizes and types must have the same number of elements";
+    final String actualMessage = exception.getMessage();
+    assertThat(actualMessage).isEqualTo(expectedMessage);
+  }
+
+  @Test
+  public void shouldThrowRLPExceptionWhenTypeIsInvalid() {
+    final Bytes invalidMessageBytes =
+        Bytes.fromHexString(
+            // ["0x07",["0x00000002"],["0x881699519a25b0e32db9b1ba9981f3fbec93fbc0726c3e096af89e5ada2b1351"]]
+            "0xe907c58400000002e1a0881699519a25b0e32db9b1ba9981f3fbec93fbc0726c3e096af89e5ada2b1351");
+
+    final Exception exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                TransactionAnnouncementDecoder.getDecoder(EthProtocol.ETH68)
+                    .decode(RLP.input(invalidMessageBytes)));
+
+    final String expectedMessage = "Unsupported transaction type";
+    final String actualMessage = exception.getMessage();
+    assertThat(actualMessage).contains(expectedMessage);
+  }
+
+  @Test
+  public void shouldThrowRLPExceptionWhenSizeSizeGreaterThanFourBytes() {
+    final Bytes invalidMessageBytes =
+        Bytes.fromHexString(
+            // ["0x02",["0xffffffff01"],["0x881699519a25b0e32db9b1ba9981f3fbec93fbc0726c3e096af89e5ada2b1351"]]
+            "0xea02c685ffffffff00e1a0881699519a25b0e32db9b1ba9981f3fbec93fbc0726c3e096af89e5ada2b1351");
+
+    final Exception exception =
+        assertThrows(
+            RLPException.class,
+            () ->
+                TransactionAnnouncementDecoder.getDecoder(EthProtocol.ETH68)
+                    .decode(RLP.input(invalidMessageBytes)));
+
+    final String expectedMessage = "Expected max 4 bytes for unsigned int, but got 5 bytes";
+    assertThat(exception)
+        .hasCauseInstanceOf(RLPException.class)
+        .cause()
+        .hasMessage(expectedMessage);
+  }
+
+  @Test
+  public void shouldThrowNullPointerIfArgumentsAreNull() {
+    final Hash hash = Hash.hash(Bytes.random(32));
+    assertThat(
+            assertThrows(NullPointerException.class, () -> new TransactionAnnouncement((Hash) null))
+                .getMessage())
+        .isEqualTo("Hash cannot be null");
+
+    assertThat(
+            assertThrows(
+                    NullPointerException.class,
+                    () -> new TransactionAnnouncement(null, TransactionType.EIP1559, 0L))
+                .getMessage())
+        .isEqualTo("Hash cannot be null");
+
+    assertThat(
+            assertThrows(
+                    NullPointerException.class, () -> new TransactionAnnouncement(hash, null, 0L))
+                .getMessage())
+        .isEqualTo("Type cannot be null");
+
+    assertThat(
+            assertThrows(
+                    NullPointerException.class,
+                    () -> new TransactionAnnouncement(hash, TransactionType.EIP1559, null))
+                .getMessage())
+        .isEqualTo("Size cannot be null");
+
+    assertThat(
+            assertThrows(
+                    NullPointerException.class,
+                    () -> new TransactionAnnouncement((Transaction) null))
+                .getMessage())
+        .isEqualTo("Transaction cannot be null");
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/NewPooledTransactionHashesMessageSenderTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/NewPooledTransactionHashesMessageSenderTest.java
new file mode 100644
index 00000000000..07e15b5eac6
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/NewPooledTransactionHashesMessageSenderTest.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions;
+
+import static com.google.common.collect.Sets.newHashSet;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.core.Transaction.toHashList;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.EthProtocol;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.MockPeerConnection;
+import org.hyperledger.besu.ethereum.eth.messages.EthPV65;
+import org.hyperledger.besu.ethereum.eth.messages.NewPooledTransactionHashesMessage;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.google.common.collect.Sets;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+
+public class NewPooledTransactionHashesMessageSenderTest {
+
+  private final EthPeer peer1 = mock(EthPeer.class);
+  private final EthPeer peer2 = mock(EthPeer.class);
+
+  private final BlockDataGenerator generator = new BlockDataGenerator();
+  private final Transaction transaction1 = generator.transaction();
+  private final Transaction transaction2 = generator.transaction();
+  private final Transaction transaction3 = generator.transaction();
+
+  public PendingTransactions pendingTransactions;
+
+  private PeerTransactionTracker transactionTracker;
+  private NewPooledTransactionHashesMessageSender messageSender;
+
+  @Before
+  public void setUp() {
+    transactionTracker = new PeerTransactionTracker();
+    messageSender = new NewPooledTransactionHashesMessageSender(transactionTracker);
+    final Transaction tx = mock(Transaction.class);
+    pendingTransactions = mock(PendingTransactions.class);
+    when(pendingTransactions.getTransactionByHash(any())).thenReturn(Optional.of(tx));
+
+    when(peer1.getConnection())
+        .thenReturn(new MockPeerConnection(Set.of(EthProtocol.ETH67), (cap, msg, conn) -> {}));
+    when(peer2.getConnection())
+        .thenReturn(new MockPeerConnection(Set.of(EthProtocol.ETH67), (cap, msg, conn) -> {}));
+  }
+
+  @Test
+  public void shouldSendPendingTransactionsToEachPeer() throws Exception {
+
+    transactionTracker.addToPeerSendQueue(peer1, transaction1);
+    transactionTracker.addToPeerSendQueue(peer1, transaction2);
+    transactionTracker.addToPeerSendQueue(peer2, transaction3);
+
+    List.of(peer1, peer2).forEach(messageSender::sendTransactionHashesToPeer);
+
+    verify(peer1).send(transactionsMessageContaining(transaction1, transaction2));
+    verify(peer2).send(transactionsMessageContaining(transaction3));
+    verify(peer1).getConnection();
+    verify(peer2).getConnection();
+    verifyNoMoreInteractions(peer1, peer2);
+  }
+
+  @Test
+  public void shouldSendTransactionsInBatchesWithLimit() throws Exception {
+    final Set<Transaction> transactions =
+        generator.transactions(6000).stream().collect(Collectors.toSet());
+
+    transactions.forEach(transaction -> transactionTracker.addToPeerSendQueue(peer1, transaction));
+
+    messageSender.sendTransactionHashesToPeer(peer1);
+    final ArgumentCaptor<MessageData> messageDataArgumentCaptor =
+        ArgumentCaptor.forClass(MessageData.class);
+    verify(peer1, times(2)).send(messageDataArgumentCaptor.capture());
+
+    final List<MessageData> sentMessages = messageDataArgumentCaptor.getAllValues();
+
+    assertThat(sentMessages)
+        .hasSize(2)
+        .allMatch(message -> message.getCode() == EthPV65.NEW_POOLED_TRANSACTION_HASHES);
+    final Set<Hash> firstBatch = getTransactionsFromMessage(sentMessages.get(0));
+    final Set<Hash> secondBatch = getTransactionsFromMessage(sentMessages.get(1));
+
+    final int expectedFirstBatchSize = 4096, expectedSecondBatchSize = 1904, toleranceDelta = 0;
+    assertThat(firstBatch)
+        .hasSizeBetween(
+            expectedFirstBatchSize - toleranceDelta, expectedFirstBatchSize + toleranceDelta);
+    assertThat(secondBatch)
+        .hasSizeBetween(
+            expectedSecondBatchSize - toleranceDelta, expectedSecondBatchSize + toleranceDelta);
+
+    assertThat(Sets.union(firstBatch, secondBatch))
+        .containsExactlyInAnyOrderElementsOf(toHashList(transactions));
+  }
+
+  private MessageData transactionsMessageContaining(final Transaction... transactions) {
+    return argThat(
+        message -> {
+          final Set<Hash> actualSentTransactions = getTransactionsFromMessage(message);
+          final Set<Hash> expectedTransactions =
+              newHashSet(toHashList(Arrays.asList(transactions)));
+          return message.getCode() == EthPV65.NEW_POOLED_TRANSACTION_HASHES
+              && actualSentTransactions.equals(expectedTransactions);
+        });
+  }
+
+  private Set<Hash> getTransactionsFromMessage(final MessageData message) {
+    final NewPooledTransactionHashesMessage transactionsMessage =
+        NewPooledTransactionHashesMessage.readFrom(message, EthProtocol.ETH66);
+    return newHashSet(transactionsMessage.pendingTransactionHashes());
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PeerPendingTransactionTrackerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PeerPendingTransactionTrackerTest.java
deleted file mode 100644
index 1d016ffb2e8..00000000000
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PeerPendingTransactionTrackerTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.transactions;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
-
-import java.util.Optional;
-
-import com.google.common.collect.ImmutableSet;
-import org.junit.Before;
-import org.junit.Test;
-
-public class PeerPendingTransactionTrackerTest {
-
-  private final EthPeer ethPeer1 = mock(EthPeer.class);
-  private final EthPeer ethPeer2 = mock(EthPeer.class);
-  private final BlockDataGenerator generator = new BlockDataGenerator();
-  private final PendingTransactions pendingTransactions = mock(PendingTransactions.class);
-  private final PeerPendingTransactionTracker tracker =
-      new PeerPendingTransactionTracker(pendingTransactions);
-  private final Hash hash1 = generator.transaction().getHash();
-  private final Hash hash2 = generator.transaction().getHash();
-  private final Hash hash3 = generator.transaction().getHash();
-
-  @Before
-  public void setUp() {
-    Transaction tx = mock(Transaction.class);
-    when(pendingTransactions.getTransactionByHash(any())).thenReturn(Optional.of(tx));
-  }
-
-  @Test
-  public void shouldTrackTransactionsToSendToPeer() {
-    tracker.addToPeerSendQueue(ethPeer1, hash1);
-    tracker.addToPeerSendQueue(ethPeer1, hash2);
-    tracker.addToPeerSendQueue(ethPeer2, hash3);
-
-    assertThat(tracker.getEthPeersWithUnsentTransactions()).containsOnly(ethPeer1, ethPeer2);
-    assertThat(tracker.claimTransactionsToSendToPeer(ethPeer1)).containsOnly(hash1, hash2);
-    assertThat(tracker.claimTransactionsToSendToPeer(ethPeer2)).containsOnly(hash3);
-  }
-
-  @Test
-  public void shouldExcludeAlreadySeenTransactionsFromTransactionsToSend() {
-    tracker.markTransactionsHashesAsSeen(ethPeer1, ImmutableSet.of(hash2));
-
-    tracker.addToPeerSendQueue(ethPeer1, hash1);
-    tracker.addToPeerSendQueue(ethPeer1, hash2);
-    tracker.addToPeerSendQueue(ethPeer2, hash3);
-
-    assertThat(tracker.getEthPeersWithUnsentTransactions()).containsOnly(ethPeer1, ethPeer2);
-    assertThat(tracker.claimTransactionsToSendToPeer(ethPeer1)).containsOnly(hash1);
-    assertThat(tracker.claimTransactionsToSendToPeer(ethPeer2)).containsOnly(hash3);
-  }
-
-  @Test
-  public void shouldExcludeAlreadySeenTransactionsAsACollectionFromTransactionsToSend() {
-    tracker.markTransactionsHashesAsSeen(ethPeer1, ImmutableSet.of(hash1, hash2));
-
-    tracker.addToPeerSendQueue(ethPeer1, hash1);
-    tracker.addToPeerSendQueue(ethPeer1, hash2);
-    tracker.addToPeerSendQueue(ethPeer2, hash3);
-
-    assertThat(tracker.getEthPeersWithUnsentTransactions()).containsOnly(ethPeer2);
-    assertThat(tracker.claimTransactionsToSendToPeer(ethPeer1)).isEmpty();
-    assertThat(tracker.claimTransactionsToSendToPeer(ethPeer2)).containsOnly(hash3);
-  }
-
-  @Test
-  public void shouldClearDataWhenPeerDisconnects() {
-    tracker.markTransactionsHashesAsSeen(ethPeer1, ImmutableSet.of(hash3));
-
-    tracker.addToPeerSendQueue(ethPeer1, hash2);
-    tracker.addToPeerSendQueue(ethPeer2, hash3);
-
-    tracker.onDisconnect(ethPeer1);
-
-    assertThat(tracker.getEthPeersWithUnsentTransactions()).containsOnly(ethPeer2);
-
-    // Should have cleared data that ethPeer1 has already seen transaction1
-    tracker.addToPeerSendQueue(ethPeer1, hash1);
-
-    assertThat(tracker.getEthPeersWithUnsentTransactions()).containsOnly(ethPeer1, ethPeer2);
-    assertThat(tracker.claimTransactionsToSendToPeer(ethPeer1)).containsOnly(hash1);
-    assertThat(tracker.claimTransactionsToSendToPeer(ethPeer2)).containsOnly(hash3);
-  }
-}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionEstimatedMemorySizeTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionEstimatedMemorySizeTest.java
new file mode 100644
index 00000000000..48317545bed
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionEstimatedMemorySizeTest.java
@@ -0,0 +1,414 @@
+/*
+ * Copyright Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
+import org.hyperledger.besu.ethereum.eth.transactions.layered.BaseTransactionPoolTest;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.evm.AccessListEntry;
+import org.hyperledger.besu.plugin.data.TransactionType;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.atomic.LongAdder;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.openjdk.jol.info.ClassLayout;
+import org.openjdk.jol.info.GraphPathRecord;
+import org.openjdk.jol.info.GraphVisitor;
+import org.openjdk.jol.info.GraphWalker;
+
+@Disabled("Need to handle different results on different OS")
+public class PendingTransactionEstimatedMemorySizeTest extends BaseTransactionPoolTest {
+  private static final Set<Class<?>> SHARED_CLASSES =
+      Set.of(SignatureAlgorithm.class, TransactionType.class);
+  private static final Set<String> EIP1559_CONSTANT_FIELD_PATHS = Set.of(".gasPrice");
+  private static final Set<String> EIP1559_VARIABLE_SIZE_PATHS =
+      Set.of(".to", ".payload", ".maybeAccessList");
+
+  private static final Set<String> FRONTIER_ACCESS_LIST_CONSTANT_FIELD_PATHS =
+      Set.of(".maxFeePerGas", ".maxPriorityFeePerGas");
+  private static final Set<String> FRONTIER_ACCESS_LIST_VARIABLE_SIZE_PATHS =
+      Set.of(".to", ".payload", ".maybeAccessList");
+
+  @Test
+  public void toSize() {
+    TransactionTestFixture preparedTx =
+        prepareTransaction(TransactionType.ACCESS_LIST, 10, Wei.of(500), 10);
+    Transaction txTo =
+        preparedTx.to(Optional.of(Address.extract(Bytes32.random()))).createTransaction(KEYS1);
+    BytesValueRLPOutput rlpOut = new BytesValueRLPOutput();
+    txTo.writeTo(rlpOut);
+
+    txTo = Transaction.readFrom(new BytesValueRLPInput(rlpOut.encoded(), false));
+    System.out.println(txTo.getSender());
+    System.out.println(txTo.getHash());
+    System.out.println(txTo.getSize());
+
+    Optional<Address> to = txTo.getTo();
+    final ClassLayout cl = ClassLayout.parseInstance(to);
+    System.out.println(cl.toPrintable());
+    LongAdder size = new LongAdder();
+    size.add(cl.instanceSize());
+    System.out.println(size);
+
+    GraphVisitor gv =
+        gpr -> {
+          // byte[] is shared so only count the specific part for each field
+          if (gpr.path().endsWith(".bytes")) {
+            if (gpr.path().contains("delegate")) {
+              size.add(20);
+              System.out.println(
+                  "("
+                      + size
+                      + ")[20 = fixed address size; overrides: "
+                      + gpr.size()
+                      + ", "
+                      + gpr.path()
+                      + ", "
+                      + gpr.klass().toString()
+                      + "]");
+            }
+          } else {
+            size.add(gpr.size());
+            System.out.println(
+                "("
+                    + size
+                    + ")["
+                    + gpr.size()
+                    + ", "
+                    + gpr.path()
+                    + ", "
+                    + gpr.klass().toString()
+                    + "]");
+          }
+        };
+
+    GraphWalker gw = new GraphWalker(gv);
+
+    gw.walk(to);
+
+    System.out.println("Optional To size: " + size);
+
+    assertThat(size.sum()).isEqualTo(PendingTransaction.OPTIONAL_TO_MEMORY_SIZE);
+  }
+
+  @Test
+  public void payloadSize() {
+
+    TransactionTestFixture preparedTx =
+        prepareTransaction(TransactionType.ACCESS_LIST, 10, Wei.of(500), 10);
+    Transaction txPayload = preparedTx.createTransaction(KEYS1);
+    BytesValueRLPOutput rlpOut = new BytesValueRLPOutput();
+    txPayload.writeTo(rlpOut);
+
+    txPayload = Transaction.readFrom(new BytesValueRLPInput(rlpOut.encoded(), false));
+    System.out.println(txPayload.getSender());
+    System.out.println(txPayload.getHash());
+    System.out.println(txPayload.getSize());
+
+    final Bytes payload = txPayload.getPayload();
+    final ClassLayout cl = ClassLayout.parseInstance(payload);
+    System.out.println(cl.toPrintable());
+    LongAdder size = new LongAdder();
+    size.add(cl.instanceSize());
+    System.out.println("Base payload size: " + size);
+
+    assertThat(size.sum()).isEqualTo(PendingTransaction.PAYLOAD_BASE_MEMORY_SIZE);
+  }
+
+  @Test
+  public void pendingTransactionSize() {
+
+    TransactionTestFixture preparedTx =
+        prepareTransaction(TransactionType.ACCESS_LIST, 10, Wei.of(500), 10);
+    Transaction txPayload = preparedTx.createTransaction(KEYS1);
+    BytesValueRLPOutput rlpOut = new BytesValueRLPOutput();
+    txPayload.writeTo(rlpOut);
+
+    txPayload = Transaction.readFrom(new BytesValueRLPInput(rlpOut.encoded(), false));
+    System.out.println(txPayload.getSender());
+    System.out.println(txPayload.getHash());
+    System.out.println(txPayload.getSize());
+
+    final PendingTransaction pendingTx = new PendingTransaction.Remote(txPayload);
+
+    final ClassLayout cl = ClassLayout.parseInstance(pendingTx);
+    System.out.println(cl.toPrintable());
+    LongAdder size = new LongAdder();
+    size.add(cl.instanceSize());
+    System.out.println("PendingTransaction size: " + size);
+
+    assertThat(size.sum()).isEqualTo(PendingTransaction.PENDING_TRANSACTION_MEMORY_SIZE);
+  }
+
+  @Test
+  public void accessListSize() {
+    System.setProperty("jol.magicFieldOffset", "true");
+
+    final AccessListEntry ale1 =
+        new AccessListEntry(Address.extract(Bytes32.random()), List.of(Bytes32.random()));
+
+    final List<AccessListEntry> ales = List.of(ale1);
+
+    TransactionTestFixture preparedTx =
+        prepareTransaction(TransactionType.ACCESS_LIST, 0, Wei.of(500), 0);
+    Transaction txAccessList = preparedTx.accessList(ales).createTransaction(KEYS1);
+    BytesValueRLPOutput rlpOut = new BytesValueRLPOutput();
+    txAccessList.writeTo(rlpOut);
+
+    txAccessList = Transaction.readFrom(new BytesValueRLPInput(rlpOut.encoded(), false));
+    System.out.println(txAccessList.getSender());
+    System.out.println(txAccessList.getHash());
+    System.out.println(txAccessList.getSize());
+
+    final var optAL = txAccessList.getAccessList();
+
+    final ClassLayout cl1 = ClassLayout.parseInstance(optAL);
+    System.out.println(cl1.toPrintable());
+    System.out.println("Optional size: " + cl1.instanceSize());
+
+    final ClassLayout cl2 = ClassLayout.parseInstance(optAL.get());
+    System.out.println(cl2.toPrintable());
+    System.out.println("Optional + list size: " + cl2.instanceSize());
+
+    assertThat(cl2.instanceSize()).isEqualTo(PendingTransaction.OPTIONAL_ACCESS_LIST_MEMORY_SIZE);
+
+    final AccessListEntry ale = optAL.get().get(0);
+
+    final ClassLayout cl3 = ClassLayout.parseInstance(ale);
+    System.out.println(cl3.toPrintable());
+    System.out.println("AccessListEntry size: " + cl3.instanceSize());
+
+    LongAdder size = new LongAdder();
+    size.add(cl3.instanceSize());
+
+    GraphVisitor gv =
+        gpr -> {
+          // byte[] is shared so only count the specific part for each field
+          if (gpr.path().endsWith(".bytes")) {
+            if (gpr.path().contains("address")) {
+              size.add(20);
+              System.out.println(
+                  "("
+                      + size
+                      + ")[20 = fixed address size; overrides: "
+                      + gpr.size()
+                      + ", "
+                      + gpr.path()
+                      + ", "
+                      + gpr.klass().toString()
+                      + "]");
+            }
+          } else if (!gpr.path()
+              .contains(
+                  "storageKeys.elementData[")) { // exclude elements since we want the container
+            // size
+            size.add(gpr.size());
+            System.out.println(
+                "("
+                    + size
+                    + ")["
+                    + gpr.size()
+                    + ", "
+                    + gpr.path()
+                    + ", "
+                    + gpr.klass().toString()
+                    + "]");
+          }
+        };
+
+    GraphWalker gw = new GraphWalker(gv);
+
+    gw.walk(ale);
+
+    System.out.println("AccessListEntry container size: " + size);
+
+    assertThat(size.sum()).isEqualTo(PendingTransaction.ACCESS_LIST_ENTRY_BASE_MEMORY_SIZE);
+
+    final Bytes32 storageKey = ale.getStorageKeys().get(0);
+    final ClassLayout cl4 = ClassLayout.parseInstance(storageKey);
+    System.out.println(cl4.toPrintable());
+    System.out.println("Single storage key size: " + cl4.instanceSize());
+
+    assertThat(cl4.instanceSize())
+        .isEqualTo(PendingTransaction.ACCESS_LIST_STORAGE_KEY_MEMORY_SIZE);
+  }
+
+  @Test
+  public void baseEIP1559TransactionMemorySize() {
+    System.setProperty("jol.magicFieldOffset", "true");
+    Transaction txEip1559 = createEIP1559Transaction(1, KEYS1, 10);
+    BytesValueRLPOutput rlpOut = new BytesValueRLPOutput();
+    txEip1559.writeTo(rlpOut);
+
+    txEip1559 = Transaction.readFrom(new BytesValueRLPInput(rlpOut.encoded(), false));
+    System.out.println(txEip1559.getSender());
+    System.out.println(txEip1559.getHash());
+    System.out.println(txEip1559.getSize());
+
+    final ClassLayout cl = ClassLayout.parseInstance(txEip1559);
+    System.out.println(cl.toPrintable());
+    LongAdder eip1559size = new LongAdder();
+    eip1559size.add(cl.instanceSize());
+    System.out.println(eip1559size);
+
+    final Set<String> skipPrefixes = new HashSet<>();
+
+    GraphVisitor gv =
+        gpr -> {
+          if (!skipPrefixes.stream().anyMatch(sp -> gpr.path().startsWith(sp))) {
+            if (SHARED_CLASSES.stream().anyMatch(scz -> scz.isAssignableFrom(gpr.klass()))) {
+              skipPrefixes.add(gpr.path());
+            } else if (!startWithAnyOf(EIP1559_CONSTANT_FIELD_PATHS, gpr)
+                && !startWithAnyOf(EIP1559_VARIABLE_SIZE_PATHS, gpr)) {
+              eip1559size.add(gpr.size());
+              System.out.println(
+                  "("
+                      + eip1559size
+                      + ")["
+                      + gpr.size()
+                      + ", "
+                      + gpr.path()
+                      + ", "
+                      + gpr.klass().toString()
+                      + "]");
+            }
+          }
+        };
+
+    GraphWalker gw = new GraphWalker(gv);
+
+    gw.walk(txEip1559);
+
+    System.out.println("Base EIP1559 size: " + eip1559size);
+    assertThat(eip1559size.sum()).isEqualTo(PendingTransaction.EIP1559_BASE_MEMORY_SIZE);
+  }
+
+  @Test
+  public void baseAccessListTransactionMemorySize() {
+    System.setProperty("jol.magicFieldOffset", "true");
+    Transaction txAccessList =
+        createTransaction(TransactionType.ACCESS_LIST, 1, Wei.of(500), 0, KEYS1);
+    BytesValueRLPOutput rlpOut = new BytesValueRLPOutput();
+    txAccessList.writeTo(rlpOut);
+
+    txAccessList = Transaction.readFrom(new BytesValueRLPInput(rlpOut.encoded(), false));
+    System.out.println(txAccessList.getSender());
+    System.out.println(txAccessList.getHash());
+    System.out.println(txAccessList.getSize());
+
+    final ClassLayout cl = ClassLayout.parseInstance(txAccessList);
+    System.out.println(cl.toPrintable());
+    LongAdder accessListSize = new LongAdder();
+    accessListSize.add(cl.instanceSize());
+    System.out.println(accessListSize);
+
+    final Set<String> skipPrefixes = new HashSet<>();
+
+    GraphVisitor gv =
+        gpr -> {
+          if (!skipPrefixes.stream().anyMatch(sp -> gpr.path().startsWith(sp))) {
+            if (SHARED_CLASSES.stream().anyMatch(scz -> scz.isAssignableFrom(gpr.klass()))) {
+              skipPrefixes.add(gpr.path());
+            } else if (!startWithAnyOf(FRONTIER_ACCESS_LIST_CONSTANT_FIELD_PATHS, gpr)
+                && !startWithAnyOf(FRONTIER_ACCESS_LIST_VARIABLE_SIZE_PATHS, gpr)) {
+              accessListSize.add(gpr.size());
+              System.out.println(
+                  "("
+                      + accessListSize
+                      + ")["
+                      + gpr.size()
+                      + ", "
+                      + gpr.path()
+                      + ", "
+                      + gpr.klass().toString()
+                      + "]");
+            }
+          }
+        };
+
+    GraphWalker gw = new GraphWalker(gv);
+
+    gw.walk(txAccessList);
+    System.out.println("Base Access List size: " + accessListSize);
+    assertThat(accessListSize.sum()).isEqualTo(PendingTransaction.ACCESS_LIST_BASE_MEMORY_SIZE);
+  }
+
+  @Test
+  public void baseFrontierTransactionMemorySize() {
+    System.setProperty("jol.magicFieldOffset", "true");
+    Transaction txFrontier = createTransaction(TransactionType.FRONTIER, 1, Wei.of(500), 0, KEYS1);
+    BytesValueRLPOutput rlpOut = new BytesValueRLPOutput();
+    txFrontier.writeTo(rlpOut);
+
+    txFrontier = Transaction.readFrom(new BytesValueRLPInput(rlpOut.encoded(), false));
+    System.out.println(txFrontier.getSender());
+    System.out.println(txFrontier.getHash());
+    System.out.println(txFrontier.getSize());
+
+    final ClassLayout cl = ClassLayout.parseInstance(txFrontier);
+    System.out.println(cl.toPrintable());
+    LongAdder frontierSize = new LongAdder();
+    frontierSize.add(cl.instanceSize());
+    System.out.println(frontierSize);
+
+    final Set<String> skipPrefixes = new HashSet<>();
+
+    GraphVisitor gv =
+        gpr -> {
+          if (!skipPrefixes.stream().anyMatch(sp -> gpr.path().startsWith(sp))) {
+            if (SHARED_CLASSES.stream().anyMatch(scz -> scz.isAssignableFrom(gpr.klass()))) {
+              skipPrefixes.add(gpr.path());
+            } else if (!startWithAnyOf(FRONTIER_ACCESS_LIST_CONSTANT_FIELD_PATHS, gpr)
+                && !startWithAnyOf(FRONTIER_ACCESS_LIST_VARIABLE_SIZE_PATHS, gpr)) {
+              frontierSize.add(gpr.size());
+              System.out.println(
+                  "("
+                      + frontierSize
+                      + ")["
+                      + gpr.size()
+                      + ", "
+                      + gpr.path()
+                      + ", "
+                      + gpr.klass().toString()
+                      + "]");
+            }
+          }
+        };
+
+    GraphWalker gw = new GraphWalker(gv);
+
+    gw.walk(txFrontier);
+    System.out.println("Base Frontier size: " + frontierSize);
+    assertThat(frontierSize.sum()).isEqualTo(PendingTransaction.FRONTIER_BASE_MEMORY_SIZE);
+  }
+
+  private boolean startWithAnyOf(final Set<String> prefixes, final GraphPathRecord path) {
+    return prefixes.stream().anyMatch(prefix -> path.path().startsWith(prefix));
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsMessageProcessorTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsMessageProcessorTest.java
deleted file mode 100644
index d227cea4610..00000000000
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsMessageProcessorTest.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.transactions;
-
-import static java.time.Duration.ofMillis;
-import static java.time.Duration.ofMinutes;
-import static java.time.Instant.now;
-import static java.util.Arrays.asList;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.eth.manager.EthContext;
-import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
-import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
-import org.hyperledger.besu.ethereum.eth.messages.NewPooledTransactionHashesMessage;
-import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactionsMessageProcessor.FetcherCreatorTask;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
-import org.hyperledger.besu.plugin.services.metrics.Counter;
-
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Optional;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-@RunWith(MockitoJUnitRunner.class)
-public class PendingTransactionsMessageProcessorTest {
-
-  @Mock private TransactionPool transactionPool;
-  @Mock private TransactionPoolConfiguration transactionPoolConfiguration;
-  @Mock private PeerPendingTransactionTracker transactionTracker;
-  @Mock private Counter totalSkippedTransactionsMessageCounter;
-  @Mock private EthPeer peer1;
-  @Mock private MetricsSystem metricsSystem;
-  @Mock private SyncState syncState;
-  @Mock private EthContext ethContext;
-  @Mock private EthScheduler ethScheduler;
-
-  private PendingTransactionsMessageProcessor messageHandler;
-
-  private final BlockDataGenerator generator = new BlockDataGenerator();
-  private final Hash hash1 = generator.transaction().getHash();
-  private final Hash hash2 = generator.transaction().getHash();
-  private final Hash hash3 = generator.transaction().getHash();
-
-  @Before
-  public void setup() {
-    when(transactionPoolConfiguration.getEth65TrxAnnouncedBufferingPeriod())
-        .thenReturn(Duration.ofMillis(500));
-    messageHandler =
-        new PendingTransactionsMessageProcessor(
-            transactionTracker,
-            transactionPool,
-            transactionPoolConfiguration,
-            totalSkippedTransactionsMessageCounter,
-            ethContext,
-            metricsSystem,
-            syncState);
-    when(ethContext.getScheduler()).thenReturn(ethScheduler);
-  }
-
-  @Test
-  public void shouldMarkAllReceivedTransactionsAsSeen() {
-    messageHandler.processNewPooledTransactionHashesMessage(
-        peer1,
-        NewPooledTransactionHashesMessage.create(asList(hash1, hash2, hash3)),
-        now(),
-        ofMinutes(1));
-
-    verify(transactionTracker)
-        .markTransactionsHashesAsSeen(peer1, Arrays.asList(hash1, hash2, hash3));
-    verifyNoMoreInteractions(transactionTracker);
-  }
-
-  @Test
-  public void shouldAddInitiatedRequestingTransactions() {
-    when(syncState.isInSync(anyLong())).thenReturn(true);
-
-    messageHandler.processNewPooledTransactionHashesMessage(
-        peer1,
-        NewPooledTransactionHashesMessage.create(asList(hash1, hash2, hash3)),
-        now(),
-        ofMinutes(1));
-
-    verify(transactionPool).addTransactionHash(hash1);
-    verify(transactionPool).addTransactionHash(hash2);
-    verify(transactionPool).addTransactionHash(hash3);
-    verify(transactionPool).getTransactionByHash(hash1);
-    verify(transactionPool).getTransactionByHash(hash2);
-    verify(transactionPool).getTransactionByHash(hash3);
-    verifyNoMoreInteractions(transactionPool);
-  }
-
-  @Test
-  public void shouldNotAddAlreadyPresentTransactions() {
-    when(syncState.isInSync(anyLong())).thenReturn(true);
-
-    when(transactionPool.getTransactionByHash(hash1))
-        .thenReturn(Optional.of(Transaction.builder().build()));
-    when(transactionPool.getTransactionByHash(hash2))
-        .thenReturn(Optional.of(Transaction.builder().build()));
-
-    messageHandler.processNewPooledTransactionHashesMessage(
-        peer1,
-        NewPooledTransactionHashesMessage.create(asList(hash1, hash2, hash3)),
-        now(),
-        ofMinutes(1));
-
-    verify(transactionPool).addTransactionHash(hash3);
-    verify(transactionPool).getTransactionByHash(hash1);
-    verify(transactionPool).getTransactionByHash(hash2);
-    verify(transactionPool).getTransactionByHash(hash3);
-    verifyNoMoreInteractions(transactionPool);
-  }
-
-  @Test
-  public void shouldNotAddInitiatedRequestingTransactionsWhemOutOfSync() {
-    when(syncState.isInSync(anyLong())).thenReturn(false);
-
-    messageHandler.processNewPooledTransactionHashesMessage(
-        peer1,
-        NewPooledTransactionHashesMessage.create(asList(hash1, hash2, hash3)),
-        now(),
-        ofMinutes(1));
-    verifyNoInteractions(transactionPool);
-  }
-
-  @Test
-  public void shouldNotMarkReceivedExpiredTransactionsAsSeen() {
-    messageHandler.processNewPooledTransactionHashesMessage(
-        peer1,
-        NewPooledTransactionHashesMessage.create(asList(hash1, hash2, hash3)),
-        now().minus(ofMinutes(1)),
-        ofMillis(1));
-    verifyNoInteractions(transactionTracker);
-    verify(totalSkippedTransactionsMessageCounter).inc(1);
-    verifyNoMoreInteractions(totalSkippedTransactionsMessageCounter);
-  }
-
-  @Test
-  public void shouldNotAddReceivedTransactionsToTransactionPoolIfExpired() {
-    messageHandler.processNewPooledTransactionHashesMessage(
-        peer1,
-        NewPooledTransactionHashesMessage.create(asList(hash1, hash2, hash3)),
-        now().minus(ofMinutes(1)),
-        ofMillis(1));
-    verifyNoInteractions(transactionPool);
-    verify(totalSkippedTransactionsMessageCounter).inc(1);
-    verifyNoMoreInteractions(totalSkippedTransactionsMessageCounter);
-  }
-
-  @Test
-  public void shouldScheduleGetPooledTransactionsTaskWhenNewTransactionAdded() {
-    when(syncState.isInSync(anyLong())).thenReturn(true);
-
-    final EthScheduler ethScheduler = mock(EthScheduler.class);
-    when(ethContext.getScheduler()).thenReturn(ethScheduler);
-    when(transactionPool.addTransactionHash(hash1)).thenReturn(true);
-
-    messageHandler.processNewPooledTransactionHashesMessage(
-        peer1, NewPooledTransactionHashesMessage.create(asList(hash1, hash2)), now(), ofMinutes(1));
-
-    verify(ethScheduler, times(1))
-        .scheduleFutureTask(any(FetcherCreatorTask.class), any(Duration.class));
-  }
-
-  @Test
-  public void shouldNotScheduleGetPooledTransactionsTaskTwice() {
-    when(syncState.isInSync(anyLong())).thenReturn(true);
-
-    when(transactionPool.addTransactionHash(hash1)).thenReturn(true);
-    when(transactionPool.addTransactionHash(hash2)).thenReturn(true);
-
-    messageHandler.processNewPooledTransactionHashesMessage(
-        peer1,
-        NewPooledTransactionHashesMessage.create(Collections.singletonList(hash1)),
-        now(),
-        ofMinutes(1));
-
-    messageHandler.processNewPooledTransactionHashesMessage(
-        peer1,
-        NewPooledTransactionHashesMessage.create(Collections.singletonList(hash2)),
-        now(),
-        ofMinutes(1));
-
-    verify(ethScheduler, times(1))
-        .scheduleFutureTask(any(FetcherCreatorTask.class), any(Duration.class));
-  }
-}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsMessageSenderTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsMessageSenderTest.java
deleted file mode 100644
index 49a5604479e..00000000000
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsMessageSenderTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.transactions;
-
-import static com.google.common.collect.Sets.newHashSet;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
-import org.hyperledger.besu.ethereum.eth.messages.EthPV65;
-import org.hyperledger.besu.ethereum.eth.messages.NewPooledTransactionHashesMessage;
-import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import com.google.common.collect.Sets;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-
-public class PendingTransactionsMessageSenderTest {
-
-  private final EthPeer peer1 = mock(EthPeer.class);
-  private final EthPeer peer2 = mock(EthPeer.class);
-
-  private final BlockDataGenerator generator = new BlockDataGenerator();
-  private final Hash transaction1 = generator.transaction().getHash();
-  private final Hash transaction2 = generator.transaction().getHash();
-  private final Hash transaction3 = generator.transaction().getHash();
-
-  private final PendingTransactions pendingTransactions = mock(PendingTransactions.class);
-  private final PeerPendingTransactionTracker transactionTracker =
-      new PeerPendingTransactionTracker(pendingTransactions);
-  private final PendingTransactionsMessageSender messageSender =
-      new PendingTransactionsMessageSender(transactionTracker);
-
-  @Before
-  public void setUp() {
-    Transaction tx = mock(Transaction.class);
-    when(pendingTransactions.getTransactionByHash(any())).thenReturn(Optional.of(tx));
-  }
-
-  @Test
-  public void shouldSendPendingTransactionsToEachPeer() throws Exception {
-
-    transactionTracker.addToPeerSendQueue(peer1, transaction1);
-    transactionTracker.addToPeerSendQueue(peer1, transaction2);
-    transactionTracker.addToPeerSendQueue(peer2, transaction3);
-
-    messageSender.sendTransactionsToPeers();
-
-    verify(peer1).send(transactionsMessageContaining(transaction1, transaction2));
-    verify(peer2).send(transactionsMessageContaining(transaction3));
-    verifyNoMoreInteractions(peer1, peer2);
-  }
-
-  @Test
-  public void shouldSendTransactionsInBatchesWithLimit() throws Exception {
-    final Set<Hash> transactions =
-        generator.transactions(6000).stream().map(Transaction::getHash).collect(Collectors.toSet());
-
-    transactions.forEach(transaction -> transactionTracker.addToPeerSendQueue(peer1, transaction));
-
-    messageSender.sendTransactionsToPeers();
-    final ArgumentCaptor<MessageData> messageDataArgumentCaptor =
-        ArgumentCaptor.forClass(MessageData.class);
-    verify(peer1, times(2)).send(messageDataArgumentCaptor.capture());
-
-    final List<MessageData> sentMessages = messageDataArgumentCaptor.getAllValues();
-
-    assertThat(sentMessages).hasSize(2);
-    assertThat(sentMessages)
-        .allMatch(message -> message.getCode() == EthPV65.NEW_POOLED_TRANSACTION_HASHES);
-    final Set<Hash> firstBatch = getTransactionsFromMessage(sentMessages.get(0));
-    final Set<Hash> secondBatch = getTransactionsFromMessage(sentMessages.get(1));
-
-    final int expectedFirstBatchSize = 4096, expectedSecondBatchSize = 1904, toleranceDelta = 0;
-    assertThat(firstBatch)
-        .hasSizeBetween(
-            expectedFirstBatchSize - toleranceDelta, expectedFirstBatchSize + toleranceDelta);
-    assertThat(secondBatch)
-        .hasSizeBetween(
-            expectedSecondBatchSize - toleranceDelta, expectedSecondBatchSize + toleranceDelta);
-
-    assertThat(Sets.union(firstBatch, secondBatch)).isEqualTo(transactions);
-  }
-
-  private MessageData transactionsMessageContaining(final Hash... transactions) {
-    return argThat(
-        message -> {
-          final Set<Hash> actualSentTransactions = getTransactionsFromMessage(message);
-          final Set<Hash> expectedTransactions = newHashSet(transactions);
-          return message.getCode() == EthPV65.NEW_POOLED_TRANSACTION_HASHES
-              && actualSentTransactions.equals(expectedTransactions);
-        });
-  }
-
-  private Set<Hash> getTransactionsFromMessage(final MessageData message) {
-    final NewPooledTransactionHashesMessage transactionsMessage =
-        NewPooledTransactionHashesMessage.readFrom(message);
-    return newHashSet(transactionsMessage.pendingTransactions());
-  }
-}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsSenderTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsSenderTest.java
deleted file mode 100644
index 2059a35e9c0..00000000000
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsSenderTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.transactions;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.eth.EthProtocol;
-import org.hyperledger.besu.ethereum.eth.manager.EthContext;
-import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
-import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
-import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
-
-import java.util.Arrays;
-import java.util.Collections;
-
-import org.apache.tuweni.bytes.Bytes32;
-import org.junit.Test;
-
-public class PendingTransactionsSenderTest {
-
-  @Test
-  public void testSendEth65PeersOnly() {
-    PeerPendingTransactionTracker peerPendingTransactionTracker =
-        mock(PeerPendingTransactionTracker.class);
-
-    PendingTransactionsMessageSender pendingTransactionsMessageSender =
-        mock(PendingTransactionsMessageSender.class);
-    EthContext ethContext = mock(EthContext.class);
-    EthScheduler ethScheduler = mock(EthScheduler.class);
-    when(ethContext.getScheduler()).thenReturn(ethScheduler);
-    PendingTransactionSender sender =
-        new PendingTransactionSender(
-            peerPendingTransactionTracker, pendingTransactionsMessageSender, ethContext);
-
-    EthPeer peer1 = mock(EthPeer.class);
-    EthPeer peer2 = mock(EthPeer.class);
-    Transaction tx = mock(Transaction.class);
-    Hash hash = Hash.wrap(Bytes32.random());
-    when(tx.getHash()).thenReturn(hash);
-    EthPeers ethPeers = mock(EthPeers.class);
-    when(ethContext.getEthPeers()).thenReturn(ethPeers);
-    when(ethPeers.streamAvailablePeers()).thenReturn(Arrays.asList(peer1, peer2).stream());
-    when(peerPendingTransactionTracker.isPeerSupported(peer1, EthProtocol.ETH65)).thenReturn(true);
-    when(peerPendingTransactionTracker.isPeerSupported(peer2, EthProtocol.ETH65)).thenReturn(false);
-    sender.onTransactionsAdded(Collections.singleton(tx));
-    verify(peerPendingTransactionTracker, times(1)).addToPeerSendQueue(peer1, hash);
-    verify(peerPendingTransactionTracker, never()).addToPeerSendQueue(peer2, hash);
-  }
-}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsTest.java
deleted file mode 100644
index 4d36d7e520a..00000000000
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/PendingTransactionsTest.java
+++ /dev/null
@@ -1,703 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.transactions;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
-import org.hyperledger.besu.ethereum.core.Util;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionAddedStatus;
-import org.hyperledger.besu.metrics.StubMetricsSystem;
-import org.hyperledger.besu.testutil.TestClock;
-
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.OptionalLong;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import com.google.common.collect.Lists;
-import org.junit.Test;
-
-public class PendingTransactionsTest {
-
-  private static final int MAX_TRANSACTIONS = 5;
-  private static final int MAX_TRANSACTION_HASHES = 5;
-  private static final KeyPair KEYS1 = KeyPair.generate();
-  private static final KeyPair KEYS2 = KeyPair.generate();
-  private static final String ADDED_COUNTER = "transactions_added_total";
-  private static final String REMOVED_COUNTER = "transactions_removed_total";
-  private static final String REMOTE = "remote";
-  private static final String LOCAL = "local";
-  private static final String DROPPED = "dropped";
-
-  private final TestClock clock = new TestClock();
-  private final StubMetricsSystem metricsSystem = new StubMetricsSystem();
-  private final PendingTransactions transactions =
-      new PendingTransactions(
-          TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
-          MAX_TRANSACTIONS,
-          MAX_TRANSACTION_HASHES,
-          TestClock.fixed(),
-          metricsSystem,
-          PendingTransactionsTest::mockBlockHeader,
-          TransactionPoolConfiguration.DEFAULT_PRICE_BUMP);
-  private final Transaction transaction1 = createTransaction(2);
-  private final Transaction transaction2 = createTransaction(1);
-
-  private final PendingTransactionListener listener = mock(PendingTransactionListener.class);
-  private final PendingTransactionDroppedListener droppedListener =
-      mock(PendingTransactionDroppedListener.class);
-  private static final Address SENDER1 = Util.publicKeyToAddress(KEYS1.getPublicKey());
-  private static final Address SENDER2 = Util.publicKeyToAddress(KEYS2.getPublicKey());
-
-  @Test
-  public void shouldReturnExclusivelyLocalTransactionsWhenAppropriate() {
-    final Transaction localTransaction0 = createTransaction(0);
-    transactions.addLocalTransaction(localTransaction0);
-    assertThat(transactions.size()).isEqualTo(1);
-
-    transactions.addRemoteTransaction(transaction1);
-    assertThat(transactions.size()).isEqualTo(2);
-
-    transactions.addRemoteTransaction(transaction2);
-    assertThat(transactions.size()).isEqualTo(3);
-
-    final List<Transaction> localTransactions = transactions.getLocalTransactions();
-    assertThat(localTransactions.size()).isEqualTo(1);
-  }
-
-  @Test
-  public void shouldAddATransaction() {
-    transactions.addRemoteTransaction(transaction1);
-    assertThat(transactions.size()).isEqualTo(1);
-    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, REMOTE)).isEqualTo(1);
-
-    transactions.addRemoteTransaction(transaction2);
-    assertThat(transactions.size()).isEqualTo(2);
-    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, REMOTE)).isEqualTo(2);
-  }
-
-  @Test
-  public void shouldReturnEmptyOptionalWhenNoTransactionWithGivenHashExists() {
-    assertThat(transactions.getTransactionByHash(Hash.EMPTY_TRIE_HASH)).isEmpty();
-  }
-
-  @Test
-  public void shouldGetTransactionByHash() {
-    transactions.addRemoteTransaction(transaction1);
-    assertTransactionPending(transaction1);
-  }
-
-  @Test
-  public void shouldDropOldestTransactionWhenLimitExceeded() {
-    final Transaction oldestTransaction = createTransaction(0);
-    transactions.addRemoteTransaction(oldestTransaction);
-    for (int i = 1; i < MAX_TRANSACTIONS; i++) {
-      transactions.addRemoteTransaction(createTransaction(i));
-    }
-    assertThat(transactions.size()).isEqualTo(MAX_TRANSACTIONS);
-    assertThat(metricsSystem.getCounterValue(REMOVED_COUNTER, REMOTE, DROPPED)).isZero();
-
-    transactions.addRemoteTransaction(createTransaction(MAX_TRANSACTIONS + 1));
-    assertThat(transactions.size()).isEqualTo(MAX_TRANSACTIONS);
-    assertTransactionNotPending(oldestTransaction);
-    assertThat(metricsSystem.getCounterValue(REMOVED_COUNTER, REMOTE, DROPPED)).isEqualTo(1);
-  }
-
-  @Test
-  public void shouldHandleMaximumTransactionLimitCorrectlyWhenSameTransactionAddedMultipleTimes() {
-    transactions.addRemoteTransaction(createTransaction(0));
-    transactions.addRemoteTransaction(createTransaction(0));
-
-    for (int i = 1; i < MAX_TRANSACTIONS; i++) {
-      transactions.addRemoteTransaction(createTransaction(i));
-    }
-    assertThat(transactions.size()).isEqualTo(MAX_TRANSACTIONS);
-
-    transactions.addRemoteTransaction(createTransaction(MAX_TRANSACTIONS + 1));
-    transactions.addRemoteTransaction(createTransaction(MAX_TRANSACTIONS + 2));
-    assertThat(transactions.size()).isEqualTo(MAX_TRANSACTIONS);
-  }
-
-  @Test
-  public void shouldPrioritizeLocalTransaction() {
-    final Transaction localTransaction = createTransaction(0);
-    transactions.addLocalTransaction(localTransaction);
-
-    for (int i = 1; i <= MAX_TRANSACTIONS; i++) {
-      transactions.addRemoteTransaction(createTransaction(i));
-    }
-    assertThat(transactions.size()).isEqualTo(MAX_TRANSACTIONS);
-    assertTransactionPending(localTransaction);
-  }
-
-  @Test
-  public void shouldPrioritizeGasPriceThenTimeAddedToPool() {
-    final List<Transaction> lowGasPriceTransactions =
-        IntStream.range(0, MAX_TRANSACTIONS)
-            .mapToObj(i -> transactionWithNonceSenderAndGasPrice(i + 1, KEYS1, 10))
-            .collect(Collectors.toUnmodifiableList());
-
-    // Fill the pool
-    lowGasPriceTransactions.forEach(transactions::addRemoteTransaction);
-
-    // This should kick the oldest tx with the low gas price out, namely the first one we added
-    final Transaction highGasPriceTransaction =
-        transactionWithNonceSenderAndGasPrice(MAX_TRANSACTIONS + 1, KEYS1, 100);
-    transactions.addRemoteTransaction(highGasPriceTransaction);
-    assertThat(transactions.size()).isEqualTo(MAX_TRANSACTIONS);
-
-    assertTransactionPending(highGasPriceTransaction);
-    assertTransactionNotPending(lowGasPriceTransactions.get(0));
-    lowGasPriceTransactions.stream().skip(1).forEach(this::assertTransactionPending);
-  }
-
-  @Test
-  public void shouldStartDroppingLocalTransactionsWhenPoolIsFullOfLocalTransactions() {
-    final Transaction firstLocalTransaction = createTransaction(0);
-    transactions.addLocalTransaction(firstLocalTransaction);
-
-    for (int i = 1; i <= MAX_TRANSACTIONS; i++) {
-      transactions.addLocalTransaction(createTransaction(i));
-    }
-    assertThat(transactions.size()).isEqualTo(MAX_TRANSACTIONS);
-    assertTransactionNotPending(firstLocalTransaction);
-  }
-
-  @Test
-  public void shouldNotifyListenerWhenRemoteTransactionAdded() {
-    transactions.subscribePendingTransactions(listener);
-
-    transactions.addRemoteTransaction(transaction1);
-
-    verify(listener).onTransactionAdded(transaction1);
-  }
-
-  @Test
-  public void shouldNotNotifyListenerAfterUnsubscribe() {
-    final long id = transactions.subscribePendingTransactions(listener);
-
-    transactions.addRemoteTransaction(transaction1);
-
-    verify(listener).onTransactionAdded(transaction1);
-
-    transactions.unsubscribePendingTransactions(id);
-
-    transactions.addRemoteTransaction(transaction2);
-
-    verifyZeroInteractions(listener);
-  }
-
-  @Test
-  public void shouldNotifyListenerWhenLocalTransactionAdded() {
-    transactions.subscribePendingTransactions(listener);
-
-    transactions.addLocalTransaction(transaction1);
-
-    verify(listener).onTransactionAdded(transaction1);
-  }
-
-  @Test
-  public void shouldNotifyDroppedListenerWhenRemoteTransactionDropped() {
-    transactions.addRemoteTransaction(transaction1);
-
-    transactions.subscribeDroppedTransactions(droppedListener);
-
-    transactions.removeTransaction(transaction1);
-
-    verify(droppedListener).onTransactionDropped(transaction1);
-  }
-
-  @Test
-  public void shouldNotNotifyDroppedListenerAfterUnsubscribe() {
-    transactions.addRemoteTransaction(transaction1);
-    transactions.addRemoteTransaction(transaction2);
-
-    final long id = transactions.subscribeDroppedTransactions(droppedListener);
-
-    transactions.removeTransaction(transaction1);
-
-    verify(droppedListener).onTransactionDropped(transaction1);
-
-    transactions.unsubscribeDroppedTransactions(id);
-
-    transactions.removeTransaction(transaction2);
-
-    verifyNoMoreInteractions(droppedListener);
-  }
-
-  @Test
-  public void shouldNotifyDroppedListenerWhenLocalTransactionDropped() {
-    transactions.addLocalTransaction(transaction1);
-
-    transactions.subscribeDroppedTransactions(droppedListener);
-
-    transactions.removeTransaction(transaction1);
-
-    verify(droppedListener).onTransactionDropped(transaction1);
-  }
-
-  @Test
-  public void shouldNotNotifyDroppedListenerWhenTransactionAddedToBlock() {
-    transactions.addRemoteTransaction(transaction1);
-
-    transactions.subscribeDroppedTransactions(droppedListener);
-
-    transactions.transactionAddedToBlock(transaction1);
-
-    verifyZeroInteractions(droppedListener);
-  }
-
-  @Test
-  public void selectTransactionsUntilSelectorRequestsNoMore() {
-    transactions.addRemoteTransaction(transaction1);
-    transactions.addRemoteTransaction(transaction2);
-
-    final List<Transaction> parsedTransactions = Lists.newArrayList();
-    transactions.selectTransactions(
-        transaction -> {
-          parsedTransactions.add(transaction);
-          return PendingTransactions.TransactionSelectionResult.COMPLETE_OPERATION;
-        });
-
-    assertThat(parsedTransactions.size()).isEqualTo(1);
-    assertThat(parsedTransactions.get(0)).isEqualTo(transaction2);
-  }
-
-  @Test
-  public void selectTransactionsUntilPendingIsEmpty() {
-    transactions.addRemoteTransaction(transaction1);
-    transactions.addRemoteTransaction(transaction2);
-
-    final List<Transaction> parsedTransactions = Lists.newArrayList();
-    transactions.selectTransactions(
-        transaction -> {
-          parsedTransactions.add(transaction);
-          return PendingTransactions.TransactionSelectionResult.CONTINUE;
-        });
-
-    assertThat(parsedTransactions.size()).isEqualTo(2);
-    assertThat(parsedTransactions.get(0)).isEqualTo(transaction2);
-    assertThat(parsedTransactions.get(1)).isEqualTo(transaction1);
-  }
-
-  @Test
-  public void shouldNotSelectReplacedTransaction() {
-    final Transaction transaction1 = transactionWithNonceSenderAndGasPrice(1, KEYS1, 1);
-    final Transaction transaction2 = transactionWithNonceSenderAndGasPrice(1, KEYS1, 2);
-
-    transactions.addRemoteTransaction(transaction1);
-    transactions.addRemoteTransaction(transaction2);
-
-    final List<Transaction> parsedTransactions = Lists.newArrayList();
-    transactions.selectTransactions(
-        transaction -> {
-          parsedTransactions.add(transaction);
-          return PendingTransactions.TransactionSelectionResult.CONTINUE;
-        });
-
-    assertThat(parsedTransactions).containsExactly(transaction2);
-  }
-
-  @Test
-  public void invalidTransactionIsDeletedFromPendingTransactions() {
-    transactions.addRemoteTransaction(transaction1);
-    transactions.addRemoteTransaction(transaction2);
-
-    final List<Transaction> parsedTransactions = Lists.newArrayList();
-    transactions.selectTransactions(
-        transaction -> {
-          parsedTransactions.add(transaction);
-          return PendingTransactions.TransactionSelectionResult.DELETE_TRANSACTION_AND_CONTINUE;
-        });
-
-    assertThat(parsedTransactions.size()).isEqualTo(2);
-    assertThat(parsedTransactions.get(0)).isEqualTo(transaction2);
-    assertThat(parsedTransactions.get(1)).isEqualTo(transaction1);
-
-    assertThat(transactions.size()).isZero();
-  }
-
-  @Test
-  public void shouldReturnEmptyOptionalAsMaximumNonceWhenNoTransactionsPresent() {
-    assertThat(transactions.getNextNonceForSender(SENDER1)).isEmpty();
-  }
-
-  @Test
-  public void shouldReturnEmptyOptionalAsMaximumNonceWhenLastTransactionForSenderRemoved() {
-    final Transaction transaction = transactionWithNonceAndSender(1, KEYS1);
-    transactions.addRemoteTransaction(transaction);
-    transactions.removeTransaction(transaction);
-    assertThat(transactions.getNextNonceForSender(SENDER1)).isEmpty();
-  }
-
-  @Test
-  public void shouldReplaceTransactionWithSameSenderAndNonce() {
-    final Transaction transaction1 = transactionWithNonceSenderAndGasPrice(1, KEYS1, 1);
-    final Transaction transaction1b = transactionWithNonceSenderAndGasPrice(1, KEYS1, 2);
-    final Transaction transaction2 = transactionWithNonceSenderAndGasPrice(2, KEYS1, 1);
-    assertThat(transactions.addRemoteTransaction(transaction1)).isTrue();
-    assertThat(transactions.addRemoteTransaction(transaction2)).isTrue();
-    assertThat(transactions.addRemoteTransaction(transaction1b)).isTrue();
-
-    assertTransactionNotPending(transaction1);
-    assertTransactionPending(transaction1b);
-    assertTransactionPending(transaction2);
-    assertThat(transactions.size()).isEqualTo(2);
-    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, REMOTE)).isEqualTo(3);
-    assertThat(metricsSystem.getCounterValue(REMOVED_COUNTER, REMOTE, DROPPED)).isEqualTo(1);
-  }
-
-  @Test
-  public void shouldReplaceTransactionWithSameSenderAndNonce_multipleReplacements() {
-    final int replacedTxCount = 5;
-    final List<Transaction> replacedTransactions = new ArrayList<>();
-    for (int i = 0; i < replacedTxCount; i++) {
-      final Transaction duplicateTx = transactionWithNonceSenderAndGasPrice(1, KEYS1, i + 1);
-      replacedTransactions.add(duplicateTx);
-      transactions.addRemoteTransaction(duplicateTx);
-    }
-    final Transaction finalReplacingTx = transactionWithNonceSenderAndGasPrice(1, KEYS1, 100);
-    final Transaction independentTx = transactionWithNonceSenderAndGasPrice(2, KEYS1, 1);
-    assertThat(transactions.addRemoteTransaction(independentTx)).isTrue();
-    assertThat(transactions.addRemoteTransaction(finalReplacingTx)).isTrue();
-
-    // All tx's except the last duplicate should be removed
-    replacedTransactions.forEach(this::assertTransactionNotPending);
-    assertTransactionPending(finalReplacingTx);
-    // Tx with distinct nonce should be maintained
-    assertTransactionPending(independentTx);
-
-    assertThat(transactions.size()).isEqualTo(2);
-    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, REMOTE)).isEqualTo(replacedTxCount + 2);
-    assertThat(metricsSystem.getCounterValue(REMOVED_COUNTER, REMOTE, DROPPED))
-        .isEqualTo(replacedTxCount);
-  }
-
-  @Test
-  public void
-      shouldReplaceTransactionWithSameSenderAndNonce_multipleReplacementsAddedLocallyAndRemotely() {
-    final int replacedTxCount = 11;
-    final List<Transaction> replacedTransactions = new ArrayList<>();
-    int remoteDuplicateCount = 0;
-    for (int i = 0; i < replacedTxCount; i++) {
-      final Transaction duplicateTx =
-          transactionWithNonceSenderAndGasPrice(1, KEYS1, (i * 110 / 100) + 1);
-      replacedTransactions.add(duplicateTx);
-      if (i % 2 == 0) {
-        transactions.addRemoteTransaction(duplicateTx);
-        remoteDuplicateCount++;
-      } else {
-        transactions.addLocalTransaction(duplicateTx);
-      }
-    }
-    final Transaction finalReplacingTx = transactionWithNonceSenderAndGasPrice(1, KEYS1, 100);
-    final Transaction independentTx = transactionWithNonceSenderAndGasPrice(2, KEYS1, 1);
-    assertThat(transactions.addLocalTransaction(finalReplacingTx))
-        .isEqualTo(TransactionAddedStatus.ADDED);
-    assertThat(transactions.addRemoteTransaction(independentTx)).isTrue();
-
-    // All tx's except the last duplicate should be removed
-    replacedTransactions.forEach(this::assertTransactionNotPending);
-    assertTransactionPending(finalReplacingTx);
-    // Tx with distinct nonce should be maintained
-    assertTransactionPending(independentTx);
-
-    final int localDuplicateCount = replacedTxCount - remoteDuplicateCount;
-    assertThat(transactions.size()).isEqualTo(2);
-    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, REMOTE))
-        .isEqualTo(remoteDuplicateCount + 1);
-    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, LOCAL))
-        .isEqualTo(localDuplicateCount + 1);
-    assertThat(metricsSystem.getCounterValue(REMOVED_COUNTER, REMOTE, DROPPED))
-        .isEqualTo(remoteDuplicateCount);
-    assertThat(metricsSystem.getCounterValue(REMOVED_COUNTER, LOCAL, DROPPED))
-        .isEqualTo(localDuplicateCount);
-  }
-
-  @Test
-  public void shouldReplaceOnlyTransactionFromSenderWhenItHasTheSameNonce() {
-    final Transaction transaction1 = transactionWithNonceSenderAndGasPrice(1, KEYS1, 1);
-    final Transaction transaction1b = transactionWithNonceSenderAndGasPrice(1, KEYS1, 2);
-    assertThat(transactions.addRemoteTransaction(transaction1)).isTrue();
-    assertThat(transactions.addRemoteTransaction(transaction1b)).isTrue();
-
-    assertTransactionNotPending(transaction1);
-    assertTransactionPending(transaction1b);
-    assertThat(transactions.size()).isEqualTo(1);
-    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, REMOTE)).isEqualTo(2);
-    assertThat(metricsSystem.getCounterValue(REMOVED_COUNTER, REMOTE, DROPPED)).isEqualTo(1);
-  }
-
-  @Test
-  public void shouldNotReplaceTransactionWithSameSenderAndNonceWhenGasPriceIsLower() {
-    final Transaction transaction1 = transactionWithNonceSenderAndGasPrice(1, KEYS1, 2);
-    final Transaction transaction1b = transactionWithNonceSenderAndGasPrice(1, KEYS1, 1);
-    assertThat(transactions.addRemoteTransaction(transaction1)).isTrue();
-
-    transactions.subscribePendingTransactions(listener);
-    assertThat(transactions.addRemoteTransaction(transaction1b)).isFalse();
-
-    assertTransactionNotPending(transaction1b);
-    assertTransactionPending(transaction1);
-    assertThat(transactions.size()).isEqualTo(1);
-    verifyZeroInteractions(listener);
-  }
-
-  @Test
-  public void shouldTrackMaximumNonceForEachSender() {
-    transactions.addRemoteTransaction(transactionWithNonceAndSender(0, KEYS1));
-    assertMaximumNonceForSender(SENDER1, 1);
-
-    transactions.addRemoteTransaction(transactionWithNonceAndSender(1, KEYS1));
-    assertMaximumNonceForSender(SENDER1, 2);
-
-    transactions.addRemoteTransaction(transactionWithNonceAndSender(2, KEYS1));
-    assertMaximumNonceForSender(SENDER1, 3);
-
-    transactions.addRemoteTransaction(transactionWithNonceAndSender(20, KEYS2));
-    assertMaximumNonceForSender(SENDER2, 21);
-    assertMaximumNonceForSender(SENDER1, 3);
-  }
-
-  @Test
-  public void shouldIterateTransactionsFromSameSenderInNonceOrder() {
-    final Transaction transaction1 = transactionWithNonceAndSender(0, KEYS1);
-    final Transaction transaction2 = transactionWithNonceAndSender(1, KEYS1);
-    final Transaction transaction3 = transactionWithNonceAndSender(2, KEYS1);
-
-    transactions.addLocalTransaction(transaction1);
-    transactions.addLocalTransaction(transaction2);
-    transactions.addLocalTransaction(transaction3);
-
-    final List<Transaction> iterationOrder = new ArrayList<>();
-    transactions.selectTransactions(
-        transaction -> {
-          iterationOrder.add(transaction);
-          return PendingTransactions.TransactionSelectionResult.CONTINUE;
-        });
-
-    assertThat(iterationOrder).containsExactly(transaction1, transaction2, transaction3);
-  }
-
-  @Test
-  public void shouldNotForceNonceOrderWhenSendersDiffer() {
-    final Transaction transaction1 = transactionWithNonceAndSender(0, KEYS1);
-    final Transaction transaction2 = transactionWithNonceAndSender(1, KEYS2);
-
-    transactions.addLocalTransaction(transaction1);
-    transactions.addLocalTransaction(transaction2);
-
-    final List<Transaction> iterationOrder = new ArrayList<>();
-    transactions.selectTransactions(
-        transaction -> {
-          iterationOrder.add(transaction);
-          return PendingTransactions.TransactionSelectionResult.CONTINUE;
-        });
-
-    assertThat(iterationOrder).containsExactly(transaction2, transaction1);
-  }
-
-  @Test
-  public void shouldNotIncreasePriorityOfTransactionsBecauseOfNonceOrder() {
-    final Transaction transaction1 = transactionWithNonceAndSender(0, KEYS1);
-    final Transaction transaction2 = transactionWithNonceAndSender(1, KEYS1);
-    final Transaction transaction3 = transactionWithNonceAndSender(2, KEYS1);
-    final Transaction transaction4 = transactionWithNonceAndSender(5, KEYS2);
-
-    transactions.addLocalTransaction(transaction1);
-    transactions.addLocalTransaction(transaction4);
-    transactions.addLocalTransaction(transaction2);
-    transactions.addLocalTransaction(transaction3);
-
-    final List<Transaction> iterationOrder = new ArrayList<>();
-    transactions.selectTransactions(
-        transaction -> {
-          iterationOrder.add(transaction);
-          return PendingTransactions.TransactionSelectionResult.CONTINUE;
-        });
-
-    // Ignoring nonces, the order would be 3, 2, 4, 1 but we have to delay 3 and 2 until after 1.
-    assertThat(iterationOrder)
-        .containsExactly(transaction4, transaction1, transaction2, transaction3);
-  }
-
-  private void assertMaximumNonceForSender(final Address sender1, final int i) {
-    assertThat(transactions.getNextNonceForSender(sender1)).isEqualTo(OptionalLong.of(i));
-  }
-
-  private Transaction transactionWithNonceAndSender(final int nonce, final KeyPair keyPair) {
-    return new TransactionTestFixture().nonce(nonce).createTransaction(keyPair);
-  }
-
-  private Transaction transactionWithNonceSenderAndGasPrice(
-      final int nonce, final KeyPair keyPair, final long gasPrice) {
-    return new TransactionTestFixture()
-        .nonce(nonce)
-        .gasPrice(Wei.of(gasPrice))
-        .createTransaction(keyPair);
-  }
-
-  private void assertTransactionPending(final Transaction t) {
-    assertThat(transactions.getTransactionByHash(t.getHash())).contains(t);
-  }
-
-  private void assertTransactionNotPending(final Transaction t) {
-    assertThat(transactions.getTransactionByHash(t.getHash())).isEmpty();
-  }
-
-  private Transaction createTransaction(final int transactionNumber) {
-    return new TransactionTestFixture()
-        .value(Wei.of(transactionNumber))
-        .nonce(transactionNumber)
-        .createTransaction(KEYS1);
-  }
-
-  @Test
-  public void shouldEvictMultipleOldTransactions() {
-    final int maxTransactionRetentionHours = 1;
-    final PendingTransactions transactions =
-        new PendingTransactions(
-            maxTransactionRetentionHours,
-            MAX_TRANSACTIONS,
-            MAX_TRANSACTION_HASHES,
-            clock,
-            metricsSystem,
-            () -> null,
-            TransactionPoolConfiguration.DEFAULT_PRICE_BUMP);
-
-    transactions.addRemoteTransaction(transaction1);
-    assertThat(transactions.size()).isEqualTo(1);
-    transactions.addRemoteTransaction(transaction2);
-    assertThat(transactions.size()).isEqualTo(2);
-
-    clock.step(2L, ChronoUnit.HOURS);
-    transactions.evictOldTransactions();
-    assertThat(transactions.size()).isEqualTo(0);
-    assertThat(metricsSystem.getCounterValue(REMOVED_COUNTER, REMOTE, DROPPED)).isEqualTo(2);
-  }
-
-  @Test
-  public void shouldEvictSingleOldTransaction() {
-    final int maxTransactionRetentionHours = 1;
-    final PendingTransactions transactions =
-        new PendingTransactions(
-            maxTransactionRetentionHours,
-            MAX_TRANSACTIONS,
-            MAX_TRANSACTION_HASHES,
-            clock,
-            metricsSystem,
-            () -> null,
-            TransactionPoolConfiguration.DEFAULT_PRICE_BUMP);
-    transactions.addRemoteTransaction(transaction1);
-    assertThat(transactions.size()).isEqualTo(1);
-    clock.step(2L, ChronoUnit.HOURS);
-    transactions.evictOldTransactions();
-    assertThat(transactions.size()).isEqualTo(0);
-    assertThat(metricsSystem.getCounterValue(REMOVED_COUNTER, REMOTE, DROPPED)).isEqualTo(1);
-  }
-
-  @Test
-  public void shouldEvictExclusivelyOldTransactions() {
-    final int maxTransactionRetentionHours = 2;
-    final PendingTransactions transactions =
-        new PendingTransactions(
-            maxTransactionRetentionHours,
-            MAX_TRANSACTIONS,
-            MAX_TRANSACTION_HASHES,
-            clock,
-            metricsSystem,
-            () -> null,
-            TransactionPoolConfiguration.DEFAULT_PRICE_BUMP);
-    transactions.addRemoteTransaction(transaction1);
-    assertThat(transactions.size()).isEqualTo(1);
-    clock.step(3L, ChronoUnit.HOURS);
-    transactions.addRemoteTransaction(transaction2);
-    assertThat(transactions.size()).isEqualTo(2);
-    transactions.evictOldTransactions();
-    assertThat(transactions.size()).isEqualTo(1);
-    assertThat(metricsSystem.getCounterValue(REMOVED_COUNTER, REMOTE, DROPPED)).isEqualTo(1);
-  }
-
-  @Test
-  public void shouldNotIncrementAddedCounterWhenRemoteTransactionAlreadyPresent() {
-    transactions.addLocalTransaction(transaction1);
-    assertThat(transactions.size()).isEqualTo(1);
-    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, LOCAL)).isEqualTo(1);
-    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, REMOTE)).isEqualTo(0);
-
-    assertThat(transactions.addRemoteTransaction(transaction1)).isFalse();
-    assertThat(transactions.size()).isEqualTo(1);
-    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, LOCAL)).isEqualTo(1);
-    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, REMOTE)).isEqualTo(0);
-  }
-
-  @Test
-  public void shouldNotIncrementAddedCounterWhenLocalTransactionAlreadyPresent() {
-    transactions.addRemoteTransaction(transaction1);
-    assertThat(transactions.size()).isEqualTo(1);
-    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, LOCAL)).isEqualTo(0);
-    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, REMOTE)).isEqualTo(1);
-
-    assertThat(transactions.addLocalTransaction(transaction1))
-        .isEqualTo(TransactionAddedStatus.ALREADY_KNOWN);
-    assertThat(transactions.size()).isEqualTo(1);
-    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, LOCAL)).isEqualTo(0);
-    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, REMOTE)).isEqualTo(1);
-  }
-
-  @Test
-  public void assertThatCorrectNonceIsReturned() {
-    assertThat(transactions.getNextNonceForSender(transaction1.getSender())).isEmpty();
-    addLocalTransactions(1, 2, 4, 5);
-    assertThat(transactions.getNextNonceForSender(transaction1.getSender()))
-        .isPresent()
-        .hasValue(3);
-    addLocalTransactions(3);
-    assertThat(transactions.getNextNonceForSender(transaction1.getSender()))
-        .isPresent()
-        .hasValue(6);
-    addLocalTransactions(6, 10);
-    assertThat(transactions.getNextNonceForSender(transaction1.getSender()))
-        .isPresent()
-        .hasValue(7);
-  }
-
-  private void addLocalTransactions(final int... nonces) {
-    for (int nonce : nonces) {
-      transactions.addLocalTransaction(createTransaction(nonce));
-    }
-  }
-
-  private static BlockHeader mockBlockHeader() {
-    final BlockHeader blockHeader = mock(BlockHeader.class);
-    when(blockHeader.getBaseFee()).thenReturn(Optional.empty());
-    return blockHeader;
-  }
-}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TestNode.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TestNode.java
index 38fb34b12d0..111fa072297 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TestNode.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TestNode.java
@@ -16,23 +16,24 @@
 
 import static java.util.Collections.singletonList;
 import static org.assertj.core.util.Preconditions.checkNotNull;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.config.GenesisConfigFile;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.GenesisState;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.difficulty.fixed.FixedDifficultyProtocolSchedule;
 import org.hyperledger.besu.ethereum.eth.EthProtocol;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
@@ -41,6 +42,7 @@
 import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
 import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
@@ -52,16 +54,21 @@
 import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
 import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
+import org.hyperledger.besu.ethereum.p2p.rlpx.RlpxAgent;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.plugin.services.permissioning.NodeMessagePermissioningProvider;
 import org.hyperledger.besu.testutil.TestClock;
 
 import java.io.Closeable;
 import java.io.IOException;
 import java.math.BigInteger;
+import java.time.ZoneId;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -69,13 +76,13 @@
 import java.util.concurrent.CompletableFuture;
 
 import io.vertx.core.Vertx;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TestNode implements Closeable {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(TestNode.class);
   private static final MetricsSystem metricsSystem = new NoOpMetricsSystem();
 
   protected final NodeKey nodeKey;
@@ -87,7 +94,7 @@ public class TestNode implements Closeable {
   public TestNode(
       final Vertx vertx,
       final Integer port,
-      final SECP256K1.KeyPair kp,
+      final KeyPair kp,
       final DiscoveryConfiguration discoveryCfg) {
     checkNotNull(vertx);
     checkNotNull(discoveryCfg);
@@ -106,7 +113,7 @@ public TestNode(
     final GenesisConfigFile genesisConfigFile = GenesisConfigFile.development();
     final ProtocolSchedule protocolSchedule =
         FixedDifficultyProtocolSchedule.create(
-            GenesisConfigFile.development().getConfigOptions(), false);
+            GenesisConfigFile.development().getConfigOptions(), false, EvmConfiguration.DEFAULT);
 
     final GenesisState genesisState = GenesisState.fromConfig(genesisConfigFile, protocolSchedule);
     final BlockHeaderFunctions blockHeaderFunctions =
@@ -116,14 +123,34 @@ public TestNode(
     final WorldStateArchive worldStateArchive = createInMemoryWorldStateArchive();
     genesisState.writeStateTo(worldStateArchive.getMutable());
     final ProtocolContext protocolContext =
-        new ProtocolContext(blockchain, worldStateArchive, null);
+        new ProtocolContext(blockchain, worldStateArchive, null, Optional.empty());
 
     final SyncState syncState = mock(SyncState.class);
+    final SynchronizerConfiguration syncConfig = mock(SynchronizerConfiguration.class);
     when(syncState.isInSync(anyLong())).thenReturn(true);
+    when(syncState.isInitialSyncPhaseDone()).thenReturn(true);
 
     final EthMessages ethMessages = new EthMessages();
-
-    final EthPeers ethPeers = new EthPeers(EthProtocol.NAME, TestClock.fixed(), metricsSystem);
+    final NodeMessagePermissioningProvider nmpp =
+        new NodeMessagePermissioningProvider() {
+          @Override
+          public boolean isMessagePermitted(final EnodeURL destinationEnode, final int code) {
+            return true;
+          }
+        };
+    final EthPeers ethPeers =
+        new EthPeers(
+            EthProtocol.NAME,
+            () -> protocolSchedule.getByBlockHeader(blockchain.getChainHeadHeader()),
+            TestClock.fixed(),
+            metricsSystem,
+            EthProtocolConfiguration.DEFAULT_MAX_MESSAGE_SIZE,
+            Collections.singletonList(nmpp),
+            Bytes.random(64),
+            25,
+            25,
+            25,
+            false);
 
     final EthScheduler scheduler = new EthScheduler(1, 1, 1, metricsSystem);
     final EthContext ethContext = new EthContext(ethPeers, ethMessages, scheduler);
@@ -133,13 +160,11 @@ public TestNode(
             protocolSchedule,
             protocolContext,
             ethContext,
-            TestClock.fixed(),
+            TestClock.system(ZoneId.systemDefault()),
             metricsSystem,
             syncState,
-            Wei.ZERO,
-            TransactionPoolConfiguration.DEFAULT,
-            true,
-            Optional.empty());
+            new MiningParameters.Builder().minTransactionGasPrice(Wei.ZERO).build(),
+            TransactionPoolConfiguration.DEFAULT);
 
     final EthProtocolManager ethProtocolManager =
         new EthProtocolManager(
@@ -152,7 +177,8 @@ public TestNode(
             ethMessages,
             ethContext,
             Collections.emptyList(),
-            false,
+            Optional.empty(),
+            syncConfig,
             scheduler);
 
     final NetworkRunner networkRunner =
@@ -167,11 +193,19 @@ public TestNode(
                         .config(networkingConfiguration)
                         .metricsSystem(new NoOpMetricsSystem())
                         .supportedCapabilities(capabilities)
-                        .storageProvider(new InMemoryStorageProvider())
+                        .storageProvider(new InMemoryKeyValueStorageProvider())
+                        .blockchain(blockchain)
+                        .blockNumberForks(Collections.emptyList())
+                        .timestampForks(Collections.emptyList())
+                        .allConnectionsSupplier(ethPeers::getAllConnections)
+                        .allActiveConnectionsSupplier(ethPeers::getAllActiveConnections)
                         .build())
             .metricsSystem(new NoOpMetricsSystem())
             .build();
     network = networkRunner.getNetwork();
+    final RlpxAgent rlpxAgent = network.getRlpxAgent();
+    rlpxAgent.subscribeConnectRequest((p, d) -> true);
+    ethPeers.setRlpxAgent(rlpxAgent);
     network.subscribeDisconnect(
         (connection, reason, initiatedByPeer) -> disconnections.put(connection, reason));
 
@@ -231,7 +265,7 @@ public void receiveRemoteTransaction(final Transaction transaction) {
   }
 
   public void receiveLocalTransaction(final Transaction transaction) {
-    transactionPool.addLocalTransaction(transaction);
+    transactionPool.addTransactionViaApi(transaction);
   }
 
   public int getPendingTransactionCount() {
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TestNodeList.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TestNodeList.java
index c6ce0197984..b49dc056137 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TestNodeList.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TestNodeList.java
@@ -17,11 +17,10 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static java.lang.String.format;
-import static org.apache.logging.log4j.util.Strings.join;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hyperledger.besu.ethereum.eth.transactions.TestNode.shortId;
 
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.KeyPair;
 import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
@@ -40,20 +39,20 @@
 import java.util.concurrent.TimeoutException;
 
 import io.vertx.core.Vertx;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.awaitility.Awaitility;
 import org.awaitility.core.ConditionTimeoutException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TestNodeList implements Closeable {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(TestNodeList.class);
   protected final List<TestNode> nodes = new ArrayList<>();
   private final Duration MSG_WAIT = Duration.ofSeconds(2);
 
   public TestNode create(
       final Vertx vertx,
       final Integer port,
-      final SECP256K1.KeyPair kp,
+      final KeyPair kp,
       final DiscoveryConfiguration discoveryCfg)
       throws IOException {
     final TestNode node = new TestNode(vertx, port, kp, discoveryCfg);
@@ -177,7 +176,7 @@ public void assertPendingTransactionCounts(final int... expected) {
     checkNotNull(expected);
     checkArgument(
         expected.length == nodes.size(),
-        "Expected values for sd nodes, but got %s.",
+        "Expected values for %s nodes, but got %s.",
         expected.length,
         nodes.size());
     int errCnt = 0;
@@ -246,7 +245,7 @@ public void logPeerConnections() {
         connStr.add("Connection: " + localString + " to " + peerString);
       }
     }
-    LOG.info("TestNodeList Connections:\n" + join(connStr, '\n'));
+    LOG.info("TestNodeList Connections: {}", connStr);
   }
 
   @Override
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionBroadcasterTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionBroadcasterTest.java
new file mode 100644
index 00000000000..52193c74037
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionBroadcasterTest.java
@@ -0,0 +1,352 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction.toTransactionList;
+import static org.hyperledger.besu.plugin.data.TransactionType.BLOB;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.manager.EthContext;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
+import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.eth.messages.EthPV65;
+import org.hyperledger.besu.plugin.data.TransactionType;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TransactionBroadcasterTest {
+
+  @Mock private EthContext ethContext;
+  @Mock private EthPeers ethPeers;
+  @Mock private EthScheduler ethScheduler;
+  @Mock private PeerTransactionTracker transactionTracker;
+  @Mock private TransactionsMessageSender transactionsMessageSender;
+  @Mock private NewPooledTransactionHashesMessageSender newPooledTransactionHashesMessageSender;
+
+  private final EthPeer ethPeerNoEth65 = mock(EthPeer.class);
+  private final EthPeer ethPeerWithEth65 = mock(EthPeer.class);
+  private final EthPeer ethPeerNoEth65_2 = mock(EthPeer.class);
+  private final EthPeer ethPeerWithEth65_2 = mock(EthPeer.class);
+  private final EthPeer ethPeerWithEth65_3 = mock(EthPeer.class);
+  private final BlockDataGenerator generator = new BlockDataGenerator();
+
+  private TransactionBroadcaster txBroadcaster;
+  private ArgumentCaptor<Runnable> sendTaskCapture;
+
+  @Before
+  public void setUp() {
+    when(ethPeerNoEth65.hasSupportForMessage(EthPV65.NEW_POOLED_TRANSACTION_HASHES))
+        .thenReturn(Boolean.FALSE);
+    when(ethPeerNoEth65_2.hasSupportForMessage(EthPV65.NEW_POOLED_TRANSACTION_HASHES))
+        .thenReturn(Boolean.FALSE);
+    when(ethPeerWithEth65.hasSupportForMessage(EthPV65.NEW_POOLED_TRANSACTION_HASHES))
+        .thenReturn(Boolean.TRUE);
+    when(ethPeerWithEth65_2.hasSupportForMessage(EthPV65.NEW_POOLED_TRANSACTION_HASHES))
+        .thenReturn(Boolean.TRUE);
+    when(ethPeerWithEth65_3.hasSupportForMessage(EthPV65.NEW_POOLED_TRANSACTION_HASHES))
+        .thenReturn(Boolean.TRUE);
+
+    sendTaskCapture = ArgumentCaptor.forClass(Runnable.class);
+    doNothing().when(ethScheduler).scheduleSyncWorkerTask(sendTaskCapture.capture());
+
+    when(ethContext.getEthPeers()).thenReturn(ethPeers);
+    when(ethContext.getScheduler()).thenReturn(ethScheduler);
+
+    txBroadcaster =
+        new TransactionBroadcaster(
+            ethContext,
+            transactionTracker,
+            transactionsMessageSender,
+            newPooledTransactionHashesMessageSender);
+  }
+
+  @Test
+  public void doNotRelayTransactionsWhenPoolIsEmpty() {
+    Collection<PendingTransaction> pendingTxs = setupTransactionPool(0, 0);
+
+    txBroadcaster.relayTransactionPoolTo(ethPeerNoEth65, pendingTxs);
+    txBroadcaster.relayTransactionPoolTo(ethPeerWithEth65, pendingTxs);
+
+    verifyNothingSent();
+  }
+
+  @Test
+  public void relayFullTransactionsFromPoolWhenPeerDoesNotSupportEth65() {
+    Collection<PendingTransaction> pendingTxs = setupTransactionPool(1, 1);
+    List<Transaction> txs = toTransactionList(pendingTxs);
+
+    txBroadcaster.relayTransactionPoolTo(ethPeerNoEth65, pendingTxs);
+
+    verifyTransactionAddedToPeerSendingQueue(ethPeerNoEth65, txs);
+
+    sendTaskCapture.getValue().run();
+
+    verify(transactionsMessageSender).sendTransactionsToPeer(ethPeerNoEth65);
+    verifyNoInteractions(newPooledTransactionHashesMessageSender);
+  }
+
+  @Test
+  public void relayTransactionHashesFromPoolWhenPeerSupportEth65() {
+    Collection<PendingTransaction> pendingTxs = setupTransactionPool(1, 1);
+    List<Transaction> txs = toTransactionList(pendingTxs);
+
+    txBroadcaster.relayTransactionPoolTo(ethPeerWithEth65, pendingTxs);
+
+    verifyTransactionAddedToPeerSendingQueue(ethPeerWithEth65, txs);
+
+    sendTaskCapture.getValue().run();
+
+    verify(newPooledTransactionHashesMessageSender).sendTransactionHashesToPeer(ethPeerWithEth65);
+    verifyNoInteractions(transactionsMessageSender);
+  }
+
+  @Test
+  public void onTransactionsAddedWithNoPeersDoesNothing() {
+    when(ethPeers.peerCount()).thenReturn(0);
+
+    txBroadcaster.onTransactionsAdded(toTransactionList(setupTransactionPool(1, 1)));
+
+    verifyNothingSent();
+  }
+
+  @Test
+  public void onTransactionsAddedWithOnlyNonEth65PeersSendFullTransactions() {
+    when(ethPeers.peerCount()).thenReturn(2);
+    when(ethPeers.streamAvailablePeers()).thenReturn(Stream.of(ethPeerNoEth65, ethPeerNoEth65_2));
+
+    List<Transaction> txs = toTransactionList(setupTransactionPool(1, 1));
+
+    txBroadcaster.onTransactionsAdded(txs);
+
+    verifyTransactionAddedToPeerSendingQueue(ethPeerNoEth65, txs);
+    verifyTransactionAddedToPeerSendingQueue(ethPeerNoEth65_2, txs);
+
+    sendTaskCapture.getAllValues().forEach(Runnable::run);
+
+    verify(transactionsMessageSender).sendTransactionsToPeer(ethPeerNoEth65);
+    verify(transactionsMessageSender).sendTransactionsToPeer(ethPeerNoEth65_2);
+    verifyNoInteractions(newPooledTransactionHashesMessageSender);
+  }
+
+  @Test
+  public void onTransactionsAddedWithOnlyFewEth65PeersSendFullTransactions() {
+    when(ethPeers.peerCount()).thenReturn(2);
+    when(ethPeers.streamAvailablePeers())
+        .thenReturn(Stream.of(ethPeerWithEth65, ethPeerWithEth65_2));
+
+    List<Transaction> txs = toTransactionList(setupTransactionPool(1, 1));
+
+    txBroadcaster.onTransactionsAdded(txs);
+
+    verifyTransactionAddedToPeerSendingQueue(ethPeerWithEth65, txs);
+    verifyTransactionAddedToPeerSendingQueue(ethPeerWithEth65_2, txs);
+
+    sendTaskCapture.getAllValues().forEach(Runnable::run);
+
+    verify(transactionsMessageSender, times(2)).sendTransactionsToPeer(any(EthPeer.class));
+    verifyNoInteractions(newPooledTransactionHashesMessageSender);
+  }
+
+  @Test
+  public void onTransactionsAddedWithOnlyEth65PeersSendFullTransactionsAndTransactionHashes() {
+    when(ethPeers.peerCount()).thenReturn(3);
+    when(ethPeers.streamAvailablePeers())
+        .thenReturn(Stream.of(ethPeerWithEth65, ethPeerWithEth65_2, ethPeerWithEth65_3));
+
+    List<Transaction> txs = toTransactionList(setupTransactionPool(1, 1));
+
+    txBroadcaster.onTransactionsAdded(txs);
+
+    verifyTransactionAddedToPeerSendingQueue(ethPeerWithEth65, txs);
+    verifyTransactionAddedToPeerSendingQueue(ethPeerWithEth65_2, txs);
+    verifyTransactionAddedToPeerSendingQueue(ethPeerWithEth65_3, txs);
+
+    sendTaskCapture.getAllValues().forEach(Runnable::run);
+
+    verify(transactionsMessageSender, times(2)).sendTransactionsToPeer(any(EthPeer.class));
+    verify(newPooledTransactionHashesMessageSender).sendTransactionHashesToPeer(any(EthPeer.class));
+  }
+
+  @Test
+  public void onTransactionsAddedWithMixedPeersSendFullTransactionsAndTransactionHashes() {
+    List<EthPeer> eth65Peers = List.of(ethPeerWithEth65, ethPeerWithEth65_2);
+
+    when(ethPeers.peerCount()).thenReturn(3);
+    when(ethPeers.streamAvailablePeers())
+        .thenReturn(Stream.concat(eth65Peers.stream(), Stream.of(ethPeerNoEth65)));
+
+    List<Transaction> txs = toTransactionList(setupTransactionPool(1, 1));
+
+    txBroadcaster.onTransactionsAdded(txs);
+
+    verifyTransactionAddedToPeerSendingQueue(ethPeerWithEth65, txs);
+    verifyTransactionAddedToPeerSendingQueue(ethPeerWithEth65_2, txs);
+    verifyTransactionAddedToPeerSendingQueue(ethPeerNoEth65, txs);
+
+    sendTaskCapture.getAllValues().forEach(Runnable::run);
+
+    ArgumentCaptor<EthPeer> capPeerFullTransactions = ArgumentCaptor.forClass(EthPeer.class);
+    verify(transactionsMessageSender, times(2))
+        .sendTransactionsToPeer(capPeerFullTransactions.capture());
+    List<EthPeer> fullTransactionPeers = new ArrayList<>(capPeerFullTransactions.getAllValues());
+    assertThat(fullTransactionPeers.remove(ethPeerNoEth65)).isTrue();
+    assertThat(fullTransactionPeers).hasSize(1).first().isIn(eth65Peers);
+
+    ArgumentCaptor<EthPeer> capPeerTransactionHashes = ArgumentCaptor.forClass(EthPeer.class);
+    verify(newPooledTransactionHashesMessageSender)
+        .sendTransactionHashesToPeer(capPeerTransactionHashes.capture());
+    assertThat(capPeerTransactionHashes.getValue()).isIn(eth65Peers);
+  }
+
+  @Test
+  public void
+      onTransactionsAddedWithMixedPeersAndHashOnlyBroadcastTransactionsSendTransactionHashes() {
+    List<EthPeer> eth65Peers = List.of(ethPeerWithEth65, ethPeerWithEth65_2);
+
+    when(ethPeers.peerCount()).thenReturn(3);
+    when(ethPeers.streamAvailablePeers())
+        .thenReturn(Stream.concat(eth65Peers.stream(), Stream.of(ethPeerNoEth65)));
+
+    List<Transaction> txs = toTransactionList(setupTransactionPool(BLOB, 0, 1));
+
+    txBroadcaster.onTransactionsAdded(txs);
+
+    verifyTransactionAddedToPeerSendingQueue(ethPeerWithEth65, txs);
+    verifyTransactionAddedToPeerSendingQueue(ethPeerWithEth65_2, txs);
+    verifyNoTransactionAddedToPeerSendingQueue(ethPeerNoEth65);
+
+    sendTaskCapture.getAllValues().forEach(Runnable::run);
+
+    verify(transactionsMessageSender, times(0)).sendTransactionsToPeer(any());
+
+    ArgumentCaptor<EthPeer> capPeerOnlyHashes = ArgumentCaptor.forClass(EthPeer.class);
+    verify(newPooledTransactionHashesMessageSender, times(2))
+        .sendTransactionHashesToPeer(capPeerOnlyHashes.capture());
+    List<EthPeer> onlyHashPeers = new ArrayList<>(capPeerOnlyHashes.getAllValues());
+    assertThat(onlyHashPeers).hasSameElementsAs(eth65Peers);
+  }
+
+  @Test
+  public void onTransactionsAddedWithMixedPeersAndMixedBroadcastKind() {
+
+    List<EthPeer> eth65Peers = List.of(ethPeerWithEth65, ethPeerWithEth65_2);
+
+    when(ethPeers.peerCount()).thenReturn(3);
+    when(ethPeers.streamAvailablePeers())
+        .thenReturn(Stream.concat(eth65Peers.stream(), Stream.of(ethPeerNoEth65)));
+
+    // 1 full broadcast transaction type
+    // 1 hash only broadcast transaction type
+    List<Transaction> fullBroadcastTxs =
+        toTransactionList(setupTransactionPool(TransactionType.EIP1559, 0, 1));
+    List<Transaction> hashBroadcastTxs = toTransactionList(setupTransactionPool(BLOB, 0, 1));
+
+    List<Transaction> mixedTxs = new ArrayList<>(fullBroadcastTxs);
+    mixedTxs.addAll(hashBroadcastTxs);
+
+    txBroadcaster.onTransactionsAdded(mixedTxs);
+
+    verifyTransactionAddedToPeerSendingQueue(ethPeerWithEth65, mixedTxs);
+    verifyTransactionAddedToPeerSendingQueue(ethPeerWithEth65_2, mixedTxs);
+    verifyTransactionAddedToPeerSendingQueue(ethPeerNoEth65, fullBroadcastTxs);
+
+    sendTaskCapture.getAllValues().forEach(Runnable::run);
+
+    verify(transactionsMessageSender, times(1)).sendTransactionsToPeer(ethPeerNoEth65);
+
+    ArgumentCaptor<EthPeer> capPeerOnlyHashes = ArgumentCaptor.forClass(EthPeer.class);
+    verify(newPooledTransactionHashesMessageSender, times(2))
+        .sendTransactionHashesToPeer(capPeerOnlyHashes.capture());
+    List<EthPeer> onlyHashPeers = new ArrayList<>(capPeerOnlyHashes.getAllValues());
+    assertThat(onlyHashPeers).hasSameElementsAs(eth65Peers);
+  }
+
+  private void verifyNothingSent() {
+    verifyNoInteractions(
+        transactionTracker, transactionsMessageSender, newPooledTransactionHashesMessageSender);
+  }
+
+  private Set<PendingTransaction> setupTransactionPool(
+      final int numLocalTransactions, final int numRemoteTransactions) {
+    Set<PendingTransaction> pendingTxs = createPendingTransactionList(numLocalTransactions, true);
+    pendingTxs.addAll(createPendingTransactionList(numRemoteTransactions, false));
+
+    return pendingTxs;
+  }
+
+  private Set<PendingTransaction> setupTransactionPool(
+      final TransactionType type, final int numLocalTransactions, final int numRemoteTransactions) {
+    Set<PendingTransaction> pendingTxs =
+        createPendingTransactionList(type, numLocalTransactions, true);
+    pendingTxs.addAll(createPendingTransactionList(type, numRemoteTransactions, false));
+
+    return pendingTxs;
+  }
+
+  private Set<PendingTransaction> createPendingTransactionList(final int num, final boolean local) {
+    return IntStream.range(0, num)
+        .mapToObj(unused -> generator.transaction())
+        .map(tx -> local ? new PendingTransaction.Local(tx) : new PendingTransaction.Remote(tx))
+        .collect(Collectors.toSet());
+  }
+
+  private Set<PendingTransaction> createPendingTransactionList(
+      final TransactionType type, final int num, final boolean local) {
+    return IntStream.range(0, num)
+        .mapToObj(unused -> generator.transaction(type))
+        .map(tx -> local ? new PendingTransaction.Local(tx) : new PendingTransaction.Remote(tx))
+        .collect(Collectors.toSet());
+  }
+
+  private void verifyTransactionAddedToPeerSendingQueue(
+      final EthPeer peer, final Collection<Transaction> transactions) {
+
+    ArgumentCaptor<Transaction> trackedTransactions = ArgumentCaptor.forClass(Transaction.class);
+    verify(transactionTracker, times(transactions.size()))
+        .addToPeerSendQueue(eq(peer), trackedTransactions.capture());
+    assertThat(trackedTransactions.getAllValues())
+        .containsExactlyInAnyOrderElementsOf(transactions);
+  }
+
+  private void verifyNoTransactionAddedToPeerSendingQueue(final EthPeer peer) {
+
+    verify(transactionTracker, times(0)).addToPeerSendQueue(eq(peer), any());
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolFactoryTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolFactoryTest.java
index cb7948c076c..865a9a9c2fb 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolFactoryTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolFactoryTest.java
@@ -15,208 +15,318 @@
 package org.hyperledger.besu.ethereum.eth.transactions;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
+import static org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule.DEFAULT_CHAIN_ID;
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
+import org.hyperledger.besu.config.StubGenesisConfigOptions;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.chain.BlockAddedObserver;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldState;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthMessages;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
 import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
-import org.hyperledger.besu.ethereum.eth.manager.ForkIdManager;
-import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
+import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionAddedStatus;
-import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionValidator;
+import org.hyperledger.besu.ethereum.eth.transactions.sorter.BaseFeePendingTransactionsSorter;
+import org.hyperledger.besu.ethereum.eth.transactions.sorter.GasPricePendingTransactionsSorter;
+import org.hyperledger.besu.ethereum.forkid.ForkIdManager;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
-import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
-import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpecAdapters;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.data.EnodeURL;
+import org.hyperledger.besu.plugin.services.permissioning.NodeMessagePermissioningProvider;
 import org.hyperledger.besu.testutil.TestClock;
 
 import java.math.BigInteger;
 import java.util.Collections;
 import java.util.Optional;
+import java.util.function.Function;
 
+import org.apache.tuweni.bytes.Bytes;
+import org.assertj.core.api.Condition;
+import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 
-@SuppressWarnings("unchecked")
+@RunWith(MockitoJUnitRunner.class)
 public class TransactionPoolFactoryTest {
+  @Mock ProtocolSchedule schedule;
+  @Mock ProtocolContext context;
+  @Mock ProtocolSpec protocolSpec;
+  @Mock MutableBlockchain blockchain;
+  @Mock EthContext ethContext;
+  @Mock EthMessages ethMessages;
+  @Mock EthScheduler ethScheduler;
 
-  @Test
-  public void testDisconnect() {
-    final ProtocolSchedule schedule = mock(ProtocolSchedule.class);
-    final ProtocolContext context = mock(ProtocolContext.class);
-    final MutableBlockchain blockchain = mock(MutableBlockchain.class);
+  @Mock PendingTransactions pendingTransactions;
+  @Mock PeerTransactionTracker peerTransactionTracker;
+  @Mock TransactionsMessageSender transactionsMessageSender;
+
+  @Mock NewPooledTransactionHashesMessageSender newPooledTransactionHashesMessageSender;
+
+  TransactionPool pool;
+  EthPeers ethPeers;
+
+  SyncState syncState;
+
+  EthProtocolManager ethProtocolManager;
 
-    when(blockchain.getBlockByNumber(anyLong())).thenReturn(Optional.of(mock(Block.class)));
+  ProtocolContext protocolContext;
+
+  @Before
+  public void setup() {
     when(blockchain.getBlockHashByNumber(anyLong())).thenReturn(Optional.of(mock(Hash.class)));
     when(context.getBlockchain()).thenReturn(blockchain);
-    final EthPeers ethPeers = new EthPeers("ETH", TestClock.fixed(), new NoOpMetricsSystem());
-    final EthContext ethContext = mock(EthContext.class);
-    when(ethContext.getEthMessages()).thenReturn(mock(EthMessages.class));
+
+    final NodeMessagePermissioningProvider nmpp =
+        new NodeMessagePermissioningProvider() {
+          @Override
+          public boolean isMessagePermitted(final EnodeURL destinationEnode, final int code) {
+            return true;
+          }
+        };
+    ethPeers =
+        new EthPeers(
+            "ETH",
+            () -> protocolSpec,
+            TestClock.fixed(),
+            new NoOpMetricsSystem(),
+            EthProtocolConfiguration.DEFAULT_MAX_MESSAGE_SIZE,
+            Collections.singletonList(nmpp),
+            Bytes.random(64),
+            25,
+            25,
+            25,
+            false);
+    when(ethContext.getEthMessages()).thenReturn(ethMessages);
     when(ethContext.getEthPeers()).thenReturn(ethPeers);
-    final SyncState state = mock(SyncState.class);
-    final PendingTransactions pendingTransactions = mock(PendingTransactions.class);
-    final PeerTransactionTracker peerTransactionTracker = mock(PeerTransactionTracker.class);
-    final TransactionsMessageSender transactionsMessageSender =
-        mock(TransactionsMessageSender.class);
-    final PeerPendingTransactionTracker peerPendingTransactionTracker =
-        mock(PeerPendingTransactionTracker.class);
-    final PendingTransactionsMessageSender pendingTransactionsMessageSender =
-        mock(PendingTransactionsMessageSender.class);
-    final TransactionPool pool =
+
+    when(ethContext.getScheduler()).thenReturn(ethScheduler);
+  }
+
+  @Test
+  public void notRegisteredToBlockAddedEventBeforeInitialSyncIsDone() {
+    setupInitialSyncPhase(true);
+    ArgumentCaptor<BlockAddedObserver> blockAddedListeners =
+        ArgumentCaptor.forClass(BlockAddedObserver.class);
+    verify(blockchain, atLeastOnce()).observeBlockAdded(blockAddedListeners.capture());
+
+    assertThat(pool.isEnabled()).isFalse();
+  }
+
+  @Test
+  public void registeredToBlockAddedEventAfterInitialSyncIsDone() {
+    setupInitialSyncPhase(true);
+    syncState.markInitialSyncPhaseAsDone();
+
+    ArgumentCaptor<BlockAddedObserver> blockAddedListeners =
+        ArgumentCaptor.forClass(BlockAddedObserver.class);
+    verify(blockchain, atLeastOnce()).observeBlockAdded(blockAddedListeners.capture());
+
+    assertThat(blockAddedListeners.getAllValues()).contains(pool);
+    assertThat(pool.isEnabled()).isTrue();
+  }
+
+  @Test
+  public void registeredToBlockAddedEventIfNoInitialSync() {
+    setupInitialSyncPhase(false);
+
+    ArgumentCaptor<BlockAddedObserver> blockAddedListeners =
+        ArgumentCaptor.forClass(BlockAddedObserver.class);
+    verify(blockchain, atLeastOnce()).observeBlockAdded(blockAddedListeners.capture());
+
+    assertThat(blockAddedListeners.getAllValues()).contains(pool);
+    assertThat(pool.isEnabled()).isTrue();
+  }
+
+  @Test
+  public void incomingTransactionMessageHandlersDisabledBeforeInitialSyncIsDone() {
+    setupInitialSyncPhase(true);
+    ArgumentCaptor<EthMessages.MessageCallback> messageHandlers =
+        ArgumentCaptor.forClass(EthMessages.MessageCallback.class);
+    verify(ethMessages, atLeast(2)).subscribe(anyInt(), messageHandlers.capture());
+
+    assertThat(messageHandlers.getAllValues())
+        .haveAtLeastOne(
+            new Condition<>(
+                h ->
+                    h instanceof NewPooledTransactionHashesMessageHandler
+                        && !((NewPooledTransactionHashesMessageHandler) h).isEnabled(),
+                "pooled transaction hashes handler should be disabled"));
+
+    assertThat(messageHandlers.getAllValues())
+        .haveAtLeastOne(
+            new Condition<>(
+                h ->
+                    h instanceof TransactionsMessageHandler
+                        && !((TransactionsMessageHandler) h).isEnabled(),
+                "transaction messages handler should be disabled"));
+  }
+
+  @Test
+  public void incomingTransactionMessageHandlersRegisteredAfterInitialSyncIsDone() {
+    setupInitialSyncPhase(true);
+    syncState.markInitialSyncPhaseAsDone();
+
+    ArgumentCaptor<EthMessages.MessageCallback> messageHandlers =
+        ArgumentCaptor.forClass(EthMessages.MessageCallback.class);
+    verify(ethMessages, atLeast(2)).subscribe(anyInt(), messageHandlers.capture());
+
+    assertThat(messageHandlers.getAllValues())
+        .haveAtLeastOne(
+            new Condition<>(
+                h ->
+                    h instanceof NewPooledTransactionHashesMessageHandler
+                        && ((NewPooledTransactionHashesMessageHandler) h).isEnabled(),
+                "pooled transaction hashes handler should be enabled"));
+
+    assertThat(messageHandlers.getAllValues())
+        .haveAtLeastOne(
+            new Condition<>(
+                h ->
+                    h instanceof TransactionsMessageHandler
+                        && ((TransactionsMessageHandler) h).isEnabled(),
+                "transaction messages handler should be enabled"));
+  }
+
+  @Test
+  public void incomingTransactionMessageHandlersRegisteredIfNoInitialSync() {
+    setupInitialSyncPhase(false);
+
+    ArgumentCaptor<EthMessages.MessageCallback> messageHandlers =
+        ArgumentCaptor.forClass(EthMessages.MessageCallback.class);
+    verify(ethMessages, atLeast(0)).subscribe(anyInt(), messageHandlers.capture());
+
+    assertThat(messageHandlers.getAllValues())
+        .haveAtLeastOne(
+            new Condition<>(
+                h ->
+                    h instanceof NewPooledTransactionHashesMessageHandler
+                        && ((NewPooledTransactionHashesMessageHandler) h).isEnabled(),
+                "pooled transaction hashes handler should be enabled"));
+
+    assertThat(messageHandlers.getAllValues())
+        .haveAtLeastOne(
+            new Condition<>(
+                h ->
+                    h instanceof TransactionsMessageHandler
+                        && ((TransactionsMessageHandler) h).isEnabled(),
+                "transaction messages handler should be enabled"));
+  }
+
+  private void setupInitialSyncPhase(final boolean hasInitialSyncPhase) {
+    syncState = new SyncState(blockchain, ethPeers, hasInitialSyncPhase, Optional.empty());
+
+    pool =
         TransactionPoolFactory.createTransactionPool(
             schedule,
             context,
             ethContext,
-            new NoOpMetricsSystem(),
-            state,
-            Wei.of(1),
-            ImmutableTransactionPoolConfiguration.of(
-                1,
-                1,
-                1,
-                1,
-                TransactionPoolConfiguration.DEFAULT_PRICE_BUMP,
-                TransactionPoolConfiguration.ETH65_TRX_ANNOUNCED_BUFFERING_PERIOD,
-                TransactionPoolConfiguration.DEFAULT_RPC_TX_FEE_CAP),
-            pendingTransactions,
+            TestClock.fixed(),
+            new TransactionPoolMetrics(new NoOpMetricsSystem()),
+            syncState,
+            new MiningParameters.Builder().minTransactionGasPrice(Wei.ONE).build(),
+            ImmutableTransactionPoolConfiguration.builder()
+                .txPoolMaxSize(1)
+                .txMessageKeepAliveSeconds(1)
+                .pendingTxRetentionPeriod(1)
+                .build(),
             peerTransactionTracker,
             transactionsMessageSender,
-            Optional.of(peerPendingTransactionTracker),
-            Optional.of(pendingTransactionsMessageSender),
-            true,
-            Optional.empty());
+            newPooledTransactionHashesMessageSender);
 
-    final EthProtocolManager ethProtocolManager =
+    ethProtocolManager =
         new EthProtocolManager(
             blockchain,
             BigInteger.ONE,
             mock(WorldStateArchive.class),
             pool,
-            new EthProtocolConfiguration(5, 5, 5, 5, 5, true, false),
+            EthProtocolConfiguration.defaultConfig(),
             ethPeers,
             mock(EthMessages.class),
             ethContext,
             Collections.emptyList(),
-            true,
+            Optional.empty(),
+            mock(SynchronizerConfiguration.class),
             mock(EthScheduler.class),
             mock(ForkIdManager.class));
+  }
+
+  @Test
+  public void createTransactionPool_shouldUseBaseFeePendingTransactionsSorter_whenLondonEnabled() {
+    setupScheduleWith(new StubGenesisConfigOptions().londonBlock(0));
+
+    final TransactionPool pool = createTransactionPool();
 
-    final RespondingEthPeer ethPeer =
-        RespondingEthPeer.builder().ethProtocolManager(ethProtocolManager).build();
-    assertThat(ethPeer.getEthPeer()).isNotNull();
-    assertThat(ethPeer.getEthPeer().isDisconnected()).isFalse();
-    ethPeer.disconnect(DisconnectMessage.DisconnectReason.CLIENT_QUITTING);
-    verify(peerTransactionTracker, times(1)).onDisconnect(ethPeer.getEthPeer());
-    verify(peerPendingTransactionTracker, times(1)).onDisconnect(ethPeer.getEthPeer());
+    assertThat(pool.getPendingTransactions()).isInstanceOf(BaseFeePendingTransactionsSorter.class);
   }
 
   @Test
-  public void testNoEth65() {
-    final EthPeers ethPeers = new EthPeers("ETH", TestClock.fixed(), new NoOpMetricsSystem());
-
-    final BlockHeader blockHeader = mock(BlockHeader.class);
-    final EthContext ethContext = mock(EthContext.class);
-    final EthScheduler ethScheduler = mock(EthScheduler.class);
-    final MutableBlockchain blockchain = mock(MutableBlockchain.class);
-    final PeerTransactionTracker peerTransactionTracker = mock(PeerTransactionTracker.class);
-    final PendingTransactions pendingTransactions = mock(PendingTransactions.class);
-    final ProtocolContext context = mock(ProtocolContext.class);
-    final ProtocolSchedule schedule = mock(ProtocolSchedule.class);
-    final ProtocolSpec protocolSpec = mock(ProtocolSpec.class);
-    final SyncState state = mock(SyncState.class);
-    final TransactionsMessageSender transactionsMessageSender =
-        mock(TransactionsMessageSender.class);
-    final MainnetTransactionValidator transactionValidator =
-        mock(MainnetTransactionValidator.class);
-    final WorldState worldState = mock(WorldState.class);
-    final WorldStateArchive worldStateArchive = mock(WorldStateArchive.class);
-
-    when(blockchain.getBlockByNumber(anyLong())).thenReturn(Optional.of(mock(Block.class)));
-    when(blockchain.getBlockHashByNumber(anyLong())).thenReturn(Optional.of(mock(Hash.class)));
-    when(blockchain.getBlockHeader(any())).thenReturn(Optional.of(blockHeader));
-    when(context.getBlockchain()).thenReturn(blockchain);
-    when(context.getWorldStateArchive()).thenReturn(worldStateArchive);
-    when(ethContext.getEthMessages()).thenReturn(mock(EthMessages.class));
-    when(ethContext.getEthPeers()).thenReturn(ethPeers);
-    when(ethContext.getScheduler()).thenReturn(ethScheduler);
-    when(pendingTransactions.addLocalTransaction(any())).thenReturn(TransactionAddedStatus.ADDED);
-    when(protocolSpec.getTransactionValidator()).thenReturn(transactionValidator);
-    when(schedule.getByBlockNumber(anyLong())).thenReturn(protocolSpec);
-    when(transactionValidator.validate(any(), any(Optional.class)))
-        .thenReturn(ValidationResult.valid());
-    when(transactionValidator.validateForSender(any(), any(), any()))
-        .thenReturn(ValidationResult.valid());
-    when(worldStateArchive.get(any())).thenReturn(Optional.of(worldState));
-
-    final TransactionPool pool =
+  public void
+      createTransactionPool_shouldUseGasPricePendingTransactionsSorter_whenLondonNotEnabled() {
+    setupScheduleWith(new StubGenesisConfigOptions().berlinBlock(0));
+
+    final TransactionPool pool = createTransactionPool();
+
+    assertThat(pool.getPendingTransactions()).isInstanceOf(GasPricePendingTransactionsSorter.class);
+  }
+
+  private void setupScheduleWith(final StubGenesisConfigOptions config) {
+    schedule =
+        new ProtocolScheduleBuilder(
+                config,
+                DEFAULT_CHAIN_ID,
+                ProtocolSpecAdapters.create(0, Function.identity()),
+                PrivacyParameters.DEFAULT,
+                false,
+                EvmConfiguration.DEFAULT)
+            .createProtocolSchedule();
+
+    protocolContext = mock(ProtocolContext.class);
+    when(protocolContext.getBlockchain()).thenReturn(blockchain);
+    when(blockchain.getChainHeadHeader()).thenReturn(new BlockHeaderTestFixture().buildHeader());
+
+    syncState = new SyncState(blockchain, ethPeers, true, Optional.empty());
+  }
+
+  private TransactionPool createTransactionPool() {
+    final TransactionPool txPool =
         TransactionPoolFactory.createTransactionPool(
             schedule,
-            context,
+            protocolContext,
             ethContext,
+            TestClock.fixed(),
             new NoOpMetricsSystem(),
-            state,
-            Wei.of(1),
-            ImmutableTransactionPoolConfiguration.of(
-                1,
-                1,
-                1,
-                1,
-                TransactionPoolConfiguration.DEFAULT_PRICE_BUMP,
-                TransactionPoolConfiguration.ETH65_TRX_ANNOUNCED_BUFFERING_PERIOD,
-                TransactionPoolConfiguration.DEFAULT_RPC_TX_FEE_CAP),
-            pendingTransactions,
-            peerTransactionTracker,
-            transactionsMessageSender,
-            Optional.empty(),
-            Optional.empty(),
-            false,
-            Optional.empty());
-
-    final EthProtocolManager ethProtocolManager =
-        new EthProtocolManager(
-            blockchain,
-            BigInteger.ONE,
-            mock(WorldStateArchive.class),
-            pool,
-            new EthProtocolConfiguration(5, 5, 5, 5, 5, true, false),
-            ethPeers,
-            mock(EthMessages.class),
-            ethContext,
-            Collections.emptyList(),
-            true,
-            mock(EthScheduler.class),
-            mock(ForkIdManager.class));
+            syncState,
+            new MiningParameters.Builder().minTransactionGasPrice(Wei.ONE).build(),
+            ImmutableTransactionPoolConfiguration.builder()
+                .txPoolMaxSize(1)
+                .txMessageKeepAliveSeconds(1)
+                .pendingTxRetentionPeriod(1)
+                .build());
 
-    // Now that we have the mocks we try to run the methods and see if smoke comes out.
-    // Only exceptions cause the test to fail.
-
-    RespondingEthPeer.builder().ethProtocolManager(ethProtocolManager).build();
-    final Transaction transaction =
-        new TransactionTestFixture()
-            .nonce(1)
-            .gasLimit(0)
-            .gasPrice(Wei.of(1))
-            .createTransaction(KeyPair.generate());
-    pool.addLocalTransaction(transaction);
+    txPool.setEnabled();
+    return txPool;
   }
 }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolLegacyTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolLegacyTest.java
new file mode 100644
index 00000000000..31f9c120726
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolLegacyTest.java
@@ -0,0 +1,262 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+import static java.util.stream.Collectors.toList;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.INVALID_TRANSACTION_FORMAT;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.REPLAY_PROTECTED_SIGNATURE_REQUIRED;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.ExecutionContextTestFixture;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
+import org.hyperledger.besu.ethereum.eth.transactions.sorter.GasPricePendingTransactionsSorter;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.plugin.data.TransactionType;
+import org.hyperledger.besu.testutil.TestClock;
+
+import java.math.BigInteger;
+import java.time.ZoneId;
+import java.util.List;
+import java.util.Optional;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@SuppressWarnings("unchecked")
+@ExtendWith(MockitoExtension.class)
+public class TransactionPoolLegacyTest extends AbstractTransactionPoolTest {
+
+  @Override
+  protected PendingTransactions createPendingTransactionsSorter() {
+
+    return new GasPricePendingTransactionsSorter(
+        ImmutableTransactionPoolConfiguration.builder()
+            .txPoolMaxSize(MAX_TRANSACTIONS)
+            .txPoolLimitByAccountPercentage(1)
+            .build(),
+        TestClock.system(ZoneId.systemDefault()),
+        metricsSystem,
+        protocolContext.getBlockchain()::getChainHeadHeader);
+  }
+
+  @Override
+  protected Transaction createTransaction(
+      final int transactionNumber, final Optional<BigInteger> maybeChainId) {
+    return createBaseTransaction(transactionNumber)
+        .chainId(maybeChainId)
+        .createTransaction(KEY_PAIR1);
+  }
+
+  @Override
+  protected Transaction createTransaction(final int transactionNumber, final Wei maxPrice) {
+    return createBaseTransaction(transactionNumber).gasPrice(maxPrice).createTransaction(KEY_PAIR1);
+  }
+
+  @Override
+  protected TransactionTestFixture createBaseTransaction(final int transactionNumber) {
+    return new TransactionTestFixture()
+        .nonce(transactionNumber)
+        .gasLimit(blockGasLimit)
+        .type(TransactionType.FRONTIER);
+  }
+
+  @Override
+  protected ExecutionContextTestFixture createExecutionContextTestFixture() {
+    return ExecutionContextTestFixture.create();
+  }
+
+  @Override
+  protected FeeMarket getFeeMarket() {
+    return FeeMarket.legacy();
+  }
+
+  @Override
+  protected Block appendBlock(
+      final Difficulty difficulty,
+      final BlockHeader parentBlock,
+      final Transaction... transactionsToAdd) {
+    final List<Transaction> transactionList = asList(transactionsToAdd);
+    final Block block =
+        new Block(
+            new BlockHeaderTestFixture()
+                .difficulty(difficulty)
+                .gasLimit(parentBlock.getGasLimit())
+                .parentHash(parentBlock.getHash())
+                .number(parentBlock.getNumber() + 1)
+                .buildHeader(),
+            new BlockBody(transactionList, emptyList()));
+    final List<TransactionReceipt> transactionReceipts =
+        transactionList.stream()
+            .map(transaction -> new TransactionReceipt(1, 1, emptyList(), Optional.empty()))
+            .collect(toList());
+    blockchain.appendBlock(block, transactionReceipts);
+    return block;
+  }
+
+  @ParameterizedTest
+  @ValueSource(booleans = {true, false})
+  public void
+      addLocalTransaction_strictReplayProtectionOn_txWithoutChainId_chainIdIsConfigured_protectionNotSupportedAtCurrentBlock(
+          final boolean disableLocalTxs) {
+    protocolSupportsTxReplayProtection(1337, false);
+    transactionPool =
+        createTransactionPool(
+            b ->
+                b.strictTransactionReplayProtectionEnabled(true)
+                    .disableLocalTransactions(disableLocalTxs));
+    final Transaction tx = createTransactionWithoutChainId(1);
+    givenTransactionIsValid(tx);
+
+    assertTransactionViaApiValid(tx, disableLocalTxs);
+  }
+
+  @Test
+  public void
+      addRemoteTransactions_strictReplayProtectionOff_txWithoutChainId_chainIdIsConfigured() {
+    protocolSupportsTxReplayProtection(1337, true);
+    transactionPool = createTransactionPool(b -> b.strictTransactionReplayProtectionEnabled(false));
+    final Transaction tx = createTransactionWithoutChainId(1);
+    givenTransactionIsValid(tx);
+
+    assertRemoteTransactionValid(tx);
+  }
+
+  @ParameterizedTest
+  @ValueSource(booleans = {true, false})
+  public void addLocalTransaction_strictReplayProtectionOff_txWithoutChainId_chainIdIsConfigured(
+      final boolean disableLocalTxs) {
+    protocolSupportsTxReplayProtection(1337, true);
+    transactionPool =
+        createTransactionPool(
+            b ->
+                b.strictTransactionReplayProtectionEnabled(false)
+                    .disableLocalTransactions(disableLocalTxs));
+    final Transaction tx = createTransactionWithoutChainId(1);
+    givenTransactionIsValid(tx);
+
+    assertTransactionViaApiValid(tx, disableLocalTxs);
+  }
+
+  @Test
+  public void addLocalTransaction_strictReplayProtectionOn_txWithoutChainId_chainIdIsConfigured() {
+    protocolSupportsTxReplayProtection(1337, true);
+    transactionPool = createTransactionPool(b -> b.strictTransactionReplayProtectionEnabled(true));
+    final Transaction tx = createTransactionWithoutChainId(1);
+    givenTransactionIsValid(tx);
+
+    assertTransactionViaApiInvalid(tx, REPLAY_PROTECTED_SIGNATURE_REQUIRED);
+  }
+
+  @Test
+  public void
+      addRemoteTransactions_strictReplayProtectionOn_txWithoutChainId_chainIdIsConfigured() {
+    protocolSupportsTxReplayProtection(1337, true);
+    transactionPool = createTransactionPool(b -> b.strictTransactionReplayProtectionEnabled(true));
+    final Transaction tx = createTransactionWithoutChainId(1);
+    givenTransactionIsValid(tx);
+
+    assertRemoteTransactionValid(tx);
+  }
+
+  @ParameterizedTest
+  @ValueSource(booleans = {true, false})
+  public void addLocalTransaction_strictReplayProtectionOn_txWithoutChainId_chainIdIsNotConfigured(
+      final boolean disableLocalTxs) {
+    protocolDoesNotSupportTxReplayProtection();
+    transactionPool =
+        createTransactionPool(
+            b ->
+                b.strictTransactionReplayProtectionEnabled(true)
+                    .disableLocalTransactions(disableLocalTxs));
+    final Transaction tx = createTransactionWithoutChainId(1);
+    givenTransactionIsValid(tx);
+
+    assertTransactionViaApiValid(tx, disableLocalTxs);
+  }
+
+  @Test
+  public void
+      addRemoteTransactions_strictReplayProtectionOn_txWithoutChainId_chainIdIsNotConfigured() {
+    protocolDoesNotSupportTxReplayProtection();
+    transactionPool = createTransactionPool(b -> b.strictTransactionReplayProtectionEnabled(true));
+    final Transaction tx = createTransactionWithoutChainId(1);
+    givenTransactionIsValid(tx);
+
+    assertRemoteTransactionValid(tx);
+  }
+
+  @Test
+  public void shouldIgnoreEIP1559TransactionWhenNotAllowed() {
+    final Transaction transaction =
+        createBaseTransaction(1)
+            .type(TransactionType.EIP1559)
+            .maxFeePerGas(Optional.of(Wei.of(100L)))
+            .maxPriorityFeePerGas(Optional.of(Wei.of(50L)))
+            .gasLimit(10)
+            .gasPrice(null)
+            .createTransaction(KEY_PAIR1);
+
+    givenTransactionIsValid(transaction);
+
+    assertTransactionViaApiInvalid(transaction, INVALID_TRANSACTION_FORMAT);
+  }
+
+  @Test
+  public void shouldAcceptZeroGasPriceFrontierLocalTransactionsWhenMining() {
+    transactionPool = createTransactionPool(b -> b.disableLocalTransactions(false));
+    when(miningParameters.isMiningEnabled()).thenReturn(true);
+
+    final Transaction transaction = createTransaction(0, Wei.ZERO);
+
+    givenTransactionIsValid(transaction);
+
+    assertTransactionViaApiValid(transaction, false);
+  }
+
+  @ParameterizedTest
+  @ValueSource(booleans = {true, false})
+  public void shouldAcceptZeroGasPriceTransactionWhenMinGasPriceIsZero(
+      final boolean disableLocalTxs) {
+    transactionPool = createTransactionPool(b -> b.disableLocalTransactions(disableLocalTxs));
+    when(miningParameters.getMinTransactionGasPrice()).thenReturn(Wei.ZERO);
+
+    final Transaction transaction = createTransaction(0, Wei.ZERO);
+
+    givenTransactionIsValid(transaction);
+
+    assertTransactionViaApiValid(transaction, disableLocalTxs);
+  }
+
+  private Transaction createTransactionWithoutChainId(final int transactionNumber) {
+    return createTransaction(transactionNumber, Optional.empty());
+  }
+
+  private void protocolDoesNotSupportTxReplayProtection() {
+    when(protocolSchedule.getChainId()).thenReturn(Optional.empty());
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolLondonTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolLondonTest.java
new file mode 100644
index 00000000000..3c17b39b133
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolLondonTest.java
@@ -0,0 +1,296 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.StubGenesisConfigOptions;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.ExecutionContextTestFixture;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
+import org.hyperledger.besu.ethereum.eth.transactions.sorter.BaseFeePendingTransactionsSorter;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpecAdapters;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.plugin.data.TransactionType;
+import org.hyperledger.besu.testutil.TestClock;
+
+import java.math.BigInteger;
+import java.time.ZoneId;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+public class TransactionPoolLondonTest extends AbstractTransactionPoolTest {
+
+  private static final Wei BASE_FEE_FLOOR = Wei.of(7L);
+
+  @Override
+  protected PendingTransactions createPendingTransactionsSorter() {
+
+    return new BaseFeePendingTransactionsSorter(
+        ImmutableTransactionPoolConfiguration.builder()
+            .txPoolMaxSize(MAX_TRANSACTIONS)
+            .txPoolLimitByAccountPercentage(1)
+            .build(),
+        TestClock.system(ZoneId.systemDefault()),
+        metricsSystem,
+        protocolContext.getBlockchain()::getChainHeadHeader);
+  }
+
+  @Override
+  protected Transaction createTransaction(
+      final int transactionNumber, final Optional<BigInteger> maybeChainId) {
+    return createBaseTransaction(transactionNumber)
+        .chainId(maybeChainId)
+        .createTransaction(KEY_PAIR1);
+  }
+
+  @Override
+  protected Transaction createTransaction(final int transactionNumber, final Wei maxPrice) {
+    return createBaseTransaction(transactionNumber)
+        .maxFeePerGas(Optional.of(maxPrice))
+        .maxPriorityFeePerGas(Optional.of(maxPrice.divide(5L)))
+        .createTransaction(KEY_PAIR1);
+  }
+
+  @Override
+  protected TransactionTestFixture createBaseTransaction(final int transactionNumber) {
+    return new TransactionTestFixture()
+        .nonce(transactionNumber)
+        .gasLimit(blockGasLimit)
+        .gasPrice(null)
+        .maxFeePerGas(Optional.of(Wei.of(5000L)))
+        .maxPriorityFeePerGas(Optional.of(Wei.of(1000L)))
+        .type(TransactionType.EIP1559);
+  }
+
+  @Override
+  protected ExecutionContextTestFixture createExecutionContextTestFixture() {
+    final ProtocolSchedule protocolSchedule =
+        new ProtocolScheduleBuilder(
+                new StubGenesisConfigOptions().londonBlock(0L).baseFeePerGas(10L),
+                BigInteger.valueOf(1),
+                ProtocolSpecAdapters.create(0, Function.identity()),
+                new PrivacyParameters(),
+                false,
+                EvmConfiguration.DEFAULT)
+            .createProtocolSchedule();
+    final ExecutionContextTestFixture executionContextTestFixture =
+        ExecutionContextTestFixture.builder().protocolSchedule(protocolSchedule).build();
+
+    final Block block =
+        new Block(
+            new BlockHeaderTestFixture()
+                .gasLimit(
+                    executionContextTestFixture
+                        .getBlockchain()
+                        .getChainHeadBlock()
+                        .getHeader()
+                        .getGasLimit())
+                .difficulty(Difficulty.ONE)
+                .baseFeePerGas(Wei.of(10L))
+                .parentHash(executionContextTestFixture.getBlockchain().getChainHeadHash())
+                .number(executionContextTestFixture.getBlockchain().getChainHeadBlockNumber() + 1)
+                .buildHeader(),
+            new BlockBody(List.of(), List.of()));
+    executionContextTestFixture.getBlockchain().appendBlock(block, List.of());
+
+    return executionContextTestFixture;
+  }
+
+  @Override
+  protected FeeMarket getFeeMarket() {
+    return FeeMarket.london(0L, Optional.of(BASE_FEE_FLOOR));
+  }
+
+  @Override
+  protected Block appendBlock(
+      final Difficulty difficulty,
+      final BlockHeader parentBlock,
+      final Transaction... transactionsToAdd) {
+    final List<Transaction> transactionList = asList(transactionsToAdd);
+    final Block block =
+        new Block(
+            new BlockHeaderTestFixture()
+                .baseFeePerGas(Wei.of(10L))
+                .gasLimit(parentBlock.getGasLimit())
+                .difficulty(difficulty)
+                .parentHash(parentBlock.getHash())
+                .number(parentBlock.getNumber() + 1)
+                .buildHeader(),
+            new BlockBody(transactionList, emptyList()));
+    final List<TransactionReceipt> transactionReceipts =
+        transactionList.stream()
+            .map(transaction -> new TransactionReceipt(1, 1, emptyList(), Optional.empty()))
+            .collect(toList());
+    blockchain.appendBlock(block, transactionReceipts);
+    return block;
+  }
+
+  @ParameterizedTest
+  @ValueSource(booleans = {true, false})
+  public void shouldAcceptZeroGasPriceFrontierTxsWhenMinGasPriceIsZeroAndLondonWithZeroBaseFee(
+      final boolean disableLocalTxs) {
+    transactionPool = createTransactionPool(b -> b.disableLocalTransactions(disableLocalTxs));
+    when(miningParameters.getMinTransactionGasPrice()).thenReturn(Wei.ZERO);
+    when(protocolSpec.getFeeMarket()).thenReturn(FeeMarket.london(0, Optional.of(Wei.ZERO)));
+    whenBlockBaseFeeIs(Wei.ZERO);
+
+    final Transaction frontierTransaction = createFrontierTransaction(0, Wei.ZERO);
+
+    givenTransactionIsValid(frontierTransaction);
+    assertTransactionViaApiValid(frontierTransaction, disableLocalTxs);
+  }
+
+  @ParameterizedTest
+  @ValueSource(booleans = {true, false})
+  public void shouldAcceptZeroGasPrice1559TxsWhenMinGasPriceIsZeroAndLondonWithZeroBaseFee(
+      final boolean disableLocalTxs) {
+    transactionPool = createTransactionPool(b -> b.disableLocalTransactions(disableLocalTxs));
+    when(miningParameters.getMinTransactionGasPrice()).thenReturn(Wei.ZERO);
+    when(protocolSpec.getFeeMarket()).thenReturn(FeeMarket.london(0, Optional.of(Wei.ZERO)));
+    whenBlockBaseFeeIs(Wei.ZERO);
+
+    final Transaction transaction = createTransaction(0, Wei.ZERO);
+
+    givenTransactionIsValid(transaction);
+    assertTransactionViaApiValid(transaction, disableLocalTxs);
+  }
+
+  @Test
+  public void shouldAcceptBaseFeeFloorGasPriceFrontierLocalTransactionsWhenMining() {
+    transactionPool = createTransactionPool(b -> b.disableLocalTransactions(false));
+    final Transaction frontierTransaction = createFrontierTransaction(0, BASE_FEE_FLOOR);
+
+    givenTransactionIsValid(frontierTransaction);
+
+    assertTransactionViaApiValid(frontierTransaction, false);
+  }
+
+  @Test
+  public void shouldRejectRemote1559TxsWhenMaxFeePerGasBelowMinGasPrice() {
+    final Wei genesisBaseFee = Wei.of(100L);
+    final Wei minGasPrice = Wei.of(200L);
+    final Wei lastBlockBaseFee = minGasPrice.add(50L);
+    final Wei txMaxFeePerGas = minGasPrice.subtract(1L);
+
+    assertThat(
+            add1559TxAndGetPendingTxsCount(
+                genesisBaseFee, minGasPrice, lastBlockBaseFee, txMaxFeePerGas, false))
+        .isEqualTo(0);
+  }
+
+  @Test
+  public void shouldAcceptRemote1559TxsWhenMaxFeePerGasIsAtLeastEqualToMinGasPrice() {
+    final Wei genesisBaseFee = Wei.of(100L);
+    final Wei minGasPrice = Wei.of(200L);
+    final Wei lastBlockBaseFee = minGasPrice.add(50L);
+    final Wei txMaxFeePerGas = minGasPrice;
+
+    assertThat(
+            add1559TxAndGetPendingTxsCount(
+                genesisBaseFee, minGasPrice, lastBlockBaseFee, txMaxFeePerGas, false))
+        .isEqualTo(1);
+  }
+
+  @Test
+  public void shouldRejectLocal1559TxsWhenMaxFeePerGasBelowMinGasPrice() {
+    final Wei genesisBaseFee = Wei.of(100L);
+    final Wei minGasPrice = Wei.of(200L);
+    final Wei lastBlockBaseFee = minGasPrice.add(50L);
+    final Wei txMaxFeePerGas = minGasPrice.subtract(1L);
+
+    assertThat(
+            add1559TxAndGetPendingTxsCount(
+                genesisBaseFee, minGasPrice, lastBlockBaseFee, txMaxFeePerGas, true))
+        .isEqualTo(0);
+  }
+
+  @Test
+  public void shouldAcceptLocal1559TxsWhenMaxFeePerGasIsAtLeastEqualToMinMinGasPrice() {
+    final Wei genesisBaseFee = Wei.of(100L);
+    final Wei minGasPrice = Wei.of(200L);
+    final Wei lastBlockBaseFee = minGasPrice.add(50L);
+    final Wei txMaxFeePerGas = minGasPrice;
+
+    assertThat(
+            add1559TxAndGetPendingTxsCount(
+                genesisBaseFee, minGasPrice, lastBlockBaseFee, txMaxFeePerGas, true))
+        .isEqualTo(1);
+  }
+
+  private int add1559TxAndGetPendingTxsCount(
+      final Wei genesisBaseFee,
+      final Wei minGasPrice,
+      final Wei lastBlockBaseFee,
+      final Wei txMaxFeePerGas,
+      final boolean isLocal) {
+    when(miningParameters.getMinTransactionGasPrice()).thenReturn(minGasPrice);
+    when(protocolSpec.getFeeMarket()).thenReturn(FeeMarket.london(0, Optional.of(genesisBaseFee)));
+    whenBlockBaseFeeIs(lastBlockBaseFee);
+
+    final Transaction transaction = createTransaction(0, txMaxFeePerGas);
+
+    givenTransactionIsValid(transaction);
+
+    if (isLocal) {
+      transactionPool.addLocalTransaction(transaction);
+    } else {
+      transactionPool.addRemoteTransactions(List.of(transaction));
+    }
+
+    return transactions.size();
+  }
+
+  private void whenBlockBaseFeeIs(final Wei baseFee) {
+    final BlockHeader header =
+        BlockHeaderBuilder.fromHeader(blockchain.getChainHeadHeader())
+            .baseFee(baseFee)
+            .blockHeaderFunctions(new MainnetBlockHeaderFunctions())
+            .parentHash(blockchain.getChainHeadHash())
+            .buildBlockHeader();
+    blockchain.appendBlock(new Block(header, BlockBody.empty()), emptyList());
+  }
+
+  private Transaction createFrontierTransaction(final int transactionNumber, final Wei gasPrice) {
+    return new TransactionTestFixture()
+        .nonce(transactionNumber)
+        .gasPrice(gasPrice)
+        .gasLimit(blockGasLimit)
+        .type(TransactionType.FRONTIER)
+        .createTransaction(KEY_PAIR1);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolPropagationTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolPropagationTest.java
index 0f4659b08b3..65961d98136 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolPropagationTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolPropagationTest.java
@@ -14,8 +14,11 @@
  */
 package org.hyperledger.besu.ethereum.eth.transactions;
 
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.crypto.SECP256K1.PrivateKey;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
 import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration;
@@ -26,24 +29,23 @@
 import io.vertx.core.Vertx;
 import org.apache.tuweni.bytes.Bytes32;
 import org.awaitility.Awaitility;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ComparisonFailure;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-public class TransactionPoolPropagationTest {
+class TransactionPoolPropagationTest {
 
   final DiscoveryConfiguration noDiscovery = DiscoveryConfiguration.create().setActive(false);
 
   private Vertx vertx;
 
-  @Before
-  public void setUp() {
+  @BeforeEach
+  void setUp() {
     vertx = Vertx.vertx();
   }
 
-  @After
-  public void tearDown() {
+  @AfterEach
+  void tearDown() {
     vertx.close();
   }
 
@@ -66,8 +68,8 @@ private void wrapup(final TestNodeList txNodes) {
    * 2nd order test to verify the framework correctly fails if a disconnect occurs It could have a
    * more detailed exception check - more than just the class.
    */
-  @Test(expected = ComparisonFailure.class)
-  public void disconnectShouldThrow() throws Exception {
+  @Test
+  void disconnectShouldThrow() throws Exception {
 
     try (final TestNodeList txNodes = new TestNodeList()) {
       // Create & Start Nodes
@@ -79,7 +81,7 @@ public void disconnectShouldThrow() throws Exception {
 
       node1.network.getPeers().iterator().next().disconnect(DisconnectReason.BREACH_OF_PROTOCOL);
 
-      wrapup(txNodes);
+      assertThatThrownBy(() -> wrapup(txNodes)).isInstanceOf(AssertionError.class);
     }
   }
 
@@ -88,16 +90,17 @@ public void disconnectShouldThrow() throws Exception {
    * node. Verify that all nodes get the correct number of pending transactions.
    */
   @Test
-  public void shouldPropagateLocalAndRemoteTransactions() throws Exception {
+  void shouldPropagateLocalAndRemoteTransactions() throws Exception {
     try (final TestNodeList nodes = new TestNodeList()) {
       // Create & Start Nodes
       final TestNode node1 = nodes.create(vertx, null, null, noDiscovery);
       final TestNode node2 = nodes.create(vertx, null, null, noDiscovery);
       final TestNode node3 = nodes.create(vertx, null, null, noDiscovery);
       final TestNode node4 = nodes.create(vertx, null, null, noDiscovery);
+      final SignatureAlgorithm signatureAlgorithm = SignatureAlgorithmFactory.getInstance();
       final KeyPair keyPair =
-          KeyPair.create(
-              PrivateKey.create(
+          signatureAlgorithm.createKeyPair(
+              signatureAlgorithm.createPrivateKey(
                   Bytes32.fromHexString(
                       "8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63")));
       final TransactionTestFixture transactionBuilder = new TransactionTestFixture();
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolReplacementHandlerTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolReplacementHandlerTest.java
index c605f06fe72..d678dd4fe47 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolReplacementHandlerTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolReplacementHandlerTest.java
@@ -23,7 +23,6 @@
 
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionInfo;
 import org.hyperledger.besu.plugin.data.TransactionType;
 
 import java.util.Collection;
@@ -55,19 +54,19 @@ public static Collection<Object[]> data() {
   }
 
   private final List<TransactionPoolReplacementRule> rules;
-  private final TransactionInfo oldTransactionInfo;
-  private final TransactionInfo newTransactionInfo;
+  private final PendingTransaction oldPendingTransaction;
+  private final PendingTransaction newPendingTransaction;
   private final boolean expectedResult;
   private final BlockHeader header;
 
   public TransactionPoolReplacementHandlerTest(
       final List<TransactionPoolReplacementRule> rules,
-      final TransactionInfo oldTransactionInfo,
-      final TransactionInfo newTransactionInfo,
+      final PendingTransaction oldPendingTransaction,
+      final PendingTransaction newPendingTransaction,
       final boolean expectedResult) {
     this.rules = rules;
-    this.oldTransactionInfo = oldTransactionInfo;
-    this.newTransactionInfo = newTransactionInfo;
+    this.oldPendingTransaction = oldPendingTransaction;
+    this.newPendingTransaction = newPendingTransaction;
     this.expectedResult = expectedResult;
     header = mock(BlockHeader.class);
     when(header.getBaseFee()).thenReturn(Optional.empty());
@@ -77,7 +76,7 @@ public TransactionPoolReplacementHandlerTest(
   public void shouldReplace() {
     assertThat(
             new TransactionPoolReplacementHandler(rules)
-                .shouldReplace(oldTransactionInfo, newTransactionInfo, header))
+                .shouldReplace(oldPendingTransaction, newPendingTransaction, header))
         .isEqualTo(expectedResult);
   }
 
@@ -92,11 +91,11 @@ private static List<TransactionPoolReplacementRule> constantRules(
         .collect(Collectors.toList());
   }
 
-  private static TransactionInfo mockTransactionInfo() {
-    final TransactionInfo transactionInfo = mock(TransactionInfo.class);
+  private static PendingTransaction mockTransactionInfo() {
+    final PendingTransaction pendingTransaction = mock(PendingTransaction.class);
     final Transaction transaction = mock(Transaction.class);
     when(transaction.getType()).thenReturn(TransactionType.FRONTIER);
-    when(transactionInfo.getTransaction()).thenReturn(transaction);
-    return transactionInfo;
+    when(pendingTransaction.getTransaction()).thenReturn(transaction);
+    return pendingTransaction;
   }
 }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolTest.java
deleted file mode 100644
index 88542d3dd04..00000000000
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPoolTest.java
+++ /dev/null
@@ -1,789 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.transactions;
-
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptyList;
-import static java.util.Collections.singleton;
-import static java.util.Collections.singletonList;
-import static java.util.stream.Collectors.toList;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.hyperledger.besu.ethereum.mainnet.ValidationResult.valid;
-import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.EXCEEDS_BLOCK_GAS_LIMIT;
-import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.GAS_PRICE_TOO_LOW;
-import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.NONCE_TOO_LOW;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.ethereum.ProtocolContext;
-import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.BlockBody;
-import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
-import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.ExecutionContextTestFixture;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.TransactionReceipt;
-import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.eth.EthProtocol;
-import org.hyperledger.besu.ethereum.eth.manager.EthContext;
-import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
-import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
-import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
-import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManagerTestUtil;
-import org.hyperledger.besu.ethereum.eth.manager.RespondingEthPeer;
-import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
-import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionValidator;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
-import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
-import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
-import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
-import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
-import org.hyperledger.besu.testutil.TestClock;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-
-@SuppressWarnings("unchecked")
-public class TransactionPoolTest {
-
-  private static final int MAX_TRANSACTIONS = 5;
-  private static final int MAX_TRANSACTION_HASHES = 5;
-  private static final KeyPair KEY_PAIR1 = KeyPair.generate();
-
-  private final PendingTransactionListener listener = mock(PendingTransactionListener.class);
-  private final TransactionPool.TransactionBatchAddedListener batchAddedListener =
-      mock(TransactionPool.TransactionBatchAddedListener.class);
-  private final TransactionPool.TransactionBatchAddedListener pendingBatchAddedListener =
-      mock(TransactionPool.TransactionBatchAddedListener.class);
-  private final MetricsSystem metricsSystem = new NoOpMetricsSystem();
-
-  @SuppressWarnings("unchecked")
-  private final ProtocolSchedule protocolSchedule = mock(ProtocolSchedule.class);
-
-  @SuppressWarnings("unchecked")
-  private final ProtocolSpec protocolSpec = mock(ProtocolSpec.class);
-
-  private final MainnetTransactionValidator transactionValidator =
-      mock(MainnetTransactionValidator.class);
-  private MutableBlockchain blockchain;
-
-  private PendingTransactions transactions;
-  private final Transaction transaction1 = createTransaction(1);
-  private final Transaction transaction2 = createTransaction(2);
-  private final ExecutionContextTestFixture executionContext = ExecutionContextTestFixture.create();
-  private final ProtocolContext protocolContext = executionContext.getProtocolContext();
-  private TransactionPool transactionPool;
-  private long genesisBlockGasLimit;
-  private SyncState syncState;
-  private EthContext ethContext;
-  private EthPeers ethPeers;
-  private PeerTransactionTracker peerTransactionTracker;
-  private PeerPendingTransactionTracker peerPendingTransactionTracker;
-
-  @Before
-  public void setUp() {
-    blockchain = executionContext.getBlockchain();
-    transactions =
-        new PendingTransactions(
-            TransactionPoolConfiguration.DEFAULT_TX_RETENTION_HOURS,
-            MAX_TRANSACTIONS,
-            MAX_TRANSACTION_HASHES,
-            TestClock.fixed(),
-            metricsSystem,
-            blockchain::getChainHeadHeader,
-            TransactionPoolConfiguration.DEFAULT_PRICE_BUMP);
-    when(protocolSchedule.getByBlockNumber(anyLong())).thenReturn(protocolSpec);
-    when(protocolSpec.getTransactionValidator()).thenReturn(transactionValidator);
-    genesisBlockGasLimit = executionContext.getGenesis().getHeader().getGasLimit();
-    syncState = mock(SyncState.class);
-    when(syncState.isInSync(anyLong())).thenReturn(true);
-    ethContext = mock(EthContext.class);
-    ethPeers = mock(EthPeers.class);
-    when(ethContext.getEthPeers()).thenReturn(ethPeers);
-    peerTransactionTracker = mock(PeerTransactionTracker.class);
-    peerPendingTransactionTracker = mock(PeerPendingTransactionTracker.class);
-    transactionPool =
-        new TransactionPool(
-            transactions,
-            protocolSchedule,
-            protocolContext,
-            batchAddedListener,
-            Optional.of(pendingBatchAddedListener),
-            syncState,
-            ethContext,
-            peerTransactionTracker,
-            Optional.of(peerPendingTransactionTracker),
-            Wei.of(2),
-            metricsSystem,
-            Optional.empty(),
-            TransactionPoolConfiguration.DEFAULT);
-    blockchain.observeBlockAdded(transactionPool);
-  }
-
-  @Test
-  public void shouldReturnExclusivelyLocalTransactionsWhenAppropriate() {
-    final Transaction localTransaction0 = createTransaction(0);
-    transactions.addLocalTransaction(localTransaction0);
-    assertThat(transactions.size()).isEqualTo(1);
-
-    transactions.addRemoteTransaction(transaction1);
-    assertThat(transactions.size()).isEqualTo(2);
-
-    transactions.addRemoteTransaction(transaction2);
-    assertThat(transactions.size()).isEqualTo(3);
-
-    List<Transaction> localTransactions = transactions.getLocalTransactions();
-    assertThat(localTransactions.size()).isEqualTo(1);
-  }
-
-  @Test
-  public void shouldRemoveTransactionsFromPendingListWhenIncludedInBlockOnChain() {
-    transactions.addRemoteTransaction(transaction1);
-    assertTransactionPending(transaction1);
-    appendBlock(transaction1);
-
-    assertTransactionNotPending(transaction1);
-  }
-
-  @Test
-  public void shouldRemoveMultipleTransactionsAddedInOneBlock() {
-    transactions.addRemoteTransaction(transaction1);
-    transactions.addRemoteTransaction(transaction2);
-    appendBlock(transaction1, transaction2);
-
-    assertTransactionNotPending(transaction1);
-    assertTransactionNotPending(transaction2);
-    assertThat(transactions.size()).isZero();
-  }
-
-  @Test
-  public void shouldIgnoreUnknownTransactionsThatAreAddedInABlock() {
-    transactions.addRemoteTransaction(transaction1);
-    appendBlock(transaction1, transaction2);
-
-    assertTransactionNotPending(transaction1);
-    assertTransactionNotPending(transaction2);
-    assertThat(transactions.size()).isZero();
-  }
-
-  @Test
-  public void shouldNotRemovePendingTransactionsWhenABlockAddedToAFork() {
-    transactions.addRemoteTransaction(transaction1);
-    final BlockHeader commonParent = getHeaderForCurrentChainHead();
-    final Block canonicalHead = appendBlock(Difficulty.of(1000), commonParent);
-    appendBlock(Difficulty.ONE, commonParent, transaction1);
-
-    verifyChainHeadIs(canonicalHead);
-
-    assertTransactionPending(transaction1);
-  }
-
-  @Test
-  public void shouldRemovePendingTransactionsFromAllBlocksOnAForkWhenItBecomesTheCanonicalChain() {
-    transactions.addRemoteTransaction(transaction1);
-    transactions.addRemoteTransaction(transaction2);
-    final BlockHeader commonParent = getHeaderForCurrentChainHead();
-    final Block originalChainHead = appendBlock(Difficulty.of(1000), commonParent);
-
-    final Block forkBlock1 = appendBlock(Difficulty.ONE, commonParent, transaction1);
-    verifyChainHeadIs(originalChainHead);
-
-    final Block forkBlock2 = appendBlock(Difficulty.of(2000), forkBlock1.getHeader(), transaction2);
-    verifyChainHeadIs(forkBlock2);
-
-    assertTransactionNotPending(transaction1);
-    assertTransactionNotPending(transaction2);
-  }
-
-  @Test
-  public void shouldReadTransactionsFromThePreviousCanonicalHeadWhenAReorgOccurs() {
-    givenTransactionIsValid(transaction1);
-    givenTransactionIsValid(transaction2);
-    transactions.addRemoteTransaction(transaction1);
-    transactions.addRemoteTransaction(transaction2);
-    final BlockHeader commonParent = getHeaderForCurrentChainHead();
-    final Block originalFork1 = appendBlock(Difficulty.of(1000), commonParent, transaction1);
-    final Block originalFork2 =
-        appendBlock(Difficulty.ONE, originalFork1.getHeader(), transaction2);
-    assertTransactionNotPending(transaction1);
-    assertTransactionNotPending(transaction2);
-
-    final Block reorgFork1 = appendBlock(Difficulty.ONE, commonParent);
-    verifyChainHeadIs(originalFork2);
-
-    transactions.subscribePendingTransactions(listener);
-    final Block reorgFork2 = appendBlock(Difficulty.of(2000), reorgFork1.getHeader());
-    verifyChainHeadIs(reorgFork2);
-
-    assertTransactionPending(transaction1);
-    assertTransactionPending(transaction2);
-    verify(listener).onTransactionAdded(transaction1);
-    verify(listener).onTransactionAdded(transaction2);
-    verifyNoMoreInteractions(listener);
-  }
-
-  @Test
-  public void shouldNotReadTransactionsThatAreInBothForksWhenReorgHappens() {
-    givenTransactionIsValid(transaction1);
-    givenTransactionIsValid(transaction2);
-    transactions.addRemoteTransaction(transaction1);
-    transactions.addRemoteTransaction(transaction2);
-    final BlockHeader commonParent = getHeaderForCurrentChainHead();
-    final Block originalFork1 = appendBlock(Difficulty.of(1000), commonParent, transaction1);
-    final Block originalFork2 =
-        appendBlock(Difficulty.ONE, originalFork1.getHeader(), transaction2);
-    assertTransactionNotPending(transaction1);
-    assertTransactionNotPending(transaction2);
-
-    final Block reorgFork1 = appendBlock(Difficulty.ONE, commonParent, transaction1);
-    verifyChainHeadIs(originalFork2);
-
-    final Block reorgFork2 = appendBlock(Difficulty.of(2000), reorgFork1.getHeader());
-    verifyChainHeadIs(reorgFork2);
-
-    assertTransactionNotPending(transaction1);
-    assertTransactionPending(transaction2);
-  }
-
-  @Test
-  public void shouldNotAddRemoteTransactionsWhenGasPriceBelowMinimum() {
-    final Transaction transaction =
-        new TransactionTestFixture()
-            .nonce(1)
-            .gasLimit(0)
-            .gasPrice(Wei.of(1))
-            .createTransaction(KEY_PAIR1);
-    transactionPool.addRemoteTransactions(singletonList(transaction));
-
-    assertTransactionNotPending(transaction);
-    verifyZeroInteractions(transactionValidator); // Reject before validation
-  }
-
-  @Test
-  public void shouldRejectLocalTransactionsWhenGasPriceBelowMinimum() {
-
-    final Transaction transaction =
-        new TransactionTestFixture()
-            .nonce(1)
-            .gasLimit(0)
-            .gasPrice(Wei.of(1))
-            .createTransaction(KEY_PAIR1);
-    final ValidationResult<TransactionInvalidReason> result =
-        transactionPool.addLocalTransaction(transaction);
-
-    assertThat(result).isEqualTo(ValidationResult.invalid(GAS_PRICE_TOO_LOW));
-    assertTransactionNotPending(transaction);
-    verifyZeroInteractions(transactionValidator); // Reject before validation
-  }
-
-  @Test
-  public void shouldNotAddRemoteTransactionsThatAreInvalidAccordingToInvariantChecks() {
-    givenTransactionIsValid(transaction2);
-    when(transactionValidator.validate(eq(transaction1), any(Optional.class)))
-        .thenReturn(ValidationResult.invalid(NONCE_TOO_LOW));
-
-    transactionPool.addRemoteTransactions(asList(transaction1, transaction2));
-
-    assertTransactionNotPending(transaction1);
-    assertTransactionPending(transaction2);
-    verify(batchAddedListener).onTransactionsAdded(singleton(transaction2));
-  }
-
-  @Test
-  public void shouldNotAddRemoteTransactionsThatAreInvalidAccordingToStateDependentChecks() {
-    givenTransactionIsValid(transaction2);
-    when(transactionValidator.validate(eq(transaction1), any(Optional.class))).thenReturn(valid());
-    when(transactionValidator.validateForSender(transaction1, null, true))
-        .thenReturn(ValidationResult.invalid(NONCE_TOO_LOW));
-
-    transactionPool.addRemoteTransactions(asList(transaction1, transaction2));
-
-    assertTransactionNotPending(transaction1);
-    assertTransactionPending(transaction2);
-    verify(batchAddedListener).onTransactionsAdded(singleton(transaction2));
-  }
-
-  @Test
-  public void shouldAllowSequenceOfTransactionsWithIncreasingNonceFromSameSender() {
-    final TransactionTestFixture builder = new TransactionTestFixture();
-    final Transaction transaction1 = builder.nonce(1).createTransaction(KEY_PAIR1);
-    final Transaction transaction2 = builder.nonce(2).createTransaction(KEY_PAIR1);
-    final Transaction transaction3 = builder.nonce(3).createTransaction(KEY_PAIR1);
-
-    when(transactionValidator.validate(any(Transaction.class), any(Optional.class)))
-        .thenReturn(valid());
-    when(transactionValidator.validateForSender(
-            eq(transaction1), nullable(Account.class), any(TransactionValidationParams.class)))
-        .thenReturn(valid());
-    when(transactionValidator.validateForSender(
-            eq(transaction2), nullable(Account.class), any(TransactionValidationParams.class)))
-        .thenReturn(valid());
-    when(transactionValidator.validateForSender(
-            eq(transaction3), nullable(Account.class), any(TransactionValidationParams.class)))
-        .thenReturn(valid());
-
-    assertThat(transactionPool.addLocalTransaction(transaction1)).isEqualTo(valid());
-    assertThat(transactionPool.addLocalTransaction(transaction2)).isEqualTo(valid());
-    assertThat(transactionPool.addLocalTransaction(transaction3)).isEqualTo(valid());
-
-    assertTransactionPending(transaction1);
-    assertTransactionPending(transaction2);
-    assertTransactionPending(transaction3);
-  }
-
-  @Test
-  public void
-      shouldAllowSequenceOfTransactionsWithIncreasingNonceFromSameSenderWhenSentInBatchOutOfOrder() {
-    final TransactionTestFixture builder = new TransactionTestFixture();
-    final Transaction transaction1 = builder.nonce(1).createTransaction(KEY_PAIR1);
-    final Transaction transaction2 = builder.nonce(2).createTransaction(KEY_PAIR1);
-    final Transaction transaction3 = builder.nonce(3).createTransaction(KEY_PAIR1);
-
-    when(transactionValidator.validate(any(Transaction.class), any(Optional.class)))
-        .thenReturn(valid());
-    when(transactionValidator.validateForSender(
-            eq(transaction1), nullable(Account.class), any(TransactionValidationParams.class)))
-        .thenReturn(valid());
-    when(transactionValidator.validateForSender(
-            eq(transaction2), nullable(Account.class), any(TransactionValidationParams.class)))
-        .thenReturn(valid());
-    when(transactionValidator.validateForSender(
-            eq(transaction3), nullable(Account.class), any(TransactionValidationParams.class)))
-        .thenReturn(valid());
-
-    transactionPool.addRemoteTransactions(asList(transaction3, transaction1, transaction2));
-
-    assertTransactionPending(transaction1);
-    assertTransactionPending(transaction2);
-    assertTransactionPending(transaction3);
-  }
-
-  @Test
-  public void shouldDiscardRemoteTransactionThatAlreadyExistsBeforeValidation() {
-    final PendingTransactions pendingTransactions = mock(PendingTransactions.class);
-    final TransactionPool transactionPool =
-        new TransactionPool(
-            pendingTransactions,
-            protocolSchedule,
-            protocolContext,
-            batchAddedListener,
-            Optional.of(pendingBatchAddedListener),
-            syncState,
-            ethContext,
-            peerTransactionTracker,
-            Optional.of(peerPendingTransactionTracker),
-            Wei.ZERO,
-            metricsSystem,
-            Optional.empty(),
-            TransactionPoolConfiguration.DEFAULT);
-
-    when(pendingTransactions.containsTransaction(transaction1.getHash())).thenReturn(true);
-
-    transactionPool.addRemoteTransactions(singletonList(transaction1));
-
-    verify(pendingTransactions).containsTransaction(transaction1.getHash());
-    verify(pendingTransactions).tryEvictTransactionHash(transaction1.getHash());
-    verifyZeroInteractions(transactionValidator);
-    verifyNoMoreInteractions(pendingTransactions);
-  }
-
-  @Test
-  public void shouldNotNotifyBatchListenerWhenRemoteTransactionDoesNotReplaceExisting() {
-    final TransactionTestFixture builder = new TransactionTestFixture();
-    final Transaction transaction1 =
-        builder.nonce(1).gasPrice(Wei.of(10)).createTransaction(KEY_PAIR1);
-    final Transaction transaction2 =
-        builder.nonce(1).gasPrice(Wei.of(5)).createTransaction(KEY_PAIR1);
-
-    when(transactionValidator.validate(any(Transaction.class), any(Optional.class)))
-        .thenReturn(valid());
-    when(transactionValidator.validateForSender(
-            eq(transaction1), nullable(Account.class), any(TransactionValidationParams.class)))
-        .thenReturn(valid());
-    when(transactionValidator.validateForSender(
-            eq(transaction2), nullable(Account.class), any(TransactionValidationParams.class)))
-        .thenReturn(valid());
-
-    transactionPool.addRemoteTransactions(singletonList(transaction1));
-    transactionPool.addRemoteTransactions(singletonList(transaction2));
-
-    assertTransactionPending(transaction1);
-    verify(batchAddedListener).onTransactionsAdded(singleton(transaction1));
-    verify(batchAddedListener, never()).onTransactionsAdded(singleton(transaction2));
-  }
-
-  @Test
-  public void shouldNotNotifyBatchListenerWhenLocalTransactionDoesNotReplaceExisting() {
-    final TransactionTestFixture builder = new TransactionTestFixture();
-    final Transaction transaction1 =
-        builder.nonce(1).gasPrice(Wei.of(10)).createTransaction(KEY_PAIR1);
-    final Transaction transaction2 =
-        builder.nonce(1).gasPrice(Wei.of(5)).createTransaction(KEY_PAIR1);
-
-    when(transactionValidator.validate(any(Transaction.class), any(Optional.class)))
-        .thenReturn(valid());
-    when(transactionValidator.validateForSender(
-            eq(transaction1), nullable(Account.class), any(TransactionValidationParams.class)))
-        .thenReturn(valid());
-    when(transactionValidator.validateForSender(
-            eq(transaction2), nullable(Account.class), any(TransactionValidationParams.class)))
-        .thenReturn(valid());
-
-    transactionPool.addLocalTransaction(transaction1);
-    transactionPool.addLocalTransaction(transaction2);
-
-    assertTransactionPending(transaction1);
-    verify(batchAddedListener).onTransactionsAdded(singletonList(transaction1));
-    verify(batchAddedListener, never()).onTransactionsAdded(singletonList(transaction2));
-  }
-
-  @Test
-  public void shouldRejectLocalTransactionsWhereGasLimitExceedBlockGasLimit() {
-    final TransactionTestFixture builder = new TransactionTestFixture();
-    final Transaction transaction1 =
-        builder.gasLimit(genesisBlockGasLimit + 1).createTransaction(KEY_PAIR1);
-
-    givenTransactionIsValid(transaction1);
-
-    assertThat(transactionPool.addLocalTransaction(transaction1))
-        .isEqualTo(ValidationResult.invalid(EXCEEDS_BLOCK_GAS_LIMIT));
-
-    assertTransactionNotPending(transaction1);
-    verifyZeroInteractions(batchAddedListener);
-  }
-
-  @Test
-  public void shouldRejectRemoteTransactionsWhereGasLimitExceedBlockGasLimit() {
-    final TransactionTestFixture builder = new TransactionTestFixture();
-    final Transaction transaction1 =
-        builder.gasLimit(genesisBlockGasLimit + 1).createTransaction(KEY_PAIR1);
-
-    givenTransactionIsValid(transaction1);
-
-    transactionPool.addRemoteTransactions(singleton(transaction1));
-
-    assertTransactionNotPending(transaction1);
-    verifyZeroInteractions(batchAddedListener);
-  }
-
-  @Test
-  public void shouldNotNotifyBatchListenerIfNoTransactionsAreAdded() {
-    transactionPool.addRemoteTransactions(emptyList());
-    verifyZeroInteractions(batchAddedListener);
-  }
-
-  @Test
-  public void shouldNotNotifyPeerForPendingTransactionsIfItDoesntSupportEth65() {
-    EthPeer peer = mock(EthPeer.class);
-    EthPeer validPeer = mock(EthPeer.class);
-    when(peerPendingTransactionTracker.isPeerSupported(peer, EthProtocol.ETH65)).thenReturn(false);
-    when(peerPendingTransactionTracker.isPeerSupported(validPeer, EthProtocol.ETH65))
-        .thenReturn(true);
-    when(transactionValidator.validate(any(), any(Optional.class))).thenReturn(valid());
-    transactionPool.addTransactionHash(transaction1.getHash());
-    transactionPool.handleConnect(peer);
-    verify(peerPendingTransactionTracker, never()).addToPeerSendQueue(peer, transaction1.getHash());
-    transactionPool.handleConnect(validPeer);
-    verify(peerPendingTransactionTracker, times(1))
-        .addToPeerSendQueue(validPeer, transaction1.getHash());
-  }
-
-  @Test
-  public void shouldAllowTransactionWhenAccountAllowlistControllerIsNotPresent() {
-    givenTransactionIsValid(transaction1);
-
-    assertThat(transactionPool.addLocalTransaction(transaction1)).isEqualTo(valid());
-
-    assertTransactionPending(transaction1);
-  }
-
-  @Test
-  public void shouldRejectRemoteTransactionsWhenNotInSync() {
-    SyncState syncState = mock(SyncState.class);
-    when(syncState.isInSync(anyLong())).thenReturn(false);
-    TransactionPool transactionPool =
-        new TransactionPool(
-            transactions,
-            protocolSchedule,
-            protocolContext,
-            batchAddedListener,
-            Optional.of(pendingBatchAddedListener),
-            syncState,
-            ethContext,
-            peerTransactionTracker,
-            Optional.of(peerPendingTransactionTracker),
-            Wei.ZERO,
-            metricsSystem,
-            Optional.empty(),
-            TransactionPoolConfiguration.DEFAULT);
-
-    final TransactionTestFixture builder = new TransactionTestFixture();
-    final Transaction transaction1 = builder.nonce(1).createTransaction(KEY_PAIR1);
-    final Transaction transaction2 = builder.nonce(2).createTransaction(KEY_PAIR1);
-    final Transaction transaction3 = builder.nonce(3).createTransaction(KEY_PAIR1);
-
-    when(transactionValidator.validate(any(Transaction.class), any(Optional.class)))
-        .thenReturn(valid());
-    when(transactionValidator.validateForSender(
-            eq(transaction1), nullable(Account.class), any(TransactionValidationParams.class)))
-        .thenReturn(valid());
-    when(transactionValidator.validateForSender(
-            eq(transaction2), nullable(Account.class), any(TransactionValidationParams.class)))
-        .thenReturn(valid());
-    when(transactionValidator.validateForSender(
-            eq(transaction3), nullable(Account.class), any(TransactionValidationParams.class)))
-        .thenReturn(valid());
-
-    transactionPool.addRemoteTransactions(asList(transaction3, transaction1, transaction2));
-
-    assertTransactionNotPending(transaction1);
-    assertTransactionNotPending(transaction2);
-    assertTransactionNotPending(transaction3);
-    verifyZeroInteractions(batchAddedListener);
-  }
-
-  @Test
-  public void shouldAllowRemoteTransactionsWhenInSync() {
-    final TransactionTestFixture builder = new TransactionTestFixture();
-    final Transaction transaction1 = builder.nonce(1).createTransaction(KEY_PAIR1);
-    final Transaction transaction2 = builder.nonce(2).createTransaction(KEY_PAIR1);
-    final Transaction transaction3 = builder.nonce(3).createTransaction(KEY_PAIR1);
-
-    when(transactionValidator.validate(any(Transaction.class), any(Optional.class)))
-        .thenReturn(valid());
-    when(transactionValidator.validateForSender(
-            eq(transaction1), nullable(Account.class), any(TransactionValidationParams.class)))
-        .thenReturn(valid());
-    when(transactionValidator.validateForSender(
-            eq(transaction2), nullable(Account.class), any(TransactionValidationParams.class)))
-        .thenReturn(valid());
-    when(transactionValidator.validateForSender(
-            eq(transaction3), nullable(Account.class), any(TransactionValidationParams.class)))
-        .thenReturn(valid());
-
-    transactionPool.addRemoteTransactions(asList(transaction3, transaction1, transaction2));
-
-    assertTransactionPending(transaction1);
-    assertTransactionPending(transaction2);
-    assertTransactionPending(transaction3);
-  }
-
-  @Test
-  public void shouldSendOnlyLocalTransactionToNewlyConnectedPeer() {
-    EthProtocolManager ethProtocolManager = EthProtocolManagerTestUtil.create();
-    EthContext ethContext = ethProtocolManager.ethContext();
-    PeerTransactionTracker peerTransactionTracker = new PeerTransactionTracker();
-    TransactionPool transactionPool =
-        new TransactionPool(
-            transactions,
-            protocolSchedule,
-            protocolContext,
-            batchAddedListener,
-            Optional.of(pendingBatchAddedListener),
-            syncState,
-            ethContext,
-            peerTransactionTracker,
-            Optional.of(peerPendingTransactionTracker),
-            Wei.ZERO,
-            metricsSystem,
-            Optional.empty(),
-            TransactionPoolConfiguration.DEFAULT);
-
-    final TransactionTestFixture builder = new TransactionTestFixture();
-    final Transaction transactionLocal = builder.nonce(1).createTransaction(KEY_PAIR1);
-    final Transaction transactionRemote = builder.nonce(2).createTransaction(KEY_PAIR1);
-    when(transactionValidator.validate(any(Transaction.class), any(Optional.class)))
-        .thenReturn(valid());
-    when(transactionValidator.validateForSender(
-            any(Transaction.class),
-            nullable(Account.class),
-            any(TransactionValidationParams.class)))
-        .thenReturn(valid());
-
-    transactionPool.addLocalTransaction(transactionLocal);
-    transactionPool.addRemoteTransactions(Collections.singletonList(transactionRemote));
-
-    RespondingEthPeer peer = EthProtocolManagerTestUtil.createPeer(ethProtocolManager);
-
-    Set<Transaction> transactionsToSendToPeer =
-        peerTransactionTracker.claimTransactionsToSendToPeer(peer.getEthPeer());
-
-    assertThat(transactionsToSendToPeer).containsExactly(transactionLocal);
-  }
-
-  @Test
-  public void shouldCallValidatorWithExpectedValidationParameters() {
-    final ArgumentCaptor<TransactionValidationParams> txValidationParamCaptor =
-        ArgumentCaptor.forClass(TransactionValidationParams.class);
-    when(transactionValidator.validate(eq(transaction1), any(Optional.class))).thenReturn(valid());
-    when(transactionValidator.validateForSender(any(), any(), txValidationParamCaptor.capture()))
-        .thenReturn(valid());
-
-    final TransactionValidationParams expectedValidationParams =
-        TransactionValidationParams.transactionPool();
-
-    transactionPool.addLocalTransaction(transaction1);
-
-    assertThat(txValidationParamCaptor.getValue())
-        .isEqualToComparingFieldByField(expectedValidationParams);
-  }
-
-  @Test
-  public void shouldIgnoreFeeCapIfSetZero() {
-    final EthProtocolManager ethProtocolManager = EthProtocolManagerTestUtil.create();
-    final EthContext ethContext = ethProtocolManager.ethContext();
-    final PeerTransactionTracker peerTransactionTracker = new PeerTransactionTracker();
-    final Wei twoEthers = Wei.fromEth(2);
-    final TransactionPool transactionPool =
-        new TransactionPool(
-            transactions,
-            protocolSchedule,
-            protocolContext,
-            batchAddedListener,
-            Optional.of(pendingBatchAddedListener),
-            syncState,
-            ethContext,
-            peerTransactionTracker,
-            Optional.of(peerPendingTransactionTracker),
-            Wei.ZERO,
-            metricsSystem,
-            Optional.empty(),
-            ImmutableTransactionPoolConfiguration.builder().txFeeCap(Wei.ZERO).build());
-    when(transactionValidator.validate(any(Transaction.class), any(Optional.class)))
-        .thenReturn(valid());
-    when(transactionValidator.validateForSender(
-            any(Transaction.class),
-            nullable(Account.class),
-            any(TransactionValidationParams.class)))
-        .thenReturn(valid());
-    assertThat(
-            transactionPool
-                .addLocalTransaction(
-                    new TransactionTestFixture()
-                        .nonce(1)
-                        .gasPrice(twoEthers.add(Wei.of(1)))
-                        .createTransaction(KEY_PAIR1))
-                .isValid())
-        .isTrue();
-  }
-
-  @Test
-  public void shouldRejectLocalTransactionIfFeeCapExceeded() {
-    final EthProtocolManager ethProtocolManager = EthProtocolManagerTestUtil.create();
-    final EthContext ethContext = ethProtocolManager.ethContext();
-    final PeerTransactionTracker peerTransactionTracker = new PeerTransactionTracker();
-    final Wei twoEthers = Wei.fromEth(2);
-    TransactionPool transactionPool =
-        new TransactionPool(
-            transactions,
-            protocolSchedule,
-            protocolContext,
-            batchAddedListener,
-            Optional.of(pendingBatchAddedListener),
-            syncState,
-            ethContext,
-            peerTransactionTracker,
-            Optional.of(peerPendingTransactionTracker),
-            Wei.ZERO,
-            metricsSystem,
-            Optional.empty(),
-            ImmutableTransactionPoolConfiguration.builder().txFeeCap(twoEthers).build());
-
-    final TransactionTestFixture builder = new TransactionTestFixture();
-    final Transaction transactionLocal =
-        builder.nonce(1).gasPrice(twoEthers.add(Wei.of(1))).createTransaction(KEY_PAIR1);
-
-    final ValidationResult<TransactionInvalidReason> result =
-        transactionPool.addLocalTransaction(transactionLocal);
-    assertThat(result.getInvalidReason()).isEqualTo(TransactionInvalidReason.TX_FEECAP_EXCEEDED);
-  }
-
-  private void assertTransactionPending(final Transaction t) {
-    assertThat(transactions.getTransactionByHash(t.getHash())).contains(t);
-  }
-
-  private void assertTransactionNotPending(final Transaction transaction) {
-    assertThat(transactions.getTransactionByHash(transaction.getHash())).isEmpty();
-  }
-
-  private void verifyChainHeadIs(final Block forkBlock2) {
-    assertThat(blockchain.getChainHeadHash()).isEqualTo(forkBlock2.getHash());
-  }
-
-  private void appendBlock(final Transaction... transactionsToAdd) {
-    appendBlock(Difficulty.ONE, getHeaderForCurrentChainHead(), transactionsToAdd);
-  }
-
-  private BlockHeader getHeaderForCurrentChainHead() {
-    return blockchain.getBlockHeader(blockchain.getChainHeadHash()).get();
-  }
-
-  private Block appendBlock(
-      final Difficulty difficulty,
-      final BlockHeader parentBlock,
-      final Transaction... transactionsToAdd) {
-    final List<Transaction> transactionList = asList(transactionsToAdd);
-    final Block block =
-        new Block(
-            new BlockHeaderTestFixture()
-                .difficulty(difficulty)
-                .parentHash(parentBlock.getHash())
-                .number(parentBlock.getNumber() + 1)
-                .buildHeader(),
-            new BlockBody(transactionList, emptyList()));
-    final List<TransactionReceipt> transactionReceipts =
-        transactionList.stream()
-            .map(transaction -> new TransactionReceipt(1, 1, emptyList(), Optional.empty()))
-            .collect(toList());
-    blockchain.appendBlock(block, transactionReceipts);
-    return block;
-  }
-
-  private Transaction createTransaction(final int transactionNumber) {
-    return new TransactionTestFixture()
-        .nonce(transactionNumber)
-        .gasLimit(0)
-        .createTransaction(KEY_PAIR1);
-  }
-
-  private void givenTransactionIsValid(final Transaction transaction) {
-    when(transactionValidator.validate(eq(transaction), any(Optional.class))).thenReturn(valid());
-    when(transactionValidator.validateForSender(
-            eq(transaction), nullable(Account.class), any(TransactionValidationParams.class)))
-        .thenReturn(valid());
-  }
-}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionReplacementByPriceRuleTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionReplacementByPriceRuleTest.java
deleted file mode 100644
index 6584e5d9f97..00000000000
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionReplacementByPriceRuleTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.eth.transactions;
-
-import static java.util.Arrays.asList;
-import static java.util.Optional.empty;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
-import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions.TransactionInfo;
-import org.hyperledger.besu.plugin.data.TransactionType;
-import org.hyperledger.besu.util.number.Percentage;
-
-import java.util.Collection;
-import java.util.Optional;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-public class TransactionReplacementByPriceRuleTest {
-
-  @Parameterized.Parameters
-  public static Collection<Object[]> data() {
-    return asList(
-        new Object[][] {
-          {frontierTx(5L), frontierTx(6L), empty(), 0, true},
-          {frontierTx(5L), frontierTx(5L), empty(), 0, false},
-          {frontierTx(5L), frontierTx(4L), empty(), 0, false},
-          {frontierTx(5L), eip1559Tx(3L, 6L), Optional.of(1L), 0, false},
-          {frontierTx(5L), eip1559Tx(3L, 5L), Optional.of(3L), 0, false},
-          {frontierTx(5L), eip1559Tx(3L, 6L), Optional.of(3L), 0, true},
-          {eip1559Tx(3L, 6L), eip1559Tx(3L, 6L), Optional.of(3L), 0, false},
-          {eip1559Tx(3L, 6L), eip1559Tx(3L, 7L), Optional.of(3L), 0, false},
-          {eip1559Tx(3L, 6L), eip1559Tx(3L, 7L), Optional.of(4L), 0, true},
-          {eip1559Tx(3L, 8L), frontierTx(7L), Optional.of(4L), 0, false},
-          {eip1559Tx(3L, 8L), frontierTx(8L), Optional.of(4L), 0, true},
-          {frontierTx(100L), frontierTx(105L), empty(), 10, false},
-          {frontierTx(100L), frontierTx(110L), empty(), 10, false},
-          {frontierTx(100L), frontierTx(111L), empty(), 10, true},
-          {eip1559Tx(10L, 200L), eip1559Tx(10L, 200L), Optional.of(90L), 10, false},
-          {eip1559Tx(10L, 200L), eip1559Tx(15L, 200L), Optional.of(90L), 10, false},
-          {eip1559Tx(10L, 200L), eip1559Tx(21L, 200L), Optional.of(90L), 10, true},
-        });
-  }
-
-  private final TransactionInfo oldTx;
-  private final TransactionInfo newTx;
-  private final Optional<Long> baseFee;
-  private final int priceBump;
-  private final boolean expected;
-
-  public TransactionReplacementByPriceRuleTest(
-      final TransactionInfo oldTx,
-      final TransactionInfo newTx,
-      final Optional<Long> baseFee,
-      final int priceBump,
-      final boolean expected) {
-    this.oldTx = oldTx;
-    this.newTx = newTx;
-    this.baseFee = baseFee;
-    this.priceBump = priceBump;
-    this.expected = expected;
-  }
-
-  @Before
-  public void enableEIP1559() {
-    ExperimentalEIPs.eip1559Enabled = true;
-  }
-
-  @After
-  public void resetEIP1559() {
-    ExperimentalEIPs.eip1559Enabled = ExperimentalEIPs.EIP1559_ENABLED_DEFAULT_VALUE;
-  }
-
-  @Test
-  public void shouldReplace() {
-    assertThat(
-            new TransactionReplacementByPriceRule(Percentage.fromInt(priceBump))
-                .shouldReplace(oldTx, newTx, baseFee))
-        .isEqualTo(expected);
-  }
-
-  private static TransactionInfo frontierTx(final long price) {
-    final TransactionInfo transactionInfo = mock(TransactionInfo.class);
-    final Transaction transaction = mock(Transaction.class);
-    when(transaction.getType()).thenReturn(TransactionType.FRONTIER);
-    when(transaction.getGasPrice()).thenReturn(Wei.of(price));
-    when(transactionInfo.getTransaction()).thenReturn(transaction);
-    return transactionInfo;
-  }
-
-  private static TransactionInfo eip1559Tx(final long gasPremium, final long feeCap) {
-    final TransactionInfo transactionInfo = mock(TransactionInfo.class);
-    final Transaction transaction = mock(Transaction.class);
-    when(transaction.getType()).thenReturn(TransactionType.EIP1559);
-    when(transaction.getGasPremium()).thenReturn(Optional.of(Wei.of(gasPremium)));
-    when(transaction.getFeeCap()).thenReturn(Optional.of(Wei.of(feeCap)));
-    when(transactionInfo.getTransaction()).thenReturn(transaction);
-    return transactionInfo;
-  }
-}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionReplacementRulesTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionReplacementRulesTest.java
new file mode 100644
index 00000000000..f6b13813ff0
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionReplacementRulesTest.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions;
+
+import static java.util.Arrays.asList;
+import static java.util.Optional.empty;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.plugin.data.TransactionType;
+import org.hyperledger.besu.util.number.Percentage;
+
+import java.math.BigInteger;
+import java.util.Collection;
+import java.util.Optional;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class TransactionReplacementRulesTest {
+
+  @Parameterized.Parameters
+  public static Collection<Object[]> data() {
+    return asList(
+        new Object[][] {
+          // TransactionReplacementByGasPriceRule
+          //   basefee absent
+          {frontierTx(5L), frontierTx(6L), empty(), 0, true},
+          {frontierTx(5L), frontierTx(5L), empty(), 0, false},
+          {frontierTx(5L), frontierTx(4L), empty(), 0, false},
+          {frontierTx(100L), frontierTx(105L), empty(), 10, false},
+          {frontierTx(100L), frontierTx(110L), empty(), 10, false},
+          {frontierTx(100L), frontierTx(111L), empty(), 10, true},
+          //   basefee present
+          {frontierTx(5L), frontierTx(6L), Optional.of(Wei.of(3L)), 0, true},
+          {frontierTx(5L), frontierTx(5L), Optional.of(Wei.of(3L)), 0, false},
+          {frontierTx(5L), frontierTx(4L), Optional.of(Wei.of(3L)), 0, false},
+          {frontierTx(100L), frontierTx(105L), Optional.of(Wei.of(3L)), 10, false},
+          {frontierTx(100L), frontierTx(110L), Optional.of(Wei.of(3L)), 10, false},
+          {frontierTx(100L), frontierTx(111L), Optional.of(Wei.of(3L)), 10, true},
+
+          // TransactionReplacementByFeeMarketRule
+          //  eip1559 replacing frontier
+          {frontierTx(5L), eip1559Tx(3L, 6L), Optional.of(Wei.of(1L)), 0, false},
+          {frontierTx(5L), eip1559Tx(3L, 5L), Optional.of(Wei.of(3L)), 0, false},
+          {frontierTx(5L), eip1559Tx(3L, 6L), Optional.of(Wei.of(3L)), 0, true},
+          //  frontier replacing 1559
+          {eip1559Tx(3L, 8L), frontierTx(7L), Optional.of(Wei.of(4L)), 0, false},
+          {eip1559Tx(3L, 8L), frontierTx(8L), Optional.of(Wei.of(4L)), 0, true},
+          //  eip1559 replacing eip1559
+          {eip1559Tx(3L, 6L), eip1559Tx(3L, 6L), Optional.of(Wei.of(3L)), 0, false},
+          {eip1559Tx(3L, 6L), eip1559Tx(3L, 7L), Optional.of(Wei.of(3L)), 0, false},
+          {eip1559Tx(3L, 6L), eip1559Tx(3L, 7L), Optional.of(Wei.of(4L)), 0, true},
+          {eip1559Tx(10L, 200L), eip1559Tx(10L, 200L), Optional.of(Wei.of(90L)), 10, false},
+          {eip1559Tx(10L, 200L), eip1559Tx(15L, 200L), Optional.of(Wei.of(90L)), 10, false},
+          {eip1559Tx(10L, 200L), eip1559Tx(21L, 200L), Optional.of(Wei.of(90L)), 10, true},
+          //  pathological, priority fee > max fee
+          {eip1559Tx(8L, 6L), eip1559Tx(3L, 7L), Optional.of(Wei.of(3L)), 0, false},
+          {eip1559Tx(8L, 6L), eip1559Tx(3L, 7L), Optional.of(Wei.of(4L)), 0, true},
+          //  pathological, eip1559 without basefee
+          {eip1559Tx(8L, 6L), eip1559Tx(3L, 7L), Optional.empty(), 0, false},
+          {eip1559Tx(8L, 6L), eip1559Tx(3L, 7L), Optional.empty(), 0, false},
+        });
+  }
+
+  private final PendingTransaction oldTx;
+  private final PendingTransaction newTx;
+  private final Optional<Wei> baseFee;
+  private final int priceBump;
+  private final boolean expected;
+
+  public TransactionReplacementRulesTest(
+      final PendingTransaction oldTx,
+      final PendingTransaction newTx,
+      final Optional<Wei> baseFee,
+      final int priceBump,
+      final boolean expected) {
+    this.oldTx = oldTx;
+    this.newTx = newTx;
+    this.baseFee = baseFee;
+    this.priceBump = priceBump;
+    this.expected = expected;
+  }
+
+  @Test
+  public void shouldReplace() {
+    BlockHeader mockHeader = mock(BlockHeader.class);
+    when(mockHeader.getBaseFee()).thenReturn(baseFee);
+
+    assertThat(
+            new TransactionPoolReplacementHandler(Percentage.fromInt(priceBump))
+                .shouldReplace(oldTx, newTx, mockHeader))
+        .isEqualTo(expected);
+  }
+
+  private static PendingTransaction frontierTx(final long price) {
+    final PendingTransaction pendingTransaction = mock(PendingTransaction.class);
+    final Transaction transaction =
+        Transaction.builder()
+            .chainId(BigInteger.ZERO)
+            .type(TransactionType.FRONTIER)
+            .gasPrice(Wei.of(price))
+            .build();
+    when(pendingTransaction.getTransaction()).thenReturn(transaction);
+    when(pendingTransaction.getGasPrice()).thenReturn(Wei.of(price));
+    return pendingTransaction;
+  }
+
+  private static PendingTransaction eip1559Tx(
+      final long maxPriorityFeePerGas, final long maxFeePerGas) {
+    final PendingTransaction pendingTransaction = mock(PendingTransaction.class);
+    final Transaction transaction =
+        Transaction.builder()
+            .chainId(BigInteger.ZERO)
+            .type(TransactionType.EIP1559)
+            .maxPriorityFeePerGas(Wei.of(maxPriorityFeePerGas))
+            .maxFeePerGas(Wei.of(maxFeePerGas))
+            .build();
+    when(pendingTransaction.getTransaction()).thenReturn(transaction);
+    return pendingTransaction;
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageProcessorTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageProcessorTest.java
index 9ed93069048..b8a3593b139 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageProcessorTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageProcessorTest.java
@@ -18,19 +18,19 @@
 import static java.time.Duration.ofMinutes;
 import static java.time.Instant.now;
 import static java.util.Arrays.asList;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeer;
 import org.hyperledger.besu.ethereum.eth.messages.TransactionsMessage;
-import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.metrics.StubMetricsSystem;
 
-import com.google.common.collect.ImmutableSet;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
@@ -39,15 +39,25 @@ public class TransactionsMessageProcessorTest {
 
   @Mock private TransactionPool transactionPool;
   @Mock private PeerTransactionTracker transactionTracker;
-  @Mock private Counter totalSkippedTransactionsMessageCounter;
   @Mock private EthPeer peer1;
-  @InjectMocks private TransactionsMessageProcessor messageHandler;
 
   private final BlockDataGenerator generator = new BlockDataGenerator();
   private final Transaction transaction1 = generator.transaction();
   private final Transaction transaction2 = generator.transaction();
   private final Transaction transaction3 = generator.transaction();
 
+  private TransactionsMessageProcessor messageHandler;
+  private StubMetricsSystem metricsSystem;
+
+  @Before
+  public void setup() {
+    metricsSystem = new StubMetricsSystem();
+
+    messageHandler =
+        new TransactionsMessageProcessor(
+            transactionTracker, transactionPool, new TransactionPoolMetrics(metricsSystem));
+  }
+
   @Test
   public void shouldMarkAllReceivedTransactionsAsSeen() {
     messageHandler.processTransactionsMessage(
@@ -57,7 +67,7 @@ public void shouldMarkAllReceivedTransactionsAsSeen() {
         ofMinutes(1));
 
     verify(transactionTracker)
-        .markTransactionsAsSeen(peer1, ImmutableSet.of(transaction1, transaction2, transaction3));
+        .markTransactionsAsSeen(peer1, asList(transaction1, transaction2, transaction3));
   }
 
   @Test
@@ -67,8 +77,7 @@ public void shouldAddReceivedTransactionsToTransactionPool() {
         TransactionsMessage.create(asList(transaction1, transaction2, transaction3)),
         now(),
         ofMinutes(1));
-    verify(transactionPool)
-        .addRemoteTransactions(ImmutableSet.of(transaction1, transaction2, transaction3));
+    verify(transactionPool).addRemoteTransactions(asList(transaction1, transaction2, transaction3));
   }
 
   @Test
@@ -78,8 +87,12 @@ public void shouldNotMarkReceivedExpiredTransactionsAsSeen() {
         TransactionsMessage.create(asList(transaction1, transaction2, transaction3)),
         now().minus(ofMinutes(1)),
         ofMillis(1));
-    verifyZeroInteractions(transactionTracker);
-    verify(totalSkippedTransactionsMessageCounter).inc(1);
+    verifyNoInteractions(transactionTracker);
+    assertThat(
+            metricsSystem.getCounterValue(
+                TransactionPoolMetrics.EXPIRED_MESSAGES_COUNTER_NAME,
+                TransactionsMessageProcessor.METRIC_LABEL))
+        .isEqualTo(1);
   }
 
   @Test
@@ -89,7 +102,11 @@ public void shouldNotAddReceivedTransactionsToTransactionPoolIfExpired() {
         TransactionsMessage.create(asList(transaction1, transaction2, transaction3)),
         now().minus(ofMinutes(1)),
         ofMillis(1));
-    verifyZeroInteractions(transactionPool);
-    verify(totalSkippedTransactionsMessageCounter).inc(1);
+    verifyNoInteractions(transactionPool);
+    assertThat(
+            metricsSystem.getCounterValue(
+                TransactionPoolMetrics.EXPIRED_MESSAGES_COUNTER_NAME,
+                TransactionsMessageProcessor.METRIC_LABEL))
+        .isEqualTo(1);
   }
 }
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageSenderTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageSenderTest.java
index b7b2582ce7e..c806b3fcb14 100644
--- a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageSenderTest.java
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionsMessageSenderTest.java
@@ -81,14 +81,7 @@ public void shouldSendTransactionsInBatchesWithLimit() throws Exception {
     final Set<Transaction> firstBatch = getTransactionsFromMessage(sentMessages.get(0));
     final Set<Transaction> secondBatch = getTransactionsFromMessage(sentMessages.get(1));
 
-    final int expectedFirstBatchSize = 5219, expectedSecondBatchSize = 781, toleranceDelta = 50;
-    assertThat(firstBatch)
-        .hasSizeBetween(
-            expectedFirstBatchSize - toleranceDelta, expectedFirstBatchSize + toleranceDelta);
-    assertThat(secondBatch)
-        .hasSizeBetween(
-            expectedSecondBatchSize - toleranceDelta, expectedSecondBatchSize + toleranceDelta);
-
+    assertThat(firstBatch).hasSizeGreaterThan(secondBatch.size());
     assertThat(Sets.union(firstBatch, secondBatch)).isEqualTo(transactions);
   }
 
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/AbstractPrioritizedTransactionsTestBase.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/AbstractPrioritizedTransactionsTestBase.java
new file mode 100644
index 00000000000..86741de9146
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/AbstractPrioritizedTransactionsTestBase.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.layered;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.ADDED;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolReplacementHandler;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.function.BiFunction;
+import java.util.stream.IntStream;
+
+import org.junit.jupiter.api.Test;
+
+public abstract class AbstractPrioritizedTransactionsTestBase extends BaseTransactionPoolTest {
+  protected static final int MAX_TRANSACTIONS = 5;
+  protected final TransactionPoolMetrics txPoolMetrics = new TransactionPoolMetrics(metricsSystem);
+  protected final EvictCollectorLayer evictCollector = new EvictCollectorLayer(txPoolMetrics);
+  protected AbstractPrioritizedTransactions transactions =
+      getSorter(
+          ImmutableTransactionPoolConfiguration.builder()
+              .maxPrioritizedTransactions(MAX_TRANSACTIONS)
+              .maxFutureBySender(MAX_TRANSACTIONS)
+              .build());
+
+  private AbstractPrioritizedTransactions getSorter(final TransactionPoolConfiguration poolConfig) {
+    return getSorter(
+        poolConfig,
+        evictCollector,
+        txPoolMetrics,
+        (pt1, pt2) -> transactionReplacementTester(poolConfig, pt1, pt2));
+  }
+
+  abstract AbstractPrioritizedTransactions getSorter(
+      final TransactionPoolConfiguration poolConfig,
+      final TransactionsLayer nextLayer,
+      final TransactionPoolMetrics txPoolMetrics,
+      final BiFunction<PendingTransaction, PendingTransaction, Boolean>
+          transactionReplacementTester);
+
+  abstract BlockHeader mockBlockHeader();
+
+  private boolean transactionReplacementTester(
+      final TransactionPoolConfiguration poolConfig,
+      final PendingTransaction pt1,
+      final PendingTransaction pt2) {
+    final TransactionPoolReplacementHandler transactionReplacementHandler =
+        new TransactionPoolReplacementHandler(poolConfig.getPriceBump());
+    return transactionReplacementHandler.shouldReplace(pt1, pt2, mockBlockHeader());
+  }
+
+  @Test
+  public void prioritizeLocalTransactionThenValue() {
+    final PendingTransaction localTransaction =
+        createLocalPendingTransaction(createTransaction(0, KEYS1));
+    assertThat(prioritizeTransaction(localTransaction)).isEqualTo(ADDED);
+
+    final List<PendingTransaction> remoteTxs = new ArrayList<>();
+    TransactionAddedResult prioritizeResult = null;
+    for (int i = 0; i < MAX_TRANSACTIONS; i++) {
+      final PendingTransaction highValueRemoteTx =
+          createRemotePendingTransaction(
+              createTransaction(
+                  0,
+                  Wei.of(BigInteger.valueOf(100).pow(i)),
+                  SIGNATURE_ALGORITHM.get().generateKeyPair()));
+      remoteTxs.add(highValueRemoteTx);
+      prioritizeResult = prioritizeTransaction(highValueRemoteTx);
+      assertThat(prioritizeResult).isEqualTo(ADDED);
+    }
+
+    assertEvicted(remoteTxs.get(0));
+    assertTransactionPrioritized(localTransaction);
+    remoteTxs.stream().skip(1).forEach(remoteTx -> assertTransactionPrioritized(remoteTx));
+  }
+
+  @Test
+  public void shouldStartDroppingLocalTransactionsWhenPoolIsFullOfLocalTransactions() {
+    final List<PendingTransaction> localTransactions = new ArrayList<>();
+
+    for (int i = 0; i < MAX_TRANSACTIONS; i++) {
+      final var localTransaction = createLocalPendingTransaction(createTransaction(i));
+      assertThat(prioritizeTransaction(localTransaction)).isEqualTo(ADDED);
+      localTransactions.add(localTransaction);
+    }
+
+    assertThat(transactions.count()).isEqualTo(MAX_TRANSACTIONS);
+
+    // this will be rejected since the prioritized set is full of txs from the same sender with
+    // lower nonce
+    final var lastLocalTransaction =
+        createLocalPendingTransaction(createTransaction(MAX_TRANSACTIONS));
+    prioritizeTransaction(lastLocalTransaction);
+    assertEvicted(lastLocalTransaction);
+
+    assertThat(transactions.count()).isEqualTo(MAX_TRANSACTIONS);
+
+    localTransactions.forEach(this::assertTransactionPrioritized);
+    assertTransactionNotPrioritized(lastLocalTransaction);
+  }
+
+  protected void shouldPrioritizeValueThenTimeAddedToPool(
+      final Iterator<PendingTransaction> lowValueTxSupplier,
+      final PendingTransaction highValueTx,
+      final PendingTransaction expectedDroppedTx) {
+
+    // Fill the pool with transactions from random senders
+    final List<PendingTransaction> lowGasPriceTransactions =
+        IntStream.range(0, MAX_TRANSACTIONS)
+            .mapToObj(
+                i -> {
+                  final var lowPriceTx = lowValueTxSupplier.next();
+                  final var prioritizeResult = transactions.add(lowPriceTx, 0);
+
+                  assertThat(prioritizeResult).isEqualTo(ADDED);
+                  assertThat(evictCollector.getEvictedTransactions()).isEmpty();
+                  return lowPriceTx;
+                })
+            .toList();
+
+    assertThat(transactions.count()).isEqualTo(MAX_TRANSACTIONS);
+
+    // This should kick the oldest tx with the low gas price out, namely the first one we added
+    final var highValuePrioRes = transactions.add(highValueTx, 0);
+    assertThat(highValuePrioRes).isEqualTo(ADDED);
+    assertEvicted(expectedDroppedTx);
+
+    assertTransactionPrioritized(highValueTx);
+    lowGasPriceTransactions.stream()
+        .filter(tx -> !tx.equals(expectedDroppedTx))
+        .forEach(tx -> assertThat(transactions.getByHash(tx.getHash())).isPresent());
+  }
+
+  protected TransactionAddedResult prioritizeTransaction(final Transaction tx) {
+    return prioritizeTransaction(createRemotePendingTransaction(tx));
+  }
+
+  protected TransactionAddedResult prioritizeTransaction(final PendingTransaction tx) {
+    return transactions.add(tx, 0);
+  }
+
+  protected void assertTransactionPrioritized(final PendingTransaction tx) {
+    assertThat(transactions.getByHash(tx.getHash())).isPresent();
+  }
+
+  protected void assertTransactionNotPrioritized(final PendingTransaction tx) {
+    assertThat(transactions.getByHash(tx.getHash())).isEmpty();
+  }
+
+  protected void assertTransactionPrioritized(final Transaction tx) {
+    assertThat(transactions.getByHash(tx.getHash())).isPresent();
+  }
+
+  protected void assertTransactionNotPrioritized(final Transaction tx) {
+    assertThat(transactions.getByHash(tx.getHash())).isEmpty();
+  }
+
+  protected void assertEvicted(final PendingTransaction tx) {
+    assertThat(evictCollector.getEvictedTransactions()).contains(tx);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/BaseFeePrioritizedTransactionsTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/BaseFeePrioritizedTransactionsTest.java
new file mode 100644
index 00000000000..f21c62e9d96
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/BaseFeePrioritizedTransactionsTest.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.layered;
+
+import static org.hyperledger.besu.plugin.data.TransactionType.EIP1559;
+import static org.hyperledger.besu.plugin.data.TransactionType.FRONTIER;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.plugin.data.TransactionType;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+import java.util.Random;
+import java.util.function.BiFunction;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import org.junit.jupiter.api.Test;
+
+public class BaseFeePrioritizedTransactionsTest extends AbstractPrioritizedTransactionsTestBase {
+
+  private static final Random randomizeTxType = new Random();
+
+  @Override
+  AbstractPrioritizedTransactions getSorter(
+      final TransactionPoolConfiguration poolConfig,
+      final TransactionsLayer nextLayer,
+      final TransactionPoolMetrics txPoolMetrics,
+      final BiFunction<PendingTransaction, PendingTransaction, Boolean>
+          transactionReplacementTester) {
+
+    return new BaseFeePrioritizedTransactions(
+        poolConfig,
+        this::mockBlockHeader,
+        nextLayer,
+        txPoolMetrics,
+        transactionReplacementTester,
+        FeeMarket.london(0L));
+  }
+
+  @Override
+  protected BlockHeader mockBlockHeader() {
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getBaseFee()).thenReturn(Optional.of(Wei.ONE));
+    return blockHeader;
+  }
+
+  @Override
+  protected Transaction createTransaction(
+      final long nonce, final Wei maxGasPrice, final KeyPair keys) {
+
+    return createTransaction(
+        randomizeTxType.nextBoolean() ? EIP1559 : FRONTIER, nonce, maxGasPrice, keys);
+  }
+
+  protected Transaction createTransaction(
+      final TransactionType type, final long nonce, final Wei maxGasPrice, final KeyPair keys) {
+
+    var tx = new TransactionTestFixture().value(Wei.of(nonce)).nonce(nonce).type(type);
+    if (type.supports1559FeeMarket()) {
+      tx.maxFeePerGas(Optional.of(maxGasPrice))
+          .maxPriorityFeePerGas(Optional.of(maxGasPrice.divide(10)));
+    } else {
+      tx.gasPrice(maxGasPrice);
+    }
+    return tx.createTransaction(keys);
+  }
+
+  @Override
+  protected Transaction createTransactionReplacement(
+      final Transaction originalTransaction, final KeyPair keys) {
+    return createTransaction(
+        originalTransaction.getType(),
+        originalTransaction.getNonce(),
+        originalTransaction.getMaxGasPrice().multiply(2),
+        keys);
+  }
+
+  @Test
+  public void shouldPrioritizePriorityFeeThenTimeAddedToPoolOnlyEIP1559Txs() {
+    shouldPrioritizePriorityFeeThenTimeAddedToPoolSameTypeTxs(EIP1559);
+  }
+
+  @Test
+  public void shouldPrioritizeGasPriceThenTimeAddedToPoolOnlyFrontierTxs() {
+    shouldPrioritizePriorityFeeThenTimeAddedToPoolSameTypeTxs(FRONTIER);
+  }
+
+  @Test
+  public void shouldPrioritizeEffectivePriorityFeeThenTimeAddedToPoolOnMixedTypes() {
+    final var nextBlockBaseFee = Optional.of(Wei.ONE);
+
+    final PendingTransaction highGasPriceTransaction =
+        createRemotePendingTransaction(createTransaction(0, Wei.of(100), KEYS1));
+
+    final List<PendingTransaction> lowValueTxs =
+        IntStream.range(0, MAX_TRANSACTIONS)
+            .mapToObj(
+                i ->
+                    new PendingTransaction.Remote(
+                        createTransaction(
+                            0, Wei.of(10), SIGNATURE_ALGORITHM.get().generateKeyPair())))
+            .collect(Collectors.toUnmodifiableList());
+
+    final var lowestPriorityFee =
+        lowValueTxs.stream()
+            .sorted(
+                Comparator.comparing(
+                    pt -> pt.getTransaction().getEffectivePriorityFeePerGas(nextBlockBaseFee)))
+            .findFirst()
+            .get()
+            .getTransaction()
+            .getEffectivePriorityFeePerGas(nextBlockBaseFee);
+
+    final var firstLowValueTx =
+        lowValueTxs.stream()
+            .filter(
+                pt ->
+                    pt.getTransaction()
+                        .getEffectivePriorityFeePerGas(nextBlockBaseFee)
+                        .equals(lowestPriorityFee))
+            .findFirst()
+            .get();
+
+    shouldPrioritizeValueThenTimeAddedToPool(
+        lowValueTxs.iterator(), highGasPriceTransaction, firstLowValueTx);
+  }
+
+  private void shouldPrioritizePriorityFeeThenTimeAddedToPoolSameTypeTxs(
+      final TransactionType transactionType) {
+    final PendingTransaction highGasPriceTransaction =
+        createRemotePendingTransaction(createTransaction(0, Wei.of(100), KEYS1));
+
+    final var lowValueTxs =
+        IntStream.range(0, MAX_TRANSACTIONS)
+            .mapToObj(
+                i ->
+                    createRemotePendingTransaction(
+                        createTransaction(
+                            transactionType,
+                            0,
+                            Wei.of(10),
+                            0,
+                            SIGNATURE_ALGORITHM.get().generateKeyPair())))
+            .collect(Collectors.toUnmodifiableList());
+
+    shouldPrioritizeValueThenTimeAddedToPool(
+        lowValueTxs.iterator(), highGasPriceTransaction, lowValueTxs.get(0));
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/BaseTransactionPoolTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/BaseTransactionPoolTest.java
new file mode 100644
index 00000000000..defafb1b369
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/BaseTransactionPoolTest.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.layered;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
+import org.hyperledger.besu.ethereum.core.Util;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.metrics.StubMetricsSystem;
+import org.hyperledger.besu.plugin.data.TransactionType;
+
+import java.util.Optional;
+import java.util.Random;
+
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
+import org.apache.tuweni.bytes.Bytes;
+
+public class BaseTransactionPoolTest {
+
+  protected static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+  protected static final KeyPair KEYS1 = SIGNATURE_ALGORITHM.get().generateKeyPair();
+  protected static final KeyPair KEYS2 = SIGNATURE_ALGORITHM.get().generateKeyPair();
+  protected static final Address SENDER1 = Util.publicKeyToAddress(KEYS1.getPublicKey());
+  protected static final Address SENDER2 = Util.publicKeyToAddress(KEYS2.getPublicKey());
+
+  private static final Random randomizeTxType = new Random();
+
+  protected final Transaction transaction0 = createTransaction(0);
+  protected final Transaction transaction1 = createTransaction(1);
+  protected final Transaction transaction2 = createTransaction(2);
+
+  protected final StubMetricsSystem metricsSystem = new StubMetricsSystem();
+
+  protected Transaction createTransaction(final long nonce) {
+    return createTransaction(nonce, Wei.of(5000L), KEYS1);
+  }
+
+  protected Transaction createTransaction(final long nonce, final KeyPair keys) {
+    return createTransaction(nonce, Wei.of(5000L), keys);
+  }
+
+  protected Transaction createTransaction(final long nonce, final Wei maxGasPrice) {
+    return createTransaction(nonce, maxGasPrice, KEYS1);
+  }
+
+  protected Transaction createTransaction(final long nonce, final int payloadSize) {
+    return createTransaction(nonce, Wei.of(5000L), payloadSize, KEYS1);
+  }
+
+  protected Transaction createTransaction(
+      final long nonce, final Wei maxGasPrice, final KeyPair keys) {
+    return createTransaction(nonce, maxGasPrice, 0, keys);
+  }
+
+  protected Transaction createEIP1559Transaction(
+      final long nonce, final KeyPair keys, final int gasFeeMultiplier) {
+    return createTransaction(
+        TransactionType.EIP1559, nonce, Wei.of(5000L).multiply(gasFeeMultiplier), 0, keys);
+  }
+
+  protected Transaction createTransaction(
+      final long nonce, final Wei maxGasPrice, final int payloadSize, final KeyPair keys) {
+
+    // ToDo 4844: include BLOB tx here
+    final TransactionType txType = TransactionType.values()[randomizeTxType.nextInt(3)];
+
+    return createTransaction(txType, nonce, maxGasPrice, payloadSize, keys);
+  }
+
+  protected Transaction createTransaction(
+      final TransactionType type,
+      final long nonce,
+      final Wei maxGasPrice,
+      final int payloadSize,
+      final KeyPair keys) {
+    return prepareTransaction(type, nonce, maxGasPrice, payloadSize).createTransaction(keys);
+  }
+
+  protected TransactionTestFixture prepareTransaction(
+      final TransactionType type, final long nonce, final Wei maxGasPrice, final int payloadSize) {
+
+    var tx =
+        new TransactionTestFixture()
+            .to(Optional.of(Address.fromHexString("0x634316eA0EE79c701c6F67C53A4C54cBAfd2316d")))
+            .value(Wei.of(nonce))
+            .nonce(nonce)
+            .type(type);
+    if (payloadSize > 0) {
+      var payloadBytes = Bytes.repeat((byte) 1, payloadSize);
+      tx.payload(payloadBytes);
+    }
+    if (type.supports1559FeeMarket()) {
+      tx.maxFeePerGas(Optional.of(maxGasPrice))
+          .maxPriorityFeePerGas(Optional.of(maxGasPrice.divide(10)));
+    } else {
+      tx.gasPrice(maxGasPrice);
+    }
+    return tx;
+  }
+
+  protected Transaction createTransactionReplacement(
+      final Transaction originalTransaction, final KeyPair keys) {
+    return createTransaction(
+        originalTransaction.getType(),
+        originalTransaction.getNonce(),
+        originalTransaction.getMaxGasPrice().multiply(2),
+        0,
+        keys);
+  }
+
+  protected PendingTransaction createRemotePendingTransaction(final Transaction transaction) {
+    return new PendingTransaction.Remote(transaction);
+  }
+
+  protected PendingTransaction createLocalPendingTransaction(final Transaction transaction) {
+    return new PendingTransaction.Local(transaction);
+  }
+
+  protected void assertTransactionPending(
+      final PendingTransactions transactions, final Transaction t) {
+    assertThat(transactions.getTransactionByHash(t.getHash())).contains(t);
+  }
+
+  protected void assertTransactionNotPending(
+      final PendingTransactions transactions, final Transaction t) {
+    assertThat(transactions.getTransactionByHash(t.getHash())).isEmpty();
+  }
+
+  protected void assertNoNextNonceForSender(
+      final PendingTransactions pendingTransactions, final Address sender) {
+    assertThat(pendingTransactions.getNextNonceForSender(sender)).isEmpty();
+  }
+
+  protected void assertNextNonceForSender(
+      final PendingTransactions pendingTransactions, final Address sender1, final int i) {
+    assertThat(pendingTransactions.getNextNonceForSender(sender1)).isPresent().hasValue(i);
+  }
+
+  protected void addLocalTransactions(
+      final PendingTransactions sorter, final Account sender, final long... nonces) {
+    for (final long nonce : nonces) {
+      sorter.addLocalTransaction(createTransaction(nonce), Optional.of(sender));
+    }
+  }
+
+  protected long getAddedCount(final String source, final String layer) {
+    return metricsSystem.getCounterValue(TransactionPoolMetrics.ADDED_COUNTER_NAME, source, layer);
+  }
+
+  protected long getRemovedCount(final String source, final String operation, final String layer) {
+    return metricsSystem.getCounterValue(
+        TransactionPoolMetrics.REMOVED_COUNTER_NAME, source, operation, layer);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/EvictCollectorLayer.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/EvictCollectorLayer.java
new file mode 100644
index 00000000000..27f478d172c
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/EvictCollectorLayer.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.layered;
+
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class EvictCollectorLayer extends EndLayer {
+  static final String LAYER_NAME = "evict-collector";
+  final List<PendingTransaction> evictedTxs = new ArrayList<>();
+
+  public EvictCollectorLayer(final TransactionPoolMetrics metrics) {
+    super(metrics);
+  }
+
+  @Override
+  public String name() {
+    return LAYER_NAME;
+  }
+
+  @Override
+  public TransactionAddedResult add(final PendingTransaction pendingTransaction, final int gap) {
+    final var res = super.add(pendingTransaction, gap);
+    evictedTxs.add(pendingTransaction);
+    return res;
+  }
+
+  public List<PendingTransaction> getEvictedTransactions() {
+    return evictedTxs;
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/GasPricePrioritizedTransactionsTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/GasPricePrioritizedTransactionsTest.java
new file mode 100644
index 00000000000..e41130f4f6e
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/GasPricePrioritizedTransactionsTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.layered;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.function.BiFunction;
+import java.util.stream.IntStream;
+
+import org.junit.jupiter.api.Test;
+
+public class GasPricePrioritizedTransactionsTest extends AbstractPrioritizedTransactionsTestBase {
+
+  @Override
+  AbstractPrioritizedTransactions getSorter(
+      final TransactionPoolConfiguration poolConfig,
+      final TransactionsLayer nextLayer,
+      final TransactionPoolMetrics txPoolMetrics,
+      final BiFunction<PendingTransaction, PendingTransaction, Boolean>
+          transactionReplacementTester) {
+
+    return new GasPricePrioritizedTransactions(
+        poolConfig, nextLayer, txPoolMetrics, transactionReplacementTester);
+  }
+
+  @Override
+  protected BlockHeader mockBlockHeader() {
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getBaseFee()).thenReturn(Optional.empty());
+    return blockHeader;
+  }
+
+  @Override
+  protected Transaction createTransaction(
+      final long transactionNumber, final Wei maxGasPrice, final KeyPair keys) {
+    return new TransactionTestFixture()
+        .value(Wei.of(transactionNumber))
+        .nonce(transactionNumber)
+        .gasPrice(maxGasPrice)
+        .createTransaction(keys);
+  }
+
+  @Override
+  protected Transaction createTransactionReplacement(
+      final Transaction originalTransaction, final KeyPair keys) {
+    return createTransaction(
+        originalTransaction.getNonce(), originalTransaction.getMaxGasPrice().multiply(2), keys);
+  }
+
+  @Test
+  public void shouldPrioritizeGasPriceThenTimeAddedToPool() {
+    final List<PendingTransaction> lowValueTxs =
+        IntStream.range(0, MAX_TRANSACTIONS)
+            .mapToObj(
+                i ->
+                    createRemotePendingTransaction(
+                        createTransaction(
+                            0, Wei.of(10), SIGNATURE_ALGORITHM.get().generateKeyPair())))
+            .toList();
+
+    final PendingTransaction highGasPriceTransaction =
+        createRemotePendingTransaction(createTransaction(0, Wei.of(100), KEYS1));
+
+    shouldPrioritizeValueThenTimeAddedToPool(
+        lowValueTxs.iterator(), highGasPriceTransaction, lowValueTxs.get(0));
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/LayeredPendingTransactionsLegacyTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/LayeredPendingTransactionsLegacyTest.java
new file mode 100644
index 00000000000..c1659446336
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/LayeredPendingTransactionsLegacyTest.java
@@ -0,0 +1,241 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.layered;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+import static java.util.stream.Collectors.toList;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.INVALID_TRANSACTION_FORMAT;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.REPLAY_PROTECTED_SIGNATURE_REQUIRED;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.ExecutionContextTestFixture;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
+import org.hyperledger.besu.ethereum.eth.transactions.AbstractTransactionsLayeredPendingTransactionsTest;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.plugin.data.TransactionType;
+
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.BiFunction;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@SuppressWarnings("unchecked")
+@RunWith(MockitoJUnitRunner.class)
+public class LayeredPendingTransactionsLegacyTest
+    extends AbstractTransactionsLayeredPendingTransactionsTest {
+
+  @Override
+  protected PendingTransactions createPendingTransactionsSorter(
+      final TransactionPoolConfiguration poolConfig,
+      final BiFunction<PendingTransaction, PendingTransaction, Boolean>
+          transactionReplacementTester) {
+
+    final var txPoolMetrics = new TransactionPoolMetrics(metricsSystem);
+    return new LayeredPendingTransactions(
+        poolConfig,
+        new GasPricePrioritizedTransactions(
+            poolConfig, new EndLayer(txPoolMetrics), txPoolMetrics, transactionReplacementTester));
+  }
+
+  @Override
+  protected Transaction createTransaction(
+      final int nonce, final Optional<BigInteger> maybeChainId) {
+    return createBaseTransaction(nonce).chainId(maybeChainId).createTransaction(KEY_PAIR1);
+  }
+
+  @Override
+  protected Transaction createTransaction(final int nonce, final Wei maxPrice) {
+    return createBaseTransaction(nonce).gasPrice(maxPrice).createTransaction(KEY_PAIR1);
+  }
+
+  @Override
+  protected TransactionTestFixture createBaseTransaction(final int nonce) {
+    return new TransactionTestFixture()
+        .nonce(nonce)
+        .gasLimit(blockGasLimit)
+        .type(TransactionType.FRONTIER);
+  }
+
+  @Override
+  protected ExecutionContextTestFixture createExecutionContextTestFixture() {
+    return ExecutionContextTestFixture.create();
+  }
+
+  @Override
+  protected FeeMarket getFeeMarket() {
+    return FeeMarket.legacy();
+  }
+
+  @Override
+  protected Block appendBlock(
+      final Difficulty difficulty,
+      final BlockHeader parentBlock,
+      final Transaction... transactionsToAdd) {
+    final List<Transaction> transactionList = asList(transactionsToAdd);
+    final Block block =
+        new Block(
+            new BlockHeaderTestFixture()
+                .difficulty(difficulty)
+                .gasLimit(parentBlock.getGasLimit())
+                .parentHash(parentBlock.getHash())
+                .number(parentBlock.getNumber() + 1)
+                .buildHeader(),
+            new BlockBody(transactionList, emptyList()));
+    final List<TransactionReceipt> transactionReceipts =
+        transactionList.stream()
+            .map(transaction -> new TransactionReceipt(1, 1, emptyList(), Optional.empty()))
+            .collect(toList());
+    blockchain.appendBlock(block, transactionReceipts);
+    return block;
+  }
+
+  @Test
+  public void
+      addLocalTransaction_strictReplayProtectionOn_txWithoutChainId_chainIdIsConfigured_protectionNotSupportedAtCurrentBlock() {
+    protocolSupportsTxReplayProtection(1337, false);
+    transactionPool = createTransactionPool(b -> b.strictTransactionReplayProtectionEnabled(true));
+    final Transaction tx = createTransactionWithoutChainId(0);
+    givenTransactionIsValid(tx);
+
+    addAndAssertLocalTransactionValid(tx);
+  }
+
+  @Test
+  public void
+      addRemoteTransactions_strictReplayProtectionOff_txWithoutChainId_chainIdIsConfigured() {
+    protocolSupportsTxReplayProtection(1337, true);
+    transactionPool = createTransactionPool(b -> b.strictTransactionReplayProtectionEnabled(false));
+    final Transaction tx = createTransactionWithoutChainId(0);
+    givenTransactionIsValid(tx);
+
+    addAndAssertRemoteTransactionValid(tx);
+  }
+
+  @Test
+  public void addLocalTransaction_strictReplayProtectionOff_txWithoutChainId_chainIdIsConfigured() {
+    protocolSupportsTxReplayProtection(1337, true);
+    transactionPool = createTransactionPool(b -> b.strictTransactionReplayProtectionEnabled(false));
+    final Transaction tx = createTransactionWithoutChainId(0);
+    givenTransactionIsValid(tx);
+
+    addAndAssertLocalTransactionValid(tx);
+  }
+
+  @Test
+  public void addLocalTransaction_strictReplayProtectionOn_txWithoutChainId_chainIdIsConfigured() {
+    protocolSupportsTxReplayProtection(1337, true);
+    transactionPool = createTransactionPool(b -> b.strictTransactionReplayProtectionEnabled(true));
+    final Transaction tx = createTransactionWithoutChainId(0);
+    givenTransactionIsValid(tx);
+
+    addAndAssertLocalTransactionInvalid(tx, REPLAY_PROTECTED_SIGNATURE_REQUIRED);
+  }
+
+  @Test
+  public void
+      addRemoteTransactions_strictReplayProtectionOn_txWithoutChainId_chainIdIsConfigured() {
+    protocolSupportsTxReplayProtection(1337, true);
+    transactionPool = createTransactionPool(b -> b.strictTransactionReplayProtectionEnabled(true));
+    final Transaction tx = createTransactionWithoutChainId(0);
+    givenTransactionIsValid(tx);
+
+    addAndAssertRemoteTransactionValid(tx);
+  }
+
+  @Test
+  public void
+      addLocalTransaction_strictReplayProtectionOn_txWithoutChainId_chainIdIsNotConfigured() {
+    protocolDoesNotSupportTxReplayProtection();
+    transactionPool = createTransactionPool(b -> b.strictTransactionReplayProtectionEnabled(true));
+    final Transaction tx = createTransactionWithoutChainId(0);
+    givenTransactionIsValid(tx);
+
+    addAndAssertLocalTransactionValid(tx);
+  }
+
+  @Test
+  public void
+      addRemoteTransactions_strictReplayProtectionOn_txWithoutChainId_chainIdIsNotConfigured() {
+    protocolDoesNotSupportTxReplayProtection();
+    transactionPool = createTransactionPool(b -> b.strictTransactionReplayProtectionEnabled(true));
+    final Transaction tx = createTransactionWithoutChainId(0);
+    givenTransactionIsValid(tx);
+
+    addAndAssertRemoteTransactionValid(tx);
+  }
+
+  @Test
+  public void shouldIgnoreEIP1559TransactionWhenNotAllowed() {
+    final Transaction transaction =
+        createBaseTransaction(1)
+            .type(TransactionType.EIP1559)
+            .maxFeePerGas(Optional.of(Wei.of(100L)))
+            .maxPriorityFeePerGas(Optional.of(Wei.of(50L)))
+            .gasLimit(10)
+            .gasPrice(null)
+            .createTransaction(KEY_PAIR1);
+
+    givenTransactionIsValid(transaction);
+
+    addAndAssertLocalTransactionInvalid(transaction, INVALID_TRANSACTION_FORMAT);
+  }
+
+  @Test
+  public void shouldAcceptZeroGasPriceFrontierTransactionsWhenMining() {
+    when(miningParameters.isMiningEnabled()).thenReturn(true);
+
+    final Transaction transaction = createTransaction(0, Wei.ZERO);
+
+    givenTransactionIsValid(transaction);
+
+    addAndAssertLocalTransactionValid(transaction);
+  }
+
+  @Test
+  public void shouldAcceptZeroGasPriceTransactionWhenMinGasPriceIsZero() {
+    when(miningParameters.getMinTransactionGasPrice()).thenReturn(Wei.ZERO);
+
+    final Transaction transaction = createTransaction(0, Wei.ZERO);
+
+    givenTransactionIsValid(transaction);
+
+    addAndAssertLocalTransactionValid(transaction);
+  }
+
+  private Transaction createTransactionWithoutChainId(final int nonce) {
+    return createTransaction(nonce, Optional.empty());
+  }
+
+  private void protocolDoesNotSupportTxReplayProtection() {
+    when(protocolSchedule.getChainId()).thenReturn(Optional.empty());
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/LayeredPendingTransactionsLondonTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/LayeredPendingTransactionsLondonTest.java
new file mode 100644
index 00000000000..9be50ea03ca
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/LayeredPendingTransactionsLondonTest.java
@@ -0,0 +1,294 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.layered;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
+import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.config.StubGenesisConfigOptions;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockBody;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
+import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.ethereum.core.ExecutionContextTestFixture;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
+import org.hyperledger.besu.ethereum.eth.transactions.AbstractTransactionsLayeredPendingTransactionsTest;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpecAdapters;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.plugin.data.TransactionType;
+
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
+import org.junit.Test;
+
+public class LayeredPendingTransactionsLondonTest
+    extends AbstractTransactionsLayeredPendingTransactionsTest {
+
+  private static final Wei BASE_FEE_FLOOR = Wei.of(7L);
+
+  @Override
+  protected PendingTransactions createPendingTransactionsSorter(
+      final TransactionPoolConfiguration poolConfig,
+      final BiFunction<PendingTransaction, PendingTransaction, Boolean>
+          transactionReplacementTester) {
+
+    final var txPoolMetrics = new TransactionPoolMetrics(metricsSystem);
+    return new LayeredPendingTransactions(
+        poolConfig,
+        new BaseFeePrioritizedTransactions(
+            poolConfig,
+            protocolContext.getBlockchain()::getChainHeadHeader,
+            new EndLayer(txPoolMetrics),
+            txPoolMetrics,
+            transactionReplacementTester,
+            FeeMarket.london(0L)));
+  }
+
+  @Override
+  protected Transaction createTransaction(
+      final int nonce, final Optional<BigInteger> maybeChainId) {
+    return createBaseTransaction(nonce).chainId(maybeChainId).createTransaction(KEY_PAIR1);
+  }
+
+  @Override
+  protected Transaction createTransaction(final int nonce, final Wei maxPrice) {
+    return createBaseTransaction(nonce)
+        .maxFeePerGas(Optional.of(maxPrice))
+        .maxPriorityFeePerGas(Optional.of(maxPrice.divide(5L)))
+        .createTransaction(KEY_PAIR1);
+  }
+
+  @Override
+  protected TransactionTestFixture createBaseTransaction(final int nonce) {
+    return new TransactionTestFixture()
+        .nonce(nonce)
+        .gasLimit(blockGasLimit)
+        .gasPrice(null)
+        .maxFeePerGas(Optional.of(Wei.of(5000L)))
+        .maxPriorityFeePerGas(Optional.of(Wei.of(1000L)))
+        .type(TransactionType.EIP1559);
+  }
+
+  @Override
+  protected ExecutionContextTestFixture createExecutionContextTestFixture() {
+    final ProtocolSchedule protocolSchedule =
+        new ProtocolScheduleBuilder(
+                new StubGenesisConfigOptions().londonBlock(0L).baseFeePerGas(10L),
+                BigInteger.valueOf(1),
+                ProtocolSpecAdapters.create(0, Function.identity()),
+                new PrivacyParameters(),
+                false,
+                EvmConfiguration.DEFAULT)
+            .createProtocolSchedule();
+    final ExecutionContextTestFixture executionContextTestFixture =
+        ExecutionContextTestFixture.builder().protocolSchedule(protocolSchedule).build();
+
+    final Block block =
+        new Block(
+            new BlockHeaderTestFixture()
+                .gasLimit(
+                    executionContextTestFixture
+                        .getBlockchain()
+                        .getChainHeadBlock()
+                        .getHeader()
+                        .getGasLimit())
+                .difficulty(Difficulty.ONE)
+                .baseFeePerGas(Wei.of(10L))
+                .parentHash(executionContextTestFixture.getBlockchain().getChainHeadHash())
+                .number(executionContextTestFixture.getBlockchain().getChainHeadBlockNumber() + 1)
+                .buildHeader(),
+            new BlockBody(List.of(), List.of()));
+    executionContextTestFixture.getBlockchain().appendBlock(block, List.of());
+
+    return executionContextTestFixture;
+  }
+
+  @Override
+  protected FeeMarket getFeeMarket() {
+    return FeeMarket.london(0L, Optional.of(BASE_FEE_FLOOR));
+  }
+
+  @Override
+  protected Block appendBlock(
+      final Difficulty difficulty,
+      final BlockHeader parentBlock,
+      final Transaction... transactionsToAdd) {
+    final List<Transaction> transactionList = asList(transactionsToAdd);
+    final Block block =
+        new Block(
+            new BlockHeaderTestFixture()
+                .baseFeePerGas(Wei.of(10L))
+                .gasLimit(parentBlock.getGasLimit())
+                .difficulty(difficulty)
+                .parentHash(parentBlock.getHash())
+                .number(parentBlock.getNumber() + 1)
+                .buildHeader(),
+            new BlockBody(transactionList, emptyList()));
+    final List<TransactionReceipt> transactionReceipts =
+        transactionList.stream()
+            .map(transaction -> new TransactionReceipt(1, 1, emptyList(), Optional.empty()))
+            .collect(toList());
+    blockchain.appendBlock(block, transactionReceipts);
+    return block;
+  }
+
+  @Test
+  public void shouldAcceptZeroGasPriceFrontierTxsWhenMinGasPriceIsZeroAndLondonWithZeroBaseFee() {
+    when(miningParameters.getMinTransactionGasPrice()).thenReturn(Wei.ZERO);
+    when(protocolSpec.getFeeMarket()).thenReturn(FeeMarket.london(0, Optional.of(Wei.ZERO)));
+    whenBlockBaseFeeIs(Wei.ZERO);
+
+    final Transaction frontierTransaction = createFrontierTransaction(0, Wei.ZERO);
+
+    givenTransactionIsValid(frontierTransaction);
+    addAndAssertLocalTransactionValid(frontierTransaction);
+  }
+
+  @Test
+  public void shouldAcceptZeroGasPrice1559TxsWhenMinGasPriceIsZeroAndLondonWithZeroBaseFee() {
+    when(miningParameters.getMinTransactionGasPrice()).thenReturn(Wei.ZERO);
+    when(protocolSpec.getFeeMarket()).thenReturn(FeeMarket.london(0, Optional.of(Wei.ZERO)));
+    whenBlockBaseFeeIs(Wei.ZERO);
+
+    final Transaction transaction = createTransaction(0, Wei.ZERO);
+
+    givenTransactionIsValid(transaction);
+    addAndAssertLocalTransactionValid(transaction);
+  }
+
+  @Test
+  public void shouldAcceptBaseFeeFloorGasPriceFrontierTransactionsWhenMining() {
+    final Transaction frontierTransaction = createFrontierTransaction(0, BASE_FEE_FLOOR);
+
+    givenTransactionIsValid(frontierTransaction);
+
+    addAndAssertLocalTransactionValid(frontierTransaction);
+  }
+
+  @Test
+  public void shouldRejectRemote1559TxsWhenMaxFeePerGasBelowMinGasPrice() {
+    final Wei genesisBaseFee = Wei.of(100L);
+    final Wei minGasPrice = Wei.of(200L);
+    final Wei lastBlockBaseFee = minGasPrice.add(50L);
+    final Wei txMaxFeePerGas = minGasPrice.subtract(1L);
+
+    assertThat(
+            add1559TxAndGetPendingTxsCount(
+                genesisBaseFee, minGasPrice, lastBlockBaseFee, txMaxFeePerGas, false))
+        .isEqualTo(0);
+  }
+
+  @Test
+  public void shouldAcceptRemote1559TxsWhenMaxFeePerGasIsAtLeastEqualToMinGasPrice() {
+    final Wei genesisBaseFee = Wei.of(100L);
+    final Wei minGasPrice = Wei.of(200L);
+    final Wei lastBlockBaseFee = minGasPrice.add(50L);
+    final Wei txMaxFeePerGas = minGasPrice;
+
+    assertThat(
+            add1559TxAndGetPendingTxsCount(
+                genesisBaseFee, minGasPrice, lastBlockBaseFee, txMaxFeePerGas, false))
+        .isEqualTo(1);
+  }
+
+  @Test
+  public void shouldRejectLocal1559TxsWhenMaxFeePerGasBelowMinGasPrice() {
+    final Wei genesisBaseFee = Wei.of(100L);
+    final Wei minGasPrice = Wei.of(200L);
+    final Wei lastBlockBaseFee = minGasPrice.add(50L);
+    final Wei txMaxFeePerGas = minGasPrice.subtract(1L);
+
+    assertThat(
+            add1559TxAndGetPendingTxsCount(
+                genesisBaseFee, minGasPrice, lastBlockBaseFee, txMaxFeePerGas, true))
+        .isEqualTo(0);
+  }
+
+  @Test
+  public void shouldAcceptLocal1559TxsWhenMaxFeePerGasIsAtLeastEqualToMinMinGasPrice() {
+    final Wei genesisBaseFee = Wei.of(100L);
+    final Wei minGasPrice = Wei.of(200L);
+    final Wei lastBlockBaseFee = minGasPrice.add(50L);
+    final Wei txMaxFeePerGas = minGasPrice;
+
+    assertThat(
+            add1559TxAndGetPendingTxsCount(
+                genesisBaseFee, minGasPrice, lastBlockBaseFee, txMaxFeePerGas, true))
+        .isEqualTo(1);
+  }
+
+  private int add1559TxAndGetPendingTxsCount(
+      final Wei genesisBaseFee,
+      final Wei minGasPrice,
+      final Wei lastBlockBaseFee,
+      final Wei txMaxFeePerGas,
+      final boolean isLocal) {
+    when(miningParameters.getMinTransactionGasPrice()).thenReturn(minGasPrice);
+    when(protocolSpec.getFeeMarket()).thenReturn(FeeMarket.london(0, Optional.of(genesisBaseFee)));
+    whenBlockBaseFeeIs(lastBlockBaseFee);
+
+    final Transaction transaction = createTransaction(0, txMaxFeePerGas);
+
+    givenTransactionIsValid(transaction);
+
+    if (isLocal) {
+      transactionPool.addTransactionViaApi(transaction);
+    } else {
+      transactionPool.addRemoteTransactions(List.of(transaction));
+    }
+
+    return transactions.size();
+  }
+
+  private void whenBlockBaseFeeIs(final Wei baseFee) {
+    final BlockHeader header =
+        BlockHeaderBuilder.fromHeader(blockchain.getChainHeadHeader())
+            .baseFee(baseFee)
+            .blockHeaderFunctions(new MainnetBlockHeaderFunctions())
+            .parentHash(blockchain.getChainHeadHash())
+            .buildBlockHeader();
+    blockchain.appendBlock(new Block(header, BlockBody.empty()), emptyList());
+  }
+
+  private Transaction createFrontierTransaction(final int transactionNumber, final Wei gasPrice) {
+    return new TransactionTestFixture()
+        .nonce(transactionNumber)
+        .gasPrice(gasPrice)
+        .gasLimit(blockGasLimit)
+        .type(TransactionType.FRONTIER)
+        .createTransaction(KEY_PAIR1);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/LayeredPendingTransactionsTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/LayeredPendingTransactionsTest.java
new file mode 100644
index 00000000000..4573a00b124
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/LayeredPendingTransactionsTest.java
@@ -0,0 +1,784 @@
+/*
+ * Copyright Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.layered;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.ADDED;
+import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.ALREADY_KNOWN;
+import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.NONCE_TOO_FAR_IN_FUTURE_FOR_SENDER;
+import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.REJECTED_UNDERPRICED_REPLACEMENT;
+import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.DROPPED;
+import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.REPLACED;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.GAS_PRICE_BELOW_CURRENT_BASE_FEE;
+import static org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason.UPFRONT_COST_EXCEEDS_BALANCE;
+import static org.hyperledger.besu.plugin.data.TransactionSelectionResult.BLOCK_FULL;
+import static org.hyperledger.besu.plugin.data.TransactionSelectionResult.BLOCK_OCCUPANCY_ABOVE_THRESHOLD;
+import static org.hyperledger.besu.plugin.data.TransactionSelectionResult.CURRENT_TX_PRICE_BELOW_MIN;
+import static org.hyperledger.besu.plugin.data.TransactionSelectionResult.DATA_PRICE_BELOW_CURRENT_MIN;
+import static org.hyperledger.besu.plugin.data.TransactionSelectionResult.SELECTED;
+import static org.hyperledger.besu.plugin.data.TransactionSelectionResult.TX_TOO_LARGE_FOR_REMAINING_GAS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactionAddedListener;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactionDroppedListener;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolReplacementHandler;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.plugin.data.TransactionSelectionResult;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.function.BiFunction;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class LayeredPendingTransactionsTest extends BaseTransactionPoolTest {
+
+  protected static final int MAX_TRANSACTIONS = 5;
+  protected static final int MAX_CAPACITY_BYTES = 10_000;
+  protected static final int LIMITED_TRANSACTIONS_BY_SENDER = 4;
+  protected static final String REMOTE = "remote";
+  protected static final String LOCAL = "local";
+  protected final PendingTransactionAddedListener listener =
+      mock(PendingTransactionAddedListener.class);
+  protected final PendingTransactionDroppedListener droppedListener =
+      mock(PendingTransactionDroppedListener.class);
+
+  private final TransactionPoolConfiguration poolConf =
+      ImmutableTransactionPoolConfiguration.builder()
+          .maxPrioritizedTransactions(MAX_TRANSACTIONS)
+          .maxFutureBySender(MAX_TRANSACTIONS)
+          .pendingTransactionsLayerMaxCapacityBytes(MAX_CAPACITY_BYTES)
+          .build();
+
+  private final TransactionPoolConfiguration senderLimitedConfig =
+      ImmutableTransactionPoolConfiguration.builder()
+          .maxPrioritizedTransactions(MAX_TRANSACTIONS)
+          .maxFutureBySender(LIMITED_TRANSACTIONS_BY_SENDER)
+          .pendingTransactionsLayerMaxCapacityBytes(MAX_CAPACITY_BYTES)
+          .build();
+  private LayeredPendingTransactions senderLimitedTransactions;
+  private LayeredPendingTransactions pendingTransactions;
+  private CreatedLayers senderLimitedLayers;
+  private CreatedLayers layers;
+  private TransactionPoolMetrics txPoolMetrics;
+
+  private static BlockHeader mockBlockHeader() {
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getBaseFee()).thenReturn(Optional.of(Wei.of(100)));
+    return blockHeader;
+  }
+
+  private CreatedLayers createLayers(final TransactionPoolConfiguration poolConfig) {
+
+    final BiFunction<PendingTransaction, PendingTransaction, Boolean> transactionReplacementTester =
+        (t1, t2) ->
+            new TransactionPoolReplacementHandler(poolConf.getPriceBump())
+                .shouldReplace(t1, t2, mockBlockHeader());
+
+    final EvictCollectorLayer evictCollector = new EvictCollectorLayer(txPoolMetrics);
+
+    final SparseTransactions sparseTransactions =
+        new SparseTransactions(
+            poolConfig, evictCollector, txPoolMetrics, transactionReplacementTester);
+
+    final ReadyTransactions readyTransactions =
+        new ReadyTransactions(
+            poolConfig, sparseTransactions, txPoolMetrics, transactionReplacementTester);
+
+    final BaseFeePrioritizedTransactions prioritizedTransactions =
+        new BaseFeePrioritizedTransactions(
+            poolConfig,
+            LayeredPendingTransactionsTest::mockBlockHeader,
+            readyTransactions,
+            txPoolMetrics,
+            transactionReplacementTester,
+            FeeMarket.london(0L));
+    return new CreatedLayers(
+        prioritizedTransactions, readyTransactions, sparseTransactions, evictCollector);
+  }
+
+  @BeforeEach
+  public void setup() {
+
+    txPoolMetrics = new TransactionPoolMetrics(metricsSystem);
+
+    layers = createLayers(poolConf);
+    senderLimitedLayers = createLayers(senderLimitedConfig);
+
+    pendingTransactions = new LayeredPendingTransactions(poolConf, layers.prioritizedTransactions);
+
+    senderLimitedTransactions =
+        new LayeredPendingTransactions(
+            senderLimitedConfig, senderLimitedLayers.prioritizedTransactions);
+  }
+
+  @Test
+  public void returnExclusivelyLocalTransactionsWhenAppropriate() {
+    final Transaction localTransaction0 = createTransaction(0, KEYS2);
+    pendingTransactions.addLocalTransaction(localTransaction0, Optional.empty());
+    assertThat(pendingTransactions.size()).isEqualTo(1);
+
+    pendingTransactions.addRemoteTransaction(transaction0, Optional.empty());
+    assertThat(pendingTransactions.size()).isEqualTo(2);
+
+    pendingTransactions.addRemoteTransaction(transaction1, Optional.empty());
+    assertThat(pendingTransactions.size()).isEqualTo(3);
+
+    final List<Transaction> localTransactions = pendingTransactions.getLocalTransactions();
+    assertThat(localTransactions.size()).isEqualTo(1);
+  }
+
+  @Test
+  public void addRemoteTransactions() {
+    pendingTransactions.addRemoteTransaction(transaction0, Optional.empty());
+    assertThat(pendingTransactions.size()).isEqualTo(1);
+
+    assertThat(getAddedCount(REMOTE, layers.prioritizedTransactions.name())).isEqualTo(1);
+
+    pendingTransactions.addRemoteTransaction(transaction1, Optional.empty());
+    assertThat(pendingTransactions.size()).isEqualTo(2);
+
+    assertThat(getAddedCount(REMOTE, layers.prioritizedTransactions.name())).isEqualTo(2);
+  }
+
+  @Test
+  public void getNotPresentTransaction() {
+    assertThat(pendingTransactions.getTransactionByHash(Hash.EMPTY_TRIE_HASH)).isEmpty();
+  }
+
+  @Test
+  public void getTransactionByHash() {
+    pendingTransactions.addRemoteTransaction(transaction0, Optional.empty());
+    assertTransactionPending(pendingTransactions, transaction0);
+  }
+
+  @Test
+  public void evictTransactionsWhenSizeLimitExceeded() {
+    final List<Transaction> firstTxs = new ArrayList<>(MAX_TRANSACTIONS);
+
+    pendingTransactions.subscribeDroppedTransactions(droppedListener);
+
+    for (int i = 0; i < MAX_TRANSACTIONS; i++) {
+      final Account sender = mock(Account.class);
+      when(sender.getNonce()).thenReturn((long) i);
+      final var tx =
+          createTransaction(
+              i,
+              Wei.of((i + 1) * 100L),
+              (int) poolConf.getPendingTransactionsLayerMaxCapacityBytes() + 1,
+              SIGNATURE_ALGORITHM.get().generateKeyPair());
+      pendingTransactions.addRemoteTransaction(tx, Optional.of(sender));
+      firstTxs.add(tx);
+      assertTransactionPending(pendingTransactions, tx);
+    }
+
+    assertThat(pendingTransactions.size()).isEqualTo(MAX_TRANSACTIONS);
+
+    final Transaction lastBigTx =
+        createTransaction(
+            0,
+            Wei.of(100_000L),
+            (int) poolConf.getPendingTransactionsLayerMaxCapacityBytes(),
+            SIGNATURE_ALGORITHM.get().generateKeyPair());
+    final Account lastSender = mock(Account.class);
+    when(lastSender.getNonce()).thenReturn(0L);
+    pendingTransactions.addRemoteTransaction(lastBigTx, Optional.of(lastSender));
+    assertTransactionPending(pendingTransactions, lastBigTx);
+
+    assertTransactionNotPending(pendingTransactions, firstTxs.get(0));
+    assertThat(getRemovedCount(REMOTE, DROPPED.label(), layers.evictedCollector.name()))
+        .isEqualTo(1);
+    assertThat(layers.evictedCollector.getEvictedTransactions())
+        .map(PendingTransaction::getTransaction)
+        .contains(firstTxs.get(0));
+    verify(droppedListener).onTransactionDropped(firstTxs.get(0));
+  }
+
+  @Test
+  public void addTransactionForMultipleSenders() {
+    final var transactionSenderA = createTransaction(0, KEYS1);
+    final var transactionSenderB = createTransaction(0, KEYS2);
+    assertThat(pendingTransactions.addRemoteTransaction(transactionSenderA, Optional.empty()))
+        .isEqualTo(ADDED);
+    assertTransactionPending(pendingTransactions, transactionSenderA);
+    assertThat(pendingTransactions.addRemoteTransaction(transactionSenderB, Optional.empty()))
+        .isEqualTo(ADDED);
+    assertTransactionPending(pendingTransactions, transactionSenderB);
+  }
+
+  @Test
+  public void dropIfTransactionTooFarInFutureForTheSender() {
+    final var futureTransaction =
+        createTransaction(poolConf.getTxPoolMaxFutureTransactionByAccount() + 1);
+    assertThat(pendingTransactions.addRemoteTransaction(futureTransaction, Optional.empty()))
+        .isEqualTo(NONCE_TOO_FAR_IN_FUTURE_FOR_SENDER);
+    assertTransactionNotPending(pendingTransactions, futureTransaction);
+  }
+
+  @Test
+  public void dropAlreadyConfirmedTransaction() {
+    final Account sender = mock(Account.class);
+    when(sender.getNonce()).thenReturn(5L);
+
+    final Transaction oldTransaction = createTransaction(2);
+    assertThat(pendingTransactions.addRemoteTransaction(oldTransaction, Optional.of(sender)))
+        .isEqualTo(ALREADY_KNOWN);
+    assertThat(pendingTransactions.size()).isEqualTo(0);
+    assertTransactionNotPending(pendingTransactions, oldTransaction);
+  }
+
+  @Test
+  public void notifyListenerWhenRemoteTransactionAdded() {
+    pendingTransactions.subscribePendingTransactions(listener);
+
+    pendingTransactions.addRemoteTransaction(transaction0, Optional.empty());
+
+    verify(listener).onTransactionAdded(transaction0);
+  }
+
+  @Test
+  public void notifyListenerWhenLocalTransactionAdded() {
+    pendingTransactions.subscribePendingTransactions(listener);
+
+    pendingTransactions.addLocalTransaction(transaction0, Optional.empty());
+
+    verify(listener).onTransactionAdded(transaction0);
+  }
+
+  @Test
+  public void notNotifyListenerAfterUnsubscribe() {
+    final long id = pendingTransactions.subscribePendingTransactions(listener);
+
+    pendingTransactions.addRemoteTransaction(transaction0, Optional.empty());
+
+    verify(listener).onTransactionAdded(transaction0);
+
+    pendingTransactions.unsubscribePendingTransactions(id);
+
+    pendingTransactions.addRemoteTransaction(transaction1, Optional.empty());
+
+    verifyNoMoreInteractions(listener);
+  }
+
+  @ParameterizedTest
+  @MethodSource
+  public void selectTransactionsUntilSelectorRequestsNoMore(
+      final TransactionSelectionResult selectionResult) {
+    pendingTransactions.addRemoteTransaction(transaction0, Optional.empty());
+    pendingTransactions.addRemoteTransaction(transaction1, Optional.empty());
+
+    final List<Transaction> parsedTransactions = new ArrayList<>();
+    pendingTransactions.selectTransactions(
+        transaction -> {
+          parsedTransactions.add(transaction);
+          return selectionResult;
+        });
+
+    assertThat(parsedTransactions.size()).isEqualTo(1);
+    assertThat(parsedTransactions.get(0)).isEqualTo(transaction0);
+  }
+
+  static Stream<TransactionSelectionResult> selectTransactionsUntilSelectorRequestsNoMore() {
+    return Stream.of(BLOCK_OCCUPANCY_ABOVE_THRESHOLD, BLOCK_OCCUPANCY_ABOVE_THRESHOLD, BLOCK_FULL);
+  }
+
+  @Test
+  public void selectTransactionsUntilPendingIsEmpty() {
+    pendingTransactions.addRemoteTransaction(transaction0, Optional.empty());
+    pendingTransactions.addRemoteTransaction(transaction1, Optional.empty());
+
+    final List<Transaction> parsedTransactions = new ArrayList<>();
+    pendingTransactions.selectTransactions(
+        transaction -> {
+          parsedTransactions.add(transaction);
+          return SELECTED;
+        });
+
+    assertThat(parsedTransactions.size()).isEqualTo(2);
+    assertThat(parsedTransactions.get(0)).isEqualTo(transaction0);
+    assertThat(parsedTransactions.get(1)).isEqualTo(transaction1);
+  }
+
+  @Test
+  public void notSelectReplacedTransaction() {
+    final Transaction transaction1 = createTransaction(0, KEYS1);
+    final Transaction transaction1b = createTransactionReplacement(transaction1, KEYS1);
+
+    pendingTransactions.addRemoteTransaction(transaction1, Optional.empty());
+    pendingTransactions.addRemoteTransaction(transaction1b, Optional.empty());
+
+    final List<Transaction> parsedTransactions = new ArrayList<>();
+    pendingTransactions.selectTransactions(
+        transaction -> {
+          parsedTransactions.add(transaction);
+          return SELECTED;
+        });
+
+    assertThat(parsedTransactions).containsExactly(transaction1b);
+  }
+
+  @Test
+  public void selectTransactionsFromSameSenderInNonceOrder() {
+    final Transaction transaction0 = createTransaction(0, KEYS1);
+    final Transaction transaction1 = createTransaction(1, KEYS1);
+    final Transaction transaction2 = createTransaction(2, KEYS1);
+
+    // add out of order
+    pendingTransactions.addLocalTransaction(transaction2, Optional.empty());
+    pendingTransactions.addLocalTransaction(transaction1, Optional.empty());
+    pendingTransactions.addLocalTransaction(transaction0, Optional.empty());
+
+    final List<Transaction> iterationOrder = new ArrayList<>(3);
+    pendingTransactions.selectTransactions(
+        transaction -> {
+          iterationOrder.add(transaction);
+          return SELECTED;
+        });
+
+    assertThat(iterationOrder).containsExactly(transaction0, transaction1, transaction2);
+  }
+
+  @ParameterizedTest
+  @MethodSource
+  public void ignoreSenderTransactionsAfterASkippedOne(
+      final TransactionSelectionResult skipSelectionResult) {
+    final Transaction transaction0a = createTransaction(0, Wei.of(20), KEYS1);
+    final Transaction transaction1a = createTransaction(1, Wei.of(20), KEYS1);
+    final Transaction transaction2a = createTransaction(2, Wei.of(20), KEYS1);
+    final Transaction transaction0b = createTransaction(0, Wei.of(10), KEYS2);
+
+    pendingTransactions.addLocalTransaction(transaction0a, Optional.empty());
+    pendingTransactions.addLocalTransaction(transaction1a, Optional.empty());
+    pendingTransactions.addLocalTransaction(transaction2a, Optional.empty());
+    pendingTransactions.addLocalTransaction(transaction0b, Optional.empty());
+
+    final List<Transaction> iterationOrder = new ArrayList<>(3);
+    pendingTransactions.selectTransactions(
+        transaction -> {
+          iterationOrder.add(transaction);
+          // pretending that the 2nd tx of the 1st sender is not selected
+          return transaction.getNonce() == 1 ? skipSelectionResult : SELECTED;
+        });
+
+    // the 3rd tx of the 1st must not be processed, since the 2nd is skipped
+    // but the 2nd sender must not be affected
+    assertThat(iterationOrder).containsExactly(transaction0a, transaction1a, transaction0b);
+  }
+
+  static Stream<TransactionSelectionResult> ignoreSenderTransactionsAfterASkippedOne() {
+    return Stream.of(
+        CURRENT_TX_PRICE_BELOW_MIN,
+        DATA_PRICE_BELOW_CURRENT_MIN,
+        TX_TOO_LARGE_FOR_REMAINING_GAS,
+        TransactionSelectionResult.invalidTransient(GAS_PRICE_BELOW_CURRENT_BASE_FEE.name()),
+        TransactionSelectionResult.invalid(UPFRONT_COST_EXCEEDS_BALANCE.name()));
+  }
+
+  @Test
+  public void notForceNonceOrderWhenSendersDiffer() {
+    final Account sender2 = mock(Account.class);
+    when(sender2.getNonce()).thenReturn(1L);
+
+    final Transaction transactionSender1 = createTransaction(0, Wei.of(10), KEYS1);
+    final Transaction transactionSender2 = createTransaction(1, Wei.of(200), KEYS2);
+
+    pendingTransactions.addLocalTransaction(transactionSender1, Optional.empty());
+    pendingTransactions.addLocalTransaction(transactionSender2, Optional.of(sender2));
+
+    final List<Transaction> iterationOrder = new ArrayList<>(2);
+    pendingTransactions.selectTransactions(
+        transaction -> {
+          iterationOrder.add(transaction);
+          return SELECTED;
+        });
+
+    assertThat(iterationOrder).containsExactly(transactionSender2, transactionSender1);
+  }
+
+  @Test
+  public void invalidTransactionIsDeletedFromPendingTransactions() {
+    pendingTransactions.addRemoteTransaction(transaction0, Optional.empty());
+    pendingTransactions.addRemoteTransaction(transaction1, Optional.empty());
+
+    final List<Transaction> parsedTransactions = new ArrayList<>(1);
+    pendingTransactions.selectTransactions(
+        transaction -> {
+          parsedTransactions.add(transaction);
+          return TransactionSelectionResult.invalid(UPFRONT_COST_EXCEEDS_BALANCE.name());
+        });
+
+    // only the first is processed since not being selected will automatically skip the processing
+    // all the other txs from the same sender
+
+    assertThat(parsedTransactions).containsExactly(transaction0);
+    assertThat(pendingTransactions.getPendingTransactions())
+        .map(PendingTransaction::getTransaction)
+        .containsExactly(transaction1);
+  }
+
+  @Test
+  public void temporarilyInvalidTransactionIsKeptInPendingTransactions() {
+    pendingTransactions.addRemoteTransaction(transaction0, Optional.empty());
+
+    final List<Transaction> parsedTransactions = new ArrayList<>(1);
+    pendingTransactions.selectTransactions(
+        transaction -> {
+          parsedTransactions.add(transaction);
+          return TransactionSelectionResult.invalidTransient(
+              GAS_PRICE_BELOW_CURRENT_BASE_FEE.name());
+        });
+
+    assertThat(parsedTransactions).containsExactly(transaction0);
+    assertThat(pendingTransactions.getPendingTransactions())
+        .map(PendingTransaction::getTransaction)
+        .containsExactly(transaction0);
+  }
+
+  @Test
+  public void returnEmptyOptionalAsMaximumNonceWhenNoTransactionsPresent() {
+    assertThat(pendingTransactions.getNextNonceForSender(SENDER1)).isEmpty();
+  }
+
+  @Test
+  public void replaceTransactionWithSameSenderAndNonce() {
+    final Transaction transaction1 = createTransaction(0, Wei.of(20), KEYS1);
+    final Transaction transaction1b = createTransactionReplacement(transaction1, KEYS1);
+    final Transaction transaction2 = createTransaction(1, Wei.of(10), KEYS1);
+    assertThat(pendingTransactions.addRemoteTransaction(transaction1, Optional.empty()))
+        .isEqualTo(ADDED);
+    assertThat(pendingTransactions.addRemoteTransaction(transaction2, Optional.empty()))
+        .isEqualTo(ADDED);
+    assertThat(
+            pendingTransactions
+                .addRemoteTransaction(transaction1b, Optional.empty())
+                .isReplacement())
+        .isTrue();
+
+    assertTransactionNotPending(pendingTransactions, transaction1);
+    assertTransactionPending(pendingTransactions, transaction1b);
+    assertTransactionPending(pendingTransactions, transaction2);
+    assertThat(pendingTransactions.size()).isEqualTo(2);
+    assertThat(getAddedCount(REMOTE, layers.prioritizedTransactions.name())).isEqualTo(3);
+    assertThat(getRemovedCount(REMOTE, REPLACED.label(), layers.prioritizedTransactions.name()))
+        .isEqualTo(1);
+  }
+
+  @Test
+  public void replaceTransactionWithSameSenderAndNonce_multipleReplacements() {
+    final int replacedTxCount = 5;
+    final List<Transaction> replacedTransactions = new ArrayList<>(replacedTxCount);
+    Transaction duplicateTx = createTransaction(0, Wei.of(50), KEYS1);
+    for (int i = 0; i < replacedTxCount; i++) {
+      replacedTransactions.add(duplicateTx);
+      pendingTransactions.addRemoteTransaction(duplicateTx, Optional.empty());
+      duplicateTx = createTransactionReplacement(duplicateTx, KEYS1);
+    }
+
+    final Transaction independentTx = createTransaction(1, Wei.ONE, KEYS1);
+    assertThat(pendingTransactions.addRemoteTransaction(independentTx, Optional.empty()))
+        .isEqualTo(ADDED);
+    assertThat(
+            pendingTransactions.addRemoteTransaction(duplicateTx, Optional.empty()).isReplacement())
+        .isTrue();
+
+    // All txs except the last duplicate should be removed
+    replacedTransactions.forEach(tx -> assertTransactionNotPending(pendingTransactions, tx));
+    assertTransactionPending(pendingTransactions, duplicateTx);
+    // Tx with distinct nonce should be maintained
+    assertTransactionPending(pendingTransactions, independentTx);
+
+    assertThat(pendingTransactions.size()).isEqualTo(2);
+    assertThat(getAddedCount(REMOTE, layers.prioritizedTransactions.name()))
+        .isEqualTo(replacedTxCount + 2);
+    assertThat(getRemovedCount(REMOTE, REPLACED.label(), layers.prioritizedTransactions.name()))
+        .isEqualTo(replacedTxCount);
+  }
+
+  @Test
+  public void
+      replaceTransactionWithSameSenderAndNonce_multipleReplacementsAddedLocallyAndRemotely() {
+    final int replacedTxCount = 5;
+    final List<Transaction> replacedTransactions = new ArrayList<>(replacedTxCount);
+    int remoteDuplicateCount = 0;
+    Transaction replacingTx = createTransaction(0, KEYS1);
+    for (int i = 0; i < replacedTxCount; i++) {
+      replacedTransactions.add(replacingTx);
+      if (i % 2 == 0) {
+        pendingTransactions.addRemoteTransaction(replacingTx, Optional.empty());
+        remoteDuplicateCount++;
+      } else {
+        pendingTransactions.addLocalTransaction(replacingTx, Optional.empty());
+      }
+      replacingTx = createTransactionReplacement(replacingTx, KEYS1);
+    }
+
+    final Transaction independentTx = createTransaction(1);
+    assertThat(
+            pendingTransactions.addLocalTransaction(replacingTx, Optional.empty()).isReplacement())
+        .isTrue();
+    assertThat(pendingTransactions.addRemoteTransaction(independentTx, Optional.empty()))
+        .isEqualTo(ADDED);
+
+    // All txs except the last duplicate should be removed
+    replacedTransactions.forEach(tx -> assertTransactionNotPending(pendingTransactions, tx));
+    assertTransactionPending(pendingTransactions, replacingTx);
+
+    // Tx with distinct nonce should be maintained
+    assertTransactionPending(pendingTransactions, independentTx);
+
+    final int localDuplicateCount = replacedTxCount - remoteDuplicateCount;
+    assertThat(pendingTransactions.size()).isEqualTo(2);
+    assertThat(getAddedCount(REMOTE, layers.prioritizedTransactions.name()))
+        .isEqualTo(remoteDuplicateCount + 1);
+    assertThat(getAddedCount(LOCAL, layers.prioritizedTransactions.name()))
+        .isEqualTo(localDuplicateCount + 1);
+    assertThat(getRemovedCount(REMOTE, REPLACED.label(), layers.prioritizedTransactions.name()))
+        .isEqualTo(remoteDuplicateCount);
+    assertThat(getRemovedCount(LOCAL, REPLACED.label(), layers.prioritizedTransactions.name()))
+        .isEqualTo(localDuplicateCount);
+  }
+
+  @Test
+  public void notReplaceTransactionWithSameSenderAndNonceWhenGasPriceIsLower() {
+    final Transaction transaction1 = createTransaction(0, Wei.of(2));
+    final Transaction transaction1b = createTransaction(0, Wei.ONE);
+    assertThat(pendingTransactions.addRemoteTransaction(transaction1, Optional.empty()))
+        .isEqualTo(ADDED);
+
+    pendingTransactions.subscribePendingTransactions(listener);
+    assertThat(pendingTransactions.addRemoteTransaction(transaction1b, Optional.empty()))
+        .isEqualTo(REJECTED_UNDERPRICED_REPLACEMENT);
+
+    assertTransactionNotPending(pendingTransactions, transaction1b);
+    assertTransactionPending(pendingTransactions, transaction1);
+    assertThat(pendingTransactions.size()).isEqualTo(1);
+    verifyNoInteractions(listener);
+  }
+
+  @Test
+  public void trackNextNonceForEachSender() {
+    // first sender consecutive txs: 0->1->2
+    final Account firstSender = mock(Account.class);
+    when(firstSender.getNonce()).thenReturn(0L);
+    when(firstSender.getAddress()).thenReturn(SENDER1);
+    assertNoNextNonceForSender(pendingTransactions, SENDER1);
+    pendingTransactions.addRemoteTransaction(createTransaction(0, KEYS1), Optional.of(firstSender));
+    assertNextNonceForSender(pendingTransactions, SENDER1, 1);
+
+    pendingTransactions.addRemoteTransaction(createTransaction(1, KEYS1), Optional.of(firstSender));
+    assertNextNonceForSender(pendingTransactions, SENDER1, 2);
+
+    pendingTransactions.addRemoteTransaction(createTransaction(2, KEYS1), Optional.of(firstSender));
+    assertNextNonceForSender(pendingTransactions, SENDER1, 3);
+
+    // second sender not in orders: 3->0->2->1
+    final Account secondSender = mock(Account.class);
+    when(secondSender.getNonce()).thenReturn(0L);
+    when(secondSender.getAddress()).thenReturn(SENDER2);
+    assertNoNextNonceForSender(pendingTransactions, SENDER2);
+    pendingTransactions.addRemoteTransaction(
+        createTransaction(3, KEYS2), Optional.of(secondSender));
+    assertNoNextNonceForSender(pendingTransactions, SENDER2);
+
+    pendingTransactions.addRemoteTransaction(
+        createTransaction(0, KEYS2), Optional.of(secondSender));
+    assertNextNonceForSender(pendingTransactions, SENDER2, 1);
+
+    pendingTransactions.addRemoteTransaction(
+        createTransaction(2, KEYS2), Optional.of(secondSender));
+    assertNextNonceForSender(pendingTransactions, SENDER2, 1);
+
+    // tx 1 will fill the nonce gap and all txs will be ready
+    pendingTransactions.addRemoteTransaction(
+        createTransaction(1, KEYS2), Optional.of(secondSender));
+    assertNextNonceForSender(pendingTransactions, SENDER2, 4);
+  }
+
+  @Test
+  public void correctNonceIsReturned() {
+    final Account sender = mock(Account.class);
+    when(sender.getNonce()).thenReturn(1L);
+    assertThat(pendingTransactions.getNextNonceForSender(transaction2.getSender())).isEmpty();
+    // since tx 3 is missing, 4 is sparse,
+    // note that 0 is already known since sender nonce is 1
+    addLocalTransactions(pendingTransactions, sender, 0, 1, 2, 4);
+    assertThat(pendingTransactions.size()).isEqualTo(3);
+    assertThat(pendingTransactions.getNextNonceForSender(transaction2.getSender()))
+        .isPresent()
+        .hasValue(3);
+
+    // tx 3 arrives and is added, while 4 is moved to ready
+    addLocalTransactions(pendingTransactions, sender, 3);
+    assertThat(pendingTransactions.size()).isEqualTo(4);
+    assertThat(pendingTransactions.getNextNonceForSender(transaction2.getSender()))
+        .isPresent()
+        .hasValue(5);
+
+    // when 5 is added, the pool is full, and so 6 and 7 are dropped since too far in future
+    addLocalTransactions(pendingTransactions, sender, 5, 6, 7);
+    assertThat(pendingTransactions.size()).isEqualTo(5);
+
+    // assert that transactions are pruned by account from the latest future nonce first
+    assertThat(pendingTransactions.getNextNonceForSender(transaction2.getSender()))
+        .isPresent()
+        .hasValue(6);
+  }
+
+  @Test
+  public void correctNonceIsReturnedForSenderLimitedPool() {
+    final Account sender = mock(Account.class);
+    when(sender.getNonce()).thenReturn(1L);
+
+    assertThat(senderLimitedTransactions.getNextNonceForSender(transaction2.getSender())).isEmpty();
+    // since tx 3 is missing, 4 is sparse,
+    // note that 0 is already known since sender nonce is 1
+    addLocalTransactions(senderLimitedTransactions, sender, 0, 1, 2, 4);
+    assertThat(senderLimitedTransactions.size()).isEqualTo(3);
+    assertThat(senderLimitedTransactions.getNextNonceForSender(transaction2.getSender()))
+        .isPresent()
+        .hasValue(3);
+
+    // tx 3 arrives and is added, while 4 is moved to ready
+    addLocalTransactions(senderLimitedTransactions, sender, 3);
+    assertThat(senderLimitedTransactions.size()).isEqualTo(4);
+    assertThat(senderLimitedTransactions.getNextNonceForSender(transaction2.getSender()))
+        .isPresent()
+        .hasValue(5);
+
+    // for sender max 4 txs are allowed, so 5, 6 and 7 are dropped since too far in future
+    addLocalTransactions(senderLimitedTransactions, sender, 5, 6, 7);
+    assertThat(senderLimitedTransactions.size()).isEqualTo(4);
+
+    // assert that we drop txs with future nonce first
+    assertThat(senderLimitedTransactions.getNextNonceForSender(transaction2.getSender()))
+        .isPresent()
+        .hasValue(5);
+  }
+
+  @Test
+  public void correctNonceIsReturnedWithRepeatedTransactions() {
+    assertThat(pendingTransactions.getNextNonceForSender(transaction2.getSender())).isEmpty();
+    final Account sender = mock(Account.class);
+    addLocalTransactions(pendingTransactions, sender, 0, 1, 2, 1, 0, 4);
+    assertThat(pendingTransactions.getNextNonceForSender(transaction2.getSender()))
+        .isPresent()
+        .hasValue(3);
+    addLocalTransactions(pendingTransactions, sender, 3);
+  }
+
+  @Test
+  public void shouldNotIncrementAddedCounterWhenRemoteTransactionAlreadyPresent() {
+    pendingTransactions.addLocalTransaction(transaction0, Optional.empty());
+    assertThat(pendingTransactions.size()).isEqualTo(1);
+    assertThat(getAddedCount(LOCAL, layers.prioritizedTransactions.name())).isEqualTo(1);
+    assertThat(getAddedCount(REMOTE, layers.prioritizedTransactions.name())).isZero();
+
+    assertThat(pendingTransactions.addRemoteTransaction(transaction0, Optional.empty()))
+        .isEqualTo(ALREADY_KNOWN);
+    assertThat(pendingTransactions.size()).isEqualTo(1);
+    assertThat(getAddedCount(LOCAL, layers.prioritizedTransactions.name())).isEqualTo(1);
+    assertThat(getAddedCount(REMOTE, layers.prioritizedTransactions.name())).isZero();
+  }
+
+  @Test
+  public void shouldNotIncrementAddedCounterWhenLocalTransactionAlreadyPresent() {
+    pendingTransactions.addRemoteTransaction(transaction0, Optional.empty());
+    assertThat(pendingTransactions.size()).isEqualTo(1);
+    assertThat(getAddedCount(LOCAL, layers.prioritizedTransactions.name())).isZero();
+    assertThat(getAddedCount(REMOTE, layers.prioritizedTransactions.name())).isEqualTo(1);
+
+    assertThat(pendingTransactions.addLocalTransaction(transaction0, Optional.empty()))
+        .isEqualTo(ALREADY_KNOWN);
+    assertThat(pendingTransactions.size()).isEqualTo(1);
+    assertThat(getAddedCount(LOCAL, layers.prioritizedTransactions.name())).isZero();
+    assertThat(getAddedCount(REMOTE, layers.prioritizedTransactions.name())).isEqualTo(1);
+  }
+
+  @Test
+  public void doNothingIfTransactionAlreadyPending() {
+    final var addedTxs = populateCache(1, 0);
+    assertThat(
+            pendingTransactions.addRemoteTransaction(
+                addedTxs[0].transaction, Optional.of(addedTxs[0].account)))
+        .isEqualTo(ALREADY_KNOWN);
+    assertTransactionPending(pendingTransactions, addedTxs[0].transaction);
+  }
+
+  @Test
+  public void returnsCorrectNextNonceWhenAddedTransactionsHaveGaps() {
+    final var addedTxs = populateCache(3, 0, 1);
+    assertThat(pendingTransactions.getNextNonceForSender(addedTxs[0].transaction.getSender()))
+        .isPresent()
+        .hasValue(1);
+  }
+
+  private TransactionAndAccount[] populateCache(final int numTxs, final long startingNonce) {
+    return populateCache(numTxs, KEYS1, startingNonce, OptionalLong.empty());
+  }
+
+  private TransactionAndAccount[] populateCache(
+      final int numTxs, final long startingNonce, final long missingNonce) {
+    return populateCache(numTxs, KEYS1, startingNonce, OptionalLong.of(missingNonce));
+  }
+
+  private TransactionAndAccount[] populateCache(
+      final int numTxs,
+      final KeyPair keys,
+      final long startingNonce,
+      final OptionalLong maybeGapNonce) {
+    final List<TransactionAndAccount> addedTransactions = new ArrayList<>(numTxs);
+    for (int i = 0; i < numTxs; i++) {
+      final long nonce = startingNonce + i;
+      if (maybeGapNonce.isEmpty() || maybeGapNonce.getAsLong() != nonce) {
+        final var transaction = createTransaction(nonce, keys);
+        final Account sender = mock(Account.class);
+        when(sender.getNonce()).thenReturn(startingNonce);
+        final var res = pendingTransactions.addRemoteTransaction(transaction, Optional.of(sender));
+        assertTransactionPending(pendingTransactions, transaction);
+        assertThat(res).isEqualTo(ADDED);
+        addedTransactions.add(new TransactionAndAccount(transaction, sender));
+      }
+    }
+    return addedTransactions.toArray(TransactionAndAccount[]::new);
+  }
+
+  record TransactionAndAccount(Transaction transaction, Account account) {}
+
+  record CreatedLayers(
+      AbstractPrioritizedTransactions prioritizedTransactions,
+      ReadyTransactions readyTransactions,
+      SparseTransactions sparseTransactions,
+      EvictCollectorLayer evictedCollector) {}
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/LayersTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/LayersTest.java
new file mode 100644
index 00000000000..0137fa17c44
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/LayersTest.java
@@ -0,0 +1,1356 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.layered;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.eth.transactions.layered.LayersTest.Sender.S1;
+import static org.hyperledger.besu.ethereum.eth.transactions.layered.LayersTest.Sender.S2;
+import static org.hyperledger.besu.ethereum.eth.transactions.layered.LayersTest.Sender.S3;
+import static org.hyperledger.besu.ethereum.eth.transactions.layered.LayersTest.Sender.S4;
+import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.INVALIDATED;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Util;
+import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolReplacementHandler;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.evm.account.Account;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class LayersTest extends BaseTransactionPoolTest {
+  private static final int MAX_PRIO_TRANSACTIONS = 3;
+  private static final int MAX_FUTURE_FOR_SENDER = 10;
+
+  private final TransactionPoolConfiguration poolConfig =
+      ImmutableTransactionPoolConfiguration.builder()
+          .maxPrioritizedTransactions(MAX_PRIO_TRANSACTIONS)
+          .maxFutureBySender(MAX_FUTURE_FOR_SENDER)
+          .pendingTransactionsLayerMaxCapacityBytes(
+              new PendingTransaction.Remote(createEIP1559Transaction(0, KEYS1, 1)).memorySize() * 3)
+          .build();
+
+  private final TransactionPoolMetrics txPoolMetrics = new TransactionPoolMetrics(metricsSystem);
+
+  private final EvictCollectorLayer evictCollector = new EvictCollectorLayer(txPoolMetrics);
+  private final SparseTransactions sparseTransactions =
+      new SparseTransactions(
+          poolConfig, evictCollector, txPoolMetrics, this::transactionReplacementTester);
+
+  private final ReadyTransactions readyTransactions =
+      new ReadyTransactions(
+          poolConfig, sparseTransactions, txPoolMetrics, this::transactionReplacementTester);
+
+  private final BaseFeePrioritizedTransactions prioritizedTransactions =
+      new BaseFeePrioritizedTransactions(
+          poolConfig,
+          LayersTest::mockBlockHeader,
+          readyTransactions,
+          txPoolMetrics,
+          this::transactionReplacementTester,
+          FeeMarket.london(0L));
+
+  private final LayeredPendingTransactions pendingTransactions =
+      new LayeredPendingTransactions(poolConfig, prioritizedTransactions);
+
+  @AfterEach
+  void reset() {
+    pendingTransactions.reset();
+  }
+
+  @ParameterizedTest
+  @MethodSource("providerAddTransactions")
+  void addTransactions(final Scenario scenario) {
+    assertScenario(scenario);
+  }
+
+  @ParameterizedTest
+  @MethodSource("providerAddTransactionsMultipleSenders")
+  void addTransactionsMultipleSenders(final Scenario scenario) {
+    assertScenario(scenario);
+  }
+
+  @ParameterizedTest
+  @MethodSource("providerRemoveTransactions")
+  void removeTransactions(final Scenario scenario) {
+    assertScenario(scenario);
+  }
+
+  @ParameterizedTest
+  @MethodSource("providerInterleavedAddRemoveTransactions")
+  void interleavedAddRemoveTransactions(final Scenario scenario) {
+    assertScenario(scenario);
+  }
+
+  @ParameterizedTest
+  @MethodSource("providerBlockAdded")
+  void removeConfirmedTransactions(final Scenario scenario) {
+    assertScenario(scenario);
+  }
+
+  @ParameterizedTest
+  @MethodSource("providerNextNonceForSender")
+  void nextNonceForSender(final Scenario scenario) {
+    assertScenario(scenario);
+  }
+
+  @ParameterizedTest
+  @MethodSource("providerSelectTransactions")
+  void selectTransactions(final Scenario scenario) {
+    assertScenario(scenario);
+  }
+
+  @ParameterizedTest
+  @MethodSource("providerReorg")
+  void reorg(final Scenario scenario) {
+    assertScenario(scenario);
+  }
+
+  @ParameterizedTest
+  @MethodSource("providerAsyncWorldStateUpdates")
+  void asyncWorldStateUpdates(final Scenario scenario) {
+    assertScenario(scenario);
+  }
+
+  private void assertScenario(final Scenario scenario) {
+    scenario.execute(
+        pendingTransactions,
+        prioritizedTransactions,
+        readyTransactions,
+        sparseTransactions,
+        evictCollector);
+  }
+
+  static Stream<Arguments> providerAddTransactions() {
+    return Stream.of(
+        Arguments.of(
+            new Scenario("add first").addForSender(S1, 0).expectedPrioritizedForSender(S1, 0)),
+        Arguments.of(
+            new Scenario("add first sparse").addForSender(S1, 1).expectedSparseForSender(S1, 1)),
+        Arguments.of(
+            new Scenario("fill prioritized")
+                .addForSender(S1, 0, 1, 2)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)),
+        Arguments.of(
+            new Scenario("fill prioritized reverse")
+                .addForSender(S1, 2, 1, 0)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)),
+        Arguments.of(
+            new Scenario("fill prioritized mixed order 1 step by step")
+                .addForSender(S1, 2)
+                .expectedSparseForSender(S1, 2)
+                .addForSender(S1, 0)
+                .expectedPrioritizedForSender(S1, 0)
+                .expectedSparseForSender(S1, 2)
+                .addForSender(S1, 1)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedSparseForSenders()),
+        Arguments.of(
+            new Scenario("fill prioritized mixed order 2")
+                .addForSender(S1, 0, 2, 1)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)),
+        Arguments.of(
+            new Scenario("overflow to ready")
+                .addForSender(S1, 0, 1, 2, 3)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3)),
+        Arguments.of(
+            new Scenario("overflow to ready reverse")
+                .addForSender(S1, 3, 2, 1, 0)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3)),
+        Arguments.of(
+            new Scenario("overflow to ready mixed order 1")
+                .addForSender(S1, 3, 0, 2, 1)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3)),
+        Arguments.of(
+            new Scenario("overflow to ready mixed order 2")
+                .addForSender(S1, 0, 3, 1, 2)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3)),
+        Arguments.of(
+            new Scenario("overflow to sparse")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5, 6)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)
+                .expectedSparseForSender(S1, 6)),
+        Arguments.of(
+            new Scenario("overflow to sparse reverse")
+                .addForSender(S1, 6, 5, 4, 3, 2, 1, 0)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                // 4,5,6 are evicted since max capacity of sparse layer is 3 txs
+                .expectedReadyForSender(S1, 3)
+                .expectedDroppedForSender(S1, 4, 5, 6)),
+        Arguments.of(
+            new Scenario("overflow to sparse mixed order 1")
+                .addForSender(S1, 6, 0, 4, 1, 3, 2, 5)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)
+                .expectedSparseForSender(S1, 6)),
+        Arguments.of(
+            new Scenario("overflow to sparse mixed order 2")
+                .addForSender(S1, 0, 4, 6, 1, 5, 2, 3)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)
+                .expectedSparseForSender(S1, 6)),
+        Arguments.of(
+            new Scenario("overflow to sparse mixed order 3")
+                .addForSender(S1, 0, 1, 2, 3, 5, 6, 4)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)
+                .expectedSparseForSender(S1, 6)),
+        Arguments.of(
+            new Scenario("nonce gap to sparse 1")
+                .addForSender(S1, 0, 2)
+                .expectedPrioritizedForSender(S1, 0)
+                .expectedSparseForSender(S1, 2)),
+        Arguments.of(
+            new Scenario("nonce gap to sparse 2")
+                .addForSender(S1, 0, 1, 2, 3, 5)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3)
+                .expectedSparseForSender(S1, 5)),
+        Arguments.of(
+            new Scenario("fill sparse 1")
+                .addForSender(S1, 2, 3, 5)
+                .expectedSparseForSender(S1, 2, 3, 5)),
+        Arguments.of(
+            new Scenario("fill sparse 2")
+                .addForSender(S1, 5, 3, 2)
+                .expectedSparseForSender(S1, 5, 3, 2)),
+        Arguments.of(
+            new Scenario("overflow sparse 1")
+                .addForSender(S1, 1, 2, 3, 4)
+                .expectedSparseForSender(S1, 1, 2, 3)
+                .expectedDroppedForSender(S1, 4)),
+        Arguments.of(
+            new Scenario("overflow sparse 2")
+                .addForSender(S1, 4, 2, 3, 1)
+                .expectedSparseForSender(S1, 2, 3, 1)
+                .expectedDroppedForSender(S1, 4)),
+        Arguments.of(
+            new Scenario("overflow sparse 3")
+                .addForSender(S1, 0, 4, 2, 3, 5)
+                .expectedPrioritizedForSender(S1, 0)
+                .expectedSparseForSender(S1, 4, 2, 3)
+                .expectedDroppedForSender(S1, 5)));
+  }
+
+  static Stream<Arguments> providerAddTransactionsMultipleSenders() {
+    return Stream.of(
+        Arguments.of(
+            new Scenario("add first")
+                .addForSenders(S1, 0, S2, 0)
+                .expectedPrioritizedForSenders(S2, 0, S1, 0)),
+        Arguments.of(
+            new Scenario("add first sparse")
+                .addForSenders(S1, 1, S2, 2)
+                .expectedSparseForSenders(S1, 1, S2, 2)),
+        Arguments.of(
+            new Scenario("fill prioritized 1")
+                .addForSender(S1, 0, 1, 2)
+                .addForSender(S2, 0, 1, 2)
+                .expectedPrioritizedForSender(S2, 0, 1, 2)
+                .expectedReadyForSender(S1, 0, 1, 2)),
+        Arguments.of(
+            new Scenario("fill prioritized 2")
+                .addForSender(S2, 0, 1, 2)
+                .addForSender(S1, 0, 1, 2)
+                .expectedPrioritizedForSender(S2, 0, 1, 2)
+                .expectedReadyForSender(S1, 0, 1, 2)),
+        Arguments.of(
+            new Scenario("fill prioritized 3")
+                .addForSenders(S1, 0, S2, 0, S1, 1, S2, 1, S1, 2, S2, 2)
+                .expectedPrioritizedForSender(S2, 0, 1, 2)
+                .expectedReadyForSender(S1, 0, 1, 2)),
+        Arguments.of(
+            new Scenario("fill prioritized mixed order")
+                .addForSenders(S1, 2, S2, 1)
+                .expectedPrioritizedForSenders()
+                .expectedReadyForSenders()
+                .expectedSparseForSenders(S1, 2, S2, 1)
+                .addForSenders(S2, 2, S1, 0)
+                .expectedPrioritizedForSender(S1, 0)
+                .expectedReadyForSenders()
+                .expectedSparseForSenders(S1, 2, S2, 1, S2, 2)
+                .addForSenders(S1, 1)
+                .expectedPrioritizedForSenders(S1, 0, S1, 1, S1, 2)
+                .expectedReadyForSenders()
+                .expectedSparseForSenders(S2, 1, S2, 2)
+                .addForSenders(S2, 0)
+                // only S2[0] is prioritized because there is no space to try to fill gaps
+                .expectedPrioritizedForSenders(S2, 0, S1, 0, S1, 1)
+                .expectedReadyForSender(S1, 2)
+                .expectedSparseForSenders(S2, 1, S2, 2)
+                // confirm some S1 txs will promote S2 txs
+                .confirmedForSenders(S1, 0)
+                .expectedPrioritizedForSenders(S2, 0, S2, 1, S1, 1)
+                .expectedReadyForSenders(S2, 2, S1, 2)
+                .expectedSparseForSenders()
+                .confirmedForSenders(S1, 1)
+                .expectedPrioritizedForSenders(S2, 0, S2, 1, S2, 2)
+                .expectedReadyForSender(S1, 2)
+                .expectedSparseForSenders()
+                .confirmedForSenders(S2, 1)
+                .expectedPrioritizedForSenders(S2, 2, S1, 2)
+                .expectedReadyForSenders()
+                .expectedSparseForSenders()),
+        Arguments.of(
+            new Scenario("overflow to ready 1")
+                .addForSenders(S1, 0, S1, 1, S2, 0, S2, 1)
+                .expectedPrioritizedForSenders(S2, 0, S2, 1, S1, 0)
+                .expectedReadyForSender(S1, 1)),
+        Arguments.of(
+            new Scenario("overflow to ready 2")
+                .addForSenders(S2, 0, S2, 1, S1, 0, S1, 1)
+                .expectedPrioritizedForSenders(S2, 0, S2, 1, S1, 0)
+                .expectedReadyForSender(S1, 1)),
+        Arguments.of(
+            new Scenario("overflow to ready 3")
+                .addForSenders(S1, 0, S2, 0, S2, 1, S1, 1)
+                .expectedPrioritizedForSenders(S2, 0, S2, 1, S1, 0)
+                .expectedReadyForSender(S1, 1)),
+        Arguments.of(
+            new Scenario("overflow to ready reverse 1")
+                .addForSenders(S1, 1, S1, 0, S2, 1, S2, 0)
+                .expectedPrioritizedForSenders(S2, 0, S2, 1, S1, 0)
+                .expectedReadyForSender(S1, 1)),
+        Arguments.of(
+            new Scenario("overflow to ready reverse 2")
+                .addForSenders(S1, 1, S2, 1, S2, 0, S1, 0)
+                .expectedPrioritizedForSenders(S2, 0, S2, 1, S1, 0)
+                .expectedReadyForSender(S1, 1)),
+        Arguments.of(
+            new Scenario("overflow to ready mixed")
+                .addForSenders(S2, 1, S1, 0, S1, 1, S2, 0)
+                .expectedPrioritizedForSenders(S2, 0, S2, 1, S1, 0)
+                .expectedReadyForSender(S1, 1)),
+        Arguments.of(
+            new Scenario("overflow to sparse")
+                .addForSenders(S1, 0, S1, 1, S2, 0, S2, 1, S3, 0, S3, 1, S3, 2)
+                .expectedPrioritizedForSender(S3, 0, 1, 2)
+                .expectedReadyForSenders(S2, 0, S2, 1, S1, 0)
+                .expectedSparseForSender(S1, 1)),
+        Arguments.of(
+            new Scenario("overflow to sparse reverse")
+                .addForSenders(S3, 2, S3, 1, S3, 0, S2, 1, S2, 0, S1, 1, S1, 0)
+                .expectedPrioritizedForSender(S3, 0, 1, 2)
+                .expectedReadyForSenders(S2, 0, S2, 1, S1, 0)
+                .expectedSparseForSender(S1, 1)),
+        Arguments.of(
+            new Scenario("overflow to sparse mixed")
+                .addForSenders(S2, 0, S3, 2, S1, 1)
+                .expectedPrioritizedForSender(S2, 0)
+                .expectedReadyForSenders()
+                .expectedSparseForSenders(S3, 2, S1, 1)
+                .addForSenders(S2, 1)
+                .expectedPrioritizedForSenders(S2, 0, S2, 1)
+                .expectedReadyForSenders()
+                .expectedSparseForSenders(S3, 2, S1, 1)
+                .addForSenders(S3, 0)
+                .expectedPrioritizedForSenders(S3, 0, S2, 0, S2, 1)
+                .expectedReadyForSenders()
+                .expectedSparseForSenders(S3, 2, S1, 1)
+                .addForSenders(S1, 0)
+                .expectedPrioritizedForSenders(S3, 0, S2, 0, S2, 1)
+                .expectedReadyForSenders(S1, 0, S1, 1)
+                .expectedSparseForSender(S3, 2)
+                .addForSenders(S3, 1)
+                // ToDo: only S3[1] is prioritized because there is no space to try to fill gaps
+                .expectedPrioritizedForSenders(S3, 0, S3, 1, S2, 0)
+                .expectedReadyForSenders(S2, 1, S1, 0, S1, 1)
+                .expectedSparseForSender(S3, 2)
+                .addForSenders(S4, 0, S4, 1, S3, 3)
+                .expectedPrioritizedForSenders(S4, 0, S4, 1, S3, 0)
+                .expectedReadyForSenders(S3, 1, S2, 0, S2, 1)
+                .expectedSparseForSenders(S3, 2, S1, 1, S1, 0)
+                // ToDo: non optimal discard, worth to improve?
+                .expectedDroppedForSender(S3, 3)),
+        Arguments.of(
+            new Scenario("replacement cross layer")
+                .addForSenders(S2, 0, S3, 2, S1, 1, S2, 1, S3, 0, S1, 0, S3, 1)
+                // ToDo: only S3[1] is prioritized because there is no space to try to fill gaps
+                .expectedPrioritizedForSenders(S3, 0, S3, 1, S2, 0)
+                .expectedReadyForSenders(S2, 1, S1, 0, S1, 1)
+                .expectedSparseForSender(S3, 2)
+                .addForSenders(S3, 2) // added in prioritized, but replacement in sparse
+                .expectedPrioritizedForSenders(S3, 0, S3, 1, S3, 2)
+                .expectedReadyForSenders(S2, 0, S2, 1, S1, 0)
+                .expectedSparseForSender(S1, 1)));
+  }
+
+  static Stream<Arguments> providerRemoveTransactions() {
+    return Stream.of(
+        Arguments.of(new Scenario("remove not existing").removeForSender(S1, 0)),
+        Arguments.of(new Scenario("add/remove first").addForSender(S1, 0).removeForSender(S1, 0)),
+        Arguments.of(
+            new Scenario("add/remove first sparse").addForSender(S1, 1).removeForSender(S1, 1)),
+        Arguments.of(
+            new Scenario("fill/remove prioritized 1")
+                .addForSender(S1, 0, 1, 2)
+                .removeForSender(S1, 0, 1, 2)),
+        Arguments.of(
+            new Scenario("fill/remove prioritized 2")
+                .addForSender(S1, 0, 1, 2)
+                .removeForSender(S1, 2, 1, 0)),
+        Arguments.of(
+            new Scenario("fill/remove prioritized reverse 1")
+                .addForSender(S1, 2, 1, 0)
+                .removeForSender(S1, 0, 1, 2)),
+        Arguments.of(
+            new Scenario("fill/remove prioritized reverse 2")
+                .addForSender(S1, 2, 1, 0)
+                .removeForSender(S1, 2, 1, 0)),
+        Arguments.of(
+            new Scenario("fill/remove first prioritized")
+                .addForSender(S1, 0, 1, 2)
+                .removeForSender(S1, 0)
+                .expectedSparseForSender(S1, 1, 2)),
+        Arguments.of(
+            new Scenario("fill/remove last prioritized")
+                .addForSender(S1, 0, 1, 2)
+                .removeForSender(S1, 2)
+                .expectedPrioritizedForSender(S1, 0, 1)),
+        Arguments.of(
+            new Scenario("fill/remove middle prioritized")
+                .addForSender(S1, 0, 1, 2)
+                .removeForSender(S1, 1)
+                .expectedPrioritizedForSender(S1, 0)
+                .expectedSparseForSender(S1, 2)),
+        Arguments.of(
+            new Scenario("overflow to ready then remove 1")
+                .addForSender(S1, 0, 1, 2, 3)
+                .removeForSender(S1, 2)
+                .expectedPrioritizedForSender(S1, 0, 1)
+                .expectedSparseForSender(S1, 3)),
+        Arguments.of(
+            new Scenario("overflow to ready then remove 2")
+                .addForSender(S1, 0, 1, 2, 3, 4)
+                .removeForSender(S1, 4)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3)),
+        Arguments.of(
+            new Scenario("overflow to ready then remove 3")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5)
+                .removeForSender(S1, 4)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3)
+                .expectedSparseForSender(S1, 5)),
+        Arguments.of(
+            new Scenario("overflow to ready then remove 4")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5)
+                .removeForSender(S1, 3)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedSparseForSender(S1, 4, 5)),
+        Arguments.of(
+            new Scenario("overflow to ready then remove 5")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5)
+                .removeForSender(S1, 0)
+                .expectedSparseForSender(S1, 1, 2, 3)
+                .expectedDroppedForSender(S1, 4, 5)),
+        Arguments.of(
+            new Scenario("overflow to sparse then remove 1")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5, 6)
+                .removeForSender(S1, 6)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)),
+        Arguments.of(
+            new Scenario("overflow to sparse then remove 2")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5, 6)
+                .removeForSender(S1, 5)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4)
+                .expectedSparseForSender(S1, 6)),
+        Arguments.of(
+            new Scenario("overflow to sparse then remove 3")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5, 6)
+                .removeForSender(S1, 2)
+                .expectedPrioritizedForSender(S1, 0, 1)
+                .expectedSparseForSender(S1, 3, 4, 5)
+                .expectedDroppedForSender(S1, 6)),
+        Arguments.of(
+            new Scenario("overflow to sparse then remove 4")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5, 6, 7, 8)
+                .removeForSender(S1, 7)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)
+                .expectedSparseForSender(S1, 6, 8)),
+        Arguments.of(
+            new Scenario("overflow to sparse then remove 5")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5, 6, 7, 8)
+                .removeForSender(S1, 6)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)
+                .expectedSparseForSender(S1, 7, 8)),
+        Arguments.of(
+            new Scenario("overflow to sparse then remove 6")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5, 6, 7, 8)
+                .removeForSender(S1, 6)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)
+                .expectedSparseForSender(S1, 7, 8)),
+        Arguments.of(
+            new Scenario("overflow to sparse then remove 7")
+                .setAccountNonce(S1, 1)
+                .addForSender(S1, 1, 2, 3, 4, 5, 8)
+                .removeForSender(S1, 2)
+                .expectedPrioritizedForSender(S1, 1)
+                .expectedSparseForSender(S1, 3, 4, 5)
+                .expectedDroppedForSender(S1, 8)));
+  }
+
+  static Stream<Arguments> providerInterleavedAddRemoveTransactions() {
+    return Stream.of(
+        Arguments.of(
+            new Scenario("interleaved add/remove 1")
+                .addForSender(S1, 0)
+                .removeForSender(S1, 0)
+                .addForSender(S1, 0)
+                .expectedPrioritizedForSender(S1, 0)),
+        Arguments.of(
+            new Scenario("interleaved add/remove 2")
+                .addForSender(S1, 0)
+                .removeForSender(S1, 0)
+                .addForSender(S1, 1)
+                .expectedSparseForSender(S1, 1)),
+        Arguments.of(
+            new Scenario("interleaved add/remove 3")
+                .addForSender(S1, 0)
+                .removeForSender(S1, 0)
+                .addForSender(S1, 1, 0)
+                .expectedPrioritizedForSender(S1, 0, 1)));
+  }
+
+  static Stream<Arguments> providerBlockAdded() {
+    return Stream.of(
+        Arguments.of(new Scenario("confirmed not exist").confirmedForSenders(S1, 0)),
+        Arguments.of(
+            new Scenario("confirmed below existing lower nonce")
+                .addForSender(S1, 1)
+                .confirmedForSenders(S1, 0)
+                .expectedPrioritizedForSender(S1, 1)),
+        Arguments.of(
+            new Scenario("confirmed only one existing")
+                .addForSender(S1, 0)
+                .confirmedForSenders(S1, 0)),
+        Arguments.of(
+            new Scenario("confirmed above existing")
+                .addForSender(S1, 0)
+                .confirmedForSenders(S1, 1)),
+        Arguments.of(
+            new Scenario("confirmed some existing 1")
+                .addForSender(S1, 0, 1)
+                .confirmedForSenders(S1, 0)
+                .expectedPrioritizedForSender(S1, 1)),
+        Arguments.of(
+            new Scenario("confirmed some existing 2")
+                .addForSender(S1, 0, 1, 2)
+                .confirmedForSenders(S1, 1)
+                .expectedPrioritizedForSender(S1, 2)),
+        Arguments.of(
+            new Scenario("overflow to ready and confirmed some existing 1")
+                .addForSender(S1, 0, 1, 2, 3)
+                .confirmedForSenders(S1, 3)),
+        Arguments.of(
+            new Scenario("overflow to ready and confirmed some existing 2")
+                .addForSender(S1, 0, 1, 2, 3)
+                .confirmedForSenders(S1, 0)
+                .expectedPrioritizedForSender(S1, 1, 2, 3)),
+        Arguments.of(
+            new Scenario("overflow to ready and confirmed some existing 3")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5)
+                .confirmedForSenders(S1, 1)
+                .expectedPrioritizedForSender(S1, 2, 3, 4)
+                .expectedReadyForSender(S1, 5)),
+        Arguments.of(
+            new Scenario("overflow to ready and confirmed all existing")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5)
+                .confirmedForSenders(S1, 5)),
+        Arguments.of(
+            new Scenario("overflow to ready and confirmed above highest nonce")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5)
+                .confirmedForSenders(S1, 6)),
+        Arguments.of(
+            new Scenario("overflow to sparse and confirmed some existing 1")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5, 6)
+                .confirmedForSenders(S1, 0)
+                .expectedPrioritizedForSender(S1, 1, 2, 3)
+                .expectedReadyForSender(S1, 4, 5, 6)),
+        Arguments.of(
+            new Scenario("overflow to sparse and confirmed some existing 2")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5, 6)
+                .confirmedForSenders(S1, 2)
+                .expectedPrioritizedForSender(S1, 3, 4, 5)
+                .expectedReadyForSender(S1, 6)),
+        Arguments.of(
+            new Scenario("overflow to sparse and confirmed some existing 3")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5, 6)
+                .confirmedForSenders(S1, 3)
+                .expectedPrioritizedForSender(S1, 4, 5, 6)),
+        Arguments.of(
+            new Scenario("overflow to sparse and confirmed some existing 4")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5, 6, 7, 8)
+                .confirmedForSenders(S1, 0)
+                .expectedPrioritizedForSender(S1, 1, 2, 3)
+                .expectedReadyForSender(S1, 4, 5, 6)
+                .expectedSparseForSender(S1, 7, 8)),
+        Arguments.of(
+            new Scenario("overflow to sparse and confirmed some existing with gap")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5, 7, 8)
+                .confirmedForSenders(S1, 0)
+                .expectedPrioritizedForSender(S1, 1, 2, 3)
+                .expectedReadyForSender(S1, 4, 5)
+                .expectedSparseForSender(S1, 7, 8)),
+        Arguments.of(
+            new Scenario("overflow to sparse and confirmed all w/o gap")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5, 6, 7, 8)
+                .confirmedForSenders(S1, 8)),
+        Arguments.of(
+            new Scenario("overflow to sparse and confirmed all with gap")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5, 7, 8)
+                .confirmedForSenders(S1, 8)),
+        Arguments.of(
+            new Scenario("overflow to sparse and confirmed all before gap 1")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5, 7, 8)
+                .confirmedForSenders(S1, 5)
+                .expectedSparseForSender(S1, 7, 8)),
+        Arguments.of(
+            new Scenario("overflow to sparse and confirmed all before gap 2")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5, 7, 8)
+                .confirmedForSenders(S1, 6)
+                .expectedPrioritizedForSender(S1, 7, 8)));
+  }
+
+  static Stream<Arguments> providerNextNonceForSender() {
+    return Stream.of(
+        Arguments.of(new Scenario("not exist").expectedNextNonceForSenders(S1, null)),
+        Arguments.of(
+            new Scenario("first transaction")
+                .addForSender(S1, 0)
+                .expectedPrioritizedForSender(S1, 0)
+                .expectedNextNonceForSenders(S1, 1)),
+        Arguments.of(
+            new Scenario("fill prioritized")
+                .addForSender(S1, 0, 1, 2)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedNextNonceForSenders(S1, 3)),
+        Arguments.of(
+            new Scenario("reverse fill prioritized")
+                .addForSender(S1, 2, 1, 0)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedNextNonceForSenders(S1, 3)),
+        Arguments.of(
+            new Scenario("reverse fill prioritized 2")
+                .addForSender(S1, 3, 2, 1, 0)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3)
+                .expectedNextNonceForSenders(S1, 4)),
+        Arguments.of(
+            new Scenario("overflow to ready")
+                .addForSender(S1, 0, 1, 2, 3)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3)
+                .expectedNextNonceForSenders(S1, 4)),
+        Arguments.of(
+            new Scenario("fill ready")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)
+                .expectedNextNonceForSenders(S1, 6)),
+        Arguments.of(
+            new Scenario("overflow to sparse")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5, 6)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)
+                .expectedSparseForSender(S1, 6)
+                .expectedNextNonceForSenders(S1, 7)),
+        Arguments.of(
+            new Scenario("fill sparse")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5, 6, 7, 8)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)
+                .expectedSparseForSender(S1, 6, 7, 8)
+                .expectedNextNonceForSenders(S1, 9)),
+        Arguments.of(
+            new Scenario("drop transaction")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)
+                .expectedSparseForSender(S1, 6, 7, 8)
+                .expectedDroppedForSender(S1, 9)
+                .expectedNextNonceForSenders(S1, 9)),
+        Arguments.of(
+            new Scenario("first with gap")
+                .addForSender(S1, 1)
+                .expectedSparseForSender(S1, 1)
+                .expectedNextNonceForSenders(S1, null)),
+        Arguments.of(
+            new Scenario("sequence with gap 1")
+                .addForSender(S1, 0, 2)
+                .expectedPrioritizedForSender(S1, 0)
+                .expectedSparseForSender(S1, 2)
+                .expectedNextNonceForSenders(S1, 1)),
+        Arguments.of(
+            new Scenario("sequence with gap 2")
+                .addForSender(S1, 0, 1, 2, 4)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedSparseForSender(S1, 4)
+                .expectedNextNonceForSenders(S1, 3)),
+        Arguments.of(
+            new Scenario("sequence with gap 3")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5, 7)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)
+                .expectedSparseForSender(S1, 7)
+                .expectedNextNonceForSenders(S1, 6)),
+        Arguments.of(
+            new Scenario("sequence with gap 4")
+                .addForSender(S1, 0, 1, 2, 3, 4, 5, 6, 8)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)
+                .expectedSparseForSender(S1, 6, 8)
+                .expectedNextNonceForSenders(S1, 7)),
+        Arguments.of(
+            new Scenario("out of order sequence 1")
+                .addForSender(S1, 2, 0, 1)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedNextNonceForSenders(S1, 3)),
+        Arguments.of(
+            new Scenario("out of order sequence 2")
+                .addForSender(S1, 2, 0, 4, 3, 1)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4)
+                .expectedNextNonceForSenders(S1, 5)),
+        Arguments.of(
+            new Scenario("out of order sequence with gap 1")
+                .addForSender(S1, 2, 1)
+                .expectedSparseForSender(S1, 2, 1)
+                .expectedNextNonceForSenders(S1, null)),
+        Arguments.of(
+            new Scenario("out of order sequence with gap 2")
+                .addForSender(S1, 2, 0)
+                .expectedPrioritizedForSender(S1, 0)
+                .expectedSparseForSender(S1, 2)
+                .expectedNextNonceForSenders(S1, 1)),
+        Arguments.of(
+            new Scenario("out of order sequence with gap 3")
+                .addForSender(S1, 2, 0, 1, 4)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedSparseForSender(S1, 4)
+                .expectedNextNonceForSenders(S1, 3)),
+        Arguments.of(
+            new Scenario("out of order sequence with gap 4")
+                .addForSender(S1, 2, 0, 4, 1, 6, 3)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4)
+                .expectedSparseForSender(S1, 6)
+                .expectedNextNonceForSenders(S1, 5)),
+        Arguments.of(
+            new Scenario("no gap and confirmed 1")
+                .addForSender(S1, 0, 1, 2)
+                .confirmedForSenders(S1, 0)
+                .expectedPrioritizedForSender(S1, 1, 2)
+                .expectedNextNonceForSenders(S1, 3)),
+        Arguments.of(
+            new Scenario("all confirmed 1")
+                .addForSender(S1, 0, 1, 2)
+                .confirmedForSenders(S1, 2)
+                .expectedNextNonceForSenders(S1, null)),
+        Arguments.of(
+            new Scenario("all confirmed 2")
+                .addForSender(S1, 3, 0, 4, 1, 5, 2)
+                .confirmedForSenders(S1, 8)
+                .expectedNextNonceForSenders(S1, null)),
+        Arguments.of(
+            new Scenario("all confirmed 3")
+                .addForSender(S1, 3, 0, 4, 1, 2, 5, 6, 7)
+                .confirmedForSenders(S1, 8)
+                .expectedNextNonceForSenders(S1, null)),
+        Arguments.of(
+            new Scenario("all confirmed step by step 1")
+                .addForSender(S1, 3)
+                .expectedSparseForSender(S1, 3)
+                .expectedNextNonceForSenders(S1, null)
+                .addForSender(S1, 0)
+                .expectedPrioritizedForSender(S1, 0)
+                .expectedSparseForSender(S1, 3)
+                .expectedNextNonceForSenders(S1, 1)
+                .addForSender(S1, 4)
+                .expectedPrioritizedForSender(S1, 0)
+                .expectedSparseForSender(S1, 3, 4)
+                .expectedNextNonceForSenders(S1, 1)
+                .addForSender(S1, 1)
+                .expectedPrioritizedForSender(S1, 0, 1)
+                .expectedSparseForSender(S1, 3, 4)
+                .expectedNextNonceForSenders(S1, 2)
+                .addForSender(S1, 2)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4)
+                .expectedNextNonceForSenders(S1, 5)
+                .addForSender(S1, 5)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)
+                .expectedNextNonceForSenders(S1, 6)
+                .addForSender(S1, 6)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)
+                .expectedSparseForSender(S1, 6)
+                .expectedNextNonceForSenders(S1, 7)
+                .addForSender(S1, 7)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)
+                .expectedSparseForSender(S1, 6, 7)
+                .expectedNextNonceForSenders(S1, 8)
+                .addForSender(S1, 8)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)
+                .expectedSparseForSender(S1, 6, 7, 8)
+                .expectedNextNonceForSenders(S1, 9)
+                .addForSender(S1, 9)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)
+                .expectedSparseForSender(S1, 6, 7, 8)
+                .expectedDroppedForSender(S1, 9)
+                .expectedNextNonceForSenders(S1, 9)
+                .confirmedForSenders(S1, 9)
+                .expectedPrioritizedForSenders()
+                .expectedReadyForSenders()
+                .expectedSparseForSenders()
+                .expectedNextNonceForSenders(S1, null)));
+  }
+
+  static Stream<Arguments> providerSelectTransactions() {
+    return Stream.of(
+        Arguments.of(new Scenario("no transactions").expectedSelectedTransactions()),
+        Arguments.of(
+            new Scenario("first transaction")
+                .addForSender(S1, 0)
+                .expectedPrioritizedForSender(S1, 0)
+                .expectedSelectedTransactions(S1, 0)),
+        Arguments.of(
+            new Scenario("fill prioritized")
+                .addForSender(S1, 0, 1, 2)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedSelectedTransactions(S1, 0, S1, 1, S1, 2)),
+        Arguments.of(
+            new Scenario("reverse fill prioritized")
+                .addForSender(S1, 2, 1, 0)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedSelectedTransactions(S1, 0, S1, 1, S1, 2)),
+        Arguments.of(
+            new Scenario("reverse fill prioritized 2")
+                .addForSender(S1, 3, 2, 1, 0)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3)
+                .expectedSelectedTransactions(S1, 0, S1, 1, S1, 2)),
+        Arguments.of(
+            new Scenario("overflow to ready")
+                .addForSender(S1, 0, 1, 2, 3)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3)
+                .expectedSelectedTransactions(S1, 0, S1, 1, S1, 2)),
+        Arguments.of(
+            new Scenario("first with gap")
+                .addForSender(S1, 1)
+                .expectedSparseForSender(S1, 1)
+                .expectedSelectedTransactions()),
+        Arguments.of(
+            new Scenario("sequence with gap 1")
+                .addForSender(S1, 0, 2)
+                .expectedPrioritizedForSender(S1, 0)
+                .expectedSparseForSender(S1, 2)
+                .expectedSelectedTransactions(S1, 0)),
+        Arguments.of(
+            new Scenario("sequence with gap 2")
+                .addForSender(S1, 0, 1, 2, 4)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedSparseForSender(S1, 4)
+                .expectedSelectedTransactions(S1, 0, S1, 1, S1, 2)),
+        Arguments.of(
+            new Scenario("out of order sequence 1")
+                .addForSender(S1, 2, 0, 1)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedSelectedTransactions(S1, 0, S1, 1, S1, 2)),
+        Arguments.of(
+            new Scenario("out of order sequence 2")
+                .addForSender(S1, 2, 0, 4, 3, 1)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4)
+                .expectedSelectedTransactions(S1, 0, S1, 1, S1, 2)),
+        Arguments.of(
+            new Scenario("out of order sequence with gap 1")
+                .addForSender(S1, 2, 1)
+                .expectedSparseForSender(S1, 2, 1)
+                .expectedSelectedTransactions()),
+        Arguments.of(
+            new Scenario("out of order sequence with gap 2")
+                .addForSender(S1, 2, 0)
+                .expectedPrioritizedForSender(S1, 0)
+                .expectedSparseForSender(S1, 2)
+                .expectedSelectedTransactions(S1, 0)),
+        Arguments.of(
+            new Scenario("no gap and confirmed 1")
+                .addForSender(S1, 0, 1, 2)
+                .confirmedForSenders(S1, 0)
+                .expectedPrioritizedForSender(S1, 1, 2)
+                .expectedSelectedTransactions(S1, 1, S1, 2)),
+        Arguments.of(
+            new Scenario("all confirmed 1")
+                .addForSender(S1, 0, 1, 2)
+                .confirmedForSenders(S1, 2)
+                .expectedSelectedTransactions()),
+        Arguments.of(
+            new Scenario("all confirmed step by step 1")
+                .addForSender(S1, 3)
+                .expectedSparseForSender(S1, 3)
+                .expectedSelectedTransactions()
+                .addForSender(S1, 0)
+                .expectedPrioritizedForSender(S1, 0)
+                .expectedSparseForSender(S1, 3)
+                .expectedSelectedTransactions(S1, 0)
+                .addForSender(S1, 4)
+                .expectedPrioritizedForSender(S1, 0)
+                .expectedSparseForSender(S1, 3, 4)
+                .expectedSelectedTransactions(S1, 0)
+                .addForSender(S1, 1)
+                .expectedPrioritizedForSender(S1, 0, 1)
+                .expectedSparseForSender(S1, 3, 4)
+                .expectedSelectedTransactions(S1, 0, S1, 1)
+                .addForSender(S1, 2)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4)
+                .expectedSelectedTransactions(S1, 0, S1, 1, S1, 2)
+                .addForSender(S1, 5)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)
+                .expectedSelectedTransactions(S1, 0, S1, 1, S1, 2)
+                .addForSender(S1, 6)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)
+                .expectedSparseForSender(S1, 6)
+                .expectedSelectedTransactions(S1, 0, S1, 1, S1, 2)
+                .addForSender(S1, 7)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)
+                .expectedSparseForSender(S1, 6, 7)
+                .expectedSelectedTransactions(S1, 0, S1, 1, S1, 2)
+                .addForSender(S1, 8)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)
+                .expectedSparseForSender(S1, 6, 7, 8)
+                .expectedSelectedTransactions(S1, 0, S1, 1, S1, 2)
+                .addForSender(S1, 9)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedReadyForSender(S1, 3, 4, 5)
+                .expectedSparseForSender(S1, 6, 7, 8)
+                .expectedDroppedForSender(S1, 9)
+                .expectedSelectedTransactions(S1, 0, S1, 1, S1, 2)
+                .confirmedForSenders(S1, 9)
+                .expectedPrioritizedForSenders()
+                .expectedReadyForSenders()
+                .expectedSparseForSenders()
+                .expectedSelectedTransactions()));
+  }
+
+  static Stream<Arguments> providerReorg() {
+    return Stream.of(
+        Arguments.of(
+            new Scenario("reorg")
+                .setAccountNonce(S1, 0)
+                .addForSender(S1, 0, 1, 2)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .confirmedForSenders(S1, 1)
+                .expectedPrioritizedForSender(S1, 2)
+                .expectedNextNonceForSenders(S1, 3)
+                .addForSender(S1, 3)
+                .expectedPrioritizedForSender(S1, 2, 3)
+                .setAccountNonce(S1, 0) // rewind nonce due to reorg
+                .addForSender(S1, 0)
+                .expectedPrioritizedForSender(S1, 0)
+                .expectedSparseForSender(S1, 2, 3)));
+  }
+
+  static Stream<Arguments> providerAsyncWorldStateUpdates() {
+    return Stream.of(
+        Arguments.of(
+            new Scenario("nonce forward just before confirmed block is processed")
+                .setAccountNonce(S1, 0)
+                .addForSender(S1, 0, 1, 2, 8, 9)
+                .expectedPrioritizedForSender(S1, 0, 1, 2)
+                .expectedSparseForSender(S1, 8, 9)
+                .expectedNextNonceForSenders(S1, 3)
+                // block has been imported and world state already has the new nonce,
+                // but block has not yet been processed by txpool
+                .setAccountNonce(S1, 5)
+                .addForSender(S1, 7)
+                .expectedPrioritizedForSenders()
+                // remember that sparse are checked by oldest first
+                .expectedSparseForSender(S1, 8, 9, 7)));
+  }
+
+  private static BlockHeader mockBlockHeader() {
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getBaseFee()).thenReturn(Optional.of(Wei.ONE));
+    return blockHeader;
+  }
+
+  private boolean transactionReplacementTester(
+      final PendingTransaction pt1, final PendingTransaction pt2) {
+    return transactionReplacementTester(poolConfig, pt1, pt2);
+  }
+
+  private static boolean transactionReplacementTester(
+      final TransactionPoolConfiguration poolConfig,
+      final PendingTransaction pt1,
+      final PendingTransaction pt2) {
+    final TransactionPoolReplacementHandler transactionReplacementHandler =
+        new TransactionPoolReplacementHandler(poolConfig.getPriceBump());
+    return transactionReplacementHandler.shouldReplace(pt1, pt2, mockBlockHeader());
+  }
+
+  static class Scenario extends BaseTransactionPoolTest {
+    interface TransactionLayersConsumer {
+      void accept(
+          LayeredPendingTransactions pending,
+          AbstractPrioritizedTransactions prioritized,
+          ReadyTransactions ready,
+          SparseTransactions sparse,
+          EvictCollectorLayer dropped);
+    }
+
+    final String description;
+    final List<TransactionLayersConsumer> actions = new ArrayList<>();
+    List<PendingTransaction> lastExpectedPrioritized = new ArrayList<>();
+    List<PendingTransaction> lastExpectedReady = new ArrayList<>();
+    List<PendingTransaction> lastExpectedSparse = new ArrayList<>();
+    List<PendingTransaction> lastExpectedDropped = new ArrayList<>();
+
+    final EnumMap<Sender, Long> nonceBySender = new EnumMap<>(Sender.class);
+
+    {
+      Arrays.stream(Sender.values()).forEach(e -> nonceBySender.put(e, 0L));
+    }
+
+    final EnumMap<Sender, Map<Long, PendingTransaction>> txsBySender = new EnumMap<>(Sender.class);
+
+    {
+      Arrays.stream(Sender.values()).forEach(e -> txsBySender.put(e, new HashMap<>()));
+    }
+
+    Scenario(final String description) {
+      this.description = description;
+    }
+
+    Scenario addForSender(final Sender sender, final long... nonce) {
+      Arrays.stream(nonce)
+          .forEach(
+              n -> {
+                final var pendingTx = getOrCreate(sender, n);
+                actions.add(
+                    (pending, prio, ready, sparse, dropped) -> {
+                      final Account mockSender = mock(Account.class);
+                      when(mockSender.getNonce()).thenReturn(nonceBySender.get(sender));
+                      pending.addTransaction(pendingTx, Optional.of(mockSender));
+                    });
+              });
+      return this;
+    }
+
+    Scenario addForSenders(final Object... args) {
+      for (int i = 0; i < args.length; i = i + 2) {
+        final Sender sender = (Sender) args[i];
+        final long nonce = (int) args[i + 1];
+        addForSender(sender, nonce);
+      }
+      return this;
+    }
+
+    public Scenario confirmedForSenders(final Object... args) {
+      final Map<Address, Long> maxConfirmedNonceBySender = new HashMap<>();
+      for (int i = 0; i < args.length; i = i + 2) {
+        final Sender sender = (Sender) args[i];
+        final long nonce = (int) args[i + 1];
+        maxConfirmedNonceBySender.put(sender.address, nonce);
+        setAccountNonce(sender, nonce + 1);
+      }
+      actions.add(
+          (pending, prio, ready, sparse, dropped) ->
+              prio.blockAdded(FeeMarket.london(0L), mockBlockHeader(), maxConfirmedNonceBySender));
+      return this;
+    }
+
+    Scenario setAccountNonce(final Sender sender, final long nonce) {
+      actions.add((pending, prio, ready, sparse, dropped) -> nonceBySender.put(sender, nonce));
+      return this;
+    }
+
+    void execute(
+        final LayeredPendingTransactions pending,
+        final AbstractPrioritizedTransactions prioritized,
+        final ReadyTransactions ready,
+        final SparseTransactions sparse,
+        final EvictCollectorLayer dropped) {
+      actions.forEach(action -> action.accept(pending, prioritized, ready, sparse, dropped));
+      assertExpectedPrioritized(prioritized, lastExpectedPrioritized);
+      assertExpectedReady(ready, lastExpectedReady);
+      assertExpectedSparse(sparse, lastExpectedSparse);
+      assertExpectedDropped(dropped, lastExpectedDropped);
+    }
+
+    private PendingTransaction getOrCreate(final Sender sender, final long nonce) {
+      return txsBySender
+          .get(sender)
+          .computeIfAbsent(nonce, n -> createEIP1559PendingTransactions(sender, n));
+    }
+
+    private PendingTransaction get(final Sender sender, final long nonce) {
+      return txsBySender.get(sender).get(nonce);
+    }
+
+    private PendingTransaction createEIP1559PendingTransactions(
+        final Sender sender, final long nonce) {
+      return createRemotePendingTransaction(
+          createEIP1559Transaction(nonce, sender.key, sender.gasFeeMultiplier));
+    }
+
+    public Scenario expectedPrioritizedForSender(final Sender sender, final long... nonce) {
+      lastExpectedPrioritized = expectedForSender(sender, nonce);
+      final var expectedCopy = List.copyOf(lastExpectedPrioritized);
+      actions.add(
+          (pending, prio, ready, sparse, dropped) -> assertExpectedPrioritized(prio, expectedCopy));
+      return this;
+    }
+
+    public Scenario expectedReadyForSender(final Sender sender, final long... nonce) {
+      lastExpectedReady = expectedForSender(sender, nonce);
+      final var expectedCopy = List.copyOf(lastExpectedReady);
+      actions.add(
+          (pending, prio, ready, sparse, dropped) -> assertExpectedReady(ready, expectedCopy));
+      return this;
+    }
+
+    public Scenario expectedSparseForSender(final Sender sender, final long... nonce) {
+      lastExpectedSparse = expectedForSender(sender, nonce);
+      final var expectedCopy = List.copyOf(lastExpectedSparse);
+      actions.add(
+          (pending, prio, ready, sparse, dropped) -> assertExpectedSparse(sparse, expectedCopy));
+      return this;
+    }
+
+    public Scenario expectedDroppedForSender(final Sender sender, final long... nonce) {
+      lastExpectedDropped = expectedForSender(sender, nonce);
+      final var expectedCopy = List.copyOf(lastExpectedDropped);
+      actions.add(
+          (pending, prio, ready, sparse, dropped) -> assertExpectedDropped(dropped, expectedCopy));
+      return this;
+    }
+
+    public Scenario expectedPrioritizedForSenders(
+        final Sender sender1, final long nonce1, final Sender sender2, Object... args) {
+      lastExpectedPrioritized = expectedForSenders(sender1, nonce1, sender2, args);
+      final var expectedCopy = List.copyOf(lastExpectedPrioritized);
+      actions.add(
+          (pending, prio, ready, sparse, dropped) -> assertExpectedPrioritized(prio, expectedCopy));
+      return this;
+    }
+
+    public Scenario expectedPrioritizedForSenders() {
+      lastExpectedPrioritized = List.of();
+      final var expectedCopy = List.copyOf(lastExpectedPrioritized);
+      actions.add(
+          (pending, prio, ready, sparse, dropped) -> assertExpectedPrioritized(prio, expectedCopy));
+      return this;
+    }
+
+    public Scenario expectedReadyForSenders(
+        final Sender sender1, final long nonce1, final Sender sender2, final Object... args) {
+      lastExpectedReady = expectedForSenders(sender1, nonce1, sender2, args);
+      final var expectedCopy = List.copyOf(lastExpectedReady);
+      actions.add(
+          (pending, prio, ready, sparse, dropped) -> assertExpectedReady(ready, expectedCopy));
+      return this;
+    }
+
+    public Scenario expectedReadyForSenders() {
+      lastExpectedReady = List.of();
+      final var expectedCopy = List.copyOf(lastExpectedReady);
+      actions.add(
+          (pending, prio, ready, sparse, dropped) -> assertExpectedReady(ready, expectedCopy));
+      return this;
+    }
+
+    public Scenario expectedSparseForSenders(
+        final Sender sender1, final long nonce1, final Sender sender2, final Object... args) {
+      lastExpectedSparse = expectedForSenders(sender1, nonce1, sender2, args);
+      final var expectedCopy = List.copyOf(lastExpectedSparse);
+      actions.add(
+          (pending, prio, ready, sparse, dropped) -> assertExpectedSparse(sparse, expectedCopy));
+      return this;
+    }
+
+    public Scenario expectedSparseForSenders() {
+      lastExpectedSparse = List.of();
+      final var expectedCopy = List.copyOf(lastExpectedSparse);
+      actions.add(
+          (pending, prio, ready, sparse, dropped) -> assertExpectedSparse(sparse, expectedCopy));
+      return this;
+    }
+
+    public Scenario expectedDroppedForSenders(
+        final Sender sender1, final long nonce1, final Sender sender2, final Object... args) {
+      lastExpectedDropped = expectedForSenders(sender1, nonce1, sender2, args);
+      final var expectedCopy = List.copyOf(lastExpectedDropped);
+      actions.add(
+          (pending, prio, ready, sparse, dropped) -> assertExpectedDropped(dropped, expectedCopy));
+      return this;
+    }
+
+    public Scenario expectedDroppedForSenders() {
+      lastExpectedDropped = List.of();
+      final var expectedCopy = List.copyOf(lastExpectedDropped);
+      actions.add(
+          (pending, prio, ready, sparse, dropped) -> assertExpectedDropped(dropped, expectedCopy));
+      return this;
+    }
+
+    private void assertExpectedPrioritized(
+        final AbstractPrioritizedTransactions prioLayer, final List<PendingTransaction> expected) {
+      assertThat(prioLayer.stream()).describedAs("Prioritized").containsExactlyElementsOf(expected);
+    }
+
+    private void assertExpectedReady(
+        final ReadyTransactions readyLayer, final List<PendingTransaction> expected) {
+      assertThat(readyLayer.stream()).describedAs("Ready").containsExactlyElementsOf(expected);
+    }
+
+    private void assertExpectedSparse(
+        final SparseTransactions sparseLayer, final List<PendingTransaction> expected) {
+      // sparse txs are returned from the most recent to the oldest, so reverse it to make writing
+      // scenarios easier
+      final var sortedExpected = new ArrayList<>(expected);
+      Collections.reverse(sortedExpected);
+      assertThat(sparseLayer.stream())
+          .describedAs("Sparse")
+          .containsExactlyElementsOf(sortedExpected);
+    }
+
+    private void assertExpectedDropped(
+        final EvictCollectorLayer evictCollector, final List<PendingTransaction> expected) {
+      assertThat(evictCollector.getEvictedTransactions())
+          .describedAs("Dropped")
+          .containsExactlyInAnyOrderElementsOf(expected);
+    }
+
+    private List<PendingTransaction> expectedForSenders(
+        final Sender sender1, final long nonce1, final Sender sender2, final Object... args) {
+      final List<PendingTransaction> expected = new ArrayList<>();
+      expected.add(get(sender1, nonce1));
+      final List<Object> sendersAndNonce = new ArrayList<>(Arrays.asList(args));
+      sendersAndNonce.add(0, sender2);
+      for (int i = 0; i < sendersAndNonce.size(); i = i + 2) {
+        final Sender sender = (Sender) sendersAndNonce.get(i);
+        final long nonce = (int) sendersAndNonce.get(i + 1);
+        expected.add(get(sender, nonce));
+      }
+      return Collections.unmodifiableList(expected);
+    }
+
+    private List<PendingTransaction> expectedForSender(final Sender sender, final long... nonce) {
+      return Arrays.stream(nonce).mapToObj(n -> get(sender, n)).toList();
+    }
+
+    public Scenario expectedNextNonceForSenders(final Object... args) {
+      for (int i = 0; i < args.length; i = i + 2) {
+        final Sender sender = (Sender) args[i];
+        final Integer nullableInt = (Integer) args[i + 1];
+        final OptionalLong nonce =
+            nullableInt == null ? OptionalLong.empty() : OptionalLong.of(nullableInt);
+        actions.add(
+            (pending, prio, ready, sparse, dropped) ->
+                assertThat(prio.getNextNonceFor(sender.address)).isEqualTo(nonce));
+      }
+      return this;
+    }
+
+    public Scenario removeForSender(final Sender sender, final long... nonce) {
+      Arrays.stream(nonce)
+          .forEach(
+              n -> {
+                final var pendingTx = getOrCreate(sender, n);
+                actions.add(
+                    (pending, prio, ready, sparse, dropped) -> prio.remove(pendingTx, INVALIDATED));
+              });
+      return this;
+    }
+
+    public Scenario expectedSelectedTransactions(final Object... args) {
+      List<PendingTransaction> expectedSelected = new ArrayList<>();
+      for (int i = 0; i < args.length; i = i + 2) {
+        final Sender sender = (Sender) args[i];
+        final long nonce = (int) args[i + 1];
+        expectedSelected.add(get(sender, nonce));
+      }
+      actions.add(
+          (pending, prio, ready, sparse, dropped) ->
+              assertThat(prio.stream()).containsExactlyElementsOf(expectedSelected));
+      return this;
+    }
+
+    @Override
+    public String toString() {
+      return description;
+    }
+  }
+
+  enum Sender {
+    S1(1),
+    S2(2),
+    S3(3),
+    S4(4);
+
+    final KeyPair key;
+    final Address address;
+    final int gasFeeMultiplier;
+
+    Sender(final int gasFeeMultiplier) {
+      this.key = SIGNATURE_ALGORITHM.get().generateKeyPair();
+      this.address = Util.publicKeyToAddress(key.getPublicKey());
+      this.gasFeeMultiplier = gasFeeMultiplier;
+    }
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/ReplayTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/ReplayTest.java
new file mode 100644
index 00000000000..d68c586c8d9
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/layered/ReplayTest.java
@@ -0,0 +1,297 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.layered;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+import static org.hyperledger.besu.ethereum.eth.transactions.layered.TransactionsLayer.RemovalReason.INVALIDATED;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransaction;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolReplacementHandler;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.metrics.StubMetricsSystem;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.zip.GZIPInputStream;
+
+import com.google.common.base.Splitter;
+import kotlin.ranges.LongRange;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ReplayTest {
+  private static final Logger LOG = LoggerFactory.getLogger(ReplayTest.class);
+  private final TransactionPoolConfiguration poolConfig =
+      ImmutableTransactionPoolConfiguration.builder().build();
+
+  private final StubMetricsSystem metricsSystem = new StubMetricsSystem();
+  private final TransactionPoolMetrics txPoolMetrics = new TransactionPoolMetrics(metricsSystem);
+
+  private final Address senderToLog =
+      Address.fromHexString("0xf7445f4b8a07921bf882175470dc8f7221c53996");
+
+  private BlockHeader currBlockHeader;
+
+  /**
+   * Ignored by default since this is useful to debug issues having a dump of txs that could be
+   * quite big and so could take many minutes to execute. To generate the input file for the test
+   * enable the LOG_FOR_REPLAY logger by adding these parts to the log4j2 configuration: in the
+   * Appenders section add
+   *
+   * <pre>{@code
+   * <RollingFile name="txCSV" fileName="/data/besu/tx.csv" filePattern="/data/besu/tx-%d{MM-dd-yyyy}-%i.csv.gz">
+   *    <PatternLayout>
+   *        <Pattern>%m%n</Pattern>
+   *    </PatternLayout>
+   *    <Policies>
+   *        <OnStartupTriggeringPolicy />
+   *    </Policies>
+   * </RollingFile>
+   * }</pre>
+   *
+   * in the Loggers section add
+   *
+   * <pre>{@code
+   * <Logger name="LOG_FOR_REPLAY" level="TRACE" additivity="false">
+   *    <AppenderRef ref="txCSV" />
+   * </Logger>
+   * }</pre>
+   *
+   * restart and let it run until you need it, then copy the CSV in the test resource folder.
+   *
+   * @throws IOException when fails to read the resource
+   */
+  @Test
+  @Disabled("Provide a replay file to run the test on demand")
+  public void replay() throws IOException {
+    try (BufferedReader br =
+        new BufferedReader(
+            new InputStreamReader(
+                new GZIPInputStream(getClass().getResourceAsStream("/tx.csv.gz")),
+                StandardCharsets.UTF_8))) {
+      currBlockHeader = mockBlockHeader(br.readLine());
+      final BaseFeeMarket baseFeeMarket = FeeMarket.london(0L);
+
+      final AbstractPrioritizedTransactions prioritizedTransactions =
+          createLayers(poolConfig, txPoolMetrics, baseFeeMarket);
+      final LayeredPendingTransactions pendingTransactions =
+          new LayeredPendingTransactions(poolConfig, prioritizedTransactions);
+      br.lines()
+          .forEach(
+              line -> {
+                try {
+                  final String[] commaSplit = line.split(",");
+                  final String type = commaSplit[0];
+                  switch (type) {
+                    case "T":
+                      System.out.println(
+                          "T:"
+                              + commaSplit[1]
+                              + " @ "
+                              + Instant.ofEpochMilli(Long.parseLong(commaSplit[2])));
+                      processTransaction(commaSplit, pendingTransactions, prioritizedTransactions);
+                      break;
+                    case "B":
+                      System.out.println("B:" + commaSplit[1]);
+                      processBlock(commaSplit, prioritizedTransactions, baseFeeMarket);
+                      break;
+                    case "S":
+                      // ToDo: commented since not always working, needs fix
+                      // System.out.println("S");
+                      // assertStats(line, pendingTransactions);
+                      break;
+                    case "D":
+                      System.out.println("D:" + commaSplit[1]);
+                      processInvalid(commaSplit, prioritizedTransactions);
+                      break;
+                    default:
+                      throw new IllegalArgumentException("Unexpected first field value " + type);
+                  }
+                } catch (Throwable throwable) {
+                  fail(line, throwable);
+                }
+              });
+    }
+  }
+
+  private BlockHeader mockBlockHeader(final String line) {
+    final List<String> commaSplit = Splitter.on(',').splitToList(line);
+    final long number = Long.parseLong(commaSplit.get(0));
+    final Wei initBaseFee = Wei.of(new BigInteger(commaSplit.get(1)));
+    final long gasUsed = Long.parseLong(commaSplit.get(2));
+    final long gasLimit = Long.parseLong(commaSplit.get(3));
+
+    final BlockHeader mockHeader = mock(BlockHeader.class);
+    when(mockHeader.getNumber()).thenReturn(number);
+    when(mockHeader.getBaseFee()).thenReturn(Optional.of(initBaseFee));
+    when(mockHeader.getGasUsed()).thenReturn(gasUsed);
+    when(mockHeader.getGasLimit()).thenReturn(gasLimit);
+
+    return mockHeader;
+  }
+
+  private BaseFeePrioritizedTransactions createLayers(
+      final TransactionPoolConfiguration poolConfig,
+      final TransactionPoolMetrics txPoolMetrics,
+      final BaseFeeMarket baseFeeMarket) {
+    final EvictCollectorLayer evictCollector = new EvictCollectorLayer(txPoolMetrics);
+    final SparseTransactions sparseTransactions =
+        new SparseTransactions(
+            poolConfig, evictCollector, txPoolMetrics, this::transactionReplacementTester);
+
+    final ReadyTransactions readyTransactions =
+        new ReadyTransactions(
+            poolConfig, sparseTransactions, txPoolMetrics, this::transactionReplacementTester);
+
+    return new BaseFeePrioritizedTransactions(
+        poolConfig,
+        () -> currBlockHeader,
+        readyTransactions,
+        txPoolMetrics,
+        this::transactionReplacementTester,
+        baseFeeMarket);
+  }
+
+  // ToDo: commented since not always working, needs fix
+  //  private void assertStats(
+  //      final String line, final LayeredPendingTransactions pendingTransactions) {
+  //    final String statsString = line.substring(2);
+  //    assertThat(pendingTransactions.logStats()).as(line).endsWith(statsString);
+  //  }
+
+  private void processBlock(
+      final String[] commaSplit,
+      final AbstractPrioritizedTransactions prioritizedTransactions,
+      final FeeMarket feeMarket) {
+    final Bytes bytes = Bytes.fromHexString(commaSplit[commaSplit.length - 1]);
+    final RLPInput rlpInput = new BytesValueRLPInput(bytes, false);
+    final BlockHeader blockHeader =
+        BlockHeader.readFrom(rlpInput, new MainnetBlockHeaderFunctions());
+
+    final Map<Address, Long> maxNonceBySender = new HashMap<>();
+    int i = 3;
+    if (!commaSplit[i].equals("")) {
+      while (!commaSplit[i].equals("R")) {
+        final Address sender = Address.fromHexString(commaSplit[i]);
+        final long nonce = Long.parseLong(commaSplit[i + 1]);
+        maxNonceBySender.put(sender, nonce);
+        i += 2;
+      }
+    } else {
+      ++i;
+    }
+
+    ++i;
+    final Map<Address, LongRange> nonceRangeBySender = new HashMap<>();
+    if (!commaSplit[i].equals("")) {
+      for (; i < commaSplit.length - 1; i += 3) {
+        final Address sender = Address.fromHexString(commaSplit[i]);
+        final long start = Long.parseLong(commaSplit[i + 1]);
+        final long end = Long.parseLong(commaSplit[i + 2]);
+        nonceRangeBySender.put(sender, new LongRange(start, end));
+      }
+    }
+
+    if (maxNonceBySender.containsKey(senderToLog) || nonceRangeBySender.containsKey(senderToLog)) {
+      LOG.warn(
+          "B {} M {} R {} Before {}",
+          blockHeader.getNumber(),
+          maxNonceBySender.get(senderToLog),
+          nonceRangeBySender.get(senderToLog),
+          prioritizedTransactions.logSender(senderToLog));
+    }
+    prioritizedTransactions.blockAdded(feeMarket, blockHeader, maxNonceBySender);
+    if (maxNonceBySender.containsKey(senderToLog) || nonceRangeBySender.containsKey(senderToLog)) {
+      LOG.warn("After {}", prioritizedTransactions.logSender(senderToLog));
+    }
+  }
+
+  private void processTransaction(
+      final String[] commaSplit,
+      final LayeredPendingTransactions pendingTransactions,
+      final AbstractPrioritizedTransactions prioritizedTransactions) {
+    final Bytes rlp = Bytes.fromHexString(commaSplit[commaSplit.length - 1]);
+    final Transaction tx = Transaction.readFrom(rlp);
+    final Account mockAccount = mock(Account.class);
+    final long nonce = Long.parseLong(commaSplit[4]);
+    when(mockAccount.getNonce()).thenReturn(nonce);
+    if (tx.getSender().equals(senderToLog)) {
+      LOG.warn(
+          "N {} T {}, Before {}",
+          nonce,
+          tx.getNonce(),
+          prioritizedTransactions.logSender(senderToLog));
+    }
+    assertThat(pendingTransactions.addRemoteTransaction(tx, Optional.of(mockAccount)))
+        .isNotEqualTo(TransactionAddedResult.INTERNAL_ERROR);
+    if (tx.getSender().equals(senderToLog)) {
+      LOG.warn("After {}", prioritizedTransactions.logSender(senderToLog));
+    }
+  }
+
+  private void processInvalid(
+      final String[] commaSplit, final AbstractPrioritizedTransactions prioritizedTransactions) {
+    final Bytes rlp = Bytes.fromHexString(commaSplit[commaSplit.length - 1]);
+    final Transaction tx = Transaction.readFrom(rlp);
+    if (tx.getSender().equals(senderToLog)) {
+      LOG.warn("D {}, Before {}", tx.getNonce(), prioritizedTransactions.logSender(senderToLog));
+    }
+    prioritizedTransactions.remove(new PendingTransaction.Remote(tx), INVALIDATED);
+    if (tx.getSender().equals(senderToLog)) {
+      LOG.warn("After {}", prioritizedTransactions.logSender(senderToLog));
+    }
+  }
+
+  private boolean transactionReplacementTester(
+      final PendingTransaction pt1, final PendingTransaction pt2) {
+    return transactionReplacementTester(poolConfig, pt1, pt2);
+  }
+
+  private boolean transactionReplacementTester(
+      final TransactionPoolConfiguration poolConfig,
+      final PendingTransaction pt1,
+      final PendingTransaction pt2) {
+    final TransactionPoolReplacementHandler transactionReplacementHandler =
+        new TransactionPoolReplacementHandler(poolConfig.getPriceBump());
+    return transactionReplacementHandler.shouldReplace(pt1, pt2, currBlockHeader);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/AbstractPendingTransactionsTestBase.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/AbstractPendingTransactionsTestBase.java
new file mode 100644
index 00000000000..4c7b352f6cf
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/AbstractPendingTransactionsTestBase.java
@@ -0,0 +1,815 @@
+/*
+ * Copyright Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.sorter;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.ADDED;
+import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.ALREADY_KNOWN;
+import static org.hyperledger.besu.ethereum.eth.transactions.TransactionAddedResult.REJECTED_UNDERPRICED_REPLACEMENT;
+import static org.hyperledger.besu.plugin.data.TransactionSelectionResult.SELECTED;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
+import org.hyperledger.besu.ethereum.core.Util;
+import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactionAddedListener;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactionDroppedListener;
+import org.hyperledger.besu.ethereum.eth.transactions.PendingTransactions;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.metrics.StubMetricsSystem;
+import org.hyperledger.besu.plugin.data.TransactionSelectionResult;
+import org.hyperledger.besu.testutil.TestClock;
+
+import java.time.Clock;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.OptionalLong;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
+import com.google.common.collect.Lists;
+import org.junit.Test;
+
+public abstract class AbstractPendingTransactionsTestBase {
+
+  protected static final int MAX_TRANSACTIONS = 5;
+  private static final float LIMITED_TRANSACTIONS_BY_SENDER_PERCENTAGE = 0.8f;
+  protected static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+  protected static final KeyPair KEYS1 = SIGNATURE_ALGORITHM.get().generateKeyPair();
+  protected static final KeyPair KEYS2 = SIGNATURE_ALGORITHM.get().generateKeyPair();
+  protected static final String ADDED_COUNTER = "transactions_added_total";
+  protected static final String REMOVED_COUNTER = "transactions_removed_total";
+  protected static final String REMOTE = "remote";
+  protected static final String LOCAL = "local";
+  protected static final String DROPPED = "dropped";
+
+  protected final TestClock clock = new TestClock();
+  protected final StubMetricsSystem metricsSystem = new StubMetricsSystem();
+  protected AbstractPendingTransactionsSorter transactions =
+      getPendingTransactions(
+          ImmutableTransactionPoolConfiguration.builder()
+              .txPoolMaxSize(MAX_TRANSACTIONS)
+              .txPoolLimitByAccountPercentage(1.0f)
+              .build(),
+          Optional.empty());
+  private final TransactionPoolConfiguration senderLimitedConfig =
+      ImmutableTransactionPoolConfiguration.builder()
+          .txPoolMaxSize(MAX_TRANSACTIONS)
+          .txPoolLimitByAccountPercentage(LIMITED_TRANSACTIONS_BY_SENDER_PERCENTAGE)
+          .build();
+  protected PendingTransactions senderLimitedTransactions =
+      getPendingTransactions(senderLimitedConfig, Optional.empty());
+
+  protected final Transaction transaction1 = createTransaction(2);
+  protected final Transaction transaction2 = createTransaction(1);
+
+  protected final PendingTransactionAddedListener listener =
+      mock(PendingTransactionAddedListener.class);
+  protected final PendingTransactionDroppedListener droppedListener =
+      mock(PendingTransactionDroppedListener.class);
+  protected static final Address SENDER1 = Util.publicKeyToAddress(KEYS1.getPublicKey());
+  protected static final Address SENDER2 = Util.publicKeyToAddress(KEYS2.getPublicKey());
+
+  abstract AbstractPendingTransactionsSorter getPendingTransactions(
+      final TransactionPoolConfiguration poolConfig, Optional<Clock> clock);
+
+  @Test
+  public void shouldReturnExclusivelyLocalTransactionsWhenAppropriate() {
+    final Transaction localTransaction0 = createTransaction(0);
+    transactions.addLocalTransaction(localTransaction0, Optional.empty());
+    assertThat(transactions.size()).isEqualTo(1);
+
+    transactions.addRemoteTransaction(transaction1, Optional.empty());
+    assertThat(transactions.size()).isEqualTo(2);
+
+    transactions.addRemoteTransaction(transaction2, Optional.empty());
+    assertThat(transactions.size()).isEqualTo(3);
+
+    final List<Transaction> localTransactions = transactions.getLocalTransactions();
+    assertThat(localTransactions.size()).isEqualTo(1);
+  }
+
+  @Test
+  public void shouldAddATransaction() {
+    transactions.addRemoteTransaction(transaction1, Optional.empty());
+    assertThat(transactions.size()).isEqualTo(1);
+    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, REMOTE)).isEqualTo(1);
+
+    transactions.addRemoteTransaction(transaction2, Optional.empty());
+    assertThat(transactions.size()).isEqualTo(2);
+    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, REMOTE)).isEqualTo(2);
+  }
+
+  @Test
+  public void shouldReturnEmptyOptionalWhenNoTransactionWithGivenHashExists() {
+    assertThat(transactions.getTransactionByHash(Hash.EMPTY_TRIE_HASH)).isEmpty();
+  }
+
+  @Test
+  public void shouldGetTransactionByHash() {
+    transactions.addRemoteTransaction(transaction1, Optional.empty());
+    assertTransactionPending(transaction1);
+  }
+
+  @Test
+  public void shouldDropOldestTransactionWhenLimitExceeded() {
+    final Transaction oldestTransaction =
+        transactionWithNonceSenderAndGasPrice(0, SIGNATURE_ALGORITHM.get().generateKeyPair(), 10L);
+    final Account oldestSender = mock(Account.class);
+    when(oldestSender.getNonce()).thenReturn(0L);
+    senderLimitedTransactions.addRemoteTransaction(oldestTransaction, Optional.of(oldestSender));
+    for (int i = 1; i < MAX_TRANSACTIONS; i++) {
+      final Account sender = mock(Account.class);
+      when(sender.getNonce()).thenReturn((long) i);
+      senderLimitedTransactions.addRemoteTransaction(
+          transactionWithNonceSenderAndGasPrice(
+              i, SIGNATURE_ALGORITHM.get().generateKeyPair(), 10L),
+          Optional.of(sender));
+    }
+    assertThat(senderLimitedTransactions.size()).isEqualTo(MAX_TRANSACTIONS);
+    assertThat(metricsSystem.getCounterValue(REMOVED_COUNTER, REMOTE, DROPPED)).isZero();
+
+    final Account lastSender = mock(Account.class);
+    when(lastSender.getNonce()).thenReturn(6L);
+    senderLimitedTransactions.addRemoteTransaction(
+        createTransaction(MAX_TRANSACTIONS + 1), Optional.of(lastSender));
+    assertThat(senderLimitedTransactions.size()).isEqualTo(MAX_TRANSACTIONS);
+    assertTransactionNotPending(oldestTransaction);
+    assertThat(metricsSystem.getCounterValue(REMOVED_COUNTER, REMOTE, DROPPED)).isEqualTo(1);
+  }
+
+  @Test
+  public void shouldDropTransactionWithATooFarNonce() {
+    Transaction furthestFutureTransaction = null;
+    for (int i = 0; i < MAX_TRANSACTIONS; i++) {
+      furthestFutureTransaction = transactionWithNonceSenderAndGasPrice(i, KEYS1, 10L);
+      senderLimitedTransactions.addRemoteTransaction(furthestFutureTransaction, Optional.empty());
+    }
+    assertThat(senderLimitedTransactions.size())
+        .isEqualTo(senderLimitedConfig.getTxPoolMaxFutureTransactionByAccount());
+    assertThat(senderLimitedConfig.getTxPoolMaxFutureTransactionByAccount()).isEqualTo(4);
+    assertThat(senderLimitedTransactions.getTransactionByHash(furthestFutureTransaction.getHash()))
+        .isEmpty();
+  }
+
+  @Test
+  public void shouldHandleMaximumTransactionLimitCorrectlyWhenSameTransactionAddedMultipleTimes() {
+    transactions.addRemoteTransaction(createTransaction(0), Optional.empty());
+    transactions.addRemoteTransaction(createTransaction(0), Optional.empty());
+
+    for (int i = 1; i < MAX_TRANSACTIONS; i++) {
+      transactions.addRemoteTransaction(createTransaction(i), Optional.empty());
+    }
+    assertThat(transactions.size()).isEqualTo(MAX_TRANSACTIONS);
+
+    transactions.addRemoteTransaction(createTransaction(MAX_TRANSACTIONS + 1), Optional.empty());
+    transactions.addRemoteTransaction(createTransaction(MAX_TRANSACTIONS + 2), Optional.empty());
+    assertThat(transactions.size()).isEqualTo(MAX_TRANSACTIONS);
+  }
+
+  @Test
+  public void shouldPrioritizeLocalTransaction() {
+    final Transaction localTransaction = createTransaction(0);
+    transactions.addLocalTransaction(localTransaction, Optional.empty());
+
+    for (int i = 1; i <= MAX_TRANSACTIONS; i++) {
+      transactions.addRemoteTransaction(createTransaction(i), Optional.empty());
+    }
+    assertThat(transactions.size()).isEqualTo(MAX_TRANSACTIONS);
+    assertTransactionPending(localTransaction);
+  }
+
+  @Test
+  public void shouldStartDroppingLocalTransactionsWhenPoolIsFullOfLocalTransactions() {
+    Transaction lastLocalTransactionForSender = null;
+
+    for (int i = 0; i <= MAX_TRANSACTIONS; i++) {
+      lastLocalTransactionForSender = createTransaction(i);
+      transactions.addLocalTransaction(lastLocalTransactionForSender, Optional.empty());
+    }
+    assertThat(transactions.size()).isEqualTo(MAX_TRANSACTIONS);
+    assertTransactionNotPending(lastLocalTransactionForSender);
+  }
+
+  @Test
+  public void shouldNotifyListenerWhenRemoteTransactionAdded() {
+    transactions.subscribePendingTransactions(listener);
+
+    transactions.addRemoteTransaction(transaction1, Optional.empty());
+
+    verify(listener).onTransactionAdded(transaction1);
+  }
+
+  @Test
+  public void shouldNotNotifyListenerAfterUnsubscribe() {
+    final long id = transactions.subscribePendingTransactions(listener);
+
+    transactions.addRemoteTransaction(transaction1, Optional.empty());
+
+    verify(listener).onTransactionAdded(transaction1);
+
+    transactions.unsubscribePendingTransactions(id);
+
+    transactions.addRemoteTransaction(transaction2, Optional.empty());
+
+    verifyNoMoreInteractions(listener);
+  }
+
+  @Test
+  public void shouldNotifyListenerWhenLocalTransactionAdded() {
+    transactions.subscribePendingTransactions(listener);
+
+    transactions.addLocalTransaction(transaction1, Optional.empty());
+
+    verify(listener).onTransactionAdded(transaction1);
+  }
+
+  @Test
+  public void shouldNotifyDroppedListenerWhenRemoteTransactionDropped() {
+    transactions.addRemoteTransaction(transaction1, Optional.empty());
+
+    transactions.subscribeDroppedTransactions(droppedListener);
+
+    transactions.removeTransaction(transaction1);
+
+    verify(droppedListener).onTransactionDropped(transaction1);
+  }
+
+  @Test
+  public void shouldNotNotifyDroppedListenerAfterUnsubscribe() {
+    transactions.addRemoteTransaction(transaction1, Optional.empty());
+    transactions.addRemoteTransaction(transaction2, Optional.empty());
+
+    final long id = transactions.subscribeDroppedTransactions(droppedListener);
+
+    transactions.removeTransaction(transaction1);
+
+    verify(droppedListener).onTransactionDropped(transaction1);
+
+    transactions.unsubscribeDroppedTransactions(id);
+
+    transactions.removeTransaction(transaction2);
+
+    verifyNoMoreInteractions(droppedListener);
+  }
+
+  @Test
+  public void shouldNotifyDroppedListenerWhenLocalTransactionDropped() {
+    transactions.addLocalTransaction(transaction1, Optional.empty());
+
+    transactions.subscribeDroppedTransactions(droppedListener);
+
+    transactions.removeTransaction(transaction1);
+
+    verify(droppedListener).onTransactionDropped(transaction1);
+  }
+
+  @Test
+  public void shouldNotNotifyDroppedListenerWhenTransactionAddedToBlock() {
+    transactions.addRemoteTransaction(transaction1, Optional.empty());
+
+    transactions.subscribeDroppedTransactions(droppedListener);
+
+    transactions.transactionAddedToBlock(transaction1);
+
+    verifyNoInteractions(droppedListener);
+  }
+
+  @Test
+  public void selectTransactionsUntilSelectorRequestsNoMore() {
+    transactions.addRemoteTransaction(transaction1, Optional.empty());
+    transactions.addRemoteTransaction(transaction2, Optional.empty());
+
+    final List<Transaction> parsedTransactions = Lists.newArrayList();
+    transactions.selectTransactions(
+        transaction -> {
+          parsedTransactions.add(transaction);
+          return TransactionSelectionResult.BLOCK_OCCUPANCY_ABOVE_THRESHOLD;
+        });
+
+    assertThat(parsedTransactions.size()).isEqualTo(1);
+    assertThat(parsedTransactions.get(0)).isEqualTo(transaction2);
+  }
+
+  @Test
+  public void selectTransactionsUntilPendingIsEmpty() {
+    transactions.addRemoteTransaction(transaction1, Optional.empty());
+    transactions.addRemoteTransaction(transaction2, Optional.empty());
+
+    final List<Transaction> parsedTransactions = Lists.newArrayList();
+    transactions.selectTransactions(
+        transaction -> {
+          parsedTransactions.add(transaction);
+          return SELECTED;
+        });
+
+    assertThat(parsedTransactions.size()).isEqualTo(2);
+    assertThat(parsedTransactions.get(0)).isEqualTo(transaction2);
+    assertThat(parsedTransactions.get(1)).isEqualTo(transaction1);
+  }
+
+  @Test
+  public void shouldNotSelectReplacedTransaction() {
+    final Transaction transaction1 = transactionWithNonceSenderAndGasPrice(1, KEYS1, 1);
+    final Transaction transaction2 = transactionWithNonceSenderAndGasPrice(1, KEYS1, 2);
+
+    transactions.addRemoteTransaction(transaction1, Optional.empty());
+    transactions.addRemoteTransaction(transaction2, Optional.empty());
+
+    final List<Transaction> parsedTransactions = Lists.newArrayList();
+    transactions.selectTransactions(
+        transaction -> {
+          parsedTransactions.add(transaction);
+          return SELECTED;
+        });
+
+    assertThat(parsedTransactions).containsExactly(transaction2);
+  }
+
+  @Test
+  public void invalidTransactionIsDeletedFromPendingTransactions() {
+    transactions.addRemoteTransaction(transaction1, Optional.empty());
+    transactions.addRemoteTransaction(transaction2, Optional.empty());
+
+    final List<Transaction> parsedTransactions = Lists.newArrayList();
+    transactions.selectTransactions(
+        transaction -> {
+          parsedTransactions.add(transaction);
+          return TransactionSelectionResult.invalid(
+              TransactionInvalidReason.UPFRONT_COST_EXCEEDS_BALANCE.name());
+        });
+
+    assertThat(parsedTransactions.size()).isEqualTo(2);
+    assertThat(parsedTransactions.get(0)).isEqualTo(transaction2);
+    assertThat(parsedTransactions.get(1)).isEqualTo(transaction1);
+
+    assertThat(transactions.size()).isZero();
+  }
+
+  @Test
+  public void shouldReturnEmptyOptionalAsMaximumNonceWhenNoTransactionsPresent() {
+    assertThat(transactions.getNextNonceForSender(SENDER1)).isEmpty();
+  }
+
+  @Test
+  public void shouldReturnEmptyOptionalAsMaximumNonceWhenLastTransactionForSenderRemoved() {
+    final Transaction transaction = transactionWithNonceAndSender(1, KEYS1);
+    transactions.addRemoteTransaction(transaction, Optional.empty());
+    transactions.removeTransaction(transaction);
+    assertThat(transactions.getNextNonceForSender(SENDER1)).isEmpty();
+  }
+
+  @Test
+  public void shouldReplaceTransactionWithSameSenderAndNonce() {
+    final Transaction transaction1 = transactionWithNonceSenderAndGasPrice(1, KEYS1, 1);
+    final Transaction transaction1b = transactionWithNonceSenderAndGasPrice(1, KEYS1, 2);
+    final Transaction transaction2 = transactionWithNonceSenderAndGasPrice(2, KEYS1, 1);
+    assertThat(transactions.addRemoteTransaction(transaction1, Optional.empty())).isEqualTo(ADDED);
+    assertThat(transactions.addRemoteTransaction(transaction2, Optional.empty())).isEqualTo(ADDED);
+    assertThat(transactions.addRemoteTransaction(transaction1b, Optional.empty())).isEqualTo(ADDED);
+
+    assertTransactionNotPending(transaction1);
+    assertTransactionPending(transaction1b);
+    assertTransactionPending(transaction2);
+    assertThat(transactions.size()).isEqualTo(2);
+    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, REMOTE)).isEqualTo(3);
+    assertThat(metricsSystem.getCounterValue(REMOVED_COUNTER, REMOTE, DROPPED)).isEqualTo(1);
+  }
+
+  @Test
+  public void shouldReplaceTransactionWithSameSenderAndNonce_multipleReplacements() {
+    final int replacedTxCount = 5;
+    final List<Transaction> replacedTransactions = new ArrayList<>();
+    for (int i = 0; i < replacedTxCount; i++) {
+      final Transaction duplicateTx = transactionWithNonceSenderAndGasPrice(1, KEYS1, i + 1);
+      replacedTransactions.add(duplicateTx);
+      transactions.addRemoteTransaction(duplicateTx, Optional.empty());
+    }
+    final Transaction finalReplacingTx = transactionWithNonceSenderAndGasPrice(1, KEYS1, 100);
+    final Transaction independentTx = transactionWithNonceSenderAndGasPrice(2, KEYS1, 1);
+    assertThat(transactions.addRemoteTransaction(independentTx, Optional.empty())).isEqualTo(ADDED);
+    assertThat(transactions.addRemoteTransaction(finalReplacingTx, Optional.empty()))
+        .isEqualTo(ADDED);
+
+    // All tx's except the last duplicate should be removed
+    replacedTransactions.forEach(this::assertTransactionNotPending);
+    assertTransactionPending(finalReplacingTx);
+    // Tx with distinct nonce should be maintained
+    assertTransactionPending(independentTx);
+
+    assertThat(transactions.size()).isEqualTo(2);
+    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, REMOTE)).isEqualTo(replacedTxCount + 2);
+    assertThat(metricsSystem.getCounterValue(REMOVED_COUNTER, REMOTE, DROPPED))
+        .isEqualTo(replacedTxCount);
+  }
+
+  @Test
+  public void
+      shouldReplaceTransactionWithSameSenderAndNonce_multipleReplacementsAddedLocallyAndRemotely() {
+    final int replacedTxCount = 11;
+    final List<Transaction> replacedTransactions = new ArrayList<>();
+    int remoteDuplicateCount = 0;
+    for (int i = 0; i < replacedTxCount; i++) {
+      final Transaction duplicateTx =
+          transactionWithNonceSenderAndGasPrice(1, KEYS1, (i * 110 / 100) + 1);
+      replacedTransactions.add(duplicateTx);
+      if (i % 2 == 0) {
+        transactions.addRemoteTransaction(duplicateTx, Optional.empty());
+        remoteDuplicateCount++;
+      } else {
+        transactions.addLocalTransaction(duplicateTx, Optional.empty());
+      }
+    }
+    final Transaction finalReplacingTx = transactionWithNonceSenderAndGasPrice(1, KEYS1, 100);
+    final Transaction independentTx = transactionWithNonceSenderAndGasPrice(2, KEYS1, 1);
+    assertThat(transactions.addLocalTransaction(finalReplacingTx, Optional.empty()))
+        .isEqualTo(ADDED);
+    assertThat(transactions.addRemoteTransaction(independentTx, Optional.empty())).isEqualTo(ADDED);
+
+    // All tx's except the last duplicate should be removed
+    replacedTransactions.forEach(this::assertTransactionNotPending);
+    assertTransactionPending(finalReplacingTx);
+    // Tx with distinct nonce should be maintained
+    assertTransactionPending(independentTx);
+
+    final int localDuplicateCount = replacedTxCount - remoteDuplicateCount;
+    assertThat(transactions.size()).isEqualTo(2);
+    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, REMOTE))
+        .isEqualTo(remoteDuplicateCount + 1);
+    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, LOCAL))
+        .isEqualTo(localDuplicateCount + 1);
+    assertThat(metricsSystem.getCounterValue(REMOVED_COUNTER, REMOTE, DROPPED))
+        .isEqualTo(remoteDuplicateCount);
+    assertThat(metricsSystem.getCounterValue(REMOVED_COUNTER, LOCAL, DROPPED))
+        .isEqualTo(localDuplicateCount);
+  }
+
+  @Test
+  public void shouldReplaceOnlyTransactionFromSenderWhenItHasTheSameNonce() {
+    final Transaction transaction1 = transactionWithNonceSenderAndGasPrice(1, KEYS1, 1);
+    final Transaction transaction1b = transactionWithNonceSenderAndGasPrice(1, KEYS1, 2);
+    assertThat(transactions.addRemoteTransaction(transaction1, Optional.empty())).isEqualTo(ADDED);
+    assertThat(transactions.addRemoteTransaction(transaction1b, Optional.empty())).isEqualTo(ADDED);
+
+    assertTransactionNotPending(transaction1);
+    assertTransactionPending(transaction1b);
+    assertThat(transactions.size()).isEqualTo(1);
+    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, REMOTE)).isEqualTo(2);
+    assertThat(metricsSystem.getCounterValue(REMOVED_COUNTER, REMOTE, DROPPED)).isEqualTo(1);
+  }
+
+  @Test
+  public void shouldNotReplaceTransactionWithSameSenderAndNonceWhenGasPriceIsLower() {
+    final Transaction transaction1 = transactionWithNonceSenderAndGasPrice(1, KEYS1, 2);
+    final Transaction transaction1b = transactionWithNonceSenderAndGasPrice(1, KEYS1, 1);
+    assertThat(transactions.addRemoteTransaction(transaction1, Optional.empty())).isEqualTo(ADDED);
+
+    transactions.subscribePendingTransactions(listener);
+    assertThat(transactions.addRemoteTransaction(transaction1b, Optional.empty()))
+        .isEqualTo(REJECTED_UNDERPRICED_REPLACEMENT);
+
+    assertTransactionNotPending(transaction1b);
+    assertTransactionPending(transaction1);
+    assertThat(transactions.size()).isEqualTo(1);
+    verifyNoInteractions(listener);
+  }
+
+  @Test
+  public void shouldTrackMaximumNonceForEachSender() {
+    transactions.addRemoteTransaction(transactionWithNonceAndSender(0, KEYS1), Optional.empty());
+    assertMaximumNonceForSender(SENDER1, 1);
+
+    transactions.addRemoteTransaction(transactionWithNonceAndSender(1, KEYS1), Optional.empty());
+    assertMaximumNonceForSender(SENDER1, 2);
+
+    transactions.addRemoteTransaction(transactionWithNonceAndSender(2, KEYS1), Optional.empty());
+    assertMaximumNonceForSender(SENDER1, 3);
+
+    transactions.addRemoteTransaction(transactionWithNonceAndSender(4, KEYS2), Optional.empty());
+    assertMaximumNonceForSender(SENDER2, 5);
+    assertMaximumNonceForSender(SENDER1, 3);
+  }
+
+  @Test
+  public void shouldIterateTransactionsFromSameSenderInNonceOrder() {
+    final Transaction transaction1 = transactionWithNonceAndSender(0, KEYS1);
+    final Transaction transaction2 = transactionWithNonceAndSender(1, KEYS1);
+    final Transaction transaction3 = transactionWithNonceAndSender(2, KEYS1);
+
+    transactions.addLocalTransaction(transaction1, Optional.empty());
+    transactions.addLocalTransaction(transaction2, Optional.empty());
+    transactions.addLocalTransaction(transaction3, Optional.empty());
+
+    final List<Transaction> iterationOrder = new ArrayList<>();
+    transactions.selectTransactions(
+        transaction -> {
+          iterationOrder.add(transaction);
+          return SELECTED;
+        });
+
+    assertThat(iterationOrder).containsExactly(transaction1, transaction2, transaction3);
+  }
+
+  @Test
+  public void shouldNotForceNonceOrderWhenSendersDiffer() {
+    final Transaction transaction1 = transactionWithNonceAndSender(0, KEYS1);
+    final Transaction transaction2 = transactionWithNonceAndSender(1, KEYS2);
+
+    transactions.addLocalTransaction(transaction1, Optional.empty());
+    transactions.addLocalTransaction(transaction2, Optional.empty());
+
+    final List<Transaction> iterationOrder = new ArrayList<>();
+    transactions.selectTransactions(
+        transaction -> {
+          iterationOrder.add(transaction);
+          return SELECTED;
+        });
+
+    assertThat(iterationOrder).containsExactly(transaction2, transaction1);
+  }
+
+  @Test
+  public void shouldNotIncreasePriorityOfTransactionsBecauseOfNonceOrder() {
+    final Transaction transaction1 = transactionWithNonceAndSender(0, KEYS1);
+    final Transaction transaction2 = transactionWithNonceAndSender(1, KEYS1);
+    final Transaction transaction3 = transactionWithNonceAndSender(2, KEYS1);
+    final Transaction transaction4 = transactionWithNonceAndSender(4, KEYS2);
+
+    transactions.addLocalTransaction(transaction1, Optional.empty());
+    transactions.addLocalTransaction(transaction4, Optional.empty());
+    transactions.addLocalTransaction(transaction2, Optional.empty());
+    transactions.addLocalTransaction(transaction3, Optional.empty());
+
+    final List<Transaction> iterationOrder = new ArrayList<>();
+    transactions.selectTransactions(
+        transaction -> {
+          iterationOrder.add(transaction);
+          return SELECTED;
+        });
+
+    // Ignoring nonces, the order would be 3, 2, 4, 1 but we have to delay 3 and 2 until after 1.
+    assertThat(iterationOrder)
+        .containsExactly(transaction4, transaction1, transaction2, transaction3);
+  }
+
+  protected void assertMaximumNonceForSender(final Address sender1, final int i) {
+    assertThat(transactions.getNextNonceForSender(sender1)).isEqualTo(OptionalLong.of(i));
+  }
+
+  protected Transaction transactionWithNonceAndSender(final int nonce, final KeyPair keyPair) {
+    return new TransactionTestFixture().nonce(nonce).createTransaction(keyPair);
+  }
+
+  protected Transaction transactionWithNonceSenderAndGasPrice(
+      final int nonce, final KeyPair keyPair, final long gasPrice) {
+    return new TransactionTestFixture()
+        .nonce(nonce)
+        .gasPrice(Wei.of(gasPrice))
+        .createTransaction(keyPair);
+  }
+
+  protected void assertTransactionPending(final Transaction t) {
+    assertThat(transactions.getTransactionByHash(t.getHash())).contains(t);
+  }
+
+  protected void assertTransactionNotPending(final Transaction t) {
+    assertThat(transactions.getTransactionByHash(t.getHash())).isEmpty();
+  }
+
+  protected Transaction createTransaction(final long transactionNumber) {
+    return new TransactionTestFixture()
+        .value(Wei.of(transactionNumber))
+        .nonce(transactionNumber)
+        .createTransaction(KEYS1);
+  }
+
+  @Test
+  public void shouldEvictMultipleOldTransactions() {
+    final int maxTransactionRetentionHours = 1;
+    final PendingTransactions transactions =
+        getPendingTransactions(
+            ImmutableTransactionPoolConfiguration.builder()
+                .pendingTxRetentionPeriod(maxTransactionRetentionHours)
+                .txPoolMaxSize(MAX_TRANSACTIONS)
+                .txPoolLimitByAccountPercentage(1)
+                .build(),
+            Optional.of(clock));
+
+    transactions.addRemoteTransaction(transaction1, Optional.empty());
+    assertThat(transactions.size()).isEqualTo(1);
+    transactions.addRemoteTransaction(transaction2, Optional.empty());
+    assertThat(transactions.size()).isEqualTo(2);
+
+    clock.step(2L, ChronoUnit.HOURS);
+    transactions.evictOldTransactions();
+    assertThat(transactions.size()).isEqualTo(0);
+    assertThat(metricsSystem.getCounterValue(REMOVED_COUNTER, REMOTE, DROPPED)).isEqualTo(2);
+  }
+
+  @Test
+  public void shouldEvictSingleOldTransaction() {
+    final PendingTransactions evictSingleTransactions =
+        getPendingTransactions(
+            ImmutableTransactionPoolConfiguration.builder()
+                .pendingTxRetentionPeriod(1)
+                .txPoolMaxSize(MAX_TRANSACTIONS)
+                .txPoolLimitByAccountPercentage(1.0f)
+                .build(),
+            Optional.of(clock));
+    evictSingleTransactions.addRemoteTransaction(transaction1, Optional.empty());
+    assertThat(evictSingleTransactions.size()).isEqualTo(1);
+    clock.step(2L, ChronoUnit.HOURS);
+    evictSingleTransactions.evictOldTransactions();
+    assertThat(evictSingleTransactions.size()).isEqualTo(0);
+    assertThat(metricsSystem.getCounterValue(REMOVED_COUNTER, REMOTE, DROPPED)).isEqualTo(1);
+  }
+
+  @Test
+  public void shouldEvictExclusivelyOldTransactions() {
+    final PendingTransactions twoHourEvictionTransactionPool =
+        getPendingTransactions(
+            ImmutableTransactionPoolConfiguration.builder()
+                .pendingTxRetentionPeriod(2)
+                .txPoolMaxSize(MAX_TRANSACTIONS)
+                .txPoolLimitByAccountPercentage(1.0f)
+                .build(),
+            Optional.of(clock));
+
+    twoHourEvictionTransactionPool.addRemoteTransaction(transaction1, Optional.empty());
+    assertThat(twoHourEvictionTransactionPool.size()).isEqualTo(1);
+    clock.step(3L, ChronoUnit.HOURS);
+    twoHourEvictionTransactionPool.addRemoteTransaction(transaction2, Optional.empty());
+    assertThat(twoHourEvictionTransactionPool.size()).isEqualTo(2);
+    twoHourEvictionTransactionPool.evictOldTransactions();
+    assertThat(twoHourEvictionTransactionPool.size()).isEqualTo(1);
+    assertThat(metricsSystem.getCounterValue(REMOVED_COUNTER, REMOTE, DROPPED)).isEqualTo(1);
+  }
+
+  @Test
+  public void shouldNotIncrementAddedCounterWhenRemoteTransactionAlreadyPresent() {
+    transactions.addLocalTransaction(transaction1, Optional.empty());
+    assertThat(transactions.size()).isEqualTo(1);
+    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, LOCAL)).isEqualTo(1);
+    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, REMOTE)).isEqualTo(0);
+
+    assertThat(transactions.addRemoteTransaction(transaction1, Optional.empty()))
+        .isEqualTo(ALREADY_KNOWN);
+    assertThat(transactions.size()).isEqualTo(1);
+    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, LOCAL)).isEqualTo(1);
+    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, REMOTE)).isEqualTo(0);
+  }
+
+  @Test
+  public void shouldNotIncrementAddedCounterWhenLocalTransactionAlreadyPresent() {
+    transactions.addRemoteTransaction(transaction1, Optional.empty());
+    assertThat(transactions.size()).isEqualTo(1);
+    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, LOCAL)).isEqualTo(0);
+    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, REMOTE)).isEqualTo(1);
+
+    assertThat(transactions.addLocalTransaction(transaction1, Optional.empty()))
+        .isEqualTo(ALREADY_KNOWN);
+    assertThat(transactions.size()).isEqualTo(1);
+    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, LOCAL)).isEqualTo(0);
+    assertThat(metricsSystem.getCounterValue(ADDED_COUNTER, REMOTE)).isEqualTo(1);
+  }
+
+  @Test
+  public void assertThatCorrectNonceIsReturned() {
+    assertThat(transactions.getNextNonceForSender(transaction1.getSender())).isEmpty();
+    addLocalTransactions(1, 2, 4, 5);
+    assertThat(transactions.getNextNonceForSender(transaction1.getSender()))
+        .isPresent()
+        .hasValue(3);
+    addLocalTransactions(3);
+    assertThat(transactions.getNextNonceForSender(transaction1.getSender()))
+        .isPresent()
+        .hasValue(6);
+    addLocalTransactions(6, 10);
+
+    // assert that transactions are pruned by account from latest future nonces first
+    assertThat(transactions.getNextNonceForSender(transaction1.getSender()))
+        .isPresent()
+        .hasValue(6);
+  }
+
+  @Test
+  public void assertThatCorrectNonceIsReturnedForSenderLimitedPool() {
+    assertThat(senderLimitedTransactions.getNextNonceForSender(transaction1.getSender())).isEmpty();
+    addLocalTransactions(senderLimitedTransactions, 1, 2, 4, 5);
+    assertThat(senderLimitedTransactions.getNextNonceForSender(transaction1.getSender()))
+        .isPresent()
+        .hasValue(3);
+    addLocalTransactions(senderLimitedTransactions, 3);
+
+    // assert we have dropped previously added tx 5, and next nonce is now 5
+    assertThat(senderLimitedTransactions.getNextNonceForSender(transaction1.getSender()))
+        .isPresent()
+        .hasValue(5);
+    addLocalTransactions(senderLimitedTransactions, 6, 10);
+
+    // assert that we drop future nonces first:
+    assertThat(senderLimitedTransactions.getNextNonceForSender(transaction1.getSender()))
+        .isPresent()
+        .hasValue(5);
+  }
+
+  @Test
+  public void assertThatCorrectNonceIsReturnedLargeGap() {
+    assertThat(transactions.getNextNonceForSender(transaction1.getSender())).isEmpty();
+    addLocalTransactions(1, 2, Long.MAX_VALUE);
+    assertThat(transactions.getNextNonceForSender(transaction1.getSender()))
+        .isPresent()
+        .hasValue(3);
+    addLocalTransactions(3);
+  }
+
+  @Test
+  public void assertThatCorrectNonceIsReturnedWithRepeatedTXes() {
+    assertThat(transactions.getNextNonceForSender(transaction1.getSender())).isEmpty();
+    addLocalTransactions(1, 2, 4, 4, 4, 4, 4, 4, 4, 4);
+    assertThat(transactions.getNextNonceForSender(transaction1.getSender()))
+        .isPresent()
+        .hasValue(3);
+    addLocalTransactions(3);
+  }
+
+  protected void addLocalTransactions(final long... nonces) {
+    addLocalTransactions(transactions, nonces);
+  }
+
+  protected void addLocalTransactions(final PendingTransactions sorter, final long... nonces) {
+    for (final long nonce : nonces) {
+      final Account sender = mock(Account.class);
+      when(sender.getNonce()).thenReturn(1L);
+      sorter.addLocalTransaction(createTransaction(nonce), Optional.of(sender));
+    }
+  }
+
+  protected static BlockHeader mockBlockHeader() {
+    final BlockHeader blockHeader = mock(BlockHeader.class);
+    when(blockHeader.getBaseFee()).thenReturn(Optional.empty());
+    return blockHeader;
+  }
+
+  @Test
+  public void shouldPrioritizeGasPriceThenTimeAddedToPool() {
+    transactions.subscribeDroppedTransactions(
+        transaction -> assertThat(transaction.getGasPrice().get().toLong()).isLessThan(100));
+
+    // Fill the pool with transactions from random senders
+    final List<Transaction> lowGasPriceTransactions =
+        IntStream.range(0, MAX_TRANSACTIONS)
+            .mapToObj(
+                i -> {
+                  final Account randomSender = mock(Account.class);
+                  final Transaction lowPriceTx =
+                      transactionWithNonceSenderAndGasPrice(
+                          0, SIGNATURE_ALGORITHM.get().generateKeyPair(), 10);
+                  transactions.addRemoteTransaction(lowPriceTx, Optional.of(randomSender));
+                  return lowPriceTx;
+                })
+            .collect(Collectors.toUnmodifiableList());
+
+    // This should kick the oldest tx with the low gas price out, namely the first one we added
+    final Account highPriceSender = mock(Account.class);
+    final Transaction highGasPriceTransaction =
+        transactionWithNonceSenderAndGasPrice(0, KEYS1, 100);
+    transactions.addRemoteTransaction(highGasPriceTransaction, Optional.of(highPriceSender));
+    assertThat(transactions.size()).isEqualTo(MAX_TRANSACTIONS);
+
+    assertTransactionPending(highGasPriceTransaction);
+    assertTransactionNotPending(lowGasPriceTransactions.get(0));
+    lowGasPriceTransactions.stream().skip(1).forEach(this::assertTransactionPending);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/BaseFeePendingTransactionsTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/BaseFeePendingTransactionsTest.java
new file mode 100644
index 00000000000..fc47600e247
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/BaseFeePendingTransactionsTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.sorter;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionTestFixture;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.plugin.data.TransactionType;
+import org.hyperledger.besu.testutil.TestClock;
+
+import java.time.Clock;
+import java.time.ZoneId;
+import java.util.Optional;
+import java.util.Random;
+
+public class BaseFeePendingTransactionsTest extends AbstractPendingTransactionsTestBase {
+
+  @Override
+  AbstractPendingTransactionsSorter getPendingTransactions(
+      final TransactionPoolConfiguration poolConfig, final Optional<Clock> clock) {
+    return new BaseFeePendingTransactionsSorter(
+        poolConfig,
+        clock.orElse(TestClock.system(ZoneId.systemDefault())),
+        metricsSystem,
+        AbstractPendingTransactionsTestBase::mockBlockHeader);
+  }
+
+  private static final Random randomizeTxType = new Random();
+
+  @Override
+  protected Transaction createTransaction(final long transactionNumber) {
+    var tx = new TransactionTestFixture().value(Wei.of(transactionNumber)).nonce(transactionNumber);
+    if (randomizeTxType.nextBoolean()) {
+      tx.type(TransactionType.EIP1559)
+          .maxFeePerGas(Optional.of(Wei.of(5000L)))
+          .maxPriorityFeePerGas(Optional.of(Wei.of(50L)));
+    }
+    return tx.createTransaction(KEYS1);
+  }
+}
diff --git a/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/GasPricePendingTransactionsTest.java b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/GasPricePendingTransactionsTest.java
new file mode 100644
index 00000000000..6dec438c5cf
--- /dev/null
+++ b/ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/transactions/sorter/GasPricePendingTransactionsTest.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.eth.transactions.sorter;
+
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
+import org.hyperledger.besu.testutil.TestClock;
+
+import java.time.Clock;
+import java.time.ZoneId;
+import java.util.Optional;
+
+public class GasPricePendingTransactionsTest extends AbstractPendingTransactionsTestBase {
+
+  @Override
+  AbstractPendingTransactionsSorter getPendingTransactions(
+      final TransactionPoolConfiguration poolConfig, final Optional<Clock> clock) {
+    return new BaseFeePendingTransactionsSorter(
+        poolConfig,
+        clock.orElse(TestClock.system(ZoneId.systemDefault())),
+        metricsSystem,
+        AbstractPendingTransactionsTestBase::mockBlockHeader);
+  }
+}
diff --git a/ethereum/eth/src/test/resources/BlockBodiesPacket66.json b/ethereum/eth/src/test/resources/BlockBodiesPacket66.json
new file mode 100644
index 00000000000..b3b294f4f70
--- /dev/null
+++ b/ethereum/eth/src/test/resources/BlockBodiesPacket66.json
@@ -0,0 +1,57 @@
+{
+  "type": "BlockBodiesPacket66",
+  "rlp": "0xf902dc820457f902d6f902d3f8d2f867088504a817c8088302e2489435353535353535353535353535353535353535358202008025a064b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c12a064b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10f867098504a817c809830334509435353535353535353535353535353535353535358202d98025a052f8f61201b2b11a78d6e866abc9c3db2ae8631fa656bfe5cb53668255367afba052f8f61201b2b11a78d6e866abc9c3db2ae8631fa656bfe5cb53668255367afbf901fcf901f9a00000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000940000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008208ae820d0582115c8215b3821a0a827788a00000000000000000000000000000000000000000000000000000000000000000880000000000000000",
+  "data": {
+    "RequestId": 1111,
+    "BlockBodiesPacket": [
+      {
+        "Transactions": [
+          {
+            "nonce": "0x8",
+            "gasPrice": "0x4a817c808",
+            "gas": "0x2e248",
+            "to": "0x3535353535353535353535353535353535353535",
+            "value": "0x200",
+            "input": "0x",
+            "v": "0x25",
+            "r": "0x64b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c12",
+            "s": "0x64b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10",
+            "hash": "0x588df025c4c2d757d3e314bd3dfbfe352687324e6b8557ad1731585e96928aed"
+          },
+          {
+            "nonce": "0x9",
+            "gasPrice": "0x4a817c809",
+            "gas": "0x33450",
+            "to": "0x3535353535353535353535353535353535353535",
+            "value": "0x2d9",
+            "input": "0x",
+            "v": "0x25",
+            "r": "0x52f8f61201b2b11a78d6e866abc9c3db2ae8631fa656bfe5cb53668255367afb",
+            "s": "0x52f8f61201b2b11a78d6e866abc9c3db2ae8631fa656bfe5cb53668255367afb",
+            "hash": "0xf39c7dac06a9f3abf09faf5e30439a349d3717611b3ed337cd52b0d192bc72da"
+          }
+        ],
+        "Uncles": [
+          {
+            "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "sha3Uncles": "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "miner": "0x0000000000000000000000000000000000000000",
+            "stateRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "transactionsRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptsRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "difficulty": "0x8ae",
+            "number": "0xd05",
+            "gasLimit": "0x115c",
+            "gasUsed": "0x15b3",
+            "timestamp": "0x1a0a",
+            "extraData": "0x7788",
+            "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "nonce": "0x0000000000000000",
+            "hash": "0x8c2f2af15b7b563b6ab1e09bed0e9caade7ed730aec98b70a993597a797579a9"
+          }
+        ]
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/ethereum/eth/src/test/resources/BlockHeadersPacket66.json b/ethereum/eth/src/test/resources/BlockHeadersPacket66.json
new file mode 100644
index 00000000000..70c19c96a2e
--- /dev/null
+++ b/ethereum/eth/src/test/resources/BlockHeadersPacket66.json
@@ -0,0 +1,27 @@
+{
+  "type": "BlockHeadersPacket66",
+  "rlp": "0xf90202820457f901fcf901f9a00000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000940000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008208ae820d0582115c8215b3821a0a827788a00000000000000000000000000000000000000000000000000000000000000000880000000000000000",
+  "data": {
+    "RequestId": 1111,
+    "BlockHeadersPacket": [
+      {
+        "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "sha3Uncles": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "miner": "0x0000000000000000000000000000000000000000",
+        "stateRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "transactionsRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "receiptsRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "difficulty": "0x8ae",
+        "number": "0xd05",
+        "gasLimit": "0x115c",
+        "gasUsed": "0x15b3",
+        "timestamp": "0x1a0a",
+        "extraData": "0x7788",
+        "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "nonce": "0x0000000000000000",
+        "hash": "0x8c2f2af15b7b563b6ab1e09bed0e9caade7ed730aec98b70a993597a797579a9"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/ethereum/eth/src/test/resources/GetBlockBodiesPacket66.json b/ethereum/eth/src/test/resources/GetBlockBodiesPacket66.json
new file mode 100644
index 00000000000..38495ea8217
--- /dev/null
+++ b/ethereum/eth/src/test/resources/GetBlockBodiesPacket66.json
@@ -0,0 +1,11 @@
+{
+  "type": "GetBlockBodiesPacket66",
+  "rlp": "0xf847820457f842a000000000000000000000000000000000000000000000000000000000deadc0dea000000000000000000000000000000000000000000000000000000000feedbeef",
+  "data": {
+    "RequestId": 1111,
+    "GetBlockBodiesPacket": [
+      "0x00000000000000000000000000000000000000000000000000000000deadc0de",
+      "0x00000000000000000000000000000000000000000000000000000000feedbeef"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/ethereum/eth/src/test/resources/GetBlockHeadersPacket66-1.json b/ethereum/eth/src/test/resources/GetBlockHeadersPacket66-1.json
new file mode 100644
index 00000000000..ffa1f9b020f
--- /dev/null
+++ b/ethereum/eth/src/test/resources/GetBlockHeadersPacket66-1.json
@@ -0,0 +1,14 @@
+{
+  "type": "GetBlockHeadersPacket66",
+  "rlp": "0xca820457c682270f050580",
+  "data": {
+    "RequestId": 1111,
+    "Origin": {
+      "Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "Number": 9999
+    },
+    "Amount": 5,
+    "Skip": 5,
+    "Reverse": false
+  }
+}
\ No newline at end of file
diff --git a/ethereum/eth/src/test/resources/GetBlockHeadersPacket66.json b/ethereum/eth/src/test/resources/GetBlockHeadersPacket66.json
new file mode 100644
index 00000000000..ad0c6a86299
--- /dev/null
+++ b/ethereum/eth/src/test/resources/GetBlockHeadersPacket66.json
@@ -0,0 +1,14 @@
+{
+  "type": "GetBlockHeadersPacket66",
+  "rlp": "0xe8820457e4a000000000000000000000000000000000000000000000000000000000deadc0de050580",
+  "data": {
+    "RequestId": 1111,
+    "Origin": {
+      "Hash": "0x00000000000000000000000000000000000000000000000000000000deadc0de",
+      "Number": 0
+    },
+    "Amount": 5,
+    "Skip": 5,
+    "Reverse": false
+  }
+}
\ No newline at end of file
diff --git a/ethereum/eth/src/test/resources/GetNodeDataPacket66.json b/ethereum/eth/src/test/resources/GetNodeDataPacket66.json
new file mode 100644
index 00000000000..5898a7f0945
--- /dev/null
+++ b/ethereum/eth/src/test/resources/GetNodeDataPacket66.json
@@ -0,0 +1,11 @@
+{
+  "type": "GetNodeDataPacket66",
+  "rlp": "0xf847820457f842a000000000000000000000000000000000000000000000000000000000deadc0dea000000000000000000000000000000000000000000000000000000000feedbeef",
+  "data": {
+    "RequestId": 1111,
+    "GetNodeDataPacket": [
+      "0x00000000000000000000000000000000000000000000000000000000deadc0de",
+      "0x00000000000000000000000000000000000000000000000000000000feedbeef"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/ethereum/eth/src/test/resources/GetPooledTransactionsPacket66.json b/ethereum/eth/src/test/resources/GetPooledTransactionsPacket66.json
new file mode 100644
index 00000000000..f4e4cf0883a
--- /dev/null
+++ b/ethereum/eth/src/test/resources/GetPooledTransactionsPacket66.json
@@ -0,0 +1,11 @@
+{
+  "type": "GetPooledTransactionsPacket66",
+  "rlp": "0xf847820457f842a000000000000000000000000000000000000000000000000000000000deadc0dea000000000000000000000000000000000000000000000000000000000feedbeef",
+  "data": {
+    "RequestId": 1111,
+    "GetPooledTransactionsPacket": [
+      "0x00000000000000000000000000000000000000000000000000000000deadc0de",
+      "0x00000000000000000000000000000000000000000000000000000000feedbeef"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/ethereum/eth/src/test/resources/GetReceiptsPacket66.json b/ethereum/eth/src/test/resources/GetReceiptsPacket66.json
new file mode 100644
index 00000000000..f7b2d1fef6c
--- /dev/null
+++ b/ethereum/eth/src/test/resources/GetReceiptsPacket66.json
@@ -0,0 +1,11 @@
+{
+  "type": "GetReceiptsPacket66",
+  "rlp": "0xf847820457f842a000000000000000000000000000000000000000000000000000000000deadc0dea000000000000000000000000000000000000000000000000000000000feedbeef",
+  "data": {
+    "RequestId": 1111,
+    "GetReceiptsPacket": [
+      "0x00000000000000000000000000000000000000000000000000000000deadc0de",
+      "0x00000000000000000000000000000000000000000000000000000000feedbeef"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/ethereum/eth/src/test/resources/NodeDataPacket66.json b/ethereum/eth/src/test/resources/NodeDataPacket66.json
new file mode 100644
index 00000000000..3337a1a8703
--- /dev/null
+++ b/ethereum/eth/src/test/resources/NodeDataPacket66.json
@@ -0,0 +1,11 @@
+{
+  "type": "NodeDataPacket66",
+  "rlp": "0xce820457ca84deadc0de84feedbeef",
+  "data": {
+    "RequestId": 1111,
+    "NodeDataPacket": [
+      "0xdeadcode",
+      "0xfeedbeef"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/ethereum/eth/src/test/resources/PooledTransactionsPacket66.json b/ethereum/eth/src/test/resources/PooledTransactionsPacket66.json
new file mode 100644
index 00000000000..565aa9c625b
--- /dev/null
+++ b/ethereum/eth/src/test/resources/PooledTransactionsPacket66.json
@@ -0,0 +1,33 @@
+{
+  "type": "PooledTransactionsPacket66",
+  "rlp": "0xf8d7820457f8d2f867088504a817c8088302e2489435353535353535353535353535353535353535358202008025a064b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c12a064b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10f867098504a817c809830334509435353535353535353535353535353535353535358202d98025a052f8f61201b2b11a78d6e866abc9c3db2ae8631fa656bfe5cb53668255367afba052f8f61201b2b11a78d6e866abc9c3db2ae8631fa656bfe5cb53668255367afb",
+  "data": {
+    "RequestId": 1111,
+    "PooledTransactionsPacket": [
+      {
+        "nonce": "0x8",
+        "gasPrice": "0x4a817c808",
+        "gas": "0x2e248",
+        "to": "0x3535353535353535353535353535353535353535",
+        "value": "0x200",
+        "input": "0x",
+        "v": "0x25",
+        "r": "0x64b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c12",
+        "s": "0x64b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10",
+        "hash": "0x588df025c4c2d757d3e314bd3dfbfe352687324e6b8557ad1731585e96928aed"
+      },
+      {
+        "nonce": "0x9",
+        "gasPrice": "0x4a817c809",
+        "gas": "0x33450",
+        "to": "0x3535353535353535353535353535353535353535",
+        "value": "0x2d9",
+        "input": "0x",
+        "v": "0x25",
+        "r": "0x52f8f61201b2b11a78d6e866abc9c3db2ae8631fa656bfe5cb53668255367afb",
+        "s": "0x52f8f61201b2b11a78d6e866abc9c3db2ae8631fa656bfe5cb53668255367afb",
+        "hash": "0xf39c7dac06a9f3abf09faf5e30439a349d3717611b3ed337cd52b0d192bc72da"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/ethereum/eth/src/test/resources/ReceiptsPacket66.json b/ethereum/eth/src/test/resources/ReceiptsPacket66.json
new file mode 100644
index 00000000000..a16bd5e51ae
--- /dev/null
+++ b/ethereum/eth/src/test/resources/ReceiptsPacket66.json
@@ -0,0 +1,38 @@
+{
+  "type": "ReceiptsPacket66",
+  "rlp": "0xf90172820457f9016cf90169f901668001b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f85ff85d940000000000000000000000000000000000000011f842a0000000000000000000000000000000000000000000000000000000000000deada0000000000000000000000000000000000000000000000000000000000000beef830100ff",
+  "data": {
+    "RequestId": 1111,
+    "ReceiptsPacket": [
+      [
+        {
+          "root": "0x",
+          "status": "0x0",
+          "cumulativeGasUsed": "0x1",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": [
+            {
+              "address": "0x0000000000000000000000000000000000000011",
+              "topics": [
+                "0x000000000000000000000000000000000000000000000000000000000000dead",
+                "0x000000000000000000000000000000000000000000000000000000000000beef"
+              ],
+              "data": "0x0100ff",
+              "blockNumber": "0x0",
+              "transactionHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+              "transactionIndex": "0x0",
+              "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+              "logIndex": "0x0",
+              "removed": false
+            }
+          ],
+          "transactionHash": "0x00000000000000000000000000000000000000000000000000000000deadc0de",
+          "contractAddress": "0x0000000000000000000000000000000000011111",
+          "gasUsed": "0x1b207",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0x0"
+        }
+      ]
+    ]
+  }
+}
\ No newline at end of file
diff --git a/ethereum/eth/src/test/resources/log4j2.xml b/ethereum/eth/src/test/resources/log4j2.xml
deleted file mode 100644
index 8bc25bfd5be..00000000000
--- a/ethereum/eth/src/test/resources/log4j2.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN">
-  <Properties>
-    <Property name="root.log.level">INFO</Property>
-  </Properties>
-
-  <Appenders>
-    <Console name="Console" target="SYSTEM_OUT">
-      <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSSZZZ} | %t | %-5level | %c{1} | %msg%n" />    </Console>
-  </Appenders>
-  <Loggers>
-    <Root level="${sys:root.log.level}">
-      <AppenderRef ref="Console" />
-    </Root>
-  </Loggers>
-</Configuration>
diff --git a/ethereum/ethstats/build.gradle b/ethereum/ethstats/build.gradle
index 0c77e97ae7c..c361c16c860 100644
--- a/ethereum/ethstats/build.gradle
+++ b/ethereum/ethstats/build.gradle
@@ -28,29 +28,29 @@ jar {
 }
 
 dependencies {
+  api 'org.slf4j:slf4j-api'
 
   implementation 'com.fasterxml.jackson.core:jackson-databind'
   implementation 'com.google.guava:guava'
   implementation 'com.squareup.okhttp3:okhttp'
-  implementation 'org.apache.logging.log4j:log4j-api'
   implementation 'io.vertx:vertx-core'
-  implementation 'org.apache.tuweni:bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
 
   implementation project(':consensus:clique')
   implementation project(':config')
   implementation project(':util')
+  implementation project(':datatypes')
   implementation project(':ethereum:api')
   implementation project(':ethereum:blockcreation')
   implementation project(':ethereum:core')
   implementation project(':ethereum:eth')
   implementation project(':ethereum:p2p')
+  implementation project(':evm')
   implementation project(':plugin-api')
 
   annotationProcessor "org.immutables:value"
   implementation "org.immutables:value-annotations"
 
-  runtimeOnly 'org.apache.logging.log4j:log4j-core'
-
   // test dependencies.
   testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts')
   testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
@@ -59,5 +59,8 @@ dependencies {
 
   testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.mockito:mockito-core'
+
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 }
diff --git a/ethereum/ethstats/src/main/java/org/hyperledger/besu/ethstats/EthStatsService.java b/ethereum/ethstats/src/main/java/org/hyperledger/besu/ethstats/EthStatsService.java
index 5f401e586f5..873fad9324d 100644
--- a/ethereum/ethstats/src/main/java/org/hyperledger/besu/ethstats/EthStatsService.java
+++ b/ethereum/ethstats/src/main/java/org/hyperledger/besu/ethstats/EthStatsService.java
@@ -36,12 +36,10 @@
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.eth.manager.EthProtocolManager;
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
 import org.hyperledger.besu.ethstats.authentication.ImmutableAuthenticationData;
 import org.hyperledger.besu.ethstats.authentication.ImmutableNodeInfo;
 import org.hyperledger.besu.ethstats.authentication.NodeInfo;
@@ -54,8 +52,9 @@
 import org.hyperledger.besu.ethstats.report.NodeStatsReport;
 import org.hyperledger.besu.ethstats.report.PendingTransactionsReport;
 import org.hyperledger.besu.ethstats.request.EthStatsRequest;
-import org.hyperledger.besu.ethstats.util.NetstatsUrl;
+import org.hyperledger.besu.ethstats.util.EthStatsConnectOptions;
 import org.hyperledger.besu.ethstats.util.PrimusHeartBeatsHelper;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.util.platform.PlatformDetector;
 
 import java.math.BigInteger;
@@ -66,18 +65,19 @@
 import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.LongStream;
-import javax.net.ssl.SSLHandshakeException;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import io.vertx.core.Vertx;
 import io.vertx.core.http.HttpClientOptions;
 import io.vertx.core.http.WebSocket;
 import io.vertx.core.http.WebSocketConnectOptions;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import io.vertx.core.net.PemTrustOptions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class describes the behaviour of the EthStats service. This class is used to report pending
@@ -85,12 +85,14 @@
  */
 public class EthStatsService {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(EthStatsService.class);
 
   private static final Duration SEND_REPORT_DELAY = Duration.ofSeconds(5);
   private static final int HISTORY_RANGE = 50;
 
-  private final NetstatsUrl netstatsUrl;
+  private final AtomicBoolean retryInProgress = new AtomicBoolean(false);
+
+  private final EthStatsConnectOptions ethStatsConnectOptions;
   private final EthProtocolManager protocolManager;
   private final TransactionPool transactionPool;
   private final MiningCoordinator miningCoordinator;
@@ -109,8 +111,22 @@ public class EthStatsService {
   private EnodeURL enodeURL;
   private long pingTimestamp;
 
+  /**
+   * Instantiates a new EthStats service.
+   *
+   * @param ethStatsConnectOptions the netstats url
+   * @param blockchainQueries the blockchain queries
+   * @param protocolManager the protocol manager
+   * @param transactionPool the transaction pool
+   * @param miningCoordinator the mining coordinator
+   * @param syncState the sync state
+   * @param vertx the vertx
+   * @param clientVersion the client version
+   * @param genesisConfigOptions the genesis config options
+   * @param p2PNetwork the p 2 p network
+   */
   public EthStatsService(
-      final NetstatsUrl netstatsUrl,
+      final EthStatsConnectOptions ethStatsConnectOptions,
       final BlockchainQueries blockchainQueries,
       final EthProtocolManager protocolManager,
       final TransactionPool transactionPool,
@@ -120,7 +136,7 @@ public EthStatsService(
       final String clientVersion,
       final GenesisConfigOptions genesisConfigOptions,
       final P2PNetwork p2PNetwork) {
-    this.netstatsUrl = netstatsUrl;
+    this.ethStatsConnectOptions = ethStatsConnectOptions;
     this.blockchainQueries = blockchainQueries;
     this.protocolManager = protocolManager;
     this.transactionPool = transactionPool;
@@ -131,21 +147,48 @@ public EthStatsService(
     this.genesisConfigOptions = genesisConfigOptions;
     this.p2PNetwork = p2PNetwork;
     this.blockResultFactory = new BlockResultFactory();
-    this.httpClientOptions = new HttpClientOptions();
-    this.webSocketConnectOptions =
-        new WebSocketConnectOptions()
-            .setURI("/api")
-            .setPort(netstatsUrl.getPort())
-            .setHost(netstatsUrl.getHost())
-            .setSsl(true);
+    this.httpClientOptions = buildHttpClientOptions(ethStatsConnectOptions);
+    this.webSocketConnectOptions = buildWebSocketConnectOptions(ethStatsConnectOptions);
   }
 
-  public void start() {
+  private static HttpClientOptions buildHttpClientOptions(
+      final EthStatsConnectOptions ethStatsConnectOptions) {
+    final HttpClientOptions options = new HttpClientOptions();
 
-    try {
+    if (ethStatsConnectOptions.getCaCert() != null) {
+      options.setPemTrustOptions(
+          new PemTrustOptions().addCertPath(ethStatsConnectOptions.getCaCert().toString()));
+    }
+    return options;
+  }
 
-      enodeURL = p2PNetwork.getLocalEnode().orElseThrow();
+  private static WebSocketConnectOptions buildWebSocketConnectOptions(
+      final EthStatsConnectOptions ethStatsConnectOptions) {
+    // if user specified scheme is null, default ssl to true, otherwise set ssl to true for wss
+    // scheme.
+    final boolean isSSL =
+        ethStatsConnectOptions.getScheme() == null
+            || ethStatsConnectOptions.getScheme().equalsIgnoreCase("wss");
+    return new WebSocketConnectOptions()
+        .setURI("/api")
+        .setSsl(isSSL)
+        .setHost(ethStatsConnectOptions.getHost())
+        .setPort(getWsPort(ethStatsConnectOptions, isSSL));
+  }
 
+  private static int getWsPort(
+      final EthStatsConnectOptions ethStatsConnectOptions, final boolean isSSL) {
+    if (ethStatsConnectOptions.getPort() >= 0) {
+      return ethStatsConnectOptions.getPort();
+    }
+    return isSSL ? 443 : 80;
+  }
+
+  /** Start. */
+  public void start() {
+    LOG.debug("Connecting to EthStats: {}", getEthStatsURI());
+    try {
+      enodeURL = p2PNetwork.getLocalEnode().orElseThrow();
       vertx
           .createHttpClient(httpClientOptions)
           .webSocket(
@@ -175,24 +218,43 @@ public void start() {
                         }
                       });
 
+                  retryInProgress.set(false);
                   // sending a hello to initiate the connection using the secret
                   sendHello();
                 } else {
-                  String errorMessage =
-                      "Failed to reach the ethstats server " + event.cause().getMessage();
-                  if (event.cause() instanceof SSLHandshakeException) {
-                    webSocketConnectOptions.setSsl(false);
-                    errorMessage += " (trying without ssl)";
-                  }
-                  LOG.error(errorMessage);
+                  LOG.error(
+                      "Failed to reach the ethstats server due to: {}", event.cause().getMessage());
+                  retryInProgress.set(false);
                   retryConnect();
                 }
               });
+
     } catch (Exception e) {
       retryConnect();
     }
   }
 
+  private String getEthStatsURI() {
+    return String.format(
+        "%s://%s:%s",
+        webSocketConnectOptions.isSsl() ? "wss" : "ws",
+        ethStatsConnectOptions.getHost(),
+        getWsPort(ethStatsConnectOptions, webSocketConnectOptions.isSsl()));
+  }
+
+  /**
+   * Switch from ssl to non-ssl and vice-versa if user specified scheme is null. Sets port to 443 or
+   * 80 if not specified.
+   */
+  private void updateSSLProtocol() {
+    if (ethStatsConnectOptions.getScheme() == null) {
+      final boolean updatedSSL = !webSocketConnectOptions.isSsl();
+      webSocketConnectOptions.setSsl(updatedSSL);
+    }
+    webSocketConnectOptions.setPort(
+        getWsPort(ethStatsConnectOptions, webSocketConnectOptions.isSsl()));
+  }
+
   /** Ends the current web socket connection, observers and schedulers */
   public void stop() {
     if (webSocket != null && !webSocket.isClosed()) {
@@ -205,11 +267,15 @@ public void stop() {
 
   /** Ends the current connection and restart a new one. */
   private void retryConnect() {
-    stop();
-    protocolManager
-        .ethContext()
-        .getScheduler()
-        .scheduleFutureTask(this::start, Duration.ofSeconds(10));
+    if (retryInProgress.getAndSet(true) == FALSE) {
+      stop();
+      updateSSLProtocol(); // switch from ssl:true to ssl:false and vice-versa
+      LOG.info("Attempting to reconnect to ethstats server in approximately 10 seconds.");
+      protocolManager
+          .ethContext()
+          .getScheduler()
+          .scheduleFutureTask(this::start, Duration.ofSeconds(10));
+    }
   }
 
   /** Sends a hello request to the ethstats server in order to log in. */
@@ -223,7 +289,7 @@ private void sendHello() {
 
         final NodeInfo nodeInfo =
             ImmutableNodeInfo.of(
-                netstatsUrl.getNodeName(),
+                ethStatsConnectOptions.getNodeName(),
                 clientVersion,
                 String.valueOf(port.get()),
                 chainId.get().toString(),
@@ -233,13 +299,15 @@ private void sendHello() {
                 arch,
                 "0.1.1",
                 true,
-                netstatsUrl.getContact());
+                ethStatsConnectOptions.getContact());
 
         final EthStatsRequest hello =
             new EthStatsRequest(
                 HELLO,
                 ImmutableAuthenticationData.of(
-                    enodeURL.getNodeId().toHexString(), nodeInfo, netstatsUrl.getSecret()));
+                    enodeURL.getNodeId().toHexString(),
+                    nodeInfo,
+                    ethStatsConnectOptions.getSecret()));
         sendMessage(
             webSocket,
             hello,
@@ -371,7 +439,7 @@ private void sendMessage(
       final EthStatsRequest message,
       final Consumer<Boolean> handlerResult) {
     try {
-      LOG.debug("Send ethstats request {}", message.generateCommand());
+      LOG.trace("Send ethstats request {}", message.generateCommand());
       webSocket.writeTextMessage(
           message.generateCommand(),
           handler -> {
@@ -439,11 +507,11 @@ private long suggestGasPrice(final Block block) {
     // retrieves transactions from the last blocks and takes the lowest gas price. If no transaction
     // is present we return the minTransactionGasPrice of the mining coordinator
     return block.getBody().getTransactions().stream()
-        .min(Comparator.comparing(Transaction::getGasPrice))
-        .map(Transaction::getGasPrice)
-        .filter(wei -> wei.getValue().longValue() > 0)
+        .min(Comparator.comparing(t -> t.getEffectiveGasPrice(block.getHeader().getBaseFee())))
+        .map(t -> t.getEffectiveGasPrice(block.getHeader().getBaseFee()))
+        .filter(wei -> wei.getAsBigInteger().longValue() > 0)
         .orElse(miningCoordinator.getMinTransactionGasPrice())
-        .getValue()
+        .getAsBigInteger()
         .longValue();
   }
 }
diff --git a/ethereum/ethstats/src/main/java/org/hyperledger/besu/ethstats/util/EthStatsConnectOptions.java b/ethereum/ethstats/src/main/java/org/hyperledger/besu/ethstats/util/EthStatsConnectOptions.java
new file mode 100644
index 00000000000..7f020adf452
--- /dev/null
+++ b/ethereum/ethstats/src/main/java/org/hyperledger/besu/ethstats/util/EthStatsConnectOptions.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethstats.util;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import java.net.URI;
+import java.nio.file.Path;
+import javax.annotation.Nullable;
+
+import org.immutables.value.Value;
+import org.slf4j.LoggerFactory;
+
+@Value.Immutable
+public interface EthStatsConnectOptions {
+  @Nullable
+  String getScheme();
+
+  String getNodeName();
+
+  String getSecret();
+
+  String getHost();
+
+  Integer getPort();
+
+  String getContact();
+
+  @Nullable
+  Path getCaCert();
+
+  static EthStatsConnectOptions fromParams(
+      final String url, final String contact, final Path caCert) {
+    try {
+      checkArgument(url != null && !url.trim().isEmpty(), "Invalid empty value.");
+
+      // if scheme is not specified in the URI, user info (nodename) gets converted to scheme.
+      final URI uri;
+      final String scheme;
+      if (url.matches("^.*://.*$")) {
+        // construct URI
+        uri = URI.create(url);
+        scheme = uri.getScheme();
+      } else {
+        // prepend ws:// to make a valid URI while keeping scheme as null
+        uri = URI.create("ws://" + url);
+        scheme = null;
+      }
+
+      if (scheme != null) {
+        // make sure that scheme is either ws or wss
+        if (!scheme.equalsIgnoreCase("ws") && !scheme.equalsIgnoreCase("wss")) {
+          throw new IllegalArgumentException("Ethstats URI only support ws:// or wss:// scheme.");
+        }
+      }
+
+      final String userInfo = uri.getUserInfo();
+
+      // make sure user info is specified
+      if (userInfo == null || !userInfo.contains(":")) {
+        throw new IllegalArgumentException("Ethstats URI missing user info.");
+      }
+      final String nodeName = userInfo.substring(0, userInfo.indexOf(":"));
+      final String secret = userInfo.substring(userInfo.indexOf(":") + 1);
+
+      return ImmutableEthStatsConnectOptions.builder()
+          .scheme(scheme)
+          .nodeName(nodeName)
+          .secret(secret)
+          .host(uri.getHost())
+          .port(uri.getPort())
+          .contact(contact)
+          .caCert(caCert)
+          .build();
+    } catch (IllegalArgumentException e) {
+      LoggerFactory.getLogger(EthStatsConnectOptions.class).error(e.getMessage());
+    }
+    throw new IllegalArgumentException(
+        "Invalid ethstats URL syntax. Ethstats URL should have the following format '[ws://|wss://]nodename:secret@host[:port]'.");
+  }
+}
diff --git a/ethereum/ethstats/src/main/java/org/hyperledger/besu/ethstats/util/NetstatsUrl.java b/ethereum/ethstats/src/main/java/org/hyperledger/besu/ethstats/util/NetstatsUrl.java
deleted file mode 100644
index 7c30c7c8d34..00000000000
--- a/ethereum/ethstats/src/main/java/org/hyperledger/besu/ethstats/util/NetstatsUrl.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethstats.util;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import com.google.common.primitives.Ints;
-import org.apache.logging.log4j.LogManager;
-import org.immutables.value.Value;
-
-@Value.Immutable
-public interface NetstatsUrl {
-
-  Pattern NETSTATS_URL_REGEX = Pattern.compile("([-\\w]+):([\\w]+)?@([-.\\w]+):([\\d]+)");
-
-  String getNodeName();
-
-  String getSecret();
-
-  String getHost();
-
-  Integer getPort();
-
-  String getContact();
-
-  static NetstatsUrl fromParams(final String url, final String contact) {
-    try {
-      checkArgument(url != null && !url.trim().isEmpty(), "Invalid empty value.");
-
-      final Matcher netStatsUrl = NETSTATS_URL_REGEX.matcher(url);
-      if (netStatsUrl.matches()) {
-        return ImmutableNetstatsUrl.builder()
-            .nodeName(netStatsUrl.group(1))
-            .secret(netStatsUrl.group(2))
-            .host(netStatsUrl.group(3))
-            .port(Ints.tryParse(netStatsUrl.group(4)))
-            .contact(contact)
-            .build();
-      }
-
-    } catch (IllegalArgumentException e) {
-      LogManager.getLogger().error(e.getMessage());
-    }
-    throw new IllegalArgumentException(
-        "Invalid netstats URL syntax. Netstats URL should have the following format 'nodename:secret@host:port'.");
-  }
-}
diff --git a/ethereum/ethstats/src/test/java/org/hyperledger/besu/ethstats/EthStatsServiceTest.java b/ethereum/ethstats/src/test/java/org/hyperledger/besu/ethstats/EthStatsServiceTest.java
index ac62b321c29..da4b08caaeb 100644
--- a/ethereum/ethstats/src/test/java/org/hyperledger/besu/ethstats/EthStatsServiceTest.java
+++ b/ethereum/ethstats/src/test/java/org/hyperledger/besu/ethstats/EthStatsServiceTest.java
@@ -30,11 +30,12 @@
 import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
 import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.ethstats.request.EthStatsRequest;
-import org.hyperledger.besu.ethstats.util.ImmutableNetstatsUrl;
-import org.hyperledger.besu.ethstats.util.NetstatsUrl;
+import org.hyperledger.besu.ethstats.util.EthStatsConnectOptions;
+import org.hyperledger.besu.ethstats.util.ImmutableEthStatsConnectOptions;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.math.BigInteger;
 import java.time.Duration;
@@ -73,8 +74,8 @@ public class EthStatsServiceTest {
   @Mock private HttpClient httpClient;
   @Mock private WebSocket webSocket;
 
-  final NetstatsUrl netstatsUrl =
-      ImmutableNetstatsUrl.builder()
+  final EthStatsConnectOptions ethStatsConnectOptions =
+      ImmutableEthStatsConnectOptions.builder()
           .nodeName("besu-node")
           .secret("secret")
           .host("127.0.0.1")
@@ -83,7 +84,7 @@ public class EthStatsServiceTest {
           .build();
 
   final EnodeURL node =
-      EnodeURL.builder()
+      EnodeURLImpl.builder()
           .nodeId(
               "50203c6bfca6874370e71aecc8958529fd723feb05013dc1abca8fc1fff845c5259faba05852e9dfe5ce172a7d6e7c2a3a5eaa8b541c8af15ea5518bbff5f2fa")
           .useDefaultPorts()
@@ -107,7 +108,7 @@ public void initMocks() {
   public void shouldRetryWhenLocalEnodeNotAvailable() throws Exception {
     ethStatsService =
         new EthStatsService(
-            netstatsUrl,
+            ethStatsConnectOptions,
             blockchainQueries,
             ethProtocolManager,
             transactionPool,
@@ -126,7 +127,7 @@ public void shouldRetryWhenLocalEnodeNotAvailable() throws Exception {
   public void shouldSendHelloMessage() {
     ethStatsService =
         new EthStatsService(
-            netstatsUrl,
+            ethStatsConnectOptions,
             blockchainQueries,
             ethProtocolManager,
             transactionPool,
@@ -159,7 +160,7 @@ public void shouldRetryIfSendHelloMessageFailed() {
 
     ethStatsService =
         new EthStatsService(
-            netstatsUrl,
+            ethStatsConnectOptions,
             blockchainQueries,
             ethProtocolManager,
             transactionPool,
@@ -191,7 +192,7 @@ public void shouldRetryIfSendHelloMessageFailed() {
   public void shouldSendFullReportIfHelloMessageSucceeded() {
     ethStatsService =
         new EthStatsService(
-            netstatsUrl,
+            ethStatsConnectOptions,
             blockchainQueries,
             ethProtocolManager,
             transactionPool,
diff --git a/ethereum/ethstats/src/test/java/org/hyperledger/besu/ethstats/util/EthStatsConnectOptionsTest.java b/ethereum/ethstats/src/test/java/org/hyperledger/besu/ethstats/util/EthStatsConnectOptionsTest.java
new file mode 100644
index 00000000000..577ac5b3c41
--- /dev/null
+++ b/ethereum/ethstats/src/test/java/org/hyperledger/besu/ethstats/util/EthStatsConnectOptionsTest.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethstats.util;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.nio.file.Path;
+
+import org.junit.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+public class EthStatsConnectOptionsTest {
+
+  private final String VALID_NETSTATS_URL = "Dev-Node-1:secret-with-dashes@127.0.0.1:3001";
+
+  private final String CONTACT = "contact@mail.fr";
+
+  private final String ERROR_MESSAGE =
+      "Invalid ethstats URL syntax. Ethstats URL should have the following format '[ws://|wss://]nodename:secret@host[:port]'.";
+
+  @Test
+  public void buildWithValidParams() {
+    final Path caCert = Path.of("./test.pem");
+    final EthStatsConnectOptions ethStatsConnectOptions =
+        EthStatsConnectOptions.fromParams(VALID_NETSTATS_URL, CONTACT, caCert);
+    assertThat(ethStatsConnectOptions.getScheme()).isNull();
+    assertThat(ethStatsConnectOptions.getHost()).isEqualTo("127.0.0.1");
+    assertThat(ethStatsConnectOptions.getNodeName()).isEqualTo("Dev-Node-1");
+    assertThat(ethStatsConnectOptions.getPort()).isEqualTo(3001);
+    assertThat(ethStatsConnectOptions.getSecret()).isEqualTo("secret-with-dashes");
+    assertThat(ethStatsConnectOptions.getContact()).isEqualTo(CONTACT);
+    assertThat(ethStatsConnectOptions.getCaCert()).isEqualTo(caCert);
+  }
+
+  @ParameterizedTest(name = "#{index} - With Host {0}")
+  @ValueSource(strings = {"url-test.test.com", "url.test.com", "test.com", "10.10.10.15"})
+  public void buildWithValidHost(final String host) {
+    final EthStatsConnectOptions ethStatsConnectOptions =
+        EthStatsConnectOptions.fromParams("Dev-Node-1:secret@" + host + ":3001", CONTACT, null);
+    assertThat(ethStatsConnectOptions.getScheme()).isNull();
+    assertThat(ethStatsConnectOptions.getHost()).isEqualTo(host);
+    assertThat(ethStatsConnectOptions.getPort()).isEqualTo(3001);
+  }
+
+  @ParameterizedTest(name = "#{index} - With Host {0}")
+  @ValueSource(strings = {"url-test.test.com", "url.test.com", "test.com", "10.10.10.15"})
+  public void buildWithValidHostWithoutPort(final String host) {
+    final EthStatsConnectOptions ethStatsConnectOptions =
+        EthStatsConnectOptions.fromParams("Dev-Node-1:secret@" + host, CONTACT, null);
+    assertThat(ethStatsConnectOptions.getScheme()).isNull();
+    assertThat(ethStatsConnectOptions.getHost()).isEqualTo(host);
+    assertThat(ethStatsConnectOptions.getPort()).isEqualTo(-1);
+  }
+
+  @ParameterizedTest(name = "#{index} - With Scheme {0}")
+  @ValueSource(strings = {"ws", "wss", "WSS", "WS"})
+  public void buildWithValidScheme(final String scheme) {
+    final EthStatsConnectOptions ethStatsConnectOptions =
+        EthStatsConnectOptions.fromParams(
+            scheme + "://Dev-Node-1:secret@url-test.test.com:3001", CONTACT, null);
+    assertThat(ethStatsConnectOptions.getScheme()).isEqualTo(scheme);
+    assertThat(ethStatsConnectOptions.getHost()).isEqualTo("url-test.test.com");
+    assertThat(ethStatsConnectOptions.getPort()).isEqualTo(3001);
+  }
+
+  @ParameterizedTest(name = "#{index} - With Scheme {0}")
+  @ValueSource(strings = {"http", "https", "ftp"})
+  public void shouldRaiseErrorOnInvalidScheme(final String scheme) {
+    // missing node name
+    assertThatThrownBy(
+            () ->
+                EthStatsConnectOptions.fromParams(
+                    scheme + "://Dev-Node-1:secret@url-test.test.com:3001", CONTACT, null))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageEndingWith(ERROR_MESSAGE);
+  }
+
+  @Test
+  public void shouldDetectEmptyParams() {
+    assertThatThrownBy(() -> EthStatsConnectOptions.fromParams("", CONTACT, null))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageEndingWith(ERROR_MESSAGE);
+  }
+
+  @Test
+  public void shouldDetectMissingParams() {
+    // missing node name
+    assertThatThrownBy(
+            () -> EthStatsConnectOptions.fromParams("secret@127.0.0.1:3001", CONTACT, null))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageEndingWith(ERROR_MESSAGE);
+
+    // missing host
+    assertThatThrownBy(() -> EthStatsConnectOptions.fromParams("Dev-Node-1:secret@", CONTACT, null))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageEndingWith(ERROR_MESSAGE);
+
+    // missing port in URL should default to -1
+    EthStatsConnectOptions ethStatsConnectOptions =
+        EthStatsConnectOptions.fromParams("Dev-Node-1:secret@127.0.0.1:", CONTACT, null);
+    assertThat(ethStatsConnectOptions.getPort()).isEqualTo(-1);
+  }
+
+  @Test
+  public void shouldDetectInvalidParams() {
+    // invalid host
+    assertThatThrownBy(
+            () ->
+                EthStatsConnectOptions.fromParams(
+                    "Dev-Node-1:secret@127.0@0.1:3001", CONTACT, null))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageEndingWith(ERROR_MESSAGE);
+
+    // invalid port
+    assertThatThrownBy(
+            () ->
+                EthStatsConnectOptions.fromParams(
+                    "Dev-Node-1:secret@127.0.0.1:A001", CONTACT, null))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageEndingWith(ERROR_MESSAGE);
+  }
+}
diff --git a/ethereum/ethstats/src/test/java/org/hyperledger/besu/ethstats/util/NetstatsUrlTest.java b/ethereum/ethstats/src/test/java/org/hyperledger/besu/ethstats/util/NetstatsUrlTest.java
deleted file mode 100644
index bdbd0a50c62..00000000000
--- a/ethereum/ethstats/src/test/java/org/hyperledger/besu/ethstats/util/NetstatsUrlTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethstats.util;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-import org.junit.Test;
-
-public class NetstatsUrlTest {
-
-  private final String VALID_NETSTATS_URL = "Dev-Node-1:secret@127.0.0.1:3001";
-
-  private final String CONTACT = "contact@mail.fr";
-
-  private final String ERROR_MESSAGE =
-      "Invalid netstats URL syntax. Netstats URL should have the following format 'nodename:secret@host:port'.";
-
-  @Test
-  public void buildWithValidParams() {
-    final NetstatsUrl netstatsUrl = NetstatsUrl.fromParams(VALID_NETSTATS_URL, CONTACT);
-    assertThat(netstatsUrl.getHost()).isEqualTo("127.0.0.1");
-    assertThat(netstatsUrl.getNodeName()).isEqualTo("Dev-Node-1");
-    assertThat(netstatsUrl.getPort()).isEqualTo(3001);
-    assertThat(netstatsUrl.getSecret()).isEqualTo("secret");
-    assertThat(netstatsUrl.getContact()).isEqualTo(CONTACT);
-  }
-
-  @Test
-  public void buildWithValidHost() {
-    final String[] validHosts =
-        new String[] {"url-test.test.com", "url.test.com", "test.com", "10.10.10.15"};
-    for (String host : validHosts) {
-      final NetstatsUrl netstatsUrl =
-          NetstatsUrl.fromParams("Dev-Node-1:secret@" + host + ":3001", CONTACT);
-      assertThat(netstatsUrl.getHost()).isEqualTo(host);
-    }
-  }
-
-  @Test
-  public void shouldDetectEmptyParams() {
-    assertThatThrownBy(() -> NetstatsUrl.fromParams("", CONTACT))
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageEndingWith(ERROR_MESSAGE);
-  }
-
-  @Test
-  public void shouldDetectMissingParams() {
-    // missing node name
-    assertThatThrownBy(() -> NetstatsUrl.fromParams("secret@127.0.0.1:3001", CONTACT))
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageEndingWith(ERROR_MESSAGE);
-
-    // missing host
-    assertThatThrownBy(() -> NetstatsUrl.fromParams("Dev-Node-1:secret@3001", CONTACT))
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageEndingWith(ERROR_MESSAGE);
-
-    // missing port
-    assertThatThrownBy(() -> NetstatsUrl.fromParams("Dev-Node-1:secret@127.0.0.1", CONTACT))
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageEndingWith(ERROR_MESSAGE);
-
-    // missing port
-    assertThatThrownBy(() -> NetstatsUrl.fromParams("Dev-Node-1:secret@127.0.0.1", CONTACT))
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageEndingWith(ERROR_MESSAGE);
-  }
-
-  @Test
-  public void shouldDetectInvalidParams() {
-    // invalid host
-    assertThatThrownBy(() -> NetstatsUrl.fromParams("Dev-Node-1:secret@127.0@0.1:3001", CONTACT))
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageEndingWith(ERROR_MESSAGE);
-
-    // invalid port
-    assertThatThrownBy(() -> NetstatsUrl.fromParams("Dev-Node-1:secret@127.0.0.1:A001", CONTACT))
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageEndingWith(ERROR_MESSAGE);
-  }
-}
diff --git a/ethereum/evmtool/README.md b/ethereum/evmtool/README.md
new file mode 100644
index 00000000000..a1a703f9132
--- /dev/null
+++ b/ethereum/evmtool/README.md
@@ -0,0 +1,127 @@
+EVM Tool
+========
+
+EVM Tool is a stand alone EVM executor and test execution tool. The
+principal purpose of the tool is for testing and validation of the EVM
+and enclosing data structures.
+
+Using EVM Tool in execution-specification-tests
+-----------------------------------------------
+
+To use EVM Tool in Execution Spec tests it is recommended that you use
+the GraalVM build, as the framework incurs significant startup penalties
+for each invocation when run via the Java runtime.
+
+### Building Execution Tests on macOS
+
+Current as of 24 Jun 2023.
+
+MacOS users will typically encounter two problems,one relating to the
+version of Python used and one relating to zsh.
+
+Homebrew will only install the most recent version of Python
+as `python3`, and that is 3.11. The execution tests require 3.10. The
+solution is to use a 3.10 version of python to set up the virtual
+environment.
+
+```zsh
+python3.10 -m venv ./venv/
+```
+
+Zsh requires braces to be escaped in the command line, so the step to
+install python packages needs to escape the brackets
+
+```zsh
+pip install -e .\[docs,lint,test\]
+```
+
+An all-in-one script, including homebrew, would look like
+
+```zsh
+brew install ethereum solidity
+git clone https://github.com/ethereum/execution-spec-tests
+cd execution-spec-tests
+python3 -m venv ./venv/
+source ./venv/bin/activate
+pip install -e .[docs,lint,test]
+```
+
+### Building EvmTool with GraalVM on macOS
+
+First you need a GraalVM JDK installed, if not already installed.
+
+It is recommended you install [SDKMAN](https://sdkman.io/install) to
+manage the graalVM install, homebrew has issues with native attributes
+and code signing.
+
+```zsh
+sdk install java 22.3.r17-grl 
+sdk use java 22.3.r17-grl
+```
+
+You can also manually install GraalVM from
+the [GraalVM website](https://www.graalvm.org/downloads)..
+
+Once GraalVM is installed you use the `nativeCompile` target.
+
+```zsh
+./gradlew nativeCompile 
+```
+
+The resulting binary
+is `./ethereum/evmtool/build/native/nativeCompile/evmtool`
+
+If the testing repository and besu are installed in the same parent
+directory, the command to run the execution tests is
+
+```zsh
+fill -v tests --evm-bin ../besu/ethereum/evmtool/build/install/evmtool/bin/evm 
+```
+
+Assuming homebrew and SDKMan are both installed, the complete script is
+
+```zsh
+sdk install java 22.3.r17-grl 
+sdk use java 22.3.r17-grl
+git clone https://github.com/hyperledger/besu
+cd besu
+./gradlew nativeCompile
+cd ..
+
+brew install ethereum solidity
+git clone https://github.com/ethereum/execution-spec-tests
+cd execution-spec-tests
+python3 -m venv ./venv/
+source ./venv/bin/activate
+pip install -e .[docs,lint,test]
+
+fill -v tests --evm-bin ../besu/ethereum/evmtool/build/install/evmtool/bin/evm
+```
+
+If you don't want to use the GraalVM tool the binary that is compatible
+is generated by the `ethereum:evmtool:installdist` target and is located
+at `./ethereum/evmtool/build/install/evmtool/bin/evm`
+
+Why not GraalVM for everything?
+-------------------------------
+
+Using GraalVM in execution-spec-tests results in over 20x performance
+increase in execution. It will be faster to build GraalVM from scratch
+and run the execution-spec-tests than to run just the Java version.
+
+It is demonstrably faster to run the Java version for a node.
+All the test execution gains are the result of reduced startup
+penalties. Larger benchmarks will show that performance intensive EVM
+code will be slower in GraalVM than the Java version due to the adaptive
+compiler.
+
+For contracts that execute 30 million gas in small operations it is
+often faster to run the Java EVMTool than the GraalVM EVMTool, including
+startup penalty. The execution tests focus on smaller VM tests that
+demonstrate specification conformance.
+
+We would also need to reconsider some library choices. GraalVM does not
+work with Log4J, and we would have to ban that library across Besu and
+all dependents. Libraries such as Netty also have some problematic entry
+points that interact poorly with how SLF4J needs to initialize.
+
diff --git a/ethereum/evmtool/build.gradle b/ethereum/evmtool/build.gradle
index 606be8d47e7..989c865412c 100644
--- a/ethereum/evmtool/build.gradle
+++ b/ethereum/evmtool/build.gradle
@@ -14,6 +14,10 @@
  *
  */
 
+plugins {
+  id 'org.graalvm.buildtools.native' version '0.9.17'
+}
+
 apply plugin: 'java-library'
 apply plugin: 'application'
 apply plugin: 'idea'
@@ -31,15 +35,16 @@ jar {
 }
 
 dependencies {
+
   implementation project(':besu')
   implementation project(':config')
-  implementation project(':crypto')
-  implementation project(':consensus:clique')
-  implementation project(':consensus:ibft')
+  implementation project(':crypto:algorithms')
+  implementation project(':datatypes')
   implementation project(':ethereum:api')
   implementation project(':ethereum:core')
   implementation project(':ethereum:referencetests')
   implementation project(':ethereum:rlp')
+  implementation project(':evm')
   implementation project(':metrics:core')
   implementation project(':plugins:rocksdb')
   implementation project(':services:kvstore')
@@ -50,14 +55,18 @@ dependencies {
   implementation 'com.google.guava:guava'
   implementation 'info.picocli:picocli'
   implementation 'io.vertx:vertx-core'
-  implementation 'org.apache.logging.log4j:log4j-api'
-  implementation 'org.apache.logging.log4j:log4j-core'
+
+  runtimeOnly 'org.slf4j:slf4j-nop'
 
   annotationProcessor 'com.google.dagger:dagger-compiler'
+  annotationProcessor 'info.picocli:picocli-codegen'
 
   testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.mockito:mockito-core'
+
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 }
 
 mainClassName = 'org.hyperledger.besu.evmtool.EvmTool'
@@ -95,7 +104,10 @@ tasks.register("dockerDistUntar") {
 task distDocker(type: Exec) {
   dependsOn dockerDistUntar
   def dockerBuildVersion = project.hasProperty('release.releaseVersion') ? project.property('release.releaseVersion') : "${rootProject.version}"
-  def imageName = "hyperledger/besu-evmtool"
+  def dockerOrgName = project.hasProperty('dockerOrgName') ? project.getProperty("dockerOrgName") : "hyperledger"
+  def dockerArtifactName = project.hasProperty("dockerArtifactName") ? project.getProperty("dockerArtifactName") : "besu-evmtool"
+  def imageName = "${dockerOrgName}/${dockerArtifactName}"
+
   def image = "${imageName}:${dockerBuildVersion}"
   def dockerBuildDir = "${buildDir}/docker-besu-evmtool/"
   workingDir "${dockerBuildDir}"
@@ -114,12 +126,14 @@ task distDocker(type: Exec) {
 task dockerUpload(type: Exec) {
   dependsOn distDocker
   def dockerBuildVersion = project.hasProperty('release.releaseVersion') ? project.property('release.releaseVersion') : "${rootProject.version}"
-  def imageName = "hyperledger/besu-evmtool"
+  def dockerOrgName = project.hasProperty('dockerOrgName') ? project.getProperty("dockerOrgName") : "hyperledger"
+  def dockerArtifactName = project.hasProperty("dockerArtifactName") ? project.getProperty("dockerArtifactName") : "besu-evmtool"
+  def imageName = "${dockerOrgName}/${dockerArtifactName}"
   def image = "${imageName}:${dockerBuildVersion}"
   def cmd = "docker push '${image}'"
   def additionalTags = []
 
-  if (project.hasProperty('branch') && project.property('branch') == 'master') {
+  if (project.hasProperty('branch') && project.property('branch') == 'main') {
     additionalTags.add('develop')
   }
 
@@ -128,9 +142,38 @@ task dockerUpload(type: Exec) {
     additionalTags.add(dockerBuildVersion.split(/\./)[0..1].join('.'))
   }
 
-  additionalTags.each { tag ->
-    cmd += " && docker tag '${image}' '${imageName}:${tag.trim()}' && docker push '${imageName}:${tag.trim()}'"
-  }
+  additionalTags.each { tag -> cmd += " && docker tag '${image}' '${imageName}:${tag.trim()}' && docker push '${imageName}:${tag.trim()}'" }
   executable "sh"
   args "-c", cmd
 }
+
+graalvmNative {
+  binaries {
+    main {
+      sharedLibrary = false
+      buildArgs.addAll(
+        "-H:ReflectionConfigurationFiles=${projectDir}/src/main/graal/reflection-config.json",
+        "-H:AdditionalSecurityProviders=org.bouncycastle.jce.provider.BouncyCastleProvider",
+        '-H:+TraceSecurityServices'
+        )
+
+
+      // Netty drags in older versions of bouncy castle, exclude it so there are no conflicts
+      excludeConfig.put("io.netty:netty-buffer", [".*"])
+    }
+  }
+}
+
+
+configurations.nativeImageClasspath {
+  // netty statically allocates some problematic classes
+  exclude group: 'io.netty', module: 'netty-buffer'
+  exclude group: 'io.netty', module: 'netty-common'
+  exclude group: 'io.netty', module: 'netty-transport'
+
+  // keep log4j from sneaking in.  GraalVM has an aleric reaction if it sees even one class
+  exclude group: 'org.slf4j', module: 'log4j-over-slf4j:1.7.36'
+  exclude group: "log4j", module: "log4j"
+  exclude group: "org.apache.logging.log4j"
+  exclude group: 'org.bouncycastle', module: 'bcprov-jdk18on'
+}
diff --git a/ethereum/evmtool/src/main/docker/Dockerfile b/ethereum/evmtool/src/main/docker/Dockerfile
index bb83b972ae1..89d6b335c7b 100644
--- a/ethereum/evmtool/src/main/docker/Dockerfile
+++ b/ethereum/evmtool/src/main/docker/Dockerfile
@@ -1,8 +1,14 @@
 
-FROM openjdk:11.0.7-jre-slim-buster
+FROM ubuntu:22.04
+ARG VERSION="dev"
 
-RUN adduser --disabled-password --gecos "" --home /opt/besu-evmtool besu && \
-    chown besu:besu /opt/besu-evmtool
+RUN apt-get update && \
+ apt-get install --no-install-recommends -q --assume-yes ca-certificates-java=20190909 && \
+ apt-get install --no-install-recommends -q --assume-yes openjdk-17-jre-headless=17* && \
+ apt-get clean  && \
+ rm -rf /var/lib/apt/lists/*  && \
+ adduser --disabled-password --gecos "" --home /opt/besu besu && \
+    chown besu:besu /opt/besu
 
 USER besu
 WORKDIR /opt/besu-evmtool
diff --git a/ethereum/evmtool/src/main/graal/reflection-config.json b/ethereum/evmtool/src/main/graal/reflection-config.json
new file mode 100644
index 00000000000..12c2d5e9737
--- /dev/null
+++ b/ethereum/evmtool/src/main/graal/reflection-config.json
@@ -0,0 +1,120 @@
+[
+  {
+    "name": "com.github.benmanes.caffeine.cache.PSMW",
+    "allDeclaredConstructors": true
+  },
+  {
+    "name": "com.github.benmanes.caffeine.cache.PSW",
+    "allDeclaredConstructors": true
+  },
+  {
+    "name": "com.github.benmanes.caffeine.cache.PSWMS",
+    "allDeclaredConstructors": true
+  },
+  {
+    "name": "com.github.benmanes.caffeine.cache.SSLA",
+    "allDeclaredConstructors": true
+  },
+  {
+    "name": "com.github.benmanes.caffeine.cache.SSLMSW",
+    "allDeclaredConstructors": true
+  },
+  {
+    "name": "com.github.benmanes.caffeine.cache.SSMSW",
+    "allDeclaredConstructors": true
+  },
+  {
+    "name": "com.github.benmanes.caffeine.cache.SSMW",
+    "allDeclaredConstructors": true
+  },
+  {
+    "name": "org.bouncycastle.jcajce.provider.asymmetric.ec.KeyFactorySpi",
+    "allDeclaredConstructors": true,
+    "allPublicMethods": true
+  },
+  {
+    "name": "org.bouncycastle.jcajce.provider.asymmetric.ec.KeyFactorySpi$ECDSA",
+    "allDeclaredConstructors": true,
+    "allPublicMethods": true
+  },
+  {
+    "name": "org.bouncycastle.jcajce.provider.asymmetric.ec.KeyPairGeneratorSpi",
+    "allDeclaredConstructors": true,
+    "allPublicMethods": true
+  },
+  {
+    "name": "org.bouncycastle.jcajce.provider.asymmetric.ec.KeyPairGeneratorSpi$ECDSA",
+    "allDeclaredConstructors": true,
+    "allPublicMethods": true
+  },
+  {
+    "name": "org.bouncycastle.jcajce.provider.digest.Keccak$Mappings",
+    "allDeclaredConstructors": true,
+    "allPublicMethods": true
+  },
+  {
+    "name": "org.bouncycastle.jcajce.provider.digest.Keccak$Digest256",
+    "allDeclaredConstructors": true,
+    "allPublicMethods": true
+  },
+  {
+    "name": "org.bouncycastle.jcajce.provider.digest.Keccak",
+    "allDeclaredConstructors": true,
+    "allPublicMethods": true
+  },
+  {
+    "name": "org.hyperledger.besu.ethereum.referencetests.ReferenceTestEnv",
+    "queryAllPublicConstructors": true,
+    "queryAllPublicMethods": true,
+    "allDeclaredConstructors": true,
+    "allPublicMethods": true
+  },
+  {
+    "name": "org.hyperledger.besu.ethereum.referencetests.ReferenceTestEnv$EnvWithdrawal",
+    "queryAllPublicConstructors": true,
+    "queryAllPublicMethods": true,
+    "allDeclaredConstructors": true,
+    "allPublicMethods": true
+  },
+  {
+    "name": "org.hyperledger.besu.ethereum.referencetests.ReferenceTestWorldState",
+    "queryAllPublicConstructors": true,
+    "queryAllPublicMethods": true,
+    "allDeclaredConstructors": true,
+    "allPublicMethods": true
+  },
+  {
+    "name": "org.hyperledger.besu.ethereum.referencetests.ReferenceTestWorldState$AccountMock",
+    "queryAllPublicConstructors": true,
+    "queryAllPublicMethods": true,
+    "allDeclaredConstructors": true,
+    "allPublicMethods": true
+  },
+  {
+    "name": "org.hyperledger.besu.ethereum.referencetests.BlockchainReferenceTestCaseSpec$ReferenceTestBlockHeader",
+    "queryAllPublicConstructors": true,
+    "queryAllPublicMethods": true,
+    "allDeclaredConstructors": true,
+    "allPublicMethods": true
+  },
+  {
+    "name": "org.hyperledger.besu.evm.internal.ReturnStack$ReturnStackItem[]",
+    "unsafeAllocated": true
+  },
+  {
+    "name": "org.hyperledger.besu.evmtool.T8nSubCommand$RejectedTransaction",
+    "queryAllPublicConstructors": true,
+    "queryAllPublicMethods": true,
+    "allDeclaredConstructors": true,
+    "allPublicMethods": true
+  },
+  {
+    "name": "org.hyperledger.besu.evm.log.Log",
+    "allDeclaredConstructors": true,
+    "allPublicConstructors": true,
+    "allDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredFields": true,
+    "allPublicFields": true
+  }
+]
\ No newline at end of file
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/B11rSubCommand.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/B11rSubCommand.java
new file mode 100644
index 00000000000..e1143c5a8fe
--- /dev/null
+++ b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/B11rSubCommand.java
@@ -0,0 +1,275 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.evmtool;
+
+import static org.hyperledger.besu.evmtool.B11rSubCommand.COMMAND_ALIAS;
+import static org.hyperledger.besu.evmtool.B11rSubCommand.COMMAND_NAME;
+
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
+import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.referencetests.BlockchainReferenceTestCaseSpec.ReferenceTestBlockHeader;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Stack;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectReader;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.tuweni.bytes.Bytes;
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.IParameterConsumer;
+import picocli.CommandLine.Model.ArgSpec;
+import picocli.CommandLine.Model.CommandSpec;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.Parameters;
+import picocli.CommandLine.ParentCommand;
+
+@Command(
+    name = COMMAND_NAME,
+    aliases = {COMMAND_ALIAS},
+    description = "Execute an Ethereum State Test.",
+    mixinStandardHelpOptions = true,
+    versionProvider = VersionProvider.class)
+public class B11rSubCommand implements Runnable {
+  static final String COMMAND_NAME = "block-builder";
+  static final String COMMAND_ALIAS = "b11r";
+  private static final Path stdoutPath = Path.of("stdout");
+  private static final Path stdinPath = Path.of("stdin");
+
+  @Option(
+      names = {"--input.header"},
+      paramLabel = "full path",
+      description = "The block header for the block")
+  private final Path header = stdinPath;
+
+  @Option(
+      names = {"--input.txs"},
+      paramLabel = "full path",
+      description = "The transactions to block")
+  private final Path txs = stdinPath;
+
+  @Option(
+      names = {"--input.ommers"},
+      paramLabel = "full path",
+      description = "The ommers for the block")
+  private final Path ommers = stdinPath;
+
+  @Option(
+      names = {"--input.withdrawals"},
+      paramLabel = "full path",
+      description = "The withdrawals for the block")
+  private final Path withdrawals = stdinPath;
+
+  @Option(
+      names = {"--seal.clique"},
+      paramLabel = "full path",
+      description = "The clique seal/signature for the block")
+  private final Path sealClique = stdinPath;
+
+  @SuppressWarnings("UnusedVariable")
+  @Option(
+      names = {"--seal.ethash"},
+      description = "Use Proof of Work to seal the block")
+  private final Boolean sealEthash = false;
+
+  @SuppressWarnings("UnusedVariable")
+  @Option(
+      names = {"--seal.ethash.mode"},
+      paramLabel = "full path",
+      description = "The ethash mode for the block")
+  private String sealEthashMode = "noproof";
+
+  @Option(
+      names = {"--output.basedir"},
+      paramLabel = "full path",
+      description = "The output ")
+  private final Path outDir = Path.of(".");
+
+  @Option(
+      names = {"--output.block"},
+      paramLabel = "file name",
+      description = "The account state after the transition")
+  private final Path outBlock = Path.of("block.json");
+
+  @ParentCommand private final EvmToolCommand parentCommand;
+
+  @Parameters(parameterConsumer = OnlyEmptyParams.class)
+  @SuppressWarnings("UnusedVariable")
+  private final List<String> parameters = new ArrayList<>();
+
+  static class OnlyEmptyParams implements IParameterConsumer {
+    @Override
+    public void consumeParameters(
+        final Stack<String> args, final ArgSpec argSpec, final CommandSpec commandSpec) {
+      while (!args.isEmpty()) {
+        if (!args.pop().isEmpty()) {
+          throw new CommandLine.ParameterException(
+              argSpec.command().commandLine(),
+              "The block-builder command does not accept any non-empty parameters");
+        }
+      }
+    }
+  }
+
+  @SuppressWarnings("unused")
+  public B11rSubCommand() {
+    // PicoCLI requires this
+    parentCommand = null;
+  }
+
+  @SuppressWarnings("unused")
+  public B11rSubCommand(final EvmToolCommand parentCommand) {
+    // PicoCLI requires this too
+    this.parentCommand = parentCommand;
+  }
+
+  @Override
+  public void run() {
+    ObjectMapper objectMapper = JsonUtils.createObjectMapper();
+    final ObjectReader b11rReader = objectMapper.reader();
+
+    ObjectNode config;
+    try {
+      if (header.equals(stdinPath)
+          || txs.equals(stdinPath)
+          || ommers.equals(stdinPath)
+          || sealClique.equals(stdinPath)
+          || withdrawals.equals(stdinPath)) {
+        config =
+            (ObjectNode)
+                b11rReader.readTree(
+                    new InputStreamReader(parentCommand.in, StandardCharsets.UTF_8));
+      } else {
+        config = objectMapper.createObjectNode();
+      }
+
+      if (!header.equals(stdinPath)) {
+        try (FileReader reader = new FileReader(header.toFile(), StandardCharsets.UTF_8)) {
+          config.set("header", b11rReader.readTree(reader));
+        }
+      }
+      if (!txs.equals(stdinPath)) {
+        try (FileReader reader = new FileReader(txs.toFile(), StandardCharsets.UTF_8)) {
+          config.set("txs", b11rReader.readTree(reader));
+        }
+      }
+      if (!withdrawals.equals(stdinPath)) {
+        try (FileReader reader = new FileReader(withdrawals.toFile(), StandardCharsets.UTF_8)) {
+          config.set("withdrawals", b11rReader.readTree(reader));
+        }
+      }
+      if (!ommers.equals(stdinPath)) {
+        try (FileReader reader = new FileReader(ommers.toFile(), StandardCharsets.UTF_8)) {
+          config.set("ommers", b11rReader.readTree(reader));
+        }
+      }
+      if (!sealClique.equals(stdinPath)) {
+        try (FileReader reader = new FileReader(sealClique.toFile(), StandardCharsets.UTF_8)) {
+          config.set("clique", b11rReader.readTree(reader));
+        }
+      }
+    } catch (final JsonProcessingException jpe) {
+      parentCommand.out.println("File content error: " + jpe);
+      jpe.printStackTrace();
+      return;
+    } catch (final IOException e) {
+      System.err.println("Unable to read state file");
+      e.printStackTrace(System.err);
+      return;
+    }
+
+    var testHeader = this.readHeader(config.get("header"), objectMapper);
+    Bytes txsBytes = null;
+
+    if (config.has("txs")) {
+      String txsString = config.get("txs").textValue();
+      if (txsString.length() > 0) {
+        txsBytes = Bytes.fromHexString(txsString);
+      }
+    }
+
+    var newHeader =
+        BlockHeaderBuilder.fromHeader(testHeader)
+            .blockHeaderFunctions(new MainnetBlockHeaderFunctions())
+            .buildBlockHeader();
+    BytesValueRLPOutput rlpOut = new BytesValueRLPOutput();
+    rlpOut.startList();
+    newHeader.writeTo(rlpOut);
+    if (txsBytes != null && txsBytes.size() > 0) {
+      rlpOut.writeRaw(txsBytes);
+    } else {
+      rlpOut.startList();
+      rlpOut.endList();
+    }
+    // ommers
+    rlpOut.startList();
+    rlpOut.endList();
+
+    // withdrawals
+    // TODO - waiting on b11r spec to specify how withdrawals are added to blocks.
+
+    rlpOut.endList();
+
+    final ObjectNode resultObject = objectMapper.createObjectNode();
+    resultObject.put("rlp", rlpOut.encoded().toHexString());
+    resultObject.put("hash", newHeader.getHash().toHexString());
+    var writer = objectMapper.writerWithDefaultPrettyPrinter();
+    try {
+      var resultString = writer.writeValueAsString(resultObject);
+      if (outBlock.equals((stdoutPath))) {
+        parentCommand.out.println(resultString);
+      } else {
+        try (var fileOut =
+            new PrintStream(new FileOutputStream(outDir.resolve(outBlock).toFile()))) {
+          fileOut.println(resultString);
+        }
+      }
+    } catch (FileNotFoundException | JsonProcessingException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  void maybeMoveField(final ObjectNode jsonObject, final String oldField, final String newField) {
+    if (jsonObject.has(oldField)) {
+      jsonObject.set(newField, jsonObject.remove(oldField));
+    }
+  }
+
+  private ReferenceTestBlockHeader readHeader(
+      final JsonNode jsonObject, final ObjectMapper objectMapper) {
+    ObjectNode objectNode = (ObjectNode) jsonObject;
+    maybeMoveField(objectNode, "sha3Uncles", "uncleHash");
+    maybeMoveField(objectNode, "miner", "coinbase");
+    maybeMoveField(objectNode, "transactionsRoot", "transactionsTrie");
+    maybeMoveField(objectNode, "receiptsRoot", "receiptTrie");
+    maybeMoveField(objectNode, "logsBloom", "bloom");
+    return objectMapper.convertValue(jsonObject, ReferenceTestBlockHeader.class);
+  }
+}
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/BlockchainModule.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/BlockchainModule.java
index 85216ff9235..91cdad76a18 100644
--- a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/BlockchainModule.java
+++ b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/BlockchainModule.java
@@ -15,21 +15,20 @@
  */
 package org.hyperledger.besu.evmtool;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.BlockParameter;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.chain.BlockchainStorage;
 import org.hyperledger.besu.ethereum.chain.DefaultBlockchain;
 import org.hyperledger.besu.ethereum.chain.GenesisState;
 import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.MutableWorldView;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
 import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage;
 import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage;
 import org.hyperledger.besu.ethereum.worldstate.DefaultMutableWorldState;
 import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
 
@@ -54,7 +53,8 @@ Blockchain provideBlockchain(
   }
 
   @Provides
-  MutableWorldView getMutableWorldView(
+  @Singleton
+  MutableWorldState getMutableWorldState(
       @Named("StateRoot") final Bytes32 stateRoot,
       final WorldStateStorage worldStateStorage,
       final WorldStatePreimageStorage worldStatePreimageStorage,
@@ -71,24 +71,28 @@ MutableWorldView getMutableWorldView(
   }
 
   @Provides
+  @Singleton
   WorldStateStorage provideWorldStateStorage(
       @Named("worldState") final KeyValueStorage keyValueStorage) {
     return new WorldStateKeyValueStorage(keyValueStorage);
   }
 
   @Provides
+  @Singleton
   WorldStatePreimageStorage provideWorldStatePreimageStorage(
       @Named("worldStatePreimage") final KeyValueStorage keyValueStorage) {
     return new WorldStatePreimageKeyValueStorage(keyValueStorage);
   }
 
   @Provides
-  WorldUpdater provideWorldUpdater(final MutableWorldView mutableWorldView) {
-    return mutableWorldView.updater();
+  @Singleton
+  WorldUpdater provideWorldUpdater(final MutableWorldState mutableWorldState) {
+    return mutableWorldState.updater();
   }
 
   @Provides
   @Named("StateRoot")
+  @Singleton
   Bytes32 provideStateRoot(final BlockParameter blockParameter, final Blockchain blockchain) {
     if (blockParameter.isEarliest()) {
       return blockchain.getBlockHeader(0).orElseThrow().getStateRoot();
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/CliqueGenesisFileModule.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/CliqueGenesisFileModule.java
deleted file mode 100644
index 05cc38b1afd..00000000000
--- a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/CliqueGenesisFileModule.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2018 ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-package org.hyperledger.besu.evmtool;
-
-import org.hyperledger.besu.config.GenesisConfigOptions;
-import org.hyperledger.besu.consensus.clique.CliqueProtocolSchedule;
-import org.hyperledger.besu.consensus.ibft.IbftBlockHeaderFunctions;
-import org.hyperledger.besu.crypto.KeyPairSecurityModule;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.SECP256K1;
-import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-
-import javax.inject.Named;
-
-class CliqueGenesisFileModule extends GenesisFileModule {
-
-  private final NodeKey nodeKey =
-      new NodeKey(new KeyPairSecurityModule(SECP256K1.KeyPair.generate()));
-
-  CliqueGenesisFileModule(final String genesisConfig) {
-    super(genesisConfig);
-  }
-
-  @Override
-  ProtocolSchedule provideProtocolSchedule(
-      final GenesisConfigOptions configOptions,
-      @Named("RevertReasonEnabled") final boolean revertReasonEnabled) {
-    // dagger can handle this magic one day
-    return CliqueProtocolSchedule.create(configOptions, nodeKey, revertReasonEnabled);
-  }
-
-  @Override
-  BlockHeaderFunctions blockHashFunction() {
-    return IbftBlockHeaderFunctions.forOnChainBlock();
-  }
-}
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/CodeValidateSubCommand.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/CodeValidateSubCommand.java
new file mode 100644
index 00000000000..210efe014ca
--- /dev/null
+++ b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/CodeValidateSubCommand.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evmtool;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.hyperledger.besu.evmtool.CodeValidateSubCommand.COMMAND_NAME;
+
+import org.hyperledger.besu.evm.code.CodeFactory;
+import org.hyperledger.besu.evm.code.CodeInvalid;
+import org.hyperledger.besu.evm.code.EOFLayout;
+import org.hyperledger.besu.util.LogConfigurator;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import org.apache.tuweni.bytes.Bytes;
+import picocli.CommandLine;
+
+@CommandLine.Command(
+    name = COMMAND_NAME,
+    description = "Execute an Ethereum State Test.",
+    mixinStandardHelpOptions = true,
+    versionProvider = VersionProvider.class)
+public class CodeValidateSubCommand implements Runnable {
+  public static final String COMMAND_NAME = "code-validate";
+  private final InputStream input;
+  private final PrintStream output;
+
+  @CommandLine.Option(
+      names = {"--file"},
+      description = "A file containing a set of inputs")
+  private final File codeFile = null;
+
+  @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") // picocli does it magically
+  @CommandLine.Parameters
+  private final List<String> cliCode = new ArrayList<>();
+
+  @SuppressWarnings("unused")
+  public CodeValidateSubCommand() {
+    // PicoCLI requires this
+    this(System.in, System.out);
+  }
+
+  CodeValidateSubCommand(final InputStream input, final PrintStream output) {
+    this.input = input;
+    this.output = output;
+  }
+
+  @Override
+  public void run() {
+    LogConfigurator.setLevel("", "OFF");
+    if (cliCode.isEmpty() && codeFile == null) {
+      try (BufferedReader in = new BufferedReader(new InputStreamReader(input, UTF_8))) {
+        checkCodeFromBufferedReader(in);
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+    } else {
+      if (codeFile != null) {
+        try (BufferedReader in = new BufferedReader(new FileReader(codeFile, UTF_8))) {
+          checkCodeFromBufferedReader(in);
+        } catch (IOException e) {
+          throw new RuntimeException(e);
+        }
+      }
+      for (String code : cliCode) {
+        output.print(considerCode(code));
+      }
+    }
+  }
+
+  private void checkCodeFromBufferedReader(final BufferedReader in) {
+    try {
+      for (String code = in.readLine(); code != null; code = in.readLine()) {
+        output.print(considerCode(code));
+      }
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public String considerCode(final String hexCode) {
+    Bytes codeBytes;
+    try {
+      codeBytes =
+          Bytes.fromHexString(
+              hexCode.replaceAll("(^|\n)#[^\n]*($|\n)", "").replaceAll("[^0-9A-Za-z]", ""));
+    } catch (RuntimeException re) {
+      return "err: hex string -" + re + "\n";
+    }
+    if (codeBytes.size() == 0) {
+      return "";
+    }
+
+    var layout = EOFLayout.parseEOF(codeBytes);
+    if (!layout.isValid()) {
+      return "err: layout - " + layout.getInvalidReason() + "\n";
+    }
+
+    var code = CodeFactory.createCode(codeBytes, 1, true);
+    if (!code.isValid()) {
+      return "err: " + ((CodeInvalid) code).getInvalidReason() + "\n";
+    }
+
+    return "OK "
+        + IntStream.range(0, code.getCodeSectionCount())
+            .mapToObj(code::getCodeSection)
+            .map(cs -> layout.getContainer().slice(cs.getEntryPoint(), cs.getLength()))
+            .map(Bytes::toUnprefixedHexString)
+            .collect(Collectors.joining(","))
+        + "\n";
+  }
+}
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/DataStoreModule.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/DataStoreModule.java
index c4b334526ea..65585b6441e 100644
--- a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/DataStoreModule.java
+++ b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/DataStoreModule.java
@@ -19,6 +19,7 @@
 import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage;
+import org.hyperledger.besu.ethereum.storage.keyvalue.VariablesKeyValueStorage;
 import org.hyperledger.besu.plugin.services.BesuConfiguration;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
@@ -37,14 +38,11 @@
 import com.google.common.base.Suppliers;
 import dagger.Module;
 import dagger.Provides;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 @SuppressWarnings({"CloseableProvides"})
 @Module(includes = GenesisFileModule.class)
 public class DataStoreModule {
 
-  private static final Logger LOG = LogManager.getLogger();
   private final Supplier<RocksDBKeyValueStorageFactory> rocksDBFactory =
       Suppliers.memoize(
           () ->
@@ -53,6 +51,20 @@ public class DataStoreModule {
                   List.of(KeyValueSegmentIdentifier.values()),
                   RocksDBMetricsFactory.PUBLIC_ROCKS_DB_METRICS));
 
+  @Provides
+  @Singleton
+  @Named("variables")
+  KeyValueStorage provideVariablesKeyValueStorage(
+      @Named("KeyValueStorageName") final String keyValueStorageName,
+      final BesuConfiguration commonConfiguration,
+      final MetricsSystem metricsSystem) {
+    return constructKeyValueStorage(
+        keyValueStorageName,
+        commonConfiguration,
+        metricsSystem,
+        KeyValueSegmentIdentifier.VARIABLES);
+  }
+
   @Provides
   @Singleton
   @Named("blockchain")
@@ -84,6 +96,7 @@ KeyValueStorage provideWorldStateKeyValueStorage(
   @Provides
   @Singleton
   @Named("worldStatePreimage")
+  @SuppressWarnings("UnusedVariable")
   KeyValueStorage provideWorldStatePreimageKeyValueStorage(
       @Named("KeyValueStorageName") final String keyValueStorageName,
       final BesuConfiguration commonConfiguration,
@@ -115,7 +128,7 @@ private KeyValueStorage constructKeyValueStorage(
       case "rocksdb":
         return rocksDBFactory.get().create(segment, commonConfiguration, metricsSystem);
       default:
-        LOG.error("Unknown key, continuing as though 'memory' was specified");
+        System.err.println("Unknown key, continuing as though 'memory' was specified");
         // fall through
       case "memory":
         return new InMemoryKeyValueStorage();
@@ -126,7 +139,9 @@ private KeyValueStorage constructKeyValueStorage(
   @Singleton
   static BlockchainStorage provideBlockchainStorage(
       @Named("blockchain") final KeyValueStorage keyValueStorage,
+      @Named("variables") final KeyValueStorage variablesKeyValueStorage,
       final BlockHeaderFunctions blockHashFunction) {
-    return new KeyValueStoragePrefixedKeyBlockchainStorage(keyValueStorage, blockHashFunction);
+    return new KeyValueStoragePrefixedKeyBlockchainStorage(
+        keyValueStorage, new VariablesKeyValueStorage(variablesKeyValueStorage), blockHashFunction);
   }
 }
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EvmTool.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EvmTool.java
index b47a962d226..c6bef5726cf 100644
--- a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EvmTool.java
+++ b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EvmTool.java
@@ -15,21 +15,11 @@
  */
 package org.hyperledger.besu.evmtool;
 
-import static picocli.CommandLine.defaultExceptionHandler;
-
-import picocli.CommandLine;
-
 public final class EvmTool {
-  private static final int SUCCESS_EXIT_CODE = 0;
-  private static final int ERROR_EXIT_CODE = 1;
 
   public static void main(final String... args) {
-
     final EvmToolCommand evmToolCommand = new EvmToolCommand();
 
-    evmToolCommand.parse(
-        new CommandLine.RunLast().andExit(SUCCESS_EXIT_CODE),
-        defaultExceptionHandler().andExit(ERROR_EXIT_CODE),
-        args);
+    evmToolCommand.execute(args);
   }
 }
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EvmToolCommand.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EvmToolCommand.java
index 6da512163c9..67bfadccb09 100644
--- a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EvmToolCommand.java
+++ b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EvmToolCommand.java
@@ -15,48 +15,60 @@
  */
 package org.hyperledger.besu.evmtool;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static picocli.CommandLine.ScopeType.INHERIT;
 
 import org.hyperledger.besu.cli.config.NetworkName;
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.LogsBloomFilter;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
-import org.hyperledger.besu.ethereum.mainnet.MainnetMessageCallProcessor;
-import org.hyperledger.besu.ethereum.mainnet.PrecompileContractRegistry;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
-import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
-import org.hyperledger.besu.ethereum.vm.Code;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.OperationTracer;
-import org.hyperledger.besu.ethereum.vm.StandardJsonTracer;
-
+import org.hyperledger.besu.ethereum.vm.CachingBlockHashLookup;
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.EvmSpecVersion;
+import org.hyperledger.besu.evm.account.AccountStorageEntry;
+import org.hyperledger.besu.evm.code.CodeInvalid;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
+import org.hyperledger.besu.evm.precompile.PrecompileContractRegistry;
+import org.hyperledger.besu.evm.processor.MessageCallProcessor;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.evm.tracing.StandardJsonTracer;
+import org.hyperledger.besu.evm.worldstate.WorldState;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+import org.hyperledger.besu.metrics.MetricsSystemModule;
+
+import java.io.BufferedWriter;
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
-import java.io.PrintStream;
-import java.nio.charset.StandardCharsets;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
 import java.time.Instant;
 import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
 import java.util.Deque;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.NavigableMap;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
+import com.google.common.base.Joiner;
 import com.google.common.base.Stopwatch;
 import io.vertx.core.json.JsonObject;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.config.Configurator;
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
@@ -74,22 +86,30 @@
     optionListHeading = "%nOptions:%n",
     footerHeading = "%n",
     footer = "Hyperledger Besu is licensed under the Apache License 2.0",
-    subcommands = {StateTestSubCommand.class})
+    subcommands = {
+      B11rSubCommand.class,
+      CodeValidateSubCommand.class,
+      StateTestSubCommand.class,
+      T8nSubCommand.class,
+      T8nServerSubCommand.class
+    })
 public class EvmToolCommand implements Runnable {
 
-  private static final Logger LOG = LogManager.getLogger();
-
   @Option(
       names = {"--code"},
       paramLabel = "<code>",
       description = "Byte stream of code to be executed.")
-  private final Bytes codeHexString = Bytes.EMPTY;
+  void setBytes(final String optionValue) {
+    codeBytes = Bytes.fromHexString(optionValue.replace(" ", ""));
+  }
+
+  private Bytes codeBytes = Bytes.EMPTY;
 
   @Option(
       names = {"--gas"},
       description = "Amount of gas for this invocation.",
       paramLabel = "<int>")
-  private final Gas gas = Gas.of(10_000_000_000L);
+  private final Long gas = 10_000_000_000L;
 
   @Option(
       names = {"--price"},
@@ -122,16 +142,46 @@ public class EvmToolCommand implements Runnable {
   private final Wei ethValue = Wei.ZERO;
 
   @Option(
-      names = {"--json"},
+      names = {"--json", "--trace"},
       description = "Trace each opcode as a json object.",
       scope = INHERIT)
   final Boolean showJsonResults = false;
 
   @Option(
-      names = {"--nomemory"},
-      description = "Disable showing the full memory output for each op.",
+      names = {"--json-alloc"},
+      description = "Output the final allocations after a run.",
       scope = INHERIT)
-  final Boolean noMemory = false;
+  final Boolean showJsonAlloc = false;
+
+  @Option(
+      names = {"--memory", "--trace.memory"},
+      description =
+          "Show the full memory output in tracing for each op. Default is not to show memory.",
+      scope = INHERIT,
+      negatable = true)
+  final Boolean showMemory = false;
+
+  @Option(
+      names = {"--trace.nostack"},
+      description = "Show the operand stack in tracing for each op. Default is to show stack.",
+      scope = INHERIT,
+      negatable = true)
+  final Boolean hideStack = false;
+
+  @Option(
+      names = {"--trace.returndata"},
+      description =
+          "Show the return data in tracing for each op when present. Default is to show return data.",
+      scope = INHERIT,
+      negatable = true)
+  final Boolean showReturnData = false;
+
+  @Option(
+      names = {"--notime"},
+      description = "Don't include time data in summary output.",
+      scope = INHERIT,
+      negatable = true)
+  final Boolean noTime = false;
 
   @Option(
       names = {"--prestate", "--genesis"},
@@ -148,28 +198,87 @@ public class EvmToolCommand implements Runnable {
       description = "Number of times to repeat for benchmarking.")
   private final Integer repeat = 0;
 
+  @Option(
+      names = {"-v", "--version"},
+      versionHelp = true,
+      description = "display version info")
+  boolean versionInfoRequested;
+
+  static final Joiner STORAGE_JOINER = Joiner.on(",\n");
   private final EvmToolCommandOptionsModule daggerOptions = new EvmToolCommandOptionsModule();
-  private PrintStream out = System.out;
+  PrintWriter out;
+  InputStream in;
+
+  public EvmToolCommand() {
+    this(
+        new ByteArrayInputStream(new byte[0]),
+        new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out, UTF_8)), true));
+  }
+
+  public EvmToolCommand(final InputStream in, final PrintWriter out) {
+    this.in = in;
+    this.out = out;
+  }
+
+  void execute(final String... args) {
+    execute(System.in, new PrintWriter(System.out, true, UTF_8), args);
+  }
 
-  void parse(
-      final CommandLine.AbstractParseResultHandler<List<Object>> resultHandler,
-      final CommandLine.DefaultExceptionHandler<List<Object>> exceptionHandler,
-      final String[] args) {
+  void execute(final InputStream input, final PrintWriter output, final String[] args) {
+    final CommandLine commandLine = new CommandLine(this).setOut(output);
+    out = output;
+    in = input;
 
-    out = resultHandler.out();
-    final CommandLine commandLine = new CommandLine(this);
+    // add dagger-injected options
     commandLine.addMixin("Dagger Options", daggerOptions);
-    // Usage of static command line flags is strictly reserved for experimental EIPs
-    commandLine.addMixin("Experimental EIPs", ExperimentalEIPs.class);
 
     // add sub commands here
-
     commandLine.registerConverter(Address.class, Address::fromHexString);
     commandLine.registerConverter(Bytes.class, Bytes::fromHexString);
-    commandLine.registerConverter(Gas.class, (arg) -> Gas.of(Long.parseUnsignedLong(arg)));
-    commandLine.registerConverter(Wei.class, (arg) -> Wei.of(Long.parseUnsignedLong(arg)));
+    commandLine.registerConverter(Wei.class, arg -> Wei.of(Long.parseUnsignedLong(arg)));
+
+    // change negation regexp so --nomemory works.  See
+    // https://picocli.info/#_customizing_negatable_options
+    commandLine.setNegatableOptionTransformer(
+        new CommandLine.RegexTransformer.Builder()
+            .addPattern("^--no(\\w(-|\\w)*)$", "--$1", "--[no]$1")
+            .addPattern("^--trace.no(\\w(-|\\w)*)$", "--trace.$1", "--trace.[no]$1")
+            .addPattern("^--(\\w(-|\\w)*)$", "--no$1", "--[no]$1")
+            .addPattern("^--trace.(\\w(-|\\w)*)$", "--trace.no$1", "--trace.[no]$1")
+            .build());
+
+    // Enumerate forks to support execution-spec-tests
+    addForkHelp(commandLine.getSubcommands().get("t8n"));
+    addForkHelp(commandLine.getSubcommands().get("t8n-server"));
+
+    commandLine.setExecutionStrategy(new CommandLine.RunLast());
+    commandLine.execute(args);
+  }
 
-    commandLine.parseWithHandlers(resultHandler, exceptionHandler, args);
+  private static void addForkHelp(final CommandLine subCommandLine) {
+    subCommandLine
+        .getHelpSectionMap()
+        .put("forks_header", help -> help.createHeading("%nKnown Forks:%n"));
+    subCommandLine
+        .getHelpSectionMap()
+        .put(
+            "forks",
+            help ->
+                help.createTextTable(
+                        Arrays.stream(EvmSpecVersion.values())
+                            .collect(
+                                Collectors.toMap(
+                                    EvmSpecVersion::getName,
+                                    EvmSpecVersion::getDescription,
+                                    (a, b) -> b,
+                                    LinkedHashMap::new)))
+                    .toString());
+    List<String> keys = new ArrayList<>(subCommandLine.getHelpSectionKeys());
+    int index = keys.indexOf(CommandLine.Model.UsageMessageSpec.SECTION_KEY_FOOTER_HEADING);
+    keys.add(index, "forks_header");
+    keys.add(index + 1, "forks");
+
+    subCommandLine.setHelpSectionKeys(keys);
   }
 
   @Override
@@ -208,33 +317,61 @@ public void run() {
               .blockHeaderFunctions(new MainnetBlockHeaderFunctions())
               .buildBlockHeader();
 
-      Configurator.setAllLevels("", repeat == 0 ? Level.INFO : Level.OFF);
-      int repeat = this.repeat;
-      Configurator.setLevel(
-          "org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder", Level.OFF);
-      final ProtocolSpec protocolSpec = component.getProtocolSpec().apply(0);
-      Configurator.setLevel("org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder", null);
+      int remainingIters = this.repeat;
+      final ProtocolSpec protocolSpec =
+          component.getProtocolSpec().apply(BlockHeaderBuilder.createDefault().buildBlockHeader());
+      final Transaction tx =
+          new Transaction(
+              0,
+              Wei.ZERO,
+              Long.MAX_VALUE,
+              Optional.ofNullable(receiver),
+              Wei.ZERO,
+              null,
+              callData,
+              sender,
+              Optional.empty(),
+              Optional.empty());
+
+      final long intrinsicGasCost =
+          protocolSpec
+              .getGasCalculator()
+              .transactionIntrinsicGasCost(tx.getPayload(), tx.isContractCreation());
+      final long accessListCost =
+          tx.getAccessList()
+              .map(list -> protocolSpec.getGasCalculator().accessListGasCost(list))
+              .orElse(0L);
+      long txGas = gas - intrinsicGasCost - accessListCost;
+
       final PrecompileContractRegistry precompileContractRegistry =
           protocolSpec.getPrecompileContractRegistry();
       final EVM evm = protocolSpec.getEvm();
+      Code code = evm.getCode(Hash.hash(codeBytes), codeBytes);
+      if (!code.isValid()) {
+        out.println(((CodeInvalid) code).getInvalidReason());
+        return;
+      }
       final Stopwatch stopwatch = Stopwatch.createUnstarted();
       long lastTime = 0;
       do {
-        final boolean lastLoop = repeat == 0;
+        final boolean lastLoop = remainingIters == 0;
 
         final OperationTracer tracer = // You should have picked Mercy.
             lastLoop && showJsonResults
-                ? new StandardJsonTracer(System.out, !noMemory)
+                ? new StandardJsonTracer(out, showMemory, !hideStack, showReturnData)
                 : OperationTracer.NO_TRACING;
 
+        WorldUpdater updater = component.getWorldUpdater();
+        updater.getOrCreate(sender);
+        updater.getOrCreate(receiver);
+
         final Deque<MessageFrame> messageFrameStack = new ArrayDeque<>();
         messageFrameStack.add(
             MessageFrame.builder()
                 .type(MessageFrame.Type.MESSAGE_CALL)
                 .messageFrameStack(messageFrameStack)
-                .blockchain(component.getBlockchain())
-                .worldState(component.getWorldUpdater())
-                .initialGas(gas)
+                .worldUpdater(updater)
+                .initialGas(txGas)
                 .contract(Address.ZERO)
                 .address(receiver)
                 .originator(sender)
@@ -243,69 +380,108 @@ public void run() {
                 .inputData(callData)
                 .value(ethValue)
                 .apparentValue(ethValue)
-                .code(new Code(codeHexString))
-                .blockHeader(blockHeader)
+                .code(code)
+                .blockValues(blockHeader)
                 .depth(0)
                 .completer(c -> {})
                 .miningBeneficiary(blockHeader.getCoinbase())
-                .blockHashLookup(new BlockHashLookup(blockHeader, component.getBlockchain()))
-                .contractAccountVersion(Account.DEFAULT_VERSION)
+                .blockHashLookup(new CachingBlockHashLookup(blockHeader, component.getBlockchain()))
                 .build());
 
-        final MainnetMessageCallProcessor mcp =
-            new MainnetMessageCallProcessor(evm, precompileContractRegistry);
+        final MessageCallProcessor mcp = new MessageCallProcessor(evm, precompileContractRegistry);
         stopwatch.start();
         while (!messageFrameStack.isEmpty()) {
           final MessageFrame messageFrame = messageFrameStack.peek();
           mcp.process(messageFrame, tracer);
-          if (lastLoop) {
-            if (messageFrame.getExceptionalHaltReason().isPresent()) {
-              out.println(messageFrame.getExceptionalHaltReason().get());
-            }
-            if (messageFrame.getRevertReason().isPresent()) {
-              out.println(
-                  new String(
-                      messageFrame.getRevertReason().get().toArray(), StandardCharsets.UTF_8));
-            }
-          }
           if (messageFrameStack.isEmpty()) {
             stopwatch.stop();
             if (lastTime == 0) {
               lastTime = stopwatch.elapsed().toNanos();
             }
+            if (lastLoop) {
+              if (messageFrame.getExceptionalHaltReason().isPresent()) {
+                out.println(messageFrame.getExceptionalHaltReason().get());
+              }
+              if (messageFrame.getRevertReason().isPresent()) {
+                out.println(new String(messageFrame.getRevertReason().get().toArray(), UTF_8));
+              }
+            }
           }
 
           if (lastLoop && messageFrameStack.isEmpty()) {
-            final Transaction tx =
-                new Transaction(
-                    0,
-                    Wei.ZERO,
-                    Long.MAX_VALUE,
-                    Optional.ofNullable(receiver),
-                    Wei.ZERO,
-                    null,
-                    callData,
-                    sender,
-                    Optional.empty());
-
-            final Gas intrinsicGasCost =
-                protocolSpec.getGasCalculator().transactionIntrinsicGasCost(tx);
-            final Gas evmGas = gas.minus(messageFrame.getRemainingGas());
+            final long evmGas = txGas - messageFrame.getRemainingGas();
+            final JsonObject resultLine = new JsonObject();
+            resultLine.put("gasUser", "0x" + Long.toHexString(evmGas));
+            if (!noTime) {
+              resultLine.put("timens", lastTime).put("time", lastTime / 1000);
+            }
+            resultLine
+                .put("gasTotal", "0x" + Long.toHexString(evmGas))
+                .put("output", messageFrame.getOutputData().toHexString());
             out.println();
-            out.println(
-                new JsonObject()
-                    .put("gasUser", evmGas.asUInt256().toShortHexString())
-                    .put("timens", lastTime)
-                    .put("time", lastTime / 1000)
-                    .put("gasTotal", evmGas.plus(intrinsicGasCost).asUInt256().toShortHexString()));
+            out.println(resultLine);
           }
         }
         lastTime = stopwatch.elapsed().toNanos();
         stopwatch.reset();
-      } while (repeat-- > 0);
+        if (showJsonAlloc && lastLoop) {
+          updater.commit();
+          WorldState worldState = component.getWorldState();
+          dumpWorldState(worldState, out);
+        }
+      } while (remainingIters-- > 0);
 
     } catch (final IOException e) {
-      LOG.fatal(e);
+      System.err.println("Unable to create Genesis module");
+      e.printStackTrace(System.out);
     }
   }
+
+  public static void dumpWorldState(final WorldState worldState, final PrintWriter out) {
+    out.println("{");
+    worldState
+        .streamAccounts(Bytes32.ZERO, Integer.MAX_VALUE)
+        .sorted(Comparator.comparing(o -> o.getAddress().get().toHexString()))
+        .forEach(
+            account -> {
+              out.println(
+                  " \"" + account.getAddress().map(Address::toHexString).orElse("-") + "\": {");
+              if (account.getCode() != null && account.getCode().size() > 0) {
+                out.println("  \"code\": \"" + account.getCode().toHexString() + "\",");
+              }
+              NavigableMap<Bytes32, AccountStorageEntry> storageEntries =
+                  account.storageEntriesFrom(Bytes32.ZERO, Integer.MAX_VALUE);
+              if (!storageEntries.isEmpty()) {
+                out.println("  \"storage\": {");
+                out.println(
+                    STORAGE_JOINER.join(
+                        storageEntries.values().stream()
+                            .map(
+                                accountStorageEntry ->
+                                    "   \""
+                                        + accountStorageEntry
+                                            .getKey()
+                                            .map(UInt256::toHexString)
+                                            .orElse("-")
+                                        + "\": \""
+                                        + accountStorageEntry.getValue().toHexString()
+                                        + "\"")
+                            .toList()));
+                out.println("  },");
+              }
+              out.print("  \"balance\": \"" + account.getBalance().toShortHexString() + "\"");
+              if (account.getNonce() > 0) {
+                out.println(",");
+                out.println(
+                    "  \"nonce\": \""
+                        + Bytes.ofUnsignedLong(account.getNonce()).toShortHexString()
+                        + "\"");
+              } else {
+                out.println();
+              }
+              out.println(" },");
+            });
+    out.println("}");
+    out.flush();
+  }
 }
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EvmToolCommandOptionsModule.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EvmToolCommandOptionsModule.java
index 19a20ed247f..9c97c8d36f8 100644
--- a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EvmToolCommandOptionsModule.java
+++ b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EvmToolCommandOptionsModule.java
@@ -24,7 +24,9 @@
 import org.hyperledger.besu.services.BesuConfigurationImpl;
 
 import java.nio.file.Path;
+import java.util.Optional;
 import javax.inject.Named;
+import javax.inject.Singleton;
 
 import dagger.Module;
 import dagger.Provides;
@@ -49,6 +51,18 @@ boolean provideRevertReasonEnabled() {
     return revertReasonEnabled;
   }
 
+  @Option(
+      names = {"--fork"},
+      paramLabel = "<String>",
+      description = "Fork to evaluate, overriding network setting.")
+  String fork = null;
+
+  @Provides
+  @Named("Fork")
+  Optional<String> provideFork() {
+    return Optional.ofNullable(fork);
+  }
+
   @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"}) // PicoCLI requires non-final Strings.
   @Option(
       names = {"--key-value-storage"},
@@ -71,6 +85,7 @@ String provideKeyValueStorageName() {
   final Path dataPath = getDefaultBesuDataPath(this);
 
   @Provides
+  @Singleton
   BesuConfiguration provideBesuConfiguration() {
     return new BesuConfigurationImpl(dataPath, dataPath.resolve(BesuController.DATABASE_PATH));
   }
@@ -83,6 +98,7 @@ BesuConfiguration provideBesuConfiguration() {
   private final BlockParameter blockParameter = BlockParameter.PENDING;
 
   @Provides
+  @Singleton
   BlockParameter provideBlockParameter() {
     return blockParameter;
   }
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EvmToolComponent.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EvmToolComponent.java
index a7fa31e3451..5f66c5ddf50 100644
--- a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EvmToolComponent.java
+++ b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/EvmToolComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -16,8 +16,12 @@
 package org.hyperledger.besu.evmtool;
 
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+import org.hyperledger.besu.metrics.MetricsConfigurationModule;
+import org.hyperledger.besu.metrics.MetricsSystemModule;
 
 import java.util.function.Function;
 import javax.inject.Singleton;
@@ -32,13 +36,16 @@
       DataStoreModule.class,
       BlockchainModule.class,
       EvmToolCommandOptionsModule.class,
+      MetricsConfigurationModule.class,
       MetricsSystemModule.class,
     })
 public interface EvmToolComponent {
 
-  Function<Integer, ProtocolSpec> getProtocolSpec();
+  Function<BlockHeader, ProtocolSpec> getProtocolSpec();
 
   WorldUpdater getWorldUpdater();
 
+  MutableWorldState getWorldState();
+
   Blockchain getBlockchain();
 }
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/GenesisFileModule.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/GenesisFileModule.java
index 2563c4cdb3e..6bd2ee52ac7 100644
--- a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/GenesisFileModule.java
+++ b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/GenesisFileModule.java
@@ -28,6 +28,7 @@
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
+import java.util.Optional;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
@@ -40,10 +41,6 @@ public class GenesisFileModule {
 
   private final String genesisConfig;
 
-  protected GenesisFileModule(final File genesisFile) throws IOException {
-    this.genesisConfig = Files.readString(genesisFile.toPath(), Charset.defaultCharset());
-  }
-
   protected GenesisFileModule(final String genesisConfig) {
     this.genesisConfig = genesisConfig;
   }
@@ -62,8 +59,10 @@ GenesisConfigOptions provideGenesisConfigOptions(final GenesisConfigFile genesis
 
   @Singleton
   @Provides
+  @SuppressWarnings("UnusedVariable")
   ProtocolSchedule provideProtocolSchedule(
       final GenesisConfigOptions configOptions,
+      @Named("Fork") final Optional<String> fork,
       @Named("RevertReasonEnabled") final boolean revertReasonEnabled) {
     throw new RuntimeException("Abstract");
   }
@@ -97,18 +96,11 @@ static GenesisFileModule createGenesisModule(final File genesisFile) throws IOEx
   }
 
   private static GenesisFileModule createGenesisModule(final String genesisConfig) {
-    // duplicating work from JsonGenesisConfigOptions, but in a refactoring this goes away.
     final JsonObject genesis = new JsonObject(genesisConfig);
     final JsonObject config = genesis.getJsonObject("config");
-    if (config.containsKey("ethash")) {
-      return new MainnetGenesisFileModule(genesisConfig);
-    } else if (config.containsKey("ibft")) {
-      return new IBFTGenesisFileModule(genesisConfig);
-    } else if (config.containsKey("clique")) {
-      return new CliqueGenesisFileModule(genesisConfig);
-    } else {
-      // default is mainnet
-      return new MainnetGenesisFileModule(genesisConfig);
+    if (config.containsKey("clique") || config.containsKey("qbft")) {
+      throw new RuntimeException("Only Ethash and Merge configs accepted as genesis files");
     }
+    return new MainnetGenesisFileModule(genesisConfig);
   }
 }
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/IBFTGenesisFileModule.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/IBFTGenesisFileModule.java
deleted file mode 100644
index 236a278e4db..00000000000
--- a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/IBFTGenesisFileModule.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-package org.hyperledger.besu.evmtool;
-
-import org.hyperledger.besu.config.GenesisConfigOptions;
-import org.hyperledger.besu.consensus.ibft.IbftBlockHeaderFunctions;
-import org.hyperledger.besu.consensus.ibft.IbftProtocolSchedule;
-import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
-import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-
-import javax.inject.Named;
-
-class IBFTGenesisFileModule extends GenesisFileModule {
-
-  IBFTGenesisFileModule(final String genesisConfig) {
-    super(genesisConfig);
-  }
-
-  @Override
-  ProtocolSchedule provideProtocolSchedule(
-      final GenesisConfigOptions configOptions,
-      @Named("RevertReasonEnabled") final boolean revertReasonEnabled) {
-    return IbftProtocolSchedule.create(configOptions);
-  }
-
-  @Override
-  BlockHeaderFunctions blockHashFunction() {
-    return IbftBlockHeaderFunctions.forOnChainBlock();
-  }
-}
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/JsonUtils.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/JsonUtils.java
new file mode 100644
index 00000000000..277679c0c80
--- /dev/null
+++ b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/JsonUtils.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.evmtool;
+
+import org.hyperledger.besu.datatypes.Address;
+
+import com.fasterxml.jackson.core.JsonParser.Feature;
+import com.fasterxml.jackson.core.util.DefaultIndenter;
+import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.apache.tuweni.bytes.Bytes;
+
+public class JsonUtils {
+
+  private JsonUtils() {}
+
+  /**
+   * Create an object mapper with all the standard bells and whistles needed for evmtool
+   *
+   * @return a properly constructed ObjectMapper
+   */
+  public static ObjectMapper createObjectMapper() {
+    final ObjectMapper objectMapper = new ObjectMapper();
+
+    // Attempting to get byte-perfect to go's standard json output
+    objectMapper.setDefaultPrettyPrinter(
+        (new DefaultPrettyPrinter())
+            .withSpacesInObjectEntries()
+            .withObjectIndenter(DefaultIndenter.SYSTEM_LINEFEED_INSTANCE.withIndent("  "))
+            .withArrayIndenter(DefaultIndenter.SYSTEM_LINEFEED_INSTANCE.withIndent("  ")));
+
+    // When we stream stdin we cannot close the stream
+    objectMapper.disable(Feature.AUTO_CLOSE_SOURCE);
+
+    // GraalVM has a hard time reflecting these classes for serialization
+    SimpleModule serializers = new SimpleModule("Serializers");
+    serializers.addSerializer(Address.class, ToStringSerializer.instance);
+    serializers.addSerializer(Bytes.class, ToStringSerializer.instance);
+    objectMapper.registerModule(serializers);
+
+    return objectMapper;
+  }
+}
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/MainnetGenesisFileModule.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/MainnetGenesisFileModule.java
index cb0a280371b..89c361b7d42 100644
--- a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/MainnetGenesisFileModule.java
+++ b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/MainnetGenesisFileModule.java
@@ -16,11 +16,21 @@
 package org.hyperledger.besu.evmtool;
 
 import org.hyperledger.besu.config.GenesisConfigOptions;
+import org.hyperledger.besu.config.StubGenesisConfigOptions;
 import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpecAdapters;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 
+import java.math.BigInteger;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.Supplier;
 import javax.inject.Named;
 
 class MainnetGenesisFileModule extends GenesisFileModule {
@@ -29,15 +39,78 @@ class MainnetGenesisFileModule extends GenesisFileModule {
     super(genesisConfig);
   }
 
+  @Override
+  BlockHeaderFunctions blockHashFunction() {
+    return new MainnetBlockHeaderFunctions();
+  }
+
   @Override
   ProtocolSchedule provideProtocolSchedule(
       final GenesisConfigOptions configOptions,
+      @Named("Fork") final Optional<String> fork,
       @Named("RevertReasonEnabled") final boolean revertReasonEnabled) {
-    return MainnetProtocolSchedule.fromConfig(configOptions);
+    if (fork.isPresent()) {
+      var schedules = createSchedules();
+      var schedule = schedules.get(fork.map(String::toLowerCase).get());
+      if (schedule != null) {
+        return schedule.get();
+      }
+    }
+    return MainnetProtocolSchedule.fromConfig(configOptions, EvmConfiguration.DEFAULT);
   }
 
-  @Override
-  BlockHeaderFunctions blockHashFunction() {
-    return new MainnetBlockHeaderFunctions();
+  public static Map<String, Supplier<ProtocolSchedule>> createSchedules() {
+    return Map.ofEntries(
+        Map.entry("frontier", createSchedule(new StubGenesisConfigOptions())),
+        Map.entry("homestead", createSchedule(new StubGenesisConfigOptions().homesteadBlock(0))),
+        Map.entry("eip150", createSchedule(new StubGenesisConfigOptions().eip150Block(0))),
+        Map.entry("eip158", createSchedule(new StubGenesisConfigOptions().eip158Block(0))),
+        Map.entry("byzantium", createSchedule(new StubGenesisConfigOptions().byzantiumBlock(0))),
+        Map.entry(
+            "constantinople",
+            createSchedule(new StubGenesisConfigOptions().constantinopleBlock(0))),
+        Map.entry(
+            "constantinoplefix", createSchedule(new StubGenesisConfigOptions().petersburgBlock(0))),
+        Map.entry("petersburg", createSchedule(new StubGenesisConfigOptions().petersburgBlock(0))),
+        Map.entry("istanbul", createSchedule(new StubGenesisConfigOptions().istanbulBlock(0))),
+        Map.entry(
+            "muirglacier", createSchedule(new StubGenesisConfigOptions().muirGlacierBlock(0))),
+        Map.entry("berlin", createSchedule(new StubGenesisConfigOptions().berlinBlock(0))),
+        Map.entry(
+            "london",
+            createSchedule(new StubGenesisConfigOptions().londonBlock(0).baseFeePerGas(0x0a))),
+        Map.entry(
+            "arrowglacier", createSchedule(new StubGenesisConfigOptions().arrowGlacierBlock(0))),
+        Map.entry(
+            "grayglacier", createSchedule(new StubGenesisConfigOptions().grayGlacierBlock(0))),
+        Map.entry(
+            "merge",
+            createSchedule(
+                new StubGenesisConfigOptions().mergeNetSplitBlock(0).baseFeePerGas(0x0a))),
+        Map.entry(
+            "shanghai",
+            createSchedule(new StubGenesisConfigOptions().shanghaiTime(0).baseFeePerGas(0x0a))),
+        Map.entry(
+            "cancun",
+            createSchedule(new StubGenesisConfigOptions().cancunTime(0).baseFeePerGas(0x0a))),
+        Map.entry(
+            "futureeips",
+            createSchedule(new StubGenesisConfigOptions().futureEipsTime(0).baseFeePerGas(0x0a))),
+        Map.entry(
+            "experimentaleips",
+            createSchedule(
+                new StubGenesisConfigOptions().experimentalEipsTime(0).baseFeePerGas(0x0a))));
+  }
+
+  private static Supplier<ProtocolSchedule> createSchedule(final GenesisConfigOptions options) {
+    return () ->
+        new ProtocolScheduleBuilder(
+                options,
+                options.getChainId().orElse(BigInteger.ONE),
+                ProtocolSpecAdapters.create(0, Function.identity()),
+                PrivacyParameters.DEFAULT,
+                false,
+                EvmConfiguration.DEFAULT)
+            .createProtocolSchedule();
   }
 }
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/MetricsSystemModule.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/MetricsSystemModule.java
deleted file mode 100644
index 975d2d70837..00000000000
--- a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/MetricsSystemModule.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-
-package org.hyperledger.besu.evmtool;
-
-import org.hyperledger.besu.metrics.MetricsSystemFactory;
-import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
-import org.hyperledger.besu.plugin.services.MetricsSystem;
-
-import dagger.Module;
-import dagger.Provides;
-
-@SuppressWarnings("WeakerAccess")
-@Module
-public class MetricsSystemModule {
-
-  @Provides
-  MetricsSystem getMetricsSystem() {
-    return MetricsSystemFactory.create(MetricsConfiguration.builder().build());
-  }
-}
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/ProtocolModule.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/ProtocolModule.java
index 8d32ffb933a..14702bc5e8d 100644
--- a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/ProtocolModule.java
+++ b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/ProtocolModule.java
@@ -15,10 +15,12 @@
  */
 package org.hyperledger.besu.evmtool;
 
+import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 
 import java.util.function.Function;
+import javax.inject.Singleton;
 
 import dagger.Module;
 import dagger.Provides;
@@ -28,7 +30,8 @@
 public class ProtocolModule {
 
   @Provides
-  Function<Integer, ProtocolSpec> getProtocolSpec(final ProtocolSchedule protocolSchedule) {
-    return protocolSchedule::getByBlockNumber;
+  @Singleton
+  Function<BlockHeader, ProtocolSpec> getProtocolSpec(final ProtocolSchedule protocolSchedule) {
+    return protocolSchedule::getByBlockHeader;
   }
 }
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/StateTestSubCommand.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/StateTestSubCommand.java
index 1996dcddb46..4b86cbb0eb0 100644
--- a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/StateTestSubCommand.java
+++ b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/StateTestSubCommand.java
@@ -16,19 +16,19 @@
 
 package org.hyperledger.besu.evmtool;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.hyperledger.besu.ethereum.referencetests.ReferenceTestProtocolSchedules.shouldClearEmptyAccounts;
 import static org.hyperledger.besu.evmtool.StateTestSubCommand.COMMAND_NAME;
 
-import org.hyperledger.besu.ethereum.core.Account;
+import org.hyperledger.besu.datatypes.DataGas;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Log;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.WorldState;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
 import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.referencetests.GeneralStateTestCaseEipSpec;
@@ -36,33 +36,31 @@
 import org.hyperledger.besu.ethereum.referencetests.ReferenceTestBlockchain;
 import org.hyperledger.besu.ethereum.referencetests.ReferenceTestProtocolSchedules;
 import org.hyperledger.besu.ethereum.rlp.RLP;
-import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
-import org.hyperledger.besu.ethereum.vm.OperationTracer;
-import org.hyperledger.besu.ethereum.vm.StandardJsonTracer;
 import org.hyperledger.besu.ethereum.worldstate.DefaultMutableWorldState;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.evm.tracing.StandardJsonTracer;
+import org.hyperledger.besu.evm.worldstate.WorldState;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 import org.hyperledger.besu.evmtool.exception.UnsupportedForkException;
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import com.fasterxml.jackson.core.JsonParser.Feature;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.base.Stopwatch;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.config.Configurator;
-import org.apache.tuweni.units.bigints.UInt256;
+import org.apache.tuweni.bytes.Bytes;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
 import picocli.CommandLine.Parameters;
@@ -74,8 +72,6 @@
     mixinStandardHelpOptions = true,
     versionProvider = VersionProvider.class)
 public class StateTestSubCommand implements Runnable {
-  private static final Logger LOG = LogManager.getLogger();
-
   public static final String COMMAND_NAME = "state-test";
 
   @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"})
@@ -84,33 +80,35 @@ public class StateTestSubCommand implements Runnable {
       description = "Force the state tests to run on a specific fork.")
   private String fork = null;
 
-  @ParentCommand private EvmToolCommand parentCommand;
+  @ParentCommand private final EvmToolCommand parentCommand;
 
   @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") // picocli does it magically
   @Parameters
-  private final List<File> stateTestFiles = new ArrayList<>();
-
-  private final ObjectMapper objectMapper = new ObjectMapper();
+  private final List<Path> stateTestFiles = new ArrayList<>();
 
-  public StateTestSubCommand() {}
+  @SuppressWarnings("unused")
+  public StateTestSubCommand() {
+    // PicoCLI requires this
+    this(null);
+  }
 
-  public StateTestSubCommand(final EvmToolCommand parentCommand) {
+  StateTestSubCommand(final EvmToolCommand parentCommand) {
     this.parentCommand = parentCommand;
   }
 
   @Override
   public void run() {
-    final ObjectMapper objectMapper = new ObjectMapper();
-    objectMapper.disable(Feature.AUTO_CLOSE_SOURCE);
+    final ObjectMapper stateTestMapper = JsonUtils.createObjectMapper();
+
     final JavaType javaType =
-        objectMapper
+        stateTestMapper
             .getTypeFactory()
             .constructParametricType(Map.class, String.class, GeneralStateTestCaseSpec.class);
     try {
       if (stateTestFiles.isEmpty()) {
         // if no state tests were specified use standard input to get filenames
         final BufferedReader in =
-            new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
+            new BufferedReader(new InputStreamReader(parentCommand.in, UTF_8));
         while (true) {
           final String fileName = in.readLine();
           if (fileName == null) {
@@ -119,121 +117,166 @@ public void run() {
           }
           final File file = new File(fileName);
           if (file.isFile()) {
-            try {
-              final Map<String, GeneralStateTestCaseSpec> generalStateTests =
-                  objectMapper.readValue(file, javaType);
-              executeStateTest(generalStateTests);
-            } catch (final JsonProcessingException jpe) {
-              System.out.println("File content error :" + jpe.toString());
-            }
+            final Map<String, GeneralStateTestCaseSpec> generalStateTests =
+                stateTestMapper.readValue(file, javaType);
+            executeStateTest(generalStateTests);
           } else {
-            System.out.println("File not found:" + fileName);
+            parentCommand.out.println("File not found: " + fileName);
           }
         }
       } else {
-        for (final File stateTestFile : stateTestFiles) {
-          final Map<String, GeneralStateTestCaseSpec> generalStateTests =
-              objectMapper.readValue(stateTestFile, javaType);
+        for (final Path stateTestFile : stateTestFiles) {
+          final Map<String, GeneralStateTestCaseSpec> generalStateTests;
+          if ("stdin".equals(stateTestFile.toString())) {
+            generalStateTests = stateTestMapper.readValue(parentCommand.in, javaType);
+          } else {
+            generalStateTests = stateTestMapper.readValue(stateTestFile.toFile(), javaType);
+          }
           executeStateTest(generalStateTests);
         }
       }
+    } catch (final JsonProcessingException jpe) {
+      parentCommand.out.println("File content error: " + jpe);
     } catch (final IOException e) {
-      LOG.fatal(e);
+      System.err.println("Unable to read state file");
+      e.printStackTrace(System.err);
     }
   }
 
   private void executeStateTest(final Map<String, GeneralStateTestCaseSpec> generalStateTests) {
-    for (final var generalStateTestEntry : generalStateTests.entrySet()) {
+    for (final Map.Entry<String, GeneralStateTestCaseSpec> generalStateTestEntry :
+        generalStateTests.entrySet()) {
       generalStateTestEntry
           .getValue()
           .finalStateSpecs()
-          .forEach((fork, specs) -> traceTestSpecs(generalStateTestEntry.getKey(), specs));
+          .forEach((__, specs) -> traceTestSpecs(generalStateTestEntry.getKey(), specs));
     }
   }
 
   private void traceTestSpecs(final String test, final List<GeneralStateTestCaseEipSpec> specs) {
-    Configurator.setLevel(
-        "org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder", Level.OFF);
     final var referenceTestProtocolSchedules = ReferenceTestProtocolSchedules.create();
-    Configurator.setLevel("org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder", null);
 
     final OperationTracer tracer = // You should have picked Mercy.
         parentCommand.showJsonResults
-            ? new StandardJsonTracer(System.out, !parentCommand.noMemory)
+            ? new StandardJsonTracer(
+                parentCommand.out,
+                parentCommand.showMemory,
+                !parentCommand.hideStack,
+                parentCommand.showReturnData)
             : OperationTracer.NO_TRACING;
 
+    final ObjectMapper objectMapper = JsonUtils.createObjectMapper();
     for (final GeneralStateTestCaseEipSpec spec : specs) {
 
       final BlockHeader blockHeader = spec.getBlockHeader();
       final WorldState initialWorldState = spec.getInitialWorldState();
       final Transaction transaction = spec.getTransaction();
 
-      final MutableWorldState worldState = new DefaultMutableWorldState(initialWorldState);
-      // Several of the GeneralStateTests check if the transaction could potentially
-      // consume more gas than is left for the block it's attempted to be included in.
-      // This check is performed within the `BlockImporter` rather than inside the
-      // `TransactionProcessor`, so these tests are skipped.
-      if (transaction.getGasLimit() > blockHeader.getGasLimit() - blockHeader.getGasUsed()) {
-        return;
-      }
+      final ObjectNode summaryLine = objectMapper.createObjectNode();
+      if (transaction == null) {
+        if (parentCommand.showJsonAlloc || parentCommand.showJsonResults) {
+          parentCommand.out.println(
+              "{\"error\":\"Transaction was invalid, trace and alloc unavailable.\"}");
+        }
+        summaryLine.put("test", test);
+        summaryLine.put("fork", spec.getFork());
+        summaryLine.put("d", spec.getDataIndex());
+        summaryLine.put("g", spec.getGasIndex());
+        summaryLine.put("v", spec.getValueIndex());
+        summaryLine.put("pass", spec.getExpectException() != null);
+        summaryLine.put("validationError", "Transaction had out-of-bounds parameters");
+      } else {
+        final MutableWorldState worldState = new DefaultMutableWorldState(initialWorldState);
+        // Several of the GeneralStateTests check if the transaction could potentially
+        // consume more gas than is left for the block it's attempted to be included in.
+        // This check is performed within the `BlockImporter` rather than inside the
+        // `TransactionProcessor`, so these tests are skipped.
+        if (transaction.getGasLimit() > blockHeader.getGasLimit() - blockHeader.getGasUsed()) {
+          return;
+        }
 
-      final String forkName = fork == null ? spec.getFork() : fork;
-      final ProtocolSchedule protocolSchedule = referenceTestProtocolSchedules.getByName(forkName);
-      if (protocolSchedule == null) {
-        throw new UnsupportedForkException(forkName);
-      }
+        final String forkName = fork == null ? spec.getFork() : fork;
+        final ProtocolSchedule protocolSchedule =
+            referenceTestProtocolSchedules.getByName(forkName);
+        if (protocolSchedule == null) {
+          throw new UnsupportedForkException(forkName);
+        }
 
-      final MainnetTransactionProcessor processor =
-          protocolSchedule.getByBlockNumber(0).getTransactionProcessor();
-      final WorldUpdater worldStateUpdater = worldState.updater();
-      final ReferenceTestBlockchain blockchain =
-          new ReferenceTestBlockchain(blockHeader.getNumber());
-      final Stopwatch timer = Stopwatch.createStarted();
-      final TransactionProcessingResult result =
-          processor.processTransaction(
-              blockchain,
-              worldStateUpdater,
-              blockHeader,
-              transaction,
-              blockHeader.getCoinbase(),
-              new BlockHashLookup(blockHeader, blockchain),
-              false,
-              TransactionValidationParams.processingBlock(),
-              tracer);
-      timer.stop();
-      final Account coinbase = worldStateUpdater.getOrCreate(spec.getBlockHeader().getCoinbase());
-      if (coinbase != null && coinbase.isEmpty() && shouldClearEmptyAccounts(spec.getFork())) {
-        worldStateUpdater.deleteAccount(coinbase.getAddress());
-      }
-      worldStateUpdater.commit();
+        final ProtocolSpec protocolSpec = protocolSchedule.getByBlockHeader(blockHeader);
+        final MainnetTransactionProcessor processor = protocolSpec.getTransactionProcessor();
+        final WorldUpdater worldStateUpdater = worldState.updater();
+        final ReferenceTestBlockchain blockchain =
+            new ReferenceTestBlockchain(blockHeader.getNumber());
+        final Stopwatch timer = Stopwatch.createStarted();
+        // Todo: EIP-4844 use the excessDataGas of the parent instead of DataGas.ZERO
+        final Wei dataGasPrice = protocolSpec.getFeeMarket().dataPrice(DataGas.ZERO);
+        final TransactionProcessingResult result =
+            processor.processTransaction(
+                blockchain,
+                worldStateUpdater,
+                blockHeader,
+                transaction,
+                blockHeader.getCoinbase(),
+                blockNumber -> Hash.hash(Bytes.wrap(Long.toString(blockNumber).getBytes(UTF_8))),
+                false,
+                TransactionValidationParams.processingBlock(),
+                tracer,
+                dataGasPrice);
+        timer.stop();
+        if (shouldClearEmptyAccounts(spec.getFork())) {
+          final Account coinbase =
+              worldStateUpdater.getOrCreate(spec.getBlockHeader().getCoinbase());
+          if (coinbase != null && coinbase.isEmpty()) {
+            worldStateUpdater.deleteAccount(coinbase.getAddress());
+          }
+          final Account sender = worldStateUpdater.getAccount(transaction.getSender());
+          if (sender != null && sender.isEmpty()) {
+            worldStateUpdater.deleteAccount(sender.getAddress());
+          }
+        }
+        worldStateUpdater.commit();
 
-      final ObjectNode summaryLine = objectMapper.createObjectNode();
-      summaryLine.put("output", result.getOutput().toUnprefixedHexString());
-      summaryLine.put(
-          "gasUsed",
-          StandardJsonTracer.shortNumber(
-              UInt256.valueOf(transaction.getGasLimit() - result.getGasRemaining())));
-      summaryLine.put("time", timer.elapsed(TimeUnit.NANOSECONDS));
-
-      // Check the world state root hash.
-      summaryLine.put("test", test);
-      summaryLine.put("fork", spec.getFork());
-      summaryLine.put("d", spec.getDataIndex());
-      summaryLine.put("g", spec.getGasIndex());
-      summaryLine.put("v", spec.getValueIndex());
-      summaryLine.put("postHash", worldState.rootHash().toHexString());
-      final List<Log> logs = result.getLogs();
-      final Hash actualLogsHash = Hash.hash(RLP.encode(out -> out.writeList(logs, Log::writeTo)));
-      summaryLine.put("postLogsHash", actualLogsHash.toHexString());
-      summaryLine.put(
-          "pass",
-          worldState.rootHash().equals(spec.getExpectedRootHash())
-              && actualLogsHash.equals(spec.getExpectedLogsHash()));
-      if (result.isInvalid()) {
-        summaryLine.put("validationError", result.getValidationResult().getErrorMessage());
+        summaryLine.put("output", result.getOutput().toUnprefixedHexString());
+        final long gasUsed = transaction.getGasLimit() - result.getGasRemaining();
+        final long timeNs = timer.elapsed(TimeUnit.NANOSECONDS);
+        final float mGps = gasUsed * 1000.0f / timeNs;
+
+        summaryLine.put("gasUsed", StandardJsonTracer.shortNumber(gasUsed));
+
+        if (!parentCommand.noTime) {
+          summaryLine.put("time", timeNs);
+          summaryLine.put("Mgps", String.format("%.3f", mGps));
+        }
+
+        // Check the world state root hash.
+        summaryLine.put("test", test);
+        summaryLine.put("fork", spec.getFork());
+        summaryLine.put("d", spec.getDataIndex());
+        summaryLine.put("g", spec.getGasIndex());
+        summaryLine.put("v", spec.getValueIndex());
+        summaryLine.put("postHash", worldState.rootHash().toHexString());
+        final List<Log> logs = result.getLogs();
+        final Hash actualLogsHash = Hash.hash(RLP.encode(out -> out.writeList(logs, Log::writeTo)));
+        summaryLine.put("postLogsHash", actualLogsHash.toHexString());
+        summaryLine.put(
+            "pass",
+            spec.getExpectException() == null
+                && worldState.rootHash().equals(spec.getExpectedRootHash())
+                && actualLogsHash.equals(spec.getExpectedLogsHash()));
+        if (result.isInvalid()) {
+          summaryLine.put("validationError", result.getValidationResult().getErrorMessage());
+        } else if (spec.getExpectException() != null) {
+          summaryLine.put(
+              "validationError",
+              "Exception '" + spec.getExpectException() + "' was expected but did not occur");
+        }
+
+        if (parentCommand.showJsonAlloc) {
+          EvmToolCommand.dumpWorldState(worldState, parentCommand.out);
+        }
       }
 
-      System.out.println(summaryLine);
+      parentCommand.out.println(summaryLine);
     }
   }
 }
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/T8nExecutor.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/T8nExecutor.java
new file mode 100644
index 00000000000..3b6da40c5c0
--- /dev/null
+++ b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/T8nExecutor.java
@@ -0,0 +1,291 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evmtool;
+
+import static org.hyperledger.besu.ethereum.referencetests.ReferenceTestProtocolSchedules.shouldClearEmptyAccounts;
+
+import org.hyperledger.besu.config.StubGenesisConfigOptions;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.DataGas;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.TransactionReceipt;
+import org.hyperledger.besu.ethereum.mainnet.BodyValidation;
+import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
+import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.ethereum.referencetests.ReferenceTestBlockchain;
+import org.hyperledger.besu.ethereum.referencetests.ReferenceTestEnv;
+import org.hyperledger.besu.ethereum.referencetests.ReferenceTestProtocolSchedules;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.worldstate.DefaultMutableWorldState;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.account.AccountStorageEntry;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+import org.hyperledger.besu.evmtool.exception.UnsupportedForkException;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.NavigableMap;
+import java.util.concurrent.TimeUnit;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.TextNode;
+import com.google.common.base.Stopwatch;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+
+public class T8nExecutor {
+  static T8nResult runTest(
+      final Long chainId,
+      final String fork,
+      final String rewardString,
+      final ObjectMapper objectMapper,
+      final ReferenceTestEnv referenceTestEnv,
+      final MutableWorldState initialWorldState,
+      final List<Transaction> transactions,
+      final TracerManager tracerManager) {
+
+    final ReferenceTestProtocolSchedules referenceTestProtocolSchedules =
+        ReferenceTestProtocolSchedules.create(
+            new StubGenesisConfigOptions().chainId(BigInteger.valueOf(chainId)));
+
+    final MutableWorldState worldState = new DefaultMutableWorldState(initialWorldState);
+
+    final ProtocolSchedule protocolSchedule = referenceTestProtocolSchedules.getByName(fork);
+    if (protocolSchedule == null) {
+      throw new UnsupportedForkException(fork);
+    }
+
+    ProtocolSpec protocolSpec =
+        protocolSchedule.getByBlockHeader(BlockHeaderBuilder.createDefault().buildBlockHeader());
+    final BlockHeader blockHeader = referenceTestEnv.updateFromParentValues(protocolSpec);
+    final MainnetTransactionProcessor processor = protocolSpec.getTransactionProcessor();
+    final WorldUpdater worldStateUpdater = worldState.updater();
+    final ReferenceTestBlockchain blockchain = new ReferenceTestBlockchain(blockHeader.getNumber());
+    // Todo: EIP-4844 use the excessDataGas of the parent instead of DataGas.ZERO
+    final Wei dataGasPrice = protocolSpec.getFeeMarket().dataPrice(DataGas.ZERO);
+
+    List<TransactionReceipt> receipts = new ArrayList<>();
+    List<T8nSubCommand.RejectedTransaction> invalidTransactions = new ArrayList<>();
+    List<Transaction> validTransactions = new ArrayList<>();
+    ArrayNode receiptsArray = objectMapper.createArrayNode();
+    long gasUsed = 0;
+    for (int i = 0; i < transactions.size(); i++) {
+      Transaction transaction = transactions.get(i);
+
+      final Stopwatch timer = Stopwatch.createStarted();
+      final OperationTracer tracer; // You should have picked Mercy.
+
+      final TransactionProcessingResult result;
+      try {
+        tracer = tracerManager.getManagedTracer(i, transaction.getHash());
+        result =
+            processor.processTransaction(
+                blockchain,
+                worldStateUpdater,
+                blockHeader,
+                transaction,
+                blockHeader.getCoinbase(),
+                blockNumber -> referenceTestEnv.getBlockhashByNumber(blockNumber).orElse(Hash.ZERO),
+                false,
+                TransactionValidationParams.processingBlock(),
+                tracer,
+                dataGasPrice);
+        tracerManager.disposeTracer(tracer);
+      } catch (Exception e) {
+        throw new RuntimeException(e);
+      }
+      timer.stop();
+
+      if (shouldClearEmptyAccounts(fork)) {
+        final Account coinbase = worldStateUpdater.getOrCreate(blockHeader.getCoinbase());
+        if (coinbase != null && coinbase.isEmpty()) {
+          worldStateUpdater.deleteAccount(coinbase.getAddress());
+        }
+        final Account txSender = worldStateUpdater.getAccount(transaction.getSender());
+        if (txSender != null && txSender.isEmpty()) {
+          worldStateUpdater.deleteAccount(txSender.getAddress());
+        }
+      }
+      if (result.isInvalid()) {
+        invalidTransactions.add(
+            new T8nSubCommand.RejectedTransaction(
+                i, result.getValidationResult().getErrorMessage()));
+      } else {
+        validTransactions.add(transaction);
+
+        long transactionGasUsed = transaction.getGasLimit() - result.getGasRemaining();
+
+        gasUsed += transactionGasUsed;
+        long intrinsicGas =
+            protocolSpec
+                .getGasCalculator()
+                .transactionIntrinsicGasCost(
+                    transaction.getPayload(), transaction.getTo().isEmpty());
+        tracer.traceEndTransaction(
+            result.getOutput(), gasUsed - intrinsicGas, timer.elapsed(TimeUnit.NANOSECONDS));
+        TransactionReceipt receipt =
+            protocolSpec
+                .getTransactionReceiptFactory()
+                .create(transaction.getType(), result, worldState, gasUsed);
+        Bytes gasUsedInTransaction = Bytes.ofUnsignedLong(transactionGasUsed);
+        receipts.add(receipt);
+        ObjectNode receiptObject = receiptsArray.addObject();
+        receiptObject.put(
+            "root", receipt.getStateRoot() == null ? "0x" : receipt.getStateRoot().toHexString());
+        receiptObject.put("status", "0x" + receipt.getStatus());
+        receiptObject.put("cumulativeGasUsed", Bytes.ofUnsignedLong(gasUsed).toQuantityHexString());
+        receiptObject.put("logsBloom", receipt.getBloomFilter().toHexString());
+        if (result.getLogs().isEmpty()) {
+          receiptObject.putNull("logs");
+        } else {
+          ArrayNode logsArray = receiptObject.putArray("logs");
+          for (Log log : result.getLogs()) {
+            logsArray.addPOJO(log);
+          }
+        }
+        receiptObject.put("transactionHash", transaction.getHash().toHexString());
+        receiptObject.put(
+            "contractAddress", transaction.contractAddress().orElse(Address.ZERO).toHexString());
+        receiptObject.put("gasUsed", gasUsedInTransaction.toQuantityHexString());
+        receiptObject.put("blockHash", Hash.ZERO.toHexString());
+        receiptObject.put("transactionIndex", Bytes.ofUnsignedLong(i).toQuantityHexString());
+      }
+    }
+
+    final ObjectNode resultObject = objectMapper.createObjectNode();
+
+    // block reward
+    // The max production reward was 5 Eth, longs can hold over 18 Eth.
+    if (!validTransactions.isEmpty() && (rewardString == null || Long.decode(rewardString) > 0)) {
+      Wei reward =
+          (rewardString == null)
+              ? protocolSpec.getBlockReward()
+              : Wei.of(Long.decode(rewardString));
+      worldStateUpdater
+          .getOrCreateSenderAccount(blockHeader.getCoinbase())
+          .getMutable()
+          .incrementBalance(reward);
+    }
+
+    // Invoke the withdrawal processor to handle CL withdrawals.
+    if (!referenceTestEnv.getWithdrawals().isEmpty()) {
+      try {
+        protocolSpec
+            .getWithdrawalsProcessor()
+            .ifPresent(
+                p -> p.processWithdrawals(referenceTestEnv.getWithdrawals(), worldStateUpdater));
+      } catch (RuntimeException re) {
+        resultObject.put("exception", re.getMessage());
+      }
+    }
+
+    worldStateUpdater.commit();
+    worldState.persist(blockHeader);
+
+    resultObject.put("stateRoot", worldState.rootHash().toHexString());
+    resultObject.put("txRoot", BodyValidation.transactionsRoot(validTransactions).toHexString());
+    resultObject.put("receiptsRoot", BodyValidation.receiptsRoot(receipts).toHexString());
+    resultObject.put(
+        "logsHash",
+        Hash.hash(
+                RLP.encode(
+                    out ->
+                        out.writeList(
+                            receipts.stream().flatMap(r -> r.getLogsList().stream()).toList(),
+                            Log::writeTo)))
+            .toHexString());
+    resultObject.put("logsBloom", BodyValidation.logsBloom(receipts).toHexString());
+    resultObject.set("receipts", receiptsArray);
+    if (!invalidTransactions.isEmpty()) {
+      resultObject.putPOJO("rejected", invalidTransactions);
+    }
+
+    resultObject.put(
+        "currentDifficulty",
+        blockHeader.getDifficultyBytes().trimLeadingZeros().size() > 0
+            ? blockHeader.getDifficultyBytes().toShortHexString()
+            : null);
+    resultObject.put("gasUsed", Bytes.ofUnsignedLong(gasUsed).toQuantityHexString());
+    blockHeader
+        .getBaseFee()
+        .ifPresent(bf -> resultObject.put("currentBaseFee", bf.toQuantityHexString()));
+    blockHeader
+        .getWithdrawalsRoot()
+        .ifPresent(wr -> resultObject.put("withdrawalsRoot", wr.toHexString()));
+
+    ObjectNode allocObject = objectMapper.createObjectNode();
+    worldState
+        .streamAccounts(Bytes32.ZERO, Integer.MAX_VALUE)
+        .sorted(Comparator.comparing(o -> o.getAddress().get().toHexString()))
+        .forEach(
+            account -> {
+              ObjectNode accountObject =
+                  allocObject.putObject(
+                      account.getAddress().map(Address::toHexString).orElse("0x"));
+              if (account.getCode() != null && account.getCode().size() > 0) {
+                accountObject.put("code", account.getCode().toHexString());
+              }
+              NavigableMap<Bytes32, AccountStorageEntry> storageEntries =
+                  account.storageEntriesFrom(Bytes32.ZERO, Integer.MAX_VALUE);
+              if (!storageEntries.isEmpty()) {
+                ObjectNode storageObject = accountObject.putObject("storage");
+                storageEntries.values().stream()
+                    .sorted(Comparator.comparing(a -> a.getKey().get()))
+                    .forEach(
+                        accountStorageEntry ->
+                            storageObject.put(
+                                accountStorageEntry.getKey().map(UInt256::toHexString).orElse("0x"),
+                                accountStorageEntry.getValue().toHexString()));
+              }
+              accountObject.put("balance", account.getBalance().toShortHexString());
+              if (account.getNonce() > 0) {
+                accountObject.put(
+                    "nonce", Bytes.ofUnsignedLong(account.getNonce()).toShortHexString());
+              }
+            });
+
+    BytesValueRLPOutput rlpOut = new BytesValueRLPOutput();
+    rlpOut.writeList(transactions, Transaction::writeTo);
+    TextNode bodyBytes = TextNode.valueOf(rlpOut.encoded().toHexString());
+    return new T8nResult(allocObject, bodyBytes, resultObject);
+  }
+
+  interface TracerManager {
+    OperationTracer getManagedTracer(int txIndex, Hash txHash) throws Exception;
+
+    void disposeTracer(OperationTracer tracer) throws IOException;
+  }
+
+  @SuppressWarnings("unused")
+  record T8nResult(ObjectNode allocObject, TextNode bodyBytes, ObjectNode resultObject) {}
+}
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/T8nServerSubCommand.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/T8nServerSubCommand.java
new file mode 100644
index 00000000000..a93ac8ac7a1
--- /dev/null
+++ b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/T8nServerSubCommand.java
@@ -0,0 +1,213 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evmtool;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.referencetests.ReferenceTestEnv;
+import org.hyperledger.besu.ethereum.referencetests.ReferenceTestWorldState;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.plugin.data.TransactionType;
+import org.hyperledger.besu.util.LogConfigurator;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import io.vertx.core.Vertx;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import picocli.CommandLine;
+
+@CommandLine.Command(
+    name = "t8n-server",
+    description = "Run Ethereum State Test server",
+    versionProvider = VersionProvider.class)
+public class T8nServerSubCommand implements Runnable {
+
+  @CommandLine.Option(
+      names = {"--host"},
+      description = "Host to bind to")
+  private String host = "localhost";
+
+  @CommandLine.Option(
+      names = {"--port"},
+      description = "Port to bind to")
+  private int port = 3000;
+
+  @Override
+  public void run() {
+    LogConfigurator.setLevel("", "OFF");
+    Vertx.vertx()
+        .createHttpServer()
+        .requestHandler(
+            req ->
+                req.bodyHandler(
+                    body -> {
+                      JsonObject t8nRequest = body.toJsonObject();
+                      JsonObject state = t8nRequest.getJsonObject("state");
+                      String fork = state.getString("fork");
+                      Long chainId = Long.valueOf(state.getString("chainid"));
+                      String reward = state.getString("reward");
+
+                      JsonObject input = t8nRequest.getJsonObject("input");
+                      ReferenceTestEnv referenceTestEnv =
+                          input.getJsonObject("env").mapTo(ReferenceTestEnv.class);
+                      ReferenceTestWorldState initialWorldState =
+                          input.getJsonObject("alloc").mapTo(ReferenceTestWorldState.class);
+                      initialWorldState.persist(null);
+                      List<Transaction> transactions = Collections.emptyList();
+                      Object txs = input.getValue("txs");
+                      if (txs != null) {
+                        if (txs instanceof JsonArray txsArray) {
+                          transactions = extractTransactions(txsArray);
+                        } else if (txs instanceof String tx) {
+                          transactions =
+                              extractTransactions(new JsonArray().add(removeSurrounding("\"", tx)));
+                        }
+                      }
+
+                      ObjectMapper objectMapper = JsonUtils.createObjectMapper();
+                      final T8nExecutor.T8nResult result =
+                          T8nExecutor.runTest(
+                              chainId,
+                              fork,
+                              reward,
+                              objectMapper,
+                              referenceTestEnv,
+                              initialWorldState,
+                              transactions,
+                              new T8nExecutor.TracerManager() {
+                                @Override
+                                public OperationTracer getManagedTracer(
+                                    final int txIndex, final Hash txHash) {
+                                  return OperationTracer.NO_TRACING;
+                                }
+
+                                @Override
+                                public void disposeTracer(final OperationTracer tracer) {
+                                  // No output streams to dispose of
+                                }
+                              });
+
+                      ObjectNode outputObject = objectMapper.createObjectNode();
+                      outputObject.set("alloc", result.allocObject());
+                      outputObject.set("body", result.bodyBytes());
+                      outputObject.set("result", result.resultObject());
+
+                      try {
+                        req.response()
+                            .putHeader("Content-Type", "application/json")
+                            .end(
+                                objectMapper
+                                    .writerWithDefaultPrettyPrinter()
+                                    .writeValueAsString(outputObject));
+                      } catch (JsonProcessingException e) {
+                        req.response().setStatusCode(500).end(e.getMessage());
+                      }
+                    }))
+        .listen(port, host)
+        .onSuccess(
+            server -> System.out.println("Transition server listening on " + server.actualPort()))
+        .onFailure(
+            err -> System.err.println("Failed to start transition server: " + err.getMessage()));
+  }
+
+  private List<Transaction> extractTransactions(final JsonArray jsonArray) {
+    List<Transaction> transactions = new ArrayList<>();
+    for (int i = 0; i < jsonArray.size(); i++) {
+      Object rawTx = jsonArray.getValue(i);
+      if (rawTx instanceof String txNode) {
+        BytesValueRLPInput rlpInput = new BytesValueRLPInput(Bytes.fromHexString(txNode), false);
+        rlpInput.enterList();
+        while (!rlpInput.isEndOfCurrentList()) {
+          Transaction tx = Transaction.readFrom(rlpInput);
+          transactions.add(tx);
+        }
+      } else if (rawTx instanceof JsonObject txNode) {
+        if (txNode.containsKey("txBytes")) {
+          JsonObject txBytesNode = txNode.getJsonObject("txBytes");
+          Transaction tx =
+              Transaction.readFrom(Bytes.fromHexString(txBytesNode.getString("txbytes")));
+          transactions.add(tx);
+        } else {
+          Transaction.Builder builder = Transaction.builder();
+          int type = Bytes.fromHexStringLenient(txNode.getString("type")).toInt();
+          TransactionType transactionType = TransactionType.of(type == 0 ? 0xf8 : type);
+          builder.type(transactionType);
+          builder.nonce(Bytes.fromHexStringLenient(txNode.getString("nonce")).toLong());
+          builder.gasPrice(Wei.fromHexString(txNode.getString("gasPrice")));
+          builder.gasLimit(Bytes.fromHexStringLenient(txNode.getString("gas")).toLong());
+          builder.value(Wei.fromHexString(txNode.getString("value")));
+          builder.payload(Bytes.fromHexString(txNode.getString("input")));
+          if (txNode.containsKey("to")) {
+            builder.to(Address.fromHexString(txNode.getString("to")));
+          }
+
+          if (transactionType.requiresChainId()
+              || !txNode.containsKey("protected")
+              || txNode.getBoolean("protected")) {
+            // chainid if protected
+            builder.chainId(
+                new BigInteger(
+                    1, Bytes.fromHexStringLenient(txNode.getString("chainId")).toArrayUnsafe()));
+          }
+
+          if (txNode.containsKey("secretKey")) {
+            SignatureAlgorithm signatureAlgorithm = SignatureAlgorithmFactory.getInstance();
+            KeyPair keys =
+                signatureAlgorithm.createKeyPair(
+                    signatureAlgorithm.createPrivateKey(
+                        Bytes32.fromHexString(txNode.getString("secretKey"))));
+
+            transactions.add(builder.signAndBuild(keys));
+          } else {
+            builder.signature(
+                SignatureAlgorithmFactory.getInstance()
+                    .createSignature(
+                        Bytes.fromHexString(txNode.getString("r")).toUnsignedBigInteger(),
+                        Bytes.fromHexString(txNode.getString("s")).toUnsignedBigInteger(),
+                        Bytes.fromHexString(txNode.getString("v"))
+                            .toUnsignedBigInteger()
+                            .subtract(Transaction.REPLAY_UNPROTECTED_V_BASE)
+                            .byteValueExact()));
+            transactions.add(builder.build());
+          }
+        }
+      }
+    }
+    return transactions;
+  }
+
+  private static String removeSurrounding(final String delimiter, final String message) {
+    if (message.startsWith(delimiter) && message.endsWith(delimiter)) {
+      return message.substring(delimiter.length(), message.length() - delimiter.length());
+    }
+    return message;
+  }
+}
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/T8nSubCommand.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/T8nSubCommand.java
new file mode 100644
index 00000000000..426c34e2514
--- /dev/null
+++ b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/T8nSubCommand.java
@@ -0,0 +1,435 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.evmtool;
+
+import static org.hyperledger.besu.evmtool.T8nSubCommand.COMMAND_ALIAS;
+import static org.hyperledger.besu.evmtool.T8nSubCommand.COMMAND_NAME;
+
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.referencetests.ReferenceTestEnv;
+import org.hyperledger.besu.ethereum.referencetests.ReferenceTestWorldState;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.evm.AccessListEntry;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.evm.tracing.StandardJsonTracer;
+import org.hyperledger.besu.plugin.data.TransactionType;
+
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.Stack;
+import java.util.stream.StreamSupport;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectReader;
+import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.IParameterConsumer;
+import picocli.CommandLine.Model.ArgSpec;
+import picocli.CommandLine.Model.CommandSpec;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.ParameterException;
+import picocli.CommandLine.Parameters;
+import picocli.CommandLine.ParentCommand;
+
+@Command(
+    name = COMMAND_NAME,
+    aliases = COMMAND_ALIAS,
+    description = "Execute an Ethereum State Test.",
+    mixinStandardHelpOptions = true,
+    versionProvider = VersionProvider.class)
+public class T8nSubCommand implements Runnable {
+
+  record RejectedTransaction(int index, String error) {}
+
+  static final String COMMAND_NAME = "transition";
+  static final String COMMAND_ALIAS = "t8n";
+  private static final Path stdoutPath = Path.of("stdout");
+  private static final Path stdinPath = Path.of("stdin");
+
+  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"})
+  @Option(
+      names = {"--state.fork"},
+      paramLabel = "fork name",
+      description = "The fork to run the transition against")
+  private String fork = null;
+
+  @Option(
+      names = {"--input.env"},
+      paramLabel = "full path",
+      description = "The block environment for the transition")
+  private final Path env = stdinPath;
+
+  @Option(
+      names = {"--input.alloc"},
+      paramLabel = "full path",
+      description = "The account state for the transition")
+  private final Path alloc = stdinPath;
+
+  @Option(
+      names = {"--input.txs"},
+      paramLabel = "full path",
+      description = "The transactions to transition")
+  private final Path txs = stdinPath;
+
+  @Option(
+      names = {"--output.basedir"},
+      paramLabel = "full path",
+      description = "The output ")
+  private final Path outDir = Path.of(".");
+
+  @Option(
+      names = {"--output.alloc"},
+      paramLabel = "file name",
+      description = "The account state after the transition")
+  private final Path outAlloc = Path.of("alloc.json");
+
+  @Option(
+      names = {"--output.result"},
+      paramLabel = "file name",
+      description = "The summary of the transition")
+  private final Path outResult = Path.of("result.json");
+
+  @Option(
+      names = {"--output.body"},
+      paramLabel = "file name",
+      description = "RLP of transactions considered")
+  private final Path outBody = Path.of("txs.rlp");
+
+  @Option(
+      names = {"--state.chainid"},
+      paramLabel = "chain ID",
+      description = "The chain Id to use")
+  private final Long chainId = 1L;
+
+  @SuppressWarnings({"FieldCanBeFinal", "FieldMayBeFinal"})
+  @Option(
+      names = {"--state.reward"},
+      paramLabel = "block mining reward",
+      description = "The block reward to use in block tess")
+  private String rewardString = null;
+
+  @ParentCommand private final EvmToolCommand parentCommand;
+
+  @Parameters(parameterConsumer = OnlyEmptyParams.class)
+  @SuppressWarnings("UnusedVariable")
+  private final List<String> parameters = new ArrayList<>();
+
+  static class OnlyEmptyParams implements IParameterConsumer {
+    @Override
+    public void consumeParameters(
+        final Stack<String> args, final ArgSpec argSpec, final CommandSpec commandSpec) {
+      while (!args.isEmpty()) {
+        if (!args.pop().isEmpty()) {
+          throw new ParameterException(
+              argSpec.command().commandLine(),
+              "The transition command does not accept any non-empty parameters");
+        }
+      }
+    }
+  }
+
+  @SuppressWarnings("unused")
+  public T8nSubCommand() {
+    // PicoCLI requires this
+    parentCommand = null;
+  }
+
+  @SuppressWarnings("unused")
+  public T8nSubCommand(final EvmToolCommand parentCommand) {
+    // PicoCLI requires this too
+    this.parentCommand = parentCommand;
+  }
+
+  @Override
+  public void run() {
+    final ObjectMapper objectMapper = JsonUtils.createObjectMapper();
+    final ObjectReader t8nReader = objectMapper.reader();
+
+    MutableWorldState initialWorldState;
+    ReferenceTestEnv referenceTestEnv;
+    List<Transaction> transactions;
+    try {
+      ObjectNode config;
+      if (env.equals(stdinPath) || alloc.equals(stdinPath) || txs.equals(stdinPath)) {
+        try (InputStreamReader reader =
+            new InputStreamReader(parentCommand.in, StandardCharsets.UTF_8)) {
+          config = (ObjectNode) t8nReader.readTree(reader);
+        }
+      } else {
+        config = objectMapper.createObjectNode();
+      }
+
+      if (!env.equals(stdinPath)) {
+        try (FileReader reader = new FileReader(env.toFile(), StandardCharsets.UTF_8)) {
+          config.set("env", t8nReader.readTree(reader));
+        }
+      }
+      if (!alloc.equals(stdinPath)) {
+        try (FileReader reader = new FileReader(alloc.toFile(), StandardCharsets.UTF_8)) {
+          config.set("alloc", t8nReader.readTree(reader));
+        }
+      }
+      if (!txs.equals(stdinPath)) {
+        try (FileReader reader = new FileReader(txs.toFile(), StandardCharsets.UTF_8)) {
+          config.set("txs", t8nReader.readTree(reader));
+        }
+      }
+
+      referenceTestEnv = objectMapper.convertValue(config.get("env"), ReferenceTestEnv.class);
+      initialWorldState =
+          objectMapper.convertValue(config.get("alloc"), ReferenceTestWorldState.class);
+      initialWorldState.persist(null);
+      var node = config.get("txs");
+      Iterator<JsonNode> it;
+      if (node.isArray()) {
+        it = config.get("txs").elements();
+      } else if (node == null || node.isNull()) {
+        it = Collections.emptyIterator();
+      } else {
+        it = List.of(node).iterator();
+      }
+
+      transactions = extractTransactions(it);
+      if (!outDir.toString().isBlank()) {
+        outDir.toFile().mkdirs();
+      }
+    } catch (final JsonProcessingException jpe) {
+      parentCommand.out.println("File content error: " + jpe);
+      jpe.printStackTrace();
+      return;
+    } catch (final IOException e) {
+      System.err.println("Unable to read state file");
+      e.printStackTrace(System.err);
+      return;
+    }
+
+    T8nExecutor.TracerManager tracerManager;
+    if (parentCommand.showJsonResults) {
+      tracerManager =
+          new T8nExecutor.TracerManager() {
+            private final Map<OperationTracer, FileOutputStream> outputStreams = new HashMap<>();
+
+            @Override
+            public OperationTracer getManagedTracer(final int txIndex, final Hash txHash)
+                throws Exception {
+              var traceDest =
+                  new FileOutputStream(
+                      outDir
+                          .resolve(
+                              String.format("trace-%d-%s.jsonl", txIndex, txHash.toHexString()))
+                          .toFile());
+
+              var jsonTracer =
+                  new StandardJsonTracer(
+                      new PrintStream(traceDest),
+                      parentCommand.showMemory,
+                      !parentCommand.hideStack,
+                      parentCommand.showReturnData);
+              outputStreams.put(jsonTracer, traceDest);
+              return jsonTracer;
+            }
+
+            @Override
+            public void disposeTracer(final OperationTracer tracer) throws IOException {
+              if (outputStreams.containsKey(tracer)) {
+                outputStreams.remove(tracer).close();
+              }
+            }
+          };
+    } else {
+      tracerManager =
+          new T8nExecutor.TracerManager() {
+            @Override
+            public OperationTracer getManagedTracer(final int txIndex, final Hash txHash) {
+              return OperationTracer.NO_TRACING;
+            }
+
+            @Override
+            public void disposeTracer(final OperationTracer tracer) {
+              // single-test mode doesn't need to track tracers
+            }
+          };
+    }
+    final T8nExecutor.T8nResult result =
+        T8nExecutor.runTest(
+            chainId,
+            fork,
+            rewardString,
+            objectMapper,
+            referenceTestEnv,
+            initialWorldState,
+            transactions,
+            tracerManager);
+
+    try {
+      ObjectWriter writer = objectMapper.writerWithDefaultPrettyPrinter();
+      ObjectNode outputObject = objectMapper.createObjectNode();
+
+      if (outAlloc.equals(stdoutPath)) {
+        outputObject.set("alloc", result.allocObject());
+      } else {
+        try (PrintStream fileOut =
+            new PrintStream(new FileOutputStream(outDir.resolve(outAlloc).toFile()))) {
+          fileOut.println(writer.writeValueAsString(result.allocObject()));
+        }
+      }
+
+      if (outBody.equals((stdoutPath))) {
+        outputObject.set("body", result.bodyBytes());
+      } else {
+        try (PrintStream fileOut =
+            new PrintStream(new FileOutputStream(outDir.resolve(outBody).toFile()))) {
+          fileOut.print(result.bodyBytes().textValue());
+        }
+      }
+
+      if (outResult.equals(stdoutPath)) {
+        outputObject.set("result", result.resultObject());
+      } else {
+        try (PrintStream fileOut =
+            new PrintStream(new FileOutputStream(outDir.resolve(outResult).toFile()))) {
+          fileOut.println(writer.writeValueAsString(result.resultObject()));
+        }
+      }
+
+      if (outputObject.size() > 0) {
+        parentCommand.out.println(writer.writeValueAsString(outputObject));
+      }
+    } catch (IOException ioe) {
+      System.err.println("Could not write results");
+      ioe.printStackTrace(System.err);
+    }
+  }
+
+  private List<Transaction> extractTransactions(final Iterator<JsonNode> it) {
+    List<Transaction> transactions = new ArrayList<>();
+    while (it.hasNext()) {
+      JsonNode txNode = it.next();
+      if (txNode.isTextual()) {
+        BytesValueRLPInput rlpInput =
+            new BytesValueRLPInput(Bytes.fromHexString(txNode.asText()), false);
+        rlpInput.enterList();
+        while (!rlpInput.isEndOfCurrentList()) {
+          Transaction tx = Transaction.readFrom(rlpInput);
+          transactions.add(tx);
+        }
+      } else if (txNode.isObject()) {
+        if (txNode.has("txBytes")) {
+          Transaction tx =
+              Transaction.readFrom(Bytes.fromHexString(txNode.get("txbytes").asText()));
+          transactions.add(tx);
+        } else {
+          Transaction.Builder builder = Transaction.builder();
+          int type = Bytes.fromHexStringLenient(txNode.get("type").textValue()).toInt();
+          TransactionType transactionType = TransactionType.of(type == 0 ? 0xf8 : type);
+          builder.type(transactionType);
+          builder.nonce(Bytes.fromHexStringLenient(txNode.get("nonce").textValue()).toLong());
+          builder.gasPrice(Wei.fromHexString(txNode.get("gasPrice").textValue()));
+          builder.gasLimit(Bytes.fromHexStringLenient(txNode.get("gas").textValue()).toLong());
+          builder.value(Wei.fromHexString(txNode.get("value").textValue()));
+          builder.payload(Bytes.fromHexString(txNode.get("input").textValue()));
+          if (txNode.has("to")) {
+            builder.to(Address.fromHexString(txNode.get("to").textValue()));
+          }
+
+          if (transactionType.requiresChainId()
+              || !txNode.has("protected")
+              || txNode.get("protected").booleanValue()) {
+            // chainid if protected
+            builder.chainId(
+                new BigInteger(
+                    1,
+                    Bytes.fromHexStringLenient(txNode.get("chainId").textValue()).toArrayUnsafe()));
+          }
+
+          if (txNode.has("accessList")) {
+            JsonNode accessList = txNode.get("accessList");
+            if (!accessList.isArray()) {
+              parentCommand.out.printf(
+                  "TX json node unparseable: expected accessList to be an array - %s%n", txNode);
+              continue;
+            }
+            List<AccessListEntry> entries = new ArrayList<>(accessList.size());
+            for (JsonNode entryAsJson : accessList) {
+              Address address = Address.fromHexString(entryAsJson.get("address").textValue());
+              List<String> storageKeys =
+                  StreamSupport.stream(
+                          Spliterators.spliteratorUnknownSize(
+                              entryAsJson.get("storageKeys").elements(), Spliterator.ORDERED),
+                          false)
+                      .map(JsonNode::textValue)
+                      .toList();
+              var accessListEntry = AccessListEntry.createAccessListEntry(address, storageKeys);
+              entries.add(accessListEntry);
+            }
+            builder.accessList(entries);
+          }
+
+          if (txNode.has("secretKey")) {
+            SignatureAlgorithm signatureAlgorithm = SignatureAlgorithmFactory.getInstance();
+            KeyPair keys =
+                signatureAlgorithm.createKeyPair(
+                    signatureAlgorithm.createPrivateKey(
+                        Bytes32.fromHexString(txNode.get("secretKey").textValue())));
+
+            transactions.add(builder.signAndBuild(keys));
+          } else {
+            builder.signature(
+                SignatureAlgorithmFactory.getInstance()
+                    .createSignature(
+                        Bytes.fromHexString(txNode.get("r").textValue()).toUnsignedBigInteger(),
+                        Bytes.fromHexString(txNode.get("s").textValue()).toUnsignedBigInteger(),
+                        Bytes.fromHexString(txNode.get("v").textValue())
+                            .toUnsignedBigInteger()
+                            .subtract(Transaction.REPLAY_UNPROTECTED_V_BASE)
+                            .byteValueExact()));
+            transactions.add(builder.build());
+          }
+        }
+      } else {
+        parentCommand.out.printf("TX json node unparseable: %s%n", txNode);
+      }
+    }
+    return transactions;
+  }
+}
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/VersionProvider.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/VersionProvider.java
index cfe743fecbe..f20e8d21087 100644
--- a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/VersionProvider.java
+++ b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/VersionProvider.java
@@ -21,10 +21,8 @@
 
 public class VersionProvider implements CommandLine.IVersionProvider {
 
-  public VersionProvider() {}
-
   @Override
   public String[] getVersion() {
-    return new String[] {"Hyperledger Besu EvmTool", BesuInfo.version()};
+    return new String[] {"Hyperledger Besu evm " + BesuInfo.shortVersion()};
   }
 }
diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/exception/UnsupportedForkException.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/exception/UnsupportedForkException.java
index 64c60152893..284fe890909 100644
--- a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/exception/UnsupportedForkException.java
+++ b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/exception/UnsupportedForkException.java
@@ -15,8 +15,14 @@
  */
 package org.hyperledger.besu.evmtool.exception;
 
+/** The Unsupported fork exception. */
 public class UnsupportedForkException extends RuntimeException {
 
+  /**
+   * Instantiates a new Unsupported fork exception.
+   *
+   * @param forkName the fork name
+   */
   public UnsupportedForkException(final String forkName) {
     super(String.format("Fork '%s' not supported", forkName));
   }
diff --git a/ethereum/evmtool/src/test/benchmarks/bench-yolov2.sh b/ethereum/evmtool/src/test/benchmarks/bench-yolov2.sh
deleted file mode 100755
index 78c490a5125..00000000000
--- a/ethereum/evmtool/src/test/benchmarks/bench-yolov2.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-# Case 1 - https://gist.github.com/holiman/174548cad102096858583c6fbbb0649a#case-1
-#
-# This checks EXT(codehash,codesize,balance) of precompiles, which should be
-# 100, and later checks the same operations twice against some non-precompiles.
-# Those are cheaper second time they are accessed. Lastly, it checks the BALANCE
-# of origin and this.
-../../../build/install/evmtool/bin/evm  \
-  --Xberlin-enabled=true \
-  --code=0x60013f5060023b506003315060f13f5060f23b5060f3315060f23f5060f33b5060f1315032315030315000 \
-  --sender=0x0000000000000000000000000000000000000000 \
-  --receiver=0x000000000000000000000000636F6E7472616374 \
-  --chain=YOLO_V2 \
-  --gas=9223372036854775807 \
-  --repeat=10
-echo 'expect gasUser="0x21cd" (8653 dec)'
-
-# Case 2 - https://gist.github.com/holiman/174548cad102096858583c6fbbb0649a#case-2
-#
-# This checks extcodecopy( 0xff,0,0,0,0) twice, (should be expensive first
-# time), and then does extcodecopy( this,0,0,0,0)
-../../../build/install/evmtool/bin/evm  \
-  --Xberlin-enabled=true \
-  --code=0x60006000600060ff3c60006000600060ff3c600060006000303c00 \
-  --sender=0x0000000000000000000000000000000000000000 \
-  --receiver=0x000000000000000000000000636F6E7472616374 \
-  --chain=YOLO_V2 \
-  --gas=9223372036854775807 \
-  --repeat=10
-echo 'expect gasUser="0xb13" (2835 dec)'
-
-# Case 3 - https://gist.github.com/holiman/174548cad102096858583c6fbbb0649a#case-3
-#
-# This checks sload( 0x1) followed by sstore(loc: 0x01, val:0x11), then 'naked'
-# sstore:sstore(loc: 0x02, val:0x11) twice, and sload(0x2), sload(0x1).
-../../../build/install/evmtool/bin/evm  \
-  --Xberlin-enabled=true \
-  --code=0x60015450601160015560116002556011600255600254600154 \
-  --sender=0x0000000000000000000000000000000000000000 \
-  --receiver=0x000000000000000000000000636F6E7472616374 \
-  --chain=YOLO_V2 \
-  --gas=9223372036854775807 \
-  --repeat=10
-echo 'expect gasUser="0xadf1" (44529 dec)'
-
-# Case 4 - https://gist.github.com/holiman/174548cad102096858583c6fbbb0649a#case-4
-#
-# This calls the identity-precompile (cheap), then calls an account (expensive)
-# and staticcalls the same account (cheap)
-../../../build/install/evmtool/bin/evm  \
-  --Xberlin-enabled=true \
-  --code=0x60008080808060046000f15060008080808060ff6000f15060008080808060ff6000fa50 \
-  --sender=0x0000000000000000000000000000000000000000 \
-  --receiver=0x000000000000000000000000636F6E7472616374 \
-  --chain=YOLO_V2 \
-  --gas=9223372036854775807 \
-  --repeat=10
-echo 'expect gasUser="0xb35" (2869 dec)'
diff --git a/ethereum/evmtool/src/test/java/org/hyperledger/besu/evmtool/CodeValidationSubCommandTest.java b/ethereum/evmtool/src/test/java/org/hyperledger/besu/evmtool/CodeValidationSubCommandTest.java
new file mode 100644
index 00000000000..8d83a3c32af
--- /dev/null
+++ b/ethereum/evmtool/src/test/java/org/hyperledger/besu/evmtool/CodeValidationSubCommandTest.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evmtool;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+
+import org.junit.Test;
+import picocli.CommandLine;
+
+public class CodeValidationSubCommandTest {
+
+  static final String CODE_STOP_ONLY = "0xef0001 010004 020001-0001 030000 00 00000000 00";
+  static final String CODE_RETF_ONLY = "0xef0001 010004 020001-0001 030000 00 00000000 e4";
+  static final String CODE_BAD_MAGIC = "0xefffff 010004 020001-0001 030000 00 00000000 e4";
+  static final String CODE_INTERIOR_COMMENTS =
+      """
+                  0xef0001 010008 020002-000c-0002 030000 00
+                  # 7 inputs 1 output,
+                  00000007-07010007
+                  59-59-59-59-59-59-59-e30001-50-e4
+                  # No immediate data
+                  f1-e4""";
+  static final String CODE_MULTIPLE =
+      CODE_STOP_ONLY + "\n" + CODE_BAD_MAGIC + "\n" + CODE_RETF_ONLY + "\n";
+
+  @Test
+  public void testSingleValidViaInput() {
+    final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    final ByteArrayInputStream bais = new ByteArrayInputStream(CODE_STOP_ONLY.getBytes(UTF_8));
+    final CodeValidateSubCommand codeValidateSubCommand =
+        new CodeValidateSubCommand(bais, new PrintStream(baos));
+    codeValidateSubCommand.run();
+    assertThat(baos.toString(UTF_8)).contains("OK 00\n");
+  }
+
+  @Test
+  public void testSingleInvalidViaInput() {
+    final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    final ByteArrayInputStream bais = new ByteArrayInputStream(CODE_BAD_MAGIC.getBytes(UTF_8));
+    final CodeValidateSubCommand codeValidateSubCommand =
+        new CodeValidateSubCommand(bais, new PrintStream(baos));
+    codeValidateSubCommand.run();
+    assertThat(baos.toString(UTF_8)).contains("err: layout - EOF header byte 1 incorrect\n");
+  }
+
+  @Test
+  public void testMultipleViaInput() {
+    final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    final ByteArrayInputStream bais = new ByteArrayInputStream(CODE_MULTIPLE.getBytes(UTF_8));
+    final CodeValidateSubCommand codeValidateSubCommand =
+        new CodeValidateSubCommand(bais, new PrintStream(baos));
+    codeValidateSubCommand.run();
+    assertThat(baos.toString(UTF_8))
+        .contains(
+            """
+                OK 00
+                err: layout - EOF header byte 1 incorrect
+                OK e4
+                """);
+  }
+
+  @Test
+  public void testSingleValidViaCli() {
+    final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    final ByteArrayInputStream bais = new ByteArrayInputStream(new byte[0]);
+    final CodeValidateSubCommand codeValidateSubCommand =
+        new CodeValidateSubCommand(bais, new PrintStream(baos));
+    final CommandLine cmd = new CommandLine(codeValidateSubCommand);
+    cmd.parseArgs(CODE_STOP_ONLY);
+    codeValidateSubCommand.run();
+    assertThat(baos.toString(UTF_8)).contains("OK 00\n");
+  }
+
+  @Test
+  public void testSingleInvalidViaCli() {
+    final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    final ByteArrayInputStream bais = new ByteArrayInputStream(new byte[0]);
+    final CodeValidateSubCommand codeValidateSubCommand =
+        new CodeValidateSubCommand(bais, new PrintStream(baos));
+    final CommandLine cmd = new CommandLine(codeValidateSubCommand);
+    cmd.parseArgs(CODE_BAD_MAGIC);
+    codeValidateSubCommand.run();
+    assertThat(baos.toString(UTF_8)).contains("err: layout - EOF header byte 1 incorrect\n");
+  }
+
+  @Test
+  public void testMultipleViaCli() {
+    final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    final ByteArrayInputStream bais = new ByteArrayInputStream(new byte[0]);
+    final CodeValidateSubCommand codeValidateSubCommand =
+        new CodeValidateSubCommand(bais, new PrintStream(baos));
+    final CommandLine cmd = new CommandLine(codeValidateSubCommand);
+    cmd.parseArgs(CODE_STOP_ONLY, CODE_BAD_MAGIC, CODE_RETF_ONLY);
+    codeValidateSubCommand.run();
+    assertThat(baos.toString(UTF_8))
+        .contains(
+            """
+                OK 00
+                err: layout - EOF header byte 1 incorrect
+                OK e4
+                """);
+  }
+
+  @Test
+  public void testCliEclipsesInput() {
+    final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    final ByteArrayInputStream bais = new ByteArrayInputStream(CODE_STOP_ONLY.getBytes(UTF_8));
+    final CodeValidateSubCommand codeValidateSubCommand =
+        new CodeValidateSubCommand(bais, new PrintStream(baos));
+    final CommandLine cmd = new CommandLine(codeValidateSubCommand);
+    cmd.parseArgs(CODE_RETF_ONLY);
+    codeValidateSubCommand.run();
+    assertThat(baos.toString(UTF_8)).contains("OK e4\n");
+  }
+
+  @Test
+  public void testInteriorCommentsSkipped() {
+    final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    final ByteArrayInputStream bais = new ByteArrayInputStream(new byte[0]);
+    final CodeValidateSubCommand codeValidateSubCommand =
+        new CodeValidateSubCommand(bais, new PrintStream(baos));
+    final CommandLine cmd = new CommandLine(codeValidateSubCommand);
+    cmd.parseArgs(CODE_INTERIOR_COMMENTS);
+    codeValidateSubCommand.run();
+    assertThat(baos.toString(UTF_8)).contains("OK 59595959595959e3000150e4,f1e4\n");
+  }
+
+  @Test
+  public void testBlankLinesAndCommentsSkipped() {
+    final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    final ByteArrayInputStream bais =
+        new ByteArrayInputStream(("# comment\n\n#blank line\n\n" + CODE_MULTIPLE).getBytes(UTF_8));
+    final CodeValidateSubCommand codeValidateSubCommand =
+        new CodeValidateSubCommand(bais, new PrintStream(baos));
+    codeValidateSubCommand.run();
+    assertThat(baos.toString(UTF_8))
+        .isEqualTo(
+            """
+                OK 00
+                err: layout - EOF header byte 1 incorrect
+                OK e4
+                """);
+  }
+}
diff --git a/ethereum/evmtool/src/test/java/org/hyperledger/besu/evmtool/EvmToolSpecTests.java b/ethereum/evmtool/src/test/java/org/hyperledger/besu/evmtool/EvmToolSpecTests.java
new file mode 100644
index 00000000000..c326d653e52
--- /dev/null
+++ b/ethereum/evmtool/src/test/java/org/hyperledger/besu/evmtool/EvmToolSpecTests.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evmtool;
+
+import static com.google.common.base.Preconditions.checkState;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.IterableAssert.assertThatIterable;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectReader;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeType;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class EvmToolSpecTests {
+
+  static final ObjectMapper objectMapper = new ObjectMapper();
+  static final ObjectReader specReader = objectMapper.reader();
+
+  public static Object[][] b11rTests() {
+    return findSpecFiles(new String[] {"b11r"});
+  }
+
+  public static Object[][] stateTestTests() {
+    return findSpecFiles(new String[] {"state-test"});
+  }
+
+  public static Object[][] t8nTests() {
+    return findSpecFiles(new String[] {"t8n"});
+  }
+
+  public static Object[][] traceTests() {
+    return findSpecFiles(new String[] {"trace"});
+  }
+
+  public static Object[][] findSpecFiles(
+      final String[] subDirectoryPaths, final String... exceptions) {
+    final List<Object[]> specFiles = new ArrayList<>();
+    for (final String path : subDirectoryPaths) {
+      final URL url = EvmToolSpecTests.class.getResource(path);
+      checkState(url != null, "Cannot find test directory " + path);
+      final Path dir;
+      try {
+        dir = Paths.get(url.toURI());
+      } catch (final URISyntaxException e) {
+        throw new RuntimeException("Problem converting URL to URI " + url, e);
+      }
+      try (final Stream<Path> s = Files.walk(dir, 1)) {
+        s.map(Path::toFile)
+            .filter(f -> f.getPath().endsWith(".json"))
+            .filter(f -> Arrays.stream(exceptions).noneMatch(f.getPath()::contains))
+            .map(f -> pathToParams(path, f))
+            .forEach(specFiles::add);
+      } catch (final IOException e) {
+        throw new RuntimeException("Problem reading directory " + dir, e);
+      }
+    }
+    final Object[][] result = new Object[specFiles.size()][2];
+    for (int i = 0; i < specFiles.size(); i++) {
+      result[i] = specFiles.get(i);
+    }
+    return result;
+  }
+
+  private static Object[] pathToParams(final String subDir, final File file) {
+    try {
+      var spec = specReader.readTree(new FileInputStream(file));
+      return new Object[] {
+        subDir + "/" + file.getName(), spec.get("cli"), spec.get("stdin"), spec.get("stdout")
+      };
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @ParameterizedTest(name = "{0}")
+  @MethodSource({"b11rTests", "stateTestTests", "t8nTests", "traceTests"})
+  void testBySpec(
+      final String file,
+      final JsonNode cliNode,
+      final JsonNode stdinNode,
+      final JsonNode stdoutNode)
+      throws IOException {
+
+    String[] cli;
+    if (cliNode.isTextual()) {
+      cli = cliNode.textValue().split("\\s+");
+    } else {
+      cli =
+          StreamSupport.stream(
+                  Spliterators.spliteratorUnknownSize(cliNode.iterator(), Spliterator.ORDERED),
+                  false)
+              .map(JsonNode::textValue)
+              .toArray(String[]::new);
+    }
+
+    InputStream inputStream;
+    if (stdinNode.isTextual()) {
+      inputStream = new ByteArrayInputStream(stdinNode.textValue().getBytes(UTF_8));
+    } else {
+      inputStream = new ByteArrayInputStream(stdinNode.toString().getBytes(UTF_8));
+    }
+
+    EvmToolCommand evmTool = new EvmToolCommand();
+    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    evmTool.execute(inputStream, new PrintWriter(baos, true, UTF_8), cli);
+
+    if (stdoutNode.isTextual()) {
+      assertThat(baos.toString(UTF_8)).isEqualTo(stdoutNode.textValue());
+    } else if (stdoutNode.isArray()) {
+      ArrayNode arrayNode = (ArrayNode) specReader.createArrayNode();
+      int pos = 0;
+      byte[] output = baos.toByteArray();
+      while (pos < output.length) {
+        int next = pos;
+        //noinspection StatementWithEmptyBody
+        while (output[next++] != ((byte) '\n')) {}
+        try {
+          JsonNode value = specReader.readTree(output, pos, next - pos);
+          if (JsonNodeType.MISSING != value.getNodeType()) {
+            arrayNode.add(value);
+          }
+        } catch (JsonParseException jpe) {
+          // Discard non-well-formed lines.
+          // If those are needed for validation use the text node option.
+        }
+        pos = next;
+      }
+      assertThatIterable(arrayNode::elements).containsExactlyElementsOf(stdoutNode::elements);
+    } else {
+      var actualNode = specReader.readTree(baos.toByteArray());
+      assertThat(actualNode).isEqualTo(stdoutNode);
+    }
+  }
+}
diff --git a/ethereum/evmtool/src/test/java/org/hyperledger/besu/evmtool/StateTestSubCommandTest.java b/ethereum/evmtool/src/test/java/org/hyperledger/besu/evmtool/StateTestSubCommandTest.java
index a4da13bcc75..8b88ab78339 100644
--- a/ethereum/evmtool/src/test/java/org/hyperledger/besu/evmtool/StateTestSubCommandTest.java
+++ b/ethereum/evmtool/src/test/java/org/hyperledger/besu/evmtool/StateTestSubCommandTest.java
@@ -14,10 +14,16 @@
  */
 package org.hyperledger.besu.evmtool;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.hyperledger.besu.evmtool.exception.UnsupportedForkException;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintWriter;
+
 import org.junit.Test;
 import picocli.CommandLine;
 
@@ -25,7 +31,10 @@ public class StateTestSubCommandTest {
 
   @Test
   public void shouldDetectUnsupportedFork() {
-    final StateTestSubCommand stateTestSubCommand = new StateTestSubCommand(new EvmToolCommand());
+    final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    EvmToolCommand parentCommand =
+        new EvmToolCommand(System.in, new PrintWriter(baos, true, UTF_8));
+    final StateTestSubCommand stateTestSubCommand = new StateTestSubCommand(parentCommand);
     final CommandLine cmd = new CommandLine(stateTestSubCommand);
     cmd.parseArgs(
         StateTestSubCommandTest.class.getResource("unsupported-fork-state-test.json").getPath());
@@ -36,9 +45,90 @@ public void shouldDetectUnsupportedFork() {
 
   @Test
   public void shouldWorkWithValidStateTest() {
-    final StateTestSubCommand stateTestSubCommand = new StateTestSubCommand(new EvmToolCommand());
+    final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    EvmToolCommand parentCommand =
+        new EvmToolCommand(System.in, new PrintWriter(baos, true, UTF_8));
+    final StateTestSubCommand stateTestSubCommand = new StateTestSubCommand(parentCommand);
     final CommandLine cmd = new CommandLine(stateTestSubCommand);
     cmd.parseArgs(StateTestSubCommandTest.class.getResource("valid-state-test.json").getPath());
     stateTestSubCommand.run();
   }
+
+  @Test
+  public void shouldWorkWithValidAccessListStateTest() {
+    final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    EvmToolCommand parentCommand =
+        new EvmToolCommand(System.in, new PrintWriter(baos, true, UTF_8));
+    final StateTestSubCommand stateTestSubCommand = new StateTestSubCommand(parentCommand);
+    final CommandLine cmd = new CommandLine(stateTestSubCommand);
+    cmd.parseArgs(StateTestSubCommandTest.class.getResource("access-list.json").getPath());
+    stateTestSubCommand.run();
+  }
+
+  @Test
+  public void noJsonTracer() {
+    final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    EvmToolCommand parentCommand =
+        new EvmToolCommand(System.in, new PrintWriter(baos, true, UTF_8));
+    CommandLine parentCmd = new CommandLine(parentCommand);
+    parentCmd.parseArgs("--json=false");
+    final StateTestSubCommand stateTestSubCommand = new StateTestSubCommand(parentCommand);
+    final CommandLine cmd = new CommandLine(stateTestSubCommand);
+    cmd.parseArgs(StateTestSubCommandTest.class.getResource("access-list.json").getPath());
+    stateTestSubCommand.run();
+    assertThat(baos.toString(UTF_8)).doesNotContain("\"pc\"");
+  }
+
+  @Test
+  public void testsInvalidTransactions() {
+    final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    final ByteArrayInputStream bais =
+        new ByteArrayInputStream(
+            StateTestSubCommandTest.class
+                .getResource("HighGasPrice.json")
+                .getPath()
+                .getBytes(UTF_8));
+    final StateTestSubCommand stateTestSubCommand =
+        new StateTestSubCommand(new EvmToolCommand(bais, new PrintWriter(baos, true, UTF_8)));
+    stateTestSubCommand.run();
+    assertThat(baos.toString(UTF_8)).contains("Transaction had out-of-bounds parameters");
+  }
+
+  @Test
+  public void shouldStreamTests() {
+    final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    final ByteArrayInputStream bais =
+        new ByteArrayInputStream(
+            StateTestSubCommandTest.class
+                .getResource("access-list.json")
+                .getPath()
+                .getBytes(UTF_8));
+    final StateTestSubCommand stateTestSubCommand =
+        new StateTestSubCommand(new EvmToolCommand(bais, new PrintWriter(baos, true, UTF_8)));
+    stateTestSubCommand.run();
+    assertThat(baos.toString(UTF_8)).contains("\"pass\":true");
+  }
+
+  @Test
+  public void failStreamMissingFile() {
+    final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    final ByteArrayInputStream bais =
+        new ByteArrayInputStream("./file-dose-not-exist.json".getBytes(UTF_8));
+    final StateTestSubCommand stateTestSubCommand =
+        new StateTestSubCommand(new EvmToolCommand(bais, new PrintWriter(baos, true, UTF_8)));
+    stateTestSubCommand.run();
+    assertThat(baos.toString(UTF_8)).contains("File not found: ./file-dose-not-exist.json");
+  }
+
+  @Test
+  public void failStreamBadFile() {
+    final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    final ByteArrayInputStream bais =
+        new ByteArrayInputStream(
+            StateTestSubCommandTest.class.getResource("bogus-test.json").getPath().getBytes(UTF_8));
+    final StateTestSubCommand stateTestSubCommand =
+        new StateTestSubCommand(new EvmToolCommand(bais, new PrintWriter(baos, true, UTF_8)));
+    stateTestSubCommand.run();
+    assertThat(baos.toString(UTF_8)).contains("File content error: ");
+  }
 }
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/HighGasPrice.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/HighGasPrice.json
new file mode 100644
index 00000000000..de8eddce185
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/HighGasPrice.json
@@ -0,0 +1,177 @@
+{
+    "HighGasPrice" : {
+        "env" : {
+            "currentBaseFee" : "0x0a",
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "0x05500000",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "Berlin" : [
+                {
+                    "expectException" : "TR_NoFunds",
+                    "hash" : "0x1751725d1aad5298768fbcf64069b2c1b85aeaffcc561146067d6beedd08052a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+                    "txbytes" : "0xf87e809f031eea408f8e1799cb883da2927b1336521d73c2c14accfebb70d5c5af006c82520894d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d001801ca039b081ab7094dff1b3ac79cbf8e381adc9f7a4e16290d7abc42dd006e5e062c5a033af00e26e5eb4431dcad601b2c8bf12d51eef2bd037d14681f22692ffab1ccd"
+                }
+            ],
+            "Byzantium" : [
+                {
+                    "expectException" : "TR_NoFunds",
+                    "hash" : "0x1751725d1aad5298768fbcf64069b2c1b85aeaffcc561146067d6beedd08052a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+                    "txbytes" : "0xf87e809f031eea408f8e1799cb883da2927b1336521d73c2c14accfebb70d5c5af006c82520894d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d001801ca039b081ab7094dff1b3ac79cbf8e381adc9f7a4e16290d7abc42dd006e5e062c5a033af00e26e5eb4431dcad601b2c8bf12d51eef2bd037d14681f22692ffab1ccd"
+                }
+            ],
+            "Constantinople" : [
+                {
+                    "expectException" : "TR_NoFunds",
+                    "hash" : "0x1751725d1aad5298768fbcf64069b2c1b85aeaffcc561146067d6beedd08052a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+                    "txbytes" : "0xf87e809f031eea408f8e1799cb883da2927b1336521d73c2c14accfebb70d5c5af006c82520894d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d001801ca039b081ab7094dff1b3ac79cbf8e381adc9f7a4e16290d7abc42dd006e5e062c5a033af00e26e5eb4431dcad601b2c8bf12d51eef2bd037d14681f22692ffab1ccd"
+                }
+            ],
+            "ConstantinopleFix" : [
+                {
+                    "expectException" : "TR_NoFunds",
+                    "hash" : "0x1751725d1aad5298768fbcf64069b2c1b85aeaffcc561146067d6beedd08052a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+                    "txbytes" : "0xf87e809f031eea408f8e1799cb883da2927b1336521d73c2c14accfebb70d5c5af006c82520894d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d001801ca039b081ab7094dff1b3ac79cbf8e381adc9f7a4e16290d7abc42dd006e5e062c5a033af00e26e5eb4431dcad601b2c8bf12d51eef2bd037d14681f22692ffab1ccd"
+                }
+            ],
+            "EIP150" : [
+                {
+                    "expectException" : "TR_NoFunds",
+                    "hash" : "0x1751725d1aad5298768fbcf64069b2c1b85aeaffcc561146067d6beedd08052a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+                    "txbytes" : "0xf87e809f031eea408f8e1799cb883da2927b1336521d73c2c14accfebb70d5c5af006c82520894d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d001801ca039b081ab7094dff1b3ac79cbf8e381adc9f7a4e16290d7abc42dd006e5e062c5a033af00e26e5eb4431dcad601b2c8bf12d51eef2bd037d14681f22692ffab1ccd"
+                }
+            ],
+            "EIP158" : [
+                {
+                    "expectException" : "TR_NoFunds",
+                    "hash" : "0x1751725d1aad5298768fbcf64069b2c1b85aeaffcc561146067d6beedd08052a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+                    "txbytes" : "0xf87e809f031eea408f8e1799cb883da2927b1336521d73c2c14accfebb70d5c5af006c82520894d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d001801ca039b081ab7094dff1b3ac79cbf8e381adc9f7a4e16290d7abc42dd006e5e062c5a033af00e26e5eb4431dcad601b2c8bf12d51eef2bd037d14681f22692ffab1ccd"
+                }
+            ],
+            "Frontier" : [
+                {
+                    "expectException" : "TR_NoFunds",
+                    "hash" : "0x1751725d1aad5298768fbcf64069b2c1b85aeaffcc561146067d6beedd08052a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+                    "txbytes" : "0xf87e809f031eea408f8e1799cb883da2927b1336521d73c2c14accfebb70d5c5af006c82520894d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d001801ca039b081ab7094dff1b3ac79cbf8e381adc9f7a4e16290d7abc42dd006e5e062c5a033af00e26e5eb4431dcad601b2c8bf12d51eef2bd037d14681f22692ffab1ccd"
+                }
+            ],
+            "Homestead" : [
+                {
+                    "expectException" : "TR_NoFunds",
+                    "hash" : "0x1751725d1aad5298768fbcf64069b2c1b85aeaffcc561146067d6beedd08052a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+                    "txbytes" : "0xf87e809f031eea408f8e1799cb883da2927b1336521d73c2c14accfebb70d5c5af006c82520894d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d001801ca039b081ab7094dff1b3ac79cbf8e381adc9f7a4e16290d7abc42dd006e5e062c5a033af00e26e5eb4431dcad601b2c8bf12d51eef2bd037d14681f22692ffab1ccd"
+                }
+            ],
+            "Istanbul" : [
+                {
+                    "expectException" : "TR_NoFunds",
+                    "hash" : "0x1751725d1aad5298768fbcf64069b2c1b85aeaffcc561146067d6beedd08052a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+                    "txbytes" : "0xf87e809f031eea408f8e1799cb883da2927b1336521d73c2c14accfebb70d5c5af006c82520894d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d001801ca039b081ab7094dff1b3ac79cbf8e381adc9f7a4e16290d7abc42dd006e5e062c5a033af00e26e5eb4431dcad601b2c8bf12d51eef2bd037d14681f22692ffab1ccd"
+                }
+            ],
+            "London" : [
+                {
+                    "expectException" : "TR_NoFunds",
+                    "hash" : "0x1751725d1aad5298768fbcf64069b2c1b85aeaffcc561146067d6beedd08052a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+                    "txbytes" : "0xf87e809f031eea408f8e1799cb883da2927b1336521d73c2c14accfebb70d5c5af006c82520894d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d001801ca039b081ab7094dff1b3ac79cbf8e381adc9f7a4e16290d7abc42dd006e5e062c5a033af00e26e5eb4431dcad601b2c8bf12d51eef2bd037d14681f22692ffab1ccd"
+                }
+            ]
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3b9aca00",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0" : {
+                "balance" : "0x00",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                "0x"
+            ],
+            "gasLimit" : [
+                "0x5208"
+            ],
+            "gasPrice" : "0x031eea408f8e1799cb883da2927b1336521d73c2c14accfebb70d5c5af006c",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "sender" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "to" : "0xd0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0d0",
+            "value" : [
+                "0x01"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/access-list.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/access-list.json
new file mode 100644
index 00000000000..466ec10e02d
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/access-list.json
@@ -0,0 +1,90 @@
+{
+    "accessList" : {
+        "_info" : {
+            "comment" : "Access list in tr example",
+            "filling-rpc-server" : "evm version 1.10.0-unstable-e09dc4eb-20210211",
+            "filling-tool-version" : "retesteth-0.1.0-accesslist+commit.37e87c45.Linux.g++",
+            "lllcversion" : "Version: 0.5.14-develop.2020.6.22+commit.9189ad7a.Linux.g++",
+            "source" : "src/GeneralStateTestsFiller/stExample/accessListFiller.json",
+            "sourceHash" : "0b91ae030423fd2d178aea8c362196b24e059c2525c64f5aca273e3e277c22ed",
+            "labels" : {
+                "0" : ":label somelabel",
+                "1" : ":label somelabel2"
+            }
+        },
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "0xff112233445566",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "Berlin" : [
+                {
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "hash" : "0x6ef2bfc9fbc7f1ad04aefc6ca5d64ec882f81c60a14f5171f181a169a6db1a6b",
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "hash" : "0x0bdf3644f34b9678b88307ffe487c8215daa8689580eacf2e93ba809843f6898",
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ]
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x600160010160005500",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                "0x1122",
+                "0x3344"
+            ],
+            "accessLists" : [
+                [
+                    {
+                        "address" : "0x0000000000000000000000000000000000001337",
+                        "storageKeys" : [
+                            "0x0000000000000000000000000000000000000000000000000000000000000001",
+                            "0x0000000000000000000000000000000000000000000000000000000000000002"
+                        ]
+                    }
+                ],
+                null
+            ],
+            "gasLimit" : [
+                "0x061a80"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+            "value" : [
+                "0x0186a0"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/b11r/simple.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/b11r/simple.json
new file mode 100644
index 00000000000..5d585797599
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/b11r/simple.json
@@ -0,0 +1,37 @@
+{
+  "cli": [
+    "b11r",
+    "--input.header=stdin",
+    "--input.txs=stdin",
+    "--input.ommers=stdin",
+    "--seal.clique=stdin",
+    "--output.block=stdout"
+  ],
+  "stdin": {
+    "header": {
+      "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "miner": "0x0000000000000000000000000000000000000000",
+      "stateRoot": "0x369ba8b2e5b32d675d07933d6fb851d97d3ca66c60a829f7356163d92ae0439a",
+      "transactionsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "difficulty": "0x20000",
+      "number": "0x0",
+      "gasLimit": "0x16345785d8a0000",
+      "gasUsed": "0xb1a2bc2ec50000",
+      "timestamp": "0x0",
+      "extraData": "0x00",
+      "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "nonce": "0x0000000000000000",
+      "baseFeePerGas": "0x7"
+    },
+    "txs": "",
+    "uncles": [],
+    "clique": null
+  },
+  "stdout": {
+    "rlp": "0xf90205f90200a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a0369ba8b2e5b32d675d07933d6fb851d97d3ca66c60a829f7356163d92ae0439aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008088016345785d8a000087b1a2bc2ec500008000a0000000000000000000000000000000000000000000000000000000000000000088000000000000000007c0c0",
+    "hash": "0xe3c84688fa32c20955c535c7d25b5b4b196079e40a9c47c9cb1edb5e58b3dce5"
+  }
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/bogus-test.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/bogus-test.json
new file mode 100644
index 00000000000..09ee74030d6
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/bogus-test.json
@@ -0,0 +1,3 @@
+{
+  "this-file-is": bogus!
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/state-test/all-trace-flags-disabled.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/state-test/all-trace-flags-disabled.json
new file mode 100644
index 00000000000..e4b8bc37ac5
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/state-test/all-trace-flags-disabled.json
@@ -0,0 +1,106 @@
+{
+  "cli": [
+    "state-test",
+    "stdin",
+    "--trace",
+    "--trace.nomemory",
+    "--trace.nostack",
+    "--trace.noreturndata",
+    "--notime"
+  ],
+  "stdin": {
+    "returndatacopy_following_call": {
+      "env": {
+        "currentBaseFee": "0x0a",
+        "currentCoinbase": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+        "currentDifficulty": "0x020000",
+        "currentGasLimit": "0x1a00000000",
+        "currentNumber": "0x01",
+        "currentRandom": "0x0000000000000000000000000000000000000000000000000000000000020000",
+        "currentTimestamp": "0x03e8",
+        "previousHash": "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+      },
+      "post": {
+        "London": [
+          {
+            "hash": "0x1c6dda42e80135b6d5ff1a664e6f85e8552d5c56888bb35e2e694f3829a500c7",
+            "indexes": {
+              "data": 0,
+              "gas": 0,
+              "value": 0
+            },
+            "logs": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+            "txbytes": "0xf862800a850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec680801ba0be56d61b678ad2c41b294c70b5213913b9a6f17753ba7aadc171c9a2474f66a8a04814800401028ca339e8af9f4a6253bddd3f9df8f1dc6da275d19862e9f28642"
+          }
+        ]
+      },
+      "pre": {
+        "0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6": {
+          "balance": "0x00",
+          "code": "0x7d111122223333444455556666777788889999aaaabbbbccccddddeeeeffff60005260206000f300",
+          "nonce": "0x00",
+          "storage": {
+          }
+        },
+        "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+          "balance": "0x00",
+          "code": "0x60006000600060006000730aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6640900000000f1506020600060003e60005160005500",
+          "nonce": "0x00",
+          "storage": {
+            "0x00": "0x01"
+          }
+        },
+        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+          "balance": "0x6400000000",
+          "code": "0x",
+          "nonce": "0x00",
+          "storage": {
+          }
+        }
+      },
+      "transaction": {
+        "data": [
+          "0x"
+        ],
+        "gasLimit": [
+          "0x0a00000000"
+        ],
+        "gasPrice": "0x0a",
+        "nonce": "0x00",
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "sender": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "to": "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+        "value": [
+          "0x00"
+        ]
+      }
+    }
+  },
+  "stdout": [
+    {"pc":0,"op":96,"gas":"0x9ffffadf8","gasCost":"0x3","memSize":0,"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":2,"op":96,"gas":"0x9ffffadf5","gasCost":"0x3","memSize":0,"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":4,"op":96,"gas":"0x9ffffadf2","gasCost":"0x3","memSize":0,"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":6,"op":96,"gas":"0x9ffffadef","gasCost":"0x3","memSize":0,"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":8,"op":96,"gas":"0x9ffffadec","gasCost":"0x3","memSize":0,"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":10,"op":115,"gas":"0x9ffffade9","gasCost":"0x3","memSize":0,"depth":1,"refund":0,"opName":"PUSH20"},
+    {"pc":31,"op":100,"gas":"0x9ffffade6","gasCost":"0x3","memSize":0,"depth":1,"refund":0,"opName":"PUSH5"},
+    {"pc":37,"op":241,"gas":"0x9ffffade3","gasCost":"0xa28","memSize":0,"depth":1,"refund":0,"opName":"CALL"},
+    {"pc":0,"op":125,"gas":"0x900000000","gasCost":"0x3","memSize":0,"depth":2,"refund":0,"opName":"PUSH30"},
+    {"pc":31,"op":96,"gas":"0x8fffffffd","gasCost":"0x3","memSize":0,"depth":2,"refund":0,"opName":"PUSH1"},
+    {"pc":33,"op":82,"gas":"0x8fffffffa","gasCost":"0x6","memSize":0,"depth":2,"refund":0,"opName":"MSTORE"},
+    {"pc":34,"op":96,"gas":"0x8fffffff4","gasCost":"0x3","memSize":32,"depth":2,"refund":0,"opName":"PUSH1"},
+    {"pc":36,"op":96,"gas":"0x8fffffff1","gasCost":"0x3","memSize":32,"depth":2,"refund":0,"opName":"PUSH1"},
+    {"pc":38,"op":243,"gas":"0x8ffffffee","gasCost":"0x0","memSize":32,"depth":2,"refund":0,"opName":"RETURN"},
+    {"pc":38,"op":80,"gas":"0x9ffffa3a9","gasCost":"0x2","memSize":0,"depth":1,"refund":0,"opName":"POP"},
+    {"pc":39,"op":96,"gas":"0x9ffffa3a7","gasCost":"0x3","memSize":0,"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":41,"op":96,"gas":"0x9ffffa3a4","gasCost":"0x3","memSize":0,"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":43,"op":96,"gas":"0x9ffffa3a1","gasCost":"0x3","memSize":0,"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":45,"op":62,"gas":"0x9ffffa39e","gasCost":"0x9","memSize":0,"depth":1,"refund":0,"opName":"RETURNDATACOPY"},
+    {"pc":46,"op":96,"gas":"0x9ffffa395","gasCost":"0x3","memSize":32,"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":48,"op":81,"gas":"0x9ffffa392","gasCost":"0x3","memSize":32,"depth":1,"refund":0,"opName":"MLOAD"},
+    {"pc":49,"op":96,"gas":"0x9ffffa38f","gasCost":"0x3","memSize":32,"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":51,"op":85,"gas":"0x9ffffa38c","gasCost":"0x1388","memSize":32,"depth":1,"refund":0,"opName":"SSTORE"},
+    {"pc":52,"op":0,"gas":"0x9ffff9004","gasCost":"0x0","memSize":32,"depth":1,"refund":0,"opName":"STOP"},
+    {"output":"","gasUsed":"0x6ffc","test":"returndatacopy_following_call","fork":"London","d":0,"g":0,"v":0,"postHash":"0x1c6dda42e80135b6d5ff1a664e6f85e8552d5c56888bb35e2e694f3829a500c7","postLogsHash":"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347","pass":true}
+  ]
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/state-test/all-trace-flags.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/state-test/all-trace-flags.json
new file mode 100644
index 00000000000..7ab16b709c7
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/state-test/all-trace-flags.json
@@ -0,0 +1,106 @@
+{
+  "cli": [
+    "state-test",
+    "stdin",
+    "--trace",
+    "--trace.memory",
+    "--trace.stack",
+    "--trace.returndata",
+    "--notime"
+  ],
+  "stdin": {
+    "returndatacopy_following_call": {
+      "env": {
+        "currentBaseFee": "0x0a",
+        "currentCoinbase": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+        "currentDifficulty": "0x020000",
+        "currentGasLimit": "0x1a00000000",
+        "currentNumber": "0x01",
+        "currentRandom": "0x0000000000000000000000000000000000000000000000000000000000020000",
+        "currentTimestamp": "0x03e8",
+        "previousHash": "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+      },
+      "post": {
+        "London": [
+          {
+            "hash": "0x1c6dda42e80135b6d5ff1a664e6f85e8552d5c56888bb35e2e694f3829a500c7",
+            "indexes": {
+              "data": 0,
+              "gas": 0,
+              "value": 0
+            },
+            "logs": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+            "txbytes": "0xf862800a850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec680801ba0be56d61b678ad2c41b294c70b5213913b9a6f17753ba7aadc171c9a2474f66a8a04814800401028ca339e8af9f4a6253bddd3f9df8f1dc6da275d19862e9f28642"
+          }
+        ]
+      },
+      "pre": {
+        "0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6": {
+          "balance": "0x00",
+          "code": "0x7d111122223333444455556666777788889999aaaabbbbccccddddeeeeffff60005260206000f300",
+          "nonce": "0x00",
+          "storage": {
+          }
+        },
+        "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+          "balance": "0x00",
+          "code": "0x60006000600060006000730aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6640900000000f1506020600060003e60005160005500",
+          "nonce": "0x00",
+          "storage": {
+            "0x00": "0x01"
+          }
+        },
+        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+          "balance": "0x6400000000",
+          "code": "0x",
+          "nonce": "0x00",
+          "storage": {
+          }
+        }
+      },
+      "transaction": {
+        "data": [
+          "0x"
+        ],
+        "gasLimit": [
+          "0x0a00000000"
+        ],
+        "gasPrice": "0x0a",
+        "nonce": "0x00",
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "sender": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "to": "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+        "value": [
+          "0x00"
+        ]
+      }
+    }
+  },
+  "stdout": [
+    {"pc":0,"op":96,"gas":"0x9ffffadf8","gasCost":"0x3","memSize":0,"stack":[],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":2,"op":96,"gas":"0x9ffffadf5","gasCost":"0x3","memSize":0,"stack":["0x0"],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":4,"op":96,"gas":"0x9ffffadf2","gasCost":"0x3","memSize":0,"stack":["0x0","0x0"],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":6,"op":96,"gas":"0x9ffffadef","gasCost":"0x3","memSize":0,"stack":["0x0","0x0","0x0"],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":8,"op":96,"gas":"0x9ffffadec","gasCost":"0x3","memSize":0,"stack":["0x0","0x0","0x0","0x0"],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":10,"op":115,"gas":"0x9ffffade9","gasCost":"0x3","memSize":0,"stack":["0x0","0x0","0x0","0x0","0x0"],"depth":1,"refund":0,"opName":"PUSH20"},
+    {"pc":31,"op":100,"gas":"0x9ffffade6","gasCost":"0x3","memSize":0,"stack":["0x0","0x0","0x0","0x0","0x0","0xaabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6"],"depth":1,"refund":0,"opName":"PUSH5"},
+    {"pc":37,"op":241,"gas":"0x9ffffade3","gasCost":"0xa28","memSize":0,"stack":["0x0","0x0","0x0","0x0","0x0","0xaabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6","0x900000000"],"depth":1,"refund":0,"opName":"CALL"},
+    {"pc":0,"op":125,"gas":"0x900000000","gasCost":"0x3","memSize":0,"stack":[],"depth":2,"refund":0,"opName":"PUSH30"},
+    {"pc":31,"op":96,"gas":"0x8fffffffd","gasCost":"0x3","memSize":0,"stack":["0x111122223333444455556666777788889999aaaabbbbccccddddeeeeffff"],"depth":2,"refund":0,"opName":"PUSH1"},
+    {"pc":33,"op":82,"gas":"0x8fffffffa","gasCost":"0x6","memSize":0,"stack":["0x111122223333444455556666777788889999aaaabbbbccccddddeeeeffff","0x0"],"depth":2,"refund":0,"opName":"MSTORE"},
+    {"pc":34,"op":96,"gas":"0x8fffffff4","gasCost":"0x3","memory":"0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff","memSize":32,"stack":[],"depth":2,"refund":0,"opName":"PUSH1"},
+    {"pc":36,"op":96,"gas":"0x8fffffff1","gasCost":"0x3","memory":"0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff","memSize":32,"stack":["0x20"],"depth":2,"refund":0,"opName":"PUSH1"},
+    {"pc":38,"op":243,"gas":"0x8ffffffee","gasCost":"0x0","memory":"0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff","memSize":32,"stack":["0x20","0x0"],"depth":2,"refund":0,"opName":"RETURN"},
+    {"pc":38,"op":80,"gas":"0x9ffffa3a9","gasCost":"0x2","memSize":0,"stack":["0x1"],"returnData":"0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff","depth":1,"refund":0,"opName":"POP"},
+    {"pc":39,"op":96,"gas":"0x9ffffa3a7","gasCost":"0x3","memSize":0,"stack":[],"returnData":"0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff","depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":41,"op":96,"gas":"0x9ffffa3a4","gasCost":"0x3","memSize":0,"stack":["0x20"],"returnData":"0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff","depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":43,"op":96,"gas":"0x9ffffa3a1","gasCost":"0x3","memSize":0,"stack":["0x20","0x0"],"returnData":"0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff","depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":45,"op":62,"gas":"0x9ffffa39e","gasCost":"0x9","memSize":0,"stack":["0x20","0x0","0x0"],"returnData":"0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff","depth":1,"refund":0,"opName":"RETURNDATACOPY"},
+    {"pc":46,"op":96,"gas":"0x9ffffa395","gasCost":"0x3","memory":"0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff","memSize":32,"stack":[],"returnData":"0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff","depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":48,"op":81,"gas":"0x9ffffa392","gasCost":"0x3","memory":"0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff","memSize":32,"stack":["0x0"],"returnData":"0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff","depth":1,"refund":0,"opName":"MLOAD"},
+    {"pc":49,"op":96,"gas":"0x9ffffa38f","gasCost":"0x3","memory":"0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff","memSize":32,"stack":["0x111122223333444455556666777788889999aaaabbbbccccddddeeeeffff"],"returnData":"0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff","depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":51,"op":85,"gas":"0x9ffffa38c","gasCost":"0x1388","memory":"0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff","memSize":32,"stack":["0x111122223333444455556666777788889999aaaabbbbccccddddeeeeffff","0x0"],"returnData":"0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff","depth":1,"refund":0,"opName":"SSTORE"},
+    {"pc":52,"op":0,"gas":"0x9ffff9004","gasCost":"0x0","memory":"0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff","memSize":32,"stack":[],"returnData":"0x0000111122223333444455556666777788889999aaaabbbbccccddddeeeeffff","depth":1,"refund":0,"opName":"STOP"},
+    {"output":"","gasUsed":"0x6ffc","test":"returndatacopy_following_call","fork":"London","d":0,"g":0,"v":0,"postHash":"0x1c6dda42e80135b6d5ff1a664e6f85e8552d5c56888bb35e2e694f3829a500c7","postLogsHash":"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347","pass":true}
+  ]
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/state-test/blockhash.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/state-test/blockhash.json
new file mode 100644
index 00000000000..b5bac5462ef
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/state-test/blockhash.json
@@ -0,0 +1,104 @@
+{
+  "cli": [
+    "state-test",
+    "stdin",
+    "--trace",
+    "--trace.memory",
+    "--trace.stack",
+    "--trace.returndata",
+    "--notime"
+  ],
+  "stdin": {
+    "00000936-mixed-1": {
+      "env": {
+        "currentCoinbase": "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "currentDifficulty": "0x20000",
+        "currentRandom": "0x0000000000000000000000000000000000000000000000000000000000020000",
+        "currentGasLimit": "0x26e1f476fe1e22",
+        "currentNumber": "0x2",
+        "currentTimestamp": "0x3e8",
+        "previousHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "currentBaseFee": "0x10"
+      },
+      "pre": {
+        "0x00000000000000000000000000000000000000f1": {
+          "code": "0x600060016001600260026101f461ffff5817907c78859e5b97166c486532b1595a673e9f9073643f1b519c6f18511b991383610389895f8a5b82723e3d6d5ff042148d326c1898713a76759ca27383404148083e7788908f409e38766cfafe083134530b5279797ef56394faa3183b3780475932387ea37a326494ff1b6b57018c79f07a9ba492a256543f0b6a813b316835b15385077d9e8d32f18c3bb159fab11734a363999e7e940a9c19699da08a82a3ff6743b13f44206194321d026490411a938b35f47cf31b91a1ff397b7c6d879f119915176f3699801bf0766b62fd855b60607d6f133f35fa40307e150a096ea35041306b9330f23441473018055f44698e928a109b02f38f515386177e819161487a5bfa7951f5317183fa743d7587f479009c8b4813089d8d3cf37e3a9b6170528b84f296f07433363a766a64529d8c62ff859c0852173e875685ff15123594f13418966f483a999990109b1694511007477171068aa03a561b8df4743642452039a43c391c3e0033f4615ab1f37cb10293387613024673187c1d5b731c3e53a19080b03e6b94755580876f7a6bf0f238f0991c775172893e7b14449e8c050968b032a29bf13265657d11386d9f8c6f360670fa1116178909f59a369c7c005f8d1464527365f0fd5b818499a2469a0b173f42478294f11c8b40567d8b9f72f43594028d67b17893668a999d8d205014687a6a9b09198bfe87a144313895a208183c8b4060a392387a5106f235a019f36d336f6034f5fe006df413a090791c3c6c52b181f047457a8a73f294f401467a79048060113b1b20fd87078a78a273368c116741128c9a715b085312949c15460b9b8613587c79365b643a67106d840b51a0009e3f893f893236527d540b14403a866d6a147df465a03a8a62489a1d7f680962036b716111f45572367e887606f282820b3d7c178af5f3846a60f2999290f3f3847882f19362113e668f19a07bfffa8aa4374793a28401fe34fd93551a7a721256130789707767a408847307067a85fe3cf1f58a64f0368d38413299f083941885867d18308e0835b054531793087b8c970490597203978d1a8a1b6ba459621b8a8d8313655711563e31073e3c3d6056337299089a94415468097df1425a91f209b13d77f493425041f4ff6718441445463c519771069e727ef59214b19b0b5a3a3b3aa01b6c963da1638117323d637c92443e97795a438593155f73123417fd7b01397b7f4587b1727a011a12450903fa62f182b168920b945a57f28a2078665088593458137d75729f8898800953933056867c1d48441839128c6238f39d3c01149b9859b1958e0b806c81966302f03407a0f5047d778c52018b20f5f13e5b7255544632708064318b31fd0b7b420b3659761da06a17584554453d4363a27c8f767941619d628b75934051",
+          "storage": {
+            "0x0000000000000000000000000000000000000000000000000000000000000000": "0x000000000000000000000000000000000000000000000000000000000000000a",
+            "0x0000000000000000000000000000000000000000000000000000000000000002": "0x000000000000000000000000000000000000000000000000000000000000000a",
+            "0x0000000000000000000000000000000000000000000000000000000000000003": "0x0000000000000000000000000000000000000000000000000000000000000002",
+            "0x0000000000000000000000000000000000000000000000000000000000000005": "0x0000000000000000000000000000000000000000000000000000000000000007",
+            "0x0000000000000000000000000000000000000000000000000000000000000008": "0x0000000000000000000000000000000000000000000000000000000000000011",
+            "0x0000000000000000000000000000000000000000000000000000000000000009": "0x0000000000000000000000000000000000000000000000000000000000000005",
+            "0x000000000000000000000000000000000000000000000000000000000000000c": "0x0000000000000000000000000000000000000000000000000000000000000008"
+          },
+          "balance": "0x0",
+          "nonce": "0x0"
+        },
+        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+          "code": "0x",
+          "storage": {},
+          "balance": "0xffffffffff",
+          "nonce": "0x0"
+        }
+      },
+      "transaction": {
+        "gasPrice": "0x10",
+        "nonce": "0x0",
+        "to": "0x00000000000000000000000000000000000000f1",
+        "data": [
+          "0xfe25cf37540066ffd30066af7690fad6d555e13067f5c3c16ced98a803e2b009db4ab89b243ac17b80386d12d621723c363e46aff1fcce9c084d"
+        ],
+        "gasLimit": [
+          "0x7a1200"
+        ],
+        "value": [
+          "0xdbbe"
+        ],
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"
+      },
+      "out": "0x",
+      "post": {
+        "Shanghai": [
+          {
+            "hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "logs": "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "indexes": {
+              "data": 0,
+              "gas": 0,
+              "value": 0
+            }
+          }
+        ]
+      }
+    }
+  },
+  "stdout": [
+    {"pc":0,"op":96,"gas":"0x79bc70","gasCost":"0x3","memSize":0,"stack":[],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":2,"op":96,"gas":"0x79bc6d","gasCost":"0x3","memSize":0,"stack":["0x0"],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":4,"op":96,"gas":"0x79bc6a","gasCost":"0x3","memSize":0,"stack":["0x0","0x1"],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":6,"op":96,"gas":"0x79bc67","gasCost":"0x3","memSize":0,"stack":["0x0","0x1","0x1"],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":8,"op":96,"gas":"0x79bc64","gasCost":"0x3","memSize":0,"stack":["0x0","0x1","0x1","0x2"],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":10,"op":97,"gas":"0x79bc61","gasCost":"0x3","memSize":0,"stack":["0x0","0x1","0x1","0x2","0x2"],"depth":1,"refund":0,"opName":"PUSH2"},
+    {"pc":13,"op":97,"gas":"0x79bc5e","gasCost":"0x3","memSize":0,"stack":["0x0","0x1","0x1","0x2","0x2","0x1f4"],"depth":1,"refund":0,"opName":"PUSH2"},
+    {"pc":16,"op":88,"gas":"0x79bc5b","gasCost":"0x2","memSize":0,"stack":["0x0","0x1","0x1","0x2","0x2","0x1f4","0xffff"],"depth":1,"refund":0,"opName":"PC"},
+    {"pc":17,"op":23,"gas":"0x79bc59","gasCost":"0x3","memSize":0,"stack":["0x0","0x1","0x1","0x2","0x2","0x1f4","0xffff","0x10"],"depth":1,"refund":0,"opName":"OR"},
+    {"pc":18,"op":144,"gas":"0x79bc56","gasCost":"0x3","memSize":0,"stack":["0x0","0x1","0x1","0x2","0x2","0x1f4","0xffff"],"depth":1,"refund":0,"opName":"SWAP1"},
+    {"pc":19,"op":124,"gas":"0x79bc53","gasCost":"0x3","memSize":0,"stack":["0x0","0x1","0x1","0x2","0x2","0xffff","0x1f4"],"depth":1,"refund":0,"opName":"PUSH29"},
+    {"pc":49,"op":131,"gas":"0x79bc50","gasCost":"0x3","memSize":0,"stack":["0x0","0x1","0x1","0x2","0x2","0xffff","0x1f4","0x78859e5b97166c486532b1595a673e9f9073643f1b519c6f18511b9913"],"depth":1,"refund":0,"opName":"DUP4"},
+    {"pc":50,"op":97,"gas":"0x79bc4d","gasCost":"0x3","memSize":0,"stack":["0x0","0x1","0x1","0x2","0x2","0xffff","0x1f4","0x78859e5b97166c486532b1595a673e9f9073643f1b519c6f18511b9913","0x2"],"depth":1,"refund":0,"opName":"PUSH2"},
+    {"pc":53,"op":137,"gas":"0x79bc4a","gasCost":"0x3","memSize":0,"stack":["0x0","0x1","0x1","0x2","0x2","0xffff","0x1f4","0x78859e5b97166c486532b1595a673e9f9073643f1b519c6f18511b9913","0x2","0x389"],"depth":1,"refund":0,"opName":"DUP10"},
+    {"pc":54,"op":95,"gas":"0x79bc47","gasCost":"0x2","memSize":0,"stack":["0x0","0x1","0x1","0x2","0x2","0xffff","0x1f4","0x78859e5b97166c486532b1595a673e9f9073643f1b519c6f18511b9913","0x2","0x389","0x0"],"depth":1,"refund":0,"opName":"PUSH0"},
+    {"pc":55,"op":138,"gas":"0x79bc45","gasCost":"0x3","memSize":0,"stack":["0x0","0x1","0x1","0x2","0x2","0xffff","0x1f4","0x78859e5b97166c486532b1595a673e9f9073643f1b519c6f18511b9913","0x2","0x389","0x0","0x0"],"depth":1,"refund":0,"opName":"DUP11"},
+    {"pc":56,"op":91,"gas":"0x79bc42","gasCost":"0x1","memSize":0,"stack":["0x0","0x1","0x1","0x2","0x2","0xffff","0x1f4","0x78859e5b97166c486532b1595a673e9f9073643f1b519c6f18511b9913","0x2","0x389","0x0","0x0","0x1"],"depth":1,"refund":0,"opName":"JUMPDEST"},
+    {"pc":57,"op":130,"gas":"0x79bc41","gasCost":"0x3","memSize":0,"stack":["0x0","0x1","0x1","0x2","0x2","0xffff","0x1f4","0x78859e5b97166c486532b1595a673e9f9073643f1b519c6f18511b9913","0x2","0x389","0x0","0x0","0x1"],"depth":1,"refund":0,"opName":"DUP3"},
+    {"pc":58,"op":114,"gas":"0x79bc3e","gasCost":"0x3","memSize":0,"stack":["0x0","0x1","0x1","0x2","0x2","0xffff","0x1f4","0x78859e5b97166c486532b1595a673e9f9073643f1b519c6f18511b9913","0x2","0x389","0x0","0x0","0x1","0x0"],"depth":1,"refund":0,"opName":"PUSH19"},
+    {"pc":78,"op":131,"gas":"0x79bc3b","gasCost":"0x3","memSize":0,"stack":["0x0","0x1","0x1","0x2","0x2","0xffff","0x1f4","0x78859e5b97166c486532b1595a673e9f9073643f1b519c6f18511b9913","0x2","0x389","0x0","0x0","0x1","0x0","0x3e3d6d5ff042148d326c1898713a76759ca273"],"depth":1,"refund":0,"opName":"DUP4"},
+    {"pc":79,"op":64,"gas":"0x79bc38","gasCost":"0x14","memSize":0,"stack":["0x0","0x1","0x1","0x2","0x2","0xffff","0x1f4","0x78859e5b97166c486532b1595a673e9f9073643f1b519c6f18511b9913","0x2","0x389","0x0","0x0","0x1","0x0","0x3e3d6d5ff042148d326c1898713a76759ca273","0x0"],"depth":1,"refund":0,"opName":"BLOCKHASH"},
+    {"pc":80,"op":65,"gas":"0x79bc24","gasCost":"0x2","memSize":0,"stack":["0x0","0x1","0x1","0x2","0x2","0xffff","0x1f4","0x78859e5b97166c486532b1595a673e9f9073643f1b519c6f18511b9913","0x2","0x389","0x0","0x0","0x1","0x0","0x3e3d6d5ff042148d326c1898713a76759ca273","0x44852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d"],"depth":1,"refund":0,"opName":"COINBASE"},
+    {"pc":81,"op":72,"gas":"0x79bc22","gasCost":"0x2","memSize":0,"stack":["0x0","0x1","0x1","0x2","0x2","0xffff","0x1f4","0x78859e5b97166c486532b1595a673e9f9073643f1b519c6f18511b9913","0x2","0x389","0x0","0x0","0x1","0x0","0x3e3d6d5ff042148d326c1898713a76759ca273","0x44852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d","0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b"],"depth":1,"refund":0,"opName":"BASEFEE"},
+    {"pc":82,"op":8,"gas":"0x79bc20","gasCost":"0x8","memSize":0,"stack":["0x0","0x1","0x1","0x2","0x2","0xffff","0x1f4","0x78859e5b97166c486532b1595a673e9f9073643f1b519c6f18511b9913","0x2","0x389","0x0","0x0","0x1","0x0","0x3e3d6d5ff042148d326c1898713a76759ca273","0x44852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d","0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b","0x10"],"depth":1,"refund":0,"opName":"ADDMOD"},
+    {"pc":83,"op":62,"gas":"0x79bc18","gasCost":"0x0","memSize":0,"stack":["0x0","0x1","0x1","0x2","0x2","0xffff","0x1f4","0x78859e5b97166c486532b1595a673e9f9073643f1b519c6f18511b9913","0x2","0x389","0x0","0x0","0x1","0x0","0x3e3d6d5ff042148d326c1898713a76759ca273","0xb94f5374fce5edbc8e2a8697c15331677e6ebf1b"],"depth":1,"refund":0,"opName":"RETURNDATACOPY","error":"Out of bounds"},
+    {"output":"","gasUsed":"0x7a1200","test":"00000936-mixed-1","fork":"Shanghai","d":0,"g":0,"v":0,"postHash":"0xd14c10ed22a1cfb642e374be985ac581c39f3969bd59249e0405aca3beb47a47","postLogsHash":"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347","pass":false}
+  ]
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/state-test/no-memory.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/state-test/no-memory.json
new file mode 100644
index 00000000000..14a995d26c2
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/state-test/no-memory.json
@@ -0,0 +1,104 @@
+{
+  "cli": [
+    "--json",
+    "--nomemory",
+    "state-test",
+    "stdin",
+    "--notime"
+  ],
+  "stdin": {
+    "returndatacopy_following_call": {
+      "env": {
+        "currentBaseFee": "0x0a",
+        "currentCoinbase": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+        "currentDifficulty": "0x020000",
+        "currentGasLimit": "0x1a00000000",
+        "currentNumber": "0x01",
+        "currentRandom": "0x0000000000000000000000000000000000000000000000000000000000020000",
+        "currentTimestamp": "0x03e8",
+        "previousHash": "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+      },
+      "post": {
+        "London": [
+          {
+            "hash": "0x1c6dda42e80135b6d5ff1a664e6f85e8552d5c56888bb35e2e694f3829a500c7",
+            "indexes": {
+              "data": 0,
+              "gas": 0,
+              "value": 0
+            },
+            "logs": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+            "txbytes": "0xf862800a850a00000000940f572e5295c57f15886f9b263e2f6d2d6c7b5ec680801ba0be56d61b678ad2c41b294c70b5213913b9a6f17753ba7aadc171c9a2474f66a8a04814800401028ca339e8af9f4a6253bddd3f9df8f1dc6da275d19862e9f28642"
+          }
+        ]
+      },
+      "pre": {
+        "0x0aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6": {
+          "balance": "0x00",
+          "code": "0x7d111122223333444455556666777788889999aaaabbbbccccddddeeeeffff60005260206000f300",
+          "nonce": "0x00",
+          "storage": {
+          }
+        },
+        "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+          "balance": "0x00",
+          "code": "0x60006000600060006000730aabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6640900000000f1506020600060003e60005160005500",
+          "nonce": "0x00",
+          "storage": {
+            "0x00": "0x01"
+          }
+        },
+        "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+          "balance": "0x6400000000",
+          "code": "0x",
+          "nonce": "0x00",
+          "storage": {
+          }
+        }
+      },
+      "transaction": {
+        "data": [
+          "0x"
+        ],
+        "gasLimit": [
+          "0x0a00000000"
+        ],
+        "gasPrice": "0x0a",
+        "nonce": "0x00",
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "sender": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+        "to": "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+        "value": [
+          "0x00"
+        ]
+      }
+    }
+  },
+  "stdout": [
+    {"pc":0,"op":96,"gas":"0x9ffffadf8","gasCost":"0x3","memSize":0,"stack":[],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":2,"op":96,"gas":"0x9ffffadf5","gasCost":"0x3","memSize":0,"stack":["0x0"],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":4,"op":96,"gas":"0x9ffffadf2","gasCost":"0x3","memSize":0,"stack":["0x0","0x0"],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":6,"op":96,"gas":"0x9ffffadef","gasCost":"0x3","memSize":0,"stack":["0x0","0x0","0x0"],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":8,"op":96,"gas":"0x9ffffadec","gasCost":"0x3","memSize":0,"stack":["0x0","0x0","0x0","0x0"],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":10,"op":115,"gas":"0x9ffffade9","gasCost":"0x3","memSize":0,"stack":["0x0","0x0","0x0","0x0","0x0"],"depth":1,"refund":0,"opName":"PUSH20"},
+    {"pc":31,"op":100,"gas":"0x9ffffade6","gasCost":"0x3","memSize":0,"stack":["0x0","0x0","0x0","0x0","0x0","0xaabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6"],"depth":1,"refund":0,"opName":"PUSH5"},
+    {"pc":37,"op":241,"gas":"0x9ffffade3","gasCost":"0xa28","memSize":0,"stack":["0x0","0x0","0x0","0x0","0x0","0xaabbccdd5c57f15886f9b263e2f6d2d6c7b5ec6","0x900000000"],"depth":1,"refund":0,"opName":"CALL"},
+    {"pc":0,"op":125,"gas":"0x900000000","gasCost":"0x3","memSize":0,"stack":[],"depth":2,"refund":0,"opName":"PUSH30"},
+    {"pc":31,"op":96,"gas":"0x8fffffffd","gasCost":"0x3","memSize":0,"stack":["0x111122223333444455556666777788889999aaaabbbbccccddddeeeeffff"],"depth":2,"refund":0,"opName":"PUSH1"},
+    {"pc":33,"op":82,"gas":"0x8fffffffa","gasCost":"0x6","memSize":0,"stack":["0x111122223333444455556666777788889999aaaabbbbccccddddeeeeffff","0x0"],"depth":2,"refund":0,"opName":"MSTORE"},
+    {"pc":34,"op":96,"gas":"0x8fffffff4","gasCost":"0x3","memSize":32,"stack":[],"depth":2,"refund":0,"opName":"PUSH1"},
+    {"pc":36,"op":96,"gas":"0x8fffffff1","gasCost":"0x3","memSize":32,"stack":["0x20"],"depth":2,"refund":0,"opName":"PUSH1"},
+    {"pc":38,"op":243,"gas":"0x8ffffffee","gasCost":"0x0","memSize":32,"stack":["0x20","0x0"],"depth":2,"refund":0,"opName":"RETURN"},
+    {"pc":38,"op":80,"gas":"0x9ffffa3a9","gasCost":"0x2","memSize":0,"stack":["0x1"],"depth":1,"refund":0,"opName":"POP"},
+    {"pc":39,"op":96,"gas":"0x9ffffa3a7","gasCost":"0x3","memSize":0,"stack":[],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":41,"op":96,"gas":"0x9ffffa3a4","gasCost":"0x3","memSize":0,"stack":["0x20"],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":43,"op":96,"gas":"0x9ffffa3a1","gasCost":"0x3","memSize":0,"stack":["0x20","0x0"],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":45,"op":62,"gas":"0x9ffffa39e","gasCost":"0x9","memSize":0,"stack":["0x20","0x0","0x0"],"depth":1,"refund":0,"opName":"RETURNDATACOPY"},
+    {"pc":46,"op":96,"gas":"0x9ffffa395","gasCost":"0x3","memSize":32,"stack":[],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":48,"op":81,"gas":"0x9ffffa392","gasCost":"0x3","memSize":32,"stack":["0x0"],"depth":1,"refund":0,"opName":"MLOAD"},
+    {"pc":49,"op":96,"gas":"0x9ffffa38f","gasCost":"0x3","memSize":32,"stack":["0x111122223333444455556666777788889999aaaabbbbccccddddeeeeffff"],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":51,"op":85,"gas":"0x9ffffa38c","gasCost":"0x1388","memSize":32,"stack":["0x111122223333444455556666777788889999aaaabbbbccccddddeeeeffff","0x0"],"depth":1,"refund":0,"opName":"SSTORE"},
+    {"pc":52,"op":0,"gas":"0x9ffff9004","gasCost":"0x0","memSize":32,"stack":[],"depth":1,"refund":0,"opName":"STOP"},
+    {"output":"","gasUsed":"0x6ffc","test":"returndatacopy_following_call","fork":"London","d":0,"g":0,"v":0,"postHash":"0x1c6dda42e80135b6d5ff1a664e6f85e8552d5c56888bb35e2e694f3829a500c7","postLogsHash":"0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347","pass":true}
+  ]
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/berlin-calculate-difficulty.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/berlin-calculate-difficulty.json
new file mode 100644
index 00000000000..3de9d7ed247
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/berlin-calculate-difficulty.json
@@ -0,0 +1,104 @@
+{
+  "cli": [
+    "t8n",
+    "--input.alloc=stdin",
+    "--input.txs=stdin",
+    "--input.env=stdin",
+    "--output.result=stdout",
+    "--output.alloc=stdout",
+    "--output.body=stdout",
+    "--state.fork=Berlin",
+    "--state.chainid=1",
+    "--state.reward=2000000000000000000"
+  ],
+  "stdin": {
+    "alloc": {
+      "0x1000000000000000000000000000000000000000": {
+        "nonce": "0x00",
+        "balance": "0x0ba1a9ce0ba1a9ce",
+        "code": "0x6010565b6000828201905092915050565b601a600260016003565b60005560206000f3",
+        "storage": {}
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "nonce": "0x00",
+        "balance": "0x0ba1a9ce0ba1a9ce",
+        "code": "0x",
+        "storage": {}
+      }
+    },
+    "txs": [
+      {
+        "type": "0x0",
+        "chainId": "0x0",
+        "nonce": "0x0",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x1000000000000000000000000000000000000000",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      }
+    ],
+    "env": {
+      "currentCoinbase": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+      "currentGasLimit": "100000000000000000",
+      "currentNumber": "1",
+      "currentTimestamp": "1000",
+      "parentDifficulty": "131072",
+      "parentGasUsed": "50000000000000000",
+      "parentGasLimit": "100000000000000000",
+      "parentTimstamp": "0",
+      "blockHashes": {
+        "0": "0x87c5fa7cef8b99fc333b662c1a4306c7d41d9d43a23414b15aa25b3e093ae88f"
+      },
+      "ommers": [],
+      "parentUncleHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+    }
+  },
+  "stdout": {
+    "alloc": {
+      "0x1000000000000000000000000000000000000000": {
+        "code": "0x6010565b6000828201905092915050565b601a600260016003565b60005560206000f3",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000003"
+        },
+        "balance": "0xba1a9ce0ba1a9ce"
+      },
+      "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": {
+        "balance": "0x1bc16d674ece96c2"
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "balance": "0xba1a9ce0b9b130c",
+        "nonce": "0x1"
+      }
+    },
+    "body": "0xf862f860800a8307a12094100000000000000000000000000000000000000080801ca091df80a63242846dcf1cc16c35e6ba39212cde92aad946f9c286fa0029782b54a0446170c2fb714c717885485ea7d93bf9277f3fb3d89ffd73e9b7f5f8eda3997b",
+    "result": {
+      "stateRoot": "0xd921e74bfe864514fa508003336b8f66eb98d748c5163749827029a1ed7db265",
+      "txRoot": "0x8e987be72f36f97a98838e03d9e5d1b3d22795606240f16684532b1c994b4ee7",
+      "receiptsRoot": "0x0812e2d0238699cad1dd4c1274804ed2dde9a35df8ee002d48bbf3ef87857a63",
+      "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "receipts": [
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0xa8ad",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0x6c4a22ee7d2d9ae9307b09aac69a34600978e34313088917a7e69fd12e8f959a",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0xa8ad",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0x0"
+        }
+      ],
+      "currentDifficulty": "0x20000",
+      "gasUsed": "0xa8ad"
+    }
+  }
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/berlin-example-yul.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/berlin-example-yul.json
new file mode 100644
index 00000000000..3de9d7ed247
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/berlin-example-yul.json
@@ -0,0 +1,104 @@
+{
+  "cli": [
+    "t8n",
+    "--input.alloc=stdin",
+    "--input.txs=stdin",
+    "--input.env=stdin",
+    "--output.result=stdout",
+    "--output.alloc=stdout",
+    "--output.body=stdout",
+    "--state.fork=Berlin",
+    "--state.chainid=1",
+    "--state.reward=2000000000000000000"
+  ],
+  "stdin": {
+    "alloc": {
+      "0x1000000000000000000000000000000000000000": {
+        "nonce": "0x00",
+        "balance": "0x0ba1a9ce0ba1a9ce",
+        "code": "0x6010565b6000828201905092915050565b601a600260016003565b60005560206000f3",
+        "storage": {}
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "nonce": "0x00",
+        "balance": "0x0ba1a9ce0ba1a9ce",
+        "code": "0x",
+        "storage": {}
+      }
+    },
+    "txs": [
+      {
+        "type": "0x0",
+        "chainId": "0x0",
+        "nonce": "0x0",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x1000000000000000000000000000000000000000",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      }
+    ],
+    "env": {
+      "currentCoinbase": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+      "currentGasLimit": "100000000000000000",
+      "currentNumber": "1",
+      "currentTimestamp": "1000",
+      "parentDifficulty": "131072",
+      "parentGasUsed": "50000000000000000",
+      "parentGasLimit": "100000000000000000",
+      "parentTimstamp": "0",
+      "blockHashes": {
+        "0": "0x87c5fa7cef8b99fc333b662c1a4306c7d41d9d43a23414b15aa25b3e093ae88f"
+      },
+      "ommers": [],
+      "parentUncleHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+    }
+  },
+  "stdout": {
+    "alloc": {
+      "0x1000000000000000000000000000000000000000": {
+        "code": "0x6010565b6000828201905092915050565b601a600260016003565b60005560206000f3",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000003"
+        },
+        "balance": "0xba1a9ce0ba1a9ce"
+      },
+      "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": {
+        "balance": "0x1bc16d674ece96c2"
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "balance": "0xba1a9ce0b9b130c",
+        "nonce": "0x1"
+      }
+    },
+    "body": "0xf862f860800a8307a12094100000000000000000000000000000000000000080801ca091df80a63242846dcf1cc16c35e6ba39212cde92aad946f9c286fa0029782b54a0446170c2fb714c717885485ea7d93bf9277f3fb3d89ffd73e9b7f5f8eda3997b",
+    "result": {
+      "stateRoot": "0xd921e74bfe864514fa508003336b8f66eb98d748c5163749827029a1ed7db265",
+      "txRoot": "0x8e987be72f36f97a98838e03d9e5d1b3d22795606240f16684532b1c994b4ee7",
+      "receiptsRoot": "0x0812e2d0238699cad1dd4c1274804ed2dde9a35df8ee002d48bbf3ef87857a63",
+      "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "receipts": [
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0xa8ad",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0x6c4a22ee7d2d9ae9307b09aac69a34600978e34313088917a7e69fd12e8f959a",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0xa8ad",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0x0"
+        }
+      ],
+      "currentDifficulty": "0x20000",
+      "gasUsed": "0xa8ad"
+    }
+  }
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/berlin-negative-cli-reward.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/berlin-negative-cli-reward.json
new file mode 100644
index 00000000000..4ef273955c4
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/berlin-negative-cli-reward.json
@@ -0,0 +1,96 @@
+{
+  "cli": [
+    "t8n",
+    "--input.alloc=stdin",
+    "--input.txs=stdin",
+    "--input.env=stdin",
+    "--output.result=stdout",
+    "--output.alloc=stdout",
+    "--output.body=stdout",
+    "--state.fork=Berlin",
+    "--state.chainid=1",
+    "--state.reward=-1"
+  ],
+  "stdin": {
+    "alloc": {
+      "0x1000000000000000000000000000000000000000": {
+        "nonce": "0x00",
+        "balance": "0x0ba1a9ce0ba1a9ce",
+        "code": "0x6010565b6000828201905092915050565b601a600260016003565b60005560206000f3",
+        "storage": {}
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "nonce": "0x00",
+        "balance": "0x0ba1a9ce0ba1a9ce",
+        "code": "0x",
+        "storage": {}
+      }
+    },
+    "txs": [
+      {
+        "type": "0x0",
+        "chainId": "0x0",
+        "nonce": "0x0",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x1000000000000000000000000000000000000000",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      }
+    ],
+    "env": {
+      "currentCoinbase": "0x0000000000000000000000000000000000000000",
+      "currentDifficulty": "0x0",
+      "currentGasLimit": "0x0",
+      "currentNumber": "0",
+      "currentTimestamp": "0"
+    }
+  },
+  "stdout": {
+    "alloc": {
+      "0x0000000000000000000000000000000000000000": {
+        "balance": "0x696c2"
+      },
+      "0x1000000000000000000000000000000000000000": {
+        "code": "0x6010565b6000828201905092915050565b601a600260016003565b60005560206000f3",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000003"
+        },
+        "balance": "0xba1a9ce0ba1a9ce"
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "balance": "0xba1a9ce0b9b130c",
+        "nonce": "0x1"
+      }
+    },
+    "body": "0xf862f860800a8307a12094100000000000000000000000000000000000000080801ca091df80a63242846dcf1cc16c35e6ba39212cde92aad946f9c286fa0029782b54a0446170c2fb714c717885485ea7d93bf9277f3fb3d89ffd73e9b7f5f8eda3997b",
+    "result": {
+      "stateRoot": "0xde762e485411037c02119ff1115b422945b37efe91f4135dd442c3346629d0ef",
+      "txRoot": "0x8e987be72f36f97a98838e03d9e5d1b3d22795606240f16684532b1c994b4ee7",
+      "receiptsRoot": "0x0812e2d0238699cad1dd4c1274804ed2dde9a35df8ee002d48bbf3ef87857a63",
+      "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "receipts": [
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0xa8ad",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0x6c4a22ee7d2d9ae9307b09aac69a34600978e34313088917a7e69fd12e8f959a",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0xa8ad",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0x0"
+        }
+      ],
+      "currentDifficulty": null,
+      "gasUsed": "0xa8ad"
+    }
+  }
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/berlin-no-cli-reward.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/berlin-no-cli-reward.json
new file mode 100644
index 00000000000..d06c75ccfd2
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/berlin-no-cli-reward.json
@@ -0,0 +1,95 @@
+{
+  "cli": [
+    "t8n",
+    "--input.alloc=stdin",
+    "--input.txs=stdin",
+    "--input.env=stdin",
+    "--output.result=stdout",
+    "--output.alloc=stdout",
+    "--output.body=stdout",
+    "--state.fork=Berlin",
+    "--state.chainid=1"
+  ],
+  "stdin": {
+    "alloc": {
+      "0x1000000000000000000000000000000000000000": {
+        "nonce": "0x00",
+        "balance": "0x0ba1a9ce0ba1a9ce",
+        "code": "0x6010565b6000828201905092915050565b601a600260016003565b60005560206000f3",
+        "storage": {}
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "nonce": "0x00",
+        "balance": "0x0ba1a9ce0ba1a9ce",
+        "code": "0x",
+        "storage": {}
+      }
+    },
+    "txs": [
+      {
+        "type": "0x0",
+        "chainId": "0x0",
+        "nonce": "0x0",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x1000000000000000000000000000000000000000",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      }
+    ],
+    "env": {
+      "currentCoinbase": "0x0000000000000000000000000000000000000000",
+      "currentDifficulty": "0x0",
+      "currentGasLimit": "0x0",
+      "currentNumber": "0",
+      "currentTimestamp": "0"
+    }
+  },
+  "stdout": {
+    "alloc": {
+      "0x0000000000000000000000000000000000000000": {
+        "balance": "0x1bc16d674ece96c2"
+      },
+      "0x1000000000000000000000000000000000000000": {
+        "code": "0x6010565b6000828201905092915050565b601a600260016003565b60005560206000f3",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000003"
+        },
+        "balance": "0xba1a9ce0ba1a9ce"
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "balance": "0xba1a9ce0b9b130c",
+        "nonce": "0x1"
+      }
+    },
+    "body": "0xf862f860800a8307a12094100000000000000000000000000000000000000080801ca091df80a63242846dcf1cc16c35e6ba39212cde92aad946f9c286fa0029782b54a0446170c2fb714c717885485ea7d93bf9277f3fb3d89ffd73e9b7f5f8eda3997b",
+    "result": {
+      "stateRoot": "0x9580f6eec8ad54773eff8e370d12dfea7b3216e929657c48a509af64c4190be6",
+      "txRoot": "0x8e987be72f36f97a98838e03d9e5d1b3d22795606240f16684532b1c994b4ee7",
+      "receiptsRoot": "0x0812e2d0238699cad1dd4c1274804ed2dde9a35df8ee002d48bbf3ef87857a63",
+      "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "receipts": [
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0xa8ad",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0x6c4a22ee7d2d9ae9307b09aac69a34600978e34313088917a7e69fd12e8f959a",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0xa8ad",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0x0"
+        }
+      ],
+      "currentDifficulty": null,
+      "gasUsed": "0xa8ad"
+    }
+  }
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/berlin-no-tx.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/berlin-no-tx.json
new file mode 100644
index 00000000000..5abcf7bb347
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/berlin-no-tx.json
@@ -0,0 +1,60 @@
+{
+  "cli": [
+    "t8n",
+    "--input.alloc=stdin",
+    "--input.txs=stdin",
+    "--input.env=stdin",
+    "--output.result=stdout",
+    "--output.alloc=stdout",
+    "--output.body=stdout",
+    "--state.fork=Berlin",
+    "--state.chainid=1",
+    "--state.reward=0"
+  ],
+  "stdin": {
+    "alloc": {
+      "0x1000000000000000000000000000000000000000": {
+        "nonce": "0x00",
+        "balance": "0x0ba1a9ce0ba1a9ce",
+        "code": "0x6010565b6000828201905092915050565b601a600260016003565b60005560206000f3",
+        "storage": {}
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "nonce": "0x00",
+        "balance": "0x0ba1a9ce0ba1a9ce",
+        "code": "0x",
+        "storage": {}
+      }
+    },
+    "txs": [],
+    "env": {
+      "currentCoinbase": "0x0000000000000000000000000000000000000000",
+      "currentDifficulty": "0x0",
+      "currentGasLimit": "0x0",
+      "currentNumber": "0",
+      "currentTimestamp": "0"
+    }
+  },
+  "stdout": {
+    "alloc": {
+      "0x1000000000000000000000000000000000000000": {
+        "code": "0x6010565b6000828201905092915050565b601a600260016003565b60005560206000f3",
+        "balance": "0xba1a9ce0ba1a9ce"
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "balance": "0xba1a9ce0ba1a9ce"
+      }
+    },
+    "body": "0xc0",
+    "result": {
+      "stateRoot": "0x369ba8b2e5b32d675d07933d6fb851d97d3ca66c60a829f7356163d92ae0439a",
+      "txRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "receipts": [],
+      "currentDifficulty": null,
+      "gasUsed": "0x0"
+    }
+  }
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/berlin-simple.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/berlin-simple.json
new file mode 100644
index 00000000000..e4555f220b3
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/berlin-simple.json
@@ -0,0 +1,96 @@
+{
+  "cli": [
+    "t8n",
+    "--input.alloc=stdin",
+    "--input.txs=stdin",
+    "--input.env=stdin",
+    "--output.result=stdout",
+    "--output.alloc=stdout",
+    "--output.body=stdout",
+    "--state.fork=Berlin",
+    "--state.chainid=1",
+    "--state.reward=0"
+  ],
+  "stdin": {
+    "alloc": {
+      "0x1000000000000000000000000000000000000000": {
+        "nonce": "0x00",
+        "balance": "0x0ba1a9ce0ba1a9ce",
+        "code": "0x6010565b6000828201905092915050565b601a600260016003565b60005560206000f3",
+        "storage": {}
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "nonce": "0x00",
+        "balance": "0x0ba1a9ce0ba1a9ce",
+        "code": "0x",
+        "storage": {}
+      }
+    },
+    "txs": [
+      {
+        "type": "0x0",
+        "chainId": "0x0",
+        "nonce": "0x0",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x1000000000000000000000000000000000000000",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      }
+    ],
+    "env": {
+      "currentCoinbase": "0x0000000000000000000000000000000000000000",
+      "currentDifficulty": "0x0",
+      "currentGasLimit": "0x0",
+      "currentNumber": "0",
+      "currentTimestamp": "0"
+    }
+  },
+  "stdout": {
+    "alloc": {
+      "0x0000000000000000000000000000000000000000": {
+        "balance": "0x696c2"
+      },
+      "0x1000000000000000000000000000000000000000": {
+        "code": "0x6010565b6000828201905092915050565b601a600260016003565b60005560206000f3",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000003"
+        },
+        "balance": "0xba1a9ce0ba1a9ce"
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "balance": "0xba1a9ce0b9b130c",
+        "nonce": "0x1"
+      }
+    },
+    "body": "0xf862f860800a8307a12094100000000000000000000000000000000000000080801ca091df80a63242846dcf1cc16c35e6ba39212cde92aad946f9c286fa0029782b54a0446170c2fb714c717885485ea7d93bf9277f3fb3d89ffd73e9b7f5f8eda3997b",
+    "result": {
+      "stateRoot": "0xde762e485411037c02119ff1115b422945b37efe91f4135dd442c3346629d0ef",
+      "txRoot": "0x8e987be72f36f97a98838e03d9e5d1b3d22795606240f16684532b1c994b4ee7",
+      "receiptsRoot": "0x0812e2d0238699cad1dd4c1274804ed2dde9a35df8ee002d48bbf3ef87857a63",
+      "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "receipts": [
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0xa8ad",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0x6c4a22ee7d2d9ae9307b09aac69a34600978e34313088917a7e69fd12e8f959a",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0xa8ad",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0x0"
+        }
+      ],
+      "currentDifficulty": null,
+      "gasUsed": "0xa8ad"
+    }
+  }
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/istanbul-cumulative-gas.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/istanbul-cumulative-gas.json
new file mode 100644
index 00000000000..7146666176f
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/istanbul-cumulative-gas.json
@@ -0,0 +1,959 @@
+{
+  "cli": [
+    "t8n",
+    "--input.alloc=stdin",
+    "--input.txs=stdin",
+    "--input.env=stdin",
+    "--output.result=stdout",
+    "--output.alloc=stdout",
+    "--output.body=txs.rlp",
+    "--state.fork=Istanbul",
+    "--state.chainid=1",
+    "--state.reward=2000000000000000000"
+  ],
+  "stdin": {
+    "alloc": {
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "nonce": "0x00",
+        "balance": "0x3635c9adc5dea00000",
+        "code": "0x",
+        "storage": {}
+      },
+      "0x0000000000000000000000000000000000000100": {
+        "nonce": "0x00",
+        "balance": "0x00",
+        "code": "0x6000600160026003600460056006600760086009600A600B600C600D600E600F601080600055600155600255600355600455600555600655600755600855600955600A55600B55600C55600D55600E55600F55601055",
+        "storage": {}
+      },
+      "0x0000000000000000000000000000000000000101": {
+        "nonce": "0x00",
+        "balance": "0x00",
+        "code": "0x6000600160026003600460056006600760086009600A600B600C600D600E600F601081600055600155600255600355600455600555600655600755600855600955600A55600B55600C55600D55600E55600F55601055",
+        "storage": {}
+      },
+      "0x0000000000000000000000000000000000000102": {
+        "nonce": "0x00",
+        "balance": "0x00",
+        "code": "0x6000600160026003600460056006600760086009600A600B600C600D600E600F601082600055600155600255600355600455600555600655600755600855600955600A55600B55600C55600D55600E55600F55601055",
+        "storage": {}
+      },
+      "0x0000000000000000000000000000000000000103": {
+        "nonce": "0x00",
+        "balance": "0x00",
+        "code": "0x6000600160026003600460056006600760086009600A600B600C600D600E600F601083600055600155600255600355600455600555600655600755600855600955600A55600B55600C55600D55600E55600F55601055",
+        "storage": {}
+      },
+      "0x0000000000000000000000000000000000000104": {
+        "nonce": "0x00",
+        "balance": "0x00",
+        "code": "0x6000600160026003600460056006600760086009600A600B600C600D600E600F601084600055600155600255600355600455600555600655600755600855600955600A55600B55600C55600D55600E55600F55601055",
+        "storage": {}
+      },
+      "0x0000000000000000000000000000000000000105": {
+        "nonce": "0x00",
+        "balance": "0x00",
+        "code": "0x6000600160026003600460056006600760086009600A600B600C600D600E600F601085600055600155600255600355600455600555600655600755600855600955600A55600B55600C55600D55600E55600F55601055",
+        "storage": {}
+      },
+      "0x0000000000000000000000000000000000000106": {
+        "nonce": "0x00",
+        "balance": "0x00",
+        "code": "0x6000600160026003600460056006600760086009600A600B600C600D600E600F601086600055600155600255600355600455600555600655600755600855600955600A55600B55600C55600D55600E55600F55601055",
+        "storage": {}
+      },
+      "0x0000000000000000000000000000000000000107": {
+        "nonce": "0x00",
+        "balance": "0x00",
+        "code": "0x6000600160026003600460056006600760086009600A600B600C600D600E600F601087600055600155600255600355600455600555600655600755600855600955600A55600B55600C55600D55600E55600F55601055",
+        "storage": {}
+      },
+      "0x0000000000000000000000000000000000000108": {
+        "nonce": "0x00",
+        "balance": "0x00",
+        "code": "0x6000600160026003600460056006600760086009600A600B600C600D600E600F601088600055600155600255600355600455600555600655600755600855600955600A55600B55600C55600D55600E55600F55601055",
+        "storage": {}
+      },
+      "0x0000000000000000000000000000000000000109": {
+        "nonce": "0x00",
+        "balance": "0x00",
+        "code": "0x6000600160026003600460056006600760086009600A600B600C600D600E600F601089600055600155600255600355600455600555600655600755600855600955600A55600B55600C55600D55600E55600F55601055",
+        "storage": {}
+      },
+      "0x000000000000000000000000000000000000010a": {
+        "nonce": "0x00",
+        "balance": "0x00",
+        "code": "0x6000600160026003600460056006600760086009600A600B600C600D600E600F60108a600055600155600255600355600455600555600655600755600855600955600A55600B55600C55600D55600E55600F55601055",
+        "storage": {}
+      },
+      "0x000000000000000000000000000000000000010b": {
+        "nonce": "0x00",
+        "balance": "0x00",
+        "code": "0x6000600160026003600460056006600760086009600A600B600C600D600E600F60108b600055600155600255600355600455600555600655600755600855600955600A55600B55600C55600D55600E55600F55601055",
+        "storage": {}
+      },
+      "0x000000000000000000000000000000000000010c": {
+        "nonce": "0x00",
+        "balance": "0x00",
+        "code": "0x6000600160026003600460056006600760086009600A600B600C600D600E600F60108c600055600155600255600355600455600555600655600755600855600955600A55600B55600C55600D55600E55600F55601055",
+        "storage": {}
+      },
+      "0x000000000000000000000000000000000000010d": {
+        "nonce": "0x00",
+        "balance": "0x00",
+        "code": "0x6000600160026003600460056006600760086009600A600B600C600D600E600F60108d600055600155600255600355600455600555600655600755600855600955600A55600B55600C55600D55600E55600F55601055",
+        "storage": {}
+      },
+      "0x000000000000000000000000000000000000010e": {
+        "nonce": "0x00",
+        "balance": "0x00",
+        "code": "0x6000600160026003600460056006600760086009600A600B600C600D600E600F60108e600055600155600255600355600455600555600655600755600855600955600A55600B55600C55600D55600E55600F55601055",
+        "storage": {}
+      },
+      "0x000000000000000000000000000000000000010f": {
+        "nonce": "0x00",
+        "balance": "0x00",
+        "code": "0x6000600160026003600460056006600760086009600A600B600C600D600E600F60108f600055600155600255600355600455600555600655600755600855600955600A55600B55600C55600D55600E55600F55601055",
+        "storage": {}
+      }
+    },
+    "txs": [
+      {
+        "type": "0x0",
+        "chainId": "0x1",
+        "nonce": "0x0",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x0000000000000000000000000000000000000100",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      },
+      {
+        "type": "0x0",
+        "chainId": "0x1",
+        "nonce": "0x1",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x0000000000000000000000000000000000000101",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      },
+      {
+        "type": "0x0",
+        "chainId": "0x1",
+        "nonce": "0x2",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x0000000000000000000000000000000000000102",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      },
+      {
+        "type": "0x0",
+        "chainId": "0x1",
+        "nonce": "0x3",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x0000000000000000000000000000000000000103",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      },
+      {
+        "type": "0x0",
+        "chainId": "0x1",
+        "nonce": "0x4",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x0000000000000000000000000000000000000104",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      },
+      {
+        "type": "0x0",
+        "chainId": "0x1",
+        "nonce": "0x5",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x0000000000000000000000000000000000000105",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      },
+      {
+        "type": "0x0",
+        "chainId": "0x1",
+        "nonce": "0x6",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x0000000000000000000000000000000000000106",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      },
+      {
+        "type": "0x0",
+        "chainId": "0x1",
+        "nonce": "0x7",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x0000000000000000000000000000000000000107",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      },
+      {
+        "type": "0x0",
+        "chainId": "0x1",
+        "nonce": "0x8",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x0000000000000000000000000000000000000108",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      },
+      {
+        "type": "0x0",
+        "chainId": "0x1",
+        "nonce": "0x9",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x0000000000000000000000000000000000000109",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      },
+      {
+        "type": "0x0",
+        "chainId": "0x1",
+        "nonce": "0xa",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x000000000000000000000000000000000000010a",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      },
+      {
+        "type": "0x0",
+        "chainId": "0x1",
+        "nonce": "0xb",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x000000000000000000000000000000000000010b",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      },
+      {
+        "type": "0x0",
+        "chainId": "0x1",
+        "nonce": "0xc",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x000000000000000000000000000000000000010c",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      },
+      {
+        "type": "0x0",
+        "chainId": "0x1",
+        "nonce": "0xd",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x000000000000000000000000000000000000010d",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      },
+      {
+        "type": "0x0",
+        "chainId": "0x1",
+        "nonce": "0xe",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x000000000000000000000000000000000000010e",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      },
+      {
+        "type": "0x0",
+        "chainId": "0x1",
+        "nonce": "0xf",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x000000000000000000000000000000000000010f",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      }
+    ],
+    "env": {
+      "currentCoinbase": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+      "currentGasLimit": "100000000000000000",
+      "currentNumber": "1",
+      "currentTimestamp": "1000",
+      "parentDifficulty": "131072",
+      "parentGasUsed": "50000000000000000",
+      "parentGasLimit": "100000000000000000",
+      "parentTimstamp": "0",
+      "blockHashes": {
+        "0": "0xa2886eb8890eda7143a5d6bcb16949db9f3871f4c2dcc8618ab62c0632a23ab7"
+      },
+      "ommers": [],
+      "parentUncleHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+    }
+  },
+  "stdout": {
+    "alloc": {
+      "0x0000000000000000000000000000000000000100": {
+        "code": "0x6000600160026003600460056006600760086009600a600b600c600d600e600f601080600055600155600255600355600455600555600655600755600855600955600a55600b55600c55600d55600e55600f55601055",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000010",
+          "0x0000000000000000000000000000000000000000000000000000000000000001": "0x0000000000000000000000000000000000000000000000000000000000000010",
+          "0x0000000000000000000000000000000000000000000000000000000000000002": "0x000000000000000000000000000000000000000000000000000000000000000f",
+          "0x0000000000000000000000000000000000000000000000000000000000000003": "0x000000000000000000000000000000000000000000000000000000000000000e",
+          "0x0000000000000000000000000000000000000000000000000000000000000004": "0x000000000000000000000000000000000000000000000000000000000000000d",
+          "0x0000000000000000000000000000000000000000000000000000000000000005": "0x000000000000000000000000000000000000000000000000000000000000000c",
+          "0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000000000000000000b",
+          "0x0000000000000000000000000000000000000000000000000000000000000007": "0x000000000000000000000000000000000000000000000000000000000000000a",
+          "0x0000000000000000000000000000000000000000000000000000000000000008": "0x0000000000000000000000000000000000000000000000000000000000000009",
+          "0x0000000000000000000000000000000000000000000000000000000000000009": "0x0000000000000000000000000000000000000000000000000000000000000008",
+          "0x000000000000000000000000000000000000000000000000000000000000000a": "0x0000000000000000000000000000000000000000000000000000000000000007",
+          "0x000000000000000000000000000000000000000000000000000000000000000b": "0x0000000000000000000000000000000000000000000000000000000000000006",
+          "0x000000000000000000000000000000000000000000000000000000000000000c": "0x0000000000000000000000000000000000000000000000000000000000000005",
+          "0x000000000000000000000000000000000000000000000000000000000000000d": "0x0000000000000000000000000000000000000000000000000000000000000004",
+          "0x000000000000000000000000000000000000000000000000000000000000000e": "0x0000000000000000000000000000000000000000000000000000000000000003",
+          "0x000000000000000000000000000000000000000000000000000000000000000f": "0x0000000000000000000000000000000000000000000000000000000000000002",
+          "0x0000000000000000000000000000000000000000000000000000000000000010": "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "balance": "0x0"
+      },
+      "0x0000000000000000000000000000000000000101": {
+        "code": "0x6000600160026003600460056006600760086009600a600b600c600d600e600f601081600055600155600255600355600455600555600655600755600855600955600a55600b55600c55600d55600e55600f55601055",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x000000000000000000000000000000000000000000000000000000000000000f",
+          "0x0000000000000000000000000000000000000000000000000000000000000001": "0x0000000000000000000000000000000000000000000000000000000000000010",
+          "0x0000000000000000000000000000000000000000000000000000000000000002": "0x000000000000000000000000000000000000000000000000000000000000000f",
+          "0x0000000000000000000000000000000000000000000000000000000000000003": "0x000000000000000000000000000000000000000000000000000000000000000e",
+          "0x0000000000000000000000000000000000000000000000000000000000000004": "0x000000000000000000000000000000000000000000000000000000000000000d",
+          "0x0000000000000000000000000000000000000000000000000000000000000005": "0x000000000000000000000000000000000000000000000000000000000000000c",
+          "0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000000000000000000b",
+          "0x0000000000000000000000000000000000000000000000000000000000000007": "0x000000000000000000000000000000000000000000000000000000000000000a",
+          "0x0000000000000000000000000000000000000000000000000000000000000008": "0x0000000000000000000000000000000000000000000000000000000000000009",
+          "0x0000000000000000000000000000000000000000000000000000000000000009": "0x0000000000000000000000000000000000000000000000000000000000000008",
+          "0x000000000000000000000000000000000000000000000000000000000000000a": "0x0000000000000000000000000000000000000000000000000000000000000007",
+          "0x000000000000000000000000000000000000000000000000000000000000000b": "0x0000000000000000000000000000000000000000000000000000000000000006",
+          "0x000000000000000000000000000000000000000000000000000000000000000c": "0x0000000000000000000000000000000000000000000000000000000000000005",
+          "0x000000000000000000000000000000000000000000000000000000000000000d": "0x0000000000000000000000000000000000000000000000000000000000000004",
+          "0x000000000000000000000000000000000000000000000000000000000000000e": "0x0000000000000000000000000000000000000000000000000000000000000003",
+          "0x000000000000000000000000000000000000000000000000000000000000000f": "0x0000000000000000000000000000000000000000000000000000000000000002",
+          "0x0000000000000000000000000000000000000000000000000000000000000010": "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "balance": "0x0"
+      },
+      "0x0000000000000000000000000000000000000102": {
+        "code": "0x6000600160026003600460056006600760086009600a600b600c600d600e600f601082600055600155600255600355600455600555600655600755600855600955600a55600b55600c55600d55600e55600f55601055",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x000000000000000000000000000000000000000000000000000000000000000e",
+          "0x0000000000000000000000000000000000000000000000000000000000000001": "0x0000000000000000000000000000000000000000000000000000000000000010",
+          "0x0000000000000000000000000000000000000000000000000000000000000002": "0x000000000000000000000000000000000000000000000000000000000000000f",
+          "0x0000000000000000000000000000000000000000000000000000000000000003": "0x000000000000000000000000000000000000000000000000000000000000000e",
+          "0x0000000000000000000000000000000000000000000000000000000000000004": "0x000000000000000000000000000000000000000000000000000000000000000d",
+          "0x0000000000000000000000000000000000000000000000000000000000000005": "0x000000000000000000000000000000000000000000000000000000000000000c",
+          "0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000000000000000000b",
+          "0x0000000000000000000000000000000000000000000000000000000000000007": "0x000000000000000000000000000000000000000000000000000000000000000a",
+          "0x0000000000000000000000000000000000000000000000000000000000000008": "0x0000000000000000000000000000000000000000000000000000000000000009",
+          "0x0000000000000000000000000000000000000000000000000000000000000009": "0x0000000000000000000000000000000000000000000000000000000000000008",
+          "0x000000000000000000000000000000000000000000000000000000000000000a": "0x0000000000000000000000000000000000000000000000000000000000000007",
+          "0x000000000000000000000000000000000000000000000000000000000000000b": "0x0000000000000000000000000000000000000000000000000000000000000006",
+          "0x000000000000000000000000000000000000000000000000000000000000000c": "0x0000000000000000000000000000000000000000000000000000000000000005",
+          "0x000000000000000000000000000000000000000000000000000000000000000d": "0x0000000000000000000000000000000000000000000000000000000000000004",
+          "0x000000000000000000000000000000000000000000000000000000000000000e": "0x0000000000000000000000000000000000000000000000000000000000000003",
+          "0x000000000000000000000000000000000000000000000000000000000000000f": "0x0000000000000000000000000000000000000000000000000000000000000002",
+          "0x0000000000000000000000000000000000000000000000000000000000000010": "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "balance": "0x0"
+      },
+      "0x0000000000000000000000000000000000000103": {
+        "code": "0x6000600160026003600460056006600760086009600a600b600c600d600e600f601083600055600155600255600355600455600555600655600755600855600955600a55600b55600c55600d55600e55600f55601055",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x000000000000000000000000000000000000000000000000000000000000000d",
+          "0x0000000000000000000000000000000000000000000000000000000000000001": "0x0000000000000000000000000000000000000000000000000000000000000010",
+          "0x0000000000000000000000000000000000000000000000000000000000000002": "0x000000000000000000000000000000000000000000000000000000000000000f",
+          "0x0000000000000000000000000000000000000000000000000000000000000003": "0x000000000000000000000000000000000000000000000000000000000000000e",
+          "0x0000000000000000000000000000000000000000000000000000000000000004": "0x000000000000000000000000000000000000000000000000000000000000000d",
+          "0x0000000000000000000000000000000000000000000000000000000000000005": "0x000000000000000000000000000000000000000000000000000000000000000c",
+          "0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000000000000000000b",
+          "0x0000000000000000000000000000000000000000000000000000000000000007": "0x000000000000000000000000000000000000000000000000000000000000000a",
+          "0x0000000000000000000000000000000000000000000000000000000000000008": "0x0000000000000000000000000000000000000000000000000000000000000009",
+          "0x0000000000000000000000000000000000000000000000000000000000000009": "0x0000000000000000000000000000000000000000000000000000000000000008",
+          "0x000000000000000000000000000000000000000000000000000000000000000a": "0x0000000000000000000000000000000000000000000000000000000000000007",
+          "0x000000000000000000000000000000000000000000000000000000000000000b": "0x0000000000000000000000000000000000000000000000000000000000000006",
+          "0x000000000000000000000000000000000000000000000000000000000000000c": "0x0000000000000000000000000000000000000000000000000000000000000005",
+          "0x000000000000000000000000000000000000000000000000000000000000000d": "0x0000000000000000000000000000000000000000000000000000000000000004",
+          "0x000000000000000000000000000000000000000000000000000000000000000e": "0x0000000000000000000000000000000000000000000000000000000000000003",
+          "0x000000000000000000000000000000000000000000000000000000000000000f": "0x0000000000000000000000000000000000000000000000000000000000000002",
+          "0x0000000000000000000000000000000000000000000000000000000000000010": "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "balance": "0x0"
+      },
+      "0x0000000000000000000000000000000000000104": {
+        "code": "0x6000600160026003600460056006600760086009600a600b600c600d600e600f601084600055600155600255600355600455600555600655600755600855600955600a55600b55600c55600d55600e55600f55601055",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x000000000000000000000000000000000000000000000000000000000000000c",
+          "0x0000000000000000000000000000000000000000000000000000000000000001": "0x0000000000000000000000000000000000000000000000000000000000000010",
+          "0x0000000000000000000000000000000000000000000000000000000000000002": "0x000000000000000000000000000000000000000000000000000000000000000f",
+          "0x0000000000000000000000000000000000000000000000000000000000000003": "0x000000000000000000000000000000000000000000000000000000000000000e",
+          "0x0000000000000000000000000000000000000000000000000000000000000004": "0x000000000000000000000000000000000000000000000000000000000000000d",
+          "0x0000000000000000000000000000000000000000000000000000000000000005": "0x000000000000000000000000000000000000000000000000000000000000000c",
+          "0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000000000000000000b",
+          "0x0000000000000000000000000000000000000000000000000000000000000007": "0x000000000000000000000000000000000000000000000000000000000000000a",
+          "0x0000000000000000000000000000000000000000000000000000000000000008": "0x0000000000000000000000000000000000000000000000000000000000000009",
+          "0x0000000000000000000000000000000000000000000000000000000000000009": "0x0000000000000000000000000000000000000000000000000000000000000008",
+          "0x000000000000000000000000000000000000000000000000000000000000000a": "0x0000000000000000000000000000000000000000000000000000000000000007",
+          "0x000000000000000000000000000000000000000000000000000000000000000b": "0x0000000000000000000000000000000000000000000000000000000000000006",
+          "0x000000000000000000000000000000000000000000000000000000000000000c": "0x0000000000000000000000000000000000000000000000000000000000000005",
+          "0x000000000000000000000000000000000000000000000000000000000000000d": "0x0000000000000000000000000000000000000000000000000000000000000004",
+          "0x000000000000000000000000000000000000000000000000000000000000000e": "0x0000000000000000000000000000000000000000000000000000000000000003",
+          "0x000000000000000000000000000000000000000000000000000000000000000f": "0x0000000000000000000000000000000000000000000000000000000000000002",
+          "0x0000000000000000000000000000000000000000000000000000000000000010": "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "balance": "0x0"
+      },
+      "0x0000000000000000000000000000000000000105": {
+        "code": "0x6000600160026003600460056006600760086009600a600b600c600d600e600f601085600055600155600255600355600455600555600655600755600855600955600a55600b55600c55600d55600e55600f55601055",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x000000000000000000000000000000000000000000000000000000000000000b",
+          "0x0000000000000000000000000000000000000000000000000000000000000001": "0x0000000000000000000000000000000000000000000000000000000000000010",
+          "0x0000000000000000000000000000000000000000000000000000000000000002": "0x000000000000000000000000000000000000000000000000000000000000000f",
+          "0x0000000000000000000000000000000000000000000000000000000000000003": "0x000000000000000000000000000000000000000000000000000000000000000e",
+          "0x0000000000000000000000000000000000000000000000000000000000000004": "0x000000000000000000000000000000000000000000000000000000000000000d",
+          "0x0000000000000000000000000000000000000000000000000000000000000005": "0x000000000000000000000000000000000000000000000000000000000000000c",
+          "0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000000000000000000b",
+          "0x0000000000000000000000000000000000000000000000000000000000000007": "0x000000000000000000000000000000000000000000000000000000000000000a",
+          "0x0000000000000000000000000000000000000000000000000000000000000008": "0x0000000000000000000000000000000000000000000000000000000000000009",
+          "0x0000000000000000000000000000000000000000000000000000000000000009": "0x0000000000000000000000000000000000000000000000000000000000000008",
+          "0x000000000000000000000000000000000000000000000000000000000000000a": "0x0000000000000000000000000000000000000000000000000000000000000007",
+          "0x000000000000000000000000000000000000000000000000000000000000000b": "0x0000000000000000000000000000000000000000000000000000000000000006",
+          "0x000000000000000000000000000000000000000000000000000000000000000c": "0x0000000000000000000000000000000000000000000000000000000000000005",
+          "0x000000000000000000000000000000000000000000000000000000000000000d": "0x0000000000000000000000000000000000000000000000000000000000000004",
+          "0x000000000000000000000000000000000000000000000000000000000000000e": "0x0000000000000000000000000000000000000000000000000000000000000003",
+          "0x000000000000000000000000000000000000000000000000000000000000000f": "0x0000000000000000000000000000000000000000000000000000000000000002",
+          "0x0000000000000000000000000000000000000000000000000000000000000010": "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "balance": "0x0"
+      },
+      "0x0000000000000000000000000000000000000106": {
+        "code": "0x6000600160026003600460056006600760086009600a600b600c600d600e600f601086600055600155600255600355600455600555600655600755600855600955600a55600b55600c55600d55600e55600f55601055",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x000000000000000000000000000000000000000000000000000000000000000a",
+          "0x0000000000000000000000000000000000000000000000000000000000000001": "0x0000000000000000000000000000000000000000000000000000000000000010",
+          "0x0000000000000000000000000000000000000000000000000000000000000002": "0x000000000000000000000000000000000000000000000000000000000000000f",
+          "0x0000000000000000000000000000000000000000000000000000000000000003": "0x000000000000000000000000000000000000000000000000000000000000000e",
+          "0x0000000000000000000000000000000000000000000000000000000000000004": "0x000000000000000000000000000000000000000000000000000000000000000d",
+          "0x0000000000000000000000000000000000000000000000000000000000000005": "0x000000000000000000000000000000000000000000000000000000000000000c",
+          "0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000000000000000000b",
+          "0x0000000000000000000000000000000000000000000000000000000000000007": "0x000000000000000000000000000000000000000000000000000000000000000a",
+          "0x0000000000000000000000000000000000000000000000000000000000000008": "0x0000000000000000000000000000000000000000000000000000000000000009",
+          "0x0000000000000000000000000000000000000000000000000000000000000009": "0x0000000000000000000000000000000000000000000000000000000000000008",
+          "0x000000000000000000000000000000000000000000000000000000000000000a": "0x0000000000000000000000000000000000000000000000000000000000000007",
+          "0x000000000000000000000000000000000000000000000000000000000000000b": "0x0000000000000000000000000000000000000000000000000000000000000006",
+          "0x000000000000000000000000000000000000000000000000000000000000000c": "0x0000000000000000000000000000000000000000000000000000000000000005",
+          "0x000000000000000000000000000000000000000000000000000000000000000d": "0x0000000000000000000000000000000000000000000000000000000000000004",
+          "0x000000000000000000000000000000000000000000000000000000000000000e": "0x0000000000000000000000000000000000000000000000000000000000000003",
+          "0x000000000000000000000000000000000000000000000000000000000000000f": "0x0000000000000000000000000000000000000000000000000000000000000002",
+          "0x0000000000000000000000000000000000000000000000000000000000000010": "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "balance": "0x0"
+      },
+      "0x0000000000000000000000000000000000000107": {
+        "code": "0x6000600160026003600460056006600760086009600a600b600c600d600e600f601087600055600155600255600355600455600555600655600755600855600955600a55600b55600c55600d55600e55600f55601055",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000009",
+          "0x0000000000000000000000000000000000000000000000000000000000000001": "0x0000000000000000000000000000000000000000000000000000000000000010",
+          "0x0000000000000000000000000000000000000000000000000000000000000002": "0x000000000000000000000000000000000000000000000000000000000000000f",
+          "0x0000000000000000000000000000000000000000000000000000000000000003": "0x000000000000000000000000000000000000000000000000000000000000000e",
+          "0x0000000000000000000000000000000000000000000000000000000000000004": "0x000000000000000000000000000000000000000000000000000000000000000d",
+          "0x0000000000000000000000000000000000000000000000000000000000000005": "0x000000000000000000000000000000000000000000000000000000000000000c",
+          "0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000000000000000000b",
+          "0x0000000000000000000000000000000000000000000000000000000000000007": "0x000000000000000000000000000000000000000000000000000000000000000a",
+          "0x0000000000000000000000000000000000000000000000000000000000000008": "0x0000000000000000000000000000000000000000000000000000000000000009",
+          "0x0000000000000000000000000000000000000000000000000000000000000009": "0x0000000000000000000000000000000000000000000000000000000000000008",
+          "0x000000000000000000000000000000000000000000000000000000000000000a": "0x0000000000000000000000000000000000000000000000000000000000000007",
+          "0x000000000000000000000000000000000000000000000000000000000000000b": "0x0000000000000000000000000000000000000000000000000000000000000006",
+          "0x000000000000000000000000000000000000000000000000000000000000000c": "0x0000000000000000000000000000000000000000000000000000000000000005",
+          "0x000000000000000000000000000000000000000000000000000000000000000d": "0x0000000000000000000000000000000000000000000000000000000000000004",
+          "0x000000000000000000000000000000000000000000000000000000000000000e": "0x0000000000000000000000000000000000000000000000000000000000000003",
+          "0x000000000000000000000000000000000000000000000000000000000000000f": "0x0000000000000000000000000000000000000000000000000000000000000002",
+          "0x0000000000000000000000000000000000000000000000000000000000000010": "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "balance": "0x0"
+      },
+      "0x0000000000000000000000000000000000000108": {
+        "code": "0x6000600160026003600460056006600760086009600a600b600c600d600e600f601088600055600155600255600355600455600555600655600755600855600955600a55600b55600c55600d55600e55600f55601055",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000008",
+          "0x0000000000000000000000000000000000000000000000000000000000000001": "0x0000000000000000000000000000000000000000000000000000000000000010",
+          "0x0000000000000000000000000000000000000000000000000000000000000002": "0x000000000000000000000000000000000000000000000000000000000000000f",
+          "0x0000000000000000000000000000000000000000000000000000000000000003": "0x000000000000000000000000000000000000000000000000000000000000000e",
+          "0x0000000000000000000000000000000000000000000000000000000000000004": "0x000000000000000000000000000000000000000000000000000000000000000d",
+          "0x0000000000000000000000000000000000000000000000000000000000000005": "0x000000000000000000000000000000000000000000000000000000000000000c",
+          "0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000000000000000000b",
+          "0x0000000000000000000000000000000000000000000000000000000000000007": "0x000000000000000000000000000000000000000000000000000000000000000a",
+          "0x0000000000000000000000000000000000000000000000000000000000000008": "0x0000000000000000000000000000000000000000000000000000000000000009",
+          "0x0000000000000000000000000000000000000000000000000000000000000009": "0x0000000000000000000000000000000000000000000000000000000000000008",
+          "0x000000000000000000000000000000000000000000000000000000000000000a": "0x0000000000000000000000000000000000000000000000000000000000000007",
+          "0x000000000000000000000000000000000000000000000000000000000000000b": "0x0000000000000000000000000000000000000000000000000000000000000006",
+          "0x000000000000000000000000000000000000000000000000000000000000000c": "0x0000000000000000000000000000000000000000000000000000000000000005",
+          "0x000000000000000000000000000000000000000000000000000000000000000d": "0x0000000000000000000000000000000000000000000000000000000000000004",
+          "0x000000000000000000000000000000000000000000000000000000000000000e": "0x0000000000000000000000000000000000000000000000000000000000000003",
+          "0x000000000000000000000000000000000000000000000000000000000000000f": "0x0000000000000000000000000000000000000000000000000000000000000002",
+          "0x0000000000000000000000000000000000000000000000000000000000000010": "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "balance": "0x0"
+      },
+      "0x0000000000000000000000000000000000000109": {
+        "code": "0x6000600160026003600460056006600760086009600a600b600c600d600e600f601089600055600155600255600355600455600555600655600755600855600955600a55600b55600c55600d55600e55600f55601055",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000007",
+          "0x0000000000000000000000000000000000000000000000000000000000000001": "0x0000000000000000000000000000000000000000000000000000000000000010",
+          "0x0000000000000000000000000000000000000000000000000000000000000002": "0x000000000000000000000000000000000000000000000000000000000000000f",
+          "0x0000000000000000000000000000000000000000000000000000000000000003": "0x000000000000000000000000000000000000000000000000000000000000000e",
+          "0x0000000000000000000000000000000000000000000000000000000000000004": "0x000000000000000000000000000000000000000000000000000000000000000d",
+          "0x0000000000000000000000000000000000000000000000000000000000000005": "0x000000000000000000000000000000000000000000000000000000000000000c",
+          "0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000000000000000000b",
+          "0x0000000000000000000000000000000000000000000000000000000000000007": "0x000000000000000000000000000000000000000000000000000000000000000a",
+          "0x0000000000000000000000000000000000000000000000000000000000000008": "0x0000000000000000000000000000000000000000000000000000000000000009",
+          "0x0000000000000000000000000000000000000000000000000000000000000009": "0x0000000000000000000000000000000000000000000000000000000000000008",
+          "0x000000000000000000000000000000000000000000000000000000000000000a": "0x0000000000000000000000000000000000000000000000000000000000000007",
+          "0x000000000000000000000000000000000000000000000000000000000000000b": "0x0000000000000000000000000000000000000000000000000000000000000006",
+          "0x000000000000000000000000000000000000000000000000000000000000000c": "0x0000000000000000000000000000000000000000000000000000000000000005",
+          "0x000000000000000000000000000000000000000000000000000000000000000d": "0x0000000000000000000000000000000000000000000000000000000000000004",
+          "0x000000000000000000000000000000000000000000000000000000000000000e": "0x0000000000000000000000000000000000000000000000000000000000000003",
+          "0x000000000000000000000000000000000000000000000000000000000000000f": "0x0000000000000000000000000000000000000000000000000000000000000002",
+          "0x0000000000000000000000000000000000000000000000000000000000000010": "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "balance": "0x0"
+      },
+      "0x000000000000000000000000000000000000010a": {
+        "code": "0x6000600160026003600460056006600760086009600a600b600c600d600e600f60108a600055600155600255600355600455600555600655600755600855600955600a55600b55600c55600d55600e55600f55601055",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000006",
+          "0x0000000000000000000000000000000000000000000000000000000000000001": "0x0000000000000000000000000000000000000000000000000000000000000010",
+          "0x0000000000000000000000000000000000000000000000000000000000000002": "0x000000000000000000000000000000000000000000000000000000000000000f",
+          "0x0000000000000000000000000000000000000000000000000000000000000003": "0x000000000000000000000000000000000000000000000000000000000000000e",
+          "0x0000000000000000000000000000000000000000000000000000000000000004": "0x000000000000000000000000000000000000000000000000000000000000000d",
+          "0x0000000000000000000000000000000000000000000000000000000000000005": "0x000000000000000000000000000000000000000000000000000000000000000c",
+          "0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000000000000000000b",
+          "0x0000000000000000000000000000000000000000000000000000000000000007": "0x000000000000000000000000000000000000000000000000000000000000000a",
+          "0x0000000000000000000000000000000000000000000000000000000000000008": "0x0000000000000000000000000000000000000000000000000000000000000009",
+          "0x0000000000000000000000000000000000000000000000000000000000000009": "0x0000000000000000000000000000000000000000000000000000000000000008",
+          "0x000000000000000000000000000000000000000000000000000000000000000a": "0x0000000000000000000000000000000000000000000000000000000000000007",
+          "0x000000000000000000000000000000000000000000000000000000000000000b": "0x0000000000000000000000000000000000000000000000000000000000000006",
+          "0x000000000000000000000000000000000000000000000000000000000000000c": "0x0000000000000000000000000000000000000000000000000000000000000005",
+          "0x000000000000000000000000000000000000000000000000000000000000000d": "0x0000000000000000000000000000000000000000000000000000000000000004",
+          "0x000000000000000000000000000000000000000000000000000000000000000e": "0x0000000000000000000000000000000000000000000000000000000000000003",
+          "0x000000000000000000000000000000000000000000000000000000000000000f": "0x0000000000000000000000000000000000000000000000000000000000000002",
+          "0x0000000000000000000000000000000000000000000000000000000000000010": "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "balance": "0x0"
+      },
+      "0x000000000000000000000000000000000000010b": {
+        "code": "0x6000600160026003600460056006600760086009600a600b600c600d600e600f60108b600055600155600255600355600455600555600655600755600855600955600a55600b55600c55600d55600e55600f55601055",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000005",
+          "0x0000000000000000000000000000000000000000000000000000000000000001": "0x0000000000000000000000000000000000000000000000000000000000000010",
+          "0x0000000000000000000000000000000000000000000000000000000000000002": "0x000000000000000000000000000000000000000000000000000000000000000f",
+          "0x0000000000000000000000000000000000000000000000000000000000000003": "0x000000000000000000000000000000000000000000000000000000000000000e",
+          "0x0000000000000000000000000000000000000000000000000000000000000004": "0x000000000000000000000000000000000000000000000000000000000000000d",
+          "0x0000000000000000000000000000000000000000000000000000000000000005": "0x000000000000000000000000000000000000000000000000000000000000000c",
+          "0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000000000000000000b",
+          "0x0000000000000000000000000000000000000000000000000000000000000007": "0x000000000000000000000000000000000000000000000000000000000000000a",
+          "0x0000000000000000000000000000000000000000000000000000000000000008": "0x0000000000000000000000000000000000000000000000000000000000000009",
+          "0x0000000000000000000000000000000000000000000000000000000000000009": "0x0000000000000000000000000000000000000000000000000000000000000008",
+          "0x000000000000000000000000000000000000000000000000000000000000000a": "0x0000000000000000000000000000000000000000000000000000000000000007",
+          "0x000000000000000000000000000000000000000000000000000000000000000b": "0x0000000000000000000000000000000000000000000000000000000000000006",
+          "0x000000000000000000000000000000000000000000000000000000000000000c": "0x0000000000000000000000000000000000000000000000000000000000000005",
+          "0x000000000000000000000000000000000000000000000000000000000000000d": "0x0000000000000000000000000000000000000000000000000000000000000004",
+          "0x000000000000000000000000000000000000000000000000000000000000000e": "0x0000000000000000000000000000000000000000000000000000000000000003",
+          "0x000000000000000000000000000000000000000000000000000000000000000f": "0x0000000000000000000000000000000000000000000000000000000000000002",
+          "0x0000000000000000000000000000000000000000000000000000000000000010": "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "balance": "0x0"
+      },
+      "0x000000000000000000000000000000000000010c": {
+        "code": "0x6000600160026003600460056006600760086009600a600b600c600d600e600f60108c600055600155600255600355600455600555600655600755600855600955600a55600b55600c55600d55600e55600f55601055",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000004",
+          "0x0000000000000000000000000000000000000000000000000000000000000001": "0x0000000000000000000000000000000000000000000000000000000000000010",
+          "0x0000000000000000000000000000000000000000000000000000000000000002": "0x000000000000000000000000000000000000000000000000000000000000000f",
+          "0x0000000000000000000000000000000000000000000000000000000000000003": "0x000000000000000000000000000000000000000000000000000000000000000e",
+          "0x0000000000000000000000000000000000000000000000000000000000000004": "0x000000000000000000000000000000000000000000000000000000000000000d",
+          "0x0000000000000000000000000000000000000000000000000000000000000005": "0x000000000000000000000000000000000000000000000000000000000000000c",
+          "0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000000000000000000b",
+          "0x0000000000000000000000000000000000000000000000000000000000000007": "0x000000000000000000000000000000000000000000000000000000000000000a",
+          "0x0000000000000000000000000000000000000000000000000000000000000008": "0x0000000000000000000000000000000000000000000000000000000000000009",
+          "0x0000000000000000000000000000000000000000000000000000000000000009": "0x0000000000000000000000000000000000000000000000000000000000000008",
+          "0x000000000000000000000000000000000000000000000000000000000000000a": "0x0000000000000000000000000000000000000000000000000000000000000007",
+          "0x000000000000000000000000000000000000000000000000000000000000000b": "0x0000000000000000000000000000000000000000000000000000000000000006",
+          "0x000000000000000000000000000000000000000000000000000000000000000c": "0x0000000000000000000000000000000000000000000000000000000000000005",
+          "0x000000000000000000000000000000000000000000000000000000000000000d": "0x0000000000000000000000000000000000000000000000000000000000000004",
+          "0x000000000000000000000000000000000000000000000000000000000000000e": "0x0000000000000000000000000000000000000000000000000000000000000003",
+          "0x000000000000000000000000000000000000000000000000000000000000000f": "0x0000000000000000000000000000000000000000000000000000000000000002",
+          "0x0000000000000000000000000000000000000000000000000000000000000010": "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "balance": "0x0"
+      },
+      "0x000000000000000000000000000000000000010d": {
+        "code": "0x6000600160026003600460056006600760086009600a600b600c600d600e600f60108d600055600155600255600355600455600555600655600755600855600955600a55600b55600c55600d55600e55600f55601055",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000003",
+          "0x0000000000000000000000000000000000000000000000000000000000000001": "0x0000000000000000000000000000000000000000000000000000000000000010",
+          "0x0000000000000000000000000000000000000000000000000000000000000002": "0x000000000000000000000000000000000000000000000000000000000000000f",
+          "0x0000000000000000000000000000000000000000000000000000000000000003": "0x000000000000000000000000000000000000000000000000000000000000000e",
+          "0x0000000000000000000000000000000000000000000000000000000000000004": "0x000000000000000000000000000000000000000000000000000000000000000d",
+          "0x0000000000000000000000000000000000000000000000000000000000000005": "0x000000000000000000000000000000000000000000000000000000000000000c",
+          "0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000000000000000000b",
+          "0x0000000000000000000000000000000000000000000000000000000000000007": "0x000000000000000000000000000000000000000000000000000000000000000a",
+          "0x0000000000000000000000000000000000000000000000000000000000000008": "0x0000000000000000000000000000000000000000000000000000000000000009",
+          "0x0000000000000000000000000000000000000000000000000000000000000009": "0x0000000000000000000000000000000000000000000000000000000000000008",
+          "0x000000000000000000000000000000000000000000000000000000000000000a": "0x0000000000000000000000000000000000000000000000000000000000000007",
+          "0x000000000000000000000000000000000000000000000000000000000000000b": "0x0000000000000000000000000000000000000000000000000000000000000006",
+          "0x000000000000000000000000000000000000000000000000000000000000000c": "0x0000000000000000000000000000000000000000000000000000000000000005",
+          "0x000000000000000000000000000000000000000000000000000000000000000d": "0x0000000000000000000000000000000000000000000000000000000000000004",
+          "0x000000000000000000000000000000000000000000000000000000000000000e": "0x0000000000000000000000000000000000000000000000000000000000000003",
+          "0x000000000000000000000000000000000000000000000000000000000000000f": "0x0000000000000000000000000000000000000000000000000000000000000002",
+          "0x0000000000000000000000000000000000000000000000000000000000000010": "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "balance": "0x0"
+      },
+      "0x000000000000000000000000000000000000010e": {
+        "code": "0x6000600160026003600460056006600760086009600a600b600c600d600e600f60108e600055600155600255600355600455600555600655600755600855600955600a55600b55600c55600d55600e55600f55601055",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000002",
+          "0x0000000000000000000000000000000000000000000000000000000000000001": "0x0000000000000000000000000000000000000000000000000000000000000010",
+          "0x0000000000000000000000000000000000000000000000000000000000000002": "0x000000000000000000000000000000000000000000000000000000000000000f",
+          "0x0000000000000000000000000000000000000000000000000000000000000003": "0x000000000000000000000000000000000000000000000000000000000000000e",
+          "0x0000000000000000000000000000000000000000000000000000000000000004": "0x000000000000000000000000000000000000000000000000000000000000000d",
+          "0x0000000000000000000000000000000000000000000000000000000000000005": "0x000000000000000000000000000000000000000000000000000000000000000c",
+          "0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000000000000000000b",
+          "0x0000000000000000000000000000000000000000000000000000000000000007": "0x000000000000000000000000000000000000000000000000000000000000000a",
+          "0x0000000000000000000000000000000000000000000000000000000000000008": "0x0000000000000000000000000000000000000000000000000000000000000009",
+          "0x0000000000000000000000000000000000000000000000000000000000000009": "0x0000000000000000000000000000000000000000000000000000000000000008",
+          "0x000000000000000000000000000000000000000000000000000000000000000a": "0x0000000000000000000000000000000000000000000000000000000000000007",
+          "0x000000000000000000000000000000000000000000000000000000000000000b": "0x0000000000000000000000000000000000000000000000000000000000000006",
+          "0x000000000000000000000000000000000000000000000000000000000000000c": "0x0000000000000000000000000000000000000000000000000000000000000005",
+          "0x000000000000000000000000000000000000000000000000000000000000000d": "0x0000000000000000000000000000000000000000000000000000000000000004",
+          "0x000000000000000000000000000000000000000000000000000000000000000e": "0x0000000000000000000000000000000000000000000000000000000000000003",
+          "0x000000000000000000000000000000000000000000000000000000000000000f": "0x0000000000000000000000000000000000000000000000000000000000000002",
+          "0x0000000000000000000000000000000000000000000000000000000000000010": "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "balance": "0x0"
+      },
+      "0x000000000000000000000000000000000000010f": {
+        "code": "0x6000600160026003600460056006600760086009600a600b600c600d600e600f60108f600055600155600255600355600455600555600655600755600855600955600a55600b55600c55600d55600e55600f55601055",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000001",
+          "0x0000000000000000000000000000000000000000000000000000000000000001": "0x0000000000000000000000000000000000000000000000000000000000000010",
+          "0x0000000000000000000000000000000000000000000000000000000000000002": "0x000000000000000000000000000000000000000000000000000000000000000f",
+          "0x0000000000000000000000000000000000000000000000000000000000000003": "0x000000000000000000000000000000000000000000000000000000000000000e",
+          "0x0000000000000000000000000000000000000000000000000000000000000004": "0x000000000000000000000000000000000000000000000000000000000000000d",
+          "0x0000000000000000000000000000000000000000000000000000000000000005": "0x000000000000000000000000000000000000000000000000000000000000000c",
+          "0x0000000000000000000000000000000000000000000000000000000000000006": "0x000000000000000000000000000000000000000000000000000000000000000b",
+          "0x0000000000000000000000000000000000000000000000000000000000000007": "0x000000000000000000000000000000000000000000000000000000000000000a",
+          "0x0000000000000000000000000000000000000000000000000000000000000008": "0x0000000000000000000000000000000000000000000000000000000000000009",
+          "0x0000000000000000000000000000000000000000000000000000000000000009": "0x0000000000000000000000000000000000000000000000000000000000000008",
+          "0x000000000000000000000000000000000000000000000000000000000000000a": "0x0000000000000000000000000000000000000000000000000000000000000007",
+          "0x000000000000000000000000000000000000000000000000000000000000000b": "0x0000000000000000000000000000000000000000000000000000000000000006",
+          "0x000000000000000000000000000000000000000000000000000000000000000c": "0x0000000000000000000000000000000000000000000000000000000000000005",
+          "0x000000000000000000000000000000000000000000000000000000000000000d": "0x0000000000000000000000000000000000000000000000000000000000000004",
+          "0x000000000000000000000000000000000000000000000000000000000000000e": "0x0000000000000000000000000000000000000000000000000000000000000003",
+          "0x000000000000000000000000000000000000000000000000000000000000000f": "0x0000000000000000000000000000000000000000000000000000000000000002",
+          "0x0000000000000000000000000000000000000000000000000000000000000010": "0x0000000000000000000000000000000000000000000000000000000000000001"
+        },
+        "balance": "0x0"
+      },
+      "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": {
+        "balance": "0x1bc16d6752399aa0"
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "balance": "0x3635c9adc5db2e6560",
+        "nonce": "0x10"
+      }
+    },
+    "result": {
+      "stateRoot": "0xf4f4aed0d1813d2880d8bb1cb5697303c20002ac6bfc206635645f43805ccbcb",
+      "txRoot": "0x2c4867cfacf11ad250ac757ccd6ab981344de836d72794360da2f88f71da2b12",
+      "receiptsRoot": "0x9d06daaa31b5192110e16c243d9ea7489e76f5c5d5b099b543998620785b1c0e",
+      "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "receipts": [
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0x58291",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0x7c615e26511998e7f8a514b5ed74c9aa77f9c8c556c69ed78f6c1cb0a630cf3f",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0x58291",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0x0"
+        },
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0xb0522",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0x152dc0100122cef38342fa255617b00a9026071d87393402da126938b0149a62",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0x58291",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0x1"
+        },
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0x1087b3",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0x0ca0803a0b38fc27168eae80e07e445747dc959f14dffd590d5466bb1b13f376",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0x58291",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0x2"
+        },
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0x160a44",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0x7535bb532ac6849e58dddeee85ba9b953ab2a572be9841a2bcb4ae2dcab9c15c",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0x58291",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0x3"
+        },
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0x1b8cd5",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0x7241f9746d28871868171c9c2098148628f27a4a676480d0c00ab55af32f9242",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0x58291",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0x4"
+        },
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0x210f66",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0xff480fea877676919f93e912bb0428ca881cc6aedf5e1b22830a769722b88161",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0x58291",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0x5"
+        },
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0x2691f7",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0x8a6ee88a656a8316fc096f29dbce62307fa3b91f992c96c882bdb98c6d31ba84",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0x58291",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0x6"
+        },
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0x2c1488",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0xd0743f84c1f62e34562635a7cea85544210ecb6805ccf0455b1022b3c80e6e1e",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0x58291",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0x7"
+        },
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0x319719",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0xd8049d4bde00f1418dc8d56660ecd088678a83de85e547d362f80d62a3554ba4",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0x58291",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0x8"
+        },
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0x3719aa",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0x5e02e25b8bd6f72c9626975ad31a57bcc575c632ba40b90b3479b8aa5073ff44",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0x58291",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0x9"
+        },
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0x3c9c3b",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0xad094903f50c19e0badf7b05a4c66071aee3b351de87c910abb05610dcfae598",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0x58291",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0xa"
+        },
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0x421ecc",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0xebb212945e32ae88c65ad7a93df7ccdaa6a1281c2aca26942017a370ae83b4d5",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0x58291",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0xb"
+        },
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0x47a15d",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0xe8053151800af44fa7ec7c16543035b28e344a097a30133fe1b2b941ccb937e4",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0x58291",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0xc"
+        },
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0x4d23ee",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0x31ffb1dc2943ccb8a49f5431b98ff39a5942301393d56eb4280dba6e995c0ea8",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0x58291",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0xd"
+        },
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0x52a67f",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0xcc0cceef2d220beb725b8d562c37b63f54c48914127e93667929ab7e9a5fa701",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0x58291",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0xe"
+        },
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0x582910",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0x85731253136d0dbe1941fa8f173bb8cccad2b93b3cefa2ac5f7ba8f384c97f61",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0x58291",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0xf"
+        }
+      ],
+      "currentDifficulty": "0x20000",
+      "gasUsed": "0x582910"
+    }
+  }
+}
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/london-env-no-basefee.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/london-env-no-basefee.json
new file mode 100644
index 00000000000..dcfe6a32b82
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/london-env-no-basefee.json
@@ -0,0 +1,106 @@
+{
+  "cli": [
+    "t8n",
+    "--input.alloc=stdin",
+    "--input.txs=stdin",
+    "--input.env=stdin",
+    "--output.result=stdout",
+    "--output.alloc=stdout",
+    "--output.body=stdout",
+    "--state.fork=London",
+    "--state.chainid=1",
+    "--state.reward=2000000000000000000"
+  ],
+  "stdin": {
+    "alloc": {
+      "0x1000000000000000000000000000000000000000": {
+        "nonce": "0x00",
+        "balance": "0x0ba1a9ce0ba1a9ce",
+        "code": "0x6010565b6000828201905092915050565b601a600260016003565b60005560206000f3",
+        "storage": {}
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "nonce": "0x00",
+        "balance": "0x0ba1a9ce0ba1a9ce",
+        "code": "0x",
+        "storage": {}
+      }
+    },
+    "txs": [
+      {
+        "type": "0x0",
+        "chainId": "0x0",
+        "nonce": "0x0",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x1000000000000000000000000000000000000000",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      }
+    ],
+    "env": {
+      "currentCoinbase": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+      "currentGasLimit": "100000000000000000",
+      "currentNumber": "1",
+      "currentTimestamp": "1000",
+      "parentDifficulty": "131072",
+      "parentBaseFee": "7",
+      "parentGasUsed": "50000000000000000",
+      "parentGasLimit": "100000000000000000",
+      "parentTimstamp": "0",
+      "blockHashes": {
+        "0": "0xe3c84688fa32c20955c535c7d25b5b4b196079e40a9c47c9cb1edb5e58b3dce5"
+      },
+      "ommers": [],
+      "parentUncleHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+    }
+  },
+  "stdout": {
+    "alloc": {
+      "0x1000000000000000000000000000000000000000": {
+        "code": "0x6010565b6000828201905092915050565b601a600260016003565b60005560206000f3",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000003"
+        },
+        "balance": "0xba1a9ce0ba1a9ce"
+      },
+      "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": {
+        "balance": "0x1bc16d674ec9fa07"
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "balance": "0xba1a9ce0b9b130c",
+        "nonce": "0x1"
+      }
+    },
+    "body": "0xf862f860800a8307a12094100000000000000000000000000000000000000080801ca091df80a63242846dcf1cc16c35e6ba39212cde92aad946f9c286fa0029782b54a0446170c2fb714c717885485ea7d93bf9277f3fb3d89ffd73e9b7f5f8eda3997b",
+    "result": {
+      "stateRoot": "0x5c0f211cd1bea44ac01bd3fd7e0ab742d316adabd139bcf60a7aac6c458d596d",
+      "txRoot": "0x8e987be72f36f97a98838e03d9e5d1b3d22795606240f16684532b1c994b4ee7",
+      "receiptsRoot": "0x0812e2d0238699cad1dd4c1274804ed2dde9a35df8ee002d48bbf3ef87857a63",
+      "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "receipts": [
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0xa8ad",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0x6c4a22ee7d2d9ae9307b09aac69a34600978e34313088917a7e69fd12e8f959a",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0xa8ad",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0x0"
+        }
+      ],
+      "currentDifficulty": "0x20000",
+      "gasUsed": "0xa8ad",
+      "currentBaseFee": "0x7"
+    }
+  }
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/london-hex.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/london-hex.json
new file mode 100644
index 00000000000..502ac628de6
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/london-hex.json
@@ -0,0 +1,105 @@
+{
+  "cli": [
+    "t8n",
+    "--input.alloc=stdin",
+    "--input.txs=stdin",
+    "--input.env=stdin",
+    "--output.result=stdout",
+    "--output.alloc=stdout",
+    "--output.body=stdout",
+    "--state.fork=London",
+    "--state.chainid=1",
+    "--state.reward=0"
+  ],
+  "stdin": {
+    "alloc": {
+      "0x1000000000000000000000000000000000000000": {
+        "nonce": "0x00",
+        "balance": "0x0ba1a9ce0ba1a9ce",
+        "code": "0x6010565b6000828201905092915050565b601a600260016003565b60005560206000f3",
+        "storage": {}
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "nonce": "0x00",
+        "balance": "0x0ba1a9ce0ba1a9ce",
+        "code": "0x",
+        "storage": {}
+      }
+    },
+    "txs": [
+      {
+        "type": "0x0",
+        "chainId": "0x0",
+        "nonce": "0x0",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x1000000000000000000000000000000000000000",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      }
+    ],
+    "env": {
+      "currentCoinbase": "0x0000000000000000000000000000000000000000",
+      "currentNumber": "0x1",
+      "currentTimestamp": "0x0",
+      "currentGasLimit": "0xff112233445566",
+      "previousHash": "0xb271e9e5796d0ff5a2fd519ba666393e42d4f38680854761121d84a7a96ff017",
+      "parentTimestamp": "0x00",
+      "parentDifficulty": "0x00",
+      "parentUncleHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "currentRandom": "0x0000000000000000000000000000000000000000000000000000000000020000",
+      "parentBaseFee": "0x0b",
+      "parentGasUsed": "0x00",
+      "parentGasLimit": "0xff112233445566",
+      "blockHashes": {
+        "0": "0xb271e9e5796d0ff5a2fd519ba666393e42d4f38680854761121d84a7a96ff017"
+      },
+      "currentDifficulty": "0x0"
+    }
+  },
+  "stdout": {
+    "alloc": {
+      "0x1000000000000000000000000000000000000000": {
+        "code": "0x6010565b6000828201905092915050565b601a600260016003565b60005560206000f3",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000003"
+        },
+        "balance": "0xba1a9ce0ba1a9ce"
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "balance": "0xba1a9ce0b9b130c",
+        "nonce": "0x1"
+      }
+    },
+    "body": "0xf862f860800a8307a12094100000000000000000000000000000000000000080801ca091df80a63242846dcf1cc16c35e6ba39212cde92aad946f9c286fa0029782b54a0446170c2fb714c717885485ea7d93bf9277f3fb3d89ffd73e9b7f5f8eda3997b",
+    "result": {
+      "stateRoot": "0x5775e461ac316f8c02466d23e4492d24bbe546336f6fc632dd1311d6a5b67b22",
+      "txRoot": "0x8e987be72f36f97a98838e03d9e5d1b3d22795606240f16684532b1c994b4ee7",
+      "receiptsRoot": "0x0812e2d0238699cad1dd4c1274804ed2dde9a35df8ee002d48bbf3ef87857a63",
+      "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "receipts": [
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0xa8ad",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0x6c4a22ee7d2d9ae9307b09aac69a34600978e34313088917a7e69fd12e8f959a",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0xa8ad",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0x0"
+        }
+      ],
+      "currentDifficulty": null,
+      "gasUsed": "0xa8ad",
+      "currentBaseFee": "0xa"
+    }
+  }
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/shanghai-blockhash.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/shanghai-blockhash.json
new file mode 100644
index 00000000000..c393d1cef2b
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/shanghai-blockhash.json
@@ -0,0 +1,109 @@
+{
+  "cli": [
+    "t8n",
+    "--input.alloc=stdin",
+    "--input.txs=stdin",
+    "--input.env=stdin",
+    "--output.result=stdout",
+    "--output.alloc=stdout",
+    "--output.body=stdout",
+    "--state.fork=Shanghai",
+    "--state.chainid=1",
+    "--state.reward=0"
+  ],
+  "stdin": {
+    "alloc": {
+      "0x1000000000000000000000000000000000000000": {
+        "nonce": "0x00",
+        "balance": "0x0ba1a9ce0ba1a9ce",
+        "code": "0x60004060005560014060015500",
+        "storage": {}
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "balance": "0x1319ad251a00",
+        "storage": {}
+      }
+    },
+    "txs": [
+      {
+        "type": "0x0",
+        "chainId": "0x0",
+        "nonce": "0x0",
+        "gasPrice": "0xa",
+        "gas": "0x7a120",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x1000000000000000000000000000000000000000",
+        "protected": false,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      }
+    ],
+    "env": {
+      "currentCoinbase": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+      "currentGasLimit": "100000000000000000",
+      "currentNumber": "257",
+      "currentTimestamp": "24",
+      "currentRandom": "0",
+      "currentDifficulty": "0",
+      "parentDifficulty": "0",
+      "parentGasUsed": "0",
+      "parentGasLimit": "100000000000000000",
+      "parentTimstamp": "12",
+      "blockHashes": {
+        "0": "0x651666d6d8727a6478a750dc8406c1bda0be85abc99094dca694807fa772f83c",
+        "1": "0x0275fc82fe832100726ec7c26078ffb1c1dbff14a3b52d93dc359768fc8c7baa"
+      },
+      "ommers": [],
+      "withdrawals": [],
+      "parentUncleHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "currentBaseFee": "7"
+    }
+  },
+  "stdout": {
+    "alloc": {
+      "0x1000000000000000000000000000000000000000": {
+        "code": "0x60004060005560014060015500",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000001": "0x0275fc82fe832100726ec7c26078ffb1c1dbff14a3b52d93dc359768fc8c7baa"
+        },
+        "balance": "0xba1a9ce0ba1a9ce"
+      },
+      "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": {
+        "balance": "0x21378"
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "balance": "0x1319ad1e2e70",
+        "nonce": "0x1"
+      }
+    },
+    "body": "0xf862f860800a8307a12094100000000000000000000000000000000000000080801ca091df80a63242846dcf1cc16c35e6ba39212cde92aad946f9c286fa0029782b54a0446170c2fb714c717885485ea7d93bf9277f3fb3d89ffd73e9b7f5f8eda3997b",
+    "result": {
+      "stateRoot": "0x89412c0f1bb31b983d0317e6e2801a4e604e1ef9987a132ab63c52f2d5a3994b",
+      "txRoot": "0x8e987be72f36f97a98838e03d9e5d1b3d22795606240f16684532b1c994b4ee7",
+      "receiptsRoot": "0x8046ec5911721c453253b45a350eb90247e1a047bdc7cf1e2c7885b4c2403276",
+      "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "receipts": [
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0xb128",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0x6c4a22ee7d2d9ae9307b09aac69a34600978e34313088917a7e69fd12e8f959a",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0xb128",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0x0"
+        }
+      ],
+      "currentDifficulty": null,
+      "gasUsed": "0xb128",
+      "currentBaseFee": "0x7",
+      "withdrawalsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
+    }
+  }
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/shanghai-init-code.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/shanghai-init-code.json
new file mode 100644
index 00000000000..3c398c92de6
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/shanghai-init-code.json
@@ -0,0 +1,85 @@
+{
+  "cli": [
+    "t8n",
+    "--input.alloc=stdin",
+    "--input.txs=stdin",
+    "--input.env=stdin",
+    "--output.result=stdout",
+    "--output.alloc=stdout",
+    "--output.body=stdout",
+    "--state.fork=Shanghai",
+    "--state.chainid=1",
+    "--state.reward=0"
+  ],
+  "stdin": {
+    "alloc": {
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "nonce": "0x00",
+        "balance": "0x3635c9adc5dea00000",
+        "code": "0x",
+        "storage": {}
+      }
+    },
+    "txs": [
+      {
+        "type": "0x0",
+        "chainId": "0x1",
+        "nonce": "0x0",
+        "gasPrice": "0xa",
+        "gas": "0x989680",
+        "value": "0x0",
+        "input": "0x610001600081600b8239f30000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "protected": true,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      }
+    ],
+    "env": {
+      "currentCoinbase": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+      "currentGasLimit": "100000000000000000",
+      "currentNumber": "1",
+      "currentTimestamp": "12",
+      "currentRandom": "0",
+      "currentDifficulty": "0",
+      "parentDifficulty": "0",
+      "parentBaseFee": "7",
+      "parentGasUsed": "0",
+      "parentGasLimit": "100000000000000000",
+      "parentTimstamp": "0",
+      "blockHashes": {
+        "0": "0xea2d7e0192d890c222f0302d972a02db0bf0c6d08257d73aa1210d08d24f30c3"
+      },
+      "ommers": [],
+      "withdrawals": [],
+      "parentUncleHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+    }
+  },
+  "stdout": {
+    "alloc": {
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "balance": "0x3635c9adc5dea00000"
+      }
+    },
+    "body": "0xf9c052f9c04f800a839896808080b9c001610001600081600b8239f3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000026a0b8ba45e0ef29fa4dae53b530d498e9b320adcd8723772d76b57dfb7f1b640d3da0675ee050b02d95a683235846a39fdc01854f680d98f8723222d339e5a15b30cc",
+    "result": {
+      "stateRoot": "0x70c42824108fafccadbfce71e6e22660c4fad89be18be324cd15ef351969a8c8",
+      "txRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "receipts": [],
+      "rejected": [
+        {
+          "index": 0,
+          "error": "Initcode size of 49153 exceeds maximum size of 49152"
+        }
+      ],
+      "currentDifficulty": null,
+      "gasUsed": "0x0",
+      "currentBaseFee": "0x7",
+      "withdrawalsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
+    }
+  }
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/shanghai-invalidTx.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/shanghai-invalidTx.json
new file mode 100644
index 00000000000..7ec8a1d7763
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/shanghai-invalidTx.json
@@ -0,0 +1,87 @@
+{
+  "cli": [
+    "t8n",
+    "--input.alloc=stdin",
+    "--input.txs=stdin",
+    "--input.env=stdin",
+    "--output.result=stdout",
+    "--output.alloc=stdout",
+    "--output.body=stdout",
+    "--state.fork=Shanghai",
+    "--state.chainid=1",
+    "--state.reward=2000000000000000000"
+  ],
+  "stdin": {
+    "alloc": {
+      "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": {
+        "balance": "0",
+        "code": "0x",
+        "nonce": "1",
+        "storage": {
+        }
+      },
+      "095e7baea6a6c7c4c2dfeb977efac326af552d87": {
+        "balance": "1000000000000000000",
+        "code": "0x600160010160005500",
+        "nonce": "0",
+        "storage": {
+        }
+      },
+      "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "balance": "1000000000000000000",
+        "code": "0x",
+        "nonce": "0",
+        "storage": {
+        }
+      }
+    },
+    "txs": "0xf864f862800a8203e894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0bb6249049eb38732aa28ef23385945e51c9582c7fab78bd33f6086bd4181615da035118c5432cd6a3bdd6f989d4eee3d43d11736e640bc249d9a2c37e01db3d4b5",
+    "env": {
+      "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+      "currentGasLimit": "0xFF112233445566",
+      "currentNumber": "1",
+      "currentTimestamp": "1000",
+      "currentDifficulty": "0x20000",
+      "currentBaseFee": "0xa",
+      "blockHashes": {
+        "0": "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+      },
+      "ommers": [],
+      "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+    }
+  },
+  "stdout": {
+    "alloc": {
+      "0x095e7baea6a6c7c4c2dfeb977efac326af552d87": {
+        "code": "0x600160010160005500",
+        "balance": "0x1000000000000000000"
+      },
+      "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": {
+        "balance": "0x0",
+        "nonce": "0x1"
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "balance": "0x1000000000000000000"
+      }
+    },
+    "body": "0xf864f862800a8203e894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0bb6249049eb38732aa28ef23385945e51c9582c7fab78bd33f6086bd4181615da035118c5432cd6a3bdd6f989d4eee3d43d11736e640bc249d9a2c37e01db3d4b5",
+    "result": {
+      "stateRoot": "0xec92f4c572101075d17eb5aaf15c33df92b6d5519cbed635fc53353b99e8e6da",
+      "txRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "receipts": [],
+      "rejected": [
+        {
+          "index": 0,
+          "error": "intrinsic gas cost 21000 exceeds gas limit 1000"
+        }
+      ],
+      "currentDifficulty": "0x20000",
+      "gasUsed": "0x0",
+      "currentBaseFee": "0xa",
+      "withdrawalsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
+    }
+  }
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/shanghai-withdrawals-no-nonce.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/shanghai-withdrawals-no-nonce.json
new file mode 100644
index 00000000000..d967e398ef6
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/shanghai-withdrawals-no-nonce.json
@@ -0,0 +1,103 @@
+{
+  "cli": [
+    "t8n",
+    "--input.alloc=stdin",
+    "--input.txs=stdin",
+    "--input.env=stdin",
+    "--output.result=stdout",
+    "--output.alloc=stdout",
+    "--output.body=stdout",
+    "--state.fork=Shanghai",
+    "--state.chainid=1",
+    "--state.reward=0"
+  ],
+  "stdin": {
+    "alloc": {
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "balance": "0x1319ad251a00",
+        "storage": {}
+      }
+    },
+    "txs": [
+      {
+        "type": "0x0",
+        "chainId": "0x1",
+        "nonce": "0x0",
+        "gasPrice": "0x3b9aca00",
+        "gas": "0x5208",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x0000000000000000000000000000000000000100",
+        "protected": true,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      }
+    ],
+    "env": {
+      "currentCoinbase": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+      "currentGasLimit": "100000000000000000",
+      "currentNumber": "2",
+      "currentTimestamp": "24",
+      "currentRandom": "0",
+      "currentDifficulty": "0",
+      "parentDifficulty": "0",
+      "parentGasUsed": "0",
+      "parentGasLimit": "100000000000000000",
+      "parentTimstamp": "12",
+      "blockHashes": {
+        "0": "0x651666d6d8727a6478a750dc8406c1bda0be85abc99094dca694807fa772f83c",
+        "1": "0x0275fc82fe832100726ec7c26078ffb1c1dbff14a3b52d93dc359768fc8c7baa"
+      },
+      "ommers": [],
+      "withdrawals": [
+        {
+          "index": "0x0",
+          "validatorIndex": "0x0",
+          "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+          "amount": "0x5209"
+        }
+      ],
+      "parentUncleHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "currentBaseFee": "7"
+    }
+  },
+  "stdout": {
+    "alloc": {
+      "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": {
+        "balance": "0x1319718811c8"
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "balance": "0x1319e8bfe400",
+        "nonce": "0x1"
+      }
+    },
+    "body": "0xf865f86380843b9aca00825208940000000000000000000000000000000000000100808026a0e319535da2cae2d72ddb352054535d000c23acdc7cad9d828891253f3850d0d2a032fe4444149b609e2ffa621e23e179b12028309fdb8cb0a5c1bbc58135299af1",
+    "result": {
+      "stateRoot": "0x41855ebd4b425591ae60f57de6ec700c8a1128c7761b63371b09671b5f1abb3f",
+      "txRoot": "0xb5ffe01eaa51ee8246b2108e049e6e11dc0a1d99b4cc52966791ef9c40b8b863",
+      "receiptsRoot": "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2",
+      "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "receipts": [
+        {
+          "root": "0x",
+          "status": "0x1",
+          "cumulativeGasUsed": "0x5208",
+          "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          "logs": null,
+          "transactionHash": "0xb5a8d2d008438dd97446b4e0971ae968fb07ee25f9c7d574d96e60808ce25dd1",
+          "contractAddress": "0x0000000000000000000000000000000000000000",
+          "gasUsed": "0x5208",
+          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "transactionIndex": "0x0"
+        }
+      ],
+      "currentDifficulty": null,
+      "gasUsed": "0x5208",
+      "currentBaseFee": "0x7",
+      "withdrawalsRoot": "0xa485a3bd07e29cb8234b5f093d5216eb8b965fb2693c66fea254f6cacef97a6f"
+    }
+  }
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/shanghai-withdrawals-overflow.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/shanghai-withdrawals-overflow.json
new file mode 100644
index 00000000000..ca3eed9f676
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/shanghai-withdrawals-overflow.json
@@ -0,0 +1,81 @@
+{
+  "cli": [
+    "t8n",
+    "--input.alloc=stdin",
+    "--input.txs=stdin",
+    "--input.env=stdin",
+    "--output.result=stdout",
+    "--output.alloc=stdout",
+    "--output.body=stdout",
+    "--state.fork=Shanghai",
+    "--state.chainid=1",
+    "--state.reward=0"
+  ],
+  "stdin": {
+    "alloc": {
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "nonce": "0x00",
+        "balance": "0x3635c9adc5dea00000",
+        "code": "0x",
+        "storage": {}
+      },
+      "0x0000000000000000000000000000000000000100": {
+        "nonce": "0x00",
+        "balance": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "code": "0x",
+        "storage": {}
+      }
+    },
+    "txs": null,
+    "env": {
+      "currentCoinbase": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+      "currentGasLimit": "100000000000000000",
+      "currentNumber": "1",
+      "currentTimestamp": "12",
+      "currentRandom": "0",
+      "currentDifficulty": "0",
+      "parentDifficulty": "0",
+      "parentBaseFee": "7",
+      "parentGasUsed": "0",
+      "parentGasLimit": "100000000000000000",
+      "parentTimstamp": "0",
+      "blockHashes": {
+        "0": "0xfc63c00c7fe67bcc6ae52ea4eed5ff00b8673b1afb581d090c34b5fa6eca9467"
+      },
+      "ommers": [],
+      "withdrawals": [
+        {
+          "index": "0x0",
+          "validatorIndex": "0x0",
+          "address": "0x0000000000000000000000000000000000000100",
+          "amount": "0x1"
+        }
+      ],
+      "parentUncleHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+    }
+  },
+  "stdout": {
+    "alloc": {
+      "0x0000000000000000000000000000000000000100": {
+        "balance": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "balance": "0x3635c9adc5dea00000"
+      }
+    },
+    "body": "0xc0",
+    "result": {
+      "exception": "UInt256 overflow",
+      "stateRoot": "0x2a23ea102cd739aa3ad83a9be1555d621e50b3a3f780a7369ec2a6c03f22e18d",
+      "txRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "receipts": [],
+      "currentDifficulty": null,
+      "gasUsed": "0x0",
+      "currentBaseFee":"0x7",
+      "withdrawalsRoot": "0x7bae13217931ff0d7a6c5823c996492f28cd92da5a7788a9a68856bb2206741a"
+    }
+  }
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/shanghai-withdrawals.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/shanghai-withdrawals.json
new file mode 100644
index 00000000000..6e3769bef22
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/t8n/shanghai-withdrawals.json
@@ -0,0 +1,86 @@
+{
+  "cli": [
+    "t8n",
+    "--input.alloc=stdin",
+    "--input.txs=stdin",
+    "--input.env=stdin",
+    "--output.result=stdout",
+    "--output.alloc=stdout",
+    "--output.body=stdout",
+    "--state.fork=Shanghai",
+    "--state.chainid=1",
+    "--state.reward=0"
+  ],
+  "stdin": {
+    "alloc": {},
+    "txs": [
+      {
+        "type": "0x0",
+        "chainId": "0x1",
+        "nonce": "0x0",
+        "gasPrice": "0x3b9aca00",
+        "gas": "0x5208",
+        "value": "0x0",
+        "input": "0x",
+        "to": "0x0000000000000000000000000000000000000100",
+        "protected": true,
+        "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+        "v": "0x0",
+        "r": "0x0",
+        "s": "0x0"
+      }
+    ],
+    "env": {
+      "currentCoinbase": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+      "currentGasLimit": "100000000000000000",
+      "currentNumber": "1",
+      "currentTimestamp": "12",
+      "currentRandom": "0",
+      "currentDifficulty": "0",
+      "parentDifficulty": "0",
+      "parentBaseFee": "7",
+      "parentGasUsed": "0",
+      "parentGasLimit": "100000000000000000",
+      "parentTimstamp": "0",
+      "blockHashes": {
+        "0": "0x651666d6d8727a6478a750dc8406c1bda0be85abc99094dca694807fa772f83c"
+      },
+      "ommers": [],
+      "withdrawals": [
+        {
+          "index": "0x0",
+          "validatorIndex": "0x0",
+          "address": "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+          "amount": "0x5209"
+        }
+      ],
+      "parentUncleHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+    }
+  },
+  "stdout": {
+    "alloc": {
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "balance": "0x1319ad251a00"
+      }
+    },
+    "body": "0xf865f86380843b9aca00825208940000000000000000000000000000000000000100808026a0e319535da2cae2d72ddb352054535d000c23acdc7cad9d828891253f3850d0d2a032fe4444149b609e2ffa621e23e179b12028309fdb8cb0a5c1bbc58135299af1",
+    "result": {
+      "stateRoot": "0x7075d070d6ec70a91216fc2dba6ceae6b8d30815166f6b7b7249776767fb9855",
+      "txRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
+      "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "receipts": [],
+      "rejected": [
+        {
+          "index": 0,
+          "error": "transaction up-front cost 0x1319718a5000 exceeds transaction sender account balance 0x0"
+        }
+      ],
+      "currentDifficulty": null,
+      "gasUsed": "0x0",
+      "currentBaseFee": "0x7",
+      "withdrawalsRoot": "0xa485a3bd07e29cb8234b5f093d5216eb8b965fb2693c66fea254f6cacef97a6f"
+    }
+  }
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/trace/badcode.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/trace/badcode.json
new file mode 100644
index 00000000000..fec350ff333
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/trace/badcode.json
@@ -0,0 +1,14 @@
+{
+  "cli": [
+    "--notime",
+    "--json",
+    "--code",
+    "6000ef"
+  ],
+  "stdin": "",
+  "stdout": [
+    {"pc":0,"op":96,"gas":"0x2540b91f8","gasCost":"0x3","memSize":0,"stack":[],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":2,"op":239,"gas":"0x2540b91f5","gasCost":"0x0","memSize":0,"stack":["0x0"],"depth":1,"refund":0,"opName":"INVALID","error":"Bad instruction"},
+    {"gasUser":"0x2540b91f8","gasTotal":"0x2540b91f8","output":"0x"}
+  ]
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/trace/revert.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/trace/revert.json
new file mode 100644
index 00000000000..c919d748ddc
--- /dev/null
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/trace/revert.json
@@ -0,0 +1,18 @@
+{
+  "cli": [
+    "--notime",
+    "--json",
+    "--code",
+    "634E6F70656000526004601CFD"
+  ],
+  "stdin": "",
+  "stdout": [
+    {"pc":0,"op":99,"gas":"0x2540b91f8","gasCost":"0x3","memSize":0,"stack":[],"depth":1,"refund":0,"opName":"PUSH4"},
+    {"pc":5,"op":96,"gas":"0x2540b91f5","gasCost":"0x3","memSize":0,"stack":["0x4e6f7065"],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":7,"op":82,"gas":"0x2540b91f2","gasCost":"0x6","memSize":0,"stack":["0x4e6f7065","0x0"],"depth":1,"refund":0,"opName":"MSTORE"},
+    {"pc":8,"op":96,"gas":"0x2540b91ec","gasCost":"0x3","memSize":32,"stack":[],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":10,"op":96,"gas":"0x2540b91e9","gasCost":"0x3","memSize":32,"stack":["0x4"],"depth":1,"refund":0,"opName":"PUSH1"},
+    {"pc":12,"op":253,"gas":"0x2540b91e6","gasCost":"0x0","memSize":32,"stack":["0x4","0x1c"],"depth":1,"refund":0,"opName":"REVERT","error":"Nope"},
+    {"gasUser":"0x12","gasTotal":"0x12","output":"0x4e6f7065"}
+  ]
+}
\ No newline at end of file
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/unsupported-fork-state-test.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/unsupported-fork-state-test.json
index e7a955a797a..b74b4735c8e 100644
--- a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/unsupported-fork-state-test.json
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/unsupported-fork-state-test.json
@@ -1,13 +1,5 @@
 {
   "callcallcodecall_010_SuicideEnd" : {
-    "_info" : {
-      "comment" : "",
-      "filling-rpc-server" : "Geth-1.9.6-unstable-63b18027-20190920",
-      "filling-tool-version" : "retesteth-0.0.1+commit.0ae18aef.Linux.g++",
-      "lllcversion" : "Version: 0.5.12-develop.2019.9.13+commit.2d601a4f.Linux.g++",
-      "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEndFiller.json",
-      "sourceHash" : "6d86c07af29329a8944aa6953d4271f5adfe2f9b0554294f2d7a54827f409569"
-    },
     "env" : {
       "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
       "currentDifficulty" : "0x020000",
diff --git a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/valid-state-test.json b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/valid-state-test.json
index 1c6c0a22e45..e5b7e02c6bc 100644
--- a/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/valid-state-test.json
+++ b/ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/valid-state-test.json
@@ -1,13 +1,5 @@
 {
   "callcallcodecall_010_SuicideEnd" : {
-    "_info" : {
-      "comment" : "",
-      "filling-rpc-server" : "Geth-1.9.6-unstable-63b18027-20190920",
-      "filling-tool-version" : "retesteth-0.0.1+commit.0ae18aef.Linux.g++",
-      "lllcversion" : "Version: 0.5.12-develop.2019.9.13+commit.2d601a4f.Linux.g++",
-      "source" : "src/GeneralStateTestsFiller/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEndFiller.json",
-      "sourceHash" : "6d86c07af29329a8944aa6953d4271f5adfe2f9b0554294f2d7a54827f409569"
-    },
     "env" : {
       "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
       "currentDifficulty" : "0x020000",
diff --git a/ethereum/mock-p2p/build.gradle b/ethereum/mock-p2p/build.gradle
index 6c2e6fc7956..b73c0a051fd 100644
--- a/ethereum/mock-p2p/build.gradle
+++ b/ethereum/mock-p2p/build.gradle
@@ -35,8 +35,11 @@ dependencies {
   implementation project(':util')
 
   implementation 'io.vertx:vertx-core'
-  implementation 'org.apache.tuweni:bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
 
-  testImplementation "junit:junit"
+  testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
+
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 }
diff --git a/ethereum/mock-p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/testing/MockNetwork.java b/ethereum/mock-p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/testing/MockNetwork.java
index 86ae017540a..b443afe9f94 100644
--- a/ethereum/mock-p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/testing/MockNetwork.java
+++ b/ethereum/mock-p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/testing/MockNetwork.java
@@ -16,7 +16,6 @@
 
 import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer;
 import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.rlpx.ConnectCallback;
 import org.hyperledger.besu.ethereum.p2p.rlpx.DisconnectCallback;
@@ -27,7 +26,9 @@
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.ShouldConnectCallback;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.util.Subscribers;
 
 import java.net.InetSocketAddress;
@@ -168,13 +169,16 @@ public void subscribeConnect(final ConnectCallback callback) {
       connectCallbacks.subscribe(callback);
     }
 
+    @Override
+    public void subscribeConnectRequest(final ShouldConnectCallback callback) {}
+
     @Override
     public void subscribeDisconnect(final DisconnectCallback callback) {
       disconnectCallbacks.subscribe(callback);
     }
 
     @Override
-    public boolean addMaintainConnectionPeer(final Peer peer) {
+    public boolean addMaintainedConnectionPeer(final Peer peer) {
       return true;
     }
 
@@ -214,6 +218,9 @@ public boolean isDiscoveryEnabled() {
     public Optional<EnodeURL> getLocalEnode() {
       return Optional.empty();
     }
+
+    @Override
+    public void updateNodeRecord() {}
   }
 
   /**
@@ -234,6 +241,8 @@ private final class MockPeerConnection implements PeerConnection {
     private final Peer to;
 
     private final MockNetwork network;
+    private boolean statusSent;
+    private boolean statusReceived;
 
     MockPeerConnection(final Peer source, final Peer target, final MockNetwork network) {
       from = source;
@@ -305,5 +314,30 @@ public InetSocketAddress getLocalAddress() {
     public InetSocketAddress getRemoteAddress() {
       throw new UnsupportedOperationException();
     }
+
+    @Override
+    public long getInitiatedAt() {
+      return 0;
+    }
+
+    @Override
+    public boolean inboundInitiated() {
+      return false;
+    }
+
+    @Override
+    public void setStatusSent() {
+      this.statusSent = true;
+    }
+
+    @Override
+    public void setStatusReceived() {
+      this.statusReceived = true;
+    }
+
+    @Override
+    public boolean getStatusExchanged() {
+      return statusSent && statusReceived;
+    }
   }
 }
diff --git a/ethereum/mock-p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/testing/MockNetworkTest.java b/ethereum/mock-p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/testing/MockNetworkTest.java
index 2f68df6947e..3596012019e 100644
--- a/ethereum/mock-p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/testing/MockNetworkTest.java
+++ b/ethereum/mock-p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/testing/MockNetworkTest.java
@@ -16,7 +16,7 @@
 
 import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
 import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
@@ -44,7 +44,7 @@ public void exchangeMessages() throws Exception {
     final MockNetwork network = new MockNetwork(Arrays.asList(cap));
     final Peer one =
         DefaultPeer.fromEnodeURL(
-            EnodeURL.builder()
+            EnodeURLImpl.builder()
                 .nodeId(randomId())
                 .ipAddress("192.168.1.2")
                 .discoveryPort(1234)
@@ -52,7 +52,7 @@ public void exchangeMessages() throws Exception {
                 .build());
     final Peer two =
         DefaultPeer.fromEnodeURL(
-            EnodeURL.builder()
+            EnodeURLImpl.builder()
                 .nodeId(randomId())
                 .ipAddress("192.168.1.3")
                 .discoveryPort(1234)
diff --git a/ethereum/p2p/build.gradle b/ethereum/p2p/build.gradle
index 376ab694a54..6d36dfd1c74 100644
--- a/ethereum/p2p/build.gradle
+++ b/ethereum/p2p/build.gradle
@@ -28,39 +28,49 @@ jar {
 }
 
 dependencies {
-  implementation project(':crypto')
+  api 'org.slf4j:slf4j-api'
+
+  implementation project(':crypto:services')
+  implementation project(':datatypes')
   implementation project(':ethereum:core')
   implementation project(':ethereum:rlp')
+  implementation project(':pki')
   implementation project(':metrics:core')
   implementation project(':nat')
+  implementation project(':util')
 
   implementation 'com.google.guava:guava'
   implementation 'dnsjava:dnsjava'
+  implementation 'io.netty:netty-transport-native-unix-common'
   implementation 'io.prometheus:simpleclient'
   implementation 'io.vertx:vertx-core'
-  implementation 'org.apache.logging.log4j:log4j-api'
-  implementation 'org.apache.tuweni:bytes'
-  implementation 'org.apache.tuweni:crypto'
-  implementation 'org.apache.tuweni:devp2p'
-  implementation 'org.apache.tuweni:dns-discovery'
-  implementation 'org.apache.tuweni:io'
-  implementation 'org.apache.tuweni:rlp'
-  implementation 'org.apache.tuweni:units'
+
+  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-crypto'
+  implementation('org.apache.tuweni:tuweni-devp2p') {
+    exclude group:'ch.qos.logback', module:'logback-classic'
+  }
+  implementation('org.apache.tuweni:tuweni-dns-discovery'){
+    exclude group:'ch.qos.logback', module:'logback-classic'
+  }
+  implementation 'org.apache.tuweni:tuweni-io'
+  implementation 'org.apache.tuweni:tuweni-rlp'
+  implementation 'org.apache.tuweni:tuweni-units'
   implementation 'org.jetbrains.kotlin:kotlin-stdlib'
+  implementation 'org.owasp.encoder:encoder'
   implementation 'org.xerial.snappy:snappy-java'
 
   annotationProcessor "org.immutables:value"
   implementation "org.immutables:value-annotations"
   implementation 'tech.pegasys.discovery:discovery'
 
-  runtimeOnly 'org.apache.logging.log4j:log4j-core'
-
   // test dependencies.
   testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts')
   testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
-  testImplementation project(path: ':crypto', configuration: 'testSupportArtifacts')
+  testImplementation project(path: ':crypto:services', configuration: 'testSupportArtifacts')
   testImplementation project(':testutil')
 
+  testImplementation 'com.fasterxml.jackson.core:jackson-databind'
   testImplementation('io.pkts:pkts-core') {
     exclude group: 'io.pkts', module: 'pkts-sdp'
     exclude group: 'io.pkts', module: 'pkts-sip'
@@ -70,5 +80,8 @@ dependencies {
   testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.awaitility:awaitility'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.mockito:mockito-core'
+
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/DiscoveryConfiguration.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/DiscoveryConfiguration.java
index 39fc116c708..036e592e1dd 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/DiscoveryConfiguration.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/DiscoveryConfiguration.java
@@ -14,176 +14,15 @@
  */
 package org.hyperledger.besu.ethereum.p2p.config;
 
-import static java.util.stream.Collectors.toList;
-
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.util.NetworkUtility;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 public class DiscoveryConfiguration {
-  public static final String GOERLI_DISCOVERY_URL =
-      "enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@all.goerli.ethdisco.net";
-  public static final String MAINNET_DISCOVERY_URL =
-      "enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@all.mainnet.ethdisco.net";
-  public static final String RINKEBY_DISCOVERY_URL =
-      "enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@all.rinkeby.ethdisco.net";
-  public static final String ROPSTEN_DISCOVERY_URL =
-      "enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@all.ropsten.ethdisco.net";
-
-  public static final List<EnodeURL> MAINNET_BOOTSTRAP_NODES =
-      Collections.unmodifiableList(
-          Stream.of(
-                  // Ethereum Foundation Bootnodes
-                  "enode://d860a01f9722d78051619d1e2351aba3f43f943f6f00718d1b9baa4101932a1f5011f16bb2b1bb35db20d6fe28fa0bf09636d26a87d31de9ec6203eeedb1f666@18.138.108.67:30303", // Singapore AWS
-                  "enode://22a8232c3abc76a16ae9d6c3b164f98775fe226f0917b0ca871128a74a8e9630b458460865bab457221f1d448dd9791d24c4e5d88786180ac185df813a68d4de@3.209.45.79:30303", // Virginia AWS
-                  "enode://ca6de62fce278f96aea6ec5a2daadb877e51651247cb96ee310a318def462913b653963c155a0ef6c7d50048bba6e6cea881130857413d9f50a621546b590758@34.255.23.113:30303", // Ireland AWS
-                  "enode://279944d8dcd428dffaa7436f25ca0ca43ae19e7bcf94a8fb7d1641651f92d121e972ac2e8f381414b80cc8e5555811c2ec6e1a99bb009b3f53c4c69923e11bd8@35.158.244.151:30303", // Frankfurt AWS
-                  "enode://8499da03c47d637b20eee24eec3c356c9a2e6148d6fe25ca195c7949ab8ec2c03e3556126b0d7ed644675e78c4318b08691b7b57de10e5f0d40d05b09238fa0a@52.187.207.27:30303", // Australia Azure
-                  "enode://103858bdb88756c71f15e9b5e09b56dc1be52f0a5021d46301dbbfb7e130029cc9d0d6f73f693bc29b665770fff7da4d34f3c6379fe12721b5d7a0bcb5ca1fc1@191.234.162.198:30303", // Brazil Azure
-                  "enode://715171f50508aba88aecd1250af392a45a330af91d7b90701c436b618c86aaa1589c9184561907bebbb56439b8f8787bc01f49a7c77276c58c1b09822d75e8e8@52.231.165.108:30303", // South Korea Azure
-                  "enode://5d6d7cd20d6da4bb83a1d28cadb5d409b64edf314c0335df658c1a54e32c7c4a7ab7823d57c39b6a757556e68ff1df17c748b698544a55cb488b52479a92b60f@104.42.217.25:30303", // West US Azure
-
-                  // Old Ethereum Foundation Bootnodes
-                  "enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@52.16.188.185:30303", // IE
-                  "enode://3f1d12044546b76342d59d4a05532c14b85aa669704bfe1f864fe079415aa2c02d743e03218e57a33fb94523adb54032871a6c51b2cc5514cb7c7e35b3ed0a99@13.93.211.84:30303", // US-WEST
-                  "enode://78de8a0916848093c73790ead81d1928bec737d565119932b98c6b100d944b7a95e94f847f689fc723399d2e31129d182f7ef3863f2b4c820abbf3ab2722344d@191.235.84.50:30303", // BR
-                  "enode://158f8aab45f6d19c6cbf4a089c2670541a8da11978a2f90dbf6a502a4a3bab80d288afdbeb7ec0ef6d92de563767f3b1ea9e8e334ca711e9f8e2df5a0385e8e6@13.75.154.138:30303", // AU
-                  "enode://1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082@52.74.57.123:30303", // SG
-
-                  // Ethereum Foundation Aleth Bootnodes
-                  "enode://979b7fa28feeb35a4741660a16076f1943202cb72b6af70d327f053e248bab9ba81760f39d0701ef1d8f89cc1fbd2cacba0710a12cd5314d5e0c9021aa3637f9@5.1.83.226:30303" // DE
-                  )
-              .map(EnodeURL::fromString)
-              .collect(toList()));
-  public static final List<EnodeURL> RINKEBY_BOOTSTRAP_NODES =
-      Collections.unmodifiableList(
-          Stream.of(
-                  "enode://a24ac7c5484ef4ed0c5eb2d36620ba4e4aa13b8c84684e1b4aab0cebea2ae45cb4d375b77eab56516d34bfbd3c1a833fc51296ff084b770b94fb9028c4d25ccf@52.169.42.101:30303",
-                  "enode://343149e4feefa15d882d9fe4ac7d88f885bd05ebb735e547f12e12080a9fa07c8014ca6fd7f373123488102fe5e34111f8509cf0b7de3f5b44339c9f25e87cb8@52.3.158.184:30303",
-                  "enode://b6b28890b006743680c52e64e0d16db57f28124885595fa03a562be1d2bf0f3a1da297d56b13da25fb992888fd556d4c1a27b1f39d531bde7de1921c90061cc6@159.89.28.211:30303")
-              .map(EnodeURL::fromString)
-              .collect(toList()));
-  public static final List<EnodeURL> ROPSTEN_BOOTSTRAP_NODES =
-      Collections.unmodifiableList(
-          Stream.of(
-                  "enode://6332792c4a00e3e4ee0926ed89e0d27ef985424d97b6a45bf0f23e51f0dcb5e66b875777506458aea7af6f9e4ffb69f43f3778ee73c81ed9d34c51c4b16b0b0f@52.232.243.152:30303",
-                  "enode://94c15d1b9e2fe7ce56e458b9a3b672ef11894ddedd0c6f247e0f1d3487f52b66208fb4aeb8179fce6e3a749ea93ed147c37976d67af557508d199d9594c35f09@192.81.208.223:30303",
-                  "enode://30b7ab30a01c124a6cceca36863ece12c4f5fa68e3ba9b0b51407ccc002eeed3b3102d20a88f1c1d3c3154e2449317b8ef95090e77b312d5cc39354f86d5d606@52.176.7.10:30303",
-                  "enode://865a63255b3bb68023b6bffd5095118fcc13e79dcf014fe4e47e065c350c7cc72af2e53eff895f11ba1bbb6a2b33271c1116ee870f266618eadfc2e78aa7349c@52.176.100.77:30303")
-              .map(EnodeURL::fromString)
-              .collect(toList()));
-
-  public static final List<EnodeURL> GOERLI_BOOTSTRAP_NODES =
-      Collections.unmodifiableList(
-          Stream.of(
-                  "enode://011f758e6552d105183b1761c5e2dea0111bc20fd5f6422bc7f91e0fabbec9a6595caf6239b37feb773dddd3f87240d99d859431891e4a642cf2a0a9e6cbb98a@51.141.78.53:30303",
-                  "enode://176b9417f511d05b6b2cf3e34b756cf0a7096b3094572a8f6ef4cdcb9d1f9d00683bf0f83347eebdf3b81c3521c2332086d9592802230bf528eaf606a1d9677b@13.93.54.137:30303",
-                  "enode://46add44b9f13965f7b9875ac6b85f016f341012d84f975377573800a863526f4da19ae2c620ec73d11591fa9510e992ecc03ad0751f53cc02f7c7ed6d55c7291@94.237.54.114:30313",
-                  "enode://b5948a2d3e9d486c4d75bf32713221c2bd6cf86463302339299bd227dc2e276cd5a1c7ca4f43a0e9122fe9af884efed563bd2a1fd28661f3b5f5ad7bf1de5949@18.218.250.66:30303",
-
-                  // Ethereum Foundation bootnode
-                  "enode://a61215641fb8714a373c80edbfa0ea8878243193f57c96eeb44d0bc019ef295abd4e044fd619bfc4c59731a73fb79afe84e9ab6da0c743ceb479cbb6d263fa91@3.11.147.67:30303",
-
-                  // Goerli Initiative bootnodes
-                  "enode://a869b02cec167211fb4815a82941db2e7ed2936fd90e78619c53eb17753fcf0207463e3419c264e2a1dd8786de0df7e68cf99571ab8aeb7c4e51367ef186b1dd@51.15.116.226:30303", // @q9f Kaveh
-                  "enode://807b37ee4816ecf407e9112224494b74dd5933625f655962d892f2f0f02d7fbbb3e2a94cf87a96609526f30c998fd71e93e2f53015c558ffc8b03eceaf30ee33@51.15.119.157:30303", // @q9f Uklun
-                  "enode://a59e33ccd2b3e52d578f1fbd70c6f9babda2650f0760d6ff3b37742fdcdfdb3defba5d56d315b40c46b70198c7621e63ffa3f987389c7118634b0fefbbdfa7fd@51.15.119.157:40303" // @q9f Uklun
-                  )
-              .map(EnodeURL::fromString)
-              .collect(toList()));
-
-  public static final List<EnodeURL> CLASSIC_BOOTSTRAP_NODES =
-      Collections.unmodifiableList(
-          Stream.of(
-                  "enode://158ac5a4817265d0d8b977660b3dbe9abee5694ed212f7091cbf784ddf47623ed015e1cb54594d10c1c46118747ddabe86ebf569cf24ae91f2daa0f1adaae390@159.203.56.33:30303",
-                  "enode://efd48ad0879eeb7f9cb5e50f33f7bc21e805a72e90361f145baaa22dd75d111e7cd9c93f1b7060dcb30aa1b3e620269336dbf32339fea4c18925a4c15fe642df@18.205.66.229:30303",
-                  "enode://5fbfb426fbb46f8b8c1bd3dd140f5b511da558cd37d60844b525909ab82e13a25ee722293c829e52cb65c2305b1637fa9a2ea4d6634a224d5f400bfe244ac0de@162.243.55.45:30303",
-                  "enode://6dd3ac8147fa82e46837ec8c3223d69ac24bcdbab04b036a3705c14f3a02e968f7f1adfcdb002aacec2db46e625c04bf8b5a1f85bb2d40a479b3cc9d45a444af@104.237.131.102:30303",
-                  "enode://b9e893ea9cb4537f4fed154233005ae61b441cd0ecd980136138c304fefac194c25a16b73dac05fc66a4198d0c15dd0f33af99b411882c68a019dfa6bb703b9d@18.130.93.66:30303",
-                  "enode://3fe9705a02487baea45c1ffebfa4d84819f5f1e68a0dbc18031553242a6a08e39499b61e361a52c2a92f9553efd63763f6fdd34692be0d4ba6823bb2fc346009@178.62.238.75:30303",
-                  "enode://d50facc65e46bda6ff594b6e95491efa16e067de41ae96571d9f3cb853d538c44864496fa5e4df10115f02bbbaf47853f932e110a44c89227da7c30e96840596@188.166.163.187:30303",
-                  "enode://a0d5c589dc02d008fe4237da9877a5f1daedee0227ab612677eabe323520f003eb5e311af335de9f7964c2092bbc2b3b7ab1cce5a074d8346959f0868b4e366e@46.101.78.44:30303",
-                  "enode://c071d96b0c0f13006feae3977fb1b3c2f62caedf643df9a3655bc1b60f777f05e69a4e58bf3547bb299210092764c56df1e08380e91265baa845dca8bc0a71da@68.183.99.5:30303",
-                  "enode://83b33409349ffa25e150555f7b4f8deebc68f3d34d782129dc3c8ba07b880c209310a4191e1725f2f6bef59bce9452d821111eaa786deab08a7e6551fca41f4f@206.189.68.191:30303",
-                  "enode://0daae2a30f2c73b0b257746587136efb8e3479496f7ea1e943eeb9a663b72dd04582f699f7010ee02c57fc45d1f09568c20a9050ff937f9139e2973ddd98b87b@159.89.169.103:30303",
-                  "enode://50808461dd73b3d70537e4c1e5fafd1132b3a90f998399af9205f8889987d62096d4e853813562dd43e7270a71c9d9d4e4dd73a534fdb22fbac98c389c1a7362@178.128.55.119:30303",
-                  "enode://5cd218959f8263bc3721d7789070806b0adff1a0ed3f95ec886fb469f9362c7507e3b32b256550b9a7964a23a938e8d42d45a0c34b332bfebc54b29081e83b93@35.187.57.94:30303",
-                  "enode://66498ac935f3f54d873de4719bf2d6d61e0c74dd173b547531325bcef331480f9bedece91099810971c8567eeb1ae9f6954b013c47c6dc51355bbbbae65a8c16@54.148.165.1:30303",
-                  "enode://73e74ce7426a17aa2d8b5bb64d796ec7dc4dcee2af9bbdd4434394d1e4e52e650b9e39202435fca29ce65c242fd6e59b93ed2cf37f04b645fb23e306273816ad@54.148.165.1:30304",
-                  "enode://8809dadb6e6145bbbce832f8e3cb54f23c84db1c4957dac04be26157a16eceb91bb2567e3a2eb794bf8e7df937fd2de46d4214416d3c199f05d3b6fa76a5ef6d@51.141.115.3:30303",
-                  "enode://942bf2f0754972391467765be1d98206926fc8ad0be8a49cd65e1730420c37fa63355bddb0ae5faa1d3505a2edcf8fad1cf00f3c179e244f047ec3a3ba5dacd7@176.9.51.216:30355", // @q9f Ceibo
-                  "enode://0b0e09d6756b672ac6a8b70895da4fb25090b939578935d4a897497ffaa205e019e068e1ae24ac10d52fa9b8ddb82840d5d990534201a4ad859ee12cb5c91e82@176.9.51.216:30365" // @q9f Ceibo
-                  )
-              .map(EnodeURL::fromString)
-              .collect(toList()));
-
-  public static final List<EnodeURL> KOTTI_BOOTSTRAP_NODES =
-      Collections.unmodifiableList(
-          Stream.of(
-                  // Authority Nodes
-                  "enode://a59e33ccd2b3e52d578f1fbd70c6f9babda2650f0760d6ff3b37742fdcdfdb3defba5d56d315b40c46b70198c7621e63ffa3f987389c7118634b0fefbbdfa7fd@51.158.191.43:37956", // @q9f Mizar
-                  "enode://93c94e999be5dd854c5d82a7cf5c14822973b5d9badb56ad4974586ec4d4f1995c815af795c20bb6e0a6226d3ee55808435c4dc89baf94ee581141b064d19dfc@80.187.116.161:25720",
-                  "enode://ae8658da8d255d1992c3ec6e62e11d6e1c5899aa1566504bc1ff96a0c9c8bd44838372be643342553817f5cc7d78f1c83a8093dee13d77b3b0a583c050c81940@18.232.185.151:30303",
-                  "enode://b477ca6d507a3f57070783eb62ba838847635f8b1a0cbffb8b7f8173f5894cf550f0225a5c279341e2d862a606e778b57180a4f1db3db78c51eadcfa4fdc6963@40.68.240.160:30303",
-
-                  // @q9f Bootnodes
-                  "enode://4956f6924335c951cb70cbc169a85c081f6ff0b374aa2815453b8a3132b49613f38a1a6b8e103f878dbec86364f60091e92a376d7cd3aca9d82d2f2554794e63@51.15.97.240:41235", // @q9f Ginan
-                  "enode://6c9a052c01bb9995fa53bebfcdbc17733fe90708270d0e6d8e38dc57b32e1dbe8c287590b634ee9753b94ba302f411c96519c7fa07df0df6a6848149d819b2c5@51.15.70.7:41235", // @q9f Polis
-                  "enode://95a7302fd8f35d9ad716a591b90dfe839dbf2d3d6a6737ef39e07899f844ad82f1659dd6212492922dd36705fb0a1e984c1d5d5c42069d5bd329388831e820c1@51.15.97.240:45678", // @q9f Ginan
-                  "enode://8c5c4dec9a0728c7058d3c29698bae888adc244e443cebc21f3d708a20751511acbf98a52b5e5ea472f8715c658913e8084123461fd187a4980a0600420b0791@51.15.70.7:45678", // @q9f Polis
-                  "enode://efd7391a3bed73ad74ae5760319bb48f9c9f1983ff22964422688cdb426c5d681004ece26c47121396653cf9bafe7104aa4ecff70e24cc5b11fd76be8e5afce0@51.158.191.43:45678", // @q9f Mizar
-                  "enode://93b12383c74c39b67afa99a7ff44ce250fe94295fa1fc087465cc4fe2d0b33b91a8d8cabe03b250104a9096aa0e06bcde5f95665a5bd9f890edd2ab33e16ae47@51.15.41.19:30303" // @q9f Zibal
-                  )
-              .map(EnodeURL::fromString)
-              .collect(toList()));
-
-  public static final List<EnodeURL> MORDOR_BOOTSTRAP_NODES =
-      Collections.unmodifiableList(
-          Stream.of(
-                  "enode://642cf9650dd8869d42525dbf6858012e3b4d64f475e733847ab6f7742341a4397414865d953874e8f5ed91b0e4e1c533dee14ad1d6bb276a5459b2471460ff0d@157.230.152.87:30303", // @meowbits Mordor
-                  "enode://651b484b652c07c72adebfaaf8bc2bd95b420b16952ef3de76a9c00ef63f07cca02a20bd2363426f9e6fe372cef96a42b0fec3c747d118f79fd5e02f2a4ebd4e@51.158.190.99:45678", // @q9f Lyrae
-                  "enode://859ed8c19ea04eaea41f1cf17c8d2710e2e0affb97328c8392a79f1764118edf2344f1941299f0d676772fa6054447e6f9b3af96444e350b417442bfd7cc832b@34.68.243.226:30303",
-                  "enode://9b1bf9613d859ac2071d88509ab40a111b75c1cfc51f4ad78a1fdbb429ff2405de0dc5ea8ae75e6ac88e03e51a465f0b27b517e78517f7220ae163a2e0692991@51.158.190.99:30426", // @q9f Lyrae
-                  "enode://534d18fd46c5cd5ba48a68250c47cea27a1376869755ed631c94b91386328039eb607cf10dd8d0aa173f5ec21e3fb45c5d7a7aa904f97bc2557e9cb4ccc703f1@51.158.190.99:30303", // @q9f Lyrae
-                  "enode://0d70715514674189792de4ad294b658c96d0ec40fe517fbe9cb7949d3792f25f82357ec77d1bd8bed6ec719ca0c1d608bb34cc702bf3d4bb4507f7280f835452@154.5.137.161:61410",
-                  "enode://f50f52b5fe18fd281748905bf5dad5439471f32cc02d99fecf960a983c1f4eba701ffca96afd2f2a68dcf6f97c5d02b566bafce1f361b51717e1a03c1dd9a836@157.230.42.102:30303",
-                  "enode://111bd28d5b2c1378d748383fd83ff59572967c317c3063a9f475a26ad3f1517642a164338fb5268d4e32ea1cc48e663bd627dec572f1d201c7198518e5a506b1@88.99.216.30:45834",
-                  "enode://07fa944c83597d5e935a2abe6194ed40fc7239e86111c971a43537a33d0184d1cd1b3f1291b8dd3bcfaebfbb802de77c843465a00065b39120c338fdd877ca4a@35.238.126.60:51240",
-                  "enode://4ca79bbff7491fed82221259e3f27492e27b95b600594e2f8d5f1fa011123ea267e71873a0db3993e5109845d519d8b849ba2c7e4b48b09bedebb99e1c2ce304@35.238.132.8:30303",
-                  "enode://06fdbeb591d26f53b2e7250025fe955ca013431ded930920cf1e3cd1f0c920e9a5e727949d209bc25a07288327b525279b11c5551315c50ff0db483e69fc159b@34.218.225.178:32000",
-                  "enode://03b133f731049e3f7be827339c3759be92778c05e54a1847d178c0fdb56fa168aa1e7e61fc77791a7afdd0328a00318f73c01212eb3f3bbe919f5ce8f5b4a314@192.227.105.4:32000",
-                  "enode://2592745efd35b4be443b8ee25fd2099de132e037951f9f6d3e8805e0a78f213537f71264b973f1a83a57372f57bbe6acac8d6ae678f39393221c045ccbe3b18c@51.15.116.226:30304",
-                  "enode://c0afb552bfe932c72598caa245aef82d55c23555622c5ab946d4e49bb0ab694e46086dcff6793a606527f323ef94d0eb499d01ceb26aefb6fa3f8977105d7dd8@157.230.152.87:52138",
-                  "enode://5a1399e6ba3268721dd7656530cd81230dbeb950570c6e3ec2a45effc50c032f66633c5eaaa1a49c51ba1849db37a7bef6e402779ad12dc9943f117e058d7760@35.225.124.17:39306",
-                  "enode://15b6ae4e9e18772f297c90d83645b0fbdb56667ce2d747d6d575b21d7b60c2d3cd52b11dec24e418438caf80ddc433232b3685320ed5d0e768e3972596385bfc@51.158.191.43:41235", // @q9f Mizar
-                  "enode://5a1399e6ba3268721dd7656530cd81230dbeb950570c6e3ec2a45effc50c032f66633c5eaaa1a49c51ba1849db37a7bef6e402779ad12dc9943f117e058d7760@34.69.121.227:30303",
-                  "enode://f840b007500f50c98ea6f9c9e56dabf4690bbbbb7036d43682c531204341aff8315013547e5bee54117eb22bd3603585ae6bf713d9fa710659533fcab65d5b84@34.69.50.155:42078",
-                  "enode://b45f008ab8ad73966d0c8c0c923c50f47c0ae50c37a9ea05cc28b00cb94802145a4158412a526fdadd7e539db5eaab72f06a9046a34576ecf5a68efc41ba9d01@34.68.40.145:30303",
-                  "enode://1f378945c9b2eeb292d910f461911fd99520a23beda1bc5c8aea12be09e249f8d92615aa3d4d75c938004db5281dabad4a9cf7a0f07ec7c1fc8e7721addc7c85@34.205.41.164:40218",
-                  "enode://2b69a3926f36a7748c9021c34050be5e0b64346225e477fe7377070f6289bd363b2be73a06010fd516e6ea3ee90778dd0399bc007bb1281923a79374f842675a@51.15.116.226:30303",
-                  "enode://a59e33ccd2b3e52d578f1fbd70c6f9babda2650f0760d6ff3b37742fdcdfdb3defba5d56d315b40c46b70198c7621e63ffa3f987389c7118634b0fefbbdfa7fd@51.158.191.43:38556", // @q9f Mizar
-                  "enode://f840b007500f50c98ea6f9c9e56dabf4690bbbbb7036d43682c531204341aff8315013547e5bee54117eb22bd3603585ae6bf713d9fa710659533fcab65d5b84@35.238.101.58:30303",
-                  "enode://07fa944c83597d5e935a2abe6194ed40fc7239e86111c971a43537a33d0184d1cd1b3f1291b8dd3bcfaebfbb802de77c843465a00065b39120c338fdd877ca4a@35.238.126.60:30000",
-                  "enode://617a2009783a09085ed0d5d5e7250e2e3c142f73448bf28200284bf4825c5926a80f3e9fb481edf38b89ade2aa0ad5a2f14cc935f3150e36e648eddda674fd70@35.225.5.185:51320",
-                  "enode://64897cb66fb209548b333467d701e5d205188023d3779411eb2032fd74315723d9bd6e002a7121214fdb68b09173d383d24f92134380fa6f1d2a193030acba1d@91.203.110.229:30303", // @q9f Dubhe
-                  "enode://8fa15f5012ac3c47619147220b7772fcc5db0cb7fd132b5d196e7ccacb166ac1fcf83be1dace6cd288e288a85e032423b6e7e9e57f479fe7373edea045caa56b@176.9.51.216:31355", // @q9f Ceibo
-                  "enode://34c14141b79652afc334dcd2ba4d8047946246b2310dc8e45737ebe3e6f15f9279ca4702b90bc5be12929f6194e2c3ce19a837b7fec7ebffcee9e9fe4693b504@176.9.51.216:31365" // @q9f Ceibo
-                  )
-              .map(EnodeURL::fromString)
-              .collect(toList()));
-
-  public static final List<EnodeURL> YOLO_V2_BOOTSTRAP_NODES =
-      Collections.unmodifiableList(
-          Stream.<String>of(
-                  "enode://9e1096aa59862a6f164994cb5cb16f5124d6c992cdbf4535ff7dea43ea1512afe5448dca9df1b7ab0726129603f1a3336b631e4d7a1a44c94daddd03241587f9@3.9.20.133:30303")
-              .map(EnodeURL::fromString)
-              .collect(toList()));
 
   private boolean active = true;
   private String bindHost = NetworkUtility.INADDR_ANY;
@@ -192,6 +31,8 @@ public class DiscoveryConfiguration {
   private int bucketSize = 16;
   private List<EnodeURL> bootnodes = new ArrayList<>();
   private String dnsDiscoveryURL;
+  private boolean discoveryV5Enabled = false;
+  private boolean filterOnEnrForkId = false;
 
   public static DiscoveryConfiguration create() {
     return new DiscoveryConfiguration();
@@ -202,9 +43,9 @@ public static void assertValidBootnodes(final List<EnodeURL> bootnodes) {
         bootnodes.stream().filter(e -> !e.isRunningDiscovery()).collect(Collectors.toList());
 
     if (invalidEnodes.size() > 0) {
-      String invalidBootnodes =
+      final String invalidBootnodes =
           invalidEnodes.stream().map(EnodeURL::toString).collect(Collectors.joining(","));
-      String errorMsg =
+      final String errorMsg =
           "Bootnodes must have discovery enabled. Invalid bootnodes: " + invalidBootnodes + ".";
       throw new IllegalArgumentException(errorMsg);
     }
@@ -269,8 +110,25 @@ public String getDNSDiscoveryURL() {
     return dnsDiscoveryURL;
   }
 
-  public void setDnsDiscoveryURL(final String dnsDiscoveryURL) {
+  public DiscoveryConfiguration setDnsDiscoveryURL(final String dnsDiscoveryURL) {
     this.dnsDiscoveryURL = dnsDiscoveryURL;
+    return this;
+  }
+
+  public void setDiscoveryV5Enabled(final boolean discoveryV5Enabled) {
+    this.discoveryV5Enabled = discoveryV5Enabled;
+  }
+
+  public boolean isDiscoveryV5Enabled() {
+    return discoveryV5Enabled;
+  }
+
+  public void setFilterOnEnrForkId(final boolean filterOnEnrForkId) {
+    this.filterOnEnrForkId = filterOnEnrForkId;
+  }
+
+  public boolean isFilterOnEnrForkIdEnabled() {
+    return filterOnEnrForkId;
   }
 
   @Override
@@ -316,6 +174,10 @@ public String toString() {
         + bootnodes
         + ", dnsDiscoveryURL="
         + dnsDiscoveryURL
+        + ", isDiscoveryV5Enabled="
+        + discoveryV5Enabled
+        + ", isFilterOnEnrForkIdEnabled="
+        + filterOnEnrForkId
         + '}';
   }
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/NetworkingConfiguration.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/NetworkingConfiguration.java
index 0f1cbc60214..0de53cfd786 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/NetworkingConfiguration.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/NetworkingConfiguration.java
@@ -17,16 +17,20 @@
 import static com.google.common.base.Preconditions.checkArgument;
 
 import java.util.Objects;
+import java.util.Optional;
 
 public class NetworkingConfiguration {
   public static final int DEFAULT_INITIATE_CONNECTIONS_FREQUENCY_SEC = 30;
-  public static final int DEFAULT_CHECK_MAINTAINED_CONNECTSION_FREQUENCY_SEC = 60;
+  public static final int DEFAULT_CHECK_MAINTAINED_CONNECTIONS_FREQUENCY_SEC = 60;
+  public static final int DEFAULT_PEER_LOWER_BOUND = 25;
 
   private DiscoveryConfiguration discovery = new DiscoveryConfiguration();
   private RlpxConfiguration rlpx = new RlpxConfiguration();
   private int initiateConnectionsFrequencySec = DEFAULT_INITIATE_CONNECTIONS_FREQUENCY_SEC;
   private int checkMaintainedConnectionsFrequencySec =
-      DEFAULT_CHECK_MAINTAINED_CONNECTSION_FREQUENCY_SEC;
+      DEFAULT_CHECK_MAINTAINED_CONNECTIONS_FREQUENCY_SEC;
+  private Integer peerLowerBound = DEFAULT_PEER_LOWER_BOUND;
+  private Optional<String> dnsDiscoveryServerOverride = Optional.empty();
 
   public static NetworkingConfiguration create() {
     return new NetworkingConfiguration();
@@ -65,6 +69,16 @@ public int getCheckMaintainedConnectionsFrequencySec() {
     return checkMaintainedConnectionsFrequencySec;
   }
 
+  public NetworkingConfiguration setDnsDiscoveryServerOverride(
+      final Optional<String> dnsDiscoveryServerOverride) {
+    this.dnsDiscoveryServerOverride = dnsDiscoveryServerOverride;
+    return this;
+  }
+
+  public Optional<String> getDnsDiscoveryServerOverride() {
+    return dnsDiscoveryServerOverride;
+  }
+
   public NetworkingConfiguration setCheckMaintainedConnectionsFrequency(
       final int checkMaintainedConnectionsFrequency) {
     checkArgument(checkMaintainedConnectionsFrequency > 0);
@@ -72,6 +86,16 @@ public NetworkingConfiguration setCheckMaintainedConnectionsFrequency(
     return this;
   }
 
+  public Integer getPeerLowerBound() {
+    return peerLowerBound;
+  }
+
+  public NetworkingConfiguration setPeerLowerBound(final Integer peerLowerBoundConfig) {
+    checkArgument(peerLowerBoundConfig > 0);
+    this.peerLowerBound = peerLowerBoundConfig;
+    return this;
+  }
+
   @Override
   public boolean equals(final Object o) {
     if (o == this) {
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/RlpxConfiguration.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/RlpxConfiguration.java
index 62e7ca96a75..3968971f869 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/RlpxConfiguration.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/config/RlpxConfiguration.java
@@ -14,8 +14,6 @@
  */
 package org.hyperledger.besu.ethereum.p2p.config;
 
-import static com.google.common.base.Preconditions.checkState;
-
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol;
 import org.hyperledger.besu.util.NetworkUtility;
 
@@ -29,9 +27,6 @@ public class RlpxConfiguration {
   private String clientId = "TestClient/1.0.0";
   private String bindHost = NetworkUtility.INADDR_ANY;
   private int bindPort = 30303;
-  private int maxPeers = 25;
-  private boolean limitRemoteWireConnectionsEnabled = false;
-  private float fractionRemoteWireConnectionsAllowed = DEFAULT_FRACTION_REMOTE_CONNECTIONS_ALLOWED;
   private List<SubProtocol> supportedProtocols = Collections.emptyList();
 
   public static RlpxConfiguration create() {
@@ -70,15 +65,6 @@ public RlpxConfiguration setBindPort(final int bindPort) {
     return this;
   }
 
-  public RlpxConfiguration setMaxPeers(final int peers) {
-    maxPeers = peers;
-    return this;
-  }
-
-  public int getMaxPeers() {
-    return maxPeers;
-  }
-
   public String getClientId() {
     return clientId;
   }
@@ -88,29 +74,6 @@ public RlpxConfiguration setClientId(final String clientId) {
     return this;
   }
 
-  public RlpxConfiguration setLimitRemoteWireConnectionsEnabled(
-      final boolean limitRemoteWireConnectionsEnabled) {
-    this.limitRemoteWireConnectionsEnabled = limitRemoteWireConnectionsEnabled;
-    return this;
-  }
-
-  public RlpxConfiguration setFractionRemoteWireConnectionsAllowed(
-      final float fractionRemoteWireConnectionsAllowed) {
-    checkState(
-        fractionRemoteWireConnectionsAllowed >= 0.0 && fractionRemoteWireConnectionsAllowed <= 1.0,
-        "Fraction of remote connections allowed must be between 0.0 and 1.0 (inclusive).");
-    this.fractionRemoteWireConnectionsAllowed = fractionRemoteWireConnectionsAllowed;
-    return this;
-  }
-
-  public int getMaxRemotelyInitiatedConnections() {
-    if (!limitRemoteWireConnectionsEnabled) {
-      return maxPeers;
-    }
-
-    return (int) Math.floor(maxPeers * fractionRemoteWireConnectionsAllowed);
-  }
-
   @Override
   public boolean equals(final Object o) {
     if (this == o) {
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/DiscoveryPeer.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/DiscoveryPeer.java
index bc264f45182..9b5981b4978 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/DiscoveryPeer.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/DiscoveryPeer.java
@@ -14,19 +14,22 @@
  */
 package org.hyperledger.besu.ethereum.p2p.discovery;
 
+import org.hyperledger.besu.ethereum.forkid.ForkId;
 import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.peers.PeerId;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
+import org.ethereum.beacon.discovery.schema.NodeRecord;
 
 /**
- * Represents an Ethereum node that we interacting with through the discovery and wire protocols.
+ * Represents an Ethereum node that we are interacting with through the discovery and wire
+ * protocols.
  */
 public class DiscoveryPeer extends DefaultPeer {
   private PeerDiscoveryStatus status = PeerDiscoveryStatus.KNOWN;
@@ -39,6 +42,9 @@ public class DiscoveryPeer extends DefaultPeer {
   private long lastSeen = 0;
   private long lastAttemptedConnection = 0;
 
+  private NodeRecord nodeRecord;
+  private Optional<ForkId> forkId = Optional.empty();
+
   private DiscoveryPeer(final EnodeURL enode, final Endpoint endpoint) {
     super(enode);
     this.endpoint = endpoint;
@@ -126,6 +132,26 @@ public Endpoint getEndpoint() {
     return endpoint;
   }
 
+  @Override
+  public Optional<NodeRecord> getNodeRecord() {
+    return Optional.ofNullable(nodeRecord);
+  }
+
+  public void setNodeRecord(final NodeRecord nodeRecord) {
+    this.nodeRecord = nodeRecord;
+    this.forkId = ForkId.fromRawForkId(nodeRecord.get("eth"));
+  }
+
+  @Override
+  public Optional<ForkId> getForkId() {
+    return this.forkId;
+  }
+
+  @Override
+  public void setForkId(final ForkId forkId) {
+    this.forkId = Optional.ofNullable(forkId);
+  }
+
   public boolean discoveryEndpointMatches(final DiscoveryPeer peer) {
     return peer.getEndpoint().getHost().equals(endpoint.getHost())
         && peer.getEndpoint().getUdpPort() == endpoint.getUdpPort();
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/Endpoint.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/Endpoint.java
index ebc123b7911..41cec4ac5f3 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/Endpoint.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/Endpoint.java
@@ -14,13 +14,13 @@
  */
 package org.hyperledger.besu.ethereum.p2p.discovery;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static org.hyperledger.besu.util.NetworkUtility.checkPort;
 import static org.hyperledger.besu.util.Preconditions.checkGuard;
 
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.util.IllegalPortException;
 
 import java.net.InetAddress;
@@ -35,17 +35,15 @@
  * used in various Discovery messages.
  */
 public class Endpoint {
-  private final String host;
+  private final Optional<String> host;
   private final int udpPort;
   private final Optional<Integer> tcpPort;
 
   public Endpoint(final String host, final int udpPort, final Optional<Integer> tcpPort) {
-    checkArgument(
-        host != null && InetAddresses.isInetAddress(host), "host requires a valid IP address");
     checkPort(udpPort, "UDP");
     tcpPort.ifPresent(port -> checkPort(port, "TCP"));
 
-    this.host = host;
+    this.host = Optional.ofNullable(host);
     this.udpPort = udpPort;
     this.tcpPort = tcpPort;
   }
@@ -63,16 +61,16 @@ public static Endpoint fromEnode(final EnodeURL enode) {
   }
 
   public EnodeURL toEnode(final Bytes nodeId) {
-    return EnodeURL.builder()
+    return EnodeURLImpl.builder()
         .nodeId(nodeId)
-        .ipAddress(host)
+        .ipAddress(host.orElse(""))
         .listeningPort(tcpPort.orElse(udpPort))
         .discoveryPort(udpPort)
         .build();
   }
 
   public String getHost() {
-    return host;
+    return host.orElse("");
   }
 
   public int getUdpPort() {
@@ -143,7 +141,16 @@ public void encodeStandalone(final RLPOutput out) {
    * @param out The RLP output stream.
    */
   public void encodeInline(final RLPOutput out) {
-    out.writeInetAddress(InetAddresses.forString(host));
+    if (host.isPresent()) {
+      InetAddress hostAddress = InetAddresses.forString(host.get());
+      if (hostAddress != null) {
+        out.writeInetAddress(hostAddress);
+      } else { // present, but not a parseable IP address
+        out.writeNull();
+      }
+    } else {
+      out.writeNull();
+    }
     out.writeIntScalar(udpPort);
     tcpPort.ifPresentOrElse(out::writeIntScalar, out::writeNull);
   }
@@ -163,7 +170,13 @@ public static Endpoint decodeInline(final RLPInput in, final int fieldCount) {
         "Invalid number of components in RLP representation of an endpoint: expected 2 or 3 elements but got %s",
         fieldCount);
 
-    final InetAddress addr = in.readInetAddress();
+    String hostAddress = null;
+    if (!in.nextIsNull()) {
+      InetAddress addr = in.readInetAddress();
+      hostAddress = addr.getHostAddress();
+    } else {
+      in.skipNext();
+    }
     final int udpPort = in.readIntScalar();
 
     // Some mainnet packets have been shown to either not have the TCP port field at all,
@@ -176,7 +189,7 @@ public static Endpoint decodeInline(final RLPInput in, final int fieldCount) {
         tcpPort = Optional.of(in.readIntScalar());
       }
     }
-    return new Endpoint(addr.getHostAddress(), udpPort, tcpPort);
+    return new Endpoint(hostAddress, udpPort, tcpPort);
   }
 
   /**
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerBondedObserver.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerBondedObserver.java
deleted file mode 100644
index 07b62b7944b..00000000000
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerBondedObserver.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.p2p.discovery;
-
-import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryEvent.PeerBondedEvent;
-
-@FunctionalInterface
-public interface PeerBondedObserver {
-  void onPeerBonded(PeerBondedEvent peerBondedEvent);
-}
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryAgent.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryAgent.java
index 072d70d6878..8af596018a1 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryAgent.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryAgent.java
@@ -15,59 +15,60 @@
 package org.hyperledger.besu.ethereum.p2p.discovery;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.tuweni.bytes.Bytes.wrapBuffer;
 
-import org.hyperledger.besu.crypto.NodeKey;
+import org.hyperledger.besu.crypto.Hash;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.ethereum.chain.VariablesStorage;
+import org.hyperledger.besu.ethereum.forkid.ForkIdManager;
 import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.Packet;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerDiscoveryController;
-import org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerDiscoveryController.AsyncExecutor;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerRequirement;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.PingPacketData;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.TimerUtil;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.peers.PeerId;
 import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions;
+import org.hyperledger.besu.ethereum.p2p.rlpx.RlpxAgent;
 import org.hyperledger.besu.ethereum.storage.StorageProvider;
-import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
 import org.hyperledger.besu.nat.NatService;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
-import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
-import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
 import org.hyperledger.besu.util.NetworkUtility;
-import org.hyperledger.besu.util.Subscribers;
 
 import java.net.InetSocketAddress;
-import java.net.SocketException;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Suppliers;
 import com.google.common.net.InetAddresses;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.units.bigints.UInt64;
 import org.ethereum.beacon.discovery.schema.EnrField;
 import org.ethereum.beacon.discovery.schema.IdentitySchema;
-import org.ethereum.beacon.discovery.schema.IdentitySchemaInterpreter;
 import org.ethereum.beacon.discovery.schema.NodeRecord;
 import org.ethereum.beacon.discovery.schema.NodeRecordFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The peer discovery agent is the network component that sends and receives peer discovery messages
  * via UDP.
  */
 public abstract class PeerDiscoveryAgent {
-  private static final Logger LOG = LogManager.getLogger();
-  private static final String SEQ_NO_STORE_KEY = "local-enr-seqno";
+  private static final Logger LOG = LoggerFactory.getLogger(PeerDiscoveryAgent.class);
+  private static final com.google.common.base.Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
 
   // The devp2p specification says only accept packets up to 1280, but some
   // clients ignore that, so we add in a little extra padding.
@@ -78,6 +79,9 @@ public abstract class PeerDiscoveryAgent {
   private final PeerPermissions peerPermissions;
   private final NatService natService;
   private final MetricsSystem metricsSystem;
+  private final RlpxAgent rlpxAgent;
+  private final ForkIdManager forkIdManager;
+
   /* The peer controller, which takes care of the state machine of peers. */
   protected Optional<PeerDiscoveryController> controller = Optional.empty();
 
@@ -93,9 +97,9 @@ public abstract class PeerDiscoveryAgent {
 
   /* Is discovery enabled? */
   private boolean isActive = false;
-  protected final Subscribers<PeerBondedObserver> peerBondedObservers = Subscribers.create();
-
-  private final StorageProvider storageProvider;
+  private final VariablesStorage variablesStorage;
+  private final Supplier<List<Bytes>> forkIdSupplier;
+  private String advertisedAddress;
 
   protected PeerDiscoveryAgent(
       final NodeKey nodeKey,
@@ -103,7 +107,9 @@ protected PeerDiscoveryAgent(
       final PeerPermissions peerPermissions,
       final NatService natService,
       final MetricsSystem metricsSystem,
-      final StorageProvider storageProvider) {
+      final StorageProvider storageProvider,
+      final ForkIdManager forkIdManager,
+      final RlpxAgent rlpxAgent) {
     this.metricsSystem = metricsSystem;
     checkArgument(nodeKey != null, "nodeKey cannot be null");
     checkArgument(config != null, "provided configuration cannot be null");
@@ -118,14 +124,17 @@ protected PeerDiscoveryAgent(
     this.config = config;
     this.nodeKey = nodeKey;
 
-    id = nodeKey.getPublicKey().getEncodedBytes();
+    this.id = nodeKey.getPublicKey().getEncodedBytes();
 
-    this.storageProvider = storageProvider;
+    this.variablesStorage = storageProvider.createVariablesStorage();
+    this.forkIdManager = forkIdManager;
+    this.forkIdSupplier = () -> forkIdManager.getForkIdForChainHead().getForkIdAsBytesList();
+    this.rlpxAgent = rlpxAgent;
   }
 
   protected abstract TimerUtil createTimer();
 
-  protected abstract AsyncExecutor createWorkerExecutor();
+  protected abstract PeerDiscoveryController.AsyncExecutor createWorkerExecutor();
 
   protected abstract CompletableFuture<InetSocketAddress> listenForConnections();
 
@@ -141,8 +150,7 @@ public CompletableFuture<Integer> start(final int tcpPort) {
       LOG.info("Starting peer discovery agent on host={}, port={}", host, port);
 
       // override advertised host if we detect an external IP address via NAT manager
-      final String advertisedAddress =
-          natService.queryExternalIPAddress(config.getAdvertisedHost());
+      this.advertisedAddress = natService.queryExternalIPAddress(config.getAdvertisedHost());
 
       return listenForConnections()
           .thenApply(
@@ -151,7 +159,7 @@ public CompletableFuture<Integer> start(final int tcpPort) {
                 final int discoveryPort = localAddress.getPort();
                 final DiscoveryPeer ourNode =
                     DiscoveryPeer.fromEnode(
-                        EnodeURL.builder()
+                        EnodeURLImpl.builder()
                             .nodeId(id)
                             .ipAddress(advertisedAddress)
                             .listeningPort(tcpPort)
@@ -160,8 +168,8 @@ public CompletableFuture<Integer> start(final int tcpPort) {
                 this.localNode = Optional.of(ourNode);
                 isActive = true;
                 LOG.info("P2P peer discovery agent started and listening on {}", localAddress);
+                updateNodeRecord();
                 startController(ourNode);
-                addLocalNodeRecord(id, advertisedAddress, tcpPort, discoveryPort);
                 return discoveryPort;
               });
     } else {
@@ -170,49 +178,74 @@ public CompletableFuture<Integer> start(final int tcpPort) {
     }
   }
 
-  private void addLocalNodeRecord(
-      final Bytes nodeId,
-      final String advertisedAddress,
-      final Integer tcpPort,
-      final Integer udpPort) {
-    final KeyValueStorage keyValueStorage =
-        storageProvider.getStorageBySegmentIdentifier(KeyValueSegmentIdentifier.BLOCKCHAIN);
-    final NodeRecordFactory nodeRecordFactory = new NodeRecordFactory(IdentitySchemaInterpreter.V4);
-    final Optional<NodeRecord> existingNodeRecord =
-        keyValueStorage
-            .get(Bytes.of(SEQ_NO_STORE_KEY.getBytes(UTF_8)).toArray())
-            .map(Bytes::of)
-            .flatMap(b -> Optional.of(nodeRecordFactory.fromBytes(b)));
-
-    final Bytes addressBytes = Bytes.of(advertisedAddress.getBytes(UTF_8));
-    if (existingNodeRecord.isEmpty()
-        || !existingNodeRecord.get().getNodeId().equals(nodeId)
-        || !addressBytes.equals(existingNodeRecord.get().get(EnrField.IP_V4))
-        || !tcpPort.equals(existingNodeRecord.get().get(EnrField.TCP))
-        || !udpPort.equals(existingNodeRecord.get().get(EnrField.UDP))) {
-      final UInt64 sequenceNumber =
-          existingNodeRecord.map(NodeRecord::getSeq).orElse(UInt64.ZERO).add(1);
-      final NodeRecord nodeRecord =
-          nodeRecordFactory.createFromValues(
-              sequenceNumber,
-              new EnrField(EnrField.ID, IdentitySchema.V4),
-              new EnrField(EnrField.PKEY_SECP256K1, nodeId),
-              new EnrField(EnrField.IP_V4, addressBytes),
-              new EnrField(EnrField.TCP, tcpPort),
-              new EnrField(EnrField.UDP, udpPort));
-
-      final KeyValueStorageTransaction keyValueStorageTransaction =
-          keyValueStorage.startTransaction();
-      keyValueStorageTransaction.put(
-          Bytes.wrap(SEQ_NO_STORE_KEY.getBytes(UTF_8)).toArray(), nodeRecord.serialize().toArray());
-      keyValueStorageTransaction.commit();
+  public void updateNodeRecord() {
+    if (!config.isActive()) {
+      return;
     }
+
+    final NodeRecordFactory nodeRecordFactory = NodeRecordFactory.DEFAULT;
+    final Optional<NodeRecord> existingNodeRecord =
+        variablesStorage.getLocalEnrSeqno().map(nodeRecordFactory::fromBytes);
+
+    final Bytes addressBytes = Bytes.of(InetAddresses.forString(advertisedAddress).getAddress());
+    final Optional<EnodeURL> maybeEnodeURL = localNode.map(DiscoveryPeer::getEnodeURL);
+    final Integer discoveryPort = maybeEnodeURL.flatMap(EnodeURL::getDiscoveryPort).orElse(0);
+    final Integer listeningPort = maybeEnodeURL.flatMap(EnodeURL::getListeningPort).orElse(0);
+    final String forkIdEnrField = "eth";
+    final NodeRecord newNodeRecord =
+        existingNodeRecord
+            .filter(
+                nodeRecord ->
+                    id.equals(nodeRecord.get(EnrField.PKEY_SECP256K1))
+                        && addressBytes.equals(nodeRecord.get(EnrField.IP_V4))
+                        && discoveryPort.equals(nodeRecord.get(EnrField.UDP))
+                        && listeningPort.equals(nodeRecord.get(EnrField.TCP))
+                        && forkIdSupplier.get().equals(nodeRecord.get(forkIdEnrField)))
+            .orElseGet(
+                () -> {
+                  final UInt64 sequenceNumber =
+                      existingNodeRecord.map(NodeRecord::getSeq).orElse(UInt64.ZERO).add(1);
+                  final NodeRecord nodeRecord =
+                      nodeRecordFactory.createFromValues(
+                          sequenceNumber,
+                          new EnrField(EnrField.ID, IdentitySchema.V4),
+                          new EnrField(
+                              SIGNATURE_ALGORITHM.get().getCurveName(),
+                              SIGNATURE_ALGORITHM
+                                  .get()
+                                  .compressPublicKey(
+                                      SIGNATURE_ALGORITHM.get().createPublicKey(id))),
+                          new EnrField(EnrField.IP_V4, addressBytes),
+                          new EnrField(EnrField.TCP, listeningPort),
+                          new EnrField(EnrField.UDP, discoveryPort),
+                          new EnrField(
+                              forkIdEnrField, Collections.singletonList(forkIdSupplier.get())));
+                  nodeRecord.setSignature(
+                      nodeKey
+                          .sign(Hash.keccak256(nodeRecord.serializeNoSignature()))
+                          .encodedBytes()
+                          .slice(0, 64));
+
+                  LOG.info("Writing node record to disk. {}", nodeRecord);
+                  final var variablesUpdater = variablesStorage.updater();
+                  variablesUpdater.setLocalEnrSeqno(nodeRecord.serialize());
+                  variablesUpdater.commit();
+
+                  return nodeRecord;
+                });
+    localNode
+        .orElseThrow(() -> new IllegalStateException("Local node should be set here"))
+        .setNodeRecord(newNodeRecord);
   }
 
   public void addPeerRequirement(final PeerRequirement peerRequirement) {
     this.peerRequirements.add(peerRequirement);
   }
 
+  public boolean checkForkId(final DiscoveryPeer peer) {
+    return peer.getForkId().map(forkIdManager::peerCheck).orElse(true);
+  }
+
   private void startController(final DiscoveryPeer localNode) {
     final PeerDiscoveryController controller = createController(localNode);
     this.controller = Optional.of(controller);
@@ -229,8 +262,10 @@ private PeerDiscoveryController createController(final DiscoveryPeer localNode)
         .workerExecutor(createWorkerExecutor())
         .peerRequirement(PeerRequirement.combine(peerRequirements))
         .peerPermissions(peerPermissions)
-        .peerBondedObservers(peerBondedObservers)
         .metricsSystem(metricsSystem)
+        .forkIdManager(forkIdManager)
+        .filterOnEnrForkId((config.isFilterOnEnrForkIdEnabled()))
+        .rlpxAgent(rlpxAgent)
         .build();
   }
 
@@ -251,7 +286,7 @@ protected void handleIncomingPacket(final Endpoint sourceEndpoint, final Packet
     final String host = sourceEndpoint.getHost();
     final DiscoveryPeer peer =
         DiscoveryPeer.fromEnode(
-            EnodeURL.builder()
+            EnodeURLImpl.builder()
                 .nodeId(packet.getNodeId())
                 .ipAddress(host)
                 .listeningPort(tcpPort)
@@ -272,22 +307,16 @@ protected void handleOutgoingPacket(final DiscoveryPeer peer, final Packet packe
         .whenComplete(
             (res, err) -> {
               if (err != null) {
-                if (err instanceof SocketException && err.getMessage().contains("unreachable")) {
-                  LOG.debug(
-                      "Peer {} is unreachable, packet: {}", peer, wrapBuffer(packet.encode()), err);
-                } else {
-                  LOG.warn(
-                      "Sending to peer {} failed, packet: {}",
-                      peer,
-                      wrapBuffer(packet.encode()),
-                      err);
-                }
+                handleOutgoingPacketError(err, peer, packet);
                 return;
               }
               peer.setLastContacted(System.currentTimeMillis());
             });
   }
 
+  protected abstract void handleOutgoingPacketError(
+      final Throwable err, final DiscoveryPeer peer, final Packet packet);
+
   public Stream<DiscoveryPeer> streamDiscoveredPeers() {
     return controller.map(PeerDiscoveryController::streamDiscoveredPeers).orElse(Stream.empty());
   }
@@ -304,40 +333,6 @@ public Bytes getId() {
     return id;
   }
 
-  /**
-   * Adds an observer that will get called when a new peer is bonded with and added to the peer
-   * table.
-   *
-   * <p><i>No guarantees are made about the order in which observers are invoked.</i>
-   *
-   * @param observer The observer to call.
-   * @return A unique ID identifying this observer, to that it can be removed later.
-   */
-  public long observePeerBondedEvents(final PeerBondedObserver observer) {
-    checkNotNull(observer);
-    return peerBondedObservers.subscribe(observer);
-  }
-
-  /**
-   * Removes an previously added peer bonded observer.
-   *
-   * @param observerId The unique ID identifying the observer to remove.
-   * @return Whether the observer was located and removed.
-   */
-  public boolean removePeerBondedObserver(final long observerId) {
-    return peerBondedObservers.unsubscribe(observerId);
-  }
-
-  /**
-   * Returns the count of observers that are registered on this controller.
-   *
-   * @return The observer count.
-   */
-  @VisibleForTesting
-  public int getObserverCount() {
-    return peerBondedObservers.getSubscriberCount();
-  }
-
   private static void validateConfiguration(final DiscoveryConfiguration config) {
     checkArgument(
         config.getBindHost() != null && InetAddresses.isInetAddress(config.getBindHost()),
@@ -371,4 +366,9 @@ public void bond(final Peer peer) {
           DiscoveryPeer.from(peer).ifPresent(c::handleBondingRequest);
         });
   }
+
+  @VisibleForTesting
+  public Optional<DiscoveryPeer> getLocalNode() {
+    return localNode;
+  }
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryStatus.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryStatus.java
index 4e67aaf7a45..dc704915658 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryStatus.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryStatus.java
@@ -33,7 +33,10 @@ public enum PeerDiscoveryStatus {
    * We have successfully bonded with this {@link DiscoveryPeer}, and we are able to exchange
    * messages with them.
    */
-  BONDED;
+  BONDED,
+
+  /** We have requested the ENR record from this {@link DiscoveryPeer} */
+  ENR_REQUESTED;
 
   @Override
   public String toString() {
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/VertxPeerDiscoveryAgent.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/VertxPeerDiscoveryAgent.java
index e8c5a43a9e4..b76d5758cf2 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/VertxPeerDiscoveryAgent.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/VertxPeerDiscoveryAgent.java
@@ -15,8 +15,10 @@
 package org.hyperledger.besu.ethereum.p2p.discovery;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static org.apache.tuweni.bytes.Bytes.wrapBuffer;
 
-import org.hyperledger.besu.crypto.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.ethereum.forkid.ForkIdManager;
 import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.Packet;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerDiscoveryController;
@@ -24,6 +26,7 @@
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.TimerUtil;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.VertxTimerUtil;
 import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions;
+import org.hyperledger.besu.ethereum.p2p.rlpx.RlpxAgent;
 import org.hyperledger.besu.ethereum.storage.StorageProvider;
 import org.hyperledger.besu.metrics.BesuMetricCategory;
 import org.hyperledger.besu.nat.NatService;
@@ -34,6 +37,7 @@
 import java.net.BindException;
 import java.net.InetSocketAddress;
 import java.net.SocketException;
+import java.nio.channels.UnsupportedAddressTypeException;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.IntSupplier;
@@ -41,17 +45,19 @@
 import java.util.stream.StreamSupport;
 
 import io.netty.channel.EventLoopGroup;
+import io.netty.channel.unix.Errors;
+import io.netty.channel.unix.Errors.NativeIoException;
 import io.netty.util.concurrent.SingleThreadEventExecutor;
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Vertx;
 import io.vertx.core.datagram.DatagramPacket;
 import io.vertx.core.datagram.DatagramSocket;
 import io.vertx.core.datagram.DatagramSocketOptions;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class VertxPeerDiscoveryAgent extends PeerDiscoveryAgent {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(VertxPeerDiscoveryAgent.class);
 
   private final Vertx vertx;
   /* The vert.x UDP socket. */
@@ -64,8 +70,18 @@ public VertxPeerDiscoveryAgent(
       final PeerPermissions peerPermissions,
       final NatService natService,
       final MetricsSystem metricsSystem,
-      final StorageProvider storageProvider) {
-    super(nodeKey, config, peerPermissions, natService, metricsSystem, storageProvider);
+      final StorageProvider storageProvider,
+      final ForkIdManager forkIdManager,
+      final RlpxAgent rlpxAgent) {
+    super(
+        nodeKey,
+        config,
+        peerPermissions,
+        natService,
+        metricsSystem,
+        storageProvider,
+        forkIdManager,
+        rlpxAgent);
     checkArgument(vertx != null, "vertx instance cannot be null");
     this.vertx = vertx;
 
@@ -96,7 +112,7 @@ protected AsyncExecutor createWorkerExecutor() {
 
   @Override
   protected CompletableFuture<InetSocketAddress> listenForConnections() {
-    CompletableFuture<InetSocketAddress> future = new CompletableFuture<>();
+    final CompletableFuture<InetSocketAddress> future = new CompletableFuture<>();
     vertx
         .createDatagramSocket(new DatagramSocketOptions().setIpV6(NetworkUtility.isIPv6Available()))
         .listen(
@@ -138,7 +154,7 @@ protected void handleListenerSetup(
     socket.exceptionHandler(this::handleException);
     socket.handler(this::handlePacket);
 
-    InetSocketAddress address =
+    final InetSocketAddress address =
         new InetSocketAddress(socket.localAddress().host(), socket.localAddress().port());
     addressFuture.complete(address);
   }
@@ -146,18 +162,23 @@ protected void handleListenerSetup(
   @Override
   protected CompletableFuture<Void> sendOutgoingPacket(
       final DiscoveryPeer peer, final Packet packet) {
-    CompletableFuture<Void> result = new CompletableFuture<>();
-    socket.send(
-        packet.encode(),
-        peer.getEndpoint().getUdpPort(),
-        peer.getEnodeURL().getIpAsString(),
-        ar -> {
-          if (ar.failed()) {
-            result.completeExceptionally(ar.cause());
-          } else {
-            result.complete(null);
-          }
-        });
+    final CompletableFuture<Void> result = new CompletableFuture<>();
+    if (socket == null) {
+      result.completeExceptionally(
+          new RuntimeException("Discovery socket already closed, because Besu is closing down"));
+    } else {
+      socket.send(
+          packet.encode(),
+          peer.getEndpoint().getUdpPort(),
+          peer.getEnodeURL().getIpAsString(),
+          ar -> {
+            if (ar.failed()) {
+              result.completeExceptionally(ar.cause());
+            } else {
+              result.complete(null);
+            }
+          });
+    }
     return result;
   }
 
@@ -181,6 +202,60 @@ public CompletableFuture<?> stop() {
     return completion;
   }
 
+  @Override
+  protected void handleOutgoingPacketError(
+      final Throwable err, final DiscoveryPeer peer, final Packet packet) {
+    if (err instanceof NativeIoException) {
+      final var nativeErr = (NativeIoException) err;
+      if (nativeErr.expectedErr() == Errors.ERROR_ENETUNREACH_NEGATIVE) {
+        LOG.atDebug()
+            .setMessage("Peer {} is unreachable, native error code {}, packet: {}, stacktrace: {}")
+            .addArgument(peer)
+            .addArgument(nativeErr::expectedErr)
+            .addArgument(() -> wrapBuffer(packet.encode()))
+            .addArgument(err)
+            .log();
+      } else {
+        LOG.warn(
+            "Sending to peer {} failed, native error code {}, packet: {}, stacktrace: {}",
+            peer,
+            nativeErr.expectedErr(),
+            wrapBuffer(packet.encode()),
+            err);
+      }
+    } else if (err instanceof SocketException && err.getMessage().contains("unreachable")) {
+      LOG.atDebug()
+          .setMessage("Peer {} is unreachable, packet: {}")
+          .addArgument(peer)
+          .addArgument(() -> wrapBuffer(packet.encode()))
+          .addArgument(err)
+          .log();
+    } else if (err instanceof SocketException
+        && err.getMessage().contentEquals("Operation not permitted")) {
+      LOG.debug(
+          "Operation not permitted sending to peer {}, this might be caused by firewall rules blocking traffic to a specific route.",
+          peer,
+          err);
+    } else if (err instanceof UnsupportedAddressTypeException) {
+      LOG.warn(
+          "Unsupported address type exception when connecting to peer {}, this is likely due to ipv6 not being enabled at runtime. "
+              + "Set logging level to TRACE to see full stacktrace",
+          peer);
+      LOG.atTrace()
+          .setMessage("Sending to peer {} failed, packet: {}, stacktrace: {}")
+          .addArgument(peer)
+          .addArgument(() -> wrapBuffer(packet.encode()))
+          .addArgument(err)
+          .log();
+    } else {
+      LOG.warn(
+          "Sending to peer {} failed, packet: {}, stacktrace: {}",
+          peer,
+          wrapBuffer(packet.encode()),
+          err);
+    }
+  }
+
   /**
    * For uncontrolled exceptions occurring in the packet handlers.
    *
@@ -202,7 +277,7 @@ private void handleException(final Throwable exception) {
   private void handlePacket(final DatagramPacket datagram) {
     final int length = datagram.data().length();
     if (!validatePacketSize(length)) {
-      LOG.debug("Discarding over-sized packet. Actual size (bytes): " + length);
+      LOG.debug("Discarding over-sized packet. Actual size (bytes): {}", length);
       return;
     }
     vertx.<Packet>executeBlocking(
@@ -222,7 +297,10 @@ private void handlePacket(final DatagramPacket datagram) {
             handleIncomingPacket(endpoint, event.result());
           } else {
             if (event.cause() instanceof PeerDiscoveryPacketDecodingException) {
-              LOG.debug("Discarding invalid peer discovery packet: {}", event.cause().getMessage());
+              LOG.debug(
+                  "Discarding invalid peer discovery packet: {}, {}",
+                  event.cause().getMessage(),
+                  event.cause());
             } else {
               LOG.error("Encountered error while handling packet", event.cause());
             }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/Bucket.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/Bucket.java
index 60a422b6723..20c802662cf 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/Bucket.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/Bucket.java
@@ -56,7 +56,7 @@ public class Bucket {
    * Returns the peer with the provided ID if it exists in the bucket.
    *
    * <p>This operation presupposes that the system has been in recent contact with this peer, hence
-   * it relocates it to to the head of the list.
+   * it relocates it to the head of the list.
    *
    * @param id The peer's ID (public key).
    * @return An empty optional if the peer was not a member of this bucket, or a filled optional if
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/DevP2PException.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/DevP2PException.java
new file mode 100644
index 00000000000..b5f80faa8e1
--- /dev/null
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/DevP2PException.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.p2p.discovery.internal;
+
+public class DevP2PException extends RuntimeException {
+  public DevP2PException(final String reason) {
+    super(reason);
+  }
+}
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/DiscoveryProtocolLogger.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/DiscoveryProtocolLogger.java
index 3dd2427a756..30f2c21945f 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/DiscoveryProtocolLogger.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/DiscoveryProtocolLogger.java
@@ -20,12 +20,12 @@
 import org.hyperledger.besu.plugin.services.metrics.Counter;
 import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DiscoveryProtocolLogger {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(DiscoveryProtocolLogger.class);
   private final LabelledMetric<Counter> outgoingMessageCounter;
   private final LabelledMetric<Counter> incomingMessageCounter;
 
@@ -47,7 +47,7 @@ public DiscoveryProtocolLogger(final MetricsSystem metricsSystem) {
   void logSendingPacket(final Peer peer, final Packet packet) {
     outgoingMessageCounter.labels(packet.getType().name()).inc();
     LOG.trace(
-        "<<< Sending  {} packet to peer {} ({}): {}",
+        "<<< Sending {} packet to peer {} ({}): {}",
         shortenPacketType(packet),
         peer.getId().slice(0, 16),
         peer.getEnodeURL(),
@@ -74,6 +74,10 @@ private String shortenPacketType(final Packet packet) {
         return "FINDN";
       case NEIGHBORS:
         return "NEIGH";
+      case ENR_REQUEST:
+        return "ENRREQ";
+      case ENR_RESPONSE:
+        return "ENRRESP";
     }
     return null;
   }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/ENRRequestPacketData.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/ENRRequestPacketData.java
new file mode 100644
index 00000000000..dcdfb87cac8
--- /dev/null
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/ENRRequestPacketData.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.discovery.internal;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+
+public class ENRRequestPacketData implements PacketData {
+  /* In seconds after epoch. */
+  private final long expiration;
+
+  private ENRRequestPacketData(final long expiration) {
+    checkArgument(expiration >= 0, "expiration cannot be negative");
+
+    this.expiration = expiration;
+  }
+
+  public static ENRRequestPacketData create() {
+    return create(PacketData.defaultExpiration());
+  }
+
+  static ENRRequestPacketData create(final long expirationSec) {
+    return new ENRRequestPacketData(expirationSec);
+  }
+
+  public static ENRRequestPacketData readFrom(final RLPInput in) {
+    in.enterList();
+    final long expiration = in.readLongScalar();
+    in.leaveListLenient();
+    return new ENRRequestPacketData(expiration);
+  }
+
+  @Override
+  public void writeTo(final RLPOutput out) {
+    out.startList();
+    out.writeLongScalar(expiration);
+    out.endList();
+  }
+
+  public long getExpiration() {
+    return expiration;
+  }
+
+  @Override
+  public String toString() {
+    return "ENRRequestPacketData{" + "expiration=" + expiration + '}';
+  }
+}
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/ENRResponsePacketData.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/ENRResponsePacketData.java
new file mode 100644
index 00000000000..d71c7e1e0b8
--- /dev/null
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/ENRResponsePacketData.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.discovery.internal;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.ethereum.beacon.discovery.schema.NodeRecord;
+import org.ethereum.beacon.discovery.schema.NodeRecordFactory;
+
+public class ENRResponsePacketData implements PacketData {
+  /* The hash of the entire ENRRequest packet being replied to. */
+  private final Bytes requestHash;
+
+  /* The node record. */
+  private final NodeRecord enr;
+
+  private ENRResponsePacketData(final Bytes requestHash, final NodeRecord enr) {
+    checkArgument(requestHash != null, "request hash cannot be null");
+    checkArgument(enr != null, "enr cannot be null");
+
+    this.requestHash = requestHash;
+    this.enr = enr;
+  }
+
+  public static ENRResponsePacketData create(final Bytes requestHash, final NodeRecord enr) {
+    return new ENRResponsePacketData(requestHash, enr);
+  }
+
+  public static ENRResponsePacketData readFrom(final RLPInput in) {
+    in.enterList();
+    final Bytes requestHash = in.readBytes();
+    in.leaveListLenient();
+    final NodeRecord enr = NodeRecordFactory.DEFAULT.fromBytes(in.currentListAsBytes());
+
+    return new ENRResponsePacketData(requestHash, enr);
+  }
+
+  @Override
+  public void writeTo(final RLPOutput out) {
+    out.startList();
+    out.writeBytes(requestHash);
+    out.writeRLPBytes(enr.serialize());
+    out.endList();
+  }
+
+  public Bytes getRequestHash() {
+    return requestHash;
+  }
+
+  public NodeRecord getEnr() {
+    return enr;
+  }
+
+  @Override
+  public String toString() {
+    return "ENRResponsePacketData{" + "requestHash=" + requestHash + ", enr=" + enr + '}';
+  }
+}
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/Packet.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/Packet.java
index 05fdbb3aab0..e7e113bfbea 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/Packet.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/Packet.java
@@ -18,10 +18,11 @@
 import static org.hyperledger.besu.crypto.Hash.keccak256;
 import static org.hyperledger.besu.util.Preconditions.checkGuard;
 
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.SECP256K1;
-import org.hyperledger.besu.crypto.SECP256K1.PublicKey;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
+import org.hyperledger.besu.crypto.SECPPublicKey;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
 import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryPacketDecodingException;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.rlp.RLP;
@@ -31,6 +32,8 @@
 import java.util.Arrays;
 import java.util.Optional;
 
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import io.vertx.core.buffer.Buffer;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.MutableBytes;
@@ -41,13 +44,15 @@ public class Packet {
   private static final int PACKET_TYPE_INDEX = 97;
   private static final int PACKET_DATA_INDEX = 98;
   private static final int SIGNATURE_INDEX = 32;
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
 
   private final PacketType type;
   private final PacketData data;
 
   private final Bytes hash;
-  private final Signature signature;
-  private final PublicKey publicKey;
+  private final SECPSignature signature;
+  private final SECPPublicKey publicKey;
 
   private Packet(final PacketType type, final PacketData data, final NodeKey nodeKey) {
     this.type = type;
@@ -80,7 +85,9 @@ private Packet(final PacketType packetType, final PacketData packetData, final B
     this.hash = hash;
     this.signature = decodeSignature(encodedSignature);
     this.publicKey =
-        PublicKey.recoverFromSignature(keccak256(signedPayload), this.signature)
+        SIGNATURE_ALGORITHM
+            .get()
+            .recoverPublicKeyFromSignature(keccak256(signedPayload), this.signature)
             .orElseThrow(
                 () ->
                     new PeerDiscoveryPacketDecodingException(
@@ -111,12 +118,18 @@ public static Packet decode(final Buffer message) {
     final PacketType.Deserializer<?> deserializer = packetType.getDeserializer();
     final PacketData packetData;
     try {
-      packetData = deserializer.deserialize(RLP.input(message, PACKET_DATA_INDEX));
+      packetData =
+          deserializer.deserialize(
+              RLP.input(
+                  Bytes.wrapBuffer(
+                      message, PACKET_DATA_INDEX, message.length() - PACKET_DATA_INDEX)));
+      return new Packet(packetType, packetData, Bytes.wrapBuffer(message));
     } catch (final RLPException e) {
       throw new PeerDiscoveryPacketDecodingException("Malformed packet of type: " + packetType, e);
+    } catch (final IllegalArgumentException e) {
+      throw new PeerDiscoveryPacketDecodingException(
+          "Failed decoding packet of type: " + packetType, e);
     }
-
-    return new Packet(packetType, packetData, Bytes.wrapBuffer(message));
   }
 
   public Buffer encode() {
@@ -182,21 +195,21 @@ public String toString() {
         + '}';
   }
 
-  private static Bytes encodeSignature(final SECP256K1.Signature signature) {
+  private static Bytes encodeSignature(final SECPSignature signature) {
     final MutableBytes encoded = MutableBytes.create(65);
-    UInt256.valueOf(signature.getR()).toBytes().copyTo(encoded, 0);
-    UInt256.valueOf(signature.getS()).toBytes().copyTo(encoded, 32);
+    UInt256.valueOf(signature.getR()).copyTo(encoded, 0);
+    UInt256.valueOf(signature.getS()).copyTo(encoded, 32);
     final int v = signature.getRecId();
     encoded.set(64, (byte) v);
     return encoded;
   }
 
-  private static SECP256K1.Signature decodeSignature(final Bytes encodedSignature) {
+  private static SECPSignature decodeSignature(final Bytes encodedSignature) {
     checkArgument(
         encodedSignature != null && encodedSignature.size() == 65, "encodedSignature is 65 bytes");
     final BigInteger r = encodedSignature.slice(0, 32).toUnsignedBigInteger();
     final BigInteger s = encodedSignature.slice(32, 32).toUnsignedBigInteger();
     final int recId = encodedSignature.get(64);
-    return SECP256K1.Signature.create(r, s, (byte) recId);
+    return SIGNATURE_ALGORITHM.get().createSignature(r, s, (byte) recId);
   }
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PacketType.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PacketType.java
index 5512cbd6d41..a36452995ab 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PacketType.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PacketType.java
@@ -26,7 +26,9 @@ public enum PacketType {
   PING(0x01, PingPacketData::readFrom),
   PONG(0x02, PongPacketData::readFrom),
   FIND_NEIGHBORS(0x03, FindNeighborsPacketData::readFrom),
-  NEIGHBORS(0x04, NeighborsPacketData::readFrom);
+  NEIGHBORS(0x04, NeighborsPacketData::readFrom),
+  ENR_REQUEST(0x05, ENRRequestPacketData::readFrom),
+  ENR_RESPONSE(0x06, ENRResponsePacketData::readFrom);
 
   private static final int MAX_VALUE = 0x7F;
   private static final int BYTE_MASK = 0xFF;
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryController.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryController.java
index 88ceae7932a..ec829d20709 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryController.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryController.java
@@ -20,19 +20,19 @@
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
-import org.hyperledger.besu.crypto.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.ethereum.forkid.ForkId;
+import org.hyperledger.besu.ethereum.forkid.ForkIdManager;
 import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer;
-import org.hyperledger.besu.ethereum.p2p.discovery.PeerBondedObserver;
-import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryEvent;
 import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryStatus;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.peers.PeerId;
 import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions;
+import org.hyperledger.besu.ethereum.p2p.rlpx.RlpxAgent;
 import org.hyperledger.besu.metrics.BesuMetricCategory;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.plugin.services.metrics.Counter;
 import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
-import org.hyperledger.besu.util.Subscribers;
 
 import java.time.Instant;
 import java.util.ArrayList;
@@ -55,9 +55,10 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.ethereum.beacon.discovery.schema.NodeRecord;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This component is the entrypoint for managing the lifecycle of peers.
@@ -103,18 +104,20 @@
  * condition, the peer will be physically dropped (eliminated) from the table.
  */
 public class PeerDiscoveryController {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PeerDiscoveryController.class);
   private static final long REFRESH_CHECK_INTERVAL_MILLIS = MILLISECONDS.convert(30, SECONDS);
   private static final int PEER_REFRESH_ROUND_TIMEOUT_IN_SECONDS = 5;
   protected final TimerUtil timerUtil;
   private final PeerTable peerTable;
   private final Cache<Bytes, DiscoveryPeer> bondingPeers =
       CacheBuilder.newBuilder().maximumSize(50).expireAfterWrite(10, TimeUnit.MINUTES).build();
+  private final Cache<Bytes, Packet> cachedEnrRequests;
 
   private final Collection<DiscoveryPeer> bootstrapNodes;
 
   /* A tracker for inflight interactions and the state machine of a peer. */
-  private final Map<Bytes, PeerInteractionState> inflightInteractions = new ConcurrentHashMap<>();
+  private final Map<Bytes, Map<PacketType, PeerInteractionState>> inflightInteractions =
+      new ConcurrentHashMap<>();
 
   private final AtomicBoolean started = new AtomicBoolean(false);
 
@@ -126,6 +129,9 @@ public class PeerDiscoveryController {
   private final DiscoveryProtocolLogger discoveryProtocolLogger;
   private final LabelledMetric<Counter> interactionCounter;
   private final LabelledMetric<Counter> interactionRetryCounter;
+  private final ForkIdManager forkIdManager;
+  private final boolean filterOnEnrForkId;
+  private final RlpxAgent rlpxAgent;
 
   private RetryDelayFunction retryDelayFunction = RetryDelayFunction.linear(1.5, 2000, 60000);
 
@@ -139,10 +145,6 @@ public class PeerDiscoveryController {
   private final long cleanPeerTableIntervalMs;
   private final AtomicBoolean peerTableIsDirty = new AtomicBoolean(false);
   private OptionalLong cleanTableTimerId = OptionalLong.empty();
-
-  // Observers for "peer bonded" discovery events.
-  private final Subscribers<PeerBondedObserver> peerBondedObservers;
-
   private RecursivePeerRefreshState recursivePeerRefreshState;
 
   private PeerDiscoveryController(
@@ -157,8 +159,11 @@ private PeerDiscoveryController(
       final long cleanPeerTableIntervalMs,
       final PeerRequirement peerRequirement,
       final PeerPermissions peerPermissions,
-      final Subscribers<PeerBondedObserver> peerBondedObservers,
-      final MetricsSystem metricsSystem) {
+      final MetricsSystem metricsSystem,
+      final Optional<Cache<Bytes, Packet>> maybeCacheForEnrRequests,
+      final ForkIdManager forkIdManager,
+      final boolean filterOnEnrForkId,
+      final RlpxAgent rlpxAgent) {
     this.timerUtil = timerUtil;
     this.nodeKey = nodeKey;
     this.localPeer = localPeer;
@@ -169,10 +174,9 @@ private PeerDiscoveryController(
     this.cleanPeerTableIntervalMs = cleanPeerTableIntervalMs;
     this.peerRequirement = peerRequirement;
     this.outboundMessageHandler = outboundMessageHandler;
-    this.peerBondedObservers = peerBondedObservers;
     this.discoveryProtocolLogger = new DiscoveryProtocolLogger(metricsSystem);
-
     this.peerPermissions = new PeerDiscoveryPermissions(localPeer, peerPermissions);
+    this.rlpxAgent = rlpxAgent;
 
     metricsSystem.createIntegerGauge(
         BesuMetricCategory.NETWORK,
@@ -180,19 +184,25 @@ private PeerDiscoveryController(
         "Current number of inflight discovery interactions",
         inflightInteractions::size);
 
-    interactionCounter =
+    this.interactionCounter =
         metricsSystem.createLabelledCounter(
             BesuMetricCategory.NETWORK,
             "discovery_interaction_count",
             "Total number of discovery interactions initiated",
             "type");
 
-    interactionRetryCounter =
+    this.interactionRetryCounter =
         metricsSystem.createLabelledCounter(
             BesuMetricCategory.NETWORK,
             "discovery_interaction_retry_count",
             "Total number of interaction retries performed",
             "type");
+    this.cachedEnrRequests =
+        maybeCacheForEnrRequests.orElse(
+            CacheBuilder.newBuilder().maximumSize(50).expireAfterWrite(10, SECONDS).build());
+
+    this.forkIdManager = forkIdManager;
+    this.filterOnEnrForkId = filterOnEnrForkId;
   }
 
   public static Builder builder() {
@@ -204,6 +214,7 @@ public void start() {
       throw new IllegalStateException("The peer table had already been started");
     }
 
+    LOG.debug("Starting with filterOnEnrForkId = {}", filterOnEnrForkId);
     final List<DiscoveryPeer> initialDiscoveryPeers =
         bootstrapNodes.stream()
             .filter(peerPermissions::isAllowedInPeerTable)
@@ -245,7 +256,13 @@ public CompletableFuture<?> stop() {
     tableRefreshTimerId = OptionalLong.empty();
     cleanTableTimerId.ifPresent(timerUtil::cancelTimer);
     cleanTableTimerId = OptionalLong.empty();
-    inflightInteractions.values().forEach(PeerInteractionState::cancelTimers);
+    inflightInteractions
+        .values()
+        .forEach(
+            l -> {
+              l.values().forEach(s -> s.cancelTimers());
+              l.clear();
+            });
     inflightInteractions.clear();
     return CompletableFuture.completedFuture(null);
   }
@@ -313,9 +330,14 @@ public void onMessage(final Packet packet, final DiscoveryPeer sender) {
         matchInteraction(packet)
             .ifPresent(
                 interaction -> {
+                  if (filterOnEnrForkId) {
+                    requestENR(peer);
+                  }
                   bondingPeers.invalidate(peer.getId());
                   addToPeerTable(peer);
                   recursivePeerRefreshState.onBondingComplete(peer);
+                  Optional.ofNullable(cachedEnrRequests.getIfPresent(peer.getId()))
+                      .ifPresent(cachedEnrRequest -> processEnrRequest(peer, cachedEnrRequest));
                 });
         break;
       case NEIGHBORS:
@@ -334,9 +356,58 @@ public void onMessage(final Packet packet, final DiscoveryPeer sender) {
         }
 
         break;
+      case ENR_REQUEST:
+        if (PeerDiscoveryStatus.BONDED.equals(peer.getStatus())) {
+          processEnrRequest(peer, packet);
+        } else if (PeerDiscoveryStatus.BONDING.equals(peer.getStatus())) {
+          LOG.trace("ENR_REQUEST cached for bonding peer Id: {}", peer.getId());
+          // Due to UDP, it may happen that we receive the ENR_REQUEST just before the PONG.
+          // Because peers want to send the ENR_REQUEST directly after the pong.
+          // If this happens we don't want to ignore the request but process when bonded.
+          // this cache allows to keep the request and to respond after having processed the PONG
+          cachedEnrRequests.put(peer.getId(), packet);
+        }
+        break;
+      case ENR_RESPONSE:
+        matchInteraction(packet)
+            .ifPresent(
+                interaction -> {
+                  final Optional<ENRResponsePacketData> packetData =
+                      packet.getPacketData(ENRResponsePacketData.class);
+                  final NodeRecord enr = packetData.get().getEnr();
+                  peer.setNodeRecord(enr);
+
+                  final Optional<ForkId> maybeForkId = peer.getForkId();
+                  if (maybeForkId.isPresent()) {
+                    if (forkIdManager.peerCheck(maybeForkId.get())) {
+                      connectOnRlpxLayer(peer);
+                      LOG.debug(
+                          "Peer {} PASSED fork id check. ForkId received: {}",
+                          sender.getId(),
+                          maybeForkId.get());
+                    } else {
+                      LOG.debug(
+                          "Peer {} FAILED fork id check. ForkId received: {}",
+                          sender.getId(),
+                          maybeForkId.get());
+                    }
+                  } else {
+                    // if the peer hasn't sent the ForkId try to connect to it anyways
+                    connectOnRlpxLayer(peer);
+                    LOG.debug("No fork id sent by peer: {}", peer.getId());
+                  }
+                });
+        break;
     }
   }
 
+  private void processEnrRequest(final DiscoveryPeer peer, final Packet packet) {
+    LOG.trace("ENR_REQUEST received from bonded peer Id: {}", peer.getId());
+    packet
+        .getPacketData(ENRRequestPacketData.class)
+        .ifPresent(p -> respondToENRRequest(p, packet.getHash(), peer));
+  }
+
   private List<DiscoveryPeer> getPeersFromNeighborsPacket(final Packet packet) {
     final Optional<NeighborsPacketData> maybeNeighborsData =
         packet.getPacketData(NeighborsPacketData.class);
@@ -351,15 +422,6 @@ private List<DiscoveryPeer> getPeersFromNeighborsPacket(final Packet packet) {
   }
 
   private boolean addToPeerTable(final DiscoveryPeer peer) {
-    if (!peerPermissions.isAllowedInPeerTable(peer)) {
-      return false;
-    }
-
-    final PeerTable.AddResult result = peerTable.tryAdd(peer);
-    if (result.getOutcome() == PeerTable.AddResult.AddOutcome.SELF) {
-      return false;
-    }
-
     // Reset the last seen timestamp.
     final long now = System.currentTimeMillis();
     if (peer.getFirstDiscovered() == 0) {
@@ -369,9 +431,13 @@ private boolean addToPeerTable(final DiscoveryPeer peer) {
 
     if (peer.getStatus() != PeerDiscoveryStatus.BONDED) {
       peer.setStatus(PeerDiscoveryStatus.BONDED);
-      notifyPeerBonded(peer, now);
+      if (!filterOnEnrForkId) {
+        connectOnRlpxLayer(peer);
+      }
     }
 
+    final PeerTable.AddResult result = peerTable.tryAdd(peer);
+
     if (result.getOutcome() == PeerTable.AddResult.AddOutcome.ALREADY_EXISTED) {
       // Bump peer.
       peerTable.tryEvict(peer);
@@ -384,29 +450,36 @@ private boolean addToPeerTable(final DiscoveryPeer peer) {
     return true;
   }
 
-  private void notifyPeerBonded(final DiscoveryPeer peer, final long now) {
-    final PeerDiscoveryEvent.PeerBondedEvent event =
-        new PeerDiscoveryEvent.PeerBondedEvent(peer, now);
-    dispatchPeerBondedEvent(peerBondedObservers, event);
+  void connectOnRlpxLayer(final DiscoveryPeer peer) {
+    rlpxAgent.connect(peer);
   }
 
   private Optional<PeerInteractionState> matchInteraction(final Packet packet) {
-    final PeerInteractionState interaction = inflightInteractions.get(packet.getNodeId());
+    final Bytes nodeId = packet.getNodeId();
+    final Map<PacketType, PeerInteractionState> stateMap = inflightInteractions.get(nodeId);
+    if (stateMap == null) {
+      return Optional.empty();
+    }
+    final PacketType packetType = packet.getType();
+    final PeerInteractionState interaction = stateMap.get(packetType);
     if (interaction == null || !interaction.test(packet)) {
       return Optional.empty();
     }
     interaction.cancelTimers();
-    inflightInteractions.remove(packet.getNodeId());
+    stateMap.remove(packetType);
+    if (stateMap.isEmpty()) {
+      inflightInteractions.remove(nodeId);
+    }
     return Optional.of(interaction);
   }
 
   private void refreshTableIfRequired() {
     final long now = System.currentTimeMillis();
     if (lastRefreshTime + tableRefreshIntervalMs <= now) {
-      LOG.debug("Peer table refresh triggered by timer expiry");
+      LOG.debug("Refreshing peer table after {} ms", tableRefreshIntervalMs);
       refreshTable();
     } else if (!peerRequirement.hasSufficientPeers()) {
-      LOG.debug("Peer table refresh triggered by insufficient peers");
+      LOG.debug("Refreshing peer table: seeking more peers. peer count < max");
       refreshTable();
     }
   }
@@ -428,7 +501,7 @@ RecursivePeerRefreshState getRecursivePeerRefreshState() {
    */
   private void refreshTable() {
     final Bytes target = Peer.randomId();
-    final List<DiscoveryPeer> initialPeers = peerTable.nearestPeers(Peer.randomId(), 16);
+    final List<DiscoveryPeer> initialPeers = peerTable.nearestBondedPeers(Peer.randomId(), 16);
     recursivePeerRefreshState.start(initialPeers, target);
     lastRefreshTime = System.currentTimeMillis();
   }
@@ -440,6 +513,10 @@ private void refreshTable() {
    */
   @VisibleForTesting
   void bond(final DiscoveryPeer peer) {
+    if (!peerPermissions.isAllowedInPeerTable(peer)) {
+      return;
+    }
+
     peer.setFirstDiscovered(System.currentTimeMillis());
     peer.setStatus(PeerDiscoveryStatus.BONDING);
     bondingPeers.put(peer.getId(), peer);
@@ -447,7 +524,10 @@ void bond(final DiscoveryPeer peer) {
     final Consumer<PeerInteractionState> action =
         interaction -> {
           final PingPacketData data =
-              PingPacketData.create(localPeer.getEndpoint(), peer.getEndpoint());
+              PingPacketData.create(
+                  Optional.of(localPeer.getEndpoint()),
+                  peer.getEndpoint(),
+                  localPeer.getNodeRecord().map(NodeRecord::getSeq).orElse(null));
           createPacket(
               PacketType.PING,
               data,
@@ -469,7 +549,44 @@ void bond(final DiscoveryPeer peer) {
 
     // The filter condition will be updated as soon as the action is performed.
     final PeerInteractionState peerInteractionState =
-        new PeerInteractionState(action, peer.getId(), PacketType.PONG, packet -> false, true);
+        new PeerInteractionState(action, peer.getId(), PacketType.PONG, packet -> false);
+    dispatchInteraction(peer, peerInteractionState);
+  }
+
+  /**
+   * Initiates an enr request cycle with a peer.
+   *
+   * @param peer The targeted peer.
+   */
+  @VisibleForTesting
+  void requestENR(final DiscoveryPeer peer) {
+    peer.setStatus(PeerDiscoveryStatus.ENR_REQUESTED);
+
+    final Consumer<PeerInteractionState> action =
+        interaction -> {
+          final ENRRequestPacketData data = ENRRequestPacketData.create();
+          createPacket(
+              PacketType.ENR_REQUEST,
+              data,
+              enrPacket -> {
+                final Bytes enrHash = enrPacket.getHash();
+                // Update the matching filter to only accept the ENRResponse if it echoes the hash
+                // of our request.
+                final Predicate<Packet> newFilter =
+                    packet ->
+                        packet
+                            .getPacketData(ENRResponsePacketData.class)
+                            .map(enr -> enr.getRequestHash().equals(enrHash))
+                            .orElse(false);
+                interaction.updateFilter(newFilter);
+
+                sendPacket(peer, enrPacket);
+              });
+        };
+
+    // The filter condition will be updated as soon as the action is performed.
+    final PeerInteractionState peerInteractionState =
+        new PeerInteractionState(action, peer.getId(), PacketType.ENR_RESPONSE, packet -> false);
     dispatchInteraction(peer, peerInteractionState);
   }
 
@@ -515,7 +632,7 @@ private void findNodes(final DiscoveryPeer peer, final Bytes target) {
           sendPacket(peer, PacketType.FIND_NEIGHBORS, data);
         };
     final PeerInteractionState interaction =
-        new PeerInteractionState(action, peer.getId(), PacketType.NEIGHBORS, packet -> true, true);
+        new PeerInteractionState(action, peer.getId(), PacketType.NEIGHBORS, packet -> true);
     dispatchInteraction(peer, interaction);
   }
 
@@ -529,20 +646,29 @@ private void findNodes(final DiscoveryPeer peer, final Bytes target) {
    * @param state The state.
    */
   private void dispatchInteraction(final Peer peer, final PeerInteractionState state) {
-    final PeerInteractionState previous = inflightInteractions.put(peer.getId(), state);
+    final Bytes id = peer.getId();
+    final PeerInteractionState previous =
+        inflightInteractions
+            .computeIfAbsent(id, k -> new ConcurrentHashMap<>())
+            .put(state.expectedType, state);
     if (previous != null) {
       previous.cancelTimers();
     }
-    state.execute(0, 0);
+    state.execute();
   }
 
   private void respondToPing(
       final PingPacketData packetData, final Bytes pingHash, final DiscoveryPeer sender) {
     if (packetData.getExpiration() < Instant.now().getEpochSecond()) {
+      LOG.debug("ignoring expired PING");
       return;
     }
     // We don't care about the `from` field of the ping, we pong to the `sender`
-    final PongPacketData data = PongPacketData.create(sender.getEndpoint(), pingHash);
+    final PongPacketData data =
+        PongPacketData.create(
+            sender.getEndpoint(),
+            pingHash,
+            localPeer.getNodeRecord().map(NodeRecord::getSeq).orElse(null));
 
     sendPacket(sender, PacketType.PONG, data);
   }
@@ -552,18 +678,25 @@ private void respondToFindNeighbors(
     if (packetData.getExpiration() < Instant.now().getEpochSecond()) {
       return;
     }
-    // TODO: for now return 16 peers. Other implementations calculate how many
-    // peers they can fit in a 1280-byte payload.
-    final List<DiscoveryPeer> peers = peerTable.nearestPeers(packetData.getTarget(), 16);
+    // Each peer is encoded as 16 bytes for address, 4 bytes for port, 4 bytes for tcp port
+    // and 64 bytes for id. This is prepended by 97 bytes of hash, signature and type.
+    // 16 + 4 + 4 + 64 = 88 bytes
+    // 88 * 13 = 1144 bytes
+    // To fit under 1280 bytes, we must return just 13 peers maximum.
+    final List<DiscoveryPeer> peers = peerTable.nearestBondedPeers(packetData.getTarget(), 13);
     final PacketData data = NeighborsPacketData.create(peers);
     sendPacket(sender, PacketType.NEIGHBORS, data);
   }
 
-  // Dispatches an event to a set of observers.
-  private void dispatchPeerBondedEvent(
-      final Subscribers<PeerBondedObserver> observers,
-      final PeerDiscoveryEvent.PeerBondedEvent event) {
-    observers.forEach(observer -> observer.onPeerBonded(event));
+  private void respondToENRRequest(
+      final ENRRequestPacketData enrRequestPacketData,
+      final Bytes requestHash,
+      final DiscoveryPeer sender) {
+    if (enrRequestPacketData.getExpiration() >= Instant.now().getEpochSecond()) {
+      final ENRResponsePacketData data =
+          ENRResponsePacketData.create(requestHash, localPeer.getNodeRecord().orElse(null));
+      sendPacket(sender, PacketType.ENR_RESPONSE, data);
+    }
   }
 
   /**
@@ -595,7 +728,7 @@ private DiscoveryPeer resolvePeer(final DiscoveryPeer peer) {
         peerTable.get(peer).filter(known -> known.discoveryEndpointMatches(peer));
     DiscoveryPeer resolvedPeer = maybeKnownPeer.orElse(peer);
     if (maybeKnownPeer.isEmpty()) {
-      DiscoveryPeer bondingPeer = bondingPeers.getIfPresent(peer.getId());
+      final DiscoveryPeer bondingPeer = bondingPeers.getIfPresent(peer.getId());
       if (bondingPeer != null) {
         resolvedPeer = bondingPeer;
       }
@@ -621,22 +754,21 @@ private class PeerInteractionState implements Predicate<Packet> {
     private final Counter retryCounter;
     /** A custom filter to accept transitions out of this state. */
     private Predicate<Packet> filter;
-    /** Whether the action associated to this state is retryable or not. */
-    private final boolean retryable;
     /** Timers associated with this entry. */
     private OptionalLong timerId = OptionalLong.empty();
 
+    private long delay = 0;
+    private int retryCount = 0;
+
     PeerInteractionState(
         final Consumer<PeerInteractionState> action,
         final Bytes peerId,
         final PacketType expectedType,
-        final Predicate<Packet> filter,
-        final boolean retryable) {
+        final Predicate<Packet> filter) {
       this.action = action;
       this.peerId = peerId;
       this.expectedType = expectedType;
       this.filter = filter;
-      this.retryable = retryable;
       interactionCounter.labels(expectedType.name()).inc();
       retryCounter = interactionRetryCounter.labels(expectedType.name());
     }
@@ -650,27 +782,29 @@ void updateFilter(final Predicate<Packet> filter) {
       this.filter = filter;
     }
 
-    /**
-     * Executes the action associated with this state. Sets a "boomerang" timer to itself in case
-     * the action is retryable.
-     *
-     * @param lastTimeout the previous timeout, or 0 if this is the first time the action is being
-     *     executed.
-     */
-    void execute(final long lastTimeout, final int retryCount) {
+    /** Executes the action associated with this state. Sets a "boomerang" timer to itself. */
+    void execute() {
       action.accept(this);
-      if (retryable && retryCount < MAX_RETRIES) {
-        final long newTimeout = retryDelayFunction.apply(lastTimeout);
+      if (retryCount < MAX_RETRIES) {
+        this.delay = retryDelayFunction.apply(this.delay);
         timerId =
             OptionalLong.of(
                 timerUtil.setTimer(
-                    newTimeout,
+                    this.delay,
                     () -> {
                       retryCounter.inc();
-                      execute(newTimeout, retryCount + 1);
+                      retryCount++;
+                      execute();
                     }));
       } else {
-        inflightInteractions.remove(peerId);
+        Optional.ofNullable(inflightInteractions.get(peerId))
+            .ifPresent(
+                peerInterationStateMap -> {
+                  peerInterationStateMap.remove(expectedType);
+                  if (peerInterationStateMap.isEmpty()) {
+                    inflightInteractions.remove(peerId);
+                  }
+                });
       }
     }
 
@@ -693,7 +827,6 @@ public static class Builder {
     private long cleanPeerTableIntervalMs = MILLISECONDS.convert(1, TimeUnit.MINUTES);
     private final List<DiscoveryPeer> bootstrapNodes = new ArrayList<>();
     private PeerTable peerTable;
-    private Subscribers<PeerBondedObserver> peerBondedObservers = Subscribers.create();
 
     // Required dependencies
     private NodeKey nodeKey;
@@ -701,6 +834,12 @@ public static class Builder {
     private TimerUtil timerUtil;
     private AsyncExecutor workerExecutor;
     private MetricsSystem metricsSystem;
+    private boolean filterOnEnrForkId;
+
+    private Cache<Bytes, Packet> cachedEnrRequests =
+        CacheBuilder.newBuilder().maximumSize(50).expireAfterWrite(10, SECONDS).build();
+    private ForkIdManager forkIdManager;
+    private RlpxAgent rlpxAgent;
 
     private Builder() {}
 
@@ -723,8 +862,11 @@ public PeerDiscoveryController build() {
           cleanPeerTableIntervalMs,
           peerRequirement,
           peerPermissions,
-          peerBondedObservers,
-          metricsSystem);
+          metricsSystem,
+          Optional.of(cachedEnrRequests),
+          forkIdManager,
+          filterOnEnrForkId,
+          rlpxAgent);
     }
 
     private void validate() {
@@ -733,7 +875,8 @@ private void validate() {
       validateRequiredDependency(timerUtil, "TimerUtil");
       validateRequiredDependency(workerExecutor, "AsyncExecutor");
       validateRequiredDependency(metricsSystem, "MetricsSystem");
-      validateRequiredDependency(peerBondedObservers, "PeerBondedObservers");
+      validateRequiredDependency(forkIdManager, "ForkIdManager");
+      validateRequiredDependency(rlpxAgent, "RlpxAgent");
     }
 
     private void validateRequiredDependency(final Object object, final String name) {
@@ -805,16 +948,33 @@ public Builder peerPermissions(final PeerPermissions peerPermissions) {
       return this;
     }
 
-    public Builder peerBondedObservers(final Subscribers<PeerBondedObserver> peerBondedObservers) {
-      checkNotNull(peerBondedObservers);
-      this.peerBondedObservers = peerBondedObservers;
-      return this;
-    }
-
     public Builder metricsSystem(final MetricsSystem metricsSystem) {
       checkNotNull(metricsSystem);
       this.metricsSystem = metricsSystem;
       return this;
     }
+
+    public Builder filterOnEnrForkId(final boolean filterOnEnrForkId) {
+      this.filterOnEnrForkId = filterOnEnrForkId;
+      return this;
+    }
+
+    public Builder cacheForEnrRequests(final Cache<Bytes, Packet> cacheToUse) {
+      checkNotNull(cacheToUse);
+      this.cachedEnrRequests = cacheToUse;
+      return this;
+    }
+
+    public Builder rlpxAgent(final RlpxAgent rlpxAgent) {
+      checkNotNull(rlpxAgent);
+      this.rlpxAgent = rlpxAgent;
+      return this;
+    }
+
+    public Builder forkIdManager(final ForkIdManager forkIdManager) {
+      checkNotNull(forkIdManager);
+      this.forkIdManager = forkIdManager;
+      return this;
+    }
   }
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerRequirement.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerRequirement.java
index 2658ebbab68..9da923bbbc9 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerRequirement.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerRequirement.java
@@ -25,7 +25,7 @@ public interface PeerRequirement {
 
   static PeerRequirement combine(final Collection<PeerRequirement> peerRequirements) {
     return () -> {
-      for (PeerRequirement peerRequirement : peerRequirements) {
+      for (final PeerRequirement peerRequirement : peerRequirements) {
         if (!peerRequirement.hasSufficientPeers()) {
           return false;
         }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerTable.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerTable.java
index 48fd3af294b..e153acbfc26 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerTable.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerTable.java
@@ -183,14 +183,14 @@ private void buildBloomFilter() {
   }
 
   /**
-   * Returns the <code>limit</code> peers (at most) closest to the provided target, based on the XOR
-   * distance between the keccak-256 hash of the ID and the keccak-256 hash of the target.
+   * Returns the <code>limit</code> peers (at most) bonded closest to the provided target, based on
+   * the XOR distance between the keccak-256 hash of the ID and the keccak-256 hash of the target.
    *
    * @param target The target node ID.
    * @param limit The amount of results to return.
    * @return The <code>limit</code> closest peers, at most.
    */
-  public List<DiscoveryPeer> nearestPeers(final Bytes target, final int limit) {
+  public List<DiscoveryPeer> nearestBondedPeers(final Bytes target, final int limit) {
     final Bytes keccak256 = Hash.keccak256(target);
     return streamAllPeers()
         .filter(p -> p.getStatus() == PeerDiscoveryStatus.BONDED)
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PingPacketData.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PingPacketData.java
index a9763d94ab7..88c0e4ac708 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PingPacketData.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PingPacketData.java
@@ -17,11 +17,16 @@
 import static com.google.common.base.Preconditions.checkArgument;
 
 import org.hyperledger.besu.ethereum.p2p.discovery.Endpoint;
+import org.hyperledger.besu.ethereum.rlp.MalformedRLPInputException;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
 
 import java.util.Optional;
 
+import org.apache.tuweni.units.bigints.UInt64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class PingPacketData implements PacketData {
 
   /* Fixed value that represents we're using v5 of the P2P discovery protocol. */
@@ -36,37 +41,115 @@ public class PingPacketData implements PacketData {
   /* In seconds after epoch. */
   private final long expiration;
 
+  /* Current sequence number of the sending node’s record */
+  private final UInt64 enrSeq;
+  private static final Logger LOG = LoggerFactory.getLogger(PingPacketData.class);
+
   private PingPacketData(
-      final Optional<Endpoint> maybeFrom, final Endpoint to, final long expiration) {
+      final Optional<Endpoint> maybeFrom,
+      final Endpoint to,
+      final long expiration,
+      final UInt64 enrSeq) {
     checkArgument(to != null, "destination endpoint cannot be null");
     checkArgument(expiration >= 0, "expiration cannot be negative");
 
     this.maybeFrom = maybeFrom;
     this.to = to;
     this.expiration = expiration;
+    this.enrSeq = enrSeq;
   }
 
-  public static PingPacketData create(final Endpoint from, final Endpoint to) {
-    return create(from, to, PacketData.defaultExpiration());
+  public static PingPacketData create(
+      final Optional<Endpoint> from, final Endpoint to, final UInt64 enrSeq) {
+    checkArgument(
+        enrSeq != null && UInt64.ZERO.compareTo(enrSeq) < 0, "enrSeq cannot be null or negative");
+    return create(from, to, PacketData.defaultExpiration(), enrSeq);
   }
 
-  static PingPacketData create(final Endpoint from, final Endpoint to, final long expirationSec) {
-    return new PingPacketData(Optional.of(from), to, expirationSec);
+  static PingPacketData create(
+      final Optional<Endpoint> from,
+      final Endpoint to,
+      final long expirationSec,
+      final UInt64 enrSeq) {
+    checkArgument(
+        enrSeq != null && UInt64.ZERO.compareTo(enrSeq) < 0, "enrSeq cannot be null or negative");
+    return new PingPacketData(from, to, expirationSec, enrSeq);
   }
 
   public static PingPacketData readFrom(final RLPInput in) {
+    in.enterList();
+    // The first element signifies the "version", but this value is ignored as of EIP-8
+    in.readBigIntegerScalar();
+    Optional<Endpoint> from = Optional.empty();
+    Optional<Endpoint> to = Optional.empty();
+    if (in.nextIsList()) {
+      to = Endpoint.maybeDecodeStandalone(in);
+      // https://github.com/ethereum/devp2p/blob/master/discv4.md#ping-packet-0x01
+      if (in.nextIsList()) { // if there are two, the first is the from address, next is the to
+        // address
+        from = to;
+        to = Endpoint.maybeDecodeStandalone(in);
+      }
+    } else {
+      throw new DevP2PException("missing address in ping packet");
+    }
+    final long expiration = in.readLongScalar();
+    UInt64 enrSeq = null;
+    if (!in.isEndOfCurrentList()) {
+      try {
+        enrSeq = UInt64.valueOf(in.readBigIntegerScalar());
+        LOG.trace("read PING enr as long scalar");
+      } catch (MalformedRLPInputException malformed) {
+        LOG.trace("failed to read PING enr as scalar, trying to read bytes instead");
+        enrSeq = UInt64.fromBytes(in.readBytes());
+      }
+    }
+    in.leaveListLenient();
+    return new PingPacketData(from, to.get(), expiration, enrSeq);
+  }
+
+  /**
+   * Used by test classes to read legacy encodes of Pings which used a byte array for the ENR field
+   *
+   * @deprecated Only to be used by internal tests to confirm backward compatibility.
+   * @param in input stream to read from
+   * @return PingPacketData parsed from input, using legacy encode.
+   */
+  @Deprecated
+  public static PingPacketData legacyReadFrom(final RLPInput in) { // only for testing, do not use
     in.enterList();
     // The first element signifies the "version", but this value is ignored as of EIP-8
     in.readBigIntegerScalar();
     final Optional<Endpoint> from = Endpoint.maybeDecodeStandalone(in);
     final Endpoint to = Endpoint.decodeStandalone(in);
     final long expiration = in.readLongScalar();
+    UInt64 enrSeq = null;
+    if (!in.isEndOfCurrentList()) {
+      enrSeq = UInt64.fromBytes(in.readBytes());
+    }
     in.leaveListLenient();
-    return new PingPacketData(from, to, expiration);
+    return new PingPacketData(from, to, expiration, enrSeq);
   }
 
   @Override
   public void writeTo(final RLPOutput out) {
+    out.startList();
+    out.writeIntScalar(VERSION);
+    if (maybeFrom.isPresent()) {
+      maybeFrom.get().encodeStandalone(out);
+    }
+    to.encodeStandalone(out);
+    out.writeLongScalar(expiration);
+    out.writeBigIntegerScalar(enrSeq.toBigInteger());
+    out.endList();
+  }
+
+  /**
+   * @deprecated Only to be used by internal tests to confirm backward compatibility.
+   * @param out stream to write to
+   */
+  @Deprecated
+  public void legacyWriteTo(final RLPOutput out) {
     out.startList();
     out.writeIntScalar(VERSION);
     maybeFrom
@@ -77,6 +160,13 @@ public void writeTo(final RLPOutput out) {
         .encodeStandalone(out);
     to.encodeStandalone(out);
     out.writeLongScalar(expiration);
+    out.writeBytes(
+        getEnrSeq()
+            .orElseThrow(
+                () ->
+                    new IllegalStateException(
+                        "Attempting to serialize invalid PING packet. Missing 'enrSeq' field"))
+            .toBytes());
     out.endList();
   }
 
@@ -92,6 +182,10 @@ public long getExpiration() {
     return expiration;
   }
 
+  public Optional<UInt64> getEnrSeq() {
+    return Optional.ofNullable(enrSeq);
+  }
+
   @Override
   public String toString() {
     return "PingPacketData{"
@@ -101,6 +195,8 @@ public String toString() {
         + to
         + ", expiration="
         + expiration
+        + ", enrSeq="
+        + enrSeq
         + '}';
   }
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PongPacketData.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PongPacketData.java
index 86c9f28726c..dd832c17032 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PongPacketData.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PongPacketData.java
@@ -15,10 +15,16 @@
 package org.hyperledger.besu.ethereum.p2p.discovery.internal;
 
 import org.hyperledger.besu.ethereum.p2p.discovery.Endpoint;
+import org.hyperledger.besu.ethereum.rlp.MalformedRLPInputException;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
 
+import java.util.Optional;
+
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PongPacketData implements PacketData {
 
@@ -31,14 +37,21 @@ public class PongPacketData implements PacketData {
   /* In seconds after epoch. */
   private final long expiration;
 
-  private PongPacketData(final Endpoint to, final Bytes pingHash, final long expiration) {
+  /* Current sequence number of the sending node’s record */
+  private final UInt64 enrSeq;
+  private static final Logger LOG = LoggerFactory.getLogger(PongPacketData.class);
+
+  private PongPacketData(
+      final Endpoint to, final Bytes pingHash, final long expiration, final UInt64 enrSeq) {
     this.to = to;
     this.pingHash = pingHash;
     this.expiration = expiration;
+    this.enrSeq = enrSeq;
   }
 
-  public static PongPacketData create(final Endpoint to, final Bytes pingHash) {
-    return new PongPacketData(to, pingHash, PacketData.defaultExpiration());
+  public static PongPacketData create(
+      final Endpoint to, final Bytes pingHash, final UInt64 enrSeq) {
+    return new PongPacketData(to, pingHash, PacketData.defaultExpiration(), enrSeq);
   }
 
   public static PongPacketData readFrom(final RLPInput in) {
@@ -46,8 +59,18 @@ public static PongPacketData readFrom(final RLPInput in) {
     final Endpoint to = Endpoint.decodeStandalone(in);
     final Bytes hash = in.readBytes();
     final long expiration = in.readLongScalar();
+    UInt64 enrSeq = null;
+    if (!in.isEndOfCurrentList()) {
+      try {
+        enrSeq = UInt64.valueOf(in.readBigIntegerScalar());
+        LOG.trace("read PONG enr from scalar");
+      } catch (final MalformedRLPInputException malformed) {
+        LOG.trace("failed to read PONG enr from scalar, trying as byte array");
+        enrSeq = UInt64.fromBytes(in.readBytes());
+      }
+    }
     in.leaveListLenient();
-    return new PongPacketData(to, hash, expiration);
+    return new PongPacketData(to, hash, expiration, enrSeq);
   }
 
   @Override
@@ -56,6 +79,48 @@ public void writeTo(final RLPOutput out) {
     to.encodeStandalone(out);
     out.writeBytes(pingHash);
     out.writeLongScalar(expiration);
+    out.writeBigIntegerScalar(enrSeq.toBigInteger());
+    out.endList();
+  }
+
+  /**
+   * Used by test classes to read legacy encodes of Pongs which used a byte array for the ENR field
+   *
+   * @deprecated Only to be used by internal tests to confirm backward compatibility.
+   * @param in input stream being read from
+   * @return PongPacketData parsed from input, using legacy encode
+   */
+  @Deprecated
+  public static PongPacketData legacyReadFrom(final RLPInput in) {
+    in.enterList();
+    final Endpoint to = Endpoint.decodeStandalone(in);
+    final Bytes hash = in.readBytes();
+    final long expiration = in.readLongScalar();
+    UInt64 enrSeq = null;
+    if (!in.isEndOfCurrentList()) {
+      enrSeq = UInt64.fromBytes(in.readBytes());
+    }
+    in.leaveListLenient();
+    return new PongPacketData(to, hash, expiration, enrSeq);
+  }
+
+  /**
+   * @deprecated Only to be used by internal tests to confirm backward compatibility.
+   * @param out output stream being written to
+   */
+  @Deprecated
+  public void legacyWriteTo(final RLPOutput out) {
+    out.startList();
+    to.encodeStandalone(out);
+    out.writeBytes(pingHash);
+    out.writeLongScalar(expiration);
+    out.writeBytes(
+        getEnrSeq()
+            .orElseThrow(
+                () ->
+                    new IllegalStateException(
+                        "Attempting to serialize invalid PONG packet. Missing 'enrSeq' field"))
+            .toBytes());
     out.endList();
   }
 
@@ -68,6 +133,8 @@ public String toString() {
         + pingHash
         + ", expiration="
         + expiration
+        + ", enrSeq="
+        + enrSeq
         + '}';
   }
 
@@ -82,4 +149,8 @@ public Bytes getPingHash() {
   public long getExpiration() {
     return expiration;
   }
+
+  public Optional<UInt64> getEnrSeq() {
+    return Optional.ofNullable(enrSeq);
+  }
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/RecursivePeerRefreshState.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/RecursivePeerRefreshState.java
index 821aec8c9d5..70b1552e015 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/RecursivePeerRefreshState.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/RecursivePeerRefreshState.java
@@ -28,12 +28,12 @@
 import java.util.stream.Collectors;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class RecursivePeerRefreshState {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(RecursivePeerRefreshState.class);
   private static final int MAX_CONCURRENT_REQUESTS = 3;
   private Bytes target;
   private final PeerDiscoveryPermissions peerPermissions;
@@ -93,6 +93,7 @@ private boolean reachedMaximumNumberOfRounds() {
   }
 
   private void addInitialPeers(final List<DiscoveryPeer> initialPeers) {
+    LOG.debug("INITIAL PEERS: {}", initialPeers);
     this.initialPeers = initialPeers;
     for (final DiscoveryPeer peer : initialPeers) {
       final MetadataPeer iterationParticipant =
@@ -190,7 +191,10 @@ void onNeighboursReceived(final DiscoveryPeer peer, final List<DiscoveryPeer> pe
     if (metadataPeer == null) {
       return;
     }
-    LOG.debug("Received neighbours packet with {} neighbours", peers.size());
+    LOG.debug(
+        "Received neighbours packet with {} neighbours from {}",
+        peers.size(),
+        peer.getEnodeURLString());
     for (final DiscoveryPeer receivedDiscoPeer : peers) {
       if (satisfiesMapAdditionCriteria(receivedDiscoPeer)) {
         final MetadataPeer receivedMetadataPeer =
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetwork.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetwork.java
index ed1f87b3c5d..427093cb599 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetwork.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetwork.java
@@ -17,16 +17,18 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 
-import org.hyperledger.besu.crypto.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.Util;
+import org.hyperledger.besu.ethereum.forkid.ForkIdManager;
 import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
 import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer;
 import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryAgent;
-import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryEvent.PeerBondedEvent;
 import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryStatus;
 import org.hyperledger.besu.ethereum.p2p.discovery.VertxPeerDiscoveryAgent;
 import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeerPrivileges;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.peers.LocalNode;
 import org.hyperledger.besu.ethereum.p2p.peers.MaintainedPeers;
 import org.hyperledger.besu.ethereum.p2p.peers.MutableLocalNode;
@@ -39,14 +41,18 @@
 import org.hyperledger.besu.ethereum.p2p.rlpx.MessageCallback;
 import org.hyperledger.besu.ethereum.p2p.rlpx.RlpxAgent;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
+import org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty.TLSConfiguration;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.ShouldConnectCallback;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
 import org.hyperledger.besu.ethereum.storage.StorageProvider;
 import org.hyperledger.besu.nat.NatMethod;
 import org.hyperledger.besu.nat.NatService;
+import org.hyperledger.besu.nat.core.NatManager;
 import org.hyperledger.besu.nat.core.domain.NatServiceType;
 import org.hyperledger.besu.nat.core.domain.NetworkProtocol;
 import org.hyperledger.besu.nat.upnp.UpnpNatManager;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
 import java.time.Duration;
@@ -56,24 +62,25 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
-import java.util.OptionalLong;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import com.google.common.annotations.VisibleForTesting;
 import io.vertx.core.Vertx;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.devp2p.EthereumNodeRecord;
 import org.apache.tuweni.discovery.DNSDaemon;
+import org.apache.tuweni.discovery.DNSDaemonListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The peer network service (defunct PeerNetworkingService) is the entrypoint to the peer-to-peer
@@ -117,7 +124,7 @@
  */
 public class DefaultP2PNetwork implements P2PNetwork {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(DefaultP2PNetwork.class);
 
   private final ScheduledExecutorService peerConnectionScheduler =
       Executors.newSingleThreadScheduledExecutor();
@@ -134,14 +141,10 @@ public class DefaultP2PNetwork implements P2PNetwork {
 
   private final NatService natService;
 
-  private OptionalLong peerBondedObserverId = OptionalLong.empty();
-
   private final AtomicBoolean started = new AtomicBoolean(false);
   private final AtomicBoolean stopped = new AtomicBoolean(false);
   private final CountDownLatch shutdownLatch = new CountDownLatch(2);
-  private final Duration shutdownTimeout = Duration.ofMinutes(1);
-
-  private final AtomicReference<List<DiscoveryPeer>> dnsPeers = new AtomicReference<>();
+  private final Duration shutdownTimeout = Duration.ofSeconds(15);
   private DNSDaemon dnsDaemon;
 
   /**
@@ -170,7 +173,7 @@ public class DefaultP2PNetwork implements P2PNetwork {
       final PeerPermissions peerPermissions,
       final NatService natService,
       final MaintainedPeers maintainedPeers,
-      final PeerReputationManager reputationManager) {
+      final PeerDenylistManager reputationManager) {
     this.localNode = localNode;
     this.peerDiscoveryAgent = peerDiscoveryAgent;
     this.rlpxAgent = rlpxAgent;
@@ -181,8 +184,10 @@ public class DefaultP2PNetwork implements P2PNetwork {
     this.nodeId = nodeKey.getPublicKey().getEncodedBytes();
     this.peerPermissions = peerPermissions;
 
-    final int maxPeers = config.getRlpx().getMaxPeers();
-    peerDiscoveryAgent.addPeerRequirement(() -> rlpxAgent.getConnectionCount() >= maxPeers);
+    // set the requirement here that the number of peers be greater than the lower bound
+    final int peerLowerBound = rlpxAgent.getPeerLowerBound();
+    LOG.debug("setting peerLowerBound {}", peerLowerBound);
+    peerDiscoveryAgent.addPeerRequirement(() -> rlpxAgent.getConnectionCount() >= peerLowerBound);
     subscribeDisconnect(reputationManager);
   }
 
@@ -197,33 +202,36 @@ public void start() {
       return;
     }
 
+    if (config.getDiscovery().isDiscoveryV5Enabled()) {
+      LOG.warn("Discovery Protocol v5 is not available");
+    }
+
     final String address = config.getDiscovery().getAdvertisedHost();
     final int configuredDiscoveryPort = config.getDiscovery().getBindPort();
     final int configuredRlpxPort = config.getRlpx().getBindPort();
-    if (config.getDiscovery().getDNSDiscoveryURL() != null) {
-      LOG.info("Starting DNS discovery with URL {}", config.getDiscovery().getDNSDiscoveryURL());
-      dnsDaemon = new DNSDaemon(config.getDiscovery().getDNSDiscoveryURL());
-      dnsDaemon
-          .getListeners()
-          .add(
-              (seq, records) -> {
-                List<DiscoveryPeer> peers = new ArrayList<>();
-                for (EthereumNodeRecord enr : records) {
-                  EnodeURL enodeURL =
-                      EnodeURL.builder()
-                          .ipAddress(enr.ip())
-                          .nodeId(enr.publicKey().bytes())
-                          .discoveryPort(Optional.ofNullable(enr.udp()))
-                          .listeningPort(Optional.ofNullable(enr.tcp()))
-                          .build();
-                  DiscoveryPeer peer = DiscoveryPeer.fromEnode(enodeURL);
-                  peers.add(peer);
-                  rlpxAgent.connect(peer);
-                }
-                dnsPeers.set(peers);
-                return null;
-              });
-    }
+
+    Optional.ofNullable(config.getDiscovery().getDNSDiscoveryURL())
+        .ifPresent(
+            disco -> {
+              // These lists are updated every 12h
+              // We retrieve the list every 10 minutes (600000 msec)
+              LOG.info("Starting DNS discovery with URL {}", disco);
+              config
+                  .getDnsDiscoveryServerOverride()
+                  .ifPresent(
+                      dnsServer ->
+                          LOG.info(
+                              "Starting DNS discovery with DNS Server override {}", dnsServer));
+
+              dnsDaemon =
+                  new DNSDaemon(
+                      disco,
+                      createDaemonListener(),
+                      0L,
+                      600000L,
+                      config.getDnsDiscoveryServerOverride().orElse(null));
+              dnsDaemon.start();
+            });
 
     final int listeningPort = rlpxAgent.start().join();
     final int discoveryPort =
@@ -234,20 +242,23 @@ public void start() {
                     : configuredDiscoveryPort)
             .join();
 
-    natService.ifNatEnvironment(
-        NatMethod.UPNP,
+    final Consumer<? super NatManager> natAction =
         natManager -> {
-          UpnpNatManager upnpNatManager = (UpnpNatManager) natManager;
+          final UpnpNatManager upnpNatManager = (UpnpNatManager) natManager;
           upnpNatManager.requestPortForward(
               discoveryPort, NetworkProtocol.UDP, NatServiceType.DISCOVERY);
           upnpNatManager.requestPortForward(
               listeningPort, NetworkProtocol.TCP, NatServiceType.RLPX);
-        });
+        };
+
+    natService.ifNatEnvironment(NatMethod.UPNP, natAction);
+    natService.ifNatEnvironment(NatMethod.UPNPP2PONLY, natAction);
 
     setLocalNode(address, listeningPort, discoveryPort);
 
-    peerBondedObserverId =
-        OptionalLong.of(peerDiscoveryAgent.observePeerBondedEvents(this::handlePeerBondedEvent));
+    // Call checkMaintainedConnectionPeers() now that the local node is up, for immediate peer
+    // additions
+    checkMaintainedConnectionPeers();
 
     // Periodically check maintained connections
     final int checkMaintainedConnectionsSec = config.getCheckMaintainedConnectionsFrequencySec();
@@ -266,15 +277,11 @@ public void stop() {
       return;
     }
 
-    if (dnsDaemon != null) {
-      dnsDaemon.close();
-    }
+    getDnsDaemon().ifPresent(DNSDaemon::close);
 
     peerConnectionScheduler.shutdownNow();
     peerDiscoveryAgent.stop().whenComplete((res, err) -> shutdownLatch.countDown());
     rlpxAgent.stop().whenComplete((res, err) -> shutdownLatch.countDown());
-    peerBondedObserverId.ifPresent(peerDiscoveryAgent::removePeerBondedObserver);
-    peerBondedObserverId = OptionalLong.empty();
     peerPermissions.close();
   }
 
@@ -298,7 +305,12 @@ public void awaitStop() {
   }
 
   @Override
-  public boolean addMaintainConnectionPeer(final Peer peer) {
+  public RlpxAgent getRlpxAgent() {
+    return rlpxAgent;
+  }
+
+  @Override
+  public boolean addMaintainedConnectionPeer(final Peer peer) {
     if (localNode.isReady()
         && localNode.getPeer() != null
         && localNode.getPeer().getEnodeURL() != null
@@ -320,14 +332,46 @@ public boolean removeMaintainedConnectionPeer(final Peer peer) {
     return wasRemoved;
   }
 
+  @VisibleForTesting
+  Optional<DNSDaemon> getDnsDaemon() {
+    return Optional.ofNullable(dnsDaemon);
+  }
+
+  @VisibleForTesting
+  DNSDaemonListener createDaemonListener() {
+    return (seq, records) -> {
+      final List<DiscoveryPeer> peers = new ArrayList<>();
+      for (final EthereumNodeRecord enr : records) {
+        final EnodeURL enodeURL =
+            EnodeURLImpl.builder()
+                .ipAddress(enr.ip())
+                .nodeId(enr.publicKey().bytes())
+                .discoveryPort(Optional.ofNullable(enr.udp()))
+                .listeningPort(Optional.ofNullable(enr.tcp()))
+                .build();
+        final DiscoveryPeer peer = DiscoveryPeer.fromEnode(enodeURL);
+        peers.add(peer);
+      }
+      if (!peers.isEmpty()) {
+        peers.stream().forEach(peerDiscoveryAgent::bond);
+      }
+    };
+  }
+
   @VisibleForTesting
   void checkMaintainedConnectionPeers() {
     if (!localNode.isReady()) {
       return;
     }
+    final List<Bytes> doNotConnectTo =
+        rlpxAgent
+            .streamActiveConnections()
+            .map(c -> c.getPeer().getId())
+            .collect(Collectors.toList());
+    doNotConnectTo.add(localNode.getPeer().getEnodeURL().getNodeId());
     maintainedPeers
         .streamPeers()
-        .filter(p -> !rlpxAgent.getPeerConnection(p).isPresent())
+        .filter(p -> !doNotConnectTo.contains(p.getId()))
         .forEach(rlpxAgent::connect);
   }
 
@@ -337,6 +381,7 @@ void attemptPeerConnections() {
     rlpxAgent.connect(
         streamDiscoveredPeers()
             .filter(peer -> peer.getStatus() == PeerDiscoveryStatus.BONDED)
+            .filter(peerDiscoveryAgent::checkForkId)
             .sorted(Comparator.comparing(DiscoveryPeer::getLastAttemptedConnection)));
   }
 
@@ -345,12 +390,13 @@ public Collection<PeerConnection> getPeers() {
     return rlpxAgent.streamConnections().collect(Collectors.toList());
   }
 
+  @Override
+  public int getPeerCount() {
+    return getRlpxAgent().getConnectionCount();
+  }
+
   @Override
   public Stream<DiscoveryPeer> streamDiscoveredPeers() {
-    List<DiscoveryPeer> peers = dnsPeers.get();
-    if (peers != null) {
-      return Stream.concat(peerDiscoveryAgent.streamDiscoveredPeers(), peers.stream());
-    }
     return peerDiscoveryAgent.streamDiscoveredPeers();
   }
 
@@ -370,12 +416,14 @@ public void subscribeConnect(final ConnectCallback callback) {
   }
 
   @Override
-  public void subscribeDisconnect(final DisconnectCallback callback) {
-    rlpxAgent.subscribeDisconnect(callback);
+  public void subscribeConnectRequest(final ShouldConnectCallback callback) {
+    rlpxAgent.subscribeConnectRequest(callback);
   }
+  ;
 
-  private void handlePeerBondedEvent(final PeerBondedEvent peerBondedEvent) {
-    rlpxAgent.connect(peerBondedEvent.getPeer());
+  @Override
+  public void subscribeDisconnect(final DisconnectCallback callback) {
+    rlpxAgent.subscribeDisconnect(callback);
   }
 
   @Override
@@ -417,7 +465,7 @@ private void setLocalNode(
     final String advertisedAddress = natService.queryExternalIPAddress(address);
 
     final EnodeURL localEnode =
-        EnodeURL.builder()
+        EnodeURLImpl.builder()
             .nodeId(nodeId)
             .ipAddress(advertisedAddress)
             .listeningPort(listeningPort)
@@ -429,6 +477,11 @@ private void setLocalNode(
     localNode.setEnode(localEnode);
   }
 
+  @Override
+  public void updateNodeRecord() {
+    peerDiscoveryAgent.updateNodeRecord();
+  }
+
   public static class Builder {
 
     private Vertx vertx;
@@ -443,10 +496,16 @@ public static class Builder {
     private PeerPermissions peerPermissions = PeerPermissions.noop();
 
     private NatService natService = new NatService(Optional.empty());
-    private boolean randomPeerPriority;
-
     private MetricsSystem metricsSystem;
     private StorageProvider storageProvider;
+    private Optional<TLSConfiguration> p2pTLSConfiguration = Optional.empty();
+    private Blockchain blockchain;
+    private List<Long> blockNumberForks;
+    private List<Long> timestampForks;
+    private boolean legacyForkIdEnabled = false;
+    private Supplier<Stream<PeerConnection>> allConnectionsSupplier;
+    private Supplier<Stream<PeerConnection>> allActiveConnectionsSupplier;
+    private int peersLowerBound;
 
     public P2PNetwork build() {
       validate();
@@ -457,14 +516,15 @@ private P2PNetwork doBuild() {
       // Set up permissions
       // Fold peer reputation into permissions
       final PeerPermissionsDenylist misbehavingPeers = PeerPermissionsDenylist.create(500);
-      final PeerReputationManager reputationManager = new PeerReputationManager(misbehavingPeers);
+      final PeerDenylistManager reputationManager =
+          new PeerDenylistManager(misbehavingPeers, maintainedPeers);
       peerPermissions = PeerPermissions.combine(peerPermissions, misbehavingPeers);
 
       final MutableLocalNode localNode =
           MutableLocalNode.create(config.getRlpx().getClientId(), 5, supportedCapabilities);
       final PeerPrivileges peerPrivileges = new DefaultPeerPrivileges(maintainedPeers);
-      peerDiscoveryAgent = peerDiscoveryAgent == null ? createDiscoveryAgent() : peerDiscoveryAgent;
       rlpxAgent = rlpxAgent == null ? createRlpxAgent(localNode, peerPrivileges) : rlpxAgent;
+      peerDiscoveryAgent = peerDiscoveryAgent == null ? createDiscoveryAgent() : peerDiscoveryAgent;
 
       return new DefaultP2PNetwork(
           localNode,
@@ -487,9 +547,15 @@ private void validate() {
       checkState(metricsSystem != null, "MetricsSystem must be set.");
       checkState(storageProvider != null, "StorageProvider must be set.");
       checkState(peerDiscoveryAgent != null || vertx != null, "Vertx must be set.");
+      checkState(blockNumberForks != null, "BlockNumberForks must be set.");
+      checkState(timestampForks != null, "TimestampForks must be set.");
+      checkState(allConnectionsSupplier != null, "Supplier must be set.");
+      checkState(allActiveConnectionsSupplier != null, "Supplier must be set.");
     }
 
     private PeerDiscoveryAgent createDiscoveryAgent() {
+      final ForkIdManager forkIdManager =
+          new ForkIdManager(blockchain, blockNumberForks, timestampForks, this.legacyForkIdEnabled);
 
       return new VertxPeerDiscoveryAgent(
           vertx,
@@ -498,11 +564,14 @@ private PeerDiscoveryAgent createDiscoveryAgent() {
           peerPermissions,
           natService,
           metricsSystem,
-          storageProvider);
+          storageProvider,
+          forkIdManager,
+          rlpxAgent);
     }
 
     private RlpxAgent createRlpxAgent(
         final LocalNode localNode, final PeerPrivileges peerPrivileges) {
+
       return RlpxAgent.builder()
           .nodeKey(nodeKey)
           .config(config.getRlpx())
@@ -510,7 +579,10 @@ private RlpxAgent createRlpxAgent(
           .peerPrivileges(peerPrivileges)
           .localNode(localNode)
           .metricsSystem(metricsSystem)
-          .randomPeerPriority(randomPeerPriority)
+          .p2pTLSConfiguration(p2pTLSConfiguration)
+          .allConnectionsSupplier(allConnectionsSupplier)
+          .allActiveConnectionsSupplier(allActiveConnectionsSupplier)
+          .peersLowerBound(peersLowerBound)
           .build();
     }
 
@@ -526,11 +598,6 @@ public Builder rlpxAgent(final RlpxAgent rlpxAgent) {
       return this;
     }
 
-    public Builder randomPeerPriority(final boolean randomPeerPriority) {
-      this.randomPeerPriority = randomPeerPriority;
-      return this;
-    }
-
     public Builder vertx(final Vertx vertx) {
       checkNotNull(vertx);
       this.vertx = vertx;
@@ -589,5 +656,51 @@ public Builder storageProvider(final StorageProvider storageProvider) {
       this.storageProvider = storageProvider;
       return this;
     }
+
+    public Builder p2pTLSConfiguration(final Optional<TLSConfiguration> p2pTLSConfiguration) {
+      checkNotNull(p2pTLSConfiguration);
+      this.p2pTLSConfiguration = p2pTLSConfiguration;
+      return this;
+    }
+
+    public Builder blockchain(final MutableBlockchain blockchain) {
+      checkNotNull(blockchain);
+      this.blockchain = blockchain;
+      return this;
+    }
+
+    public Builder blockNumberForks(final List<Long> forks) {
+      checkNotNull(forks);
+      this.blockNumberForks = forks;
+      return this;
+    }
+
+    public Builder timestampForks(final List<Long> forks) {
+      checkNotNull(forks);
+      this.timestampForks = forks;
+      return this;
+    }
+
+    public Builder legacyForkIdEnabled(final boolean legacyForkIdEnabled) {
+      this.legacyForkIdEnabled = legacyForkIdEnabled;
+      return this;
+    }
+
+    public Builder allConnectionsSupplier(
+        final Supplier<Stream<PeerConnection>> allConnectionsSupplier) {
+      this.allConnectionsSupplier = allConnectionsSupplier;
+      return this;
+    }
+
+    public Builder allActiveConnectionsSupplier(
+        final Supplier<Stream<PeerConnection>> allActiveConnectionsSupplier) {
+      this.allActiveConnectionsSupplier = allActiveConnectionsSupplier;
+      return this;
+    }
+
+    public Builder peersLowerBound(final int peersLowerBound) {
+      this.peersLowerBound = peersLowerBound;
+      return this;
+    }
   }
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/NetworkRunner.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/NetworkRunner.java
index 294d1f5c631..5811bd65f99 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/NetworkRunner.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/NetworkRunner.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.p2p.network;
 
+import org.hyperledger.besu.ethereum.p2p.rlpx.RlpxAgent;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
@@ -32,13 +33,13 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class NetworkRunner implements AutoCloseable {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(NetworkRunner.class);
 
-  private final CountDownLatch shutdown = new CountDownLatch(1);;
+  private final CountDownLatch shutdown = new CountDownLatch(1);
   private final AtomicBoolean started = new AtomicBoolean(false);
   private final AtomicBoolean stopped = new AtomicBoolean(false);
 
@@ -78,6 +79,12 @@ public void start() {
       LOG.info("Starting Network.");
       setupHandlers();
       network.start();
+
+      LOG.info(
+          "Supported capabilities: {}",
+          protocolManagers.stream()
+              .map(q -> String.format("%s", q.getSupportedCapabilities()))
+              .collect(Collectors.joining(", ")));
     } else {
       LOG.error("Attempted to start already running network.");
     }
@@ -148,6 +155,9 @@ private void setupHandlers() {
             protocolManager.handleNewConnection(connection);
           });
 
+      network.subscribeConnectRequest(
+          (peer, incoming) -> protocolManager.shouldConnect(peer, incoming));
+
       network.subscribeDisconnect(
           (connection, disconnectReason, initiatedByPeer) -> {
             if (Collections.disjoint(
@@ -164,6 +174,10 @@ public void close() {
     stop();
   }
 
+  public RlpxAgent getRlpxAgent() {
+    return network.getRlpxAgent();
+  }
+
   public static class Builder {
     private NetworkBuilder networkProvider;
     List<ProtocolManager> protocolManagers = new ArrayList<>();
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/NoopP2PNetwork.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/NoopP2PNetwork.java
index 5fcffd6835d..36f44148266 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/NoopP2PNetwork.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/NoopP2PNetwork.java
@@ -16,13 +16,14 @@
 
 import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer;
 import org.hyperledger.besu.ethereum.p2p.network.exceptions.P2PDisabledException;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.rlpx.ConnectCallback;
 import org.hyperledger.besu.ethereum.p2p.rlpx.DisconnectCallback;
 import org.hyperledger.besu.ethereum.p2p.rlpx.MessageCallback;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.ShouldConnectCallback;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -52,11 +53,14 @@ public void subscribe(final Capability capability, final MessageCallback callbac
   @Override
   public void subscribeConnect(final ConnectCallback callback) {}
 
+  @Override
+  public void subscribeConnectRequest(final ShouldConnectCallback callback) {}
+
   @Override
   public void subscribeDisconnect(final DisconnectCallback callback) {}
 
   @Override
-  public boolean addMaintainConnectionPeer(final Peer peer) {
+  public boolean addMaintainedConnectionPeer(final Peer peer) {
     throw new P2PDisabledException("P2P networking disabled.  Unable to connect to add peer.");
   }
 
@@ -91,6 +95,9 @@ public Optional<EnodeURL> getLocalEnode() {
     return Optional.empty();
   }
 
+  @Override
+  public void updateNodeRecord() {}
+
   @Override
   public void close() throws IOException {}
 
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/P2PNetwork.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/P2PNetwork.java
index 82dcc469a56..268801c9dc0 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/P2PNetwork.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/P2PNetwork.java
@@ -15,14 +15,16 @@
 package org.hyperledger.besu.ethereum.p2p.network;
 
 import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.rlpx.ConnectCallback;
 import org.hyperledger.besu.ethereum.p2p.rlpx.DisconnectCallback;
 import org.hyperledger.besu.ethereum.p2p.rlpx.MessageCallback;
+import org.hyperledger.besu.ethereum.p2p.rlpx.RlpxAgent;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.ShouldConnectCallback;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.io.Closeable;
 import java.util.Collection;
@@ -83,8 +85,9 @@ default int getPeerCount() {
    *
    * @param callback The callback to invoke when a new connection is established
    */
-  void subscribeConnect(ConnectCallback callback);
+  void subscribeConnect(final ConnectCallback callback);
 
+  void subscribeConnectRequest(final ShouldConnectCallback callback);
   /**
    * Subscribe a {@link Consumer} to all incoming new Peer disconnect events.
    *
@@ -101,14 +104,14 @@ default int getPeerCount() {
    * @return boolean representing whether or not the peer has been added to the list, false is
    *     returned if the peer was already on the list
    */
-  boolean addMaintainConnectionPeer(final Peer peer);
+  boolean addMaintainedConnectionPeer(final Peer peer);
 
   /**
    * Disconnect and remove the given {@link Peer} from the maintained peer list. Peer is
    * disconnected even if it is not in the maintained peer list. See {@link
-   * #addMaintainConnectionPeer(Peer)} for details on the maintained peer list.
+   * #addMaintainedConnectionPeer(Peer)} for details on the maintained peer list.
    *
-   * @param peer The peer to which connections are not longer required
+   * @param peer The peer to which connections are no longer required
    * @return boolean representing whether the peer was removed from the maintained peer list
    */
   boolean removeMaintainedConnectionPeer(final Peer peer);
@@ -147,4 +150,11 @@ default int getPeerCount() {
    *     otherwise.
    */
   Optional<EnodeURL> getLocalEnode();
+
+  void updateNodeRecord();
+
+  default RlpxAgent getRlpxAgent() {
+    return null;
+  }
+  ;
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/PeerDenylistManager.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/PeerDenylistManager.java
new file mode 100644
index 00000000000..bf98a0bb3f5
--- /dev/null
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/PeerDenylistManager.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.network;
+
+import org.hyperledger.besu.ethereum.p2p.peers.MaintainedPeers;
+import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissionsDenylist;
+import org.hyperledger.besu.ethereum.p2p.rlpx.DisconnectCallback;
+import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
+
+import java.util.Set;
+
+import com.google.common.collect.ImmutableSet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PeerDenylistManager implements DisconnectCallback {
+  private static final Logger LOG = LoggerFactory.getLogger(PeerDenylistManager.class);
+  private static final Set<DisconnectReason> locallyTriggeredDisconnectReasons =
+      ImmutableSet.of(
+          DisconnectReason.BREACH_OF_PROTOCOL, DisconnectReason.INCOMPATIBLE_P2P_PROTOCOL_VERSION);
+
+  private static final Set<DisconnectReason> remotelyTriggeredDisconnectReasons =
+      ImmutableSet.of(DisconnectReason.INCOMPATIBLE_P2P_PROTOCOL_VERSION);
+
+  private final PeerPermissionsDenylist denylist;
+
+  private final MaintainedPeers maintainedPeers;
+
+  public PeerDenylistManager(
+      final PeerPermissionsDenylist denylist, final MaintainedPeers maintainedPeers) {
+    this.denylist = denylist;
+    this.maintainedPeers = maintainedPeers;
+  }
+
+  @Override
+  public void onDisconnect(
+      final PeerConnection connection,
+      final DisconnectReason reason,
+      final boolean initiatedByPeer) {
+    if (shouldBlock(reason, initiatedByPeer)) {
+      if (maintainedPeers.contains(connection.getPeer())) {
+        LOG.debug(
+            "Skip adding maintained peer {} to peer denylist for reason {}",
+            connection,
+            reason.name());
+      } else {
+        LOG.debug("Added peer {} to peer denylist for reason {}", connection, reason.name());
+        denylist.add(connection.getPeer());
+      }
+    }
+  }
+
+  private boolean shouldBlock(final DisconnectReason reason, final boolean initiatedByPeer) {
+    return (!initiatedByPeer && locallyTriggeredDisconnectReasons.contains(reason))
+        || (initiatedByPeer && remotelyTriggeredDisconnectReasons.contains(reason));
+  }
+}
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/PeerReputationManager.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/PeerReputationManager.java
deleted file mode 100644
index e452999a33f..00000000000
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/PeerReputationManager.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.p2p.network;
-
-import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissionsDenylist;
-import org.hyperledger.besu.ethereum.p2p.rlpx.DisconnectCallback;
-import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
-import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
-
-import java.util.Set;
-
-import com.google.common.collect.ImmutableSet;
-
-public class PeerReputationManager implements DisconnectCallback {
-  private static final Set<DisconnectReason> locallyTriggeredDisconnectReasons =
-      ImmutableSet.of(
-          DisconnectReason.BREACH_OF_PROTOCOL, DisconnectReason.INCOMPATIBLE_P2P_PROTOCOL_VERSION);
-
-  private static final Set<DisconnectReason> remotelyTriggeredDisconnectReasons =
-      ImmutableSet.of(DisconnectReason.INCOMPATIBLE_P2P_PROTOCOL_VERSION);
-
-  private final PeerPermissionsDenylist blacklist;
-
-  public PeerReputationManager(final PeerPermissionsDenylist blacklist) {
-    this.blacklist = blacklist;
-  }
-
-  @Override
-  public void onDisconnect(
-      final PeerConnection connection,
-      final DisconnectReason reason,
-      final boolean initiatedByPeer) {
-    if (shouldBlock(reason, initiatedByPeer)) {
-      blacklist.add(connection.getPeer());
-    }
-  }
-
-  private boolean shouldBlock(final DisconnectReason reason, final boolean initiatedByPeer) {
-    return (!initiatedByPeer && locallyTriggeredDisconnectReasons.contains(reason))
-        || (initiatedByPeer && remotelyTriggeredDisconnectReasons.contains(reason));
-  }
-}
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/ProtocolManager.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/ProtocolManager.java
index 2042c361d00..f87847a488d 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/ProtocolManager.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/ProtocolManager.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.p2p.network;
 
+import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message;
@@ -58,6 +59,14 @@ public interface ProtocolManager extends AutoCloseable {
    */
   void handleNewConnection(PeerConnection peerConnection);
 
+  /**
+   * Call this to find out whether we should try to connect to a certain peer
+   *
+   * @param peer the peer that we are trying to connect to
+   * @param incoming true if the connection is incoming
+   * @return true, if the ProtocolManager wants to connect to the peer, false otherwise
+   */
+  boolean shouldConnect(Peer peer, final boolean incoming);
   /**
    * Handles peer disconnects.
    *
@@ -69,6 +78,13 @@ public interface ProtocolManager extends AutoCloseable {
   void handleDisconnect(
       PeerConnection peerConnection, DisconnectReason disconnectReason, boolean initiatedByPeer);
 
+  /**
+   * Returns the highest capability in the list of capabilities supported by this manager.
+   *
+   * @return the highest capability
+   */
+  int getHighestProtocolVersion();
+
   @Override
   default void close() {
     stop();
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/exceptions/PeerChannelClosedException.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/exceptions/PeerChannelClosedException.java
new file mode 100644
index 00000000000..34590ae1d61
--- /dev/null
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/exceptions/PeerChannelClosedException.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.p2p.network.exceptions;
+
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo;
+
+public class PeerChannelClosedException extends RuntimeException {
+  public PeerChannelClosedException(final PeerInfo peerInfo) {
+    super(String.format("Failed to create connection for peer %s", peerInfo));
+  }
+}
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultLocalNode.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultLocalNode.java
index 5fd0ee25a12..5a0f4d6075e 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultLocalNode.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultLocalNode.java
@@ -16,6 +16,7 @@
 
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultPeer.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultPeer.java
index 9d5973b7a8e..38d38a51ba2 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultPeer.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultPeer.java
@@ -14,17 +14,22 @@
  */
 package org.hyperledger.besu.ethereum.p2p.peers;
 
+import org.hyperledger.besu.ethereum.forkid.ForkId;
+import org.hyperledger.besu.plugin.data.EnodeURL;
+
 import java.net.URI;
 import java.util.Objects;
+import java.util.Optional;
 
 /** The default, basic representation of an Ethereum {@link Peer}. */
 public class DefaultPeer extends DefaultPeerId implements Peer {
 
-  private final EnodeURL enode;
+  private final EnodeURL enodeURL;
+  private ForkId forkId;
 
-  protected DefaultPeer(final EnodeURL enode) {
-    super(enode.getNodeId());
-    this.enode = enode;
+  protected DefaultPeer(final EnodeURL enodeURL) {
+    super(enodeURL.getNodeId());
+    this.enodeURL = enodeURL;
   }
 
   public static DefaultPeer fromEnodeURL(final EnodeURL enodeURL) {
@@ -39,7 +44,7 @@ public static DefaultPeer fromEnodeURL(final EnodeURL enodeURL) {
    * @see <a href="https://github.com/ethereum/wiki/wiki/enode-url-format">enode URL format</a>
    */
   public static DefaultPeer fromURI(final String uri) {
-    return new DefaultPeer(EnodeURL.fromString(uri));
+    return new DefaultPeer(EnodeURLImpl.fromString(uri));
   }
 
   /**
@@ -50,12 +55,22 @@ public static DefaultPeer fromURI(final String uri) {
    * @see <a href="https://github.com/ethereum/wiki/wiki/enode-url-format">enode URL format</a>
    */
   public static DefaultPeer fromURI(final URI uri) {
-    return new DefaultPeer(EnodeURL.fromURI(uri));
+    return new DefaultPeer(EnodeURLImpl.fromURI(uri));
   }
 
   @Override
   public EnodeURL getEnodeURL() {
-    return enode;
+    return enodeURL;
+  }
+
+  @Override
+  public Optional<ForkId> getForkId() {
+    return Optional.ofNullable(forkId);
+  }
+
+  @Override
+  public void setForkId(final ForkId forkId) {
+    this.forkId = forkId;
   }
 
   @Override
@@ -70,19 +85,19 @@ public boolean equals(final Object obj) {
       return false;
     }
     final DefaultPeer other = (DefaultPeer) obj;
-    return id.equals(other.id) && enode.equals(other.enode);
+    return id.equals(other.id) && enodeURL.equals(other.enodeURL);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, enode);
+    return Objects.hash(id, enodeURL);
   }
 
   @Override
   public String toString() {
     final StringBuilder sb = new StringBuilder("DefaultPeer{");
     sb.append("id=").append(id);
-    sb.append(", enode=").append(enode);
+    sb.append(", enode=").append(enodeURL);
     sb.append('}');
     return sb.toString();
   }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURL.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURL.java
deleted file mode 100644
index 0d4e592b151..00000000000
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURL.java
+++ /dev/null
@@ -1,435 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.p2p.peers;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkState;
-
-import org.hyperledger.besu.util.NetworkUtility;
-
-import java.net.InetAddress;
-import java.net.URI;
-import java.net.UnknownHostException;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.OptionalInt;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import com.google.common.net.InetAddresses;
-import com.google.common.primitives.Ints;
-import org.apache.tuweni.bytes.Bytes;
-
-public class EnodeURL {
-
-  public static final int DEFAULT_LISTENING_PORT = 30303;
-  public static final int NODE_ID_SIZE = 64;
-  private static final Pattern DISCPORT_QUERY_STRING_REGEX =
-      Pattern.compile("^discport=([0-9]{1,5})$");
-  private static final Pattern NODE_ID_PATTERN = Pattern.compile("^[0-9a-fA-F]{128}$");
-
-  private final Bytes nodeId;
-  private InetAddress ip;
-  private final Optional<String> maybeHostname;
-  private final Optional<Integer> listeningPort;
-  private final Optional<Integer> discoveryPort;
-
-  private EnodeURL(
-      final Bytes nodeId,
-      final InetAddress address,
-      final Optional<String> maybeHostname,
-      final Optional<Integer> listeningPort,
-      final Optional<Integer> discoveryPort) {
-    checkArgument(
-        nodeId.size() == NODE_ID_SIZE, "Invalid node id.  Expected id of length: 64 bytes.");
-    listeningPort.ifPresent(port -> NetworkUtility.checkPort(port, "listening"));
-    discoveryPort.ifPresent(port -> NetworkUtility.checkPort(port, "discovery"));
-
-    this.nodeId = nodeId;
-    this.ip = address;
-    this.maybeHostname = maybeHostname;
-    this.listeningPort = listeningPort;
-    this.discoveryPort = discoveryPort;
-  }
-
-  public static Builder builder() {
-    return new Builder();
-  }
-
-  public static EnodeURL fromString(final String value) {
-    return fromString(value, EnodeDnsConfiguration.dnsDisabled());
-  }
-
-  public static EnodeURL fromString(
-      final String value, final EnodeDnsConfiguration enodeDnsConfiguration) {
-    try {
-      checkStringArgumentNotEmpty(value, "Invalid empty value.");
-      return fromURI(URI.create(value), enodeDnsConfiguration);
-    } catch (IllegalArgumentException e) {
-      String message =
-          "Invalid enode URL syntax. Enode URL should have the following format 'enode://<node_id>@<ip>:<listening_port>[?discport=<discovery_port>]'.";
-      if (e.getMessage() != null) {
-        message += " " + e.getMessage();
-      }
-      throw new IllegalArgumentException(message, e);
-    }
-  }
-
-  public static EnodeURL fromURI(final URI uri) {
-    return fromURI(uri, EnodeDnsConfiguration.dnsDisabled());
-  }
-
-  public static EnodeURL fromURI(final URI uri, final EnodeDnsConfiguration enodeDnsConfiguration) {
-    checkArgument(uri != null, "URI cannot be null");
-    checkStringArgumentNotEmpty(uri.getScheme(), "Missing 'enode' scheme.");
-    checkStringArgumentNotEmpty(uri.getHost(), "Missing or invalid ip address.");
-    checkStringArgumentNotEmpty(uri.getUserInfo(), "Missing node ID.");
-
-    checkArgument(
-        uri.getScheme().equalsIgnoreCase("enode"), "Invalid URI scheme (must equal \"enode\").");
-    checkArgument(
-        NODE_ID_PATTERN.matcher(uri.getUserInfo()).matches(),
-        "Invalid node ID: node ID must have exactly 128 hexadecimal characters and should not include any '0x' hex prefix.");
-
-    final Bytes id = Bytes.fromHexString(uri.getUserInfo());
-    String host = uri.getHost();
-    int tcpPort = uri.getPort();
-
-    // Parse discport if it exists
-    Optional<Integer> discoveryPort = Optional.empty();
-    String query = uri.getQuery();
-    if (query != null) {
-      final Matcher discPortMatcher = DISCPORT_QUERY_STRING_REGEX.matcher(query);
-      if (discPortMatcher.matches()) {
-        discoveryPort = Optional.ofNullable(Ints.tryParse(discPortMatcher.group(1)));
-      }
-      checkArgument(discoveryPort.isPresent(), "Invalid discovery port: '" + query + "'.");
-    } else {
-      discoveryPort = Optional.of(tcpPort);
-    }
-
-    return builder()
-        .ipAddress(host, enodeDnsConfiguration)
-        .nodeId(id)
-        .listeningPort(tcpPort)
-        .discoveryPort(discoveryPort)
-        .build();
-  }
-
-  private static void checkStringArgumentNotEmpty(final String argument, final String message) {
-    checkArgument(argument != null && !argument.trim().isEmpty(), message);
-  }
-
-  public static boolean sameListeningEndpoint(final EnodeURL enodeA, final EnodeURL enodeB) {
-    if (enodeA == null || enodeB == null) {
-      return false;
-    }
-
-    return Objects.equals(enodeA.getNodeId(), enodeB.getNodeId())
-        && Objects.equals(enodeA.getIp(), enodeB.getIp())
-        && Objects.equals(enodeA.getListeningPort(), enodeB.getListeningPort());
-  }
-
-  public static Bytes parseNodeId(final String nodeId) {
-    int expectedSize = EnodeURL.NODE_ID_SIZE * 2;
-    if (nodeId.toLowerCase().startsWith("0x")) {
-      expectedSize += 2;
-    }
-    checkArgument(
-        nodeId.length() == expectedSize,
-        "Expected " + EnodeURL.NODE_ID_SIZE + " bytes in " + nodeId);
-    return Bytes.fromHexString(nodeId, NODE_ID_SIZE);
-  }
-
-  public URI toURI() {
-
-    final String uri =
-        String.format(
-            "enode://%s@%s:%d",
-            nodeId.toUnprefixedHexString(),
-            maybeHostname.orElse(InetAddresses.toUriString(getIp())),
-            getListeningPortOrZero());
-    final OptionalInt discPort = getDiscPortQueryParam();
-    if (discPort.isPresent()) {
-      return URI.create(uri + String.format("?discport=%d", discPort.getAsInt()));
-    } else {
-      return URI.create(uri);
-    }
-  }
-
-  public URI toURIWithoutDiscoveryPort() {
-    final String uri =
-        String.format(
-            "enode://%s@%s:%d",
-            nodeId.toUnprefixedHexString(),
-            maybeHostname.orElse(InetAddresses.toUriString(getIp())),
-            getListeningPortOrZero());
-
-    return URI.create(uri);
-  }
-
-  /**
-   * Returns the discovery port only if it differs from the listening port
-   *
-   * @return The port, as an optional.
-   */
-  private OptionalInt getDiscPortQueryParam() {
-    final int listeningPort = getListeningPortOrZero();
-    final int discoveryPort = getDiscoveryPortOrZero();
-    if (listeningPort == discoveryPort) {
-      return OptionalInt.empty();
-    }
-    return OptionalInt.of(discoveryPort);
-  }
-
-  public static URI asURI(final String url) {
-    return asURI(url, EnodeDnsConfiguration.dnsDisabled());
-  }
-
-  public static URI asURI(final String url, final EnodeDnsConfiguration enodeDnsConfiguration) {
-    return fromString(url, enodeDnsConfiguration).toURI();
-  }
-
-  public Bytes getNodeId() {
-    return nodeId;
-  }
-
-  public String getIpAsString() {
-    return getIp().getHostAddress();
-  }
-
-  /**
-   * Get IP of the EnodeURL
-   *
-   * <p>If "dns" and "dns-update" are enabled -&gt; DNS lookup every time to have the IP up to date
-   * and not to rely on an invalid cache
-   *
-   * <p>If the "dns" is enabled but "dns-update" is disabled -&gt; IP is retrieved only one time and
-   * the hostname is no longer stored (maybeHostname is empty).
-   *
-   * @return ip
-   */
-  public InetAddress getIp() {
-    this.ip =
-        maybeHostname
-            .map(
-                hostname -> {
-                  try {
-                    return InetAddress.getByName(hostname);
-                  } catch (UnknownHostException e) {
-                    return ip;
-                  }
-                })
-            .orElse(ip);
-    return ip;
-  }
-
-  public boolean isListening() {
-    return listeningPort.isPresent();
-  }
-
-  public boolean isRunningDiscovery() {
-    return discoveryPort.isPresent();
-  }
-
-  public Optional<Integer> getListeningPort() {
-    return listeningPort;
-  }
-
-  public int getListeningPortOrZero() {
-    return listeningPort.orElse(0);
-  }
-
-  public Optional<Integer> getDiscoveryPort() {
-    return discoveryPort;
-  }
-
-  public int getDiscoveryPortOrZero() {
-    return discoveryPort.orElse(0);
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EnodeURL enodeURL = (EnodeURL) o;
-    return Objects.equals(getNodeId(), enodeURL.getNodeId())
-        && Objects.equals(getIp(), enodeURL.getIp())
-        && Objects.equals(getListeningPort(), enodeURL.getListeningPort())
-        && Objects.equals(getDiscoveryPort(), enodeURL.getDiscoveryPort());
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(getNodeId(), getIp(), getListeningPort(), getDiscoveryPort());
-  }
-
-  @Override
-  public String toString() {
-    return this.toURI().toString();
-  }
-
-  public static class Builder {
-
-    private Bytes nodeId;
-    private Optional<Integer> listeningPort;
-    private Optional<Integer> discoveryPort;
-    private Optional<String> maybeHostname = Optional.empty();
-    private InetAddress ip;
-
-    private Builder() {}
-
-    public EnodeURL build() {
-      validate();
-      return new EnodeURL(nodeId, ip, maybeHostname, listeningPort, discoveryPort);
-    }
-
-    private void validate() {
-      checkState(nodeId != null, "Node id must be configured.");
-      checkState(listeningPort != null, "Listening port must be configured.");
-      checkState(discoveryPort != null, "Discovery port must be configured.");
-      checkState(ip != null, "Ip address must be configured.");
-    }
-
-    public Builder configureFromEnode(final EnodeURL enode) {
-      return this.nodeId(enode.getNodeId())
-          .listeningPort(enode.getListeningPort())
-          .discoveryPort(enode.getDiscoveryPort())
-          .ipAddress(enode.getIp());
-    }
-
-    public Builder nodeId(final Bytes nodeId) {
-      this.nodeId = nodeId;
-      return this;
-    }
-
-    public Builder nodeId(final byte[] nodeId) {
-      this.nodeId = Bytes.wrap(nodeId);
-      return this;
-    }
-
-    public Builder nodeId(final String nodeId) {
-      this.nodeId = Bytes.fromHexString(nodeId);
-      return this;
-    }
-
-    public Builder ipAddress(final InetAddress ip) {
-      this.ip = ip;
-      return this;
-    }
-
-    public Builder ipAddress(final String ip) {
-      return ipAddress(ip, EnodeDnsConfiguration.dnsDisabled());
-    }
-
-    public Builder ipAddress(final String ip, final EnodeDnsConfiguration enodeDnsConfiguration) {
-      if (InetAddresses.isUriInetAddress(ip)) {
-        this.ip = InetAddresses.forUriString(ip);
-      } else if (InetAddresses.isInetAddress(ip)) {
-        this.ip = InetAddresses.forString(ip);
-      } else if (enodeDnsConfiguration.dnsEnabled()) {
-        try {
-          if (enodeDnsConfiguration.updateEnabled()) {
-            this.maybeHostname = Optional.of(ip);
-          }
-          this.ip = InetAddress.getByName(ip);
-        } catch (UnknownHostException e) {
-          if (!enodeDnsConfiguration.updateEnabled()) {
-            throw new IllegalArgumentException("Invalid ip address or hostname.");
-          } else {
-            this.ip = InetAddresses.forString("127.0.0.1");
-          }
-        }
-      } else {
-        throw new IllegalArgumentException("Invalid ip address.");
-      }
-      return this;
-    }
-
-    public Builder discoveryAndListeningPorts(final int listeningAndDiscoveryPorts) {
-      listeningPort(listeningAndDiscoveryPorts);
-      discoveryPort(listeningAndDiscoveryPorts);
-      return this;
-    }
-
-    public Builder disableListening() {
-      this.listeningPort = Optional.empty();
-      return this;
-    }
-
-    public Builder disableDiscovery() {
-      this.discoveryPort = Optional.empty();
-      return this;
-    }
-
-    public Builder useDefaultPorts() {
-      discoveryAndListeningPorts(EnodeURL.DEFAULT_LISTENING_PORT);
-      return this;
-    }
-
-    /**
-     * An optional listening port value. If the value is empty of equal to 0, the listening port
-     * will be empty - indicating the corresponding node is not listening.
-     *
-     * @param maybeListeningPort If non-empty represents the port to listen on, if empty means the
-     *     node is not listening
-     * @return The modified builder
-     */
-    public Builder listeningPort(final Optional<Integer> maybeListeningPort) {
-      this.listeningPort = maybeListeningPort.filter(port -> port != 0);
-      return this;
-    }
-
-    /**
-     * An listening port value. A value of 0 means the node is not listening.
-     *
-     * @param listeningPort If non-zero, represents the port on which to listen for connections. A
-     *     value of 0 means the node is not listening for connections.
-     * @return The modified builder
-     */
-    public Builder listeningPort(final int listeningPort) {
-      return listeningPort(Optional.of(listeningPort));
-    }
-
-    /**
-     * The port on which to listen for discovery messages. A value that is empty or equal to 0,
-     * indicates that the node is not listening for discovery messages.
-     *
-     * @param maybeDiscoveryPort If non-empty and non-zero, represents the port on which to listen
-     *     for discovery messages. Otherwise, indicates that the node is not running discovery.
-     * @return The modified builder
-     */
-    public Builder discoveryPort(final Optional<Integer> maybeDiscoveryPort) {
-      this.discoveryPort = maybeDiscoveryPort.filter(port -> port != 0);
-      return this;
-    }
-
-    /**
-     * The port on which to listen for discovery messages. A value that is equal to 0, indicates
-     * that the node is not listening for discovery messages.
-     *
-     * @param discoveryPort If non-zero, represents the port on which to listen for discovery
-     *     messages. Otherwise, indicates that the node is not running discovery.
-     * @return The modified builder
-     */
-    public Builder discoveryPort(final int discoveryPort) {
-      return discoveryPort(Optional.of(discoveryPort));
-    }
-  }
-}
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLImpl.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLImpl.java
new file mode 100644
index 00000000000..747a06efdf6
--- /dev/null
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLImpl.java
@@ -0,0 +1,478 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.peers;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+
+import org.hyperledger.besu.plugin.data.EnodeURL;
+import org.hyperledger.besu.util.NetworkUtility;
+
+import java.net.InetAddress;
+import java.net.URI;
+import java.net.UnknownHostException;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.OptionalInt;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.google.common.net.InetAddresses;
+import com.google.common.primitives.Ints;
+import org.apache.tuweni.bytes.Bytes;
+
+public class EnodeURLImpl implements EnodeURL {
+
+  public static final int DEFAULT_LISTENING_PORT = 30303;
+  public static final int NODE_ID_SIZE = 64;
+  private static final Pattern DISCPORT_QUERY_STRING_REGEX =
+      Pattern.compile("^discport=([0-9]{1,5})$");
+  private static final Pattern NODE_ID_PATTERN = Pattern.compile("^[0-9a-fA-F]{128}$");
+
+  private final Bytes nodeId;
+  private InetAddress ip;
+  private final Optional<String> maybeHostname;
+  private final Optional<Integer> listeningPort;
+  private final Optional<Integer> discoveryPort;
+
+  private EnodeURLImpl(
+      final Bytes nodeId,
+      final InetAddress address,
+      final Optional<String> maybeHostname,
+      final Optional<Integer> listeningPort,
+      final Optional<Integer> discoveryPort) {
+    checkArgument(
+        nodeId.size() == NODE_ID_SIZE,
+        "Invalid node id of length " + nodeId.size() + ".  Expected id of length: 64 bytes.");
+    listeningPort.ifPresent(port -> NetworkUtility.checkPort(port, "listening"));
+    discoveryPort.ifPresent(port -> NetworkUtility.checkPort(port, "discovery"));
+
+    this.nodeId = nodeId;
+    this.ip = address;
+    this.maybeHostname = maybeHostname;
+    this.listeningPort = listeningPort;
+    this.discoveryPort = discoveryPort;
+  }
+
+  public static Builder builder() {
+    return new Builder();
+  }
+
+  public static EnodeURL fromString(final String value) {
+    return fromString(value, EnodeDnsConfiguration.dnsDisabled());
+  }
+
+  public static EnodeURL fromString(
+      final String value, final EnodeDnsConfiguration enodeDnsConfiguration) {
+    try {
+      checkStringArgumentNotEmpty(value, "Invalid empty value.");
+      return fromURI(URI.create(value), enodeDnsConfiguration);
+    } catch (final IllegalArgumentException e) {
+      String message = "";
+      if (enodeDnsConfiguration.dnsEnabled() && !enodeDnsConfiguration.updateEnabled()) {
+        message =
+            "Invalid IP address (or DNS query resolved an invalid IP). --Xdns-enabled is true but --Xdns-update-enabled flag is false.";
+      } else {
+        message =
+            String.format(
+                "Invalid enode URL syntax '%s'. Enode URL should have the following format 'enode://<node_id>@<ip>:<listening_port>[?discport=<discovery_port>]'.",
+                value);
+        if (e.getMessage() != null) {
+          message += " " + e.getMessage();
+        }
+      }
+
+      throw new IllegalArgumentException(message, e);
+    }
+  }
+
+  public static EnodeURL fromURI(final URI uri) {
+    return fromURI(uri, EnodeDnsConfiguration.dnsDisabled());
+  }
+
+  public static EnodeURL fromURI(final URI uri, final EnodeDnsConfiguration enodeDnsConfiguration) {
+    checkArgument(uri != null, "URI cannot be null");
+    checkStringArgumentNotEmpty(uri.getScheme(), "Missing 'enode' scheme.");
+    checkStringArgumentNotEmpty(uri.getHost(), "Missing or invalid host or ip address.");
+    checkStringArgumentNotEmpty(uri.getUserInfo(), "Missing node ID.");
+
+    checkArgument(
+        uri.getScheme().equalsIgnoreCase("enode"), "Invalid URI scheme (must equal \"enode\").");
+    checkArgument(
+        NODE_ID_PATTERN.matcher(uri.getUserInfo()).matches(),
+        "Invalid node ID: node ID must have exactly 128 hexadecimal characters and should not include any '0x' hex prefix.");
+
+    final Bytes id = Bytes.fromHexString(uri.getUserInfo());
+    String host = uri.getHost();
+    int tcpPort = uri.getPort();
+
+    // Parse discport if it exists
+    Optional<Integer> discoveryPort = Optional.empty();
+    String query = uri.getQuery();
+    if (query != null) {
+      final Matcher discPortMatcher = DISCPORT_QUERY_STRING_REGEX.matcher(query);
+      if (discPortMatcher.matches()) {
+        discoveryPort = Optional.ofNullable(Ints.tryParse(discPortMatcher.group(1)));
+      }
+      checkArgument(discoveryPort.isPresent(), "Invalid discovery port: '" + query + "'.");
+    } else {
+      discoveryPort = Optional.of(tcpPort);
+    }
+
+    return builder()
+        .ipAddress(host, enodeDnsConfiguration)
+        .nodeId(id)
+        .listeningPort(tcpPort)
+        .discoveryPort(discoveryPort)
+        .build();
+  }
+
+  private static void checkStringArgumentNotEmpty(final String argument, final String message) {
+    checkArgument(argument != null && !argument.trim().isEmpty(), message);
+  }
+
+  public static boolean sameListeningEndpoint(final EnodeURL enodeA, final EnodeURL enodeB) {
+    if (enodeA == null || enodeB == null) {
+      return false;
+    }
+
+    return Objects.equals(enodeA.getNodeId(), enodeB.getNodeId())
+        && Objects.equals(enodeA.getIp(), enodeB.getIp())
+        && Objects.equals(enodeA.getListeningPort(), enodeB.getListeningPort());
+  }
+
+  public static Bytes parseNodeId(final String nodeId) {
+    int expectedSize = EnodeURLImpl.NODE_ID_SIZE * 2;
+    if (nodeId.toLowerCase().startsWith("0x")) {
+      expectedSize += 2;
+    }
+    checkArgument(
+        nodeId.length() == expectedSize,
+        "Expected " + EnodeURLImpl.NODE_ID_SIZE + " bytes in " + nodeId);
+    return Bytes.fromHexString(nodeId, NODE_ID_SIZE);
+  }
+
+  @Override
+  public URI toURI() {
+
+    final String uri =
+        String.format(
+            "enode://%s@%s:%d",
+            nodeId.toUnprefixedHexString(),
+            maybeHostname.orElse(InetAddresses.toUriString(getIp())),
+            getListeningPortOrZero());
+    final OptionalInt discPort = getDiscPortQueryParam();
+    if (discPort.isPresent()) {
+      return URI.create(uri + String.format("?discport=%d", discPort.getAsInt()));
+    } else {
+      return URI.create(uri);
+    }
+  }
+
+  @Override
+  public URI toURIWithoutDiscoveryPort() {
+    final String uri =
+        String.format(
+            "enode://%s@%s:%d",
+            nodeId.toUnprefixedHexString(),
+            maybeHostname.orElse(InetAddresses.toUriString(getIp())),
+            getListeningPortOrZero());
+
+    return URI.create(uri);
+  }
+
+  /**
+   * Returns the discovery port only if it differs from the listening port
+   *
+   * @return The port, as an optional.
+   */
+  private OptionalInt getDiscPortQueryParam() {
+    final int listeningPort = getListeningPortOrZero();
+    final int discoveryPort = getDiscoveryPortOrZero();
+    if (listeningPort == discoveryPort) {
+      return OptionalInt.empty();
+    }
+    return OptionalInt.of(discoveryPort);
+  }
+
+  public static URI asURI(final String url) {
+    return asURI(url, EnodeDnsConfiguration.dnsDisabled());
+  }
+
+  public static URI asURI(final String url, final EnodeDnsConfiguration enodeDnsConfiguration) {
+    return fromString(url, enodeDnsConfiguration).toURI();
+  }
+
+  @Override
+  public Bytes getNodeId() {
+    return nodeId;
+  }
+
+  @Override
+  public String getIpAsString() {
+    return getIp().getHostAddress();
+  }
+
+  /**
+   * Get IP of the EnodeURL
+   *
+   * <p>If "dns" and "dns-update" are enabled -&gt; DNS lookup every time to have the IP up to date
+   * and not to rely on an invalid cache
+   *
+   * <p>If the "dns" is enabled but "dns-update" is disabled -&gt; IP is retrieved only one time and
+   * the hostname is no longer stored (maybeHostname is empty).
+   *
+   * @return ip
+   */
+  @Override
+  public InetAddress getIp() {
+    this.ip =
+        maybeHostname
+            .map(
+                hostname -> {
+                  try {
+                    return InetAddress.getByName(hostname);
+                  } catch (final UnknownHostException e) {
+                    return ip;
+                  }
+                })
+            .orElse(ip);
+    return ip;
+  }
+
+  @Override
+  public boolean isListening() {
+    return listeningPort.isPresent();
+  }
+
+  @Override
+  public boolean isRunningDiscovery() {
+    return discoveryPort.isPresent();
+  }
+
+  @Override
+  public Optional<Integer> getListeningPort() {
+    return listeningPort;
+  }
+
+  @Override
+  public int getListeningPortOrZero() {
+    return listeningPort.orElse(0);
+  }
+
+  @Override
+  public Optional<Integer> getDiscoveryPort() {
+    return discoveryPort;
+  }
+
+  @Override
+  public int getDiscoveryPortOrZero() {
+    return discoveryPort.orElse(0);
+  }
+
+  @Override
+  public String getHost() {
+    final URI uriWithoutDiscoveryPort = toURIWithoutDiscoveryPort();
+    String host = uriWithoutDiscoveryPort.getHost();
+    if (host == null) {
+      host = "";
+      final String uriString = uriWithoutDiscoveryPort.toString();
+      int indexOfAt = uriString.indexOf("@");
+      if (indexOfAt > -1) {
+        int lastIndexOfColon = uriString.lastIndexOf(":");
+        if (lastIndexOfColon > indexOfAt) {
+          host = uriString.substring(indexOfAt + 1, lastIndexOfColon);
+        }
+      }
+    }
+    return host;
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    final EnodeURL enodeURL = (EnodeURL) o;
+    return Objects.equals(getNodeId(), enodeURL.getNodeId())
+        && Objects.equals(getIp(), enodeURL.getIp())
+        && Objects.equals(getListeningPort(), enodeURL.getListeningPort())
+        && Objects.equals(getDiscoveryPort(), enodeURL.getDiscoveryPort());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(getNodeId(), getIp(), getListeningPort(), getDiscoveryPort());
+  }
+
+  @Override
+  public String toString() {
+    return this.toURI().toString();
+  }
+
+  public static class Builder {
+
+    private Bytes nodeId;
+    private Optional<Integer> listeningPort;
+    private Optional<Integer> discoveryPort;
+    private Optional<String> maybeHostname = Optional.empty();
+    private InetAddress ip;
+
+    private Builder() {}
+
+    public EnodeURL build() {
+      validate();
+      return new EnodeURLImpl(nodeId, ip, maybeHostname, listeningPort, discoveryPort);
+    }
+
+    private void validate() {
+      checkState(nodeId != null, "Node id must be configured.");
+      checkState(listeningPort != null, "Listening port must be configured.");
+      checkState(discoveryPort != null, "Discovery port must be configured.");
+      checkState(ip != null, "Ip address must be configured.");
+    }
+
+    public Builder configureFromEnode(final EnodeURL enode) {
+      return this.nodeId(enode.getNodeId())
+          .listeningPort(enode.getListeningPort())
+          .discoveryPort(enode.getDiscoveryPort())
+          .ipAddress(enode.getIp());
+    }
+
+    public Builder nodeId(final Bytes nodeId) {
+      this.nodeId = nodeId;
+      return this;
+    }
+
+    public Builder nodeId(final byte[] nodeId) {
+      this.nodeId = Bytes.wrap(nodeId);
+      return this;
+    }
+
+    public Builder nodeId(final String nodeId) {
+      this.nodeId = Bytes.fromHexString(nodeId);
+      return this;
+    }
+
+    public Builder ipAddress(final InetAddress ip) {
+      this.ip = ip;
+      return this;
+    }
+
+    public Builder ipAddress(final String ip) {
+      return ipAddress(ip, EnodeDnsConfiguration.dnsDisabled());
+    }
+
+    public Builder ipAddress(final String ip, final EnodeDnsConfiguration enodeDnsConfiguration) {
+      if (enodeDnsConfiguration.dnsEnabled()) {
+        try {
+          this.ip = InetAddress.getByName(ip);
+          if (enodeDnsConfiguration.updateEnabled()) {
+            if (this.ip.isLoopbackAddress()) {
+              this.ip = InetAddress.getLocalHost();
+            }
+            this.maybeHostname = Optional.of(this.ip.getHostName());
+          }
+        } catch (final UnknownHostException e) {
+          if (!enodeDnsConfiguration.updateEnabled()) {
+            throw new IllegalArgumentException("Invalid ip address or hostname.");
+          } else {
+            this.ip = InetAddresses.forString("127.0.0.1");
+          }
+        }
+      } else if (InetAddresses.isUriInetAddress(ip)) {
+        this.ip = InetAddresses.forUriString(ip);
+      } else if (InetAddresses.isInetAddress(ip)) {
+        this.ip = InetAddresses.forString(ip);
+      } else {
+        throw new IllegalArgumentException("Invalid ip address.");
+      }
+      return this;
+    }
+
+    public Builder discoveryAndListeningPorts(final int listeningAndDiscoveryPorts) {
+      listeningPort(listeningAndDiscoveryPorts);
+      discoveryPort(listeningAndDiscoveryPorts);
+      return this;
+    }
+
+    public Builder disableListening() {
+      this.listeningPort = Optional.empty();
+      return this;
+    }
+
+    public Builder disableDiscovery() {
+      this.discoveryPort = Optional.empty();
+      return this;
+    }
+
+    public Builder useDefaultPorts() {
+      discoveryAndListeningPorts(EnodeURLImpl.DEFAULT_LISTENING_PORT);
+      return this;
+    }
+
+    /**
+     * An optional listening port value. If the value is empty of equal to 0, the listening port
+     * will be empty - indicating the corresponding node is not listening.
+     *
+     * @param maybeListeningPort If non-empty represents the port to listen on, if empty means the
+     *     node is not listening
+     * @return The modified builder
+     */
+    public Builder listeningPort(final Optional<Integer> maybeListeningPort) {
+      this.listeningPort = maybeListeningPort.filter(port -> port != 0);
+      return this;
+    }
+
+    /**
+     * An listening port value. A value of 0 means the node is not listening.
+     *
+     * @param listeningPort If non-zero, represents the port on which to listen for connections. A
+     *     value of 0 means the node is not listening for connections.
+     * @return The modified builder
+     */
+    public Builder listeningPort(final int listeningPort) {
+      return listeningPort(Optional.of(listeningPort));
+    }
+
+    /**
+     * The port on which to listen for discovery messages. A value that is empty or equal to 0,
+     * indicates that the node is not listening for discovery messages.
+     *
+     * @param maybeDiscoveryPort If non-empty and non-zero, represents the port on which to listen
+     *     for discovery messages. Otherwise, indicates that the node is not running discovery.
+     * @return The modified builder
+     */
+    public Builder discoveryPort(final Optional<Integer> maybeDiscoveryPort) {
+      this.discoveryPort = maybeDiscoveryPort.filter(port -> port != 0);
+      return this;
+    }
+
+    /**
+     * The port on which to listen for discovery messages. A value that is equal to 0, indicates
+     * that the node is not listening for discovery messages.
+     *
+     * @param discoveryPort If non-zero, represents the port on which to listen for discovery
+     *     messages. Otherwise, indicates that the node is not running discovery.
+     * @return The modified builder
+     */
+    public Builder discoveryPort(final int discoveryPort) {
+      return discoveryPort(Optional.of(discoveryPort));
+    }
+  }
+}
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/LocalNode.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/LocalNode.java
index 916979fafc0..5bd4cc90ac6 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/LocalNode.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/LocalNode.java
@@ -16,6 +16,7 @@
 
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.util.List;
 
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/MaintainedPeers.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/MaintainedPeers.java
index f686f7a20e2..c75f7009514 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/MaintainedPeers.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/MaintainedPeers.java
@@ -33,13 +33,13 @@ public boolean add(final Peer peer) {
     checkArgument(
         peer.getEnodeURL().isListening(),
         "Invalid enode url.  Enode url must contain a non-zero listening port.");
-    boolean wasAdded = maintainedPeers.add(peer);
+    final boolean wasAdded = maintainedPeers.add(peer);
     addedSubscribers.forEach(s -> s.onPeerAdded(peer, wasAdded));
     return wasAdded;
   }
 
   public boolean remove(final Peer peer) {
-    boolean wasRemoved = maintainedPeers.remove(peer);
+    final boolean wasRemoved = maintainedPeers.remove(peer);
     removedCallbackSubscribers.forEach(s -> s.onPeerRemoved(peer, wasRemoved));
     return wasRemoved;
   }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/MutableLocalNode.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/MutableLocalNode.java
index 04160119faf..d95a7ca4f88 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/MutableLocalNode.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/MutableLocalNode.java
@@ -15,6 +15,7 @@
 package org.hyperledger.besu.ethereum.p2p.peers;
 
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.util.List;
 
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/Peer.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/Peer.java
index 94e81dff2b1..2351a474dfd 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/Peer.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/Peer.java
@@ -15,8 +15,13 @@
 package org.hyperledger.besu.ethereum.p2p.peers;
 
 import org.hyperledger.besu.crypto.SecureRandomProvider;
+import org.hyperledger.besu.ethereum.forkid.ForkId;
+import org.hyperledger.besu.plugin.data.EnodeURL;
+
+import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
+import org.ethereum.beacon.discovery.schema.NodeRecord;
 
 public interface Peer extends PeerId {
 
@@ -33,7 +38,7 @@ public interface Peer extends PeerId {
    * @return The generated peer ID.
    */
   static Bytes randomId() {
-    final byte[] id = new byte[EnodeURL.NODE_ID_SIZE];
+    final byte[] id = new byte[EnodeURLImpl.NODE_ID_SIZE];
     SecureRandomProvider.publicSecureRandom().nextBytes(id);
     return Bytes.wrap(id);
   }
@@ -46,4 +51,29 @@ static Bytes randomId() {
   default String getEnodeURLString() {
     return this.getEnodeURL().toString();
   }
+
+  /**
+   * Returns the node record
+   *
+   * @return The node record wrapped in an Optional
+   */
+  default Optional<NodeRecord> getNodeRecord() {
+    return Optional.empty();
+  }
+
+  /**
+   * Returns the fork id
+   *
+   * @return The fork id wrapped in an Optional
+   */
+  default Optional<ForkId> getForkId() {
+    return Optional.empty();
+  }
+
+  /**
+   * Sets the fork id
+   *
+   * @param forkId The fork id
+   */
+  void setForkId(ForkId forkId);
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/StaticNodesParser.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/StaticNodesParser.java
index 28b7ff80bc7..b3a014bba15 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/StaticNodesParser.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/peers/StaticNodesParser.java
@@ -18,8 +18,11 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Collections.emptySet;
 
+import org.hyperledger.besu.plugin.data.EnodeURL;
+
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.nio.file.AccessDeniedException;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
@@ -28,12 +31,12 @@
 
 import io.vertx.core.json.DecodeException;
 import io.vertx.core.json.JsonArray;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class StaticNodesParser {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(StaticNodesParser.class);
 
   public static Set<EnodeURL> fromPath(
       final Path path, final EnodeDnsConfiguration enodeDnsConfiguration)
@@ -42,16 +45,21 @@ public static Set<EnodeURL> fromPath(
     try {
       return readEnodesFromPath(path, enodeDnsConfiguration);
     } catch (FileNotFoundException | NoSuchFileException ex) {
-      LOG.info("StaticNodes file {} does not exist, no static connections will be created.", path);
+      LOG.debug("StaticNodes file {} does not exist, no static connections will be created.", path);
       return emptySet();
+    } catch (AccessDeniedException ex) {
+      LOG.warn(
+          "Access denied to static nodes file ({}). Ensure static nodes file and node data directory have correct permissions.",
+          path);
+      throw ex;
     } catch (IOException ex) {
-      LOG.info("Unable to parse static nodes file ({})", path);
+      LOG.warn("Unable to parse static nodes file ({})", path);
       throw ex;
     } catch (DecodeException ex) {
-      LOG.info("Content of ({}} was invalid json, and could not be decoded.", path);
+      LOG.warn("Content of ({}} was invalid json, and could not be decoded.", path);
       throw ex;
     } catch (IllegalArgumentException ex) {
-      LOG.info("Parsing ({}) has failed due incorrectly formatted enode element.", path);
+      LOG.warn("Parsing ({}) has failed due incorrectly formatted enode element.", path);
       throw ex;
     }
   }
@@ -72,13 +80,12 @@ private static Set<EnodeURL> readEnodesFromPath(
   private static EnodeURL decodeString(
       final String input, final EnodeDnsConfiguration enodeDnsConfiguration) {
     try {
-      final EnodeURL enode = EnodeURL.fromString(input, enodeDnsConfiguration);
+      final EnodeURL enode = EnodeURLImpl.fromString(input, enodeDnsConfiguration);
       checkArgument(
           enode.isListening(), "Static node must be configured with a valid listening port.");
       return enode;
     } catch (IllegalArgumentException ex) {
-      LOG.info("Illegal static enode supplied ({}). {}", input, ex.getMessage());
-      throw ex;
+      throw new IllegalArgumentException("Illegal static enode supplied (" + input + ")", ex);
     }
   }
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissions.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissions.java
index 9b8a14ac71a..7a98390b7f6 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissions.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissions.java
@@ -125,7 +125,7 @@ public void subscribeUpdate(final PermissionsUpdateCallback callback) {
 
     @Override
     public boolean isPermitted(final Peer localNode, final Peer remotePeer, final Action action) {
-      for (PeerPermissions permission : permissions) {
+      for (final PeerPermissions permission : permissions) {
         if (!permission.isPermitted(localNode, remotePeer, action)) {
           return false;
         }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsDenylist.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsDenylist.java
index 4033c49bc99..88877050ae1 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsDenylist.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsDenylist.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.p2p.permissions;
 
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.util.LimitedSet;
 import org.hyperledger.besu.util.LimitedSet.Mode;
@@ -29,14 +30,14 @@
 public class PeerPermissionsDenylist extends PeerPermissions {
   private static final int DEFAULT_INITIAL_CAPACITY = 20;
 
-  private final Set<Bytes> blacklist;
+  private final Set<Bytes> denylist;
 
   private PeerPermissionsDenylist(final int initialCapacity, final OptionalInt maxSize) {
     if (maxSize.isPresent()) {
-      blacklist =
+      denylist =
           LimitedSet.create(initialCapacity, maxSize.getAsInt(), Mode.DROP_LEAST_RECENTLY_ACCESSED);
     } else {
-      blacklist = new ConcurrentHashSet<>(initialCapacity);
+      denylist = new ConcurrentHashSet<>(initialCapacity);
     }
   }
 
@@ -54,35 +55,36 @@ public static PeerPermissionsDenylist create(final int maxSize) {
 
   @Override
   public boolean isPermitted(final Peer localNode, final Peer remotePeer, final Action action) {
-    return !blacklist.contains(remotePeer.getId());
+    return !EnodeURLImpl.sameListeningEndpoint(localNode.getEnodeURL(), remotePeer.getEnodeURL())
+        && !denylist.contains(remotePeer.getId());
   }
 
   public void add(final Peer peer) {
-    if (blacklist.add(peer.getId())) {
+    if (denylist.add(peer.getId())) {
       dispatchUpdate(true, Optional.of(Collections.singletonList(peer)));
     }
   }
 
   public void remove(final Peer peer) {
-    if (blacklist.remove(peer.getId())) {
+    if (denylist.remove(peer.getId())) {
       dispatchUpdate(false, Optional.of(Collections.singletonList(peer)));
     }
   }
 
   public void add(final Bytes peerId) {
-    if (blacklist.add(peerId)) {
+    if (denylist.add(peerId)) {
       dispatchUpdate(true, Optional.empty());
     }
   }
 
   public void remove(final Bytes peerId) {
-    if (blacklist.remove(peerId)) {
+    if (denylist.remove(peerId)) {
       dispatchUpdate(false, Optional.empty());
     }
   }
 
   @Override
   public void close() {
-    blacklist.clear();
+    denylist.clear();
   }
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/plain/MessageHandler.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/plain/MessageHandler.java
new file mode 100644
index 00000000000..2b4efba9df6
--- /dev/null
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/plain/MessageHandler.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.plain;
+
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+
+import io.netty.buffer.ByteBuf;
+import org.apache.tuweni.bytes.Bytes;
+
+public class MessageHandler {
+
+  public static Bytes buildMessage(final PlainMessage message) {
+    final BytesValueRLPOutput ret = new BytesValueRLPOutput();
+    ret.startList();
+    ret.writeInt(message.getMessageType().getValue());
+    if (MessageType.DATA.equals(message.getMessageType())) {
+      ret.writeInt(message.getCode());
+    }
+    ret.writeBytes(message.getData());
+    ret.endList();
+    return ret.encoded();
+  }
+
+  public static Bytes buildMessage(final MessageType messageType, final Bytes data) {
+    return buildMessage(new PlainMessage(messageType, data));
+  }
+
+  public static Bytes buildMessage(
+      final MessageType messageType, final int code, final Bytes data) {
+    return buildMessage(new PlainMessage(messageType, code, data));
+  }
+
+  public static Bytes buildMessage(final MessageType messageType, final byte[] data) {
+    return buildMessage(new PlainMessage(messageType, data));
+  }
+
+  public static PlainMessage parseMessage(final ByteBuf buf) {
+    PlainMessage ret = null;
+    final ByteBuf bufferedBytes = buf.readSlice(buf.readableBytes());
+    final byte[] byteArr = new byte[bufferedBytes.readableBytes()];
+    bufferedBytes.getBytes(0, byteArr);
+    Bytes bytes = Bytes.wrap(byteArr);
+    final RLPInput input = new BytesValueRLPInput(bytes, true);
+    input.enterList();
+    MessageType type = MessageType.forNumber(input.readInt());
+    if (MessageType.DATA.equals(type)) {
+      ret = new PlainMessage(type, input.readInt(), input.readBytes());
+    } else {
+      ret = new PlainMessage(type, input.readBytes());
+    }
+    return ret;
+  }
+}
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/plain/MessageType.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/plain/MessageType.java
new file mode 100644
index 00000000000..7335b9810f5
--- /dev/null
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/plain/MessageType.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.plain;
+
+public enum MessageType {
+  PING(0),
+  PONG(1),
+  DATA(2),
+  UNRECOGNIZED(-1),
+  ;
+
+  private final int value;
+
+  private MessageType(final int value) {
+    this.value = value;
+  }
+
+  public int getValue() {
+    return value;
+  }
+
+  public static MessageType forNumber(final int value) {
+    switch (value) {
+      case 0:
+        return PING;
+      case 1:
+        return PONG;
+      case 2:
+        return DATA;
+      default:
+        return null;
+    }
+  }
+}
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/plain/PlainFramer.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/plain/PlainFramer.java
new file mode 100644
index 00000000000..dfab2043024
--- /dev/null
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/plain/PlainFramer.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.plain;
+
+import static com.google.common.base.Preconditions.checkState;
+
+import org.hyperledger.besu.ethereum.p2p.rlpx.framing.Framer;
+import org.hyperledger.besu.ethereum.p2p.rlpx.framing.FramingException;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.RawMessage;
+
+import io.netty.buffer.ByteBuf;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PlainFramer extends Framer {
+  private static final Logger LOG = LoggerFactory.getLogger(PlainFramer.class);
+
+  public PlainFramer() {
+    LOG.trace("Initialising PlainFramer");
+  }
+
+  @Override
+  public synchronized MessageData deframe(final ByteBuf buf) throws FramingException {
+    LOG.trace("Deframing Message");
+    if (buf == null || !buf.isReadable()) {
+      return null;
+    }
+    PlainMessage message = MessageHandler.parseMessage(buf);
+    checkState(
+        MessageType.DATA.equals(message.getMessageType()), "unexpected message: needs to be data");
+    return new RawMessage(message.getCode(), message.getData());
+  }
+
+  @Override
+  public synchronized void frame(final MessageData message, final ByteBuf output) {
+    LOG.trace("Framing Message");
+    output.writeBytes(
+        MessageHandler.buildMessage(MessageType.DATA, message.getCode(), message.getData())
+            .toArray());
+  }
+}
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/plain/PlainHandshaker.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/plain/PlainHandshaker.java
new file mode 100644
index 00000000000..cc109c87d6b
--- /dev/null
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/plain/PlainHandshaker.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.plain;
+
+import static com.google.common.base.Preconditions.checkState;
+
+import org.hyperledger.besu.crypto.SECPPublicKey;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.HandshakeException;
+import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.HandshakeSecrets;
+import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.Handshaker;
+
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PlainHandshaker implements Handshaker {
+
+  private static final Logger LOG = LoggerFactory.getLogger(PlainHandshaker.class);
+
+  private final AtomicReference<Handshaker.HandshakeStatus> status =
+      new AtomicReference<>(Handshaker.HandshakeStatus.UNINITIALIZED);
+
+  private boolean initiator;
+  private NodeKey nodeKey;
+  private SECPPublicKey partyPubKey;
+  private Bytes initiatorMsg;
+  private Bytes responderMsg;
+
+  @Override
+  public void prepareInitiator(final NodeKey nodeKey, final SECPPublicKey theirPubKey) {
+    checkState(
+        status.compareAndSet(
+            Handshaker.HandshakeStatus.UNINITIALIZED, Handshaker.HandshakeStatus.PREPARED),
+        "handshake was already prepared");
+
+    this.initiator = true;
+    this.nodeKey = nodeKey;
+    this.partyPubKey = theirPubKey;
+    LOG.trace(
+        "Prepared plain handshake with node {}... under INITIATOR role",
+        theirPubKey.getEncodedBytes().slice(0, 16));
+  }
+
+  @Override
+  public void prepareResponder(final NodeKey nodeKey) {
+    checkState(
+        status.compareAndSet(
+            Handshaker.HandshakeStatus.UNINITIALIZED, Handshaker.HandshakeStatus.IN_PROGRESS),
+        "handshake was already prepared");
+
+    this.initiator = false;
+    this.nodeKey = nodeKey;
+    LOG.trace("Prepared plain handshake under RESPONDER role");
+  }
+
+  @Override
+  public ByteBuf firstMessage() throws HandshakeException {
+    checkState(initiator, "illegal invocation of firstMessage on non-initiator end of handshake");
+    checkState(
+        status.compareAndSet(
+            Handshaker.HandshakeStatus.PREPARED, Handshaker.HandshakeStatus.IN_PROGRESS),
+        "illegal invocation of firstMessage, handshake had already started");
+    initiatorMsg =
+        MessageHandler.buildMessage(MessageType.PING, nodeKey.getPublicKey().getEncoded());
+
+    LOG.trace("First plain handshake message under INITIATOR role");
+
+    return Unpooled.wrappedBuffer(initiatorMsg.toArray());
+  }
+
+  @Override
+  public Optional<ByteBuf> handleMessage(final ByteBuf buf) throws HandshakeException {
+    checkState(
+        status.get() == Handshaker.HandshakeStatus.IN_PROGRESS,
+        "illegal invocation of onMessage on handshake that is not in progress");
+
+    PlainMessage message = MessageHandler.parseMessage(buf);
+
+    Optional<Bytes> nextMsg = Optional.empty();
+    if (initiator) {
+      checkState(
+          responderMsg == null,
+          "unexpected message: responder message had " + "already been received");
+
+      checkState(
+          message.getMessageType().equals(MessageType.PONG),
+          "unexpected message: needs to be a pong");
+      responderMsg = message.getData();
+
+      LOG.trace(
+          "Received responder's plain handshake message from node {}...: {}",
+          partyPubKey.getEncodedBytes().slice(0, 16),
+          responderMsg);
+
+    } else {
+      checkState(
+          initiatorMsg == null,
+          "unexpected message: initiator message " + "had already been received");
+      checkState(
+          message.getMessageType().equals(MessageType.PING),
+          "unexpected message: needs to be a ping");
+
+      initiatorMsg = message.getData();
+      LOG.trace(
+          "[{}] Received initiator's plain handshake message: {}",
+          nodeKey.getPublicKey().getEncodedBytes(),
+          initiatorMsg);
+
+      partyPubKey = SignatureAlgorithmFactory.getInstance().createPublicKey(message.getData());
+
+      responderMsg =
+          MessageHandler.buildMessage(MessageType.PONG, nodeKey.getPublicKey().getEncoded());
+
+      LOG.trace(
+          "Generated responder's plain handshake message against peer {}...: {}",
+          partyPubKey.getEncodedBytes().slice(0, 16),
+          responderMsg);
+
+      nextMsg = Optional.of(Bytes.wrap(responderMsg.toArray()));
+    }
+
+    status.set(Handshaker.HandshakeStatus.SUCCESS);
+    LOG.trace("Handshake status set to {}", status.get());
+    return nextMsg.map(bv -> Unpooled.wrappedBuffer(bv.toArray()));
+  }
+
+  void computeSecrets() {}
+
+  @Override
+  public HandshakeStatus getStatus() {
+    return status.get();
+  }
+
+  @Override
+  public HandshakeSecrets secrets() {
+    return null;
+  }
+
+  @Override
+  public SECPPublicKey partyPubKey() {
+    return partyPubKey;
+  }
+}
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/plain/PlainMessage.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/plain/PlainMessage.java
new file mode 100644
index 00000000000..f212141037d
--- /dev/null
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/plain/PlainMessage.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.plain;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class PlainMessage {
+
+  private final MessageType messageType;
+  private final int code;
+  private final Bytes data;
+
+  public PlainMessage(final MessageType messageType, final byte[] data) {
+    this(messageType, Bytes.wrap(data));
+  }
+
+  public PlainMessage(final MessageType messageType, final Bytes data) {
+    this(messageType, -1, data);
+  }
+
+  public PlainMessage(final MessageType messageType, final int code, final Bytes data) {
+    super();
+    this.messageType = messageType;
+    this.code = code;
+    this.data = data;
+  }
+
+  public MessageType getMessageType() {
+    return messageType;
+  }
+
+  public Bytes getData() {
+    return data;
+  }
+
+  public int getCode() {
+    return code;
+  }
+}
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/RlpxAgent.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/RlpxAgent.java
index 18dcdb466b2..6cf250d715b 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/RlpxAgent.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/RlpxAgent.java
@@ -16,13 +16,10 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
-import static java.util.Objects.isNull;
 
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.cryptoservices.NodeKey;
 import org.hyperledger.besu.ethereum.p2p.config.RlpxConfiguration;
 import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
 import org.hyperledger.besu.ethereum.p2p.peers.LocalNode;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.peers.PeerPrivileges;
@@ -31,55 +28,57 @@
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnectionEvents;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerRlpxPermissions;
-import org.hyperledger.besu.ethereum.p2p.rlpx.connections.RlpxConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty.NettyConnectionInitializer;
+import org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty.NettyTLSConnectionInitializer;
+import org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty.TLSConfiguration;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.ShouldConnectCallback;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
-import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
-import org.hyperledger.besu.plugin.services.metrics.Counter;
 import org.hyperledger.besu.util.Subscribers;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import org.apache.tuweni.bytes.Bytes;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class RlpxAgent {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(RlpxAgent.class);
 
   private final LocalNode localNode;
   private final PeerConnectionEvents connectionEvents;
   private final ConnectionInitializer connectionInitializer;
   private final Subscribers<ConnectCallback> connectSubscribers = Subscribers.create();
-
+  private final List<ShouldConnectCallback> connectRequestSubscribers = new ArrayList<>();
   private final PeerRlpxPermissions peerPermissions;
   private final PeerPrivileges peerPrivileges;
-  private final int maxConnections;
-  private final boolean randomPeerPriority;
-  private final int maxRemotelyInitiatedConnections;
-  // xor'ing with this mask will allow us to randomly let new peers connect
-  // without allowing the counterparty to play nodeId farming games
-  private final Bytes nodeIdMask = Bytes.random(SECP256K1.PublicKey.BYTE_LENGTH);
-
-  @VisibleForTesting final Map<Bytes, RlpxConnection> connectionsById = new ConcurrentHashMap<>();
-
   private final AtomicBoolean started = new AtomicBoolean(false);
   private final AtomicBoolean stopped = new AtomicBoolean(false);
-
-  private final Counter connectedPeersCounter;
+  private final int lowerBound;
+  private final Supplier<Stream<PeerConnection>> allConnectionsSupplier;
+  private final Supplier<Stream<PeerConnection>> allActiveConnectionsSupplier;
+  private final Cache<Bytes, CompletableFuture<PeerConnection>> peersConnectingCache =
+      CacheBuilder.newBuilder()
+          .expireAfterWrite(
+              Duration.ofSeconds(30L)) // we will at most try to connect every 30 seconds
+          .concurrencyLevel(1)
+          .build();
 
   private RlpxAgent(
       final LocalNode localNode,
@@ -87,35 +86,17 @@ private RlpxAgent(
       final ConnectionInitializer connectionInitializer,
       final PeerRlpxPermissions peerPermissions,
       final PeerPrivileges peerPrivileges,
-      final int maxConnections,
-      final int maxRemotelyInitiatedConnections,
-      final boolean randomPeerPriority,
-      final MetricsSystem metricsSystem) {
+      final int peersLowerBound,
+      final Supplier<Stream<PeerConnection>> allConnectionsSupplier,
+      final Supplier<Stream<PeerConnection>> allActiveConnectionsSupplier) {
     this.localNode = localNode;
     this.connectionEvents = connectionEvents;
     this.connectionInitializer = connectionInitializer;
     this.peerPermissions = peerPermissions;
     this.peerPrivileges = peerPrivileges;
-    this.maxConnections = maxConnections;
-    this.randomPeerPriority = randomPeerPriority;
-    this.maxRemotelyInitiatedConnections =
-        Math.min(maxConnections, maxRemotelyInitiatedConnections);
-
-    // Setup metrics
-    connectedPeersCounter =
-        metricsSystem.createCounter(
-            BesuMetricCategory.PEERS, "connected_total", "Total number of peers connected");
-
-    metricsSystem.createIntegerGauge(
-        BesuMetricCategory.ETHEREUM,
-        "peer_count",
-        "The current number of peers connected",
-        this::getConnectionCount);
-    metricsSystem.createIntegerGauge(
-        BesuMetricCategory.ETHEREUM,
-        "peer_limit",
-        "The maximum number of peers this node allows to connect",
-        () -> maxConnections);
+    this.lowerBound = peersLowerBound;
+    this.allConnectionsSupplier = allConnectionsSupplier;
+    this.allActiveConnectionsSupplier = allActiveConnectionsSupplier;
   }
 
   public static Builder builder() {
@@ -157,43 +138,58 @@ public CompletableFuture<Void> stop() {
     return connectionInitializer.stop();
   }
 
-  public Stream<? extends PeerConnection> streamConnections() {
-    return connectionsById.values().stream()
-        .filter(RlpxConnection::isActive)
-        .map(RlpxConnection::getPeerConnection);
+  public Stream<PeerConnection> streamConnections() {
+    try {
+      return allConnectionsSupplier.get();
+    } catch (final Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public Stream<PeerConnection> streamActiveConnections() {
+    try {
+      return allActiveConnectionsSupplier.get();
+    } catch (final Exception e) {
+      throw new RuntimeException(e);
+    }
   }
 
   public int getConnectionCount() {
-    return Math.toIntExact(streamConnections().count());
+    try {
+      return (int) allActiveConnectionsSupplier.get().count();
+    } catch (final Exception e) {
+      throw new RuntimeException(e);
+    }
   }
 
   public void connect(final Stream<? extends Peer> peerStream) {
     if (!localNode.isReady()) {
       return;
     }
-    final int availablePeerSlots = Math.max(0, maxConnections - getConnectionCount());
-    peerStream
-        .filter(peer -> !connectionsById.containsKey(peer.getId()))
-        .filter(peer -> peer.getEnodeURL().isListening())
-        .filter(peerPermissions::allowNewOutboundConnectionTo)
-        .limit(availablePeerSlots)
-        .forEach(this::connect);
+    peerStream.forEach(this::connect);
   }
 
   public void disconnect(final Bytes peerId, final DisconnectReason reason) {
-    RlpxConnection connection = connectionsById.remove(peerId);
-    if (connection != null) {
-      connection.disconnect(reason);
+    try {
+      allActiveConnectionsSupplier
+          .get()
+          .filter(c -> c.getPeer().getId().equals(peerId))
+          .forEach(c -> c.disconnect(reason));
+      final CompletableFuture<PeerConnection> peerConnectionCompletableFuture =
+          getMapOfCompletableFutures().get(peerId);
+      if (peerConnectionCompletableFuture != null) {
+        if (!peerConnectionCompletableFuture.isDone()) {
+          peerConnectionCompletableFuture.cancel(true);
+        } else if (!peerConnectionCompletableFuture.isCompletedExceptionally()
+            && !peerConnectionCompletableFuture.isCancelled()) {
+          peerConnectionCompletableFuture.get().disconnect(reason);
+        }
+      }
+    } catch (final Exception e) {
+      throw new RuntimeException(e);
     }
   }
 
-  public Optional<CompletableFuture<PeerConnection>> getPeerConnection(final Peer peer) {
-    final RlpxConnection connection = connectionsById.get(peer.getId());
-    return Optional.ofNullable(connection)
-        .filter(conn -> !conn.isFailedOrDisconnected())
-        .map(RlpxConnection::getFuture);
-  }
-
   /**
    * Connect to the peer
    *
@@ -213,83 +209,60 @@ public CompletableFuture<PeerConnection> connect(final Peer peer) {
     // Check peer is valid
     final EnodeURL enode = peer.getEnodeURL();
     if (!enode.isListening()) {
-      final String errorMsg =
-          "Attempt to connect to peer with no listening port: " + enode.toString();
+      final String errorMsg = "Attempt to connect to peer with no listening port: " + enode;
       LOG.warn(errorMsg);
       return CompletableFuture.failedFuture((new IllegalArgumentException(errorMsg)));
     }
 
-    // Shortcut checks if we're already connected
-    final Optional<CompletableFuture<PeerConnection>> peerConnection = getPeerConnection(peer);
-    if (peerConnection.isPresent()) {
-      return peerConnection.get();
-    }
-    // Check max peers
-    if (!peerPrivileges.canExceedConnectionLimits(peer) && getConnectionCount() >= maxConnections) {
-      final String errorMsg =
-          "Max peer peer connections established ("
-              + maxConnections
-              + "). Cannot connect to peer: "
-              + peer;
-      return CompletableFuture.failedFuture(new IllegalStateException(errorMsg));
-    }
     // Check permissions
     if (!peerPermissions.allowNewOutboundConnectionTo(peer)) {
       return CompletableFuture.failedFuture(peerPermissions.newOutboundConnectionException(peer));
     }
 
-    // Initiate connection or return existing connection
-    AtomicReference<CompletableFuture<PeerConnection>> connectionFuture = new AtomicReference<>();
-    connectionsById.compute(
-        peer.getId(),
-        (id, existingConnection) -> {
-          if (existingConnection != null && !existingConnection.isFailedOrDisconnected()) {
-            // We're already connected or connecting
-            connectionFuture.set(existingConnection.getFuture());
-            return existingConnection;
-          } else {
-            // We're initiating a new connection
-            final CompletableFuture<PeerConnection> future = initiateOutboundConnection(peer);
-            connectionFuture.set(future);
-            RlpxConnection newConnection = RlpxConnection.outboundConnection(peer, future);
-            newConnection.subscribeConnectionEstablished(
-                (conn) -> {
-                  this.dispatchConnect(conn.getPeerConnection());
-                  this.enforceConnectionLimits();
-                },
-                (failedConn) -> cleanUpPeerConnection(failedConn.getId()));
-            return newConnection;
+    final CompletableFuture<PeerConnection> peerConnectionCompletableFuture;
+    if (checkWhetherToConnect(peer, false)) {
+      try {
+        synchronized (this) {
+          peerConnectionCompletableFuture =
+              peersConnectingCache.get(
+                  peer.getId(), () -> createPeerConnectionCompletableFuture(peer));
+        }
+      } catch (final ExecutionException e) {
+        throw new RuntimeException(e);
+      }
+    } else {
+      final String errorMsg =
+          "None of the ProtocolManagers wants to connect to peer " + peer.getId();
+      LOG.trace(errorMsg);
+      return CompletableFuture.failedFuture((new RuntimeException(errorMsg)));
+    }
+
+    return peerConnectionCompletableFuture;
+  }
+
+  @NotNull
+  private CompletableFuture<PeerConnection> createPeerConnectionCompletableFuture(final Peer peer) {
+    final CompletableFuture<PeerConnection> peerConnectionCompletableFuture =
+        initiateOutboundConnection(peer);
+    peerConnectionCompletableFuture.whenComplete(
+        (peerConnection, throwable) -> {
+          if (throwable == null) {
+            dispatchConnect(peerConnection);
           }
         });
+    return peerConnectionCompletableFuture;
+  }
 
-    return connectionFuture.get();
+  private boolean checkWhetherToConnect(final Peer peer, final boolean incoming) {
+    return connectRequestSubscribers.stream()
+        .anyMatch(callback -> callback.shouldConnect(peer, incoming));
   }
 
   private void setupListeners() {
     connectionInitializer.subscribeIncomingConnect(this::handleIncomingConnection);
-    connectionEvents.subscribeDisconnect(this::handleDisconnect);
     peerPermissions.subscribeUpdate(this::handlePermissionsUpdate);
   }
 
-  private void handleDisconnect(
-      final PeerConnection peerConnection,
-      final DisconnectReason disconnectReason,
-      final boolean initiatedByPeer) {
-    cleanUpPeerConnection(peerConnection.getPeer().getId());
-  }
-
-  private void cleanUpPeerConnection(final Bytes peerId) {
-    connectionsById.compute(
-        peerId,
-        (id, trackedConnection) -> {
-          if (isNull(trackedConnection) || trackedConnection.isFailedOrDisconnected()) {
-            // Remove if failed or disconnected
-            return null;
-          }
-          return trackedConnection;
-        });
-  }
-
   private void handlePermissionsUpdate(
       final boolean permissionsRestricted, final Optional<List<Peer>> peers) {
     if (!permissionsRestricted) {
@@ -297,20 +270,20 @@ private void handlePermissionsUpdate(
       return;
     }
 
-    final List<RlpxConnection> connectionsToCheck =
-        peers
-            .map(
-                updatedPeers ->
-                    updatedPeers.stream()
-                        .map(peer -> connectionsById.get(peer.getId()))
-                        .filter(connection -> !isNull(connection))
-                        .collect(Collectors.toList()))
-            .orElse(new ArrayList<>(connectionsById.values()));
+    final Stream<PeerConnection> connectionsToCheck;
+    if (peers.isPresent()) {
+      final List<Bytes> changedPeersIds =
+          peers.get().stream().map(p -> p.getId()).collect(Collectors.toList());
+      connectionsToCheck =
+          streamConnections().filter(c -> changedPeersIds.contains(c.getPeer().getId()));
+    } else {
+      connectionsToCheck = streamConnections();
+    }
 
     connectionsToCheck.forEach(
         connection -> {
           if (!peerPermissions.allowOngoingConnection(
-              connection.getPeer(), connection.initiatedRemotely())) {
+              connection.getPeer(), connection.inboundInitiated())) {
             LOG.debug(
                 "Disconnecting from peer that is not permitted to maintain ongoing connection: {}",
                 connection);
@@ -337,6 +310,10 @@ private CompletableFuture<PeerConnection> initiateOutboundConnection(final Peer
             });
   }
 
+  public boolean canExceedConnectionLimits(final Peer peer) {
+    return peerPrivileges.canExceedConnectionLimits(peer);
+  }
+
   private void handleIncomingConnection(final PeerConnection peerConnection) {
     final Peer peer = peerConnection.getPeer();
     // Deny connection if our local node isn't ready
@@ -345,23 +322,7 @@ private void handleIncomingConnection(final PeerConnection peerConnection) {
       peerConnection.disconnect(DisconnectReason.UNKNOWN);
       return;
     }
-    if (!randomPeerPriority) {
-      // Disconnect if too many peers
-      if (!peerPrivileges.canExceedConnectionLimits(peer)
-          && getConnectionCount() >= maxConnections) {
-        LOG.debug("Too many peers. Disconnect incoming connection: {}", peerConnection);
-        peerConnection.disconnect(DisconnectReason.TOO_MANY_PEERS);
-        return;
-      }
-      // Disconnect if too many remotely-initiated connections
-      if (!peerPrivileges.canExceedConnectionLimits(peer) && remoteConnectionLimitReached()) {
-        LOG.debug(
-            "Too many remotely-initiated connections. Disconnect incoming connection: {}",
-            peerConnection);
-        peerConnection.disconnect(DisconnectReason.TOO_MANY_PEERS);
-        return;
-      }
-    }
+
     // Disconnect if not permitted
     if (!peerPermissions.allowNewInboundConnectionFrom(peer)) {
       LOG.debug(
@@ -370,164 +331,11 @@ && getConnectionCount() >= maxConnections) {
       return;
     }
 
-    // Track this new connection, deduplicating existing connection if necessary
-    final AtomicBoolean newConnectionAccepted = new AtomicBoolean(false);
-    final RlpxConnection inboundConnection = RlpxConnection.inboundConnection(peerConnection);
-    // Our disconnect handler runs connectionsById.compute(), so don't actually execute the
-    // disconnect command until we've returned from our compute() calculation
-    final AtomicReference<Runnable> disconnectAction = new AtomicReference<>();
-    connectionsById.compute(
-        peer.getId(),
-        (nodeId, existingConnection) -> {
-          if (existingConnection == null) {
-            // The new connection is unique, set it and return
-            LOG.debug("Inbound connection established with {}", peerConnection.getPeer().getId());
-            newConnectionAccepted.set(true);
-            return inboundConnection;
-          }
-          // We already have an existing connection, figure out which connection to keep
-          if (compareDuplicateConnections(inboundConnection, existingConnection) < 0) {
-            // Keep the inbound connection
-            LOG.debug(
-                "Duplicate connection detected, disconnecting previously established connection in favor of new inbound connection for peer:  {}",
-                peerConnection.getPeer().getId());
-            disconnectAction.set(
-                () -> existingConnection.disconnect(DisconnectReason.ALREADY_CONNECTED));
-            newConnectionAccepted.set(true);
-            return inboundConnection;
-          } else {
-            // Keep the existing connection
-            LOG.debug(
-                "Duplicate connection detected, disconnecting inbound connection in favor of previously established connection for peer:  {}",
-                peerConnection.getPeer().getId());
-            disconnectAction.set(
-                () -> inboundConnection.disconnect(DisconnectReason.ALREADY_CONNECTED));
-            return existingConnection;
-          }
-        });
-
-    if (!isNull(disconnectAction.get())) {
-      disconnectAction.get().run();
-    }
-    if (newConnectionAccepted.get()) {
+    if (checkWhetherToConnect(peer, true)) {
       dispatchConnect(peerConnection);
-    }
-    // Check remote connections again to control for race conditions
-    enforceRemoteConnectionLimits();
-    enforceConnectionLimits();
-  }
-
-  private boolean shouldLimitRemoteConnections() {
-    return maxRemotelyInitiatedConnections < maxConnections;
-  }
-
-  private boolean remoteConnectionLimitReached() {
-    return shouldLimitRemoteConnections()
-        && countUntrustedRemotelyInitiatedConnections() >= maxRemotelyInitiatedConnections;
-  }
-
-  private long countUntrustedRemotelyInitiatedConnections() {
-    return connectionsById.values().stream()
-        .filter(RlpxConnection::isActive)
-        .filter(RlpxConnection::initiatedRemotely)
-        .filter(conn -> !peerPrivileges.canExceedConnectionLimits(conn.getPeer()))
-        .count();
-  }
-
-  private void enforceRemoteConnectionLimits() {
-    if (!shouldLimitRemoteConnections()
-        || connectionsById.size() < maxRemotelyInitiatedConnections) {
-      // Nothing to do
-      return;
-    }
-
-    getActivePrioritizedConnections()
-        .filter(RlpxConnection::initiatedRemotely)
-        .filter(conn -> !peerPrivileges.canExceedConnectionLimits(conn.getPeer()))
-        .skip(maxRemotelyInitiatedConnections)
-        .forEach(
-            conn -> {
-              LOG.debug(
-                  "Too many remotely initiated connections. Disconnect low-priority connection: {}",
-                  conn);
-              conn.disconnect(DisconnectReason.TOO_MANY_PEERS);
-            });
-  }
-
-  private void enforceConnectionLimits() {
-    if (connectionsById.size() < maxConnections) {
-      // Nothing to do - we're under our limits
-      return;
-    }
-
-    getActivePrioritizedConnections()
-        .skip(maxConnections)
-        .filter(c -> !peerPrivileges.canExceedConnectionLimits(c.getPeer()))
-        .forEach(
-            conn -> {
-              LOG.debug("Too many connections. Disconnect low-priority connection: {}", conn);
-              conn.disconnect(DisconnectReason.TOO_MANY_PEERS);
-            });
-  }
-
-  private Stream<RlpxConnection> getActivePrioritizedConnections() {
-    return connectionsById.values().stream()
-        .filter(RlpxConnection::isActive)
-        .sorted(this::comparePeerPriorities);
-  }
-
-  private int comparePeerPriorities(final RlpxConnection a, final RlpxConnection b) {
-    final boolean aIgnoresPeerLimits = peerPrivileges.canExceedConnectionLimits(a.getPeer());
-    final boolean bIgnoresPeerLimits = peerPrivileges.canExceedConnectionLimits(b.getPeer());
-    if (aIgnoresPeerLimits && !bIgnoresPeerLimits) {
-      return -1;
-    } else if (bIgnoresPeerLimits && !aIgnoresPeerLimits) {
-      return 1;
     } else {
-      return randomPeerPriority
-          ? compareByMaskedNodeId(a, b)
-          : compareConnectionInitiationTimes(a, b);
-    }
-  }
-
-  private int compareConnectionInitiationTimes(final RlpxConnection a, final RlpxConnection b) {
-    return Math.toIntExact(a.getInitiatedAt() - b.getInitiatedAt());
-  }
-
-  private int compareByMaskedNodeId(final RlpxConnection a, final RlpxConnection b) {
-    return a.getPeer().getId().xor(nodeIdMask).compareTo(b.getPeer().getId().xor(nodeIdMask));
-  }
-
-  /**
-   * Compares two connections to the same peer to determine which connection should be kept
-   *
-   * @param a The first connection
-   * @param b The second connection
-   * @return A negative value if {@code a} should be kept, a positive value is {@code b} should be
-   *     kept
-   */
-  private int compareDuplicateConnections(final RlpxConnection a, final RlpxConnection b) {
-    checkState(localNode.isReady());
-    checkState(Objects.equals(a.getPeer().getId(), b.getPeer().getId()));
-
-    if (a.isFailedOrDisconnected() != b.isFailedOrDisconnected()) {
-      // One connection has failed - prioritize the one that hasn't failed
-      return a.isFailedOrDisconnected() ? 1 : -1;
-    }
-
-    final Bytes peerId = a.getPeer().getId();
-    final Bytes localId = localNode.getPeer().getId();
-    if (a.initiatedRemotely() != b.initiatedRemotely()) {
-      // If we have connections initiated in different directions, keep the connection initiated
-      // by the node with the lower id
-      if (localId.compareTo(peerId) < 0) {
-        return a.initiatedLocally() ? -1 : 1;
-      } else {
-        return a.initiatedLocally() ? 1 : -1;
-      }
+      peerConnection.disconnect(DisconnectReason.UNKNOWN);
     }
-    // Otherwise, keep older connection
-    return Math.toIntExact(a.getInitiatedAt() - b.getInitiatedAt());
   }
 
   public void subscribeMessage(final Capability capability, final MessageCallback callback) {
@@ -538,15 +346,27 @@ public void subscribeConnect(final ConnectCallback callback) {
     connectSubscribers.subscribe(callback);
   }
 
+  public void subscribeConnectRequest(final ShouldConnectCallback callback) {
+    connectRequestSubscribers.add(callback);
+  }
+
   public void subscribeDisconnect(final DisconnectCallback callback) {
     connectionEvents.subscribeDisconnect(callback);
   }
 
   private void dispatchConnect(final PeerConnection connection) {
-    connectedPeersCounter.inc();
     connectSubscribers.forEach(c -> c.onConnect(connection));
   }
 
+  @VisibleForTesting
+  public ConcurrentMap<Bytes, CompletableFuture<PeerConnection>> getMapOfCompletableFutures() {
+    return peersConnectingCache.asMap();
+  }
+
+  public int getPeerLowerBound() {
+    return lowerBound;
+  }
+
   public static class Builder {
     private NodeKey nodeKey;
     private LocalNode localNode;
@@ -555,8 +375,11 @@ public static class Builder {
     private PeerPermissions peerPermissions;
     private ConnectionInitializer connectionInitializer;
     private PeerConnectionEvents connectionEvents;
-    private boolean randomPeerPriority;
     private MetricsSystem metricsSystem;
+    private Optional<TLSConfiguration> p2pTLSConfiguration;
+    private Supplier<Stream<PeerConnection>> allConnectionsSupplier;
+    private Supplier<Stream<PeerConnection>> allActiveConnectionsSupplier;
+    private int peersLowerBound;
 
     private Builder() {}
 
@@ -567,9 +390,22 @@ public RlpxAgent build() {
         connectionEvents = new PeerConnectionEvents(metricsSystem);
       }
       if (connectionInitializer == null) {
-        connectionInitializer =
-            new NettyConnectionInitializer(
-                nodeKey, config, localNode, connectionEvents, metricsSystem);
+        if (p2pTLSConfiguration.isPresent()) {
+          LOG.debug("TLS Configuration found using NettyTLSConnectionInitializer");
+          connectionInitializer =
+              new NettyTLSConnectionInitializer(
+                  nodeKey,
+                  config,
+                  localNode,
+                  connectionEvents,
+                  metricsSystem,
+                  p2pTLSConfiguration.get());
+        } else {
+          LOG.debug("Using default NettyConnectionInitializer");
+          connectionInitializer =
+              new NettyConnectionInitializer(
+                  nodeKey, config, localNode, connectionEvents, metricsSystem);
+        }
       }
 
       final PeerRlpxPermissions rlpxPermissions =
@@ -580,10 +416,9 @@ public RlpxAgent build() {
           connectionInitializer,
           rlpxPermissions,
           peerPrivileges,
-          config.getMaxPeers(),
-          config.getMaxRemotelyInitiatedConnections(),
-          randomPeerPriority,
-          metricsSystem);
+          peersLowerBound,
+          allConnectionsSupplier,
+          allActiveConnectionsSupplier);
     }
 
     private void validate() {
@@ -643,8 +478,25 @@ public Builder metricsSystem(final MetricsSystem metricsSystem) {
       return this;
     }
 
-    public Builder randomPeerPriority(final boolean randomPeerPriority) {
-      this.randomPeerPriority = randomPeerPriority;
+    public Builder p2pTLSConfiguration(final Optional<TLSConfiguration> p2pTLSConfiguration) {
+      this.p2pTLSConfiguration = p2pTLSConfiguration;
+      return this;
+    }
+
+    public Builder allConnectionsSupplier(
+        final Supplier<Stream<PeerConnection>> allConnectionsSupplier) {
+      this.allConnectionsSupplier = allConnectionsSupplier;
+      return this;
+    }
+
+    public Builder allActiveConnectionsSupplier(
+        final Supplier<Stream<PeerConnection>> allActiveConnectionsSupplier) {
+      this.allActiveConnectionsSupplier = allActiveConnectionsSupplier;
+      return this;
+    }
+
+    public Builder peersLowerBound(final int peersLowerBound) {
+      this.peersLowerBound = peersLowerBound;
       return this;
     }
   }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/RlpxFrameConstants.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/RlpxFrameConstants.java
new file mode 100644
index 00000000000..82b706c535e
--- /dev/null
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/RlpxFrameConstants.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.rlpx;
+
+public class RlpxFrameConstants {
+
+  private RlpxFrameConstants() {}
+
+  public static final int LENGTH_MAX_MESSAGE_FRAME = 0xFFFFFF;
+  public static final int LENGTH_FRAME_SIZE = 3;
+}
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/AbstractPeerConnection.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/AbstractPeerConnection.java
index c84253eebda..fbd183b9ed0 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/AbstractPeerConnection.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/AbstractPeerConnection.java
@@ -32,15 +32,15 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
 
-import com.google.common.base.MoreObjects;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
 
 public abstract class AbstractPeerConnection implements PeerConnection {
-  private static final Logger LOG = LogManager.getLogger();
-
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractPeerConnection.class);
+  private static final Marker P2P_MESSAGE_MARKER = MarkerFactory.getMarker("P2PMSG");
   private final Peer peer;
   private final PeerInfo peerInfo;
   private final InetSocketAddress localAddress;
@@ -53,6 +53,10 @@ public abstract class AbstractPeerConnection implements PeerConnection {
   private final AtomicBoolean disconnected = new AtomicBoolean(false);
   protected final PeerConnectionEventDispatcher connectionEventDispatcher;
   private final LabelledMetric<Counter> outboundMessagesCounter;
+  private final long initiatedAt;
+  private final boolean inboundInitiated;
+  private boolean statusSent;
+  private boolean statusReceived;
 
   protected AbstractPeerConnection(
       final Peer peer,
@@ -62,7 +66,8 @@ protected AbstractPeerConnection(
       final String connectionId,
       final CapabilityMultiplexer multiplexer,
       final PeerConnectionEventDispatcher connectionEventDispatcher,
-      final LabelledMetric<Counter> outboundMessagesCounter) {
+      final LabelledMetric<Counter> outboundMessagesCounter,
+      final boolean inboundInitiated) {
     this.peer = peer;
     this.peerInfo = peerInfo;
     this.localAddress = localAddress;
@@ -76,6 +81,10 @@ protected AbstractPeerConnection(
     }
     this.connectionEventDispatcher = connectionEventDispatcher;
     this.outboundMessagesCounter = outboundMessagesCounter;
+    this.inboundInitiated = inboundInitiated;
+    this.initiatedAt = System.currentTimeMillis();
+
+    LOG.debug("New PeerConnection ({}) established with peer {}", this, peer.getId());
   }
 
   @Override
@@ -113,7 +122,15 @@ private void doSend(final Capability capability, final MessageData message) {
           .inc();
     }
 
-    LOG.trace("Writing {} to {} via protocol {}", message, peerInfo, capability);
+    LOG.atTrace()
+        .addMarker(P2P_MESSAGE_MARKER)
+        .setMessage("Writing {} to {} via protocol {}")
+        .addArgument(message)
+        .addArgument(peerInfo)
+        .addArgument(capability)
+        .addKeyValue("rawData", message.getData())
+        .addKeyValue("decodedData", message::toStringDecoded)
+        .log();
     doSendMessage(capability, message);
   }
 
@@ -142,12 +159,12 @@ public Set<Capability> getAgreedCapabilities() {
   @Override
   public void terminateConnection(final DisconnectReason reason, final boolean peerInitiated) {
     if (disconnected.compareAndSet(false, true)) {
-      LOG.debug("Disconnected ({}) from {}", reason, peerInfo);
       connectionEventDispatcher.dispatchDisconnect(this, reason, peerInitiated);
     }
     // Always ensure the context gets closed immediately even if we previously sent a disconnect
     // message and are waiting to close.
     closeConnectionImmediately();
+    LOG.debug("Terminating connection {}, reason {}", this, reason);
   }
 
   protected abstract void closeConnectionImmediately();
@@ -157,9 +174,9 @@ public void terminateConnection(final DisconnectReason reason, final boolean pee
   @Override
   public void disconnect(final DisconnectReason reason) {
     if (disconnected.compareAndSet(false, true)) {
-      LOG.debug("Disconnecting ({}) from {}", reason, peerInfo);
       connectionEventDispatcher.dispatchDisconnect(this, reason, false);
       doSend(null, DisconnectMessage.create(reason));
+      LOG.debug("Disconnecting connection {}, reason {}", System.identityHashCode(this), reason);
       closeConnection();
     }
   }
@@ -179,6 +196,16 @@ public InetSocketAddress getRemoteAddress() {
     return remoteAddress;
   }
 
+  @Override
+  public long getInitiatedAt() {
+    return initiatedAt;
+  }
+
+  @Override
+  public boolean inboundInitiated() {
+    return inboundInitiated;
+  }
+
   @Override
   public boolean equals(final Object o) {
     if (o == this) {
@@ -197,14 +224,31 @@ public int hashCode() {
     return Objects.hash(connectionId, peer);
   }
 
+  @Override
+  public void setStatusSent() {
+    this.statusSent = true;
+  }
+
+  @Override
+  public void setStatusReceived() {
+    this.statusReceived = true;
+  }
+
+  @Override
+  public boolean getStatusExchanged() {
+    return statusReceived && statusSent;
+  }
+
   @Override
   public String toString() {
-    return MoreObjects.toStringHelper(this)
-        .add("nodeId", peerInfo.getNodeId())
-        .add("clientId", peerInfo.getClientId())
-        .add(
-            "caps",
-            agreedCapabilities.stream().map(Capability::toString).collect(Collectors.joining(", ")))
-        .toString();
+    return "[Connection with hashCode "
+        + hashCode()
+        + " with peer "
+        + this.peer.getId()
+        + " inboundInitiated "
+        + inboundInitiated
+        + " initAt "
+        + initiatedAt
+        + "]";
   }
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/PeerConnection.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/PeerConnection.java
index 50b74372ed1..bd622273aaf 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/PeerConnection.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/PeerConnection.java
@@ -14,12 +14,12 @@
  */
 package org.hyperledger.besu.ethereum.p2p.rlpx.connections;
 
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MessageData;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -122,4 +122,20 @@ public PeerNotConnected(final String message) {
   default EnodeURL getRemoteEnode() {
     return getPeer().getEnodeURL();
   }
+
+  /**
+   * Get the difference, measured in milliseconds, between the time this connection was initiated
+   * and midnight, January 1, 1970 UTC
+   *
+   * @return the time when this connection was initiated.
+   */
+  long getInitiatedAt();
+
+  boolean inboundInitiated();
+
+  void setStatusSent();
+
+  void setStatusReceived();
+
+  boolean getStatusExchanged();
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/RlpxConnection.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/RlpxConnection.java
deleted file mode 100644
index a56e9b8fef6..00000000000
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/RlpxConnection.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.p2p.rlpx.connections;
-
-import org.hyperledger.besu.ethereum.p2p.peers.Peer;
-import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
-
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-
-import org.apache.tuweni.bytes.Bytes;
-
-public abstract class RlpxConnection {
-
-  private final long initiatedAt;
-  protected final CompletableFuture<PeerConnection> future;
-
-  private RlpxConnection(final CompletableFuture<PeerConnection> future) {
-    this.future = future;
-    this.initiatedAt = System.currentTimeMillis();
-  }
-
-  public static RlpxConnection inboundConnection(final PeerConnection peerConnection) {
-    return new RemotelyInitiatedRlpxConnection(peerConnection);
-  }
-
-  public static RlpxConnection outboundConnection(
-      final Peer peer, final CompletableFuture<PeerConnection> future) {
-    return new LocallyInitiatedRlpxConnection(peer, future);
-  }
-
-  public abstract Peer getPeer();
-
-  public abstract void disconnect(DisconnectReason reason);
-
-  public Bytes getId() {
-    return getPeer().getId();
-  }
-
-  public abstract PeerConnection getPeerConnection() throws ConnectionNotEstablishedException;
-
-  public CompletableFuture<PeerConnection> getFuture() {
-    return future;
-  }
-
-  public abstract boolean isActive();
-
-  public abstract boolean isPending();
-
-  public abstract boolean isFailedOrDisconnected();
-
-  public abstract boolean initiatedRemotely();
-
-  public void subscribeConnectionEstablished(
-      final RlpxConnectCallback successCallback, final RlpxConnectFailedCallback failedCallback) {
-    future.whenComplete(
-        (conn, err) -> {
-          if (err != null) {
-            failedCallback.onFailure(this);
-          } else {
-            successCallback.onConnect(this);
-          }
-        });
-  }
-
-  public boolean initiatedLocally() {
-    return !initiatedRemotely();
-  }
-
-  public long getInitiatedAt() {
-    return initiatedAt;
-  }
-
-  private static class RemotelyInitiatedRlpxConnection extends RlpxConnection {
-
-    private final PeerConnection peerConnection;
-
-    private RemotelyInitiatedRlpxConnection(final PeerConnection peerConnection) {
-      super(CompletableFuture.completedFuture(peerConnection));
-      this.peerConnection = peerConnection;
-    }
-
-    @Override
-    public Peer getPeer() {
-      return peerConnection.getPeer();
-    }
-
-    @Override
-    public void disconnect(final DisconnectReason reason) {
-      peerConnection.disconnect(reason);
-    }
-
-    @Override
-    public PeerConnection getPeerConnection() {
-      return peerConnection;
-    }
-
-    @Override
-    public boolean isActive() {
-      return !peerConnection.isDisconnected();
-    }
-
-    @Override
-    public boolean isPending() {
-      return false;
-    }
-
-    @Override
-    public boolean isFailedOrDisconnected() {
-      return peerConnection.isDisconnected();
-    }
-
-    @Override
-    public boolean initiatedRemotely() {
-      return true;
-    }
-
-    @Override
-    public boolean equals(final Object o) {
-      if (o == this) {
-        return true;
-      }
-      if (!(o instanceof RemotelyInitiatedRlpxConnection)) {
-        return false;
-      }
-      final RemotelyInitiatedRlpxConnection that = (RemotelyInitiatedRlpxConnection) o;
-      return Objects.equals(peerConnection, that.peerConnection);
-    }
-
-    @Override
-    public int hashCode() {
-      return Objects.hash(peerConnection);
-    }
-  }
-
-  private static class LocallyInitiatedRlpxConnection extends RlpxConnection {
-
-    private final Peer peer;
-
-    private LocallyInitiatedRlpxConnection(
-        final Peer peer, final CompletableFuture<PeerConnection> future) {
-      super(future);
-      this.peer = peer;
-    }
-
-    @Override
-    public Peer getPeer() {
-      return peer;
-    }
-
-    @Override
-    public void disconnect(final DisconnectReason reason) {
-      future.thenAccept((conn) -> conn.disconnect(reason));
-    }
-
-    @Override
-    public PeerConnection getPeerConnection() throws ConnectionNotEstablishedException {
-      if (!future.isDone() || future.isCompletedExceptionally()) {
-        throw new ConnectionNotEstablishedException(
-            "Cannot access PeerConnection before connection is fully established.");
-      }
-      return future.getNow(null);
-    }
-
-    @Override
-    public boolean isActive() {
-      return future.isDone()
-          && !future.isCompletedExceptionally()
-          && !getPeerConnection().isDisconnected();
-    }
-
-    @Override
-    public boolean isPending() {
-      return !future.isDone();
-    }
-
-    @Override
-    public boolean isFailedOrDisconnected() {
-      return future.isCompletedExceptionally()
-          || (future.isDone() && getPeerConnection().isDisconnected());
-    }
-
-    @Override
-    public boolean initiatedRemotely() {
-      return false;
-    }
-
-    @Override
-    public boolean equals(final Object o) {
-      if (o == this) {
-        return true;
-      }
-      if (!(o instanceof LocallyInitiatedRlpxConnection)) {
-        return false;
-      }
-      final LocallyInitiatedRlpxConnection that = (LocallyInitiatedRlpxConnection) o;
-      return Objects.equals(peer, that.peer) && Objects.equals(future, that.future);
-    }
-
-    @Override
-    public int hashCode() {
-      return Objects.hash(peer, future);
-    }
-  }
-
-  public static class ConnectionNotEstablishedException extends IllegalStateException {
-
-    public ConnectionNotEstablishedException(final String message) {
-      super(message);
-    }
-  }
-
-  @FunctionalInterface
-  public interface RlpxConnectCallback {
-    void onConnect(RlpxConnection connection);
-  }
-
-  @FunctionalInterface
-  public interface RlpxConnectFailedCallback {
-    void onFailure(RlpxConnection connection);
-  }
-}
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/AbstractHandshakeHandler.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/AbstractHandshakeHandler.java
index cef549d63f6..87826b5f93b 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/AbstractHandshakeHandler.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/AbstractHandshakeHandler.java
@@ -19,8 +19,9 @@
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnectionEventDispatcher;
 import org.hyperledger.besu.ethereum.p2p.rlpx.framing.Framer;
+import org.hyperledger.besu.ethereum.p2p.rlpx.framing.FramerProvider;
 import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.Handshaker;
-import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker;
+import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.HandshakerProvider;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.HelloMessage;
@@ -36,15 +37,15 @@
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.codec.ByteToMessageDecoder;
 import io.netty.handler.codec.MessageToByteEncoder;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 abstract class AbstractHandshakeHandler extends SimpleChannelInboundHandler<ByteBuf> {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractHandshakeHandler.class);
 
-  protected final Handshaker handshaker = new ECIESHandshaker();
+  protected final Handshaker handshaker;
 
   // The peer we are expecting to connect to, if such a peer is known
   private final Optional<Peer> expectedPeer;
@@ -57,19 +58,28 @@ abstract class AbstractHandshakeHandler extends SimpleChannelInboundHandler<Byte
 
   private final MetricsSystem metricsSystem;
 
+  private final FramerProvider framerProvider;
+  private final boolean inboundInitiated;
+
   AbstractHandshakeHandler(
       final List<SubProtocol> subProtocols,
       final LocalNode localNode,
       final Optional<Peer> expectedPeer,
       final CompletableFuture<PeerConnection> connectionFuture,
       final PeerConnectionEventDispatcher connectionEventDispatcher,
-      final MetricsSystem metricsSystem) {
+      final MetricsSystem metricsSystem,
+      final HandshakerProvider handshakerProvider,
+      final FramerProvider framerProvider,
+      final boolean inboundInitiated) {
     this.subProtocols = subProtocols;
     this.localNode = localNode;
     this.expectedPeer = expectedPeer;
     this.connectionFuture = connectionFuture;
     this.connectionEventDispatcher = connectionEventDispatcher;
     this.metricsSystem = metricsSystem;
+    this.handshaker = handshakerProvider.buildInstance();
+    this.framerProvider = framerProvider;
+    this.inboundInitiated = inboundInitiated;
   }
 
   /**
@@ -97,10 +107,10 @@ protected final void channelRead0(final ChannelHandlerContext ctx, final ByteBuf
         return;
       }
 
-      LOG.debug("Sending framed hello");
+      LOG.trace("Sending framed hello");
 
       // Exchange keys done
-      final Framer framer = new Framer(handshaker.secrets());
+      final Framer framer = this.framerProvider.buildFramer(handshaker.secrets());
 
       final ByteToMessageDecoder deFramer =
           new DeFramer(
@@ -110,18 +120,19 @@ protected final void channelRead0(final ChannelHandlerContext ctx, final ByteBuf
               expectedPeer,
               connectionEventDispatcher,
               connectionFuture,
-              metricsSystem);
+              metricsSystem,
+              inboundInitiated);
 
       ctx.channel()
           .pipeline()
-          .addFirst(new ValidateFirstOutboundMessage(framer))
-          .replace(this, "DeFramer", deFramer);
+          .replace(this, "DeFramer", deFramer)
+          .addBefore("DeFramer", "validate", new ValidateFirstOutboundMessage(framer));
 
       ctx.writeAndFlush(new OutboundMessage(null, HelloMessage.create(localNode.getPeerInfo())))
           .addListener(
               ff -> {
                 if (ff.isSuccess()) {
-                  LOG.debug("Successfully wrote hello message");
+                  LOG.trace("Successfully wrote hello message");
                 }
               });
       msg.retain();
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/ApiHandler.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/ApiHandler.java
index 0fa4b9924a9..d0a689a0521 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/ApiHandler.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/ApiHandler.java
@@ -27,12 +27,15 @@
 
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
 
 final class ApiHandler extends SimpleChannelInboundHandler<MessageData> {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(ApiHandler.class);
+  private static final Marker P2P_MESSAGE_MARKER = MarkerFactory.getMarker("P2PMSG");
 
   private final CapabilityMultiplexer multiplexer;
   private final AtomicBoolean waitingForPong;
@@ -63,7 +66,7 @@ protected void channelRead0(final ChannelHandlerContext ctx, final MessageData o
     if (demultiplexed.getCapability() == null) {
       switch (message.getCode()) {
         case WireMessageCodes.PING:
-          LOG.debug("Received Wire PING");
+          LOG.trace("Received Wire PING");
           try {
             connection.send(null, PongMessage.get());
           } catch (final PeerConnection.PeerNotConnected peerNotConnected) {
@@ -71,7 +74,7 @@ protected void channelRead0(final ChannelHandlerContext ctx, final MessageData o
           }
           break;
         case WireMessageCodes.PONG:
-          LOG.debug("Received Wire PONG");
+          LOG.trace("Received Wire PONG");
           waitingForPong.set(false);
           break;
         case WireMessageCodes.DISCONNECT:
@@ -79,12 +82,12 @@ protected void channelRead0(final ChannelHandlerContext ctx, final MessageData o
           DisconnectMessage.DisconnectReason reason = DisconnectMessage.DisconnectReason.UNKNOWN;
           try {
             reason = disconnect.getReason();
-            LOG.debug(
+            LOG.trace(
                 "Received Wire DISCONNECT ({}) from peer: {}",
                 reason.name(),
                 connection.getPeerInfo());
           } catch (final RLPException e) {
-            LOG.debug(
+            LOG.trace(
                 "Received Wire DISCONNECT with invalid RLP. Peer: {}", connection.getPeerInfo());
           } catch (final Exception e) {
             LOG.error(
@@ -96,6 +99,16 @@ protected void channelRead0(final ChannelHandlerContext ctx, final MessageData o
       }
       return;
     }
+    LOG.atTrace()
+        .addMarker(P2P_MESSAGE_MARKER)
+        .setMessage("Received {} from {} via protocol {}")
+        .addArgument(message)
+        .addArgument(connection.getPeerInfo())
+        .addArgument(demultiplexed.getCapability())
+        .addKeyValue("rawData", message.getData())
+        .addKeyValue("decodedData", message::toStringDecoded)
+        .log();
+
     connectionEventDispatcher.dispatchMessage(demultiplexed.getCapability(), connection, message);
   }
 
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/DeFramer.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/DeFramer.java
index 51168005182..b39a6b82193 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/DeFramer.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/DeFramer.java
@@ -16,10 +16,11 @@
 
 import org.hyperledger.besu.ethereum.p2p.network.exceptions.BreachOfProtocolException;
 import org.hyperledger.besu.ethereum.p2p.network.exceptions.IncompatiblePeerException;
+import org.hyperledger.besu.ethereum.p2p.network.exceptions.PeerChannelClosedException;
 import org.hyperledger.besu.ethereum.p2p.network.exceptions.PeerDisconnectedException;
 import org.hyperledger.besu.ethereum.p2p.network.exceptions.UnexpectedPeerConnectionException;
 import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.peers.LocalNode;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
@@ -52,12 +53,12 @@
 import io.netty.handler.codec.ByteToMessageDecoder;
 import io.netty.handler.codec.DecoderException;
 import io.netty.handler.timeout.IdleStateHandler;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 final class DeFramer extends ByteToMessageDecoder {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(DeFramer.class);
 
   private final CompletableFuture<PeerConnection> connectFuture;
 
@@ -68,6 +69,7 @@ final class DeFramer extends ByteToMessageDecoder {
   // The peer we are expecting to connect to, if such a peer is known
   private final Optional<Peer> expectedPeer;
   private final List<SubProtocol> subProtocols;
+  private final boolean inboundInitiated;
   private boolean hellosExchanged;
   private final LabelledMetric<Counter> outboundMessagesCounter;
 
@@ -78,13 +80,15 @@ final class DeFramer extends ByteToMessageDecoder {
       final Optional<Peer> expectedPeer,
       final PeerConnectionEventDispatcher connectionEventDispatcher,
       final CompletableFuture<PeerConnection> connectFuture,
-      final MetricsSystem metricsSystem) {
+      final MetricsSystem metricsSystem,
+      final boolean inboundInitiated) {
     this.framer = framer;
     this.subProtocols = subProtocols;
     this.localNode = localNode;
     this.expectedPeer = expectedPeer;
     this.connectFuture = connectFuture;
     this.connectionEventDispatcher = connectionEventDispatcher;
+    this.inboundInitiated = inboundInitiated;
     this.outboundMessagesCounter =
         metricsSystem.createLabelledCounter(
             BesuMetricCategory.NETWORK,
@@ -109,14 +113,14 @@ protected void decode(final ChannelHandlerContext ctx, final ByteBuf in, final L
         try {
           peerInfo = HelloMessage.readFrom(message).getPeerInfo();
         } catch (final RLPException e) {
-          LOG.debug("Received invalid HELLO message", e);
+          LOG.debug("Received invalid HELLO message, set log level to TRACE for message body", e);
           connectFuture.completeExceptionally(e);
           ctx.close();
           return;
         }
-        LOG.debug("Received HELLO message: {}", peerInfo);
+        LOG.trace("Received HELLO message: {}", peerInfo);
         if (peerInfo.getVersion() >= 5) {
-          LOG.debug("Enable compression for p2pVersion: {}", peerInfo.getVersion());
+          LOG.trace("Enable compression for p2pVersion: {}", peerInfo.getVersion());
           framer.enableCompression();
         }
 
@@ -125,20 +129,27 @@ protected void decode(final ChannelHandlerContext ctx, final ByteBuf in, final L
                 subProtocols,
                 localNode.getPeerInfo().getCapabilities(),
                 peerInfo.getCapabilities());
-        final Peer peer = expectedPeer.orElse(createPeer(peerInfo, ctx));
+        final Optional<Peer> peer = expectedPeer.or(() -> createPeer(peerInfo, ctx));
+        if (peer.isEmpty()) {
+          LOG.debug("Failed to create connection for peer {}", peerInfo);
+          connectFuture.completeExceptionally(new PeerChannelClosedException(peerInfo));
+          ctx.close();
+          return;
+        }
         final PeerConnection connection =
             new NettyPeerConnection(
                 ctx,
-                peer,
+                peer.get(),
                 peerInfo,
                 capabilityMultiplexer,
                 connectionEventDispatcher,
-                outboundMessagesCounter);
+                outboundMessagesCounter,
+                inboundInitiated);
 
         // Check peer is who we expected
         if (expectedPeer.isPresent()
             && !Objects.equals(expectedPeer.get().getId(), peerInfo.getNodeId())) {
-          String unexpectedMsg =
+          final String unexpectedMsg =
               String.format(
                   "Expected id %s, but got %s", expectedPeer.get().getId(), peerInfo.getNodeId());
           connectFuture.completeExceptionally(new UnexpectedPeerConnectionException(unexpectedMsg));
@@ -166,16 +177,19 @@ protected void decode(final ChannelHandlerContext ctx, final ByteBuf in, final L
                 new MessageFramer(capabilityMultiplexer, framer));
         connectFuture.complete(connection);
       } else if (message.getCode() == WireMessageCodes.DISCONNECT) {
-        DisconnectMessage disconnectMessage = DisconnectMessage.readFrom(message);
+        final DisconnectMessage disconnectMessage = DisconnectMessage.readFrom(message);
         LOG.debug(
-            "Peer disconnected before sending HELLO.  Reason: " + disconnectMessage.getReason());
+            "Peer {} disconnected before sending HELLO.  Reason: {}",
+            expectedPeer.map(Peer::getEnodeURLString).orElse("unknown"),
+            disconnectMessage.getReason());
         ctx.close();
         connectFuture.completeExceptionally(
             new PeerDisconnectedException(disconnectMessage.getReason()));
       } else {
         // Unexpected message - disconnect
         LOG.debug(
-            "Message received before HELLO's exchanged, disconnecting.  Code: {}, Data: {}",
+            "Message received before HELLO's exchanged (BREACH_OF_PROTOCOL), disconnecting.  Peer: {}, Code: {}, Data: {}",
+            expectedPeer.map(Peer::getEnodeURLString).orElse("unknown"),
             message.getCode(),
             message.getData().toString());
         ctx.writeAndFlush(
@@ -190,17 +204,21 @@ protected void decode(final ChannelHandlerContext ctx, final ByteBuf in, final L
     }
   }
 
-  private Peer createPeer(final PeerInfo peerInfo, final ChannelHandlerContext ctx) {
+  private Optional<Peer> createPeer(final PeerInfo peerInfo, final ChannelHandlerContext ctx) {
     final InetSocketAddress remoteAddress = ((InetSocketAddress) ctx.channel().remoteAddress());
-    int port = peerInfo.getPort();
-    return DefaultPeer.fromEnodeURL(
-        EnodeURL.builder()
-            .nodeId(peerInfo.getNodeId())
-            .ipAddress(remoteAddress.getAddress())
-            .listeningPort(port)
-            // Discovery information is unknown, so disable it
-            .disableDiscovery()
-            .build());
+    if (remoteAddress == null) {
+      return Optional.empty();
+    }
+    final int port = peerInfo.getPort();
+    return Optional.of(
+        DefaultPeer.fromEnodeURL(
+            EnodeURLImpl.builder()
+                .nodeId(peerInfo.getNodeId())
+                .ipAddress(remoteAddress.getAddress())
+                .listeningPort(port)
+                // Discovery information is unknown, so disable it
+                .disableDiscovery()
+                .build()));
   }
 
   @Override
@@ -213,7 +231,7 @@ public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable thr
     if (cause instanceof FramingException
         || cause instanceof RLPException
         || cause instanceof IllegalArgumentException) {
-      LOG.debug("Invalid incoming message", throwable);
+      LOG.debug("Invalid incoming message (BREACH_OF_PROTOCOL)", throwable);
       if (connectFuture.isDone() && !connectFuture.isCompletedExceptionally()) {
         connectFuture.get().disconnect(DisconnectMessage.DisconnectReason.BREACH_OF_PROTOCOL);
         return;
@@ -227,7 +245,7 @@ public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable thr
     if (connectFuture.isDone() && !connectFuture.isCompletedExceptionally()) {
       connectFuture
           .get()
-          .terminateConnection(DisconnectMessage.DisconnectReason.TCP_SUBSYSTEM_ERROR, true);
+          .terminateConnection(DisconnectMessage.DisconnectReason.TCP_SUBSYSTEM_ERROR, false);
     } else {
       connectFuture.completeExceptionally(throwable);
       ctx.close();
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/HandshakeHandlerInbound.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/HandshakeHandlerInbound.java
index 5dc65bec870..184cf5cf8c1 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/HandshakeHandlerInbound.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/HandshakeHandlerInbound.java
@@ -14,11 +14,13 @@
  */
 package org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty;
 
-import org.hyperledger.besu.crypto.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKey;
 import org.hyperledger.besu.ethereum.p2p.peers.LocalNode;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnectionEventDispatcher;
+import org.hyperledger.besu.ethereum.p2p.rlpx.framing.FramerProvider;
 import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.Handshaker;
+import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.HandshakerProvider;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
@@ -36,14 +38,19 @@ public HandshakeHandlerInbound(
       final LocalNode localNode,
       final CompletableFuture<PeerConnection> connectionFuture,
       final PeerConnectionEventDispatcher connectionEventDispatcher,
-      final MetricsSystem metricsSystem) {
+      final MetricsSystem metricsSystem,
+      final HandshakerProvider handshakerProvider,
+      final FramerProvider framerProvider) {
     super(
         subProtocols,
         localNode,
         Optional.empty(),
         connectionFuture,
         connectionEventDispatcher,
-        metricsSystem);
+        metricsSystem,
+        handshakerProvider,
+        framerProvider,
+        true);
     handshaker.prepareResponder(nodeKey);
   }
 
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/HandshakeHandlerOutbound.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/HandshakeHandlerOutbound.java
index 364cc0fc4f4..1c1391f2f79 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/HandshakeHandlerOutbound.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/HandshakeHandlerOutbound.java
@@ -14,13 +14,15 @@
  */
 package org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty;
 
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
 import org.hyperledger.besu.ethereum.p2p.peers.LocalNode;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnectionEventDispatcher;
+import org.hyperledger.besu.ethereum.p2p.rlpx.framing.FramerProvider;
 import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.Handshaker;
+import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.HandshakerProvider;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
@@ -30,12 +32,12 @@
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 final class HandshakeHandlerOutbound extends AbstractHandshakeHandler {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(HandshakeHandlerOutbound.class);
 
   private final ByteBuf first;
 
@@ -46,15 +48,21 @@ public HandshakeHandlerOutbound(
       final LocalNode localNode,
       final CompletableFuture<PeerConnection> connectionFuture,
       final PeerConnectionEventDispatcher connectionEventDispatcher,
-      final MetricsSystem metricsSystem) {
+      final MetricsSystem metricsSystem,
+      final HandshakerProvider handshakerProvider,
+      final FramerProvider framerProvider) {
     super(
         subProtocols,
         localNode,
         Optional.of(peer),
         connectionFuture,
         connectionEventDispatcher,
-        metricsSystem);
-    handshaker.prepareInitiator(nodeKey, SECP256K1.PublicKey.create(peer.getId()));
+        metricsSystem,
+        handshakerProvider,
+        framerProvider,
+        false);
+    handshaker.prepareInitiator(
+        nodeKey, SignatureAlgorithmFactory.getInstance().createPublicKey(peer.getId()));
     this.first = handshaker.firstMessage();
   }
 
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyConnectionInitializer.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyConnectionInitializer.java
index 8047be8c602..c20e511df9d 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyConnectionInitializer.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyConnectionInitializer.java
@@ -14,29 +14,39 @@
  */
 package org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty;
 
-import org.hyperledger.besu.crypto.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKey;
 import org.hyperledger.besu.ethereum.p2p.config.RlpxConfiguration;
 import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
 import org.hyperledger.besu.ethereum.p2p.peers.LocalNode;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.rlpx.ConnectCallback;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.ConnectionInitializer;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnectionEventDispatcher;
+import org.hyperledger.besu.ethereum.p2p.rlpx.framing.Framer;
+import org.hyperledger.besu.ethereum.p2p.rlpx.framing.FramerProvider;
+import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.HandshakeSecrets;
+import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.Handshaker;
+import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.HandshakerProvider;
+import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker;
 import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.util.Subscribers;
 
+import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.security.GeneralSecurityException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.IntSupplier;
 import java.util.stream.StreamSupport;
+import javax.annotation.Nonnull;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelOption;
@@ -47,7 +57,8 @@
 import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.util.concurrent.SingleThreadEventExecutor;
 
-public class NettyConnectionInitializer implements ConnectionInitializer {
+public class NettyConnectionInitializer
+    implements ConnectionInitializer, HandshakerProvider, FramerProvider {
 
   private static final int TIMEOUT_SECONDS = 10;
 
@@ -127,7 +138,7 @@ public CompletableFuture<InetSocketAddress> start() {
 
   @Override
   public CompletableFuture<Void> stop() {
-    CompletableFuture<Void> stoppedFuture = new CompletableFuture<>();
+    final CompletableFuture<Void> stoppedFuture = new CompletableFuture<>();
     if (!started.get() || !stopped.compareAndSet(false, true)) {
       stoppedFuture.completeExceptionally(
           new IllegalStateException("Illegal attempt to stop " + this.getClass().getSimpleName()));
@@ -170,30 +181,7 @@ public CompletableFuture<PeerConnection> connect(final Peer peer) {
         .remoteAddress(new InetSocketAddress(enode.getIp(), enode.getListeningPort().get()))
         .option(ChannelOption.TCP_NODELAY, true)
         .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, TIMEOUT_SECONDS * 1000)
-        .handler(
-            new ChannelInitializer<SocketChannel>() {
-              @Override
-              protected void initChannel(final SocketChannel ch) {
-                ch.pipeline()
-                    .addLast(
-                        new TimeoutHandler<>(
-                            connectionFuture::isDone,
-                            TIMEOUT_SECONDS,
-                            () ->
-                                connectionFuture.completeExceptionally(
-                                    new TimeoutException(
-                                        "Timed out waiting to establish connection with peer: "
-                                            + peer.getId()))),
-                        new HandshakeHandlerOutbound(
-                            nodeKey,
-                            peer,
-                            config.getSupportedProtocols(),
-                            localNode,
-                            connectionFuture,
-                            eventDispatcher,
-                            metricsSystem));
-              }
-            })
+        .handler(outboundChannelInitializer(peer, connectionFuture))
         .connect()
         .addListener(
             (f) -> {
@@ -205,35 +193,90 @@ protected void initChannel(final SocketChannel ch) {
     return connectionFuture;
   }
 
-  /** @return a channel initializer for inbound connections */
+  /**
+   * @return a channel initializer for outbound connections
+   */
+  @Nonnull
+  private ChannelInitializer<SocketChannel> outboundChannelInitializer(
+      final Peer peer, final CompletableFuture<PeerConnection> connectionFuture) {
+    return new ChannelInitializer<SocketChannel>() {
+      @Override
+      protected void initChannel(final SocketChannel ch) throws Exception {
+        ch.pipeline()
+            .addLast(
+                timeoutHandler(
+                    connectionFuture,
+                    "Timed out waiting to establish connection with peer: " + peer.getId()));
+        addAdditionalOutboundHandlers(ch, peer);
+        ch.pipeline().addLast(outboundHandler(peer, connectionFuture));
+      }
+    };
+  }
+
+  /**
+   * @return a channel initializer for inbound connections
+   */
   private ChannelInitializer<SocketChannel> inboundChannelInitializer() {
     return new ChannelInitializer<SocketChannel>() {
       @Override
-      protected void initChannel(final SocketChannel ch) {
+      protected void initChannel(final SocketChannel ch) throws Exception {
         final CompletableFuture<PeerConnection> connectionFuture = new CompletableFuture<>();
         connectionFuture.thenAccept(
             connection -> connectSubscribers.forEach(c -> c.onConnect(connection)));
-
         ch.pipeline()
             .addLast(
-                new TimeoutHandler<>(
-                    connectionFuture::isDone,
-                    TIMEOUT_SECONDS,
-                    () ->
-                        connectionFuture.completeExceptionally(
-                            new TimeoutException(
-                                "Timed out waiting to fully establish incoming connection"))),
-                new HandshakeHandlerInbound(
-                    nodeKey,
-                    config.getSupportedProtocols(),
-                    localNode,
-                    connectionFuture,
-                    eventDispatcher,
-                    metricsSystem));
+                timeoutHandler(
+                    connectionFuture, "Timed out waiting to fully establish incoming connection"));
+        addAdditionalInboundHandlers(ch);
+        ch.pipeline().addLast(inboundHandler(connectionFuture));
       }
     };
   }
 
+  @Nonnull
+  private HandshakeHandlerInbound inboundHandler(
+      final CompletableFuture<PeerConnection> connectionFuture) {
+    return new HandshakeHandlerInbound(
+        nodeKey,
+        config.getSupportedProtocols(),
+        localNode,
+        connectionFuture,
+        eventDispatcher,
+        metricsSystem,
+        this,
+        this);
+  }
+
+  @Nonnull
+  private HandshakeHandlerOutbound outboundHandler(
+      final Peer peer, final CompletableFuture<PeerConnection> connectionFuture) {
+    return new HandshakeHandlerOutbound(
+        nodeKey,
+        peer,
+        config.getSupportedProtocols(),
+        localNode,
+        connectionFuture,
+        eventDispatcher,
+        metricsSystem,
+        this,
+        this);
+  }
+
+  @Nonnull
+  private TimeoutHandler<Channel> timeoutHandler(
+      final CompletableFuture<PeerConnection> connectionFuture, final String s) {
+    return new TimeoutHandler<>(
+        connectionFuture::isDone,
+        TIMEOUT_SECONDS,
+        () -> connectionFuture.completeExceptionally(new TimeoutException(s)));
+  }
+
+  void addAdditionalOutboundHandlers(final Channel ch, final Peer peer)
+      throws GeneralSecurityException, IOException {}
+
+  void addAdditionalInboundHandlers(final Channel ch)
+      throws GeneralSecurityException, IOException {}
+
   private IntSupplier pendingTaskCounter(final EventLoopGroup eventLoopGroup) {
     return () ->
         StreamSupport.stream(eventLoopGroup.spliterator(), false)
@@ -241,4 +284,14 @@ private IntSupplier pendingTaskCounter(final EventLoopGroup eventLoopGroup) {
             .mapToInt(eventExecutor -> ((SingleThreadEventExecutor) eventExecutor).pendingTasks())
             .sum();
   }
+
+  @Override
+  public Handshaker buildInstance() {
+    return new ECIESHandshaker();
+  }
+
+  @Override
+  public Framer buildFramer(final HandshakeSecrets secrets) {
+    return new Framer(secrets);
+  }
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyPeerConnection.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyPeerConnection.java
index dc9c11a61a0..e772f2dc5cc 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyPeerConnection.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyPeerConnection.java
@@ -43,7 +43,8 @@ public NettyPeerConnection(
       final PeerInfo peerInfo,
       final CapabilityMultiplexer multiplexer,
       final PeerConnectionEventDispatcher connectionEventDispatcher,
-      final LabelledMetric<Counter> outboundMessagesCounter) {
+      final LabelledMetric<Counter> outboundMessagesCounter,
+      final boolean inboundInitiated) {
     super(
         peer,
         peerInfo,
@@ -52,7 +53,8 @@ public NettyPeerConnection(
         ctx.channel().id().asLongText(),
         multiplexer,
         connectionEventDispatcher,
-        outboundMessagesCounter);
+        outboundMessagesCounter,
+        inboundInitiated);
 
     this.ctx = ctx;
     ctx.channel()
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyTLSConnectionInitializer.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyTLSConnectionInitializer.java
new file mode 100644
index 00000000000..4e6010771fc
--- /dev/null
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyTLSConnectionInitializer.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty;
+
+import static org.hyperledger.besu.ethereum.p2p.rlpx.RlpxFrameConstants.LENGTH_FRAME_SIZE;
+import static org.hyperledger.besu.ethereum.p2p.rlpx.RlpxFrameConstants.LENGTH_MAX_MESSAGE_FRAME;
+
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.ethereum.p2p.config.RlpxConfiguration;
+import org.hyperledger.besu.ethereum.p2p.peers.LocalNode;
+import org.hyperledger.besu.ethereum.p2p.peers.Peer;
+import org.hyperledger.besu.ethereum.p2p.plain.PlainFramer;
+import org.hyperledger.besu.ethereum.p2p.plain.PlainHandshaker;
+import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnectionEventDispatcher;
+import org.hyperledger.besu.ethereum.p2p.rlpx.framing.Framer;
+import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.HandshakeSecrets;
+import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.Handshaker;
+import org.hyperledger.besu.plugin.data.EnodeURL;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import java.security.GeneralSecurityException;
+import java.util.Optional;
+import java.util.function.Supplier;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Suppliers;
+import io.netty.channel.Channel;
+import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+import io.netty.handler.codec.LengthFieldPrepender;
+import io.netty.handler.codec.compression.SnappyFrameDecoder;
+import io.netty.handler.codec.compression.SnappyFrameEncoder;
+import io.netty.handler.ssl.SslContext;
+import io.netty.handler.ssl.SslHandler;
+
+public class NettyTLSConnectionInitializer extends NettyConnectionInitializer {
+
+  private final Optional<Supplier<TLSContextFactory>> tlsContextFactorySupplier;
+  private final Boolean clientHelloSniHeaderEnabled;
+
+  public NettyTLSConnectionInitializer(
+      final NodeKey nodeKey,
+      final RlpxConfiguration config,
+      final LocalNode localNode,
+      final PeerConnectionEventDispatcher eventDispatcher,
+      final MetricsSystem metricsSystem,
+      final TLSConfiguration p2pTLSConfiguration) {
+    this(
+        nodeKey,
+        config,
+        localNode,
+        eventDispatcher,
+        metricsSystem,
+        defaultTlsContextFactorySupplier(p2pTLSConfiguration),
+        p2pTLSConfiguration.getClientHelloSniHeaderEnabled());
+  }
+
+  @VisibleForTesting
+  NettyTLSConnectionInitializer(
+      final NodeKey nodeKey,
+      final RlpxConfiguration config,
+      final LocalNode localNode,
+      final PeerConnectionEventDispatcher eventDispatcher,
+      final MetricsSystem metricsSystem,
+      final Supplier<TLSContextFactory> tlsContextFactorySupplier,
+      final Boolean clientHelloSniHeaderEnabled) {
+    super(nodeKey, config, localNode, eventDispatcher, metricsSystem);
+    if (tlsContextFactorySupplier != null) {
+      this.tlsContextFactorySupplier =
+          Optional.of(Suppliers.memoize(tlsContextFactorySupplier::get));
+    } else {
+      this.tlsContextFactorySupplier = Optional.empty();
+    }
+    this.clientHelloSniHeaderEnabled = clientHelloSniHeaderEnabled;
+  }
+
+  @Override
+  void addAdditionalOutboundHandlers(final Channel ch, final Peer peer)
+      throws GeneralSecurityException {
+    if (tlsContextFactorySupplier.isPresent()) {
+      final SslContext clientSslContext =
+          tlsContextFactorySupplier.get().get().createNettyClientSslContext();
+      final EnodeURL enode = peer.getEnodeURL();
+      final SslHandler sslHandler = createClientSslHandler(ch, clientSslContext, enode);
+      addHandlersToChannelPipeline(ch, sslHandler);
+    }
+  }
+
+  private SslHandler createClientSslHandler(
+      final Channel ch, final SslContext sslContext, final EnodeURL enode) {
+    if (this.clientHelloSniHeaderEnabled) {
+      return sslContext.newHandler(
+          ch.alloc(), enode.getHost(), enode.getListeningPort().orElseThrow());
+    } else {
+      return sslContext.newHandler(ch.alloc());
+    }
+  }
+
+  @Override
+  void addAdditionalInboundHandlers(final Channel ch) throws GeneralSecurityException {
+    if (tlsContextFactorySupplier.isPresent()) {
+      final SslContext serverSslContext =
+          tlsContextFactorySupplier.get().get().createNettyServerSslContext();
+      addHandlersToChannelPipeline(ch, serverSslContext.newHandler(ch.alloc()));
+    }
+  }
+
+  private void addHandlersToChannelPipeline(final Channel ch, final SslHandler sslHandler) {
+    ch.pipeline().addLast(sslHandler);
+    ch.pipeline().addLast(new SnappyFrameDecoder());
+    ch.pipeline().addLast(new SnappyFrameEncoder());
+    ch.pipeline()
+        .addLast(
+            new LengthFieldBasedFrameDecoder(
+                LENGTH_MAX_MESSAGE_FRAME, 0, LENGTH_FRAME_SIZE, 0, LENGTH_FRAME_SIZE));
+    ch.pipeline().addLast(new LengthFieldPrepender(LENGTH_FRAME_SIZE));
+  }
+
+  @Override
+  public Handshaker buildInstance() {
+    return new PlainHandshaker();
+  }
+
+  @Override
+  public Framer buildFramer(final HandshakeSecrets secrets) {
+    return new PlainFramer();
+  }
+
+  @VisibleForTesting
+  static Supplier<TLSContextFactory> defaultTlsContextFactorySupplier(
+      final TLSConfiguration tlsConfiguration) {
+    if (tlsConfiguration == null) {
+      throw new IllegalStateException("TLSConfiguration cannot be null when using TLS");
+    }
+
+    return () -> {
+      try {
+        return TLSContextFactory.buildFrom(tlsConfiguration);
+      } catch (final Exception e) {
+        throw new IllegalStateException("Error creating TLSContextFactory", e);
+      }
+    };
+  }
+}
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/TLSConfiguration.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/TLSConfiguration.java
new file mode 100644
index 00000000000..52771bc4212
--- /dev/null
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/TLSConfiguration.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty;
+
+import static java.util.Objects.requireNonNull;
+
+import java.nio.file.Path;
+import java.util.function.Supplier;
+
+public class TLSConfiguration {
+
+  private final String keyStoreType;
+  private final Path keyStorePath;
+  private final Supplier<String> keyStorePasswordSupplier;
+  private final Path keyStorePasswordPath;
+  private final String trustStoreType;
+  private final Path trustStorePath;
+  private final Supplier<String> trustStorePasswordSupplier;
+  private final Path trustStorePasswordPath;
+  private final Path crlPath;
+  private final String[] allowedProtocols;
+  private final Boolean clientHelloSniHeaderEnabled;
+
+  private TLSConfiguration(
+      final String keyStoreType,
+      final Path keyStorePath,
+      final Supplier<String> keyStorePasswordSupplier,
+      final Path keyStorePasswordPath,
+      final String trustStoreType,
+      final Path trustStorePath,
+      final Supplier<String> trustStorePasswordSupplier,
+      final Path trustStorePasswordPath,
+      final Path crlPath,
+      final String[] allowedProtocols,
+      final Boolean clientHelloSniHeaderEnabled) {
+    this.keyStoreType = keyStoreType;
+    this.keyStorePath = keyStorePath;
+    this.keyStorePasswordSupplier = keyStorePasswordSupplier;
+    this.keyStorePasswordPath = keyStorePasswordPath;
+    this.trustStoreType = trustStoreType;
+    this.trustStorePath = trustStorePath;
+    this.trustStorePasswordSupplier = trustStorePasswordSupplier;
+    this.trustStorePasswordPath = trustStorePasswordPath;
+    this.crlPath = crlPath;
+    this.allowedProtocols = allowedProtocols;
+    this.clientHelloSniHeaderEnabled = clientHelloSniHeaderEnabled;
+  }
+
+  public String getKeyStoreType() {
+    return keyStoreType;
+  }
+
+  public Path getKeyStorePath() {
+    return keyStorePath;
+  }
+
+  public String getKeyStorePassword() {
+    return null == keyStorePasswordSupplier ? null : keyStorePasswordSupplier.get();
+  }
+
+  public Path getKeyStorePasswordPath() {
+    return keyStorePasswordPath;
+  }
+
+  public String getTrustStoreType() {
+    return trustStoreType;
+  }
+
+  public Path getTrustStorePath() {
+    return trustStorePath;
+  }
+
+  public String getTrustStorePassword() {
+    return null == trustStorePasswordSupplier ? null : trustStorePasswordSupplier.get();
+  }
+
+  public Path getTrustStorePasswordPath() {
+    return trustStorePasswordPath;
+  }
+
+  public Path getCrlPath() {
+    return crlPath;
+  }
+
+  public String[] getAllowedProtocols() {
+    return allowedProtocols;
+  }
+
+  public Boolean getClientHelloSniHeaderEnabled() {
+    return clientHelloSniHeaderEnabled;
+  }
+
+  public static final class Builder {
+    private String keyStoreType;
+    private Path keyStorePath;
+    private Supplier<String> keyStorePasswordSupplier;
+    private Path keyStorePasswordPath;
+    private String trustStoreType;
+    private Path trustStorePath;
+    private Supplier<String> trustStorePasswordSupplier;
+    private Path trustStorePasswordPath;
+    private Path crlPath;
+    private String[] allowedProtocols;
+    private Boolean clientHelloSniHeaderEnabled;
+
+    private Builder() {}
+
+    public static Builder tlsConfiguration() {
+      return new Builder();
+    }
+
+    public Builder withKeyStoreType(final String keyStoreType) {
+      this.keyStoreType = keyStoreType;
+      return this;
+    }
+
+    public Builder withKeyStorePath(final Path keyStorePath) {
+      this.keyStorePath = keyStorePath;
+      return this;
+    }
+
+    public Builder withKeyStorePasswordPath(final Path keyStorePasswordPath) {
+      this.keyStorePasswordPath = keyStorePasswordPath;
+      return this;
+    }
+
+    public Builder withKeyStorePasswordSupplier(final Supplier<String> keyStorePasswordSupplier) {
+      this.keyStorePasswordSupplier = keyStorePasswordSupplier;
+      return this;
+    }
+
+    public Builder withTrustStoreType(final String trustStoreType) {
+      this.trustStoreType = trustStoreType;
+      return this;
+    }
+
+    public Builder withTrustStorePath(final Path trustStorePath) {
+      this.trustStorePath = trustStorePath;
+      return this;
+    }
+
+    public Builder withTrustStorePasswordSupplier(
+        final Supplier<String> trustStorePasswordSupplier) {
+      this.trustStorePasswordSupplier = trustStorePasswordSupplier;
+      return this;
+    }
+
+    public Builder withTrustStorePasswordPath(final Path trustStorePasswordPath) {
+      this.trustStorePasswordPath = trustStorePasswordPath;
+      return this;
+    }
+
+    public Builder withCrlPath(final Path crlPath) {
+      this.crlPath = crlPath;
+      return this;
+    }
+
+    public Builder withAllowedProtocols(final String[] allowedProtocols) {
+      this.allowedProtocols = allowedProtocols;
+      return this;
+    }
+
+    public Builder withClientHelloSniEnabled(final Boolean clientHelloSniHeaderEnabled) {
+      this.clientHelloSniHeaderEnabled = clientHelloSniHeaderEnabled;
+      return this;
+    }
+
+    public TLSConfiguration build() {
+      requireNonNull(keyStoreType, "Key Store Type must not be null");
+      requireNonNull(keyStorePasswordSupplier, "Key Store password supplier must not be null");
+      return new TLSConfiguration(
+          keyStoreType,
+          keyStorePath,
+          keyStorePasswordSupplier,
+          keyStorePasswordPath,
+          trustStoreType,
+          trustStorePath,
+          trustStorePasswordSupplier,
+          trustStorePasswordPath,
+          crlPath,
+          allowedProtocols,
+          clientHelloSniHeaderEnabled);
+    }
+  }
+}
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/TLSContextFactory.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/TLSContextFactory.java
new file mode 100644
index 00000000000..d3d6c6e280a
--- /dev/null
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/TLSContextFactory.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty;
+
+import org.hyperledger.besu.pki.keystore.HardwareKeyStoreWrapper;
+import org.hyperledger.besu.pki.keystore.KeyStoreWrapper;
+import org.hyperledger.besu.pki.keystore.SoftwareKeyStoreWrapper;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509CRL;
+import java.security.cert.X509Certificate;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
+
+import io.netty.handler.ssl.ClientAuth;
+import io.netty.handler.ssl.IdentityCipherSuiteFilter;
+import io.netty.handler.ssl.JdkSslContext;
+import io.netty.handler.ssl.SslContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TLSContextFactory {
+
+  private static final Logger LOG = LoggerFactory.getLogger(TLSContextFactory.class);
+
+  private static final String[] ALLOWED_PROTOCOLS = {"TLSv1.3"};
+  private static final String KEYMANAGER_FACTORY_ALGORITHM = "PKIX";
+  private static final String TRUSTMANAGER_FACTORY_ALGORITHM = "PKIX";
+
+  private List<String> enabledCipherSuites = null;
+  private KeyManagerFactory kmf;
+  private TrustManagerFactory tmf;
+  private Collection<X509CRL> crls;
+  private String[] allowedProtocols;
+
+  protected TLSContextFactory() {}
+
+  protected TLSContextFactory(
+      final String keystorePass,
+      final KeyStoreWrapper keystoreWrapper,
+      final List<String> configuredCipherSuites,
+      final String[] allowedProtocols)
+      throws GeneralSecurityException, IOException {
+    kmf = getKeyManagerFactory(keystoreWrapper.getKeyStore(), keystorePass);
+    tmf = getTrustManagerFactory(keystoreWrapper.getTrustStore());
+    crls = keystoreWrapper.getCRLs();
+    if (configuredCipherSuites != null && !configuredCipherSuites.isEmpty()) {
+      enabledCipherSuites = configuredCipherSuites;
+    }
+    this.allowedProtocols = null == allowedProtocols ? ALLOWED_PROTOCOLS : allowedProtocols;
+  }
+
+  public static TLSContextFactory getInstance(
+      final String keyStorePassword, final KeyStoreWrapper wrapper, final String[] allowedProtocols)
+      throws GeneralSecurityException, IOException {
+    return new TLSContextFactory(keyStorePassword, wrapper, null, allowedProtocols);
+  }
+
+  public static TLSContextFactory getInstance(
+      final String keyStorePassword, final KeyStoreWrapper wrapper)
+      throws GeneralSecurityException, IOException {
+    return new TLSContextFactory(keyStorePassword, wrapper, null, null);
+  }
+
+  public SslContext createNettyServerSslContext()
+      throws NoSuchAlgorithmException, KeyManagementException {
+    final List<String> enabledCipherSuites = getEnabledCipherSuites();
+
+    return new JdkSslContext(
+        createJavaSslContext(),
+        false,
+        enabledCipherSuites,
+        IdentityCipherSuiteFilter.INSTANCE,
+        null,
+        ClientAuth.REQUIRE,
+        null,
+        false);
+  }
+
+  public SslContext createNettyClientSslContext()
+      throws NoSuchAlgorithmException, KeyManagementException {
+    final List<String> enabledCipherSuites = getEnabledCipherSuites();
+
+    return new JdkSslContext(
+        createJavaSslContext(),
+        true,
+        enabledCipherSuites,
+        IdentityCipherSuiteFilter.INSTANCE,
+        null,
+        ClientAuth.NONE,
+        null,
+        false);
+  }
+
+  public SSLContext createJavaSslContext() throws NoSuchAlgorithmException, KeyManagementException {
+    final SSLContext context = SSLContext.getInstance(getTlsProtocol());
+    context.init(
+        kmf.getKeyManagers(),
+        null == crls || crls.isEmpty() ? tmf.getTrustManagers() : wrap(tmf.getTrustManagers()),
+        null);
+    return context;
+  }
+
+  protected TrustManager[] wrap(final TrustManager[] trustMgrs) {
+    final TrustManager[] ret = trustMgrs.clone();
+    for (int i = 0; i < ret.length; i++) {
+      TrustManager trustMgr = ret[i];
+      if (trustMgr instanceof X509TrustManager) {
+        X509TrustManager x509TrustManager = (X509TrustManager) trustMgr;
+        ret[i] =
+            new X509TrustManager() {
+              @Override
+              public void checkClientTrusted(
+                  final X509Certificate[] x509Certificates, final String s)
+                  throws CertificateException {
+                checkRevoked(x509Certificates);
+                x509TrustManager.checkClientTrusted(x509Certificates, s);
+              }
+
+              @Override
+              public void checkServerTrusted(
+                  final X509Certificate[] x509Certificates, final String s)
+                  throws CertificateException {
+                checkRevoked(x509Certificates);
+                x509TrustManager.checkServerTrusted(x509Certificates, s);
+              }
+
+              private void checkRevoked(final X509Certificate[] x509Certificates)
+                  throws CertificateException {
+                for (X509CRL crl : crls) {
+                  for (X509Certificate cert : x509Certificates) {
+                    if (crl.isRevoked(cert)) {
+                      throw new CertificateException("Certificate revoked");
+                    }
+                  }
+                }
+              }
+
+              @Override
+              public X509Certificate[] getAcceptedIssuers() {
+                return x509TrustManager.getAcceptedIssuers();
+              }
+            };
+      }
+    }
+    return ret;
+  }
+
+  protected TrustManagerFactory getTrustManagerFactory(final KeyStore truststore)
+      throws GeneralSecurityException {
+    final TrustManagerFactory tmf = TrustManagerFactory.getInstance(TRUSTMANAGER_FACTORY_ALGORITHM);
+    tmf.init(truststore);
+    return tmf;
+  }
+
+  protected KeyManagerFactory getKeyManagerFactory(
+      final KeyStore keystore, final String keystorePassword) throws GeneralSecurityException {
+    final KeyManagerFactory kmf = KeyManagerFactory.getInstance(KEYMANAGER_FACTORY_ALGORITHM);
+    kmf.init(keystore, keystorePassword.toCharArray());
+    return kmf;
+  }
+
+  private List<String> getEnabledCipherSuites() {
+    final String protocol = getTlsProtocol();
+    try {
+      if (enabledCipherSuites == null || enabledCipherSuites.isEmpty()) {
+        final SSLContext sslcontext = SSLContext.getInstance(protocol);
+        sslcontext.init(null, null, null);
+        enabledCipherSuites = Arrays.asList(sslcontext.createSSLEngine().getEnabledCipherSuites());
+      }
+    } catch (final NoSuchAlgorithmException | KeyManagementException e) {
+      LOG.warn(
+          "Could not get list of enabled (JDK) cipher suites for protocol:{}, reverting to Netty's default ones.",
+          protocol);
+    }
+    return enabledCipherSuites;
+  }
+
+  private String getTlsProtocol() {
+    return Arrays.stream(allowedProtocols).max(Comparator.naturalOrder()).orElse(null);
+  }
+
+  public static TLSContextFactory buildFrom(final TLSConfiguration config)
+      throws GeneralSecurityException, IOException {
+    TLSContextFactory ret = null;
+    if (null != config) {
+      LOG.info("Initializing SSL Context using {} keystore.", config.getKeyStoreType());
+      KeyStoreWrapper wrapper =
+          KeyStoreWrapper.KEYSTORE_TYPE_PKCS11.equalsIgnoreCase(config.getKeyStoreType())
+              ? new HardwareKeyStoreWrapper(
+                  config.getKeyStorePassword(), config.getKeyStorePath(), config.getCrlPath())
+              : new SoftwareKeyStoreWrapper(
+                  config.getKeyStoreType(),
+                  config.getKeyStorePath(),
+                  config.getKeyStorePassword(),
+                  config.getTrustStoreType(),
+                  config.getTrustStorePath(),
+                  config.getTrustStorePassword(),
+                  config.getCrlPath());
+      ret =
+          TLSContextFactory.getInstance(
+              config.getKeyStorePassword(), wrapper, config.getAllowedProtocols());
+    }
+    return ret;
+  }
+}
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/WireKeepAlive.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/WireKeepAlive.java
index b366c29a32c..38c566d8449 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/WireKeepAlive.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/WireKeepAlive.java
@@ -25,11 +25,11 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.timeout.IdleState;
 import io.netty.handler.timeout.IdleStateEvent;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 final class WireKeepAlive extends ChannelDuplexHandler {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(WireKeepAlive.class);
 
   private final AtomicBoolean waitingForPong;
 
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/Framer.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/Framer.java
index 433275c60b4..2e9cad6dfe5 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/Framer.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/Framer.java
@@ -17,6 +17,8 @@
 import static io.netty.buffer.ByteBufUtil.hexDump;
 import static io.netty.buffer.Unpooled.wrappedBuffer;
 import static org.bouncycastle.pqc.math.linearalgebra.ByteUtils.xor;
+import static org.hyperledger.besu.ethereum.p2p.rlpx.RlpxFrameConstants.LENGTH_FRAME_SIZE;
+import static org.hyperledger.besu.ethereum.p2p.rlpx.RlpxFrameConstants.LENGTH_MAX_MESSAGE_FRAME;
 
 import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.HandshakeSecrets;
 import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.Handshaker;
@@ -38,6 +40,8 @@
 import org.bouncycastle.crypto.modes.SICBlockCipher;
 import org.bouncycastle.crypto.params.KeyParameter;
 import org.bouncycastle.crypto.params.ParametersWithIV;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This component is responsible for reading and composing RLPx protocol frames, conformant to the
@@ -53,12 +57,12 @@
  * @see <a href="https://github.com/ethereum/devp2p/blob/master/rlpx.md#framing">RLPx framing</a>
  */
 public class Framer {
+  private static final Logger LOG = LoggerFactory.getLogger(Framer.class);
+
   private static final int LENGTH_HEADER_DATA = 16;
   private static final int LENGTH_MAC = 16;
   private static final int LENGTH_FULL_HEADER = LENGTH_HEADER_DATA + LENGTH_MAC;
-  private static final int LENGTH_FRAME_SIZE = 3;
   private static final int LENGTH_MESSAGE_ID = 1;
-  private static final int LENGTH_MAX_MESSAGE_FRAME = 0xFFFFFF;
 
   private static final byte[] IV = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
   private static final byte[] PROTOCOL_HEADER =
@@ -79,6 +83,15 @@ public class Framer {
   private boolean headerProcessed;
   private int frameSize;
   private boolean compressionEnabled = false;
+  // have we ever successfully uncompressed a packet?
+  private boolean compressionSuccessful = false;
+
+  protected Framer() {
+    this.secrets = null;
+    this.encryptor = null;
+    this.decryptor = null;
+    this.macEncryptor = null;
+  }
 
   /**
    * Creates a new framer out of the handshake secrets derived during the cryptographic handshake.
@@ -109,6 +122,14 @@ public void disableCompression() {
     this.compressionEnabled = false;
   }
 
+  boolean isCompressionEnabled() {
+    return compressionEnabled;
+  }
+
+  boolean isCompressionSuccessful() {
+    return compressionSuccessful;
+  }
+
   /**
    * Deframes a full message from the byte buffer, if possible.
    *
@@ -269,8 +290,24 @@ private MessageData processFrame(final ByteBuf f, final int frameSize) {
       if (uncompressedLength >= LENGTH_MAX_MESSAGE_FRAME) {
         throw error("Message size %s in excess of maximum length.", uncompressedLength);
       }
-      final byte[] decompressedMessageData = compressor.decompress(compressedMessageData);
-      data = Bytes.wrap(decompressedMessageData);
+      Bytes _data;
+      try {
+        final byte[] decompressedMessageData = compressor.decompress(compressedMessageData);
+        _data = Bytes.wrap(decompressedMessageData);
+        compressionSuccessful = true;
+      } catch (final FramingException fe) {
+        if (compressionSuccessful) {
+          throw fe;
+        } else {
+          // OpenEthereum/Parity does not implement EIP-706
+          // If failing on the first packet downgrade to uncompressed
+          compressionEnabled = false;
+          LOG.debug("Snappy decompression failed: downgrading to uncompressed");
+          final int messageLength = frameSize - LENGTH_MESSAGE_ID;
+          _data = Bytes.wrap(frameData, 1, messageLength);
+        }
+      }
+      data = _data;
     } else {
       // Move data to a ByteBuf
       final int messageLength = frameSize - LENGTH_MESSAGE_ID;
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/FramerProvider.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/FramerProvider.java
new file mode 100644
index 00000000000..423bdccaf69
--- /dev/null
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/FramerProvider.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.rlpx.framing;
+
+import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.HandshakeSecrets;
+
+public interface FramerProvider {
+
+  public Framer buildFramer(HandshakeSecrets secrets);
+}
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/Handshaker.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/Handshaker.java
index 6126983484e..19e9556bfe1 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/Handshaker.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/Handshaker.java
@@ -14,8 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.p2p.rlpx.handshake;
 
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.SECPPublicKey;
+import org.hyperledger.besu.cryptoservices.NodeKey;
 import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies.ECIESHandshaker;
 
 import java.util.Optional;
@@ -81,7 +81,7 @@ enum HandshakeStatus {
    * @param theirPubKey The public key of the node we're handshaking with.
    * @throws IllegalStateException Indicates that preparation had already occurred.
    */
-  void prepareInitiator(NodeKey nodeKey, SECP256K1.PublicKey theirPubKey);
+  void prepareInitiator(NodeKey nodeKey, SECPPublicKey theirPubKey);
 
   /**
    * This method must be called by the <em>responding side</em> of the handshake to prepare the
@@ -159,5 +159,5 @@ enum HandshakeStatus {
    * @throws IllegalStateException Thrown if this handshake has not completed and hence it cannot
    *     return the other party's public key yet.
    */
-  SECP256K1.PublicKey partyPubKey();
+  SECPPublicKey partyPubKey();
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/HandshakerProvider.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/HandshakerProvider.java
new file mode 100644
index 00000000000..e6eca777582
--- /dev/null
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/HandshakerProvider.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.rlpx.handshake;
+
+public interface HandshakerProvider {
+
+  public Handshaker buildInstance();
+}
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ECIESEncryptionEngine.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ECIESEncryptionEngine.java
index 691e2efd0d0..523ad677a74 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ECIESEncryptionEngine.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ECIESEncryptionEngine.java
@@ -16,8 +16,11 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SECPPublicKey;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.bouncycastle.crypto.BufferedBlockCipher;
@@ -71,11 +74,11 @@ public class ECIESEncryptionEngine {
   private final BufferedBlockCipher cipher =
       new BufferedBlockCipher(new SICBlockCipher(new AESEngine()));
 
-  private final SECP256K1.PublicKey ephPubKey;
+  private final SECPPublicKey ephPubKey;
   private final byte[] iv;
 
   private ECIESEncryptionEngine(
-      final Bytes agreedSecret, final SECP256K1.PublicKey ephPubKey, final byte[] iv) {
+      final Bytes agreedSecret, final SECPPublicKey ephPubKey, final byte[] iv) {
     this.ephPubKey = ephPubKey;
     this.iv = iv;
 
@@ -92,7 +95,7 @@ private ECIESEncryptionEngine(
    * @return An engine prepared for decryption.
    */
   public static ECIESEncryptionEngine forDecryption(
-      final NodeKey nodeKey, final SECP256K1.PublicKey ephPubKey, final Bytes iv) {
+      final NodeKey nodeKey, final SECPPublicKey ephPubKey, final Bytes iv) {
     final byte[] ivb = iv.toArray();
 
     // Create parameters.
@@ -110,15 +113,17 @@ public static ECIESEncryptionEngine forDecryption(
    * @param pubKey The public key of the receiver.
    * @return An engine prepared for encryption.
    */
-  public static ECIESEncryptionEngine forEncryption(final SECP256K1.PublicKey pubKey) {
+  public static ECIESEncryptionEngine forEncryption(final SECPPublicKey pubKey) {
+    final SignatureAlgorithm signatureAlgorithm = SignatureAlgorithmFactory.getInstance();
+
     // Create an ephemeral key pair for IES whose public key we can later append in the message.
-    final SECP256K1.KeyPair ephKeyPair = SECP256K1.KeyPair.generate();
+    final KeyPair ephKeyPair = signatureAlgorithm.generateKeyPair();
 
     // Create random iv.
     final byte[] ivb = ECIESHandshaker.random(CIPHER_BLOCK_SIZE).toArray();
 
     return new ECIESEncryptionEngine(
-        SECP256K1.calculateECDHKeyAgreement(ephKeyPair.getPrivateKey(), pubKey),
+        signatureAlgorithm.calculateECDHKeyAgreement(ephKeyPair.getPrivateKey(), pubKey),
         ephKeyPair.getPublicKey(),
         ivb);
   }
@@ -296,7 +301,7 @@ public Bytes getIv() {
    *
    * @return The ephemeral public key.
    */
-  public SECP256K1.PublicKey getEphPubKey() {
+  public SECPPublicKey getEphPubKey() {
     return ephPubKey;
   }
 
@@ -354,7 +359,7 @@ public int generateBytes(final byte[] out, final int outOff, final int len)
       final int cThreshold = (len + outLen - 1) / outLen;
       final byte[] dig = new byte[digestSize];
       final byte[] C = Pack.intToBigEndian(COUNTER_START);
-      int counterBase = COUNTER_START & ~0xFF;
+      int counterBase = 0; // COUNTER_START & ~0xFF is always zero
       int offset = outOff;
       int length = len;
 
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshaker.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshaker.java
index 1d0aa17a580..0538e36aade 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshaker.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshaker.java
@@ -18,10 +18,12 @@
 import static org.apache.tuweni.bytes.Bytes.concatenate;
 import static org.hyperledger.besu.crypto.Hash.keccak256;
 
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.SECP256K1;
-import org.hyperledger.besu.crypto.SECP256K1.PublicKey;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SECPPublicKey;
 import org.hyperledger.besu.crypto.SecureRandomProvider;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
 import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.HandshakeException;
 import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.HandshakeSecrets;
 import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.Handshaker;
@@ -34,11 +36,11 @@
 import com.google.common.annotations.VisibleForTesting;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.bouncycastle.crypto.InvalidCipherTextException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An Elliptic Curve Integrated Encryption Scheme implementation, following the handshake ceremony
@@ -49,7 +51,7 @@
  */
 public class ECIESHandshaker implements Handshaker {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(ECIESHandshaker.class);
   private static final SecureRandom RANDOM = SecureRandomProvider.publicSecureRandom();
 
   static final int SIGNATURE_LENGTH = 65;
@@ -60,11 +62,11 @@ public class ECIESHandshaker implements Handshaker {
 
   // Keypairs under our control.
   private NodeKey nodeKey;
-  private SECP256K1.KeyPair ephKeyPair;
+  private KeyPair ephKeyPair;
 
   // Party's material, only public keys.
-  private PublicKey partyPubKey;
-  private PublicKey partyEphPubKey;
+  private SECPPublicKey partyPubKey;
+  private SECPPublicKey partyEphPubKey;
 
   // Messages, for later MAC calculation.
   private InitiatorHandshakeMessage initiatorMsg;
@@ -86,8 +88,10 @@ public class ECIESHandshaker implements Handshaker {
 
   private boolean version4 = true;
 
+  private final SignatureAlgorithm signatureAlgorithm = SignatureAlgorithmFactory.getInstance();
+
   @Override
-  public void prepareInitiator(final NodeKey nodeKey, final PublicKey theirPubKey) {
+  public void prepareInitiator(final NodeKey nodeKey, final SECPPublicKey theirPubKey) {
     checkState(
         status.compareAndSet(
             Handshaker.HandshakeStatus.UNINITIALIZED, Handshaker.HandshakeStatus.PREPARED),
@@ -95,7 +99,7 @@ public void prepareInitiator(final NodeKey nodeKey, final PublicKey theirPubKey)
 
     this.initiator = true;
     this.nodeKey = nodeKey;
-    this.ephKeyPair = SECP256K1.KeyPair.generate();
+    this.ephKeyPair = signatureAlgorithm.generateKeyPair();
     this.partyPubKey = theirPubKey;
     this.initiatorNonce = Bytes32.wrap(random(32), 0);
     LOG.trace(
@@ -112,7 +116,7 @@ public void prepareResponder(final NodeKey nodeKey) {
 
     this.initiator = false;
     this.nodeKey = nodeKey;
-    this.ephKeyPair = SECP256K1.KeyPair.generate();
+    this.ephKeyPair = signatureAlgorithm.generateKeyPair();
     this.responderNonce = Bytes32.wrap(random(32), 0);
     LOG.trace("Prepared ECIES handshake under RESPONDER role");
   }
@@ -185,9 +189,6 @@ public Optional<ByteBuf> handleMessage(final ByteBuf buf) throws HandshakeExcept
     try {
       // Decrypt the message with our private key.
       try {
-        bytes = EncryptedMessage.decryptMsg(bytes, nodeKey);
-        version4 = false;
-      } catch (final Exception ex) {
         // Assume new format
         final int size = bufferedBytes.readUnsignedShort();
         if (buf.writerIndex() >= size) {
@@ -199,8 +200,11 @@ public Optional<ByteBuf> handleMessage(final ByteBuf buf) throws HandshakeExcept
           bytes = EncryptedMessage.decryptMsgEIP8(encryptedMsg, nodeKey);
           version4 = true;
         } else {
-          throw new HandshakeException("Failed to decrypt handshake message", ex);
+          throw new HandshakeException("Failed to decrypt handshake message");
         }
+      } catch (final Exception ex) {
+        bytes = EncryptedMessage.decryptMsg(bytes, nodeKey);
+        version4 = false;
       }
     } catch (final InvalidCipherTextException e) {
       status.set(Handshaker.HandshakeStatus.FAILED);
@@ -344,7 +348,7 @@ public HandshakeSecrets secrets() {
   }
 
   @Override
-  public PublicKey partyPubKey() {
+  public SECPPublicKey partyPubKey() {
     checkState(
         initiator || status.get() == Handshaker.HandshakeStatus.SUCCESS,
         "under the role of responder, cannot return the party's public "
@@ -355,7 +359,7 @@ public PublicKey partyPubKey() {
   /** Computes the secrets from the two exchanged messages. */
   void computeSecrets() {
     final Bytes agreedSecret =
-        SECP256K1.calculateECDHKeyAgreement(ephKeyPair.getPrivateKey(), partyEphPubKey);
+        signatureAlgorithm.calculateECDHKeyAgreement(ephKeyPair.getPrivateKey(), partyEphPubKey);
 
     final Bytes sharedSecret =
         keccak256(
@@ -398,17 +402,17 @@ NodeKey getNodeKey() {
   }
 
   @VisibleForTesting
-  SECP256K1.KeyPair getEphKeyPair() {
+  KeyPair getEphKeyPair() {
     return ephKeyPair;
   }
 
   @VisibleForTesting
-  void setEphKeyPair(final SECP256K1.KeyPair ephKeyPair) {
+  void setEphKeyPair(final KeyPair ephKeyPair) {
     this.ephKeyPair = ephKeyPair;
   }
 
   @VisibleForTesting
-  PublicKey getPartyEphPubKey() {
+  SECPPublicKey getPartyEphPubKey() {
     return partyEphPubKey;
   }
 
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessage.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessage.java
index 3ac2dd9e711..eec3dcca8d2 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessage.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessage.java
@@ -14,13 +14,17 @@
  */
 package org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies;
 
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.SECPPublicKey;
 import org.hyperledger.besu.crypto.SecureRandomProvider;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
 
 import java.nio.ByteBuffer;
 import java.security.SecureRandom;
 
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.MutableBytes;
 import org.bouncycastle.crypto.InvalidCipherTextException;
@@ -30,6 +34,8 @@ final class EncryptedMessage {
   private static final int IV_SIZE = 16;
 
   private static final SecureRandom RANDOM = SecureRandomProvider.createSecureRandom();
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
 
   private EncryptedMessage() {
     // Utility Class
@@ -48,7 +54,8 @@ public static Bytes decryptMsg(final Bytes msgBytes, final NodeKey nodeKey)
 
     // Extract the ephemeral public key, stripping off the first byte (0x04), which designates it's
     // an uncompressed key.
-    final SECP256K1.PublicKey ephPubKey = SECP256K1.PublicKey.create(msgBytes.slice(1, 64));
+    final SECPPublicKey ephPubKey =
+        SIGNATURE_ALGORITHM.get().createPublicKey(msgBytes.slice(1, 64));
 
     // Strip off the IV to use.
     final Bytes iv = msgBytes.slice(65, IV_SIZE);
@@ -72,7 +79,8 @@ public static Bytes decryptMsg(final Bytes msgBytes, final NodeKey nodeKey)
    */
   public static Bytes decryptMsgEIP8(final Bytes msgBytes, final NodeKey nodeKey)
       throws InvalidCipherTextException {
-    final SECP256K1.PublicKey ephPubKey = SECP256K1.PublicKey.create(msgBytes.slice(3, 64));
+    final SECPPublicKey ephPubKey =
+        SIGNATURE_ALGORITHM.get().createPublicKey(msgBytes.slice(3, 64));
 
     // Strip off the IV to use.
     final Bytes iv = msgBytes.slice(3 + 64, IV_SIZE);
@@ -94,7 +102,7 @@ public static Bytes decryptMsgEIP8(final Bytes msgBytes, final NodeKey nodeKey)
    * @return The ciphertext.
    * @throws InvalidCipherTextException Thrown if encryption failed.
    */
-  public static Bytes encryptMsg(final Bytes bytes, final SECP256K1.PublicKey remoteKey)
+  public static Bytes encryptMsg(final Bytes bytes, final SECPPublicKey remoteKey)
       throws InvalidCipherTextException {
     // TODO: check size.
     final ECIESEncryptionEngine engine = ECIESEncryptionEngine.forEncryption(remoteKey);
@@ -102,7 +110,7 @@ public static Bytes encryptMsg(final Bytes bytes, final SECP256K1.PublicKey remo
     // Do the encryption.
     final Bytes encrypted = engine.encrypt(bytes);
     final Bytes iv = engine.getIv();
-    final SECP256K1.PublicKey ephPubKey = engine.getEphPubKey();
+    final SECPPublicKey ephPubKey = engine.getEphPubKey();
 
     // Create the output message by concatenating the ephemeral public key (prefixed with
     // 0x04 to designate uncompressed), IV, and encrypted bytes.
@@ -126,7 +134,7 @@ public static Bytes encryptMsg(final Bytes bytes, final SECP256K1.PublicKey remo
    * @return The ciphertext.
    * @throws InvalidCipherTextException Thrown if encryption failed.
    */
-  public static Bytes encryptMsgEip8(final Bytes message, final SECP256K1.PublicKey remoteKey)
+  public static Bytes encryptMsgEip8(final Bytes message, final SECPPublicKey remoteKey)
       throws InvalidCipherTextException {
     final ECIESEncryptionEngine engine = ECIESEncryptionEngine.forEncryption(remoteKey);
 
@@ -136,7 +144,7 @@ public static Bytes encryptMsgEip8(final Bytes message, final SECP256K1.PublicKe
     final byte[] sizePrefix = {(byte) (size >>> 8), (byte) size};
     final Bytes encrypted = engine.encrypt(bytes, sizePrefix);
     final Bytes iv = engine.getIv();
-    final SECP256K1.PublicKey ephPubKey = engine.getEphPubKey();
+    final SECPPublicKey ephPubKey = engine.getEphPubKey();
 
     // Create the output message by concatenating the ephemeral public key (prefixed with
     // 0x04 to designate uncompressed), IV, and encrypted bytes.
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessage.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessage.java
index 73bcc72d4bc..d14acf7476d 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessage.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessage.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies;
 
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.SECPPublicKey;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
@@ -25,9 +25,9 @@ public interface InitiatorHandshakeMessage {
 
   Bytes32 getNonce();
 
-  SECP256K1.PublicKey getPubKey();
+  SECPPublicKey getPubKey();
 
-  SECP256K1.PublicKey getEphPubKey();
+  SECPPublicKey getEphPubKey();
 
   Bytes32 getEphPubKeyHash();
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV1.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV1.java
index 350bc097d62..eedf394e290 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV1.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV1.java
@@ -17,9 +17,15 @@
 import static com.google.common.base.Preconditions.checkState;
 
 import org.hyperledger.besu.crypto.Hash;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.SECP256K1;
-
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SECPPublicKey;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.bytes.MutableBytes;
@@ -55,17 +61,20 @@ public final class InitiatorHandshakeMessageV1 implements InitiatorHandshakeMess
           + ECIESHandshaker.NONCE_LENGTH
           + ECIESHandshaker.TOKEN_FLAG_LENGTH;
 
-  private final SECP256K1.PublicKey pubKey;
-  private final SECP256K1.Signature signature;
-  private final SECP256K1.PublicKey ephPubKey;
+  private final SECPPublicKey pubKey;
+  private final SECPSignature signature;
+  private final SECPPublicKey ephPubKey;
   private final Bytes32 ephPubKeyHash;
   private final Bytes32 nonce;
   private final boolean token;
 
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+
   InitiatorHandshakeMessageV1(
-      final SECP256K1.PublicKey pubKey,
-      final SECP256K1.Signature signature,
-      final SECP256K1.PublicKey ephPubKey,
+      final SECPPublicKey pubKey,
+      final SECPSignature signature,
+      final SECPPublicKey ephPubKey,
       final Bytes32 ephPubKeyHash,
       final Bytes32 nonce,
       final boolean token) {
@@ -78,15 +87,16 @@ public final class InitiatorHandshakeMessageV1 implements InitiatorHandshakeMess
   }
 
   public static InitiatorHandshakeMessageV1 create(
-      final SECP256K1.PublicKey ourPubKey,
-      final SECP256K1.KeyPair ephKeyPair,
+      final SECPPublicKey ourPubKey,
+      final KeyPair ephKeyPair,
       final Bytes32 staticSharedSecret,
       final Bytes32 nonce,
       final boolean token) {
     final Bytes32 ephPubKeyHash = Hash.keccak256(ephKeyPair.getPublicKey().getEncodedBytes());
 
     // XOR of the static shared secret and the generated nonce.
-    final SECP256K1.Signature signature = SECP256K1.sign(staticSharedSecret.xor(nonce), ephKeyPair);
+    final SECPSignature signature =
+        SIGNATURE_ALGORITHM.get().sign(staticSharedSecret.xor(nonce), ephKeyPair);
     return new InitiatorHandshakeMessageV1(
         ourPubKey, signature, ephKeyPair.getPublicKey(), ephPubKeyHash, nonce, token);
   }
@@ -102,25 +112,32 @@ public static InitiatorHandshakeMessageV1 decode(final Bytes bytes, final NodeKe
     checkState(bytes.size() == MESSAGE_LENGTH);
 
     int offset = 0;
-    final SECP256K1.Signature signature =
-        SECP256K1.Signature.decode(bytes.slice(offset, ECIESHandshaker.SIGNATURE_LENGTH));
+    final SECPSignature signature =
+        SIGNATURE_ALGORITHM
+            .get()
+            .decodeSignature(bytes.slice(offset, ECIESHandshaker.SIGNATURE_LENGTH));
     final Bytes32 ephPubKeyHash =
         Bytes32.wrap(
             bytes.slice(
                 offset += ECIESHandshaker.SIGNATURE_LENGTH, ECIESHandshaker.HASH_EPH_PUBKEY_LENGTH),
             0);
-    final SECP256K1.PublicKey pubKey =
-        SECP256K1.PublicKey.create(
-            bytes.slice(
-                offset += ECIESHandshaker.HASH_EPH_PUBKEY_LENGTH, ECIESHandshaker.PUBKEY_LENGTH));
+    final SECPPublicKey pubKey =
+        SIGNATURE_ALGORITHM
+            .get()
+            .createPublicKey(
+                bytes.slice(
+                    offset += ECIESHandshaker.HASH_EPH_PUBKEY_LENGTH,
+                    ECIESHandshaker.PUBKEY_LENGTH));
     final Bytes32 nonce =
         Bytes32.wrap(
             bytes.slice(offset += ECIESHandshaker.PUBKEY_LENGTH, ECIESHandshaker.NONCE_LENGTH), 0);
     final boolean token = bytes.get(offset) == 0x01;
 
     final Bytes32 staticSharedSecret = nodeKey.calculateECDHKeyAgreement(pubKey);
-    final SECP256K1.PublicKey ephPubKey =
-        SECP256K1.PublicKey.recoverFromSignature(staticSharedSecret.xor(nonce), signature)
+    final SECPPublicKey ephPubKey =
+        SIGNATURE_ALGORITHM
+            .get()
+            .recoverPublicKeyFromSignature(staticSharedSecret.xor(nonce), signature)
             .orElseThrow(() -> new RuntimeException("Could not recover public key from signature"));
 
     return new InitiatorHandshakeMessageV1(
@@ -145,7 +162,7 @@ public Bytes encode() {
   }
 
   @Override
-  public SECP256K1.PublicKey getPubKey() {
+  public SECPPublicKey getPubKey() {
     return pubKey;
   }
 
@@ -160,7 +177,7 @@ public Bytes32 getNonce() {
   }
 
   @Override
-  public SECP256K1.PublicKey getEphPubKey() {
+  public SECPPublicKey getEphPubKey() {
     return ephPubKey;
   }
 
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4.java
index 0e213e1e6a4..88791244ef3 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4.java
@@ -15,33 +15,41 @@
 package org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies;
 
 import org.hyperledger.besu.crypto.Hash;
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SECPPublicKey;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 
 public final class InitiatorHandshakeMessageV4 implements InitiatorHandshakeMessage {
 
   public static final int VERSION = 4;
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
 
-  private final SECP256K1.PublicKey pubKey;
-  private final SECP256K1.Signature signature;
-  private final SECP256K1.PublicKey ephPubKey;
+  private final SECPPublicKey pubKey;
+  private final SECPSignature signature;
+  private final SECPPublicKey ephPubKey;
   private final Bytes32 ephPubKeyHash;
   private final Bytes32 nonce;
 
   public static InitiatorHandshakeMessageV4 create(
-      final SECP256K1.PublicKey ourPubKey,
-      final SECP256K1.KeyPair ephKeyPair,
+      final SECPPublicKey ourPubKey,
+      final KeyPair ephKeyPair,
       final Bytes32 staticSharedSecret,
       final Bytes32 nonce) {
     return new InitiatorHandshakeMessageV4(
         ourPubKey,
-        SECP256K1.sign(staticSharedSecret.xor(nonce), ephKeyPair),
+        SIGNATURE_ALGORITHM.get().sign(staticSharedSecret.xor(nonce), ephKeyPair),
         ephKeyPair.getPublicKey(),
         nonce);
   }
@@ -56,21 +64,23 @@ public static InitiatorHandshakeMessageV4 create(
   public static InitiatorHandshakeMessageV4 decode(final Bytes bytes, final NodeKey nodeKey) {
     final RLPInput input = new BytesValueRLPInput(bytes, true);
     input.enterList();
-    final SECP256K1.Signature signature = SECP256K1.Signature.decode(input.readBytes());
-    final SECP256K1.PublicKey pubKey = SECP256K1.PublicKey.create(input.readBytes());
+    final SECPSignature signature = SIGNATURE_ALGORITHM.get().decodeSignature(input.readBytes());
+    final SECPPublicKey pubKey = SIGNATURE_ALGORITHM.get().createPublicKey(input.readBytes());
     final Bytes32 nonce = input.readBytes32();
     final Bytes32 staticSharedSecret = nodeKey.calculateECDHKeyAgreement(pubKey);
-    final SECP256K1.PublicKey ephPubKey =
-        SECP256K1.PublicKey.recoverFromSignature(staticSharedSecret.xor(nonce), signature)
+    final SECPPublicKey ephPubKey =
+        SIGNATURE_ALGORITHM
+            .get()
+            .recoverPublicKeyFromSignature(staticSharedSecret.xor(nonce), signature)
             .orElseThrow(() -> new RuntimeException("Could not recover public key from signature"));
 
     return new InitiatorHandshakeMessageV4(pubKey, signature, ephPubKey, nonce);
   }
 
   private InitiatorHandshakeMessageV4(
-      final SECP256K1.PublicKey pubKey,
-      final SECP256K1.Signature signature,
-      final SECP256K1.PublicKey ephPubKey,
+      final SECPPublicKey pubKey,
+      final SECPSignature signature,
+      final SECPPublicKey ephPubKey,
       final Bytes32 nonce) {
     this.pubKey = pubKey;
     this.signature = signature;
@@ -97,12 +107,12 @@ public Bytes32 getNonce() {
   }
 
   @Override
-  public SECP256K1.PublicKey getPubKey() {
+  public SECPPublicKey getPubKey() {
     return pubKey;
   }
 
   @Override
-  public SECP256K1.PublicKey getEphPubKey() {
+  public SECPPublicKey getEphPubKey() {
     return ephPubKey;
   }
 
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessage.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessage.java
index 0bd61c2e53c..61b1e1cc6ea 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessage.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessage.java
@@ -14,14 +14,14 @@
  */
 package org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies;
 
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.SECPPublicKey;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 
 public interface ResponderHandshakeMessage {
 
-  SECP256K1.PublicKey getEphPublicKey();
+  SECPPublicKey getEphPublicKey();
 
   Bytes32 getNonce();
 
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV1.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV1.java
index 317ebc48180..e176272b66d 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV1.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV1.java
@@ -16,7 +16,8 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.SECPPublicKey;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
@@ -49,19 +50,19 @@ public final class ResponderHandshakeMessageV1 implements ResponderHandshakeMess
           + ECIESHandshaker.NONCE_LENGTH
           + ECIESHandshaker.TOKEN_FLAG_LENGTH;
 
-  private final SECP256K1.PublicKey ephPublicKey; // 64 bytes - uncompressed and no type byte
+  private final SECPPublicKey ephPublicKey; // 64 bytes - uncompressed and no type byte
   private final Bytes32 nonce; // 32 bytes
   private final boolean token; // 1 byte - 0x00 or 0x01
 
   private ResponderHandshakeMessageV1(
-      final SECP256K1.PublicKey ephPublicKey, final Bytes32 nonce, final boolean token) {
+      final SECPPublicKey ephPublicKey, final Bytes32 nonce, final boolean token) {
     this.ephPublicKey = ephPublicKey;
     this.nonce = nonce;
     this.token = token;
   }
 
   public static ResponderHandshakeMessageV1 create(
-      final SECP256K1.PublicKey ephPublicKey, final Bytes32 nonce, final boolean token) {
+      final SECPPublicKey ephPublicKey, final Bytes32 nonce, final boolean token) {
     return new ResponderHandshakeMessageV1(ephPublicKey, nonce, token);
   }
 
@@ -69,7 +70,7 @@ public static ResponderHandshakeMessageV1 decode(final Bytes bytes) {
     checkArgument(bytes.size() == MESSAGE_LENGTH);
 
     final Bytes pubk = bytes.slice(0, ECIESHandshaker.PUBKEY_LENGTH);
-    final SECP256K1.PublicKey ephPubKey = SECP256K1.PublicKey.create(pubk);
+    final SECPPublicKey ephPubKey = SignatureAlgorithmFactory.getInstance().createPublicKey(pubk);
     final Bytes32 nonce =
         Bytes32.wrap(bytes.slice(ECIESHandshaker.PUBKEY_LENGTH, ECIESHandshaker.NONCE_LENGTH), 0);
     final boolean token =
@@ -88,7 +89,7 @@ public Bytes encode() {
   }
 
   @Override
-  public SECP256K1.PublicKey getEphPublicKey() {
+  public SECPPublicKey getEphPublicKey() {
     return ephPublicKey;
   }
 
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV4.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV4.java
index 85323ffbfbb..681d07c4c2c 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV4.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ResponderHandshakeMessageV4.java
@@ -14,7 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies;
 
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.SECPPublicKey;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
@@ -24,12 +25,12 @@
 
 public class ResponderHandshakeMessageV4 implements ResponderHandshakeMessage {
 
-  private final SECP256K1.PublicKey ephPublicKey;
+  private final SECPPublicKey ephPublicKey;
 
   private final Bytes32 nonce;
 
   public static ResponderHandshakeMessageV4 create(
-      final SECP256K1.PublicKey ephPublicKey, final Bytes32 nonce) {
+      final SECPPublicKey ephPublicKey, final Bytes32 nonce) {
     return new ResponderHandshakeMessageV4(ephPublicKey, nonce);
   }
 
@@ -37,16 +38,17 @@ public static ResponderHandshakeMessageV4 decode(final Bytes raw) {
     final RLPInput input = new BytesValueRLPInput(raw, true);
     input.enterList();
     return new ResponderHandshakeMessageV4(
-        SECP256K1.PublicKey.create(input.readBytes()), input.readBytes32());
+        SignatureAlgorithmFactory.getInstance().createPublicKey(input.readBytes()),
+        input.readBytes32());
   }
 
-  private ResponderHandshakeMessageV4(final SECP256K1.PublicKey ephPublicKey, final Bytes32 nonce) {
+  private ResponderHandshakeMessageV4(final SECPPublicKey ephPublicKey, final Bytes32 nonce) {
     this.ephPublicKey = ephPublicKey;
     this.nonce = nonce;
   }
 
   @Override
-  public SECP256K1.PublicKey getEphPublicKey() {
+  public SECPPublicKey getEphPublicKey() {
     return ephPublicKey;
   }
 
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/AbstractMessageData.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/AbstractMessageData.java
index 0640905ab72..c6c613b90b0 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/AbstractMessageData.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/AbstractMessageData.java
@@ -52,4 +52,9 @@ public boolean equals(final Object o) {
   public int hashCode() {
     return Objects.hashCode(data);
   }
+
+  @Override
+  public String toString() {
+    return getClass().getSimpleName() + "{code=" + getCode() + ", size=" + getSize() + "}";
+  }
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/AbstractSnapMessageData.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/AbstractSnapMessageData.java
new file mode 100644
index 00000000000..fd6ceb700dd
--- /dev/null
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/AbstractSnapMessageData.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.rlpx.wire;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+
+import java.math.BigInteger;
+import java.util.AbstractMap;
+import java.util.Map;
+import java.util.Optional;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.tuweni.bytes.Bytes;
+
+public abstract class AbstractSnapMessageData extends AbstractMessageData {
+
+  @VisibleForTesting
+  public static final BigInteger SIZE_REQUEST = BigInteger.valueOf(524288); // 512 * 1024
+
+  private Optional<Hash> rootHash;
+
+  public AbstractSnapMessageData(final Bytes data) {
+    super(data);
+    rootHash = Optional.empty();
+  }
+
+  public Optional<Hash> getRootHash() {
+    return rootHash;
+  }
+
+  public void setRootHash(final Optional<Hash> rootHash) {
+    this.rootHash = rootHash;
+  }
+
+  @Override
+  public MessageData wrapMessageData(final BigInteger requestId) {
+    return new RawMessage(getCode(), wrap(requestId));
+  }
+
+  @Override
+  public Map.Entry<BigInteger, MessageData> unwrapMessageData() {
+    final RLPInput messageDataRLP = RLP.input(getData());
+    messageDataRLP.enterList();
+    final BigInteger requestId = messageDataRLP.readBigIntegerScalar();
+    messageDataRLP.leaveListLenient();
+    return new AbstractMap.SimpleImmutableEntry<>(requestId, new RawMessage(getCode(), getData()));
+  }
+
+  protected Bytes wrap(final BigInteger requestId) {
+    throw new UnsupportedOperationException("cannot wrap this message");
+  }
+
+  public static MessageData create(final Message message) {
+    return new AbstractSnapMessageData(message.getData().getData()) {
+      @Override
+      public int getCode() {
+        return message.getData().getCode();
+      }
+    };
+  }
+}
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/Capability.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/Capability.java
index 6f092fec3ca..5a3a57df46d 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/Capability.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/Capability.java
@@ -22,6 +22,8 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 
+import org.owasp.encoder.Encode;
+
 /**
  * Represents a client capability.
  *
@@ -52,7 +54,7 @@ public int getVersion() {
   public void writeTo(final RLPOutput out) {
     out.startList();
     out.writeBytes(wrap(getName().getBytes(StandardCharsets.US_ASCII)));
-    out.writeUnsignedByte(getVersion());
+    out.writeUnsignedInt(getVersion());
     out.endList();
   }
 
@@ -82,7 +84,8 @@ public int hashCode() {
   }
 
   @Override
+  /** Returned string is sanitized since it contains user input */
   public String toString() {
-    return name + "/" + version;
+    return Encode.forJava(name) + "/" + version;
   }
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/CapabilityMultiplexer.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/CapabilityMultiplexer.java
index 2df84e5eb62..c21d531aeca 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/CapabilityMultiplexer.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/CapabilityMultiplexer.java
@@ -107,6 +107,11 @@ public int getCode() {
       public Bytes getData() {
         return originalMessage.getData();
       }
+
+      @Override
+      public String toString() {
+        return "Message{ code=" + getCode() + ", size=" + getSize() + "}";
+      }
     };
   }
 
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/MessageData.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/MessageData.java
index 820cb2ad69f..043ca05baad 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/MessageData.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/MessageData.java
@@ -14,11 +14,18 @@
  */
 package org.hyperledger.besu.ethereum.p2p.rlpx.wire;
 
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+
+import java.math.BigInteger;
+import java.util.AbstractMap;
+import java.util.Map;
+
 import org.apache.tuweni.bytes.Bytes;
 
 /** A P2P Network Message's Data. */
 public interface MessageData {
-
   /**
    * Returns the size of the message.
    *
@@ -39,4 +46,31 @@ public interface MessageData {
    * @return the serialized representation of this message
    */
   Bytes getData();
+
+  default MessageData wrapMessageData(final BigInteger requestId) {
+    final BytesValueRLPOutput rlpOutput = new BytesValueRLPOutput();
+    rlpOutput.startList();
+    rlpOutput.writeBigIntegerScalar(requestId);
+    rlpOutput.writeRaw(getData());
+    rlpOutput.endList();
+    return new RawMessage(getCode(), rlpOutput.encoded());
+  }
+
+  default Map.Entry<BigInteger, MessageData> unwrapMessageData() {
+    final RLPInput messageDataRLP = RLP.input(getData());
+    messageDataRLP.enterList();
+    final BigInteger requestId = messageDataRLP.readBigIntegerScalar();
+    final Bytes message = messageDataRLP.readAsRlp().raw();
+    messageDataRLP.leaveList();
+    return new AbstractMap.SimpleImmutableEntry<>(requestId, new RawMessage(getCode(), message));
+  }
+
+  /**
+   * Subclasses can implement this method to return a human-readable version of the raw data.
+   *
+   * @return return a human-readable version of the raw data
+   */
+  default String toStringDecoded() {
+    return "N/A";
+  }
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/PeerInfo.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/PeerInfo.java
index fd2d631a4dd..bd98270e020 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/PeerInfo.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/PeerInfo.java
@@ -16,8 +16,9 @@
 
 import static org.apache.tuweni.bytes.Bytes.wrap;
 
-import org.hyperledger.besu.crypto.SECP256K1.PublicKey;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.crypto.SECPPublicKey;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.core.Util;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
@@ -26,8 +27,10 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
+import javax.annotation.Nonnull;
 
 import org.apache.tuweni.bytes.Bytes;
+import org.owasp.encoder.Encode;
 
 /**
  * Encapsulates information about a peer, including their protocol version, client ID, capabilities
@@ -35,12 +38,13 @@
  *
  * <p>The peer info is shared between peers during the <code>HELLO</code> wire protocol handshake.
  */
-public class PeerInfo {
+public class PeerInfo implements Comparable<PeerInfo> {
   private final int version;
   private final String clientId;
   private final List<Capability> capabilities;
   private final int port;
   private final Bytes nodeId;
+  private Address address = null;
 
   public PeerInfo(
       final int version,
@@ -95,8 +99,12 @@ public Bytes getNodeId() {
   }
 
   public Address getAddress() {
-    final PublicKey remotePublicKey = PublicKey.create(nodeId);
-    return Util.publicKeyToAddress(remotePublicKey);
+    if (address == null) {
+      final SECPPublicKey remotePublicKey =
+          SignatureAlgorithmFactory.getInstance().createPublicKey(nodeId);
+      address = Util.publicKeyToAddress(remotePublicKey);
+    }
+    return address;
   }
 
   public void writeTo(final RLPOutput out) {
@@ -110,10 +118,11 @@ public void writeTo(final RLPOutput out) {
   }
 
   @Override
+  /** Returned string is sanitized since it contains user input */
   public String toString() {
     final StringBuilder sb = new StringBuilder("PeerInfo{");
     sb.append("version=").append(version);
-    sb.append(", clientId='").append(clientId).append('\'');
+    sb.append(", clientId='").append(Encode.forJava(clientId)).append('\'');
     sb.append(", capabilities=").append(capabilities);
     sb.append(", port=").append(port);
     sb.append(", nodeId=").append(nodeId);
@@ -141,4 +150,9 @@ public boolean equals(final Object o) {
   public int hashCode() {
     return Objects.hash(version, clientId, capabilities, port, nodeId);
   }
+
+  @Override
+  public int compareTo(final @Nonnull PeerInfo peerInfo) {
+    return this.nodeId.compareTo(peerInfo.nodeId);
+  }
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/RawMessage.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/RawMessage.java
index 0ab21723901..b4b0bc20c59 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/RawMessage.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/RawMessage.java
@@ -29,9 +29,4 @@ public RawMessage(final int code, final Bytes data) {
   public int getCode() {
     return code;
   }
-
-  @Override
-  public String toString() {
-    return "RawMessage{" + "code=" + code + ", data=" + data + '}';
-  }
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/ShouldConnectCallback.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/ShouldConnectCallback.java
new file mode 100644
index 00000000000..dbc208efb78
--- /dev/null
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/ShouldConnectCallback.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.rlpx.wire;
+
+import org.hyperledger.besu.ethereum.p2p.peers.Peer;
+
+@FunctionalInterface
+public interface ShouldConnectCallback {
+
+  boolean shouldConnect(final Peer peer, final boolean incoming);
+}
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/DisconnectMessage.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/DisconnectMessage.java
index e87e718cd9f..d81520f1ddc 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/DisconnectMessage.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/DisconnectMessage.java
@@ -61,11 +61,6 @@ public DisconnectReason getReason() {
     return Data.readFrom(RLP.input(data)).getReason();
   }
 
-  @Override
-  public String toString() {
-    return "DisconnectMessage{" + "data=" + data + '}';
-  }
-
   public static class Data {
     private final DisconnectReason reason;
 
@@ -80,9 +75,14 @@ public void writeTo(final RLPOutput out) {
     }
 
     public static Data readFrom(final RLPInput in) {
-      in.enterList();
-      Bytes reasonData = in.readBytes();
-      in.leaveList();
+      Bytes reasonData = Bytes.EMPTY;
+      if (in.nextIsList()) {
+        in.enterList();
+        reasonData = in.readBytes();
+        in.leaveList();
+      } else if (in.nextSize() == 1) {
+        reasonData = in.readBytes();
+      }
 
       // Disconnect reason should be at most 1 byte, otherwise, just return UNKNOWN
       final DisconnectReason reason =
@@ -101,8 +101,8 @@ public DisconnectReason getReason() {
   /**
    * Reasons for disconnection, modelled as specified in the wire protocol DISCONNECT message.
    *
-   * @see <a href="https://github.com/ethereum/wiki/wiki/%C3%90%CE%9EVp2p-Wire-Protocol">ÐΞVp2p Wire
-   *     Protocol</a>
+   * @see <a href="https://github.com/ethereum/devp2p/blob/master/rlpx.md#disconnect-0x01">RLPx
+   *     Transport Protocol</a>
    */
   public enum DisconnectReason {
     UNKNOWN(null),
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/EmptyMessage.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/EmptyMessage.java
index 2bb40ff6111..4611dc4b207 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/EmptyMessage.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/EmptyMessage.java
@@ -30,4 +30,9 @@ public final int getSize() {
   public Bytes getData() {
     return Bytes.EMPTY;
   }
+
+  @Override
+  public String toString() {
+    return getClass().getSimpleName() + "{ code=" + getCode() + ", size=0}";
+  }
 }
diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/HelloMessage.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/HelloMessage.java
index 1a18fa42064..d22513d3348 100644
--- a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/HelloMessage.java
+++ b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/messages/HelloMessage.java
@@ -55,9 +55,4 @@ public int getCode() {
   public PeerInfo getPeerInfo() {
     return PeerInfo.readFrom(RLP.input(data));
   }
-
-  @Override
-  public String toString() {
-    return "HelloMessage{" + "data=" + data + '}';
-  }
 }
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/config/DiscoveryConfigurationTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/config/DiscoveryConfigurationTest.java
index b6273167df2..305cd9e3763 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/config/DiscoveryConfigurationTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/config/DiscoveryConfigurationTest.java
@@ -16,8 +16,9 @@
 
 import static org.assertj.core.api.Java6Assertions.assertThatThrownBy;
 
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.util.Collections;
 
@@ -28,7 +29,7 @@ public class DiscoveryConfigurationTest {
   @Test
   public void setBootnodes_withDiscoveryDisabled() {
     final EnodeURL invalidBootnode =
-        EnodeURL.builder()
+        EnodeURLImpl.builder()
             .nodeId(Peer.randomId())
             .ipAddress("127.0.0.1")
             .listeningPort(30303)
@@ -46,7 +47,7 @@ public void setBootnodes_withDiscoveryDisabled() {
   @Test
   public void setBootnodes_withListeningDisabled() {
     final EnodeURL invalidBootnode =
-        EnodeURL.builder()
+        EnodeURLImpl.builder()
             .nodeId(Peer.randomId())
             .ipAddress("127.0.0.1")
             .discoveryAndListeningPorts(0)
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/config/RlpxConfigurationTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/config/RlpxConfigurationTest.java
deleted file mode 100644
index f0a8106ff4a..00000000000
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/config/RlpxConfigurationTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.p2p.config;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.Test;
-
-public class RlpxConfigurationTest {
-
-  @Test
-  public void getMaxRemotelyInitiatedConnections_remoteLimitsDisabled() {
-    final RlpxConfiguration config =
-        RlpxConfiguration.create()
-            .setFractionRemoteWireConnectionsAllowed(.5f)
-            .setLimitRemoteWireConnectionsEnabled(false)
-            .setMaxPeers(20);
-
-    assertThat(config.getMaxRemotelyInitiatedConnections()).isEqualTo(20);
-  }
-
-  @Test
-  public void getMaxRemotelyInitiatedConnections_remoteLimitsEnabled() {
-    final RlpxConfiguration config =
-        RlpxConfiguration.create()
-            .setFractionRemoteWireConnectionsAllowed(.5f)
-            .setLimitRemoteWireConnectionsEnabled(true)
-            .setMaxPeers(20);
-
-    assertThat(config.getMaxRemotelyInitiatedConnections()).isEqualTo(10);
-  }
-
-  @Test
-  public void getMaxRemotelyInitiatedConnections_remoteLimitsEnabledWithNonIntegerRatio() {
-    final RlpxConfiguration config =
-        RlpxConfiguration.create()
-            .setFractionRemoteWireConnectionsAllowed(.5f)
-            .setLimitRemoteWireConnectionsEnabled(true)
-            .setMaxPeers(25);
-
-    assertThat(config.getMaxRemotelyInitiatedConnections()).isEqualTo(12);
-  }
-
-  @Test
-  public void getMaxRemotelyInitiatedConnections_remoteLimitsEnabledRoundsToZero() {
-    final RlpxConfiguration config =
-        RlpxConfiguration.create()
-            .setFractionRemoteWireConnectionsAllowed(.5f)
-            .setLimitRemoteWireConnectionsEnabled(true)
-            .setMaxPeers(1);
-
-    assertThat(config.getMaxRemotelyInitiatedConnections()).isEqualTo(0);
-  }
-}
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryAgentTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryAgentTest.java
index 45d0fb456eb..7c2eb09e2cd 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryAgentTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryAgentTest.java
@@ -16,14 +16,19 @@
 
 import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.ethereum.forkid.ForkId;
 import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryTestHelper.AgentBuilder;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.FindNeighborsPacketData;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.MockPeerDiscoveryAgent;
@@ -32,28 +37,36 @@
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.Packet;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.PacketType;
 import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions;
 import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions.Action;
 import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissionsDenylist;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.ethereum.beacon.discovery.schema.NodeRecord;
 import org.junit.Test;
 
 public class PeerDiscoveryAgentTest {
 
   private static final int BROADCAST_TCP_PORT = 30303;
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
   private final PeerDiscoveryTestHelper helper = new PeerDiscoveryTestHelper();
 
   @Test
   public void createAgentWithInvalidBootnodes() {
     final EnodeURL invalidBootnode =
-        EnodeURL.builder()
+        EnodeURLImpl.builder()
             .nodeId(Peer.randomId())
             .ipAddress("127.0.0.1")
             .listeningPort(30303)
@@ -67,6 +80,87 @@ public void createAgentWithInvalidBootnodes() {
         .hasMessageContaining("Bootnodes must have discovery enabled");
   }
 
+  @Test
+  public void testNodeRecordCreated() {
+    final KeyPair keyPair =
+        SIGNATURE_ALGORITHM
+            .get()
+            .createKeyPair(
+                SIGNATURE_ALGORITHM
+                    .get()
+                    .createPrivateKey(
+                        Bytes32.fromHexString(
+                            "0xb71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")));
+    final MockPeerDiscoveryAgent agent =
+        helper.startDiscoveryAgent(
+            helper
+                .agentBuilder()
+                .nodeKey(NodeKeyUtils.createFrom(keyPair))
+                .advertisedHost("127.0.0.1")
+                .bindPort(30303));
+    assertThat(agent.getAdvertisedPeer().isPresent()).isTrue();
+    assertThat(agent.getAdvertisedPeer().get().getNodeRecord().isPresent()).isTrue();
+    final NodeRecord nodeRecord = agent.getAdvertisedPeer().get().getNodeRecord().get();
+    assertThat(nodeRecord.getNodeId()).isNotNull();
+    assertThat(nodeRecord.getIdentityScheme()).isNotNull();
+    assertThat(nodeRecord.getSignature()).isNotNull();
+    assertThat(nodeRecord.getSeq()).isNotNull();
+    assertThat(nodeRecord.get("eth")).isNotNull();
+    assertThat(nodeRecord.get("eth"))
+        .isEqualTo(
+            Collections.singletonList(new ForkId(Bytes.EMPTY, Bytes.EMPTY).getForkIdAsBytesList()));
+    assertThat(nodeRecord.asEnr())
+        .isEqualTo(
+            "enr:-JG4QF0FFhEXDu_G-1LD5lkWh5-cbnw8vJ00NvO8vGnAf85JMwLiP-Qo49DL2xYMzX3zg_d5VXhegmoVTFJRWgZAtCYBg2V0aMPCgICCaWSCdjSCaXCEfwAAAYlzZWNwMjU2azGhA8pjTK4NSay0Adikxrb-jFW3DRFb9AB2nMFADzJYzTE4g3RjcAKDdWRwgnZf");
+  }
+
+  @Test
+  public void testNodeRecordCreatedUpdatesDiscoveryPeer() {
+    final KeyPair keyPair =
+        SIGNATURE_ALGORITHM
+            .get()
+            .createKeyPair(
+                SIGNATURE_ALGORITHM
+                    .get()
+                    .createPrivateKey(
+                        Bytes32.fromHexString(
+                            "0xb71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")));
+    final MockPeerDiscoveryAgent agent =
+        helper.startDiscoveryAgent(
+            helper
+                .agentBuilder()
+                .nodeKey(NodeKeyUtils.createFrom(keyPair))
+                .advertisedHost("127.0.0.1")
+                .bindPort(30303));
+    agent.start(30303);
+    final NodeRecord pre = agent.getLocalNode().get().getNodeRecord().get();
+    agent.updateNodeRecord();
+    final NodeRecord post = agent.getLocalNode().get().getNodeRecord().get();
+    assertThat(pre).isNotEqualTo(post);
+  }
+
+  @Test
+  public void testNodeRecordNotUpdatedIfNoPeerDiscovery() {
+    final KeyPair keyPair =
+        SIGNATURE_ALGORITHM
+            .get()
+            .createKeyPair(
+                SIGNATURE_ALGORITHM
+                    .get()
+                    .createPrivateKey(
+                        Bytes32.fromHexString(
+                            "0xb71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")));
+    final MockPeerDiscoveryAgent agent =
+        helper.startDiscoveryAgent(
+            helper
+                .agentBuilder()
+                .nodeKey(NodeKeyUtils.createFrom(keyPair))
+                .advertisedHost("127.0.0.1")
+                .bindPort(30303)
+                .active(false));
+    assertThatCode(agent::updateNodeRecord).doesNotThrowAnyException();
+  }
+
   @Test
   public void neighborsPacketFromUnbondedPeerIsDropped() {
     // Start an agent with no bootstrap peers.
@@ -131,19 +225,20 @@ public void neighborsPacketLimited() {
     final IncomingPacket neighborsPacket = incomingPackets.get(0);
     assertThat(neighborsPacket.fromAgent).isEqualTo(agent);
 
-    // Assert that we only received 16 items.
+    // Assert that we only received 13 items.
     assertThat(neighborsPacket.packet.getPacketData(NeighborsPacketData.class).isPresent())
         .isTrue();
     final NeighborsPacketData neighbors =
         neighborsPacket.packet.getPacketData(NeighborsPacketData.class).get();
     assertThat(neighbors).isNotNull();
-    assertThat(neighbors.getNodes()).hasSize(16);
+    assertThat(neighbors.getNodes()).hasSize(13);
+    assertThat(neighborsPacket.packet.encode().length()).isLessThanOrEqualTo(1280); // under max MTU
 
-    // Assert that after removing those 16 items we're left with either 4 or 5.
-    // If we are left with 5, the test peer was returned as an item, assert that this is the case.
+    // Assert that after removing those 13 items we're left with either 7 or 8.
+    // If we are left with 8, the test peer was returned as an item, assert that this is the case.
     otherPeers.removeAll(neighbors.getNodes());
-    assertThat(otherPeers.size()).isBetween(4, 5);
-    if (otherPeers.size() == 5) {
+    assertThat(otherPeers.size()).isBetween(7, 8);
+    if (otherPeers.size() == 8) {
       assertThat(testAgent.getAdvertisedPeer().isPresent()).isTrue();
       assertThat(neighbors.getNodes()).contains(testAgent.getAdvertisedPeer().get());
     }
@@ -151,7 +246,7 @@ public void neighborsPacketLimited() {
 
   @Test
   public void shouldEvictPeerWhenPermissionsRevoked() {
-    final PeerPermissionsDenylist blacklist = PeerPermissionsDenylist.create();
+    final PeerPermissionsDenylist denylist = PeerPermissionsDenylist.create();
     final MockPeerDiscoveryAgent peerDiscoveryAgent1 = helper.startDiscoveryAgent();
     peerDiscoveryAgent1.start(BROADCAST_TCP_PORT).join();
     assertThat(peerDiscoveryAgent1.getAdvertisedPeer().isPresent()).isTrue();
@@ -159,12 +254,12 @@ public void shouldEvictPeerWhenPermissionsRevoked() {
 
     final MockPeerDiscoveryAgent peerDiscoveryAgent2 =
         helper.startDiscoveryAgent(
-            helper.agentBuilder().peerPermissions(blacklist).bootstrapPeers(peer));
+            helper.agentBuilder().peerPermissions(denylist).bootstrapPeers(peer));
     peerDiscoveryAgent2.start(BROADCAST_TCP_PORT).join();
 
     assertThat(peerDiscoveryAgent2.streamDiscoveredPeers().count()).isEqualTo(1);
 
-    blacklist.add(peer);
+    denylist.add(peer);
 
     assertThat(peerDiscoveryAgent2.streamDiscoveredPeers().count()).isEqualTo(0);
   }
@@ -230,7 +325,7 @@ public void bond_supplyGenericPeer() {
     agent.bond(genericPeer);
 
     // We should send an outgoing ping
-    List<IncomingPacket> remoteIncomingPackets = otherNode.getIncomingPackets();
+    final List<IncomingPacket> remoteIncomingPackets = otherNode.getIncomingPackets();
     assertThat(remoteIncomingPackets).hasSize(2);
     final IncomingPacket firstMsg = remoteIncomingPackets.get(0);
     assertThat(firstMsg.packet.getType()).isEqualTo(PacketType.PING);
@@ -258,13 +353,16 @@ public void bond_allowOutgoingBonding() {
     when(peerPermissions.isPermitted(
             any(), eq(remotePeer), eq(Action.DISCOVERY_ALLOW_OUTBOUND_BONDING)))
         .thenReturn(true);
+    when(peerPermissions.isPermitted(
+            any(), eq(remotePeer), eq(Action.DISCOVERY_ALLOW_IN_PEER_TABLE)))
+        .thenReturn(true);
 
     // Start agent and bond
     assertThat(agent.start(30303)).isCompleted();
     agent.bond(remotePeer);
 
     // We should send an outgoing ping
-    List<IncomingPacket> remoteIncomingPackets = otherNode.getIncomingPackets();
+    final List<IncomingPacket> remoteIncomingPackets = otherNode.getIncomingPackets();
     assertThat(remoteIncomingPackets).hasSize(1);
     final IncomingPacket firstMsg = remoteIncomingPackets.get(0);
     assertThat(firstMsg.packet.getType()).isEqualTo(PacketType.PING);
@@ -278,7 +376,10 @@ public void bond_peerWithDiscoveryDisabled() {
     assertThat(otherNode.getAdvertisedPeer().isPresent()).isTrue();
     final DiscoveryPeer remotePeer = otherNode.getAdvertisedPeer().get();
     final EnodeURL enodeWithDiscoveryDisabled =
-        EnodeURL.builder().configureFromEnode(remotePeer.getEnodeURL()).disableDiscovery().build();
+        EnodeURLImpl.builder()
+            .configureFromEnode(remotePeer.getEnodeURL())
+            .disableDiscovery()
+            .build();
     final Peer peerWithDisabledDiscovery = DefaultPeer.fromEnodeURL(enodeWithDiscoveryDisabled);
 
     final PeerPermissions peerPermissions = mock(PeerPermissions.class);
@@ -292,7 +393,7 @@ public void bond_peerWithDiscoveryDisabled() {
     agent.bond(peerWithDisabledDiscovery);
 
     // We should not send any messages to peer with discovery disabled
-    List<IncomingPacket> remoteIncomingPackets = otherNode.getIncomingPackets();
+    final List<IncomingPacket> remoteIncomingPackets = otherNode.getIncomingPackets();
     assertThat(remoteIncomingPackets).hasSize(0);
   }
 
@@ -316,7 +417,7 @@ public void bond_disallowOutgoingBonding() {
     agent.bond(remotePeer);
 
     // We should not send an outgoing ping
-    List<IncomingPacket> remoteIncomingPackets = otherNode.getIncomingPackets();
+    final List<IncomingPacket> remoteIncomingPackets = otherNode.getIncomingPackets();
     assertThat(remoteIncomingPackets).hasSize(0);
   }
 
@@ -344,7 +445,7 @@ public void bonding_allowIncomingBonding() {
     // Bond
     otherNode.bond(localNode);
 
-    List<IncomingPacket> remoteIncomingPackets = otherNode.getIncomingPackets();
+    final List<IncomingPacket> remoteIncomingPackets = otherNode.getIncomingPackets();
     assertThat(remoteIncomingPackets).hasSize(2);
     final IncomingPacket firstMsg = remoteIncomingPackets.get(0);
     assertThat(firstMsg.packet.getType()).isEqualTo(PacketType.PING);
@@ -407,7 +508,7 @@ public void bonding_allowOutgoingBonding() {
     // Check peer was allowed
     assertThat(agent.streamDiscoveredPeers()).hasSize(1);
     // Check that peer received a return ping
-    List<IncomingPacket> remoteIncomingPackets = otherNode.getIncomingPackets();
+    final List<IncomingPacket> remoteIncomingPackets = otherNode.getIncomingPackets();
     assertThat(remoteIncomingPackets).hasSize(1);
     final IncomingPacket firstMsg = remoteIncomingPackets.get(0);
     assertThat(firstMsg.packet.getType()).isEqualTo(PacketType.PING);
@@ -437,7 +538,7 @@ public void bonding_disallowOutgoingBonding() {
     agent.start(999);
 
     assertThat(agent.streamDiscoveredPeers()).hasSize(1);
-    List<IncomingPacket> remoteIncomingPackets = otherNode.getIncomingPackets();
+    final List<IncomingPacket> remoteIncomingPackets = otherNode.getIncomingPackets();
     assertThat(remoteIncomingPackets).isEmpty();
   }
 
@@ -568,7 +669,7 @@ public void neighbors_allowOutgoingRequest() {
     agent.start(999);
 
     assertThat(agent.streamDiscoveredPeers()).hasSize(1);
-    List<IncomingPacket> remoteIncomingPackets = otherNode.getIncomingPackets();
+    final List<IncomingPacket> remoteIncomingPackets = otherNode.getIncomingPackets();
     assertThat(remoteIncomingPackets).hasSize(2);
     // Peer should get a ping
     final IncomingPacket firstMsg = remoteIncomingPackets.get(0);
@@ -600,7 +701,7 @@ public void neighbors_disallowOutgoingRequest() {
     agent.start(999);
 
     assertThat(agent.streamDiscoveredPeers()).hasSize(1);
-    List<IncomingPacket> remoteIncomingPackets = otherNode.getIncomingPackets();
+    final List<IncomingPacket> remoteIncomingPackets = otherNode.getIncomingPackets();
     assertThat(remoteIncomingPackets).hasSize(2);
     // Peer should get a ping
     final IncomingPacket firstMsg = remoteIncomingPackets.get(0);
@@ -641,7 +742,7 @@ public void neighbors_allowIncomingRequest() {
     requestNeighbors(otherNode, agent);
 
     assertThat(agent.streamDiscoveredPeers()).hasSize(1);
-    List<IncomingPacket> remoteIncomingPackets = otherNode.getIncomingPackets();
+    final List<IncomingPacket> remoteIncomingPackets = otherNode.getIncomingPackets();
     assertThat(remoteIncomingPackets).hasSize(2);
 
     // Peer should get a ping
@@ -677,7 +778,7 @@ public void neighbors_disallowIncomingRequest() {
     requestNeighbors(otherNode, agent);
 
     assertThat(agent.streamDiscoveredPeers()).hasSize(1);
-    List<IncomingPacket> remoteIncomingPackets = otherNode.getIncomingPackets();
+    final List<IncomingPacket> remoteIncomingPackets = otherNode.getIncomingPackets();
     assertThat(remoteIncomingPackets).hasSize(3);
     // Peer should get a ping
     final IncomingPacket firstMsg = remoteIncomingPackets.get(0);
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryObserversTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryObserversTest.java
deleted file mode 100644
index 0b4efe9f2bb..00000000000
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryObserversTest.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.p2p.discovery;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryEvent.PeerBondedEvent;
-import org.hyperledger.besu.ethereum.p2p.discovery.internal.MockPeerDiscoveryAgent;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
-
-public class PeerDiscoveryObserversTest {
-  private static final int BROADCAST_TCP_PORT = 30303;
-  private final PeerDiscoveryTestHelper helper = new PeerDiscoveryTestHelper();
-
-  @Test
-  public void addAndRemoveObservers() {
-    final MockPeerDiscoveryAgent agent = helper.startDiscoveryAgent(Collections.emptyList());
-    assertThat(agent.getObserverCount()).isEqualTo(0);
-
-    final long id1 = agent.observePeerBondedEvents((event) -> {});
-    final long id2 = agent.observePeerBondedEvents((event) -> {});
-    final long id3 = agent.observePeerBondedEvents((event) -> {});
-    final long id4 = agent.observePeerBondedEvents((event) -> {});
-    final long id5 = agent.observePeerBondedEvents((event) -> {});
-    final long id6 = agent.observePeerBondedEvents((event) -> {});
-    assertThat(agent.getObserverCount()).isEqualTo(6);
-
-    agent.removePeerBondedObserver(id1);
-    agent.removePeerBondedObserver(id2);
-    assertThat(agent.getObserverCount()).isEqualTo(4);
-
-    agent.removePeerBondedObserver(id3);
-    agent.removePeerBondedObserver(id4);
-    assertThat(agent.getObserverCount()).isEqualTo(2);
-
-    agent.removePeerBondedObserver(id5);
-    agent.removePeerBondedObserver(id6);
-    assertThat(agent.getObserverCount()).isEqualTo(0);
-
-    final long id7 = agent.observePeerBondedEvents((event) -> {});
-    final long id8 = agent.observePeerBondedEvents((event) -> {});
-    assertThat(agent.getObserverCount()).isEqualTo(2);
-
-    agent.removePeerBondedObserver(id7);
-    agent.removePeerBondedObserver(id8);
-    assertThat(agent.getObserverCount()).isEqualTo(0);
-  }
-
-  @Test
-  public void removeInexistingObserver() {
-    final MockPeerDiscoveryAgent agent = helper.startDiscoveryAgent(Collections.emptyList());
-    assertThat(agent.getObserverCount()).isEqualTo(0);
-
-    agent.observePeerBondedEvents((event) -> {});
-    assertThat(agent.removePeerBondedObserver(12345)).isFalse();
-  }
-
-  @Test
-  public void peerBondedObserverTriggered() {
-    // Create 3 discovery agents with no bootstrap peers.
-    final List<MockPeerDiscoveryAgent> others1 =
-        helper.startDiscoveryAgents(3, Collections.emptyList());
-    final List<DiscoveryPeer> peers1 =
-        others1.stream()
-            .map(MockPeerDiscoveryAgent::getAdvertisedPeer)
-            .map(Optional::get)
-            .collect(Collectors.toList());
-
-    // Create two discovery agents pointing to the above as bootstrap peers.
-    final List<MockPeerDiscoveryAgent> others2 = helper.startDiscoveryAgents(2, peers1);
-    final List<DiscoveryPeer> peers2 =
-        others2.stream()
-            .map(MockPeerDiscoveryAgent::getAdvertisedPeer)
-            .map(Optional::get)
-            .collect(Collectors.toList());
-
-    // A list of all peers.
-    final List<DiscoveryPeer> allPeers = new ArrayList<>(peers1);
-    allPeers.addAll(peers2);
-
-    // Create a discovery agent (which we'll assert on), using the above two peers as bootstrap
-    // peers.
-    final MockPeerDiscoveryAgent agent = helper.createDiscoveryAgent(peers2);
-    // A queue for storing peer bonded events.
-    final List<PeerBondedEvent> events = new ArrayList<>(10);
-    agent.observePeerBondedEvents(events::add);
-    agent.start(BROADCAST_TCP_PORT).join();
-
-    final HashSet<Bytes> seenPeers = new HashSet<>();
-    List<DiscoveryPeer> discoveredPeers =
-        events.stream()
-            .map(PeerDiscoveryEvent::getPeer)
-            // We emit some duplicate events when the tcp port differs (in terms of presence) for a
-            // peer,
-            // filter peers by id to remove duplicates (See: DefaultPeer::equals).
-            // TODO: Should we evaluate peer equality based on id??
-            .filter((p) -> seenPeers.add(p.getId()))
-            .collect(Collectors.toList());
-    assertThat(discoveredPeers.size()).isEqualTo(allPeers.size());
-
-    Assertions.assertThat(discoveredPeers)
-        .extracting(DiscoveryPeer::getId)
-        .containsExactlyInAnyOrderElementsOf(
-            allPeers.stream().map(DiscoveryPeer::getId).collect(Collectors.toList()));
-    assertThat(events).extracting(PeerDiscoveryEvent::getTimestamp).isSorted();
-  }
-
-  @Test
-  public void multiplePeerBondedObserversTriggered() {
-    // Create 3 discovery agents with no bootstrap peers.
-    final List<MockPeerDiscoveryAgent> others =
-        helper.startDiscoveryAgents(3, Collections.emptyList());
-    assertThat(others.get(0).getAdvertisedPeer().isPresent()).isTrue();
-    final DiscoveryPeer peer = others.get(0).getAdvertisedPeer().get();
-
-    // Create a discovery agent (which we'll assert on), using the above two peers as bootstrap
-    // peers.
-    final MockPeerDiscoveryAgent agent = helper.createDiscoveryAgent(peer);
-
-    // Create 5 queues and subscribe them to peer bonded events.
-    final List<List<PeerBondedEvent>> queues =
-        Stream.generate(() -> new ArrayList<PeerBondedEvent>(10))
-            .limit(5)
-            .collect(Collectors.toList());
-    queues.forEach(q -> agent.observePeerBondedEvents(q::add));
-
-    // Start the agent and wait until each queue receives one event.
-    agent.start(BROADCAST_TCP_PORT).join();
-    for (List<PeerBondedEvent> eventQueue : queues) {
-      assertThat(eventQueue.size()).isEqualTo(1);
-    }
-
-    // All events are for the same peer.
-    final List<PeerBondedEvent> events =
-        Stream.of(queues)
-            .flatMap(Collection::stream)
-            .flatMap(Collection::stream)
-            .collect(Collectors.toList());
-    assertThat(events).extracting(PeerDiscoveryEvent::getPeer).allMatch(p -> p.equals(peer));
-
-    // We can event check that the event instance is the same across all queues.
-    final PeerBondedEvent event = events.get(0);
-    assertThat(events).allMatch(e -> e == event);
-  }
-}
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryPacketPcapSedesTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryPacketPcapSedesTest.java
index 969b98ae75d..3704eff438d 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryPacketPcapSedesTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryPacketPcapSedesTest.java
@@ -16,126 +16,200 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.hyperledger.besu.ethereum.p2p.discovery.internal.ENRRequestPacketData;
+import org.hyperledger.besu.ethereum.p2p.discovery.internal.ENRResponsePacketData;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.FindNeighborsPacketData;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.NeighborsPacketData;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.Packet;
+import org.hyperledger.besu.ethereum.p2p.discovery.internal.PacketType;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.PingPacketData;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.PongPacketData;
 import org.hyperledger.besu.util.NetworkUtility;
 
-import java.io.IOException;
 import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
 
 import com.google.common.net.InetAddresses;
-import io.pkts.Pcap;
-import io.pkts.protocol.Protocol;
 import io.vertx.core.buffer.Buffer;
+import org.apache.tuweni.units.bigints.UInt64;
 import org.assertj.core.api.Condition;
+import org.bouncycastle.util.encoders.Hex;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 
-@RunWith(Parameterized.class)
 public class PeerDiscoveryPacketPcapSedesTest {
+  private static final String pingHexData =
+      "dd49244b390b8ee964c7320742acfbb893ab47f051a323c0d908bd360ae83bd92d1e6dd370af2e5d21c4ce2b054baa1be66fe879d"
+          + "76ca851c12803a26a382d6e56e33071ba98ae22374fd37be02aa8573aac89f955ae21e96f154d82d0f6b2e20101df05cb"
+          + "84b4b57a1982040182765fcb84b4b57a1a82040182765f8460e5f20603";
+  private static final String pongHexData =
+      "3b3d56e4fcdcf714d6c29b0d521e9f4ec0dd50c73c0bbb9b44758a0a7e416ff30a3ea99de3e78a5cff82ad0a0b82030f78c6eff5a"
+          + "1b2a030276277b6e9b6ad7c35db1a6d5f83586a203b4537d82edc6b2820849a485e55aa06cfc680dc63c22d0002f3cb84"
+          + "b4b57a1a82040182765fa046896547d3b4259aa1a67bd26e7ec58ab4be650c5552ef0360caf9dae489d53b8460e5e7b603";
+  private static final String findNeighborsHexData =
+      "3b4c3be981427a8e9739dcd4ea3cf29fe1faa104b8381cb7c26053c4b711015b3"
+          + "919213819e30284bb82ec90081098ff4af02e8d9aa12692d4a0511fe92a3c137c3b65dddc309a0384ddb60074be46735c798710f04b95a"
+          + "868a1fdbac9328bc70003f847b840986165a2febf6b2b69383bfe10bfeafe1e0d63eac2387d340e51f402bf98860323dd8603800b661ce"
+          + "df5823e1a478f4f78e6661c957ed1db1b146d521cf60675845fda14be";
+  private static final String neighborsHexData =
+      "fa4484fd625113e9bf1d38218d98ce8c28f31d722f38b0bb1bc8296c82c741e8490ac"
+          + "82ea9afcb582f393cd5b7ad7fc72990015d3cc58f7f1527b6a60f671767458bc4cd4c00a08ab0eb56c85b5ab739bfda68b7cf24cdbb99d"
+          + "3dddbd4e0c6840004f8a5f89ef84d847f00000182765f82765fb840233590850744c0d95e3fd325a2b694de5d3a0f1e0c7e304358253f5"
+          + "725d25734a2e08bb1c2ac4ccccd527660b8f1a265c0dae4ef6adda8b5f07a742239bbd1fff84d847f00000182765f82765fb840841d92a"
+          + "de4223b36e213e03197fecc1250f34c52e1e1ec8cdff5b9cbe005f95567daa9fd96a64c0e3e3a8d55157bf9d87f1c4666cdae79b37bfa5"
+          + "c1835353475845fda165c";
+  private static final String enrResquestHexData =
+      "fed7cfd0a60b51d027d14d5bd1d4c5bc4ea289940c0d38f2ff8e72522e33e39be040ef1acbe25e2c40523821c0c536e17e0f7204a08260b842dc"
+          + "a830513a2f9e5169a3f711ecb5a512fdd56e5edfd7d8fdaa0e6982020dbd2f76949ef84d1a840005c58460146486";
+  private static final String enrResponseHexData =
+      "9c85a6d16e5222dc48df51654cc36fb372b5429646ca8fd85a7f79ea420dba326f2cc84456b6c7fa1e6dd4ed6e3e89934e6f4415d58b40899996"
+          + "ee461a8e147f62ff33177680cffe061d048183091b4254dd1edf05f7e92d1117b23035d94f7d0106f8a7a0fed7cfd0a60b51d027d14d5b"
+          + "d1d4c5bc4ea289940c0d38f2ff8e72522e33e39bf884b8407098ad865b00a582051940cb9cf36836572411a47278783077011599ed5cd1"
+          + "6b76f2635f4e234738f30813a89eb9137e3e3df5266e3a1f11df72ecf1145ccb9c01826964827634826970847f00000189736563703235"
+          + "366b31a103ca634cae0d49acb401d8a4c6b6fe8c55b70d115bf400769cc1400f3258cd31388375647082765f";
 
-  private final Instant timestamp;
-  private final byte[] data;
+  @Test
+  public void testUDPPingSerializeDeserialize() {
+    final byte[] data = Hex.decode(pingHexData);
+    final Packet packet = Packet.decode(Buffer.buffer(data));
+    assertThat(packet.getType()).isNotNull();
+    assertThat(packet.getNodeId()).isNotNull();
+    assertThat(packet.getNodeId().toArray()).hasSize(64);
+
+    assertThat(packet.getType()).isEqualTo(PacketType.PING);
+    assertThat(packet.getPacketData(PingPacketData.class)).isPresent();
+    final PingPacketData pingPacketData = packet.getPacketData(PingPacketData.class).orElse(null);
+
+    assertThat(pingPacketData).isNotNull();
+    assertThat(pingPacketData.getTo()).isNotNull();
+    assertThat(pingPacketData.getFrom()).isNotNull();
+    assertThat(pingPacketData.getTo().getHost()).satisfies(validInetAddressCondition);
+    assertThat(pingPacketData.getFrom().map(Endpoint::getHost))
+        .hasValueSatisfying(validInetAddressCondition);
+    assertThat(pingPacketData.getTo().getUdpPort()).isPositive();
+    assertThat(pingPacketData.getFrom().get().getUdpPort()).isPositive();
+    pingPacketData.getTo().getTcpPort().ifPresent(p -> assertThat(p).isPositive());
+    pingPacketData.getFrom().get().getTcpPort().ifPresent(p -> assertThat(p).isPositive());
+    assertThat(pingPacketData.getExpiration()).isPositive();
+    assertThat(pingPacketData.getEnrSeq().isPresent()).isTrue();
+    assertThat(pingPacketData.getEnrSeq().get()).isGreaterThan(UInt64.ZERO);
 
-  public PeerDiscoveryPacketPcapSedesTest(final Instant instant, final byte[] data) {
-    this.timestamp = instant;
-    this.data = data;
+    final byte[] encoded = packet.encode().getBytes();
+    assertThat(encoded).isEqualTo(data);
   }
 
-  @Parameterized.Parameters(name = "{index}: {0}")
-  public static Collection<Object[]> parameters() throws IOException {
-    final Pcap pcap =
-        Pcap.openStream(
-            PeerDiscoveryPacketPcapSedesTest.class
-                .getClassLoader()
-                .getResourceAsStream("udp.pcap"));
-
-    final List<Object[]> parameters = new ArrayList<>();
-    pcap.loop(
-        packet -> {
-          if (packet.hasProtocol(Protocol.UDP)) {
-            final byte[] data = packet.getPacket(Protocol.UDP).getPayload().getArray();
-            parameters.add(
-                new Object[] {Instant.ofEpochMilli(packet.getArrivalTime() / 1000), data});
-          }
-          return true;
-        });
-    return parameters;
+  @Test
+  public void testUDPPongSerializeDeserialize() {
+    final byte[] data = Hex.decode(pongHexData);
+    final Packet packet = Packet.decode(Buffer.buffer(data));
+    assertThat(packet.getType()).isNotNull();
+    assertThat(packet.getNodeId()).isNotNull();
+    assertThat(packet.getNodeId().toArray()).hasSize(64);
+    assertThat(packet.getType()).isEqualTo(PacketType.PONG);
+    assertThat(packet.getPacketData(PongPacketData.class)).isPresent();
+
+    final PongPacketData pongPacketData = packet.getPacketData(PongPacketData.class).orElse(null);
+    assertThat(pongPacketData).isNotNull();
+    assertThat(pongPacketData.getTo()).isNotNull();
+    assertThat(pongPacketData.getTo().getHost()).satisfies(validInetAddressCondition);
+    assertThat(pongPacketData.getTo().getUdpPort()).isPositive();
+    pongPacketData.getTo().getTcpPort().ifPresent(p -> assertThat(p).isPositive());
+    assertThat(pongPacketData.getPingHash().toArray()).hasSize(32);
+    assertThat(pongPacketData.getExpiration()).isPositive();
+    assertThat(pongPacketData.getEnrSeq().isPresent()).isTrue();
+    assertThat(pongPacketData.getEnrSeq().get()).isGreaterThan(UInt64.ZERO);
+
+    final byte[] encoded = packet.encode().getBytes();
+    assertThat(encoded).isEqualTo(data);
   }
 
   @Test
-  public void serializeDeserialize() {
+  public void testUDPFindNeighborsSerializeDeserialize() {
+    final byte[] data = Hex.decode(findNeighborsHexData);
     final Packet packet = Packet.decode(Buffer.buffer(data));
+    final Instant timestamp = Instant.ofEpochSecond(1608127678L);
     assertThat(packet.getType()).isNotNull();
     assertThat(packet.getNodeId()).isNotNull();
     assertThat(packet.getNodeId().toArray()).hasSize(64);
+    assertThat(packet.getType()).isEqualTo(PacketType.FIND_NEIGHBORS);
+    assertThat(packet.getPacketData(FindNeighborsPacketData.class)).isPresent();
+
+    final FindNeighborsPacketData findNeighborsPacketData =
+        packet.getPacketData(FindNeighborsPacketData.class).orElse(null);
+    assertThat(findNeighborsPacketData).isNotNull();
+    assertThat(findNeighborsPacketData.getExpiration())
+        .isBetween(timestamp.getEpochSecond() - 10000, timestamp.getEpochSecond() + 10000);
+    assertThat(findNeighborsPacketData.getTarget().toArray()).hasSize(64);
+    assertThat(packet.getNodeId().toArray()).hasSize(64);
+
+    final byte[] encoded = packet.encode().getBytes();
+    assertThat(encoded).isEqualTo(data);
+  }
 
-    switch (packet.getType()) {
-      case PING:
-        assertThat(packet.getPacketData(PingPacketData.class)).isPresent();
-        final PingPacketData ping = packet.getPacketData(PingPacketData.class).get();
-
-        assertThat(ping.getTo()).isNotNull();
-        assertThat(ping.getFrom()).isNotNull();
-        assertThat(ping.getTo().getHost()).satisfies(validInetAddressCondition);
-        assertThat(ping.getFrom().map(Endpoint::getHost))
-            .hasValueSatisfying(validInetAddressCondition);
-        assertThat(ping.getTo().getUdpPort()).isPositive();
-        assertThat(ping.getFrom().get().getUdpPort()).isPositive();
-        ping.getTo().getTcpPort().ifPresent(p -> assertThat(p).isPositive());
-        ping.getFrom().get().getTcpPort().ifPresent(p -> assertThat(p).isPositive());
-        assertThat(ping.getExpiration()).isPositive();
-        // because of the version upgrade the ping packet won't re-serialize, so we're done
-        return;
-
-      case PONG:
-        assertThat(packet.getPacketData(PongPacketData.class)).isPresent();
-        final PongPacketData pong = packet.getPacketData(PongPacketData.class).get();
-
-        assertThat(pong.getTo()).isNotNull();
-        assertThat(pong.getTo().getHost()).satisfies(validInetAddressCondition);
-        assertThat(pong.getTo().getUdpPort()).isPositive();
-        pong.getTo().getTcpPort().ifPresent(p -> assertThat(p).isPositive());
-        assertThat(pong.getPingHash().toArray()).hasSize(32);
-        assertThat(pong.getExpiration()).isPositive();
-        break;
-
-      case FIND_NEIGHBORS:
-        assertThat(packet.getPacketData(FindNeighborsPacketData.class)).isPresent();
-        final FindNeighborsPacketData data =
-            packet.getPacketData(FindNeighborsPacketData.class).get();
-        assertThat(data.getExpiration())
-            .isBetween(timestamp.getEpochSecond() - 10000, timestamp.getEpochSecond() + 10000);
-        assertThat(data.getTarget().toArray()).hasSize(64);
-        assertThat(packet.getNodeId().toArray()).hasSize(64);
-        break;
-
-      case NEIGHBORS:
-        assertThat(packet.getPacketData(NeighborsPacketData.class)).isPresent();
-        final NeighborsPacketData neighbors = packet.getPacketData(NeighborsPacketData.class).get();
-        assertThat(neighbors.getExpiration()).isPositive();
-        assertThat(neighbors.getNodes()).isNotEmpty();
-
-        for (final DiscoveryPeer p : neighbors.getNodes()) {
-          assertThat(NetworkUtility.isValidPort(p.getEndpoint().getUdpPort())).isTrue();
-          assertThat(p.getEndpoint().getHost()).satisfies(validInetAddressCondition);
-          assertThat(p.getId().toArray()).hasSize(64);
-        }
-
-        break;
+  @Test
+  public void testUDPNeighborsSerializeDeserialize() {
+    final byte[] data = Hex.decode(neighborsHexData);
+    final Packet packet = Packet.decode(Buffer.buffer(data));
+    assertThat(packet.getType()).isNotNull();
+    assertThat(packet.getNodeId()).isNotNull();
+    assertThat(packet.getNodeId().toArray()).hasSize(64);
+    assertThat(packet.getType()).isEqualTo(PacketType.NEIGHBORS);
+    assertThat(packet.getPacketData(NeighborsPacketData.class)).isPresent();
+
+    final NeighborsPacketData neighborsPacketData =
+        packet.getPacketData(NeighborsPacketData.class).orElse(null);
+    assertThat(neighborsPacketData).isNotNull();
+    assertThat(neighborsPacketData.getExpiration()).isPositive();
+    assertThat(neighborsPacketData.getNodes()).isNotEmpty();
+
+    for (final DiscoveryPeer p : neighborsPacketData.getNodes()) {
+      assertThat(NetworkUtility.isValidPort(p.getEndpoint().getUdpPort())).isTrue();
+      assertThat(p.getEndpoint().getHost()).satisfies(validInetAddressCondition);
+      assertThat(p.getId().toArray()).hasSize(64);
     }
 
     final byte[] encoded = packet.encode().getBytes();
     assertThat(encoded).isEqualTo(data);
   }
 
+  @Test
+  public void testUDPENRRequestSerializeDeserialize() {
+    final byte[] data = Hex.decode(enrResquestHexData);
+    final Packet packet = Packet.decode(Buffer.buffer(data));
+    assertThat(packet.getType()).isNotNull();
+    assertThat(packet.getNodeId()).isNotNull();
+    assertThat(packet.getNodeId().toArray()).hasSize(64);
+    assertThat(packet.getType()).isEqualTo(PacketType.ENR_REQUEST);
+
+    final ENRRequestPacketData enrRequestPacketData =
+        packet.getPacketData(ENRRequestPacketData.class).orElse(null);
+    assertThat(enrRequestPacketData).isNotNull();
+    assertThat(enrRequestPacketData.getExpiration()).isPositive();
+
+    final byte[] encoded = packet.encode().getBytes();
+    assertThat(encoded).isEqualTo(data);
+  }
+
+  @Test
+  public void testUDPENRResponseSerializeDeserialize() {
+    final byte[] data = Hex.decode(enrResponseHexData);
+    final Packet packet = Packet.decode(Buffer.buffer(data));
+    assertThat(packet.getType()).isNotNull();
+    assertThat(packet.getNodeId()).isNotNull();
+    assertThat(packet.getNodeId().toArray()).hasSize(64);
+    assertThat(packet.getType()).isEqualTo(PacketType.ENR_RESPONSE);
+
+    final ENRResponsePacketData enrResponsePacketData =
+        packet.getPacketData(ENRResponsePacketData.class).orElse(null);
+    assertThat(enrResponsePacketData).isNotNull();
+    assertThat(enrResponsePacketData.getEnr()).isNotNull();
+    assertThat(enrResponsePacketData.getEnr().getSeq()).isGreaterThan(UInt64.ZERO);
+    assertThat(enrResponsePacketData.getEnr().getSignature()).isNotNull();
+    assertThat(enrResponsePacketData.getRequestHash()).isNotNull();
+    assertThat(enrResponsePacketData.getRequestHash().toArray()).hasSize(32);
+
+    final byte[] encoded = packet.encode().getBytes();
+    assertThat(encoded).isEqualTo(data);
+  }
+
   private final Condition<String> validInetAddressCondition =
       new Condition<>(InetAddresses::isInetAddress, "checks for valid InetAddresses");
 }
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryPacketSedesTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryPacketSedesTest.java
index c2b7949d2e2..36773080ae4 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryPacketSedesTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryPacketSedesTest.java
@@ -15,10 +15,11 @@
 package org.hyperledger.besu.ethereum.p2p.discovery;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.data.Offset.offset;
 
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.FindNeighborsPacketData;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.NeighborsPacketData;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.Packet;
@@ -26,6 +27,7 @@
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.PacketType;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPException;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
 
 import java.util.List;
 import java.util.Random;
@@ -90,7 +92,7 @@ public void neighborsPacketData() {
     assertThat(deserialized.getExpiration()).isCloseTo(PacketData.defaultExpiration(), offset(2L));
   }
 
-  @Test(expected = RLPException.class)
+  @Test
   public void deserializeDifferentPacketData() {
     final byte[] r = new byte[64];
     new Random().nextBytes(r);
@@ -100,10 +102,11 @@ public void deserializeDifferentPacketData() {
     final Bytes serialized = RLP.encode(packet::writeTo);
     assertThat(serialized).isNotNull();
 
-    NeighborsPacketData.readFrom(RLP.input(serialized));
+    final RLPInput input = RLP.input(serialized);
+    assertThatThrownBy(() -> NeighborsPacketData.readFrom(input)).isInstanceOf(RLPException.class);
   }
 
-  @Test(expected = PeerDiscoveryPacketDecodingException.class)
+  @Test
   public void integrityCheckFailsUnmatchedHash() {
     final byte[] r = new byte[64];
     new Random().nextBytes(r);
@@ -120,6 +123,8 @@ public void integrityCheckFailsUnmatchedHash() {
     // Change one bit in the last byte, which belongs to the payload, hence the hash will not match
     // any longer.
     garbled.set(i, (byte) (garbled.get(i) + 0x01));
-    Packet.decode(Buffer.buffer(garbled.toArray()));
+    final Buffer input = Buffer.buffer(garbled.toArray());
+    assertThatThrownBy(() -> Packet.decode(input))
+        .isInstanceOf(PeerDiscoveryPacketDecodingException.class);
   }
 }
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryTestHelper.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryTestHelper.java
index ecadc23b8a8..e51b6320a6e 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryTestHelper.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryTestHelper.java
@@ -16,20 +16,26 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static java.util.Arrays.asList;
-
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.ethereum.core.Hash;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.forkid.ForkId;
+import org.hyperledger.besu.ethereum.forkid.ForkIdManager;
 import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.MockPeerDiscoveryAgent;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.Packet;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.PacketType;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.PingPacketData;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.PongPacketData;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions;
+import org.hyperledger.besu.ethereum.p2p.rlpx.RlpxAgent;
 import org.hyperledger.besu.nat.NatService;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -43,6 +49,9 @@
 import java.util.stream.Stream;
 
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt64;
+import org.ethereum.beacon.discovery.schema.IdentitySchemaInterpreter;
+import org.ethereum.beacon.discovery.schema.NodeRecord;
 
 public class PeerDiscoveryTestHelper {
   private static final String LOOPBACK_IP_ADDR = "127.0.0.1";
@@ -75,12 +84,17 @@ public DiscoveryPeer createDiscoveryPeer() {
   public DiscoveryPeer createDiscoveryPeer(final NodeKey nodeKey) {
     final Bytes peerId = nodeKey.getPublicKey().getEncodedBytes();
     final int port = nextAvailablePort.incrementAndGet();
-    return DiscoveryPeer.fromEnode(
-        EnodeURL.builder()
-            .nodeId(peerId)
-            .ipAddress(LOOPBACK_IP_ADDR)
-            .discoveryAndListeningPorts(port)
-            .build());
+    final DiscoveryPeer discoveryPeer =
+        DiscoveryPeer.fromEnode(
+            EnodeURLImpl.builder()
+                .nodeId(peerId)
+                .ipAddress(LOOPBACK_IP_ADDR)
+                .discoveryAndListeningPorts(port)
+                .build());
+    discoveryPeer.setNodeRecord(
+        NodeRecord.fromValues(IdentitySchemaInterpreter.V4, UInt64.ONE, Collections.emptyList()));
+
+    return discoveryPeer;
   }
 
   public Packet createPingPacket(
@@ -88,15 +102,17 @@ public Packet createPingPacket(
     return Packet.create(
         PacketType.PING,
         PingPacketData.create(
-            fromAgent.getAdvertisedPeer().get().getEndpoint(),
-            toAgent.getAdvertisedPeer().get().getEndpoint()),
+            Optional.of(fromAgent.getAdvertisedPeer().get().getEndpoint()),
+            toAgent.getAdvertisedPeer().get().getEndpoint(),
+            UInt64.ONE),
         fromAgent.getNodeKey());
   }
 
   public Packet createPongPacket(final MockPeerDiscoveryAgent toAgent, final Hash pingHash) {
     return Packet.create(
         PacketType.PONG,
-        PongPacketData.create(toAgent.getAdvertisedPeer().get().getEndpoint(), pingHash),
+        PongPacketData.create(
+            toAgent.getAdvertisedPeer().get().getEndpoint(), pingHash, UInt64.ONE),
         toAgent.getNodeKey());
   }
 
@@ -199,6 +215,8 @@ public static class AgentBuilder {
     private String advertisedHost = "127.0.0.1";
     private OptionalInt bindPort = OptionalInt.empty();
     private NodeKey nodeKey = NodeKeyUtils.generate();
+    private NodeRecord nodeRecord =
+        NodeRecord.fromValues(IdentitySchemaInterpreter.V4, UInt64.ONE, Collections.emptyList());
 
     private AgentBuilder(
         final Map<Bytes, MockPeerDiscoveryAgent> agents, final AtomicInteger nextAvailablePort) {
@@ -256,6 +274,11 @@ public AgentBuilder nodeKey(final NodeKey nodeKey) {
       return this;
     }
 
+    public AgentBuilder nodeRecord(final NodeRecord nodeRecord) {
+      this.nodeRecord = nodeRecord;
+      return this;
+    }
+
     public MockPeerDiscoveryAgent build() {
       final int port = bindPort.orElseGet(nextAvailablePort::incrementAndGet);
       final DiscoveryConfiguration config = new DiscoveryConfiguration();
@@ -265,7 +288,22 @@ public MockPeerDiscoveryAgent build() {
       config.setBindPort(port);
       config.setActive(active);
 
-      return new MockPeerDiscoveryAgent(nodeKey, config, peerPermissions, agents, natService);
+      final ForkIdManager mockForkIdManager = mock(ForkIdManager.class);
+      final ForkId forkId = new ForkId(Bytes.EMPTY, Bytes.EMPTY);
+      when(mockForkIdManager.getForkIdForChainHead()).thenReturn(forkId);
+      when(mockForkIdManager.peerCheck(forkId)).thenReturn(true);
+      final MockPeerDiscoveryAgent mockPeerDiscoveryAgent =
+          new MockPeerDiscoveryAgent(
+              nodeKey,
+              config,
+              peerPermissions,
+              agents,
+              natService,
+              mockForkIdManager,
+              mock(RlpxAgent.class));
+      mockPeerDiscoveryAgent.getAdvertisedPeer().ifPresent(peer -> peer.setNodeRecord(nodeRecord));
+
+      return mockPeerDiscoveryAgent;
     }
   }
 }
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryTimestampsTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryTimestampsTest.java
index 2ce9277629b..f0f5fc173bd 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryTimestampsTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryTimestampsTest.java
@@ -16,7 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.MockPeerDiscoveryAgent;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.Packet;
 
@@ -92,6 +92,12 @@ public void lastContactedTimestampUpdatedOnOutboundMessage() {
     firstDiscovered.set(fd);
 
     // Send another packet and ensure that timestamps are updated accordingly.
+    // Sleep beforehand to make sure timestamps will be different.
+    try {
+      Thread.sleep(1);
+    } catch (InterruptedException e) {
+      // Swallow exception because we only want to pause the test.
+    }
     helper.sendMessageBetweenAgents(testAgent, agent, ping);
 
     peer = agent.streamDiscoveredPeers().iterator().next();
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/ENRRequestPacketDataTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/ENRRequestPacketDataTest.java
new file mode 100644
index 00000000000..e2892299d98
--- /dev/null
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/ENRRequestPacketDataTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.discovery.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+
+import java.time.Instant;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Test;
+
+public class ENRRequestPacketDataTest {
+  @Test
+  public void serializeDeserialize() {
+    final long currentTimeSec = Instant.now().getEpochSecond();
+    final ENRRequestPacketData packet = ENRRequestPacketData.create();
+    final Bytes serialized = RLP.encode(packet::writeTo);
+    final ENRRequestPacketData deserialized = ENRRequestPacketData.readFrom(RLP.input(serialized));
+
+    assertThat(deserialized.getExpiration()).isGreaterThan(currentTimeSec);
+  }
+
+  @Test
+  public void readFrom() {
+    final long time = System.currentTimeMillis();
+
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    out.startList();
+    out.writeLongScalar(time);
+    out.endList();
+
+    final Bytes serialized = out.encoded();
+    final ENRRequestPacketData deserialized = ENRRequestPacketData.readFrom(RLP.input(serialized));
+
+    assertThat(deserialized.getExpiration()).isEqualTo(time);
+  }
+
+  @Test
+  public void readFrom_withExtraFields() {
+    final long time = System.currentTimeMillis();
+
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    out.startList();
+    out.writeLongScalar(time);
+    // Add extra field
+    out.writeLongScalar(11);
+    out.endList();
+
+    final Bytes serialized = out.encoded();
+    final ENRRequestPacketData deserialized = ENRRequestPacketData.readFrom(RLP.input(serialized));
+
+    assertThat(deserialized.getExpiration()).isEqualTo(time);
+  }
+}
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/ENRResponsePacketDataTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/ENRResponsePacketDataTest.java
new file mode 100644
index 00000000000..d12a05373c2
--- /dev/null
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/ENRResponsePacketDataTest.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.discovery.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt64;
+import org.ethereum.beacon.discovery.schema.EnrField;
+import org.ethereum.beacon.discovery.schema.IdentitySchema;
+import org.ethereum.beacon.discovery.schema.NodeRecord;
+import org.ethereum.beacon.discovery.schema.NodeRecordFactory;
+import org.ethereum.beacon.discovery.util.Functions;
+import org.junit.Test;
+
+public class ENRResponsePacketDataTest {
+  @Test
+  public void serializeDeserialize() {
+    final Bytes requestHash = Bytes.fromHexStringLenient("0x1234");
+    final Bytes nodeId =
+        Bytes.fromHexString("a448f24c6d18e575453db13171562b71999873db5b286df957af199ec94617f7");
+    final Bytes privateKey =
+        Bytes.fromHexString("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291");
+
+    NodeRecord nodeRecord =
+        NodeRecordFactory.DEFAULT.createFromValues(
+            UInt64.ONE,
+            new EnrField(EnrField.ID, IdentitySchema.V4),
+            new EnrField(EnrField.IP_V4, Bytes.fromHexString("0x7F000001")),
+            new EnrField(EnrField.IP_V6, Bytes.fromHexString("0x00000001")),
+            new EnrField(EnrField.UDP, 30303),
+            new EnrField(EnrField.UDP_V6, 30303),
+            new EnrField(EnrField.TCP, 8080),
+            new EnrField(EnrField.TCP_V6, 8080),
+            new EnrField(
+                EnrField.PKEY_SECP256K1, Functions.derivePublicKeyFromPrivate(privateKey)));
+    nodeRecord.sign(privateKey);
+
+    assertThat(nodeRecord.getNodeId()).isEqualTo(nodeId);
+    assertThat(nodeRecord.asEnr())
+        .isEqualTo(
+            "enr:-KS4QHWjNgmcnxf-dwC_paPSLEi1N-eW0Swoa4lLNOLe09UOEZ4qoDy3a8dl8wmprsu84JMFzvdc-WZrrqW"
+                + "efDWpf3IBgmlkgnY0gmlwhH8AAAGDaXA2hAAAAAGJc2VjcDI1NmsxoQPKY0yuDUmstAHYpMa2_oxVtw0R"
+                + "W_QAdpzBQA8yWM0xOIN0Y3CCH5CEdGNwNoIfkIN1ZHCCdl-EdWRwNoJ2Xw");
+
+    final ENRResponsePacketData packet = ENRResponsePacketData.create(requestHash, nodeRecord);
+    final Bytes serialized = RLP.encode(packet::writeTo);
+    final ENRResponsePacketData deserialized =
+        ENRResponsePacketData.readFrom(RLP.input(serialized));
+
+    assertThat(deserialized.getRequestHash()).isEqualTo(requestHash);
+    assertThat(deserialized.getEnr()).isEqualTo(nodeRecord);
+  }
+
+  @Test
+  public void readFrom() {
+    final Bytes requestHash = Bytes.fromHexStringLenient("0x1234");
+    final Bytes nodeId =
+        Bytes.fromHexString("a448f24c6d18e575453db13171562b71999873db5b286df957af199ec94617f7");
+    final Bytes privateKey =
+        Bytes.fromHexString("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291");
+
+    NodeRecord nodeRecord =
+        NodeRecordFactory.DEFAULT.createFromValues(
+            UInt64.ONE,
+            new EnrField(EnrField.ID, IdentitySchema.V4),
+            new EnrField(EnrField.IP_V4, Bytes.fromHexString("0x7F000001")),
+            new EnrField(EnrField.UDP, 30303),
+            new EnrField(
+                EnrField.PKEY_SECP256K1, Functions.derivePublicKeyFromPrivate(privateKey)));
+    nodeRecord.sign(privateKey);
+
+    assertThat(nodeRecord.getNodeId()).isEqualTo(nodeId);
+    assertThat(nodeRecord.asEnr())
+        .isEqualTo(
+            "enr:-IS4QHCYrYZbAKWCBRlAy5zzaDZXJBGkcnh4MHcBFZntXNFrdvJjX04jRzjzCBOonrkTfj499SZuOh8R33L"
+                + "s8RRcy5wBgmlkgnY0gmlwhH8AAAGJc2VjcDI1NmsxoQPKY0yuDUmstAHYpMa2_oxVtw0RW_QAdpzBQA8y"
+                + "WM0xOIN1ZHCCdl8");
+
+    BytesValueRLPOutput out = new BytesValueRLPOutput();
+    out.startList();
+    out.writeBytes(requestHash);
+    out.writeRLPBytes(nodeRecord.serialize());
+    out.endList();
+    final Bytes encoded = out.encoded();
+
+    final ENRResponsePacketData deserialized = ENRResponsePacketData.readFrom(RLP.input(encoded));
+    assertThat(deserialized.getRequestHash()).isEqualTo(requestHash);
+    assertThat(deserialized.getEnr()).isEqualTo(nodeRecord);
+  }
+
+  @Test
+  public void writeTo() {
+    final Bytes requestHash = Bytes.fromHexStringLenient("0x1234");
+    final Bytes nodeId =
+        Bytes.fromHexString("a448f24c6d18e575453db13171562b71999873db5b286df957af199ec94617f7");
+    final Bytes privateKey =
+        Bytes.fromHexString("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291");
+
+    NodeRecord nodeRecord =
+        NodeRecordFactory.DEFAULT.createFromValues(
+            UInt64.ONE,
+            new EnrField(EnrField.ID, IdentitySchema.V4),
+            new EnrField(EnrField.IP_V4, Bytes.fromHexString("0x7F000001")),
+            new EnrField(EnrField.UDP, 30303),
+            new EnrField(
+                EnrField.PKEY_SECP256K1, Functions.derivePublicKeyFromPrivate(privateKey)));
+    nodeRecord.sign(privateKey);
+
+    assertThat(nodeRecord.getNodeId()).isEqualTo(nodeId);
+    assertThat(nodeRecord.asEnr())
+        .isEqualTo(
+            "enr:-IS4QHCYrYZbAKWCBRlAy5zzaDZXJBGkcnh4MHcBFZntXNFrdvJjX04jRzjzCBOonrkTfj499SZuOh8R33L"
+                + "s8RRcy5wBgmlkgnY0gmlwhH8AAAGJc2VjcDI1NmsxoQPKY0yuDUmstAHYpMa2_oxVtw0RW_QAdpzBQA8y"
+                + "WM0xOIN1ZHCCdl8");
+
+    BytesValueRLPOutput out = new BytesValueRLPOutput();
+    final ENRResponsePacketData packet = ENRResponsePacketData.create(requestHash, nodeRecord);
+    packet.writeTo(out);
+    final Bytes encoded = out.encoded();
+
+    final ENRResponsePacketData deserialized = ENRResponsePacketData.readFrom(RLP.input(encoded));
+    assertThat(deserialized.getRequestHash()).isEqualTo(requestHash);
+    assertThat(deserialized.getEnr()).isEqualTo(nodeRecord);
+  }
+
+  @Test
+  public void readFrom_withExtraFields() {
+    final Bytes requestHash = Bytes.fromHexStringLenient("0x1234");
+    final Bytes nodeId =
+        Bytes.fromHexString("a448f24c6d18e575453db13171562b71999873db5b286df957af199ec94617f7");
+    final Bytes privateKey =
+        Bytes.fromHexString("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291");
+
+    NodeRecord nodeRecord =
+        NodeRecordFactory.DEFAULT.createFromValues(
+            UInt64.ONE,
+            new EnrField(EnrField.ID, IdentitySchema.V4),
+            new EnrField(EnrField.IP_V4, Bytes.fromHexString("0x7F000001")),
+            new EnrField(EnrField.UDP, 30303),
+            new EnrField(EnrField.PKEY_SECP256K1, Functions.derivePublicKeyFromPrivate(privateKey)),
+            new EnrField("foo", Bytes.fromHexString("0x1234")));
+    nodeRecord.sign(privateKey);
+
+    assertThat(nodeRecord.getNodeId()).isEqualTo(nodeId);
+    assertThat(nodeRecord.asEnr())
+        .isEqualTo(
+            "enr:-Iu4QDokK026ShDdi-PmzNgTr-oaQEslAfoLuphwEznSx0xsVwD0KZV1m7k4enZpf0aEQmCYWZOgD4kptYE"
+                + "Fo2QKX28Bg2Zvb4ISNIJpZIJ2NIJpcIR_AAABiXNlY3AyNTZrMaEDymNMrg1JrLQB2KTGtv6MVbcNEVv0"
+                + "AHacwUAPMljNMTiDdWRwgnZf");
+
+    BytesValueRLPOutput out = new BytesValueRLPOutput();
+    out.startList();
+    out.writeBytes(requestHash);
+    out.writeRLPBytes(nodeRecord.serialize());
+    // Add random fields
+    out.writeLong(1234L);
+    out.endList();
+    final Bytes encoded = out.encoded();
+
+    final ENRResponsePacketData deserialized = ENRResponsePacketData.readFrom(RLP.input(encoded));
+    assertThat(deserialized.getRequestHash()).isEqualTo(requestHash);
+    assertThat(deserialized.getEnr()).isEqualTo(nodeRecord);
+  }
+
+  @Test
+  public void readFrom_invalidSignature() {
+    final Bytes requestHash = Bytes.fromHexStringLenient("0x1234");
+    final Bytes privateKey =
+        Bytes.fromHexString("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f292");
+
+    NodeRecord nodeRecord =
+        NodeRecordFactory.DEFAULT.createFromValues(
+            UInt64.ONE,
+            new EnrField(EnrField.ID, IdentitySchema.V4),
+            new EnrField(EnrField.IP_V4, Bytes.fromHexString("0x7F000001")),
+            new EnrField(EnrField.UDP, 30303),
+            new EnrField(
+                EnrField.PKEY_SECP256K1, Functions.derivePublicKeyFromPrivate(privateKey)));
+    nodeRecord.sign(privateKey);
+    nodeRecord.set(EnrField.UDP, 1234);
+
+    BytesValueRLPOutput out = new BytesValueRLPOutput();
+    out.startList();
+    out.writeBytes(requestHash);
+    out.writeRLPBytes(nodeRecord.serialize());
+    out.endList();
+    final Bytes encoded = out.encoded();
+
+    final ENRResponsePacketData deserialized = ENRResponsePacketData.readFrom(RLP.input(encoded));
+    assertThat(deserialized.getRequestHash()).isEqualTo(requestHash);
+    assertThat(deserialized.getEnr()).isEqualTo(nodeRecord);
+    assertThat(deserialized.getEnr().isValid()).isFalse();
+  }
+}
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/MockPacketDataFactory.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/MockPacketDataFactory.java
index d0e1de662de..c2982355983 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/MockPacketDataFactory.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/MockPacketDataFactory.java
@@ -26,6 +26,7 @@
 
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt64;
 
 class MockPacketDataFactory {
 
@@ -46,7 +47,8 @@ static Packet mockNeighborsPacket(final DiscoveryPeer from, final DiscoveryPeer.
   static Packet mockPongPacket(final DiscoveryPeer from, final Bytes pingHash) {
     final Packet packet = mock(Packet.class);
 
-    final PongPacketData pongPacketData = PongPacketData.create(from.getEndpoint(), pingHash);
+    final PongPacketData pongPacketData =
+        PongPacketData.create(from.getEndpoint(), pingHash, UInt64.ONE);
     when(packet.getPacketData(any())).thenReturn(Optional.of(pongPacketData));
     final Bytes id = from.getId();
     when(packet.getNodeId()).thenReturn(id);
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/MockPeerDiscoveryAgent.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/MockPeerDiscoveryAgent.java
index be369946531..ea6e1593b83 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/MockPeerDiscoveryAgent.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/MockPeerDiscoveryAgent.java
@@ -14,13 +14,16 @@
  */
 package org.hyperledger.besu.ethereum.p2p.discovery.internal;
 
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
+import static org.apache.tuweni.bytes.Bytes.wrapBuffer;
+
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.forkid.ForkIdManager;
 import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration;
 import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer;
 import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryAgent;
-import org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerDiscoveryController.AsyncExecutor;
 import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions;
+import org.hyperledger.besu.ethereum.p2p.rlpx.RlpxAgent;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.nat.NatService;
 
@@ -32,12 +35,12 @@
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MockPeerDiscoveryAgent extends PeerDiscoveryAgent {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(MockPeerDiscoveryAgent.class);
 
   // The set of known agents operating on the network
   private final Map<Bytes, MockPeerDiscoveryAgent> agentNetwork;
@@ -49,14 +52,18 @@ public MockPeerDiscoveryAgent(
       final DiscoveryConfiguration config,
       final PeerPermissions peerPermissions,
       final Map<Bytes, MockPeerDiscoveryAgent> agentNetwork,
-      final NatService natService) {
+      final NatService natService,
+      final ForkIdManager forkIdManager,
+      final RlpxAgent rlpxAgent) {
     super(
         nodeKey,
         config,
         peerPermissions,
         natService,
         new NoOpMetricsSystem(),
-        new InMemoryStorageProvider());
+        new InMemoryKeyValueStorageProvider(),
+        forkIdManager,
+        rlpxAgent);
     this.agentNetwork = agentNetwork;
   }
 
@@ -74,7 +81,8 @@ public void processIncomingPacket(final MockPeerDiscoveryAgent fromAgent, final
    * @return A list of packets received by this agent
    */
   public List<IncomingPacket> getIncomingPackets() {
-    List<IncomingPacket> packets = Arrays.asList(incomingPackets.toArray(new IncomingPacket[0]));
+    final List<IncomingPacket> packets =
+        Arrays.asList(incomingPackets.toArray(new IncomingPacket[0]));
     incomingPackets.clear();
     return packets;
   }
@@ -83,19 +91,20 @@ public List<IncomingPacket> getIncomingPackets() {
   protected CompletableFuture<InetSocketAddress> listenForConnections() {
     isRunning = true;
     // Skip network setup for tests
-    InetSocketAddress address = new InetSocketAddress(config.getBindHost(), config.getBindPort());
+    final InetSocketAddress address =
+        new InetSocketAddress(config.getBindHost(), config.getBindPort());
     return CompletableFuture.completedFuture(address);
   }
 
   @Override
   protected CompletableFuture<Void> sendOutgoingPacket(
       final DiscoveryPeer toPeer, final Packet packet) {
-    CompletableFuture<Void> result = new CompletableFuture<>();
+    final CompletableFuture<Void> result = new CompletableFuture<>();
     if (!this.isRunning) {
       result.completeExceptionally(new Exception("Attempt to send message from an inactive agent"));
     }
 
-    MockPeerDiscoveryAgent toAgent = agentNetwork.get(toPeer.getId());
+    final MockPeerDiscoveryAgent toAgent = agentNetwork.get(toPeer.getId());
     if (toAgent == null) {
       result.completeExceptionally(
           new Exception(
@@ -129,7 +138,7 @@ protected TimerUtil createTimer() {
   }
 
   @Override
-  protected AsyncExecutor createWorkerExecutor() {
+  protected PeerDiscoveryController.AsyncExecutor createWorkerExecutor() {
     return new BlockingAsyncExecutor();
   }
 
@@ -139,6 +148,16 @@ public CompletableFuture<?> stop() {
     return CompletableFuture.completedFuture(null);
   }
 
+  @Override
+  protected void handleOutgoingPacketError(
+      final Throwable err, final DiscoveryPeer peer, final Packet packet) {
+    LOG.warn(
+        "Sending to peer {} failed, packet: {}, stacktrace: {}",
+        peer,
+        wrapBuffer(packet.encode()),
+        err);
+  }
+
   public NodeKey getNodeKey() {
     return nodeKey;
   }
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PacketTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PacketTest.java
index 75267dab1d1..eeef2d4ddb9 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PacketTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PacketTest.java
@@ -15,20 +15,25 @@
 package org.hyperledger.besu.ethereum.p2p.discovery.internal;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.hyperledger.besu.ethereum.p2p.discovery.Endpoint;
+import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryPacketDecodingException;
 
 import java.util.Optional;
 
 import io.vertx.core.buffer.Buffer;
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt64;
 import org.bouncycastle.util.encoders.Hex;
 import org.junit.Test;
 
 public class PacketTest {
 
   private static final String VALID_PONG_PACKET =
-      "a1581c1705e744976d0341011c4490b3ab0b48283407ae5cf7526b948717489613ad897c4cf167117196d21352c15bcbaec23227b22eb92a15f5cd4b0a4ef98124a679935c16bd334fbd26be55ba4344843ac4710a3f3e3684d719d48c4980660002f2cb84b4b57a1a82040182765fa046896547d3b4259aa1a67bd26e7ec58ab4be650c5552ef0360caf9dae489d53b845b872dc8";
+      "3b3d56e4fcdcf714d6c29b0d521e9f4ec0dd50c73c0bbb9b44758a0a7e416ff30a3ea99de3e78a5cff82ad0a0b82030f78c6eff5a1b2a030276277b6e9b6ad7c35db1a6d5f83586a203b4537d82edc6b2820849a485e55aa06cfc680dc63c22d0002f3cb84b4b57a1a82040182765fa046896547d3b4259aa1a67bd26e7ec58ab4be650c5552ef0360caf9dae489d53b8460e5e7b603";
+  private static final String INVALID_SIGNATURE_PACKET =
+      "43f91d11b3338b4dbdf16db4f9fa25d7b4e2db81e6fd63f8f6884dfaea851e106f8f692c77169b387bde7c38832cf2d37a9b97b1553d07587ebe251ee21ee36e0ed54fd9218e3feea3bd13ca6982b25c204d5186e7ec5373ea664c91d42467b30102f3cb842f3ee37b82040e82765fa04139782abaccbc8fd290a7fde1ff138943fa9659f7bd67f97c97b09893d1ee8a84607806e108";
 
   @Test
   public void shouldDecodeValidPongPacket() {
@@ -42,15 +47,17 @@ public void shouldDecodeValidPongPacket() {
         .isEqualTo(
             Bytes.fromHexString(
                 "0x46896547d3b4259aa1a67bd26e7ec58ab4be650c5552ef0360caf9dae489d53b"));
-    assertThat(packetData.getExpiration()).isEqualTo(1535585736);
+    assertThat(packetData.getExpiration()).isEqualTo(1625679798);
+    assertThat(packetData.getEnrSeq().isPresent()).isTrue();
+    assertThat(packetData.getEnrSeq().get()).isEqualTo(UInt64.valueOf(3L));
     assertThat(packet.getNodeId())
         .isEqualTo(
             Bytes.fromHexString(
-                "0x669f45b66acf3b804c26ce13cfdd1f7e3d0ff4ed85060841b9af3af6dbfbacd05181e1c9363161446a307f3ca24e707856a01e4bf1eed5e1aefc14011a5c1c1c"));
+                "0x8cee393bcb969168690845905292da56f5eed661a2f332632c61be3d9171763825f8d520041d6dbf41b4d749a78ff73b6da286a5d7e88c52ac4dae26b9df4602"));
     assertThat(packet.getHash())
         .isEqualTo(
             Bytes.fromHexString(
-                "0xa1581c1705e744976d0341011c4490b3ab0b48283407ae5cf7526b9487174896"));
+                "0x3b3d56e4fcdcf714d6c29b0d521e9f4ec0dd50c73c0bbb9b44758a0a7e416ff3"));
   }
 
   @Test
@@ -59,6 +66,12 @@ public void shouldRoundTripPacket() {
     assertThat(Hex.toHexString(packet.encode().getBytes())).isEqualTo(VALID_PONG_PACKET);
   }
 
+  @Test
+  public void invalidSignatureShouldThrowPeerDiscoveryPacketDecodingException() {
+    assertThatThrownBy(() -> decode(INVALID_SIGNATURE_PACKET))
+        .isInstanceOf(PeerDiscoveryPacketDecodingException.class);
+  }
+
   private Packet decode(final String hexData) {
     return Packet.decode(Buffer.buffer(Hex.decode(hexData)));
   }
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryControllerDistanceCalculatorTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryControllerDistanceCalculatorTest.java
index f97e233e14a..f4634c15ea7 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryControllerDistanceCalculatorTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryControllerDistanceCalculatorTest.java
@@ -15,6 +15,7 @@
 package org.hyperledger.besu.ethereum.p2p.discovery.internal;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerDistanceCalculator.distance;
 
 import java.util.Random;
@@ -66,11 +67,11 @@ public void distance40() {
     assertThat(distance(id1, id2)).isEqualTo(40);
   }
 
-  @Test(expected = AssertionError.class)
+  @Test
   public void distance40_differentLengths() {
     final Bytes id1 = Bytes.fromHexString("0x8f19400000");
     final Bytes id2 = Bytes.fromHexString("0x0f1940000099");
-    assertThat(distance(id1, id2)).isEqualTo(40);
+    assertThatThrownBy(() -> distance(id1, id2)).isInstanceOf(AssertionError.class);
   }
 
   @Test
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryControllerTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryControllerTest.java
index 8cde8b1afca..bce73cdc66f 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryControllerTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryControllerTest.java
@@ -16,6 +16,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.argThat;
@@ -30,25 +31,30 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.crypto.NodeKey;
+import org.hyperledger.besu.crypto.Hash;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.ethereum.forkid.ForkId;
+import org.hyperledger.besu.ethereum.forkid.ForkIdManager;
 import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer;
 import org.hyperledger.besu.ethereum.p2p.discovery.Endpoint;
-import org.hyperledger.besu.ethereum.p2p.discovery.PeerBondedObserver;
 import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryStatus;
 import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryTestHelper;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions;
 import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions.Action;
 import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissionsDenylist;
+import org.hyperledger.besu.ethereum.p2p.rlpx.RlpxAgent;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.util.Subscribers;
 
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
@@ -56,11 +62,22 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+import com.google.common.base.Ticker;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.net.InetAddresses;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.bytes.MutableBytes;
 import org.apache.tuweni.units.bigints.UInt256;
+import org.apache.tuweni.units.bigints.UInt64;
 import org.assertj.core.api.Assertions;
+import org.ethereum.beacon.discovery.schema.EnrField;
+import org.ethereum.beacon.discovery.schema.IdentitySchema;
+import org.ethereum.beacon.discovery.schema.IdentitySchemaInterpreter;
+import org.ethereum.beacon.discovery.schema.NodeRecord;
+import org.ethereum.beacon.discovery.schema.NodeRecordFactory;
+import org.jetbrains.annotations.NotNull;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -68,7 +85,7 @@
 
 public class PeerDiscoveryControllerTest {
 
-  private static final byte MOST_SIGNFICANT_BIT_MASK = -128;
+  private static final byte MOST_SIGNIFICANT_BIT_MASK = -128;
   private static final PeerRequirement PEER_REQUIREMENT = () -> true;
   private static final long TABLE_REFRESH_INTERVAL_MS = TimeUnit.HOURS.toMillis(1);
   private PeerDiscoveryController controller;
@@ -121,7 +138,8 @@ public void bootstrapPeersRetriesSent() {
     // Mock the creation of the PING packet, so that we can control the hash,
     // which gets validated when receiving the PONG.
     final PingPacketData mockPing =
-        PingPacketData.create(localPeer.getEndpoint(), peers.get(0).getEndpoint());
+        PingPacketData.create(
+            Optional.ofNullable(localPeer.getEndpoint()), peers.get(0).getEndpoint(), UInt64.ONE);
     final Packet mockPacket = Packet.create(PacketType.PING, mockPing, nodeKeys.get(0));
     mockPingPacketCreation(mockPacket);
 
@@ -192,7 +210,8 @@ public void bootstrapPeersRetriesStoppedUponResponse() {
     // Mock the creation of the PING packet, so that we can control the hash,
     // which gets validated when receiving the PONG.
     final PingPacketData mockPing =
-        PingPacketData.create(localPeer.getEndpoint(), peers.get(0).getEndpoint());
+        PingPacketData.create(
+            Optional.ofNullable(localPeer.getEndpoint()), peers.get(0).getEndpoint(), UInt64.ONE);
     final Packet mockPacket = Packet.create(PacketType.PING, mockPing, nodeKeys.get(0));
     mockPingPacketCreation(mockPacket);
 
@@ -210,7 +229,7 @@ public void bootstrapPeersRetriesStoppedUponResponse() {
 
     // Simulate a PONG message from peer 0.
     final PongPacketData packetData =
-        PongPacketData.create(localPeer.getEndpoint(), mockPacket.getHash());
+        PongPacketData.create(localPeer.getEndpoint(), mockPacket.getHash(), UInt64.ONE);
     final Packet packet = Packet.create(PacketType.PONG, packetData, nodeKeys.get(0));
     controller.onMessage(packet, peers.get(0));
 
@@ -246,7 +265,8 @@ public void shouldStopRetryingInteractionWhenLimitIsReached() {
     // Mock the creation of the PING packet, so that we can control the hash,
     // which gets validated when receiving the PONG.
     final PingPacketData mockPing =
-        PingPacketData.create(localPeer.getEndpoint(), peers.get(0).getEndpoint());
+        PingPacketData.create(
+            Optional.ofNullable(localPeer.getEndpoint()), peers.get(0).getEndpoint(), UInt64.ONE);
     final Packet mockPacket = Packet.create(PacketType.PING, mockPing, nodeKeys.get(0));
     mockPingPacketCreation(mockPacket);
 
@@ -281,7 +301,8 @@ public void shouldRespondToPingRequest() {
     // Setup ping to be sent to discoPeer
     final List<NodeKey> nodeKeys = PeerDiscoveryTestHelper.generateNodeKeys(1);
     final PingPacketData pingPacketData =
-        PingPacketData.create(localEndpoint, discoPeer.getEndpoint());
+        PingPacketData.create(
+            Optional.ofNullable(localEndpoint), discoPeer.getEndpoint(), UInt64.ONE);
     final Packet discoPeerPing = Packet.create(PacketType.PING, pingPacketData, nodeKeys.get(0));
     mockPingPacketCreation(discoPeer, discoPeerPing);
 
@@ -310,9 +331,10 @@ public void shouldNotRespondToExpiredPingRequest() {
     final List<NodeKey> nodeKeys = PeerDiscoveryTestHelper.generateNodeKeys(1);
     final PingPacketData pingPacketData =
         PingPacketData.create(
-            localEndpoint,
+            Optional.ofNullable(localEndpoint),
             discoPeer.getEndpoint(),
-            Instant.now().getEpochSecond() - PacketData.DEFAULT_EXPIRATION_PERIOD_SEC);
+            Instant.now().getEpochSecond() - PacketData.DEFAULT_EXPIRATION_PERIOD_SEC,
+            UInt64.ONE);
     final Packet discoPeerPing = Packet.create(PacketType.PING, pingPacketData, nodeKeys.get(0));
     mockPingPacketCreation(discoPeer, discoPeerPing);
 
@@ -340,7 +362,8 @@ public void bootstrapPeersPongReceived_HashMatched() {
     // Mock the creation of the PING packet, so that we can control the hash, which gets validated
     // when receiving the PONG.
     final PingPacketData mockPing =
-        PingPacketData.create(localPeer.getEndpoint(), peers.get(0).getEndpoint());
+        PingPacketData.create(
+            Optional.ofNullable(localPeer.getEndpoint()), peers.get(0).getEndpoint(), UInt64.ONE);
     final Packet mockPacket = Packet.create(PacketType.PING, mockPing, nodeKeys.get(0));
     mockPingPacketCreation(mockPacket);
 
@@ -355,7 +378,7 @@ public void bootstrapPeersPongReceived_HashMatched() {
     // Simulate PONG messages from all peers
     for (int i = 0; i < 3; i++) {
       final PongPacketData packetData =
-          PongPacketData.create(localPeer.getEndpoint(), mockPacket.getHash());
+          PongPacketData.create(localPeer.getEndpoint(), mockPacket.getHash(), UInt64.ONE);
       final Packet packet0 = Packet.create(PacketType.PONG, packetData, nodeKeys.get(i));
       controller.onMessage(packet0, peers.get(i));
     }
@@ -400,7 +423,8 @@ public void bootstrapPeersPongReceived_HashUnmatched() {
     // when
     // processing the PONG.
     final PingPacketData mockPing =
-        PingPacketData.create(localPeer.getEndpoint(), peers.get(0).getEndpoint());
+        PingPacketData.create(
+            Optional.ofNullable(localPeer.getEndpoint()), peers.get(0).getEndpoint(), UInt64.ONE);
     final Packet mockPacket = Packet.create(PacketType.PING, mockPing, nodeKeys.get(0));
     mockPingPacketCreation(mockPacket);
 
@@ -414,7 +438,7 @@ public void bootstrapPeersPongReceived_HashUnmatched() {
 
     // Send a PONG packet from peer 1, with an incorrect hash.
     final PongPacketData packetData =
-        PongPacketData.create(localPeer.getEndpoint(), Bytes.fromHexString("1212"));
+        PongPacketData.create(localPeer.getEndpoint(), Bytes.fromHexString("1212"), UInt64.ONE);
     final Packet packet = Packet.create(PacketType.PONG, packetData, nodeKeys.get(1));
     controller.onMessage(packet, peers.get(1));
 
@@ -449,7 +473,8 @@ public void findNeighborsSentAfterBondingFinished() {
     // when
     // processing the PONG.
     final PingPacketData mockPing =
-        PingPacketData.create(localPeer.getEndpoint(), peers.get(0).getEndpoint());
+        PingPacketData.create(
+            Optional.ofNullable(localPeer.getEndpoint()), peers.get(0).getEndpoint(), UInt64.ONE);
     final Packet mockPacket = Packet.create(PacketType.PING, mockPing, nodeKeys.get(0));
     mockPingPacketCreation(mockPacket);
     controller.setRetryDelayFunction((prev) -> 999999999L);
@@ -492,7 +517,8 @@ private ControllerBuilder getControllerBuilder() {
 
   private void respondWithPong(
       final DiscoveryPeer discoveryPeer, final NodeKey nodeKey, final Bytes hash) {
-    final PongPacketData packetData0 = PongPacketData.create(localPeer.getEndpoint(), hash);
+    final PongPacketData packetData0 =
+        PongPacketData.create(localPeer.getEndpoint(), hash, UInt64.ONE);
     final Packet pongPacket0 = Packet.create(PacketType.PONG, packetData0, nodeKey);
     controller.onMessage(pongPacket0, discoveryPeer);
   }
@@ -514,7 +540,8 @@ public void peerSeenTwice() {
     // Mock the creation of the PING packet, so that we can control the hash, which gets validated
     // when processing the PONG.
     final PingPacketData pingPacketData =
-        PingPacketData.create(localPeer.getEndpoint(), peers.get(0).getEndpoint());
+        PingPacketData.create(
+            Optional.ofNullable(localPeer.getEndpoint()), peers.get(0).getEndpoint(), UInt64.ONE);
     final Packet pingPacket = Packet.create(PacketType.PING, pingPacketData, nodeKeys.get(0));
 
     mockPingPacketCreation(pingPacket);
@@ -540,7 +567,7 @@ public void peerSeenTwice() {
         .hasSize(1);
 
     final PongPacketData pongPacketData =
-        PongPacketData.create(localPeer.getEndpoint(), pingPacket.getHash());
+        PongPacketData.create(localPeer.getEndpoint(), pingPacket.getHash(), UInt64.ONE);
     final Packet pongPacket = Packet.create(PacketType.PONG, pongPacketData, nodeKeys.get(1));
     controller.onMessage(pongPacket, peers.get(1));
 
@@ -574,7 +601,7 @@ public void peerSeenTwice() {
 
     // Send a PONG packet from peer[2], to transition it to the BONDED state.
     final PongPacketData packetData2 =
-        PongPacketData.create(localPeer.getEndpoint(), pingPacket.getHash());
+        PongPacketData.create(localPeer.getEndpoint(), pingPacket.getHash(), UInt64.ONE);
     final Packet pongPacket2 = Packet.create(PacketType.PONG, packetData2, nodeKeys.get(2));
     controller.onMessage(pongPacket2, peers.get(2));
 
@@ -587,10 +614,10 @@ public void peerSeenTwice() {
         .send(eq(peers.get(2)), matchPacketOfType(PacketType.PING));
   }
 
-  @Test(expected = IllegalStateException.class)
+  @Test
   public void startTwice() {
     startPeerDiscoveryController();
-    controller.start();
+    assertThatThrownBy(() -> controller.start()).isInstanceOf(IllegalStateException.class);
   }
 
   @Test
@@ -637,19 +664,19 @@ public void shouldNotRemoveExistingPeerWhenReceivedPing() {
   }
 
   @Test
-  public void shouldNotAddNewPeerWhenReceivedPongFromBlacklistedPeer() {
+  public void shouldNotAddNewPeerWhenReceivedPongFromDenylistedPeer() {
     final List<DiscoveryPeer> peers = createPeersInLastBucket(localPeer, 3);
 
     final DiscoveryPeer discoPeer = peers.get(0);
     final DiscoveryPeer otherPeer = peers.get(1);
     final DiscoveryPeer otherPeer2 = peers.get(2);
 
-    final PeerPermissionsDenylist blacklist = PeerPermissionsDenylist.create();
+    final PeerPermissionsDenylist denylist = PeerPermissionsDenylist.create();
     final OutboundMessageHandler outboundMessageHandler = mock(OutboundMessageHandler.class);
     controller =
         getControllerBuilder()
             .peers(discoPeer)
-            .peerPermissions(blacklist)
+            .peerPermissions(denylist)
             .outboundMessageHandler(outboundMessageHandler)
             .build();
 
@@ -657,7 +684,9 @@ public void shouldNotAddNewPeerWhenReceivedPongFromBlacklistedPeer() {
 
     // Setup ping to be sent to discoPeer
     List<NodeKey> nodeKeys = PeerDiscoveryTestHelper.generateNodeKeys(1);
-    PingPacketData pingPacketData = PingPacketData.create(localEndpoint, discoPeer.getEndpoint());
+    PingPacketData pingPacketData =
+        PingPacketData.create(
+            Optional.ofNullable(localEndpoint), discoPeer.getEndpoint(), UInt64.ONE);
     final Packet discoPeerPing = Packet.create(PacketType.PING, pingPacketData, nodeKeys.get(0));
     mockPingPacketCreation(discoPeer, discoPeerPing);
 
@@ -674,13 +703,17 @@ public void shouldNotAddNewPeerWhenReceivedPongFromBlacklistedPeer() {
 
     // Setup ping to be sent to otherPeer after neighbors packet is received
     nodeKeys = PeerDiscoveryTestHelper.generateNodeKeys(1);
-    pingPacketData = PingPacketData.create(localEndpoint, otherPeer.getEndpoint());
+    pingPacketData =
+        PingPacketData.create(
+            Optional.ofNullable(localEndpoint), otherPeer.getEndpoint(), UInt64.ONE);
     final Packet pingPacket = Packet.create(PacketType.PING, pingPacketData, nodeKeys.get(0));
     mockPingPacketCreation(otherPeer, pingPacket);
 
     // Setup ping to be sent to otherPeer2 after neighbors packet is received
     nodeKeys = PeerDiscoveryTestHelper.generateNodeKeys(1);
-    pingPacketData = PingPacketData.create(localEndpoint, otherPeer2.getEndpoint());
+    pingPacketData =
+        PingPacketData.create(
+            Optional.ofNullable(localEndpoint), otherPeer2.getEndpoint(), UInt64.ONE);
     final Packet pingPacket2 = Packet.create(PacketType.PING, pingPacketData, nodeKeys.get(0));
     mockPingPacketCreation(otherPeer2, pingPacket2);
 
@@ -694,8 +727,8 @@ public void shouldNotAddNewPeerWhenReceivedPongFromBlacklistedPeer() {
     final Packet pongPacket = MockPacketDataFactory.mockPongPacket(otherPeer, pingPacket.getHash());
     controller.onMessage(pongPacket, otherPeer);
 
-    // Blacklist otherPeer2 before sending return pong
-    blacklist.add(otherPeer2);
+    // Denylist otherPeer2 before sending return pong
+    denylist.add(otherPeer2);
     final Packet pongPacket2 =
         MockPacketDataFactory.mockPongPacket(otherPeer2, pingPacket2.getHash());
     controller.onMessage(pongPacket2, otherPeer2);
@@ -715,19 +748,19 @@ private Packet matchPacketOfType(final PacketType type) {
   }
 
   @Test
-  public void shouldNotBondWithBlacklistedPeer() {
+  public void shouldNotBondWithDenylistedPeer() {
     final List<DiscoveryPeer> peers = createPeersInLastBucket(localPeer, 3);
 
     final DiscoveryPeer discoPeer = peers.get(0);
     final DiscoveryPeer otherPeer = peers.get(1);
     final DiscoveryPeer otherPeer2 = peers.get(2);
 
-    final PeerPermissionsDenylist blacklist = PeerPermissionsDenylist.create();
+    final PeerPermissionsDenylist denylist = PeerPermissionsDenylist.create();
     final OutboundMessageHandler outboundMessageHandler = mock(OutboundMessageHandler.class);
     controller =
         getControllerBuilder()
             .peers(discoPeer)
-            .peerPermissions(blacklist)
+            .peerPermissions(denylist)
             .outboundMessageHandler(outboundMessageHandler)
             .build();
 
@@ -735,7 +768,9 @@ public void shouldNotBondWithBlacklistedPeer() {
 
     // Setup ping to be sent to discoPeer
     List<NodeKey> nodeKeys = PeerDiscoveryTestHelper.generateNodeKeys(1);
-    PingPacketData pingPacketData = PingPacketData.create(localEndpoint, discoPeer.getEndpoint());
+    PingPacketData pingPacketData =
+        PingPacketData.create(
+            Optional.ofNullable(localEndpoint), discoPeer.getEndpoint(), UInt64.ONE);
     final Packet discoPeerPing = Packet.create(PacketType.PING, pingPacketData, nodeKeys.get(0));
     mockPingPacketCreation(discoPeer, discoPeerPing);
 
@@ -751,18 +786,22 @@ public void shouldNotBondWithBlacklistedPeer() {
 
     // Setup ping to be sent to otherPeer after neighbors packet is received
     nodeKeys = PeerDiscoveryTestHelper.generateNodeKeys(1);
-    pingPacketData = PingPacketData.create(localEndpoint, otherPeer.getEndpoint());
+    pingPacketData =
+        PingPacketData.create(
+            Optional.ofNullable(localEndpoint), otherPeer.getEndpoint(), UInt64.ONE);
     final Packet pingPacket = Packet.create(PacketType.PING, pingPacketData, nodeKeys.get(0));
     mockPingPacketCreation(otherPeer, pingPacket);
 
     // Setup ping to be sent to otherPeer2 after neighbors packet is received
     nodeKeys = PeerDiscoveryTestHelper.generateNodeKeys(1);
-    pingPacketData = PingPacketData.create(localEndpoint, otherPeer2.getEndpoint());
+    pingPacketData =
+        PingPacketData.create(
+            Optional.ofNullable(localEndpoint), otherPeer2.getEndpoint(), UInt64.ONE);
     final Packet pingPacket2 = Packet.create(PacketType.PING, pingPacketData, nodeKeys.get(0));
     mockPingPacketCreation(otherPeer2, pingPacket2);
 
-    // Blacklist peer
-    blacklist.add(otherPeer);
+    // Denylist peer
+    denylist.add(otherPeer);
 
     final Packet neighborsPacket =
         MockPacketDataFactory.mockNeighborsPacket(discoPeer, otherPeer, otherPeer2);
@@ -790,7 +829,8 @@ public void shouldRespondToNeighborsRequestFromKnownPeer() {
     // Setup ping to be sent to discoPeer
     final List<NodeKey> nodeKeys = PeerDiscoveryTestHelper.generateNodeKeys(1);
     final PingPacketData pingPacketData =
-        PingPacketData.create(localEndpoint, discoPeer.getEndpoint());
+        PingPacketData.create(
+            Optional.ofNullable(localEndpoint), discoPeer.getEndpoint(), UInt64.ONE);
     final Packet discoPeerPing = Packet.create(PacketType.PING, pingPacketData, nodeKeys.get(0));
     mockPingPacketCreation(discoPeer, discoPeerPing);
 
@@ -830,7 +870,8 @@ public void shouldNotRespondToNeighborsRequestFromUnknownPeer() {
     // Setup ping to be sent to discoPeer
     final List<NodeKey> nodeKeys = PeerDiscoveryTestHelper.generateNodeKeys(1);
     final PingPacketData pingPacketData =
-        PingPacketData.create(localEndpoint, discoPeer.getEndpoint());
+        PingPacketData.create(
+            Optional.ofNullable(localEndpoint), discoPeer.getEndpoint(), UInt64.ONE);
     final Packet discoPeerPing = Packet.create(PacketType.PING, pingPacketData, nodeKeys.get(0));
     mockPingPacketCreation(discoPeer, discoPeerPing);
 
@@ -869,7 +910,8 @@ public void shouldNotRespondToExpiredNeighborsRequest() {
     // Setup ping to be sent to discoPeer
     final List<NodeKey> nodeKeys = PeerDiscoveryTestHelper.generateNodeKeys(1);
     final PingPacketData pingPacketData =
-        PingPacketData.create(localEndpoint, discoPeer.getEndpoint());
+        PingPacketData.create(
+            Optional.ofNullable(localEndpoint), discoPeer.getEndpoint(), UInt64.ONE);
     final Packet discoPeerPing = Packet.create(PacketType.PING, pingPacketData, nodeKeys.get(0));
     mockPingPacketCreation(discoPeer, discoPeerPing);
 
@@ -893,17 +935,17 @@ public void shouldNotRespondToExpiredNeighborsRequest() {
   }
 
   @Test
-  public void shouldNotRespondToNeighborsRequestFromBlacklistedPeer() {
+  public void shouldNotRespondToNeighborsRequestFromDenylistedPeer() {
     final List<DiscoveryPeer> peers = createPeersInLastBucket(localPeer, 1);
 
     final DiscoveryPeer discoPeer = peers.get(0);
 
-    final PeerPermissionsDenylist blacklist = PeerPermissionsDenylist.create();
+    final PeerPermissionsDenylist denylist = PeerPermissionsDenylist.create();
     final OutboundMessageHandler outboundMessageHandler = mock(OutboundMessageHandler.class);
     controller =
         getControllerBuilder()
             .peers(discoPeer)
-            .peerPermissions(blacklist)
+            .peerPermissions(denylist)
             .outboundMessageHandler(outboundMessageHandler)
             .build();
 
@@ -912,7 +954,8 @@ public void shouldNotRespondToNeighborsRequestFromBlacklistedPeer() {
     // Setup ping to be sent to discoPeer
     final List<NodeKey> nodeKeys = PeerDiscoveryTestHelper.generateNodeKeys(1);
     final PingPacketData pingPacketData =
-        PingPacketData.create(localEndpoint, discoPeer.getEndpoint());
+        PingPacketData.create(
+            Optional.ofNullable(localEndpoint), discoPeer.getEndpoint(), UInt64.ONE);
     final Packet discoPeerPing = Packet.create(PacketType.PING, pingPacketData, nodeKeys.get(0));
     mockPingPacketCreation(discoPeer, discoPeerPing);
 
@@ -926,7 +969,7 @@ public void shouldNotRespondToNeighborsRequestFromBlacklistedPeer() {
     verify(outboundMessageHandler, times(1))
         .send(eq(discoPeer), matchPacketOfType(PacketType.FIND_NEIGHBORS));
 
-    blacklist.add(discoPeer);
+    denylist.add(discoPeer);
     final Packet findNeighborsPacket = MockPacketDataFactory.mockFindNeighborsPacket(discoPeer);
     controller.onMessage(findNeighborsPacket, discoPeer);
 
@@ -941,7 +984,8 @@ public void shouldAddNewPeerWhenReceivedPongAndPeerTableBucketIsNotFull() {
     // Mock the creation of the PING packet to control hash for PONG.
     final List<NodeKey> nodeKeys = PeerDiscoveryTestHelper.generateNodeKeys(1);
     final PingPacketData pingPacketData =
-        PingPacketData.create(localPeer.getEndpoint(), peers.get(0).getEndpoint());
+        PingPacketData.create(
+            Optional.ofNullable(localPeer.getEndpoint()), peers.get(0).getEndpoint(), UInt64.ONE);
     final Packet pingPacket = Packet.create(PacketType.PING, pingPacketData, nodeKeys.get(0));
 
     final OutboundMessageHandler outboundMessageHandler = mock(OutboundMessageHandler.class);
@@ -980,7 +1024,8 @@ public void shouldAddNewPeerWhenReceivedPongAndPeerTableBucketIsFull() {
     // Mock the creation of PING packets to control hash PONG packets.
     final List<NodeKey> nodeKeys = PeerDiscoveryTestHelper.generateNodeKeys(1);
     final PingPacketData pingPacketData =
-        PingPacketData.create(localPeer.getEndpoint(), peers.get(0).getEndpoint());
+        PingPacketData.create(
+            Optional.ofNullable(localPeer.getEndpoint()), peers.get(0).getEndpoint(), UInt64.ONE);
     final Packet pingPacket = Packet.create(PacketType.PING, pingPacketData, nodeKeys.get(0));
     mockPingPacketCreation(pingPacket);
 
@@ -1039,7 +1084,8 @@ public void shouldNotAddPeerInNeighborsPacketWithoutBonding() {
     // Mock the creation of the PING packet to control hash for PONG.
     final List<NodeKey> nodeKeys = PeerDiscoveryTestHelper.generateNodeKeys(1);
     final PingPacketData pingPacketData =
-        PingPacketData.create(localPeer.getEndpoint(), peers.get(0).getEndpoint());
+        PingPacketData.create(
+            Optional.ofNullable(localPeer.getEndpoint()), peers.get(0).getEndpoint(), UInt64.ONE);
     final Packet pingPacket = Packet.create(PacketType.PING, pingPacketData, nodeKeys.get(0));
 
     final OutboundMessageHandler outboundMessageHandler = mock(OutboundMessageHandler.class);
@@ -1073,11 +1119,13 @@ public void streamDiscoveredPeers() {
 
     final DiscoveryPeer localNode =
         DiscoveryPeer.fromEnode(
-            EnodeURL.builder()
+            EnodeURLImpl.builder()
                 .ipAddress("127.0.0.1")
                 .nodeId(Peer.randomId())
                 .discoveryAndListeningPorts(30303)
                 .build());
+    localNode.setNodeRecord(
+        NodeRecord.fromValues(IdentitySchemaInterpreter.V4, UInt64.ONE, Collections.emptyList()));
 
     controller =
         getControllerBuilder()
@@ -1111,11 +1159,13 @@ public void updatePermissions_restrictWithList() {
 
     final DiscoveryPeer localNode =
         DiscoveryPeer.fromEnode(
-            EnodeURL.builder()
+            EnodeURLImpl.builder()
                 .ipAddress("127.0.0.1")
                 .nodeId(Peer.randomId())
                 .discoveryAndListeningPorts(30303)
                 .build());
+    localNode.setNodeRecord(
+        NodeRecord.fromValues(IdentitySchemaInterpreter.V4, UInt64.ONE, Collections.emptyList()));
 
     controller =
         getControllerBuilder()
@@ -1155,11 +1205,13 @@ public void updatePermissions_restrictWithNoList() {
 
     final DiscoveryPeer localNode =
         DiscoveryPeer.fromEnode(
-            EnodeURL.builder()
+            EnodeURLImpl.builder()
                 .ipAddress("127.0.0.1")
                 .nodeId(Peer.randomId())
                 .discoveryAndListeningPorts(30303)
                 .build());
+    localNode.setNodeRecord(
+        NodeRecord.fromValues(IdentitySchemaInterpreter.V4, UInt64.ONE, Collections.emptyList()));
 
     controller =
         getControllerBuilder()
@@ -1201,11 +1253,13 @@ public void updatePermissions_relaxPermissionsWithList() {
 
     final DiscoveryPeer localNode =
         DiscoveryPeer.fromEnode(
-            EnodeURL.builder()
+            EnodeURLImpl.builder()
                 .ipAddress("127.0.0.1")
                 .nodeId(Peer.randomId())
                 .discoveryAndListeningPorts(30303)
                 .build());
+    localNode.setNodeRecord(
+        NodeRecord.fromValues(IdentitySchemaInterpreter.V4, UInt64.ONE, Collections.emptyList()));
 
     controller =
         getControllerBuilder()
@@ -1239,11 +1293,13 @@ public void updatePermissions_relaxPermissionsWithNoList() {
 
     final DiscoveryPeer localNode =
         DiscoveryPeer.fromEnode(
-            EnodeURL.builder()
+            EnodeURLImpl.builder()
                 .ipAddress("127.0.0.1")
                 .nodeId(Peer.randomId())
                 .discoveryAndListeningPorts(30303)
                 .build());
+    localNode.setNodeRecord(
+        NodeRecord.fromValues(IdentitySchemaInterpreter.V4, UInt64.ONE, Collections.emptyList()));
 
     controller =
         getControllerBuilder()
@@ -1266,11 +1322,338 @@ public void updatePermissions_relaxPermissionsWithNoList() {
     verify(controller, never()).dropPeer(any());
   }
 
+  @Test
+  public void shouldRespondToENRRequest() {
+    final List<DiscoveryPeer> peers = createPeersInLastBucket(localPeer, 1);
+
+    // Mock the creation of the PING packet to control hash for PONG.
+    final List<NodeKey> nodeKeys = PeerDiscoveryTestHelper.generateNodeKeys(1);
+    final PingPacketData pingPacketData =
+        PingPacketData.create(
+            Optional.ofNullable(localPeer.getEndpoint()), peers.get(0).getEndpoint(), UInt64.ONE);
+    final Packet pingPacket = Packet.create(PacketType.PING, pingPacketData, nodeKeys.get(0));
+
+    final OutboundMessageHandler outboundMessageHandler = mock(OutboundMessageHandler.class);
+    controller =
+        getControllerBuilder()
+            .peers(peers.get(0))
+            .outboundMessageHandler(outboundMessageHandler)
+            .build();
+    mockPingPacketCreation(pingPacket);
+    controller.start();
+    verify(outboundMessageHandler, times(1)).send(any(), matchPacketOfType(PacketType.PING));
+
+    final Packet pongPacket =
+        MockPacketDataFactory.mockPongPacket(peers.get(0), pingPacket.getHash());
+    controller.onMessage(pongPacket, peers.get(0));
+    assertThat(controller.streamDiscoveredPeers())
+        .filteredOn(p -> p.getStatus() == PeerDiscoveryStatus.BONDED)
+        .contains(peers.get(0));
+
+    final ENRRequestPacketData enrRequestPacketData = ENRRequestPacketData.create();
+    final Packet enrRequestPacket =
+        Packet.create(PacketType.ENR_REQUEST, enrRequestPacketData, nodeKeys.get(0));
+    controller.onMessage(enrRequestPacket, peers.get(0));
+    verify(outboundMessageHandler, times(1))
+        .send(any(), matchPacketOfType(PacketType.FIND_NEIGHBORS));
+    verify(outboundMessageHandler, times(1))
+        .send(any(), matchPacketOfType(PacketType.ENR_RESPONSE));
+  }
+
+  @Test
+  public void shouldNotRespondToENRRequestForNonBondedPeer() {
+    final List<NodeKey> nodeKeys = PeerDiscoveryTestHelper.generateNodeKeys(1);
+    final List<DiscoveryPeer> peers = helper.createDiscoveryPeers(nodeKeys);
+    final OutboundMessageHandler outboundMessageHandler = mock(OutboundMessageHandler.class);
+    controller =
+        getControllerBuilder()
+            .peers(peers.get(0))
+            .outboundMessageHandler(outboundMessageHandler)
+            .build();
+
+    final ENRRequestPacketData enrRequestPacketData = ENRRequestPacketData.create();
+    final Packet packet =
+        Packet.create(PacketType.ENR_REQUEST, enrRequestPacketData, nodeKeys.get(0));
+
+    controller.onMessage(packet, peers.get(0));
+
+    assertThat(controller.streamDiscoveredPeers())
+        .filteredOn(p -> p.getStatus() == PeerDiscoveryStatus.BONDED)
+        .hasSize(0);
+    verify(outboundMessageHandler, times(0))
+        .send(eq(peers.get(0)), matchPacketOfType(PacketType.ENR_REQUEST));
+  }
+
+  @Test
+  public void shouldRespondToRecentENRRequestAfterBonding() {
+    final List<NodeKey> nodeKeys = PeerDiscoveryTestHelper.generateNodeKeys(1);
+    final List<DiscoveryPeer> peers = helper.createDiscoveryPeers(nodeKeys);
+    final OutboundMessageHandler outboundMessageHandler = mock(OutboundMessageHandler.class);
+    controller =
+        getControllerBuilder()
+            .peers(peers.get(0))
+            .outboundMessageHandler(outboundMessageHandler)
+            .build();
+
+    // Mock the creation of the PING packet, so that we can control the hash, which gets validated
+    // when receiving the PONG.
+    final PingPacketData mockPing =
+        PingPacketData.create(
+            Optional.ofNullable(localPeer.getEndpoint()), peers.get(0).getEndpoint(), UInt64.ONE);
+    final Packet mockPacket = Packet.create(PacketType.PING, mockPing, nodeKeys.get(0));
+    mockPingPacketCreation(mockPacket);
+
+    controller.start();
+
+    final PongPacketData pongRequestPacketData =
+        PongPacketData.create(localPeer.getEndpoint(), mockPacket.getHash(), UInt64.ONE);
+
+    final ENRRequestPacketData enrRequestPacketData = ENRRequestPacketData.create();
+
+    final Packet enrPacket =
+        Packet.create(PacketType.ENR_REQUEST, enrRequestPacketData, nodeKeys.get(0));
+    final Packet pongPacket =
+        Packet.create(PacketType.PONG, pongRequestPacketData, nodeKeys.get(0));
+
+    controller.onMessage(enrPacket, peers.get(0));
+    verify(outboundMessageHandler, never()).send(any(), matchPacketOfType(PacketType.ENR_RESPONSE));
+    controller.onMessage(pongPacket, peers.get(0));
+
+    verify(outboundMessageHandler, times(1))
+        .send(any(), matchPacketOfType(PacketType.ENR_RESPONSE));
+  }
+
+  @Test
+  public void shouldNotRespondENRPriorToPong() {
+    final List<NodeKey> nodeKeys = PeerDiscoveryTestHelper.generateNodeKeys(1);
+    final List<DiscoveryPeer> peers = helper.createDiscoveryPeers(nodeKeys);
+    final OutboundMessageHandler outboundMessageHandler = mock(OutboundMessageHandler.class);
+    final Cache<Bytes, Packet> enrs =
+        CacheBuilder.newBuilder()
+            .maximumSize(50)
+            .expireAfterWrite(1, TimeUnit.NANOSECONDS)
+            .ticker(
+                new Ticker() {
+                  int tickCount = 1;
+
+                  @Override
+                  public long read() {
+                    return tickCount += 10;
+                  }
+                })
+            .build();
+    controller =
+        getControllerBuilder()
+            .peers(peers.get(0))
+            .outboundMessageHandler(outboundMessageHandler)
+            .enrCache(enrs)
+            .build();
+
+    // Mock the creation of the PING packet, so that we can control the hash, which gets validated
+    // when receiving the PONG.
+    final PingPacketData mockPing =
+        PingPacketData.create(
+            Optional.ofNullable(localPeer.getEndpoint()), peers.get(0).getEndpoint(), UInt64.ONE);
+    final Packet mockPacket = Packet.create(PacketType.PING, mockPing, nodeKeys.get(0));
+    mockPingPacketCreation(mockPacket);
+
+    controller.start();
+
+    final PongPacketData pongRequestPacketData =
+        PongPacketData.create(localPeer.getEndpoint(), mockPacket.getHash(), UInt64.ONE);
+
+    final ENRRequestPacketData enrRequestPacketData = ENRRequestPacketData.create();
+
+    final Packet enrPacket =
+        Packet.create(PacketType.ENR_REQUEST, enrRequestPacketData, nodeKeys.get(0));
+    final Packet pongPacket =
+        Packet.create(PacketType.PONG, pongRequestPacketData, nodeKeys.get(0));
+
+    controller.onMessage(enrPacket, peers.get(0));
+    enrs.cleanUp();
+    controller.onMessage(pongPacket, peers.get(0));
+
+    verify(outboundMessageHandler, never())
+        .send(
+            argThat((DiscoveryPeer peer) -> peer.equals(peers.get(0))),
+            matchPacketOfType(PacketType.ENR_RESPONSE));
+  }
+
+  @Test
+  public void shouldFiltersOnForkIdSuccess() {
+    final List<NodeKey> nodeKeys = PeerDiscoveryTestHelper.generateNodeKeys(1);
+    final List<DiscoveryPeer> peers = helper.createDiscoveryPeers(nodeKeys);
+    final ForkIdManager forkIdManager = mock(ForkIdManager.class);
+    final DiscoveryPeer sender = peers.get(0);
+    final Packet enrPacket = prepareForForkIdCheck(forkIdManager, nodeKeys, sender, true);
+
+    when(forkIdManager.peerCheck(any(ForkId.class))).thenReturn(true);
+    controller.onMessage(enrPacket, sender);
+
+    final Optional<DiscoveryPeer> maybePeer =
+        controller
+            .streamDiscoveredPeers()
+            .filter(p -> p.getId().equals(sender.getId()))
+            .findFirst();
+
+    assertThat(maybePeer.isPresent()).isTrue();
+    assertThat(maybePeer.get().getForkId().isPresent()).isTrue();
+    verify(controller, times(1)).connectOnRlpxLayer(eq(maybePeer.get()));
+  }
+
+  @Test
+  public void shouldFiltersOnForkIdFailure() {
+    final List<NodeKey> nodeKeys = PeerDiscoveryTestHelper.generateNodeKeys(1);
+    final List<DiscoveryPeer> peers = helper.createDiscoveryPeers(nodeKeys);
+    final ForkIdManager forkIdManager = mock(ForkIdManager.class);
+    final DiscoveryPeer sender = peers.get(0);
+    final Packet enrPacket = prepareForForkIdCheck(forkIdManager, nodeKeys, sender, true);
+
+    when(forkIdManager.peerCheck(any(ForkId.class))).thenReturn(false);
+    controller.onMessage(enrPacket, sender);
+
+    final Optional<DiscoveryPeer> maybePeer =
+        controller
+            .streamDiscoveredPeers()
+            .filter(p -> p.getId().equals(sender.getId()))
+            .findFirst();
+
+    assertThat(maybePeer.isPresent()).isTrue();
+    assertThat(maybePeer.get().getForkId().isPresent()).isTrue();
+    verify(controller, never()).connectOnRlpxLayer(eq(maybePeer.get()));
+  }
+
+  @Test
+  public void shouldStillCallConnectIfNoForkIdSent() {
+    final List<NodeKey> nodeKeys = PeerDiscoveryTestHelper.generateNodeKeys(1);
+    final List<DiscoveryPeer> peers = helper.createDiscoveryPeers(nodeKeys);
+    final DiscoveryPeer sender = peers.get(0);
+    final Packet enrPacket =
+        prepareForForkIdCheck(mock(ForkIdManager.class), nodeKeys, sender, false);
+
+    controller.onMessage(enrPacket, sender);
+
+    final Optional<DiscoveryPeer> maybePeer =
+        controller
+            .streamDiscoveredPeers()
+            .filter(p -> p.getId().equals(sender.getId()))
+            .findFirst();
+
+    assertThat(maybePeer.isPresent()).isTrue();
+    assertThat(maybePeer.get().getForkId().isPresent()).isFalse();
+    verify(controller, times(1)).connectOnRlpxLayer(eq(maybePeer.get()));
+  }
+
+  @NotNull
+  private Packet prepareForForkIdCheck(
+      final ForkIdManager forkIdManager,
+      final List<NodeKey> nodeKeys,
+      final DiscoveryPeer sender,
+      final boolean sendForkId) {
+    final HashMap<PacketType, Bytes> packetTypeBytesHashMap = new HashMap<>();
+    final OutboundMessageHandler outboundMessageHandler =
+        (dp, pa) -> packetTypeBytesHashMap.put(pa.getType(), pa.getHash());
+    final Cache<Bytes, Packet> enrs =
+        CacheBuilder.newBuilder()
+            .maximumSize(50)
+            .expireAfterWrite(1, TimeUnit.NANOSECONDS)
+            .ticker(
+                new Ticker() {
+                  int tickCount = 1;
+
+                  @Override
+                  public long read() {
+                    return tickCount += 10;
+                  }
+                })
+            .build();
+    controller =
+        getControllerBuilder()
+            .peers(sender)
+            .outboundMessageHandler(outboundMessageHandler)
+            .enrCache(enrs)
+            .filterOnForkId(true)
+            .forkIdManager(forkIdManager)
+            .build();
+
+    // Mock the creation of the PING packet, so that we can control the hash, which gets validated
+    // when receiving the PONG.
+    final PingPacketData mockPing =
+        PingPacketData.create(
+            Optional.ofNullable(localPeer.getEndpoint()), sender.getEndpoint(), UInt64.ONE);
+    final Packet mockPacket = Packet.create(PacketType.PING, mockPing, nodeKeys.get(0));
+    mockPingPacketCreation(mockPacket);
+
+    controller.start();
+
+    final PongPacketData pongRequestPacketData =
+        PongPacketData.create(localPeer.getEndpoint(), mockPacket.getHash(), UInt64.ONE);
+
+    final Packet pongPacket =
+        Packet.create(PacketType.PONG, pongRequestPacketData, nodeKeys.get(0));
+
+    controller.onMessage(pongPacket, sender);
+
+    final NodeRecord nodeRecord = createNodeRecord(nodeKeys.get(0), sendForkId);
+
+    final ENRResponsePacketData enrResponsePacketData =
+        ENRResponsePacketData.create(
+            packetTypeBytesHashMap.get(PacketType.ENR_REQUEST), nodeRecord);
+    final Packet enrPacket =
+        Packet.create(PacketType.ENR_RESPONSE, enrResponsePacketData, nodeKeys.get(0));
+    return enrPacket;
+  }
+
+  private NodeRecord createNodeRecord(final NodeKey nodeKey, final boolean sendForkId) {
+    final UInt64 sequenceNumber = UInt64.ZERO.add(1);
+    final NodeRecordFactory nodeRecordFactory = NodeRecordFactory.DEFAULT;
+    final SignatureAlgorithm signatureAlgorithm = SignatureAlgorithmFactory.getInstance();
+    final Bytes addressBytes = Bytes.of(InetAddresses.forString("127.0.0.1").getAddress());
+
+    final NodeRecord nodeRecord;
+    if (sendForkId) {
+      final Bytes forkIdHash = Bytes.fromHexString("0xfc64ec04");
+      final Bytes forkIdNext = Bytes.fromHexString("118c30");
+      final ArrayList<Bytes> forkIdBytesList = new ArrayList<>();
+      forkIdBytesList.add(0, forkIdHash);
+      forkIdBytesList.add(1, forkIdNext);
+      nodeRecord =
+          nodeRecordFactory.createFromValues(
+              sequenceNumber,
+              new EnrField(EnrField.ID, IdentitySchema.V4),
+              new EnrField(
+                  EnrField.PKEY_SECP256K1,
+                  signatureAlgorithm.compressPublicKey(nodeKey.getPublicKey())),
+              new EnrField(EnrField.IP_V4, addressBytes),
+              new EnrField(EnrField.TCP, 7890),
+              new EnrField(EnrField.UDP, 4871),
+              new EnrField("eth", Collections.singletonList(forkIdBytesList)));
+    } else {
+      nodeRecord =
+          nodeRecordFactory.createFromValues(
+              sequenceNumber,
+              new EnrField(EnrField.ID, IdentitySchema.V4),
+              new EnrField(
+                  EnrField.PKEY_SECP256K1,
+                  signatureAlgorithm.compressPublicKey(nodeKey.getPublicKey())),
+              new EnrField(EnrField.IP_V4, addressBytes),
+              new EnrField(EnrField.TCP, 7890),
+              new EnrField(EnrField.UDP, 4871));
+    }
+    nodeRecord.setSignature(
+        nodeKey
+            .sign(Hash.keccak256(nodeRecord.serializeNoSignature()))
+            .encodedBytes()
+            .slice(0, 64));
+    return nodeRecord;
+  }
+
   private static Packet mockPingPacket(final DiscoveryPeer from, final DiscoveryPeer to) {
     final Packet packet = mock(Packet.class);
 
     final PingPacketData pingPacketData =
-        PingPacketData.create(from.getEndpoint(), to.getEndpoint());
+        PingPacketData.create(
+            Optional.ofNullable(from.getEndpoint()), to.getEndpoint(), UInt64.ONE);
     when(packet.getPacketData(any())).thenReturn(Optional.of(pingPacketData));
     final Bytes id = from.getId();
     when(packet.getNodeId()).thenReturn(id);
@@ -1288,22 +1671,23 @@ private List<DiscoveryPeer> createPeersInLastBucket(final Peer host, final int n
     final Bytes32 keccak256 = host.keccak256();
     final MutableBytes template = MutableBytes.create(keccak256.size());
     byte msb = keccak256.get(0);
-    msb ^= MOST_SIGNFICANT_BIT_MASK;
+    msb ^= MOST_SIGNIFICANT_BIT_MASK;
     template.set(0, msb);
 
     for (int i = 0; i < n; i++) {
       template.setInt(template.size() - 4, i);
       final Bytes32 keccak = Bytes32.leftPad(template.copy());
       final MutableBytes id = MutableBytes.create(64);
-      UInt256.valueOf(i).toBytes().copyTo(id, id.size() - Bytes32.SIZE);
+      UInt256.valueOf(i).copyTo(id, id.size() - Bytes32.SIZE);
       final DiscoveryPeer peer =
           spy(
               DiscoveryPeer.fromEnode(
-                  EnodeURL.builder()
+                  EnodeURLImpl.builder()
                       .nodeId(id)
                       .ipAddress("127.0.0.1")
                       .discoveryAndListeningPorts(100 + counter.incrementAndGet())
                       .build()));
+
       doReturn(keccak).when(peer).keccak256();
       newPeers.add(peer);
     }
@@ -1331,13 +1715,22 @@ static class ControllerBuilder {
     private PeerTable peerTable;
     private OutboundMessageHandler outboundMessageHandler = OutboundMessageHandler.NOOP;
     private static final PeerDiscoveryTestHelper helper = new PeerDiscoveryTestHelper();
-    private final Subscribers<PeerBondedObserver> peerBondedObservers = Subscribers.create();
     private PeerPermissions peerPermissions = PeerPermissions.noop();
 
+    private Cache<Bytes, Packet> enrs =
+        CacheBuilder.newBuilder().maximumSize(50).expireAfterWrite(10, TimeUnit.SECONDS).build();
+    private boolean filterOnForkId = false;
+    private ForkIdManager forkIdManager;
+
     public static ControllerBuilder create() {
       return new ControllerBuilder();
     }
 
+    ControllerBuilder enrCache(final Cache<Bytes, Packet> cacheToUse) {
+      this.enrs = cacheToUse;
+      return this;
+    }
+
     ControllerBuilder peers(final Collection<DiscoveryPeer> discoPeers) {
       this.discoPeers = discoPeers;
       return this;
@@ -1378,6 +1771,16 @@ ControllerBuilder outboundMessageHandler(final OutboundMessageHandler outboundMe
       return this;
     }
 
+    public ControllerBuilder filterOnForkId(final boolean filterOnForkId) {
+      this.filterOnForkId = filterOnForkId;
+      return this;
+    }
+
+    public ControllerBuilder forkIdManager(final ForkIdManager forkIdManager) {
+      this.forkIdManager = forkIdManager;
+      return this;
+    }
+
     PeerDiscoveryController build() {
       checkNotNull(nodeKey);
       if (localPeer == null) {
@@ -1398,8 +1801,11 @@ PeerDiscoveryController build() {
               .tableRefreshIntervalMs(TABLE_REFRESH_INTERVAL_MS)
               .peerRequirement(PEER_REQUIREMENT)
               .peerPermissions(peerPermissions)
-              .peerBondedObservers(peerBondedObservers)
               .metricsSystem(new NoOpMetricsSystem())
+              .cacheForEnrRequests(enrs)
+              .forkIdManager(forkIdManager == null ? mock(ForkIdManager.class) : forkIdManager)
+              .filterOnEnrForkId(filterOnForkId)
+              .rlpxAgent(mock(RlpxAgent.class))
               .build());
     }
   }
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryTableRefreshTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryTableRefreshTest.java
index cd6a308ab17..d607d4d5023 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryTableRefreshTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerDiscoveryTableRefreshTest.java
@@ -23,12 +23,13 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
-import org.hyperledger.besu.crypto.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.ethereum.forkid.ForkIdManager;
 import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer;
 import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryStatus;
 import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryTestHelper;
+import org.hyperledger.besu.ethereum.p2p.rlpx.RlpxAgent;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.util.Subscribers;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -38,6 +39,7 @@
 import java.util.stream.Collectors;
 
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt64;
 import org.assertj.core.api.Assertions;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
@@ -68,13 +70,15 @@ public void tableRefreshSingleNode() {
                 .timerUtil(timer)
                 .workerExecutor(new BlockingAsyncExecutor())
                 .tableRefreshIntervalMs(0)
-                .peerBondedObservers(Subscribers.create())
                 .metricsSystem(new NoOpMetricsSystem())
+                .rlpxAgent(mock(RlpxAgent.class))
+                .forkIdManager(mock(ForkIdManager.class))
                 .build());
     controller.start();
 
     final PingPacketData mockPing =
-        PingPacketData.create(localPeer.getEndpoint(), remotePeer.getEndpoint());
+        PingPacketData.create(
+            Optional.ofNullable(localPeer.getEndpoint()), remotePeer.getEndpoint(), UInt64.ONE);
     final Packet mockPingPacket = Packet.create(PacketType.PING, mockPing, localKeyPair);
 
     doAnswer(
@@ -88,13 +92,14 @@ public void tableRefreshSingleNode() {
 
     // Send a PING, so as to add a Peer in the controller.
     final PingPacketData ping =
-        PingPacketData.create(remotePeer.getEndpoint(), localPeer.getEndpoint());
+        PingPacketData.create(
+            Optional.ofNullable(remotePeer.getEndpoint()), localPeer.getEndpoint(), UInt64.ONE);
     final Packet pingPacket = Packet.create(PacketType.PING, ping, remoteKeyPair);
     controller.onMessage(pingPacket, remotePeer);
 
     // Answer localPeer PING to complete bonding
     final PongPacketData pong =
-        PongPacketData.create(localPeer.getEndpoint(), mockPingPacket.getHash());
+        PongPacketData.create(localPeer.getEndpoint(), mockPingPacket.getHash(), UInt64.ONE);
     final Packet pongPacket = Packet.create(PacketType.PONG, pong, remoteKeyPair);
     controller.onMessage(pongPacket, remotePeer);
 
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerTableTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerTableTest.java
index 4fb3bb2ef8e..f3283d35f51 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerTableTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PeerTableTest.java
@@ -16,23 +16,29 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
 import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer;
 import org.hyperledger.besu.ethereum.p2p.discovery.Endpoint;
 import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryTestHelper;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerTable.AddResult.AddOutcome;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerTable.EvictResult;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.PeerTable.EvictResult.EvictOutcome;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 
 import java.util.List;
 import java.util.Optional;
 
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import org.apache.tuweni.bytes.Bytes;
 import org.junit.Test;
 
 public class PeerTableTest {
+
+  private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+      Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
   private final PeerDiscoveryTestHelper helper = new PeerDiscoveryTestHelper();
 
   @Test
@@ -52,7 +58,7 @@ public void addPeer() {
   public void addSelf() {
     final DiscoveryPeer localPeer =
         DiscoveryPeer.fromEnode(
-            EnodeURL.builder()
+            EnodeURLImpl.builder()
                 .nodeId(Peer.randomId())
                 .ipAddress("127.0.0.1")
                 .discoveryAndListeningPorts(12345)
@@ -82,7 +88,8 @@ public void peerExists() {
   @Test
   public void peerExists_withDifferentIp() {
     final PeerTable table = new PeerTable(Peer.randomId(), 16);
-    final Bytes peerId = KeyPair.generate().getPublicKey().getEncodedBytes();
+    final Bytes peerId =
+        SIGNATURE_ALGORITHM.get().generateKeyPair().getPublicKey().getEncodedBytes();
     final DiscoveryPeer peer =
         DiscoveryPeer.fromIdAndEndpoint(peerId, new Endpoint("1.1.1.1", 30303, Optional.empty()));
 
@@ -101,7 +108,8 @@ public void peerExists_withDifferentIp() {
   @Test
   public void peerExists_withDifferentUdpPort() {
     final PeerTable table = new PeerTable(Peer.randomId(), 16);
-    final Bytes peerId = KeyPair.generate().getPublicKey().getEncodedBytes();
+    final Bytes peerId =
+        SIGNATURE_ALGORITHM.get().generateKeyPair().getPublicKey().getEncodedBytes();
     final DiscoveryPeer peer =
         DiscoveryPeer.fromIdAndEndpoint(peerId, new Endpoint("1.1.1.1", 30303, Optional.empty()));
 
@@ -120,7 +128,8 @@ public void peerExists_withDifferentUdpPort() {
   @Test
   public void peerExists_withDifferentIdAndUdpPort() {
     final PeerTable table = new PeerTable(Peer.randomId(), 16);
-    final Bytes peerId = KeyPair.generate().getPublicKey().getEncodedBytes();
+    final Bytes peerId =
+        SIGNATURE_ALGORITHM.get().generateKeyPair().getPublicKey().getEncodedBytes();
     final DiscoveryPeer peer =
         DiscoveryPeer.fromIdAndEndpoint(peerId, new Endpoint("1.1.1.1", 30303, Optional.empty()));
 
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PingPacketDataTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PingPacketDataTest.java
index fe811a13eb4..89afd235a35 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PingPacketDataTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PingPacketDataTest.java
@@ -19,11 +19,13 @@
 import org.hyperledger.besu.ethereum.p2p.discovery.Endpoint;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
 import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.rlp.RLPOutput;
 
 import java.time.Instant;
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt64;
 import org.junit.Test;
 
 public class PingPacketDataTest {
@@ -34,13 +36,16 @@ public void serializeDeserialize() {
 
     final Endpoint from = new Endpoint("127.0.0.1", 30303, Optional.of(30303));
     final Endpoint to = new Endpoint("127.0.0.2", 30303, Optional.empty());
-    final PingPacketData packet = PingPacketData.create(from, to);
+    final UInt64 enrSeq = UInt64.ONE;
+    final PingPacketData packet = PingPacketData.create(Optional.of(from), to, enrSeq);
     final Bytes serialized = RLP.encode(packet::writeTo);
     final PingPacketData deserialized = PingPacketData.readFrom(RLP.input(serialized));
 
     assertThat(deserialized.getFrom()).contains(from);
     assertThat(deserialized.getTo()).isEqualTo(to);
     assertThat(deserialized.getExpiration()).isGreaterThan(currentTimeSec);
+    assertThat(deserialized.getEnrSeq().isPresent()).isTrue();
+    assertThat(deserialized.getEnrSeq().get()).isEqualTo(enrSeq);
   }
 
   @Test
@@ -49,6 +54,7 @@ public void readFrom() {
     final Endpoint from = new Endpoint("127.0.0.1", 30303, Optional.of(30303));
     final Endpoint to = new Endpoint("127.0.0.2", 30303, Optional.empty());
     final long time = System.currentTimeMillis();
+    final UInt64 enrSeq = UInt64.ONE;
 
     final BytesValueRLPOutput out = new BytesValueRLPOutput();
     out.startList();
@@ -56,6 +62,7 @@ public void readFrom() {
     from.encodeStandalone(out);
     to.encodeStandalone(out);
     out.writeLongScalar(time);
+    out.writeLongScalar(enrSeq.toLong());
     out.endList();
 
     final Bytes serialized = out.encoded();
@@ -64,6 +71,134 @@ public void readFrom() {
     assertThat(deserialized.getFrom()).contains(from);
     assertThat(deserialized.getTo()).isEqualTo(to);
     assertThat(deserialized.getExpiration()).isEqualTo(time);
+    assertThat(deserialized.getEnrSeq().isPresent()).isTrue();
+    assertThat(deserialized.getEnrSeq().get()).isEqualTo(enrSeq);
+  }
+
+  @Test
+  public void handlesNullEnr() {
+    final int version = 4;
+    final Endpoint from = new Endpoint("127.0.0.1", 30303, Optional.of(30303));
+    final Endpoint to = new Endpoint("127.0.0.2", 30303, Optional.empty());
+    final long time = System.currentTimeMillis();
+
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    out.startList();
+    out.writeIntScalar(version);
+    from.encodeStandalone(out);
+    to.encodeStandalone(out);
+    out.writeLongScalar(time);
+    out.endList();
+
+    final Bytes serialized = out.encoded();
+    final PingPacketData deserialized = PingPacketData.readFrom(RLP.input(serialized));
+
+    assertThat(deserialized.getFrom()).contains(from);
+    assertThat(deserialized.getTo()).isEqualTo(to);
+    assertThat(deserialized.getExpiration()).isEqualTo(time);
+    assertThat(deserialized.getEnrSeq().isPresent()).isFalse();
+  }
+
+  @Test
+  public void handlesLegacyENREncode() {
+    final int version = 4;
+    final Endpoint from = new Endpoint("127.0.0.1", 30303, Optional.of(30303));
+    final Endpoint to = new Endpoint("127.0.0.2", 30303, Optional.empty());
+    final long time = System.currentTimeMillis();
+    final UInt64 enrSeq = UInt64.ONE;
+
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    out.startList();
+    out.writeIntScalar(version);
+    from.encodeStandalone(out);
+    to.encodeStandalone(out);
+    out.writeLongScalar(time);
+    out.writeBytes(enrSeq.toBytes());
+    out.endList();
+
+    final Bytes serialized = out.encoded();
+    final PingPacketData deserialized = PingPacketData.readFrom(RLP.input(serialized));
+
+    assertThat(deserialized.getFrom()).contains(from);
+    assertThat(deserialized.getTo()).isEqualTo(to);
+    assertThat(deserialized.getExpiration()).isEqualTo(time);
+    assertThat(deserialized.getEnrSeq().isPresent()).isTrue();
+    assertThat(deserialized.getEnrSeq().get()).isEqualTo(enrSeq);
+  }
+
+  @Test
+  public void handleOptionalSourceIP() {
+
+    final Endpoint to = new Endpoint("127.0.0.2", 30303, Optional.empty());
+    final long time = System.currentTimeMillis();
+    final UInt64 enrSeq = UInt64.ONE;
+
+    final PingPacketData anon = PingPacketData.create(Optional.empty(), to, time, enrSeq);
+
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    anon.writeTo(out);
+    final Bytes serialized = out.encoded();
+    System.out.println(serialized.toHexString());
+    final PingPacketData deserialized = PingPacketData.readFrom(RLP.input(serialized));
+
+    assertThat(deserialized.getFrom()).isEmpty();
+    assertThat(deserialized.getTo()).isEqualTo(to);
+    assertThat(deserialized.getExpiration()).isEqualTo(time);
+    assertThat(deserialized.getEnrSeq().isPresent()).isTrue();
+    assertThat(deserialized.getEnrSeq().get()).isEqualTo(enrSeq);
+  }
+
+  @Test
+  public void handleSourcePortNullHost() {
+    final Endpoint to = new Endpoint("127.0.0.2", 30303, Optional.empty());
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    final UInt64 enrSeq = UInt64.MAX_VALUE;
+    final long time = System.currentTimeMillis();
+
+    out.startList();
+    out.writeIntScalar(4);
+
+    ((RLPOutput) out).startList();
+    out.writeNull();
+    out.writeIntScalar(30303);
+    out.writeNull();
+    ((RLPOutput) out).endList();
+
+    to.encodeStandalone(out);
+    out.writeLongScalar(time);
+    out.writeBigIntegerScalar(enrSeq.toBigInteger());
+    out.endList();
+
+    final Bytes serialized = out.encoded();
+    final PingPacketData deserialized = PingPacketData.readFrom(RLP.input(serialized));
+
+    assertThat(deserialized.getFrom()).isPresent();
+    assertThat(deserialized.getFrom().get().getUdpPort()).isEqualTo(30303);
+    assertThat(deserialized.getFrom().get().getHost().isEmpty()).isTrue();
+    assertThat(deserialized.getFrom().get().getTcpPort().isEmpty()).isTrue();
+
+    assertThat(deserialized.getTo()).isEqualTo(to);
+    assertThat(deserialized.getExpiration()).isEqualTo(time);
+    assertThat(deserialized.getEnrSeq().isPresent()).isTrue();
+    assertThat(deserialized.getEnrSeq().get()).isEqualTo(enrSeq);
+  }
+
+  @Test
+  public void legacyHandlesScalarEncode() {
+    final Endpoint from = new Endpoint("127.0.0.1", 30303, Optional.of(30303));
+    final Endpoint to = new Endpoint("127.0.0.2", 30303, Optional.empty());
+    final UInt64 enrSeq = UInt64.MAX_VALUE;
+    final PingPacketData ping = PingPacketData.create(Optional.of(from), to, enrSeq);
+
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    ping.writeTo(out);
+
+    final PingPacketData legacyPing = PingPacketData.legacyReadFrom(RLP.input(out.encoded()));
+
+    assertThat(legacyPing.getFrom().get()).isEqualTo(from);
+    assertThat(legacyPing.getTo()).isEqualTo(to);
+    assertThat(legacyPing.getEnrSeq().isPresent()).isTrue();
+    assertThat(legacyPing.getEnrSeq().get()).isEqualTo(enrSeq);
   }
 
   @Test
@@ -72,6 +207,7 @@ public void readFrom_withExtraFields() {
     final Endpoint from = new Endpoint("127.0.0.1", 30303, Optional.of(30303));
     final Endpoint to = new Endpoint("127.0.0.2", 30303, Optional.empty());
     final long time = System.currentTimeMillis();
+    final UInt64 enrSeq = UInt64.ONE;
 
     final BytesValueRLPOutput out = new BytesValueRLPOutput();
     out.startList();
@@ -79,6 +215,7 @@ public void readFrom_withExtraFields() {
     from.encodeStandalone(out);
     to.encodeStandalone(out);
     out.writeLongScalar(time);
+    out.writeLongScalar(enrSeq.toLong());
     // Add extra field
     out.writeLongScalar(11);
     out.endList();
@@ -89,6 +226,8 @@ public void readFrom_withExtraFields() {
     assertThat(deserialized.getFrom()).contains(from);
     assertThat(deserialized.getTo()).isEqualTo(to);
     assertThat(deserialized.getExpiration()).isEqualTo(time);
+    assertThat(deserialized.getEnrSeq().isPresent()).isTrue();
+    assertThat(deserialized.getEnrSeq().get()).isEqualTo(enrSeq);
   }
 
   @Test
@@ -97,6 +236,7 @@ public void readFrom_unknownVersion() {
     final Endpoint from = new Endpoint("127.0.0.1", 30303, Optional.of(30303));
     final Endpoint to = new Endpoint("127.0.0.2", 30303, Optional.empty());
     final long time = System.currentTimeMillis();
+    final UInt64 enrSeq = UInt64.ONE;
 
     final BytesValueRLPOutput out = new BytesValueRLPOutput();
     out.startList();
@@ -104,6 +244,7 @@ public void readFrom_unknownVersion() {
     from.encodeStandalone(out);
     to.encodeStandalone(out);
     out.writeLongScalar(time);
+    out.writeLongScalar(enrSeq.toLong());
     out.endList();
 
     final Bytes serialized = out.encoded();
@@ -112,6 +253,8 @@ public void readFrom_unknownVersion() {
     assertThat(deserialized.getFrom()).contains(from);
     assertThat(deserialized.getTo()).isEqualTo(to);
     assertThat(deserialized.getExpiration()).isEqualTo(time);
+    assertThat(deserialized.getEnrSeq().isPresent()).isTrue();
+    assertThat(deserialized.getEnrSeq().get()).isEqualTo(enrSeq);
   }
 
   @Test
@@ -120,6 +263,7 @@ public void readFrom_lowPortValues() {
     final Endpoint from = new Endpoint("0.1.2.1", 1, Optional.of(1));
     final Endpoint to = new Endpoint("127.0.0.2", 30303, Optional.empty());
     final long time = System.currentTimeMillis();
+    final UInt64 enrSeq = UInt64.ONE;
 
     final BytesValueRLPOutput out = new BytesValueRLPOutput();
     out.startList();
@@ -127,6 +271,7 @@ public void readFrom_lowPortValues() {
     from.encodeStandalone(out);
     to.encodeStandalone(out);
     out.writeLongScalar(time);
+    out.writeLongScalar(enrSeq.toLong());
     out.endList();
 
     final Bytes serialized = out.encoded();
@@ -135,5 +280,7 @@ public void readFrom_lowPortValues() {
     assertThat(deserialized.getFrom()).contains(from);
     assertThat(deserialized.getTo()).isEqualTo(to);
     assertThat(deserialized.getExpiration()).isEqualTo(time);
+    assertThat(deserialized.getEnrSeq().isPresent()).isTrue();
+    assertThat(deserialized.getEnrSeq().get()).isEqualTo(enrSeq);
   }
 }
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PongPacketDataTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PongPacketDataTest.java
index 287bbf469d8..0d13604a57d 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PongPacketDataTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/PongPacketDataTest.java
@@ -25,6 +25,7 @@
 
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt64;
 import org.junit.Test;
 
 public class PongPacketDataTest {
@@ -34,14 +35,17 @@ public void serializeDeserialize() {
     final long currentTimeSec = Instant.now().getEpochSecond();
     final Endpoint to = new Endpoint("127.0.0.2", 30303, Optional.empty());
     final Bytes32 hash = Bytes32.fromHexStringLenient("0x1234");
+    final UInt64 enrSeq = UInt64.ONE;
 
-    final PongPacketData packet = PongPacketData.create(to, hash);
+    final PongPacketData packet = PongPacketData.create(to, hash, enrSeq);
     final Bytes serialized = RLP.encode(packet::writeTo);
     final PongPacketData deserialized = PongPacketData.readFrom(RLP.input(serialized));
 
     assertThat(deserialized.getTo()).isEqualTo(to);
     assertThat(deserialized.getPingHash()).isEqualTo(hash);
     assertThat(deserialized.getExpiration()).isGreaterThan(currentTimeSec);
+    assertThat(deserialized.getEnrSeq().isPresent()).isTrue();
+    assertThat(deserialized.getEnrSeq().get()).isEqualTo(enrSeq);
   }
 
   @Test
@@ -49,12 +53,14 @@ public void readFrom() {
     final long time = System.currentTimeMillis();
     final Endpoint to = new Endpoint("127.0.0.2", 30303, Optional.empty());
     final Bytes32 hash = Bytes32.fromHexStringLenient("0x1234");
+    final UInt64 enrSeq = UInt64.ONE;
 
     BytesValueRLPOutput out = new BytesValueRLPOutput();
     out.startList();
     to.encodeStandalone(out);
     out.writeBytes(hash);
     out.writeLongScalar(time);
+    out.writeLongScalar(enrSeq.toLong());
     out.endList();
     final Bytes encoded = out.encoded();
 
@@ -62,6 +68,51 @@ public void readFrom() {
     assertThat(deserialized.getTo()).isEqualTo(to);
     assertThat(deserialized.getPingHash()).isEqualTo(hash);
     assertThat(deserialized.getExpiration()).isEqualTo(time);
+    assertThat(deserialized.getEnrSeq().isPresent()).isTrue();
+    assertThat(deserialized.getEnrSeq().get()).isEqualTo(enrSeq);
+  }
+
+  @Test
+  public void handlesLegacyENREncode() {
+    final long time = System.currentTimeMillis();
+    final Endpoint to = new Endpoint("127.0.0.2", 30303, Optional.empty());
+    final Bytes32 hash = Bytes32.fromHexStringLenient("0x1234");
+    final UInt64 enrSeq = UInt64.ONE;
+
+    BytesValueRLPOutput out = new BytesValueRLPOutput();
+    out.startList();
+    to.encodeStandalone(out);
+    out.writeBytes(hash);
+    out.writeLongScalar(time);
+    out.writeBytes(enrSeq.toBytes());
+    out.endList();
+    final Bytes encoded = out.encoded();
+
+    final PongPacketData deserialized = PongPacketData.readFrom(RLP.input(encoded));
+    assertThat(deserialized.getTo()).isEqualTo(to);
+    assertThat(deserialized.getPingHash()).isEqualTo(hash);
+    assertThat(deserialized.getExpiration()).isEqualTo(time);
+    assertThat(deserialized.getEnrSeq().isPresent()).isTrue();
+    assertThat(deserialized.getEnrSeq().get()).isEqualTo(enrSeq);
+  }
+
+  @Test
+  public void legacyHandlesScalar() {
+
+    final Endpoint to = new Endpoint("127.0.0.2", 30303, Optional.empty());
+    final UInt64 enrSeq = UInt64.MAX_VALUE;
+    final Bytes32 hash = Bytes32.fromHexStringLenient("0x1234");
+    final PongPacketData pong = PongPacketData.create(to, hash, enrSeq);
+
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    pong.writeTo(out);
+
+    final PongPacketData legacyPong = PongPacketData.legacyReadFrom(RLP.input(out.encoded()));
+
+    assertThat(legacyPong.getTo()).isEqualTo(to);
+    assertThat(legacyPong.getPingHash()).isEqualTo(hash);
+    assertThat(legacyPong.getEnrSeq().isPresent()).isTrue();
+    assertThat(legacyPong.getEnrSeq().get()).isEqualTo(enrSeq);
   }
 
   @Test
@@ -69,12 +120,40 @@ public void readFrom_withExtraFields() {
     final long time = System.currentTimeMillis();
     final Endpoint to = new Endpoint("127.0.0.2", 30303, Optional.empty());
     final Bytes32 hash = Bytes32.fromHexStringLenient("0x1234");
+    final UInt64 enrSeq = UInt64.ONE;
+
+    BytesValueRLPOutput out = new BytesValueRLPOutput();
+    out.startList();
+    to.encodeStandalone(out);
+    out.writeBytes(hash);
+    out.writeLongScalar(time);
+    out.writeLongScalar(enrSeq.toLong());
+    // Add random fields
+    out.writeLong(1234L);
+    out.endList();
+    final Bytes encoded = out.encoded();
+
+    final PongPacketData deserialized = PongPacketData.readFrom(RLP.input(encoded));
+    assertThat(deserialized.getTo()).isEqualTo(to);
+    assertThat(deserialized.getPingHash()).isEqualTo(hash);
+    assertThat(deserialized.getExpiration()).isEqualTo(time);
+    assertThat(deserialized.getEnrSeq().isPresent()).isTrue();
+    assertThat(deserialized.getEnrSeq().get()).isEqualTo(enrSeq);
+  }
+
+  @Test
+  public void readFrom_fixedWidthSeq() {
+    final long time = System.currentTimeMillis();
+    final Endpoint to = new Endpoint("127.0.0.2", 30303, Optional.empty());
+    final Bytes32 hash = Bytes32.fromHexStringLenient("0x1234");
+    final UInt64 enrSeq = UInt64.ONE;
 
     BytesValueRLPOutput out = new BytesValueRLPOutput();
     out.startList();
     to.encodeStandalone(out);
     out.writeBytes(hash);
     out.writeLongScalar(time);
+    out.writeLongScalar(enrSeq.toLong());
     // Add random fields
     out.writeLong(1234L);
     out.endList();
@@ -84,5 +163,7 @@ public void readFrom_withExtraFields() {
     assertThat(deserialized.getTo()).isEqualTo(to);
     assertThat(deserialized.getPingHash()).isEqualTo(hash);
     assertThat(deserialized.getExpiration()).isEqualTo(time);
+    assertThat(deserialized.getEnrSeq().isPresent()).isTrue();
+    assertThat(deserialized.getEnrSeq().get()).isEqualTo(enrSeq);
   }
 }
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/RecursivePeerRefreshStateTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/RecursivePeerRefreshStateTest.java
index 68f6bb87e20..31525ac5b22 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/RecursivePeerRefreshStateTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/discovery/internal/RecursivePeerRefreshStateTest.java
@@ -29,7 +29,7 @@
 import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryStatus;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.RecursivePeerRefreshState.BondingAgent;
 import org.hyperledger.besu.ethereum.p2p.discovery.internal.RecursivePeerRefreshState.FindNeighbourDispatcher;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 
 import java.util.Collections;
 import java.util.List;
@@ -514,7 +514,7 @@ private static DiscoveryPeer createPeer(
   private static DiscoveryPeer createPeer(
       final Bytes id, final String ip, final int discoveryPort, final int listeningPort) {
     return DiscoveryPeer.fromEnode(
-        EnodeURL.builder()
+        EnodeURLImpl.builder()
             .nodeId(id)
             .ipAddress(ip)
             .discoveryPort(discoveryPort)
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetworkTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetworkTest.java
index d6bb2447d9f..ffc1c84431b 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetworkTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetworkTest.java
@@ -18,30 +18,28 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
 import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration;
 import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
 import org.hyperledger.besu.ethereum.p2p.config.RlpxConfiguration;
 import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer;
-import org.hyperledger.besu.ethereum.p2p.discovery.Endpoint;
-import org.hyperledger.besu.ethereum.p2p.discovery.PeerBondedObserver;
 import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryAgent;
-import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryEvent;
 import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryStatus;
 import org.hyperledger.besu.ethereum.p2p.peers.MaintainedPeers;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.peers.PeerTestHelper;
 import org.hyperledger.besu.ethereum.p2p.rlpx.RlpxAgent;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.MockPeerConnection;
-import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MockSubProtocol;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
@@ -50,14 +48,18 @@
 import org.hyperledger.besu.nat.NatService;
 import org.hyperledger.besu.nat.core.domain.NetworkProtocol;
 import org.hyperledger.besu.nat.upnp.UpnpNatManager;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.crypto.SECP256K1;
 import org.assertj.core.api.Assertions;
 import org.junit.Before;
 import org.junit.Test;
@@ -65,19 +67,18 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.StrictStubs.class)
 public final class DefaultP2PNetworkTest {
-
   final MaintainedPeers maintainedPeers = new MaintainedPeers();
+  final SECP256K1.SecretKey mockKey =
+      SECP256K1.SecretKey.fromBytes(
+          Bytes32.fromHexString(
+              "0x8f2a55949038a9610f50fb23b5883af3b4ecb3c3bb792cbcefbd1542c692be63"));
   @Mock PeerDiscoveryAgent discoveryAgent;
   @Mock RlpxAgent rlpxAgent;
 
-  private final ArgumentCaptor<PeerBondedObserver> discoverySubscriberCaptor =
-      ArgumentCaptor.forClass(PeerBondedObserver.class);
-
   @Captor private ArgumentCaptor<Stream<? extends Peer>> peerStreamCaptor;
 
   private final NetworkingConfiguration config =
@@ -92,15 +93,11 @@ public final class DefaultP2PNetworkTest {
   public void before() {
     lenient().when(rlpxAgent.start()).thenReturn(CompletableFuture.completedFuture(30303));
     lenient().when(rlpxAgent.stop()).thenReturn(CompletableFuture.completedFuture(null));
-    lenient()
-        .when(discoveryAgent.start(anyInt()))
-        .thenAnswer(
-            invocation ->
-                CompletableFuture.completedFuture(invocation.getArgument(0, Integer.class)));
     lenient().when(discoveryAgent.stop()).thenReturn(CompletableFuture.completedFuture(null));
+    lenient().when(discoveryAgent.checkForkId(any())).thenReturn(true);
     lenient()
-        .when(discoveryAgent.observePeerBondedEvents(discoverySubscriberCaptor.capture()))
-        .thenReturn(1L);
+        .when(discoveryAgent.start(anyInt()))
+        .thenReturn(CompletableFuture.completedFuture(Integer.valueOf(30301)));
   }
 
   @Test
@@ -109,7 +106,7 @@ public void addMaintainConnectionPeer_newPeer() {
     network.start();
     final Peer peer = PeerTestHelper.createPeer();
 
-    assertThat(network.addMaintainConnectionPeer(peer)).isTrue();
+    assertThat(network.addMaintainedConnectionPeer(peer)).isTrue();
 
     assertThat(maintainedPeers.contains(peer)).isTrue();
     verify(rlpxAgent).connect(peer);
@@ -122,8 +119,8 @@ public void addMaintainConnectionPeer_existingPeer() {
     network.start();
     final Peer peer = PeerTestHelper.createPeer();
 
-    assertThat(network.addMaintainConnectionPeer(peer)).isTrue();
-    assertThat(network.addMaintainConnectionPeer(peer)).isFalse();
+    assertThat(network.addMaintainedConnectionPeer(peer)).isTrue();
+    assertThat(network.addMaintainedConnectionPeer(peer)).isFalse();
     verify(rlpxAgent, times(2)).connect(peer);
     verify(discoveryAgent, times(2)).bond(peer);
     assertThat(maintainedPeers.contains(peer)).isTrue();
@@ -135,7 +132,7 @@ public void removeMaintainedConnectionPeer_alreadyMaintainedPeer() {
     network.start();
     final Peer peer = PeerTestHelper.createPeer();
 
-    assertThat(network.addMaintainConnectionPeer(peer)).isTrue();
+    assertThat(network.addMaintainedConnectionPeer(peer)).isTrue();
     assertThat(network.removeMaintainedConnectionPeer(peer)).isTrue();
 
     assertThat(maintainedPeers.contains(peer)).isFalse();
@@ -159,46 +156,47 @@ public void removeMaintainedConnectionPeer_nonMaintainedPeer() {
   }
 
   @Test
-  public void checkMaintainedConnectionPeers_unconnectedPeer() {
+  public void checkMaintainedConnectionPeers_doesNotConnectToSelf() {
     final DefaultP2PNetwork network = network();
-    final Peer peer = PeerTestHelper.createPeer();
-    maintainedPeers.add(peer);
-
     network.start();
 
-    verify(rlpxAgent, times(0)).connect(peer);
+    final Optional<EnodeURL> maybeSelfEnode = network.getLocalEnode();
+    final Peer selfPeer = PeerTestHelper.createPeer(maybeSelfEnode.get());
+    maintainedPeers.add(selfPeer);
+
+    verify(rlpxAgent, times(0)).connect(selfPeer);
 
     network.checkMaintainedConnectionPeers();
-    verify(rlpxAgent, times(1)).connect(peer);
+    verify(rlpxAgent, times(0)).connect(selfPeer);
   }
 
   @Test
-  public void checkMaintainedConnectionPeers_connectedPeer() {
+  public void checkMaintainedConnectionPeers_unconnectedPeer() {
     final DefaultP2PNetwork network = network();
     final Peer peer = PeerTestHelper.createPeer();
-    maintainedPeers.add(peer);
 
     network.start();
 
-    // Don't connect to an already connected peer
-    final CompletableFuture<PeerConnection> connectionFuture =
-        CompletableFuture.completedFuture(MockPeerConnection.create(peer));
-    when(rlpxAgent.getPeerConnection(peer)).thenReturn(Optional.of(connectionFuture));
-    network.checkMaintainedConnectionPeers();
+    maintainedPeers.add(peer);
+
     verify(rlpxAgent, times(0)).connect(peer);
+
+    network.checkMaintainedConnectionPeers();
+    verify(rlpxAgent, times(1)).connect(peer);
   }
 
   @Test
-  public void checkMaintainedConnectionPeers_connectingPeer() {
+  public void checkMaintainedConnectionPeers_connectedPeer() {
     final DefaultP2PNetwork network = network();
     final Peer peer = PeerTestHelper.createPeer();
-    maintainedPeers.add(peer);
 
     network.start();
 
-    // Don't connect when connection is already pending.
-    final CompletableFuture<PeerConnection> connectionFuture = new CompletableFuture<>();
-    when(rlpxAgent.getPeerConnection(peer)).thenReturn(Optional.of(connectionFuture));
+    maintainedPeers.add(peer);
+
+    // Don't connect to an already connected peer
+    when(rlpxAgent.streamActiveConnections())
+        .thenReturn(Stream.of(MockPeerConnection.create(peer)));
     network.checkMaintainedConnectionPeers();
     verify(rlpxAgent, times(0)).connect(peer);
   }
@@ -229,7 +227,7 @@ public void start_withNatManager() {
     when(upnpNatManager.queryExternalIPAddress())
         .thenReturn(CompletableFuture.completedFuture(externalIp));
 
-    final NatService natService = Mockito.spy(new NatService(Optional.of(upnpNatManager)));
+    final NatService natService = spy(new NatService(Optional.of(upnpNatManager)));
     final P2PNetwork network = builder().natService(natService).build();
 
     network.start();
@@ -243,29 +241,27 @@ public void start_withNatManager() {
   }
 
   @Test
-  public void handlePeerBondedEvent_forListeningPeer() {
-    final DefaultP2PNetwork network = network();
-    network.start();
-    final DiscoveryPeer peer = DiscoveryPeer.fromEnode(PeerTestHelper.enode());
-    final PeerDiscoveryEvent.PeerBondedEvent peerBondedEvent =
-        new PeerDiscoveryEvent.PeerBondedEvent(peer, System.currentTimeMillis());
+  public void start_withNatManagerUpnpP2p() {
+    final String externalIp = "127.0.0.3";
+    config.getRlpx().setBindPort(30303);
+    config.getDiscovery().setBindPort(30301);
 
-    discoverySubscriberCaptor.getValue().onPeerBonded(peerBondedEvent);
-    verify(rlpxAgent, times(1)).connect(peer);
-  }
+    final UpnpNatManager upnpNatManager = mock(UpnpNatManager.class);
+    when(upnpNatManager.getNatMethod()).thenReturn(NatMethod.UPNPP2PONLY);
+    when(upnpNatManager.queryExternalIPAddress())
+        .thenReturn(CompletableFuture.completedFuture(externalIp));
+
+    final NatService natService = spy(new NatService(Optional.of(upnpNatManager)));
+    final P2PNetwork network = builder().natService(natService).build();
 
-  @Test
-  public void handlePeerBondedEvent_forPeerWithNoTcpPort() {
-    final DefaultP2PNetwork network = network();
     network.start();
-    final DiscoveryPeer peer =
-        DiscoveryPeer.fromIdAndEndpoint(
-            Peer.randomId(), new Endpoint("127.0.0.1", 999, Optional.empty()));
-    final PeerDiscoveryEvent.PeerBondedEvent peerBondedEvent =
-        new PeerDiscoveryEvent.PeerBondedEvent(peer, System.currentTimeMillis());
+    verify(upnpNatManager)
+        .requestPortForward(eq(config.getRlpx().getBindPort()), eq(NetworkProtocol.TCP), any());
+    verify(upnpNatManager)
+        .requestPortForward(
+            eq(config.getDiscovery().getBindPort()), eq(NetworkProtocol.UDP), any());
 
-    discoverySubscriberCaptor.getValue().onPeerBonded(peerBondedEvent);
-    verify(rlpxAgent, times(1)).connect(peer);
+    Assertions.assertThat(network.getLocalEnode().get().getIpAsString()).isEqualTo(externalIp);
   }
 
   @Test
@@ -279,7 +275,8 @@ public void attemptPeerConnections_bondedPeers() {
     network.attemptPeerConnections();
     verify(rlpxAgent, times(1)).connect(peerStreamCaptor.capture());
 
-    List<? extends Peer> capturedPeers = peerStreamCaptor.getValue().collect(Collectors.toList());
+    final List<? extends Peer> capturedPeers =
+        peerStreamCaptor.getValue().collect(Collectors.toList());
     assertThat(capturedPeers.contains(discoPeer)).isTrue();
     assertThat(capturedPeers.size()).isEqualTo(1);
   }
@@ -295,7 +292,8 @@ public void attemptPeerConnections_unbondedPeers() {
     network.attemptPeerConnections();
     verify(rlpxAgent, times(1)).connect(peerStreamCaptor.capture());
 
-    List<? extends Peer> capturedPeers = peerStreamCaptor.getValue().collect(Collectors.toList());
+    final List<? extends Peer> capturedPeers =
+        peerStreamCaptor.getValue().collect(Collectors.toList());
     assertThat(capturedPeers.contains(discoPeer)).isFalse();
     assertThat(capturedPeers.size()).isEqualTo(0);
   }
@@ -315,7 +313,8 @@ public void attemptPeerConnections_sortsPeersByLastContacted() {
     network.attemptPeerConnections();
     verify(rlpxAgent, times(1)).connect(peerStreamCaptor.capture());
 
-    List<? extends Peer> capturedPeers = peerStreamCaptor.getValue().collect(Collectors.toList());
+    final List<? extends Peer> capturedPeers =
+        peerStreamCaptor.getValue().collect(Collectors.toList());
     assertThat(capturedPeers.size()).isEqualTo(3);
     assertThat(capturedPeers.get(0)).isEqualTo(discoPeers.get(1));
     assertThat(capturedPeers.get(1)).isEqualTo(discoPeers.get(0));
@@ -328,7 +327,51 @@ public void cannotAddNodeWithSameEnodeID() {
     network.start();
     assertThat(network.getLocalEnode()).isPresent();
     final Peer peer = PeerTestHelper.createPeer(network.getLocalEnode().get().getNodeId());
-    assertThat(network.addMaintainConnectionPeer(peer)).isFalse();
+    assertThat(network.addMaintainedConnectionPeer(peer)).isFalse();
+  }
+
+  @Test
+  public void shouldNotStartDnsDiscoveryWhenDnsURLIsNotConfigured() {
+    final DefaultP2PNetwork testClass = network();
+    testClass.start();
+    // ensure DnsDaemon is NOT present:
+    assertThat(testClass.getDnsDaemon()).isNotPresent();
+  }
+
+  @Test
+  public void shouldStartDnsDiscoveryWhenDnsURLIsConfigured() {
+    // create a discovery config with a dns config
+    final DiscoveryConfiguration disco =
+        DiscoveryConfiguration.create().setDnsDiscoveryURL("enrtree://mock@localhost");
+
+    // spy on config to return dns discovery config:
+    final NetworkingConfiguration dnsConfig =
+        when(spy(config).getDiscovery()).thenReturn(disco).getMock();
+
+    // spy on DefaultP2PNetwork
+    final DefaultP2PNetwork testClass = (DefaultP2PNetwork) builder().config(dnsConfig).build();
+
+    testClass.start();
+    assertThat(testClass.getDnsDaemon()).isPresent();
+  }
+
+  @Test
+  public void shouldUseDnsServerOverrideIfPresent() {
+    // create a discovery config with a dns config
+    final DiscoveryConfiguration disco =
+        DiscoveryConfiguration.create().setDnsDiscoveryURL("enrtree://mock@localhost");
+
+    // spy on config to return dns discovery config:
+    final NetworkingConfiguration dnsConfig = spy(config);
+    doReturn(disco).when(dnsConfig).getDiscovery();
+    doReturn(Optional.of("localhost")).when(dnsConfig).getDnsDiscoveryServerOverride();
+
+    final DefaultP2PNetwork testClass = (DefaultP2PNetwork) builder().config(dnsConfig).build();
+    testClass.start();
+
+    // ensure we used the dns server override config when building DNSDaemon:
+    assertThat(testClass.getDnsDaemon()).isPresent();
+    verify(dnsConfig, times(2)).getDnsDiscoveryServerOverride();
   }
 
   private DefaultP2PNetwork network() {
@@ -347,6 +390,10 @@ private DefaultP2PNetwork.Builder builder() {
         .maintainedPeers(maintainedPeers)
         .metricsSystem(new NoOpMetricsSystem())
         .supportedCapabilities(Capability.create("eth", 63))
-        .storageProvider(new InMemoryStorageProvider());
+        .storageProvider(new InMemoryKeyValueStorageProvider())
+        .blockNumberForks(Collections.emptyList())
+        .timestampForks(Collections.emptyList())
+        .allConnectionsSupplier(Stream::empty)
+        .allActiveConnectionsSupplier(Stream::empty);
   }
 }
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/FileBasedPasswordProvider.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/FileBasedPasswordProvider.java
new file mode 100644
index 00000000000..7c72a66d23a
--- /dev/null
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/FileBasedPasswordProvider.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.network;
+
+import static java.util.Objects.requireNonNull;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+public class FileBasedPasswordProvider implements Supplier<String> {
+  private final Path passwordFile;
+
+  public FileBasedPasswordProvider(final Path passwordFile) {
+    requireNonNull(passwordFile, "Password file path cannot be null");
+    this.passwordFile = passwordFile;
+  }
+
+  @Override
+  public String get() {
+    try (final Stream<String> fileStream = Files.lines(passwordFile)) {
+      return fileStream
+          .findFirst()
+          .orElseThrow(
+              () ->
+                  new RuntimeException(
+                      String.format(
+                          "Unable to read keystore password from %s", passwordFile.toString())));
+    } catch (final IOException e) {
+      throw new RuntimeException(
+          String.format("Unable to read keystore password file %s", passwordFile.toString()), e);
+    }
+  }
+}
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/NetworkingServiceLifecycleTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/NetworkingServiceLifecycleTest.java
index a676db27a76..97d897c52b3 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/NetworkingServiceLifecycleTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/NetworkingServiceLifecycleTest.java
@@ -16,23 +16,34 @@
 
 import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hamcrest.Matchers.startsWith;
 import static org.hyperledger.besu.ethereum.p2p.NetworkingTestHelper.configWithRandomPorts;
-
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
+import static org.junit.Assume.assumeThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
 import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration;
 import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
 import org.hyperledger.besu.ethereum.p2p.discovery.PeerDiscoveryServiceException;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.stream.Stream;
 
 import io.vertx.core.Vertx;
 import org.assertj.core.api.Assertions;
+import org.jetbrains.annotations.NotNull;
 import org.junit.After;
 import org.junit.Test;
 
@@ -50,7 +61,8 @@ public void closeVertx() {
   @Test
   public void createP2PNetwork() throws IOException {
     final NetworkingConfiguration config = configWithRandomPorts();
-    try (final P2PNetwork service = builder().build()) {
+    final DefaultP2PNetwork.Builder builder = getP2PNetworkBuilder();
+    try (final P2PNetwork service = builder.build()) {
       service.start();
       final EnodeURL enode = service.getLocalEnode().get();
       final int udpPort = enode.getDiscoveryPortOrZero();
@@ -63,46 +75,77 @@ public void createP2PNetwork() throws IOException {
     }
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @NotNull
+  private DefaultP2PNetwork.Builder getP2PNetworkBuilder() {
+    final DefaultP2PNetwork.Builder builder = builder();
+    final MutableBlockchain blockchainMock = mock(MutableBlockchain.class);
+    final Block blockMock = mock(Block.class);
+    when(blockMock.getHash()).thenReturn(Hash.ZERO);
+    when(blockchainMock.getGenesisBlock()).thenReturn(blockMock);
+    builder
+        .blockchain(blockchainMock)
+        .blockNumberForks(Collections.emptyList())
+        .timestampForks(Collections.emptyList())
+        .allConnectionsSupplier(Stream::empty)
+        .allActiveConnectionsSupplier(Stream::empty);
+    return builder;
+  }
+
+  @Test
   public void createP2PNetwork_NullHost() throws IOException {
     final NetworkingConfiguration config =
         NetworkingConfiguration.create()
             .setDiscovery(DiscoveryConfiguration.create().setBindHost(null));
-    try (final P2PNetwork broken = builder().config(config).build()) {
-      Assertions.fail("Expected Exception");
-    }
+    final DefaultP2PNetwork.Builder p2pNetworkBuilder = getP2PNetworkBuilder().config(config);
+    assertThatThrownBy(
+            () -> {
+              try (final P2PNetwork ignored = p2pNetworkBuilder.build()) {
+                Assertions.fail("Expected Exception");
+              }
+            })
+        .isInstanceOf(IllegalArgumentException.class);
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void createP2PNetwork_InvalidHost() throws IOException {
     final NetworkingConfiguration config =
         NetworkingConfiguration.create()
             .setDiscovery(DiscoveryConfiguration.create().setBindHost("fake.fake.fake"));
-    try (final P2PNetwork broken = builder().config(config).build()) {
-      Assertions.fail("Expected Exception");
-    }
+    final DefaultP2PNetwork.Builder p2pNetworkBuilder = getP2PNetworkBuilder().config(config);
+    assertThatThrownBy(
+            () -> {
+              try (final P2PNetwork ignored = p2pNetworkBuilder.build()) {
+                Assertions.fail("Expected Exception");
+              }
+            })
+        .isInstanceOf(IllegalArgumentException.class);
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void createP2PNetwork_InvalidPort() throws IOException {
     final NetworkingConfiguration config =
         NetworkingConfiguration.create()
             .setDiscovery(DiscoveryConfiguration.create().setBindPort(-1));
-    try (final P2PNetwork broken = builder().config(config).build()) {
-      Assertions.fail("Expected Exception");
-    }
+    final DefaultP2PNetwork.Builder p2pNetworkBuilder = getP2PNetworkBuilder().config(config);
+    assertThatThrownBy(
+            () -> {
+              try (final P2PNetwork ignored = p2pNetworkBuilder.build()) {
+                Assertions.fail("Expected Exception");
+              }
+            })
+        .isInstanceOf(IllegalArgumentException.class);
   }
 
-  @Test(expected = NullPointerException.class)
+  @Test
   public void createP2PNetwork_NullKeyPair() throws IOException {
-    try (final P2PNetwork broken = builder().config(config).nodeKey(null).build()) {
-      Assertions.fail("Expected Exception");
-    }
+    final DefaultP2PNetwork.Builder p2pNetworkBuilder = builder().config(config);
+    assertThatThrownBy(() -> p2pNetworkBuilder.nodeKey(null))
+        .isInstanceOf(NullPointerException.class);
   }
 
   @Test
   public void startStopP2PNetwork() throws IOException {
-    try (final P2PNetwork service = builder().build()) {
+    try (final P2PNetwork service = getP2PNetworkBuilder().build()) {
       service.start();
       service.stop();
     }
@@ -110,8 +153,8 @@ public void startStopP2PNetwork() throws IOException {
 
   @Test
   public void startDiscoveryAgentBackToBack() throws IOException {
-    try (final P2PNetwork service1 = builder().build();
-        final P2PNetwork service2 = builder().build()) {
+    try (final P2PNetwork service1 = getP2PNetworkBuilder().build();
+        final P2PNetwork service2 = getP2PNetworkBuilder().build()) {
       service1.start();
       service1.stop();
       service2.start();
@@ -121,13 +164,17 @@ public void startDiscoveryAgentBackToBack() throws IOException {
 
   @Test
   public void startDiscoveryPortInUse() throws IOException {
-    try (final P2PNetwork service1 = builder().config(config).build()) {
+    assumeThat(
+        "Ignored if system language is not English",
+        System.getProperty("user.language"),
+        startsWith("en"));
+    try (final P2PNetwork service1 = getP2PNetworkBuilder().config(config).build()) {
       service1.start();
       final NetworkingConfiguration config = configWithRandomPorts();
       final int usedPort = service1.getLocalEnode().get().getDiscoveryPortOrZero();
       assertThat(usedPort).isNotZero();
       config.getDiscovery().setBindPort(usedPort);
-      try (final P2PNetwork service2 = builder().config(config).build()) {
+      try (final P2PNetwork service2 = getP2PNetworkBuilder().config(config).build()) {
         try {
           service2.start();
         } catch (final Exception e) {
@@ -147,7 +194,7 @@ public void startDiscoveryPortInUse() throws IOException {
 
   @Test
   public void createP2PNetwork_NoActivePeers() throws IOException {
-    try (final P2PNetwork agent = builder().build()) {
+    try (final P2PNetwork agent = getP2PNetworkBuilder().build()) {
       assertThat(agent.streamDiscoveredPeers().collect(toList())).isEmpty();
       assertThat(agent.getPeers()).isEmpty();
     }
@@ -160,6 +207,6 @@ private DefaultP2PNetwork.Builder builder() {
         .config(config)
         .metricsSystem(new NoOpMetricsSystem())
         .supportedCapabilities(Arrays.asList(Capability.create("eth", 63)))
-        .storageProvider(new InMemoryStorageProvider());
+        .storageProvider(new InMemoryKeyValueStorageProvider());
   }
 }
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/P2PNetworkTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/P2PNetworkTest.java
index 633d5bdd624..399f92c3c20 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/P2PNetworkTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/P2PNetworkTest.java
@@ -21,28 +21,35 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.crypto.NodeKey;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
 import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration;
 import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
 import org.hyperledger.besu.ethereum.p2p.config.RlpxConfiguration;
 import org.hyperledger.besu.ethereum.p2p.network.exceptions.IncompatiblePeerException;
 import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions;
 import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissionsDenylist;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MockSubProtocol;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.net.InetAddress;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Stream;
 
 import io.vertx.core.Vertx;
 import org.apache.tuweni.bytes.Bytes;
@@ -58,7 +65,10 @@ public class P2PNetworkTest {
   private final NetworkingConfiguration config =
       NetworkingConfiguration.create()
           .setDiscovery(DiscoveryConfiguration.create().setActive(false))
-          .setRlpx(RlpxConfiguration.create().setBindPort(0).setSupportedProtocols(subProtocol()));
+          .setRlpx(
+              RlpxConfiguration.create()
+                  .setBindPort(0)
+                  .setSupportedProtocols(MockSubProtocol.create()));
 
   @After
   public void closeVertx() {
@@ -70,6 +80,8 @@ public void handshaking() throws Exception {
     final NodeKey nodeKey = NodeKeyUtils.generate();
     try (final P2PNetwork listener = builder().nodeKey(nodeKey).build();
         final P2PNetwork connector = builder().build()) {
+      listener.getRlpxAgent().subscribeConnectRequest((p, d) -> true);
+      connector.getRlpxAgent().subscribeConnectRequest((p, d) -> true);
 
       listener.start();
       connector.start();
@@ -92,6 +104,8 @@ public void preventMultipleConnections() throws Exception {
     final NodeKey listenNodeKey = NodeKeyUtils.generate();
     try (final P2PNetwork listener = builder().nodeKey(listenNodeKey).build();
         final P2PNetwork connector = builder().build()) {
+      listener.getRlpxAgent().subscribeConnectRequest((p, d) -> true);
+      connector.getRlpxAgent().subscribeConnectRequest((p, d) -> true);
 
       listener.start();
       connector.start();
@@ -114,80 +128,22 @@ public void preventMultipleConnections() throws Exception {
     }
   }
 
-  /**
-   * Tests that max peers setting is honoured and inbound connections that would exceed the limit
-   * are correctly disconnected.
-   *
-   * @throws Exception On Failure
-   */
-  @Test
-  public void limitMaxPeers() throws Exception {
-    final NodeKey nodeKey = NodeKeyUtils.generate();
-    final int maxPeers = 1;
-    final NetworkingConfiguration listenerConfig =
-        NetworkingConfiguration.create()
-            .setDiscovery(DiscoveryConfiguration.create().setActive(false))
-            .setRlpx(
-                RlpxConfiguration.create()
-                    .setBindPort(0)
-                    .setMaxPeers(maxPeers)
-                    .setSupportedProtocols(subProtocol()));
-    try (final P2PNetwork listener = builder().nodeKey(nodeKey).config(listenerConfig).build();
-        final P2PNetwork connector1 = builder().build();
-        final P2PNetwork connector2 = builder().build()) {
-
-      // Setup listener and first connection
-      listener.start();
-      connector1.start();
-      final EnodeURL listenerEnode = listener.getLocalEnode().get();
-      final Bytes listenId = listenerEnode.getNodeId();
-      final int listenPort = listenerEnode.getListeningPort().get();
-
-      final Peer listeningPeer = createPeer(listenId, listenPort);
-      Assertions.assertThat(
-              connector1
-                  .connect(listeningPeer)
-                  .get(30L, TimeUnit.SECONDS)
-                  .getPeerInfo()
-                  .getNodeId())
-          .isEqualTo(listenId);
-
-      // Setup second connection and check that connection is not accepted
-      final CompletableFuture<PeerConnection> peerFuture = new CompletableFuture<>();
-      final CompletableFuture<DisconnectReason> reasonFuture = new CompletableFuture<>();
-      connector2.subscribeDisconnect(
-          (peerConnection, reason, initiatedByPeer) -> {
-            peerFuture.complete(peerConnection);
-            reasonFuture.complete(reason);
-          });
-      connector2.start();
-      Assertions.assertThat(
-              connector2
-                  .connect(listeningPeer)
-                  .get(30L, TimeUnit.SECONDS)
-                  .getPeerInfo()
-                  .getNodeId())
-          .isEqualTo(listenId);
-      Assertions.assertThat(peerFuture.get(30L, TimeUnit.SECONDS).getPeerInfo().getNodeId())
-          .isEqualTo(listenId);
-      assertThat(reasonFuture.get(30L, TimeUnit.SECONDS))
-          .isEqualByComparingTo(DisconnectReason.TOO_MANY_PEERS);
-    }
-  }
-
   @Test
   public void rejectPeerWithNoSharedCaps() throws Exception {
     final NodeKey listenerNodeKey = NodeKeyUtils.generate();
     final NodeKey connectorNodeKey = NodeKeyUtils.generate();
 
-    final SubProtocol subprotocol1 = subProtocol("eth");
+    final SubProtocol subprotocol1 = MockSubProtocol.create("eth");
     final Capability cap1 = Capability.create(subprotocol1.getName(), 63);
-    final SubProtocol subprotocol2 = subProtocol("oth");
+    final SubProtocol subprotocol2 = MockSubProtocol.create("oth");
     final Capability cap2 = Capability.create(subprotocol2.getName(), 63);
     try (final P2PNetwork listener =
             builder().nodeKey(listenerNodeKey).supportedCapabilities(cap1).build();
         final P2PNetwork connector =
             builder().nodeKey(connectorNodeKey).supportedCapabilities(cap2).build()) {
+      listener.getRlpxAgent().subscribeConnectRequest((p, d) -> true);
+      connector.getRlpxAgent().subscribeConnectRequest((p, d) -> true);
+
       listener.start();
       connector.start();
       final EnodeURL listenerEnode = listener.getLocalEnode().get();
@@ -201,11 +157,13 @@ public void rejectPeerWithNoSharedCaps() throws Exception {
   }
 
   @Test
-  public void rejectIncomingConnectionFromBlacklistedPeer() throws Exception {
-    final PeerPermissionsDenylist localBlacklist = PeerPermissionsDenylist.create();
+  public void rejectIncomingConnectionFromDenylistedPeer() throws Exception {
+    final PeerPermissionsDenylist localDenylist = PeerPermissionsDenylist.create();
 
-    try (final P2PNetwork localNetwork = builder().peerPermissions(localBlacklist).build();
+    try (final P2PNetwork localNetwork = builder().peerPermissions(localDenylist).build();
         final P2PNetwork remoteNetwork = builder().build()) {
+      localNetwork.getRlpxAgent().subscribeConnectRequest((p, d) -> true);
+      remoteNetwork.getRlpxAgent().subscribeConnectRequest((p, d) -> true);
 
       localNetwork.start();
       remoteNetwork.start();
@@ -221,8 +179,8 @@ public void rejectIncomingConnectionFromBlacklistedPeer() throws Exception {
       final Peer localPeer = createPeer(localId, localPort);
       final Peer remotePeer = createPeer(remoteId, remotePort);
 
-      // Blacklist the remote peer
-      localBlacklist.add(remotePeer);
+      // Denylist the remote peer
+      localDenylist.add(remotePeer);
 
       // Setup disconnect listener
       final CompletableFuture<PeerConnection> peerFuture = new CompletableFuture<>();
@@ -253,6 +211,8 @@ public void rejectIncomingConnectionFromDisallowedPeer() throws Exception {
 
     try (final P2PNetwork localNetwork = builder().peerPermissions(peerPermissions).build();
         final P2PNetwork remoteNetwork = builder().build()) {
+      localNetwork.getRlpxAgent().subscribeConnectRequest((p, d) -> true);
+      remoteNetwork.getRlpxAgent().subscribeConnectRequest((p, d) -> true);
 
       localNetwork.start();
       remoteNetwork.start();
@@ -293,48 +253,29 @@ public void rejectIncomingConnectionFromDisallowedPeer() throws Exception {
 
   private Peer createPeer(final Bytes nodeId, final int listenPort) {
     return DefaultPeer.fromEnodeURL(
-        EnodeURL.builder()
+        EnodeURLImpl.builder()
             .ipAddress(InetAddress.getLoopbackAddress().getHostAddress())
             .nodeId(nodeId)
             .discoveryAndListeningPorts(listenPort)
             .build());
   }
 
-  private static SubProtocol subProtocol() {
-    return subProtocol("eth");
-  }
-
-  private static SubProtocol subProtocol(final String name) {
-    return new SubProtocol() {
-      @Override
-      public String getName() {
-        return name;
-      }
-
-      @Override
-      public int messageSpace(final int protocolVersion) {
-        return 8;
-      }
-
-      @Override
-      public boolean isValidMessageCode(final int protocolVersion, final int code) {
-        return true;
-      }
-
-      @Override
-      public String messageName(final int protocolVersion, final int code) {
-        return INVALID_MESSAGE_NAME;
-      }
-    };
-  }
-
   private DefaultP2PNetwork.Builder builder() {
+    final MutableBlockchain blockchainMock = mock(MutableBlockchain.class);
+    final Block blockMock = mock(Block.class);
+    when(blockMock.getHash()).thenReturn(Hash.ZERO);
+    when(blockchainMock.getGenesisBlock()).thenReturn(blockMock);
     return DefaultP2PNetwork.builder()
         .vertx(vertx)
         .config(config)
         .nodeKey(NodeKeyUtils.generate())
         .metricsSystem(new NoOpMetricsSystem())
         .supportedCapabilities(Arrays.asList(Capability.create("eth", 63)))
-        .storageProvider(new InMemoryStorageProvider());
+        .storageProvider(new InMemoryKeyValueStorageProvider())
+        .blockNumberForks(Collections.emptyList())
+        .timestampForks(Collections.emptyList())
+        .blockchain(blockchainMock)
+        .allConnectionsSupplier(Stream::empty)
+        .allActiveConnectionsSupplier(Stream::empty);
   }
 }
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/P2PPlainNetworkTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/P2PPlainNetworkTest.java
new file mode 100644
index 00000000000..fab939e8cb4
--- /dev/null
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/P2PPlainNetworkTest.java
@@ -0,0 +1,465 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.network;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Fail.fail;
+import static org.hyperledger.besu.pki.keystore.KeyStoreWrapper.KEYSTORE_TYPE_PKCS12;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
+import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration;
+import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
+import org.hyperledger.besu.ethereum.p2p.config.RlpxConfiguration;
+import org.hyperledger.besu.ethereum.p2p.network.exceptions.IncompatiblePeerException;
+import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
+import org.hyperledger.besu.ethereum.p2p.peers.Peer;
+import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions;
+import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissionsDenylist;
+import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
+import org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty.TLSConfiguration;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.AbstractMessageData;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Message;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.MockSubProtocol;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.ShouldConnectCallback;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.SubProtocol;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.data.EnodeURL;
+
+import java.net.InetAddress;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Stream;
+
+import io.vertx.core.Vertx;
+import org.apache.tuweni.bytes.Bytes;
+import org.assertj.core.api.Assertions;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
+public class P2PPlainNetworkTest {
+  // See ethereum/p2p/src/test/resources/keys/README.md for certificates setup.
+  private final Vertx vertx = Vertx.vertx();
+  private final NetworkingConfiguration config =
+      NetworkingConfiguration.create()
+          .setDiscovery(DiscoveryConfiguration.create().setActive(false))
+          .setRlpx(
+              RlpxConfiguration.create()
+                  .setBindPort(0)
+                  .setSupportedProtocols(MockSubProtocol.create()));
+
+  @After
+  public void closeVertx() {
+    vertx.close();
+  }
+
+  @Test
+  public void handshaking() throws Exception {
+    final NodeKey nodeKey = NodeKeyUtils.generate();
+    try (final P2PNetwork listener = builder("partner1client1").nodeKey(nodeKey).build();
+        final P2PNetwork connector = builder("partner2client1").build()) {
+      listener.getRlpxAgent().subscribeConnectRequest(testCallback);
+      connector.getRlpxAgent().subscribeConnectRequest(testCallback);
+
+      listener.start();
+      connector.start();
+      final EnodeURL listenerEnode = listener.getLocalEnode().get();
+      final Bytes listenId = listenerEnode.getNodeId();
+      final int listenPort = listenerEnode.getListeningPort().get();
+
+      Assertions.assertThat(
+              connector
+                  .connect(createPeer(listenId, listenPort))
+                  .get(30L, TimeUnit.SECONDS)
+                  .getPeerInfo()
+                  .getNodeId())
+          .isEqualTo(listenId);
+    }
+  }
+
+  @Test
+  public void preventMultipleConnections() throws Exception {
+    final NodeKey listenNodeKey = NodeKeyUtils.generate();
+    try (final P2PNetwork listener = builder("partner1client1").nodeKey(listenNodeKey).build();
+        final P2PNetwork connector = builder("partner2client1").build()) {
+      listener.getRlpxAgent().subscribeConnectRequest(testCallback);
+      connector.getRlpxAgent().subscribeConnectRequest(testCallback);
+
+      listener.start();
+      connector.start();
+      final EnodeURL listenerEnode = listener.getLocalEnode().get();
+      final Bytes listenId = listenerEnode.getNodeId();
+      final int listenPort = listenerEnode.getListeningPort().get();
+
+      final CompletableFuture<PeerConnection> firstFuture =
+          connector.connect(createPeer(listenId, listenPort));
+      final CompletableFuture<PeerConnection> secondFuture =
+          connector.connect(createPeer(listenId, listenPort));
+
+      final PeerConnection firstConnection = firstFuture.get(30L, TimeUnit.SECONDS);
+      final PeerConnection secondConnection = secondFuture.get(30L, TimeUnit.SECONDS);
+      Assertions.assertThat(firstConnection.getPeerInfo().getNodeId()).isEqualTo(listenId);
+
+      // Connections should reference the same instance - i.e. we shouldn't create 2 distinct
+      // connections
+      assertThat(firstConnection == secondConnection).isTrue();
+    }
+  }
+
+  /**
+   * Tests that max peers setting is honoured and inbound connections that would exceed the limit
+   * are correctly disconnected.
+   *
+   * @throws Exception On Failure
+   */
+  @Test
+  public void limitMaxPeers() throws Exception {
+    final NodeKey nodeKey = NodeKeyUtils.generate();
+    final NetworkingConfiguration listenerConfig =
+        NetworkingConfiguration.create()
+            .setDiscovery(DiscoveryConfiguration.create().setActive(false))
+            .setRlpx(
+                RlpxConfiguration.create()
+                    .setBindPort(0)
+                    .setSupportedProtocols(MockSubProtocol.create()));
+    try (final P2PNetwork listener =
+            builder("partner1client1").nodeKey(nodeKey).config(listenerConfig).build();
+        final P2PNetwork connector1 = builder("partner1client1").build();
+        final P2PNetwork connector2 = builder("partner2client1").build()) {
+      listener.getRlpxAgent().subscribeConnectRequest(testCallback);
+      connector1.getRlpxAgent().subscribeConnectRequest(testCallback);
+      connector2.getRlpxAgent().subscribeConnectRequest((p, d) -> false);
+
+      // Setup listener and first connection
+      listener.start();
+      connector1.start();
+      final EnodeURL listenerEnode = listener.getLocalEnode().get();
+      final Bytes listenId = listenerEnode.getNodeId();
+      final int listenPort = listenerEnode.getListeningPort().get();
+
+      final Peer listeningPeer = createPeer(listenId, listenPort);
+      Assertions.assertThat(
+              connector1
+                  .connect(listeningPeer)
+                  .get(30L, TimeUnit.SECONDS)
+                  .getPeerInfo()
+                  .getNodeId())
+          .isEqualTo(listenId);
+
+      // Setup second connection and check that connection is not accepted
+      final CompletableFuture<PeerConnection> peerFuture = new CompletableFuture<>();
+      final CompletableFuture<DisconnectReason> reasonFuture = new CompletableFuture<>();
+      connector2.subscribeDisconnect(
+          (peerConnection, reason, initiatedByPeer) -> {
+            peerFuture.complete(peerConnection);
+            reasonFuture.complete(reason);
+          });
+      connector2.start();
+      Assertions.assertThat(connector2.connect(listeningPeer)).isCompletedExceptionally();
+    }
+  }
+
+  @Test
+  public void rejectPeerWithNoSharedCaps() throws Exception {
+    final NodeKey listenerNodeKey = NodeKeyUtils.generate();
+    final NodeKey connectorNodeKey = NodeKeyUtils.generate();
+
+    final SubProtocol subprotocol1 = MockSubProtocol.create("eth");
+    final Capability cap1 = Capability.create(subprotocol1.getName(), 63);
+    final SubProtocol subprotocol2 = MockSubProtocol.create("oth");
+    final Capability cap2 = Capability.create(subprotocol2.getName(), 63);
+    try (final P2PNetwork listener =
+            builder("partner1client1")
+                .nodeKey(listenerNodeKey)
+                .supportedCapabilities(cap1)
+                .build();
+        final P2PNetwork connector =
+            builder("partner2client1")
+                .nodeKey(connectorNodeKey)
+                .supportedCapabilities(cap2)
+                .build()) {
+      listener.getRlpxAgent().subscribeConnectRequest(testCallback);
+      connector.getRlpxAgent().subscribeConnectRequest(testCallback);
+
+      listener.start();
+      connector.start();
+      final EnodeURL listenerEnode = listener.getLocalEnode().get();
+      final Bytes listenId = listenerEnode.getNodeId();
+      final int listenPort = listenerEnode.getListeningPort().get();
+
+      final Peer listenerPeer = createPeer(listenId, listenPort);
+      final CompletableFuture<PeerConnection> connectFuture = connector.connect(listenerPeer);
+      assertThatThrownBy(connectFuture::get).hasCauseInstanceOf(IncompatiblePeerException.class);
+    }
+  }
+
+  @Test
+  public void rejectIncomingConnectionFromDenylistedPeer() throws Exception {
+    final PeerPermissionsDenylist localDenylist = PeerPermissionsDenylist.create();
+
+    try (final P2PNetwork localNetwork =
+            builder("partner1client1").peerPermissions(localDenylist).build();
+        final P2PNetwork remoteNetwork = builder("partner2client1").build()) {
+      localNetwork.getRlpxAgent().subscribeConnectRequest(testCallback);
+      remoteNetwork.getRlpxAgent().subscribeConnectRequest(testCallback);
+
+      localNetwork.start();
+      remoteNetwork.start();
+
+      final EnodeURL localEnode = localNetwork.getLocalEnode().get();
+      final Bytes localId = localEnode.getNodeId();
+      final int localPort = localEnode.getListeningPort().get();
+
+      final EnodeURL remoteEnode = remoteNetwork.getLocalEnode().get();
+      final Bytes remoteId = remoteEnode.getNodeId();
+      final int remotePort = remoteEnode.getListeningPort().get();
+
+      final Peer localPeer = createPeer(localId, localPort);
+      final Peer remotePeer = createPeer(remoteId, remotePort);
+
+      // Denylist the remote peer
+      localDenylist.add(remotePeer);
+
+      // Setup disconnect listener
+      final CompletableFuture<PeerConnection> peerFuture = new CompletableFuture<>();
+      final CompletableFuture<DisconnectReason> reasonFuture = new CompletableFuture<>();
+      remoteNetwork.subscribeDisconnect(
+          (peerConnection, reason, initiatedByPeer) -> {
+            peerFuture.complete(peerConnection);
+            reasonFuture.complete(reason);
+          });
+
+      // Remote connect to local
+      final CompletableFuture<PeerConnection> connectFuture = remoteNetwork.connect(localPeer);
+
+      // Check connection is made, and then a disconnect is registered at remote
+      Assertions.assertThat(connectFuture.get(5L, TimeUnit.SECONDS).getPeerInfo().getNodeId())
+          .isEqualTo(localId);
+      Assertions.assertThat(peerFuture.get(5L, TimeUnit.SECONDS).getPeerInfo().getNodeId())
+          .isEqualTo(localId);
+      assertThat(reasonFuture.get(5L, TimeUnit.SECONDS))
+          .isEqualByComparingTo(DisconnectReason.UNKNOWN);
+    }
+  }
+
+  @Test
+  public void rejectIncomingConnectionFromDisallowedPeer() throws Exception {
+    final PeerPermissions peerPermissions = mock(PeerPermissions.class);
+    when(peerPermissions.isPermitted(any(), any(), any())).thenReturn(true);
+
+    try (final P2PNetwork localNetwork =
+            builder("partner1client1").peerPermissions(peerPermissions).build();
+        final P2PNetwork remoteNetwork = builder("partner2client1").build()) {
+      localNetwork.getRlpxAgent().subscribeConnectRequest(testCallback);
+      remoteNetwork.getRlpxAgent().subscribeConnectRequest(testCallback);
+
+      localNetwork.start();
+      remoteNetwork.start();
+
+      final EnodeURL localEnode = localNetwork.getLocalEnode().get();
+      final Peer localPeer = DefaultPeer.fromEnodeURL(localEnode);
+      final Peer remotePeer = DefaultPeer.fromEnodeURL(remoteNetwork.getLocalEnode().get());
+
+      // Deny incoming connection permissions for remotePeer
+      when(peerPermissions.isPermitted(
+              eq(localPeer),
+              eq(remotePeer),
+              eq(PeerPermissions.Action.RLPX_ALLOW_NEW_INBOUND_CONNECTION)))
+          .thenReturn(false);
+
+      // Setup disconnect listener
+      final CompletableFuture<PeerConnection> peerFuture = new CompletableFuture<>();
+      final CompletableFuture<DisconnectReason> reasonFuture = new CompletableFuture<>();
+      remoteNetwork.subscribeDisconnect(
+          (peerConnection, reason, initiatedByPeer) -> {
+            peerFuture.complete(peerConnection);
+            reasonFuture.complete(reason);
+          });
+
+      // Remote connect to local
+      final CompletableFuture<PeerConnection> connectFuture = remoteNetwork.connect(localPeer);
+
+      // Check connection is made, and then a disconnect is registered at remote
+      final Bytes localId = localEnode.getNodeId();
+      Assertions.assertThat(connectFuture.get(5L, TimeUnit.SECONDS).getPeerInfo().getNodeId())
+          .isEqualTo(localId);
+      Assertions.assertThat(peerFuture.get(5L, TimeUnit.SECONDS).getPeerInfo().getNodeId())
+          .isEqualTo(localId);
+      assertThat(reasonFuture.get(5L, TimeUnit.SECONDS))
+          .isEqualByComparingTo(DisconnectReason.UNKNOWN);
+    }
+  }
+
+  @Test
+  public void p2pOverTlsCanHandleRecordFragmentation() throws Exception {
+    // Given
+    final int tlsRecordSize = 16 * 1024;
+    final int threeTlsRecords = 2 * tlsRecordSize + 1;
+    final LargeMessageData largeMessageData =
+        new LargeMessageData(Bytes.of(buildPaddedMessage(threeTlsRecords)));
+
+    final NodeKey nodeKey = NodeKeyUtils.generate();
+    try (final P2PNetwork listener = builder("partner1client1").nodeKey(nodeKey).build();
+        final P2PNetwork connector = builder("partner2client1").build()) {
+      listener.getRlpxAgent().subscribeConnectRequest(testCallback);
+      connector.getRlpxAgent().subscribeConnectRequest(testCallback);
+
+      final CompletableFuture<DisconnectReason> disconnectReasonFuture = new CompletableFuture<>();
+      listener.subscribeDisconnect(
+          (peerConnection, reason, initiatedByPeer) -> {
+            if (!DisconnectReason.CLIENT_QUITTING.equals(
+                reason)) { // client quitting is the valid end state
+              disconnectReasonFuture.complete(reason);
+            }
+          });
+      final CompletableFuture<Message> successfulMessageFuture = new CompletableFuture<>();
+      listener.subscribe(
+          Capability.create("eth", 63),
+          (capability, message) -> {
+            if (message.getData().getCode() == LargeMessageData.VALID_ETH_MESSAGE_CODE) {
+              successfulMessageFuture.complete(message);
+            }
+          });
+
+      listener.start();
+      connector.start();
+
+      final EnodeURL listenerEnode = listener.getLocalEnode().get();
+      final Bytes listenId = listenerEnode.getNodeId();
+      final int listenPort = listenerEnode.getListeningPort().get();
+      final PeerConnection peerConnection =
+          connector.connect(createPeer(listenId, listenPort)).get(30000L, TimeUnit.SECONDS);
+
+      // When
+      peerConnection.sendForProtocol("eth", largeMessageData);
+
+      // Then
+      CompletableFuture.anyOf(disconnectReasonFuture, successfulMessageFuture)
+          .thenAccept(
+              successOrFailure -> {
+                if (successOrFailure instanceof DisconnectReason) {
+                  fail(
+                      "listener disconnected due to "
+                          + ((DisconnectReason) successOrFailure).name());
+                } else {
+                  final Message receivedMessage = (Message) successOrFailure;
+                  assertThat(receivedMessage.getData().getData())
+                      .isEqualTo(largeMessageData.getData());
+                }
+              })
+          .get(30L, TimeUnit.SECONDS);
+    }
+  }
+
+  private final ShouldConnectCallback testCallback = (p, d) -> true;
+
+  private static class LargeMessageData extends AbstractMessageData {
+
+    public static final int VALID_ETH_MESSAGE_CODE = 0x07;
+
+    private LargeMessageData(final Bytes data) {
+      super(data);
+    }
+
+    @Override
+    public int getCode() {
+      return VALID_ETH_MESSAGE_CODE;
+    }
+  }
+
+  private byte[] buildPaddedMessage(final int messageSize) {
+    final byte[] bytes = new byte[messageSize];
+    Arrays.fill(bytes, (byte) 9);
+    return bytes;
+  }
+
+  private Peer createPeer(final Bytes nodeId, final int listenPort) {
+    return DefaultPeer.fromEnodeURL(
+        EnodeURLImpl.builder()
+            .ipAddress(InetAddress.getLoopbackAddress().getHostAddress())
+            .nodeId(nodeId)
+            .discoveryAndListeningPorts(listenPort)
+            .build());
+  }
+
+  private static Path toPath(final String path) {
+    try {
+      return Path.of(Objects.requireNonNull(P2PPlainNetworkTest.class.getResource(path)).toURI());
+    } catch (final URISyntaxException e) {
+      throw new RuntimeException("Error converting to URI.", e);
+    }
+  }
+
+  public Optional<TLSConfiguration> p2pTLSEnabled(final String clientDirName) {
+    final String parentPath = "/keys";
+    final String keystorePath = parentPath + "/%s/client1.p12";
+    final String truststorePath = parentPath + "/%s/truststore.p12";
+    final String crl = parentPath + "/crl/crl.pem";
+    final TLSConfiguration.Builder builder = TLSConfiguration.Builder.tlsConfiguration();
+    builder
+        .withKeyStoreType(KEYSTORE_TYPE_PKCS12)
+        .withKeyStorePath(toPath(String.format(keystorePath, clientDirName)))
+        .withKeyStorePasswordSupplier(() -> "test123")
+        // .withKeyStorePasswordPath(toPath(String.format(nsspin, name)))
+        .withTrustStoreType(KEYSTORE_TYPE_PKCS12)
+        .withTrustStorePath(toPath(String.format(truststorePath, clientDirName)))
+        .withTrustStorePasswordSupplier(() -> "test123")
+        .withCrlPath(toPath(crl))
+        .withClientHelloSniEnabled(false);
+
+    return Optional.of(builder.build());
+  }
+
+  private DefaultP2PNetwork.Builder builder(final String clientDirName) {
+    final MutableBlockchain blockchainMock = mock(MutableBlockchain.class);
+    final Block blockMock = mock(Block.class);
+    when(blockMock.getHash()).thenReturn(Hash.ZERO);
+    when(blockchainMock.getGenesisBlock()).thenReturn(blockMock);
+    return DefaultP2PNetwork.builder()
+        .vertx(vertx)
+        .config(config)
+        .nodeKey(NodeKeyUtils.generate())
+        .p2pTLSConfiguration(p2pTLSEnabled(clientDirName))
+        .metricsSystem(new NoOpMetricsSystem())
+        .supportedCapabilities(Arrays.asList(Capability.create("eth", 63)))
+        .storageProvider(new InMemoryKeyValueStorageProvider())
+        .blockNumberForks(Collections.emptyList())
+        .timestampForks(Collections.emptyList())
+        .blockchain(blockchainMock)
+        .allConnectionsSupplier(Stream::empty)
+        .allActiveConnectionsSupplier(Stream::empty);
+  }
+}
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/PeerDenylistManagerTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/PeerDenylistManagerTest.java
new file mode 100644
index 00000000000..38435d9d53c
--- /dev/null
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/PeerDenylistManagerTest.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.network;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
+import org.hyperledger.besu.ethereum.p2p.peers.MaintainedPeers;
+import org.hyperledger.besu.ethereum.p2p.peers.Peer;
+import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions;
+import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissionsDenylist;
+import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Test;
+
+public class PeerDenylistManagerTest {
+  private final Peer localNode = generatePeer();
+  private final PeerDenylistManager peerDenylistManager;
+  private final PeerPermissionsDenylist denylist;
+  private final MaintainedPeers maintainedPeers = new MaintainedPeers();
+
+  public PeerDenylistManagerTest() {
+    denylist = PeerPermissionsDenylist.create();
+    peerDenylistManager = new PeerDenylistManager(denylist, maintainedPeers);
+  }
+
+  @Test
+  public void doesNotDenylistPeerForNormalDisconnect() {
+    final PeerConnection peer = generatePeerConnection();
+
+    checkPermissions(denylist, peer.getPeer(), true);
+
+    peerDenylistManager.onDisconnect(peer, DisconnectReason.TOO_MANY_PEERS, false);
+
+    checkPermissions(denylist, peer.getPeer(), true);
+  }
+
+  @Test
+  public void denylistPeerForBadBehavior() {
+    final PeerConnection peer = generatePeerConnection();
+
+    checkPermissions(denylist, peer.getPeer(), true);
+    peerDenylistManager.onDisconnect(peer, DisconnectReason.BREACH_OF_PROTOCOL, false);
+    checkPermissions(denylist, peer.getPeer(), false);
+  }
+
+  @Test
+  public void doesNotDenylistPeerForOurBadBehavior() {
+    final PeerConnection peer = generatePeerConnection();
+
+    checkPermissions(denylist, peer.getPeer(), true);
+    peerDenylistManager.onDisconnect(peer, DisconnectReason.BREACH_OF_PROTOCOL, true);
+    checkPermissions(denylist, peer.getPeer(), true);
+  }
+
+  @Test
+  public void doesNotDenylistMaintainedPeer() {
+    final PeerConnection peer = generatePeerConnection();
+    maintainedPeers.add(peer.getPeer());
+
+    checkPermissions(denylist, peer.getPeer(), true);
+    peerDenylistManager.onDisconnect(peer, DisconnectReason.BREACH_OF_PROTOCOL, false);
+    checkPermissions(denylist, peer.getPeer(), true);
+  }
+
+  @Test
+  public void denylistIncompatiblePeer() {
+    final PeerConnection peer = generatePeerConnection();
+
+    checkPermissions(denylist, peer.getPeer(), true);
+    peerDenylistManager.onDisconnect(
+        peer, DisconnectReason.INCOMPATIBLE_P2P_PROTOCOL_VERSION, false);
+    checkPermissions(denylist, peer.getPeer(), false);
+  }
+
+  @Test
+  public void denylistIncompatiblePeerWhoIssuesDisconnect() {
+    final PeerConnection peer = generatePeerConnection();
+
+    checkPermissions(denylist, peer.getPeer(), true);
+    peerDenylistManager.onDisconnect(
+        peer, DisconnectReason.INCOMPATIBLE_P2P_PROTOCOL_VERSION, true);
+    checkPermissions(denylist, peer.getPeer(), false);
+  }
+
+  private void checkPermissions(
+      final PeerPermissionsDenylist denylist, final Peer remotePeer, final boolean expectedResult) {
+    for (PeerPermissions.Action action : PeerPermissions.Action.values()) {
+      assertThat(denylist.isPermitted(localNode, remotePeer, action)).isEqualTo(expectedResult);
+    }
+  }
+
+  private PeerConnection generatePeerConnection() {
+    final Bytes nodeId = Peer.randomId();
+    final PeerConnection conn = mock(PeerConnection.class);
+    final PeerInfo peerInfo = mock(PeerInfo.class);
+    final Peer peer = generatePeer();
+
+    when(peerInfo.getNodeId()).thenReturn(nodeId);
+    when(conn.getPeerInfo()).thenReturn(peerInfo);
+    when(conn.getPeer()).thenReturn(peer);
+
+    return conn;
+  }
+
+  private Peer generatePeer() {
+    return DefaultPeer.fromEnodeURL(
+        EnodeURLImpl.builder()
+            .nodeId(Peer.randomId())
+            .ipAddress("10.9.8.7")
+            .discoveryPort(65535)
+            .listeningPort(65534)
+            .build());
+  }
+}
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/PeerReputationManagerTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/PeerReputationManagerTest.java
deleted file mode 100644
index d7e222cc0a1..00000000000
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/network/PeerReputationManagerTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.p2p.network;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
-import org.hyperledger.besu.ethereum.p2p.peers.Peer;
-import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions;
-import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissionsDenylist;
-import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
-import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo;
-import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-
-public class PeerReputationManagerTest {
-  private final Peer localNode = generatePeer();
-  private final PeerReputationManager peerReputationManager;
-  private final PeerPermissionsDenylist blacklist;
-
-  public PeerReputationManagerTest() {
-    blacklist = PeerPermissionsDenylist.create();
-    peerReputationManager = new PeerReputationManager(blacklist);
-  }
-
-  @Test
-  public void doesNotBlacklistPeerForNormalDisconnect() {
-    final PeerConnection peer = generatePeerConnection();
-
-    checkPermissions(blacklist, peer.getPeer(), true);
-
-    peerReputationManager.onDisconnect(peer, DisconnectReason.TOO_MANY_PEERS, false);
-
-    checkPermissions(blacklist, peer.getPeer(), true);
-  }
-
-  @Test
-  public void blacklistPeerForBadBehavior() {
-    final PeerConnection peer = generatePeerConnection();
-
-    checkPermissions(blacklist, peer.getPeer(), true);
-    peerReputationManager.onDisconnect(peer, DisconnectReason.BREACH_OF_PROTOCOL, false);
-    checkPermissions(blacklist, peer.getPeer(), false);
-  }
-
-  @Test
-  public void doesNotBlacklistPeerForOurBadBehavior() {
-    final PeerConnection peer = generatePeerConnection();
-
-    checkPermissions(blacklist, peer.getPeer(), true);
-    peerReputationManager.onDisconnect(peer, DisconnectReason.BREACH_OF_PROTOCOL, true);
-    checkPermissions(blacklist, peer.getPeer(), true);
-  }
-
-  @Test
-  public void blacklistIncompatiblePeer() {
-    final PeerConnection peer = generatePeerConnection();
-
-    checkPermissions(blacklist, peer.getPeer(), true);
-    peerReputationManager.onDisconnect(
-        peer, DisconnectReason.INCOMPATIBLE_P2P_PROTOCOL_VERSION, false);
-    checkPermissions(blacklist, peer.getPeer(), false);
-  }
-
-  @Test
-  public void blacklistIncompatiblePeerWhoIssuesDisconnect() {
-    final PeerConnection peer = generatePeerConnection();
-
-    checkPermissions(blacklist, peer.getPeer(), true);
-    peerReputationManager.onDisconnect(
-        peer, DisconnectReason.INCOMPATIBLE_P2P_PROTOCOL_VERSION, true);
-    checkPermissions(blacklist, peer.getPeer(), false);
-  }
-
-  private void checkPermissions(
-      final PeerPermissionsDenylist blacklist,
-      final Peer remotePeer,
-      final boolean expectedResult) {
-    for (PeerPermissions.Action action : PeerPermissions.Action.values()) {
-      assertThat(blacklist.isPermitted(localNode, remotePeer, action)).isEqualTo(expectedResult);
-    }
-  }
-
-  private PeerConnection generatePeerConnection() {
-    final Bytes nodeId = Peer.randomId();
-    final PeerConnection conn = mock(PeerConnection.class);
-    final PeerInfo peerInfo = mock(PeerInfo.class);
-    final Peer peer = generatePeer();
-
-    when(peerInfo.getNodeId()).thenReturn(nodeId);
-    when(conn.getPeerInfo()).thenReturn(peerInfo);
-    when(conn.getPeer()).thenReturn(peer);
-
-    return conn;
-  }
-
-  private Peer generatePeer() {
-    return DefaultPeer.fromEnodeURL(
-        EnodeURL.builder()
-            .nodeId(Peer.randomId())
-            .ipAddress("10.9.8.7")
-            .discoveryPort(65535)
-            .listeningPort(65534)
-            .build());
-  }
-}
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultLocalNodeTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultLocalNodeTest.java
index 8138fdbfc7c..aaecffda2be 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultLocalNodeTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/DefaultLocalNodeTest.java
@@ -19,6 +19,7 @@
 
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.PeerInfo;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.util.Arrays;
 import java.util.List;
@@ -35,7 +36,7 @@ public class DefaultLocalNodeTest {
   private final Bytes nodeId = Bytes.of(new byte[64]);
   private final int port = 30303;
   private final EnodeURL enode =
-      EnodeURL.builder()
+      EnodeURLImpl.builder()
           .ipAddress("127.0.0.1")
           .discoveryAndListeningPorts(port)
           .nodeId(nodeId)
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLImplTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLImplTest.java
new file mode 100644
index 00000000000..c6ebfe77a48
--- /dev/null
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLImplTest.java
@@ -0,0 +1,1067 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.peers;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.catchThrowable;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.hyperledger.besu.plugin.data.EnodeURL;
+import org.hyperledger.besu.util.IllegalPortException;
+
+import java.net.InetAddress;
+import java.net.URI;
+import java.net.UnknownHostException;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.assertj.core.api.ThrowableAssert;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class EnodeURLImplTest {
+
+  private final String VALID_NODE_ID =
+      "6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0";
+  private final String IPV4_ADDRESS = "192.168.0.1";
+  private final String IPV6_FULL_ADDRESS = "[2001:db8:85a3:0:0:8a2e:370:7334]";
+  private final String IPV6_COMPACT_ADDRESS = "[2001:db8:85a3::8a2e:370:7334]";
+  private final int P2P_PORT = 30303;
+  private final int DISCOVERY_PORT = 30301;
+  private final String DISCOVERY_QUERY = "discport=" + DISCOVERY_PORT;
+
+  @Test
+  public void build_withMatchingDiscoveryAndListeningPorts() {
+    final EnodeURL enode =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .listeningPort(P2P_PORT)
+            .discoveryPort(Optional.of(P2P_PORT))
+            .build();
+    assertThat(enode.getListeningPortOrZero()).isEqualTo(P2P_PORT);
+    assertThat(enode.getDiscoveryPortOrZero()).isEqualTo(P2P_PORT);
+  }
+
+  @Test
+  public void build_withNonMatchingDiscoveryAndListeningPorts() {
+    final EnodeURL enode =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .listeningPort(P2P_PORT)
+            .discoveryPort(Optional.of(DISCOVERY_PORT))
+            .build();
+    assertThat(enode.getListeningPortOrZero()).isEqualTo(P2P_PORT);
+    assertThat(enode.getDiscoveryPortOrZero()).isEqualTo(DISCOVERY_PORT);
+  }
+
+  @Test
+  public void fromString_withDiscoveryPortShouldBuildExpectedEnodeURLObject() {
+    final EnodeURL expectedEnodeURL =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .listeningPort(P2P_PORT)
+            .discoveryPort(Optional.of(DISCOVERY_PORT))
+            .build();
+    final String enodeURLString =
+        "enode://" + VALID_NODE_ID + "@" + IPV4_ADDRESS + ":" + P2P_PORT + "?" + DISCOVERY_QUERY;
+
+    final EnodeURL enodeURL = EnodeURLImpl.fromString(enodeURLString);
+
+    assertThat(enodeURL).isEqualTo(expectedEnodeURL);
+    assertThat(enodeURL.toString()).isEqualTo(enodeURLString);
+  }
+
+  @Test
+  public void fromString_withoutDiscoveryPortShouldBuildExpectedEnodeURLObject() {
+    final EnodeURL expectedEnodeURL =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .discoveryAndListeningPorts(P2P_PORT)
+            .build();
+    final String enodeURLString = "enode://" + VALID_NODE_ID + "@" + IPV4_ADDRESS + ":" + P2P_PORT;
+
+    final EnodeURL enodeURL = EnodeURLImpl.fromString(enodeURLString);
+
+    assertThat(enodeURL).isEqualTo(expectedEnodeURL);
+    assertThat(enodeURL.toString()).isEqualTo(enodeURLString);
+  }
+
+  @Test
+  public void fromString_withIPV6ShouldBuildExpectedEnodeURLObject() {
+    final EnodeURL expectedEnodeURL =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV6_FULL_ADDRESS)
+            .listeningPort(P2P_PORT)
+            .discoveryPort(Optional.of(DISCOVERY_PORT))
+            .build();
+    final String enodeURLString =
+        "enode://"
+            + VALID_NODE_ID
+            + "@"
+            + IPV6_FULL_ADDRESS
+            + ":"
+            + P2P_PORT
+            + "?"
+            + DISCOVERY_QUERY;
+
+    final EnodeURL enodeURL = EnodeURLImpl.fromString(enodeURLString);
+
+    assertThat(enodeURL).isEqualTo(expectedEnodeURL);
+  }
+
+  @Test
+  public void fromString_withIPV6InCompactFormShouldBuildExpectedEnodeURLObject() {
+    final EnodeURL expectedEnodeURL =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV6_COMPACT_ADDRESS)
+            .listeningPort(P2P_PORT)
+            .discoveryPort(Optional.of(DISCOVERY_PORT))
+            .build();
+    final String enodeURLString =
+        "enode://"
+            + VALID_NODE_ID
+            + "@"
+            + IPV6_COMPACT_ADDRESS
+            + ":"
+            + P2P_PORT
+            + "?"
+            + DISCOVERY_QUERY;
+
+    final EnodeURL enodeURL = EnodeURLImpl.fromString(enodeURLString);
+
+    assertThat(enodeURL).isEqualTo(expectedEnodeURL);
+    assertThat(enodeURL.toString()).isEqualTo(enodeURLString);
+  }
+
+  @Test
+  public void fromString_with0ValuedDiscoveryPort() {
+    final String query = "discport=0";
+    final String enodeURLString =
+        "enode://" + VALID_NODE_ID + "@" + IPV6_COMPACT_ADDRESS + ":" + P2P_PORT + "?" + query;
+
+    EnodeURL enodeURL = EnodeURLImpl.fromString(enodeURLString);
+    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
+    assertThat("[" + enodeURL.getIpAsString() + "]").isEqualTo(IPV6_FULL_ADDRESS);
+    assertThat(enodeURL.getListeningPort()).isEqualTo(Optional.of(P2P_PORT));
+    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(0);
+    assertThat(enodeURL.isListening()).isTrue();
+    assertThat(enodeURL.isRunningDiscovery()).isFalse();
+
+    assertThat(enodeURL.toString()).isEqualTo(enodeURLString);
+  }
+
+  @Test
+  public void fromString_with0ValuedListeningPort() {
+    final String enodeURLString = "enode://" + VALID_NODE_ID + "@" + IPV4_ADDRESS + ":" + 0;
+
+    EnodeURL enodeURL = EnodeURLImpl.fromString(enodeURLString);
+    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
+    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
+    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(0);
+    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(0);
+    assertThat(enodeURL.isListening()).isFalse();
+    assertThat(enodeURL.isRunningDiscovery()).isFalse();
+
+    assertThat(enodeURL.toString()).isEqualTo(enodeURLString);
+  }
+
+  @Test
+  public void fromString_with0ValuedListeningPortAndExplicit0ValuedDiscPort() {
+    final String query = "discport=0";
+    final String enodeURLString =
+        "enode://" + VALID_NODE_ID + "@" + IPV4_ADDRESS + ":" + 0 + "?" + query;
+
+    EnodeURL enodeURL = EnodeURLImpl.fromString(enodeURLString);
+    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
+    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
+    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(0);
+    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(0);
+    assertThat(enodeURL.isListening()).isFalse();
+    assertThat(enodeURL.isRunningDiscovery()).isFalse();
+  }
+
+  @Test
+  public void fromString_withoutNodeIdShouldFail() {
+    final String enodeURLString = "enode://@" + IPV4_ADDRESS + ":" + P2P_PORT;
+    final Throwable thrown = catchThrowable(() -> EnodeURLImpl.fromString(enodeURLString));
+
+    assertThat(thrown)
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Missing node ID.");
+  }
+
+  @Test
+  public void fromString_withInvalidSizeNodeIdShouldFail() {
+    final String enodeURLString = "enode://wrong_size_string@" + IPV4_ADDRESS + ":" + P2P_PORT;
+    final Throwable thrown = catchThrowable(() -> EnodeURLImpl.fromString(enodeURLString));
+
+    assertThat(thrown)
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Invalid node ID");
+  }
+
+  @Test
+  public void fromString_withInvalidHexCharacterNodeIdShouldFail() {
+    final String enodeURLString =
+        "enode://0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000@"
+            + IPV4_ADDRESS
+            + ":"
+            + P2P_PORT;
+    final Throwable thrown = catchThrowable(() -> EnodeURLImpl.fromString(enodeURLString));
+
+    assertThat(thrown)
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Invalid node ID");
+  }
+
+  @Test
+  public void fromString_withoutIpShouldFail() {
+    final String enodeURLString = "enode://" + VALID_NODE_ID + "@:" + P2P_PORT;
+    final Throwable thrown = catchThrowable(() -> EnodeURLImpl.fromString(enodeURLString));
+
+    assertThat(thrown)
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Missing or invalid host or ip address.");
+  }
+
+  @Test
+  public void fromString_withInvalidIpFormatShouldFail() {
+    final String enodeURLString = "enode://" + VALID_NODE_ID + "@192.0.1:" + P2P_PORT;
+    final Throwable thrown = catchThrowable(() -> EnodeURLImpl.fromString(enodeURLString));
+
+    assertThat(thrown)
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Missing or invalid host or ip address.");
+  }
+
+  @Test
+  public void fromString_withoutListeningPortShouldFail() {
+    final String enodeURLString = "enode://" + VALID_NODE_ID + "@" + IPV4_ADDRESS + ":";
+    final Throwable thrown = catchThrowable(() -> EnodeURLImpl.fromString(enodeURLString));
+
+    assertThat(thrown).hasCauseInstanceOf(IllegalPortException.class);
+  }
+
+  @Test
+  public void fromString_withoutListeningPortAndWithDiscoveryPortShouldFail() {
+    final String enodeURLString =
+        "enode://" + VALID_NODE_ID + "@" + IPV4_ADDRESS + ":?discport=30301";
+    final Throwable thrown = catchThrowable(() -> EnodeURLImpl.fromString(enodeURLString));
+
+    assertThat(thrown).hasCauseInstanceOf(IllegalPortException.class);
+  }
+
+  @Test
+  public void fromString_withAboveRangeListeningPortShouldFail() {
+    final String enodeURLString = "enode://" + VALID_NODE_ID + "@" + IPV4_ADDRESS + ":98765";
+    final Throwable thrown = catchThrowable(() -> EnodeURLImpl.fromString(enodeURLString));
+
+    assertThat(thrown).hasCauseInstanceOf(IllegalPortException.class);
+  }
+
+  @Test
+  public void fromString_withAboveRangeDiscoveryPortShouldFail() {
+    final String enodeURLString =
+        "enode://" + VALID_NODE_ID + "@" + IPV4_ADDRESS + ":" + P2P_PORT + "?discport=98765";
+    final Throwable thrown = catchThrowable(() -> EnodeURLImpl.fromString(enodeURLString));
+
+    assertThat(thrown).hasCauseInstanceOf(IllegalPortException.class);
+  }
+
+  @Test
+  public void fromString_withMisspelledDiscoveryParam() {
+    final String query = "adiscport=1234";
+    final String enodeURLString =
+        "enode://" + VALID_NODE_ID + "@" + IPV6_FULL_ADDRESS + ":" + P2P_PORT + "?" + query;
+
+    assertThatThrownBy(() -> EnodeURLImpl.fromString(enodeURLString))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Invalid discovery port: '" + query + "'");
+  }
+
+  @Test
+  public void fromString_withAdditionalTrailingQueryParam() {
+    final String query = "discport=1234&other=y";
+    final String enodeURLString =
+        "enode://" + VALID_NODE_ID + "@" + IPV6_FULL_ADDRESS + ":" + P2P_PORT + "?" + query;
+
+    assertThatThrownBy(() -> EnodeURLImpl.fromString(enodeURLString))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Invalid discovery port: '" + query + "'");
+  }
+
+  @Test
+  public void fromString_withAdditionalLeadingQueryParam() {
+    final String query = "other=123&discport=1234";
+    final String enodeURLString =
+        "enode://" + VALID_NODE_ID + "@" + IPV6_FULL_ADDRESS + ":" + P2P_PORT + "?" + query;
+
+    assertThatThrownBy(() -> EnodeURLImpl.fromString(enodeURLString))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Invalid discovery port: '" + query + "'");
+  }
+
+  @Test
+  public void fromString_withAdditionalLeadingAndTrailingQueryParams() {
+    final String query = "other=123&discport=1234&other2=456";
+    final String enodeURLString =
+        "enode://" + VALID_NODE_ID + "@" + IPV6_FULL_ADDRESS + ":" + P2P_PORT + "?" + query;
+
+    assertThatThrownBy(() -> EnodeURLImpl.fromString(enodeURLString))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Invalid discovery port: '" + query + "'");
+  }
+
+  @Test
+  public void fromString_withMultipleDiscoveryParams() {
+    final String query = "discport=1234&discport=456";
+    final String enodeURLString =
+        "enode://" + VALID_NODE_ID + "@" + IPV6_FULL_ADDRESS + ":" + P2P_PORT + "?" + query;
+
+    assertThatThrownBy(() -> EnodeURLImpl.fromString(enodeURLString))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Invalid discovery port: '" + query + "'");
+  }
+
+  @Test
+  public void fromString_withNullEnodeURLShouldFail() {
+    final Throwable thrown = catchThrowable(() -> EnodeURLImpl.fromString(null));
+
+    assertThat(thrown)
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Invalid empty value");
+  }
+
+  @Test
+  public void fromString_withEmptyEnodeURLShouldFail() {
+    final Throwable thrown = catchThrowable(() -> EnodeURLImpl.fromString(""));
+
+    assertThat(thrown)
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Invalid empty value.");
+  }
+
+  @Test
+  public void fromString_withWhitespaceEnodeURLShouldFail() {
+    final Throwable thrown = catchThrowable(() -> EnodeURLImpl.fromString(" "));
+
+    assertThat(thrown)
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Invalid empty value.");
+  }
+
+  @Test
+  public void fromStringInvalidNodeIdLengthHasDescriptiveMessage() {
+    String invalidEnodeURL =
+        String.format("enode://%s@%s:%d", VALID_NODE_ID.substring(1), IPV4_ADDRESS, P2P_PORT);
+    assertThatThrownBy(() -> EnodeURLImpl.fromString(invalidEnodeURL))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageEndingWith(
+            "Invalid node ID: node ID must have exactly 128 hexadecimal characters and should not include any '0x' hex prefix.");
+  }
+
+  @Test
+  public void fromString_withHostnameEnodeURLShouldFailWhenDnsDisabled() {
+    final String enodeURLString =
+        "enode://" + VALID_NODE_ID + "@" + "localhost" + ":" + P2P_PORT + "?" + DISCOVERY_QUERY;
+
+    assertThatThrownBy(
+            () ->
+                EnodeURLImpl.fromString(
+                    enodeURLString,
+                    ImmutableEnodeDnsConfiguration.builder()
+                        .dnsEnabled(false)
+                        .updateEnabled(false)
+                        .build()))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Invalid enode URL syntax");
+  }
+
+  @Test
+  public void fromString_withHostnameEnodeURLShouldFailWhenDnsDisabledAndUpdateEnabled() {
+    final String enodeURLString =
+        "enode://" + VALID_NODE_ID + "@" + "localhost" + ":" + P2P_PORT + "?" + DISCOVERY_QUERY;
+
+    assertThatThrownBy(
+            () ->
+                EnodeURLImpl.fromString(
+                    enodeURLString,
+                    ImmutableEnodeDnsConfiguration.builder()
+                        .dnsEnabled(false)
+                        .updateEnabled(true)
+                        .build()))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Invalid enode URL syntax");
+  }
+
+  @Test
+  public void fromString_withHostnameEnodeURLShouldWorkWhenDnsEnabled() {
+    final EnodeURL expectedEnodeURL =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress("127.0.0.1")
+            .listeningPort(P2P_PORT)
+            .discoveryPort(Optional.of(DISCOVERY_PORT))
+            .build();
+    final String enodeURLString =
+        "enode://" + VALID_NODE_ID + "@" + "localhost" + ":" + P2P_PORT + "?" + DISCOVERY_QUERY;
+
+    final EnodeURL enodeURL =
+        EnodeURLImpl.fromString(
+            enodeURLString,
+            ImmutableEnodeDnsConfiguration.builder().dnsEnabled(true).updateEnabled(false).build());
+    ;
+
+    assertThat(enodeURL).isEqualTo(expectedEnodeURL);
+  }
+
+  @Test
+  public void fromString_withHostnameEnodeURLShouldWorkWhenDnsEnabledAndUpdateEnabled() {
+    final EnodeURL expectedEnodeURL =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress("127.0.0.1")
+            .listeningPort(P2P_PORT)
+            .discoveryPort(Optional.of(DISCOVERY_PORT))
+            .build();
+    final String enodeURLString =
+        "enode://" + VALID_NODE_ID + "@" + "localhost" + ":" + P2P_PORT + "?" + DISCOVERY_QUERY;
+
+    final EnodeURL enodeURL =
+        EnodeURLImpl.fromString(
+            enodeURLString,
+            ImmutableEnodeDnsConfiguration.builder().dnsEnabled(true).updateEnabled(false).build());
+    ;
+
+    assertThat(enodeURL).isEqualTo(expectedEnodeURL);
+  }
+
+  @Test
+  public void toURI_WithDiscoveryPortCreateExpectedURI() {
+    final String enodeURLString =
+        "enode://" + VALID_NODE_ID + "@" + IPV4_ADDRESS + ":" + P2P_PORT + "?" + DISCOVERY_QUERY;
+    final URI expectedURI = URI.create(enodeURLString);
+    final URI createdURI = EnodeURLImpl.fromString(enodeURLString).toURI();
+
+    assertThat(createdURI).isEqualTo(expectedURI);
+  }
+
+  @Test
+  public void toURI_WithoutDiscoveryPortCreateExpectedURI() {
+    final String enodeURLString = "enode://" + VALID_NODE_ID + "@" + IPV4_ADDRESS + ":" + P2P_PORT;
+    final URI expectedURI = URI.create(enodeURLString);
+    final URI createdURI = EnodeURLImpl.fromString(enodeURLString).toURI();
+
+    assertThat(createdURI).isEqualTo(expectedURI);
+  }
+
+  @Test
+  public void toURI_WithHostnameShouldWorkWhenDnsEnabled() {
+    final String enodeURLString = "enode://" + VALID_NODE_ID + "@" + "localhost" + ":" + P2P_PORT;
+    final URI expectedURI =
+        URI.create("enode://" + VALID_NODE_ID + "@" + "127.0.0.1" + ":" + P2P_PORT);
+    final URI createdURI =
+        EnodeURLImpl.fromString(
+                enodeURLString,
+                ImmutableEnodeDnsConfiguration.builder()
+                    .dnsEnabled(true)
+                    .updateEnabled(false)
+                    .build())
+            .toURI();
+
+    assertThat(createdURI).isEqualTo(expectedURI);
+  }
+
+  @Test
+  public void toURI_WithHostnameShouldWorkWhenDnsEnabledAndUpdateEnabled()
+      throws UnknownHostException {
+    final String enodeURLString =
+        "enode://"
+            + VALID_NODE_ID
+            + "@"
+            + InetAddress.getLocalHost().getCanonicalHostName()
+            + ":"
+            + P2P_PORT;
+    final URI expectedURI = URI.create(enodeURLString);
+    final URI createdURI =
+        EnodeURLImpl.fromString(
+                enodeURLString,
+                ImmutableEnodeDnsConfiguration.builder()
+                    .dnsEnabled(true)
+                    .updateEnabled(true)
+                    .build())
+            .toURI();
+
+    assertThat(createdURI).isEqualTo(expectedURI);
+  }
+
+  @Test
+  public void fromURI_withHostnameShouldFailWhenDnsDisabled() {
+    final String enodeURLString =
+        "enode://" + VALID_NODE_ID + "@" + "localhost" + ":" + P2P_PORT + "?" + DISCOVERY_QUERY;
+    final URI expectedURI = URI.create(enodeURLString);
+
+    assertThatThrownBy(
+            () ->
+                EnodeURLImpl.fromURI(
+                    expectedURI,
+                    ImmutableEnodeDnsConfiguration.builder()
+                        .dnsEnabled(false)
+                        .updateEnabled(false)
+                        .build()))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Invalid ip address");
+  }
+
+  @Test
+  public void fromURI_withHostnameEnodeURLShouldWorkWhenDnsEnabled() {
+    final EnodeURL expectedEnodeURL =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress("127.0.0.1")
+            .listeningPort(P2P_PORT)
+            .discoveryPort(Optional.of(DISCOVERY_PORT))
+            .build();
+
+    final String enodeURLString =
+        "enode://" + VALID_NODE_ID + "@" + "localhost" + ":" + P2P_PORT + "?" + DISCOVERY_QUERY;
+    final URI expectedURI = URI.create(enodeURLString);
+
+    final EnodeURL enodeURL =
+        EnodeURLImpl.fromURI(
+            expectedURI,
+            ImmutableEnodeDnsConfiguration.builder().dnsEnabled(true).updateEnabled(false).build());
+    assertThat(enodeURL).isEqualTo(expectedEnodeURL);
+  }
+
+  @Test
+  public void builder_setInvalidPorts() {
+    final EnodeURLImpl.Builder validBuilder =
+        EnodeURLImpl.builder().nodeId(VALID_NODE_ID).ipAddress(IPV4_ADDRESS);
+
+    Stream.<ThrowableAssert.ThrowingCallable>of(
+            () -> validBuilder.listeningPort(200_000).disableDiscovery().build(),
+            () -> validBuilder.listeningPort(-2).disableDiscovery().build(),
+            () -> validBuilder.discoveryPort(-1).disableListening().build(),
+            () -> validBuilder.discoveryPort(100_000).disableListening().build())
+        .forEach(assertThatExceptionOfType(IllegalPortException.class)::isThrownBy);
+  }
+
+  @Test
+  public void builder_setEachPortExplicitly() {
+    final EnodeURL enodeURL =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .listeningPort(P2P_PORT)
+            .discoveryPort(DISCOVERY_PORT)
+            .build();
+
+    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
+    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
+    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(P2P_PORT);
+    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(DISCOVERY_PORT);
+    assertThat(enodeURL.isListening()).isTrue();
+    assertThat(enodeURL.isRunningDiscovery()).isTrue();
+  }
+
+  @Test
+  public void builder_setPortsTogether() {
+    final EnodeURL enodeURL =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .discoveryAndListeningPorts(P2P_PORT)
+            .build();
+
+    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
+    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
+    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(P2P_PORT);
+    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(P2P_PORT);
+    assertThat(enodeURL.isListening()).isTrue();
+    assertThat(enodeURL.isRunningDiscovery()).isTrue();
+  }
+
+  @Test
+  public void builder_setDefaultPorts() {
+    final EnodeURL enodeURL =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .useDefaultPorts()
+            .build();
+
+    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
+    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
+    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(EnodeURLImpl.DEFAULT_LISTENING_PORT);
+    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(EnodeURLImpl.DEFAULT_LISTENING_PORT);
+    assertThat(enodeURL.isListening()).isTrue();
+    assertThat(enodeURL.isRunningDiscovery()).isTrue();
+  }
+
+  @Test
+  public void builder_discoveryDisabled() {
+    final EnodeURL enodeURL =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .listeningPort(P2P_PORT)
+            .disableDiscovery()
+            .build();
+
+    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
+    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
+    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(P2P_PORT);
+    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(0);
+    assertThat(enodeURL.isListening()).isTrue();
+    assertThat(enodeURL.isRunningDiscovery()).isFalse();
+  }
+
+  @Test
+  public void builder_listeningDisabled() {
+    final EnodeURL enodeURL =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .discoveryPort(P2P_PORT)
+            .disableListening()
+            .build();
+
+    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
+    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
+    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(0);
+    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(P2P_PORT);
+    assertThat(enodeURL.isListening()).isFalse();
+    assertThat(enodeURL.isRunningDiscovery()).isTrue();
+  }
+
+  @Test
+  public void builder_listeningAndDiscoveryDisabled() {
+    final EnodeURL enodeURL =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .disableDiscovery()
+            .disableListening()
+            .build();
+
+    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
+    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
+    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(0);
+    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(0);
+    assertThat(enodeURL.isListening()).isFalse();
+    assertThat(enodeURL.isRunningDiscovery()).isFalse();
+  }
+
+  @Test
+  public void builder_setPortsTo0() {
+    final EnodeURL enodeURL =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .discoveryAndListeningPorts(0)
+            .build();
+
+    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
+    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
+    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(0);
+    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(0);
+    assertThat(enodeURL.isListening()).isFalse();
+    assertThat(enodeURL.isRunningDiscovery()).isFalse();
+  }
+
+  @Test
+  public void builder_setDiscoveryPortTo0() {
+    final EnodeURL enodeURL =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .discoveryPort(0)
+            .listeningPort(P2P_PORT)
+            .build();
+
+    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
+    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
+    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(P2P_PORT);
+    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(0);
+    assertThat(enodeURL.isListening()).isTrue();
+    assertThat(enodeURL.isRunningDiscovery()).isFalse();
+  }
+
+  @Test
+  public void builder_setListeningPortTo0() {
+    final EnodeURL enodeURL =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .discoveryPort(P2P_PORT)
+            .listeningPort(0)
+            .build();
+
+    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
+    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
+    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(0);
+    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(P2P_PORT);
+    assertThat(enodeURL.isListening()).isFalse();
+    assertThat(enodeURL.isRunningDiscovery()).isTrue();
+  }
+
+  @Test
+  public void builder_setDiscoveryPortToEmptyValue() {
+    final EnodeURL enodeURL =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .discoveryPort(Optional.empty())
+            .listeningPort(P2P_PORT)
+            .build();
+
+    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
+    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
+    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(P2P_PORT);
+    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(0);
+    assertThat(enodeURL.isListening()).isTrue();
+    assertThat(enodeURL.isRunningDiscovery()).isFalse();
+  }
+
+  @Test
+  public void builder_setListeningPortToEmptyValue() {
+    final EnodeURL enodeURL =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .discoveryPort(P2P_PORT)
+            .listeningPort(Optional.empty())
+            .build();
+
+    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
+    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
+    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(0);
+    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(P2P_PORT);
+    assertThat(enodeURL.isListening()).isFalse();
+    assertThat(enodeURL.isRunningDiscovery()).isTrue();
+  }
+
+  @Test
+  public void builder_discoveryNotSpecified() {
+    final EnodeURLImpl.Builder builder =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .listeningPort(P2P_PORT);
+
+    assertThatThrownBy(builder::build)
+        .isInstanceOf(IllegalStateException.class)
+        .hasMessageContaining("Discovery port must be configured");
+  }
+
+  @Test
+  public void builder_listeningPortNotSpecified() {
+    final EnodeURLImpl.Builder builder =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .discoveryPort(P2P_PORT);
+
+    assertThatThrownBy(builder::build)
+        .isInstanceOf(IllegalStateException.class)
+        .hasMessageContaining("Listening port must be configured");
+  }
+
+  @Test
+  public void builder_nodeIdNotSpecified() {
+    final EnodeURLImpl.Builder builder =
+        EnodeURLImpl.builder().ipAddress(IPV4_ADDRESS).discoveryAndListeningPorts(P2P_PORT);
+
+    assertThatThrownBy(builder::build)
+        .isInstanceOf(IllegalStateException.class)
+        .hasMessageContaining("Node id must be configured");
+  }
+
+  @Test
+  public void builder_ipNotSpecified() {
+    final EnodeURLImpl.Builder builder =
+        EnodeURLImpl.builder().nodeId(VALID_NODE_ID).discoveryAndListeningPorts(P2P_PORT);
+
+    assertThatThrownBy(builder::build)
+        .isInstanceOf(IllegalStateException.class)
+        .hasMessageContaining("Ip address must be configured");
+  }
+
+  @Test
+  public void sameListeningEndpoint_forMatchingEnodes() {
+    final EnodeURL enodeA =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .listeningPort(P2P_PORT)
+            .discoveryPort(DISCOVERY_PORT)
+            .build();
+    final EnodeURL enodeB =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .listeningPort(P2P_PORT)
+            .discoveryPort(DISCOVERY_PORT + 1)
+            .build();
+
+    assertThat(EnodeURLImpl.sameListeningEndpoint(enodeA, enodeB)).isTrue();
+  }
+
+  @Test
+  public void sameListeningEndpoint_differentListeningPorts() {
+    final EnodeURL enodeA =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .listeningPort(P2P_PORT)
+            .discoveryPort(DISCOVERY_PORT)
+            .build();
+    final EnodeURL enodeB =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .listeningPort(P2P_PORT + 1)
+            .discoveryPort(DISCOVERY_PORT)
+            .build();
+
+    assertThat(EnodeURLImpl.sameListeningEndpoint(enodeA, enodeB)).isFalse();
+  }
+
+  @Test
+  public void sameListeningEndpoint_differentIps() {
+    final EnodeURL enodeA =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV6_COMPACT_ADDRESS)
+            .listeningPort(P2P_PORT)
+            .discoveryPort(DISCOVERY_PORT)
+            .build();
+    final EnodeURL enodeB =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .listeningPort(P2P_PORT)
+            .discoveryPort(DISCOVERY_PORT)
+            .build();
+
+    assertThat(EnodeURLImpl.sameListeningEndpoint(enodeA, enodeB)).isFalse();
+  }
+
+  @Test
+  public void sameListeningEndpoint_listeningDisabledForOne() {
+    final EnodeURL enodeA =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .disableListening()
+            .discoveryPort(DISCOVERY_PORT)
+            .build();
+    final EnodeURL enodeB =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .listeningPort(P2P_PORT)
+            .discoveryPort(DISCOVERY_PORT)
+            .build();
+
+    assertThat(EnodeURLImpl.sameListeningEndpoint(enodeA, enodeB)).isFalse();
+  }
+
+  @Test
+  public void sameListeningEndpoint_listeningDisabledForBoth() {
+    final EnodeURL enodeA =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .disableListening()
+            .discoveryPort(DISCOVERY_PORT)
+            .build();
+    final EnodeURL enodeB =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .disableListening()
+            .discoveryPort(DISCOVERY_PORT)
+            .build();
+
+    assertThat(EnodeURLImpl.sameListeningEndpoint(enodeA, enodeB)).isTrue();
+  }
+
+  @Test
+  public void parseNodeId_invalid() {
+    final String invalidId = "0x10";
+    assertThatThrownBy(() -> EnodeURLImpl.parseNodeId(invalidId))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Expected 64 bytes in " + invalidId);
+  }
+
+  @Test
+  public void parseNodeId_valid() {
+    final String validId = VALID_NODE_ID;
+    final Bytes nodeId = EnodeURLImpl.parseNodeId(validId);
+    assertThat(nodeId.size()).isEqualTo(EnodeURLImpl.NODE_ID_SIZE);
+    assertThat(nodeId.toUnprefixedHexString()).isEqualTo(validId);
+  }
+
+  @Test
+  public void toURIWithoutDiscoveryPortShouldProduceEntryWithHostnameWhenUsingLoopbackAddress()
+      throws UnknownHostException {
+    String enodeString = String.format("enode://%s@%s:%d", VALID_NODE_ID, "127.0.0.1", 9999);
+
+    final EnodeURL enodeA =
+        EnodeURLImpl.fromString(
+            enodeString,
+            ImmutableEnodeDnsConfiguration.builder().dnsEnabled(true).updateEnabled(true).build());
+
+    URI expected =
+        URI.create(
+            String.format(
+                "enode://%s@%s:%d", VALID_NODE_ID, InetAddress.getLocalHost().getHostName(), 9999));
+    assertThat(enodeA.toURIWithoutDiscoveryPort()).isEqualTo(expected);
+  }
+
+  @Test
+  public void toURIWithoutDiscoveryPortShouldUseLoopbackWhenDomainNotFound() {
+    String enodeString =
+        String.format("enode://%s@%s:%d", VALID_NODE_ID, "besu-is-awesome.example.com", 9999);
+
+    final EnodeURL enodeA =
+        EnodeURLImpl.fromString(
+            enodeString,
+            ImmutableEnodeDnsConfiguration.builder().dnsEnabled(true).updateEnabled(true).build());
+
+    URI expected = URI.create(String.format("enode://%s@%s:%d", VALID_NODE_ID, "127.0.0.1", 9999));
+    assertThat(enodeA.toURIWithoutDiscoveryPort()).isEqualTo(expected);
+  }
+
+  @Test
+  public void toURIWithoutDiscoveryPortShouldKeepDomainWhenFound() {
+    String enodeString = String.format("enode://%s@%s:%d", VALID_NODE_ID, "hyperledger.org", 9999);
+
+    final EnodeURL enodeA =
+        EnodeURLImpl.fromString(
+            enodeString,
+            ImmutableEnodeDnsConfiguration.builder().dnsEnabled(true).updateEnabled(true).build());
+
+    URI expected =
+        URI.create(String.format("enode://%s@%s:%d", VALID_NODE_ID, "hyperledger.org", 9999));
+    assertThat(enodeA.toURIWithoutDiscoveryPort()).isEqualTo(expected);
+  }
+
+  @Test
+  public void getHostShouldReturnHostNameIpv4() {
+    final EnodeURL enode =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV4_ADDRESS)
+            .disableListening()
+            .discoveryPort(DISCOVERY_PORT)
+            .build();
+    assertEquals(IPV4_ADDRESS, enode.getHost());
+  }
+
+  @Test
+  public void getHostShouldReturnHostNameIpv6Compact() {
+    final EnodeURL enode =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV6_COMPACT_ADDRESS)
+            .disableListening()
+            .discoveryPort(DISCOVERY_PORT)
+            .build();
+    assertEquals(IPV6_COMPACT_ADDRESS, enode.getHost());
+  }
+
+  @Test
+  public void getHostShouldReturnHostNameIpv6CompactFromFull() {
+    final EnodeURL enode =
+        EnodeURLImpl.builder()
+            .nodeId(VALID_NODE_ID)
+            .ipAddress(IPV6_FULL_ADDRESS)
+            .disableListening()
+            .discoveryPort(DISCOVERY_PORT)
+            .build();
+    assertEquals(IPV6_COMPACT_ADDRESS, enode.getHost());
+  }
+
+  @Test
+  public void getHostShouldReturnHostNameWhenHostContainsUnderscore() {
+    EnodeURL enodeMock = Mockito.mock(EnodeURLImpl.class);
+    URI uriMock = Mockito.mock(URI.class);
+    Mockito.when(enodeMock.getHost()).thenCallRealMethod();
+    Mockito.when(enodeMock.toURIWithoutDiscoveryPort()).thenReturn(uriMock);
+    Mockito.when(uriMock.getHost()).thenReturn(null);
+    String hostName = "host_name";
+    Mockito.when(uriMock.toString())
+        .thenReturn("enode://" + VALID_NODE_ID + "@" + hostName + ":9999");
+    assertEquals(hostName, enodeMock.getHost());
+  }
+
+  @Test
+  public void getHostShouldReturnEmptyStringWhenUriToStringDoesNotContainAt() {
+    EnodeURL enodeMock = Mockito.mock(EnodeURLImpl.class);
+    URI uriMock = Mockito.mock(URI.class);
+    Mockito.when(enodeMock.getHost()).thenCallRealMethod();
+    Mockito.when(enodeMock.toURIWithoutDiscoveryPort()).thenReturn(uriMock);
+    Mockito.when(uriMock.getHost()).thenReturn(null);
+    String hostName = "host_name";
+    Mockito.when(uriMock.toString()).thenReturn("enode://" + VALID_NODE_ID + hostName + ":9999");
+    assertEquals("", enodeMock.getHost());
+  }
+
+  @Test
+  public void getHostShouldReturnEmptyStringWhenUriToStringReturnsColonBeforeAt() {
+    EnodeURL enodeMock = Mockito.mock(EnodeURLImpl.class);
+    URI uriMock = Mockito.mock(URI.class);
+    Mockito.when(enodeMock.getHost()).thenCallRealMethod();
+    Mockito.when(enodeMock.toURIWithoutDiscoveryPort()).thenReturn(uriMock);
+    Mockito.when(uriMock.getHost()).thenReturn(null);
+    String hostName = "host_name";
+    Mockito.when(uriMock.toString()).thenReturn("enode://" + VALID_NODE_ID + "@" + hostName);
+    assertEquals("", enodeMock.getHost());
+  }
+
+  @Test
+  public void getHostShouldReturnHostNameWhenDomainFound() {
+    String site = "hyperledger.org";
+    String enodeString = String.format("enode://%s@%s:%d", VALID_NODE_ID, site, 9999);
+    final EnodeURL enode =
+        EnodeURLImpl.fromString(
+            enodeString,
+            ImmutableEnodeDnsConfiguration.builder().dnsEnabled(true).updateEnabled(true).build());
+    assertEquals(site, enode.getHost());
+  }
+
+  @Test
+  public void getHostShouldReturnLoopBackWhenDomainNotFound() {
+    String site = "besu-is-awesome.example.com";
+    String enodeString = String.format("enode://%s@%s:%d", VALID_NODE_ID, site, 9999);
+    final EnodeURL enode =
+        EnodeURLImpl.fromString(
+            enodeString,
+            ImmutableEnodeDnsConfiguration.builder().dnsEnabled(true).updateEnabled(true).build());
+    assertEquals("127.0.0.1", enode.getHost());
+  }
+}
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLTest.java
deleted file mode 100644
index edc1f1d45a3..00000000000
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLTest.java
+++ /dev/null
@@ -1,905 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.p2p.peers;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.assertj.core.api.Assertions.catchThrowable;
-
-import org.hyperledger.besu.util.IllegalPortException;
-
-import java.net.URI;
-import java.util.Optional;
-import java.util.stream.Stream;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.assertj.core.api.ThrowableAssert;
-import org.junit.Test;
-
-public class EnodeURLTest {
-
-  private final String VALID_NODE_ID =
-      "6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0";
-  private final String IPV4_ADDRESS = "192.168.0.1";
-  private final String IPV6_FULL_ADDRESS = "[2001:db8:85a3:0:0:8a2e:370:7334]";
-  private final String IPV6_COMPACT_ADDRESS = "[2001:db8:85a3::8a2e:370:7334]";
-  private final int P2P_PORT = 30303;
-  private final int DISCOVERY_PORT = 30301;
-  private final String DISCOVERY_QUERY = "discport=" + DISCOVERY_PORT;
-
-  @Test
-  public void build_withMatchingDiscoveryAndListeningPorts() {
-    final EnodeURL enode =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV4_ADDRESS)
-            .listeningPort(P2P_PORT)
-            .discoveryPort(Optional.of(P2P_PORT))
-            .build();
-    assertThat(enode.getListeningPortOrZero()).isEqualTo(P2P_PORT);
-    assertThat(enode.getDiscoveryPortOrZero()).isEqualTo(P2P_PORT);
-  }
-
-  @Test
-  public void build_withNonMatchingDiscoveryAndListeningPorts() {
-    final EnodeURL enode =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV4_ADDRESS)
-            .listeningPort(P2P_PORT)
-            .discoveryPort(Optional.of(DISCOVERY_PORT))
-            .build();
-    assertThat(enode.getListeningPortOrZero()).isEqualTo(P2P_PORT);
-    assertThat(enode.getDiscoveryPortOrZero()).isEqualTo(DISCOVERY_PORT);
-  }
-
-  @Test
-  public void fromString_withDiscoveryPortShouldBuildExpectedEnodeURLObject() {
-    final EnodeURL expectedEnodeURL =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV4_ADDRESS)
-            .listeningPort(P2P_PORT)
-            .discoveryPort(Optional.of(DISCOVERY_PORT))
-            .build();
-    final String enodeURLString =
-        "enode://" + VALID_NODE_ID + "@" + IPV4_ADDRESS + ":" + P2P_PORT + "?" + DISCOVERY_QUERY;
-
-    final EnodeURL enodeURL = EnodeURL.fromString(enodeURLString);
-
-    assertThat(enodeURL).isEqualTo(expectedEnodeURL);
-    assertThat(enodeURL.toString()).isEqualTo(enodeURLString);
-  }
-
-  @Test
-  public void fromString_withoutDiscoveryPortShouldBuildExpectedEnodeURLObject() {
-    final EnodeURL expectedEnodeURL =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV4_ADDRESS)
-            .discoveryAndListeningPorts(P2P_PORT)
-            .build();
-    final String enodeURLString = "enode://" + VALID_NODE_ID + "@" + IPV4_ADDRESS + ":" + P2P_PORT;
-
-    final EnodeURL enodeURL = EnodeURL.fromString(enodeURLString);
-
-    assertThat(enodeURL).isEqualTo(expectedEnodeURL);
-    assertThat(enodeURL.toString()).isEqualTo(enodeURLString);
-  }
-
-  @Test
-  public void fromString_withIPV6ShouldBuildExpectedEnodeURLObject() {
-    final EnodeURL expectedEnodeURL =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV6_FULL_ADDRESS)
-            .listeningPort(P2P_PORT)
-            .discoveryPort(Optional.of(DISCOVERY_PORT))
-            .build();
-    final String enodeURLString =
-        "enode://"
-            + VALID_NODE_ID
-            + "@"
-            + IPV6_FULL_ADDRESS
-            + ":"
-            + P2P_PORT
-            + "?"
-            + DISCOVERY_QUERY;
-
-    final EnodeURL enodeURL = EnodeURL.fromString(enodeURLString);
-
-    assertThat(enodeURL).isEqualTo(expectedEnodeURL);
-  }
-
-  @Test
-  public void fromString_withIPV6InCompactFormShouldBuildExpectedEnodeURLObject() {
-    final EnodeURL expectedEnodeURL =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV6_COMPACT_ADDRESS)
-            .listeningPort(P2P_PORT)
-            .discoveryPort(Optional.of(DISCOVERY_PORT))
-            .build();
-    final String enodeURLString =
-        "enode://"
-            + VALID_NODE_ID
-            + "@"
-            + IPV6_COMPACT_ADDRESS
-            + ":"
-            + P2P_PORT
-            + "?"
-            + DISCOVERY_QUERY;
-
-    final EnodeURL enodeURL = EnodeURL.fromString(enodeURLString);
-
-    assertThat(enodeURL).isEqualTo(expectedEnodeURL);
-    assertThat(enodeURL.toString()).isEqualTo(enodeURLString);
-  }
-
-  @Test
-  public void fromString_with0ValuedDiscoveryPort() {
-    final String query = "discport=0";
-    final String enodeURLString =
-        "enode://" + VALID_NODE_ID + "@" + IPV6_COMPACT_ADDRESS + ":" + P2P_PORT + "?" + query;
-
-    EnodeURL enodeURL = EnodeURL.fromString(enodeURLString);
-    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
-    assertThat("[" + enodeURL.getIpAsString() + "]").isEqualTo(IPV6_FULL_ADDRESS);
-    assertThat(enodeURL.getListeningPort()).isEqualTo(Optional.of(P2P_PORT));
-    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(0);
-    assertThat(enodeURL.isListening()).isTrue();
-    assertThat(enodeURL.isRunningDiscovery()).isFalse();
-
-    assertThat(enodeURL.toString()).isEqualTo(enodeURLString);
-  }
-
-  @Test
-  public void fromString_with0ValuedListeningPort() {
-    final String enodeURLString = "enode://" + VALID_NODE_ID + "@" + IPV4_ADDRESS + ":" + 0;
-
-    EnodeURL enodeURL = EnodeURL.fromString(enodeURLString);
-    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
-    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
-    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(0);
-    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(0);
-    assertThat(enodeURL.isListening()).isFalse();
-    assertThat(enodeURL.isRunningDiscovery()).isFalse();
-
-    assertThat(enodeURL.toString()).isEqualTo(enodeURLString);
-  }
-
-  @Test
-  public void fromString_with0ValuedListeningPortAndExplicit0ValuedDiscPort() {
-    final String query = "discport=0";
-    final String enodeURLString =
-        "enode://" + VALID_NODE_ID + "@" + IPV4_ADDRESS + ":" + 0 + "?" + query;
-
-    EnodeURL enodeURL = EnodeURL.fromString(enodeURLString);
-    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
-    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
-    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(0);
-    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(0);
-    assertThat(enodeURL.isListening()).isFalse();
-    assertThat(enodeURL.isRunningDiscovery()).isFalse();
-  }
-
-  @Test
-  public void fromString_withoutNodeIdShouldFail() {
-    final String enodeURLString = "enode://@" + IPV4_ADDRESS + ":" + P2P_PORT;
-    final Throwable thrown = catchThrowable(() -> EnodeURL.fromString(enodeURLString));
-
-    assertThat(thrown)
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageContaining("Missing node ID.");
-  }
-
-  @Test
-  public void fromString_withInvalidSizeNodeIdShouldFail() {
-    final String enodeURLString = "enode://wrong_size_string@" + IPV4_ADDRESS + ":" + P2P_PORT;
-    final Throwable thrown = catchThrowable(() -> EnodeURL.fromString(enodeURLString));
-
-    assertThat(thrown)
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageContaining("Invalid node ID");
-  }
-
-  @Test
-  public void fromString_withInvalidHexCharacterNodeIdShouldFail() {
-    final String enodeURLString =
-        "enode://0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000@"
-            + IPV4_ADDRESS
-            + ":"
-            + P2P_PORT;
-    final Throwable thrown = catchThrowable(() -> EnodeURL.fromString(enodeURLString));
-
-    assertThat(thrown)
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageContaining("Invalid node ID");
-  }
-
-  @Test
-  public void fromString_withoutIpShouldFail() {
-    final String enodeURLString = "enode://" + VALID_NODE_ID + "@:" + P2P_PORT;
-    final Throwable thrown = catchThrowable(() -> EnodeURL.fromString(enodeURLString));
-
-    assertThat(thrown)
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageContaining("Missing or invalid ip address.");
-  }
-
-  @Test
-  public void fromString_withInvalidIpFormatShouldFail() {
-    final String enodeURLString = "enode://" + VALID_NODE_ID + "@192.0.1:" + P2P_PORT;
-    final Throwable thrown = catchThrowable(() -> EnodeURL.fromString(enodeURLString));
-
-    assertThat(thrown)
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageContaining("Missing or invalid ip address.");
-  }
-
-  @Test
-  public void fromString_withoutListeningPortShouldFail() {
-    final String enodeURLString = "enode://" + VALID_NODE_ID + "@" + IPV4_ADDRESS + ":";
-    final Throwable thrown = catchThrowable(() -> EnodeURL.fromString(enodeURLString));
-
-    assertThat(thrown).hasCauseInstanceOf(IllegalPortException.class);
-  }
-
-  @Test
-  public void fromString_withoutListeningPortAndWithDiscoveryPortShouldFail() {
-    final String enodeURLString =
-        "enode://" + VALID_NODE_ID + "@" + IPV4_ADDRESS + ":?discport=30301";
-    final Throwable thrown = catchThrowable(() -> EnodeURL.fromString(enodeURLString));
-
-    assertThat(thrown).hasCauseInstanceOf(IllegalPortException.class);
-  }
-
-  @Test
-  public void fromString_withAboveRangeListeningPortShouldFail() {
-    final String enodeURLString = "enode://" + VALID_NODE_ID + "@" + IPV4_ADDRESS + ":98765";
-    final Throwable thrown = catchThrowable(() -> EnodeURL.fromString(enodeURLString));
-
-    assertThat(thrown).hasCauseInstanceOf(IllegalPortException.class);
-  }
-
-  @Test
-  public void fromString_withAboveRangeDiscoveryPortShouldFail() {
-    final String enodeURLString =
-        "enode://" + VALID_NODE_ID + "@" + IPV4_ADDRESS + ":" + P2P_PORT + "?discport=98765";
-    final Throwable thrown = catchThrowable(() -> EnodeURL.fromString(enodeURLString));
-
-    assertThat(thrown).hasCauseInstanceOf(IllegalPortException.class);
-  }
-
-  @Test
-  public void fromString_withMisspelledDiscoveryParam() {
-    final String query = "adiscport=1234";
-    final String enodeURLString =
-        "enode://" + VALID_NODE_ID + "@" + IPV6_FULL_ADDRESS + ":" + P2P_PORT + "?" + query;
-
-    assertThatThrownBy(() -> EnodeURL.fromString(enodeURLString))
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageContaining("Invalid discovery port: '" + query + "'");
-  }
-
-  @Test
-  public void fromString_withAdditionalTrailingQueryParam() {
-    final String query = "discport=1234&other=y";
-    final String enodeURLString =
-        "enode://" + VALID_NODE_ID + "@" + IPV6_FULL_ADDRESS + ":" + P2P_PORT + "?" + query;
-
-    assertThatThrownBy(() -> EnodeURL.fromString(enodeURLString))
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageContaining("Invalid discovery port: '" + query + "'");
-  }
-
-  @Test
-  public void fromString_withAdditionalLeadingQueryParam() {
-    final String query = "other=123&discport=1234";
-    final String enodeURLString =
-        "enode://" + VALID_NODE_ID + "@" + IPV6_FULL_ADDRESS + ":" + P2P_PORT + "?" + query;
-
-    assertThatThrownBy(() -> EnodeURL.fromString(enodeURLString))
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageContaining("Invalid discovery port: '" + query + "'");
-  }
-
-  @Test
-  public void fromString_withAdditionalLeadingAndTrailingQueryParams() {
-    final String query = "other=123&discport=1234&other2=456";
-    final String enodeURLString =
-        "enode://" + VALID_NODE_ID + "@" + IPV6_FULL_ADDRESS + ":" + P2P_PORT + "?" + query;
-
-    assertThatThrownBy(() -> EnodeURL.fromString(enodeURLString))
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageContaining("Invalid discovery port: '" + query + "'");
-  }
-
-  @Test
-  public void fromString_withMultipleDiscoveryParams() {
-    final String query = "discport=1234&discport=456";
-    final String enodeURLString =
-        "enode://" + VALID_NODE_ID + "@" + IPV6_FULL_ADDRESS + ":" + P2P_PORT + "?" + query;
-
-    assertThatThrownBy(() -> EnodeURL.fromString(enodeURLString))
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageContaining("Invalid discovery port: '" + query + "'");
-  }
-
-  @Test
-  public void fromString_withNullEnodeURLShouldFail() {
-    final Throwable thrown = catchThrowable(() -> EnodeURL.fromString(null));
-
-    assertThat(thrown)
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageContaining("Invalid empty value");
-  }
-
-  @Test
-  public void fromString_withEmptyEnodeURLShouldFail() {
-    final Throwable thrown = catchThrowable(() -> EnodeURL.fromString(""));
-
-    assertThat(thrown)
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageContaining("Invalid empty value.");
-  }
-
-  @Test
-  public void fromString_withWhitespaceEnodeURLShouldFail() {
-    final Throwable thrown = catchThrowable(() -> EnodeURL.fromString(" "));
-
-    assertThat(thrown)
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageContaining("Invalid empty value.");
-  }
-
-  @Test
-  public void fromStringInvalidNodeIdLengthHasDescriptiveMessage() {
-    String invalidEnodeURL =
-        String.format("enode://%s@%s:%d", VALID_NODE_ID.substring(1), IPV4_ADDRESS, P2P_PORT);
-    assertThatThrownBy(() -> EnodeURL.fromString(invalidEnodeURL))
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageEndingWith(
-            "Invalid node ID: node ID must have exactly 128 hexadecimal characters and should not include any '0x' hex prefix.");
-  }
-
-  @Test
-  public void fromString_withHostnameEnodeURLShouldFailWhenDnsDisabled() {
-    final String enodeURLString =
-        "enode://" + VALID_NODE_ID + "@" + "localhost" + ":" + P2P_PORT + "?" + DISCOVERY_QUERY;
-
-    assertThatThrownBy(
-            () ->
-                EnodeURL.fromString(
-                    enodeURLString,
-                    ImmutableEnodeDnsConfiguration.builder()
-                        .dnsEnabled(false)
-                        .updateEnabled(false)
-                        .build()))
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageContaining("Invalid enode URL syntax");
-  }
-
-  @Test
-  public void fromString_withHostnameEnodeURLShouldFailWhenDnsDisabledAndUpdateEnabled() {
-    final String enodeURLString =
-        "enode://" + VALID_NODE_ID + "@" + "localhost" + ":" + P2P_PORT + "?" + DISCOVERY_QUERY;
-
-    assertThatThrownBy(
-            () ->
-                EnodeURL.fromString(
-                    enodeURLString,
-                    ImmutableEnodeDnsConfiguration.builder()
-                        .dnsEnabled(false)
-                        .updateEnabled(true)
-                        .build()))
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageContaining("Invalid enode URL syntax");
-  }
-
-  @Test
-  public void fromString_withHostnameEnodeURLShouldWorkWhenDnsEnabled() {
-    final EnodeURL expectedEnodeURL =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress("127.0.0.1")
-            .listeningPort(P2P_PORT)
-            .discoveryPort(Optional.of(DISCOVERY_PORT))
-            .build();
-    final String enodeURLString =
-        "enode://" + VALID_NODE_ID + "@" + "localhost" + ":" + P2P_PORT + "?" + DISCOVERY_QUERY;
-
-    final EnodeURL enodeURL =
-        EnodeURL.fromString(
-            enodeURLString,
-            ImmutableEnodeDnsConfiguration.builder().dnsEnabled(true).updateEnabled(false).build());
-    ;
-
-    assertThat(enodeURL).isEqualTo(expectedEnodeURL);
-  }
-
-  @Test
-  public void fromString_withHostnameEnodeURLShouldWorkWhenDnsEnabledAndUpdateEnabled() {
-    final EnodeURL expectedEnodeURL =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress("127.0.0.1")
-            .listeningPort(P2P_PORT)
-            .discoveryPort(Optional.of(DISCOVERY_PORT))
-            .build();
-    final String enodeURLString =
-        "enode://" + VALID_NODE_ID + "@" + "localhost" + ":" + P2P_PORT + "?" + DISCOVERY_QUERY;
-
-    final EnodeURL enodeURL =
-        EnodeURL.fromString(
-            enodeURLString,
-            ImmutableEnodeDnsConfiguration.builder().dnsEnabled(true).updateEnabled(false).build());
-    ;
-
-    assertThat(enodeURL).isEqualTo(expectedEnodeURL);
-  }
-
-  @Test
-  public void toURI_WithDiscoveryPortCreateExpectedURI() {
-    final String enodeURLString =
-        "enode://" + VALID_NODE_ID + "@" + IPV4_ADDRESS + ":" + P2P_PORT + "?" + DISCOVERY_QUERY;
-    final URI expectedURI = URI.create(enodeURLString);
-    final URI createdURI = EnodeURL.fromString(enodeURLString).toURI();
-
-    assertThat(createdURI).isEqualTo(expectedURI);
-  }
-
-  @Test
-  public void toURI_WithoutDiscoveryPortCreateExpectedURI() {
-    final String enodeURLString = "enode://" + VALID_NODE_ID + "@" + IPV4_ADDRESS + ":" + P2P_PORT;
-    final URI expectedURI = URI.create(enodeURLString);
-    final URI createdURI = EnodeURL.fromString(enodeURLString).toURI();
-
-    assertThat(createdURI).isEqualTo(expectedURI);
-  }
-
-  @Test
-  public void toURI_WithHostnameShouldWorkWhenDnsEnabled() {
-    final String enodeURLString = "enode://" + VALID_NODE_ID + "@" + "localhost" + ":" + P2P_PORT;
-    final URI expectedURI =
-        URI.create("enode://" + VALID_NODE_ID + "@" + "127.0.0.1" + ":" + P2P_PORT);
-    final URI createdURI =
-        EnodeURL.fromString(
-                enodeURLString,
-                ImmutableEnodeDnsConfiguration.builder()
-                    .dnsEnabled(true)
-                    .updateEnabled(false)
-                    .build())
-            .toURI();
-
-    assertThat(createdURI).isEqualTo(expectedURI);
-  }
-
-  @Test
-  public void toURI_WithHostnameShouldWorkWhenDnsEnabledAndUpdateEnabled() {
-    final String enodeURLString = "enode://" + VALID_NODE_ID + "@" + "localhost" + ":" + P2P_PORT;
-    final URI expectedURI = URI.create(enodeURLString);
-    final URI createdURI =
-        EnodeURL.fromString(
-                enodeURLString,
-                ImmutableEnodeDnsConfiguration.builder()
-                    .dnsEnabled(true)
-                    .updateEnabled(true)
-                    .build())
-            .toURI();
-
-    assertThat(createdURI).isEqualTo(expectedURI);
-  }
-
-  @Test
-  public void fromURI_withHostnameShouldFailWhenDnsDisabled() {
-    final String enodeURLString =
-        "enode://" + VALID_NODE_ID + "@" + "localhost" + ":" + P2P_PORT + "?" + DISCOVERY_QUERY;
-    final URI expectedURI = URI.create(enodeURLString);
-
-    assertThatThrownBy(
-            () ->
-                EnodeURL.fromURI(
-                    expectedURI,
-                    ImmutableEnodeDnsConfiguration.builder()
-                        .dnsEnabled(false)
-                        .updateEnabled(false)
-                        .build()))
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageContaining("Invalid ip address");
-  }
-
-  @Test
-  public void fromURI_withHostnameEnodeURLShouldWorkWhenDnsEnabled() {
-    final EnodeURL expectedEnodeURL =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress("127.0.0.1")
-            .listeningPort(P2P_PORT)
-            .discoveryPort(Optional.of(DISCOVERY_PORT))
-            .build();
-
-    final String enodeURLString =
-        "enode://" + VALID_NODE_ID + "@" + "localhost" + ":" + P2P_PORT + "?" + DISCOVERY_QUERY;
-    final URI expectedURI = URI.create(enodeURLString);
-
-    final EnodeURL enodeURL =
-        EnodeURL.fromURI(
-            expectedURI,
-            ImmutableEnodeDnsConfiguration.builder().dnsEnabled(true).updateEnabled(false).build());
-    assertThat(enodeURL).isEqualTo(expectedEnodeURL);
-  }
-
-  @Test
-  public void builder_setInvalidPorts() {
-    final EnodeURL.Builder validBuilder =
-        EnodeURL.builder().nodeId(VALID_NODE_ID).ipAddress(IPV4_ADDRESS);
-
-    Stream.<ThrowableAssert.ThrowingCallable>of(
-            () -> validBuilder.listeningPort(200_000).disableDiscovery().build(),
-            () -> validBuilder.listeningPort(-2).disableDiscovery().build(),
-            () -> validBuilder.discoveryPort(-1).disableListening().build(),
-            () -> validBuilder.discoveryPort(100_000).disableListening().build())
-        .forEach(assertThatExceptionOfType(IllegalPortException.class)::isThrownBy);
-  }
-
-  @Test
-  public void builder_setEachPortExplicitly() {
-    final EnodeURL enodeURL =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV4_ADDRESS)
-            .listeningPort(P2P_PORT)
-            .discoveryPort(DISCOVERY_PORT)
-            .build();
-
-    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
-    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
-    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(P2P_PORT);
-    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(DISCOVERY_PORT);
-    assertThat(enodeURL.isListening()).isTrue();
-    assertThat(enodeURL.isRunningDiscovery()).isTrue();
-  }
-
-  @Test
-  public void builder_setPortsTogether() {
-    final EnodeURL enodeURL =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV4_ADDRESS)
-            .discoveryAndListeningPorts(P2P_PORT)
-            .build();
-
-    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
-    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
-    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(P2P_PORT);
-    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(P2P_PORT);
-    assertThat(enodeURL.isListening()).isTrue();
-    assertThat(enodeURL.isRunningDiscovery()).isTrue();
-  }
-
-  @Test
-  public void builder_setDefaultPorts() {
-    final EnodeURL enodeURL =
-        EnodeURL.builder().nodeId(VALID_NODE_ID).ipAddress(IPV4_ADDRESS).useDefaultPorts().build();
-
-    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
-    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
-    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(EnodeURL.DEFAULT_LISTENING_PORT);
-    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(EnodeURL.DEFAULT_LISTENING_PORT);
-    assertThat(enodeURL.isListening()).isTrue();
-    assertThat(enodeURL.isRunningDiscovery()).isTrue();
-  }
-
-  @Test
-  public void builder_discoveryDisabled() {
-    final EnodeURL enodeURL =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV4_ADDRESS)
-            .listeningPort(P2P_PORT)
-            .disableDiscovery()
-            .build();
-
-    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
-    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
-    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(P2P_PORT);
-    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(0);
-    assertThat(enodeURL.isListening()).isTrue();
-    assertThat(enodeURL.isRunningDiscovery()).isFalse();
-  }
-
-  @Test
-  public void builder_listeningDisabled() {
-    final EnodeURL enodeURL =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV4_ADDRESS)
-            .discoveryPort(P2P_PORT)
-            .disableListening()
-            .build();
-
-    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
-    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
-    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(0);
-    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(P2P_PORT);
-    assertThat(enodeURL.isListening()).isFalse();
-    assertThat(enodeURL.isRunningDiscovery()).isTrue();
-  }
-
-  @Test
-  public void builder_listeningAndDiscoveryDisabled() {
-    final EnodeURL enodeURL =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV4_ADDRESS)
-            .disableDiscovery()
-            .disableListening()
-            .build();
-
-    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
-    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
-    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(0);
-    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(0);
-    assertThat(enodeURL.isListening()).isFalse();
-    assertThat(enodeURL.isRunningDiscovery()).isFalse();
-  }
-
-  @Test
-  public void builder_setPortsTo0() {
-    final EnodeURL enodeURL =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV4_ADDRESS)
-            .discoveryAndListeningPorts(0)
-            .build();
-
-    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
-    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
-    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(0);
-    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(0);
-    assertThat(enodeURL.isListening()).isFalse();
-    assertThat(enodeURL.isRunningDiscovery()).isFalse();
-  }
-
-  @Test
-  public void builder_setDiscoveryPortTo0() {
-    final EnodeURL enodeURL =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV4_ADDRESS)
-            .discoveryPort(0)
-            .listeningPort(P2P_PORT)
-            .build();
-
-    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
-    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
-    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(P2P_PORT);
-    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(0);
-    assertThat(enodeURL.isListening()).isTrue();
-    assertThat(enodeURL.isRunningDiscovery()).isFalse();
-  }
-
-  @Test
-  public void builder_setListeningPortTo0() {
-    final EnodeURL enodeURL =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV4_ADDRESS)
-            .discoveryPort(P2P_PORT)
-            .listeningPort(0)
-            .build();
-
-    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
-    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
-    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(0);
-    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(P2P_PORT);
-    assertThat(enodeURL.isListening()).isFalse();
-    assertThat(enodeURL.isRunningDiscovery()).isTrue();
-  }
-
-  @Test
-  public void builder_setDiscoveryPortToEmptyValue() {
-    final EnodeURL enodeURL =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV4_ADDRESS)
-            .discoveryPort(Optional.empty())
-            .listeningPort(P2P_PORT)
-            .build();
-
-    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
-    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
-    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(P2P_PORT);
-    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(0);
-    assertThat(enodeURL.isListening()).isTrue();
-    assertThat(enodeURL.isRunningDiscovery()).isFalse();
-  }
-
-  @Test
-  public void builder_setListeningPortToEmptyValue() {
-    final EnodeURL enodeURL =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV4_ADDRESS)
-            .discoveryPort(P2P_PORT)
-            .listeningPort(Optional.empty())
-            .build();
-
-    assertThat(enodeURL.getNodeId().toUnprefixedHexString()).isEqualTo(VALID_NODE_ID);
-    assertThat(enodeURL.getIpAsString()).isEqualTo(IPV4_ADDRESS);
-    assertThat(enodeURL.getListeningPortOrZero()).isEqualTo(0);
-    assertThat(enodeURL.getDiscoveryPortOrZero()).isEqualTo(P2P_PORT);
-    assertThat(enodeURL.isListening()).isFalse();
-    assertThat(enodeURL.isRunningDiscovery()).isTrue();
-  }
-
-  @Test
-  public void builder_discoveryNotSpecified() {
-    final EnodeURL.Builder builder =
-        EnodeURL.builder().nodeId(VALID_NODE_ID).ipAddress(IPV4_ADDRESS).listeningPort(P2P_PORT);
-
-    assertThatThrownBy(builder::build)
-        .isInstanceOf(IllegalStateException.class)
-        .hasMessageContaining("Discovery port must be configured");
-  }
-
-  @Test
-  public void builder_listeningPortNotSpecified() {
-    final EnodeURL.Builder builder =
-        EnodeURL.builder().nodeId(VALID_NODE_ID).ipAddress(IPV4_ADDRESS).discoveryPort(P2P_PORT);
-
-    assertThatThrownBy(builder::build)
-        .isInstanceOf(IllegalStateException.class)
-        .hasMessageContaining("Listening port must be configured");
-  }
-
-  @Test
-  public void builder_nodeIdNotSpecified() {
-    final EnodeURL.Builder builder =
-        EnodeURL.builder().ipAddress(IPV4_ADDRESS).discoveryAndListeningPorts(P2P_PORT);
-
-    assertThatThrownBy(builder::build)
-        .isInstanceOf(IllegalStateException.class)
-        .hasMessageContaining("Node id must be configured");
-  }
-
-  @Test
-  public void builder_ipNotSpecified() {
-    final EnodeURL.Builder builder =
-        EnodeURL.builder().nodeId(VALID_NODE_ID).discoveryAndListeningPorts(P2P_PORT);
-
-    assertThatThrownBy(builder::build)
-        .isInstanceOf(IllegalStateException.class)
-        .hasMessageContaining("Ip address must be configured");
-  }
-
-  @Test
-  public void sameListeningEndpoint_forMatchingEnodes() {
-    final EnodeURL enodeA =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV4_ADDRESS)
-            .listeningPort(P2P_PORT)
-            .discoveryPort(DISCOVERY_PORT)
-            .build();
-    final EnodeURL enodeB =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV4_ADDRESS)
-            .listeningPort(P2P_PORT)
-            .discoveryPort(DISCOVERY_PORT + 1)
-            .build();
-
-    assertThat(EnodeURL.sameListeningEndpoint(enodeA, enodeB)).isTrue();
-  }
-
-  @Test
-  public void sameListeningEndpoint_differentListeningPorts() {
-    final EnodeURL enodeA =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV4_ADDRESS)
-            .listeningPort(P2P_PORT)
-            .discoveryPort(DISCOVERY_PORT)
-            .build();
-    final EnodeURL enodeB =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV4_ADDRESS)
-            .listeningPort(P2P_PORT + 1)
-            .discoveryPort(DISCOVERY_PORT)
-            .build();
-
-    assertThat(EnodeURL.sameListeningEndpoint(enodeA, enodeB)).isFalse();
-  }
-
-  @Test
-  public void sameListeningEndpoint_differentIps() {
-    final EnodeURL enodeA =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV6_COMPACT_ADDRESS)
-            .listeningPort(P2P_PORT)
-            .discoveryPort(DISCOVERY_PORT)
-            .build();
-    final EnodeURL enodeB =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV4_ADDRESS)
-            .listeningPort(P2P_PORT)
-            .discoveryPort(DISCOVERY_PORT)
-            .build();
-
-    assertThat(EnodeURL.sameListeningEndpoint(enodeA, enodeB)).isFalse();
-  }
-
-  @Test
-  public void sameListeningEndpoint_listeningDisabledForOne() {
-    final EnodeURL enodeA =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV4_ADDRESS)
-            .disableListening()
-            .discoveryPort(DISCOVERY_PORT)
-            .build();
-    final EnodeURL enodeB =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV4_ADDRESS)
-            .listeningPort(P2P_PORT)
-            .discoveryPort(DISCOVERY_PORT)
-            .build();
-
-    assertThat(EnodeURL.sameListeningEndpoint(enodeA, enodeB)).isFalse();
-  }
-
-  @Test
-  public void sameListeningEndpoint_listeningDisabledForBoth() {
-    final EnodeURL enodeA =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV4_ADDRESS)
-            .disableListening()
-            .discoveryPort(DISCOVERY_PORT)
-            .build();
-    final EnodeURL enodeB =
-        EnodeURL.builder()
-            .nodeId(VALID_NODE_ID)
-            .ipAddress(IPV4_ADDRESS)
-            .disableListening()
-            .discoveryPort(DISCOVERY_PORT)
-            .build();
-
-    assertThat(EnodeURL.sameListeningEndpoint(enodeA, enodeB)).isTrue();
-  }
-
-  @Test
-  public void parseNodeId_invalid() {
-    final String invalidId = "0x10";
-    assertThatThrownBy(() -> EnodeURL.parseNodeId(invalidId))
-        .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageContaining("Expected 64 bytes in " + invalidId);
-  }
-
-  @Test
-  public void parseNodeId_valid() {
-    final String validId = VALID_NODE_ID;
-    final Bytes nodeId = EnodeURL.parseNodeId(validId);
-    assertThat(nodeId.size()).isEqualTo(EnodeURL.NODE_ID_SIZE);
-    assertThat(nodeId.toUnprefixedHexString()).isEqualTo(validId);
-  }
-}
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/PeerTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/PeerTest.java
index 28b379a5ebf..42a61d0936a 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/PeerTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/PeerTest.java
@@ -34,14 +34,14 @@ public void notEquals() {
             "c7849b663d12a2b5bf05b1ebf5810364f4870d5f1053fbd7500d38bc54c705b453d7511ca8a4a86003d34d4c8ee0bbfcd387aa724f5b240b3ab4bbb994a1e09b");
     final Peer peer =
         DiscoveryPeer.fromEnode(
-            EnodeURL.builder()
+            EnodeURLImpl.builder()
                 .nodeId(id)
                 .ipAddress("127.0.0.1")
                 .discoveryAndListeningPorts(5000)
                 .build());
     final Peer peer2 =
         DiscoveryPeer.fromEnode(
-            EnodeURL.builder()
+            EnodeURLImpl.builder()
                 .nodeId(id)
                 .ipAddress("127.0.0.1")
                 .discoveryAndListeningPorts(5001)
@@ -56,14 +56,14 @@ public void differentHashCode() {
             "c7849b663d12a2b5bf05b1ebf5810364f4870d5f1053fbd7500d38bc54c705b453d7511ca8a4a86003d34d4c8ee0bbfcd387aa724f5b240b3ab4bbb994a1e09b");
     final Peer peer =
         DiscoveryPeer.fromEnode(
-            EnodeURL.builder()
+            EnodeURLImpl.builder()
                 .nodeId(id)
                 .ipAddress("127.0.0.1")
                 .discoveryAndListeningPorts(5000)
                 .build());
     final Peer peer2 =
         DiscoveryPeer.fromEnode(
-            EnodeURL.builder()
+            EnodeURLImpl.builder()
                 .nodeId(id)
                 .ipAddress("127.0.0.1")
                 .discoveryAndListeningPorts(5001)
@@ -75,7 +75,7 @@ public void differentHashCode() {
   public void getStatus() {
     final DiscoveryPeer peer =
         DiscoveryPeer.fromEnode(
-            EnodeURL.builder()
+            EnodeURLImpl.builder()
                 .nodeId(Peer.randomId())
                 .ipAddress("127.0.0.1")
                 .discoveryAndListeningPorts(5000)
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/PeerTestHelper.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/PeerTestHelper.java
index 5e168e0948e..95ed206995e 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/PeerTestHelper.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/PeerTestHelper.java
@@ -15,6 +15,7 @@
 package org.hyperledger.besu.ethereum.p2p.peers;
 
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.Capability;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.util.Arrays;
 
@@ -26,6 +27,10 @@ public static Peer createPeer() {
     return DefaultPeer.fromEnodeURL(enode());
   }
 
+  public static Peer createPeer(final EnodeURL enodeURL) {
+    return DefaultPeer.fromEnodeURL(enodeURL);
+  }
+
   public static Peer createPeer(final Bytes nodeId) {
     return DefaultPeer.fromEnodeURL(enodeBuilder().nodeId(nodeId).build());
   }
@@ -34,18 +39,22 @@ public static EnodeURL enode() {
     return enodeBuilder().build();
   }
 
-  public static EnodeURL.Builder enodeBuilder() {
-    return EnodeURL.builder().ipAddress("127.0.0.1").useDefaultPorts().nodeId(Peer.randomId());
+  public static EnodeURLImpl.Builder enodeBuilder() {
+    return EnodeURLImpl.builder().ipAddress("127.0.0.1").useDefaultPorts().nodeId(Peer.randomId());
   }
 
-  /** @return A LocalNode that is setup and ready. */
+  /**
+   * @return A LocalNode that is setup and ready.
+   */
   public static LocalNode createLocalNode() {
     final MutableLocalNode localNode = createMutableLocalNode();
     localNode.setEnode(enode());
     return localNode;
   }
 
-  /** @return A MutableLocalNode that is not ready (the enode has not been set). */
+  /**
+   * @return A MutableLocalNode that is not ready (the enode has not been set).
+   */
   public static MutableLocalNode createMutableLocalNode() {
     return MutableLocalNode.create("clientId", 5, Arrays.asList(Capability.create("eth", 63)));
   }
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/StaticNodesParserTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/StaticNodesParserTest.java
index 8ade4837a7e..91f5e2d602e 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/StaticNodesParserTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/StaticNodesParserTest.java
@@ -17,6 +17,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import org.hyperledger.besu.plugin.data.EnodeURL;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -30,44 +32,43 @@
 
 import com.google.common.collect.Lists;
 import io.vertx.core.json.DecodeException;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class StaticNodesParserTest {
 
   // NOTE: The invalid_static_nodes file is identical to the valid, however one node's port is set
   // to "A".
 
-  // First peer ion the valid_static_nodes file.
+  // First peer in the valid_static_nodes file.
   private final List<EnodeURL> validFileItems =
       Lists.newArrayList(
-          EnodeURL.builder()
+          EnodeURLImpl.builder()
               .nodeId(
                   "50203c6bfca6874370e71aecc8958529fd723feb05013dc1abca8fc1fff845c5259faba05852e9dfe5ce172a7d6e7c2a3a5eaa8b541c8af15ea5518bbff5f2fa")
               .ipAddress("127.0.0.1")
               .useDefaultPorts()
               .build(),
-          EnodeURL.builder()
+          EnodeURLImpl.builder()
               .nodeId(
                   "02beb46bc17227616be44234071dfa18516684e45eed88049190b6cb56b0bae218f045fd0450f123b8f55c60b96b78c45e8e478004293a8de6818aa4e02eff97")
               .ipAddress("127.0.0.1")
               .discoveryAndListeningPorts(30304)
               .build(),
-          EnodeURL.builder()
+          EnodeURLImpl.builder()
               .nodeId(
                   "819e5cbd81f123516b10f04bf620daa2b385efef06d77253148b814bf1bb6197ff58ebd1fd7bf5dc765b49a4440c733bf941e479c800173f2bfeb887e4fbcbc2")
-              .ipAddress("127.0.0.1")
+              .ipAddress("10.0.0.1")
               .discoveryAndListeningPorts(30305)
               .build(),
-          EnodeURL.builder()
+          EnodeURLImpl.builder()
               .nodeId(
                   "6cf53e25d2a98a22e7e205a86bda7077e3c8a7bc99e5ff88ddfd2037a550969ab566f069ffa455df0cfae0c21f7aec3447e414eccc473a3e8b20984b90f164ac")
               .ipAddress("127.0.0.1")
               .discoveryAndListeningPorts(30306)
               .build());
 
-  @Rule public TemporaryFolder testFolder = new TemporaryFolder();
+  @TempDir private static Path testFolder;
 
   @Test
   public void validFileLoadsWithExpectedEnodes() throws IOException, URISyntaxException {
@@ -77,7 +78,7 @@ public void validFileLoadsWithExpectedEnodes() throws IOException, URISyntaxExce
         StaticNodesParser.fromPath(validFile.toPath(), EnodeDnsConfiguration.DEFAULT_CONFIG);
 
     assertThat(enodes)
-        .containsExactlyInAnyOrder(validFileItems.toArray(new EnodeURL[validFileItems.size()]));
+        .containsExactlyInAnyOrder(validFileItems.toArray(new EnodeURLImpl[validFileItems.size()]));
   }
 
   @Test
@@ -92,7 +93,7 @@ public void validFileLoadsWithExpectedEnodesWhenDnsEnabled()
         StaticNodesParser.fromPath(validFile.toPath(), enodeDnsConfiguration);
 
     assertThat(enodes)
-        .containsExactlyInAnyOrder(validFileItems.toArray(new EnodeURL[validFileItems.size()]));
+        .containsExactlyInAnyOrder(validFileItems.toArray(new EnodeURLImpl[validFileItems.size()]));
   }
 
   @Test
@@ -122,6 +123,12 @@ public void fileWithUnknownHostnameNotThrowsAnExceptionWhenDnsAndUpdateEnabled()
 
     assertThat(enodes)
         .containsExactlyInAnyOrder(validFileItems.toArray(new EnodeURL[validFileItems.size()]));
+    final Set<EnodeURL> actual =
+        StaticNodesParser.fromPath(validFile.toPath(), enodeDnsConfiguration);
+
+    final EnodeURL[] expected = validFileItems.toArray(new EnodeURLImpl[validFileItems.size()]);
+
+    assertThat(actual).containsExactlyInAnyOrder(expected);
   }
 
   @Test
@@ -161,18 +168,16 @@ public void fromPath_withNonListeningNodesThrowsException() {
                 StaticNodesParser.fromPath(
                     invalidFile.toPath(), EnodeDnsConfiguration.DEFAULT_CONFIG))
         .isInstanceOf(IllegalArgumentException.class)
-        .hasMessageContaining("Static node must be configured with a valid listening port");
+        .hasRootCauseMessage("Static node must be configured with a valid listening port.");
   }
 
   @Test
   public void nonJsonFileThrowsAnException() throws IOException {
-    final File tempFile = testFolder.newFile("file.txt");
-    tempFile.deleteOnExit();
-    Files.write(tempFile.toPath(), "This Is Not Json".getBytes(Charset.forName("UTF-8")));
+    final Path tempFile = Files.createTempFile(testFolder, "file", "txt");
+    Files.write(tempFile, "This Is Not Json".getBytes(Charset.forName("UTF-8")));
 
     assertThatThrownBy(
-            () ->
-                StaticNodesParser.fromPath(tempFile.toPath(), EnodeDnsConfiguration.DEFAULT_CONFIG))
+            () -> StaticNodesParser.fromPath(tempFile, EnodeDnsConfiguration.DEFAULT_CONFIG))
         .isInstanceOf(DecodeException.class);
   }
 
@@ -187,11 +192,10 @@ public void anEmptyCacheIsCreatedIfTheFileDoesNotExist() throws IOException {
 
   @Test
   public void cacheIsCreatedIfFileExistsButIsEmpty() throws IOException {
-    final File tempFile = testFolder.newFile("file.txt");
-    tempFile.deleteOnExit();
+    final Path tempFile = Files.createTempFile(testFolder, "file", "txt");
 
     final Set<EnodeURL> enodes =
-        StaticNodesParser.fromPath(tempFile.toPath(), EnodeDnsConfiguration.DEFAULT_CONFIG);
+        StaticNodesParser.fromPath(tempFile, EnodeDnsConfiguration.DEFAULT_CONFIG);
     assertThat(enodes.size()).isZero();
   }
 }
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsDenylistTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsDenylistTest.java
index 871c02d8ca7..34e2e9ac447 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsDenylistTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsDenylistTest.java
@@ -17,7 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions.Action;
 
@@ -35,11 +35,11 @@ public class PeerPermissionsDenylistTest {
 
   @Test
   public void add_peer() {
-    PeerPermissionsDenylist blacklist = PeerPermissionsDenylist.create();
+    PeerPermissionsDenylist denylist = PeerPermissionsDenylist.create();
     Peer peer = createPeer();
 
     final AtomicInteger callbackCount = new AtomicInteger(0);
-    blacklist.subscribeUpdate(
+    denylist.subscribeUpdate(
         (restricted, affectedPeers) -> {
           callbackCount.incrementAndGet();
           assertThat(restricted).isTrue();
@@ -48,18 +48,18 @@ public void add_peer() {
 
     assertThat(callbackCount).hasValue(0);
 
-    blacklist.add(peer);
+    denylist.add(peer);
     assertThat(callbackCount).hasValue(1);
   }
 
   @Test
   public void remove_peer() {
-    PeerPermissionsDenylist blacklist = PeerPermissionsDenylist.create();
+    PeerPermissionsDenylist denylist = PeerPermissionsDenylist.create();
     Peer peer = createPeer();
-    blacklist.add(peer);
+    denylist.add(peer);
 
     final AtomicInteger callbackCount = new AtomicInteger(0);
-    blacklist.subscribeUpdate(
+    denylist.subscribeUpdate(
         (restricted, affectedPeers) -> {
           callbackCount.incrementAndGet();
           assertThat(restricted).isFalse();
@@ -68,17 +68,17 @@ public void remove_peer() {
 
     assertThat(callbackCount).hasValue(0);
 
-    blacklist.remove(peer);
+    denylist.remove(peer);
     assertThat(callbackCount).hasValue(1);
   }
 
   @Test
   public void add_id() {
-    PeerPermissionsDenylist blacklist = PeerPermissionsDenylist.create();
+    PeerPermissionsDenylist denylist = PeerPermissionsDenylist.create();
     Peer peer = createPeer();
 
     final AtomicInteger callbackCount = new AtomicInteger(0);
-    blacklist.subscribeUpdate(
+    denylist.subscribeUpdate(
         (restricted, affectedPeers) -> {
           callbackCount.incrementAndGet();
           assertThat(restricted).isTrue();
@@ -87,18 +87,18 @@ public void add_id() {
 
     assertThat(callbackCount).hasValue(0);
 
-    blacklist.add(peer.getId());
+    denylist.add(peer.getId());
     assertThat(callbackCount).hasValue(1);
   }
 
   @Test
   public void remove_id() {
-    PeerPermissionsDenylist blacklist = PeerPermissionsDenylist.create();
+    PeerPermissionsDenylist denylist = PeerPermissionsDenylist.create();
     Peer peer = createPeer();
-    blacklist.add(peer);
+    denylist.add(peer);
 
     final AtomicInteger callbackCount = new AtomicInteger(0);
-    blacklist.subscribeUpdate(
+    denylist.subscribeUpdate(
         (restricted, affectedPeers) -> {
           callbackCount.incrementAndGet();
           assertThat(restricted).isFalse();
@@ -107,32 +107,39 @@ public void remove_id() {
 
     assertThat(callbackCount).hasValue(0);
 
-    blacklist.remove(peer.getId());
+    denylist.remove(peer.getId());
     assertThat(callbackCount).hasValue(1);
   }
 
   @Test
   public void trackedPeerIsNotPermitted() {
-    PeerPermissionsDenylist blacklist = PeerPermissionsDenylist.create();
+    PeerPermissionsDenylist denylist = PeerPermissionsDenylist.create();
 
     Peer peer = createPeer();
-    checkPermissions(blacklist, peer, true);
+    checkPermissions(denylist, peer, true);
 
-    blacklist.add(peer);
-    checkPermissions(blacklist, peer, false);
+    denylist.add(peer);
+    checkPermissions(denylist, peer, false);
 
-    blacklist.remove(peer);
-    checkPermissions(blacklist, peer, true);
+    denylist.remove(peer);
+    checkPermissions(denylist, peer, true);
+  }
+
+  @Test
+  public void selfPeerIsNotPermitted() {
+    PeerPermissionsDenylist denylist = PeerPermissionsDenylist.create();
+
+    checkPermissions(denylist, localNode, false);
   }
 
   @Test
   public void subscribeUpdate() {
-    PeerPermissionsDenylist blacklist = PeerPermissionsDenylist.create();
+    PeerPermissionsDenylist denylist = PeerPermissionsDenylist.create();
     final AtomicInteger callbackCount = new AtomicInteger(0);
     final AtomicInteger restrictedCallbackCount = new AtomicInteger(0);
     Peer peer = createPeer();
 
-    blacklist.subscribeUpdate(
+    denylist.subscribeUpdate(
         (permissionsRestricted, affectedPeers) -> {
           callbackCount.incrementAndGet();
           if (permissionsRestricted) {
@@ -140,93 +147,91 @@ public void subscribeUpdate() {
           }
         });
 
-    checkPermissions(blacklist, peer, true);
+    checkPermissions(denylist, peer, true);
     assertThat(callbackCount).hasValue(0);
     assertThat(restrictedCallbackCount).hasValue(0);
 
-    blacklist.add(peer);
+    denylist.add(peer);
     assertThat(callbackCount).hasValue(1);
     assertThat(restrictedCallbackCount).hasValue(1);
 
-    blacklist.add(peer);
+    denylist.add(peer);
     assertThat(callbackCount).hasValue(1);
     assertThat(restrictedCallbackCount).hasValue(1);
 
-    blacklist.remove(peer);
+    denylist.remove(peer);
     assertThat(callbackCount).hasValue(2);
     assertThat(restrictedCallbackCount).hasValue(1);
 
-    blacklist.remove(peer);
+    denylist.remove(peer);
     assertThat(callbackCount).hasValue(2);
     assertThat(restrictedCallbackCount).hasValue(1);
 
-    blacklist.add(peer);
+    denylist.add(peer);
     assertThat(callbackCount).hasValue(3);
     assertThat(restrictedCallbackCount).hasValue(2);
   }
 
   @Test
   public void createWithLimitedCapacity() {
-    final PeerPermissionsDenylist blacklist = PeerPermissionsDenylist.create(2);
+    final PeerPermissionsDenylist denylist = PeerPermissionsDenylist.create(2);
     Peer peerA = createPeer();
     Peer peerB = createPeer();
     Peer peerC = createPeer();
 
     // All peers are initially permitted
-    checkPermissions(blacklist, peerA, true);
-    checkPermissions(blacklist, peerB, true);
-    checkPermissions(blacklist, peerC, true);
+    checkPermissions(denylist, peerA, true);
+    checkPermissions(denylist, peerB, true);
+    checkPermissions(denylist, peerC, true);
 
     // Add peerA
-    blacklist.add(peerA);
-    checkPermissions(blacklist, peerA, false);
-    checkPermissions(blacklist, peerB, true);
-    checkPermissions(blacklist, peerC, true);
+    denylist.add(peerA);
+    checkPermissions(denylist, peerA, false);
+    checkPermissions(denylist, peerB, true);
+    checkPermissions(denylist, peerC, true);
 
     // Add peerB
-    blacklist.add(peerB);
-    checkPermissions(blacklist, peerA, false);
-    checkPermissions(blacklist, peerB, false);
-    checkPermissions(blacklist, peerC, true);
+    denylist.add(peerB);
+    checkPermissions(denylist, peerA, false);
+    checkPermissions(denylist, peerB, false);
+    checkPermissions(denylist, peerC, true);
 
     // Add peerC
     // Limit is exceeded and peerA should drop off of the list and be allowed
-    blacklist.add(peerC);
-    checkPermissions(blacklist, peerA, true);
-    checkPermissions(blacklist, peerB, false);
-    checkPermissions(blacklist, peerC, false);
+    denylist.add(peerC);
+    checkPermissions(denylist, peerA, true);
+    checkPermissions(denylist, peerB, false);
+    checkPermissions(denylist, peerC, false);
   }
 
   private void checkPermissions(
-      final PeerPermissionsDenylist blacklist,
-      final Peer remotePeer,
-      final boolean expectedResult) {
+      final PeerPermissionsDenylist denylist, final Peer remotePeer, final boolean expectedResult) {
     for (Action action : Action.values()) {
-      assertThat(blacklist.isPermitted(localNode, remotePeer, action)).isEqualTo(expectedResult);
+      assertThat(denylist.isPermitted(localNode, remotePeer, action)).isEqualTo(expectedResult);
     }
   }
 
   @Test
   public void createWithUnlimitedCapacity() {
-    final PeerPermissionsDenylist blacklist = PeerPermissionsDenylist.create();
+    final PeerPermissionsDenylist denylist = PeerPermissionsDenylist.create();
     final int peerCount = 200;
     final List<Peer> peers =
         Stream.generate(this::createPeer).limit(peerCount).collect(Collectors.toList());
 
-    peers.forEach(p -> checkPermissions(blacklist, p, true));
-    peers.forEach(blacklist::add);
-    peers.forEach(p -> checkPermissions(blacklist, p, false));
+    peers.forEach(p -> checkPermissions(denylist, p, true));
+    peers.forEach(denylist::add);
+    peers.forEach(p -> checkPermissions(denylist, p, false));
 
-    peers.forEach(blacklist::remove);
-    peers.forEach(p -> checkPermissions(blacklist, p, true));
+    peers.forEach(denylist::remove);
+    peers.forEach(p -> checkPermissions(denylist, p, true));
   }
 
   private Peer createPeer() {
     return DefaultPeer.fromEnodeURL(
-        EnodeURL.builder()
+        EnodeURLImpl.builder()
             .nodeId(Peer.randomId())
             .ipAddress("127.0.0.1")
-            .discoveryAndListeningPorts(EnodeURL.DEFAULT_LISTENING_PORT)
+            .discoveryAndListeningPorts(EnodeURLImpl.DEFAULT_LISTENING_PORT)
             .build());
   }
 }
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsTest.java
index ad67e480f13..2ef2deffe44 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/permissions/PeerPermissionsTest.java
@@ -21,7 +21,7 @@
 import static org.mockito.Mockito.verify;
 
 import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions.Action;
 
@@ -157,7 +157,7 @@ public void close_forCombinedPermissions() {
 
   private Peer createPeer() {
     return DefaultPeer.fromEnodeURL(
-        EnodeURL.builder()
+        EnodeURLImpl.builder()
             .listeningPort(30303)
             .discoveryPort(30303)
             .nodeId(Peer.randomId())
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/plain/MessageHandlerTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/plain/MessageHandlerTest.java
new file mode 100644
index 00000000000..d550ddb5ecd
--- /dev/null
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/plain/MessageHandlerTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.plain;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.netty.buffer.Unpooled;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.Test;
+
+public class MessageHandlerTest {
+
+  private static final byte[] PING_DATA = new byte[] {0, 1, 2, 3};
+
+  private static final byte[] PONG_DATA = new byte[] {3, 2, 1, 0};
+
+  private static final byte[] MESSAGE_DATA = new byte[] {0, 1, 1, 0};
+
+  private static final Bytes MESSAGE = Bytes.wrap(MESSAGE_DATA);
+
+  private static final int DATA_CODE = 1000;
+
+  @Test
+  public void buildPingMessage() throws Exception {
+    Bytes message = MessageHandler.buildMessage(MessageType.PING, PING_DATA);
+    assertThat(message).isNotNull();
+    PlainMessage parsed = MessageHandler.parseMessage(Unpooled.wrappedBuffer(message.toArray()));
+    assertThat(parsed).isNotNull();
+    assertThat(parsed.getMessageType()).isEqualTo(MessageType.PING);
+    assertThat(parsed.getData().toArray()).isEqualTo(PING_DATA);
+  }
+
+  @Test
+  public void buildPongMessage() throws Exception {
+    Bytes message = MessageHandler.buildMessage(MessageType.PONG, PONG_DATA);
+    assertThat(message).isNotNull();
+    PlainMessage parsed = MessageHandler.parseMessage(Unpooled.wrappedBuffer(message.toArray()));
+    assertThat(parsed).isNotNull();
+    assertThat(parsed.getMessageType()).isEqualTo(MessageType.PONG);
+    assertThat(parsed.getData().toArray()).isEqualTo(PONG_DATA);
+  }
+
+  @Test
+  public void buildDataMessage() throws Exception {
+    Bytes message = MessageHandler.buildMessage(MessageType.DATA, DATA_CODE, MESSAGE);
+    assertThat(message).isNotNull();
+    PlainMessage parsed = MessageHandler.parseMessage(Unpooled.wrappedBuffer(message.toArray()));
+    assertThat(parsed).isNotNull();
+    assertThat(parsed.getMessageType()).isEqualTo(MessageType.DATA);
+    assertThat(parsed.getCode()).isEqualTo(DATA_CODE);
+    assertThat(parsed.getData().toArray()).isEqualTo(MESSAGE_DATA);
+  }
+}
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/RlpxAgentTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/RlpxAgentTest.java
index ad6d33ac038..6898ce0fef4 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/RlpxAgentTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/RlpxAgentTest.java
@@ -29,12 +29,12 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
 import org.hyperledger.besu.ethereum.p2p.config.RlpxConfiguration;
 import org.hyperledger.besu.ethereum.p2p.discovery.DiscoveryPeer;
 import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
 import org.hyperledger.besu.ethereum.p2p.peers.MutableLocalNode;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.peers.PeerPrivileges;
@@ -51,7 +51,7 @@
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
@@ -60,16 +60,16 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.stream.Collectors;
+import java.util.function.Supplier;
 import java.util.stream.Stream;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.assertj.core.api.Assertions;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
 public class RlpxAgentTest {
-  private static final KeyPair KEY_PAIR = KeyPair.generate();
+  private static final KeyPair KEY_PAIR = SignatureAlgorithmFactory.getInstance().generateKeyPair();
   private final RlpxConfiguration config = RlpxConfiguration.create();
   private final TestPeerPermissions peerPermissions = spy(new TestPeerPermissions());
   private final PeerPrivileges peerPrivileges = mock(PeerPrivileges.class);
@@ -78,13 +78,21 @@ public class RlpxAgentTest {
   private final PeerConnectionEvents peerConnectionEvents = new PeerConnectionEvents(metrics);
   private final MockConnectionInitializer connectionInitializer =
       new MockConnectionInitializer(peerConnectionEvents);
+  private List<PeerConnection> connections = Collections.emptyList();
+  private final Supplier<Stream<PeerConnection>> allConnectionsSupplier = this::streamConnections;
+  private final Supplier<Stream<PeerConnection>> allActiveConnectionsSupplier = Stream::empty;
   private RlpxAgent agent = agent();
 
   @Before
   public void setup() {
     // Set basic defaults
     when(peerPrivileges.canExceedConnectionLimits(any())).thenReturn(false);
-    config.setMaxPeers(5);
+    agent.subscribeConnectRequest((a, b) -> true);
+  }
+
+  @After
+  public void after() {
+    connections = Collections.emptyList();
   }
 
   @Test
@@ -115,7 +123,10 @@ public void stop() throws ExecutionException, InterruptedException {
 
     // Stop after starting should succeed
     startAgent();
+
     final MockPeerConnection connection = (MockPeerConnection) agent.connect(createPeer()).get();
+    connections = List.of(connection);
+
     final CompletableFuture<Void> future2 = agent.stop();
     assertThat(future2).isDone();
     assertThat(future2).isNotCompletedExceptionally();
@@ -135,30 +146,33 @@ public void stop() throws ExecutionException, InterruptedException {
   public void connect_succeeds() {
     startAgent();
     final Peer peer = createPeer();
+
     final CompletableFuture<PeerConnection> connection = agent.connect(peer);
 
     assertThat(connection).isDone();
     assertThat(connection).isNotCompletedExceptionally();
 
-    assertThat(agent.getPeerConnection(peer)).contains(connection);
+    assertThat(agent.getMapOfCompletableFutures().values()).contains(connection);
   }
 
   @Test
   public void connect_fails() {
     connectionInitializer.setAutocompleteConnections(false);
     startAgent();
+
     final Peer peer = createPeer();
     final CompletableFuture<PeerConnection> connection = agent.connect(peer);
 
     // Fail connection
-    connection.completeExceptionally(new RuntimeException("whoopsies"));
+    connection.completeExceptionally(new RuntimeException());
 
-    assertPeerConnectionNotTracked(peer);
+    agent.getMapOfCompletableFutures().get(peer.getId()).isCompletedExceptionally();
   }
 
   @Test
   public void connect_toDiscoveryPeerUpdatesStats() {
     startAgent();
+
     final DiscoveryPeer peer = DiscoveryPeer.fromEnode(enode());
     assertThat(peer.getLastAttemptedConnection()).isEqualTo(0);
     final CompletableFuture<PeerConnection> connection = agent.connect(peer);
@@ -169,16 +183,17 @@ public void connect_toDiscoveryPeerUpdatesStats() {
   }
 
   @Test
-  public void incomingConnect_succeeds() {
+  public void incomingConnect_causesDispatch() {
     startAgent();
+
+    final ConnectionDispatch connectionDispatch = new ConnectionDispatch();
+    agent.subscribeConnect(connectionDispatch::onConnect);
+
     final Peer peer = createPeer();
-    final PeerConnection connection = connection(peer);
+    final PeerConnection connection = connection(peer, true);
     connectionInitializer.simulateIncomingConnection(connection);
 
-    final Optional<CompletableFuture<PeerConnection>> trackedConnection =
-        agent.getPeerConnection(peer);
-    assertThat(trackedConnection).isNotEmpty();
-    assertThat(trackedConnection.get()).isCompletedWithValue(connection);
+    assertThat(connectionDispatch.getDispatchCount()).isEqualTo(1);
   }
 
   @Test
@@ -194,23 +209,24 @@ public void connect_failsIfAgentIsNotReady() {
         .hasCauseInstanceOf(IllegalStateException.class)
         .hasMessageContaining("Cannot connect before")
         .hasMessageContaining("has finished starting");
-    assertPeerConnectionNotTracked(peer);
   }
 
   @Test
   public void incomingConnect_failsIfAgentIsNotReady() {
     // Don't start agent or set localNode
+    final ConnectionDispatch connectionDispatch = new ConnectionDispatch();
+    agent.subscribeConnect(connectionDispatch::onConnect);
     final Peer peer = createPeer();
-    final PeerConnection connection = connection(peer);
+    final PeerConnection connection = connection(peer, true);
     connectionInitializer.simulateIncomingConnection(connection);
 
-    assertPeerConnectionNotTracked(peer);
-    assertThat(agent.getConnectionCount()).isEqualTo(0);
+    assertThat(connectionDispatch.getDispatchCount()).isEqualTo(0);
   }
 
   @Test
   public void connect_failsIfPeerIsNotListening() {
     startAgent();
+
     final Peer peer = DefaultPeer.fromEnodeURL(enodeBuilder().disableListening().build());
     final CompletableFuture<PeerConnection> connection = agent.connect(peer);
 
@@ -220,449 +236,23 @@ public void connect_failsIfPeerIsNotListening() {
     assertThatThrownBy(connection::get)
         .hasCauseInstanceOf(IllegalArgumentException.class)
         .hasMessageContaining("Attempt to connect to peer with no listening port");
-    assertPeerConnectionNotTracked(peer);
   }
 
   @Test
   public void connect_doesNotCreateDuplicateConnections() {
     startAgent();
+
     final Peer peer = createPeer();
     final CompletableFuture<PeerConnection> connection1 = agent.connect(peer);
     final CompletableFuture<PeerConnection> connection2 = agent.connect(peer);
 
-    assertThat(connection2).isDone();
-    assertThat(connection2).isNotCompletedExceptionally();
     assertThat(connection2).isEqualTo(connection1);
-
-    assertThat(agent.getPeerConnection(peer)).contains(connection2);
-    assertThat(agent.getConnectionCount()).isEqualTo(1);
-  }
-
-  @Test
-  public void incomingConnection_deduplicatedWhenAlreadyConnected_peerWithHigherValueNodeId() {
-    final Bytes localNodeId = Bytes.fromHexString("0x01", EnodeURL.NODE_ID_SIZE);
-    final Bytes remoteNodeId = Bytes.fromHexString("0x02", EnodeURL.NODE_ID_SIZE);
-
-    startAgent(localNodeId);
-
-    final Peer peer = createPeer(remoteNodeId);
-    final CompletableFuture<PeerConnection> existingConnection = agent.connect(peer);
-    final MockPeerConnection incomingConnection = connection(peer);
-    connectionInitializer.simulateIncomingConnection(incomingConnection);
-
-    // Existing connection should be kept
-    assertThat(agent.getPeerConnection(peer)).contains(existingConnection);
-    assertThat(agent.getConnectionCount()).isEqualTo(1);
-    assertThat(incomingConnection.isDisconnected()).isTrue();
-    assertThat(incomingConnection.getDisconnectReason())
-        .contains(DisconnectReason.ALREADY_CONNECTED);
-  }
-
-  @Test
-  public void incomingConnection_deduplicatedWhenAlreadyConnected_peerWithLowerValueNodeId()
-      throws ExecutionException, InterruptedException {
-    final Bytes localNodeId = Bytes.fromHexString("0x02", EnodeURL.NODE_ID_SIZE);
-    final Bytes remoteNodeId = Bytes.fromHexString("0x01", EnodeURL.NODE_ID_SIZE);
-
-    startAgent(localNodeId);
-
-    final Peer peer = createPeer(remoteNodeId);
-    final CompletableFuture<PeerConnection> existingConnection = agent.connect(peer);
-    final PeerConnection incomingConnection = connection(peer);
-    connectionInitializer.simulateIncomingConnection(incomingConnection);
-
-    // New connection should be kept
-    Assertions.assertThat(agent.getPeerConnection(peer).get().get()).isEqualTo(incomingConnection);
-    assertThat(agent.getConnectionCount()).isEqualTo(1);
-    assertThat(existingConnection.get().isDisconnected()).isTrue();
-    assertThat(((MockPeerConnection) existingConnection.get()).getDisconnectReason())
-        .contains(DisconnectReason.ALREADY_CONNECTED);
-  }
-
-  @Test
-  public void connect_failsWhenMaxPeersConnected() {
-    // Saturate connections
-    startAgentWithMaxPeers(1);
-    agent.connect(createPeer());
-
-    final Peer peer = createPeer();
-    final CompletableFuture<PeerConnection> connection = agent.connect(peer);
-
-    assertThat(connection).isDone();
-    assertThat(connection).isCompletedExceptionally();
-
-    assertThatThrownBy(connection::get)
-        .hasCauseInstanceOf(IllegalStateException.class)
-        .hasMessageContaining("Max peer peer connections established (1). Cannot connect to peer");
-    assertPeerConnectionNotTracked(peer);
-    assertThat(agent.getConnectionCount()).isEqualTo(1);
-  }
-
-  @Test
-  public void incomingConnection_maxPeersExceeded()
-      throws ExecutionException, InterruptedException {
-    // Saturate connections
-    startAgentWithMaxPeers(1);
-    final Peer existingPeer = createPeer();
-    final PeerConnection existingConnection = agent.connect(existingPeer).get();
-    // Sanity check
-    assertThat(agent.getConnectionCount()).isEqualTo(1);
-
-    // Simulate incoming connection
-    final Peer newPeer = createPeer();
-    final MockPeerConnection incomingConnection = connection(newPeer);
-    connectionInitializer.simulateIncomingConnection(incomingConnection);
-
-    // Incoming or existing connection should be disconnected
-    assertThat(agent.getConnectionCount()).isEqualTo(1);
-    if (agent.getPeerConnection(newPeer).isPresent()) {
-      assertThat(((MockPeerConnection) existingConnection).getDisconnectReason())
-          .contains(DisconnectReason.TOO_MANY_PEERS);
-    } else {
-      assertThat(incomingConnection.getDisconnectReason())
-          .contains(DisconnectReason.TOO_MANY_PEERS);
-    }
-  }
-
-  @Test
-  public void incomingConnection_succeedsEventuallyWithRandomPeerPrioritization() {
-    // Saturate connections with one local and one remote
-    final int maxPeers = 25;
-    startAgentWithMaxPeers(
-        maxPeers,
-        builder -> builder.randomPeerPriority(true),
-        rlpxConfiguration -> rlpxConfiguration.setLimitRemoteWireConnectionsEnabled(false));
-    agent.connect(createPeer());
-    for (int i = 0; i < 24; i++) {
-      connectionInitializer.simulateIncomingConnection(connection(createPeer()));
-    }
-    // Sanity check
-    assertThat(agent.getConnectionCount()).isEqualTo(maxPeers);
-
-    boolean newConnectionDisconnected = false;
-    boolean oldConnectionDisconnected = false;
-    // With very high probability we should see the connections churn
-    for (int i = 0; i < 1000 && !(newConnectionDisconnected && oldConnectionDisconnected); ++i) {
-      final List<PeerConnection> connectionsBefore =
-          agent.streamConnections().collect(Collectors.toUnmodifiableList());
-
-      // Simulate incoming connection
-      final Peer newPeer = createPeer();
-      final MockPeerConnection incomingConnection = connection(newPeer);
-      connectionInitializer.simulateIncomingConnection(incomingConnection);
-
-      final List<PeerConnection> connectionsAfter =
-          agent.streamConnections().collect(Collectors.toUnmodifiableList());
-
-      if (connectionsBefore.equals(connectionsAfter)) {
-        newConnectionDisconnected = true;
-      } else if (!connectionsBefore.equals(connectionsAfter)) {
-        oldConnectionDisconnected = true;
-      }
-
-      assertThat(agent.getConnectionCount()).isEqualTo(maxPeers);
-    }
-    assertThat(newConnectionDisconnected).isTrue();
-    assertThat(oldConnectionDisconnected).isTrue();
-  }
-
-  @Test
-  public void incomingConnection_afterMaxRemotelyInitiatedConnectionsHaveBeenEstablished() {
-    final int maxPeers = 10;
-    final int maxRemotePeers = 8;
-    final float maxRemotePeersFraction = (float) maxRemotePeers / (float) maxPeers;
-    config.setLimitRemoteWireConnectionsEnabled(true);
-    config.setFractionRemoteWireConnectionsAllowed(maxRemotePeersFraction);
-    startAgentWithMaxPeers(maxPeers);
-
-    // Connect max remote peers
-    for (int i = 0; i < maxRemotePeers; i++) {
-      final Peer remotelyInitiatedPeer = createPeer();
-      final MockPeerConnection incomingConnection = connection(remotelyInitiatedPeer);
-      connectionInitializer.simulateIncomingConnection(incomingConnection);
-      assertThat(incomingConnection.getDisconnectReason()).isEmpty();
-    }
-
-    // Next remote connection should be rejected
-    final Peer remotelyInitiatedPeer = createPeer();
-    final MockPeerConnection incomingConnection = connection(remotelyInitiatedPeer);
-    connectionInitializer.simulateIncomingConnection(incomingConnection);
-    assertThat(incomingConnection.getDisconnectReason()).contains(DisconnectReason.TOO_MANY_PEERS);
-  }
-
-  @Test
-  public void connect_afterMaxRemotelyInitiatedConnectionsHaveBeenEstablished() {
-    final int maxPeers = 10;
-    final int maxRemotePeers = 8;
-    final float maxRemotePeersFraction = (float) maxRemotePeers / (float) maxPeers;
-    config.setLimitRemoteWireConnectionsEnabled(true);
-    config.setFractionRemoteWireConnectionsAllowed(maxRemotePeersFraction);
-    startAgentWithMaxPeers(maxPeers);
-
-    // Connect max remote peers
-    for (int i = 0; i < maxRemotePeers; i++) {
-      final Peer remotelyInitiatedPeer = createPeer();
-      final MockPeerConnection incomingConnection = connection(remotelyInitiatedPeer);
-      connectionInitializer.simulateIncomingConnection(incomingConnection);
-      assertThat(incomingConnection.getDisconnectReason()).isEmpty();
-    }
-
-    // Subsequent local connection should be permitted up to maxPeers
-    for (int i = 0; i < (maxPeers - maxRemotePeers); i++) {
-      final Peer peer = createPeer();
-      final CompletableFuture<PeerConnection> connection = agent.connect(peer);
-      assertThat(connection).isDone();
-      assertThat(connection).isNotCompletedExceptionally();
-      assertThat(agent.getPeerConnection(peer)).contains(connection);
-    }
-  }
-
-  @Test
-  public void incomingConnection_withMaxRemotelyInitiatedConnectionsAt100Percent() {
-    final int maxPeers = 10;
-    final float maxRemotePeersFraction = 1.0f;
-    config.setLimitRemoteWireConnectionsEnabled(true);
-    config.setFractionRemoteWireConnectionsAllowed(maxRemotePeersFraction);
-    startAgentWithMaxPeers(maxPeers);
-
-    // Connect max remote peers
-    for (int i = 0; i < maxPeers; i++) {
-      final Peer remotelyInitiatedPeer = createPeer();
-      final MockPeerConnection incomingConnection = connection(remotelyInitiatedPeer);
-      connectionInitializer.simulateIncomingConnection(incomingConnection);
-      assertThat(incomingConnection.getDisconnectReason()).isEmpty();
-    }
-  }
-
-  @Test
-  public void connect_withMaxRemotelyInitiatedConnectionsAt100Percent() {
-    final int maxPeers = 10;
-    final float maxRemotePeersFraction = 1.0f;
-    config.setLimitRemoteWireConnectionsEnabled(true);
-    config.setFractionRemoteWireConnectionsAllowed(maxRemotePeersFraction);
-    startAgentWithMaxPeers(maxPeers);
-
-    // Connect max peers locally
-    for (int i = 0; i < maxPeers; i++) {
-      final Peer peer = createPeer();
-      final CompletableFuture<PeerConnection> connection = agent.connect(peer);
-      assertThat(connection).isDone();
-      assertThat(connection).isNotCompletedExceptionally();
-      assertThat(agent.getPeerConnection(peer)).contains(connection);
-    }
-  }
-
-  @Test
-  public void incomingConnection_withMaxRemotelyInitiatedConnectionsAtZeroPercent() {
-    final int maxPeers = 10;
-    final float maxRemotePeersFraction = 0.0f;
-    config.setLimitRemoteWireConnectionsEnabled(true);
-    config.setFractionRemoteWireConnectionsAllowed(maxRemotePeersFraction);
-    startAgentWithMaxPeers(maxPeers);
-
-    // First remote connection should be rejected
-    final Peer remotelyInitiatedPeer = createPeer();
-    final MockPeerConnection incomingConnection = connection(remotelyInitiatedPeer);
-    connectionInitializer.simulateIncomingConnection(incomingConnection);
-    assertThat(incomingConnection.getDisconnectReason()).contains(DisconnectReason.TOO_MANY_PEERS);
-  }
-
-  @Test
-  public void connect_withMaxRemotelyInitiatedConnectionsAtZeroPercent() {
-    final int maxPeers = 10;
-    final float maxRemotePeersFraction = 0.0f;
-    config.setLimitRemoteWireConnectionsEnabled(true);
-    config.setFractionRemoteWireConnectionsAllowed(maxRemotePeersFraction);
-    startAgentWithMaxPeers(maxPeers);
-
-    // Connect max local peers
-    for (int i = 0; i < maxPeers; i++) {
-      final Peer peer = createPeer();
-      final CompletableFuture<PeerConnection> connection = agent.connect(peer);
-      assertThat(connection).isDone();
-      assertThat(connection).isNotCompletedExceptionally();
-      assertThat(agent.getPeerConnection(peer)).contains(connection);
-    }
-  }
-
-  @Test
-  public void incomingConnection_succeedsForPrivilegedPeerWhenMaxRemoteConnectionsExceeded() {
-    final int maxPeers = 5;
-    final int maxRemotePeers = 3;
-    final float maxRemotePeersFraction = (float) maxRemotePeers / (float) maxPeers;
-    config.setLimitRemoteWireConnectionsEnabled(true);
-    config.setFractionRemoteWireConnectionsAllowed(maxRemotePeersFraction);
-    startAgentWithMaxPeers(maxPeers);
-
-    // Connect max remote peers
-    for (int i = 0; i < maxRemotePeers; i++) {
-      final Peer remotelyInitiatedPeer = createPeer();
-      final MockPeerConnection incomingConnection = connection(remotelyInitiatedPeer);
-      connectionInitializer.simulateIncomingConnection(incomingConnection);
-      assertThat(incomingConnection.getDisconnectReason()).isEmpty();
-    }
-    // Sanity check
-    assertThat(agent.getConnectionCount()).isEqualTo(maxRemotePeers);
-
-    final Peer privilegedPeer = createPeer();
-    when(peerPrivileges.canExceedConnectionLimits(privilegedPeer)).thenReturn(true);
-    final MockPeerConnection privilegedConnection = connection(privilegedPeer);
-    connectionInitializer.simulateIncomingConnection(privilegedConnection);
-    assertThat(privilegedConnection.isDisconnected()).isFalse();
-
-    // No peers should be disconnected - exempt connections are ignored when enforcing this limit
-    assertThat(agent.getConnectionCount()).isEqualTo(maxRemotePeers + 1);
-
-    // The next non-exempt connection should fail
-    final Peer remotelyInitiatedPeer = createPeer();
-    final MockPeerConnection incomingConnection = connection(remotelyInitiatedPeer);
-    connectionInitializer.simulateIncomingConnection(incomingConnection);
-    assertThat(agent.getConnectionCount()).isEqualTo(maxRemotePeers + 1);
-    assertThat(incomingConnection.getDisconnectReason()).contains(DisconnectReason.TOO_MANY_PEERS);
-  }
-
-  @Test
-  public void connect_succeedsForExemptPeerWhenMaxPeersConnected()
-      throws ExecutionException, InterruptedException {
-    // Turn off autocomplete so that each connection is established (completed) after it has been
-    // successfully added to the internal connections set. This mimics async production behavior.
-    connectionInitializer.setAutocompleteConnections(false);
-
-    // Saturate connections
-    startAgentWithMaxPeers(1);
-    final CompletableFuture<PeerConnection> existingConnectionFuture = agent.connect(createPeer());
-    connectionInitializer.completePendingFutures();
-    final MockPeerConnection existingConnection =
-        (MockPeerConnection) existingConnectionFuture.get();
-
-    final Peer peer = createPeer();
-    when(peerPrivileges.canExceedConnectionLimits(peer)).thenReturn(true);
-    final CompletableFuture<PeerConnection> connection = agent.connect(peer);
-    connectionInitializer.completePendingFutures();
-
-    assertThat(connection).isDone();
-    assertThat(connection).isNotCompletedExceptionally();
-
-    assertThat(agent.getPeerConnection(peer)).contains(connection);
-    // Previous, non-exempt connection should be disconnected
-    assertThat(existingConnection.isDisconnected()).isTrue();
-    assertThat(existingConnection.getDisconnectReason()).contains(DisconnectReason.TOO_MANY_PEERS);
-    assertThat(agent.getConnectionCount()).isEqualTo(1);
-  }
-
-  @Test
-  public void connect_succeedsForExemptPeerWhenMaxExemptPeersConnected() {
-    // Turn off autocomplete so that each connection is established (completed) after it has been
-    // successfully added to the internal connections set. This mimics async production behavior.
-    connectionInitializer.setAutocompleteConnections(false);
-
-    startAgentWithMaxPeers(1);
-    final Peer peerA = createPeer();
-    final Peer peerB = createPeer();
-    when(peerPrivileges.canExceedConnectionLimits(peerA)).thenReturn(true);
-    when(peerPrivileges.canExceedConnectionLimits(peerB)).thenReturn(true);
-
-    // Saturate connections
-    final CompletableFuture<PeerConnection> existingConnection = agent.connect(peerA);
-    connectionInitializer.completePendingFutures();
-
-    // Create new connection
-    final CompletableFuture<PeerConnection> connection = agent.connect(peerB);
-    connectionInitializer.completePendingFutures();
-
-    assertThat(connection).isDone();
-    assertThat(connection).isNotCompletedExceptionally();
-
-    // Both connections should be kept since they are both exempt from max peer limits
-    assertThat(agent.getPeerConnection(peerA)).contains(existingConnection);
-    assertThat(agent.getPeerConnection(peerB)).contains(connection);
-    assertThat(agent.getConnectionCount()).isEqualTo(2);
-  }
-
-  @Test
-  public void incomingConnection_maxPeersExceeded_incomingConnectionExemptFromLimits()
-      throws ExecutionException, InterruptedException {
-    final Peer peerA = createPeer();
-    final Peer peerB = createPeer();
-    when(peerPrivileges.canExceedConnectionLimits(peerB)).thenReturn(true);
-
-    // Saturate connections
-    startAgentWithMaxPeers(1);
-
-    // Add existing peer
-    final MockPeerConnection existingConnection = (MockPeerConnection) agent.connect(peerA).get();
-    assertThat(agent.getConnectionCount()).isEqualTo(1);
-
-    // Simulate incoming connection
-    final MockPeerConnection connection = connection(peerB);
-    connectionInitializer.simulateIncomingConnection(connection);
-
-    // Existing connection should be disconnected
-    assertThat(agent.getConnectionCount()).isEqualTo(1);
-    assertPeerConnectionNotTracked(peerA);
-    assertThat(agent.getPeerConnection(peerB)).isNotEmpty();
-    assertThat(existingConnection.isDisconnected()).isTrue();
-    assertThat(existingConnection.getDisconnectReason()).contains(DisconnectReason.TOO_MANY_PEERS);
-    assertThat(connection.isDisconnected()).isFalse();
-  }
-
-  @Test
-  public void incomingConnection_maxPeersExceeded_existingConnectionExemptFromLimits()
-      throws ExecutionException, InterruptedException {
-    final Peer peerA = createPeer();
-    final Peer peerB = createPeer();
-    when(peerPrivileges.canExceedConnectionLimits(peerA)).thenReturn(true);
-
-    // Saturate connections
-    startAgentWithMaxPeers(1);
-
-    // Add existing peer
-    final PeerConnection existingConnection = agent.connect(peerA).get();
-    assertThat(agent.getConnectionCount()).isEqualTo(1);
-
-    // Simulate incoming connection
-    final MockPeerConnection connection = connection(peerB);
-    connectionInitializer.simulateIncomingConnection(connection);
-
-    // Incoming connection should be disconnected
-    assertThat(agent.getConnectionCount()).isEqualTo(1);
-    assertPeerConnectionNotTracked(peerB);
-    assertThat(agent.getPeerConnection(peerA)).isNotEmpty();
-    assertThat(connection.isDisconnected()).isTrue();
-    assertThat(connection.getDisconnectReason()).contains(DisconnectReason.TOO_MANY_PEERS);
-    assertThat(existingConnection.isDisconnected()).isFalse();
-  }
-
-  @Test
-  public void incomingConnection_maxPeersExceeded_allConnectionsExemptFromLimits()
-      throws ExecutionException, InterruptedException {
-    final Peer peerA = createPeer();
-    final Peer peerB = createPeer();
-    when(peerPrivileges.canExceedConnectionLimits(peerA)).thenReturn(true);
-    when(peerPrivileges.canExceedConnectionLimits(peerB)).thenReturn(true);
-
-    // Saturate connections
-    startAgentWithMaxPeers(1);
-
-    // Add existing peer
-    final CompletableFuture<PeerConnection> existingConnection = agent.connect(peerA);
-    assertThat(agent.getConnectionCount()).isEqualTo(1);
-
-    // Simulate incoming connection
-    final PeerConnection connection = connection(peerB);
-    connectionInitializer.simulateIncomingConnection(connection);
-
-    // Neither peer should be disconnected
-    assertThat(agent.getConnectionCount()).isEqualTo(2);
-    assertThat(agent.getPeerConnection(peerB)).isNotEmpty();
-    assertThat(agent.getPeerConnection(peerA)).isNotEmpty();
-    assertThat(connection.isDisconnected()).isFalse();
-    assertThat(existingConnection.get().isDisconnected()).isFalse();
   }
 
   @Test
   public void connect_failsIfPeerIsNotPermitted() {
     startAgent();
+
     final Peer peer = createPeer();
     doReturn(false)
         .when(peerPermissions)
@@ -676,14 +266,15 @@ public void connect_failsIfPeerIsNotPermitted() {
     assertThat(connection).isCompletedExceptionally();
 
     assertThatThrownBy(connection::get).hasCauseInstanceOf(PeerPermissionsException.class);
-    assertPeerConnectionNotTracked(peer);
+    assertThat(agent.getMapOfCompletableFutures().keySet().contains(peer)).isFalse();
   }
 
   @Test
   public void incomingConnection_disconnectedIfPeerIsNotPermitted() {
     startAgent();
+
     final Peer peer = createPeer();
-    final MockPeerConnection connection = connection(peer);
+    final MockPeerConnection connection = connection(peer, true);
     doReturn(false)
         .when(peerPermissions)
         .isPermitted(
@@ -692,71 +283,45 @@ public void incomingConnection_disconnectedIfPeerIsNotPermitted() {
             eq(PeerPermissions.Action.RLPX_ALLOW_NEW_INBOUND_CONNECTION));
     connectionInitializer.simulateIncomingConnection(connection);
 
-    assertPeerConnectionNotTracked(peer);
+    assertThat(agent.getMapOfCompletableFutures().keySet().contains(peer)).isFalse();
     assertThat(connection.getDisconnectReason()).contains(DisconnectReason.UNKNOWN);
   }
 
   @Test
   public void connect_largeStreamOfPeers() {
-    final int maxPeers = 5;
-    final Stream<Peer> peerStream = Stream.generate(PeerTestHelper::createPeer).limit(20);
+    startAgent();
+
+    final int peerNo = 20;
+    final Stream<? extends Peer> peerStream =
+        Stream.generate(PeerTestHelper::createPeer).limit(peerNo);
 
-    startAgentWithMaxPeers(maxPeers);
     agent = spy(agent);
     agent.connect(peerStream);
 
-    assertThat(agent.getConnectionCount()).isEqualTo(maxPeers);
-    // Check that stream was not fully iterated
-    verify(agent, times(maxPeers)).connect(any(Peer.class));
+    assertThat(agent.getMapOfCompletableFutures().size()).isEqualTo(peerNo);
+    verify(agent, times(peerNo)).connect(any(Peer.class));
   }
 
   @Test
   public void disconnect() throws ExecutionException, InterruptedException {
     startAgent();
+
     final Peer peer = spy(createPeer());
     final CompletableFuture<PeerConnection> future = agent.connect(peer);
-    final MockPeerConnection connection = (MockPeerConnection) future.get();
 
     // Sanity check connection was established
-    assertThat(agent.getConnectionCount()).isEqualTo(1);
-    assertThat(agent.getPeerConnection(peer)).isNotEmpty();
+    assertThat(agent.getMapOfCompletableFutures().size()).isEqualTo(1);
+    assertThat(agent.getMapOfCompletableFutures().keySet()).contains(peer.getId());
 
     // Disconnect
     final DisconnectReason reason = DisconnectReason.REQUESTED;
     agent.disconnect(peer.getId(), reason);
 
     // Validate peer was disconnected
-    assertThat(agent.getConnectionCount()).isEqualTo(0);
-    assertThat(connection.isDisconnected()).isTrue();
-    assertThat(connection.getDisconnectReason()).contains(reason);
-    assertPeerConnectionNotTracked(peer);
-
-    // Additional requests to disconnect should do nothing
-    agent.disconnect(peer.getId(), reason);
-    agent.disconnect(peer.getId(), reason);
-    assertThat(agent.getConnectionCount()).isEqualTo(0);
-  }
-
-  @Test
-  public void getConnectionCount() throws ExecutionException, InterruptedException {
-    startAgent();
-    final Peer peerA = createPeer();
-    final Peer peerB = createPeer();
-    final Peer peerC = createPeer();
-
-    assertThat(agent.getConnectionCount()).isEqualTo(0);
-    agent.connect(peerA);
-    assertThat(agent.getConnectionCount()).isEqualTo(1);
-    agent.connect(peerA);
-    assertThat(agent.getConnectionCount()).isEqualTo(1);
-    agent.connect(peerB);
-    assertThat(agent.getConnectionCount()).isEqualTo(2);
-    agent.connect(peerC);
-    assertThat(agent.getConnectionCount()).isEqualTo(3);
-
-    // Disconnect should decrement count
-    agent.disconnect(peerB.getId(), DisconnectReason.UNKNOWN);
-    assertThat(agent.getConnectionCount()).isEqualTo(2);
+    final PeerConnection actual = agent.getMapOfCompletableFutures().get(peer.getId()).get();
+    assertThat(actual).isEqualTo(future.get());
+    assertThat(actual.isDisconnected()).isTrue();
+    assertThat(((MockPeerConnection) actual).getDisconnectReason()).contains(reason);
   }
 
   @Test
@@ -765,11 +330,16 @@ public void permissionsUpdate_permissionsRestrictedWithNoListOfPeers()
     final Peer permittedPeer = createPeer();
     final Peer nonPermittedPeer = createPeer();
     startAgent();
-    final PeerConnection permittedConnection = agent.connect(permittedPeer).get();
-    final PeerConnection nonPermittedConnection = agent.connect(nonPermittedPeer).get();
+
+    final CompletableFuture<PeerConnection> permittedConnectionFuture =
+        this.agent.connect(permittedPeer);
+    final PeerConnection permittedConnection = permittedConnectionFuture.get();
+    final PeerConnection nonPermittedConnection = spy(this.agent.connect(nonPermittedPeer).get());
+
+    connections = List.of(permittedConnection, nonPermittedConnection);
 
     // Sanity check
-    assertThat(agent.getConnectionCount()).isEqualTo(2);
+    assertThat(agent.getMapOfCompletableFutures().size()).isEqualTo(2);
 
     doReturn(false)
         .when(peerPermissions)
@@ -779,9 +349,8 @@ public void permissionsUpdate_permissionsRestrictedWithNoListOfPeers()
             eq(PeerPermissions.Action.RLPX_ALLOW_ONGOING_LOCALLY_INITIATED_CONNECTION));
     peerPermissions.testDispatchUpdate(true, Optional.empty());
 
-    assertThat(agent.getConnectionCount()).isEqualTo(1);
-    assertThat(agent.getPeerConnection(permittedPeer)).isNotEmpty();
-    assertPeerConnectionNotTracked(nonPermittedPeer);
+    verify(nonPermittedConnection, times(1)).disconnect(any());
+    assertThat(agent.getMapOfCompletableFutures().values()).contains(permittedConnectionFuture);
     assertThat(permittedConnection.isDisconnected()).isFalse();
     assertThat(nonPermittedConnection.isDisconnected()).isTrue();
   }
@@ -792,11 +361,14 @@ public void permissionsUpdate_permissionsRestrictedWithListOfPeers()
     final Peer permittedPeer = createPeer();
     final Peer nonPermittedPeer = createPeer();
     startAgent();
+
     final PeerConnection permittedConnection = agent.connect(permittedPeer).get();
     final PeerConnection nonPermittedConnection = agent.connect(nonPermittedPeer).get();
 
+    connections = List.of(permittedConnection, nonPermittedConnection);
+
     // Sanity check
-    assertThat(agent.getConnectionCount()).isEqualTo(2);
+    assertThat(agent.getMapOfCompletableFutures().size()).isEqualTo(2);
 
     doReturn(false)
         .when(peerPermissions)
@@ -804,11 +376,9 @@ public void permissionsUpdate_permissionsRestrictedWithListOfPeers()
             eq(localNode.getPeer()),
             eq(nonPermittedPeer),
             eq(PeerPermissions.Action.RLPX_ALLOW_ONGOING_LOCALLY_INITIATED_CONNECTION));
-    peerPermissions.testDispatchUpdate(true, Optional.of(Arrays.asList(nonPermittedPeer)));
+    peerPermissions.testDispatchUpdate(true, Optional.of(List.of(nonPermittedPeer)));
 
-    assertThat(agent.getConnectionCount()).isEqualTo(1);
-    assertThat(agent.getPeerConnection(permittedPeer)).isNotEmpty();
-    assertPeerConnectionNotTracked(nonPermittedPeer);
+    assertThat(agent.getMapOfCompletableFutures().get(permittedPeer.getId())).isNotNull();
     assertThat(permittedConnection.isDisconnected()).isFalse();
     assertThat(nonPermittedConnection.isDisconnected()).isTrue();
   }
@@ -819,24 +389,28 @@ public void permissionsUpdate_permissionsRestrictedForRemotelyInitiatedConnectio
     final Peer locallyConnectedPeer = createPeer();
     final Peer remotelyConnectedPeer = createPeer();
     startAgent();
+
+    final ConnectionDispatch connectionDispatch = new ConnectionDispatch();
+    agent.subscribeConnect(connectionDispatch::onConnect);
+
     final PeerConnection locallyInitiatedConnection = agent.connect(locallyConnectedPeer).get();
-    final PeerConnection remotelyInitiatedConnection = connection(remotelyConnectedPeer);
+    final PeerConnection remotelyInitiatedConnection = connection(remotelyConnectedPeer, true);
+    connections = List.of(locallyInitiatedConnection, remotelyInitiatedConnection);
     connectionInitializer.simulateIncomingConnection(remotelyInitiatedConnection);
 
     // Sanity check
-    assertThat(agent.getConnectionCount()).isEqualTo(2);
+    assertThat(agent.getMapOfCompletableFutures().size()).isEqualTo(1); // outgoing connection
+    assertThat(connectionDispatch.getDispatchCount())
+        .isEqualTo(2); // incoming and outgoing connection
 
     doReturn(false)
         .when(peerPermissions)
         .isPermitted(
             eq(localNode.getPeer()),
-            any(),
+            eq(remotelyConnectedPeer),
             eq(PeerPermissions.Action.RLPX_ALLOW_ONGOING_REMOTELY_INITIATED_CONNECTION));
     peerPermissions.testDispatchUpdate(true, Optional.empty());
 
-    assertThat(agent.getConnectionCount()).isEqualTo(1);
-    assertThat(agent.getPeerConnection(locallyConnectedPeer)).isNotEmpty();
-    assertPeerConnectionNotTracked(remotelyConnectedPeer);
     assertThat(locallyInitiatedConnection.isDisconnected()).isFalse();
     assertThat(remotelyInitiatedConnection.isDisconnected()).isTrue();
   }
@@ -847,24 +421,28 @@ public void permissionsUpdate_permissionsRestrictedForLocallyInitiatedConnection
     final Peer locallyConnectedPeer = createPeer();
     final Peer remotelyConnectedPeer = createPeer();
     startAgent();
+
+    final ConnectionDispatch connectionDispatch = new ConnectionDispatch();
+    agent.subscribeConnect(connectionDispatch::onConnect);
+
     final PeerConnection locallyInitiatedConnection = agent.connect(locallyConnectedPeer).get();
-    final PeerConnection remotelyInitiatedConnection = connection(remotelyConnectedPeer);
+    final PeerConnection remotelyInitiatedConnection = connection(remotelyConnectedPeer, true);
+    connections = List.of(locallyInitiatedConnection, remotelyInitiatedConnection);
     connectionInitializer.simulateIncomingConnection(remotelyInitiatedConnection);
 
     // Sanity check
-    assertThat(agent.getConnectionCount()).isEqualTo(2);
+    assertThat(agent.getMapOfCompletableFutures().size()).isEqualTo(1); // outgoing connection
+    assertThat(connectionDispatch.getDispatchCount())
+        .isEqualTo(2); // incoming and outgoing connection
 
     doReturn(false)
         .when(peerPermissions)
         .isPermitted(
             eq(localNode.getPeer()),
-            any(),
+            eq(locallyConnectedPeer),
             eq(PeerPermissions.Action.RLPX_ALLOW_ONGOING_LOCALLY_INITIATED_CONNECTION));
     peerPermissions.testDispatchUpdate(true, Optional.empty());
 
-    assertThat(agent.getConnectionCount()).isEqualTo(1);
-    assertPeerConnectionNotTracked(locallyConnectedPeer);
-    assertThat(agent.getPeerConnection(remotelyConnectedPeer)).isNotEmpty();
     assertThat(locallyInitiatedConnection.isDisconnected()).isTrue();
     assertThat(remotelyInitiatedConnection.isDisconnected()).isFalse();
   }
@@ -875,17 +453,16 @@ public void permissionsUpdate_permissionsRelaxedWithNoListOfPeers()
     final Peer peerA = createPeer();
     final Peer peerB = createPeer();
     startAgent();
+
     final PeerConnection connectionA = agent.connect(peerA).get();
     final PeerConnection connectionB = agent.connect(peerB).get();
 
     // Sanity check
-    assertThat(agent.getConnectionCount()).isEqualTo(2);
+    assertThat(agent.getMapOfCompletableFutures().size()).isEqualTo(2); // outgoing connections
 
+    doReturn(false).when(peerPermissions).isPermitted(any(), any(), any());
     peerPermissions.testDispatchUpdate(false, Optional.empty());
 
-    assertThat(agent.getConnectionCount()).isEqualTo(2);
-    assertThat(agent.getPeerConnection(peerA)).isNotEmpty();
-    assertThat(agent.getPeerConnection(peerB)).isNotEmpty();
     assertThat(connectionA.isDisconnected()).isFalse();
     assertThat(connectionB.isDisconnected()).isFalse();
   }
@@ -896,17 +473,16 @@ public void permissionsUpdate_permissionsRelaxedWithListOfPeers()
     final Peer peerA = createPeer();
     final Peer peerB = createPeer();
     startAgent();
+
     final PeerConnection connectionA = agent.connect(peerA).get();
     final PeerConnection connectionB = agent.connect(peerB).get();
 
     // Sanity check
-    assertThat(agent.getConnectionCount()).isEqualTo(2);
+    assertThat(agent.getMapOfCompletableFutures().size()).isEqualTo(2); // outgoing connections
 
-    peerPermissions.testDispatchUpdate(false, Optional.of(Arrays.asList(peerA)));
+    doReturn(false).when(peerPermissions).isPermitted(any(), any(), any());
+    peerPermissions.testDispatchUpdate(false, Optional.of(List.of(peerA)));
 
-    assertThat(agent.getConnectionCount()).isEqualTo(2);
-    assertThat(agent.getPeerConnection(peerA)).isNotEmpty();
-    assertThat(agent.getPeerConnection(peerB)).isNotEmpty();
     assertThat(connectionA.isDisconnected()).isFalse();
     assertThat(connectionB.isDisconnected()).isFalse();
   }
@@ -922,7 +498,7 @@ public void subscribeConnect_firesForOutgoingConnection() {
     agent.connect(peer);
 
     assertThat(connection.get()).isNotNull();
-    Assertions.assertThat(connection.get().getPeer()).isEqualTo(peer);
+    assertThat(connection.get().getPeer()).isEqualTo(peer);
   }
 
   @Test
@@ -933,10 +509,10 @@ public void subscribeConnect_firesForIncomingConnection() {
     final AtomicReference<PeerConnection> connection = new AtomicReference<>();
     agent.subscribeConnect(connection::set);
 
-    connectionInitializer.simulateIncomingConnection(connection(peer));
+    connectionInitializer.simulateIncomingConnection(connection(peer, true));
 
     assertThat(connection.get()).isNotNull();
-    Assertions.assertThat(connection.get().getPeer()).isEqualTo(peer);
+    assertThat(connection.get().getPeer()).isEqualTo(peer);
   }
 
   @Test
@@ -951,7 +527,7 @@ public void subscribeDisconnect() {
     agent.disconnect(peer.getId(), DisconnectReason.REQUESTED);
 
     assertThat(connection.get()).isNotNull();
-    Assertions.assertThat(connection.get().getPeer()).isEqualTo(peer);
+    assertThat(connection.get().getPeer()).isEqualTo(peer);
   }
 
   @Test
@@ -980,7 +556,7 @@ public void getPeerConnection_pending() {
     final CompletableFuture<PeerConnection> future = agent.connect(peer);
     assertThat(future).isNotDone();
 
-    assertThat(agent.getPeerConnection(peer)).contains(future);
+    assertThat(agent.getMapOfCompletableFutures().values()).contains(future);
   }
 
   @Test
@@ -991,31 +567,13 @@ public void getPeerConnection_established() {
     final CompletableFuture<PeerConnection> future = agent.connect(peer);
     assertThat(future).isDone();
 
-    assertThat(agent.getPeerConnection(peer)).contains(future);
-  }
-
-  private void assertPeerConnectionNotTracked(final Peer peer) {
-    assertThat(agent.getPeerConnection(peer)).isEmpty();
-    Assertions.assertThat(agent.connectionsById.get(peer.getId())).isNull();
+    assertThat(agent.getMapOfCompletableFutures().values()).contains(future);
   }
 
   private void startAgent() {
     startAgent(Peer.randomId());
   }
 
-  private void startAgentWithMaxPeers(final int maxPeers) {
-    startAgentWithMaxPeers(maxPeers, Function.identity(), __ -> {});
-  }
-
-  private void startAgentWithMaxPeers(
-      final int maxPeers,
-      final Function<RlpxAgent.Builder, RlpxAgent.Builder> buildCustomization,
-      final Consumer<RlpxConfiguration> rlpxConfigurationModifier) {
-    config.setMaxPeers(maxPeers);
-    agent = agent(buildCustomization, rlpxConfigurationModifier);
-    startAgent();
-  }
-
   private void startAgent(final Bytes nodeId) {
     agent.start();
     localNode.setEnode(enodeBuilder().nodeId(nodeId).build());
@@ -1028,7 +586,6 @@ private RlpxAgent agent() {
   private RlpxAgent agent(
       final Function<RlpxAgent.Builder, RlpxAgent.Builder> buildCustomization,
       final Consumer<RlpxConfiguration> rlpxConfigurationModifier) {
-    config.setLimitRemoteWireConnectionsEnabled(true);
     rlpxConfigurationModifier.accept(config);
     return buildCustomization
         .apply(
@@ -1040,12 +597,14 @@ private RlpxAgent agent(
                 .localNode(localNode)
                 .metricsSystem(metrics)
                 .connectionInitializer(connectionInitializer)
-                .connectionEvents(peerConnectionEvents))
+                .connectionEvents(peerConnectionEvents)
+                .allConnectionsSupplier(allConnectionsSupplier)
+                .allActiveConnectionsSupplier(allActiveConnectionsSupplier))
         .build();
   }
 
-  private MockPeerConnection connection(final Peer peer) {
-    return MockPeerConnection.create(peer, peerConnectionEvents);
+  private MockPeerConnection connection(final Peer peer, final boolean inboundInitiated) {
+    return MockPeerConnection.create(peer, peerConnectionEvents, inboundInitiated);
   }
 
   private static class TestPeerPermissions extends PeerPermissions {
@@ -1060,4 +619,20 @@ public void testDispatchUpdate(
       this.dispatchUpdate(permissionsRestricted, affectedPeers);
     }
   }
+
+  private static class ConnectionDispatch {
+    private int dispatchCount;
+
+    public void onConnect(final PeerConnection pc) {
+      this.dispatchCount++;
+    }
+
+    public int getDispatchCount() {
+      return dispatchCount;
+    }
+  }
+
+  private Stream<PeerConnection> streamConnections() {
+    return connections.stream();
+  }
 }
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/AbstractPeerConnectionTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/AbstractPeerConnectionTest.java
index 046e5c6d19d..412accc5ef1 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/AbstractPeerConnectionTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/AbstractPeerConnectionTest.java
@@ -181,7 +181,8 @@ private static class TestPeerConnection extends AbstractPeerConnection {
           connectionId,
           multiplexer,
           connectionEventDispatcher,
-          outboundMessagesCounter);
+          outboundMessagesCounter,
+          true);
     }
 
     @Override
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/MockConnectionInitializer.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/MockConnectionInitializer.java
index 898b8301f24..814e9a797f6 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/MockConnectionInitializer.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/MockConnectionInitializer.java
@@ -16,6 +16,7 @@
 
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.rlpx.ConnectCallback;
+import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage;
 import org.hyperledger.besu.util.Subscribers;
 
 import java.net.InetSocketAddress;
@@ -32,6 +33,7 @@ public class MockConnectionInitializer implements ConnectionInitializer {
   private boolean autocompleteConnections = true;
   private final Map<Peer, CompletableFuture<PeerConnection>> incompleteConnections =
       new HashMap<>();
+  private int autoDisconnectCounter = 0;
 
   public MockConnectionInitializer(final PeerConnectionEventDispatcher eventDispatcher) {
     this.eventDispatcher = eventDispatcher;
@@ -42,7 +44,7 @@ public void setAutocompleteConnections(final boolean shouldAutocomplete) {
   }
 
   public void completePendingFutures() {
-    for (Map.Entry<Peer, CompletableFuture<PeerConnection>> conn :
+    for (final Map.Entry<Peer, CompletableFuture<PeerConnection>> conn :
         incompleteConnections.entrySet()) {
       conn.getValue().complete(MockPeerConnection.create(conn.getKey()));
     }
@@ -55,7 +57,7 @@ public void simulateIncomingConnection(final PeerConnection incomingConnection)
 
   @Override
   public CompletableFuture<InetSocketAddress> start() {
-    InetSocketAddress socketAddress =
+    final InetSocketAddress socketAddress =
         new InetSocketAddress("127.0.0.1", NEXT_PORT.incrementAndGet());
     return CompletableFuture.completedFuture(socketAddress);
   }
@@ -72,12 +74,24 @@ public void subscribeIncomingConnect(final ConnectCallback callback) {
 
   @Override
   public CompletableFuture<PeerConnection> connect(final Peer peer) {
+    if (autoDisconnectCounter > 0) {
+      autoDisconnectCounter--;
+      final MockPeerConnection mockPeerConnection =
+          MockPeerConnection.create(peer, eventDispatcher, false);
+      mockPeerConnection.disconnect(DisconnectMessage.DisconnectReason.CLIENT_QUITTING);
+      return CompletableFuture.completedFuture(mockPeerConnection);
+    }
     if (autocompleteConnections) {
-      return CompletableFuture.completedFuture(MockPeerConnection.create(peer, eventDispatcher));
+      return CompletableFuture.completedFuture(
+          MockPeerConnection.create(peer, eventDispatcher, false));
     } else {
       final CompletableFuture<PeerConnection> future = new CompletableFuture<>();
       incompleteConnections.put(peer, future);
       return future;
     }
   }
+
+  public void setAutoDisconnectCounter(final int autoDisconnectCounter) {
+    this.autoDisconnectCounter = autoDisconnectCounter;
+  }
 }
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/MockPeerConnection.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/MockPeerConnection.java
index 3662ae35ddf..a57677f514e 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/MockPeerConnection.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/MockPeerConnection.java
@@ -47,7 +47,8 @@ private MockPeerConnection(
       final String connectionId,
       final CapabilityMultiplexer multiplexer,
       final PeerConnectionEventDispatcher connectionEventDispatcher,
-      final LabelledMetric<Counter> outboundMessagesCounter) {
+      final LabelledMetric<Counter> outboundMessagesCounter,
+      final boolean inboundInitiated) {
     super(
         peer,
         peerInfo,
@@ -56,7 +57,8 @@ private MockPeerConnection(
         connectionId,
         multiplexer,
         connectionEventDispatcher,
-        outboundMessagesCounter);
+        outboundMessagesCounter,
+        inboundInitiated);
   }
 
   public static MockPeerConnection create() {
@@ -64,11 +66,13 @@ public static MockPeerConnection create() {
   }
 
   public static MockPeerConnection create(final Peer peer) {
-    return create(peer, mock(PeerConnectionEventDispatcher.class));
+    return create(peer, mock(PeerConnectionEventDispatcher.class), true);
   }
 
   public static MockPeerConnection create(
-      final Peer peer, final PeerConnectionEventDispatcher eventDispatcher) {
+      final Peer peer,
+      final PeerConnectionEventDispatcher eventDispatcher,
+      final boolean inboundInitiated) {
     final List<SubProtocol> subProtocols = Arrays.asList(MockSubProtocol.create("eth"));
     final List<Capability> caps = Arrays.asList(Capability.create("eth", 63));
     final CapabilityMultiplexer multiplexer = new CapabilityMultiplexer(subProtocols, caps, caps);
@@ -83,7 +87,8 @@ public static MockPeerConnection create(
         Integer.toString(connectionId.incrementAndGet()),
         multiplexer,
         eventDispatcher,
-        NoOpMetricsSystem.NO_OP_LABELLED_3_COUNTER);
+        NoOpMetricsSystem.NO_OP_LABELLED_3_COUNTER,
+        inboundInitiated);
   }
 
   @Override
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/RlpxConnectionTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/RlpxConnectionTest.java
deleted file mode 100644
index fa61beb53ca..00000000000
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/RlpxConnectionTest.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.p2p.rlpx.connections;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.hyperledger.besu.ethereum.p2p.peers.PeerTestHelper.createPeer;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import org.hyperledger.besu.ethereum.p2p.peers.Peer;
-import org.hyperledger.besu.ethereum.p2p.rlpx.connections.RlpxConnection.ConnectionNotEstablishedException;
-import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
-
-import java.util.concurrent.CompletableFuture;
-
-import org.junit.Test;
-
-public class RlpxConnectionTest {
-
-  @Test
-  public void getPeer_pendingOutboundConnection() {
-    final Peer peer = createPeer();
-    final CompletableFuture<PeerConnection> future = new CompletableFuture<>();
-    final RlpxConnection conn = RlpxConnection.outboundConnection(peer, future);
-
-    assertThat(conn.getPeer()).isEqualTo(peer);
-  }
-
-  @Test
-  public void getPeer_establishedOutboundConnection() {
-    final Peer peer = createPeer();
-    final CompletableFuture<PeerConnection> future = new CompletableFuture<>();
-    final RlpxConnection conn = RlpxConnection.outboundConnection(peer, future);
-    future.complete(peerConnection(peer));
-
-    assertThat(conn.getPeer()).isEqualTo(peer);
-  }
-
-  @Test
-  public void getPeer_inboundConnection() {
-    final Peer peer = createPeer();
-    final PeerConnection peerConnection = peerConnection(peer);
-    final RlpxConnection conn = RlpxConnection.inboundConnection(peerConnection);
-
-    assertThat(conn.getPeer()).isEqualTo(peer);
-  }
-
-  @Test
-  public void disconnect_pendingOutboundConnection() {
-    final Peer peer = createPeer();
-    final CompletableFuture<PeerConnection> future = new CompletableFuture<>();
-    final RlpxConnection conn = RlpxConnection.outboundConnection(peer, future);
-
-    final DisconnectReason reason = DisconnectReason.REQUESTED;
-    conn.disconnect(reason);
-    assertThat(conn.isFailedOrDisconnected()).isFalse();
-
-    // Resolve future
-    final PeerConnection peerConnection = peerConnection(peer);
-    future.complete(peerConnection);
-
-    // Check disconnect was issued
-    verify(peerConnection).disconnect(reason);
-    assertThat(conn.isFailedOrDisconnected()).isTrue();
-  }
-
-  @Test
-  public void disconnect_activeOutboundConnection() {
-    final Peer peer = createPeer();
-    final CompletableFuture<PeerConnection> future = new CompletableFuture<>();
-    final RlpxConnection conn = RlpxConnection.outboundConnection(peer, future);
-    final PeerConnection peerConnection = peerConnection(peer);
-    future.complete(peerConnection);
-
-    final DisconnectReason reason = DisconnectReason.REQUESTED;
-    conn.disconnect(reason);
-
-    // Check disconnect was issued
-    assertThat(conn.isFailedOrDisconnected()).isTrue();
-    verify(peerConnection).disconnect(reason);
-  }
-
-  @Test
-  public void disconnect_failedOutboundConnection() {
-    final Peer peer = createPeer();
-    final CompletableFuture<PeerConnection> future = new CompletableFuture<>();
-    final RlpxConnection conn = RlpxConnection.outboundConnection(peer, future);
-    future.completeExceptionally(new IllegalStateException("whoops"));
-
-    assertThat(conn.isFailedOrDisconnected()).isTrue();
-    final DisconnectReason reason = DisconnectReason.REQUESTED;
-    conn.disconnect(reason);
-    assertThat(conn.isFailedOrDisconnected()).isTrue();
-  }
-
-  @Test
-  public void disconnect_inboundConnection() {
-    final Peer peer = createPeer();
-    final PeerConnection peerConnection = peerConnection(peer);
-    final RlpxConnection conn = RlpxConnection.inboundConnection(peerConnection);
-
-    assertThat(conn.isFailedOrDisconnected()).isFalse();
-    final DisconnectReason reason = DisconnectReason.REQUESTED;
-    conn.disconnect(reason);
-
-    // Check disconnect was issued
-    assertThat(conn.isFailedOrDisconnected()).isTrue();
-    verify(peerConnection).disconnect(reason);
-  }
-
-  @Test
-  public void getPeerConnection_pendingOutboundConnection() {
-    final Peer peer = createPeer();
-    final CompletableFuture<PeerConnection> future = new CompletableFuture<>();
-    final RlpxConnection conn = RlpxConnection.outboundConnection(peer, future);
-
-    assertThatThrownBy(conn::getPeerConnection)
-        .isInstanceOf(ConnectionNotEstablishedException.class);
-  }
-
-  @Test
-  public void getPeerConnection_activeOutboundConnection() {
-    final Peer peer = createPeer();
-    final CompletableFuture<PeerConnection> future = new CompletableFuture<>();
-    final RlpxConnection conn = RlpxConnection.outboundConnection(peer, future);
-    final PeerConnection peerConnection = peerConnection(peer);
-    future.complete(peerConnection);
-
-    assertThat(conn.getPeerConnection()).isEqualTo(peerConnection);
-  }
-
-  @Test
-  public void getPeerConnection_failedOutboundConnection() {
-    final Peer peer = createPeer();
-    final CompletableFuture<PeerConnection> future = new CompletableFuture<>();
-    final RlpxConnection conn = RlpxConnection.outboundConnection(peer, future);
-    future.completeExceptionally(new IllegalStateException("whoops"));
-
-    assertThatThrownBy(conn::getPeerConnection)
-        .isInstanceOf(ConnectionNotEstablishedException.class);
-  }
-
-  @Test
-  public void getPeerConnection_disconnectedOutboundConnection() {
-    final Peer peer = createPeer();
-    final CompletableFuture<PeerConnection> future = new CompletableFuture<>();
-    final RlpxConnection conn = RlpxConnection.outboundConnection(peer, future);
-    final PeerConnection peerConnection = peerConnection(peer);
-    future.complete(peerConnection);
-    conn.disconnect(DisconnectReason.REQUESTED);
-
-    assertThat(conn.getPeerConnection()).isEqualTo(peerConnection);
-  }
-
-  @Test
-  public void getPeerConnection_activeInboundConnection() {
-    final Peer peer = createPeer();
-    final PeerConnection peerConnection = peerConnection(peer);
-    final RlpxConnection conn = RlpxConnection.inboundConnection(peerConnection);
-
-    assertThat(conn.getPeerConnection()).isEqualTo(peerConnection);
-  }
-
-  @Test
-  public void getPeerConnection_disconnectedInboundConnection() {
-    final Peer peer = createPeer();
-    final PeerConnection peerConnection = peerConnection(peer);
-    final RlpxConnection conn = RlpxConnection.inboundConnection(peerConnection);
-    conn.disconnect(DisconnectReason.REQUESTED);
-
-    assertThat(conn.getPeerConnection()).isEqualTo(peerConnection);
-  }
-
-  @Test
-  public void checkState_pendingOutboundConnection() {
-    final Peer peer = createPeer();
-    final CompletableFuture<PeerConnection> future = new CompletableFuture<>();
-    final RlpxConnection conn = RlpxConnection.outboundConnection(peer, future);
-
-    assertThat(conn.initiatedRemotely()).isFalse();
-    assertThat(conn.isActive()).isFalse();
-    assertThat(conn.isPending()).isTrue();
-    assertThat(conn.isFailedOrDisconnected()).isFalse();
-  }
-
-  @Test
-  public void checkState_activeOutboundConnection() {
-    final Peer peer = createPeer();
-    final CompletableFuture<PeerConnection> future = new CompletableFuture<>();
-    final RlpxConnection conn = RlpxConnection.outboundConnection(peer, future);
-    final PeerConnection peerConnection = peerConnection(peer);
-    future.complete(peerConnection);
-
-    assertThat(conn.initiatedRemotely()).isFalse();
-    assertThat(conn.isActive()).isTrue();
-    assertThat(conn.isPending()).isFalse();
-    assertThat(conn.isFailedOrDisconnected()).isFalse();
-  }
-
-  @Test
-  public void checkState_failedOutboundConnection() {
-    final Peer peer = createPeer();
-    final CompletableFuture<PeerConnection> future = new CompletableFuture<>();
-    final RlpxConnection conn = RlpxConnection.outboundConnection(peer, future);
-    future.completeExceptionally(new IllegalStateException("whoops"));
-
-    assertThat(conn.initiatedRemotely()).isFalse();
-    assertThat(conn.isActive()).isFalse();
-    assertThat(conn.isPending()).isFalse();
-    assertThat(conn.isFailedOrDisconnected()).isTrue();
-  }
-
-  @Test
-  public void checkState_disconnectedOutboundConnection() {
-    final Peer peer = createPeer();
-    final CompletableFuture<PeerConnection> future = new CompletableFuture<>();
-    final RlpxConnection conn = RlpxConnection.outboundConnection(peer, future);
-    final PeerConnection peerConnection = peerConnection(peer);
-    future.complete(peerConnection);
-    conn.disconnect(DisconnectReason.UNKNOWN);
-
-    assertThat(conn.initiatedRemotely()).isFalse();
-    assertThat(conn.isActive()).isFalse();
-    assertThat(conn.isPending()).isFalse();
-    assertThat(conn.isFailedOrDisconnected()).isTrue();
-  }
-
-  @Test
-  public void checkState_activeInboundConnection() {
-    final Peer peer = createPeer();
-    final PeerConnection peerConnection = peerConnection(peer);
-    final RlpxConnection conn = RlpxConnection.inboundConnection(peerConnection);
-
-    assertThat(conn.initiatedRemotely()).isTrue();
-    assertThat(conn.isActive()).isTrue();
-    assertThat(conn.isPending()).isFalse();
-    assertThat(conn.isFailedOrDisconnected()).isFalse();
-  }
-
-  @Test
-  public void checkState_disconnectedInboundConnection() {
-    final Peer peer = createPeer();
-    final PeerConnection peerConnection = peerConnection(peer);
-    final RlpxConnection conn = RlpxConnection.inboundConnection(peerConnection);
-    conn.disconnect(DisconnectReason.UNKNOWN);
-
-    assertThat(conn.initiatedRemotely()).isTrue();
-    assertThat(conn.isActive()).isFalse();
-    assertThat(conn.isPending()).isFalse();
-    assertThat(conn.isFailedOrDisconnected()).isTrue();
-  }
-
-  private PeerConnection peerConnection(final Peer peer) {
-    return spy(MockPeerConnection.create(peer));
-  }
-}
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/DeFramerTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/DeFramerTest.java
index 269c6a9ffd6..271dbc31dbf 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/DeFramerTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/DeFramerTest.java
@@ -26,10 +26,11 @@
 
 import org.hyperledger.besu.ethereum.p2p.network.exceptions.BreachOfProtocolException;
 import org.hyperledger.besu.ethereum.p2p.network.exceptions.IncompatiblePeerException;
+import org.hyperledger.besu.ethereum.p2p.network.exceptions.PeerChannelClosedException;
 import org.hyperledger.besu.ethereum.p2p.network.exceptions.PeerDisconnectedException;
 import org.hyperledger.besu.ethereum.p2p.network.exceptions.UnexpectedPeerConnectionException;
 import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.peers.LocalNode;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
@@ -49,6 +50,7 @@
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.WireMessageCodes;
 import org.hyperledger.besu.ethereum.rlp.RLPException;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
@@ -93,7 +95,7 @@ public class DeFramerTest {
   private final int port = 30303;
   private final List<Capability> capabilities = Arrays.asList(Capability.create("eth", 63));
   private final EnodeURL localEnode =
-      EnodeURL.builder()
+      EnodeURLImpl.builder()
           .ipAddress("127.0.0.1")
           .discoveryAndListeningPorts(port)
           .nodeId(Peer.randomId())
@@ -165,27 +167,27 @@ public void exceptionCaught_shouldHandleGenericExceptionWhenFutureCompletedExcep
 
   @Test
   public void decode_handlesHello() throws ExecutionException, InterruptedException {
-    ChannelFuture future = NettyMocks.channelFuture(false);
+    final ChannelFuture future = NettyMocks.channelFuture(false);
     when(channel.closeFuture()).thenReturn(future);
 
     final Peer peer = createRemotePeer();
     final PeerInfo remotePeerInfo = createPeerInfo(peer);
 
-    HelloMessage helloMessage = HelloMessage.create(remotePeerInfo);
-    ByteBuf data = Unpooled.wrappedBuffer(helloMessage.getData().toArray());
+    final HelloMessage helloMessage = HelloMessage.create(remotePeerInfo);
+    final ByteBuf data = Unpooled.wrappedBuffer(helloMessage.getData().toArray());
     when(framer.deframe(eq(data)))
         .thenReturn(new RawMessage(helloMessage.getCode(), helloMessage.getData()))
         .thenReturn(null);
-    List<Object> out = new ArrayList<>();
+    final List<Object> out = new ArrayList<>();
     deFramer.decode(ctx, data, out);
 
     assertThat(connectFuture).isDone();
     assertThat(connectFuture).isNotCompletedExceptionally();
-    PeerConnection peerConnection = connectFuture.get();
+    final PeerConnection peerConnection = connectFuture.get();
     assertThat(peerConnection.getPeerInfo()).isEqualTo(remotePeerInfo);
 
-    EnodeURL expectedEnode =
-        EnodeURL.builder()
+    final EnodeURL expectedEnode =
+        EnodeURLImpl.builder()
             .configureFromEnode(peer.getEnodeURL())
             // Discovery information is not available from peer info
             .disableDiscovery()
@@ -197,8 +199,8 @@ public void decode_handlesHello() throws ExecutionException, InterruptedExceptio
     verify(pipeline, times(1)).addLast(any());
 
     // Next message should be pushed out
-    PingMessage nextMessage = PingMessage.get();
-    ByteBuf nextData = Unpooled.wrappedBuffer(nextMessage.getData().toArray());
+    final PingMessage nextMessage = PingMessage.get();
+    final ByteBuf nextData = Unpooled.wrappedBuffer(nextMessage.getData().toArray());
     when(framer.deframe(eq(nextData)))
         .thenReturn(new RawMessage(nextMessage.getCode(), nextMessage.getData()))
         .thenReturn(null);
@@ -210,7 +212,7 @@ public void decode_handlesHello() throws ExecutionException, InterruptedExceptio
   @Test
   public void decode_handlesHelloFromPeerWithAdvertisedPortOf0()
       throws ExecutionException, InterruptedException {
-    ChannelFuture future = NettyMocks.channelFuture(false);
+    final ChannelFuture future = NettyMocks.channelFuture(false);
     when(channel.closeFuture()).thenReturn(future);
 
     final Peer peer = createRemotePeer();
@@ -218,22 +220,22 @@ public void decode_handlesHelloFromPeerWithAdvertisedPortOf0()
         new PeerInfo(p2pVersion, clientId, capabilities, 0, peer.getId());
     final DeFramer deFramer = createDeFramer(null);
 
-    HelloMessage helloMessage = HelloMessage.create(remotePeerInfo);
-    ByteBuf data = Unpooled.wrappedBuffer(helloMessage.getData().toArray());
+    final HelloMessage helloMessage = HelloMessage.create(remotePeerInfo);
+    final ByteBuf data = Unpooled.wrappedBuffer(helloMessage.getData().toArray());
     when(framer.deframe(eq(data)))
         .thenReturn(new RawMessage(helloMessage.getCode(), helloMessage.getData()))
         .thenReturn(null);
-    List<Object> out = new ArrayList<>();
+    final List<Object> out = new ArrayList<>();
     deFramer.decode(ctx, data, out);
 
     assertThat(connectFuture).isDone();
     assertThat(connectFuture).isNotCompletedExceptionally();
-    PeerConnection peerConnection = connectFuture.get();
+    final PeerConnection peerConnection = connectFuture.get();
     assertThat(peerConnection.getPeerInfo()).isEqualTo(remotePeerInfo);
     assertThat(out).isEmpty();
 
     final EnodeURL expectedEnode =
-        EnodeURL.builder()
+        EnodeURLImpl.builder()
             .ipAddress(remoteAddress.getAddress())
             .nodeId(peer.getId())
             // Listening port should be disabled
@@ -247,8 +249,8 @@ public void decode_handlesHelloFromPeerWithAdvertisedPortOf0()
     verify(pipeline, times(1)).addLast(any());
 
     // Next message should be pushed out
-    PingMessage nextMessage = PingMessage.get();
-    ByteBuf nextData = Unpooled.wrappedBuffer(nextMessage.getData().toArray());
+    final PingMessage nextMessage = PingMessage.get();
+    final ByteBuf nextData = Unpooled.wrappedBuffer(nextMessage.getData().toArray());
     when(framer.deframe(eq(nextData)))
         .thenReturn(new RawMessage(nextMessage.getCode(), nextMessage.getData()))
         .thenReturn(null);
@@ -259,7 +261,7 @@ public void decode_handlesHelloFromPeerWithAdvertisedPortOf0()
 
   @Test
   public void decode_handlesUnexpectedPeerId() {
-    ChannelFuture future = NettyMocks.channelFuture(false);
+    final ChannelFuture future = NettyMocks.channelFuture(false);
     when(channel.closeFuture()).thenReturn(future);
 
     final Peer peer = createRemotePeer();
@@ -273,12 +275,12 @@ public void decode_handlesUnexpectedPeerId() {
             mismatchedId);
     final DeFramer deFramer = createDeFramer(peer);
 
-    HelloMessage helloMessage = HelloMessage.create(remotePeerInfo);
-    ByteBuf data = Unpooled.wrappedBuffer(helloMessage.getData().toArray());
+    final HelloMessage helloMessage = HelloMessage.create(remotePeerInfo);
+    final ByteBuf data = Unpooled.wrappedBuffer(helloMessage.getData().toArray());
     when(framer.deframe(eq(data)))
         .thenReturn(new RawMessage(helloMessage.getCode(), helloMessage.getData()))
         .thenReturn(null);
-    List<Object> out = new ArrayList<>();
+    final List<Object> out = new ArrayList<>();
     deFramer.decode(ctx, data, out);
 
     assertThat(connectFuture).isDone();
@@ -295,22 +297,22 @@ public void decode_handlesUnexpectedPeerId() {
 
   @Test
   public void decode_handlesNoSharedCaps() {
-    ChannelFuture future = NettyMocks.channelFuture(false);
+    final ChannelFuture future = NettyMocks.channelFuture(false);
     when(channel.closeFuture()).thenReturn(future);
 
-    PeerInfo remotePeerInfo =
+    final PeerInfo remotePeerInfo =
         new PeerInfo(
             p2pVersion,
             "bla",
             Arrays.asList(Capability.create("eth", 254)),
             30303,
             Peer.randomId());
-    HelloMessage helloMessage = HelloMessage.create(remotePeerInfo);
-    ByteBuf data = Unpooled.wrappedBuffer(helloMessage.getData().toArray());
+    final HelloMessage helloMessage = HelloMessage.create(remotePeerInfo);
+    final ByteBuf data = Unpooled.wrappedBuffer(helloMessage.getData().toArray());
     when(framer.deframe(eq(data)))
         .thenReturn(new RawMessage(helloMessage.getCode(), helloMessage.getData()))
         .thenReturn(null);
-    List<Object> out = new ArrayList<>();
+    final List<Object> out = new ArrayList<>();
     deFramer.decode(ctx, data, out);
 
     assertThat(connectFuture).isDone();
@@ -324,12 +326,13 @@ public void decode_handlesNoSharedCaps() {
 
   @Test
   public void decode_shouldHandleImmediateDisconnectMessage() {
-    DisconnectMessage disconnectMessage = DisconnectMessage.create(DisconnectReason.TOO_MANY_PEERS);
-    ByteBuf disconnectData = Unpooled.wrappedBuffer(disconnectMessage.getData().toArray());
+    final DisconnectMessage disconnectMessage =
+        DisconnectMessage.create(DisconnectReason.TOO_MANY_PEERS);
+    final ByteBuf disconnectData = Unpooled.wrappedBuffer(disconnectMessage.getData().toArray());
     when(framer.deframe(eq(disconnectData)))
         .thenReturn(new RawMessage(disconnectMessage.getCode(), disconnectMessage.getData()))
         .thenReturn(null);
-    List<Object> out = new ArrayList<>();
+    final List<Object> out = new ArrayList<>();
     deFramer.decode(ctx, disconnectData, out);
 
     assertThat(connectFuture).isDone();
@@ -340,24 +343,48 @@ public void decode_shouldHandleImmediateDisconnectMessage() {
     assertThat(out).isEmpty();
   }
 
+  @Test
+  public void decode_shouldHandleRemoteSocketAddressIsNull() {
+    final Peer peer = createRemotePeer();
+    final PeerInfo remotePeerInfo =
+        new PeerInfo(p2pVersion, clientId, capabilities, 0, peer.getId());
+    final HelloMessage helloMessage = HelloMessage.create(remotePeerInfo);
+    final ByteBuf data = Unpooled.wrappedBuffer(helloMessage.getData().toArray());
+    when(framer.deframe(any()))
+        .thenReturn(new RawMessage(helloMessage.getCode(), helloMessage.getData()))
+        .thenReturn(null);
+    when(channel.remoteAddress()).thenReturn(null);
+    final ChannelFuture future = NettyMocks.channelFuture(true);
+    when(ctx.writeAndFlush(any())).thenReturn(future);
+    final List<Object> out = new ArrayList<>();
+    deFramer.decode(ctx, data, out);
+
+    assertThat(connectFuture).isDone();
+    assertThat(connectFuture).isCompletedExceptionally();
+    assertThatThrownBy(connectFuture::get).hasCauseInstanceOf(PeerChannelClosedException.class);
+    verify(ctx).close();
+    assertThat(out).isEmpty();
+  }
+
   @Test
   public void decode_shouldHandleInvalidMessage() {
-    MessageData messageData = PingMessage.get();
-    ByteBuf data = Unpooled.wrappedBuffer(messageData.getData().toArray());
+    final MessageData messageData = PingMessage.get();
+    final ByteBuf data = Unpooled.wrappedBuffer(messageData.getData().toArray());
     when(framer.deframe(eq(data)))
         .thenReturn(new RawMessage(messageData.getCode(), messageData.getData()))
         .thenReturn(null);
-    ChannelFuture future = NettyMocks.channelFuture(true);
+    final ChannelFuture future = NettyMocks.channelFuture(true);
     when(ctx.writeAndFlush(any())).thenReturn(future);
-    List<Object> out = new ArrayList<>();
+    final List<Object> out = new ArrayList<>();
     deFramer.decode(ctx, data, out);
 
-    ArgumentCaptor<Object> outboundMessageArgumentCaptor =
+    final ArgumentCaptor<Object> outboundMessageArgumentCaptor =
         ArgumentCaptor.forClass(OutboundMessage.class);
     verify(ctx, times(1)).writeAndFlush(outboundMessageArgumentCaptor.capture());
-    OutboundMessage outboundMessage = (OutboundMessage) outboundMessageArgumentCaptor.getValue();
+    final OutboundMessage outboundMessage =
+        (OutboundMessage) outboundMessageArgumentCaptor.getValue();
     assertThat(outboundMessage.getCapability()).isNull();
-    MessageData outboundMessageData = outboundMessage.getData();
+    final MessageData outboundMessageData = outboundMessage.getData();
     assertThat(outboundMessageData.getCode()).isEqualTo(WireMessageCodes.DISCONNECT);
     assertThat(DisconnectMessage.readFrom(outboundMessageData).getReason())
         .isEqualTo(DisconnectReason.BREACH_OF_PROTOCOL);
@@ -370,7 +397,7 @@ public void decode_shouldHandleInvalidMessage() {
 
   private Peer createRemotePeer() {
     return DefaultPeer.fromEnodeURL(
-        EnodeURL.builder()
+        EnodeURLImpl.builder()
             .ipAddress(remoteAddress.getAddress())
             .discoveryAndListeningPorts(remotePort)
             .nodeId(Peer.randomId())
@@ -394,6 +421,7 @@ private DeFramer createDeFramer(final Peer expectedPeer) {
         Optional.ofNullable(expectedPeer),
         connectionEventDispatcher,
         connectFuture,
-        new NoOpMetricsSystem());
+        new NoOpMetricsSystem(),
+        true);
   }
 }
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyTLSConnectionInitializerTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyTLSConnectionInitializerTest.java
new file mode 100644
index 00000000000..dd5f0080c04
--- /dev/null
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/NettyTLSConnectionInitializerTest.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.cryptoservices.NodeKey;
+import org.hyperledger.besu.ethereum.p2p.config.RlpxConfiguration;
+import org.hyperledger.besu.ethereum.p2p.peers.LocalNode;
+import org.hyperledger.besu.ethereum.p2p.peers.Peer;
+import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnectionEventDispatcher;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.data.EnodeURL;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import com.google.common.collect.ImmutableList;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
+import io.netty.handler.codec.LengthFieldPrepender;
+import io.netty.handler.codec.compression.SnappyFrameDecoder;
+import io.netty.handler.codec.compression.SnappyFrameEncoder;
+import io.netty.handler.ssl.SslContext;
+import io.netty.handler.ssl.SslHandler;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class NettyTLSConnectionInitializerTest {
+
+  private static final String PEER_HOST = "hyperledger.org";
+  private static final int PEER_PORT = 30303;
+  @Mock private NodeKey nodeKey;
+  @Mock private RlpxConfiguration rlpxConfiguration;
+  @Mock private LocalNode localNode;
+  @Mock private PeerConnectionEventDispatcher eventDispatcher;
+  @Mock private TLSContextFactory tlsContextFactory;
+  @Mock private SslContext clientSslContext;
+  @Mock private SslContext serverSslContext;
+  @Mock private SslHandler clientSslHandler;
+  @Mock private SslHandler serverSslHandler;
+  @Mock private Peer peer;
+  @Mock private EnodeURL enodeURL;
+
+  private NettyTLSConnectionInitializer nettyTLSConnectionInitializer;
+
+  @Before
+  public void before() throws Exception {
+    nettyTLSConnectionInitializer = createNettyTLSConnectionInitializer(false);
+
+    when(tlsContextFactory.createNettyServerSslContext()).thenReturn(serverSslContext);
+    when(serverSslContext.newHandler(any())).thenReturn(serverSslHandler);
+
+    when(tlsContextFactory.createNettyClientSslContext()).thenReturn(clientSslContext);
+    when(clientSslContext.newHandler(any())).thenReturn(clientSslHandler);
+    when(peer.getEnodeURL()).thenReturn(enodeURL);
+    when(enodeURL.getHost()).thenReturn(PEER_HOST);
+    when(enodeURL.getListeningPort()).thenReturn(Optional.of(PEER_PORT));
+  }
+
+  private NettyTLSConnectionInitializer createNettyTLSConnectionInitializer(
+      final boolean clientHelloSniHeaderEnabled) {
+    return new NettyTLSConnectionInitializer(
+        nodeKey,
+        rlpxConfiguration,
+        localNode,
+        eventDispatcher,
+        new NoOpMetricsSystem(),
+        () -> tlsContextFactory,
+        clientHelloSniHeaderEnabled);
+  }
+
+  @Test
+  public void addAdditionalOutboundHandlersIncludesAllExpectedHandlersToChannelPipeline()
+      throws Exception {
+    final EmbeddedChannel embeddedChannel = new EmbeddedChannel();
+    nettyTLSConnectionInitializer.addAdditionalOutboundHandlers(embeddedChannel, peer);
+
+    // TLS
+    assertThat(embeddedChannel.pipeline().get(SslHandler.class)).isEqualTo(clientSslHandler);
+
+    // Snappy compression
+    assertThat(embeddedChannel.pipeline().get(SnappyFrameDecoder.class)).isNotNull();
+    assertThat(embeddedChannel.pipeline().get(SnappyFrameEncoder.class)).isNotNull();
+
+    // Message Framing
+    assertThat(embeddedChannel.pipeline().get(LengthFieldBasedFrameDecoder.class)).isNotNull();
+    assertThat(embeddedChannel.pipeline().get(LengthFieldPrepender.class)).isNotNull();
+
+    assertHandlersOrderInPipeline(embeddedChannel.pipeline());
+  }
+
+  @Test
+  public void addAdditionalOutboundHandlersUsesSslHandlerWithSniHeaderEnabledIfConfigured()
+      throws Exception {
+    nettyTLSConnectionInitializer = createNettyTLSConnectionInitializer(true);
+    when(clientSslContext.newHandler(any(), eq(PEER_HOST), eq(PEER_PORT)))
+        .thenReturn(clientSslHandler);
+
+    final EmbeddedChannel embeddedChannel = new EmbeddedChannel();
+    nettyTLSConnectionInitializer.addAdditionalOutboundHandlers(embeddedChannel, peer);
+
+    // Handler with SNI params was created
+    verify(clientSslContext).newHandler(any(), eq(PEER_HOST), eq(PEER_PORT));
+
+    // Other handlers are still present as expected
+    assertHandlersOrderInPipeline(embeddedChannel.pipeline());
+  }
+
+  @Test
+  public void addAdditionalInboundHandlersIncludesAllExpectedHandlersToChannelPipeline()
+      throws Exception {
+    final EmbeddedChannel embeddedChannel = new EmbeddedChannel();
+    nettyTLSConnectionInitializer.addAdditionalInboundHandlers(embeddedChannel);
+
+    // TLS
+    assertThat(embeddedChannel.pipeline().get(SslHandler.class)).isEqualTo(serverSslHandler);
+
+    // Snappy compression
+    assertThat(embeddedChannel.pipeline().get(SnappyFrameDecoder.class)).isNotNull();
+    assertThat(embeddedChannel.pipeline().get(SnappyFrameEncoder.class)).isNotNull();
+
+    // Message Framing
+    assertThat(embeddedChannel.pipeline().get(LengthFieldBasedFrameDecoder.class)).isNotNull();
+    assertThat(embeddedChannel.pipeline().get(LengthFieldPrepender.class)).isNotNull();
+
+    assertHandlersOrderInPipeline(embeddedChannel.pipeline());
+  }
+
+  private void assertHandlersOrderInPipeline(final ChannelPipeline pipeline) {
+    // Appending '#0' because Netty adds it to the handler's names
+    final ArrayList<String> expectedHandlerNamesInOrder =
+        new ArrayList<>(
+            ImmutableList.of(
+                "SslHandler#0",
+                "SnappyFrameDecoder#0",
+                "SnappyFrameEncoder#0",
+                "LengthFieldBasedFrameDecoder#0",
+                "LengthFieldPrepender#0",
+                "DefaultChannelPipeline$TailContext#0")); // This final handler is Netty's default
+
+    final List<String> actualHandlerNamesInOrder = pipeline.names();
+    assertThat(actualHandlerNamesInOrder).isEqualTo(expectedHandlerNamesInOrder);
+  }
+
+  @Test
+  public void defaultTlsContextFactorySupplierThrowsErrorWithNullTLSConfiguration() {
+    assertThatThrownBy(() -> NettyTLSConnectionInitializer.defaultTlsContextFactorySupplier(null))
+        .isInstanceOf(IllegalStateException.class)
+        .hasMessage("TLSConfiguration cannot be null when using TLS");
+  }
+
+  @Test
+  public void defaultTlsContextFactorySupplierCapturesInternalError() {
+    final TLSConfiguration tlsConfiguration = mock(TLSConfiguration.class);
+    when(tlsConfiguration.getKeyStoreType()).thenThrow(new RuntimeException());
+
+    assertThatThrownBy(
+            () ->
+                NettyTLSConnectionInitializer.defaultTlsContextFactorySupplier(tlsConfiguration)
+                    .get())
+        .isInstanceOf(IllegalStateException.class)
+        .hasMessage("Error creating TLSContextFactory");
+  }
+}
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/TLSContextFactoryTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/TLSContextFactoryTest.java
new file mode 100644
index 00000000000..d89d319b87b
--- /dev/null
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/connections/netty/TLSContextFactoryTest.java
@@ -0,0 +1,499 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.rlpx.connections.netty;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.pki.keystore.KeyStoreWrapper.KEYSTORE_TYPE_PKCS12;
+
+import org.hyperledger.besu.pki.PkiException;
+import org.hyperledger.besu.pki.keystore.HardwareKeyStoreWrapper;
+import org.hyperledger.besu.pki.keystore.KeyStoreWrapper;
+import org.hyperledger.besu.pki.keystore.SoftwareKeyStoreWrapper;
+
+import java.net.InetSocketAddress;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Optional;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.handler.ssl.SslContext;
+import io.netty.handler.ssl.SslHandler;
+import org.junit.Assume;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.condition.OS;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+class TLSContextFactoryTest {
+
+  // see resources/keys/README.md for setup details.
+  private static final String keystorePassword = "test123";
+
+  private static final Logger LOG = LoggerFactory.getLogger(TLSContextFactoryTest.class);
+
+  private static final int MAX_NUMBER_MESSAGES = 10;
+  private static final String CRL_PEM = "/keys/crl/crl.pem";
+  private static final String PARTNER1_CLIENT1_PKCS11 = "/keys/partner1client1/nss.cfg";
+  private static final String PARTNER1_CLIENT1_KEYSTORE = "/keys/partner1client1/client1.p12";
+  private static final String PARTNET1_CLIENT2_KEYSTORE = "/keys/partner1client2rvk/client2.p12";
+  private static final String PARTNER2_CLIENT1_KEYSTORE = "/keys/partner2client1/client1.p12";
+  private static final String PARTNER2_CLIENT2_KEYSTORE = "/keys/partner2client2rvk/client2.p12";
+  private static final String INVALIDPARTNER1_CLIENT1_KEYSTORE =
+      "/keys/invalidpartner1client1/client1.p12";
+
+  private static final String PARTNER1_CLIENT1_TRUSTSTORE = "/keys/partner1client1/truststore.p12";
+  private static final String PARTNET1_CLIENT2_TRUSTSTORE =
+      "/keys/partner1client2rvk/truststore.p12";
+  private static final String PARTNER2_CLIENT1_TRUSTSTORE = "/keys/partner2client1/truststore.p12";
+  private static final String PARTNER2_CLIENT2_TRUSTSTORE =
+      "/keys/partner2client2rvk/truststore.p12";
+  private static final String INVALIDPARTNER1_CLIENT1_TRUSTSTORE =
+      "/keys/invalidpartner1client1/truststore.p12";
+
+  private Server server;
+  private Client client;
+
+  static Collection<Object[]> hardwareKeysData() {
+    return Arrays.asList(
+        new Object[][] {
+          {
+            "PKCS11 server Partner1 Client1 -> PKCS12 client Partner2 Client1 SuccessfulConnection",
+            true,
+            getHardwareKeyStoreWrapper(PARTNER1_CLIENT1_PKCS11, CRL_PEM),
+            getSoftwareKeyStoreWrapper(
+                PARTNER2_CLIENT1_KEYSTORE, PARTNER2_CLIENT1_TRUSTSTORE, CRL_PEM),
+            Optional.empty(),
+            Optional.empty()
+          },
+          {
+            "PKCS11 server Partner1 Client1 -> PKCS12 client InvalidPartner1 Client1 FailedConnection",
+            false,
+            getHardwareKeyStoreWrapper(PARTNER1_CLIENT1_PKCS11, CRL_PEM),
+            getSoftwareKeyStoreWrapper(
+                INVALIDPARTNER1_CLIENT1_KEYSTORE, INVALIDPARTNER1_CLIENT1_TRUSTSTORE, null),
+            Optional.empty(),
+            Optional.of("certificate_unknown")
+          },
+          {
+            "PKCS11 server Partner1 Client1 -> PKCS12 client Partner2 Client2 revoked FailedConnection",
+            false,
+            getHardwareKeyStoreWrapper(PARTNER1_CLIENT1_PKCS11, CRL_PEM),
+            getSoftwareKeyStoreWrapper(
+                PARTNER2_CLIENT2_KEYSTORE, PARTNER2_CLIENT2_TRUSTSTORE, null),
+            Optional.of("Certificate revoked"),
+            Optional.of("certificate_unknown")
+          },
+        });
+  }
+
+  static Collection<Object[]> softwareKeysData() {
+    return Arrays.asList(
+        new Object[][] {
+          {
+            "PKCS12 server Partner1 Client1 -> PKCS12 client Partner2 Client1 SuccessfulConnection",
+            true,
+            getSoftwareKeyStoreWrapper(
+                PARTNER1_CLIENT1_KEYSTORE, PARTNER1_CLIENT1_TRUSTSTORE, CRL_PEM),
+            getSoftwareKeyStoreWrapper(
+                PARTNER2_CLIENT1_KEYSTORE, PARTNER2_CLIENT1_TRUSTSTORE, CRL_PEM),
+            Optional.empty(),
+            Optional.empty()
+          },
+          {
+            "PKCS12 server Partner2 Client1 -> PKCS12 client Partner1 Client1 SuccessfulConnection",
+            true,
+            getSoftwareKeyStoreWrapper(
+                PARTNER2_CLIENT1_KEYSTORE, PARTNER2_CLIENT1_TRUSTSTORE, CRL_PEM),
+            getSoftwareKeyStoreWrapper(
+                PARTNER1_CLIENT1_KEYSTORE, PARTNER1_CLIENT1_TRUSTSTORE, CRL_PEM),
+            Optional.empty(),
+            Optional.empty()
+          },
+          {
+            "PKCS12 server Partner1 Client1 -> PKCS12 client InvalidPartner1 Client1 FailedConnection",
+            false,
+            getSoftwareKeyStoreWrapper(
+                PARTNER1_CLIENT1_KEYSTORE, PARTNER1_CLIENT1_TRUSTSTORE, CRL_PEM),
+            getSoftwareKeyStoreWrapper(
+                INVALIDPARTNER1_CLIENT1_KEYSTORE, INVALIDPARTNER1_CLIENT1_TRUSTSTORE, null),
+            Optional.empty(),
+            Optional.of("certificate_unknown")
+          },
+          {
+            "PKCS12 server InvalidPartner1 Client1 -> PKCS12 client Partner1 Client1 FailedConnection",
+            false,
+            getSoftwareKeyStoreWrapper(
+                INVALIDPARTNER1_CLIENT1_KEYSTORE, INVALIDPARTNER1_CLIENT1_TRUSTSTORE, null),
+            getSoftwareKeyStoreWrapper(
+                PARTNER1_CLIENT1_KEYSTORE, PARTNER1_CLIENT1_TRUSTSTORE, CRL_PEM),
+            Optional.of("certificate_unknown"),
+            Optional.empty()
+          },
+          {
+            "PKCS12 server Partner1 Client2 (revoked) -> PKCS12 client Partner2 Client1 FailedConnection",
+            false,
+            getSoftwareKeyStoreWrapper(
+                PARTNET1_CLIENT2_KEYSTORE, PARTNET1_CLIENT2_TRUSTSTORE, null),
+            getSoftwareKeyStoreWrapper(
+                PARTNER2_CLIENT1_KEYSTORE, PARTNER2_CLIENT1_TRUSTSTORE, CRL_PEM),
+            Optional.empty(),
+            Optional.of("Certificate revoked")
+          },
+          {
+            "PKCS12 server Partner2 Client1 -> PKCS12 client Partner1 Client2 (revoked) FailedConnection",
+            false,
+            getSoftwareKeyStoreWrapper(
+                PARTNER2_CLIENT1_KEYSTORE, PARTNER2_CLIENT1_TRUSTSTORE, CRL_PEM),
+            getSoftwareKeyStoreWrapper(
+                PARTNET1_CLIENT2_KEYSTORE, PARTNET1_CLIENT2_TRUSTSTORE, null),
+            Optional.of("Certificate revoked"),
+            Optional.of("certificate_unknown")
+          },
+          {
+            "PKCS12 server Partner2 Client2 (revoked) -> PKCS12 client Partner1 Client1 FailedConnection",
+            false,
+            getSoftwareKeyStoreWrapper(
+                PARTNER2_CLIENT2_KEYSTORE, PARTNER2_CLIENT2_TRUSTSTORE, null),
+            getSoftwareKeyStoreWrapper(
+                PARTNER1_CLIENT1_KEYSTORE, PARTNER1_CLIENT1_TRUSTSTORE, CRL_PEM),
+            Optional.empty(),
+            Optional.of("Certificate revoked"),
+          },
+          {
+            "PKCS12 server Partner1 Client1 -> PKCS12 client Partner2 Client2 (revoked) FailedConnection",
+            false,
+            getSoftwareKeyStoreWrapper(
+                PARTNER1_CLIENT1_KEYSTORE, PARTNER1_CLIENT1_TRUSTSTORE, CRL_PEM),
+            getSoftwareKeyStoreWrapper(
+                PARTNER2_CLIENT2_KEYSTORE, PARTNER2_CLIENT2_TRUSTSTORE, null),
+            Optional.of("Certificate revoked"),
+            Optional.of("certificate_unknown")
+          }
+        });
+  }
+
+  @BeforeEach
+  void init() {}
+
+  @AfterEach
+  void tearDown() {
+    if (client != null) {
+      client.stop();
+    }
+    if (server != null) {
+      server.stop();
+    }
+  }
+
+  private static Path toPath(final String path) throws Exception {
+    return null == path ? null : Path.of(TLSContextFactoryTest.class.getResource(path).toURI());
+  }
+
+  private static KeyStoreWrapper getHardwareKeyStoreWrapper(
+      final String config, final String crlLocation) {
+    try {
+      return new HardwareKeyStoreWrapper(keystorePassword, toPath(config), toPath(crlLocation));
+    } catch (final Exception e) {
+      if (OS.MAC.isCurrentOs()) {
+        // nss3 is difficult to setup on mac correctly, don't let it break unit tests for dev
+        // machines.
+        Assume.assumeNoException("Failed to initialize hardware keystore", e);
+      }
+      // Not a mac, probably a production build. Full failure.
+      throw new PkiException("Failed to initialize hardware keystore", e);
+    }
+  }
+
+  private static KeyStoreWrapper getSoftwareKeyStoreWrapper(
+      final String jksKeyStore, final String trustStore, final String crl) {
+    try {
+      return new SoftwareKeyStoreWrapper(
+          KEYSTORE_TYPE_PKCS12,
+          toPath(jksKeyStore),
+          keystorePassword,
+          KEYSTORE_TYPE_PKCS12,
+          toPath(trustStore),
+          keystorePassword,
+          toPath(crl));
+    } catch (final Exception e) {
+      throw new PkiException("Failed to initialize software keystore", e);
+    }
+  }
+
+  @ParameterizedTest(name = "{index}: {0}")
+  @MethodSource("softwareKeysData")
+  void testConnectionSoftwareKeys(
+      final String ignoredTestDescription,
+      final boolean testSuccess,
+      final KeyStoreWrapper serverKeyStoreWrapper,
+      final KeyStoreWrapper clientKeyStoreWrapper,
+      final Optional<String> serverFailureMessage,
+      final Optional<String> clientFailureMessage)
+      throws Exception {
+    testConnection(
+        testSuccess,
+        serverKeyStoreWrapper,
+        clientKeyStoreWrapper,
+        serverFailureMessage,
+        clientFailureMessage);
+  }
+
+  @ParameterizedTest(name = "{index}: {0}")
+  @MethodSource("hardwareKeysData")
+  void testConnectionHardwareKeys(
+      final String ignoredTestDescription,
+      final boolean testSuccess,
+      final KeyStoreWrapper serverKeyStoreWrapper,
+      final KeyStoreWrapper clientKeyStoreWrapper,
+      final Optional<String> serverFailureMessage,
+      final Optional<String> clientFailureMessage)
+      throws Exception {
+    testConnection(
+        testSuccess,
+        serverKeyStoreWrapper,
+        clientKeyStoreWrapper,
+        serverFailureMessage,
+        clientFailureMessage);
+  }
+
+  private void testConnection(
+      final boolean testSuccess,
+      final KeyStoreWrapper serverKeyStoreWrapper,
+      final KeyStoreWrapper clientKeyStoreWrapper,
+      final Optional<String> serverFailureMessage,
+      final Optional<String> clientFailureMessage)
+      throws Exception {
+    final CountDownLatch serverLatch = new CountDownLatch(MAX_NUMBER_MESSAGES);
+    final CountDownLatch clientLatch = new CountDownLatch(MAX_NUMBER_MESSAGES);
+    server = startServer(serverKeyStoreWrapper, serverLatch);
+    client = startClient(server.port, clientKeyStoreWrapper, clientLatch);
+
+    if (testSuccess) {
+      client.getChannelFuture().channel().writeAndFlush(Unpooled.copyInt(0));
+      final boolean allMessagesServerExchanged = serverLatch.await(10, TimeUnit.SECONDS);
+      final boolean allMessagesClientExchanged = clientLatch.await(10, TimeUnit.SECONDS);
+      assertThat(allMessagesClientExchanged && allMessagesServerExchanged).isTrue();
+    } else {
+      try {
+        client.getChannelFuture().channel().writeAndFlush(Unpooled.copyInt(0)).sync();
+        serverLatch.await(2, TimeUnit.SECONDS);
+        assertThat(client.getChannelFuture().channel().isActive()).isFalse();
+
+        if (serverFailureMessage.isPresent()) {
+          assertThat(server.getCause()).isNotEmpty();
+          assertThat(server.getCause().get()).hasMessageContaining(serverFailureMessage.get());
+        } else {
+          assertThat(server.getCause()).isEmpty();
+        }
+
+        if (clientFailureMessage.isPresent()) {
+          assertThat(client.getCause()).isNotEmpty();
+          assertThat(client.getCause().get()).hasMessageContaining(clientFailureMessage.get());
+        } else {
+          assertThat(client.getCause()).isEmpty();
+        }
+      } catch (final Exception e) {
+        // NOOP
+      }
+    }
+  }
+
+  private Server startServer(final KeyStoreWrapper keyStoreWrapper, final CountDownLatch latch)
+      throws Exception {
+
+    final Server nettyServer = new Server(keystorePassword, keyStoreWrapper, latch);
+    nettyServer.start();
+    return nettyServer;
+  }
+
+  private Client startClient(
+      final int port, final KeyStoreWrapper keyStoreWrapper, final CountDownLatch latch)
+      throws Exception {
+
+    final Client nettyClient = new Client(port, keystorePassword, keyStoreWrapper, latch);
+    nettyClient.start();
+    return nettyClient;
+  }
+
+  static class MessageHandler extends ChannelInboundHandlerAdapter {
+    private final String id;
+    private final CountDownLatch latch;
+
+    private Throwable cause;
+
+    MessageHandler(final String id, final CountDownLatch latch) {
+      this.id = id;
+      this.latch = latch;
+    }
+
+    @Override
+    public void channelRead(final ChannelHandlerContext ctx, final Object msg)
+        throws InterruptedException {
+      final int message = ((ByteBuf) msg).readInt();
+      LOG.info("[" + id + "] Received message: " + message);
+
+      if (message < 2 * MAX_NUMBER_MESSAGES) {
+        final int replyMessage = message + 1;
+        ctx.writeAndFlush(Unpooled.copyInt(replyMessage)).sync();
+        LOG.info("[" + id + "] Sent message: " + replyMessage);
+        this.latch.countDown();
+        LOG.info("Remaining {}", this.latch.getCount());
+      }
+    }
+
+    @Override
+    public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable cause)
+        throws Exception {
+      this.cause = cause;
+    }
+
+    public Optional<Throwable> getCause() {
+      return Optional.ofNullable(cause);
+    }
+  }
+
+  static class Client {
+    int port;
+    private final String keystorePassword;
+    private final KeyStoreWrapper keyStoreWrapper;
+    private final CountDownLatch latch;
+
+    private ChannelFuture channelFuture;
+    private final EventLoopGroup group = new NioEventLoopGroup();
+    private MessageHandler messageHandler;
+
+    ChannelFuture getChannelFuture() {
+      return channelFuture;
+    }
+
+    Client(
+        final int port,
+        final String keystorePassword,
+        final KeyStoreWrapper keyStoreWrapper,
+        final CountDownLatch latch) {
+      this.port = port;
+      this.keystorePassword = keystorePassword;
+      this.keyStoreWrapper = keyStoreWrapper;
+      this.latch = latch;
+    }
+
+    void start() throws Exception {
+      final Bootstrap b = new Bootstrap();
+      b.group(group);
+      b.channel(NioSocketChannel.class);
+      b.handler(
+          new ChannelInitializer<SocketChannel>() {
+            @Override
+            protected void initChannel(final SocketChannel socketChannel) throws Exception {
+              final SslContext sslContext =
+                  TLSContextFactory.getInstance(keystorePassword, keyStoreWrapper)
+                      .createNettyClientSslContext();
+
+              final SslHandler sslHandler = sslContext.newHandler(socketChannel.alloc());
+              socketChannel.pipeline().addFirst("ssl", sslHandler);
+              messageHandler = new MessageHandler("Client", latch);
+              socketChannel.pipeline().addLast(messageHandler);
+            }
+          });
+
+      this.channelFuture = b.connect("127.0.0.1", this.port).sync();
+    }
+
+    void stop() {
+      group.shutdownGracefully();
+      messageHandler = null;
+    }
+
+    Optional<Throwable> getCause() {
+      return messageHandler != null ? messageHandler.getCause() : Optional.empty();
+    }
+  }
+
+  static class Server {
+    private int port;
+    private final String keystorePassword;
+    private final KeyStoreWrapper keyStoreWrapper;
+    private final CountDownLatch latch;
+
+    private Channel channel;
+
+    private final EventLoopGroup parentGroup = new NioEventLoopGroup();
+    private final EventLoopGroup childGroup = new NioEventLoopGroup();
+
+    private MessageHandler messageHandler;
+
+    Server(
+        final String keystorePassword,
+        final KeyStoreWrapper keyStoreWrapper,
+        final CountDownLatch latch) {
+      this.keystorePassword = keystorePassword;
+      this.keyStoreWrapper = keyStoreWrapper;
+      this.latch = latch;
+    }
+
+    void start() throws Exception {
+      final ServerBootstrap sb = new ServerBootstrap();
+      sb.group(parentGroup, childGroup)
+          .channel(NioServerSocketChannel.class)
+          .childHandler(
+              new ChannelInitializer<SocketChannel>() {
+                @Override
+                public void initChannel(final SocketChannel socketChannel) throws Exception {
+                  final SslContext sslContext =
+                      TLSContextFactory.getInstance(keystorePassword, keyStoreWrapper)
+                          .createNettyServerSslContext();
+                  final SslHandler sslHandler = sslContext.newHandler(channel.alloc());
+                  socketChannel.pipeline().addFirst("ssl", sslHandler);
+
+                  socketChannel
+                      .pipeline()
+                      .addLast(messageHandler = new MessageHandler("Server", latch));
+                }
+              });
+
+      final ChannelFuture cf = sb.bind(0).sync();
+      this.channel = cf.channel();
+      this.port = ((InetSocketAddress) channel.localAddress()).getPort();
+    }
+
+    void stop() {
+      childGroup.shutdownGracefully();
+      parentGroup.shutdownGracefully();
+    }
+
+    Optional<Throwable> getCause() {
+      return messageHandler != null ? messageHandler.getCause() : Optional.empty();
+    }
+  }
+}
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/FramerTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/FramerTest.java
index a6627d82953..16ead4fcce0 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/FramerTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/framing/FramerTest.java
@@ -218,7 +218,7 @@ public void frameMessage() throws IOException {
   }
 
   @Test
-  public void shouldThrowFramingExceptionWhenMessageIsNotCompressedButShouldBe() {
+  public void downgradesToUncompressed() {
     final HandshakeSecrets secrets =
         new HandshakeSecrets(
             Bytes.fromHexString(
@@ -239,7 +239,36 @@ public void shouldThrowFramingExceptionWhenMessageIsNotCompressedButShouldBe() {
 
     // Then read it with compression enabled.
     receivingFramer.enableCompression();
-    assertThatThrownBy(() -> receivingFramer.deframe(out)).isInstanceOf(FramingException.class);
+    assertThat(receivingFramer.deframe(out)).isNotNull();
+    assertThat(receivingFramer.isCompressionEnabled()).isFalse();
+  }
+
+  @Test
+  public void compressionWorks() {
+    final HandshakeSecrets secrets =
+        new HandshakeSecrets(
+            Bytes.fromHexString(
+                    "0x75b3ee95adff0c529a05efd7612aa1dbe5057eb9facdde0dfc837ad143da1d43")
+                .toArray(),
+            Bytes.fromHexString(
+                    "0x030dfd1566f4800c4842c177f7d476b64ae2b99a2aa0ab5600aa2f41a8710575")
+                .toArray(),
+            Bytes.fromHexString(
+                    "0xc9d3385b1588a5969cba312f8c29bedb4cb9d56ec0cf825436addc1ec644f1d6")
+                .toArray());
+    final Framer receivingFramer = new Framer(secrets);
+    final Framer sendingFramer = new Framer(secrets);
+
+    // Write a disconnect message with compression enabled.
+    sendingFramer.enableCompression();
+    final ByteBuf out = Unpooled.buffer();
+    sendingFramer.frame(DisconnectMessage.create(DisconnectReason.TIMEOUT), out);
+
+    // Then read it with compression enabled.
+    receivingFramer.enableCompression();
+    assertThat(receivingFramer.deframe(out)).isNotNull();
+    assertThat(receivingFramer.isCompressionEnabled()).isTrue();
+    assertThat(receivingFramer.isCompressionSuccessful()).isTrue();
   }
 
   private HandshakeSecrets secretsFrom(final JsonNode td, final boolean swap) {
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshakeTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshakeTest.java
index 8e15966f7d4..d9edbac9f59 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshakeTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/ECIESHandshakeTest.java
@@ -16,13 +16,16 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.crypto.SECP256K1.PrivateKey;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
 import org.hyperledger.besu.ethereum.p2p.rlpx.handshake.Handshaker.HandshakeStatus;
 
 import java.util.Optional;
 
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import junit.framework.AssertionFailedError;
@@ -36,23 +39,42 @@ public class ECIESHandshakeTest {
   // Input data.
   private static class Input {
 
+    static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
+        Suppliers.memoize(SignatureAlgorithmFactory::getInstance);
+
     // Keys.
     private static final KeyPair initiatorKeyPair =
-        KeyPair.create(
-            PrivateKey.create(
-                h32("0x5e173f6ac3c669587538e7727cf19b782a4f2fda07c1eaa662c593e5e85e3051")));
+        SIGNATURE_ALGORITHM
+            .get()
+            .createKeyPair(
+                SIGNATURE_ALGORITHM
+                    .get()
+                    .createPrivateKey(
+                        h32("0x5e173f6ac3c669587538e7727cf19b782a4f2fda07c1eaa662c593e5e85e3051")));
     private static final KeyPair initiatorEphKeyPair =
-        KeyPair.create(
-            PrivateKey.create(
-                h32("0x19c2185f4f40634926ebed3af09070ca9e029f2edd5fae6253074896205f5f6c")));
+        SIGNATURE_ALGORITHM
+            .get()
+            .createKeyPair(
+                SIGNATURE_ALGORITHM
+                    .get()
+                    .createPrivateKey(
+                        h32("0x19c2185f4f40634926ebed3af09070ca9e029f2edd5fae6253074896205f5f6c")));
     private static final KeyPair responderKeyPair =
-        KeyPair.create(
-            PrivateKey.create(
-                h32("0xc45f950382d542169ea207959ee0220ec1491755abe405cd7498d6b16adb6df8")));
+        SIGNATURE_ALGORITHM
+            .get()
+            .createKeyPair(
+                SIGNATURE_ALGORITHM
+                    .get()
+                    .createPrivateKey(
+                        h32("0xc45f950382d542169ea207959ee0220ec1491755abe405cd7498d6b16adb6df8")));
     private static final KeyPair responderEphKeyPair =
-        KeyPair.create(
-            PrivateKey.create(
-                h32("0xd25688cf0ab10afa1a0e2dba7853ed5f1e5bf1c631757ed4e103b593ff3f5620")));
+        SIGNATURE_ALGORITHM
+            .get()
+            .createKeyPair(
+                SIGNATURE_ALGORITHM
+                    .get()
+                    .createPrivateKey(
+                        h32("0xd25688cf0ab10afa1a0e2dba7853ed5f1e5bf1c631757ed4e103b593ff3f5620")));
 
     // Nonces.
     private static final Bytes32 initiatorNonce =
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessageTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessageTest.java
index 1c32b651e1e..7be227ab2cd 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessageTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/EncryptedMessageTest.java
@@ -14,8 +14,9 @@
  */
 package org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies;
 
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
 
 import java.util.concurrent.ThreadLocalRandom;
 
@@ -29,7 +30,7 @@ public final class EncryptedMessageTest {
 
   @Test
   public void eip8RoundTrip() throws InvalidCipherTextException {
-    final SECP256K1.KeyPair keyPair = SECP256K1.KeyPair.generate();
+    final KeyPair keyPair = SignatureAlgorithmFactory.getInstance().generateKeyPair();
     final byte[] message = new byte[288];
     ThreadLocalRandom.current().nextBytes(message);
     final Bytes initial = Bytes.wrap(message);
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4Test.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4Test.java
index f099e60df23..f795fe8aff2 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4Test.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/handshake/ecies/InitiatorHandshakeMessageV4Test.java
@@ -14,9 +14,9 @@
  */
 package org.hyperledger.besu.ethereum.p2p.rlpx.handshake.ecies;
 
+import org.hyperledger.besu.crypto.KeyPair;
 import org.hyperledger.besu.crypto.KeyPairUtil;
-import org.hyperledger.besu.crypto.NodeKeyUtils;
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,7 +33,7 @@ public final class InitiatorHandshakeMessageV4Test {
 
   private static final Bytes EXAMPLE_MESSAGE;
 
-  private static final SECP256K1.KeyPair EXAMPLE_KEYPAIR;
+  private static final KeyPair EXAMPLE_KEYPAIR;
 
   static {
     try {
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/CapabilityMultiplexerTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/CapabilityMultiplexerTest.java
index 9eebb1bb690..a4f29156f1e 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/CapabilityMultiplexerTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/CapabilityMultiplexerTest.java
@@ -42,9 +42,9 @@ public void multiplexer() {
     // Define protocols with message spaces
     final List<SubProtocol> subProtocols =
         Arrays.asList(
-            subProtocol(eth61.getName(), 8),
-            subProtocol(shh1.getName(), 11),
-            subProtocol(bzz1.getName(), 25));
+            MockSubProtocol.create(eth61.getName(), 8),
+            MockSubProtocol.create(shh1.getName(), 11),
+            MockSubProtocol.create(bzz1.getName(), 25));
 
     // Calculate capabilities
     final List<Capability> capSetA = Arrays.asList(eth61, eth62, bzz1, shh2);
@@ -86,28 +86,4 @@ public void multiplexer() {
     assertThat(demultiplexed.getCapability()).isEqualTo(eth62);
     assertThat(demultiplexedData).isEqualTo(ethData);
   }
-
-  private SubProtocol subProtocol(final String name, final int messageSpace) {
-    return new SubProtocol() {
-      @Override
-      public String getName() {
-        return name;
-      }
-
-      @Override
-      public int messageSpace(final int protocolVersion) {
-        return messageSpace;
-      }
-
-      @Override
-      public boolean isValidMessageCode(final int protocolVersion, final int code) {
-        return true;
-      }
-
-      @Override
-      public String messageName(final int protocolVersion, final int code) {
-        return INVALID_MESSAGE_NAME;
-      }
-    };
-  }
 }
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/MockSubProtocol.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/MockSubProtocol.java
index 6e86e193501..b28cdb60590 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/MockSubProtocol.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/MockSubProtocol.java
@@ -16,10 +16,16 @@
 
 public class MockSubProtocol {
   public static SubProtocol create() {
-    return create("eth");
+    return create("eth", 8);
   }
 
   public static SubProtocol create(final String name) {
+    final int messageSpace = 8;
+    return create(name, messageSpace);
+  }
+
+  public static SubProtocol create(final String name, final int messageSpace) {
+
     return new SubProtocol() {
       @Override
       public String getName() {
@@ -28,7 +34,7 @@ public String getName() {
 
       @Override
       public int messageSpace(final int protocolVersion) {
-        return 8;
+        return messageSpace;
       }
 
       @Override
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/PeerInfoTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/PeerInfoTest.java
new file mode 100644
index 00000000000..3217f23fcbb
--- /dev/null
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/PeerInfoTest.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.p2p.rlpx.wire;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Test;
+
+class PeerInfoTest {
+
+  @Test
+  public void toStringIsSanitized() {
+    final PeerInfo maliciousPeer =
+        new PeerInfo(
+            1,
+            "ab\nc",
+            List.of(Capability.create("c\ba\rp", 4)),
+            30303,
+            Bytes.fromHexStringLenient("0x1234"));
+
+    final String toString = maliciousPeer.toString();
+
+    assertThat(toString).doesNotContain(List.of("\n", "\b", "\r"));
+  }
+}
diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/WireMessagesSedesTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/WireMessagesSedesTest.java
index e3e3ffcd82f..0fb8e353064 100644
--- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/WireMessagesSedesTest.java
+++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/rlpx/wire/WireMessagesSedesTest.java
@@ -44,6 +44,13 @@ public void deserializeHello() {
                 + "3b1e5d41");
 
     assertSedesWorks(rlp);
+
+    rlp =
+        decodeHexDump(
+            "f8a305b74e65746865726d696e642f76312e31332e342d302d3365353937326332342d32303232303831312f5836342d4c696e75782f362e302e36e4c5836574683ec5836574683fc58365746840c58365746841c58365746842c5837769748082765db84005c95b2618ba1ca53f0f019d1750d12769267705e46b4dbfb77f73998b21d30973161542a2090bcaa5876e6aed99436009f3f646029bb723b8dff75feec27374");
+    // This test contains a hello message from Nethermind. The Capability version of the wit
+    // capability is encoded as 0x80, which is an empty string
+    assertSedesWorks(rlp);
   }
 
   private static void assertSedesWorks(final byte[] data) {
diff --git a/ethereum/p2p/src/test/resources/keys/README.md b/ethereum/p2p/src/test/resources/keys/README.md
new file mode 100644
index 00000000000..36e86553a5f
--- /dev/null
+++ b/ethereum/p2p/src/test/resources/keys/README.md
@@ -0,0 +1,249 @@
+Following instructions were used to set up various certificates and keystores.
+
+The certificates hierarchy 
+~~~
+                 root.ca.besu.com
+                        | 
+                 inter.ca.besu.com
+                        |      
+partner1.ca.besu.com             partner2.ca.besu.com
+       |                               |
+client1.partner1.besu.com        client1.partner2.besu.com
+client2.partner1.besu.com        client2.partner2.besu.com 
+~~~
+
+Partner1 clients
+Client1 - EC key, backed by PKCS11/nssdb as well.
+Client2 - in certificate revoked list (CRL)
+
+Partner2 clients
+Client1 
+Client2 - in certificate revoked list (CRL)
+
+InvalidPartner1 clients
+Client1 - not trusted by Partner1 and Partner2 due to different CA hierarchy 
+
+
+
+## Lib NSS Setup Instructions:
+Linux: `sudo apt install libnss3-tools`
+Mac OS: 
+1. `brew install nss`
+2. Create symlink for libnss3 and lonsoftokn3 in your JDK's lib (or update LD_LIBRARY_PATH globally)
+~~~
+ln -s /opt/homebrew/lib/libnss3.dylib <jdk_path>/lib/libnss3.dylib
+ln -s /opt/homebrew/lib/libsoftokn3.dylib <jdk_path>/lib/libsoftokn3.dylib
+~~~
+
+## Root CA, InterCA, partner1 CA, partner2 CA
+All the CA keystores will be generated in `ca_certs` directory. 
+
+Generate Root CA (validity 100 years)
+~~~
+cd ca_certs
+
+export ROOT_CA_KS=root_ca.p12
+export INTER_CA_KS=inter_ca.p12
+export PARTNER1_CA_KS=partner1_ca.p12
+export PARTNER2_CA_KS=partner2_ca.p12
+~~~
+~~~
+keytool -genkeypair -alias root_ca -dname "CN=root.ca.besu.com" -ext bc:c -keyalg RSA \
+-sigalg SHA256WithRSA -validity 36500 \
+-storepass test123 \
+-keystore $ROOT_CA_KS
+
+keytool -genkeypair -alias inter_ca -dname "CN=inter.ca.besu.com" \
+-ext bc:c=ca:true,pathlen:1 -ext ku:c=dS,kCS,cRLs \
+-keyalg RSA -sigalg SHA256WithRSA -validity 36500 \
+-storepass test123 \
+-keystore $INTER_CA_KS
+
+keytool -genkeypair -alias partner1_ca -dname "CN=partner1.ca.besu.com" \
+-ext bc:c=ca:true,pathlen:0 -ext ku:c=dS,kCS,cRLs \
+-keyalg RSA -sigalg SHA256WithRSA -validity 36500 \
+-storepass test123 \
+-keystore $PARTNER1_CA_KS
+
+keytool -genkeypair -alias partner2_ca -dname "CN=partner2.ca.besu.com" \
+-ext bc:c=ca:true,pathlen:0 -ext ku:c=dS,kCS,cRLs \
+-keyalg RSA -sigalg SHA256WithRSA -validity 36500 \
+-storepass test123 \
+-keystore $PARTNER2_CA_KS
+~~~
+
+CSR, Signing and re-import
+~~~
+keytool -storepass test123 -keystore $ROOT_CA_KS -alias root_ca -exportcert -rfc > root_ca.pem
+
+keytool -storepass test123 -keystore $INTER_CA_KS -certreq -alias inter_ca \
+| keytool -storepass test123 -keystore $ROOT_CA_KS -gencert -validity 36500 -alias root_ca \
+-ext bc:c=ca:true,pathlen:1 -ext ku:c=dS,kCS,cRLs -rfc > inter_ca.pem
+
+cat root_ca.pem >> inter_ca.pem
+
+keytool -keystore $INTER_CA_KS -importcert -alias inter_ca \
+-storepass test123 -noprompt -file ./inter_ca.pem
+
+keytool -storepass test123 -keystore $PARTNER1_CA_KS -certreq -alias partner1_ca \
+| keytool -storepass test123 -keystore $INTER_CA_KS -gencert -validity 36500 -alias inter_ca \
+-ext bc:c=ca:true,pathlen:0 -ext ku:c=dS,kCS,cRLs -rfc > partner1_ca.pem
+
+keytool -storepass test123 -keystore $PARTNER2_CA_KS -certreq -alias partner2_ca \
+| keytool -storepass test123 -keystore $INTER_CA_KS -gencert -validity 36500 -alias inter_ca \
+-ext bc:c=ca:true,pathlen:0 -ext ku:c=dS,kCS,cRLs -rfc > partner2_ca.pem
+
+cat root_ca.pem >> partner1_ca.pem
+cat root_ca.pem >> partner2_ca.pem
+
+keytool -keystore $PARTNER1_CA_KS -importcert -alias partner1_ca \
+-storepass test123 -noprompt -file ./partner1_ca.pem
+
+keytool -keystore $PARTNER2_CA_KS -importcert -alias partner2_ca \
+-storepass test123 -noprompt -file ./partner2_ca.pem
+
+cd ..
+~~~
+
+---
+
+## Client certificates
+Following folder names are used
+- 
+- `partner1client1`
+- `partner1client2rvk`
+- `partner2client1`
+- `partner2client2rvk`
+
+Modify the partner and client variables while running following commands accordingly.
+
+## Truststore
+Create truststore for each partner and copy in appropriate client directories
+~~~
+cd partner2client1
+
+export OU=partner2
+
+keytool -import -trustcacerts -alias root_ca \
+-file ../ca_certs/root_ca.pem -keystore truststore.p12 \
+-storepass test123 -noprompt
+
+keytool -import -trustcacerts -alias inter_ca \
+-file ../ca_certs/inter_ca.pem -keystore truststore.p12 \
+-storepass test123 -noprompt
+
+keytool -import -trustcacerts -alias ${OU}_ca \
+-file ../ca_certs/${OU}_ca.pem -keystore truststore.p12 \
+-storepass test123 -noprompt
+
+~~~
+
+Cd to appropriate client directory and generate the certificates.
+Note: The keyalg for partner1client1 (EC) is different than others
+
+Modify the export command.
+~~~
+cd partner1client1
+
+export OU=partner1
+export CLIENT=client1
+~~~
+
+EC Key generation (for partner1 client 1)
+~~~
+keytool -genkeypair -keystore $CLIENT.p12 -storepass test123 -alias $CLIENT \
+-keyalg EC -groupname secp256r1 -validity 36500 \
+-dname "CN=$CLIENT.$OU.besu.com, OU=$OU, O=Besu, L=Brisbane, ST=QLD, C=AU" \
+-ext san=dns:localhost,ip:127.0.0.1
+~~~
+RSA key generation
+~~~
+keytool -genkeypair -keystore $CLIENT.p12 -storepass test123 -alias $CLIENT \
+-keyalg RSA -validity 36500 \
+-dname "CN=$CLIENT.$OU.besu.com, OU=$OU, O=Besu, L=Brisbane, ST=QLD, C=AU" \
+-ext san=dns:localhost,ip:127.0.0.1
+~~~
+
+CSR and reimport
+~~~
+keytool -storepass test123 -keystore "$CLIENT.p12" -certreq -alias $CLIENT \
+| keytool -storepass test123 -keystore "../ca_certs/${OU}_ca.p12" -gencert -validity 36500 -alias ${OU}_ca \
+-ext ku:c=digitalSignature,nonRepudiation,keyEncipherment -ext eku=sA,cA -rfc > "$CLIENT.pem"
+
+cat ../ca_certs/root_ca.pem >> $CLIENT.pem
+
+keytool -keystore $CLIENT.p12 -importcert -alias $CLIENT \
+-storepass test123 -noprompt -file ./$CLIENT.pem
+~~~
+
+Verify
+~~~
+keytool -keystore $CLIENT.p12 -storepass test123 -list -v
+~~~
+
+
+## NSS database setup
+The nss database will be setup in `partner1client1` directory.
+
+Initialize empty nss database. Modify client and OU export.
+~~~
+export CLIENT=client1
+export OU=partner1
+
+mkdir nssdb
+echo "test123" > nsspin.txt
+certutil -N -d sql:nssdb -f nsspin.txt
+touch ./nssdb/secmod.db
+~~~
+
+Import client1 keystore into nss
+~~~
+pk12util -i ./$CLIENT.p12 -d sql:nssdb -k nsspin.txt -W test123
+certutil -M -n "CN=root.ca.besu.com" -t CT,C,C -d sql:nssdb -f ./nsspin.txt
+certutil -M -n "CN=inter.ca.besu.com" -t CT,C,C -d sql:nssdb -f ./nsspin.txt
+certutil -M -n "CN=${OU}.ca.besu.com" -t CT,C,C -d sql:nssdb -f ./nsspin.txt
+
+certutil -d sql:nssdb -f nsspin.txt -L
+~~~
+
+PKCS11 Configuration file
+~~~
+cat <<EOF >./nss.cfg
+name = NSScrypto-${OU}-${CLIENT}
+nssSecmodDirectory = ./src/test/resources/keys/partner1client1/nssdb
+nssDbMode = readOnly
+nssModule = keystore
+showInfo = true
+EOF
+~~~
+
+## CRL certificate
+As mentioned at the start of README, `partner1client2` and `partner2client2` certificates are in revoke list.
+The crl list is maintained under `crl` folder.
+
+Partner1 and Partner2 private keys are required to exported in pem format.
+
+Following operations are performed under `crl` folder. 
+_Note: On Mac OS, using `gnutls-certtool`. On Linux, `certtool` can be used._
+
+~~~
+openssl pkcs12 -nodes -in ../ca_certs/partner1_ca.p12 -out partner1_ca_key.pem -passin pass:test123 -nocerts
+openssl pkcs12 -nodes -in ../ca_certs/partner1_ca.p12 -out partner1_ca.pem -passin pass:test123 -nokeys
+
+openssl pkcs12 -nodes -in ../ca_certs/partner2_ca.p12 -out partner2_ca_key.pem -passin pass:test123 -nocerts
+openssl pkcs12 -nodes -in ../ca_certs/partner2_ca.p12 -out partner2_ca.pem -passin pass:test123 -nokeys
+
+openssl pkcs12 -nokeys -clcerts -in ../partner1client2rvk/client2.p12 -out partner1client2.pem -passin pass:test123
+openssl pkcs12 -nokeys -clcerts -in ../partner2client2rvk/client2.p12 -out partner2client2.pem -passin pass:test123
+
+gnutls-certtool --generate-crl --load-ca-privkey ./partner1_ca_key.pem --load-ca-certificate ./partner1_ca.pem \
+--load-certificate ./partner1client2.pem >> crl.pem
+gnutls-certtool --generate-crl --load-ca-privkey ./partner2_ca_key.pem --load-ca-certificate ./partner2_ca.pem \
+--load-certificate ./partner2client2.pem >> crl.pem
+
+keytool -printcrl -file ./crl.pem
+
+rm *_ca_key.pem
+rm *_ca.pem
+rm *client2.pem
+~~~
diff --git a/ethereum/p2p/src/test/resources/keys/ca_certs/inter_ca.p12 b/ethereum/p2p/src/test/resources/keys/ca_certs/inter_ca.p12
new file mode 100644
index 00000000000..328345ffac7
Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/ca_certs/inter_ca.p12 differ
diff --git a/ethereum/p2p/src/test/resources/keys/ca_certs/partner1_ca.p12 b/ethereum/p2p/src/test/resources/keys/ca_certs/partner1_ca.p12
new file mode 100644
index 00000000000..5f1c8190723
Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/ca_certs/partner1_ca.p12 differ
diff --git a/ethereum/p2p/src/test/resources/keys/ca_certs/partner2_ca.p12 b/ethereum/p2p/src/test/resources/keys/ca_certs/partner2_ca.p12
new file mode 100644
index 00000000000..175693769c1
Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/ca_certs/partner2_ca.p12 differ
diff --git a/ethereum/p2p/src/test/resources/keys/ca_certs/root_ca.p12 b/ethereum/p2p/src/test/resources/keys/ca_certs/root_ca.p12
new file mode 100644
index 00000000000..b31a1a38867
Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/ca_certs/root_ca.p12 differ
diff --git a/ethereum/p2p/src/test/resources/keys/crl/crl.pem b/ethereum/p2p/src/test/resources/keys/crl/crl.pem
new file mode 100644
index 00000000000..2f60ae0a3d6
--- /dev/null
+++ b/ethereum/p2p/src/test/resources/keys/crl/crl.pem
@@ -0,0 +1,24 @@
+-----BEGIN X509 CRL-----
+MIIByzCBtAIBATANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDExRwYXJ0bmVyMS5j
+YS5iZXN1LmNvbRcNMjMwNTA0MDAyMDM5WhgPMjEyMzA0MTAwMDIwNTZaMBwwGgIJ
+APbTXO0zb7GDFw0yMzA1MDQwMDIwMzlaoEEwPzAfBgNVHSMEGDAWgBSCofgh9oBV
+KID1yPbGjPcLeWXBPTAcBgNVHRQEFQITZFL6aBXe4ICyYE9gj7VI3UG6vzANBgkq
+hkiG9w0BAQsFAAOCAQEAYWoZ8V3csO+RrnwqRdtWBhYHxYxbq3W/3zT/Plrq+6ga
+47jRihxc1ZbvXPsfNpFND2eSCCBp9Jx6C8ExOhXmJhESfMwwty67APx4iLSJVC9q
+QN/BZwvak9XFJrwWqCUvEZO7of5wtgcS78SlVMPxCWkgIbvI/jhfXU2sTPRGRMuo
+Vg8WTr5eZK00h51CAYG1cf6ePRCm9FNPOae8XZ/4O9EEB9A+L+ROhn8XVF8jMJCp
+teRkieEPdcom/Sx+xpZJ3VrnQyjl6g5zSJhyHcgk1P1JpYwiZsjeTUjnBZlesv/I
+d4oNajmtcvpON2guMvAurte76UxKNQzA/WqFBcx64g==
+-----END X509 CRL-----
+-----BEGIN X509 CRL-----
+MIIByzCBtAIBATANBgkqhkiG9w0BAQsFADAfMR0wGwYDVQQDExRwYXJ0bmVyMi5j
+YS5iZXN1LmNvbRcNMjMwNTA0MDAyMTQwWhgPMjEyMzA0MTAwMDIxNDdaMBwwGgIJ
+AIV9jGkel7fHFw0yMzA1MDQwMDIxNDBaoEEwPzAfBgNVHSMEGDAWgBSKvDdJ/ptO
+koPxFZ9+fMA+O18GXzAcBgNVHRQEFQITZFL6my0yNKi8/pYIAwy5QU+swjANBgkq
+hkiG9w0BAQsFAAOCAQEAB139q1PbVPh01yvDNZGb2ymhSAs8ZUS7RkoC8R+iBvf7
+9qvRjoO3KcpKxssGtk/pRxgkGIPin6AoXMgbNILayM0fxCwXOGbrwLS81RLEeQMh
+Jx4HLXpyTJH56cQd1F9m+yZattXBEJHybS+XXzkNEyPINvgkYXnF9vSWzXhj8ImA
+Chm10J/c5tGKCzoFbEPDxvsduJmyyEnIk+OdM7bfAPVppSImcQYv4Q586RPdJEaS
+p+gSgOlM0PebJpSzauaPEfWVem6qG/w3lCEpRtqA5J8LrB23VfOn+r6MsRzq1xf2
+I2PKF8tgGzGTEth1PAgMGHKe685hbfuqFdOkz0eV6A==
+-----END X509 CRL-----
diff --git a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/client1.p12 b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/client1.p12
new file mode 100644
index 00000000000..09ffa235086
Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/client1.p12 differ
diff --git a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/inter_ca.p12 b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/inter_ca.p12
new file mode 100644
index 00000000000..5cf36ad0313
Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/inter_ca.p12 differ
diff --git a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/partner1_ca.p12 b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/partner1_ca.p12
new file mode 100644
index 00000000000..17105e4ccb7
Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/partner1_ca.p12 differ
diff --git a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/root_ca.p12 b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/root_ca.p12
new file mode 100644
index 00000000000..ef95c26dcb0
Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/root_ca.p12 differ
diff --git a/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/truststore.p12 b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/truststore.p12
new file mode 100644
index 00000000000..28a22ee0c90
Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/invalidpartner1client1/truststore.p12 differ
diff --git a/ethereum/p2p/src/test/resources/keys/partner1client1/client1.p12 b/ethereum/p2p/src/test/resources/keys/partner1client1/client1.p12
new file mode 100644
index 00000000000..79b48953cd3
Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/partner1client1/client1.p12 differ
diff --git a/ethereum/p2p/src/test/resources/keys/partner1client1/nss.cfg b/ethereum/p2p/src/test/resources/keys/partner1client1/nss.cfg
new file mode 100644
index 00000000000..c4dd61c691c
--- /dev/null
+++ b/ethereum/p2p/src/test/resources/keys/partner1client1/nss.cfg
@@ -0,0 +1,5 @@
+name = NSScrypto-partner1-client1
+nssSecmodDirectory = ./src/test/resources/keys/partner1client1/nssdb
+nssDbMode = readOnly
+nssModule = keystore
+showInfo = true
diff --git a/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/cert9.db b/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/cert9.db
new file mode 100644
index 00000000000..76506b1b312
Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/cert9.db differ
diff --git a/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/key4.db b/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/key4.db
new file mode 100644
index 00000000000..9c0d1c273e3
Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/key4.db differ
diff --git a/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/pkcs11.txt b/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/pkcs11.txt
new file mode 100644
index 00000000000..d6925f07819
--- /dev/null
+++ b/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/pkcs11.txt
@@ -0,0 +1,5 @@
+library=
+name=NSS Internal PKCS #11 Module
+parameters=configdir='sql:nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription='' 
+NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})
+
diff --git a/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/secmod.db b/ethereum/p2p/src/test/resources/keys/partner1client1/nssdb/secmod.db
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/ethereum/p2p/src/test/resources/keys/partner1client1/nsspin.txt b/ethereum/p2p/src/test/resources/keys/partner1client1/nsspin.txt
new file mode 100644
index 00000000000..5271a526801
--- /dev/null
+++ b/ethereum/p2p/src/test/resources/keys/partner1client1/nsspin.txt
@@ -0,0 +1 @@
+test123
diff --git a/ethereum/p2p/src/test/resources/keys/partner1client1/truststore.p12 b/ethereum/p2p/src/test/resources/keys/partner1client1/truststore.p12
new file mode 100644
index 00000000000..b712b844a12
Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/partner1client1/truststore.p12 differ
diff --git a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/client2.p12 b/ethereum/p2p/src/test/resources/keys/partner1client2rvk/client2.p12
new file mode 100644
index 00000000000..05eccca91ba
Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/partner1client2rvk/client2.p12 differ
diff --git a/ethereum/p2p/src/test/resources/keys/partner1client2rvk/truststore.p12 b/ethereum/p2p/src/test/resources/keys/partner1client2rvk/truststore.p12
new file mode 100644
index 00000000000..e51ea577f1d
Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/partner1client2rvk/truststore.p12 differ
diff --git a/ethereum/p2p/src/test/resources/keys/partner2client1/client1.p12 b/ethereum/p2p/src/test/resources/keys/partner2client1/client1.p12
new file mode 100644
index 00000000000..605776aaf0c
Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/partner2client1/client1.p12 differ
diff --git a/ethereum/p2p/src/test/resources/keys/partner2client1/truststore.p12 b/ethereum/p2p/src/test/resources/keys/partner2client1/truststore.p12
new file mode 100644
index 00000000000..594728c4355
Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/partner2client1/truststore.p12 differ
diff --git a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/client2.p12 b/ethereum/p2p/src/test/resources/keys/partner2client2rvk/client2.p12
new file mode 100644
index 00000000000..80cd7c4763f
Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/partner2client2rvk/client2.p12 differ
diff --git a/ethereum/p2p/src/test/resources/keys/partner2client2rvk/truststore.p12 b/ethereum/p2p/src/test/resources/keys/partner2client2rvk/truststore.p12
new file mode 100644
index 00000000000..40f60a99e59
Binary files /dev/null and b/ethereum/p2p/src/test/resources/keys/partner2client2rvk/truststore.p12 differ
diff --git a/ethereum/p2p/src/test/resources/log4j2.xml b/ethereum/p2p/src/test/resources/log4j2.xml
deleted file mode 100644
index 3465f7ef823..00000000000
--- a/ethereum/p2p/src/test/resources/log4j2.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN" monitorInterval="30">
-    <Properties>
-        <Property name="root.log.level">INFO</Property>
-    </Properties>
-    <Appenders>
-        <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSSZZZ} | %t | %-5level | %c{1} | %msg%n" />
-        </Console>
-    </Appenders>
-    <Loggers>
-        <Root level="${sys:root.log.level}">
-            <AppenderRef ref="Console" />
-        </Root>
-    </Loggers>
-</Configuration>
diff --git a/ethereum/p2p/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/ethereum/p2p/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 00000000000..ca6ee9cea8e
--- /dev/null
+++ b/ethereum/p2p/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline
\ No newline at end of file
diff --git a/ethereum/p2p/src/test/resources/org/hyperledger/besu/ethereum/p2p/peers/unknown_hostname_static_nodes.json b/ethereum/p2p/src/test/resources/org/hyperledger/besu/ethereum/p2p/peers/unknown_hostname_static_nodes.json
index 42eb845b7c4..3b2b5188f4a 100644
--- a/ethereum/p2p/src/test/resources/org/hyperledger/besu/ethereum/p2p/peers/unknown_hostname_static_nodes.json
+++ b/ethereum/p2p/src/test/resources/org/hyperledger/besu/ethereum/p2p/peers/unknown_hostname_static_nodes.json
@@ -1,4 +1,4 @@
-["enode://50203c6bfca6874370e71aecc8958529fd723feb05013dc1abca8fc1fff845c5259faba05852e9dfe5ce172a7d6e7c2a3a5eaa8b541c8af15ea5518bbff5f2fa@localhost:30303",
-  "enode://02beb46bc17227616be44234071dfa18516684e45eed88049190b6cb56b0bae218f045fd0450f123b8f55c60b96b78c45e8e478004293a8de6818aa4e02eff97@nodfound:30304",
-  "enode://819e5cbd81f123516b10f04bf620daa2b385efef06d77253148b814bf1bb6197ff58ebd1fd7bf5dc765b49a4440c733bf941e479c800173f2bfeb887e4fbcbc2@127.0.0.1:30305",
-  "enode://6cf53e25d2a98a22e7e205a86bda7077e3c8a7bc99e5ff88ddfd2037a550969ab566f069ffa455df0cfae0c21f7aec3447e414eccc473a3e8b20984b90f164ac@127.0.0.1:30306"]
\ No newline at end of file
+["enode://50203c6bfca6874370e71aecc8958529fd723feb05013dc1abca8fc1fff845c5259faba05852e9dfe5ce172a7d6e7c2a3a5eaa8b541c8af15ea5518bbff5f2fa@not-found:30303",
+  "enode://02beb46bc17227616be44234071dfa18516684e45eed88049190b6cb56b0bae218f045fd0450f123b8f55c60b96b78c45e8e478004293a8de6818aa4e02eff97@not-found:30304",
+  "enode://819e5cbd81f123516b10f04bf620daa2b385efef06d77253148b814bf1bb6197ff58ebd1fd7bf5dc765b49a4440c733bf941e479c800173f2bfeb887e4fbcbc2@10.0.0.1:30305",
+  "enode://6cf53e25d2a98a22e7e205a86bda7077e3c8a7bc99e5ff88ddfd2037a550969ab566f069ffa455df0cfae0c21f7aec3447e414eccc473a3e8b20984b90f164ac@not-found:30306"]
\ No newline at end of file
diff --git a/ethereum/p2p/src/test/resources/org/hyperledger/besu/ethereum/p2p/peers/valid_hostname_static_nodes.json b/ethereum/p2p/src/test/resources/org/hyperledger/besu/ethereum/p2p/peers/valid_hostname_static_nodes.json
index 93b882ce73d..c2321426b4b 100644
--- a/ethereum/p2p/src/test/resources/org/hyperledger/besu/ethereum/p2p/peers/valid_hostname_static_nodes.json
+++ b/ethereum/p2p/src/test/resources/org/hyperledger/besu/ethereum/p2p/peers/valid_hostname_static_nodes.json
@@ -1,4 +1,4 @@
 ["enode://50203c6bfca6874370e71aecc8958529fd723feb05013dc1abca8fc1fff845c5259faba05852e9dfe5ce172a7d6e7c2a3a5eaa8b541c8af15ea5518bbff5f2fa@localhost:30303",
   "enode://02beb46bc17227616be44234071dfa18516684e45eed88049190b6cb56b0bae218f045fd0450f123b8f55c60b96b78c45e8e478004293a8de6818aa4e02eff97@localhost:30304",
-  "enode://819e5cbd81f123516b10f04bf620daa2b385efef06d77253148b814bf1bb6197ff58ebd1fd7bf5dc765b49a4440c733bf941e479c800173f2bfeb887e4fbcbc2@127.0.0.1:30305",
+  "enode://819e5cbd81f123516b10f04bf620daa2b385efef06d77253148b814bf1bb6197ff58ebd1fd7bf5dc765b49a4440c733bf941e479c800173f2bfeb887e4fbcbc2@10.0.0.1:30305",
   "enode://6cf53e25d2a98a22e7e205a86bda7077e3c8a7bc99e5ff88ddfd2037a550969ab566f069ffa455df0cfae0c21f7aec3447e414eccc473a3e8b20984b90f164ac@127.0.0.1:30306"]
\ No newline at end of file
diff --git a/ethereum/p2p/src/test/resources/org/hyperledger/besu/ethereum/p2p/peers/valid_static_nodes.json b/ethereum/p2p/src/test/resources/org/hyperledger/besu/ethereum/p2p/peers/valid_static_nodes.json
index 1e1764425d2..889fde3f79c 100644
--- a/ethereum/p2p/src/test/resources/org/hyperledger/besu/ethereum/p2p/peers/valid_static_nodes.json
+++ b/ethereum/p2p/src/test/resources/org/hyperledger/besu/ethereum/p2p/peers/valid_static_nodes.json
@@ -1,4 +1,4 @@
 ["enode://50203c6bfca6874370e71aecc8958529fd723feb05013dc1abca8fc1fff845c5259faba05852e9dfe5ce172a7d6e7c2a3a5eaa8b541c8af15ea5518bbff5f2fa@127.0.0.1:30303",
   "enode://02beb46bc17227616be44234071dfa18516684e45eed88049190b6cb56b0bae218f045fd0450f123b8f55c60b96b78c45e8e478004293a8de6818aa4e02eff97@127.0.0.1:30304",
-  "enode://819e5cbd81f123516b10f04bf620daa2b385efef06d77253148b814bf1bb6197ff58ebd1fd7bf5dc765b49a4440c733bf941e479c800173f2bfeb887e4fbcbc2@127.0.0.1:30305",
+  "enode://819e5cbd81f123516b10f04bf620daa2b385efef06d77253148b814bf1bb6197ff58ebd1fd7bf5dc765b49a4440c733bf941e479c800173f2bfeb887e4fbcbc2@10.0.0.1:30305",
   "enode://6cf53e25d2a98a22e7e205a86bda7077e3c8a7bc99e5ff88ddfd2037a550969ab566f069ffa455df0cfae0c21f7aec3447e414eccc473a3e8b20984b90f164ac@127.0.0.1:30306"]
\ No newline at end of file
diff --git a/ethereum/permissioning/build.gradle b/ethereum/permissioning/build.gradle
index 56138795512..5b10e216ecf 100644
--- a/ethereum/permissioning/build.gradle
+++ b/ethereum/permissioning/build.gradle
@@ -28,24 +28,34 @@ jar {
 }
 
 dependencies {
-  implementation project(':crypto')
+  api 'org.slf4j:slf4j-api'
+
+  implementation project(':crypto:algorithms')
+  implementation project(':datatypes')
   implementation project(':ethereum:core')
   implementation project(':ethereum:p2p')
+  implementation project(':evm')
   implementation project(':metrics:core')
+  implementation project(':plugin-api')
   implementation project(':util')
 
+  implementation 'com.fasterxml.jackson.core:jackson-databind'
   implementation 'com.google.guava:guava'
-  implementation 'org.apache.logging.log4j:log4j-api'
-  implementation 'org.apache.tuweni:bytes'
-  implementation 'org.apache.tuweni:toml'
-  implementation 'org.apache.tuweni:units'
-  implementation 'org.web3j:abi:5.0.0'
+  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-toml'
+  implementation 'org.apache.tuweni:tuweni-units'
+  implementation 'org.web3j:abi'
 
   testImplementation project(':config')
   testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
+  testImplementation project(':evm')
   testImplementation project(':testutil')
+
   testImplementation 'io.vertx:vertx-core'
   testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.mockito:mockito-core'
+
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 }
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/AbstractNodeSmartContractPermissioningController.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/AbstractNodeSmartContractPermissioningController.java
index 6fbb4b6c21b..7f5b629113a 100644
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/AbstractNodeSmartContractPermissioningController.java
+++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/AbstractNodeSmartContractPermissioningController.java
@@ -14,21 +14,21 @@
  */
 package org.hyperledger.besu.ethereum.permissioning;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
-import org.hyperledger.besu.ethereum.permissioning.node.NodePermissioningProvider;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.transaction.CallParameter;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
 import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.plugin.services.permissioning.NodeConnectionPermissioningProvider;
 
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
 
 public abstract class AbstractNodeSmartContractPermissioningController
-    implements NodePermissioningProvider {
+    implements NodeConnectionPermissioningProvider {
 
   protected final Address contractAddress;
   protected final TransactionSimulator transactionSimulator;
@@ -73,10 +73,11 @@ protected AbstractNodeSmartContractPermissioningController(
    *
    * @param sourceEnode The enode url of the node initiating the connection
    * @param destinationEnode The enode url of the node receiving the connection
-   * @return boolean of whether or not to permit the connection to occur
+   * @return boolean of whether to permit the connection
    */
   @Override
-  public boolean isPermitted(final EnodeURL sourceEnode, final EnodeURL destinationEnode) {
+  public boolean isConnectionPermitted(
+      final EnodeURL sourceEnode, final EnodeURL destinationEnode) {
     this.checkCounter.inc();
 
     if (!isContractDeployed()) {
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/AccountLocalConfigPermissioningController.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/AccountLocalConfigPermissioningController.java
index f9020b3545e..c62ed9d6b0b 100644
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/AccountLocalConfigPermissioningController.java
+++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/AccountLocalConfigPermissioningController.java
@@ -14,8 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.permissioning;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.permissioning.AllowlistPersistor.ALLOWLIST_TYPE;
 import org.hyperledger.besu.ethereum.permissioning.account.TransactionPermissioningProvider;
@@ -31,13 +31,14 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AccountLocalConfigPermissioningController implements TransactionPermissioningProvider {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG =
+      LoggerFactory.getLogger(AccountLocalConfigPermissioningController.class);
 
   private static final int ACCOUNT_BYTES_SIZE = 20;
   private LocalPermissioningConfiguration configuration;
@@ -216,13 +217,11 @@ public synchronized void reload() throws RuntimeException {
       readAccountsFromConfig(updatedConfig);
       configuration = updatedConfig;
     } catch (Exception e) {
-      LOG.warn(
-          "Error reloading permissions file. In-memory accounts allowlist will be reverted to previous valid configuration. "
-              + "Details: {}",
-          e.getMessage());
       accountAllowlist.clear();
       accountAllowlist.addAll(currentAccountsList);
-      throw new RuntimeException(e);
+      throw new IllegalStateException(
+          "Error reloading permissions file. In-memory accounts allowlist will be reverted to previous valid configuration",
+          e);
     }
   }
 
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/AllowlistPersistor.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/AllowlistPersistor.java
index 1f4e583e6c8..7e9957ee281 100644
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/AllowlistPersistor.java
+++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/AllowlistPersistor.java
@@ -31,8 +31,11 @@
 import com.google.common.base.Charsets;
 import org.apache.tuweni.toml.Toml;
 import org.apache.tuweni.toml.TomlParseResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AllowlistPersistor {
+  private static final Logger LOG = LoggerFactory.getLogger(AllowlistPersistor.class);
 
   private final File configurationFile;
 
@@ -68,11 +71,16 @@ public static boolean verifyConfigFileMatchesState(
             ? configItems.get(allowlistType)
             : Collections.emptyList();
 
-    boolean listsMatch = existingValues.containsAll(checkLists);
-    if (!listsMatch) {
+    if (!existingValues.containsAll(checkLists)) {
+      LOG.atDebug()
+          .setMessage("\n LISTS DO NOT MATCH configFile::")
+          .addArgument(existingValues)
+          .addArgument(configurationFilePath)
+          .log();
+      LOG.atDebug().setMessage("\nLISTS DO NOT MATCH in-memory ::").addArgument(checkLists).log();
       throw new AllowlistFileSyncException();
     }
-    return listsMatch;
+    return true;
   }
 
   public boolean verifyConfigFileMatchesState(
@@ -102,9 +110,7 @@ private static Map<ALLOWLIST_TYPE, Collection<String>> existingConfigItems(
             Collectors.toMap(
                 o -> o.getKey(),
                 o ->
-                    o.getValue()
-                        .toList()
-                        .parallelStream()
+                    o.getValue().toList().parallelStream()
                         .map(Object::toString)
                         .collect(Collectors.toList())));
   }
@@ -112,9 +118,7 @@ private static Map<ALLOWLIST_TYPE, Collection<String>> existingConfigItems(
   @VisibleForTesting
   void removeExistingConfigItem(final ALLOWLIST_TYPE allowlistType) throws IOException {
     List<String> otherConfigItems =
-        existingConfigItems(configurationFile.toPath())
-            .entrySet()
-            .parallelStream()
+        existingConfigItems(configurationFile.toPath()).entrySet().parallelStream()
             .filter(listType -> !listType.getKey().equals(allowlistType))
             .map(keyVal -> valueListToTomlArray(keyVal.getKey(), keyVal.getValue()))
             .collect(Collectors.toList());
@@ -153,8 +157,7 @@ private static String valueListToTomlArray(
     return String.format(
         "%s=[%s]",
         allowlistType.getTomlKey(),
-        allowlistValues
-            .parallelStream()
+        allowlistValues.parallelStream()
             .map(uri -> String.format("\"%s\"", uri))
             .collect(Collectors.joining(",")));
   }
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/GoQuorumPermissioningConfiguration.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/GoQuorumPermissioningConfiguration.java
new file mode 100644
index 00000000000..4e66a6c0723
--- /dev/null
+++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/GoQuorumPermissioningConfiguration.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.permissioning;
+
+public class GoQuorumPermissioningConfiguration {
+
+  public static final long QIP714_DEFAULT_BLOCK = 0;
+
+  private final long qip714Block;
+  private final boolean enabled;
+
+  public GoQuorumPermissioningConfiguration(final long qip714Block, final boolean enabled) {
+    this.qip714Block = qip714Block;
+    this.enabled = enabled;
+  }
+
+  public static GoQuorumPermissioningConfiguration enabled(final long qip714Block) {
+    return new GoQuorumPermissioningConfiguration(qip714Block, true);
+  }
+
+  public static GoQuorumPermissioningConfiguration disabled() {
+    return new GoQuorumPermissioningConfiguration(QIP714_DEFAULT_BLOCK, false);
+  }
+
+  public long getQip714Block() {
+    return qip714Block;
+  }
+
+  public boolean isEnabled() {
+    return enabled;
+  }
+}
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/GoQuorumQip714Gate.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/GoQuorumQip714Gate.java
new file mode 100644
index 00000000000..7958cf3b5aa
--- /dev/null
+++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/GoQuorumQip714Gate.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.permissioning;
+
+import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+
+import java.util.concurrent.atomic.AtomicLong;
+
+import com.google.common.annotations.VisibleForTesting;
+
+public class GoQuorumQip714Gate {
+
+  private static GoQuorumQip714Gate SINGLE_INSTANCE = null;
+
+  private final long qip714Block;
+  private final AtomicLong latestBlock = new AtomicLong(0L);
+
+  @VisibleForTesting
+  GoQuorumQip714Gate(final long qip714Block, final Blockchain blockchain) {
+    this.qip714Block = qip714Block;
+
+    blockchain.observeBlockAdded(this::checkChainHeight);
+  }
+
+  // this is only called during start-up, synchronized access won't hurt performance
+  public static synchronized GoQuorumQip714Gate getInstance(
+      final long qip714Block, final Blockchain blockchain) {
+    if (SINGLE_INSTANCE == null) {
+      SINGLE_INSTANCE = new GoQuorumQip714Gate(qip714Block, blockchain);
+    } else {
+      if (SINGLE_INSTANCE.qip714Block != qip714Block) {
+        throw new IllegalStateException(
+            "Tried to create Quorum QIP-714 gate with different block config from already instantiated gate block config");
+      }
+    }
+
+    return SINGLE_INSTANCE;
+  }
+
+  public boolean shouldCheckPermissions() {
+    if (qip714Block == 0) {
+      return true;
+    } else {
+      return latestBlock.get() >= qip714Block;
+    }
+  }
+
+  @VisibleForTesting
+  void checkChainHeight(final BlockAddedEvent event) {
+    if (event.isNewCanonicalHead()) {
+      latestBlock.set(event.getBlock().getHeader().getNumber());
+    }
+  }
+
+  @VisibleForTesting
+  long getLatestBlock() {
+    return latestBlock.get();
+  }
+}
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/LocalPermissioningConfiguration.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/LocalPermissioningConfiguration.java
index 410d5cddd08..690d65a4a05 100644
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/LocalPermissioningConfiguration.java
+++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/LocalPermissioningConfiguration.java
@@ -15,7 +15,7 @@
 package org.hyperledger.besu.ethereum.permissioning;
 
 import org.hyperledger.besu.ethereum.p2p.peers.EnodeDnsConfiguration;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodeLocalConfigPermissioningController.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodeLocalConfigPermissioningController.java
index 98b09629609..ec66ea51eff 100644
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodeLocalConfigPermissioningController.java
+++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodeLocalConfigPermissioningController.java
@@ -14,13 +14,14 @@
  */
 package org.hyperledger.besu.ethereum.permissioning;
 
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.permissioning.AllowlistPersistor.ALLOWLIST_TYPE;
 import org.hyperledger.besu.ethereum.permissioning.node.NodeAllowlistUpdatedEvent;
-import org.hyperledger.besu.ethereum.permissioning.node.NodePermissioningProvider;
 import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.plugin.services.permissioning.NodeConnectionPermissioningProvider;
 import org.hyperledger.besu.util.Subscribers;
 
 import java.io.IOException;
@@ -35,13 +36,14 @@
 import java.util.stream.Collectors;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class NodeLocalConfigPermissioningController implements NodePermissioningProvider {
+public class NodeLocalConfigPermissioningController implements NodeConnectionPermissioningProvider {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG =
+      LoggerFactory.getLogger(NodeLocalConfigPermissioningController.class);
 
   private LocalPermissioningConfiguration configuration;
   private final List<EnodeURL> fixedNodes;
@@ -112,7 +114,7 @@ public NodesAllowlistResult addNodes(final List<String> enodeURLs) {
     }
     final List<EnodeURL> peers =
         enodeURLs.stream()
-            .map(url -> EnodeURL.fromString(url, configuration.getEnodeDnsConfiguration()))
+            .map(url -> EnodeURLImpl.fromString(url, configuration.getEnodeDnsConfiguration()))
             .collect(Collectors.toList());
 
     for (EnodeURL peer : peers) {
@@ -146,7 +148,7 @@ public NodesAllowlistResult removeNodes(final List<String> enodeURLs) {
     }
     final List<EnodeURL> peers =
         enodeURLs.stream()
-            .map(url -> EnodeURL.fromString(url, configuration.getEnodeDnsConfiguration()))
+            .map(url -> EnodeURLImpl.fromString(url, configuration.getEnodeDnsConfiguration()))
             .collect(Collectors.toList());
 
     boolean anyBootnode = peers.stream().anyMatch(fixedNodes::contains);
@@ -231,14 +233,14 @@ private Collection<String> peerToEnodeURI(final Collection<EnodeURL> peers) {
   }
 
   public boolean isPermitted(final String enodeURL) {
-    return isPermitted(EnodeURL.fromString(enodeURL, configuration.getEnodeDnsConfiguration()));
+    return isPermitted(EnodeURLImpl.fromString(enodeURL, configuration.getEnodeDnsConfiguration()));
   }
 
   public boolean isPermitted(final EnodeURL node) {
     if (Objects.equals(localNodeId, node.getNodeId())) {
       return true;
     }
-    return nodesAllowlist.stream().anyMatch(p -> EnodeURL.sameListeningEndpoint(p, node));
+    return nodesAllowlist.stream().anyMatch(p -> EnodeURLImpl.sameListeningEndpoint(p, node));
   }
 
   public List<String> getNodesAllowlist() {
@@ -263,13 +265,11 @@ public synchronized void reload() throws RuntimeException {
 
       createNodeAllowlistModifiedEventAfterReload(currentAccountsList, nodesAllowlist);
     } catch (Exception e) {
-      LOG.warn(
-          "Error reloading permissions file. In-memory nodes allowlist will be reverted to previous valid configuration. "
-              + "Details: {}",
-          e.getMessage());
       nodesAllowlist.clear();
       nodesAllowlist.addAll(currentAccountsList);
-      throw new RuntimeException(e);
+      throw new IllegalStateException(
+          "Error reloading permissions file. In-memory nodes allowlist will be reverted to previous valid configuration",
+          e);
     }
   }
 
@@ -328,7 +328,8 @@ public Optional<String> message() {
   }
 
   @Override
-  public boolean isPermitted(final EnodeURL sourceEnode, final EnodeURL destinationEnode) {
+  public boolean isConnectionPermitted(
+      final EnodeURL sourceEnode, final EnodeURL destinationEnode) {
     this.checkCounter.inc();
     if (isPermitted(sourceEnode) && isPermitted(destinationEnode)) {
       this.checkCounterPermitted.inc();
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodePermissioningControllerFactory.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodePermissioningControllerFactory.java
index a990e603c8d..7bca3ef8dfb 100644
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodePermissioningControllerFactory.java
+++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodePermissioningControllerFactory.java
@@ -14,28 +14,31 @@
  */
 package org.hyperledger.besu.ethereum.permissioning;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.permissioning.node.NodePermissioningController;
-import org.hyperledger.besu.ethereum.permissioning.node.NodePermissioningProvider;
 import org.hyperledger.besu.ethereum.permissioning.node.provider.SyncStatusNodePermissioningProvider;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.plugin.services.permissioning.NodeConnectionPermissioningProvider;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import com.google.common.collect.Lists;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class NodePermissioningControllerFactory {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG =
+      LoggerFactory.getLogger(NodePermissioningControllerFactory.class);
 
   public NodePermissioningController create(
       final PermissioningConfiguration permissioningConfiguration,
@@ -44,11 +47,13 @@ public NodePermissioningController create(
       final Bytes localNodeId,
       final TransactionSimulator transactionSimulator,
       final MetricsSystem metricsSystem,
-      final Blockchain blockchain) {
+      final Blockchain blockchain,
+      final List<NodeConnectionPermissioningProvider> pluginProviders) {
+
+    ArrayList<NodeConnectionPermissioningProvider> providers = Lists.newArrayList(pluginProviders);
 
     final Optional<SyncStatusNodePermissioningProvider> syncStatusProviderOptional;
 
-    List<NodePermissioningProvider> providers = new ArrayList<>();
     if (permissioningConfiguration.getLocalConfig().isPresent()) {
       LocalPermissioningConfiguration localPermissioningConfiguration =
           permissioningConfiguration.getLocalConfig().get();
@@ -83,21 +88,21 @@ public NodePermissioningController create(
       syncStatusProviderOptional = Optional.empty();
     }
 
-    final Optional<QuorumQip714Gate> quorumQip714Gate =
+    final Optional<GoQuorumQip714Gate> goQuorumQip714Gate =
         permissioningConfiguration
             .getQuorumPermissioningConfig()
             .flatMap(
                 config -> {
                   if (config.isEnabled()) {
                     return Optional.of(
-                        QuorumQip714Gate.getInstance(config.getQip714Block(), blockchain));
+                        GoQuorumQip714Gate.getInstance(config.getQip714Block(), blockchain));
                   } else {
                     return Optional.empty();
                   }
                 });
 
     final NodePermissioningController nodePermissioningController =
-        new NodePermissioningController(syncStatusProviderOptional, providers, quorumQip714Gate);
+        new NodePermissioningController(syncStatusProviderOptional, providers, goQuorumQip714Gate);
 
     permissioningConfiguration
         .getSmartContractConfig()
@@ -117,13 +122,13 @@ private void configureNodePermissioningSmartContractProvider(
       final PermissioningConfiguration permissioningConfiguration,
       final TransactionSimulator transactionSimulator,
       final MetricsSystem metricsSystem,
-      final List<NodePermissioningProvider> providers) {
+      final List<NodeConnectionPermissioningProvider> providers) {
     final SmartContractPermissioningConfiguration smartContractPermissioningConfig =
         permissioningConfiguration.getSmartContractConfig().get();
     final Address nodePermissioningSmartContractAddress =
         smartContractPermissioningConfig.getNodeSmartContractAddress();
 
-    final NodePermissioningProvider smartContractProvider;
+    final NodeConnectionPermissioningProvider smartContractProvider;
     switch (smartContractPermissioningConfig.getNodeSmartContractInterfaceVersion()) {
       case 1:
         {
@@ -151,13 +156,20 @@ private void validatePermissioningContract(
       final SmartContractPermissioningConfiguration smartContractPermissioningConfig) {
     LOG.debug("Validating onchain node permissioning smart contract configuration");
 
+    // eliminate the sync status and other checks, so we can just check the smart contract function
+    final NodePermissioningController tempControllerCheckingSmartContractOnly =
+        new NodePermissioningController(
+            Optional.empty(), nodePermissioningController.getProviders(), Optional.empty());
+
     try {
       // the enodeURLs don't matter. We just want to check if a call to the smart contract succeeds
-      nodePermissioningController.isPermitted(
-          EnodeURL.fromString(
+      tempControllerCheckingSmartContractOnly.isPermitted(
+          EnodeURLImpl.fromString(
               "enode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@10.3.58.6:30303"),
-          EnodeURL.fromString(
+          EnodeURLImpl.fromString(
               "enode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@10.3.58.6:30303"));
+      LOG.debug(
+          "Successful validation of onchain node permissioning smart contract configuration!");
     } catch (Exception e) {
       final String msg =
           String.format(
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodeSmartContractPermissioningController.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodeSmartContractPermissioningController.java
index c39202d722b..5f619ee3f80 100644
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodeSmartContractPermissioningController.java
+++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodeSmartContractPermissioningController.java
@@ -17,11 +17,11 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import org.hyperledger.besu.crypto.Hash;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.transaction.CallParameter;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulatorResult;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
 import java.net.InetAddress;
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodeSmartContractV2PermissioningController.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodeSmartContractV2PermissioningController.java
index 8c4f797cf91..ca114d17955 100644
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodeSmartContractV2PermissioningController.java
+++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/NodeSmartContractV2PermissioningController.java
@@ -14,16 +14,21 @@
  */
 package org.hyperledger.besu.ethereum.permissioning;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
-import org.hyperledger.besu.ethereum.transaction.CallParameter;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
+import org.hyperledger.besu.ethereum.p2p.peers.ImmutableEnodeDnsConfiguration;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulatorResult;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
 import java.util.List;
+import javax.annotation.Nonnull;
 
+import com.google.common.net.InetAddresses;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.web3j.abi.FunctionEncoder;
 import org.web3j.abi.TypeEncoder;
 import org.web3j.abi.datatypes.Bool;
@@ -36,6 +41,9 @@
 public class NodeSmartContractV2PermissioningController
     extends AbstractNodeSmartContractPermissioningController {
 
+  private static final Logger LOG =
+      LoggerFactory.getLogger(NodeSmartContractV2PermissioningController.class);
+
   public static final Bytes TRUE_RESPONSE = Bytes.fromHexString(TypeEncoder.encode(new Bool(true)));
   public static final Bytes FALSE_RESPONSE =
       Bytes.fromHexString(TypeEncoder.encode(new Bool(false)));
@@ -53,16 +61,43 @@ boolean checkSmartContractRules(final EnodeURL sourceEnode, final EnodeURL desti
   }
 
   private boolean isPermitted(final EnodeURL enode) {
-    final Bytes payload = createPayload(enode);
-    final CallParameter callParams = buildCallParameters(payload);
+    try {
+      final boolean isIpEnodePermitted = getCallResult(enode);
+      LOG.trace("Permitted? {} for IP {}", isIpEnodePermitted, enode);
+      if (isIpEnodePermitted) return true;
+      final EnodeURL ipToDNSEnode = ipToDNS(enode);
+      final boolean isIpToDNSEnodePermitted = getCallResult(ipToDNSEnode);
+      LOG.trace("Permitted? {} for DNS {}", isIpToDNSEnodePermitted, ipToDNSEnode);
+      return isIpToDNSEnodePermitted;
+    } catch (final IllegalStateException illegalStateException) {
+      throw new IllegalStateException(
+          "Unable to check permissions for " + enode, illegalStateException);
+    }
+  }
 
-    return transactionSimulator.processAtHead(callParams).map(this::parseResult).orElse(false);
+  @Nonnull
+  private Boolean getCallResult(final EnodeURL enode) {
+    return transactionSimulator
+        .processAtHead(buildCallParameters(createPayload(enode)))
+        .map(this::parseResult)
+        .orElse(false);
+  }
+
+  private EnodeURL ipToDNS(final EnodeURL enodeURL) {
+    final String dnsHost = InetAddresses.forString(enodeURL.getIpAsString()).getHostName();
+    final ImmutableEnodeDnsConfiguration dnsConfig =
+        ImmutableEnodeDnsConfiguration.builder().dnsEnabled(true).updateEnabled(true).build();
+    return EnodeURLImpl.builder()
+        .configureFromEnode(enodeURL)
+        .ipAddress(dnsHost, dnsConfig)
+        .build();
   }
 
   private Bytes createPayload(final EnodeURL enodeUrl) {
     try {
+
       final String hexNodeIdString = enodeUrl.getNodeId().toUnprefixedHexString();
-      final String address = enodeUrl.getIp().getHostAddress();
+      final String address = enodeUrl.getHost();
       final int port = enodeUrl.getListeningPortOrZero();
 
       final Function connectionAllowedFunction =
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/PermissioningConfiguration.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/PermissioningConfiguration.java
index 63c6b9de958..402239243f6 100644
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/PermissioningConfiguration.java
+++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/PermissioningConfiguration.java
@@ -20,12 +20,12 @@ public class PermissioningConfiguration {
 
   private final Optional<LocalPermissioningConfiguration> localConfig;
   private final Optional<SmartContractPermissioningConfiguration> smartContractConfig;
-  private final Optional<QuorumPermissioningConfiguration> quorumPermissioningConfig;
+  private final Optional<GoQuorumPermissioningConfiguration> quorumPermissioningConfig;
 
   public PermissioningConfiguration(
       final Optional<LocalPermissioningConfiguration> localConfig,
       final Optional<SmartContractPermissioningConfiguration> smartContractConfig,
-      final Optional<QuorumPermissioningConfiguration> quorumPermissioningConfig) {
+      final Optional<GoQuorumPermissioningConfiguration> quorumPermissioningConfig) {
     this.localConfig = localConfig;
     this.smartContractConfig = smartContractConfig;
     this.quorumPermissioningConfig = quorumPermissioningConfig;
@@ -39,7 +39,7 @@ public Optional<SmartContractPermissioningConfiguration> getSmartContractConfig(
     return smartContractConfig;
   }
 
-  public Optional<QuorumPermissioningConfiguration> getQuorumPermissioningConfig() {
+  public Optional<GoQuorumPermissioningConfiguration> getQuorumPermissioningConfig() {
     return quorumPermissioningConfig;
   }
 
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/PermissioningConfigurationBuilder.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/PermissioningConfigurationBuilder.java
index 32769579947..d9c2ba0e806 100644
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/PermissioningConfigurationBuilder.java
+++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/PermissioningConfigurationBuilder.java
@@ -14,9 +14,10 @@
  */
 package org.hyperledger.besu.ethereum.permissioning;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.p2p.peers.EnodeDnsConfiguration;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -76,13 +77,11 @@ private static LocalPermissioningConfiguration loadNodePermissioning(
 
       if (nodeAllowlistTomlArray != null) {
         List<EnodeURL> nodesAllowlistToml =
-            nodeAllowlistTomlArray
-                .toList()
-                .parallelStream()
+            nodeAllowlistTomlArray.toList().parallelStream()
                 .map(Object::toString)
                 .map(
                     url ->
-                        EnodeURL.fromString(
+                        EnodeURLImpl.fromString(
                             url, permissioningConfiguration.getEnodeDnsConfiguration()))
                 .collect(Collectors.toList());
         permissioningConfiguration.setNodeAllowlist(nodesAllowlistToml);
@@ -113,9 +112,7 @@ private static LocalPermissioningConfiguration loadAccountPermissioning(
 
       if (accountAllowlistTomlArray != null) {
         List<String> accountsAllowlistToml =
-            accountAllowlistTomlArray
-                .toList()
-                .parallelStream()
+            accountAllowlistTomlArray.toList().parallelStream()
                 .map(Object::toString)
                 .collect(Collectors.toList());
 
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/QuorumPermissioningConfiguration.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/QuorumPermissioningConfiguration.java
deleted file mode 100644
index fcc13591138..00000000000
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/QuorumPermissioningConfiguration.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.permissioning;
-
-public class QuorumPermissioningConfiguration {
-
-  public static final long QIP714_DEFAULT_BLOCK = 0;
-
-  private final long qip714Block;
-  private final boolean enabled;
-
-  public QuorumPermissioningConfiguration(final long qip714Block, final boolean enabled) {
-    this.qip714Block = qip714Block;
-    this.enabled = enabled;
-  }
-
-  public static QuorumPermissioningConfiguration enabled(final long qip714Block) {
-    return new QuorumPermissioningConfiguration(qip714Block, true);
-  }
-
-  public static QuorumPermissioningConfiguration disabled() {
-    return new QuorumPermissioningConfiguration(QIP714_DEFAULT_BLOCK, false);
-  }
-
-  public long getQip714Block() {
-    return qip714Block;
-  }
-
-  public boolean isEnabled() {
-    return enabled;
-  }
-}
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/QuorumQip714Gate.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/QuorumQip714Gate.java
deleted file mode 100644
index fbf9dc7a672..00000000000
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/QuorumQip714Gate.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.permissioning;
-
-import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-
-import java.util.concurrent.atomic.AtomicLong;
-
-import com.google.common.annotations.VisibleForTesting;
-
-public class QuorumQip714Gate {
-
-  private static QuorumQip714Gate SINGLE_INSTANCE = null;
-
-  private final long qip714Block;
-  private final AtomicLong latestBlock = new AtomicLong(0L);
-
-  @VisibleForTesting
-  QuorumQip714Gate(final long qip714Block, final Blockchain blockchain) {
-    this.qip714Block = qip714Block;
-
-    blockchain.observeBlockAdded(this::checkChainHeight);
-  }
-
-  // this is only called during start-up, synchronized access won't hurt performance
-  public static synchronized QuorumQip714Gate getInstance(
-      final long qip714Block, final Blockchain blockchain) {
-    if (SINGLE_INSTANCE == null) {
-      SINGLE_INSTANCE = new QuorumQip714Gate(qip714Block, blockchain);
-    } else {
-      if (SINGLE_INSTANCE.qip714Block != qip714Block) {
-        throw new IllegalStateException(
-            "Tried to create Quorum QIP-714 gate with different block config from already instantiated gate block config");
-      }
-    }
-
-    return SINGLE_INSTANCE;
-  }
-
-  public boolean shouldCheckPermissions() {
-    if (qip714Block == 0) {
-      return true;
-    } else {
-      return latestBlock.get() >= qip714Block;
-    }
-  }
-
-  @VisibleForTesting
-  void checkChainHeight(final BlockAddedEvent event) {
-    if (event.isNewCanonicalHead()) {
-      latestBlock.set(event.getBlock().getHeader().getNumber());
-    }
-  }
-
-  @VisibleForTesting
-  long getLatestBlock() {
-    return latestBlock.get();
-  }
-}
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/SmartContractPermissioningConfiguration.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/SmartContractPermissioningConfiguration.java
index 1575a362cd3..31933a52869 100644
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/SmartContractPermissioningConfiguration.java
+++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/SmartContractPermissioningConfiguration.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.permissioning;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 
 public class SmartContractPermissioningConfiguration {
   private boolean smartContractNodeAllowlistEnabled;
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/TomlConfigFileParser.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/TomlConfigFileParser.java
index 543f033a8de..5c8f63e198d 100644
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/TomlConfigFileParser.java
+++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/TomlConfigFileParser.java
@@ -21,15 +21,15 @@
 import java.util.stream.Collectors;
 
 import com.google.common.io.Resources;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.toml.Toml;
 import org.apache.tuweni.toml.TomlParseError;
 import org.apache.tuweni.toml.TomlParseResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TomlConfigFileParser {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(TomlConfigFileParser.class);
 
   private static TomlParseResult checkConfigurationValidity(
       final TomlParseResult result, final String toml) throws Exception {
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/TransactionSmartContractPermissioningController.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/TransactionSmartContractPermissioningController.java
index 680d8bbfa93..f8ee921668f 100644
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/TransactionSmartContractPermissioningController.java
+++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/TransactionSmartContractPermissioningController.java
@@ -18,7 +18,7 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import org.hyperledger.besu.crypto.Hash;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.permissioning.account.TransactionPermissioningProvider;
 import org.hyperledger.besu.ethereum.transaction.CallParameter;
@@ -30,9 +30,11 @@
 
 import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.BaseUInt256Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Controller that can read from a smart contract that exposes the permissioning call
@@ -41,7 +43,8 @@
 public class TransactionSmartContractPermissioningController
     implements TransactionPermissioningProvider {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TransactionSmartContractPermissioningController.class);
 
   private final Address contractAddress;
   private final TransactionSimulator transactionSimulator;
@@ -106,7 +109,7 @@ public TransactionSmartContractPermissioningController(
    */
   @Override
   public boolean isPermitted(final Transaction transaction) {
-    final org.hyperledger.besu.ethereum.core.Hash transactionHash = transaction.getHash();
+    final org.hyperledger.besu.datatypes.Hash transactionHash = transaction.getHash();
     final Address sender = transaction.getSender();
 
     LOG.trace("Account permissioning - Smart Contract : Checking transaction {}", transactionHash);
@@ -193,8 +196,8 @@ private static Bytes encodeTransaction(final Transaction transaction) {
     return Bytes.concatenate(
         encodeAddress(transaction.getSender()),
         encodeAddress(transaction.getTo()),
-        transaction.getValue().toBytes(),
-        transaction.getGasPrice().toBytes(),
+        transaction.getValue(),
+        transaction.getGasPrice().map(BaseUInt256Value::toBytes).orElse(Bytes32.ZERO),
         encodeLong(transaction.getGasLimit()),
         encodeBytes(transaction.getPayload()));
   }
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningController.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningController.java
index f2df92aaa90..cc8f3236394 100644
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningController.java
+++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningController.java
@@ -14,47 +14,47 @@
  */
 package org.hyperledger.besu.ethereum.permissioning.account;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController;
-import org.hyperledger.besu.ethereum.permissioning.QuorumQip714Gate;
+import org.hyperledger.besu.ethereum.permissioning.GoQuorumQip714Gate;
 import org.hyperledger.besu.ethereum.permissioning.TransactionSmartContractPermissioningController;
 
 import java.util.Optional;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AccountPermissioningController {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(AccountPermissioningController.class);
 
   private final Optional<AccountLocalConfigPermissioningController>
       accountLocalConfigPermissioningController;
   private final Optional<TransactionSmartContractPermissioningController>
       transactionSmartContractPermissioningController;
-  private final Optional<QuorumQip714Gate> quorumQip714Gate;
+  private final Optional<GoQuorumQip714Gate> goQuorumQip714Gate;
 
   public AccountPermissioningController(
       final Optional<AccountLocalConfigPermissioningController>
           accountLocalConfigPermissioningController,
       final Optional<TransactionSmartContractPermissioningController>
           transactionSmartContractPermissioningController,
-      final Optional<QuorumQip714Gate> quorumQip714Gate) {
+      final Optional<GoQuorumQip714Gate> goQuorumQip714Gate) {
     this.accountLocalConfigPermissioningController = accountLocalConfigPermissioningController;
     this.transactionSmartContractPermissioningController =
         transactionSmartContractPermissioningController;
-    this.quorumQip714Gate = quorumQip714Gate;
+    this.goQuorumQip714Gate = goQuorumQip714Gate;
   }
 
   public boolean isPermitted(
       final Transaction transaction,
       final boolean includeLocalCheck,
-      final boolean includeOnChainCheck) {
+      final boolean includeOnchainCheck) {
     final boolean checkPermissions =
-        quorumQip714Gate.map(QuorumQip714Gate::shouldCheckPermissions).orElse(true);
+        goQuorumQip714Gate.map(GoQuorumQip714Gate::shouldCheckPermissions).orElse(true);
     if (!checkPermissions) {
       LOG.trace("Skipping account permissioning check due to qip714block config");
 
@@ -76,7 +76,7 @@ public boolean isPermitted(
               .orElse(true);
     }
 
-    if (includeOnChainCheck) {
+    if (includeOnchainCheck) {
       permittedOnchain =
           transactionSmartContractPermissioningController
               .map(c -> c.isPermitted(transaction))
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningControllerFactory.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningControllerFactory.java
index 657c6b2404b..bed0a42b8b5 100644
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningControllerFactory.java
+++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningControllerFactory.java
@@ -14,15 +14,17 @@
  */
 package org.hyperledger.besu.ethereum.permissioning.account;
 
-import org.hyperledger.besu.crypto.SECP256K1;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController;
+import org.hyperledger.besu.ethereum.permissioning.GoQuorumQip714Gate;
 import org.hyperledger.besu.ethereum.permissioning.LocalPermissioningConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
-import org.hyperledger.besu.ethereum.permissioning.QuorumQip714Gate;
 import org.hyperledger.besu.ethereum.permissioning.SmartContractPermissioningConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.TransactionSmartContractPermissioningController;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
@@ -31,13 +33,14 @@
 
 import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AccountPermissioningControllerFactory {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG =
+      LoggerFactory.getLogger(AccountPermissioningControllerFactory.class);
 
   public static Optional<AccountPermissioningController> create(
       final PermissioningConfiguration permissioningConfiguration,
@@ -61,14 +64,14 @@ public static Optional<AccountPermissioningController> create(
     if (accountLocalConfigPermissioningController.isPresent()
         || transactionSmartContractPermissioningController.isPresent()) {
 
-      final Optional<QuorumQip714Gate> quorumQip714Gate =
+      final Optional<GoQuorumQip714Gate> goQuorumQip714Gate =
           permissioningConfiguration
               .getQuorumPermissioningConfig()
               .flatMap(
                   config -> {
                     if (config.isEnabled()) {
                       return Optional.of(
-                          QuorumQip714Gate.getInstance(config.getQip714Block(), blockchain));
+                          GoQuorumQip714Gate.getInstance(config.getQip714Block(), blockchain));
                     } else {
                       return Optional.empty();
                     }
@@ -78,7 +81,7 @@ public static Optional<AccountPermissioningController> create(
           new AccountPermissioningController(
               accountLocalConfigPermissioningController,
               transactionSmartContractPermissioningController,
-              quorumQip714Gate);
+              goQuorumQip714Gate);
 
       return Optional.of(controller);
     } else {
@@ -139,9 +142,13 @@ private static void validatePermissioningContract(
     try {
       LOG.debug("Validating onchain account permissioning smart contract configuration");
 
-      final SECP256K1.Signature FAKE_SIGNATURE =
-          SECP256K1.Signature.create(
-              SECP256K1.HALF_CURVE_ORDER, SECP256K1.HALF_CURVE_ORDER, (byte) 0);
+      final SignatureAlgorithm signatureAlgorithm = SignatureAlgorithmFactory.getInstance();
+
+      final SECPSignature FAKE_SIGNATURE =
+          signatureAlgorithm.createSignature(
+              signatureAlgorithm.getHalfCurveOrder(),
+              signatureAlgorithm.getHalfCurveOrder(),
+              (byte) 0);
 
       final Transaction transaction =
           Transaction.builder()
@@ -158,10 +165,8 @@ private static void validatePermissioningContract(
       // We don't care about the validation result. All we need it to ensure the check doesn't fail
       transactionSmartContractPermissioningController.isPermitted(transaction);
     } catch (Exception e) {
-      final String msg =
-          "Error validating onchain account permissioning smart contract configuration";
-      LOG.error(msg + ":", e);
-      throw new IllegalStateException(msg, e);
+      throw new IllegalStateException(
+          "Error validating onchain account permissioning smart contract configuration", e);
     }
   }
 }
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/ContextualNodePermissioningProvider.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/ContextualNodePermissioningProvider.java
index 988f7de2954..415b97e2fc8 100644
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/ContextualNodePermissioningProvider.java
+++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/ContextualNodePermissioningProvider.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.permissioning.node;
 
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.util.Optional;
 
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/InsufficientPeersPermissioningProvider.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/InsufficientPeersPermissioningProvider.java
index 1ab539077b4..538b68d91f6 100644
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/InsufficientPeersPermissioningProvider.java
+++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/InsufficientPeersPermissioningProvider.java
@@ -15,9 +15,10 @@
 package org.hyperledger.besu.ethereum.permissioning.node;
 
 import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
 import org.hyperledger.besu.ethereum.p2p.rlpx.wire.messages.DisconnectMessage.DisconnectReason;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.util.Subscribers;
 
 import java.util.Collection;
@@ -52,7 +53,7 @@ private boolean isNotABootnode(final PeerConnection peerConnection) {
     return bootnodeEnodes.stream()
         .noneMatch(
             (bootNode) ->
-                EnodeURL.sameListeningEndpoint(peerConnection.getRemoteEnode(), bootNode));
+                EnodeURLImpl.sameListeningEndpoint(peerConnection.getRemoteEnode(), bootNode));
   }
 
   private long countP2PNetworkNonBootnodeConnections() {
@@ -62,7 +63,7 @@ private long countP2PNetworkNonBootnodeConnections() {
   @Override
   public Optional<Boolean> isPermitted(
       final EnodeURL sourceEnode, final EnodeURL destinationEnode) {
-    Optional<EnodeURL> maybeSelfEnode = p2pNetwork.getLocalEnode();
+    final Optional<EnodeURL> maybeSelfEnode = p2pNetwork.getLocalEnode();
     if (nonBootnodePeerConnections > 0) {
       return Optional.empty();
     } else if (!maybeSelfEnode.isPresent()) {
@@ -77,9 +78,9 @@ && checkEnode(maybeSelfEnode.get(), destinationEnode)) {
   }
 
   private boolean checkEnode(final EnodeURL localEnode, final EnodeURL enode) {
-    return (EnodeURL.sameListeningEndpoint(localEnode, enode)
+    return (EnodeURLImpl.sameListeningEndpoint(localEnode, enode)
         || bootnodeEnodes.stream()
-            .anyMatch(bootNode -> EnodeURL.sameListeningEndpoint(bootNode, enode)));
+            .anyMatch(bootNode -> EnodeURLImpl.sameListeningEndpoint(bootNode, enode)));
   }
 
   private void handleConnect(final PeerConnection peerConnection) {
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/NodeAllowlistUpdatedEvent.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/NodeAllowlistUpdatedEvent.java
index b5847469c36..527d515dfe3 100644
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/NodeAllowlistUpdatedEvent.java
+++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/NodeAllowlistUpdatedEvent.java
@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.permissioning.node;
 
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningController.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningController.java
index 2a4ebf78453..2ca141e54dd 100644
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningController.java
+++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningController.java
@@ -14,41 +14,42 @@
  */
 package org.hyperledger.besu.ethereum.permissioning.node;
 
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.permissioning.GoQuorumQip714Gate;
 import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController;
-import org.hyperledger.besu.ethereum.permissioning.QuorumQip714Gate;
 import org.hyperledger.besu.ethereum.permissioning.node.provider.SyncStatusNodePermissioningProvider;
+import org.hyperledger.besu.plugin.data.EnodeURL;
+import org.hyperledger.besu.plugin.services.permissioning.NodeConnectionPermissioningProvider;
 import org.hyperledger.besu.util.Subscribers;
 
 import java.util.List;
 import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class NodePermissioningController {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(NodePermissioningController.class);
 
   private final Optional<SyncStatusNodePermissioningProvider> syncStatusNodePermissioningProvider;
   private Optional<ContextualNodePermissioningProvider> insufficientPeersPermissioningProvider =
       Optional.empty();
-  private final List<NodePermissioningProvider> providers;
-  private final Optional<QuorumQip714Gate> quorumQip714Gate;
+  private final List<NodeConnectionPermissioningProvider> providers;
+  private final Optional<GoQuorumQip714Gate> goQuorumQip714Gate;
   private final Subscribers<Runnable> permissioningUpdateSubscribers = Subscribers.create();
 
   public NodePermissioningController(
       final Optional<SyncStatusNodePermissioningProvider> syncStatusNodePermissioningProvider,
-      final List<NodePermissioningProvider> providers,
-      final Optional<QuorumQip714Gate> quorumQip714Gate) {
+      final List<NodeConnectionPermissioningProvider> providers,
+      final Optional<GoQuorumQip714Gate> goQuorumQip714Gate) {
     this.providers = providers;
     this.syncStatusNodePermissioningProvider = syncStatusNodePermissioningProvider;
-    this.quorumQip714Gate = quorumQip714Gate;
+    this.goQuorumQip714Gate = goQuorumQip714Gate;
   }
 
   public boolean isPermitted(final EnodeURL sourceEnode, final EnodeURL destinationEnode) {
     final boolean checkPermissions =
-        quorumQip714Gate.map(QuorumQip714Gate::shouldCheckPermissions).orElse(true);
+        goQuorumQip714Gate.map(GoQuorumQip714Gate::shouldCheckPermissions).orElse(true);
     if (!checkPermissions) {
       LOG.trace("Skipping node permissioning check due to qip714block config");
 
@@ -58,7 +59,7 @@ public boolean isPermitted(final EnodeURL sourceEnode, final EnodeURL destinatio
     LOG.trace("Node permissioning: Checking {} -> {}", sourceEnode, destinationEnode);
 
     if (syncStatusNodePermissioningProvider
-        .map(p -> !p.hasReachedSync() && p.isPermitted(sourceEnode, destinationEnode))
+        .map(p -> !p.hasReachedSync() && p.isConnectionPermitted(sourceEnode, destinationEnode))
         .orElse(false)) {
 
       LOG.trace(
@@ -84,15 +85,17 @@ public boolean isPermitted(final EnodeURL sourceEnode, final EnodeURL destinatio
     }
 
     if (syncStatusNodePermissioningProvider.isPresent()
-        && !syncStatusNodePermissioningProvider.get().isPermitted(sourceEnode, destinationEnode)) {
+        && !syncStatusNodePermissioningProvider
+            .get()
+            .isConnectionPermitted(sourceEnode, destinationEnode)) {
 
       LOG.trace(
           "Node permissioning - Sync Status: Rejected {} -> {}", sourceEnode, destinationEnode);
 
       return false;
     } else {
-      for (final NodePermissioningProvider provider : providers) {
-        if (!provider.isPermitted(sourceEnode, destinationEnode)) {
+      for (final NodeConnectionPermissioningProvider provider : providers) {
+        if (!provider.isConnectionPermitted(sourceEnode, destinationEnode)) {
           LOG.trace(
               "Node permissioning - {}: Rejected {} -> {}",
               provider.getClass().getSimpleName(),
@@ -121,7 +124,7 @@ public Optional<SyncStatusNodePermissioningProvider> getSyncStatusNodePermission
     return syncStatusNodePermissioningProvider;
   }
 
-  public List<NodePermissioningProvider> getProviders() {
+  public List<NodeConnectionPermissioningProvider> getProviders() {
     return providers;
   }
 
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningProvider.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningProvider.java
deleted file mode 100644
index 94d96f98849..00000000000
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningProvider.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.permissioning.node;
-
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
-
-@FunctionalInterface
-public interface NodePermissioningProvider {
-
-  boolean isPermitted(final EnodeURL sourceEnode, final EnodeURL destinationEnode);
-}
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/PeerPermissionsAdapter.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/PeerPermissionsAdapter.java
index 2c1ec1ca3b8..f5fbb89e80f 100644
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/PeerPermissionsAdapter.java
+++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/PeerPermissionsAdapter.java
@@ -17,19 +17,19 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions;
 import org.hyperledger.besu.ethereum.permissioning.node.provider.SyncStatusNodePermissioningProvider;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.util.List;
 import java.util.Optional;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PeerPermissionsAdapter extends PeerPermissions {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(PeerPermissionsAdapter.class);
 
   private final NodePermissioningController nodePermissioningController;
   private final List<EnodeURL> bootnodes;
@@ -87,7 +87,7 @@ public boolean isPermitted(final Peer localNode, final Peer remotePeer, final Ac
   }
 
   private boolean allowOutboundBonding(final Peer localNode, final Peer remotePeer) {
-    boolean outboundMessagingAllowed = outboundIsPermitted(localNode, remotePeer);
+    final boolean outboundMessagingAllowed = outboundIsPermitted(localNode, remotePeer);
     if (!nodePermissioningController.getSyncStatusNodePermissioningProvider().isPresent()) {
       return outboundMessagingAllowed;
     }
@@ -101,7 +101,7 @@ private boolean allowOutboundBonding(final Peer localNode, final Peer remotePeer
   }
 
   private boolean allowOutboundNeighborsRequests(final Peer localNode, final Peer remotePeer) {
-    boolean outboundMessagingAllowed = outboundIsPermitted(localNode, remotePeer);
+    final boolean outboundMessagingAllowed = outboundIsPermitted(localNode, remotePeer);
     if (!nodePermissioningController.getSyncStatusNodePermissioningProvider().isPresent()) {
       return outboundMessagingAllowed;
     }
diff --git a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/provider/SyncStatusNodePermissioningProvider.java b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/provider/SyncStatusNodePermissioningProvider.java
index ed07c6d550b..873c88e28aa 100644
--- a/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/provider/SyncStatusNodePermissioningProvider.java
+++ b/ethereum/permissioning/src/main/java/org/hyperledger/besu/ethereum/permissioning/node/provider/SyncStatusNodePermissioningProvider.java
@@ -17,11 +17,11 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import org.hyperledger.besu.ethereum.core.Synchronizer;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
-import org.hyperledger.besu.ethereum.permissioning.node.NodePermissioningProvider;
 import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.plugin.services.permissioning.NodeConnectionPermissioningProvider;
 
 import java.net.URI;
 import java.util.Collection;
@@ -29,7 +29,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
-public class SyncStatusNodePermissioningProvider implements NodePermissioningProvider {
+public class SyncStatusNodePermissioningProvider implements NodeConnectionPermissioningProvider {
 
   private final Synchronizer synchronizer;
   private final Set<URI> fixedNodes;
@@ -91,7 +91,8 @@ private void handleInSyncEvent(final boolean isInSync) {
    *     otherwise
    */
   @Override
-  public boolean isPermitted(final EnodeURL sourceEnode, final EnodeURL destinationEnode) {
+  public boolean isConnectionPermitted(
+      final EnodeURL sourceEnode, final EnodeURL destinationEnode) {
     if (hasReachedSync.get()) {
       return true;
     } else {
diff --git a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/AccountLocalConfigPermissioningControllerTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/AccountLocalConfigPermissioningControllerTest.java
index b98927362a8..963d30498ab 100644
--- a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/AccountLocalConfigPermissioningControllerTest.java
+++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/AccountLocalConfigPermissioningControllerTest.java
@@ -25,7 +25,7 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.metrics.BesuMetricCategory;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
@@ -299,7 +299,8 @@ public void reloadAccountAllowlistWithErrorReadingConfigFileShouldKeepOldAllowli
 
     assertThat(thrown)
         .isInstanceOf(RuntimeException.class)
-        .hasMessageContaining("Unable to read permissioning TOML config file");
+        .hasRootCauseMessage(
+            "Unable to read permissioning TOML config file : foo Configuration file does not exist: foo");
 
     assertThat(controller.getAccountAllowlist())
         .containsExactly("0xfe3b557e8fb62b89f4916b721be55ceb828dbd73");
diff --git a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/AllowlistPersistorTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/AllowlistPersistorTest.java
index 27b2f92032f..25cb91c2aa2 100644
--- a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/AllowlistPersistorTest.java
+++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/AllowlistPersistorTest.java
@@ -15,6 +15,8 @@
 package org.hyperledger.besu.ethereum.permissioning;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.hyperledger.besu.ethereum.permissioning.AllowlistPersistor.verifyConfigFileMatchesState;
 
 import org.hyperledger.besu.ethereum.permissioning.AllowlistPersistor.ALLOWLIST_TYPE;
 
@@ -110,6 +112,30 @@ public void outputIsValidTOML() throws IOException {
     assertThat(hasKeyAndExactLineContent(key, expectedValue)).isTrue();
   }
 
+  @Test
+  public void compareContentsWhenEqual_shouldMatch() throws Exception {
+    final ALLOWLIST_TYPE key = ALLOWLIST_TYPE.ACCOUNTS;
+    final List<String> newValue = Lists.newArrayList("account5", "account6", "account4");
+
+    allowlistPersistor.updateConfig(key, newValue);
+
+    assertThat(verifyConfigFileMatchesState(key, newValue, tempFile.toPath())).isTrue();
+  }
+
+  @Test
+  public void compareContentsWhenDifferent_shouldThrow() throws Exception {
+    final ALLOWLIST_TYPE key = ALLOWLIST_TYPE.ACCOUNTS;
+    final List<String> newValue = Lists.newArrayList("account5", "account6", "account4");
+
+    allowlistPersistor.updateConfig(key, newValue);
+
+    assertThatThrownBy(
+            () ->
+                verifyConfigFileMatchesState(
+                    key, Lists.newArrayList("not-the-same"), tempFile.toPath()))
+        .isInstanceOf(AllowlistFileSyncException.class);
+  }
+
   @After
   public void tearDown() {
     tempFile.delete();
diff --git a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/GoQuorumQip714GateTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/GoQuorumQip714GateTest.java
new file mode 100644
index 00000000000..b280e181b38
--- /dev/null
+++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/GoQuorumQip714GateTest.java
@@ -0,0 +1,109 @@
+package org.hyperledger.besu.ethereum.permissioning;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
+import org.hyperledger.besu.ethereum.chain.Blockchain;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
+import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions;
+
+import java.util.Collections;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+public class GoQuorumQip714GateTest {
+
+  private Blockchain blockchain;
+  private GoQuorumQip714Gate gate;
+
+  @Before
+  public void before() {
+    blockchain = mock(Blockchain.class);
+  }
+
+  @Test
+  public void gateShouldSubscribeAsBlockAddedObserver() {
+    gate = new GoQuorumQip714Gate(100, blockchain);
+
+    verify(blockchain).observeBlockAdded(any());
+  }
+
+  @Test
+  public void whenTargetBlockIsZeroCheckPermissionsReturnTrue() {
+    gate = new GoQuorumQip714Gate(0, blockchain);
+
+    assertThat(gate.shouldCheckPermissions()).isTrue();
+  }
+
+  @Test
+  public void whenBelowTargetBlockCheckPermissionsReturnFalse() {
+    gate = new GoQuorumQip714Gate(99, blockchain);
+
+    updateChainHead(55);
+
+    assertThat(gate.shouldCheckPermissions()).isFalse();
+  }
+
+  @Test
+  public void whenAboveTargetBlockCheckPermissionsReturnTrue() {
+    gate = new GoQuorumQip714Gate(99, blockchain);
+
+    updateChainHead(100);
+
+    assertThat(gate.shouldCheckPermissions()).isTrue();
+  }
+
+  @Test
+  public void latestBlockCheckShouldKeepUpToChainHeight() {
+    gate = new GoQuorumQip714Gate(0, blockchain);
+    assertThat(gate.getLatestBlock()).isEqualTo(0);
+
+    updateChainHead(1);
+    assertThat(gate.getLatestBlock()).isEqualTo(1);
+
+    updateChainHead(3);
+    assertThat(gate.getLatestBlock()).isEqualTo(3);
+
+    updateChainHead(2);
+    assertThat(gate.getLatestBlock()).isEqualTo(2);
+  }
+
+  @Test
+  public void getInstanceForbidInstancesWithDifferentQip714BlockNumber() {
+    // creating singleton with qip714block = 1
+    GoQuorumQip714Gate.getInstance(1L, blockchain);
+
+    // creating new instance with qip714block != 1 should fail
+    assertThatThrownBy(() -> GoQuorumQip714Gate.getInstance(2L, blockchain))
+        .isInstanceOf(IllegalStateException.class)
+        .hasMessage(
+            "Tried to create Quorum QIP-714 gate with different block config from already instantiated gate block config");
+  }
+
+  private void updateChainHead(final int height) {
+    final Block block = new BlockDataGenerator().block(new BlockOptions().setBlockNumber(height));
+    gate.checkChainHeight(
+        BlockAddedEvent.createForHeadAdvancement(
+            block, Collections.emptyList(), Collections.emptyList()));
+  }
+}
diff --git a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/LocalPermissioningConfigurationBuilderTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/LocalPermissioningConfigurationBuilderTest.java
index 21dc7785f9e..9cf9030b1d3 100644
--- a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/LocalPermissioningConfigurationBuilderTest.java
+++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/LocalPermissioningConfigurationBuilderTest.java
@@ -20,7 +20,7 @@
 import static org.assertj.core.api.Assertions.catchThrowable;
 import static org.hyperledger.besu.ethereum.p2p.peers.EnodeDnsConfiguration.dnsDisabled;
 
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.peers.ImmutableEnodeDnsConfiguration;
 
 import java.io.IOException;
@@ -76,7 +76,7 @@ public void permissioningConfig_usingDeprecatedKeysIsStillValid() throws Excepti
         .containsExactly("0x0000000000000000000000000000000000000009");
     assertThat(permissioningConfiguration.isNodeAllowlistEnabled()).isTrue();
     assertThat(permissioningConfiguration.getNodeAllowlist())
-        .containsExactly(EnodeURL.fromString(uri), EnodeURL.fromString(uri2));
+        .containsExactly(EnodeURLImpl.fromString(uri), EnodeURLImpl.fromString(uri2));
   }
 
   @Test
@@ -94,7 +94,7 @@ public void permissioningConfig() throws Exception {
         .containsExactly("0x0000000000000000000000000000000000000009");
     assertThat(permissioningConfiguration.isNodeAllowlistEnabled()).isTrue();
     assertThat(permissioningConfiguration.getNodeAllowlist())
-        .containsExactly(EnodeURL.fromString(uri), EnodeURL.fromString(uri2));
+        .containsExactly(EnodeURLImpl.fromString(uri), EnodeURLImpl.fromString(uri2));
   }
 
   @Test
@@ -115,7 +115,7 @@ public void permissioningConfigWithOnlyNodeAllowlistSet() throws Exception {
     assertThat(permissioningConfiguration.isAccountAllowlistEnabled()).isFalse();
     assertThat(permissioningConfiguration.isNodeAllowlistEnabled()).isTrue();
     assertThat(permissioningConfiguration.getNodeAllowlist())
-        .containsExactly(EnodeURL.fromString(uri));
+        .containsExactly(EnodeURLImpl.fromString(uri));
   }
 
   @Test
@@ -137,7 +137,7 @@ public void permissioningConfigWithNodeAllowlistSetWithDnsEnabled() throws Excep
     assertThat(permissioningConfiguration.isAccountAllowlistEnabled()).isFalse();
     assertThat(permissioningConfiguration.isNodeAllowlistEnabled()).isTrue();
     assertThat(permissioningConfiguration.getNodeAllowlist())
-        .containsExactly(EnodeURL.fromString(uri));
+        .containsExactly(EnodeURLImpl.fromString(uri));
   }
 
   @Test
diff --git a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/LocalPermissioningConfigurationTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/LocalPermissioningConfigurationTest.java
index 2fbbf5a9d3d..32a1f9cd694 100644
--- a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/LocalPermissioningConfigurationTest.java
+++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/LocalPermissioningConfigurationTest.java
@@ -16,7 +16,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.util.Arrays;
 
@@ -25,11 +26,11 @@
 public class LocalPermissioningConfigurationTest {
 
   final EnodeURL[] nodes = {
-    EnodeURL.fromString(
+    EnodeURLImpl.fromString(
         "enode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@127.0.0.1:4567"),
-    EnodeURL.fromString(
+    EnodeURLImpl.fromString(
         "enode://7f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@127.0.0.1:4568"),
-    EnodeURL.fromString(
+    EnodeURLImpl.fromString(
         "enode://8f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@127.0.0.1:4569")
   };
 
diff --git a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/NodeLocalConfigPermissioningControllerTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/NodeLocalConfigPermissioningControllerTest.java
index ad703308aef..a579f231177 100644
--- a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/NodeLocalConfigPermissioningControllerTest.java
+++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/NodeLocalConfigPermissioningControllerTest.java
@@ -23,20 +23,22 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.ethereum.p2p.peers.EnodeDnsConfiguration;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.peers.ImmutableEnodeDnsConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController.NodesAllowlistResult;
 import org.hyperledger.besu.ethereum.permissioning.node.NodeAllowlistUpdatedEvent;
 import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.plugin.services.metrics.Counter;
 
 import java.io.IOException;
+import java.net.InetAddress;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -65,7 +67,7 @@ public class NodeLocalConfigPermissioningControllerTest {
   private final String enode2 =
       "enode://5f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@192.168.0.10:4567";
   private final EnodeURL selfEnode =
-      EnodeURL.fromString(
+      EnodeURLImpl.fromString(
           "enode://5f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@192.168.0.10:1111");
   private final String enodeDns =
       "enode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@localhost:4567";
@@ -202,7 +204,9 @@ public void whenNodeIdsAreDifferentItShouldNotBePermitted() {
 
     verifyCountersUntouched();
 
-    assertThat(controller.isPermitted(EnodeURL.fromString(peer2), EnodeURL.fromString(peer1)))
+    assertThat(
+            controller.isConnectionPermitted(
+                EnodeURLImpl.fromString(peer2), EnodeURLImpl.fromString(peer1)))
         .isFalse();
 
     verifyCountersUnpermitted();
@@ -303,18 +307,20 @@ public void whenCheckingIfNodeIsPermittedOrderDoesNotMatter() {
 
     verifyCountersUntouched();
 
-    assertThat(controller.isPermitted(EnodeURL.fromString(enode1), selfEnode)).isTrue();
+    assertThat(controller.isConnectionPermitted(EnodeURLImpl.fromString(enode1), selfEnode))
+        .isTrue();
 
     verifyCountersPermitted();
 
-    assertThat(controller.isPermitted(selfEnode, EnodeURL.fromString(enode1))).isTrue();
+    assertThat(controller.isConnectionPermitted(selfEnode, EnodeURLImpl.fromString(enode1)))
+        .isTrue();
   }
 
   @Test
   public void stateShouldRevertIfAllowlistPersistFails()
       throws IOException, AllowlistFileSyncException {
-    List<String> newNode1 = singletonList(EnodeURL.fromString(enode1).toString());
-    List<String> newNode2 = singletonList(EnodeURL.fromString(enode2).toString());
+    List<String> newNode1 = singletonList(EnodeURLImpl.fromString(enode1).toString());
+    List<String> newNode2 = singletonList(EnodeURLImpl.fromString(enode2).toString());
 
     assertThat(controller.getNodesAllowlist().size()).isEqualTo(0);
 
@@ -344,7 +350,10 @@ public void reloadNodeAllowlistWithValidConfigFileShouldUpdateAllowlist() throws
         .thenReturn(permissionsFile.toAbsolutePath().toString());
     when(permissioningConfig.isNodeAllowlistEnabled()).thenReturn(true);
     when(permissioningConfig.getNodeAllowlist())
-        .thenReturn(Arrays.asList(EnodeURL.fromString(expectedEnodeURL)));
+        .thenReturn(Arrays.asList(EnodeURLImpl.fromString(expectedEnodeURL)));
+    when(permissioningConfig.getEnodeDnsConfiguration())
+        .thenReturn(EnodeDnsConfiguration.dnsDisabled());
+
     controller =
         new NodeLocalConfigPermissioningController(
             permissioningConfig, bootnodesList, selfEnode.getNodeId(), metricsSystem);
@@ -364,7 +373,7 @@ public void reloadNodeAllowlistWithErrorReadingConfigFileShouldKeepOldAllowlist(
     when(permissioningConfig.getNodePermissioningConfigFilePath()).thenReturn("foo");
     when(permissioningConfig.isNodeAllowlistEnabled()).thenReturn(true);
     when(permissioningConfig.getNodeAllowlist())
-        .thenReturn(Arrays.asList(EnodeURL.fromString(expectedEnodeURI)));
+        .thenReturn(Arrays.asList(EnodeURLImpl.fromString(expectedEnodeURI)));
     controller =
         new NodeLocalConfigPermissioningController(
             permissioningConfig, bootnodesList, selfEnode.getNodeId(), metricsSystem);
@@ -373,7 +382,8 @@ public void reloadNodeAllowlistWithErrorReadingConfigFileShouldKeepOldAllowlist(
 
     assertThat(thrown)
         .isInstanceOf(RuntimeException.class)
-        .hasMessageContaining("Unable to read permissioning TOML config file");
+        .hasRootCauseMessage(
+            "Unable to read permissioning TOML config file : foo Configuration file does not exist: foo");
 
     assertThat(controller.getNodesAllowlist()).containsExactly(expectedEnodeURI);
   }
@@ -384,7 +394,7 @@ public void whenAddingNodeShouldNotifyAllowlistModifiedSubscribers() {
     final Consumer<NodeAllowlistUpdatedEvent> consumer = mock(Consumer.class);
     final NodeAllowlistUpdatedEvent expectedEvent =
         new NodeAllowlistUpdatedEvent(
-            Lists.newArrayList(EnodeURL.fromString(enode1)), Collections.emptyList());
+            Lists.newArrayList(EnodeURLImpl.fromString(enode1)), Collections.emptyList());
 
     controller.subscribeToListUpdatedEvent(consumer);
     controller.addNodes(Lists.newArrayList(enode1));
@@ -403,7 +413,7 @@ public void whenAddingNodeDoesNotAddShouldNotNotifyAllowlistModifiedSubscribers(
     // won't add duplicate node
     controller.addNodes(Lists.newArrayList(enode1));
 
-    verifyZeroInteractions(consumer);
+    verifyNoInteractions(consumer);
   }
 
   @Test
@@ -415,7 +425,7 @@ public void whenRemovingNodeShouldNotifyAllowlistModifiedSubscribers() {
     final Consumer<NodeAllowlistUpdatedEvent> consumer = mock(Consumer.class);
     final NodeAllowlistUpdatedEvent expectedEvent =
         new NodeAllowlistUpdatedEvent(
-            Collections.emptyList(), Lists.newArrayList(EnodeURL.fromString(enode1)));
+            Collections.emptyList(), Lists.newArrayList(EnodeURLImpl.fromString(enode1)));
 
     controller.subscribeToListUpdatedEvent(consumer);
     controller.removeNodes(Lists.newArrayList(enode1));
@@ -432,14 +442,14 @@ public void whenRemovingNodeDoesNotRemoveShouldNotifyAllowlistModifiedSubscriber
     // won't remove absent node
     controller.removeNodes(Lists.newArrayList(enode1));
 
-    verifyZeroInteractions(consumer);
+    verifyNoInteractions(consumer);
   }
 
   @Test
   public void whenRemovingBootnodeShouldReturnRemoveBootnodeError() {
     NodesAllowlistResult expected =
         new NodesAllowlistResult(AllowlistOperationResult.ERROR_FIXED_NODE_CANNOT_BE_REMOVED);
-    bootnodesList.add(EnodeURL.fromString(enode1));
+    bootnodesList.add(EnodeURLImpl.fromString(enode1));
     controller.addNodes(Lists.newArrayList(enode1, enode2));
 
     NodesAllowlistResult actualResult = controller.removeNodes(Lists.newArrayList(enode1));
@@ -457,14 +467,17 @@ public void whenReloadingAllowlistShouldNotifyAllowlistModifiedSubscribers() thr
     final Consumer<NodeAllowlistUpdatedEvent> consumer = mock(Consumer.class);
     final NodeAllowlistUpdatedEvent expectedEvent =
         new NodeAllowlistUpdatedEvent(
-            Lists.newArrayList(EnodeURL.fromString(enode2)),
-            Lists.newArrayList(EnodeURL.fromString(enode1)));
+            Lists.newArrayList(EnodeURLImpl.fromString(enode2)),
+            Lists.newArrayList(EnodeURLImpl.fromString(enode1)));
 
     when(permissioningConfig.getNodePermissioningConfigFilePath())
         .thenReturn(permissionsFile.toAbsolutePath().toString());
     when(permissioningConfig.isNodeAllowlistEnabled()).thenReturn(true);
     when(permissioningConfig.getNodeAllowlist())
-        .thenReturn(Arrays.asList(EnodeURL.fromString(enode1)));
+        .thenReturn(Arrays.asList(EnodeURLImpl.fromString(enode1)));
+    when(permissioningConfig.getEnodeDnsConfiguration())
+        .thenReturn(EnodeDnsConfiguration.dnsDisabled());
+
     controller =
         new NodeLocalConfigPermissioningController(
             permissioningConfig, bootnodesList, selfEnode.getNodeId(), metricsSystem);
@@ -488,7 +501,10 @@ public void whenReloadingAllowlistAndNothingChangesShouldNotNotifyAllowlistModif
         .thenReturn(permissionsFile.toAbsolutePath().toString());
     when(permissioningConfig.isNodeAllowlistEnabled()).thenReturn(true);
     when(permissioningConfig.getNodeAllowlist())
-        .thenReturn(Arrays.asList(EnodeURL.fromString(enode1)));
+        .thenReturn(Arrays.asList(EnodeURLImpl.fromString(enode1)));
+    when(permissioningConfig.getEnodeDnsConfiguration())
+        .thenReturn(EnodeDnsConfiguration.dnsDisabled());
+
     controller =
         new NodeLocalConfigPermissioningController(
             permissioningConfig, bootnodesList, selfEnode.getNodeId(), metricsSystem);
@@ -496,7 +512,7 @@ public void whenReloadingAllowlistAndNothingChangesShouldNotNotifyAllowlistModif
 
     controller.reload();
 
-    verifyZeroInteractions(consumer);
+    verifyNoInteractions(consumer);
   }
 
   @Test
@@ -513,7 +529,7 @@ public void getNodeAllowlistShouldWorkWhenOnlyDnsEnabled() throws Exception {
         .thenReturn(permissionsFile.toAbsolutePath().toString());
     when(permissioningConfig.isNodeAllowlistEnabled()).thenReturn(true);
     when(permissioningConfig.getNodeAllowlist())
-        .thenReturn(singletonList(EnodeURL.fromString(enodeDns, enodeDnsConfiguration)));
+        .thenReturn(singletonList(EnodeURLImpl.fromString(enodeDns, enodeDnsConfiguration)));
     controller =
         new NodeLocalConfigPermissioningController(
             permissioningConfig, bootnodesList, selfEnode.getNodeId(), metricsSystem);
@@ -537,12 +553,16 @@ public void getNodeAllowlistShouldWorkWhenDnsAndUpdateEnabled() throws Exception
         .thenReturn(permissionsFile.toAbsolutePath().toString());
     when(permissioningConfig.isNodeAllowlistEnabled()).thenReturn(true);
     when(permissioningConfig.getNodeAllowlist())
-        .thenReturn(singletonList(EnodeURL.fromString(enodeDns, enodeDnsConfiguration)));
+        .thenReturn(singletonList(EnodeURLImpl.fromString(enodeDns, enodeDnsConfiguration)));
     controller =
         new NodeLocalConfigPermissioningController(
             permissioningConfig, bootnodesList, selfEnode.getNodeId(), metricsSystem);
     assertThat(controller.getNodesAllowlist()).hasSize(1);
-    assertThat(controller.getNodesAllowlist()).contains(enodeDns);
+    assertThat(controller.getNodesAllowlist())
+        .contains(
+            "enode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@"
+                + InetAddress.getLocalHost().getHostName()
+                + ":4567");
   }
 
   private Path createPermissionsFileWithNode(final String node) throws IOException {
diff --git a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/NodeSmartContractPermissioningControllerTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/NodeSmartContractPermissioningControllerTest.java
index da5ea0a6ac2..dcfff810ead 100644
--- a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/NodeSmartContractPermissioningControllerTest.java
+++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/NodeSmartContractPermissioningControllerTest.java
@@ -17,20 +17,20 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.config.JsonUtil;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.chain.GenesisState;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.ProtocolScheduleFixture;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 import org.hyperledger.besu.metrics.BesuMetricCategory;
@@ -128,10 +128,10 @@ public void testIpv4Included() throws IOException {
     verifyCountersUntouched();
 
     assertThat(
-            controller.isPermitted(
-                EnodeURL.fromString(
+            controller.isConnectionPermitted(
+                EnodeURLImpl.fromString(
                     "enode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@192.168.0.1:30303"),
-                EnodeURL.fromString(
+                EnodeURLImpl.fromString(
                     "enode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@192.168.0.1:30304")))
         .isTrue();
 
@@ -148,10 +148,10 @@ public void testIpv4DestinationMissing() throws IOException {
     verifyCountersUntouched();
 
     assertThat(
-            controller.isPermitted(
-                EnodeURL.fromString(
+            controller.isConnectionPermitted(
+                EnodeURLImpl.fromString(
                     "enode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@192.168.0.1:30303"),
-                EnodeURL.fromString(
+                EnodeURLImpl.fromString(
                     "enode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@192.168.0.1:30305")))
         .isFalse();
 
@@ -168,10 +168,10 @@ public void testIpv4SourceMissing() throws IOException {
     verifyCountersUntouched();
 
     assertThat(
-            controller.isPermitted(
-                EnodeURL.fromString(
+            controller.isConnectionPermitted(
+                EnodeURLImpl.fromString(
                     "enode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@192.168.0.1:30302"),
-                EnodeURL.fromString(
+                EnodeURLImpl.fromString(
                     "enode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@192.168.0.1:30304")))
         .isFalse();
 
@@ -188,10 +188,10 @@ public void testIpv6Included() throws IOException {
     verifyCountersUntouched();
 
     assertThat(
-            controller.isPermitted(
-                EnodeURL.fromString(
+            controller.isConnectionPermitted(
+                EnodeURLImpl.fromString(
                     "enode://1234000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ab61@[1:2:3:4:5:6:7:8]:30303"),
-                EnodeURL.fromString(
+                EnodeURLImpl.fromString(
                     "enode://1234000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ab62@[1:2:3:4:5:6:7:8]:30304")))
         .isTrue();
 
@@ -208,10 +208,10 @@ public void testIpv6SourceMissing() throws IOException {
     verifyCountersUntouched();
 
     assertThat(
-            controller.isPermitted(
-                EnodeURL.fromString(
+            controller.isConnectionPermitted(
+                EnodeURLImpl.fromString(
                     "enode://1234000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ab63@[1:2:3:4:5:6:7:8]:30303"),
-                EnodeURL.fromString(
+                EnodeURLImpl.fromString(
                     "enode://1234000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ab62@[1:2:3:4:5:6:7:8]:30304")))
         .isFalse();
 
@@ -228,10 +228,10 @@ public void testIpv6DestinationMissing() throws IOException {
     verifyCountersUntouched();
 
     assertThat(
-            controller.isPermitted(
-                EnodeURL.fromString(
+            controller.isConnectionPermitted(
+                EnodeURLImpl.fromString(
                     "enode://1234000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ab61@[1:2:3:4:5:6:7:8]:30303"),
-                EnodeURL.fromString(
+                EnodeURLImpl.fromString(
                     "enode://1234000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ab63@[1:2:3:4:5:6:7:8]:30304")))
         .isFalse();
 
@@ -249,10 +249,10 @@ public void testPermissioningContractMissing() throws IOException {
 
     assertThatThrownBy(
             () ->
-                controller.isPermitted(
-                    EnodeURL.fromString(
+                controller.isConnectionPermitted(
+                    EnodeURLImpl.fromString(
                         "enode://1234000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ab61@[1:2:3:4:5:6:7:8]:30303"),
-                    EnodeURL.fromString(
+                    EnodeURLImpl.fromString(
                         "enode://1234000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ab63@[1:2:3:4:5:6:7:8]:30304")))
         .isInstanceOf(IllegalStateException.class)
         .hasMessage("Permissioning contract does not exist");
@@ -271,10 +271,10 @@ public void testPermissioningContractCorrupt() throws IOException {
 
     assertThatThrownBy(
             () ->
-                controller.isPermitted(
-                    EnodeURL.fromString(
+                controller.isConnectionPermitted(
+                    EnodeURLImpl.fromString(
                         "enode://1234000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ab61@[1:2:3:4:5:6:7:8]:30303"),
-                    EnodeURL.fromString(
+                    EnodeURLImpl.fromString(
                         "enode://1234000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ab63@[1:2:3:4:5:6:7:8]:30304")))
         .isInstanceOf(IllegalStateException.class)
         .hasMessage("Permissioning transaction failed when processing");
diff --git a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/NodeSmartContractV2PermissioningControllerTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/NodeSmartContractV2PermissioningControllerTest.java
index 55312a3d975..4934dd910c4 100644
--- a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/NodeSmartContractV2PermissioningControllerTest.java
+++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/NodeSmartContractV2PermissioningControllerTest.java
@@ -14,6 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.permissioning;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 import static org.mockito.ArgumentMatchers.any;
@@ -23,18 +24,21 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
 import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
 import org.hyperledger.besu.ethereum.transaction.CallParameter;
 import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulatorResult;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
@@ -46,24 +50,24 @@ public class NodeSmartContractV2PermissioningControllerTest {
   /*
    Payloads created using Remix to call method connectionAllowed(string, string, uint16)
   */
-  private static final Bytes SOURCE_ENODE_EXPECTED_PAYLOAD =
+  private static final Bytes SOURCE_ENODE_EXPECTED_PAYLOAD_IP =
       Bytes.fromHexString(
           "0x45a59e5b00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000765f0000000000000000000000000000000000000000000000000000000000000080666362653966383332313834383762336330623530383738313933383830653663323563666438363730386330613062663063613931663063653633333734366138393266653234306166613562396138383062386263613438653861323237303465663933376664646132643763633633653464343165643162343137616500000000000000000000000000000000000000000000000000000000000000093132372e302e302e310000000000000000000000000000000000000000000000");
-  private static final Bytes DESTINATION_ENODE_EXPECTED_PAYLOAD =
+  private static final Bytes DESTINATION_ENODE_EXPECTED_PAYLOAD_IP =
       Bytes.fromHexString(
           "0x45a59e5b000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000009dd40000000000000000000000000000000000000000000000000000000000000080333534386338376239393230666631366161346264636630316338356632353131376132396165313537346437353962616434386363393436336438653966376333633164316539666230643238653733383938393531663930653032373134616262373730666436643232653930333731383832613435363538383030653900000000000000000000000000000000000000000000000000000000000000093132372e302e302e310000000000000000000000000000000000000000000000");
 
   private static final EnodeURL SOURCE_ENODE_IPV4 =
-      EnodeURL.fromString(
+      EnodeURLImpl.fromString(
           "enode://fcbe9f83218487b3c0b50878193880e6c25cfd86708c0a0bf0ca91f0ce633746a892fe240afa5b9a880b8bca48e8a22704ef937fdda2d7cc63e4d41ed1b417ae@127.0.0.1:30303");
   private static final EnodeURL DESTINATION_ENODE_IPV4 =
-      EnodeURL.fromString(
+      EnodeURLImpl.fromString(
           "enode://3548c87b9920ff16aa4bdcf01c85f25117a29ae1574d759bad48cc9463d8e9f7c3c1d1e9fb0d28e73898951f90e02714abb770fd6d22e90371882a45658800e9@127.0.0.1:40404");
   private static final EnodeURL SOURCE_ENODE_IPV6 =
-      EnodeURL.fromString(
+      EnodeURLImpl.fromString(
           "enode://fcbe9f83218487b3c0b50878193880e6c25cfd86708c0a0bf0ca91f0ce633746a892fe240afa5b9a880b8bca48e8a22704ef937fdda2d7cc63e4d41ed1b417ae@[::ffff:7f00:0001]:30303");
   private static final EnodeURL DESTINATION_ENODE_IPV6 =
-      EnodeURL.fromString(
+      EnodeURLImpl.fromString(
           "enode://3548c87b9920ff16aa4bdcf01c85f25117a29ae1574d759bad48cc9463d8e9f7c3c1d1e9fb0d28e73898951f90e02714abb770fd6d22e90371882a45658800e9@[::ffff:7f00:0001]:40404");
 
   private final BlockDataGenerator blockDataGenerator = new BlockDataGenerator();
@@ -85,7 +89,7 @@ public void nonExpectedCallOutputThrowsIllegalState() {
     final TransactionSimulatorResult txSimulatorResult =
         transactionSimulatorResult(Bytes.random(10), ValidationResult.valid());
 
-    when(transactionSimulator.processAtHead(eq(callParams(SOURCE_ENODE_EXPECTED_PAYLOAD))))
+    when(transactionSimulator.processAtHead(eq(callParams(SOURCE_ENODE_EXPECTED_PAYLOAD_IP))))
         .thenReturn(Optional.of(txSimulatorResult));
 
     assertThatIllegalStateException()
@@ -101,7 +105,7 @@ public void falseCallOutputReturnsNotPermitted() {
         transactionSimulatorResult(
             NodeSmartContractV2PermissioningController.FALSE_RESPONSE, ValidationResult.valid());
 
-    when(transactionSimulator.processAtHead(eq(callParams(SOURCE_ENODE_EXPECTED_PAYLOAD))))
+    when(transactionSimulator.processAtHead(eq(callParams(SOURCE_ENODE_EXPECTED_PAYLOAD_IP))))
         .thenReturn(Optional.of(txSimulatorResult));
 
     boolean isPermitted =
@@ -116,7 +120,7 @@ public void failedCallOutputReturnsNotPermitted() {
             NodeSmartContractV2PermissioningController.TRUE_RESPONSE,
             ValidationResult.invalid(TransactionInvalidReason.INTERNAL_ERROR));
 
-    when(transactionSimulator.processAtHead(eq(callParams(SOURCE_ENODE_EXPECTED_PAYLOAD))))
+    when(transactionSimulator.processAtHead(eq(callParams(SOURCE_ENODE_EXPECTED_PAYLOAD_IP))))
         .thenReturn(Optional.of(txSimulatorResult));
 
     boolean isPermitted =
@@ -130,9 +134,9 @@ public void expectedPayloadWhenCheckingPermissioningWithIPV4() {
         transactionSimulatorResult(
             NodeSmartContractV2PermissioningController.TRUE_RESPONSE, ValidationResult.valid());
 
-    when(transactionSimulator.processAtHead(eq(callParams(SOURCE_ENODE_EXPECTED_PAYLOAD))))
+    when(transactionSimulator.processAtHead(eq(callParams(SOURCE_ENODE_EXPECTED_PAYLOAD_IP))))
         .thenReturn(Optional.of(txSimulatorResult));
-    when(transactionSimulator.processAtHead(eq(callParams(DESTINATION_ENODE_EXPECTED_PAYLOAD))))
+    when(transactionSimulator.processAtHead(eq(callParams(DESTINATION_ENODE_EXPECTED_PAYLOAD_IP))))
         .thenReturn(Optional.of(txSimulatorResult));
 
     boolean isPermitted =
@@ -148,9 +152,9 @@ public void expectedPayloadWhenCheckingPermissioningWithIPV6() {
         transactionSimulatorResult(
             NodeSmartContractV2PermissioningController.TRUE_RESPONSE, ValidationResult.valid());
 
-    when(transactionSimulator.processAtHead(eq(callParams(SOURCE_ENODE_EXPECTED_PAYLOAD))))
+    when(transactionSimulator.processAtHead(eq(callParams(SOURCE_ENODE_EXPECTED_PAYLOAD_IP))))
         .thenReturn(Optional.of(txSimulatorResult));
-    when(transactionSimulator.processAtHead(eq(callParams(DESTINATION_ENODE_EXPECTED_PAYLOAD))))
+    when(transactionSimulator.processAtHead(eq(callParams(DESTINATION_ENODE_EXPECTED_PAYLOAD_IP))))
         .thenReturn(Optional.of(txSimulatorResult));
 
     boolean isPermitted =
@@ -160,6 +164,37 @@ public void expectedPayloadWhenCheckingPermissioningWithIPV6() {
     verify(transactionSimulator, times(2)).processAtHead(any());
   }
 
+  @Test
+  public void expectedPayloadWhenCheckingPermissioningWithAlternateDNS()
+      throws UnknownHostException {
+    final TransactionSimulatorResult txSimulatorResultFalse =
+        transactionSimulatorResult(
+            NodeSmartContractV2PermissioningController.FALSE_RESPONSE, ValidationResult.valid());
+
+    final TransactionSimulatorResult txSimulatorResultTrue =
+        transactionSimulatorResult(
+            NodeSmartContractV2PermissioningController.TRUE_RESPONSE, ValidationResult.valid());
+
+    when(transactionSimulator.processAtHead(eq(callParams(SOURCE_ENODE_EXPECTED_PAYLOAD_IP))))
+        .thenReturn(Optional.of(txSimulatorResultFalse));
+    when(transactionSimulator.processAtHead(eq(callParams(DESTINATION_ENODE_EXPECTED_PAYLOAD_IP))))
+        .thenReturn(Optional.of(txSimulatorResultFalse));
+
+    var sourcePayload = sourceEnodeExpectedPayloadDns();
+    when(transactionSimulator.processAtHead(eq(callParams(Bytes.fromHexString(sourcePayload)))))
+        .thenReturn(Optional.of(txSimulatorResultTrue));
+    var destinationPayload = destinationEnodeExpectedPayloadDns();
+    when(transactionSimulator.processAtHead(
+            eq(callParams(Bytes.fromHexString(destinationPayload)))))
+        .thenReturn(Optional.of(txSimulatorResultTrue));
+
+    boolean isPermitted =
+        permissioningController.checkSmartContractRules(SOURCE_ENODE_IPV4, DESTINATION_ENODE_IPV4);
+    assertThat(isPermitted).isTrue();
+
+    verify(transactionSimulator, times(4)).processAtHead(any());
+  }
+
   private CallParameter callParams(final Bytes payload) {
     return new CallParameter(null, contractAddress, -1, null, null, payload);
   }
@@ -171,4 +206,21 @@ private TransactionSimulatorResult transactionSimulatorResult(
         TransactionProcessingResult.successful(
             blockDataGenerator.logs(1, 1), 0L, 0L, output, validationResult));
   }
+
+  // Note - don't use FunctionEncoder.makeFunction here otherwise we're not really testing anything!
+  private String sourceEnodeExpectedPayloadDns() throws UnknownHostException {
+    var hostname = InetAddress.getLocalHost().getHostName();
+    return "0x45a59e5b00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000765f0000000000000000000000000000000000000000000000000000000000000080666362653966383332313834383762336330623530383738313933383830653663323563666438363730386330613062663063613931663063653633333734366138393266653234306166613562396138383062386263613438653861323237303465663933376664646132643763633633653464343165643162343137616500000000000000000000000000000000000000000000000000000000000000"
+        + Bytes.of(hostname.length()).toUnprefixedHexString()
+        + Bytes.of(hostname.getBytes(UTF_8)).toUnprefixedHexString()
+        + "00".repeat(32 - hostname.length());
+  }
+
+  private String destinationEnodeExpectedPayloadDns() throws UnknownHostException {
+    var hostname = InetAddress.getLocalHost().getHostName();
+    return "0x45a59e5b000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000009dd40000000000000000000000000000000000000000000000000000000000000080333534386338376239393230666631366161346264636630316338356632353131376132396165313537346437353962616434386363393436336438653966376333633164316539666230643238653733383938393531663930653032373134616262373730666436643232653930333731383832613435363538383030653900000000000000000000000000000000000000000000000000000000000000"
+        + Bytes.of(hostname.length()).toUnprefixedHexString()
+        + Bytes.of(hostname.getBytes(UTF_8)).toUnprefixedHexString()
+        + "00".repeat(32 - hostname.length());
+  }
 }
diff --git a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/QuorumQip714GateTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/QuorumQip714GateTest.java
deleted file mode 100644
index 6e8155ff3e2..00000000000
--- a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/QuorumQip714GateTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.hyperledger.besu.ethereum.permissioning;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import org.hyperledger.besu.ethereum.chain.BlockAddedEvent;
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Block;
-import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-import org.hyperledger.besu.ethereum.core.BlockDataGenerator.BlockOptions;
-
-import java.util.Collections;
-
-import org.junit.Before;
-import org.junit.Test;
-
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-public class QuorumQip714GateTest {
-
-  private Blockchain blockchain;
-  private QuorumQip714Gate gate;
-
-  @Before
-  public void before() {
-    blockchain = mock(Blockchain.class);
-  }
-
-  @Test
-  public void gateShouldSubscribeAsBlockAddedObserver() {
-    gate = new QuorumQip714Gate(100, blockchain);
-
-    verify(blockchain).observeBlockAdded(any());
-  }
-
-  @Test
-  public void whenTargetBlockIsZeroCheckPermissionsReturnTrue() {
-    gate = new QuorumQip714Gate(0, blockchain);
-
-    assertThat(gate.shouldCheckPermissions()).isTrue();
-  }
-
-  @Test
-  public void whenBelowTargetBlockCheckPermissionsReturnFalse() {
-    gate = new QuorumQip714Gate(99, blockchain);
-
-    updateChainHead(55);
-
-    assertThat(gate.shouldCheckPermissions()).isFalse();
-  }
-
-  @Test
-  public void whenAboveTargetBlockCheckPermissionsReturnTrue() {
-    gate = new QuorumQip714Gate(99, blockchain);
-
-    updateChainHead(100);
-
-    assertThat(gate.shouldCheckPermissions()).isTrue();
-  }
-
-  @Test
-  public void latestBlockCheckShouldKeepUpToChainHeight() {
-    gate = new QuorumQip714Gate(0, blockchain);
-    assertThat(gate.getLatestBlock()).isEqualTo(0);
-
-    updateChainHead(1);
-    assertThat(gate.getLatestBlock()).isEqualTo(1);
-
-    updateChainHead(3);
-    assertThat(gate.getLatestBlock()).isEqualTo(3);
-
-    updateChainHead(2);
-    assertThat(gate.getLatestBlock()).isEqualTo(2);
-  }
-
-  @Test
-  public void getInstanceForbidInstancesWithDifferentQip714BlockNumber() {
-    // creating singleton with qip714block = 1
-    QuorumQip714Gate.getInstance(1L, blockchain);
-
-    // creating new instance with qip714block != 1 should fail
-    assertThatThrownBy(() -> QuorumQip714Gate.getInstance(2L, blockchain))
-        .isInstanceOf(IllegalStateException.class)
-        .hasMessage(
-            "Tried to create Quorum QIP-714 gate with different block config from already instantiated gate block config");
-  }
-
-  private void updateChainHead(final int height) {
-    final Block block = new BlockDataGenerator().block(new BlockOptions().setBlockNumber(height));
-    gate.checkChainHeight(
-        BlockAddedEvent.createForHeadAdvancement(
-            block, Collections.emptyList(), Collections.emptyList()));
-  }
-}
diff --git a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/TransactionSmartContractPermissioningControllerTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/TransactionSmartContractPermissioningControllerTest.java
index d5ad4090370..6136448ccce 100644
--- a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/TransactionSmartContractPermissioningControllerTest.java
+++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/TransactionSmartContractPermissioningControllerTest.java
@@ -17,20 +17,20 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryBlockchain;
-import static org.hyperledger.besu.ethereum.core.InMemoryStorageProvider.createInMemoryWorldStateArchive;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryBlockchain;
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.config.GenesisConfigFile;
-import org.hyperledger.besu.crypto.SECP256K1.Signature;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.chain.GenesisState;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.ProtocolScheduleFixture;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
@@ -104,7 +104,9 @@ private Transaction transactionForAccount(final Address address) {
         .gasLimit(0)
         .payload(Bytes.fromHexString("0x1234"))
         .nonce(1)
-        .signature(Signature.create(BigInteger.ONE, BigInteger.TEN, (byte) 1))
+        .signature(
+            SignatureAlgorithmFactory.getInstance()
+                .createSignature(BigInteger.ONE, BigInteger.TEN, (byte) 1))
         .build();
   }
 
diff --git a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningControllerFactoryTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningControllerFactoryTest.java
index 7c862e3cad1..2c19f3cd37b 100644
--- a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningControllerFactoryTest.java
+++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningControllerFactoryTest.java
@@ -20,8 +20,8 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.permissioning.LocalPermissioningConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.SmartContractPermissioningConfiguration;
diff --git a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningControllerTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningControllerTest.java
index 8ef61236103..b125138a18b 100644
--- a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningControllerTest.java
+++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/account/AccountPermissioningControllerTest.java
@@ -23,7 +23,7 @@
 
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.permissioning.AccountLocalConfigPermissioningController;
-import org.hyperledger.besu.ethereum.permissioning.QuorumQip714Gate;
+import org.hyperledger.besu.ethereum.permissioning.GoQuorumQip714Gate;
 import org.hyperledger.besu.ethereum.permissioning.TransactionSmartContractPermissioningController;
 
 import java.util.Optional;
@@ -41,7 +41,7 @@ public class AccountPermissioningControllerTest {
 
   @Mock private AccountLocalConfigPermissioningController localConfigController;
   @Mock private TransactionSmartContractPermissioningController smartContractController;
-  @Mock private QuorumQip714Gate quorumQip714Gate;
+  @Mock private GoQuorumQip714Gate goQuorumQip714Gate;
 
   @Before
   public void before() {
@@ -109,9 +109,9 @@ public void whenQuorumQip714GateIsNotActiveShouldBypassProviders() {
         new AccountPermissioningController(
             Optional.of(localConfigController),
             Optional.of(smartContractController),
-            Optional.of(quorumQip714Gate));
+            Optional.of(goQuorumQip714Gate));
 
-    when(quorumQip714Gate.shouldCheckPermissions()).thenReturn(false);
+    when(goQuorumQip714Gate.shouldCheckPermissions()).thenReturn(false);
 
     boolean isPermitted = permissioningController.isPermitted(mock(Transaction.class), true, false);
     assertThat(isPermitted).isTrue();
@@ -126,9 +126,9 @@ public void whenQuorumQip714GateIsActiveActiveShouldDelegateToProviders() {
         new AccountPermissioningController(
             Optional.of(localConfigController),
             Optional.of(smartContractController),
-            Optional.of(quorumQip714Gate));
+            Optional.of(goQuorumQip714Gate));
 
-    when(quorumQip714Gate.shouldCheckPermissions()).thenReturn(true);
+    when(goQuorumQip714Gate.shouldCheckPermissions()).thenReturn(true);
 
     permissioningController.isPermitted(mock(Transaction.class), true, false);
 
diff --git a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/InsufficientPeersPermissioningProviderTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/InsufficientPeersPermissioningProviderTest.java
index aa35300c34f..fc0be831506 100644
--- a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/InsufficientPeersPermissioningProviderTest.java
+++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/InsufficientPeersPermissioningProviderTest.java
@@ -21,10 +21,11 @@
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.ethereum.p2p.network.P2PNetwork;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.rlpx.ConnectCallback;
 import org.hyperledger.besu.ethereum.p2p.rlpx.DisconnectCallback;
 import org.hyperledger.besu.ethereum.p2p.rlpx.connections.PeerConnection;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -42,19 +43,19 @@
 public class InsufficientPeersPermissioningProviderTest {
   @Mock private P2PNetwork p2pNetwork;
   private final EnodeURL SELF_ENODE =
-      EnodeURL.fromString(
+      EnodeURLImpl.fromString(
           "enode://00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001@192.168.0.1:30303");
   private final EnodeURL ENODE_2 =
-      EnodeURL.fromString(
+      EnodeURLImpl.fromString(
           "enode://00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002@192.168.0.2:30303");
   private final EnodeURL ENODE_3 =
-      EnodeURL.fromString(
+      EnodeURLImpl.fromString(
           "enode://00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003@192.168.0.3:30303");
   private final EnodeURL ENODE_4 =
-      EnodeURL.fromString(
+      EnodeURLImpl.fromString(
           "enode://00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004@192.168.0.4:30303");
   private final EnodeURL ENODE_5 =
-      EnodeURL.fromString(
+      EnodeURLImpl.fromString(
           "enode://00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005@192.168.0.5:30303");
 
   @Before
@@ -182,21 +183,21 @@ public void firesUpdateWhenNonBootnodeConnects() {
         ArgumentCaptor.forClass(ConnectCallback.class);
 
     verify(p2pNetwork).subscribeConnect(callbackCaptor.capture());
-    final ConnectCallback connectCallback = callbackCaptor.getValue();
+    final ConnectCallback incomingConnectCallback = callbackCaptor.getValue();
 
     final Runnable updatePermsCallback = mock(Runnable.class);
 
     provider.subscribeToUpdates(updatePermsCallback);
 
-    connectCallback.onConnect(peerConnectionMatching(ENODE_2));
+    incomingConnectCallback.onConnect(peerConnectionMatching(ENODE_2));
     verify(updatePermsCallback, times(0)).run();
-    connectCallback.onConnect(peerConnectionMatching(ENODE_3));
+    incomingConnectCallback.onConnect(peerConnectionMatching(ENODE_3));
     verify(updatePermsCallback, times(0)).run();
-    connectCallback.onConnect(peerConnectionMatching(ENODE_4));
+    incomingConnectCallback.onConnect(peerConnectionMatching(ENODE_4));
     verify(updatePermsCallback, times(1)).run();
-    connectCallback.onConnect(peerConnectionMatching(ENODE_5));
+    incomingConnectCallback.onConnect(peerConnectionMatching(ENODE_5));
     verify(updatePermsCallback, times(1)).run();
-    connectCallback.onConnect(peerConnectionMatching(ENODE_3));
+    incomingConnectCallback.onConnect(peerConnectionMatching(ENODE_3));
     verify(updatePermsCallback, times(1)).run();
   }
 
@@ -214,7 +215,7 @@ public void firesUpdateWhenGettingAndLosingConnection() {
     final ArgumentCaptor<ConnectCallback> connectCallbackCaptor =
         ArgumentCaptor.forClass(ConnectCallback.class);
     verify(p2pNetwork).subscribeConnect(connectCallbackCaptor.capture());
-    final ConnectCallback connectCallback = connectCallbackCaptor.getValue();
+    final ConnectCallback incomingConnectCallback = connectCallbackCaptor.getValue();
 
     final ArgumentCaptor<DisconnectCallback> disconnectCallbackCaptor =
         ArgumentCaptor.forClass(DisconnectCallback.class);
@@ -225,13 +226,13 @@ public void firesUpdateWhenGettingAndLosingConnection() {
 
     provider.subscribeToUpdates(updatePermsCallback);
 
-    connectCallback.onConnect(peerConnectionMatching(ENODE_2));
+    incomingConnectCallback.onConnect(peerConnectionMatching(ENODE_2));
     verify(updatePermsCallback, times(0)).run();
-    connectCallback.onConnect(peerConnectionMatching(ENODE_3));
+    incomingConnectCallback.onConnect(peerConnectionMatching(ENODE_3));
     verify(updatePermsCallback, times(0)).run();
-    connectCallback.onConnect(peerConnectionMatching(ENODE_4));
+    incomingConnectCallback.onConnect(peerConnectionMatching(ENODE_4));
     verify(updatePermsCallback, times(1)).run();
-    connectCallback.onConnect(peerConnectionMatching(ENODE_5));
+    incomingConnectCallback.onConnect(peerConnectionMatching(ENODE_5));
     verify(updatePermsCallback, times(1)).run();
     disconnectCallback.onDisconnect(peerConnectionMatching(ENODE_2), null, true);
     verify(updatePermsCallback, times(1)).run();
diff --git a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningControllerFactoryTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningControllerFactoryTest.java
index 627728307a9..a313c4a60ed 100644
--- a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningControllerFactoryTest.java
+++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningControllerFactoryTest.java
@@ -19,10 +19,10 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.Synchronizer;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.permissioning.LocalPermissioningConfiguration;
 import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController;
 import org.hyperledger.besu.ethereum.permissioning.NodePermissioningControllerFactory;
@@ -31,6 +31,8 @@
 import org.hyperledger.besu.ethereum.permissioning.SmartContractPermissioningConfiguration;
 import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.data.EnodeURL;
+import org.hyperledger.besu.plugin.services.permissioning.NodeConnectionPermissioningProvider;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -53,7 +55,7 @@ public class NodePermissioningControllerFactoryTest {
   private final String enode =
       "enode://5f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@192.168.0.10:1111";
   Collection<EnodeURL> bootnodes = Collections.emptyList();
-  EnodeURL selfEnode = EnodeURL.fromString(enode);
+  EnodeURL selfEnode = EnodeURLImpl.fromString(enode);
   LocalPermissioningConfiguration localPermissioningConfig;
   SmartContractPermissioningConfiguration smartContractPermissioningConfiguration;
   PermissioningConfiguration config;
@@ -75,9 +77,10 @@ public void testCreateWithNeitherPermissioningEnabled() {
             selfEnode.getNodeId(),
             transactionSimulator,
             new NoOpMetricsSystem(),
-            blockchain);
+            blockchain,
+            Collections.emptyList());
 
-    List<NodePermissioningProvider> providers = controller.getProviders();
+    List<NodeConnectionPermissioningProvider> providers = controller.getProviders();
     assertThat(providers.size()).isEqualTo(0);
     assertThat(controller.getSyncStatusNodePermissioningProvider()).isNotPresent();
   }
@@ -103,12 +106,13 @@ public void testCreateWithSmartContractNodePermissioningEnabledOnly() {
             selfEnode.getNodeId(),
             transactionSimulator,
             new NoOpMetricsSystem(),
-            blockchain);
+            blockchain,
+            Collections.emptyList());
 
-    List<NodePermissioningProvider> providers = controller.getProviders();
+    List<NodeConnectionPermissioningProvider> providers = controller.getProviders();
     assertThat(providers.size()).isEqualTo(1);
 
-    NodePermissioningProvider p1 = providers.get(0);
+    NodeConnectionPermissioningProvider p1 = providers.get(0);
     assertThat(p1).isInstanceOf(NodeSmartContractPermissioningController.class);
     assertThat(controller.getSyncStatusNodePermissioningProvider()).isEmpty();
   }
@@ -131,12 +135,13 @@ public void testCreateWithLocalNodePermissioningEnabledOnly() {
             selfEnode.getNodeId(),
             transactionSimulator,
             new NoOpMetricsSystem(),
-            blockchain);
+            blockchain,
+            Collections.emptyList());
 
-    List<NodePermissioningProvider> providers = controller.getProviders();
+    List<NodeConnectionPermissioningProvider> providers = controller.getProviders();
     assertThat(providers.size()).isEqualTo(1);
 
-    NodePermissioningProvider p1 = providers.get(0);
+    NodeConnectionPermissioningProvider p1 = providers.get(0);
     assertThat(p1).isInstanceOf(NodeLocalConfigPermissioningController.class);
     assertThat(controller.getSyncStatusNodePermissioningProvider()).isNotPresent();
   }
@@ -167,12 +172,13 @@ public void testCreateWithLocalNodePermissioningEnabledOnly() {
             selfEnode.getNodeId(),
             transactionSimulator,
             new NoOpMetricsSystem(),
-            blockchain);
+            blockchain,
+            Collections.emptyList());
 
-    List<NodePermissioningProvider> providers = controller.getProviders();
+    List<NodeConnectionPermissioningProvider> providers = controller.getProviders();
     assertThat(providers.size()).isEqualTo(1);
 
-    NodePermissioningProvider p1 = providers.get(0);
+    NodeConnectionPermissioningProvider p1 = providers.get(0);
     assertThat(p1).isInstanceOf(NodeLocalConfigPermissioningController.class);
     assertThat(controller.getSyncStatusNodePermissioningProvider()).isNotPresent();
   }
@@ -202,13 +208,14 @@ public void testCreateWithLocalNodeAndSmartContractPermissioningEnabled() {
             selfEnode.getNodeId(),
             transactionSimulator,
             new NoOpMetricsSystem(),
-            blockchain);
+            blockchain,
+            Collections.emptyList());
 
-    List<NodePermissioningProvider> providers = controller.getProviders();
+    List<NodeConnectionPermissioningProvider> providers = controller.getProviders();
     assertThat(providers.size()).isEqualTo(2);
 
-    NodePermissioningProvider p1 = providers.get(0);
-    NodePermissioningProvider p2 = providers.get(1);
+    NodeConnectionPermissioningProvider p1 = providers.get(0);
+    NodeConnectionPermissioningProvider p2 = providers.get(1);
     if (p1.getClass() == NodeLocalConfigPermissioningController.class) {
       assertThat(p2).isInstanceOf(NodeSmartContractPermissioningController.class);
     } else {
@@ -241,7 +248,8 @@ public void testCreateWithSmartContractNodePermissioningEnabledOnlyAndBootnode()
             selfEnode.getNodeId(),
             transactionSimulator,
             new NoOpMetricsSystem(),
-            blockchain);
+            blockchain,
+            Collections.emptyList());
 
     assertThat(controller.getSyncStatusNodePermissioningProvider()).isPresent();
   }
@@ -271,7 +279,8 @@ public void createOnchainShouldFailIfValidationFails() {
                         selfEnode.getNodeId(),
                         transactionSimulator,
                         new NoOpMetricsSystem(),
-                        blockchain));
+                        blockchain,
+                        Collections.emptyList()));
 
     assertThat(thrown)
         .isInstanceOf(IllegalStateException.class)
diff --git a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningControllerTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningControllerTest.java
index a12f2f065e7..77743814d9b 100644
--- a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningControllerTest.java
+++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/NodePermissioningControllerTest.java
@@ -24,10 +24,12 @@
 import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
+import org.hyperledger.besu.ethereum.permissioning.GoQuorumQip714Gate;
 import org.hyperledger.besu.ethereum.permissioning.NodeLocalConfigPermissioningController;
-import org.hyperledger.besu.ethereum.permissioning.QuorumQip714Gate;
 import org.hyperledger.besu.ethereum.permissioning.node.provider.SyncStatusNodePermissioningProvider;
+import org.hyperledger.besu.plugin.data.EnodeURL;
+import org.hyperledger.besu.plugin.services.permissioning.NodeConnectionPermissioningProvider;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -44,24 +46,24 @@
 public class NodePermissioningControllerTest {
 
   private static final EnodeURL enode1 =
-      EnodeURL.fromString(
+      EnodeURLImpl.fromString(
           "enode://94c15d1b9e2fe7ce56e458b9a3b672ef11894ddedd0c6f247e0f1d3487f52b66208fb4aeb8179fce6e3a749ea93ed147c37976d67af557508d199d9594c35f09@192.168.0.2:1234");
   private static final EnodeURL enode2 =
-      EnodeURL.fromString(
+      EnodeURLImpl.fromString(
           "enode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@192.168.0.3:5678");
 
   @Mock private SyncStatusNodePermissioningProvider syncStatusNodePermissioningProvider;
   Optional<SyncStatusNodePermissioningProvider> syncStatusNodePermissioningProviderOptional;
   @Mock private NodeLocalConfigPermissioningController localConfigNodePermissioningProvider;
-  @Mock private NodePermissioningProvider otherPermissioningProvider;
-  @Mock private QuorumQip714Gate quorumQip714Gate;
+  @Mock private NodeConnectionPermissioningProvider otherPermissioningProvider;
+  @Mock private GoQuorumQip714Gate goQuorumQip714Gate;
 
   private NodePermissioningController controller;
 
   @Before
   public void before() {
     syncStatusNodePermissioningProviderOptional = Optional.of(syncStatusNodePermissioningProvider);
-    List<NodePermissioningProvider> emptyProviders = new ArrayList<>();
+    List<NodeConnectionPermissioningProvider> emptyProviders = new ArrayList<>();
     this.controller =
         new NodePermissioningController(
             syncStatusNodePermissioningProviderOptional, emptyProviders, Optional.empty());
@@ -71,43 +73,46 @@ public void before() {
   public void isPermittedShouldDelegateToSyncStatusProvider() {
     controller.isPermitted(enode1, enode2);
 
-    verify(syncStatusNodePermissioningProvider, atLeast(1)).isPermitted(eq(enode1), eq(enode2));
+    verify(syncStatusNodePermissioningProvider, atLeast(1))
+        .isConnectionPermitted(eq(enode1), eq(enode2));
   }
 
   @Test
   public void whenNoSyncStatusProviderWeShouldDelegateToLocalConfigNodePermissioningProvider() {
-    List<NodePermissioningProvider> providers = new ArrayList<>();
+    List<NodeConnectionPermissioningProvider> providers = new ArrayList<>();
     providers.add(localConfigNodePermissioningProvider);
     this.controller =
         new NodePermissioningController(Optional.empty(), providers, Optional.empty());
 
     controller.isPermitted(enode1, enode2);
 
-    verify(localConfigNodePermissioningProvider).isPermitted(eq(enode1), eq(enode2));
+    verify(localConfigNodePermissioningProvider).isConnectionPermitted(eq(enode1), eq(enode2));
   }
 
   @Test
   public void
       whenInSyncWeShouldDelegateToAnyOtherNodePermissioningProviderAndIsPermittedIfAllPermitted() {
-    List<NodePermissioningProvider> providers = getNodePermissioningProviders();
+    List<NodeConnectionPermissioningProvider> providers = getNodePermissioningProviders();
     this.controller =
         new NodePermissioningController(
             syncStatusNodePermissioningProviderOptional, providers, Optional.empty());
 
-    when(syncStatusNodePermissioningProvider.isPermitted(eq(enode1), eq(enode2))).thenReturn(true);
+    when(syncStatusNodePermissioningProvider.isConnectionPermitted(eq(enode1), eq(enode2)))
+        .thenReturn(true);
     when(syncStatusNodePermissioningProvider.hasReachedSync()).thenReturn(true);
-    when(localConfigNodePermissioningProvider.isPermitted(eq(enode1), eq(enode2))).thenReturn(true);
-    when(otherPermissioningProvider.isPermitted(eq(enode1), eq(enode2))).thenReturn(true);
+    when(localConfigNodePermissioningProvider.isConnectionPermitted(eq(enode1), eq(enode2)))
+        .thenReturn(true);
+    when(otherPermissioningProvider.isConnectionPermitted(eq(enode1), eq(enode2))).thenReturn(true);
 
     assertThat(controller.isPermitted(enode1, enode2)).isTrue();
 
-    verify(syncStatusNodePermissioningProvider).isPermitted(eq(enode1), eq(enode2));
-    verify(localConfigNodePermissioningProvider).isPermitted(eq(enode1), eq(enode2));
-    verify(otherPermissioningProvider).isPermitted(eq(enode1), eq(enode2));
+    verify(syncStatusNodePermissioningProvider).isConnectionPermitted(eq(enode1), eq(enode2));
+    verify(localConfigNodePermissioningProvider).isConnectionPermitted(eq(enode1), eq(enode2));
+    verify(otherPermissioningProvider).isConnectionPermitted(eq(enode1), eq(enode2));
   }
 
-  private List<NodePermissioningProvider> getNodePermissioningProviders() {
-    List<NodePermissioningProvider> providers = new ArrayList<>();
+  private List<NodeConnectionPermissioningProvider> getNodePermissioningProviders() {
+    List<NodeConnectionPermissioningProvider> providers = new ArrayList<>();
     providers.add(localConfigNodePermissioningProvider);
     providers.add(otherPermissioningProvider);
     return providers;
@@ -116,27 +121,30 @@ private List<NodePermissioningProvider> getNodePermissioningProviders() {
   @Test
   public void
       whenInSyncWeShouldDelegateToAnyOtherNodePermissioningProviderAndIsNotPermittedIfAnyNotPermitted() {
-    List<NodePermissioningProvider> providers = getNodePermissioningProviders();
+    List<NodeConnectionPermissioningProvider> providers = getNodePermissioningProviders();
 
     this.controller =
         new NodePermissioningController(
             syncStatusNodePermissioningProviderOptional, providers, Optional.empty());
 
-    when(syncStatusNodePermissioningProvider.isPermitted(eq(enode1), eq(enode2))).thenReturn(true);
+    when(syncStatusNodePermissioningProvider.isConnectionPermitted(eq(enode1), eq(enode2)))
+        .thenReturn(true);
     when(syncStatusNodePermissioningProvider.hasReachedSync()).thenReturn(true);
-    when(localConfigNodePermissioningProvider.isPermitted(eq(enode1), eq(enode2))).thenReturn(true);
-    when(otherPermissioningProvider.isPermitted(eq(enode1), eq(enode2))).thenReturn(false);
+    when(localConfigNodePermissioningProvider.isConnectionPermitted(eq(enode1), eq(enode2)))
+        .thenReturn(true);
+    when(otherPermissioningProvider.isConnectionPermitted(eq(enode1), eq(enode2)))
+        .thenReturn(false);
 
     assertThat(controller.isPermitted(enode1, enode2)).isFalse();
 
-    verify(syncStatusNodePermissioningProvider).isPermitted(eq(enode1), eq(enode2));
-    verify(localConfigNodePermissioningProvider).isPermitted(eq(enode1), eq(enode2));
-    verify(otherPermissioningProvider).isPermitted(eq(enode1), eq(enode2));
+    verify(syncStatusNodePermissioningProvider).isConnectionPermitted(eq(enode1), eq(enode2));
+    verify(localConfigNodePermissioningProvider).isConnectionPermitted(eq(enode1), eq(enode2));
+    verify(otherPermissioningProvider).isConnectionPermitted(eq(enode1), eq(enode2));
   }
 
   @Test
   public void shouldStopAtInsufficientPeersWhenInsufficientAndBootnode() {
-    final List<NodePermissioningProvider> providers = getNodePermissioningProviders();
+    final List<NodeConnectionPermissioningProvider> providers = getNodePermissioningProviders();
 
     this.controller =
         new NodePermissioningController(
@@ -154,12 +162,12 @@ public void shouldStopAtInsufficientPeersWhenInsufficientAndBootnode() {
     assertThat(controller.isPermitted(enode1, enode2)).isTrue();
 
     verify(insufficientPeersPermissioningProvider, times(1)).isPermitted(any(), any());
-    providers.forEach(p -> verify(p, times(0)).isPermitted(any(), any()));
+    providers.forEach(p -> verify(p, times(0)).isConnectionPermitted(any(), any()));
   }
 
   @Test
   public void doesntStopAtInsufficientPeersWhenNoAnswer() {
-    final List<NodePermissioningProvider> providers = getNodePermissioningProviders();
+    final List<NodeConnectionPermissioningProvider> providers = getNodePermissioningProviders();
 
     this.controller =
         new NodePermissioningController(
@@ -168,20 +176,20 @@ public void doesntStopAtInsufficientPeersWhenNoAnswer() {
     final ContextualNodePermissioningProvider insufficientPeersPermissioningProvider =
         mock(ContextualNodePermissioningProvider.class);
 
-    when(syncStatusNodePermissioningProvider.isPermitted(any(), any())).thenReturn(true);
+    when(syncStatusNodePermissioningProvider.isConnectionPermitted(any(), any())).thenReturn(true);
     when(syncStatusNodePermissioningProvider.hasReachedSync()).thenReturn(true);
     when(insufficientPeersPermissioningProvider.isPermitted(any(), any()))
         .thenReturn(Optional.empty());
-    when(localConfigNodePermissioningProvider.isPermitted(any(), any())).thenReturn(true);
-    when(otherPermissioningProvider.isPermitted(any(), any())).thenReturn(true);
+    when(localConfigNodePermissioningProvider.isConnectionPermitted(any(), any())).thenReturn(true);
+    when(otherPermissioningProvider.isConnectionPermitted(any(), any())).thenReturn(true);
 
     controller.setInsufficientPeersPermissioningProvider(insufficientPeersPermissioningProvider);
 
     assertThat(controller.isPermitted(enode1, enode2)).isTrue();
 
-    verify(syncStatusNodePermissioningProvider, times(1)).isPermitted(any(), any());
+    verify(syncStatusNodePermissioningProvider, times(1)).isConnectionPermitted(any(), any());
     verify(insufficientPeersPermissioningProvider, times(1)).isPermitted(any(), any());
-    providers.forEach(p -> verify(p, times(1)).isPermitted(any(), any()));
+    providers.forEach(p -> verify(p, times(1)).isConnectionPermitted(any(), any()));
   }
 
   @Test
@@ -192,7 +200,8 @@ public void whenQuorumQip714GateIsEmptyShouldDelegateToProviders() {
 
     controller.isPermitted(enode1, enode2);
 
-    verify(syncStatusNodePermissioningProvider, atLeast(1)).isPermitted(eq(enode1), eq(enode2));
+    verify(syncStatusNodePermissioningProvider, atLeast(1))
+        .isConnectionPermitted(eq(enode1), eq(enode2));
   }
 
   @Test
@@ -201,9 +210,9 @@ public void whenQuorumQip714GateIsNotActiveShouldBypassProviders() {
         new NodePermissioningController(
             syncStatusNodePermissioningProviderOptional,
             Collections.emptyList(),
-            Optional.of(quorumQip714Gate));
+            Optional.of(goQuorumQip714Gate));
 
-    when(quorumQip714Gate.shouldCheckPermissions()).thenReturn(false);
+    when(goQuorumQip714Gate.shouldCheckPermissions()).thenReturn(false);
 
     assertThat(controller.isPermitted(enode1, enode2)).isTrue();
 
@@ -216,12 +225,13 @@ public void whenQuorumQip714GateIsActiveShouldDelegateToProviders() {
         new NodePermissioningController(
             syncStatusNodePermissioningProviderOptional,
             Collections.emptyList(),
-            Optional.of(quorumQip714Gate));
+            Optional.of(goQuorumQip714Gate));
 
-    when(quorumQip714Gate.shouldCheckPermissions()).thenReturn(true);
+    when(goQuorumQip714Gate.shouldCheckPermissions()).thenReturn(true);
 
     controller.isPermitted(enode1, enode2);
 
-    verify(syncStatusNodePermissioningProvider, atLeast(1)).isPermitted(eq(enode1), eq(enode2));
+    verify(syncStatusNodePermissioningProvider, atLeast(1))
+        .isConnectionPermitted(eq(enode1), eq(enode2));
   }
 }
diff --git a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/PeerPermissionsAdapterTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/PeerPermissionsAdapterTest.java
index e0b6d8ce7ce..90d434f0163 100644
--- a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/PeerPermissionsAdapterTest.java
+++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/PeerPermissionsAdapterTest.java
@@ -21,12 +21,13 @@
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockDataGenerator;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
 import org.hyperledger.besu.ethereum.p2p.peers.DefaultPeer;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
 import org.hyperledger.besu.ethereum.p2p.peers.Peer;
 import org.hyperledger.besu.ethereum.p2p.permissions.PeerPermissions.Action;
 import org.hyperledger.besu.ethereum.permissioning.node.provider.SyncStatusNodePermissioningProvider;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,7 +45,7 @@ public class PeerPermissionsAdapterTest {
       mock(NodePermissioningController.class);
   private final BlockDataGenerator gen = new BlockDataGenerator();
   private final MutableBlockchain blockchain =
-      InMemoryStorageProvider.createInMemoryBlockchain(gen.genesisBlock());
+      InMemoryKeyValueStorageProvider.createInMemoryBlockchain(gen.genesisBlock());
   private final List<EnodeURL> bootNodes = new ArrayList<>();
   private final PeerPermissionsAdapter adapter =
       new PeerPermissionsAdapter(nodePermissioningController, bootNodes, blockchain);
@@ -397,7 +398,7 @@ private void mockControllerPermissions(
 
   private Peer createPeer() {
     return DefaultPeer.fromEnodeURL(
-        EnodeURL.builder()
+        EnodeURLImpl.builder()
             .ipAddress("127.0.0.1")
             .nodeId(Peer.randomId())
             .useDefaultPorts()
diff --git a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/provider/SyncStatusNodePermissioningProviderTest.java b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/provider/SyncStatusNodePermissioningProviderTest.java
index 74d7b09cefb..a261fb18ab0 100644
--- a/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/provider/SyncStatusNodePermissioningProviderTest.java
+++ b/ethereum/permissioning/src/test/java/org/hyperledger/besu/ethereum/permissioning/node/provider/SyncStatusNodePermissioningProviderTest.java
@@ -23,11 +23,15 @@
 
 import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.core.Synchronizer.InSyncListener;
-import org.hyperledger.besu.ethereum.p2p.peers.EnodeURL;
+import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
+import org.hyperledger.besu.ethereum.p2p.peers.ImmutableEnodeDnsConfiguration;
 import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.data.EnodeURL;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.plugin.services.metrics.Counter;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.function.IntSupplier;
@@ -49,13 +53,13 @@ public class SyncStatusNodePermissioningProviderTest {
   private IntSupplier syncGauge;
 
   private static final EnodeURL bootnode =
-      EnodeURL.fromString(
+      EnodeURLImpl.fromString(
           "enode://6332792c4a00e3e4ee0926ed89e0d27ef985424d97b6a45bf0f23e51f0dcb5e66b875777506458aea7af6f9e4ffb69f43f3778ee73c81ed9d34c51c4b16b0b0f@192.168.0.1:9999");
   private static final EnodeURL enode1 =
-      EnodeURL.fromString(
+      EnodeURLImpl.fromString(
           "enode://94c15d1b9e2fe7ce56e458b9a3b672ef11894ddedd0c6f247e0f1d3487f52b66208fb4aeb8179fce6e3a749ea93ed147c37976d67af557508d199d9594c35f09@192.168.0.2:1234");
   private static final EnodeURL enode2 =
-      EnodeURL.fromString(
+      EnodeURLImpl.fromString(
           "enode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@192.168.0.3:5678");
 
   @Mock private Synchronizer synchronizer;
@@ -142,7 +146,7 @@ public void whenHasNotSyncedNonBootnodeShouldNotBePermitted() {
     assertThat(provider.hasReachedSync()).isFalse();
     assertThat(syncGauge.getAsInt()).isEqualTo(0);
 
-    boolean isPermitted = provider.isPermitted(enode1, enode2);
+    boolean isPermitted = provider.isConnectionPermitted(enode1, enode2);
 
     assertThat(isPermitted).isFalse();
     verify(checkCounter, times(1)).inc();
@@ -155,7 +159,7 @@ public void whenHasNotSyncedBootnodeIncomingConnectionShouldNotBePermitted() {
     assertThat(provider.hasReachedSync()).isFalse();
     assertThat(syncGauge.getAsInt()).isEqualTo(0);
 
-    boolean isPermitted = provider.isPermitted(bootnode, enode1);
+    boolean isPermitted = provider.isConnectionPermitted(bootnode, enode1);
 
     assertThat(isPermitted).isFalse();
     verify(checkCounter, times(1)).inc();
@@ -168,7 +172,7 @@ public void whenHasNotSyncedBootnodeOutgoingConnectionShouldBePermitted() {
     assertThat(provider.hasReachedSync()).isFalse();
     assertThat(syncGauge.getAsInt()).isEqualTo(0);
 
-    boolean isPermitted = provider.isPermitted(enode1, bootnode);
+    boolean isPermitted = provider.isConnectionPermitted(enode1, bootnode);
 
     assertThat(isPermitted).isTrue();
     verify(checkCounter, times(1)).inc();
@@ -182,7 +186,7 @@ public void whenOutOfSyncNonBootnodeShouldNotBePermitted() {
     assertThat(provider.hasReachedSync()).isFalse();
     assertThat(syncGauge.getAsInt()).isEqualTo(0);
 
-    boolean isPermitted = provider.isPermitted(enode1, enode2);
+    boolean isPermitted = provider.isConnectionPermitted(enode1, enode2);
 
     assertThat(isPermitted).isFalse();
     verify(checkCounter, times(1)).inc();
@@ -196,7 +200,7 @@ public void whenOutOfSyncBootnodeIncomingConnectionShouldNotBePermitted() {
     assertThat(provider.hasReachedSync()).isFalse();
     assertThat(syncGauge.getAsInt()).isEqualTo(0);
 
-    boolean isPermitted = provider.isPermitted(bootnode, enode1);
+    boolean isPermitted = provider.isConnectionPermitted(bootnode, enode1);
 
     assertThat(isPermitted).isFalse();
     verify(checkCounter, times(1)).inc();
@@ -210,7 +214,7 @@ public void whenOutOfSyncBootnodeOutgoingConnectionShouldBePermitted() {
     assertThat(provider.hasReachedSync()).isFalse();
     assertThat(syncGauge.getAsInt()).isEqualTo(0);
 
-    boolean isPermitted = provider.isPermitted(enode1, bootnode);
+    boolean isPermitted = provider.isConnectionPermitted(enode1, bootnode);
 
     assertThat(isPermitted).isTrue();
     verify(checkCounter, times(1)).inc();
@@ -224,7 +228,7 @@ public void whenHasSyncedIsPermittedShouldReturnTrue() {
     assertThat(provider.hasReachedSync()).isTrue();
     assertThat(syncGauge.getAsInt()).isEqualTo(1);
 
-    boolean isPermitted = provider.isPermitted(enode1, enode2);
+    boolean isPermitted = provider.isConnectionPermitted(enode1, enode2);
 
     assertThat(isPermitted).isTrue();
     verify(checkCounter, times(0)).inc();
@@ -238,17 +242,59 @@ public void syncStatusPermissioningCheckShouldIgnoreEnodeURLDiscoveryPort() {
     assertThat(provider.hasReachedSync()).isFalse();
 
     final EnodeURL bootnode =
-        EnodeURL.fromString(
+        EnodeURLImpl.fromString(
             "enode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@192.168.0.3:5678");
     final EnodeURL enodeWithDiscoveryPort =
-        EnodeURL.fromString(
+        EnodeURLImpl.fromString(
             "enode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@192.168.0.3:5678?discport=30303");
 
     final SyncStatusNodePermissioningProvider provider =
         new SyncStatusNodePermissioningProvider(
             synchronizer, Lists.newArrayList(bootnode), metricsSystem);
 
-    boolean isPermitted = provider.isPermitted(enode1, enodeWithDiscoveryPort);
+    boolean isPermitted = provider.isConnectionPermitted(enode1, enodeWithDiscoveryPort);
+
+    assertThat(isPermitted).isTrue();
+  }
+
+  @Test
+  public void syncStatusPermissioningCheckShouldAllowDNS() throws UnknownHostException {
+    inSyncListener.onInSyncStatusChange(false);
+    assertThat(provider.hasReachedSync()).isFalse();
+
+    EnodeURL bootnode =
+        EnodeURLImpl.builder()
+            .nodeId(
+                "6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0")
+            .listeningPort(9999)
+            .disableDiscovery()
+            .ipAddress(
+                InetAddress.getLocalHost().getCanonicalHostName(),
+                ImmutableEnodeDnsConfiguration.builder()
+                    .dnsEnabled(true)
+                    .updateEnabled(true)
+                    .build())
+            .build();
+
+    EnodeURL enodeWithIP =
+        EnodeURLImpl.builder()
+            .nodeId(
+                "6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0")
+            .listeningPort(9999)
+            .disableDiscovery()
+            .ipAddress(
+                InetAddress.getLocalHost().getHostAddress(),
+                ImmutableEnodeDnsConfiguration.builder()
+                    .dnsEnabled(true)
+                    .updateEnabled(true)
+                    .build())
+            .build();
+
+    final SyncStatusNodePermissioningProvider provider =
+        new SyncStatusNodePermissioningProvider(
+            synchronizer, Lists.newArrayList(bootnode), metricsSystem);
+
+    boolean isPermitted = provider.isConnectionPermitted(enode1, enodeWithIP);
 
     assertThat(isPermitted).isTrue();
   }
diff --git a/ethereum/permissioning/src/test/resources/NodeSmartContractPermissioningControllerTest/corruptSmartPermissioning.json b/ethereum/permissioning/src/test/resources/NodeSmartContractPermissioningControllerTest/corruptSmartPermissioning.json
index c67f6b7d4e2..19d6df53108 100644
--- a/ethereum/permissioning/src/test/resources/NodeSmartContractPermissioningControllerTest/corruptSmartPermissioning.json
+++ b/ethereum/permissioning/src/test/resources/NodeSmartContractPermissioningControllerTest/corruptSmartPermissioning.json
@@ -1,14 +1,7 @@
 {
   "config": {
     "chainId": 2018,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
-    "byzantiumBlock": 0,
-    "constantinopleBlock": 0,
-    "constantinopleFixBlock": 0,
+    "petersburgBlock": 0,
     "ethash": {
       "fixeddifficulty": 100
     }
diff --git a/ethereum/permissioning/src/test/resources/NodeSmartContractPermissioningControllerTest/noSmartPermissioning.json b/ethereum/permissioning/src/test/resources/NodeSmartContractPermissioningControllerTest/noSmartPermissioning.json
index 27aa588c395..384502681b2 100644
--- a/ethereum/permissioning/src/test/resources/NodeSmartContractPermissioningControllerTest/noSmartPermissioning.json
+++ b/ethereum/permissioning/src/test/resources/NodeSmartContractPermissioningControllerTest/noSmartPermissioning.json
@@ -1,14 +1,7 @@
 {
   "config": {
     "chainId": 2018,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
-    "byzantiumBlock": 0,
-    "constantinopleBlock": 0,
-    "constantinopleFixBlock": 0,
+    "petersburgBlock": 0,
     "ethash": {
       "fixeddifficulty": 100
     }
diff --git a/ethereum/permissioning/src/test/resources/NodeSmartContractPermissioningControllerTest/preseededSmartPermissioning.json b/ethereum/permissioning/src/test/resources/NodeSmartContractPermissioningControllerTest/preseededSmartPermissioning.json
index 309d1a9ff35..87c35c216e7 100644
--- a/ethereum/permissioning/src/test/resources/NodeSmartContractPermissioningControllerTest/preseededSmartPermissioning.json
+++ b/ethereum/permissioning/src/test/resources/NodeSmartContractPermissioningControllerTest/preseededSmartPermissioning.json
@@ -1,14 +1,7 @@
 {
   "config": {
     "chainId": 2018,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
-    "byzantiumBlock": 0,
-    "constantinopleBlock": 0,
-    "constantinopleFixBlock": 0,
+    "petersburgBlock": 0,
     "ethash": {
       "fixeddifficulty": 100
     }
diff --git a/ethereum/permissioning/src/test/resources/TransactionSmartContractPermissioningControllerTest/corruptSmartPermissioning.json b/ethereum/permissioning/src/test/resources/TransactionSmartContractPermissioningControllerTest/corruptSmartPermissioning.json
index 4b59f298d5a..09929905337 100644
--- a/ethereum/permissioning/src/test/resources/TransactionSmartContractPermissioningControllerTest/corruptSmartPermissioning.json
+++ b/ethereum/permissioning/src/test/resources/TransactionSmartContractPermissioningControllerTest/corruptSmartPermissioning.json
@@ -1,14 +1,7 @@
 {
   "config": {
     "chainId": 2018,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
-    "byzantiumBlock": 0,
-    "constantinopleBlock": 0,
-    "constantinopleFixBlock": 0,
+    "petersburgBlock": 0,
     "ethash": {
       "fixeddifficulty": 100
     }
diff --git a/ethereum/permissioning/src/test/resources/TransactionSmartContractPermissioningControllerTest/noSmartPermissioning.json b/ethereum/permissioning/src/test/resources/TransactionSmartContractPermissioningControllerTest/noSmartPermissioning.json
index 27aa588c395..384502681b2 100644
--- a/ethereum/permissioning/src/test/resources/TransactionSmartContractPermissioningControllerTest/noSmartPermissioning.json
+++ b/ethereum/permissioning/src/test/resources/TransactionSmartContractPermissioningControllerTest/noSmartPermissioning.json
@@ -1,14 +1,7 @@
 {
   "config": {
     "chainId": 2018,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
-    "byzantiumBlock": 0,
-    "constantinopleBlock": 0,
-    "constantinopleFixBlock": 0,
+    "petersburgBlock": 0,
     "ethash": {
       "fixeddifficulty": 100
     }
diff --git a/ethereum/permissioning/src/test/resources/TransactionSmartContractPermissioningControllerTest/preseededSmartPermissioning.json b/ethereum/permissioning/src/test/resources/TransactionSmartContractPermissioningControllerTest/preseededSmartPermissioning.json
index 6dd7ef265d3..a2c472b93d0 100644
--- a/ethereum/permissioning/src/test/resources/TransactionSmartContractPermissioningControllerTest/preseededSmartPermissioning.json
+++ b/ethereum/permissioning/src/test/resources/TransactionSmartContractPermissioningControllerTest/preseededSmartPermissioning.json
@@ -1,14 +1,7 @@
 {
   "config": {
     "chainId": 2018,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
-    "byzantiumBlock": 0,
-    "constantinopleBlock": 0,
-    "constantinopleFixBlock": 0,
+    "petersburgBlock": 0,
     "ethash": {
       "fixeddifficulty": 100
     }
diff --git a/ethereum/referencetests/build.gradle b/ethereum/referencetests/build.gradle
index 0d9470d6660..49dc6109074 100644
--- a/ethereum/referencetests/build.gradle
+++ b/ethereum/referencetests/build.gradle
@@ -13,38 +13,161 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+def blockchainReferenceTests = tasks.register("blockchainReferenceTests")  {
+  final referenceTestsPath = 'src/reference-test/external-resources/BlockchainTests'
+  final generatedTestsPath = "$buildDir/generated/sources/reference-test/$name/java"
+  inputs.files fileTree(referenceTestsPath),
+    fileTree(generatedTestsPath)
+  outputs.files generatedTestsPath
+  generateTestFiles(
+    fileTree(referenceTestsPath),
+    file("src/reference-test/templates/BlockchainReferenceTest.java.template"),
+    "BlockchainTests",
+    "$generatedTestsPath/org/hyperledger/besu/ethereum/vm/blockchain",
+    "BlockchainReferenceTest",
+    ("BlockchainTests/InvalidBlocks/bcExpectSection") // exclude test for test filling tool
+    )
+}
+
+configurations {
+  // we need this because referenceTestImplementation defaults to 'canBeResolved=false'.
+  tarConfig.extendsFrom referenceTestImplementation
+  tarConfig {
+    canBeResolved = true
+    canBeConsumed = false
+  }
+}
+
+def executionSpecTests = tasks.register("executionSpecTests") {
+  final referenceTestsPath = "$buildDir/execution-spec-tests/"
+  final generatedTestsPath = "$buildDir/generated/sources/reference-test/$name/java"
+  def tarPath = configurations.tarConfig.files.find{ it.name.startsWith('execution-spec-tests')}
+
+  copy {
+    from tarTree(tarPath)
+    into "$referenceTestsPath"
+  }
+
+  inputs.files fileTree(referenceTestsPath), fileTree(generatedTestsPath)
+  outputs.files generatedTestsPath
+  generateTestFiles(
+    fileTree(referenceTestsPath + "/fixtures"),
+    file("src/reference-test/templates/BlockchainReferenceTest.java.template"),
+    "fixtures",
+    "$generatedTestsPath/org/hyperledger/besu/ethereum/vm/executionspec",
+    "ExecutionSpecTest",
+    ("fixtures/example/example") // exclude test for test filling tool
+    )
+}
+
+def generalstateReferenceTests = tasks.register("generalstateReferenceTests")  {
+  final referenceTestsPath = "src/reference-test/external-resources/GeneralStateTests"
+  final generatedTestsPath = "$buildDir/generated/sources/reference-test/$name/java"
+  inputs.files fileTree(referenceTestsPath),
+    fileTree(generatedTestsPath)
+  outputs.files generatedTestsPath
+  generateTestFiles(
+    fileTree(referenceTestsPath),
+    file("src/reference-test/templates/GeneralStateReferenceTest.java.template"),
+    "GeneralStateTests",
+    "$generatedTestsPath/org/hyperledger/besu/ethereum/vm/generalstate",
+    "GeneralStateReferenceTest"
+    )
+}
+
+def generalstateRegressionReferenceTests = tasks.register("generalstateRegressionReferenceTests") {
+  final referenceTestsPath = "src/reference-test/resources/regressions/generalstate"
+  final generatedTestsPath = "$buildDir/generated/sources/reference-test/$name/java"
+  inputs.files fileTree(referenceTestsPath),
+    fileTree(generatedTestsPath)
+  outputs.files generatedTestsPath
+  generateTestFiles(
+    fileTree(referenceTestsPath),
+    file("src/reference-test/templates/GeneralStateReferenceTest.java.template"),
+    "regressions",
+    "$generatedTestsPath/org/hyperledger/besu/ethereum/vm/generalstate",
+    "GeneralStateRegressionReferenceTest"
+    )
+}
+
 sourceSets {
-  test {
+  referenceTest {
+    java {
+      compileClasspath += main.output
+      runtimeClasspath += main.output
+      srcDirs "src/reference-test/java",
+        blockchainReferenceTests,
+        executionSpecTests,
+        generalstateReferenceTests,
+        generalstateRegressionReferenceTests
+    }
     resources {
-      include '*Tests/**/*.json'
+      srcDirs 'src/reference-test/resources',
+        'src/reference-test/external-resources',
+        'src/reference-test/templates',
+        'build/execution-spec-tests/'
     }
   }
 }
 
-configurations { testOutput }
-
 dependencies {
   implementation project(':config')
-  implementation project(':crypto')
+  implementation project(':crypto:algorithms')
+  implementation project(':datatypes')
   implementation project(':ethereum:core')
   implementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
   implementation project(':ethereum:rlp')
+  implementation project(':evm')
   implementation project(':services:kvstore')
 
   implementation 'com.fasterxml.jackson.core:jackson-databind'
   implementation 'com.google.guava:guava'
 
-  testOutput sourceSets.test.output
+  referenceTestImplementation project(path: ':config')
+  referenceTestImplementation project(path: ':datatypes')
+  referenceTestImplementation project(path: ':ethereum:core')
+  referenceTestImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
+  referenceTestImplementation project(path: ':ethereum:rlp')
+  referenceTestImplementation project(path: ':ethereum:rlp', configuration: 'testSupportArtifacts')
+  referenceTestImplementation project(path: ':ethereum:trie')
+  referenceTestImplementation project(path: ':evm')
+  referenceTestImplementation project(path: ':plugin-api')
+  referenceTestImplementation project(path: ':testutil')
+  referenceTestImplementation project(path: ':util')
+  // the following will be resolved via custom ivy repository declared in root build.gradle
+  referenceTestImplementation 'ethereum:execution-spec-tests:0.2.3:fixtures@tar.gz'
+  referenceTestImplementation 'com.fasterxml.jackson.core:jackson-databind'
+  referenceTestImplementation 'com.google.guava:guava'
+  referenceTestImplementation 'org.apache.tuweni:tuweni-bytes'
+  referenceTestImplementation 'org.apache.tuweni:tuweni-units'
+  referenceTestImplementation 'org.assertj:assertj-core'
+  referenceTestImplementation 'org.junit.jupiter:junit-jupiter-api'
+  referenceTestImplementation 'org.junit.jupiter:junit-jupiter-params'
+
+  referenceTestRuntimeOnly 'org.junit.jupiter:junit-jupiter'
 }
 
-task ('validateReferenceTestSubmodule') {
-  description = "Checks that the reference tests submodule is not accidentially changed"
+tasks.register('referenceTests', Test) {
+  useJUnitPlatform()
+  doFirst {
+    if (!file("src/reference-test/external-resources/README.md").exists()) {
+      throw new GradleException("ethereum/referencetest/src/reference-test/external-resources/README.md missing: please clone submodules (git submodule update --init --recursive)")
+    }
+  }
+  description = 'Runs ETH reference tests.'
+  testClassesDirs = sourceSets.referenceTest.output.classesDirs
+  classpath = sourceSets.referenceTest.runtimeClasspath
+}
+
+tasks.register('validateReferenceTestSubmodule') {
+  description = "Checks that the reference tests submodule is not accidentally changed"
   doLast {
-    def expectedHash = 'b8abaebf5949877ead03e8f74ac03c0ede41d5f7'
     def result = new ByteArrayOutputStream()
+    def expectedHash = '04f338a6e673a6b4d906ec9d6d2bc939309357a5'
+    def submodulePath = java.nio.file.Path.of("${rootProject.projectDir}", "ethereum/referencetests/src/reference-test/external-resources").toAbsolutePath()
     try {
       exec {
-        commandLine 'git', 'submodule'
+        commandLine 'git', 'submodule', 'status', submodulePath
         standardOutput = result
         errorOutput = result
       }
@@ -53,9 +176,10 @@ task ('validateReferenceTestSubmodule') {
       // The CI servers have git and that is the only critical place for this failure
       expectedHash = ''
     }
+
     if (!result.toString().contains(expectedHash)) {
       throw new GradleException("""For the Ethereum Reference Tests the git commit did not match what was expected.
-
+  
 If this is a deliberate change where you are updating the reference tests 
 then update "expectedHash" in `ethereum/referencetests/build.gradle` as the 
 commit hash for this task.
@@ -64,7 +188,7 @@ Full git output : ${result}
 
 If this is accidental you can correct the reference test versions with the 
 following commands:
-    pushd ethereum/referencetests/src/test/resources
+    pushd ${submodulePath}
     git checkout ${expectedHash}
     cd ..
     git add resources
@@ -73,3 +197,33 @@ following commands:
   }
 }
 processResources.dependsOn('validateReferenceTestSubmodule')
+
+def generateTestFiles(FileTree jsonPath, File templateFile, String pathstrip, String destination, String namePrefix, String ... excludedPath) {
+  mkdir(destination)
+  def referenceTestTemplate = templateFile.text
+
+  // This is how many json files to include in each test file
+  def fileSets = jsonPath.getFiles().collate(5)
+
+  fileSets.eachWithIndex { fileSet, idx ->
+    def paths = []
+    fileSet.each { testJsonFile ->
+      def parentFile = testJsonFile.getParentFile()
+      def parentPathFile = parentFile.getPath().substring(parentFile.getPath().indexOf(pathstrip))
+      if (!testJsonFile.getName().toString().startsWith(".") && !excludedPath.contains(parentPathFile)) {
+        def pathFile = testJsonFile.getPath()
+        paths << pathFile.substring(pathFile.indexOf(pathstrip))
+      }
+    }
+
+    def testFile = file(destination + "/" + namePrefix + "_" + idx + ".java")
+
+
+    def allPaths = '"' + paths.join('", "') + '"'
+
+    def testFileContents = referenceTestTemplate
+      .replaceAll("%%TESTS_FILE%%", allPaths)
+      .replaceAll("%%TESTS_NAME%%", namePrefix + "_" + idx)
+    testFile.newWriter().withWriter { w -> w << testFileContents }
+  }
+}
diff --git a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/BlockchainReferenceTestCaseSpec.java b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/BlockchainReferenceTestCaseSpec.java
index 082a6fa2117..0cdb6854853 100644
--- a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/BlockchainReferenceTestCaseSpec.java
+++ b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/BlockchainReferenceTestCaseSpec.java
@@ -15,27 +15,34 @@
  */
 package org.hyperledger.besu.ethereum.referencetests;
 
+import static org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider.createInMemoryWorldStateArchive;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.DataGas;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Address;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.core.Deposit;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.InMemoryStorageProvider;
-import org.hyperledger.besu.ethereum.core.LogsBloomFilter;
+import org.hyperledger.besu.ethereum.core.InMemoryKeyValueStorageProvider;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.ParsedExtraData;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.util.Map;
+import java.util.Optional;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -62,8 +69,7 @@ public class BlockchainReferenceTestCaseSpec {
 
   private static WorldStateArchive buildWorldStateArchive(
       final Map<String, ReferenceTestWorldState.AccountMock> accounts) {
-    final WorldStateArchive worldStateArchive =
-        InMemoryStorageProvider.createInMemoryWorldStateArchive();
+    final WorldStateArchive worldStateArchive = createInMemoryWorldStateArchive();
 
     final MutableWorldState worldState = worldStateArchive.getMutable();
     final WorldUpdater updater = worldState.updater();
@@ -81,7 +87,7 @@ private static WorldStateArchive buildWorldStateArchive(
 
   private static MutableBlockchain buildBlockchain(final BlockHeader genesisBlockHeader) {
     final Block genesisBlock = new Block(genesisBlockHeader, BlockBody.empty());
-    return InMemoryStorageProvider.createInMemoryBlockchain(genesisBlock);
+    return InMemoryKeyValueStorageProvider.createInMemoryBlockchain(genesisBlock);
   }
 
   @JsonCreator
@@ -100,7 +106,8 @@ public BlockchainReferenceTestCaseSpec(
     this.worldStateArchive = buildWorldStateArchive(accounts);
     this.blockchain = buildBlockchain(genesisBlockHeader);
     this.sealEngine = sealEngine;
-    this.protocolContext = new ProtocolContext(this.blockchain, this.worldStateArchive, null);
+    this.protocolContext =
+        new ProtocolContext(this.blockchain, this.worldStateArchive, null, Optional.empty());
   }
 
   public String getNetwork() {
@@ -152,17 +159,24 @@ public ReferenceTestBlockHeader(
         @JsonProperty("gasUsed") final String gasUsed,
         @JsonProperty("timestamp") final String timestamp,
         @JsonProperty("extraData") final String extraData,
-        @JsonProperty("baseFee") final String baseFee,
+        @JsonProperty("baseFeePerGas") final String baseFee,
         @JsonProperty("mixHash") final String mixHash,
         @JsonProperty("nonce") final String nonce,
+        @JsonProperty("withdrawalsRoot") final String withdrawalsRoot,
+        @JsonProperty("depositsRoot") final String depositsRoot,
+        @JsonProperty("excessDataGas") final String excessDataGas,
         @JsonProperty("hash") final String hash) {
       super(
           Hash.fromHexString(parentHash), // parentHash
-          Hash.fromHexString(uncleHash), // ommersHash
+          uncleHash == null ? Hash.EMPTY_LIST_HASH : Hash.fromHexString(uncleHash), // ommersHash
           Address.fromHexString(coinbase), // coinbase
           Hash.fromHexString(stateRoot), // stateRoot
-          Hash.fromHexString(transactionsTrie), // transactionsRoot
-          Hash.fromHexString(receiptTrie), // receiptTrie
+          transactionsTrie == null
+              ? Hash.EMPTY_TRIE_HASH
+              : Hash.fromHexString(transactionsTrie), // transactionsRoot
+          receiptTrie == null
+              ? Hash.EMPTY_TRIE_HASH
+              : Hash.fromHexString(receiptTrie), // receiptTrie
           LogsBloomFilter.fromHexString(bloom), // bloom
           Difficulty.fromHexString(difficulty), // difficulty
           Long.decode(number), // number
@@ -170,13 +184,16 @@ public ReferenceTestBlockHeader(
           Long.decode(gasUsed), // gasUsed
           Long.decode(timestamp), // timestamp
           Bytes.fromHexString(extraData), // extraData
-          baseFee != null ? Long.decode(baseFee) : null, // baseFee
+          baseFee != null ? Wei.fromHexString(baseFee) : null, // baseFee
           Hash.fromHexString(mixHash), // mixHash
-          Bytes.fromHexString(nonce).getLong(0),
+          Bytes.fromHexStringLenient(nonce).toLong(),
+          withdrawalsRoot != null ? Hash.fromHexString(withdrawalsRoot) : null,
+          excessDataGas != null ? DataGas.fromHexString(excessDataGas) : null,
+          depositsRoot != null ? Hash.fromHexString(depositsRoot) : null,
           new BlockHeaderFunctions() {
             @Override
             public Hash hash(final BlockHeader header) {
-              return Hash.fromHexString(hash);
+              return hash == null ? null : Hash.fromHexString(hash);
             }
 
             @Override
@@ -200,7 +217,8 @@ public ParsedExtraData parseExtraData(final BlockHeader header) {
     "blocknumber",
     "chainname",
     "expectExceptionALL",
-    "chainnetwork"
+    "chainnetwork",
+    "transactionSequence"
   })
   public static class CandidateBlock {
 
@@ -213,22 +231,26 @@ public CandidateBlock(
         @JsonProperty("rlp") final String rlp,
         @JsonProperty("blockHeader") final Object blockHeader,
         @JsonProperty("transactions") final Object transactions,
-        @JsonProperty("uncleHeaders") final Object uncleHeaders) {
-      boolean valid = true;
+        @JsonProperty("uncleHeaders") final Object uncleHeaders,
+        @JsonProperty("withdrawals") final Object withdrawals) {
+      boolean blockVaid = true;
       // The BLOCK__WrongCharAtRLP_0 test has an invalid character in its rlp string.
       Bytes rlpAttempt = null;
       try {
         rlpAttempt = Bytes.fromHexString(rlp);
       } catch (final IllegalArgumentException e) {
-        valid = false;
+        blockVaid = false;
       }
       this.rlp = rlpAttempt;
 
-      if (blockHeader == null && transactions == null && uncleHeaders == null) {
-        valid = false;
+      if (blockHeader == null
+          && transactions == null
+          && uncleHeaders == null
+          && withdrawals == null) {
+        blockVaid = false;
       }
 
-      this.valid = valid;
+      this.valid = blockVaid;
     }
 
     public boolean isValid() {
@@ -247,7 +269,13 @@ public Block getBlock() {
       final BlockBody body =
           new BlockBody(
               input.readList(Transaction::readFrom),
-              input.readList(rlp -> BlockHeader.readFrom(rlp, blockHeaderFunctions)));
+              input.readList(inputData -> BlockHeader.readFrom(inputData, blockHeaderFunctions)),
+              input.isEndOfCurrentList()
+                  ? Optional.empty()
+                  : Optional.of(input.readList(Withdrawal::readFrom)),
+              input.isEndOfCurrentList()
+                  ? Optional.empty()
+                  : Optional.of(input.readList(Deposit::readFrom)));
       return new Block(header, body);
     }
   }
diff --git a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/EnvironmentInformation.java b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/EnvironmentInformation.java
index a55ac46e379..d0dc94b4ab6 100644
--- a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/EnvironmentInformation.java
+++ b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/EnvironmentInformation.java
@@ -15,12 +15,9 @@
  */
 package org.hyperledger.besu.ethereum.referencetests;
 
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.vm.Code;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -46,9 +43,7 @@ public class EnvironmentInformation {
 
   private final Address callerAddress;
 
-  private final Code code;
-
-  private final int version;
+  private final Bytes code;
 
   private final Bytes data;
 
@@ -60,7 +55,7 @@ public class EnvironmentInformation {
 
   private final Wei value;
 
-  private final Gas gas;
+  private final long gas;
 
   /**
    * Public constructor.
@@ -75,7 +70,6 @@ public class EnvironmentInformation {
    * @param origin The sender address of the original transaction. message call instruction or
    *     transaction.
    * @param value The deposited value by the instruction/transaction responsible for this execution.
-   * @param version the account version of the account
    */
   @SuppressWarnings("unused") // jackson reflected constructor
   @JsonCreator
@@ -83,13 +77,12 @@ public EnvironmentInformation(
       @JsonProperty("address") final String account,
       @JsonProperty("balance") final String balance,
       @JsonProperty("caller") final String caller,
-      @JsonProperty("code") final ReferenceTestCode code,
+      @JsonProperty("code") final Bytes code,
       @JsonProperty("data") final String data,
       @JsonProperty("gas") final String gas,
       @JsonProperty("gasPrice") final String gasPrice,
       @JsonProperty("origin") final String origin,
-      @JsonProperty("value") final String value,
-      @JsonProperty("version") final String version) {
+      @JsonProperty("value") final String value) {
     this(
         code,
         0,
@@ -100,12 +93,11 @@ public EnvironmentInformation(
         data == null ? null : Bytes.fromHexString(data),
         value == null ? null : Wei.fromHexString(value),
         gasPrice == null ? null : Wei.fromHexString(gasPrice),
-        gas == null ? null : Gas.fromHexString(gas),
-        version == null ? Account.DEFAULT_VERSION : Integer.decode(version));
+        gas == null ? 0 : Long.decode(gas));
   }
 
   private EnvironmentInformation(
-      final Code code,
+      final Bytes code,
       final int depth,
       final Address accountAddress,
       final Wei accountBalance,
@@ -114,8 +106,7 @@ private EnvironmentInformation(
       final Bytes data,
       final Wei value,
       final Wei gasPrice,
-      final Gas gas,
-      final int version) {
+      final long gas) {
     this.code = code;
     this.depth = depth;
     this.accountAddress = accountAddress;
@@ -126,13 +117,12 @@ private EnvironmentInformation(
     this.value = value;
     this.gasPrice = gasPrice;
     this.gas = gas;
-    this.version = version;
   }
 
   /**
    * Assigns the block header.
    *
-   * @param blockHeader A @{link BlockHeader}.
+   * @param blockHeader A {@link BlockHeader}.
    */
   public void setBlockHeader(final BlockHeader blockHeader) {
     this.blockHeader = blockHeader;
@@ -188,7 +178,7 @@ public Wei getValue() {
    *
    * @return code to be executed.
    */
-  public Code getCode() {
+  public Bytes getCode() {
     return code;
   }
 
@@ -224,7 +214,7 @@ public Wei getGasPrice() {
    *
    * @return the amount of gas available.
    */
-  public Gas getGas() {
+  public long getGas() {
     return gas;
   }
 
@@ -237,15 +227,6 @@ public Address getOriginAddress() {
     return originAddress;
   }
 
-  /**
-   * Returns the account version.
-   *
-   * @return the account version.
-   */
-  public int getVersion() {
-    return version;
-  }
-
   @Override
   public String toString() {
     final StringBuilder builder = new StringBuilder();
@@ -259,11 +240,9 @@ public String toString() {
         .append("\nAccount: ")
         .append(accountAddress)
         .append("\nBlock header: \n  ")
-        .append(blockHeader.toString().replaceAll("\n", "\n  "))
+        .append(blockHeader.toString().replace("\n", "\n  "))
         .append("\nCaller: ")
-        .append(callerAddress)
-        .append("\nVersion: ")
-        .append(version);
+        .append(callerAddress);
 
     return builder.toString();
   }
diff --git a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/GeneralStateTestCaseEipSpec.java b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/GeneralStateTestCaseEipSpec.java
index dd537715a9e..b396eff98f8 100644
--- a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/GeneralStateTestCaseEipSpec.java
+++ b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/GeneralStateTestCaseEipSpec.java
@@ -15,10 +15,10 @@
  */
 package org.hyperledger.besu.ethereum.referencetests;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.WorldState;
+import org.hyperledger.besu.evm.worldstate.WorldState;
 
 import java.util.function.Supplier;
 
@@ -49,6 +49,7 @@ public class GeneralStateTestCaseEipSpec {
   private final int dataIndex;
   private final int gasIndex;
   private final int valueIndex;
+  private final String expectException;
 
   GeneralStateTestCaseEipSpec(
       final String fork,
@@ -59,7 +60,8 @@ public class GeneralStateTestCaseEipSpec {
       final BlockHeader blockHeader,
       final int dataIndex,
       final int gasIndex,
-      final int valueIndex) {
+      final int valueIndex,
+      final String expectException) {
     this.fork = fork;
     this.transactionSupplier = transactionSupplier;
     this.initialWorldState = initialWorldState;
@@ -69,6 +71,7 @@ public class GeneralStateTestCaseEipSpec {
     this.dataIndex = dataIndex;
     this.gasIndex = gasIndex;
     this.valueIndex = valueIndex;
+    this.expectException = expectException;
   }
 
   public String getFork() {
@@ -88,7 +91,15 @@ public Hash getExpectedLogsHash() {
   }
 
   public Transaction getTransaction() {
-    return transactionSupplier.get();
+    try {
+      return transactionSupplier.get();
+    } catch (RuntimeException re) {
+      // some tests specify invalid transactions.  We throw exceptions in
+      // GeneralStateTests but they are encoded in BlockchainTests, so we
+      // can skip them as invalid (since the point of the tests is to reject
+      // invalid transactions).
+      return null;
+    }
   }
 
   public BlockHeader getBlockHeader() {
@@ -106,4 +117,8 @@ public int getGasIndex() {
   public int getValueIndex() {
     return valueIndex;
   }
+
+  public String getExpectException() {
+    return expectException;
+  }
 }
diff --git a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/GeneralStateTestCaseSpec.java b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/GeneralStateTestCaseSpec.java
index 5a1523ca5dd..328922e1876 100644
--- a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/GeneralStateTestCaseSpec.java
+++ b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/GeneralStateTestCaseSpec.java
@@ -15,8 +15,8 @@
  */
 package org.hyperledger.besu.ethereum.referencetests;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
 
 import java.util.ArrayList;
@@ -24,7 +24,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.Supplier;
+import javax.annotation.Nullable;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -71,7 +73,8 @@ private Map<String, List<GeneralStateTestCaseEipSpec>> generate(
                 blockHeader,
                 p.indexes.data,
                 p.indexes.gas,
-                p.indexes.value));
+                p.indexes.value,
+                p.expectException));
       }
       res.put(eip, specs);
     }
@@ -118,20 +121,25 @@ public int hashCode() {
   }
 
   /** Represents the "post" part of a general state test json _for a specific hard-fork_. */
+  @JsonIgnoreProperties(ignoreUnknown = true)
   public static class PostSection {
 
     private final Hash rootHash;
-    private final Hash logsHash;
+    @Nullable private final Hash logsHash;
     private final Indexes indexes;
+    private final String expectException;
 
     @JsonCreator
     public PostSection(
+        @JsonProperty("expectException") final String expectException,
         @JsonProperty("hash") final String hash,
+        @JsonProperty("indexes") final Indexes indexes,
         @JsonProperty("logs") final String logs,
-        @JsonProperty("indexes") final Indexes indexes) {
+        @JsonProperty("txbytes") final String txbytes) {
       this.rootHash = Hash.fromHexString(hash);
-      this.logsHash = Hash.fromHexString(logs);
+      this.logsHash = Optional.ofNullable(logs).map(Hash::fromHexString).orElse(null);
       this.indexes = indexes;
+      this.expectException = expectException;
     }
   }
 }
diff --git a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestBlockchain.java b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestBlockchain.java
index 13fc54aec27..716c81d5d14 100644
--- a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestBlockchain.java
+++ b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestBlockchain.java
@@ -17,6 +17,7 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.chain.BlockAddedObserver;
 import org.hyperledger.besu.ethereum.chain.Blockchain;
 import org.hyperledger.besu.ethereum.chain.ChainHead;
@@ -26,10 +27,10 @@
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.Transaction;
 import org.hyperledger.besu.ethereum.core.TransactionReceipt;
 
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -57,6 +58,10 @@ public class ReferenceTestBlockchain implements Blockchain {
       "Blocks must not be looked up by number in the EVM. The block being processed may not be on the canonical chain.";
   private static final String CHAIN_HEAD_ERROR =
       "Chain head is inherently non-deterministic. The block currently being processed should be treated as the chain head.";
+  private static final String FINALIZED_ERROR =
+      "Finalized block is inherently non-deterministic. The block currently being processed should be treated as the finalized block.";
+  private static final String SAFE_BLOCK_ERROR =
+      "Safe block is inherently non-deterministic. The block currently being processed should be treated as the safe block.";
   private final Map<Hash, BlockHeader> hashToHeader = new HashMap<>();
 
   public ReferenceTestBlockchain() {
@@ -92,6 +97,16 @@ public ChainHead getChainHead() {
     throw new NonDeterministicOperationException(CHAIN_HEAD_ERROR);
   }
 
+  @Override
+  public Optional<Hash> getFinalized() {
+    throw new NonDeterministicOperationException(FINALIZED_ERROR);
+  }
+
+  @Override
+  public Optional<Hash> getSafeBlock() {
+    throw new NonDeterministicOperationException(SAFE_BLOCK_ERROR);
+  }
+
   @Override
   public long getChainHeadBlockNumber() {
     throw new NonDeterministicOperationException(CHAIN_HEAD_ERROR);
@@ -166,4 +181,17 @@ public static class NonDeterministicOperationException extends RuntimeException
       super(message);
     }
   }
+
+  @Override
+  public Comparator<BlockHeader> getBlockChoiceRule() {
+    return (a, b) -> {
+      throw new NonDeterministicOperationException(
+          "ReferenceTestBlockchian for VMTest Chains do not support fork choice rules");
+    };
+  }
+
+  @Override
+  public void setBlockChoiceRule(final Comparator<BlockHeader> blockChoiceRule) {
+    throw new UnsupportedOperationException("Not Used for Reference Tests");
+  }
 }
diff --git a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestCode.java b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestCode.java
deleted file mode 100644
index 3144b333027..00000000000
--- a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestCode.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-package org.hyperledger.besu.ethereum.referencetests;
-
-import org.hyperledger.besu.ethereum.vm.Code;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.apache.tuweni.bytes.Bytes;
-
-/** A mock for representing EVM Code associated with an account. */
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class ReferenceTestCode extends Code {
-
-  /**
-   * Public constructor.
-   *
-   * @param bytes - A hex string representation of the code.
-   */
-  @JsonCreator
-  public ReferenceTestCode(final String bytes) {
-    super(Bytes.fromHexString(bytes));
-  }
-}
diff --git a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestEnv.java b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestEnv.java
index dc6af7808ed..7898960c384 100644
--- a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestEnv.java
+++ b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestEnv.java
@@ -18,22 +18,67 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.GWei;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
 import org.hyperledger.besu.ethereum.core.Difficulty;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.LogsBloomFilter;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+import org.hyperledger.besu.ethereum.mainnet.BodyValidation;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.mainnet.feemarket.BaseFeeMarket;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.Strings;
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt64;
 
 /** A memory holder for testing. */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class ReferenceTestEnv extends BlockHeader {
 
+  public record EnvWithdrawal(
+      @JsonProperty("index") String index,
+      @JsonProperty("validatorIndex") String validatorIndex,
+      @JsonProperty("address") String address,
+      @JsonProperty("amount") String amount) {
+
+    Withdrawal asWithdrawal() {
+      return new Withdrawal(
+          UInt64.fromHexString(index),
+          UInt64.fromHexString(validatorIndex),
+          Address.fromHexString(address),
+          GWei.fromHexString(amount));
+    }
+  }
+
+  private final String parentDifficulty;
+
+  private final String parentBaseFee;
+
+  private final String parentGasUsed;
+
+  private final String parentGasLimit;
+
+  private final String parentTimestamp;
+
+  private final List<Withdrawal> withdrawals;
+
+  private final Map<Long, Hash> blockHashes;
+
   /**
    * Public constructor.
    *
@@ -41,7 +86,9 @@ public class ReferenceTestEnv extends BlockHeader {
    * @param difficulty Difficulty for the mock block being tested.
    * @param gasLimit Gas Limit for the mock block being tested.
    * @param number Block number for the mock block being tested.
+   * @param baseFee Optional BaseFee for the mock block being tested.
    * @param timestamp Timestamp for the mock block being tested.
+   * @param random Optional RANDAO or the mock block being tested.
    */
   @JsonCreator
   public ReferenceTestEnv(
@@ -49,29 +96,139 @@ public ReferenceTestEnv(
       @JsonProperty("currentDifficulty") final String difficulty,
       @JsonProperty("currentGasLimit") final String gasLimit,
       @JsonProperty("currentNumber") final String number,
-      @JsonProperty("currentTimestamp") final String timestamp) {
+      @JsonProperty("currentBaseFee") final String baseFee,
+      @JsonProperty("currentTimestamp") final String timestamp,
+      @JsonProperty("currentRandom") final String random,
+      @JsonProperty("previousHash") final String previousHash,
+      @JsonProperty("parentDifficulty") final String parentDifficulty,
+      @JsonProperty("parentBaseFee") final String parentBaseFee,
+      @JsonProperty("parentGasUsed") final String parentGasUsed,
+      @JsonProperty("parentGasLimit") final String parentGasLimit,
+      @JsonProperty("parentTimestamp") final String parentTimestamp,
+      @JsonProperty("withdrawals") final List<EnvWithdrawal> withdrawals,
+      @JsonProperty("blockHashes") final Map<String, String> blockHashes) {
     super(
-        generateTestBlockHash(Long.decode(number) - 1),
-        Hash.EMPTY, // ommersHash
+        generateTestBlockHash(previousHash, number),
+        Hash.EMPTY_LIST_HASH, // ommersHash
         Address.fromHexString(coinbase),
         Hash.EMPTY, // stateRoot
         Hash.EMPTY, // transactionsRoot
         Hash.EMPTY, // receiptsRoot
         new LogsBloomFilter(),
-        Difficulty.fromHexString(difficulty),
-        Long.decode(number),
-        Long.decode(gasLimit),
+        difficulty == null ? null : Difficulty.fromHexOrDecimalString(difficulty),
+        number == null ? 0 : Long.decode(number),
+        gasLimit == null ? 15_000_000L : Long.decode(gasLimit),
         0L,
-        Long.decode(timestamp),
+        timestamp == null ? 0L : Long.decode(timestamp),
         Bytes.EMPTY,
+        Optional.ofNullable(baseFee).map(Wei::fromHexString).orElse(null),
+        Optional.ofNullable(random).map(Difficulty::fromHexString).orElse(Difficulty.ZERO),
         0L,
-        Hash.ZERO,
-        0L,
+        null, // withdrawalsRoot
+        null, // depositsRoot
+        null,
         new MainnetBlockHeaderFunctions());
+    this.parentDifficulty = parentDifficulty;
+    this.parentBaseFee = parentBaseFee;
+    this.parentGasUsed = parentGasUsed;
+    this.parentGasLimit = parentGasLimit;
+    this.parentTimestamp = parentTimestamp;
+    this.withdrawals =
+        withdrawals == null
+            ? List.of()
+            : withdrawals.stream().map(EnvWithdrawal::asWithdrawal).toList();
+    this.blockHashes =
+        blockHashes == null
+            ? Map.of()
+            : blockHashes.entrySet().stream()
+                .map(
+                    entry ->
+                        Map.entry(
+                            Long.decode(entry.getKey()), Hash.fromHexString(entry.getValue())))
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+  }
+
+  @Override
+  public Difficulty getDifficulty() {
+    return difficulty == null ? Difficulty.ZERO : super.getDifficulty();
+  }
+
+  private static Hash generateTestBlockHash(final String previousHash, final String number) {
+    if (Strings.isNullOrEmpty(previousHash)) {
+      if (number == null) {
+        return Hash.EMPTY;
+      } else {
+        final byte[] bytes = Long.toString(Long.decode(number) - 1).getBytes(UTF_8);
+        return Hash.hash(Bytes.wrap(bytes));
+      }
+    } else {
+      return Hash.wrap(Bytes32.fromHexString(previousHash));
+    }
+  }
+
+  public BlockHeader updateFromParentValues(final ProtocolSpec protocolSpec) {
+    var builder =
+        BlockHeaderBuilder.fromHeader(this)
+            .blockHeaderFunctions(protocolSpec.getBlockHeaderFunctions());
+    if (protocolSpec.getWithdrawalsProcessor().isPresent()) {
+      builder.withdrawalsRoot(BodyValidation.withdrawalsRoot(withdrawals));
+    }
+    if ((baseFee == null || baseFee.isEmpty()) && protocolSpec.getFeeMarket().implementsBaseFee()) {
+      builder.baseFee(
+          ((BaseFeeMarket) protocolSpec.getFeeMarket())
+              .computeBaseFee(
+                  number,
+                  Wei.fromHexString(parentBaseFee),
+                  Long.decode(parentGasUsed),
+                  gasLimit / 2));
+    }
+    if (difficulty == null && parentDifficulty != null) {
+      builder.difficulty(
+          Difficulty.of(
+              protocolSpec
+                  .getDifficultyCalculator()
+                  .nextDifficulty(
+                      timestamp,
+                      BlockHeaderBuilder.createDefault()
+                          .difficulty(Difficulty.fromHexOrDecimalString(parentDifficulty))
+                          .number(number - 1)
+                          .buildBlockHeader(),
+                      null)));
+    }
+
+    return builder.buildBlockHeader();
+  }
+
+  public List<Withdrawal> getWithdrawals() {
+    return withdrawals;
+  }
+
+  public Optional<Hash> getBlockhashByNumber(final long number) {
+    return Optional.ofNullable(blockHashes.get(number));
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) return true;
+    if (!(o instanceof ReferenceTestEnv that)) return false;
+    if (!super.equals(o)) return false;
+    return Objects.equals(parentDifficulty, that.parentDifficulty)
+        && Objects.equals(parentBaseFee, that.parentBaseFee)
+        && Objects.equals(parentGasUsed, that.parentGasUsed)
+        && Objects.equals(parentGasLimit, that.parentGasLimit)
+        && Objects.equals(parentTimestamp, that.parentTimestamp)
+        && Objects.equals(withdrawals, that.withdrawals);
   }
 
-  private static Hash generateTestBlockHash(final long number) {
-    final byte[] bytes = Long.toString(number).getBytes(UTF_8);
-    return Hash.hash(Bytes.wrap(bytes));
+  @Override
+  public int hashCode() {
+    return Objects.hash(
+        super.hashCode(),
+        parentDifficulty,
+        parentBaseFee,
+        parentGasUsed,
+        parentGasLimit,
+        parentTimestamp,
+        withdrawals);
   }
 }
diff --git a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestProtocolSchedules.java b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestProtocolSchedules.java
index 6607c97bcb0..0ec30b0959f 100644
--- a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestProtocolSchedules.java
+++ b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestProtocolSchedules.java
@@ -17,10 +17,11 @@
 
 import org.hyperledger.besu.config.GenesisConfigOptions;
 import org.hyperledger.besu.config.StubGenesisConfigOptions;
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
 import org.hyperledger.besu.ethereum.core.PrivacyParameters;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolScheduleBuilder;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpecAdapters;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 
 import java.math.BigInteger;
 import java.util.Arrays;
@@ -38,34 +39,44 @@ public class ReferenceTestProtocolSchedules {
       Arrays.asList("Frontier", "Homestead", "EIP150");
 
   public static ReferenceTestProtocolSchedules create() {
+    return create(new StubGenesisConfigOptions());
+  }
+
+  public static ReferenceTestProtocolSchedules create(final StubGenesisConfigOptions genesisStub) {
     final ImmutableMap.Builder<String, ProtocolSchedule> builder = ImmutableMap.builder();
-    builder.put("Frontier", createSchedule(new StubGenesisConfigOptions()));
-    builder.put(
-        "FrontierToHomesteadAt5", createSchedule(new StubGenesisConfigOptions().homesteadBlock(5)));
-    builder.put("Homestead", createSchedule(new StubGenesisConfigOptions().homesteadBlock(0)));
+    builder.put("Frontier", createSchedule(genesisStub.clone()));
+    builder.put("FrontierToHomesteadAt5", createSchedule(genesisStub.clone().homesteadBlock(5)));
+    builder.put("Homestead", createSchedule(genesisStub.clone().homesteadBlock(0)));
     builder.put(
         "HomesteadToEIP150At5",
-        createSchedule(new StubGenesisConfigOptions().homesteadBlock(0).eip150Block(5)));
+        createSchedule(genesisStub.clone().homesteadBlock(0).eip150Block(5)));
     builder.put(
-        "HomesteadToDaoAt5",
-        createSchedule(new StubGenesisConfigOptions().homesteadBlock(0).daoForkBlock(5)));
-    builder.put("EIP150", createSchedule(new StubGenesisConfigOptions().eip150Block(0)));
-    builder.put("EIP158", createSchedule(new StubGenesisConfigOptions().eip158Block(0)));
+        "HomesteadToDaoAt5", createSchedule(genesisStub.clone().homesteadBlock(0).daoForkBlock(5)));
+    builder.put("EIP150", createSchedule(genesisStub.clone().eip150Block(0)));
+    builder.put("EIP158", createSchedule(genesisStub.clone().eip158Block(0)));
     builder.put(
         "EIP158ToByzantiumAt5",
-        createSchedule(new StubGenesisConfigOptions().eip158Block(0).byzantiumBlock(5)));
-    builder.put("Byzantium", createSchedule(new StubGenesisConfigOptions().byzantiumBlock(0)));
-    builder.put(
-        "Constantinople", createSchedule(new StubGenesisConfigOptions().constantinopleBlock(0)));
-    builder.put(
-        "ConstantinopleFix",
-        createSchedule(new StubGenesisConfigOptions().constantinopleFixBlock(0)));
-    builder.put("Istanbul", createSchedule(new StubGenesisConfigOptions().istanbulBlock(0)));
-    builder.put("MuirGlacier", createSchedule(new StubGenesisConfigOptions().muirGlacierBlock(0)));
-    if (ExperimentalEIPs.berlinEnabled) {
-      builder.put("Berlin", createSchedule(new StubGenesisConfigOptions().berlinBlock(0)));
-      builder.put("YOLOv2", createSchedule(new StubGenesisConfigOptions().berlinBlock(0)));
+        createSchedule(genesisStub.clone().eip158Block(0).byzantiumBlock(5)));
+    builder.put("Byzantium", createSchedule(genesisStub.clone().byzantiumBlock(0)));
+    builder.put("Constantinople", createSchedule(genesisStub.clone().constantinopleBlock(0)));
+    builder.put("ConstantinopleFix", createSchedule(genesisStub.clone().petersburgBlock(0)));
+    builder.put("Petersburg", createSchedule(genesisStub.clone().petersburgBlock(0)));
+    builder.put("Istanbul", createSchedule(genesisStub.clone().istanbulBlock(0)));
+    builder.put("MuirGlacier", createSchedule(genesisStub.clone().muirGlacierBlock(0)));
+    builder.put("Berlin", createSchedule(genesisStub.clone().berlinBlock(0)));
+
+    // the following schedules activate EIP-1559, but may have non-default
+    if (genesisStub.getBaseFeePerGas().isEmpty()) {
+      genesisStub.baseFeePerGas(0x0a);
     }
+    builder.put("London", createSchedule(genesisStub.clone().londonBlock(0)));
+    builder.put("ArrowGlacier", createSchedule(genesisStub.clone().arrowGlacierBlock(0)));
+    builder.put("GrayGlacier", createSchedule(genesisStub.clone().grayGlacierBlock(0)));
+    builder.put("Merge", createSchedule(genesisStub.clone().mergeNetSplitBlock(0)));
+    builder.put("Shanghai", createSchedule(genesisStub.clone().shanghaiTime(0)));
+    builder.put("Cancun", createSchedule(genesisStub.clone().cancunTime(0)));
+    builder.put("Future_EIPs", createSchedule(genesisStub.clone().futureEipsTime(0)));
+    builder.put("Experimental_EIPs", createSchedule(genesisStub.clone().experimentalEipsTime(0)));
     return new ReferenceTestProtocolSchedules(builder.build());
   }
 
@@ -83,10 +94,10 @@ private static ProtocolSchedule createSchedule(final GenesisConfigOptions option
     return new ProtocolScheduleBuilder(
             options,
             CHAIN_ID,
-            Function.identity(),
+            ProtocolSpecAdapters.create(0, Function.identity()),
             PrivacyParameters.DEFAULT,
             false,
-            options.isQuorum())
+            EvmConfiguration.DEFAULT)
         .createProtocolSchedule();
   }
 
diff --git a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestWorldState.java b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestWorldState.java
index edff179551e..9518d2c99d4 100644
--- a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestWorldState.java
+++ b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestWorldState.java
@@ -15,13 +15,13 @@
  */
 package org.hyperledger.besu.ethereum.referencetests;
 
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.MutableAccount;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage;
 import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage;
 import org.hyperledger.besu.ethereum.worldstate.DefaultMutableWorldState;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
 
 import java.util.HashMap;
@@ -41,7 +41,6 @@ public static class AccountMock {
     private final long nonce;
     private final Wei balance;
     private final Bytes code;
-    private final int version;
     private final Map<UInt256, UInt256> storage;
 
     private static Map<UInt256, UInt256> parseStorage(final Map<String, String> values) {
@@ -56,17 +55,11 @@ public AccountMock(
         @JsonProperty("nonce") final String nonce,
         @JsonProperty("balance") final String balance,
         @JsonProperty("storage") final Map<String, String> storage,
-        @JsonProperty("code") final String code,
-        @JsonProperty("version") final String version) {
-      this.nonce = Long.decode(nonce);
-      this.balance = Wei.fromHexString(balance);
-      this.code = Bytes.fromHexString(code);
-      this.storage = parseStorage(storage);
-      if (version != null) {
-        this.version = Integer.decode(version);
-      } else {
-        this.version = 0;
-      }
+        @JsonProperty("code") final String code) {
+      this.nonce = nonce == null ? 0 : Bytes.fromHexStringLenient(nonce).toLong();
+      this.balance = balance == null ? Wei.ZERO : Wei.fromHexString(balance);
+      this.code = code == null ? Bytes.EMPTY : Bytes.fromHexString(code);
+      this.storage = storage == null ? Map.of() : parseStorage(storage);
     }
 
     public long getNonce() {
@@ -81,10 +74,6 @@ public Bytes getCode() {
       return code;
     }
 
-    public int getVersion() {
-      return version;
-    }
-
     public Map<UInt256, UInt256> getStorage() {
       return storage;
     }
@@ -96,7 +85,6 @@ static void insertAccount(
     account.setNonce(toCopy.getNonce());
     account.setBalance(toCopy.getBalance());
     account.setCode(toCopy.getCode());
-    account.setVersion(toCopy.getVersion());
     for (final Map.Entry<UInt256, UInt256> entry : toCopy.getStorage().entrySet()) {
       account.setStorageValue(entry.getKey(), entry.getValue());
     }
diff --git a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/StateTestAccessListDeserializer.java b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/StateTestAccessListDeserializer.java
new file mode 100644
index 00000000000..be6888f0323
--- /dev/null
+++ b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/StateTestAccessListDeserializer.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.ethereum.referencetests;
+
+import org.hyperledger.besu.evm.AccessListEntry;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class StateTestAccessListDeserializer extends JsonDeserializer<List<List<AccessListEntry>>> {
+  @Override
+  public List<List<AccessListEntry>> deserialize(
+      final JsonParser p, final DeserializationContext ctxt) throws IOException {
+    final ObjectMapper objectMapper = new ObjectMapper();
+    final List<List<AccessListEntry>> accessLists = new ArrayList<>();
+    while (!p.nextToken().equals(JsonToken.END_ARRAY)) {
+      accessLists.add(
+          p.currentToken().equals(JsonToken.VALUE_NULL)
+              ? null
+              : Arrays.asList(objectMapper.readValue(p, AccessListEntry[].class)));
+    }
+    return accessLists;
+  }
+}
diff --git a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/StateTestVersionedTransaction.java b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/StateTestVersionedTransaction.java
index 9c02c9cdfeb..69ad9267536 100644
--- a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/StateTestVersionedTransaction.java
+++ b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/StateTestVersionedTransaction.java
@@ -15,23 +15,28 @@
  */
 package org.hyperledger.besu.ethereum.referencetests;
 
-import org.hyperledger.besu.crypto.SECP256K1.KeyPair;
-import org.hyperledger.besu.crypto.SECP256K1.PrivateKey;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.evm.AccessListEntry;
 
+import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Function;
 import javax.annotation.Nullable;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
 
 /**
  * Represents the "transaction" part of the JSON of a general state tests.
@@ -55,63 +60,100 @@
 public class StateTestVersionedTransaction {
 
   private final long nonce;
-  private final Wei gasPrice;
+  @Nullable private final Wei maxFeePerGas;
+  @Nullable private final Wei maxPriorityFeePerGas;
+  @Nullable private final Wei gasPrice;
   @Nullable private final Address to;
 
   private final KeyPair keys;
 
-  private final List<Gas> gasLimits;
+  private final List<Long> gasLimits;
   private final List<Wei> values;
   private final List<Bytes> payloads;
+  private final Optional<List<List<AccessListEntry>>> maybeAccessLists;
 
   /**
    * Constructor for populating a mock transaction with json data.
    *
    * @param nonce Nonce of the mock transaction.
-   * @param gasPrice Gas price of the mock transaction.
+   * @param gasPrice Gas price of the mock transaction, if not 1559 transaction.
+   * @param maxFeePerGas Wei fee cap of the mock transaction, if a 1559 transaction.
+   * @param maxPriorityFeePerGas Wei tip cap of the mock transaction, if a 1559 transaction.
    * @param gasLimit Gas Limit of the mock transaction.
    * @param to Recipient account of the mock transaction.
    * @param value Amount of ether transferred in the mock transaction.
    * @param secretKey Secret Key of the mock transaction.
    * @param data Call data of the mock transaction.
+   * @param maybeAccessLists List of access lists of the mock transaction. Can be null.
    */
   @JsonCreator
   public StateTestVersionedTransaction(
       @JsonProperty("nonce") final String nonce,
       @JsonProperty("gasPrice") final String gasPrice,
+      @JsonProperty("maxFeePerGas") final String maxFeePerGas,
+      @JsonProperty("maxPriorityFeePerGas") final String maxPriorityFeePerGas,
       @JsonProperty("gasLimit") final String[] gasLimit,
       @JsonProperty("to") final String to,
       @JsonProperty("value") final String[] value,
       @JsonProperty("secretKey") final String secretKey,
-      @JsonProperty("data") final String[] data) {
+      @JsonProperty("data") final String[] data,
+      @JsonDeserialize(using = StateTestAccessListDeserializer.class) @JsonProperty("accessLists")
+          final List<List<AccessListEntry>> maybeAccessLists) {
 
-    this.nonce = Long.decode(nonce);
-    this.gasPrice = Wei.fromHexString(gasPrice);
+    this.nonce = Bytes.fromHexStringLenient(nonce).toLong();
+    this.gasPrice = Optional.ofNullable(gasPrice).map(Wei::fromHexString).orElse(null);
+    this.maxFeePerGas = Optional.ofNullable(maxFeePerGas).map(Wei::fromHexString).orElse(null);
+    this.maxPriorityFeePerGas =
+        Optional.ofNullable(maxPriorityFeePerGas).map(Wei::fromHexString).orElse(null);
     this.to = to.isEmpty() ? null : Address.fromHexString(to);
-    this.keys = KeyPair.create(PrivateKey.create(Bytes32.fromHexString(secretKey)));
 
-    this.gasLimits = parseArray(gasLimit, Gas::fromHexString);
+    SignatureAlgorithm signatureAlgorithm = SignatureAlgorithmFactory.getInstance();
+    this.keys =
+        signatureAlgorithm.createKeyPair(
+            signatureAlgorithm.createPrivateKey(Bytes32.fromHexString(secretKey)));
+
+    this.gasLimits = parseArray(gasLimit, s -> UInt256.fromHexString(s).toLong());
     this.values = parseArray(value, Wei::fromHexString);
     this.payloads = parseArray(data, Bytes::fromHexString);
+    this.maybeAccessLists = Optional.ofNullable(maybeAccessLists);
   }
 
   private static <T> List<T> parseArray(final String[] array, final Function<String, T> parseFct) {
     final List<T> res = new ArrayList<>(array.length);
     for (final String str : array) {
-      res.add(parseFct.apply(str));
+      try {
+        res.add(parseFct.apply(str));
+      } catch (RuntimeException re) {
+        // the reference tests may be testing a boundary violation
+        res.add(null);
+      }
     }
     return res;
   }
 
   public Transaction get(final GeneralStateTestCaseSpec.Indexes indexes) {
-    return Transaction.builder()
-        .nonce(nonce)
-        .gasPrice(gasPrice)
-        .gasLimit(gasLimits.get(indexes.gas).asUInt256().toLong())
-        .to(to)
-        .value(values.get(indexes.value))
-        .payload(payloads.get(indexes.data))
-        .guessType()
-        .signAndBuild(keys);
+    Long gasLimit = gasLimits.get(indexes.gas);
+    Wei value = values.get(indexes.value);
+    Bytes data = payloads.get(indexes.data);
+    if (value == null || gasLimit == null) {
+      // this means one of the params is an out-of-bounds value. Don't generate the transaction.
+      return null;
+    }
+
+    final Transaction.Builder transactionBuilder =
+        Transaction.builder().nonce(nonce).gasLimit(gasLimit).to(to).value(value).payload(data);
+
+    Optional.ofNullable(gasPrice).ifPresent(transactionBuilder::gasPrice);
+    Optional.ofNullable(maxFeePerGas).ifPresent(transactionBuilder::maxFeePerGas);
+    Optional.ofNullable(maxPriorityFeePerGas).ifPresent(transactionBuilder::maxPriorityFeePerGas);
+    maybeAccessLists.ifPresent(
+        accessLists -> transactionBuilder.accessList(accessLists.get(indexes.data)));
+
+    transactionBuilder.guessType();
+    if (transactionBuilder.getTransactionType().requiresChainId()) {
+      transactionBuilder.chainId(BigInteger.ONE);
+    }
+
+    return transactionBuilder.signAndBuild(keys);
   }
 }
diff --git a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/VMReferenceTestCaseSpec.java b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/VMReferenceTestCaseSpec.java
index 712b44a2e17..ba1a9e00602 100644
--- a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/VMReferenceTestCaseSpec.java
+++ b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/VMReferenceTestCaseSpec.java
@@ -15,8 +15,7 @@
  */
 package org.hyperledger.besu.ethereum.referencetests;
 
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.WorldState;
+import org.hyperledger.besu.evm.worldstate.WorldState;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -37,7 +36,7 @@ public class VMReferenceTestCaseSpec {
   /** The VM output. */
   private final Bytes out;
 
-  private final Gas finalGas;
+  private final long finalGas;
 
   private final ReferenceTestWorldState initialWorldState;
 
@@ -59,7 +58,7 @@ public VMReferenceTestCaseSpec(
     exec.setBlockHeader(env);
 
     if (finalGas != null && out != null && finalWorldState != null) {
-      this.finalGas = Gas.fromHexString(finalGas);
+      this.finalGas = Long.decode(finalGas);
       this.finalWorldState = finalWorldState;
       this.out = Bytes.fromHexString(out);
       this.exceptionalHaltExpected = false;
@@ -67,7 +66,7 @@ public VMReferenceTestCaseSpec(
       this.exceptionalHaltExpected = true;
       // These values should never be checked if this is a test case that
       // exceptionally halts.
-      this.finalGas = null;
+      this.finalGas = -1;
       this.finalWorldState = null;
       this.out = null;
     }
@@ -100,7 +99,7 @@ public WorldState getFinalWorldState() {
     return finalWorldState;
   }
 
-  public Gas getFinalGas() {
+  public long getFinalGas() {
     return finalGas;
   }
 
diff --git a/ethereum/referencetests/src/reference-test/external-resources b/ethereum/referencetests/src/reference-test/external-resources
new file mode 160000
index 00000000000..04f338a6e67
--- /dev/null
+++ b/ethereum/referencetests/src/reference-test/external-resources
@@ -0,0 +1 @@
+Subproject commit 04f338a6e673a6b4d906ec9d6d2bc939309357a5
diff --git a/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/core/TransactionTest.java b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/core/TransactionTest.java
new file mode 100644
index 00000000000..3cc53650024
--- /dev/null
+++ b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/core/TransactionTest.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionValidator;
+import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
+import org.hyperledger.besu.ethereum.mainnet.ValidationResult;
+import org.hyperledger.besu.ethereum.referencetests.ReferenceTestProtocolSchedules;
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
+import org.hyperledger.besu.evm.gascalculator.BerlinGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.ByzantiumGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.ConstantinopleGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.FrontierGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.gascalculator.HomesteadGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.IstanbulGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.LondonGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.PetersburgGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.SpuriousDragonGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.TangerineWhistleGasCalculator;
+import org.hyperledger.besu.testutil.JsonTestParameters;
+
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class TransactionTest {
+
+  private static final ReferenceTestProtocolSchedules REFERENCE_TEST_PROTOCOL_SCHEDULES =
+      ReferenceTestProtocolSchedules.create();
+
+  private static MainnetTransactionValidator transactionValidator(final String name) {
+    return REFERENCE_TEST_PROTOCOL_SCHEDULES
+        .getByName(name)
+        .getByBlockHeader(BlockHeaderBuilder.createDefault().buildBlockHeader())
+        .getTransactionValidator();
+  }
+
+  private static final String TEST_CONFIG_FILE_DIR_PATH = "TransactionTests/";
+
+  public static Stream<Arguments> getTestParametersForConfig() {
+    return JsonTestParameters.create(TransactionTestCaseSpec.class)
+        .generator((name, fullPath, spec, collector) -> collector.add(name, fullPath, spec, true))
+        .generate(TEST_CONFIG_FILE_DIR_PATH).stream().map(params -> Arguments.of(params[0], params[1]));
+  }
+
+  @ParameterizedTest(name = "Name: {0}")
+  @MethodSource("getTestParametersForConfig")
+  public void frontier(final String name, final TransactionTestCaseSpec spec) {
+    milestone(spec, name, "Frontier", new FrontierGasCalculator(), Optional.empty());
+  }
+
+  @ParameterizedTest(name = "Name: {0}")
+  @MethodSource("getTestParametersForConfig")
+  public void homestead(final String name, final TransactionTestCaseSpec spec) {
+    milestone(spec, name, "Homestead", new HomesteadGasCalculator(), Optional.empty());
+  }
+
+  @ParameterizedTest(name = "Name: {0}")
+  @MethodSource("getTestParametersForConfig")
+  public void eIP150(final String name, final TransactionTestCaseSpec spec) {
+    milestone(spec, name, "EIP150", new TangerineWhistleGasCalculator(), Optional.empty());
+  }
+
+  @ParameterizedTest(name = "Name: {0}")
+  @MethodSource("getTestParametersForConfig")
+  public void eIP158(final String name, final TransactionTestCaseSpec spec) {
+    milestone(spec, name, "EIP158", new SpuriousDragonGasCalculator(), Optional.empty());
+  }
+
+  @ParameterizedTest(name = "Name: {0}")
+  @MethodSource("getTestParametersForConfig")
+  public void byzantium(final String name, final TransactionTestCaseSpec spec) {
+    milestone(spec, name, "Byzantium", new ByzantiumGasCalculator(), Optional.empty());
+  }
+
+  @ParameterizedTest(name = "Name: {0}")
+  @MethodSource("getTestParametersForConfig")
+  public void constantinople(final String name, final TransactionTestCaseSpec spec) {
+    milestone(spec, name, "Constantinople", new ConstantinopleGasCalculator(), Optional.empty());
+  }
+
+  @ParameterizedTest(name = "Name: {0}")
+  @MethodSource("getTestParametersForConfig")
+  public void petersburg(final String name, final TransactionTestCaseSpec spec) {
+    milestone(spec, name, "ConstantinopleFix", new PetersburgGasCalculator(), Optional.empty());
+  }
+
+  @ParameterizedTest(name = "Name: {0}")
+  @MethodSource("getTestParametersForConfig")
+  public void istanbul(final String name, final TransactionTestCaseSpec spec) {
+    milestone(spec, name, "Istanbul", new IstanbulGasCalculator(), Optional.empty());
+  }
+
+  @ParameterizedTest(name = "Name: {0}")
+  @MethodSource("getTestParametersForConfig")
+  public void berlin(final String name, final TransactionTestCaseSpec spec) {
+    milestone(spec, name, "Berlin", new BerlinGasCalculator(), Optional.empty());
+  }
+
+  @ParameterizedTest(name = "Name: {0}")
+  @MethodSource("getTestParametersForConfig")
+  public void london(final String name, final TransactionTestCaseSpec spec) {
+    milestone(spec, name, "London", new LondonGasCalculator(), Optional.of(Wei.of(0)));
+  }
+
+  public void milestone(
+      final TransactionTestCaseSpec spec, final String name, final String milestone, final GasCalculator gasCalculator, final Optional<Wei> baseFee) {
+
+    final TransactionTestCaseSpec.Expectation expected = spec.expectation(milestone);
+
+    try {
+      Bytes rlp = spec.getRlp();
+
+      // non-frontier transactions need to be opaque for parsing to work
+      if (rlp.get(0) > 0) {
+        final BytesValueRLPOutput output = new BytesValueRLPOutput();
+        output.writeBytes(rlp);
+        rlp = output.encoded();
+      }
+
+      // Test transaction deserialization (will throw an exception if it fails).
+      final Transaction transaction = Transaction.readFrom(RLP.input(rlp));
+      final ValidationResult<TransactionInvalidReason> validation =
+          transactionValidator(milestone)
+              .validate(transaction, baseFee, TransactionValidationParams.processingBlock());
+      if (!validation.isValid()) {
+        throw new RuntimeException(
+            String.format(
+                "Transaction is invalid %s - %s", validation.getInvalidReason(), transaction));
+      }
+
+      // Test rlp encoding
+      final Bytes actualRlp = RLP.encode(transaction::writeTo);
+      assertThat(expected.isSucceeds())
+          .withFailMessage("Transaction " + name + "/" + milestone + " was supposed to be invalid")
+          .isTrue();
+
+      assertThat(actualRlp).isEqualTo(rlp);
+
+      assertThat(transaction.getSender()).isEqualTo(expected.getSender());
+      assertThat(transaction.getHash()).isEqualTo(expected.getHash());
+      final long intrinsicGasCost =
+          gasCalculator.transactionIntrinsicGasCost(
+                  transaction.getPayload(), transaction.isContractCreation())
+              + (transaction.getAccessList().map(gasCalculator::accessListGasCost).orElse(0L));
+      assertThat(intrinsicGasCost).isEqualTo(expected.getIntrinsicGas());
+    } catch (final Exception e) {
+      if (expected.isSucceeds()) {
+        throw e;
+      }
+    }
+  }
+}
diff --git a/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/core/TransactionTestCaseSpec.java b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/core/TransactionTestCaseSpec.java
new file mode 100644
index 00000000000..7f9c3cb7c63
--- /dev/null
+++ b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/core/TransactionTestCaseSpec.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.core;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.tuweni.bytes.Bytes;
+
+/** A Transaction test case specification. */
+@JsonIgnoreProperties({"_info"})
+public class TransactionTestCaseSpec {
+
+  public static class Expectation {
+
+    private final Hash hash;
+
+    private final Address sender;
+
+    private long intrinsicGas;
+
+    private final boolean succeeds;
+
+    Expectation(
+        @JsonProperty("exception") final String exception,
+        @JsonProperty("hash") final String hash,
+        @JsonProperty("intrinsicGas") final String intrinsicGas,
+        @JsonProperty("sender") final String sender) {
+      this.succeeds = exception == null;
+      if (succeeds) {
+        this.hash = Hash.fromHexString(hash);
+        this.sender = Address.fromHexString(sender);
+        this.intrinsicGas = Long.decode(intrinsicGas);
+      } else {
+        this.hash = null;
+        this.sender = null;
+      }
+    }
+
+    public boolean isSucceeds() {
+      return this.succeeds;
+    }
+
+    public Hash getHash() {
+      return this.hash;
+    }
+
+    public Address getSender() {
+      return this.sender;
+    }
+
+    public long getIntrinsicGas() {
+      return intrinsicGas;
+    }
+  }
+
+  private final HashMap<String, Expectation> expectations;
+
+  private final Bytes rlp;
+
+  @SuppressWarnings("unchecked")
+  @JsonCreator
+  public TransactionTestCaseSpec(final Map<String, Object> props) {
+    expectations = new HashMap<>();
+    var result = (Map<String, Object>) props.get("result");
+    for (final Map.Entry<String, Object> entry : result.entrySet()) {
+      final Map<String, Object> expectation = (Map<String, Object>) entry.getValue();
+      expectations.put(
+          entry.getKey(),
+          new Expectation(
+              (String) expectation.get("exception"),
+              (String) expectation.get("hash"),
+              (String) expectation.get("intrinsicGas"),
+              (String) expectation.get("sender")));
+    }
+
+    Bytes parsedRlp = null;
+    try {
+      parsedRlp = Bytes.fromHexString(props.get("txbytes").toString());
+    } catch (final IllegalArgumentException e) {
+      // Some test cases include rlp "hex strings" with invalid characters
+      // In this case, just set rlp to null
+    }
+    this.rlp = parsedRlp;
+  }
+
+  public Bytes getRlp() {
+    return rlp;
+  }
+
+  public Expectation expectation(final String milestone) {
+    final Expectation expectation = expectations.get(milestone);
+
+    if (expectation == null) {
+      throw new IllegalStateException("Expectation for milestone " + milestone + " not found");
+    }
+
+    return expectation;
+  }
+}
diff --git a/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/mainnet/DifficultyCalculatorTests.java b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/mainnet/DifficultyCalculatorTests.java
new file mode 100644
index 00000000000..da9bcda0b14
--- /dev/null
+++ b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/mainnet/DifficultyCalculatorTests.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.ethereum.mainnet;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.config.GenesisConfigFile;
+import org.hyperledger.besu.config.JsonUtil;
+import org.hyperledger.besu.config.StubGenesisConfigOptions;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
+import org.hyperledger.besu.ethereum.core.Difficulty;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.evm.log.LogsBloomFilter;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.io.Resources;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class DifficultyCalculatorTests {
+
+  public static Stream<Arguments> getTestParametersForConfig() throws IOException {
+    return Stream.of(
+        Arguments.of(
+            "/BasicTests/difficultyMainNetwork.json",
+            MainnetProtocolSchedule.fromConfig(
+                GenesisConfigFile.mainnet()
+                    .getConfigOptions(Map.of("shanghaiTime", "999999999999")),
+                EvmConfiguration.DEFAULT)),
+        Arguments.of(
+          "/DifficultyTests/dfGrayGlacier/difficultyGrayGlacierForkBlock.json",
+          MainnetProtocolSchedule.fromConfig(
+              new StubGenesisConfigOptions().grayGlacierBlock(15050000))
+        ),
+        Arguments.of(
+                "/DifficultyTests/dfGrayGlacier/difficultyGrayGlacierTimeDiff1.json",
+                MainnetProtocolSchedule.fromConfig(
+                        new StubGenesisConfigOptions().grayGlacierBlock(15050000))
+        ),
+        Arguments.of(
+                "/DifficultyTests/dfGrayGlacier/difficultyGrayGlacierTimeDiff2.json",
+                MainnetProtocolSchedule.fromConfig(
+                        new StubGenesisConfigOptions().grayGlacierBlock(15050000))
+        ),
+        Arguments.of(
+          "/DifficultyTests/dfArrowGlacier/difficultyArrowGlacierForkBlock.json",
+          MainnetProtocolSchedule.fromConfig(
+              new StubGenesisConfigOptions().arrowGlacierBlock(13773000))
+        ),
+        Arguments.of(
+          "/DifficultyTests/dfArrowGlacier/difficultyArrowGlacierTimeDiff1.json",
+          MainnetProtocolSchedule.fromConfig(
+              new StubGenesisConfigOptions().arrowGlacierBlock(13773000))
+        ),
+        Arguments.of(
+          "/DifficultyTests/dfArrowGlacier/difficultyArrowGlacierTimeDiff2.json",
+          MainnetProtocolSchedule.fromConfig(
+              new StubGenesisConfigOptions().arrowGlacierBlock(13773000))
+        ),
+        Arguments.of(
+          "/DifficultyTests/dfByzantium/difficultyByzantium.json",
+          MainnetProtocolSchedule.fromConfig(new StubGenesisConfigOptions().byzantiumBlock(0))
+        ),
+        Arguments.of(
+          "/DifficultyTests/dfConstantinople/difficultyConstantinople.json",
+          MainnetProtocolSchedule.fromConfig(new StubGenesisConfigOptions().constantinopleBlock(0))
+        ),
+        Arguments.of(
+          "/DifficultyTests/dfEIP2384/difficultyEIP2384.json",
+          MainnetProtocolSchedule.fromConfig(new StubGenesisConfigOptions().muirGlacierBlock(0))
+        ),
+        Arguments.of(
+          "/DifficultyTests/dfEIP2384/difficultyEIP2384_random.json",
+          MainnetProtocolSchedule.fromConfig(new StubGenesisConfigOptions().muirGlacierBlock(0))
+        ),
+        Arguments.of(
+          "/DifficultyTests/dfEIP2384/difficultyEIP2384_random_to20M.json",
+          MainnetProtocolSchedule.fromConfig(new StubGenesisConfigOptions().muirGlacierBlock(0))
+        ),
+        Arguments.of(
+          "/DifficultyTests/dfFrontier/difficultyFrontier.json",
+          MainnetProtocolSchedule.fromConfig(new StubGenesisConfigOptions())
+        ),
+        Arguments.of(
+          "/DifficultyTests/dfHomestead/difficultyHomestead.json",
+          MainnetProtocolSchedule.fromConfig(new StubGenesisConfigOptions().homesteadBlock(0))
+        ));
+  }
+
+  @ParameterizedTest(name = "TestFile: {0}")
+  @MethodSource("getTestParametersForConfig")
+  public void testDifficultyCalculation(final String testFile, final ProtocolSchedule protocolSchedule) throws IOException {
+    final MainnetBlockHeaderFunctions blockHeaderFunctions = new MainnetBlockHeaderFunctions();
+    final ObjectNode testObject =
+        JsonUtil.objectNodeFromString(
+            Resources.toString(
+                DifficultyCalculatorTests.class.getResource(testFile), StandardCharsets.UTF_8));
+
+    if (testObject.size() == 1) {
+      final var topObjectIterator = testObject.fields();
+      while (topObjectIterator.hasNext()) {
+        final Map.Entry<String, JsonNode> testNameIterator = topObjectIterator.next();
+        final var testHolderIter = testNameIterator.getValue().fields();
+        while (testHolderIter.hasNext()) {
+          final var testList = testHolderIter.next();
+          if (!testList.getKey().equals("_info")) {
+            testDifficulty(testFile, protocolSchedule, blockHeaderFunctions, (ObjectNode) testList.getValue());
+          }
+        }
+      }
+    } else {
+      testDifficulty(testFile, protocolSchedule, blockHeaderFunctions, testObject);
+    }
+  }
+
+  private void testDifficulty(
+      final String testFile, final ProtocolSchedule protocolSchedule, final MainnetBlockHeaderFunctions blockHeaderFunctions, final ObjectNode testObject) {
+    final var fields = testObject.fields();
+    while (fields.hasNext()) {
+      final var entry = fields.next();
+      final JsonNode value = entry.getValue();
+      final long currentBlockNumber = extractLong(value, "currentBlockNumber");
+      String parentUncles = value.get("parentUncles").asText();
+      final BlockHeader testHeader =
+          BlockHeaderBuilder.create()
+              .parentHash(Hash.EMPTY)
+              .coinbase(Address.ZERO)
+              .gasLimit(Long.MAX_VALUE)
+              .stateRoot(Hash.EMPTY)
+              .transactionsRoot(Hash.EMPTY)
+              .receiptsRoot(Hash.EMPTY)
+              .logsBloom(new LogsBloomFilter())
+              .gasUsed(0)
+              .extraData(Bytes.of())
+              .mixHash(Hash.EMPTY)
+              .nonce(0)
+              .blockHeaderFunctions(blockHeaderFunctions)
+              .timestamp(extractLong(value, "parentTimestamp"))
+              .difficulty(Difficulty.fromHexString(value.get("parentDifficulty").asText()))
+              .ommersHash(
+                  parentUncles.equals("0x00")
+                      ? Hash.EMPTY_LIST_HASH
+                      : Hash.fromHexStringLenient(parentUncles))
+              .number(currentBlockNumber)
+              .buildBlockHeader();
+      final long currentTime = extractLong(value, "currentTimestamp");
+      final UInt256 currentDifficulty =
+          UInt256.fromHexString(value.get("currentDifficulty").asText());
+      final var spec = protocolSchedule.getByBlockHeader(testHeader);
+      final var calculator = spec.getDifficultyCalculator();
+      assertThat(UInt256.valueOf(calculator.nextDifficulty(currentTime, testHeader, null)))
+          .describedAs("File %s Test %s", testFile, entry.getKey())
+          .isEqualTo(currentDifficulty);
+    }
+  }
+
+  private long extractLong(final JsonNode node, final String name) {
+    return Long.decode(node.get(name).asText());
+  }
+}
diff --git a/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/rlp/InvalidRLPRefTest.java b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/rlp/InvalidRLPRefTest.java
new file mode 100644
index 00000000000..718e5d19bd6
--- /dev/null
+++ b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/rlp/InvalidRLPRefTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.rlp;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
+import org.hyperledger.besu.ethereum.rlp.util.RLPTestUtil;
+import org.hyperledger.besu.testutil.JsonTestParameters;
+
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/** The Ethereum reference RLP tests. */
+public class InvalidRLPRefTest {
+
+  private static final String[] TEST_CONFIG_FILES = {
+    // TODO: upstream these additional tests to the ethereum tests repo
+    "org/hyperledger/besu/ethereum/rlp/invalidRLPTest.json", "RLPTests/invalidRLPTest.json"
+  };
+
+  public static Stream<Arguments> getTestParametersForConfig() {
+    return JsonTestParameters.create(InvalidRLPRefTestCaseSpec.class).generate(TEST_CONFIG_FILES).stream().map(params -> Arguments.of(params[0], params[1], params[2]));
+  }
+
+  /** Test RLP decoding. */
+  @ParameterizedTest(name = "Name: {0}")
+  @MethodSource("getTestParametersForConfig")
+  public void decode(final String name, final InvalidRLPRefTestCaseSpec spec, final boolean runTest) {
+    assumeTrue(runTest, "Test was blacklisted");
+    final Bytes rlp = spec.getRLP();
+    assertThatThrownBy(() -> RLPTestUtil.decode(rlp)).isInstanceOf(RLPException.class);
+  }
+}
diff --git a/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/InvalidRLPRefTestCaseSpec.java b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/rlp/InvalidRLPRefTestCaseSpec.java
similarity index 100%
rename from ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/InvalidRLPRefTestCaseSpec.java
rename to ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/rlp/InvalidRLPRefTestCaseSpec.java
diff --git a/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/rlp/RLPRefTest.java b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/rlp/RLPRefTest.java
new file mode 100644
index 00000000000..a4eff43c98d
--- /dev/null
+++ b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/rlp/RLPRefTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.rlp;
+
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
+import org.assertj.core.api.Assertions;
+import org.hyperledger.besu.ethereum.rlp.util.RLPTestUtil;
+import org.hyperledger.besu.testutil.JsonTestParameters;
+
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/** The Ethereum reference RLP tests. */
+public class RLPRefTest {
+
+  private static final String TEST_CONFIG_FILES = "RLPTests/rlptest.json";
+
+  public static Stream<Arguments> getTestParametersForConfig() {
+    return JsonTestParameters.create(RLPRefTestCaseSpec.class).generate(TEST_CONFIG_FILES).stream().map(params -> Arguments.of(params[0], params[1], params[2]));
+  }
+
+  @ParameterizedTest(name = "Name: {0}")
+  @MethodSource("getTestParametersForConfig")
+  public void encode(final String name, final RLPRefTestCaseSpec spec, final boolean runTest) {
+    assumeTrue(runTest, "Test was blacklisted");
+    Assertions.assertThat(RLPTestUtil.encode(spec.getIn())).isEqualTo(spec.getOut());
+  }
+
+  @ParameterizedTest(name = "Name: {0}")
+  @MethodSource("getTestParametersForConfig")
+  public void decode(final String name, final RLPRefTestCaseSpec spec, final boolean runTest) {
+    assumeTrue(runTest, "Test was blacklisted");
+    Assertions.assertThat(RLPTestUtil.decode(spec.getOut())).isEqualTo(spec.getIn());
+  }
+}
diff --git a/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/RLPRefTestCaseSpec.java b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/rlp/RLPRefTestCaseSpec.java
similarity index 100%
rename from ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/RLPRefTestCaseSpec.java
rename to ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/rlp/RLPRefTestCaseSpec.java
diff --git a/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/trie/TrieRefTest.java b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/trie/TrieRefTest.java
new file mode 100644
index 00000000000..a7739071733
--- /dev/null
+++ b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/trie/TrieRefTest.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.trie;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
+import org.hyperledger.besu.ethereum.trie.patricia.SimpleMerklePatriciaTrie;
+import org.hyperledger.besu.testutil.JsonTestParameters;
+
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class TrieRefTest {
+
+  private static final String[] TEST_CONFIG_FILES = {"TrieTests/trietest.json"};
+
+  public static Stream<Arguments> getTestParametersForConfig() {
+    return JsonTestParameters.create(TrieRefTestCaseSpec.class).generate(TEST_CONFIG_FILES).stream().map(params -> Arguments.of(params[0], params[1], params[2]));
+  }
+
+  @ParameterizedTest(name = "Name: {0}")
+  @MethodSource("getTestParametersForConfig")
+  public void rootHashAfterInsertionsAndRemovals(final String name, final TrieRefTestCaseSpec spec, final boolean runTest) {
+    assumeTrue(runTest, "Test was blacklisted");
+    final SimpleMerklePatriciaTrie<Bytes, Bytes> trie =
+        new SimpleMerklePatriciaTrie<>(Function.identity());
+    for (final Bytes[] pair : spec.getIn()) {
+      if (pair[1] == null) {
+        trie.remove(pair[0]);
+      } else {
+        trie.put(pair[0], pair[1]);
+      }
+    }
+
+    assertThat(spec.getRoot()).isEqualTo(trie.getRootHash());
+  }
+}
diff --git a/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieRefTestCaseSpec.java b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/trie/TrieRefTestCaseSpec.java
similarity index 100%
rename from ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieRefTestCaseSpec.java
rename to ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/trie/TrieRefTestCaseSpec.java
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestTools.java b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestTools.java
similarity index 77%
rename from ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestTools.java
rename to ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestTools.java
index f97ff018982..a4a27647a7b 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestTools.java
+++ b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestTools.java
@@ -16,15 +16,15 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.config.experimental.ExperimentalEIPs;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockImporter;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
+import org.hyperledger.besu.ethereum.mainnet.BlockImportResult;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 import org.hyperledger.besu.ethereum.referencetests.BlockchainReferenceTestCaseSpec;
 import org.hyperledger.besu.ethereum.referencetests.ReferenceTestProtocolSchedules;
@@ -48,16 +48,17 @@ public class BlockchainReferenceTestTools {
         System.getProperty(
             "test.ethereum.blockchain.eips",
             "FrontierToHomesteadAt5,HomesteadToEIP150At5,HomesteadToDaoAt5,EIP158ToByzantiumAt5,"
-                + "Frontier,Homestead,EIP150,EIP158,Byzantium,Constantinople,ConstantinopleFix,Istanbul,Berlin");
+                + "Frontier,Homestead,EIP150,EIP158,Byzantium,Constantinople,ConstantinopleFix,Istanbul,Berlin,"
+                + "London,Merge,Shanghai,Cancun,Prague,Osaka,Bogota");
     NETWORKS_TO_RUN = Arrays.asList(networks.split(","));
   }
 
   private static final JsonTestParameters<?, ?> params =
       JsonTestParameters.create(BlockchainReferenceTestCaseSpec.class)
           .generator(
-              (testName, spec, collector) -> {
+              (testName, fullPath, spec, collector) -> {
                 final String eip = spec.getNetwork();
-                collector.add(testName + "[" + eip + "]", spec, NETWORKS_TO_RUN.contains(eip));
+                collector.add(testName + "[" + eip + "]", fullPath, spec, NETWORKS_TO_RUN.contains(eip));
               });
 
   static {
@@ -65,10 +66,6 @@ public class BlockchainReferenceTestTools {
       params.ignoreAll();
     }
 
-    // Known bad test.
-    params.ignore(
-        "RevertPrecompiledTouch(_storage)?_d(0|3)g0v0_(EIP158|Byzantium|Constantinople|ConstantinopleFix)");
-
     // Consumes a huge amount of memory
     params.ignore("static_Call1MB1024Calldepth_d1g0v0_\\w+");
     params.ignore("ShanghaiLove_.*");
@@ -78,11 +75,20 @@ public class BlockchainReferenceTestTools {
 
     // Don't do time consuming tests
     params.ignore("CALLBlake2f_MaxRounds.*");
+    params.ignore("loopMul_*");
 
-    // Berlin isn't finalized
-    if (!ExperimentalEIPs.berlinEnabled) {
-      params.ignore(".*[_-]Berlin");
-    }
+    // Inconclusive fork choice rule, since in merge CL should be choosing forks and setting the
+    // chain head.
+    // Perfectly valid test pre-merge.
+    params.ignore("UncleFromSideChain_(Merge|Shanghai|Cancun|Prague|Osaka|Bogota)");
+
+    // EIP tests are explicitly meant to be works-in-progress with known failing tests
+    // We want to however include withdrawals even though they are EIP tests
+    params.ignore("(?:/EIPTests/(?!\\bbc4895\\b))");
+  }
+
+  private BlockchainReferenceTestTools() {
+    // utility class
   }
 
   public static Collection<Object[]> generateTestParametersForConfig(final String[] filePath) {
@@ -90,9 +96,11 @@ public static Collection<Object[]> generateTestParametersForConfig(final String[
   }
 
   public static void executeTest(final BlockchainReferenceTestCaseSpec spec) {
-    final MutableWorldState worldState =
-        spec.getWorldStateArchive().getMutable(spec.getGenesisBlockHeader().getStateRoot()).get();
     final BlockHeader genesisBlockHeader = spec.getGenesisBlockHeader();
+    final MutableWorldState worldState =
+        spec.getWorldStateArchive()
+            .getMutable(genesisBlockHeader.getStateRoot(), genesisBlockHeader.getHash())
+            .get();
     assertThat(worldState.rootHash()).isEqualTo(genesisBlockHeader.getStateRoot());
 
     final ProtocolSchedule schedule =
@@ -110,16 +118,16 @@ public static void executeTest(final BlockchainReferenceTestCaseSpec spec) {
       try {
         final Block block = candidateBlock.getBlock();
 
-        final ProtocolSpec protocolSpec = schedule.getByBlockNumber(block.getHeader().getNumber());
+        final ProtocolSpec protocolSpec = schedule.getByBlockHeader(block.getHeader());
         final BlockImporter blockImporter = protocolSpec.getBlockImporter();
         final HeaderValidationMode validationMode =
             "NoProof".equalsIgnoreCase(spec.getSealEngine())
                 ? HeaderValidationMode.LIGHT
                 : HeaderValidationMode.FULL;
-        final boolean imported =
+        final BlockImportResult importResult =
             blockImporter.importBlock(context, block, validationMode, validationMode);
 
-        assertThat(imported).isEqualTo(candidateBlock.isValid());
+        assertThat(importResult.isImported()).isEqualTo(candidateBlock.isValid());
       } catch (final RLPException e) {
         assertThat(candidateBlock.isValid()).isFalse();
       }
diff --git a/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTestTools.java b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTestTools.java
new file mode 100644
index 00000000000..41dffe2b5bf
--- /dev/null
+++ b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTestTools.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.vm;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.DataGas;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
+import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
+import org.hyperledger.besu.ethereum.processing.TransactionProcessingResult;
+import org.hyperledger.besu.ethereum.referencetests.GeneralStateTestCaseEipSpec;
+import org.hyperledger.besu.ethereum.referencetests.GeneralStateTestCaseSpec;
+import org.hyperledger.besu.ethereum.referencetests.ReferenceTestBlockchain;
+import org.hyperledger.besu.ethereum.referencetests.ReferenceTestProtocolSchedules;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.worldstate.DefaultMutableWorldState;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.worldstate.WorldState;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+import org.hyperledger.besu.testutil.JsonTestParameters;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+public class GeneralStateReferenceTestTools {
+  private static final ReferenceTestProtocolSchedules REFERENCE_TEST_PROTOCOL_SCHEDULES =
+      ReferenceTestProtocolSchedules.create();
+  private static final List<String> SPECS_PRIOR_TO_DELETING_EMPTY_ACCOUNTS =
+      Arrays.asList("Frontier", "Homestead", "EIP150");
+
+  private static MainnetTransactionProcessor transactionProcessor(final String name) {
+    return protocolSpec(name)
+        .getTransactionProcessor();
+  }
+
+  private static ProtocolSpec protocolSpec(final String name) {
+    return REFERENCE_TEST_PROTOCOL_SCHEDULES
+            .getByName(name)
+            .getByBlockHeader(BlockHeaderBuilder.createDefault().buildBlockHeader());
+  }
+
+  private static final List<String> EIPS_TO_RUN;
+
+  static {
+    final String eips =
+        System.getProperty(
+            "test.ethereum.state.eips",
+            "Frontier,Homestead,EIP150,EIP158,Byzantium,Constantinople,ConstantinopleFix,Istanbul,Berlin,"
+                + "London,Merge,Shanghai,Cancun,Prague,Osaka,Bogota");
+    EIPS_TO_RUN = Arrays.asList(eips.split(","));
+  }
+
+  private static final JsonTestParameters<?, ?> params =
+      JsonTestParameters.create(GeneralStateTestCaseSpec.class, GeneralStateTestCaseEipSpec.class)
+          .generator(
+              (testName, fullPath, stateSpec, collector) -> {
+                final String prefix = testName + "-";
+                for (final Map.Entry<String, List<GeneralStateTestCaseEipSpec>> entry :
+                    stateSpec.finalStateSpecs().entrySet()) {
+                  final String eip = entry.getKey();
+                  final boolean runTest = EIPS_TO_RUN.contains(eip);
+                  final List<GeneralStateTestCaseEipSpec> eipSpecs = entry.getValue();
+                  if (eipSpecs.size() == 1) {
+                    collector.add(prefix + eip, fullPath, eipSpecs.get(0), runTest);
+                  } else {
+                    for (int i = 0; i < eipSpecs.size(); i++) {
+                      collector.add(
+                          prefix + eip + '[' + i + ']', fullPath, eipSpecs.get(i), runTest);
+                    }
+                  }
+                }
+              });
+
+  static {
+    if (EIPS_TO_RUN.isEmpty()) {
+      params.ignoreAll();
+    }
+
+    // Consumes a huge amount of memory
+    params.ignore("static_Call1MB1024Calldepth-\\w");
+    params.ignore("ShanghaiLove_.*");
+
+    // Don't do time consuming tests
+    params.ignore("CALLBlake2f_MaxRounds.*");
+    params.ignore("loopMul-.*");
+
+    // EIP tests are explicitly meant to be works-in-progress with known failing tests
+    params.ignore("/EIPTests/");
+  }
+
+  private GeneralStateReferenceTestTools() {
+    // utility class
+  }
+
+  public static Collection<Object[]> generateTestParametersForConfig(final String[] filePath) {
+    return params.generate(filePath);
+  }
+
+  public static void executeTest(final GeneralStateTestCaseEipSpec spec) {
+    final BlockHeader blockHeader = spec.getBlockHeader();
+    final WorldState initialWorldState = spec.getInitialWorldState();
+    final Transaction transaction = spec.getTransaction();
+
+    // Sometimes the tests ask us assemble an invalid transaction.  If we have
+    // no valid transaction then there is no test.  GeneralBlockChain tests
+    // will handle the case where we receive the TXs in a serialized form.
+    if (transaction == null) {
+      assertThat(spec.getExpectException())
+          .withFailMessage("Transaction was not assembled, but no exception was expected")
+          .isNotNull();
+      return;
+    }
+
+    final MutableWorldState worldState = new DefaultMutableWorldState(initialWorldState);
+    // Several of the GeneralStateTests check if the transaction could potentially
+    // consume more gas than is left for the block it's attempted to be included in.
+    // This check is performed within the `BlockImporter` rather than inside the
+    // `TransactionProcessor`, so these tests are skipped.
+    if (transaction.getGasLimit() > blockHeader.getGasLimit() - blockHeader.getGasUsed()) {
+      return;
+    }
+
+    final MainnetTransactionProcessor processor = transactionProcessor(spec.getFork());
+    final WorldUpdater worldStateUpdater = worldState.updater();
+    final ReferenceTestBlockchain blockchain = new ReferenceTestBlockchain(blockHeader.getNumber());
+    // Todo: EIP-4844 use the excessDataGas of the parent instead of DataGas.ZERO
+    final Wei dataGasPrice = protocolSpec(spec.getFork()).getFeeMarket().dataPrice(DataGas.ZERO);
+    final TransactionProcessingResult result =
+        processor.processTransaction(
+            blockchain,
+            worldStateUpdater,
+            blockHeader,
+            transaction,
+            blockHeader.getCoinbase(),
+            new CachingBlockHashLookup(blockHeader, blockchain),
+            false,
+            TransactionValidationParams.processingBlock(),
+            dataGasPrice);
+    if (result.isInvalid()) {
+      assertThat(spec.getExpectException()).isNotNull();
+      return;
+    }
+    assertThat(spec.getExpectException())
+        .withFailMessage("Exception was expected - " + spec.getExpectException())
+        .isNull();
+
+    final Account coinbase = worldStateUpdater.getOrCreate(spec.getBlockHeader().getCoinbase());
+    if (coinbase != null && coinbase.isEmpty() && shouldClearEmptyAccounts(spec.getFork())) {
+      worldStateUpdater.deleteAccount(coinbase.getAddress());
+    }
+    worldStateUpdater.commit();
+
+    // Check the world state root hash.
+    final Hash expectedRootHash = spec.getExpectedRootHash();
+    assertThat(worldState.rootHash())
+        .withFailMessage(
+            "Unexpected world state root hash; expected state: %s, computed state: %s",
+            spec.getExpectedRootHash(), worldState.rootHash())
+        .isEqualTo(expectedRootHash);
+
+    // Check the logs.
+    final Hash expectedLogsHash = spec.getExpectedLogsHash();
+    Optional.ofNullable(expectedLogsHash)
+        .ifPresent(
+            expected -> {
+              final List<Log> logs = result.getLogs();
+
+              assertThat(Hash.hash(RLP.encode(out -> out.writeList(logs, Log::writeTo))))
+                  .withFailMessage("Unmatched logs hash. Generated logs: %s", logs)
+                  .isEqualTo(expected);
+            });
+  }
+
+  private static boolean shouldClearEmptyAccounts(final String eip) {
+    return !SPECS_PRIOR_TO_DELETING_EMPTY_ACCOUNTS.contains(eip);
+  }
+}
diff --git a/ethereum/rlp/src/test/resources/org/hyperledger/besu/ethereum/rlp/invalidRLPTest.json b/ethereum/referencetests/src/reference-test/resources/org/hyperledger/besu/ethereum/rlp/invalidRLPTest.json
similarity index 100%
rename from ethereum/rlp/src/test/resources/org/hyperledger/besu/ethereum/rlp/invalidRLPTest.json
rename to ethereum/referencetests/src/reference-test/resources/org/hyperledger/besu/ethereum/rlp/invalidRLPTest.json
diff --git a/ethereum/core/src/test/resources/regressions/generalstate/ripeMdAccountShouldBeDeletedWhenEmptyAndTouchedTransactionSucceedsPostEIP158.json b/ethereum/referencetests/src/reference-test/resources/regressions/generalstate/ripeMdAccountShouldBeDeletedWhenEmptyAndTouchedTransactionSucceedsPostEIP158.json
similarity index 100%
rename from ethereum/core/src/test/resources/regressions/generalstate/ripeMdAccountShouldBeDeletedWhenEmptyAndTouchedTransactionSucceedsPostEIP158.json
rename to ethereum/referencetests/src/reference-test/resources/regressions/generalstate/ripeMdAccountShouldBeDeletedWhenEmptyAndTouchedTransactionSucceedsPostEIP158.json
diff --git a/ethereum/core/src/test/resources/regressions/generalstate/ripeMdAccountShouldNotBeDeletedWhenEmptyAndTouchedTransactionFails.json b/ethereum/referencetests/src/reference-test/resources/regressions/generalstate/ripeMdAccountShouldNotBeDeletedWhenEmptyAndTouchedTransactionFails.json
similarity index 100%
rename from ethereum/core/src/test/resources/regressions/generalstate/ripeMdAccountShouldNotBeDeletedWhenEmptyAndTouchedTransactionFails.json
rename to ethereum/referencetests/src/reference-test/resources/regressions/generalstate/ripeMdAccountShouldNotBeDeletedWhenEmptyAndTouchedTransactionFails.json
diff --git a/ethereum/core/src/test/resources/regressions/generalstate/ripeMdAccountShouldNotBeDeletedWhenNonEmptyAndTouchedTransactionFails.json b/ethereum/referencetests/src/reference-test/resources/regressions/generalstate/ripeMdAccountShouldNotBeDeletedWhenNonEmptyAndTouchedTransactionFails.json
similarity index 100%
rename from ethereum/core/src/test/resources/regressions/generalstate/ripeMdAccountShouldNotBeDeletedWhenNonEmptyAndTouchedTransactionFails.json
rename to ethereum/referencetests/src/reference-test/resources/regressions/generalstate/ripeMdAccountShouldNotBeDeletedWhenNonEmptyAndTouchedTransactionFails.json
diff --git a/ethereum/core/src/test/resources/regressions/generalstate/ripeMdAccountShouldNotBeDeletedWhenNonEmptyAndTouchedTransactionSucceeds.json b/ethereum/referencetests/src/reference-test/resources/regressions/generalstate/ripeMdAccountShouldNotBeDeletedWhenNonEmptyAndTouchedTransactionSucceeds.json
similarity index 100%
rename from ethereum/core/src/test/resources/regressions/generalstate/ripeMdAccountShouldNotBeDeletedWhenNonEmptyAndTouchedTransactionSucceeds.json
rename to ethereum/referencetests/src/reference-test/resources/regressions/generalstate/ripeMdAccountShouldNotBeDeletedWhenNonEmptyAndTouchedTransactionSucceeds.json
diff --git a/ethereum/referencetests/src/reference-test/templates/BlockchainReferenceTest.java.template b/ethereum/referencetests/src/reference-test/templates/BlockchainReferenceTest.java.template
new file mode 100644
index 00000000000..f8b99e8a735
--- /dev/null
+++ b/ethereum/referencetests/src/reference-test/templates/BlockchainReferenceTest.java.template
@@ -0,0 +1,36 @@
+package org.hyperledger.besu.ethereum.vm.blockchain;
+
+import static org.hyperledger.besu.ethereum.vm.BlockchainReferenceTestTools.executeTest;
+import static org.hyperledger.besu.ethereum.vm.BlockchainReferenceTestTools.generateTestParametersForConfig;
+
+import org.hyperledger.besu.ethereum.referencetests.BlockchainReferenceTestCaseSpec;
+
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
+/** The blockchain test operation testing framework entry point. */
+public class %%TESTS_NAME%% {
+
+  private static final String[] TEST_CONFIG_FILE_DIR_PATH = new String[] {%%TESTS_FILE%%};
+
+  public static Stream<Arguments> getTestParametersForConfig() {
+    return generateTestParametersForConfig(TEST_CONFIG_FILE_DIR_PATH).stream().map(params ->
+        Arguments.of(params[0], params[1], params[2])
+        );
+  }
+
+  @ParameterizedTest(name = "Name: {0}")
+  @MethodSource("getTestParametersForConfig")
+  public void execution(
+      final String name,
+      final BlockchainReferenceTestCaseSpec spec,
+      final boolean runTest) {
+    assumeTrue(runTest, "Test " + name + " was ignored");
+    executeTest(spec);
+  }
+}
diff --git a/ethereum/referencetests/src/reference-test/templates/GeneralStateReferenceTest.java.template b/ethereum/referencetests/src/reference-test/templates/GeneralStateReferenceTest.java.template
new file mode 100644
index 00000000000..4b93b877334
--- /dev/null
+++ b/ethereum/referencetests/src/reference-test/templates/GeneralStateReferenceTest.java.template
@@ -0,0 +1,37 @@
+package org.hyperledger.besu.ethereum.vm.generalstate;
+
+import static org.hyperledger.besu.ethereum.vm.GeneralStateReferenceTestTools.executeTest;
+import static org.hyperledger.besu.ethereum.vm.GeneralStateReferenceTestTools.generateTestParametersForConfig;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
+import org.hyperledger.besu.ethereum.referencetests.GeneralStateTestCaseEipSpec;
+
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
+/** The general state test operation testing framework entry point. */
+public class %%TESTS_NAME%% {
+
+  private static final String[] TEST_CONFIG_FILE_DIR_PATH = new String[] {%%TESTS_FILE%%};
+
+  public static Stream<Arguments> getTestParametersForConfig() {
+    return generateTestParametersForConfig(TEST_CONFIG_FILE_DIR_PATH).stream().map(params ->
+        Arguments.of(params[0], params[1], params[2])
+        );
+  }
+
+  @ParameterizedTest(name = "Name: {0}")
+  @MethodSource("getTestParametersForConfig")
+  public void execution(
+      final String name,
+      final GeneralStateTestCaseEipSpec spec,
+      final boolean runTest) {
+    assumeTrue(runTest, "Test " + name + " was ignored");
+    executeTest(spec);
+  }
+}
diff --git a/ethereum/referencetests/src/test/resources b/ethereum/referencetests/src/test/resources
deleted file mode 160000
index b8abaebf594..00000000000
--- a/ethereum/referencetests/src/test/resources
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b8abaebf5949877ead03e8f74ac03c0ede41d5f7
diff --git a/ethereum/retesteth/build.gradle b/ethereum/retesteth/build.gradle
index 98bd11fb486..08d06932905 100644
--- a/ethereum/retesteth/build.gradle
+++ b/ethereum/retesteth/build.gradle
@@ -26,7 +26,10 @@ jar {
 }
 
 dependencies {
+  api 'org.slf4j:slf4j-api'
+
   implementation project(':config')
+  implementation project(':datatypes')
   implementation project(':ethereum:api')
   implementation project(':ethereum:api')
   implementation project(':ethereum:blockcreation')
@@ -34,6 +37,7 @@ dependencies {
   implementation project(':ethereum:eth')
   implementation project(':ethereum:p2p')
   implementation project(':ethereum:rlp')
+  implementation project(':evm')
   implementation project(':metrics:core')
   implementation project(':nat')
   implementation project(':services:kvstore')
@@ -42,13 +46,14 @@ dependencies {
   implementation 'com.google.guava:guava'
   implementation 'io.vertx:vertx-core'
   implementation 'io.vertx:vertx-web'
-  implementation 'org.apache.logging.log4j:log4j-api'
-  implementation 'org.apache.tuweni:bytes'
-  implementation 'org.apache.tuweni:units'
+  implementation 'com.fasterxml.jackson.core:jackson-databind'
+  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-units'
 
   testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.mockito:mockito-core'
 
-  runtimeOnly 'org.apache.logging.log4j:log4j-core'
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 }
diff --git a/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/DummySynchronizer.java b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/DummySynchronizer.java
new file mode 100644
index 00000000000..6b10f2c6807
--- /dev/null
+++ b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/DummySynchronizer.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.retesteth;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.ethereum.core.Synchronizer;
+import org.hyperledger.besu.plugin.data.SyncStatus;
+import org.hyperledger.besu.plugin.services.BesuEvents;
+
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/**
+ * Naive implementation of Synchronizer used by retesteth. Because retesteth is not implemented in
+ * the test module, it has no access to mockito. This class provides a minimum implementation needed
+ * to run RPC methods which may require a Synchronizer.
+ */
+public class DummySynchronizer implements Synchronizer {
+  @Override
+  public CompletableFuture<Void> start() {
+    return CompletableFuture.completedFuture(null);
+  }
+
+  @Override
+  public void stop() {}
+
+  @Override
+  public void awaitStop() throws InterruptedException {}
+
+  @Override
+  public Optional<SyncStatus> getSyncStatus() {
+    return Optional.empty();
+  }
+
+  @Override
+  public boolean resyncWorldState() {
+    return false;
+  }
+
+  @Override
+  public boolean healWorldState(
+      final Optional<Address> maybeAccountToRepair, final Bytes location) {
+    return false;
+  }
+
+  @Override
+  public long subscribeSyncStatus(final BesuEvents.SyncStatusListener listener) {
+    return 0;
+  }
+
+  @Override
+  public boolean unsubscribeSyncStatus(final long observerId) {
+    return false;
+  }
+
+  @Override
+  public long subscribeInSync(final InSyncListener listener) {
+    return 0;
+  }
+
+  @Override
+  public long subscribeInSync(final InSyncListener listener, final long syncTolerance) {
+    return 0;
+  }
+
+  @Override
+  public boolean unsubscribeInSync(final long listenerId) {
+    return false;
+  }
+}
diff --git a/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/NoRewardProtocolScheduleWrapper.java b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/NoRewardProtocolScheduleWrapper.java
index 0b4bfd88813..09f99f16281 100644
--- a/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/NoRewardProtocolScheduleWrapper.java
+++ b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/NoRewardProtocolScheduleWrapper.java
@@ -14,21 +14,24 @@
  */
 package org.hyperledger.besu.ethereum.retesteth;
 
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.BlockValidator;
 import org.hyperledger.besu.ethereum.MainnetBlockValidator;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockImporter;
+import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
 import org.hyperledger.besu.ethereum.core.TransactionFilter;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.fees.TransactionGasBudgetCalculator;
 import org.hyperledger.besu.ethereum.mainnet.BlockProcessor;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockImporter;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockProcessor;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
+import org.hyperledger.besu.ethereum.mainnet.ScheduledProtocolSpec;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
 
 import java.math.BigInteger;
 import java.util.Optional;
+import java.util.function.Predicate;
 
 public class NoRewardProtocolScheduleWrapper implements ProtocolSchedule {
 
@@ -39,8 +42,8 @@ public class NoRewardProtocolScheduleWrapper implements ProtocolSchedule {
   }
 
   @Override
-  public ProtocolSpec getByBlockNumber(final long number) {
-    final ProtocolSpec original = delegate.getByBlockNumber(number);
+  public ProtocolSpec getByBlockHeader(final ProcessableBlockHeader blockHeader) {
+    final ProtocolSpec original = delegate.getByBlockHeader(blockHeader);
     final BlockProcessor noRewardBlockProcessor =
         new MainnetBlockProcessor(
             original.getTransactionProcessor(),
@@ -48,7 +51,7 @@ public ProtocolSpec getByBlockNumber(final long number) {
             Wei.ZERO,
             original.getMiningBeneficiaryCalculator(),
             original.isSkipZeroBlockRewards(),
-            TransactionGasBudgetCalculator.frontier());
+            delegate);
     final BlockValidator noRewardBlockValidator =
         new MainnetBlockValidator(
             original.getBlockHeaderValidator(),
@@ -76,10 +79,24 @@ public ProtocolSpec getByBlockNumber(final long number) {
         original.getPrecompileContractRegistry(),
         original.isSkipZeroBlockRewards(),
         original.getGasCalculator(),
-        original.getTransactionPriceCalculator(),
-        original.getEip1559(),
-        original.getGasBudgetCalculator(),
-        original.getBadBlocksManager());
+        original.getGasLimitCalculator(),
+        original.getFeeMarket(),
+        original.getBadBlocksManager(),
+        Optional.empty(),
+        original.getWithdrawalsValidator(),
+        original.getWithdrawalsProcessor(),
+        original.getDepositsValidator(),
+        original.isPoS());
+  }
+
+  @Override
+  public boolean anyMatch(final Predicate<ScheduledProtocolSpec> predicate) {
+    return delegate.anyMatch(predicate);
+  }
+
+  @Override
+  public boolean isOnMilestoneBoundary(final BlockHeader blockHeader) {
+    return delegate.isOnMilestoneBoundary(blockHeader);
   }
 
   @Override
@@ -87,6 +104,21 @@ public Optional<BigInteger> getChainId() {
     return delegate.getChainId();
   }
 
+  @Override
+  public void putBlockNumberMilestone(final long blockNumber, final ProtocolSpec protocolSpec) {
+    delegate.putBlockNumberMilestone(blockNumber, protocolSpec);
+  }
+
+  @Override
+  public void putTimestampMilestone(final long timestamp, final ProtocolSpec protocolSpec) {
+    delegate.putTimestampMilestone(timestamp, protocolSpec);
+  }
+
+  @Override
+  public String listMilestones() {
+    return delegate.listMilestones();
+  }
+
   @Override
   public void setTransactionFilter(final TransactionFilter transactionFilter) {
     delegate.setTransactionFilter(transactionFilter);
diff --git a/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/RetestethContext.java b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/RetestethContext.java
index de83908ccf7..95cb744ace4 100644
--- a/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/RetestethContext.java
+++ b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/RetestethContext.java
@@ -18,6 +18,9 @@
 
 import org.hyperledger.besu.config.JsonGenesisConfigOptions;
 import org.hyperledger.besu.config.JsonUtil;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockReplay;
 import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
@@ -25,13 +28,13 @@
 import org.hyperledger.besu.ethereum.chain.DefaultBlockchain;
 import org.hyperledger.besu.ethereum.chain.GenesisState;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
-import org.hyperledger.besu.ethereum.core.Address;
+import org.hyperledger.besu.ethereum.chain.VariablesStorage;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
+import org.hyperledger.besu.ethereum.core.MiningParameters;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.fees.EIP1559;
+import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
 import org.hyperledger.besu.ethereum.eth.manager.EthContext;
 import org.hyperledger.besu.ethereum.eth.manager.EthMessages;
 import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
@@ -43,41 +46,47 @@
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
 import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolFactory;
 import org.hyperledger.besu.ethereum.mainnet.EpochCalculator;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolver;
-import org.hyperledger.besu.ethereum.mainnet.EthHasher;
 import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
 import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.mainnet.MainnetProtocolSchedule;
+import org.hyperledger.besu.ethereum.mainnet.PoWHasher;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolution;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolver;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage;
+import org.hyperledger.besu.ethereum.storage.keyvalue.VariablesKeyValueStorage;
 import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStateKeyValueStorage;
 import org.hyperledger.besu.ethereum.storage.keyvalue.WorldStatePreimageKeyValueStorage;
 import org.hyperledger.besu.ethereum.worldstate.DefaultWorldStateArchive;
 import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
 import org.hyperledger.besu.util.Subscribers;
 
+import java.util.Collections;
 import java.util.Optional;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.Supplier;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class RetestethContext {
 
-  private static final Logger LOG = LogManager.getLogger();
-  private static final EthHasher NO_WORK_HASHER =
-      (final byte[] buffer,
-          final long nonce,
-          final long number,
-          EpochCalculator epochCalc,
-          final byte[] headerHash) -> {};
+  private static final Logger LOG = LoggerFactory.getLogger(RetestethContext.class);
+  private static final PoWHasher NO_WORK_HASHER =
+      (final long nonce, final long number, EpochCalculator epochCalc, final Bytes headerHash) ->
+          new PoWSolution(nonce, Hash.ZERO, UInt256.ZERO, Hash.ZERO);
+  public static final int MAX_PEERS = 25;
 
   private final ReentrantLock contextLock = new ReentrantLock();
   private Address coinbase;
@@ -93,7 +102,10 @@ public class RetestethContext {
 
   private TransactionPool transactionPool;
   private EthScheduler ethScheduler;
-  private EthHashSolver ethHashSolver;
+  private PoWSolver poWSolver;
+
+  private Optional<Bytes> terminalTotalDifficulty;
+  private Optional<Bytes32> mixHash;
 
   public boolean resetContext(
       final String genesisConfigString, final String sealEngine, final Optional<Long> clockTime) {
@@ -129,10 +141,17 @@ private boolean buildContext(
     clockTime.ifPresent(retestethClock::resetTime);
     final MetricsSystem metricsSystem = new NoOpMetricsSystem();
 
+    terminalTotalDifficulty =
+        Optional.ofNullable(genesisConfig.get("params"))
+            .map(n -> n.get("terminaltotaldifficulty"))
+            .map(JsonNode::asText)
+            .map(Bytes::fromHexString);
+
     final JsonGenesisConfigOptions jsonGenesisConfigOptions =
         JsonGenesisConfigOptions.fromJsonObject(
             JsonUtil.getObjectNode(genesisConfig, "config").get());
-    protocolSchedule = MainnetProtocolSchedule.fromConfig(jsonGenesisConfigOptions);
+    protocolSchedule =
+        MainnetProtocolSchedule.fromConfig(jsonGenesisConfigOptions, EvmConfiguration.DEFAULT);
     if ("NoReward".equalsIgnoreCase(sealEngine)) {
       protocolSchedule = new NoRewardProtocolScheduleWrapper(protocolSchedule);
     }
@@ -141,6 +160,7 @@ private boolean buildContext(
     final GenesisState genesisState = GenesisState.fromJson(genesisConfigString, protocolSchedule);
     coinbase = genesisState.getBlock().getHeader().getCoinbase();
     extraData = genesisState.getBlock().getHeader().getExtraData();
+    mixHash = Optional.ofNullable(genesisState.getBlock().getHeader().getMixHashOrPrevRandao());
 
     final WorldStateArchive worldStateArchive =
         new DefaultWorldStateArchive(
@@ -150,7 +170,7 @@ private boolean buildContext(
     genesisState.writeStateTo(worldState);
 
     blockchain = createInMemoryBlockchain(genesisState.getBlock());
-    protocolContext = new ProtocolContext(blockchain, worldStateArchive, null);
+    protocolContext = new ProtocolContext(blockchain, worldStateArchive, null, Optional.empty());
 
     blockchainQueries = new BlockchainQueries(blockchain, worldStateArchive, ethScheduler);
 
@@ -161,37 +181,55 @@ private boolean buildContext(
             : HeaderValidationMode.FULL;
 
     final Iterable<Long> nonceGenerator = new IncrementingNonceGenerator(0);
-    ethHashSolver =
+    poWSolver =
         ("NoProof".equals(sealengine) || "NoReward".equals(sealEngine))
-            ? new EthHashSolver(
+            ? new PoWSolver(
                 nonceGenerator,
                 NO_WORK_HASHER,
                 false,
                 Subscribers.none(),
-                new EpochCalculator.DefaultEpochCalculator())
-            : new EthHashSolver(
+                new EpochCalculator.DefaultEpochCalculator(),
+                1000,
+                8)
+            : new PoWSolver(
                 nonceGenerator,
-                new EthHasher.Light(),
+                PoWHasher.ETHASH_LIGHT,
                 false,
                 Subscribers.none(),
-                new EpochCalculator.DefaultEpochCalculator());
+                new EpochCalculator.DefaultEpochCalculator(),
+                1000,
+                8);
 
-    blockReplay =
-        new BlockReplay(
-            protocolSchedule,
-            blockchainQueries.getBlockchain(),
-            blockchainQueries.getWorldStateArchive());
+    blockReplay = new BlockReplay(protocolSchedule, blockchainQueries.getBlockchain());
+
+    final Bytes localNodeKey = Bytes.wrap(new byte[64]);
 
     // mining support
 
-    final EthPeers ethPeers = new EthPeers("reteseth", retestethClock, metricsSystem);
+    final Supplier<ProtocolSpec> currentProtocolSpecSupplier =
+        () -> protocolSchedule.getByBlockHeader(blockchain.getChainHeadHeader());
+    final EthPeers ethPeers =
+        new EthPeers(
+            "reteseth",
+            currentProtocolSpecSupplier,
+            retestethClock,
+            metricsSystem,
+            EthProtocolConfiguration.DEFAULT_MAX_MESSAGE_SIZE,
+            Collections.emptyList(),
+            localNodeKey,
+            MAX_PEERS,
+            MAX_PEERS,
+            MAX_PEERS,
+            false);
     final SyncState syncState = new SyncState(blockchain, ethPeers);
 
     ethScheduler = new EthScheduler(1, 1, 1, 1, metricsSystem);
     final EthContext ethContext = new EthContext(ethPeers, new EthMessages(), ethScheduler);
 
     final TransactionPoolConfiguration transactionPoolConfiguration =
-        ImmutableTransactionPoolConfiguration.builder().build();
+        ImmutableTransactionPoolConfiguration.builder()
+            .txPoolLimitByAccountPercentage(0.004f)
+            .build();
 
     transactionPool =
         TransactionPoolFactory.createTransactionPool(
@@ -201,15 +239,12 @@ private boolean buildContext(
             retestethClock,
             metricsSystem,
             syncState,
-            Wei.ZERO,
-            transactionPoolConfiguration,
-            true,
-            jsonGenesisConfigOptions.getEIP1559BlockNumber().isPresent()
-                ? Optional.of(
-                    new EIP1559(jsonGenesisConfigOptions.getEIP1559BlockNumber().getAsLong()))
-                : Optional.empty());
+            new MiningParameters.Builder().minTransactionGasPrice(Wei.ZERO).build(),
+            transactionPoolConfiguration);
 
-    LOG.trace("Genesis Block {} ", genesisState::getBlock);
+    if (LOG.isTraceEnabled()) {
+      LOG.trace("Genesis Block {} ", genesisState.getBlock());
+    }
 
     return true;
   }
@@ -221,9 +256,12 @@ private static MutableBlockchain createInMemoryBlockchain(final Block genesisBlo
   private static MutableBlockchain createInMemoryBlockchain(
       final Block genesisBlock, final BlockHeaderFunctions blockHeaderFunctions) {
     final InMemoryKeyValueStorage keyValueStorage = new InMemoryKeyValueStorage();
+    final VariablesStorage variablesStorage =
+        new VariablesKeyValueStorage(new InMemoryKeyValueStorage());
     return DefaultBlockchain.createMutable(
         genesisBlock,
-        new KeyValueStoragePrefixedKeyBlockchainStorage(keyValueStorage, blockHeaderFunctions),
+        new KeyValueStoragePrefixedKeyBlockchainStorage(
+            keyValueStorage, variablesStorage, blockHeaderFunctions),
         new NoOpMetricsSystem(),
         100);
   }
@@ -244,8 +282,8 @@ public long getBlockHeight() {
     return blockchain.getChainHeadBlockNumber();
   }
 
-  public ProtocolSpec getProtocolSpec(final long blockNumber) {
-    return getProtocolSchedule().getByBlockNumber(blockNumber);
+  public ProtocolSpec getProtocolSpec(final BlockHeader blockHeader) {
+    return getProtocolSchedule().getByBlockHeader(blockHeader);
   }
 
   public BlockHeader getBlockHeader(final long blockNumber) {
@@ -288,7 +326,15 @@ public RetestethClock getRetestethClock() {
     return retestethClock;
   }
 
-  public EthHashSolver getEthHashSolver() {
-    return ethHashSolver;
+  public Optional<Bytes> getTerminalTotalDifficulty() {
+    return terminalTotalDifficulty;
+  }
+
+  public Optional<Bytes32> getMixHash() {
+    return mixHash;
+  }
+
+  public PoWSolver getEthHashSolver() {
+    return poWSolver;
   }
 }
diff --git a/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/RetestethService.java b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/RetestethService.java
index 1bb83aa5704..6bc6d1ef138 100644
--- a/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/RetestethService.java
+++ b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/RetestethService.java
@@ -30,6 +30,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.Web3ClientVersion;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory;
+import org.hyperledger.besu.ethereum.core.Synchronizer;
 import org.hyperledger.besu.ethereum.retesteth.methods.TestGetLogHash;
 import org.hyperledger.besu.ethereum.retesteth.methods.TestImportRawBlock;
 import org.hyperledger.besu.ethereum.retesteth.methods.TestMineBlocks;
@@ -63,21 +64,23 @@ public RetestethService(
     final BlockResultFactory blockResult = new BlockResultFactory();
     final NatService natService = new NatService(Optional.empty());
 
+    // Synchronizer needed by RPC methods. Didn't wanna mock it, since this isn't the test module.
+    Synchronizer sync = new DummySynchronizer();
+
     final Map<String, JsonRpcMethod> jsonRpcMethods =
         mapOf(
             new Web3ClientVersion(clientVersion),
             new TestSetChainParams(retestethContext),
             new TestImportRawBlock(retestethContext),
             new EthBlockNumber(retestethContext::getBlockchainQueries, true),
-            new EthGetBlockByNumber(retestethContext::getBlockchainQueries, blockResult, true),
+            new EthGetBlockByNumber(
+                retestethContext::getBlockchainQueries, blockResult, sync, true),
             new DebugAccountRange(retestethContext::getBlockchainQueries),
             new EthGetBalance(retestethContext::getBlockchainQueries),
             new EthGetBlockByHash(retestethContext::getBlockchainQueries, blockResult, true),
             new EthGetCode(retestethContext::getBlockchainQueries),
             new EthGetTransactionCount(
-                retestethContext::getBlockchainQueries,
-                retestethContext::getPendingTransactions,
-                true),
+                retestethContext::getBlockchainQueries, retestethContext::getPendingTransactions),
             new DebugStorageRangeAt(
                 retestethContext::getBlockchainQueries, retestethContext::getBlockReplay, true),
             new TestModifyTimestamp(retestethContext),
diff --git a/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestGetLogHash.java b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestGetLogHash.java
index 1640ffd04ab..637110b74a5 100644
--- a/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestGetLogHash.java
+++ b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestGetLogHash.java
@@ -14,15 +14,15 @@
  */
 package org.hyperledger.besu.ethereum.retesteth.methods;
 
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.query.TransactionReceiptWithMetadata;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.core.Log;
 import org.hyperledger.besu.ethereum.retesteth.RetestethContext;
 import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.evm.log.Log;
 
 import java.util.Optional;
 
@@ -55,6 +55,6 @@ private Hash calculateLogHash(
         RLP.encode(
             out ->
                 out.writeList(
-                    transactionReceiptWithMetadata.getReceipt().getLogs(), Log::writeTo)));
+                    transactionReceiptWithMetadata.getReceipt().getLogsList(), Log::writeTo)));
   }
 }
diff --git a/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestImportRawBlock.java b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestImportRawBlock.java
index c979772b4ab..32430eb4169 100644
--- a/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestImportRawBlock.java
+++ b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestImportRawBlock.java
@@ -23,16 +23,19 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockImporter;
+import org.hyperledger.besu.ethereum.mainnet.BlockImportResult;
 import org.hyperledger.besu.ethereum.retesteth.RetestethContext;
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPException;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import java.util.Collections;
+
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TestImportRawBlock implements JsonRpcMethod {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(TestImportRawBlock.class);
 
   public static final String METHOD_NAME = "test_importRawBlock";
 
@@ -62,19 +65,35 @@ public JsonRpcResponse response(final JsonRpcRequestContext requestContext) {
           requestContext.getRequest().getId(), JsonRpcError.BLOCK_RLP_IMPORT_ERROR);
     }
 
-    final BlockImporter blockImporter =
-        context.getProtocolSpec(block.getHeader().getNumber()).getBlockImporter();
-    if (blockImporter.importBlock(
-        protocolContext,
-        block,
-        context.getHeaderValidationMode(),
-        context.getHeaderValidationMode())) {
-      return new JsonRpcSuccessResponse(
-          requestContext.getRequest().getId(), block.getHash().toString());
+    // retesteth expects test_rawImportBlock to not only import the block, but append it to head
+    if (context.getBlockchain().contains(block.getHash())) {
+      // if we already have the block but it is not head, append it:
+      context
+          .getBlockchain()
+          .appendBlock(
+              block,
+              context
+                  .getBlockchain()
+                  .getTxReceipts(block.getHash())
+                  .orElse(Collections.emptyList()));
     } else {
-      LOG.debug("Failed to import block.");
-      return new JsonRpcErrorResponse(
-          requestContext.getRequest().getId(), JsonRpcError.BLOCK_IMPORT_ERROR);
+      // otherwise attempt to import the block
+      final BlockImporter blockImporter =
+          context.getProtocolSpec(block.getHeader()).getBlockImporter();
+      final BlockImportResult result =
+          blockImporter.importBlock(
+              protocolContext,
+              block,
+              context.getHeaderValidationMode(),
+              context.getHeaderValidationMode());
+      if (!result.isImported()) {
+        LOG.debug("Failed to import block.");
+        return new JsonRpcErrorResponse(
+            requestContext.getRequest().getId(), JsonRpcError.BLOCK_IMPORT_ERROR);
+      }
     }
+    // return success on append or import
+    return new JsonRpcSuccessResponse(
+        requestContext.getRequest().getId(), block.getHash().toString());
   }
 }
diff --git a/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestMineBlocks.java b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestMineBlocks.java
index b66f6ceb7c1..59ac6df2401 100644
--- a/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestMineBlocks.java
+++ b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestMineBlocks.java
@@ -14,22 +14,24 @@
  */
 package org.hyperledger.besu.ethereum.retesteth.methods;
 
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonRpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashBlockCreator;
-import org.hyperledger.besu.ethereum.blockcreation.GasLimitCalculator;
+import org.hyperledger.besu.ethereum.blockcreation.PoWBlockCreator;
 import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockImporter;
-import org.hyperledger.besu.ethereum.core.Wei;
+import org.hyperledger.besu.ethereum.mainnet.BlockImportResult;
 import org.hyperledger.besu.ethereum.mainnet.HeaderValidationMode;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.retesteth.RetestethClock;
 import org.hyperledger.besu.ethereum.retesteth.RetestethContext;
 
+import java.util.Optional;
+
 public class TestMineBlocks implements JsonRpcMethod {
   private final RetestethContext context;
 
@@ -60,26 +62,29 @@ private boolean mineNewBlock() {
     final ProtocolContext protocolContext = context.getProtocolContext();
     final MutableBlockchain blockchain = context.getBlockchain();
     final HeaderValidationMode headerValidationMode = context.getHeaderValidationMode();
-    final EthHashBlockCreator blockCreator =
-        new EthHashBlockCreator(
+    final PoWBlockCreator blockCreator =
+        new PoWBlockCreator(
             context.getCoinbase(),
+            () -> Optional.of(blockchain.getChainHeadHeader().getGasLimit()),
             header -> context.getExtraData(),
             context.getTransactionPool().getPendingTransactions(),
             protocolContext,
             protocolSchedule,
-            GasLimitCalculator.constant(),
             context.getEthHashSolver(),
             Wei.ZERO,
             0.0,
             blockchain.getChainHeadHeader());
-    final Block block = blockCreator.createBlock(retesethClock.instant().getEpochSecond());
+    final Block block =
+        blockCreator.createBlock(retesethClock.instant().getEpochSecond()).getBlock();
 
     // advance clock so next mine won't hit the same timestamp
     retesethClock.advanceSeconds(1);
 
     final BlockImporter blockImporter =
-        protocolSchedule.getByBlockNumber(blockchain.getChainHeadBlockNumber()).getBlockImporter();
-    return blockImporter.importBlock(
-        protocolContext, block, headerValidationMode, headerValidationMode);
+        protocolSchedule.getByBlockHeader(blockchain.getChainHeadHeader()).getBlockImporter();
+    final BlockImportResult result =
+        blockImporter.importBlock(
+            protocolContext, block, headerValidationMode, headerValidationMode);
+    return result.isImported();
   }
 }
diff --git a/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestRewindToBlock.java b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestRewindToBlock.java
index ee76a8c1dce..a2bc59ecc23 100644
--- a/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestRewindToBlock.java
+++ b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestRewindToBlock.java
@@ -23,13 +23,15 @@
 public class TestRewindToBlock implements JsonRpcMethod {
   private final RetestethContext context;
 
+  public static final String METHOD_NAME = "test_rewindToBlock";
+
   public TestRewindToBlock(final RetestethContext context) {
     this.context = context;
   }
 
   @Override
   public String getName() {
-    return "test_rewindToBlock";
+    return METHOD_NAME;
   }
 
   @Override
diff --git a/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestSetChainParams.java b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestSetChainParams.java
index 0c8c5915dbc..d55fbe9dd12 100644
--- a/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestSetChainParams.java
+++ b/ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/methods/TestSetChainParams.java
@@ -27,12 +27,12 @@
 import java.util.Optional;
 
 import io.vertx.core.json.JsonObject;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TestSetChainParams implements JsonRpcMethod {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(TestSetChainParams.class);
 
   public static final String METHOD_NAME = "test_setChainParams";
   private final RetestethContext context;
@@ -118,11 +118,20 @@ private static String modifyGenesisFile(final String initialGenesis) {
     maybeMoveToNumber(params, "EIP158ForkBlock", config, "eip158Block");
     maybeMoveToNumber(params, "byzantiumForkBlock", config, "byzantiumBlock");
     maybeMoveToNumber(params, "constantinopleForkBlock", config, "constantinopleBlock");
-    maybeMoveToNumber(params, "constantinopleFixForkBlock", config, "constantinopleFixBlock");
+    maybeMoveToNumber(params, "constantinopleFixForkBlock", config, "petersburgBlock");
     maybeMoveToNumber(params, "istanbulForkBlock", config, "istanbulBlock");
     maybeMoveToNumber(params, "muirGlacierForkBlock", config, "muirGlacierBlock");
     maybeMoveToNumber(params, "berlinForkBlock", config, "berlinBlock");
+    maybeMoveToNumber(params, "londonForkBlock", config, "londonBlock");
+    maybeMoveToNumber(params, "arrowGlacierForkBlock", config, "arrowGlacierBlock");
+    maybeMoveToNumber(params, "grayGlacierForkBlock", config, "grayGlacierBlock");
+    maybeMoveToNumber(params, "mergeNetSplitForkBlock", config, "mergeNetSplitBlock");
+    maybeMoveToNumber(params, "shanghaiForkTime", config, "shanghaiTime");
+    maybeMoveToNumber(params, "cancunForkTime", config, "cancunTime");
+    maybeMoveToNumber(params, "futureEipsForkTime", config, "futureEipsTime");
+    maybeMoveToNumber(params, "experimentalEipsForkTime", config, "experimentalEipsTime");
     maybeMoveToNumber(params, "chainID", config, "chainId", 1);
+
     maybeMove(genesis, "author", chainParamsJson, "coinbase");
     maybeMove(genesis, "difficulty", chainParamsJson, "difficulty");
     maybeMove(genesis, "extraData", chainParamsJson, "extraData");
@@ -131,6 +140,7 @@ private static String modifyGenesisFile(final String initialGenesis) {
     maybeMove(genesis, "nonce", chainParamsJson, "nonce");
     maybeMove(genesis, "timestamp", chainParamsJson, "timestamp");
     maybeMove(chainParamsJson, "accounts", chainParamsJson, "alloc");
+    maybeMove(genesis, "baseFeePerGas", chainParamsJson, "baseFeePerGas");
 
     // strip out precompiles with zero balance
     final JsonObject alloc = chainParamsJson.getJsonObject("alloc");
diff --git a/ethereum/retesteth/src/test/java/org/hyperledger/besu/ethereum/retesteth/methods/TestImportRawBlockTest.java b/ethereum/retesteth/src/test/java/org/hyperledger/besu/ethereum/retesteth/methods/TestImportRawBlockTest.java
index 040cd8813b0..27fc9f28f27 100644
--- a/ethereum/retesteth/src/test/java/org/hyperledger/besu/ethereum/retesteth/methods/TestImportRawBlockTest.java
+++ b/ethereum/retesteth/src/test/java/org/hyperledger/besu/ethereum/retesteth/methods/TestImportRawBlockTest.java
@@ -36,11 +36,14 @@
 
 public class TestImportRawBlockTest {
   private TestImportRawBlock test_importRawBlock;
+  private TestRewindToBlock test_rewindToBlock;
+  private RetestethContext context;
 
   @Before
   public void setupClass() throws IOException {
-    final RetestethContext context = new RetestethContext();
+    context = new RetestethContext();
     test_importRawBlock = new TestImportRawBlock(context);
+    test_rewindToBlock = new TestRewindToBlock(context);
     final TestSetChainParams test_setChainParams = new TestSetChainParams(context);
     final String chainParamsJsonString =
         Resources.toString(
@@ -101,4 +104,28 @@ public void testGoodBlock() {
     final var response = test_importRawBlock.response(request);
     assertThat(response.getType()).isEqualTo(JsonRpcResponseType.SUCCESS);
   }
+
+  @Test
+  public void testReimportExistingBlock() {
+    final String rawBlockRLPString =
+        "0xf90262f901faa0e38bef3dadb98e856ea82c7e9813b76a6ec8d9cf60694dd65d800a1669c1a1fda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347948888f1f195afa192cfee860698584c030f4c9db1a06e6be3f633fe0399cb17a9d8238b988a39bd9ab3e0ac0820f4df705a1ee37536a06fb77a9ddaa64a8e161b643d05533a4093f2be900ad06279b1b56b3bcee3b979a04b33fa3c9c50b7b9a4500f5c0b1e71ab43362abc81c2cf31fd2b54acf7d750d8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001832fefba83016b66845db7320980a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f862f860800a830249f094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0d42a045ac77a6d4676dd5fbc5104ed7471b6cef2465cfefaa52919b340f942a9a06e4d319aea79e45cde79d337e6edf849ceac505cab65dd41a572cab132d4dccac0";
+
+    final JsonRpcRequestContext request =
+        new JsonRpcRequestContext(
+            new JsonRpcRequest(
+                "2.0", TestImportRawBlock.METHOD_NAME, new Object[] {rawBlockRLPString}));
+
+    final JsonRpcRequestContext requestRewind =
+        new JsonRpcRequestContext(
+            new JsonRpcRequest("2.0", TestRewindToBlock.METHOD_NAME, new Object[] {0L}));
+
+    final var response = test_importRawBlock.response(request);
+    assertThat(response.getType()).isEqualTo(JsonRpcResponseType.SUCCESS);
+    final var rewindResponse = test_rewindToBlock.response(requestRewind);
+    assertThat(rewindResponse.getType()).isEqualTo(JsonRpcResponseType.SUCCESS);
+    final var reimportResponse = test_importRawBlock.response(request);
+    assertThat(reimportResponse.getType()).isEqualTo(JsonRpcResponseType.SUCCESS);
+
+    assertThat(context.getBlockchain().getChainHead().getHeight()).isEqualTo(1L);
+  }
 }
diff --git a/ethereum/retesteth/src/test/java/org/hyperledger/besu/ethereum/retesteth/methods/TestSetChainParamsTest.java b/ethereum/retesteth/src/test/java/org/hyperledger/besu/ethereum/retesteth/methods/TestSetChainParamsTest.java
index e53a1340aa9..107bc7a5a01 100644
--- a/ethereum/retesteth/src/test/java/org/hyperledger/besu/ethereum/retesteth/methods/TestSetChainParamsTest.java
+++ b/ethereum/retesteth/src/test/java/org/hyperledger/besu/ethereum/retesteth/methods/TestSetChainParamsTest.java
@@ -16,6 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
@@ -85,4 +86,30 @@ public void testValidateGenesisImport() throws IOException {
     assertThat(blockHeader.getOmmersHash().toString())
         .isEqualTo("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347");
   }
+
+  @Test
+  public void testValidate1559GenesisImport() throws IOException {
+    final String chainParamsJsonString =
+        Resources.toString(
+            TestSetChainParamsTest.class.getResource("1559ChainParams.json"), Charsets.UTF_8);
+    final JsonObject chainParamsJson = new JsonObject(chainParamsJsonString);
+
+    final JsonRpcRequestContext request =
+        new JsonRpcRequestContext(
+            new JsonRpcRequest(
+                "2.0", TestSetChainParams.METHOD_NAME, new Object[] {chainParamsJson.getMap()}));
+
+    assertThat(test_setChainParams.response(request))
+        .isEqualTo(new JsonRpcSuccessResponse(null, true));
+
+    final BlockHeader blockHeader = context.getBlockHeader(0);
+    assertThat(blockHeader.getDifficulty()).isEqualTo(UInt256.fromHexString("0x20000"));
+    assertThat(blockHeader.getGasLimit()).isEqualTo(1234L);
+    assertThat(blockHeader.getBaseFee()).hasValue(Wei.of(12345L));
+    assertThat(blockHeader.getExtraData().toHexString()).isEqualTo("0x00");
+    assertThat(blockHeader.getTimestamp()).isEqualTo(0l);
+    assertThat(blockHeader.getNonce()).isEqualTo(0L);
+    assertThat(blockHeader.getMixHash().toHexString())
+        .isEqualTo("0x0000000000000000000000000000000000000000000000000000000000000000");
+  }
 }
diff --git a/ethereum/retesteth/src/test/resources/org/hyperledger/besu/ethereum/retesteth/methods/1559ChainParams.json b/ethereum/retesteth/src/test/resources/org/hyperledger/besu/ethereum/retesteth/methods/1559ChainParams.json
new file mode 100644
index 00000000000..95535e269f7
--- /dev/null
+++ b/ethereum/retesteth/src/test/resources/org/hyperledger/besu/ethereum/retesteth/methods/1559ChainParams.json
@@ -0,0 +1,21 @@
+{
+  "genesis" : {
+    "author" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+    "difficulty" : "0x020000",
+    "gasLimit" : "0x04d2",
+    "baseFeePerGas" : "0x3039",
+    "extraData" : "0x00",
+    "timestamp" : "0x00",
+    "nonce" : "0x0000000000000000",
+    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "params": {
+    "EIP150ForkBlock": "0x00",
+    "EIP158ForkBlock": "0x00",
+    "byzantiumForkBlock": "0x00",
+    "homesteadForkBlock": "0x00",
+    "londonForkBlock": "0x00"
+  },
+  "sealEngine": "NoProof",
+  "accounts": {}
+}
\ No newline at end of file
diff --git a/ethereum/rlp/build.gradle b/ethereum/rlp/build.gradle
index 26fd29d9065..678918d7cef 100644
--- a/ethereum/rlp/build.gradle
+++ b/ethereum/rlp/build.gradle
@@ -22,7 +22,8 @@ jar {
       'Specification-Title': archiveBaseName,
       'Specification-Version': project.version,
       'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Automatic-Module-Name': 'org.hyperledger.besu.internal.rlp'
       )
   }
 }
@@ -30,35 +31,21 @@ jar {
 dependencies {
   annotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess'
 
-  api project(':plugin-api')
-  api project(':util')
-
+  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-units'
   implementation 'com.google.guava:guava'
-  implementation 'io.vertx:vertx-core'
-  implementation 'org.apache.tuweni:bytes'
-  implementation 'org.apache.tuweni:units'
+
 
   jmh project(':util')
 
-  testImplementation project(path: ':ethereum:referencetests', configuration: 'testOutput')
   testImplementation project(':testutil')
 
   testImplementation 'com.fasterxml.jackson.core:jackson-databind'
   testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
-}
+  testImplementation 'org.junit.jupiter:junit-jupiter'
 
-test {
-  exclude 'org/hyperledger/besu/ethereum/rlp/InvalidRLPRefTest.class'
-  exclude 'org/hyperledger/besu/ethereum/rlp/RLPRefTest.class'
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 }
 
-task referenceTests(type: Test, dependsOn: ['compileTestJava']) {
-  doFirst {
-    if (!file("../referencetests/src/test/resources/README.md").exists()) {
-      throw new GradleException("ethereum/referencetests/src/test/resources/README.md missing: please clone submodules (git submodule update --init --recursive)")
-    }
-  }
-  include 'org/hyperledger/besu/ethereum/rlp/InvalidRLPRefTest.class'
-  include 'org/hyperledger/besu/ethereum/rlp/RLPRefTest.class'
-}
+artifacts { testSupportArtifacts testSupportJar }
diff --git a/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/AbstractRLPInput.java b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/AbstractRLPInput.java
index 16b9423d5ea..43413d7995e 100644
--- a/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/AbstractRLPInput.java
+++ b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/AbstractRLPInput.java
@@ -24,8 +24,10 @@
 
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.bytes.MutableBytes;
 import org.apache.tuweni.bytes.MutableBytes32;
 import org.apache.tuweni.units.bigints.UInt256;
+import org.apache.tuweni.units.bigints.UInt64;
 
 abstract class AbstractRLPInput implements RLPInput {
 
@@ -128,13 +130,13 @@ private void prepareCurrentItem() {
     // Sets the kind of the item, the offset at which his payload starts and the size of this
     // payload.
     try {
-      RLPDecodingHelpers.RLPElementMetadata elementMetadata =
+      final RLPDecodingHelpers.RLPElementMetadata elementMetadata =
           RLPDecodingHelpers.rlpElementMetadata(this::inputByte, size, currentItem);
       currentKind = elementMetadata.kind;
       currentPayloadOffset = elementMetadata.payloadStart;
       currentPayloadSize = elementMetadata.payloadSize;
-    } catch (RLPException exception) {
-      String message =
+    } catch (final RLPException exception) {
+      final String message =
           String.format(
               exception.getMessage() + getErrorMessageSuffix(), getErrorMessageSuffixParams());
       throw new RLPException(message, exception);
@@ -287,16 +289,18 @@ public void skipNext() {
   @Override
   public long readLongScalar() {
     checkScalar("long scalar", 8);
+    long res = readGenericLongScalar();
+    setTo(nextItem());
+    return res;
+  }
+
+  private long readGenericLongScalar() {
     long res = 0;
     int shift = 0;
     for (int i = 0; i < currentPayloadSize; i++) {
       res |= ((long) payloadByte(currentPayloadSize - i - 1) & 0xFF) << shift;
       shift += 8;
     }
-    if (res < 0) {
-      error("long scalar %s is not non-negative", res);
-    }
-    setTo(nextItem());
     return res;
   }
 
@@ -313,6 +317,12 @@ public int readIntScalar() {
     return res;
   }
 
+  @Override
+  public long readUnsignedIntScalar() {
+    checkScalar("unsigned int scalar", 4);
+    return readLongScalar();
+  }
+
   @Override
   public BigInteger readBigIntegerScalar() {
     checkScalar("arbitrary precision scalar");
@@ -321,6 +331,19 @@ public BigInteger readBigIntegerScalar() {
     return res;
   }
 
+  private Bytes readBytes8Scalar() {
+    checkScalar("8-bytes scalar", 8);
+    final MutableBytes res = MutableBytes.create(8);
+    payloadSlice().copyTo(res, res.size() - currentPayloadSize);
+    setTo(nextItem());
+    return res;
+  }
+
+  @Override
+  public UInt64 readUInt64Scalar() {
+    return UInt64.fromBytes(readBytes8Scalar());
+  }
+
   private Bytes32 readBytes32Scalar() {
     checkScalar("32-bytes scalar", 32);
     final MutableBytes32 res = MutableBytes32.create();
@@ -513,13 +536,41 @@ public int nextSize() {
     return currentPayloadSize;
   }
 
+  @Override
+  public int nextOffset() {
+    return Math.toIntExact(currentPayloadOffset);
+  }
+
   @Override
   public boolean isEndOfCurrentList() {
     return depth > 0 && currentItem >= endOfListOffset[depth - 1];
   }
 
+  @Override
+  public boolean isZeroLengthString() {
+    return currentKind == RLPDecodingHelpers.Kind.SHORT_ELEMENT && currentPayloadSize == 0;
+  }
+
   @Override
   public void reset() {
     setTo(0);
   }
+
+  @Override
+  public Bytes currentListAsBytes() {
+    if (currentItem >= size) {
+      throw error("Cannot read list, input is fully consumed");
+    }
+    if (!currentKind.isList()) {
+      throw error("Cannot read list, current item is not a list list");
+    }
+
+    final MutableBytes scratch = MutableBytes.create(currentPayloadSize + 10);
+    final int headerSize = RLPEncodingHelpers.writeListHeader(currentPayloadSize, scratch, 0);
+    payloadSlice().copyTo(scratch, headerSize);
+    final Bytes res = scratch.slice(0, currentPayloadSize + headerSize);
+
+    setTo(nextItem());
+    return res;
+  }
 }
diff --git a/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/AbstractRLPOutput.java b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/AbstractRLPOutput.java
index 1f7ba36f320..73eebbb212e 100644
--- a/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/AbstractRLPOutput.java
+++ b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/AbstractRLPOutput.java
@@ -36,7 +36,7 @@ abstract class AbstractRLPOutput implements RLPOutput {
    * (that is, the list that starts at the ith LIST_MARKER in 'values').
    *
    * With that information gathered, encoded() can write its output in a single walk of 'values':
-   * values can encoded directly, and every time we read a list marker, we use the corresponding
+   * values can be encoded directly, and every time we read a list marker, we use the corresponding
    * payload size to write the proper prefix and continue.
    *
    * The main remaining aspect is how the values of 'payloadSizes' are computed. Computing the size
@@ -44,15 +44,15 @@ abstract class AbstractRLPOutput implements RLPOutput {
    * to the running size. The difficulty is with nesting: when we start a new list, we need to
    * track both the sizes of the previous list and the new one. To deal with that, we use the small
    * stack 'parentListStack': it stores the index in 'payloadSizes' of every currently "open" lists.
-   * In other words, payloadSises[parentListStack[stackSize - 1]] corresponds to the size of the
+   * In other words, payloadSizes[parentListStack[stackSize - 1]] corresponds to the size of the
    * current list, the one to which newly added value are currently written (until the next call
-   * to 'endList()' that is, while payloadSises[parentListStack[stackSize - 2]] would be the size
+   * to 'endList()' that is, while payloadSizes[parentListStack[stackSize - 2]] would be the size
    * of the parent list, ....
    *
    * Note that when a new value is added, we add its size only the currently running list. We should
    * add that size to that of any parent list as well, but we do so indirectly when a list is
    * finished: when 'endList()' is called, we add the size of the full list we just finished (and
-   * whose size we have now have completely) to its parent size.
+   * whose size we have now completed) to its parent size.
    *
    * Side-note: this class internally and informally use "element" to refer to a non list items.
    */
@@ -65,7 +65,7 @@ abstract class AbstractRLPOutput implements RLPOutput {
   private final BitSet rlpEncoded = new BitSet();
 
   // First element is the total size of everything (the encoding may be a single non-list item, so
-  // this handle that case more easily; we need that value to size out final output). Following
+  // this handles that case more easily; we need that value to size out final output). Following
   // elements holds the size of the payload of the ith list in 'values'.
   private int[] payloadSizes = new int[8];
   private int listsCount = 1; // number of lists current in 'values' + 1.
diff --git a/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLP.java b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLP.java
index 145b01bc003..bdd07bf0fbb 100644
--- a/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLP.java
+++ b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLP.java
@@ -18,7 +18,6 @@
 
 import java.util.function.Consumer;
 
-import io.vertx.core.buffer.Buffer;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.MutableBytes;
 
@@ -31,6 +30,11 @@ private RLP() {}
 
   public static final Bytes EMPTY_LIST;
 
+  // RLP encoding requires payloads to be less thatn 2^64 bytes in length
+  // As a result, the longest RLP strings will have a prefix composed of 1 byte encoding the type
+  // of string followed by at most 8 bytes describing the length of the string
+  public static final int MAX_PREFIX_SIZE = 9;
+
   static {
     final BytesValueRLPOutput out = new BytesValueRLPOutput();
     out.startList();
@@ -59,27 +63,6 @@ public static RLPInput input(final Bytes encoded, final boolean lenient) {
     return new BytesValueRLPInput(encoded, lenient);
   }
 
-  /**
-   * Creates a new {@link RLPInput} suitable for decoding an RLP value encoded in the provided
-   * Vert.x {@link Buffer}.
-   *
-   * <p>The created input is strict, in that exceptions will be thrown for any malformed input,
-   * either by this method or by future reads from the returned input.
-   *
-   * @param buffer A buffer containing the RLP encoded data to decode.
-   * @param offset The offset in {@code encoded} at which the data to decode starts.
-   * @return A newly created {@link RLPInput} to decode RLP data in {@code encoded} from {@code
-   *     offset}.
-   * @throws MalformedRLPInputException if {@code encoded} doesn't contain a properly encoded RLP
-   *     item. Note that this only detect malformation on the main item at {@code offset}, but more
-   *     deeply nested corruption/malformation of the input will not be detected by this method
-   *     call, but only later when the input is read.
-   */
-  public static BytesValueRLPInput input(final Buffer buffer, final int offset) {
-    return new BytesValueRLPInput(
-        Bytes.wrapBuffer(buffer, offset, buffer.length() - offset), false, false);
-  }
-
   /**
    * Creates a {@link RLPOutput}, pass it to the provided consumer for writing, and then return the
    * RLP encoded result of that writing.
diff --git a/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPDecodingHelpers.java b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPDecodingHelpers.java
index b52f3b3ce5f..f53931ba67c 100644
--- a/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPDecodingHelpers.java
+++ b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPDecodingHelpers.java
@@ -171,7 +171,7 @@ static class RLPElementMetadata {
     final Kind kind; // The type of rlp element
     final long elementStart; // The index at which this element starts
     final long payloadStart; // The index at which the payload of this element starts
-    final int payloadSize; // The size of the paylod
+    final int payloadSize; // The size of the payload
 
     RLPElementMetadata(
         final Kind kind, final long elementStart, final long payloadStart, final int payloadSize) {
@@ -181,7 +181,11 @@ static class RLPElementMetadata {
       this.payloadSize = payloadSize;
     }
 
-    /** @return the size of the byte string holding the rlp-encoded value and metadata */
+    /**
+     * The size of the byte string holding the rlp-encoded value and metadata
+     *
+     * @return the size of the byte string holding the rlp-encoded value and metadata
+     */
     int getEncodedSize() {
       final long encodedSize = elementEnd() - elementStart + 1;
       try {
diff --git a/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPInput.java b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPInput.java
index 92eb2917826..e8f966ed1b5 100644
--- a/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPInput.java
+++ b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPInput.java
@@ -23,6 +23,7 @@
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.units.bigints.UInt256;
+import org.apache.tuweni.units.bigints.UInt64;
 
 /**
  * An input used to decode data in RLP encoding.
@@ -82,6 +83,13 @@ public interface RLPInput {
    */
   int nextSize();
 
+  /**
+   * Returns the offset of the next item, counting from the start of the RLP Input as a whole.
+   *
+   * @return offset from buffer start
+   */
+  int nextOffset();
+
   /**
    * Whether the input is at the end of a currently entered list, that is if {@link #leaveList()}
    * should be the next method called.
@@ -129,7 +137,8 @@ public interface RLPInput {
   void leaveListLenient();
 
   /**
-   * Reads a scalar from the input and return is as a long value.
+   * Reads a non-negative scalar from the input and return it as a long value which is interpreted
+   * as an unsigned long.
    *
    * @return The next scalar item of this input as a long value.
    * @throws RLPException if the next item to read is a list, the input is at the end of its current
@@ -157,6 +166,16 @@ public interface RLPInput {
    */
   BigInteger readBigIntegerScalar();
 
+  /**
+   * Reads a scalar from the input and return is as a {@link UInt64}.
+   *
+   * @return The next scalar item of this input as a {@link UInt64}.
+   * @throws RLPException if the next item to read is a list, the input is at the end of its current
+   *     list (and {@link #leaveList()} hasn't been called) or if the next item is either too big to
+   *     fit a {@link UInt64} or has leading zeros.
+   */
+  UInt64 readUInt64Scalar();
+
   /**
    * Reads a scalar from the input and return is as a {@link UInt256}.
    *
@@ -213,6 +232,11 @@ public interface RLPInput {
    *     long.
    */
   default int readUnsignedByte() {
+    if (isZeroLengthString()) {
+      // Decode an empty string (0x80) as an unsigned byte with value 0
+      readBytes();
+      return 0;
+    }
     return readByte() & 0xFF;
   }
 
@@ -238,6 +262,15 @@ default long readUnsignedInt() {
     return (readInt()) & 0xFFFFFFFFL;
   }
 
+  /**
+   * Reads a scalar from the input and return is as an unsigned int contained in a long
+   *
+   * @return The next scalar item of this input as an unsigned int value as long
+   * @throws RLPException if the next item to read is a list, the input is at the end of its current
+   *     list (and {@link #leaveList()} hasn't been called) or if the next item is either too big to
+   *     fit an unsigned int or has leading zeros.
+   */
+  long readUnsignedIntScalar();
   /**
    * Reads an inet address from this input.
    *
@@ -268,7 +301,7 @@ default long readUnsignedInt() {
   Bytes32 readBytes32();
 
   /**
-   * Reads the next iterm of this input (assuming it is not a list) and transform it with the
+   * Reads the next item of this input (assuming it is not a list) and transforms it with the
    * provided mapping function.
    *
    * <p>Note that the only benefit of this method over calling the mapper function on the result of
@@ -303,9 +336,18 @@ default long readUnsignedInt() {
    */
   Bytes raw();
 
+  boolean isZeroLengthString();
+
   /** Resets this RLP input to the start. */
   void reset();
 
+  /**
+   * Returns a raw {@link Bytes} representation of this RLP list.
+   *
+   * @return The raw RLP list.
+   */
+  Bytes currentListAsBytes();
+
   /**
    * Reads a full list from the input given a method that knows how to read its elements.
    *
@@ -317,7 +359,7 @@ default long readUnsignedInt() {
    */
   default <T> List<T> readList(final Function<RLPInput, T> valueReader) {
     final int size = enterList();
-    final List<T> res = new ArrayList<>(size);
+    final List<T> res = size == 0 ? List.of() : new ArrayList<>(size);
     for (int i = 0; i < size; i++) {
       try {
         res.add(valueReader.apply(this));
diff --git a/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPOutput.java b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPOutput.java
index dd1b9c8bd88..140e60d9d24 100644
--- a/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPOutput.java
+++ b/ethereum/rlp/src/main/java/org/hyperledger/besu/ethereum/rlp/RLPOutput.java
@@ -14,15 +14,15 @@
  */
 package org.hyperledger.besu.ethereum.rlp;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
 import java.math.BigInteger;
 import java.net.InetAddress;
 import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.MutableBytes;
 import org.apache.tuweni.units.bigints.UInt256Value;
+import org.apache.tuweni.units.bigints.UInt64Value;
 
 /**
  * An output used to encode data in RLP encoding.
@@ -72,13 +72,21 @@ public interface RLPOutput {
    */
   void writeBytes(Bytes v);
 
+  /**
+   * Writes a scalar 64 bits unsigned int (encoded without leading zeros)
+   *
+   * @param v unsigned 64 bit integer value
+   */
+  default void writeUInt64Scalar(final UInt64Value<?> v) {
+    writeBytes(v.toBytes().trimLeadingZeros());
+  }
   /**
    * Writes a scalar (encoded with no leading zeroes).
    *
    * @param v The scalar to write.
    */
   default void writeUInt256Scalar(final UInt256Value<?> v) {
-    writeBytes(v.toBytes().trimLeadingZeros());
+    writeBytes(v.trimLeadingZeros());
   }
 
   /**
@@ -104,10 +112,8 @@ default void writeIntScalar(final int v) {
    * Writes a scalar (encoded with no leading zeroes).
    *
    * @param v The scalar to write.
-   * @throws IllegalArgumentException if {@code v < 0}.
    */
   default void writeLongScalar(final long v) {
-    checkArgument(v >= 0, "Invalid negative value %s for scalar encoding", v);
     writeBytes(Bytes.minimalBytes(v));
   }
 
@@ -115,13 +121,15 @@ default void writeLongScalar(final long v) {
    * Writes a scalar (encoded with no leading zeroes).
    *
    * @param v The scalar to write.
-   * @throws IllegalArgumentException if {@code v} is a negative integer ({@code v.signum() < 0}).
    */
   default void writeBigIntegerScalar(final BigInteger v) {
-    checkArgument(v.signum() >= 0, "Invalid negative integer %s for scalar encoding", v);
+    if (v.equals(BigInteger.ZERO)) {
+      writeBytes(Bytes.EMPTY);
+      return;
+    }
 
     final byte[] bytes = v.toByteArray();
-    // BigInteger will not include leading zeros by contract, but it always include at least one
+    // BigInteger will not include leading zeros by contract, but it always includes at least one
     // bit of sign (a zero here since it's positive). What that mean is that if the first 1 of the
     // resulting number is exactly on a byte boundary, then the sign bit constraint will make the
     // value include one extra byte, which will be zero. In other words, they can be one zero bytes
@@ -189,7 +197,7 @@ default void writeLong(final long l) {
    *     {@code b < 0} or {@code b > 0xFF}.
    */
   default void writeUnsignedByte(final int b) {
-    writeBytes(Bytes.of(b));
+    processZeroByte(Long.valueOf(b), a -> writeBytes(Bytes.of(b)));
   }
 
   /**
@@ -200,7 +208,7 @@ default void writeUnsignedByte(final int b) {
    *     if either {@code s < 0} or {@code s > 0xFFFF}.
    */
   default void writeUnsignedShort(final int s) {
-    writeBytes(Bytes.ofUnsignedShort(s));
+    processZeroByte(Long.valueOf(s), a -> writeBytes(Bytes.ofUnsignedShort(s).trimLeadingZeros()));
   }
 
   /**
@@ -211,7 +219,7 @@ default void writeUnsignedShort(final int s) {
    *     either {@code i < 0} or {@code i > 0xFFFFFFFFL}.
    */
   default void writeUnsignedInt(final long i) {
-    writeBytes(Bytes.ofUnsignedInt(i));
+    processZeroByte(i, a -> writeBytes(Bytes.ofUnsignedInt(i).trimLeadingZeros()));
   }
 
   /**
@@ -250,6 +258,21 @@ default <T> void writeList(final Iterable<T> values, final BiConsumer<T, RLPOutp
     endList();
   }
 
+  /**
+   * Writes an empty list to the output.
+   *
+   * <p>This is a shortcut for doing:
+   *
+   * <pre>{@code
+   * startList();
+   * endList();
+   * }</pre>
+   */
+  default void writeEmptyList() {
+    startList();
+    endList();
+  }
+
   /**
    * Writes an already RLP encoded item to the output.
    *
@@ -277,4 +300,19 @@ default void writeRLPBytes(final Bytes rlpEncodedValue) {
    * @param bytes An already RLP encoded value to write as next item of this output.
    */
   void writeRaw(Bytes bytes);
+
+  /**
+   * Check if the incoming value is 0 and writes it as 0x80, per the spec.
+   *
+   * @param input The value to check
+   * @param writer The consumer to write the non-zero output
+   */
+  private void processZeroByte(final Long input, final Consumer<Long> writer) {
+    // If input == 0, encode 0 value as 0x80
+    if (input == 0) {
+      writeRaw(Bytes.of(0x80));
+    } else {
+      writer.accept(input);
+    }
+  }
 }
diff --git a/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/util/RLPTestUtil.java b/ethereum/rlp/src/test-support/java/org/hyperledger/besu/ethereum/rlp/util/RLPTestUtil.java
similarity index 100%
rename from ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/util/RLPTestUtil.java
rename to ethereum/rlp/src/test-support/java/org/hyperledger/besu/ethereum/rlp/util/RLPTestUtil.java
diff --git a/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/BytesValueRLPInputTest.java b/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/BytesValueRLPInputTest.java
index 0046fa14840..10550e75143 100644
--- a/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/BytesValueRLPInputTest.java
+++ b/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/BytesValueRLPInputTest.java
@@ -150,6 +150,25 @@ public void singleLongElementBoundaryCase_6() {
     assertThat(in.isDone()).isTrue();
   }
 
+  @Test
+  public void assertUnsignedIntScalar() {
+    // Scalar should be encoded as the minimal byte array representing the number. For 0, that means
+    // the empty byte array, which is a short element of zero-length, so 0x80.
+    assertUnsignedIntScalar(0L, h("0x80"));
+
+    assertUnsignedIntScalar(1L, h("0x01"));
+    assertUnsignedIntScalar(15L, h("0x0F"));
+    assertUnsignedIntScalar(1024L, h("0x820400"));
+    assertUnsignedIntScalar((1L << 32) - 1, h("0x84ffffffff"));
+  }
+
+  private void assertUnsignedIntScalar(final long expected, final Bytes toTest) {
+    final RLPInput in = RLP.input(toTest);
+    assertThat(in.isDone()).isFalse();
+    assertThat(in.readUnsignedIntScalar()).isEqualTo(expected);
+    assertThat(in.isDone()).isTrue();
+  }
+
   @Test
   public void assertLongScalar() {
     // Scalar should be encoded as the minimal byte array representing the number. For 0, that means
@@ -161,15 +180,6 @@ public void assertLongScalar() {
     assertLongScalar(1024L, h("0x820400"));
   }
 
-  @Test
-  public void longScalar_NegativeLong() {
-    Bytes bytes = h("0x88FFFFFFFFFFFFFFFF");
-    final RLPInput in = RLP.input(bytes);
-    assertThatThrownBy(in::readLongScalar)
-        .isInstanceOf(RLPException.class)
-        .hasMessageStartingWith("long scalar -1 is not non-negative");
-  }
-
   private void assertLongScalar(final long expected, final Bytes toTest) {
     final RLPInput in = RLP.input(toTest);
     assertThat(in.isDone()).isFalse();
@@ -199,7 +209,7 @@ private void assertIntScalar(final int expected, final Bytes toTest) {
   public void emptyList() {
     final RLPInput in = RLP.input(h("0xc0"));
     assertThat(in.isDone()).isFalse();
-    assertThat(in.enterList()).isEqualTo(0);
+    assertThat(in.enterList()).isZero();
     assertThat(in.isDone()).isFalse();
     in.leaveList();
     assertThat(in.isDone()).isTrue();
@@ -377,9 +387,9 @@ public void readAsRlp() {
     final RLPInput el = RLP.input(emptyList);
     assertThat(el.readAsRlp().raw()).isEqualTo(emptyList);
     el.reset();
-    assertThat(el.readAsRlp().enterList()).isEqualTo(0);
+    assertThat(el.readAsRlp().enterList()).isZero();
     el.reset();
-    assertThat(el.enterList()).isEqualTo(0);
+    assertThat(el.enterList()).isZero();
 
     final Bytes nestedList =
         RLP.encode(
@@ -447,6 +457,55 @@ public void reset() {
     }
   }
 
+  @Test
+  public void sizeAndPosition() {
+    final RLPInput in = RLP.input(h("0xc80102c51112c22122"));
+
+    assertOffsetAndSize(in, 1, 8);
+    assertThat(in.enterList()).isEqualTo(3);
+
+    assertOffsetAndSize(in, 1, 1);
+    assertThat(in.readByte()).isEqualTo((byte) 0x01);
+
+    assertOffsetAndSize(in, 2, 1);
+    assertThat(in.readByte()).isEqualTo((byte) 0x02);
+
+    assertOffsetAndSize(in, 4, 5);
+    assertThat(in.enterList()).isEqualTo(3);
+
+    assertOffsetAndSize(in, 4, 1);
+    assertThat(in.readByte()).isEqualTo((byte) 0x11);
+
+    assertOffsetAndSize(in, 5, 1);
+    assertThat(in.readByte()).isEqualTo((byte) 0x12);
+
+    assertOffsetAndSize(in, 7, 2);
+    assertThat(in.enterList()).isEqualTo(2);
+
+    assertOffsetAndSize(in, 7, 1);
+    assertThat(in.readByte()).isEqualTo((byte) 0x21);
+
+    assertOffsetAndSize(in, 8, 1);
+    assertThat(in.readByte()).isEqualTo((byte) 0x22);
+
+    assertOffsetAndSize(in, 9, 0);
+    in.leaveList();
+    assertThat(in.isDone()).isFalse();
+
+    assertOffsetAndSize(in, 9, 0);
+    in.leaveList();
+    assertThat(in.isDone()).isFalse();
+
+    assertOffsetAndSize(in, 9, 0);
+    in.leaveList();
+    assertThat(in.isDone()).isTrue();
+  }
+
+  private void assertOffsetAndSize(final RLPInput in, final int offset, final int size) {
+    assertThat(in.nextOffset()).isEqualTo(offset);
+    assertThat(in.nextSize()).isEqualTo(size);
+  }
+
   @Test
   public void ignoreListTail() {
     final RLPInput in = RLP.input(h("0xc80102c51112c22122"));
diff --git a/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/BytesValueRLPOutputTest.java b/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/BytesValueRLPOutputTest.java
index 87066e3af8d..8dc3da30467 100644
--- a/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/BytesValueRLPOutputTest.java
+++ b/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/BytesValueRLPOutputTest.java
@@ -15,8 +15,10 @@
 package org.hyperledger.besu.ethereum.rlp;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
 import org.junit.Test;
 
 public class BytesValueRLPOutputTest {
@@ -152,11 +154,29 @@ public void singleLongElementBoundaryCase_6() {
     assertThat(out.encoded()).isEqualTo(h("0xbb01000000" + times("3c", 16777216)));
   }
 
-  @Test(expected = IllegalStateException.class)
+  @Test
   public void multipleElementAddedWithoutList() {
     final BytesValueRLPOutput out = new BytesValueRLPOutput();
     out.writeByte((byte) 0);
-    out.writeByte((byte) 1);
+    assertThatThrownBy(() -> out.writeByte((byte) 1)).isInstanceOf(IllegalStateException.class);
+  }
+
+  @Test
+  public void unsignedIntScalar() {
+    // Scalar should be encoded as the minimal byte array representing the number. For 0, that means
+    // the empty byte array, which is a short element of zero-length, so 0x80.
+    assertUnsignedIntScalar(h("0x80"), 0);
+
+    assertUnsignedIntScalar(h("0x01"), 1);
+    assertUnsignedIntScalar(h("0x0F"), 15);
+    assertUnsignedIntScalar(h("0x820400"), 1024);
+    assertUnsignedIntScalar(h("0x84ffffffff"), (1L << 32) - 1);
+  }
+
+  private void assertUnsignedIntScalar(final Bytes expected, final long toTest) {
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    out.writeUnsignedInt(toTest);
+    assertThat(out.encoded()).isEqualTo(expected);
   }
 
   @Test
@@ -176,6 +196,23 @@ private void assertLongScalar(final Bytes expected, final long toTest) {
     assertThat(out.encoded()).isEqualTo(expected);
   }
 
+  @Test
+  public void uint256Scalar() {
+    // Scalar should be encoded as the minimal byte array representing the number. For 0, that means
+    // the empty byte array, which is a short element of zero-length, so 0x80.
+    assertUInt256Scalar(h("0x80"), UInt256.valueOf(0));
+
+    assertUInt256Scalar(h("0x01"), UInt256.valueOf(1));
+    assertUInt256Scalar(h("0x0F"), UInt256.valueOf(15));
+    assertUInt256Scalar(h("0x820400"), UInt256.valueOf(1024));
+  }
+
+  private void assertUInt256Scalar(final Bytes expected, final UInt256 toTest) {
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    out.writeUInt256Scalar(toTest);
+    assertThat(out.encoded()).isEqualTo(expected);
+  }
+
   @Test
   public void emptyList() {
     final BytesValueRLPOutput out = new BytesValueRLPOutput();
@@ -185,17 +222,17 @@ public void emptyList() {
     assertThat(out.encoded()).isEqualTo(h("0xc0"));
   }
 
-  @Test(expected = IllegalStateException.class)
+  @Test
   public void unclosedList() {
     final BytesValueRLPOutput out = new BytesValueRLPOutput();
     out.startList();
-    out.encoded();
+    assertThatThrownBy(out::encoded).isInstanceOf(IllegalStateException.class);
   }
 
-  @Test(expected = IllegalStateException.class)
+  @Test
   public void closeUnopenedList() {
     final BytesValueRLPOutput out = new BytesValueRLPOutput();
-    out.endList();
+    assertThatThrownBy(out::endList).isInstanceOf(IllegalStateException.class);
   }
 
   @Test
diff --git a/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/InvalidRLPRefTest.java b/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/InvalidRLPRefTest.java
deleted file mode 100644
index 66ef4ca298a..00000000000
--- a/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/InvalidRLPRefTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.rlp;
-
-import static org.junit.Assume.assumeTrue;
-
-import org.hyperledger.besu.ethereum.rlp.util.RLPTestUtil;
-import org.hyperledger.besu.testutil.JsonTestParameters;
-
-import java.util.Collection;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/** The Ethereum reference RLP tests. */
-@RunWith(Parameterized.class)
-public class InvalidRLPRefTest {
-
-  private static final String[] TEST_CONFIG_FILES = {
-    // TODO: upstream these additional tests to the ethereum tests repo
-    "org/hyperledger/besu/ethereum/rlp/invalidRLPTest.json", "RLPTests/invalidRLPTest.json"
-  };
-
-  private final InvalidRLPRefTestCaseSpec spec;
-
-  public InvalidRLPRefTest(
-      final String name, final InvalidRLPRefTestCaseSpec spec, final boolean runTest) {
-    this.spec = spec;
-    assumeTrue("Test was blacklisted", runTest);
-  }
-
-  @Parameters(name = "Name: {0}")
-  public static Collection<Object[]> getTestParametersForConfig() {
-    return JsonTestParameters.create(InvalidRLPRefTestCaseSpec.class).generate(TEST_CONFIG_FILES);
-  }
-
-  /** Test RLP decoding. */
-  @Test(expected = RLPException.class)
-  public void decode() throws Exception {
-    RLPTestUtil.decode(spec.getRLP());
-  }
-}
diff --git a/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/RLPRefTest.java b/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/RLPRefTest.java
deleted file mode 100644
index f958fab282c..00000000000
--- a/ethereum/rlp/src/test/java/org/hyperledger/besu/ethereum/rlp/RLPRefTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.rlp;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
-
-import org.hyperledger.besu.ethereum.rlp.util.RLPTestUtil;
-import org.hyperledger.besu.testutil.JsonTestParameters;
-
-import java.util.Collection;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/** The Ethereum reference RLP tests. */
-@RunWith(Parameterized.class)
-public class RLPRefTest {
-
-  private static final String TEST_CONFIG_FILES = "RLPTests/rlptest.json";
-
-  private final RLPRefTestCaseSpec spec;
-
-  public RLPRefTest(final String name, final RLPRefTestCaseSpec spec, final boolean runTest) {
-    this.spec = spec;
-    assumeTrue("Test was blacklisted", runTest);
-  }
-
-  @Parameters(name = "Name: {0}")
-  public static Collection<Object[]> getTestParametersForConfig() {
-    return JsonTestParameters.create(RLPRefTestCaseSpec.class).generate(TEST_CONFIG_FILES);
-  }
-
-  @Test
-  public void encode() {
-    assertThat(RLPTestUtil.encode(spec.getIn())).isEqualTo(spec.getOut());
-  }
-
-  @Test
-  public void decode() {
-    assertThat(RLPTestUtil.decode(spec.getOut())).isEqualTo(spec.getIn());
-  }
-}
diff --git a/ethereum/stratum/build.gradle b/ethereum/stratum/build.gradle
index fb15cdc738c..d462fb3f32d 100644
--- a/ethereum/stratum/build.gradle
+++ b/ethereum/stratum/build.gradle
@@ -31,19 +31,27 @@ dependencies {
   api project(':plugin-api')
   api project(':util')
 
+  implementation project(':datatypes')
   implementation project(':ethereum:api')
   implementation project(':ethereum:core')
   implementation project(':ethereum:blockcreation')
+  implementation project(':metrics:core')
+  implementation project(':consensus:merge')
 
   implementation 'com.google.guava:guava'
   implementation 'io.vertx:vertx-core'
-  implementation 'org.apache.tuweni:bytes'
-  implementation 'org.apache.tuweni:units'
+  implementation 'com.fasterxml.jackson.core:jackson-databind'
+  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-units'
 
+  testImplementation project(path: ':metrics:core', configuration: 'testSupportArtifacts')
   testImplementation project(':testutil')
 
   testImplementation 'com.fasterxml.jackson.core:jackson-databind'
-  testImplementation 'junit:junit'
+  testImplementation 'io.vertx:vertx-junit5'
+  testImplementation 'io.vertx:vertx-web-client'
   testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.mockito:mockito-core'
+  testImplementation 'org.mockito:mockito-junit-jupiter'
 }
diff --git a/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/GetWorkProtocol.java b/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/GetWorkProtocol.java
new file mode 100644
index 00000000000..262956c32f9
--- /dev/null
+++ b/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/GetWorkProtocol.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.stratum;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.Quantity;
+import org.hyperledger.besu.ethereum.mainnet.DirectAcyclicGraphSeed;
+import org.hyperledger.besu.ethereum.mainnet.EpochCalculator;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolution;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolverInputs;
+
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.json.DecodeException;
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** Protocol using JSON-RPC HTTP methods to provide getWork/submitWork methods. */
+public class GetWorkProtocol implements StratumProtocol {
+  private static final Logger LOG = LoggerFactory.getLogger(GetWorkProtocol.class);
+  private static final ObjectMapper mapper = new ObjectMapper();
+
+  private final EpochCalculator epochCalculator;
+  private volatile PoWSolverInputs currentInput;
+  private Function<PoWSolution, Boolean> submitCallback;
+  private String[] getWorkResult;
+
+  public GetWorkProtocol(final EpochCalculator epochCalculator) {
+    this.epochCalculator = epochCalculator;
+  }
+
+  @Override
+  public boolean maybeHandle(
+      final Buffer initialMessage, final StratumConnection conn, final Consumer<String> sender) {
+    JsonObject message;
+    try {
+      message = initialMessage.toJsonObject();
+    } catch (DecodeException e) {
+      return false;
+    }
+    if (message == null) {
+      return false;
+    }
+    String method = message.getString("method");
+    if (method != null) {
+      if ("eth_getWork".equals(method) || "eth_submitWork".equals(method)) {
+        boolean canHandle;
+        try {
+          Integer idNode = message.getInteger("id");
+          canHandle = idNode != null;
+        } catch (ClassCastException e) {
+          canHandle = false;
+        }
+        try {
+          handle(conn, initialMessage, sender);
+        } catch (Exception e) {
+          LOG.warn("Error handling message", e);
+        }
+        return canHandle;
+      }
+    }
+    return false;
+  }
+
+  @Override
+  public void onClose(final StratumConnection conn) {}
+
+  @Override
+  public void handle(
+      final StratumConnection conn, final Buffer message, final Consumer<String> sender) {
+    JsonObject jsonrpcMessage = message.toJsonObject();
+    if (jsonrpcMessage == null) {
+      LOG.warn("Invalid message {}", message);
+      conn.close();
+      return;
+    }
+    String method = jsonrpcMessage.getString("method");
+    Integer id;
+    try {
+      id = jsonrpcMessage.getInteger("id");
+    } catch (ClassCastException e) {
+      throw new IllegalArgumentException(e);
+    }
+    if (method == null || id == null) {
+      throw new IllegalArgumentException("Invalid JSON-RPC message");
+    }
+    if ("eth_getWork".equals(method)) {
+      JsonRpcSuccessResponse response = new JsonRpcSuccessResponse(id, getWorkResult);
+      try {
+        String responseMessage = mapper.writeValueAsString(response);
+        sender.accept(responseMessage);
+      } catch (JsonProcessingException e) {
+        LOG.warn("Error sending work", e);
+        conn.close();
+      }
+    } else if ("eth_submitWork".equals(method)) {
+      JsonArray paramsNode;
+      try {
+        paramsNode = jsonrpcMessage.getJsonArray("params");
+      } catch (ClassCastException e) {
+        throw new IllegalArgumentException("Invalid eth_submitWork params");
+      }
+      if (paramsNode == null || paramsNode.size() != 3) {
+        throw new IllegalArgumentException("Invalid eth_submitWork params");
+      }
+      final PoWSolution solution =
+          new PoWSolution(
+              Bytes.fromHexString(paramsNode.getString(0)).getLong(0),
+              Hash.fromHexString(paramsNode.getString(2)),
+              null,
+              Bytes.fromHexString(paramsNode.getString(1)));
+      final boolean result = submitCallback.apply(solution);
+      try {
+        String resultMessage = mapper.writeValueAsString(new JsonRpcSuccessResponse(id, result));
+        sender.accept(resultMessage);
+      } catch (JsonProcessingException e) {
+        throw new IllegalStateException("Error accepting solution work", e);
+      }
+    } else {
+      throw new UnsupportedOperationException("Unsupported method " + method);
+    }
+  }
+
+  @Override
+  public void setCurrentWorkTask(final PoWSolverInputs input) {
+    LOG.atDebug().setMessage("setting current stratum work task {}").addArgument(input).log();
+    currentInput = input;
+    final byte[] dagSeed =
+        DirectAcyclicGraphSeed.dagSeed(currentInput.getBlockNumber(), epochCalculator);
+    getWorkResult =
+        new String[] {
+          currentInput.getPrePowHash().toHexString(),
+          Bytes.wrap(dagSeed).toHexString(),
+          currentInput.getTarget().toHexString(),
+          Quantity.create(currentInput.getBlockNumber())
+        };
+  }
+
+  @Override
+  public void setSubmitCallback(final Function<PoWSolution, Boolean> submitSolutionCallback) {
+    this.submitCallback = submitSolutionCallback;
+  }
+}
diff --git a/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/Stratum1EthProxyProtocol.java b/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/Stratum1EthProxyProtocol.java
index 6c93572e23f..0506fa1e25b 100644
--- a/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/Stratum1EthProxyProtocol.java
+++ b/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/Stratum1EthProxyProtocol.java
@@ -14,30 +14,29 @@
  */
 package org.hyperledger.besu.ethereum.stratum;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
-
-import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthGetWork;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthSubmitHashRate;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.EthSubmitWork;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
-import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
-import org.hyperledger.besu.ethereum.core.Hash;
-import org.hyperledger.besu.ethereum.mainnet.DirectAcyclicGraphSeed;
-import org.hyperledger.besu.ethereum.mainnet.EpochCalculator;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolution;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolverInputs;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolution;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolverInputs;
 
-import java.io.IOException;
-import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.function.Consumer;
 import java.util.function.Function;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.json.JsonMapper;
-import com.google.common.io.BaseEncoding;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.json.DecodeException;
 import io.vertx.core.json.JsonObject;
-import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Implementation of the stratum1+tcp protocol.
@@ -45,109 +44,88 @@
  * <p>This protocol allows miners to submit EthHash solutions over a persistent TCP connection.
  */
 public class Stratum1EthProxyProtocol implements StratumProtocol {
-  private static final Logger LOG = getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(Stratum1EthProxyProtocol.class);
   private static final JsonMapper mapper = new JsonMapper();
-
-  private final MiningCoordinator miningCoordinator;
-  private EthHashSolverInputs currentInput;
-  private Function<EthHashSolution, Boolean> submitCallback;
-  private final EpochCalculator epochCalculator;
-
-  public Stratum1EthProxyProtocol(final MiningCoordinator miningCoordinator) {
-    if (!(miningCoordinator instanceof EthHashMiningCoordinator)) {
-      throw new IllegalArgumentException(
-          "Stratum1 Proxies require an EthHashMiningCoordinator not "
-              + ((miningCoordinator == null) ? "null" : miningCoordinator.getClass().getName()));
-    }
-    this.miningCoordinator = miningCoordinator;
-    this.epochCalculator = ((EthHashMiningCoordinator) miningCoordinator).getEpochCalculator();
+  private final EthGetWork ethGetWork;
+  private final EthSubmitWork ethSubmitWork;
+  private final EthSubmitHashRate ethSubmitHashRate;
+  private final Collection<StratumConnection> activeConnections = new ArrayList<>();
+
+  public Stratum1EthProxyProtocol(final PoWMiningCoordinator miningCoordinator) {
+    ethGetWork = new EthGetWork(miningCoordinator);
+    ethSubmitWork = new EthSubmitWork(miningCoordinator);
+    ethSubmitHashRate = new EthSubmitHashRate(miningCoordinator);
   }
 
   @Override
-  public boolean canHandle(final String initialMessage, final StratumConnection conn) {
-    JsonRpcRequestContext req;
+  public boolean maybeHandle(
+      final Buffer initialMessage, final StratumConnection conn, final Consumer<String> sender) {
+    JsonRpcRequest req;
     try {
-      req = new JsonObject(initialMessage).mapTo(JsonRpcRequestContext.class);
-    } catch (IllegalArgumentException e) {
+      req = new JsonObject(initialMessage).mapTo(JsonRpcRequest.class);
+    } catch (DecodeException | IllegalArgumentException e) {
       LOG.debug(e.getMessage(), e);
       return false;
     }
-    if (!"eth_submitLogin".equals(req.getRequest().getMethod())) {
-      LOG.debug("Invalid first message method: {}", req.getRequest().getMethod());
+    if (!"eth_submitLogin".equals(req.getMethod())) {
+      LOG.debug("Invalid first message method: {}", req.getMethod());
       return false;
     }
 
     try {
-      String response =
-          mapper.writeValueAsString(new JsonRpcSuccessResponse(req.getRequest().getId(), true));
-      conn.send(response + "\n");
+      String response = mapper.writeValueAsString(new JsonRpcSuccessResponse(req.getId(), true));
+      sender.accept(response);
+      activeConnections.add(conn);
     } catch (JsonProcessingException e) {
       LOG.debug(e.getMessage(), e);
-      conn.close(null);
+      conn.close();
     }
 
     return true;
   }
 
-  private void sendNewWork(final StratumConnection conn, final Object id) {
-    byte[] dagSeed = DirectAcyclicGraphSeed.dagSeed(currentInput.getBlockNumber(), epochCalculator);
-    final String[] result = {
-      "0x" + BaseEncoding.base16().lowerCase().encode(currentInput.getPrePowHash()),
-      "0x" + BaseEncoding.base16().lowerCase().encode(dagSeed),
-      currentInput.getTarget().toHexString()
-    };
-    JsonRpcSuccessResponse req = new JsonRpcSuccessResponse(id, result);
-    try {
-      conn.send(mapper.writeValueAsString(req) + "\n");
-    } catch (JsonProcessingException e) {
-      LOG.debug(e.getMessage(), e);
-    }
-  }
-
   @Override
-  public void onClose(final StratumConnection conn) {}
+  public void onClose(final StratumConnection conn) {
+    activeConnections.remove(conn);
+  }
 
   @Override
-  public void handle(final StratumConnection conn, final String message) {
-    try {
-      final JsonRpcRequest req = new JsonObject(message).mapTo(JsonRpcRequest.class);
-      if (RpcMethod.ETH_GET_WORK.getMethodName().equals(req.getMethod())) {
-        sendNewWork(conn, req.getId());
-      } else if (RpcMethod.ETH_SUBMIT_WORK.getMethodName().equals(req.getMethod())) {
-        handleMiningSubmit(conn, req);
-      } else if (RpcMethod.ETH_SUBMIT_HASHRATE.getMethodName().equals(req.getMethod())) {
-        handleHashrateSubmit(mapper, miningCoordinator, conn, req);
+  public void handle(
+      final StratumConnection conn, final Buffer message, final Consumer<String> sender) {
+    final JsonRpcRequest req = new JsonObject(message).mapTo(JsonRpcRequest.class);
+    final JsonRpcRequestContext reqContext = new JsonRpcRequestContext(req);
+    final JsonRpcResponse rpcResponse;
+    switch (req.getMethod()) {
+      case "eth_getWork" -> rpcResponse = ethGetWork.response(reqContext);
+      case "eth_submitWork" -> rpcResponse = ethSubmitWork.response(reqContext);
+      case "eth_submitHashrate" -> rpcResponse = ethSubmitHashRate.response(reqContext);
+      default -> {
+        LOG.debug("Invalid method: {}", req.getMethod());
+        throw new UnsupportedOperationException("Invalid method: " + req.getMethod());
       }
-    } catch (IllegalArgumentException | IOException e) {
-      LOG.debug(e.getMessage(), e);
-      conn.close(null);
     }
-  }
-
-  private void handleMiningSubmit(final StratumConnection conn, final JsonRpcRequest req)
-      throws IOException {
-    LOG.debug("Miner submitted solution {}", req);
-    boolean result = false;
-    final EthHashSolution solution =
-        new EthHashSolution(
-            Bytes.fromHexString(req.getRequiredParameter(0, String.class)).getLong(0),
-            req.getRequiredParameter(2, Hash.class),
-            Bytes.fromHexString(req.getRequiredParameter(1, String.class)).toArrayUnsafe());
-    if (Arrays.equals(currentInput.getPrePowHash(), solution.getPowHash())) {
-      result = submitCallback.apply(solution);
+    try {
+      sender.accept(mapper.writeValueAsString(rpcResponse));
+    } catch (JsonProcessingException e) {
+      throw new IllegalStateException(e);
     }
-
-    String response = mapper.writeValueAsString(new JsonRpcSuccessResponse(req.getId(), result));
-    conn.send(response + "\n");
   }
 
   @Override
-  public void setCurrentWorkTask(final EthHashSolverInputs input) {
-    this.currentInput = input;
+  public void setCurrentWorkTask(final PoWSolverInputs input) {
+    activeConnections.forEach(
+        conn -> {
+          try {
+            conn.notificationSender()
+                .accept(
+                    mapper.writeValueAsString(
+                        new JsonRpcSuccessResponse(0, ethGetWork.rawResponse(input))));
+          } catch (JsonProcessingException e) {
+            LOG.error("Failed to announce new work", e);
+          }
+        });
   }
 
   @Override
-  public void setSubmitCallback(final Function<EthHashSolution, Boolean> submitSolutionCallback) {
-    this.submitCallback = submitSolutionCallback;
-  }
+  public void setSubmitCallback(final Function<PoWSolution, Boolean> submitSolutionCallback) {}
 }
diff --git a/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/Stratum1Protocol.java b/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/Stratum1Protocol.java
index 5189ca18870..d3408dc4c94 100644
--- a/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/Stratum1Protocol.java
+++ b/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/Stratum1Protocol.java
@@ -14,33 +14,33 @@
  */
 package org.hyperledger.besu.ethereum.stratum;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
-
+import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
-import org.hyperledger.besu.ethereum.core.Hash;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
 import org.hyperledger.besu.ethereum.mainnet.DirectAcyclicGraphSeed;
 import org.hyperledger.besu.ethereum.mainnet.EpochCalculator;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolution;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolverInputs;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolution;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolverInputs;
 
-import java.io.IOException;
 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.json.JsonMapper;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.json.DecodeException;
 import io.vertx.core.json.JsonObject;
-import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Implementation of the stratum+tcp protocol.
@@ -48,7 +48,7 @@
  * <p>This protocol allows miners to submit EthHash solutions over a persistent TCP connection.
  */
 public class Stratum1Protocol implements StratumProtocol {
-  private static final Logger LOG = getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(Stratum1Protocol.class);
   private static final JsonMapper mapper = new JsonMapper();
   private static final String STRATUM_1 = "EthereumStratum/1.0.0";
 
@@ -60,14 +60,14 @@ private static String createSubscriptionID() {
 
   private final MiningCoordinator miningCoordinator;
   private final String extranonce;
-  private EthHashSolverInputs currentInput;
-  private Function<EthHashSolution, Boolean> submitCallback;
+  private PoWSolverInputs currentInput;
+  private Function<PoWSolution, Boolean> submitCallback;
   private final Supplier<String> jobIdSupplier;
   private final Supplier<String> subscriptionIdCreator;
   private final List<StratumConnection> activeConnections = new ArrayList<>();
   private final EpochCalculator epochCalculator;
 
-  public Stratum1Protocol(final String extranonce, final MiningCoordinator miningCoordinator) {
+  public Stratum1Protocol(final String extranonce, final PoWMiningCoordinator miningCoordinator) {
     this(
         extranonce,
         miningCoordinator,
@@ -80,27 +80,23 @@ public Stratum1Protocol(final String extranonce, final MiningCoordinator miningC
 
   Stratum1Protocol(
       final String extranonce,
-      final MiningCoordinator miningCoordinator,
+      final PoWMiningCoordinator miningCoordinator,
       final Supplier<String> jobIdSupplier,
       final Supplier<String> subscriptionIdCreator) {
-    if (!(miningCoordinator instanceof EthHashMiningCoordinator)) {
-      throw new IllegalArgumentException(
-          "Stratum1 requires an EthHashMiningCoordinator not "
-              + ((miningCoordinator == null) ? "null" : miningCoordinator.getClass().getName()));
-    }
     this.extranonce = extranonce;
     this.miningCoordinator = miningCoordinator;
     this.jobIdSupplier = jobIdSupplier;
     this.subscriptionIdCreator = subscriptionIdCreator;
-    this.epochCalculator = ((EthHashMiningCoordinator) miningCoordinator).getEpochCalculator();
+    this.epochCalculator = miningCoordinator.getEpochCalculator();
   }
 
   @Override
-  public boolean canHandle(final String initialMessage, final StratumConnection conn) {
+  public boolean maybeHandle(
+      final Buffer initialMessage, final StratumConnection conn, final Consumer<String> sender) {
     final JsonRpcRequest requestBody;
     try {
       requestBody = new JsonObject(initialMessage).mapTo(JsonRpcRequest.class);
-    } catch (IllegalArgumentException e) {
+    } catch (IllegalArgumentException | DecodeException e) {
       LOG.debug(e.getMessage(), e);
       return false;
     }
@@ -121,36 +117,36 @@ public boolean canHandle(final String initialMessage, final StratumConnection co
                     },
                     extranonce
                   }));
-      conn.send(notify + "\n");
+      sender.accept(notify);
     } catch (JsonProcessingException e) {
       LOG.debug(e.getMessage(), e);
-      conn.close(null);
+      conn.close();
     }
     return true;
   }
 
-  private void registerConnection(final StratumConnection conn) {
+  private void registerConnection(final StratumConnection conn, final Consumer<String> sender) {
     activeConnections.add(conn);
     if (currentInput != null) {
-      sendNewWork(conn);
+      sendNewWork(sender);
     }
   }
 
-  private void sendNewWork(final StratumConnection conn) {
+  private void sendNewWork(final Consumer<String> sender) {
     byte[] dagSeed = DirectAcyclicGraphSeed.dagSeed(currentInput.getBlockNumber(), epochCalculator);
     Object[] params =
         new Object[] {
           jobIdSupplier.get(),
           Bytes.wrap(currentInput.getPrePowHash()).toHexString(),
           Bytes.wrap(dagSeed).toHexString(),
-          currentInput.getTarget().toBytes().toHexString(),
+          currentInput.getTarget().toHexString(),
           true
         };
     JsonRpcRequest req = new JsonRpcRequest("2.0", "mining.notify", params);
     try {
-      conn.send(mapper.writeValueAsString(req) + "\n");
+      sender.accept(mapper.writeValueAsString(req));
     } catch (JsonProcessingException e) {
-      LOG.debug(e.getMessage(), e);
+      throw new IllegalStateException(e);
     }
   }
 
@@ -160,61 +156,66 @@ public void onClose(final StratumConnection conn) {
   }
 
   @Override
-  public void handle(final StratumConnection conn, final String message) {
-    try {
-      JsonRpcRequest req = new JsonObject(message).mapTo(JsonRpcRequest.class);
-      if ("mining.authorize".equals(req.getMethod())) {
-        handleMiningAuthorize(conn, req);
-      } else if ("mining.submit".equals(req.getMethod())) {
-        handleMiningSubmit(conn, req);
-      } else if (RpcMethod.ETH_SUBMIT_HASHRATE.getMethodName().equals(req.getMethod())) {
-        handleHashrateSubmit(mapper, miningCoordinator, conn, req);
-      }
-    } catch (IllegalArgumentException | IOException e) {
-      LOG.debug(e.getMessage(), e);
-      conn.close(null);
+  public void handle(
+      final StratumConnection conn, final Buffer message, final Consumer<String> sender) {
+    JsonRpcRequest req = new JsonObject(message).mapTo(JsonRpcRequest.class);
+    if ("mining.authorize".equals(req.getMethod())) {
+      handleMiningAuthorize(conn, req, sender);
+    } else if ("mining.submit".equals(req.getMethod())) {
+      handleMiningSubmit(req, sender);
+    } else if (RpcMethod.ETH_SUBMIT_HASHRATE.getMethodName().equals(req.getMethod())) {
+      handleHashrateSubmit(mapper, miningCoordinator, conn, req, sender);
     }
   }
 
-  private void handleMiningSubmit(final StratumConnection conn, final JsonRpcRequest message)
-      throws IOException {
+  private void handleMiningSubmit(final JsonRpcRequest message, final Consumer<String> sender) {
     LOG.debug("Miner submitted solution {}", message);
     boolean result = false;
-    final EthHashSolution solution =
-        new EthHashSolution(
+    final PoWSolution solution =
+        new PoWSolution(
             Bytes.fromHexString(message.getRequiredParameter(2, String.class)).getLong(0),
             Hash.fromHexString(message.getRequiredParameter(4, String.class)),
-            Bytes.fromHexString(message.getRequiredParameter(3, String.class)).toArrayUnsafe());
-    if (Arrays.equals(currentInput.getPrePowHash(), solution.getPowHash())) {
+            null,
+            Bytes.fromHexString(message.getRequiredParameter(3, String.class)));
+    if (currentInput.getPrePowHash().equals(solution.getPowHash())) {
       result = submitCallback.apply(solution);
     }
 
-    String response =
-        mapper.writeValueAsString(new JsonRpcSuccessResponse(message.getId(), result));
-    conn.send(response + "\n");
+    String response;
+    try {
+      response = mapper.writeValueAsString(new JsonRpcSuccessResponse(message.getId(), result));
+    } catch (JsonProcessingException e) {
+      throw new IllegalStateException(e);
+    }
+    sender.accept(response);
   }
 
-  private void handleMiningAuthorize(final StratumConnection conn, final JsonRpcRequest message)
-      throws IOException {
+  private void handleMiningAuthorize(
+      final StratumConnection conn, final JsonRpcRequest message, final Consumer<String> sender) {
     // discard message contents as we don't care for username/password.
     // send confirmation
-    String confirm = mapper.writeValueAsString(new JsonRpcSuccessResponse(message.getId(), true));
-    conn.send(confirm + "\n");
+    String confirm;
+    try {
+      confirm = mapper.writeValueAsString(new JsonRpcSuccessResponse(message.getId(), true));
+    } catch (JsonProcessingException e) {
+      throw new IllegalStateException(e);
+    }
+    sender.accept(confirm);
     // ready for work.
-    registerConnection(conn);
+    registerConnection(conn, sender);
   }
 
   @Override
-  public void setCurrentWorkTask(final EthHashSolverInputs input) {
+  public void setCurrentWorkTask(final PoWSolverInputs input) {
     this.currentInput = input;
     LOG.debug("Sending new work to miners: {}", input);
     for (StratumConnection conn : activeConnections) {
-      sendNewWork(conn);
+      sendNewWork(conn.notificationSender());
     }
   }
 
   @Override
-  public void setSubmitCallback(final Function<EthHashSolution, Boolean> submitSolutionCallback) {
+  public void setSubmitCallback(final Function<PoWSolution, Boolean> submitSolutionCallback) {
     this.submitCallback = submitSolutionCallback;
   }
 }
diff --git a/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/StratumConnection.java b/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/StratumConnection.java
index f976d3f71a9..5db1957bfd0 100644
--- a/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/StratumConnection.java
+++ b/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/StratumConnection.java
@@ -14,92 +14,52 @@
  */
 package org.hyperledger.besu.ethereum.stratum;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Iterator;
 import java.util.function.Consumer;
 
-import com.google.common.base.Splitter;
 import io.vertx.core.buffer.Buffer;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Persistent TCP connection using a variant of the Stratum protocol, connecting the client to
  * miners.
  */
 final class StratumConnection {
-  private static final Logger LOG = getLogger();
-
-  private String incompleteMessage = "";
+  private static final Logger LOG = LoggerFactory.getLogger(StratumConnection.class);
 
   private final StratumProtocol[] protocols;
-  private final Runnable closeHandle;
-  private final Consumer<String> sender;
-
+  private final Consumer<String> notificationSender;
   private StratumProtocol protocol;
 
-  StratumConnection(
-      final StratumProtocol[] protocols,
-      final Runnable closeHandle,
-      final Consumer<String> sender) {
+  StratumConnection(final StratumProtocol[] protocols, final Consumer<String> notificationSender) {
     this.protocols = protocols;
-    this.closeHandle = closeHandle;
-    this.sender = sender;
-  }
-
-  void handleBuffer(final Buffer buffer) {
-    LOG.trace("Buffer received {}", buffer);
-    Splitter splitter = Splitter.on('\n');
-    boolean firstMessage = false;
-    String messagesString;
-    try {
-      messagesString = buffer.toString(StandardCharsets.UTF_8);
-    } catch (IllegalArgumentException e) {
-      LOG.debug("Invalid message with non UTF-8 characters: " + e.getMessage(), e);
-      closeHandle.run();
-      return;
-    }
-    Iterator<String> messages = splitter.split(messagesString).iterator();
-    while (messages.hasNext()) {
-      String message = messages.next();
-      if (!firstMessage) {
-        message = incompleteMessage + message;
-        firstMessage = true;
-      }
-      if (!messages.hasNext()) {
-        incompleteMessage = message;
-      } else {
-        LOG.trace("Dispatching message {}", message);
-        handleMessage(message);
-      }
-    }
+    this.notificationSender = notificationSender;
   }
 
-  void close(final Void aVoid) {
-    if (protocol != null) {
-      protocol.onClose(this);
-    }
-  }
-
-  private void handleMessage(final String message) {
+  void handleBuffer(final Buffer message, final Consumer<String> sender) {
+    LOG.trace(">> {}", message);
     if (protocol == null) {
       for (StratumProtocol protocol : protocols) {
-        if (protocol.canHandle(message, this)) {
+        if (protocol.maybeHandle(message, this, sender)) {
+          LOG.trace("Using protocol: {}", protocol.getClass().getSimpleName());
           this.protocol = protocol;
         }
       }
       if (protocol == null) {
-        LOG.debug("Invalid first message: {}", message);
-        closeHandle.run();
+        throw new IllegalArgumentException("Invalid first message");
       }
     } else {
-      protocol.handle(this, message);
+      protocol.handle(this, message, sender);
+    }
+  }
+
+  void close() {
+    if (protocol != null) {
+      protocol.onClose(this);
     }
   }
 
-  public void send(final String message) {
-    LOG.debug("Sending message {}", message);
-    sender.accept(message);
+  public Consumer<String> notificationSender() {
+    return notificationSender;
   }
 }
diff --git a/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/StratumProtocol.java b/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/StratumProtocol.java
index d5482ad5a7e..275724aa965 100644
--- a/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/StratumProtocol.java
+++ b/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/StratumProtocol.java
@@ -17,13 +17,15 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequest;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolution;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolverInputs;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolution;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolverInputs;
 
-import java.io.IOException;
+import java.util.function.Consumer;
 import java.util.function.Function;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.json.JsonMapper;
+import io.vertx.core.buffer.Buffer;
 import org.apache.tuweni.bytes.Bytes;
 
 /**
@@ -35,13 +37,15 @@
 public interface StratumProtocol {
 
   /**
-   * Checks if the protocol can handle a TCP connection, based on the initial message.
+   * Checks if the protocol can handle a TCP connection, based on the initial message. If the
+   * protocol can handle the message, it will consume it and handle it.
    *
    * @param initialMessage the initial message sent over the TCP connection.
    * @param conn the connection itself
+   * @param sender the callback to use to send messages back to the client
    * @return true if the protocol can handle this connection
    */
-  boolean canHandle(String initialMessage, StratumConnection conn);
+  boolean maybeHandle(Buffer initialMessage, StratumConnection conn, Consumer<String> sender);
 
   /**
    * Callback when a stratum connection is closed.
@@ -55,32 +59,38 @@ public interface StratumProtocol {
    *
    * @param conn the Stratum connection
    * @param message the message to handle
+   * @param sender the callback to use to send messages back to the client
    */
-  void handle(StratumConnection conn, String message);
+  void handle(StratumConnection conn, Buffer message, Consumer<String> sender);
 
   /**
    * Sets the current proof-of-work job.
    *
    * @param input the new proof-of-work job to send to miners
    */
-  void setCurrentWorkTask(EthHashSolverInputs input);
+  void setCurrentWorkTask(PoWSolverInputs input);
 
-  void setSubmitCallback(Function<EthHashSolution, Boolean> submitSolutionCallback);
+  void setSubmitCallback(Function<PoWSolution, Boolean> submitSolutionCallback);
 
   default void handleHashrateSubmit(
       final JsonMapper mapper,
       final MiningCoordinator miningCoordinator,
       final StratumConnection conn,
-      final JsonRpcRequest message)
-      throws IOException {
+      final JsonRpcRequest message,
+      final Consumer<String> sender) {
     final String hashRate = message.getRequiredParameter(0, String.class);
     final String id = message.getRequiredParameter(1, String.class);
-    String response =
-        mapper.writeValueAsString(
-            new JsonRpcSuccessResponse(
-                message.getId(),
-                miningCoordinator.submitHashRate(
-                    id, Bytes.fromHexString(hashRate).toBigInteger().longValue())));
-    conn.send(response + "\n");
+    String response;
+    try {
+      response =
+          mapper.writeValueAsString(
+              new JsonRpcSuccessResponse(
+                  message.getId(),
+                  miningCoordinator.submitHashRate(
+                      id, Bytes.fromHexString(hashRate).toBigInteger().longValue())));
+    } catch (JsonProcessingException e) {
+      throw new IllegalStateException(e);
+    }
+    sender.accept(response);
   }
 }
diff --git a/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/StratumServer.java b/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/StratumServer.java
index ff6f6a223fd..7990b883905 100644
--- a/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/StratumServer.java
+++ b/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/StratumServer.java
@@ -14,123 +14,321 @@
  */
 package org.hyperledger.besu.ethereum.stratum;
 
-import static org.apache.logging.log4j.LogManager.getLogger;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
+import org.hyperledger.besu.ethereum.chain.PoWObserver;
+import org.hyperledger.besu.ethereum.mainnet.EthHash;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolution;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolverInputs;
+import org.hyperledger.besu.metrics.BesuMetricCategory;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.plugin.services.metrics.Counter;
 
-import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
-import org.hyperledger.besu.ethereum.chain.EthHashObserver;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolution;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolverInputs;
-
-import java.util.concurrent.CompletableFuture;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 
+import com.google.common.util.concurrent.AtomicDouble;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.DecoderResultProvider;
+import io.netty.handler.codec.LineBasedFrameDecoder;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.HttpContent;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpRequestDecoder;
+import io.netty.handler.codec.http.HttpResponseEncoder;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.codec.http.LastHttpContent;
+import io.netty.handler.codec.string.StringEncoder;
+import io.netty.util.CharsetUtil;
+import io.vertx.core.Future;
 import io.vertx.core.Vertx;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.net.NetServer;
 import io.vertx.core.net.NetServerOptions;
 import io.vertx.core.net.NetSocket;
-import org.apache.logging.log4j.Logger;
+import io.vertx.core.net.impl.NetSocketInternal;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * TCP server allowing miners to connect to the client over persistent TCP connections, using the
  * various Stratum protocols.
  */
-public class StratumServer implements EthHashObserver {
+public class StratumServer implements PoWObserver {
 
-  private static final Logger logger = getLogger();
+  private static final Logger logger = LoggerFactory.getLogger(StratumServer.class);
+  private static final String VERTX_HANDLER_NAME = "handler";
 
   private final Vertx vertx;
   private final int port;
   private final String networkInterface;
-  private final AtomicBoolean started = new AtomicBoolean(false);
+  protected final AtomicBoolean started = new AtomicBoolean(false);
+  private final AtomicLong numberOfMiners = new AtomicLong(0);
+  private final AtomicDouble currentDifficulty = new AtomicDouble(0.0);
   private final StratumProtocol[] protocols;
+  private final Counter connectionsCount;
+  private final Counter disconnectionsCount;
   private NetServer server;
 
   public StratumServer(
       final Vertx vertx,
-      final MiningCoordinator miningCoordinator,
+      final PoWMiningCoordinator miningCoordinator,
       final int port,
       final String networkInterface,
-      final String extraNonce) {
+      final String extraNonce,
+      final MetricsSystem metricsSystem) {
     this.vertx = vertx;
     this.port = port;
     this.networkInterface = networkInterface;
     protocols =
         new StratumProtocol[] {
+          new GetWorkProtocol(miningCoordinator.getEpochCalculator()),
           new Stratum1Protocol(extraNonce, miningCoordinator),
           new Stratum1EthProxyProtocol(miningCoordinator)
         };
+    metricsSystem.createLongGauge(
+        BesuMetricCategory.STRATUM, "miners", "Number of miners connected", numberOfMiners::get);
+    metricsSystem.createGauge(
+        BesuMetricCategory.STRATUM,
+        "difficulty",
+        "Current mining difficulty",
+        currentDifficulty::get);
+    this.connectionsCount =
+        metricsSystem.createCounter(
+            BesuMetricCategory.STRATUM, "connections", "Number of connections over time");
+    this.disconnectionsCount =
+        metricsSystem.createCounter(
+            BesuMetricCategory.STRATUM, "disconnections", "Number of disconnections over time");
   }
 
-  public CompletableFuture<?> start() {
+  public Future<NetServer> start() {
     if (started.compareAndSet(false, true)) {
-      logger.info("Starting stratum server on {}:{}", networkInterface, port);
       server =
           vertx.createNetServer(
               new NetServerOptions().setPort(port).setHost(networkInterface).setTcpKeepAlive(true));
-      CompletableFuture<?> result = new CompletableFuture<>();
       server.connectHandler(this::handle);
-      server.listen(
-          res -> {
-            if (res.failed()) {
-              result.completeExceptionally(
-                  new StratumServerException(
-                      String.format(
-                          "Failed to bind Stratum Server listener to %s:%s: %s",
-                          networkInterface, port, res.cause().getMessage())));
-            } else {
-              result.complete(null);
-            }
-          });
-      return result;
+      return server
+          .listen()
+          .onSuccess(
+              v ->
+                  logger.info("Stratum server started on {}:{}", networkInterface, v.actualPort()));
     }
-    return CompletableFuture.completedFuture(null);
+    return Future.succeededFuture(server);
   }
 
   private void handle(final NetSocket socket) {
+    connectionsCount.inc();
+    numberOfMiners.incrementAndGet();
+    NetSocketInternal internalSocket = (NetSocketInternal) socket;
     StratumConnection conn =
         new StratumConnection(
-            protocols, socket::close, bytes -> socket.write(Buffer.buffer(bytes)));
-    socket.handler(conn::handleBuffer);
-    socket.closeHandler(conn::close);
+            protocols, response -> sendLineBasedResponse(internalSocket, response));
+    ChannelPipeline pipeline = internalSocket.channelHandlerContext().pipeline();
+    pipeline.addBefore(
+        VERTX_HANDLER_NAME,
+        "stratumDecoder",
+        new HttpRequestDecoder() {
+          @Override
+          protected void decode(
+              final ChannelHandlerContext ctx, final ByteBuf in, final List<Object> out)
+              throws Exception {
+            ByteBuf inputCopy = in.copy();
+            int indexBeforeDecode = inputCopy.readerIndex();
+            super.decode(ctx, inputCopy, out);
+            if (out.isEmpty()) { // to process last chunk
+              super.decode(ctx, inputCopy, out);
+            }
+            DecoderResultProvider httpDecodingResult =
+                (DecoderResultProvider) out.get(out.size() - 1);
+            ChannelPipeline pipeline = ctx.pipeline();
+            if (httpDecodingResult.decoderResult().isFailure()) {
+              logger.trace("Received non-HTTP request, switching to line-based protocol");
+              out.remove(httpDecodingResult);
+              pipeline.addBefore(
+                  VERTX_HANDLER_NAME, "frameDecoder", new LineBasedFrameDecoder(240));
+              pipeline.addBefore(
+                  VERTX_HANDLER_NAME,
+                  "lineTrimmer",
+                  new MessageToMessageDecoder<ByteBuf>() {
+                    @Override
+                    protected void decode(
+                        final ChannelHandlerContext ctx,
+                        final ByteBuf message,
+                        final List<Object> out) {
+                      if (message.readableBytes() > 0
+                          && message.getByte(message.readableBytes() - 1) == '\n') {
+                        if (message.readableBytes() > 1
+                            && message.getByte(message.readableBytes() - 2) == '\r') {
+                          out.add(message.readRetainedSlice(message.readableBytes() - 2));
+                        } else {
+                          out.add(message.readRetainedSlice(message.readableBytes() - 1));
+                        }
+                      } else {
+                        out.add(message.retain());
+                      }
+                    }
+                  });
+              pipeline.addBefore(
+                  VERTX_HANDLER_NAME, "stringEncoder", new StringEncoder(CharsetUtil.UTF_8));
+              pipeline.remove(this);
+            } else {
+              String httpEncoderHandlerName = "httpEncoder";
+              if (pipeline.get(httpEncoderHandlerName) == null) {
+                logger.trace("Received HTTP request, switching to HTTP protocol");
+                pipeline.addBefore(
+                    VERTX_HANDLER_NAME, httpEncoderHandlerName, new HttpResponseEncoder());
+              }
+              if (httpDecodingResult instanceof HttpRequest request
+                  && !request.method().equals(HttpMethod.POST)) {
+                logger.debug("Received non-POST request");
+                in.skipBytes(in.readableBytes()); // skip body decode
+              } else {
+                in.skipBytes(inputCopy.readerIndex() - indexBeforeDecode);
+              }
+            }
+          }
+        });
+    Buffer requestBody = Buffer.buffer();
+    internalSocket.messageHandler(
+        obj -> {
+          try {
+            if (obj instanceof HttpRequest request && !request.method().equals(HttpMethod.POST)) {
+              sendHttpResponse(
+                  internalSocket, HttpResponseStatus.METHOD_NOT_ALLOWED, Unpooled.EMPTY_BUFFER);
+            } else if (obj instanceof HttpContent httpContent) {
+              requestBody.appendBuffer(Buffer.buffer(httpContent.content()));
+              if (obj instanceof LastHttpContent) {
+                try {
+                  conn.handleBuffer(
+                      requestBody,
+                      response ->
+                          sendHttpResponse(
+                              internalSocket,
+                              HttpResponseStatus.OK,
+                              Unpooled.wrappedBuffer(response.getBytes(CharsetUtil.UTF_8))));
+                } catch (IllegalArgumentException e) {
+                  logger.warn("Invalid message {}", requestBody);
+                  sendHttpResponse(
+                      internalSocket, HttpResponseStatus.BAD_REQUEST, Unpooled.EMPTY_BUFFER);
+                } catch (Exception e) {
+                  logger.warn("Unexpected error", e);
+                  sendHttpResponse(
+                      internalSocket,
+                      HttpResponseStatus.INTERNAL_SERVER_ERROR,
+                      Unpooled.EMPTY_BUFFER);
+                } finally {
+                  conn.close();
+                }
+              }
+            } else if (obj instanceof ByteBuf value && value.readableBytes() > 0) {
+              try {
+                conn.handleBuffer(
+                    Buffer.buffer(value),
+                    response -> sendLineBasedResponse(internalSocket, response));
+              } catch (Exception e) {
+                logger.error("Error handling request", e);
+                internalSocket.close().onFailure(ex -> logger.error("Error closing socket", ex));
+              }
+            }
+          } catch (Exception e) {
+            pipeline.fireExceptionCaught(e);
+          }
+        });
+    internalSocket.exceptionHandler(
+        ex -> {
+          logger.error("Unknown error", ex);
+          internalSocket
+              .close()
+              .onFailure(
+                  closingException -> logger.error("Error closing socket", closingException));
+        });
+    socket.closeHandler(
+        (aVoid) -> {
+          logger.debug("Socket closed");
+          conn.close();
+          numberOfMiners.decrementAndGet();
+          disconnectionsCount.inc();
+        });
+  }
+
+  private static void sendHttpResponse(
+      final NetSocketInternal internalSocket,
+      final HttpResponseStatus responseStatus,
+      final ByteBuf content) {
+    ByteBuf contentResponse = content;
+    if (logger.isTraceEnabled()) {
+      contentResponse = content.copy();
+    }
+    internalSocket
+        .writeMessage(
+            new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, responseStatus, contentResponse))
+        .onFailure(ex -> logger.error("Failed to write response", ex))
+        .onSuccess(
+            writeResult ->
+                internalSocket
+                    .close()
+                    .onSuccess(
+                        v ->
+                            logger.trace(
+                                "<< {}",
+                                content.isReadable()
+                                    ? content.toString(StandardCharsets.UTF_8)
+                                    : "no content"))
+                    .onFailure(ex -> logger.error("Failed to close socket", ex)));
+  }
+
+  private static Future<Void> sendLineBasedResponse(
+      final NetSocketInternal internalSocket, final String response) {
+    return internalSocket
+        .writeMessage(response + '\n') // response is delimited by a newline
+        .onSuccess(v -> logger.trace("<< {}", response))
+        .onFailure(ex -> logger.error("Failed to send response: {}", response, ex));
   }
 
-  public CompletableFuture<?> stop() {
+  public Future<Void> stop() {
     if (started.compareAndSet(true, false)) {
-      CompletableFuture<?> result = new CompletableFuture<>();
-      server.close(
-          res -> {
-            if (res.failed()) {
-              result.completeExceptionally(
-                  new StratumServerException(
-                      String.format(
-                          "Failed to bind Stratum Server listener to %s:%s: %s",
-                          networkInterface, port, res.cause().getMessage())));
-            } else {
-              result.complete(null);
-            }
-          });
-      return result;
+      return server.close();
     }
     logger.debug("Stopping StratumServer that was not running");
-    return CompletableFuture.completedFuture(null);
+    return Future.succeededFuture();
   }
 
   @Override
-  public void newJob(final EthHashSolverInputs ethHashSolverInputs) {
+  public void newJob(final PoWSolverInputs poWSolverInputs) {
     if (!started.get()) {
-      logger.debug("Discarding {} as stratum server is not started", ethHashSolverInputs);
+      logger.debug("Discarding {} as stratum server is not started", poWSolverInputs);
       return;
     }
+    logger.debug("stratum newJob with inputs: {}", poWSolverInputs);
     for (StratumProtocol protocol : protocols) {
-      protocol.setCurrentWorkTask(ethHashSolverInputs);
+      protocol.setCurrentWorkTask(poWSolverInputs);
     }
+
+    // reverse the target calculation to get the difficulty
+    // and ensure we do not get divide by zero:
+    UInt256 difficulty =
+        Optional.of(poWSolverInputs.getTarget().toUnsignedBigInteger())
+            .filter(td -> td.compareTo(BigInteger.ONE) > 0)
+            .map(EthHash.TARGET_UPPER_BOUND::divide)
+            .map(UInt256::valueOf)
+            .orElse(UInt256.MAX_VALUE);
+
+    currentDifficulty.set(difficulty.toUnsignedBigInteger().doubleValue());
   }
 
   @Override
-  public void setSubmitWorkCallback(
-      final Function<EthHashSolution, Boolean> submitSolutionCallback) {
+  public void setSubmitWorkCallback(final Function<PoWSolution, Boolean> submitSolutionCallback) {
     for (StratumProtocol protocol : protocols) {
       protocol.setSubmitCallback(submitSolutionCallback);
     }
diff --git a/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/StratumServerException.java b/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/StratumServerException.java
deleted file mode 100644
index 4d51ed3aa30..00000000000
--- a/ethereum/stratum/src/main/java/org/hyperledger/besu/ethereum/stratum/StratumServerException.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.stratum;
-
-/** Class of exception occurring while launching the Stratum server. */
-public class StratumServerException extends RuntimeException {
-
-  public StratumServerException(final String message) {
-    super(message);
-  }
-}
diff --git a/ethereum/stratum/src/test/java/org/hyperledger/besu/ethereum/stratum/GetWorkProtocolTest.java b/ethereum/stratum/src/test/java/org/hyperledger/besu/ethereum/stratum/GetWorkProtocolTest.java
new file mode 100644
index 00000000000..aadbb1d7470
--- /dev/null
+++ b/ethereum/stratum/src/test/java/org/hyperledger/besu/ethereum/stratum/GetWorkProtocolTest.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.stratum;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+import org.hyperledger.besu.ethereum.mainnet.EpochCalculator;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolution;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolverInputs;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import io.vertx.core.buffer.Buffer;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.jupiter.api.Test;
+
+public class GetWorkProtocolTest {
+
+  @Test
+  public void testCanHandleGetWorkMessage() {
+    String message = "{\"method\":\"eth_getWork\",\"id\":1}";
+    EpochCalculator epochCalculator = mock(EpochCalculator.class);
+    GetWorkProtocol protocol = new GetWorkProtocol(epochCalculator);
+    assertThat(
+            protocol.maybeHandle(
+                Buffer.buffer(message),
+                new StratumConnection(new StratumProtocol[0], null),
+                (msg) -> {}))
+        .isTrue();
+  }
+
+  @Test
+  public void testCanHandleSubmitWorkMessage() {
+    String message = "{\"method\":\"eth_submitWork\",\"id\":1}";
+    EpochCalculator epochCalculator = mock(EpochCalculator.class);
+    GetWorkProtocol protocol = new GetWorkProtocol(epochCalculator);
+    assertThat(
+            protocol.maybeHandle(
+                Buffer.buffer(message),
+                new StratumConnection(new StratumProtocol[0], null),
+                (msg) -> {}))
+        .isTrue();
+  }
+
+  @Test
+  public void testCanHandleBadRequest() {
+    String message = "bad-request";
+    EpochCalculator epochCalculator = mock(EpochCalculator.class);
+    GetWorkProtocol protocol = new GetWorkProtocol(epochCalculator);
+    assertThat(
+            protocol.maybeHandle(
+                Buffer.buffer(message),
+                new StratumConnection(new StratumProtocol[0], null),
+                (msg) -> {}))
+        .isFalse();
+  }
+
+  @Test
+  public void testCanGetSolutions() {
+    AtomicReference<Object> messageRef = new AtomicReference<>();
+    StratumConnection connection = new StratumConnection(new StratumProtocol[0], null);
+
+    GetWorkProtocol protocol = new GetWorkProtocol(new EpochCalculator.DefaultEpochCalculator());
+    AtomicReference<PoWSolution> solutionFound = new AtomicReference<>();
+    protocol.setSubmitCallback(
+        (sol) -> {
+          solutionFound.set(sol);
+          return true;
+        });
+    protocol.setCurrentWorkTask(
+        new PoWSolverInputs(UInt256.ZERO, Bytes.fromHexString("0xdeadbeef"), 123L));
+    String requestWork = "{\"method\":\"eth_getWork\",\"id\":1}";
+    protocol.handle(connection, Buffer.buffer(requestWork), messageRef::set);
+    assertThat(messageRef.get())
+        .isEqualTo(
+            "{\"jsonrpc\":\"2.0\",\"id\":1,\"result\":[\"0xdeadbeef\",\"0x0000000000000000000000000000000000000000000000000000000000000000\",\"0x0000000000000000000000000000000000000000000000000000000000000000\",\"0x7b\"]}");
+
+    String submitWork =
+        "{\"method\":\"eth_submitWork\",\"id\":1,\"params\":[\"0xdeadbeefdeadbeef\", \"0x0000000000000000000000000000000000000000000000000000000000000000\", \"0x0000000000000000000000000000000000000000000000000000000000000000\"]}";
+    assertThat(
+            protocol.maybeHandle(
+                Buffer.buffer(submitWork),
+                new StratumConnection(new StratumProtocol[0], null),
+                messageRef::set))
+        .isTrue();
+    protocol.handle(connection, Buffer.buffer(submitWork), messageRef::set);
+    assertThat(messageRef.get()).isEqualTo("{\"jsonrpc\":\"2.0\",\"id\":1,\"result\":true}");
+  }
+}
diff --git a/ethereum/stratum/src/test/java/org/hyperledger/besu/ethereum/stratum/Stratum1EthProxyProtocolTest.java b/ethereum/stratum/src/test/java/org/hyperledger/besu/ethereum/stratum/Stratum1EthProxyProtocolTest.java
new file mode 100644
index 00000000000..51fb0923920
--- /dev/null
+++ b/ethereum/stratum/src/test/java/org/hyperledger/besu/ethereum/stratum/Stratum1EthProxyProtocolTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.stratum;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import io.vertx.core.buffer.Buffer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class Stratum1EthProxyProtocolTest {
+
+  private Stratum1EthProxyProtocol protocol;
+  private StratumConnection conn;
+  private List<Object> receivedMessages;
+
+  @BeforeEach
+  public void setUp() {
+    protocol = new Stratum1EthProxyProtocol(null);
+    receivedMessages = new ArrayList<>();
+    conn = new StratumConnection(new StratumProtocol[0], null);
+  }
+
+  @Test
+  public void testCanHandleEmptyString() {
+    assertThat(protocol.maybeHandle(Buffer.buffer(), conn, receivedMessages::add)).isFalse();
+  }
+
+  @Test
+  public void testCanHandleMalformedJSON() {
+    assertThat(protocol.maybeHandle(Buffer.buffer("{[\"foo\","), conn, receivedMessages::add))
+        .isFalse();
+  }
+
+  @Test
+  public void testCanHandleWrongMethod() {
+    assertThat(
+            protocol.maybeHandle(
+                Buffer.buffer(
+                    "{\"id\":0,\"method\":\"eth_byebye\",\"params\":[\"0xdeadbeefdeadbeef.worker\"]}"),
+                conn,
+                receivedMessages::add))
+        .isFalse();
+  }
+
+  @Test
+  public void testCanHandleWellFormedRequest() {
+    assertThat(
+            protocol.maybeHandle(
+                Buffer.buffer(
+                    "{\"id\":0,\"method\":\"eth_submitLogin\",\"params\":[\"0xdeadbeefdeadbeef.worker\"]}"),
+                conn,
+                receivedMessages::add))
+        .isTrue();
+  }
+}
diff --git a/ethereum/stratum/src/test/java/org/hyperledger/besu/ethereum/stratum/StratumConnectionTest.java b/ethereum/stratum/src/test/java/org/hyperledger/besu/ethereum/stratum/StratumConnectionTest.java
index 13a112cf1cb..f8803966486 100644
--- a/ethereum/stratum/src/test/java/org/hyperledger/besu/ethereum/stratum/StratumConnectionTest.java
+++ b/ethereum/stratum/src/test/java/org/hyperledger/besu/ethereum/stratum/StratumConnectionTest.java
@@ -15,69 +15,65 @@
 package org.hyperledger.besu.ethereum.stratum;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
 import static org.mockito.Mockito.when;
 
-import org.hyperledger.besu.ethereum.blockcreation.EthHashMiningCoordinator;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
 import org.hyperledger.besu.ethereum.mainnet.EpochCalculator;
-import org.hyperledger.besu.ethereum.mainnet.EthHashSolverInputs;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolverInputs;
 
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.vertx.core.buffer.Buffer;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.units.bigints.UInt256;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
 
+@ExtendWith(MockitoExtension.class)
 public class StratumConnectionTest {
 
-  @Mock EthHashMiningCoordinator miningCoordinator;
+  @Mock PoWMiningCoordinator miningCoordinator;
+  private EpochCalculator epochCalculator;
 
-  @Before
+  @BeforeEach
   public void setup() {
-    miningCoordinator = Mockito.mock(EthHashMiningCoordinator.class);
-    when(miningCoordinator.getEpochCalculator())
-        .thenReturn(new EpochCalculator.DefaultEpochCalculator());
+    this.epochCalculator = new EpochCalculator.DefaultEpochCalculator();
   }
 
   @Test
   public void testNoSuitableProtocol() {
-    AtomicBoolean called = new AtomicBoolean(false);
-    StratumConnection conn =
-        new StratumConnection(new StratumProtocol[] {}, () -> called.set(true), bytes -> {});
-    conn.handleBuffer(Buffer.buffer("{}\n"));
-    assertThat(called.get()).isTrue();
+    StratumConnection conn = new StratumConnection(new StratumProtocol[] {}, notification -> {});
+    assertThatThrownBy(() -> conn.handleBuffer(Buffer.buffer("{}\n"), bytes -> {}))
+        .isInstanceOf(IllegalArgumentException.class);
   }
 
   @Test
   public void testStratum1WithoutMatches() {
-    AtomicBoolean called = new AtomicBoolean(false);
+    when(miningCoordinator.getEpochCalculator()).thenReturn(epochCalculator);
     StratumConnection conn =
         new StratumConnection(
             new StratumProtocol[] {new Stratum1Protocol("", miningCoordinator)},
-            () -> called.set(true),
-            bytes -> {});
-    conn.handleBuffer(Buffer.buffer("{}\n"));
-    assertThat(called.get()).isTrue();
+            notification -> {});
+    assertThatThrownBy(() -> conn.handleBuffer(Buffer.buffer("{}\n"), bytes -> {}))
+        .isInstanceOf(IllegalArgumentException.class);
   }
 
   @Test
   public void testStratum1Matches() {
-
-    AtomicBoolean called = new AtomicBoolean(false);
-
-    AtomicReference<String> message = new AtomicReference<>();
+    when(miningCoordinator.getEpochCalculator()).thenReturn(epochCalculator);
+    AtomicReference<Object> message = new AtomicReference<>();
 
     StratumConnection conn =
         new StratumConnection(
             new StratumProtocol[] {
               new Stratum1Protocol("", miningCoordinator, () -> "abcd", () -> "abcd")
             },
-            () -> called.set(true),
-            message::set);
+            notification -> {});
     conn.handleBuffer(
         Buffer.buffer(
             "{"
@@ -86,27 +82,23 @@ public void testStratum1Matches() {
                 + "  \"params\": [ "
                 + "    \"MinerName/1.0.0\", \"EthereumStratum/1.0.0\" "
                 + "  ]"
-                + "}\n"));
-    assertThat(called.get()).isFalse();
+                + "}\n"),
+        message::set);
 
     assertThat(message.get())
         .isEqualTo(
-            "{\"jsonrpc\":\"2.0\",\"id\":23,\"result\":[[\"mining.notify\",\"abcd\",\"EthereumStratum/1.0.0\"],\"\"]}\n");
+            "{\"jsonrpc\":\"2.0\",\"id\":23,\"result\":[[\"mining.notify\",\"abcd\",\"EthereumStratum/1.0.0\"],\"\"]}");
   }
 
   @Test
   public void testStratum1SendWork() {
-
-    AtomicBoolean called = new AtomicBoolean(false);
-
-    AtomicReference<String> message = new AtomicReference<>();
+    when(miningCoordinator.getEpochCalculator()).thenReturn(epochCalculator);
+    AtomicReference<Object> message = new AtomicReference<>();
 
     Stratum1Protocol protocol =
         new Stratum1Protocol("", miningCoordinator, () -> "abcd", () -> "abcd");
 
-    StratumConnection conn =
-        new StratumConnection(
-            new StratumProtocol[] {protocol}, () -> called.set(true), message::set);
+    StratumConnection conn = new StratumConnection(new StratumProtocol[] {protocol}, message::set);
     conn.handleBuffer(
         Buffer.buffer(
             "{"
@@ -115,7 +107,8 @@ public void testStratum1SendWork() {
                 + "  \"params\": [ "
                 + "    \"MinerName/1.0.0\", \"EthereumStratum/1.0.0\" "
                 + "  ]"
-                + "}\n"));
+                + "}\n"),
+        message::set);
     conn.handleBuffer(
         Buffer.buffer(
             "{"
@@ -124,24 +117,21 @@ public void testStratum1SendWork() {
                 + "  \"params\": [ "
                 + "    \"someusername\", \"password\" "
                 + "  ]"
-                + "}\n"));
-    assertThat(called.get()).isFalse();
+                + "}\n"),
+        message::set);
     // now send work without waiting.
     protocol.setCurrentWorkTask(
-        new EthHashSolverInputs(
-            UInt256.valueOf(3), Bytes.fromHexString("deadbeef").toArrayUnsafe(), 42));
+        new PoWSolverInputs(UInt256.valueOf(3), Bytes.fromHexString("deadbeef"), 42));
 
     assertThat(message.get())
         .isEqualTo(
-            "{\"jsonrpc\":\"2.0\",\"method\":\"mining.notify\",\"params\":[\"abcd\",\"0xdeadbeef\",\"0x0000000000000000000000000000000000000000000000000000000000000000\",\"0x0000000000000000000000000000000000000000000000000000000000000003\",true],\"id\":null}\n");
+            "{\"jsonrpc\":\"2.0\",\"method\":\"mining.notify\",\"params\":[\"abcd\",\"0xdeadbeef\",\"0x0000000000000000000000000000000000000000000000000000000000000000\",\"0x0000000000000000000000000000000000000000000000000000000000000003\",true],\"id\":null}");
   }
 
   @Test
   public void testStratum1SubmitHashrate() {
-
-    AtomicBoolean called = new AtomicBoolean(false);
-
-    AtomicReference<String> message = new AtomicReference<>();
+    when(miningCoordinator.getEpochCalculator()).thenReturn(epochCalculator);
+    AtomicReference<Object> message = new AtomicReference<>();
 
     Stratum1Protocol protocol =
         new Stratum1Protocol("", miningCoordinator, () -> "abcd", () -> "abcd");
@@ -149,8 +139,7 @@ public void testStratum1SubmitHashrate() {
     Mockito.when(miningCoordinator.submitHashRate("0x02", 3L)).thenReturn(true);
 
     StratumConnection conn =
-        new StratumConnection(
-            new StratumProtocol[] {protocol}, () -> called.set(true), message::set);
+        new StratumConnection(new StratumProtocol[] {protocol}, notification -> {});
     conn.handleBuffer(
         Buffer.buffer(
             "{"
@@ -159,7 +148,8 @@ public void testStratum1SubmitHashrate() {
                 + "  \"params\": [ "
                 + "    \"MinerName/1.0.0\", \"EthereumStratum/1.0.0\" "
                 + "  ]"
-                + "}\n"));
+                + "}\n"),
+        message::set);
     conn.handleBuffer(
         Buffer.buffer(
             "{"
@@ -168,9 +158,8 @@ public void testStratum1SubmitHashrate() {
                 + "  \"params\": [ "
                 + "    \"0x03\",\"0x02\" "
                 + "  ]"
-                + "}\n"));
-    assertThat(called.get()).isFalse();
-
-    assertThat(message.get()).isEqualTo("{\"jsonrpc\":\"2.0\",\"id\":23,\"result\":true}\n");
+                + "}\n"),
+        message::set);
+    assertThat(message.get()).isEqualTo("{\"jsonrpc\":\"2.0\",\"id\":23,\"result\":true}");
   }
 }
diff --git a/ethereum/stratum/src/test/java/org/hyperledger/besu/ethereum/stratum/StratumServerTest.java b/ethereum/stratum/src/test/java/org/hyperledger/besu/ethereum/stratum/StratumServerTest.java
new file mode 100644
index 00000000000..59d89395233
--- /dev/null
+++ b/ethereum/stratum/src/test/java/org/hyperledger/besu/ethereum/stratum/StratumServerTest.java
@@ -0,0 +1,408 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.stratum;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.blockcreation.PoWMiningCoordinator;
+import org.hyperledger.besu.ethereum.mainnet.EpochCalculator;
+import org.hyperledger.besu.ethereum.mainnet.PoWSolverInputs;
+import org.hyperledger.besu.metrics.ObservableMetricsSystem;
+import org.hyperledger.besu.metrics.StubMetricsSystem;
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+
+import java.nio.charset.StandardCharsets;
+
+import io.vertx.core.Future;
+import io.vertx.core.Vertx;
+import io.vertx.core.buffer.Buffer;
+import io.vertx.core.file.OpenOptions;
+import io.vertx.core.json.JsonObject;
+import io.vertx.core.net.NetClient;
+import io.vertx.core.net.NetServer;
+import io.vertx.ext.web.client.WebClient;
+import io.vertx.ext.web.client.WebClientOptions;
+import io.vertx.junit5.VertxExtension;
+import io.vertx.junit5.VertxTestContext;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith({MockitoExtension.class, VertxExtension.class})
+public class StratumServerTest {
+
+  public static final Buffer DEFAULT_TEST_MESSAGE =
+      new JsonObject()
+          .put("version", "1.0")
+          .put("id", 1)
+          .put("method", RpcMethod.ETH_GET_WORK.getMethodName())
+          .toBuffer();
+  @Mock private PoWMiningCoordinator mockPoW;
+
+  @Test
+  public void runJobSetDifficultyShouldSucceed() {
+    StubMetricsSystem metrics = new StubMetricsSystem();
+    stratumServerWithMocks(metrics).newJob(new PoWSolverInputs(UInt256.MAX_VALUE, Bytes.EMPTY, 1));
+    assertThat(metrics.getGaugeValue("difficulty")).isEqualTo(1d);
+  }
+
+  @Test
+  public void runJobSetZeroDifficultyShouldNotThrow() {
+    StubMetricsSystem metrics = new StubMetricsSystem();
+    stratumServerWithMocks(metrics).newJob(new PoWSolverInputs(UInt256.MIN_VALUE, Bytes.EMPTY, 1));
+
+    assertThat(metrics.getGaugeValue("difficulty"))
+        .isEqualTo(UInt256.MAX_VALUE.toUnsignedBigInteger().doubleValue());
+  }
+
+  @Test
+  public void handleHttpChunkedPost(final Vertx vertx, final VertxTestContext testContext) {
+    String host = "localhost";
+    StratumServer stratum = new StratumServer(vertx, mockPoW, 0, host, "", new NoOpMetricsSystem());
+    stratum
+        .start()
+        .onComplete(
+            testContext.succeeding(
+                server ->
+                    vertx
+                        .fileSystem()
+                        .open("rpc-request.json", new OpenOptions())
+                        .onComplete(
+                            testContext.succeeding(
+                                file -> {
+                                  WebClient http =
+                                      WebClient.create(
+                                          vertx,
+                                          new WebClientOptions()
+                                              .setDefaultHost(host)
+                                              .setDefaultPort(server.actualPort()));
+                                  http.post("/")
+                                      .sendStream(
+                                          file,
+                                          testContext.succeeding(
+                                              resp -> {
+                                                testContext.verify(
+                                                    () -> {
+                                                      assertThat(resp.statusCode()).isEqualTo(200);
+                                                      assertThat(resp.bodyAsString())
+                                                          .contains(
+                                                              "\"jsonrpc\":\"2.0\",\"id\":1,\"result\"");
+                                                      stratum
+                                                          .stop()
+                                                          .onComplete(
+                                                              testContext.succeedingThenComplete());
+                                                    });
+                                              }));
+                                }))));
+  }
+
+  @Test
+  public void rejectNotHttpPost(final Vertx vertx, final VertxTestContext testContext) {
+    String host = "localhost";
+    StratumServer stratum = new StratumServer(vertx, mockPoW, 0, host, "", new NoOpMetricsSystem());
+    stratum
+        .start()
+        .onComplete(
+            testContext.succeeding(
+                server -> {
+                  WebClient http =
+                      WebClient.create(
+                          vertx,
+                          new WebClientOptions()
+                              .setDefaultHost(host)
+                              .setDefaultPort(server.actualPort()));
+                  http.put("/")
+                      .sendBuffer(DEFAULT_TEST_MESSAGE)
+                      .onComplete(
+                          testContext.succeeding(
+                              resp -> {
+                                testContext.verify(
+                                    () -> {
+                                      assertThat(resp.statusCode()).isEqualTo(405);
+                                      stratum
+                                          .stop()
+                                          .onComplete(testContext.succeedingThenComplete());
+                                    });
+                              }));
+                }));
+  }
+
+  @Test
+  public void handlePlainText(final Vertx vertx, final VertxTestContext testContext) {
+    String host = "localhost";
+    StratumServer stratum = new StratumServer(vertx, mockPoW, 0, host, "", new NoOpMetricsSystem());
+    stratum
+        .start()
+        .onComplete(
+            testContext.succeeding(
+                server -> {
+                  NetClient client = vertx.createNetClient();
+                  client
+                      .connect(server.actualPort(), host)
+                      .onComplete(
+                          testContext.succeeding(
+                              socket ->
+                                  socket
+                                      .handler(
+                                          resp ->
+                                              testContext.verify(
+                                                  () -> {
+                                                    assertThat(resp.length()).isNotZero();
+                                                    assertThat(resp.toString())
+                                                        .contains(
+                                                            "\"jsonrpc\":\"2.0\",\"id\":1,\"result\"");
+                                                    stratum
+                                                        .stop()
+                                                        .onComplete(
+                                                            testContext.succeedingThenComplete());
+                                                  }))
+                                      .write(
+                                          DEFAULT_TEST_MESSAGE.appendString(System.lineSeparator()))
+                                      .onComplete(
+                                          writeResult ->
+                                              testContext.verify(
+                                                  () ->
+                                                      assertThat(writeResult.failed())
+                                                          .isFalse()))));
+                }));
+  }
+
+  @Test
+  public void handlePlainTextMultiple(final Vertx vertx, final VertxTestContext testContext) {
+    String host = "localhost";
+    StratumServer stratum = new StratumServer(vertx, mockPoW, 0, host, "", new NoOpMetricsSystem());
+    stratum
+        .start()
+        .onComplete(
+            testContext.succeeding(
+                server -> {
+                  NetClient client = vertx.createNetClient();
+                  client
+                      .connect(server.actualPort(), host)
+                      .onComplete(
+                          testContext.succeeding(
+                              socket -> {
+                                socket.handler(
+                                    resp -> {
+                                      testContext.verify(
+                                          () -> {
+                                            assertThat(resp.length()).isNotZero();
+                                            String[] responses =
+                                                resp.toString(StandardCharsets.UTF_8).split("\n");
+                                            assertThat(responses).hasSize(2);
+                                            assertThat(responses)
+                                                .containsOnly(
+                                                    "{\"jsonrpc\":\"2.0\",\"id\":1,\"result\":null}");
+                                            stratum
+                                                .stop()
+                                                .onComplete(testContext.succeedingThenComplete());
+                                          });
+                                    });
+                                socket
+                                    .write(
+                                        DEFAULT_TEST_MESSAGE
+                                            .copy()
+                                            .appendString(System.lineSeparator())
+                                            .appendBuffer(DEFAULT_TEST_MESSAGE)
+                                            .appendString(System.lineSeparator()))
+                                    .onComplete(
+                                        writeResult ->
+                                            testContext.verify(
+                                                () -> assertThat(writeResult.failed()).isFalse()));
+                              }));
+                }));
+  }
+
+  @Test
+  public void handleHttpPost(final Vertx vertx, final VertxTestContext testContext) {
+    String host = "localhost";
+    StratumServer stratum = new StratumServer(vertx, mockPoW, 0, host, "", new NoOpMetricsSystem());
+    stratum
+        .start()
+        .onComplete(
+            testContext.succeeding(
+                server -> {
+                  WebClient http =
+                      WebClient.create(
+                          vertx,
+                          new WebClientOptions()
+                              .setDefaultHost(host)
+                              .setDefaultPort(server.actualPort()));
+                  http.post("/")
+                      .putHeader("Connection", "keep-alive")
+                      .putHeader("Accept-Encoding", "gzip, deflate")
+                      .sendBuffer(DEFAULT_TEST_MESSAGE)
+                      .onComplete(
+                          testContext.succeeding(
+                              resp -> {
+                                testContext.verify(
+                                    () -> {
+                                      assertThat(resp.statusCode()).isEqualTo(200);
+                                      assertThat(resp.bodyAsString())
+                                          .contains("\"jsonrpc\":\"2.0\",\"id\":1,\"result\"");
+                                      stratum
+                                          .stop()
+                                          .onComplete(testContext.succeedingThenComplete());
+                                    });
+                              }));
+                }));
+  }
+
+  @Test
+  public void handleHttpBadJson(final Vertx vertx, final VertxTestContext testContext) {
+    String host = "localhost";
+    StratumServer stratum = new StratumServer(vertx, mockPoW, 0, host, "", new NoOpMetricsSystem());
+    stratum
+        .start()
+        .onComplete(
+            testContext.succeeding(
+                server -> {
+                  WebClient http =
+                      WebClient.create(
+                          vertx,
+                          new WebClientOptions()
+                              .setDefaultHost(host)
+                              .setDefaultPort(server.actualPort()));
+                  http.post("/")
+                      .sendBuffer(Buffer.buffer("{\"jsonrpc\":\"2.0\",..."))
+                      .onComplete(
+                          testContext.succeeding(
+                              resp -> {
+                                testContext.verify(
+                                    () -> {
+                                      assertThat(resp.statusCode()).isEqualTo(400);
+                                      stratum
+                                          .stop()
+                                          .onComplete(testContext.succeedingThenComplete());
+                                    });
+                              }));
+                }));
+  }
+
+  @Test
+  public void handleHttpBadJsonRpc(final Vertx vertx, final VertxTestContext testContext) {
+    String host = "localhost";
+    StratumServer stratum = new StratumServer(vertx, mockPoW, 0, host, "", new NoOpMetricsSystem());
+    stratum
+        .start()
+        .onComplete(
+            testContext.succeeding(
+                server -> {
+                  WebClient http =
+                      WebClient.create(
+                          vertx,
+                          new WebClientOptions()
+                              .setDefaultHost(host)
+                              .setDefaultPort(server.actualPort()));
+                  http.post("/")
+                      .sendBuffer(
+                          Buffer.buffer(
+                              "{\"jsonrpc\":\"2.0\",\"id\":one,\"method\":\"eth_getWork\"}"))
+                      .onComplete(
+                          testContext.succeeding(
+                              resp -> {
+                                testContext.verify(
+                                    () -> {
+                                      assertThat(resp.statusCode()).isEqualTo(400);
+                                      stratum
+                                          .stop()
+                                          .onComplete(testContext.succeedingThenComplete());
+                                    });
+                              }));
+                }));
+  }
+
+  @Test
+  public void handleHttpUnknownMethod(final Vertx vertx, final VertxTestContext testContext) {
+    String host = "localhost";
+    StratumServer stratum = new StratumServer(vertx, mockPoW, 0, host, "", new NoOpMetricsSystem());
+    stratum
+        .start()
+        .onComplete(
+            testContext.succeeding(
+                server -> {
+                  WebClient http =
+                      WebClient.create(
+                          vertx,
+                          new WebClientOptions()
+                              .setDefaultHost(host)
+                              .setDefaultPort(server.actualPort()));
+                  http.post("/")
+                      .sendBuffer(
+                          Buffer.buffer(
+                              "{\"jsonrpc\":\"2.0\",\"id\":1,\"method\":\"unknown_method\"}"))
+                      .onComplete(
+                          testContext.succeeding(
+                              resp -> {
+                                testContext.verify(
+                                    () -> {
+                                      assertThat(resp.statusCode()).isEqualTo(400);
+                                      stratum
+                                          .stop()
+                                          .onComplete(testContext.succeedingThenComplete());
+                                    });
+                              }));
+                }));
+  }
+
+  @Test
+  public void handlePlainTextBadMessage(final Vertx vertx, final VertxTestContext testContext) {
+    String host = "localhost";
+    StratumServer stratum = new StratumServer(vertx, mockPoW, 0, host, "", new NoOpMetricsSystem());
+    stratum
+        .start()
+        .onComplete(
+            testContext.succeeding(
+                server -> {
+                  NetClient client = vertx.createNetClient();
+                  client
+                      .connect(server.actualPort(), host)
+                      .onComplete(
+                          testContext.succeeding(
+                              socket ->
+                                  socket
+                                      .closeHandler(v -> testContext.completeNow())
+                                      .write(
+                                          Buffer.buffer(
+                                              "{\"jsonrpc\":\"2.0\",..." + System.lineSeparator()))
+                                      .onComplete(
+                                          writeResult ->
+                                              testContext.verify(
+                                                  () ->
+                                                      assertThat(writeResult.failed())
+                                                          .isFalse()))));
+                }));
+  }
+
+  private StratumServer stratumServerWithMocks(final ObservableMetricsSystem metrics) {
+    when(mockPoW.getEpochCalculator()).thenReturn(new EpochCalculator.DefaultEpochCalculator());
+
+    StratumServer ss =
+        new StratumServer(null, mockPoW, 0, "lo", "", metrics) {
+          @Override
+          public Future<NetServer> start() {
+            this.started.set(true);
+            return null;
+          }
+        };
+    ss.start();
+    return ss;
+  }
+}
diff --git a/ethereum/stratum/src/test/resources/rpc-request.json b/ethereum/stratum/src/test/resources/rpc-request.json
new file mode 100644
index 00000000000..506e9b5c7af
--- /dev/null
+++ b/ethereum/stratum/src/test/resources/rpc-request.json
@@ -0,0 +1,5 @@
+{
+  "jsonrpc": "2.0",
+  "id": 1,
+  "method": "eth_getWork"
+}
\ No newline at end of file
diff --git a/ethereum/trie/build.gradle b/ethereum/trie/build.gradle
index 7bcf850c15b..c671a75bf0f 100644
--- a/ethereum/trie/build.gradle
+++ b/ethereum/trie/build.gradle
@@ -28,31 +28,28 @@ jar {
 }
 
 dependencies {
-  implementation project(':crypto')
+  implementation project(':crypto:algorithms')
+  implementation project(':datatypes')
   implementation project(':ethereum:rlp')
-  implementation project(':services:kvstore')
+  implementation project(':plugin-api')
 
+  implementation 'org.immutables:value-annotations'
   implementation 'com.google.guava:guava'
-  implementation 'org.apache.tuweni:bytes'
+  implementation 'io.opentelemetry:opentelemetry-api'
+  implementation 'org.apache.tuweni:tuweni-bytes'
   implementation 'org.bouncycastle:bcprov-jdk15on'
 
+  annotationProcessor 'org.immutables:value'
+
+  testImplementation project(':services:kvstore')
   testImplementation project(':testutil')
-  testImplementation project(path: ':ethereum:referencetests', configuration: 'testOutput')
 
   testImplementation 'com.fasterxml.jackson.core:jackson-databind'
   testImplementation 'junit:junit'
-  testImplementation 'org.apache.tuweni:units'
+  testImplementation 'org.apache.tuweni:tuweni-units'
   testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.mockito:mockito-core'
-}
 
-test { exclude 'org/hyperledger/besu/ethereum/trie/TrieRefTest.class' }
-
-task referenceTests(type: Test, dependsOn: ['compileTestJava']) {
-  doFirst {
-    if (!file("../referencetests/src/test/resources/README.md").exists()) {
-      throw new GradleException("ethereum/referencetests/src/test/resources/README.md missing: please clone submodules (git submodule update --init --recursive)")
-    }
-  }
-  include 'org/hyperledger/besu/ethereum/trie/TrieRefTest.class'
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 }
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/AllNodesVisitor.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/AllNodesVisitor.java
index 3c4d4f6b4b2..35d4caaae13 100644
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/AllNodesVisitor.java
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/AllNodesVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,13 +14,17 @@
  */
 package org.hyperledger.besu.ethereum.trie;
 
+import org.hyperledger.besu.ethereum.trie.patricia.BranchNode;
+import org.hyperledger.besu.ethereum.trie.patricia.ExtensionNode;
+import org.hyperledger.besu.ethereum.trie.patricia.LeafNode;
+
 import java.util.function.Consumer;
 
 public class AllNodesVisitor<V> implements NodeVisitor<V> {
 
   private final Consumer<Node<V>> handler;
 
-  AllNodesVisitor(final Consumer<Node<V>> handler) {
+  public AllNodesVisitor(final Consumer<Node<V>> handler) {
     this.handler = handler;
   }
 
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/BranchNode.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/BranchNode.java
deleted file mode 100644
index a1853e087f0..00000000000
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/BranchNode.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.trie;
-
-import static org.hyperledger.besu.crypto.Hash.keccak256;
-
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
-import org.hyperledger.besu.ethereum.rlp.RLP;
-
-import java.lang.ref.SoftReference;
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.Function;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.bytes.MutableBytes;
-
-class BranchNode<V> implements Node<V> {
-  public static final byte RADIX = CompactEncoding.LEAF_TERMINATOR;
-
-  @SuppressWarnings("rawtypes")
-  private static final Node NULL_NODE = NullNode.instance();
-
-  private final ArrayList<Node<V>> children;
-  private final Optional<V> value;
-  private final NodeFactory<V> nodeFactory;
-  private final Function<V, Bytes> valueSerializer;
-  private WeakReference<Bytes> rlp;
-  private SoftReference<Bytes32> hash;
-  private boolean dirty = false;
-
-  BranchNode(
-      final ArrayList<Node<V>> children,
-      final Optional<V> value,
-      final NodeFactory<V> nodeFactory,
-      final Function<V, Bytes> valueSerializer) {
-    assert (children.size() == RADIX);
-    this.children = children;
-    this.value = value;
-    this.nodeFactory = nodeFactory;
-    this.valueSerializer = valueSerializer;
-  }
-
-  @Override
-  public Node<V> accept(final PathNodeVisitor<V> visitor, final Bytes path) {
-    return visitor.visit(this, path);
-  }
-
-  @Override
-  public void accept(final NodeVisitor<V> visitor) {
-    visitor.visit(this);
-  }
-
-  @Override
-  public void accept(final Bytes location, final LocationNodeVisitor<V> visitor) {
-    visitor.visit(location, this);
-  }
-
-  @Override
-  public Bytes getPath() {
-    return Bytes.EMPTY;
-  }
-
-  @Override
-  public Optional<V> getValue() {
-    return value;
-  }
-
-  @Override
-  public List<Node<V>> getChildren() {
-    return Collections.unmodifiableList(children);
-  }
-
-  public Node<V> child(final byte index) {
-    return children.get(index);
-  }
-
-  @Override
-  public Bytes getRlp() {
-    if (rlp != null) {
-      final Bytes encoded = rlp.get();
-      if (encoded != null) {
-        return encoded;
-      }
-    }
-    final BytesValueRLPOutput out = new BytesValueRLPOutput();
-    out.startList();
-    for (int i = 0; i < RADIX; ++i) {
-      out.writeRaw(children.get(i).getRlpRef());
-    }
-    if (value.isPresent()) {
-      out.writeBytes(valueSerializer.apply(value.get()));
-    } else {
-      out.writeNull();
-    }
-    out.endList();
-    final Bytes encoded = out.encoded();
-    rlp = new WeakReference<>(encoded);
-    return encoded;
-  }
-
-  @Override
-  public Bytes getRlpRef() {
-    if (isReferencedByHash()) {
-      return RLP.encodeOne(getHash());
-    } else {
-      return getRlp();
-    }
-  }
-
-  @Override
-  public Bytes32 getHash() {
-    if (hash != null) {
-      final Bytes32 hashed = hash.get();
-      if (hashed != null) {
-        return hashed;
-      }
-    }
-    final Bytes32 hashed = keccak256(getRlp());
-    hash = new SoftReference<>(hashed);
-    return hashed;
-  }
-
-  @Override
-  public Node<V> replacePath(final Bytes newPath) {
-    return nodeFactory.createExtension(newPath, this);
-  }
-
-  public Node<V> replaceChild(final byte index, final Node<V> updatedChild) {
-    final ArrayList<Node<V>> newChildren = new ArrayList<>(children);
-    newChildren.set(index, updatedChild);
-
-    if (updatedChild == NULL_NODE) {
-      if (value.isPresent() && !hasChildren()) {
-        return nodeFactory.createLeaf(Bytes.of(index), value.get());
-      } else if (value.isEmpty()) {
-        final Optional<Node<V>> flattened = maybeFlatten(newChildren);
-        if (flattened.isPresent()) {
-          return flattened.get();
-        }
-      }
-    }
-
-    return nodeFactory.createBranch(newChildren, value);
-  }
-
-  public Node<V> replaceValue(final V value) {
-    return nodeFactory.createBranch(children, Optional.of(value));
-  }
-
-  public Node<V> removeValue() {
-    return maybeFlatten(children).orElse(nodeFactory.createBranch(children, Optional.empty()));
-  }
-
-  private boolean hasChildren() {
-    for (final Node<V> child : children) {
-      if (child != NULL_NODE) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  private static <V> Optional<Node<V>> maybeFlatten(final ArrayList<Node<V>> children) {
-    final int onlyChildIndex = findOnlyChild(children);
-    if (onlyChildIndex >= 0) {
-      // replace the path of the only child and return it
-      final Node<V> onlyChild = children.get(onlyChildIndex);
-      final Bytes onlyChildPath = onlyChild.getPath();
-      final MutableBytes completePath = MutableBytes.create(1 + onlyChildPath.size());
-      completePath.set(0, (byte) onlyChildIndex);
-      onlyChildPath.copyTo(completePath, 1);
-      return Optional.of(onlyChild.replacePath(completePath));
-    }
-    return Optional.empty();
-  }
-
-  private static <V> int findOnlyChild(final ArrayList<Node<V>> children) {
-    int onlyChildIndex = -1;
-    assert (children.size() == RADIX);
-    for (int i = 0; i < RADIX; ++i) {
-      if (children.get(i) != NULL_NODE) {
-        if (onlyChildIndex >= 0) {
-          return -1;
-        }
-        onlyChildIndex = i;
-      }
-    }
-    return onlyChildIndex;
-  }
-
-  @Override
-  public String print() {
-    final StringBuilder builder = new StringBuilder();
-    builder.append("Branch:");
-    builder.append("\n\tRef: ").append(getRlpRef());
-    for (int i = 0; i < RADIX; i++) {
-      final Node<V> child = child((byte) i);
-      if (!Objects.equals(child, NullNode.instance())) {
-        final String branchLabel = "[" + Integer.toHexString(i) + "] ";
-        final String childRep = child.print().replaceAll("\n\t", "\n\t\t");
-        builder.append("\n\t").append(branchLabel).append(childRep);
-      }
-    }
-    builder.append("\n\tValue: ").append(getValue().map(Object::toString).orElse("empty"));
-    return builder.toString();
-  }
-
-  @Override
-  public boolean isDirty() {
-    return dirty;
-  }
-
-  @Override
-  public void markDirty() {
-    dirty = true;
-  }
-}
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/CommitVisitor.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/CommitVisitor.java
index 3746f13e266..6958a719426 100644
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/CommitVisitor.java
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/CommitVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,11 +14,15 @@
  */
 package org.hyperledger.besu.ethereum.trie;
 
+import org.hyperledger.besu.ethereum.trie.patricia.BranchNode;
+import org.hyperledger.besu.ethereum.trie.patricia.ExtensionNode;
+import org.hyperledger.besu.ethereum.trie.patricia.LeafNode;
+
 import org.apache.tuweni.bytes.Bytes;
 
 public class CommitVisitor<V> implements LocationNodeVisitor<V> {
 
-  private final NodeUpdater nodeUpdater;
+  protected final NodeUpdater nodeUpdater;
 
   public CommitVisitor(final NodeUpdater nodeUpdater) {
     this.nodeUpdater = nodeUpdater;
@@ -44,10 +48,11 @@ public void visit(final Bytes location, final BranchNode<V> branchNode) {
       return;
     }
 
-    for (byte i = 0; i < BranchNode.RADIX; ++i) {
-      final Node<V> child = branchNode.child(i);
+    for (int i = 0; i < branchNode.maxChild(); ++i) {
+      Bytes index = Bytes.of(i);
+      final Node<V> child = branchNode.child((byte) i);
       if (child.isDirty()) {
-        child.accept(Bytes.concatenate(location, Bytes.of(i)), this);
+        child.accept(Bytes.concatenate(location, index), this);
       }
     }
 
@@ -66,8 +71,8 @@ public void visit(final Bytes location, final LeafNode<V> leafNode) {
   @Override
   public void visit(final Bytes location, final NullNode<V> nullNode) {}
 
-  private void maybeStoreNode(final Bytes location, final Node<V> node) {
-    final Bytes nodeRLP = node.getRlp();
+  public void maybeStoreNode(final Bytes location, final Node<V> node) {
+    final Bytes nodeRLP = node.getEncodedBytes();
     if (nodeRLP.size() >= 32) {
       this.nodeUpdater.store(location, node.getHash(), nodeRLP);
     }
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/CompactEncoding.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/CompactEncoding.java
index 30b27c3acba..6303c63812f 100644
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/CompactEncoding.java
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/CompactEncoding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -22,7 +22,7 @@
 public abstract class CompactEncoding {
   private CompactEncoding() {}
 
-  static final byte LEAF_TERMINATOR = 0x10;
+  public static final byte LEAF_TERMINATOR = 0x10;
 
   public static Bytes bytesToPath(final Bytes bytes) {
     final MutableBytes path = MutableBytes.create(bytes.size() * 2 + 1);
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/ExtensionNode.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/ExtensionNode.java
deleted file mode 100644
index 5a398f71a4b..00000000000
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/ExtensionNode.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.trie;
-
-import static org.hyperledger.besu.crypto.Hash.keccak256;
-
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
-import org.hyperledger.besu.ethereum.rlp.RLP;
-
-import java.lang.ref.SoftReference;
-import java.lang.ref.WeakReference;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-
-class ExtensionNode<V> implements Node<V> {
-  private final Bytes path;
-  private final Node<V> child;
-  private final NodeFactory<V> nodeFactory;
-  private WeakReference<Bytes> rlp;
-  private SoftReference<Bytes32> hash;
-  private boolean dirty = false;
-
-  ExtensionNode(final Bytes path, final Node<V> child, final NodeFactory<V> nodeFactory) {
-    assert (path.size() > 0);
-    assert (path.get(path.size() - 1) != CompactEncoding.LEAF_TERMINATOR)
-        : "Extension path ends in a leaf terminator";
-    this.path = path;
-    this.child = child;
-    this.nodeFactory = nodeFactory;
-  }
-
-  @Override
-  public Node<V> accept(final PathNodeVisitor<V> visitor, final Bytes path) {
-    return visitor.visit(this, path);
-  }
-
-  @Override
-  public void accept(final NodeVisitor<V> visitor) {
-    visitor.visit(this);
-  }
-
-  @Override
-  public void accept(final Bytes location, final LocationNodeVisitor<V> visitor) {
-    visitor.visit(location, this);
-  }
-
-  @Override
-  public Bytes getPath() {
-    return path;
-  }
-
-  @Override
-  public Optional<V> getValue() {
-    return Optional.empty();
-  }
-
-  @Override
-  public List<Node<V>> getChildren() {
-    return Collections.singletonList(child);
-  }
-
-  public Node<V> getChild() {
-    return child;
-  }
-
-  @Override
-  public Bytes getRlp() {
-    if (rlp != null) {
-      final Bytes encoded = rlp.get();
-      if (encoded != null) {
-        return encoded;
-      }
-    }
-    final BytesValueRLPOutput out = new BytesValueRLPOutput();
-    out.startList();
-    out.writeBytes(CompactEncoding.encode(path));
-    out.writeRaw(child.getRlpRef());
-    out.endList();
-    final Bytes encoded = out.encoded();
-    rlp = new WeakReference<>(encoded);
-    return encoded;
-  }
-
-  @Override
-  public Bytes getRlpRef() {
-    if (isReferencedByHash()) {
-      return RLP.encodeOne(getHash());
-    } else {
-      return getRlp();
-    }
-  }
-
-  @Override
-  public Bytes32 getHash() {
-    if (hash != null) {
-      final Bytes32 hashed = hash.get();
-      if (hashed != null) {
-        return hashed;
-      }
-    }
-    final Bytes rlp = getRlp();
-    final Bytes32 hashed = keccak256(rlp);
-    hash = new SoftReference<>(hashed);
-    return hashed;
-  }
-
-  public Node<V> replaceChild(final Node<V> updatedChild) {
-    // collapse this extension - if the child is a branch, it will create a new extension
-    return updatedChild.replacePath(Bytes.concatenate(path, updatedChild.getPath()));
-  }
-
-  @Override
-  public Node<V> replacePath(final Bytes path) {
-    if (path.size() == 0) {
-      return child;
-    }
-    return nodeFactory.createExtension(path, child);
-  }
-
-  @Override
-  public String print() {
-    final StringBuilder builder = new StringBuilder();
-    final String childRep = getChild().print().replaceAll("\n\t", "\n\t\t");
-    builder
-        .append("Extension:")
-        .append("\n\tRef: ")
-        .append(getRlpRef())
-        .append("\n\tPath: ")
-        .append(CompactEncoding.encode(path))
-        .append("\n\t")
-        .append(childRep);
-    return builder.toString();
-  }
-
-  @Override
-  public boolean isDirty() {
-    return dirty;
-  }
-
-  @Override
-  public void markDirty() {
-    dirty = true;
-  }
-}
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/InnerNodeDiscoveryManager.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/InnerNodeDiscoveryManager.java
new file mode 100644
index 00000000000..5190ada7ef9
--- /dev/null
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/InnerNodeDiscoveryManager.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.trie;
+
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.ethereum.trie.patricia.BranchNode;
+import org.hyperledger.besu.ethereum.trie.patricia.ExtensionNode;
+import org.hyperledger.besu.ethereum.trie.patricia.LeafNode;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredNodeFactory;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.bytes.MutableBytes;
+import org.apache.tuweni.bytes.MutableBytes32;
+import org.immutables.value.Value;
+
+public class InnerNodeDiscoveryManager<V> extends StoredNodeFactory<V> {
+
+  private final List<InnerNode> innerNodes = new ArrayList<>();
+
+  private final Bytes startKeyHash, endKeyHash;
+
+  private final boolean allowMissingElementInRange;
+
+  public InnerNodeDiscoveryManager(
+      final NodeLoader nodeLoader,
+      final Function<V, Bytes> valueSerializer,
+      final Function<Bytes, V> valueDeserializer,
+      final Bytes32 startKeyHash,
+      final Bytes32 endKeyHash,
+      final boolean allowMissingElementInRange) {
+    super(nodeLoader, valueSerializer, valueDeserializer);
+    this.startKeyHash = createPath(startKeyHash);
+    this.endKeyHash = createPath(endKeyHash);
+    this.allowMissingElementInRange = allowMissingElementInRange;
+  }
+
+  @Override
+  protected Node<V> decodeExtension(
+      final Bytes location,
+      final Bytes path,
+      final RLPInput valueRlp,
+      final Supplier<String> errMessage) {
+    final ExtensionNode<V> vNode =
+        (ExtensionNode<V>) super.decodeExtension(location, path, valueRlp, errMessage);
+    if (isInRange(Bytes.concatenate(location, Bytes.of(0)))) {
+      innerNodes.add(
+          ImmutableInnerNode.builder()
+              .location(location)
+              .path(Bytes.of(0, CompactEncoding.LEAF_TERMINATOR))
+              .build());
+    }
+    return vNode;
+  }
+
+  @Override
+  protected BranchNode<V> decodeBranch(
+      final Bytes location, final RLPInput nodeRLPs, final Supplier<String> errMessage) {
+    final BranchNode<V> vBranchNode = super.decodeBranch(location, nodeRLPs, errMessage);
+    final List<Node<V>> children = vBranchNode.getChildren();
+    for (int i = 0; i < children.size(); i++) {
+      if (isInRange(Bytes.concatenate(location, Bytes.of(i)))) {
+        innerNodes.add(
+            ImmutableInnerNode.builder()
+                .location(location)
+                .path(Bytes.of(i, CompactEncoding.LEAF_TERMINATOR))
+                .build());
+      }
+    }
+    return vBranchNode;
+  }
+
+  @Override
+  protected LeafNode<V> decodeLeaf(
+      final Bytes location,
+      final Bytes path,
+      final RLPInput valueRlp,
+      final Supplier<String> errMessage) {
+    final LeafNode<V> vLeafNode = super.decodeLeaf(location, path, valueRlp, errMessage);
+    final Bytes concatenatePath = Bytes.concatenate(location, path);
+    if (isInRange(concatenatePath.slice(0, concatenatePath.size() - 1))) {
+      innerNodes.add(ImmutableInnerNode.builder().location(location).path(path).build());
+    }
+    return vLeafNode;
+  }
+
+  @Override
+  public Optional<Node<V>> retrieve(final Bytes location, final Bytes32 hash)
+      throws MerkleTrieException {
+    return super.retrieve(location, hash)
+        .or(
+            () -> {
+              if (!allowMissingElementInRange && isInRange(location)) {
+                return Optional.empty();
+              }
+              return Optional.of(new MissingNode<>(hash, location));
+            });
+  }
+
+  public List<InnerNode> getInnerNodes() {
+    return List.copyOf(innerNodes);
+  }
+
+  private boolean isInRange(final Bytes location) {
+    return !location.isEmpty()
+        && Arrays.compare(location.toArrayUnsafe(), startKeyHash.toArrayUnsafe()) >= 0
+        && Arrays.compare(location.toArrayUnsafe(), endKeyHash.toArrayUnsafe()) <= 0;
+  }
+
+  private Bytes createPath(final Bytes bytes) {
+    final MutableBytes path = MutableBytes.create(bytes.size() * 2);
+    int j = 0;
+    for (int i = 0; i < bytes.size(); i += 1, j += 2) {
+      final byte b = bytes.get(i);
+      path.set(j, (byte) ((b >>> 4) & 0x0f));
+      path.set(j + 1, (byte) (b & 0x0f));
+    }
+    return path;
+  }
+
+  public static Bytes32 decodePath(final Bytes bytes) {
+    final MutableBytes32 decoded = MutableBytes32.create();
+    final MutableBytes path = MutableBytes.create(Bytes32.SIZE * 2);
+    path.set(0, bytes);
+    int decodedPos = 0;
+    for (int pathPos = 0; pathPos < path.size() - 1; pathPos += 2, decodedPos += 1) {
+      final byte high = path.get(pathPos);
+      final byte low = path.get(pathPos + 1);
+      if ((high & 0xf0) != 0 || (low & 0xf0) != 0) {
+        throw new IllegalArgumentException("Invalid path: contains elements larger than a nibble");
+      }
+      decoded.set(decodedPos, (byte) (high << 4 | (low & 0xff)));
+    }
+    return decoded;
+  }
+
+  @Value.Immutable
+  public interface InnerNode {
+    Bytes location();
+
+    Bytes path();
+  }
+}
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/LeafNode.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/LeafNode.java
deleted file mode 100644
index a5714283c18..00000000000
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/LeafNode.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.trie;
-
-import static org.hyperledger.besu.crypto.Hash.keccak256;
-
-import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
-import org.hyperledger.besu.ethereum.rlp.RLP;
-
-import java.lang.ref.SoftReference;
-import java.lang.ref.WeakReference;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.Function;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-
-class LeafNode<V> implements Node<V> {
-  private final Bytes path;
-  private final V value;
-  private final NodeFactory<V> nodeFactory;
-  private final Function<V, Bytes> valueSerializer;
-  private WeakReference<Bytes> rlp;
-  private SoftReference<Bytes32> hash;
-  private boolean dirty = false;
-
-  LeafNode(
-      final Bytes path,
-      final V value,
-      final NodeFactory<V> nodeFactory,
-      final Function<V, Bytes> valueSerializer) {
-    this.path = path;
-    this.value = value;
-    this.nodeFactory = nodeFactory;
-    this.valueSerializer = valueSerializer;
-  }
-
-  @Override
-  public Node<V> accept(final PathNodeVisitor<V> visitor, final Bytes path) {
-    return visitor.visit(this, path);
-  }
-
-  @Override
-  public void accept(final NodeVisitor<V> visitor) {
-    visitor.visit(this);
-  }
-
-  @Override
-  public void accept(final Bytes location, final LocationNodeVisitor<V> visitor) {
-    visitor.visit(location, this);
-  }
-
-  @Override
-  public Bytes getPath() {
-    return path;
-  }
-
-  @Override
-  public Optional<V> getValue() {
-    return Optional.of(value);
-  }
-
-  @Override
-  public List<Node<V>> getChildren() {
-    return Collections.emptyList();
-  }
-
-  @Override
-  public Bytes getRlp() {
-    if (rlp != null) {
-      final Bytes encoded = rlp.get();
-      if (encoded != null) {
-        return encoded;
-      }
-    }
-
-    final BytesValueRLPOutput out = new BytesValueRLPOutput();
-    out.startList();
-    out.writeBytes(CompactEncoding.encode(path));
-    out.writeBytes(valueSerializer.apply(value));
-    out.endList();
-    final Bytes encoded = out.encoded();
-    rlp = new WeakReference<>(encoded);
-    return encoded;
-  }
-
-  @Override
-  public Bytes getRlpRef() {
-    if (isReferencedByHash()) {
-      return RLP.encodeOne(getHash());
-    } else {
-      return getRlp();
-    }
-  }
-
-  @Override
-  public Bytes32 getHash() {
-    if (hash != null) {
-      final Bytes32 hashed = hash.get();
-      if (hashed != null) {
-        return hashed;
-      }
-    }
-    final Bytes32 hashed = keccak256(getRlp());
-    hash = new SoftReference<>(hashed);
-    return hashed;
-  }
-
-  @Override
-  public Node<V> replacePath(final Bytes path) {
-    return nodeFactory.createLeaf(path, value);
-  }
-
-  @Override
-  public String print() {
-    return "Leaf:"
-        + "\n\tRef: "
-        + getRlpRef()
-        + "\n\tPath: "
-        + CompactEncoding.encode(path)
-        + "\n\tValue: "
-        + getValue().map(Object::toString).orElse("empty");
-  }
-
-  @Override
-  public boolean isDirty() {
-    return dirty;
-  }
-
-  @Override
-  public void markDirty() {
-    dirty = true;
-  }
-}
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/LocationNodeVisitor.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/LocationNodeVisitor.java
index 2e1f934ea98..ac4ce53796d 100644
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/LocationNodeVisitor.java
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/LocationNodeVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,9 +14,13 @@
  */
 package org.hyperledger.besu.ethereum.trie;
 
+import org.hyperledger.besu.ethereum.trie.patricia.BranchNode;
+import org.hyperledger.besu.ethereum.trie.patricia.ExtensionNode;
+import org.hyperledger.besu.ethereum.trie.patricia.LeafNode;
+
 import org.apache.tuweni.bytes.Bytes;
 
-interface LocationNodeVisitor<V> {
+public interface LocationNodeVisitor<V> {
 
   void visit(Bytes location, ExtensionNode<V> extensionNode);
 
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerklePatriciaTrie.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerklePatriciaTrie.java
deleted file mode 100644
index bde04afba1d..00000000000
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerklePatriciaTrie.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.trie;
-
-import static org.hyperledger.besu.crypto.Hash.keccak256;
-
-import org.hyperledger.besu.ethereum.rlp.RLP;
-
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Consumer;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-
-/** An Merkle Patricial Trie. */
-public interface MerklePatriciaTrie<K, V> {
-
-  Bytes EMPTY_TRIE_NODE = RLP.NULL;
-  Bytes32 EMPTY_TRIE_NODE_HASH = keccak256(EMPTY_TRIE_NODE);
-
-  /**
-   * Returns an {@code Optional} of value mapped to the hash if it exists; otherwise empty.
-   *
-   * @param key The key for the value.
-   * @return an {@code Optional} of value mapped to the hash if it exists; otherwise empty
-   */
-  Optional<V> get(K key);
-
-  /**
-   * Returns value and ordered proof-related nodes mapped to the hash if it exists; otherwise empty.
-   *
-   * @param key The key for the value.
-   * @return value and ordered proof-related nodes
-   */
-  Proof<V> getValueWithProof(K key);
-
-  /**
-   * Updates the value mapped to the specified key, creating the mapping if one does not already
-   * exist.
-   *
-   * @param key The key that corresponds to the value to be updated.
-   * @param value The value to associate the key with.
-   */
-  void put(K key, V value);
-
-  /**
-   * Deletes the value mapped to the specified key, if such a value exists (Optional operation).
-   *
-   * @param key The key of the value to be deleted.
-   */
-  void remove(K key);
-
-  /**
-   * Returns the KECCAK256 hash of the root node of the trie.
-   *
-   * @return The KECCAK256 hash of the root node of the trie.
-   */
-  Bytes32 getRootHash();
-
-  /**
-   * Commits any pending changes to the underlying storage.
-   *
-   * @param nodeUpdater used to store the node values
-   */
-  void commit(NodeUpdater nodeUpdater);
-
-  /**
-   * Retrieve up to {@code limit} storage entries beginning from the first entry with hash equal to
-   * or greater than {@code startKeyHash}.
-   *
-   * @param startKeyHash the first key hash to return.
-   * @param limit the maximum number of entries to return.
-   * @return the requested storage entries as a map of key hash to value.
-   */
-  Map<Bytes32, V> entriesFrom(Bytes32 startKeyHash, int limit);
-
-  void visitAll(Consumer<Node<V>> nodeConsumer);
-
-  CompletableFuture<Void> visitAll(Consumer<Node<V>> nodeConsumer, ExecutorService executorService);
-
-  void visitLeafs(final TrieIterator.LeafHandler<V> handler);
-}
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerkleStorage.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerkleStorage.java
index 5f08b02f8f2..f9bb764376b 100644
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerkleStorage.java
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerkleStorage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,6 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.trie;
 
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
+
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerkleTrie.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerkleTrie.java
new file mode 100644
index 00000000000..ede4fac6460
--- /dev/null
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerkleTrie.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.trie;
+
+import static org.hyperledger.besu.crypto.Hash.keccak256;
+
+import org.hyperledger.besu.ethereum.rlp.RLP;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+/** An Merkle Patricial Trie. */
+public interface MerkleTrie<K, V> {
+
+  Bytes EMPTY_TRIE_NODE = RLP.NULL;
+  Bytes32 EMPTY_TRIE_NODE_HASH = keccak256(EMPTY_TRIE_NODE);
+
+  /**
+   * Returns an {@code Optional} of value mapped to the hash if it exists; otherwise empty.
+   *
+   * @param key The key for the value.
+   * @return an {@code Optional} of value mapped to the hash if it exists; otherwise empty
+   */
+  Optional<V> get(K key);
+
+  /**
+   * Returns an {@code Optional} of value mapped to the given path if it exists; otherwise empty.
+   *
+   * @param path The path for the value.
+   * @return an {@code Optional} of value mapped to the given path if it exists; otherwise empty
+   */
+  Optional<V> getPath(final K path);
+
+  /**
+   * Returns value and ordered proof-related nodes mapped to the hash if it exists; otherwise empty.
+   *
+   * @param key The key for the value.
+   * @return value and ordered proof-related nodes
+   */
+  Proof<V> getValueWithProof(K key);
+
+  /**
+   * Updates the value mapped to the specified key, creating the mapping if one does not already
+   * exist.
+   *
+   * @param key The key that corresponds to the value to be updated.
+   * @param value The value to associate the key with.
+   */
+  void put(K key, V value);
+
+  /**
+   * Updates the value mapped to the specified path, creating the mapping if one does not already
+   * exist.
+   *
+   * @param path path of the node to be updated.
+   * @param value The value to associate the key with.
+   */
+  void putPath(K path, V value);
+  /**
+   * Updates the value mapped to the specified key, creating the mapping if one does not already
+   * exist.
+   *
+   * @param key The key that corresponds to the value to be updated.
+   * @param putVisitor custom visitor for the update
+   */
+  void put(K key, PathNodeVisitor<V> putVisitor);
+
+  /**
+   * Deletes the value mapped to the specified key, if such a value exists (Optional operation).
+   *
+   * @param key The key of the value to be deleted.
+   */
+  void remove(K key);
+
+  /**
+   * Deletes the node mapped to the specified path, if such a node exists (Optional operation).
+   *
+   * @param path of the node to be deleted.
+   * @param removeVisitor custom visitor for the deletion
+   */
+  void removePath(K path, PathNodeVisitor<V> removeVisitor);
+
+  /**
+   * Returns the KECCAK256 hash of the root node of the trie.
+   *
+   * @return The KECCAK256 hash of the root node of the trie.
+   */
+  Bytes32 getRootHash();
+
+  /**
+   * Commits any pending changes to the underlying storage.
+   *
+   * @param nodeUpdater used to store the node values
+   */
+  void commit(NodeUpdater nodeUpdater);
+
+  /**
+   * Commits any pending changes to the underlying storage.
+   *
+   * @param nodeUpdater used to store the node values
+   * @param commitVisitor custom visitor for the commit
+   */
+  void commit(NodeUpdater nodeUpdater, CommitVisitor<V> commitVisitor);
+
+  /**
+   * Retrieve up to {@code limit} storage entries beginning from the first entry with hash equal to
+   * or greater than {@code startKeyHash}.
+   *
+   * @param startKeyHash the first key hash to return.
+   * @param limit the maximum number of entries to return.
+   * @return the requested storage entries as a map of key hash to value.
+   */
+  Map<Bytes32, V> entriesFrom(Bytes32 startKeyHash, int limit);
+
+  /**
+   * Retrieve entries using a custom collector
+   *
+   * @param handler a custom trie collector.
+   * @return the requested storage entries as a map of key hash to value.
+   */
+  Map<Bytes32, V> entriesFrom(final Function<Node<V>, Map<Bytes32, V>> handler);
+
+  void visitAll(Consumer<Node<V>> nodeConsumer);
+
+  CompletableFuture<Void> visitAll(Consumer<Node<V>> nodeConsumer, ExecutorService executorService);
+
+  void visitLeafs(final TrieIterator.LeafHandler<V> handler);
+}
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerkleTrieException.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerkleTrieException.java
index d671f75dbee..546b6c155b0 100644
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerkleTrieException.java
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MerkleTrieException.java
@@ -14,17 +14,58 @@
  */
 package org.hyperledger.besu.ethereum.trie;
 
+import org.hyperledger.besu.datatypes.Address;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
 /**
  * This exception is thrown when there is an issue retrieving or decoding values from {@link
  * MerkleStorage}.
  */
 public class MerkleTrieException extends RuntimeException {
 
+  private Optional<Address> maybeAddress;
+  private Bytes32 hash;
+  private Bytes location;
+
   public MerkleTrieException(final String message) {
     super(message);
   }
 
+  public MerkleTrieException(final String message, final Bytes32 hash, final Bytes location) {
+    super(message);
+    this.hash = hash;
+    this.location = location;
+    this.maybeAddress = Optional.empty();
+  }
+
   public MerkleTrieException(final String message, final Exception cause) {
     super(message, cause);
   }
+
+  public MerkleTrieException(
+      final String message,
+      final Optional<Address> maybeAddress,
+      final Bytes32 hash,
+      final Bytes location) {
+    super(message);
+    this.hash = hash;
+    this.location = location;
+    this.maybeAddress = maybeAddress;
+  }
+
+  public Optional<Address> getMaybeAddress() {
+    return maybeAddress;
+  }
+
+  public Bytes32 getHash() {
+    return hash;
+  }
+
+  public Bytes getLocation() {
+    return location;
+  }
 }
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MissingNode.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MissingNode.java
new file mode 100644
index 00000000000..92035330e95
--- /dev/null
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/MissingNode.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.trie;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+public class MissingNode<V> extends NullNode<V> {
+
+  private final Bytes32 hash;
+  private final Bytes location;
+  private final Bytes path;
+
+  public MissingNode(final Bytes32 hash, final Bytes location) {
+    this.hash = hash;
+    this.location = location;
+    this.path = location.isEmpty() ? Bytes.EMPTY : location.slice(0, location.size() - 1);
+  }
+
+  @Override
+  public Bytes32 getHash() {
+    return hash;
+  }
+
+  @Override
+  public Bytes getPath() {
+    return path;
+  }
+
+  @Override
+  public boolean isHealNeeded() {
+    return true;
+  }
+
+  @Override
+  public Optional<Bytes> getLocation() {
+    return Optional.ofNullable(location);
+  }
+}
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/Node.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/Node.java
index 8e85e2049de..93a0dbc5774 100644
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/Node.java
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/Node.java
@@ -30,13 +30,17 @@ public interface Node<V> {
 
   Bytes getPath();
 
+  default Optional<Bytes> getLocation() {
+    return Optional.empty();
+  }
+
   Optional<V> getValue();
 
   List<Node<V>> getChildren();
 
-  Bytes getRlp();
+  Bytes getEncodedBytes();
 
-  Bytes getRlpRef();
+  Bytes getEncodedBytesRef();
 
   /**
    * Whether a reference to this node should be represented as a hash of the rlp, or the node rlp
@@ -46,7 +50,7 @@ public interface Node<V> {
    * @return true if this node should be referenced by hash
    */
   default boolean isReferencedByHash() {
-    return getRlp().size() >= 32;
+    return getEncodedBytes().size() >= 32;
   }
 
   Bytes32 getHash();
@@ -67,4 +71,16 @@ default boolean isReferencedByHash() {
 
   /** Unloads the node if it is, for example, a StoredNode. */
   default void unload() {}
+
+  /**
+   * Return if a node needs heal. If one of its children missing in the storage
+   *
+   * @return true if the node need heal
+   */
+  boolean isHealNeeded();
+
+  /**
+   * Marking a node as need heal means that one of its children is not yet present in the storage
+   */
+  void markHealNeeded();
 }
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NodeFactory.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NodeFactory.java
index f8e8b9a614f..69d61e3ff00 100644
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NodeFactory.java
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NodeFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,10 +14,11 @@
  */
 package org.hyperledger.besu.ethereum.trie;
 
-import java.util.ArrayList;
+import java.util.List;
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
 
 public interface NodeFactory<V> {
 
@@ -25,7 +26,11 @@ public interface NodeFactory<V> {
 
   Node<V> createBranch(byte leftIndex, Node<V> left, byte rightIndex, Node<V> right);
 
-  Node<V> createBranch(ArrayList<Node<V>> newChildren, Optional<V> value);
+  Node<V> createBranch(List<Node<V>> newChildren, Optional<V> value);
 
   Node<V> createLeaf(Bytes path, V value);
+
+  default Optional<Node<V>> retrieve(final Bytes location, final Bytes32 hash) {
+    throw new UnsupportedOperationException("retrieve is not implemented");
+  }
 }
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NodeVisitor.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NodeVisitor.java
index e8a771763c3..bfc517dfdfc 100644
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NodeVisitor.java
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NodeVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,7 +14,11 @@
  */
 package org.hyperledger.besu.ethereum.trie;
 
-interface NodeVisitor<V> {
+import org.hyperledger.besu.ethereum.trie.patricia.BranchNode;
+import org.hyperledger.besu.ethereum.trie.patricia.ExtensionNode;
+import org.hyperledger.besu.ethereum.trie.patricia.LeafNode;
+
+public interface NodeVisitor<V> {
 
   void visit(ExtensionNode<V> extensionNode);
 
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NullNode.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NullNode.java
index 0e0c07b3e9b..da2ab9cddca 100644
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NullNode.java
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/NullNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -25,7 +25,7 @@ public class NullNode<V> implements Node<V> {
   @SuppressWarnings("rawtypes")
   private static final NullNode instance = new NullNode();
 
-  private NullNode() {}
+  protected NullNode() {}
 
   @SuppressWarnings("unchecked")
   public static <V> NullNode<V> instance() {
@@ -63,18 +63,18 @@ public List<Node<V>> getChildren() {
   }
 
   @Override
-  public Bytes getRlp() {
-    return MerklePatriciaTrie.EMPTY_TRIE_NODE;
+  public Bytes getEncodedBytes() {
+    return MerkleTrie.EMPTY_TRIE_NODE;
   }
 
   @Override
-  public Bytes getRlpRef() {
-    return MerklePatriciaTrie.EMPTY_TRIE_NODE;
+  public Bytes getEncodedBytesRef() {
+    return MerkleTrie.EMPTY_TRIE_NODE;
   }
 
   @Override
   public Bytes32 getHash() {
-    return MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH;
+    return MerkleTrie.EMPTY_TRIE_NODE_HASH;
   }
 
   @Override
@@ -96,4 +96,14 @@ public boolean isDirty() {
   public void markDirty() {
     // do nothing
   }
+
+  @Override
+  public boolean isHealNeeded() {
+    return false;
+  }
+
+  @Override
+  public void markHealNeeded() {
+    // do nothing
+  }
 }
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/PathNodeVisitor.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/PathNodeVisitor.java
index 424fca44799..958c1bf5d6f 100644
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/PathNodeVisitor.java
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/PathNodeVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,9 +14,13 @@
  */
 package org.hyperledger.besu.ethereum.trie;
 
+import org.hyperledger.besu.ethereum.trie.patricia.BranchNode;
+import org.hyperledger.besu.ethereum.trie.patricia.ExtensionNode;
+import org.hyperledger.besu.ethereum.trie.patricia.LeafNode;
+
 import org.apache.tuweni.bytes.Bytes;
 
-interface PathNodeVisitor<V> {
+public interface PathNodeVisitor<V> {
 
   Node<V> visit(ExtensionNode<V> extensionNode, Bytes path);
 
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/PersistVisitor.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/PersistVisitor.java
index 39e0dceaf46..c524df2ceab 100644
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/PersistVisitor.java
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/PersistVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -16,6 +16,10 @@
 
 package org.hyperledger.besu.ethereum.trie;
 
+import org.hyperledger.besu.ethereum.trie.patricia.BranchNode;
+import org.hyperledger.besu.ethereum.trie.patricia.ExtensionNode;
+import org.hyperledger.besu.ethereum.trie.patricia.LeafNode;
+
 import java.util.function.BiConsumer;
 
 import org.apache.tuweni.bytes.Bytes;
@@ -51,21 +55,21 @@ public void persist(final Node<V> root) {
 
   @Override
   public void visit(final BranchNode<V> branchNode) {
-    writer.accept(branchNode.getHash(), branchNode.getRlp());
+    writer.accept(branchNode.getHash(), branchNode.getEncodedBytes());
     branchNodeCount++;
     branchNode.getChildren().forEach(node -> node.accept(this));
   }
 
   @Override
   public void visit(final ExtensionNode<V> extensionNode) {
-    writer.accept(extensionNode.getHash(), extensionNode.getRlp());
+    writer.accept(extensionNode.getHash(), extensionNode.getEncodedBytes());
     extensionNodeCount++;
     extensionNode.getChild().accept(this);
   }
 
   @Override
   public void visit(final LeafNode<V> leafNode) {
-    writer.accept(leafNode.getHash(), leafNode.getRlp());
+    writer.accept(leafNode.getHash(), leafNode.getEncodedBytes());
     leafNodeCount++;
   }
 
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/ProofVisitor.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/ProofVisitor.java
index 2e21b78294f..0b85626d931 100644
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/ProofVisitor.java
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/ProofVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,17 +14,22 @@
  */
 package org.hyperledger.besu.ethereum.trie;
 
+import org.hyperledger.besu.ethereum.trie.patricia.BranchNode;
+import org.hyperledger.besu.ethereum.trie.patricia.ExtensionNode;
+import org.hyperledger.besu.ethereum.trie.patricia.GetVisitor;
+import org.hyperledger.besu.ethereum.trie.patricia.LeafNode;
+
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.tuweni.bytes.Bytes;
 
-class ProofVisitor<V> extends GetVisitor<V> implements PathNodeVisitor<V> {
+public class ProofVisitor<V> extends GetVisitor<V> implements PathNodeVisitor<V> {
 
   private final Node<V> rootNode;
   private final List<Node<V>> proof = new ArrayList<>();
 
-  ProofVisitor(final Node<V> rootNode) {
+  public ProofVisitor(final Node<V> rootNode) {
     this.rootNode = rootNode;
   }
 
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/RangeStorageEntriesCollector.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/RangeStorageEntriesCollector.java
new file mode 100644
index 00000000000..595f46164d1
--- /dev/null
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/RangeStorageEntriesCollector.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.trie;
+
+import java.util.Map;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+public class RangeStorageEntriesCollector extends StorageEntriesCollector<Bytes> {
+
+  private int currentSize = 0;
+  private final Optional<Bytes32> endKeyHash;
+  private final Integer maxResponseBytes;
+
+  public RangeStorageEntriesCollector(
+      final Bytes32 startKeyHash,
+      final Optional<Bytes32> endKeyHash,
+      final int limit,
+      final int maxResponseBytes) {
+    super(startKeyHash, limit);
+    this.endKeyHash = endKeyHash;
+    this.maxResponseBytes = maxResponseBytes;
+  }
+
+  public static RangeStorageEntriesCollector createCollector(
+      final Bytes32 startKeyHash,
+      final Bytes32 endKeyHash,
+      final int limit,
+      final int maxResponseBytes) {
+    return new RangeStorageEntriesCollector(
+        startKeyHash, Optional.ofNullable(endKeyHash), limit, maxResponseBytes);
+  }
+
+  public static RangeStorageEntriesCollector createCollector(
+      final Bytes32 startKeyHash, final int limit, final int maxResponseBytes) {
+    return new RangeStorageEntriesCollector(
+        startKeyHash, Optional.empty(), limit, maxResponseBytes);
+  }
+
+  public static TrieIterator<Bytes> createVisitor(final RangeStorageEntriesCollector collector) {
+    return new TrieIterator<>(collector, false);
+  }
+
+  public static Map<Bytes32, Bytes> collectEntries(
+      final RangeStorageEntriesCollector collector,
+      final TrieIterator<Bytes> visitor,
+      final Node<Bytes> root,
+      final Bytes32 startKeyHash) {
+    root.accept(visitor, CompactEncoding.bytesToPath(startKeyHash));
+    return collector.getValues();
+  }
+
+  @Override
+  public TrieIterator.State onLeaf(final Bytes32 keyHash, final Node<Bytes> node) {
+    if (keyHash.compareTo(startKeyHash) >= 0) {
+      if (node.getValue().isPresent()) {
+        final Bytes value = node.getValue().get();
+        currentSize += Bytes32.SIZE + value.size();
+        if (currentSize > maxResponseBytes) {
+          return TrieIterator.State.STOP;
+        }
+        if (endKeyHash.isPresent() && keyHash.compareTo(endKeyHash.get()) > 0) {
+          return TrieIterator.State.STOP;
+        }
+
+        values.put(keyHash, value);
+      }
+    }
+    return limitReached() ? TrieIterator.State.STOP : TrieIterator.State.CONTINUE;
+  }
+}
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/RestoreVisitor.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/RestoreVisitor.java
index 3e421ab2f11..556db062b9c 100644
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/RestoreVisitor.java
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/RestoreVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,6 +14,11 @@
  */
 package org.hyperledger.besu.ethereum.trie;
 
+import org.hyperledger.besu.ethereum.trie.patricia.BranchNode;
+import org.hyperledger.besu.ethereum.trie.patricia.DefaultNodeFactory;
+import org.hyperledger.besu.ethereum.trie.patricia.ExtensionNode;
+import org.hyperledger.besu.ethereum.trie.patricia.LeafNode;
+
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
@@ -91,7 +96,7 @@ private BranchNode<V> persistNode(final BranchNode<V> parent, final byte index)
     if (!(child instanceof StoredNode)) {
       child.accept(persistVisitor);
       final PersistedNode<V> persistedNode =
-          new PersistedNode<>(null, child.getHash(), child.getRlpRef());
+          new PersistedNode<>(null, child.getHash(), child.getEncodedBytesRef());
       return (BranchNode<V>) parent.replaceChild(index, persistedNode);
     } else {
       return parent;
@@ -145,7 +150,9 @@ static class PersistedNode<V> implements Node<V> {
       this.refRlp = refRlp;
     }
 
-    /** @return True if the node needs to be persisted. */
+    /**
+     * @return True if the node needs to be persisted.
+     */
     @Override
     public boolean isDirty() {
       return false;
@@ -158,6 +165,17 @@ public void markDirty() {
           "A persisted node cannot ever be dirty since it's loaded from storage");
     }
 
+    @Override
+    public boolean isHealNeeded() {
+      return false;
+    }
+
+    @Override
+    public void markHealNeeded() {
+      throw new UnsupportedOperationException(
+          "A persisted node cannot be healed since it's loaded from storage");
+    }
+
     @Override
     public Node<V> accept(final PathNodeVisitor<V> visitor, final Bytes path) {
       // do nothing
@@ -191,13 +209,13 @@ public List<Node<V>> getChildren() {
     }
 
     @Override
-    public Bytes getRlp() {
+    public Bytes getEncodedBytes() {
       throw new UnsupportedOperationException(
           "A persisted node cannot have rlp, as it's already been restored.");
     }
 
     @Override
-    public Bytes getRlpRef() {
+    public Bytes getEncodedBytesRef() {
       return refRlp;
     }
 
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/SimpleMerklePatriciaTrie.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/SimpleMerklePatriciaTrie.java
deleted file mode 100644
index 1b167b42ac9..00000000000
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/SimpleMerklePatriciaTrie.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.trie;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static java.util.stream.Collectors.toUnmodifiableSet;
-import static org.hyperledger.besu.ethereum.trie.CompactEncoding.bytesToPath;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-
-/**
- * An in-memory {@link MerklePatriciaTrie}.
- *
- * @param <V> The type of values stored by this trie.
- */
-public class SimpleMerklePatriciaTrie<K extends Bytes, V> implements MerklePatriciaTrie<K, V> {
-  private final PathNodeVisitor<V> getVisitor = new GetVisitor<>();
-  private final PathNodeVisitor<V> removeVisitor = new RemoveVisitor<>();
-  private final DefaultNodeFactory<V> nodeFactory;
-
-  private Node<V> root;
-
-  /**
-   * Create a trie.
-   *
-   * @param valueSerializer A function for serializing values to bytes.
-   */
-  public SimpleMerklePatriciaTrie(final Function<V, Bytes> valueSerializer) {
-    this.nodeFactory = new DefaultNodeFactory<>(valueSerializer);
-    this.root = NullNode.instance();
-  }
-
-  @Override
-  public Optional<V> get(final K key) {
-    checkNotNull(key);
-    return root.accept(getVisitor, bytesToPath(key)).getValue();
-  }
-
-  @Override
-  public Proof<V> getValueWithProof(final K key) {
-    checkNotNull(key);
-    final ProofVisitor<V> proofVisitor = new ProofVisitor<>(root);
-    final Optional<V> value = root.accept(proofVisitor, bytesToPath(key)).getValue();
-    final List<Bytes> proof =
-        proofVisitor.getProof().stream().map(Node::getRlp).collect(Collectors.toList());
-    return new Proof<>(value, proof);
-  }
-
-  @Override
-  public void put(final K key, final V value) {
-    checkNotNull(key);
-    checkNotNull(value);
-    this.root = root.accept(new PutVisitor<>(nodeFactory, value), bytesToPath(key));
-  }
-
-  @Override
-  public void remove(final K key) {
-    checkNotNull(key);
-    this.root = root.accept(removeVisitor, bytesToPath(key));
-  }
-
-  @Override
-  public Bytes32 getRootHash() {
-    return root.getHash();
-  }
-
-  @Override
-  public String toString() {
-    return getClass().getSimpleName() + "[" + getRootHash() + "]";
-  }
-
-  @Override
-  public void commit(final NodeUpdater nodeUpdater) {
-    // Nothing to do here
-  }
-
-  @Override
-  public Map<Bytes32, V> entriesFrom(final Bytes32 startKeyHash, final int limit) {
-    return StorageEntriesCollector.collectEntries(root, startKeyHash, limit);
-  }
-
-  @Override
-  public void visitAll(final Consumer<Node<V>> nodeConsumer) {
-    root.accept(new AllNodesVisitor<>(nodeConsumer));
-  }
-
-  @Override
-  public CompletableFuture<Void> visitAll(
-      final Consumer<Node<V>> nodeConsumer, final ExecutorService executorService) {
-    return CompletableFuture.allOf(
-        Stream.concat(
-                Stream.of(
-                    CompletableFuture.runAsync(() -> nodeConsumer.accept(root), executorService)),
-                root.getChildren().stream()
-                    .map(
-                        rootChild ->
-                            CompletableFuture.runAsync(
-                                () -> rootChild.accept(new AllNodesVisitor<>(nodeConsumer)),
-                                executorService)))
-            .collect(toUnmodifiableSet())
-            .toArray(CompletableFuture[]::new));
-  }
-
-  @Override
-  public void visitLeafs(final TrieIterator.LeafHandler<V> handler) {
-    final TrieIterator<V> visitor = new TrieIterator<>(handler, true);
-    root.accept(visitor, CompactEncoding.bytesToPath(Bytes32.ZERO));
-  }
-}
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/SimpleMerkleTrie.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/SimpleMerkleTrie.java
new file mode 100644
index 00000000000..d938f098f3d
--- /dev/null
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/SimpleMerkleTrie.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.trie;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.stream.Collectors.toUnmodifiableSet;
+import static org.hyperledger.besu.ethereum.trie.CompactEncoding.bytesToPath;
+
+import org.hyperledger.besu.ethereum.trie.patricia.DefaultNodeFactory;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+/**
+ * An in-memory {@link MerkleTrie}.
+ *
+ * @param <V> The type of values stored by this trie.
+ */
+public abstract class SimpleMerkleTrie<K extends Bytes, V> implements MerkleTrie<K, V> {
+
+  protected final DefaultNodeFactory<V> nodeFactory;
+
+  private Node<V> root;
+
+  /**
+   * Create a trie.
+   *
+   * @param valueSerializer A function for serializing values to bytes.
+   */
+  public SimpleMerkleTrie(final Function<V, Bytes> valueSerializer) {
+    this.nodeFactory = new DefaultNodeFactory<>(valueSerializer);
+    this.root = NullNode.instance();
+  }
+
+  @Override
+  public Optional<V> get(final K key) {
+    checkNotNull(key);
+    return root.accept(getGetVisitor(), bytesToPath(key)).getValue();
+  }
+
+  @Override
+  public Optional<V> getPath(final K path) {
+    checkNotNull(path);
+    return root.accept(getGetVisitor(), path).getValue();
+  }
+
+  @Override
+  public Proof<V> getValueWithProof(final K key) {
+    checkNotNull(key);
+    final ProofVisitor<V> proofVisitor = new ProofVisitor<>(root);
+    final Optional<V> value = root.accept(proofVisitor, bytesToPath(key)).getValue();
+    final List<Bytes> proof =
+        proofVisitor.getProof().stream().map(Node::getEncodedBytes).collect(Collectors.toList());
+    return new Proof<>(value, proof);
+  }
+
+  @Override
+  public void put(final K key, final V value) {
+    checkNotNull(key);
+    checkNotNull(value);
+    this.root = root.accept(getPutVisitor(value), bytesToPath(key));
+  }
+
+  @Override
+  public void putPath(final K path, final V value) {
+    checkNotNull(path);
+    checkNotNull(value);
+    this.root = root.accept(getPutVisitor(value), path);
+  }
+
+  @Override
+  public void put(final K key, final PathNodeVisitor<V> putVisitor) {
+    checkNotNull(key);
+    this.root = root.accept(putVisitor, bytesToPath(key));
+  }
+
+  @Override
+  public void remove(final K key) {
+    checkNotNull(key);
+    this.root = root.accept(getRemoveVisitor(), bytesToPath(key));
+  }
+
+  @Override
+  public void removePath(final K path, final PathNodeVisitor<V> removeVisitor) {
+    checkNotNull(path);
+    this.root = root.accept(removeVisitor, path);
+  }
+
+  @Override
+  public Bytes32 getRootHash() {
+    return root.getHash();
+  }
+
+  @Override
+  public String toString() {
+    return getClass().getSimpleName() + "[" + getRootHash() + "]";
+  }
+
+  @Override
+  public void commit(final NodeUpdater nodeUpdater) {
+    // Nothing to do here
+  }
+
+  @Override
+  public void commit(final NodeUpdater nodeUpdater, final CommitVisitor<V> commitVisitor) {
+    // Nothing to do here
+  }
+
+  @Override
+  public Map<Bytes32, V> entriesFrom(final Bytes32 startKeyHash, final int limit) {
+    return StorageEntriesCollector.collectEntries(root, startKeyHash, limit);
+  }
+
+  @Override
+  public Map<Bytes32, V> entriesFrom(final Function<Node<V>, Map<Bytes32, V>> handler) {
+    return handler.apply(root);
+  }
+
+  @Override
+  public void visitAll(final Consumer<Node<V>> nodeConsumer) {
+    root.accept(new AllNodesVisitor<>(nodeConsumer));
+  }
+
+  @Override
+  public CompletableFuture<Void> visitAll(
+      final Consumer<Node<V>> nodeConsumer, final ExecutorService executorService) {
+    return CompletableFuture.allOf(
+        Stream.concat(
+                Stream.of(
+                    CompletableFuture.runAsync(() -> nodeConsumer.accept(root), executorService)),
+                root.getChildren().stream()
+                    .map(
+                        rootChild ->
+                            CompletableFuture.runAsync(
+                                () -> rootChild.accept(new AllNodesVisitor<>(nodeConsumer)),
+                                executorService)))
+            .collect(toUnmodifiableSet())
+            .toArray(CompletableFuture[]::new));
+  }
+
+  @Override
+  public void visitLeafs(final TrieIterator.LeafHandler<V> handler) {
+    final TrieIterator<V> visitor = new TrieIterator<>(handler, true);
+    root.accept(visitor, CompactEncoding.bytesToPath(Bytes32.ZERO));
+  }
+
+  public abstract PathNodeVisitor<V> getGetVisitor();
+
+  public abstract PathNodeVisitor<V> getRemoveVisitor();
+
+  public abstract PathNodeVisitor<V> getPutVisitor(final V value);
+}
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/SnapPutVisitor.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/SnapPutVisitor.java
new file mode 100644
index 00000000000..0cce55dcf4a
--- /dev/null
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/SnapPutVisitor.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.trie;
+
+import org.hyperledger.besu.ethereum.trie.patricia.BranchNode;
+import org.hyperledger.besu.ethereum.trie.patricia.ExtensionNode;
+import org.hyperledger.besu.ethereum.trie.patricia.PutVisitor;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class SnapPutVisitor<V> extends PutVisitor<V> {
+
+  public SnapPutVisitor(final NodeFactory<V> nodeFactory, final V value) {
+    super(nodeFactory, value);
+  }
+
+  @Override
+  public Node<V> visit(final BranchNode<V> branchNode, final Bytes path) {
+    final Node<V> visit = super.visit(branchNode, path);
+    for (Node<V> child : visit.getChildren()) {
+      if (child.isHealNeeded() || (child instanceof StoredNode && child.getValue().isEmpty())) {
+        visit.markHealNeeded(); // not save an incomplete node
+        return visit;
+      }
+    }
+    return visit;
+  }
+
+  @Override
+  public Node<V> visit(final ExtensionNode<V> extensionNode, final Bytes path) {
+    final Node<V> visit = super.visit(extensionNode, path);
+    for (Node<V> child : visit.getChildren()) {
+      if (child.isHealNeeded() || (child instanceof StoredNode && child.getValue().isEmpty())) {
+        visit.markHealNeeded(); // not save an incomplete node
+        return visit;
+      }
+    }
+    return visit;
+  }
+}
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StorageEntriesCollector.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StorageEntriesCollector.java
index 3fd168812bd..0d6a0bbac2b 100644
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StorageEntriesCollector.java
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StorageEntriesCollector.java
@@ -21,9 +21,9 @@
 
 public class StorageEntriesCollector<V> implements TrieIterator.LeafHandler<V> {
 
-  private final Bytes32 startKeyHash;
-  private final int limit;
-  private final Map<Bytes32, V> values = new TreeMap<>();
+  protected final Bytes32 startKeyHash;
+  protected final int limit;
+  protected final Map<Bytes32, V> values = new TreeMap<>();
 
   public StorageEntriesCollector(final Bytes32 startKeyHash, final int limit) {
     this.startKeyHash = startKeyHash;
@@ -39,7 +39,7 @@ public static <V> Map<Bytes32, V> collectEntries(
     return entriesCollector.getValues();
   }
 
-  private boolean limitReached() {
+  protected boolean limitReached() {
     return limit <= values.size();
   }
 
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredMerklePatriciaTrie.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredMerklePatriciaTrie.java
deleted file mode 100644
index dedb95dde4b..00000000000
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredMerklePatriciaTrie.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.trie;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static java.util.stream.Collectors.toUnmodifiableSet;
-import static org.hyperledger.besu.ethereum.trie.CompactEncoding.bytesToPath;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.apache.tuweni.bytes.Bytes32;
-
-/**
- * A {@link MerklePatriciaTrie} that persists trie nodes to a {@link MerkleStorage} key/value store.
- *
- * @param <V> The type of values stored by this trie.
- */
-public class StoredMerklePatriciaTrie<K extends Bytes, V> implements MerklePatriciaTrie<K, V> {
-
-  private final GetVisitor<V> getVisitor = new GetVisitor<>();
-  private final RemoveVisitor<V> removeVisitor = new RemoveVisitor<>();
-  private final StoredNodeFactory<V> nodeFactory;
-
-  private Node<V> root;
-
-  /**
-   * Create a trie.
-   *
-   * @param nodeLoader The {@link NodeLoader} to retrieve node data from.
-   * @param valueSerializer A function for serializing values to bytes.
-   * @param valueDeserializer A function for deserializing values from bytes.
-   */
-  public StoredMerklePatriciaTrie(
-      final NodeLoader nodeLoader,
-      final Function<V, Bytes> valueSerializer,
-      final Function<Bytes, V> valueDeserializer) {
-    this(nodeLoader, EMPTY_TRIE_NODE_HASH, valueSerializer, valueDeserializer);
-  }
-
-  /**
-   * Create a trie.
-   *
-   * @param nodeLoader The {@link NodeLoader} to retrieve node data from.
-   * @param rootHash The initial root has for the trie, which should be already present in {@code
-   *     storage}.
-   * @param valueSerializer A function for serializing values to bytes.
-   * @param valueDeserializer A function for deserializing values from bytes.
-   */
-  public StoredMerklePatriciaTrie(
-      final NodeLoader nodeLoader,
-      final Bytes32 rootHash,
-      final Function<V, Bytes> valueSerializer,
-      final Function<Bytes, V> valueDeserializer) {
-    this.nodeFactory = new StoredNodeFactory<>(nodeLoader, valueSerializer, valueDeserializer);
-    this.root =
-        rootHash.equals(EMPTY_TRIE_NODE_HASH)
-            ? NullNode.instance()
-            : new StoredNode<>(nodeFactory, Bytes.EMPTY, rootHash);
-  }
-
-  @Override
-  public Optional<V> get(final K key) {
-    checkNotNull(key);
-    return root.accept(getVisitor, bytesToPath(key)).getValue();
-  }
-
-  @Override
-  public Proof<V> getValueWithProof(final K key) {
-    checkNotNull(key);
-    final ProofVisitor<V> proofVisitor = new ProofVisitor<>(root);
-    final Optional<V> value = root.accept(proofVisitor, bytesToPath(key)).getValue();
-    final List<Bytes> proof =
-        proofVisitor.getProof().stream().map(Node::getRlp).collect(Collectors.toList());
-    return new Proof<>(value, proof);
-  }
-
-  @Override
-  public void put(final K key, final V value) {
-    checkNotNull(key);
-    checkNotNull(value);
-    this.root = root.accept(new PutVisitor<>(nodeFactory, value), bytesToPath(key));
-  }
-
-  @Override
-  public void remove(final K key) {
-    checkNotNull(key);
-    this.root = root.accept(removeVisitor, bytesToPath(key));
-  }
-
-  @Override
-  public void commit(final NodeUpdater nodeUpdater) {
-    final CommitVisitor<V> commitVisitor = new CommitVisitor<>(nodeUpdater);
-    root.accept(Bytes.EMPTY, commitVisitor);
-    // Make sure root node was stored
-    if (root.isDirty() && root.getRlpRef().size() < 32) {
-      nodeUpdater.store(Bytes.EMPTY, root.getHash(), root.getRlpRef());
-    }
-    // Reset root so dirty nodes can be garbage collected
-    final Bytes32 rootHash = root.getHash();
-    this.root =
-        rootHash.equals(EMPTY_TRIE_NODE_HASH)
-            ? NullNode.instance()
-            : new StoredNode<>(nodeFactory, Bytes.EMPTY, rootHash);
-  }
-
-  public void acceptAtRoot(final NodeVisitor<V> visitor) {
-    root.accept(visitor);
-  }
-
-  public void acceptAtRoot(final PathNodeVisitor<V> visitor, final Bytes path) {
-    root.accept(visitor, path);
-  }
-
-  @Override
-  public Map<Bytes32, V> entriesFrom(final Bytes32 startKeyHash, final int limit) {
-    return StorageEntriesCollector.collectEntries(root, startKeyHash, limit);
-  }
-
-  @Override
-  public void visitAll(final Consumer<Node<V>> nodeConsumer) {
-    root.accept(new AllNodesVisitor<>(nodeConsumer));
-  }
-
-  @Override
-  public CompletableFuture<Void> visitAll(
-      final Consumer<Node<V>> nodeConsumer, final ExecutorService executorService) {
-    return CompletableFuture.allOf(
-        Stream.concat(
-                Stream.of(
-                    CompletableFuture.runAsync(() -> nodeConsumer.accept(root), executorService)),
-                root.getChildren().stream()
-                    .map(
-                        rootChild ->
-                            CompletableFuture.runAsync(
-                                () -> rootChild.accept(new AllNodesVisitor<>(nodeConsumer)),
-                                executorService)))
-            .collect(toUnmodifiableSet())
-            .toArray(CompletableFuture[]::new));
-  }
-
-  @Override
-  public void visitLeafs(final TrieIterator.LeafHandler<V> handler) {
-    final TrieIterator<V> visitor = new TrieIterator<>(handler, true);
-    root.accept(visitor, CompactEncoding.bytesToPath(Bytes32.ZERO));
-  }
-
-  @Override
-  public Bytes32 getRootHash() {
-    return root.getHash();
-  }
-
-  @Override
-  public String toString() {
-    return getClass().getSimpleName() + "[" + getRootHash() + "]";
-  }
-}
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredMerkleTrie.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredMerkleTrie.java
new file mode 100644
index 00000000000..835bcd5b680
--- /dev/null
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredMerkleTrie.java
@@ -0,0 +1,215 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.trie;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.stream.Collectors.toUnmodifiableSet;
+import static org.hyperledger.besu.ethereum.trie.CompactEncoding.bytesToPath;
+
+import org.hyperledger.besu.ethereum.trie.patricia.StoredNodeFactory;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+/**
+ * A {@link MerkleTrie} that persists trie nodes to a {@link MerkleStorage} key/value store.
+ *
+ * @param <V> The type of values stored by this trie.
+ */
+public abstract class StoredMerkleTrie<K extends Bytes, V> implements MerkleTrie<K, V> {
+
+  protected final NodeFactory<V> nodeFactory;
+
+  protected Node<V> root;
+
+  /**
+   * Create a trie.
+   *
+   * @param nodeFactory The {@link StoredNodeFactory} to retrieve node.
+   */
+  public StoredMerkleTrie(final NodeFactory<V> nodeFactory) {
+    this(nodeFactory, EMPTY_TRIE_NODE_HASH);
+  }
+
+  /**
+   * Create a trie.
+   *
+   * @param nodeFactory The {@link StoredNodeFactory} to retrieve node.
+   * @param rootHash The initial root has for the trie, which should be already present in {@code
+   *     storage}.
+   * @param rootLocation The initial root location for the trie
+   */
+  public StoredMerkleTrie(
+      final NodeFactory<V> nodeFactory, final Bytes32 rootHash, final Bytes rootLocation) {
+    this.nodeFactory = nodeFactory;
+    this.root =
+        rootHash.equals(EMPTY_TRIE_NODE_HASH)
+            ? NullNode.instance()
+            : new StoredNode<>(nodeFactory, rootLocation, rootHash);
+  }
+
+  /**
+   * Create a trie.
+   *
+   * @param nodeFactory The {@link StoredNodeFactory} to retrieve node.
+   * @param rootHash The initial root hash for the trie, which should be already present in {@code
+   *     storage}.
+   */
+  public StoredMerkleTrie(final NodeFactory<V> nodeFactory, final Bytes32 rootHash) {
+    this.nodeFactory = nodeFactory;
+    this.root =
+        rootHash.equals(EMPTY_TRIE_NODE_HASH)
+            ? NullNode.instance()
+            : new StoredNode<>(nodeFactory, Bytes.EMPTY, rootHash);
+  }
+
+  @Override
+  public Optional<V> get(final K key) {
+    checkNotNull(key);
+    return root.accept(getGetVisitor(), bytesToPath(key)).getValue();
+  }
+
+  @Override
+  public Optional<V> getPath(final K path) {
+    checkNotNull(path);
+    return root.accept(getGetVisitor(), path).getValue();
+  }
+
+  @Override
+  public Proof<V> getValueWithProof(final K key) {
+    checkNotNull(key);
+    final ProofVisitor<V> proofVisitor = new ProofVisitor<>(root);
+    final Optional<V> value = root.accept(proofVisitor, bytesToPath(key)).getValue();
+    final List<Bytes> proof =
+        proofVisitor.getProof().stream().map(Node::getEncodedBytes).collect(Collectors.toList());
+    return new Proof<>(value, proof);
+  }
+
+  @Override
+  public void put(final K key, final V value) {
+    checkNotNull(key);
+    checkNotNull(value);
+    this.root = root.accept(getPutVisitor(value), bytesToPath(key));
+  }
+
+  @Override
+  public void putPath(final K path, final V value) {
+    checkNotNull(path);
+    checkNotNull(value);
+    this.root = root.accept(getPutVisitor(value), path);
+  }
+
+  @Override
+  public void put(final K key, final PathNodeVisitor<V> putVisitor) {
+    checkNotNull(key);
+    this.root = root.accept(putVisitor, bytesToPath(key));
+  }
+
+  @Override
+  public void remove(final K key) {
+    checkNotNull(key);
+    this.root = root.accept(getRemoveVisitor(), bytesToPath(key));
+  }
+
+  @Override
+  public void removePath(final K path, final PathNodeVisitor<V> removeVisitor) {
+    checkNotNull(path);
+    this.root = root.accept(removeVisitor, path);
+  }
+
+  @Override
+  public void commit(final NodeUpdater nodeUpdater) {
+    commit(nodeUpdater, new CommitVisitor<>(nodeUpdater));
+  }
+
+  @Override
+  public void commit(final NodeUpdater nodeUpdater, final CommitVisitor<V> commitVisitor) {
+    root.accept(Bytes.EMPTY, commitVisitor);
+    // Make sure root node was stored
+    if (root.isDirty() && root.getEncodedBytesRef().size() < 32) {
+      nodeUpdater.store(Bytes.EMPTY, root.getHash(), root.getEncodedBytesRef());
+    }
+    // Reset root so dirty nodes can be garbage collected
+    final Bytes32 rootHash = root.getHash();
+    this.root =
+        rootHash.equals(EMPTY_TRIE_NODE_HASH)
+            ? NullNode.instance()
+            : new StoredNode<>(nodeFactory, Bytes.EMPTY, rootHash);
+  }
+
+  @Override
+  public Map<Bytes32, V> entriesFrom(final Bytes32 startKeyHash, final int limit) {
+    return StorageEntriesCollector.collectEntries(root, startKeyHash, limit);
+  }
+
+  @Override
+  public Map<Bytes32, V> entriesFrom(final Function<Node<V>, Map<Bytes32, V>> handler) {
+    return handler.apply(root);
+  }
+
+  @Override
+  public void visitAll(final Consumer<Node<V>> nodeConsumer) {
+    root.accept(new AllNodesVisitor<>(nodeConsumer));
+  }
+
+  @Override
+  public CompletableFuture<Void> visitAll(
+      final Consumer<Node<V>> nodeConsumer, final ExecutorService executorService) {
+    return CompletableFuture.allOf(
+        Stream.concat(
+                Stream.of(
+                    CompletableFuture.runAsync(() -> nodeConsumer.accept(root), executorService)),
+                root.getChildren().stream()
+                    .map(
+                        rootChild ->
+                            CompletableFuture.runAsync(
+                                () -> rootChild.accept(new AllNodesVisitor<>(nodeConsumer)),
+                                executorService)))
+            .collect(toUnmodifiableSet())
+            .toArray(CompletableFuture[]::new));
+  }
+
+  @Override
+  public void visitLeafs(final TrieIterator.LeafHandler<V> handler) {
+    final TrieIterator<V> visitor = new TrieIterator<>(handler, true);
+    root.accept(visitor, CompactEncoding.bytesToPath(Bytes32.ZERO));
+  }
+
+  @Override
+  public Bytes32 getRootHash() {
+    return root.getHash();
+  }
+
+  @Override
+  public String toString() {
+    return getClass().getSimpleName() + "[" + getRootHash() + "]";
+  }
+
+  public abstract PathNodeVisitor<V> getGetVisitor();
+
+  public abstract PathNodeVisitor<V> getRemoveVisitor();
+
+  public abstract PathNodeVisitor<V> getPutVisitor(final V value);
+}
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredNode.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredNode.java
index 765def40ecf..8a90287cdb0 100644
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredNode.java
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -22,19 +22,21 @@
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 
-class StoredNode<V> implements Node<V> {
-  private final StoredNodeFactory<V> nodeFactory;
+public class StoredNode<V> implements Node<V> {
+  private final NodeFactory<V> nodeFactory;
   private final Bytes location;
   private final Bytes32 hash;
   private Node<V> loaded;
 
-  StoredNode(final StoredNodeFactory<V> nodeFactory, final Bytes location, final Bytes32 hash) {
+  public StoredNode(final NodeFactory<V> nodeFactory, final Bytes location, final Bytes32 hash) {
     this.nodeFactory = nodeFactory;
     this.location = location;
     this.hash = hash;
   }
 
-  /** @return True if the node needs to be persisted. */
+  /**
+   * @return True if the node needs to be persisted.
+   */
   @Override
   public boolean isDirty() {
     return false;
@@ -47,6 +49,17 @@ public void markDirty() {
         "A stored node cannot ever be dirty since it's loaded from storage");
   }
 
+  @Override
+  public boolean isHealNeeded() {
+    return false;
+  }
+
+  @Override
+  public void markHealNeeded() {
+    throw new IllegalStateException(
+        "A stored node cannot be healed since it's loaded from storage");
+  }
+
   @Override
   public Node<V> accept(final PathNodeVisitor<V> visitor, final Bytes path) {
     final Node<V> node = load();
@@ -70,6 +83,11 @@ public Bytes getPath() {
     return load().getPath();
   }
 
+  @Override
+  public Optional<Bytes> getLocation() {
+    return Optional.ofNullable(location);
+  }
+
   @Override
   public Optional<V> getValue() {
     return load().getValue();
@@ -81,12 +99,12 @@ public List<Node<V>> getChildren() {
   }
 
   @Override
-  public Bytes getRlp() {
-    return load().getRlp();
+  public Bytes getEncodedBytes() {
+    return load().getEncodedBytes();
   }
 
   @Override
-  public Bytes getRlpRef() {
+  public Bytes getEncodedBytesRef() {
     // If this node was stored, then it must have a rlp larger than a hash
     return RLP.encodeOne(hash);
   }
@@ -113,7 +131,14 @@ private Node<V> load() {
           nodeFactory
               .retrieve(location, hash)
               .orElseThrow(
-                  () -> new MerkleTrieException("Unable to load trie node value for hash " + hash));
+                  () ->
+                      new MerkleTrieException(
+                          "Unable to load trie node value for hash "
+                              + hash
+                              + " location "
+                              + location,
+                          hash,
+                          location));
     }
 
     return loaded;
@@ -127,7 +152,7 @@ public void unload() {
   @Override
   public String print() {
     if (loaded == null) {
-      return "StoredNode:" + "\n\tRef: " + getRlpRef();
+      return "StoredNode:" + "\n\tRef: " + getEncodedBytesRef();
     } else {
       return load().print();
     }
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/TrieIterator.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/TrieIterator.java
index c19435910a7..cb314d87959 100644
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/TrieIterator.java
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/TrieIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -14,12 +14,17 @@
  */
 package org.hyperledger.besu.ethereum.trie;
 
+import org.hyperledger.besu.ethereum.trie.patricia.BranchNode;
+import org.hyperledger.besu.ethereum.trie.patricia.ExtensionNode;
+import org.hyperledger.besu.ethereum.trie.patricia.LeafNode;
+
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.Iterator;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.bytes.MutableBytes;
 
 public class TrieIterator<V> implements PathNodeVisitor<V> {
 
@@ -36,10 +41,15 @@ public TrieIterator(final LeafHandler<V> leafHandler, final boolean unload) {
   @Override
   public Node<V> visit(final ExtensionNode<V> node, final Bytes searchPath) {
     Bytes remainingPath = searchPath;
+    final Bytes extensionPath;
+    final Bytes commonPrefixPath;
     if (state == State.SEARCHING) {
-      final Bytes extensionPath = node.getPath();
-      final int commonPathLength = extensionPath.commonPrefixLength(searchPath);
-      remainingPath = searchPath.slice(commonPathLength);
+      extensionPath = node.getPath();
+      commonPrefixPath = searchPath.slice(0, Math.min(searchPath.size(), extensionPath.size()));
+      remainingPath = searchPath.slice(commonPrefixPath.size());
+      if (node.getPath().compareTo(commonPrefixPath) > 0) {
+        remainingPath = MutableBytes.create(remainingPath.size());
+      }
     }
 
     paths.push(node.getPath());
@@ -63,10 +73,15 @@ public Node<V> visit(final BranchNode<V> node, final Bytes searchPath) {
       remainingPath = searchPath.slice(1);
     }
     paths.push(node.getPath());
-    for (byte i = iterateFrom; i < BranchNode.RADIX && state.continueIterating(); i++) {
+    for (int i = iterateFrom; i < node.maxChild() && state.continueIterating(); i++) {
       paths.push(Bytes.of(i));
-      final Node<V> child = node.child(i);
-      child.accept(this, remainingPath);
+      final Node<V> child = node.child((byte) i);
+      if (i == iterateFrom) {
+        child.accept(this, remainingPath);
+      } else {
+        child.accept(this, MutableBytes.create(remainingPath.size()));
+      }
+
       if (unload) {
         child.unload();
       }
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/BranchNode.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/BranchNode.java
new file mode 100644
index 00000000000..ac5eec524b6
--- /dev/null
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/BranchNode.java
@@ -0,0 +1,281 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.trie.patricia;
+
+import static org.hyperledger.besu.crypto.Hash.keccak256;
+
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.trie.LocationNodeVisitor;
+import org.hyperledger.besu.ethereum.trie.Node;
+import org.hyperledger.besu.ethereum.trie.NodeFactory;
+import org.hyperledger.besu.ethereum.trie.NodeVisitor;
+import org.hyperledger.besu.ethereum.trie.NullNode;
+import org.hyperledger.besu.ethereum.trie.PathNodeVisitor;
+
+import java.lang.ref.SoftReference;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Function;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.bytes.MutableBytes;
+
+public class BranchNode<V> implements Node<V> {
+
+  @SuppressWarnings("rawtypes")
+  protected static final Node NULL_NODE = NullNode.instance();
+
+  private final Optional<Bytes> location;
+  private final List<Node<V>> children;
+  private final Optional<V> value;
+  protected final NodeFactory<V> nodeFactory;
+  private final Function<V, Bytes> valueSerializer;
+  protected WeakReference<Bytes> encodedBytes;
+  private SoftReference<Bytes32> hash;
+  private boolean dirty = false;
+  private boolean needHeal = false;
+
+  public BranchNode(
+      final Bytes location,
+      final ArrayList<Node<V>> children,
+      final Optional<V> value,
+      final NodeFactory<V> nodeFactory,
+      final Function<V, Bytes> valueSerializer) {
+    assert (children.size() == maxChild());
+    this.location = Optional.ofNullable(location);
+    this.children = children;
+    this.value = value;
+    this.nodeFactory = nodeFactory;
+    this.valueSerializer = valueSerializer;
+  }
+
+  public BranchNode(
+      final List<Node<V>> children,
+      final Optional<V> value,
+      final NodeFactory<V> nodeFactory,
+      final Function<V, Bytes> valueSerializer) {
+    assert (children.size() == maxChild());
+    this.location = Optional.empty();
+    this.children = children;
+    this.value = value;
+    this.nodeFactory = nodeFactory;
+    this.valueSerializer = valueSerializer;
+  }
+
+  @Override
+  public Node<V> accept(final PathNodeVisitor<V> visitor, final Bytes path) {
+    return visitor.visit(this, path);
+  }
+
+  @Override
+  public void accept(final NodeVisitor<V> visitor) {
+    visitor.visit(this);
+  }
+
+  @Override
+  public void accept(final Bytes location, final LocationNodeVisitor<V> visitor) {
+    visitor.visit(location, this);
+  }
+
+  @Override
+  public Optional<Bytes> getLocation() {
+    return location;
+  }
+
+  @Override
+  public Bytes getPath() {
+    return Bytes.EMPTY;
+  }
+
+  @Override
+  public Optional<V> getValue() {
+    return value;
+  }
+
+  @Override
+  public List<Node<V>> getChildren() {
+    return Collections.unmodifiableList(children);
+  }
+
+  public Node<V> child(final byte index) {
+    return children.get(index);
+  }
+
+  @Override
+  public Bytes getEncodedBytes() {
+    if (encodedBytes != null) {
+      final Bytes encoded = encodedBytes.get();
+      if (encoded != null) {
+        return encoded;
+      }
+    }
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    out.startList();
+    for (int i = 0; i < maxChild(); ++i) {
+      out.writeRaw(children.get(i).getEncodedBytesRef());
+    }
+    if (value.isPresent()) {
+      out.writeBytes(valueSerializer.apply(value.get()));
+    } else {
+      out.writeNull();
+    }
+    out.endList();
+    final Bytes encoded = out.encoded();
+    encodedBytes = new WeakReference<>(encoded);
+    return encoded;
+  }
+
+  @Override
+  public Bytes getEncodedBytesRef() {
+    if (isReferencedByHash()) {
+      return RLP.encodeOne(getHash());
+    } else {
+      return getEncodedBytes();
+    }
+  }
+
+  @Override
+  public Bytes32 getHash() {
+    if (hash != null) {
+      final Bytes32 hashed = hash.get();
+      if (hashed != null) {
+        return hashed;
+      }
+    }
+    final Bytes32 hashed = keccak256(getEncodedBytes());
+    hash = new SoftReference<>(hashed);
+    return hashed;
+  }
+
+  @Override
+  public Node<V> replacePath(final Bytes newPath) {
+    return nodeFactory.createExtension(newPath, this);
+  }
+
+  public Node<V> replaceChild(final byte index, final Node<V> updatedChild) {
+    return replaceChild(index, updatedChild, true);
+  }
+
+  public Node<V> replaceChild(
+      final byte index, final Node<V> updatedChild, final boolean allowFlatten) {
+    final ArrayList<Node<V>> newChildren = new ArrayList<>(children);
+    newChildren.set(index, updatedChild);
+
+    if (updatedChild == NULL_NODE) {
+      if (value.isPresent() && !hasChildren()) {
+        return nodeFactory.createLeaf(Bytes.of(index), value.get());
+      } else if (value.isEmpty() && allowFlatten) {
+        final Optional<Node<V>> flattened = maybeFlatten(newChildren);
+        if (flattened.isPresent()) {
+          return flattened.get();
+        }
+      }
+    }
+
+    return nodeFactory.createBranch(newChildren, value);
+  }
+
+  public Node<V> replaceValue(final V value) {
+    return nodeFactory.createBranch(children, Optional.of(value));
+  }
+
+  public Node<V> removeValue() {
+    return maybeFlatten(children).orElse(nodeFactory.createBranch(children, Optional.empty()));
+  }
+
+  protected boolean hasChildren() {
+    for (final Node<V> child : children) {
+      if (child != NULL_NODE) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  protected Optional<Node<V>> maybeFlatten(final List<Node<V>> children) {
+    final int onlyChildIndex = findOnlyChild(children);
+    if (onlyChildIndex >= 0) {
+      // replace the path of the only child and return it
+      final Node<V> onlyChild = children.get(onlyChildIndex);
+      final Bytes onlyChildPath = onlyChild.getPath();
+      final MutableBytes completePath = MutableBytes.create(1 + onlyChildPath.size());
+      completePath.set(0, (byte) onlyChildIndex);
+      onlyChildPath.copyTo(completePath, 1);
+      return Optional.of(onlyChild.replacePath(completePath));
+    }
+    return Optional.empty();
+  }
+
+  private int findOnlyChild(final List<Node<V>> children) {
+    int onlyChildIndex = -1;
+    assert (children.size() == maxChild());
+    for (int i = 0; i < maxChild(); ++i) {
+      if (children.get(i) != NULL_NODE) {
+        if (onlyChildIndex >= 0) {
+          return -1;
+        }
+        onlyChildIndex = i;
+      }
+    }
+    return onlyChildIndex;
+  }
+
+  @Override
+  public String print() {
+    final StringBuilder builder = new StringBuilder();
+    builder.append("Branch:");
+    builder.append("\n\tRef: ").append(getEncodedBytesRef());
+    for (int i = 0; i < maxChild(); i++) {
+      final Node<V> child = child((byte) i);
+      if (!Objects.equals(child, NullNode.instance())) {
+        final String branchLabel = "[" + Integer.toHexString(i) + "] ";
+        final String childRep = child.print().replaceAll("\n\t", "\n\t\t");
+        builder.append("\n\t").append(branchLabel).append(childRep);
+      }
+    }
+    builder.append("\n\tValue: ").append(getValue().map(Object::toString).orElse("empty"));
+    return builder.toString();
+  }
+
+  @Override
+  public boolean isDirty() {
+    return dirty;
+  }
+
+  @Override
+  public void markDirty() {
+    dirty = true;
+  }
+
+  @Override
+  public boolean isHealNeeded() {
+    return needHeal;
+  }
+
+  @Override
+  public void markHealNeeded() {
+    this.needHeal = true;
+  }
+
+  public int maxChild() {
+    return 16;
+  }
+}
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/DefaultNodeFactory.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/DefaultNodeFactory.java
similarity index 76%
rename from ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/DefaultNodeFactory.java
rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/DefaultNodeFactory.java
index 79d7fa02e23..2c348c7a86c 100644
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/DefaultNodeFactory.java
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/DefaultNodeFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -12,10 +12,15 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.trie;
+package org.hyperledger.besu.ethereum.trie.patricia;
+
+import org.hyperledger.besu.ethereum.trie.Node;
+import org.hyperledger.besu.ethereum.trie.NodeFactory;
+import org.hyperledger.besu.ethereum.trie.NullNode;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
 
@@ -25,6 +30,8 @@ public class DefaultNodeFactory<V> implements NodeFactory<V> {
   @SuppressWarnings("rawtypes")
   private static final Node NULL_NODE = NullNode.instance();
 
+  private static final int NB_CHILD = 16;
+
   private final Function<V, Bytes> valueSerializer;
 
   public DefaultNodeFactory(final Function<V, Bytes> valueSerializer) {
@@ -40,16 +47,16 @@ public Node<V> createExtension(final Bytes path, final Node<V> child) {
   @Override
   public Node<V> createBranch(
       final byte leftIndex, final Node<V> left, final byte rightIndex, final Node<V> right) {
-    assert (leftIndex <= BranchNode.RADIX);
-    assert (rightIndex <= BranchNode.RADIX);
+    assert (leftIndex <= NB_CHILD);
+    assert (rightIndex <= NB_CHILD);
     assert (leftIndex != rightIndex);
 
     final ArrayList<Node<V>> children =
-        new ArrayList<>(Collections.nCopies(BranchNode.RADIX, (Node<V>) NULL_NODE));
-    if (leftIndex == BranchNode.RADIX) {
+        new ArrayList<>(Collections.nCopies(NB_CHILD, (Node<V>) NULL_NODE));
+    if (leftIndex == NB_CHILD) {
       children.set(rightIndex, right);
       return createBranch(children, left.getValue());
-    } else if (rightIndex == BranchNode.RADIX) {
+    } else if (rightIndex == NB_CHILD) {
       children.set(leftIndex, left);
       return createBranch(children, right.getValue());
     } else {
@@ -60,7 +67,7 @@ public Node<V> createBranch(
   }
 
   @Override
-  public Node<V> createBranch(final ArrayList<Node<V>> children, final Optional<V> value) {
+  public Node<V> createBranch(final List<Node<V>> children, final Optional<V> value) {
     return new BranchNode<>(children, value, this, valueSerializer);
   }
 
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/ExtensionNode.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/ExtensionNode.java
new file mode 100644
index 00000000000..50df015e380
--- /dev/null
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/ExtensionNode.java
@@ -0,0 +1,199 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.trie.patricia;
+
+import static org.hyperledger.besu.crypto.Hash.keccak256;
+
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.trie.CompactEncoding;
+import org.hyperledger.besu.ethereum.trie.LocationNodeVisitor;
+import org.hyperledger.besu.ethereum.trie.Node;
+import org.hyperledger.besu.ethereum.trie.NodeFactory;
+import org.hyperledger.besu.ethereum.trie.NodeVisitor;
+import org.hyperledger.besu.ethereum.trie.PathNodeVisitor;
+
+import java.lang.ref.SoftReference;
+import java.lang.ref.WeakReference;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+public class ExtensionNode<V> implements Node<V> {
+
+  private final Optional<Bytes> location;
+  private final Bytes path;
+  private final Node<V> child;
+  private final NodeFactory<V> nodeFactory;
+  private WeakReference<Bytes> rlp;
+  private SoftReference<Bytes32> hash;
+  private boolean dirty = false;
+  private boolean needHeal = false;
+
+  public ExtensionNode(
+      final Bytes location,
+      final Bytes path,
+      final Node<V> child,
+      final NodeFactory<V> nodeFactory) {
+    assert (path.size() > 0);
+    assert (path.get(path.size() - 1) != CompactEncoding.LEAF_TERMINATOR)
+        : "Extension path ends in a leaf terminator";
+    this.location = Optional.ofNullable(location);
+    this.path = path;
+    this.child = child;
+    this.nodeFactory = nodeFactory;
+  }
+
+  public ExtensionNode(final Bytes path, final Node<V> child, final NodeFactory<V> nodeFactory) {
+    assert (path.size() > 0);
+    assert (path.get(path.size() - 1) != CompactEncoding.LEAF_TERMINATOR)
+        : "Extension path ends in a leaf terminator";
+    this.location = Optional.empty();
+    this.path = path;
+    this.child = child;
+    this.nodeFactory = nodeFactory;
+  }
+
+  @Override
+  public Node<V> accept(final PathNodeVisitor<V> visitor, final Bytes path) {
+    return visitor.visit(this, path);
+  }
+
+  @Override
+  public void accept(final NodeVisitor<V> visitor) {
+    visitor.visit(this);
+  }
+
+  @Override
+  public void accept(final Bytes location, final LocationNodeVisitor<V> visitor) {
+    visitor.visit(location, this);
+  }
+
+  @Override
+  public Optional<Bytes> getLocation() {
+    return location;
+  }
+
+  @Override
+  public Bytes getPath() {
+    return path;
+  }
+
+  @Override
+  public Optional<V> getValue() {
+    return Optional.empty();
+  }
+
+  @Override
+  public List<Node<V>> getChildren() {
+    return Collections.singletonList(child);
+  }
+
+  public Node<V> getChild() {
+    return child;
+  }
+
+  @Override
+  public Bytes getEncodedBytes() {
+    if (rlp != null) {
+      final Bytes encoded = rlp.get();
+      if (encoded != null) {
+        return encoded;
+      }
+    }
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    out.startList();
+    out.writeBytes(CompactEncoding.encode(path));
+    out.writeRaw(child.getEncodedBytesRef());
+    out.endList();
+    final Bytes encoded = out.encoded();
+    rlp = new WeakReference<>(encoded);
+    return encoded;
+  }
+
+  @Override
+  public Bytes getEncodedBytesRef() {
+    if (isReferencedByHash()) {
+      return RLP.encodeOne(getHash());
+    } else {
+      return getEncodedBytes();
+    }
+  }
+
+  @Override
+  public Bytes32 getHash() {
+    if (hash != null) {
+      final Bytes32 hashed = hash.get();
+      if (hashed != null) {
+        return hashed;
+      }
+    }
+    final Bytes rlp = getEncodedBytes();
+    final Bytes32 hashed = keccak256(rlp);
+    hash = new SoftReference<>(hashed);
+    return hashed;
+  }
+
+  public Node<V> replaceChild(final Node<V> updatedChild) {
+    // collapse this extension - if the child is a branch, it will create a new extension
+    return updatedChild.replacePath(Bytes.concatenate(path, updatedChild.getPath()));
+  }
+
+  @Override
+  public Node<V> replacePath(final Bytes path) {
+    if (path.size() == 0) {
+      return child;
+    }
+    return nodeFactory.createExtension(path, child);
+  }
+
+  @Override
+  public String print() {
+    final StringBuilder builder = new StringBuilder();
+    final String childRep = getChild().print().replaceAll("\n\t", "\n\t\t");
+    builder
+        .append("Extension:")
+        .append("\n\tRef: ")
+        .append(getEncodedBytesRef())
+        .append("\n\tPath: ")
+        .append(CompactEncoding.encode(path))
+        .append("\n\t")
+        .append(childRep);
+    return builder.toString();
+  }
+
+  @Override
+  public boolean isDirty() {
+    return dirty;
+  }
+
+  @Override
+  public void markDirty() {
+    dirty = true;
+  }
+
+  @Override
+  public boolean isHealNeeded() {
+    return needHeal;
+  }
+
+  @Override
+  public void markHealNeeded() {
+    this.needHeal = true;
+  }
+}
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/GetVisitor.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/GetVisitor.java
similarity index 84%
rename from ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/GetVisitor.java
rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/GetVisitor.java
index 20397701a46..c34bc96fa6f 100644
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/GetVisitor.java
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/GetVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -12,11 +12,16 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.trie;
+package org.hyperledger.besu.ethereum.trie.patricia;
+
+import org.hyperledger.besu.ethereum.trie.CompactEncoding;
+import org.hyperledger.besu.ethereum.trie.Node;
+import org.hyperledger.besu.ethereum.trie.NullNode;
+import org.hyperledger.besu.ethereum.trie.PathNodeVisitor;
 
 import org.apache.tuweni.bytes.Bytes;
 
-class GetVisitor<V> implements PathNodeVisitor<V> {
+public class GetVisitor<V> implements PathNodeVisitor<V> {
   private final Node<V> NULL_NODE_RESULT = NullNode.instance();
 
   @Override
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/LeafNode.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/LeafNode.java
new file mode 100644
index 00000000000..38690d95050
--- /dev/null
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/LeafNode.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.trie.patricia;
+
+import static org.hyperledger.besu.crypto.Hash.keccak256;
+
+import org.hyperledger.besu.ethereum.rlp.BytesValueRLPOutput;
+import org.hyperledger.besu.ethereum.rlp.RLP;
+import org.hyperledger.besu.ethereum.trie.CompactEncoding;
+import org.hyperledger.besu.ethereum.trie.LocationNodeVisitor;
+import org.hyperledger.besu.ethereum.trie.Node;
+import org.hyperledger.besu.ethereum.trie.NodeFactory;
+import org.hyperledger.besu.ethereum.trie.NodeVisitor;
+import org.hyperledger.besu.ethereum.trie.PathNodeVisitor;
+
+import java.lang.ref.SoftReference;
+import java.lang.ref.WeakReference;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+public class LeafNode<V> implements Node<V> {
+  private final Optional<Bytes> location;
+  private final Bytes path;
+  protected final V value;
+  private final NodeFactory<V> nodeFactory;
+  protected final Function<V, Bytes> valueSerializer;
+  protected WeakReference<Bytes> encodedBytes;
+  private SoftReference<Bytes32> hash;
+  private boolean dirty = false;
+
+  public LeafNode(
+      final Bytes location,
+      final Bytes path,
+      final V value,
+      final NodeFactory<V> nodeFactory,
+      final Function<V, Bytes> valueSerializer) {
+    this.location = Optional.ofNullable(location);
+    this.path = path;
+    this.value = value;
+    this.nodeFactory = nodeFactory;
+    this.valueSerializer = valueSerializer;
+  }
+
+  public LeafNode(
+      final Bytes path,
+      final V value,
+      final NodeFactory<V> nodeFactory,
+      final Function<V, Bytes> valueSerializer) {
+    this.location = Optional.empty();
+    this.path = path;
+    this.value = value;
+    this.nodeFactory = nodeFactory;
+    this.valueSerializer = valueSerializer;
+  }
+
+  @Override
+  public Node<V> accept(final PathNodeVisitor<V> visitor, final Bytes path) {
+    return visitor.visit(this, path);
+  }
+
+  @Override
+  public void accept(final NodeVisitor<V> visitor) {
+    visitor.visit(this);
+  }
+
+  @Override
+  public void accept(final Bytes location, final LocationNodeVisitor<V> visitor) {
+    visitor.visit(location, this);
+  }
+
+  @Override
+  public Optional<Bytes> getLocation() {
+    return location;
+  }
+
+  @Override
+  public Bytes getPath() {
+    return path;
+  }
+
+  @Override
+  public Optional<V> getValue() {
+    return Optional.of(value);
+  }
+
+  @Override
+  public List<Node<V>> getChildren() {
+    return Collections.emptyList();
+  }
+
+  @Override
+  public Bytes getEncodedBytes() {
+    if (encodedBytes != null) {
+      final Bytes encoded = encodedBytes.get();
+      if (encoded != null) {
+        return encoded;
+      }
+    }
+
+    final BytesValueRLPOutput out = new BytesValueRLPOutput();
+    out.startList();
+    out.writeBytes(CompactEncoding.encode(path));
+    out.writeBytes(valueSerializer.apply(value));
+    out.endList();
+    final Bytes encoded = out.encoded();
+    encodedBytes = new WeakReference<>(encoded);
+    return encoded;
+  }
+
+  @Override
+  public Bytes getEncodedBytesRef() {
+    if (isReferencedByHash()) {
+      return RLP.encodeOne(getHash());
+    } else {
+      return getEncodedBytes();
+    }
+  }
+
+  @Override
+  public Bytes32 getHash() {
+    if (hash != null) {
+      final Bytes32 hashed = hash.get();
+      if (hashed != null) {
+        return hashed;
+      }
+    }
+    final Bytes32 hashed = keccak256(getEncodedBytes());
+    hash = new SoftReference<>(hashed);
+    return hashed;
+  }
+
+  @Override
+  public Node<V> replacePath(final Bytes path) {
+    return nodeFactory.createLeaf(path, value);
+  }
+
+  @Override
+  public String print() {
+    return "Leaf:"
+        + "\n\tRef: "
+        + getEncodedBytesRef()
+        + "\n\tPath: "
+        + CompactEncoding.encode(path)
+        + "\n\tValue: "
+        + getValue().map(Object::toString).orElse("empty");
+  }
+
+  @Override
+  public boolean isDirty() {
+    return dirty;
+  }
+
+  @Override
+  public void markDirty() {
+    dirty = true;
+  }
+
+  @Override
+  public boolean isHealNeeded() {
+    return false;
+  }
+
+  @Override
+  public void markHealNeeded() {
+    // nothing to do a leaf don't have child
+  }
+}
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/PutVisitor.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/PutVisitor.java
similarity index 91%
rename from ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/PutVisitor.java
rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/PutVisitor.java
index e8e939d2f86..c536fa56b33 100644
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/PutVisitor.java
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/PutVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -12,7 +12,13 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.trie;
+package org.hyperledger.besu.ethereum.trie.patricia;
+
+import org.hyperledger.besu.ethereum.trie.CompactEncoding;
+import org.hyperledger.besu.ethereum.trie.Node;
+import org.hyperledger.besu.ethereum.trie.NodeFactory;
+import org.hyperledger.besu.ethereum.trie.NullNode;
+import org.hyperledger.besu.ethereum.trie.PathNodeVisitor;
 
 import org.apache.tuweni.bytes.Bytes;
 
@@ -28,7 +34,6 @@ public PutVisitor(final NodeFactory<V> nodeFactory, final V value) {
   @Override
   public Node<V> visit(final ExtensionNode<V> extensionNode, final Bytes path) {
     final Bytes extensionPath = extensionNode.getPath();
-
     final int commonPathLength = extensionPath.commonPrefixLength(path);
     assert commonPathLength < path.size()
         : "Visiting path doesn't end with a non-matching terminator";
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/RemoveVisitor.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/RemoveVisitor.java
similarity index 77%
rename from ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/RemoveVisitor.java
rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/RemoveVisitor.java
index 42db3460430..3be8f8f4411 100644
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/RemoveVisitor.java
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/RemoveVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -12,13 +12,28 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.trie;
+package org.hyperledger.besu.ethereum.trie.patricia;
+
+import org.hyperledger.besu.ethereum.trie.CompactEncoding;
+import org.hyperledger.besu.ethereum.trie.Node;
+import org.hyperledger.besu.ethereum.trie.NullNode;
+import org.hyperledger.besu.ethereum.trie.PathNodeVisitor;
 
 import org.apache.tuweni.bytes.Bytes;
 
-class RemoveVisitor<V> implements PathNodeVisitor<V> {
+public class RemoveVisitor<V> implements PathNodeVisitor<V> {
   private final Node<V> NULL_NODE_RESULT = NullNode.instance();
 
+  private final boolean allowFlatten;
+
+  public RemoveVisitor() {
+    allowFlatten = true;
+  }
+
+  public RemoveVisitor(final boolean allowFlatten) {
+    this.allowFlatten = allowFlatten;
+  }
+
   @Override
   public Node<V> visit(final ExtensionNode<V> extensionNode, final Bytes path) {
     final Bytes extensionPath = extensionNode.getPath();
@@ -46,7 +61,7 @@ public Node<V> visit(final BranchNode<V> branchNode, final Bytes path) {
     }
 
     final Node<V> updatedChild = branchNode.child(childIndex).accept(this, path.slice(1));
-    return branchNode.replaceChild(childIndex, updatedChild);
+    return branchNode.replaceChild(childIndex, updatedChild, allowFlatten);
   }
 
   @Override
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/SimpleMerklePatriciaTrie.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/SimpleMerklePatriciaTrie.java
new file mode 100644
index 00000000000..8bd14cbb93c
--- /dev/null
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/SimpleMerklePatriciaTrie.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.trie.patricia;
+
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.PathNodeVisitor;
+import org.hyperledger.besu.ethereum.trie.SimpleMerkleTrie;
+
+import java.util.function.Function;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/**
+ * An in-memory {@link MerkleTrie}.
+ *
+ * @param <V> The type of values stored by this trie.
+ */
+public class SimpleMerklePatriciaTrie<K extends Bytes, V> extends SimpleMerkleTrie<K, V>
+    implements MerkleTrie<K, V> {
+  private final GetVisitor<V> getVisitor = new GetVisitor<>();
+  private final RemoveVisitor<V> removeVisitor = new RemoveVisitor<>();
+
+  public SimpleMerklePatriciaTrie(final Function<V, Bytes> valueSerializer) {
+    super(valueSerializer);
+  }
+
+  @Override
+  public GetVisitor<V> getGetVisitor() {
+    return getVisitor;
+  }
+
+  @Override
+  public RemoveVisitor<V> getRemoveVisitor() {
+    return removeVisitor;
+  }
+
+  @Override
+  public PathNodeVisitor<V> getPutVisitor(final V value) {
+    return new PutVisitor<>(nodeFactory, value);
+  }
+}
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/StoredMerklePatriciaTrie.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/StoredMerklePatriciaTrie.java
new file mode 100644
index 00000000000..0ae7cf344e7
--- /dev/null
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/StoredMerklePatriciaTrie.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.trie.patricia;
+
+import org.hyperledger.besu.ethereum.trie.MerkleStorage;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.NodeLoader;
+import org.hyperledger.besu.ethereum.trie.PathNodeVisitor;
+import org.hyperledger.besu.ethereum.trie.StoredMerkleTrie;
+
+import java.util.function.Function;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+/**
+ * A {@link MerkleTrie} that persists trie nodes to a {@link MerkleStorage} key/value store.
+ *
+ * @param <V> The type of values stored by this trie.
+ */
+public class StoredMerklePatriciaTrie<K extends Bytes, V> extends StoredMerkleTrie<K, V>
+    implements MerkleTrie<K, V> {
+
+  private final GetVisitor<V> getVisitor = new GetVisitor<>();
+  private final RemoveVisitor<V> removeVisitor = new RemoveVisitor<>();
+
+  public StoredMerklePatriciaTrie(
+      final NodeLoader nodeLoader,
+      final Function<V, Bytes> valueSerializer,
+      final Function<Bytes, V> valueDeserializer) {
+    super(new StoredNodeFactory<>(nodeLoader, valueSerializer, valueDeserializer));
+  }
+
+  public StoredMerklePatriciaTrie(
+      final NodeLoader nodeLoader,
+      final Bytes32 rootHash,
+      final Bytes rootLocation,
+      final Function<V, Bytes> valueSerializer,
+      final Function<Bytes, V> valueDeserializer) {
+    super(
+        new StoredNodeFactory<>(nodeLoader, valueSerializer, valueDeserializer),
+        rootHash,
+        rootLocation);
+  }
+
+  public StoredMerklePatriciaTrie(
+      final NodeLoader nodeLoader,
+      final Bytes32 rootHash,
+      final Function<V, Bytes> valueSerializer,
+      final Function<Bytes, V> valueDeserializer) {
+    super(new StoredNodeFactory<>(nodeLoader, valueSerializer, valueDeserializer), rootHash);
+  }
+
+  public StoredMerklePatriciaTrie(final StoredNodeFactory<V> nodeFactory, final Bytes32 rootHash) {
+    super(nodeFactory, rootHash);
+  }
+
+  @Override
+  public PathNodeVisitor<V> getGetVisitor() {
+    return getVisitor;
+  }
+
+  @Override
+  public PathNodeVisitor<V> getRemoveVisitor() {
+    return removeVisitor;
+  }
+
+  @Override
+  public PathNodeVisitor<V> getPutVisitor(final V value) {
+    return new PutVisitor<>(nodeFactory, value);
+  }
+}
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredNodeFactory.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/StoredNodeFactory.java
similarity index 79%
rename from ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredNodeFactory.java
rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/StoredNodeFactory.java
index 6518a287f01..68e0d293f3c 100644
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/StoredNodeFactory.java
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/StoredNodeFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -12,16 +12,24 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.trie;
+package org.hyperledger.besu.ethereum.trie.patricia;
 
 import static java.lang.String.format;
 
 import org.hyperledger.besu.ethereum.rlp.RLP;
 import org.hyperledger.besu.ethereum.rlp.RLPException;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
+import org.hyperledger.besu.ethereum.trie.CompactEncoding;
+import org.hyperledger.besu.ethereum.trie.MerkleTrieException;
+import org.hyperledger.besu.ethereum.trie.Node;
+import org.hyperledger.besu.ethereum.trie.NodeFactory;
+import org.hyperledger.besu.ethereum.trie.NodeLoader;
+import org.hyperledger.besu.ethereum.trie.NullNode;
+import org.hyperledger.besu.ethereum.trie.StoredNode;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -33,6 +41,8 @@ public class StoredNodeFactory<V> implements NodeFactory<V> {
   @SuppressWarnings("rawtypes")
   private static final NullNode NULL_NODE = NullNode.instance();
 
+  private static final int RADIX = 16;
+
   private final NodeLoader nodeLoader;
   private final Function<V, Bytes> valueSerializer;
   private final Function<Bytes, V> valueDeserializer;
@@ -55,17 +65,17 @@ public Node<V> createExtension(final Bytes path, final Node<V> child) {
   @Override
   public Node<V> createBranch(
       final byte leftIndex, final Node<V> left, final byte rightIndex, final Node<V> right) {
-    assert (leftIndex <= BranchNode.RADIX);
-    assert (rightIndex <= BranchNode.RADIX);
+    assert (leftIndex <= RADIX);
+    assert (rightIndex <= RADIX);
     assert (leftIndex != rightIndex);
 
     final ArrayList<Node<V>> children =
-        new ArrayList<>(Collections.nCopies(BranchNode.RADIX, (Node<V>) NULL_NODE));
+        new ArrayList<>(Collections.nCopies(RADIX, (Node<V>) NULL_NODE));
 
-    if (leftIndex == BranchNode.RADIX) {
+    if (leftIndex == RADIX) {
       children.set(rightIndex, right);
       return createBranch(children, left.getValue());
-    } else if (rightIndex == BranchNode.RADIX) {
+    } else if (rightIndex == RADIX) {
       children.set(leftIndex, left);
       return createBranch(children, right.getValue());
     } else {
@@ -76,7 +86,7 @@ public Node<V> createBranch(
   }
 
   @Override
-  public Node<V> createBranch(final ArrayList<Node<V>> children, final Optional<V> value) {
+  public Node<V> createBranch(final List<Node<V>> children, final Optional<V> value) {
     return handleNewNode(new BranchNode<>(children, value, this, valueSerializer));
   }
 
@@ -90,6 +100,7 @@ private Node<V> handleNewNode(final Node<V> node) {
     return node;
   }
 
+  @Override
   public Optional<Node<V>> retrieve(final Bytes location, final Bytes32 hash)
       throws MerkleTrieException {
     return nodeLoader
@@ -138,7 +149,7 @@ private Node<V> decode(
 
         final int size = path.size();
         if (size > 0 && path.get(size - 1) == CompactEncoding.LEAF_TERMINATOR) {
-          final LeafNode<V> leafNode = decodeLeaf(path, nodeRLPs, errMessage);
+          final LeafNode<V> leafNode = decodeLeaf(location, path, nodeRLPs, errMessage);
           nodeRLPs.leaveList();
           return leafNode;
         } else {
@@ -147,7 +158,7 @@ private Node<V> decode(
           return extensionNode;
         }
 
-      case (BranchNode.RADIX + 1):
+      case (RADIX + 1):
         final BranchNode<V> branchNode = decodeBranch(location, nodeRLPs, errMessage);
         nodeRLPs.leaveList();
         return branchNode;
@@ -158,34 +169,39 @@ private Node<V> decode(
     }
   }
 
-  private Node<V> decodeExtension(
+  protected Node<V> decodeExtension(
       final Bytes location,
       final Bytes path,
       final RLPInput valueRlp,
       final Supplier<String> errMessage) {
     final RLPInput childRlp = valueRlp.readAsRlp();
     if (childRlp.nextIsList()) {
-      final Node<V> childNode = decode(location, childRlp, errMessage);
-      return new ExtensionNode<>(path, childNode, this);
+      final Node<V> childNode =
+          decode(location == null ? null : Bytes.concatenate(location, path), childRlp, errMessage);
+      return new ExtensionNode<>(location, path, childNode, this);
     } else {
       final Bytes32 childHash = childRlp.readBytes32();
       final StoredNode<V> childNode =
           new StoredNode<>(
               this, location == null ? null : Bytes.concatenate(location, path), childHash);
-      return new ExtensionNode<>(path, childNode, this);
+      return new ExtensionNode<>(location, path, childNode, this);
     }
   }
 
   @SuppressWarnings("unchecked")
-  private BranchNode<V> decodeBranch(
+  protected BranchNode<V> decodeBranch(
       final Bytes location, final RLPInput nodeRLPs, final Supplier<String> errMessage) {
-    final ArrayList<Node<V>> children = new ArrayList<>(BranchNode.RADIX);
-    for (int i = 0; i < BranchNode.RADIX; ++i) {
+    final ArrayList<Node<V>> children = new ArrayList<>(RADIX);
+    for (int i = 0; i < RADIX; ++i) {
       if (nodeRLPs.nextIsNull()) {
         nodeRLPs.skipNext();
         children.add(NULL_NODE);
       } else if (nodeRLPs.nextIsList()) {
-        final Node<V> child = decode(location, nodeRLPs, errMessage);
+        final Node<V> child =
+            decode(
+                location == null ? null : Bytes.concatenate(location, Bytes.of((byte) i)),
+                nodeRLPs,
+                errMessage);
         children.add(child);
       } else {
         final Bytes32 childHash = nodeRLPs.readBytes32();
@@ -205,16 +221,19 @@ private BranchNode<V> decodeBranch(
       value = Optional.of(decodeValue(nodeRLPs, errMessage));
     }
 
-    return new BranchNode<>(children, value, this, valueSerializer);
+    return new BranchNode<>(location, children, value, this, valueSerializer);
   }
 
-  private LeafNode<V> decodeLeaf(
-      final Bytes path, final RLPInput valueRlp, final Supplier<String> errMessage) {
+  protected LeafNode<V> decodeLeaf(
+      final Bytes location,
+      final Bytes path,
+      final RLPInput valueRlp,
+      final Supplier<String> errMessage) {
     if (valueRlp.nextIsNull()) {
       throw new MerkleTrieException(errMessage.get() + ": leaf has null value");
     }
     final V value = decodeValue(valueRlp, errMessage);
-    return new LeafNode<>(path, value, this, valueSerializer);
+    return new LeafNode<>(location, path, value, this, valueSerializer);
   }
 
   @SuppressWarnings("unchecked")
diff --git a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/TrieNodeDecoder.java b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/TrieNodeDecoder.java
similarity index 95%
rename from ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/TrieNodeDecoder.java
rename to ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/TrieNodeDecoder.java
index af8215a0de4..3d99b7ffbec 100644
--- a/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/TrieNodeDecoder.java
+++ b/ethereum/trie/src/main/java/org/hyperledger/besu/ethereum/trie/patricia/TrieNodeDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -12,10 +12,14 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.trie;
+package org.hyperledger.besu.ethereum.trie.patricia;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
+import org.hyperledger.besu.ethereum.trie.Node;
+import org.hyperledger.besu.ethereum.trie.NodeLoader;
+import org.hyperledger.besu.ethereum.trie.NullNode;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -126,11 +130,6 @@ private static class BreadthFirstIterator implements Iterator<Node<Bytes>> {
           .ifPresent(currentNodes::add);
     }
 
-    public static BreadthFirstIterator create(
-        final NodeLoader nodeLoader, final Bytes32 rootHash, final int maxDepth) {
-      return new BreadthFirstIterator(nodeLoader, rootHash, maxDepth);
-    }
-
     @Override
     public boolean hasNext() {
       return !currentNodes.isEmpty() && currentDepth <= maxDepth;
diff --git a/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/AllNodesVisitorTest.java b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/AllNodesVisitorTest.java
index 733c0acb10f..a117335318e 100644
--- a/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/AllNodesVisitorTest.java
+++ b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/AllNodesVisitorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -17,6 +17,9 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.hyperledger.besu.ethereum.trie.patricia.BranchNode;
+import org.hyperledger.besu.ethereum.trie.patricia.ExtensionNode;
+
 import java.util.Collections;
 
 import org.junit.Test;
diff --git a/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/CompactEncodingTest.java b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/CompactEncodingTest.java
index 9e61abf3eeb..dabc5ca56bf 100644
--- a/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/CompactEncodingTest.java
+++ b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/CompactEncodingTest.java
@@ -37,8 +37,7 @@ public void bytesToPath() {
   public void shouldRoundTripFromBytesToPathAndBack() {
     final Random random = new Random(282943948928429484L);
     for (int i = 0; i < 1000; i++) {
-      final Bytes32 bytes =
-          Hash.keccak256(UInt256.valueOf(random.nextInt(Integer.MAX_VALUE)).toBytes());
+      final Bytes32 bytes = Hash.keccak256(UInt256.valueOf(random.nextInt(Integer.MAX_VALUE)));
       final Bytes path = CompactEncoding.bytesToPath(bytes);
       assertThat(CompactEncoding.pathToBytes(path)).isEqualTo(bytes);
     }
diff --git a/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/RangeStorageEntriesCollectorTest.java b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/RangeStorageEntriesCollectorTest.java
new file mode 100644
index 00000000000..da44b541c87
--- /dev/null
+++ b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/RangeStorageEntriesCollectorTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.trie;
+
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
+
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+public class RangeStorageEntriesCollectorTest {
+
+  @Test
+  public void shouldRetrieveAllLeavesInRangeWhenStartFromZero() {
+    InMemoryKeyValueStorage worldStateStorage = new InMemoryKeyValueStorage();
+    final MerkleTrie<Bytes, Bytes> accountStateTrie =
+        new StoredMerklePatriciaTrie<>(
+            (location, hash) -> worldStateStorage.get(hash.toArrayUnsafe()).map(Bytes::wrap),
+            b -> b,
+            b -> b);
+    final List<Bytes32> lists =
+        List.of(
+            Bytes32.rightPad(Bytes.of(1, 1, 3, 0)),
+            Bytes32.rightPad(Bytes.of(1, 1, 3, 1)),
+            Bytes32.rightPad(Bytes.of(1, 2, 0, 0)));
+    lists.forEach(bytes -> accountStateTrie.put(bytes, Bytes.of(1, 2, 3)));
+    Assertions.assertThat(
+            accountStateTrie.entriesFrom(Bytes32.rightPad(Bytes.of(0, 0, 0, 0)), 3).keySet())
+        .containsAll(lists);
+  }
+
+  @Test
+  public void shouldRetrieveAllLeavesInRangeWhenStartFromSpecificRange() {
+    InMemoryKeyValueStorage worldStateStorage = new InMemoryKeyValueStorage();
+    final MerkleTrie<Bytes, Bytes> accountStateTrie =
+        new StoredMerklePatriciaTrie<>(
+            (location, hash) -> worldStateStorage.get(hash.toArrayUnsafe()).map(Bytes::wrap),
+            b -> b,
+            b -> b);
+    final List<Bytes32> lists =
+        List.of(
+            Bytes32.rightPad(Bytes.of(1, 1, 3, 0)),
+            Bytes32.rightPad(Bytes.of(1, 1, 3, 1)),
+            Bytes32.rightPad(Bytes.of(1, 2, 0, 0)));
+    lists.forEach(bytes -> accountStateTrie.put(bytes, Bytes.of(1, 2, 3)));
+    Assertions.assertThat(
+            accountStateTrie.entriesFrom(Bytes32.rightPad(Bytes.of(1, 1, 2, 1)), 3).keySet())
+        .containsAll(lists);
+  }
+
+  @Test
+  public void shouldExcludeLeavesNotInRange() {
+    InMemoryKeyValueStorage worldStateStorage = new InMemoryKeyValueStorage();
+    final MerkleTrie<Bytes, Bytes> accountStateTrie =
+        new StoredMerklePatriciaTrie<>(
+            (location, hash) -> worldStateStorage.get(hash.toArrayUnsafe()).map(Bytes::wrap),
+            b -> b,
+            b -> b);
+    final List<Bytes32> lists =
+        List.of(
+            Bytes32.rightPad(Bytes.of(1, 1, 3, 0)),
+            Bytes32.rightPad(Bytes.of(1, 1, 3, 1)),
+            Bytes32.rightPad(Bytes.of(1, 2, 0, 0)));
+    lists.forEach(bytes -> accountStateTrie.put(bytes, Bytes.of(1, 2, 3)));
+    Assertions.assertThat(
+            accountStateTrie.entriesFrom(Bytes32.rightPad(Bytes.of(1, 1, 9, 9)), 1).keySet())
+        .contains(Bytes32.rightPad(Bytes.of(1, 2, 0, 0)));
+  }
+}
diff --git a/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/SnapPutVisitorTest.java b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/SnapPutVisitorTest.java
new file mode 100644
index 00000000000..76381d918a7
--- /dev/null
+++ b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/SnapPutVisitorTest.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.trie;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyByte;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.ethereum.trie.patricia.BranchNode;
+import org.hyperledger.besu.ethereum.trie.patricia.ExtensionNode;
+import org.hyperledger.besu.ethereum.trie.patricia.LeafNode;
+import org.hyperledger.besu.ethereum.trie.patricia.StoredNodeFactory;
+
+import java.util.ArrayList;
+import java.util.Optional;
+import java.util.function.Function;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+@SuppressWarnings("unchecked")
+public class SnapPutVisitorTest {
+
+  @Test
+  public void shouldDetectValidBranch() {
+    final StoredNodeFactory<Bytes> storedNodeFactory = mock(StoredNodeFactory.class);
+    when(storedNodeFactory.createBranch(any(), any()))
+        .thenReturn(
+            new LeafNode<Bytes>(
+                Bytes.EMPTY, Bytes.of(0x00), storedNodeFactory, Function.identity()));
+    final ArrayList<Node<Bytes>> children = new ArrayList<>();
+    for (int i = 0; i < 16; i++) {
+      children.add(new StoredNode<>(storedNodeFactory, Bytes.EMPTY, Hash.ZERO));
+    }
+    final BranchNode<Bytes> invalidBranchNode =
+        new BranchNode<>(
+            Bytes.EMPTY,
+            children,
+            Optional.of(Bytes.of(0x00)),
+            storedNodeFactory,
+            Function.identity());
+    final SnapPutVisitor<Bytes> snapPutVisitor =
+        new SnapPutVisitor<>(storedNodeFactory, Bytes.EMPTY);
+    Node<Bytes> visit =
+        snapPutVisitor.visit(invalidBranchNode, Bytes.of(CompactEncoding.LEAF_TERMINATOR));
+    Assertions.assertThat(visit.isHealNeeded()).isFalse();
+  }
+
+  @Test
+  public void shouldDetectBranchWithMissingChildren() {
+    final StoredNodeFactory<Bytes> storedNodeFactory = mock(StoredNodeFactory.class);
+    when(storedNodeFactory.createBranch(any(), any()))
+        .thenReturn(new MissingNode<>(Hash.ZERO, Bytes.EMPTY));
+    final ArrayList<Node<Bytes>> children = new ArrayList<>();
+    for (int i = 0; i < 16; i++) {
+      children.add(new StoredNode<>(storedNodeFactory, Bytes.EMPTY, Hash.ZERO));
+    }
+    final BranchNode<Bytes> invalidBranchNode =
+        new BranchNode<>(
+            Bytes.EMPTY,
+            children,
+            Optional.of(Bytes.of(0x00)),
+            storedNodeFactory,
+            Function.identity());
+    final SnapPutVisitor<Bytes> snapPutVisitor =
+        new SnapPutVisitor<>(storedNodeFactory, Bytes.EMPTY);
+    Node<Bytes> visit =
+        snapPutVisitor.visit(invalidBranchNode, Bytes.of(CompactEncoding.LEAF_TERMINATOR));
+    Assertions.assertThat(visit.isHealNeeded()).isTrue();
+  }
+
+  @Test
+  public void shouldDetectValidExtension() {
+    final StoredNodeFactory<Bytes> storedNodeFactory = mock(StoredNodeFactory.class);
+    when(storedNodeFactory.createBranch(any(), any()))
+        .thenReturn(
+            new LeafNode<>(Bytes.EMPTY, Bytes.of(0x00), storedNodeFactory, Function.identity()));
+    final ArrayList<Node<Bytes>> children = new ArrayList<>();
+    for (int i = 0; i < 16; i++) {
+      children.add(new StoredNode<>(storedNodeFactory, Bytes.EMPTY, Hash.ZERO));
+    }
+    final BranchNode<Bytes> invalidBranchNode =
+        new BranchNode<>(
+            Bytes.EMPTY,
+            children,
+            Optional.of(Bytes.of(0x00)),
+            storedNodeFactory,
+            Function.identity());
+    final SnapPutVisitor<Bytes> snapPutVisitor =
+        new SnapPutVisitor<>(storedNodeFactory, Bytes.EMPTY);
+    Node<Bytes> visit =
+        snapPutVisitor.visit(invalidBranchNode, Bytes.of(CompactEncoding.LEAF_TERMINATOR));
+    Assertions.assertThat(visit.isHealNeeded()).isFalse();
+  }
+
+  @Test
+  public void shouldDetectExtensionWithMissingChildren() {
+    final StoredNodeFactory<Bytes> storedNodeFactory = mock(StoredNodeFactory.class);
+    when(storedNodeFactory.createBranch(anyByte(), any(), anyByte(), any()))
+        .thenReturn(new MissingNode<>(Hash.ZERO, Bytes.EMPTY));
+    when(storedNodeFactory.createLeaf(any(), any()))
+        .thenReturn(new MissingNode<>(Hash.ZERO, Bytes.EMPTY));
+    final ExtensionNode<Bytes> invalidBranchNode =
+        new ExtensionNode<>(
+            Bytes.of(0x00),
+            new StoredNode<>(storedNodeFactory, Bytes.EMPTY, Hash.ZERO),
+            storedNodeFactory);
+    final SnapPutVisitor<Bytes> snapPutVisitor =
+        new SnapPutVisitor<>(storedNodeFactory, Bytes.EMPTY);
+    Node<Bytes> visit =
+        snapPutVisitor.visit(invalidBranchNode, Bytes.of(CompactEncoding.LEAF_TERMINATOR));
+    Assertions.assertThat(visit.isHealNeeded()).isTrue();
+  }
+}
diff --git a/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieIteratorTest.java b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieIteratorTest.java
index 132548db58e..b7220a3392a 100644
--- a/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieIteratorTest.java
+++ b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieIteratorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -20,13 +20,15 @@
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import org.hyperledger.besu.crypto.Hash;
 import org.hyperledger.besu.ethereum.trie.TrieIterator.LeafHandler;
 import org.hyperledger.besu.ethereum.trie.TrieIterator.State;
+import org.hyperledger.besu.ethereum.trie.patricia.DefaultNodeFactory;
+import org.hyperledger.besu.ethereum.trie.patricia.PutVisitor;
 
 import java.nio.charset.StandardCharsets;
 import java.util.NavigableSet;
@@ -45,6 +47,7 @@ public class TrieIteratorTest {
       Bytes32.fromHexString("0x5555555555555555555555555555555555555555555555555555555555555555");
   private static final Bytes32 KEY_HASH2 =
       Bytes32.fromHexString("0x5555555555555555555555555555555555555555555555555555555555555556");
+
   private static final Bytes PATH1 = bytesToPath(KEY_HASH1);
   private static final Bytes PATH2 = bytesToPath(KEY_HASH2);
 
@@ -71,7 +74,7 @@ public void shouldCallLeafHandlerWhenRootNodeIsALeaf() {
   public void shouldNotNotifyLeafHandlerOfNullNodes() {
     NullNode.<String>instance().accept(iterator, PATH1);
 
-    verifyZeroInteractions(leafHandler);
+    verifyNoInteractions(leafHandler);
   }
 
   @Test
@@ -125,7 +128,7 @@ public void shouldIterateArbitraryStructureAccurately() {
     final int stopNodeNumber = random.nextInt(Math.max(1, totalNodes - 1));
     for (int i = 0; i < totalNodes; i++) {
       final Bytes32 keyHash =
-          Hash.keccak256(UInt256.valueOf(Math.abs(random.nextLong())).toBytes());
+          Hash.keccak256(UInt256.valueOf(Math.abs(random.nextInt(Integer.MAX_VALUE))));
       root = root.accept(new PutVisitor<>(nodeFactory, "Value"), bytesToPath(keyHash));
       expectedKeyHashes.add(keyHash);
       if (i == startNodeNumber) {
diff --git a/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieNodeDecoderTest.java b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieNodeDecoderTest.java
index 581bbfd0341..1d654bf6d4c 100644
--- a/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieNodeDecoderTest.java
+++ b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieNodeDecoderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -16,6 +16,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
+import org.hyperledger.besu.ethereum.trie.patricia.TrieNodeDecoder;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
 import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
@@ -38,7 +40,7 @@ public void decodeNodes() {
     final InMemoryKeyValueStorage storage = new InMemoryKeyValueStorage();
 
     // Build a small trie
-    final MerklePatriciaTrie<Bytes, Bytes> trie =
+    final MerkleTrie<Bytes, Bytes> trie =
         new StoredMerklePatriciaTrie<>(
             new BytesToByteNodeLoader(storage), Function.identity(), Function.identity());
     trie.put(Bytes.fromHexString("0x100000"), Bytes.of(1));
@@ -82,7 +84,7 @@ public void breadthFirstDecode_smallTrie() {
     final InMemoryKeyValueStorage storage = new InMemoryKeyValueStorage();
 
     // Build a small trie
-    final MerklePatriciaTrie<Bytes, Bytes> trie =
+    final MerkleTrie<Bytes, Bytes> trie =
         new StoredMerklePatriciaTrie<>(
             new BytesToByteNodeLoader(storage), Function.identity(), Function.identity());
     trie.put(Bytes.fromHexString("0x100000"), Bytes.of(1));
@@ -153,7 +155,7 @@ public void breadthFirstDecode_partialTrie() {
     final InMemoryKeyValueStorage partialStorage = new InMemoryKeyValueStorage();
 
     // Build a small trie
-    final MerklePatriciaTrie<Bytes, Bytes> trie =
+    final MerkleTrie<Bytes, Bytes> trie =
         new StoredMerklePatriciaTrie<>(
             new BytesToByteNodeLoader(fullStorage), Function.identity(), Function.identity());
     final Random random = new Random(1);
@@ -177,7 +179,7 @@ public void breadthFirstDecode_partialTrie() {
 
     // Decode partially available trie
     final KeyValueStorageTransaction partialTx = partialStorage.startTransaction();
-    partialTx.put(trie.getRootHash().toArrayUnsafe(), rootNode.getRlp().toArrayUnsafe());
+    partialTx.put(trie.getRootHash().toArrayUnsafe(), rootNode.getEncodedBytes().toArrayUnsafe());
     partialTx.commit();
     final List<Node<Bytes>> allDecodableNodes =
         TrieNodeDecoder.breadthFirstDecoder(
@@ -191,7 +193,7 @@ public void breadthFirstDecode_partialTrie() {
   public void breadthFirstDecode_emptyTrie() {
     final List<Node<Bytes>> result =
         TrieNodeDecoder.breadthFirstDecoder(
-                (l, h) -> Optional.empty(), MerklePatriciaTrie.EMPTY_TRIE_NODE_HASH)
+                (l, h) -> Optional.empty(), MerkleTrie.EMPTY_TRIE_NODE_HASH)
             .collect(Collectors.toList());
     assertThat(result.size()).isEqualTo(0);
   }
@@ -200,7 +202,7 @@ public void breadthFirstDecode_emptyTrie() {
   public void breadthFirstDecode_singleNodeTrie() {
     final InMemoryKeyValueStorage storage = new InMemoryKeyValueStorage();
 
-    final MerklePatriciaTrie<Bytes, Bytes> trie =
+    final MerkleTrie<Bytes, Bytes> trie =
         new StoredMerklePatriciaTrie<>(
             new BytesToByteNodeLoader(storage), Function.identity(), Function.identity());
     trie.put(Bytes.fromHexString("0x100000"), Bytes.of(1));
diff --git a/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieRefTest.java b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieRefTest.java
deleted file mode 100644
index 3dc3c13d798..00000000000
--- a/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/TrieRefTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.ethereum.trie;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assume.assumeTrue;
-
-import org.hyperledger.besu.testutil.JsonTestParameters;
-
-import java.util.Collection;
-import java.util.function.Function;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class TrieRefTest {
-
-  private static final String[] TEST_CONFIG_FILES = {"TrieTests/trietest.json"};
-
-  private final TrieRefTestCaseSpec spec;
-
-  public TrieRefTest(final String name, final TrieRefTestCaseSpec spec, final boolean runTest) {
-    this.spec = spec;
-    assumeTrue("Test was blacklisted", runTest);
-  }
-
-  @Parameters(name = "Name: {0}")
-  public static Collection<Object[]> getTestParametersForConfig() {
-    return JsonTestParameters.create(TrieRefTestCaseSpec.class).generate(TEST_CONFIG_FILES);
-  }
-
-  @Test
-  public void rootHashAfterInsertionsAndRemovals() {
-    final SimpleMerklePatriciaTrie<Bytes, Bytes> trie =
-        new SimpleMerklePatriciaTrie<>(Function.identity());
-    for (final Bytes[] pair : spec.getIn()) {
-      if (pair[1] == null) {
-        trie.remove(pair[0]);
-      } else {
-        trie.put(pair[0], pair[1]);
-      }
-    }
-
-    assertThat(spec.getRoot()).isEqualTo(trie.getRootHash());
-  }
-}
diff --git a/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/AbstractMerklePatriciaTrieTest.java b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/patricia/AbstractMerklePatriciaTrieTest.java
similarity index 91%
rename from ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/AbstractMerklePatriciaTrieTest.java
rename to ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/patricia/AbstractMerklePatriciaTrieTest.java
index 6db7aff5c6f..d843b467f36 100644
--- a/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/AbstractMerklePatriciaTrieTest.java
+++ b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/patricia/AbstractMerklePatriciaTrieTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -12,12 +12,19 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.trie;
+package org.hyperledger.besu.ethereum.trie.patricia;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static junit.framework.TestCase.assertFalse;
 import static org.assertj.core.api.Assertions.assertThat;
-
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.hyperledger.besu.ethereum.trie.CompactEncoding;
+import org.hyperledger.besu.ethereum.trie.KeyValueMerkleStorage;
+import org.hyperledger.besu.ethereum.trie.MerkleStorage;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
+import org.hyperledger.besu.ethereum.trie.Node;
+import org.hyperledger.besu.ethereum.trie.Proof;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
 import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
 
@@ -30,14 +37,14 @@
 import org.junit.Test;
 
 public abstract class AbstractMerklePatriciaTrieTest {
-  protected MerklePatriciaTrie<Bytes, String> trie;
+  protected MerkleTrie<Bytes, String> trie;
 
   @Before
   public void setup() {
     trie = createTrie();
   }
 
-  protected abstract MerklePatriciaTrie<Bytes, String> createTrie();
+  protected abstract MerkleTrie<Bytes, String> createTrie();
 
   @Test
   public void emptyTreeReturnsEmpty() {
@@ -50,9 +57,10 @@ public void emptyTreeHasKnownRootHash() {
         .isEqualTo("0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421");
   }
 
-  @Test(expected = NullPointerException.class)
+  @Test
   public void throwsOnUpdateWithNull() {
-    trie.put(Bytes.EMPTY, null);
+    assertThatThrownBy(() -> trie.put(Bytes.EMPTY, (String) null))
+        .isInstanceOf(NullPointerException.class);
   }
 
   @Test
@@ -67,6 +75,18 @@ public void replaceSingleValue() {
     assertThat(trie.get(key)).isEqualTo(Optional.of(value2));
   }
 
+  @Test
+  public void replaceSingleValueWithPath() {
+    final Bytes key = Bytes.of(1);
+    final String value1 = "value1";
+    trie.putPath(CompactEncoding.bytesToPath(key), value1);
+    assertThat(trie.get(key)).isEqualTo(Optional.of(value1));
+
+    final String value2 = "value2";
+    trie.putPath(CompactEncoding.bytesToPath(key), value2);
+    assertThat(trie.get(key)).isEqualTo(Optional.of(value2));
+  }
+
   @Test
   public void hashChangesWhenSingleValueReplaced() {
     final Bytes key = Bytes.of(1);
diff --git a/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/SimpleMerklePatriciaTrieTest.java b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/patricia/SimpleMerklePatriciaTrieTest.java
similarity index 81%
rename from ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/SimpleMerklePatriciaTrieTest.java
rename to ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/patricia/SimpleMerklePatriciaTrieTest.java
index c303c636f91..33eecfd2286 100644
--- a/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/SimpleMerklePatriciaTrieTest.java
+++ b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/patricia/SimpleMerklePatriciaTrieTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -12,7 +12,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.trie;
+package org.hyperledger.besu.ethereum.trie.patricia;
+
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
 
 import java.nio.charset.Charset;
 
@@ -20,7 +22,7 @@
 
 public class SimpleMerklePatriciaTrieTest extends AbstractMerklePatriciaTrieTest {
   @Override
-  protected MerklePatriciaTrie<Bytes, String> createTrie() {
+  protected MerkleTrie<Bytes, String> createTrie() {
     return new SimpleMerklePatriciaTrie<>(
         value -> (value != null) ? Bytes.wrap(value.getBytes(Charset.forName("UTF-8"))) : null);
   }
diff --git a/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/StoredMerklePatriciaTrieTest.java b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/patricia/StoredMerklePatriciaTrieTest.java
similarity index 93%
rename from ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/StoredMerklePatriciaTrieTest.java
rename to ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/patricia/StoredMerklePatriciaTrieTest.java
index 5276caa268e..40bef52fe4d 100644
--- a/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/StoredMerklePatriciaTrieTest.java
+++ b/ethereum/trie/src/test/java/org/hyperledger/besu/ethereum/trie/patricia/StoredMerklePatriciaTrieTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -12,10 +12,13 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.trie;
+package org.hyperledger.besu.ethereum.trie.patricia;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.hyperledger.besu.ethereum.trie.KeyValueMerkleStorage;
+import org.hyperledger.besu.ethereum.trie.MerkleStorage;
+import org.hyperledger.besu.ethereum.trie.MerkleTrie;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
 import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
 
@@ -34,7 +37,7 @@ public class StoredMerklePatriciaTrieTest extends AbstractMerklePatriciaTrieTest
   private Function<Bytes, String> valueDeserializer;
 
   @Override
-  protected MerklePatriciaTrie<Bytes, String> createTrie() {
+  protected MerkleTrie<Bytes, String> createTrie() {
     keyValueStore = new InMemoryKeyValueStorage();
     merkleStorage = new KeyValueMerkleStorage(keyValueStore);
     valueSerializer =
diff --git a/ethereum/verkletrie/build.gradle b/ethereum/verkletrie/build.gradle
new file mode 100644
index 00000000000..0ca780ba88d
--- /dev/null
+++ b/ethereum/verkletrie/build.gradle
@@ -0,0 +1,57 @@
+/*
+ * Copyright Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+apply plugin: 'java-library'
+
+jar {
+  archiveBaseName = 'besu-verkletrie'
+  manifest {
+    attributes(
+      'Specification-Title': archiveBaseName,
+      'Specification-Version': project.version,
+      'Implementation-Title': archiveBaseName,
+      'Implementation-Version': calculateVersion()
+      )
+  }
+}
+
+dependencies {
+  implementation project(':crypto:algorithms')
+  implementation project(':ethereum:rlp')
+  implementation project(':ethereum:trie')
+
+  implementation "org.immutables:value-annotations"
+  implementation 'com.google.guava:guava'
+  implementation 'io.opentelemetry:opentelemetry-api'
+  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-units'
+  implementation 'org.bouncycastle:bcprov-jdk15on'
+  implementation 'org.hyperledger.besu:ipa-multipoint'
+
+  annotationProcessor "org.immutables:value"
+
+  testImplementation project(':services:kvstore')
+  testImplementation project(':testutil')
+
+  testImplementation 'com.fasterxml.jackson.core:jackson-databind'
+  testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
+  testImplementation 'junit:junit'
+  testImplementation 'org.apache.tuweni:tuweni-units'
+  testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
+  testImplementation 'org.mockito:mockito-core'
+
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
+}
diff --git a/ethereum/verkletrie/src/main/java/org/hyperledger/besu/ethereum/verkletrie/bandersnatch/Point.java b/ethereum/verkletrie/src/main/java/org/hyperledger/besu/ethereum/verkletrie/bandersnatch/Point.java
new file mode 100644
index 00000000000..18f9dcc8afd
--- /dev/null
+++ b/ethereum/verkletrie/src/main/java/org/hyperledger/besu/ethereum/verkletrie/bandersnatch/Point.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.verkletrie.bandersnatch;
+
+import org.hyperledger.besu.ethereum.verkletrie.bandersnatch.fp.Element;
+
+import java.nio.ByteOrder;
+
+import org.apache.tuweni.bytes.Bytes32;
+
+public class Point {
+
+  public static final Point EMPTY = new Point(Element.ZERO, Element.ZERO, Element.ZERO);
+  public static final Point IDENTITY = new Point(Element.ZERO, Element.ONE, Element.ONE);
+  public final Element x;
+  public final Element y;
+  public final Element z;
+
+  public Point(final Element x, final Element y, final Element z) {
+    this.x = x;
+    this.y = y;
+    this.z = z;
+  }
+
+  @Override
+  public String toString() {
+    return "Point{" + "x=" + x + ", y=" + y + ", z=" + z + '}';
+  }
+
+  public Bytes32 mapToBaseFieldBytes() {
+    Element res = x.divide(y);
+    return res.getBytes(ByteOrder.LITTLE_ENDIAN);
+  }
+
+  public Bytes32 bytes() {
+    PointAffine affineRepresentation = PointAffine.fromProj(this);
+    Element x = affineRepresentation.x;
+    if (!affineRepresentation.y.lexicographicallyLargest()) {
+      x = x.neg();
+    }
+    return x.getBytes(ByteOrder.BIG_ENDIAN);
+  }
+}
diff --git a/ethereum/verkletrie/src/main/java/org/hyperledger/besu/ethereum/verkletrie/bandersnatch/PointAffine.java b/ethereum/verkletrie/src/main/java/org/hyperledger/besu/ethereum/verkletrie/bandersnatch/PointAffine.java
new file mode 100644
index 00000000000..400fa4fbeba
--- /dev/null
+++ b/ethereum/verkletrie/src/main/java/org/hyperledger/besu/ethereum/verkletrie/bandersnatch/PointAffine.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.verkletrie.bandersnatch;
+
+import org.hyperledger.besu.ethereum.verkletrie.bandersnatch.fp.Element;
+
+public class PointAffine {
+
+  final Element x;
+  final Element y;
+
+  public PointAffine(final Element x, final Element y) {
+    this.x = x;
+    this.y = y;
+  }
+
+  public static PointAffine fromProj(final Point point) {
+    return new PointAffine(point.x.divide(point.z), point.y.divide(point.z));
+  }
+}
diff --git a/ethereum/verkletrie/src/main/java/org/hyperledger/besu/ethereum/verkletrie/bandersnatch/fp/Element.java b/ethereum/verkletrie/src/main/java/org/hyperledger/besu/ethereum/verkletrie/bandersnatch/fp/Element.java
new file mode 100644
index 00000000000..02d2e43b9f8
--- /dev/null
+++ b/ethereum/verkletrie/src/main/java/org/hyperledger/besu/ethereum/verkletrie/bandersnatch/fp/Element.java
@@ -0,0 +1,526 @@
+/*
+ * Copyright Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.verkletrie.bandersnatch.fp;
+
+import java.math.BigInteger;
+import java.nio.ByteOrder;
+import java.util.Objects;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.bytes.MutableBytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+
+public class Element {
+  public static final Element ZERO = new Element(UInt256.ZERO);
+  public static final Element ONE;
+  static final Element Q_MODULUS;
+  private static final Element R_SQUARE;
+
+  static {
+    {
+      // z0, z1, z2 and z3 represent the 4 limbs of element
+      // `1` in Montgomery form.
+      UInt256 z0 = UInt256.valueOf(8589934590L);
+      UInt256 z1 = UInt256.valueOf(6378425256633387010L).shiftLeft(64);
+      UInt256 z2 = UInt256.valueOf(new BigInteger("11064306276430008309", 10)).shiftLeft(128);
+      UInt256 z3 = UInt256.valueOf(1739710354780652911L).shiftLeft(192);
+      ONE = new Element(z0.add(z1).add(z2).add(z3));
+    }
+    {
+      UInt256 z0 = UInt256.valueOf(new BigInteger("18446744069414584321", 10));
+      UInt256 z1 = UInt256.valueOf(new BigInteger("6034159408538082302", 10)).shiftLeft(64);
+      UInt256 z2 = UInt256.valueOf(new BigInteger("3691218898639771653", 10)).shiftLeft(128);
+      UInt256 z3 = UInt256.valueOf(new BigInteger("8353516859464449352", 10)).shiftLeft(192);
+      Q_MODULUS = new Element(z0.add(z1).add(z2).add(z3));
+    }
+    {
+      UInt256 z0 = UInt256.valueOf(new BigInteger("14526898881837571181", 10));
+      UInt256 z1 = UInt256.valueOf(new BigInteger("3129137299524312099", 10)).shiftLeft(64);
+      UInt256 z2 = UInt256.valueOf(new BigInteger("419701826671360399", 10)).shiftLeft(128);
+      UInt256 z3 = UInt256.valueOf(new BigInteger("524908885293268753", 10)).shiftLeft(192);
+      R_SQUARE = new Element(z0.add(z1).add(z2).add(z3));
+    }
+  }
+
+  public static Element random() {
+    UInt256 value = UInt256.fromBytes(Bytes32.random());
+    UInt256 divisor = UInt256.fromBytes(Bytes32.rightPad(Q_MODULUS.value.slice(8)));
+    value = value.mod(divisor);
+
+    if (value.greaterThan(Q_MODULUS.value)) {
+      value = value.subtract(Q_MODULUS.value);
+    }
+    return new Element(value);
+  }
+
+  final UInt256 value;
+
+  public Element(final UInt256 value) {
+    this.value = value;
+  }
+
+  public static Element fromBytes(final Bytes data, final ByteOrder byteOrder) {
+    return new Element(
+        UInt256.fromBytes(byteOrder == ByteOrder.BIG_ENDIAN ? data : data.reverse()));
+  }
+
+  public boolean biggerModulus() {
+    return value.greaterOrEqualThan(Q_MODULUS.value);
+  }
+
+  public Element inverse() {
+    if (isZero()) {
+      return new Element(UInt256.ZERO);
+    }
+    UInt256 u = Q_MODULUS.value;
+    UInt256 s = R_SQUARE.value;
+    UInt256 v = value;
+    UInt256 r = UInt256.ZERO;
+    while (true) {
+      while ((v.getLong(24) & 1L) == 0) {
+        v = v.shiftRight(1);
+        if ((s.getLong(24) & 1L) == 1) {
+          s = s.add(Q_MODULUS.value);
+        }
+        s = s.shiftRight(1);
+      }
+      while ((u.getLong(24) & 1L) == 0) {
+        u = u.shiftRight(1);
+        if ((r.getLong(24) & 1L) == 1) {
+          r = r.add(Q_MODULUS.value);
+        }
+        r = r.shiftRight(1);
+      }
+      boolean bigger = v.greaterOrEqualThan(u);
+      if (bigger) {
+        v = v.subtract(u);
+        UInt256 oldS = s;
+        s = s.subtract(r);
+        if (s.greaterThan(oldS)) {
+          s = s.add(Q_MODULUS.value);
+        }
+
+      } else {
+        u = u.subtract(v);
+        UInt256 oldR = r;
+        r = r.subtract(s);
+        if (r.greaterThan(oldR)) {
+          r = r.add(Q_MODULUS.value);
+        }
+      }
+      if (u.getLong(24) == 1L && u.shiftRight(8).equals(UInt256.ZERO)) {
+        return new Element(r);
+      }
+      if (v.getLong(24) == 1L && v.shiftRight(8).equals(UInt256.ZERO)) {
+        return new Element(s);
+      }
+    }
+  }
+
+  public Element neg() {
+    if (isZero()) {
+      return this;
+    }
+    return new Element(Q_MODULUS.value.subtract(this.value));
+  }
+
+  public byte[] limb(final int i) {
+    return value.slice(32 - (i + 1) * 8, 8).toArrayUnsafe();
+  }
+
+  public boolean isZero() {
+    return value.isZero();
+  }
+
+  public Element divide(final Element b) {
+    Element bInv = b.inverse();
+    return this.multiply(bInv);
+  }
+
+  private UInt256 madd0(final UInt256 a, final UInt256 b, final UInt256 c) {
+    UInt256 product = a.multiply(b).add(c);
+    return product;
+  }
+
+  private UInt256 madd1(final UInt256 a, final UInt256 b, final UInt256 c) {
+    UInt256 product = a.multiply(b).add(c);
+    return product;
+  }
+
+  private UInt256 madd2(final UInt256 a, final UInt256 b, final UInt256 c, final UInt256 d) {
+    UInt256 product = a.multiply(b).add(c).add(d);
+    return product;
+  }
+
+  private UInt256 madd3(
+      final UInt256 a, final UInt256 b, final UInt256 c, final UInt256 d, final UInt256 e) {
+    UInt256 product = a.multiply(b);
+    product = product.add(c).add(d);
+    product = product.add(e.shiftLeft(64));
+    return product;
+  }
+
+  private UInt256 limb(final UInt256 value, final int index) {
+    return UInt256.fromBytes(Bytes32.leftPad(value.slice(32 - (index + 1) * 8, 8)));
+  }
+
+  private UInt256 setLimb(final UInt256 value, final UInt256 limb, final int index) {
+    MutableBytes32 mutable = value.toBytes().mutableCopy();
+    mutable.set(32 - (index + 1) * 8, limb.slice(24, 8));
+    return UInt256.fromBytes(mutable);
+  }
+
+  public Element multiply(final Element y) {
+
+    UInt256 t = UInt256.ZERO;
+    UInt256 c;
+
+    // round 0
+    {
+      // v := x[0]
+      UInt256 v = limb(this.value, 0);
+      // c[1], c[0] = bits.Mul64(v, y[0])
+      UInt256 tempC = v.multiply(limb(y.value, 0));
+      c = setLimb(UInt256.ZERO, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      // m := c[0] * 18446744069414584319
+      UInt256 constant = UInt256.valueOf(new BigInteger("18446744069414584319", 10));
+      UInt256 c0 = limb(c, 0);
+      UInt256 m = limb(constant.multiply(c0), 0);
+
+      // c[2] = madd0(m, 18446744069414584321, c[0])
+      UInt256 c2 =
+          madd0(m, UInt256.valueOf(new BigInteger("18446744069414584321", 10)), limb(c, 0));
+      c = setLimb(c, limb(c2, 1), 2);
+      // c[1], c[0] = madd1(v, y[1], c[1])
+      tempC = madd1(v, limb(y.value, 1), limb(c, 1));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      // c[2], t[0] = madd2(m, 6034159408538082302, c[2], c[0])
+      tempC =
+          madd2(
+              m,
+              UInt256.valueOf(new BigInteger("6034159408538082302", 10)),
+              limb(c, 2),
+              limb(c, 0));
+      c = setLimb(c, limb(tempC, 1), 2);
+      t = setLimb(t, limb(tempC, 0), 0);
+      // c[1], c[0] = madd1(v, y[2], c[1])
+      tempC = madd1(v, limb(y.value, 2), limb(c, 1));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      // c[2], t[1] = madd2(m, 3691218898639771653, c[2], c[0])
+      tempC =
+          madd2(
+              m,
+              UInt256.valueOf(new BigInteger("3691218898639771653", 10)),
+              limb(c, 2),
+              limb(c, 0));
+      c = setLimb(c, limb(tempC, 1), 2);
+      t = setLimb(t, limb(tempC, 0), 1);
+      // c[1], c[0] = madd1(v, y[3], c[1])
+      tempC = madd1(v, limb(y.value, 3), limb(c, 1));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      // t[3], t[2] = madd3(m, 8353516859464449352, c[0], c[2], c[1])
+      tempC =
+          madd3(
+              m,
+              UInt256.valueOf(new BigInteger("8353516859464449352", 10)),
+              limb(c, 0),
+              limb(c, 2),
+              limb(c, 1));
+      t = setLimb(t, limb(tempC, 1), 3);
+      t = setLimb(t, limb(tempC, 0), 2);
+    }
+    // round 1
+    {
+      UInt256 v = limb(this.value, 1);
+      // c[1], c[0] = madd1(v, y[0], t[0])
+      UInt256 tempC = madd1(v, limb(y.value, 0), limb(t, 0));
+      c = setLimb(UInt256.ZERO, limb(tempC, 0), 0);
+      c = setLimb(c, limb(tempC, 1), 1);
+      // m := c[0] * 18446744069414584319
+      UInt256 m =
+          setLimb(
+              UInt256.ZERO,
+              limb(
+                  UInt256.valueOf(new BigInteger("18446744069414584319", 10)).multiply(limb(c, 0)),
+                  0),
+              0);
+      //		c[2] = madd0(m, 18446744069414584321, c[0])
+      UInt256 c2 =
+          madd0(m, UInt256.valueOf(new BigInteger("18446744069414584321", 10)), limb(c, 0));
+      c = setLimb(c, limb(c2, 1), 2);
+      //		c[1], c[0] = madd2(v, y[1], c[1], t[1])
+      tempC = madd2(v, limb(y.value, 1), limb(c, 1), limb(t, 1));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      //		c[2], t[0] = madd2(m, 6034159408538082302, c[2], c[0])
+      tempC =
+          madd2(
+              m,
+              UInt256.valueOf(new BigInteger("6034159408538082302", 10)),
+              limb(c, 2),
+              limb(c, 0));
+      c = setLimb(c, limb(tempC, 1), 2);
+      t = setLimb(t, limb(tempC, 0), 0);
+      //		c[1], c[0] = madd2(v, y[2], c[1], t[2])
+      tempC = madd2(v, limb(y.value, 2), limb(c, 1), limb(t, 2));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      //		c[2], t[1] = madd2(m, 3691218898639771653, c[2], c[0])
+      tempC =
+          madd2(
+              m,
+              UInt256.valueOf(new BigInteger("3691218898639771653", 10)),
+              limb(c, 2),
+              limb(c, 0));
+      c = setLimb(c, limb(tempC, 1), 2);
+      t = setLimb(t, limb(tempC, 0), 1);
+      //		c[1], c[0] = madd2(v, y[3], c[1], t[3])
+      tempC = madd2(v, limb(y.value, 3), limb(c, 1), limb(t, 3));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+
+      //		t[3], t[2] = madd3(m, 8353516859464449352, c[0], c[2], c[1])
+      tempC =
+          madd3(
+              m,
+              UInt256.valueOf(new BigInteger("8353516859464449352", 10)),
+              limb(c, 0),
+              limb(c, 2),
+              limb(c, 1));
+      t = setLimb(t, limb(tempC, 1), 3);
+      t = setLimb(t, limb(tempC, 0), 2);
+    }
+    // round 2
+    {
+      // v := x[2]
+      UInt256 v = limb(this.value, 2);
+      //		c[1], c[0] = madd1(v, y[0], t[0])
+      UInt256 tempC = madd1(v, limb(y.value, 0), limb(t, 0));
+      c = setLimb(UInt256.ZERO, limb(tempC, 0), 0);
+      c = setLimb(c, limb(tempC, 1), 1);
+      //		m := c[0] * 18446744069414584319
+      UInt256 m =
+          setLimb(
+              UInt256.ZERO,
+              limb(c, 0).multiply(UInt256.valueOf(new BigInteger("18446744069414584319", 10))),
+              0);
+      //		c[2] = madd0(m, 18446744069414584321, c[0])
+      UInt256 c2 =
+          madd0(m, UInt256.valueOf(new BigInteger("18446744069414584321", 10)), limb(c, 0));
+      c = setLimb(c, limb(c2, 1), 2);
+      //		c[1], c[0] = madd2(v, y[1], c[1], t[1])
+      tempC = madd2(v, limb(y.value, 1), limb(c, 1), limb(t, 1));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      //		c[2], t[0] = madd2(m, 6034159408538082302, c[2], c[0])
+      tempC =
+          madd2(
+              m,
+              UInt256.valueOf(new BigInteger("6034159408538082302", 10)),
+              limb(c, 2),
+              limb(c, 0));
+      c = setLimb(c, limb(tempC, 1), 2);
+      t = setLimb(t, limb(tempC, 0), 0);
+      //		c[1], c[0] = madd2(v, y[2], c[1], t[2])
+      tempC = madd2(v, limb(y.value, 2), limb(c, 1), limb(t, 2));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      //		c[2], t[1] = madd2(m, 3691218898639771653, c[2], c[0])
+      tempC =
+          madd2(
+              m,
+              UInt256.valueOf(new BigInteger("3691218898639771653", 10)),
+              limb(c, 2),
+              limb(c, 0));
+      c = setLimb(c, limb(tempC, 1), 2);
+      t = setLimb(t, limb(tempC, 0), 1);
+      //		c[1], c[0] = madd2(v, y[3], c[1], t[3])
+      tempC = madd2(v, limb(y.value, 3), limb(c, 1), limb(t, 3));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      //		t[3], t[2] = madd3(m, 8353516859464449352, c[0], c[2], c[1])
+      tempC =
+          madd3(
+              m,
+              UInt256.valueOf(new BigInteger("8353516859464449352", 10)),
+              limb(c, 0),
+              limb(c, 2),
+              limb(c, 1));
+      t = setLimb(t, limb(tempC, 1), 3);
+      t = setLimb(t, limb(tempC, 0), 2);
+    }
+    // round 3
+    {
+      // v := x[3]
+      UInt256 v = limb(this.value, 3);
+      //		c[1], c[0] = madd1(v, y[0], t[0])
+      UInt256 tempC = madd1(v, limb(y.value, 0), limb(t, 0));
+      c = setLimb(UInt256.ZERO, limb(tempC, 0), 0);
+      c = setLimb(c, limb(tempC, 1), 1);
+      //		m := c[0] * 18446744069414584319
+      UInt256 m =
+          setLimb(
+              UInt256.ZERO,
+              limb(c, 0).multiply(UInt256.valueOf(new BigInteger("18446744069414584319", 10))),
+              0);
+      //		c[2] = madd0(m, 18446744069414584321, c[0])
+      UInt256 c2 =
+          madd0(m, UInt256.valueOf(new BigInteger("18446744069414584321", 10)), limb(c, 0));
+      c = setLimb(c, limb(c2, 1), 2);
+      //		c[1], c[0] = madd2(v, y[1], c[1], t[1])
+      tempC = madd2(v, limb(y.value, 1), limb(c, 1), limb(t, 1));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      //		c[2], z[0] = madd2(m, 6034159408538082302, c[2], c[0])
+      tempC =
+          madd2(
+              m,
+              UInt256.valueOf(new BigInteger("6034159408538082302", 10)),
+              limb(c, 2),
+              limb(c, 0));
+      c = setLimb(c, limb(tempC, 1), 2);
+      t = setLimb(t, limb(tempC, 0), 0);
+      //		c[1], c[0] = madd2(v, y[2], c[1], t[2])
+      tempC = madd2(v, limb(y.value, 2), limb(c, 1), limb(t, 2));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      //		c[2], z[1] = madd2(m, 3691218898639771653, c[2], c[0])
+      tempC =
+          madd2(
+              m,
+              UInt256.valueOf(new BigInteger("3691218898639771653", 10)),
+              limb(c, 2),
+              limb(c, 0));
+      c = setLimb(c, limb(tempC, 1), 2);
+      t = setLimb(t, limb(tempC, 0), 1);
+      //		c[1], c[0] = madd2(v, y[3], c[1], t[3])
+      tempC = madd2(v, limb(y.value, 3), limb(c, 1), limb(t, 3));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      //		z[3], z[2] = madd3(m, 8353516859464449352, c[0], c[2], c[1])
+      tempC =
+          madd3(
+              m,
+              UInt256.valueOf(new BigInteger("8353516859464449352", 10)),
+              limb(c, 0),
+              limb(c, 2),
+              limb(c, 1));
+      t = setLimb(t, limb(tempC, 1), 3);
+      t = setLimb(t, limb(tempC, 0), 2);
+    }
+
+    if (t.greaterThan(Q_MODULUS.value)) {
+      t = t.subtract(Q_MODULUS.value);
+    }
+
+    return new Element(t);
+  }
+
+  public boolean lexicographicallyLargest() {
+    return value.greaterThan((Q_MODULUS.value.subtract(1)).divide(2));
+  }
+
+  public Bytes32 getValue(final ByteOrder byteOrder) {
+    if (byteOrder == ByteOrder.BIG_ENDIAN) {
+      return this.value;
+    } else {
+      return (Bytes32) this.value.reverse();
+    }
+  }
+
+  public Bytes32 getBytes(final ByteOrder byteOrder) {
+    Element toRegular = fromMontgomery();
+    if (byteOrder == ByteOrder.BIG_ENDIAN) {
+      return toRegular.value;
+    } else {
+      return (Bytes32) toRegular.value.reverse();
+    }
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    Element element = (Element) o;
+    return Objects.equals(value, element.value);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(value);
+  }
+
+  @Override
+  public String toString() {
+    return "Element{" + "value=" + value + '}';
+  }
+
+  private UInt256 add(final UInt256 z) {
+    UInt256 mutableZ = z;
+    // m = z[0]n'[0] mod W
+    // m := z[0] * 18446744069414584319
+    UInt256 z0 = limb(mutableZ, 0);
+    UInt256 m =
+        setLimb(
+            UInt256.ZERO,
+            UInt256.valueOf(new BigInteger("18446744069414584319", 10)).multiply(z0),
+            0);
+    // C := madd0(m, 18446744069414584321, z[0])
+    UInt256 tempC = madd0(m, limb(Q_MODULUS.value, 0), limb(mutableZ, 0));
+    UInt256 c = setLimb(UInt256.ZERO, limb(tempC, 1), 0);
+    // C, z[0] = madd2(m, 6034159408538082302, z[1], C)
+    tempC = madd2(m, limb(Q_MODULUS.value, 1), limb(mutableZ, 1), c);
+    c = setLimb(c, limb(tempC, 1), 0);
+    mutableZ = setLimb(mutableZ, limb(tempC, 0), 0);
+    // C, z[1] = madd2(m, 3691218898639771653, z[2], C)
+    tempC = madd2(m, limb(Q_MODULUS.value, 2), limb(mutableZ, 2), c);
+    c = setLimb(c, limb(tempC, 1), 0);
+    mutableZ = setLimb(mutableZ, limb(tempC, 0), 1);
+    // C, z[2] = madd2(m, 8353516859464449352, z[3], C)
+    tempC = madd2(m, limb(Q_MODULUS.value, 3), limb(mutableZ, 3), c);
+    c = setLimb(c, limb(tempC, 1), 0);
+    mutableZ = setLimb(mutableZ, limb(tempC, 0), 2);
+    // z[3] = C
+    mutableZ = setLimb(mutableZ, limb(c, 0), 3);
+    return mutableZ;
+  }
+
+  /**
+   * fromMontgomery converts the element from Montgomery to regular representation sets and returns
+   * z = z * 1
+   *
+   * @return z * 1
+   */
+  public Element fromMontgomery() {
+    UInt256 calc = add(this.value);
+    calc = add(calc);
+    calc = add(calc);
+    calc = add(calc);
+
+    if (calc.greaterThan(Q_MODULUS.value)) {
+      return new Element(calc.subtract(Q_MODULUS.value));
+    }
+    return new Element(calc);
+  }
+
+  public Element toMontgomery() {
+    return multiply(Element.R_SQUARE);
+  }
+}
diff --git a/ethereum/verkletrie/src/main/java/org/hyperledger/besu/ethereum/verkletrie/bandersnatch/fr/Element.java b/ethereum/verkletrie/src/main/java/org/hyperledger/besu/ethereum/verkletrie/bandersnatch/fr/Element.java
new file mode 100644
index 00000000000..8fd84f7041a
--- /dev/null
+++ b/ethereum/verkletrie/src/main/java/org/hyperledger/besu/ethereum/verkletrie/bandersnatch/fr/Element.java
@@ -0,0 +1,508 @@
+/*
+ * Copyright Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.verkletrie.bandersnatch.fr;
+
+import java.math.BigInteger;
+import java.nio.ByteOrder;
+import java.util.Objects;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.bytes.MutableBytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+
+public class Element {
+  public static final Element ZERO = new Element(UInt256.ZERO);
+  public static final Element ONE;
+  static final Element Q_MODULUS;
+  private static final Element R_SQUARE;
+
+  static {
+    {
+      UInt256 z0 = UInt256.valueOf(new BigInteger("6347764673676886264", 10));
+      UInt256 z1 = UInt256.valueOf(new BigInteger("253265890806062196", 10)).shiftLeft(64);
+      UInt256 z2 = UInt256.valueOf(new BigInteger("11064306276430008312", 10)).shiftLeft(128);
+      UInt256 z3 = UInt256.valueOf(new BigInteger("1739710354780652911", 10)).shiftLeft(192);
+      ONE = new Element(z0.add(z1).add(z2).add(z3));
+    }
+    {
+      UInt256 z0 = UInt256.valueOf(new BigInteger("8429901452645165025", 10));
+      UInt256 z1 = UInt256.valueOf(new BigInteger("18415085837358793841", 10)).shiftLeft(64);
+      UInt256 z2 = UInt256.valueOf(new BigInteger("922804724659942912", 10)).shiftLeft(128);
+      UInt256 z3 = UInt256.valueOf(new BigInteger("2088379214866112338", 10)).shiftLeft(192);
+      Q_MODULUS = new Element(z0.add(z1).add(z2).add(z3));
+    }
+    {
+      UInt256 z0 = UInt256.valueOf(new BigInteger("15831548891076708299", 10));
+      UInt256 z1 = UInt256.valueOf(new BigInteger("4682191799977818424", 10)).shiftLeft(64);
+      UInt256 z2 = UInt256.valueOf(new BigInteger("12294384630081346794", 10)).shiftLeft(128);
+      UInt256 z3 = UInt256.valueOf(new BigInteger("785759240370973821", 10)).shiftLeft(192);
+      R_SQUARE = new Element(z0.add(z1).add(z2).add(z3));
+    }
+  }
+
+  public static Element random() {
+    UInt256 value = UInt256.fromBytes(Bytes32.random());
+    UInt256 divisor = UInt256.fromBytes(Bytes32.rightPad(Q_MODULUS.value.slice(8)));
+    value = value.mod(divisor);
+
+    if (value.greaterThan(Q_MODULUS.value)) {
+      value = value.subtract(Q_MODULUS.value);
+    }
+    return new Element(value);
+  }
+
+  final UInt256 value;
+
+  public Element(final UInt256 value) {
+    this.value = value;
+  }
+
+  public static Element fromBytes(final Bytes data, final ByteOrder byteOrder) {
+    return new Element(
+        UInt256.fromBytes(byteOrder == ByteOrder.BIG_ENDIAN ? data : data.reverse()));
+  }
+
+  public boolean biggerModulus() {
+    return value.greaterOrEqualThan(Q_MODULUS.value);
+  }
+
+  public Element inverse() {
+    if (isZero()) {
+      return new Element(UInt256.ZERO);
+    }
+    UInt256 u = Q_MODULUS.value;
+    UInt256 s = R_SQUARE.value;
+    UInt256 v = value;
+    UInt256 r = UInt256.ZERO;
+    while (true) {
+      while ((v.getLong(24) & 1L) == 0) {
+        v = v.shiftRight(1);
+        if ((s.getLong(24) & 1L) == 1) {
+          s = s.add(Q_MODULUS.value);
+        }
+        s = s.shiftRight(1);
+      }
+      while ((u.getLong(24) & 1L) == 0) {
+        u = u.shiftRight(1);
+        if ((r.getLong(24) & 1L) == 1) {
+          r = r.add(Q_MODULUS.value);
+        }
+        r = r.shiftRight(1);
+      }
+      boolean bigger = v.greaterOrEqualThan(u);
+      if (bigger) {
+        v = v.subtract(u);
+        UInt256 oldS = s;
+        s = s.subtract(r);
+        if (s.greaterThan(oldS)) {
+          s = s.add(Q_MODULUS.value);
+        }
+
+      } else {
+        u = u.subtract(v);
+        UInt256 oldR = r;
+        r = r.subtract(s);
+        if (r.greaterThan(oldR)) {
+          r = r.add(Q_MODULUS.value);
+        }
+      }
+      if (u.getLong(24) == 1L && u.shiftRight(8).equals(UInt256.ZERO)) {
+        return new Element(r);
+      }
+      if (v.getLong(24) == 1L && v.shiftRight(8).equals(UInt256.ZERO)) {
+        return new Element(s);
+      }
+    }
+  }
+
+  public Element neg() {
+    if (isZero()) {
+      return this;
+    }
+    return new Element(Q_MODULUS.value.subtract(this.value));
+  }
+
+  public byte[] limb(final int i) {
+    return value.slice(32 - (i + 1) * 8, 8).toArrayUnsafe();
+  }
+
+  public boolean isZero() {
+    return value.isZero();
+  }
+
+  public Element divide(final Element b) {
+    Element bInv = b.inverse();
+    return this.multiply(bInv);
+  }
+
+  private UInt256 madd0(final UInt256 a, final UInt256 b, final UInt256 c) {
+    UInt256 product = a.multiply(b).add(c);
+    return product;
+  }
+
+  private UInt256 madd1(final UInt256 a, final UInt256 b, final UInt256 c) {
+    UInt256 product = a.multiply(b).add(c);
+    return product;
+  }
+
+  private UInt256 madd2(final UInt256 a, final UInt256 b, final UInt256 c, final UInt256 d) {
+    UInt256 product = a.multiply(b).add(c).add(d);
+    return product;
+  }
+
+  private UInt256 madd3(
+      final UInt256 a, final UInt256 b, final UInt256 c, final UInt256 d, final UInt256 e) {
+    UInt256 product = a.multiply(b);
+    product = product.add(c).add(d);
+    product = product.add(e.shiftLeft(64));
+    return product;
+  }
+
+  private UInt256 limb(final UInt256 value, final int index) {
+    return UInt256.fromBytes(Bytes32.leftPad(value.slice(32 - (index + 1) * 8, 8)));
+  }
+
+  private UInt256 setLimb(final UInt256 value, final UInt256 limb, final int index) {
+    MutableBytes32 mutable = value.toBytes().mutableCopy();
+    mutable.set(32 - (index + 1) * 8, limb.slice(24, 8));
+    return UInt256.fromBytes(mutable);
+  }
+
+  public Element multiply(final Element y) {
+
+    UInt256 t = UInt256.ZERO;
+    UInt256 c;
+
+    // round 0
+    {
+      // v := x[0]
+      UInt256 v = limb(this.value, 0);
+      // c[1], c[0] = bits.Mul64(v, y[0])
+      UInt256 tempC = v.multiply(limb(y.value, 0));
+      c = setLimb(UInt256.ZERO, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      // m := c[0] * 17410672245482742751
+      UInt256 constant = UInt256.valueOf(new BigInteger("17410672245482742751", 10));
+      UInt256 c0 = limb(c, 0);
+      UInt256 m = limb(constant.multiply(c0), 0);
+
+      // c[2] = madd0(m, 8429901452645165025, c[0])
+      UInt256 c2 = madd0(m, UInt256.valueOf(new BigInteger("8429901452645165025", 10)), limb(c, 0));
+      c = setLimb(c, limb(c2, 1), 2);
+      // c[1], c[0] = madd1(v, y[1], c[1])
+      tempC = madd1(v, limb(y.value, 1), limb(c, 1));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      // c[2], t[0] = madd2(m, 18415085837358793841, c[2], c[0])
+      tempC =
+          madd2(
+              m,
+              UInt256.valueOf(new BigInteger("18415085837358793841", 10)),
+              limb(c, 2),
+              limb(c, 0));
+      c = setLimb(c, limb(tempC, 1), 2);
+      t = setLimb(t, limb(tempC, 0), 0);
+      // c[1], c[0] = madd1(v, y[2], c[1])
+      tempC = madd1(v, limb(y.value, 2), limb(c, 1));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      // c[2], t[1] = madd2(m, 922804724659942912, c[2], c[0])
+      tempC =
+          madd2(
+              m, UInt256.valueOf(new BigInteger("922804724659942912", 10)), limb(c, 2), limb(c, 0));
+      c = setLimb(c, limb(tempC, 1), 2);
+      t = setLimb(t, limb(tempC, 0), 1);
+      // c[1], c[0] = madd1(v, y[3], c[1])
+      tempC = madd1(v, limb(y.value, 3), limb(c, 1));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      // t[3], t[2] = madd3(m, 2088379214866112338, c[0], c[2], c[1])
+      tempC =
+          madd3(
+              m,
+              UInt256.valueOf(new BigInteger("2088379214866112338", 10)),
+              limb(c, 0),
+              limb(c, 2),
+              limb(c, 1));
+      t = setLimb(t, limb(tempC, 1), 3);
+      t = setLimb(t, limb(tempC, 0), 2);
+    }
+    // round 1
+    {
+      UInt256 v = limb(this.value, 1);
+      // c[1], c[0] = madd1(v, y[0], t[0])
+      UInt256 tempC = madd1(v, limb(y.value, 0), limb(t, 0));
+      c = setLimb(UInt256.ZERO, limb(tempC, 0), 0);
+      c = setLimb(c, limb(tempC, 1), 1);
+      // m := c[0] * 17410672245482742751
+      UInt256 m =
+          setLimb(
+              UInt256.ZERO,
+              limb(
+                  UInt256.valueOf(new BigInteger("17410672245482742751", 10)).multiply(limb(c, 0)),
+                  0),
+              0);
+      //		c[2] = madd0(m, 8429901452645165025, c[0])
+      UInt256 c2 = madd0(m, UInt256.valueOf(new BigInteger("8429901452645165025", 10)), limb(c, 0));
+      c = setLimb(c, limb(c2, 1), 2);
+      //		c[1], c[0] = madd2(v, y[1], c[1], t[1])
+      tempC = madd2(v, limb(y.value, 1), limb(c, 1), limb(t, 1));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      //		c[2], t[0] = madd2(m, 18415085837358793841, c[2], c[0])
+      tempC =
+          madd2(
+              m,
+              UInt256.valueOf(new BigInteger("18415085837358793841", 10)),
+              limb(c, 2),
+              limb(c, 0));
+      c = setLimb(c, limb(tempC, 1), 2);
+      t = setLimb(t, limb(tempC, 0), 0);
+      //		c[1], c[0] = madd2(v, y[2], c[1], t[2])
+      tempC = madd2(v, limb(y.value, 2), limb(c, 1), limb(t, 2));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      //		c[2], t[1] = madd2(m, 922804724659942912, c[2], c[0])
+      tempC =
+          madd2(
+              m, UInt256.valueOf(new BigInteger("922804724659942912", 10)), limb(c, 2), limb(c, 0));
+      c = setLimb(c, limb(tempC, 1), 2);
+      t = setLimb(t, limb(tempC, 0), 1);
+      //		c[1], c[0] = madd2(v, y[3], c[1], t[3])
+      tempC = madd2(v, limb(y.value, 3), limb(c, 1), limb(t, 3));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+
+      //		t[3], t[2] = madd3(m, 2088379214866112338, c[0], c[2], c[1])
+      tempC =
+          madd3(
+              m,
+              UInt256.valueOf(new BigInteger("2088379214866112338", 10)),
+              limb(c, 0),
+              limb(c, 2),
+              limb(c, 1));
+      t = setLimb(t, limb(tempC, 1), 3);
+      t = setLimb(t, limb(tempC, 0), 2);
+    }
+    // round 2
+    {
+      // v := x[2]
+      UInt256 v = limb(this.value, 2);
+      //		c[1], c[0] = madd1(v, y[0], t[0])
+      UInt256 tempC = madd1(v, limb(y.value, 0), limb(t, 0));
+      c = setLimb(UInt256.ZERO, limb(tempC, 0), 0);
+      c = setLimb(c, limb(tempC, 1), 1);
+      //		m := c[0] * 17410672245482742751
+      UInt256 m =
+          setLimb(
+              UInt256.ZERO,
+              limb(c, 0).multiply(UInt256.valueOf(new BigInteger("17410672245482742751", 10))),
+              0);
+      //		c[2] = madd0(m, 8429901452645165025, c[0])
+      UInt256 c2 = madd0(m, UInt256.valueOf(new BigInteger("8429901452645165025", 10)), limb(c, 0));
+      c = setLimb(c, limb(c2, 1), 2);
+      //		c[1], c[0] = madd2(v, y[1], c[1], t[1])
+      tempC = madd2(v, limb(y.value, 1), limb(c, 1), limb(t, 1));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      //		c[2], t[0] = madd2(m, 18415085837358793841, c[2], c[0])
+      tempC =
+          madd2(
+              m,
+              UInt256.valueOf(new BigInteger("18415085837358793841", 10)),
+              limb(c, 2),
+              limb(c, 0));
+      c = setLimb(c, limb(tempC, 1), 2);
+      t = setLimb(t, limb(tempC, 0), 0);
+      //		c[1], c[0] = madd2(v, y[2], c[1], t[2])
+      tempC = madd2(v, limb(y.value, 2), limb(c, 1), limb(t, 2));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      //		c[2], t[1] = madd2(m, 922804724659942912, c[2], c[0])
+      tempC =
+          madd2(
+              m, UInt256.valueOf(new BigInteger("922804724659942912", 10)), limb(c, 2), limb(c, 0));
+      c = setLimb(c, limb(tempC, 1), 2);
+      t = setLimb(t, limb(tempC, 0), 1);
+      //		c[1], c[0] = madd2(v, y[3], c[1], t[3])
+      tempC = madd2(v, limb(y.value, 3), limb(c, 1), limb(t, 3));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      //		t[3], t[2] = madd3(m, 2088379214866112338, c[0], c[2], c[1])
+      tempC =
+          madd3(
+              m,
+              UInt256.valueOf(new BigInteger("2088379214866112338", 10)),
+              limb(c, 0),
+              limb(c, 2),
+              limb(c, 1));
+      t = setLimb(t, limb(tempC, 1), 3);
+      t = setLimb(t, limb(tempC, 0), 2);
+    }
+    // round 3
+    {
+      // v := x[3]
+      UInt256 v = limb(this.value, 3);
+      //		c[1], c[0] = madd1(v, y[0], t[0])
+      UInt256 tempC = madd1(v, limb(y.value, 0), limb(t, 0));
+      c = setLimb(UInt256.ZERO, limb(tempC, 0), 0);
+      c = setLimb(c, limb(tempC, 1), 1);
+      //		m := c[0] * 17410672245482742751
+      UInt256 m =
+          setLimb(
+              UInt256.ZERO,
+              limb(c, 0).multiply(UInt256.valueOf(new BigInteger("17410672245482742751", 10))),
+              0);
+      //		c[2] = madd0(m, 8429901452645165025, c[0])
+      UInt256 c2 = madd0(m, UInt256.valueOf(new BigInteger("8429901452645165025", 10)), limb(c, 0));
+      c = setLimb(c, limb(c2, 1), 2);
+      //		c[1], c[0] = madd2(v, y[1], c[1], t[1])
+      tempC = madd2(v, limb(y.value, 1), limb(c, 1), limb(t, 1));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      //		c[2], z[0] = madd2(m, 18415085837358793841, c[2], c[0])
+      tempC =
+          madd2(
+              m,
+              UInt256.valueOf(new BigInteger("18415085837358793841", 10)),
+              limb(c, 2),
+              limb(c, 0));
+      c = setLimb(c, limb(tempC, 1), 2);
+      t = setLimb(t, limb(tempC, 0), 0);
+      //		c[1], c[0] = madd2(v, y[2], c[1], t[2])
+      tempC = madd2(v, limb(y.value, 2), limb(c, 1), limb(t, 2));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      //		c[2], z[1] = madd2(m, 922804724659942912, c[2], c[0])
+      tempC =
+          madd2(
+              m, UInt256.valueOf(new BigInteger("922804724659942912", 10)), limb(c, 2), limb(c, 0));
+      c = setLimb(c, limb(tempC, 1), 2);
+      t = setLimb(t, limb(tempC, 0), 1);
+      //		c[1], c[0] = madd2(v, y[3], c[1], t[3])
+      tempC = madd2(v, limb(y.value, 3), limb(c, 1), limb(t, 3));
+      c = setLimb(c, limb(tempC, 1), 1);
+      c = setLimb(c, limb(tempC, 0), 0);
+      //		z[3], z[2] = madd3(m, 2088379214866112338, c[0], c[2], c[1])
+      tempC =
+          madd3(
+              m,
+              UInt256.valueOf(new BigInteger("2088379214866112338", 10)),
+              limb(c, 0),
+              limb(c, 2),
+              limb(c, 1));
+      t = setLimb(t, limb(tempC, 1), 3);
+      t = setLimb(t, limb(tempC, 0), 2);
+    }
+
+    if (t.greaterThan(Q_MODULUS.value)) {
+      t = t.subtract(Q_MODULUS.value);
+    }
+
+    return new Element(t);
+  }
+
+  public boolean lexicographicallyLargest() {
+    return value.greaterThan((Q_MODULUS.value.subtract(1)).divide(2));
+  }
+
+  public Bytes32 getValue(final ByteOrder byteOrder) {
+    if (byteOrder == ByteOrder.BIG_ENDIAN) {
+      return this.value;
+    } else {
+      return (Bytes32) this.value.reverse();
+    }
+  }
+
+  public Bytes32 getBytes(final ByteOrder byteOrder) {
+    Element toRegular = fromMontgomery();
+    if (byteOrder == ByteOrder.BIG_ENDIAN) {
+      return toRegular.value;
+    } else {
+      return (Bytes32) toRegular.value.reverse();
+    }
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    Element element = (Element) o;
+    return Objects.equals(value, element.value);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(value);
+  }
+
+  @Override
+  public String toString() {
+    return "Element{" + "value=" + value + '}';
+  }
+
+  private UInt256 add(final UInt256 z) {
+    UInt256 mutableZ = z;
+    // m = z[0]n'[0] mod W
+    // m := z[0] * 17410672245482742751
+    UInt256 z0 = limb(mutableZ, 0);
+    UInt256 m =
+        setLimb(
+            UInt256.ZERO,
+            UInt256.valueOf(new BigInteger("17410672245482742751", 10)).multiply(z0),
+            0);
+    // C := madd0(m, 8429901452645165025, z[0])
+    UInt256 tempC = madd0(m, limb(Q_MODULUS.value, 0), limb(mutableZ, 0));
+    UInt256 c = setLimb(UInt256.ZERO, limb(tempC, 1), 0);
+    // C, z[0] = madd2(m, 18415085837358793841, z[1], C)
+    tempC = madd2(m, limb(Q_MODULUS.value, 1), limb(mutableZ, 1), c);
+    c = setLimb(c, limb(tempC, 1), 0);
+    mutableZ = setLimb(mutableZ, limb(tempC, 0), 0);
+    // C, z[1] = madd2(m, 922804724659942912, z[2], C)
+    tempC = madd2(m, limb(Q_MODULUS.value, 2), limb(mutableZ, 2), c);
+    c = setLimb(c, limb(tempC, 1), 0);
+    mutableZ = setLimb(mutableZ, limb(tempC, 0), 1);
+    // C, z[2] = madd2(m, 2088379214866112338, z[3], C)
+    tempC = madd2(m, limb(Q_MODULUS.value, 3), limb(mutableZ, 3), c);
+    c = setLimb(c, limb(tempC, 1), 0);
+    mutableZ = setLimb(mutableZ, limb(tempC, 0), 2);
+    // z[3] = C
+    mutableZ = setLimb(mutableZ, limb(c, 0), 3);
+    return mutableZ;
+  }
+
+  /**
+   * fromMontgomery converts the element from Montgomery to regular representation sets and returns
+   * z = z * 1
+   *
+   * @return z * 1
+   */
+  public Element fromMontgomery() {
+    UInt256 calc = add(this.value);
+    calc = add(calc);
+    calc = add(calc);
+    calc = add(calc);
+
+    if (calc.greaterThan(Q_MODULUS.value)) {
+      return new Element(calc.subtract(Q_MODULUS.value));
+    }
+    return new Element(calc);
+  }
+
+  public Element toMontgomery() {
+    return multiply(R_SQUARE);
+  }
+}
diff --git a/ethereum/verkletrie/src/test/java/org/hyperledger/besu/ethereum/verkletrie/bandersnatch/fp/ElementTest.java b/ethereum/verkletrie/src/test/java/org/hyperledger/besu/ethereum/verkletrie/bandersnatch/fp/ElementTest.java
new file mode 100644
index 00000000000..fe3fcb00827
--- /dev/null
+++ b/ethereum/verkletrie/src/test/java/org/hyperledger/besu/ethereum/verkletrie/bandersnatch/fp/ElementTest.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.verkletrie.bandersnatch.fp;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.math.BigInteger;
+
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.Test;
+
+public class ElementTest {
+
+  @Test
+  public void testIsZero() {
+    assertThat(Element.ZERO.isZero()).isTrue();
+    assertThat(Element.ONE.isZero()).isFalse();
+    assertThat(new Element(UInt256.valueOf(42L)).isZero()).isFalse();
+  }
+
+  @Test
+  public void testInverseZero() {
+    Element elt = Element.ZERO;
+    assertThat(elt.inverse()).isEqualTo(elt);
+  }
+
+  @Test
+  public void testInverse42() {
+    assertThat(new Element(UInt256.valueOf(42L)).inverse())
+        .isEqualTo(
+            new Element(
+                UInt256.fromHexString(
+                    "3fa8731a5789261bc0c32da675b6100c6bd8289edea72861d409c282e75503ba")));
+  }
+
+  @Test
+  public void testInverseOverQ() {
+    assertThat(new Element(Element.Q_MODULUS.value.add(1)).inverse())
+        .isEqualTo(
+            new Element(
+                UInt256.fromHexString(
+                    "0748d9d99f59ff1105d314967254398f2b6cedcb87925c23c999e990f3f29c6d")));
+  }
+
+  @Test
+  public void testRandom() {
+    assertThat(Element.random().value.lessOrEqualThan(Element.Q_MODULUS.value)).isTrue();
+  }
+
+  @Test
+  public void testDivide() {
+    Element x =
+        new Element(
+            UInt256.fromHexString(
+                "73eda753299d7d433339d80809a1d80253bda402fffe5bfcfffffffefffffff3"));
+    Element y =
+        new Element(
+            UInt256.fromHexString(
+                "73eda753299d7d753339d80809a1d7d553bda402fffe5c1cfffffffeffffffe9"));
+    assertThat(x.divide(y))
+        .isEqualTo(
+            new Element(
+                UInt256.fromHexString(
+                    "42291ebda05409e31e85f7061384f4066381dbac31023c5f2609827a639d6ddc")));
+  }
+
+  @Test
+  public void testMultiply() {
+    Element x =
+        new Element(
+            UInt256.fromHexString(
+                "73eda753299d7d433339d80809a1d80253bda402fffe5bfcfffffffefffffff3"));
+    Element y =
+        new Element(
+            UInt256.fromHexString(
+                "73eda753299d7d753339d80809a1d7d553bda402fffe5c1cfffffffeffffffe9"));
+    assertThat(x.multiply(y))
+        .isEqualTo(
+            new Element(
+                UInt256.fromHexString(
+                    "addbab1d634d4bbc1c11001562f72e2a24caa1b482c2f2038b3a8d46bf1416f")));
+  }
+
+  @Test
+  public void testNeg() {
+    Element x =
+        new Element(
+            UInt256.fromHexString(
+                "05f98ae63ff2eb86b466cc60a939dd4adaeed3599e3ad7a34694ff6dbf518a76"));
+    Element result = x.neg();
+    assertThat(result.value)
+        .isEqualTo(
+            UInt256.fromHexString(
+                "6df41c6ce9aa91c17ed30ba76067faba78ced0a961c3845bb96b009140ae758b"));
+  }
+
+  @Test
+  public void testNegOverQ() {
+    Element x =
+        new Element(
+            UInt256.fromHexString(
+                "73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000002"));
+    Element result = x.neg();
+    assertThat(result.value)
+        .isEqualTo(
+            UInt256.fromHexString(
+                "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"));
+  }
+
+  @Test
+  public void testNegZero() {
+    Element x = Element.ZERO;
+    Element result = x.neg();
+    assertThat(result.value).isEqualTo(Element.ZERO.value);
+  }
+
+  @Test
+  public void testNegOne() {
+    Element x = new Element(UInt256.ONE);
+    Element result = x.neg();
+    assertThat(result.value)
+        .isEqualTo(
+            UInt256.fromHexString(
+                "73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000000"));
+  }
+
+  @Test
+  public void testFromMont() {
+    Element x =
+        new Element(
+            UInt256.fromHexString(
+                "73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000002"));
+    Element result = x.fromMontgomery();
+    assertThat(result.value)
+        .isEqualTo(
+            UInt256.fromHexString(
+                "1bbe869330009d577204078a4f77266aab6fca8f09dc705f13f75b69fe75c040"));
+  }
+
+  @Test
+  public void testToMont() {
+    Element x =
+        new Element(
+            UInt256.fromHexString(
+                "73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000002"));
+    Element result = x.toMontgomery();
+    assertThat(result.value)
+        .isEqualTo(
+            UInt256.fromHexString(
+                "0x1824b159acc5056f998c4fefecbc4ff55884b7fa0003480200000001fffffffe"));
+  }
+
+  @Test
+  public void testToMont2() {
+    Element before =
+        new Element(
+            UInt256.valueOf(new BigInteger("999881962499998002", 10))
+                .add(UInt256.valueOf(new BigInteger("0", 10)).shiftLeft(64))
+                .add(UInt256.valueOf(new BigInteger("1", 10)).shiftLeft(128))
+                .add(UInt256.valueOf(new BigInteger("0", 10)).shiftLeft(192)));
+    Element expected =
+        new Element(
+            UInt256.valueOf(new BigInteger("479530773443910689", 10))
+                .add(UInt256.valueOf(new BigInteger("6571075494204656015", 10)).shiftLeft(64))
+                .add(UInt256.valueOf(new BigInteger("12714171422618877016", 10)).shiftLeft(128))
+                .add(UInt256.valueOf(new BigInteger("1309675183017776880", 10)).shiftLeft(192)));
+    assertThat(before.toMontgomery()).isEqualTo(expected);
+  }
+
+  //  @Test
+  //  public void testToMont3() {
+  //    Element before =
+  //        new Element(
+  //            UInt256.valueOf(new BigInteger("6121572481584493354", 10))
+  //                .add(UInt256.valueOf(new BigInteger("12601925224297426022", 10)).shiftLeft(64))
+  //                .add(UInt256.valueOf(new BigInteger("7716030069200636218", 10)).shiftLeft(128))
+  //                .add(UInt256.valueOf(new BigInteger("1351674413095362254",
+  // 10)).shiftLeft(192)));
+  //    Element expected =
+  //        new Element(
+  //            UInt256.valueOf(new BigInteger("479530773443910689", 10))
+  //                .add(UInt256.valueOf(new BigInteger("6571075494204656015", 10)).shiftLeft(64))
+  //                .add(UInt256.valueOf(new BigInteger("12714171422618877016", 10)).shiftLeft(128))
+  //                .add(UInt256.valueOf(new BigInteger("1309675183017776880",
+  // 10)).shiftLeft(192)));
+  //    assertThat(before.toMontgomery()).isEqualTo(expected);
+  //  }
+
+  @Test
+  public void testSetBytes() {
+    Element x =
+        new Element(
+            UInt256.fromHexString(
+                "0000000000000000000000000000000100000000000000000de04b58e8220132"));
+    Element expected =
+        new Element(
+            UInt256.valueOf(new BigInteger("999881962499998002", 10))
+                .add(UInt256.valueOf(new BigInteger("0", 10)).shiftLeft(64))
+                .add(UInt256.valueOf(new BigInteger("1", 10)).shiftLeft(128))
+                .add(UInt256.valueOf(new BigInteger("0", 10)).shiftLeft(192)));
+    assertThat(x).isEqualTo(expected);
+    Element result = x.toMontgomery();
+    assertThat(result.value)
+        .isEqualTo(
+            UInt256.fromHexString(
+                "122ce6a3d6eb56f0b071cf8bda9efc585b312658d057c98f06a7a2b2a1fe1c21"));
+  }
+}
diff --git a/ethereum/verkletrie/src/test/java/org/hyperledger/besu/ethereum/verkletrie/bandersnatch/fr/ElementTest.java b/ethereum/verkletrie/src/test/java/org/hyperledger/besu/ethereum/verkletrie/bandersnatch/fr/ElementTest.java
new file mode 100644
index 00000000000..ef7c1923327
--- /dev/null
+++ b/ethereum/verkletrie/src/test/java/org/hyperledger/besu/ethereum/verkletrie/bandersnatch/fr/ElementTest.java
@@ -0,0 +1,199 @@
+/*
+ * Copyright Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.ethereum.verkletrie.bandersnatch.fr;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.math.BigInteger;
+
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.Test;
+
+public class ElementTest {
+
+  @Test
+  public void testIsZero() {
+    assertThat(Element.ZERO.isZero()).isTrue();
+    assertThat(Element.ONE.isZero()).isFalse();
+    assertThat(new Element(UInt256.valueOf(42L)).isZero()).isFalse();
+  }
+
+  @Test
+  public void testInverseZero() {
+    Element elt = Element.ZERO;
+    assertThat(elt.inverse()).isEqualTo(elt);
+  }
+
+  @Test
+  public void testInverse42() {
+    assertThat(new Element(UInt256.valueOf(42L)).inverse())
+        .isEqualTo(
+            new Element(
+                UInt256.fromHexString(
+                    "2546c9a92adbd3384fa236bec5cec2a385f743ac23217035cd355920b19e79b")));
+  }
+
+  @Test
+  public void testInverseOverQ() {
+    assertThat(new Element(Element.Q_MODULUS.value.add(1)).inverse())
+        .isEqualTo(
+            new Element(
+                UInt256.fromHexString(
+                    "0ae793ddb14aec7daa9e6daec0055cea40fa7ca27fecb938dbb4f5d658db47cb")));
+  }
+
+  @Test
+  public void testRandom() {
+    assertThat(Element.random().value.lessOrEqualThan(Element.Q_MODULUS.value)).isTrue();
+  }
+
+  @Test
+  public void testDivide() {
+    Element x =
+        new Element(
+            UInt256.fromHexString(
+                "73eda753299d7d433339d80809a1d80253bda402fffe5bfcfffffffefffffff3"));
+    Element y =
+        new Element(
+            UInt256.fromHexString(
+                "73eda753299d7d753339d80809a1d7d553bda402fffe5c1cfffffffeffffffe9"));
+    assertThat(x.divide(y))
+        .isEqualTo(
+            new Element(
+                UInt256.fromHexString(
+                    "14d7b4f7f22fb5688cab25906b04691b468a5397997285ab6ef862deae100957")));
+  }
+
+  @Test
+  public void testMultiply() {
+    Element x =
+        new Element(
+            UInt256.fromHexString(
+                "73eda753299d7d433339d80809a1d80253bda402fffe5bfcfffffffefffffff3"));
+    Element y =
+        new Element(
+            UInt256.fromHexString(
+                "73eda753299d7d753339d80809a1d7d553bda402fffe5c1cfffffffeffffffe9"));
+    assertThat(x.multiply(y))
+        .isEqualTo(
+            new Element(
+                UInt256.fromHexString(
+                    "209ee057659143a392a0e135c23c3dee1f96f11ebf6151699193e4a29141e0fd")));
+  }
+
+  @Test
+  public void testNeg() {
+    Element x =
+        new Element(
+            UInt256.fromHexString(
+                "0000000000000000000000000000000000000000000000000000000000000001"));
+    Element result = x.neg();
+    assertThat(result.value)
+        .isEqualTo(
+            UInt256.fromHexString(
+                "1cfb69d4ca675f520cce760202687600ff8f87007419047174fd06b52876e7e0"));
+  }
+
+  @Test
+  public void testNegOverQ() {
+    Element x =
+        new Element(
+            UInt256.fromHexString(
+                "73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000002"));
+    Element result = x.neg();
+    assertThat(result.value)
+        .isEqualTo(
+            UInt256.fromHexString(
+                "a90dc281a0c9e209d9949df9f8c69dfbabd1e2fd741aa87274fd06b62876e7df"));
+  }
+
+  @Test
+  public void testNegZero() {
+    Element x = Element.ZERO;
+    Element result = x.neg();
+    assertThat(result.value).isEqualTo(Element.ZERO.value);
+  }
+
+  @Test
+  public void testNegOne() {
+    Element x = new Element(UInt256.ONE);
+    Element result = x.neg();
+    assertThat(result.value)
+        .isEqualTo(
+            UInt256.fromHexString(
+                "0x1cfb69d4ca675f520cce760202687600ff8f87007419047174fd06b52876e7e0"));
+  }
+
+  @Test
+  public void testFromMont() {
+    Element x =
+        new Element(
+            UInt256.fromHexString(
+                "73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000002"));
+    Element result = x.fromMontgomery();
+    assertThat(result.value)
+        .isEqualTo(
+            UInt256.fromHexString(
+                "029dcd39374fa1ed499348e004ce8e397648170983b64e150042fce1ccb70b7d"));
+  }
+
+  @Test
+  public void testToMont() {
+    Element x =
+        new Element(
+            UInt256.fromHexString(
+                "73eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000002"));
+    Element result = x.toMontgomery();
+    assertThat(result.value)
+        .isEqualTo(
+            UInt256.fromHexString(
+                "ff2df0939978a11eb3730340bb816b35def26d563fd67125f62b5942d4903e8"));
+  }
+
+  @Test
+  public void testToMont2() {
+    Element before =
+        new Element(
+            UInt256.valueOf(new BigInteger("999881962499998002", 10))
+                .add(UInt256.valueOf(new BigInteger("0", 10)).shiftLeft(64))
+                .add(UInt256.valueOf(new BigInteger("1", 10)).shiftLeft(128))
+                .add(UInt256.valueOf(new BigInteger("0", 10)).shiftLeft(192)));
+    Element expected =
+        new Element(
+            UInt256.fromHexString(
+                "12c21cb79c889ece6b14d87776efc93aaee3083940486c6654f431bd0fa6732a"));
+    assertThat(before.toMontgomery()).isEqualTo(expected);
+  }
+
+  @Test
+  public void testSetBytes() {
+    Element x =
+        new Element(
+            UInt256.fromHexString(
+                "0000000000000000000000000000000100000000000000000de04b58e8220132"));
+    Element expected =
+        new Element(
+            UInt256.valueOf(new BigInteger("999881962499998002", 10))
+                .add(UInt256.valueOf(new BigInteger("0", 10)).shiftLeft(64))
+                .add(UInt256.valueOf(new BigInteger("1", 10)).shiftLeft(128))
+                .add(UInt256.valueOf(new BigInteger("0", 10)).shiftLeft(192)));
+    assertThat(x).isEqualTo(expected);
+    Element result = x.toMontgomery();
+    assertThat(result.value)
+        .isEqualTo(
+            UInt256.fromHexString(
+                "12c21cb79c889ece6b14d87776efc93aaee3083940486c6654f431bd0fa6732a"));
+  }
+}
diff --git a/evm/build.gradle b/evm/build.gradle
new file mode 100644
index 00000000000..dd8760c1079
--- /dev/null
+++ b/evm/build.gradle
@@ -0,0 +1,71 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+apply plugin: 'java-library'
+apply plugin: 'idea'
+
+jar {
+  archiveBaseName = 'besu-evm'
+  manifest {
+    attributes(
+      'Specification-Title': archiveBaseName,
+      'Specification-Version': project.version,
+      'Implementation-Title': archiveBaseName,
+      'Implementation-Version': calculateVersion(),
+      'Automatic-Module-Name': 'org.hyperledger.besu.evm'
+      )
+  }
+}
+
+dependencies {
+  api 'org.slf4j:slf4j-api'
+
+  implementation project(':crypto:algorithms')
+  implementation project(':datatypes')
+  implementation project(':ethereum:rlp')
+
+  implementation 'com.github.ben-manes.caffeine:caffeine'
+  implementation 'com.google.guava:guava'
+  implementation 'net.java.dev.jna:jna'
+  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-units'
+  implementation 'org.hyperledger.besu:arithmetic'
+  implementation 'org.hyperledger.besu:bls12-381'
+  implementation 'tech.pegasys:jc-kzg-4844'
+
+  compileOnly 'com.fasterxml.jackson.core:jackson-databind'
+
+  testImplementation 'com.fasterxml.jackson.core:jackson-databind'
+  testImplementation 'info.picocli:picocli'
+  testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
+  testImplementation 'org.mockito:mockito-core'
+  testImplementation 'org.mockito:mockito-junit-jupiter'
+
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
+}
+
+publishing {
+  publications {
+    mavenJava(MavenPublication) {
+      groupId 'org.hyperledger.besu'
+      pom {
+        name = 'Besu EVM'
+        description = 'EVM Engine component'
+      }
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/AccessListEntry.java b/evm/src/main/java/org/hyperledger/besu/evm/AccessListEntry.java
new file mode 100644
index 00000000000..76243295bd6
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/AccessListEntry.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm;
+
+import org.hyperledger.besu.datatypes.Address;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+/** The Access list entry. */
+public class AccessListEntry {
+  private final Address address;
+  private final List<Bytes32> storageKeys;
+
+  /**
+   * Instantiates a new Access list entry.
+   *
+   * @param address the address
+   * @param storageKeys the storage keys
+   */
+  public AccessListEntry(final Address address, final List<Bytes32> storageKeys) {
+    this.address = address;
+    this.storageKeys = storageKeys;
+  }
+
+  /**
+   * Create access list entry.
+   *
+   * @param address the address
+   * @param storageKeys the storage keys
+   * @return the access list entry
+   */
+  @JsonCreator
+  public static AccessListEntry createAccessListEntry(
+      @JsonProperty("address") final Address address,
+      @JsonProperty("storageKeys") final List<String> storageKeys) {
+    return new AccessListEntry(
+        address, storageKeys.stream().map(Bytes32::fromHexString).collect(Collectors.toList()));
+  }
+
+  /**
+   * Gets address.
+   *
+   * @return the address
+   */
+  @JsonIgnore
+  public Address getAddress() {
+    return address;
+  }
+
+  /**
+   * Gets storage keys.
+   *
+   * @return the storage keys
+   */
+  @JsonIgnore
+  public List<Bytes32> getStorageKeys() {
+    return storageKeys;
+  }
+
+  /**
+   * Gets address string.
+   *
+   * @return the address string in hex format
+   */
+  @JsonProperty("address")
+  public String getAddressString() {
+    return address.toHexString();
+  }
+
+  /**
+   * Gets storage keys string.
+   *
+   * @return the list of storage keys in hex format
+   */
+  @JsonProperty("storageKeys")
+  public List<String> getStorageKeysString() {
+    return storageKeys.stream().map(Bytes::toHexString).collect(Collectors.toList());
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/Code.java b/evm/src/main/java/org/hyperledger/besu/evm/Code.java
new file mode 100644
index 00000000000..3ccb87c3a10
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/Code.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.evm.code.CodeSection;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** Represents EVM code associated with an account. */
+public interface Code {
+
+  /**
+   * Size of the code in bytes. This is for the whole container, not just the code section in
+   * formats that have sections.
+   *
+   * @return size of code in bytes.
+   */
+  int getSize();
+
+  /**
+   * Get the bytes for the entire container, for example what EXTCODECOPY would want. For V0 it is
+   * the same as getCodeBytes, for V1 it is the entire container, not just the data section.
+   *
+   * @return container bytes.
+   */
+  Bytes getBytes();
+
+  /**
+   * Hash of the entire container
+   *
+   * @return hash of the code.
+   */
+  Hash getCodeHash();
+
+  /**
+   * For V0 and V1, is the target jump location valid?
+   *
+   * @param jumpDestination index from PC=0. Code section for v1, whole container in V0
+   * @return true if the operation is both a valid opcode and a JUMPDEST
+   */
+  boolean isJumpDestInvalid(final int jumpDestination);
+
+  /**
+   * Code is considered valid by the EVM.
+   *
+   * @return isValid
+   */
+  boolean isValid();
+
+  /**
+   * The Code Section Info associated with a code section. If the code does not support sections or
+   * an out-of-section code is requested null will be returned.
+   *
+   * @param section the section number to retrieve.
+   * @return The code section, or null of there is no associated section
+   */
+  CodeSection getCodeSection(final int section);
+
+  /**
+   * The number of code sections in this container.
+   *
+   * @return 1 for legacy, count for valid, zero for invalid.
+   */
+  int getCodeSectionCount();
+
+  /**
+   * Returns the EOF version of the code. Legacy code is version 0, invalid code -1.
+   *
+   * @return The version of hte ode.
+   */
+  int getEofVersion();
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/EVM.java b/evm/src/main/java/org/hyperledger/besu/evm/EVM.java
new file mode 100644
index 00000000000..3f5d706d412
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/EVM.java
@@ -0,0 +1,319 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm;
+
+import static org.hyperledger.besu.evm.operation.PushOperation.PUSH_BASE;
+import static org.hyperledger.besu.evm.operation.SwapOperation.SWAP_BASE;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.evm.code.CodeFactory;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.frame.MessageFrame.State;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.CodeCache;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.evm.internal.FixedStack.OverflowException;
+import org.hyperledger.besu.evm.internal.FixedStack.UnderflowException;
+import org.hyperledger.besu.evm.operation.AddModOperation;
+import org.hyperledger.besu.evm.operation.AddOperation;
+import org.hyperledger.besu.evm.operation.AndOperation;
+import org.hyperledger.besu.evm.operation.ByteOperation;
+import org.hyperledger.besu.evm.operation.DivOperation;
+import org.hyperledger.besu.evm.operation.DupOperation;
+import org.hyperledger.besu.evm.operation.ExpOperation;
+import org.hyperledger.besu.evm.operation.GtOperation;
+import org.hyperledger.besu.evm.operation.InvalidOperation;
+import org.hyperledger.besu.evm.operation.IsZeroOperation;
+import org.hyperledger.besu.evm.operation.JumpDestOperation;
+import org.hyperledger.besu.evm.operation.JumpOperation;
+import org.hyperledger.besu.evm.operation.JumpiOperation;
+import org.hyperledger.besu.evm.operation.LtOperation;
+import org.hyperledger.besu.evm.operation.ModOperation;
+import org.hyperledger.besu.evm.operation.MulModOperation;
+import org.hyperledger.besu.evm.operation.MulOperation;
+import org.hyperledger.besu.evm.operation.NotOperation;
+import org.hyperledger.besu.evm.operation.Operation;
+import org.hyperledger.besu.evm.operation.Operation.OperationResult;
+import org.hyperledger.besu.evm.operation.OperationRegistry;
+import org.hyperledger.besu.evm.operation.OrOperation;
+import org.hyperledger.besu.evm.operation.PopOperation;
+import org.hyperledger.besu.evm.operation.Push0Operation;
+import org.hyperledger.besu.evm.operation.PushOperation;
+import org.hyperledger.besu.evm.operation.SDivOperation;
+import org.hyperledger.besu.evm.operation.SGtOperation;
+import org.hyperledger.besu.evm.operation.SLtOperation;
+import org.hyperledger.besu.evm.operation.SModOperation;
+import org.hyperledger.besu.evm.operation.SignExtendOperation;
+import org.hyperledger.besu.evm.operation.StopOperation;
+import org.hyperledger.besu.evm.operation.SubOperation;
+import org.hyperledger.besu.evm.operation.SwapOperation;
+import org.hyperledger.besu.evm.operation.VirtualOperation;
+import org.hyperledger.besu.evm.operation.XorOperation;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Evm. */
+public class EVM {
+  private static final Logger LOG = LoggerFactory.getLogger(EVM.class);
+
+  /** The constant OVERFLOW_RESPONSE. */
+  protected static final OperationResult OVERFLOW_RESPONSE =
+      new OperationResult(0L, ExceptionalHaltReason.TOO_MANY_STACK_ITEMS);
+  /** The constant UNDERFLOW_RESPONSE. */
+  protected static final OperationResult UNDERFLOW_RESPONSE =
+      new OperationResult(0L, ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS);
+
+  private final OperationRegistry operations;
+  private final GasCalculator gasCalculator;
+  private final Operation endOfScriptStop;
+  private final CodeCache codeCache;
+  private final EvmSpecVersion evmSpecVersion;
+
+  // Optimized operation flags
+  private final boolean enableShanghai;
+
+  /**
+   * Instantiates a new Evm.
+   *
+   * @param operations the operations
+   * @param gasCalculator the gas calculator
+   * @param evmConfiguration the evm configuration
+   * @param evmSpecVersion the evm spec version
+   */
+  public EVM(
+      final OperationRegistry operations,
+      final GasCalculator gasCalculator,
+      final EvmConfiguration evmConfiguration,
+      final EvmSpecVersion evmSpecVersion) {
+    this.operations = operations;
+    this.gasCalculator = gasCalculator;
+    this.endOfScriptStop = new VirtualOperation(new StopOperation(gasCalculator));
+    this.codeCache = new CodeCache(evmConfiguration);
+    this.evmSpecVersion = evmSpecVersion;
+
+    enableShanghai = EvmSpecVersion.SHANGHAI.ordinal() <= evmSpecVersion.ordinal();
+  }
+
+  /**
+   * Gets gas calculator.
+   *
+   * @return the gas calculator
+   */
+  public GasCalculator getGasCalculator() {
+    return gasCalculator;
+  }
+
+  /**
+   * Gets max eof version.
+   *
+   * @return the max eof version
+   */
+  public int getMaxEOFVersion() {
+    return evmSpecVersion.maxEofVersion;
+  }
+
+  /**
+   * Run to halt.
+   *
+   * @param frame the frame
+   * @param tracing the tracing
+   */
+  // Note to maintainers: lots of Java idioms and OO principals are being set aside in the
+  // name of performance. This is one of the hottest sections of code.
+  //
+  // Please benchmark before refactoring.
+  public void runToHalt(final MessageFrame frame, final OperationTracer tracing) {
+    evmSpecVersion.maybeWarnVersion();
+
+    var operationTracer = tracing == OperationTracer.NO_TRACING ? null : tracing;
+    byte[] code = frame.getCode().getBytes().toArrayUnsafe();
+    Operation[] operationArray = operations.getOperations();
+    while (frame.getState() == MessageFrame.State.CODE_EXECUTING) {
+      Operation currentOperation;
+      int opcode;
+      int pc = frame.getPC();
+      try {
+        opcode = code[pc] & 0xff;
+        currentOperation = operationArray[opcode];
+      } catch (ArrayIndexOutOfBoundsException aiiobe) {
+        opcode = 0;
+        currentOperation = endOfScriptStop;
+      }
+      frame.setCurrentOperation(currentOperation);
+      if (operationTracer != null) {
+        operationTracer.tracePreExecution(frame);
+      }
+
+      OperationResult result;
+      try {
+        result =
+            switch (opcode) {
+              case 0x00 -> StopOperation.staticOperation(frame);
+              case 0x01 -> AddOperation.staticOperation(frame);
+              case 0x02 -> MulOperation.staticOperation(frame);
+              case 0x03 -> SubOperation.staticOperation(frame);
+              case 0x04 -> DivOperation.staticOperation(frame);
+              case 0x05 -> SDivOperation.staticOperation(frame);
+              case 0x06 -> ModOperation.staticOperation(frame);
+              case 0x07 -> SModOperation.staticOperation(frame);
+              case 0x08 -> AddModOperation.staticOperation(frame);
+              case 0x09 -> MulModOperation.staticOperation(frame);
+              case 0x0a -> ExpOperation.staticOperation(frame, gasCalculator);
+              case 0x0b -> SignExtendOperation.staticOperation(frame);
+              case 0x0c, 0x0d, 0x0e, 0x0f -> InvalidOperation.INVALID_RESULT;
+              case 0x10 -> LtOperation.staticOperation(frame);
+              case 0x11 -> GtOperation.staticOperation(frame);
+              case 0x12 -> SLtOperation.staticOperation(frame);
+              case 0x13 -> SGtOperation.staticOperation(frame);
+              case 0x15 -> IsZeroOperation.staticOperation(frame);
+              case 0x16 -> AndOperation.staticOperation(frame);
+              case 0x17 -> OrOperation.staticOperation(frame);
+              case 0x18 -> XorOperation.staticOperation(frame);
+              case 0x19 -> NotOperation.staticOperation(frame);
+              case 0x1a -> ByteOperation.staticOperation(frame);
+              case 0x50 -> PopOperation.staticOperation(frame);
+              case 0x56 -> JumpOperation.staticOperation(frame);
+              case 0x57 -> JumpiOperation.staticOperation(frame);
+              case 0x5b -> JumpDestOperation.JUMPDEST_SUCCESS;
+              case 0x5f -> enableShanghai
+                  ? Push0Operation.staticOperation(frame)
+                  : InvalidOperation.INVALID_RESULT;
+              case 0x60, // PUSH1-32
+                  0x61,
+                  0x62,
+                  0x63,
+                  0x64,
+                  0x65,
+                  0x66,
+                  0x67,
+                  0x68,
+                  0x69,
+                  0x6a,
+                  0x6b,
+                  0x6c,
+                  0x6d,
+                  0x6e,
+                  0x6f,
+                  0x70,
+                  0x71,
+                  0x72,
+                  0x73,
+                  0x74,
+                  0x75,
+                  0x76,
+                  0x77,
+                  0x78,
+                  0x79,
+                  0x7a,
+                  0x7b,
+                  0x7c,
+                  0x7d,
+                  0x7e,
+                  0x7f -> PushOperation.staticOperation(frame, code, pc, opcode - PUSH_BASE);
+              case 0x80, // DUP1-16
+                  0x81,
+                  0x82,
+                  0x83,
+                  0x84,
+                  0x85,
+                  0x86,
+                  0x87,
+                  0x88,
+                  0x89,
+                  0x8a,
+                  0x8b,
+                  0x8c,
+                  0x8d,
+                  0x8e,
+                  0x8f -> DupOperation.staticOperation(frame, opcode - DupOperation.DUP_BASE);
+              case 0x90, // SWAP1-16
+                  0x91,
+                  0x92,
+                  0x93,
+                  0x94,
+                  0x95,
+                  0x96,
+                  0x97,
+                  0x98,
+                  0x99,
+                  0x9a,
+                  0x9b,
+                  0x9c,
+                  0x9d,
+                  0x9e,
+                  0x9f -> SwapOperation.staticOperation(frame, opcode - SWAP_BASE);
+              default -> { // unoptimized operations
+                frame.setCurrentOperation(currentOperation);
+                yield currentOperation.execute(frame, this);
+              }
+            };
+      } catch (final OverflowException oe) {
+        result = OVERFLOW_RESPONSE;
+      } catch (final UnderflowException ue) {
+        result = UNDERFLOW_RESPONSE;
+      }
+      final ExceptionalHaltReason haltReason = result.getHaltReason();
+      if (haltReason != null) {
+        LOG.trace("MessageFrame evaluation halted because of {}", haltReason);
+        frame.setExceptionalHaltReason(Optional.of(haltReason));
+        frame.setState(State.EXCEPTIONAL_HALT);
+      } else if (frame.decrementRemainingGas(result.getGasCost()) < 0) {
+        frame.setExceptionalHaltReason(Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
+        frame.setState(State.EXCEPTIONAL_HALT);
+      }
+      if (frame.getState() == State.CODE_EXECUTING) {
+        final int currentPC = frame.getPC();
+        final int opSize = result.getPcIncrement();
+        frame.setPC(currentPC + opSize);
+      }
+      if (operationTracer != null) {
+        operationTracer.tracePostExecution(frame, result);
+      }
+    }
+  }
+
+  /**
+   * Get Operations (unsafe)
+   *
+   * @return Operations array
+   */
+  public Operation[] getOperationsUnsafe() {
+    return operations.getOperations();
+  }
+
+  /**
+   * Gets code.
+   *
+   * @param codeHash the code hash
+   * @param codeBytes the code bytes
+   * @return the code
+   */
+  public Code getCode(final Hash codeHash, final Bytes codeBytes) {
+    Code result = codeHash == null ? null : codeCache.getIfPresent(codeHash);
+    if (result == null) {
+      result = CodeFactory.createCode(codeBytes, evmSpecVersion.getMaxEofVersion(), false);
+      if (codeHash != null) {
+        codeCache.put(codeHash, result);
+      }
+    }
+    return result;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/EvmSpecVersion.java b/evm/src/main/java/org/hyperledger/besu/evm/EvmSpecVersion.java
new file mode 100644
index 00000000000..03ea8a3b8b4
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/EvmSpecVersion.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The enum Evm spec version. */
+public enum EvmSpecVersion {
+  /** Frontier evm spec version. */
+  FRONTIER(0, true, "Frontier", "Finalized"),
+  /** Homestead evm spec version. */
+  HOMESTEAD(0, true, "Homestead", "Finalized"),
+  /** Byzantium evm spec version. */
+  BYZANTIUM(0, true, "Byzantium", "Finalized"),
+  /** Constantinople evm spec version. */
+  CONSTANTINOPLE(0, true, "Constantinople", "Did not reach Mainnet"),
+  /** Petersburg / ConstantinopleFix evm spec version. */
+  PETERSBURG(0, true, "ConstantinopleFix", "Finalized (also called Petersburg)"),
+  /** Istanbul evm spec version. */
+  ISTANBUL(0, true, "Istanbul", "Finalized"),
+  /** Berlin evm spec version */
+  BERLIN(0, true, "Berlin", "Finalized"),
+  /** London evm spec version. */
+  LONDON(0, true, "London", "Finalized"),
+  /** Paris evm spec version. */
+  PARIS(0, true, "Merge", "Finalized (also called Paris)"),
+  /** Shanghai evm spec version. */
+  SHANGHAI(0, true, "Shanghai", "Finalized"),
+  /** Cancun evm spec version. */
+  CANCUN(0, false, "Cancun", "In Development"),
+  /** Prague evm spec version. */
+  PRAGUE(0, false, "Prague", "Placeholder"),
+  /** Osaka evm spec version. */
+  OSAKA(0, false, "Osaka", "Placeholder"),
+  /** Bogota evm spec version. */
+  BOGOTA(0, false, "Bogata", "Placeholder"),
+  /** Development fork for unscheduled EIPs */
+  FUTURE_EIPS(1, false, "Future_EIPs", "Development, for accepted and unscheduled EIPs"),
+  /** Development fork for EIPs not accepted to Mainnet */
+  EXPERIMENTAL_EIPS(1, false, "Experimental_EIPs", "Development, for experimental EIPs");
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(EvmSpecVersion.class);
+
+  /** The Spec finalized. */
+  final boolean specFinalized;
+  /** The Max eof version. */
+  final int maxEofVersion;
+
+  /** Public name matching execution-spec-tests name */
+  final String name;
+  /** A brief description of the state of the fork */
+  final String description;
+
+  /** The Version warned. */
+  boolean versionWarned = false;
+
+  EvmSpecVersion(
+      final int maxEofVersion,
+      final boolean specFinalized,
+      final String name,
+      final String description) {
+    this.maxEofVersion = maxEofVersion;
+    this.specFinalized = specFinalized;
+    this.name = name;
+    this.description = description;
+  }
+
+  /**
+   * Gets max eof version.
+   *
+   * @return the max eof version
+   */
+  public int getMaxEofVersion() {
+    return maxEofVersion;
+  }
+
+  /**
+   * Name of the fork, in execution-spec-tests form
+   *
+   * @return name of the fork
+   */
+  public String getName() {
+    return name;
+  }
+
+  /**
+   * Description of the fork
+   *
+   * @return description
+   */
+  public String getDescription() {
+    return description;
+  }
+
+  /** Maybe warn version. */
+  @SuppressWarnings("AlreadyChecked") // false positive
+  public void maybeWarnVersion() {
+    if (versionWarned) {
+      return;
+    }
+
+    if (!specFinalized) {
+      LOGGER.error(
+          "****** Not for Production Network Use ******\nExecuting code from EVM Spec Version {}, which has not been finalized.\n****** Not for Production Network Use ******",
+          this.name());
+    }
+    versionWarned = true;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/MainnetEVMs.java b/evm/src/main/java/org/hyperledger/besu/evm/MainnetEVMs.java
new file mode 100644
index 00000000000..fdebbdb2de4
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/MainnetEVMs.java
@@ -0,0 +1,1201 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm;
+
+import org.hyperledger.besu.evm.gascalculator.ByzantiumGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.CancunGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.ConstantinopleGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.FrontierGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.gascalculator.IstanbulGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.LondonGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.PetersburgGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.ShanghaiGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.SpuriousDragonGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.TangerineWhistleGasCalculator;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.evm.operation.AddModOperation;
+import org.hyperledger.besu.evm.operation.AddOperation;
+import org.hyperledger.besu.evm.operation.AddressOperation;
+import org.hyperledger.besu.evm.operation.AndOperation;
+import org.hyperledger.besu.evm.operation.BalanceOperation;
+import org.hyperledger.besu.evm.operation.BaseFeeOperation;
+import org.hyperledger.besu.evm.operation.BlockHashOperation;
+import org.hyperledger.besu.evm.operation.ByteOperation;
+import org.hyperledger.besu.evm.operation.CallCodeOperation;
+import org.hyperledger.besu.evm.operation.CallDataCopyOperation;
+import org.hyperledger.besu.evm.operation.CallDataLoadOperation;
+import org.hyperledger.besu.evm.operation.CallDataSizeOperation;
+import org.hyperledger.besu.evm.operation.CallFOperation;
+import org.hyperledger.besu.evm.operation.CallOperation;
+import org.hyperledger.besu.evm.operation.CallValueOperation;
+import org.hyperledger.besu.evm.operation.CallerOperation;
+import org.hyperledger.besu.evm.operation.ChainIdOperation;
+import org.hyperledger.besu.evm.operation.CodeCopyOperation;
+import org.hyperledger.besu.evm.operation.CodeSizeOperation;
+import org.hyperledger.besu.evm.operation.CoinbaseOperation;
+import org.hyperledger.besu.evm.operation.Create2Operation;
+import org.hyperledger.besu.evm.operation.CreateOperation;
+import org.hyperledger.besu.evm.operation.DataHashOperation;
+import org.hyperledger.besu.evm.operation.DelegateCallOperation;
+import org.hyperledger.besu.evm.operation.DifficultyOperation;
+import org.hyperledger.besu.evm.operation.DivOperation;
+import org.hyperledger.besu.evm.operation.DupOperation;
+import org.hyperledger.besu.evm.operation.EqOperation;
+import org.hyperledger.besu.evm.operation.ExpOperation;
+import org.hyperledger.besu.evm.operation.ExtCodeCopyOperation;
+import org.hyperledger.besu.evm.operation.ExtCodeHashOperation;
+import org.hyperledger.besu.evm.operation.ExtCodeSizeOperation;
+import org.hyperledger.besu.evm.operation.GasLimitOperation;
+import org.hyperledger.besu.evm.operation.GasOperation;
+import org.hyperledger.besu.evm.operation.GasPriceOperation;
+import org.hyperledger.besu.evm.operation.GtOperation;
+import org.hyperledger.besu.evm.operation.InvalidOperation;
+import org.hyperledger.besu.evm.operation.IsZeroOperation;
+import org.hyperledger.besu.evm.operation.JumpDestOperation;
+import org.hyperledger.besu.evm.operation.JumpOperation;
+import org.hyperledger.besu.evm.operation.JumpiOperation;
+import org.hyperledger.besu.evm.operation.Keccak256Operation;
+import org.hyperledger.besu.evm.operation.LogOperation;
+import org.hyperledger.besu.evm.operation.LtOperation;
+import org.hyperledger.besu.evm.operation.MCopyOperation;
+import org.hyperledger.besu.evm.operation.MLoadOperation;
+import org.hyperledger.besu.evm.operation.MSizeOperation;
+import org.hyperledger.besu.evm.operation.MStore8Operation;
+import org.hyperledger.besu.evm.operation.MStoreOperation;
+import org.hyperledger.besu.evm.operation.ModOperation;
+import org.hyperledger.besu.evm.operation.MulModOperation;
+import org.hyperledger.besu.evm.operation.MulOperation;
+import org.hyperledger.besu.evm.operation.NotOperation;
+import org.hyperledger.besu.evm.operation.NumberOperation;
+import org.hyperledger.besu.evm.operation.OperationRegistry;
+import org.hyperledger.besu.evm.operation.OrOperation;
+import org.hyperledger.besu.evm.operation.OriginOperation;
+import org.hyperledger.besu.evm.operation.PCOperation;
+import org.hyperledger.besu.evm.operation.PopOperation;
+import org.hyperledger.besu.evm.operation.PrevRanDaoOperation;
+import org.hyperledger.besu.evm.operation.Push0Operation;
+import org.hyperledger.besu.evm.operation.PushOperation;
+import org.hyperledger.besu.evm.operation.RelativeJumpIfOperation;
+import org.hyperledger.besu.evm.operation.RelativeJumpOperation;
+import org.hyperledger.besu.evm.operation.RelativeJumpVectorOperation;
+import org.hyperledger.besu.evm.operation.RetFOperation;
+import org.hyperledger.besu.evm.operation.ReturnDataCopyOperation;
+import org.hyperledger.besu.evm.operation.ReturnDataSizeOperation;
+import org.hyperledger.besu.evm.operation.ReturnOperation;
+import org.hyperledger.besu.evm.operation.RevertOperation;
+import org.hyperledger.besu.evm.operation.SDivOperation;
+import org.hyperledger.besu.evm.operation.SGtOperation;
+import org.hyperledger.besu.evm.operation.SLoadOperation;
+import org.hyperledger.besu.evm.operation.SLtOperation;
+import org.hyperledger.besu.evm.operation.SModOperation;
+import org.hyperledger.besu.evm.operation.SStoreOperation;
+import org.hyperledger.besu.evm.operation.SarOperation;
+import org.hyperledger.besu.evm.operation.SelfBalanceOperation;
+import org.hyperledger.besu.evm.operation.SelfDestructOperation;
+import org.hyperledger.besu.evm.operation.ShlOperation;
+import org.hyperledger.besu.evm.operation.ShrOperation;
+import org.hyperledger.besu.evm.operation.SignExtendOperation;
+import org.hyperledger.besu.evm.operation.StaticCallOperation;
+import org.hyperledger.besu.evm.operation.StopOperation;
+import org.hyperledger.besu.evm.operation.SubOperation;
+import org.hyperledger.besu.evm.operation.SwapOperation;
+import org.hyperledger.besu.evm.operation.TLoadOperation;
+import org.hyperledger.besu.evm.operation.TStoreOperation;
+import org.hyperledger.besu.evm.operation.TimestampOperation;
+import org.hyperledger.besu.evm.operation.XorOperation;
+
+import java.math.BigInteger;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+/** Provides EVMs supporting the appropriate operations for mainnet hard forks. */
+public class MainnetEVMs {
+
+  /** The constant DEV_NET_CHAIN_ID. */
+  public static final BigInteger DEV_NET_CHAIN_ID = BigInteger.valueOf(1337);
+
+  /** The constant SPURIOUS_DRAGON_CONTRACT_SIZE_LIMIT. */
+  public static final int SPURIOUS_DRAGON_CONTRACT_SIZE_LIMIT = 0x6000;
+  /** The constant SHANGHAI_INIT_CODE_SIZE_LIMIT. */
+  public static final int SHANGHAI_INIT_CODE_SIZE_LIMIT = 2 * SPURIOUS_DRAGON_CONTRACT_SIZE_LIMIT;
+
+  private MainnetEVMs() {
+    // utility class
+  }
+
+  /**
+   * Frontier evm.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM frontier(final EvmConfiguration evmConfiguration) {
+    return frontier(new FrontierGasCalculator(), evmConfiguration);
+  }
+
+  /**
+   * Frontier evm.
+   *
+   * @param gasCalculator the gas calculator
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM frontier(
+      final GasCalculator gasCalculator, final EvmConfiguration evmConfiguration) {
+    return new EVM(
+        frontierOperations(gasCalculator),
+        gasCalculator,
+        evmConfiguration,
+        EvmSpecVersion.FRONTIER);
+  }
+
+  /**
+   * Operation registry for frontier's operations.
+   *
+   * @param gasCalculator the gas calculator
+   * @return the operation registry
+   */
+  public static OperationRegistry frontierOperations(final GasCalculator gasCalculator) {
+    OperationRegistry operationRegistry = new OperationRegistry();
+    registerFrontierOperations(operationRegistry, gasCalculator);
+    return operationRegistry;
+  }
+
+  /**
+   * Register frontier operations.
+   *
+   * @param registry the registry
+   * @param gasCalculator the gas calculator
+   */
+  public static void registerFrontierOperations(
+      final OperationRegistry registry, final GasCalculator gasCalculator) {
+    for (int i = 0; i < 255; i++) {
+      registry.put(new InvalidOperation(i, gasCalculator));
+    }
+    registry.put(new AddOperation(gasCalculator));
+    registry.put(new MulOperation(gasCalculator));
+    registry.put(new SubOperation(gasCalculator));
+    registry.put(new DivOperation(gasCalculator));
+    registry.put(new SDivOperation(gasCalculator));
+    registry.put(new ModOperation(gasCalculator));
+    registry.put(new SModOperation(gasCalculator));
+    registry.put(new ExpOperation(gasCalculator));
+    registry.put(new AddModOperation(gasCalculator));
+    registry.put(new MulModOperation(gasCalculator));
+    registry.put(new SignExtendOperation(gasCalculator));
+    registry.put(new LtOperation(gasCalculator));
+    registry.put(new GtOperation(gasCalculator));
+    registry.put(new SLtOperation(gasCalculator));
+    registry.put(new SGtOperation(gasCalculator));
+    registry.put(new EqOperation(gasCalculator));
+    registry.put(new IsZeroOperation(gasCalculator));
+    registry.put(new AndOperation(gasCalculator));
+    registry.put(new OrOperation(gasCalculator));
+    registry.put(new XorOperation(gasCalculator));
+    registry.put(new NotOperation(gasCalculator));
+    registry.put(new ByteOperation(gasCalculator));
+    registry.put(new Keccak256Operation(gasCalculator));
+    registry.put(new AddressOperation(gasCalculator));
+    registry.put(new BalanceOperation(gasCalculator));
+    registry.put(new OriginOperation(gasCalculator));
+    registry.put(new CallerOperation(gasCalculator));
+    registry.put(new CallValueOperation(gasCalculator));
+    registry.put(new CallDataLoadOperation(gasCalculator));
+    registry.put(new CallDataSizeOperation(gasCalculator));
+    registry.put(new CallDataCopyOperation(gasCalculator));
+    registry.put(new CodeSizeOperation(gasCalculator));
+    registry.put(new CodeCopyOperation(gasCalculator));
+    registry.put(new GasPriceOperation(gasCalculator));
+    registry.put(new ExtCodeCopyOperation(gasCalculator));
+    registry.put(new ExtCodeSizeOperation(gasCalculator));
+    registry.put(new BlockHashOperation(gasCalculator));
+    registry.put(new CoinbaseOperation(gasCalculator));
+    registry.put(new TimestampOperation(gasCalculator));
+    registry.put(new NumberOperation(gasCalculator));
+    registry.put(new DifficultyOperation(gasCalculator));
+    registry.put(new GasLimitOperation(gasCalculator));
+    registry.put(new PopOperation(gasCalculator));
+    registry.put(new MLoadOperation(gasCalculator));
+    registry.put(new MStoreOperation(gasCalculator));
+    registry.put(new MStore8Operation(gasCalculator));
+    registry.put(new SLoadOperation(gasCalculator));
+    registry.put(new SStoreOperation(gasCalculator, SStoreOperation.FRONTIER_MINIMUM));
+    registry.put(new JumpOperation(gasCalculator));
+    registry.put(new JumpiOperation(gasCalculator));
+    registry.put(new PCOperation(gasCalculator));
+    registry.put(new MSizeOperation(gasCalculator));
+    registry.put(new GasOperation(gasCalculator));
+    registry.put(new JumpDestOperation(gasCalculator));
+    registry.put(new ReturnOperation(gasCalculator));
+    registry.put(new InvalidOperation(gasCalculator));
+    registry.put(new StopOperation(gasCalculator));
+    registry.put(new SelfDestructOperation(gasCalculator));
+    registry.put(new CreateOperation(gasCalculator, Integer.MAX_VALUE));
+    registry.put(new CallOperation(gasCalculator));
+    registry.put(new CallCodeOperation(gasCalculator));
+
+    // Register the PUSH1, PUSH2, ..., PUSH32 operations.
+    for (int i = 1; i <= 32; ++i) {
+      registry.put(new PushOperation(i, gasCalculator));
+    }
+
+    // Register the DUP1, DUP2, ..., DUP16 operations.
+    for (int i = 1; i <= 16; ++i) {
+      registry.put(new DupOperation(i, gasCalculator));
+    }
+
+    // Register the SWAP1, SWAP2, ..., SWAP16 operations.
+    for (int i = 1; i <= 16; ++i) {
+      registry.put(new SwapOperation(i, gasCalculator));
+    }
+
+    // Register the LOG0, LOG1, ..., LOG4 operations.
+    for (int i = 0; i < 5; ++i) {
+      registry.put(new LogOperation(i, gasCalculator));
+    }
+  }
+
+  /**
+   * Homestead evm.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM homestead(final EvmConfiguration evmConfiguration) {
+    return homestead(new FrontierGasCalculator(), evmConfiguration);
+  }
+
+  /**
+   * Homestead evm.
+   *
+   * @param gasCalculator the gas calculator
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM homestead(
+      final GasCalculator gasCalculator, final EvmConfiguration evmConfiguration) {
+    return new EVM(
+        homesteadOperations(gasCalculator),
+        gasCalculator,
+        evmConfiguration,
+        EvmSpecVersion.HOMESTEAD);
+  }
+
+  /**
+   * Operation registry for homestead's operations.
+   *
+   * @param gasCalculator the gas calculator
+   * @return the operation registry
+   */
+  public static OperationRegistry homesteadOperations(final GasCalculator gasCalculator) {
+    OperationRegistry operationRegistry = new OperationRegistry();
+    registerHomesteadOperations(operationRegistry, gasCalculator);
+    return operationRegistry;
+  }
+
+  /**
+   * Register homestead operations.
+   *
+   * @param registry the registry
+   * @param gasCalculator the gas calculator
+   */
+  public static void registerHomesteadOperations(
+      final OperationRegistry registry, final GasCalculator gasCalculator) {
+    registerFrontierOperations(registry, gasCalculator);
+    registry.put(new DelegateCallOperation(gasCalculator));
+  }
+
+  /**
+   * Spurious dragon evm.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM spuriousDragon(final EvmConfiguration evmConfiguration) {
+    return homestead(new SpuriousDragonGasCalculator(), evmConfiguration);
+  }
+
+  /**
+   * Tangerine whistle evm.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM tangerineWhistle(final EvmConfiguration evmConfiguration) {
+    return homestead(new TangerineWhistleGasCalculator(), evmConfiguration);
+  }
+
+  /**
+   * Byzantium evm.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM byzantium(final EvmConfiguration evmConfiguration) {
+    return byzantium(new ByzantiumGasCalculator(), evmConfiguration);
+  }
+
+  /**
+   * Byzantium evm.
+   *
+   * @param gasCalculator the gas calculator
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM byzantium(
+      final GasCalculator gasCalculator, final EvmConfiguration evmConfiguration) {
+    return new EVM(
+        byzantiumOperations(gasCalculator),
+        gasCalculator,
+        evmConfiguration,
+        EvmSpecVersion.BYZANTIUM);
+  }
+
+  /**
+   * Operation registry for byzantium's operations.
+   *
+   * @param gasCalculator the gas calculator
+   * @return the operation registry
+   */
+  public static OperationRegistry byzantiumOperations(final GasCalculator gasCalculator) {
+    OperationRegistry operationRegistry = new OperationRegistry();
+    registerByzantiumOperations(operationRegistry, gasCalculator);
+    return operationRegistry;
+  }
+
+  /**
+   * Register byzantium operations.
+   *
+   * @param registry the registry
+   * @param gasCalculator the gas calculator
+   */
+  public static void registerByzantiumOperations(
+      final OperationRegistry registry, final GasCalculator gasCalculator) {
+    registerHomesteadOperations(registry, gasCalculator);
+    registry.put(new ReturnDataCopyOperation(gasCalculator));
+    registry.put(new ReturnDataSizeOperation(gasCalculator));
+    registry.put(new RevertOperation(gasCalculator));
+    registry.put(new StaticCallOperation(gasCalculator));
+  }
+
+  /**
+   * Constantinople evm.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM constantinople(final EvmConfiguration evmConfiguration) {
+    return constantinople(new ConstantinopleGasCalculator(), evmConfiguration);
+  }
+
+  /**
+   * Constantinople evm.
+   *
+   * @param gasCalculator the gas calculator
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM constantinople(
+      final GasCalculator gasCalculator, final EvmConfiguration evmConfiguration) {
+    return new EVM(
+        constantinopleOperations(gasCalculator),
+        gasCalculator,
+        evmConfiguration,
+        EvmSpecVersion.CONSTANTINOPLE);
+  }
+
+  /**
+   * Operation registry for constantinople's operations.
+   *
+   * @param gasCalculator the gas calculator
+   * @return the operation registry
+   */
+  public static OperationRegistry constantinopleOperations(final GasCalculator gasCalculator) {
+    OperationRegistry operationRegistry = new OperationRegistry();
+    registerConstantinopleOperations(operationRegistry, gasCalculator);
+    return operationRegistry;
+  }
+
+  /**
+   * Register constantinople operations.
+   *
+   * @param registry the registry
+   * @param gasCalculator the gas calculator
+   */
+  public static void registerConstantinopleOperations(
+      final OperationRegistry registry, final GasCalculator gasCalculator) {
+    registerByzantiumOperations(registry, gasCalculator);
+    registry.put(new Create2Operation(gasCalculator, Integer.MAX_VALUE));
+    registry.put(new SarOperation(gasCalculator));
+    registry.put(new ShlOperation(gasCalculator));
+    registry.put(new ShrOperation(gasCalculator));
+    registry.put(new ExtCodeHashOperation(gasCalculator));
+  }
+
+  /**
+   * Petersburg evm.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM petersburg(final EvmConfiguration evmConfiguration) {
+    return constantinople(new PetersburgGasCalculator(), evmConfiguration);
+  }
+
+  /**
+   * Istanbul evm.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM istanbul(final EvmConfiguration evmConfiguration) {
+    return istanbul(DEV_NET_CHAIN_ID, evmConfiguration);
+  }
+
+  /**
+   * Istanbul evm.
+   *
+   * @param chainId the chain id
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM istanbul(final BigInteger chainId, final EvmConfiguration evmConfiguration) {
+    return istanbul(new IstanbulGasCalculator(), chainId, evmConfiguration);
+  }
+
+  /**
+   * Istanbul evm.
+   *
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM istanbul(
+      final GasCalculator gasCalculator,
+      final BigInteger chainId,
+      final EvmConfiguration evmConfiguration) {
+    return new EVM(
+        istanbulOperations(gasCalculator, chainId),
+        gasCalculator,
+        evmConfiguration,
+        EvmSpecVersion.ISTANBUL);
+  }
+
+  /**
+   * Operation registry for istanbul's operations.
+   *
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   * @return the operation registry
+   */
+  public static OperationRegistry istanbulOperations(
+      final GasCalculator gasCalculator, final BigInteger chainId) {
+    OperationRegistry operationRegistry = new OperationRegistry();
+    registerIstanbulOperations(operationRegistry, gasCalculator, chainId);
+    return operationRegistry;
+  }
+
+  /**
+   * Register istanbul operations.
+   *
+   * @param registry the registry
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   */
+  public static void registerIstanbulOperations(
+      final OperationRegistry registry,
+      final GasCalculator gasCalculator,
+      final BigInteger chainId) {
+    registerConstantinopleOperations(registry, gasCalculator);
+    registry.put(
+        new ChainIdOperation(gasCalculator, Bytes32.leftPad(Bytes.of(chainId.toByteArray()))));
+    registry.put(new SelfBalanceOperation(gasCalculator));
+    registry.put(new SStoreOperation(gasCalculator, SStoreOperation.EIP_1706_MINIMUM));
+  }
+
+  /**
+   * Berlin evm.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM berlin(final EvmConfiguration evmConfiguration) {
+    return berlin(DEV_NET_CHAIN_ID, evmConfiguration);
+  }
+
+  /**
+   * Berlin evm.
+   *
+   * @param chainId the chain id
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM berlin(final BigInteger chainId, final EvmConfiguration evmConfiguration) {
+    return berlin(new IstanbulGasCalculator(), chainId, evmConfiguration);
+  }
+
+  /**
+   * Berlin evm.
+   *
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM berlin(
+      final GasCalculator gasCalculator,
+      final BigInteger chainId,
+      final EvmConfiguration evmConfiguration) {
+    return new EVM(
+        istanbulOperations(gasCalculator, chainId),
+        gasCalculator,
+        evmConfiguration,
+        EvmSpecVersion.BERLIN);
+  }
+
+  /**
+   * London evm.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM london(final EvmConfiguration evmConfiguration) {
+    return london(DEV_NET_CHAIN_ID, evmConfiguration);
+  }
+
+  /**
+   * London evm.
+   *
+   * @param chainId the chain id
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM london(final BigInteger chainId, final EvmConfiguration evmConfiguration) {
+    return london(new LondonGasCalculator(), chainId, evmConfiguration);
+  }
+
+  /**
+   * London evm.
+   *
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM london(
+      final GasCalculator gasCalculator,
+      final BigInteger chainId,
+      final EvmConfiguration evmConfiguration) {
+    return new EVM(
+        londonOperations(gasCalculator, chainId),
+        gasCalculator,
+        evmConfiguration,
+        EvmSpecVersion.LONDON);
+  }
+
+  /**
+   * Operation registry for london's operations.
+   *
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   * @return the operation registry
+   */
+  public static OperationRegistry londonOperations(
+      final GasCalculator gasCalculator, final BigInteger chainId) {
+    OperationRegistry operationRegistry = new OperationRegistry();
+    registerLondonOperations(operationRegistry, gasCalculator, chainId);
+    return operationRegistry;
+  }
+
+  /**
+   * Register london operations.
+   *
+   * @param registry the registry
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   */
+  public static void registerLondonOperations(
+      final OperationRegistry registry,
+      final GasCalculator gasCalculator,
+      final BigInteger chainId) {
+    registerIstanbulOperations(registry, gasCalculator, chainId);
+    registry.put(new BaseFeeOperation(gasCalculator));
+  }
+
+  /**
+   * Paris evm.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM paris(final EvmConfiguration evmConfiguration) {
+    return paris(DEV_NET_CHAIN_ID, evmConfiguration);
+  }
+
+  /**
+   * Paris evm.
+   *
+   * @param chainId the chain id
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM paris(final BigInteger chainId, final EvmConfiguration evmConfiguration) {
+    return paris(new LondonGasCalculator(), chainId, evmConfiguration);
+  }
+
+  /**
+   * Paris evm.
+   *
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM paris(
+      final GasCalculator gasCalculator,
+      final BigInteger chainId,
+      final EvmConfiguration evmConfiguration) {
+    return new EVM(
+        parisOperations(gasCalculator, chainId),
+        gasCalculator,
+        evmConfiguration,
+        EvmSpecVersion.PARIS);
+  }
+
+  /**
+   * Operation registry for paris's operations.
+   *
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   * @return the operation registry
+   */
+  public static OperationRegistry parisOperations(
+      final GasCalculator gasCalculator, final BigInteger chainId) {
+    OperationRegistry operationRegistry = new OperationRegistry();
+    registerParisOperations(operationRegistry, gasCalculator, chainId);
+    return operationRegistry;
+  }
+
+  /**
+   * Register paris operations.
+   *
+   * @param registry the registry
+   * @param gasCalculator the gas calculator
+   * @param chainID the chain id
+   */
+  public static void registerParisOperations(
+      final OperationRegistry registry,
+      final GasCalculator gasCalculator,
+      final BigInteger chainID) {
+    registerLondonOperations(registry, gasCalculator, chainID);
+    registry.put(new PrevRanDaoOperation(gasCalculator));
+  }
+
+  /**
+   * Shanghai evm.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM shanghai(final EvmConfiguration evmConfiguration) {
+    return shanghai(DEV_NET_CHAIN_ID, evmConfiguration);
+  }
+
+  /**
+   * Shanghai evm
+   *
+   * @param chainId the chain id
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM shanghai(final BigInteger chainId, final EvmConfiguration evmConfiguration) {
+    return shanghai(new ShanghaiGasCalculator(), chainId, evmConfiguration);
+  }
+
+  /**
+   * shanghai evm.
+   *
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM shanghai(
+      final GasCalculator gasCalculator,
+      final BigInteger chainId,
+      final EvmConfiguration evmConfiguration) {
+    return new EVM(
+        shanghaiOperations(gasCalculator, chainId),
+        gasCalculator,
+        evmConfiguration,
+        EvmSpecVersion.SHANGHAI);
+  }
+
+  /**
+   * shanghai operations registry.
+   *
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   * @return the operation registry
+   */
+  public static OperationRegistry shanghaiOperations(
+      final GasCalculator gasCalculator, final BigInteger chainId) {
+    OperationRegistry operationRegistry = new OperationRegistry();
+    registerShanghaiOperations(operationRegistry, gasCalculator, chainId);
+    return operationRegistry;
+  }
+
+  /**
+   * Register Shanghai operations.
+   *
+   * @param registry the registry
+   * @param gasCalculator the gas calculator
+   * @param chainID the chain id
+   */
+  public static void registerShanghaiOperations(
+      final OperationRegistry registry,
+      final GasCalculator gasCalculator,
+      final BigInteger chainID) {
+    registerParisOperations(registry, gasCalculator, chainID);
+    registry.put(new Push0Operation(gasCalculator));
+    registry.put(new CreateOperation(gasCalculator, SHANGHAI_INIT_CODE_SIZE_LIMIT));
+    registry.put(new Create2Operation(gasCalculator, SHANGHAI_INIT_CODE_SIZE_LIMIT));
+  }
+
+  /**
+   * Cancun evm.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM cancun(final EvmConfiguration evmConfiguration) {
+    return cancun(DEV_NET_CHAIN_ID, evmConfiguration);
+  }
+  /**
+   * Cancun evm.
+   *
+   * @param chainId the chain id
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM cancun(final BigInteger chainId, final EvmConfiguration evmConfiguration) {
+    return cancun(new CancunGasCalculator(), chainId, evmConfiguration);
+  }
+
+  /**
+   * Cancun evm.
+   *
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM cancun(
+      final GasCalculator gasCalculator,
+      final BigInteger chainId,
+      final EvmConfiguration evmConfiguration) {
+    return new EVM(
+        cancunOperations(gasCalculator, chainId),
+        gasCalculator,
+        evmConfiguration,
+        EvmSpecVersion.CANCUN);
+  }
+
+  /**
+   * Operation registry for cancun's operations.
+   *
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   * @return the operation registry
+   */
+  public static OperationRegistry cancunOperations(
+      final GasCalculator gasCalculator, final BigInteger chainId) {
+    OperationRegistry operationRegistry = new OperationRegistry();
+    registerCancunOperations(operationRegistry, gasCalculator, chainId);
+    return operationRegistry;
+  }
+
+  /**
+   * Register cancun operations.
+   *
+   * @param registry the registry
+   * @param gasCalculator the gas calculator
+   * @param chainID the chain id
+   */
+  public static void registerCancunOperations(
+      final OperationRegistry registry,
+      final GasCalculator gasCalculator,
+      final BigInteger chainID) {
+    registerShanghaiOperations(registry, gasCalculator, chainID);
+
+    // EIP-4844 DATAHASH
+    registry.put(new DataHashOperation(gasCalculator));
+
+    // EIP-1153 TSTORE/TLOAD
+    registry.put(new TStoreOperation(gasCalculator));
+    registry.put(new TLoadOperation(gasCalculator));
+
+    // EIP-5656 MCOPY
+    registry.put(new MCopyOperation(gasCalculator));
+  }
+
+  /**
+   * Prague evm.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM prague(final EvmConfiguration evmConfiguration) {
+    return prague(DEV_NET_CHAIN_ID, evmConfiguration);
+  }
+  /**
+   * Prague evm.
+   *
+   * @param chainId the chain id
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM prague(final BigInteger chainId, final EvmConfiguration evmConfiguration) {
+    return prague(new CancunGasCalculator(), chainId, evmConfiguration);
+  }
+
+  /**
+   * Prague evm.
+   *
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM prague(
+      final GasCalculator gasCalculator,
+      final BigInteger chainId,
+      final EvmConfiguration evmConfiguration) {
+    return new EVM(
+        pragueOperations(gasCalculator, chainId),
+        gasCalculator,
+        evmConfiguration,
+        EvmSpecVersion.PRAGUE);
+  }
+
+  /**
+   * Operation registry for prague's operations.
+   *
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   * @return the operation registry
+   */
+  public static OperationRegistry pragueOperations(
+      final GasCalculator gasCalculator, final BigInteger chainId) {
+    OperationRegistry operationRegistry = new OperationRegistry();
+    registerPragueOperations(operationRegistry, gasCalculator, chainId);
+    return operationRegistry;
+  }
+
+  /**
+   * Register prague operations.
+   *
+   * @param registry the registry
+   * @param gasCalculator the gas calculator
+   * @param chainID the chain id
+   */
+  public static void registerPragueOperations(
+      final OperationRegistry registry,
+      final GasCalculator gasCalculator,
+      final BigInteger chainID) {
+    registerCancunOperations(registry, gasCalculator, chainID);
+  }
+
+  /**
+   * Osaka evm.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM osaka(final EvmConfiguration evmConfiguration) {
+    return osaka(DEV_NET_CHAIN_ID, evmConfiguration);
+  }
+  /**
+   * Osaka evm.
+   *
+   * @param chainId the chain id
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM osaka(final BigInteger chainId, final EvmConfiguration evmConfiguration) {
+    return osaka(new CancunGasCalculator(), chainId, evmConfiguration);
+  }
+
+  /**
+   * Osaka evm.
+   *
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM osaka(
+      final GasCalculator gasCalculator,
+      final BigInteger chainId,
+      final EvmConfiguration evmConfiguration) {
+    return new EVM(
+        osakaOperations(gasCalculator, chainId),
+        gasCalculator,
+        evmConfiguration,
+        EvmSpecVersion.OSAKA);
+  }
+
+  /**
+   * Operation registry for osaka's operations.
+   *
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   * @return the operation registry
+   */
+  public static OperationRegistry osakaOperations(
+      final GasCalculator gasCalculator, final BigInteger chainId) {
+    OperationRegistry operationRegistry = new OperationRegistry();
+    registerOsakaOperations(operationRegistry, gasCalculator, chainId);
+    return operationRegistry;
+  }
+
+  /**
+   * Register osaka operations.
+   *
+   * @param registry the registry
+   * @param gasCalculator the gas calculator
+   * @param chainID the chain id
+   */
+  public static void registerOsakaOperations(
+      final OperationRegistry registry,
+      final GasCalculator gasCalculator,
+      final BigInteger chainID) {
+    registerPragueOperations(registry, gasCalculator, chainID);
+  }
+
+  /**
+   * Bogota evm.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM bogota(final EvmConfiguration evmConfiguration) {
+    return bogota(DEV_NET_CHAIN_ID, evmConfiguration);
+  }
+  /**
+   * Bogota evm.
+   *
+   * @param chainId the chain id
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM bogota(final BigInteger chainId, final EvmConfiguration evmConfiguration) {
+    return bogota(new CancunGasCalculator(), chainId, evmConfiguration);
+  }
+
+  /**
+   * Bogota evm.
+   *
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM bogota(
+      final GasCalculator gasCalculator,
+      final BigInteger chainId,
+      final EvmConfiguration evmConfiguration) {
+    return new EVM(
+        bogotaOperations(gasCalculator, chainId),
+        gasCalculator,
+        evmConfiguration,
+        EvmSpecVersion.BOGOTA);
+  }
+
+  /**
+   * Bogota operation registry.
+   *
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   * @return the operation registry
+   */
+  public static OperationRegistry bogotaOperations(
+      final GasCalculator gasCalculator, final BigInteger chainId) {
+    OperationRegistry operationRegistry = new OperationRegistry();
+    registerBogotaOperations(operationRegistry, gasCalculator, chainId);
+    return operationRegistry;
+  }
+
+  /**
+   * Register bogota operations.
+   *
+   * @param registry the registry
+   * @param gasCalculator the gas calculator
+   * @param chainID the chain id
+   */
+  public static void registerBogotaOperations(
+      final OperationRegistry registry,
+      final GasCalculator gasCalculator,
+      final BigInteger chainID) {
+    registerOsakaOperations(registry, gasCalculator, chainID);
+  }
+
+  /**
+   * Future eips evm.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM futureEips(final EvmConfiguration evmConfiguration) {
+    return futureEips(DEV_NET_CHAIN_ID, evmConfiguration);
+  }
+
+  /**
+   * Future eips evm.
+   *
+   * @param chainId the chain id
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM futureEips(final BigInteger chainId, final EvmConfiguration evmConfiguration) {
+    return futureEips(new CancunGasCalculator(), chainId, evmConfiguration);
+  }
+
+  /**
+   * Future eips evm.
+   *
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM futureEips(
+      final GasCalculator gasCalculator,
+      final BigInteger chainId,
+      final EvmConfiguration evmConfiguration) {
+    return new EVM(
+        futureEipsOperations(gasCalculator, chainId),
+        gasCalculator,
+        evmConfiguration,
+        EvmSpecVersion.FUTURE_EIPS);
+  }
+
+  /**
+   * Future Operation registry for eIPs's operations.
+   *
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   * @return the operation registry
+   */
+  public static OperationRegistry futureEipsOperations(
+      final GasCalculator gasCalculator, final BigInteger chainId) {
+    OperationRegistry operationRegistry = new OperationRegistry();
+    registerFutureEipsOperations(operationRegistry, gasCalculator, chainId);
+    return operationRegistry;
+  }
+
+  /**
+   * Register FutureEIPs operations.
+   *
+   * @param registry the registry
+   * @param gasCalculator the gas calculator
+   * @param chainID the chain id
+   */
+  public static void registerFutureEipsOperations(
+      final OperationRegistry registry,
+      final GasCalculator gasCalculator,
+      final BigInteger chainID) {
+    registerBogotaOperations(registry, gasCalculator, chainID);
+
+    // "big" EOF
+    registry.put(new RelativeJumpOperation(gasCalculator));
+    registry.put(new RelativeJumpIfOperation(gasCalculator));
+    registry.put(new RelativeJumpVectorOperation(gasCalculator));
+    registry.put(new CallFOperation(gasCalculator));
+    registry.put(new RetFOperation(gasCalculator));
+  }
+
+  /**
+   * Experimental eips evm.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM experimentalEips(final EvmConfiguration evmConfiguration) {
+    return futureEips(DEV_NET_CHAIN_ID, evmConfiguration);
+  }
+
+  /**
+   * Experimental eips evm.
+   *
+   * @param chainId the chain Id
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM experimentalEips(
+      final BigInteger chainId, final EvmConfiguration evmConfiguration) {
+    return futureEips(chainId, evmConfiguration);
+  }
+
+  /**
+   * Experimental eips evm.
+   *
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   * @param evmConfiguration the evm configuration
+   * @return the evm
+   */
+  public static EVM experimentalEips(
+      final GasCalculator gasCalculator,
+      final BigInteger chainId,
+      final EvmConfiguration evmConfiguration) {
+    return new EVM(
+        experimentalEipsOperations(gasCalculator, chainId),
+        gasCalculator,
+        evmConfiguration,
+        EvmSpecVersion.FUTURE_EIPS);
+  }
+
+  /**
+   * Operation registry for experimental's operations.
+   *
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   * @return the operation registry
+   */
+  public static OperationRegistry experimentalEipsOperations(
+      final GasCalculator gasCalculator, final BigInteger chainId) {
+    OperationRegistry operationRegistry = new OperationRegistry();
+    registerExperimentalEipsOperations(operationRegistry, gasCalculator, chainId);
+    return operationRegistry;
+  }
+
+  /**
+   * Register experimental eips operations.
+   *
+   * @param registry the registry
+   * @param gasCalculator the gas calculator
+   * @param chainID the chain id
+   */
+  public static void registerExperimentalEipsOperations(
+      final OperationRegistry registry,
+      final GasCalculator gasCalculator,
+      final BigInteger chainID) {
+    registerFutureEipsOperations(registry, gasCalculator, chainID);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/ModificationNotAllowedException.java b/evm/src/main/java/org/hyperledger/besu/evm/ModificationNotAllowedException.java
similarity index 84%
rename from ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/ModificationNotAllowedException.java
rename to evm/src/main/java/org/hyperledger/besu/evm/ModificationNotAllowedException.java
index 6851a443e36..d9131a3475e 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/ModificationNotAllowedException.java
+++ b/evm/src/main/java/org/hyperledger/besu/evm/ModificationNotAllowedException.java
@@ -12,9 +12,11 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.core;
+package org.hyperledger.besu.evm;
 
+/** The Modification not allowed exception. */
 public class ModificationNotAllowedException extends RuntimeException {
+  /** Instantiates a new Modification not allowed exception. */
   public ModificationNotAllowedException() {
     super("This account may not be modified");
   }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Account.java b/evm/src/main/java/org/hyperledger/besu/evm/account/Account.java
similarity index 76%
rename from ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Account.java
rename to evm/src/main/java/org/hyperledger/besu/evm/account/Account.java
index 6758ce99585..d57a1093f20 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Account.java
+++ b/evm/src/main/java/org/hyperledger/besu/evm/account/Account.java
@@ -12,7 +12,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.core;
+package org.hyperledger.besu.evm.account;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
 
 /**
  * A world state account.
@@ -23,9 +26,12 @@
  */
 public interface Account extends AccountState {
 
+  /** The constant DEFAULT_NONCE. */
   long DEFAULT_NONCE = 0L;
+  /** The constant MAX_NONCE. */
+  long MAX_NONCE = -1; // per twos compliment rules -1 will be the unsigned max number
+  /** The constant DEFAULT_BALANCE. */
   Wei DEFAULT_BALANCE = Wei.ZERO;
-  int DEFAULT_VERSION = 0;
 
   /**
    * The account address.
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AccountState.java b/evm/src/main/java/org/hyperledger/besu/evm/account/AccountState.java
similarity index 95%
rename from ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AccountState.java
rename to evm/src/main/java/org/hyperledger/besu/evm/account/AccountState.java
index d1be2700772..a1bd0da1826 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AccountState.java
+++ b/evm/src/main/java/org/hyperledger/besu/evm/account/AccountState.java
@@ -12,7 +12,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.core;
+package org.hyperledger.besu.evm.account;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
 
 import java.util.NavigableMap;
 
@@ -90,13 +93,6 @@ default boolean hasCode() {
     return !getCode().isEmpty();
   }
 
-  /**
-   * The version of the EVM bytecode associated with this account.
-   *
-   * @return the version of the account code. Default is zero.
-   */
-  int getVersion();
-
   /**
    * Retrieves a value in the account storage given its key.
    *
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/account/AccountStorageEntry.java b/evm/src/main/java/org/hyperledger/besu/evm/account/AccountStorageEntry.java
new file mode 100644
index 00000000000..aef937c9435
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/account/AccountStorageEntry.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.account;
+
+import org.hyperledger.besu.datatypes.Hash;
+
+import java.util.Objects;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** The Account storage entry. */
+public class AccountStorageEntry {
+
+  private final UInt256 value;
+  private final Optional<UInt256> key;
+  private final Bytes32 keyHash;
+
+  private AccountStorageEntry(
+      final UInt256 value, final Bytes32 keyHash, final Optional<UInt256> key) {
+    this.key = key;
+    this.keyHash = keyHash;
+    this.value = value;
+  }
+
+  /**
+   * Create account storage entry.
+   *
+   * @param value the value
+   * @param keyHash the key hash
+   * @param key the key
+   * @return the account storage entry
+   */
+  public static AccountStorageEntry create(
+      final UInt256 value, final Bytes32 keyHash, final UInt256 key) {
+    return create(value, keyHash, Optional.ofNullable(key));
+  }
+
+  /**
+   * Create account storage entry.
+   *
+   * @param value the value
+   * @param keyHash the key hash
+   * @param key the key
+   * @return the account storage entry
+   */
+  public static AccountStorageEntry create(
+      final UInt256 value, final Bytes32 keyHash, final Optional<UInt256> key) {
+    return new AccountStorageEntry(value, keyHash, key);
+  }
+
+  /**
+   * Create account storage entry for key and value.
+   *
+   * @param key the key
+   * @param value the value
+   * @return the account storage entry
+   */
+  public static AccountStorageEntry forKeyAndValue(final UInt256 key, final UInt256 value) {
+    return create(value, Hash.hash(key), key);
+  }
+
+  /**
+   * The original key used for this storage entry. The hash of this key is used to store the value
+   * in the storage trie, so a preimage of the trie key must be available in order to provide the
+   * original key value.
+   *
+   * @return If available, returns the original key corresponding to this storage entry.
+   */
+  public Optional<UInt256> getKey() {
+    return key;
+  }
+
+  /**
+   * The hash of the storage key. When inserting storage entries the hash of the original key is
+   * used as the key. When iterating over values in the storage trie, only the hashedKey and value
+   * are available.
+   *
+   * @return The hash of the storage key.
+   */
+  public Bytes32 getKeyHash() {
+    return keyHash;
+  }
+
+  /**
+   * Gets value.
+   *
+   * @return the value
+   */
+  public UInt256 getValue() {
+    return value;
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (o == this) {
+      return true;
+    }
+    if (!(o instanceof AccountStorageEntry)) {
+      return false;
+    }
+    final AccountStorageEntry that = (AccountStorageEntry) o;
+    return Objects.equals(value, that.value)
+        && Objects.equals(key, that.key)
+        && Objects.equals(keyHash, that.keyHash);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(value, key, keyHash);
+  }
+
+  @Override
+  public String toString() {
+    return "AccountStorageEntry{"
+        + "key="
+        + key
+        + ", keyHash="
+        + keyHash
+        + ", value="
+        + value
+        + '}';
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/account/EvmAccount.java b/evm/src/main/java/org/hyperledger/besu/evm/account/EvmAccount.java
new file mode 100644
index 00000000000..ecd3cf3ceaf
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/account/EvmAccount.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.account;
+
+import org.hyperledger.besu.evm.ModificationNotAllowedException;
+
+/** The interface Evm account. */
+public interface EvmAccount extends Account {
+  /**
+   * Gets mutable account.
+   *
+   * @return the mutable account
+   * @throws ModificationNotAllowedException the modification not allowed exception
+   */
+  public MutableAccount getMutable() throws ModificationNotAllowedException;
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MutableAccount.java b/evm/src/main/java/org/hyperledger/besu/evm/account/MutableAccount.java
similarity index 93%
rename from ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MutableAccount.java
rename to evm/src/main/java/org/hyperledger/besu/evm/account/MutableAccount.java
index 8abc176fc68..a4caf35c288 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MutableAccount.java
+++ b/evm/src/main/java/org/hyperledger/besu/evm/account/MutableAccount.java
@@ -12,7 +12,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.core;
+package org.hyperledger.besu.evm.account;
+
+import org.hyperledger.besu.datatypes.Wei;
 
 import java.util.Map;
 
@@ -48,7 +50,7 @@ default long incrementNonce() {
    */
   default Wei incrementBalance(final Wei value) {
     final Wei current = getBalance();
-    setBalance(current.add(value));
+    setBalance(current.addExact(value));
     return current;
   }
 
@@ -84,13 +86,6 @@ default Wei decrementBalance(final Wei value) {
    */
   void setCode(Bytes code);
 
-  /**
-   * Sets the version for the account.
-   *
-   * @param version the version of the code being set
-   */
-  void setVersion(int version);
-
   /**
    * Sets a particular key-value pair in the account storage.
    *
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/code/CodeFactory.java b/evm/src/main/java/org/hyperledger/besu/evm/code/CodeFactory.java
new file mode 100644
index 00000000000..23b074e4334
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/code/CodeFactory.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.evm.code;
+
+import org.hyperledger.besu.evm.Code;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Code factory. */
+public final class CodeFactory {
+
+  /** The constant EOF_LEAD_BYTE. */
+  public static final byte EOF_LEAD_BYTE = -17; // 0xEF in signed byte form
+
+  private CodeFactory() {
+    // factory class, no instantiations.
+  }
+
+  /**
+   * Create Code.
+   *
+   * @param bytes the bytes
+   * @param maxEofVersion the max eof version
+   * @param inCreateOperation the in create operation
+   * @return the code
+   */
+  public static Code createCode(
+      final Bytes bytes, final int maxEofVersion, final boolean inCreateOperation) {
+    if (maxEofVersion == 0) {
+      return new CodeV0(bytes);
+    } else if (maxEofVersion == 1) {
+      int codeSize = bytes.size();
+      if (codeSize > 0 && bytes.get(0) == EOF_LEAD_BYTE) {
+        if (codeSize == 1 && !inCreateOperation) {
+          return new CodeV0(bytes);
+        }
+        if (codeSize < 3) {
+          return new CodeInvalid(bytes, "EOF Container too short");
+        }
+        if (bytes.get(1) != 0) {
+          if (inCreateOperation) {
+            // because some 0xef code made it to mainnet, this is only an error at contract create
+            return new CodeInvalid(bytes, "Incorrect second byte");
+          } else {
+            return new CodeV0(bytes);
+          }
+        }
+        int version = bytes.get(2);
+        if (version != 1) {
+          return new CodeInvalid(bytes, "Unsupported EOF Version: " + version);
+        }
+
+        final EOFLayout layout = EOFLayout.parseEOF(bytes);
+        if (!layout.isValid()) {
+          return new CodeInvalid(bytes, "Invalid EOF Layout: " + layout.getInvalidReason());
+        }
+
+        final String codeValidationError = CodeV1Validation.validateCode(layout);
+        if (codeValidationError != null) {
+          return new CodeInvalid(bytes, "EOF Code Invalid : " + codeValidationError);
+        }
+
+        final String stackValidationError = CodeV1Validation.validateStack(layout);
+        if (stackValidationError != null) {
+          return new CodeInvalid(bytes, "EOF Code Invalid : " + stackValidationError);
+        }
+
+        return new CodeV1(layout);
+      } else {
+        return new CodeV0(bytes);
+      }
+    } else {
+      return new CodeInvalid(bytes, "Unsupported max code version " + maxEofVersion);
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/code/CodeInvalid.java b/evm/src/main/java/org/hyperledger/besu/evm/code/CodeInvalid.java
new file mode 100644
index 00000000000..c28adb1b4a4
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/code/CodeInvalid.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.evm.code;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.evm.Code;
+
+import java.util.function.Supplier;
+
+import com.google.common.base.Suppliers;
+import org.apache.tuweni.bytes.Bytes;
+
+/**
+ * For code versions where code can be deemed "invalid" this represents a cachable instance of
+ * invalid code. Note that EXTCODE operations can still access invalid code.
+ */
+public class CodeInvalid implements Code {
+
+  private final Supplier<Hash> codeHash;
+  private final Bytes codeBytes;
+
+  private final String invalidReason;
+
+  /**
+   * Instantiates a new Code invalid.
+   *
+   * @param codeBytes the code bytes
+   * @param invalidReason the invalid reason
+   */
+  public CodeInvalid(final Bytes codeBytes, final String invalidReason) {
+    this.codeBytes = codeBytes;
+    this.codeHash = Suppliers.memoize(() -> Hash.hash(codeBytes));
+    this.invalidReason = invalidReason;
+  }
+
+  /**
+   * Gets invalid reason.
+   *
+   * @return the invalid reason
+   */
+  public String getInvalidReason() {
+    return invalidReason;
+  }
+
+  @Override
+  public int getSize() {
+    return codeBytes.size();
+  }
+
+  @Override
+  public Bytes getBytes() {
+    return codeBytes;
+  }
+
+  @Override
+  public Hash getCodeHash() {
+    return codeHash.get();
+  }
+
+  @Override
+  public boolean isJumpDestInvalid(final int jumpDestination) {
+    return false;
+  }
+
+  @Override
+  public boolean isValid() {
+    return false;
+  }
+
+  @Override
+  public CodeSection getCodeSection(final int section) {
+    return null;
+  }
+
+  @Override
+  public int getCodeSectionCount() {
+    return 0;
+  }
+
+  @Override
+  public int getEofVersion() {
+    return -1;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/code/CodeSection.java b/evm/src/main/java/org/hyperledger/besu/evm/code/CodeSection.java
new file mode 100644
index 00000000000..b853a1f90e7
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/code/CodeSection.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.evm.code;
+
+import java.util.Objects;
+
+//// java17 convert to record
+
+/** The code section */
+public final class CodeSection {
+
+  /** The length. */
+  final int length;
+  /** The Inputs. */
+  final int inputs;
+  /** The Outputs. */
+  final int outputs;
+  /** The Max stack height. */
+  final int maxStackHeight;
+  /** The byte offset from the begining of the container that the section starts at */
+  final int entryPoint;
+
+  /**
+   * Instantiates a new Code section.
+   *
+   * @param length the length
+   * @param inputs the inputs
+   * @param outputs the outputs
+   * @param maxStackHeight the max stack height
+   * @param entryPoint the entry point
+   */
+  public CodeSection(
+      final int length,
+      final int inputs,
+      final int outputs,
+      final int maxStackHeight,
+      final int entryPoint) {
+    this.length = length;
+    this.inputs = inputs;
+    this.outputs = outputs;
+    this.maxStackHeight = maxStackHeight;
+    this.entryPoint = entryPoint;
+  }
+
+  /**
+   * Gets Length.
+   *
+   * @return the length
+   */
+  public int getLength() {
+    return length;
+  }
+
+  /**
+   * Gets inputs.
+   *
+   * @return the inputs
+   */
+  public int getInputs() {
+    return inputs;
+  }
+
+  /**
+   * Gets outputs.
+   *
+   * @return the outputs
+   */
+  public int getOutputs() {
+    return outputs;
+  }
+
+  /**
+   * Gets max stack height.
+   *
+   * @return the max stack height
+   */
+  public int getMaxStackHeight() {
+    return maxStackHeight;
+  }
+
+  /**
+   * Get Entry Point
+   *
+   * @return the entry point.
+   */
+  public int getEntryPoint() {
+    return entryPoint;
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    CodeSection that = (CodeSection) o;
+    return length == that.length
+        && inputs == that.inputs
+        && outputs == that.outputs
+        && maxStackHeight == that.maxStackHeight;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(length, inputs, outputs, maxStackHeight);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/code/CodeV0.java b/evm/src/main/java/org/hyperledger/besu/evm/code/CodeV0.java
new file mode 100644
index 00000000000..c2263b42ac6
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/code/CodeV0.java
@@ -0,0 +1,300 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.evm.code;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.operation.JumpDestOperation;
+
+import java.util.function.Supplier;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Suppliers;
+import org.apache.tuweni.bytes.Bytes;
+
+/** The CodeV0. */
+public class CodeV0 implements Code {
+
+  /** The constant EMPTY_CODE. */
+  public static final CodeV0 EMPTY_CODE = new CodeV0(Bytes.EMPTY);
+
+  /** The bytes representing the code. */
+  private final Bytes bytes;
+
+  /** The hash of the code, needed for accessing metadata about the bytecode */
+  private final Supplier<Hash> codeHash;
+
+  /** Used to cache valid jump destinations. */
+  private long[] validJumpDestinations;
+
+  /** Code section info for the legacy code */
+  private final CodeSection codeSectionZero;
+
+  /**
+   * Public constructor.
+   *
+   * @param bytes The byte representation of the code.
+   */
+  CodeV0(final Bytes bytes) {
+    this.bytes = bytes;
+    this.codeHash = Suppliers.memoize(() -> Hash.hash(bytes));
+    this.codeSectionZero = new CodeSection(bytes.size(), 0, -1, -1, 0);
+  }
+
+  /**
+   * Returns true if the object is equal to this; otherwise false.
+   *
+   * @param other The object to compare this with.
+   * @return True if the object is equal to this; otherwise false.
+   */
+  @Override
+  public boolean equals(final Object other) {
+    if (other == null) return false;
+    if (other == this) return true;
+    if (!(other instanceof CodeV0)) return false;
+
+    final CodeV0 that = (CodeV0) other;
+    return this.bytes.equals(that.bytes);
+  }
+
+  @Override
+  public int hashCode() {
+    return bytes.hashCode();
+  }
+
+  /**
+   * Size of the Code, in bytes
+   *
+   * @return The number of bytes in the code.
+   */
+  @Override
+  public int getSize() {
+    return bytes.size();
+  }
+
+  @Override
+  public Bytes getBytes() {
+    return bytes;
+  }
+
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this).add("bytes", bytes).toString();
+  }
+
+  @Override
+  public Hash getCodeHash() {
+    return codeHash.get();
+  }
+
+  @Override
+  public boolean isJumpDestInvalid(final int jumpDestination) {
+    if (jumpDestination < 0 || jumpDestination >= getSize()) {
+      return true;
+    }
+    if (validJumpDestinations == null || validJumpDestinations.length == 0) {
+      validJumpDestinations = calculateJumpDests();
+    }
+
+    final long targetLong = validJumpDestinations[jumpDestination >>> 6];
+    final long targetBit = 1L << (jumpDestination & 0x3F);
+    return (targetLong & targetBit) == 0L;
+  }
+
+  @Override
+  public boolean isValid() {
+    return true;
+  }
+
+  @Override
+  public CodeSection getCodeSection(final int section) {
+    if (section == 0) {
+      return codeSectionZero;
+    } else {
+      return null;
+    }
+  }
+
+  @Override
+  public int getCodeSectionCount() {
+    return 1;
+  }
+
+  @Override
+  public int getEofVersion() {
+    return 0;
+  }
+
+  /**
+   * Calculate jump destination.
+   *
+   * @return the long [ ]
+   */
+  long[] calculateJumpDests() {
+    final int size = getSize();
+    final long[] bitmap = new long[(size >> 6) + 1];
+    final byte[] rawCode = bytes.toArrayUnsafe();
+    final int length = rawCode.length;
+    for (int i = 0; i < length; ) {
+      long thisEntry = 0L;
+      final int entryPos = i >> 6;
+      final int max = Math.min(64, length - (entryPos << 6));
+      int j = i & 0x3F;
+      for (; j < max; i++, j++) {
+        final byte operationNum = rawCode[i];
+        if (operationNum >= JumpDestOperation.OPCODE) {
+          switch (operationNum) {
+            case JumpDestOperation.OPCODE:
+              thisEntry |= 1L << j;
+              break;
+            case 0x60:
+              i += 1;
+              j += 1;
+              break;
+            case 0x61:
+              i += 2;
+              j += 2;
+              break;
+            case 0x62:
+              i += 3;
+              j += 3;
+              break;
+            case 0x63:
+              i += 4;
+              j += 4;
+              break;
+            case 0x64:
+              i += 5;
+              j += 5;
+              break;
+            case 0x65:
+              i += 6;
+              j += 6;
+              break;
+            case 0x66:
+              i += 7;
+              j += 7;
+              break;
+            case 0x67:
+              i += 8;
+              j += 8;
+              break;
+            case 0x68:
+              i += 9;
+              j += 9;
+              break;
+            case 0x69:
+              i += 10;
+              j += 10;
+              break;
+            case 0x6a:
+              i += 11;
+              j += 11;
+              break;
+            case 0x6b:
+              i += 12;
+              j += 12;
+              break;
+            case 0x6c:
+              i += 13;
+              j += 13;
+              break;
+            case 0x6d:
+              i += 14;
+              j += 14;
+              break;
+            case 0x6e:
+              i += 15;
+              j += 15;
+              break;
+            case 0x6f:
+              i += 16;
+              j += 16;
+              break;
+            case 0x70:
+              i += 17;
+              j += 17;
+              break;
+            case 0x71:
+              i += 18;
+              j += 18;
+              break;
+            case 0x72:
+              i += 19;
+              j += 19;
+              break;
+            case 0x73:
+              i += 20;
+              j += 20;
+              break;
+            case 0x74:
+              i += 21;
+              j += 21;
+              break;
+            case 0x75:
+              i += 22;
+              j += 22;
+              break;
+            case 0x76:
+              i += 23;
+              j += 23;
+              break;
+            case 0x77:
+              i += 24;
+              j += 24;
+              break;
+            case 0x78:
+              i += 25;
+              j += 25;
+              break;
+            case 0x79:
+              i += 26;
+              j += 26;
+              break;
+            case 0x7a:
+              i += 27;
+              j += 27;
+              break;
+            case 0x7b:
+              i += 28;
+              j += 28;
+              break;
+            case 0x7c:
+              i += 29;
+              j += 29;
+              break;
+            case 0x7d:
+              i += 30;
+              j += 30;
+              break;
+            case 0x7e:
+              i += 31;
+              j += 31;
+              break;
+            case 0x7f:
+              i += 32;
+              j += 32;
+              break;
+            default:
+          }
+        }
+      }
+      bitmap[entryPos] = thisEntry;
+    }
+    return bitmap;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/code/CodeV1.java b/evm/src/main/java/org/hyperledger/besu/evm/code/CodeV1.java
new file mode 100644
index 00000000000..f45cab025e3
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/code/CodeV1.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.evm.code;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.evm.Code;
+
+import java.util.Objects;
+import java.util.function.Supplier;
+
+import com.google.common.base.Suppliers;
+import org.apache.tuweni.bytes.Bytes;
+
+/** The CodeV1. */
+public class CodeV1 implements Code {
+
+  private final Supplier<Hash> codeHash;
+  EOFLayout eofLayout;
+
+  /**
+   * Instantiates a new CodeV1.
+   *
+   * @param layout the layout
+   */
+  CodeV1(final EOFLayout layout) {
+    this.eofLayout = layout;
+    this.codeHash = Suppliers.memoize(() -> Hash.hash(eofLayout.getContainer()));
+  }
+
+  @Override
+  public int getSize() {
+    return eofLayout.getContainer().size();
+  }
+
+  @Override
+  public CodeSection getCodeSection(final int section) {
+    checkArgument(section >= 0, "Section number is positive");
+    checkArgument(section < eofLayout.getCodeSectionCount(), "Section index is valid");
+    return eofLayout.getCodeSection(section);
+  }
+
+  @Override
+  public int getCodeSectionCount() {
+    return eofLayout.getCodeSectionCount();
+  }
+
+  @Override
+  public Bytes getBytes() {
+    return eofLayout.getContainer();
+  }
+
+  @Override
+  public Hash getCodeHash() {
+    return codeHash.get();
+  }
+
+  @Override
+  public boolean isJumpDestInvalid(final int jumpDestination) {
+    return true; // code validation ensures this
+  }
+
+  @Override
+  public boolean isValid() {
+    return true;
+  }
+
+  @Override
+  public int getEofVersion() {
+    return eofLayout.getVersion();
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    final CodeV1 codeV1 = (CodeV1) o;
+    return codeHash.equals(codeV1.codeHash) && Objects.equals(eofLayout, codeV1.eofLayout);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(codeHash, eofLayout);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/code/CodeV1Validation.java b/evm/src/main/java/org/hyperledger/besu/evm/code/CodeV1Validation.java
new file mode 100644
index 00000000000..6174a2734af
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/code/CodeV1Validation.java
@@ -0,0 +1,803 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.evm.code;
+
+import static org.hyperledger.besu.evm.internal.Words.readBigEndianI16;
+import static org.hyperledger.besu.evm.internal.Words.readBigEndianU16;
+
+import org.hyperledger.besu.evm.operation.CallFOperation;
+import org.hyperledger.besu.evm.operation.PushOperation;
+import org.hyperledger.besu.evm.operation.RelativeJumpIfOperation;
+import org.hyperledger.besu.evm.operation.RelativeJumpOperation;
+import org.hyperledger.besu.evm.operation.RelativeJumpVectorOperation;
+import org.hyperledger.besu.evm.operation.RetFOperation;
+
+import java.util.Arrays;
+import java.util.BitSet;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** Code V1 Validation */
+public final class CodeV1Validation {
+
+  private CodeV1Validation() {
+    // to prevent instantiation
+  }
+
+  static final byte INVALID = 0x01;
+  static final byte VALID = 0x02;
+  static final byte TERMINAL = 0x04;
+  static final byte VALID_AND_TERMINAL = VALID | TERMINAL;
+  static final byte[] OPCODE_ATTRIBUTES = {
+    VALID_AND_TERMINAL, // 0x00	STOP
+    VALID, // 0x01 - ADD
+    VALID, // 0x02 - MUL
+    VALID, // 0x03 - SUB
+    VALID, // 0x04 - DIV
+    VALID, // 0x05 - SDIV
+    VALID, // 0x06 - MOD
+    VALID, // 0x07 - SMOD
+    VALID, // 0x08 - ADDMOD
+    VALID, // 0x09 - MULMOD
+    VALID, // 0x0a - EXP
+    VALID, // 0x0b - SIGNEXTEND
+    INVALID, // 0x0c
+    INVALID, // 0x0d
+    INVALID, // 0x0e
+    INVALID, // 0x0f
+    VALID, // 0x10 - LT
+    VALID, // 0x11 - GT
+    VALID, // 0x12 - SLT
+    VALID, // 0x13 - SGT
+    VALID, // 0x14 - EQ
+    VALID, // 0x15 - ISZERO
+    VALID, // 0x16 - AND
+    VALID, // 0x17 - OR
+    VALID, // 0x18 - XOR
+    VALID, // 0x19 - NOT
+    VALID, // 0x1a - BYTE
+    VALID, // 0x1b - SHL
+    VALID, // 0x1c - SHR
+    VALID, // 0x1d - SAR
+    INVALID, // 0x1e
+    INVALID, // 0x1f
+    VALID, // 0x20 - SHA3
+    INVALID, // 0x21
+    INVALID, // 0x22
+    INVALID, // 0x23
+    INVALID, // 0x24
+    INVALID, // 0x25
+    INVALID, // 0x26
+    INVALID, // 0x27
+    INVALID, // 0x28
+    INVALID, // 0x29
+    INVALID, // 0x2a
+    INVALID, // 0x2b
+    INVALID, // 0x2c
+    INVALID, // 0x2d
+    INVALID, // 0x2e
+    INVALID, // 0x2f
+    VALID, // 0x30 - ADDRESS
+    VALID, // 0x31 - BALANCE
+    VALID, // 0x32 - ORIGIN
+    VALID, // 0x33 - CALLER
+    VALID, // 0x34 - CALLVALUE
+    VALID, // 0x35 - CALLDATALOAD
+    VALID, // 0x36 - CALLDATASIZE
+    VALID, // 0x37 - CALLDATACOPY
+    VALID, // 0x38 - CODESIZE
+    VALID, // 0x39 - CODECOPY
+    VALID, // 0x3a - GASPRICE
+    VALID, // 0x3b - EXTCODESIZE
+    VALID, // 0x3c - EXTCODECOPY
+    VALID, // 0x3d - RETURNDATASIZE
+    VALID, // 0x3e - RETURNDATACOPY
+    VALID, // 0x3f - EXTCODEHASH
+    VALID, // 0x40 - BLOCKHASH
+    VALID, // 0x41 - COINBASE
+    VALID, // 0x42 - TIMESTAMP
+    VALID, // 0x43 - NUMBER
+    VALID, // 0x44 - PREVRANDAO (née DIFFICULTY)
+    VALID, // 0x45 - GASLIMIT
+    VALID, // 0x46 - CHAINID
+    VALID, // 0x47 - SELFBALANCE
+    VALID, // 0x48 - BASEFEE
+    INVALID, // 0x49
+    INVALID, // 0x4a
+    INVALID, // 0x4b
+    INVALID, // 0x4c
+    INVALID, // 0x4d
+    INVALID, // 0x4e
+    INVALID, // 0x4f
+    VALID, // 0x50 - POP
+    VALID, // 0x51 - MLOAD
+    VALID, // 0x52 - MSTORE
+    VALID, // 0x53 - MSTORE8
+    VALID, // 0x54 - SLOAD
+    VALID, // 0x55 - SSTORE
+    INVALID, // 0x56 - JUMP
+    INVALID, // 0x57 - JUMPI
+    INVALID, // 0x58 - PC
+    VALID, // 0x59 - MSIZE
+    VALID, // 0x5a - GAS
+    VALID, // 0x5b - NOOOP (née JUMPDEST)
+    VALID, // 0X5c - TLOAD
+    VALID, // 0X5d - TSTORE
+    VALID, // 0X5e - MCOPY
+    VALID, // 0X5f - PUSH0
+    VALID, // 0x60 - PUSH1
+    VALID, // 0x61 - PUSH2
+    VALID, // 0x62 - PUSH3
+    VALID, // 0x63 - PUSH4
+    VALID, // 0x64 - PUSH5
+    VALID, // 0x65 - PUSH6
+    VALID, // 0x66 - PUSH7
+    VALID, // 0x67 - PUSH8
+    VALID, // 0x68 - PUSH9
+    VALID, // 0x69 - PUSH10
+    VALID, // 0x6a - PUSH11
+    VALID, // 0x6b - PUSH12
+    VALID, // 0x6c - PUSH13
+    VALID, // 0x6d - PUSH14
+    VALID, // 0x6e - PUSH15
+    VALID, // 0x6f - PUSH16
+    VALID, // 0x70 - PUSH17
+    VALID, // 0x71 - PUSH18
+    VALID, // 0x72 - PUSH19
+    VALID, // 0x73 - PUSH20
+    VALID, // 0x74 - PUSH21
+    VALID, // 0x75 - PUSH22
+    VALID, // 0x76 - PUSH23
+    VALID, // 0x77 - PUSH24
+    VALID, // 0x78 - PUSH25
+    VALID, // 0x79 - PUSH26
+    VALID, // 0x7a - PUSH27
+    VALID, // 0x7b - PUSH28
+    VALID, // 0x7c - PUSH29
+    VALID, // 0x7d - PUSH30
+    VALID, // 0x7e - PUSH31
+    VALID, // 0x7f - PUSH32
+    VALID, // 0x80 - DUP1
+    VALID, // 0x81 - DUP2
+    VALID, // 0x82 - DUP3
+    VALID, // 0x83 - DUP4
+    VALID, // 0x84 - DUP5
+    VALID, // 0x85 - DUP6
+    VALID, // 0x86 - DUP7
+    VALID, // 0x87 - DUP8
+    VALID, // 0x88 - DUP9
+    VALID, // 0x89 - DUP10
+    VALID, // 0x8a - DUP11
+    VALID, // 0x8b - DUP12
+    VALID, // 0x8c - DUP13
+    VALID, // 0x8d - DUP14
+    VALID, // 0x8e - DUP15
+    VALID, // 0x8f - DUP16
+    VALID, // 0x90 - SWAP1
+    VALID, // 0x91 - SWAP2
+    VALID, // 0x92 - SWAP3
+    VALID, // 0x93 - SWAP4
+    VALID, // 0x94 - SWAP5
+    VALID, // 0x95 - SWAP6
+    VALID, // 0x96 - SWAP7
+    VALID, // 0x97 - SWAP8
+    VALID, // 0x98 - SWAP9
+    VALID, // 0x99 - SWAP10
+    VALID, // 0x9a - SWAP11
+    VALID, // 0x9b - SWAP12
+    VALID, // 0x9c - SWAP13
+    VALID, // 0x9d - SWAP14
+    VALID, // 0x9e - SWAP15
+    VALID, // 0x9f - SWAP16
+    VALID, // 0xa0 - LOG0
+    VALID, // 0xa1 - LOG1
+    VALID, // 0xa2 - LOG2
+    VALID, // 0xa3 - LOG3
+    VALID, // 0xa4 - LOG4
+    INVALID, // 0xa5
+    INVALID, // 0xa6
+    INVALID, // 0xa7
+    INVALID, // 0xa8
+    INVALID, // 0xa9
+    INVALID, // 0xaa
+    INVALID, // 0xab
+    INVALID, // 0xac
+    INVALID, // 0xad
+    INVALID, // 0xae
+    INVALID, // 0xaf
+    INVALID, // 0xb0
+    INVALID, // 0xb1
+    INVALID, // 0xb2
+    INVALID, // 0xb3
+    INVALID, // 0xb4
+    INVALID, // 0xb5
+    INVALID, // 0xb6
+    INVALID, // 0xb7
+    INVALID, // 0xb8
+    INVALID, // 0xb9
+    INVALID, // 0xba
+    INVALID, // 0xbb
+    INVALID, // 0xbc
+    INVALID, // 0xbd
+    INVALID, // 0xbe
+    INVALID, // 0xbf
+    INVALID, // 0xc0
+    INVALID, // 0xc1
+    INVALID, // 0xc2
+    INVALID, // 0xc3
+    INVALID, // 0xc4
+    INVALID, // 0xc5
+    INVALID, // 0xc6
+    INVALID, // 0xc7
+    INVALID, // 0xc8
+    INVALID, // 0xc9
+    INVALID, // 0xca
+    INVALID, // 0xcb
+    INVALID, // 0xcc
+    INVALID, // 0xcd
+    INVALID, // 0xce
+    INVALID, // 0xcf
+    INVALID, // 0xd0
+    INVALID, // 0xd1
+    INVALID, // 0xd2
+    INVALID, // 0xd3
+    INVALID, // 0xd4
+    INVALID, // 0xd5
+    INVALID, // 0xd6
+    INVALID, // 0xd7
+    INVALID, // 0xd8
+    INVALID, // 0xd9
+    INVALID, // 0xda
+    INVALID, // 0xdb
+    INVALID, // 0xdc
+    INVALID, // 0xdd
+    INVALID, // 0xde
+    INVALID, // 0xef
+    VALID_AND_TERMINAL, // 0xe0 - RJUMP
+    VALID, // 0xe1 - RJUMPI
+    VALID, // 0xe2 - RJUMPV
+    VALID, // 0xe3 - CALLF
+    VALID_AND_TERMINAL, // 0xe4 - RETF
+    INVALID, // 0xe5
+    INVALID, // 0xe6
+    INVALID, // 0xe7
+    INVALID, // 0xe8
+    INVALID, // 0xe9
+    INVALID, // 0xea
+    INVALID, // 0xeb
+    INVALID, // 0xec
+    INVALID, // 0xed
+    INVALID, // 0xee
+    INVALID, // 0xef
+    VALID, // 0xf0 - CREATE
+    VALID, // 0xf1 - CALL
+    INVALID, // 0xf2 - CALLCODE
+    VALID_AND_TERMINAL, // 0xf3 - RETURN
+    VALID, // 0xf4 - DELEGATECALL
+    VALID, // 0xf5 - CREATE2
+    INVALID, // 0xf6
+    INVALID, // 0xf7
+    INVALID, // 0xf8
+    INVALID, // 0xf9
+    VALID, // 0xfa - STATICCALL
+    INVALID, // 0xfb
+    INVALID, // 0xfc
+    VALID_AND_TERMINAL, // 0xfd - REVERT
+    VALID_AND_TERMINAL, // 0xfe - INVALID
+    INVALID, // 0xff - SELFDESTRUCT
+  };
+  static final int MAX_STACK_HEIGHT = 1024;
+  // java17 move to record
+  // [0] - stack input consumed
+  // [1] - stack outputs added
+  // [2] - PC advance
+  static final byte[][] OPCODE_STACK_VALIDATION = {
+    {0, 0, -1}, // 0x00 - STOP
+    {2, 1, 1}, // 0x01 - ADD
+    {2, 1, 1}, // 0x02 - MUL
+    {2, 1, 1}, // 0x03 - SUB
+    {2, 1, 1}, // 0x04 - DIV
+    {2, 1, 1}, // 0x05 - SDIV
+    {2, 1, 1}, // 0x06 - MOD
+    {2, 1, 1}, // 0x07 - SMOD
+    {3, 1, 1}, // 0x08 - ADDMOD
+    {3, 1, 1}, // 0x09 - MULMOD
+    {2, 1, 1}, // 0x0a - EXP
+    {2, 1, 1}, // 0x0b - SIGNEXTEND
+    {0, 0, 0}, // 0x0c
+    {0, 0, 0}, // 0x0d
+    {0, 0, 0}, // 0x0e
+    {0, 0, 0}, // 0x0f
+    {2, 1, 1}, // 0x10 - LT
+    {2, 1, 1}, // 0x11 - GT
+    {2, 1, 1}, // 0x12 - SLT
+    {2, 1, 1}, // 0x13 - SGT
+    {2, 1, 1}, // 0x14 - EQ
+    {1, 1, 1}, // 0x15 - ISZERO
+    {2, 1, 1}, // 0x16 - AND
+    {2, 1, 1}, // 0x17 - OR
+    {2, 1, 1}, // 0x18 - XOR
+    {1, 1, 1}, // 0x19 - NOT
+    {2, 1, 1}, // 0x1a - BYTE
+    {2, 1, 1}, // 0x1b - SHL
+    {2, 1, 1}, // 0x1c - SHR
+    {2, 1, 1}, // 0x1d - SAR
+    {0, 0, 0}, // 0x1e
+    {0, 0, 0}, // 0x1f
+    {2, 1, 1}, // 0x20 - SHA3
+    {0, 0, 0}, // 0x21
+    {0, 0, 0}, // 0x22
+    {0, 0, 0}, // 0x23
+    {0, 0, 0}, // 0x24
+    {0, 0, 0}, // 0x25
+    {0, 0, 0}, // 0x26
+    {0, 0, 0}, // 0x27
+    {0, 0, 0}, // 0x28
+    {0, 0, 0}, // 0x29
+    {0, 0, 0}, // 0x2a
+    {0, 0, 0}, // 0x2b
+    {0, 0, 0}, // 0x2c
+    {0, 0, 0}, // 0x2d
+    {0, 0, 0}, // 0x2e
+    {0, 0, 0}, // 0x2f
+    {0, 1, 1}, // 0x30 - ADDRESS
+    {1, 1, 1}, // 0x31 - BALANCE
+    {0, 1, 1}, // 0x32 - ORIGIN
+    {0, 1, 1}, // 0x33 - CALLER
+    {0, 1, 1}, // 0x34 - CALLVALUE
+    {1, 1, 1}, // 0x35 - CALLDATALOAD
+    {0, 1, 1}, // 0x36 - CALLDATASIZE
+    {3, 0, 1}, // 0x37 - CALLDATACOPY
+    {0, 1, 1}, // 0x38 - CODESIZE
+    {3, 0, 1}, // 0x39 - CODECOPY
+    {0, 1, 1}, // 0x3a - GASPRICE
+    {1, 1, 1}, // 0x3b - EXTCODESIZE
+    {4, 0, 1}, // 0x3c - EXTCODECOPY
+    {0, 1, 1}, // 0x3d - RETURNDATASIZE
+    {3, 0, 1}, // 0x3e - RETURNDATACOPY
+    {1, 1, 1}, // 0x3f - EXTCODEHASH
+    {1, 1, 1}, // 0x40 - BLOCKHASH
+    {0, 1, 1}, // 0x41 - COINBASE
+    {0, 1, 1}, // 0x42 - TIMESTAMP
+    {0, 1, 1}, // 0x43 - NUMBER
+    {0, 1, 1}, // 0x44 - PREVRANDAO (née DIFFICULTY)
+    {0, 1, 1}, // 0x45 - GASLIMIT
+    {0, 1, 1}, // 0x46 - CHAINID
+    {0, 1, 1}, // 0x47 - SELFBALANCE
+    {0, 1, 1}, // 0x48 - BASEFEE
+    {0, 0, 0}, // 0x49
+    {0, 0, 0}, // 0x4a
+    {0, 0, 0}, // 0x4b
+    {0, 0, 0}, // 0x4c
+    {0, 0, 0}, // 0x4d
+    {0, 0, 0}, // 0x4e
+    {0, 0, 0}, // 0x4f
+    {1, 0, 1}, // 0x50 - POP
+    {1, 1, 1}, // 0x51 - MLOAD
+    {2, 0, 1}, // 0x52 - MSTORE
+    {2, 0, 1}, // 0x53 - MSTORE8
+    {1, 1, 1}, // 0x54 - SLOAD
+    {2, 0, 1}, // 0x55 - SSTORE
+    {0, 0, 0}, // 0x56 - JUMP
+    {0, 0, 0}, // 0x57 - JUMPI
+    {0, 0, 0}, // 0x58 - PC
+    {0, 1, 1}, // 0x59 - MSIZE
+    {0, 1, 1}, // 0x5a - GAS
+    {0, 0, 1}, // 0x5b - NOOP (née JUMPDEST)
+    {1, 1, 1}, // 0x5c - TLOAD
+    {2, 0, 1}, // 0x5d - TSTORE
+    {4, 0, 1}, // 0x5e - MCOPY
+    {0, 1, 1}, // 0x5f - PUSH0
+    {0, 1, 2}, // 0x60 - PUSH1
+    {0, 1, 3}, // 0x61 - PUSH2
+    {0, 1, 4}, // 0x62 - PUSH3
+    {0, 1, 5}, // 0x63 - PUSH4
+    {0, 1, 6}, // 0x64 - PUSH5
+    {0, 1, 7}, // 0x65 - PUSH6
+    {0, 1, 8}, // 0x66 - PUSH7
+    {0, 1, 9}, // 0x67 - PUSH8
+    {0, 1, 10}, // 0x68 - PUSH9
+    {0, 1, 11}, // 0x69 - PUSH10
+    {0, 1, 12}, // 0x6a - PUSH11
+    {0, 1, 13}, // 0x6b - PUSH12
+    {0, 1, 14}, // 0x6c - PUSH13
+    {0, 1, 15}, // 0x6d - PUSH14
+    {0, 1, 16}, // 0x6e - PUSH15
+    {0, 1, 17}, // 0x6f - PUSH16
+    {0, 1, 18}, // 0x70 - PUSH17
+    {0, 1, 19}, // 0x71 - PUSH18
+    {0, 1, 20}, // 0x72 - PUSH19
+    {0, 1, 21}, // 0x73 - PUSH20
+    {0, 1, 22}, // 0x74 - PUSH21
+    {0, 1, 23}, // 0x75 - PUSH22
+    {0, 1, 24}, // 0x76 - PUSH23
+    {0, 1, 25}, // 0x77 - PUSH24
+    {0, 1, 26}, // 0x78 - PUSH25
+    {0, 1, 27}, // 0x79 - PUSH26
+    {0, 1, 28}, // 0x7a - PUSH27
+    {0, 1, 29}, // 0x7b - PUSH28
+    {0, 1, 30}, // 0x7c - PUSH29
+    {0, 1, 31}, // 0x7d - PUSH30
+    {0, 1, 32}, // 0x7e - PUSH31
+    {0, 1, 33}, // 0x7f - PUSH32
+    {1, 2, 1}, // 0x80 - DUP1
+    {2, 3, 1}, // 0x81 - DUP2
+    {3, 4, 1}, // 0x82 - DUP3
+    {4, 5, 1}, // 0x83 - DUP4
+    {5, 6, 1}, // 0x84 - DUP5
+    {6, 7, 1}, // 0x85 - DUP6
+    {7, 8, 1}, // 0x86 - DUP7
+    {8, 9, 1}, // 0x87 - DUP8
+    {9, 10, 1}, // 0x88 - DUP9
+    {10, 11, 1}, // 0x89 - DUP10
+    {11, 12, 1}, // 0x8a - DUP11
+    {12, 13, 1}, // 0x8b - DUP12
+    {13, 14, 1}, // 0x8c - DUP13
+    {14, 15, 1}, // 0x8d - DUP14
+    {15, 16, 1}, // 0x8e - DUP15
+    {16, 17, 1}, // 0x8f - DUP16
+    {2, 2, 1}, // 0x90 - SWAP1
+    {3, 3, 1}, // 0x91 - SWAP2
+    {4, 4, 1}, // 0x92 - SWAP3
+    {5, 5, 1}, // 0x93 - SWAP4
+    {6, 6, 1}, // 0x94 - SWAP5
+    {7, 7, 1}, // 0x95 - SWAP6
+    {8, 8, 1}, // 0x96 - SWAP7
+    {9, 9, 1}, // 0x97 - SWAP8
+    {10, 10, 1}, // 0x98 - SWAP9
+    {11, 11, 1}, // 0x99 - SWAP10
+    {12, 12, 1}, // 0x9a - SWAP11
+    {13, 13, 1}, // 0x9b - SWAP12
+    {14, 14, 1}, // 0x9c - SWAP13
+    {15, 15, 1}, // 0x9d - SWAP14
+    {16, 16, 1}, // 0x9e - SWAP15
+    {17, 17, 1}, // 0x9f - SWAP16
+    {2, 0, 1}, // 0xa0 - LOG0
+    {3, 0, 1}, // 0xa1 - LOG1
+    {4, 0, 1}, // 0xa2 - LOG2
+    {5, 0, 1}, // 0xa3 - LOG3
+    {6, 0, 1}, // 0xa4 - LOG4
+    {0, 0, 0}, // 0xa5
+    {0, 0, 0}, // 0xa6
+    {0, 0, 0}, // 0xa7
+    {0, 0, 0}, // 0xa8
+    {0, 0, 0}, // 0xa9
+    {0, 0, 0}, // 0xaa
+    {0, 0, 0}, // 0xab
+    {0, 0, 0}, // 0xac
+    {0, 0, 0}, // 0xad
+    {0, 0, 0}, // 0xae
+    {0, 0, 0}, // 0xaf
+    {0, 0, 0}, // 0xb0
+    {0, 0, 0}, // 0xb1
+    {0, 0, 0}, // 0xb2
+    {0, 0, 0}, // 0xb3
+    {0, 0, 0}, // 0xb4
+    {0, 0, 0}, // 0xb5
+    {0, 0, 0}, // 0xb6
+    {0, 0, 0}, // 0xb7
+    {0, 0, 0}, // 0xb8
+    {0, 0, 0}, // 0xb9
+    {0, 0, 0}, // 0xba
+    {0, 0, 0}, // 0xbb
+    {0, 0, 0}, // 0xbc
+    {0, 0, 0}, // 0xbd
+    {0, 0, 0}, // 0xbe
+    {0, 0, 0}, // 0xbf
+    {0, 0, 0}, // 0xc0
+    {0, 0, 0}, // 0xc1
+    {0, 0, 0}, // 0xc2
+    {0, 0, 0}, // 0xc3
+    {0, 0, 0}, // 0xc4
+    {0, 0, 0}, // 0xc5
+    {0, 0, 0}, // 0xc6
+    {0, 0, 0}, // 0xc7
+    {0, 0, 0}, // 0xc8
+    {0, 0, 0}, // 0xc9
+    {0, 0, 0}, // 0xca
+    {0, 0, 0}, // 0xcb
+    {0, 0, 0}, // 0xcc
+    {0, 0, 0}, // 0xcd
+    {0, 0, 0}, // 0xce
+    {0, 0, 0}, // 0xcf
+    {0, 0, 0}, // 0xd0
+    {0, 0, 0}, // 0xd1
+    {0, 0, 0}, // 0xd2
+    {0, 0, 0}, // 0xd3
+    {0, 0, 0}, // 0xd4
+    {0, 0, 0}, // 0xd5
+    {0, 0, 0}, // 0xd6
+    {0, 0, 0}, // 0xd7
+    {0, 0, 0}, // 0xd8
+    {0, 0, 0}, // 0xd9
+    {0, 0, 0}, // 0xda
+    {0, 0, 0}, // 0xdb
+    {0, 0, 0}, // 0xdc
+    {0, 0, 0}, // 0xdd
+    {0, 0, 0}, // 0xde
+    {0, 0, 0}, // 0xef
+    {0, 0, -3}, // 0xe0 - RJUMP
+    {1, 0, 3}, // 0xe1 - RJUMPI
+    {1, 0, 2}, // 0xe2 - RJUMPV
+    {0, 0, 3}, // 0xe3 - CALLF
+    {0, 0, -1}, // 0xe4 - RETF
+    {0, 0, 0}, // 0xe5 - JUMPF
+    {0, 0, 0}, // 0xe6
+    {0, 0, 0}, // 0xe7
+    {0, 0, 0}, // 0xe8
+    {0, 0, 0}, // 0xe9
+    {0, 0, 0}, // 0xea
+    {0, 0, 0}, // 0xeb
+    {0, 0, 0}, // 0xec
+    {0, 0, 0}, // 0xed
+    {0, 0, 0}, // 0xee
+    {0, 0, 0}, // 0xef
+    {3, 1, 1}, // 0xf0 - CREATE
+    {7, 1, 1}, // 0xf1 - CALL
+    {0, 0, 0}, // 0xf2 - CALLCODE
+    {2, 0, -1}, // 0xf3 - RETURN
+    {6, 1, 1}, // 0xf4 - DELEGATECALL
+    {4, 1, 1}, // 0xf5 - CREATE2
+    {0, 0, 0}, // 0xf6
+    {0, 0, 0}, // 0xf7
+    {0, 0, 0}, // 0xf8
+    {0, 0, 0}, // 0xf9
+    {6, 1, 1}, // 0xfa - STATICCALL
+    {0, 0, 0}, // 0xfb
+    {0, 0, 0}, // 0xfc
+    {2, 0, -1}, // 0xfd - REVERT
+    {0, 0, -1}, // 0xfe - INVALID
+    {0, 0, 0}, // 0xff - SELFDESTRUCT
+  };
+
+  /**
+   * Validate Code
+   *
+   * @param eofLayout The EOF Layout
+   * @return validation code, null otherwise.
+   */
+  public static String validateCode(final EOFLayout eofLayout) {
+    int sectionCount = eofLayout.getCodeSectionCount();
+    for (int i = 0; i < sectionCount; i++) {
+      CodeSection cs = eofLayout.getCodeSection(i);
+      var validation =
+          CodeV1Validation.validateCode(
+              eofLayout.getContainer().slice(cs.getEntryPoint(), cs.getLength()), sectionCount);
+      if (validation != null) {
+        return validation;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * validates the code section
+   *
+   * @param code the code section code
+   * @return null if valid, otherwise a string containing an error reason.
+   */
+  static String validateCode(final Bytes code, final int sectionCount) {
+    final int size = code.size();
+    final BitSet rjumpdests = new BitSet(size);
+    final BitSet immediates = new BitSet(size);
+    final byte[] rawCode = code.toArrayUnsafe();
+    int attribute = INVALID;
+    int pos = 0;
+    while (pos < size) {
+      final int operationNum = rawCode[pos] & 0xff;
+      attribute = OPCODE_ATTRIBUTES[operationNum];
+      if ((attribute & INVALID) == INVALID) {
+        // undefined instruction
+        return String.format("Invalid Instruction 0x%02x", operationNum);
+      }
+      pos += 1;
+      int pcPostInstruction = pos;
+      if (operationNum > PushOperation.PUSH_BASE && operationNum <= PushOperation.PUSH_MAX) {
+        final int multiByteDataLen = operationNum - PushOperation.PUSH_BASE;
+        pcPostInstruction += multiByteDataLen;
+      } else if (operationNum == RelativeJumpOperation.OPCODE
+          || operationNum == RelativeJumpIfOperation.OPCODE) {
+        if (pos + 2 > size) {
+          return "Truncated relative jump offset";
+        }
+        pcPostInstruction += 2;
+        final int offset = readBigEndianI16(pos, rawCode);
+        final int rjumpdest = pcPostInstruction + offset;
+        if (rjumpdest < 0 || rjumpdest >= size) {
+          return "Relative jump destination out of bounds";
+        }
+        rjumpdests.set(rjumpdest);
+      } else if (operationNum == RelativeJumpVectorOperation.OPCODE) {
+        if (pos + 1 > size) {
+          return "Truncated jump table";
+        }
+        final int jumpTableSize = RelativeJumpVectorOperation.getVectorSize(code, pos);
+        if (jumpTableSize == 0) {
+          return "Empty jump table";
+        }
+        pcPostInstruction += 1 + 2 * jumpTableSize;
+        if (pcPostInstruction > size) {
+          return "Truncated jump table";
+        }
+        for (int offsetPos = pos + 1; offsetPos < pcPostInstruction; offsetPos += 2) {
+          final int offset = readBigEndianI16(offsetPos, rawCode);
+          final int rjumpdest = pcPostInstruction + offset;
+          if (rjumpdest < 0 || rjumpdest >= size) {
+            return "Relative jump destination out of bounds";
+          }
+          rjumpdests.set(rjumpdest);
+        }
+      } else if (operationNum == CallFOperation.OPCODE) {
+        if (pos + 2 > size) {
+          return "Truncated CALLF";
+        }
+        int section = readBigEndianU16(pos, rawCode);
+        if (section >= sectionCount) {
+          return "CALLF to non-existent section - " + Integer.toHexString(section);
+        }
+        pcPostInstruction += 2;
+      }
+      immediates.set(pos, pcPostInstruction);
+      pos = pcPostInstruction;
+    }
+    if ((attribute & TERMINAL) != TERMINAL) {
+      return "No terminating instruction";
+    }
+    if (rjumpdests.intersects(immediates)) {
+      return "Relative jump destinations targets invalid immediate data";
+    }
+    return null;
+  }
+
+  static String validateStack(final EOFLayout eofLayout) {
+    for (int i = 0; i < eofLayout.getCodeSectionCount(); i++) {
+      var validation = CodeV1Validation.validateStack(i, eofLayout);
+      if (validation != null) {
+        return validation;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Validates the stack heights per <a href="https://eips.ethereum.org/EIPS/eip-5450">EIP-5450</a>.
+   *
+   * <p>This presumes code validation has already been performed, so there are no RJUMPS into
+   * immediates as well as no immediates falling off of the end of code sections.
+   *
+   * @param codeSectionToValidate The index of code to validate in the code sections
+   * @param eofLayout The EOF container to validate
+   * @return null if valid, otherwise an error string providing the validation error.
+   */
+  public static String validateStack(final int codeSectionToValidate, final EOFLayout eofLayout) {
+    try {
+      CodeSection toValidate = eofLayout.getCodeSection(codeSectionToValidate);
+      byte[] code =
+          eofLayout.getContainer().slice(toValidate.entryPoint, toValidate.length).toArrayUnsafe();
+      int codeLength = code.length;
+      int[] stackHeights = new int[codeLength];
+      Arrays.fill(stackHeights, -1);
+
+      int thisWork = 0;
+      int maxWork = 1;
+      int[][] workList = new int[codeLength][2];
+
+      int initialStackHeight = toValidate.getInputs();
+      int maxStackHeight = initialStackHeight;
+      stackHeights[0] = initialStackHeight;
+      workList[0][1] = initialStackHeight;
+      int unusedBytes = codeLength;
+
+      while (thisWork < maxWork) {
+        int currentPC = workList[thisWork][0];
+        int currentStackHeight = workList[thisWork][1];
+        if (thisWork > 0 && stackHeights[currentPC] >= 0) {
+          // we've been here, validate the jump is what is expected
+          if (stackHeights[currentPC] != currentStackHeight) {
+            return String.format(
+                "Jump into code stack height (%d) does not match previous value (%d)",
+                stackHeights[currentPC], currentStackHeight);
+          } else {
+            thisWork++;
+            continue;
+          }
+        } else {
+          stackHeights[currentPC] = currentStackHeight;
+        }
+
+        while (currentPC < codeLength) {
+          int thisOp = code[currentPC] & 0xff;
+
+          byte[] stackInfo = OPCODE_STACK_VALIDATION[thisOp];
+          int stackInputs;
+          int stackOutputs;
+          int pcAdvance = stackInfo[2];
+          if (thisOp == CallFOperation.OPCODE) {
+            int section = readBigEndianU16(currentPC + 1, code);
+            stackInputs = eofLayout.getCodeSection(section).getInputs();
+            stackOutputs = eofLayout.getCodeSection(section).getOutputs();
+          } else {
+            stackInputs = stackInfo[0];
+            stackOutputs = stackInfo[1];
+          }
+
+          if (stackInputs > currentStackHeight) {
+            return String.format(
+                "Operation 0x%02X requires stack of %d but only has %d items",
+                thisOp, stackInputs, currentStackHeight);
+          }
+
+          currentStackHeight = currentStackHeight - stackInputs + stackOutputs;
+          if (currentStackHeight > MAX_STACK_HEIGHT) {
+            return "Stack height exceeds 1024";
+          }
+
+          maxStackHeight = Math.max(maxStackHeight, currentStackHeight);
+
+          if (thisOp == RelativeJumpOperation.OPCODE || thisOp == RelativeJumpIfOperation.OPCODE) {
+            // no `& 0xff` on high byte because this is one case we want sign extension
+            int rvalue = readBigEndianI16(currentPC + 1, code);
+            workList[maxWork] = new int[] {currentPC + rvalue + 3, currentStackHeight};
+            maxWork++;
+          } else if (thisOp == RelativeJumpVectorOperation.OPCODE) {
+            int immediateDataSize = (code[currentPC + 1] & 0xff) * 2;
+            unusedBytes -= immediateDataSize;
+            int tableEnd = immediateDataSize + currentPC + 2;
+            for (int i = currentPC + 2; i < tableEnd; i += 2) {
+              int rvalue = readBigEndianI16(i, code);
+              workList[maxWork] = new int[] {tableEnd + rvalue, currentStackHeight};
+              maxWork++;
+            }
+            currentPC = tableEnd - 2;
+          } else if (thisOp == RetFOperation.OPCODE) {
+            int returnStackItems = toValidate.getOutputs();
+            if (currentStackHeight != returnStackItems) {
+              return String.format(
+                  "Section return (RETF) calculated height 0x%x does not match configured height 0x%x",
+                  currentStackHeight, returnStackItems);
+            }
+          }
+          if (pcAdvance < 0) {
+            unusedBytes += pcAdvance;
+            break;
+          } else if (pcAdvance == 0) {
+            return String.format("Invalid Instruction 0x%02x", thisOp);
+          }
+
+          currentPC += pcAdvance;
+          stackHeights[currentPC] = currentStackHeight;
+          unusedBytes -= pcAdvance;
+        }
+
+        thisWork++;
+      }
+      if (maxStackHeight != toValidate.maxStackHeight) {
+        return String.format(
+            "Calculated max stack height (%d) does not match reported stack height (%d)",
+            maxStackHeight, toValidate.maxStackHeight);
+      }
+      if (unusedBytes != 0) {
+        return String.format("Dead code detected in section %d", codeSectionToValidate);
+      }
+
+      return null;
+    } catch (RuntimeException re) {
+      re.printStackTrace();
+      return "Internal Exception " + re.getMessage();
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/code/EOFLayout.java b/evm/src/main/java/org/hyperledger/besu/evm/code/EOFLayout.java
new file mode 100644
index 00000000000..f92022ca445
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/code/EOFLayout.java
@@ -0,0 +1,280 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.evm.code;
+
+import java.io.ByteArrayInputStream;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The EOF layout. */
+public class EOFLayout {
+
+  /** The Section Terminator. */
+  static final int SECTION_TERMINATOR = 0x00;
+  /** The Section types. */
+  static final int SECTION_TYPES = 0x01;
+  /** The Section code. */
+  static final int SECTION_CODE = 0x02;
+  /** The Section data. */
+  static final int SECTION_DATA = 0x03;
+
+  /** The Max supported section. */
+  static final int MAX_SUPPORTED_VERSION = 1;
+
+  private final Bytes container;
+  private final int version;
+  private final CodeSection[] codeSections;
+  private final String invalidReason;
+
+  private EOFLayout(final Bytes container, final int version, final CodeSection[] codeSections) {
+    this.container = container;
+    this.version = version;
+    this.codeSections = codeSections;
+    this.invalidReason = null;
+  }
+
+  private EOFLayout(final Bytes container, final int version, final String invalidReason) {
+    this.container = container;
+    this.version = version;
+    this.codeSections = null;
+    this.invalidReason = invalidReason;
+  }
+
+  private static EOFLayout invalidLayout(
+      final Bytes container, final int version, final String invalidReason) {
+    return new EOFLayout(container, version, invalidReason);
+  }
+
+  private static String readKind(final ByteArrayInputStream inputStream, final int expectedKind) {
+    int kind = inputStream.read();
+    if (kind == -1) {
+      return "Improper section headers";
+    }
+    if (kind != expectedKind) {
+      return "Expected kind " + expectedKind + " but read kind " + kind;
+    }
+    return null;
+  }
+
+  /**
+   * Parse EOF.
+   *
+   * @param container the container
+   * @return the eof layout
+   */
+  public static EOFLayout parseEOF(final Bytes container) {
+    final ByteArrayInputStream inputStream = new ByteArrayInputStream(container.toArrayUnsafe());
+
+    if (inputStream.available() < 3) {
+      return invalidLayout(container, -1, "EOF Container too small");
+    }
+    if (inputStream.read() != 0xEF) {
+      return invalidLayout(container, -1, "EOF header byte 0 incorrect");
+    }
+    if (inputStream.read() != 0x0) {
+      return invalidLayout(container, -1, "EOF header byte 1 incorrect");
+    }
+
+    final int version = inputStream.read();
+    if (version > MAX_SUPPORTED_VERSION || version < 1) {
+      return invalidLayout(container, version, "Unsupported EOF Version " + version);
+    }
+
+    String error = readKind(inputStream, SECTION_TYPES);
+    if (error != null) {
+      return invalidLayout(container, version, error);
+    }
+    int typesLength = readUnsignedShort(inputStream);
+    if (typesLength <= 0) {
+      return invalidLayout(container, version, "Invalid Types section size");
+    }
+
+    error = readKind(inputStream, SECTION_CODE);
+    if (error != null) {
+      return invalidLayout(container, version, error);
+    }
+    int codeSectionCount = readUnsignedShort(inputStream);
+    if (codeSectionCount <= 0) {
+      return invalidLayout(container, version, "Invalid Code section count");
+    }
+    if (codeSectionCount * 4 != typesLength) {
+      return invalidLayout(
+          container,
+          version,
+          "Type section length incompatible with code section count - 0x"
+              + Integer.toHexString(codeSectionCount)
+              + " * 4 != 0x"
+              + Integer.toHexString(typesLength));
+    }
+    if (codeSectionCount > 1024) {
+      return invalidLayout(
+          container,
+          version,
+          "Too many code sections - 0x" + Integer.toHexString(codeSectionCount));
+    }
+    int[] codeSectionSizes = new int[codeSectionCount];
+    for (int i = 0; i < codeSectionCount; i++) {
+      int size = readUnsignedShort(inputStream);
+      if (size <= 0) {
+        return invalidLayout(container, version, "Invalid Code section size for section " + i);
+      }
+      codeSectionSizes[i] = size;
+    }
+
+    error = readKind(inputStream, SECTION_DATA);
+    if (error != null) {
+      return invalidLayout(container, version, error);
+    }
+    int dataSize = readUnsignedShort(inputStream);
+    if (dataSize < 0) {
+      return invalidLayout(container, version, "Invalid Data section size");
+    }
+
+    error = readKind(inputStream, SECTION_TERMINATOR);
+    if (error != null) {
+      return invalidLayout(container, version, error);
+    }
+    int[][] typeData = new int[codeSectionCount][3];
+    for (int i = 0; i < codeSectionCount; i++) {
+      // input stream keeps spitting out -1 if we run out of data, so no exceptions
+      typeData[i][0] = inputStream.read();
+      typeData[i][1] = inputStream.read();
+      typeData[i][2] = readUnsignedShort(inputStream);
+    }
+    if (typeData[codeSectionCount - 1][2] == -1) {
+      return invalidLayout(container, version, "Incomplete type section");
+    }
+    if (typeData[0][0] != 0 || typeData[0][1] != 0) {
+      return invalidLayout(
+          container, version, "Code section does not have zero inputs and outputs");
+    }
+    CodeSection[] codeSections = new CodeSection[codeSectionCount];
+    int pos = // calculate pos in stream...
+        3 // header and version
+            + 3 // type header
+            + 3
+            + (codeSectionCount * 2) // code section size
+            + 3 // data section header
+            + 1 // padding
+            + (codeSectionCount * 4); // type data
+    for (int i = 0; i < codeSectionCount; i++) {
+      int codeSectionSize = codeSectionSizes[i];
+      if (inputStream.skip(codeSectionSize) != codeSectionSize) {
+        return invalidLayout(container, version, "Incomplete code section " + i);
+      }
+      if (typeData[i][0] > 0x7f) {
+        return invalidLayout(
+            container,
+            version,
+            "Type data input stack too large - 0x" + Integer.toHexString(typeData[i][0]));
+      }
+      if (typeData[i][1] > 0x7f) {
+        return invalidLayout(
+            container,
+            version,
+            "Type data output stack too large - 0x" + Integer.toHexString(typeData[i][1]));
+      }
+      if (typeData[i][2] > 0x3ff) {
+        return invalidLayout(
+            container,
+            version,
+            "Type data max stack too large - 0x" + Integer.toHexString(typeData[i][2]));
+      }
+      codeSections[i] =
+          new CodeSection(codeSectionSize, typeData[i][0], typeData[i][1], typeData[i][2], pos);
+      pos += codeSectionSize;
+    }
+
+    if (inputStream.skip(dataSize) != dataSize) {
+      return invalidLayout(container, version, "Incomplete data section");
+    }
+    if (inputStream.read() != -1) {
+      return invalidLayout(container, version, "Dangling data after end of all sections");
+    }
+
+    return new EOFLayout(container, version, codeSections);
+  }
+
+  /**
+   * Read unsigned short int.
+   *
+   * @param inputStream the input stream
+   * @return the int
+   */
+  static int readUnsignedShort(final ByteArrayInputStream inputStream) {
+    if (inputStream.available() < 2) {
+      return -1;
+    } else {
+      return inputStream.read() << 8 | inputStream.read();
+    }
+  }
+
+  /**
+   * Gets container.
+   *
+   * @return the container
+   */
+  public Bytes getContainer() {
+    return container;
+  }
+
+  /**
+   * Gets version.
+   *
+   * @return the version
+   */
+  public int getVersion() {
+    return version;
+  }
+
+  /**
+   * Get code section count.
+   *
+   * @return the code section count
+   */
+  public int getCodeSectionCount() {
+    return codeSections == null ? 0 : codeSections.length;
+  }
+
+  /**
+   * Get code sections.
+   *
+   * @param i the index
+   * @return the Code section
+   */
+  public CodeSection getCodeSection(final int i) {
+    return codeSections[i];
+  }
+
+  /**
+   * Gets invalid reason.
+   *
+   * @return the invalid reason
+   */
+  public String getInvalidReason() {
+    return invalidReason;
+  }
+
+  /**
+   * Is valid.
+   *
+   * @return the boolean
+   */
+  public boolean isValid() {
+    return invalidReason == null;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/contractvalidation/CachedInvalidCodeRule.java b/evm/src/main/java/org/hyperledger/besu/evm/contractvalidation/CachedInvalidCodeRule.java
new file mode 100644
index 00000000000..34c14ec8a7a
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/contractvalidation/CachedInvalidCodeRule.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.evm.contractvalidation;
+
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.EvmSpecVersion;
+import org.hyperledger.besu.evm.code.CodeFactory;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Cached invalid code rule. */
+public class CachedInvalidCodeRule implements ContractValidationRule {
+
+  private final int maxEofVersion;
+
+  /**
+   * Instantiates a new Cached invalid code rule.
+   *
+   * @param maxEofVersion the max eof version
+   */
+  public CachedInvalidCodeRule(final int maxEofVersion) {
+    this.maxEofVersion = maxEofVersion;
+  }
+
+  @Override
+  public Optional<ExceptionalHaltReason> validate(
+      final Bytes contractCode, final MessageFrame frame) {
+    final Code code = CodeFactory.createCode(contractCode, maxEofVersion, false);
+    if (!code.isValid()) {
+      return Optional.of(ExceptionalHaltReason.INVALID_CODE);
+    } else {
+      return Optional.empty();
+    }
+  }
+
+  /**
+   * Instantiate contract validation rule.
+   *
+   * @param specVersion The evm spec version
+   * @return the contract validation rule
+   */
+  public static ContractValidationRule of(final EvmSpecVersion specVersion) {
+    return new CachedInvalidCodeRule(specVersion.getMaxEofVersion());
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/contractvalidation/ContractValidationRule.java b/evm/src/main/java/org/hyperledger/besu/evm/contractvalidation/ContractValidationRule.java
new file mode 100644
index 00000000000..a32718e7494
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/contractvalidation/ContractValidationRule.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.contractvalidation;
+
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The interface Contract validation rule. */
+@FunctionalInterface
+public interface ContractValidationRule {
+
+  /**
+   * Validate.
+   *
+   * @param contractCode the contract code to validate
+   * @param frame the message frame to use for context
+   * @return the optional halt reason
+   */
+  Optional<ExceptionalHaltReason> validate(Bytes contractCode, MessageFrame frame);
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/contractvalidation/EOFValidationCodeRule.java b/evm/src/main/java/org/hyperledger/besu/evm/contractvalidation/EOFValidationCodeRule.java
new file mode 100644
index 00000000000..3481035ee0f
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/contractvalidation/EOFValidationCodeRule.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.contractvalidation;
+
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.code.CodeFactory;
+import org.hyperledger.besu.evm.code.CodeInvalid;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Validates code is properly EOF formatted if it has the correct magic bytes. This supplants
+ * PrefixRule.
+ */
+public class EOFValidationCodeRule implements ContractValidationRule {
+
+  private static final Logger LOG = LoggerFactory.getLogger(EOFValidationCodeRule.class);
+
+  final int maxEofVersion;
+  final boolean inCreateTransaction;
+
+  private EOFValidationCodeRule(final int maxEofVersion, final boolean inCreateTransaction) {
+    this.maxEofVersion = maxEofVersion;
+    this.inCreateTransaction = inCreateTransaction;
+  }
+
+  /**
+   * Runs eof validation rules as per the various EIPs covering it.
+   *
+   * @param contractCode the contract code to validate
+   * @param frame the message frame to use for context
+   * @return Either an empty optional on success, or an optional containing one of the invalid
+   *     reasons.
+   */
+  @Override
+  public Optional<ExceptionalHaltReason> validate(
+      final Bytes contractCode, final MessageFrame frame) {
+    Code code = CodeFactory.createCode(contractCode, maxEofVersion, inCreateTransaction);
+    if (!code.isValid()) {
+      LOG.trace("EOF Validation Error: {}", ((CodeInvalid) code).getInvalidReason());
+      return Optional.of(ExceptionalHaltReason.INVALID_CODE);
+    }
+
+    if (frame.getCode().getEofVersion() > code.getEofVersion()) {
+      LOG.trace(
+          "Cannot deploy older eof versions: initcode version - {} runtime code version - {}",
+          frame.getCode().getEofVersion(),
+          code.getEofVersion());
+      return Optional.of(ExceptionalHaltReason.EOF_CREATE_VERSION_INCOMPATIBLE);
+    }
+
+    return Optional.empty();
+  }
+
+  /**
+   * Create EOF validation.
+   *
+   * @param maxEofVersion Maximum EOF version to validate
+   * @param inCreateTransaction Is this inside a create transaction?
+   * @return The EOF validation contract validation rule.
+   */
+  public static ContractValidationRule of(
+      final int maxEofVersion, final boolean inCreateTransaction) {
+    return new EOFValidationCodeRule(maxEofVersion, inCreateTransaction);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/contractvalidation/MaxCodeSizeRule.java b/evm/src/main/java/org/hyperledger/besu/evm/contractvalidation/MaxCodeSizeRule.java
new file mode 100644
index 00000000000..9a82e89a6fa
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/contractvalidation/MaxCodeSizeRule.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.contractvalidation;
+
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Max code size rule. */
+public class MaxCodeSizeRule implements ContractValidationRule {
+
+  private static final Logger LOG = LoggerFactory.getLogger(MaxCodeSizeRule.class);
+
+  private final int maxCodeSize;
+
+  /**
+   * Instantiates a new Max code size rule.
+   *
+   * @param maxCodeSize the max code size
+   */
+  MaxCodeSizeRule(final int maxCodeSize) {
+    this.maxCodeSize = maxCodeSize;
+  }
+
+  @Override
+  public Optional<ExceptionalHaltReason> validate(
+      final Bytes contractCode, final MessageFrame frame) {
+    final int contractCodeSize = contractCode.size();
+    if (contractCodeSize <= maxCodeSize) {
+      return Optional.empty();
+    } else {
+      LOG.trace(
+          "Contract creation error: code size {} exceeds code size limit {}",
+          contractCodeSize,
+          maxCodeSize);
+      return Optional.of(ExceptionalHaltReason.CODE_TOO_LARGE);
+    }
+  }
+
+  /**
+   * Instantiate ContractValidationRule.
+   *
+   * @param maxCodeSize the max code size
+   * @return the contract validation rule
+   */
+  public static ContractValidationRule of(final int maxCodeSize) {
+    return new MaxCodeSizeRule(maxCodeSize);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/contractvalidation/PrefixCodeRule.java b/evm/src/main/java/org/hyperledger/besu/evm/contractvalidation/PrefixCodeRule.java
new file mode 100644
index 00000000000..d6be76d599a
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/contractvalidation/PrefixCodeRule.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.contractvalidation;
+
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Prefix code rule. */
+public class PrefixCodeRule implements ContractValidationRule {
+
+  private static final Logger LOG = LoggerFactory.getLogger(PrefixCodeRule.class);
+
+  private static final byte FORMAT_RESERVED = (byte) 0xEF;
+
+  @Override
+  // As per https://eips.ethereum.org/EIPS/eip-3541
+  public Optional<ExceptionalHaltReason> validate(
+      final Bytes contractCode, final MessageFrame frame) {
+    if (!contractCode.isEmpty() && contractCode.get(0) == FORMAT_RESERVED) {
+      LOG.trace("Contract creation error: code cannot start with {}", FORMAT_RESERVED);
+      return Optional.of(ExceptionalHaltReason.INVALID_CODE);
+    } else {
+      return Optional.empty();
+    }
+  }
+
+  /**
+   * Instantiate ContractValidationRule of prefix code rule
+   *
+   * @return the contract validation rule
+   */
+  public static ContractValidationRule of() {
+    return new PrefixCodeRule();
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/fluent/EVMExecutor.java b/evm/src/main/java/org/hyperledger/besu/evm/fluent/EVMExecutor.java
new file mode 100644
index 00000000000..875b3da49db
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/fluent/EVMExecutor.java
@@ -0,0 +1,658 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.fluent;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.MainnetEVMs;
+import org.hyperledger.besu.evm.code.CodeV0;
+import org.hyperledger.besu.evm.contractvalidation.ContractValidationRule;
+import org.hyperledger.besu.evm.contractvalidation.MaxCodeSizeRule;
+import org.hyperledger.besu.evm.contractvalidation.PrefixCodeRule;
+import org.hyperledger.besu.evm.frame.BlockValues;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.evm.precompile.MainnetPrecompiledContracts;
+import org.hyperledger.besu.evm.precompile.PrecompileContractRegistry;
+import org.hyperledger.besu.evm.processor.ContractCreationProcessor;
+import org.hyperledger.besu.evm.processor.MessageCallProcessor;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+
+import java.util.ArrayDeque;
+import java.util.Collection;
+import java.util.Deque;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+/** The Evm executor. */
+public class EVMExecutor {
+
+  private final EVM evm;
+  private PrecompileContractRegistry precompileContractRegistry;
+  private boolean commitWorldState = false;
+  private WorldUpdater worldUpdater = new SimpleWorld();
+  private long gas = Long.MAX_VALUE;
+  private Address receiver = Address.ZERO;
+  private Address sender = Address.ZERO;
+  private Wei gasPriceGWei = Wei.ZERO;
+  private Bytes callData = Bytes.EMPTY;
+  private Wei ethValue = Wei.ZERO;
+  private Code code = CodeV0.EMPTY_CODE;
+  private BlockValues blockValues = new SimpleBlockValues();
+  private OperationTracer tracer = OperationTracer.NO_TRACING;
+  private boolean requireDeposit = true;
+  private List<ContractValidationRule> contractValidationRules =
+      List.of(MaxCodeSizeRule.of(0x6000), PrefixCodeRule.of());
+  private long initialNonce = 0;
+  private Collection<Address> forceCommitAddresses = List.of(Address.fromHexString("0x03"));
+  private Set<Address> accessListWarmAddresses = Set.of();
+  private Multimap<Address, Bytes32> accessListWarmStorage = HashMultimap.create();
+  private MessageCallProcessor messageCallProcessor = null;
+  private ContractCreationProcessor contractCreationProcessor = null;
+
+  private EVMExecutor(final EVM evm) {
+    checkNotNull(evm, "evm must not be null");
+    this.evm = evm;
+  }
+
+  /**
+   * Instandiate Evm executor.
+   *
+   * @param evm the evm
+   * @return the evm executor
+   */
+  public static EVMExecutor evm(final EVM evm) {
+    return new EVMExecutor(evm);
+  }
+
+  /**
+   * Instantiate Frontier evm executor.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm executor
+   */
+  public static EVMExecutor frontier(final EvmConfiguration evmConfiguration) {
+    final EVMExecutor executor = new EVMExecutor(MainnetEVMs.frontier(evmConfiguration));
+    executor.precompileContractRegistry =
+        MainnetPrecompiledContracts.frontier(executor.evm.getGasCalculator());
+    executor.contractValidationRules = List.of();
+    executor.requireDeposit = false;
+    executor.forceCommitAddresses = List.of();
+    return executor;
+  }
+
+  /**
+   * Instantiate Homestead evm executor.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm executor
+   */
+  public static EVMExecutor homestead(final EvmConfiguration evmConfiguration) {
+    final EVMExecutor executor = new EVMExecutor(MainnetEVMs.homestead(evmConfiguration));
+    executor.precompileContractRegistry =
+        MainnetPrecompiledContracts.frontier(executor.evm.getGasCalculator());
+    executor.contractValidationRules = List.of();
+    executor.forceCommitAddresses = List.of();
+    return executor;
+  }
+
+  /**
+   * Instantiate Spurious dragon evm executor.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm executor
+   */
+  public static EVMExecutor spuriousDragon(final EvmConfiguration evmConfiguration) {
+    final EVMExecutor executor = new EVMExecutor(MainnetEVMs.spuriousDragon(evmConfiguration));
+    executor.precompileContractRegistry =
+        MainnetPrecompiledContracts.frontier(executor.evm.getGasCalculator());
+    executor.contractValidationRules = List.of(MaxCodeSizeRule.of(0x6000));
+    return executor;
+  }
+
+  /**
+   * Instantiate Tangerine whistle evm executor.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm executor
+   */
+  public static EVMExecutor tangerineWhistle(final EvmConfiguration evmConfiguration) {
+    final EVMExecutor executor = new EVMExecutor(MainnetEVMs.tangerineWhistle(evmConfiguration));
+    executor.precompileContractRegistry =
+        MainnetPrecompiledContracts.frontier(executor.evm.getGasCalculator());
+    executor.contractValidationRules = List.of(MaxCodeSizeRule.of(0x6000));
+    return executor;
+  }
+
+  /**
+   * Instantiate Byzantium evm executor.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm executor
+   */
+  public static EVMExecutor byzantium(final EvmConfiguration evmConfiguration) {
+    final EVMExecutor executor = new EVMExecutor(MainnetEVMs.byzantium(evmConfiguration));
+    executor.precompileContractRegistry =
+        MainnetPrecompiledContracts.byzantium(executor.evm.getGasCalculator());
+    executor.contractValidationRules = List.of(MaxCodeSizeRule.of(0x6000));
+    return executor;
+  }
+
+  /**
+   * Instantiate Constantinople evm executor.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm executor
+   */
+  public static EVMExecutor constantinople(final EvmConfiguration evmConfiguration) {
+    final EVMExecutor executor = new EVMExecutor(MainnetEVMs.constantinople(evmConfiguration));
+    executor.precompileContractRegistry =
+        MainnetPrecompiledContracts.byzantium(executor.evm.getGasCalculator());
+    executor.contractValidationRules = List.of(MaxCodeSizeRule.of(0x6000));
+    return executor;
+  }
+
+  /**
+   * Instantiate Petersburg evm executor.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm executor
+   */
+  public static EVMExecutor petersburg(final EvmConfiguration evmConfiguration) {
+    final EVMExecutor executor = new EVMExecutor(MainnetEVMs.petersburg(evmConfiguration));
+    executor.precompileContractRegistry =
+        MainnetPrecompiledContracts.byzantium(executor.evm.getGasCalculator());
+    executor.contractValidationRules = List.of(MaxCodeSizeRule.of(0x6000));
+    return executor;
+  }
+
+  /**
+   * Instantiate Istanbul evm executor.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm executor
+   */
+  public static EVMExecutor istanbul(final EvmConfiguration evmConfiguration) {
+    final EVMExecutor executor = new EVMExecutor(MainnetEVMs.istanbul(evmConfiguration));
+    executor.precompileContractRegistry =
+        MainnetPrecompiledContracts.istanbul(executor.evm.getGasCalculator());
+    executor.contractValidationRules = List.of(MaxCodeSizeRule.of(0x6000));
+    return executor;
+  }
+
+  /**
+   * Instantiate Berlin evm executor.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm executor
+   */
+  public static EVMExecutor berlin(final EvmConfiguration evmConfiguration) {
+    final EVMExecutor executor = new EVMExecutor(MainnetEVMs.berlin(evmConfiguration));
+    executor.precompileContractRegistry =
+        MainnetPrecompiledContracts.istanbul(executor.evm.getGasCalculator());
+    executor.contractValidationRules = List.of(MaxCodeSizeRule.of(0x6000));
+    return executor;
+  }
+
+  /**
+   * Instantiate London evm executor.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm executor
+   */
+  public static EVMExecutor london(final EvmConfiguration evmConfiguration) {
+    final EVMExecutor executor = new EVMExecutor(MainnetEVMs.london(evmConfiguration));
+    executor.precompileContractRegistry =
+        MainnetPrecompiledContracts.istanbul(executor.evm.getGasCalculator());
+    return executor;
+  }
+
+  /**
+   * Instantiate Paris evm executor.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm executor
+   */
+  public static EVMExecutor paris(final EvmConfiguration evmConfiguration) {
+    final EVMExecutor executor = new EVMExecutor(MainnetEVMs.paris(evmConfiguration));
+    executor.precompileContractRegistry =
+        MainnetPrecompiledContracts.istanbul(executor.evm.getGasCalculator());
+    return executor;
+  }
+
+  /**
+   * Instantiate Shanghai evm executor.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm executor
+   */
+  public static EVMExecutor shanghai(final EvmConfiguration evmConfiguration) {
+    final EVMExecutor executor = new EVMExecutor(MainnetEVMs.shanghai(evmConfiguration));
+    executor.precompileContractRegistry =
+        MainnetPrecompiledContracts.istanbul(executor.evm.getGasCalculator());
+    return executor;
+  }
+
+  /**
+   * Instantiate Cancun evm executor.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm executor
+   */
+  public static EVMExecutor cancun(final EvmConfiguration evmConfiguration) {
+    final EVMExecutor executor = new EVMExecutor(MainnetEVMs.cancun(evmConfiguration));
+    executor.precompileContractRegistry =
+        MainnetPrecompiledContracts.cancun(executor.evm.getGasCalculator());
+    return executor;
+  }
+
+  /**
+   * Instantiate Future EIPs evm executor.
+   *
+   * @param evmConfiguration the evm configuration
+   * @return the evm executor
+   */
+  public static EVMExecutor futureEIPs(final EvmConfiguration evmConfiguration) {
+    final EVMExecutor executor = new EVMExecutor(MainnetEVMs.cancun(evmConfiguration));
+    executor.precompileContractRegistry =
+        MainnetPrecompiledContracts.futureEIPs(executor.evm.getGasCalculator());
+    return executor;
+  }
+
+  private MessageCallProcessor thisMessageCallProcessor() {
+    return Objects.requireNonNullElseGet(
+        messageCallProcessor, () -> new MessageCallProcessor(evm, precompileContractRegistry));
+  }
+
+  private ContractCreationProcessor thisContractCreationProcessor() {
+    return Objects.requireNonNullElseGet(
+        contractCreationProcessor,
+        () ->
+            new ContractCreationProcessor(
+                evm.getGasCalculator(),
+                evm,
+                requireDeposit,
+                contractValidationRules,
+                initialNonce,
+                forceCommitAddresses));
+  }
+
+  /**
+   * Execute code.
+   *
+   * @param code the code
+   * @param inputData the input data
+   * @param value the value
+   * @param receiver the receiver
+   * @return the bytes
+   */
+  public Bytes execute(
+      final Code code, final Bytes inputData, final Wei value, final Address receiver) {
+    this.code = code;
+    this.callData = inputData;
+    this.ethValue = value;
+    this.receiver = receiver;
+    return execute();
+  }
+
+  /**
+   * Execute code.
+   *
+   * @param codeBytes the code bytes
+   * @param inputData the input data
+   * @param value the value
+   * @param receiver the receiver
+   * @return the bytes
+   */
+  public Bytes execute(
+      final Bytes codeBytes, final Bytes inputData, final Wei value, final Address receiver) {
+    this.code = evm.getCode(Hash.hash(codeBytes), codeBytes);
+    this.callData = inputData;
+    this.ethValue = value;
+    this.receiver = receiver;
+    return execute();
+  }
+
+  /**
+   * Execute.
+   *
+   * @return the bytes
+   */
+  public Bytes execute() {
+    final MessageCallProcessor mcp = thisMessageCallProcessor();
+    final ContractCreationProcessor ccp = thisContractCreationProcessor();
+    final Deque<MessageFrame> messageFrameStack = new ArrayDeque<>();
+    final MessageFrame initialMessageFrame =
+        MessageFrame.builder()
+            .type(MessageFrame.Type.MESSAGE_CALL)
+            .messageFrameStack(messageFrameStack)
+            .worldUpdater(worldUpdater.updater())
+            .initialGas(gas)
+            .contract(Address.ZERO)
+            .address(receiver)
+            .originator(sender)
+            .sender(sender)
+            .gasPrice(gasPriceGWei)
+            .inputData(callData)
+            .value(ethValue)
+            .apparentValue(ethValue)
+            .code(code)
+            .blockValues(blockValues)
+            .depth(0)
+            .completer(c -> {})
+            .miningBeneficiary(Address.ZERO)
+            .blockHashLookup(h -> null)
+            .accessListWarmAddresses(accessListWarmAddresses)
+            .accessListWarmStorage(accessListWarmStorage)
+            .build();
+    messageFrameStack.add(initialMessageFrame);
+
+    while (!messageFrameStack.isEmpty()) {
+      final MessageFrame messageFrame = messageFrameStack.peek();
+      if (messageFrame.getType() == MessageFrame.Type.CONTRACT_CREATION) {
+        ccp.process(messageFrame, tracer);
+      } else if (messageFrame.getType() == MessageFrame.Type.MESSAGE_CALL) {
+        mcp.process(messageFrame, tracer);
+      }
+    }
+    if (commitWorldState) {
+      worldUpdater.commit();
+    }
+    return initialMessageFrame.getReturnData();
+  }
+
+  /**
+   * MArk Commit world state to true.
+   *
+   * @return the evm executor
+   */
+  public EVMExecutor commitWorldState() {
+    this.commitWorldState = true;
+    return this;
+  }
+
+  /**
+   * Sets Commit world state.
+   *
+   * @param commitWorldState the commit world state
+   * @return the evm executor
+   */
+  public EVMExecutor commitWorldState(final boolean commitWorldState) {
+    this.commitWorldState = commitWorldState;
+    return this;
+  }
+
+  /**
+   * Sets World updater.
+   *
+   * @param worldUpdater the world updater
+   * @return the evm executor
+   */
+  public EVMExecutor worldUpdater(final WorldUpdater worldUpdater) {
+    this.worldUpdater = worldUpdater;
+    return this;
+  }
+
+  /**
+   * Sets Gas.
+   *
+   * @param gas the gas
+   * @return the evm executor
+   */
+  public EVMExecutor gas(final long gas) {
+    this.gas = gas;
+    return this;
+  }
+
+  /**
+   * Sets Receiver address.
+   *
+   * @param receiver the receiver
+   * @return the evm executor
+   */
+  public EVMExecutor receiver(final Address receiver) {
+    this.receiver = receiver;
+    return this;
+  }
+
+  /**
+   * Sets Sender address.
+   *
+   * @param sender the sender
+   * @return the evm executor
+   */
+  public EVMExecutor sender(final Address sender) {
+    this.sender = sender;
+    return this;
+  }
+
+  /**
+   * Sets Gas price GWei.
+   *
+   * @param gasPriceGWei the gas price g wei
+   * @return the evm executor
+   */
+  public EVMExecutor gasPriceGWei(final Wei gasPriceGWei) {
+    this.gasPriceGWei = gasPriceGWei;
+    return this;
+  }
+
+  /**
+   * Sets Call data.
+   *
+   * @param callData the call data
+   * @return the evm executor
+   */
+  public EVMExecutor callData(final Bytes callData) {
+    this.callData = callData;
+    return this;
+  }
+
+  /**
+   * Sets Eth value.
+   *
+   * @param ethValue the eth value
+   * @return the evm executor
+   */
+  public EVMExecutor ethValue(final Wei ethValue) {
+    this.ethValue = ethValue;
+    return this;
+  }
+
+  /**
+   * Sets Code.
+   *
+   * @param code the code
+   * @return the evm executor
+   */
+  public EVMExecutor code(final Code code) {
+    this.code = code;
+    return this;
+  }
+
+  /**
+   * Sets Code.
+   *
+   * @param codeBytes the code bytes
+   * @param hash the hash
+   * @return the evm executor
+   */
+  public EVMExecutor code(final Bytes codeBytes, final Hash hash) {
+    this.code = evm.getCode(hash, codeBytes);
+    return this;
+  }
+
+  /**
+   * Sets Block values.
+   *
+   * @param blockValues the block values
+   * @return the evm executor
+   */
+  public EVMExecutor blockValues(final BlockValues blockValues) {
+    this.blockValues = blockValues;
+    return this;
+  }
+
+  /**
+   * Sets Operation Tracer.
+   *
+   * @param tracer the tracer
+   * @return the evm executor
+   */
+  public EVMExecutor tracer(final OperationTracer tracer) {
+    this.tracer = tracer;
+    return this;
+  }
+
+  /**
+   * Sets Precompile contract registry.
+   *
+   * @param precompileContractRegistry the precompile contract registry
+   * @return the evm executor
+   */
+  public EVMExecutor precompileContractRegistry(
+      final PrecompileContractRegistry precompileContractRegistry) {
+    this.precompileContractRegistry = precompileContractRegistry;
+    return this;
+  }
+
+  /**
+   * Sets Require deposit.
+   *
+   * @param requireDeposit the require deposit
+   * @return the evm executor
+   */
+  public EVMExecutor requireDeposit(final boolean requireDeposit) {
+    this.requireDeposit = requireDeposit;
+    return this;
+  }
+
+  /**
+   * Sets Initial nonce.
+   *
+   * @param initialNonce the initial nonce
+   * @return the evm executor
+   */
+  public EVMExecutor initialNonce(final long initialNonce) {
+    this.initialNonce = initialNonce;
+    return this;
+  }
+
+  /**
+   * Sets Contract validation rules.
+   *
+   * @param contractValidationRules the contract validation rules
+   * @return the evm executor
+   */
+  public EVMExecutor contractValidationRules(
+      final List<ContractValidationRule> contractValidationRules) {
+    this.contractValidationRules = contractValidationRules;
+    return this;
+  }
+
+  /**
+   * List of EIP-718 contracts that require special delete handling. By default, this is only the
+   * RIPEMD precompile contract.
+   *
+   * @param forceCommitAddresses collection of addresses for special handling
+   * @return fluent executor
+   * @see <a
+   *     href="https://github.com/ethereum/EIPs/issues/716">https://github.com/ethereum/EIPs/issues/716</a>
+   */
+  public EVMExecutor forceCommitAddresses(final Collection<Address> forceCommitAddresses) {
+    this.forceCommitAddresses = forceCommitAddresses;
+    return this;
+  }
+
+  /**
+   * Sets Access list warm addresses.
+   *
+   * @param accessListWarmAddresses the access list warm addresses
+   * @return the evm executor
+   */
+  public EVMExecutor accessListWarmAddresses(final Set<Address> accessListWarmAddresses) {
+    this.accessListWarmAddresses = accessListWarmAddresses;
+    return this;
+  }
+
+  /**
+   * Sets Warm addresses.
+   *
+   * @param addresses the addresses
+   * @return the evm executor
+   */
+  public EVMExecutor warmAddress(final Address... addresses) {
+    this.accessListWarmAddresses.addAll(List.of(addresses));
+    return this;
+  }
+
+  /**
+   * Sets Access list warm storage map.
+   *
+   * @param accessListWarmStorage the access list warm storage
+   * @return the evm executor
+   */
+  public EVMExecutor accessListWarmStorage(final Multimap<Address, Bytes32> accessListWarmStorage) {
+    this.accessListWarmStorage = accessListWarmStorage;
+    return this;
+  }
+
+  /**
+   * Sets Access list warm storage.
+   *
+   * @param address the address
+   * @param slots the slots
+   * @return the evm executor
+   */
+  public EVMExecutor accessListWarmStorage(final Address address, final Bytes32... slots) {
+    this.accessListWarmStorage.putAll(address, List.of(slots));
+    return this;
+  }
+
+  /**
+   * Sets Message call processor.
+   *
+   * @param messageCallProcessor the message call processor
+   * @return the evm executor
+   */
+  public EVMExecutor messageCallProcessor(final MessageCallProcessor messageCallProcessor) {
+    this.messageCallProcessor = messageCallProcessor;
+    return this;
+  }
+
+  /**
+   * Sets Contract call processor.
+   *
+   * @param contractCreationProcessor the contract creation processor
+   * @return the evm executor
+   */
+  public EVMExecutor contractCallProcessor(
+      final ContractCreationProcessor contractCreationProcessor) {
+    this.contractCreationProcessor = contractCreationProcessor;
+    return this;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/fluent/SimpleAccount.java b/evm/src/main/java/org/hyperledger/besu/evm/fluent/SimpleAccount.java
new file mode 100644
index 00000000000..1d1c1c81d3d
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/fluent/SimpleAccount.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.fluent;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.ModificationNotAllowedException;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.account.AccountStorageEntry;
+import org.hyperledger.besu.evm.account.EvmAccount;
+import org.hyperledger.besu.evm.account.MutableAccount;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.function.Supplier;
+
+import com.google.common.base.Suppliers;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** The Simple account. */
+public class SimpleAccount implements EvmAccount, MutableAccount {
+
+  private final Account parent;
+
+  private Address address;
+  private final Supplier<Hash> addressHash =
+      Suppliers.memoize(() -> address == null ? Hash.ZERO : Hash.hash(address));
+  private long nonce;
+  private Wei balance;
+  private Bytes code;
+  private Supplier<Hash> codeHash =
+      Suppliers.memoize(() -> code == null ? Hash.EMPTY : Hash.hash(code));
+  private final Map<UInt256, UInt256> storage = new HashMap<>();
+
+  /**
+   * Instantiates a new Simple account.
+   *
+   * @param address the address
+   * @param nonce the nonce
+   * @param balance the balance
+   */
+  public SimpleAccount(final Address address, final long nonce, final Wei balance) {
+    this(null, address, nonce, balance, Bytes.EMPTY);
+  }
+
+  /**
+   * Instantiates a new Simple account.
+   *
+   * @param parent the parent
+   * @param address the address
+   * @param nonce the nonce
+   * @param balance the balance
+   * @param code the code
+   */
+  public SimpleAccount(
+      final Account parent,
+      final Address address,
+      final long nonce,
+      final Wei balance,
+      final Bytes code) {
+    this.parent = parent;
+    this.address = address;
+    this.nonce = nonce;
+    this.balance = balance;
+    this.code = code;
+  }
+
+  @Override
+  public Address getAddress() {
+    return address;
+  }
+
+  @Override
+  public Hash getAddressHash() {
+    return addressHash.get();
+  }
+
+  @Override
+  public long getNonce() {
+    return nonce;
+  }
+
+  @Override
+  public Wei getBalance() {
+    return balance;
+  }
+
+  @Override
+  public Bytes getCode() {
+    return code;
+  }
+
+  @Override
+  public Hash getCodeHash() {
+    return codeHash.get();
+  }
+
+  @Override
+  public UInt256 getStorageValue(final UInt256 key) {
+    if (storage.containsKey(key)) {
+      return storage.get(key);
+    } else {
+      return getOriginalStorageValue(key);
+    }
+  }
+
+  @Override
+  public UInt256 getOriginalStorageValue(final UInt256 key) {
+    if (parent != null) {
+      return parent.getStorageValue(key);
+    } else {
+      return UInt256.ZERO;
+    }
+  }
+
+  @Override
+  public NavigableMap<Bytes32, AccountStorageEntry> storageEntriesFrom(
+      final Bytes32 startKeyHash, final int limit) {
+    throw new UnsupportedOperationException(
+        "Storage iteration not supported in simple account facade");
+  }
+
+  @Override
+  public MutableAccount getMutable() throws ModificationNotAllowedException {
+    return this;
+  }
+
+  @Override
+  public void setNonce(final long value) {
+    nonce = value;
+  }
+
+  @Override
+  public void setBalance(final Wei value) {
+    balance = value;
+  }
+
+  @Override
+  public void setCode(final Bytes code) {
+    this.code = code;
+    codeHash = Suppliers.memoize(() -> this.code == null ? Hash.EMPTY : Hash.hash(this.code));
+  }
+
+  @Override
+  public void setStorageValue(final UInt256 key, final UInt256 value) {
+    storage.put(key, value);
+  }
+
+  @Override
+  public void clearStorage() {
+    storage.clear();
+  }
+
+  @Override
+  public Map<UInt256, UInt256> getUpdatedStorage() {
+    return storage;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/fluent/SimpleBlockValues.java b/evm/src/main/java/org/hyperledger/besu/evm/fluent/SimpleBlockValues.java
new file mode 100644
index 00000000000..f6c7c26a7d1
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/fluent/SimpleBlockValues.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.fluent;
+
+import org.hyperledger.besu.evm.frame.BlockValues;
+
+/** A concrete BlockValues object that takes all the defaults */
+public class SimpleBlockValues implements BlockValues {}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/fluent/SimpleWorld.java b/evm/src/main/java/org/hyperledger/besu/evm/fluent/SimpleWorld.java
new file mode 100644
index 00000000000..a7288602083
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/fluent/SimpleWorld.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.fluent;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.account.EvmAccount;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/** The Simple world. */
+public class SimpleWorld implements WorldUpdater {
+
+  /** The Parent. */
+  SimpleWorld parent;
+  /** The Accounts. */
+  Map<Address, SimpleAccount> accounts = new HashMap<>();
+
+  /** Instantiates a new Simple world. */
+  public SimpleWorld() {
+    this(null);
+  }
+
+  /**
+   * Instantiates a new Simple world.
+   *
+   * @param parent the parent
+   */
+  public SimpleWorld(final SimpleWorld parent) {
+    this.parent = parent;
+  }
+
+  @Override
+  public WorldUpdater updater() {
+    return new SimpleWorld(this);
+  }
+
+  @Override
+  public Account get(final Address address) {
+    if (accounts.containsKey(address)) {
+      return accounts.get(address);
+    } else if (parent != null) {
+      return parent.get(address);
+    } else {
+      return null;
+    }
+  }
+
+  @Override
+  public EvmAccount createAccount(final Address address, final long nonce, final Wei balance) {
+    SimpleAccount account = new SimpleAccount(address, nonce, balance);
+    accounts.put(address, account);
+    return account;
+  }
+
+  @Override
+  public EvmAccount getAccount(final Address address) {
+    if (accounts.containsKey(address)) {
+      return accounts.get(address);
+    } else if (parent != null) {
+      return parent.getAccount(address);
+    } else {
+      return null;
+    }
+  }
+
+  @Override
+  public void deleteAccount(final Address address) {
+    accounts.put(address, null);
+  }
+
+  @Override
+  public Collection<? extends Account> getTouchedAccounts() {
+    return accounts.values();
+  }
+
+  @Override
+  public Collection<Address> getDeletedAccountAddresses() {
+    return accounts.entrySet().stream()
+        .filter(e -> e.getValue() == null)
+        .map(Map.Entry::getKey)
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  public void revert() {
+    accounts = new HashMap<>();
+  }
+
+  @Override
+  public void commit() {
+    parent.accounts.putAll(accounts);
+  }
+
+  @Override
+  public Optional<WorldUpdater> parentUpdater() {
+    return Optional.empty();
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/frame/BlockValues.java b/evm/src/main/java/org/hyperledger/besu/evm/frame/BlockValues.java
new file mode 100644
index 00000000000..74db00274a0
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/frame/BlockValues.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.frame;
+
+import org.hyperledger.besu.datatypes.Wei;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+/**
+ * Block Header Values used by various EVM Opcodes. This is not a complete BlocHeader, just the
+ * values that are returned or accessed by various operations.
+ */
+public interface BlockValues {
+
+  /**
+   * Returns the block difficulty.
+   *
+   * @return the block difficulty
+   */
+  default Bytes getDifficultyBytes() {
+    return null;
+  }
+
+  /**
+   * Returns the mixHash before merge, and the prevRandao value after
+   *
+   * @return the mixHash before merge, and the prevRandao value after
+   */
+  default Bytes32 getMixHashOrPrevRandao() {
+    return null;
+  }
+
+  /**
+   * Returns the basefee of the block.
+   *
+   * @return the raw bytes of the extra data field
+   */
+  default Optional<Wei> getBaseFee() {
+    return Optional.empty();
+  }
+
+  /**
+   * Returns the block number.
+   *
+   * @return the block number
+   */
+  default long getNumber() {
+    return 0L;
+  }
+
+  /**
+   * Return the block timestamp.
+   *
+   * @return the block timestamp
+   */
+  default long getTimestamp() {
+    return 0L;
+  }
+
+  /**
+   * Return the block gas limit.
+   *
+   * @return the block gas limit
+   */
+  default long getGasLimit() {
+    return 0L;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/frame/ExceptionalHaltReason.java b/evm/src/main/java/org/hyperledger/besu/evm/frame/ExceptionalHaltReason.java
new file mode 100644
index 00000000000..06c10b9c025
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/frame/ExceptionalHaltReason.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.frame;
+
+/** The interface Exceptional halt reason. */
+public interface ExceptionalHaltReason {
+
+  /** The constant NONE. */
+  ExceptionalHaltReason NONE = DefaultExceptionalHaltReason.NONE;
+  /** The constant INSUFFICIENT_GAS. */
+  ExceptionalHaltReason INSUFFICIENT_GAS = DefaultExceptionalHaltReason.INSUFFICIENT_GAS;
+  /** The constant INSUFFICIENT_STACK_ITEMS. */
+  ExceptionalHaltReason INSUFFICIENT_STACK_ITEMS =
+      DefaultExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS;
+  /** The constant INVALID_JUMP_DESTINATION. */
+  ExceptionalHaltReason INVALID_JUMP_DESTINATION =
+      DefaultExceptionalHaltReason.INVALID_JUMP_DESTINATION;
+  /** The constant INVALID_OPERATION. */
+  ExceptionalHaltReason INVALID_OPERATION = DefaultExceptionalHaltReason.INVALID_OPERATION;
+  /** The constant INVALID_RETURN_DATA_BUFFER_ACCESS. */
+  ExceptionalHaltReason INVALID_RETURN_DATA_BUFFER_ACCESS =
+      DefaultExceptionalHaltReason.INVALID_RETURN_DATA_BUFFER_ACCESS;
+  /** The constant TOO_MANY_STACK_ITEMS. */
+  ExceptionalHaltReason TOO_MANY_STACK_ITEMS = DefaultExceptionalHaltReason.TOO_MANY_STACK_ITEMS;
+  /** The constant ILLEGAL_STATE_CHANGE. */
+  ExceptionalHaltReason ILLEGAL_STATE_CHANGE = DefaultExceptionalHaltReason.ILLEGAL_STATE_CHANGE;
+  /** The constant OUT_OF_BOUNDS. */
+  ExceptionalHaltReason OUT_OF_BOUNDS = DefaultExceptionalHaltReason.OUT_OF_BOUNDS;
+  /** The constant CODE_TOO_LARGE. */
+  ExceptionalHaltReason CODE_TOO_LARGE = DefaultExceptionalHaltReason.CODE_TOO_LARGE;
+  /** The constant INVALID_CODE. */
+  ExceptionalHaltReason INVALID_CODE = DefaultExceptionalHaltReason.INVALID_CODE;
+  /** The constant PRECOMPILE_ERROR. */
+  ExceptionalHaltReason PRECOMPILE_ERROR = DefaultExceptionalHaltReason.PRECOMPILE_ERROR;
+
+  /** The constant CODE_SECTION_MISSING. */
+  ExceptionalHaltReason CODE_SECTION_MISSING = DefaultExceptionalHaltReason.CODE_SECTION_MISSING;
+  /** The constant INCORRECT_CODE_SECTION_RETURN_OUTPUTS. */
+  ExceptionalHaltReason INCORRECT_CODE_SECTION_RETURN_OUTPUTS =
+      DefaultExceptionalHaltReason.INCORRECT_CODE_SECTION_RETURN_OUTPUTS;
+  /** The constant TOO_FEW_INPUTS_FOR_CODE_SECTION. */
+  ExceptionalHaltReason TOO_FEW_INPUTS_FOR_CODE_SECTION =
+      DefaultExceptionalHaltReason.TOO_FEW_INPUTS_FOR_CODE_SECTION;
+  /** The constant JUMPF_STACK_MISMATCH. */
+  ExceptionalHaltReason JUMPF_STACK_MISMATCH = DefaultExceptionalHaltReason.JUMPF_STACK_MISMATCH;
+  /** The constant EOF_CREATE_VERSION_INCOMPATIBLE. */
+  ExceptionalHaltReason EOF_CREATE_VERSION_INCOMPATIBLE =
+      DefaultExceptionalHaltReason.EOF_CREATE_VERSION_INCOMPATIBLE;
+
+  /**
+   * Name string.
+   *
+   * @return the string
+   */
+  String name();
+
+  /**
+   * Gets description.
+   *
+   * @return the description
+   */
+  String getDescription();
+
+  /** The enum Default exceptional halt reason. */
+  enum DefaultExceptionalHaltReason implements ExceptionalHaltReason {
+    /** None default exceptional halt reason. */
+    NONE(""),
+    /** The Insufficient gas. */
+    INSUFFICIENT_GAS("Out of gas"),
+    /** The Insufficient stack items. */
+    INSUFFICIENT_STACK_ITEMS("Stack underflow"),
+    /** The Invalid jump destination. */
+    INVALID_JUMP_DESTINATION("Bad jump destination"),
+    /** The Invalid operation. */
+    INVALID_OPERATION("Bad instruction"),
+    /** The Invalid return data buffer access. */
+    INVALID_RETURN_DATA_BUFFER_ACCESS("Out of bounds"),
+    /** The Too many stack items. */
+    TOO_MANY_STACK_ITEMS("Out of stack"),
+    /** The Illegal state change. */
+    ILLEGAL_STATE_CHANGE("Illegal state change"),
+    /** The Out of bounds. */
+    OUT_OF_BOUNDS("Out of bounds"),
+    /** The Code too large. */
+    CODE_TOO_LARGE("Code is too large"),
+    /** The Invalid code. */
+    INVALID_CODE("Code is invalid"),
+    /** The Precompile error. */
+    PRECOMPILE_ERROR("Precompile error"),
+    /** The Code section missing. */
+    CODE_SECTION_MISSING("No code section at requested index"),
+    /** The Insufficient code section return data. */
+    INSUFFICIENT_CODE_SECTION_RETURN_DATA("The stack for a return "),
+    /** The Incorrect code section return outputs. */
+    INCORRECT_CODE_SECTION_RETURN_OUTPUTS(
+        "The return of a code section does not have the correct number of outputs"),
+    /** The Too few inputs for code section. */
+    TOO_FEW_INPUTS_FOR_CODE_SECTION("Not enough stack items for a function call"),
+    /** The Jumpf stack mismatch. */
+    JUMPF_STACK_MISMATCH(
+        "The stack height for a JUMPF does not match the requirements of the target section"),
+    /** The Eof version incompatible. */
+    EOF_CREATE_VERSION_INCOMPATIBLE(
+        "EOF Code is attempting to create EOF code of an earlier version");
+
+    /** The Description. */
+    final String description;
+
+    DefaultExceptionalHaltReason(final String description) {
+      this.description = description;
+    }
+
+    @Override
+    public String getDescription() {
+      return description;
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/frame/Memory.java b/evm/src/main/java/org/hyperledger/besu/evm/frame/Memory.java
new file mode 100644
index 00000000000..ac503ad0908
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/frame/Memory.java
@@ -0,0 +1,429 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.frame;
+
+import java.util.Arrays;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.bytes.MutableBytes;
+
+/**
+ * An EVM memory implementation.
+ *
+ * <p>Note: this is meant to map to I in Section 9.1 "Basics" and Section 9.4.1 "Machine State" in
+ * the Yellow Paper Revision 59dccd.
+ */
+public class Memory {
+
+  // See below.
+  private static final long MAX_BYTES = Integer.MAX_VALUE;
+
+  /**
+   * The data stored within the memory.
+   *
+   * <p>Note that the current Ethereum spec don't put a limit on memory, so we could theoretically
+   * overflow this. A byte array implementation limits us to 2 GiB. But that would cost over 51
+   * trillion gas. So this is likely a reasonable limitation, at least at first.
+   */
+  private byte[] memBytes;
+
+  private int activeWords;
+
+  /** Instantiates a new Memory. */
+  public Memory() {
+    memBytes = new byte[0];
+  }
+
+  private static RuntimeException overflow(final long v) {
+    return overflow(String.valueOf(v));
+  }
+
+  private static RuntimeException overflow(final String v) {
+    // TODO: we should probably have another specific exception so this properly end up as an
+    // exceptional halt condition with a clear message (message that can indicate that if anyone
+    // runs into this, he should contact us so we know it's a case we do need to handle).
+    final String msg = "Memory index or length %s too large, cannot be larger than %d";
+    throw new IllegalStateException(String.format(msg, v, MAX_BYTES));
+  }
+
+  private void checkByteIndex(final long v) {
+    // We can have at most MAX_BYTES, so an index can only at most MAX_BYTES - 1.
+    if (v < 0 || v >= MAX_BYTES) throw overflow(v);
+  }
+
+  private int asByteIndex(final long w) {
+    try {
+      final long v = Math.toIntExact(w);
+      checkByteIndex(v);
+      return (int) v;
+    } catch (final ArithmeticException | IllegalStateException e) {
+      throw overflow(w);
+    }
+  }
+
+  private static int asByteLength(final long l) {
+    try {
+      return Math.toIntExact(l);
+    } catch (final ArithmeticException | IllegalStateException e) {
+      throw overflow(l);
+    }
+  }
+
+  /**
+   * For use in memoryExpansionGasCost() of GasCost. Returns the number of new active words that
+   * accommodate at least the number of specified bytes from the provided memory offset.
+   *
+   * <p>Not that this has to return a UInt256 for Gas calculation, in case someone writes code that
+   * require a crazy amount of data. Such allocation should get prohibitive however, and we will end
+   * up with an Out-of-Gas error.
+   *
+   * @param location The offset in memory from which we want to accommodate {@code numBytes}.
+   * @param numBytes The minimum number of bytes in memory.
+   * @return The number of active words that accommodate at least the number of specified bytes.
+   */
+  long calculateNewActiveWords(final long location, final long numBytes) {
+    if (numBytes == 0) {
+      return activeWords;
+    }
+
+    try {
+      final long byteSize = Math.addExact(Math.addExact(location, numBytes), 31);
+      long wordSize = byteSize / 32;
+      return Math.max(wordSize, activeWords);
+    } catch (ArithmeticException ae) {
+      return Long.MAX_VALUE >> 5;
+    }
+  }
+
+  /**
+   * Expands the active words to accommodate the specified byte position.
+   *
+   * @param offset The location in memory to start with.
+   * @param numBytes The number of bytes to get.
+   */
+  void ensureCapacityForBytes(final long offset, final long numBytes) {
+    // Do not increase the memory capacity if no bytes are being written
+    // regardless of what the address may be.
+    if (numBytes == 0) {
+      return;
+    }
+    final long lastByteIndex = Math.addExact(offset, numBytes);
+    final long lastWordRequired = ((lastByteIndex - 1) / Bytes32.SIZE);
+    maybeExpandCapacity((int) lastWordRequired + 1);
+  }
+
+  /**
+   * Expands the memory to the specified number of active words.
+   *
+   * @param newActiveWords The new number of active words to expand to.
+   */
+  private void maybeExpandCapacity(final int newActiveWords) {
+    if (activeWords >= newActiveWords) return;
+
+    int neededSize = newActiveWords * Bytes32.SIZE;
+    if (neededSize > memBytes.length) {
+      int newSize = Math.max(neededSize, memBytes.length * 2);
+      byte[] newMem = new byte[newSize];
+      System.arraycopy(memBytes, 0, newMem, 0, memBytes.length);
+      memBytes = newMem;
+    }
+    activeWords = newActiveWords;
+  }
+
+  /**
+   * Returns true if the object is equal to this memory instance; otherwise false.
+   *
+   * @param other The object to compare this memory instance with.
+   * @return True if the object is equal to this memory instance.
+   */
+  @Override
+  public boolean equals(final Object other) {
+    if (other == null) return false;
+    if (other == this) return true;
+    if (!(other instanceof Memory)) return false;
+
+    return Arrays.equals(memBytes, ((Memory) other).memBytes);
+  }
+
+  @Override
+  public int hashCode() {
+    return Arrays.hashCode(memBytes);
+  }
+
+  /**
+   * Returns the current number of active bytes stored in memory.
+   *
+   * @return The current number of active bytes stored in memory.
+   */
+  int getActiveBytes() {
+    return activeWords * Bytes32.SIZE;
+  }
+
+  /**
+   * Returns the current number of active words stored in memory.
+   *
+   * @return The current number of active words stored in memory.
+   */
+  int getActiveWords() {
+    return activeWords;
+  }
+
+  /**
+   * Returns a copy of bytes from memory.
+   *
+   * @param location The location in memory to start with.
+   * @param numBytes The number of bytes to get.
+   * @return A fresh copy of the bytes from memory starting at {@code location} and extending {@code
+   *     numBytes}.
+   */
+  public Bytes getBytes(final long location, final long numBytes) {
+    // Note: if length == 0, we don't require any memory expansion, whatever location is. So
+    // we must call asByteIndex(location) after this check so as it doesn't throw if the location
+    // is too big but the length is 0 (which is somewhat nonsensical, but is exercise by some
+    // tests).
+    final int length = asByteLength(numBytes);
+    if (length == 0) {
+      return Bytes.EMPTY;
+    }
+
+    final int start = asByteIndex(location);
+
+    ensureCapacityForBytes(start, length);
+    return Bytes.wrap(Arrays.copyOfRange(memBytes, start, start + length));
+  }
+
+  /**
+   * Returns a copy of bytes from memory.
+   *
+   * @param location The location in memory to start with.
+   * @param numBytes The number of bytes to get.
+   * @return A fresh copy of the bytes from memory starting at {@code location} and extending {@code
+   *     numBytes}.
+   */
+  public MutableBytes getMutableBytes(final long location, final long numBytes) {
+    // Note: if length == 0, we don't require any memory expansion, whatever location is. So
+    // we must call asByteIndex(location) after this check so as it doesn't throw if the location
+    // is too big but the length is 0 (which is somewhat nonsensical, but is exercise by some
+    // tests).
+    final int length = asByteLength(numBytes);
+    if (length == 0) {
+      return MutableBytes.EMPTY;
+    }
+
+    final int start = asByteIndex(location);
+
+    ensureCapacityForBytes(start, length);
+    return MutableBytes.wrap(memBytes, start, length);
+  }
+
+  /**
+   * Copy the bytes from the provided number of bytes from the provided value to memory from the
+   * provided offset.
+   *
+   * <p>Note that this method will extend memory to accommodate the location assigned and bytes
+   * copied and so never fails.
+   *
+   * @param memOffset the location in memory at which to start copying the bytes of {@code value}.
+   * @param offset the location in the source to start copying.
+   * @param length the number of bytes to set in memory. Note that this value may differ from {@code
+   *     value.size()}: if {@code numBytes < value.size()} bytes, only {@code numBytes} will be
+   *     copied from {@code value}; if {@code numBytes < value.size()}, then only the bytes in
+   *     {@code value} will be copied, but the memory will be expanded if necessary to cover {@code
+   *     numBytes} (in other words, {@link #getActiveWords()} will return a value consistent with
+   *     having set {@code numBytes} bytes, even if less than that have been concretely set due to
+   *     {@code value} being smaller).
+   * @param bytes the bytes to copy to memory from {@code location}.
+   */
+  public void setBytes(
+      final long memOffset, final long offset, final long length, final Bytes bytes) {
+
+    if (offset >= bytes.size()) {
+      clearBytes(memOffset, length);
+      return;
+    }
+
+    final Bytes toCopy =
+        bytes.slice((int) offset, Math.min((int) length, bytes.size() - (int) offset));
+    setBytes(memOffset, length, toCopy);
+  }
+
+  /**
+   * Copy the bytes from the provided number of bytes from the provided value to memory from the
+   * provided offset.
+   *
+   * <p>Note that this method will extend memory to accommodate the location assigned and bytes
+   * copied and so never fails.
+   *
+   * @param location the location in memory at which to start copying the bytes of {@code value}.
+   * @param numBytes the number of bytes to set in memory. Note that this value may differ from
+   *     {@code value.size()}: if {@code numBytes < value.size()} bytes, only {@code numBytes} will
+   *     be copied from {@code value}; if {@code numBytes > value.size()}, then only the bytes in
+   *     {@code value} will be copied, but the memory will be expanded if necessary to cover {@code
+   *     numBytes} (in other words, {@link #getActiveWords()} will return a value consistent with
+   *     having set {@code numBytes} bytes, even if less than that have been concretely set due to
+   *     {@code value} being smaller).
+   * @param taintedValue the bytes to copy to memory from {@code location}.
+   */
+  public void setBytes(final long location, final long numBytes, final Bytes taintedValue) {
+    if (numBytes == 0) {
+      return;
+    }
+
+    final int start = asByteIndex(location);
+    final int length = asByteLength(numBytes);
+    final int srcLength = taintedValue.size();
+    final int end = Math.addExact(start, length);
+
+    ensureCapacityForBytes(start, length);
+    if (srcLength >= length) {
+      System.arraycopy(taintedValue.toArrayUnsafe(), 0, memBytes, start, length);
+    } else {
+      Arrays.fill(memBytes, start + srcLength, end, (byte) 0);
+      if (srcLength > 0) {
+        System.arraycopy(taintedValue.toArrayUnsafe(), 0, memBytes, start, srcLength);
+      }
+    }
+  }
+
+  /**
+   * Copy the bytes from the value param into memory at the specified offset. In cases where the
+   * value does not have numBytes bytes the appropriate amount of zero bytes will be added before
+   * writing the value bytes.
+   *
+   * <p>Note that this method will extend memory to accommodate the location assigned and bytes
+   * copied and so never fails.
+   *
+   * @param location the location in memory at which to start writing the padding and {@code value}
+   *     bytes.
+   * @param numBytes the number of bytes to set in memory. Note that this value may differ from
+   *     {@code value.size()}: if {@code numBytes < value.size()} bytes, only {@code numBytes} will
+   *     be copied from {@code value}; if {@code numBytes > value.size()}, then only the bytes in
+   *     {@code value} will be copied, but the memory will be expanded if necessary to cover {@code
+   *     numBytes} (in other words, {@link #getActiveWords()} will return a value consistent with
+   *     having set {@code numBytes} bytes, even if less than that have been concretely set due to
+   *     {@code value} being smaller). These create bytes will be added to the left as needed.
+   * @param value the bytes to copy into memory starting at {@code location}.
+   */
+  public void setBytesRightAligned(final long location, final long numBytes, final Bytes value) {
+    if (numBytes == 0) {
+      return;
+    }
+
+    final int start = asByteIndex(location);
+    final int length = asByteLength(numBytes);
+    final int srcLength = value.size();
+    final int end = Math.addExact(start, length);
+
+    ensureCapacityForBytes(start, length);
+    if (srcLength >= length) {
+      System.arraycopy(value.toArrayUnsafe(), 0, memBytes, start, length);
+    } else {
+      int divider = end - srcLength;
+      Arrays.fill(memBytes, start, divider, (byte) 0);
+      if (srcLength > 0) {
+        System.arraycopy(value.toArrayUnsafe(), 0, memBytes, divider, srcLength);
+      }
+    }
+  }
+
+  /**
+   * Clears (set to 0) some contiguous number of bytes in memory.
+   *
+   * @param location The location in memory from which to start clearing the bytes.
+   * @param numBytes The number of bytes to clear.
+   */
+  private void clearBytes(final long location, final long numBytes) {
+    // See getBytes for why we check length == 0 first, before calling asByteIndex(location).
+    final int length = asByteLength(numBytes);
+    if (length == 0) {
+      return;
+    }
+    clearBytes(asByteIndex(location), length);
+  }
+
+  /**
+   * Clears (set to 0) some contiguous number of bytes in memory.
+   *
+   * @param location The location in memory from which to start clearing the bytes.
+   * @param numBytes The number of bytes to clear.
+   */
+  private void clearBytes(final int location, final int numBytes) {
+    if (numBytes == 0) {
+      return;
+    }
+
+    ensureCapacityForBytes(location, numBytes);
+    Arrays.fill(memBytes, location, location + numBytes, (byte) 0);
+  }
+
+  /**
+   * Sets a single byte in memory at the provided location.
+   *
+   * @param location the location of the byte to set.
+   * @param value the value to set for the byte at {@code location}.
+   */
+  void setByte(final long location, final byte value) {
+    final int start = asByteIndex(location);
+    ensureCapacityForBytes(start, 1);
+    memBytes[start] = value;
+  }
+
+  /**
+   * Returns a copy of the 32-bytes word that begins at the specified memory location.
+   *
+   * @param location The memory location the 256-bit word begins at.
+   * @return a copy of the 32-bytes word that begins at the specified memory location.
+   */
+  public Bytes32 getWord(final long location) {
+    final int start = asByteIndex(location);
+    ensureCapacityForBytes(start, Bytes32.SIZE);
+    return Bytes32.wrap(Arrays.copyOfRange(memBytes, start, start + Bytes32.SIZE));
+  }
+
+  /**
+   * Sets a 32-bytes word in memory at the provided location.
+   *
+   * <p>Note that this method will extend memory to accommodate the location assigned and bytes
+   * copied and so never fails.
+   *
+   * @param location the location at which to start setting the bytes.
+   * @param bytes the 32 bytes to copy at {@code location}.
+   */
+  public void setWord(final long location, final Bytes32 bytes) {
+    final int start = asByteIndex(location);
+    ensureCapacityForBytes(start, Bytes32.SIZE);
+    System.arraycopy(bytes.toArrayUnsafe(), 0, memBytes, start, Bytes32.SIZE);
+  }
+
+  /**
+   * Copies one length of bytes to a new memory location, growing memory if needed.
+   *
+   * <p>Copying behaves as if the values are copied to an intermediate buffer before writing.
+   *
+   * @param dst where to copy the bytes _to_
+   * @param src where to copy the bytes _from_
+   * @param length the number of bytes to copy.
+   */
+  public void copy(final long dst, final long src, final long length) {
+    ensureCapacityForBytes(Math.max(dst, src), length);
+    System.arraycopy(memBytes, asByteIndex(src), memBytes, asByteIndex(dst), asByteLength(length));
+  }
+
+  @Override
+  public String toString() {
+    return Bytes.wrap(memBytes).toHexString();
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/frame/MessageFrame.java b/evm/src/main/java/org/hyperledger/besu/evm/frame/MessageFrame.java
new file mode 100644
index 00000000000..a71838e22b7
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/frame/MessageFrame.java
@@ -0,0 +1,1754 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.frame;
+
+import static com.google.common.base.Preconditions.checkState;
+import static java.util.Collections.emptySet;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.code.CodeSection;
+import org.hyperledger.besu.evm.internal.FixedStack.UnderflowException;
+import org.hyperledger.besu.evm.internal.MemoryEntry;
+import org.hyperledger.besu.evm.internal.OperandStack;
+import org.hyperledger.besu.evm.internal.ReturnStack;
+import org.hyperledger.besu.evm.internal.StorageEntry;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.operation.Operation;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import com.google.common.collect.HashBasedTable;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Table;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.bytes.MutableBytes;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/**
+ * A container object for all the states associated with a message.
+ *
+ * <p>A message corresponds to an interaction between two accounts. A Transaction spawns at least
+ * one message when its processed. Messages can also spawn messages depending on the code executed
+ * within a message.
+ *
+ * <p>Note that there is no specific Message object in the code base. Instead, message executions
+ * correspond to a {@code MessageFrame} and a specific AbstractMessageProcessor. Currently, there
+ * are two such AbstractMessageProcessor types:
+ *
+ * <p><b>Message Call ({@code MESSAGE_CALL})</b>
+ *
+ * <p>A message call consists of applying a set of changes to an account on behalf of another
+ * account. At the minimal end of changes is a value transfer between a sender and recipient
+ * account. If the recipient account contains code, that code is also executed.
+ *
+ * <p><b>Contract Creation ({@code CONTRACT_CREATION})</b>
+ *
+ * <p>A contract creation, as its name suggests, creates contract accounts. Contract initialization
+ * code and a value are supplied to initialize the contract account code and balance, respectively.
+ */
+public class MessageFrame {
+
+  /**
+   * Message Frame State.
+   *
+   * <h2>Message Frame Lifecycle</h2>
+   *
+   * <p>The diagram below presents the message frame lifecycle:
+   *
+   * <pre>
+   *            ------------------------------------------------------
+   *            |                                                    |
+   *            |                                                    v
+   *            |               ---------------------     ---------------------
+   *            |               |                   |     |                   |
+   *            |               |    CODE_SUCCESS   | --&gt; | COMPLETED_SUCCESS |
+   *            |               |                   |     |                   |
+   *            |               ---------------------     ---------------------
+   *            |                         ^
+   *            |                         |
+   *  ---------------------     ---------------------     ---------------------
+   *  |                   |     |                   | --&gt; |                   |
+   *  |    NOT_STARTED    | --&gt; |   CODE_EXECUTING  |     |   CODE_SUSPENDED  |
+   *  |                   |     |                   | &lt;-- |                   |
+   *  ---------------------     ---------------------     ---------------------
+   *            |                         |
+   *            |                         |
+   *            |                         |                 ---------------------
+   *            |                         |                 |                   |
+   *            |                         |------------&gt; |      REVERTED     |
+   *            |                         |                 |                   |
+   *            |                         |                 ---------------------
+   *            |                         |
+   *            |                         v
+   *            |               ---------------------     ---------------------
+   *            |               |                   |     |                   |
+   *            |-------------&gt; |  EXCEPTIONAL_HALT | --&gt; | COMPLETED_FAILURE |
+   *                            |                   |     |                   |
+   *                            ---------------------     ---------------------
+   * </pre>
+   *
+   * <b>Message Not Started ({@link #NOT_STARTED})</b>
+   *
+   * <p>The message has not begun to execute yet.
+   *
+   * <p><b>Code Executing ({@link #CODE_EXECUTING})</b>
+   *
+   * <p>The message contains code and has begun executing it. The execution will continue until it
+   * is halted due to (1) spawning a child message (2) encountering an exceptional halting condition
+   * (2) completing successfully.
+   *
+   * <p><b>Code Suspended Execution ({@link #CODE_SUSPENDED})</b>
+   *
+   * <p>The message has spawned a child message and has suspended its execution until the child
+   * message has completed and notified its parent message. The message will then continue executing
+   * code ({@link #CODE_EXECUTING}) again.
+   *
+   * <p><b>Code Execution Completed Successfully ({@link #CODE_SUSPENDED})</b>
+   *
+   * <p>The code within the message has executed to completion successfully.
+   *
+   * <p><b>Message Exceptionally Halted ({@link #EXCEPTIONAL_HALT})</b>
+   *
+   * <p>The message execution has encountered an exceptional halting condition at some point during
+   * its execution.
+   *
+   * <p><b>Message Reverted ({@link #REVERT})</b>
+   *
+   * <p>The message execution has requested to revert state during execution.
+   *
+   * <p><b>Message Execution Failed ({@link #COMPLETED_FAILED})</b>
+   *
+   * <p>The message execution failed to execute successfully; most likely due to encountering an
+   * exceptional halting condition. At this point the message frame is finalized and the parent is
+   * notified.
+   *
+   * <p><b>Message Execution Completed Successfully ({@link #COMPLETED_SUCCESS})</b>
+   *
+   * <p>The message execution completed successfully and needs to finalized and propagated to the
+   * parent message that spawned it.
+   */
+  public enum State {
+
+    /** Message execution has not started. */
+    NOT_STARTED,
+
+    /** Code execution within the message is in progress. */
+    CODE_EXECUTING,
+
+    /** Code execution within the message has finished successfully. */
+    CODE_SUCCESS,
+
+    /** Code execution within the message has been suspended. */
+    CODE_SUSPENDED,
+
+    /** An exceptional halting condition has occurred. */
+    EXCEPTIONAL_HALT,
+
+    /** State changes were reverted during execution. */
+    REVERT,
+
+    /** The message execution has failed to complete successfully. */
+    COMPLETED_FAILED,
+
+    /** The message execution has completed successfully. */
+    COMPLETED_SUCCESS,
+  }
+
+  /** The message type the frame corresponds to. */
+  public enum Type {
+
+    /** A Contract creation message. */
+    CONTRACT_CREATION,
+
+    /** A message call message. */
+    MESSAGE_CALL,
+  }
+
+  /** The constant DEFAULT_MAX_STACK_SIZE. */
+  public static final int DEFAULT_MAX_STACK_SIZE = 1024;
+
+  // Global data fields.
+  private final WorldUpdater worldUpdater;
+
+  // Metadata fields.
+  private final Type type;
+  private State state;
+
+  // Machine state fields.
+  private long gasRemaining;
+  private final Function<Long, Hash> blockHashLookup;
+  private final int maxStackSize;
+  private int pc;
+  private int section;
+  private final Memory memory;
+  private final OperandStack stack;
+  private final ReturnStack returnStack;
+  private Bytes output;
+  private Bytes returnData;
+  private final boolean isStatic;
+
+  // Transaction substate fields.
+  private final List<Log> logs;
+  private long gasRefund;
+  private final Set<Address> selfDestructs;
+  private final Map<Address, Wei> refunds;
+  private final Set<Address> warmedUpAddresses;
+  private final Multimap<Address, Bytes32> warmedUpStorage;
+
+  // Execution Environment fields.
+  private final Address recipient;
+  private final Address originator;
+  private final Address contract;
+  private final Wei gasPrice;
+  private final Bytes inputData;
+  private final Address sender;
+  private final Wei value;
+  private final Wei apparentValue;
+  private final Code code;
+  private final BlockValues blockValues;
+  private final int depth;
+  private final MessageFrame parentMessageFrame;
+  private final Deque<MessageFrame> messageFrameStack;
+  private final Address miningBeneficiary;
+  private Optional<Bytes> revertReason;
+
+  private final Map<String, Object> contextVariables;
+  private final Optional<List<Hash>> versionedHashes;
+
+  private final Table<Address, Bytes32, Bytes32> transientStorage = HashBasedTable.create();
+
+  // Miscellaneous fields.
+  private Optional<ExceptionalHaltReason> exceptionalHaltReason = Optional.empty();
+  private Operation currentOperation;
+  private final Consumer<MessageFrame> completer;
+  private Optional<MemoryEntry> maybeUpdatedMemory = Optional.empty();
+  private Optional<StorageEntry> maybeUpdatedStorage = Optional.empty();
+
+  /**
+   * Builder builder.
+   *
+   * @return the builder
+   */
+  public static Builder builder() {
+    return new Builder();
+  }
+
+  private MessageFrame(
+      final Type type,
+      final Deque<MessageFrame> messageFrameStack,
+      final WorldUpdater worldUpdater,
+      final long initialGas,
+      final Address recipient,
+      final Address originator,
+      final Address contract,
+      final Wei gasPrice,
+      final Bytes inputData,
+      final Address sender,
+      final Wei value,
+      final Wei apparentValue,
+      final Code code,
+      final BlockValues blockValues,
+      final int depth,
+      final boolean isStatic,
+      final Consumer<MessageFrame> completer,
+      final Address miningBeneficiary,
+      final Function<Long, Hash> blockHashLookup,
+      final Map<String, Object> contextVariables,
+      final Optional<Bytes> revertReason,
+      final int maxStackSize,
+      final Set<Address> accessListWarmAddresses,
+      final Multimap<Address, Bytes32> accessListWarmStorage,
+      final Optional<List<Hash>> versionedHashes) {
+    this.type = type;
+    this.messageFrameStack = messageFrameStack;
+    this.parentMessageFrame = messageFrameStack.peek();
+    this.worldUpdater = worldUpdater;
+    this.gasRemaining = initialGas;
+    this.blockHashLookup = blockHashLookup;
+    this.maxStackSize = maxStackSize;
+    this.pc = 0;
+    this.section = 0;
+    this.memory = new Memory();
+    this.stack = new OperandStack(maxStackSize);
+    this.returnStack = new ReturnStack();
+    returnStack.push(new ReturnStack.ReturnStackItem(0, 0, 0));
+    pc = code.isValid() ? code.getCodeSection(0).getEntryPoint() : 0;
+    this.output = Bytes.EMPTY;
+    this.returnData = Bytes.EMPTY;
+    this.logs = new ArrayList<>();
+    this.gasRefund = 0L;
+    this.selfDestructs = new HashSet<>();
+    this.refunds = new HashMap<>();
+    this.recipient = recipient;
+    this.originator = originator;
+    this.contract = contract;
+    this.gasPrice = gasPrice;
+    this.inputData = inputData;
+    this.sender = sender;
+    this.value = value;
+    this.apparentValue = apparentValue;
+    this.code = code;
+    this.blockValues = blockValues;
+    this.depth = depth;
+    this.state = State.NOT_STARTED;
+    this.isStatic = isStatic;
+    this.completer = completer;
+    this.miningBeneficiary = miningBeneficiary;
+    this.contextVariables = contextVariables;
+    this.revertReason = revertReason;
+
+    this.warmedUpAddresses = new HashSet<>(accessListWarmAddresses);
+    this.warmedUpAddresses.add(sender);
+    this.warmedUpAddresses.add(contract);
+    this.warmedUpStorage = HashMultimap.create(accessListWarmStorage);
+    this.versionedHashes = versionedHashes;
+
+    // the warmed up addresses will always be a superset of the address keys in the warmed up
+    // storage, so we can do both warm-ups in one pass
+    accessListWarmAddresses.forEach(
+        address ->
+            Optional.ofNullable(worldUpdater.get(address))
+                .ifPresent(
+                    account ->
+                        warmedUpStorage
+                            .get(address)
+                            .forEach(
+                                storageKeyBytes ->
+                                    account.getStorageValue(UInt256.fromBytes(storageKeyBytes)))));
+  }
+
+  /**
+   * Return the program counter.
+   *
+   * @return the program counter
+   */
+  public int getPC() {
+    return pc;
+  }
+
+  /**
+   * Set the program counter.
+   *
+   * @param pc The new program counter value
+   */
+  public void setPC(final int pc) {
+    this.pc = pc;
+  }
+
+  /**
+   * Set the code section index.
+   *
+   * @param section the code section index
+   */
+  public void setSection(final int section) {
+    this.section = section;
+  }
+
+  /**
+   * Return the current code section. Always zero for legacy code.
+   *
+   * @return the current code section
+   */
+  public int getSection() {
+    return section;
+  }
+
+  /**
+   * Call function and return exceptional halt reason.
+   *
+   * @param calledSection the called section
+   * @return the exceptional halt reason
+   */
+  public ExceptionalHaltReason callFunction(final int calledSection) {
+    CodeSection info = code.getCodeSection(calledSection);
+    if (info == null) {
+      return ExceptionalHaltReason.CODE_SECTION_MISSING;
+    } else if (stack.size() + info.getMaxStackHeight() > maxStackSize) {
+      return ExceptionalHaltReason.TOO_MANY_STACK_ITEMS;
+    } else if (stack.size() < info.getInputs()) {
+      return ExceptionalHaltReason.TOO_FEW_INPUTS_FOR_CODE_SECTION;
+    } else {
+      returnStack.push(
+          new ReturnStack.ReturnStackItem(section, pc + 2, stack.size() - info.getInputs()));
+      pc = info.getEntryPoint() - 1; // will be +1ed at end of operations loop
+      this.section = calledSection;
+      return null;
+    }
+  }
+
+  /**
+   * Jump function exceptional halt reason.
+   *
+   * @param section the section
+   * @return the exceptional halt reason
+   */
+  public ExceptionalHaltReason jumpFunction(final int section) {
+    CodeSection info = code.getCodeSection(section);
+    if (info == null) {
+      return ExceptionalHaltReason.CODE_SECTION_MISSING;
+    } else if (stackSize() != peekReturnStack().getStackHeight() + info.getInputs()) {
+      return ExceptionalHaltReason.JUMPF_STACK_MISMATCH;
+    } else {
+      pc = -1; // will be +1ed at end of operations loop
+      this.section = section;
+      return null;
+    }
+  }
+
+  /**
+   * Return function exceptional halt reason.
+   *
+   * @return the exceptional halt reason
+   */
+  public ExceptionalHaltReason returnFunction() {
+    CodeSection thisInfo = code.getCodeSection(this.section);
+    var returnInfo = returnStack.pop();
+    if ((returnInfo.getStackHeight() + thisInfo.getOutputs()) != stack.size()) {
+      return ExceptionalHaltReason.INCORRECT_CODE_SECTION_RETURN_OUTPUTS;
+    } else if (returnStack.isEmpty()) {
+      setState(MessageFrame.State.CODE_SUCCESS);
+      setOutputData(Bytes.EMPTY);
+      return null;
+    } else {
+      this.pc = returnInfo.getPC();
+      this.section = returnInfo.getCodeSectionIndex();
+      return null;
+    }
+  }
+
+  /** Deducts the remaining gas. */
+  public void clearGasRemaining() {
+    this.gasRemaining = 0L;
+  }
+
+  /**
+   * Decrement the amount of remaining gas.
+   *
+   * @param amount The amount of gas to deduct
+   * @return the amount of gas available, after deductions.
+   */
+  public long decrementRemainingGas(final long amount) {
+    return this.gasRemaining -= amount;
+  }
+
+  /**
+   * Return the amount of remaining gas.
+   *
+   * @return the amount of remaining gas
+   */
+  public long getRemainingGas() {
+    return gasRemaining;
+  }
+
+  /**
+   * Increment the amount of remaining gas.
+   *
+   * @param amount The amount of gas to increment
+   */
+  public void incrementRemainingGas(final long amount) {
+    this.gasRemaining += amount;
+  }
+
+  /**
+   * Set the amount of remaining gas.
+   *
+   * @param amount The amount of remaining gas
+   */
+  public void setGasRemaining(final long amount) {
+    this.gasRemaining = amount;
+  }
+
+  /**
+   * Return the output data.
+   *
+   * @return the output data
+   */
+  public Bytes getOutputData() {
+    return output;
+  }
+
+  /**
+   * Set the output data.
+   *
+   * @param output The output data
+   */
+  public void setOutputData(final Bytes output) {
+    this.output = output;
+  }
+
+  /** Clears the output data buffer. */
+  public void clearOutputData() {
+    setOutputData(Bytes.EMPTY);
+  }
+
+  /**
+   * Return the return data.
+   *
+   * @return the return data
+   */
+  public Bytes getReturnData() {
+    return returnData;
+  }
+
+  /**
+   * Set the return data.
+   *
+   * @param returnData The return data
+   */
+  public void setReturnData(final Bytes returnData) {
+    this.returnData = returnData;
+  }
+
+  /** Clear the return data buffer. */
+  public void clearReturnData() {
+    setReturnData(Bytes.EMPTY);
+  }
+
+  /**
+   * Returns the item at the specified offset in the stack.
+   *
+   * @param offset The item's position relative to the top of the stack
+   * @return The item at the specified offset in the stack
+   * @throws UnderflowException if the offset is out of range
+   */
+  public Bytes getStackItem(final int offset) {
+    return stack.get(offset);
+  }
+
+  /**
+   * Removes the item at the top of the stack.
+   *
+   * @return the item at the top of the stack
+   * @throws UnderflowException if the stack is empty
+   */
+  public Bytes popStackItem() {
+    return stack.pop();
+  }
+
+  /**
+   * Removes the corresponding number of items from the top of the stack.
+   *
+   * @param n The number of items to pop off the stack
+   */
+  public void popStackItems(final int n) {
+    stack.bulkPop(n);
+  }
+
+  /**
+   * Pushes the corresponding item onto the top of the stack
+   *
+   * @param value The value to push onto the stack.
+   */
+  public void pushStackItem(final Bytes value) {
+    stack.push(value);
+  }
+
+  /**
+   * Sets the stack item at the specified offset from the top of the stack to the value
+   *
+   * @param offset The item's position relative to the top of the stack
+   * @param value The value to set the stack item to
+   * @throws IllegalStateException if the stack is too small
+   */
+  public void setStackItem(final int offset, final Bytes value) {
+    stack.set(offset, value);
+  }
+
+  /**
+   * Return the current stack size.
+   *
+   * @return The current stack size
+   */
+  public int stackSize() {
+    return stack.size();
+  }
+
+  /**
+   * Return the current return stack size.
+   *
+   * @return The current return stack size
+   */
+  public int returnStackSize() {
+    return returnStack.size();
+  }
+
+  /**
+   * The top item of the return stack
+   *
+   * @return The top item of the return stack, or null if the stack is empty
+   */
+  public ReturnStack.ReturnStackItem peekReturnStack() {
+    return returnStack.peek();
+  }
+
+  /**
+   * Pushes a new return stack item onto the return stack
+   *
+   * @param returnStackItem item to be pushed
+   */
+  public void pushReturnStackItem(final ReturnStack.ReturnStackItem returnStackItem) {
+    returnStack.push(returnStackItem);
+  }
+
+  /**
+   * Returns whether the message frame is static or not.
+   *
+   * @return {@code} true if the frame is static; otherwise {@code false}
+   */
+  public boolean isStatic() {
+    return isStatic;
+  }
+
+  /**
+   * Returns the memory size for specified memory access.
+   *
+   * @param offset The offset in memory
+   * @param length The length of the memory access
+   * @return the memory size for specified memory access
+   */
+  public long calculateMemoryExpansion(final long offset, final long length) {
+    return memory.calculateNewActiveWords(offset, length);
+  }
+
+  /**
+   * Expands memory to accommodate the specified memory access.
+   *
+   * @param offset The offset in memory
+   * @param length The length of the memory access
+   */
+  public void expandMemory(final long offset, final long length) {
+    memory.ensureCapacityForBytes(offset, length);
+  }
+
+  /**
+   * Returns the number of bytes in memory.
+   *
+   * @return the number of bytes in memory
+   */
+  public long memoryByteSize() {
+    return memory.getActiveBytes();
+  }
+
+  /**
+   * Returns the number of words in memory.
+   *
+   * @return the number of words in memory
+   */
+  public int memoryWordSize() {
+    return memory.getActiveWords();
+  }
+
+  /**
+   * Returns the revertReason as string
+   *
+   * @return the revertReason string
+   */
+  public Optional<Bytes> getRevertReason() {
+    return revertReason;
+  }
+
+  /**
+   * Sets revert reason.
+   *
+   * @param revertReason the revert reason
+   */
+  public void setRevertReason(final Bytes revertReason) {
+    this.revertReason = Optional.ofNullable(revertReason);
+  }
+
+  /**
+   * Read bytes in memory as mutable. Contents should not be considered stable outside the scope of
+   * the current operation.
+   *
+   * @param offset The offset in memory
+   * @param length The length of the bytes to read
+   * @return The bytes in the specified range
+   */
+  public MutableBytes readMutableMemory(final long offset, final long length) {
+    return readMutableMemory(offset, length, false);
+  }
+
+  /**
+   * Read bytes in memory .
+   *
+   * @param offset The offset in memory
+   * @param length The length of the bytes to read
+   * @return The bytes in the specified range
+   */
+  public Bytes readMemory(final long offset, final long length) {
+    return readMutableMemory(offset, length, false).copy();
+  }
+
+  /**
+   * Read bytes in memory. Contents should not be considered stable outside the scope of the current
+   * operation.
+   *
+   * @param offset The offset in memory
+   * @param length The length of the bytes to read
+   * @param explicitMemoryRead true if triggered by a memory opcode, false otherwise
+   * @return The bytes in the specified range
+   */
+  public MutableBytes readMutableMemory(
+      final long offset, final long length, final boolean explicitMemoryRead) {
+    final MutableBytes memBytes = memory.getMutableBytes(offset, length);
+    if (explicitMemoryRead) {
+      setUpdatedMemory(offset, memBytes);
+    }
+    return memBytes;
+  }
+
+  /**
+   * Write byte to memory
+   *
+   * @param offset The offset in memory
+   * @param value The value to set in memory
+   * @param explicitMemoryUpdate true if triggered by a memory opcode, false otherwise
+   */
+  public void writeMemory(final long offset, final byte value, final boolean explicitMemoryUpdate) {
+    memory.setByte(offset, value);
+    if (explicitMemoryUpdate) {
+      setUpdatedMemory(offset, Bytes.of(value));
+    }
+  }
+
+  /**
+   * Write bytes to memory
+   *
+   * @param offset The offset in memory
+   * @param length The length of the bytes to write
+   * @param value The value to write
+   */
+  public void writeMemory(final long offset, final long length, final Bytes value) {
+    writeMemory(offset, length, value, false);
+  }
+
+  /**
+   * Write bytes to memory
+   *
+   * @param offset The offset in memory
+   * @param length The length of the bytes to write
+   * @param value The value to write
+   * @param explicitMemoryUpdate true if triggered by a memory opcode, false otherwise
+   */
+  public void writeMemory(
+      final long offset, final long length, final Bytes value, final boolean explicitMemoryUpdate) {
+    memory.setBytes(offset, length, value);
+    if (explicitMemoryUpdate) {
+      setUpdatedMemory(offset, 0, length, value);
+    }
+  }
+
+  /**
+   * Copy the bytes from the value param into memory at the specified offset. In cases where the
+   * value does not have numBytes bytes the appropriate amount of zero bytes will be added before
+   * writing the value bytes.
+   *
+   * @param offset The offset in memory
+   * @param length The length of the bytes to write
+   * @param value The value to write
+   * @param explicitMemoryUpdate true if triggered by a memory opcode, false otherwise
+   */
+  public void writeMemoryRightAligned(
+      final long offset, final long length, final Bytes value, final boolean explicitMemoryUpdate) {
+    memory.setBytesRightAligned(offset, length, value);
+    if (explicitMemoryUpdate) {
+      setUpdatedMemoryRightAligned(offset, length, value);
+    }
+  }
+
+  /**
+   * Write bytes to memory
+   *
+   * @param offset The offset in memory to start writing
+   * @param sourceOffset The offset in the source value to start writing
+   * @param length The length of the bytes to write
+   * @param value The value to write
+   */
+  public void writeMemory(
+      final long offset, final long sourceOffset, final long length, final Bytes value) {
+    writeMemory(offset, sourceOffset, length, value, false);
+  }
+
+  /**
+   * Write bytes to memory
+   *
+   * @param offset The offset in memory to start writing
+   * @param sourceOffset The offset in the source value to start writing
+   * @param length The length of the bytes to write
+   * @param value The value to write
+   * @param explicitMemoryUpdate true if triggered by a memory opcode, false otherwise
+   */
+  public void writeMemory(
+      final long offset,
+      final long sourceOffset,
+      final long length,
+      final Bytes value,
+      final boolean explicitMemoryUpdate) {
+    memory.setBytes(offset, sourceOffset, length, value);
+    if (explicitMemoryUpdate && length > 0) {
+      setUpdatedMemory(offset, sourceOffset, length, value);
+    }
+  }
+
+  /**
+   * Copies bytes within memory.
+   *
+   * <p>Copying behaves as if the values are copied to an intermediate buffer before writing.
+   *
+   * @param dst The destination address
+   * @param src The source address
+   * @param length the number of bytes to copy
+   * @param explicitMemoryUpdate true if triggered by a memory opcode, false otherwise
+   */
+  public void copyMemory(
+      final long dst, final long src, final long length, final boolean explicitMemoryUpdate) {
+    if (length > 0) {
+      memory.copy(dst, src, length);
+      if (explicitMemoryUpdate) {
+        setUpdatedMemory(dst, memory.getBytes(dst, length));
+      }
+    }
+  }
+
+  private void setUpdatedMemory(
+      final long offset, final long sourceOffset, final long length, final Bytes value) {
+    final long endIndex = sourceOffset + length;
+    if (sourceOffset >= 0 && endIndex > 0) {
+      final int srcSize = value.size();
+      if (endIndex > srcSize) {
+        final MutableBytes paddedAnswer = MutableBytes.create((int) length);
+        if (sourceOffset < srcSize) {
+          value.slice((int) sourceOffset, (int) (srcSize - sourceOffset)).copyTo(paddedAnswer, 0);
+        }
+        setUpdatedMemory(offset, paddedAnswer.copy());
+      } else {
+        setUpdatedMemory(offset, value.slice((int) sourceOffset, (int) length).copy());
+      }
+    }
+  }
+
+  private void setUpdatedMemoryRightAligned(
+      final long offset, final long length, final Bytes value) {
+    if (length > 0) {
+      final int srcSize = value.size();
+      if (length > srcSize) {
+        final MutableBytes paddedAnswer = MutableBytes.create((int) length);
+        if ((long) 0 < srcSize) {
+          value.slice(0, srcSize).copyTo(paddedAnswer, (int) (length - srcSize));
+        }
+        setUpdatedMemory(offset, paddedAnswer.copy());
+      } else {
+        setUpdatedMemory(offset, value.slice(0, (int) length).copy());
+      }
+    }
+  }
+
+  private void setUpdatedMemory(final long offset, final Bytes value) {
+    maybeUpdatedMemory = Optional.of(new MemoryEntry(offset, value));
+  }
+
+  /**
+   * Storage was updated.
+   *
+   * @param storageAddress the storage address
+   * @param value the value
+   */
+  public void storageWasUpdated(final UInt256 storageAddress, final Bytes value) {
+    maybeUpdatedStorage = Optional.of(new StorageEntry(storageAddress, value));
+  }
+
+  /**
+   * Accumulate a log.
+   *
+   * @param log The log to accumulate
+   */
+  public void addLog(final Log log) {
+    logs.add(log);
+  }
+
+  /**
+   * Accumulate logs.
+   *
+   * @param logs The logs to accumulate
+   */
+  public void addLogs(final List<Log> logs) {
+    this.logs.addAll(logs);
+  }
+
+  /** Clear the accumulated logs. */
+  public void clearLogs() {
+    logs.clear();
+  }
+
+  /**
+   * Return the accumulated logs.
+   *
+   * @return the accumulated logs
+   */
+  public List<Log> getLogs() {
+    return logs;
+  }
+
+  /**
+   * Increment the gas refund.
+   *
+   * @param amount The amount to increment the refund
+   */
+  public void incrementGasRefund(final long amount) {
+    this.gasRefund += amount;
+  }
+
+  /** Clear the accumulated gas refund. */
+  public void clearGasRefund() {
+    gasRefund = 0L;
+  }
+
+  /**
+   * Return the accumulated gas refund.
+   *
+   * @return accumulated gas refund
+   */
+  public long getGasRefund() {
+    return gasRefund;
+  }
+
+  /**
+   * Add recipient to the self-destruct set if not already present.
+   *
+   * @param address The recipient to self-destruct
+   */
+  public void addSelfDestruct(final Address address) {
+    selfDestructs.add(address);
+  }
+
+  /**
+   * Add addresses to the self-destruct set if they are not already present.
+   *
+   * @param addresses The addresses to self-destruct
+   */
+  public void addSelfDestructs(final Set<Address> addresses) {
+    selfDestructs.addAll(addresses);
+  }
+
+  /** Removes all entries in the self-destruct set. */
+  public void clearSelfDestructs() {
+    selfDestructs.clear();
+  }
+
+  /**
+   * Returns the self-destruct set.
+   *
+   * @return the self-destruct set
+   */
+  public Set<Address> getSelfDestructs() {
+    return selfDestructs;
+  }
+
+  /**
+   * Add refund to the refunds map if not already present.
+   *
+   * @param beneficiary the beneficiary of the refund.
+   * @param amount the amount of the refund.
+   */
+  public void addRefund(final Address beneficiary, final Wei amount) {
+    refunds.put(beneficiary, amount);
+  }
+
+  /**
+   * Returns the refunds map.
+   *
+   * @return the refunds map
+   */
+  public Map<Address, Wei> getRefunds() {
+    return refunds;
+  }
+
+  /**
+   * "Warms up" the address as per EIP-2929
+   *
+   * @param address the address to warm up
+   * @return true if the address was already warmed up
+   */
+  public boolean warmUpAddress(final Address address) {
+    if (warmedUpAddresses.add(address)) {
+      return parentMessageFrame != null && parentMessageFrame.isWarm(address);
+    } else {
+      return true;
+    }
+  }
+
+  private boolean isWarm(final Address address) {
+    MessageFrame frame = this;
+    while (frame != null) {
+      if (frame.warmedUpAddresses.contains(address)) {
+        return true;
+      }
+      frame = frame.parentMessageFrame;
+    }
+    return false;
+  }
+
+  /**
+   * "Warms up" the storage slot as per EIP-2929
+   *
+   * @param address the address whose storage is being warmed up
+   * @param slot the slot being warmed up
+   * @return true if the storage slot was already warmed up
+   */
+  public boolean warmUpStorage(final Address address, final Bytes32 slot) {
+    if (warmedUpStorage.put(address, slot)) {
+      return parentMessageFrame != null && parentMessageFrame.isWarm(address, slot);
+    } else {
+      return true;
+    }
+  }
+
+  private boolean isWarm(final Address address, final Bytes32 slot) {
+    MessageFrame frame = this;
+    while (frame != null) {
+      if (frame.warmedUpStorage.containsEntry(address, slot)) {
+        return true;
+      }
+      frame = frame.parentMessageFrame;
+    }
+    return false;
+  }
+
+  /**
+   * Merge warmed up fields.
+   *
+   * @param childFrame the child frame
+   */
+  public void mergeWarmedUpFields(final MessageFrame childFrame) {
+    if (childFrame == this) {
+      return;
+    }
+
+    warmedUpAddresses.addAll(childFrame.warmedUpAddresses);
+    warmedUpStorage.putAll(childFrame.warmedUpStorage);
+  }
+
+  /**
+   * Return the world state.
+   *
+   * @return the world state
+   */
+  public WorldUpdater getWorldUpdater() {
+    return worldUpdater;
+  }
+
+  /**
+   * Returns the message frame type.
+   *
+   * @return the message frame type
+   */
+  public Type getType() {
+    return type;
+  }
+
+  /**
+   * Returns the current execution state.
+   *
+   * @return the current execution state
+   */
+  public State getState() {
+    return state;
+  }
+
+  /**
+   * Sets the current execution state.
+   *
+   * @param state The new execution state
+   */
+  public void setState(final State state) {
+    this.state = state;
+  }
+
+  /**
+   * Returns the code currently being executed.
+   *
+   * @return the code currently being executed
+   */
+  public Code getCode() {
+    return code;
+  }
+
+  /**
+   * Returns the current input data.
+   *
+   * @return the current input data
+   */
+  public Bytes getInputData() {
+    return inputData;
+  }
+
+  /**
+   * Returns the recipient account recipient
+   *
+   * @return the callee account recipient
+   */
+  public Address getRecipientAddress() {
+    return recipient;
+  }
+
+  /**
+   * Returns the message stack depth.
+   *
+   * @return the message stack depth
+   */
+  public int getMessageStackDepth() {
+    return depth;
+  }
+
+  /**
+   * Returns the recipient that originated the message.
+   *
+   * @return the recipient that originated the message
+   */
+  public Address getOriginatorAddress() {
+    return originator;
+  }
+
+  /**
+   * Returns the recipient of the code currently executing.
+   *
+   * @return the recipient of the code currently executing
+   */
+  public Address getContractAddress() {
+    return contract;
+  }
+
+  /**
+   * Returns the current gas price.
+   *
+   * @return the current gas price
+   */
+  public Wei getGasPrice() {
+    return gasPrice;
+  }
+
+  /**
+   * Returns the recipient of the sender.
+   *
+   * @return the recipient of the sender
+   */
+  public Address getSenderAddress() {
+    return sender;
+  }
+
+  /**
+   * Returns the value being transferred.
+   *
+   * @return the value being transferred
+   */
+  public Wei getValue() {
+    return value;
+  }
+
+  /**
+   * Returns the apparent value being transferred.
+   *
+   * @return the apparent value being transferred
+   */
+  public Wei getApparentValue() {
+    return apparentValue;
+  }
+
+  /**
+   * Returns the current block header.
+   *
+   * @return the current block header
+   */
+  public BlockValues getBlockValues() {
+    return blockValues;
+  }
+
+  /** Performs updates based on the message frame's execution. */
+  public void notifyCompletion() {
+    completer.accept(this);
+  }
+
+  /**
+   * Returns the current message frame stack.
+   *
+   * @return the current message frame stack
+   */
+  public Deque<MessageFrame> getMessageFrameStack() {
+    return messageFrameStack;
+  }
+
+  /**
+   * Sets exceptional halt reason.
+   *
+   * @param exceptionalHaltReason the exceptional halt reason
+   */
+  public void setExceptionalHaltReason(
+      final Optional<ExceptionalHaltReason> exceptionalHaltReason) {
+    this.exceptionalHaltReason = exceptionalHaltReason;
+  }
+
+  /**
+   * Gets exceptional halt reason.
+   *
+   * @return the exceptional halt reason
+   */
+  public Optional<ExceptionalHaltReason> getExceptionalHaltReason() {
+    return exceptionalHaltReason;
+  }
+
+  /**
+   * Returns the current miningBeneficiary (aka coinbase)
+   *
+   * @return the current mining beneficiary
+   */
+  public Address getMiningBeneficiary() {
+    return miningBeneficiary;
+  }
+
+  /**
+   * Gets block hash lookup.
+   *
+   * @return the block hash lookup
+   */
+  public Function<Long, Hash> getBlockHashLookup() {
+    return blockHashLookup;
+  }
+
+  /**
+   * Gets current operation.
+   *
+   * @return the current operation
+   */
+  public Operation getCurrentOperation() {
+    return currentOperation;
+  }
+
+  /**
+   * Gets max stack size.
+   *
+   * @return the max stack size
+   */
+  public int getMaxStackSize() {
+    return maxStackSize;
+  }
+
+  /**
+   * Gets context variable.
+   *
+   * @param <T> the type parameter
+   * @param name the name
+   * @return the context variable
+   */
+  @SuppressWarnings({"unchecked", "TypeParameterUnusedInFormals"})
+  public <T> T getContextVariable(final String name) {
+    return (T) contextVariables.get(name);
+  }
+
+  /**
+   * Gets context variable.
+   *
+   * @param <T> the type parameter
+   * @param name the name
+   * @param defaultValue the default value
+   * @return the context variable
+   */
+  @SuppressWarnings("unchecked")
+  public <T> T getContextVariable(final String name, final T defaultValue) {
+    return (T) contextVariables.getOrDefault(name, defaultValue);
+  }
+
+  /**
+   * Has context variable.
+   *
+   * @param name the name
+   * @return the boolean
+   */
+  public boolean hasContextVariable(final String name) {
+    return contextVariables.containsKey(name);
+  }
+
+  /**
+   * Sets current operation.
+   *
+   * @param currentOperation the current operation
+   */
+  public void setCurrentOperation(final Operation currentOperation) {
+    this.currentOperation = currentOperation;
+  }
+
+  /**
+   * Gets warmedUp Storage.
+   *
+   * @return the warmed up storage
+   */
+  public Multimap<Address, Bytes32> getWarmedUpStorage() {
+    return warmedUpStorage;
+  }
+
+  /**
+   * Gets maybe updated memory.
+   *
+   * @return the maybe updated memory
+   */
+  public Optional<MemoryEntry> getMaybeUpdatedMemory() {
+    return maybeUpdatedMemory;
+  }
+
+  /**
+   * Gets maybe updated storage.
+   *
+   * @return the maybe updated storage
+   */
+  public Optional<StorageEntry> getMaybeUpdatedStorage() {
+    return maybeUpdatedStorage;
+  }
+
+  /**
+   * Gets the transient storage value, including values from parent frames if not set
+   *
+   * @param accountAddress The address of the executing context
+   * @param slot the slot to retrieve
+   * @return the data value read
+   */
+  public Bytes32 getTransientStorageValue(final Address accountAddress, final Bytes32 slot) {
+    Bytes32 data = transientStorage.get(accountAddress, slot);
+
+    if (data != null) {
+      return data;
+    }
+
+    if (parentMessageFrame != null) {
+      data = parentMessageFrame.getTransientStorageValue(accountAddress, slot);
+    }
+    if (data == null) {
+      data = Bytes32.ZERO;
+    }
+    transientStorage.put(accountAddress, slot, data);
+
+    return data;
+  }
+
+  /**
+   * Gets the transient storage value, including values from parent frames if not set
+   *
+   * @param accountAddress The address of the executing context
+   * @param slot the slot to set
+   * @param value the value to set in the transient store
+   */
+  public void setTransientStorageValue(
+      final Address accountAddress, final Bytes32 slot, final Bytes32 value) {
+    transientStorage.put(accountAddress, slot, value);
+  }
+
+  /** Writes the transient storage to the parent frame, if one exists */
+  public void commitTransientStorage() {
+    if (parentMessageFrame != null) {
+      parentMessageFrame.transientStorage.putAll(transientStorage);
+    }
+  }
+
+  /**
+   * Accessor for versionedHashes, if present.
+   *
+   * @return optional list of hashes
+   */
+  public Optional<List<Hash>> getVersionedHashes() {
+    return versionedHashes;
+  }
+
+  /** Reset. */
+  public void reset() {
+    maybeUpdatedMemory = Optional.empty();
+    maybeUpdatedStorage = Optional.empty();
+  }
+
+  /** The MessageFrame Builder. */
+  public static class Builder {
+
+    private Type type;
+    private Deque<MessageFrame> messageFrameStack;
+    private WorldUpdater worldUpdater;
+    private Long initialGas;
+    private Address address;
+    private Address originator;
+    private Address contract;
+    private Wei gasPrice;
+    private Bytes inputData;
+    private Address sender;
+    private Wei value;
+    private Wei apparentValue;
+    private Code code;
+    private BlockValues blockValues;
+    private int depth = -1;
+    private int maxStackSize = DEFAULT_MAX_STACK_SIZE;
+    private boolean isStatic = false;
+    private Consumer<MessageFrame> completer;
+    private Address miningBeneficiary;
+    private Function<Long, Hash> blockHashLookup;
+    private Map<String, Object> contextVariables;
+    private Optional<Bytes> reason = Optional.empty();
+    private Set<Address> accessListWarmAddresses = emptySet();
+    private Multimap<Address, Bytes32> accessListWarmStorage = HashMultimap.create();
+
+    private Optional<List<Hash>> versionedHashes;
+
+    /**
+     * Sets Type.
+     *
+     * @param type the type
+     * @return the builder
+     */
+    public Builder type(final Type type) {
+      this.type = type;
+      return this;
+    }
+
+    /**
+     * Sets Message frame stack.
+     *
+     * @param messageFrameStack the message frame stack
+     * @return the builder
+     */
+    public Builder messageFrameStack(final Deque<MessageFrame> messageFrameStack) {
+      this.messageFrameStack = messageFrameStack;
+      return this;
+    }
+
+    /**
+     * Sets World updater.
+     *
+     * @param worldUpdater the world updater
+     * @return the builder
+     */
+    public Builder worldUpdater(final WorldUpdater worldUpdater) {
+      this.worldUpdater = worldUpdater;
+      return this;
+    }
+
+    /**
+     * Sets Initial gas.
+     *
+     * @param initialGas the initial gas
+     * @return the builder
+     */
+    public Builder initialGas(final long initialGas) {
+      this.initialGas = initialGas;
+      return this;
+    }
+
+    /**
+     * Sets Address.
+     *
+     * @param address the address
+     * @return the builder
+     */
+    public Builder address(final Address address) {
+      this.address = address;
+      return this;
+    }
+
+    /**
+     * Sets Originator.
+     *
+     * @param originator the originator
+     * @return the builder
+     */
+    public Builder originator(final Address originator) {
+      this.originator = originator;
+      return this;
+    }
+
+    /**
+     * Sets Contract.
+     *
+     * @param contract the contract
+     * @return the builder
+     */
+    public Builder contract(final Address contract) {
+      this.contract = contract;
+      return this;
+    }
+
+    /**
+     * Sets Gas price.
+     *
+     * @param gasPrice the gas price
+     * @return the builder
+     */
+    public Builder gasPrice(final Wei gasPrice) {
+      this.gasPrice = gasPrice;
+      return this;
+    }
+
+    /**
+     * Sets Input data.
+     *
+     * @param inputData the input data
+     * @return the builder
+     */
+    public Builder inputData(final Bytes inputData) {
+      this.inputData = inputData;
+      return this;
+    }
+
+    /**
+     * Sets Sender address.
+     *
+     * @param sender the sender
+     * @return the builder
+     */
+    public Builder sender(final Address sender) {
+      this.sender = sender;
+      return this;
+    }
+
+    /**
+     * Sets Value.
+     *
+     * @param value the value
+     * @return the builder
+     */
+    public Builder value(final Wei value) {
+      this.value = value;
+      return this;
+    }
+
+    /**
+     * Sets Apparent value.
+     *
+     * @param apparentValue the apparent value
+     * @return the builder
+     */
+    public Builder apparentValue(final Wei apparentValue) {
+      this.apparentValue = apparentValue;
+      return this;
+    }
+
+    /**
+     * Sets Code.
+     *
+     * @param code the code
+     * @return the builder
+     */
+    public Builder code(final Code code) {
+      this.code = code;
+      return this;
+    }
+
+    /**
+     * Sets Block values.
+     *
+     * @param blockValues the block values
+     * @return the builder
+     */
+    public Builder blockValues(final BlockValues blockValues) {
+      this.blockValues = blockValues;
+      return this;
+    }
+
+    /**
+     * Sets Depth.
+     *
+     * @param depth the depth
+     * @return the builder
+     */
+    public Builder depth(final int depth) {
+      this.depth = depth;
+      return this;
+    }
+
+    /**
+     * Sets Is static.
+     *
+     * @param isStatic the is static
+     * @return the builder
+     */
+    public Builder isStatic(final boolean isStatic) {
+      this.isStatic = isStatic;
+      return this;
+    }
+
+    /**
+     * Sets Max stack size.
+     *
+     * @param maxStackSize the max stack size
+     * @return the builder
+     */
+    public Builder maxStackSize(final int maxStackSize) {
+      this.maxStackSize = maxStackSize;
+      return this;
+    }
+
+    /**
+     * Sets Completer.
+     *
+     * @param completer the completer
+     * @return the builder
+     */
+    public Builder completer(final Consumer<MessageFrame> completer) {
+      this.completer = completer;
+      return this;
+    }
+
+    /**
+     * Sets Mining beneficiary.
+     *
+     * @param miningBeneficiary the mining beneficiary
+     * @return the builder
+     */
+    public Builder miningBeneficiary(final Address miningBeneficiary) {
+      this.miningBeneficiary = miningBeneficiary;
+      return this;
+    }
+
+    /**
+     * Sets Block hash lookup.
+     *
+     * @param blockHashLookup the block hash lookup
+     * @return the builder
+     */
+    public Builder blockHashLookup(final Function<Long, Hash> blockHashLookup) {
+      this.blockHashLookup = blockHashLookup;
+      return this;
+    }
+
+    /**
+     * Sets Context variables.
+     *
+     * @param contextVariables the context variables
+     * @return the builder
+     */
+    public Builder contextVariables(final Map<String, Object> contextVariables) {
+      this.contextVariables = contextVariables;
+      return this;
+    }
+
+    /**
+     * Sets Reason.
+     *
+     * @param reason the reason
+     * @return the builder
+     */
+    public Builder reason(final Bytes reason) {
+      this.reason = Optional.ofNullable(reason);
+      return this;
+    }
+
+    /**
+     * Sets Access list warm addresses.
+     *
+     * @param accessListWarmAddresses the access list warm addresses
+     * @return the builder
+     */
+    public Builder accessListWarmAddresses(final Set<Address> accessListWarmAddresses) {
+      this.accessListWarmAddresses = accessListWarmAddresses;
+      return this;
+    }
+
+    /**
+     * Sets Access list warm storage.
+     *
+     * @param accessListWarmStorage the access list warm storage
+     * @return the builder
+     */
+    public Builder accessListWarmStorage(final Multimap<Address, Bytes32> accessListWarmStorage) {
+      this.accessListWarmStorage = accessListWarmStorage;
+      return this;
+    }
+
+    /**
+     * Sets versioned hashes list.
+     *
+     * @param versionedHashes the Optional list of versioned hashes
+     * @return the builder
+     */
+    public Builder versionedHashes(final Optional<List<Hash>> versionedHashes) {
+      this.versionedHashes = versionedHashes;
+      return this;
+    }
+
+    private void validate() {
+      checkState(type != null, "Missing message frame type");
+      checkState(messageFrameStack != null, "Missing message frame message frame stack");
+      checkState(worldUpdater != null, "Missing message frame world updater");
+      checkState(initialGas != null, "Missing message frame initial getGasRemaining");
+      checkState(address != null, "Missing message frame recipient");
+      checkState(originator != null, "Missing message frame originator");
+      checkState(contract != null, "Missing message frame contract");
+      checkState(gasPrice != null, "Missing message frame getGasRemaining price");
+      checkState(inputData != null, "Missing message frame input data");
+      checkState(sender != null, "Missing message frame sender");
+      checkState(value != null, "Missing message frame value");
+      checkState(apparentValue != null, "Missing message frame apparent value");
+      checkState(code != null, "Missing message frame code");
+      checkState(blockValues != null, "Missing message frame block header");
+      checkState(depth > -1, "Missing message frame depth");
+      checkState(completer != null, "Missing message frame completer");
+      checkState(miningBeneficiary != null, "Missing mining beneficiary");
+      checkState(blockHashLookup != null, "Missing block hash lookup");
+    }
+
+    /**
+     * Build MessageFrame.
+     *
+     * @return instance of MessageFrame
+     */
+    public MessageFrame build() {
+      validate();
+
+      return new MessageFrame(
+          type,
+          messageFrameStack,
+          worldUpdater,
+          initialGas,
+          address,
+          originator,
+          contract,
+          gasPrice,
+          inputData,
+          sender,
+          value,
+          apparentValue,
+          code,
+          blockValues,
+          depth,
+          isStatic,
+          completer,
+          miningBeneficiary,
+          blockHashLookup,
+          contextVariables == null ? Map.of() : contextVariables,
+          reason,
+          maxStackSize,
+          accessListWarmAddresses,
+          accessListWarmStorage,
+          versionedHashes);
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/BerlinGasCalculator.java b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/BerlinGasCalculator.java
new file mode 100644
index 00000000000..c15de3270f8
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/BerlinGasCalculator.java
@@ -0,0 +1,268 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.gascalculator;
+
+import static org.hyperledger.besu.datatypes.Address.BLAKE2B_F_COMPRESSION;
+import static org.hyperledger.besu.evm.internal.Words.clampedAdd;
+import static org.hyperledger.besu.evm.internal.Words.clampedMultiply;
+import static org.hyperledger.besu.evm.internal.Words.clampedToInt;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.internal.Words;
+import org.hyperledger.besu.evm.precompile.BigIntegerModularExponentiationPrecompiledContract;
+
+import java.math.BigInteger;
+import java.util.function.Supplier;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** The Berlin gas calculator. */
+public class BerlinGasCalculator extends IstanbulGasCalculator {
+
+  // new constants for EIP-2929
+  private static final long COLD_SLOAD_COST = 2100L;
+  private static final long COLD_ACCOUNT_ACCESS_COST = 2600L;
+  /** Warm storage read, defined in EIP-2929 */
+  protected static final long WARM_STORAGE_READ_COST = 100L;
+
+  private static final long ACCESS_LIST_ADDRESS_COST = 2400L;
+  /** The constant ACCESS_LIST_STORAGE_COST. */
+  protected static final long ACCESS_LIST_STORAGE_COST = 1900L;
+
+  // redefinitions for EIP-2929
+  private static final long SLOAD_GAS = WARM_STORAGE_READ_COST;
+  /** The constant SSTORE_RESET_GAS. */
+  protected static final long SSTORE_RESET_GAS = 5000L - COLD_SLOAD_COST;
+
+  // unchanged from Istanbul
+  private static final long SSTORE_SET_GAS = 20_000L;
+  private static final long SSTORE_CLEARS_SCHEDULE = 15_000L;
+
+  /** The constant SSTORE_SET_GAS_LESS_SLOAD_GAS. */
+  protected static final long SSTORE_SET_GAS_LESS_SLOAD_GAS = SSTORE_SET_GAS - SLOAD_GAS;
+  /** The constant SSTORE_RESET_GAS_LESS_SLOAD_GAS. */
+  protected static final long SSTORE_RESET_GAS_LESS_SLOAD_GAS = SSTORE_RESET_GAS - SLOAD_GAS;
+
+  private static final long NEGATIVE_SSTORE_CLEARS_SCHEDULE = -SSTORE_CLEARS_SCHEDULE;
+
+  // unchanged from Frontier
+  private static final long COPY_WORD_GAS_COST = 3L;
+
+  private final int maxPrecompile;
+
+  /**
+   * Instantiates a new Berlin gas calculator.
+   *
+   * @param maxPrecompile the max precompile
+   */
+  protected BerlinGasCalculator(final int maxPrecompile) {
+    this.maxPrecompile = maxPrecompile;
+  }
+
+  /** Instantiates a new Berlin gas calculator. */
+  public BerlinGasCalculator() {
+    this(BLAKE2B_F_COMPRESSION.toArrayUnsafe()[19]);
+  }
+
+  @Override
+  public long accessListGasCost(final int addresses, final int storageSlots) {
+    return ACCESS_LIST_ADDRESS_COST * addresses + (ACCESS_LIST_STORAGE_COST * storageSlots);
+  }
+
+  @Override
+  public boolean isPrecompile(final Address address) {
+    final byte[] addressBytes = address.toArrayUnsafe();
+    for (int i = 0; i < 19; i++) {
+      if (addressBytes[i] != 0) {
+        return false;
+      }
+    }
+    final int lastByte = Byte.toUnsignedInt(addressBytes[19]);
+    return lastByte <= maxPrecompile && lastByte != 0;
+  }
+
+  // new costs
+  @Override
+  public long getColdSloadCost() {
+    return COLD_SLOAD_COST;
+  }
+
+  @Override
+  public long getColdAccountAccessCost() {
+    return COLD_ACCOUNT_ACCESS_COST;
+  }
+
+  @Override
+  public long getWarmStorageReadCost() {
+    return WARM_STORAGE_READ_COST;
+  }
+
+  // Zeroed out old costs
+  @Override
+  public long getBalanceOperationGasCost() {
+    return 0L;
+  }
+
+  @Override
+  public long callOperationBaseGasCost() {
+    return 0L;
+  }
+
+  @Override
+  public long extCodeHashOperationGasCost() {
+    return 0L;
+  }
+
+  @Override
+  public long getExtCodeSizeOperationGasCost() {
+    return 0L;
+  }
+
+  @Override
+  public long getSloadOperationGasCost() {
+    return 0L;
+  }
+
+  // Redefined costs from EIP-2929
+  @Override
+  public long callOperationGasCost(
+      final MessageFrame frame,
+      final long stipend,
+      final long inputDataOffset,
+      final long inputDataLength,
+      final long outputDataOffset,
+      final long outputDataLength,
+      final Wei transferValue,
+      final Account recipient,
+      final Address to) {
+    final long baseCost =
+        super.callOperationGasCost(
+            frame,
+            stipend,
+            inputDataOffset,
+            inputDataLength,
+            outputDataOffset,
+            outputDataLength,
+            transferValue,
+            recipient,
+            to);
+    final boolean accountIsWarm = frame.warmUpAddress(to) || isPrecompile(to);
+    return clampedAdd(
+        baseCost, accountIsWarm ? getWarmStorageReadCost() : getColdAccountAccessCost());
+  }
+
+  // defined in Frontier, but re-implemented with no base cost.
+  @Override
+  public long extCodeCopyOperationGasCost(
+      final MessageFrame frame, final long offset, final long length) {
+    return copyWordsToMemoryGasCost(frame, 0L, COPY_WORD_GAS_COST, offset, length);
+  }
+
+  // defined in Istanbul, but re-implemented with new constants
+  @Override
+  // As per https://eips.ethereum.org/EIPS/eip-2200
+  public long calculateStorageCost(
+      final UInt256 newValue,
+      final Supplier<UInt256> currentValue,
+      final Supplier<UInt256> originalValue) {
+
+    final UInt256 localCurrentValue = currentValue.get();
+    if (localCurrentValue.equals(newValue)) {
+      return SLOAD_GAS;
+    } else {
+      final UInt256 localOriginalValue = originalValue.get();
+      if (localOriginalValue.equals(localCurrentValue)) {
+        return localOriginalValue.isZero() ? SSTORE_SET_GAS : SSTORE_RESET_GAS;
+      } else {
+        return SLOAD_GAS;
+      }
+    }
+  }
+
+  // defined in Istanbul, but re-implemented with new constants
+  @Override
+  // As per https://eips.ethereum.org/EIPS/eip-2200
+  public long calculateStorageRefundAmount(
+      final UInt256 newValue,
+      final Supplier<UInt256> currentValue,
+      final Supplier<UInt256> originalValue) {
+
+    final UInt256 localCurrentValue = currentValue.get();
+    if (localCurrentValue.equals(newValue)) {
+      return 0L;
+    } else {
+      final UInt256 localOriginalValue = originalValue.get();
+      if (localOriginalValue.equals(localCurrentValue)) {
+        if (localOriginalValue.isZero()) {
+          return 0L;
+        } else if (newValue.isZero()) {
+          return SSTORE_CLEARS_SCHEDULE;
+        } else {
+          return 0L;
+        }
+      } else {
+        long refund = 0L;
+        if (!localOriginalValue.isZero()) {
+          if (localCurrentValue.isZero()) {
+            refund = NEGATIVE_SSTORE_CLEARS_SCHEDULE;
+          } else if (newValue.isZero()) {
+            refund = SSTORE_CLEARS_SCHEDULE;
+          }
+        }
+
+        if (localOriginalValue.equals(newValue)) {
+          refund =
+              refund
+                  + (localOriginalValue.isZero()
+                      ? SSTORE_SET_GAS_LESS_SLOAD_GAS
+                      : SSTORE_RESET_GAS_LESS_SLOAD_GAS);
+        }
+        return refund;
+      }
+    }
+  }
+
+  @Override
+  public long modExpGasCost(final Bytes input) {
+    final long baseLength = BigIntegerModularExponentiationPrecompiledContract.baseLength(input);
+    final long exponentLength =
+        BigIntegerModularExponentiationPrecompiledContract.exponentLength(input);
+    final long modulusLength =
+        BigIntegerModularExponentiationPrecompiledContract.modulusLength(input);
+    final long exponentOffset =
+        clampedAdd(BigIntegerModularExponentiationPrecompiledContract.BASE_OFFSET, baseLength);
+    final long firstExponentBytesCap =
+        Math.min(exponentLength, ByzantiumGasCalculator.MAX_FIRST_EXPONENT_BYTES);
+    final BigInteger firstExpBytes =
+        BigIntegerModularExponentiationPrecompiledContract.extractParameter(
+            input, clampedToInt(exponentOffset), clampedToInt(firstExponentBytesCap));
+    final long adjustedExponentLength = adjustedExponentLength(exponentLength, firstExpBytes);
+    long multiplicationComplexity = (Math.max(modulusLength, baseLength) + 7L) / 8L;
+    multiplicationComplexity =
+        Words.clampedMultiply(multiplicationComplexity, multiplicationComplexity);
+
+    long gasRequirement =
+        clampedMultiply(multiplicationComplexity, Math.max(adjustedExponentLength, 1L));
+    if (gasRequirement != Long.MAX_VALUE) {
+      gasRequirement /= 3;
+    }
+
+    return Math.max(gasRequirement, 200L);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/ByzantiumGasCalculator.java b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/ByzantiumGasCalculator.java
new file mode 100644
index 00000000000..2bc25458e96
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/ByzantiumGasCalculator.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.gascalculator;
+
+import static org.hyperledger.besu.evm.internal.Words.clampedAdd;
+import static org.hyperledger.besu.evm.internal.Words.clampedMultiply;
+import static org.hyperledger.besu.evm.internal.Words.clampedToInt;
+
+import org.hyperledger.besu.evm.precompile.BigIntegerModularExponentiationPrecompiledContract;
+
+import java.math.BigInteger;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Byzantium gas calculator. */
+public class ByzantiumGasCalculator extends SpuriousDragonGasCalculator {
+  private static final int GQUADDIVISOR = 20;
+  private static final int WORD_SIZE = 32;
+  private static final int BITS_IN_BYTE = 8;
+
+  /** The constant MAX_FIRST_EXPONENT_BYTES. */
+  public static final int MAX_FIRST_EXPONENT_BYTES = 32;
+
+  @Override
+  public long modExpGasCost(final Bytes input) {
+    final long baseLength = BigIntegerModularExponentiationPrecompiledContract.baseLength(input);
+    final long exponentLength =
+        BigIntegerModularExponentiationPrecompiledContract.exponentLength(input);
+    final long modulusLength =
+        BigIntegerModularExponentiationPrecompiledContract.modulusLength(input);
+    final long exponentOffset =
+        clampedAdd(BigIntegerModularExponentiationPrecompiledContract.BASE_OFFSET, baseLength);
+    final long firstExponentBytesCap = Math.min(exponentLength, MAX_FIRST_EXPONENT_BYTES);
+    final BigInteger firstExpBytes =
+        BigIntegerModularExponentiationPrecompiledContract.extractParameter(
+            input, clampedToInt(exponentOffset), clampedToInt(firstExponentBytesCap));
+    final long adjustedExponentLength = adjustedExponentLength(exponentLength, firstExpBytes);
+    final long multiplicationComplexity =
+        BigIntegerModularExponentiationPrecompiledContract.multiplicationComplexity(
+            Math.max(baseLength, modulusLength));
+    long numerator = clampedMultiply(multiplicationComplexity, Math.max(adjustedExponentLength, 1));
+    return (numerator == Long.MAX_VALUE) ? Long.MAX_VALUE : numerator / GQUADDIVISOR;
+  }
+
+  /**
+   * Adjusted exponent length.
+   *
+   * @param exponentLength the exponent length
+   * @param firstExpBytes the first exp bytes
+   * @return the long
+   */
+  public static long adjustedExponentLength(
+      final long exponentLength, final BigInteger firstExpBytes) {
+    final int bitLength = bitLength(firstExpBytes);
+    if (exponentLength < WORD_SIZE) {
+      return bitLength;
+    } else {
+      return clampedAdd(clampedMultiply(BITS_IN_BYTE, (exponentLength - WORD_SIZE)), bitLength);
+    }
+  }
+
+  private static int bitLength(final BigInteger n) {
+    return n.compareTo(BigInteger.ZERO) == 0 ? 0 : (n.bitLength() - 1);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/CancunGasCalculator.java b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/CancunGasCalculator.java
new file mode 100644
index 00000000000..b78e765cc8b
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/CancunGasCalculator.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright Hyperledger Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.gascalculator;
+
+/**
+ * Gas Calculator for Cancun
+ *
+ * <UL>
+ *   <LI>Gas costs for TSTORE/TLOAD
+ *   <LI>Data gas for EIP-4844
+ * </UL>
+ */
+public class CancunGasCalculator extends LondonGasCalculator {
+
+  private static final long TLOAD_GAS = WARM_STORAGE_READ_COST;
+  private static final long TSTORE_GAS = WARM_STORAGE_READ_COST;
+
+  private static final long DATA_GAS_PER_BLOB = 1 << 17;
+  private static final long TARGET_DATA_GAS_PER_BLOCK = 1 << 18;
+
+  // EIP-1153
+  @Override
+  public long getTransientLoadOperationGasCost() {
+    return TLOAD_GAS;
+  }
+
+  @Override
+  public long getTransientStoreOperationGasCost() {
+    return TSTORE_GAS;
+  }
+
+  @Override
+  public long dataGasCost(final int blobCount) {
+    return DATA_GAS_PER_BLOB * blobCount;
+  }
+
+  @Override
+  public long computeExcessDataGas(final long parentExcessDataGas, final int newBlobs) {
+    final long consumedDataGas = dataGasCost(newBlobs);
+    final long currentExcessDataGas = parentExcessDataGas + consumedDataGas;
+
+    if (currentExcessDataGas < TARGET_DATA_GAS_PER_BLOCK) {
+      return 0L;
+    }
+    return currentExcessDataGas - TARGET_DATA_GAS_PER_BLOCK;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/ConstantinopleGasCalculator.java b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/ConstantinopleGasCalculator.java
new file mode 100644
index 00000000000..0284269c4db
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/ConstantinopleGasCalculator.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.gascalculator;
+
+import static org.hyperledger.besu.evm.internal.Words.clampedAdd;
+import static org.hyperledger.besu.evm.internal.Words.clampedMultiply;
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
+import org.hyperledger.besu.evm.frame.MessageFrame;
+
+import java.util.function.Supplier;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** The Constantinople gas calculator. */
+public class ConstantinopleGasCalculator extends ByzantiumGasCalculator {
+
+  private static final long SSTORE_NO_OP_COST = 200L;
+  private static final long SSTORE_ADDITIONAL_WRITE_COST = 200L;
+  private static final long SSTORE_FIRST_DIRTY_NEW_STORAGE_COST = 20_000L;
+  private static final long SSTORE_FIRST_DIRTY_EXISTING_STORAGE_COST = 5_000L;
+  private static final long STORAGE_RESET_REFUND_AMOUNT = 15_000L;
+  private static final long NEGATIVE_STORAGE_RESET_REFUND_AMOUNT = -STORAGE_RESET_REFUND_AMOUNT;
+  private static final long SSTORE_DIRTY_RETURN_TO_UNUSED_REFUND_AMOUNT = 19800L;
+  private static final long SSTORE_DIRTY_RETURN_TO_ORIGINAL_VALUE_REFUND_AMOUNT = 4800L;
+
+  private static final long EXTCODE_HASH_COST = 400L;
+
+  @Override
+  public long create2OperationGasCost(final MessageFrame frame) {
+    final long initCodeLength = clampedToLong(frame.getStackItem(2));
+    final long numWords = clampedAdd(initCodeLength, 31) / Bytes32.SIZE;
+    final long initCodeHashCost = clampedMultiply(KECCAK256_OPERATION_WORD_GAS_COST, numWords);
+    return clampedAdd(createOperationGasCost(frame), initCodeHashCost);
+  }
+
+  @Override
+  // As per https://eips.ethereum.org/EIPS/eip-1283
+  public long calculateStorageCost(
+      final UInt256 newValue,
+      final Supplier<UInt256> currentValue,
+      final Supplier<UInt256> originalValue) {
+
+    final UInt256 localCurrentValue = currentValue.get();
+    if (localCurrentValue.equals(newValue)) {
+      return SSTORE_NO_OP_COST;
+    } else {
+      final UInt256 localOriginalValue = originalValue.get();
+      if (localOriginalValue.equals(localCurrentValue)) {
+        return localOriginalValue.isZero()
+            ? SSTORE_FIRST_DIRTY_NEW_STORAGE_COST
+            : SSTORE_FIRST_DIRTY_EXISTING_STORAGE_COST;
+      } else {
+        return SSTORE_ADDITIONAL_WRITE_COST;
+      }
+    }
+  }
+
+  @Override
+  // As per https://eips.ethereum.org/EIPS/eip-1283
+  public long calculateStorageRefundAmount(
+      final UInt256 newValue,
+      final Supplier<UInt256> currentValue,
+      final Supplier<UInt256> originalValue) {
+
+    UInt256 localCurrentValue = currentValue.get();
+    if (localCurrentValue.equals(newValue)) {
+      return 0L;
+    } else {
+      UInt256 localOriginalValue = originalValue.get();
+      if (localOriginalValue.equals(localCurrentValue)) {
+        if (localOriginalValue.isZero()) {
+          return 0L;
+        } else if (newValue.isZero()) {
+          return STORAGE_RESET_REFUND_AMOUNT;
+        } else {
+          return 0L;
+        }
+      } else {
+        long refund = 0L;
+        if (!localOriginalValue.isZero()) {
+          if (localCurrentValue.isZero()) {
+            refund = NEGATIVE_STORAGE_RESET_REFUND_AMOUNT;
+          } else if (newValue.isZero()) {
+            refund = STORAGE_RESET_REFUND_AMOUNT;
+          }
+        }
+
+        if (localOriginalValue.equals(newValue)) {
+          refund =
+              refund
+                  + (localOriginalValue.isZero()
+                      ? SSTORE_DIRTY_RETURN_TO_UNUSED_REFUND_AMOUNT
+                      : SSTORE_DIRTY_RETURN_TO_ORIGINAL_VALUE_REFUND_AMOUNT);
+        }
+        return refund;
+      }
+    }
+  }
+
+  @Override
+  public long extCodeHashOperationGasCost() {
+    return EXTCODE_HASH_COST;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/DieHardGasCalculator.java b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/DieHardGasCalculator.java
similarity index 78%
rename from ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/DieHardGasCalculator.java
rename to evm/src/main/java/org/hyperledger/besu/evm/gascalculator/DieHardGasCalculator.java
index 76e5a977d5f..4dfc52a7982 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/DieHardGasCalculator.java
+++ b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/DieHardGasCalculator.java
@@ -12,15 +12,14 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import org.hyperledger.besu.ethereum.core.Gas;
+package org.hyperledger.besu.evm.gascalculator;
 
+/** The Die hard gas calculator. */
 public class DieHardGasCalculator extends TangerineWhistleGasCalculator {
-  private static final Gas EXP_OPERATION_BYTE_GAS_COST = Gas.of(50L);
+  private static final long EXP_OPERATION_BYTE_GAS_COST = 50L;
 
   @Override
-  protected Gas expOperationByteGasCost() {
+  protected long expOperationByteGasCost() {
     return EXP_OPERATION_BYTE_GAS_COST;
   }
 }
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/FrontierGasCalculator.java b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/FrontierGasCalculator.java
new file mode 100644
index 00000000000..ed0c3c90d93
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/FrontierGasCalculator.java
@@ -0,0 +1,497 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.gascalculator;
+
+import static org.hyperledger.besu.evm.internal.Words.clampedAdd;
+import static org.hyperledger.besu.evm.internal.Words.clampedMultiply;
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.internal.Words;
+import org.hyperledger.besu.evm.operation.ExpOperation;
+
+import java.util.function.Supplier;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** The Frontier gas calculator. */
+public class FrontierGasCalculator implements GasCalculator {
+
+  private static final long TX_DATA_ZERO_COST = 4L;
+
+  private static final long TX_DATA_NON_ZERO_COST = 68L;
+
+  private static final long TX_BASE_COST = 21_000L;
+
+  private static final long TX_CREATE_EXTRA_COST = 0L;
+
+  private static final long CODE_DEPOSIT_BYTE_COST = 200L;
+
+  private static final long ID_PRECOMPILED_BASE_GAS_COST = 15L;
+
+  private static final long ID_PRECOMPILED_WORD_GAS_COST = 3L;
+
+  private static final long ECREC_PRECOMPILED_GAS_COST = 3_000L;
+
+  private static final long SHA256_PRECOMPILED_BASE_GAS_COST = 60L;
+
+  private static final long SHA256_PRECOMPILED_WORD_GAS_COST = 12L;
+
+  private static final long RIPEMD160_PRECOMPILED_WORD_GAS_COST = 120L;
+
+  private static final long RIPEMD160_PRECOMPILED_BASE_GAS_COST = 600L;
+
+  private static final long VERY_LOW_TIER_GAS_COST = 3L;
+
+  private static final long LOW_TIER_GAS_COST = 5L;
+
+  private static final long BASE_TIER_GAS_COST = 2L;
+
+  private static final long MID_TIER_GAS_COST = 8L;
+
+  private static final long HIGH_TIER_GAS_COST = 10L;
+
+  private static final long CALL_OPERATION_BASE_GAS_COST = 40L;
+
+  private static final long CALL_VALUE_TRANSFER_GAS_COST = 9_000L;
+
+  private static final long ADDITIONAL_CALL_STIPEND = 2_300L;
+
+  private static final long NEW_ACCOUNT_GAS_COST = 25_000L;
+
+  private static final long CREATE_OPERATION_GAS_COST = 32_000L;
+
+  private static final long COPY_WORD_GAS_COST = 3L;
+
+  private static final long MEMORY_WORD_GAS_COST = 3L;
+
+  private static final long BALANCE_OPERATION_GAS_COST = 20L;
+
+  private static final long BLOCKHASH_OPERATION_GAS_COST = 20L;
+
+  private static final long EXP_OPERATION_BASE_GAS_COST = 10L;
+
+  private static final long EXP_OPERATION_BYTE_GAS_COST = 10L;
+
+  private static final long EXT_CODE_BASE_GAS_COST = 20L;
+
+  private static final long JUMPDEST_OPERATION_GAS_COST = 1L;
+
+  private static final long LOG_OPERATION_BASE_GAS_COST = 375L;
+
+  private static final long LOG_OPERATION_DATA_BYTE_GAS_COST = 8L;
+
+  private static final long LOG_OPERATION_TOPIC_GAS_COST = 375L;
+
+  private static final long SELFDESTRUCT_OPERATION_GAS_COST = 0L;
+
+  private static final long KECCAK256_OPERATION_BASE_GAS_COST = 30L;
+
+  /** The constant KECCAK256_OPERATION_WORD_GAS_COST. */
+  static final long KECCAK256_OPERATION_WORD_GAS_COST = 6L;
+
+  private static final long SLOAD_OPERATION_GAS_COST = 50L;
+
+  /** The constant STORAGE_SET_GAS_COST. */
+  public static final long STORAGE_SET_GAS_COST = 20_000L;
+
+  /** The constant STORAGE_RESET_GAS_COST. */
+  public static final long STORAGE_RESET_GAS_COST = 5_000L;
+
+  /** The constant STORAGE_RESET_REFUND_AMOUNT. */
+  public static final long STORAGE_RESET_REFUND_AMOUNT = 15_000L;
+
+  private static final long SELF_DESTRUCT_REFUND_AMOUNT = 24_000L;
+
+  @Override
+  public long transactionIntrinsicGasCost(final Bytes payload, final boolean isContractCreate) {
+    int zeros = 0;
+    for (int i = 0; i < payload.size(); i++) {
+      if (payload.get(i) == 0) {
+        ++zeros;
+      }
+    }
+    final int nonZeros = payload.size() - zeros;
+
+    final long cost = TX_BASE_COST + TX_DATA_ZERO_COST * zeros + TX_DATA_NON_ZERO_COST * nonZeros;
+
+    return isContractCreate ? (cost + txCreateExtraGasCost()) : cost;
+  }
+
+  /**
+   * Returns the additional gas cost for contract creation transactions
+   *
+   * @return the additional gas cost for contract creation transactions
+   */
+  protected long txCreateExtraGasCost() {
+    return TX_CREATE_EXTRA_COST;
+  }
+
+  @Override
+  public long codeDepositGasCost(final int codeSize) {
+    return CODE_DEPOSIT_BYTE_COST * codeSize;
+  }
+
+  @Override
+  public long idPrecompiledContractGasCost(final Bytes input) {
+    return ID_PRECOMPILED_WORD_GAS_COST * Words.numWords(input) + ID_PRECOMPILED_BASE_GAS_COST;
+  }
+
+  @Override
+  public long getEcrecPrecompiledContractGasCost() {
+    return ECREC_PRECOMPILED_GAS_COST;
+  }
+
+  @Override
+  public long sha256PrecompiledContractGasCost(final Bytes input) {
+    return SHA256_PRECOMPILED_WORD_GAS_COST * Words.numWords(input)
+        + SHA256_PRECOMPILED_BASE_GAS_COST;
+  }
+
+  @Override
+  public long ripemd160PrecompiledContractGasCost(final Bytes input) {
+    return RIPEMD160_PRECOMPILED_WORD_GAS_COST * Words.numWords(input)
+        + RIPEMD160_PRECOMPILED_BASE_GAS_COST;
+  }
+
+  @Override
+  public long getZeroTierGasCost() {
+    return 0L;
+  }
+
+  @Override
+  public long getVeryLowTierGasCost() {
+    return VERY_LOW_TIER_GAS_COST;
+  }
+
+  @Override
+  public long getLowTierGasCost() {
+    return LOW_TIER_GAS_COST;
+  }
+
+  @Override
+  public long getBaseTierGasCost() {
+    return BASE_TIER_GAS_COST;
+  }
+
+  @Override
+  public long getMidTierGasCost() {
+    return MID_TIER_GAS_COST;
+  }
+
+  @Override
+  public long getHighTierGasCost() {
+    return HIGH_TIER_GAS_COST;
+  }
+
+  /**
+   * Returns the base gas cost to execute a call operation.
+   *
+   * @return the base gas cost to execute a call operation
+   */
+  @Override
+  public long callOperationBaseGasCost() {
+    return CALL_OPERATION_BASE_GAS_COST;
+  }
+
+  /**
+   * Returns the gas cost to transfer funds in a call operation.
+   *
+   * @return the gas cost to transfer funds in a call operation
+   */
+  long callValueTransferGasCost() {
+    return CALL_VALUE_TRANSFER_GAS_COST;
+  }
+
+  /**
+   * Returns the gas cost to create a new account.
+   *
+   * @return the gas cost to create a new account
+   */
+  long newAccountGasCost() {
+    return NEW_ACCOUNT_GAS_COST;
+  }
+
+  @Override
+  public long callOperationGasCost(
+      final MessageFrame frame,
+      final long stipend,
+      final long inputDataOffset,
+      final long inputDataLength,
+      final long outputDataOffset,
+      final long outputDataLength,
+      final Wei transferValue,
+      final Account recipient,
+      final Address to) {
+    final long inputDataMemoryExpansionCost =
+        memoryExpansionGasCost(frame, inputDataOffset, inputDataLength);
+    final long outputDataMemoryExpansionCost =
+        memoryExpansionGasCost(frame, outputDataOffset, outputDataLength);
+    final long memoryExpansionCost =
+        Math.max(inputDataMemoryExpansionCost, outputDataMemoryExpansionCost);
+
+    long cost = clampedAdd(clampedAdd(callOperationBaseGasCost(), stipend), memoryExpansionCost);
+
+    if (!transferValue.isZero()) {
+      cost = clampedAdd(cost, callValueTransferGasCost());
+    }
+
+    if (recipient == null) {
+      cost = clampedAdd(cost, newAccountGasCost());
+    }
+
+    return cost;
+  }
+
+  /**
+   * Returns the additional call stipend for calls with value transfers.
+   *
+   * @return the additional call stipend for calls with value transfers
+   */
+  @Override
+  public long getAdditionalCallStipend() {
+    return ADDITIONAL_CALL_STIPEND;
+  }
+
+  @Override
+  public long gasAvailableForChildCall(
+      final MessageFrame frame, final long stipend, final boolean transfersValue) {
+    if (transfersValue) {
+      return stipend + getAdditionalCallStipend();
+    } else {
+      return stipend;
+    }
+  }
+
+  @Override
+  public long createOperationGasCost(final MessageFrame frame) {
+    final long initCodeOffset = clampedToLong(frame.getStackItem(1));
+    final long initCodeLength = clampedToLong(frame.getStackItem(2));
+
+    final long memoryGasCost = memoryExpansionGasCost(frame, initCodeOffset, initCodeLength);
+    return clampedAdd(CREATE_OPERATION_GAS_COST, memoryGasCost);
+  }
+
+  @Override
+  public long gasAvailableForChildCreate(final long stipend) {
+    return stipend;
+  }
+
+  @Override
+  public long dataCopyOperationGasCost(
+      final MessageFrame frame, final long offset, final long length) {
+    return copyWordsToMemoryGasCost(
+        frame, VERY_LOW_TIER_GAS_COST, COPY_WORD_GAS_COST, offset, length);
+  }
+
+  @Override
+  public long memoryExpansionGasCost(
+      final MessageFrame frame, final long offset, final long length) {
+
+    final long pre = memoryCost(frame.memoryWordSize());
+    final long post = memoryCost(frame.calculateMemoryExpansion(offset, length));
+    if (post == Long.MAX_VALUE) {
+      return Long.MAX_VALUE;
+    }
+    return post - pre;
+  }
+
+  @Override
+  public long getBalanceOperationGasCost() {
+    return BALANCE_OPERATION_GAS_COST;
+  }
+
+  @Override
+  public long getBlockHashOperationGasCost() {
+    return BLOCKHASH_OPERATION_GAS_COST;
+  }
+
+  /**
+   * Returns the gas cost for a byte in the {@link ExpOperation}.
+   *
+   * @return the gas cost for a byte in the exponent operation
+   */
+  protected long expOperationByteGasCost() {
+    return EXP_OPERATION_BYTE_GAS_COST;
+  }
+
+  @Override
+  public long expOperationGasCost(final int numBytes) {
+    return expOperationByteGasCost() * numBytes + EXP_OPERATION_BASE_GAS_COST;
+  }
+
+  /**
+   * Returns the base gas cost for external code accesses.
+   *
+   * @return the base gas cost for external code accesses
+   */
+  protected long extCodeBaseGasCost() {
+    return EXT_CODE_BASE_GAS_COST;
+  }
+
+  @Override
+  public long extCodeCopyOperationGasCost(
+      final MessageFrame frame, final long offset, final long length) {
+    return copyWordsToMemoryGasCost(
+        frame, extCodeBaseGasCost(), COPY_WORD_GAS_COST, offset, length);
+  }
+
+  @Override
+  public long extCodeHashOperationGasCost() {
+    throw new UnsupportedOperationException(
+        "EXTCODEHASH not supported by " + getClass().getSimpleName());
+  }
+
+  @Override
+  public long getExtCodeSizeOperationGasCost() {
+    return extCodeBaseGasCost();
+  }
+
+  @Override
+  public long getJumpDestOperationGasCost() {
+    return JUMPDEST_OPERATION_GAS_COST;
+  }
+
+  @Override
+  public long logOperationGasCost(
+      final MessageFrame frame, final long dataOffset, final long dataLength, final int numTopics) {
+    return clampedAdd(
+        LOG_OPERATION_BASE_GAS_COST,
+        clampedAdd(
+            clampedMultiply(LOG_OPERATION_DATA_BYTE_GAS_COST, dataLength),
+            clampedAdd(
+                clampedMultiply(LOG_OPERATION_TOPIC_GAS_COST, numTopics),
+                memoryExpansionGasCost(frame, dataOffset, dataLength))));
+  }
+
+  @Override
+  public long mLoadOperationGasCost(final MessageFrame frame, final long offset) {
+    return clampedAdd(VERY_LOW_TIER_GAS_COST, memoryExpansionGasCost(frame, offset, 32));
+  }
+
+  @Override
+  public long mStoreOperationGasCost(final MessageFrame frame, final long offset) {
+    return clampedAdd(VERY_LOW_TIER_GAS_COST, memoryExpansionGasCost(frame, offset, 32));
+  }
+
+  @Override
+  public long mStore8OperationGasCost(final MessageFrame frame, final long offset) {
+    return clampedAdd(VERY_LOW_TIER_GAS_COST, memoryExpansionGasCost(frame, offset, 1));
+  }
+
+  @Override
+  public long selfDestructOperationGasCost(final Account recipient, final Wei inheritance) {
+    return SELFDESTRUCT_OPERATION_GAS_COST;
+  }
+
+  @Override
+  public long keccak256OperationGasCost(
+      final MessageFrame frame, final long offset, final long length) {
+    return copyWordsToMemoryGasCost(
+        frame,
+        KECCAK256_OPERATION_BASE_GAS_COST,
+        KECCAK256_OPERATION_WORD_GAS_COST,
+        offset,
+        length);
+  }
+
+  @Override
+  public long create2OperationGasCost(final MessageFrame frame) {
+    throw new UnsupportedOperationException(
+        "CREATE2 operation not supported by " + getClass().getSimpleName());
+  }
+
+  @Override
+  public long getSloadOperationGasCost() {
+    return SLOAD_OPERATION_GAS_COST;
+  }
+
+  @Override
+  public long calculateStorageCost(
+      final UInt256 newValue,
+      final Supplier<UInt256> currentValue,
+      final Supplier<UInt256> originalValue) {
+    return !newValue.isZero() && currentValue.get().isZero()
+        ? STORAGE_SET_GAS_COST
+        : STORAGE_RESET_GAS_COST;
+  }
+
+  @Override
+  public long calculateStorageRefundAmount(
+      final UInt256 newValue,
+      final Supplier<UInt256> currentValue,
+      final Supplier<UInt256> originalValue) {
+    return newValue.isZero() && !currentValue.get().isZero() ? STORAGE_RESET_REFUND_AMOUNT : 0L;
+  }
+
+  @Override
+  public long getSelfDestructRefundAmount() {
+    return SELF_DESTRUCT_REFUND_AMOUNT;
+  }
+
+  /**
+   * Copy words to memory gas cost.
+   *
+   * @param frame the frame
+   * @param baseGasCost the base gas cost
+   * @param wordGasCost the word gas cost
+   * @param offset the offset
+   * @param length the length
+   * @return the cost
+   */
+  protected long copyWordsToMemoryGasCost(
+      final MessageFrame frame,
+      final long baseGasCost,
+      final long wordGasCost,
+      final long offset,
+      final long length) {
+    final long numWords = length / 32 + (length % 32 == 0 ? 0 : 1);
+
+    final long copyCost = clampedAdd(clampedMultiply(wordGasCost, numWords), baseGasCost);
+    final long memoryCost = memoryExpansionGasCost(frame, offset, length);
+
+    return clampedAdd(copyCost, memoryCost);
+  }
+
+  /**
+   * Memory cost.
+   *
+   * @param length the length
+   * @return the cost
+   */
+  static long memoryCost(final long length) {
+    final long lengthSquare = clampedMultiply(length, length);
+    final long base =
+        (lengthSquare == Long.MAX_VALUE)
+            ? clampedMultiply(length / 512, length)
+            : lengthSquare / 512;
+
+    return clampedAdd(clampedMultiply(MEMORY_WORD_GAS_COST, length), base);
+  }
+
+  @Override
+  public long getMaximumTransactionCost(final int size) {
+    return TX_BASE_COST + TX_DATA_NON_ZERO_COST * size;
+  }
+
+  @Override
+  public long getMinimumTransactionCost() {
+    return TX_BASE_COST;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/GasCalculator.java b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/GasCalculator.java
new file mode 100644
index 00000000000..cd8b659051d
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/GasCalculator.java
@@ -0,0 +1,537 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.gascalculator;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.AccessListEntry;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.operation.BalanceOperation;
+import org.hyperledger.besu.evm.operation.BlockHashOperation;
+import org.hyperledger.besu.evm.operation.ExpOperation;
+import org.hyperledger.besu.evm.operation.ExtCodeCopyOperation;
+import org.hyperledger.besu.evm.operation.ExtCodeHashOperation;
+import org.hyperledger.besu.evm.operation.ExtCodeSizeOperation;
+import org.hyperledger.besu.evm.operation.JumpDestOperation;
+import org.hyperledger.besu.evm.operation.Keccak256Operation;
+import org.hyperledger.besu.evm.operation.LogOperation;
+import org.hyperledger.besu.evm.operation.MLoadOperation;
+import org.hyperledger.besu.evm.operation.MStore8Operation;
+import org.hyperledger.besu.evm.operation.MStoreOperation;
+import org.hyperledger.besu.evm.operation.SLoadOperation;
+import org.hyperledger.besu.evm.operation.SelfDestructOperation;
+import org.hyperledger.besu.evm.precompile.ECRECPrecompiledContract;
+import org.hyperledger.besu.evm.precompile.IDPrecompiledContract;
+import org.hyperledger.besu.evm.precompile.RIPEMD160PrecompiledContract;
+import org.hyperledger.besu.evm.precompile.SHA256PrecompiledContract;
+import org.hyperledger.besu.evm.processor.AbstractMessageProcessor;
+
+import java.util.List;
+import java.util.function.Supplier;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/**
+ * Provides various gas cost lookups and calculations used during block processing.
+ *
+ * <p>The {@code GasCalculator} is meant to encapsulate all Gas-related calculations except for the
+ * following "safe" operations:
+ *
+ * <ul>
+ *   <li><b>Operation Gas Deductions:</b> Deducting the operation's gas cost from the VM's current
+ *       message frame because the
+ * </ul>
+ */
+public interface GasCalculator {
+
+  // Precompiled Contract Gas Calculations
+
+  /**
+   * Returns the gas cost to execute the {@link IDPrecompiledContract}.
+   *
+   * @param input The input to the ID precompiled contract
+   * @return the gas cost to execute the ID precompiled contract
+   */
+  long idPrecompiledContractGasCost(Bytes input);
+
+  /**
+   * Returns the gas cost to execute the {@link ECRECPrecompiledContract}.
+   *
+   * @return the gas cost to execute the ECREC precompiled contract
+   */
+  long getEcrecPrecompiledContractGasCost();
+
+  /**
+   * Returns the gas cost to execute the {@link SHA256PrecompiledContract}.
+   *
+   * @param input The input to the SHA256 precompiled contract
+   * @return the gas cost to execute the SHA256 precompiled contract
+   */
+  long sha256PrecompiledContractGasCost(Bytes input);
+
+  /**
+   * Returns the gas cost to execute the {@link RIPEMD160PrecompiledContract}.
+   *
+   * @param input The input to the RIPEMD160 precompiled contract
+   * @return the gas cost to execute the RIPEMD160 precompiled contract
+   */
+  long ripemd160PrecompiledContractGasCost(Bytes input);
+
+  // Gas Tier Lookups
+
+  /**
+   * Returns the gas cost for the zero gas tier.
+   *
+   * @return the gas cost for the zero gas tier
+   */
+  long getZeroTierGasCost();
+
+  /**
+   * Returns the gas cost for the very low gas tier.
+   *
+   * @return the gas cost for the very low gas tier
+   */
+  long getVeryLowTierGasCost();
+
+  /**
+   * Returns the gas cost for the low gas tier.
+   *
+   * @return the gas cost for the low gas tier
+   */
+  long getLowTierGasCost();
+
+  /**
+   * Returns the gas cost for the base gas tier.
+   *
+   * @return the gas cost for the base gas tier
+   */
+  long getBaseTierGasCost();
+
+  /**
+   * Returns the gas cost for the mid gas tier.
+   *
+   * @return the gas cost for the mid gas tier
+   */
+  long getMidTierGasCost();
+
+  /**
+   * Returns the gas cost for the high gas tier.
+   *
+   * @return the gas cost for the high gas tier
+   */
+  long getHighTierGasCost();
+
+  // Call/Create Operation Calculations
+
+  /**
+   * Returns the base gas cost to execute a call operation.
+   *
+   * @return the base gas cost to execute a call operation
+   */
+  long callOperationBaseGasCost();
+
+  /**
+   * Returns the gas cost for one of the various CALL operations.
+   *
+   * @param frame The current frame
+   * @param stipend The gas stipend being provided by the CALL caller
+   * @param inputDataOffset The offset in memory to retrieve the CALL input data
+   * @param inputDataLength The CALL input data length
+   * @param outputDataOffset The offset in memory to place the CALL output data
+   * @param outputDataLength The CALL output data length
+   * @param transferValue The wei being transferred
+   * @param recipient The CALL recipient (may be null if self destructed or new)
+   * @param contract The address of the recipient (never null)
+   * @return The gas cost for the CALL operation
+   */
+  long callOperationGasCost(
+      MessageFrame frame,
+      long stipend,
+      long inputDataOffset,
+      long inputDataLength,
+      long outputDataOffset,
+      long outputDataLength,
+      Wei transferValue,
+      Account recipient,
+      Address contract);
+
+  /**
+   * Gets additional call stipend.
+   *
+   * @return the additional call stipend
+   */
+  long getAdditionalCallStipend();
+
+  /**
+   * Returns the amount of gas parent will provide its child CALL.
+   *
+   * @param frame The current frame
+   * @param stipend The gas stipend being provided by the CALL caller
+   * @param transfersValue Whether call transfers any wei
+   * @return the amount of gas parent will provide its child CALL
+   */
+  long gasAvailableForChildCall(MessageFrame frame, long stipend, boolean transfersValue);
+
+  /**
+   * Returns the amount of gas the CREATE operation will consume.
+   *
+   * @param frame The current frame
+   * @return the amount of gas the CREATE operation will consume
+   */
+  long createOperationGasCost(MessageFrame frame);
+
+  /**
+   * Returns the amount of gas the CREATE2 operation will consume.
+   *
+   * @param frame The current frame
+   * @return the amount of gas the CREATE2 operation will consume
+   */
+  long create2OperationGasCost(MessageFrame frame);
+
+  /**
+   * Returns the amount of gas parent will provide its child CREATE.
+   *
+   * @param stipend The gas stipend being provided by the CREATE caller
+   * @return the amount of gas parent will provide its child CREATE
+   */
+  long gasAvailableForChildCreate(long stipend);
+
+  // Re-used Operation Calculations
+
+  /**
+   * Returns the amount of gas consumed by the data copy operation.
+   *
+   * @param frame The current frame
+   * @param offset The offset in memory to copy the data to
+   * @param length The length of the data being copied into memory
+   * @return the amount of gas consumed by the data copy operation
+   */
+  long dataCopyOperationGasCost(MessageFrame frame, long offset, long length);
+
+  /**
+   * Returns the cost of expanding memory for the specified access.
+   *
+   * @param frame The current frame
+   * @param offset The offset in memory where the access occurs
+   * @param length the length of the memory access
+   * @return The gas required to expand memory for the specified access
+   */
+  long memoryExpansionGasCost(MessageFrame frame, long offset, long length);
+
+  // Specific Non-call Operation Calculations
+
+  /**
+   * Returns the cost for executing a {@link BalanceOperation}.
+   *
+   * @return the cost for executing the balance operation
+   */
+  long getBalanceOperationGasCost();
+
+  /**
+   * Returns the cost for executing a {@link BlockHashOperation}.
+   *
+   * @return the cost for executing the block hash operation
+   */
+  long getBlockHashOperationGasCost();
+
+  /**
+   * Returns the cost for executing a {@link ExpOperation}.
+   *
+   * @param numBytes The number of bytes for the exponent parameter
+   * @return the cost for executing the exp operation
+   */
+  long expOperationGasCost(int numBytes);
+
+  /**
+   * Returns the cost for executing a {@link ExtCodeCopyOperation}.
+   *
+   * @param frame The current frame
+   * @param offset The offset in memory to external code copy the data to
+   * @param length The length of the code being copied into memory
+   * @return the cost for executing the external code size operation
+   */
+  long extCodeCopyOperationGasCost(MessageFrame frame, long offset, long length);
+
+  /**
+   * Returns the cost for executing a {@link ExtCodeHashOperation}.
+   *
+   * @return the cost for executing the external code hash operation
+   */
+  long extCodeHashOperationGasCost();
+
+  /**
+   * Returns the cost for executing a {@link ExtCodeSizeOperation}.
+   *
+   * @return the cost for executing the external code size operation
+   */
+  long getExtCodeSizeOperationGasCost();
+
+  /**
+   * Returns the cost for executing a {@link JumpDestOperation}.
+   *
+   * @return the cost for executing the jump destination operation
+   */
+  long getJumpDestOperationGasCost();
+
+  /**
+   * Returns the cost for executing a {@link LogOperation}.
+   *
+   * @param frame The current frame
+   * @param dataOffset The offset in memory where the log data exists
+   * @param dataLength The length of the log data to read from memory
+   * @param numTopics The number of topics in the log
+   * @return the cost for executing the external code size operation
+   */
+  long logOperationGasCost(MessageFrame frame, long dataOffset, long dataLength, int numTopics);
+
+  /**
+   * Returns the cost for executing a {@link MLoadOperation}.
+   *
+   * @param frame The current frame
+   * @param offset The offset in memory where the access takes place
+   * @return the cost for executing the memory load operation
+   */
+  long mLoadOperationGasCost(MessageFrame frame, long offset);
+
+  /**
+   * Returns the cost for executing a {@link MStoreOperation}.
+   *
+   * @param frame The current frame
+   * @param offset The offset in memory where the access takes place
+   * @return the cost for executing the memory store operation
+   */
+  long mStoreOperationGasCost(MessageFrame frame, long offset);
+
+  /**
+   * Returns the cost for executing a {@link MStore8Operation}.
+   *
+   * @param frame The current frame
+   * @param offset The offset in memory where the access takes place
+   * @return the cost for executing the memory byte store operation
+   */
+  long mStore8OperationGasCost(MessageFrame frame, long offset);
+
+  /**
+   * Returns the cost for executing a {@link SelfDestructOperation}.
+   *
+   * @param recipient The recipient of the self destructed inheritance (may be null)
+   * @param inheritance The amount the recipient will receive
+   * @return the cost for executing the self destruct operation
+   */
+  long selfDestructOperationGasCost(Account recipient, Wei inheritance);
+
+  /**
+   * Returns the cost for executing a {@link Keccak256Operation}.
+   *
+   * @param frame The current frame
+   * @param offset The offset in memory where the data to be hashed exists
+   * @param length The hashed data length
+   * @return the cost for executing the memory byte store operation
+   */
+  long keccak256OperationGasCost(MessageFrame frame, long offset, long length);
+
+  /**
+   * Returns the cost for executing a {@link SLoadOperation}.
+   *
+   * @return the cost for executing the storage load operation
+   */
+  long getSloadOperationGasCost();
+
+  /**
+   * Returns the cost for an SSTORE operation.
+   *
+   * @param newValue the new value to be stored
+   * @param currentValue the supplier of the current value
+   * @param originalValue the supplier of the original value
+   * @return the gas cost for the SSTORE operation
+   */
+  long calculateStorageCost(
+      UInt256 newValue, Supplier<UInt256> currentValue, Supplier<UInt256> originalValue);
+
+  /**
+   * Returns the refund amount for an SSTORE operation.
+   *
+   * @param newValue the new value to be stored
+   * @param currentValue the supplier of the current value
+   * @param originalValue the supplier of the original value
+   * @return the gas refund for the SSTORE operation
+   */
+  long calculateStorageRefundAmount(
+      UInt256 newValue, Supplier<UInt256> currentValue, Supplier<UInt256> originalValue);
+
+  /**
+   * Returns the refund amount for deleting an account in a {@link SelfDestructOperation}.
+   *
+   * @return the refund amount for deleting an account in a self destruct operation
+   */
+  long getSelfDestructRefundAmount();
+
+  /**
+   * Returns the cost of a SLOAD to a storage slot not previously loaded in the TX context.
+   *
+   * @return the cost of a SLOAD to a storage slot not previously loaded in the TX context.
+   */
+  default long getColdSloadCost() {
+    return 0L;
+  }
+
+  /**
+   * Returns the cost to access an account not previously accessed in the TX context.
+   *
+   * @return the cost to access an account not previously accessed in the TX context.
+   */
+  default long getColdAccountAccessCost() {
+    return 0L;
+  }
+
+  /**
+   * Returns the cost of a SLOAD to a storage slot that has previously been loaded in the TX
+   * context.
+   *
+   * @return the cost of a SLOAD to a storage slot that has previously been loaded in the TX
+   *     context.
+   */
+  default long getWarmStorageReadCost() {
+    return 0L;
+  }
+
+  /**
+   * For the purposes of this gas calculator, is this address a precompile?
+   *
+   * @param address the address to test for being a precompile
+   * @return true if it is a precompile.
+   */
+  default boolean isPrecompile(final Address address) {
+    return false;
+  }
+
+  /**
+   * Mod exp gas cost.
+   *
+   * @param input the input
+   * @return the long
+   */
+  default long modExpGasCost(final Bytes input) {
+    return 0L;
+  }
+
+  /**
+   * Returns the cost for a {@link AbstractMessageProcessor} to deposit the code in storage
+   *
+   * @param codeSize The size of the code in bytes
+   * @return the code deposit cost
+   */
+  long codeDepositGasCost(int codeSize);
+
+  /**
+   * Returns the intrinsic gas cost of a transaction payload, i.e. the cost deriving from its
+   * encoded binary representation when stored on-chain.
+   *
+   * @param transactionPayload The encoded transaction, as bytes
+   * @param isContractCreate Is this transaction a contract creation transaction?
+   * @return the transaction's intrinsic gas cost
+   */
+  long transactionIntrinsicGasCost(Bytes transactionPayload, boolean isContractCreate);
+
+  /**
+   * Returns the gas cost of the explicitly declared access list.
+   *
+   * @param accessListEntries The access list entries
+   * @return the access list's gas cost
+   */
+  default long accessListGasCost(final List<AccessListEntry> accessListEntries) {
+    return accessListGasCost(
+        accessListEntries.size(),
+        accessListEntries.stream().mapToInt(e -> e.getStorageKeys().size()).sum());
+  }
+
+  /**
+   * Returns the gas cost of the explicitly declared access list.
+   *
+   * @param addresses The count of addresses accessed
+   * @param storageSlots The count of storage slots accessed
+   * @return the access list's gas cost
+   */
+  default long accessListGasCost(final int addresses, final int storageSlots) {
+    return 0L;
+  }
+
+  /**
+   * A measure of the maximum amount of refunded gas a transaction will be credited with.
+   *
+   * @return the quotient of the equation `txGasCost / refundQuotient`.
+   */
+  default long getMaxRefundQuotient() {
+    return 2;
+  }
+
+  /**
+   * Maximum Cost of a Transaction of a certain length.
+   *
+   * @param size the length of the transaction, in bytes
+   * @return the maximum gas cost
+   */
+  // what would be the gas for a PMT with hash of all non-zeros
+  long getMaximumTransactionCost(int size);
+
+  /**
+   * Minimum gas cost of a transaction.
+   *
+   * @return the minimum gas cost
+   */
+  long getMinimumTransactionCost();
+
+  /**
+   * Returns the cost of a loading from Transient Storage
+   *
+   * @return the cost of a TLOAD from a storage slot
+   */
+  default long getTransientLoadOperationGasCost() {
+    return 0L;
+  }
+
+  /**
+   * Returns the cost of a storing to Transient Storage
+   *
+   * @return the cost of a TSTORE to a storage slot
+   */
+  default long getTransientStoreOperationGasCost() {
+    return 0L;
+  }
+
+  /**
+   * Return the gas cost given the number of blobs
+   *
+   * @param blobCount the number of blobs
+   * @return the total gas cost
+   */
+  default long dataGasCost(final int blobCount) {
+    return 0L;
+  }
+
+  /**
+   * Compute the new value for the excess data gas, given the parent value and the count of new
+   * blobs
+   *
+   * @param parentExcessDataGas excess data gas from the parent
+   * @param newBlobs count of new blobs
+   * @return the new excess data gas value
+   */
+  default long computeExcessDataGas(final long parentExcessDataGas, final int newBlobs) {
+    return 0L;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/HomesteadGasCalculator.java b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/HomesteadGasCalculator.java
similarity index 75%
rename from ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/HomesteadGasCalculator.java
rename to evm/src/main/java/org/hyperledger/besu/evm/gascalculator/HomesteadGasCalculator.java
index 50d9b30098a..092dce26b0b 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/HomesteadGasCalculator.java
+++ b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/HomesteadGasCalculator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright contributors to Hyperledger Besu
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -12,16 +12,15 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import org.hyperledger.besu.ethereum.core.Gas;
+package org.hyperledger.besu.evm.gascalculator;
 
+/** The Homestead gas calculator. */
 public class HomesteadGasCalculator extends FrontierGasCalculator {
 
-  private static final Gas TX_CREATE_EXTRA = Gas.of(32_000L);
+  private static final long TX_CREATE_EXTRA = 32_000L;
 
   @Override
-  protected Gas txCreateExtraGasCost() {
+  protected long txCreateExtraGasCost() {
     return TX_CREATE_EXTRA;
   }
 }
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/IstanbulGasCalculator.java b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/IstanbulGasCalculator.java
new file mode 100644
index 00000000000..62fb0db4aa2
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/IstanbulGasCalculator.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.gascalculator;
+
+import java.util.function.Supplier;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** The Istanbul gas calculator. */
+public class IstanbulGasCalculator extends PetersburgGasCalculator {
+
+  private static final long TX_DATA_ZERO_COST = 4L;
+  private static final long ISTANBUL_TX_DATA_NON_ZERO_COST = 16L;
+  private static final long TX_BASE_COST = 21_000L;
+
+  private static final long SLOAD_GAS = 800L;
+  private static final long BALANCE_OPERATION_GAS_COST = 700L;
+  private static final long EXTCODE_HASH_COST = 700L;
+
+  private static final long SSTORE_SET_GAS = 20_000L;
+  private static final long SSTORE_RESET_GAS = 5_000L;
+  private static final long SSTORE_CLEARS_SCHEDULE = 15_000L;
+
+  private static final long SSTORE_SET_GAS_LESS_SLOAD_GAS = SSTORE_SET_GAS - SLOAD_GAS;
+  private static final long SSTORE_RESET_GAS_LESS_SLOAD_GAS = SSTORE_RESET_GAS - SLOAD_GAS;
+  private static final long NEGATIVE_SSTORE_CLEARS_SCHEDULE = -SSTORE_CLEARS_SCHEDULE;
+
+  @Override
+  public long transactionIntrinsicGasCost(final Bytes payload, final boolean isContractCreation) {
+    int zeros = 0;
+    for (int i = 0; i < payload.size(); i++) {
+      if (payload.get(i) == 0) {
+        ++zeros;
+      }
+    }
+    final int nonZeros = payload.size() - zeros;
+
+    final long cost =
+        TX_BASE_COST + (TX_DATA_ZERO_COST * zeros) + (ISTANBUL_TX_DATA_NON_ZERO_COST * nonZeros);
+
+    return isContractCreation ? (cost + txCreateExtraGasCost()) : cost;
+  }
+
+  @Override
+  // As per https://eips.ethereum.org/EIPS/eip-2200
+  public long calculateStorageCost(
+      final UInt256 newValue,
+      final Supplier<UInt256> currentValue,
+      final Supplier<UInt256> originalValue) {
+
+    final UInt256 localCurrentValue = currentValue.get();
+    if (localCurrentValue.equals(newValue)) {
+      return SLOAD_GAS;
+    } else {
+      final UInt256 localOriginalValue = originalValue.get();
+      if (localOriginalValue.equals(localCurrentValue)) {
+        return localOriginalValue.isZero() ? SSTORE_SET_GAS : SSTORE_RESET_GAS;
+      } else {
+        return SLOAD_GAS;
+      }
+    }
+  }
+
+  @Override
+  // As per https://eips.ethereum.org/EIPS/eip-2200
+  public long calculateStorageRefundAmount(
+      final UInt256 newValue,
+      final Supplier<UInt256> currentValue,
+      final Supplier<UInt256> originalValue) {
+
+    final UInt256 localCurrentValue = currentValue.get();
+    if (localCurrentValue.equals(newValue)) {
+      return 0L;
+    } else {
+      final UInt256 localOriginalValue = originalValue.get();
+      if (localOriginalValue.equals(localCurrentValue)) {
+        if (localOriginalValue.isZero()) {
+          return 0L;
+        } else if (newValue.isZero()) {
+          return SSTORE_CLEARS_SCHEDULE;
+        } else {
+          return 0L;
+        }
+      } else {
+        long refund = 0L;
+        if (!localOriginalValue.isZero()) {
+          if (localCurrentValue.isZero()) {
+            refund = NEGATIVE_SSTORE_CLEARS_SCHEDULE;
+          } else if (newValue.isZero()) {
+            refund = SSTORE_CLEARS_SCHEDULE;
+          }
+        }
+
+        if (localOriginalValue.equals(newValue)) {
+          refund =
+              refund
+                  + (localOriginalValue.isZero()
+                      ? SSTORE_SET_GAS_LESS_SLOAD_GAS
+                      : SSTORE_RESET_GAS_LESS_SLOAD_GAS);
+        }
+        return refund;
+      }
+    }
+  }
+
+  @Override
+  // As per https://eips.ethereum.org/EIPS/eip-1884
+  public long getSloadOperationGasCost() {
+    return SLOAD_GAS;
+  }
+
+  @Override
+  // As per https://eips.ethereum.org/EIPS/eip-1884
+  public long getBalanceOperationGasCost() {
+    return BALANCE_OPERATION_GAS_COST;
+  }
+
+  @Override
+  // As per https://eips.ethereum.org/EIPS/eip-1884
+  public long extCodeHashOperationGasCost() {
+    return EXTCODE_HASH_COST;
+  }
+
+  @Override
+  public long getMaximumTransactionCost(final int size) {
+    return TX_BASE_COST + (ISTANBUL_TX_DATA_NON_ZERO_COST * size);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/LondonGasCalculator.java b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/LondonGasCalculator.java
new file mode 100644
index 00000000000..69336414542
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/LondonGasCalculator.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.gascalculator;
+
+import java.util.function.Supplier;
+
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** The London gas calculator. */
+public class LondonGasCalculator extends BerlinGasCalculator {
+
+  // redefinitions for EIP-3529
+  private static final long SSTORE_CLEARS_SCHEDULE = SSTORE_RESET_GAS + ACCESS_LIST_STORAGE_COST;
+
+  private static final long NEGATIVE_SSTORE_CLEARS_SCHEDULE = -SSTORE_CLEARS_SCHEDULE;
+
+  // redefinitions for EIP-3529
+  private static final int NEW_MAX_REFUND_QUOTIENT = 5;
+
+  // Redefined refund amount from EIP-3529
+  @Override
+  public long getSelfDestructRefundAmount() {
+    return 0L;
+  }
+
+  // defined in Berlin, but re-implemented with new constants
+  @Override
+  // As per https://eips.ethereum.org/EIPS/eip-3529
+  public long calculateStorageRefundAmount(
+      final UInt256 newValue,
+      final Supplier<UInt256> currentValue,
+      final Supplier<UInt256> originalValue) {
+
+    final UInt256 localCurrentValue = currentValue.get();
+    if (localCurrentValue.equals(newValue)) {
+      return 0L;
+    } else {
+      final UInt256 localOriginalValue = originalValue.get();
+      if (localOriginalValue.equals(localCurrentValue)) {
+        if (localOriginalValue.isZero()) {
+          return 0L;
+        } else if (newValue.isZero()) {
+          return SSTORE_CLEARS_SCHEDULE;
+        } else {
+          return 0L;
+        }
+      } else {
+        long refund = 0L;
+        if (!localOriginalValue.isZero()) {
+          if (localCurrentValue.isZero()) {
+            refund = NEGATIVE_SSTORE_CLEARS_SCHEDULE;
+          } else if (newValue.isZero()) {
+            refund = SSTORE_CLEARS_SCHEDULE;
+          }
+        }
+
+        if (localOriginalValue.equals(newValue)) {
+          refund =
+              refund
+                  + (localOriginalValue.isZero()
+                      ? SSTORE_SET_GAS_LESS_SLOAD_GAS
+                      : SSTORE_RESET_GAS_LESS_SLOAD_GAS);
+        }
+        return refund;
+      }
+    }
+  }
+
+  @Override
+  public long getMaxRefundQuotient() {
+    return NEW_MAX_REFUND_QUOTIENT;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/PetersburgGasCalculator.java b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/PetersburgGasCalculator.java
new file mode 100644
index 00000000000..df5dd960ff3
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/PetersburgGasCalculator.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.gascalculator;
+
+import java.util.function.Supplier;
+
+import org.apache.tuweni.units.bigints.UInt256;
+
+/**
+ * Gas Calculator for Petersberg Hard Fork. Rollback EIP-1283.
+ *
+ * <p>Neither {@link TangerineWhistleGasCalculator} nor {@link SpuriousDragonGasCalculator} overrode
+ * these two methods so {@link FrontierGasCalculator} is the source.
+ */
+public class PetersburgGasCalculator extends ConstantinopleGasCalculator {
+
+  /** Same as {#link {@link FrontierGasCalculator#STORAGE_SET_GAS_COST} */
+  private static final long STORAGE_SET_GAS_COST = 20_000L;
+  /** Same as {#link {@link FrontierGasCalculator#STORAGE_RESET_GAS_COST} */
+  private static final long STORAGE_RESET_GAS_COST = 5_000L;
+  /** Same as {#link {@link FrontierGasCalculator#STORAGE_RESET_REFUND_AMOUNT} */
+  private static final long STORAGE_RESET_REFUND_AMOUNT = 15_000L;
+
+  /**
+   * Same as {#link {@link FrontierGasCalculator#calculateStorageCost(UInt256, Supplier, Supplier)}
+   */
+  @Override
+  public long calculateStorageCost(
+      final UInt256 newValue,
+      final Supplier<UInt256> currentValue,
+      final Supplier<UInt256> originalValue) {
+    return !newValue.isZero() && currentValue.get().isZero()
+        ? STORAGE_SET_GAS_COST
+        : STORAGE_RESET_GAS_COST;
+  }
+
+  /**
+   * Same as {#link {@link FrontierGasCalculator#calculateStorageRefundAmount(UInt256, Supplier,
+   * Supplier)}
+   */
+  @Override
+  public long calculateStorageRefundAmount(
+      final UInt256 newValue,
+      final Supplier<UInt256> currentValue,
+      final Supplier<UInt256> originalValue) {
+    return newValue.isZero() && !currentValue.get().isZero() ? STORAGE_RESET_REFUND_AMOUNT : 0L;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/ShanghaiGasCalculator.java b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/ShanghaiGasCalculator.java
new file mode 100644
index 00000000000..ce764b58524
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/ShanghaiGasCalculator.java
@@ -0,0 +1,48 @@
+package org.hyperledger.besu.evm.gascalculator;
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import static org.hyperledger.besu.evm.internal.Words.clampedAdd;
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
+import org.hyperledger.besu.evm.frame.MessageFrame;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Shanghai gas calculator. */
+public class ShanghaiGasCalculator extends LondonGasCalculator {
+
+  private static final long INIT_CODE_COST = 2L;
+
+  @Override
+  public long transactionIntrinsicGasCost(final Bytes payload, final boolean isContractCreation) {
+    long intrinsicGasCost = super.transactionIntrinsicGasCost(payload, isContractCreation);
+    if (isContractCreation) {
+      return clampedAdd(intrinsicGasCost, calculateInitGasCost(payload.size()));
+    } else {
+      return intrinsicGasCost;
+    }
+  }
+
+  @Override
+  public long createOperationGasCost(final MessageFrame frame) {
+    final long initCodeLength = clampedToLong(frame.getStackItem(2));
+    return clampedAdd(super.createOperationGasCost(frame), calculateInitGasCost(initCodeLength));
+  }
+
+  private static long calculateInitGasCost(final long initCodeLength) {
+    final int dataLength = (int) Math.ceil(initCodeLength / 32.0);
+    return dataLength * INIT_CODE_COST;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/SpuriousDragonGasCalculator.java b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/SpuriousDragonGasCalculator.java
new file mode 100644
index 00000000000..2e905c414e4
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/SpuriousDragonGasCalculator.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.gascalculator;
+
+import static org.hyperledger.besu.evm.internal.Words.clampedAdd;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+
+/** The Spurious dragon gas calculator. */
+public class SpuriousDragonGasCalculator extends TangerineWhistleGasCalculator {
+
+  private static final long EXP_OPERATION_BYTE_GAS_COST = 50L;
+
+  @Override
+  public long callOperationGasCost(
+      final MessageFrame frame,
+      final long stipend,
+      final long inputDataOffset,
+      final long inputDataLength,
+      final long outputDataOffset,
+      final long outputDataLength,
+      final Wei transferValue,
+      final Account recipient,
+      final Address to) {
+    final long inputDataMemoryExpansionCost =
+        memoryExpansionGasCost(frame, inputDataOffset, inputDataLength);
+    final long outputDataMemoryExpansionCost =
+        memoryExpansionGasCost(frame, outputDataOffset, outputDataLength);
+    final long memoryExpansionCost =
+        Math.max(inputDataMemoryExpansionCost, outputDataMemoryExpansionCost);
+
+    long cost = clampedAdd(callOperationBaseGasCost(), memoryExpansionCost);
+
+    if (!transferValue.isZero()) {
+      cost = clampedAdd(cost, callValueTransferGasCost());
+    }
+
+    if ((recipient == null || recipient.isEmpty()) && !transferValue.isZero()) {
+      cost = clampedAdd(cost, newAccountGasCost());
+    }
+
+    return cost;
+  }
+
+  @Override
+  protected long expOperationByteGasCost() {
+    return EXP_OPERATION_BYTE_GAS_COST;
+  }
+
+  private static final long SELFDESTRUCT_OPERATION_GAS_COST = 5_000L;
+
+  private static final long SELFDESTRUCT_OPERATION_CREATES_NEW_ACCOUNT = 30_000L;
+
+  @Override
+  public long selfDestructOperationGasCost(final Account recipient, final Wei inheritance) {
+    if ((recipient == null || recipient.isEmpty()) && !inheritance.isZero()) {
+      return SELFDESTRUCT_OPERATION_CREATES_NEW_ACCOUNT;
+    } else {
+      return SELFDESTRUCT_OPERATION_GAS_COST;
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/TangerineWhistleGasCalculator.java b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/TangerineWhistleGasCalculator.java
new file mode 100644
index 00000000000..a5df3a0f623
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/TangerineWhistleGasCalculator.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.gascalculator;
+
+import static org.hyperledger.besu.evm.internal.Words.clampedAdd;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.internal.Words;
+
+/** The Tangerine whistle gas calculator. */
+public class TangerineWhistleGasCalculator extends HomesteadGasCalculator {
+
+  private static final long BALANCE_OPERATION_GAS_COST = 400L;
+
+  private static final long CALL_OPERATION_BASE_GAS_COST = 700L;
+
+  private static final long EXT_CODE_BASE_GAS_COST = 700L;
+
+  private static final long SELFDESTRUCT_OPERATION_GAS_COST = 5_000L;
+
+  private static final long SELFDESTRUCT_OPERATION_CREATES_NEW_ACCOUNT = 30_000L;
+
+  private static final long SLOAD_OPERATION_GAS_COST = 200L;
+
+  @Override
+  public long getBalanceOperationGasCost() {
+    return BALANCE_OPERATION_GAS_COST;
+  }
+
+  // Returns all but 1/64 (n - floor(n /16)) of the provided value
+  private static long allButOneSixtyFourth(final long value) {
+    return value - value / 64;
+  }
+
+  @Override
+  public long callOperationBaseGasCost() {
+    return CALL_OPERATION_BASE_GAS_COST;
+  }
+
+  @Override
+  public long callOperationGasCost(
+      final MessageFrame frame,
+      final long stipend,
+      final long inputDataOffset,
+      final long inputDataLength,
+      final long outputDataOffset,
+      final long outputDataLength,
+      final Wei transferValue,
+      final Account recipient,
+      final Address to) {
+    final long inputDataMemoryExpansionCost =
+        memoryExpansionGasCost(frame, inputDataOffset, inputDataLength);
+    final long outputDataMemoryExpansionCost =
+        memoryExpansionGasCost(frame, outputDataOffset, outputDataLength);
+    final long memoryExpansionCost =
+        Math.max(inputDataMemoryExpansionCost, outputDataMemoryExpansionCost);
+
+    long cost = clampedAdd(callOperationBaseGasCost(), memoryExpansionCost);
+
+    if (!transferValue.isZero()) {
+      cost = clampedAdd(cost, callValueTransferGasCost());
+    }
+
+    if (recipient == null) {
+      cost = clampedAdd(cost, newAccountGasCost());
+    }
+
+    return cost;
+  }
+
+  private static long gasCap(final long remaining, final long stipend) {
+    return Words.unsignedMin(allButOneSixtyFourth(remaining), stipend);
+  }
+
+  @Override
+  public long gasAvailableForChildCall(
+      final MessageFrame frame, final long stipend, final boolean transfersValue) {
+    final long gasCap = gasCap(frame.getRemainingGas(), stipend);
+
+    // TODO: Integrate this into AbstractCallOperation since it's
+    // a little out of place to mutate the frame here.
+    frame.decrementRemainingGas(gasCap);
+
+    if (transfersValue) {
+      return gasCap + getAdditionalCallStipend();
+    } else {
+      return gasCap;
+    }
+  }
+
+  @Override
+  public long gasAvailableForChildCreate(final long stipend) {
+    return allButOneSixtyFourth(stipend);
+  }
+
+  @Override
+  protected long extCodeBaseGasCost() {
+    return EXT_CODE_BASE_GAS_COST;
+  }
+
+  @Override
+  public long selfDestructOperationGasCost(final Account recipient, final Wei inheritance) {
+    if (recipient == null) {
+      return SELFDESTRUCT_OPERATION_CREATES_NEW_ACCOUNT;
+    } else {
+      return SELFDESTRUCT_OPERATION_GAS_COST;
+    }
+  }
+
+  @Override
+  public long getSloadOperationGasCost() {
+    return SLOAD_OPERATION_GAS_COST;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/internal/CodeCache.java b/evm/src/main/java/org/hyperledger/besu/evm/internal/CodeCache.java
new file mode 100644
index 00000000000..25014b093bf
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/internal/CodeCache.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.evm.internal;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.evm.Code;
+
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+
+/** The Code cache. */
+public class CodeCache {
+
+  private final Cache<Hash, Code> cache;
+  private final long weightLimit;
+
+  /**
+   * Instantiates a new Code cache.
+   *
+   * @param config the config
+   */
+  public CodeCache(final EvmConfiguration config) {
+    this(config.getJumpDestCacheWeightBytes());
+  }
+
+  private CodeCache(final long maxWeightBytes) {
+    this.weightLimit = maxWeightBytes;
+    this.cache =
+        Caffeine.newBuilder().maximumWeight(maxWeightBytes).weigher(new CodeScale()).build();
+  }
+
+  /**
+   * Invalidate cache for given key.
+   *
+   * @param key the key
+   */
+  public void invalidate(final Hash key) {
+    this.cache.invalidate(key);
+  }
+
+  /** Clean up. */
+  public void cleanUp() {
+    this.cache.cleanUp();
+  }
+
+  /**
+   * Gets if present.
+   *
+   * @param codeHash the code hash
+   * @return the if present
+   */
+  public Code getIfPresent(final Hash codeHash) {
+    return cache.getIfPresent(codeHash);
+  }
+
+  /**
+   * Put.
+   *
+   * @param key the key
+   * @param value the value
+   */
+  public void put(final Hash key, final Code value) {
+    cache.put(key, value);
+  }
+
+  /**
+   * Size of cache.
+   *
+   * @return the long
+   */
+  public long size() {
+    cache.cleanUp();
+    return cache.estimatedSize();
+  }
+
+  /**
+   * Gets weight limit.
+   *
+   * @return the weight limit
+   */
+  public long getWeightLimit() {
+    return weightLimit;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/internal/CodeScale.java b/evm/src/main/java/org/hyperledger/besu/evm/internal/CodeScale.java
new file mode 100644
index 00000000000..cd736c3d572
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/internal/CodeScale.java
@@ -0,0 +1,28 @@
+/*
+ *  Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.evm.internal;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.evm.Code;
+
+import com.github.benmanes.caffeine.cache.Weigher;
+
+class CodeScale implements Weigher<Hash, Code> {
+  @Override
+  public int weigh(final Hash key, final Code code) {
+    return ((code.getSize() * 9 + 7) / 8) + key.size();
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/internal/EvmConfiguration.java b/evm/src/main/java/org/hyperledger/besu/evm/internal/EvmConfiguration.java
new file mode 100644
index 00000000000..19533a538a5
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/internal/EvmConfiguration.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.evm.internal;
+
+/** The Evm configuration. */
+public class EvmConfiguration {
+  /** The constant DEFAULT. */
+  public static final EvmConfiguration DEFAULT = new EvmConfiguration(32_000L);
+
+  private final long jumpDestCacheWeightKB;
+
+  /**
+   * Instantiates a new Evm configuration.
+   *
+   * @param jumpDestCacheWeightKB the jump dest cache weight kb
+   */
+  public EvmConfiguration(final long jumpDestCacheWeightKB) {
+    this.jumpDestCacheWeightKB = jumpDestCacheWeightKB;
+  }
+
+  /**
+   * Gets jump dest cache weight bytes.
+   *
+   * @return the jump dest cache weight bytes
+   */
+  public long getJumpDestCacheWeightBytes() {
+    return jumpDestCacheWeightKB * 1024L;
+  }
+
+  /**
+   * Gets jump dest cache weight kb.
+   *
+   * @return the jump dest cache weight kb
+   */
+  public long getJumpDestCacheWeightKB() {
+    return jumpDestCacheWeightKB;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/internal/FixedStack.java b/evm/src/main/java/org/hyperledger/besu/evm/internal/FixedStack.java
new file mode 100644
index 00000000000..c18ee0aeda1
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/internal/FixedStack.java
@@ -0,0 +1,246 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.internal;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import java.lang.reflect.Array;
+import java.util.Arrays;
+
+/**
+ * An operand stack for the Ethereum Virtual machine (EVM).
+ *
+ * <p>The operand stack is responsible for storing the current operands that the EVM can execute. It
+ * is assumed to have a fixed size.
+ *
+ * @param <T> the type parameter
+ */
+public class FixedStack<T> {
+
+  private final T[] entries;
+
+  private final int maxSize;
+
+  private int top;
+
+  /** The Underflow exception. */
+  public static class UnderflowException extends RuntimeException {
+    // Don't create a stack trace since these are not "errors" per say but are using exceptions to
+    // throw rare control flow conditions (EVM stack overflow) that are expected to be seen in
+    // normal
+    // operations.
+    @Override
+    public synchronized Throwable fillInStackTrace() {
+      return this;
+    }
+  }
+
+  /** The Overflow exception. */
+  public static class OverflowException extends RuntimeException {
+    // Don't create a stack trace since these are not "errors" per say but are using exceptions to
+    // throw rare control flow conditions (EVM stack overflow) that are expected to be seen in
+    // normal
+    // operations.
+    @Override
+    public synchronized Throwable fillInStackTrace() {
+      return this;
+    }
+  }
+
+  /**
+   * Instantiates a new Fixed stack.
+   *
+   * @param maxSize the max size
+   * @param klass the klass
+   */
+  @SuppressWarnings("unchecked")
+  public FixedStack(final int maxSize, final Class<T> klass) {
+    checkArgument(maxSize >= 0, "max size must be non-negative");
+
+    this.entries = (T[]) Array.newInstance(klass, maxSize);
+    this.maxSize = maxSize;
+    this.top = -1;
+  }
+
+  /**
+   * Get operand.
+   *
+   * @param offset the offset
+   * @return the operand
+   */
+  public T get(final int offset) {
+    if (offset < 0 || offset >= size()) {
+      throw new UnderflowException();
+    }
+
+    return entries[top - offset];
+  }
+
+  /**
+   * Pop operand.
+   *
+   * @return the operand
+   */
+  public T pop() {
+    if (top < 0) {
+      throw new UnderflowException();
+    }
+
+    final T removed = entries[top];
+    entries[top--] = null;
+    return removed;
+  }
+
+  /**
+   * Peek and return type T.
+   *
+   * @return the T entry
+   */
+  public T peek() {
+    if (top < 0) {
+      return null;
+    } else {
+      return entries[top];
+    }
+  }
+
+  /**
+   * Pops the specified number of operands from the stack.
+   *
+   * @param items the number of operands to pop off the stack
+   * @throws IllegalArgumentException if the items to pop is negative.
+   * @throws UnderflowException when the items to pop is greater than {@link #size()}
+   */
+  public void bulkPop(final int items) {
+    checkArgument(items > 0, "number of items to pop must be greater than 0");
+    if (items > size()) {
+      throw new UnderflowException();
+    }
+
+    Arrays.fill(entries, top - items + 1, top + 1, null);
+    top -= items;
+  }
+
+  /**
+   * Trims the "middle" section of items out of the stack. Items below the cutpoint remains, and of
+   * the items above only the itemsToKeep items remain. All items in the middle are removed.
+   *
+   * @param cutPoint Point at which to start removing items
+   * @param itemsToKeep itemsToKeep Number of items on top to place at the cutPoint
+   * @throws IllegalArgumentException if the cutPoint or items to keep is negative.
+   * @throws UnderflowException If there are less than itemsToKeep above the cutPoint
+   */
+  public void preserveTop(final int cutPoint, final int itemsToKeep) {
+    checkArgument(cutPoint >= 0, "cutPoint must be positive");
+    checkArgument(itemsToKeep >= 0, "itemsToKeep must be positive");
+    if (itemsToKeep == 0) {
+      if (cutPoint < size()) {
+        bulkPop(top - cutPoint);
+      }
+    } else {
+      int targetSize = cutPoint + itemsToKeep;
+      int currentSize = size();
+      if (targetSize > currentSize) {
+        throw new UnderflowException();
+      } else if (targetSize < currentSize) {
+        System.arraycopy(entries, currentSize - itemsToKeep, entries, cutPoint, itemsToKeep);
+        Arrays.fill(entries, targetSize, currentSize, null);
+        top = targetSize - 1;
+      }
+    }
+  }
+
+  /**
+   * Push operand.
+   *
+   * @param operand the operand
+   */
+  public void push(final T operand) {
+    final int nextTop = top + 1;
+    if (nextTop == maxSize) {
+      throw new OverflowException();
+    }
+    entries[nextTop] = operand;
+    top = nextTop;
+  }
+
+  /**
+   * Set operand.
+   *
+   * @param offset the offset
+   * @param operand the operand
+   */
+  public void set(final int offset, final T operand) {
+    if (offset < 0) {
+      throw new UnderflowException();
+    } else if (offset >= size()) {
+      throw new OverflowException();
+    }
+
+    entries[top - offset] = operand;
+  }
+
+  /**
+   * Size of entries.
+   *
+   * @return the size
+   */
+  public int size() {
+    return top + 1;
+  }
+
+  @Override
+  public String toString() {
+    final StringBuilder builder = new StringBuilder();
+    for (int i = 0; i < entries.length; ++i) {
+      builder.append(String.format("%n0x%04X ", i)).append(entries[i]);
+    }
+    return builder.toString();
+  }
+
+  @Override
+  public int hashCode() {
+    return Arrays.hashCode(entries);
+  }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public boolean equals(final Object other) {
+    if (!(other instanceof FixedStack)) {
+      return false;
+    }
+
+    final FixedStack<T> that = (FixedStack<T>) other;
+    return Arrays.deepEquals(this.entries, that.entries);
+  }
+
+  /**
+   * Is stack full.
+   *
+   * @return the boolean
+   */
+  public boolean isFull() {
+    return top + 1 >= maxSize;
+  }
+
+  /**
+   * Is stack empty.
+   *
+   * @return the boolean
+   */
+  public boolean isEmpty() {
+    return top < 0;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/internal/MemoryEntry.java b/evm/src/main/java/org/hyperledger/besu/evm/internal/MemoryEntry.java
new file mode 100644
index 00000000000..6e0fbb098e8
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/internal/MemoryEntry.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.evm.internal;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Memory entry. */
+public class MemoryEntry {
+  private final long offset;
+  private final Bytes value;
+
+  /**
+   * Instantiates a new Memory entry.
+   *
+   * @param offset the offset
+   * @param value the value
+   */
+  public MemoryEntry(final long offset, final Bytes value) {
+    this.offset = offset;
+    this.value = value;
+  }
+
+  /**
+   * Gets offset.
+   *
+   * @return the offset
+   */
+  public long getOffset() {
+    return offset;
+  }
+
+  /**
+   * Gets value.
+   *
+   * @return the value
+   */
+  public Bytes getValue() {
+    return value;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/internal/OperandStack.java b/evm/src/main/java/org/hyperledger/besu/evm/internal/OperandStack.java
new file mode 100644
index 00000000000..60da0a98343
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/internal/OperandStack.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.evm.internal;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Operand stack. */
+public class OperandStack extends FixedStack<Bytes> {
+
+  /**
+   * Instantiates a new Operand stack.
+   *
+   * @param maxSize the max size
+   */
+  public OperandStack(final int maxSize) {
+    super(maxSize, Bytes.class);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/internal/ReturnStack.java b/evm/src/main/java/org/hyperledger/besu/evm/internal/ReturnStack.java
new file mode 100644
index 00000000000..1482aa704ab
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/internal/ReturnStack.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.internal;
+
+import java.util.Objects;
+
+/** The type Return stack. */
+public class ReturnStack extends FixedStack<ReturnStack.ReturnStackItem> {
+
+  /** The type Return stack item. */
+  // Java17 convert to record
+  public static final class ReturnStackItem {
+
+    /** The Code section index. */
+    final int codeSectionIndex;
+    /** The Pc. */
+    final int pc;
+    /** The Stack height. */
+    final int stackHeight;
+
+    /**
+     * Instantiates a new Return stack item.
+     *
+     * @param codeSectionIndex the code section index
+     * @param pc the pc
+     * @param stackHeight the stack height
+     */
+    public ReturnStackItem(final int codeSectionIndex, final int pc, final int stackHeight) {
+      this.codeSectionIndex = codeSectionIndex;
+      this.pc = pc;
+      this.stackHeight = stackHeight;
+    }
+
+    /**
+     * Gets code section index.
+     *
+     * @return the code section index
+     */
+    public int getCodeSectionIndex() {
+      return codeSectionIndex;
+    }
+
+    /**
+     * Gets pc.
+     *
+     * @return the pc
+     */
+    public int getPC() {
+      return pc;
+    }
+
+    /**
+     * Gets stack height.
+     *
+     * @return the stack height
+     */
+    public int getStackHeight() {
+      return stackHeight;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+      if (this == o) return true;
+      if (o == null || getClass() != o.getClass()) return false;
+      ReturnStackItem that = (ReturnStackItem) o;
+      return codeSectionIndex == that.codeSectionIndex
+          && pc == that.pc
+          && stackHeight == that.stackHeight;
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(codeSectionIndex, pc, stackHeight);
+    }
+
+    @Override
+    public String toString() {
+      return "ReturnStackItem{"
+          + "codeSectionIndex="
+          + codeSectionIndex
+          + ", pc="
+          + pc
+          + ", stackHeight="
+          + stackHeight
+          + '}';
+    }
+  }
+
+  /**
+   * Max return stack size specified in <a
+   * href="https://eips.ethereum.org/EIPS/eip-4750">EIP-4750</a>
+   */
+  static final int MAX_RETURN_STACK = 1024;
+
+  /** Instantiates a new Return stack. */
+  public ReturnStack() {
+    super(MAX_RETURN_STACK, ReturnStackItem.class);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/internal/StorageEntry.java b/evm/src/main/java/org/hyperledger/besu/evm/internal/StorageEntry.java
new file mode 100644
index 00000000000..7e68f75770d
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/internal/StorageEntry.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.evm.internal;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** The Storage entry. */
+public class StorageEntry {
+  private final UInt256 offset;
+  private final Bytes value;
+
+  /**
+   * Instantiates a new Storage entry.
+   *
+   * @param offset the offset
+   * @param value the value
+   */
+  public StorageEntry(final UInt256 offset, final Bytes value) {
+    this.offset = offset;
+    this.value = value;
+  }
+
+  /**
+   * Gets offset.
+   *
+   * @return the offset
+   */
+  public UInt256 getOffset() {
+    return offset;
+  }
+
+  /**
+   * Gets value.
+   *
+   * @return the value
+   */
+  public Bytes getValue() {
+    return value;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/internal/Words.java b/evm/src/main/java/org/hyperledger/besu/evm/internal/Words.java
new file mode 100644
index 00000000000..965573c9953
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/internal/Words.java
@@ -0,0 +1,225 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.internal;
+
+import org.hyperledger.besu.datatypes.Address;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.bytes.MutableBytes;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** Static utility methods to work with VM words (that is, {@link Bytes32} values). */
+public interface Words {
+  /**
+   * Creates a new word containing the provided address.
+   *
+   * @param address The address to convert to a word.
+   * @return A VM word containing {@code address} (left-padded as according to the VM specification
+   *     (Appendix H. of the Yellow paper)).
+   */
+  static UInt256 fromAddress(final Address address) {
+    return UInt256.fromBytes(Bytes32.leftPad(address));
+  }
+
+  /**
+   * Extract an address from the provided address.
+   *
+   * @param bytes The word to extract the address from.
+   * @return An address build from the right-most 160-bits of the {@code bytes} (as according to the
+   *     VM specification (Appendix H. of the Yellow paper)).
+   */
+  static Address toAddress(final Bytes bytes) {
+    final int size = bytes.size();
+    if (size < 20) {
+      final MutableBytes result = MutableBytes.create(20);
+      bytes.copyTo(result, 20 - size);
+      // Addresses get hashed alot in calls, and mutable bytes don't cache the `hashCode`
+      // so always return an immutable copy
+      return Address.wrap(result.copy());
+    } else if (size == 20) {
+      return Address.wrap(bytes);
+    } else {
+      return Address.wrap(bytes.slice(size - Address.SIZE, Address.SIZE));
+    }
+  }
+
+  /**
+   * The number of words corresponding to the provided input.
+   *
+   * <p>In other words, this computes {@code input.size() / 32} but rounded up.
+   *
+   * @param input the input to check.
+   * @return the number of (32 bytes) words that {@code input} spans.
+   */
+  static int numWords(final Bytes input) {
+    // m/n round up == (m + n - 1)/n: http://www.cs.nott.ac.uk/~psarb2/G51MPC/slides/NumberLogic.pdf
+    return (input.size() + Bytes32.SIZE - 1) / Bytes32.SIZE;
+  }
+
+  /**
+   * The value of the bytes as though it was representing an unsigned integer, however if the value
+   * exceeds Long.MAX_VALUE then Long.MAX_VALUE will be returned.
+   *
+   * @param uint the unsigned integer
+   * @return the least of the integer value or Long.MAX_VALUE
+   */
+  static long clampedToLong(final Bytes uint) {
+    if (uint.size() <= 8) {
+      final long result = uint.toLong();
+      return result < 0 ? Long.MAX_VALUE : result;
+    }
+
+    final Bytes trimmed = uint.trimLeadingZeros();
+    if (trimmed.size() <= 8) {
+      final long result = trimmed.toLong();
+      return result < 0 ? Long.MAX_VALUE : result;
+    } else {
+      // clamp to the largest int.
+      return Long.MAX_VALUE;
+    }
+  }
+
+  /**
+   * The value of the long as though it was representing an unsigned integer, however if the value
+   * is out of range it will return the number at the end of the range.
+   *
+   * @param l the signed integer
+   * @return The int value, or Integer.MAX_VALUE if too large or Integer.MIN_VALUE if to small.
+   */
+  static int clampedToInt(final long l) {
+    if (l > Integer.MAX_VALUE) {
+      return Integer.MAX_VALUE;
+    } else if (l < Integer.MIN_VALUE) {
+      return Integer.MIN_VALUE;
+    } else {
+      return (int) l;
+    }
+  }
+
+  /**
+   * Adds a and b, but if an underflow/overflow occurs return the Long max/min value
+   *
+   * @param a first value
+   * @param b second value
+   * @return value of a plus b if no over/underflows or Long.MAX_VALUE/Long.MIN_VALUE otherwise
+   */
+  static long clampedAdd(final long a, final long b) {
+    try {
+      return Math.addExact(a, b);
+    } catch (final ArithmeticException ae) {
+      return a > 0 ? Long.MAX_VALUE : Long.MIN_VALUE;
+    }
+  }
+
+  /**
+   * Multiplies a and b, but if an underflow/overflow occurs return the Long max/min value
+   *
+   * @param a first value
+   * @param b second value
+   * @return value of a times b if no over/underflows or Long.MAX_VALUE/Long.MIN_VALUE otherwise
+   */
+  static long clampedMultiply(final long a, final long b) {
+    try {
+      return Math.multiplyExact(a, b);
+    } catch (final ArithmeticException ae) {
+      return ((a ^ b) < 0) ? Long.MIN_VALUE : Long.MAX_VALUE;
+    }
+  }
+
+  /**
+   * Multiplies a and b, but if an underflow/overflow occurs return the Integer max/min value
+   *
+   * @param a first value
+   * @param b second value
+   * @return value of a times b if no over/underflows or Integer.MAX_VALUE/Integer.MIN_VALUE
+   *     otherwise
+   */
+  static int clampedMultiply(final int a, final int b) {
+    try {
+      return Math.multiplyExact(a, b);
+    } catch (final ArithmeticException ae) {
+      return ((a ^ b) < 0) ? Integer.MIN_VALUE : Integer.MAX_VALUE;
+    }
+  }
+
+  /**
+   * Returns the lesser of the two values, when compared as an unsigned value
+   *
+   * @param a first value
+   * @param b second value
+   * @return a if, as an unsigned integer, a is less than b; otherwise b.
+   */
+  static long unsignedMin(final long a, final long b) {
+    return Long.compareUnsigned(a, b) < 0 ? a : b;
+  }
+
+  /**
+   * Read big endian u16.
+   *
+   * @param index the index
+   * @param array the array
+   * @return the int
+   */
+  static int readBigEndianU16(final int index, final byte[] array) {
+    if (index + 1 >= array.length) {
+      throw new IndexOutOfBoundsException();
+    }
+    return ((array[index] & 0xff) << 8) | (array[index + 1] & 0xff);
+  }
+
+  /**
+   * Read big endian i16.
+   *
+   * @param index the index
+   * @param array the array
+   * @return the int
+   */
+  static int readBigEndianI16(final int index, final byte[] array) {
+    if (index + 1 >= array.length) {
+      throw new IndexOutOfBoundsException();
+    }
+    return (array[index] << 8) | (array[index + 1] & 0xff);
+  }
+
+  /**
+   * Get the big-endian Bytes representation of an unsigned int, including leading zeros
+   *
+   * @param value the int value
+   * @return a Bytes object of the value, Big Endian order
+   */
+  static Bytes intBytes(final int value) {
+    return Bytes.of(
+        (byte) (value >>> 24), (byte) (value >>> 16), (byte) (value >>> 8), (byte) value);
+  }
+
+  /**
+   * Get the big-endian Bytes representation of an unsigned int, including leading zeros
+   *
+   * @param value the long value
+   * @return a Bytes object of the value, Big Endian order
+   */
+  static Bytes longBytes(final long value) {
+    return Bytes.of(
+        (byte) (value >>> 56),
+        (byte) (value >>> 48),
+        (byte) (value >>> 40),
+        (byte) (value >>> 32),
+        (byte) (value >>> 24),
+        (byte) (value >>> 16),
+        (byte) (value >>> 8),
+        (byte) value);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Log.java b/evm/src/main/java/org/hyperledger/besu/evm/log/Log.java
similarity index 80%
rename from ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Log.java
rename to evm/src/main/java/org/hyperledger/besu/evm/log/Log.java
index 8903606200b..02b523445e7 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/Log.java
+++ b/evm/src/main/java/org/hyperledger/besu/evm/log/Log.java
@@ -12,14 +12,17 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.core;
+package org.hyperledger.besu.evm.log;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
 
 import java.util.List;
 import java.util.Objects;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import org.apache.tuweni.bytes.Bytes;
@@ -28,18 +31,24 @@
  * A log entry is a tuple of a logger’s address (the address of the contract that added the logs), a
  * series of 32-bytes log topics, and some number of bytes of data.
  */
-public class Log implements org.hyperledger.besu.plugin.data.Log {
+public class Log {
 
   private final Address logger;
   private final Bytes data;
   private final ImmutableList<LogTopic> topics;
 
   /**
+   * Instantiates a new Log.
+   *
    * @param logger The address of the contract that produced this log.
    * @param data Data associated with this log.
    * @param topics Indexable topics associated with this log.
    */
-  public Log(final Address logger, final Bytes data, final List<LogTopic> topics) {
+  @JsonCreator
+  public Log(
+      @JsonProperty("logger") final Address logger,
+      @JsonProperty("data") final Bytes data,
+      @JsonProperty("topics") final List<LogTopic> topics) {
     this.logger = logger;
     this.data = data;
     this.topics = ImmutableList.copyOf(topics);
@@ -73,27 +82,41 @@ public static Log readFrom(final RLPInput in) {
     return new Log(logger, data, topics);
   }
 
-  @Override
+  /**
+   * Gets logger address.
+   *
+   * @return the logger
+   */
+  @JsonProperty("logger")
   public Address getLogger() {
     return logger;
   }
 
-  @Override
+  /**
+   * Gets data.
+   *
+   * @return the data
+   */
+  @JsonProperty("data")
   public Bytes getData() {
     return data;
   }
 
-  @Override
+  /**
+   * Gets topics.
+   *
+   * @return the topics
+   */
+  @JsonProperty("topics")
   public List<LogTopic> getTopics() {
     return topics;
   }
 
   @Override
   public boolean equals(final Object other) {
-    if (!(other instanceof Log)) return false;
+    if (!(other instanceof Log that)) return false;
 
     // Compare data
-    final Log that = (Log) other;
     return this.data.equals(that.data)
         && this.logger.equals(that.logger)
         && this.topics.equals(that.topics);
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/LogTopic.java b/evm/src/main/java/org/hyperledger/besu/evm/log/LogTopic.java
similarity index 76%
rename from ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/LogTopic.java
rename to evm/src/main/java/org/hyperledger/besu/evm/log/LogTopic.java
index 2a6d9b93454..bff5621e51c 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/LogTopic.java
+++ b/evm/src/main/java/org/hyperledger/besu/evm/log/LogTopic.java
@@ -12,7 +12,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.core;
+package org.hyperledger.besu.evm.log;
 
 import org.hyperledger.besu.ethereum.rlp.RLPInput;
 import org.hyperledger.besu.ethereum.rlp.RLPOutput;
@@ -20,24 +20,54 @@
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.DelegatingBytes32;
 
+/** The Log topic. */
 public class LogTopic extends DelegatingBytes32 {
 
+  /**
+   * Instantiates a new Log topic.
+   *
+   * @param bytes the bytes
+   */
   protected LogTopic(final Bytes bytes) {
     super(bytes);
   }
 
+  /**
+   * Create log topic.
+   *
+   * @param bytes the bytes
+   * @return the log topic
+   */
   public static LogTopic create(final Bytes bytes) {
     return new LogTopic(bytes);
   }
 
+  /**
+   * Wrap log topic.
+   *
+   * @param bytes the bytes
+   * @return the log topic
+   */
   public static LogTopic wrap(final Bytes bytes) {
     return new LogTopic(bytes);
   }
 
+  /**
+   * Instantiate Log Topic from copy of bytes.
+   *
+   * @param bytes the bytes
+   * @return the log topic
+   */
   public static LogTopic of(final Bytes bytes) {
     return new LogTopic(bytes.copy());
   }
 
+  /**
+   * Instantiate Log Topic from hex string
+   *
+   * @param str the str
+   * @return the log topic
+   */
   public static LogTopic fromHexString(final String str) {
     return str == null ? null : LogTopic.create(Bytes.fromHexString(str));
   }
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/log/LogsBloomFilter.java b/evm/src/main/java/org/hyperledger/besu/evm/log/LogsBloomFilter.java
new file mode 100644
index 00000000000..32d382eca1a
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/log/LogsBloomFilter.java
@@ -0,0 +1,239 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.log;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static org.hyperledger.besu.crypto.Hash.keccak256;
+
+import org.hyperledger.besu.ethereum.rlp.RLPException;
+import org.hyperledger.besu.ethereum.rlp.RLPInput;
+
+import java.util.Collection;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.DelegatingBytes;
+import org.apache.tuweni.bytes.MutableBytes;
+
+/**
+ * Bloom filter implementation for storing persistent logs, describes a 2048-bit representation of
+ * all log entries of a transaction, except data. Sets the bits of the 2048 byte array, where
+ * indices are given by: The lower order 11-bits, of the first three double-bytes, of the KECCAK256,
+ * of each value. For instance the address "0x0F572E5295C57F15886F9B263E2F6D2D6C7B5EC6" results in
+ * the KECCAK256 hash "bd2b01afcd27800b54d2179edc49e2bffde5078bb6d0b204694169b1643fb108", of which
+ * the corresponding double-bytes are: bd2b, 01af, cd27, corresponding to the following bits in the
+ * bloom filter: 1323, 431, 1319
+ */
+public class LogsBloomFilter extends DelegatingBytes {
+
+  /** The constant BYTE_SIZE. */
+  public static final int BYTE_SIZE = 256;
+
+  private static final int LEAST_SIGNIFICANT_BYTE = 0xFF;
+  private static final int LEAST_SIGNIFICANT_THREE_BITS = 0x7;
+  private static final int BITS_IN_BYTE = 8;
+
+  /** Instantiates a new Logs bloom filter. */
+  public LogsBloomFilter() {
+    super(Bytes.wrap(new byte[BYTE_SIZE]));
+  }
+
+  /**
+   * Instantiates a new Logs bloom filter.
+   *
+   * @param data the data
+   */
+  public LogsBloomFilter(final MutableBytes data) {
+    this(data.copy());
+  }
+
+  /**
+   * Instantiates a new Logs bloom filter.
+   *
+   * @param data the data
+   */
+  public LogsBloomFilter(final Bytes data) {
+    super(data);
+    checkArgument(
+        data.size() == BYTE_SIZE,
+        "Invalid size for bloom filter backing array: expected %s but got %s",
+        BYTE_SIZE,
+        data.size());
+  }
+
+  /**
+   * Instantiates a new Logs bloom filter.
+   *
+   * @param logsBloomHexString the logs bloom hex string
+   */
+  public LogsBloomFilter(final String logsBloomHexString) {
+    this(Bytes.fromHexString(logsBloomHexString));
+  }
+
+  /**
+   * Instantiate logs bloom filter From hex string.
+   *
+   * @param hexString the hex string
+   * @return the logs bloom filter
+   */
+  public static LogsBloomFilter fromHexString(final String hexString) {
+    return new LogsBloomFilter(Bytes.fromHexString(hexString));
+  }
+
+  /**
+   * Instantiates an empty logs bloom filter.
+   *
+   * @return the logs bloom filter
+   */
+  public static LogsBloomFilter empty() {
+    return new LogsBloomFilter(Bytes.wrap(new byte[LogsBloomFilter.BYTE_SIZE]));
+  }
+
+  /**
+   * Creates a bloom filter from the given RLP-encoded input.
+   *
+   * @param input The input to read from
+   * @return the input's corresponding bloom filter
+   */
+  public static LogsBloomFilter readFrom(final RLPInput input) {
+    final Bytes bytes = input.readBytes();
+    if (bytes.size() != BYTE_SIZE) {
+      throw new RLPException(
+          String.format(
+              "LogsBloomFilter unexpected size of %s (needs %s)", bytes.size(), BYTE_SIZE));
+    }
+    return new LogsBloomFilter(bytes);
+  }
+
+  /**
+   * Checks of subset log bloom filter can be contained.
+   *
+   * @param subset the subset
+   * @return the boolean
+   */
+  public boolean couldContain(final LogsBloomFilter subset) {
+    if (subset == null) {
+      return true;
+    }
+    if (subset.size() != size()) {
+      return false;
+    }
+    for (int i = 0; i < size(); i++) {
+      final byte subsetValue = subset.get(i);
+      if ((get(i) & subsetValue) != subsetValue) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  /**
+   * Instantiate Builder.
+   *
+   * @return the builder
+   */
+  public static Builder builder() {
+    return new Builder();
+  }
+
+  /** The Builder. */
+  public static final class Builder {
+    /** The Data. */
+    final MutableBytes data;
+
+    private Builder() {
+      data = MutableBytes.create(LogsBloomFilter.BYTE_SIZE);
+    }
+
+    /**
+     * Insert filter.
+     *
+     * @param other the other
+     * @return the builder
+     */
+    public Builder insertFilter(final LogsBloomFilter other) {
+      for (int i = 0; i < data.size(); ++i) {
+        data.set(i, (byte) ((data.get(i) | other.get(i)) & 0xff));
+      }
+      return this;
+    }
+
+    /**
+     * Insert log.
+     *
+     * @param log the log
+     * @return the builder
+     */
+    public Builder insertLog(final Log log) {
+      insertBytes((Bytes) log.getLogger());
+
+      for (final LogTopic topic : log.getTopics()) {
+        insertBytes(topic);
+      }
+      return this;
+    }
+
+    /**
+     * Insert logs.
+     *
+     * @param logs the logs
+     * @return the builder
+     */
+    public Builder insertLogs(final Collection<Log> logs) {
+      logs.forEach(this::insertLog);
+      return this;
+    }
+
+    /**
+     * Insert bytes.
+     *
+     * @param value the value
+     * @return the builder
+     */
+    public Builder insertBytes(final Bytes value) {
+      setBits(keccak256(value));
+      return this;
+    }
+
+    /**
+     * Build logs bloom filter.
+     *
+     * @return the logs bloom filter
+     */
+    public LogsBloomFilter build() {
+      return new LogsBloomFilter(data);
+    }
+
+    /**
+     * Discover the low order 11-bits, of the first three double-bytes, of the KECCAK256 hash, of
+     * each value and update the bloom filter accordingly.
+     *
+     * @param hashValue The hash of the log item.
+     */
+    private void setBits(final Bytes hashValue) {
+      for (int counter = 0; counter < 6; counter += 2) {
+        final int setBloomBit =
+            ((hashValue.get(counter) & LEAST_SIGNIFICANT_THREE_BITS) << BITS_IN_BYTE)
+                + (hashValue.get(counter + 1) & LEAST_SIGNIFICANT_BYTE);
+        setBit(setBloomBit);
+      }
+    }
+
+    private void setBit(final int index) {
+      final int byteIndex = BYTE_SIZE - 1 - index / 8;
+      final int bitIndex = index % 8;
+      data.set(byteIndex, (byte) (data.get(byteIndex) | (1 << bitIndex)));
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractCallOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractCallOperation.java
new file mode 100644
index 00000000000..529754905aa
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractCallOperation.java
@@ -0,0 +1,278 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.code.CodeV0;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/**
+ * A skeleton class for implementing call operations.
+ *
+ * <p>A call operation creates a child message call from the current message context, allows it to
+ * execute, and then updates the current message context based on its execution.
+ */
+public abstract class AbstractCallOperation extends AbstractOperation {
+
+  /** The constant UNDERFLOW_RESPONSE. */
+  protected static final OperationResult UNDERFLOW_RESPONSE =
+      new OperationResult(0L, ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS);
+
+  /**
+   * Instantiates a new Abstract call operation.
+   *
+   * @param opcode the opcode
+   * @param name the name
+   * @param stackItemsConsumed the stack items consumed
+   * @param stackItemsProduced the stack items produced
+   * @param gasCalculator the gas calculator
+   */
+  AbstractCallOperation(
+      final int opcode,
+      final String name,
+      final int stackItemsConsumed,
+      final int stackItemsProduced,
+      final GasCalculator gasCalculator) {
+    super(opcode, name, stackItemsConsumed, stackItemsProduced, gasCalculator);
+  }
+
+  /**
+   * Returns the additional gas to provide the call operation.
+   *
+   * @param frame The current message frame
+   * @return the additional gas to provide the call operation
+   */
+  protected long gas(final MessageFrame frame) {
+    return clampedToLong(frame.getStackItem(0));
+  }
+
+  /**
+   * Returns the account the call is being made to.
+   *
+   * @param frame The current message frame
+   * @return the account the call is being made to
+   */
+  protected abstract Address to(MessageFrame frame);
+
+  /**
+   * Returns the value being transferred in the call
+   *
+   * @param frame The current message frame
+   * @return the value being transferred in the call
+   */
+  protected abstract Wei value(MessageFrame frame);
+
+  /**
+   * Returns the apparent value being transferred in the call
+   *
+   * @param frame The current message frame
+   * @return the apparent value being transferred in the call
+   */
+  protected abstract Wei apparentValue(MessageFrame frame);
+
+  /**
+   * Returns the memory offset the input data starts at.
+   *
+   * @param frame The current message frame
+   * @return the memory offset the input data starts at
+   */
+  protected abstract long inputDataOffset(MessageFrame frame);
+
+  /**
+   * Returns the length of the input data to read from memory.
+   *
+   * @param frame The current message frame
+   * @return the length of the input data to read from memory.
+   */
+  protected abstract long inputDataLength(MessageFrame frame);
+
+  /**
+   * Returns the memory offset the offset data starts at.
+   *
+   * @param frame The current message frame
+   * @return the memory offset the offset data starts at
+   */
+  protected abstract long outputDataOffset(MessageFrame frame);
+
+  /**
+   * Returns the length of the output data to read from memory.
+   *
+   * @param frame The current message frame
+   * @return the length of the output data to read from memory.
+   */
+  protected abstract long outputDataLength(MessageFrame frame);
+
+  /**
+   * Returns the account address the call operation is being performed on
+   *
+   * @param frame The current message frame
+   * @return the account address the call operation is being performed on
+   */
+  protected abstract Address address(MessageFrame frame);
+
+  /**
+   * Returns the account address the call operation is being sent from
+   *
+   * @param frame The current message frame
+   * @return the account address the call operation is being sent from
+   */
+  protected abstract Address sender(MessageFrame frame);
+
+  /**
+   * Returns the gas available to execute the child message call.
+   *
+   * @param frame The current message frame
+   * @return the gas available to execute the child message call
+   */
+  protected abstract long gasAvailableForChildCall(MessageFrame frame);
+
+  /**
+   * Returns whether the child message call should be static.
+   *
+   * @param frame The current message frame
+   * @return {@code true} if the child message call should be static; otherwise {@code false}
+   */
+  protected abstract boolean isStatic(MessageFrame frame);
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    // manual check because some reads won't come until the "complete" step.
+    if (frame.stackSize() < getStackItemsConsumed()) {
+      return UNDERFLOW_RESPONSE;
+    }
+
+    final long cost = cost(frame);
+    if (frame.getRemainingGas() < cost) {
+      return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+    }
+    frame.decrementRemainingGas(cost);
+
+    frame.clearReturnData();
+
+    final Address to = to(frame);
+    final Account contract = frame.getWorldUpdater().get(to);
+
+    final Account account = frame.getWorldUpdater().get(frame.getRecipientAddress());
+    final Wei balance = account == null ? Wei.ZERO : account.getBalance();
+    // If the call is sending more value than the account has or the message frame is to deep
+    // return a failed call
+    if (value(frame).compareTo(balance) > 0 || frame.getMessageStackDepth() >= 1024) {
+      frame.expandMemory(inputDataOffset(frame), inputDataLength(frame));
+      frame.expandMemory(outputDataOffset(frame), outputDataLength(frame));
+      frame.incrementRemainingGas(gasAvailableForChildCall(frame) + cost);
+      frame.popStackItems(getStackItemsConsumed());
+      frame.pushStackItem(FAILURE_STACK_ITEM);
+      return new OperationResult(cost, null);
+    }
+
+    final Bytes inputData = frame.readMutableMemory(inputDataOffset(frame), inputDataLength(frame));
+
+    final Code code =
+        contract == null
+            ? CodeV0.EMPTY_CODE
+            : evm.getCode(contract.getCodeHash(), contract.getCode());
+
+    if (code.isValid()) {
+      final MessageFrame childFrame =
+          MessageFrame.builder()
+              .type(MessageFrame.Type.MESSAGE_CALL)
+              .messageFrameStack(frame.getMessageFrameStack())
+              .worldUpdater(frame.getWorldUpdater().updater())
+              .initialGas(gasAvailableForChildCall(frame))
+              .address(address(frame))
+              .originator(frame.getOriginatorAddress())
+              .contract(to)
+              .gasPrice(frame.getGasPrice())
+              .inputData(inputData)
+              .sender(sender(frame))
+              .value(value(frame))
+              .apparentValue(apparentValue(frame))
+              .code(code)
+              .blockValues(frame.getBlockValues())
+              .depth(frame.getMessageStackDepth() + 1)
+              .isStatic(isStatic(frame))
+              .completer(child -> complete(frame, child))
+              .miningBeneficiary(frame.getMiningBeneficiary())
+              .blockHashLookup(frame.getBlockHashLookup())
+              .maxStackSize(frame.getMaxStackSize())
+              .build();
+      frame.incrementRemainingGas(cost);
+
+      frame.getMessageFrameStack().addFirst(childFrame);
+      frame.setState(MessageFrame.State.CODE_SUSPENDED);
+      return new OperationResult(cost, null, 0);
+    } else {
+      return new OperationResult(cost, ExceptionalHaltReason.INVALID_CODE, 0);
+    }
+  }
+
+  /**
+   * Calculates Cost.
+   *
+   * @param frame the frame
+   * @return the long
+   */
+  protected abstract long cost(final MessageFrame frame);
+
+  /**
+   * Complete.
+   *
+   * @param frame the frame
+   * @param childFrame the child frame
+   */
+  public void complete(final MessageFrame frame, final MessageFrame childFrame) {
+    frame.setState(MessageFrame.State.CODE_EXECUTING);
+
+    final long outputOffset = outputDataOffset(frame);
+    final long outputSize = outputDataLength(frame);
+    final Bytes outputData = childFrame.getOutputData();
+
+    if (outputSize > outputData.size()) {
+      frame.expandMemory(outputOffset, outputSize);
+      frame.writeMemory(outputOffset, outputData.size(), outputData, true);
+    } else {
+      frame.writeMemory(outputOffset, outputSize, outputData, true);
+    }
+
+    frame.setReturnData(outputData);
+    frame.addLogs(childFrame.getLogs());
+    frame.addSelfDestructs(childFrame.getSelfDestructs());
+    frame.incrementGasRefund(childFrame.getGasRefund());
+
+    final long gasRemaining = childFrame.getRemainingGas();
+    frame.incrementRemainingGas(gasRemaining);
+
+    frame.popStackItems(getStackItemsConsumed());
+    if (childFrame.getState() == MessageFrame.State.COMPLETED_SUCCESS) {
+      frame.mergeWarmedUpFields(childFrame);
+      frame.pushStackItem(SUCCESS_STACK_ITEM);
+    } else {
+      frame.pushStackItem(FAILURE_STACK_ITEM);
+    }
+
+    final int currentPC = frame.getPC();
+    frame.setPC(currentPC + 1);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractCreateOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractCreateOperation.java
new file mode 100644
index 00000000000..5ea9737299f
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractCreateOperation.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.code.CodeFactory;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.Words;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Abstract create operation. */
+public abstract class AbstractCreateOperation extends AbstractOperation {
+
+  /** The constant UNDERFLOW_RESPONSE. */
+  protected static final OperationResult UNDERFLOW_RESPONSE =
+      new OperationResult(0L, ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS);
+
+  /** The maximum init code size */
+  protected int maxInitcodeSize;
+
+  /**
+   * Instantiates a new Abstract create operation.
+   *
+   * @param opcode the opcode
+   * @param name the name
+   * @param stackItemsConsumed the stack items consumed
+   * @param stackItemsProduced the stack items produced
+   * @param gasCalculator the gas calculator
+   * @param maxInitcodeSize Maximum init code size
+   */
+  protected AbstractCreateOperation(
+      final int opcode,
+      final String name,
+      final int stackItemsConsumed,
+      final int stackItemsProduced,
+      final GasCalculator gasCalculator,
+      final int maxInitcodeSize) {
+    super(opcode, name, stackItemsConsumed, stackItemsProduced, gasCalculator);
+    this.maxInitcodeSize = maxInitcodeSize;
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    // manual check because some reads won't come until the "complete" step.
+    if (frame.stackSize() < getStackItemsConsumed()) {
+      return UNDERFLOW_RESPONSE;
+    }
+
+    final long cost = cost(frame);
+    if (frame.isStatic()) {
+      return new OperationResult(cost, ExceptionalHaltReason.ILLEGAL_STATE_CHANGE);
+    } else if (frame.getRemainingGas() < cost) {
+      return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+    }
+    final Wei value = Wei.wrap(frame.getStackItem(0));
+
+    final Address address = frame.getRecipientAddress();
+    final MutableAccount account = frame.getWorldUpdater().getAccount(address).getMutable();
+
+    frame.clearReturnData();
+    final long inputOffset = clampedToLong(frame.getStackItem(1));
+    final long inputSize = clampedToLong(frame.getStackItem(2));
+    if (inputSize > maxInitcodeSize) {
+      frame.popStackItems(getStackItemsConsumed());
+      return new OperationResult(cost, ExceptionalHaltReason.CODE_TOO_LARGE);
+    }
+
+    if (value.compareTo(account.getBalance()) > 0
+        || frame.getMessageStackDepth() >= 1024
+        || account.getNonce() == -1) {
+      fail(frame);
+    } else {
+      account.incrementNonce();
+
+      final Bytes inputData = frame.readMemory(inputOffset, inputSize);
+      // Never cache CREATEx initcode. The amount of reuse is very low, and caching mostly
+      // addresses disk loading delay, and we already have the code.
+      Code code = evm.getCode(null, inputData);
+
+      if (code.isValid() && frame.getCode().getEofVersion() <= code.getEofVersion()) {
+        frame.decrementRemainingGas(cost);
+        spawnChildMessage(frame, code, evm);
+        frame.incrementRemainingGas(cost);
+      } else {
+        fail(frame);
+      }
+    }
+
+    return new OperationResult(cost, null);
+  }
+
+  /**
+   * Cost operation.
+   *
+   * @param frame the frame
+   * @return the long
+   */
+  protected abstract long cost(final MessageFrame frame);
+
+  /**
+   * Target contract address.
+   *
+   * @param frame the frame
+   * @return the address
+   */
+  protected abstract Address targetContractAddress(MessageFrame frame);
+
+  private void fail(final MessageFrame frame) {
+    final long inputOffset = clampedToLong(frame.getStackItem(1));
+    final long inputSize = clampedToLong(frame.getStackItem(2));
+    frame.readMutableMemory(inputOffset, inputSize);
+    frame.popStackItems(getStackItemsConsumed());
+    frame.pushStackItem(FAILURE_STACK_ITEM);
+  }
+
+  private void spawnChildMessage(final MessageFrame frame, final Code code, final EVM evm) {
+    final Wei value = Wei.wrap(frame.getStackItem(0));
+
+    final Address contractAddress = targetContractAddress(frame);
+
+    final long childGasStipend =
+        gasCalculator().gasAvailableForChildCreate(frame.getRemainingGas());
+    frame.decrementRemainingGas(childGasStipend);
+
+    final MessageFrame childFrame =
+        MessageFrame.builder()
+            .type(MessageFrame.Type.CONTRACT_CREATION)
+            .messageFrameStack(frame.getMessageFrameStack())
+            .worldUpdater(frame.getWorldUpdater().updater())
+            .initialGas(childGasStipend)
+            .address(contractAddress)
+            .originator(frame.getOriginatorAddress())
+            .contract(contractAddress)
+            .gasPrice(frame.getGasPrice())
+            .inputData(Bytes.EMPTY)
+            .sender(frame.getRecipientAddress())
+            .value(value)
+            .apparentValue(value)
+            .code(code)
+            .blockValues(frame.getBlockValues())
+            .depth(frame.getMessageStackDepth() + 1)
+            .completer(child -> complete(frame, child, evm))
+            .miningBeneficiary(frame.getMiningBeneficiary())
+            .blockHashLookup(frame.getBlockHashLookup())
+            .maxStackSize(frame.getMaxStackSize())
+            .build();
+
+    frame.getMessageFrameStack().addFirst(childFrame);
+    frame.setState(MessageFrame.State.CODE_SUSPENDED);
+  }
+
+  private void complete(final MessageFrame frame, final MessageFrame childFrame, final EVM evm) {
+    frame.setState(MessageFrame.State.CODE_EXECUTING);
+
+    Code outputCode =
+        CodeFactory.createCode(childFrame.getOutputData(), evm.getMaxEOFVersion(), true);
+    frame.popStackItems(getStackItemsConsumed());
+
+    if (outputCode.isValid()) {
+      frame.incrementRemainingGas(childFrame.getRemainingGas());
+      frame.addLogs(childFrame.getLogs());
+      frame.addSelfDestructs(childFrame.getSelfDestructs());
+      frame.incrementGasRefund(childFrame.getGasRefund());
+
+      if (childFrame.getState() == MessageFrame.State.COMPLETED_SUCCESS) {
+        frame.mergeWarmedUpFields(childFrame);
+        frame.pushStackItem(Words.fromAddress(childFrame.getContractAddress()));
+      } else {
+        frame.setReturnData(childFrame.getOutputData());
+        frame.pushStackItem(FAILURE_STACK_ITEM);
+      }
+    } else {
+      frame.getWorldUpdater().deleteAccount(childFrame.getRecipientAddress());
+      frame.setReturnData(childFrame.getOutputData());
+      frame.pushStackItem(FAILURE_STACK_ITEM);
+    }
+
+    final int currentPC = frame.getPC();
+    frame.setPC(currentPC + 1);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractFixedCostOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractFixedCostOperation.java
new file mode 100644
index 00000000000..afccdb20eb2
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractFixedCostOperation.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.FixedStack.OverflowException;
+import org.hyperledger.besu.evm.internal.FixedStack.UnderflowException;
+
+/** The Abstract fixed cost operation. */
+abstract class AbstractFixedCostOperation extends AbstractOperation {
+
+  /** The Success response. */
+  protected final OperationResult successResponse;
+  /** The Out of gas response. */
+  protected final OperationResult outOfGasResponse;
+
+  private final OperationResult underflowResponse;
+  private final OperationResult overflowResponse;
+  /** The Gas cost. */
+  protected final long gasCost;
+
+  /**
+   * Instantiates a new Abstract fixed cost operation.
+   *
+   * @param opcode the opcode
+   * @param name the name
+   * @param stackItemsConsumed the stack items consumed
+   * @param stackItemsProduced the stack items produced
+   * @param gasCalculator the gas calculator
+   * @param fixedCost the fixed cost
+   */
+  protected AbstractFixedCostOperation(
+      final int opcode,
+      final String name,
+      final int stackItemsConsumed,
+      final int stackItemsProduced,
+      final GasCalculator gasCalculator,
+      final long fixedCost) {
+    super(opcode, name, stackItemsConsumed, stackItemsProduced, gasCalculator);
+    gasCost = fixedCost;
+    successResponse = new OperationResult(gasCost, null);
+    outOfGasResponse = new OperationResult(gasCost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+    underflowResponse =
+        new OperationResult(gasCost, ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS);
+    overflowResponse = new OperationResult(gasCost, ExceptionalHaltReason.TOO_MANY_STACK_ITEMS);
+  }
+
+  @Override
+  public final OperationResult execute(final MessageFrame frame, final EVM evm) {
+    try {
+      if (frame.getRemainingGas() < gasCost) {
+        return outOfGasResponse;
+      } else {
+        return executeFixedCostOperation(frame, evm);
+      }
+    } catch (final UnderflowException ufe) {
+      return underflowResponse;
+    } catch (final OverflowException ofe) {
+      return overflowResponse;
+    }
+  }
+
+  /**
+   * Execute fixed cost operation.
+   *
+   * @param frame the frame
+   * @param evm the evm
+   * @return the operation result
+   */
+  protected abstract OperationResult executeFixedCostOperation(MessageFrame frame, EVM evm);
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractOperation.java
new file mode 100644
index 00000000000..58ebc5b43e0
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/AbstractOperation.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/**
+ * All {@link Operation} implementations should inherit from this class to get the setting of some
+ * members for free.
+ */
+public abstract class AbstractOperation implements Operation {
+
+  static final Bytes BYTES_ONE = Bytes.of(1);
+  static final Bytes SUCCESS_STACK_ITEM = BYTES_ONE;
+  static final Bytes FAILURE_STACK_ITEM = Bytes.EMPTY;
+
+  private final int opcode;
+  private final String name;
+  private final int stackItemsConsumed;
+  private final int stackItemsProduced;
+  private final GasCalculator gasCalculator;
+
+  /**
+   * Instantiates a new Abstract operation.
+   *
+   * @param opcode the opcode
+   * @param name the name
+   * @param stackItemsConsumed the stack items consumed
+   * @param stackItemsProduced the stack items produced
+   * @param gasCalculator the gas calculator
+   */
+  protected AbstractOperation(
+      final int opcode,
+      final String name,
+      final int stackItemsConsumed,
+      final int stackItemsProduced,
+      final GasCalculator gasCalculator) {
+    this.opcode = opcode & 0xff;
+    this.name = name;
+    this.stackItemsConsumed = stackItemsConsumed;
+    this.stackItemsProduced = stackItemsProduced;
+    this.gasCalculator = gasCalculator;
+  }
+
+  /**
+   * Gets Gas calculator.
+   *
+   * @return the gas calculator
+   */
+  protected GasCalculator gasCalculator() {
+    return gasCalculator;
+  }
+
+  @Override
+  public int getOpcode() {
+    return opcode;
+  }
+
+  @Override
+  public String getName() {
+    return name;
+  }
+
+  @Override
+  public int getStackItemsConsumed() {
+    return stackItemsConsumed;
+  }
+
+  @Override
+  public int getStackItemsProduced() {
+    return stackItemsProduced;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/AddModOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/AddModOperation.java
new file mode 100644
index 00000000000..5d3586d7d88
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/AddModOperation.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import java.math.BigInteger;
+import java.util.Arrays;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Add mod operation. */
+public class AddModOperation extends AbstractFixedCostOperation {
+
+  private static final OperationResult addModSuccess = new OperationResult(8, null);
+
+  /**
+   * Instantiates a new Add mod operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public AddModOperation(final GasCalculator gasCalculator) {
+    super(0x08, "ADDMOD", 3, 1, gasCalculator, gasCalculator.getMidTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Static operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+
+    final Bytes value0 = frame.popStackItem();
+    final Bytes value1 = frame.popStackItem();
+    final Bytes value2 = frame.popStackItem();
+
+    if (value2.isZero()) {
+      frame.pushStackItem(FAILURE_STACK_ITEM);
+    } else {
+      BigInteger b0 = new BigInteger(1, value0.toArrayUnsafe());
+      BigInteger b1 = new BigInteger(1, value1.toArrayUnsafe());
+      BigInteger b2 = new BigInteger(1, value2.toArrayUnsafe());
+
+      BigInteger result = b0.add(b1).mod(b2);
+      Bytes resultBytes = Bytes.wrap(result.toByteArray());
+      if (resultBytes.size() > 32) {
+        resultBytes = resultBytes.slice(resultBytes.size() - 32, 32);
+      }
+
+      final byte[] padding = new byte[32 - resultBytes.size()];
+      Arrays.fill(padding, result.signum() < 0 ? (byte) 0xFF : 0x00);
+
+      frame.pushStackItem(Bytes.concatenate(Bytes.wrap(padding), resultBytes));
+    }
+    return addModSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/AddOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/AddOperation.java
new file mode 100644
index 00000000000..fd1f0ffe941
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/AddOperation.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import java.math.BigInteger;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Add operation. */
+public class AddOperation extends AbstractFixedCostOperation {
+
+  /** The Add operation success result. */
+  static final OperationResult addSuccess = new OperationResult(3, null);
+
+  /**
+   * Instantiates a new Add operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public AddOperation(final GasCalculator gasCalculator) {
+    super(0x01, "ADD", 2, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Static operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    final BigInteger value0 = new BigInteger(1, frame.popStackItem().toArrayUnsafe());
+    final BigInteger value1 = new BigInteger(1, frame.popStackItem().toArrayUnsafe());
+
+    final BigInteger result = value0.add(value1);
+
+    byte[] resultArray = result.toByteArray();
+    int length = resultArray.length;
+    if (length > 32) {
+      frame.pushStackItem(Bytes.wrap(resultArray, length - 32, 32));
+    } else {
+      frame.pushStackItem(Bytes.wrap(resultArray));
+    }
+
+    return addSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/AddressOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/AddressOperation.java
new file mode 100644
index 00000000000..6f517639764
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/AddressOperation.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+/** The Address operation. */
+public class AddressOperation extends AbstractFixedCostOperation {
+
+  /**
+   * Instantiates a new Address operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public AddressOperation(final GasCalculator gasCalculator) {
+    super(0x30, "ADDRESS", 0, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    frame.pushStackItem(frame.getRecipientAddress());
+
+    return successResponse;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/AndOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/AndOperation.java
new file mode 100644
index 00000000000..726a2df7d12
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/AndOperation.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The And operation. */
+public class AndOperation extends AbstractFixedCostOperation {
+
+  /** The And operation success result. */
+  static final OperationResult andSuccess = new OperationResult(3, null);
+
+  /**
+   * Instantiates a new And operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public AndOperation(final GasCalculator gasCalculator) {
+    super(0x16, "AND", 2, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Static And operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    final Bytes value0 = frame.popStackItem();
+    final Bytes value1 = frame.popStackItem();
+
+    final Bytes result = value0.and(value1);
+    frame.pushStackItem(result);
+
+    return andSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/BalanceOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/BalanceOperation.java
new file mode 100644
index 00000000000..3b822d4f887
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/BalanceOperation.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.FixedStack.OverflowException;
+import org.hyperledger.besu.evm.internal.FixedStack.UnderflowException;
+import org.hyperledger.besu.evm.internal.Words;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Balance operation. */
+public class BalanceOperation extends AbstractOperation {
+
+  /**
+   * Instantiates a new Balance operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public BalanceOperation(final GasCalculator gasCalculator) {
+    super(0x31, "BALANCE", 1, 1, gasCalculator);
+  }
+
+  /**
+   * Gets Balance operation Gas Cost plus warm storage read cost or cold account access cost.
+   *
+   * @param accountIsWarm true to add warm storage read cost, false to add cold account access cost
+   * @return the long
+   */
+  protected long cost(final boolean accountIsWarm) {
+    return gasCalculator().getBalanceOperationGasCost()
+        + (accountIsWarm
+            ? gasCalculator().getWarmStorageReadCost()
+            : gasCalculator().getColdAccountAccessCost());
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    try {
+      final Address address = Words.toAddress(frame.popStackItem());
+      final boolean accountIsWarm =
+          frame.warmUpAddress(address) || gasCalculator().isPrecompile(address);
+      final long cost = cost(accountIsWarm);
+      if (frame.getRemainingGas() < cost) {
+        return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+      } else {
+        final Account account = frame.getWorldUpdater().get(address);
+        frame.pushStackItem(account == null ? Bytes.EMPTY : account.getBalance());
+        return new OperationResult(cost, null);
+      }
+    } catch (final UnderflowException ufe) {
+      return new OperationResult(cost(true), ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS);
+    } catch (final OverflowException ofe) {
+      return new OperationResult(cost(true), ExceptionalHaltReason.TOO_MANY_STACK_ITEMS);
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/BaseFeeOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/BaseFeeOperation.java
new file mode 100644
index 00000000000..e65f7f139c4
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/BaseFeeOperation.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import java.util.Optional;
+
+/** The Base fee operation. */
+public class BaseFeeOperation extends AbstractFixedCostOperation {
+
+  /**
+   * Instantiates a new Base fee operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public BaseFeeOperation(final GasCalculator gasCalculator) {
+    super(0x48, "BASEFEE", 0, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    final Optional<Wei> maybeBaseFee = frame.getBlockValues().getBaseFee();
+    if (maybeBaseFee.isEmpty()) {
+      return new Operation.OperationResult(gasCost, ExceptionalHaltReason.INVALID_OPERATION);
+    }
+    frame.pushStackItem(maybeBaseFee.orElseThrow());
+    return successResponse;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/BlockHashOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/BlockHashOperation.java
new file mode 100644
index 00000000000..a9bb5c08363
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/BlockHashOperation.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.BlockValues;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import java.util.function.Function;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** The Block hash operation. */
+public class BlockHashOperation extends AbstractFixedCostOperation {
+
+  private static final int MAX_RELATIVE_BLOCK = 255;
+
+  /**
+   * Instantiates a new Block hash operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public BlockHashOperation(final GasCalculator gasCalculator) {
+    super(0x40, "BLOCKHASH", 1, 1, gasCalculator, gasCalculator.getBlockHashOperationGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    final Bytes blockArg = frame.popStackItem().trimLeadingZeros();
+
+    // Short-circuit if value is unreasonably large
+    if (blockArg.size() > 8) {
+      frame.pushStackItem(UInt256.ZERO);
+      return successResponse;
+    }
+
+    final long soughtBlock = blockArg.toLong();
+    final BlockValues blockValues = frame.getBlockValues();
+    final long currentBlockNumber = blockValues.getNumber();
+    final long mostRecentBlockNumber = currentBlockNumber - 1;
+
+    // If the current block is the genesis block or the sought block is
+    // not within the last 256 completed blocks, zero is returned.
+    if (currentBlockNumber == 0
+        || soughtBlock < (mostRecentBlockNumber - MAX_RELATIVE_BLOCK)
+        || soughtBlock > mostRecentBlockNumber) {
+      frame.pushStackItem(Bytes32.ZERO);
+    } else {
+      final Function<Long, Hash> blockHashLookup = frame.getBlockHashLookup();
+      final Hash blockHash = blockHashLookup.apply(soughtBlock);
+      frame.pushStackItem(blockHash);
+    }
+
+    return successResponse;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/ByteOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/ByteOperation.java
new file mode 100644
index 00000000000..d8f67570a10
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/ByteOperation.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Byte operation. */
+public class ByteOperation extends AbstractFixedCostOperation {
+
+  /** The Byte operation success result. */
+  static final OperationResult byteSuccess = new OperationResult(3, null);
+
+  /**
+   * Instantiates a new Byte operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public ByteOperation(final GasCalculator gasCalculator) {
+    super(0x1A, "BYTE", 2, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
+  }
+
+  private static Bytes getByte(final Bytes seq, final Bytes offset) {
+    Bytes trimmedOffset = offset.trimLeadingZeros();
+    if (trimmedOffset.size() > 1) {
+      return Bytes.EMPTY;
+    }
+    final int index = trimmedOffset.toInt();
+
+    int size = seq.size();
+    int pos = index - 32 + size;
+    if (pos >= size || pos < 0) {
+      return Bytes.EMPTY;
+    } else {
+      final byte b = seq.get(pos);
+      return Bytes.of(b);
+    }
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Static Byte operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    final Bytes value0 = frame.popStackItem();
+    final Bytes value1 = frame.popStackItem();
+
+    // Stack items are reversed for the BYTE operation.
+    final Bytes result = getByte(value1, value0);
+
+    frame.pushStackItem(result);
+
+    return byteSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/CallCodeOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/CallCodeOperation.java
new file mode 100644
index 00000000000..d2c78a2f500
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/CallCodeOperation.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.Words;
+
+/** The Call code operation. */
+public class CallCodeOperation extends AbstractCallOperation {
+
+  /**
+   * Instantiates a new Call code operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public CallCodeOperation(final GasCalculator gasCalculator) {
+    super(0xF2, "CALLCODE", 7, 1, gasCalculator);
+  }
+
+  @Override
+  protected Address to(final MessageFrame frame) {
+    return Words.toAddress(frame.getStackItem(1));
+  }
+
+  @Override
+  protected Wei value(final MessageFrame frame) {
+    return Wei.wrap(frame.getStackItem(2));
+  }
+
+  @Override
+  protected Wei apparentValue(final MessageFrame frame) {
+    return value(frame);
+  }
+
+  @Override
+  protected long inputDataOffset(final MessageFrame frame) {
+    return clampedToLong(frame.getStackItem(3));
+  }
+
+  @Override
+  protected long inputDataLength(final MessageFrame frame) {
+    return clampedToLong(frame.getStackItem(4));
+  }
+
+  @Override
+  protected long outputDataOffset(final MessageFrame frame) {
+    return clampedToLong(frame.getStackItem(5));
+  }
+
+  @Override
+  protected long outputDataLength(final MessageFrame frame) {
+    return clampedToLong(frame.getStackItem(6));
+  }
+
+  @Override
+  protected Address address(final MessageFrame frame) {
+    return frame.getRecipientAddress();
+  }
+
+  @Override
+  protected Address sender(final MessageFrame frame) {
+    return frame.getRecipientAddress();
+  }
+
+  @Override
+  public long gasAvailableForChildCall(final MessageFrame frame) {
+    return gasCalculator().gasAvailableForChildCall(frame, gas(frame), !value(frame).isZero());
+  }
+
+  @Override
+  protected boolean isStatic(final MessageFrame frame) {
+    return frame.isStatic();
+  }
+
+  @Override
+  public long cost(final MessageFrame frame) {
+    final long stipend = gas(frame);
+    final long inputDataOffset = inputDataOffset(frame);
+    final long inputDataLength = inputDataLength(frame);
+    final long outputDataOffset = outputDataOffset(frame);
+    final long outputDataLength = outputDataLength(frame);
+    final Account recipient = frame.getWorldUpdater().get(address(frame));
+
+    return gasCalculator()
+        .callOperationGasCost(
+            frame,
+            stipend,
+            inputDataOffset,
+            inputDataLength,
+            outputDataOffset,
+            outputDataLength,
+            value(frame),
+            recipient,
+            to(frame));
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/CallDataCopyOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/CallDataCopyOperation.java
new file mode 100644
index 00000000000..3cdbd4f4b5c
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/CallDataCopyOperation.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Call data copy operation. */
+public class CallDataCopyOperation extends AbstractOperation {
+
+  /**
+   * Instantiates a new Call data copy operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public CallDataCopyOperation(final GasCalculator gasCalculator) {
+    super(0x37, "CALLDATACOPY", 3, 0, gasCalculator);
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    final long memOffset = clampedToLong(frame.popStackItem());
+    final long sourceOffset = clampedToLong(frame.popStackItem());
+    final long numBytes = clampedToLong(frame.popStackItem());
+
+    final long cost = gasCalculator().dataCopyOperationGasCost(frame, memOffset, numBytes);
+    if (frame.getRemainingGas() < cost) {
+      return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+    }
+
+    final Bytes callData = frame.getInputData();
+
+    frame.writeMemory(memOffset, sourceOffset, numBytes, callData, true);
+
+    return new OperationResult(cost, null);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/CallDataLoadOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/CallDataLoadOperation.java
new file mode 100644
index 00000000000..f3c63db1fc3
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/CallDataLoadOperation.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.bytes.MutableBytes32;
+
+/** The Call data load operation. */
+public class CallDataLoadOperation extends AbstractFixedCostOperation {
+
+  /**
+   * Instantiates a new Call data load operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public CallDataLoadOperation(final GasCalculator gasCalculator) {
+    super(0x35, "CALLDATALOAD", 1, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    final Bytes startWord = frame.popStackItem().trimLeadingZeros();
+
+    // If the start index doesn't fit in an int, it comes after anything in data, and so the
+    // returned
+    // word should be zero.
+    if (startWord.size() > 4) {
+      frame.pushStackItem(Bytes.EMPTY);
+      return successResponse;
+    }
+
+    final int offset = startWord.toInt();
+    if (offset < 0) {
+      frame.pushStackItem(Bytes.EMPTY);
+      return successResponse;
+    }
+    final Bytes data = frame.getInputData();
+    final MutableBytes32 res = MutableBytes32.create();
+    if (offset < data.size()) {
+      final Bytes toCopy = data.slice(offset, Math.min(Bytes32.SIZE, data.size() - offset));
+      toCopy.copyTo(res, 0);
+      frame.pushStackItem(res.copy());
+    } else {
+      frame.pushStackItem(Bytes.EMPTY);
+    }
+
+    return successResponse;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/CallDataSizeOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/CallDataSizeOperation.java
new file mode 100644
index 00000000000..49f8693279b
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/CallDataSizeOperation.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.Words;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Call data size operation. */
+public class CallDataSizeOperation extends AbstractFixedCostOperation {
+
+  /**
+   * Instantiates a new Call data size operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public CallDataSizeOperation(final GasCalculator gasCalculator) {
+    super(0x36, "CALLDATASIZE", 0, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    final Bytes callData = frame.getInputData();
+    frame.pushStackItem(Words.intBytes(callData.size()));
+
+    return successResponse;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/CallFOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/CallFOperation.java
new file mode 100644
index 00000000000..998d8a2e923
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/CallFOperation.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.hyperledger.besu.evm.internal.Words.readBigEndianU16;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+/** The Call F operation. */
+public class CallFOperation extends AbstractOperation {
+
+  /** The constant OPCODE. */
+  public static final int OPCODE = 0xe3;
+  /** The Call F success. */
+  static final OperationResult callfSuccess = new OperationResult(5, null);
+
+  /**
+   * Instantiates a new Call F operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public CallFOperation(final GasCalculator gasCalculator) {
+    super(OPCODE, "CALLF", 0, 0, gasCalculator);
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    final byte[] code = frame.getCode().getBytes().toArrayUnsafe();
+    return staticOperation(frame, code, frame.getPC());
+  }
+
+  /**
+   * Performs Call F operation.
+   *
+   * @param frame the frame
+   * @param code the code
+   * @param pc the pc
+   * @return the successful operation result
+   */
+  public static OperationResult staticOperation(
+      final MessageFrame frame, final byte[] code, final int pc) {
+    int section = readBigEndianU16(pc + 1, code);
+    var exception = frame.callFunction(section);
+    if (exception == null) {
+      return callfSuccess;
+    } else {
+      return new OperationResult(callfSuccess.gasCost, exception);
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/CallOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/CallOperation.java
new file mode 100644
index 00000000000..d6b7ddfd22a
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/CallOperation.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.Words;
+
+/** The Call operation. */
+public class CallOperation extends AbstractCallOperation {
+
+  /**
+   * Instantiates a new Call operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public CallOperation(final GasCalculator gasCalculator) {
+    super(0xF1, "CALL", 7, 1, gasCalculator);
+  }
+
+  @Override
+  protected Address to(final MessageFrame frame) {
+    return Words.toAddress(frame.getStackItem(1));
+  }
+
+  @Override
+  protected Wei value(final MessageFrame frame) {
+    return Wei.wrap(frame.getStackItem(2));
+  }
+
+  @Override
+  protected Wei apparentValue(final MessageFrame frame) {
+    return value(frame);
+  }
+
+  @Override
+  protected long inputDataOffset(final MessageFrame frame) {
+    return clampedToLong(frame.getStackItem(3));
+  }
+
+  @Override
+  protected long inputDataLength(final MessageFrame frame) {
+    return clampedToLong(frame.getStackItem(4));
+  }
+
+  @Override
+  protected long outputDataOffset(final MessageFrame frame) {
+    return clampedToLong(frame.getStackItem(5));
+  }
+
+  @Override
+  protected long outputDataLength(final MessageFrame frame) {
+    return clampedToLong(frame.getStackItem(6));
+  }
+
+  @Override
+  protected Address address(final MessageFrame frame) {
+    return to(frame);
+  }
+
+  @Override
+  protected Address sender(final MessageFrame frame) {
+    return frame.getRecipientAddress();
+  }
+
+  @Override
+  public long gasAvailableForChildCall(final MessageFrame frame) {
+    return gasCalculator().gasAvailableForChildCall(frame, gas(frame), !value(frame).isZero());
+  }
+
+  @Override
+  protected boolean isStatic(final MessageFrame frame) {
+    return frame.isStatic();
+  }
+
+  @Override
+  public long cost(final MessageFrame frame) {
+    final long stipend = gas(frame);
+    final long inputDataOffset = inputDataOffset(frame);
+    final long inputDataLength = inputDataLength(frame);
+    final long outputDataOffset = outputDataOffset(frame);
+    final long outputDataLength = outputDataLength(frame);
+    final Account recipient = frame.getWorldUpdater().get(address(frame));
+
+    return gasCalculator()
+        .callOperationGasCost(
+            frame,
+            stipend,
+            inputDataOffset,
+            inputDataLength,
+            outputDataOffset,
+            outputDataLength,
+            value(frame),
+            recipient,
+            to(frame));
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    if (frame.isStatic() && !value(frame).isZero()) {
+      return new OperationResult(cost(frame), ExceptionalHaltReason.ILLEGAL_STATE_CHANGE);
+    } else {
+      return super.execute(frame, evm);
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/CallValueOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/CallValueOperation.java
new file mode 100644
index 00000000000..0cde3d8336a
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/CallValueOperation.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+/** The Call value operation. */
+public class CallValueOperation extends AbstractFixedCostOperation {
+
+  /**
+   * Instantiates a new Call value operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public CallValueOperation(final GasCalculator gasCalculator) {
+    super(0x34, "CALLVALUE", 0, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    final Wei value = frame.getApparentValue();
+    frame.pushStackItem(value.toBytes());
+
+    return successResponse;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/CallerOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/CallerOperation.java
new file mode 100644
index 00000000000..384a980ad1b
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/CallerOperation.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+/** The Caller operation. */
+public class CallerOperation extends AbstractFixedCostOperation {
+
+  /**
+   * Instantiates a new Caller operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public CallerOperation(final GasCalculator gasCalculator) {
+    super(0x33, "CALLER", 0, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    frame.pushStackItem(frame.getSenderAddress());
+
+    return successResponse;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/ChainIdOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/ChainIdOperation.java
new file mode 100644
index 00000000000..66918298fa9
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/ChainIdOperation.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes32;
+
+/** The Chain id operation. */
+public class ChainIdOperation extends AbstractFixedCostOperation {
+
+  private final Bytes32 chainId;
+
+  /**
+   * Instantiates a new Chain id operation.
+   *
+   * @param gasCalculator the gas calculator
+   * @param chainId the chain id
+   */
+  public ChainIdOperation(final GasCalculator gasCalculator, final Bytes32 chainId) {
+    super(0x46, "CHAINID", 0, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
+    this.chainId = chainId;
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    frame.pushStackItem(chainId);
+
+    return successResponse;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/CodeCopyOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/CodeCopyOperation.java
new file mode 100644
index 00000000000..f135880c2f4
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/CodeCopyOperation.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+/** The Code copy operation. */
+public class CodeCopyOperation extends AbstractOperation {
+
+  /**
+   * Instantiates a new Code copy operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public CodeCopyOperation(final GasCalculator gasCalculator) {
+    super(0x39, "CODECOPY", 3, 0, gasCalculator);
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    final long memOffset = clampedToLong(frame.popStackItem());
+    final long sourceOffset = clampedToLong(frame.popStackItem());
+    final long numBytes = clampedToLong(frame.popStackItem());
+
+    final long cost = gasCalculator().dataCopyOperationGasCost(frame, memOffset, numBytes);
+    if (frame.getRemainingGas() < cost) {
+      return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+    }
+
+    final Code code = frame.getCode();
+
+    frame.writeMemory(memOffset, sourceOffset, numBytes, code.getBytes(), true);
+
+    return new OperationResult(cost, null);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/CodeSizeOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/CodeSizeOperation.java
new file mode 100644
index 00000000000..690b5692f88
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/CodeSizeOperation.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.Words;
+
+/** The Code size operation. */
+public class CodeSizeOperation extends AbstractFixedCostOperation {
+
+  /**
+   * Instantiates a new Code size operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public CodeSizeOperation(final GasCalculator gasCalculator) {
+    super(0x38, "CODESIZE", 0, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    final Code code = frame.getCode();
+    frame.pushStackItem(Words.intBytes(code.getSize()));
+
+    return successResponse;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/CoinbaseOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/CoinbaseOperation.java
new file mode 100644
index 00000000000..0e596e46f93
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/CoinbaseOperation.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+/** The Coinbase operation. */
+public class CoinbaseOperation extends AbstractFixedCostOperation {
+
+  /**
+   * Instantiates a new Coinbase operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public CoinbaseOperation(final GasCalculator gasCalculator) {
+    super(0x41, "COINBASE", 0, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    final Address coinbase = frame.getMiningBeneficiary();
+    frame.pushStackItem(coinbase);
+
+    return successResponse;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/Create2Operation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/Create2Operation.java
new file mode 100644
index 00000000000..8d4fd36250f
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/Create2Operation.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.hyperledger.besu.crypto.Hash.keccak256;
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+/** The Create2 operation. */
+public class Create2Operation extends AbstractCreateOperation {
+
+  private static final Bytes PREFIX = Bytes.fromHexString("0xFF");
+
+  /**
+   * Instantiates a new Create2 operation.
+   *
+   * @param gasCalculator the gas calculator
+   * @param maxInitcodeSize Maximum init code size
+   */
+  public Create2Operation(final GasCalculator gasCalculator, final int maxInitcodeSize) {
+    super(0xF5, "CREATE2", 4, 1, gasCalculator, maxInitcodeSize);
+  }
+
+  @Override
+  public Address targetContractAddress(final MessageFrame frame) {
+    final Address sender = frame.getRecipientAddress();
+    final long offset = clampedToLong(frame.getStackItem(1));
+    final long length = clampedToLong(frame.getStackItem(2));
+    final Bytes32 salt = Bytes32.leftPad(frame.getStackItem(3));
+    final Bytes initCode = frame.readMutableMemory(offset, length);
+    final Bytes32 hash = keccak256(Bytes.concatenate(PREFIX, sender, salt, keccak256(initCode)));
+    final Address address = Address.extract(hash);
+    frame.warmUpAddress(address);
+    return address;
+  }
+
+  @Override
+  public long cost(final MessageFrame frame) {
+    return gasCalculator().create2OperationGasCost(frame);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/CreateOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/CreateOperation.java
new file mode 100644
index 00000000000..d5d311e337c
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/CreateOperation.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+/** The Create operation. */
+public class CreateOperation extends AbstractCreateOperation {
+
+  /**
+   * Instantiates a new Create operation.
+   *
+   * @param gasCalculator the gas calculator
+   * @param maxInitcodeSize Maximum init code size
+   */
+  public CreateOperation(final GasCalculator gasCalculator, final int maxInitcodeSize) {
+    super(0xF0, "CREATE", 3, 1, gasCalculator, maxInitcodeSize);
+  }
+
+  @Override
+  public long cost(final MessageFrame frame) {
+    return gasCalculator().createOperationGasCost(frame);
+  }
+
+  @Override
+  protected Address targetContractAddress(final MessageFrame frame) {
+    final Account sender = frame.getWorldUpdater().get(frame.getRecipientAddress());
+    // Decrement nonce by 1 to normalize the effect of transaction execution
+    final Address address =
+        Address.contractAddress(frame.getRecipientAddress(), sender.getNonce() - 1L);
+    frame.warmUpAddress(address);
+    return address;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/DataHashOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/DataHashOperation.java
new file mode 100644
index 00000000000..eda3f5dfd4e
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/DataHashOperation.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/**
+ * The DataHash operation. https://eips.ethereum.org/EIPS/eip-4844
+ *
+ * <p>Reads index from the top of the stack as big-endian uint256, and replaces it on the stack with
+ * tx.message.blob_versioned_hashes[index] if index &lt; len(tx.message.blob_versioned_hashes), and
+ * otherwise with a zeroed bytes32 value.
+ */
+public class DataHashOperation extends AbstractOperation {
+
+  /** DATAHASH opcode number */
+  public static final int OPCODE = 0x49;
+
+  /**
+   * Instantiates a new DataHash operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public DataHashOperation(final GasCalculator gasCalculator) {
+    super(OPCODE, "DATAHASH", 1, 1, gasCalculator);
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    int blobIndex = frame.popStackItem().toInt();
+    final Optional<List<Hash>> maybeHashes = frame.getVersionedHashes();
+    if (frame.getVersionedHashes().isPresent()) {
+      List<Hash> versionedHashes = maybeHashes.get();
+      if (blobIndex < versionedHashes.size()) {
+        Hash requested = versionedHashes.get(blobIndex);
+        frame.pushStackItem(requested);
+      } else {
+        frame.pushStackItem(Bytes.EMPTY);
+      }
+    } else {
+      frame.pushStackItem(Bytes.EMPTY);
+    }
+    return new OperationResult(3, null);
+  }
+
+  @Override
+  public boolean isVirtualOperation() {
+    return super.isVirtualOperation();
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/DelegateCallOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/DelegateCallOperation.java
new file mode 100644
index 00000000000..464495a15dd
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/DelegateCallOperation.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.Words;
+
+/** The Delegate call operation. */
+public class DelegateCallOperation extends AbstractCallOperation {
+
+  /**
+   * Instantiates a new Delegate call operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public DelegateCallOperation(final GasCalculator gasCalculator) {
+    super(0xF4, "DELEGATECALL", 6, 1, gasCalculator);
+  }
+
+  @Override
+  protected Address to(final MessageFrame frame) {
+    return Words.toAddress(frame.getStackItem(1));
+  }
+
+  @Override
+  protected Wei value(final MessageFrame frame) {
+    return Wei.ZERO;
+  }
+
+  @Override
+  protected Wei apparentValue(final MessageFrame frame) {
+    return frame.getApparentValue();
+  }
+
+  @Override
+  protected long inputDataOffset(final MessageFrame frame) {
+    return clampedToLong(frame.getStackItem(2));
+  }
+
+  @Override
+  protected long inputDataLength(final MessageFrame frame) {
+    return clampedToLong(frame.getStackItem(3));
+  }
+
+  @Override
+  protected long outputDataOffset(final MessageFrame frame) {
+    return clampedToLong(frame.getStackItem(4));
+  }
+
+  @Override
+  protected long outputDataLength(final MessageFrame frame) {
+    return clampedToLong(frame.getStackItem(5));
+  }
+
+  @Override
+  protected Address address(final MessageFrame frame) {
+    return frame.getRecipientAddress();
+  }
+
+  @Override
+  protected Address sender(final MessageFrame frame) {
+    return frame.getSenderAddress();
+  }
+
+  @Override
+  public long gasAvailableForChildCall(final MessageFrame frame) {
+    return gasCalculator().gasAvailableForChildCall(frame, gas(frame), false);
+  }
+
+  @Override
+  protected boolean isStatic(final MessageFrame frame) {
+    return frame.isStatic();
+  }
+
+  @Override
+  public long cost(final MessageFrame frame) {
+    final long stipend = gas(frame);
+    final long inputDataOffset = inputDataOffset(frame);
+    final long inputDataLength = inputDataLength(frame);
+    final long outputDataOffset = outputDataOffset(frame);
+    final long outputDataLength = outputDataLength(frame);
+    final Account recipient = frame.getWorldUpdater().get(address(frame));
+
+    return gasCalculator()
+        .callOperationGasCost(
+            frame,
+            stipend,
+            inputDataOffset,
+            inputDataLength,
+            outputDataOffset,
+            outputDataLength,
+            Wei.ZERO,
+            recipient,
+            to(frame));
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/DifficultyOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/DifficultyOperation.java
new file mode 100644
index 00000000000..c6ecfc8c0e0
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/DifficultyOperation.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+/** The Difficulty operation. */
+public class DifficultyOperation extends AbstractFixedCostOperation {
+
+  /**
+   * Instantiates a new Difficulty operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public DifficultyOperation(final GasCalculator gasCalculator) {
+    super(0x44, "DIFFICULTY", 0, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    frame.pushStackItem(frame.getBlockValues().getDifficultyBytes());
+    return successResponse;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/DivOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/DivOperation.java
new file mode 100644
index 00000000000..41db7e17a6f
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/DivOperation.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import java.math.BigInteger;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Div operation. */
+public class DivOperation extends AbstractFixedCostOperation {
+
+  /** The Div success. */
+  static final OperationResult divSuccess = new OperationResult(5, null);
+
+  /**
+   * Instantiates a new Div operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public DivOperation(final GasCalculator gasCalculator) {
+    super(0x04, "DIV", 2, 1, gasCalculator, gasCalculator.getLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs Div operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+
+    final Bytes value0 = frame.popStackItem();
+    final Bytes value1 = frame.popStackItem();
+
+    if (value1.isZero()) {
+      frame.pushStackItem(Bytes.EMPTY);
+    } else {
+      BigInteger b1 = new BigInteger(1, value0.toArrayUnsafe());
+      BigInteger b2 = new BigInteger(1, value1.toArrayUnsafe());
+      final BigInteger result = b1.divide(b2);
+
+      // because it's unsigned there is a change a 33 byte result will occur
+      // there is no toByteArrayUnsigned so we have to check and trim
+      byte[] resultArray = result.toByteArray();
+      int length = resultArray.length;
+      if (length > 32) {
+        frame.pushStackItem(Bytes.wrap(resultArray, length - 32, 32));
+      } else {
+        frame.pushStackItem(Bytes.wrap(resultArray));
+      }
+    }
+
+    return divSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/DupOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/DupOperation.java
new file mode 100644
index 00000000000..be5eec56677
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/DupOperation.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+/** The Dup operation. */
+public class DupOperation extends AbstractFixedCostOperation {
+
+  /** The constant DUP_BASE. */
+  public static final int DUP_BASE = 0x7F;
+  /** The Dup success operation result. */
+  static final OperationResult dupSuccess = new OperationResult(3, null);
+  /** The Underflow response. */
+  protected final Operation.OperationResult underflowResponse;
+
+  private final int index;
+
+  /**
+   * Instantiates a new Dup operation.
+   *
+   * @param index the index
+   * @param gasCalculator the gas calculator
+   */
+  public DupOperation(final int index, final GasCalculator gasCalculator) {
+    super(
+        0x80 + index - 1,
+        "DUP" + index,
+        index,
+        index + 1,
+        gasCalculator,
+        gasCalculator.getVeryLowTierGasCost());
+    this.index = index;
+    this.underflowResponse =
+        new Operation.OperationResult(gasCost, ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS);
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame, index);
+  }
+
+  /**
+   * Performs Dup operation.
+   *
+   * @param frame the frame
+   * @param index the index
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame, final int index) {
+    frame.pushStackItem(frame.getStackItem(index - 1));
+
+    return dupSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/EqOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/EqOperation.java
new file mode 100644
index 00000000000..4968a002716
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/EqOperation.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** The Eq operation. */
+public class EqOperation extends AbstractFixedCostOperation {
+
+  /** The Eq operation success result. */
+  static final OperationResult eqSuccess = new OperationResult(3, null);
+
+  /**
+   * Instantiates a new Eq operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public EqOperation(final GasCalculator gasCalculator) {
+    super(0x14, "EQ", 2, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs Eq operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    final Bytes value0 = frame.popStackItem().trimLeadingZeros();
+    final Bytes value1 = frame.popStackItem().trimLeadingZeros();
+
+    final Bytes result = (value0.equals(value1) ? UInt256.ONE : UInt256.ZERO);
+
+    frame.pushStackItem(result);
+
+    return eqSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/ExpOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/ExpOperation.java
new file mode 100644
index 00000000000..0d0592b2d54
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/ExpOperation.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import java.math.BigInteger;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Exp operation. */
+public class ExpOperation extends AbstractOperation {
+
+  static final BigInteger MOD_BASE = BigInteger.TWO.pow(256);
+
+  /**
+   * Instantiates a new Exp operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public ExpOperation(final GasCalculator gasCalculator) {
+    super(0x0A, "EXP", 2, 1, gasCalculator);
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame, gasCalculator());
+  }
+
+  /**
+   * Performs exp operation.
+   *
+   * @param frame the frame
+   * @param gasCalculator the gas calculator
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(
+      final MessageFrame frame, final GasCalculator gasCalculator) {
+    final Bytes number = frame.popStackItem();
+    final Bytes power = frame.popStackItem();
+
+    final int numBytes = (power.bitLength() + 7) / 8;
+
+    final long cost = gasCalculator.expOperationGasCost(numBytes);
+    if (frame.getRemainingGas() < cost) {
+      return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+    }
+
+    byte[] numberBytes = number.toArrayUnsafe();
+    BigInteger numBI = numberBytes.length > 0 ? new BigInteger(1, numberBytes) : BigInteger.ZERO;
+    byte[] powBytes = power.toArrayUnsafe();
+    BigInteger powBI = powBytes.length > 0 ? new BigInteger(1, powBytes) : BigInteger.ZERO;
+
+    final BigInteger result = numBI.modPow(powBI, MOD_BASE);
+
+    byte[] resultArray = result.toByteArray();
+    int length = resultArray.length;
+    if (length > 32) {
+      frame.pushStackItem(Bytes.wrap(resultArray, length - 32, 32));
+    } else {
+      frame.pushStackItem(Bytes.wrap(resultArray));
+    }
+    return new OperationResult(cost, null);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeCopyOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeCopyOperation.java
new file mode 100644
index 00000000000..7801b6d7d37
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeCopyOperation.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.hyperledger.besu.evm.internal.Words.clampedAdd;
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.Words;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Ext code copy operation. */
+public class ExtCodeCopyOperation extends AbstractOperation {
+
+  /**
+   * Instantiates a new Ext code copy operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public ExtCodeCopyOperation(final GasCalculator gasCalculator) {
+    super(0x3C, "EXTCODECOPY", 4, 0, gasCalculator);
+  }
+
+  /**
+   * Cost of Ext Code Copy operation.
+   *
+   * @param frame the frame
+   * @param memOffset the mem offset
+   * @param length the length
+   * @param accountIsWarm the account is warm
+   * @return the long
+   */
+  protected long cost(
+      final MessageFrame frame,
+      final long memOffset,
+      final long length,
+      final boolean accountIsWarm) {
+    return clampedAdd(
+        gasCalculator().extCodeCopyOperationGasCost(frame, memOffset, length),
+        accountIsWarm
+            ? gasCalculator().getWarmStorageReadCost()
+            : gasCalculator().getColdAccountAccessCost());
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    final Address address = Words.toAddress(frame.popStackItem());
+    final long memOffset = clampedToLong(frame.popStackItem());
+    final long sourceOffset = clampedToLong(frame.popStackItem());
+    final long numBytes = clampedToLong(frame.popStackItem());
+
+    final boolean accountIsWarm =
+        frame.warmUpAddress(address) || gasCalculator().isPrecompile(address);
+    final long cost = cost(frame, memOffset, numBytes, accountIsWarm);
+
+    if (frame.getRemainingGas() < cost) {
+      return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+    }
+
+    final Account account = frame.getWorldUpdater().get(address);
+    final Bytes code = account != null ? account.getCode() : Bytes.EMPTY;
+
+    frame.writeMemory(memOffset, sourceOffset, numBytes, code);
+    return new OperationResult(cost, null);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeHashOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeHashOperation.java
new file mode 100644
index 00000000000..5ab9216903f
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeHashOperation.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.FixedStack.OverflowException;
+import org.hyperledger.besu.evm.internal.FixedStack.UnderflowException;
+import org.hyperledger.besu.evm.internal.Words;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Ext code hash operation. */
+public class ExtCodeHashOperation extends AbstractOperation {
+
+  /**
+   * Instantiates a new Ext code hash operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public ExtCodeHashOperation(final GasCalculator gasCalculator) {
+    super(0x3F, "EXTCODEHASH", 1, 1, gasCalculator);
+  }
+
+  /**
+   * Cost of Ext code hash operation.
+   *
+   * @param accountIsWarm the account is warm
+   * @return the long
+   */
+  protected long cost(final boolean accountIsWarm) {
+    return gasCalculator().extCodeHashOperationGasCost()
+        + (accountIsWarm
+            ? gasCalculator().getWarmStorageReadCost()
+            : gasCalculator().getColdAccountAccessCost());
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    try {
+      final Address address = Words.toAddress(frame.popStackItem());
+      final boolean accountIsWarm =
+          frame.warmUpAddress(address) || gasCalculator().isPrecompile(address);
+      final long cost = cost(accountIsWarm);
+      if (frame.getRemainingGas() < cost) {
+        return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+      } else {
+        final Account account = frame.getWorldUpdater().get(address);
+        if (account == null || account.isEmpty()) {
+          frame.pushStackItem(Bytes.EMPTY);
+        } else {
+          frame.pushStackItem(account.getCodeHash());
+        }
+        return new OperationResult(cost, null);
+      }
+    } catch (final UnderflowException ufe) {
+      return new OperationResult(cost(true), ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS);
+    } catch (final OverflowException ofe) {
+      return new OperationResult(cost(true), ExceptionalHaltReason.TOO_MANY_STACK_ITEMS);
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeSizeOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeSizeOperation.java
new file mode 100644
index 00000000000..6ab0f799dc7
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/ExtCodeSizeOperation.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.FixedStack.OverflowException;
+import org.hyperledger.besu.evm.internal.FixedStack.UnderflowException;
+import org.hyperledger.besu.evm.internal.Words;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Ext code size operation. */
+public class ExtCodeSizeOperation extends AbstractOperation {
+
+  /**
+   * Instantiates a new Ext code size operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public ExtCodeSizeOperation(final GasCalculator gasCalculator) {
+    super(0x3B, "EXTCODESIZE", 1, 1, gasCalculator);
+  }
+
+  /**
+   * Cost of Ext code size operation.
+   *
+   * @param accountIsWarm the account is warm
+   * @return the long
+   */
+  protected long cost(final boolean accountIsWarm) {
+    return gasCalculator().getExtCodeSizeOperationGasCost()
+        + (accountIsWarm
+            ? gasCalculator().getWarmStorageReadCost()
+            : gasCalculator().getColdAccountAccessCost());
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    try {
+      final Address address = Words.toAddress(frame.popStackItem());
+      final boolean accountIsWarm =
+          frame.warmUpAddress(address) || gasCalculator().isPrecompile(address);
+      final long cost = cost(accountIsWarm);
+      if (frame.getRemainingGas() < cost) {
+        return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+      } else {
+        final Account account = frame.getWorldUpdater().get(address);
+        frame.pushStackItem(
+            account == null ? Bytes.EMPTY : Words.intBytes(account.getCode().size()));
+        return new OperationResult(cost, null);
+      }
+    } catch (final UnderflowException ufe) {
+      return new OperationResult(cost(true), ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS);
+    } catch (final OverflowException ofe) {
+      return new OperationResult(cost(true), ExceptionalHaltReason.TOO_MANY_STACK_ITEMS);
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/GasLimitOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/GasLimitOperation.java
new file mode 100644
index 00000000000..a65900d88bc
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/GasLimitOperation.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.Words;
+
+/** The Gas limit operation. */
+public class GasLimitOperation extends AbstractFixedCostOperation {
+
+  /**
+   * Instantiates a new Gas limit operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public GasLimitOperation(final GasCalculator gasCalculator) {
+    super(0x45, "GASLIMIT", 0, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    frame.pushStackItem(Words.longBytes(frame.getBlockValues().getGasLimit()));
+
+    return successResponse;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/GasOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/GasOperation.java
new file mode 100644
index 00000000000..10d41f8b4ec
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/GasOperation.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.Words;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Gas operation. */
+public class GasOperation extends AbstractFixedCostOperation {
+
+  /**
+   * Instantiates a new Gas operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public GasOperation(final GasCalculator gasCalculator) {
+    super(0x5A, "GAS", 0, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    final long gasRemaining = frame.getRemainingGas() - gasCost;
+    final Bytes value = Words.longBytes(gasRemaining);
+    frame.pushStackItem(value);
+
+    return successResponse;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/GasPriceOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/GasPriceOperation.java
new file mode 100644
index 00000000000..2a2d5b1a9b7
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/GasPriceOperation.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+/** The Gas price operation. */
+public class GasPriceOperation extends AbstractFixedCostOperation {
+
+  /**
+   * Instantiates a new Gas price operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public GasPriceOperation(final GasCalculator gasCalculator) {
+    super(0x3A, "GASPRICE", 0, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    final Wei gasPrice = frame.getGasPrice();
+    frame.pushStackItem(gasPrice.toBytes());
+
+    return successResponse;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/GtOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/GtOperation.java
new file mode 100644
index 00000000000..859584fc1fc
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/GtOperation.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The GT operation. */
+public class GtOperation extends AbstractFixedCostOperation {
+
+  /** The GT operation success result. */
+  static final OperationResult gtSuccess = new OperationResult(3, null);
+
+  /**
+   * Instantiates a new GT operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public GtOperation(final GasCalculator gasCalculator) {
+    super(0x11, "GT", 2, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs GT operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    final Bytes value0 = frame.popStackItem().trimLeadingZeros();
+    final Bytes value1 = frame.popStackItem().trimLeadingZeros();
+
+    final Bytes result = (value0.compareTo(value1) > 0 ? BYTES_ONE : Bytes.EMPTY);
+
+    frame.pushStackItem(result);
+
+    return gtSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/InvalidOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/InvalidOperation.java
new file mode 100644
index 00000000000..adb6b1bc4aa
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/InvalidOperation.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+/** The Invalid operation. */
+public class InvalidOperation extends AbstractOperation {
+
+  /** The constant OPCODE. */
+  public static final int OPCODE = 0xFE;
+  /** The constant INVALID_RESULT. */
+  public static final OperationResult INVALID_RESULT =
+      new OperationResult(0, ExceptionalHaltReason.INVALID_OPERATION);
+  /** The Invalid operation result. */
+  protected final OperationResult invalidResult;
+
+  /**
+   * Instantiates a new Invalid operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public InvalidOperation(final GasCalculator gasCalculator) {
+    this(OPCODE, gasCalculator);
+  }
+
+  /**
+   * Instantiates a new Invalid operation.
+   *
+   * @param opcode the opcode
+   * @param gasCalculator the gas calculator
+   */
+  public InvalidOperation(final int opcode, final GasCalculator gasCalculator) {
+    super(opcode, "INVALID", -1, -1, gasCalculator);
+    invalidResult = new OperationResult(0L, ExceptionalHaltReason.INVALID_OPERATION);
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    return invalidResult;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/IsZeroOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/IsZeroOperation.java
new file mode 100644
index 00000000000..165481957e3
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/IsZeroOperation.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Is zero operation. */
+public class IsZeroOperation extends AbstractFixedCostOperation {
+
+  /** The Is zero operation success result. */
+  static final OperationResult isZeroSuccess = new OperationResult(3, null);
+
+  /**
+   * Instantiates a new Is zero operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public IsZeroOperation(final GasCalculator gasCalculator) {
+    super(0x15, "ISZERO", 1, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs Is Zero operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    final Bytes value = frame.popStackItem().trimLeadingZeros();
+
+    frame.pushStackItem((value.size() == 0) ? BYTES_ONE : Bytes.EMPTY);
+
+    return isZeroSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/JumpDestOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/JumpDestOperation.java
new file mode 100644
index 00000000000..7a6dfc8b2e4
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/JumpDestOperation.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+/** The Jump dest operation. */
+public class JumpDestOperation extends AbstractFixedCostOperation {
+
+  /** constant for a successful jumpdest * */
+  public static final OperationResult JUMPDEST_SUCCESS = new OperationResult(1L, null);
+
+  /** The constant OPCODE. */
+  public static final int OPCODE = 0x5B;
+
+  /**
+   * Instantiates a new Jump dest operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public JumpDestOperation(final GasCalculator gasCalculator) {
+    super(OPCODE, "JUMPDEST", 0, 0, gasCalculator, gasCalculator.getJumpDestOperationGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return successResponse;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/JumpFOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/JumpFOperation.java
new file mode 100644
index 00000000000..612d70fb16c
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/JumpFOperation.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.hyperledger.besu.evm.internal.Words.readBigEndianU16;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+/** The type Jump F operation. */
+public class JumpFOperation extends AbstractOperation {
+
+  /** The constant OPCODE. */
+  public static final int OPCODE = 0xe5;
+  /** The Jump F success operation result. */
+  static final OperationResult jumpfSuccess = new OperationResult(3, null);
+
+  /**
+   * Instantiates a new Jump F operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public JumpFOperation(final GasCalculator gasCalculator) {
+    super(OPCODE, "JUMPF", 0, 0, gasCalculator);
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    final byte[] code = frame.getCode().getBytes().toArrayUnsafe();
+    return staticOperation(frame, code, frame.getPC());
+  }
+
+  /**
+   * Performs Jump F operation.
+   *
+   * @param frame the frame
+   * @param code the code
+   * @param pc the pc
+   * @return the successful operation result
+   */
+  public static OperationResult staticOperation(
+      final MessageFrame frame, final byte[] code, final int pc) {
+    int section = readBigEndianU16(pc + 1, code);
+    var exception = frame.jumpFunction(section);
+    if (exception == null) {
+      return jumpfSuccess;
+    } else {
+      return new OperationResult(jumpfSuccess.gasCost, exception);
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/JumpOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/JumpOperation.java
new file mode 100644
index 00000000000..0b11a7f4cd3
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/JumpOperation.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Jump operation. */
+public class JumpOperation extends AbstractFixedCostOperation {
+
+  private static final Operation.OperationResult invalidJumpResponse =
+      new Operation.OperationResult(8L, ExceptionalHaltReason.INVALID_JUMP_DESTINATION);
+  private static final OperationResult jumpResponse = new OperationResult(8L, null, 0);
+
+  /**
+   * Instantiates a new Jump operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public JumpOperation(final GasCalculator gasCalculator) {
+    super(0x56, "JUMP", 2, 0, gasCalculator, gasCalculator.getMidTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs Jump operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    final int jumpDestination;
+    final Bytes bytes = frame.popStackItem().trimLeadingZeros();
+    try {
+      jumpDestination = bytes.toInt();
+    } catch (final RuntimeException iae) {
+      return invalidJumpResponse;
+    }
+    final Code code = frame.getCode();
+    if (code.isJumpDestInvalid(jumpDestination)) {
+      return invalidJumpResponse;
+    } else {
+      frame.setPC(jumpDestination);
+      return jumpResponse;
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/JumpiOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/JumpiOperation.java
new file mode 100644
index 00000000000..80611724d79
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/JumpiOperation.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The JUMPI operation. */
+public class JumpiOperation extends AbstractFixedCostOperation {
+
+  private static final OperationResult invalidJumpResponse =
+      new Operation.OperationResult(10L, ExceptionalHaltReason.INVALID_JUMP_DESTINATION);
+  private static final OperationResult jumpiResponse = new OperationResult(10L, null, 0);
+  private static final OperationResult nojumpResponse = new OperationResult(10L, null);
+
+  /**
+   * Instantiates a new JUMPI operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public JumpiOperation(final GasCalculator gasCalculator) {
+    super(0x57, "JUMPI", 2, 0, gasCalculator, gasCalculator.getHighTierGasCost());
+  }
+
+  @Override
+  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs Jump operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    final Bytes dest = frame.popStackItem().trimLeadingZeros();
+    final Bytes condition = frame.popStackItem().trimLeadingZeros();
+
+    // If condition is zero (false), no jump is will be performed. Therefore, skip the test.
+    if (condition.size() == 0) {
+      return nojumpResponse;
+    } else {
+      final int jumpDestination;
+      try {
+        jumpDestination = dest.toInt();
+      } catch (final RuntimeException re) {
+        return invalidJumpResponse;
+      }
+      final Code code = frame.getCode();
+      if (code.isJumpDestInvalid(jumpDestination)) {
+        return invalidJumpResponse;
+      }
+      frame.setPC(jumpDestination);
+      return jumpiResponse;
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/Keccak256Operation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/Keccak256Operation.java
new file mode 100644
index 00000000000..b06c5b7aa44
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/Keccak256Operation.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.hyperledger.besu.crypto.Hash.keccak256;
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Keccak256 operation. */
+public class Keccak256Operation extends AbstractOperation {
+
+  /**
+   * Instantiates a new Keccak256 operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public Keccak256Operation(final GasCalculator gasCalculator) {
+    super(0x20, "KECCAK256", 2, 1, gasCalculator);
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    final long from = clampedToLong(frame.popStackItem());
+    final long length = clampedToLong(frame.popStackItem());
+
+    final long cost = gasCalculator().keccak256OperationGasCost(frame, from, length);
+    if (frame.getRemainingGas() < cost) {
+      return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+    }
+
+    final Bytes bytes = frame.readMutableMemory(from, length);
+    frame.pushStackItem(keccak256(bytes));
+    return new OperationResult(cost, null);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/LogOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/LogOperation.java
new file mode 100644
index 00000000000..3b75647db31
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/LogOperation.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.apache.tuweni.bytes.Bytes32.leftPad;
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.log.LogTopic;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Log operation. */
+public class LogOperation extends AbstractOperation {
+
+  private final int numTopics;
+
+  /**
+   * Instantiates a new Log operation.
+   *
+   * @param numTopics the num topics
+   * @param gasCalculator the gas calculator
+   */
+  public LogOperation(final int numTopics, final GasCalculator gasCalculator) {
+    super(0xA0 + numTopics, "LOG" + numTopics, numTopics + 2, 0, gasCalculator);
+    this.numTopics = numTopics;
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    final long dataLocation = clampedToLong(frame.popStackItem());
+    final long numBytes = clampedToLong(frame.popStackItem());
+
+    final long cost = gasCalculator().logOperationGasCost(frame, dataLocation, numBytes, numTopics);
+    if (frame.isStatic()) {
+      return new OperationResult(cost, ExceptionalHaltReason.ILLEGAL_STATE_CHANGE);
+    } else if (frame.getRemainingGas() < cost) {
+      return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+    }
+
+    final Address address = frame.getRecipientAddress();
+
+    final Bytes data = frame.readMemory(dataLocation, numBytes);
+
+    final ImmutableList.Builder<LogTopic> builder =
+        ImmutableList.builderWithExpectedSize(numTopics);
+    for (int i = 0; i < numTopics; i++) {
+      builder.add(LogTopic.create(leftPad(frame.popStackItem())));
+    }
+
+    frame.addLog(new Log(address, data, builder.build()));
+    return new OperationResult(cost, null);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/LtOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/LtOperation.java
new file mode 100644
index 00000000000..e300c3baa2a
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/LtOperation.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The LT operation. */
+public class LtOperation extends AbstractFixedCostOperation {
+
+  /** The LT operation success result. */
+  static final OperationResult ltSuccess = new OperationResult(3, null);
+
+  /**
+   * Instantiates a new LT operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public LtOperation(final GasCalculator gasCalculator) {
+    super(0x10, "LT", 2, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs LT operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    final Bytes value0 = frame.popStackItem().trimLeadingZeros();
+    final Bytes value1 = frame.popStackItem().trimLeadingZeros();
+
+    final Bytes result = value0.compareTo(value1) < 0 ? BYTES_ONE : Bytes.EMPTY;
+
+    frame.pushStackItem(result);
+
+    return ltSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/MCopyOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/MCopyOperation.java
new file mode 100644
index 00000000000..a36c0f060a4
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/MCopyOperation.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+/** The Memory copy operation. */
+public class MCopyOperation extends AbstractOperation {
+
+  /**
+   * Instantiates a new Memory Copy operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public MCopyOperation(final GasCalculator gasCalculator) {
+    super(0x5e, "MCOPY", 3, 0, gasCalculator);
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    final long dst = clampedToLong(frame.popStackItem());
+    final long src = clampedToLong(frame.popStackItem());
+    final long length = clampedToLong(frame.popStackItem());
+
+    final long cost = gasCalculator().dataCopyOperationGasCost(frame, Math.max(src, dst), length);
+    if (frame.getRemainingGas() < cost) {
+      return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+    }
+
+    frame.copyMemory(dst, src, length, true);
+
+    return new OperationResult(cost, null);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/MLoadOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/MLoadOperation.java
new file mode 100644
index 00000000000..cd2e482cd4b
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/MLoadOperation.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The M load operation. */
+public class MLoadOperation extends AbstractOperation {
+
+  /**
+   * Instantiates a new M load operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public MLoadOperation(final GasCalculator gasCalculator) {
+    super(0x51, "MLOAD", 1, 1, gasCalculator);
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    final long location = clampedToLong(frame.popStackItem());
+
+    final long cost = gasCalculator().mLoadOperationGasCost(frame, location);
+    if (frame.getRemainingGas() < cost) {
+      return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+    }
+
+    final Bytes value = frame.readMutableMemory(location, 32, true).copy();
+
+    frame.pushStackItem(value);
+    return new OperationResult(cost, null);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/MSizeOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/MSizeOperation.java
new file mode 100644
index 00000000000..b2ec67632eb
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/MSizeOperation.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.Words;
+
+/** The M size operation. */
+public class MSizeOperation extends AbstractFixedCostOperation {
+
+  /**
+   * Instantiates a new M size operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public MSizeOperation(final GasCalculator gasCalculator) {
+    super(0x59, "MSIZE", 0, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    frame.pushStackItem(Words.longBytes(frame.memoryByteSize()));
+
+    return successResponse;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/MStore8Operation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/MStore8Operation.java
new file mode 100644
index 00000000000..8b0ac3a70ec
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/MStore8Operation.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The M store8 operation. */
+public class MStore8Operation extends AbstractOperation {
+
+  /**
+   * Instantiates a new M store8 operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public MStore8Operation(final GasCalculator gasCalculator) {
+    super(0x53, "MSTORE8", 2, 0, gasCalculator);
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    final long location = clampedToLong(frame.popStackItem());
+    final Bytes value = frame.popStackItem();
+    final byte theByte = (value.size() > 0) ? value.get(value.size() - 1) : 0;
+
+    final long cost = gasCalculator().mStore8OperationGasCost(frame, location);
+    if (frame.getRemainingGas() < cost) {
+      return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+    }
+
+    frame.writeMemory(location, theByte, true);
+    return new OperationResult(cost, null);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/MStoreOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/MStoreOperation.java
new file mode 100644
index 00000000000..012d7d99c11
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/MStoreOperation.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The M store operation. */
+public class MStoreOperation extends AbstractOperation {
+
+  /**
+   * Instantiates a new M store operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public MStoreOperation(final GasCalculator gasCalculator) {
+    super(0x52, "MSTORE", 2, 0, gasCalculator);
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    final long location = clampedToLong(frame.popStackItem());
+    final Bytes value = frame.popStackItem();
+
+    final long cost = gasCalculator().mStoreOperationGasCost(frame, location);
+    if (frame.getRemainingGas() < cost) {
+      return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+    }
+
+    frame.writeMemoryRightAligned(location, 32, value, true);
+    return new OperationResult(cost, null);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/ModOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/ModOperation.java
new file mode 100644
index 00000000000..e61495e9f5b
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/ModOperation.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import java.math.BigInteger;
+import java.util.Arrays;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+/** The Mod operation. */
+public class ModOperation extends AbstractFixedCostOperation {
+
+  private static final OperationResult modSuccess = new OperationResult(5, null);
+
+  /**
+   * Instantiates a new Mod operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public ModOperation(final GasCalculator gasCalculator) {
+    super(0x06, "MOD", 2, 1, gasCalculator, gasCalculator.getLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs Mod operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    final Bytes value0 = frame.popStackItem();
+    final Bytes value1 = frame.popStackItem();
+    if (value1.isZero()) {
+      frame.pushStackItem(Bytes32.ZERO);
+    } else {
+      BigInteger b1 = new BigInteger(1, value0.toArrayUnsafe());
+      BigInteger b2 = new BigInteger(1, value1.toArrayUnsafe());
+      final BigInteger result = b1.mod(b2);
+
+      Bytes resultBytes = Bytes.wrap(result.toByteArray());
+      if (resultBytes.size() > 32) {
+        resultBytes = resultBytes.slice(resultBytes.size() - 32, 32);
+      }
+
+      final byte[] padding = new byte[32 - resultBytes.size()];
+      Arrays.fill(padding, result.signum() < 0 ? (byte) 0xFF : 0x00);
+
+      frame.pushStackItem(Bytes.concatenate(Bytes.wrap(padding), resultBytes));
+    }
+
+    return modSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/MulModOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/MulModOperation.java
new file mode 100644
index 00000000000..589ef9570be
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/MulModOperation.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import java.math.BigInteger;
+import java.util.Arrays;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Mul mod operation. */
+public class MulModOperation extends AbstractFixedCostOperation {
+
+  private static final OperationResult mulModSuccess = new OperationResult(8, null);
+
+  /**
+   * Instantiates a new Mul mod operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public MulModOperation(final GasCalculator gasCalculator) {
+    super(0x09, "MULMOD", 3, 1, gasCalculator, gasCalculator.getMidTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs MulMod operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    final Bytes value0 = frame.popStackItem();
+    final Bytes value1 = frame.popStackItem();
+    final Bytes value2 = frame.popStackItem();
+
+    if (value2.isZero()) {
+      frame.pushStackItem(Bytes.EMPTY);
+    } else {
+      BigInteger b0 = new BigInteger(1, value0.toArrayUnsafe());
+      BigInteger b1 = new BigInteger(1, value1.toArrayUnsafe());
+      BigInteger b2 = new BigInteger(1, value2.toArrayUnsafe());
+
+      BigInteger result = b0.multiply(b1).mod(b2);
+      Bytes resultBytes = Bytes.wrap(result.toByteArray());
+      if (resultBytes.size() > 32) {
+        resultBytes = resultBytes.slice(resultBytes.size() - 32, 32);
+      }
+
+      final byte[] padding = new byte[32 - resultBytes.size()];
+      Arrays.fill(padding, result.signum() < 0 ? (byte) 0xFF : 0x00);
+
+      frame.pushStackItem(Bytes.concatenate(Bytes.wrap(padding), resultBytes));
+    }
+
+    return mulModSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/MulOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/MulOperation.java
new file mode 100644
index 00000000000..da9e091d8f9
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/MulOperation.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import java.math.BigInteger;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Mul operation. */
+public class MulOperation extends AbstractFixedCostOperation {
+
+  /** The Mul operation success result. */
+  static final OperationResult mulSuccess = new OperationResult(5, null);
+
+  /**
+   * Instantiates a new Mul operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public MulOperation(final GasCalculator gasCalculator) {
+    super(0x02, "MUL", 2, 1, gasCalculator, gasCalculator.getLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs mul operation
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    BigInteger a = new BigInteger(1, frame.popStackItem().toArrayUnsafe());
+    BigInteger b = new BigInteger(1, frame.popStackItem().toArrayUnsafe());
+    BigInteger c = a.multiply(b);
+    byte[] cBytes = c.toByteArray();
+    Bytes result = Bytes.wrap(cBytes);
+    if (cBytes.length > 32) {
+      result = result.slice(cBytes.length - 32, 32);
+    }
+
+    frame.pushStackItem(result);
+    return mulSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/NotOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/NotOperation.java
new file mode 100644
index 00000000000..0b684365956
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/NotOperation.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+/** The Not operation. */
+public class NotOperation extends AbstractFixedCostOperation {
+
+  /** The Not operation success result. */
+  static final OperationResult notSuccess = new OperationResult(3, null);
+
+  /**
+   * Instantiates a new Not operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public NotOperation(final GasCalculator gasCalculator) {
+    super(0x19, "NOT", 1, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs Not operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    final Bytes value = Bytes32.leftPad(frame.popStackItem());
+
+    final Bytes result = value.not();
+
+    frame.pushStackItem(result);
+
+    return notSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/NumberOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/NumberOperation.java
new file mode 100644
index 00000000000..4f82562dadd
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/NumberOperation.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.Words;
+
+/** The Number operation. */
+public class NumberOperation extends AbstractFixedCostOperation {
+
+  /**
+   * Instantiates a new Number operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public NumberOperation(final GasCalculator gasCalculator) {
+    super(0x43, "NUMBER", 0, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    final long number = frame.getBlockValues().getNumber();
+    frame.pushStackItem(Words.longBytes(number));
+
+    return successResponse;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/Operation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/Operation.java
new file mode 100644
index 00000000000..4a926fd1efd
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/Operation.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+
+/** The interface Operation. */
+public interface Operation {
+
+  /** The Operation result. */
+  class OperationResult {
+    /** The Gas cost. */
+    final long gasCost;
+    /** The Halt reason. */
+    final ExceptionalHaltReason haltReason;
+    /** The increment. */
+    final int pcIncrement;
+
+    /**
+     * Instantiates a new Operation result.
+     *
+     * @param gasCost the gas cost
+     * @param haltReason the halt reason
+     */
+    public OperationResult(final long gasCost, final ExceptionalHaltReason haltReason) {
+      this(gasCost, haltReason, 1);
+    }
+
+    /**
+     * Instantiates a new Operation result.
+     *
+     * @param gasCost the gas cost
+     * @param haltReason the halt reason
+     * @param pcIncrement the increment
+     */
+    public OperationResult(
+        final long gasCost, final ExceptionalHaltReason haltReason, final int pcIncrement) {
+      this.gasCost = gasCost;
+      this.haltReason = haltReason;
+      this.pcIncrement = pcIncrement;
+    }
+
+    /**
+     * Gets gas cost.
+     *
+     * @return the gas cost
+     */
+    public long getGasCost() {
+      return gasCost;
+    }
+
+    /**
+     * Gets halt reason.
+     *
+     * @return the halt reason
+     */
+    public ExceptionalHaltReason getHaltReason() {
+      return haltReason;
+    }
+
+    /**
+     * Gets increment.
+     *
+     * @return the increment
+     */
+    public int getPcIncrement() {
+      return pcIncrement;
+    }
+  }
+
+  /**
+   * Executes the logic behind this operation.
+   *
+   * <p>Implementors are responsible for calculating gas cost, checking Out-of-gas conditions,
+   * applying gas cost to the MessageFrame, executing the operation including all side effects, and
+   * checking for all operation related exceptional halts such as OutOfGas, InvalidJumpDestination,
+   * Stack overflow/underflow, etc., and storing the halt in the MessageFrame
+   *
+   * @param frame The frame for execution of this operation.
+   * @param evm The EVM for execution of this operation.
+   * @return the gas cost and any exceptional halt reasons of the operation.
+   */
+  OperationResult execute(final MessageFrame frame, final EVM evm);
+
+  /**
+   * Gets opcode.
+   *
+   * @return the opcode
+   */
+  int getOpcode();
+
+  /**
+   * Gets name.
+   *
+   * @return the name
+   */
+  String getName();
+
+  /**
+   * Gets stack items consumed.
+   *
+   * @return the stack items consumed
+   */
+  int getStackItemsConsumed();
+
+  /**
+   * Gets stack items produced.
+   *
+   * @return the stack items produced
+   */
+  int getStackItemsProduced();
+
+  /**
+   * Determines whether this operation has been virtually added to the contract code. For instance
+   * if the contract is not ended by a STOP opcode the {@link EVM} adds an explicit end of script
+   * stop which can be considered as virtual.
+   *
+   * @return a boolean indicating if the operation is virtual.
+   */
+  default boolean isVirtualOperation() {
+    return false;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/OperationRegistry.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/OperationRegistry.java
new file mode 100644
index 00000000000..0971999c66e
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/OperationRegistry.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+/** Encapsulates a group of {@link Operation}s used together. */
+public class OperationRegistry {
+
+  private static final int NUM_OPERATIONS = 256;
+
+  private final Operation[] operations;
+
+  /** Instantiates a new Operation registry. */
+  public OperationRegistry() {
+    this.operations = new Operation[NUM_OPERATIONS];
+  }
+
+  /**
+   * Get operation.
+   *
+   * @param opcode the opcode
+   * @return the operation
+   */
+  public Operation get(final byte opcode) {
+    return get(opcode & 0xff);
+  }
+
+  /**
+   * Get operation.
+   *
+   * @param opcode the opcode
+   * @return the operation
+   */
+  public Operation get(final int opcode) {
+    return operations[opcode];
+  }
+
+  /**
+   * Put.
+   *
+   * @param operation the operation
+   */
+  public void put(final Operation operation) {
+    operations[operation.getOpcode()] = operation;
+  }
+
+  /**
+   * Gets or default.
+   *
+   * @param opcode the opcode
+   * @param defaultOperation the default operation
+   * @return the or default
+   */
+  public Operation getOrDefault(final byte opcode, final Operation defaultOperation) {
+    final Operation operation = get(opcode);
+
+    if (operation == null) {
+      return defaultOperation;
+    }
+
+    return operation;
+  }
+
+  /**
+   * Get operations.
+   *
+   * @return the operation [ ]
+   */
+  public Operation[] getOperations() {
+    return operations;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/OrOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/OrOperation.java
new file mode 100644
index 00000000000..a8d4382f319
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/OrOperation.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Or operation. */
+public class OrOperation extends AbstractFixedCostOperation {
+
+  /** The Or operation success result. */
+  static final OperationResult orSuccess = new OperationResult(3, null);
+
+  /**
+   * Instantiates a new Or operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public OrOperation(final GasCalculator gasCalculator) {
+    super(0x17, "OR", 2, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs Or operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    final Bytes value0 = frame.popStackItem();
+    final Bytes value1 = frame.popStackItem();
+
+    final Bytes result = value0.or(value1);
+
+    frame.pushStackItem(result);
+
+    return orSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/OriginOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/OriginOperation.java
new file mode 100644
index 00000000000..8c392718ba3
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/OriginOperation.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+/** The Origin operation. */
+public class OriginOperation extends AbstractFixedCostOperation {
+
+  /**
+   * Instantiates a new Origin operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public OriginOperation(final GasCalculator gasCalculator) {
+    super(0x32, "ORIGIN", 0, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    frame.pushStackItem(frame.getOriginatorAddress());
+
+    return successResponse;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/PCOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/PCOperation.java
new file mode 100644
index 00000000000..71c3b3ed917
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/PCOperation.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.Words;
+
+/** The PC operation. */
+public class PCOperation extends AbstractFixedCostOperation {
+
+  /**
+   * Instantiates a new Pc operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public PCOperation(final GasCalculator gasCalculator) {
+    super(0x58, "PC", 0, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    frame.pushStackItem(Words.intBytes(frame.getPC()));
+
+    return successResponse;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/PopOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/PopOperation.java
new file mode 100644
index 00000000000..88e66a44ed0
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/PopOperation.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+/** The Pop operation. */
+public class PopOperation extends AbstractFixedCostOperation {
+
+  /** The Pop operation success result. */
+  static final OperationResult popSuccess = new OperationResult(2, null);
+
+  /**
+   * Instantiates a new Pop operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public PopOperation(final GasCalculator gasCalculator) {
+    super(0x50, "POP", 1, 0, gasCalculator, gasCalculator.getBaseTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs Pop operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    frame.popStackItem();
+    return popSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/PrevRanDaoOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/PrevRanDaoOperation.java
new file mode 100644
index 00000000000..0785d121448
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/PrevRanDaoOperation.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+/** The Prev randao operation. */
+public class PrevRanDaoOperation extends AbstractFixedCostOperation {
+
+  /**
+   * Instantiates a new Prev randao operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public PrevRanDaoOperation(final GasCalculator gasCalculator) {
+    super(0x44, "PREVRANDAO", 0, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
+  }
+
+  @Override
+  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
+    frame.pushStackItem(frame.getBlockValues().getMixHashOrPrevRandao());
+    return successResponse;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/Push0Operation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/Push0Operation.java
new file mode 100644
index 00000000000..b9d4b048ff4
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/Push0Operation.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.hyperledger.besu.evm.operation.PushOperation.PUSH_BASE;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Push0 operation. */
+public class Push0Operation extends AbstractFixedCostOperation {
+
+  /** The Push0 operation success result. */
+  static final OperationResult push0Success = new OperationResult(2, null);
+
+  /**
+   * Instantiates a new Push 0 operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public Push0Operation(final GasCalculator gasCalculator) {
+    super(PUSH_BASE, "PUSH0", 0, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
+  }
+
+  @Override
+  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs push0 operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    frame.pushStackItem(Bytes.EMPTY);
+    return push0Success;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/PushOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/PushOperation.java
new file mode 100644
index 00000000000..af107d994de
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/PushOperation.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Push operation. */
+public class PushOperation extends AbstractFixedCostOperation {
+
+  /** The constant PUSH_BASE. */
+  public static final int PUSH_BASE = 0x5F;
+  /** The constant PUSH_MAX. */
+  public static final int PUSH_MAX = 0x7F;
+
+  private final int length;
+
+  /** The Push operation success result. */
+  static final OperationResult pushSuccess = new OperationResult(3, null);
+
+  /**
+   * Instantiates a new Push operation.
+   *
+   * @param length the length
+   * @param gasCalculator the gas calculator
+   */
+  public PushOperation(final int length, final GasCalculator gasCalculator) {
+    super(
+        PUSH_BASE + length,
+        "PUSH" + length,
+        0,
+        1,
+        gasCalculator,
+        gasCalculator.getVeryLowTierGasCost());
+    this.length = length;
+  }
+
+  @Override
+  public OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
+    final byte[] code = frame.getCode().getBytes().toArrayUnsafe();
+    return staticOperation(frame, code, frame.getPC(), length);
+  }
+
+  /**
+   * Performs Push operation.
+   *
+   * @param frame the frame
+   * @param code the code
+   * @param pc the pc
+   * @param pushSize the push size
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(
+      final MessageFrame frame, final byte[] code, final int pc, final int pushSize) {
+    int copyStart = pc + 1;
+    Bytes push;
+    if (code.length <= copyStart) {
+      push = Bytes.EMPTY;
+    } else {
+      final int copyLength = Math.min(pushSize, code.length - pc - 1);
+      push = Bytes.wrap(code, copyStart, copyLength);
+    }
+    frame.pushStackItem(push);
+    frame.setPC(pc + pushSize);
+    return pushSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/RelativeJumpIfOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/RelativeJumpIfOperation.java
new file mode 100644
index 00000000000..d6aaae5cbbd
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/RelativeJumpIfOperation.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The type Relative jump If operation. */
+public class RelativeJumpIfOperation extends RelativeJumpOperation {
+
+  /** The constant OPCODE. */
+  public static final int OPCODE = 0xe1;
+
+  /**
+   * Instantiates a new Relative jump If operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public RelativeJumpIfOperation(final GasCalculator gasCalculator) {
+    super(OPCODE, "RJUMPI", 0, 0, gasCalculator, 4L);
+  }
+
+  @Override
+  protected OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
+    final Bytes condition = frame.popStackItem();
+    // If condition is zero (false), no jump is will be performed. Therefore, skip the rest.
+    if (!condition.isZero()) {
+      return super.executeFixedCostOperation(frame, evm);
+    }
+    return new OperationResult(gasCost, null, 2 + 1);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/RelativeJumpOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/RelativeJumpOperation.java
new file mode 100644
index 00000000000..9f7b912f21e
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/RelativeJumpOperation.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.Words;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The type Relative jump operation. */
+public class RelativeJumpOperation extends AbstractFixedCostOperation {
+
+  /** The constant OPCODE. */
+  public static final int OPCODE = 0xe0;
+
+  /**
+   * Instantiates a new Relative jump operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public RelativeJumpOperation(final GasCalculator gasCalculator) {
+    this(OPCODE, "RJUMP", 0, 0, gasCalculator, gasCalculator.getBaseTierGasCost());
+  }
+
+  /**
+   * Instantiates a new Relative jump operation.
+   *
+   * @param opcode the opcode
+   * @param name the name
+   * @param stackItemsConsumed the stack items consumed
+   * @param stackItemsProduced the stack items produced
+   * @param gasCalculator the gas calculator
+   * @param fixedCost the fixed cost
+   */
+  protected RelativeJumpOperation(
+      final int opcode,
+      final String name,
+      final int stackItemsConsumed,
+      final int stackItemsProduced,
+      final GasCalculator gasCalculator,
+      final long fixedCost) {
+    super(opcode, name, stackItemsConsumed, stackItemsProduced, gasCalculator, fixedCost);
+  }
+
+  @Override
+  protected OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
+    final Bytes code = frame.getCode().getBytes();
+    final int pcPostInstruction = frame.getPC() + 1;
+    return new OperationResult(
+        gasCost, null, 2 + Words.readBigEndianI16(pcPostInstruction, code.toArrayUnsafe()) + 1);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/RelativeJumpVectorOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/RelativeJumpVectorOperation.java
new file mode 100644
index 00000000000..1657d325c3c
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/RelativeJumpVectorOperation.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.hyperledger.besu.evm.internal.Words.readBigEndianI16;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The type Relative jump vector operation. */
+public class RelativeJumpVectorOperation extends AbstractFixedCostOperation {
+
+  /** The constant OPCODE. */
+  public static final int OPCODE = 0xe2;
+
+  /**
+   * Instantiates a new Relative jump vector operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public RelativeJumpVectorOperation(final GasCalculator gasCalculator) {
+    super(OPCODE, "RJUMPV", 0, 0, gasCalculator, 4L);
+  }
+
+  @Override
+  protected OperationResult executeFixedCostOperation(final MessageFrame frame, final EVM evm) {
+    final Bytes code = frame.getCode().getBytes();
+    int offsetCase;
+    try {
+      offsetCase = frame.popStackItem().toInt();
+      if (offsetCase < 0) {
+        offsetCase = Integer.MAX_VALUE;
+      }
+    } catch (ArithmeticException | IllegalArgumentException ae) {
+      offsetCase = Integer.MAX_VALUE;
+    }
+    final int vectorSize = getVectorSize(code, frame.getPC() + 1);
+    return new OperationResult(
+        gasCost,
+        null,
+        1
+            + 2 * vectorSize
+            + ((offsetCase >= vectorSize)
+                ? 0
+                : readBigEndianI16(frame.getPC() + 2 + offsetCase * 2, code.toArrayUnsafe()))
+            + 1);
+  }
+
+  /**
+   * Gets vector size.
+   *
+   * @param code the code
+   * @param offsetCountByteIndex the offset count byte index
+   * @return the vector size
+   */
+  public static int getVectorSize(final Bytes code, final int offsetCountByteIndex) {
+    return code.get(offsetCountByteIndex) & 0xff;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/RetFOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/RetFOperation.java
new file mode 100644
index 00000000000..327dac1cb81
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/RetFOperation.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+/** The type Ret F operation. */
+public class RetFOperation extends AbstractOperation {
+
+  /** The Opcode. */
+  public static final int OPCODE = 0xe4;
+  /** The Ret F success. */
+  static final OperationResult retfSuccess = new OperationResult(4, null);
+
+  /**
+   * Instantiates a new Ret F operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public RetFOperation(final GasCalculator gasCalculator) {
+    super(OPCODE, "RETF", 0, 0, gasCalculator);
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    var exception = frame.returnFunction();
+    if (exception == null) {
+      return retfSuccess;
+    } else {
+      return new OperationResult(retfSuccess.gasCost, exception);
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/ReturnDataCopyOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/ReturnDataCopyOperation.java
new file mode 100644
index 00000000000..c2cb651cf60
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/ReturnDataCopyOperation.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Return data copy operation. */
+public class ReturnDataCopyOperation extends AbstractOperation {
+
+  /** The constant INVALID_RETURN_DATA_BUFFER_ACCESS. */
+  protected static final OperationResult INVALID_RETURN_DATA_BUFFER_ACCESS =
+      new OperationResult(0L, ExceptionalHaltReason.INVALID_RETURN_DATA_BUFFER_ACCESS);
+  /** The constant OUT_OF_BOUNDS. */
+  protected static final OperationResult OUT_OF_BOUNDS =
+      new OperationResult(0L, ExceptionalHaltReason.OUT_OF_BOUNDS);
+
+  /**
+   * Instantiates a new Return data copy operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public ReturnDataCopyOperation(final GasCalculator gasCalculator) {
+    super(0x3E, "RETURNDATACOPY", 3, 0, gasCalculator);
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    final long memOffset = clampedToLong(frame.popStackItem());
+    final long sourceOffset = clampedToLong(frame.popStackItem());
+    final long numBytes = clampedToLong(frame.popStackItem());
+    final Bytes returnData = frame.getReturnData();
+    final int returnDataLength = returnData.size();
+
+    try {
+      final long end = Math.addExact(sourceOffset, numBytes);
+      if (end > returnDataLength) {
+        return INVALID_RETURN_DATA_BUFFER_ACCESS;
+      }
+    } catch (final ArithmeticException ae) {
+      return OUT_OF_BOUNDS;
+    }
+
+    final long cost = gasCalculator().dataCopyOperationGasCost(frame, memOffset, numBytes);
+    if (frame.getRemainingGas() < cost) {
+      return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+    }
+
+    frame.writeMemory(memOffset, sourceOffset, numBytes, returnData, true);
+
+    return new OperationResult(cost, null);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/ReturnDataSizeOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/ReturnDataSizeOperation.java
new file mode 100644
index 00000000000..c3f75e32754
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/ReturnDataSizeOperation.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.Words;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Return data size operation. */
+public class ReturnDataSizeOperation extends AbstractFixedCostOperation {
+
+  /**
+   * Instantiates a new Return data size operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public ReturnDataSizeOperation(final GasCalculator gasCalculator) {
+    super(0x3D, "RETURNDATASIZE", 0, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    final Bytes returnData = frame.getReturnData();
+    frame.pushStackItem(Words.longBytes(returnData.size()));
+
+    return successResponse;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/ReturnOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/ReturnOperation.java
new file mode 100644
index 00000000000..56dbe9205cb
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/ReturnOperation.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+/** The Return operation. */
+public class ReturnOperation extends AbstractOperation {
+
+  /**
+   * Instantiates a new Return operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public ReturnOperation(final GasCalculator gasCalculator) {
+    super(0xF3, "RETURN", 2, 0, gasCalculator);
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    final long from = clampedToLong(frame.popStackItem());
+    final long length = clampedToLong(frame.popStackItem());
+
+    final long cost = gasCalculator().memoryExpansionGasCost(frame, from, length);
+    if (frame.getRemainingGas() < cost) {
+      return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+    }
+
+    frame.setOutputData(frame.readMemory(from, length));
+    frame.setState(MessageFrame.State.CODE_SUCCESS);
+    return new OperationResult(cost, null);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/RevertOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/RevertOperation.java
new file mode 100644
index 00000000000..8f08aac884f
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/RevertOperation.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Revert operation. */
+public class RevertOperation extends AbstractOperation {
+
+  /**
+   * Instantiates a new Revert operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public RevertOperation(final GasCalculator gasCalculator) {
+    super(0xFD, "REVERT", 2, 0, gasCalculator);
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    final long from = clampedToLong(frame.popStackItem());
+    final long length = clampedToLong(frame.popStackItem());
+
+    final long cost = gasCalculator().memoryExpansionGasCost(frame, from, length);
+    if (frame.getRemainingGas() < cost) {
+      return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+    }
+
+    final Bytes reason = frame.readMemory(from, length);
+    frame.setOutputData(reason);
+    frame.setRevertReason(reason);
+    frame.setState(MessageFrame.State.REVERT);
+    return new OperationResult(cost, null);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/SDivOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/SDivOperation.java
new file mode 100644
index 00000000000..e4907a98e60
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/SDivOperation.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import java.math.BigInteger;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+/** The SDiv operation. */
+public class SDivOperation extends AbstractFixedCostOperation {
+
+  private static final OperationResult sdivSuccess = new OperationResult(5, null);
+
+  /**
+   * Instantiates a new SDiv operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public SDivOperation(final GasCalculator gasCalculator) {
+    super(0x05, "SDIV", 2, 1, gasCalculator, gasCalculator.getLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs SDiv operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    final Bytes value0 = frame.popStackItem();
+    final Bytes value1 = frame.popStackItem();
+
+    if (value1.isZero()) {
+      frame.pushStackItem(Bytes.EMPTY);
+    } else {
+      final BigInteger b1 =
+          value0.size() < 32
+              ? new BigInteger(1, value0.toArrayUnsafe())
+              : new BigInteger(value0.toArrayUnsafe());
+      final BigInteger b2 =
+          value1.size() < 32
+              ? new BigInteger(1, value1.toArrayUnsafe())
+              : new BigInteger(value1.toArrayUnsafe());
+      final BigInteger result = b1.divide(b2);
+      Bytes resultBytes = Bytes.wrap(result.toByteArray());
+      if (resultBytes.size() > 32) {
+        resultBytes = resultBytes.slice(resultBytes.size() - 32, 32);
+      }
+
+      frame.pushStackItem(Bytes32.leftPad(resultBytes, result.signum() < 0 ? (byte) 0xFF : 0x00));
+    }
+
+    return sdivSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/SGtOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/SGtOperation.java
new file mode 100644
index 00000000000..8625f1fcc3a
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/SGtOperation.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import java.math.BigInteger;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The SGt operation. */
+public class SGtOperation extends AbstractFixedCostOperation {
+
+  /** The SGt operation success result. */
+  static final OperationResult sgtSuccess = new OperationResult(3, null);
+
+  /**
+   * Instantiates a new SGt operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public SGtOperation(final GasCalculator gasCalculator) {
+    super(0x13, "SGT", 2, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs SGt operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    final Bytes value0 = frame.popStackItem();
+    final Bytes value1 = frame.popStackItem();
+
+    final BigInteger b0 =
+        value0.size() < 32
+            ? new BigInteger(1, value0.toArrayUnsafe())
+            : new BigInteger(value0.toArrayUnsafe());
+    final BigInteger b1 =
+        value1.size() < 32
+            ? new BigInteger(1, value1.toArrayUnsafe())
+            : new BigInteger(value1.toArrayUnsafe());
+
+    final Bytes result = b0.compareTo(b1) > 0 ? BYTES_ONE : Bytes.EMPTY;
+
+    frame.pushStackItem(result);
+
+    return sgtSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/SLoadOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/SLoadOperation.java
new file mode 100644
index 00000000000..087d18ab0ee
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/SLoadOperation.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.FixedStack.OverflowException;
+import org.hyperledger.besu.evm.internal.FixedStack.UnderflowException;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** The SLoad operation. */
+public class SLoadOperation extends AbstractOperation {
+
+  private final long warmCost;
+  private final long coldCost;
+
+  private final OperationResult warmSuccess;
+  private final OperationResult coldSuccess;
+
+  /**
+   * Instantiates a new SLoad operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public SLoadOperation(final GasCalculator gasCalculator) {
+    super(0x54, "SLOAD", 1, 1, gasCalculator);
+    final long baseCost = gasCalculator.getSloadOperationGasCost();
+    warmCost = baseCost + gasCalculator.getWarmStorageReadCost();
+    coldCost = baseCost + gasCalculator.getColdSloadCost();
+
+    warmSuccess = new OperationResult(warmCost, null);
+    coldSuccess = new OperationResult(coldCost, null);
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    try {
+      final Account account = frame.getWorldUpdater().get(frame.getRecipientAddress());
+      final Address address = account.getAddress();
+      final Bytes32 key = UInt256.fromBytes(frame.popStackItem());
+      final boolean slotIsWarm = frame.warmUpStorage(address, key);
+      final long cost = slotIsWarm ? warmCost : coldCost;
+      if (frame.getRemainingGas() < cost) {
+        return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+      } else {
+        frame.pushStackItem(account.getStorageValue(UInt256.fromBytes(key)));
+
+        return slotIsWarm ? warmSuccess : coldSuccess;
+      }
+    } catch (final UnderflowException ufe) {
+      return new OperationResult(warmCost, ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS);
+    } catch (final OverflowException ofe) {
+      return new OperationResult(warmCost, ExceptionalHaltReason.TOO_MANY_STACK_ITEMS);
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/SLtOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/SLtOperation.java
new file mode 100644
index 00000000000..4e8aaff490b
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/SLtOperation.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import java.math.BigInteger;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The SLT operation. */
+public class SLtOperation extends AbstractFixedCostOperation {
+
+  /** The Slt operation success result. */
+  static final OperationResult sltSuccess = new OperationResult(3, null);
+
+  /**
+   * Instantiates a new SLt operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public SLtOperation(final GasCalculator gasCalculator) {
+    super(0x12, "SLT", 2, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs SLt operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    final Bytes value0 = frame.popStackItem();
+    final Bytes value1 = frame.popStackItem();
+
+    final BigInteger b0 =
+        value0.size() < 32
+            ? new BigInteger(1, value0.toArrayUnsafe())
+            : new BigInteger(value0.toArrayUnsafe());
+    final BigInteger b1 =
+        value1.size() < 32
+            ? new BigInteger(1, value1.toArrayUnsafe())
+            : new BigInteger(value1.toArrayUnsafe());
+
+    final Bytes result = b0.compareTo(b1) < 0 ? BYTES_ONE : Bytes.EMPTY;
+
+    frame.pushStackItem(result);
+
+    return sltSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/SModOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/SModOperation.java
new file mode 100644
index 00000000000..e210aec6069
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/SModOperation.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import java.math.BigInteger;
+import java.util.Arrays;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The SMod operation. */
+public class SModOperation extends AbstractFixedCostOperation {
+
+  private static final OperationResult smodSuccess = new OperationResult(5, null);
+
+  /**
+   * Instantiates a new SMod operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public SModOperation(final GasCalculator gasCalculator) {
+    super(0x07, "SMOD", 2, 1, gasCalculator, gasCalculator.getLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs SMod operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    final Bytes value0 = frame.popStackItem();
+    final Bytes value1 = frame.popStackItem();
+
+    if (value1.isZero()) {
+      frame.pushStackItem(Bytes.EMPTY);
+    } else {
+      final BigInteger b1 =
+          value0.size() < 32
+              ? new BigInteger(1, value0.toArrayUnsafe())
+              : new BigInteger(value0.toArrayUnsafe());
+      final BigInteger b2 =
+          value1.size() < 32
+              ? new BigInteger(1, value1.toArrayUnsafe())
+              : new BigInteger(value1.toArrayUnsafe());
+      BigInteger result = b1.abs().mod(b2.abs());
+      if (b1.signum() < 0) {
+        result = result.negate();
+      }
+
+      Bytes resultBytes = Bytes.wrap(result.toByteArray());
+      if (resultBytes.size() > 32) {
+        resultBytes = resultBytes.slice(resultBytes.size() - 32, 32);
+      }
+
+      final byte[] padding = new byte[32 - resultBytes.size()];
+      Arrays.fill(padding, result.signum() < 0 ? (byte) 0xFF : 0x00);
+
+      frame.pushStackItem(Bytes.concatenate(Bytes.wrap(padding), resultBytes));
+    }
+
+    return smodSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/SStoreOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/SStoreOperation.java
new file mode 100644
index 00000000000..b4fa49751e4
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/SStoreOperation.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import java.util.function.Supplier;
+
+import com.google.common.base.Suppliers;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** The SStore operation. */
+public class SStoreOperation extends AbstractOperation {
+
+  /** The constant FRONTIER_MINIMUM. */
+  public static final long FRONTIER_MINIMUM = 0L;
+  /** The constant EIP_1706_MINIMUM. */
+  public static final long EIP_1706_MINIMUM = 2300L;
+
+  /** The constant ILLEGAL_STATE_CHANGE. */
+  protected static final OperationResult ILLEGAL_STATE_CHANGE =
+      new OperationResult(0L, ExceptionalHaltReason.ILLEGAL_STATE_CHANGE);
+
+  private final long minimumGasRemaining;
+
+  /**
+   * Instantiates a new SStore operation.
+   *
+   * @param gasCalculator the gas calculator
+   * @param minimumGasRemaining the minimum gas remaining
+   */
+  public SStoreOperation(final GasCalculator gasCalculator, final long minimumGasRemaining) {
+    super(0x55, "SSTORE", 2, 0, gasCalculator);
+    this.minimumGasRemaining = minimumGasRemaining;
+  }
+
+  /**
+   * Gets minimum gas remaining.
+   *
+   * @return the minimum gas remaining
+   */
+  public long getMinimumGasRemaining() {
+    return minimumGasRemaining;
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+
+    final UInt256 key = UInt256.fromBytes(frame.popStackItem());
+    final UInt256 newValue = UInt256.fromBytes(frame.popStackItem());
+
+    final MutableAccount account =
+        frame.getWorldUpdater().getAccount(frame.getRecipientAddress()).getMutable();
+    if (account == null) {
+      return ILLEGAL_STATE_CHANGE;
+    }
+
+    final Address address = account.getAddress();
+    final boolean slotIsWarm = frame.warmUpStorage(address, key);
+    final Supplier<UInt256> currentValueSupplier =
+        Suppliers.memoize(() -> account.getStorageValue(key));
+    final Supplier<UInt256> originalValueSupplier =
+        Suppliers.memoize(() -> account.getOriginalStorageValue(key));
+
+    final long cost =
+        gasCalculator().calculateStorageCost(newValue, currentValueSupplier, originalValueSupplier)
+            + (slotIsWarm ? 0L : gasCalculator().getColdSloadCost());
+
+    final long remainingGas = frame.getRemainingGas();
+    if (frame.isStatic()) {
+      return new OperationResult(remainingGas, ExceptionalHaltReason.ILLEGAL_STATE_CHANGE);
+    } else if (remainingGas < cost) {
+      return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+    } else if (remainingGas <= minimumGasRemaining) {
+      return new OperationResult(minimumGasRemaining, ExceptionalHaltReason.INSUFFICIENT_GAS);
+    }
+
+    // Increment the refund counter.
+    frame.incrementGasRefund(
+        gasCalculator()
+            .calculateStorageRefundAmount(newValue, currentValueSupplier, originalValueSupplier));
+
+    account.setStorageValue(key, newValue);
+    frame.storageWasUpdated(key, newValue);
+    return new OperationResult(cost, null);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/SarOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/SarOperation.java
new file mode 100644
index 00000000000..f40881db99e
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/SarOperation.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.apache.tuweni.bytes.Bytes32.leftPad;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Sar operation. */
+public class SarOperation extends AbstractFixedCostOperation {
+
+  /** The Sar operation success result. */
+  static final OperationResult sarSuccess = new OperationResult(3, null);
+
+  private static final Bytes ALL_BITS =
+      Bytes.fromHexString("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
+
+  /**
+   * Instantiates a new Sar operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public SarOperation(final GasCalculator gasCalculator) {
+    super(0x1d, "SAR", 2, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs sar operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    Bytes shiftAmount = frame.popStackItem();
+    final Bytes value = leftPad(frame.popStackItem());
+    final boolean negativeNumber = value.get(0) < 0;
+    if (shiftAmount.size() > 4 && (shiftAmount = shiftAmount.trimLeadingZeros()).size() > 4) {
+      frame.pushStackItem(negativeNumber ? ALL_BITS : Bytes.EMPTY);
+    } else {
+      final int shiftAmountInt = shiftAmount.toInt();
+
+      if (shiftAmountInt >= 256 || shiftAmountInt < 0) {
+        frame.pushStackItem(negativeNumber ? ALL_BITS : Bytes.EMPTY);
+      } else {
+        // first perform standard shift right.
+        Bytes result = value.shiftRight(shiftAmountInt);
+
+        // if a negative number, carry through the sign.
+        if (negativeNumber) {
+          final Bytes significantBits = ALL_BITS.shiftLeft(256 - shiftAmountInt);
+          result = result.or(significantBits);
+        }
+        frame.pushStackItem(result);
+      }
+    }
+    return sarSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/SelfBalanceOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/SelfBalanceOperation.java
new file mode 100644
index 00000000000..7e9761f726e
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/SelfBalanceOperation.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Self balance operation. */
+public class SelfBalanceOperation extends AbstractFixedCostOperation {
+
+  /**
+   * Instantiates a new Self balance operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public SelfBalanceOperation(final GasCalculator gasCalculator) {
+    super(0x47, "SELFBALANCE", 0, 1, gasCalculator, gasCalculator.getLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    final Address accountAddress = frame.getRecipientAddress();
+    final Account account = frame.getWorldUpdater().get(accountAddress);
+    frame.pushStackItem(account == null ? Bytes.EMPTY : account.getBalance());
+
+    return successResponse;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/SelfDestructOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/SelfDestructOperation.java
new file mode 100644
index 00000000000..e0e5a728293
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/SelfDestructOperation.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.Words;
+
+/** The Self destruct operation. */
+public class SelfDestructOperation extends AbstractOperation {
+
+  /**
+   * Instantiates a new Self destruct operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public SelfDestructOperation(final GasCalculator gasCalculator) {
+    super(0xFF, "SELFDESTRUCT", 1, 0, gasCalculator);
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    final Address recipientAddress = Words.toAddress(frame.popStackItem());
+
+    // because of weird EIP150/158 reasons we care about a null account, so we can't merge this.
+    final Account recipientNullable = frame.getWorldUpdater().get(recipientAddress);
+    final Wei inheritance = frame.getWorldUpdater().get(frame.getRecipientAddress()).getBalance();
+
+    final boolean accountIsWarm =
+        frame.warmUpAddress(recipientAddress) || gasCalculator().isPrecompile(recipientAddress);
+
+    final long cost =
+        gasCalculator().selfDestructOperationGasCost(recipientNullable, inheritance)
+            + (accountIsWarm ? 0L : gasCalculator().getColdAccountAccessCost());
+
+    if (frame.isStatic()) {
+      return new OperationResult(cost, ExceptionalHaltReason.ILLEGAL_STATE_CHANGE);
+    } else if (frame.getRemainingGas() < cost) {
+      return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+    }
+
+    final Address address = frame.getRecipientAddress();
+    final MutableAccount account = frame.getWorldUpdater().getAccount(address).getMutable();
+
+    frame.addSelfDestruct(address);
+
+    final MutableAccount recipient =
+        frame.getWorldUpdater().getOrCreate(recipientAddress).getMutable();
+
+    if (!account.getAddress().equals(recipient.getAddress())) {
+      recipient.incrementBalance(account.getBalance());
+    }
+
+    // add refund in message frame
+    frame.addRefund(recipient.getAddress(), account.getBalance());
+
+    account.setBalance(Wei.ZERO);
+
+    frame.setState(MessageFrame.State.CODE_SUCCESS);
+    return new OperationResult(cost, null);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/ShlOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/ShlOperation.java
new file mode 100644
index 00000000000..ec152ae778c
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/ShlOperation.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.apache.tuweni.bytes.Bytes32.leftPad;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Shl (Shift Left) operation. */
+public class ShlOperation extends AbstractFixedCostOperation {
+
+  /** The Shl operation success result. */
+  static final OperationResult shlSuccess = new OperationResult(3, null);
+
+  /**
+   * Instantiates a new Shl operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public ShlOperation(final GasCalculator gasCalculator) {
+    super(0x1b, "SHL", 2, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs Shift Left operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    Bytes shiftAmount = frame.popStackItem();
+    if (shiftAmount.size() > 4 && (shiftAmount = shiftAmount.trimLeadingZeros()).size() > 4) {
+      frame.popStackItem();
+      frame.pushStackItem(Bytes.EMPTY);
+    } else {
+      final int shiftAmountInt = shiftAmount.toInt();
+      final Bytes value = leftPad(frame.popStackItem());
+
+      if (shiftAmountInt >= 256 || shiftAmountInt < 0) {
+        frame.pushStackItem(Bytes.EMPTY);
+      } else {
+        frame.pushStackItem(value.shiftLeft(shiftAmountInt));
+      }
+    }
+    return shlSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/ShrOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/ShrOperation.java
new file mode 100644
index 00000000000..9b2c9ea5aa9
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/ShrOperation.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.apache.tuweni.bytes.Bytes32.leftPad;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Shr (Shift Right) operation. */
+public class ShrOperation extends AbstractFixedCostOperation {
+
+  /** The Shr operation success result. */
+  static final OperationResult shrSuccess = new OperationResult(3, null);
+
+  /**
+   * Instantiates a new Shr operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public ShrOperation(final GasCalculator gasCalculator) {
+    super(0x1c, "SHR", 2, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs SHR operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    Bytes shiftAmount = frame.popStackItem();
+    if (shiftAmount.size() > 4 && (shiftAmount = shiftAmount.trimLeadingZeros()).size() > 4) {
+      frame.popStackItem();
+      frame.pushStackItem(Bytes.EMPTY);
+    } else {
+      final int shiftAmountInt = shiftAmount.toInt();
+      final Bytes value = leftPad(frame.popStackItem());
+
+      if (shiftAmountInt >= 256 || shiftAmountInt < 0) {
+        frame.pushStackItem(Bytes.EMPTY);
+      } else {
+        frame.pushStackItem(value.shiftRight(shiftAmountInt));
+      }
+    }
+    return shrSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/SignExtendOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/SignExtendOperation.java
new file mode 100644
index 00000000000..bd9d9178aa0
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/SignExtendOperation.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.bytes.MutableBytes32;
+
+/** The Sign extend operation. */
+public class SignExtendOperation extends AbstractFixedCostOperation {
+
+  private static final OperationResult signExtendSuccess = new OperationResult(5, null);
+
+  /**
+   * Instantiates a new Sign extend operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public SignExtendOperation(final GasCalculator gasCalculator) {
+    super(0x0B, "SIGNEXTEND", 2, 1, gasCalculator, gasCalculator.getLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs Sign Extend operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    final Bytes value0 = frame.popStackItem().trimLeadingZeros();
+    final Bytes value1 = Bytes32.leftPad(frame.popStackItem());
+
+    final MutableBytes32 result = MutableBytes32.create();
+
+    // Any value >= 31 imply an index <= 0, so no work to do (note that 0 itself is a valid index,
+    // but copying the 0th byte to itself is only so useful).
+    int value0size = value0.size();
+    if (value0size > 1) {
+      frame.pushStackItem(value1);
+      return signExtendSuccess;
+    }
+
+    int value0Value = value0.toInt();
+    if (value0Value >= 31) {
+      frame.pushStackItem(value1);
+      return signExtendSuccess;
+    }
+
+    final int byteIndex = 31 - value0.toInt();
+    final byte toSet = value1.get(byteIndex) < 0 ? (byte) 0xFF : 0x00;
+    result.mutableSlice(0, byteIndex).fill(toSet);
+    value1.slice(byteIndex).copyTo(result, byteIndex);
+    frame.pushStackItem(result);
+
+    return signExtendSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/StaticCallOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/StaticCallOperation.java
new file mode 100644
index 00000000000..e8eebae4e4d
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/StaticCallOperation.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.Words;
+
+/** The Static call operation. */
+public class StaticCallOperation extends AbstractCallOperation {
+
+  /**
+   * Instantiates a new Static call operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public StaticCallOperation(final GasCalculator gasCalculator) {
+    super(0xFA, "STATICCALL", 6, 1, gasCalculator);
+  }
+
+  @Override
+  protected Address to(final MessageFrame frame) {
+    return Words.toAddress(frame.getStackItem(1));
+  }
+
+  @Override
+  protected Wei value(final MessageFrame frame) {
+    return Wei.ZERO;
+  }
+
+  @Override
+  protected Wei apparentValue(final MessageFrame frame) {
+    return value(frame);
+  }
+
+  @Override
+  protected long inputDataOffset(final MessageFrame frame) {
+    return clampedToLong(frame.getStackItem(2));
+  }
+
+  @Override
+  protected long inputDataLength(final MessageFrame frame) {
+    return clampedToLong(frame.getStackItem(3));
+  }
+
+  @Override
+  protected long outputDataOffset(final MessageFrame frame) {
+    return clampedToLong(frame.getStackItem(4));
+  }
+
+  @Override
+  protected long outputDataLength(final MessageFrame frame) {
+    return clampedToLong(frame.getStackItem(5));
+  }
+
+  @Override
+  protected Address address(final MessageFrame frame) {
+    return to(frame);
+  }
+
+  @Override
+  protected Address sender(final MessageFrame frame) {
+    return frame.getRecipientAddress();
+  }
+
+  @Override
+  public long gasAvailableForChildCall(final MessageFrame frame) {
+    return gasCalculator().gasAvailableForChildCall(frame, gas(frame), !value(frame).isZero());
+  }
+
+  @Override
+  protected boolean isStatic(final MessageFrame frame) {
+    return true;
+  }
+
+  @Override
+  public long cost(final MessageFrame frame) {
+    final long stipend = gas(frame);
+    final long inputDataOffset = inputDataOffset(frame);
+    final long inputDataLength = inputDataLength(frame);
+    final long outputDataOffset = outputDataOffset(frame);
+    final long outputDataLength = outputDataLength(frame);
+    final Account recipient = frame.getWorldUpdater().get(address(frame));
+
+    return gasCalculator()
+        .callOperationGasCost(
+            frame,
+            stipend,
+            inputDataOffset,
+            inputDataLength,
+            outputDataOffset,
+            outputDataLength,
+            value(frame),
+            recipient,
+            to(frame));
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/StopOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/StopOperation.java
new file mode 100644
index 00000000000..7bbdb00682f
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/StopOperation.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Stop operation. */
+public class StopOperation extends AbstractFixedCostOperation {
+
+  /** The Stop operation success result. */
+  static final OperationResult stopSuccess = new OperationResult(0, null);
+
+  /**
+   * Instantiates a new Stop operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public StopOperation(final GasCalculator gasCalculator) {
+    super(0x00, "STOP", 0, 0, gasCalculator, gasCalculator.getZeroTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs Stop operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    frame.setState(MessageFrame.State.CODE_SUCCESS);
+    frame.setOutputData(Bytes.EMPTY);
+    return stopSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/SubOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/SubOperation.java
new file mode 100644
index 00000000000..491f1ff5980
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/SubOperation.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import java.math.BigInteger;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+/** The Sub (Subtract) operation. */
+public class SubOperation extends AbstractFixedCostOperation {
+
+  /** The Sub operation success result. */
+  static final OperationResult subSuccess = new OperationResult(3, null);
+
+  /**
+   * Instantiates a new Sub operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public SubOperation(final GasCalculator gasCalculator) {
+    super(0x03, "SUB", 2, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs Sub operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    final BigInteger value0 = new BigInteger(1, frame.popStackItem().toArrayUnsafe());
+    final BigInteger value1 = new BigInteger(1, frame.popStackItem().toArrayUnsafe());
+
+    final BigInteger result = value0.subtract(value1);
+
+    byte[] resultArray = result.toByteArray();
+    int length = resultArray.length;
+    if (length >= 32) {
+      frame.pushStackItem(Bytes.wrap(resultArray, length - 32, 32));
+    } else if (result.signum() < 0) {
+      frame.pushStackItem(Bytes32.leftPad(Bytes.wrap(resultArray), (byte) -1));
+    } else {
+      frame.pushStackItem(Bytes.wrap(resultArray));
+    }
+
+    return subSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/SwapOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/SwapOperation.java
new file mode 100644
index 00000000000..bcb11bd9b8c
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/SwapOperation.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Swap operation. */
+public class SwapOperation extends AbstractFixedCostOperation {
+
+  /** The constant SWAP_BASE. */
+  public static final int SWAP_BASE = 0x8F;
+  /** The Swap operation success result. */
+  static final OperationResult swapSuccess = new OperationResult(3, null);
+
+  private final int index;
+  /** The operation result due to underflow. */
+  protected final Operation.OperationResult underflowResponse;
+
+  /**
+   * Instantiates a new Swap operation.
+   *
+   * @param index the index
+   * @param gasCalculator the gas calculator
+   */
+  public SwapOperation(final int index, final GasCalculator gasCalculator) {
+    super(
+        SWAP_BASE + index,
+        "SWAP" + index,
+        index + 1,
+        index + 1,
+        gasCalculator,
+        gasCalculator.getVeryLowTierGasCost());
+    this.index = index;
+    this.underflowResponse =
+        new Operation.OperationResult(gasCost, ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS);
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame, index);
+  }
+
+  /**
+   * Performs swap operation.
+   *
+   * @param frame the frame
+   * @param index the index
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame, final int index) {
+    final Bytes tmp = frame.getStackItem(0);
+    frame.setStackItem(0, frame.getStackItem(index));
+    frame.setStackItem(index, tmp);
+
+    return swapSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/TLoadOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/TLoadOperation.java
new file mode 100644
index 00000000000..e813e72e1a9
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/TLoadOperation.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright Hyperledger Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.FixedStack.OverflowException;
+import org.hyperledger.besu.evm.internal.FixedStack.UnderflowException;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** Implements the TLOAD operation defined in EIP-1153 */
+public class TLoadOperation extends AbstractOperation {
+
+  /**
+   * TLoad operation
+   *
+   * @param gasCalculator gas calculator for costing
+   */
+  public TLoadOperation(final GasCalculator gasCalculator) {
+    super(0x5C, "TLOAD", 1, 1, gasCalculator);
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    final long cost = gasCalculator().getTransientLoadOperationGasCost();
+    try {
+      final Bytes32 slot = UInt256.fromBytes(frame.popStackItem());
+      if (frame.getRemainingGas() < cost) {
+        return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+      } else {
+        frame.pushStackItem(frame.getTransientStorageValue(frame.getRecipientAddress(), slot));
+
+        return new OperationResult(cost, null);
+      }
+    } catch (final UnderflowException ufe) {
+      return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_STACK_ITEMS);
+    } catch (final OverflowException ofe) {
+      return new OperationResult(cost, ExceptionalHaltReason.TOO_MANY_STACK_ITEMS);
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/TStoreOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/TStoreOperation.java
new file mode 100644
index 00000000000..d8b8730cd5f
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/TStoreOperation.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright Hyperledger Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** Implements the TLOAD operation defined in EIP-1153 */
+public class TStoreOperation extends AbstractOperation {
+
+  /**
+   * TLoad operation
+   *
+   * @param gasCalculator gas calculator for costing
+   */
+  public TStoreOperation(final GasCalculator gasCalculator) {
+    super(0x5D, "TSTORE", 2, 0, gasCalculator);
+  }
+
+  @Override
+  public OperationResult execute(final MessageFrame frame, final EVM evm) {
+    final UInt256 key = UInt256.fromBytes(frame.popStackItem());
+    final UInt256 value = UInt256.fromBytes(frame.popStackItem());
+
+    final long cost = gasCalculator().getTransientStoreOperationGasCost();
+
+    final long remainingGas = frame.getRemainingGas();
+    if (frame.isStatic()) {
+      return new OperationResult(remainingGas, ExceptionalHaltReason.ILLEGAL_STATE_CHANGE);
+    } else if (remainingGas < cost) {
+      return new OperationResult(cost, ExceptionalHaltReason.INSUFFICIENT_GAS);
+    } else {
+      frame.setTransientStorageValue(frame.getRecipientAddress(), key, value);
+      return new OperationResult(cost, null);
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/TimestampOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/TimestampOperation.java
new file mode 100644
index 00000000000..55863d0d69e
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/TimestampOperation.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.Words;
+
+/** The Timestamp operation. */
+public class TimestampOperation extends AbstractFixedCostOperation {
+
+  /**
+   * Instantiates a new Timestamp operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public TimestampOperation(final GasCalculator gasCalculator) {
+    super(0x42, "TIMESTAMP", 0, 1, gasCalculator, gasCalculator.getBaseTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    final long timestamp = frame.getBlockValues().getTimestamp();
+    frame.pushStackItem(Words.longBytes(timestamp));
+
+    return successResponse;
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/VirtualOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/VirtualOperation.java
similarity index 75%
rename from ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/VirtualOperation.java
rename to evm/src/main/java/org/hyperledger/besu/evm/operation/VirtualOperation.java
index bb03434bb4a..fdb61bff490 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/vm/operations/VirtualOperation.java
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/VirtualOperation.java
@@ -13,23 +13,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.hyperledger.besu.ethereum.vm.operations;
+package org.hyperledger.besu.evm.operation;
 
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.Operation;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
 
+/** The Virtual operation. */
 public class VirtualOperation implements Operation {
 
   private final Operation delegate;
 
+  /**
+   * Instantiates a new Virtual operation.
+   *
+   * @param delegate the delegate
+   */
   public VirtualOperation(final Operation delegate) {
     this.delegate = delegate;
   }
 
   @Override
   public OperationResult execute(final MessageFrame frame, final EVM evm) {
-    return delegate.execute(frame, evm);
+    OperationResult result = delegate.execute(frame, evm);
+    return new OperationResult(result.getGasCost(), result.getHaltReason(), 0);
   }
 
   @Override
@@ -52,16 +58,6 @@ public int getStackItemsProduced() {
     return delegate.getStackItemsProduced();
   }
 
-  @Override
-  public boolean getUpdatesProgramCounter() {
-    return delegate.getUpdatesProgramCounter();
-  }
-
-  @Override
-  public int getOpSize() {
-    return delegate.getOpSize();
-  }
-
   @Override
   public boolean isVirtualOperation() {
     return true;
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/XorOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/XorOperation.java
new file mode 100644
index 00000000000..f1f78d9f3ea
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/operation/XorOperation.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operation;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The XOR operation. */
+public class XorOperation extends AbstractFixedCostOperation {
+
+  /** The XOR operation success result. */
+  static final OperationResult xorSuccess = new OperationResult(3, null);
+
+  /**
+   * Instantiates a new Xor operation.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public XorOperation(final GasCalculator gasCalculator) {
+    super(0x18, "XOR", 2, 1, gasCalculator, gasCalculator.getVeryLowTierGasCost());
+  }
+
+  @Override
+  public Operation.OperationResult executeFixedCostOperation(
+      final MessageFrame frame, final EVM evm) {
+    return staticOperation(frame);
+  }
+
+  /**
+   * Performs XOR operation.
+   *
+   * @param frame the frame
+   * @return the operation result
+   */
+  public static OperationResult staticOperation(final MessageFrame frame) {
+    final Bytes value0 = frame.popStackItem();
+    final Bytes value1 = frame.popStackItem();
+
+    final Bytes result = value0.xor(value1);
+
+    frame.pushStackItem(result);
+
+    return xorSuccess;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/precompile/AbstractAltBnPrecompiledContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/AbstractAltBnPrecompiledContract.java
new file mode 100644
index 00000000000..c44e4822ad0
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/AbstractAltBnPrecompiledContract.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
+
+import java.util.Optional;
+import javax.annotation.Nonnull;
+
+import com.sun.jna.ptr.IntByReference;
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Abstract AltBn precompiled contract. */
+public abstract class AbstractAltBnPrecompiledContract extends AbstractPrecompiledContract {
+
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractAltBnPrecompiledContract.class);
+
+  /** The constant useNative. */
+  // use the native library implementation, if it is available
+  static boolean useNative;
+
+  static {
+    try {
+      useNative = LibEthPairings.ENABLED;
+    } catch (UnsatisfiedLinkError ule) {
+      LOG.info("altbn128 native precompile not available: {}", ule.getMessage());
+      useNative = false;
+    }
+  }
+
+  /** Disable native. */
+  public static void disableNative() {
+    useNative = false;
+  }
+
+  /**
+   * Is native boolean.
+   *
+   * @return the boolean
+   */
+  public static boolean isNative() {
+    return useNative;
+  }
+
+  private final byte operationId;
+  private final int inputLen;
+
+  /**
+   * Instantiates a new Abstract alt bn precompiled contract.
+   *
+   * @param name the name
+   * @param gasCalculator the gas calculator
+   * @param operationId the operation id
+   * @param inputLen the input len
+   */
+  AbstractAltBnPrecompiledContract(
+      final String name,
+      final GasCalculator gasCalculator,
+      final byte operationId,
+      final int inputLen) {
+    super(name, gasCalculator);
+    this.operationId = operationId;
+    this.inputLen = inputLen + 1;
+
+    if (!LibEthPairings.ENABLED) {
+      LOG.info("Native alt bn128 not available");
+    }
+  }
+
+  /**
+   * Compute native precompile contract result.
+   *
+   * @param input the input
+   * @param messageFrame the message frame
+   * @return the precompile contract result
+   */
+  @Nonnull
+  public PrecompileContractResult computeNative(
+      final @Nonnull Bytes input, final MessageFrame messageFrame) {
+    final byte[] result = new byte[LibEthPairings.EIP196_PREALLOCATE_FOR_RESULT_BYTES];
+    final byte[] error = new byte[LibEthPairings.EIP2537_PREALLOCATE_FOR_ERROR_BYTES];
+
+    final IntByReference o_len =
+        new IntByReference(LibEthPairings.EIP196_PREALLOCATE_FOR_RESULT_BYTES);
+    final IntByReference err_len =
+        new IntByReference(LibEthPairings.EIP2537_PREALLOCATE_FOR_ERROR_BYTES);
+    final int inputSize = Math.min(inputLen, input.size());
+    final int errorNo =
+        LibEthPairings.eip196_perform_operation(
+            operationId,
+            input.slice(0, inputSize).toArrayUnsafe(),
+            inputSize,
+            result,
+            o_len,
+            error,
+            err_len);
+    if (errorNo == 0) {
+      return PrecompileContractResult.success(Bytes.wrap(result, 0, o_len.getValue()));
+    } else {
+      final String errorString = new String(error, 0, err_len.getValue(), UTF_8);
+      messageFrame.setRevertReason(Bytes.wrap(error, 0, err_len.getValue()));
+      LOG.trace("Error executing precompiled contract {}: '{}'", getName(), errorString);
+      return PrecompileContractResult.halt(
+          null, Optional.of(ExceptionalHaltReason.PRECOMPILE_ERROR));
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/precompile/AbstractBLS12PrecompiledContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/AbstractBLS12PrecompiledContract.java
new file mode 100644
index 00000000000..159e4d39962
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/AbstractBLS12PrecompiledContract.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
+
+import java.util.Optional;
+import javax.annotation.Nonnull;
+
+import com.sun.jna.ptr.IntByReference;
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Abstract BLS12 precompiled contract. */
+public abstract class AbstractBLS12PrecompiledContract implements PrecompiledContract {
+
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractBLS12PrecompiledContract.class);
+
+  /** The Discount table. */
+  static final int[] DISCOUNT_TABLE =
+      new int[] {
+        -1, 1_200, 888, 764, 641, 594, 547, 500, 453, 438, 423, 408, 394, 379, 364, 349,
+        334, 330, 326, 322, 318, 314, 310, 306, 302, 298, 294, 289, 285, 281, 277, 273,
+        269, 268, 266, 265, 263, 262, 260, 259, 257, 256, 254, 253, 251, 250, 248, 247,
+        245, 244, 242, 241, 239, 238, 236, 235, 233, 232, 231, 229, 228, 226, 225, 223,
+        222, 221, 220, 219, 219, 218, 217, 216, 216, 215, 214, 213, 213, 212, 211, 211,
+        210, 209, 208, 208, 207, 206, 205, 205, 204, 203, 202, 202, 201, 200, 199, 199,
+        198, 197, 196, 196, 195, 194, 193, 193, 192, 191, 191, 190, 189, 188, 188, 187,
+        186, 185, 185, 184, 183, 182, 182, 181, 180, 179, 179, 178, 177, 176, 176, 175,
+        174
+      };
+
+  /** The Max discount. */
+  static final int MAX_DISCOUNT = 174;
+
+  private final String name;
+  private final byte operationId;
+  private final int inputLen;
+
+  /**
+   * Instantiates a new Abstract BLS12 precompiled contract.
+   *
+   * @param name the name
+   * @param operationId the operation id
+   * @param inputLen the input len
+   */
+  AbstractBLS12PrecompiledContract(final String name, final byte operationId, final int inputLen) {
+    this.name = name;
+    this.operationId = operationId;
+    this.inputLen = inputLen + 1;
+  }
+
+  @Override
+  public String getName() {
+    return name;
+  }
+
+  @Nonnull
+  @Override
+  public PrecompileContractResult computePrecompile(
+      final Bytes input, @Nonnull final MessageFrame messageFrame) {
+    final byte[] result = new byte[LibEthPairings.EIP2537_PREALLOCATE_FOR_RESULT_BYTES];
+    final byte[] error = new byte[LibEthPairings.EIP2537_PREALLOCATE_FOR_ERROR_BYTES];
+
+    final IntByReference o_len =
+        new IntByReference(LibEthPairings.EIP2537_PREALLOCATE_FOR_RESULT_BYTES);
+    final IntByReference err_len =
+        new IntByReference(LibEthPairings.EIP2537_PREALLOCATE_FOR_ERROR_BYTES);
+    final int inputSize = Math.min(inputLen, input.size());
+    final int errorNo =
+        LibEthPairings.eip2537_perform_operation(
+            operationId,
+            input.slice(0, inputSize).toArrayUnsafe(),
+            inputSize,
+            result,
+            o_len,
+            error,
+            err_len);
+    if (errorNo == 0) {
+      return PrecompileContractResult.success(Bytes.wrap(result, 0, o_len.getValue()));
+    } else {
+      final String errorMessage = new String(error, 0, err_len.getValue(), UTF_8);
+      messageFrame.setRevertReason(Bytes.wrap(error, 0, err_len.getValue()));
+      LOG.trace("Error executing precompiled contract {}: '{}'", name, errorMessage);
+      return PrecompileContractResult.halt(
+          null, Optional.of(ExceptionalHaltReason.PRECOMPILE_ERROR));
+    }
+  }
+
+  /**
+   * Gets discount.
+   *
+   * @param k the k
+   * @return the discount
+   */
+  protected int getDiscount(final int k) {
+    // `k * multiplication_cost * discount / multiplier` where `multiplier = 1000`
+    // multiplication_cost and multiplier are folded into one constant as a long and placed first to
+    // prevent int32 overflow
+    // there was a table prepared for discount in case of k <= 128 points in the multiexponentiation
+    // with a discount cup max_discount for k > 128.
+
+    if (k >= DISCOUNT_TABLE.length) {
+      return MAX_DISCOUNT;
+    }
+    return DISCOUNT_TABLE[k];
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/precompile/AbstractPrecompiledContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/AbstractPrecompiledContract.java
new file mode 100644
index 00000000000..ed2a4ad585b
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/AbstractPrecompiledContract.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** Skeleton class for {@link PrecompiledContract} implementations. */
+@SuppressWarnings("unused")
+public abstract class AbstractPrecompiledContract implements PrecompiledContract {
+
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractPrecompiledContract.class);
+
+  private final GasCalculator gasCalculator;
+
+  private final String name;
+
+  /**
+   * Instantiates a new Abstract precompiled contract.
+   *
+   * @param name the name
+   * @param gasCalculator the gas calculator
+   */
+  protected AbstractPrecompiledContract(final String name, final GasCalculator gasCalculator) {
+    this.name = name;
+    this.gasCalculator = gasCalculator;
+  }
+
+  /**
+   * Gas calculator.
+   *
+   * @return the gas calculator
+   */
+  protected GasCalculator gasCalculator() {
+    return gasCalculator;
+  }
+
+  @Override
+  public String getName() {
+    return name;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/precompile/AltBN128AddPrecompiledContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/AltBN128AddPrecompiledContract.java
new file mode 100644
index 00000000000..026a78c4a25
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/AltBN128AddPrecompiledContract.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import org.hyperledger.besu.crypto.altbn128.AltBn128Point;
+import org.hyperledger.besu.crypto.altbn128.Fq;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
+
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Optional;
+import javax.annotation.Nonnull;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.MutableBytes;
+
+/** The AltBN128Add precompiled contract. */
+public class AltBN128AddPrecompiledContract extends AbstractAltBnPrecompiledContract {
+
+  private static final int PARAMETER_LENGTH = 128;
+
+  private final long gasCost;
+
+  private AltBN128AddPrecompiledContract(final GasCalculator gasCalculator, final long gasCost) {
+    super(
+        "AltBN128Add",
+        gasCalculator,
+        LibEthPairings.EIP196_ADD_OPERATION_RAW_VALUE,
+        PARAMETER_LENGTH);
+    this.gasCost = gasCost;
+  }
+
+  /**
+   * Create Byzantium AltBN128Add precompiled contract.
+   *
+   * @param gasCalculator the gas calculator
+   * @return the AltBN128Add precompiled contract
+   */
+  public static AltBN128AddPrecompiledContract byzantium(final GasCalculator gasCalculator) {
+    return new AltBN128AddPrecompiledContract(gasCalculator, 500L);
+  }
+
+  /**
+   * Create Istanbul AltBN128Add precompiled contract.
+   *
+   * @param gasCalculator the gas calculator
+   * @return the AltBN128Add precompiled contract
+   */
+  public static AltBN128AddPrecompiledContract istanbul(final GasCalculator gasCalculator) {
+    return new AltBN128AddPrecompiledContract(gasCalculator, 150L);
+  }
+
+  @Override
+  public long gasRequirement(final Bytes input) {
+    return gasCost;
+  }
+
+  @Nonnull
+  @Override
+  public PrecompileContractResult computePrecompile(
+      final Bytes input, @Nonnull final MessageFrame messageFrame) {
+    if (useNative) {
+      return computeNative(input, messageFrame);
+    } else {
+      return computeDefault(input);
+    }
+  }
+
+  private static PrecompileContractResult computeDefault(final Bytes input) {
+    final BigInteger x1 = extractParameter(input, 0, 32);
+    final BigInteger y1 = extractParameter(input, 32, 32);
+    final BigInteger x2 = extractParameter(input, 64, 32);
+    final BigInteger y2 = extractParameter(input, 96, 32);
+
+    final AltBn128Point p1 = new AltBn128Point(Fq.create(x1), Fq.create(y1));
+    final AltBn128Point p2 = new AltBn128Point(Fq.create(x2), Fq.create(y2));
+    if (!p1.isOnCurve() || !p2.isOnCurve()) {
+      return PrecompileContractResult.halt(
+          null, Optional.of(ExceptionalHaltReason.PRECOMPILE_ERROR));
+    }
+    final AltBn128Point sum = p1.add(p2);
+    final Bytes x = sum.getX().toBytes();
+    final Bytes y = sum.getY().toBytes();
+    final MutableBytes result = MutableBytes.create(64);
+    x.copyTo(result, 32 - x.size());
+    y.copyTo(result, 64 - y.size());
+
+    return PrecompileContractResult.success(result.copy());
+  }
+
+  private static BigInteger extractParameter(
+      final Bytes input, final int offset, final int length) {
+    if (offset > input.size() || length == 0) {
+      return BigInteger.ZERO;
+    }
+    final byte[] raw = Arrays.copyOfRange(input.toArray(), offset, offset + length);
+    return new BigInteger(1, raw);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/precompile/AltBN128MulPrecompiledContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/AltBN128MulPrecompiledContract.java
new file mode 100644
index 00000000000..0b8da1a3e40
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/AltBN128MulPrecompiledContract.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import org.hyperledger.besu.crypto.altbn128.AltBn128Point;
+import org.hyperledger.besu.crypto.altbn128.Fq;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
+
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Optional;
+import javax.annotation.Nonnull;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.MutableBytes;
+
+/** The AltBN128Mul precompiled contract. */
+public class AltBN128MulPrecompiledContract extends AbstractAltBnPrecompiledContract {
+
+  private static final int PARAMETER_LENGTH = 96;
+
+  private static final BigInteger MAX_N =
+      new BigInteger(
+          "115792089237316195423570985008687907853269984665640564039457584007913129639935");
+
+  private final long gasCost;
+
+  private AltBN128MulPrecompiledContract(final GasCalculator gasCalculator, final long gasCost) {
+    super(
+        "AltBN128Mul",
+        gasCalculator,
+        LibEthPairings.EIP196_MUL_OPERATION_RAW_VALUE,
+        PARAMETER_LENGTH);
+    this.gasCost = gasCost;
+  }
+
+  /**
+   * Create Byzantium AltBN128Mul precompiled contract.
+   *
+   * @param gasCalculator the gas calculator
+   * @return the alt bn 128 mul precompiled contract
+   */
+  public static AltBN128MulPrecompiledContract byzantium(final GasCalculator gasCalculator) {
+    return new AltBN128MulPrecompiledContract(gasCalculator, 40_000L);
+  }
+
+  /**
+   * Create Istanbul AltBN128Mul precompiled contract.
+   *
+   * @param gasCalculator the gas calculator
+   * @return the alt bn 128 mul precompiled contract
+   */
+  public static AltBN128MulPrecompiledContract istanbul(final GasCalculator gasCalculator) {
+    return new AltBN128MulPrecompiledContract(gasCalculator, 6_000L);
+  }
+
+  @Override
+  public long gasRequirement(final Bytes input) {
+    return gasCost;
+  }
+
+  @Nonnull
+  @Override
+  public PrecompileContractResult computePrecompile(
+      final Bytes input, @Nonnull final MessageFrame messageFrame) {
+    if (useNative) {
+      return computeNative(input, messageFrame);
+    } else {
+      return computeDefault(input);
+    }
+  }
+
+  @Nonnull
+  private static PrecompileContractResult computeDefault(final Bytes input) {
+    final BigInteger x = extractParameter(input, 0, 32);
+    final BigInteger y = extractParameter(input, 32, 32);
+    final BigInteger n = extractParameter(input, 64, 32);
+
+    final AltBn128Point p = new AltBn128Point(Fq.create(x), Fq.create(y));
+    if (!p.isOnCurve() || n.compareTo(MAX_N) > 0) {
+      return PrecompileContractResult.halt(
+          null, Optional.of(ExceptionalHaltReason.PRECOMPILE_ERROR));
+    }
+    final AltBn128Point product = p.multiply(n);
+
+    final Bytes xResult = product.getX().toBytes();
+    final Bytes yResult = product.getY().toBytes();
+    final MutableBytes result = MutableBytes.create(64);
+    xResult.copyTo(result, 32 - xResult.size());
+    yResult.copyTo(result, 64 - yResult.size());
+
+    return PrecompileContractResult.success(result);
+  }
+
+  private static BigInteger extractParameter(
+      final Bytes input, final int offset, final int length) {
+    if (offset > input.size() || length == 0) {
+      return BigInteger.ZERO;
+    }
+    final byte[] raw = Arrays.copyOfRange(input.toArray(), offset, offset + length);
+    return new BigInteger(1, raw);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/precompile/AltBN128PairingPrecompiledContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/AltBN128PairingPrecompiledContract.java
new file mode 100644
index 00000000000..fd5205b3098
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/AltBN128PairingPrecompiledContract.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import org.hyperledger.besu.crypto.altbn128.AltBn128Fq12Pairer;
+import org.hyperledger.besu.crypto.altbn128.AltBn128Fq2Point;
+import org.hyperledger.besu.crypto.altbn128.AltBn128Point;
+import org.hyperledger.besu.crypto.altbn128.Fq;
+import org.hyperledger.besu.crypto.altbn128.Fq12;
+import org.hyperledger.besu.crypto.altbn128.Fq2;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import javax.annotation.Nonnull;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The AltBN128Pairing precompiled contract. */
+public class AltBN128PairingPrecompiledContract extends AbstractAltBnPrecompiledContract {
+
+  private static final int FIELD_LENGTH = 32;
+  private static final int PARAMETER_LENGTH = 192;
+
+  /** The constant FALSE. */
+  static final Bytes FALSE =
+      Bytes.fromHexString("0x0000000000000000000000000000000000000000000000000000000000000000");
+  /** The constant TRUE. */
+  public static final Bytes TRUE =
+      Bytes.fromHexString("0x0000000000000000000000000000000000000000000000000000000000000001");
+
+  private final long pairingGasCost;
+  private final long baseGasCost;
+
+  private AltBN128PairingPrecompiledContract(
+      final GasCalculator gasCalculator, final long pairingGasCost, final long baseGasCost) {
+    super(
+        "AltBN128Pairing",
+        gasCalculator,
+        LibEthPairings.EIP196_PAIR_OPERATION_RAW_VALUE,
+        Integer.MAX_VALUE / PARAMETER_LENGTH * PARAMETER_LENGTH);
+    this.pairingGasCost = pairingGasCost;
+    this.baseGasCost = baseGasCost;
+  }
+
+  /**
+   * Create Byzantium AltBN128Pairing precompiled contract.
+   *
+   * @param gasCalculator the gas calculator
+   * @return the AltBN128Pairing precompiled contract
+   */
+  public static AltBN128PairingPrecompiledContract byzantium(final GasCalculator gasCalculator) {
+    return new AltBN128PairingPrecompiledContract(gasCalculator, 80_000L, 100_000L);
+  }
+
+  /**
+   * Create Istanbul AltBN128Pairing precompiled contract.
+   *
+   * @param gasCalculator the gas calculator
+   * @return the AltBN128Pairing precompiled contract
+   */
+  public static AltBN128PairingPrecompiledContract istanbul(final GasCalculator gasCalculator) {
+    return new AltBN128PairingPrecompiledContract(gasCalculator, 34_000L, 45_000L);
+  }
+
+  @Override
+  public long gasRequirement(final Bytes input) {
+    final int parameters = input.size() / PARAMETER_LENGTH;
+    return (pairingGasCost * parameters) + baseGasCost;
+  }
+
+  @Nonnull
+  @Override
+  public PrecompileContractResult computePrecompile(
+      final Bytes input, @Nonnull final MessageFrame messageFrame) {
+    if (input.isEmpty()) {
+      return PrecompileContractResult.success(TRUE);
+    }
+    if (input.size() % PARAMETER_LENGTH != 0) {
+      return PrecompileContractResult.halt(
+          null, Optional.of(ExceptionalHaltReason.PRECOMPILE_ERROR));
+    }
+    if (useNative) {
+      return computeNative(input, messageFrame);
+    } else {
+      return computeDefault(input);
+    }
+  }
+
+  @Nonnull
+  private static PrecompileContractResult computeDefault(final Bytes input) {
+    final int parameters = input.size() / PARAMETER_LENGTH;
+    final List<AltBn128Point> a = new ArrayList<>();
+    final List<AltBn128Fq2Point> b = new ArrayList<>();
+    for (int i = 0; i < parameters; ++i) {
+      final BigInteger p1_x = extractParameter(input, i * PARAMETER_LENGTH, FIELD_LENGTH);
+      final BigInteger p1_y = extractParameter(input, i * PARAMETER_LENGTH + 32, FIELD_LENGTH);
+      final AltBn128Point p1 = new AltBn128Point(Fq.create(p1_x), Fq.create(p1_y));
+      if (!p1.isOnCurve()) {
+        return PrecompileContractResult.halt(
+            null, Optional.of(ExceptionalHaltReason.PRECOMPILE_ERROR));
+      }
+      a.add(p1);
+
+      final BigInteger p2_xImag = extractParameter(input, i * PARAMETER_LENGTH + 64, FIELD_LENGTH);
+      final BigInteger p2_xReal = extractParameter(input, i * PARAMETER_LENGTH + 96, FIELD_LENGTH);
+      final BigInteger p2_yImag = extractParameter(input, i * PARAMETER_LENGTH + 128, FIELD_LENGTH);
+      final BigInteger p2_yReal = extractParameter(input, i * PARAMETER_LENGTH + 160, FIELD_LENGTH);
+      final Fq2 p2_x = Fq2.create(p2_xReal, p2_xImag);
+      final Fq2 p2_y = Fq2.create(p2_yReal, p2_yImag);
+      final AltBn128Fq2Point p2 = new AltBn128Fq2Point(p2_x, p2_y);
+      if (!p2.isOnCurve() || !p2.isInGroup()) {
+        return PrecompileContractResult.halt(
+            null, Optional.of(ExceptionalHaltReason.PRECOMPILE_ERROR));
+      }
+      b.add(p2);
+    }
+
+    Fq12 exponent = Fq12.one();
+    for (int i = 0; i < parameters; ++i) {
+      exponent = exponent.multiply(AltBn128Fq12Pairer.pair(a.get(i), b.get(i)));
+    }
+
+    if (AltBn128Fq12Pairer.finalize(exponent).equals(Fq12.one())) {
+      return PrecompileContractResult.success(TRUE);
+    } else {
+      return PrecompileContractResult.success(FALSE);
+    }
+  }
+
+  private static BigInteger extractParameter(
+      final Bytes input, final int offset, final int length) {
+    if (offset > input.size() || length == 0) {
+      return BigInteger.ZERO;
+    }
+    final byte[] raw = Arrays.copyOfRange(input.toArray(), offset, offset + length);
+    return new BigInteger(1, raw);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLAKE2BFPrecompileContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLAKE2BFPrecompileContract.java
new file mode 100644
index 00000000000..de7152d6048
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLAKE2BFPrecompileContract.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import static java.util.Arrays.copyOfRange;
+import static org.hyperledger.besu.crypto.Blake2bfMessageDigest.Blake2bfDigest.MESSAGE_LENGTH_BYTES;
+
+import org.hyperledger.besu.crypto.Hash;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import java.math.BigInteger;
+import java.util.Optional;
+import javax.annotation.Nonnull;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The BLAKE2BF precompile contract. */
+// https://github.com/keep-network/go-ethereum/pull/4
+public class BLAKE2BFPrecompileContract extends AbstractPrecompiledContract {
+
+  private static final Logger LOG = LoggerFactory.getLogger(BLAKE2BFPrecompileContract.class);
+
+  /**
+   * Instantiates a new BLAKE2BF precompile contract.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public BLAKE2BFPrecompileContract(final GasCalculator gasCalculator) {
+    super("BLAKE2f", gasCalculator);
+  }
+
+  @Override
+  public long gasRequirement(final Bytes input) {
+    if (input.size() != MESSAGE_LENGTH_BYTES) {
+      // Input is malformed, we can't read the number of rounds.
+      // Precompile can't be executed, so we set its price to 0.
+      return 0L;
+    }
+    if ((input.get(212) & 0xFE) != 0) {
+      // Input is malformed, F value can be only 0 or 1
+      return 0L;
+    }
+
+    final byte[] roundsBytes = copyOfRange(input.toArray(), 0, 4);
+    final BigInteger rounds = new BigInteger(1, roundsBytes);
+    return rounds.longValueExact();
+  }
+
+  @Nonnull
+  @Override
+  public PrecompileContractResult computePrecompile(
+      final Bytes input, @Nonnull final MessageFrame messageFrame) {
+    if (input.size() != MESSAGE_LENGTH_BYTES) {
+      LOG.trace(
+          "Incorrect input length.  Expected {} and got {}", MESSAGE_LENGTH_BYTES, input.size());
+      return PrecompileContractResult.halt(
+          null, Optional.of(ExceptionalHaltReason.PRECOMPILE_ERROR));
+    }
+    if ((input.get(212) & 0xFE) != 0) {
+      LOG.trace("Incorrect finalization flag, expected 0 or 1 and got {}", input.get(212));
+      return PrecompileContractResult.halt(
+          null, Optional.of(ExceptionalHaltReason.PRECOMPILE_ERROR));
+    }
+    return PrecompileContractResult.success(Hash.blake2bf(input));
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1AddPrecompiledContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12G1AddPrecompiledContract.java
similarity index 75%
rename from ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1AddPrecompiledContract.java
rename to evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12G1AddPrecompiledContract.java
index c91b502a27c..c15f5748305 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1AddPrecompiledContract.java
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12G1AddPrecompiledContract.java
@@ -13,21 +13,24 @@
  * SPDX-License-Identifier: Apache-2.0
  *
  */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
+package org.hyperledger.besu.evm.precompile;
 
-import org.hyperledger.besu.ethereum.core.Gas;
 import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
 
 import org.apache.tuweni.bytes.Bytes;
 
+/** The BLS12G1 Add precompiled contract. */
 public class BLS12G1AddPrecompiledContract extends AbstractBLS12PrecompiledContract {
 
+  private static final int PARAMETER_LENGTH = 256;
+
+  /** Instantiates a new BLS12G1 Add precompiled contract. */
   public BLS12G1AddPrecompiledContract() {
-    super("BLS12_G1ADD", LibEthPairings.BLS12_G1ADD_OPERATION_RAW_VALUE);
+    super("BLS12_G1ADD", LibEthPairings.BLS12_G1ADD_OPERATION_RAW_VALUE, PARAMETER_LENGTH);
   }
 
   @Override
-  public Gas gasRequirement(final Bytes input) {
-    return Gas.of(600);
+  public long gasRequirement(final Bytes input) {
+    return 600L;
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1MulPrecompiledContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12G1MulPrecompiledContract.java
similarity index 75%
rename from ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1MulPrecompiledContract.java
rename to evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12G1MulPrecompiledContract.java
index e58fd0b76d0..42e90a9f478 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G1MulPrecompiledContract.java
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12G1MulPrecompiledContract.java
@@ -13,21 +13,24 @@
  * SPDX-License-Identifier: Apache-2.0
  *
  */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
+package org.hyperledger.besu.evm.precompile;
 
-import org.hyperledger.besu.ethereum.core.Gas;
 import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
 
 import org.apache.tuweni.bytes.Bytes;
 
+/** The BLS12G1 Mul precompiled contract. */
 public class BLS12G1MulPrecompiledContract extends AbstractBLS12PrecompiledContract {
 
+  private static final int PARAMETER_LENGTH = 160;
+
+  /** Instantiates a new BLS12G1 Mul precompiled contract. */
   public BLS12G1MulPrecompiledContract() {
-    super("BLS12_G1MUL", LibEthPairings.BLS12_G1MUL_OPERATION_RAW_VALUE);
+    super("BLS12_G1MUL", LibEthPairings.BLS12_G1MUL_OPERATION_RAW_VALUE, PARAMETER_LENGTH);
   }
 
   @Override
-  public Gas gasRequirement(final Bytes input) {
-    return Gas.of(12_000);
+  public long gasRequirement(final Bytes input) {
+    return 12_000L;
   }
 }
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12G1MultiExpPrecompiledContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12G1MultiExpPrecompiledContract.java
new file mode 100644
index 00000000000..536ff56d606
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12G1MultiExpPrecompiledContract.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The type BLS12_G1 MultiExp precompiled contract. */
+public class BLS12G1MultiExpPrecompiledContract extends AbstractBLS12PrecompiledContract {
+
+  private static final int PARAMETER_LENGTH = 160;
+
+  /** Instantiates a new BLS12_G1 MultiExp precompiled contract. */
+  public BLS12G1MultiExpPrecompiledContract() {
+    super(
+        "BLS12_G1MULTIEXP",
+        LibEthPairings.BLS12_G1MULTIEXP_OPERATION_RAW_VALUE,
+        Integer.MAX_VALUE / PARAMETER_LENGTH * PARAMETER_LENGTH);
+  }
+
+  @Override
+  public long gasRequirement(final Bytes input) {
+    final int k = input.size() / PARAMETER_LENGTH;
+    return 12L * k * getDiscount(k);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2AddPrecompiledContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12G2AddPrecompiledContract.java
similarity index 75%
rename from ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2AddPrecompiledContract.java
rename to evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12G2AddPrecompiledContract.java
index 45998221471..906fc62fd08 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2AddPrecompiledContract.java
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12G2AddPrecompiledContract.java
@@ -13,21 +13,24 @@
  * SPDX-License-Identifier: Apache-2.0
  *
  */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
+package org.hyperledger.besu.evm.precompile;
 
-import org.hyperledger.besu.ethereum.core.Gas;
 import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
 
 import org.apache.tuweni.bytes.Bytes;
 
+/** The BLS12_G2 Add precompiled contract. */
 public class BLS12G2AddPrecompiledContract extends AbstractBLS12PrecompiledContract {
 
+  private static final int PARAMETER_LENGTH = 512;
+
+  /** Instantiates a new BLS12_G2 Add precompiled contract. */
   public BLS12G2AddPrecompiledContract() {
-    super("BLS12_G2ADD", LibEthPairings.BLS12_G2ADD_OPERATION_RAW_VALUE);
+    super("BLS12_G2ADD", LibEthPairings.BLS12_G2ADD_OPERATION_RAW_VALUE, PARAMETER_LENGTH);
   }
 
   @Override
-  public Gas gasRequirement(final Bytes input) {
-    return Gas.of(4_500);
+  public long gasRequirement(final Bytes input) {
+    return 4_500L;
   }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2MulPrecompiledContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12G2MulPrecompiledContract.java
similarity index 75%
rename from ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2MulPrecompiledContract.java
rename to evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12G2MulPrecompiledContract.java
index a79391b797b..4b7fef54b11 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/BLS12G2MulPrecompiledContract.java
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12G2MulPrecompiledContract.java
@@ -13,21 +13,24 @@
  * SPDX-License-Identifier: Apache-2.0
  *
  */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
+package org.hyperledger.besu.evm.precompile;
 
-import org.hyperledger.besu.ethereum.core.Gas;
 import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
 
 import org.apache.tuweni.bytes.Bytes;
 
+/** The BLS12_G2Mul precompiled contract. */
 public class BLS12G2MulPrecompiledContract extends AbstractBLS12PrecompiledContract {
 
+  private static final int PARAMETER_LENGTH = 288;
+
+  /** Instantiates a new BLS12_G2Mul precompiled contract. */
   public BLS12G2MulPrecompiledContract() {
-    super("BLS12_G2MUL", LibEthPairings.BLS12_G2MUL_OPERATION_RAW_VALUE);
+    super("BLS12_G2MUL", LibEthPairings.BLS12_G2MUL_OPERATION_RAW_VALUE, PARAMETER_LENGTH);
   }
 
   @Override
-  public Gas gasRequirement(final Bytes input) {
-    return Gas.of(55_000);
+  public long gasRequirement(final Bytes input) {
+    return 55_000L;
   }
 }
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12G2MultiExpPrecompiledContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12G2MultiExpPrecompiledContract.java
new file mode 100644
index 00000000000..c5ce2856218
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12G2MultiExpPrecompiledContract.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The BLS12_G2 MultiExp precompiled contract. */
+public class BLS12G2MultiExpPrecompiledContract extends AbstractBLS12PrecompiledContract {
+
+  private static final int PARAMETER_LENGTH = 288;
+
+  /** Instantiates a new BLS12_G2 MultiExp precompiled contract. */
+  public BLS12G2MultiExpPrecompiledContract() {
+    super(
+        "BLS12_G2MULTIEXP",
+        LibEthPairings.BLS12_G2MULTIEXP_OPERATION_RAW_VALUE,
+        Integer.MAX_VALUE / PARAMETER_LENGTH * PARAMETER_LENGTH);
+  }
+
+  @Override
+  public long gasRequirement(final Bytes input) {
+    final int k = input.size() / PARAMETER_LENGTH;
+    return 55L * k * getDiscount(k);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12MapFp2ToG2PrecompiledContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12MapFp2ToG2PrecompiledContract.java
new file mode 100644
index 00000000000..e56517253c0
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12MapFp2ToG2PrecompiledContract.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The BLS12MapFp2ToG2 precompiled contract. */
+public class BLS12MapFp2ToG2PrecompiledContract extends AbstractBLS12PrecompiledContract {
+
+  private static final int PARAMETER_LENGTH = 128;
+
+  /** Instantiates a new BLS12MapFp2ToG2 precompiled contract. */
+  public BLS12MapFp2ToG2PrecompiledContract() {
+    super(
+        "BLS12_MAP_FIELD_TO_CURVE",
+        LibEthPairings.BLS12_MAP_FP2_TO_G2_OPERATION_RAW_VALUE,
+        PARAMETER_LENGTH);
+  }
+
+  @Override
+  public long gasRequirement(final Bytes input) {
+    return 110_000L;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12MapFpToG1PrecompiledContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12MapFpToG1PrecompiledContract.java
new file mode 100644
index 00000000000..c0cd00b2e63
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12MapFpToG1PrecompiledContract.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The BLS12MapFpToG1 precompiled contract. */
+public class BLS12MapFpToG1PrecompiledContract extends AbstractBLS12PrecompiledContract {
+
+  private static final int PARAMETER_LENGTH = 64;
+
+  /** Instantiates a new BLS12MapFpToG1 precompiled contract. */
+  public BLS12MapFpToG1PrecompiledContract() {
+    super(
+        "BLS12_MAP_FIELD_TO_CURVE",
+        LibEthPairings.BLS12_MAP_FP_TO_G1_OPERATION_RAW_VALUE,
+        PARAMETER_LENGTH);
+  }
+
+  @Override
+  public long gasRequirement(final Bytes input) {
+    return 5_500L;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12PairingPrecompiledContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12PairingPrecompiledContract.java
new file mode 100644
index 00000000000..309b3e377ae
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/BLS12PairingPrecompiledContract.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import org.hyperledger.besu.nativelib.bls12_381.LibEthPairings;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The BLS12Pairing precompiled contract. */
+public class BLS12PairingPrecompiledContract extends AbstractBLS12PrecompiledContract {
+
+  private static final int PARAMETER_LENGTH = 384;
+
+  /** Instantiates a new BLS12Pairing precompiled contract. */
+  public BLS12PairingPrecompiledContract() {
+    super(
+        "BLS12_PAIRING",
+        LibEthPairings.BLS12_PAIR_OPERATION_RAW_VALUE,
+        Integer.MAX_VALUE / PARAMETER_LENGTH * PARAMETER_LENGTH);
+  }
+
+  @Override
+  public long gasRequirement(final Bytes input) {
+    final int k = input.size() / PARAMETER_LENGTH;
+    return 23_000L * k + 115_000L;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/precompile/BigIntegerModularExponentiationPrecompiledContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/BigIntegerModularExponentiationPrecompiledContract.java
new file mode 100644
index 00000000000..1520947960a
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/BigIntegerModularExponentiationPrecompiledContract.java
@@ -0,0 +1,254 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import static org.hyperledger.besu.evm.internal.Words.clampedMultiply;
+import static org.hyperledger.besu.evm.internal.Words.clampedToInt;
+import static org.hyperledger.besu.evm.internal.Words.clampedToLong;
+
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.nativelib.arithmetic.LibArithmetic;
+
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Optional;
+import javax.annotation.Nonnull;
+
+import com.sun.jna.ptr.IntByReference;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.MutableBytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Big integer modular exponentiation precompiled contract defined in EIP-198. */
+public class BigIntegerModularExponentiationPrecompiledContract
+    extends AbstractPrecompiledContract {
+
+  private static final Logger LOG =
+      LoggerFactory.getLogger(BigIntegerModularExponentiationPrecompiledContract.class);
+
+  /** Use native Arithmetic libraries. */
+  static boolean useNative;
+
+  static {
+    try {
+      useNative = LibArithmetic.ENABLED;
+    } catch (UnsatisfiedLinkError | NoClassDefFoundError ule) {
+      LOG.info("modexp native precompile not available: {}", ule.getMessage());
+      useNative = false;
+    }
+  }
+
+  /** The constant BASE_OFFSET. */
+  public static final int BASE_OFFSET = 96;
+
+  private static final int PARAMETER_LENGTH = 32;
+  private static final int BASE_LENGTH_OFFSET = 0;
+  private static final int EXPONENT_LENGTH_OFFSET = 32;
+  private static final int MODULUS_LENGTH_OFFSET = 64;
+
+  /**
+   * Instantiates a new BigInteger modular exponentiation precompiled contract.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public BigIntegerModularExponentiationPrecompiledContract(final GasCalculator gasCalculator) {
+    super("BigIntModExp", gasCalculator);
+  }
+
+  /** Disable native Arithmetic libraries. */
+  public static void disableNative() {
+    useNative = false;
+  }
+
+  /**
+   * Check if native Arithmetic libraries are enabled.
+   *
+   * @return the boolean
+   */
+  public static boolean isNative() {
+    return useNative;
+  }
+
+  @Override
+  public long gasRequirement(final Bytes input) {
+    return gasCalculator().modExpGasCost(input);
+  }
+
+  @Nonnull
+  @Override
+  public PrecompileContractResult computePrecompile(
+      final Bytes input, @Nonnull final MessageFrame messageFrame) {
+    if (useNative) {
+      return computeNative(input);
+    } else {
+      return computeDefault(input);
+    }
+  }
+
+  /**
+   * Compute default precompile contract.
+   *
+   * @param input the input
+   * @return the precompile contract result
+   */
+  @Nonnull
+  public PrecompileContractResult computeDefault(final Bytes input) {
+    final int baseLength = clampedToInt(baseLength(input));
+    final int exponentLength = clampedToInt(exponentLength(input));
+    final int modulusLength = clampedToInt(modulusLength(input));
+    // If baseLength and modulusLength are zero
+    // we could have a massively overflowing exp because it wouldn't have been filtered out at the
+    // gas cost phase
+    if ((baseLength == 0) && (modulusLength == 0)) {
+      return PrecompileContractResult.success(Bytes.EMPTY);
+    }
+    final int exponentOffset = BASE_OFFSET + baseLength;
+    final int modulusOffset = exponentOffset + exponentLength;
+    final BigInteger base = extractParameter(input, BASE_OFFSET, baseLength);
+    final BigInteger exp = extractParameter(input, exponentOffset, exponentLength);
+    final BigInteger mod = extractParameter(input, modulusOffset, modulusLength);
+
+    final Bytes modExp;
+    // Result must be the length of the modulus.
+    final MutableBytes result = MutableBytes.create(modulusLength);
+    if (mod.compareTo(BigInteger.ZERO) == 0) {
+      modExp = MutableBytes.EMPTY;
+    } else {
+      // BigInteger zero-pads positive values whose most significant bit is a 1 if
+      // the padding was not there.
+      modExp = Bytes.wrap(base.modPow(exp, mod).toByteArray()).trimLeadingZeros();
+    }
+
+    modExp.copyTo(result, result.size() - modExp.size());
+    return PrecompileContractResult.success(result);
+  }
+
+  /**
+   * Equation to estimate the multiplication complexity.
+   *
+   * @param x the x
+   * @return the long
+   */
+  public static long multiplicationComplexity(final long x) {
+    if (x <= 64) {
+      return square(x);
+    } else if (x <= 1024) {
+      return (square(x) / 4) + (x * 96) - 3072;
+    } else {
+      return (square(x) / 16) + (480 * x) - 199680;
+    }
+  }
+
+  /**
+   * Base length.
+   *
+   * @param input the input
+   * @return the long
+   */
+  public static long baseLength(final Bytes input) {
+    return extractParameterLong(input, BASE_LENGTH_OFFSET, PARAMETER_LENGTH);
+  }
+
+  /**
+   * Exponent length.
+   *
+   * @param input the input
+   * @return the long
+   */
+  public static long exponentLength(final Bytes input) {
+    return extractParameterLong(input, EXPONENT_LENGTH_OFFSET, PARAMETER_LENGTH);
+  }
+
+  /**
+   * Modulus length.
+   *
+   * @param input the input
+   * @return the long
+   */
+  public static long modulusLength(final Bytes input) {
+    return extractParameterLong(input, MODULUS_LENGTH_OFFSET, PARAMETER_LENGTH);
+  }
+
+  /**
+   * Extract parameter.
+   *
+   * @param input the input
+   * @param offset the offset
+   * @param length the length
+   * @return the big integer
+   */
+  public static BigInteger extractParameter(final Bytes input, final int offset, final int length) {
+    if (offset > input.size() || length == 0) {
+      return BigInteger.ZERO;
+    }
+    final byte[] raw = Arrays.copyOfRange(input.toArray(), offset, offset + length);
+    return new BigInteger(1, raw);
+  }
+
+  /**
+   * Extract parameter.
+   *
+   * @param input the input
+   * @param offset the offset
+   * @param length the length
+   * @return the long
+   */
+  public static long extractParameterLong(final Bytes input, final int offset, final int length) {
+    if (offset >= input.size() || length == 0) {
+      return 0;
+    }
+    Bytes num;
+    if (offset + length <= input.size()) {
+      num = input.slice(offset, length).trimLeadingZeros();
+    } else {
+      // Ethereum's memory is always infinitely full of zeros, but we don't store those zeros, just
+      // what we write.  If we are asked for a range that is outside the written memory create a
+      // result of the correct size (defaults to zeros) and copy the memory we do have into there.
+      MutableBytes mut = MutableBytes.create(length);
+      input.slice(offset).copyTo(mut, 0);
+      num = mut.trimLeadingZeros();
+    }
+    return clampedToLong(num);
+  }
+
+  private static long square(final long n) {
+    return clampedMultiply(n, n);
+  }
+
+  /**
+   * Compute native precompile contract.
+   *
+   * @param input the input
+   * @return the precompile contract result
+   */
+  public PrecompileContractResult computeNative(final @Nonnull Bytes input) {
+    final int modulusLength = clampedToInt(modulusLength(input));
+    final IntByReference o_len = new IntByReference(modulusLength);
+
+    final byte[] result = new byte[modulusLength];
+    final int errorNo =
+        LibArithmetic.modexp_precompiled(input.toArrayUnsafe(), input.size(), result, o_len);
+    if (errorNo == 0) {
+      return PrecompileContractResult.success(Bytes.wrap(result, 0, o_len.getValue()));
+    } else {
+      LOG.trace("Error executing precompiled contract {}: {}", getName(), errorNo);
+      return PrecompileContractResult.halt(
+          null, Optional.of(ExceptionalHaltReason.PRECOMPILE_ERROR));
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/precompile/ECRECPrecompiledContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/ECRECPrecompiledContract.java
new file mode 100644
index 00000000000..07e05bfb801
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/ECRECPrecompiledContract.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import org.hyperledger.besu.crypto.Hash;
+import org.hyperledger.besu.crypto.SECPPublicKey;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import java.math.BigInteger;
+import java.util.Optional;
+import javax.annotation.Nonnull;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.bytes.MutableBytes;
+import org.apache.tuweni.bytes.MutableBytes32;
+
+/** The ECREC precompiled contract. */
+public class ECRECPrecompiledContract extends AbstractPrecompiledContract {
+
+  private static final int V_BASE = 27;
+
+  /**
+   * Instantiates a new ECREC precompiled contract.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public ECRECPrecompiledContract(final GasCalculator gasCalculator) {
+    super("ECREC", gasCalculator);
+  }
+
+  @Override
+  public long gasRequirement(final Bytes input) {
+    return gasCalculator().getEcrecPrecompiledContractGasCost();
+  }
+
+  @Nonnull
+  @Override
+  public PrecompileContractResult computePrecompile(
+      final Bytes input, @Nonnull final MessageFrame messageFrame) {
+    final int size = input.size();
+    final Bytes d = size >= 128 ? input : Bytes.wrap(input, MutableBytes.create(128 - size));
+    final Bytes32 h = Bytes32.wrap(d, 0);
+    // Note that the Yellow Paper defines v as the next 32 bytes (so 32..63). Yet, v is a simple
+    // byte in ECDSARECOVER and the Yellow Paper is not very clear on this mismatch, but it appears
+    // it is simply the last byte of those 32 bytes that needs to be used. It does appear we need
+    // to check the rest of the bytes are zero though.
+    if (!d.slice(32, 31).isZero()) {
+      return PrecompileContractResult.success(Bytes.EMPTY);
+    }
+
+    final int recId = d.get(63) - V_BASE;
+    final BigInteger r = d.slice(64, 32).toUnsignedBigInteger();
+    final BigInteger s = d.slice(96, 32).toUnsignedBigInteger();
+    final SignatureAlgorithm signatureAlgorithm = SignatureAlgorithmFactory.getInstance();
+
+    final SECPSignature signature;
+    try {
+      signature = signatureAlgorithm.createSignature(r, s, (byte) recId);
+    } catch (final IllegalArgumentException e) {
+      return PrecompileContractResult.success(Bytes.EMPTY);
+    }
+
+    // SECP256K1#PublicKey#recoverFromSignature throws an Illegal argument exception
+    // when it is unable to recover the key. There is not a straightforward way to
+    // check the arguments ahead of time to determine if the fail will happen and
+    // the library needs to be updated.
+    try {
+      final Optional<SECPPublicKey> recovered =
+          signatureAlgorithm.recoverPublicKeyFromSignature(h, signature);
+      if (recovered.isEmpty()) {
+        return PrecompileContractResult.success(Bytes.EMPTY);
+      }
+
+      final Bytes32 hashed = Hash.keccak256(recovered.get().getEncodedBytes());
+      final MutableBytes32 result = MutableBytes32.create();
+      hashed.slice(12).copyTo(result, 12);
+      return PrecompileContractResult.success(result);
+    } catch (final IllegalArgumentException e) {
+      return PrecompileContractResult.success(Bytes.EMPTY);
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/precompile/IDPrecompiledContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/IDPrecompiledContract.java
new file mode 100644
index 00000000000..ae669e7364b
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/IDPrecompiledContract.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import javax.annotation.Nonnull;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The ID precompiled contract. */
+public class IDPrecompiledContract extends AbstractPrecompiledContract {
+
+  /**
+   * Instantiates a new ID precompiled contract.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public IDPrecompiledContract(final GasCalculator gasCalculator) {
+    super("ID", gasCalculator);
+  }
+
+  @Override
+  public long gasRequirement(final Bytes input) {
+    return gasCalculator().idPrecompiledContractGasCost(input);
+  }
+
+  @Nonnull
+  @Override
+  public PrecompileContractResult computePrecompile(
+      final Bytes input, @Nonnull final MessageFrame messageFrame) {
+    return PrecompileContractResult.success(input.copy());
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/precompile/KZGPointEvalPrecompiledContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/KZGPointEvalPrecompiledContract.java
new file mode 100644
index 00000000000..ed1a3c94332
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/KZGPointEvalPrecompiledContract.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.internal.Words;
+
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import com.google.common.annotations.VisibleForTesting;
+import ethereum.ckzg4844.CKZG4844JNI;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.jetbrains.annotations.NotNull;
+
+/** The KZGPointEval precompile contract. */
+public class KZGPointEvalPrecompiledContract implements PrecompiledContract {
+  private static final AtomicBoolean loaded = new AtomicBoolean(false);
+
+  private static Bytes successResult;
+
+  private static void init() {
+    CKZG4844JNI.loadNativeLibrary(CKZG4844JNI.Preset.MAINNET);
+    Bytes fieldElementsPerBlob =
+        Bytes32.wrap(Words.intBytes(CKZG4844JNI.getFieldElementsPerBlob()).xor(Bytes32.ZERO));
+    Bytes blsModulus =
+        Bytes32.wrap(Bytes.of(CKZG4844JNI.BLS_MODULUS.toByteArray()).xor(Bytes32.ZERO));
+
+    successResult = Bytes.concatenate(fieldElementsPerBlob, blsModulus);
+  }
+
+  /**
+   * Init the C-KZG native lib using a file as trusted setup
+   *
+   * @param trustedSetupFile the file with the trusted setup
+   * @throws IllegalStateException is the trusted setup was already loaded
+   */
+  public static void init(final Path trustedSetupFile) {
+    if (loaded.compareAndSet(false, true)) {
+      init();
+      CKZG4844JNI.loadTrustedSetup(trustedSetupFile.toAbsolutePath().toString());
+    } else {
+      throw new IllegalStateException("KZG trusted setup was already loaded");
+    }
+  }
+
+  /**
+   * Init the C-KZG native lib using a resource identified by the passed network name as trusted
+   * setup
+   *
+   * @param networkName used to select the resource that contains the trusted setup
+   * @throws IllegalStateException is the trusted setup was already loaded
+   */
+  public static void init(final String networkName) {
+    if (loaded.compareAndSet(false, true)) {
+      init();
+      final String trustedSetupResourceName =
+          "/kzg-trusted-setups/" + networkName.toLowerCase() + ".txt";
+      CKZG4844JNI.loadTrustedSetupFromResource(
+          trustedSetupResourceName, KZGPointEvalPrecompiledContract.class);
+    } else {
+      throw new IllegalStateException("KZG trusted setup was already loaded");
+    }
+  }
+
+  /** free up resources. */
+  @VisibleForTesting
+  void tearDown() {
+    CKZG4844JNI.freeTrustedSetup();
+    loaded.set(false);
+  }
+
+  @Override
+  public String getName() {
+    return "KZGPointEval";
+  }
+
+  @Override
+  public long gasRequirement(final Bytes input) {
+    // As defined in EIP-4844
+    return 50000;
+  }
+
+  @NotNull
+  @Override
+  public PrecompileContractResult computePrecompile(
+      final Bytes input, @NotNull final MessageFrame messageFrame) {
+
+    if (input.size() != 192) {
+      return new PrecompileContractResult(
+          Bytes.EMPTY,
+          false,
+          MessageFrame.State.COMPLETED_FAILED,
+          Optional.of(ExceptionalHaltReason.PRECOMPILE_ERROR));
+    }
+    Bytes z = input.slice(32, 32);
+    Bytes y = input.slice(64, 32);
+    Bytes commitment = input.slice(96, 48);
+    Bytes proof = input.slice(144, 48);
+
+    PrecompileContractResult result;
+    try {
+      boolean proved =
+          CKZG4844JNI.verifyKzgProof(
+              commitment.toArray(), z.toArray(), y.toArray(), proof.toArray());
+
+      if (proved) {
+        result =
+            new PrecompileContractResult(
+                successResult, false, MessageFrame.State.COMPLETED_SUCCESS, Optional.empty());
+      } else {
+        result =
+            new PrecompileContractResult(
+                Bytes.EMPTY,
+                false,
+                MessageFrame.State.COMPLETED_FAILED,
+                Optional.of(ExceptionalHaltReason.PRECOMPILE_ERROR));
+      }
+      return result;
+    } catch (RuntimeException kzgFailed) {
+      System.out.println(kzgFailed.getMessage());
+      result =
+          new PrecompileContractResult(
+              Bytes.EMPTY,
+              false,
+              MessageFrame.State.COMPLETED_FAILED,
+              Optional.of(ExceptionalHaltReason.PRECOMPILE_ERROR));
+    }
+    return result;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/precompile/MainnetPrecompiledContracts.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/MainnetPrecompiledContracts.java
new file mode 100644
index 00000000000..454e7280215
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/MainnetPrecompiledContracts.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+/** Provides the various precompiled contracts used on mainnet hard forks. */
+public interface MainnetPrecompiledContracts {
+
+  /**
+   * Frontier precompile contract registry.
+   *
+   * @param gasCalculator the gas calculator
+   * @return the precompile contract registry
+   */
+  static PrecompileContractRegistry frontier(final GasCalculator gasCalculator) {
+    PrecompileContractRegistry precompileContractRegistry = new PrecompileContractRegistry();
+    populateForFrontier(precompileContractRegistry, gasCalculator);
+    return precompileContractRegistry;
+  }
+
+  /**
+   * Populate registry for frontier.
+   *
+   * @param registry the registry
+   * @param gasCalculator the gas calculator
+   */
+  static void populateForFrontier(
+      final PrecompileContractRegistry registry, final GasCalculator gasCalculator) {
+    registry.put(Address.ECREC, new ECRECPrecompiledContract(gasCalculator));
+    registry.put(Address.SHA256, new SHA256PrecompiledContract(gasCalculator));
+    registry.put(Address.RIPEMD160, new RIPEMD160PrecompiledContract(gasCalculator));
+    registry.put(Address.ID, new IDPrecompiledContract(gasCalculator));
+  }
+
+  /**
+   * Homestead precompile contract registry.
+   *
+   * @param gasCalculator the gas calculator
+   * @return the precompile contract registry
+   */
+  static PrecompileContractRegistry homestead(final GasCalculator gasCalculator) {
+    return frontier(gasCalculator);
+  }
+
+  /**
+   * Byzantium precompile contract registry.
+   *
+   * @param gasCalculator the gas calculator
+   * @return the precompile contract registry
+   */
+  static PrecompileContractRegistry byzantium(final GasCalculator gasCalculator) {
+    PrecompileContractRegistry precompileContractRegistry = new PrecompileContractRegistry();
+    populateForByzantium(precompileContractRegistry, gasCalculator);
+    return precompileContractRegistry;
+  }
+
+  /**
+   * Populate registry for byzantium.
+   *
+   * @param registry the registry
+   * @param gasCalculator the gas calculator
+   */
+  static void populateForByzantium(
+      final PrecompileContractRegistry registry, final GasCalculator gasCalculator) {
+    populateForFrontier(registry, gasCalculator);
+    registry.put(
+        Address.MODEXP, new BigIntegerModularExponentiationPrecompiledContract(gasCalculator));
+    registry.put(Address.ALTBN128_ADD, AltBN128AddPrecompiledContract.byzantium(gasCalculator));
+    registry.put(Address.ALTBN128_MUL, AltBN128MulPrecompiledContract.byzantium(gasCalculator));
+    registry.put(
+        Address.ALTBN128_PAIRING, AltBN128PairingPrecompiledContract.byzantium(gasCalculator));
+  }
+
+  /**
+   * Istanbul precompile contract registry.
+   *
+   * @param gasCalculator the gas calculator
+   * @return the precompile contract registry
+   */
+  static PrecompileContractRegistry istanbul(final GasCalculator gasCalculator) {
+    PrecompileContractRegistry precompileContractRegistry = new PrecompileContractRegistry();
+    populateForIstanbul(precompileContractRegistry, gasCalculator);
+    return precompileContractRegistry;
+  }
+
+  /**
+   * Populate registry for istanbul.
+   *
+   * @param registry the registry
+   * @param gasCalculator the gas calculator
+   */
+  static void populateForIstanbul(
+      final PrecompileContractRegistry registry, final GasCalculator gasCalculator) {
+    populateForByzantium(registry, gasCalculator);
+    registry.put(Address.ALTBN128_ADD, AltBN128AddPrecompiledContract.istanbul(gasCalculator));
+    registry.put(Address.ALTBN128_MUL, AltBN128MulPrecompiledContract.istanbul(gasCalculator));
+    registry.put(
+        Address.ALTBN128_PAIRING, AltBN128PairingPrecompiledContract.istanbul(gasCalculator));
+    registry.put(Address.BLAKE2B_F_COMPRESSION, new BLAKE2BFPrecompileContract(gasCalculator));
+  }
+
+  /**
+   * Cancun precompile contract registry.
+   *
+   * @param gasCalculator the gas calculator
+   * @return the precompile contract registry
+   */
+  static PrecompileContractRegistry cancun(final GasCalculator gasCalculator) {
+    PrecompileContractRegistry precompileContractRegistry = new PrecompileContractRegistry();
+    populateForCancun(precompileContractRegistry, gasCalculator);
+    return precompileContractRegistry;
+  }
+
+  /**
+   * Populate registry for Cancun.
+   *
+   * @param registry the registry
+   * @param gasCalculator the gas calculator
+   */
+  static void populateForCancun(
+      final PrecompileContractRegistry registry, final GasCalculator gasCalculator) {
+    populateForIstanbul(registry, gasCalculator);
+
+    // EIP-4844 - shard blob transactions
+    // TODO: allow override to be configured?
+    registry.put(Address.KZG_POINT_EVAL, new KZGPointEvalPrecompiledContract());
+  }
+
+  /**
+   * FutureEIPs precompile contract registry.
+   *
+   * @param gasCalculator the gas calculator
+   * @return the precompile contract registry
+   */
+  static PrecompileContractRegistry futureEIPs(final GasCalculator gasCalculator) {
+    PrecompileContractRegistry precompileContractRegistry = new PrecompileContractRegistry();
+    populateForFutureEIPs(precompileContractRegistry, gasCalculator);
+    return precompileContractRegistry;
+  }
+
+  /**
+   * Populate registry for Future EIPs.
+   *
+   * @param registry the registry
+   * @param gasCalculator the gas calculator
+   */
+  static void populateForFutureEIPs(
+      final PrecompileContractRegistry registry, final GasCalculator gasCalculator) {
+    populateForCancun(registry, gasCalculator);
+
+    // EIP-2537 - BLS12-381 curve operations
+    registry.put(Address.BLS12_G1ADD, new BLS12G1AddPrecompiledContract());
+    registry.put(Address.BLS12_G1MUL, new BLS12G1MulPrecompiledContract());
+    registry.put(Address.BLS12_G1MULTIEXP, new BLS12G1MultiExpPrecompiledContract());
+    registry.put(Address.BLS12_G2ADD, new BLS12G2AddPrecompiledContract());
+    registry.put(Address.BLS12_G2MUL, new BLS12G2MulPrecompiledContract());
+    registry.put(Address.BLS12_G2MULTIEXP, new BLS12G2MultiExpPrecompiledContract());
+    registry.put(Address.BLS12_PAIRING, new BLS12PairingPrecompiledContract());
+    registry.put(Address.BLS12_MAP_FP_TO_G1, new BLS12MapFpToG1PrecompiledContract());
+    registry.put(Address.BLS12_MAP_FP2_TO_G2, new BLS12MapFp2ToG2PrecompiledContract());
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/precompile/PrecompileContractRegistry.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/PrecompileContractRegistry.java
new file mode 100644
index 00000000000..a41b3a0a7fc
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/PrecompileContractRegistry.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import org.hyperledger.besu.datatypes.Address;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/** Encapsulates a group of {@link PrecompiledContract}s used together. */
+public class PrecompileContractRegistry {
+
+  private final Map<Address, PrecompiledContract> precompiles;
+
+  /** Instantiates a new Precompile contract registry. */
+  public PrecompileContractRegistry() {
+    this.precompiles = new HashMap<>(16);
+  }
+
+  /**
+   * Get precompiled contract.
+   *
+   * @param address the address
+   * @return the precompiled contract
+   */
+  public PrecompiledContract get(final Address address) {
+    return precompiles.get(address);
+  }
+
+  /**
+   * Put.
+   *
+   * @param address the address
+   * @param precompile the precompile
+   */
+  public void put(final Address address, final PrecompiledContract precompile) {
+    precompiles.put(address, precompile);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/precompile/PrecompiledContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/PrecompiledContract.java
new file mode 100644
index 00000000000..c710dc04b0f
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/PrecompiledContract.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+
+import java.util.Optional;
+import javax.annotation.Nonnull;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/**
+ * A pre-compiled contract.
+ *
+ * <p>It corresponds to one of the function defined in Appendix E of the Yellow Paper (rev.
+ * a91c29c).
+ */
+public interface PrecompiledContract {
+
+  /**
+   * Returns the pre-compiled contract name.
+   *
+   * @return the pre-compiled contract name
+   */
+  String getName();
+
+  /**
+   * Gas requirement for the contract.
+   *
+   * @param input the input for the pre-compiled contract (on which the gas requirement may or may
+   *     not depend).
+   * @return the gas requirement (cost) for the pre-compiled contract.
+   */
+  long gasRequirement(Bytes input);
+
+  /**
+   * Executes the pre-compiled contract.
+   *
+   * @param input the input for the pre-compiled contract.
+   * @param messageFrame context for this message
+   * @return the output of the pre-compiled contract.
+   */
+  @SuppressWarnings("deprecation")
+  @Nonnull
+  default PrecompileContractResult computePrecompile(
+      final Bytes input, @Nonnull final MessageFrame messageFrame) {
+    final Bytes result = compute(input, messageFrame);
+    if (result == null) {
+      return PrecompileContractResult.halt(null, Optional.of(ExceptionalHaltReason.NONE));
+    } else {
+      return PrecompileContractResult.success(result);
+    }
+  }
+
+  /**
+   * Executes the pre-compiled contract.
+   *
+   * @param input the input for the pre-compiled contract.
+   * @param messageFrame context for this message
+   * @return the output of the pre-compiled contract.
+   * @deprecated Migrate to use {@link #computePrecompile(Bytes, MessageFrame)}.
+   */
+  @Deprecated(since = "22.1.2")
+  default Bytes compute(final Bytes input, final @Nonnull MessageFrame messageFrame) {
+    return computePrecompile(input, messageFrame).getOutput();
+  }
+
+  /** The Precompile contract result. */
+  class PrecompileContractResult {
+    private final Bytes output;
+    private final boolean refundGas;
+    private final MessageFrame.State state;
+    private final Optional<ExceptionalHaltReason> haltReason;
+
+    /**
+     * Encapsulated result of precompiled contract.
+     *
+     * @param output output if successful
+     * @param refundGas Should we charge the gasRequirement?
+     * @param state state of the EVM after execution (for format errors this would be
+     *     ExceptionalHalt)
+     * @param haltReason the exceptional halt reason
+     */
+    // TOO JDK17 use a record
+    public PrecompileContractResult(
+        final Bytes output,
+        final boolean refundGas,
+        final MessageFrame.State state,
+        final Optional<ExceptionalHaltReason> haltReason) {
+      this.output = output;
+      this.refundGas = refundGas;
+      this.state = state;
+      this.haltReason = haltReason;
+    }
+
+    /**
+     * precompile contract result with Success state.
+     *
+     * @param output the output
+     * @return the precompile contract result
+     */
+    public static PrecompileContractResult success(final Bytes output) {
+      return new PrecompileContractResult(
+          output, false, MessageFrame.State.COMPLETED_SUCCESS, Optional.empty());
+    }
+
+    /**
+     * precompile contract result with revert state.
+     *
+     * @param output the output
+     * @return the precompile contract result
+     */
+    public static PrecompileContractResult revert(final Bytes output) {
+      return new PrecompileContractResult(
+          output, false, MessageFrame.State.REVERT, Optional.empty());
+    }
+
+    /**
+     * precompile contract result with Halt state.
+     *
+     * @param output the output
+     * @param haltReason the halt reason
+     * @return the precompile contract result
+     */
+    public static PrecompileContractResult halt(
+        final Bytes output, final Optional<ExceptionalHaltReason> haltReason) {
+      if (haltReason.isEmpty()) {
+        throw new IllegalArgumentException("Halt reason cannot be empty");
+      }
+      return new PrecompileContractResult(
+          output, false, MessageFrame.State.EXCEPTIONAL_HALT, haltReason);
+    }
+
+    /**
+     * Gets output.
+     *
+     * @return the output
+     */
+    public Bytes getOutput() {
+      return output;
+    }
+
+    /**
+     * Is refund gas.
+     *
+     * @return the boolean
+     */
+    public boolean isRefundGas() {
+      return refundGas;
+    }
+
+    /**
+     * Gets state.
+     *
+     * @return the state
+     */
+    public MessageFrame.State getState() {
+      return state;
+    }
+
+    /**
+     * Gets halt reason.
+     *
+     * @return the halt reason
+     */
+    public Optional<ExceptionalHaltReason> getHaltReason() {
+      return haltReason;
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/precompile/RIPEMD160PrecompiledContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/RIPEMD160PrecompiledContract.java
new file mode 100644
index 00000000000..152797d5fab
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/RIPEMD160PrecompiledContract.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import org.hyperledger.besu.crypto.Hash;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import javax.annotation.Nonnull;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+
+/** The RIPEMD160 precompiled contract. */
+public class RIPEMD160PrecompiledContract extends AbstractPrecompiledContract {
+
+  /**
+   * Instantiates a new Ripemd 160 precompiled contract.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public RIPEMD160PrecompiledContract(final GasCalculator gasCalculator) {
+    super("RIPEMD160", gasCalculator);
+  }
+
+  @Override
+  public long gasRequirement(final Bytes input) {
+    return gasCalculator().ripemd160PrecompiledContractGasCost(input);
+  }
+
+  @Nonnull
+  @Override
+  public PrecompileContractResult computePrecompile(
+      final Bytes input, @Nonnull final MessageFrame messageFrame) {
+    return PrecompileContractResult.success(Bytes32.leftPad(Hash.ripemd160(input)));
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/precompile/SHA256PrecompiledContract.java b/evm/src/main/java/org/hyperledger/besu/evm/precompile/SHA256PrecompiledContract.java
new file mode 100644
index 00000000000..536d28ffad6
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/precompile/SHA256PrecompiledContract.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import org.hyperledger.besu.crypto.Hash;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+
+import javax.annotation.Nonnull;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The Sha256 precompiled contract. */
+public class SHA256PrecompiledContract extends AbstractPrecompiledContract {
+
+  /**
+   * Instantiates a new Sha256 precompiled contract.
+   *
+   * @param gasCalculator the gas calculator
+   */
+  public SHA256PrecompiledContract(final GasCalculator gasCalculator) {
+    super("SHA256", gasCalculator);
+  }
+
+  @Override
+  public long gasRequirement(final Bytes input) {
+    return gasCalculator().sha256PrecompiledContractGasCost(input);
+  }
+
+  @Nonnull
+  @Override
+  public PrecompileContractResult computePrecompile(
+      final Bytes input, @Nonnull final MessageFrame messageFrame) {
+    return PrecompileContractResult.success(Hash.sha256(input));
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractMessageProcessor.java b/evm/src/main/java/org/hyperledger/besu/evm/processor/AbstractMessageProcessor.java
similarity index 76%
rename from ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractMessageProcessor.java
rename to evm/src/main/java/org/hyperledger/besu/evm/processor/AbstractMessageProcessor.java
index 67656813a06..d2b1c99688d 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractMessageProcessor.java
+++ b/evm/src/main/java/org/hyperledger/besu/evm/processor/AbstractMessageProcessor.java
@@ -12,26 +12,31 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.mainnet;
-
-import org.hyperledger.besu.ethereum.core.Account;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.ModificationNotAllowedException;
-import org.hyperledger.besu.ethereum.vm.EVM;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
-import org.hyperledger.besu.ethereum.vm.OperationTracer;
+package org.hyperledger.besu.evm.processor;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.ModificationNotAllowedException;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.account.AccountState;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.stream.Collectors;
 
+import org.apache.tuweni.bytes.Bytes;
+
 /**
  * A skeletal class for instantiating message processors.
  *
  * <p>The following methods have been created to be invoked when the message state changes via the
  * {@link MessageFrame.State}. Note that some of these methods are abstract while others have
  * default behaviors. There is currently no method for responding to a {@link
- * MessageFrame.State#CODE_SUSPENDED}.
+ * MessageFrame.State#CODE_SUSPENDED}*.
  *
  * <table>
  * <caption>Method Overview</caption>
@@ -64,14 +69,26 @@ public abstract class AbstractMessageProcessor {
 
   // List of addresses to force delete when they are touched but empty
   // when the state changes in the message are were not meant to be committed.
-  private final Collection<Address> forceDeleteAccountsWhenEmpty;
+  private final Collection<? super Address> forceDeleteAccountsWhenEmpty;
   private final EVM evm;
 
+  /**
+   * Instantiates a new Abstract message processor.
+   *
+   * @param evm the evm
+   * @param forceDeleteAccountsWhenEmpty the force delete accounts when empty
+   */
   AbstractMessageProcessor(final EVM evm, final Collection<Address> forceDeleteAccountsWhenEmpty) {
     this.evm = evm;
     this.forceDeleteAccountsWhenEmpty = forceDeleteAccountsWhenEmpty;
   }
 
+  /**
+   * Start.
+   *
+   * @param frame the frame
+   * @param operationTracer the operation tracer
+   */
   protected abstract void start(MessageFrame frame, final OperationTracer operationTracer);
 
   /**
@@ -83,18 +100,19 @@ public abstract class AbstractMessageProcessor {
   protected abstract void codeSuccess(MessageFrame frame, final OperationTracer operationTracer);
 
   private void clearAccumulatedStateBesidesGasAndOutput(final MessageFrame frame) {
-    final Collection<Address> addressesToForceCommit =
-        frame.getWorldState().getTouchedAccounts().stream()
-            .filter(a -> forceDeleteAccountsWhenEmpty.contains(a.getAddress()) && a.isEmpty())
+    ArrayList<Address> addresses =
+        frame.getWorldUpdater().getTouchedAccounts().stream()
+            .filter(AccountState::isEmpty)
             .map(Account::getAddress)
+            .filter(forceDeleteAccountsWhenEmpty::contains)
             .collect(Collectors.toCollection(ArrayList::new));
 
     // Clear any pending changes.
-    frame.getWorldState().revert();
+    frame.getWorldUpdater().revert();
 
     // Force delete any requested accounts and commit the changes.
-    addressesToForceCommit.forEach(h -> frame.getWorldState().deleteAccount(h));
-    frame.getWorldState().commit();
+    ((Collection<Address>) addresses).forEach(h -> frame.getWorldUpdater().deleteAccount(h));
+    frame.getWorldUpdater().commit();
 
     frame.clearLogs();
     frame.clearSelfDestructs();
@@ -129,7 +147,8 @@ protected void revert(final MessageFrame frame) {
    * @param frame The message frame
    */
   private void completedSuccess(final MessageFrame frame) {
-    frame.getWorldState().commit();
+    frame.getWorldUpdater().commit();
+    frame.commitTransientStorage();
     frame.getMessageFrameStack().removeFirst();
     frame.notifyCompletion();
   }
@@ -158,6 +177,12 @@ private void codeExecute(final MessageFrame frame, final OperationTracer operati
     }
   }
 
+  /**
+   * Process.
+   *
+   * @param frame the frame
+   * @param operationTracer the operation tracer
+   */
   public void process(final MessageFrame frame, final OperationTracer operationTracer) {
     if (frame.getState() == MessageFrame.State.NOT_STARTED) {
       start(frame, operationTracer);
@@ -191,4 +216,15 @@ public void process(final MessageFrame frame, final OperationTracer operationTra
       completedFailed(frame);
     }
   }
+
+  /**
+   * Gets code from evm.
+   *
+   * @param codeHash the code hash
+   * @param codeBytes the code bytes
+   * @return the code from evm
+   */
+  public Code getCodeFromEVM(final Hash codeHash, final Bytes codeBytes) {
+    return evm.getCode(codeHash, codeBytes);
+  }
 }
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/processor/ContractCreationProcessor.java b/evm/src/main/java/org/hyperledger/besu/evm/processor/ContractCreationProcessor.java
new file mode 100644
index 00000000000..87c0c3bd120
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/processor/ContractCreationProcessor.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.processor;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.ModificationNotAllowedException;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.contractvalidation.ContractValidationRule;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** A contract creation message processor. */
+public class ContractCreationProcessor extends AbstractMessageProcessor {
+
+  private static final Logger LOG = LoggerFactory.getLogger(ContractCreationProcessor.class);
+
+  private final boolean requireCodeDepositToSucceed;
+
+  private final GasCalculator gasCalculator;
+
+  private final long initialContractNonce;
+
+  private final List<ContractValidationRule> contractValidationRules;
+
+  /**
+   * Instantiates a new Contract creation processor.
+   *
+   * @param gasCalculator the gas calculator
+   * @param evm the evm
+   * @param requireCodeDepositToSucceed the require code deposit to succeed
+   * @param contractValidationRules the contract validation rules
+   * @param initialContractNonce the initial contract nonce
+   * @param forceCommitAddresses the force commit addresses
+   */
+  public ContractCreationProcessor(
+      final GasCalculator gasCalculator,
+      final EVM evm,
+      final boolean requireCodeDepositToSucceed,
+      final List<ContractValidationRule> contractValidationRules,
+      final long initialContractNonce,
+      final Collection<Address> forceCommitAddresses) {
+    super(evm, forceCommitAddresses);
+    this.gasCalculator = gasCalculator;
+    this.requireCodeDepositToSucceed = requireCodeDepositToSucceed;
+    this.contractValidationRules = contractValidationRules;
+    this.initialContractNonce = initialContractNonce;
+  }
+
+  /**
+   * Instantiates a new Contract creation processor.
+   *
+   * @param gasCalculator the gas calculator
+   * @param evm the evm
+   * @param requireCodeDepositToSucceed the require code deposit to succeed
+   * @param contractValidationRules the contract validation rules
+   * @param initialContractNonce the initial contract nonce
+   */
+  public ContractCreationProcessor(
+      final GasCalculator gasCalculator,
+      final EVM evm,
+      final boolean requireCodeDepositToSucceed,
+      final List<ContractValidationRule> contractValidationRules,
+      final long initialContractNonce) {
+    this(
+        gasCalculator,
+        evm,
+        requireCodeDepositToSucceed,
+        contractValidationRules,
+        initialContractNonce,
+        Set.of());
+  }
+
+  private static boolean accountExists(final Account account) {
+    // The account exists if it has sent a transaction
+    // or already has its code initialized.
+    return account.getNonce() > 0 || !account.getCode().isEmpty();
+  }
+
+  @Override
+  public void start(final MessageFrame frame, final OperationTracer operationTracer) {
+    if (LOG.isTraceEnabled()) {
+      LOG.trace("Executing contract-creation");
+    }
+    try {
+
+      final MutableAccount sender = frame.getWorldUpdater().getSenderAccount(frame).getMutable();
+      sender.decrementBalance(frame.getValue());
+
+      final MutableAccount contract =
+          frame.getWorldUpdater().getOrCreate(frame.getContractAddress()).getMutable();
+      if (accountExists(contract)) {
+        LOG.trace(
+            "Contract creation error: account has already been created for address {}",
+            frame.getContractAddress());
+        frame.setExceptionalHaltReason(Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
+        frame.setState(MessageFrame.State.EXCEPTIONAL_HALT);
+        operationTracer.traceAccountCreationResult(
+            frame, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
+      } else {
+        contract.incrementBalance(frame.getValue());
+        contract.setNonce(initialContractNonce);
+        contract.clearStorage();
+        frame.setState(MessageFrame.State.CODE_EXECUTING);
+      }
+    } catch (final ModificationNotAllowedException ex) {
+      LOG.trace("Contract creation error: attempt to mutate an immutable account");
+      frame.setExceptionalHaltReason(Optional.of(ExceptionalHaltReason.ILLEGAL_STATE_CHANGE));
+      frame.setState(MessageFrame.State.EXCEPTIONAL_HALT);
+    }
+  }
+
+  @Override
+  public void codeSuccess(final MessageFrame frame, final OperationTracer operationTracer) {
+    final Bytes contractCode = frame.getOutputData();
+
+    final long depositFee = gasCalculator.codeDepositGasCost(contractCode.size());
+
+    if (frame.getRemainingGas() < depositFee) {
+      LOG.trace(
+          "Not enough gas to pay the code deposit fee for {}: "
+              + "remaining gas = {} < {} = deposit fee",
+          frame.getContractAddress(),
+          frame.getRemainingGas(),
+          depositFee);
+      if (requireCodeDepositToSucceed) {
+        LOG.trace("Contract creation error: insufficient funds for code deposit");
+        frame.setExceptionalHaltReason(Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
+        frame.setState(MessageFrame.State.EXCEPTIONAL_HALT);
+        operationTracer.traceAccountCreationResult(
+            frame, Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
+      } else {
+        frame.setState(MessageFrame.State.COMPLETED_SUCCESS);
+      }
+    } else {
+      final var invalidReason =
+          contractValidationRules.stream()
+              .map(rule -> rule.validate(contractCode, frame))
+              .filter(Optional::isPresent)
+              .findFirst();
+      if (invalidReason.isEmpty()) {
+        frame.decrementRemainingGas(depositFee);
+
+        // Finalize contract creation, setting the contract code.
+        final MutableAccount contract =
+            frame.getWorldUpdater().getOrCreate(frame.getContractAddress()).getMutable();
+        contract.setCode(contractCode);
+        LOG.trace(
+            "Successful creation of contract {} with code of size {} (Gas remaining: {})",
+            frame.getContractAddress(),
+            contractCode.size(),
+            frame.getRemainingGas());
+        frame.setState(MessageFrame.State.COMPLETED_SUCCESS);
+      } else {
+        final Optional<ExceptionalHaltReason> exceptionalHaltReason = invalidReason.get();
+        frame.setExceptionalHaltReason(exceptionalHaltReason);
+        frame.setState(MessageFrame.State.EXCEPTIONAL_HALT);
+        operationTracer.traceAccountCreationResult(frame, exceptionalHaltReason);
+      }
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/processor/MessageCallProcessor.java b/evm/src/main/java/org/hyperledger/besu/evm/processor/MessageCallProcessor.java
new file mode 100644
index 00000000000..b1d41da97a1
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/processor/MessageCallProcessor.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.processor;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.ModificationNotAllowedException;
+import org.hyperledger.besu.evm.account.EvmAccount;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.precompile.PrecompileContractRegistry;
+import org.hyperledger.besu.evm.precompile.PrecompiledContract;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+
+import java.util.Collection;
+import java.util.Objects;
+import java.util.Optional;
+
+import com.google.common.collect.ImmutableSet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Message call processor. */
+public class MessageCallProcessor extends AbstractMessageProcessor {
+  private static final Logger LOG = LoggerFactory.getLogger(MessageCallProcessor.class);
+
+  private final PrecompileContractRegistry precompiles;
+
+  /**
+   * Instantiates a new Message call processor.
+   *
+   * @param evm the evm
+   * @param precompiles the precompiles
+   * @param forceCommitAddresses the force commit addresses
+   */
+  public MessageCallProcessor(
+      final EVM evm,
+      final PrecompileContractRegistry precompiles,
+      final Collection<Address> forceCommitAddresses) {
+    super(evm, forceCommitAddresses);
+    this.precompiles = precompiles;
+  }
+
+  /**
+   * Instantiates a new Message call processor.
+   *
+   * @param evm the evm
+   * @param precompiles the precompiles
+   */
+  public MessageCallProcessor(final EVM evm, final PrecompileContractRegistry precompiles) {
+    super(evm, ImmutableSet.of());
+    this.precompiles = precompiles;
+  }
+
+  @Override
+  public void start(final MessageFrame frame, final OperationTracer operationTracer) {
+    LOG.trace("Executing message-call");
+    try {
+      transferValue(frame);
+
+      // Check first if the message call is to a pre-compile contract
+      final PrecompiledContract precompile = precompiles.get(frame.getContractAddress());
+      if (precompile != null) {
+        executePrecompile(precompile, frame, operationTracer);
+      } else {
+        frame.setState(MessageFrame.State.CODE_EXECUTING);
+      }
+    } catch (final ModificationNotAllowedException ex) {
+      LOG.trace("Message call error: attempt to mutate an immutable account");
+      frame.setExceptionalHaltReason(Optional.of(ExceptionalHaltReason.ILLEGAL_STATE_CHANGE));
+      frame.setState(MessageFrame.State.EXCEPTIONAL_HALT);
+    }
+  }
+
+  @Override
+  protected void codeSuccess(final MessageFrame frame, final OperationTracer operationTracer) {
+    LOG.trace(
+        "Successful message call of {} to {} (Gas remaining: {})",
+        frame.getSenderAddress(),
+        frame.getRecipientAddress(),
+        frame.getRemainingGas());
+    frame.setState(MessageFrame.State.COMPLETED_SUCCESS);
+  }
+
+  /**
+   * Transfers the message call value from the sender to the recipient.
+   *
+   * <p>Assumes that the transaction has been validated so that the sender has the required fund as
+   * of the world state of this executor.
+   */
+  private void transferValue(final MessageFrame frame) {
+    final EvmAccount senderAccount = frame.getWorldUpdater().getSenderAccount(frame);
+
+    // The yellow paper explicitly states that if the recipient account doesn't exist at this
+    // point, it is created. Even if the value is zero we are still creating an account with 0x!
+    final EvmAccount recipientAccount =
+        frame.getWorldUpdater().getOrCreate(frame.getRecipientAddress());
+
+    if (Objects.equals(frame.getValue(), Wei.ZERO)) {
+      // This is only here for situations where you are calling a public address from a private
+      // address. Without this guard clause we would attempt to get a mutable public address
+      // which isn't possible from a private address and an error would be thrown.
+      // If you are attempting to transfer value from a private address
+      // to public address an error will be thrown.
+      LOG.trace(
+          "Message call from {} to {} has zero value: no fund transferred",
+          frame.getSenderAddress(),
+          frame.getRecipientAddress());
+      return;
+    }
+
+    if (frame.getRecipientAddress().equals(frame.getSenderAddress())) {
+      LOG.trace("Message call of {} to itself: no fund transferred", frame.getSenderAddress());
+    } else {
+      final Wei prevSenderBalance = senderAccount.getMutable().decrementBalance(frame.getValue());
+      final Wei prevRecipientBalance =
+          recipientAccount.getMutable().incrementBalance(frame.getValue());
+
+      LOG.trace(
+          "Transferred value {} for message call from {} ({} -> {}) to {} ({} -> {})",
+          frame.getValue(),
+          frame.getSenderAddress(),
+          prevSenderBalance,
+          senderAccount.getBalance(),
+          frame.getRecipientAddress(),
+          prevRecipientBalance,
+          recipientAccount.getBalance());
+    }
+  }
+
+  /**
+   * Executes this message call knowing that it is a call to the provided pre-compiled contract.
+   *
+   * @param contract The contract this is a message call to.
+   */
+  private void executePrecompile(
+      final PrecompiledContract contract,
+      final MessageFrame frame,
+      final OperationTracer operationTracer) {
+    final long gasRequirement = contract.gasRequirement(frame.getInputData());
+    if (frame.getRemainingGas() < gasRequirement) {
+      LOG.trace(
+          "Not enough gas available for pre-compiled contract code {}: requiring "
+              + "{} but only {} gas available",
+          contract,
+          gasRequirement,
+          frame.getRemainingGas());
+      frame.setExceptionalHaltReason(Optional.of(ExceptionalHaltReason.INSUFFICIENT_GAS));
+      frame.setState(MessageFrame.State.EXCEPTIONAL_HALT);
+    } else {
+      frame.decrementRemainingGas(gasRequirement);
+      final PrecompiledContract.PrecompileContractResult result =
+          contract.computePrecompile(frame.getInputData(), frame);
+      operationTracer.tracePrecompileCall(frame, gasRequirement, result.getOutput());
+      if (result.isRefundGas()) {
+        frame.incrementRemainingGas(gasRequirement);
+      }
+      if (frame.getState() == MessageFrame.State.REVERT) {
+        frame.setRevertReason(result.getOutput());
+      } else {
+        frame.setOutputData(result.getOutput());
+      }
+      frame.setState(result.getState());
+      frame.setExceptionalHaltReason(result.getHaltReason());
+      LOG.trace(
+          "Precompiled contract {} {} (gasComsumed: {})",
+          contract.getName(),
+          result.getState(),
+          result.isRefundGas() ? 0L : gasRequirement);
+    }
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/tracing/AccessListOperationTracer.java b/evm/src/main/java/org/hyperledger/besu/evm/tracing/AccessListOperationTracer.java
new file mode 100644
index 00000000000..703b0cec122
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/tracing/AccessListOperationTracer.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.tracing;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.evm.AccessListEntry;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.operation.Operation.OperationResult;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.common.collect.Multimap;
+import org.apache.tuweni.bytes.Bytes32;
+
+/** The Access List Operation Tracer. */
+public class AccessListOperationTracer extends EstimateGasOperationTracer {
+
+  private Multimap<Address, Bytes32> warmedUpStorage;
+
+  @Override
+  public void tracePostExecution(final MessageFrame frame, final OperationResult operationResult) {
+    super.tracePostExecution(frame, operationResult);
+    warmedUpStorage = frame.getWarmedUpStorage();
+  }
+
+  @Override
+  public void tracePreExecution(final MessageFrame frame) {}
+
+  /**
+   * Get the access list.
+   *
+   * @return the access list
+   */
+  public List<AccessListEntry> getAccessList() {
+    final List<AccessListEntry> list = new ArrayList<>();
+    if (warmedUpStorage != null) {
+      warmedUpStorage
+          .asMap()
+          .forEach(
+              (address, storageKeys) ->
+                  list.add(new AccessListEntry(address, new ArrayList<>(storageKeys))));
+    }
+    return list;
+  }
+
+  /**
+   * Create a AccessListOperationTracer.
+   *
+   * @return the AccessListOperationTracer
+   */
+  public static AccessListOperationTracer create() {
+    return new AccessListOperationTracer();
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/tracing/EstimateGasOperationTracer.java b/evm/src/main/java/org/hyperledger/besu/evm/tracing/EstimateGasOperationTracer.java
new file mode 100644
index 00000000000..a9ac495a176
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/tracing/EstimateGasOperationTracer.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.tracing;
+
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.operation.Operation.OperationResult;
+import org.hyperledger.besu.evm.operation.SStoreOperation;
+
+/** The Estimate gas operation tracer. */
+public class EstimateGasOperationTracer implements OperationTracer {
+
+  private int maxDepth = 0;
+
+  private long sStoreStipendNeeded = 0L;
+
+  @Override
+  public void tracePostExecution(final MessageFrame frame, final OperationResult operationResult) {
+    if (frame.getCurrentOperation() instanceof SStoreOperation && sStoreStipendNeeded == 0L) {
+      sStoreStipendNeeded =
+          ((SStoreOperation) frame.getCurrentOperation()).getMinimumGasRemaining();
+    }
+    if (maxDepth < frame.getMessageStackDepth()) {
+      maxDepth = frame.getMessageStackDepth();
+    }
+  }
+
+  /**
+   * Gets max depth.
+   *
+   * @return the max depth
+   */
+  public int getMaxDepth() {
+    return maxDepth;
+  }
+
+  /**
+   * Gets stipend needed.
+   *
+   * @return the stipend needed
+   */
+  public long getStipendNeeded() {
+    return sStoreStipendNeeded;
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/tracing/OperationTracer.java b/evm/src/main/java/org/hyperledger/besu/evm/tracing/OperationTracer.java
new file mode 100644
index 00000000000..d278d1d7832
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/tracing/OperationTracer.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.tracing;
+
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.operation.Operation.OperationResult;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The interface Operation tracer. */
+public interface OperationTracer {
+
+  /** The constant NO_TRACING. */
+  OperationTracer NO_TRACING = new OperationTracer() {};
+
+  /**
+   * Trace pre execution.
+   *
+   * @param frame the frame
+   */
+  default void tracePreExecution(final MessageFrame frame) {}
+
+  /**
+   * Trace post execution.
+   *
+   * @param frame the frame
+   * @param operationResult the operation result
+   */
+  default void tracePostExecution(
+      final MessageFrame frame, final OperationResult operationResult) {}
+
+  /**
+   * Trace precompile call.
+   *
+   * @param frame the frame
+   * @param gasRequirement the gas requirement
+   * @param output the output
+   */
+  default void tracePrecompileCall(
+      final MessageFrame frame, final long gasRequirement, final Bytes output) {}
+
+  /**
+   * Trace account creation result.
+   *
+   * @param frame the frame
+   * @param haltReason the halt reason
+   */
+  default void traceAccountCreationResult(
+      final MessageFrame frame, final Optional<ExceptionalHaltReason> haltReason) {}
+
+  /**
+   * Trace the end of a transaction.
+   *
+   * @param output the bytes output from the transaction
+   * @param gasUsed the gas used by the entire transaction
+   * @param timeNs the time in nanoseconds it took to execute the transaction
+   */
+  default void traceEndTransaction(final Bytes output, final long gasUsed, final long timeNs) {}
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/tracing/StandardJsonTracer.java b/evm/src/main/java/org/hyperledger/besu/evm/tracing/StandardJsonTracer.java
new file mode 100644
index 00000000000..3db7c38e116
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/tracing/StandardJsonTracer.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.evm.tracing;
+
+import static com.google.common.base.Strings.padStart;
+
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.internal.Words;
+import org.hyperledger.besu.evm.operation.Operation;
+
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import com.google.common.base.Joiner;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** The Standard json tracer. */
+public class StandardJsonTracer implements OperationTracer {
+
+  private static final Joiner commaJoiner = Joiner.on(',');
+  private final PrintWriter out;
+  private final boolean showMemory;
+  private final boolean showStack;
+  private final boolean showReturnData;
+  private int pc;
+  private int section;
+  private List<String> stack;
+  private String gas;
+  private Bytes memory;
+  private int memorySize;
+
+  /**
+   * Instantiates a new Standard json tracer.
+   *
+   * @param out the out
+   * @param showMemory show memory in trace lines
+   * @param showStack show the stack in trace lines
+   * @param showReturnData show return data in trace lines
+   */
+  public StandardJsonTracer(
+      final PrintWriter out,
+      final boolean showMemory,
+      final boolean showStack,
+      final boolean showReturnData) {
+    this.out = out;
+    this.showMemory = showMemory;
+    this.showStack = showStack;
+    this.showReturnData = showReturnData;
+  }
+
+  /**
+   * Instantiates a new Standard json tracer.
+   *
+   * @param out the out
+   * @param showMemory show memory in trace lines
+   * @param showStack show the stack in trace lines
+   * @param showReturnData show return data in trace lines
+   */
+  public StandardJsonTracer(
+      final PrintStream out,
+      final boolean showMemory,
+      final boolean showStack,
+      final boolean showReturnData) {
+    this(new PrintWriter(out, true, StandardCharsets.UTF_8), showMemory, showStack, showReturnData);
+  }
+
+  /**
+   * Short as hex string.
+   *
+   * @param number the number
+   * @return the string
+   */
+  public static String shortNumber(final UInt256 number) {
+    return number.isZero() ? "0x0" : number.toShortHexString();
+  }
+
+  /**
+   * Long number as hex string.
+   *
+   * @param number the number
+   * @return the string
+   */
+  public static String shortNumber(final long number) {
+    return "0x" + Long.toHexString(number);
+  }
+
+  private static String shortBytes(final Bytes bytes) {
+    return bytes.isZero() ? "0x0" : bytes.toShortHexString();
+  }
+
+  @Override
+  public void tracePreExecution(final MessageFrame messageFrame) {
+    stack = new ArrayList<>(messageFrame.stackSize());
+    for (int i = messageFrame.stackSize() - 1; i >= 0; i--) {
+      stack.add("\"" + shortBytes(messageFrame.getStackItem(i)) + "\"");
+    }
+    pc =
+        messageFrame.getPC()
+            - messageFrame.getCode().getCodeSection(messageFrame.getSection()).getEntryPoint();
+    section = messageFrame.getSection();
+    gas = shortNumber(messageFrame.getRemainingGas());
+    memorySize = messageFrame.memoryWordSize() * 32;
+    if (showMemory && memorySize > 0) {
+      memory = messageFrame.readMemory(0, messageFrame.memoryWordSize() * 32L);
+    } else {
+      memory = null;
+    }
+  }
+
+  @Override
+  public void tracePostExecution(
+      final MessageFrame messageFrame, final Operation.OperationResult executeResult) {
+    final Operation currentOp = messageFrame.getCurrentOperation();
+    final int opcode = currentOp.getOpcode();
+    final Bytes returnData = messageFrame.getReturnData();
+    final int depth = messageFrame.getMessageStackDepth() + 1;
+
+    final StringBuilder sb = new StringBuilder(1024);
+    sb.append("{");
+    sb.append("\"pc\":").append(pc).append(",");
+    if (section > 0) {
+      sb.append("\"section\":").append(section).append(",");
+    }
+    sb.append("\"op\":").append(opcode).append(",");
+    sb.append("\"gas\":\"").append(gas).append("\",");
+    sb.append("\"gasCost\":\"").append(shortNumber(executeResult.getGasCost())).append("\",");
+    if (memory != null) {
+      sb.append("\"memory\":\"").append(memory.toHexString()).append("\",");
+    }
+    sb.append("\"memSize\":").append(memorySize).append(",");
+    if (showStack) {
+      sb.append("\"stack\":[").append(commaJoiner.join(stack)).append("],");
+    }
+    if (showReturnData && returnData.size() > 0) {
+      sb.append("\"returnData\":\"").append(returnData.toHexString()).append("\",");
+    }
+    sb.append("\"depth\":").append(depth).append(",");
+    sb.append("\"refund\":").append(messageFrame.getGasRefund()).append(",");
+    sb.append("\"opName\":\"").append(currentOp.getName()).append("\"");
+    if (executeResult.getHaltReason() != null) {
+      sb.append(",\"error\":\"")
+          .append(executeResult.getHaltReason().getDescription())
+          .append("\"}");
+    } else if (messageFrame.getRevertReason().isPresent()) {
+      sb.append(",\"error\":\"")
+          .append(quoteEscape(messageFrame.getRevertReason().orElse(Bytes.EMPTY)))
+          .append("\"}");
+    } else {
+      sb.append("}");
+    }
+    out.println(sb);
+  }
+
+  private static String quoteEscape(final Bytes bytes) {
+    final StringBuilder result = new StringBuilder(bytes.size());
+    for (final byte b : bytes.toArrayUnsafe()) {
+      final int c = Byte.toUnsignedInt(b);
+      // list from RFC-4627 section 2
+      if (c == '"') {
+        result.append("\\\"");
+      } else if (c == '\\') {
+        result.append("\\\\");
+      } else if (c == '/') {
+        result.append("\\/");
+      } else if (c == '\b') {
+        result.append("\\b");
+      } else if (c == '\f') {
+        result.append("\\f");
+      } else if (c == '\n') {
+        result.append("\\n");
+      } else if (c == '\r') {
+        result.append("\\r");
+      } else if (c == '\t') {
+        result.append("\\t");
+      } else if (c <= 0x1F) {
+        result.append("\\u");
+        result.append(padStart(Integer.toHexString(c), 4, '0'));
+      } else {
+        result.append((char) b);
+      }
+    }
+    return result.toString();
+  }
+
+  @Override
+  public void tracePrecompileCall(
+      final MessageFrame frame, final long gasRequirement, final Bytes output) {
+    // precompile calls are not part of the standard trace
+  }
+
+  @Override
+  public void traceAccountCreationResult(
+      final MessageFrame frame, final Optional<ExceptionalHaltReason> haltReason) {
+    // precompile calls are not part of the standard trace
+  }
+
+  @Override
+  public void traceEndTransaction(final Bytes output, final long gasUsed, final long timeNs) {
+    final StringBuilder sb = new StringBuilder(1024);
+    sb.append("{");
+    if (output.size() > 0) {
+      sb.append("\"output\":\"").append(output.toShortHexString()).append("\",");
+    } else {
+      sb.append("\"output\":\"\",");
+    }
+    sb.append("\"gasUsed\":\"").append(Words.longBytes(gasUsed).toShortHexString()).append("\",");
+    sb.append("\"time\":").append(timeNs).append("}");
+    out.println(sb);
+  }
+}
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/worldstate/AbstractWorldUpdater.java b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/AbstractWorldUpdater.java
new file mode 100644
index 00000000000..fde3aa8c244
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/AbstractWorldUpdater.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.worldstate;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.account.EvmAccount;
+import org.hyperledger.besu.evm.account.MutableAccount;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * An abstract implementation of a {@link WorldUpdater} that buffers update over the {@link
+ * WorldView}* provided in the constructor in memory.
+ *
+ * <p>Concrete implementation have to implement the {@link #commit()} method.
+ *
+ * @param <W> the type parameter
+ * @param <A> the type parameter
+ */
+public abstract class AbstractWorldUpdater<W extends WorldView, A extends Account>
+    implements WorldUpdater {
+
+  private final W world;
+
+  /** The Updated accounts. */
+  protected Map<Address, UpdateTrackingAccount<A>> updatedAccounts = new ConcurrentHashMap<>();
+  /** The Deleted accounts. */
+  protected Set<Address> deletedAccounts = Collections.synchronizedSet(new HashSet<>());
+
+  /**
+   * Instantiates a new Abstract world updater.
+   *
+   * @param world the world
+   */
+  protected AbstractWorldUpdater(final W world) {
+    this.world = world;
+  }
+
+  /**
+   * Gets for mutation.
+   *
+   * @param address the address
+   * @return the for mutation
+   */
+  protected abstract A getForMutation(Address address);
+
+  /**
+   * Track update tracking account.
+   *
+   * @param account the account
+   * @return the update tracking account
+   */
+  protected UpdateTrackingAccount<A> track(final UpdateTrackingAccount<A> account) {
+    final Address address = account.getAddress();
+    updatedAccounts.put(address, account);
+    deletedAccounts.remove(address);
+    return account;
+  }
+
+  @Override
+  public EvmAccount createAccount(final Address address, final long nonce, final Wei balance) {
+    final UpdateTrackingAccount<A> account = new UpdateTrackingAccount<>(address);
+    account.setNonce(nonce);
+    account.setBalance(balance);
+    return new WrappedEvmAccount(track(account));
+  }
+
+  @Override
+  public Account get(final Address address) {
+    // We may have updated it already, so check that first.
+    final MutableAccount existing = updatedAccounts.get(address);
+    if (existing != null) {
+      return existing;
+    }
+    if (deletedAccounts.contains(address)) {
+      return null;
+    }
+    return world.get(address);
+  }
+
+  @Override
+  public EvmAccount getAccount(final Address address) {
+    // We may have updated it already, so check that first.
+    final MutableAccount existing = updatedAccounts.get(address);
+    if (existing != null) {
+      return new WrappedEvmAccount(existing);
+    }
+    if (deletedAccounts.contains(address)) {
+      return null;
+    }
+
+    // Otherwise, get it from our wrapped view and create a new update tracker.
+    final A origin = getForMutation(address);
+    if (origin == null) {
+      return null;
+    } else {
+      return new WrappedEvmAccount(track(new UpdateTrackingAccount<>(origin)));
+    }
+  }
+
+  @Override
+  public void deleteAccount(final Address address) {
+    deletedAccounts.add(address);
+    updatedAccounts.remove(address);
+  }
+
+  /**
+   * Creates an updater that buffer updates on top of this updater.
+   *
+   * @return a new updater on top of this updater. Updates made to the returned object will become
+   *     visible on this updater when the returned updater is committed. Note however that updates
+   *     to this updater <b>may or may not</b> be reflected to the created updater, so it is
+   *     <b>strongly</b> advised to not update this updater until the returned one is discarded
+   *     (either after having been committed, or because the updates it represent are meant to be
+   *     discarded).
+   */
+  @Override
+  public WorldUpdater updater() {
+    return new StackedUpdater<>(this);
+  }
+
+  /**
+   * The world view on top of which this buffer updates.
+   *
+   * @return The world view on top of which this buffer updates.
+   */
+  protected W wrappedWorldView() {
+    return world;
+  }
+
+  @Override
+  public Optional<WorldUpdater> parentUpdater() {
+    if (world instanceof WorldUpdater) {
+      return Optional.of((WorldUpdater) world);
+    } else {
+      return Optional.empty();
+    }
+  }
+
+  /**
+   * The accounts modified in this updater.
+   *
+   * @return The accounts modified in this updater.
+   */
+  protected Collection<UpdateTrackingAccount<A>> getUpdatedAccounts() {
+    return updatedAccounts.values();
+  }
+
+  /**
+   * The accounts deleted as part of this updater.
+   *
+   * @return The accounts deleted as part of this updater.
+   */
+  protected Collection<Address> getDeletedAccounts() {
+    return deletedAccounts;
+  }
+
+  /** Reset. */
+  protected void reset() {
+    updatedAccounts.clear();
+    deletedAccounts.clear();
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MutableWorldView.java b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/MutableWorldView.java
similarity index 86%
rename from ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MutableWorldView.java
rename to evm/src/main/java/org/hyperledger/besu/evm/worldstate/MutableWorldView.java
index e80e8a8896d..23c851b161e 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MutableWorldView.java
+++ b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/MutableWorldView.java
@@ -12,12 +12,13 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.core;
+package org.hyperledger.besu.evm.worldstate;
 
+/** The interface Mutable world view. */
 public interface MutableWorldView extends WorldView {
 
   /**
-   * Creates a updater for this mutable world view.
+   * Creates an updater for this mutable world view.
    *
    * @return a new updater for this mutable world view. On commit, change made to this updater will
    *     become visible on this view.
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/worldstate/StackedUpdater.java b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/StackedUpdater.java
new file mode 100644
index 00000000000..348f76dfa10
--- /dev/null
+++ b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/StackedUpdater.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.worldstate;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.evm.account.Account;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+/**
+ * The Stacked updater.
+ *
+ * @param <W> the WorldView type parameter
+ * @param <A> the Account type parameter
+ */
+public class StackedUpdater<W extends WorldView, A extends Account>
+    extends AbstractWorldUpdater<AbstractWorldUpdater<W, A>, UpdateTrackingAccount<A>> {
+
+  /**
+   * Instantiates a new Stacked updater.
+   *
+   * @param world the world
+   */
+  public StackedUpdater(final AbstractWorldUpdater<W, A> world) {
+    super(world);
+  }
+
+  @Override
+  protected UpdateTrackingAccount<A> getForMutation(final Address address) {
+    final AbstractWorldUpdater<W, A> wrapped = wrappedWorldView();
+    final UpdateTrackingAccount<A> wrappedTracker = wrapped.updatedAccounts.get(address);
+    if (wrappedTracker != null) {
+      return wrappedTracker;
+    }
+    if (wrapped.deletedAccounts.contains(address)) {
+      return null;
+    }
+    // The wrapped one isn't tracking that account. We're creating a tracking "for him" (but
+    // don't add him yet to his tracking map) because we need it to satisfy the type system.
+    // We will recognize this case in commit below and use that tracker "pay back" our
+    // allocation, so this isn't lost.
+    final A account = wrappedWorldView().getForMutation(address);
+    return account == null ? null : new UpdateTrackingAccount<>(account);
+  }
+
+  @Override
+  public Collection<? extends Account> getTouchedAccounts() {
+    return new ArrayList<>(getUpdatedAccounts());
+  }
+
+  @Override
+  public Collection<Address> getDeletedAccountAddresses() {
+    return new ArrayList<>(getDeletedAccounts());
+  }
+
+  @Override
+  public void revert() {
+    getDeletedAccounts().clear();
+    getUpdatedAccounts().clear();
+  }
+
+  @Override
+  public void commit() {
+    final AbstractWorldUpdater<W, A> wrapped = wrappedWorldView();
+    // Our own updates should apply on top of the updates we're stacked on top, so our deletions
+    // may kill some of "their" updates, and our updates may review some of the account "they"
+    // deleted.
+    getDeletedAccounts().forEach(wrapped.updatedAccounts::remove);
+    getUpdatedAccounts().forEach(a -> wrapped.deletedAccounts.remove(a.getAddress()));
+
+    // Then push our deletes and updates to the stacked ones.
+    wrapped.deletedAccounts.addAll(getDeletedAccounts());
+
+    for (final UpdateTrackingAccount<UpdateTrackingAccount<A>> update : getUpdatedAccounts()) {
+      UpdateTrackingAccount<A> existing = wrapped.updatedAccounts.get(update.getAddress());
+      if (existing == null) {
+        // If we don't track this account, it's either a new one or getForMutation above had
+        // created a tracker to satisfy the type system above and we can reuse that now.
+        existing = update.getWrappedAccount();
+        if (existing == null) {
+          // Brand new account, create our own version
+          existing = new UpdateTrackingAccount<>(update.getAddress());
+        }
+        wrapped.updatedAccounts.put(existing.getAddress(), existing);
+      }
+      existing.setNonce(update.getNonce());
+      existing.setBalance(update.getBalance());
+      if (update.codeWasUpdated()) {
+        existing.setCode(update.getCode());
+      }
+      if (update.getStorageWasCleared()) {
+        existing.clearStorage();
+      }
+      update.getUpdatedStorage().forEach(existing::setStorageValue);
+    }
+  }
+
+  /** Mark transaction boundary. */
+  public void markTransactionBoundary() {
+    getUpdatedAccounts().forEach(UpdateTrackingAccount::markTransactionBoundary);
+  }
+}
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/UpdateTrackingAccount.java b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/UpdateTrackingAccount.java
similarity index 85%
rename from ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/UpdateTrackingAccount.java
rename to evm/src/main/java/org/hyperledger/besu/evm/worldstate/UpdateTrackingAccount.java
index 5a481616b9e..e1121171ccc 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/UpdateTrackingAccount.java
+++ b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/UpdateTrackingAccount.java
@@ -14,10 +14,19 @@
  *
  */
 
-package org.hyperledger.besu.ethereum.core;
+package org.hyperledger.besu.evm.worldstate;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.ModificationNotAllowedException;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.account.AccountStorageEntry;
+import org.hyperledger.besu.evm.account.EvmAccount;
+import org.hyperledger.besu.evm.account.MutableAccount;
+
 import java.util.Map;
 import java.util.NavigableMap;
 import java.util.TreeMap;
@@ -35,8 +44,10 @@
  * remind if those were modified or not (the reason being that any modification of an account imply
  * the underlying trie node will have to be updated, and so knowing if the nonce and balance where
  * updated or not doesn't matter, we just need their new value).
+ *
+ * @param <A> the type parameter
  */
-public class UpdateTrackingAccount<A extends Account> implements MutableAccount {
+public class UpdateTrackingAccount<A extends Account> implements MutableAccount, EvmAccount {
   private final Address address;
   private final Hash addressHash;
 
@@ -44,7 +55,6 @@ public class UpdateTrackingAccount<A extends Account> implements MutableAccount
 
   private long nonce;
   private Wei balance;
-  private int version;
 
   @Nullable private Bytes updatedCode; // Null if the underlying code has not been updated.
   @Nullable private Hash updatedCodeHash;
@@ -55,6 +65,11 @@ public class UpdateTrackingAccount<A extends Account> implements MutableAccount
   private boolean storageWasCleared = false;
   private boolean transactionBoundary = false;
 
+  /**
+   * Instantiates a new Update tracking account.
+   *
+   * @param address the address
+   */
   UpdateTrackingAccount(final Address address) {
     checkNotNull(address);
     this.address = address;
@@ -63,12 +78,16 @@ public class UpdateTrackingAccount<A extends Account> implements MutableAccount
 
     this.nonce = 0;
     this.balance = Wei.ZERO;
-    this.version = Account.DEFAULT_VERSION;
 
     this.updatedCode = Bytes.EMPTY;
     this.updatedStorage = new TreeMap<>();
   }
 
+  /**
+   * Instantiates a new Update tracking account.
+   *
+   * @param account the account
+   */
   public UpdateTrackingAccount(final A account) {
     checkNotNull(account);
 
@@ -81,7 +100,6 @@ public UpdateTrackingAccount(final A account) {
 
     this.nonce = account.getNonce();
     this.balance = account.getBalance();
-    this.version = account.getVersion();
 
     this.updatedStorage = new TreeMap<>();
   }
@@ -96,6 +114,11 @@ public A getWrappedAccount() {
     return account;
   }
 
+  /**
+   * Sets wrapped account.
+   *
+   * @param account the account
+   */
   public void setWrappedAccount(final A account) {
     if (this.account == null) {
       this.account = account;
@@ -188,16 +211,7 @@ public void setCode(final Bytes code) {
     this.updatedCodeHash = null;
   }
 
-  @Override
-  public void setVersion(final int version) {
-    this.version = version;
-  }
-
-  @Override
-  public int getVersion() {
-    return version;
-  }
-
+  /** Mark transaction boundary. */
   void markTransactionBoundary() {
     this.transactionBoundary = true;
   }
@@ -229,6 +243,7 @@ public UInt256 getOriginalStorageValue(final UInt256 key) {
   }
 
   @Override
+  @SuppressWarnings("unchecked")
   public NavigableMap<Bytes32, AccountStorageEntry> storageEntriesFrom(
       final Bytes32 startKeyHash, final int limit) {
     final NavigableMap<Bytes32, AccountStorageEntry> entries;
@@ -259,10 +274,24 @@ public void clearStorage() {
     updatedStorage.clear();
   }
 
+  /**
+   * Gets storage was cleared.
+   *
+   * @return boolean if storage was cleared
+   */
   public boolean getStorageWasCleared() {
     return storageWasCleared;
   }
 
+  /**
+   * Sets storage was cleared.
+   *
+   * @param storageWasCleared the storage was cleared
+   */
+  public void setStorageWasCleared(final boolean storageWasCleared) {
+    this.storageWasCleared = storageWasCleared;
+  }
+
   @Override
   public String toString() {
     String storage = updatedStorage.isEmpty() ? "[not updated]" : updatedStorage.toString();
@@ -273,4 +302,9 @@ public String toString() {
         "%s -> {nonce: %s, balance:%s, code:%s, storage:%s }",
         address, nonce, balance, updatedCode == null ? "[not updated]" : updatedCode, storage);
   }
+
+  @Override
+  public MutableAccount getMutable() throws ModificationNotAllowedException {
+    return this;
+  }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/WorldState.java b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/WorldState.java
similarity index 79%
rename from ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/WorldState.java
rename to evm/src/main/java/org/hyperledger/besu/evm/worldstate/WorldState.java
index 83ffaf5bec7..1a12f0bbe96 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/WorldState.java
+++ b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/WorldState.java
@@ -12,7 +12,13 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.core;
+package org.hyperledger.besu.evm.worldstate;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.account.AccountState;
+import org.hyperledger.besu.evm.account.AccountStorageEntry;
 
 import java.util.NavigableMap;
 import java.util.Optional;
@@ -30,7 +36,7 @@
  * not mutable. In other words, objects implementing this interface are not guaranteed to be
  * thread-safe, though some particular implementations may provide such guarantees.
  */
-public interface WorldState extends WorldView {
+public interface WorldState extends WorldView, AutoCloseable {
 
   /**
    * The root hash of the world state this represents.
@@ -39,6 +45,13 @@ public interface WorldState extends WorldView {
    */
   Hash rootHash();
 
+  /**
+   * Get the mid-block root hash for Frontier transactions.
+   *
+   * @return the world state root hash.
+   */
+  Hash frontierRootHash();
+
   /**
    * A stream of all the accounts in this world state.
    *
@@ -49,15 +62,27 @@ public interface WorldState extends WorldView {
    */
   Stream<StreamableAccount> streamAccounts(Bytes32 startKeyHash, int limit);
 
+  /** The Streamable account. */
   class StreamableAccount implements AccountState {
     private final Optional<Address> address;
     private final AccountState accountState;
 
+    /**
+     * Instantiates a new Streamable account.
+     *
+     * @param address the address
+     * @param accountState the account state
+     */
     public StreamableAccount(final Optional<Address> address, final AccountState accountState) {
       this.address = address;
       this.accountState = accountState;
     }
 
+    /**
+     * Gets address.
+     *
+     * @return the address
+     */
     public Optional<Address> getAddress() {
       return address;
     }
@@ -87,11 +112,6 @@ public Hash getCodeHash() {
       return accountState.getCodeHash();
     }
 
-    @Override
-    public int getVersion() {
-      return accountState.getVersion();
-    }
-
     @Override
     public UInt256 getStorageValue(final UInt256 key) {
       return accountState.getStorageValue(key);
@@ -108,4 +128,9 @@ public NavigableMap<Bytes32, AccountStorageEntry> storageEntriesFrom(
       return accountState.storageEntriesFrom(startKeyHash, limit);
     }
   }
+
+  @Override
+  default void close() throws Exception {
+    // default no-op
+  }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/WorldUpdater.java b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/WorldUpdater.java
similarity index 77%
rename from ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/WorldUpdater.java
rename to evm/src/main/java/org/hyperledger/besu/evm/worldstate/WorldUpdater.java
index 04db5169b40..a9b012facbf 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/WorldUpdater.java
+++ b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/WorldUpdater.java
@@ -12,8 +12,16 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.core;
+package org.hyperledger.besu.evm.worldstate;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.account.EvmAccount;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Optional;
 
@@ -70,6 +78,17 @@ default EvmAccount getOrCreate(final Address address) {
     return account == null ? createAccount(address) : account;
   }
 
+  /**
+   * Retrieves the provided account for a sender of a transaction if it exists, or creates it if it
+   * doesn't.
+   *
+   * @param address the address of the account.
+   * @return the account of the sender for {@code address}
+   */
+  default EvmAccount getOrCreateSenderAccount(final Address address) {
+    return getOrCreate(address);
+  }
+
   /**
    * Retrieves the provided account, returning a modifiable object (whose updates are accumulated by
    * this updater).
@@ -79,6 +98,17 @@ default EvmAccount getOrCreate(final Address address) {
    */
   EvmAccount getAccount(Address address);
 
+  /**
+   * Retrieves the senders account, returning a modifiable object (whose updates are accumulated by
+   * this updater).
+   *
+   * @param frame the current message frame.
+   * @return the account {@code address}, or {@code null} if the account does not exist.
+   */
+  default EvmAccount getSenderAccount(final MessageFrame frame) {
+    return getAccount(frame.getSenderAddress());
+  }
+
   /**
    * Deletes the provided account.
    *
@@ -116,4 +146,10 @@ default EvmAccount getOrCreate(final Address address) {
    * @return The parent WorldUpdater if this wraps another one, empty otherwise
    */
   Optional<WorldUpdater> parentUpdater();
+
+  /** Clears any accounts that are empty */
+  default void clearAccountsThatAreEmpty() {
+    new ArrayList<>(getTouchedAccounts())
+        .stream().filter(Account::isEmpty).forEach(a -> deleteAccount(a.getAddress()));
+  }
 }
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/WorldView.java b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/WorldView.java
similarity index 82%
rename from ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/WorldView.java
rename to evm/src/main/java/org/hyperledger/besu/evm/worldstate/WorldView.java
index 77221b4eb91..c4b1f25db9f 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/WorldView.java
+++ b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/WorldView.java
@@ -12,14 +12,18 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.core;
+package org.hyperledger.besu.evm.worldstate;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.evm.account.Account;
 
 /** Generic interface for a view over the accounts of the world state. */
 public interface WorldView {
+  /** The constant EMPTY. */
   WorldView EMPTY = address -> null;
 
   /**
-   * Get an account provided it's address.
+   * Get an account provided its address.
    *
    * @param address the address of the account to retrieve.
    * @return the {@link Account} corresponding to {@code address} or {@code null} if there is no
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/WrappedEvmAccount.java b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/WrappedEvmAccount.java
similarity index 77%
rename from ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/WrappedEvmAccount.java
rename to evm/src/main/java/org/hyperledger/besu/evm/worldstate/WrappedEvmAccount.java
index 5e5c5d77460..8d644d9650d 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/WrappedEvmAccount.java
+++ b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/WrappedEvmAccount.java
@@ -12,7 +12,15 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.core;
+package org.hyperledger.besu.evm.worldstate;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.ModificationNotAllowedException;
+import org.hyperledger.besu.evm.account.AccountStorageEntry;
+import org.hyperledger.besu.evm.account.EvmAccount;
+import org.hyperledger.besu.evm.account.MutableAccount;
 
 import java.util.NavigableMap;
 
@@ -20,19 +28,35 @@
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.units.bigints.UInt256;
 
+/** The Wrapped evm account. */
 public class WrappedEvmAccount implements EvmAccount {
   private final MutableAccount mutableAccount;
 
+  /**
+   * Is immutable.
+   *
+   * @return the boolean
+   */
   public boolean isImmutable() {
     return isImmutable;
   }
 
+  /**
+   * Sets immutable.
+   *
+   * @param immutable the immutable
+   */
   public void setImmutable(final boolean immutable) {
     isImmutable = immutable;
   }
 
   private boolean isImmutable;
 
+  /**
+   * Instantiates a new Wrapped evm account.
+   *
+   * @param mutableAccount the mutable account
+   */
   public WrappedEvmAccount(final MutableAccount mutableAccount) {
 
     this.mutableAccount = mutableAccount;
@@ -77,11 +101,6 @@ public Hash getCodeHash() {
     return mutableAccount.getCodeHash();
   }
 
-  @Override
-  public int getVersion() {
-    return mutableAccount.getVersion();
-  }
-
   @Override
   public UInt256 getStorageValue(final UInt256 key) {
     return mutableAccount.getStorageValue(key);
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/StandardJsonTracerTest.java b/evm/src/test/java/org/hyperledger/besu/evm/StandardJsonTracerTest.java
new file mode 100644
index 00000000000..a65ab05d62a
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/StandardJsonTracerTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.evm;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.fluent.EVMExecutor;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.evm.tracing.StandardJsonTracer;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Test;
+
+class StandardJsonTracerTest {
+
+  @Test
+  void eip3155ModifiedTestCase() {
+
+    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    PrintStream out = new PrintStream(baos);
+    var executor = EVMExecutor.istanbul(EvmConfiguration.DEFAULT);
+    StandardJsonTracer tracer = new StandardJsonTracer(out, true, true, true);
+    executor.tracer(tracer);
+    executor.gas(10_000_000_000L);
+
+    var codeBytes = Bytes.fromHexString("0x604080536040604055604060006040600060025afa6040f3");
+    executor.execute(codeBytes, Bytes.EMPTY, Wei.ZERO, Address.ZERO);
+
+    // differences from the EIP-3155 test case
+    //  (a) the test case was written when EIP-2315 was part of the pending hard fork, so
+    //      returnStack was a valid field.  It no longer appears in any traces.
+    //  (b) the summary line is omitted
+    //  (c) pc:3 is in error, the size of the memory before the first MSTORE8 is zero.
+    //  (d) we don't report call requested gas in CALL series operations as a gas cost, just the EVM
+    //      consumed gas
+    //  (e) if memory is zero length, it is not included even if `showMemory` is true
+    //  (f) if return data is zero length or null, it is not included even if `showReturnData` is
+    // true
+    //  (g) if error is zero length or null it is not included.
+    assertThat(baos)
+        .hasToString(
+            "{\"pc\":0,\"op\":96,\"gas\":\"0x2540be400\",\"gasCost\":\"0x3\",\"memSize\":0,\"stack\":[],\"depth\":1,\"refund\":0,\"opName\":\"PUSH1\"}\n"
+                + "{\"pc\":2,\"op\":128,\"gas\":\"0x2540be3fd\",\"gasCost\":\"0x3\",\"memSize\":0,\"stack\":[\"0x40\"],\"depth\":1,\"refund\":0,\"opName\":\"DUP1\"}\n"
+                + "{\"pc\":3,\"op\":83,\"gas\":\"0x2540be3fa\",\"gasCost\":\"0xc\",\"memSize\":0,\"stack\":[\"0x40\",\"0x40\"],\"depth\":1,\"refund\":0,\"opName\":\"MSTORE8\"}\n"
+                + "{\"pc\":4,\"op\":96,\"gas\":\"0x2540be3ee\",\"gasCost\":\"0x3\",\"memory\":\"0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000\",\"memSize\":96,\"stack\":[],\"depth\":1,\"refund\":0,\"opName\":\"PUSH1\"}\n"
+                + "{\"pc\":6,\"op\":96,\"gas\":\"0x2540be3eb\",\"gasCost\":\"0x3\",\"memory\":\"0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000\",\"memSize\":96,\"stack\":[\"0x40\"],\"depth\":1,\"refund\":0,\"opName\":\"PUSH1\"}\n"
+                + "{\"pc\":8,\"op\":85,\"gas\":\"0x2540be3e8\",\"gasCost\":\"0x4e20\",\"memory\":\"0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000\",\"memSize\":96,\"stack\":[\"0x40\",\"0x40\"],\"depth\":1,\"refund\":0,\"opName\":\"SSTORE\"}\n"
+                + "{\"pc\":9,\"op\":96,\"gas\":\"0x2540b95c8\",\"gasCost\":\"0x3\",\"memory\":\"0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000\",\"memSize\":96,\"stack\":[],\"depth\":1,\"refund\":0,\"opName\":\"PUSH1\"}\n"
+                + "{\"pc\":11,\"op\":96,\"gas\":\"0x2540b95c5\",\"gasCost\":\"0x3\",\"memory\":\"0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000\",\"memSize\":96,\"stack\":[\"0x40\"],\"depth\":1,\"refund\":0,\"opName\":\"PUSH1\"}\n"
+                + "{\"pc\":13,\"op\":96,\"gas\":\"0x2540b95c2\",\"gasCost\":\"0x3\",\"memory\":\"0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000\",\"memSize\":96,\"stack\":[\"0x40\",\"0x0\"],\"depth\":1,\"refund\":0,\"opName\":\"PUSH1\"}\n"
+                + "{\"pc\":15,\"op\":96,\"gas\":\"0x2540b95bf\",\"gasCost\":\"0x3\",\"memory\":\"0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000\",\"memSize\":96,\"stack\":[\"0x40\",\"0x0\",\"0x40\"],\"depth\":1,\"refund\":0,\"opName\":\"PUSH1\"}\n"
+                + "{\"pc\":17,\"op\":96,\"gas\":\"0x2540b95bc\",\"gasCost\":\"0x3\",\"memory\":\"0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000\",\"memSize\":96,\"stack\":[\"0x40\",\"0x0\",\"0x40\",\"0x0\"],\"depth\":1,\"refund\":0,\"opName\":\"PUSH1\"}\n"
+                + "{\"pc\":19,\"op\":90,\"gas\":\"0x2540b95b9\",\"gasCost\":\"0x2\",\"memory\":\"0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000\",\"memSize\":96,\"stack\":[\"0x40\",\"0x0\",\"0x40\",\"0x0\",\"0x2\"],\"depth\":1,\"refund\":0,\"opName\":\"GAS\"}\n"
+                + "{\"pc\":20,\"op\":250,\"gas\":\"0x2540b95b7\",\"gasCost\":\"0x2bc\",\"memory\":\"0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000\",\"memSize\":96,\"stack\":[\"0x40\",\"0x0\",\"0x40\",\"0x0\",\"0x2\",\"0x2540b95b7\"],\"depth\":1,\"refund\":0,\"opName\":\"STATICCALL\"}\n"
+                + "{\"pc\":21,\"op\":96,\"gas\":\"0x2540b92a7\",\"gasCost\":\"0x3\",\"memory\":\"0xf5a5fd42d16a20302798ef6ed309979b43003d2320d9f0e8ea9831a92759fb4b00000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000\",\"memSize\":96,\"stack\":[\"0x1\"],\"returnData\":\"0xf5a5fd42d16a20302798ef6ed309979b43003d2320d9f0e8ea9831a92759fb4b\",\"depth\":1,\"refund\":0,\"opName\":\"PUSH1\"}\n"
+                + "{\"pc\":23,\"op\":243,\"gas\":\"0x2540b92a4\",\"gasCost\":\"0x0\",\"memory\":\"0xf5a5fd42d16a20302798ef6ed309979b43003d2320d9f0e8ea9831a92759fb4b00000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000\",\"memSize\":96,\"stack\":[\"0x1\",\"0x40\"],\"returnData\":\"0xf5a5fd42d16a20302798ef6ed309979b43003d2320d9f0e8ea9831a92759fb4b\",\"depth\":1,\"refund\":0,\"opName\":\"RETURN\"}\n");
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/code/CodeFactoryTest.java b/evm/src/test/java/org/hyperledger/besu/evm/code/CodeFactoryTest.java
new file mode 100644
index 00000000000..79ddeb12429
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/code/CodeFactoryTest.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.code;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.evm.Code;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Test;
+
+class CodeFactoryTest {
+
+  @Test
+  void invalidCodeIncompleteMagic() {
+    invalidCode("0xEF");
+  }
+
+  @Test
+  void invalidCodeInvalidMagic() {
+    invalidCode("0xEFFF0101000302000400600000AABBCCDD");
+  }
+
+  @Test
+  void invalidCodeNoVersion() {
+    invalidCode("0xEF00");
+  }
+
+  @Test
+  void invalidCodeInvalidVersion0x00() {
+    invalidCode("EF000001000302000400600000AABBCCDD");
+  }
+
+  @Test
+  void invalidCodeInvalidVersion0x02() {
+    invalidCode("EF000201000302000400600000AABBCCDD");
+  }
+
+  @Test
+  void invalidCodeInvalidVersion0xFF() {
+    invalidCode("EF00FF01000302000400600000AABBCCDD");
+  }
+
+  @Test
+  void invalidCodeNoHeader() {
+    invalidCode("0xEF0001");
+  }
+
+  @Test
+  void invalidCodeNoCodeSection() {
+    invalidCode("0xEF000100");
+  }
+
+  @Test
+  void invalidCodeNoCodeSectionSize() {
+    invalidCode("0xEF000101");
+  }
+
+  @Test
+  void invalidCodeCodeSectionSizeIncomplete() {
+    invalidCode("0xEF00010100");
+  }
+
+  @Test
+  void invalidCodeNoSectionTerminator0x03() {
+    invalidCode("0xEF0001010003");
+  }
+
+  @Test
+  void invalidCodeNoSectionTerminator0x03600000() {
+    invalidCode("0xEF0001010003600000");
+  }
+
+  @Test
+  void invalidCodeNoCodeSectionContents() {
+    invalidCode("0xEF000101000200");
+  }
+
+  @Test
+  void invalidCodeCodeSectionContentsIncomplete() {
+    invalidCode("0xEF00010100020060");
+  }
+
+  @Test
+  void invalidCodeTrailingBytesAfterCodeSection() {
+    invalidCode("0xEF000101000300600000DEADBEEF");
+  }
+
+  @Test
+  void invalidCodeMultipleCodeSections() {
+    invalidCode("0xEF000101000301000300600000600000");
+  }
+
+  @Test
+  void invalidCodeEmptyCodeSection() {
+    invalidCode("0xEF000101000000");
+  }
+
+  @Test
+  void invalidCodeEmptyCodeSectionWithNonEmptyDataSection() {
+    invalidCode("0xEF000101000002000200AABB");
+  }
+
+  @Test
+  void invalidCodeDataSectionPrecedingCodeSection() {
+    invalidCode("0xEF000102000401000300AABBCCDD600000");
+  }
+
+  @Test
+  void invalidCodeDataSectionWithoutCodeSection() {
+    invalidCode("0xEF000102000400AABBCCDD");
+  }
+
+  @Test
+  void invalidCodeNoDataSectionSize() {
+    invalidCode("0xEF000101000202");
+  }
+
+  @Test
+  void invalidCodeDataSectionSizeIncomplete() {
+    invalidCode("0xEF00010100020200");
+  }
+
+  @Test
+  void invalidCodeNoSectionTerminator0x03020004() {
+    invalidCode("0xEF0001010003020004");
+  }
+
+  @Test
+  void invalidCodeNoSectionTerminator0x03020004600000AABBCCDD() {
+    invalidCode("0xEF0001010003020004600000AABBCCDD");
+  }
+
+  @Test
+  void invalidCodeNoDataSectionContents() {
+    invalidCode("0xEF000101000302000400600000");
+  }
+
+  @Test
+  void invalidCodeDataSectionContentsIncomplete() {
+    invalidCode("0xEF000101000302000400600000AABBCC");
+  }
+
+  @Test
+  void invalidCodeTrailingBytesAfterDataSection() {
+    invalidCode("0xEF000101000302000400600000AABBCCDDEE");
+  }
+
+  @Test
+  void invalidCodeMultipleDataSections() {
+    invalidCode("0xEF000101000302000402000400600000AABBCCDDAABBCCDD");
+  }
+
+  @Test
+  void invalidCodeMultipleCodeAndDataSections() {
+    invalidCode("0xEF000101000101000102000102000100FEFEAABB");
+  }
+
+  @Test
+  void invalidCodeEmptyDataSection() {
+    invalidCode("0xEF000101000302000000600000");
+  }
+
+  @Test
+  void invalidCodeUnknownSectionId3() {
+    invalidCode("0xEF0001010002030004006000AABBCCDD");
+  }
+
+  private static void invalidCode(final String str) {
+    Code code = CodeFactory.createCode(Bytes.fromHexString(str), 1, true);
+    assertThat(code.isValid()).isFalse();
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/code/CodeV0Test.java b/evm/src/test/java/org/hyperledger/besu/evm/code/CodeV0Test.java
new file mode 100644
index 00000000000..ff8014c10e7
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/code/CodeV0Test.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.evm.code;
+
+import static org.hyperledger.besu.evm.frame.MessageFrame.Type.MESSAGE_CALL;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.EvmSpecVersion;
+import org.hyperledger.besu.evm.frame.BlockValues;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.IstanbulGasCalculator;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.evm.operation.JumpDestOperation;
+import org.hyperledger.besu.evm.operation.JumpOperation;
+import org.hyperledger.besu.evm.operation.Operation.OperationResult;
+import org.hyperledger.besu.evm.operation.OperationRegistry;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+
+import java.util.ArrayDeque;
+import javax.annotation.Nonnull;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+class CodeV0Test {
+
+  private static final IstanbulGasCalculator gasCalculator = new IstanbulGasCalculator();
+
+  private static final int CURRENT_PC = 1;
+  private EVM evm;
+
+  @BeforeEach
+  void startUp() {
+    final OperationRegistry registry = new OperationRegistry();
+    registry.put(new JumpOperation(gasCalculator));
+    registry.put(new JumpDestOperation(gasCalculator));
+    evm = new EVM(registry, gasCalculator, EvmConfiguration.DEFAULT, EvmSpecVersion.PARIS);
+  }
+
+  @Test
+  void shouldReuseJumpDestMap() {
+    final JumpOperation operation = new JumpOperation(gasCalculator);
+    final Bytes jumpBytes = Bytes.fromHexString("0x6003565b00");
+    final CodeV0 getsCached = (CodeV0) spy(CodeFactory.createCode(jumpBytes, 0, false));
+    MessageFrame frame = createJumpFrame(getsCached);
+
+    OperationResult result = operation.execute(frame, evm);
+    assertNull(result.getHaltReason());
+    Mockito.verify(getsCached, times(1)).calculateJumpDests();
+
+    // do it again to prove we don't recalculate, and we hit the cache
+
+    frame = createJumpFrame(getsCached);
+
+    result = operation.execute(frame, evm);
+    assertNull(result.getHaltReason());
+    Mockito.verify(getsCached, times(1)).calculateJumpDests();
+  }
+
+  @Nonnull
+  private MessageFrame createJumpFrame(final CodeV0 getsCached) {
+    final MessageFrame frame =
+        MessageFrame.builder()
+            .type(MESSAGE_CALL)
+            .messageFrameStack(new ArrayDeque<>())
+            .worldUpdater(mock(WorldUpdater.class))
+            .initialGas(10_000L)
+            .address(Address.ZERO)
+            .originator(Address.ZERO)
+            .contract(Address.ZERO)
+            .gasPrice(Wei.ZERO)
+            .inputData(Bytes.EMPTY)
+            .sender(Address.ZERO)
+            .value(Wei.ZERO)
+            .apparentValue(Wei.ZERO)
+            .code(getsCached)
+            .blockValues(mock(BlockValues.class))
+            .depth(0)
+            .completer(f -> {})
+            .miningBeneficiary(Address.ZERO)
+            .blockHashLookup(l -> Hash.EMPTY)
+            .build();
+
+    frame.setPC(CURRENT_PC);
+    frame.pushStackItem(UInt256.fromHexString("0x03"));
+    return frame;
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/code/CodeV1Test.java b/evm/src/test/java/org/hyperledger/besu/evm/code/CodeV1Test.java
new file mode 100644
index 00000000000..7f8547d6643
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/code/CodeV1Test.java
@@ -0,0 +1,833 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.evm.code;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.evm.code.CodeV1Validation.validateCode;
+import static org.hyperledger.besu.evm.code.CodeV1Validation.validateStack;
+
+import java.util.List;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+/**
+ * These tests focus on code only validations, which are checked within the code runs themselves.
+ * Tests that depend on the EOF container (such as CallF into other sections) are in EOFLayoutTest.
+ */
+class CodeV1Test {
+
+  public static final String ZERO_HEX = "00";
+  public static final String NOOP_HEX = "5b";
+
+  @Test
+  void validCode() {
+    String codeHex =
+        "0xEF0001 01000C 020003 000b 0002 0008 030000 00 00000000 02010001 01000002 60016002e30001e30002e4 01e4 60005360106000f3";
+    final EOFLayout layout = EOFLayout.parseEOF(Bytes.fromHexString(codeHex.replace(" ", "")));
+
+    String validationError = validateCode(layout);
+
+    assertThat(validationError).isNull();
+  }
+
+  @ParameterizedTest
+  @ValueSource(
+      strings = {"3000", "5000", "e0000000", "6000e1000000", "6000e201000000", "fe00", "0000"})
+  void testValidOpcodes(final String code) {
+    final String validationError = validateCode(Bytes.fromHexString(code), 1);
+    assertThat(validationError).isNull();
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = {"00", "3030f3", "3030fd", "fe"})
+  void testValidCodeTerminator(final String code) {
+    final String validationError = validateCode(Bytes.fromHexString(code), 1);
+    assertThat(validationError).isNull();
+  }
+
+  @ParameterizedTest
+  @MethodSource("testPushValidImmediateArguments")
+  void testPushValidImmediate(final String code) {
+    final String validationError = validateCode(Bytes.fromHexString(code), 1);
+    assertThat(validationError).isNull();
+  }
+
+  private static Stream<Arguments> testPushValidImmediateArguments() {
+    final int codeBegin = 96;
+    return IntStream.range(0, 32)
+        .mapToObj(i -> String.format("%02x", codeBegin + i) + ZERO_HEX.repeat(i + 1) + ZERO_HEX)
+        .map(Arguments::arguments);
+  }
+
+  @ParameterizedTest
+  @MethodSource("testRjumpValidImmediateArguments")
+  void testRjumpValidImmediate(final String code) {
+    final String validationError = validateCode(Bytes.fromHexString(code), 1);
+    assertThat(validationError).isNull();
+  }
+
+  private static Stream<Arguments> testRjumpValidImmediateArguments() {
+    return Stream.of(
+            "e0000000",
+            "e000010000",
+            "e000010000000000",
+            "e00100" + NOOP_HEX.repeat(256) + ZERO_HEX,
+            "e07fff" + NOOP_HEX.repeat(32767) + ZERO_HEX,
+            "e0fffd0000",
+            "00e0fffc00",
+            NOOP_HEX.repeat(253) + "e0ff0000",
+            NOOP_HEX.repeat(32765) + "e0800000")
+        .map(Arguments::arguments);
+  }
+
+  @ParameterizedTest
+  @MethodSource("testRjumpiValidImmediateArguments")
+  void testRjumpiValidImmediate(final String code) {
+    final String validationError = validateCode(Bytes.fromHexString(code), 1);
+    assertThat(validationError).isNull();
+  }
+
+  private static Stream<Arguments> testRjumpiValidImmediateArguments() {
+    return Stream.of(
+            "6001e1000000",
+            "6001e100010000",
+            "6001e100010000000000",
+            "6001e10100" + "5b".repeat(256) + ZERO_HEX,
+            "6001e17fff" + "5b".repeat(32767) + ZERO_HEX,
+            "6001e1fffd0000",
+            "6001e1fffb00",
+            NOOP_HEX.repeat(252) + "6001e1ff0000",
+            NOOP_HEX.repeat(32763) + "6001e1800000",
+            "e1000000")
+        .map(Arguments::arguments);
+  }
+
+  @ParameterizedTest
+  @MethodSource("rjumptableValidImmediateArguments")
+  void testRjumptableValidImmediate(final String code) {
+    final String validationError = validateCode(Bytes.fromHexString(code), 1);
+    assertThat(validationError).isNull();
+  }
+
+  private static Stream<Arguments> rjumptableValidImmediateArguments() {
+    return Stream.of(
+            "6001e201000000",
+            "6001e202000000010000",
+            "6001e203000000040100" + "5b".repeat(256) + ZERO_HEX,
+            "6001e2040000000401007fff" + "5b".repeat(32767) + ZERO_HEX,
+            "6001e201fffc0000",
+            "5b".repeat(248) + "6001e202fffaff0000",
+            "5b".repeat(32760) + "6001e202fffa800000",
+            "e201000000")
+        .map(Arguments::arguments);
+  }
+
+  @ParameterizedTest
+  @MethodSource("invalidCodeArguments")
+  void testInvalidCode(final String code) {
+    final String validationError = validateCode(Bytes.fromHexString(code), 1);
+    assertThat(validationError).startsWith("Invalid Instruction 0x");
+  }
+
+  private static Stream<Arguments> invalidCodeArguments() {
+    return Stream.of(
+            IntStream.rangeClosed(0x0c, 0x0f),
+            IntStream.of(0x1e, 0x1f),
+            IntStream.rangeClosed(0x21, 0x2f),
+            IntStream.rangeClosed(0x49, 0x4f),
+            IntStream.rangeClosed(0xa5, 0xaf),
+            IntStream.rangeClosed(0xb0, 0xbf),
+            IntStream.rangeClosed(0xc0, 0xcf),
+            IntStream.rangeClosed(0xd0, 0xdf),
+            IntStream.rangeClosed(0xe5, 0xef),
+            IntStream.of(0xf6, 0xf7, 0xf8, 0xf9, 0xfb, 0xfc))
+        .flatMapToInt(i -> i)
+        .mapToObj(i -> String.format("%02x", i) + ZERO_HEX)
+        .map(Arguments::arguments);
+  }
+
+  @ParameterizedTest
+  @MethodSource("pushTruncatedImmediateArguments")
+  void testPushTruncatedImmediate(final String code) {
+    final String validationError = validateCode(Bytes.fromHexString(code), 1);
+    assertThat(validationError).isEqualTo("No terminating instruction");
+  }
+
+  private static Stream<Arguments> pushTruncatedImmediateArguments() {
+    return Stream.concat(
+            Stream.of("60"),
+            IntStream.range(0, 31)
+                .mapToObj(i -> String.format("%02x", 0x61 + i) + NOOP_HEX.repeat(i + 1)))
+        .map(Arguments::arguments);
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = {"e0", "e000"})
+  void testRjumpTruncatedImmediate(final String code) {
+    final String validationError = validateCode(Bytes.fromHexString(code), 1);
+    assertThat(validationError).isEqualTo("Truncated relative jump offset");
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = {"6001e1", "6001e100"})
+  void testRjumpiTruncatedImmediate(final String code) {
+    final String validationError = validateCode(Bytes.fromHexString(code), 1);
+    assertThat(validationError).isEqualTo("Truncated relative jump offset");
+  }
+
+  @ParameterizedTest
+  @ValueSource(
+      strings = {
+        "6001e2",
+        "6001e201",
+        "6001e20100",
+        "6001e2030000",
+        "6001e20300000001",
+        "6001e2030000000100"
+      })
+  void testRjumpvTruncatedImmediate(final String code) {
+    final String validationError = validateCode(Bytes.fromHexString(code), 1);
+    assertThat(validationError).isEqualTo("Truncated jump table");
+  }
+
+  @ParameterizedTest
+  @ValueSource(
+      strings = {
+        "e00000",
+        "e0000100",
+        "e0fffc00",
+        "6001e10000",
+        "6001e1000100",
+        "6001e1fffa00",
+        "6001e201000100",
+        "6001e201fff900"
+      })
+  void testRjumpsOutOfBounds(final String code) {
+    final String validationError = validateCode(Bytes.fromHexString(code), 1);
+    assertThat(validationError).isEqualTo("Relative jump destination out of bounds");
+  }
+
+  @ParameterizedTest
+  @MethodSource("rjumpsIntoImmediateExtraArguments")
+  @ValueSource(
+      strings = {
+        // RJUMP into RJUMP immediate
+        "e0ffff00",
+        "e0fffe00",
+        "e00001e0000000",
+        "e00002e0000000",
+        // RJUMPI into RJUMP immediate
+        "6001e10001e0000000",
+        "6001e10002e0000000",
+        // RJUMPV into RJUMP immediate
+        "6001e2010001e0000000",
+        "6001e2010002e0000000",
+        // RJUMP into RJUMPI immediate
+        "e000036001e1000000",
+        "e000046001e1000000",
+        // RJUMPI into RJUMPI immediate
+        "6001e1ffff00",
+        "6001e1fffe00",
+        "6001e100036001e1000000",
+        "6001e100046001e1000000",
+        // RJUMPV into RJUMPI immediate
+        "6001e20100036001e1000000",
+        "6001e20100046001e1000000",
+        // RJUMP into RJUMPV immediate
+        "e00001e201000000",
+        "e00002e201000000",
+        "e00003e201000000",
+        // RJUMPI into RJUMPV immediate
+        "6001e10001e201000000",
+        "6001e10002e201000000",
+        "6001e10003e201000000",
+        // RJUMPV into RJUMPV immediate
+        "6001e201ffff00",
+        "6001e201fffe00",
+        "6001e201fffd00",
+        "6001e2010001e201000000",
+        "6001e2010002e201000000",
+        "6001e2010003e201000000",
+        "6001e2010001e2020000fff400",
+        "6001e2010002e2020000fff400",
+        "6001e2010003e2020000fff400",
+        "6001e2010004e2020000fff400",
+        "6001e2010005e2020000fff400"
+      })
+  void testRjumpsIntoImmediate(final String code) {
+    final String validationError = validateCode(Bytes.fromHexString(code), 1);
+    assertThat(validationError)
+        .isEqualTo("Relative jump destinations targets invalid immediate data");
+  }
+
+  private static Stream<Arguments> rjumpsIntoImmediateExtraArguments() {
+    return IntStream.range(1, 33)
+        .mapToObj(
+            n ->
+                IntStream.range(1, n + 1)
+                    .mapToObj(
+                        offset ->
+                            Stream.of(
+                                String.format("e000%02x", offset)
+                                    + // RJUMP offset
+                                    String.format("%02x", 0x60 + n - 1)
+                                    + // PUSHn
+                                    ZERO_HEX.repeat(n)
+                                    + // push data
+                                    ZERO_HEX, // STOP
+                                String.format("6001e100%02x", offset)
+                                    + // PUSH1 1 RJUMI offset
+                                    String.format("%02x", 0x60 + n - 1)
+                                    + // PUSHn
+                                    ZERO_HEX.repeat(n)
+                                    + // push data
+                                    ZERO_HEX, // STOP
+                                String.format("6001e20100%02x", offset)
+                                    + String.format("%02x", 0x60 + n - 1)
+                                    + // PUSHn
+                                    ZERO_HEX.repeat(n)
+                                    + // push data
+                                    ZERO_HEX // STOP
+                                )))
+        .flatMap(i -> i)
+        .flatMap(i -> i)
+        .map(Arguments::arguments);
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = {"6001e20000"})
+  void testRjumpvEmptyTable(final String code) {
+    final String validationError = validateCode(Bytes.fromHexString(code), 1);
+    assertThat(validationError).isEqualTo("Empty jump table");
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = {"e3", "e300"})
+  void testCallFTruncated(final String code) {
+    final String validationError = validateCode(Bytes.fromHexString(code), 1);
+    assertThat(validationError).isEqualTo("Truncated CALLF");
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = {"e5", "e500"})
+  @Disabled("Out of Shahghai, will likely return in Cancun or Prague")
+  void testJumpCallFTruncated(final String code) {
+    final String validationError = validateCode(Bytes.fromHexString(code), 1);
+    assertThat(validationError).isEqualTo("Truncated CALLF");
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = {"e30004", "e303ff", "e3ffff"})
+  void testCallFWrongSection(final String code) {
+    final String validationError = validateCode(Bytes.fromHexString(code), 3);
+    assertThat(validationError).startsWith("CALLF to non-existent section -");
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = {"e50004", "e503ff", "e5ffff"})
+  @Disabled("Out of Shahghai, will likely return in Cancun or Prague")
+  void testJumpFWrongSection(final String code) {
+    final String validationError = validateCode(Bytes.fromHexString(code), 3);
+    assertThat(validationError).startsWith("CALLF to non-existent section -");
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = {"e3000100", "e3000200", "e3000000"})
+  void testCallFValid(final String code) {
+    final String validationError = validateCode(Bytes.fromHexString(code), 3);
+    assertThat(validationError).isNull();
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = {"e50001", "e50002", "e50000"})
+  @Disabled("Out of Shahghai, will likely return in Cancun or Prague")
+  void testJumpFValid(final String code) {
+    final String validationError = validateCode(Bytes.fromHexString(code), 3);
+    assertThat(validationError).isNull();
+  }
+
+  @ParameterizedTest
+  @MethodSource("immediateContainsOpcodeArguments")
+  void testImmediateContainsOpcode(final String code) {
+    final String validationError = validateCode(Bytes.fromHexString(code), 1);
+    assertThat(validationError).isNull();
+  }
+
+  private static Stream<Arguments> immediateContainsOpcodeArguments() {
+    return Stream.of(
+            // 0xe0 byte which could be interpreted a RJUMP, but it's not because it's in PUSH data
+            "60e0001000",
+            "6100e0001000",
+            // 0xe1 byte which could be interpreted a RJUMPI, but it's not because it's in PUSH data
+            "60e1001000",
+            "6100e1001000",
+            // 0xe2 byte which could be interpreted a RJUMPV, but it's not because it's in PUSH data
+            "60e201000000",
+            "6100e201000000",
+            // 0x60 byte which could be interpreted as PUSH, but it's not because it's in RJUMP data
+            // offset = -160
+            "5b".repeat(160) + "e0ff6000",
+            // 0x60 byte which could be interpreted as PUSH, but it's not because it's in RJUMPI
+            // data
+            // offset = -160
+            "5b".repeat(160) + "e1ff6000",
+            // 0x60 byte which could be interpreted as PUSH, but it's not because it's in RJUMPV
+            // data
+            // offset = -160
+            "5b".repeat(160) + "e201ff6000")
+        .map(Arguments::arguments);
+  }
+
+  @ParameterizedTest(name = "{index}: {0}")
+  @MethodSource({
+    "stackEmpty",
+    "stackEmptyAtExit",
+    "stackImmediateBytes",
+    "stackUnderflow",
+    "stackRJumpForward",
+    "stackRJumpBackward",
+    "stackRJumpI",
+    "stackCallF",
+    "stackRetF",
+    "stackUnreachable",
+    "stackHeight",
+    "invalidInstructions",
+  })
+  void validateStackAnalysis(
+      final String ignoredName,
+      final String expectedError,
+      final int sectionToTest,
+      final List<List<Object>> rawCodeSections) {
+
+    StringBuilder codeLengths = new StringBuilder();
+    StringBuilder typesData = new StringBuilder();
+    StringBuilder codeData = new StringBuilder();
+
+    for (var rawCodeSection : rawCodeSections) {
+      var code = Bytes.fromHexString(((String) rawCodeSection.get(0)).replace(" ", ""));
+      int inputs = (Integer) rawCodeSection.get(1);
+      int outputs = (Integer) rawCodeSection.get(2);
+      int length = (Integer) rawCodeSection.get(3);
+
+      codeLengths.append(String.format("%04x", code.size()));
+      typesData.append(String.format("%02x%02x%04x", inputs, outputs, length));
+      codeData.append(code.toUnprefixedHexString());
+    }
+    int sectionCount = rawCodeSections.size();
+    String sb =
+        "0xef0001"
+            + String.format("01%04x", sectionCount * 4)
+            + String.format("02%04x", sectionCount)
+            + codeLengths
+            + "030000"
+            + "00"
+            + typesData
+            + codeData;
+
+    EOFLayout eofLayout = EOFLayout.parseEOF(Bytes.fromHexString(sb));
+
+    assertThat(validateStack(sectionToTest, eofLayout)).isEqualTo(expectedError);
+  }
+
+  /**
+   * Vectors from an early <a
+   * href="https://github.com/ipsilon/eof/commit/c1a2422ddbb72db48bacd2406ed7dad28567b403#diff-ce64373581560ddf02962cb731dfa06457d5ff8615fe12b63c881ab97432f1cf">Ipsilon
+   * Prototype</a>
+   *
+   * @return parameterized test vectors
+   */
+  static Stream<Arguments> stackEmpty() {
+    return Stream.of(Arguments.of("Empty", null, 0, List.of(List.of("00", 0, 0, 0))));
+  }
+
+  static Stream<Arguments> stackEmptyAtExit() {
+    return Stream.of(
+        // this depends on requiring stacks to be "clean" returns
+        Arguments.of("Stack Empty at Exit", null, 0, List.of(List.of("43 50 00", 0, 0, 1))),
+        Arguments.of(
+            "Stack empty with input",
+            null,
+            1,
+            List.of(List.of("00", 0, 0, 0), List.of("50 00", 1, 0, 1))),
+        // this depends on requiring stacks to be "clean" returns
+        Arguments.of(
+            "Stack not empty at output",
+            null,
+            1,
+            List.of(List.of("00", 0, 0, 0), List.of("00", 1, 0, 1))));
+  }
+
+  static Stream<Arguments> stackImmediateBytes() {
+    return Stream.of(
+        Arguments.of(
+            "Immediate Bytes - simple push", null, 0, List.of(List.of("6001 50 00", 0, 0, 1))));
+  }
+
+  static Stream<Arguments> stackUnderflow() {
+    return Stream.of(
+        Arguments.of(
+            "Stack underflow",
+            "Operation 0x50 requires stack of 1 but only has 0 items",
+            0,
+            List.of(List.of("50 00", 0, 0, 1))));
+  }
+
+  static Stream<Arguments> stackRJumpForward() {
+    return Stream.of(
+        Arguments.of("RJUMP 0", null, 0, List.of(List.of("e00000 00", 0, 0, 0))),
+        Arguments.of(
+            "RJUMP 1 w/ dead code",
+            "Dead code detected in section 0",
+            0,
+            List.of(List.of("e00001 43 00", 0, 0, 0))),
+        Arguments.of(
+            "RJUMP 2 w/ dead code",
+            "Dead code detected in section 0",
+            0,
+            List.of(List.of("e00002 43 50 00", 0, 0, 0))),
+        Arguments.of(
+            "RJUMP 3 and -10",
+            null,
+            0,
+            List.of(List.of("e00003 01 50 00 6001 6001 e0fff6", 0, 0, 2))));
+  }
+
+  static Stream<Arguments> stackRJumpBackward() {
+    return Stream.of(
+        Arguments.of("RJUMP -3", null, 0, List.of(List.of("e0fffd", 0, 0, 0))),
+        Arguments.of("RJUMP -4", null, 0, List.of(List.of("5B e0fffc", 0, 0, 0))),
+        Arguments.of(
+            "RJUMP -4 unmatched stack",
+            "Jump into code stack height (0) does not match previous value (1)",
+            0,
+            List.of(List.of("43 e0fffc", 0, 0, 0))),
+        Arguments.of(
+            "RJUMP -4 unmatched stack",
+            "Jump into code stack height (1) does not match previous value (0)",
+            0,
+            List.of(List.of("43 50 e0fffc 00", 0, 0, 0))),
+        Arguments.of("RJUMP -3 matched stack", null, 0, List.of(List.of("43 50 e0fffd", 0, 0, 1))),
+        Arguments.of(
+            "RJUMP -4 matched stack", null, 0, List.of(List.of("43 50 5B e0fffc", 0, 0, 1))),
+        Arguments.of(
+            "RJUMP -5 matched stack", null, 0, List.of(List.of("43 50 43 e0fffb", 0, 0, 1))),
+        Arguments.of(
+            "RJUMP -4 unmatched stack",
+            "Jump into code stack height (0) does not match previous value (1)",
+            0,
+            List.of(List.of("43 50 43 e0fffc 50 00", 0, 0, 0))));
+  }
+
+  static Stream<Arguments> stackRJumpI() {
+    return Stream.of(
+        Arguments.of(
+            "RJUMPI Each branch ending with STOP",
+            null,
+            0,
+            List.of(List.of("60ff 6001 e10002 50 00 50 00", 0, 0, 2))),
+        Arguments.of(
+            "RJUMPI One branch ending with RJUMP",
+            null,
+            0,
+            List.of(List.of("60ff 6001 e10004 50 e00001 50 00", 0, 0, 2))),
+        Arguments.of(
+            "RJUMPI Fallthrough",
+            null,
+            0,
+            List.of(List.of("60ff 6001 e10004 80 80 50 50 50 00", 0, 0, 3))),
+        Arguments.of(
+            "RJUMPI Offset 0", null, 0, List.of(List.of("60ff 6001 e10000 50 00", 0, 0, 2))),
+        Arguments.of(
+            "Simple loop (RJUMPI offset = -5)",
+            null,
+            0,
+            List.of(List.of("6001 60ff 81 02 80 e1fffa 50 50 00", 0, 0, 3))),
+        Arguments.of(
+            "RJUMPI One branch increasing max stack more stack than another",
+            null,
+            0,
+            List.of(List.of("6001 e10007 30 30 30 50 50 50 00 30 50 00", 0, 0, 3))),
+        Arguments.of(
+            "RJUMPI One branch increasing max stack more stack than another II",
+            null,
+            0,
+            List.of(List.of("6001 e10003 30 50 00 30 30 30 50 50 50 00", 0, 0, 3))),
+        Arguments.of(
+            "RJUMPI Missing stack argument",
+            "Operation 0xE1 requires stack of 1 but only has 0 items",
+            0,
+            List.of(List.of("e10000 00", 0, 0, 0))),
+        Arguments.of(
+            "Stack underflow one branch",
+            "Operation 0x02 requires stack of 2 but only has 1 items",
+            0,
+            List.of(List.of("60ff 6001 e10002 50 00 02 50 00", 0, 0, 0))),
+        Arguments.of(
+            "Stack underflow another branch",
+            "Operation 0x02 requires stack of 2 but only has 1 items",
+            0,
+            List.of(List.of("60ff 6001 e10002 02 00 19 50 00", 0, 0, 0))),
+        // this depends on requiring stacks to be "clean" returns
+        Arguments.of(
+            "RJUMPI Stack not empty in the end of one branch",
+            null,
+            0,
+            List.of(List.of("60ff 6001 e10002 50 00 19 00", 0, 0, 2))),
+        // this depends on requiring stacks to be "clean" returns
+        Arguments.of(
+            "RJUMPI Stack not empty in the end of one branch II",
+            null,
+            0,
+            List.of(List.of("60ff 6001 e10002 19 00 50 00", 0, 0, 2))));
+  }
+
+  static Stream<Arguments> stackCallF() {
+    return Stream.of(
+        Arguments.of(
+            "0 input 0 output",
+            null,
+            0,
+            List.of(List.of("e30001 00", 0, 0, 0), List.of("e4", 0, 0, 0))),
+        Arguments.of(
+            "0 inputs, 0 output 3 sections",
+            null,
+            0,
+            List.of(List.of("e30002 00", 0, 0, 0), List.of("e4", 1, 1, 1), List.of("e4", 0, 0, 0))),
+        Arguments.of(
+            "more than 0 inputs",
+            null,
+            0,
+            List.of(List.of("30 e30001 00", 0, 0, 1), List.of("00", 1, 0, 1))),
+        Arguments.of(
+            "forwarding an argument",
+            null,
+            1,
+            List.of(List.of("00", 0, 0, 0), List.of("e30002 00", 1, 0, 1), List.of("00", 1, 0, 1))),
+        Arguments.of(
+            "more than 1 inputs",
+            null,
+            0,
+            List.of(List.of("30 80 e30001 00", 0, 0, 2), List.of("00", 2, 0, 2))),
+        Arguments.of(
+            "more than 0 outputs",
+            null,
+            0,
+            List.of(List.of("e30001 50 00", 0, 0, 1), List.of("3000", 0, 1, 1))),
+        Arguments.of(
+            "more than 0 outputs 3 sections",
+            null,
+            0,
+            List.of(
+                List.of("e30002 50 00", 0, 0, 1),
+                List.of("00", 0, 0, 0),
+                List.of("30305000", 0, 1, 2))),
+        Arguments.of(
+            "more than 1 outputs",
+            null,
+            0,
+            List.of(List.of("e30001 50 50 00", 0, 0, 2), List.of("303000", 0, 2, 2))),
+        Arguments.of(
+            "more than 0 inputs, more than 0 outputs",
+            null,
+            0,
+            List.of(
+                List.of("30 30 e30001 50 50 50 00", 0, 0, 3),
+                List.of("30 30 e30001 50 50 00", 2, 3, 5))),
+        Arguments.of("recursion", null, 0, List.of(List.of("e30000 00", 0, 0, 0))),
+        Arguments.of(
+            "recursion 2 inputs",
+            null,
+            1,
+            List.of(List.of("00", 0, 0, 0), List.of("e30000 00", 2, 0, 2))),
+        Arguments.of(
+            "recursion 2 inputs 2 outputs",
+            null,
+            1,
+            List.of(List.of("00", 0, 0, 0), List.of("e30000 50 50 00", 2, 2, 2))),
+        Arguments.of(
+            "recursion 2 inputs 1 output",
+            null,
+            1,
+            List.of(List.of("00", 0, 0, 0), List.of("30 30 e30001 50 50 50 00", 2, 1, 4))),
+        Arguments.of(
+            "multiple CALLFs with different types",
+            null,
+            1,
+            List.of(
+                List.of("00", 0, 0, 0),
+                List.of("44 e30002 80 80 e30003 44 80 e30004 50 50 00", 0, 0, 3),
+                List.of("3030505000", 1, 1, 3),
+                List.of("50505000", 3, 0, 3),
+                List.of("00", 2, 2, 2))),
+        Arguments.of(
+            "underflow",
+            "Operation 0xE3 requires stack of 1 but only has 0 items",
+            0,
+            List.of(List.of("e30001 00", 0, 0, 0), List.of("00", 1, 0, 0))),
+        Arguments.of(
+            "underflow 2",
+            "Operation 0xE3 requires stack of 2 but only has 1 items",
+            0,
+            List.of(List.of("30 e30001 00", 0, 0, 0), List.of("00", 2, 0, 2))),
+        Arguments.of(
+            "underflow 3",
+            "Operation 0xE3 requires stack of 1 but only has 0 items",
+            1,
+            List.of(List.of("00", 0, 0, 0), List.of("50 e30001 00", 1, 0, 1))),
+        Arguments.of(
+            "underflow 4",
+            "Operation 0xE3 requires stack of 3 but only has 2 items",
+            0,
+            List.of(
+                List.of("44 e30001 80 e30002 00", 0, 0, 0),
+                List.of("00", 1, 1, 1),
+                List.of("00", 3, 0, 3))));
+  }
+
+  static Stream<Arguments> stackRetF() {
+    return Stream.of(
+        Arguments.of(
+            "0 outputs at section 0",
+            null,
+            0,
+            List.of(List.of("e4", 0, 0, 0), List.of("00", 0, 0, 0))),
+        Arguments.of(
+            "0 outputs at section 1",
+            null,
+            1,
+            List.of(List.of("00", 0, 0, 0), List.of("e4", 0, 0, 0))),
+        Arguments.of(
+            "0 outputs at section 2",
+            null,
+            2,
+            List.of(List.of("00", 0, 0, 0), List.of("00", 1, 1, 1), List.of("e4", 0, 0, 0))),
+        Arguments.of(
+            "more than 0 outputs section 0",
+            null,
+            0,
+            List.of(List.of("44 50 e4", 0, 0, 1), List.of("4400", 0, 1, 1))),
+        Arguments.of(
+            "more than 0 outputs section 0",
+            null,
+            1,
+            List.of(List.of("00", 0, 0, 0), List.of("44 e4", 0, 1, 1))),
+        Arguments.of(
+            "more than 1 outputs section 1",
+            null,
+            1,
+            List.of(List.of("00", 0, 0, 0), List.of("44 80 e4", 0, 2, 2))),
+        Arguments.of(
+            "Forwarding return values",
+            null,
+            1,
+            List.of(List.of("00", 0, 0, 0), List.of("e4", 1, 1, 1))),
+        Arguments.of(
+            "Forwarding of return values 2",
+            null,
+            1,
+            List.of(
+                List.of("00", 0, 0, 0), List.of("e30002 e4", 0, 1, 1), List.of("3000", 0, 1, 1))),
+        Arguments.of(
+            "Multiple RETFs",
+            null,
+            1,
+            List.of(List.of("00", 0, 0, 0), List.of("e10003 44 80 e4 30 80 e4", 1, 2, 2))),
+        Arguments.of(
+            "underflow 1",
+            "Section return (RETF) calculated height 0x0 does not match configured height 0x1",
+            1,
+            List.of(List.of("00", 0, 0, 0), List.of("e4", 0, 1, 0))),
+        Arguments.of(
+            "underflow 2",
+            "Section return (RETF) calculated height 0x1 does not match configured height 0x2",
+            1,
+            List.of(List.of("00", 0, 0, 0), List.of("44 e4", 0, 2, 1))),
+        Arguments.of(
+            "underflow 3",
+            "Section return (RETF) calculated height 0x1 does not match configured height 0x2",
+            1,
+            List.of(List.of("00", 0, 0, 0), List.of("e10003 44 80 e4 30 e4", 1, 2, 2))));
+  }
+
+  static Stream<Arguments> stackUnreachable() {
+    return Stream.of(
+        Arguments.of(
+            "Max stack not changed by unreachable code",
+            "Dead code detected in section 0",
+            0,
+            List.of(List.of("30 50 00 30 30 30 50 50 50 00", 0, 0, 1))),
+        Arguments.of(
+            "Max stack not changed by unreachable code RETf",
+            "Dead code detected in section 0",
+            0,
+            List.of(List.of("30 50 e4 30 30 30 50 50 50 00", 0, 0, 1))),
+        Arguments.of(
+            "Max stack not changed by unreachable code RJUMP",
+            "Dead code detected in section 0",
+            0,
+            List.of(List.of("30 50 e00006 30 30 30 50 50 50 00", 0, 0, 1))),
+        Arguments.of(
+            "Stack underflow in unreachable code",
+            "Dead code detected in section 0",
+            0,
+            List.of(List.of("30 50 00 50 00", 0, 0, 1))),
+        Arguments.of(
+            "Stack underflow in unreachable code RETF",
+            "Dead code detected in section 0",
+            0,
+            List.of(List.of("30 50 e4 50 00", 0, 0, 1))),
+        Arguments.of(
+            "Stack underflow in unreachable code RJUMP",
+            "Dead code detected in section 0",
+            0,
+            List.of(List.of("30 50 e00001 50 00", 0, 0, 1))));
+  }
+
+  static Stream<Arguments> stackHeight() {
+    return Stream.of(
+        Arguments.of(
+            "Stack height mismatch backwards",
+            "Jump into code stack height (0) does not match previous value (1)",
+            0,
+            List.of(List.of("30 e0fffc00", 0, 0, 1))),
+        Arguments.of(
+            "Stack height mismatch forwards",
+            "Jump into code stack height (3) does not match previous value (0)",
+            0,
+            List.of(List.of("30e10003303030303000", 0, 0, 2))));
+  }
+
+  static Stream<Arguments> invalidInstructions() {
+    return IntStream.range(0, 256)
+        .filter(opcode -> CodeV1Validation.OPCODE_ATTRIBUTES[opcode] == CodeV1Validation.INVALID)
+        .mapToObj(
+            opcode ->
+                Arguments.of(
+                    String.format("Invalid opcode %02x", opcode),
+                    String.format("Invalid Instruction 0x%02x", opcode),
+                    0,
+                    List.of(List.of(String.format("0x%02x", opcode), 0, 0, 0))));
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/code/EOFLayoutTest.java b/evm/src/test/java/org/hyperledger/besu/evm/code/EOFLayoutTest.java
new file mode 100644
index 00000000000..3e8e17f2a65
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/code/EOFLayoutTest.java
@@ -0,0 +1,326 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.evm.code;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class EOFLayoutTest {
+
+  public static Collection<Object[]> containersWithFormatErrors() {
+    return Arrays.asList(
+        new Object[][] {
+          {"EF", "No magic", "EOF Container too small", -1},
+          {"FFFFFF", "Wrong magic", "EOF header byte 0 incorrect", -1},
+          {"EFFF01010002020004006000AABBCCDD", "Invalid magic", "EOF header byte 1 incorrect", -1},
+          {"EF00", "No version", "EOF Container too small", -1},
+          {"EF0000010002020004006000AABBCCDD", "Invalid version", "Unsupported EOF Version 0", 0},
+          {"EF0002010002020004006000AABBCCDD", "Invalid version", "Unsupported EOF Version 2", 2},
+          {
+            "EF00FF010002020004006000AABBCCDD",
+            "Invalid version",
+            "Unsupported EOF Version 255",
+            255
+          },
+          {"EF0001", "No header", "Improper section headers", 1},
+          {"EF0001 00", "No code section", "Expected kind 1 but read kind 0", 1},
+          {"EF0001 01", "No code section size", "Invalid Types section size", 1},
+          {"EF0001 0100", "Code section size incomplete", "Invalid Types section size", 1},
+          {"EF0001 010004", "No section terminator", "Improper section headers", 1},
+          {"EF0001 010004 00", "No code section contents", "Expected kind 2 but read kind 0", 1},
+          {"EF0001 010004 02", "No code section count", "Invalid Code section count", 1},
+          {"EF0001 010004 0200", "Short code section count", "Invalid Code section count", 1},
+          {
+            "EF0001 010004 020001",
+            "No code section size",
+            "Invalid Code section size for section 0",
+            1
+          },
+          {
+            "EF0001 010004 02000100",
+            "Short code section size",
+            "Invalid Code section size for section 0",
+            1
+          },
+          {
+            "EF0001 010008 0200020001",
+            "No code section size multiple codes",
+            "Invalid Code section size for section 1",
+            1
+          },
+          {
+            "EF0001 010008 020002000100",
+            "No code section size multiple codes",
+            "Invalid Code section size for section 1",
+            1
+          },
+          {"EF0001 010004 0200010001 03", "No data section size", "Invalid Data section size", 1},
+          {
+            "EF0001 010004 0200010001 0300",
+            "Short data section size",
+            "Invalid Data section size",
+            1
+          },
+          {"EF0001 010004 0200010001 030000", "No Terminator", "Improper section headers", 1},
+          {"EF0001 010004 0200010002 030000 00", "No type section", "Incomplete type section", 1},
+          {
+            "EF0001 010004 0200010002 030001 030001 00 DA DA",
+            "Duplicate data sections",
+            "Expected kind 0 but read kind 3",
+            1
+          },
+          {
+            "EF0001 010004 0200010002 030000 00 00",
+            "Incomplete type section",
+            "Incomplete type section",
+            1
+          },
+          {
+            "EF0001 010008 02000200020002 030000 00 00000000FE",
+            "Incomplete type section",
+            "Incomplete type section",
+            1
+          },
+          {
+            "EF0001 010008 0200010001 030000 00 00000000 FE ",
+            "Incorrect type section size",
+            "Type section length incompatible with code section count - 0x1 * 4 != 0x8",
+            1
+          },
+          {
+            "EF0001 010008 02000200010001 030000 00 0100000000000000 FE FE",
+            "Incorrect section zero type input",
+            "Code section does not have zero inputs and outputs",
+            1
+          },
+          {
+            "EF0001 010008 02000200010001 030000 00 0001000000000000 FE FE",
+            "Incorrect section zero type output",
+            "Code section does not have zero inputs and outputs",
+            1
+          },
+          {
+            "EF0001 010004 0200010002 030000 00 00000000 ",
+            "Incomplete code section",
+            "Incomplete code section 0",
+            1
+          },
+          {
+            "EF0001 010004 0200010002 030000 00 00000000 FE",
+            "Incomplete code section",
+            "Incomplete code section 0",
+            1
+          },
+          {
+            "EF0001 010008 02000200020002 030000 00 00000000 00000000 FEFE ",
+            "No code section multiple",
+            "Incomplete code section 1",
+            1
+          },
+          {
+            "EF0001 010008 02000200020002 030000 00 00000000 00000000 FEFE FE",
+            "Incomplete code section multiple",
+            "Incomplete code section 1",
+            1
+          },
+          {
+            "EF0001 010004 0200010001 030003 00 00000000 FE DEADBEEF",
+            "Incomplete data section",
+            "Dangling data after end of all sections",
+            1
+          },
+          {
+            "EF0001 010004 0200010001 030003 00 00000000 FE BEEF",
+            "Incomplete data section",
+            "Incomplete data section",
+            1
+          },
+          {
+            "EF0001 0200010001 030001 00 FE DA",
+            "type section missing",
+            "Expected kind 1 but read kind 2",
+            1
+          },
+          {
+            "EF0001 010004 030001 00 00000000 DA",
+            "code section missing",
+            "Expected kind 2 but read kind 3",
+            1
+          },
+          {
+            "EF0001 010004 0200010001 00 00000000 FE",
+            "data section missing",
+            "Expected kind 3 but read kind 0",
+            1
+          },
+          {
+            "EF0001 030001 00 DA",
+            "type and code section missing",
+            "Expected kind 1 but read kind 3",
+            1
+          },
+          {
+            "EF0001 0200010001 00 FE",
+            "type and data section missing",
+            "Expected kind 1 but read kind 2",
+            1
+          },
+          {
+            "EF0001 010004 00 00000000",
+            "code and data sections missing",
+            "Expected kind 2 but read kind 0",
+            1
+          },
+          {"EF0001 00", "all sections missing", "Expected kind 1 but read kind 0", 1},
+          {
+            "EF0001 011004 020401"
+                + " 0001".repeat(1025)
+                + " 030000 00"
+                + " 00000000".repeat(1025)
+                + " FE".repeat(1025),
+            "no data section, 1025 code sections",
+            "Too many code sections - 0x401",
+            1
+          },
+          {"ef000101000002000003000000", "All kinds zero size", "Invalid Types section size", 1},
+          {"ef0001010000020001000103000000ef", "Zero type size ", "Invalid Types section size", 1},
+          {
+            "ef0001010004020001000003000000",
+            "Zero code section length",
+            "Invalid Code section size for section 0",
+            1
+          },
+          {"ef000101000402000003000000", "Zero code sections", "Invalid Code section count", 1},
+        });
+  }
+
+  public static Collection<Object[]> correctContainers() {
+    return Arrays.asList(
+        new Object[][] {
+          {
+            "EF0001 010004 0200010001 030000 00 00000000 FE",
+            "no data section, one code section",
+            null,
+            1
+          },
+          {
+            "EF0001 010004 0200010001 030001 00 00000000 FE DA",
+            "with data section, one code section",
+            null,
+            1
+          },
+          {
+            "EF0001 010008 02000200010001 030000 00 00000000 00000000 FE FE",
+            "no data section, multiple code section",
+            null,
+            1
+          },
+          {
+            "EF0001 010008 02000200010001 030001 00 00000000 00000000 FE FE DA",
+            "with data section, multiple code section",
+            null,
+            1
+          },
+          {
+            "EF0001 010010 0200040001000200020002 030000 00 00000000 01000001 00010001 02030003 FE 5000 3000 8000",
+            "non-void input and output types",
+            null,
+            1
+          },
+          {
+            "EF0001 011000 020400"
+                + " 0001".repeat(1024)
+                + " 030000 00"
+                + " 00000000".repeat(1024)
+                + " FE".repeat(1024),
+            "no data section, 1024 code sections",
+            null,
+            1
+          },
+        });
+  }
+
+  public static Collection<Object[]> typeSectionTests() {
+    return Arrays.asList(
+        new Object[][] {
+          {
+            "EF0001 010008 02000200020002 030000 00 0100000000000000",
+            "Incorrect section zero type input",
+            "Code section does not have zero inputs and outputs",
+            1
+          },
+          {
+            "EF0001 010008 02000200020002 030000 00 0001000000000000",
+            "Incorrect section zero type output",
+            "Code section does not have zero inputs and outputs",
+            1
+          },
+          {
+            "EF0001 010010 0200040001000200020002 030000 00 00000000 80000000 00010000 02030000 FE 5000 3000 8000",
+            "inputs too large",
+            "Type data input stack too large - 0x80",
+            1
+          },
+          {
+            "EF0001 010010 0200040001000200020002 030000 00 00000000 01000000 00800000 02030000 FE 5000 3000 8000",
+            "outputs too large",
+            "Type data output stack too large - 0x80",
+            1
+          },
+          {
+            "EF0001 010010 0200040001000200020002 030000 00 00000400 01000000 00010000 02030400 FE 5000 3000 8000",
+            "stack too large",
+            "Type data max stack too large - 0x400",
+            1
+          },
+          {
+            "EF0001 010010 0200040001000200020002 030000 00 00000000 01000001 00010001 02030003 FE 5000 3000 8000",
+            "non-void input and output types",
+            null,
+            1
+          }
+        });
+  }
+
+  @ParameterizedTest(name = "{1}")
+  @MethodSource({"correctContainers", "containersWithFormatErrors", "typeSectionTests"})
+  void test(
+      final String containerString,
+      final String description,
+      final String failureReason,
+      final int expectedVersion) {
+    final Bytes container = Bytes.fromHexString(containerString.replace(" ", ""));
+    final EOFLayout layout = EOFLayout.parseEOF(container);
+
+    assertThat(layout.getVersion()).isEqualTo(expectedVersion);
+    assertThat(layout.getInvalidReason()).isEqualTo(failureReason);
+    assertThat(layout.getContainer()).isEqualTo(container);
+    if (layout.getInvalidReason() != null) {
+      assertThat(layout.isValid()).isFalse();
+      assertThat(layout.getCodeSectionCount()).isZero();
+    } else {
+      assertThat(layout.isValid()).isTrue();
+      assertThat(layout.getCodeSectionCount()).isNotZero();
+    }
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/internal/CodeCacheTest.java b/evm/src/test/java/org/hyperledger/besu/evm/internal/CodeCacheTest.java
new file mode 100644
index 00000000000..8c40a1a53a4
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/internal/CodeCacheTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright Hyperledger Besu Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.evm.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.code.CodeFactory;
+import org.hyperledger.besu.evm.operation.JumpDestOperation;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Test;
+
+class CodeCacheTest {
+
+  private final String op = Bytes.of(JumpDestOperation.OPCODE).toUnprefixedHexString();
+
+  @Test
+  void testScale() {
+    final Bytes contractBytes =
+        Bytes.fromHexString("0xDEAD" + op + "BEEF" + op + "B0B0" + op + "C0DE" + op + "FACE");
+    final CodeScale scale = new CodeScale();
+    final Code contractCode = CodeFactory.createCode(contractBytes, 0, false);
+    final int weight = scale.weigh(contractCode.getCodeHash(), contractCode);
+    assertThat(weight)
+        .isEqualTo(contractCode.getCodeHash().size() + (contractBytes.size() * 9 + 7) / 8);
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/internal/OperandStackTest.java b/evm/src/test/java/org/hyperledger/besu/evm/internal/OperandStackTest.java
new file mode 100644
index 00000000000..63afa470584
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/internal/OperandStackTest.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.hyperledger.besu.evm.internal.FixedStack.OverflowException;
+import org.hyperledger.besu.evm.internal.FixedStack.UnderflowException;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.jupiter.api.Test;
+
+class OperandStackTest {
+
+  @Test
+  void construction() {
+    final OperandStack stack = new OperandStack(1);
+    assertThat(stack.size()).isZero();
+  }
+
+  @Test
+  void construction_NegativeMaximumSize() {
+    assertThatThrownBy(() -> new OperandStack(-1)).isInstanceOf(IllegalArgumentException.class);
+  }
+
+  @Test
+  void push_StackOverflow() {
+    final OperandStack stack = new OperandStack(1);
+    stack.push(UInt256.fromHexString("0x01"));
+    final UInt256 operand = UInt256.fromHexString("0x02");
+    assertThatThrownBy(() -> stack.push(operand)).isInstanceOf(OverflowException.class);
+  }
+
+  @Test
+  void pop_StackUnderflow() {
+    final OperandStack stack = new OperandStack(1);
+    assertThatThrownBy(stack::pop).isInstanceOf(UnderflowException.class);
+  }
+
+  @Test
+  void pushPop() {
+    final OperandStack stack = new OperandStack(1);
+    stack.push(UInt256.fromHexString("0x01"));
+    assertThat(stack.size()).isEqualTo(1);
+    assertThat(stack.pop()).isEqualTo(Bytes32.fromHexString("0x01"));
+  }
+
+  @Test
+  void get_NegativeOffset() {
+    final OperandStack stack = new OperandStack(1);
+    assertThatThrownBy(() -> stack.get(-1)).isInstanceOf(UnderflowException.class);
+  }
+
+  @Test
+  void get_IndexGreaterThanSize() {
+    final OperandStack stack = new OperandStack(1);
+    stack.push(UInt256.fromHexString("0x01"));
+    assertThatThrownBy(() -> stack.get(2)).isInstanceOf(UnderflowException.class);
+  }
+
+  @Test
+  void get() {
+    final OperandStack stack = new OperandStack(3);
+    stack.push(UInt256.fromHexString("0x01"));
+    stack.push(UInt256.fromHexString("0x02"));
+    stack.push(UInt256.fromHexString("0x03"));
+    assertThat(stack.size()).isEqualTo(3);
+    assertThat(stack.get(0)).isEqualTo(Bytes32.fromHexString("0x03"));
+    assertThat(stack.get(1)).isEqualTo(Bytes32.fromHexString("0x02"));
+    assertThat(stack.get(2)).isEqualTo(Bytes32.fromHexString("0x01"));
+  }
+
+  @Test
+  void set_NegativeOffset() {
+    final OperandStack stack = new OperandStack(1);
+    final Bytes32 operand = Bytes32.fromHexString("0x01");
+    assertThatThrownBy(() -> stack.set(-1, operand)).isInstanceOf(UnderflowException.class);
+  }
+
+  @Test
+  void set_IndexGreaterThanSize() {
+    final OperandStack stack = new OperandStack(1);
+    stack.push(UInt256.fromHexString("0x01"));
+    final Bytes32 operand = Bytes32.fromHexString("0x01");
+    assertThatThrownBy(() -> stack.set(2, operand)).isInstanceOf(OverflowException.class);
+  }
+
+  @Test
+  void set() {
+    final OperandStack stack = new OperandStack(3);
+    stack.push(UInt256.fromHexString("0x01"));
+    stack.push(UInt256.fromHexString("0x02"));
+    stack.push(UInt256.fromHexString("0x03"));
+    stack.set(2, UInt256.fromHexString("0x04"));
+    assertThat(stack.size()).isEqualTo(3);
+    assertThat(stack.get(0)).isEqualTo(Bytes32.fromHexString("0x03"));
+    assertThat(stack.get(1)).isEqualTo(Bytes32.fromHexString("0x02"));
+    assertThat(stack.get(2)).isEqualTo(Bytes32.fromHexString("0x04"));
+  }
+
+  @Test
+  void bulkPop() {
+    final OperandStack stack = new OperandStack(8);
+    stack.push(UInt256.fromHexString("0x01"));
+    stack.push(UInt256.fromHexString("0x02"));
+    stack.push(UInt256.fromHexString("0x03"));
+    stack.push(UInt256.fromHexString("0x04"));
+    stack.push(UInt256.fromHexString("0x05"));
+    stack.push(UInt256.fromHexString("0x06"));
+    stack.push(UInt256.fromHexString("0x07"));
+    stack.push(UInt256.fromHexString("0x08"));
+    assertThat(stack.size()).isEqualTo(8);
+    stack.bulkPop(2);
+    assertThat(stack.get(0)).isEqualTo(Bytes32.fromHexString("0x06"));
+    stack.bulkPop(6);
+    assertThat(stack.isEmpty()).isTrue();
+  }
+
+  @Test
+  void preserveTop() {
+    final OperandStack stack = new OperandStack(8);
+    stack.push(UInt256.fromHexString("0x01"));
+    stack.push(UInt256.fromHexString("0x02"));
+    stack.push(UInt256.fromHexString("0x03"));
+    stack.push(UInt256.fromHexString("0x04"));
+    stack.push(UInt256.fromHexString("0x05"));
+    stack.push(UInt256.fromHexString("0x06"));
+    stack.push(UInt256.fromHexString("0x07"));
+    stack.push(UInt256.fromHexString("0x08"));
+    assertThat(stack.size()).isEqualTo(8);
+    stack.preserveTop(6, 1);
+    assertThat(stack.get(0)).isEqualTo(Bytes32.fromHexString("0x08"));
+    assertThat(stack.get(1)).isEqualTo(Bytes32.fromHexString("0x06"));
+    assertThat(stack.size()).isEqualTo(7);
+    stack.preserveTop(1, 3);
+    assertThat(stack.get(0)).isEqualTo(Bytes32.fromHexString("0x08"));
+    assertThat(stack.get(1)).isEqualTo(Bytes32.fromHexString("0x06"));
+    assertThat(stack.get(2)).isEqualTo(Bytes32.fromHexString("0x05"));
+    assertThat(stack.get(3)).isEqualTo(Bytes32.fromHexString("0x01"));
+    assertThat(stack.size()).isEqualTo(4);
+
+    stack.preserveTop(4, 0);
+    assertThat(stack.size()).isEqualTo(4);
+    assertThatThrownBy(() -> stack.preserveTop(4, 2)).isInstanceOf(UnderflowException.class);
+    stack.preserveTop(2, 2);
+    assertThat(stack.size()).isEqualTo(4);
+    stack.preserveTop(0, 2);
+    assertThat(stack.get(0)).isEqualTo(Bytes32.fromHexString("0x08"));
+    assertThat(stack.get(1)).isEqualTo(Bytes32.fromHexString("0x06"));
+
+    assertThatThrownBy(() -> stack.preserveTop(5, 1)).isInstanceOf(UnderflowException.class);
+    assertThatThrownBy(() -> stack.preserveTop(1, 5)).isInstanceOf(UnderflowException.class);
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/internal/WordsTest.java b/evm/src/test/java/org/hyperledger/besu/evm/internal/WordsTest.java
new file mode 100644
index 00000000000..40eb0a0b898
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/internal/WordsTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.evm.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.evm.internal.Words.unsignedMin;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.TestInstance.Lifecycle;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+@TestInstance(Lifecycle.PER_CLASS)
+class WordsTest {
+
+  Collection<Object[]> unsignedMinLongTestVector() {
+    return Arrays.asList(
+        new Object[][] {
+          {10, 10, 10},
+          {-10, -10, -10},
+          {10, 20, 10},
+          {20, 10, 10},
+          {10, -10, 10},
+          {-10, 10, 10},
+          {-20, -10, -20},
+          {-10, -20, -20},
+        });
+  }
+
+  @ParameterizedTest
+  @MethodSource("unsignedMinLongTestVector")
+  void unsugnedMinLongTest(final long a, final long b, final long min) {
+    assertThat(unsignedMin(a, b)).isEqualTo(min);
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogsBloomFilterTest.java b/evm/src/test/java/org/hyperledger/besu/evm/log/LogsBloomFilterTest.java
similarity index 87%
rename from ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogsBloomFilterTest.java
rename to evm/src/test/java/org/hyperledger/besu/evm/log/LogsBloomFilterTest.java
index bcb20ff179b..75abca39d36 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/core/LogsBloomFilterTest.java
+++ b/evm/src/test/java/org/hyperledger/besu/evm/log/LogsBloomFilterTest.java
@@ -12,20 +12,21 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.core;
+package org.hyperledger.besu.evm.log;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.hyperledger.besu.datatypes.Address;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
 
-public class LogsBloomFilterTest {
+class LogsBloomFilterTest {
 
   @Test
-  public void logsBloomFilter() {
+  void logsBloomFilter() {
     final Address address = Address.fromHexString("0x095e7baea6a6c7c4c2dfeb977efac326af552d87");
     final Bytes data = Bytes.fromHexString("0x0102");
     final List<LogTopic> topics = new ArrayList<>();
@@ -36,7 +37,7 @@ public void logsBloomFilter() {
     final Log log = new Log(address, data, topics);
     final LogsBloomFilter bloom = LogsBloomFilter.builder().insertLog(log).build();
 
-    assertThat(bloom)
+    Assertions.assertThat(bloom)
         .isEqualTo(
             Bytes.fromHexString(
                 "0x00000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000040000000000000000000000000000000000000000000000000000000"));
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/BaseFeeOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/BaseFeeOperationTest.java
new file mode 100644
index 00000000000..ac816137af3
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/operations/BaseFeeOperationTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operations;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.frame.BlockValues;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.BerlinGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.Words;
+import org.hyperledger.besu.evm.operation.BaseFeeOperation;
+import org.hyperledger.besu.evm.operation.Operation;
+import org.hyperledger.besu.evm.operation.Operation.OperationResult;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.jupiter.api.Test;
+
+class BaseFeeOperationTest {
+  private final GasCalculator gasCalculator = new BerlinGasCalculator();
+
+  @Test
+  void shouldReturnGasCost() {
+    final MessageFrame frame = createMessageFrame(100, Optional.of(Wei.of(5L)));
+    final Operation operation = new BaseFeeOperation(gasCalculator);
+    final OperationResult result = operation.execute(frame, null);
+    assertThat(result.getGasCost()).isEqualTo(gasCalculator.getBaseTierGasCost());
+    assertSuccessResult(result);
+  }
+
+  @Test
+  void shouldWriteBaseFeeToStack() {
+    final MessageFrame frame = createMessageFrame(100, Optional.of(Wei.of(5L)));
+    final Operation operation = new BaseFeeOperation(gasCalculator);
+    final OperationResult result = operation.execute(frame, null);
+    verify(frame).pushStackItem(UInt256.fromBytes(Bytes32.leftPad(Words.longBytes(5L))));
+    assertSuccessResult(result);
+  }
+
+  @Test
+  void shouldHaltIfNoBaseFeeInBlockHeader() {
+    final MessageFrame frame = createMessageFrame(100, Optional.empty());
+    final Operation operation = new BaseFeeOperation(gasCalculator);
+    final OperationResult result = operation.execute(frame, null);
+    assertExceptionalHalt(result, ExceptionalHaltReason.INVALID_OPERATION);
+  }
+
+  private void assertSuccessResult(final OperationResult result) {
+    assertThat(result).isNotNull();
+    assertThat(result.getHaltReason()).isNull();
+  }
+
+  private void assertExceptionalHalt(
+      final OperationResult result, final ExceptionalHaltReason reason) {
+    assertThat(result).isNotNull();
+    assertThat(result.getHaltReason()).isEqualTo(reason);
+  }
+
+  private MessageFrame createMessageFrame(final long initialGas, final Optional<Wei> baseFee) {
+    final MessageFrame frame = mock(MessageFrame.class);
+    when(frame.getRemainingGas()).thenReturn(initialGas);
+    final BlockValues blockHeader = mock(BlockValues.class);
+    when(blockHeader.getBaseFee()).thenReturn(baseFee);
+    when(frame.getBlockValues()).thenReturn(blockHeader);
+    return frame;
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/BlockHashOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/BlockHashOperationTest.java
new file mode 100644
index 00000000000..9614f63316e
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/operations/BlockHashOperationTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operations;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.FrontierGasCalculator;
+import org.hyperledger.besu.evm.operation.BlockHashOperation;
+import org.hyperledger.besu.evm.testutils.FakeBlockValues;
+import org.hyperledger.besu.evm.testutils.TestMessageFrameBuilder;
+
+import java.util.function.Function;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.jupiter.api.Test;
+
+class BlockHashOperationTest {
+
+  private static final int MAXIMUM_COMPLETE_BLOCKS_BEHIND = 256;
+  private final BlockHashOperation blockHashOperation =
+      new BlockHashOperation(new FrontierGasCalculator());
+
+  @Test
+  void shouldReturnZeroWhenArgIsBiggerThanALong() {
+    assertBlockHash(
+        Bytes32.fromHexString("F".repeat(64)), Bytes32.ZERO, 100, n -> Hash.EMPTY_LIST_HASH);
+  }
+
+  @Test
+  void shouldReturnZeroWhenCurrentBlockIsGenesis() {
+    assertBlockHash(Bytes32.ZERO, Bytes32.ZERO, 0, block -> Hash.EMPTY_LIST_HASH);
+  }
+
+  @Test
+  void shouldReturnZeroWhenRequestedBlockAheadOfCurrent() {
+    assertBlockHash(250, Bytes32.ZERO, 100, block -> Hash.EMPTY_LIST_HASH);
+  }
+
+  @Test
+  void shouldReturnZeroWhenRequestedBlockTooFarBehindCurrent() {
+    final int requestedBlock = 10;
+    // Our block is the one after the chain head (it's a new block), hence the + 1.
+    final int importingBlockNumber = MAXIMUM_COMPLETE_BLOCKS_BEHIND + requestedBlock + 1;
+    assertBlockHash(
+        requestedBlock, Bytes32.ZERO, importingBlockNumber, block -> Hash.EMPTY_LIST_HASH);
+  }
+
+  @Test
+  void shouldReturnZeroWhenRequestedBlockGreaterThanImportingBlock() {
+    assertBlockHash(101, Bytes32.ZERO, 100, block -> Hash.EMPTY_LIST_HASH);
+  }
+
+  @Test
+  void shouldReturnZeroWhenRequestedBlockEqualToImportingBlock() {
+    assertBlockHash(100, Bytes32.ZERO, 100, block -> Hash.EMPTY_LIST_HASH);
+  }
+
+  @Test
+  void shouldReturnBlockHashUsingLookupFromFrameWhenItIsWithinTheAllowedRange() {
+    final Hash blockHash = Hash.hash(Bytes.fromHexString("0x1293487297"));
+    assertBlockHash(100, blockHash, 200, block -> block == 100 ? blockHash : Hash.EMPTY_LIST_HASH);
+  }
+
+  private void assertBlockHash(
+      final long requestedBlock,
+      final Bytes32 expectedOutput,
+      final long currentBlockNumber,
+      final Function<Long, Hash> blockHashLookup) {
+    assertBlockHash(
+        UInt256.valueOf(requestedBlock), expectedOutput, currentBlockNumber, blockHashLookup);
+  }
+
+  private void assertBlockHash(
+      final Bytes32 input,
+      final Bytes32 expectedOutput,
+      final long currentBlockNumber,
+      final Function<Long, Hash> blockHashLookup) {
+    final MessageFrame frame =
+        new TestMessageFrameBuilder()
+            .blockHashLookup(blockHashLookup)
+            .blockValues(new FakeBlockValues(currentBlockNumber))
+            .pushStackItem(UInt256.fromBytes(input))
+            .build();
+    blockHashOperation.execute(frame, null);
+    final Bytes result = frame.popStackItem();
+    assertThat(result).isEqualTo(expectedOutput);
+    assertThat(frame.stackSize()).isZero();
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/CallFOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/CallFOperationTest.java
new file mode 100644
index 00000000000..c5ea477db80
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/operations/CallFOperationTest.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operations;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.code.CodeSection;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.ReturnStack;
+import org.hyperledger.besu.evm.operation.CallFOperation;
+import org.hyperledger.besu.evm.operation.Operation;
+import org.hyperledger.besu.evm.testutils.TestMessageFrameBuilder;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Test;
+
+class CallFOperationTest {
+
+  @Test
+  void callFHappyPath() {
+    final GasCalculator gasCalculator = mock(GasCalculator.class);
+    final Code mockCode = mock(Code.class);
+    final Bytes code = Bytes.fromHexString("00" + "b0" + "0001" + "00");
+    when(mockCode.getBytes()).thenReturn(code);
+
+    final CodeSection codeSection = new CodeSection(0, 1, 2, 3, 0);
+    when(mockCode.getCodeSection(1)).thenReturn(codeSection);
+
+    MessageFrame messageFrame =
+        new TestMessageFrameBuilder()
+            .code(mockCode)
+            .pc(1)
+            .initialGas(10L)
+            .pushStackItem(Bytes.EMPTY)
+            .pushStackItem(Bytes.EMPTY)
+            .build();
+
+    CallFOperation callF = new CallFOperation(gasCalculator);
+    Operation.OperationResult callfResult = callF.execute(messageFrame, null);
+
+    assertThat(callfResult.getHaltReason()).isNull();
+    assertThat(callfResult.getPcIncrement()).isEqualTo(1);
+    assertThat(messageFrame.getSection()).isEqualTo(1);
+    assertThat(messageFrame.getPC()).isEqualTo(-1);
+    assertThat(messageFrame.returnStackSize()).isEqualTo(2);
+    assertThat(messageFrame.peekReturnStack()).isEqualTo(new ReturnStack.ReturnStackItem(0, 3, 1));
+  }
+
+  @Test
+  void callFMissingCodeSection() {
+    final GasCalculator gasCalculator = mock(GasCalculator.class);
+    final Code mockCode = mock(Code.class);
+    final Bytes code = Bytes.fromHexString("00" + "b0" + "03ff" + "00");
+    when(mockCode.getBytes()).thenReturn(code);
+
+    final CodeSection codeSection = new CodeSection(0, 1, 2, 3, 0);
+    when(mockCode.getCodeSection(1)).thenReturn(codeSection);
+
+    MessageFrame messageFrame =
+        new TestMessageFrameBuilder()
+            .code(mockCode)
+            .pc(1)
+            .initialGas(10L)
+            .pushStackItem(Bytes.EMPTY)
+            .pushStackItem(Bytes.EMPTY)
+            .build();
+
+    CallFOperation callF = new CallFOperation(gasCalculator);
+    Operation.OperationResult callfResult = callF.execute(messageFrame, null);
+
+    assertThat(callfResult.getHaltReason()).isEqualTo(ExceptionalHaltReason.CODE_SECTION_MISSING);
+    assertThat(callfResult.getPcIncrement()).isEqualTo(1);
+    assertThat(messageFrame.getSection()).isZero();
+    assertThat(messageFrame.getPC()).isEqualTo(1);
+    assertThat(messageFrame.returnStackSize()).isEqualTo(1);
+    assertThat(messageFrame.peekReturnStack()).isEqualTo(new ReturnStack.ReturnStackItem(0, 0, 0));
+  }
+
+  @Test
+  void callFTooMuchStack() {
+    final GasCalculator gasCalculator = mock(GasCalculator.class);
+    final Code mockCode = mock(Code.class);
+    final Bytes code = Bytes.fromHexString("00" + "b0" + "0001" + "00");
+    when(mockCode.getBytes()).thenReturn(code);
+
+    final CodeSection codeSection = new CodeSection(0, 1, 2, 1023, 0);
+    when(mockCode.getCodeSection(1)).thenReturn(codeSection);
+
+    MessageFrame messageFrame =
+        new TestMessageFrameBuilder()
+            .code(mockCode)
+            .pc(1)
+            .initialGas(10L)
+            .pushStackItem(Bytes.EMPTY)
+            .pushStackItem(Bytes.EMPTY)
+            .build();
+
+    CallFOperation callF = new CallFOperation(gasCalculator);
+    Operation.OperationResult callfResult = callF.execute(messageFrame, null);
+
+    assertThat(callfResult.getHaltReason()).isEqualTo(ExceptionalHaltReason.TOO_MANY_STACK_ITEMS);
+    assertThat(callfResult.getPcIncrement()).isEqualTo(1);
+    assertThat(messageFrame.getSection()).isZero();
+    assertThat(messageFrame.getPC()).isEqualTo(1);
+    assertThat(messageFrame.returnStackSize()).isEqualTo(1);
+    assertThat(messageFrame.peekReturnStack()).isEqualTo(new ReturnStack.ReturnStackItem(0, 0, 0));
+  }
+
+  @Test
+  void callFTooFewStack() {
+    final GasCalculator gasCalculator = mock(GasCalculator.class);
+    final Code mockCode = mock(Code.class);
+    final Bytes code = Bytes.fromHexString("00" + "b0" + "0001" + "00");
+    when(mockCode.getBytes()).thenReturn(code);
+
+    final CodeSection codeSection = new CodeSection(0, 5, 2, 5, 0);
+    when(mockCode.getCodeSection(1)).thenReturn(codeSection);
+
+    MessageFrame messageFrame =
+        new TestMessageFrameBuilder()
+            .code(mockCode)
+            .pc(1)
+            .initialGas(10L)
+            .pushStackItem(Bytes.EMPTY)
+            .pushStackItem(Bytes.EMPTY)
+            .build();
+
+    CallFOperation callF = new CallFOperation(gasCalculator);
+    Operation.OperationResult callfResult = callF.execute(messageFrame, null);
+
+    assertThat(callfResult.getHaltReason())
+        .isEqualTo(ExceptionalHaltReason.TOO_FEW_INPUTS_FOR_CODE_SECTION);
+    assertThat(callfResult.getPcIncrement()).isEqualTo(1);
+    assertThat(messageFrame.getSection()).isZero();
+    assertThat(messageFrame.getPC()).isEqualTo(1);
+    assertThat(messageFrame.returnStackSize()).isEqualTo(1);
+    assertThat(messageFrame.peekReturnStack()).isEqualTo(new ReturnStack.ReturnStackItem(0, 0, 0));
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/ChainIdOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/ChainIdOperationTest.java
new file mode 100644
index 00000000000..7202be03ce3
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/operations/ChainIdOperationTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operations;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.ConstantinopleGasCalculator;
+import org.hyperledger.besu.evm.operation.ChainIdOperation;
+import org.hyperledger.besu.evm.operation.Operation.OperationResult;
+
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
+
+class ChainIdOperationTest {
+
+  private final MessageFrame messageFrame = mock(MessageFrame.class);
+
+  static Iterable<Arguments> params() {
+    return List.of(
+        Arguments.of("0x01", 2),
+        Arguments.of("0x03", 2),
+        Arguments.of("0x04", 2),
+        Arguments.of("0x05", 2));
+  }
+
+  @ParameterizedTest
+  @MethodSource("params")
+  void shouldReturnChainId(final String chainIdString, final int expectedGas) {
+    Bytes32 chainId = Bytes32.fromHexString(chainIdString);
+    ChainIdOperation operation = new ChainIdOperation(new ConstantinopleGasCalculator(), chainId);
+    final ArgumentCaptor<Bytes> arg = ArgumentCaptor.forClass(UInt256.class);
+    when(messageFrame.getRemainingGas()).thenReturn(100L);
+    operation.execute(messageFrame, null);
+    Mockito.verify(messageFrame).getRemainingGas();
+    Mockito.verify(messageFrame).pushStackItem(arg.capture());
+    Mockito.verifyNoMoreInteractions(messageFrame);
+    assertThat(arg.getValue()).isEqualTo(chainId);
+  }
+
+  @ParameterizedTest
+  @MethodSource("params")
+  void shouldCalculateGasPrice(final String chainIdString, final int expectedGas) {
+    Bytes32 chainId = Bytes32.fromHexString(chainIdString);
+    ChainIdOperation operation = new ChainIdOperation(new ConstantinopleGasCalculator(), chainId);
+    final OperationResult result = operation.execute(messageFrame, null);
+    assertThat(result.getGasCost()).isEqualTo(expectedGas);
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/ConstantinopleSStoreOperationGasCostTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/ConstantinopleSStoreOperationGasCostTest.java
new file mode 100644
index 00000000000..00edb9c5d17
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/operations/ConstantinopleSStoreOperationGasCostTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operations;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.evm.MainnetEVMs;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.frame.MessageFrame.State;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.evm.testutils.TestCodeExecutor;
+
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class ConstantinopleSStoreOperationGasCostTest {
+
+  public static Object[][] scenarios() {
+    // Tests specified in EIP-1283.
+    return new Object[][] {
+      {"0x60006000556000600055", 0, 412, 0},
+      {"0x60006000556001600055", 0, 20212, 0},
+      {"0x60016000556000600055", 0, 20212, 19800},
+      {"0x60016000556002600055", 0, 20212, 0},
+      {"0x60016000556001600055", 0, 20212, 0},
+      {"0x60006000556000600055", 1, 5212, 15000},
+      {"0x60006000556001600055", 1, 5212, 4800},
+      {"0x60006000556002600055", 1, 5212, 0},
+      {"0x60026000556003600055", 1, 5212, 0},
+      {"0x60026000556001600055", 1, 5212, 4800},
+      {"0x60026000556002600055", 1, 5212, 0},
+      {"0x60016000556000600055", 1, 5212, 15000},
+      {"0x60016000556002600055", 1, 5212, 0},
+      {"0x60016000556001600055", 1, 412, 0},
+      {"0x600160005560006000556001600055", 0, 40218, 19800},
+      {"0x600060005560016000556000600055", 1, 10218, 19800},
+      {"0x60026000556000600055", 1, 5212, 15000},
+    };
+  }
+
+  @ParameterizedTest
+  @MethodSource("scenarios")
+  void shouldCalculateGasAccordingToEip1283(
+      final String code,
+      final int originalValue,
+      final int expectedGasUsed,
+      final int expectedGasRefund) {
+
+    TestCodeExecutor codeExecutor =
+        new TestCodeExecutor(MainnetEVMs.constantinople(EvmConfiguration.DEFAULT));
+
+    final long gasLimit = 1_000_000;
+    final MessageFrame frame =
+        codeExecutor.executeCode(
+            code,
+            gasLimit,
+            account -> account.setStorageValue(UInt256.ZERO, UInt256.valueOf(originalValue)));
+    assertThat(frame.getState()).isEqualTo(State.COMPLETED_SUCCESS);
+    System.out.println(gasLimit - frame.getRemainingGas());
+    assertThat(frame.getRemainingGas()).isEqualTo(gasLimit - expectedGasUsed);
+    assertThat(frame.getGasRefund()).isEqualTo(expectedGasRefund);
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/Create2OperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/Create2OperationTest.java
new file mode 100644
index 00000000000..5fdc25d9380
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/operations/Create2OperationTest.java
@@ -0,0 +1,360 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operations;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.evm.MainnetEVMs.DEV_NET_CHAIN_ID;
+import static org.hyperledger.besu.evm.frame.ExceptionalHaltReason.CODE_TOO_LARGE;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.MainnetEVMs;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.code.CodeFactory;
+import org.hyperledger.besu.evm.frame.BlockValues;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.ConstantinopleGasCalculator;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.evm.internal.Words;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.operation.Create2Operation;
+import org.hyperledger.besu.evm.operation.Operation.OperationResult;
+import org.hyperledger.besu.evm.processor.ContractCreationProcessor;
+import org.hyperledger.besu.evm.testutils.TestMessageFrameBuilder;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+import org.hyperledger.besu.evm.worldstate.WrappedEvmAccount;
+
+import java.util.ArrayDeque;
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class Create2OperationTest {
+
+  private MessageFrame messageFrame;
+  private final WorldUpdater worldUpdater = mock(WorldUpdater.class);
+  private final WrappedEvmAccount account = mock(WrappedEvmAccount.class);
+  private final MutableAccount mutableAccount = mock(MutableAccount.class);
+  private final EVM evm = mock(EVM.class);
+  private final WrappedEvmAccount newAccount = mock(WrappedEvmAccount.class);
+  private final MutableAccount newMutableAccount = mock(MutableAccount.class);
+
+  private final Create2Operation operation =
+      new Create2Operation(new ConstantinopleGasCalculator(), Integer.MAX_VALUE);
+
+  private final Create2Operation maxInitCodeOperation =
+      new Create2Operation(
+          new ConstantinopleGasCalculator(), MainnetEVMs.SHANGHAI_INIT_CODE_SIZE_LIMIT);
+
+  private static final String TOPIC =
+      "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"; // 32 FFs
+  private static final Bytes SIMPLE_CREATE =
+      Bytes.fromHexString(
+          "0x"
+              + "7f" // push32
+              + TOPIC
+              + "6000" // PUSH1 0x00
+              + "6000" // PUSH1 0x00
+              + "A1" // LOG1
+              + "6000" // PUSH1 0x00
+              + "6000" // PUSH1 0x00
+              + "F3" // RETURN
+          );
+  public static final Bytes SIMPLE_EOF =
+      Bytes.fromHexString("0xEF00010100040200010001030000000000000000");
+  public static final String SENDER = "0xdeadc0de00000000000000000000000000000000";
+  private static final int SHANGHAI_CREATE_GAS = 41240 + (0xc000 / 32) * 6;
+
+  public static Object[][] params() {
+    return new Object[][] {
+      {
+        "0x0000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x00",
+        "0x4D1A2e2bB4F88F0250f26Ffff098B0b30B26BF38",
+        32006
+      },
+      {
+        "0xdeadbeef00000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x00",
+        "0xB928f69Bb1D91Cd65274e3c79d8986362984fDA3",
+        32006
+      },
+      {
+        "0xdeadbeef00000000000000000000000000000000",
+        "0x000000000000000000000000feed000000000000000000000000000000000000",
+        "0x00",
+        "0xD04116cDd17beBE565EB2422F2497E06cC1C9833",
+        32006
+      },
+      {
+        "0x0000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0xdeadbeef",
+        "0x70f2b2914A2a4b783FaEFb75f459A580616Fcb5e",
+        32006
+      },
+      {
+        "0x00000000000000000000000000000000deadbeef",
+        "0x00000000000000000000000000000000000000000000000000000000cafebabe",
+        "0xdeadbeef",
+        "0x60f3f640a8508fC6a86d45DF051962668E1e8AC7",
+        32006
+      },
+      {
+        "0x00000000000000000000000000000000deadbeef",
+        "0x00000000000000000000000000000000000000000000000000000000cafebabe",
+        "0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef",
+        "0x1d8bfDC5D46DC4f61D6b6115972536eBE6A8854C",
+        32012
+      },
+      {
+        "0x0000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x",
+        "0xE33C0C7F7df4809055C3ebA6c09CFe4BaF1BD9e0",
+        32000
+      }
+    };
+  }
+
+  public void setUp(final String sender, final String salt, final String code) {
+
+    final UInt256 memoryOffset = UInt256.fromHexString("0xFF");
+    final Bytes codeBytes = Bytes.fromHexString(code);
+    final UInt256 memoryLength = UInt256.valueOf(codeBytes.size());
+    when(account.getMutable()).thenReturn(mutableAccount);
+    messageFrame =
+        MessageFrame.builder()
+            .type(MessageFrame.Type.CONTRACT_CREATION)
+            .contract(Address.ZERO)
+            .inputData(Bytes.EMPTY)
+            .sender(Address.fromHexString(sender))
+            .value(Wei.ZERO)
+            .apparentValue(Wei.ZERO)
+            .code(CodeFactory.createCode(codeBytes, 0, true))
+            .depth(1)
+            .completer(__ -> {})
+            .address(Address.fromHexString(sender))
+            .blockHashLookup(n -> Hash.hash(Words.longBytes(n)))
+            .blockValues(mock(BlockValues.class))
+            .gasPrice(Wei.ZERO)
+            .messageFrameStack(new ArrayDeque<>())
+            .miningBeneficiary(Address.ZERO)
+            .originator(Address.ZERO)
+            .initialGas(100_000L)
+            .worldUpdater(worldUpdater)
+            .build();
+    messageFrame.pushStackItem(UInt256.fromHexString(salt));
+    messageFrame.pushStackItem(memoryLength);
+    messageFrame.pushStackItem(memoryOffset);
+    messageFrame.pushStackItem(UInt256.ZERO);
+    messageFrame.expandMemory(0, 500);
+    messageFrame.writeMemory(memoryOffset.trimLeadingZeros().toInt(), code.length(), codeBytes);
+
+    when(mutableAccount.getBalance()).thenReturn(Wei.ZERO);
+    when(worldUpdater.getAccount(any())).thenReturn(account);
+    when(worldUpdater.updater()).thenReturn(worldUpdater);
+    when(evm.getCode(any(), any()))
+        .thenAnswer(invocation -> CodeFactory.createCode(invocation.getArgument(1), 0, true));
+  }
+
+  @ParameterizedTest
+  @MethodSource("params")
+  void shouldCalculateAddress(
+      final String sender,
+      final String salt,
+      final String code,
+      final String expectedAddress,
+      final int ignoredExpectedGas) {
+    setUp(sender, salt, code);
+    final Address targetContractAddress = operation.targetContractAddress(messageFrame);
+    assertThat(targetContractAddress).isEqualTo(Address.fromHexString(expectedAddress));
+  }
+
+  @ParameterizedTest
+  @MethodSource("params")
+  void shouldCalculateGasPrice(
+      final String sender,
+      final String salt,
+      final String code,
+      final String ignoredExpectedAddress,
+      final int expectedGas) {
+    setUp(sender, salt, code);
+    final OperationResult result = operation.execute(messageFrame, evm);
+    assertThat(result.getHaltReason()).isNull();
+    assertThat(result.getGasCost()).isEqualTo(expectedGas);
+  }
+
+  @Test
+  void shanghaiMaxInitCodeSizeCreate() {
+    final UInt256 memoryOffset = UInt256.fromHexString("0xFF");
+    final UInt256 memoryLength = UInt256.fromHexString("0xc000");
+    final ArrayDeque<MessageFrame> messageFrameStack = new ArrayDeque<>();
+    final MessageFrame messageFrame =
+        testMemoryFrame(memoryOffset, memoryLength, UInt256.ZERO, 1, messageFrameStack);
+
+    when(account.getMutable()).thenReturn(mutableAccount);
+    when(account.getNonce()).thenReturn(55L);
+    when(mutableAccount.getBalance()).thenReturn(Wei.ZERO);
+    when(worldUpdater.getAccount(any())).thenReturn(account);
+    when(worldUpdater.get(any())).thenReturn(account);
+    when(worldUpdater.getSenderAccount(any())).thenReturn(account);
+    when(worldUpdater.getOrCreate(any())).thenReturn(newAccount);
+    when(newAccount.getMutable()).thenReturn(newMutableAccount);
+    when(newMutableAccount.getCode()).thenReturn(Bytes.EMPTY);
+    when(worldUpdater.updater()).thenReturn(worldUpdater);
+
+    final EVM evm = MainnetEVMs.shanghai(DEV_NET_CHAIN_ID, EvmConfiguration.DEFAULT);
+    var result = maxInitCodeOperation.execute(messageFrame, evm);
+    final MessageFrame createFrame = messageFrameStack.peek();
+    final ContractCreationProcessor ccp =
+        new ContractCreationProcessor(evm.getGasCalculator(), evm, false, List.of(), 0, List.of());
+    ccp.process(createFrame, OperationTracer.NO_TRACING);
+
+    final Log log = createFrame.getLogs().get(0);
+    final String calculatedTopic = log.getTopics().get(0).toUnprefixedHexString();
+    assertThat(calculatedTopic).isEqualTo(TOPIC);
+    assertThat(result.getGasCost()).isEqualTo(SHANGHAI_CREATE_GAS);
+  }
+
+  @Test
+  void shanghaiMaxInitCodeSizePlus1Create() {
+    final UInt256 memoryOffset = UInt256.fromHexString("0xFF");
+    final UInt256 memoryLength = UInt256.fromHexString("0xc001");
+    final ArrayDeque<MessageFrame> messageFrameStack = new ArrayDeque<>();
+    final MessageFrame messageFrame =
+        testMemoryFrame(memoryOffset, memoryLength, UInt256.ZERO, 1, messageFrameStack);
+
+    when(account.getMutable()).thenReturn(mutableAccount);
+    when(account.getNonce()).thenReturn(55L);
+    when(mutableAccount.getBalance()).thenReturn(Wei.ZERO);
+    when(worldUpdater.getAccount(any())).thenReturn(account);
+    when(worldUpdater.get(any())).thenReturn(account);
+    when(worldUpdater.getSenderAccount(any())).thenReturn(account);
+    when(worldUpdater.getOrCreate(any())).thenReturn(newAccount);
+    when(newAccount.getMutable()).thenReturn(newMutableAccount);
+    when(newMutableAccount.getCode()).thenReturn(Bytes.EMPTY);
+    when(worldUpdater.updater()).thenReturn(worldUpdater);
+
+    final EVM evm = MainnetEVMs.shanghai(DEV_NET_CHAIN_ID, EvmConfiguration.DEFAULT);
+    var result = maxInitCodeOperation.execute(messageFrame, evm);
+    assertThat(result.getHaltReason()).isEqualTo(CODE_TOO_LARGE);
+  }
+
+  @NotNull
+  private MessageFrame testMemoryFrame(
+      final UInt256 memoryOffset,
+      final UInt256 memoryLength,
+      final UInt256 value,
+      final int depth,
+      final ArrayDeque<MessageFrame> messageFrameStack) {
+    final MessageFrame messageFrame =
+        MessageFrame.builder()
+            .type(MessageFrame.Type.CONTRACT_CREATION)
+            .contract(Address.ZERO)
+            .inputData(Bytes.EMPTY)
+            .sender(Address.fromHexString(SENDER))
+            .value(Wei.ZERO)
+            .apparentValue(Wei.ZERO)
+            .code(CodeFactory.createCode(SIMPLE_CREATE, 0, true))
+            .depth(depth)
+            .completer(__ -> {})
+            .address(Address.fromHexString(SENDER))
+            .blockHashLookup(n -> Hash.hash(Words.longBytes(n)))
+            .blockValues(mock(BlockValues.class))
+            .gasPrice(Wei.ZERO)
+            .messageFrameStack(messageFrameStack)
+            .miningBeneficiary(Address.ZERO)
+            .originator(Address.ZERO)
+            .initialGas(100000L)
+            .worldUpdater(worldUpdater)
+            .build();
+    messageFrame.pushStackItem(Bytes.EMPTY);
+    messageFrame.pushStackItem(memoryLength);
+    messageFrame.pushStackItem(memoryOffset);
+    messageFrame.pushStackItem(value);
+    messageFrame.expandMemory(0, 500);
+    messageFrame.writeMemory(
+        memoryOffset.trimLeadingZeros().toInt(), SIMPLE_CREATE.size(), SIMPLE_CREATE);
+    return messageFrame;
+  }
+
+  @Test
+  void eofV1CannotCreateLegacy() {
+    final UInt256 memoryOffset = UInt256.fromHexString("0xFF");
+    final UInt256 memoryLength = UInt256.valueOf(SIMPLE_CREATE.size());
+    final MessageFrame messageFrame =
+        new TestMessageFrameBuilder()
+            .code(CodeFactory.createCode(SIMPLE_EOF, 1, true))
+            .pushStackItem(Bytes.EMPTY)
+            .pushStackItem(memoryLength)
+            .pushStackItem(memoryOffset)
+            .pushStackItem(Bytes.EMPTY)
+            .worldUpdater(worldUpdater)
+            .build();
+    messageFrame.writeMemory(memoryOffset.toLong(), memoryLength.toLong(), SIMPLE_CREATE);
+
+    when(account.getMutable()).thenReturn(mutableAccount);
+    when(mutableAccount.getBalance()).thenReturn(Wei.ZERO);
+    when(worldUpdater.getAccount(any())).thenReturn(account);
+
+    final EVM evm = MainnetEVMs.cancun(DEV_NET_CHAIN_ID, EvmConfiguration.DEFAULT);
+    var result = operation.execute(messageFrame, evm);
+    assertThat(result.getHaltReason()).isNull();
+    assertThat(messageFrame.getStackItem(0).trimLeadingZeros()).isEqualTo(Bytes.EMPTY);
+  }
+
+  @Test
+  void legacyCanCreateEOFv1() {
+    final UInt256 memoryOffset = UInt256.fromHexString("0xFF");
+    final UInt256 memoryLength = UInt256.valueOf(SIMPLE_EOF.size());
+    final MessageFrame messageFrame =
+        new TestMessageFrameBuilder()
+            .code(CodeFactory.createCode(SIMPLE_CREATE, 1, true))
+            .pushStackItem(Bytes.EMPTY)
+            .pushStackItem(memoryLength)
+            .pushStackItem(memoryOffset)
+            .pushStackItem(Bytes.EMPTY)
+            .worldUpdater(worldUpdater)
+            .build();
+    messageFrame.writeMemory(memoryOffset.toLong(), memoryLength.toLong(), SIMPLE_EOF);
+
+    when(account.getMutable()).thenReturn(mutableAccount);
+    when(account.getNonce()).thenReturn(55L);
+    when(mutableAccount.getBalance()).thenReturn(Wei.ZERO);
+    when(worldUpdater.getAccount(any())).thenReturn(account);
+    when(worldUpdater.get(any())).thenReturn(account);
+    when(worldUpdater.getSenderAccount(any())).thenReturn(account);
+    when(worldUpdater.updater()).thenReturn(worldUpdater);
+
+    final EVM evm = MainnetEVMs.cancun(DEV_NET_CHAIN_ID, EvmConfiguration.DEFAULT);
+    var result = operation.execute(messageFrame, evm);
+    assertThat(result.getHaltReason()).isNull();
+    assertThat(messageFrame.getStackItem(0)).isNotEqualTo(UInt256.ZERO);
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/CreateOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/CreateOperationTest.java
new file mode 100644
index 00000000000..e3ffc975772
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/operations/CreateOperationTest.java
@@ -0,0 +1,333 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.operations;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.evm.MainnetEVMs.DEV_NET_CHAIN_ID;
+import static org.hyperledger.besu.evm.frame.ExceptionalHaltReason.CODE_TOO_LARGE;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.MainnetEVMs;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.code.CodeFactory;
+import org.hyperledger.besu.evm.frame.BlockValues;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.ConstantinopleGasCalculator;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.evm.internal.Words;
+import org.hyperledger.besu.evm.log.Log;
+import org.hyperledger.besu.evm.operation.CreateOperation;
+import org.hyperledger.besu.evm.processor.ContractCreationProcessor;
+import org.hyperledger.besu.evm.testutils.TestMessageFrameBuilder;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+import org.hyperledger.besu.evm.worldstate.WrappedEvmAccount;
+
+import java.util.ArrayDeque;
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Test;
+
+class CreateOperationTest {
+
+  private final WorldUpdater worldUpdater = mock(WorldUpdater.class);
+  private final WrappedEvmAccount account = mock(WrappedEvmAccount.class);
+  private final WrappedEvmAccount newAccount = mock(WrappedEvmAccount.class);
+  private final MutableAccount mutableAccount = mock(MutableAccount.class);
+  private final MutableAccount newMutableAccount = mock(MutableAccount.class);
+  private final CreateOperation operation =
+      new CreateOperation(new ConstantinopleGasCalculator(), Integer.MAX_VALUE);
+  private final CreateOperation maxInitCodeOperation =
+      new CreateOperation(
+          new ConstantinopleGasCalculator(), MainnetEVMs.SHANGHAI_INIT_CODE_SIZE_LIMIT);
+
+  private static final String TOPIC =
+      "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"; // 32 FFs
+  private static final Bytes SIMPLE_CREATE =
+      Bytes.fromHexString(
+          "0x"
+              + "7f" // push32
+              + TOPIC
+              + "6000" // PUSH1 0x00
+              + "6000" // PUSH1 0x00
+              + "A1" // LOG1
+              + "6000" // PUSH1 0x00
+              + "6000" // PUSH1 0x00
+              + "F3" // RETURN
+          );
+  public static final Bytes SIMPLE_EOF =
+      Bytes.fromHexString("0xEF00010100040200010001030000000000000000");
+  public static final String SENDER = "0xdeadc0de00000000000000000000000000000000";
+
+  private static final int SHANGHAI_CREATE_GAS = 41240;
+
+  @Test
+  void createFromMemoryMutationSafe() {
+
+    // Given:  Execute a CREATE operation with a contract that logs in the constructor
+    final UInt256 memoryOffset = UInt256.fromHexString("0xFF");
+    final UInt256 memoryLength = UInt256.valueOf(SIMPLE_CREATE.size());
+    final ArrayDeque<MessageFrame> messageFrameStack = new ArrayDeque<>();
+    final MessageFrame messageFrame =
+        testMemoryFrame(memoryOffset, memoryLength, UInt256.ZERO, 1, messageFrameStack);
+
+    when(account.getMutable()).thenReturn(mutableAccount);
+    when(account.getNonce()).thenReturn(55L);
+    when(mutableAccount.getBalance()).thenReturn(Wei.ZERO);
+    when(worldUpdater.getAccount(any())).thenReturn(account);
+    when(worldUpdater.get(any())).thenReturn(account);
+    when(worldUpdater.getSenderAccount(any())).thenReturn(account);
+    when(worldUpdater.getOrCreate(any())).thenReturn(newAccount);
+    when(newAccount.getMutable()).thenReturn(newMutableAccount);
+    when(newMutableAccount.getCode()).thenReturn(Bytes.EMPTY);
+    when(worldUpdater.updater()).thenReturn(worldUpdater);
+
+    final EVM evm = MainnetEVMs.london(EvmConfiguration.DEFAULT);
+    operation.execute(messageFrame, evm);
+    final MessageFrame createFrame = messageFrameStack.peek();
+    final ContractCreationProcessor ccp =
+        new ContractCreationProcessor(evm.getGasCalculator(), evm, false, List.of(), 0, List.of());
+    ccp.process(createFrame, OperationTracer.NO_TRACING);
+
+    final Log log = createFrame.getLogs().get(0);
+    final String calculatedTopic = log.getTopics().get(0).toUnprefixedHexString();
+    assertThat(calculatedTopic).isEqualTo(TOPIC);
+
+    // WHEN the memory that the create operation was executed from is altered.
+    messageFrame.writeMemory(
+        memoryOffset.trimLeadingZeros().toInt(),
+        SIMPLE_CREATE.size(),
+        Bytes.random(SIMPLE_CREATE.size()));
+
+    // THEN the logs still have the expected topic
+    final String calculatedTopicAfter = log.getTopics().get(0).toUnprefixedHexString();
+    assertThat(calculatedTopicAfter).isEqualTo(TOPIC);
+  }
+
+  @Test
+  void nonceTooLarge() {
+    final UInt256 memoryOffset = UInt256.fromHexString("0xFF");
+    final UInt256 memoryLength = UInt256.valueOf(SIMPLE_CREATE.size());
+    final ArrayDeque<MessageFrame> messageFrameStack = new ArrayDeque<>();
+    final MessageFrame messageFrame =
+        testMemoryFrame(memoryOffset, memoryLength, UInt256.ZERO, 1, messageFrameStack);
+
+    when(worldUpdater.getAccount(any())).thenReturn(account);
+    when(account.getMutable()).thenReturn(mutableAccount);
+    when(mutableAccount.getBalance()).thenReturn(Wei.ZERO);
+    when(mutableAccount.getNonce()).thenReturn(-1L);
+
+    final EVM evm = MainnetEVMs.london(EvmConfiguration.DEFAULT);
+    operation.execute(messageFrame, evm);
+
+    assertThat(messageFrame.getStackItem(0).trimLeadingZeros()).isEqualTo(Bytes.EMPTY);
+  }
+
+  @Test
+  void messageFrameStackTooDeep() {
+    final UInt256 memoryOffset = UInt256.fromHexString("0xFF");
+    final UInt256 memoryLength = UInt256.valueOf(SIMPLE_CREATE.size());
+    final ArrayDeque<MessageFrame> messageFrameStack = new ArrayDeque<>();
+    final MessageFrame messageFrame =
+        testMemoryFrame(memoryOffset, memoryLength, UInt256.ZERO, 1025, messageFrameStack);
+
+    when(worldUpdater.getAccount(any())).thenReturn(account);
+    when(account.getMutable()).thenReturn(mutableAccount);
+    when(mutableAccount.getBalance()).thenReturn(Wei.ZERO);
+    when(mutableAccount.getNonce()).thenReturn(55L);
+
+    final EVM evm = MainnetEVMs.london(EvmConfiguration.DEFAULT);
+    operation.execute(messageFrame, evm);
+
+    assertThat(messageFrame.getStackItem(0).trimLeadingZeros()).isEqualTo(Bytes.EMPTY);
+  }
+
+  @Test
+  void notEnoughValue() {
+    final UInt256 memoryOffset = UInt256.fromHexString("0xFF");
+    final UInt256 memoryLength = UInt256.valueOf(SIMPLE_CREATE.size());
+    final ArrayDeque<MessageFrame> messageFrameStack = new ArrayDeque<>();
+    final MessageFrame messageFrame =
+        testMemoryFrame(memoryOffset, memoryLength, UInt256.valueOf(1), 1, messageFrameStack);
+    for (int i = 0; i < 1025; i++) {
+      messageFrameStack.add(messageFrame);
+    }
+
+    when(worldUpdater.getAccount(any())).thenReturn(account);
+    when(account.getMutable()).thenReturn(mutableAccount);
+    when(mutableAccount.getBalance()).thenReturn(Wei.ZERO);
+    when(mutableAccount.getNonce()).thenReturn(55L);
+
+    final EVM evm = MainnetEVMs.london(EvmConfiguration.DEFAULT);
+    operation.execute(messageFrame, evm);
+
+    assertThat(messageFrame.getStackItem(0).trimLeadingZeros()).isEqualTo(Bytes.EMPTY);
+  }
+
+  @Test
+  void shanghaiMaxInitCodeSizeCreate() {
+    final UInt256 memoryOffset = UInt256.fromHexString("0xFF");
+    final UInt256 memoryLength = UInt256.fromHexString("0xc000");
+    final ArrayDeque<MessageFrame> messageFrameStack = new ArrayDeque<>();
+    final MessageFrame messageFrame =
+        testMemoryFrame(memoryOffset, memoryLength, UInt256.ZERO, 1, messageFrameStack);
+
+    when(account.getMutable()).thenReturn(mutableAccount);
+    when(account.getNonce()).thenReturn(55L);
+    when(mutableAccount.getBalance()).thenReturn(Wei.ZERO);
+    when(worldUpdater.getAccount(any())).thenReturn(account);
+    when(worldUpdater.get(any())).thenReturn(account);
+    when(worldUpdater.getSenderAccount(any())).thenReturn(account);
+    when(worldUpdater.getOrCreate(any())).thenReturn(newAccount);
+    when(newAccount.getMutable()).thenReturn(newMutableAccount);
+    when(newMutableAccount.getCode()).thenReturn(Bytes.EMPTY);
+    when(worldUpdater.updater()).thenReturn(worldUpdater);
+
+    final EVM evm = MainnetEVMs.shanghai(DEV_NET_CHAIN_ID, EvmConfiguration.DEFAULT);
+    var result = maxInitCodeOperation.execute(messageFrame, evm);
+    final MessageFrame createFrame = messageFrameStack.peek();
+    final ContractCreationProcessor ccp =
+        new ContractCreationProcessor(evm.getGasCalculator(), evm, false, List.of(), 0, List.of());
+    ccp.process(createFrame, OperationTracer.NO_TRACING);
+
+    final Log log = createFrame.getLogs().get(0);
+    final String calculatedTopic = log.getTopics().get(0).toUnprefixedHexString();
+    assertThat(calculatedTopic).isEqualTo(TOPIC);
+    assertThat(result.getGasCost()).isEqualTo(SHANGHAI_CREATE_GAS);
+  }
+
+  @Test
+  void shanghaiMaxInitCodeSizePlus1Create() {
+    final UInt256 memoryOffset = UInt256.fromHexString("0xFF");
+    final UInt256 memoryLength = UInt256.fromHexString("0xc001");
+    final ArrayDeque<MessageFrame> messageFrameStack = new ArrayDeque<>();
+    final MessageFrame messageFrame =
+        testMemoryFrame(memoryOffset, memoryLength, UInt256.ZERO, 1, messageFrameStack);
+
+    when(account.getMutable()).thenReturn(mutableAccount);
+    when(account.getNonce()).thenReturn(55L);
+    when(mutableAccount.getBalance()).thenReturn(Wei.ZERO);
+    when(worldUpdater.getAccount(any())).thenReturn(account);
+    when(worldUpdater.get(any())).thenReturn(account);
+    when(worldUpdater.getSenderAccount(any())).thenReturn(account);
+    when(worldUpdater.getOrCreate(any())).thenReturn(newAccount);
+    when(newAccount.getMutable()).thenReturn(newMutableAccount);
+    when(newMutableAccount.getCode()).thenReturn(Bytes.EMPTY);
+    when(worldUpdater.updater()).thenReturn(worldUpdater);
+
+    final EVM evm = MainnetEVMs.shanghai(DEV_NET_CHAIN_ID, EvmConfiguration.DEFAULT);
+    var result = maxInitCodeOperation.execute(messageFrame, evm);
+    assertThat(result.getHaltReason()).isEqualTo(CODE_TOO_LARGE);
+  }
+
+  @Test
+  void eofV1CannotCreateLegacy() {
+    final UInt256 memoryOffset = UInt256.fromHexString("0xFF");
+    final UInt256 memoryLength = UInt256.valueOf(SIMPLE_CREATE.size());
+    final MessageFrame messageFrame =
+        new TestMessageFrameBuilder()
+            .code(CodeFactory.createCode(SIMPLE_EOF, 1, true))
+            .pushStackItem(memoryLength)
+            .pushStackItem(memoryOffset)
+            .pushStackItem(Bytes.EMPTY)
+            .worldUpdater(worldUpdater)
+            .build();
+    messageFrame.writeMemory(memoryOffset.toLong(), memoryLength.toLong(), SIMPLE_CREATE);
+
+    when(account.getMutable()).thenReturn(mutableAccount);
+    when(mutableAccount.getBalance()).thenReturn(Wei.ZERO);
+    when(worldUpdater.getAccount(any())).thenReturn(account);
+
+    final EVM evm = MainnetEVMs.cancun(DEV_NET_CHAIN_ID, EvmConfiguration.DEFAULT);
+    var result = operation.execute(messageFrame, evm);
+    assertThat(result.getHaltReason()).isNull();
+    assertThat(messageFrame.getStackItem(0).trimLeadingZeros()).isEqualTo(Bytes.EMPTY);
+  }
+
+  @Test
+  void legacyCanCreateEOFv1() {
+    final UInt256 memoryOffset = UInt256.fromHexString("0xFF");
+    final UInt256 memoryLength = UInt256.valueOf(SIMPLE_EOF.size());
+    final MessageFrame messageFrame =
+        new TestMessageFrameBuilder()
+            .code(CodeFactory.createCode(SIMPLE_CREATE, 1, true))
+            .pushStackItem(memoryLength)
+            .pushStackItem(memoryOffset)
+            .pushStackItem(Bytes.EMPTY)
+            .worldUpdater(worldUpdater)
+            .build();
+    messageFrame.writeMemory(memoryOffset.toLong(), memoryLength.toLong(), SIMPLE_EOF);
+
+    when(account.getMutable()).thenReturn(mutableAccount);
+    when(account.getNonce()).thenReturn(55L);
+    when(mutableAccount.getBalance()).thenReturn(Wei.ZERO);
+    when(worldUpdater.getAccount(any())).thenReturn(account);
+    when(worldUpdater.get(any())).thenReturn(account);
+    when(worldUpdater.getSenderAccount(any())).thenReturn(account);
+    when(worldUpdater.updater()).thenReturn(worldUpdater);
+
+    final EVM evm = MainnetEVMs.cancun(DEV_NET_CHAIN_ID, EvmConfiguration.DEFAULT);
+    var result = operation.execute(messageFrame, evm);
+    assertThat(result.getHaltReason()).isNull();
+    assertThat(messageFrame.getState()).isEqualTo(MessageFrame.State.CODE_SUSPENDED);
+  }
+
+  @NotNull
+  private MessageFrame testMemoryFrame(
+      final UInt256 memoryOffset,
+      final UInt256 memoryLength,
+      final UInt256 value,
+      final int depth,
+      final ArrayDeque<MessageFrame> messageFrameStack) {
+    final MessageFrame messageFrame =
+        MessageFrame.builder()
+            .type(MessageFrame.Type.CONTRACT_CREATION)
+            .contract(Address.ZERO)
+            .inputData(Bytes.EMPTY)
+            .sender(Address.fromHexString(SENDER))
+            .value(Wei.ZERO)
+            .apparentValue(Wei.ZERO)
+            .code(CodeFactory.createCode(SIMPLE_CREATE, 0, true))
+            .depth(depth)
+            .completer(__ -> {})
+            .address(Address.fromHexString(SENDER))
+            .blockHashLookup(n -> Hash.hash(Words.longBytes(n)))
+            .blockValues(mock(BlockValues.class))
+            .gasPrice(Wei.ZERO)
+            .messageFrameStack(messageFrameStack)
+            .miningBeneficiary(Address.ZERO)
+            .originator(Address.ZERO)
+            .initialGas(100000L)
+            .worldUpdater(worldUpdater)
+            .build();
+    messageFrame.pushStackItem(memoryLength);
+    messageFrame.pushStackItem(memoryOffset);
+    messageFrame.pushStackItem(value);
+    messageFrame.expandMemory(0, 500);
+    messageFrame.writeMemory(
+        memoryOffset.trimLeadingZeros().toInt(), SIMPLE_CREATE.size(), SIMPLE_CREATE);
+    return messageFrame;
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/DataHashOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/DataHashOperationTest.java
new file mode 100644
index 00000000000..6e334fea67c
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/operations/DataHashOperationTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.evm.operations;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.LondonGasCalculator;
+import org.hyperledger.besu.evm.operation.DataHashOperation;
+import org.hyperledger.besu.evm.operation.Operation;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Test;
+
+class DataHashOperationTest {
+
+  @Test
+  void putsHashOnStack() {
+    Hash version0Hash = Hash.fromHexStringLenient("0xcafebabeb0b0facedeadbeef");
+    List<Hash> versionedHashes = List.of(version0Hash);
+    DataHashOperation getHash = new DataHashOperation(new LondonGasCalculator());
+    MessageFrame frame = mock(MessageFrame.class);
+    when(frame.popStackItem()).thenReturn(Bytes.of(0));
+    when(frame.getVersionedHashes()).thenReturn(Optional.of(versionedHashes));
+    EVM fakeEVM = mock(EVM.class);
+    Operation.OperationResult r = getHash.execute(frame, fakeEVM);
+    assertThat(r.getGasCost()).isEqualTo(3);
+    assertThat(r.getHaltReason()).isNull();
+    verify(frame).pushStackItem(version0Hash);
+  }
+
+  @Test
+  void pushesZeroOnBloblessTx() {
+
+    EVM fakeEVM = mock(EVM.class);
+
+    DataHashOperation getHash = new DataHashOperation(new LondonGasCalculator());
+    MessageFrame frame = mock(MessageFrame.class);
+    when(frame.popStackItem()).thenReturn(Bytes.of(0));
+    when(frame.getVersionedHashes()).thenReturn(Optional.empty());
+
+    Operation.OperationResult failed1 = getHash.execute(frame, fakeEVM);
+    assertThat(failed1.getGasCost()).isEqualTo(3);
+    assertThat(failed1.getHaltReason()).isNull();
+
+    when(frame.popStackItem()).thenReturn(Bytes.of(0));
+    when(frame.getVersionedHashes()).thenReturn(Optional.of(new ArrayList<>()));
+    Operation.OperationResult failed2 = getHash.execute(frame, fakeEVM);
+    assertThat(failed2.getGasCost()).isEqualTo(3);
+    assertThat(failed2.getHaltReason()).isNull();
+    verify(frame, times(2)).pushStackItem(Bytes.EMPTY);
+  }
+
+  @Test
+  void pushZeroOnVersionIndexOutOFBounds() {
+    Hash version0Hash = Hash.fromHexStringLenient("0xcafebabeb0b0facedeadbeef");
+    List<Hash> versionedHashes = List.of(version0Hash);
+    DataHashOperation getHash = new DataHashOperation(new LondonGasCalculator());
+    MessageFrame frame = mock(MessageFrame.class);
+    when(frame.popStackItem()).thenReturn(Bytes.of(1));
+    when(frame.getVersionedHashes()).thenReturn(Optional.of(versionedHashes));
+    EVM fakeEVM = mock(EVM.class);
+    Operation.OperationResult r = getHash.execute(frame, fakeEVM);
+    assertThat(r.getGasCost()).isEqualTo(3);
+    assertThat(r.getHaltReason()).isNull();
+    verify(frame).pushStackItem(Bytes.EMPTY);
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/ExtCodeHashOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/ExtCodeHashOperationTest.java
new file mode 100644
index 00000000000..3127970c3b9
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/operations/ExtCodeHashOperationTest.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operations;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.frame.BlockValues;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.ConstantinopleGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.IstanbulGasCalculator;
+import org.hyperledger.besu.evm.internal.Words;
+import org.hyperledger.besu.evm.operation.ExtCodeHashOperation;
+import org.hyperledger.besu.evm.operation.Operation.OperationResult;
+import org.hyperledger.besu.evm.testutils.FakeBlockValues;
+import org.hyperledger.besu.evm.testutils.TestMessageFrameBuilder;
+import org.hyperledger.besu.evm.toy.ToyWorld;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.jupiter.api.Test;
+
+class ExtCodeHashOperationTest {
+
+  private static final Address REQUESTED_ADDRESS = Address.fromHexString("0x22222222");
+
+  private final ToyWorld toyWorld = new ToyWorld();
+  private final WorldUpdater worldStateUpdater = toyWorld.updater();
+
+  private final ExtCodeHashOperation operation =
+      new ExtCodeHashOperation(new ConstantinopleGasCalculator());
+  private final ExtCodeHashOperation operationIstanbul =
+      new ExtCodeHashOperation(new IstanbulGasCalculator());
+
+  @Test
+  void shouldCharge400Gas() {
+    final OperationResult result = operation.execute(createMessageFrame(REQUESTED_ADDRESS), null);
+    assertThat(result.getGasCost()).isEqualTo(400L);
+  }
+
+  @Test
+  void istanbulShouldCharge700Gas() {
+    final OperationResult result =
+        operationIstanbul.execute(createMessageFrame(REQUESTED_ADDRESS), null);
+    assertThat(result.getGasCost()).isEqualTo(700L);
+  }
+
+  @Test
+  void shouldReturnZeroWhenAccountDoesNotExist() {
+    final Bytes result = executeOperation(REQUESTED_ADDRESS);
+    assertThat(result.trimLeadingZeros()).isEqualTo(Bytes.EMPTY);
+  }
+
+  @Test
+  void shouldReturnHashOfEmptyDataWhenAccountExistsButDoesNotHaveCode() {
+    worldStateUpdater.getOrCreate(REQUESTED_ADDRESS).getMutable().setBalance(Wei.of(1));
+    assertThat(executeOperation(REQUESTED_ADDRESS)).isEqualTo(Hash.EMPTY);
+  }
+
+  @Test
+  void shouldReturnZeroWhenAccountExistsButIsEmpty() {
+    worldStateUpdater.getOrCreate(REQUESTED_ADDRESS);
+    assertThat(executeOperation(REQUESTED_ADDRESS).trimLeadingZeros()).isEqualTo(Bytes.EMPTY);
+  }
+
+  @Test
+  void shouldReturnZeroWhenPrecompiledContractHasNoBalance() {
+    assertThat(executeOperation(Address.ECREC).trimLeadingZeros()).isEqualTo(Bytes.EMPTY);
+  }
+
+  @Test
+  void shouldReturnEmptyCodeHashWhenPrecompileHasBalance() {
+    // Sending money to a precompile causes it to exist in the world state archive.
+    worldStateUpdater.getOrCreate(Address.ECREC).getMutable().setBalance(Wei.of(10));
+    assertThat(executeOperation(Address.ECREC)).isEqualTo(Hash.EMPTY);
+  }
+
+  @Test
+  void shouldGetHashOfAccountCodeWhenCodeIsPresent() {
+    final Bytes code = Bytes.fromHexString("0xabcdef");
+    final MutableAccount account = worldStateUpdater.getOrCreate(REQUESTED_ADDRESS).getMutable();
+    account.setCode(code);
+    assertThat(executeOperation(REQUESTED_ADDRESS)).isEqualTo(Hash.hash(code));
+  }
+
+  @Test
+  void shouldZeroOutLeftMostBitsToGetAddress() {
+    // If EXTCODEHASH of A is X, then EXTCODEHASH of A + 2**160 is X.
+    final Bytes code = Bytes.fromHexString("0xabcdef");
+    final MutableAccount account = worldStateUpdater.getOrCreate(REQUESTED_ADDRESS).getMutable();
+    account.setCode(code);
+    final UInt256 value =
+        UInt256.fromBytes(Words.fromAddress(REQUESTED_ADDRESS))
+            .add(UInt256.valueOf(2).pow(UInt256.valueOf(160)));
+    final MessageFrame frame = createMessageFrame(value);
+    operation.execute(frame, null);
+    assertThat(frame.getStackItem(0)).isEqualTo(Hash.hash(code));
+  }
+
+  private Bytes executeOperation(final Address requestedAddress) {
+    final MessageFrame frame = createMessageFrame(requestedAddress);
+    operation.execute(frame, null);
+    return frame.getStackItem(0);
+  }
+
+  private MessageFrame createMessageFrame(final Address requestedAddress) {
+    final UInt256 stackItem = Words.fromAddress(requestedAddress);
+    return createMessageFrame(stackItem);
+  }
+
+  private MessageFrame createMessageFrame(final UInt256 stackItem) {
+    final BlockValues blockValues = new FakeBlockValues(1337);
+    final MessageFrame frame =
+        new TestMessageFrameBuilder()
+            .worldUpdater(worldStateUpdater)
+            .blockValues(blockValues)
+            .build();
+
+    frame.pushStackItem(stackItem);
+    return frame;
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/JumpFOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/JumpFOperationTest.java
new file mode 100644
index 00000000000..a6157e52a84
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/operations/JumpFOperationTest.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operations;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.code.CodeSection;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.ReturnStack;
+import org.hyperledger.besu.evm.operation.JumpFOperation;
+import org.hyperledger.besu.evm.operation.Operation;
+import org.hyperledger.besu.evm.testutils.TestMessageFrameBuilder;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Test;
+
+class JumpFOperationTest {
+
+  @Test
+  void jumpFHappyPath() {
+    final GasCalculator gasCalculator = mock(GasCalculator.class);
+    final Code mockCode = mock(Code.class);
+    final Bytes code = Bytes.fromHexString("00" + "b2" + "0001" + "00");
+    when(mockCode.getBytes()).thenReturn(code);
+
+    final CodeSection codeSection = new CodeSection(0, 1, 2, 3, 0);
+    when(mockCode.getCodeSection(1)).thenReturn(codeSection);
+    when(mockCode.getCodeSection(2)).thenReturn(codeSection);
+
+    MessageFrame messageFrame =
+        new TestMessageFrameBuilder()
+            .code(mockCode)
+            .pc(1)
+            .section(2)
+            .initialGas(10L)
+            .pushStackItem(Bytes.EMPTY)
+            .build();
+
+    JumpFOperation jumpF = new JumpFOperation(gasCalculator);
+    Operation.OperationResult jumpFResult = jumpF.execute(messageFrame, null);
+
+    assertThat(jumpFResult.getHaltReason()).isNull();
+    assertThat(jumpFResult.getPcIncrement()).isEqualTo(1);
+    assertThat(messageFrame.getSection()).isEqualTo(1);
+    assertThat(messageFrame.getPC()).isEqualTo(-1);
+    assertThat(messageFrame.returnStackSize()).isEqualTo(1);
+    assertThat(messageFrame.peekReturnStack()).isEqualTo(new ReturnStack.ReturnStackItem(0, 0, 0));
+  }
+
+  @Test
+  void jumpFMissingCodeSection() {
+    final GasCalculator gasCalculator = mock(GasCalculator.class);
+    final Code mockCode = mock(Code.class);
+    final Bytes code = Bytes.fromHexString("00" + "b2" + "03ff" + "00");
+    when(mockCode.getBytes()).thenReturn(code);
+
+    final CodeSection codeSection = new CodeSection(0, 1, 2, 3, 0);
+    when(mockCode.getCodeSection(1)).thenReturn(codeSection);
+
+    MessageFrame messageFrame =
+        new TestMessageFrameBuilder()
+            .code(mockCode)
+            .pc(1)
+            .initialGas(10L)
+            .pushStackItem(Bytes.EMPTY)
+            .pushStackItem(Bytes.EMPTY)
+            .build();
+
+    JumpFOperation jumpF = new JumpFOperation(gasCalculator);
+    Operation.OperationResult jumpFResult = jumpF.execute(messageFrame, null);
+
+    assertThat(jumpFResult.getHaltReason()).isEqualTo(ExceptionalHaltReason.CODE_SECTION_MISSING);
+    assertThat(jumpFResult.getPcIncrement()).isEqualTo(1);
+    assertThat(messageFrame.getSection()).isZero();
+    assertThat(messageFrame.getPC()).isEqualTo(1);
+    assertThat(messageFrame.returnStackSize()).isEqualTo(1);
+    assertThat(messageFrame.peekReturnStack()).isEqualTo(new ReturnStack.ReturnStackItem(0, 0, 0));
+  }
+
+  @Test
+  void jumpFTooMuchStack() {
+    final GasCalculator gasCalculator = mock(GasCalculator.class);
+    final Code mockCode = mock(Code.class);
+    final Bytes code = Bytes.fromHexString("00" + "b2" + "0001" + "00");
+    when(mockCode.getBytes()).thenReturn(code);
+
+    final CodeSection codeSection1 = new CodeSection(0, 1, 2, 3, 0);
+    when(mockCode.getCodeSection(1)).thenReturn(codeSection1);
+    final CodeSection codeSection2 = new CodeSection(0, 2, 2, 3, 0);
+    when(mockCode.getCodeSection(2)).thenReturn(codeSection2);
+
+    MessageFrame messageFrame =
+        new TestMessageFrameBuilder()
+            .code(mockCode)
+            .pc(1)
+            .section(2)
+            .initialGas(10L)
+            .pushStackItem(Bytes.EMPTY)
+            .pushStackItem(Bytes.EMPTY)
+            .build();
+
+    JumpFOperation jumpF = new JumpFOperation(gasCalculator);
+    Operation.OperationResult jumpFResult = jumpF.execute(messageFrame, null);
+
+    assertThat(jumpFResult.getHaltReason()).isEqualTo(ExceptionalHaltReason.JUMPF_STACK_MISMATCH);
+    assertThat(jumpFResult.getPcIncrement()).isEqualTo(1);
+    assertThat(messageFrame.getSection()).isEqualTo(2);
+    assertThat(messageFrame.getPC()).isEqualTo(1);
+    assertThat(messageFrame.returnStackSize()).isEqualTo(1);
+    assertThat(messageFrame.peekReturnStack()).isEqualTo(new ReturnStack.ReturnStackItem(0, 0, 0));
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/JumpOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/JumpOperationTest.java
new file mode 100644
index 00000000000..37b5998309f
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/operations/JumpOperationTest.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operations;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.EvmSpecVersion;
+import org.hyperledger.besu.evm.code.CodeFactory;
+import org.hyperledger.besu.evm.frame.BlockValues;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.IstanbulGasCalculator;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.evm.operation.JumpDestOperation;
+import org.hyperledger.besu.evm.operation.JumpOperation;
+import org.hyperledger.besu.evm.operation.Operation.OperationResult;
+import org.hyperledger.besu.evm.operation.OperationRegistry;
+import org.hyperledger.besu.evm.testutils.FakeBlockValues;
+import org.hyperledger.besu.evm.testutils.TestMessageFrameBuilder;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+class JumpOperationTest {
+
+  private static final IstanbulGasCalculator gasCalculator = new IstanbulGasCalculator();
+
+  private static final int CURRENT_PC = 1;
+
+  private Address address;
+  private EVM evm;
+
+  private TestMessageFrameBuilder createMessageFrameBuilder(final long initialGas) {
+    final BlockValues blockValues = new FakeBlockValues(1337);
+    return new TestMessageFrameBuilder()
+        .address(address)
+        .blockValues(blockValues)
+        .initialGas(initialGas);
+  }
+
+  @BeforeEach
+  void init() {
+    address = Address.fromHexString("0x18675309");
+
+    final OperationRegistry registry = new OperationRegistry();
+    registry.put(new JumpOperation(gasCalculator));
+    registry.put(new JumpDestOperation(gasCalculator));
+    evm = new EVM(registry, gasCalculator, EvmConfiguration.DEFAULT, EvmSpecVersion.PARIS);
+  }
+
+  @Test
+  void shouldJumpWhenLocationIsJumpDest() {
+    final JumpOperation operation = new JumpOperation(gasCalculator);
+    final Bytes jumpBytes = Bytes.fromHexString("0x6003565b00");
+    final MessageFrame frame =
+        createMessageFrameBuilder(10_000L)
+            .pushStackItem(UInt256.fromHexString("0x03"))
+            .code(CodeFactory.createCode(jumpBytes, 0, false))
+            .build();
+    frame.setPC(CURRENT_PC);
+
+    final OperationResult result = operation.execute(frame, evm);
+    assertThat(result.getHaltReason()).isNull();
+  }
+
+  @Test
+  void shouldJumpWhenLocationIsJumpDestAndAtEndOfCode() {
+    final JumpOperation operation = new JumpOperation(gasCalculator);
+    final Bytes jumpBytes = Bytes.fromHexString("0x6003565b");
+    final MessageFrame frame =
+        createMessageFrameBuilder(10_000L)
+            .pushStackItem(UInt256.fromHexString("0x03"))
+            .code(CodeFactory.createCode(jumpBytes, 0, false))
+            .build();
+    frame.setPC(CURRENT_PC);
+
+    final OperationResult result = operation.execute(frame, evm);
+    assertThat(result.getHaltReason()).isNull();
+  }
+
+  @Test
+  void shouldHaltWithInvalidJumDestinationWhenLocationIsOutsideOfCodeRange() {
+    final JumpOperation operation = new JumpOperation(gasCalculator);
+    final Bytes jumpBytes = Bytes.fromHexString("0x6801000000000000000c565b00");
+    final MessageFrame frameDestinationGreaterThanCodeSize =
+        createMessageFrameBuilder(100L)
+            .pushStackItem(UInt256.fromHexString("0xFFFFFFFF"))
+            .code(CodeFactory.createCode(jumpBytes, 0, false))
+            .build();
+    frameDestinationGreaterThanCodeSize.setPC(CURRENT_PC);
+
+    final OperationResult result = operation.execute(frameDestinationGreaterThanCodeSize, evm);
+    assertThat(result.getHaltReason()).isEqualTo(ExceptionalHaltReason.INVALID_JUMP_DESTINATION);
+    final Bytes badJump = Bytes.fromHexString("0x60045600");
+    final MessageFrame frameDestinationEqualsToCodeSize =
+        createMessageFrameBuilder(100L)
+            .pushStackItem(UInt256.fromHexString("0x04"))
+            .code(CodeFactory.createCode(badJump, 0, false))
+            .build();
+    frameDestinationEqualsToCodeSize.setPC(CURRENT_PC);
+
+    final OperationResult result2 = operation.execute(frameDestinationEqualsToCodeSize, evm);
+    assertThat(result2.getHaltReason()).isEqualTo(ExceptionalHaltReason.INVALID_JUMP_DESTINATION);
+  }
+
+  @Test
+  void longContractsValidate() {
+    final JumpOperation operation = new JumpOperation(gasCalculator);
+    final Bytes longCode =
+        Bytes.fromHexString(
+            "0x60006000351461001157600050610018565b6101016020525b60016000351461002a5760005061002f565b326020525b60026000351461004157600050610046565b336020525b6003600035146100585760005061005d565b306020525b60046000351461006f57600050610075565b60016020525b60005160005260006020351461008d576000506100b6565b5a600052602051315060165a60005103036000555a600052602051315060165a60005103036001555b6001602035146100c8576000506100f1565b5a6000526020513b5060165a60005103036000555a6000526020513b5060165a60005103036001555b6002602035146101035760005061012c565b5a6000526020513f5060165a60005103036000555a6000526020513f5060165a60005103036001555b60036020351461013e5760005061017a565b6106a5610100525a600052602060006101006020513c60205a60005103036000555a600052602060006101006020513c60205a60005103036001555b00");
+
+    final MessageFrame longContract =
+        createMessageFrameBuilder(100L)
+            .pushStackItem(UInt256.fromHexString("0x12c"))
+            .code(CodeFactory.createCode(longCode, 0, false))
+            .build();
+    longContract.setPC(255);
+
+    final OperationResult result = operation.execute(longContract, evm);
+    assertThat(result.getHaltReason()).isNull();
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/LondonSStoreOperationGasCostTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/LondonSStoreOperationGasCostTest.java
new file mode 100644
index 00000000000..1065d5cbd66
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/operations/LondonSStoreOperationGasCostTest.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operations;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.evm.MainnetEVMs;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.frame.MessageFrame.State;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.evm.testutils.TestCodeExecutor;
+
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class LondonSStoreOperationGasCostTest {
+
+  public static Object[][] scenarios() {
+    // Tests specified in EIP-3539.
+    return new Object[][] {
+      {"0x60006000556000600055", 0, 212, 0},
+      {"0x60006000556001600055", 0, 20112, 0},
+      {"0x60016000556000600055", 0, 20112, 19900},
+      {"0x60016000556002600055", 0, 20112, 0},
+      {"0x60016000556001600055", 0, 20112, 0},
+      {"0x60006000556000600055", 1, 3012, 4800},
+      {"0x60006000556001600055", 1, 3012, 2800},
+      {"0x60006000556002600055", 1, 3012, 0},
+      {"0x60026000556000600055", 1, 3012, 4800},
+      {"0x60026000556003600055", 1, 3012, 0},
+      {"0x60026000556001600055", 1, 3012, 2800},
+      {"0x60026000556002600055", 1, 3012, 0},
+      {"0x60016000556000600055", 1, 3012, 4800},
+      {"0x60016000556002600055", 1, 3012, 0},
+      {"0x60016000556001600055", 1, 212, 0},
+      {"0x600160005560006000556001600055", 0, 40118, 19900},
+      {"0x600060005560016000556000600055", 1, 5918, 7600},
+    };
+  }
+
+  private TestCodeExecutor codeExecutor;
+
+  @BeforeEach
+  public void setUp() {
+    codeExecutor = new TestCodeExecutor(MainnetEVMs.london(EvmConfiguration.DEFAULT));
+  }
+
+  @ParameterizedTest
+  @MethodSource("scenarios")
+  void shouldCalculateGasAccordingToEip3529(
+      final String code,
+      final int originalValue,
+      final int expectedGasUsed,
+      final int expectedGasRefund) {
+    final long gasLimit = 1_000_000;
+    final MessageFrame frame =
+        codeExecutor.executeCode(
+            code,
+            gasLimit,
+            account -> account.setStorageValue(UInt256.ZERO, UInt256.valueOf(originalValue)));
+    assertThat(frame.getState()).isEqualTo(State.COMPLETED_SUCCESS);
+    assertThat(frame.getRemainingGas()).isEqualTo(gasLimit - (expectedGasUsed + 2100));
+    assertThat(frame.getGasRefund()).isEqualTo(expectedGasRefund);
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/MCopyOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/MCopyOperationTest.java
new file mode 100644
index 00000000000..bdae1238d5c
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/operations/MCopyOperationTest.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operations;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.CancunGasCalculator;
+import org.hyperledger.besu.evm.operation.MCopyOperation;
+import org.hyperledger.besu.evm.operation.Operation;
+import org.hyperledger.besu.evm.testutils.TestMessageFrameBuilder;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+class MCopyOperationTest {
+
+  @Mock EVM evm;
+
+  static Collection<Object[]> mcopyTestVector() {
+    return Arrays.asList(
+        new Object[][] {
+          {
+            "Copy after, no overlap",
+            Bytes.fromHexString("0123456789abcdef000000000000000000000000000000000000000000000000"),
+            32,
+            0,
+            8,
+            Bytes.fromHexString(
+                "0123456789abcdef0000000000000000000000000000000000000000000000000123456789abcdef"),
+            9L
+          },
+          {
+            "copy from uninitialized memory",
+            Bytes.EMPTY,
+            0,
+            24,
+            16,
+            Bytes.fromHexString(
+                "0x000000000000000000000000000000000000000000000000000000000000000000"),
+            12L
+          },
+          {
+            "copy from initialized + uninitialized memory",
+            Bytes.fromHexString(
+                "0x0000000000000000000000000000000000000000000000000123456789abcdef"),
+            64,
+            24,
+            16,
+            Bytes.fromHexString(
+                "0x0000000000000000000000000000000000000000000000000123456789abcdef00000000000000000000000000000000000000000000000000000000000000000123456789abcdef000000000000000000000000000000000000000000000000"),
+            12L
+          },
+          {
+            "overlapping src < dst",
+            Bytes.fromHexString(
+                "0x0123456789abcdef000000000000000000000000000000000000000000000000"),
+            4,
+            0,
+            8,
+            Bytes.fromHexString(
+                "0x012345670123456789abcdef0000000000000000000000000000000000000000"),
+            6L
+          },
+          {
+            "overlapping src > dst",
+            Bytes.fromHexString(
+                "0x00112233445566778899aabbccddeeff00000000000000000000000000000000"),
+            0,
+            4,
+            8,
+            Bytes.fromHexString(
+                "0x445566778899aabb8899aabbccddeeff00000000000000000000000000000000"),
+            6L
+          },
+          {
+            "overlapping src == dst",
+            Bytes.fromHexString(
+                "0x00112233445566778899aabbccddeeff00000000000000000000000000000000"),
+            4,
+            4,
+            8,
+            Bytes.fromHexString(
+                "0x00112233445566778899aabbccddeeff00000000000000000000000000000000"),
+            6L
+          }
+        });
+  }
+
+  @SuppressWarnings("unused")
+  @ParameterizedTest(name = "{0}")
+  @MethodSource("mcopyTestVector")
+  void testMCopy(
+      final String name,
+      final Bytes memory,
+      final long dst,
+      final long src,
+      final long len,
+      final Bytes expected,
+      final long gasCost) {
+    MCopyOperation subject = new MCopyOperation(new CancunGasCalculator());
+    MessageFrame frame =
+        new TestMessageFrameBuilder()
+            .pushStackItem(Bytes.ofUnsignedLong(len))
+            .pushStackItem(Bytes.ofUnsignedLong(src))
+            .pushStackItem(Bytes.ofUnsignedLong(dst))
+            .memory(memory)
+            .build();
+
+    Operation.OperationResult result = subject.execute(frame, evm);
+
+    assertThat(frame.memoryWordSize()).isEqualTo((expected.size() + 31) / 32);
+    assertThat(frame.readMemory(0, expected.size())).isEqualTo(expected);
+    assertThat(result.getGasCost()).isEqualTo(gasCost);
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/PrevRanDaoOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/PrevRanDaoOperationTest.java
new file mode 100644
index 00000000000..8030cacc855
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/operations/PrevRanDaoOperationTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operations;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.frame.BlockValues;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.LondonGasCalculator;
+import org.hyperledger.besu.evm.operation.Operation;
+import org.hyperledger.besu.evm.operation.PrevRanDaoOperation;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.jupiter.api.Test;
+
+class PrevRanDaoOperationTest {
+
+  @Test
+  void pushesPrevRandaoWhenDifficultyZero() {
+    PrevRanDaoOperation op = new PrevRanDaoOperation(new LondonGasCalculator());
+    MessageFrame messageFrame = mock(MessageFrame.class);
+    BlockValues blockHeader = mock(BlockValues.class);
+    Bytes32 prevRandao = Bytes32.fromHexString("0xb0b0face");
+    when(blockHeader.getDifficultyBytes()).thenReturn(UInt256.ZERO);
+    when(blockHeader.getMixHashOrPrevRandao()).thenReturn(prevRandao);
+    when(messageFrame.getBlockValues()).thenReturn(blockHeader);
+    EVM evm = mock(EVM.class);
+    Operation.OperationResult r = op.executeFixedCostOperation(messageFrame, evm);
+    assertThat(r.getHaltReason()).isNull();
+    verify(messageFrame).pushStackItem(prevRandao);
+  }
+
+  @Test
+  void pushesPrevRandDaoWhenDifficultyPresent() {
+    PrevRanDaoOperation op = new PrevRanDaoOperation(new LondonGasCalculator());
+    MessageFrame messageFrame = mock(MessageFrame.class);
+    BlockValues blockHeader = mock(BlockValues.class);
+    Bytes32 prevRandao = Bytes32.fromHexString("0xb0b0face");
+    Bytes difficulty = Bytes.random(32);
+    when(blockHeader.getDifficultyBytes()).thenReturn(difficulty);
+    when(blockHeader.getMixHashOrPrevRandao()).thenReturn(prevRandao);
+    when(messageFrame.getBlockValues()).thenReturn(blockHeader);
+    EVM evm = mock(EVM.class);
+    Operation.OperationResult r = op.executeFixedCostOperation(messageFrame, evm);
+    assertThat(r.getHaltReason()).isNull();
+    verify(messageFrame).pushStackItem(prevRandao);
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/Push0OperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/Push0OperationTest.java
new file mode 100644
index 00000000000..439f4144f07
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/operations/Push0OperationTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operations;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.code.CodeV0;
+import org.hyperledger.besu.evm.frame.BlockValues;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.BerlinGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.operation.Operation;
+import org.hyperledger.besu.evm.operation.Operation.OperationResult;
+import org.hyperledger.besu.evm.operation.Push0Operation;
+import org.hyperledger.besu.evm.testutils.FakeBlockValues;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+class Push0OperationTest {
+
+  private final GasCalculator gasCalculator = new BerlinGasCalculator();
+
+  @Test
+  void shouldPush0OntoStack() {
+    final MessageFrame frame = createMessageFrame(100, Optional.of(Wei.of(5L)));
+    final Operation operation = new Push0Operation(gasCalculator);
+    final OperationResult result = operation.execute(frame, null);
+    Mockito.verify(frame).pushStackItem(Bytes.EMPTY);
+    assertThat(result.getGasCost()).isEqualTo(gasCalculator.getBaseTierGasCost());
+    assertSuccessResult(result);
+  }
+
+  private void assertSuccessResult(final OperationResult result) {
+    assertThat(result).isNotNull();
+    assertThat(result.getHaltReason()).isNull();
+  }
+
+  private MessageFrame createMessageFrame(final long initialGas, final Optional<Wei> baseFee) {
+    final MessageFrame frame = mock(MessageFrame.class);
+    when(frame.getRemainingGas()).thenReturn(initialGas);
+    final BlockValues blockValues = new FakeBlockValues(baseFee);
+    when(frame.getBlockValues()).thenReturn(blockValues);
+    when(frame.getCode()).thenReturn(CodeV0.EMPTY_CODE);
+    return frame;
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/RelativeJumpOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/RelativeJumpOperationTest.java
new file mode 100644
index 00000000000..e576b196978
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/operations/RelativeJumpOperationTest.java
@@ -0,0 +1,237 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.operations;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.Words;
+import org.hyperledger.besu.evm.operation.Operation;
+import org.hyperledger.besu.evm.operation.RelativeJumpIfOperation;
+import org.hyperledger.besu.evm.operation.RelativeJumpOperation;
+import org.hyperledger.besu.evm.operation.RelativeJumpVectorOperation;
+import org.hyperledger.besu.evm.testutils.TestMessageFrameBuilder;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.mockito.Mockito;
+
+class RelativeJumpOperationTest {
+
+  @ParameterizedTest
+  @ValueSource(ints = {1, 0, 9, -4, -5})
+  void rjumpOperation(final int jumpLength) {
+    final GasCalculator gasCalculator = mock(GasCalculator.class);
+    final MessageFrame messageFrame = mock(MessageFrame.class, Mockito.RETURNS_DEEP_STUBS);
+    final Code mockCode = mock(Code.class);
+    final String twosComplementJump = String.format("%08x", jumpLength).substring(4);
+    final int rjumpOperationIndex = 3;
+    final Bytes code = Bytes.fromHexString("00".repeat(3) + "5c" + twosComplementJump);
+
+    when(messageFrame.getCode()).thenReturn(mockCode);
+    when(mockCode.getBytes()).thenReturn(code);
+    when(messageFrame.getRemainingGas()).thenReturn(3L);
+    when(messageFrame.getPC()).thenReturn(rjumpOperationIndex);
+
+    RelativeJumpOperation rjump = new RelativeJumpOperation(gasCalculator);
+    Operation.OperationResult rjumpResult = rjump.execute(messageFrame, null);
+
+    assertThat(rjumpResult.getPcIncrement())
+        .isEqualTo(code.size() - rjumpOperationIndex + jumpLength);
+  }
+
+  @Test
+  void rjumpiOperation() {
+    final GasCalculator gasCalculator = mock(GasCalculator.class);
+    final Code mockCode = mock(Code.class);
+    final int rjumpOperationIndex = 3;
+    final Bytes code = Bytes.fromHexString("00".repeat(rjumpOperationIndex) + "5d0004");
+
+    MessageFrame messageFrame =
+        new TestMessageFrameBuilder()
+            .code(mockCode)
+            .pc(rjumpOperationIndex)
+            .initialGas(5L)
+            .pushStackItem(Bytes.EMPTY)
+            .build();
+    when(mockCode.getBytes()).thenReturn(code);
+
+    RelativeJumpIfOperation rjumpi = new RelativeJumpIfOperation(gasCalculator);
+    Operation.OperationResult rjumpResult = rjumpi.execute(messageFrame, null);
+
+    assertThat(rjumpResult.getPcIncrement()).isEqualTo(2 + 1);
+  }
+
+  @Test
+  void rjumpiHitOperation() {
+    final GasCalculator gasCalculator = mock(GasCalculator.class);
+    final Code mockCode = mock(Code.class);
+    final int rjumpOperationIndex = 3;
+    final Bytes code = Bytes.fromHexString("00".repeat(rjumpOperationIndex) + "5dfffc00");
+
+    MessageFrame messageFrame =
+        new TestMessageFrameBuilder()
+            .code(mockCode)
+            .pc(rjumpOperationIndex)
+            .initialGas(5L)
+            .pushStackItem(Words.intBytes(1))
+            .build();
+    when(mockCode.getBytes()).thenReturn(code);
+
+    RelativeJumpIfOperation rjumpi = new RelativeJumpIfOperation(gasCalculator);
+    Operation.OperationResult rjumpResult = rjumpi.execute(messageFrame, null);
+
+    assertThat(rjumpResult.getPcIncrement()).isEqualTo(-1);
+  }
+
+  @Test
+  void rjumpvOperation() {
+    final GasCalculator gasCalculator = mock(GasCalculator.class);
+    final Code mockCode = mock(Code.class);
+    final int rjumpOperationIndex = 3;
+    final int jumpVectorSize = 1;
+    final int jumpLength = 4;
+    final Bytes code =
+        Bytes.fromHexString(
+            "00".repeat(rjumpOperationIndex)
+                + String.format("5e%02x%04x", jumpVectorSize, jumpLength));
+
+    MessageFrame messageFrame =
+        new TestMessageFrameBuilder()
+            .code(mockCode)
+            .pc(rjumpOperationIndex)
+            .initialGas(5L)
+            .pushStackItem(Bytes.of(jumpVectorSize))
+            .build();
+    when(mockCode.getBytes()).thenReturn(code);
+
+    RelativeJumpVectorOperation rjumpv = new RelativeJumpVectorOperation(gasCalculator);
+    Operation.OperationResult rjumpResult = rjumpv.execute(messageFrame, null);
+
+    assertThat(rjumpResult.getPcIncrement()).isEqualTo(1 + 2 * jumpVectorSize + 1);
+  }
+
+  @ParameterizedTest
+  @ValueSource(
+      strings = {
+        "0xff",
+        "0x5f5f",
+        "0xf5f5",
+        "0x7fff",
+        "0xffff",
+        "0x5f5f5f5f",
+        "0xf5f5f5f5",
+        "0x7fffffff",
+        "0xffffffff",
+        "0x5f5f5f5f5f5f5f5f",
+        "0xf5f5f5f5f5f5f5f5",
+        "0x7fffffffffffffff",
+        "0xffffffffffffffff",
+        "0x5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+        "0xf5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5",
+        "0x7fffffffffffffffffffffffffffffff",
+        "0xffffffffffffffffffffffffffffffff",
+        "0x5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f",
+        "0xf5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5",
+        "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+      })
+  void rjumpvOverflowOperation(final String stackValue) {
+    final GasCalculator gasCalculator = mock(GasCalculator.class);
+    final Code mockCode = mock(Code.class);
+    final int rjumpOperationIndex = 3;
+    final int jumpVectorSize = 255;
+    final int jumpLength = 400;
+    final Bytes code =
+        Bytes.fromHexString(
+            "00".repeat(rjumpOperationIndex)
+                + String.format("5e%02x", jumpVectorSize)
+                + String.format("%04x", jumpLength).repeat(jumpVectorSize));
+
+    when(mockCode.getBytes()).thenReturn(code);
+    RelativeJumpVectorOperation rjumpv = new RelativeJumpVectorOperation(gasCalculator);
+    MessageFrame messageFrame =
+        new TestMessageFrameBuilder()
+            .code(mockCode)
+            .pc(rjumpOperationIndex)
+            .initialGas(5L)
+            .pushStackItem(Bytes.fromHexString(stackValue))
+            .build();
+
+    Operation.OperationResult rjumpResult = rjumpv.execute(messageFrame, null);
+
+    assertThat(rjumpResult.getPcIncrement()).isEqualTo(1 + 2 * jumpVectorSize + 1);
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = {"0x7f", "0xf5", "0x5f", "0xfe"})
+  void rjumpvIndexOperation(final String stackValue) {
+    final GasCalculator gasCalculator = mock(GasCalculator.class);
+    final Code mockCode = mock(Code.class);
+    final int rjumpOperationIndex = 3;
+    final int jumpVectorSize = 255;
+    final int jumpLength = 400;
+    final Bytes code =
+        Bytes.fromHexString(
+            "00".repeat(rjumpOperationIndex)
+                + String.format("5e%02x", jumpVectorSize)
+                + String.format("%04x", jumpLength).repeat(jumpVectorSize));
+
+    when(mockCode.getBytes()).thenReturn(code);
+    RelativeJumpVectorOperation rjumpv = new RelativeJumpVectorOperation(gasCalculator);
+    MessageFrame messageFrame =
+        new TestMessageFrameBuilder()
+            .code(mockCode)
+            .pc(rjumpOperationIndex)
+            .initialGas(5L)
+            .pushStackItem(Bytes.fromHexString(stackValue))
+            .build();
+
+    Operation.OperationResult rjumpResult = rjumpv.execute(messageFrame, null);
+
+    assertThat(rjumpResult.getPcIncrement()).isEqualTo(2 + 2 * jumpVectorSize + jumpLength);
+  }
+
+  @Test
+  void rjumpvHitOperation() {
+    final GasCalculator gasCalculator = mock(GasCalculator.class);
+    final Code mockCode = mock(Code.class);
+    final int rjumpOperationIndex = 3;
+    final int jumpVectorSize = 2;
+    final Bytes code =
+        Bytes.fromHexString("00".repeat(rjumpOperationIndex) + "5e" + "02" + "1234" + "5678");
+
+    MessageFrame messageFrame =
+        new TestMessageFrameBuilder()
+            .code(mockCode)
+            .pc(rjumpOperationIndex)
+            .initialGas(5L)
+            .pushStackItem(Bytes.of(jumpVectorSize - 1))
+            .build();
+    when(mockCode.getBytes()).thenReturn(code);
+
+    RelativeJumpVectorOperation rjumpv = new RelativeJumpVectorOperation(gasCalculator);
+    Operation.OperationResult rjumpResult = rjumpv.execute(messageFrame, null);
+
+    assertThat(rjumpResult.getPcIncrement()).isEqualTo(2 + 2 * jumpVectorSize + 0x5678);
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/RetFOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/RetFOperationTest.java
new file mode 100644
index 00000000000..fb375902260
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/operations/RetFOperationTest.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operations;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.code.CodeSection;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.ReturnStack;
+import org.hyperledger.besu.evm.operation.Operation;
+import org.hyperledger.besu.evm.operation.RetFOperation;
+import org.hyperledger.besu.evm.testutils.TestMessageFrameBuilder;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Test;
+
+class RetFOperationTest {
+
+  @Test
+  void retFHappyPath() {
+    final GasCalculator gasCalculator = mock(GasCalculator.class);
+    final Code mockCode = mock(Code.class);
+    final Bytes code = Bytes.fromHexString("00" + "b1" + "00");
+    when(mockCode.getBytes()).thenReturn(code);
+
+    final CodeSection codeSection = new CodeSection(0, 1, 2, 3, 0);
+    when(mockCode.getCodeSection(1)).thenReturn(codeSection);
+
+    MessageFrame messageFrame =
+        new TestMessageFrameBuilder()
+            .code(mockCode)
+            .pc(1)
+            .section(1)
+            .initialGas(10L)
+            .pushStackItem(Bytes.EMPTY)
+            .pushStackItem(Bytes.EMPTY)
+            .pushStackItem(Bytes.EMPTY)
+            .build();
+    messageFrame.pushReturnStackItem(new ReturnStack.ReturnStackItem(2, 3, 1));
+
+    RetFOperation retF = new RetFOperation(gasCalculator);
+    Operation.OperationResult retFResult = retF.execute(messageFrame, null);
+
+    assertThat(retFResult.getHaltReason()).isNull();
+    assertThat(retFResult.getPcIncrement()).isEqualTo(1);
+    assertThat(messageFrame.getSection()).isEqualTo(2);
+    assertThat(messageFrame.getPC()).isEqualTo(3);
+    assertThat(messageFrame.returnStackSize()).isEqualTo(1);
+  }
+
+  @Test
+  void retFFinalReturn() {
+    final GasCalculator gasCalculator = mock(GasCalculator.class);
+    final Code mockCode = mock(Code.class);
+    final Bytes code = Bytes.fromHexString("00" + "b1" + "00");
+    when(mockCode.getBytes()).thenReturn(code);
+
+    final CodeSection codeSection = new CodeSection(0, 1, 2, 3, 0);
+    when(mockCode.getCodeSection(1)).thenReturn(codeSection);
+
+    MessageFrame messageFrame =
+        new TestMessageFrameBuilder()
+            .code(mockCode)
+            .pc(1)
+            .section(1)
+            .initialGas(10L)
+            .pushStackItem(Bytes.EMPTY)
+            .pushStackItem(Bytes.EMPTY)
+            .build();
+
+    RetFOperation retF = new RetFOperation(gasCalculator);
+    Operation.OperationResult retFResult = retF.execute(messageFrame, null);
+
+    assertThat(retFResult.getHaltReason()).isNull();
+    assertThat(retFResult.getPcIncrement()).isEqualTo(1);
+    assertThat(messageFrame.getState()).isEqualTo(MessageFrame.State.CODE_SUCCESS);
+    assertThat(messageFrame.getOutputData()).isEqualTo(Bytes.EMPTY);
+  }
+
+  @Test
+  void retFIncorrectOutput() {
+    final GasCalculator gasCalculator = mock(GasCalculator.class);
+    final Code mockCode = mock(Code.class);
+    final Bytes code = Bytes.fromHexString("00" + "b1" + "00");
+    when(mockCode.getBytes()).thenReturn(code);
+
+    final CodeSection codeSection = new CodeSection(0, 1, 2, 3, 0);
+    when(mockCode.getCodeSection(1)).thenReturn(codeSection);
+
+    MessageFrame messageFrame =
+        new TestMessageFrameBuilder()
+            .code(mockCode)
+            .pc(1)
+            .section(1)
+            .initialGas(10L)
+            .pushStackItem(Bytes.EMPTY)
+            .pushStackItem(Bytes.EMPTY)
+            .pushStackItem(Bytes.EMPTY)
+            .build();
+
+    RetFOperation retF = new RetFOperation(gasCalculator);
+    Operation.OperationResult retFResult = retF.execute(messageFrame, null);
+
+    assertThat(retFResult.getHaltReason())
+        .isEqualTo(ExceptionalHaltReason.INCORRECT_CODE_SECTION_RETURN_OUTPUTS);
+    assertThat(retFResult.getPcIncrement()).isEqualTo(1);
+    assertThat(messageFrame.getSection()).isEqualTo(1);
+    assertThat(messageFrame.getPC()).isEqualTo(1);
+    assertThat(messageFrame.returnStackSize()).isZero();
+    assertThat(messageFrame.peekReturnStack()).isNull();
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/RevertOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/RevertOperationTest.java
new file mode 100644
index 00000000000..9ffc422d609
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/operations/RevertOperationTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operations;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.ConstantinopleGasCalculator;
+import org.hyperledger.besu.evm.operation.RevertOperation;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+class RevertOperationTest {
+
+  @Mock private MessageFrame messageFrame;
+  private final RevertOperation operation = new RevertOperation(new ConstantinopleGasCalculator());
+
+  private final Bytes revertReasonBytes = Bytes.fromHexString("726576657274206d657373616765");
+
+  @BeforeEach
+  void setUp() {
+    when(messageFrame.popStackItem())
+        .thenReturn(UInt256.fromHexString("0x00"))
+        .thenReturn(UInt256.fromHexString("0x0e"));
+    when(messageFrame.readMemory(0, 14)).thenReturn(revertReasonBytes);
+    when(messageFrame.memoryWordSize()).thenReturn(0);
+    when(messageFrame.calculateMemoryExpansion(anyLong(), anyLong())).thenReturn(14L);
+    when(messageFrame.getRemainingGas()).thenReturn(10_000L);
+  }
+
+  @Test
+  void shouldReturnReason() {
+    final ArgumentCaptor<Bytes> arg = ArgumentCaptor.forClass(Bytes.class);
+    operation.execute(messageFrame, null);
+    Mockito.verify(messageFrame).setRevertReason(arg.capture());
+    assertThat(arg.getValue()).isEqualTo(revertReasonBytes);
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/SStoreOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/SStoreOperationTest.java
new file mode 100644
index 00000000000..fbf21ab5102
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/operations/SStoreOperationTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operations;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.evm.frame.ExceptionalHaltReason.INSUFFICIENT_GAS;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.frame.BlockValues;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.ConstantinopleGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.operation.Operation.OperationResult;
+import org.hyperledger.besu.evm.operation.SStoreOperation;
+import org.hyperledger.besu.evm.testutils.FakeBlockValues;
+import org.hyperledger.besu.evm.testutils.TestMessageFrameBuilder;
+import org.hyperledger.besu.evm.toy.ToyWorld;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+
+import java.util.List;
+
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class SStoreOperationTest {
+
+  private static final GasCalculator gasCalculator = new ConstantinopleGasCalculator();
+
+  static Iterable<Arguments> data() {
+    return List.of(
+        Arguments.of(SStoreOperation.FRONTIER_MINIMUM, 200L, 200L, null),
+        Arguments.of(SStoreOperation.EIP_1706_MINIMUM, 200L, 200L, INSUFFICIENT_GAS),
+        Arguments.of(SStoreOperation.FRONTIER_MINIMUM, 10_000L, 10_000L, null),
+        Arguments.of(SStoreOperation.EIP_1706_MINIMUM, 10_000L, 10_000L, null),
+        Arguments.of(SStoreOperation.FRONTIER_MINIMUM, 10_000L, 200L, null),
+        Arguments.of(SStoreOperation.EIP_1706_MINIMUM, 10_000L, 200L, INSUFFICIENT_GAS));
+  }
+
+  private MessageFrame createMessageFrame(
+      final Address address, final long initialGas, final long remainingGas) {
+    final ToyWorld toyWorld = new ToyWorld();
+    final WorldUpdater worldStateUpdater = toyWorld.updater();
+    final BlockValues blockHeader = new FakeBlockValues(1337);
+    final MessageFrame frame =
+        new TestMessageFrameBuilder()
+            .address(address)
+            .worldUpdater(worldStateUpdater)
+            .blockValues(blockHeader)
+            .initialGas(initialGas)
+            .build();
+    worldStateUpdater.getOrCreate(address).getMutable().setBalance(Wei.of(1));
+    worldStateUpdater.commit();
+    frame.setGasRemaining(remainingGas);
+
+    return frame;
+  }
+
+  @ParameterizedTest(
+      name = "{index}: minimum gas {0}, initial gas {1}, remaining gas {2}, expected halt {3}")
+  @MethodSource("data")
+  void storeOperation(
+      final long minimumGasAvailable,
+      final long initialGas,
+      final long remainingGas,
+      final ExceptionalHaltReason expectedHalt) {
+    final SStoreOperation operation = new SStoreOperation(gasCalculator, minimumGasAvailable);
+    final MessageFrame frame =
+        createMessageFrame(Address.fromHexString("0x18675309"), initialGas, remainingGas);
+    frame.pushStackItem(UInt256.ZERO);
+    frame.pushStackItem(UInt256.fromHexString("0x01"));
+
+    final OperationResult result = operation.execute(frame, null);
+    assertThat(result.getHaltReason()).isEqualTo(expectedHalt);
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/SarOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/SarOperationTest.java
new file mode 100644
index 00000000000..460a7294f69
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/operations/SarOperationTest.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operations;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.gascalculator.SpuriousDragonGasCalculator;
+import org.hyperledger.besu.evm.operation.SarOperation;
+
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class SarOperationTest {
+
+  private final GasCalculator gasCalculator = new SpuriousDragonGasCalculator();
+  private final SarOperation operation = new SarOperation(gasCalculator);
+
+  static Iterable<Arguments> data() {
+    return List.of(
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000001",
+            "0x00",
+            "0x0000000000000000000000000000000000000000000000000000000000000001"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000001",
+            "0x01",
+            "0x0000000000000000000000000000000000000000000000000000000000000000"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000002",
+            "0x01",
+            "0x0000000000000000000000000000000000000000000000000000000000000001"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000004",
+            "0x01",
+            "0x0000000000000000000000000000000000000000000000000000000000000002"),
+        Arguments.of(
+            "0x000000000000000000000000000000000000000000000000000000000000000f",
+            "0x01",
+            "0x0000000000000000000000000000000000000000000000000000000000000007"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000008",
+            "0x01",
+            "0x0000000000000000000000000000000000000000000000000000000000000004"),
+        Arguments.of(
+            "0x8000000000000000000000000000000000000000000000000000000000000000",
+            "0x01",
+            "0xc000000000000000000000000000000000000000000000000000000000000000"),
+        Arguments.of(
+            "0x8000000000000000000000000000000000000000000000000000000000000000",
+            "0xff",
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"),
+        Arguments.of(
+            "0x8000000000000000000000000000000000000000000000000000000000000000",
+            "0x100",
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"),
+        Arguments.of(
+            "0x8000000000000000000000000000000000000000000000000000000000000000",
+            "0x101",
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"),
+        Arguments.of(
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "0x0",
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"),
+        Arguments.of(
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "0x01",
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"),
+        Arguments.of(
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "0xff",
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"),
+        Arguments.of(
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "0x100",
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "0x01",
+            "0x0000000000000000000000000000000000000000000000000000000000000000"),
+        Arguments.of(
+            "0x4000000000000000000000000000000000000000000000000000000000000000",
+            "0xfe",
+            "0x0000000000000000000000000000000000000000000000000000000000000001"),
+        Arguments.of(
+            "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "0xf8",
+            "0x000000000000000000000000000000000000000000000000000000000000007f"),
+        Arguments.of(
+            "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "0xfe",
+            "0x0000000000000000000000000000000000000000000000000000000000000001"),
+        Arguments.of(
+            "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "0xff",
+            "0x0000000000000000000000000000000000000000000000000000000000000000"),
+        Arguments.of(
+            "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "0x100", "0x"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000400",
+            "0x80",
+            "0x0000000000000000000000000000000000000000000000000000000000000000"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000400", "0x8000", "0x"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000400",
+            "0x80000000",
+            "0x"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000400",
+            "0x8000000000000000",
+            "0x"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000400",
+            "0x80000000000000000000000000000000",
+            "0x"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000400",
+            "0x8000000000000000000000000000000000000000000000000000000000000000",
+            "0x"),
+        Arguments.of(
+            "0x8000000000000000000000000000000000000000000000000000000000000400",
+            "0x80",
+            "0xffffffffffffffffffffffffffffffff80000000000000000000000000000000"),
+        Arguments.of(
+            "0x8000000000000000000000000000000000000000000000000000000000000400",
+            "0x8000",
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"),
+        Arguments.of(
+            "0x8000000000000000000000000000000000000000000000000000000000000400",
+            "0x80000000",
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"),
+        Arguments.of(
+            "0x8000000000000000000000000000000000000000000000000000000000000400",
+            "0x8000000000000000",
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"),
+        Arguments.of(
+            "0x8000000000000000000000000000000000000000000000000000000000000400",
+            "0x80000000000000000000000000000000",
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"),
+        Arguments.of(
+            "0x8000000000000000000000000000000000000000000000000000000000000400",
+            "0x8000000000000000000000000000000000000000000000000000000000000000",
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"));
+  }
+
+  @ParameterizedTest(name = "{index}: {0}, {1}, {2}")
+  @MethodSource("data")
+  void shiftOperation(final String number, final String shift, final String expectedResult) {
+    final MessageFrame frame = mock(MessageFrame.class);
+    when(frame.stackSize()).thenReturn(2);
+    when(frame.getRemainingGas()).thenReturn(100L);
+    when(frame.popStackItem())
+        .thenReturn(Bytes32.fromHexStringLenient(shift))
+        .thenReturn(Bytes.fromHexString(number));
+    operation.execute(frame, null);
+    verify(frame).pushStackItem(Bytes.fromHexString(expectedResult));
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/ShlOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/ShlOperationTest.java
new file mode 100644
index 00000000000..7ee283877af
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/operations/ShlOperationTest.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operations;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.gascalculator.SpuriousDragonGasCalculator;
+import org.hyperledger.besu.evm.operation.ShlOperation;
+
+import java.util.Arrays;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class ShlOperationTest {
+
+  private final GasCalculator gasCalculator = new SpuriousDragonGasCalculator();
+  private final ShlOperation operation = new ShlOperation(gasCalculator);
+
+  static Iterable<Arguments> data() {
+    return Arrays.asList(
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000001",
+            "0x00",
+            "0x0000000000000000000000000000000000000000000000000000000000000001"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000001",
+            "0x01",
+            "0x0000000000000000000000000000000000000000000000000000000000000002"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000002",
+            "0x01",
+            "0x0000000000000000000000000000000000000000000000000000000000000004"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000004",
+            "0x01",
+            "0x0000000000000000000000000000000000000000000000000000000000000008"),
+        Arguments.of(
+            "0x000000000000000000000000000000000000000000000000000000000000000f",
+            "0x01",
+            "0x000000000000000000000000000000000000000000000000000000000000001e"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000008",
+            "0x01",
+            "0x0000000000000000000000000000000000000000000000000000000000000010"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000001", "0x100", "0x"),
+        Arguments.of(
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "0x01",
+            "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "0x01",
+            "0x0000000000000000000000000000000000000000000000000000000000000000"),
+        Arguments.of(
+            "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "0x01",
+            "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000400",
+            "0x80",
+            "0x0000000000000000000000000000040000000000000000000000000000000000"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000400", "0x8000", "0x"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000400",
+            "0x80000000",
+            "0x"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000400",
+            "0x8000000000000000",
+            "0x"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000400",
+            "0x80000000000000000000000000000000",
+            "0x"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000400",
+            "0x8000000000000000000000000000000000000000000000000000000000000000",
+            "0x"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("data")
+  void shiftOperation(final String number, final String shift, final String expectedResult) {
+    final MessageFrame frame = mock(MessageFrame.class);
+    when(frame.stackSize()).thenReturn(2);
+    when(frame.getRemainingGas()).thenReturn(100L);
+    when(frame.popStackItem())
+        .thenReturn(UInt256.fromBytes(Bytes32.fromHexStringLenient(shift)))
+        .thenReturn(UInt256.fromHexString(number));
+    operation.execute(frame, null);
+    verify(frame).pushStackItem(Bytes.fromHexString(expectedResult));
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/ShrOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/ShrOperationTest.java
new file mode 100644
index 00000000000..16e5ca76319
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/operations/ShrOperationTest.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operations;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.gascalculator.SpuriousDragonGasCalculator;
+import org.hyperledger.besu.evm.operation.ShrOperation;
+
+import java.util.Arrays;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class ShrOperationTest {
+  private final GasCalculator gasCalculator = new SpuriousDragonGasCalculator();
+  private final ShrOperation operation = new ShrOperation(gasCalculator);
+
+  static Iterable<Arguments> data() {
+    return Arrays.asList(
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000001",
+            "0x00",
+            "0x0000000000000000000000000000000000000000000000000000000000000001"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000001",
+            "0x01",
+            "0x0000000000000000000000000000000000000000000000000000000000000000"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000002",
+            "0x01",
+            "0x0000000000000000000000000000000000000000000000000000000000000001"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000004",
+            "0x01",
+            "0x0000000000000000000000000000000000000000000000000000000000000002"),
+        Arguments.of(
+            "0x000000000000000000000000000000000000000000000000000000000000000f",
+            "0x01",
+            "0x0000000000000000000000000000000000000000000000000000000000000007"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000008",
+            "0x01",
+            "0x0000000000000000000000000000000000000000000000000000000000000004"),
+        Arguments.of(
+            "0x8000000000000000000000000000000000000000000000000000000000000000",
+            "0xff",
+            "0x0000000000000000000000000000000000000000000000000000000000000001"),
+        Arguments.of(
+            "0x8000000000000000000000000000000000000000000000000000000000000000", "0x100", "0x"),
+        Arguments.of(
+            "0x8000000000000000000000000000000000000000000000000000000000000000", "0x101", "0x"),
+        Arguments.of(
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "0x0",
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"),
+        Arguments.of(
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "0x01",
+            "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"),
+        Arguments.of(
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            "0xff",
+            "0x0000000000000000000000000000000000000000000000000000000000000001"),
+        Arguments.of(
+            "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "0x100", "0x"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "0x01",
+            "0x0000000000000000000000000000000000000000000000000000000000000000"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000400",
+            "0x80",
+            "0x0000000000000000000000000000000000000000000000000000000000000000"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000400", "0x8000", "0x"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000400",
+            "0x80000000",
+            "0x"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000400",
+            "0x8000000000000000",
+            "0x"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000400",
+            "0x80000000000000000000000000000000",
+            "0x"),
+        Arguments.of(
+            "0x0000000000000000000000000000000000000000000000000000000000000400",
+            "0x8000000000000000000000000000000000000000000000000000000000000000",
+            "0x"));
+  }
+
+  @ParameterizedTest
+  @MethodSource("data")
+  void shiftOperation(final String number, final String shift, final String expectedResult) {
+    final MessageFrame frame = mock(MessageFrame.class);
+    when(frame.stackSize()).thenReturn(2);
+    when(frame.getRemainingGas()).thenReturn(100L);
+    when(frame.popStackItem())
+        .thenReturn(UInt256.fromBytes(Bytes32.fromHexStringLenient(shift)))
+        .thenReturn(UInt256.fromHexString(number));
+    operation.execute(frame, null);
+    verify(frame).pushStackItem(Bytes.fromHexString(expectedResult));
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/operations/TStoreOperationTest.java b/evm/src/test/java/org/hyperledger/besu/evm/operations/TStoreOperationTest.java
new file mode 100644
index 00000000000..403bd68a7a6
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/operations/TStoreOperationTest.java
@@ -0,0 +1,593 @@
+/*
+ * Copyright Hyperledger Besu contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.operations;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.evm.frame.ExceptionalHaltReason.INSUFFICIENT_GAS;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.MainnetEVMs;
+import org.hyperledger.besu.evm.frame.BlockValues;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.CancunGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.evm.operation.Operation.OperationResult;
+import org.hyperledger.besu.evm.operation.TLoadOperation;
+import org.hyperledger.besu.evm.operation.TStoreOperation;
+import org.hyperledger.besu.evm.testutils.ByteCodeBuilder;
+import org.hyperledger.besu.evm.testutils.FakeBlockValues;
+import org.hyperledger.besu.evm.testutils.TestCodeExecutor;
+import org.hyperledger.besu.evm.testutils.TestMessageFrameBuilder;
+import org.hyperledger.besu.evm.toy.ToyWorld;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+
+import java.util.stream.Stream;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class TStoreOperationTest {
+
+  private static final GasCalculator gasCalculator = new CancunGasCalculator();
+
+  private MessageFrame createMessageFrame(
+      final Address address, final long initialGas, final long remainingGas) {
+    final ToyWorld toyWorld = new ToyWorld();
+    final WorldUpdater worldStateUpdater = toyWorld.updater();
+    final BlockValues blockHeader = new FakeBlockValues(1337);
+    final MessageFrame frame =
+        new TestMessageFrameBuilder()
+            .address(address)
+            .worldUpdater(worldStateUpdater)
+            .blockValues(blockHeader)
+            .initialGas(initialGas)
+            .build();
+    worldStateUpdater.getOrCreate(address).getMutable().setBalance(Wei.of(1));
+    worldStateUpdater.commit();
+    frame.setGasRemaining(remainingGas);
+
+    return frame;
+  }
+
+  @Test
+  void tstoreInsufficientGas() {
+    long initialGas = 10_000L;
+    long remainingGas = 99L; // TSTORE cost should be 100
+    final TStoreOperation operation = new TStoreOperation(gasCalculator);
+    final MessageFrame frame =
+        createMessageFrame(Address.fromHexString("0x18675309"), initialGas, remainingGas);
+    frame.pushStackItem(UInt256.ZERO);
+    frame.pushStackItem(UInt256.fromHexString("0x01"));
+
+    final OperationResult result = operation.execute(frame, null);
+    assertThat(result.getHaltReason()).isEqualTo(INSUFFICIENT_GAS);
+  }
+
+  @Test
+  void tStoreSimpleTest() {
+    long initialGas = 10_000L;
+    long remainingGas = 10_000L;
+    final TStoreOperation operation = new TStoreOperation(gasCalculator);
+    final MessageFrame frame =
+        createMessageFrame(Address.fromHexString("0x18675309"), initialGas, remainingGas);
+    frame.pushStackItem(UInt256.ZERO);
+    frame.pushStackItem(UInt256.fromHexString("0x01"));
+
+    final OperationResult result = operation.execute(frame, null);
+    assertThat(result.getHaltReason()).isNull();
+  }
+
+  @Test
+  void tLoadEmpty() {
+    long initialGas = 10_000L;
+    long remainingGas = 10_000L;
+    final MessageFrame frame =
+        createMessageFrame(Address.fromHexString("0x18675309"), initialGas, remainingGas);
+
+    final TLoadOperation tload = new TLoadOperation(gasCalculator);
+    frame.pushStackItem(UInt256.fromHexString("0x01"));
+    final OperationResult tloadResult = tload.execute(frame, null);
+    assertThat(tloadResult.getHaltReason()).isNull();
+    var tloadValue = frame.popStackItem();
+    assertThat(tloadValue).isEqualTo(Bytes32.ZERO);
+  }
+
+  @Test
+  void tStoreTLoad() {
+    long initialGas = 10_000L;
+    long remainingGas = 10_000L;
+    final TStoreOperation tstore = new TStoreOperation(gasCalculator);
+    final MessageFrame frame =
+        createMessageFrame(Address.fromHexString("0x18675309"), initialGas, remainingGas);
+    frame.pushStackItem(UInt256.ONE);
+    frame.pushStackItem(UInt256.fromHexString("0x01"));
+
+    final OperationResult result = tstore.execute(frame, null);
+    assertThat(result.getHaltReason()).isNull();
+
+    TLoadOperation tload = new TLoadOperation(gasCalculator);
+    frame.pushStackItem(UInt256.fromHexString("0x01"));
+    OperationResult tloadResult = tload.execute(frame, null);
+    assertThat(tloadResult.getHaltReason()).isNull();
+    UInt256 tloadValue = UInt256.fromBytes(frame.popStackItem());
+    assertThat(tloadValue).isEqualTo(UInt256.ONE);
+
+    // Loading from a different location returns default value
+    frame.pushStackItem(UInt256.fromHexString("0x02"));
+    tloadResult = tload.execute(frame, null);
+    assertThat(tloadResult.getHaltReason()).isNull();
+    tloadValue = UInt256.fromBytes(frame.popStackItem());
+    assertThat(tloadValue).isEqualTo(UInt256.ZERO);
+  }
+
+  @Test
+  void tStoreUpdate() {
+    long initialGas = 10_000L;
+    long remainingGas = 10_000L;
+    final TStoreOperation tstore = new TStoreOperation(gasCalculator);
+    final MessageFrame frame =
+        createMessageFrame(Address.fromHexString("0x18675309"), initialGas, remainingGas);
+    frame.pushStackItem(UInt256.ONE);
+    frame.pushStackItem(UInt256.fromHexString("0x01"));
+
+    OperationResult result = tstore.execute(frame, null);
+    assertThat(result.getHaltReason()).isNull();
+
+    // Store 2 at position 1
+    frame.pushStackItem(UInt256.fromHexString("0x02"));
+    frame.pushStackItem(UInt256.fromHexString("0x01"));
+
+    result = tstore.execute(frame, null);
+    assertThat(result.getHaltReason()).isNull();
+
+    final TLoadOperation tload = new TLoadOperation(gasCalculator);
+    frame.pushStackItem(UInt256.fromHexString("0x01"));
+    final OperationResult tloadResult = tload.execute(frame, null);
+    assertThat(tloadResult.getHaltReason()).isNull();
+    UInt256 tloadValue = UInt256.fromBytes(frame.popStackItem());
+    assertThat(tloadValue).isEqualTo(UInt256.fromHexString("0x02"));
+  }
+
+  // Zeroing out a transient storage slot does not result in gas refund
+  @Test
+  void noGasRefundFromTransientState() {
+    long initialGas = 10_000L;
+    long remainingGas = 10_000L;
+    final TStoreOperation tstore = new TStoreOperation(gasCalculator);
+    final MessageFrame frame =
+        createMessageFrame(Address.fromHexString("0x18675309"), initialGas, remainingGas);
+    frame.pushStackItem(UInt256.ONE);
+    frame.pushStackItem(UInt256.fromHexString("0x01"));
+
+    OperationResult result = tstore.execute(frame, null);
+    assertThat(result.getHaltReason()).isNull();
+
+    // Reset value to 0
+    frame.pushStackItem(UInt256.fromHexString("0x00"));
+    frame.pushStackItem(UInt256.fromHexString("0x01"));
+
+    result = tstore.execute(frame, null);
+    assertThat(result.getHaltReason()).isNull();
+
+    assertThat(result.getGasCost()).isEqualTo(100L);
+  }
+
+  private static final UInt256 gasLimit = UInt256.valueOf(50_000);
+  private static final Address contractAddress = Address.fromHexString("0x675910144");
+
+  static Stream<Arguments> testParameters() {
+    return Stream.of(
+        // Tests specified in EIP-1153.
+        Arguments.of(
+            "Can TSTORE",
+            null,
+            new ByteCodeBuilder().tstore(1, 1),
+            MessageFrame.State.COMPLETED_SUCCESS,
+            0,
+            1),
+        Arguments.of(
+            "Can tload uninitialized",
+            null,
+            new ByteCodeBuilder().tload(1).dataOnStackToMemory(0).returnValueAtMemory(32, 0),
+            MessageFrame.State.COMPLETED_SUCCESS,
+            0,
+            1),
+        Arguments.of(
+            "Can tload after tstore",
+            null,
+            new ByteCodeBuilder()
+                .tstore(1, 2)
+                .tload(1)
+                .dataOnStackToMemory(0)
+                .returnValueAtMemory(32, 0),
+            MessageFrame.State.COMPLETED_SUCCESS,
+            2,
+            1),
+        Arguments.of(
+            "Can tload after tstore from different location",
+            null,
+            new ByteCodeBuilder()
+                .tstore(1, 2)
+                .tload(2)
+                .dataOnStackToMemory(0)
+                .returnValueAtMemory(32, 0),
+            MessageFrame.State.COMPLETED_SUCCESS,
+            0,
+            1),
+        Arguments.of(
+            "Contracts have separate transient storage",
+            new ByteCodeBuilder().tload(1).dataOnStackToMemory(0).returnValueAtMemory(32, 0),
+            new ByteCodeBuilder()
+                .tstore(1, 2)
+                .call(ByteCodeBuilder.Operation.CALL, contractAddress, gasLimit)
+                .returnInnerCallResults(),
+            MessageFrame.State.COMPLETED_SUCCESS,
+            0,
+            1),
+        Arguments.of(
+            "Reentrant calls access the same transient storage",
+            new ByteCodeBuilder()
+                // check if caller is self
+                .callerIs(contractAddress)
+                .conditionalJump(78)
+                // non-reentrant, call self after tstore
+                .tstore(1, 8)
+                .call(ByteCodeBuilder.Operation.CALL, contractAddress, gasLimit)
+                .returnInnerCallResults()
+                // reentrant, TLOAD and return value
+                .op(ByteCodeBuilder.Operation.JUMPDEST)
+                .tload(1)
+                .dataOnStackToMemory(0)
+                .returnValueAtMemory(32, 0),
+            new ByteCodeBuilder()
+                .call(ByteCodeBuilder.Operation.CALL, contractAddress, gasLimit)
+                .returnInnerCallResults(),
+            MessageFrame.State.COMPLETED_SUCCESS,
+            8,
+            1),
+        Arguments.of(
+            "Successfully returned calls do not revert transient storage writes",
+            new ByteCodeBuilder()
+                // check if caller is self
+                .callerIs(contractAddress)
+                .conditionalJump(77)
+                // non-reentrant, call self after tstore
+                .tstore(1, 8)
+                .call(ByteCodeBuilder.Operation.CALL, contractAddress, gasLimit)
+                .tload(1)
+                .dataOnStackToMemory(0)
+                .returnValueAtMemory(32, 0)
+                // reentrant, TLOAD and return value
+                .op(ByteCodeBuilder.Operation.JUMPDEST)
+                .tstore(1, 9),
+            new ByteCodeBuilder()
+                .call(ByteCodeBuilder.Operation.CALL, contractAddress, gasLimit)
+                .returnInnerCallResults(),
+            MessageFrame.State.COMPLETED_SUCCESS,
+            9,
+            1),
+        Arguments.of(
+            "Revert undoes the transient storage write from the failed call",
+            new ByteCodeBuilder()
+                // check if caller is self
+                .callerIs(contractAddress)
+                .conditionalJump(77)
+                // non-reentrant, call self after tstore
+                .tstore(1, 8)
+                .call(ByteCodeBuilder.Operation.CALL, contractAddress, gasLimit)
+                .tload(1)
+                .dataOnStackToMemory(0)
+                .returnValueAtMemory(32, 0)
+                // reentrant, TLOAD and return value
+                .op(ByteCodeBuilder.Operation.JUMPDEST)
+                .tstore(1, 9)
+                .op(ByteCodeBuilder.Operation.REVERT),
+            new ByteCodeBuilder()
+                .call(ByteCodeBuilder.Operation.CALL, contractAddress, gasLimit)
+                .returnInnerCallResults(),
+            MessageFrame.State.COMPLETED_SUCCESS,
+            8,
+            1),
+        Arguments.of(
+            "Revert undoes all the transient storage writes to the same key from the failed call",
+            new ByteCodeBuilder()
+                // check if caller is self
+                .callerIs(contractAddress)
+                .conditionalJump(77)
+                // non-reentrant, call self after tstore
+                .tstore(1, 8)
+                .call(ByteCodeBuilder.Operation.CALL, contractAddress, gasLimit)
+                .tload(1)
+                .dataOnStackToMemory(0)
+                .returnValueAtMemory(32, 0)
+                // reentrant, TLOAD and return value
+                .op(ByteCodeBuilder.Operation.JUMPDEST)
+                .tstore(1, 9)
+                .tstore(1, 10)
+                .op(ByteCodeBuilder.Operation.REVERT),
+            new ByteCodeBuilder()
+                .call(ByteCodeBuilder.Operation.CALL, contractAddress, gasLimit)
+                .returnInnerCallResults(),
+            MessageFrame.State.COMPLETED_SUCCESS,
+            8,
+            1),
+        Arguments.of(
+            "Revert undoes transient storage writes from inner calls that successfully returned",
+            new ByteCodeBuilder()
+                // Check call depth
+                .push(0)
+                .op(ByteCodeBuilder.Operation.CALLDATALOAD)
+                // Store input in mem and reload it to stack
+                .dataOnStackToMemory(5)
+                .push(5)
+                .op(ByteCodeBuilder.Operation.MLOAD)
+
+                // See if we're at call depth 1
+                .push(1)
+                .op(ByteCodeBuilder.Operation.EQ)
+                .conditionalJump(84)
+
+                // See if we're at call depth 2
+                .push(5)
+                .op(ByteCodeBuilder.Operation.MLOAD)
+                .push(2)
+                .op(ByteCodeBuilder.Operation.EQ)
+                .conditionalJump(135)
+
+                // Call depth = 0, call self after TSTORE 8
+                .tstore(1, 8)
+
+                // Recursive call with input
+                // Depth++
+                .push(5)
+                .op(ByteCodeBuilder.Operation.MLOAD)
+                .push(1)
+                .op(ByteCodeBuilder.Operation.ADD)
+                .callWithInput(ByteCodeBuilder.Operation.CALL, contractAddress, gasLimit)
+
+                // TLOAD and return value
+                .tload(1)
+                .dataOnStackToMemory(0)
+                .returnValueAtMemory(32, 0)
+
+                // Call depth 1, TSTORE 9 but REVERT after recursion
+                .op(ByteCodeBuilder.Operation.JUMPDEST)
+                .tstore(1, 9)
+
+                // Recursive call with input
+                // Depth++
+                .push(5)
+                .op(ByteCodeBuilder.Operation.MLOAD)
+                .push(1)
+                .op(ByteCodeBuilder.Operation.ADD)
+                .callWithInput(ByteCodeBuilder.Operation.CALL, contractAddress, gasLimit)
+                .op(ByteCodeBuilder.Operation.REVERT)
+
+                // Call depth 2, TSTORE 10 and complete
+                .op(ByteCodeBuilder.Operation.JUMPDEST)
+                .tstore(1, 10),
+            new ByteCodeBuilder()
+                // Call with input 0
+                .callWithInput(
+                    ByteCodeBuilder.Operation.CALL, contractAddress, gasLimit, UInt256.valueOf(0))
+                .returnInnerCallResults(),
+            MessageFrame.State.COMPLETED_SUCCESS,
+            8,
+            1),
+        Arguments.of(
+            "Transient storage cannot be manipulated in a static context",
+            new ByteCodeBuilder()
+                .tstore(1, 8)
+                .tload(1)
+                .dataOnStackToMemory(0)
+                .returnValueAtMemory(32, 0),
+            new ByteCodeBuilder()
+                .call(ByteCodeBuilder.Operation.STATICCALL, contractAddress, gasLimit)
+                .returnInnerCallResults(),
+            MessageFrame.State.COMPLETED_FAILED,
+            0,
+            1),
+        Arguments.of(
+            "Transient storage cannot be manipulated in a static context when calling self",
+            new ByteCodeBuilder()
+                // Check if caller is self
+                .callerIs(contractAddress)
+                .conditionalJump(82)
+
+                // Non-reentrant, call self after TSTORE 8
+                .tstore(1, 8)
+                .callWithInput(
+                    ByteCodeBuilder.Operation.STATICCALL,
+                    contractAddress,
+                    gasLimit,
+                    UInt256.valueOf(0))
+                // Return the TLOAD value
+                // Should be 8 if call fails, 9 if success
+                .tload(1)
+                .dataOnStackToMemory(0)
+                .returnValueAtMemory(32, 0)
+
+                // Reentrant, TSTORE 9
+                .op(ByteCodeBuilder.Operation.JUMPDEST)
+                .tstore(1, 9),
+            new ByteCodeBuilder()
+                .call(ByteCodeBuilder.Operation.CALL, contractAddress, gasLimit)
+                .returnInnerCallResults(),
+            MessageFrame.State.COMPLETED_SUCCESS,
+            8,
+            1),
+        Arguments.of(
+            "Transient storage cannot be manipulated in a nested static context",
+            new ByteCodeBuilder()
+                // Check call depth
+                .push(0)
+                .op(ByteCodeBuilder.Operation.CALLDATALOAD)
+                // Store input in mem and reload it to stack
+                .dataOnStackToMemory(5)
+                .push(5)
+                .op(ByteCodeBuilder.Operation.MLOAD)
+
+                // See if we're at call depth 1
+                .push(1)
+                .op(ByteCodeBuilder.Operation.EQ)
+                .conditionalJump(84)
+
+                // See if we're at call depth 2
+                .push(5)
+                .op(ByteCodeBuilder.Operation.MLOAD)
+                .push(2)
+                .op(ByteCodeBuilder.Operation.EQ)
+                .conditionalJump(140)
+
+                // Call depth = 0, call self after TSTORE 8
+                .tstore(1, 8)
+
+                // Recursive call with input
+                // Depth++
+                .push(5)
+                .op(ByteCodeBuilder.Operation.MLOAD)
+                .push(1)
+                .op(ByteCodeBuilder.Operation.ADD)
+                .callWithInput(ByteCodeBuilder.Operation.STATICCALL, contractAddress, gasLimit)
+
+                // TLOAD and return value
+                .tload(1)
+                .dataOnStackToMemory(0)
+                .returnValueAtMemory(32, 0)
+
+                // Call depth 1, TSTORE 9 but REVERT after recursion
+                .op(ByteCodeBuilder.Operation.JUMPDEST) // 84
+
+                // Recursive call with input
+                // Depth++
+                .push(5)
+                .op(ByteCodeBuilder.Operation.MLOAD)
+                .push(1)
+                .op(ByteCodeBuilder.Operation.ADD)
+                .callWithInput(ByteCodeBuilder.Operation.CALL, contractAddress, gasLimit)
+
+                // TLOAD and return value
+                .tload(1)
+                .dataOnStackToMemory(0)
+                .returnValueAtMemory(32, 0)
+
+                // Call depth 2, TSTORE 10 and complete
+                .op(ByteCodeBuilder.Operation.JUMPDEST) // 140
+                .tstore(1, 10) // this call will fail
+            ,
+            new ByteCodeBuilder()
+                // Call with input 0
+                .callWithInput(
+                    ByteCodeBuilder.Operation.CALL, contractAddress, gasLimit, UInt256.valueOf(0))
+                .returnInnerCallResults(),
+            MessageFrame.State.COMPLETED_SUCCESS,
+            8,
+            1),
+        Arguments.of(
+            "Delegatecall manipulates transient storage in the context of the current address",
+            new ByteCodeBuilder().tstore(1, 8),
+            new ByteCodeBuilder()
+                .tstore(1, 7)
+                .call(ByteCodeBuilder.Operation.DELEGATECALL, contractAddress, gasLimit)
+                .tload(1)
+                .dataOnStackToMemory(0)
+                .returnValueAtMemory(32, 0),
+            MessageFrame.State.COMPLETED_SUCCESS,
+            8,
+            1),
+        Arguments.of(
+            "Zeroing out a transient storage slot does not result in gas refund",
+            null,
+            new ByteCodeBuilder().tstore(1, 7).tstore(1, 0),
+            MessageFrame.State.COMPLETED_SUCCESS,
+            0,
+            1),
+        Arguments.of(
+            "Transient storage can be accessed in a static context when calling self",
+            new ByteCodeBuilder()
+                // Check if caller is self
+                .callerIs(contractAddress)
+                .conditionalJump(78)
+
+                // Non-reentrant, call self after TSTORE 8
+                .tstore(1, 8)
+                .call(ByteCodeBuilder.Operation.STATICCALL, contractAddress, gasLimit)
+                .returnInnerCallResults()
+
+                // Reentrant, TLOAD and return
+                .op(ByteCodeBuilder.Operation.JUMPDEST)
+                .tload(1)
+                .dataOnStackToMemory(0)
+                .returnValueAtMemory(32, 0),
+            new ByteCodeBuilder()
+                .call(ByteCodeBuilder.Operation.CALL, contractAddress, gasLimit)
+                .returnInnerCallResults(),
+            MessageFrame.State.COMPLETED_SUCCESS,
+            8,
+            1),
+        Arguments.of(
+            "Transient storage does not persist beyond a single transaction. The tstore should not have any impact on the second call",
+            new ByteCodeBuilder()
+                .tload(1)
+                .tstore(1, 1)
+                .dataOnStackToMemory(0)
+                .returnValueAtMemory(32, 0),
+            new ByteCodeBuilder()
+                .call(ByteCodeBuilder.Operation.CALL, contractAddress, gasLimit)
+                .returnInnerCallResults(),
+            MessageFrame.State.COMPLETED_SUCCESS,
+            0,
+            2));
+  }
+
+  @ParameterizedTest(name = "{0}")
+  @MethodSource("testParameters")
+  void transientStorageExecutionTest(
+      final String ignoredName,
+      final ByteCodeBuilder contractByteCodeBuilder,
+      final ByteCodeBuilder byteCodeBuilder,
+      final MessageFrame.State expectedResultState,
+      final int expectedReturnValue,
+      final int numberOfIterations) {
+
+    TestCodeExecutor codeExecutor =
+        new TestCodeExecutor(MainnetEVMs.cancun(EvmConfiguration.DEFAULT));
+
+    // Pre-deploy the contract if it's specified
+    WorldUpdater worldUpdater =
+        TestCodeExecutor.createInitialWorldState(
+            account -> account.setStorageValue(UInt256.ZERO, UInt256.valueOf(0)));
+    if (contractByteCodeBuilder != null) {
+      WorldUpdater updater = worldUpdater.updater();
+      TestCodeExecutor.deployContract(updater, contractAddress, contractByteCodeBuilder.toString());
+      updater.commit();
+    }
+    for (int i = 0; i < numberOfIterations; i++) {
+      final MessageFrame frame =
+          codeExecutor.executeCode(
+              byteCodeBuilder.toString(), gasLimit.toLong(), worldUpdater.updater());
+
+      assertThat(frame.getState()).isEqualTo(expectedResultState);
+      assertThat(frame.getGasRefund()).isZero();
+      assertThat(UInt256.fromBytes(frame.getOutputData()).toInt()).isEqualTo(expectedReturnValue);
+    }
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128PairingPrecompiledContractTest.java b/evm/src/test/java/org/hyperledger/besu/evm/precompile/AltBN128PairingPrecompiledContractTest.java
similarity index 85%
rename from ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128PairingPrecompiledContractTest.java
rename to evm/src/test/java/org/hyperledger/besu/evm/precompile/AltBN128PairingPrecompiledContractTest.java
index ee7da91ea66..af78f975b77 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/AltBN128PairingPrecompiledContractTest.java
+++ b/evm/src/test/java/org/hyperledger/besu/evm/precompile/AltBN128PairingPrecompiledContractTest.java
@@ -12,22 +12,21 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
+package org.hyperledger.besu.evm.precompile;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.vm.GasCalculator;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
-public class AltBN128PairingPrecompiledContractTest {
+@ExtendWith(MockitoExtension.class)
+class AltBN128PairingPrecompiledContractTest {
 
   @Mock MessageFrame messageFrame;
   @Mock GasCalculator gasCalculator;
@@ -38,13 +37,13 @@ public class AltBN128PairingPrecompiledContractTest {
       AltBN128PairingPrecompiledContract.istanbul(gasCalculator);
 
   @Test
-  public void compute_validPoints() {
+  void compute_validPoints() {
     final Bytes input = validPointBytes();
-    final Bytes result = byzantiumContract.compute(input, messageFrame);
+    final Bytes result = byzantiumContract.computePrecompile(input, messageFrame).getOutput();
     assertThat(result).isEqualTo(AltBN128PairingPrecompiledContract.TRUE);
   }
 
-  public Bytes validPointBytes() {
+  Bytes validPointBytes() {
     final Bytes g1Point0 =
         Bytes.concatenate(
             Bytes.fromHexString(
@@ -82,7 +81,7 @@ public Bytes validPointBytes() {
   }
 
   @Test
-  public void compute_invalidPointsOutsideSubgroupG2() {
+  void compute_invalidPointsOutsideSubgroupG2() {
     final Bytes g1Point0 =
         Bytes.concatenate(
             Bytes.fromHexString(
@@ -117,17 +116,17 @@ public void compute_invalidPointsOutsideSubgroupG2() {
                 "0x1fbf8045ce3e79b5cde4112d38bcd0efbdb1295d2eefdf58151ae309d7ded7db"));
 
     final Bytes input = Bytes.concatenate(g1Point0, g2Point0, g1Point1, g2Point1);
-    final Bytes result = byzantiumContract.compute(input, messageFrame);
+    final Bytes result = byzantiumContract.computePrecompile(input, messageFrame).getOutput();
     assertThat(result).isNull();
   }
 
   @Test
-  public void gasPrice_byzantium() {
-    assertThat(byzantiumContract.gasRequirement(validPointBytes())).isEqualTo(Gas.of(260_000));
+  void gasPrice_byzantium() {
+    assertThat(byzantiumContract.gasRequirement(validPointBytes())).isEqualTo(260_000L);
   }
 
   @Test
-  public void gasPrice_istanbul() {
-    assertThat(istanbulContract.gasRequirement(validPointBytes())).isEqualTo(Gas.of(113_000));
+  void gasPrice_istanbul() {
+    assertThat(istanbulContract.gasRequirement(validPointBytes())).isEqualTo(113_000L);
   }
 }
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLAKE2BFPrecompileContractTest.java b/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLAKE2BFPrecompileContractTest.java
new file mode 100644
index 00000000000..c449f3e0827
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLAKE2BFPrecompileContractTest.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.PetersburgGasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class BLAKE2BFPrecompileContractTest {
+  private final BLAKE2BFPrecompileContract contract =
+      new BLAKE2BFPrecompileContract(new PetersburgGasCalculator());
+
+  BLAKE2BFPrecompileContractTest() {}
+
+  private final MessageFrame messageFrame = mock(MessageFrame.class);
+
+  static Arguments[] parameters() {
+    return new Arguments[] {
+      Arguments.of( // https://tools.ietf.org/html/rfc7693#appendix-A
+          "0000000c48c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001",
+          "ba80a53f981c4d0d6a2797b69f12f6e94c212f14685ac4b74b12bb6fdbffa2d17d87c5392aab792dc252d5de4533cc9518d38aa8dbf1925ab92386edd4009923",
+          12),
+      Arguments.of( // https://tools.ietf.org/html/rfc7693#appendix-A, not final
+          "0000000c48c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000",
+          "75ab69d3190a562c51aef8d88f1c2775876944407270c42c9844252c26d2875298743e7f6d5ea2f2d3e8d226039cd31b4e426ac4f2d3d666a610c2116fde4735",
+          12),
+      Arguments.of( // as above, but 8 million rounds.
+          "007a120048c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001",
+          "6d2ce9e534d50e18ff866ae92d70cceba79bbcd14c63819fe48752c8aca87a4bb7dcc230d22a4047f0486cfcfb50a17b24b2899eb8fca370f22240adb5170189",
+          8_000_000),
+      Arguments.of( // empty
+          "", null, 0),
+      Arguments.of( // too long
+          "0000000c48c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b6162630000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000001",
+          null,
+          0),
+      Arguments.of( // too short
+          "0000000c48c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b616263000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000001",
+          null,
+          0),
+      Arguments.of( // bad final
+          "0000000c48c9bdf267e6096a3ba7ca8485ae67bb2bf894fe72f36e3cf1361d5f3af54fa5d182e6ad7f520e511f6c3e2b8c68059b6bbd41fbabd9831f79217e1319cde05b61626300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000011",
+          null,
+          0),
+    };
+  }
+
+  @ParameterizedTest
+  @MethodSource("parameters")
+  void shouldRunFCompression(
+      final String inputString, final String expectedResult, final long expectedGasUsed) {
+
+    final Bytes input = Bytes.fromHexString(inputString);
+    final Bytes expectedComputation =
+        expectedResult == null ? null : Bytes.fromHexString(expectedResult);
+    assertThat(contract.computePrecompile(input, messageFrame).getOutput())
+        .isEqualTo(expectedComputation);
+    assertThat(contract.gasRequirement(input)).isEqualTo(expectedGasUsed);
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12G1AddPrecompiledContractTest.java b/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12G1AddPrecompiledContractTest.java
new file mode 100644
index 00000000000..293976e7f8b
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12G1AddPrecompiledContractTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+import org.hyperledger.besu.evm.frame.MessageFrame;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import com.google.common.io.CharStreams;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
+
+class BLS12G1AddPrecompiledContractTest {
+
+  final BLS12G1AddPrecompiledContract contract = new BLS12G1AddPrecompiledContract();
+
+  private final MessageFrame messageFrame = mock(MessageFrame.class);
+
+  static Iterable<Arguments> parameters() throws IOException {
+    return CharStreams.readLines(
+            new InputStreamReader(
+                Objects.requireNonNull(
+                    BLS12G1AddPrecompiledContractTest.class.getResourceAsStream("g1_add.csv")),
+                UTF_8))
+        .stream()
+        .map(line -> Arguments.of((Object[]) line.split(",", 4)))
+        .collect(Collectors.toList());
+  }
+
+  @ParameterizedTest
+  @MethodSource("parameters")
+  void shouldCalculate(
+      final String inputString,
+      final String expectedResult,
+      final String expectedGasUsed,
+      final String notes) {
+
+    if ("input".equals(inputString)) {
+      // skip the header row
+      return;
+    }
+    final Bytes input = Bytes.fromHexString(inputString);
+    final Bytes expectedComputation =
+        expectedResult == null ? null : Bytes.fromHexString(expectedResult);
+    final PrecompiledContract.PrecompileContractResult result =
+        contract.computePrecompile(input, messageFrame);
+    Bytes actualComputation = result.getOutput();
+    if (actualComputation == null) {
+      final ArgumentCaptor<Bytes> revertReason = ArgumentCaptor.forClass(Bytes.class);
+      Mockito.verify(messageFrame).setRevertReason(revertReason.capture());
+      assertThat(new String(revertReason.getValue().toArrayUnsafe(), UTF_8)).isEqualTo(notes);
+
+      assertThat(expectedComputation.size()).isZero();
+    } else {
+      assertThat(actualComputation).isEqualTo(expectedComputation);
+      assertThat(contract.gasRequirement(input)).isEqualTo(Long.parseLong(expectedGasUsed));
+    }
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12G1MulPrecompiledContractTest.java b/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12G1MulPrecompiledContractTest.java
new file mode 100644
index 00000000000..bb5a2e1cb80
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12G1MulPrecompiledContractTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import org.hyperledger.besu.evm.frame.MessageFrame;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import com.google.common.io.CharStreams;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.ArgumentCaptor;
+
+class BLS12G1MulPrecompiledContractTest {
+
+  final BLS12G1MulPrecompiledContract contract = new BLS12G1MulPrecompiledContract();
+
+  private final MessageFrame messageFrame = mock(MessageFrame.class);
+
+  static Iterable<Arguments> parameters() throws IOException {
+    return CharStreams.readLines(
+            new InputStreamReader(
+                Objects.requireNonNull(
+                    BLS12G1MulPrecompiledContractTest.class.getResourceAsStream("g1_mul.csv")),
+                UTF_8))
+        .stream()
+        .map(line -> Arguments.of((Object[]) line.split(",", 4)))
+        .collect(Collectors.toList());
+  }
+
+  @ParameterizedTest
+  @MethodSource("parameters")
+  void shouldCalculate(
+      final String inputString,
+      final String expectedResult,
+      final String expectedGasUsed,
+      final String notes) {
+
+    if ("input".equals(inputString)) {
+      // skip the header row
+      return;
+    }
+    final Bytes input = Bytes.fromHexString(inputString);
+    final Bytes expectedComputation =
+        expectedResult == null ? null : Bytes.fromHexString(expectedResult);
+    final PrecompiledContract.PrecompileContractResult result =
+        contract.computePrecompile(input, messageFrame);
+    Bytes actualComputation = result.getOutput();
+    if (actualComputation == null) {
+      final ArgumentCaptor<Bytes> revertReason = ArgumentCaptor.forClass(Bytes.class);
+      verify(messageFrame).setRevertReason(revertReason.capture());
+      assertThat(new String(revertReason.getValue().toArrayUnsafe(), UTF_8)).isEqualTo(notes);
+
+      assertThat(expectedComputation.size()).isZero();
+    } else {
+      assertThat(actualComputation).isEqualTo(expectedComputation);
+      assertThat(contract.gasRequirement(input)).isEqualTo(Long.parseLong(expectedGasUsed));
+    }
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12G1MultiExpPrecompiledContractTest.java b/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12G1MultiExpPrecompiledContractTest.java
new file mode 100644
index 00000000000..b4d21661f11
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12G1MultiExpPrecompiledContractTest.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import org.hyperledger.besu.evm.frame.MessageFrame;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import com.google.common.io.CharStreams;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.ArgumentCaptor;
+
+class BLS12G1MultiExpPrecompiledContractTest {
+
+  final BLS12G1MultiExpPrecompiledContract contract = new BLS12G1MultiExpPrecompiledContract();
+
+  private final MessageFrame messageFrame = mock(MessageFrame.class);
+
+  static Iterable<Arguments> parameters() throws IOException {
+    return CharStreams.readLines(
+            new InputStreamReader(
+                Objects.requireNonNull(
+                    BLS12G1MultiExpPrecompiledContractTest.class.getResourceAsStream(
+                        "g1_multiexp.csv")),
+                UTF_8))
+        .stream()
+        .map(line -> Arguments.of((Object[]) line.split(",", 4)))
+        .collect(Collectors.toList());
+  }
+
+  @ParameterizedTest
+  @MethodSource("parameters")
+  void shouldCalculate(
+      final String inputString,
+      final String expectedResult,
+      final String expectedGasUsed,
+      final String notes) {
+
+    if ("input".equals(inputString)) {
+      // skip the header row
+      return;
+    }
+    final Bytes input = Bytes.fromHexString(inputString);
+    final Bytes expectedComputation =
+        expectedResult == null ? null : Bytes.fromHexString(expectedResult);
+    final PrecompiledContract.PrecompileContractResult result =
+        contract.computePrecompile(input, messageFrame);
+    Bytes actualComputation = result.getOutput();
+    if (actualComputation == null) {
+      final ArgumentCaptor<Bytes> revertReason = ArgumentCaptor.forClass(Bytes.class);
+      verify(messageFrame).setRevertReason(revertReason.capture());
+      assertThat(new String(revertReason.getValue().toArrayUnsafe(), UTF_8)).isEqualTo(notes);
+
+      assertThat(expectedComputation.size()).isZero();
+    } else {
+      assertThat(actualComputation).isEqualTo(expectedComputation);
+      assertThat(contract.gasRequirement(input)).isEqualTo(Long.parseLong(expectedGasUsed));
+    }
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12G2AddPrecompiledContractTest.java b/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12G2AddPrecompiledContractTest.java
new file mode 100644
index 00000000000..b2865c57ebf
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12G2AddPrecompiledContractTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import org.hyperledger.besu.evm.frame.MessageFrame;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import com.google.common.io.CharStreams;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.ArgumentCaptor;
+
+class BLS12G2AddPrecompiledContractTest {
+
+  final BLS12G2AddPrecompiledContract contract = new BLS12G2AddPrecompiledContract();
+
+  private final MessageFrame messageFrame = mock(MessageFrame.class);
+
+  static Iterable<Arguments> parameters() throws IOException {
+    return CharStreams.readLines(
+            new InputStreamReader(
+                Objects.requireNonNull(
+                    BLS12G2AddPrecompiledContractTest.class.getResourceAsStream("g2_add.csv")),
+                UTF_8))
+        .stream()
+        .map(line -> Arguments.of((Object[]) line.split(",", 4)))
+        .collect(Collectors.toList());
+  }
+
+  @ParameterizedTest
+  @MethodSource("parameters")
+  void shouldCalculate(
+      final String inputString,
+      final String expectedResult,
+      final String expectedGasUsed,
+      final String notes) {
+
+    if ("input".equals(inputString)) {
+      // skip the header row
+      return;
+    }
+    final Bytes input = Bytes.fromHexString(inputString);
+    final Bytes expectedComputation =
+        expectedResult == null ? null : Bytes.fromHexString(expectedResult);
+    final PrecompiledContract.PrecompileContractResult result =
+        contract.computePrecompile(input, messageFrame);
+    Bytes actualComputation = result.getOutput();
+    if (actualComputation == null) {
+      final ArgumentCaptor<Bytes> revertReason = ArgumentCaptor.forClass(Bytes.class);
+      verify(messageFrame).setRevertReason(revertReason.capture());
+      assertThat(new String(revertReason.getValue().toArrayUnsafe(), UTF_8)).isEqualTo(notes);
+
+      assertThat(expectedComputation.size()).isZero();
+    } else {
+      assertThat(actualComputation).isEqualTo(expectedComputation);
+      assertThat(contract.gasRequirement(input)).isEqualTo(Long.parseLong(expectedGasUsed));
+    }
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12G2MulPrecompiledContractTest.java b/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12G2MulPrecompiledContractTest.java
new file mode 100644
index 00000000000..b33cfb73cea
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12G2MulPrecompiledContractTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import org.hyperledger.besu.evm.frame.MessageFrame;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import com.google.common.io.CharStreams;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.ArgumentCaptor;
+
+class BLS12G2MulPrecompiledContractTest {
+
+  final BLS12G2MulPrecompiledContract contract = new BLS12G2MulPrecompiledContract();
+
+  private final MessageFrame messageFrame = mock(MessageFrame.class);
+
+  static Iterable<Arguments> parameters() throws IOException {
+    return CharStreams.readLines(
+            new InputStreamReader(
+                Objects.requireNonNull(
+                    BLS12G2MulPrecompiledContractTest.class.getResourceAsStream("g2_mul.csv")),
+                UTF_8))
+        .stream()
+        .map(line -> Arguments.of((Object[]) line.split(",", 4)))
+        .collect(Collectors.toList());
+  }
+
+  @ParameterizedTest
+  @MethodSource("parameters")
+  void shouldCalculate(
+      final String inputString,
+      final String expectedResult,
+      final String expectedGasUsed,
+      final String notes) {
+
+    if ("input".equals(inputString)) {
+      // skip the header row
+      return;
+    }
+    final Bytes input = Bytes.fromHexString(inputString);
+    final Bytes expectedComputation =
+        expectedResult == null ? null : Bytes.fromHexString(expectedResult);
+    final PrecompiledContract.PrecompileContractResult result =
+        contract.computePrecompile(input, messageFrame);
+    Bytes actualComputation = result.getOutput();
+    if (actualComputation == null) {
+      final ArgumentCaptor<Bytes> revertReason = ArgumentCaptor.forClass(Bytes.class);
+      verify(messageFrame).setRevertReason(revertReason.capture());
+      assertThat(new String(revertReason.getValue().toArrayUnsafe(), UTF_8)).isEqualTo(notes);
+
+      assertThat(expectedComputation.size()).isZero();
+    } else {
+      assertThat(actualComputation).isEqualTo(expectedComputation);
+      assertThat(contract.gasRequirement(input)).isEqualTo(Long.parseLong(expectedGasUsed));
+    }
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12G2MultiExpPrecompiledContractTest.java b/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12G2MultiExpPrecompiledContractTest.java
new file mode 100644
index 00000000000..21f9084d570
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12G2MultiExpPrecompiledContractTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import org.hyperledger.besu.evm.frame.MessageFrame;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Objects;
+
+import com.google.common.io.CharStreams;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.ArgumentCaptor;
+
+class BLS12G2MultiExpPrecompiledContractTest {
+
+  final BLS12G2MultiExpPrecompiledContract contract = new BLS12G2MultiExpPrecompiledContract();
+
+  private final MessageFrame messageFrame = mock(MessageFrame.class);
+
+  static Iterable<Arguments> parameters() throws IOException {
+    return CharStreams.readLines(
+            new InputStreamReader(
+                Objects.requireNonNull(
+                    BLS12G2MultiExpPrecompiledContractTest.class.getResourceAsStream(
+                        "g2_multiexp.csv")),
+                UTF_8))
+        .stream()
+        .map(line -> Arguments.of((Object[]) line.split(",", 4)))
+        .toList();
+  }
+
+  @ParameterizedTest
+  @MethodSource("parameters")
+  void shouldCalculate(
+      final String inputString,
+      final String expectedResult,
+      final String expectedGasUsed,
+      final String notes) {
+
+    if ("input".equals(inputString)) {
+      // skip the header row
+      return;
+    }
+    final Bytes input = Bytes.fromHexString(inputString);
+    final Bytes expectedComputation =
+        expectedResult == null ? null : Bytes.fromHexString(expectedResult);
+    final PrecompiledContract.PrecompileContractResult result =
+        contract.computePrecompile(input, messageFrame);
+    Bytes actualComputation = result.getOutput();
+    if (actualComputation == null) {
+      final ArgumentCaptor<Bytes> revertReason = ArgumentCaptor.forClass(Bytes.class);
+      verify(messageFrame).setRevertReason(revertReason.capture());
+      assertThat(new String(revertReason.getValue().toArrayUnsafe(), UTF_8)).isEqualTo(notes);
+
+      assertThat(expectedComputation.size()).isZero();
+    } else {
+      assertThat(actualComputation).isEqualTo(expectedComputation);
+      assertThat(contract.gasRequirement(input)).isEqualTo(Long.parseLong(expectedGasUsed));
+    }
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12MapFp2ToG2PrecompiledContractTest.java b/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12MapFp2ToG2PrecompiledContractTest.java
new file mode 100644
index 00000000000..c90e2a1eb41
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12MapFp2ToG2PrecompiledContractTest.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import org.hyperledger.besu.evm.frame.MessageFrame;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import com.google.common.io.CharStreams;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.ArgumentCaptor;
+
+class BLS12MapFp2ToG2PrecompiledContractTest {
+
+  final BLS12MapFp2ToG2PrecompiledContract contract = new BLS12MapFp2ToG2PrecompiledContract();
+
+  private final MessageFrame messageFrame = mock(MessageFrame.class);
+
+  static Iterable<Arguments> parameters() throws IOException {
+    return CharStreams.readLines(
+            new InputStreamReader(
+                Objects.requireNonNull(
+                    BLS12MapFp2ToG2PrecompiledContractTest.class.getResourceAsStream(
+                        "fp2_to_g2.csv")),
+                UTF_8))
+        .stream()
+        .map(line -> Arguments.of((Object[]) line.split(",", 4)))
+        .collect(Collectors.toList());
+  }
+
+  @ParameterizedTest
+  @MethodSource("parameters")
+  void shouldCalculate(
+      final String inputString,
+      final String expectedResult,
+      final String expectedGasUsed,
+      final String notes) {
+
+    if ("input".equals(inputString)) {
+      // skip the header row
+      return;
+    }
+    final Bytes input = Bytes.fromHexString(inputString);
+    final Bytes expectedComputation =
+        expectedResult == null ? null : Bytes.fromHexString(expectedResult);
+    final PrecompiledContract.PrecompileContractResult result =
+        contract.computePrecompile(input, messageFrame);
+    Bytes actualComputation = result.getOutput();
+    if (actualComputation == null) {
+      final ArgumentCaptor<Bytes> revertReason = ArgumentCaptor.forClass(Bytes.class);
+      verify(messageFrame).setRevertReason(revertReason.capture());
+      assertThat(new String(revertReason.getValue().toArrayUnsafe(), UTF_8)).isEqualTo(notes);
+
+      assertThat(expectedComputation.size()).isZero();
+    } else {
+      assertThat(actualComputation).isEqualTo(expectedComputation);
+      assertThat(contract.gasRequirement(input)).isEqualTo(Long.parseLong(expectedGasUsed));
+    }
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12MapFpToG1PrecompiledContractTest.java b/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12MapFpToG1PrecompiledContractTest.java
new file mode 100644
index 00000000000..6f269b7880f
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12MapFpToG1PrecompiledContractTest.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import org.hyperledger.besu.evm.frame.MessageFrame;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import com.google.common.io.CharStreams;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.ArgumentCaptor;
+
+class BLS12MapFpToG1PrecompiledContractTest {
+
+  final BLS12MapFpToG1PrecompiledContract contract = new BLS12MapFpToG1PrecompiledContract();
+
+  private final MessageFrame messageFrame = mock(MessageFrame.class);
+
+  static Iterable<Arguments> parameters() throws IOException {
+    return CharStreams.readLines(
+            new InputStreamReader(
+                Objects.requireNonNull(
+                    BLS12MapFpToG1PrecompiledContractTest.class.getResourceAsStream(
+                        "fp_to_g1.csv")),
+                UTF_8))
+        .stream()
+        .map(line -> Arguments.of((Object[]) line.split(",", 4)))
+        .collect(Collectors.toList());
+  }
+
+  @ParameterizedTest
+  @MethodSource("parameters")
+  void shouldCalculate(
+      final String inputString,
+      final String expectedResult,
+      final String expectedGasUsed,
+      final String notes) {
+
+    if ("input".equals(inputString)) {
+      // skip the header row
+      return;
+    }
+    final Bytes input = Bytes.fromHexString(inputString);
+    final Bytes expectedComputation =
+        expectedResult == null ? null : Bytes.fromHexString(expectedResult);
+    final PrecompiledContract.PrecompileContractResult result =
+        contract.computePrecompile(input, messageFrame);
+    Bytes actualComputation = result.getOutput();
+    if (actualComputation == null) {
+      final ArgumentCaptor<Bytes> revertReason = ArgumentCaptor.forClass(Bytes.class);
+      verify(messageFrame).setRevertReason(revertReason.capture());
+      assertThat(new String(revertReason.getValue().toArrayUnsafe(), UTF_8)).isEqualTo(notes);
+
+      assertThat(expectedComputation.size()).isZero();
+    } else {
+      assertThat(actualComputation).isEqualTo(expectedComputation);
+      assertThat(contract.gasRequirement(input)).isEqualTo(Long.parseLong(expectedGasUsed));
+    }
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12PairingPrecompiledContractTest.java b/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12PairingPrecompiledContractTest.java
new file mode 100644
index 00000000000..a1e3b49fc25
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/precompile/BLS12PairingPrecompiledContractTest.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import org.hyperledger.besu.evm.frame.MessageFrame;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import com.google.common.collect.Streams;
+import com.google.common.io.CharStreams;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.ArgumentCaptor;
+
+class BLS12PairingPrecompiledContractTest {
+
+  final BLS12PairingPrecompiledContract contract = new BLS12PairingPrecompiledContract();
+
+  private final MessageFrame messageFrame = mock(MessageFrame.class);
+
+  static Iterable<Arguments> parameters() throws IOException {
+    return Streams.concat(
+            CharStreams.readLines(
+                new InputStreamReader(
+                    Objects.requireNonNull(
+                        BLS12PairingPrecompiledContractTest.class.getResourceAsStream(
+                            "pairing.csv")),
+                    UTF_8))
+                .stream(),
+            CharStreams.readLines(
+                new InputStreamReader(
+                    Objects.requireNonNull(
+                        BLS12PairingPrecompiledContractTest.class.getResourceAsStream(
+                            "invalid_subgroup_for_pairing.csv")),
+                    UTF_8))
+                .stream())
+        .map(line -> Arguments.of((Object[]) line.split(",", 4)))
+        .collect(Collectors.toList());
+  }
+
+  @ParameterizedTest
+  @MethodSource("parameters")
+  void shouldCalculate(
+      final String inputString,
+      final String expectedResult,
+      final String expectedGasUsed,
+      final String notes) {
+
+    if ("input".equals(inputString)) {
+      // skip the header row
+      return;
+    }
+    final Bytes input = Bytes.fromHexString(inputString);
+    final Bytes expectedComputation =
+        expectedResult == null ? null : Bytes.fromHexString(expectedResult);
+    final PrecompiledContract.PrecompileContractResult result =
+        contract.computePrecompile(input, messageFrame);
+    Bytes actualComputation = result.getOutput();
+    if (actualComputation == null) {
+      final ArgumentCaptor<Bytes> revertReason = ArgumentCaptor.forClass(Bytes.class);
+      verify(messageFrame).setRevertReason(revertReason.capture());
+      assertThat(new String(revertReason.getValue().toArrayUnsafe(), UTF_8)).isEqualTo(notes);
+
+      assertThat(expectedComputation.size()).isZero();
+    } else {
+      assertThat(actualComputation).isEqualTo(expectedComputation);
+      assertThat(contract.gasRequirement(input)).isEqualTo(Long.parseLong(expectedGasUsed));
+    }
+  }
+}
diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/Benchmarks.java b/evm/src/test/java/org/hyperledger/besu/evm/precompile/Benchmarks.java
similarity index 95%
rename from ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/Benchmarks.java
rename to evm/src/test/java/org/hyperledger/besu/evm/precompile/Benchmarks.java
index 2265b345267..94230483ca5 100644
--- a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/precompiles/Benchmarks.java
+++ b/evm/src/test/java/org/hyperledger/besu/evm/precompile/Benchmarks.java
@@ -14,26 +14,26 @@
  *
  */
 
-package org.hyperledger.besu.ethereum.mainnet.precompiles;
+package org.hyperledger.besu.evm.precompile;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.hyperledger.besu.crypto.Hash.keccak256;
 import static org.mockito.Mockito.mock;
 
 import org.hyperledger.besu.crypto.Hash;
-import org.hyperledger.besu.crypto.SECP256K1;
-import org.hyperledger.besu.ethereum.chain.Blockchain;
-import org.hyperledger.besu.ethereum.core.Address;
-import org.hyperledger.besu.ethereum.core.Gas;
-import org.hyperledger.besu.ethereum.core.ProcessableBlockHeader;
-import org.hyperledger.besu.ethereum.core.Wei;
-import org.hyperledger.besu.ethereum.core.WorldUpdater;
-import org.hyperledger.besu.ethereum.mainnet.BerlinGasCalculator;
-import org.hyperledger.besu.ethereum.mainnet.IstanbulGasCalculator;
-import org.hyperledger.besu.ethereum.mainnet.PrecompiledContract;
-import org.hyperledger.besu.ethereum.vm.BlockHashLookup;
-import org.hyperledger.besu.ethereum.vm.Code;
-import org.hyperledger.besu.ethereum.vm.MessageFrame;
+import org.hyperledger.besu.crypto.KeyPair;
+import org.hyperledger.besu.crypto.SECPPrivateKey;
+import org.hyperledger.besu.crypto.SECPSignature;
+import org.hyperledger.besu.crypto.SignatureAlgorithm;
+import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.code.CodeV0;
+import org.hyperledger.besu.evm.frame.BlockValues;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.BerlinGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.IstanbulGasCalculator;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
 import java.math.BigInteger;
 import java.util.ArrayDeque;
@@ -65,37 +65,37 @@ public class Benchmarks {
           .sender(Address.ZERO)
           .value(Wei.ZERO)
           .apparentValue(Wei.ZERO)
-          .code(new Code(Bytes.EMPTY))
+          .code(CodeV0.EMPTY_CODE)
           .depth(1)
           .completer(__ -> {})
-          .contractAccountVersion(0)
           .address(Address.ZERO)
-          .blockHashLookup(mock(BlockHashLookup.class))
-          .blockHeader(mock(ProcessableBlockHeader.class))
-          .blockchain(mock(Blockchain.class))
+          .blockHashLookup(n -> null)
+          .blockValues(mock(BlockValues.class))
           .gasPrice(Wei.ZERO)
           .messageFrameStack(new ArrayDeque<>())
           .miningBeneficiary(Address.ZERO)
           .originator(Address.ZERO)
-          .initialGas(Gas.of(100000))
-          .worldState(mock(WorldUpdater.class))
+          .initialGas(100_000L)
+          .worldUpdater(mock(WorldUpdater.class))
           .build();
 
-  public static void benchSecp256k1Recover() {
-    final SECP256K1.PrivateKey privateKey =
-        SECP256K1.PrivateKey.create(
+  private static void benchSecp256k1Recover() {
+    final SignatureAlgorithm signatureAlgorithm = SignatureAlgorithmFactory.getInstance();
+
+    final SECPPrivateKey privateKey =
+        signatureAlgorithm.createPrivateKey(
             new BigInteger("c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4", 16));
-    final SECP256K1.KeyPair keyPair = SECP256K1.KeyPair.create(privateKey);
+    final KeyPair keyPair = signatureAlgorithm.createKeyPair(privateKey);
 
     final Bytes data = Bytes.wrap("This is an example of a signed message.".getBytes(UTF_8));
     final Bytes32 dataHash = keccak256(data);
-    final SECP256K1.Signature signature = SECP256K1.sign(dataHash, keyPair);
+    final SECPSignature signature = signatureAlgorithm.sign(dataHash, keyPair);
     for (int i = 0; i < MATH_WARMUP; i++) {
-      SECP256K1.PublicKey.recoverFromSignature(dataHash, signature);
+      signatureAlgorithm.recoverPublicKeyFromSignature(dataHash, signature);
     }
     final Stopwatch timer = Stopwatch.createStarted();
     for (int i = 0; i < MATH_ITERATIONS; i++) {
-      SECP256K1.PublicKey.recoverFromSignature(dataHash, signature);
+      signatureAlgorithm.recoverPublicKeyFromSignature(dataHash, signature);
     }
     timer.stop();
 
@@ -130,11 +130,13 @@ public static void benchSha256() {
 
       System.out.printf(
           "sha256 %,d bytes for %,d gas. Charging %,d gas.%n",
-          len, (int) gasSpent, contract.gasRequirement(bytes).asUInt256().toLong());
+          len, (int) gasSpent, contract.gasRequirement(bytes));
     }
   }
 
   private static void benchKeccak256() {
+    fakeFrame.expandMemory(0, 1024);
+    var istanbulGasCalculator = new IstanbulGasCalculator();
     final byte[] warmupData = new byte[240];
     final Bytes warmupBytes = Bytes.wrap(warmupData);
     for (int i = 0; i < HASH_WARMUP; i++) {
@@ -154,7 +156,9 @@ private static void benchKeccak256() {
       final double perCall = elapsed / HASH_ITERATIONS;
       final double gasSpent = perCall * GAS_PER_SECOND_STANDARD;
 
-      System.out.printf("keccak256 %,d bytes for %,d gas.%n", len, (int) gasSpent);
+      System.out.printf(
+          "keccak256 %,d bytes for %,d gas. Charing %d gas.%n",
+          len, (int) gasSpent, istanbulGasCalculator.keccak256OperationGasCost(fakeFrame, 0, len));
     }
   }
 
@@ -182,7 +186,7 @@ private static void benchRipeMD() {
 
       System.out.printf(
           "ripemd %,d bytes for %,d gas. Charging %,d gas.%n",
-          len, (int) gasSpent, contract.gasRequirement(bytes).asUInt256().toLong());
+          len, (int) gasSpent, contract.gasRequirement(bytes));
     }
   }
 
@@ -275,9 +279,7 @@ private static void benchModExp() {
 
       System.out.printf(
           "ModEXP %s for \t%,d gas. Charging %,d gas.%n",
-          testCase.getKey(),
-          (int) gasSpent,
-          contract.gasRequirement(testCase.getValue()).asUInt256().toLong());
+          testCase.getKey(), (int) gasSpent, contract.gasRequirement(testCase.getValue()));
     }
   }
 
@@ -303,8 +305,7 @@ private static void benchBNADD() {
     final double gasSpent = runBenchmark(arg, contract);
 
     System.out.printf(
-        "BNADD for %,d gas. Charging %,d gas.%n",
-        (int) gasSpent, contract.gasRequirement(arg).asUInt256().toLong());
+        "BNADD for %,d gas. Charging %,d gas.%n", (int) gasSpent, contract.gasRequirement(arg));
   }
 
   private static void benchBNMUL() {
@@ -324,8 +325,7 @@ private static void benchBNMUL() {
     final double gasSpent = runBenchmark(arg, contract);
 
     System.out.printf(
-        "BNMUL for %,d gas. Charging %,d gas.%n",
-        (int) gasSpent, contract.gasRequirement(arg).asUInt256().toLong());
+        "BNMUL for %,d gas. Charging %,d gas.%n", (int) gasSpent, contract.gasRequirement(arg));
   }
 
   private static void benchBNPairing() {
@@ -378,7 +378,7 @@ private static void benchBNPairing() {
 
       System.out.printf(
           "BNPairings %d pairs for %,d gas. Charging %,d gas.%n",
-          i * 2 + 2, (int) gasSpent, contract.gasRequirement(args[i]).asUInt256().toLong());
+          i * 2 + 2, (int) gasSpent, contract.gasRequirement(args[i]));
     }
   }
 
@@ -395,8 +395,7 @@ public static void benchBLS12G1Add() {
     final double gasSpent = runBenchmark(arg, contract);
 
     System.out.printf(
-        "G1ADD for %,d gas. Charging %,d gas.%n",
-        (int) gasSpent, contract.gasRequirement(arg).asUInt256().toLong());
+        "G1ADD for %,d gas. Charging %,d gas.%n", (int) gasSpent, contract.gasRequirement(arg));
   }
 
   private static void benchBLS12G1Mul() {
@@ -412,8 +411,7 @@ private static void benchBLS12G1Mul() {
     final double gasSpent = runBenchmark(arg, contract);
 
     System.out.printf(
-        "G1MUL for %,d gas. Charging %,d gas.%n",
-        (int) gasSpent, contract.gasRequirement(arg).asUInt256().toLong());
+        "G1MUL for %,d gas. Charging %,d gas.%n", (int) gasSpent, contract.gasRequirement(arg));
   }
 
   private static void benchBLS12G1MultiExp() {
@@ -462,7 +460,7 @@ private static void benchBLS12G1MultiExp() {
 
       System.out.printf(
           "G1MULTIEXP %d for %,d gas. Charging %,d gas.%n",
-          i + 1, (int) gasSpent, contract.gasRequirement(args[i]).asUInt256().toLong());
+          i + 1, (int) gasSpent, contract.gasRequirement(args[i]));
     }
   }
 
@@ -479,8 +477,7 @@ public static void benchBLS12G2Add() {
     final double gasSpent = runBenchmark(arg, contract);
 
     System.out.printf(
-        "G2ADD for %,d gas. Charging %,d gas.%n",
-        (int) gasSpent, contract.gasRequirement(arg).asUInt256().toLong());
+        "G2ADD for %,d gas. Charging %,d gas.%n", (int) gasSpent, contract.gasRequirement(arg));
   }
 
   private static void benchBLS12G2Mul() {
@@ -495,8 +492,7 @@ private static void benchBLS12G2Mul() {
     final double gasSpent = runBenchmark(arg, contract);
 
     System.out.printf(
-        "G2MUL for %,d gas. Charging %,d gas.%n",
-        (int) gasSpent, contract.gasRequirement(arg).asUInt256().toLong());
+        "G2MUL for %,d gas. Charging %,d gas.%n", (int) gasSpent, contract.gasRequirement(arg));
   }
 
   private static void benchBLS12G2MultiExp() {
@@ -545,7 +541,7 @@ private static void benchBLS12G2MultiExp() {
 
       System.out.printf(
           "G2MULTIEXP %d for %,d gas. Charging %,d gas.%n",
-          i + 1, (int) gasSpent, contract.gasRequirement(args[i]).asUInt256().toLong());
+          i + 1, (int) gasSpent, contract.gasRequirement(args[i]));
     }
   }
 
@@ -586,7 +582,7 @@ public static void benchBLS12Pair() {
 
       System.out.printf(
           "BLS pairings %d pairs for %,d gas. Charging %,d gas.%n",
-          i * 2 + 2, (int) gasSpent, contract.gasRequirement(args[i]).asUInt256().toLong());
+          i * 2 + 2, (int) gasSpent, contract.gasRequirement(args[i]));
     }
   }
 
@@ -600,8 +596,7 @@ private static void benchBLS12MapFPTOG1() {
     final double gasSpent = runBenchmark(arg, contract);
 
     System.out.printf(
-        "MAPFPTOG1 for %,d gas. Charging %,d gas.%n",
-        (int) gasSpent, contract.gasRequirement(arg).asUInt256().toLong());
+        "MAPFPTOG1 for %,d gas. Charging %,d gas.%n", (int) gasSpent, contract.gasRequirement(arg));
   }
 
   private static void benchBLS12MapFP2TOG2() {
@@ -615,20 +610,20 @@ private static void benchBLS12MapFP2TOG2() {
 
     System.out.printf(
         "MAPFP2TOG2 for %,d gas. Charging %,d gas.%n",
-        (int) gasSpent, contract.gasRequirement(arg).asUInt256().toLong());
+        (int) gasSpent, contract.gasRequirement(arg));
   }
 
   private static double runBenchmark(final Bytes arg, final PrecompiledContract contract) {
-    if (contract.compute(arg, fakeFrame) == null) {
+    if (contract.computePrecompile(arg, fakeFrame).getOutput() == null) {
       throw new RuntimeException("Input is Invalid");
     }
 
     for (int i = 0; i < MATH_WARMUP; i++) {
-      contract.compute(arg, fakeFrame);
+      contract.computePrecompile(arg, fakeFrame);
     }
     final Stopwatch timer = Stopwatch.createStarted();
     for (int i = 0; i < MATH_ITERATIONS; i++) {
-      contract.compute(arg, fakeFrame);
+      contract.computePrecompile(arg, fakeFrame);
     }
     timer.stop();
 
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/precompile/ECRECPrecompiledContractTest.java b/evm/src/test/java/org/hyperledger/besu/evm/precompile/ECRECPrecompiledContractTest.java
new file mode 100644
index 00000000000..bc4026ae64b
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/precompile/ECRECPrecompiledContractTest.java
@@ -0,0 +1,358 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.SpuriousDragonGasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class ECRECPrecompiledContractTest {
+
+  private final ECRECPrecompiledContract contract =
+      new ECRECPrecompiledContract(new SpuriousDragonGasCalculator());
+
+  ECRECPrecompiledContractTest() {}
+
+  private final MessageFrame messageFrame = mock(MessageFrame.class);
+
+  static Arguments[] parameters() {
+    return new Arguments[] {
+      Arguments.of(
+          "acb1c19ac0832320815b5e886c6b73ad7d6177853d44b026f2a7a9e11bb899fc000000000000000000000000000000000000000000000000000000000000001c89ea49159b334f9aebbf54481b69d000d285baa341899db355a4030f6838394e540e9f9fa17bef441e32d98d5f4554cfefdc6a56101352e4b92efafd0d9646e8",
+          null),
+      Arguments.of(
+          "0x0049872459827432342344987245982743234234498724598274323423429943000000000000000000000000000000000000000000000000000000000000001be8359c341771db7f9ea3a662a1741d27775ce277961470028e054ed3285aab8e31f63eaac35c4e6178abbc2a1073040ac9bbb0b67f2bc89a2e9593ba9abe8c53",
+          "0x0c65a9d9ffc02c7c99e36e32ce0f950c7804ceda"),
+      Arguments.of(
+          "0x82f3df49d3645876de6313df2bbe9fbce593f21341a7b03acdb9423bc171fcc9000000000000000000000000000000000000000000000000000000000000001cba13918f50da910f2d55a7ea64cf716ba31dad91856f45908dde900530377d8a112d60f36900d18eb8f9d3b4f85a697b545085614509e3520e4b762e35d0d6bd",
+          "0xc6e93f4c1920eaeaa1e699f76a7a8c18e3056074"),
+      Arguments.of(
+          "0x0fcdd8f8c550589cbae6183bc40713beb8d11898a201d13d6d5e40bc9ebf221d000000000000000000000000000000000000000000000000000000000000001c3824317158d005cbe49614fa05798ea00f2ca9db302a5e92d55bcaecd33d33da3c7de48ebec95be7b5111a7812febed1421f839d4d480c98501b78666aefdcd3",
+          "0xfe26206ad0a5897a478dd046c56164553adaea20"),
+      Arguments.of(
+          "0xeb9a6731fa269c24c2535aa00a4b31d7117a2791188120c71aacd97664d1cc16000000000000000000000000000000000000000000000000000000000000001c707c68dd904de055d735f9e5c4dfba46296ad38ff6ba8f0e5e3f4ae83243b84a5b1920d628abc74e4f3a09449011a9664ab9885f74fdc7628d417599207bde74",
+          "0x39c0f4fbcd41581d5b440a7c9f964b903037e09e"),
+      Arguments.of(
+          "0xf3ae1d9176371dd31accd73bb6bbaee561a041f5ac291a548880e1abe7b19e38000000000000000000000000000000000000000000000000000000000000001b116bd86d971b70ed540dc7c13756a99ff17644ed433781a3ffcc7359541d02fc4a2358ffc21682ece870e633cc8537f04be4ff75a142ecd35a951fc95fd1de57",
+          "0x64849cfbf0353f2c80e2a1e558982f7c4738d9f1"),
+      Arguments.of(
+          "0x69567625d007e5c915eadb8b768f008227d57f4951f9d5711dfc72a8af13d35f000000000000000000000000000000000000000000000000000000000000001ba3ef328e9f95b4a28d9b8c20f3e9fc939bf94ad3611b4e1aaabb442f1c40545f6f83fe2c067d7a35f9bcb655894d15cd6d95d5e05c9fad33b2efa67592c0a4fe",
+          "0x5026d2655bc28bee480b2f31934f0970e8acc647"),
+      Arguments.of(
+          "0x5ecdd449eb48c111c596d6b41047547deb4bbb27eafa419d1d041d842f1d81cb000000000000000000000000000000000000000000000000000000000000001c7ee309958bcd2f7a8d0fa904f16358d7b1dd52dc653f62b0eba42eec74335a620bf25c9db104a22c77af694cdb56e115fe259eef0a5e7968698bad0a592f6a2d",
+          "0x24bf97810c294811aa8165c9a05717a7731342a0"),
+      Arguments.of(
+          "0x9a996c7083b19106163161ad5117a11703507ac61cad659c5bb164cd9d368672000000000000000000000000000000000000000000000000000000000000001bffc032f93b534eec6f76d194821f9fa70de06f0aac391e7f105401b23ab1a23071b55820c93857ed7e079e72f65798b2d5afad4f999048c1a987152bc5dbf78a",
+          "0x9bdeac37b1bf31980c6e8cbc5bdfa38dacbc4c43"),
+      Arguments.of(
+          "0xea3305a892449d8215a5c41c619a42aeef22f888ee1b2c370584a6eb9e16fa27000000000000000000000000000000000000000000000000000000000000001b8efcc5180b219820d57856f018a7de24b0c4c633dfae40a96a5110c4f94b947151f4320da2e79e2d5e5c0efaef659b60b7d3de1debb4e37853746395f9426f2b",
+          "0x9ded673711119881765005a33ef7bb1961bfe98d"),
+      Arguments.of(
+          "0xebb2b43c1070b6000aaa866071de173a24dbdec57443b9467c1aa11c0090d20c000000000000000000000000000000000000000000000000000000000000001bb52ebd3ee958d6487d7a6d68faa5df32e8f34a4703201feb6ea7687c1abf5b28439215bef624ef3799919da5980f3793f6aa14fd6dc43df3c5c652a4e2f6149b",
+          "0xd4bbacccff27e6e8534d14cd8fcd665d455dddf2"),
+      Arguments.of(
+          "0xb28e4662bf41c1043e06400119c6c7804dcea81b1e4e8555c9db5be41380b1d3000000000000000000000000000000000000000000000000000000000000001ca010458d4c545fca2831e8ee9eb7857955d083feba0080c0b58a1b94233650572bfb5978a642da7b7f255562c47404ee3ad236d9f0319413f2e5a69cfafec2cb",
+          "0x5b73664bd5ef270f91775d27f47e436d960aa853"),
+      Arguments.of(
+          "0x694bace9fe95c0370ef0eb3c0c629186616e33469972ff6a7ecce90f3fe2ab2d000000000000000000000000000000000000000000000000000000000000001ca07e9497d29f7c9adae37b9a985c876b5b3ee6d21a9bc83cfcf27531cb5eb67879f317e2c145caaa798bb1b30fd96f32d843636559f195622f2fac69297f935a",
+          "0x200d8d10eab444331cb2a0802219771c11443205"),
+      Arguments.of(
+          "0xc3964b44adfd407ce69ccae93c033b6418ab903c674e794681baadf3173e37c1000000000000000000000000000000000000000000000000000000000000001c28e8ff8b5d9e55740da1ab2f7cfb9b527509439b2a99117d40a2158501a5b4354cdda2112aa6a7e89019556011f50abec5c3ae48501a1594b831275a2f031999",
+          "0x4135437a672c7d48fefc4be43a26783fe030e9b7"),
+      Arguments.of(
+          "0x0d56ee3eb6ecd6a949793c8afaa905550333dc9063bc58cdcace8a146f23b2af000000000000000000000000000000000000000000000000000000000000001cebdb65ebfd20803c364d393e4df95a3631d906d3ebeb7fae31bc5bdbf9297e6c5d4e7a93d40278c1c3ddd4659c58a0eeb01fa41a3ca78fdb184b4bf7b2e34af1",
+          "0xff2726d26e39daf03ae70b7f4cce693329e3a027"),
+      Arguments.of(
+          "0x23fa3e10e5b041840a8bd9055e9f6aca4c9764b6b21658bd6f126e6cf821e963000000000000000000000000000000000000000000000000000000000000001c19552a6e36c2c2c8fa97534c8e0a0575420364acd73f9399a6a375cb6ab8685d619a8afcdc09d88344dce929d90eed48f9caef102acb28c632340386d168cd14",
+          "0x6c36670046a1f02fe217d95c5e78f5c84efd703e"),
+      Arguments.of(
+          "0xe4e5120a2c41c1beac3a04fe7895fb93db7e53e33a4f279cf196ac8d12e4eccc000000000000000000000000000000000000000000000000000000000000001bc113be6e205a4851f4aa56b499aee3fe75389382fb7b4da2eb894537addf20980dac9e071a562749cce0ea9da2f4cac450509ec03ebcf23898c52b3375c29169",
+          "0x52d2883c39100d09a6b8d793e0f693fd7f2bac51"),
+      Arguments.of(
+          "0x7b4ba1f9fd096f738c26df77a1a87a87153d5eb253a4622cc41ca1e57f678370000000000000000000000000000000000000000000000000000000000000001bbdb9a84a3eaea6f3a16bb084387c1dd1bf91c0be1300cc99ece1cf8d239d7e0d37f24155f143635a761427684207ffabfa00dda09d502056768a4e57e0f336c5",
+          "0xc65a2a9ef32f747865a119d1c044ad836a8f6d73"),
+      Arguments.of(
+          "0x4c16d10f1bfbaa34814a39d017cdcc18590d08a52ee01be38b43742cf0f76ee9000000000000000000000000000000000000000000000000000000000000001c75d276f5646653753fdcec2ab92d27e58a59c614aab6cc3568834a4ef36819bd54bcaf3c605ed948a20e56cfe58c1595d727877b0bfa9b9b6553879ba0e08a2b",
+          "0x5cfe5b8bf54dee364ef6f411aac9bbb6eb051202"),
+      Arguments.of(
+          "0x8e4ae0eb9cb54e2378b3d161eeedc36654269cd1bef02d68751cc1b0021b709f000000000000000000000000000000000000000000000000000000000000001c01f53df1ac64d831f7cb45bcf9037052162900e3d7fb4d62934112a8c4b257d50c0c36cc064d72ba8a3ba57b1d2eee88b0628907dfe2cf0088dbf69d89c2f1c7",
+          "0xf34405682c4deb55da399822373b632cf5ca25c0"),
+      Arguments.of(
+          "0xb755e67b6ba34376ac93bc8f81b072df191aed5c5e1bc7131cf1556731fad13e000000000000000000000000000000000000000000000000000000000000001b61b542768763d72e298e93cf8635ac430c2155835c079eb508e47d0cff5fb1fa62fb0cf03fd42a35bd6ade27fd10ba4e22975a61c259e1e71664892cb9f89f6c",
+          "0x617c0e2ac02fd3e876fd5bd8581e73937df53c5d"),
+      Arguments.of(
+          "0x361a00e41d8e97cb935320dad3ba8b071f198e4c2424a2dbe110ab59a9a74511000000000000000000000000000000000000000000000000000000000000001c703cb0a9ee3a332e5b53664ee0495a757fbf1c168971a618f0010a894e8f00152d0fd7a61bbcfde075675e868593ff695298cb1dd7640ebdccd2864bd4f5fd71",
+          "0x2b43183e036afb83fed9ad70f1bfadda5497dbba"),
+      Arguments.of(
+          "0xff94a2c7dbfbb566784a5d0df05c461f050dbc826f622940ca96ea949f9e1a87000000000000000000000000000000000000000000000000000000000000001b66489a58f64e058f150ffdb7e22a0993f4299073fc2b0840b082850138990fb54fcaca68705d1108a555ed4733a959c8e302510098c80b5e3c9353b1a86a64de",
+          "0x81b6898913b2d49aec6e0bbcc8c192cff4d0eed8"),
+      Arguments.of(
+          "0xf655a5caf4dba704f63f5e17e5a94535ea7d277f2b8f4d69951291319f5c2c1b000000000000000000000000000000000000000000000000000000000000001b66987335ff22966a6084e88a4dbdc96f2cfb126aba2f6a477c18bf0fb3c42f2a5f1ef94acf1184da542f3f7271032a931bfcf3afeb3a9dafca95d5aff68bdee5",
+          "0xb48bc9d6546fb5156954699062774443a7676986"),
+      Arguments.of(
+          "0x19e7a1205c185da64a45bb5e04f35c54cd092b70bb1a1527f8372f1ae67b4bb7000000000000000000000000000000000000000000000000000000000000001becde2323e521681126ea23af56953a18166158919d3fa445e93fcf957f60185a4738fce3d006827c432e5f6c1b8d7e3450fb434172b6ab4d619fe49a09ed4b68",
+          "0x13cb19ae4e86177abfcc9d44139dcebb993ebdc1"),
+      Arguments.of(
+          "0x42d1878efb373fb18df168ce9687fae3cf8c1afa3063fb15b44f309adae25894000000000000000000000000000000000000000000000000000000000000001b15439bd45f426bdab38723290e9691371196e2105bee21c9dc36f77b3797fb6849f66ca42c6a4d5dde4b2996f68082c930fa6466e16077b074a63551d0a36bd4",
+          "0x6d78fd01abb065be75ffeef89a9df8f87926daf1"),
+      Arguments.of(
+          "0x91f5c73a9e6b54b896940478ac0995d6d757feb38790cfeeaa0ca0c4c0c72db7000000000000000000000000000000000000000000000000000000000000001b5d26a45936c8b69117451625649c356a7a40627635f60e038313afd5a9e8082323aa5968522ea56d32beff94e628e36ebc0ceb68cf89f7141175b3dca19e2446",
+          "0xd213383f34edd2a9d6e89dc6ed2bdedb2b875a3f"),
+      Arguments.of(
+          "0x654643af5d8045129adcbd4e2fe3a0270eae3072765e952ae1a8d239905f1848000000000000000000000000000000000000000000000000000000000000001cb3fdc5124a4193b35ba4eee7a3a764ea3ef14b0bacc61ce0a32e52258c64a31b2f66dc6529567230fc420f48e650a589146a409b85cb7b7d1d25cd7782198873",
+          "0x0bcfc1ef1f89de5d6bcd354d797faf3047ace632"),
+      Arguments.of(
+          "0xa3dcb3d6e954a0da9e57fef6322a489935535fb892eb60fc2aee0153207441f2000000000000000000000000000000000000000000000000000000000000001c58d31b5c643c2e2376e5420c250ab85ac58a730523449998d08c55ce7ef1a8871777e9f81e84fa66f656615e414b7f89e5800d429f618cf2fe88aa67631db651",
+          "0xe2faafdf582764fa4b65004ef676466552f4bfe3"),
+      Arguments.of(
+          "0x98eec766a1da31be4aa5b56a3c1d388610a4a37f7b8ef17011c78c135c999783000000000000000000000000000000000000000000000000000000000000001c30a0d88c1733418d1248ffecf0b3585abde3999aa4c4b4496dce559a6a9cc1c81c1de713d501fef22da4bfd4afa7bbb65d0b2217ac03dbc3bc3c75156593a8f9",
+          "0xa32c72d11ac3723ad0129c6f395c7d118db9e5db"),
+      Arguments.of(
+          "0xd646626db60c8f37f0d67df1f7795860dc97f70fb26e85b7dd67fdd8865d70a1000000000000000000000000000000000000000000000000000000000000001c3f4c0a2e4c038aac868040990b4334a6c007e8394837ef2b467ac417075b502e2b67b91a1a52df65501d16645b7835849f70aa50a72d25ab9baeda90528003f4",
+          "0x75cc7deb0bea00df88dc37a6a69038489b7a00da"),
+      Arguments.of(
+          "0x4a3842955bc493c1478b8e5d091f5ea38b6e1fbfe29e2a76af6b642829a674d5000000000000000000000000000000000000000000000000000000000000001b9fdc9d14a459294ecdf918920dbc4f5bf957425563fcd2fcda6db19ef1ae37a144ec3663dbec38c0acb40623552b4062981c635842434e5529a6961eb468a815",
+          "0x8b38952f5858f58d8b448da2bfc7cd5f203d9874"),
+      Arguments.of(
+          "0x1fa23790ba1f754c40131e8ebd40ad95e8c3f9ed32308395907bd9b6f451286d000000000000000000000000000000000000000000000000000000000000001cb9eb00b69db8a908c0fb24cf9a54fecd06b568efac82ffa38df3c0a088825f6002e574107158e2a83da1227343a536966fd4e92b298e473893ccbaf20ca3b479",
+          "0x01e86c2dc7888aaf69c067c3d81d3324b221ac4e"),
+      Arguments.of(
+          "0x88f8b41d758a53d0065691f5c771b999c241508a26b6d49b0698f99675602372000000000000000000000000000000000000000000000000000000000000001b5f97bee8c1a2660617aa6d00b48cae9dc866e7dd92471a18e34f863841e4e7954a20c134006aa0a19fa7d1eecbdd3a7213029fc1b173157d2354a62e6add5a0a",
+          "0xd7f38f4cdbf5cde5a68111970cb377003f971dd6"),
+      Arguments.of(
+          "0x85bced90e31303e32e094be2d0210d8ae7f4ff29a793bd3e5959fc86a79b2738000000000000000000000000000000000000000000000000000000000000001b04efc53658e9a47738a7078783dd6ef305b9912443fb6008451026e80a38a8f64d0abf58ef63bdf5ed576c6f0e99bdd3dc7f73f17549303222b144868bf17b58",
+          "0xb72b25e2dc98013d1e429180a95ce8d763b92ad3"),
+      Arguments.of(
+          "0xb0df0e432f097fc53dfb8d14165a63a24313cff79254a7cbe554ab7eebd43bc6000000000000000000000000000000000000000000000000000000000000001bee9e7ad060f9c969b7d289c5006eb9b03cebb508af9e5647228d48030d1bf2c87d0d66c0cefaef9eb15617a891963d51bb1e19bc7cb33544e919c94bd2235ea6",
+          "0x270433b68a15b4979186f44c3594041e8f6fae80"),
+      Arguments.of(
+          "0x70d6236cd7c57cb44dd1f99e20e785668b6cdead0b007458d0ed4e9655d7f990000000000000000000000000000000000000000000000000000000000000001bb262ec123fde934f67facf354ca12eb19b6b453a8bcd7beeb0566743fe4ed78607baec6194afcc4f66cb3c42518f0eda63e5f94df9121242e4e128133ede0024",
+          "0xa6182f0f4ceb72de969d20684f71660c2cd2ada0"),
+      Arguments.of(
+          "0xabcbaaca73cafb7fbf215909dd5750ec1ded7a3e151ff830df92590fad8cbf30000000000000000000000000000000000000000000000000000000000000001c0168786a30ab53bff4fac2f46c7f2cad22e96c0e80be8c6f96f1bf987b134c726caf9c6b4fafb3689506f8ed360cb61be6529c4de87e1d9bf553f7f3734beb6a",
+          "0xecd91ebd69948e971744c52ceff54b5681c6d419"),
+      Arguments.of(
+          "0x4e166b5f7df865f51522a4ccc9616a4d8c9b83df29dbde6dc96dc94a13e4a7e4000000000000000000000000000000000000000000000000000000000000001ba43b80dd0721a715082425bf9252322c4b61671102e860b7371871abe5bd6a5e5c8abaf399cb7e6f39405a0583031f73b40ef41963b3827f3d20d5103ccd3517",
+          "0x8cd8416864cc82c1061c00a2571e2b6ef1bc8f9f"),
+      Arguments.of(
+          "0x515ac051195596523c6664ac8d8e48345ea5932cda58d22ac49339dc234127e1000000000000000000000000000000000000000000000000000000000000001ba780c9c0aea4501f09cf5a75d133e9c89386ffea400719dc82d9586975cfb6ab41adfa6195e155b7a2a7f598c32a754010d5ce98e967a2f812f77050e72d67cd",
+          "0xa91aefd1bddca65485567c7014ebf4b48917e3de"),
+      Arguments.of(
+          "0x3c5ad848eecf1a48d12f17ee1ef6a4ee45f3c1ae7cb5b843fbf70d0f9b7b4a13000000000000000000000000000000000000000000000000000000000000001c50cad8bc91ef3924d32ce6194c79a6104686de2e2f0e67c3353262489aa7f6451532f54f6b99e8f4ce54377a86a515088bfe440eebec374402122c69fb691f5f",
+          "0xd5be345de0dd0d15d34899173b7c375d31140f24"),
+      Arguments.of(
+          "0xfcde24b61bbd3ece34d2f7d99751e57e0d840cbcbd58fa1777a5e6be8f74bcd6000000000000000000000000000000000000000000000000000000000000001b378491f640df70d59dfba12f7135fec6e7b0ecd67bd07a29e3644f85071438ae0a737efc36831bd13576d2c517b2b4694181ee687f40732d428cc5478a8fa7f5",
+          "0xfe4701547b7dbaba4c0702f226dc48a2663e18bc"),
+      Arguments.of(
+          "0x83326209a1fc9e7f4e111a20ed12e2ce6d0639e8eeeb75fe403a9bb180288a47000000000000000000000000000000000000000000000000000000000000001cad837bf4ac65dc6741fd911ecc41ce1d137e135540bd1035a06cc732d23b3fe243b3d70317177dd578027952eeb6e701280beb3685cb44a9cbc6685cd3149aa7",
+          "0x66036bc0f0fdcfbf8d814da7f3f16885132a43ec"),
+      Arguments.of(
+          "0x4ab6fb0952a3e801814a72bdeb8630aeb9edce54f0b08c8284bc7efa0d737ff0000000000000000000000000000000000000000000000000000000000000001cc8fc37b1724ce16d169b4856fe2113ff305290859070a3cb5cfbb93f90a248e3382c9ca18fa7f926e914cf781999c2c8de6ea1fa4e8536030699005b45efce86",
+          "0xa4e7416ef65b74c3b61a1eee53a33eb1d2b51a63"),
+      Arguments.of(
+          "0x80d7c38d08128721cb1d6b78f26b2f53b7bdcb2448a6d87668f4fe4e19cf5dcb000000000000000000000000000000000000000000000000000000000000001be5dc7cddccc9c61eac363691c6305420bc393a4ca17f1e10bc5192ff63b5d03f02536812a3fd90cc50208fc3b886efca921c520b4a66ef00d3228cf02fbad675",
+          "0xabb83304268fec4160d80e3e45d1376c0b458636"),
+      Arguments.of(
+          "0x1e4c87808973dd4b705d20186d4daf911f7002006aeca1ae1a476ec23a3eb67b000000000000000000000000000000000000000000000000000000000000001b942c0416506f34ae4a5aff5bde5fbe4e093f4fca798e4d8be460a84c5cbe8a1a0fdc6113fa280b9c4e736147ccd5bf8d383353556692f27405e77344b7c9b253",
+          "0x78bbe6f432b755a9bc0bf9798ea82e2574d01930"),
+      Arguments.of(
+          "0x5a174e433de66595c112432074d5d6fd07239edb8f3e1bc6b78814d4ce41cf22000000000000000000000000000000000000000000000000000000000000001c964fc2baba65aef4a47358132fd87ac92dbdf08e7fab49605293e43f47a76fac320d603d6e841fea09a4dd7b7bddb8b9c6bbb30b81893ee655bb8a16e3939d51",
+          "0xd309698bda9fbc6ba8f56ec71cd0fe50374ab147"),
+      Arguments.of(
+          "0x390fe5599dcc23aabd594ae17f08b27a3f686f5a12d3ebd2624811738976e21a000000000000000000000000000000000000000000000000000000000000001c4d32732c7278ba4060cd00c4bbef14189604470147910f6f254cfe04bff7638346a2c66f0acc61b8a612d05ceddda4f2dd9ce79a7f36597bc74797d3d28d6cc7",
+          "0xf658c09eaa7cdf744e34b676a92de4cdbef19306"),
+      Arguments.of(
+          "0xe0a1f6a2b34ed7cabe5829e4a0fb68989c8b520cb69376f4e6b754181cd02c4a000000000000000000000000000000000000000000000000000000000000001bcb22c52a26b97580036849796289293ff7e7016c13e948d99f2dfb5176d7ec01441aad675e9119fb30019f6c73adcdc4bcecb077c9164026230b5bf71cbbcbb2",
+          "0x4566e04fe531b85ad7103ac1d234e36fcc4c80c7"),
+      Arguments.of(
+          "0x925023d3dde43d2691bacaa0202dad390a73acd5c67dbc3b73c8667696103cb2000000000000000000000000000000000000000000000000000000000000001c61cb8f8271a58b25ac3fe24e2b1a91b613a5e0da5fea8a27c4c4f38c46c7d74901be5ad35bbf74b5f23bcd03f5cb06dca74054738411e86fad9d985ee43d6003",
+          "0xe22dc594d5a836902a398fef392e4acae4eb64d8"),
+      Arguments.of(
+          "0x809e822931959c627d36bf34ebc22415614f20c1b98839665187154233ab35c6000000000000000000000000000000000000000000000000000000000000001baa4df42f677f348f44151cfd059b3fc0e43468301acc0e32c68fe1175428308129eb46f79704e3169f336f7a269a026f43a316b7318198b9880fe25c069c4628",
+          "0x6825015903052024e1c39b5ec4686d8f17650623"),
+      Arguments.of(
+          "0x3e84e7a38dd4802b3469a55ffeba8e3b09cd6f2d50c446b217ca943ed09c7143000000000000000000000000000000000000000000000000000000000000001bd10fcd30c21a2f7eae829e5445a7e8ac1f4d64ebb5e007c087b64e369e502a25101bbc6e6e3c2b8a0a7b0cc936be004570de3c58e6dcfa460507861aac2d7675",
+          "0xc19cb83c80aca377fe7d32114f0391c64fe5a043"),
+      Arguments.of(
+          "0x4c6dcfab6ae4a6f8b9f812d361d7064ca6802a6d391a5e936c7e80b53723f172000000000000000000000000000000000000000000000000000000000000001ce680d9f9b0fbb6a7edba040c9e03415530b7d954910790ecda3892ab881a7a8a2ffa92fcb1824d6098f4ab4704630fac4f0f34dcc36795af6984f9302551fcfd",
+          "0x5f8e0630b06762a24670bd407f79bceee4ec0841"),
+      Arguments.of(
+          "0x0c77a6a08a98cc812e7a5275421336d78cd6063747a3fa90385391df9f17d32f000000000000000000000000000000000000000000000000000000000000001bfa375b6bd93d3a73787ded81e2d470f511db2e127f950d63308d23a34d2eafc5594a8c4cb868f796a37b2a1c55eaea2d9fe6aa77d41c9f9b01a0ce240d605c1c",
+          "0x4caad3e55d7c8e67c3a9c0397d743b8cf207ce2f"),
+      Arguments.of(
+          "0x131d7ad7d9ef2b50c379b4cc5d84df851d652d6012cbc612e600a7f99455b241000000000000000000000000000000000000000000000000000000000000001c90e090540445c5533d4391e7bf4e5b11d6985105bdb7944abdcee09753a4b3e0697d19c3b03c7433672132d175a991111be1ecae5ea0d236eb751355e628beeb",
+          "0x763f039273833269c26cfd79fe4713da5d74a45b"),
+      Arguments.of(
+          "0x8370b9d2e6dd2d7ab1a0adf391a4f8380229de45fb017f812091b4226d7ebefc000000000000000000000000000000000000000000000000000000000000001ca7184b28a17f1fcb25953de968f5bf5c4b67ca115155f00cb4ee7c7a838d82cd44b55aa67acfd3fc8939b607eec5fe256f8098ab65db1c3db04c0efffff4c34c",
+          "0x014f31c9e429c69c270f4ccff594508abd520420"),
+      Arguments.of(
+          "0xc9d7002487ee5026fadffeed13893e827378acfca9171b89817c53dee584d289000000000000000000000000000000000000000000000000000000000000001bb5a3c506e8c38cd916bf20c237906befc29ae91d5474700c66ed47263222a487116fc65be6ad78140feb2df974d4568cc5aade5bf78ce14ec0df274b0983aafa",
+          "0x6bafa3e7d355788ade4f5c3ce4ab865a490118da"),
+      Arguments.of(
+          "0x8dac2bb0d2e8ba5923577b2b12a0b9eb6b1af5c35ac6ec381ecf8ace2de84172000000000000000000000000000000000000000000000000000000000000001c549c2c7d6f644a5a9df73dfb88cbf1902fb6ad2ce7de27b18560f58d11c1de6658ba07f35e5676c33e71c6fbabfa30c7654f997394a8c713f7eedd2da78b25d1",
+          "0xc7d1544579c6a0002966ca562923c5cfcb5e21d0"),
+      Arguments.of(
+          "0xfd7bdacc8bf6f0901fbb76d18dd3a9580b88cbbe8c5c667feb497ab2ec1aaf60000000000000000000000000000000000000000000000000000000000000001b01fb675ce7c18d34abf4d21993a36bd3b213fbd29f5077d178a84f6f5dbf7c4422f1d63423dc3bb682eed2f3c96c9ecbde516f1e26364556ad9950e431217240",
+          "0xf18c3dbf2aca83afc71b520e8ac3d4d016fa9ec1"),
+      Arguments.of(
+          "0xe24beed8117992ce468610a4c7ea3b8bbce67831d5459993ad80ef75ff74399f000000000000000000000000000000000000000000000000000000000000001c65d5763121e91655fa84d7ae74b422d61db272cc6584622673e9993af10f5d7f5181a54f089809da91d008fca5fb6d7af9bb41d064b839f7643881a70c124bae",
+          "0x22a09a6e7578d42f9af290f6417d2bc04ce3380f"),
+      Arguments.of(
+          "0xd0490e2210e00722e024000245b28c5cb699c1597881a6e0dff13adfd7f00b7b000000000000000000000000000000000000000000000000000000000000001bc95aa8a187ed486f3f4a2c4fbc58b4f1e8fac5f6aad373ebce0d5e91d8e8bea67008db4c559da979b5b07a60890fd4cbe8db164d0102e395de7ea27aa5224fab",
+          "0x0431be799b7f179e4431ae1cb629c17edabdf917"),
+      Arguments.of(
+          "0x96a49e2d7833c3dee1b5ba8da56088b3fc900ba28b80e1120341796271bbc8c7000000000000000000000000000000000000000000000000000000000000001b488f5bf61a104009d5b1c2102454199afb712742c4d563ce3dc6a1aaf5e177d7605652e31020e876ce65c1fd3f75ddbb163cb636065639b1f03e7b90c256e2f9",
+          "0x1ef26cd19e0b83e4f56c88b68293c1cd9444c684"),
+      Arguments.of(
+          "0x5f764e0f288b12167977651452f233de59ed6163eb6b17796195c96c603e4313000000000000000000000000000000000000000000000000000000000000001b5bb97625154686b77f4c3480fa06e314798503d157c5db85a15218f076d19239052a96f028d44331020106277591db48c0b07e7c501c181a842ccdd20b3089a6",
+          "0xe04d0368b19ef078d6040abc1eac64869a510e8d"),
+      Arguments.of(
+          "0x5d811d11af03c52f95907d5f8fe1cf9ca6d25e44031588a08673ee39fc720c29000000000000000000000000000000000000000000000000000000000000001c963a39edda9392c83b390b7540b6b901bf1bf0f678c59603c0b8ec02f41633945ce49973a3e15591eebe3ff1b677696c1609509e547ba84ad711e13aa229c5e3",
+          "0x730594bd0a7389acc19aad47741533abd0f19e81"),
+      Arguments.of(
+          "0xed6b74c00def739b829b1d11f44190c075804414bcf78c30b6ea781d5f842b5d000000000000000000000000000000000000000000000000000000000000001c115e46eac1f6abaa48f4ed42713e8a10eb748d638331e83ab1f5b1aa672c3faa7f5892be39cfa345c785a369dd147d5c8bd79e37d4fc392782495231d52752aa",
+          "0x150e6c28a10d4b01ef1c5c733a2e5831fd75f684"),
+      Arguments.of(
+          "0xbc80fc2f142d3c139a6bdddccfb8d793be4bfff086904e4016ef5fdf4f552186000000000000000000000000000000000000000000000000000000000000001b8b5fc96d3cd453c51bf480ca1f564c6a88e3310bd938993acd6f4d2e1fa30857640660bb208f15a9cbc3bb2c1de892dea23628040c84cd48bf035cf1440e6ff2",
+          "0xffb0f15492e9bb8dc8a8b3caf74cf30fbff51add"),
+      Arguments.of(
+          "0xd14c00d0637bd1f80b8a29695375c4c4fbc25abeb0215190b937ac5d77138389000000000000000000000000000000000000000000000000000000000000001ceb7236075f80b65a43318e377fce6b4403a9fdf37e9d5e4563942625cba9603a67e8aae700ac3a877381cdcc71ddda0fbbf16a807e9f89ada558fef5b89c5eb5",
+          "0x5cba0a3e82a42466cbdd0cef06165f3936be541f"),
+      Arguments.of(
+          "0x964f1ec157e2214d09985d8d96997cedf59d6c75c1e01f9b6038d841f9a02f41000000000000000000000000000000000000000000000000000000000000001b61154b748a60ab1171413ad6d8cf8bf3d21c5c8da5c5025385565cc685519ff45358e7cb911a227fc36ce4d14bb11144735e90ad80d074f59b453bf2d8273b6e",
+          "0xfc7eaab26c1dfbb2a112d34794e0ec67ce76d471"),
+      Arguments.of(
+          "0xd98b755dd654a52b968830f43c01f7b312c87b210c614bb13b27f3a1c3be430a000000000000000000000000000000000000000000000000000000000000001b8d0eb91bf9a3e3c7dd67e1703acf6f7d558e8e4407b30bc8db31b8b3c29ef907188c479e1285d9d5e74ca4e863114e70de6cd66f381e0adb1b387829aca1191d",
+          "0xe157b225a52436ac28043a4940a300bca589d0d9"),
+      Arguments.of(
+          "0xae7c9444d3777ab5966ce98a996cc590bd0560e5b7b4cf7c603c294e5f83ef64000000000000000000000000000000000000000000000000000000000000001b4462a10e115f9beb9a1ae7e1f9bc135ba18c3cb47d4562b63f34a2ffc3f0e104454e9de9b8f86ef018f185f6131cea90967c13377be39162fd70326cba74e088",
+          "0x726871df1a80253abcdc39b8efbb019485f0aa92"),
+      Arguments.of(
+          "0x59d4a98ff7238c392d366f4e1b59c0e0f062b8069d6aa7217d4271e6e06ea1b7000000000000000000000000000000000000000000000000000000000000001c180b92c72691caa41d149d3c8c4b02d8e637d447fbf702f80353e1c89aade51b27d59ae0d0bad8148134e17744de8a1ed126a381b2ba0039336b815b093e8178",
+          "0xb70a82e0b8d80c113f31797bef325f9894e33d53"),
+      Arguments.of(
+          "0x1d651cc72be8cafc2f831a5030188dc23bce6648be7045ff9eb3dad7f0d0458b000000000000000000000000000000000000000000000000000000000000001c15b9fcdba84fb454a47cbf830705a7fbb03bb8547cde5695338bab38213048505363b8bf99f730d497983ab0eb3986f9bb7750a98e2db08fc24f8e094c23f8e1",
+          "0x6f8763efc3d08828982d41e37a9be12d795d81db"),
+      Arguments.of(
+          "0xeb3558fc388e8d245f892684fe0bd166bf5e1ec061f778436c36f7ba27fb5e88000000000000000000000000000000000000000000000000000000000000001cda01d3af46bfeb57e495ff722d0612132b66a3e2f7358e2d6a210ffa36a91c4671a5a1eeeb5f03f9b97fbd4076266a3aec7c2c64c13cf533298ea440e54aac04",
+          "0x85f54483bb76aaf73fa1ee8313de109f309aaf33"),
+      Arguments.of(
+          "0x85543dcd0a1c590cfe63cc1c6e732a124b2138d4ebc7aa257ce4ff5ab7838a67000000000000000000000000000000000000000000000000000000000000001b737c920964ae5e15f3be8548774dd965f5b5af522f3e811cad247bda80c13e753bc58cb3f973fb67b3856a3a6f5aca1847ed06711ed722f11f8124c025adac1e",
+          "0xf1383ccac546c49072c73fb3a0a4da4ca54d4b30"),
+      Arguments.of(
+          "0x334ea2be8566052b9c0f52fac3005b8fa96950dc17a2998f4ccc8a68b6f483a9000000000000000000000000000000000000000000000000000000000000001b5bb08f9a15c2deb532774b0e29d9782f7be619f57d15467d4282148eacf114d943c430c811c5979351ce3e77d1843e7677a1eeca350e3952958323ee5c5406e8",
+          "0xeaef2c85d19516bb3434a8bc364ecd270fba994c"),
+      Arguments.of(
+          "0x9797b28b78d1a41f655e4670e797c4b4054b7aefa4c0b7cfabecfdedba772ab5000000000000000000000000000000000000000000000000000000000000001b8c69b0dc1f4fa557d658d9f2a2ae2a87abba4dc30a918c2249cc0df2cd520aed3f5012f755ad6320af14746a7531a70503200e5818a243e7d9d7389dcd47db08",
+          "0x7a3177965811818903f69d2202464de03d43b6c7"),
+      Arguments.of(
+          "0x185faa83fbab6980289744d05f6fbac7a9eea9078ed82af38b2f542922a57355000000000000000000000000000000000000000000000000000000000000001b345a728c2c87c11adc137d19d1c7a3acc2195b7591fb7449b3fd9ef476b32a005df1738096a09ec334cbbc43bfbc42be19777d6583f82ea499f59f8ac652a879",
+          "0xc07d2a4f05c1617f3314e29e3dd98c083b9cc55c"),
+      Arguments.of(
+          "0xc281aefd2405635d3229c7bd155abf3ae22abd2a6b60b9f6358aa3b349fe76de000000000000000000000000000000000000000000000000000000000000001b5bc6959194476096e223df55cefc3ca991e5886fe80751a5ad40b1ad9999d6045426b00332eceed4152c733e8dbeb04987718a458e4369bfc6c30e538a95641f",
+          "0x6722fa2ba638738b50b9cb45f4f7722ff8264b62"),
+      Arguments.of(
+          "0x53fdbd4b17fa328ed653476b7ce5beaa9f6b99affe3e64cf6fd99dc440379878000000000000000000000000000000000000000000000000000000000000001b0960d87cebc136087ed15f005349b20dcef74ea4f234d1ce9e10fb9e5fb0e4ee28d0755d8a6c66eb49eddb6b3ea8061a4265b83052d5e4ef9c7b6a3cccbd0441",
+          "0x2c3bc458c2aa4e62ba5c4300cfcbc344da9ee93e"),
+      Arguments.of(
+          "0x6edc1c049d2a86ca8fe892bf24a48dd3c5b630b03adb2a3b2855c1f7935264b9000000000000000000000000000000000000000000000000000000000000001b9a2f685a2089728baaf03c379703097d412504fd3399c2f79a18e1d13c07ee945c5da9bc00581bf2b1977dd5809683ec4e06a9a4a7a32561ec7aabbd54b04dbc",
+          "0xff6e669dee405c6dc021a7e1ba2f5feb96c97adf"),
+      Arguments.of(
+          "0x65f6ec58597df636a59d070d48b29db68fc229801db026a4dce11e59ca6d23b1000000000000000000000000000000000000000000000000000000000000001b5bee25353248c9d12df421c3db9eb3141918e2a69f766d7f11edc1ba66852d205ca06336f49919bb3f45e81a463d96b0dd5071bf7edb7663e20e3fbc505e232c",
+          "0xba0093215db426d68708d1e95156ef0aaf90b588"),
+      Arguments.of(
+          "0x3546335f92dbc0883248693660061db1cb8283d2dd1969f0260915983d7ce30b000000000000000000000000000000000000000000000000000000000000001c27b51e23abfab6a82bf3bf83c23b222a01ecfdadda3587b58d965eebfab7dc5a7b3006e95e02b19c2fdfcb85794bad59cd2708b43cf658e4696b292c95cb6fc8",
+          "0x130dc34dc7b806a3e7aa2a2b2db8cd9dec66fd89"),
+      Arguments.of(
+          "0x237d94f90f917d6eaf1987353f5907950ed6c8136112f029494e0f769ccddbcf000000000000000000000000000000000000000000000000000000000000001b14919b0374173a158b04213c718d74573c438891cca416f9e198704d56320daf7ab172688fdf770b1553fd7ec4e27a9bb57a84374562734904b8ade0f31fdb41",
+          "0xd50240c7d2ae4a7c30ebd3948460581f72385732"),
+      Arguments.of(
+          "0xf2c26852616ca8ca4fbefad89111e5326f2c78158e609488461ab8fe3bc6573c000000000000000000000000000000000000000000000000000000000000001c0ed26622b205d658331ccea6286cf5d623687047e61b81c7cccae5181eb1c4b827312bb9af5c55c23f75cc72b20ff10a301ac3023f5823757c0fc9c4b9f827a2",
+          "0x674fadf0fcf26febc6a21a70d27dbf2219d374dd"),
+      Arguments.of(
+          "0xd238468a4cf3eb5939950c0dfd1ed56f13f61784ea1dcc4ec472470370f8e4fd000000000000000000000000000000000000000000000000000000000000001b059cc3c246d17f6b044b3b15ee1f3bffc59865701703c2b6e9a9e282d65e3771788c55359b3f9879245ede61f801a4bcaa18bd6a90216b952e06815a407bc7ef",
+          "0x8e76a1cd7db91aff5c8ed95f17148f9a8d4c81f6"),
+      Arguments.of(
+          "0x5dafec9564fbff6371b45399a361407b8e0f11ae8b62b784e121974957db9ef9000000000000000000000000000000000000000000000000000000000000001c2a71af5be39a199bb3b668994f28be40de1c0f5d59fa7b193cb72d4d357073f42e21a423a8b3bc8443ec9a05af6f2bf709f23c98c2c6c3a4d728873000d0b3c3",
+          "0xeb10e6f82e42a18ad05f623ed291f7bba26c1166"),
+      Arguments.of(
+          "0x8eef9ad23caf2ddfb868faa610cee0de186722d20c8d8bd15d8258fd278f4b81000000000000000000000000000000000000000000000000000000000000001b890ae7c25d8c93d9b232d664f46357bfc21b529b427d9f3c84fe1e24cb5eabe515146ea64479f18acfebad6f556437d826833650fab32f940f5eeeeff0865aea",
+          "0x6ed176182fdb30cc2d9f553179603ba45fadbc4f"),
+      Arguments.of(
+          "0x7e38048ef47052bc73329abe12d51de302b690ec6e5c612a6dc545a16e578bdc000000000000000000000000000000000000000000000000000000000000001c1879fbfaeec45b117adfd62abc9fdc3ad575f1d7f09b388f02a2ad5ec37287504761f9cee67e6b6d75c6b53ddc966939df3f5f605083e8c93c06a64812b08ab7",
+          "0x45505cf5182b9bfaee12c1b5b3e3d09377567b5c"),
+      Arguments.of(
+          "0x9981e530d595012980ad4f1cd860f6d524a2f34f6aa132932796cd4be96d6e5d000000000000000000000000000000000000000000000000000000000000001ce08be9670177846e05696271da3960eb617869935456a14f634c3f604543dff36f1b05d985d111ae7cdaf679f75e9151030e09f0c8148c6ce3e02c1847415002",
+          "0xcb69ddd0bf6c51348567444a93d8a3f9d995f363"),
+      Arguments.of(
+          "0xcb7f1bf45f76e3dca564764290cbdaa64a7622fac589799a70199845682566b2000000000000000000000000000000000000000000000000000000000000001be6c9c8dc4b408518b89e5a048d36ad1426b3ace96b8518a5a9e88f286103758e0cd9a5ddac0f848eefb204dd403bffb063a718c8e1fca4c4ec94155269370b77",
+          "0xc97af81301f96ad50d9b7c64e322ef1527702278"),
+      Arguments.of(
+          "0x21e69437899f6a37302b239fc0261c7ffabb970e8a48096475e998d2871f5bd2000000000000000000000000000000000000000000000000000000000000001b89501dd1567e56253ba097ffc663718fac90818e56ca6b393b69e9925162ce5a7262088cff050243662adfb2aac50143bf5aff60f904f2279d6f6cce5adbebdb",
+          "0xf00f8df597663bf073bcbf43f75d0e5b6caae7cb"),
+      Arguments.of(
+          "0xf524d92f0d374b4d104786fb521265f6034cb6e2e6370d9d83464aaf8c87b0a6000000000000000000000000000000000000000000000000000000000000001b94332385b44da4cb31cc83c8d1caa85c99a85b58a812f9d3b8ab62e32c9dfc7e17f2b4d58e52bccb42bc069e8e6445a87deed25e094fe1cdce663623493c21c8",
+          "0x532f5d1695f4305a7193eecf7f17c4ae7fbd5c1c"),
+      Arguments.of(
+          "0x739c5a643ca04c7bf21ea78cc89270a2d66662f1441879f6f0246a3b71416996000000000000000000000000000000000000000000000000000000000000001ba6f422a6fec65ac04fe923c8e7e92cd65a26b914f06124276dfdfb7ad396eb9b7613f03ab9c71d48af2c93d430a805cb9600991d92e76b504b63d55d7dd187a3",
+          "0x0b67296d0486d16d83f4f3ddb8e07a0a57c36631"),
+      Arguments.of(
+          "0x33693f2a0c99ea981b5b11acd2c6bfbd58e43170c5a31f79b5a8eb3321858e71000000000000000000000000000000000000000000000000000000000000001b5b33ddf363736a3abd5a356eb610d2f9fd09ef6125fdcd4ff4c7775b39e87349225b33e5afebde52fe30eb987d72318e9cf095d892e7fbdcd9e5892786f49d1c",
+          "0xe5c7698dc89c75475d5d067e124696b81a0d53f5"),
+      Arguments.of(
+          "0xdb9ffb31945e1cbe86910f30bf7129e276f0ed9d7cd623f7b74a245324ce9c82000000000000000000000000000000000000000000000000000000000000001c8b9f853439623cc3af1f15ba21c639bfb3d8ba8302fa9d1603587a537b32fcd1308adf297dde649d208fc0b323f3c36e9404ba6dc8a74510d4082c867fbe1205",
+          "0x988cfd3652a9bacc3debc441f02a8bac7913e048"),
+      Arguments.of(
+          "0x3930cff06ebe66193b61bd2d099c001a4f1c8597276b6324ced78b401746ed82000000000000000000000000000000000000000000000000000000000000001be2f6e9aa05b5af82987c65c31c131c152e4fa58f6b52a140519b11654c3cc8970472559ab09821cfb51b6d0c96ca9e5421f78f98af0d4aa601c49a6ceb9d4a78",
+          "0xfcbbfb74050fee34c54f3b18a50d61a679f5f320"),
+      Arguments.of(
+          "0xadf263dddf4ad5f323822773b76e64abc06230aec4bde5d8b7be5ea1193f2b6d000000000000000000000000000000000000000000000000000000000000001c8caf0f4834f493ade134f733cd97752b4b1f0a5c8ffee47b6ec05f46857557bf20de09970e1c57404cf7ca7efbcaa95c47d99a2eba76aa72bd1b44bb0486e368",
+          "0xe21d622e34869e656a1e28f278a6b8226082d153"),
+      Arguments.of(
+          "0x9b3ef1d284641e6c3be8dddfcf29844b393729155edb1d146dd6023dd336dc46000000000000000000000000000000000000000000000000000000000000001ba08e0795bbf5850b36b4326bb104aa14a49d44eb18e31b034b1694c5bbbcfd9732580cd88ea1277b202c6d3a575e45fbb6b2e0a489b74343035bdeef5c32863a",
+          "0x7bbba2e9fca9f2ade01d6c9c0f63a12307e3fcfd"),
+      Arguments.of(
+          "0x7eed0e79c71b7baf9b2598a7a53bcdbaffb985ec48e1560bf963aa631d5d8c92000000000000000000000000000000000000000000000000000000000000001b21a8126ccf776ed394576e3c50e10e489951886b7e8b1a9d640b5ab4c63253737f76e9955dc860d49295a3782130cabe694eb2ee34ef0dc3367b07b3efe9f3ac",
+          "0x6df661c685e9433e2f85961d15c1a1c3f2121417"),
+      Arguments.of(
+          "0xead4ef63f6bd001593e8088cdd8ab3c0c35ba808bebb091f43240ecbd81db3b9000000000000000000000000000000000000000000000000000000000000001b30d5d51ab3a1987baf4fb41ad5a2467b4a4a1000c909d51caf389e191441634135d94ea50996b6db1b1182a2c28162058ae53c3ef52695e5cc6b17018039d90e",
+          "0xbf14cdbb0f88457c9e6225c0b87b0b0b3d38e953"),
+      Arguments.of(
+          "0x0c24abcfa29ff1f068a19f2f1db51b6da6ab042ac0ea3d74c87465b2075377ff000000000000000000000000000000000000000000000000000000000000001b18e975c578187caeda96b6029a7ec7aa037757cfd182b5f8d71f872233c2264a6adbb4465a68fbf4a574071cc4973f5fd5e7b721c86cb7e0f47f595222e37289",
+          "0xcd6eb47247a12aea535d6fd96cad1f4c7bcb409c"),
+      Arguments.of(
+          "0xda13687f911cf8ede5e0a4317d8b9bf691b56bc2f3f4e463c8c2eb1f61a54469000000000000000000000000000000000000000000000000000000000000001bf6e5df315197d9fe994fae7e05e33be4bd090f9533f36c6285b80478cd21c38533928bb06d48795a86c12f5ccb95758e891d8b1b2d62106e85ae36cb8414d56b",
+          "0x9765c8a57ade562c30166b7e18aef179a22da185")
+    };
+  }
+
+  @ParameterizedTest
+  @MethodSource("parameters")
+  void shouldRecoverAddress(final String inputString, final String expectedResult) {
+
+    final Bytes input = Bytes.fromHexString(inputString);
+    final Bytes expected =
+        expectedResult == null ? Bytes.EMPTY : Bytes32.fromHexString(expectedResult);
+    assertThat(contract.computePrecompile(input, messageFrame).getOutput()).isEqualTo(expected);
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/precompile/KZGPointEvalPrecompileContractTest.java b/evm/src/test/java/org/hyperledger/besu/evm/precompile/KZGPointEvalPrecompileContractTest.java
new file mode 100644
index 00000000000..e56ed49e5ed
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/precompile/KZGPointEvalPrecompileContractTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+import org.hyperledger.besu.evm.frame.MessageFrame;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class KZGPointEvalPrecompileContractTest {
+  private static KZGPointEvalPrecompiledContract contract;
+  private final MessageFrame toRun = mock(MessageFrame.class);
+
+  @BeforeAll
+  public static void init() {
+    KZGPointEvalPrecompiledContract.init("foo");
+    contract = new KZGPointEvalPrecompiledContract();
+  }
+
+  @AfterAll
+  public static void tearDown() {
+    contract.tearDown();
+  }
+
+  @ParameterizedTest(name = "{index}")
+  @MethodSource("getPointEvaluationPrecompileTestVectors")
+  public void testComputePrecompile(final PrecompileTestParameters parameters) {
+    PrecompiledContract.PrecompileContractResult result =
+        contract.computePrecompile(parameters.input, toRun);
+    if (parameters.valid) {
+      assertThat(result.getState()).isEqualTo(MessageFrame.State.COMPLETED_SUCCESS);
+      assertThat(result.getOutput()).isEqualTo(parameters.returnValue);
+    } else {
+      assertThat(result.getState()).isNotEqualTo(MessageFrame.State.COMPLETED_SUCCESS);
+    }
+  }
+
+  public static List<PrecompileTestParameters> getPointEvaluationPrecompileTestVectors()
+      throws IOException {
+    final JsonNode jsonNode;
+    try (final InputStream testVectors =
+        KZGPointEvalPrecompileContractTest.class.getResourceAsStream(
+            "pointEvaluationPrecompile.json")) {
+      jsonNode = new ObjectMapper().readTree(testVectors);
+    }
+    final ArrayNode testCases = (ArrayNode) jsonNode.get("TestCases");
+    final Bytes returnValue = Bytes.fromHexString(jsonNode.get("PrecompileReturnValue").asText());
+    return IntStream.range(0, testCases.size())
+        .mapToObj(
+            i -> {
+              final JsonNode testCase = testCases.get(i);
+              final Bytes input = Bytes.fromHexString(testCase.get("Input").asText());
+              final boolean valid = testCase.get("Valid").asBoolean();
+              return new PrecompileTestParameters(input, valid, returnValue);
+            })
+        .collect(Collectors.toList());
+  }
+
+  record PrecompileTestParameters(Bytes input, boolean valid, Bytes returnValue) {}
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/precompile/MODEXPPrecompiledContractTest.java b/evm/src/test/java/org/hyperledger/besu/evm/precompile/MODEXPPrecompiledContractTest.java
new file mode 100644
index 00000000000..ad2c80a41f5
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/precompile/MODEXPPrecompiledContractTest.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.precompile;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assumptions.assumeThat;
+
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.BerlinGasCalculator;
+import org.hyperledger.besu.evm.gascalculator.ByzantiumGasCalculator;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.Mock;
+
+class MODEXPPrecompiledContractTest {
+  @Mock private MessageFrame messageFrame;
+
+  private final BigIntegerModularExponentiationPrecompiledContract byzantiumContract =
+      new BigIntegerModularExponentiationPrecompiledContract(new ByzantiumGasCalculator());
+  private final BigIntegerModularExponentiationPrecompiledContract berlinContract =
+      new BigIntegerModularExponentiationPrecompiledContract(new BerlinGasCalculator());
+
+  MODEXPPrecompiledContractTest() {}
+
+  static Arguments[] parameters() {
+    return new Arguments[] {
+      Arguments.of(
+          "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+          "0000000000000000000000000000000000000000000000000000000000000001",
+          13056L,
+          1360L),
+      Arguments.of(
+          "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
+          "0000000000000000000000000000000000000000000000000000000000000000",
+          13056L,
+          1360L),
+      Arguments.of(
+          "000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000040e09ad9675465c53a109fac66a445c91b292d2bb2c5268addb30cd82f80fcb0033ff97c80a5fc6f39193ae969c6ede6710a6b7ac27078a06d90ef1c72e5c85fb502fc9e1f6beb81516545975218075ec2af118cd8798df6e08a147c60fd6095ac2bb02c2908cf4dd7c81f11c289e4bce98f3553768f392a80ce22bf5c4f4a248c6b",
+          "60008f1614cc01dcfb6bfb09c625cf90b47d4468db81b5f8b7a39d42f332eab9b2da8f2d95311648a8f243f4bb13cfb3d8f7f2a3c014122ebb3ed41b02783adc",
+          204L,
+          200L),
+      Arguments.of(
+          "000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000040e09ad9675465c53a109fac66a445c91b292d2bb2c5268addb30cd82f80fcb0033ff97c80a5fc6f39193ae969c6ede6710a6b7ac27078a06d90ef1c72e5c85fb503fc9e1f6beb81516545975218075ec2af118cd8798df6e08a147c60fd6095ac2bb02c2908cf4dd7c81f11c289e4bce98f3553768f392a80ce22bf5c4f4a248c6b",
+          "4834a46ba565db27903b1c720c9d593e84e4cbd6ad2e64b31885d944f68cd801f92225a8961c952ddf2797fa4701b330c85c4b363798100b921a1a22a46a7fec",
+          204L,
+          200L),
+      Arguments.of(
+          "000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000040e09ad9675465c53a109fac66a445c91b292d2bb2c5268addb30cd82f80fcb0033ff97c80a5fc6f39193ae969c6ede6710a6b7ac27078a06d90ef1c72e5c85fb5010001fc9e1f6beb81516545975218075ec2af118cd8798df6e08a147c60fd6095ac2bb02c2908cf4dd7c81f11c289e4bce98f3553768f392a80ce22bf5c4f4a248c6b",
+          "c36d804180c35d4426b57b50c5bfcca5c01856d104564cd513b461d3c8b8409128a5573e416d0ebe38f5f736766d9dc27143e4da981dfa4d67f7dc474cbee6d2",
+          3276L,
+          341L),
+      Arguments.of(
+          "000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080cad7d991a00047dd54d3399b6b0b937c718abddef7917c75b6681f40cc15e2be0003657d8d4c34167b2f0bbbca0ccaa407c2a6a07d50f1517a8f22979ce12a81dcaf707cc0cebfc0ce2ee84ee7f77c38b9281b9822a8d3de62784c089c9b18dcb9a2a5eecbede90ea788a862a9ddd9d609c2c52972d63e289e28f6a590ffbf5102e6d893b80aeed5e6e9ce9afa8a5d5675c93a32ac05554cb20e9951b2c140e3ef4e433068cf0fb73bc9f33af1853f64aa27a0028cbf570d7ac9048eae5dc7b28c87c31e5810f1e7fa2cda6adf9f1076dbc1ec1238560071e7efc4e9565c49be9e7656951985860a558a754594115830bcdb421f741408346dd5997bb01c287087",
+          "981dd99c3b113fae3e3eaa9435c0dc96779a23c12a53d1084b4f67b0b053a27560f627b873e3f16ad78f28c94f14b6392def26e4d8896c5e3c984e50fa0b3aa44f1da78b913187c6128baa9340b1e9c9a0fd02cb78885e72576da4a8f7e5a113e173a7a2889fde9d407bd9f06eb05bc8fc7b4229377a32941a02bf4edcc06d70",
+          665L,
+          200L),
+      Arguments.of(
+          "000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080cad7d991a00047dd54d3399b6b0b937c718abddef7917c75b6681f40cc15e2be0003657d8d4c34167b2f0bbbca0ccaa407c2a6a07d50f1517a8f22979ce12a81dcaf707cc0cebfc0ce2ee84ee7f77c38b9281b9822a8d3de62784c089c9b18dcb9a2a5eecbede90ea788a862a9ddd9d609c2c52972d63e289e28f6a590ffbf5103e6d893b80aeed5e6e9ce9afa8a5d5675c93a32ac05554cb20e9951b2c140e3ef4e433068cf0fb73bc9f33af1853f64aa27a0028cbf570d7ac9048eae5dc7b28c87c31e5810f1e7fa2cda6adf9f1076dbc1ec1238560071e7efc4e9565c49be9e7656951985860a558a754594115830bcdb421f741408346dd5997bb01c287087",
+          "d89ceb68c32da4f6364978d62aaa40d7b09b59ec61eb3c0159c87ec3a91037f7dc6967594e530a69d049b64adfa39c8fa208ea970cfe4b7bcd359d345744405afe1cbf761647e32b3184c7fbe87cee8c6c7ff3b378faba6c68b83b6889cb40f1603ee68c56b4c03d48c595c826c041112dc941878f8c5be828154afd4a16311f",
+          665L,
+          200L),
+      Arguments.of(
+          "000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000080cad7d991a00047dd54d3399b6b0b937c718abddef7917c75b6681f40cc15e2be0003657d8d4c34167b2f0bbbca0ccaa407c2a6a07d50f1517a8f22979ce12a81dcaf707cc0cebfc0ce2ee84ee7f77c38b9281b9822a8d3de62784c089c9b18dcb9a2a5eecbede90ea788a862a9ddd9d609c2c52972d63e289e28f6a590ffbf51010001e6d893b80aeed5e6e9ce9afa8a5d5675c93a32ac05554cb20e9951b2c140e3ef4e433068cf0fb73bc9f33af1853f64aa27a0028cbf570d7ac9048eae5dc7b28c87c31e5810f1e7fa2cda6adf9f1076dbc1ec1238560071e7efc4e9565c49be9e7656951985860a558a754594115830bcdb421f741408346dd5997bb01c287087",
+          "ad85e8ef13fd1dd46eae44af8b91ad1ccae5b7a1c92944f92a19f21b0b658139e0cabe9c1f679507c2de354bf2c91ebd965d1e633978a830d517d2f6f8dd5fd58065d58559de7e2334a878f8ec6992d9b9e77430d4764e863d77c0f87beede8f2f7f2ab2e7222f85cc9d98b8467f4bb72e87ef2882423ebdb6daf02dddac6db2",
+          10649L,
+          1365L),
+      Arguments.of(
+          "000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000100c9130579f243e12451760976261416413742bd7c91d39ae087f46794062b8c239f2a74abf3918605a0e046a7890e049475ba7fbb78f5de6490bd22a710cc04d30088179a919d86c2da62cf37f59d8f258d2310d94c24891be2d7eeafaa32a8cb4b0cfe5f475ed778f45907dc8916a73f03635f233f7a77a00a3ec9ca6761a5bbd558a2318ecd0caa1c5016691523e7e1fa267dd35e70c66e84380bdcf7c0582f540174e572c41f81e93da0b757dff0b0fe23eb03aa19af0bdec3afb474216febaacb8d0381e631802683182b0fe72c28392539850650b70509f54980241dc175191a35d967288b532a7a8223ce2440d010615f70df269501944d4ec16fe4a3cb02d7a85909174757835187cb52e71934e6c07ef43b4c46fc30bbcd0bc72913068267c54a4aabebb493922492820babdeb7dc9b1558fcf7bd82c37c82d3147e455b623ab0efa752fe0b3a67ca6e4d126639e645a0bf417568adbb2a6a4eef62fa1fa29b2a5a43bebea1f82193a7dd98eb483d09bb595af1fa9c97c7f41f5649d976aee3e5e59e2329b43b13bea228d4a93f16ba139ccb511de521ffe747aa2eca664f7c9e33da59075cc335afcd2bf3ae09765f01ab5a7c3e3938ec168b74724b5074247d200d9970382f683d6059b94dbc336603d1dfee714e4b447ac2fa1d99ecb4961da2854e03795ed758220312d101e1e3d87d5313a6d052aebde75110363d",
+          "affc7507ea6d84751ec6b3f0d7b99dbcc263f33330e450d1b3ff0bc3d0874320bf4edd57debd587306988157958cb3cfd369cc0c9c198706f635c9e0f15d047df5cb44d03e2727f26b083c4ad8485080e1293f171c1ed52aef5993a5815c35108e848c951cf1e334490b4a539a139e57b68f44fee583306f5b85ffa57206b3ee5660458858534e5386b9584af3c7f67806e84c189d695e5eb96e1272d06ec2df5dc5fabc6e94b793718c60c36be0a4d031fc84cd658aa72294b2e16fc240aef70cb9e591248e38bd49c5a554d1afa01f38dab72733092f7555334bbef6c8c430119840492380aa95fa025dcf699f0a39669d812b0c6946b6091e6e235337b6f8",
+          1894L,
+          341L),
+      Arguments.of(
+          "000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000100c9130579f243e12451760976261416413742bd7c91d39ae087f46794062b8c239f2a74abf3918605a0e046a7890e049475ba7fbb78f5de6490bd22a710cc04d30088179a919d86c2da62cf37f59d8f258d2310d94c24891be2d7eeafaa32a8cb4b0cfe5f475ed778f45907dc8916a73f03635f233f7a77a00a3ec9ca6761a5bbd558a2318ecd0caa1c5016691523e7e1fa267dd35e70c66e84380bdcf7c0582f540174e572c41f81e93da0b757dff0b0fe23eb03aa19af0bdec3afb474216febaacb8d0381e631802683182b0fe72c28392539850650b70509f54980241dc175191a35d967288b532a7a8223ce2440d010615f70df269501944d4ec16fe4a3cb03d7a85909174757835187cb52e71934e6c07ef43b4c46fc30bbcd0bc72913068267c54a4aabebb493922492820babdeb7dc9b1558fcf7bd82c37c82d3147e455b623ab0efa752fe0b3a67ca6e4d126639e645a0bf417568adbb2a6a4eef62fa1fa29b2a5a43bebea1f82193a7dd98eb483d09bb595af1fa9c97c7f41f5649d976aee3e5e59e2329b43b13bea228d4a93f16ba139ccb511de521ffe747aa2eca664f7c9e33da59075cc335afcd2bf3ae09765f01ab5a7c3e3938ec168b74724b5074247d200d9970382f683d6059b94dbc336603d1dfee714e4b447ac2fa1d99ecb4961da2854e03795ed758220312d101e1e3d87d5313a6d052aebde75110363d",
+          "1b280ecd6a6bf906b806d527c2a831e23b238f89da48449003a88ac3ac7150d6a5e9e6b3be4054c7da11dd1e470ec29a606f5115801b5bf53bc1900271d7c3ff3cd5ed790d1c219a9800437a689f2388ba1a11d68f6a8e5b74e9a3b1fac6ee85fc6afbac599f93c391f5dc82a759e3c6c0ab45ce3f5d25d9b0c1bf94cf701ea6466fc9a478dacc5754e593172b5111eeba88557048bceae401337cd4c1182ad9f700852bc8c99933a193f0b94cf1aedbefc48be3bc93ef5cb276d7c2d5462ac8bb0c8fe8923a1db2afe1c6b90d59c534994a6a633f0ead1d638fdc293486bb634ff2c8ec9e7297c04241a61c37e3ae95b11d53343d4ba2b4cc33d2cfa7eb705e",
+          1894L,
+          341L),
+      Arguments.of(
+          "000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000100c9130579f243e12451760976261416413742bd7c91d39ae087f46794062b8c239f2a74abf3918605a0e046a7890e049475ba7fbb78f5de6490bd22a710cc04d30088179a919d86c2da62cf37f59d8f258d2310d94c24891be2d7eeafaa32a8cb4b0cfe5f475ed778f45907dc8916a73f03635f233f7a77a00a3ec9ca6761a5bbd558a2318ecd0caa1c5016691523e7e1fa267dd35e70c66e84380bdcf7c0582f540174e572c41f81e93da0b757dff0b0fe23eb03aa19af0bdec3afb474216febaacb8d0381e631802683182b0fe72c28392539850650b70509f54980241dc175191a35d967288b532a7a8223ce2440d010615f70df269501944d4ec16fe4a3cb010001d7a85909174757835187cb52e71934e6c07ef43b4c46fc30bbcd0bc72913068267c54a4aabebb493922492820babdeb7dc9b1558fcf7bd82c37c82d3147e455b623ab0efa752fe0b3a67ca6e4d126639e645a0bf417568adbb2a6a4eef62fa1fa29b2a5a43bebea1f82193a7dd98eb483d09bb595af1fa9c97c7f41f5649d976aee3e5e59e2329b43b13bea228d4a93f16ba139ccb511de521ffe747aa2eca664f7c9e33da59075cc335afcd2bf3ae09765f01ab5a7c3e3938ec168b74724b5074247d200d9970382f683d6059b94dbc336603d1dfee714e4b447ac2fa1d99ecb4961da2854e03795ed758220312d101e1e3d87d5313a6d052aebde75110363d",
+          "37843d7c67920b5f177372fa56e2a09117df585f81df8b300fba245b1175f488c99476019857198ed459ed8d9799c377330e49f4180c4bf8e8f66240c64f65ede93d601f957b95b83efdee1e1bfde74169ff77002eaf078c71815a9220c80b2e3b3ff22c2f358111d816ebf83c2999026b6de50bfc711ff68705d2f40b753424aefc9f70f08d908b5a20276ad613b4ab4309a3ea72f0c17ea9df6b3367d44fb3acab11c333909e02e81ea2ed404a712d3ea96bba87461720e2d98723e7acd0520ac1a5212dbedcd8dc0c1abf61d4719e319ff4758a774790b8d463cdfe131d1b2dcfee52d002694e98e720cb6ae7ccea353bc503269ba35f0f63bf8d7b672a76",
+          30310L,
+          5461L),
+      Arguments.of(
+          "000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000200db34d0e438249c0ed685c949cc28776a05094e1c48691dc3f2dca5fc3356d2a0663bd376e4712839917eb9a19c670407e2c377a2de385a3ff3b52104f7f1f4e0c7bf7717fb913896693dc5edbb65b760ef1b00e42e9d8f9af17352385e1cd742c9b006c0f669995cb0bb21d28c0aced2892267637b6470d8cee0ab27fc5d42658f6e88240c31d6774aa60a7ebd25cd48b56d0da11209f1928e61005c6eb709f3e8e0aaf8d9b10f7d7e296d772264dc76897ccdddadc91efa91c1903b7232a9e4c3b941917b99a3bc0c26497dedc897c25750af60237aa67934a26a2bc491db3dcc677491944bc1f51d3e5d76b8d846a62db03dedd61ff508f91a56d71028125035c3a44cbb041497c83bf3e4ae2a9613a401cc721c547a2afa3b16a2969933d3626ed6d8a7428648f74122fd3f2a02a20758f7f693892c8fd798b39abac01d18506c45e71432639e9f9505719ee822f62ccbf47f6850f096ff77b5afaf4be7d772025791717dbe5abf9b3f40cff7d7aab6f67e38f62faf510747276e20a42127e7500c444f9ed92baf65ade9e836845e39c4316d9dce5f8e2c8083e2c0acbb95296e05e51aab13b6b8f53f06c9c4276e12b0671133218cc3ea907da3bd9a367096d9202128d14846cc2e20d56fc8473ecb07cecbfb8086919f3971926e7045b853d85a69d026195c70f9f7a823536e2a8f4b3e12e94d9b53a934353451094b8102df3143a0057457d75e8c708b6337a6f5a4fd1a06727acf9fb93e2993c62f3378b37d56c85e7b1e00f0145ebf8e4095bd723166293c60b6ac1252291ef65823c9e040ddad14969b3b340a4ef714db093a587c37766d68b8d6b5016e741587e7e6bf7e763b44f0247e64bae30f994d248bfd20541a333e5b225ef6a61199e301738b1e688f70ec1d7fb892c183c95dc543c3e12adf8a5e8b9ca9d04f9445cced3ab256f29e998e69efaa633a7b60e1db5a867924ccab0a171d9d6e1098dfa15acde9553de599eaa56490c8f411e4985111f3d40bddfc5e301edb01547b01a886550a61158f7e2033c59707789bf7c854181d0c2e2a42a93cf09209747d7082e147eb8544de25c3eb14f2e35559ea0c0f5877f2f3fc92132c0ae9da4e45b2f6c866a224ea6d1f28c05320e287750fbc647368d41116e528014cc1852e5531d53e4af938374daba6cee4baa821ed07117253bb3601ddd00d59a3d7fb2ef1f5a2fbba7c429f0cf9a5b3462410fd833a69118f8be9c559b1000cc608fd877fb43f8e65c2d1302622b944462579056874b387208d90623fcdaf93920ca7a9e4ba64ea208758222ad868501cc2c345e2d3a5ea2a17e5069248138c8a79c0251185d29ee73e5afab5354769142d2bf0cb6712727aa6bf84a6245fcdae66e4938d84d1b9dd09a884818622080ff5f98942fb20acd7e0c916c2d5ea7ce6f7e173315384518f",
+          "8a5aea5f50dcc03dc7a7a272b5aeebc040554dbc1ffe36753c4fc75f7ed5f6c2cc0de3a922bf96c78bf0643a73025ad21f45a4a5cadd717612c511ab2bff1190fe5f1ae05ba9f8fe3624de1de2a817da6072ddcdb933b50216811dbe6a9ca79d3a3c6b3a476b079fd0d05f04fb154e2dd3e5cb83b148a006f2bcbf0042efb2ae7b916ea81b27aac25c3bf9a8b6d35440062ad8eae34a83f3ffa2cc7b40346b62174a4422584f72f95316f6b2bee9ff232ba9739301c97c99a9ded26c45d72676eb856ad6ecc81d36a6de36d7f9dafafee11baa43a4b0d5e4ecffa7b9b7dcefd58c397dd373e6db4acd2b2c02717712e6289bed7c813b670c4a0c6735aa7f3b0f1ce556eae9fcc94b501b2c8781ba50a8c6220e8246371c3c7359fe4ef9da786ca7d98256754ca4e496be0a9174bedbecb384bdf470779186d6a833f068d2838a88d90ef3ad48ff963b67c39cc5a3ee123baf7bf3125f64e77af7f30e105d72c4b9b5b237ed251e4c122c6d8c1405e736299c3afd6db16a28c6a9cfa68241e53de4cd388271fe534a6a9b0dbea6171d170db1b89858468885d08fecbd54c8e471c3e25d48e97ba450b96d0d87e00ac732aaa0d3ce4309c1064bd8a4c0808a97e0143e43a24cfa847635125cd41c13e0574487963e9d725c01375db99c31da67b4cf65eff555f0c0ac416c727ff8d438ad7c42030551d68c2e7adda0abb1ca7c10",
+          5580L,
+          1365L),
+      Arguments.of(
+          "000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000200db34d0e438249c0ed685c949cc28776a05094e1c48691dc3f2dca5fc3356d2a0663bd376e4712839917eb9a19c670407e2c377a2de385a3ff3b52104f7f1f4e0c7bf7717fb913896693dc5edbb65b760ef1b00e42e9d8f9af17352385e1cd742c9b006c0f669995cb0bb21d28c0aced2892267637b6470d8cee0ab27fc5d42658f6e88240c31d6774aa60a7ebd25cd48b56d0da11209f1928e61005c6eb709f3e8e0aaf8d9b10f7d7e296d772264dc76897ccdddadc91efa91c1903b7232a9e4c3b941917b99a3bc0c26497dedc897c25750af60237aa67934a26a2bc491db3dcc677491944bc1f51d3e5d76b8d846a62db03dedd61ff508f91a56d71028125035c3a44cbb041497c83bf3e4ae2a9613a401cc721c547a2afa3b16a2969933d3626ed6d8a7428648f74122fd3f2a02a20758f7f693892c8fd798b39abac01d18506c45e71432639e9f9505719ee822f62ccbf47f6850f096ff77b5afaf4be7d772025791717dbe5abf9b3f40cff7d7aab6f67e38f62faf510747276e20a42127e7500c444f9ed92baf65ade9e836845e39c4316d9dce5f8e2c8083e2c0acbb95296e05e51aab13b6b8f53f06c9c4276e12b0671133218cc3ea907da3bd9a367096d9202128d14846cc2e20d56fc8473ecb07cecbfb8086919f3971926e7045b853d85a69d026195c70f9f7a823536e2a8f4b3e12e94d9b53a934353451094b8103df3143a0057457d75e8c708b6337a6f5a4fd1a06727acf9fb93e2993c62f3378b37d56c85e7b1e00f0145ebf8e4095bd723166293c60b6ac1252291ef65823c9e040ddad14969b3b340a4ef714db093a587c37766d68b8d6b5016e741587e7e6bf7e763b44f0247e64bae30f994d248bfd20541a333e5b225ef6a61199e301738b1e688f70ec1d7fb892c183c95dc543c3e12adf8a5e8b9ca9d04f9445cced3ab256f29e998e69efaa633a7b60e1db5a867924ccab0a171d9d6e1098dfa15acde9553de599eaa56490c8f411e4985111f3d40bddfc5e301edb01547b01a886550a61158f7e2033c59707789bf7c854181d0c2e2a42a93cf09209747d7082e147eb8544de25c3eb14f2e35559ea0c0f5877f2f3fc92132c0ae9da4e45b2f6c866a224ea6d1f28c05320e287750fbc647368d41116e528014cc1852e5531d53e4af938374daba6cee4baa821ed07117253bb3601ddd00d59a3d7fb2ef1f5a2fbba7c429f0cf9a5b3462410fd833a69118f8be9c559b1000cc608fd877fb43f8e65c2d1302622b944462579056874b387208d90623fcdaf93920ca7a9e4ba64ea208758222ad868501cc2c345e2d3a5ea2a17e5069248138c8a79c0251185d29ee73e5afab5354769142d2bf0cb6712727aa6bf84a6245fcdae66e4938d84d1b9dd09a884818622080ff5f98942fb20acd7e0c916c2d5ea7ce6f7e173315384518f",
+          "5a2664252aba2d6e19d9600da582cdd1f09d7a890ac48e6b8da15ae7c6ff1856fc67a841ac2314d283ffa3ca81a0ecf7c27d89ef91a5a893297928f5da0245c99645676b481b7e20a566ee6a4f2481942bee191deec5544600bb2441fd0fb19e2ee7d801ad8911c6b7750affec367a4b29a22942c0f5f4744a4e77a8b654da2a82571037099e9c6d930794efe5cdca73c7b6c0844e386bdca8ea01b3d7807146bb81365e2cdc6475f8c23e0ff84463126189dc9789f72bbce2e3d2d114d728a272f1345122de23df54c922ec7a16e5c2a8f84da8871482bd258c20a7c09bbcd64c7a96a51029bbfe848736a6ba7bf9d931a9b7de0bcaf3635034d4958b20ae9ab3a95a147b0421dd5f7ebff46c971010ebfc4adbbe0ad94d5498c853e7142c450d8c71de4b2f84edbf8acd2e16d00c8115b150b1c30e553dbb82635e781379fe2a56360420ff7e9f70cc64c00aba7e26ed13c7c19622865ae07248daced36416080f35f8cc157a857ed70ea4f347f17d1bee80fa038abd6e39b1ba06b97264388b21364f7c56e192d4b62d9b161405f32ab1e2594e86243e56fcf2cb30d21adef15b9940f91af681da24328c883d892670c6aa47940867a81830a82b82716895db810df1b834640abefb7db2092dd92912cb9a735175bc447be40a503cf22dfe565b4ed7a3293ca0dfd63a507430b323ee248ec82e843b673c97ad730728cebc",
+          5580L,
+          1365L),
+      Arguments.of(
+          "000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000200db34d0e438249c0ed685c949cc28776a05094e1c48691dc3f2dca5fc3356d2a0663bd376e4712839917eb9a19c670407e2c377a2de385a3ff3b52104f7f1f4e0c7bf7717fb913896693dc5edbb65b760ef1b00e42e9d8f9af17352385e1cd742c9b006c0f669995cb0bb21d28c0aced2892267637b6470d8cee0ab27fc5d42658f6e88240c31d6774aa60a7ebd25cd48b56d0da11209f1928e61005c6eb709f3e8e0aaf8d9b10f7d7e296d772264dc76897ccdddadc91efa91c1903b7232a9e4c3b941917b99a3bc0c26497dedc897c25750af60237aa67934a26a2bc491db3dcc677491944bc1f51d3e5d76b8d846a62db03dedd61ff508f91a56d71028125035c3a44cbb041497c83bf3e4ae2a9613a401cc721c547a2afa3b16a2969933d3626ed6d8a7428648f74122fd3f2a02a20758f7f693892c8fd798b39abac01d18506c45e71432639e9f9505719ee822f62ccbf47f6850f096ff77b5afaf4be7d772025791717dbe5abf9b3f40cff7d7aab6f67e38f62faf510747276e20a42127e7500c444f9ed92baf65ade9e836845e39c4316d9dce5f8e2c8083e2c0acbb95296e05e51aab13b6b8f53f06c9c4276e12b0671133218cc3ea907da3bd9a367096d9202128d14846cc2e20d56fc8473ecb07cecbfb8086919f3971926e7045b853d85a69d026195c70f9f7a823536e2a8f4b3e12e94d9b53a934353451094b81010001df3143a0057457d75e8c708b6337a6f5a4fd1a06727acf9fb93e2993c62f3378b37d56c85e7b1e00f0145ebf8e4095bd723166293c60b6ac1252291ef65823c9e040ddad14969b3b340a4ef714db093a587c37766d68b8d6b5016e741587e7e6bf7e763b44f0247e64bae30f994d248bfd20541a333e5b225ef6a61199e301738b1e688f70ec1d7fb892c183c95dc543c3e12adf8a5e8b9ca9d04f9445cced3ab256f29e998e69efaa633a7b60e1db5a867924ccab0a171d9d6e1098dfa15acde9553de599eaa56490c8f411e4985111f3d40bddfc5e301edb01547b01a886550a61158f7e2033c59707789bf7c854181d0c2e2a42a93cf09209747d7082e147eb8544de25c3eb14f2e35559ea0c0f5877f2f3fc92132c0ae9da4e45b2f6c866a224ea6d1f28c05320e287750fbc647368d41116e528014cc1852e5531d53e4af938374daba6cee4baa821ed07117253bb3601ddd00d59a3d7fb2ef1f5a2fbba7c429f0cf9a5b3462410fd833a69118f8be9c559b1000cc608fd877fb43f8e65c2d1302622b944462579056874b387208d90623fcdaf93920ca7a9e4ba64ea208758222ad868501cc2c345e2d3a5ea2a17e5069248138c8a79c0251185d29ee73e5afab5354769142d2bf0cb6712727aa6bf84a6245fcdae66e4938d84d1b9dd09a884818622080ff5f98942fb20acd7e0c916c2d5ea7ce6f7e173315384518f",
+          "bed8b970c4a34849fc6926b08e40e20b21c15ed68d18f228904878d4370b56322d0da5789da0318768a374758e6375bfe4641fca5285ec7171828922160f48f5ca7efbfee4d5148612c38ad683ae4e3c3a053d2b7c098cf2b34f2cb19146eadd53c86b2d7ccf3d83b2c370bfb840913ee3879b1057a6b4e07e110b6bcd5e958bc71a14798c91d518cc70abee264b0d25a4110962a764b364ac0b0dd1ee8abc8426d775ec0f22b7e47b32576afaf1b5a48f64573ed1c5c29f50ab412188d9685307323d990802b81dacc06c6e05a1e901830ba9fcc67688dc29c5e27bde0a6e845ca925f5454b6fb3747edfaa2a5820838fb759eadf57f7cb5cec57fc213ddd8a4298fa079c3c0f472b07fb15aa6a7f0a3780bd296ff6a62e58ef443870b02260bd4fd2bbc98255674b8e1f1f9f8d33c7170b0ebbea4523b695911abbf26e41885344823bd0587115fdd83b721a4e8457a31c9a84b3d3520a07e0e35df7f48e5a9d534d0ec7feef1ff74de6a11e7f93eab95175b6ce22c68d78a642ad642837897ec11349205d8593ac19300207572c38d29ca5dfa03bc14cdbc32153c80e5cc3e739403d34c75915e49beb43094cc6dcafb3665b305ddec9286934ae66ec6b777ca528728c851318eb0f207b39f1caaf96db6eeead6b55ed08f451939314577d42bcc9f97c0b52d0234f88fd07e4c1d7780fdebc025cfffcb572cb27a8c33963",
+          89292L,
+          21845L),
+      Arguments.of(
+          "000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000400c5a1611f8be90071a43db23cc2fe01871cc4c0e8ab5743f6378e4fef77f7f6db0095c0727e20225beb665645403453e325ad5f9aeb9ba99bf3c148f63f9c07cf4fe8847ad5242d6b7d4499f93bd47056ddab8f7dee878fc2314f344dbee2a7c41a5d3db91eff372c730c2fdd3a141a4b61999e36d549b9870cf2f4e632c4d5df5f024f81c028000073a0ed8847cfb0593d36a47142f578f05ccbe28c0c06aeb1b1da027794c48db880278f79ba78ae64eedfea3c07d10e0562668d839749dc95f40467d15cf65b9cfc52c7c4bcef1cda3596dd52631aac942f146c7cebd46065131699ce8385b0db1874336747ee020a5698a3d1a1082665721e769567f579830f9d259cec1a836845109c21cf6b25da572512bf3c42fd4b96e43895589042ab60dd41f497db96aec102087fe784165bb45f942859268fd2ff6c012d9d00c02ba83eace047cc5f7b2c392c2955c58a49f0338d6fc58749c9db2155522ac17914ec216ad87f12e0ee95574613942fa615898c4d9e8a3be68cd6afa4e7a003dedbdf8edfee31162b174f965b20ae752ad89c967b3068b6f722c16b354456ba8e280f987c08e0a52d40a2e8f3a59b94d590aeef01879eb7a90b3ee7d772c839c85519cbeaddc0c193ec4874a463b53fcaea3271d80ebfb39b33489365fc039ae549a17a9ff898eea2f4cb27b8dbee4c17b998438575b2b8d107e4a0d66ba7fca85b41a58a8d51f191a35c856dfbe8aef2b00048a694bbccff832d23c8ca7a7ff0b6c0b3011d00b97c86c0628444d267c951d9e4fb8f83e154b8f74fb51aa16535e498235c5597dac9606ed0be3173a3836baa4e7d756ffe1e2879b415d3846bccd538c05b847785699aefde3e305decb600cd8fb0e7d8de5efc26971a6ad4e6d7a2d91474f1023a0ac4b78dc937da0ce607a45974d2cac1c33a2631ff7fe6144a3b2e5cf98b531a9627dea92c1dc82204d09db0439b6a11dd64b484e1263aa45fd9539b6020b55e3baece3986a8bffc1003406348f5c61265099ed43a766ee4f93f5f9c5abbc32a0fd3ac2b35b87f9ec26037d88275bd7dd0a54474995ee34ed3727f3f97c48db544b1980193a4b76a8a3ddab3591ce527f16d91882e67f0103b5cda53f7da54d489fc4ac08b6ab358a5a04aa9daa16219d50bd672a7cb804ed769d218807544e5993f1c27427104b349906a0b654df0bf69328afd3013fbe430155339c39f236df5557bf92f1ded7ff609a8502f49064ec3d1dbfb6c15d3a4c11a4f8acd12278cbf68acd5709463d12e3338a6eddb8c112f199645e23154a8e60879d2a654e3ed9296aa28f134168619691cd2c6b9e2eba4438381676173fc63c2588a3c5910dc149cf3760f0aa9fa9c3f5faa9162b0bf1aac9dd32b706a60ef53cbdb394b6b40222b5bc80eea82ba8958386672564cae3794f977871ab62337cf02e30049201ec12937e7ce79d0f55d9c810e20acf52212aca1d3888949e0e4830aad88d804161230eb89d4d329cc83570fe257217d2119134048dd2ed167646975fc7d77136919a049ea74cf08ddd2b896890bb24a0ba18094a22baa351bf29ad96c66bbb1a598f2ca391749620e62d61c3561a7d3653ccc8892c7b99baaf76bf836e2991cb06d6bc0514568ff0d1ec8bb4b3d6984f5eaefb17d3ea2893722375d3ddb8e389a8eef7d7d198f8e687d6a513983df906099f9a2d23f4f9dec6f8ef2f11fc0a21fac45353b94e00486f5e17d386af42502d09db33cf0cf28310e049c07e88682aeeb00cb833c5174266e62407a57583f1f88b304b7c6e0c84bbe1c0fd423072d37a5bd0aacf764229e5c7cd02473460ba3645cd8e8ae144065bf02d0dd238593d8e230354f67e0b2f23012c23274f80e3ee31e35e2606a4a3f31d94ab755e6d163cff52cbb36b6d0cc67ffc512aeed1dce4d7a0d70ce82f2baba12e8d514dc92a056f994adfb17b5b9712bd5186f27a2fda1f7039c5df2c8587fdc62f5627580c13234b55be4df3056050e2d1ef3218f0dd66cb05265fe1acfb0989d8213f2c19d1735a7cf3fa65d88dad5af52dc2bba22b7abf46c3bc77b5091baab9e8f0ddc4d5e581037de91a9f8dcbc69309be29cc815cf19a20a7585b8b3073edf51fc9baeb3e509b97fa4ecfd621e0fd57bd61cac1b895c03248ff12bdbc57509250df3517e8a3fe1d776836b34ab352b973d932ef708b14f7418f9eceb1d87667e61e3e758649cb083f01b133d37ab2f5afa96d6c84bcacf4efc3851ad308c1e7d9113624fce29fab460ab9d2a48d92cdb281103a5250ad44cb2ff6e67ac670c02fdafb3e0f1353953d6d7d5646ca1568dea55275a050ec501b7c6250444f7219f1ba7521ba3b93d089727ca5f3bbe0d6c1300b423377004954c5628fdb65770b18ced5c9b23a4a5a6d6ef25fe01b4ce278de0bcc4ed86e28a0a68818ffa40970128cf2c38740e80037984428c1bd5113f40ff47512ee6f4e4d8f9b8e8e1b3040d2928d003bd1c1329dc885302fbce9fa81c23b4dc49c7c82d29b52957847898676c89aa5d32b5b0e1c0d5a2b79a19d67562f407f19425687971a957375879d90c5f57c857136c17106c9ab1b99d80e69c8c954ed386493368884b55c939b8d64d26f643e800c56f90c01079d7c534e3b2b7ae352cefd3016da55f6a85eb803b85e2304915fd2001f77c74e28746293c46e4f5f0fd49cf988aafd0026b8e7a3bab2da5cdce1ea26c2e29ec03f4807fac432662b2d6c060be1c7be0e5489de69d0a6e03a4b9117f9244b34a0f1ecba89884f781c6320412413a00c4980287409a2a78c2cd7e65cecebbe4ec1c28cac4dd95f6998e78fc6f1392384331c9436aa10e10e2bf8ad2c4eafbcf276aa7bae64b74428911b3269c749338b0fc5075ad",
+          "d61fe4e3f32ac260915b5b03b78a86d11bfc41d973fce5b0cc59035cf8289a8a2e3878ea15fa46565b0d806e2f85b53873ea20ed653869b688adf83f3ef444535bf91598ff7e80f334fb782539b92f39f55310cc4b35349ab7b278346eda9bc37c0d8acd3557fae38197f412f8d9e57ce6a76b7205c23564cab06e5615be7c6f05c3d05ec690cba91da5e89d55b152ff8dd2157dc5458190025cf94b1ad98f7cbe64e9482faba95e6b33844afc640892872b44a9932096508f4a782a4805323808f23e54b6ff9b841dbfa87db3505ae4f687972c18ea0f0d0af89d36c1c2a5b14560c153c3fee406f5cf15cfd1c0bb45d767426d465f2f14c158495069d0c5955a00150707862ecaae30624ebacdd8ac33e4e6aab3ff90b6ba445a84689386b9e945d01823a65874444316e83767290fcff630d2477f49d5d8ffdd200e08ee1274270f86ed14c687895f6caf5ce528bd970c20d2408a9ba66216324c6a011ac4999098362dbd98a038129a2d40c8da6ab88318aa3046cb660327cc44236d9e5d2163bd0959062195c51ed93d0088b6f92051fc99050ece2538749165976233697ab4b610385366e5ce0b02ad6b61c168ecfbedcdf74278a38de340fd7a5fead8e588e294795f9b011e2e60377a89e25c90e145397cdeabc60fd32444a6b7642a611a83c464d8b8976666351b4865c37b02e6dc21dbcdf5f930341707b618cc0f03c3122646b3385c9df9f2ec730eec9d49e7dfc9153b6e6289da8c4f0ebea9ccc1b751948e3bb7171c9e4d57423b0eeeb79095c030cb52677b3f7e0b45c30f645391f3f9c957afa549c4e0b2465b03c67993cd200b1af01035962edbc4c9e89b31c82ac121987d6529dafdeef67a132dc04b6dc68e77f22862040b75e2ceb9ff16da0fca534e6db7bd12fa7b7f51b6c08c1e23dfcdb7acbd2da0b51c87ffbced065a612e9b1c8bba9b7e2d8d7a2f04fcc4aaf355b60d764879a76b5e16762d5f2f55d585d0c8e82df6940960cddfb72c91dfa71f6b4e1c6ca25dfc39a878e998a663c04fe29d5e83b9586d047b4d7ff70a9f0d44f127e7d741685ca75f11629128d916a0ffef4be586a30c4b70389cc746e84ebf177c01ee8a4511cfbb9d1ecf7f7b33c7dd8177896e10bbc82f838dcd6db7ac67de62bf46b6a640fb580c5d1d2708f3862e3d2b645d0d18e49ef088053e3a220adc0e033c2afcfe61c90e32151152eb3caaf746c5e377d541cafc6cbb0cc0fa48b5caf1728f2e1957f5addfc234f1a9d89e40d49356c9172d0561a695fce6dab1d412321bbf407f63766ffd7b6b3d79bcfa07991c5a9709849c1008689e3b47c50d613980bec239fb64185249d055b30375ccb4354d71fe4d05648fbf6c80634dfc3575f2f24abb714c1e4c95e8896763bf4316e954c7ad19e5780ab7a040ca6fb9271f90a8b22ae738daf6cb",
+          17868L,
+          5461L),
+      Arguments.of(
+          "000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000400c5a1611f8be90071a43db23cc2fe01871cc4c0e8ab5743f6378e4fef77f7f6db0095c0727e20225beb665645403453e325ad5f9aeb9ba99bf3c148f63f9c07cf4fe8847ad5242d6b7d4499f93bd47056ddab8f7dee878fc2314f344dbee2a7c41a5d3db91eff372c730c2fdd3a141a4b61999e36d549b9870cf2f4e632c4d5df5f024f81c028000073a0ed8847cfb0593d36a47142f578f05ccbe28c0c06aeb1b1da027794c48db880278f79ba78ae64eedfea3c07d10e0562668d839749dc95f40467d15cf65b9cfc52c7c4bcef1cda3596dd52631aac942f146c7cebd46065131699ce8385b0db1874336747ee020a5698a3d1a1082665721e769567f579830f9d259cec1a836845109c21cf6b25da572512bf3c42fd4b96e43895589042ab60dd41f497db96aec102087fe784165bb45f942859268fd2ff6c012d9d00c02ba83eace047cc5f7b2c392c2955c58a49f0338d6fc58749c9db2155522ac17914ec216ad87f12e0ee95574613942fa615898c4d9e8a3be68cd6afa4e7a003dedbdf8edfee31162b174f965b20ae752ad89c967b3068b6f722c16b354456ba8e280f987c08e0a52d40a2e8f3a59b94d590aeef01879eb7a90b3ee7d772c839c85519cbeaddc0c193ec4874a463b53fcaea3271d80ebfb39b33489365fc039ae549a17a9ff898eea2f4cb27b8dbee4c17b998438575b2b8d107e4a0d66ba7fca85b41a58a8d51f191a35c856dfbe8aef2b00048a694bbccff832d23c8ca7a7ff0b6c0b3011d00b97c86c0628444d267c951d9e4fb8f83e154b8f74fb51aa16535e498235c5597dac9606ed0be3173a3836baa4e7d756ffe1e2879b415d3846bccd538c05b847785699aefde3e305decb600cd8fb0e7d8de5efc26971a6ad4e6d7a2d91474f1023a0ac4b78dc937da0ce607a45974d2cac1c33a2631ff7fe6144a3b2e5cf98b531a9627dea92c1dc82204d09db0439b6a11dd64b484e1263aa45fd9539b6020b55e3baece3986a8bffc1003406348f5c61265099ed43a766ee4f93f5f9c5abbc32a0fd3ac2b35b87f9ec26037d88275bd7dd0a54474995ee34ed3727f3f97c48db544b1980193a4b76a8a3ddab3591ce527f16d91882e67f0103b5cda53f7da54d489fc4ac08b6ab358a5a04aa9daa16219d50bd672a7cb804ed769d218807544e5993f1c27427104b349906a0b654df0bf69328afd3013fbe430155339c39f236df5557bf92f1ded7ff609a8502f49064ec3d1dbfb6c15d3a4c11a4f8acd12278cbf68acd5709463d12e3338a6eddb8c112f199645e23154a8e60879d2a654e3ed9296aa28f134168619691cd2c6b9e2eba4438381676173fc63c2588a3c5910dc149cf3760f0aa9fa9c3f5faa9162b0bf1aac9dd32b706a60ef53cbdb394b6b40222b5bc80eea82ba8958386672564cae3794f977871ab62337cf03e30049201ec12937e7ce79d0f55d9c810e20acf52212aca1d3888949e0e4830aad88d804161230eb89d4d329cc83570fe257217d2119134048dd2ed167646975fc7d77136919a049ea74cf08ddd2b896890bb24a0ba18094a22baa351bf29ad96c66bbb1a598f2ca391749620e62d61c3561a7d3653ccc8892c7b99baaf76bf836e2991cb06d6bc0514568ff0d1ec8bb4b3d6984f5eaefb17d3ea2893722375d3ddb8e389a8eef7d7d198f8e687d6a513983df906099f9a2d23f4f9dec6f8ef2f11fc0a21fac45353b94e00486f5e17d386af42502d09db33cf0cf28310e049c07e88682aeeb00cb833c5174266e62407a57583f1f88b304b7c6e0c84bbe1c0fd423072d37a5bd0aacf764229e5c7cd02473460ba3645cd8e8ae144065bf02d0dd238593d8e230354f67e0b2f23012c23274f80e3ee31e35e2606a4a3f31d94ab755e6d163cff52cbb36b6d0cc67ffc512aeed1dce4d7a0d70ce82f2baba12e8d514dc92a056f994adfb17b5b9712bd5186f27a2fda1f7039c5df2c8587fdc62f5627580c13234b55be4df3056050e2d1ef3218f0dd66cb05265fe1acfb0989d8213f2c19d1735a7cf3fa65d88dad5af52dc2bba22b7abf46c3bc77b5091baab9e8f0ddc4d5e581037de91a9f8dcbc69309be29cc815cf19a20a7585b8b3073edf51fc9baeb3e509b97fa4ecfd621e0fd57bd61cac1b895c03248ff12bdbc57509250df3517e8a3fe1d776836b34ab352b973d932ef708b14f7418f9eceb1d87667e61e3e758649cb083f01b133d37ab2f5afa96d6c84bcacf4efc3851ad308c1e7d9113624fce29fab460ab9d2a48d92cdb281103a5250ad44cb2ff6e67ac670c02fdafb3e0f1353953d6d7d5646ca1568dea55275a050ec501b7c6250444f7219f1ba7521ba3b93d089727ca5f3bbe0d6c1300b423377004954c5628fdb65770b18ced5c9b23a4a5a6d6ef25fe01b4ce278de0bcc4ed86e28a0a68818ffa40970128cf2c38740e80037984428c1bd5113f40ff47512ee6f4e4d8f9b8e8e1b3040d2928d003bd1c1329dc885302fbce9fa81c23b4dc49c7c82d29b52957847898676c89aa5d32b5b0e1c0d5a2b79a19d67562f407f19425687971a957375879d90c5f57c857136c17106c9ab1b99d80e69c8c954ed386493368884b55c939b8d64d26f643e800c56f90c01079d7c534e3b2b7ae352cefd3016da55f6a85eb803b85e2304915fd2001f77c74e28746293c46e4f5f0fd49cf988aafd0026b8e7a3bab2da5cdce1ea26c2e29ec03f4807fac432662b2d6c060be1c7be0e5489de69d0a6e03a4b9117f9244b34a0f1ecba89884f781c6320412413a00c4980287409a2a78c2cd7e65cecebbe4ec1c28cac4dd95f6998e78fc6f1392384331c9436aa10e10e2bf8ad2c4eafbcf276aa7bae64b74428911b3269c749338b0fc5075ad",
+          "5f9c70ec884926a89461056ad20ac4c30155e817f807e4d3f5bb743d789c83386762435c3627773fa77da5144451f2a8aad8adba88e0b669f5377c5e9bad70e45c86fe952b613f015a9953b8a5de5eaee4566acf98d41e327d93a35bd5cef4607d025e58951167957df4ff9b1627649d3943805472e5e293d3efb687cfd1e503faafeb2840a3e3b3f85d016051a58e1c9498aab72e63b748d834b31eb05d85dcde65e27834e266b85c75cc4ec0135135e0601cb93eeeb6e0010c8ceb65c4c319623c5e573a2c8c9fbbf7df68a930beb412d3f4dfd146175484f45d7afaa0d2e60684af9b34730f7c8438465ad3e1d0c3237336722f2aa51095bd5759f4b8ab4dda111b684aa3dac62a761722e7ae43495b7709933512c81c4e3c9133a51f7ce9f2b51fcec064f65779666960b4e45df3900f54311f5613e8012dd1b8efd359eda31a778264c72aa8bb419d862734d769076bce2810011989a45374e5c5d8729fec21427f0bf397eacbb4220f603cf463a4b0c94efd858ffd9768cd60d6ce68d755e0fbad007ce5c2223d70c7018345a102e4ab3c60a13a9e7794303156d4c2063e919f2153c13961fb324c80b240742f47773a7a8e25b3e3fb19b00ce839346c6eb3c732fbc6b888df0b1fe0a3d07b053a2e9402c267b2d62f794d8a2840526e3ade15ce2264496ccd7519571dfde47f7a4bb16292241c20b2be59f3f8fb4f6383f232d838c5a22d8c95b6834d9d2ca493f5a505ebe8899503b0e8f9b19e6e2dd81c1628b80016d02097e0134de51054c4e7674824d4d758760fc52377d2cad145e259aa2ffaf54139e1a66b1e0c1c191e32ac59474c6b526f5b3ba07d3e5ec286eddf531fcd5292869be58c9f22ef91026159f7cf9d05ef66b4299f4da48cc1635bf2243051d342d378a22c83390553e873713c0454ce5f3234397111ac3fe3207b86f0ed9fc025c81903e1748103692074f83824fda6341be4f95ff00b0a9a208c267e12fa01825054cc0513629bf3dbb56dc5b90d4316f87654a8be18227978ea0a8a522760cad620d0d14fd38920fb7321314062914275a5f99f677145a6979b156bd82ecd36f23f8e1273cc2759ecc0b2c69d94dad5211d1bed939dd87ed9e07b91d49713a6e16ade0a98aea789f04994e318e4ff2c8a188cd8d43aeb52c6daa3bc29b4af50ea82a247c5cd67b573b34cbadcc0a376d3bbd530d50367b42705d870f2e27a8197ef46070528bfe408360faa2ebb8bf76e9f388572842bcb119f4d84ee34ae31f5cc594f23705a49197b181fb78ed1ec99499c690f843a4d0cf2e226d118e9372271054fbabdcc5c92ae9fefaef0589cd0e722eaf30c1703ec4289c7fd81beaa8a455ccee5298e31e2080c10c366a6fcf56f7d13582ad0bcad037c612b710fc595b70fbefaaca23623b60c6c39b11beb8e5843b6b3dac60f",
+          17868L,
+          5461L),
+      Arguments.of(
+          "000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000400c5a1611f8be90071a43db23cc2fe01871cc4c0e8ab5743f6378e4fef77f7f6db0095c0727e20225beb665645403453e325ad5f9aeb9ba99bf3c148f63f9c07cf4fe8847ad5242d6b7d4499f93bd47056ddab8f7dee878fc2314f344dbee2a7c41a5d3db91eff372c730c2fdd3a141a4b61999e36d549b9870cf2f4e632c4d5df5f024f81c028000073a0ed8847cfb0593d36a47142f578f05ccbe28c0c06aeb1b1da027794c48db880278f79ba78ae64eedfea3c07d10e0562668d839749dc95f40467d15cf65b9cfc52c7c4bcef1cda3596dd52631aac942f146c7cebd46065131699ce8385b0db1874336747ee020a5698a3d1a1082665721e769567f579830f9d259cec1a836845109c21cf6b25da572512bf3c42fd4b96e43895589042ab60dd41f497db96aec102087fe784165bb45f942859268fd2ff6c012d9d00c02ba83eace047cc5f7b2c392c2955c58a49f0338d6fc58749c9db2155522ac17914ec216ad87f12e0ee95574613942fa615898c4d9e8a3be68cd6afa4e7a003dedbdf8edfee31162b174f965b20ae752ad89c967b3068b6f722c16b354456ba8e280f987c08e0a52d40a2e8f3a59b94d590aeef01879eb7a90b3ee7d772c839c85519cbeaddc0c193ec4874a463b53fcaea3271d80ebfb39b33489365fc039ae549a17a9ff898eea2f4cb27b8dbee4c17b998438575b2b8d107e4a0d66ba7fca85b41a58a8d51f191a35c856dfbe8aef2b00048a694bbccff832d23c8ca7a7ff0b6c0b3011d00b97c86c0628444d267c951d9e4fb8f83e154b8f74fb51aa16535e498235c5597dac9606ed0be3173a3836baa4e7d756ffe1e2879b415d3846bccd538c05b847785699aefde3e305decb600cd8fb0e7d8de5efc26971a6ad4e6d7a2d91474f1023a0ac4b78dc937da0ce607a45974d2cac1c33a2631ff7fe6144a3b2e5cf98b531a9627dea92c1dc82204d09db0439b6a11dd64b484e1263aa45fd9539b6020b55e3baece3986a8bffc1003406348f5c61265099ed43a766ee4f93f5f9c5abbc32a0fd3ac2b35b87f9ec26037d88275bd7dd0a54474995ee34ed3727f3f97c48db544b1980193a4b76a8a3ddab3591ce527f16d91882e67f0103b5cda53f7da54d489fc4ac08b6ab358a5a04aa9daa16219d50bd672a7cb804ed769d218807544e5993f1c27427104b349906a0b654df0bf69328afd3013fbe430155339c39f236df5557bf92f1ded7ff609a8502f49064ec3d1dbfb6c15d3a4c11a4f8acd12278cbf68acd5709463d12e3338a6eddb8c112f199645e23154a8e60879d2a654e3ed9296aa28f134168619691cd2c6b9e2eba4438381676173fc63c2588a3c5910dc149cf3760f0aa9fa9c3f5faa9162b0bf1aac9dd32b706a60ef53cbdb394b6b40222b5bc80eea82ba8958386672564cae3794f977871ab62337cf010001e30049201ec12937e7ce79d0f55d9c810e20acf52212aca1d3888949e0e4830aad88d804161230eb89d4d329cc83570fe257217d2119134048dd2ed167646975fc7d77136919a049ea74cf08ddd2b896890bb24a0ba18094a22baa351bf29ad96c66bbb1a598f2ca391749620e62d61c3561a7d3653ccc8892c7b99baaf76bf836e2991cb06d6bc0514568ff0d1ec8bb4b3d6984f5eaefb17d3ea2893722375d3ddb8e389a8eef7d7d198f8e687d6a513983df906099f9a2d23f4f9dec6f8ef2f11fc0a21fac45353b94e00486f5e17d386af42502d09db33cf0cf28310e049c07e88682aeeb00cb833c5174266e62407a57583f1f88b304b7c6e0c84bbe1c0fd423072d37a5bd0aacf764229e5c7cd02473460ba3645cd8e8ae144065bf02d0dd238593d8e230354f67e0b2f23012c23274f80e3ee31e35e2606a4a3f31d94ab755e6d163cff52cbb36b6d0cc67ffc512aeed1dce4d7a0d70ce82f2baba12e8d514dc92a056f994adfb17b5b9712bd5186f27a2fda1f7039c5df2c8587fdc62f5627580c13234b55be4df3056050e2d1ef3218f0dd66cb05265fe1acfb0989d8213f2c19d1735a7cf3fa65d88dad5af52dc2bba22b7abf46c3bc77b5091baab9e8f0ddc4d5e581037de91a9f8dcbc69309be29cc815cf19a20a7585b8b3073edf51fc9baeb3e509b97fa4ecfd621e0fd57bd61cac1b895c03248ff12bdbc57509250df3517e8a3fe1d776836b34ab352b973d932ef708b14f7418f9eceb1d87667e61e3e758649cb083f01b133d37ab2f5afa96d6c84bcacf4efc3851ad308c1e7d9113624fce29fab460ab9d2a48d92cdb281103a5250ad44cb2ff6e67ac670c02fdafb3e0f1353953d6d7d5646ca1568dea55275a050ec501b7c6250444f7219f1ba7521ba3b93d089727ca5f3bbe0d6c1300b423377004954c5628fdb65770b18ced5c9b23a4a5a6d6ef25fe01b4ce278de0bcc4ed86e28a0a68818ffa40970128cf2c38740e80037984428c1bd5113f40ff47512ee6f4e4d8f9b8e8e1b3040d2928d003bd1c1329dc885302fbce9fa81c23b4dc49c7c82d29b52957847898676c89aa5d32b5b0e1c0d5a2b79a19d67562f407f19425687971a957375879d90c5f57c857136c17106c9ab1b99d80e69c8c954ed386493368884b55c939b8d64d26f643e800c56f90c01079d7c534e3b2b7ae352cefd3016da55f6a85eb803b85e2304915fd2001f77c74e28746293c46e4f5f0fd49cf988aafd0026b8e7a3bab2da5cdce1ea26c2e29ec03f4807fac432662b2d6c060be1c7be0e5489de69d0a6e03a4b9117f9244b34a0f1ecba89884f781c6320412413a00c4980287409a2a78c2cd7e65cecebbe4ec1c28cac4dd95f6998e78fc6f1392384331c9436aa10e10e2bf8ad2c4eafbcf276aa7bae64b74428911b3269c749338b0fc5075ad",
+          "5a0eb2bdf0ac1cae8e586689fa16cd4b07dfdedaec8a110ea1fdb059dd5253231b6132987598dfc6e11f86780428982d50cf68f67ae452622c3b336b537ef3298ca645e8f89ee39a26758206a5a3f6409afc709582f95274b57b71fae5c6b74619ae6f089a5393c5b79235d9caf699d23d88fb873f78379690ad8405e34c19f5257d596580c7a6a7206a3712825afe630c76b31cdb4a23e7f0632e10f14f4e282c81a66451a26f8df2a352b5b9f607a7198449d1b926e27036810368e691a74b91c61afa73d9d3b99453e7c8b50fd4f09c039a2f2feb5c419206694c31b92df1d9586140cb3417b38d0c503c7b508cc2ed12e813a1c795e9829eb39ee78eeaf360a169b491a1d4e419574e712402de9d48d54c1ae5e03739b7156615e8267e1fb0a897f067afd11fb33f6e24182d7aaaaa18fe5bc1982f20d6b871e5a398f0f6f718181d31ec225cfa9a0a70124ed9a70031bdf0c1c7829f708b6e17d50419ef361cf77d99c85f44607186c8d683106b8bd38a49b5d0fb503b397a83388c5678dcfcc737499d84512690701ed621a6f0172aecf037184ddf0f2453e4053024018e5ab2e30d6d5363b56e8b41509317c99042f517247474ab3abc848e00a07f69c254f46f2a05cf6ed84e5cc906a518fdcfdf2c61ce731f24c5264f1a25fc04934dc28aec112134dd523f70115074ca34e3807aa4cb925147f3a0ce152d323bd8c675ace446d0fd1ae30c4b57f0eb2c23884bc18f0964c0114796c5b6d080c3d89175665fbf63a6381a6a9da39ad070b645c8bb1779506da14439a9f5b5d481954764ea114fac688930bc68534d403cff4210673b6a6ff7ae416b7cd41404c3d3f282fcd193b86d0f54d0006c2a503b40d5c3930da980565b8f9630e9493a79d1c03e74e5f93ac8e4dc1a901ec5e3b3e57049124c7b72ea345aa359e782285d9e6a5c144a378111dd02c40855ff9c2be9b48425cb0b2fd62dc8678fd151121cf26a65e917d65d8e0dacfae108eb5508b601fb8ffa370be1f9a8b749a2d12eeab81f41079de87e2d777994fa4d28188c579ad327f9957fb7bdecec5c680844dd43cb57cf87aeb763c003e65011f73f8c63442df39a92b946a6bd968a1c1e4d5fa7d88476a68bd8e20e5b70a99259c7d3f85fb1b65cd2e93972e6264e74ebf289b8b6979b9b68a85cd5b360c1987f87235c3c845d62489e33acf85d53fa3561fe3a3aee18924588d9c6eba4edb7a4d106b31173e42929f6f0c48c80ce6a72d54eca7c0fe870068b7a7c89c63cdda593f5b32d3cb4ea8a32c39f00ab449155757172d66763ed9527019d6de6c9f2416aa6203f4d11c9ebee1e1d3845099e55504446448027212616167eb36035726daa7698b075286f5379cd3e93cb3e0cf4f9cb8d017facbb5550ed32d5ec5400ae57e47e2bf78d1eaeff9480cc765ceff39db500",
+          285900L,
+          87381L),
+      Arguments.of(
+          "00000000000000000000000000000000000000000000000000000000000000ff2a1e5300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+          null,
+          Long.MAX_VALUE,
+          Long.MAX_VALUE),
+      Arguments.of(
+          "0000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010001",
+          null,
+          Long.MAX_VALUE,
+          Long.MAX_VALUE),
+      Arguments.of(
+          "00000000000000000000000000000000000000000000000000000000000000e300000000000000000000000000000000000000000000000000",
+          null,
+          1580L,
+          280L),
+      Arguments.of(
+          "00000000008000000000000000000000000000000000000000000000000000000000000400000000000000000000000a",
+          null,
+          Long.MAX_VALUE,
+          Long.MAX_VALUE),
+      Arguments.of(
+          "0x00000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000",
+          null,
+          28928590731427686L,
+          Long.MAX_VALUE)
+    };
+  }
+
+  @ParameterizedTest
+  @MethodSource("parameters")
+  void testPrecompiledContract(
+      final String inputString,
+      final String precompiledResult,
+      final Long eip198Gas,
+      final Long eip2565Gas) {
+
+    assumeThat(precompiledResult).isNotNull();
+    final Bytes input = Bytes.fromHexString(inputString);
+    final Bytes expected = Bytes.fromHexString(precompiledResult);
+    assertThat(byzantiumContract.computePrecompile(input, messageFrame).getOutput())
+        .isEqualTo(expected);
+    assertThat(berlinContract.computePrecompile(input, messageFrame).getOutput())
+        .isEqualTo(expected);
+  }
+
+  @ParameterizedTest
+  @MethodSource("parameters")
+  void testGasPrice(
+      final String inputString,
+      final String precompiledResult,
+      final Long eip198Gas,
+      final Long eip2565Gas) {
+
+    final Bytes input = Bytes.fromHexString(inputString);
+    assertThat(byzantiumContract.gasRequirement(input)).isEqualTo(eip198Gas);
+    assertThat(berlinContract.gasRequirement(input)).isEqualTo(eip2565Gas);
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/processor/ContractCreationProcessorTest.java b/evm/src/test/java/org/hyperledger/besu/evm/processor/ContractCreationProcessorTest.java
new file mode 100644
index 00000000000..d84d44ea7ae
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/processor/ContractCreationProcessorTest.java
@@ -0,0 +1,297 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.processor;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.evm.frame.MessageFrame.State.COMPLETED_SUCCESS;
+import static org.hyperledger.besu.evm.frame.MessageFrame.State.EXCEPTIONAL_HALT;
+import static org.mockito.Mockito.when;
+
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.EvmSpecVersion;
+import org.hyperledger.besu.evm.code.CodeFactory;
+import org.hyperledger.besu.evm.contractvalidation.CachedInvalidCodeRule;
+import org.hyperledger.besu.evm.contractvalidation.EOFValidationCodeRule;
+import org.hyperledger.besu.evm.contractvalidation.MaxCodeSizeRule;
+import org.hyperledger.besu.evm.contractvalidation.PrefixCodeRule;
+import org.hyperledger.besu.evm.frame.ExceptionalHaltReason;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.testutils.TestMessageFrameBuilder;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+
+import java.util.Collections;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+class ContractCreationProcessorTest {
+
+  @Mock GasCalculator gasCalculator;
+  @Mock EVM evm;
+
+  private ContractCreationProcessor processor;
+
+  @Test
+  void shouldThrowAnExceptionWhenCodeContractFormatInvalidPreEOF() {
+    processor =
+        new ContractCreationProcessor(
+            gasCalculator,
+            evm,
+            true,
+            Collections.singletonList(PrefixCodeRule.of()),
+            1,
+            Collections.emptyList());
+    final Bytes contractCode = Bytes.fromHexString("EF01010101010101");
+    final MessageFrame messageFrame = new TestMessageFrameBuilder().build();
+    messageFrame.setOutputData(contractCode);
+    messageFrame.setGasRemaining(100L);
+
+    when(gasCalculator.codeDepositGasCost(contractCode.size())).thenReturn(10L);
+    processor.codeSuccess(messageFrame, OperationTracer.NO_TRACING);
+    assertThat(messageFrame.getState()).isEqualTo(EXCEPTIONAL_HALT);
+    assertThat(messageFrame.getExceptionalHaltReason())
+        .contains(ExceptionalHaltReason.INVALID_CODE);
+  }
+
+  @Test
+  void shouldNotThrowAnExceptionWhenCodeContractIsValid() {
+    processor =
+        new ContractCreationProcessor(
+            gasCalculator,
+            evm,
+            true,
+            Collections.singletonList(PrefixCodeRule.of()),
+            1,
+            Collections.emptyList());
+    final Bytes contractCode = Bytes.fromHexString("0101010101010101");
+    final MessageFrame messageFrame = new TestMessageFrameBuilder().build();
+    messageFrame.setOutputData(contractCode);
+    messageFrame.setGasRemaining(100L);
+
+    when(gasCalculator.codeDepositGasCost(contractCode.size())).thenReturn(10L);
+    processor.codeSuccess(messageFrame, OperationTracer.NO_TRACING);
+    assertThat(messageFrame.getState()).isEqualTo(COMPLETED_SUCCESS);
+  }
+
+  @Test
+  void shouldNotThrowAnExceptionWhenPrefixCodeRuleNotAdded() {
+    processor =
+        new ContractCreationProcessor(
+            gasCalculator, evm, true, Collections.emptyList(), 1, Collections.emptyList());
+    final Bytes contractCode = Bytes.fromHexString("0F01010101010101");
+    final MessageFrame messageFrame = new TestMessageFrameBuilder().build();
+    messageFrame.setOutputData(contractCode);
+    messageFrame.setGasRemaining(100L);
+
+    when(gasCalculator.codeDepositGasCost(contractCode.size())).thenReturn(10L);
+    processor.codeSuccess(messageFrame, OperationTracer.NO_TRACING);
+    assertThat(messageFrame.getState()).isEqualTo(COMPLETED_SUCCESS);
+  }
+
+  @Test
+  void shouldThrowAnExceptionWhenCodeContractFormatInvalidPostEOF() {
+    processor =
+        new ContractCreationProcessor(
+            gasCalculator,
+            evm,
+            true,
+            Collections.singletonList(EOFValidationCodeRule.of(1, false)),
+            1,
+            Collections.emptyList());
+    final Bytes contractCode = Bytes.fromHexString("EF00010101010101");
+    final MessageFrame messageFrame = new TestMessageFrameBuilder().build();
+    messageFrame.setOutputData(contractCode);
+    messageFrame.setGasRemaining(100L);
+
+    when(gasCalculator.codeDepositGasCost(contractCode.size())).thenReturn(10L);
+    processor.codeSuccess(messageFrame, OperationTracer.NO_TRACING);
+    assertThat(messageFrame.getState()).isEqualTo(EXCEPTIONAL_HALT);
+    assertThat(messageFrame.getExceptionalHaltReason())
+        .contains(ExceptionalHaltReason.INVALID_CODE);
+  }
+
+  @Test
+  void eofValidationShouldAllowLegacyCode() {
+    processor =
+        new ContractCreationProcessor(
+            gasCalculator,
+            evm,
+            true,
+            Collections.singletonList(EOFValidationCodeRule.of(1, false)),
+            1,
+            Collections.emptyList());
+    final Bytes contractCode = Bytes.fromHexString("0101010101010101");
+    final MessageFrame messageFrame = new TestMessageFrameBuilder().build();
+    messageFrame.setOutputData(contractCode);
+    messageFrame.setGasRemaining(100L);
+
+    when(gasCalculator.codeDepositGasCost(contractCode.size())).thenReturn(10L);
+    processor.codeSuccess(messageFrame, OperationTracer.NO_TRACING);
+    assertThat(messageFrame.getState()).isEqualTo(COMPLETED_SUCCESS);
+  }
+
+  @Test
+  void eofValidationShouldAllowEOFCode() {
+    processor =
+        new ContractCreationProcessor(
+            gasCalculator,
+            evm,
+            true,
+            Collections.singletonList(EOFValidationCodeRule.of(1, false)),
+            1,
+            Collections.emptyList());
+    final Bytes contractCode =
+        Bytes.fromHexString(
+            "0xEF000101000C020003000b000200080300000000000002020100020100000260016002e30001e30002e401e460005360106000f3");
+    final MessageFrame messageFrame = new TestMessageFrameBuilder().build();
+    messageFrame.setOutputData(contractCode);
+    messageFrame.setGasRemaining(100L);
+
+    when(gasCalculator.codeDepositGasCost(contractCode.size())).thenReturn(10L);
+    processor.codeSuccess(messageFrame, OperationTracer.NO_TRACING);
+    assertThat(messageFrame.getState()).isEqualTo(COMPLETED_SUCCESS);
+  }
+
+  @Test
+  void eofValidationShouldPreventLegacyCodeDeployment() {
+    processor =
+        new ContractCreationProcessor(
+            gasCalculator,
+            evm,
+            true,
+            Collections.singletonList(EOFValidationCodeRule.of(1, false)),
+            1,
+            Collections.emptyList());
+    final Bytes contractCode = Bytes.fromHexString("6030602001");
+    final Bytes initCode =
+        Bytes.fromHexString(
+            "0xEF000101000C020003000b000200080300000000000002020100020100000260016002e30001e30002e401e460005360106000f3");
+    final MessageFrame messageFrame =
+        new TestMessageFrameBuilder().code(CodeFactory.createCode(initCode, 1, true)).build();
+    messageFrame.setOutputData(contractCode);
+    messageFrame.setGasRemaining(100L);
+
+    when(gasCalculator.codeDepositGasCost(contractCode.size())).thenReturn(10L);
+    processor.codeSuccess(messageFrame, OperationTracer.NO_TRACING);
+    assertThat(messageFrame.getState()).isEqualTo(EXCEPTIONAL_HALT);
+  }
+
+  @Test
+  void eofValidationPreventsInvalidEOFCode() {
+    processor =
+        new ContractCreationProcessor(
+            gasCalculator,
+            evm,
+            true,
+            Collections.singletonList(EOFValidationCodeRule.of(1, false)),
+            1,
+            Collections.emptyList());
+    final Bytes contractCode =
+        Bytes.fromHexString(
+            "0xEF000101000C020003000b000200080300000000000000020100020100000260016002b00001b00002b101b160005360106000f3");
+    final MessageFrame messageFrame = new TestMessageFrameBuilder().build();
+    messageFrame.setOutputData(contractCode);
+    messageFrame.setGasRemaining(100L);
+
+    when(gasCalculator.codeDepositGasCost(contractCode.size())).thenReturn(10L);
+    processor.codeSuccess(messageFrame, OperationTracer.NO_TRACING);
+    assertThat(messageFrame.getState()).isEqualTo(EXCEPTIONAL_HALT);
+  }
+
+  @Test
+  void shouldThrowAnExceptionWhenCodeContractTooLarge() {
+    processor =
+        new ContractCreationProcessor(
+            gasCalculator,
+            evm,
+            true,
+            Collections.singletonList(MaxCodeSizeRule.of(24 * 1024)),
+            1,
+            Collections.emptyList());
+    final Bytes contractCode = Bytes.fromHexString("00".repeat(24 * 1024 + 1));
+    final MessageFrame messageFrame = new TestMessageFrameBuilder().build();
+    messageFrame.setOutputData(contractCode);
+    messageFrame.setGasRemaining(100L);
+
+    when(gasCalculator.codeDepositGasCost(contractCode.size())).thenReturn(10L);
+    processor.codeSuccess(messageFrame, OperationTracer.NO_TRACING);
+    assertThat(messageFrame.getState()).isEqualTo(EXCEPTIONAL_HALT);
+    assertThat(messageFrame.getExceptionalHaltReason())
+        .contains(ExceptionalHaltReason.CODE_TOO_LARGE);
+  }
+
+  @Test
+  void shouldThrowAnExceptionWhenDeployingInvalidContract() {
+    EvmSpecVersion evmSpecVersion = EvmSpecVersion.FUTURE_EIPS;
+    processor =
+        new ContractCreationProcessor(
+            gasCalculator,
+            evm,
+            true,
+            Collections.singletonList(CachedInvalidCodeRule.of(evmSpecVersion)),
+            1,
+            Collections.emptyList());
+    final Bytes contractCreateCode = Bytes.fromHexString("0x67ef0001010001006060005260086018f3");
+    final MessageFrame messageFrame =
+        new TestMessageFrameBuilder()
+            .code(
+                CodeFactory.createCode(contractCreateCode, evmSpecVersion.getMaxEofVersion(), true))
+            .build();
+    messageFrame.setOutputData(Bytes.fromHexString("0xef00010100010060"));
+
+    processor.codeSuccess(messageFrame, OperationTracer.NO_TRACING);
+    assertThat(messageFrame.getState()).isEqualTo(EXCEPTIONAL_HALT);
+  }
+
+  @Test
+  void shouldNotThrowAnExceptionWhenCodeContractTooLarge() {
+    processor =
+        new ContractCreationProcessor(
+            gasCalculator,
+            evm,
+            true,
+            Collections.singletonList(MaxCodeSizeRule.of(24 * 1024)),
+            1,
+            Collections.emptyList());
+    final Bytes contractCode = Bytes.fromHexString("00".repeat(24 * 1024));
+    final MessageFrame messageFrame = new TestMessageFrameBuilder().build();
+    messageFrame.setOutputData(contractCode);
+    messageFrame.setGasRemaining(100L);
+
+    when(gasCalculator.codeDepositGasCost(contractCode.size())).thenReturn(10L);
+    processor.codeSuccess(messageFrame, OperationTracer.NO_TRACING);
+    assertThat(messageFrame.getState()).isEqualTo(COMPLETED_SUCCESS);
+  }
+
+  @Test
+  void shouldNotThrowAnExceptionWhenCodeSizeRuleNotAdded() {
+    processor =
+        new ContractCreationProcessor(
+            gasCalculator, evm, true, Collections.emptyList(), 1, Collections.emptyList());
+    final Bytes contractCode = Bytes.fromHexString("00".repeat(24 * 1024 + 1));
+    final MessageFrame messageFrame = new TestMessageFrameBuilder().build();
+    messageFrame.setOutputData(contractCode);
+    messageFrame.setGasRemaining(100L);
+
+    when(gasCalculator.codeDepositGasCost(contractCode.size())).thenReturn(10L);
+    processor.codeSuccess(messageFrame, OperationTracer.NO_TRACING);
+    assertThat(messageFrame.getState()).isEqualTo(COMPLETED_SUCCESS);
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/testutils/ByteCodeBuilder.java b/evm/src/test/java/org/hyperledger/besu/evm/testutils/ByteCodeBuilder.java
new file mode 100644
index 00000000000..19276d1afae
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/testutils/ByteCodeBuilder.java
@@ -0,0 +1,285 @@
+/*
+ * Copyright Besu Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.testutils;
+
+import org.hyperledger.besu.datatypes.Address;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** ByteCodeBuilder is a helper class to aid in construction of EVM bytecode for tests */
+public class ByteCodeBuilder {
+
+  public enum Operation {
+    ADD("01"),
+    CALL("f1"),
+    CALLDATALOAD("35"),
+    CALLER("33"),
+    DELEGATECALL("f4"),
+    EQ("14"),
+    JUMPDEST("5b"),
+    JUMPI("57"),
+    MLOAD("51"),
+    MSTORE("52"),
+    PUSH("60"),
+    RETURN("f3"),
+    RETURNDATACOPY("3e"),
+    REVERT("fd"),
+    STATICCALL("fa"),
+    TLOAD("5c"),
+    TSTORE("5d");
+
+    private final String value;
+
+    Operation(final String value) {
+      this.value = value;
+    }
+
+    @Override
+    public String toString() {
+      return value;
+    }
+  }
+
+  final StringBuilder byteCode = new StringBuilder("0x");
+
+  @Override
+  public String toString() {
+    return byteCode.toString();
+  }
+
+  /**
+   * Operation to push the value to the EVM stack
+   *
+   * @param value Integer value to push
+   * @return this
+   */
+  public ByteCodeBuilder push(final int value) {
+    return this.push(UInt256.valueOf(value));
+  }
+
+  /**
+   * Operation to push the value to the EVM stack
+   *
+   * @param value Bytes value to push
+   * @return this
+   */
+  public ByteCodeBuilder push(final Bytes value) {
+    UInt256 pushSize = UInt256.valueOf(Bytes.fromHexString("0x60").toInt() + value.size() - 1);
+    String byteString = standardizeByteString(pushSize);
+    byteCode.append(byteString);
+    byteCode.append(value.toUnprefixedHexString());
+    return this;
+  }
+
+  /**
+   * Operation to push the value to the EVM stack
+   *
+   * @param value UInt256 value to push
+   * @return this
+   */
+  public ByteCodeBuilder push(final UInt256 value) {
+    String byteString = standardizeByteString(value);
+    byteCode.append(Operation.PUSH);
+    byteCode.append(byteString);
+    return this;
+  }
+
+  private String standardizeByteString(final UInt256 value) {
+    String byteString = value.toMinimalBytes().toUnprefixedHexString();
+    if (byteString.length() % 2 == 1) {
+      byteString = "0" + byteString;
+    } else if (byteString.length() == 0) {
+      byteString = "00";
+    }
+    return byteString;
+  }
+
+  /**
+   * Operation to store the value in transient storage
+   *
+   * @param key location in the contract's storage
+   * @param value value to store
+   * @return this
+   */
+  public ByteCodeBuilder tstore(final int key, final int value) {
+    this.push(value).push(key);
+    byteCode.append(Operation.TSTORE);
+    return this;
+  }
+
+  /**
+   * Operation to load a value from transient storage
+   *
+   * @param key location in the contract's storage
+   * @return this
+   */
+  public ByteCodeBuilder tload(final int key) {
+    this.push(key);
+    byteCode.append(Operation.TLOAD);
+    return this;
+  }
+
+  /**
+   * Operation to store the current stack value to memory
+   *
+   * @param key location in the contract's memory
+   * @return this
+   */
+  public ByteCodeBuilder dataOnStackToMemory(final int key) {
+    this.push(key).op(Operation.MSTORE);
+    return this;
+  }
+
+  /**
+   * Operations to return the value at a given memory position
+   *
+   * @param size size of the returned value
+   * @param key location in memory of the returned value
+   * @return this
+   */
+  public ByteCodeBuilder returnValueAtMemory(final int size, final int key) {
+    this.push(size).push(key).op(Operation.RETURN);
+    return this;
+  }
+
+  /**
+   * Operation to call another smart contract
+   *
+   * @param callType CALL, STATICCALL, DELEGATECALL
+   * @param address contract's address
+   * @param gasLimit gas limit for the nested call
+   * @return this
+   */
+  public ByteCodeBuilder call(
+      final Operation callType, final Address address, final UInt256 gasLimit) {
+    callTypeCheck(callType);
+    this.push(0)
+        .push(0)
+        .push(0)
+        .push(0)
+        .push(0)
+        .push(Bytes.fromHexString(address.toHexString()))
+        .push(gasLimit.toMinimalBytes())
+        .op(callType);
+    return this;
+  }
+
+  private static void callTypeCheck(final Operation callType) {
+
+    if (callType != Operation.CALL
+        && callType != Operation.STATICCALL
+        && callType != Operation.DELEGATECALL) {
+      throw new UnsupportedOperationException("callType not supported: " + callType);
+    }
+  }
+
+  /**
+   * Operation to call another smart contract with input Assumes input data is 32 bytes, already in
+   * memory at position 0
+   *
+   * @param callType CALL, STATICCALL, DELEGATECALL
+   * @param address contract's address
+   * @param gasLimit gas limit for the nested call
+   * @return this
+   */
+  public ByteCodeBuilder callWithInput(
+      final Operation callType, final Address address, final UInt256 gasLimit) {
+    return callWithInput(callType, address, gasLimit, null);
+  }
+
+  /**
+   * Operation to call another smart contract with input Assumes input data is 32 bytes
+   *
+   * @param callType CALL, STATICCALL, DELEGATECALL
+   * @param address contract's address
+   * @param gasLimit gas limit for the nested call
+   * @param input input to the nested call, if null pulls from memory at pos 0
+   * @return this
+   */
+  public ByteCodeBuilder callWithInput(
+      final Operation callType,
+      final Address address,
+      final UInt256 gasLimit,
+      final UInt256 input) {
+    callTypeCheck(callType);
+    if (input != null) {
+      this.push(input);
+      this.push(0);
+      this.op(Operation.MSTORE);
+    } else {
+      // Use top of stack as input
+      dataOnStackToMemory(0);
+    }
+
+    this.push(0)
+        .push(0)
+        .push(32)
+        .push(0)
+        .push(0)
+        .push(Bytes.fromHexString(address.toHexString()))
+        .push(gasLimit.toMinimalBytes())
+        .op(callType);
+    return this;
+  }
+
+  /**
+   * Operations to return the results of the nested call
+   *
+   * @return this
+   */
+  public ByteCodeBuilder returnInnerCallResults() {
+    this.push(32).push(0).push(0);
+    byteCode.append(Operation.RETURNDATACOPY);
+    this.returnValueAtMemory(32, 0);
+    return this;
+  }
+
+  /**
+   * Operations to check if the current caller is the address provided
+   *
+   * @param caller address of the expected caller
+   * @return this
+   */
+  public ByteCodeBuilder callerIs(final Address caller) {
+    byteCode.append(Operation.CALLER);
+    this.push(Bytes.fromHexString(caller.toHexString()));
+    byteCode.append(Operation.EQ);
+    return this;
+  }
+
+  /**
+   * Operations for a conditional jump
+   *
+   * @param dest location to jump to if true
+   * @return this
+   */
+  public ByteCodeBuilder conditionalJump(final int dest) {
+    this.push(dest);
+    byteCode.append(Operation.JUMPI);
+    return this;
+  }
+
+  /**
+   * Adds the specified operation to the set
+   *
+   * @param operation operation to add
+   * @return this
+   */
+  public ByteCodeBuilder op(final Operation operation) {
+    byteCode.append(operation.toString());
+    return this;
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/testutils/FakeBlockValues.java b/evm/src/test/java/org/hyperledger/besu/evm/testutils/FakeBlockValues.java
new file mode 100644
index 00000000000..be18e927c08
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/testutils/FakeBlockValues.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.testutils;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.frame.BlockValues;
+
+import java.util.Optional;
+
+public class FakeBlockValues implements BlockValues {
+  final long number;
+  final Optional<Wei> baseFee;
+
+  public FakeBlockValues(final long number) {
+    this(number, Optional.empty());
+  }
+
+  public FakeBlockValues(final Optional<Wei> baseFee) {
+    this(1337, baseFee);
+  }
+
+  public FakeBlockValues(final long number, final Optional<Wei> baseFee) {
+    this.number = number;
+    this.baseFee = baseFee;
+  }
+
+  @Override
+  public long getNumber() {
+    return number;
+  }
+
+  @Override
+  public Optional<Wei> getBaseFee() {
+    return baseFee;
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/testutils/TestCodeExecutor.java b/evm/src/test/java/org/hyperledger/besu/evm/testutils/TestCodeExecutor.java
new file mode 100644
index 00000000000..69fbe4e13bb
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/testutils/TestCodeExecutor.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.testutils;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.account.MutableAccount;
+import org.hyperledger.besu.evm.frame.BlockValues;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.precompile.PrecompileContractRegistry;
+import org.hyperledger.besu.evm.processor.MessageCallProcessor;
+import org.hyperledger.besu.evm.toy.ToyWorld;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.function.Consumer;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class TestCodeExecutor {
+
+  private final BlockValues blockValues = new FakeBlockValues(13);
+  private static final Address SENDER_ADDRESS = Address.fromHexString("0xe8f1b89");
+  private final EVM evm;
+
+  public TestCodeExecutor(final EVM evm) {
+    this.evm = evm;
+  }
+
+  public MessageFrame executeCode(
+      final String codeHexString,
+      final long gasLimit,
+      final Consumer<MutableAccount> accountSetup) {
+    final WorldUpdater worldUpdater = createInitialWorldState(accountSetup);
+    return executeCode(codeHexString, gasLimit, worldUpdater);
+  }
+
+  public MessageFrame executeCode(
+      final String codeHexString, final long gasLimit, final WorldUpdater worldUpdater) {
+    final Deque<MessageFrame> messageFrameStack = new ArrayDeque<>();
+
+    final MessageCallProcessor messageCallProcessor =
+        new MessageCallProcessor(evm, new PrecompileContractRegistry());
+    final Bytes codeBytes = Bytes.fromHexString(codeHexString.replaceAll("\\s", ""));
+    final Code code = evm.getCode(Hash.hash(codeBytes), codeBytes);
+
+    final MessageFrame initialFrame =
+        new TestMessageFrameBuilder()
+            .messageFrameStack(messageFrameStack)
+            .worldUpdater(worldUpdater)
+            .initialGas(gasLimit)
+            .address(SENDER_ADDRESS)
+            .originator(SENDER_ADDRESS)
+            .contract(SENDER_ADDRESS)
+            .gasPrice(Wei.ZERO)
+            .inputData(Bytes.EMPTY)
+            .sender(SENDER_ADDRESS)
+            .value(Wei.ZERO)
+            .code(code)
+            .blockValues(blockValues)
+            .depth(0)
+            .build();
+    messageFrameStack.addFirst(initialFrame);
+
+    while (!messageFrameStack.isEmpty()) {
+      messageCallProcessor.process(messageFrameStack.peekFirst(), OperationTracer.NO_TRACING);
+    }
+    return initialFrame;
+  }
+
+  public static void deployContract(
+      final WorldUpdater worldUpdater, final Address contractAddress, final String codeHexString) {
+    var updater = worldUpdater.updater();
+    final MutableAccount contract = updater.getOrCreate(contractAddress).getMutable();
+
+    contract.setNonce(0);
+    contract.clearStorage();
+    contract.setCode(Bytes.fromHexStringLenient(codeHexString));
+    updater.commit();
+  }
+
+  public static WorldUpdater createInitialWorldState(final Consumer<MutableAccount> accountSetup) {
+    ToyWorld toyWorld = new ToyWorld();
+
+    final WorldUpdater worldState = toyWorld.updater();
+    final MutableAccount senderAccount =
+        worldState.getOrCreate(TestCodeExecutor.SENDER_ADDRESS).getMutable();
+    accountSetup.accept(senderAccount);
+    worldState.commit();
+    return toyWorld.updater();
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/testutils/TestMessageFrameBuilder.java b/evm/src/test/java/org/hyperledger/besu/evm/testutils/TestMessageFrameBuilder.java
new file mode 100644
index 00000000000..dfceccaf4f8
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/testutils/TestMessageFrameBuilder.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.evm.testutils;
+
+import static org.hyperledger.besu.evm.frame.MessageFrame.DEFAULT_MAX_STACK_SIZE;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.code.CodeV0;
+import org.hyperledger.besu.evm.frame.BlockValues;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.internal.Words;
+import org.hyperledger.besu.evm.toy.ToyWorld;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Function;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class TestMessageFrameBuilder {
+
+  public static final Address DEFAUT_ADDRESS = Address.fromHexString("0xe8f1b89");
+  private static final int maxStackSize = DEFAULT_MAX_STACK_SIZE;
+
+  private Deque<MessageFrame> messageFrameStack = new ArrayDeque<>();
+  private Optional<BlockValues> blockValues = Optional.empty();
+  private Optional<WorldUpdater> worldUpdater = Optional.empty();
+  private long initialGas = Long.MAX_VALUE;
+  private Address address = DEFAUT_ADDRESS;
+  private Address sender = DEFAUT_ADDRESS;
+  private Address originator = DEFAUT_ADDRESS;
+  private Address contract = DEFAUT_ADDRESS;
+  private Wei gasPrice = Wei.ZERO;
+  private Wei value = Wei.ZERO;
+  private Bytes inputData = Bytes.EMPTY;
+  private Code code = CodeV0.EMPTY_CODE;
+  private int pc = 0;
+  private int section = 0;
+  private final List<Bytes> stackItems = new ArrayList<>();
+  private int depth = 0;
+  private Optional<Function<Long, Hash>> blockHashLookup = Optional.empty();
+  private Bytes memory = Bytes.EMPTY;
+
+  TestMessageFrameBuilder messageFrameStack(final Deque<MessageFrame> messageFrameStack) {
+    this.messageFrameStack = messageFrameStack;
+    return this;
+  }
+
+  public TestMessageFrameBuilder worldUpdater(final WorldUpdater worldUpdater) {
+    this.worldUpdater = Optional.of(worldUpdater);
+    return this;
+  }
+
+  public TestMessageFrameBuilder initialGas(final long initialGas) {
+    this.initialGas = initialGas;
+    return this;
+  }
+
+  public TestMessageFrameBuilder sender(final Address sender) {
+    this.sender = sender;
+    return this;
+  }
+
+  public TestMessageFrameBuilder address(final Address address) {
+    this.address = address;
+    return this;
+  }
+
+  TestMessageFrameBuilder originator(final Address originator) {
+    this.originator = originator;
+    return this;
+  }
+
+  public TestMessageFrameBuilder contract(final Address contract) {
+    this.contract = contract;
+    return this;
+  }
+
+  public TestMessageFrameBuilder gasPrice(final Wei gasPrice) {
+    this.gasPrice = gasPrice;
+    return this;
+  }
+
+  public TestMessageFrameBuilder value(final Wei value) {
+    this.value = value;
+    return this;
+  }
+
+  TestMessageFrameBuilder inputData(final Bytes inputData) {
+    this.inputData = inputData;
+    return this;
+  }
+
+  public TestMessageFrameBuilder code(final Code code) {
+    this.code = code;
+    return this;
+  }
+
+  public TestMessageFrameBuilder pc(final int pc) {
+    this.pc = pc;
+    return this;
+  }
+
+  public TestMessageFrameBuilder section(final int section) {
+    this.section = section;
+    return this;
+  }
+
+  public TestMessageFrameBuilder blockValues(final BlockValues blockValues) {
+    this.blockValues = Optional.of(blockValues);
+    return this;
+  }
+
+  public TestMessageFrameBuilder depth(final int depth) {
+    this.depth = depth;
+    return this;
+  }
+
+  public TestMessageFrameBuilder pushStackItem(final Bytes item) {
+    stackItems.add(item);
+    return this;
+  }
+
+  public TestMessageFrameBuilder blockHashLookup(final Function<Long, Hash> blockHashLookup) {
+    this.blockHashLookup = Optional.of(blockHashLookup);
+    return this;
+  }
+
+  public TestMessageFrameBuilder memory(final Bytes memory) {
+    this.memory = memory;
+    return this;
+  }
+
+  public MessageFrame build() {
+    final MessageFrame frame =
+        MessageFrame.builder()
+            .type(MessageFrame.Type.MESSAGE_CALL)
+            .messageFrameStack(messageFrameStack)
+            .worldUpdater(worldUpdater.orElseGet(this::createDefaultWorldUpdater))
+            .initialGas(initialGas)
+            .address(address)
+            .originator(originator)
+            .gasPrice(gasPrice)
+            .inputData(inputData)
+            .sender(sender)
+            .value(value)
+            .apparentValue(value)
+            .contract(contract)
+            .code(code)
+            .blockValues(blockValues.orElseGet(() -> new FakeBlockValues(1337)))
+            .depth(depth)
+            .completer(c -> {})
+            .miningBeneficiary(Address.ZERO)
+            .blockHashLookup(blockHashLookup.orElse(number -> Hash.hash(Words.longBytes(number))))
+            .maxStackSize(maxStackSize)
+            .build();
+    frame.setPC(pc);
+    frame.setSection(section);
+    stackItems.forEach(frame::pushStackItem);
+    frame.writeMemory(0, memory.size(), memory);
+    return frame;
+  }
+
+  private WorldUpdater createDefaultWorldUpdater() {
+    return new ToyWorld();
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/toy/EvmToy.java b/evm/src/test/java/org/hyperledger/besu/evm/toy/EvmToy.java
new file mode 100644
index 00000000000..58957758315
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/toy/EvmToy.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.toy;
+
+import picocli.CommandLine;
+
+public final class EvmToy {
+  private static final int SUCCESS_EXIT_CODE = 0;
+  private static final int ERROR_EXIT_CODE = 1;
+
+  public static void main(final String... args) {
+
+    final EvmToyCommand evmToolCommand = new EvmToyCommand();
+
+    evmToolCommand.parse(
+        new CommandLine.RunLast().andExit(SUCCESS_EXIT_CODE),
+        CommandLine.defaultExceptionHandler().andExit(ERROR_EXIT_CODE),
+        args);
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/toy/EvmToyCommand.java b/evm/src/test/java/org/hyperledger/besu/evm/toy/EvmToyCommand.java
new file mode 100644
index 00000000000..00e875d1849
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/toy/EvmToyCommand.java
@@ -0,0 +1,236 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.toy;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.Code;
+import org.hyperledger.besu.evm.EVM;
+import org.hyperledger.besu.evm.MainnetEVMs;
+import org.hyperledger.besu.evm.frame.MessageFrame;
+import org.hyperledger.besu.evm.internal.EvmConfiguration;
+import org.hyperledger.besu.evm.precompile.MainnetPrecompiledContracts;
+import org.hyperledger.besu.evm.precompile.PrecompileContractRegistry;
+import org.hyperledger.besu.evm.processor.ContractCreationProcessor;
+import org.hyperledger.besu.evm.processor.MessageCallProcessor;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.evm.tracing.StandardJsonTracer;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+
+import java.io.PrintStream;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.List;
+
+import com.google.common.base.Stopwatch;
+import org.apache.tuweni.bytes.Bytes;
+import picocli.CommandLine;
+import picocli.CommandLine.ScopeType;
+
+@CommandLine.Command(
+    description = "This Toy evaluates EVM transactions.",
+    abbreviateSynopsis = true,
+    name = "evmtoy",
+    mixinStandardHelpOptions = true,
+    sortOptions = false,
+    header = "Usage:",
+    synopsisHeading = "%n",
+    descriptionHeading = "%nDescription:%n%n",
+    optionListHeading = "%nOptions:%n",
+    footerHeading = "%n",
+    footer = "Hyperledger Besu is licensed under the Apache License 2.0")
+public class EvmToyCommand implements Runnable {
+
+  @CommandLine.Option(
+      names = {"--code"},
+      paramLabel = "<code>",
+      description = "Byte stream of code to be executed.")
+  private final Bytes codeBytes = Bytes.EMPTY;
+
+  @CommandLine.Option(
+      names = {"--gas"},
+      description = "Amount of gas for this invocation.",
+      paramLabel = "<int>")
+  private final Long gas = 10_000_000_000L;
+
+  @CommandLine.Option(
+      names = {"--price"},
+      description = "Price of gas (in GWei) for this invocation",
+      paramLabel = "<int>")
+  private final Wei gasPriceGWei = Wei.ZERO;
+
+  @CommandLine.Option(
+      names = {"--sender"},
+      paramLabel = "<address>",
+      description = "Calling address for this invocation.")
+  private final Address sender = Address.fromHexString("0x00");
+
+  @CommandLine.Option(
+      names = {"--receiver"},
+      paramLabel = "<address>",
+      description = "Receiving address for this invocation.")
+  private final Address receiver = Address.fromHexString("0x00");
+
+  @CommandLine.Option(
+      names = {"--input"},
+      paramLabel = "<code>",
+      description = "The CALLDATA for this invocation")
+  private final Bytes callData = Bytes.EMPTY;
+
+  @CommandLine.Option(
+      names = {"--value"},
+      description = "The amount of ether attached to this invocation",
+      paramLabel = "<int>")
+  private final Wei ethValue = Wei.ZERO;
+
+  @CommandLine.Option(
+      names = {"--json", "--trace"},
+      description = "Trace each opcode as a json object.",
+      scope = ScopeType.INHERIT)
+  final Boolean showJsonResults = false;
+
+  @CommandLine.Option(
+      names = {"--showMemory", "--trace.memory"},
+      description = "When tracing, show the full memory when not empty.",
+      scope = ScopeType.INHERIT)
+  final Boolean showMemory = false;
+
+  @CommandLine.Option(
+      names = {"--trace.stack"},
+      description = "When tracing, show the operand stack.",
+      scope = ScopeType.INHERIT)
+  final Boolean showStack = false;
+
+  @CommandLine.Option(
+      names = {"--trace.returnData"},
+      description = "When tracing, show the return data when not empty.",
+      scope = ScopeType.INHERIT)
+  final Boolean showReturnData = false;
+
+  @CommandLine.Option(
+      names = {"--repeat"},
+      description = "Number of times to repeat for benchmarking.")
+  private final Integer repeat = 0;
+
+  private PrintStream out = System.out;
+
+  void parse(
+      final CommandLine.AbstractParseResultHandler<List<Object>> resultHandler,
+      final CommandLine.DefaultExceptionHandler<List<Object>> exceptionHandler,
+      final String[] args) {
+
+    out = resultHandler.out();
+    final CommandLine commandLine = new CommandLine(this);
+
+    // add sub commands here
+    commandLine.registerConverter(Address.class, Address::fromHexString);
+    commandLine.registerConverter(Bytes.class, Bytes::fromHexString);
+    commandLine.registerConverter(Wei.class, (arg) -> Wei.of(Long.parseUnsignedLong(arg)));
+
+    commandLine.parseWithHandlers(resultHandler, exceptionHandler, args);
+  }
+
+  @Override
+  public void run() {
+    final WorldUpdater worldUpdater = new ToyWorld();
+    worldUpdater.getOrCreate(sender).getMutable().setBalance(Wei.of(BigInteger.TWO.pow(20)));
+    worldUpdater.getOrCreate(receiver).getMutable().setCode(codeBytes);
+
+    int repeat = this.repeat;
+    final EVM evm = MainnetEVMs.berlin(EvmConfiguration.DEFAULT);
+    final Code code = evm.getCode(Hash.hash(codeBytes), codeBytes);
+    final PrecompileContractRegistry precompileContractRegistry = new PrecompileContractRegistry();
+    MainnetPrecompiledContracts.populateForIstanbul(
+        precompileContractRegistry, evm.getGasCalculator());
+    final Stopwatch stopwatch = Stopwatch.createUnstarted();
+    long lastTime = 0;
+    do {
+      final boolean lastLoop = repeat == 0;
+
+      final OperationTracer tracer = // You should have picked Mercy.
+          lastLoop && showJsonResults
+              ? new StandardJsonTracer(System.out, showMemory, showStack, showReturnData)
+              : OperationTracer.NO_TRACING;
+
+      final Deque<MessageFrame> messageFrameStack = new ArrayDeque<>();
+      messageFrameStack.add(
+          MessageFrame.builder()
+              .type(MessageFrame.Type.MESSAGE_CALL)
+              .messageFrameStack(messageFrameStack)
+              .worldUpdater(worldUpdater.updater())
+              .initialGas(gas)
+              .contract(Address.ZERO)
+              .address(receiver)
+              .originator(sender)
+              .sender(sender)
+              .gasPrice(gasPriceGWei)
+              .inputData(callData)
+              .value(ethValue)
+              .apparentValue(ethValue)
+              .code(code)
+              .blockValues(new ToyBlockValues())
+              .depth(0)
+              .completer(c -> {})
+              .miningBeneficiary(Address.ZERO)
+              .blockHashLookup(h -> null)
+              .build());
+
+      final MessageCallProcessor mcp = new MessageCallProcessor(evm, precompileContractRegistry);
+      final ContractCreationProcessor ccp =
+          new ContractCreationProcessor(evm.getGasCalculator(), evm, false, List.of(), 0);
+      stopwatch.start();
+      while (!messageFrameStack.isEmpty()) {
+        final MessageFrame messageFrame = messageFrameStack.peek();
+        switch (messageFrame.getType()) {
+          case CONTRACT_CREATION:
+            ccp.process(messageFrame, tracer);
+            break;
+          case MESSAGE_CALL:
+            mcp.process(messageFrame, tracer);
+            break;
+        }
+        if (lastLoop) {
+          if (messageFrame.getExceptionalHaltReason().isPresent()) {
+            out.println(messageFrame.getExceptionalHaltReason().get());
+          }
+          if (messageFrame.getRevertReason().isPresent()) {
+            out.println(
+                new String(messageFrame.getRevertReason().get().toArray(), StandardCharsets.UTF_8));
+          }
+        }
+        if (messageFrameStack.isEmpty()) {
+          stopwatch.stop();
+          if (lastTime == 0) {
+            lastTime = stopwatch.elapsed().toNanos();
+          }
+        }
+
+        if (lastLoop && messageFrameStack.isEmpty()) {
+          final long evmGas = gas - messageFrame.getRemainingGas();
+          out.println();
+          out.printf(
+              "{ \"gasUser\": \"0x%s\", \"timens\": %d, \"time\": %d }%n",
+              Long.toHexString(evmGas), lastTime, lastTime / 1000);
+        }
+      }
+      lastTime = stopwatch.elapsed().toNanos();
+      stopwatch.reset();
+    } while (repeat-- > 0);
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/toy/ToyAccount.java b/evm/src/test/java/org/hyperledger/besu/evm/toy/ToyAccount.java
new file mode 100644
index 00000000000..dd6971d83f4
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/toy/ToyAccount.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.toy;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.ModificationNotAllowedException;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.account.AccountStorageEntry;
+import org.hyperledger.besu.evm.account.EvmAccount;
+import org.hyperledger.besu.evm.account.MutableAccount;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.function.Supplier;
+
+import com.google.common.base.Suppliers;
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt256;
+
+public class ToyAccount implements EvmAccount, MutableAccount {
+
+  private final Account parent;
+
+  private Address address;
+  private final Supplier<Hash> addressHash =
+      Suppliers.memoize(() -> address == null ? Hash.ZERO : Hash.hash(address));
+  private long nonce;
+  private Wei balance;
+  private Bytes code;
+  private Supplier<Hash> codeHash =
+      Suppliers.memoize(() -> code == null ? Hash.EMPTY : Hash.hash(code));
+  private final Map<UInt256, UInt256> storage = new HashMap<>();
+
+  public ToyAccount(
+      final Account parent,
+      final Address address,
+      final long nonce,
+      final Wei balance,
+      final Bytes code) {
+    this.parent = parent;
+    this.address = address;
+    this.nonce = nonce;
+    this.balance = balance;
+    this.code = code;
+  }
+
+  @Override
+  public Address getAddress() {
+    return address;
+  }
+
+  @Override
+  public Hash getAddressHash() {
+    return addressHash.get();
+  }
+
+  @Override
+  public long getNonce() {
+    return nonce;
+  }
+
+  @Override
+  public Wei getBalance() {
+    return balance;
+  }
+
+  @Override
+  public Bytes getCode() {
+    return code;
+  }
+
+  @Override
+  public Hash getCodeHash() {
+    return codeHash.get();
+  }
+
+  @Override
+  public UInt256 getStorageValue(final UInt256 key) {
+    if (storage.containsKey(key)) {
+      return storage.get(key);
+    } else if (parent != null) {
+      return getOriginalStorageValue(key);
+    } else {
+      return UInt256.ZERO;
+    }
+  }
+
+  @Override
+  public UInt256 getOriginalStorageValue(final UInt256 key) {
+    if (parent != null) {
+      return parent.getStorageValue(key);
+    } else {
+      return getStorageValue(key);
+    }
+  }
+
+  @Override
+  public NavigableMap<Bytes32, AccountStorageEntry> storageEntriesFrom(
+      final Bytes32 startKeyHash, final int limit) {
+    throw new UnsupportedOperationException("Storage iteration not supported in toy evm");
+  }
+
+  @Override
+  public MutableAccount getMutable() throws ModificationNotAllowedException {
+    return this;
+  }
+
+  @Override
+  public void setNonce(final long value) {
+    nonce = value;
+  }
+
+  @Override
+  public void setBalance(final Wei value) {
+    balance = value;
+  }
+
+  @Override
+  public void setCode(final Bytes code) {
+    this.code = code;
+    codeHash = Suppliers.memoize(() -> this.code == null ? Hash.EMPTY : Hash.hash(this.code));
+  }
+
+  @Override
+  public void setStorageValue(final UInt256 key, final UInt256 value) {
+    storage.put(key, value);
+  }
+
+  @Override
+  public void clearStorage() {
+    storage.clear();
+  }
+
+  @Override
+  public Map<UInt256, UInt256> getUpdatedStorage() {
+    return storage;
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/toy/ToyBlockValues.java b/evm/src/test/java/org/hyperledger/besu/evm/toy/ToyBlockValues.java
new file mode 100644
index 00000000000..300014d3878
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/toy/ToyBlockValues.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.toy;
+
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.frame.BlockValues;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+
+public class ToyBlockValues implements BlockValues {
+
+  @Override
+  public Bytes getDifficultyBytes() {
+    return UInt256.ZERO;
+  }
+
+  @Override
+  public Optional<Wei> getBaseFee() {
+    return Optional.empty();
+  }
+
+  @Override
+  public long getNumber() {
+    return 0;
+  }
+
+  @Override
+  public long getGasLimit() {
+    return 0;
+  }
+
+  @Override
+  public long getTimestamp() {
+    return 0;
+  }
+}
diff --git a/evm/src/test/java/org/hyperledger/besu/evm/toy/ToyWorld.java b/evm/src/test/java/org/hyperledger/besu/evm/toy/ToyWorld.java
new file mode 100644
index 00000000000..b49d4930e5f
--- /dev/null
+++ b/evm/src/test/java/org/hyperledger/besu/evm/toy/ToyWorld.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.evm.toy;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Wei;
+import org.hyperledger.besu.evm.account.Account;
+import org.hyperledger.besu.evm.account.EvmAccount;
+import org.hyperledger.besu.evm.worldstate.WorldUpdater;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class ToyWorld implements WorldUpdater {
+
+  ToyWorld parent;
+  Map<Address, ToyAccount> accounts = new HashMap<>();
+
+  public ToyWorld() {
+    this(null);
+  }
+
+  public ToyWorld(final ToyWorld parent) {
+    this.parent = parent;
+  }
+
+  @Override
+  public WorldUpdater updater() {
+    return new ToyWorld(this);
+  }
+
+  @Override
+  public Account get(final Address address) {
+    if (accounts.containsKey(address)) {
+      return accounts.get(address);
+    } else if (parent != null) {
+      return parent.get(address);
+    } else {
+      return null;
+    }
+  }
+
+  @Override
+  public EvmAccount createAccount(final Address address, final long nonce, final Wei balance) {
+    return createAccount(null, address, nonce, balance, Bytes.EMPTY);
+  }
+
+  public EvmAccount createAccount(
+      final Account parentAccount,
+      final Address address,
+      final long nonce,
+      final Wei balance,
+      final Bytes code) {
+    ToyAccount account = new ToyAccount(parentAccount, address, nonce, balance, code);
+    accounts.put(address, account);
+    return account;
+  }
+
+  @Override
+  public EvmAccount getAccount(final Address address) {
+    if (accounts.containsKey(address)) {
+      return accounts.get(address);
+    } else if (parent != null) {
+      Account parentAccount = parent.getAccount(address);
+      if (parentAccount == null) {
+        return null;
+      } else {
+        return createAccount(
+            parentAccount,
+            parentAccount.getAddress(),
+            parentAccount.getNonce(),
+            parentAccount.getBalance(),
+            parentAccount.getCode());
+      }
+    } else {
+      return null;
+    }
+  }
+
+  @Override
+  public void deleteAccount(final Address address) {
+    accounts.put(address, null);
+  }
+
+  @Override
+  public Collection<? extends Account> getTouchedAccounts() {
+    return accounts.values();
+  }
+
+  @Override
+  public Collection<Address> getDeletedAccountAddresses() {
+    return accounts.entrySet().stream()
+        .filter(e -> e.getValue() == null)
+        .map(Map.Entry::getKey)
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  public void revert() {
+    accounts = new HashMap<>();
+  }
+
+  @Override
+  public void commit() {
+    if (parent != null) {
+      parent.accounts.putAll(accounts);
+    }
+  }
+
+  @Override
+  public Optional<WorldUpdater> parentUpdater() {
+    return Optional.empty();
+  }
+}
diff --git a/evm/src/test/resources/kzg-trusted-setups/foo.txt b/evm/src/test/resources/kzg-trusted-setups/foo.txt
new file mode 100644
index 00000000000..c22cfff7515
--- /dev/null
+++ b/evm/src/test/resources/kzg-trusted-setups/foo.txt
@@ -0,0 +1,4163 @@
+4096
+65
+97f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb
+854262641262cb9e056a8512808ea6864d903dbcad713fd6da8dddfa5ce40d85612c912063ace060ed8c4bf005bab839
+86f708eee5ae0cf40be36993e760d9cb3b2371f22db3209947c5d21ea68e55186b30871c50bf11ef29e5248bf42d5678
+94f9c0bafb23cbbf34a93a64243e3e0f934b57593651f3464de7dc174468123d9698f1b9dfa22bb5b6eb96eae002f29f
+82b8775b874067bdd4479ac237f8d56036a742c17901354caaf38bf8c70e696650fbec76f0cd941ed8c658f44ea359ff
+a7ce299c79c7d7e4f1adecd754c5aff8a720728ab27f5737b7b399f72724407ac54965088596375b8c876665ed8e4ff1
+81ca4c808a76a6f217f8b0540ff400199295da69b2587b7be6aeb56447fa4fac08d154a27c4aa6082bc40660078d36e9
+a70bad5311c97f1f3fea5d3375da1a11ba948aca41609ea28666dd343e07af766834e1256dc685ac1dcd915073250864
+a91c2911a658ba79f56abe30716a3398387630e785b351b07344022a04b2f5c90de5573bd6e8048fe8878dde19336c5b
+a8c560283fce9813bcbaddfb78cff93efcbc39b33025cfad94ebd40942a9fa605d2a947dc3a1f03c2e454075892e96bf
+aa14f07fbd2c1ce7bd995e335c69b5f675ea573517c1834e787b30ab4fa10aecc62ecc5e617ac8a539af1aff114dc9ec
+87f03429aff126b7c5a918423da278e17b5f48a4cdd6d34dba77a75f4f99e26a417e65d6a8579bcb2eaaf1d4d8c64dce
+b1ac81ba91ede78315f712d524e9d821a152203f04141ba77f4e481ad5881473dff14a71788ce941f0905b429e7ee5b2
+8f5c2af611ddfa3edf7e442d00e56a24d615bac848c05070c908c741ba18b67eb2e82e6651c9b3c70fb8edbf051810c4
+aa4115b19221e4d17cc335d4f9b0aad22df566231f2286d550e97ff2875cbc419edfa189c4ecb24001123b95c6aaa2da
+b363ba913969df0debd4e2712ae6e9177ce82e169ce7e0ff1d7616ef8e352aff3efb40fffbf7bff1b21cb8a33e19b455
+b1013d778727d20466778cea47e1bf56a77168a8ce1b33bb1265f66438ab2bf4a7df4f4142b8681f2993ea9baf798d17
+83b7250ee17d8529207db97b73c1c4a92ac076951a577ce2fe3a2cd633b461c1820c139ab36a895a5962e143c6198386
+86d180bd2f0a4919764e6f4e846ec0d5ebe44060ec1e529ed15101d7e531bf1b8f9412916ea5aeb93b37b2d7c6bfb408
+827451462c79d74b504c01bda199481b3c70416f66a95b2216686ca4d48da48932b0d323d0cd630a1e86e8033e832e5f
+b789d217cb12c334fedff0ae01f85b96e968fb98761755d1ba3ee17934e8fbd83172225df7c0c6cb99432a30a0ef8c24
+b730e5412dfbd646b0d2fe084a1a32eb5596c3fe8a5bc0f430151804f9e67f05f70b522e9aef08082b0afdc652a1d213
+9987653bacd9bc1659b17f6964aec06ea63b787813d4601bee0479706aed5595ac82c87ed4f96f0cd30c19e1d9510a91
+9506a9ba38f1d26c35a17c7e2554e28eb347a19cef523846a2559fb80fb40306b2f85bdc2c9fb98c2267df21c1ee3589
+98dda58de74c0cdaef97b2826b4a9d53c9e9ea592dc0a755ccf5b3fbc1264979578563f5979aaa246e679918053c5f83
+b00aaa16841ab53883af481e2f925050f5f7bf7d8088bc696f55f30593bdbbaf434f5d2b46095ed097b6cdb96c8fbc3b
+b463d656480f89335d3a840a7b9398877003985388871b148ba708c60f9857c7585ef17c8b2ae67fbb191c04ad61e692
+80af54f3d0584126e23635276d650292baf7e3e12bb06468708107bcd80937d36575721ee7472c5f085ffa71dbf438ad
+94ccb8ade84e834685110c96908b42e10d2184208f434d7f98d96cc158e0c0c95135979600e5e9f465d5846b0bb3c787
+8e13674b00c633d7cceb4f6ecd61e4f99420d6cccf9db5e81f8c90f6c661bc76e10939b83b56c225fce8565f525d4fa4
+a46a15b2e671c1a1df2490768dec1093caf537e1a21fbc11ff8ba8b21b9f2be8d50257027d9357df20d9fbb1307d7249
+b8ed532d48b0533a3084d7a5eea7b401255c5825e9a1b80ed81fd530cd69e347d152b1ad8a899acff7d68e0103bbfbde
+ad6b7df980ebaa24177d830c4aa522d6179a9a489257f60ee6604cccc2cbe90fb1f72aa9d5bee0d3a88f73b179485f56
+a56855e9fcf62ceef3043991a93ec24f8f6b5667ef5fb7ad1771249ece68a73580ec3cf3e58a009ca4650c01241ad172
+ab2f25517d4b0b33d317eb78d091d3c3f98dc352b8a3e4650f7005f9327129e23d95f38eaeda5e9b51c50a31d20a4c20
+a2d4071385b8a421da86f39739eaadcdea5685466feb6ac083cba0ea4c71dbbdf655032097276d703f9a77a4ca6fab03
+a8681d7c258984f01e92e92c95738692b7bbd59c3a802adf4dda8d34add69590b080391c09e98e3b75c085c9f191e5e5
+97685643da6c07b5e5fe91393122813ba11c8ef3dbd43a03b3a22a7a1603201fd516c1929418eafb14039270694c239a
+a7bb3b85d6101e4fb0bcf540f52041cdb3e819d517465e342b832f0e91346a9a18bdb38845ea4d2b71ab87ef3bf59f96
+8afc90b7d35336fdcf8f81cd024e921e244520ecfcb5a3994f2bbd595366b68bfa792a8dceb11e1e889b11432c9dad6b
+94d9db7bd04f962d8d6caa3b7aa0f19acbd58a09d35ae187158d77e537d2fc65215f51f1afd62d4ba378e7d176a680f9
+ad62d7c01b14b6f97e6084ec9f9d084f106a7ff3d603032e6e34c027cdce4b0fe3c20ac7931f1209439a59c9fede4815
+a5b44a87bd0ada7498e011e495a2818a8694746c4e7dc9d24c0c1096f54be6439e08c1b11c10d7c4bf68fe392000e971
+828626c6609acc599f1bf216e9a4310fc3cb227e0d2e47bfe3360239427c8b0cc300cddf92456a5c36620596a6d37027
+8380f91baac6447dd39886455ec5d99b874ac114a3c6a6ded18fc4ef69c2208ec19732428d8329d200a69f31792b852e
+85a8389b522b0a686234450165514127006baaa3907f6eb29c976522591a542ffb681b3b88c4886814fd7ba3cc8110f7
+b8ae7949ddafad37c0bc4d48325a7cbcd3096fb92c04a027c650a03cc609c7eac250d6a7ba341616bc36f64f1b4c8be4
+8f9b9d2c2ab5c85abe946ed9986e0f304281b277d4d48c7760ea2331b55a9e9a1c4d53a6bdd83fa6294f421ca7431e29
+9464b906ea8bc994b31e03c5f2af2be0724a43293fd42cbd2263b2de75a2ec04832d1100ce62ac2c0708f05fb6bb3ce6
+93d923f6805e7cf972d8387b352d77215724a3e1f5489c4114fcf0b25fc2231963eda872387a1369a02b2e8b888d6427
+aba4af392884eb7283fc5611ddc1cebfecf9477462e951bdae650e311606e129b4424452a3a14717146f954a7fa1cfc3
+a8d0bab694d116e4f21fa19ff8fa4c6fe4061dbb54cbceda8235a7e05159737f87e008beccb90df0bac9c7d572281903
+85743e3ecbac7ae04a81a09c2961397aa4bd20401533cd24d5fc0693cbfbdd2b37bbee6dec2ae5d0a66250d1fcba6944
+80ae913447d7d3f6c54f9cb584aa1603308146daeb3024c8e06ede66ddc97821df09f9591453e9b617b828a02d54c719
+803c2a64bb1c68890b5f1909be3aa180830ee3ef316d3aac38bfd909e2b19d890525e18e8fc2f405ee70ac14f5569b3f
+964d2968724eb790f2f42263fcaaa1869c373b57b3eeee904f8b36f13169f07d5e29cb2b03c74d3a7adb772e91d5a59a
+98a72ce71a57262aa058643a5cd39af64cc9eee88bef7edb003143983f29d87c7f9658b1ec89712f79f6f79dc24a6a45
+91f3479c5d7c76acd2d51883961179efc975c714720187cc9c0aa7aeff71ca1b3e2db5b0a90fd3ff6abf880ebc49fe36
+84312757edd09f111420bfede10ed3c1fa39d1723ddb9bd4d0004c829f0c1eb060e9648fd75f2e5427a67a5b37945a9f
+95edd726cf4042a082d786262304c51d8d5e6a89b1b58e825a11febe5f861d5ce076bdcb2fc0a5dfa95eb2e5b0ffc32e
+96500da38f942871d78fcc46cda1e72944c7888b538b82e2a979f149e5061a20c7602860f82b76510d02efdf3a911f5a
+8ac62eda98bef8864df243696b53651a02a391b898535d2d76ac5a8e9322e0178a290c83f5afe72ffe80ad56183469e3
+8ab2d4427fb6d3da5cf6c59835bdb39fb0c2de82c213b5de77edae3304458ea505511bd98fda95bdbbb9058bd5e92c34
+ab67c4344a5080930029ca3b803883ad05ca004ddefb48d5164e71a1c6dd96b27aaec70f62b39bb126ce1a57bbff1453
+86c6bf91686bff714a873a78b0fe449db5317a5172a0a14eb3a96b2997b888d5d3f440de8baa32a6966fe44c3625b014
+81d4f1e9d9e550125290d993a4886d46aac8cb29dbbba1e608aefc3432569c5faf14d8b49fcb485d9b75b649ad6b2fa5
+8594140f253ced6fa98dd90ab4f38899916bcc6f1052572f182e46c00752f3053c390512338a0bc8f8c27a91916b855f
+911284d4fad4999bb37590206d582b9e62ffbb815f414fd829f5b2843e6f0e1a132cd64464c131d5a0f476469a37daa1
+8631a6a4987410982db9c0ba632023a5b613f553b6b8ffd3cfd501b2417523ba8cf06741c62f24b405554bd93e39e626
+906ac35d22794a10a7273fdbca499fd921799b1ce9414643779dce9e1ec37920a5aa2caceb4b70a0eaf56c6032ef1b43
+87374cdb8b7a1ce3c182b31eec465d435e35df782fe3a11f421462b48cf56c6fef2a9cb8ee4fe89672ba7804156d9e3a
+a1f825e0246eee506c8ce40f849a17f75e8a0d6fc3f68b6a4dd431173b4fe997d30dca53005829e4e2422a4077ce35c7
+875ad0379abd9873f6634692e33e9b36353e1a0d15b13d3215eb591244e1f236eb2f8f75274ca7f096179d1714fa68b7
+b87b4e1acc09c5701fd9d75375ab896f178c1b3648fb9a2e2c6e1478778156decc32cd390766f3e80b36beb1e3a6bdec
+836ca80949269eb52395776ac5ceb35b7df717a981c5cbbbb627f73c274aa8164e973a7b01012fa72a02404e878a9918
+a770b13a8f07f74e5a75842b18f2520f6d0be42c865a29dd81bfe485e69a83c40ad10ce229afce276ccc9cb46c54b912
+b4b919322bba2866baeed38bf0e2389d4fe6ab6166597e87dbfee75acac7c2f5ad3bef55293b56957c103d5825051bb5
+b6171f1bbeedb3ee1af368c9c9f327d1dc3e55aeaffbe15f14db8038cd72540b62fe65f44ad0b5486dcf4023f0e91af8
+8e42d0c1e8e8c2ccaf06edcc3c686aed56b8c987f9d68f20937fc088120a410cb92fb0ab45bba5db70b86876015a6b72
+937bcff1af9685fd0d1f6616acf91d97ac9fcb1eb96d49d1c880c9945c1fcf1414f63d59fb78348d08a8546f6e83e407
+a6eeb4873c0531fbcd407c2e702c68e4980fa77c9c032b9913b89031702cfa56f335fc413576c37ac4d523357a841203
+b3962b5eed69cfa27fb94edba74b6cedd7569352ea71861494dd579da96d9743655b6308e54f8a42ee6d7e805c1bc0f9
+8eea944dce7202b033ce734c9e88e82dd760c916e00b217cf1f00bf6ec5f20e21885d5fe95d6138871d167de4c46359e
+81e6c7b356e2703ee333a9dfeb2b54260636422b9bda118e0523a20ce83b30fefc2f019e8291a8db05d207f0fa7332fb
+83817f6164dc9e8e2506252511cb9871a8c9b595dde45f67e75ce3505f947b3fb3b804c18c054ad13b1518a98f59f008
+a9ab4dbe7699e7982cd750d7effe031f273fab6b2e024a0b4f8beccb5c280903bcd3f2400b9cac7e8c94e157b4658ab6
+84d2e3bc66fc6b59a1ee98b8981ebca0901d846c40d207e5bb5004ec9339d28956d16f054af52453f6a7ff3fc66c346b
+b24bf0f69c3e86f610b6d27885ac5f4556fbb14e8286681538ddbb0b4921aa0d5604fedef0daf4a514ae15268a640174
+a4be967f7f31995562669bf9587f5463bd1d9873fe9169687790e75961efa5ce2252fd21276d022f580de23527282838
+a3f3c4e673b302bdb91fa3cbdec88499752e6ffe37e2215d69b8a426f4da98c3a10e4c659e77c656172e4e8b1b1a41bb
+b704ffbb3434563bbbce69ca7e812a8bd30757b1e90630bf3261735f9ea221524b36f97dec324ffd209bef45bdf6f2b4
+959dde49f15c663a2de000195e182a11d8c396c1380f98322cbe5521b697bc3bec3223ca9e94ee2734c4ffdfb6a19e8c
+a469685143cd82b78d7b1854c350da63819d9d86670e9b35a72381d0362cf5c3f1d24e22ef2ea6a12176c9dad39fd51c
+adb97ef4463e5e13d91b75a3086d72a841a60be278e9651d9ac5f76c9537bac5eac33424a1ea00522b3357fcefea0738
+a4597b2ced7566576e71b4f105b5ee48aa4ffca93901e9b626f7059824f53be3e8f3560e6861285f3d97fe88054fee83
+a18d9b1b81564447f798ce5966bf10c823aedb14b143972eb4dbbba9312fc79f46635aa016cd20c53be90f170f06fb84
+ac4724069177d3c6ac1b72ea2a7d6bc5ac3d4b2a4dbad124152fbd170c9c1038cdcf255d162a25c14ae8df11a3849945
+892683f64179ba84f6a447c5c7489e3cdf02474d2837dd7bf3b82a4dd05a6461ce94fff28d65b9539cacaf47dddedbc1
+a68ad797bbc1b2909e216a0b3f39aa6c3e4dfc7a49f81a206b530ec0c6ba30f871e4a0053625aeb99448026ae2e0a6eb
+964ff8badf35b6b93be6d97209d87f4ac8847be1c2ac4bcafa1db5c3f604f61834c85b3dcf58af50d09bd03ff8d78f27
+b76dc9ec64b1fab7be269097a18a77144623d37bc656934fa1562817c922485e69b18ef40413ee309e100fde645fa7b2
+b2a812be6e69f284580ebdec5ae2cdffd587bc7eae10989e9d2f290498b1eaa934b148ec7783edec300be5d7a9b34af0
+85ffcabc623f8ffc58c5f640f857e27b7c105359315a3969f346e1366acb2af88f4acc025b299b9c324a8535c380a2c5
+8d0140f79fb8ef02d13b1d51c4ba1af5b5ffb19322f88912215d4198f9a592f7ec6800c8a3ca853a3b68f9bf0353a13a
+b3174deb53c1ebb6a1e16c915cac287573b70fe4e0036e8e971e8e807a77362ede632f6e3f29cb87a80a318213946ff1
+8c58d603f6420e3f55522ec2853065125af4e7773a909e28296552f7f8ec4691ada9211d834dca38e118f432b6cfe03b
+aa7ac268e155ff074bfc197844e21fc2a9f9aec9b50d9cda63f50d3c4fbbf9221e6fac3a6ba0f7e4cde71fecd493a15d
+a191337721bc9fd2d3ec2ca6f6f97ca2462ef5e207464bf9e746a650a67d69abb5f578a8238521cee3f704b275845e47
+93521abea8f38c103ebed3313a3af8f27f03c9a54681847f4201bf9f72f1f63064b18175986fca64f80b4380905e894c
+a1b9d063d6538885f9826b84944123d7d6027dd030aef29fd6229f4cf5d32404f7dd0e899a0c8f4b6bdf4649e8a8966f
+a15d5497f0fd2fd0b2c2e5df58a25a72a9d99df8215951ea58c15569d312c6f096f78034f6a8502f808e649f6cb9283a
+b3c275306852612362e1073d0f4da3ce598dc5fac3f3eefa22ccee35dd57a4caae347b43342cd1f6a6e068d3ea9fd30c
+94eb678e0700bf39caf428c65bbf2fbf7f601c39e382570a4df9186ff1dd5a958d78e051a5fd084e4f75536a14b7690b
+97b13995bbcb8e824bec28488994a830a9c1f34ae4c1a16d5528d57f09e4c8b5d81677ea9f979f0acb8cac629ee09c85
+817c99ad48bc05bd4fd29f952dbdc5ef56bb02f3442c18e3b91cb6d72ac2d2a5df901c099165ded1bee62c3ed13c41e8
+a884acf980f6470e11cff347692d8a7cb7860d4822112f7bfeb02efb05948ea98c837d5d98dd7a104aa36eb8f016a0f4
+95debd2ed23a23a16a393f59f666cfc864f63751238b73981faec4a85b4c04cfa11520c9e4cbe4e23fe80e86c260093a
+937b4691c59453bc6cf6468ed5b17dbb25496bfa3817798562cd5fd86ab5ee35745991afea2fe271ce0fbe5a990c41c7
+b4da98c879e6b475c540ff2c5501299f0e3e97b7b93beb45faef1253f7de96968898505e672cfc4a3ee7e20c1f72c256
+8ec9d806f344d0c675bb5ecd47c54defb5f059a5233dfb2d459632b9b22edd6c4b8c47fd7899ab13e35f37ede9b124f8
+aab4408410abb4d2cd98694f71b5452e6fab2690daa3066b3f9747e7dc40b57259d52e6fddeaeeca227b733d049b9694
+b85a12f39808961c331038159255140a61dedc56050345a2eb13b1f7d140ae07b353d68d22f2cf60925fe66e598213e9
+b61bc3bd68bffdbe9731f48fcd523491da04dab83add49fde390070513b9ad87a489010f1ccfe6f54e9a48edaf88b5f9
+8f50f6d8235824cf25031f09e4b139bd89c1090269dae95a5aa0dacaf5f9b59c329a5a3cdddf9efe6c77cd61f481dcbc
+91a543b85e18f34361d7df5ece8504d456627fbce65abff437007e9109359538a03996e35393a40f0586f962921eccaf
+b7557bc52931324dd4c58d0e63c89a8dbdd2d00d0baf79d81d7a062aedd2de9dd743ea30fb031b18c806ba03175d7e1d
+8e056b842a9af7aeb6c0d113a3acc8bfb5c6a8980fa81869747f75abef76b7fd20cb67694e70016e3de6e7821cde030b
+966c00fd6472bb13ffa531d8eedc145ffb7733114e0f4a6a9fddb34ab7601f6cfb056460f757636230b692453d8b31d6
+a25d85947c6939547fbee088e0131988053c5bb23aa2bd48ca764f4ef2b29235a817b8918d1de6865695977a95711e9d
+958567f217ce7a6d74861777801663d7175eeeca8ff62e240582fb603ac91dc402331034fb4855632352df2328fe0233
+85e53f3802a7d32dec2db84fad7f8c8fc856037cc0cd4ef9a8988e97ab580d4b929023f1fcde7633828b5e8bcdab08c7
+878d1fbbedee7f7ff72eaa3848d7f6bc3cd13b40149278b3afe5e3621e6d1f0386f8ede32971d3f33be189c927bef6f7
+b041e880e4ecb254f6f8d92635a1ef3be3d5d885c751f247bec2d8a016aada6a7fd2f7c599f458ee466886abe721bba9
+920747dac9f35ba0b2670f82c762a71ee9bfb9e490825fb7ed613bf2548ef4ea00bc01e9d2c952dd9c56f3586a3ffb49
+800005cefda1ddb860fd8974342fe315d227902dcb5f3736f8b9ad1fa2f8fbeff8c8ba0eb3f0c21a6706f288ef4bb13b
+91f2b822b728fc5d1f15b69a303985bab14c08df5e929decbfa5aa5689f3cd93ccfe19ab10499d31df9d38c84039e492
+957a909486abd85b1e627a4739c7d212cd03f2b62952045b704c415acdf2e6c0cc627af93f382836603f33d1a716ac7d
+9733ec7a30ed833cc1e7e0ada4badddb1cd1908bcbd3d4e4694576421c94090a9297aacd7f42d9d305b87d711828304a
+ac2785a0dadfd246fe12b63f759e9f021006cff4f06b2b5a9986f0b02a40f29513feb1c9044af6e27d1c5029b1e1db35
+948b22bddf55f4b4bc26892e83f70b882a0458582ed87fbbc81bbd037c946d833c19162327354240c42e05cfef55394b
+a49c5d81544028d56f4caf8699477bcda589c65f6754dd40a487ef88d93925008dc7fefa6d458619d51a54b3edb5e5c4
+ac57b8ca2d0623f5c4137cada67afd6935fb75fd82567f2c57cb22e89a0562d3c0716d5e903fc06694a8c2edbc9a6f1c
+ad52af6a0cf838bbca5a97aec5d87fee1aec4fcf5e802b8bbad1b110c31ed777de0b0ebf74384bae68289af20e351bb3
+b0c7c48d734e5a1b37674465eb07a629dbdf8f9080c44a578f3dd687261d9d1cc5cbdc084488c745c9114fd998bfefb2
+8a2b2ccd4c52d15bf7aa4a8847b8015bd53f58ee484589339b4510ef08a27db56178c15b4d79a9c6eba1ac0b641eaa61
+98f659a37bffd7a9b7759bb111412ea9e9eec483645511590f683064eaf15e1b101b5eac3b98f79ea38662b1956a06d2
+af6cda3fb2479b6f2d959f2d03e52b49afd12bdccd7a65a1bf6b91e345387924d5e355363f79bbe32a4624287cf4c1ac
+a24d325d8c2dbf9d2e346e3504154018937efb74246ee0658e68d148d9ad0f4bfe348ea9bdca77d4467ea1b3dc2fae5f
+81a729dad3798121027c29e9310d56e36a48c1c479cffe674cbf9131c562f541d7e6c52c2718025d3470b05b67cdd321
+95bd5cd6d9895c775e58cd4296ebefa51ab9e324418208c3c4d073be59410497a4d0daddba6c1e7373abc08e13d32b89
+809fa97a229b056def6b548902d8d90c873e496db6cb1b2d448709b9ae08d9b9762559666cd96b6bba396eebbab4ea4e
+8bcae63cc680494606e44037a3bf6dc7bae2e723e5ec3ac0451550b8ca7914ee1d4bed0f40adc3dfa45f8f80a36c11a5
+b3474711a0f933cf269e97e4e1e98762ddbbf49dd72e468f1e8a2f89514c1c35cb8db32d08dff50f93e50db43bed54f2
+9788a37c3d95310627deec58ba6d9e0324618469275276632a3fa7841fb127c8fefc1b7392064f2eecb508056bd346c7
+8d031fdb156023e185fe5fcac67b966baf9c098fddead4a6f1a3cef54d8e912d0de2d1e1d3f3f05da538eac4af5b6973
+a5efe72b86a714dbbae40fa69fbccf41042e0647d177cd60275700257aa583708130a64b2f9dcacde4fb636b5cbd5aac
+824092ea32eb7a8c619182d926f292cedce7ac3d3fc64f60d00fcd767649e1d6cffc20dd9c1d1c8ef6f64be315d1e2b3
+900ad22d3b63376b1ac80c7343a58df23c03c4e7d6e5740dc10d8cdee793be07fec09cfbdf29e1d1c6484d3077630d6a
+826815005550844ac5a6e831de0e25fadc49aff808cd601d70743d4873a341e3f0cd40d490422c87df3f3c40921fa723
+b39d189aea740c52b03660c0abc8e796cab72193ed44a4b1f59fd1ec0e283ef7d5e157ed23741eaf289cf968597c0900
+968ed61662d1e656e039900912ab61173b49d2e24aa6b7d3af07c3b04a2c89c4516540934aa543bb48ee14153780d10a
+a433b8b689007ecae7f1df15d442b0570664a2db6318de66c6e5fd68884615778d296bd260ab7d07469bfb5f6d8c94ca
+a69ed4a0f39920d1a62a01214daec143fb7596212e2439583df9ba508784ef4d2fe86334f0f9a6b7a3342ec0a72ef15f
+96f260d9cd88757e7c45201d57bd816f1cfd37587ba17a64997bf7716ca1c2cfe16a7119c36acf1754231f303058a9cf
+a51f2bb09d30028eeb0860e2de38094623e5b5514fd5d591a7d4a9731cd4b9c4c12c5dd6ef409e009dafb10d185d5346
+8abe821036140ccb3ff9063dcb5e8b8724cff1cf0784b8f44486c8380fc51715cf55b443cc20870f426c4874be93caeb
+acd73facb964d9012ad12405dc866beb52d8de3ef81fe966cfdb14d22a19bbd2e7ad3a29cf029617b9d6510ed323c6a2
+8f18f6883c8e4741cd6c52e0d3335dd71b5571446ee28e8c27cb0625f77a9f5bd0720d960e5e8970257907f503d58a9a
+b66457a91e7ddcf56c8ce4936a209c69ee53d71236b72ea386f7719c8b8c9b4ba4ea19039a8de17a0a869da427da42e7
+80b1de58bb3ac5f264e0273061f485e49413de604b5ade73ef81bc249f5e89ce97dbec7d99b088b5a2ff65c0bb93fa76
+8bdf276c88f80371ef0ef7e1224929681629aaebc8cba3c0db0b258be3c26cd17268f56369832f564b1679be33e98c69
+943cf6fc88678816da42e4f337c730eb2dd59f8d738ea638a799e8b77214ad7e74723056bae96b100f9a972155885d26
+91c8c1a8a61f47119005869c11edf0b69d0bcf40534b82e46aa96bb6107f940e582b6733f855144accb8dc21d79acc39
+96ba98bd291faa0904ca0398d6c50eb5bc2ab5a389c359ca42b8909f41f4fc37dcedc370ece777d5035074a597da503e
+b4598e6f889d319713a9896161a6c9bd8575ca30c21d3fdd37cff15dc0141ce28dc536f73957e6fc8f6185fc0adb731d
+af1ed593a0547c26ff729c159ef14bd0818f25e7c1c6c51ce8ce5425bd2526086eff9fa3341279daf82e480bfe431230
+8c02b9ad3aebf156c80fec9b012241f3794d736adfbe4a272faf505ab818cb121ad2ad7c2eb1716e252d0a2e7ee6b246
+8d2a8a31784c446eff4c2ed7b004009f08b86c87a4786a0b7be3df36ca9130a0ec42a58d09dfede1279a4a6d3d37b501
+a78b61be13005b1718a3aa3deba103ce71e1ff73163c76815f9cbcc101d993f119ca128a25c51a12fa52f46550c4b609
+b990d81d7aec9fc50d798eb8c38b40b162004f78730e9ed4a103faeea0995bb654893e557e5eee9b74046ddcaa70617b
+ad56d68777d0ed53d3331b0cfd44503b27435278416ac2268965d8ef711fdd819c16ef5499d8d7fddadd229c3d0d4bd6
+b5110140b9ee542ec03c945cd6180ab1af205537704fd408fc4490d799d87a3f3aa0f1f0ae9c8daa55c1757f7bb53cbd
+b7d8a4080c5eeb00be4540a00e65e744f4c7792b518c9fd2dbdd25abd0dd89e76563618cdb92e4cda0fe3ba4597508dd
+a880b33af98cc0bd1065767a2600145e6e326c3cee25602dd22d531c26c4b8543f846fadf679e26749c929310779d858
+941f124078990e03310cacd79e4a38667f4dac4dda4dfa3173a03c14aafbf538fdaa01b940fd5be770c1cde0a84bfefd
+b234e9d0f04da6efc5aa5c77bf71cb05001cd193178fdd546e4ec81875830113d3d4f1512e7405b16d0b3aead285999d
+b857bf6f62c4b19ca9441f700ea6676ffa3b0c7138299533ede59a9b9cf9b94295046e7eafcf1d4ecaf0341898ed6b15
+a2b0d74f17d3387566bb4f17dfef214cdc6b61dc50698fbbe298a7e2f4a82d20aefd719c5e82bbf4ba4fee0e2e35b4c6
+b5ffae433aafad3fd51ac137976e2c22661d8a286b221e0107baf19f5c8f2f6c7eac1e785f145bf7c16a497310fbf51d
+a69e9dfb14f8c6cda716166cb69f06879718656c9f46730d94f194e2888fec371a11c9701071bf8690e57996fa91d213
+a1f51ecd5c5d73155013dcf02b327cdbae9f9c2fbc62f73959050cd3a0bd66192213d1f4bb56a85cd21343722ff3f57c
+ab3e54b8f4829f1115694a4be7d16e8214c94387ae783263cfe145f965705d51943176191c706f6211c8be2699dc79a9
+8cd6a64c5d30149ca4dae4fb7e8974dce1200aba9be9c8cf9af5d43e40098746ecff7bcde7ff84a0072138dcd04c2771
+a52f6fe24305bcff685f2d047c9a8d9a1f70c2b416cfe55fc137c6b5b185029f3644890418873665712dba4886e3fc07
+b2e8e3d2ba2d64815bafb678dfc1180534186eca415bd8cd32b303bbac6cfb637b17200aa7cacb953e656ad19dd5c9b4
+b5412d1073b3b80bf0d18f791a6d02727cd9c40a86ab0f13ccfd847bf4e767b8b79aba3935194398da2c9cf17c6bfc8a
+8bbaee84aca9089585d5ff385dc2ee6e653d0fcb9088f98bc5fb1c6c83db026d9a73d77c33c6cae3268be90805d862fa
+9691343d1a8b7fcebefe2584b28ab5808764ed79d8f28168a65ca90b0094e7920fa43e56b960331209f4b8465cb8a5bd
+8ea475e12088d558f5cf6dea2da71837791093a622d5cbee608a95b4c8a61296255c1545d454562e371ea0e2cb2e0b1f
+951d6b404667ccca099d01328562790d1e8446231d7d22bc2b1c4c6b15785bf59f2099accc58817a06d24d59ff4e6a2f
+a5d012687f341eb9c783c1c2040388eb7ad662cfb2b84cd94d270bcc99116939aea80440d7ab726f9abcad22fcd90274
+818fb57b7a8cc59f06af054ce09dfef812f8f115eb2473d06c8f20fc50cf17423331aae1f843bcae57fe4e2926ad5aaa
+aad27bde8eaa2e7fb1a9a5ab531eb41f475afdc89b7f02085f7289f8f84d172fe516d0104560a40c89e97db7e5e836ee
+b8cd923efac1b09d9c6b1d97a0c1bce9fe4eba1d872eaa3c0df34dcff2e7ea2354f1b31b69c6b266944ec8cae2a16865
+af628e772d609224aa7cd3eddbbfe965fdae6a05cf6d14959c5c26c4806043afd5fef803091bec710c6854ec095ba18e
+b662e1d32704d96919f5dbefc3cc40e7d41d4124c5865b46408c2ee5c40926eed71fa3df71fa7ad349d476d9a525d7fc
+ae4c5512396f9c26381394ff8e22b1d6267e3d3a5d3fe48457450694520c5e173716572b68fc1dc352761991abd262b4
+86b530978a7e549e6ca014168fa4aeda9438bcd3a29f7edb1f4e9c712c16faa58b81b028c25a8e90b421b61a1766d7d7
+97b32f1371f76dac7a449295365780d1bd03f290a041b3d19db3f14bee6365a614ca356e7cbd6f966260420b451f6117
+8be97569ea08d0b6c4d46e9565ae14f79d1990f192a26ec935a865cedd6bb5f69f608b069f7d645877c5081fb4a68c54
+9733488f48de05f57f623752b80b37c91f6c9afc0f9b4df4cf400f3f82b137bdf06fee82190f2a4ad4aad20e964cc214
+a794f6dbf155666056529748a792be13011bee6ca10e0d55c82c3e84c5dfa1f370c8e8abf2971a75c73a4ddef3da3319
+95ff5d16c0d9bd679738257a1f7f309f257c20469f2fa41bcfadc671ad65acb249793defab591f515bb3d8072e2e05f3
+8d849150bf8dc3452839256ec4eb65cc9ef87aa0f90dfea4d1d486f16ee855d6c480a8fa4b6cf8d536e435f9fb7bf507
+b61c29121dca2bbc6024ad2f487bb57b926786ae60a9e7a721440787752432ba9c7e1df86ef0d74c2592d23f0e89326e
+819630a678e4a5e6adbde9b292f5c8f2b6e3f2ecc9bcec60ba0f8502e503f697b0ded4f0f7157b60ddc976ded66713aa
+b3525b071e26babf669ae2b98319b3516c083e797d74bd5b9b0e1f67792a2e8ab2c60921812690b5928de66290ff7b86
+a344c6670718b9824ae62b309813bd31984eefb5efee38052cd06812308edcc39fdee165f8164629267bc0e98fb50ba6
+81d78d54738817dadee7bf70a468a51728de0e9775f8779fea5d0d95e55b2004377b4e2db595d420f017af18a384d9aa
+848c97b9413ba6ede751ece925ba57b8f8ae27168c5d46347d39e0232a5eb42069a85f1ee2d30d8b94fde574642be5d1
+b020048c5a5a2d186df628550c6f61a204f16e6eb991283e975de520c4f916badc999b3b7e9402ccc39db5c0b510e2d4
+9298c1aec9664ab3fe328f532428e9b037efe8412ccfdd15e33c9c82dc3631e49f84e0d2d75dced85e3a4e0fd0f3f2dc
+8c4a78841f51e2f8b91defb0a3844933999f9884e2b324bd89a01e482756758b1b5a278289163409947c73106bf934f7
+b328a9db915c4bea1783218c7668e2bd7a8fa62e52d3a005a43590041d34ff388c0555b044ec5ff85368352a3643b7eb
+8a395d89469d374c1ec472c4d571ae670849549d05124907faae5a086519686683c1773d22d290ebdcfb8dab926d10b5
+aec52b8a883f4ff68fa5f418cc91c8e9d08ef324544356b0ac56a7f0980fab6b376b8f567e357ba96b408652b8e568ed
+af80f0c5d50ab23d8ad99c7fba504f2f02b7307b5ae5ff529142bead28d69c3d55f4e2226c44549548fdf761ce30cff2
+af73700803caf7b06f5453a620253731de33a458da01f5790106e9418fb59e7aecf6fc1d1b650e1c7b3456f7a55d4301
+8be3ee3caa86cbe21ce9998fe1c0de73ba6481125ef28e312002377676317b5ac4c27180086fb83794efbf86438ad27e
+a0439d051d06a7fbd5ab83f32f0f95364bc043d9d934ac64df7031223e731d7992206879d567e77f35badcb7623f03fc
+b99de1a16670fbbe3ec26ccd37399e2a23c96813c26428deda4f74dd3afdbd28cbe47e074379f6094b85176f8ab349fc
+8a943a039aa33f38d3887de4e77566d446e87225bb8333e3ea991466c15c6487077c6decb9cc10e5de6af03e6b81a10f
+80b109fb49ab810121fd411e4cb85773a1004af2d257e85ab5b4c99aad8d66e5803a8ca7b95587197e88abaaef0b8d42
+892148bd190b042fe9b7914b8aab073c0d19001158087077a5946690dd60d99a1ef372ac01e372a434d00b0568a75fd7
+a266dcc9ccbda054e396e1605eabde6cf79a028b697898090e9f34a4a4e0b771c121b8d470b14130a79cebc19f8d6e58
+b1ab30b97c76392712b173460c227247cac50597c036f674361c63c3638a4c03420fa5b7efdacd0496a9b83956cf5d06
+8a33c46084f669455ba089b369b9c8493a97c131f09c66f9347873504f35d6b94a09483b2775656ab32a12c7b9766ab1
+b77a7c1402edd9ae448b7a606ba2eed192a9bb8f852b647b6ed689b0a3ccb81a4632edbca4c113750f62643a0626e2a2
+8586e85e3bb07b07a39ecbd822d2adbfbf1fc66cf2377fbe6b1bc38369f86292c6cfdb5b405a0bc4d584c0600178321f
+80cfe5b1b032d5a28662d13772fe112e9b73c997f8ef0fc796576bb39e02189c3ec0228d192c981061dcccb9dd3c4f39
+873c085029b900d1fcbe93f8789d635e3a8fa558766701ba9fee76dcf05abb6cef518f2b56c4ca5e26f3847cf23bfd72
+ae8075937a23505f51a1a26f7f54e35caadff44ffc43465368daa9c330b553cb4548adbdb04e24c3977e35a08841c36a
+b1c7076afec527912f7648bedef633ea0e3b02e5fc3fc495779b93e8a9f64eb503f46a1372c8dcd8fc2572c198112da2
+b5233c4545bae360b07c4411776218a1d9040bad1e788e099f90149c58258ecdf01dbf246ddea48ac8fc2dcde6f34f20
+b62655a8376ce1ca225dba04cb29f1a95d09e1a20b58f0330c478c6acf931ae52268779d6cab87d9074a362b9e82b205
+9684e676088b409052773bb740bd3577bf0dc15d0392ea792393a158e643b165f8cbdd91cf355d5425682c77f2a91f34
+a892744cc0c428c97bc929913ada86c36f280f49bd1603e21bf6b6abf8ed195cb05b22e586f0c841ee02f234731985cd
+a62c089a73c6dcf3f7d957719c7d452962ee851d6ed8c4b57ade8a1e57156762c348fe5f20adf6d6ce47b4e98f93d60d
+91b29be6022d43937df9c597d19e23cbb83cb6f5b764e1f7db6cf60dd9b3e9c79f1f617c3101c60fe6c7af9b5719fd5d
+91d13fe99d7dd7b4744fa2fde41bb51f4edbefb2189ef3ca5d337ee84ca3f728e300aec19b96dee18aec090669c85400
+b17a5328808ca929b794dbf0bf3a3fc318f8df144a892ec0ac2163a0f7c3a4614d7ec433b66bc491c05a286fe986d986
+84a9e84bbecfc2aaf8bd623d79bd4240c630b81ecd55a50198de21758255207238179a345700e65d9bc6eec1a1a1985a
+8d428be451efbe630740449ab3677ce6f69d94d75c5a9d91d14b2493a838260d6418be3d4658fd15218eabe3adfe455d
+af11126224f6ff0e88a09dbc0de6db3c70e3db3f6e154deb448d044100f989ea41c6c0259a8ecefdcf531f892a957d82
+a51716b900a00277aa932bb03fb61eab3bd8e74edfad6153a06f85aece6f832af710f1477d883dd8e48931deca12bae9
+9542a82039c2d3c538f15da884f090622c5af556c16370d21bdd6544208cb17e0a30e511b0af4a618e8ef70d0c43af07
+af76f93250bd7bda2b5e30e6f88416ef6fc8ce0cb614515a1f8d81dec717077209493cb47b79e8b1a62e09e394038338
+8fa8d657f1d584b06d5bf41a52bc2c73853e4092290789df04eb8952c6eb236df601a1c6cc81de420a424d8e748dfc38
+a6e93e27421b9e32b170d240b4cf2710c97b49dabfc0ea25759c5f61937eb3da8d45a6400f8bcfbb42bc9a7ae9b66ef1
+81848c8d66d34d274b21dfc10bb36fb9497a1b152aad64a8f7c874e58d31d5dd5f39e30e6000b6d7b444e573da1e043f
+b85692a84154f87869d97cb5f16c81fb0559e097fc37473bb11dc9cbd311ab91a46b01aa9debcada590992c2473ef0fe
+b565371692ab0f0d899d8139d3eaacd213e7d23d6f5df6ac3409c961aca019ce861fb4ca8317f462be01e8c1dc7af154
+82ae2bda0228d36343f6153fbc41fc5c79fafbc03c99a7926c624dfa28ed0a1d215e11ab83cfd438fe5d85d7fee50363
+923f38a2f839e165fd197e1711ad52673deed9774e0590ff63ff9a9985f99612aabe003b9a98db2407c2878abc6d9b0a
+af8d5e1048de3b813308544705eeb0facbd604a0ed03e66c1d221be64cad35d71748d2a55d1ff3049e1e5053c7b1f712
+a90a4b3b9d3b7c87c34f85c7643fd67dc771caa940c9e2ea81294ce6c072eaed698368a0e8056d7b819ce3d73de4424e
+93a106e914d2c6892fee866602edfbf8d03dea1918d82d511e528b99c8423c260c0d103bfaf9992e0e24638b913af737
+864cb44b1adf5a59ce7baeda0ddec3a0ecedd42923205dfabf30dcdb216a7b760d8895dedab52ee09bb09e999486b521
+acb5f2bc1257c49c7df89837502e699bcb9652567c1716513f258f021755092954f2dc65b9766ffd9a10584bba424c7c
+86653b3a479bf6e10e781e316e61437af1abc988f59399bed8fb4ff128f5f6d53f50a293da58774acd42b8d342e52429
+926b7b90eb7d81fdad2a8a59e13b1573970e15c10515954b7c232c37955755b6758178314439ee6c3b0c881d4092c838
+ac05f011011a354f0e16fbbfb7e9dff03b3cf403dcc449eb5c71067128e314badf4d4dc5dca4b8616994ecdb15909c93
+8e063c6601e553f33abc64f9553db5a19ea794a1f254d5a5f7b8ff2db4ed9d180f68ec919a0f83142c5710813baef4a7
+b6e891dd4d44fd54120b7b8716292c27d4bc8744d96253a841433cf4b07895606db4a3cc5872c480616b863073bf77e1
+8dc623d7928234bfbb8cd0b4fce5c8d9a9db848ab0af967ba9c49daffdf719cf8b55e1dad0b7e421571b8770cdfe9df0
+b5b53f7d6b5d1af75e5a1720281feefb8c9039ef7f1e1969d83bed5a2f73cfbca91dbf4fb8179d9b0d3bd06d1207089b
+a5dbce9e6db637e053b4b4d3df07b724b50d11eacd3327ddfc5aa8f37b9a5bf628cc9b428328e16cacc552c1dba505c9
+acb82d6c9af9af0dd426a07b1aec81b388b61042bd601546cde248730ef85a09016bdc66dd014447fbb56fdcc23011a7
+a41692e96f1d775b3a9378b3634495a8350dcfa52b4b2b7773b39d36f7d349fd5ee9a2b3e72769ca98f2319319890216
+a0b4bd6a68ac5735539cbbdd78ee4faaef7d6488eb7a11e091d94e315cfcc49a90f204f636dd8033857378ddd67cc153
+ac3dab32427b0583159482f73f94236980d69f9f8f781b93f44aeb43dbeaa740c77898c38c57677b42c248b9bbb1d673
+a6cd1090b97826486f59a056ed90cde29f2ed821211391f2f16e66f1e8914398348cf6f0df6d3acaadab31f0382bb5bb
+abd1252b722aa56010e3bd4119f2a28a852e9ac1a8ce68c96b6da9d00fac0c9fa70e67cd4afd45e0a8042a810b8e0a91
+9194b629ca80b3bfefc0144553017343d0915aab59faa3d0e2bb3720dd3c8fe07804be6e582c6d57c764be96cd40f2c9
+b6bece03ae1c5935eb38b14f0f64d9d0b4410c02ac309e085a233c74bc3e67ce63edea56ea37f4532e8b864aecacadd0
+b753eb9184f5b30e77bcb5d3487323e0f1178f1ab3e15130953381272209a97c3e8084e810dcebf1ea7b22f0a90b9c77
+87dd4a76955bc98326823cffd653fb7b7eda5df1a971b72ec2a4d25fb3958b9d6092369539361069e7e4f1dc9343d929
+b0f1e8b25a2687d98cc037272473b4e3f33cc8d49a3c83a335d48b8a0d3ca5f84e8e2bde304ade6f7d50e5f3539d639b
+afce1c0205adad1ce52fcca71a99cd6df9da5b748209c2ed1013b5b7d484b937bfbb26db9e9f8e77c081e0a0384114b4
+b363d31209c075b94441d1a8ddcc6bcf9eaee78f8adbf0992d5c7e7d638a02d58e19203247443c35d700fc8ac8a1b7ef
+a0aac7dbb08a10f6cc2c6a4d37aea6bc3dc034d933f49de3dcc79bc0b7a011b1e27df7cb882d155287436b72092a1da7
+86dde01fb7090c80fb404afdc9ec64ac40909b64c4e16460a4c862c3a3f857ebfc0c3122250306c266cb1e9f9f245934
+8b3ebbbb0ccc466c72afb4c27ad99d2d4e98b5aee9c05bc283ea3332e5f67a3d9263b71d16b20db31ad4d8f48174b0d7
+8610c492ce130e76c06b7e0204617087ebd8f285cc3f007897c253a0e1af50f80a825ea7fa3167f882e146402fd342b7
+b17f04a257d3142005b8517dfb57d28661604eea9050ce39c60ba9a05d23897114c59c55af199ed186034e456e111cb2
+a04cd806847686ffe023db1721fffbc26160582c239d5bdef08f4730e2fbb64c341fbabf1fd831af6eb84a113ad7e2f7
+879018340deed1fc762e1b8f3a8b78a40539d6f917215621b725c0a3aa347eeff60765e5ad6f4a36bbea51ab77f88726
+b421e65891dd0c6641e8ddf479b065163897a418d723fc6dce19046501e01c616bd19c9d5fd6b395e65abe0ef956d53b
+89350af1d432a8c209b69f937d2aa20a24d5eb95c5b4cec097ca3dbbb3ea9efcde2a8c56c58f8d7901b96a627c45df9e
+a32d6b31cc9efbad4bcffd8b0ffa46b8fa97ddf3453ed151d7de1d03a02cf233f07415584893155d2d7e14b9534921d1
+8efad47caa32277eb04137c92def618e0715c1e77b5053b0cdd60fa03256fa1c9fba9aa86fdf1c04cda9c5450863d58f
+8dff9d309f7294ba750158e70474c978d1dd98739df654945f5f29fedc607caa06b2866c93a0c7b830ff9b26955833a6
+84bb00fbaa4358a2563abf96d2434e4a26acda87b189cd8d2aabde1323dc1eb2eefcdaba3b90e9ad1215ee469745b72e
+b75acb924159ecdcf49df587d5ac1b1b04291600a4f530fb7cb6231e7fd1029f8cfc957c891a59182518480c2947f472
+8d2c671ad0d442664a0cf267b39be742b1d3760935137e4c50195695bdb99254c4a4d5830634059d96dfb2b4e214b067
+ac27b31843caa8140e729a01e7d0229d7c221feccc89ffc173c11a419af3db0f8a47a41cac358e15ef41f679a3f0b96b
+b0b3e33c590bc00faeb83f4b160748fea4fad3e21dfa324bc14a138ee8c5e18743b6bb27cd0ad7c7c28c2b3e92040b0e
+b0d2882c5a0a21fe05b522f2e8a4f43a402bfc961874deec962a1e3d039e411d43bd3d95a26d930c2509aec8ed69e2e0
+aded1e47b3ea6ea7276736fbd1896297b9ead21dc634d68ee56c20fae3da90170f30ad0642be10929ecfe7de5ad8ce5e
+aefe525c0dd24d6c0a66b43ebc6403ac75bfc322d1a22f76340948cf3536d2ae87290ca80acd3e55d2df9aaf0fe6bfcf
+979d1510d3271ff1f06d9cefe30badaece436fae8de70b01ac843850f678aa5f48821dea48ce1c363fa35eec37283f3e
+b8e8d10692f1bad943052fc366291c134a0fc7ca4696feb216aed46eb32de7333a9ba4f553389e7e58c8fa96ba023f58
+913353bc585c0248a54d4705b5e29cc778f304472446eb4baaf30bafa30f2ad0643aaf21196a6c4d177b11eb4e2ad5b2
+b25a0e3b9f983c47b8faaae8549fa7d00d12d7145e1b232d1813ff94058ed603957a340beff25711075cefacde767661
+8515151729ce9a7984af3b94f74880a2402ff853b99f924d581fd3935d8ecfc80e2a1185918a5b1c4902106bd1561ff8
+88e4282ded5e2163874f6464236d5bdcc3c484a0fef8ed0da8d0177973e8175432b75afcde2a4d7d6aefeaed52fbeaa7
+81c31113f2a5ff37250f395d6722a43cebe2a267a0ee40ac06faccaffd7d6eb522103f0431a325aa46a54e606b14de84
+9302ade30ccd62a803b9610a397661298941a644b1ee9d293c63a6c3368fa3557dcf6bfd0c9b44c5c2a6be06d1baf663
+b4ff9f1f6a2a64c50b0a16980ca7cdcc297c6f93e11c580019de52f58381fd0f60a66d3e010fa7ab56bdd250e7b2df2b
+8e57eb61ed3c919dfa0f0cbca2cf559cbede5bbb1e89ae4849b380339cb1c567c98fc2c671211fff4df1a058d46a42bc
+b3d5b45b4096eb088523d16bda1c6aacda01473533314961e6a8de36ccfb35d4b717eeb1ee1bce47ad3b80e9e5084d4e
+b933ff4d3c5a77cd7cd32926266d4f05198178ce350f7215e512e71b07177ac1ff89ba183e424138e1fbf088ecf86c24
+8cf430a6e4eafd23bcb5ec8ca3d711bb56ae719c8621ecee964ef3bae7c53044f7ab3d5d0b911e09c7543e56c1e82e11
+8b3c34f5321c9ed48024196e1e941fb7a5975a045a5a9de88d7f200fc7ffaa0b3e500ab7b535e02bc5c35fbe420e2c3a
+b3c235b65fbdd5c4c2aa45271b9e51674f9a0383a8ac383b0de53125a67c87261540a95b8f81ffe67ecdbf3955b13814
+aaa93ce79ed6e7084fe906c9a1002435ed6829ee3d1380681b902d35dc9e5a23a214ae12dd4fb76691b0016f28d43651
+b4c9533e50ec58f75ea82e2aa7f735c4257bdc1ecd0da0b6521d1442fa61f19e4f73cc90972b47a762f5cd9af591d957
+ae0255dd70befe7eb979d41f9a7407040937e7a879daa64353c66d524d3d3cf1d5e854886a6c32c142f4673c56a4df1d
+805fc5ea840d1c2e6b35ce586309698530f056b41de7a403d9e7d81efc2d7068976e8e23bc0b9ee256f39b15bc4f7ecd
+a8de5055b6d2310b6ccb211a397077b211683b05c7e68e55ff05b546c5c81522e6097a3c3b4b4c21fe06667071beaa4c
+a4014d39b23c13efb4326956c5ee476b1d474663950c9e3e45aa1345037be862cfa14aa1d03bb388085bdb4ba9d70a59
+aebe9a9ba34d6cd3692a8bc0b0aff5648e16b36d6c123e636e9260386642e29d52ba71ef7778481c1b1cfeca7fe6acba
+b59706380c9271918ee16a04e84e91046caf99623a0120aeb37a7a98d4c954d3d880960086de6cb180c8b922ca1d7405
+8dc0713371808850f2137a89c33fd55ec2df6a028e22b2679e09f7084d5c471451187f6488fbd9b5100b84593540e5f3
+b492c55e470c35c7a7efa536f3e7c1e586b623c6669ba6eceeebaa1f81fe3b8b927c2e522fb12e603ae246d9566e4d23
+a5148eadcedab9ae08f5db6265326fa415aef46d0b24155910210338500be6d77bc9fa6f6e284a4c2552dac09167e450
+a0af7b66c8a1319ffbe7a0180795b442cffde153f9a871046d6bdef959378c3068813c516e280371825af06ef2320b15
+95479ffc4903f252fe58632e833d63d963469e89744d5c91315d38eca21b98f1ad6fb3ca77d620a6f97d9ca3aefa1f7e
+84861bdb5880f663a5d9b5e89b59a940611a233d82a9895a330464f7e9b7a6965c2420704f3adc61f876584d06771f03
+933c374f176381a3a63fa98d238d3b7d337aa745528e271168f5b550fb703664c3128097b927b5922b4ae8fad30d5e40
+a3ed2c5080c52ad1235fd93c9bbf128b48ba8abe364247104bbf298582930bf3faaa4f4b6103062a4696e68c44f79555
+94668bae91eccfa8ad459588f927bd1a169af834a76132b2f2d5cda26a91094cb94661e3c59f7547b290f827eb43125f
+b704404a487a7dce87ea8207dd5d813378a345375e8e2c07de349c1448a39af8672bb4436779b3485adc46df2212f409
+9347dacaf6dd678574a4f1a95df79369e3f5543c565b1580f907ecfd17b5d6e1ee3322d83601cbbc6d6ffe0bd2833a83
+92841abd813bd9934bfe945e428193e33ae6d4dd235a16edfecd6e4184abefb8a1f85015ee83caf9532dda380fd678b6
+95c14a1d3a1e1ea18f8a61f34b85ee8a794c95d3b4b0ce6ffc89013c9a80291a9a2487b00bb3de51ca2e4290fead7482
+962fb52a2134123ca31d91027fe9fb62dff4e0542c66b55899a163e50f6ff2c4c4b9c1f5b5b3d6c6dbda40e757c0bd3a
+8aa06ae95b0ff361dea2792e465436d810b86f803ba6121ff93fddd9ba60ce47e846eb2d248b28f2c47bccc9457c1ece
+81adde02ddc49b6cc89561716a839fdee2879c78d1ea0fc0418a6cd4a2a8189a2bc245bf2d1e535dde07e93b8a5e18c0
+a7a5713055455728d6d982a6650d1edf1a3b4612c9072ee8ee0bdaa3992963a6fe91ca242fe36f839595d09f6a47aaa5
+93900cefff6f918dfb12ccbb256adec89fb8da019324b811398eea03f6fd34f28a6eac2ce5580904cdb289879bd4b4d1
+820262cbf7864213e768b5a38f39d27dcfa7baa5abca557ab575b07c33917f7b0f06f0a6abd81222fe8a5a69d95d774f
+a33114d4cc3cc84258fdf252e754c8bb1feb6a130785d35a78b4b05d0f782424a5ce0f34be3c1a14e3bb1bc0246bf0b6
+b966ca0a11f0361e611ab2a8907f78a3d639980cae405d380f3a080125c734059acb08431a42ef3a60ae9331a07e6a5b
+9305d107311654ee727182a1683f322a78fc637bc214eae311f8778773e5bc52063bb0a902a5a962a4a26fa0cba3b06c
+b3dc808231c75e681aa2bc4358c41f01e371bfa5bd504e7bd2282e35e72a2889a51747cc008dd4d8b2a070c8e4c2d7a5
+8f05cc76848367abf2020461b6bcc1ecc412ae9f114d44715875f25f34d8cd26b84b01fd6c0640648676b8d2d5120814
+8798c23f0ca8a7b23152ce17086f31e2a80533067f15ab4a7b43c127a5d8af3297115a3cd7978ace811fcc38805abccb
+99a917f54253059a45103e15e92e1bbdb03e80584a85b658f231aa5947b29388f5b04588de1ed6de998741d360015313
+8b0ce3f6afb5aa83ff229ae1ee0f986ec4d31b113070c7ef3c1ca3613d74e3f23cc1cc81957bddc709a5c5bd85cc64f1
+9035b71e4cbdc7c410fc03a85543aed34a1c0a98e07ddc933e64886f1796416ff3a0f7754b5246ec93d617aad0f53d5d
+87478f69c45394f94c67b7196f60aca42823ad92ea86a427d705576fa6a9bead40b1a4106767b8a20411e757f8762b68
+b36901adf577f159b4263821a48fc5888e7bbd6c9f3857968a9cd02e1a1a788c08a566b7bd5bb6be294fa5ab92b4ff6f
+8a738b1392aecb35a5a1f12920522997c9016a0455354e41d2e1b81d8ec9b30a90f71492c7bc122505b2ecb0654545ec
+a5a422515f17f2bf4b9b6c4b5b94df27ce80826cc3ad2a8579eb6666c67a96355e60bf227b36e1f082d749ade7a38a92
+b6d0e36a98e0518b14728bfd79db76c408f58220111e8c4dbf5bcfbd7a85bc68022456196f07b9f40158037a3c3eb90b
+82ad91b812d08bfa815a93b47bd3656b493853bad52656450eb408fc915e430192ae123fb9daf4aeef4608800e818b74
+b8ae5b30118dda7b972464e14a96853147c4b362e9cde22130250447575c0d8d05053202db4c650467dc16330cb54b36
+835d913a3d15ff205497b98107eca77058beebe1aa35ffc20241bbc2a9b4d2019ba41fa3c9b43fe2265a1110b5c2fbe7
+a283d88acbddb50983356f2aed99c2f153b6a8f489b0597d8db08ff7e3b04392609e01aceb37fe985f59773327258195
+b6927dc3318931eac59c6e21def3ca79154beeaa4c57e11ec1f3362aeb33445366dae770e533aaf33c273eaa4f54275e
+a6033a62119e077b438e0170f27835597e21c1d6e4acbd53fec7df69bd1372148f90966732fc5c004857cdd44b8a03c2
+acc764a116e31d63f534b3e0e42a3f899d817d3ec32fb4504045bce7ba3a952ddc81a33d48c5b0499eacbef4268bd5ae
+af5d1f6a67dc6361e19f222a24163be388033a3fd0d33ad204f4411302668436f933c4a91c6472fd4262397417e3c588
+a2b1fe93eb481d4fec6fccbd64945a12cfeca85aa8b8bbadc4e4ecab2f3ef65616294dc168d6c955744b7c6acd712012
+acb6d3e123572ec20d0ecceaf4916401874f0298218b36a0ce089acef90329204611968c7397c2a518c0a78d02a9285e
+88e4457b1c9b56957b76a08e98c569fb588b081e0e420a0d859b70296f648a8d64ff35ca61a39d1b8ac3613ea5fdc2eb
+a7d1643b3bbef49b2f9fff326061cc27a7f65228e40929562de73e1c66a9d164d42bfcc3dae9103b2acf27606f18b031
+a66e3b97efb7ce4e81534453d3d41ecd4b5b6e9bb829b07b5afbf11fc6ea30382a0059c33c97afd906656ec19432830d
+ae9a17d0044abbf3e6aa2e388a986754d6b0fa35d115e410f69ad4aa114db1af5dd0389222b838cfd859d436aded1b5c
+a4a66a163365528b08333f15c6673ca48d7a9b6d17822f1e5390fecad122bcf7ec5656eed2f22fbc6ccb6dd96ee260f3
+b7dd42c938c2ec50c3b3fde92ff629a571e46f8ce128fde7c2d8f18796ba1b1d7eaf7337212f55cf5cfc540c7d2dbf31
+a36bcad22f3408b3bfd45d272f3387cdfbff57e014226dcd1db54bf3f8d1d896fc4fd16640b5d1484c9567ab9322a37d
+8c9831fd5f74ffac203aa6b6ce03acfde8a2fd939b79236a01931d28b424fd8f6b6e44522d28e086aa12f0b110e5688c
+b48bc95abd331d901610335299580ecec02a263d2b03bb0579cae3aa87ebf5e93dd110e7fa4306d31974099fe6e8f58b
+a15e27a87bcd8ba69ebfb6228c3c48e19d79b22978d3a63af553b3083ad13e48dca496896cec195e63b8a4e2c40cae7e
+96f3de6fa492dd2d653888311bc918ab832d6342dc7af9155bc7070004e89ca940b7672dce0a1b4976a7c3018f13e49b
+81a022bee3593997f556ea53e2ee484188cfba0be4b831ccc048ae4b5a6df9e3b4d57c436caae5cba92486abb71813b0
+b9d8e46df67e481c84d5520a9613aa92750c8e8a1e8f376b8ad7b71a3ebd95d2d191ce538e6f7fde3ac5943f70c670a9
+8f0b52365d944f59d2ed445b6ecc4f88c687fd281c1913912c8e6075c3a59667060b42f2c1589a5955e9f3791e23aa02
+ad07429bab813045fd909b928ba4eaf262b6ea40b353aa43157e1e683b2752c5bf19eea7ab6ebb8daa8ee91241fbe84f
+b90a99ec1f31c43060ef649e047bf24f2fa7fa9daf904136c6a5846d9479966b54090ded7093e481c52d872c6377eb65
+8cb05fab3ee23db24c9bac109db52895b200dd115209bfa41fde510b29d9871907d44f689fa0f5474d12314a711f6fa4
+b00d8f280ee21866b01ba3de3bf943a7d0825ed67db03d13a0b69f54a4ab389df1cb10909e831ec0af8f1675fa7dc399
+b383d14fdc47df80be46390420603e7f505052b1a44ebf595354726f2b487f7f18d4243709d347e1e584c28167a0e988
+aa951f60d1e069304222a8eb0338a94c8b3b4515d7cee833864b6c222ad76f6c48e0346c5603c35a3b52edb6f9381911
+b887070ecae2884109eed80ff9341f5fc514d59158f5dc755ea46ba396f6783b8a86ffd2fae4419cec2ed57f4dfd4327
+b1a6f1e4d25f4aade76714e52bc426beaa7592b975f07d0a6b372a3f94e7a3ab0e8829575bccc953195ba0c9bf46e68c
+aa64bc4e0d9502d294f0d3e6a1400dc38f28e87c85d3429ab3575c821e1229f1dc8e2c13f03080006bc897e8fc3555c8
+8f215476d94bc2af7d2e0eb68783292e314c9a4f812f3065cf064f427aae165990dc9665011af502f5713f3664317989
+a578c8991e9e29bf3ad7be44bce3817e1c4af3e4a8ba3d82643378da78538787f581b9caea7602b87619e5f8cfb337fc
+abe5453b650106cf65bf2b7faf8ff973b7b3be0e6f42983daaa5359dd4ca225edb7228bcca3d71bcb8d77241b320fa90
+b7ed1d027dfa91d0ca5d797295e359bdb1b0221b1f5eabd2ef76ea3bf456f9aa9788dd00ea24fe0add9e3d9b09ae2428
+96ba0f0c5ac0eae3f0031f8b7a87543ac369c22122681cade0ea33a6ca370cafd360ea6b80758476ab94cb07ad6820e6
+966f6191951b998202b8a63e3b10ece69616b989e9695cda84a450cb953acaf9c4f902200b7492eb66cb9ae0cdc8ecf0
+8d7bf21f76ca0e3b3758c293e66e977f83533d918dc445a09f4f38975ccf7220855627de6460d318290daa03a5f5c68f
+b10dcd91d6602852783bb76b0a286523a0942e8eaaca4e0ee5bc76cf19d33bc631f6d0fda1c1ca51bb3d5d5c7dd43728
+884d502d934e2b045357e981506900849e6eb051ca3ecf3079b485b348372496db97da384f8d2b5a52216b4d223c90ea
+b074162e5d33171477ed48f2f185b1c83e8fc2e7906681f96ed97da8ee86be7476d65e61648383c2766ad9853ead35b5
+90bd3d8b475da20c6e32324e30bab475f2059cd81fa67840a6c831026cf3d5806496a3a25192128da4b819c1b7cd6bd8
+8da4889258cd6ffdf1608af8325230f74abe6a2a511872c2dd10123b491cb09407fb979d80fb1185ebedf421ba22d0fc
+96fe1d9137c24fba18b1ac431ccffc01ef1792623bc334ec362751b7bac73c4d4f7e9bdc2d595ad4731c71808adea15e
+ac816ee0b9103f0bbdb50cc05f9c5c8f7ff2f14bb827541c51ae5d788f979c00fe4796b86eb9e3ba5d810925c1f34a17
+b231e98ecb3a534dfda5b40916fd4fda270e316399c9d514dd510f0602cbc29e51c5ed60107b73e3c9721f7ada779f91
+80115e104f22ff2653ba7c4e1cc417dc054663d488f861a9bbec4b9e907dedbb985e6e78f31dc16defa3aaf4f88dabe8
+a0dbc25dde933e6114f2ec22445f1e209836585997b14100f3f8b7e62f5fdc6aa2a85ba5ec39a5197c9d4dabc9a5c452
+8d2deffdeb1f0abed8ba62187f5e1cc06a1e2bc49b3e15f73c3d8e574dfba7efdfb762ab512cce53d7db790a7354c56b
+b73f4897e221927feedbbf209e3d5b9c08f52bb732dc0d710822576abb7ba5ef0e728d2d95c802a00eba925ce99d734a
+970761c7ee891b3ed08253d2c0d28478145d0776e2429c85b4734e5eb7a6416d197d0b1ad3392b37ce8d86fcaf9de7ec
+b4c9e2acb4c05236357be37609abc437612244bb4421d69486050e390d5ddb52887a1b3e1bfe968a90f1695d892ba8cd
+87caac2c93e192c34b5dabc36abe26a844a33bf63e9b01a668c90b70701360a0417ae3248173450c64034685d913f4f1
+a16ac64cd1a7ad46cde1c93024fdeff724afe228818b72bb66176c7daa090acf58e7fc0aabc582ad22486e46f0b96c5c
+936bdd6d67d666274c29765690f4ad9c4b9203e9bc9dd5af558a8d908dfe8d6d4346f6fbbfa69158cdaccb0058ed0193
+b39af8d43ce9d120497888fba0dc95ceeabdd3d84421c1a30fea226e03b78cadca0eee57db524f6ccf1f6235fadd1470
+847da75509ca07fde2277aac9e7622c5874256903a92f7a56382ad3f79d1b3b0cc0b06b2a6b2bd1749ed567e68816d31
+969407bab3f8106a49be63f17ddd603e185afc1c9fc0ca0e90ac415f53923e3c6a69fe488d33403521231c5008bc11e4
+82e25ef35abbd9b98c55a45e7a71791925639afd92780e64a154ad8a94e9807f2643854250f30bff1c5e8806632778f7
+8e6da5cb8cd80d6b8e2321ba3f034ece1813a7b6ee3afac73371a51434a3e66221188162cd9b9ec035326e7e04e74b25
+9868bc3e60478fd0ce37d35e0e4f7695f1ffb7cf2e05842b3a09e832af33c7ba48448935d425196fdaea9c3e8a5122e7
+ac7733adfeba1da388eee6540a127d0eadcbd23770f2deec39edc0bfb1002beacb9a8c7106baedb22e664f37771c1410
+912581c23e3ad0d7eb886cfc22633fc704e530b6b4977086f68f1d9f839bbca3bf0162acede87c853e8ad8137b5cf345
+a0315fee6285a33d4ec60f6c1557ebe4473e8990ade0feff7e008d3be1a709f5f486abe784398734d9ea1193929697e8
+a44a08d6fe0a22849a8f518ed9b30b78367de205c3301fc8159ea273076488299b35c362530436dbb7e21b6b9f36835c
+a591ea6ef83f2ec78a402a86ae5b82e330998e18ce66126a89046f169dee58634dfc531b1286277eed49f571df5202a8
+a60d86619b41f59b48c800a302775656266725b44ff8318014fb668f331bec82b3b543ca848a7d40b2718f29e5ce6cd1
+9420d0219d407583fff43c560964e1da06b105043187ea156771b1e4dfb5d5851d06fcfd819c7d8bb6568fa1bdacd916
+97ba0b6731c78eed331530be7cc374a7f4a7cb2144ac73b7c000ca36036f68754d4edccf73ce373dd6c6be55177d89d0
+b4e07b5c1376900fa2dfef8fd1a5a4b6152df7b805d5efc29057d1df2343f8bc841284ed23d2bab5cd1431fb95f71b60
+8017de31e62a24bed74460dbdde1717f3a9cc17e2e2ca9848d77c3b5c364e7e1d58ac0eabb3daa2b7336edcc8a418b01
+ab6e409231b778bbc1ab74c3062a376c5287c0cbd7d19d4ac1d5da1a8d0571864d0723944da72581783cd7b6b0d529a6
+b5f2fd4ef29a2ac847358abf2b3e7a3567b8653a4b9ed8da70809f2affc6ab44c65cd17f255db0cd8315e4801bb1a408
+91b61d5d047e9c672d7312f563b8da90d9c2c1c1268913656f061028748a351e116f524593b1be7117a46f168b3e829a
+b6c10b09ecfb92168906191756cb824694caa32c6f2f9b19c51658d44dc330dcd344e7b04333392a8a93c73346a3845b
+9431d01a121e6ffa15c32e724dadcebff65f806c11717b050c106c0c80e43e622130f41224533d13be4a8d14a66ae1e7
+a1248085c85855b4df6eb5a02df0dbd5de5a8a82656e1a5f61214885fcb75428647c8545a848960701d61c3002840647
+9867caba8f4be9483df9b48e2bfa024e79e6797adc2198f2b5115d7283931fe4cefc382323edfa1e850c3970bd1a2d53
+89e88c50c43d7e966e60d49b3afea792429563c93550b10584c91e4a827a3617971eb286c39205e2af4e7dfbc523fd8e
+8ed261502f95814410fb081e7348eb09f3a3df22cc3ca82a2f071abca0190e9f041e8714b811418caf7e1753cf284e9e
+87ac65370073b6bb85a945e138e4d0a5d71ed88739f72b9ba747d2a03b5d4877e8e526026348d2578c752bc4102055ed
+b07de38d07906dc2838be840c291f467d9b695c62175c5afa46d80f34674d061107d6fec6847ba5f17f2d8729f31f5f5
+899348bd385a7c3d38f9d740001c9a543dd8496b58807a6a73180c94f3aa5c15a56cbb85cd7124458e2ae44a454a8a58
+91b70c3543b8e21cbcc8a40cbe00cf2ee0372ba9ddc7f610b711a070110508159e6a52e8778b20f0194ca09b109881bb
+8ab84d75831ec1e708ec74eb6d6de2b13bf97e2d2262ece39e5ba5a4a3049c8303023e40fce5e87b237bb1dabfff5246
+914ac70dd91ccb6d7b83a5ed0a9250c66e77a815aca17416f1796fc0e1c26bee7acec5de11e65061a44d2d9c35f5d19a
+8867260f8024f533fcb75d9c3f2ab113d349504b40f650a2c92bb46aebae3a55de6a113cb6387bf00eeb2bd4719d87ea
+9976dd4e56b16fe11533dce2734e2903a3ec986dca6540bd9ca8b758a59a1e45b1e69c0b8f094d42cf7e015363ce37ff
+b48c840786653a0f3ed6b07f8f980284c5eb2dd22e9ecd5a0566754a1534300e129b39a8a6d4fc48bd403b351e714f05
+b1633aae7c5e5c51a82aa4e4bf9f92c0cd30cc1067b03364825ecc492fa43391ea075195f2f73b99a11dc49f670c0e89
+8769a592f503bf8ab03d767524d9ec2223c502ebf15b69eb4b3d53325ab366888afbb668bcb380230b5bd74b32d90a44
+87439671fda66bf5989fe1fa2aa32519ef908aa6ab3eb34eb5b7d908e9a7db2d679170cf3fa0e0a388a355b8c51d306c
+ae1ca219832c90554a91a7258ca5598f8bcaaa7059c574803b2688d8026df9083985c2f8f4ad3aa9b122efe64e0b2481
+94916e6dca309d9c7afb9aa4c0bc89a3de875a8537cae1fd32258b34782994e5be5c4987577d697ddc86b8d68dbbcbaa
+8c5361b85176adf77ab1949d34edd562d8c16979e33b59d09548ad372b8c913ef385166bae53c8fef814a529fceafaef
+b968172a6a831c6ae53e876dc4ef8686879cdadff0aef4147c4dc3ccbc173f89748b840a30ad393eaab69e422363bb86
+8fabda060f8bb2bfcd675803ff0a3f834e2356152f88bc79c23f58fbfa6b0c82850f281f7b8fd2a5e16230aeb4077320
+8e5c887c318335c5561e63fd3c3f64edc669c0b03b217e3ae40ea29245885442864dde15751d7c6ab177a91fdc1f7235
+b2f67f9d64650c6b51b88e7ee6d6a796b453131c93a7791cdb2d0a4922d3c913a4ac988bac5b4b9bfe61469886e1e7a4
+96b836824dc2a12ffecc6a053f7549b7faad9808e98bf20f3c9146fab05098df56fc2833a6002eb39c935fd8757d4716
+a4aa33fa77b62605f751bcad91333659e9345967845226371e5f38d5a7f72405d0e30777b485b730e6c62d8216790cba
+a041bf3467320df4bb7baee569cd685a65c9d0e431824b7de93ee47ab8b3ab20298d60746fea7fefb5bc82d3f7e25dd6
+a85842f11f490bda22e9f73409de0909a2e61efc6d8be0c3f561d881988b4d2e6924ffaf0a4c40843481892b272943cc
+94de0ecf58ef27228f5afb12496c53b075bb347f900b2df98f47ceda8675bc2941aec04d1c8ca0dec0233430f2759824
+b1795a70651be509c0955b07d58a1b8655a2e6c292b939b6c156f0c0983abd7e416cb0cf14afac6ceec85f2c46b83a28
+b6beb936ea1f1639ae59eaf53015dc1855ca0f798d9ed72607edbc6c119741e10af5354c29571af8befd83b8255a8f58
+9424188ceb15c1b470c4bb17c71a37af56c87625e7b7fa752099802673c3a5a99d16e7d6dd8f8b680e89b75cbe7920f9
+b9e22b5df8318bc0ff81003e8208ff3217ba1a84edf6a0b326b7180208d3a9144c6fa54c57ce6d6071ccb1a40eaf4509
+8e5fb55da49feb7a9152528ad6a6766af75cce249eadaaf4806c6d4162f65f3c7311bcf8da72b96f6636cc019546c05e
+a55f751de82aed5842f94d1ba1e29976c3d0146267b11eacaa4fc765da8d2acf617d3a65a2a74aa983130851f8c57d05
+9647758fc596b78fb52db58f2ec31cea186d9d4f68692f56e474961b277396af4a51781b0a358a6a6aa8138e46443a43
+9461f6dc72988b44c662865cdc01c0f970f078637859cbe6314fb17d2cfb3451b222cfb93a5c6eecafd1ddb36de075ef
+93b30bbf4fa0926cc5483ba9803c8b001aa80322addcc866bc514f2a10aa43bbd86008e4671ea26d8e0d2ffd4bb8f2f1
+b44020d0f062a001bd6dca2bc3ce61b17efc7a121a9035709f01a8c34708ed0c1c85cfe98c534189e0669eea719c88fb
+afabce43f35e0d3201b60226c72c30177c4c5d75bac654fd2b58b3ce9de7d83ef01be60514817f1e7bdb525c910b8bca
+a97bbab394253ebb02ba47ad391db3aec1b4d03e88ab3e7505730640558c11fbfce42d53b7f85787cb564208d3dc826f
+805a34cb0c8c7ade28c69dfdde46b7a283e539977602aab165316e973c62bc65396b6fe2c96750ba028c550de03100ea
+a0be38fdba281e0c248933ed73f1119f90e34d5b4435bb704a5fb7c20805e195518a2a424bb483f16500d74f440d4a53
+abbabc7db0a20030c6e687b89162e704720a010d7ac53b9766a9ccb7e02d4ea1926792f5263d715cb97d67f2010288c2
+b9e471a7a433a678090fe4324739dffe238ed7e9a867159e0b43fa80c9c0798cac6b58bc09a389223f94f22fec43e18b
+9818e9a42ebf415c6d970c87261645f876d709751c8629d1ffbcba4abc8e3a2a1db8c4c6a6324dbf433c43fff62803d1
+8290ed53eecdb61157cc458dd081b9e890bed5e4cfb643d11b549b2c65fe68fb981d4311473510781945b0ee763a84aa
+ae730a7c69866f22d8f9b0d8e17d7564c25763cc77a5eb718d5651b9c5198b2b9d3eed1c066f4985b2f6d7edb0a109d2
+88325e421a1be440175293efd498cd167dcd0914c8827ebf64ad86788f1fdeb3c16d3de7a681f958b0f49046c54fd804
+a8f592d6ba7fc3ab8ce8260f13f9c4886191530cb1d7505d0beae54d4c97d09712930b8f34ad74f1ac5ebedcea25dc8b
+81c0853b0310a96674a92a144a14c48fcee0d72a772451ed046c284f16fd6447f67389ff7841d752a025da172d62e73e
+b9f50526ce4bee12fc3fd8f3582f3829b90840f6eba06f37b53febc1d0987bbf58107d73fe4373d79e53827270bcd817
+a2ca28f619d4821f450b9431bdcdb129d4f35dbc2a4976e4d416dbd14e378d4d60a517457aa0343f7a5e60a7e246e22f
+b9576225cf7e13374d3975703b3850251d53ccafc6feeedd07be2b0bdea63b899139a1fb446dcf76f62f3c03beea0486
+a88df9f6e95df995345c6265af546158499fc0d89447d3b387e7708fa037f95ac9c4e20ed35b749b8d8a7471dedeea87
+a853ec333af8f35d51ddd6c4d45972b68fb36219e34278efa6cce02bf8193d72c6014ba6961f8448785b0a43a31a688d
+a1ead9282496e590bb43908dc64341595cd22b844624e02f2daf597f708ab0d336bcacb5862bce3ce23d1a9616fc6179
+b97398d8ebb52535a1ce3a10b2255d358142ff653def823ad9e9ce4ca5f372c6e7c9301588ae5d914b2b921a0fac7442
+8d0d292c7e9122b8d001b3a3323f9d37dca61de5a595f9402ab0e53e941c83f80237a853abe4aaf012a35cf59df48c68
+830535a5a8268d5ce4e7462fca4f809348908ae7ee117312244e0a9c30b09d91b6f798654d8064091078400346614e04
+a44a90d3d307ee3a3c3838ce43a873311789a9b9292c62a01622bb813a02f6defd21b0889cb6dda6d7225009cc6d2641
+a219afe00a9327f2c937afabdf5f10bca0687f48d8f7a2a046a52e6924af613f38cf82454df4f412f5991ba20b7db74e
+b448ed4b15ced4de098781793a6e850ea1547d514646fb8f1c137c86e14231ac4340b308bf07813fb813cd02e47c015e
+905fb68b8f5bc14834a06d61f3da686bee77b3b590a33c640c82f34e68ab993f8c4897df463973d6d9f0d53f9ac5cf5e
+991cb6857dd0b3ee6597aa2fb1f4ccc962cb038228615466964680795587240e6ccf7861ec220a53ede1e2e9752e1cb7
+b823dc0249ae72e2de91108cd4ae6d6af3e464f12a53a46ca583727c7351a67f2d12c911534e234ee187389fcbf1f621
+981ba6bda1816036e75a864f635629a141905a4805c706260e7a5e12b82dfa9de4f4058143065b10a1012adca6b7d083
+8bd8ec0e77a6867057e5393d82132474eba9fcc4bbe025544bab0ada4ebad3d296ceffa3788acfea0a44406e2ab637bc
+93eaca3a7f9a0dc809eb9f604905b0cab18750a9bfa42d98d99728a6de6e0f1e05b6e98bb3b0d9862a69eb57ee2e18f3
+90b077d7b7b1651ac0d723978b3e408191c2b8b08247fe2a7fd69afe0615dec09e43771cd845c2cd064b56295e53f634
+847e8f607332129e95eb1f3e00003b087e92ebf1ac9477304b0d54ea38419fe8581122d21bef8d034f788a9c92f4ec00
+b0301becb003dc7cd56ea7d830bf0fb4b85bdb33606d8d9ab2b70c6415ab5c8f4934bb7079ced16081b8f6d16b77c0c0
+9068fbbfcc95fff7ef79ab64063dd9bff0c40b4855eedb39bfced9250cc351b5b3b1bc6c2d038cb6d59a12a41b3db664
+84857e081fa1c6c08bf7b0bcfe7c6d74b57cbad1b67676e99686bcca0b17715ede19f826517dce3f84cfa014e11909b0
+98fbfd6a94ac3e4b53b811e4d275b865486a52884352ff514889313c7a15b07822f76d428533a0f8d3cb42f1e6f72356
+b4faa1b1245aa6339b5bb987f3423d187f6e7e5d4b4b341de87ebdea53b124932cd0e586470cf4a3b1060a126e4ce7e1
+973e88d073071c2cf5ed643d770a45f6be7b230896caf72a2cef10e56ff0a4e032d6ae1ff4c19bba2cc29f29ba70cc19
+8d40b3285879fb9ac0b6c9d92199afaf4716fe21edcd56b1a1fcb6ed298b5ec5b3b64222eb6f0cd1086d41872911068a
+b5e338a02076ad851778d590ada4af1c217d035c2505b891163689a554e5a957219410bbb435bbb38c8a1515146f8789
+b1d3e990d027a38fc8a38579e39e199d9984dc6d857bf51e2ed5fae061c8723fed3c74662405378c29342bc4f1fff7ca
+8679f10f866804b19dd0b14b24068c1d32908a52149d33ab03394990cc60c0f388eef02bc0db819f92f8197b1fc60c17
+aee5157db1cb7ca8013b0c19201ea1e7af32e4117896b3f8ec0ef0b2a4ded6a5e7c893281865cdae7deff4532a6a3fe0
+950315818b710d3903b679dd0de0619059bea7dac3bf4edc8fd4a6dba81b7aff9bca7cf1972940b789458f287609439b
+ade345a6171b8e8afce7a455cb98024d0d91dfa347632e1a5a40721868bfed1c1959300f1e1e39a551d99a4e1abb563a
+adde1719c13b3ec224bdb6b44dc2c5f2daad54e7ee736209653a0198a769180019d87fe6bdc37ec1b48f0212ea5a8927
+a3397eba3ed2ea491e8d0328333689f66b2bbed0e1892d7b14b2aa45460a12e4d592d78a5d0ac20bd6d34c88b8f1f7a3
+8613160aca85f0154e170b1b3f1052ba984f5c422c4c25e0771a53469c274130a31f875a0ba9650f77fabd910cb10467
+a91ae4d048c56d5b2383a9d8f6396837543b609d8b0be139ebd5fd31fe4a90071656442ca7f14136cb8205734d929b5b
+8e42732269c77887f105d1c326488025f9938cbade678bc6b39941311360408ea6baf274bbf5ffff996756cd2390bf1d
+b96e1ca66d51a186237fef402bc4e14f8f96a138db377b7e2c3243954b6f47ca75cf4fb5dd081aaee634b5e2efe2a065
+81d1c20d76ed054923c17b362b50205050f185137ea10559e35ee7e191bd89383b68179c0aa4531eb61abdc239ae6891
+a350b5778e26ee808466619f73900e09bd387849d072c0c014517d16adb4e3394673238c4f4e705d30b4ec2edfe5a695
+a13657433e39c0241d48075ae8ab1efe3680c96d078685c5dc0ac3c49d468db98f2094dd4204f44e8e90bf54059b5807
+a96255abe489be9d42ce6fa76ee90e4bb6a36421fb78068432cc935632ea5b5bb2ab70790ef79422f93d35d1034568b0
+b745d643480edb577b1f92ded38a522236fa1be2944ad8102ca64c3d55f6297b7e0aa1beb082261af1cc334f5a723614
+b235ccbf94e2bbd3c794bcaf84266141c0e04ecdcd7d2def83a7eeb86a2ff4dd3ddbd8245296b27344770f3d5d332f90
+935f3e4e9dceb4f58404ba1a489985001827e96bf6be227a8ac4e2eb8a950d4a446320ce3a245d09d2d74776c7033a3e
+99cb7f3d6256ee8918f40642f5cb788f0047a04c482146e70687c3298629bf082dd98d4a4c222fbfea3afa3d7d806f00
+ad6abd2fcc67af691e76792432b83b8cd9b0a9e5e73de21f89ab54081ea002ffd904d77ab8efb6906790987e29c53ff9
+b6de4c3a45ed7898abc037a47507f46f7327c057a911529d3a671286f98e79a421f4586a7ff3235f1892d0cbbd0e7bff
+9120311b071d38214e39f4b48ce6299ae9297c7b76ab364353d3816669cba56592fe4c7f1f93507bec7ddc1df471f0f1
+a6daf71681485d01ae7fd4bb81a326d3d2764bbed5d3be45efcbc04aed190163ce8f9d04a84bacf25ec151790f8fe917
+9534da45c2a497607f7440f61943f4c16878a18f0bbce00dd644de88383470705b489225f5be4428d1f988256b70c926
+b2d1b633b4832dab1a530a1d85415e7fa3e4a1fd383ddb898a79c7ad028f2dd8fbd56b83600cf481eb14a073cd65431a
+8c43dc994dfeb5f22df9560518df32deb1af43f254acb8e6f93eec3fb3ac80081b39610800d0822246e130e8c5f7a067
+a18174ffb85d13b7edde5822f22872ece12383d79fbbdb8c02bcc9f654cea904ed8c03b8709d70736dd4b308ecc1607c
+a54e4bb27d6d561261a3fc48705781399f337448c0afa68c074918d2c14ea7d51263199b01070b7161c3db8b9949717d
+a7457cba2c5b455584980ab6d0bb5253dbf2cafea4efe5bd769020b970dc35fba4109d002f5934610b8b4a158252ebdc
+877d4111f50f77463b60e07843b4521b2c44629a7deff20dbabd412206a4fe03f976de1a3897b9df7eed16217f03e2c2
+84d1ab99732fed1470f69fdb499dd3de795b055354e89d522c6a7df4d6a5375052c8befa4dc7615d29b3d92ce7df2f24
+93bd139c343d8b83403e04547072c3e546c67445220afd06c119f7119730288629439640302d0628e74fa596e305c0e0
+8157b5ab48d026684f6b51b802b4d8e7f85ef82583d1e8dfeca042b47a0e0f58e30cfdf4738e6d51394b260a4ca7e19f
+8f03d5c1720540c29a1dee44ef5c7f8b209094ba8376d8e5eb9b52537d9843912b68562eff742f0a7a07f5faf6abd1ba
+a15e4999a0028b8b083c2afbf4968a1f0397c26cda8dd7f6c134c6a860e740ac4bf1a1936849a4f2080e0cc9f8e44387
+8b71fb85363158c7afc3c41422e9a32ecb2d1f9d3c01fff00b77e0ec6a8661e95b552a7f05f4acebee751448ed750684
+b34125432d0704c0638090fc4566780d2d8038d803f96e19ff748325f8b5579cb8867e12491921feaf3c0df949f36aab
+968196e10bcdc6cba28331a229acd54b59edaa83cad0f8d14f39d787467bd5ea725a3dc3d50accc334e74c81fd762cff
+968abfa40af365986e68c47b4eb3562a72793fbd66a7d1b3804a5bac8137f0a3cbbf5cd306097cbf1a3b95c3414fb061
+85395fa84223dcc16b7e620a7ef6f902f7b29dce7760f57baafb37d985755e65623768b8bd745c8de7d00e2035aba7ab
+b57ad86ab3f5cb00ca0855088921865893b6e539edbbd504238df2f9b2fa7c7bdbf2d6eec6ba8e2a70a4c4fa3f459a97
+a2f203ed1f07cca3f8c0d35ccf7a63216ab98c9e71557e829dea45e2c723583bfbaa7a83d66521b08a0718c63973a6b2
+99a3522974525f4ed10623bae83dddace6f9495687cb9cf4ef52c8530b05672c2b226d3fc5058c56462ab3737a068baf
+a4a50d127ad06067f1eac2d61c0a1e813fceba2e5e895467b5e6045c9b7308d3678bed9212b98e44c19a1783e0f57bef
+a62d103ecc1d5e1d5cb98a0bbf9682ad65774d63f67f95bcbfb0cdb5e2437f2279043e4426d490f534961a2487782cce
+b12fdaa5ca77456e6e96eccf97a303ee2d73f547916ed67378835402136c2aa03e63912edf5a67785f7ac1636f6ddb51
+91315750043c4e08c7e4359b9cba25309eedc9c85672851f05a0651dd9b9329bef00a79cfe73ddc308d97cf548486b47
+947115aa6cb3c635bda7f3c5fc3dd0e4881500d74db4c0579e4b9039b75b131eb5db54174b1bb970064740551e6cd1c7
+aff091a9c7e86c80646cfffbf154ecbcfeb66877c5b773b6e8759649ada1094270e57970cbf2b0a4bcde9bbfa9689b1c
+81e3cb9116f81e583b7579f9af06931a5337fae0d57d9ef777003f32e0eb619b75b74137385f9e30dfe0e10c2120b02e
+81ab49647db2a5a6f47ec757d8427325fe721142377a287c547fbe04ea280acb32d71f3dedf7ec0f67b43ffc5d748342
+84b0e16d8478b798694503ac4a87ff31affe0ef6d2bad47abe0fcb3a2571fc8e4e9c966276a5f4968b2675827a115818
+9567b2edd65974393cf2181d235f877f5827a6d5ca16e77165ef35f6c66370f0c55a2dca5387c02ae73a66b81f01798c
+af19f841026271e284548b2cfe9fe7d6f9acdb4759ca76fc566de7a8d835408f86627185fe32e705f94e6a719e463cd3
+83883e1c9d215c90948d066d2210528552093a726f0a27b8342b611e4b8639f6d2a5f95bef8cfea4312c1f2203f34986
+a48019b2da37a232b7999f6b668e2758f82132e15ea93608bb2350d3188297c8ff8c791977f2a083ad9773570bb560db
+a1fcc29974eb065a350cdcb4283b2a813f02421b872eb3c15056ef96e2d5ffe2fba0e10ba19a4d271937cf08838e4106
+86f9ec59a1f5a5796e498247c0ef1457ea7ab098247f363329a336a1ee57afb31cc18d35e008a5263e7c401fad5719eb
+a903f95675c14cc618b02f7a0401ab67170b4a143925979791d76aacc90ad1faab828fe904f13d155425b2ffd79c008e
+8f652c4982220b8e9868a621a91eee85279b13b0c2974472fbba11775e6bb1d8d53309f500fbdacdd432170bc76c93a8
+a9b02cfa052b5808c1c9ee65ade446a6ce20174bd2e9d9c7388a1973b0290debbb6fe82697f09afee6ed01c9dd99b905
+8b4c700fdbcb13854c7b1d257a781fb7449a9e3236b962871f11b31b1f2e69ecfa6039e2d168ebdf2f142f93b91f5882
+a9ba2295980603515f80f0130993f1be434281fd4442ce7e68b2fee12b24e440bc0282df67707e460bc67a4706bdf8b8
+a382b85dd64b70296a2d16d1d15d6de80687dec9cc074445fac8de7bad616a95972ec399bda7c2cffa4247bd04413b76
+b6adb37da1c6cba5ddfaafa3718aa66fe2821b43923ec371cd4eb9e974ebf3d0e94dff1ffc1347cee5c9e19af7c76be9
+b5b531ea7f93c4756e5799118654ebc478a3ab57ea51125fd31c012053c759c8a52c8830b53208f74215e437d059eda6
+89c88a5ecee1931dc027d1553b5aa82dbc5fed2a4bed329809467f79f2712fa5529c0f80ce6891817927d0b66d356db6
+b4ad1964f73d3b7bc338909df2ab8889c4faad9b3b8a5959ea81f44c6c4bec95f0fb6e8fea1fb7e09789c690423e2b85
+b573bcbd8f484e350db04eb263187ae4e99ecd03494058e68221aad8d044db82957f4bf23f71a9634b2ef9612a78ecc8
+93c3dd86f7c3105fe482f62b0a56fe43338aef50f0d10f237ca774f834151273aa653e17bf919e54aeb35343ed790c0e
+9069c429e7c6507a755871b301b31c3b4233006c51bb66ea2c9051c6caa52e933ad81a8e879129e0c1b099a124bcb295
+a22203e5bb65593bd22cd5bc6e95a2f5c9a9aac1e14d948a7e0aebce4f009a56623026e0980bd194a633b42f15822ad5
+b1585de69b3014634da2ba76218321ff4ce8476b653ea985a7330290b1bb1445db3e1f3c510f9ae7c22940157e2df36f
+802a70ea7fa057a03d12538c3ad6b348a8e694bc6b483cd62c97af8809627a161223557f1d5196e23f13eddce15c814f
+afe8b0e94d8d9b44652602c5ad15bb0140456d90c95af4ba58cff528e2834e0036572af867488f27cb2d27d81cf02e30
+93bb332d924bcacc41b4b9bf726647d7cbb642847fee5ee7dbf3d2a0489d71802d959a3e905a80ab1f34097328632f00
+8caad1d29fe712bf09d505ccfc724574c8edaf5fc743953b2771cdae006ad9792a889e0c8136409b8f92e2cab5ba09f9
+8678be67412da4d43d74660df98744c54365cf10aa59e522c59afc3836d115380416cb1ae497ba4b50ad31a23ece8b92
+a48e64a5447ebeb5f6b0e0fea29fd5845b378e83f6b06b79b604081e5e723930a0d4c6025627382f6baba8d47425cd27
+b8914eefa2f5613dfe99f11212912dd53d678ed349fe871781074d5b6eed1fc7f2e5bbfad3356a685c52a3c8a26e7963
+836ba66155facd2a1839f603644aa5520cecaad130fcd5cf379139056d3e163bf35f172a4a1f015924b89137f83d366a
+835b70cc340b57a09b1fecac678be381ffa4c4951f6742322c2751cf1c748ffc2b9bee8f155c007d88ca69c12bd9db20
+8e98b4ae7c68941a48a70f703c3d5bc9a4cf6c20c61eb4c1338095920c4f23aa9eeb474a0430dc28d355b15dc6e83b22
+b24be8171a105f203c5bf2ab0797dca8ce61ee07307e1d82fd26fcc064bd8a8a5b6bcae8dd611f8ab650176e694da677
+b057bec8ca008dbfd4982ce4516a4925a61bd68e7a36b182575c6a4044c7a413ecd1dffa66ae3cfe2213763dd0f55a01
+8d270924c541120a18d587cee51711486f09a39444182800355c4193a76789614c6925e6a448f46c1891106f866f08db
+a0ebf85c44453153764bfc817364493166833b0f84b7a7c505a955cf3a7d4c1b4d2dd00145220d8a3207758a82dd8e4c
+a56fbc83a3f1034337ca0d5aa89a0a18f900c3654d171d47ee86b0720c6a965c09c9b06678e3f25b151b115d129ff7bb
+833618f5d13b7919206c8e9666997ef26c04a74844f57150e7268bea540e30b93eb785803535566765bdc899d4f10667
+987daa13c00dcacdfb1f0eb13c38ddf773e7e8e19af125604ede42c6d0907f9ed1e4b8b8c9118b14f9449026802a6200
+99b6e669cd7532b435d01b20dfed29211042beea6de58acd68b6eba26baa1687d80aadff901b5607a2553df047ac51d0
+82c81899cb76ae21838558a1946425c719cf68d07950b0f106b859048107c13e4e83b0f2762ac8590cdd044c3e731f6f
+8f1c5f634e38f47cc6967f2a80a449f5bf69585622c333d784263e3f6f027bccf8910da76435a84155a6fbe9a8adc4cc
+92d3b5515744115dd20742be1a72a455c6d481855f4366a0e960104665db4ecae8925182f32d4e1d9dd7fb9aa246726c
+ac86e14775cc4ef22cafa8ac3298bff27fbefa9b7004ccb16d2937128492a2c1319641062f609d27b9314aa225301d14
+a07e1ac19f4c374d68084415fa4a8068c0be540c8b9d81c0837347fe096547d8318bbd804b7642820e43c284af663258
+839266a2fe6dddc446d4b515eb538a27b5a3a5e1a8246f6df77c2de8267e172bb7522aa7985e0503c68db9cf93399b95
+8a381fa29e553fb57e3780f915a86048aa82a8a09059c80154df9490271aa6b99baf6bb217df43c8ea1265e85f07adfc
+8d8806db0093161d7f83aaa2cbf0bfb8cabf823cb54bec094f886da6461397f41d54c39f216d7ff4a8262d12aa8ebfc7
+90aff3f98394674791e194b57c3f4e6e019471df1a74dc47bed725d4c47399e91c88a955612be47e89002f451ebacb55
+8bce2d60f3e82042ba94cddd02543b46cebb8770e9b7833b4e79289d4c491df7f4da0ab69778cef92dd81e5a6f0eb71d
+8246fc9424b5d5ae0a3344acd7d6962fba6b68cde09332c262d7b3f379cac2c650d80cb5ed4baeea16a5557efb6878d9
+92ea8547fedbf440517522c687f1d652ae4637cd072147ef31338a40e11017bfdeac42a32808d33522a71136cc3bf26b
+84f6a64600184c54d3d5c320498282947b8a8166f09ccfdfd6d285cff374312da57087fec3838a49eac5b93315f03b80
+86dfa1485e343c861286c057109119ce8e20abc646a4411696a3bf4718ce03d37fe14b6ea1600d8a7b172fcca6d08ea1
+8dd3404facfe49c2f096d2e74641c474c9c54cd6121771061db3c1757cdb1cd6813d3ffd79e3b839b348d34b7b4f1ba4
+8870cf255b342ffbaa2dcff41910a37afb29ca6a721774953dec182d95b426a481eac7bc107c4c2ef3df9f70e04e0b88
+b0b843ccc630209b9ab35a69f3aad58c76b2cd3cbe94579b5757350460633217246b342fd098e365fb3ae88d5b7d13f0
+804fe307b2d477085f8d9800c8a11c2dbf6f662d684d6a0d2fd415cbe4a09255e47535a08796a805188e1bad779ce121
+93d91029bce430ecc5f41a460c02cefd3fdcb8c3e761ba26a020e108e06520cbe2eb0c04139aad0c0fe58ed34d8b2215
+830867ec984210b314e7f23dc5b10e6d9ca53789cc447e29ebca229f4c79c9120618a540a9d21e4ba2ed8a811d6c456b
+8d7a89ae9d7318d6578c1fa75b3babfa7c9df7099eefc2a9983ffa96627f4e7fc99dfde21b92fef5e0034dfaee35e97b
+8eb68f5875dac63cdbbeb5df2fad7c1426939ecb6e3b6a48f737bbac1179ed4cf5a1e6919529878169d6d8552fa5ad56
+861e26c9a31d21839735cca8a384b981f7346b026cab7d60fa95a7ad7a4a370cfb409812ca285090c3f1c3a95e5194b0
+a02ab98589d48b2240209f54b0be78edb56b614b1aa02095ab5a9cec6a04faf065eb7b81bfe45aead551b1f774c60161
+88124374273a2425bd5932a6b446986756379c7eb93d3ba0c5d7cbc3477e6267d9c67e5e956cf6df841bb263d1a8e224
+91a766128a4c718a45db571606867bfe6e1b1049f0ccf71a01138d5443014c9758000a8be4dae0caca56321e3f992e99
+8dbfc433e2477b9d86f221e9c49fb8db67c85438fd54b670ce44b68b62d4c0a9cd56c37a2127fb2adef22c07643fdd3d
+880cb650f01191db0dbfe63215d208f70f924380fa22baa0e5bcab60f61ece3c6d4cca0e4363291f6a10aca9649da69d
+8532214650619e201bd330865a3228e9ffaf1f64ddd33d206be5616c691b1965814f8bc507fc8a695c8291c2f8713dae
+90e81d5a9d8fc976a3bf6ee6d3022107d3a9441ff212305cbc7c35bc9163321cadb352632181ccdc1450f91f51872b00
+94d656836edd68384df1fe61239d40a36a0fadd59abead673e4a2ae58de5e2a6bcc4b980dd9b517e7212726b8ac94ee7
+afa70edfed2d81326f26f111982aafad55f510de95555a4d05d9916a600f3ca6c1e3f66d6b092c91c1fce6c407e022a8
+95cfbd616c2a59acde8152578737d3ed329aa82a950dcbb9378bebc3ec8beef9be2759a937381ed5aec1a46d486d1afc
+a0a1ae94bcd07ba44c30bf50cbe0ddca2fdb5db82ae73e53c2efe9446c2464fea8e5de31da4afb99c6405798f0f9a59c
+848e10f6c12a6adcf711ae3af8382178c46b90b9ff9970350f14b1a1b565a7efd91eb96871277b86040d26561acee099
+815e749e4a56c3b982b50ef5ed249c4defee558647a5c6062022c3ef42b5ebb219ba770f0de74869bea14a98eec02360
+a4d88794689a0f2e194988114ab96d28f77a29cfff606228ebe030a62eb4fba25cefd59d3d5f2fb66acaeda866f5c24c
+ad59a8541eb9641c3045d5cea6e3930b35886da4c96906f701ed3ef90cf74431df3c444174d9071a1657efc8cebdc739
+97ae83289d535707039e9df8ebc73262f881ee8e288f73b9f0d6fd209385d3e2b761fb87ca852e10cc4818384ee155de
+b47983e11702462a23e26c8d6407b01b67ad532bce3f1e0626fe3164886603bbc803c688729a64a69d119b15235389bd
+b447011409a07a2d9074e08502e882098799f3b649e947de44c79ecf86a63045a19985857ec500638a3baa2b228a79c7
+870f506356aa4f8df7d61449a7c7a8689705388b8b81dfe08fd79e8a734c998a7ba71f1f6e9df085b8aa5813a4ec4adc
+a07abf6abcacd7612338b455c1461ff484dccda7430d4e9c5f9b4e5c1cb65055f4be650e6d67179b2c62709cd52a9b07
+988b73c2a71f3b1d6b4734d231c089ad6cb07f7ea6f4b8fcfdd34aa33f09feab6cda91232c06b47e90ae9930ea46beeb
+886443bb8d7d6c7634f55da1c5695f1691750fbf9ad2d63621589f91a0205ed4adbd4b905c62effaab235e740a172040
+b66caf1ac38a8a66c43767e8597ddb66fbefd888989ca1ed56abb96ab9fb41937927a792ce422577c68286e53bb4856b
+a84be3b37007cc932429ba2b4064ab7fabbd0b77400bbeaff09f8c6b818b5cd127ff8497e131dd8bf4323e092c690219
+a99e9898b6f9b7b1b9ef6f28f60fe2ea71e961b64b262cceae41003f6aaa16fa3dc1c2ab63bf63534718ad812e882a35
+a1cea8f3f5605a5c60144fed53943d3f259e3e33545eb0dfeb211a9dad8d99cb3cd3b2cf5031b85778ef6520700eac4f
+8b979026924097a06b3827ad28f3efd7f0e5aaf7920ebe5347fabc61b000631f0ee973b61b7468fcc60ba6e4381ee478
+b5dd7393dcff33d6d337328167ceaa7a04a98e0acf1dcbaf454247e85793fcc9a7d280ab14693cf2cee01afdf44506d4
+8580c90d72c0c83c6c003dcc340553ea547eca5989780493c2551ea9f04225d77ea76acc1bde20fef1a0bb7ec01685c4
+8c77db66f09e76ebf7ac14fe2fadabd41291f7ec5971060580b317f6af0daabe099f9db2c3d09c4c6edfa41211da0c4a
+b6dec051200c25f150d3b9a7802f5b7c361b074528c79dccefa77d26ea2f67562a6d9fb8246369c6a60f832fec6b7636
+8620173e19eac12fdc7796df12bd3648c66f78fb83a8e6f6c9077c34027a3acd0884ef2e3455a3de0fbfd4ca130ed545
+b44e3ae4047f917fe1af378cacae2813f8774307c20d54c565b674de197fdf90e1a6da0733e948c3218353c613d23fbc
+b330af874ac5d749a4ce1a23f4fbfa67f71e8fd16f6da07c714218be431b2a30cc4ad2594994a7a35f5aa06bf87ea3ff
+a5be67aad05a965685aadfe03d66ea1136e6979cef00605e92912fe8f84be7351a6acf6b73c567a20ce6045a703cf557
+a1672ed63df30aabe34e8eb81209ff31f4e5eee620b58074d92d9cf2687e40217169df59be8af7374aa5a9107c5f51c1
+ac01de17b74e2dacfe3db539910b6c370de94e646b6f2dd2a828a381b04f2979f8a62bac473659fe7b6e126f15ed7aed
+b978099cd3aec49300ef9ce5561aa30da4d37cb5c697e0b5cbc3c42ccf2f96e53e948fc579cbd24605101176a353a962
+8c8c439d9da3627e9f74da784bab8191552b945bb5bf9abb673659c939a60903e11f37300dddcbc8a495adf5c038234c
+8b4570ac55ea349560a4e7043fa17f264dbaae15a2f3dbc5ef8a6579e1f9b5a440aeda94122982fe564f78b615de3e1f
+a76bbb163db2ba26f5dcae8267d1a890815a76196af10444d3a04c1debeaa3c7cd51102fd0bff8944710c743f5393745
+8d3ba2494b612f93b4ebab77e6f207b636e2d09a3e4a9666d4ddd5859fdbb9747a88eddb7749356b141a071584677ec5
+a8bfd973dee352ae653f7c7bc7df2b32d790653a3f1f2b239d71677992938cabe941fa609e915e607809b5fa954c9073
+aeb4c1ccee15753d4fbba545ec4ebb05c7428427f087fdc0852a18439b19b1669a3c744a0ae2e7f74c46905f520c3231
+8fffac3ff9de863257a836aff3cdb705fe7f4bf604c2cbe10180d81c0956f723b69438bb8a3aa094fc755e386234dbf9
+a583153b241d31223ebec9a95e11ebc4a657b14056b8ca052aebdd9866140dc4669bef4f02b5ffdf667ddc9a87e0bac4
+93177005082ccf2143f24c063d20068fda393948bfac34af57ca58cfbcd0bf9a0de46f8f41312e83a502b7ad69b8f2ce
+a79b0967599894340ef2408b48f42e6ba4f406e5ccaff13b46414ee38e5329ffc145f6c34d8e8acc6aba41c23e57e7f8
+809a356a76d54a05e5006f2cddf0decf73e5392b57ead32ab56bea9fe13c1ad090cd69a8e297fa6e017b39361906360f
+b051226cb44ab1bf94a9cc0e4f246751d68f32ffd12f1d077d3318de642f3997fbfb0f2ae1dd103264542c2bd0293e57
+8cac28256b1a82d0be373d884d00e9ff2e384d5afbeedda706f942b1d222694f126ad44f9453fc8a985cf69fe11ad70d
+a13b073290de7a2f01a65e429e1adb78cd37eb23c24d6fd5a1632cce2275496179e3c22e0b7f59fb51d526402c0f3f7a
+92dab68d1dbf07e5b058120422ae610806809ddecd2aeb9d11d8fcac738c72eca584b88ff52c95817b79b9e0369e3ba6
+b24267fbee28883cc8649c243b13905874e5d97a285b9c6abec749a53e106db0a6fd6fd8671d5b7c9a1851da75a4ac5a
+99cdf977dbfc10084b698c81cffb431a9eabb55b1323e1b15baed5984a1ed212ec5f6c58372f965fe18de0100292e26c
+b021c697c56989bc8c06636cd623c3672e8885598fd2014f5e560fa2f721f9487cfdbcf4adfa34c178ac84771fbb77a1
+8fd7e3ad3330d4eb1a0bd42801d95ce40a82b43c366abc823e25311aa1ed882446d60b6309e1a1e201e725326736257a
+b1b3c641ef4cbd5e9c69955217f53373cbd104916e04d012eb40a24d798e76bf05ed0a218862ce02619ef694c42be170
+a376d0296c0105789e9fe539a5d22bf62ee36a2de4c9aa0f5e57210ae49e2cfc5209fe0f467ed19dc95b9746595255e0
+8a0ec125a145e373929ae33efb978bdaf16041eba684ada612c244bc3e28c7027886e6308373a5ea53c9c3d8e868ce1b
+93fde45cbf04cc386507b03eeb93c885da12bfe519df9fbdac5ada735934ea6e1a6cce066d033be66163b078e96e2100
+80c1839ee1d2ddcae1fed77d5f8091ae3074409461e04153db801e05b44a7658c6ccadd33ad682e51e211dd9e3c80f72
+87112961553b4a243875ac8d46bb6e274325699ccbdc40d7d9b7f7e58d3fd164f86b0b1df5df5f980785cb3918dc9b33
+a011463964a319c1ea11c7c55c607bffe0116fc834b8a1d3684df33f77f6e51dbe16a891307c9f51d5b4d205c4530072
+b316c4be33abd10400a4925f9d20ba02ab1feb50af39b6f6120d6dbcf1bde0a8dff7e08c64bd1f5c43543b013e242483
+9555b696d428c4b74806a7d08b9ff17c8512a86cbb13040360ce248de241facc42c042d3779c28fe98dc3ca96a47b2fa
+819f54bcfc58a7b793d185d8ffe411bde6207b77cf22b0d5e1b3d9843e4638009c907fdec1966b485f95870da57f131a
+82c3f9623bfb8a8ff3573197497c175fcb314addafadd025528f805b7a63c87b0e54b48d46c0322110b0043f7f77153c
+abc023b35318fd97ec81933ce55799d8c36c3d55cf59b9efb302b276a76a37c517d5c690287f216ffc5d1fc082e116c3
+a6579226d602a7ceec06d402d38f217b836c8804e9da202bfaf1f3f4f15c24762ad6a2414ac022d8de68fb76ba8a725f
+b701d6d60387d4e2308a77cebd210e868eaec10d86532ea18c0c6393475b3976a3eddd79e469458bae4f496da7398fcc
+ab202a2acd4ff874cfc147ad1b02d4515ace254f8b828f619df2537698f4e1b2687e004c70a152d605a73ab1ae40fb3c
+a7e09ef6c86ec7475eb3ed69e57e0cbe86114ca5c0748069d00b6e3a1e2ed74e4366adfcb4d938023560fd91d0f64612
+a9fc42b05ceaff4312d5dacd78fd2394dfb8dc87d52efb0529595877727747827c1c7e3a3da81255356033fce1f97513
+b0150a1dadde09cd60ec3686256b4378f47dc6a55c092c60a3a3f0bbf586013dc37ed53ba7a91c72791c0d52e4c49c2e
+ac88e91b48f031df297c29fbb2cd0d2bcc767be5e0a7db87acc87fcc0f4300cce6deffc0b1cb6fc7e51c6ab13ec2ea24
+a8fb1542a956fdb1dcf90da2672d40c90a4aaa2f1232318b4112816bab660657eb97e3d0fee9f327793f6ba9bf8df2cd
+b78191d1ec4615b03b21d7730d48fd9643c78c31feea19866429073f4cbb0d1a67f7d7ed210ab62b760c679515b20acb
+967c20d53d46011f59ae675a26aaadbb7512d9f7fe87b7a20c3a84c76569d23920121063235e37cee2692bca3af69039
+9766abf0251cefbcfbf85ab1322f62267c22e6556b7fb909413a7819f635e3ac1670da6f5f72d3bb4b739e12eae5ccc6
+b0e9c5c327fba5347474366eed1ff60b986a41aabab00abe18a91dec69aa54197d3f5680603057f05d5efa0a48dbc92b
+ae2f5defdbd14e2c7eaf595b017b4a97edf521f561ca649b6bc2e66382478b5323aaf84f0b90f0147e20ad078d185248
+b841bb6e04d2409a419dff4bf97dd3d4f06f6fa4e5e23e4c85f23533b7f25fe3da9285ba033c6eae7e5e447e35329c0c
+85e26db850536cb6d3de259f662a88d23577fd56d1f99b3113ef1bb166456324d3f141a7ff63dbccc639cff68e7ae5a5
+8cc36d89424da80bcc2b9d9969bbd75bab038c0cf836f561080e14bb691e8e0c17306fd6d42522030d4640a01d5c0704
+817e72d50f68dfbdfc9d5611eef7c6b490ef1509559801fe1ff916050429a5f79c8d03c60d2bcb02e72310b3c4c9d068
+a15ed72881c49b545413102975fc69649fd5417f5b7ea9091f8209974024785496fa0682352c879953cd1e9edb3fbee7
+adafd20b962921334f4be2188f9ced4a5914389d0afcdbb485096d3848db85152e2881aed0fdfca11f9c8a9858a745eb
+8d8aaea706815f1ec45d9ee470698ff199c40b1ff2d75bb54afd4a29250b094335538dd41637eb862e822c4cf0e2bebf
+b8480d2a79cb6ada254435dd19d793598adda44f44a386ccb1a90d32cd13fe129a8d66d8babd67044de375ee59d8db51
+97c17d6594ccefd8f17944fb760fd32cc41a9b046f87893bb7ab2260090de291e8260ffc63e774a4b6b1dfe0e5107ef8
+b5b7e1d4d9683de7193120be850395762ac9a5669cded9226f5ca2a3de13eb13b2900af083645ec35345894de349433f
+9405d473872cc9f9b9c57bb9976d3ec6892ea429cbd1b12f22962b74d88448d4ccdfcc6d5c6ffa068d560d7bdc3208a1
+b99cca139a3733b365f4718beb4ff4a5fd6aada0173471156640d8be2cc69f2a70d959b57688f927bca2329c3b30477a
+94872ec872f19279fd26abfb132b4a7fd8c485fbdf04515c7b416fc564e61a7b0fc5da9f1a380d2b3db989f1832ac1b4
+92aba716538bd66e35a7bb877cd364c1b8dc3055a9cba2da23c7d9c0a010209ba8afab455da99747fb4bcc8fd3144cd8
+95ec4c205be3dd5df181220c96bba3f4e3b526fe5369035edfcf706c1eca43f29a4c95cfcf94cecfc974e01547e55125
+b48c719d7cbda1e79b3f7ee9c17c13bbac197bb015b344f79bc6785b28a1e9484e2349178178a2fe94c46132c54983c3
+908c495c355a0555544ec6f0b8e0dd0926ef2c5c640fcb89049e6178697625b85492722d42bb5c966aee2cee9981607e
+98ded9cdfa92bc8e3664ae90af87f88759503715f6eaccfc983e3ab53f7b3af6802999da93caa7eb3530402ec4d8901e
+993266bb366ba46d532973391af7204aab46a3189c83ce7cfd2713bc11e99066b1a5a012bead2fedb09274e7b362e8be
+88d462a3a17f84326b1e4177799d6e9c5f4ef57152cb83ffff4353a8382ac8be7d50381723aeca77d33d8f07fccf69f7
+80438d9eadea15c90008ccf4758d4e3fd5a7bd02809eed5b683f2c96a15d24524ffe75683b7167d42a47161c65d533a2
+b9e7dbbd3d3d0d86e347831cf99657fb269930087920637ac6cdf185d5eded3f09cf3eb27759ce3f4b46f41411e2fdce
+8f0215f23b4945470f74b99607c12c36eca41aaaf99747f522d8531244b668d6ab8c1096b9b5697208c3931e1fefaed4
+b2c8d8515ff16beae04c855b4365e450e0ebfb423acf5da2501fea76259f862bf29738a858a4093b98c2a444396249f6
+b27364a7258c30a59d1f13d358eb49dcef298a92bfa699b3b91817d2f324be8fff91c0b71cabf26747802a92582e7dea
+aee7d6f71fd674cdd8dd1f22195981e7160990c16647c871835d988e881a3d4c52345e74f7a54768fd97a65fdbd84567
+91356cb2024f7703ccd662f50baee33409c28ff13bb5eb92fa93f303913e9bf31bf83b0babff4b5e3649003ae95492e6
+b744e4754043d3ed85c3bf6ccda60e665568dd087548ac70670b90328509d0d5013cbdd07bf603949067e54d8094fc2a
+8146cbea5899401a80676850d0b43b02d376b4b8f02ed63a7d92532d13689e2c02846df79cffa0f33ff81c3bf492339a
+94bba8a1508c6296d3dd5d2e609d6d732ab2541849deea5436a4a9034e1e6f1c8d26f6b781fa34dcdae7cbf8899d006b
+80260b321d932e1179667de4916428c1b77ee1ea537a569dc64a12da5ddc85d09896939718ce08ea7e0fe8f8b115c408
+89d4640cbbca5d105dd67250f3bbfaa96d7ce19a89f8d6e188353f3a9b8737f2db1707c506f8ffe1d3144dd1da371920
+92f5962946ef7190fbb7bd3935427157ffc815a52ef44397ead3aaddddc82e5f85b1edcca1e9082a500960e19b492614
+8b89240c9b7257cbbfcd6e415fd035ce33bb46c773569d217c82ecee5dc2d66eedc9333e0b043616b0cbf21744909b60
+a3d23484916d2c0ad1b81fc7df70c97d711040799cab076223e0ee02a45a0fe9ab564faf7a225982468f3e62e32424d0
+b31751386bcd471b5858d001fee15d566215e34d2d62556c51ddc60a834d3f1acf18c415c23a36b581cdf4791f461ce1
+860a99003b841221dc5ea2bd7e226e5aad72db8a5959d5d4dae8a86114d30b9e8915b2314ef867e9c2a477d9424a2d94
+ac925b330cafddc7d95d115a9e62b2c135acd22b5e35a4aa789f4318f03aabef818805845f2532e9504bb19f69171809
+95d8180cae0815d33bf8854f4590be652f95f72fc29f0c519ca9bf3f490ba4a724b23d9054e08e3d31bd61d609a8f0dc
+994f223740ff95764fb88de1ad6dd90c9c58c0dfbf8482e1dd9bafc20c099a6772acf40569c54143f6697fab72772296
+971d93cb1e7aec5defa52815bf202b11de6a2ac9c5d4c0eb236cf2c4941460731e12b718f4a5b980ec6f4c54c3d17deb
+a341095fe5adb96dec2be367f09804ef4fe77d553102ddf7d643b7277992708e84be9a7748a97a56f065002a97dd7cbe
+843709280fba29d446779b1ac6e31bc3ec8ab8082e8b063ef8d2f3733ee77a4191b55772302964bf867fe1044dbfad65
+b7ccc71fd0d0c9642c32d292ae88ca369d1fb5cabb97b1745c621aee41da8f94bb580c1ab23664c1baee65e97b21f0b0
+a9b41f31be84f8ba061570633bd9e5f4d8af6fcc5276c25d9ab67b2b88c1f8c2a87eb19280cd4fe7b4c04da8b2d02d7e
+93eb14ce0632cd325429e1c23340da9655d3d7c2b42a4594bfd5a4e07815afc9eb1ac737228771492020f6528c0b7c61
+959aedea532471b9610150657b895c5f51ca950aaca910df137dbda2d17184173cf2638a2a0efea3f61d82b6ef8a7c3e
+8ebfb50bd48fbf9a6f782454ea900acf0c7143164de9b5b46c1cd072c69b76143ac4c99bd43139b5e55f847841fa6a1c
+851499b3a1eae6da530a47d3e8bc068e6e7144b744d5eca5394f96253df65094e5f3c34abfaf7c7d78c4d5a5d4863da4
+a8d68bf15b900cc47197739856557b43a5eb233b6c095f21a14a90ac8c36caaa1a54690c95840f0a4d2e2ffad0874a2d
+81a6ff8fb1dc4d4042089d4cfc10cf826e39083aa5983e53f4866f8f4c10cf06cd8608c4cb1b785f8d309bdb9b2dda63
+82f658bd1a95fac0b65d337efc95d856aa65541d49aa993b094d70e527e7d478970eeb3daa2904a1309d755e1d677691
+b46ba4f3d8f287eb92390e5d930df4f1a40abe500c9aebf62e2eeeb2e5ecfe5296b09fa22d6c9cfdae28d431fd10a00a
+b5b38508befa4623166f6213cfd160782fae5b7c3c7ec279b42a83d43a7adcfaa6c5b34cedbf98bba357fa663eec896c
+89b8a0fb37a0c45eb1f234ae9c7be65c8a708f08d431728572169b33f8288b1e17b7d4b18de9fb76afc37ae609290623
+a7d1f5779c043900f3ddf29b6b7ae4301699c0ee9e70314fcd3bb2643f912fb1225a0164f45c47419ab762420bf8e5ad
+89d2a69fc014068aa6d0b79784b8953f3519f563b5c9f774f4b148334d822aa645b662d5efe7dc6f9cccc2f67268c3fa
+a698d3f0b1b6b72b72358d5fd5e49e928cfde69bfda10e163b9b43bb9604362b32af1909d28da5e0364abcf5e96cc226
+91c12dc25c48aee56484172de8c6aba0d9f5eae8db848a7b53d76001c292d115ec57d816c2cf10bb9e901b2707dcb71d
+b0740219e084d56db4829daa30b2812115b2e95ae85ee96a140b7c4012860e8017e19b482e981547e50e25bd4ba76716
+8c84d4fa255e2de7cd23b0bbd110687edc47ed7fa87bd42658fbaf3831c6d68cde3ef403ed6c585f8654d0cd32074bad
+a530d3272aa1740a73e15cb9b31c5e2e54c404db72274b0840c19b164642389acdab4514b9b2bf9688ce51392d8b6793
+a601f52bf7b3226fcab93c67dccd95c1d6673270671c4a099b867bd5578d5711fe9acc9b935b867ca780ba4a394279ef
+8a238082dc8ae33314fe1257e7bec69e905c194ded6f894267bce97443166fb443628490755e1d453545f389b5beaa2f
+88a9737f3e9ded874681fb6cc8abe0f6e1ce18a05ab599b2f855f73e6fe5bf804de5c5dddeb11057aeca6613bba72c8c
+8a5cf70293eb99ad3c34992c47299646c8702d1035b75e4784cbec67b28cd4c88eb8c721f4cb8982d3c6a42d1b9f7fae
+8a62228b84fa7463a6a8392a7af767b661382175633c5e00b36979d816a53b388f31afedfc47a5d8cbcb645e8d5928b7
+92836b5a41900a1c1ceec83cf4f15c6177dc20f95eed23a203810116ede2a072a8d6c96532ef32c93ee21acfb14448b9
+b4e538d7bf40c263dd1ede65c81883dd31f9237a0fc8d134a2b480a1a681dd89cd2edb19e63070ee69e96cd12069ce3f
+913eceddd4c9939cf82c7e9ca5ac300cd79dc5a72b8458cd69e9f8929168eb19e5f21eac12a3b09eb8d3998e28e3801f
+81f4a3e7195661b174aa2059796dd88d3206bedeb7d7cfbb7e61aee335a01ac50bb8edeb258a68949492d4ac6215d95f
+913a393eba8eb88d1076effa8d2a30258d83635ccb346f1bfe099fb5fcc69d0457ce5a79363a618f9e8b43f53728433b
+b11d721b08be428254665bd64a8864d78c5112e252feccca113631b2818fb729129fcff1e739178507ece41b807ffafd
+92603fb7d50d11b59fe376720aa57412b866fcd5da90195a5a401e6222201b30c29f8797dcc1b41ee2cbc6349bd5ee1d
+a466c5d41cd4a8d1f47a650ca67b529ad3873ba3fd3a36db27f7a5869b74b42381788bb1a1c100ed184118839b9879e5
+85c50607a86d4f76826220286784fa9b6ccbaadccb661fb3489fd35a3a8917d6999ac891190f2297afac3c37abba2967
+966320c2762b266cf7eac7aae39221599df4fd608036f6101cb8c68192fcbfd5f61c7f93172aa2be0934486fdf4816f6
+ab69525f1c77b6706592cdd5b98f840184b49efc6fc2687d6dad3b014f6a12c4d5cbcb5120d8869246da010823534d8b
+aa2c9df15c06b58d7b9bdf617df8bcda83ccaaf6ddeb8074db931f7f03dc06a7914e322777e297226ee51dc8268e80af
+97035b62f8db4df6e787cc2c940f2298c7d26c2127c7a76e4660d132a14f43c8bac8dd4e261605611b2e9c08929f2bac
+8ace33e696953806f594427f137e84ea6b22ca9b48c3bdf3830b3e951e5a463d4a7067c68d2033eff452295a741fa1cb
+b621fe49b12580bc8ec68fa39d5133875da23524a5ebc793c35040fa3436350d0f3e4bb4e53eaa23d312a7847e2eb2d6
+ab7d6ccc0de9c7ddea145e83fb423a535cf26d470af3326d1d6a9a579592b32ededb078bae4613028557877a9fe71642
+97528eef76389dd77d33ee7daebbb290814911beb725ef1326c3160b9003c3043be09bf3f84e4818bc2a7960ce1acef5
+a408eaf5c675b50dc1c655f83b9595dabed68e74e6d2eca5a4948252667413cfffb46358400df5d35f92657811ae56e2
+b36537726b26b474e184dce0ad868a66f0944b4105ff6d35a2cae0f3a520fd14a66630388aeba178d400b5fe104e521b
+b2b88518d10bdcb111c82a261076367e34718f1d0a1a06b421891b4eca1e3c1f904b66e65dc914ff1ea5991f6a638a02
+aa3172531879a5c8f594ce96277b2c8c8d4a2d0f4bbe567ae40d5b36fa6108e00f0b1dc94b81f36c9eb6d1e9ee1896ca
+a53975587f10667a9474ae2756faefe43e7f81bf9e051049de175a8ec085530fdee3d5e3db15d4be874ecacf49f31691
+a1abdc58bff4fad0f6562338daeacdac8e37f9f3212aa252b17389bd9c54db58706129a63bd0695d299d043b5ef0e2d3
+b8588fa1090597fe0f6275e5779da11a4d128c52fb8954e475c4940f1a3e10fc23ce1f61e9aabe8a75e82824f718a94c
+8a1981c536747d4cc06315c794f1536db7ab3c9dfa024a0df854b948d93bee72083b6c9c4c4a7ce999c98b904813a659
+95b2b1ed525d629eed454bd6bd059b01869423c3463a56689a7c39cffbd3453c962426a1126ed631b25ae8cd7538302c
+8032c60f083477693f533c2d8ae391d62ea754b8eb41ce9cd59bc469b980dd959a8ac840ccac54b404a9d08a6f9e4b98
+a72ccc14eeed758d3d43c51d68341fd7e98880c3687e122238d77dac8d987c8edb3067bb63baf13a0e57fe02334545c7
+aac3eb536a5061a8ec788ce131582dea691957ce8b9c6af5ab7224bdf0fd15c77bc6bc63ad037bd83e0ae52fda738361
+97dfa193800e57e6b19d1b7fbab40da6dd1463f043eeec34b316ba6bee21b6bb633ec0c4fe107c9dab6e06e07e0acdce
+966ee3cf2f54777968fbc34f08c8de121ae7c1d6b2cdf1f1f9c675828d22ccb909bfdffa2e3f2ce51b0cc85bb29f8504
+a9df6dfd12f8c43c28b929280355cb23ab0ddd2cc2e4fe76603a2e5dc2ef5d1aca2edf89b304a27345cbb1f24a86cad6
+abbceef80c744e5a1194313f7b84b5dee1c9861cd4bd3d0d12c433e5f2e8c6ef6f10b860abf3b788aa04896f708426bf
+b1dffdd81711e9782c992c4b14583ad9d6c39ef88974682a72e717e21923da6892490d7efd121423fdc638467e62e064
+817f30dd799c422da33e13ac2bada8cce3930233ddad495f714a1c789b7aa8f41ff6e688bbffc5f2e8dfc72e5243b645
+96760a79e4414ff1d19fee65b6e65b2dd6665323981ce8b4ee93d0a9c410b018ac086c08fcbc7a71720e1e3a676f2b3f
+95445cabb75909262975a5b06381af2bff5c4c6cf51cc84adbc0b7f2a985117f35c014e33672cd5216a9737d3f37e067
+a279c905fd9d49482d213f5eb98256d020c2b90bebac45004d6f152ee4ddcfc72a7e6b188ce3b6c93ebb9ba9b8be587f
+8591e8379a78af8860e6a0e002be5b25aa4b93c5e556f5ae2e40400f828dfa19d93a4910823e230a51e2c1ea5464d437
+a6fde17d41fd9f03605ab6ddfc992e36535a23b2c39608d30cd6d72588f1ec6afb9db193e88eb609e104e73ddde779a7
+93e2cb6352a5eec063151e5c9a822f6fd475a072dfde2464af4afaf6a730a6af1fd74c424c09727328a7f23505b91407
+a7b1e4f703386fdd16f5fc9b59ef1dd682bfe5a23bd42b3c4b1385bff894e758ab09674dd6d0ded5b32a0a0526aa6d98
+aa7f01c450e619c4bb42d6cb1a90a94dfe132a641728a642997b71e2c3b02d09a7695b544712b2e14416e7de0252fb11
+ae840b870a938668d0d4404b76f5d4d252d8ae1e3619661df0890ccbab900e3d8dbd5dc9f96013413e3f1e30dc541db3
+ab7552930ab07b0f5d50edea3a2e5ea3ac1a05cc985246ca066fc3350bc58949dfb99d4f6a6408d1bba64d3de47a3c2b
+8053634d4c730b5e90d68c2830a73e93f1c9e522ae0e00a04e2ba15a1b7b4fffb8b25516ceea61719f886c7763d46219
+880c39ca4cafa622bc767d3127d62143434d0a1d7de8dce1a2f94cdcaa023a7096641a46e6b97e1b1ce9c233c873a519
+ab9d46e46cb2f382ee7d21b6da01578b786b7998e0fc2b5d5a4e1a0d93aaab997b5c481c2d9a741865d6460ceef57a5b
+857a5957adc3a888cf93f144aa809c70a211932742a258978af5e657f4f57fcb6d9e39dbe8d3128fac6c592dd5bc4ddb
+8c98656861fb8c8a03d491db45077f1d136a759177842ecf6c1ca36923088237e928558433d5b631590f395db56f96c1
+abddacadd7d536e91d36609fd0047f5db113be0f4d84abc7631ffc5c00df919c085c049c013a05131150b0043d51f892
+a8b14af12cfdd0e11c8487334efbfdd22c8b4fe6bf350333d42ac8c704efe54f50a4bb51d9d802e5185ce72e4b21aa58
+a8badc2bb3cad0143db1bb3cc81751f9974ff3f0e2ee35921d04985409def84ac2803a657571699eba34767b773666e5
+a6739a05d270efdab18462e8536f43dad577158e1c1655fa130da97e469adce9bb7cda6f9ac26f4a9ba3f9b22329b066
+842ed6efb4395603e7fef0bf92326c0c63992da4ce7912f850c4960f7a19e0b2ecc720d9510f15ba6f73a2c5ada8ea71
+8502ede859944047898d533e1923ef90e1b5c17d985c9fb4c6aa39d50636de4c5a4df278f2f62cfd3ad08bba4c5ca6cb
+8c738573226dd5617b3ca1dec8780000a77f3fa8de241cac99b0d9b1b6c90cbb8aa2009668005f2c5c7abb09c0ab3f99
+b101335c403d769313bd05c755a9196769465f7068fd6f9e00937f3cc843d48f013f5931f999bb5c0082d4315134f5d5
+925ace190259b321981fcf8bcf52c6852b206099f25c0f278439ef6edc4320d6f926cd6fccf1b4cd224bc52e5c681612
+95f5855ad1bf14224e51f7d5e0d229683c0d38fa324b1abe9d595685d3497955e30289618c4775f6083bbf923ff3a37d
+a3d3c7100962c8b60c40b830af834ddc48858e7eba5ebe2874ebf74e505c25cf52e661b49d7619f2f2a039e1df02f5c8
+af7e66c1d5dca63e6be117b210c616efd533e77199d67d8f694e4278841963e0a46e4e44f0416e69bce6a7156e1872ca
+ab796760166d1e1fceb20f9bf19b1b7cfcd327650cc7cc35c161ddbb3cd4846e9a971b541f303cf62fdc0124688fbd41
+b920211c5b440b3567942dedf62a65ffbcad1e3516f58d14d8f8dbe86f45c4b9745fbce43f5219b7052b27a3a04df12b
+ab6d5d25b9fc46b0824df1628993e44535febd7c62185b6795550388185035ae12bab60fa34848f465fb4f4a8add3544
+a6539b67dfd6f3976cb6b304f4d152532b3f08c02bb97730c03c746da0f7b38ba65536faa43953d46e5e7687a86c356e
+95bb225586b1c82d894ababea7e5dfa8468bc0e10a2ef34e5f736fd1611114cddaf1a5c58bc9d664b667adef68b5c25c
+a16eefa4e6161a8e7bac63cffb2dd5cefcae57144e63b3fded581abf7ce32016a654aaa582fc25bfa51c83f352e09372
+8b742428f6af81261a47a0df061e480ef9176694d361ecb57967bea67e11cd44df686e38e35b7d4a6ee02ebd520aa1c0
+a2a4f2307f646384a0238a711c2dcf7000b4747b8df1d46c5da962fdb106c5339790b48682e8ec2532b8d319ccafae5f
+81910c1d72f6731d27d3a4059ccb0316faf51fa58e0fb3d1287b798ea8f9b00bbbde31fac03f93c7e9a1cdbc9502d5df
+b846b933c2acd71e9f9845f1013cea14d35cd4b8f7a371b9be9bec9d4b3c37a2d0da315ba766c3a126f8e2893f10af4b
+8ffad59284b41b75064c277ab01c5b4b3a4f3c4b355bf9128160b1a55ed6b0d91366f7804006b4e6991525d3435d5235
+82ff36a72533fd5d6745d0c3a346fce4f62b6aca0b8eccd11399b482f91cdf6a5a4135c627043008cb137ef4ccd935d0
+a11c27f6eefe54cf32fd86333d9ccb59477a655bb0c35dcd028eea58d4cc40ef9a26cf3432fad4e9d058a27b419b8f04
+96642ce0eea3c2c0fd155a75bec3b5cd573d41e8081632c56528464cd69a1141be3180c457213128bcd37f5fae47f7f2
+8349a9e390e05150bbab2351b77a3674f1af000b6eb6752927ef838b6f0a1200e6fd7201dad8565e3caf3802f204246c
+b8ae7fea6275ea61935d3047d8156e8fbc4a95c9fefd1c36439b2111b9ebeb7ccc306e0f8c875fa772f7b433cff848aa
+b366f056e23905bae10ef7ce1728b317b83f504d128f5bd34701ecb0d25ec08491969625e23d5a2fcf0048af610664df
+a3d88d506ba46b73bf07729aafe9698e788fd688647a6b4145761275257d262cc450c7889b8a40d698455baca55e3da4
+891ebaac7a7a408aee4ba61605f44f9ca5a6d5e046eebfd8f5108b6dc4479482806dd01686045b4c7760051f22bce468
+a6ddb74e3e3725e6f2d9025532ee3f357ee35289e1cb38dcd5b2ea8ebc0bb697416fb3aa73e1eba632d593d40fdb030c
+a7dc097f440ebd31ec1a005648468c702bb77073ac8cfa32b050e90a9e1cf388f138abdd18f07951c752f7e19f706af1
+a200f25299f9a0542c196adc2e00289f453411066b88b125d3f0e6b17e98efe9da8096312a2f1841e01837da90a65440
+97cd3a9d4185d77d4c7bd4ee80928def7b660d8b949b0face798c62a7cadce1000997af29504d28ccf9070fc3016dc56
+b9ebaba1a15eecae6b1998ae6d08233d05610dc0933b16922076b2dc4418cbeb4e5cbe099bbded3139d8a47f2b2eae10
+86f5fe8fb36b419fe6fece1c5c4b9d64468b4aa0154bb5dca466a243b6fb1227c3b8bdaf7ce5c2d4fd05c061979f87df
+8050e011011e7918ebc25825d9863c91046fc3756703bdedf936dec2815cbd10c2403ce6f4a0b4f576cdfa1347efdb85
+ac22132a482d2950be9442167be214ed9d24519073bf5ef1c8e3e6f4a77065da198a851950330fe4d62b2a1272835015
+819e2e8e3ac43b6ae4885899346f3b558bd7658ef7d380070588154694957596695a925a001a9fec7cf3655326c50c2c
+b00f40c084d2eafa36811e0d822ffef874a0d4bebd4817690408a737624be05c920a08307cfa0c1195505c5e7a5fd878
+8355768c09515a593c8fc8289baa3b6cf7fc10d302abc93f72090ad99a70a1ef1107eccf839be722132259500a565d68
+8bf0615d2cd11b03546ab7a0c90c0c938776aca8a8b989a709c367f0f5eea7b0a7cdd78f96050cdd5d0a123d01b99c53
+827c2cce458464fdc716a2198fc67b3cf2ed7802a1f53f7a2793b2314789998b13ea61343c723da8863cb63def6a285c
+b609cfe6acfccd632759700bbb0a06fc7903a6c0c5875c2c3bd85c65bfae7b29b03e77092f29d565a6a89b85012396fc
+b73ddbc330e872363bed36578b245b666d42923393a1341816769ce0af24b700c19ea0f579e4f9aff1c3ff369e63da8b
+976d658085e5978807e13b150c7aa539b44ab8855a386bb58a52d9ec9b5e21ddaf89a18b043394d6cf47bd589d04b240
+a213897312aa28cbb2c572e643d3aed003c84bc2ca571dc5fbea8a0b642313be94db0047e293078d975fbc6800751a87
+b54f2914f6a7508b6686280d3cc955730458ff035978be29645fba161ed54ef3d4086f956e68d2a48c49afe904edff5a
+af99e470055062390904673e18d04427c16afeb7b9f13ad83bc2599e9a92314bd91d6f1f81b55419a4d668bd889ec8c5
+946ff0cff4030b73a1342a9173fe697ab20cc5e43ea6158573f2def601e12a174da431f8170bd31ceed4be48c90b4f6b
+abc51f8bb5f74cee819ee383cbab739026c453bb55336fdf423af2c2ac6712ba90006d62dd72d8cc1b2ff6cac900c8b6
+b43623a56c5fd1bf28bc356fb4a875d72dd4cbb00c9c863646a3376937088f9932a4a0aa26afe2ad69840b06242ec76c
+b0f371952f99eabf7ed368a142ee07d06bf2b7ec1ff852fd948b8c53eaa52300753fb9ff6765201e35873b5167583f3a
+b3906488172c09e148c571ef0712f88bc9f1ecae0db95380f61901660fc1aa090d0740378d5b9b76883507bed100093c
+945373b5e6ffce11d39a722df7b24eb929b14a967d211be3b969f48fe1ad3dd4280317d1ca772a69b033f3bf26c02c4f
+b2ad3490389fe5bfdd5ac7eb5bd61facff8d57a8f9969f4938ea56f4a85eaa2c1179a2e5b4f87d9e6409925c75b61828
+a4d61547e405319cbc20cad16a2bfd9e6d093a064522c332dd22134ab05e893bc84786b21b4c71a6265bbd06da2ef4b1
+86749c26715d22b185e1b25dd34818e96aad319d7add22a98486ef9f9808b5e4b938c6320d391dc4e0fb5d57bd41778c
+acc554d5b866693a453a9ec46d422c8b410458fe8397384b927a62bf5f2b1fb9706c8c21af9845050fea8a91786e3577
+8eb7e763d297cd93a7a54dbe4654c39c0ebfd73fcc34d3f1338de0c347676f445d32f270664fcb7b33347bd377c9f867
+a1b469e3f9dabd36b13149c83aa5b7b5987eb0ecc1ce6b68c72acb39ed503a11ab4451e658576a92df4aa51d1bc709f6
+b1ef105cd0259486be8f265a73ea089d5b7fab7bd7547932134539963467fb917b2206aa72446e2fed5a8185b04d345d
+b3e211c1a14925f6de451271728a3c1e555ebebecd4bae29bf666927868039d4ec99d9f9aa98d835da7845a5c863dfaf
+a416632a50500f29b6bb471bf00b37558975ac91e5c5b5004b67e130be1acc954a8ebaee7efcaf6883187ee9173d1ccb
+8c655a85f66b5f28ab8760c94b6cf01cdc36fedd19a09c261e432fa7eda7928c3c88355384e689f1d2715d419fd8d898
+b1fa9f82c9866d4f296755bef5b7c39fadd09374f38ef9954aa57b1431a1ea4cc17a9750da844fa1f5848f0ab7ca295c
+b45cdf1a9eaaf85c0b07bfe239da618ee649ce90b417d90b08eb518b1fd88c0d25cd29fa7a0d8058d6616627a3dda306
+a2be1552d3c4142755e0371a9543032ee82ad669d7edd24c4e2941bde3b78c5c6df427228fc45812a55943b3663cdbda
+a28feb053e86dd9e2f9ccbb7c38467e2425fd580ba0f63190036fb47d01eb198ba8590b5cf68d1c0f47638e9dbdaec74
+ae06b849e080efcdba86fa03a0c9dacb38a15ba911aaec624d15787c3e11ada6909b1e33a2e3de928a23818d833eade4
+b4888445d86bcf4d1f6a9c2d253f277596795084c3d45a4591b307b7ae4ba177d6ce871c2cacdcf9457f9c132f244722
+87a568aa2f5471214f63932b0d48e589898e82a1f4c1055a9e73120763430537c233e9a3cb6cc178df53768e4c58c993
+81e0ec97cdf91ae66d065234492a1119198c396e2db204b7edf192c88eb4238e0a45bf7e245f3714bd864244cba0ebed
+a954a3785588d4bb3cfd7cb27df45c82e6958051f916594d76cdb35bb07e4f88e2831a5cda35fe1f3c99f32a275f0668
+a9c9f4d54339d414342e87b03679baf29c219d28b6548f01891cf94d0313a64d3384658d82373d6e838d886235ac446d
+8ef46cb24432b419b4cc803e60b3ef5872db8ea614dc37643e4592fbb2891cdff61f6b2a10653d9e99e6c7359ca4c590
+b23eeb458c05ffa5d58be21cd0699974694dc61a9a928fb1eb509954a3dfe7d8a71620a2d4046a448de0fb213be7e97d
+ad631be8e17285f6310fb72ba913c564fc66d14460c4e8c4b0c68c572a5c2a45b088ef60eaa9d317403bacf534d57a23
+b7130f5607f236374f5e023fd43cc6dee38286ca47d504c9e75c6504957ac2bb9134fd59d8bb1010d545c56ad9c71c4b
+b83cb511757d80781e26b5e9b3e0597c4cf9a976a3fb60c84efeab2b6793e46282612da45b1bb8b45af4b7f39877feb2
+a0c5f8b0027ee11cd5f86515698f689ad514cfa890ac4ead5502b5ede9d7d7ad12285f5806c9c85ab58f89bd9f188938
+aa8e8f9335c6e34bca3472b5f412ce93ab1ed5f9e51c3affdf986a5badd2ba3ca1ee69eae53ba8144927f082371b4cf3
+b2a4f775a10cd9caa776123771f08e928ecdb22dcb91efc440c69e37c6b467acfa6112c2776d4a530bfd6df3b04fd50d
+a0c553d5d2a9b0525f71a5a0a539d579d937275df9220a0c3c322d6c0ac7fbd2fc55335a1a283e687856e2b30398e4b6
+8ab800ab4c810e8f6a9d42d2dae9be89841bc7328bab06b88bbe1256f720ca99c056fbe4e1378d7cf805586ae18dcc55
+b9a8766f4f4bf796e2517a8a7a05bafaa6d3ec601a85c466d33b8a7e0498fa1dd4e2a9e42161fe2362c81d4c8ee1fbf3
+8cb7d054162e9f41245b0914e7dcf6108ec11456b39b473ecf6c40e56b172fe5be4e7b0753a3685667436796a977b977
+9131d0395897f5591ad56b62ef83a3ed9e7b3951080b33ea606a15742f78a283f924373e813b877f32762dd69884658e
+8d784d7f0884cce988305d314896dc6dac2d2934cf5d650904e1397f9b9dca397eb7f3accad60ab5e34cb2e494bb640b
+8819629608ca1535bfc156c1e17f8fce5821d81e6661bca75a1754a5919d0404e31e65bd509387383a4111535e949f5a
+820a6f46e251a1e6d92784aee18fb0d265d7e2f0a5b7e0b15180273eabdefb34f1d575e1d8e93dfc2be1114d10abf31c
+8d10d0e0557beb8db344c2d8bcada724e720823fc37ee7c51b322c3269559ae932bb2ea07e50d7ada88ede788839dc8f
+911a333e2f7578a0ff6533284176cf235036047a11534acb649a0043a326723662bccddaf1970b7c37b5146977277b88
+a4be2104cc5d6fce4a46de5de8d210559a6b743b6347b8d9990315bb56cbf80695ff936afadfdcc415d88b23ce6863ce
+87ec5877ea8f1123371c49263dd9fedfbde41846a23e12073ef80f7afddf5a0ddab298cc02e861a90188ef1282139ecf
+a3f1dae70745b8284b1353aa6902ebe3cf5580e24e02490d42b2f509ffec7e8e777fdce4f1a92d83bbb23cbaeaddac57
+8ed5a0733b42482d88da7c24e85a841ece65f6066dec060bb267a8d1f1ec165ad5f7964c2908d3fbdc2999c580eb8990
+b124a1db23f4875e0caff1c7f4b9a411564b93a9ec3ad8143bc7a70b8305d380b934c194de8201f7e3699e905a1f0115
+8af58886d4ac5578a29c2e309a68f19a62edef5285d0757c42f0ec2550c633c0e991c4cd7a60df4523cdde40c3909345
+a63fbdbde883f54667c6cacb356db1fb976bad147b790064ff25ae72be53bb6f4d74b22ca803996e0d95d216caa3fa81
+b99fc9012ad938b36246a4471d29f0a2b37b2a3be6fbfae7ec9fdccbfd14d48fdbede0d88ef3b6cc273f2488f4cab55f
+acb6cd4e1672eabf530d38f50ae651db8bc4025c2557c59ac4f1a278b4741f1e2cda978e5d1337f9e5aae77c95ccb872
+8f8f6964534e4a9294c61c76206674d836d4d56970e9c14ad6835adc6b0d256402742d8a4879764569d9082ea6a750cb
+969607ac6ca9bbef4fbc2fac22b12714a31f5d6103dfb998c3b6f2776283ebc7346e81a22da168af40752f28ff60d97b
+b633f60cf6eb8ed588c545c04972ff156cee767edf31720c9715be3cda8c8de0290b623b22cb8fadb1690bf3665a7be6
+8235bc2e818e4d259bf2c9fcc9646ccf83b7e238044e26be417d1d0dd5283d7b38c86e8c88a5447645be191516e2993c
+b503052246ea840a4083bb4a8978029af3e242e831518bcca015f2c2df504e98a48c9002b6b9fbb97e861a0a3c5b4b5c
+a145ac57d7c028c3cbd2a2bfea25caa35a9b5d69cb491b13eaadc2b0d927a590decb7c4995541f8f29089a2cbde6429a
+80b4c0938058fa5d03c948777f13c70f46fc025d4d6c2f2051915b476eb0c0bef902374d784df57ac368c01e1fd51c00
+92eb253e3b1770b36c4b2869a944caeed7b5c8a5b8356b25dcd4102df79fab8dd2c9d01e3253070f1206d149c43f64e2
+b7979ad6187f7921e725787b0a99050f4c98762c63fa64a467f7f110932f6d07556453a95e3a2c0162bf1c9c41424c90
+8808ae4c7cb38202c8c8bca0321e827580155197a700fa54b6a15b0f14b001327d4c9a0923168bb5afdd1b45d6a78367
+b16a4ceee9de5f49a99430e18aefc192f3c1ffdc4b41392069f690893bccdca760e6dadf4127539a763e4f60aef37dde
+8ac113da7ca59ca97d6bf7d6e03f1e9570867bed27230515475f965ce9ce0b424c85810e18a584ae5a3d5c2c80c6d4a0
+847ae1b0ef5cb11be37320f3ab5e30f59d7910ba3d7cbf8265c74df25f4b8f56f1ac96cf49fd166c3b6985d1e8091e6f
+aaa9b04f50ed6778e2481842cda30c7dbc7d462b40c7602a438ca9f2c1599e83fe6423f30d7789fd240d2e3166836f5d
+8c18492569faa8cfa1c2a05a0edeea3f63d003e38d9ce23c4a5b31cde993a4ec88c9db83011ae15b578e0d0f6b72ddb8
+838b400217af9241755032c21a3ac4610f77f3ad76abc43f0c59a59f9bd52f2251e46fcf1552b6ee0220f4f2902e54e5
+8675f8de084c6c05644deeed1ff45090096c72c0db6bb2ceaf1c0d070bd10ff1e83b2dcd89b6f99bf132d3e131ef6d0f
+89611bc63c83d56131bc2a8653278b234b4635aa7a05033d71a8377a5d188ffed7506a50a5c37a33d199a42b9e55fea4
+90c290c17f1687a87023fadf74b1e10ad0c0414cf08629b2a313347f0f6913bbe511e5d18d1c3264b47f65dee7887d4a
+a590bcb6391506035466dea82617f11dd9417c9f379d32b4c3bbf723840e1a3124d2327deb28849aacac278470d7ae20
+97c55f459ebdf94ade7bc3bb18b329bbe2bccea345f0b4dc38cfff2839749b8f9365e8a1cf31722649c165e265344c35
+8159d02fd03c1d0b3c928658b3df1a27a57699ed8a573e0c3a179e97f50b6c1a6467b7055e42f9f9c6c858459eed517f
+84d4f009c052f3bf76b2b972b3d8f7a4b2d78605a566478670c33016aab06828a1737a36d3c9173583e7bed0aee84fcc
+b99d7558944ac2d61f5a800c24ee47fca719e69f7284956be94596623cf434a214c042aa46d54019de3556540ea53236
+8d1efbad46f69b80efc5776d8afe95dc0a8182d57318b9f2d6fb5b7d5c48e7181e6bd61a8446a553c58f7899ea7a7c78
+84a9cf6a9d64cee7e7d8f0b678d3606c9080ab3ecf62fe0d6f994a681de68b30534ded61db1445a257b2c5427e97b36c
+b6a5d2c55a23841a4263b10cdf784be6fdfe1b25350a4af510ca294949716711363ca19f9c44ab1c347aa3fcd60f0573
+b1b5b6dbe6945db539fe7e2de07d222c88d7b91753118593ad9890c55c4c3d83b4194f886ea7f66ccbb348f5a23a2a22
+a8a58169edd3e58f87fe8529f5cf7da7679807467ec707ab96faedf75085185a78f2ef912d9180a5e820adfad32ae4ae
+874c1f416f866756ae3e93360342848afdea0048a575f977fb1f8a57325e50da122d3e9f423e308f0acb1b28fd47a6eb
+95cbe8b47ec42a5c72ef7b1f91e3de0b1f648ae8069416c48d5529c9cffb104ba4dcbe87cc06e4e798a1b23bf1595f9a
+a1b6e9c5d63ab1262559727872d1140b74a4f01c12366ed2d401c64007faf7917ec591b631c6bb4dd44b39aa43c7f965
+89e6f4a05679c95d45b54e760056378a5eeacc72624eec8b5f19aecf8ef0d8acfb2d807d3b88c6b1206827203f219905
+b7f7b30cdea6377d5f16d200b987e3b4a6f28387faa701dc579cf7b3c6887d74ca43609c5bc36414a6dfd0317ec75448
+83474b58135f3e2c5e8355e31ae44a77721db71cb2919c3f3403f44903622d4116e812ea9ee9ca073938dee780f4aa22
+a3e4cbbec770630c5e2f3b67059a55b1217435bb70ba5b5010244e241ad6a3e6b8d9261d8a0765c4b42bf795fa4e96d4
+87d3ebf0fc03ad67299f3b9cf9c9ff0890b1d0d2d1a0ca2a62147444922d207663329e49898d79bd8e09ee48a1560fa5
+a1d33282cb17c7a4c5cfeab4dee8875d324aca8d0513567c4e5eae180d1e8ac98b2ef16b31afa7c3f2ec25cf3e8bbd11
+b10b6cfe3ba563b41ae0d66813105948416ce0848ba3b34b8e96547e8842086b632a52904e56eb61d93e0cbdd402d305
+84c4feb35c8d3583ca17245e6f7e73cb488aed515c2ef671b09a04d8eebe6b7579e5b1fc8634fcd4c3bf8100d2cb98de
+918d8fa2f52a9b3957ba412c24cc579dbd1f0b0834b909a6ac0da5dc602ceec17046f61b3d4a2658f724757ca8041fb9
+87296e4775fb887bb00dd3265f202f31a8fdeae5c6ad8ec63508476cc57d330827d0d241c68091bb724a2ba921694a7a
+a8908019d96c506b314c84b22c475157daa36016a9b94feecc4571e869918e4e5a9e39fb7c9ae0f73f9f868bdc50e2af
+abedfabf75a93e7521eb339ce2e22e0e887f94ea28d3adfa42d1e0523686c6cbee4c96b2bbab3b8393feda1099b24d4b
+a464d6bb17386cb431520cdbb3818beb3951b0255d72f58c300fd780aea1fe4dbce5532f5321e80e16db2f9b9bfe8a1b
+8cb8fe0df930e1e19446ff0183c7034e35e33442da346df8a802160120a5f4d8abac236763114a650dcb1a1d38bafb37
+975c47ea6412bfa97db9cf12c2b4c07ebbda436716aaa7253b2343138b36de6c897386833849f539bad7659d9319abce
+8cf94457a5a708cc91bca9615e599b0c0afa92a7f2d9c83704e05a3dba56a90c4eedebb6d2d25b3080786e16c27194c6
+950d02a5e41c8f704184c7c59715fdf3b48d86b53b04dff7c21738c7c38c9f4f75349ac1e70ca18a0744b01fb8b13504
+9458faad893db4458b330ee283d6a90f68346332c99cbe8e121c890bfca908f0c91168072aa221c3c078d7fd5e4b44d9
+b0262948c113fa2a122dc6208250b62ff35b12d3aa1e5735e95198424cf16a4829e9211c9edad83989c537572c5b41ad
+abed7125de7dc52b0b42cd34fb350d4c6c45016319ab776b52289bc8c2b341a15d48165c0eb09511a1a5a5ed7ff39e4e
+b4c352b4a127afb5b0833d210dc2c216bea666e7c5a940a3372988c0b02dfd236e4ac7c124664bcbf353132d6f061f3f
+a334c5919909dadca50f3124de06400df660082b527f1f32b386b9216d021d38685f1839bafbaa7950eea6c1cb14bf53
+a52f4534e9de29f91039af3fce055f2f6726fd9b10595a43ae41f7b466cc4ea6314487081e867ff4b5e35cd622fb428a
+a68c6ba9673896bf49ed145935773fa50d95ec0103f97a6f1ed698d93b4dd78111325f797e47fe153fb3852f4590ee89
+a5c456d516a557aaca80441705cda63d081181199097e83b22e9cf7b9947a8bb78cc476642f04a5ca3b13032319591eb
+8a359a3dacc7b45da2b826dc27700178553f6a52e9705451f24c6d6026a0c597328acaa10b3b5a883b6353eee4eca594
+807217b435d73c1374bca84d2d3e069db756176220a01607b81438a70f69232b82099c676fff361dd909271be8d5d555
+965d0f46eb0804f19dd700d8721349287335c70e992efdfe89058ec424b87acccb3fbb18d84b727ff5ccb6f6783e9065
+aeb5f2a0bff1e6115bc2fa73093019f8c679efec91d03398e24651be187265f7ca80369a1dfa61e8701385dc0ce9a0a8
+85732f872228dd5d691f1507ba00cc94e054baa59a764565401e9e9b3287d2d0cd0f2af290b28b5e3c80da9cf23ded63
+8e9a315c5b40e7cdb866b8a7e6ec01eeb27a52a76a88d5956ac3e66fd9ade3ec954acce816227b57fea6ae9244f1303c
+80436457879607efd008f959cfd7507fbe22e417c701f59b5a36e878a04e51e87eb38c48c0992333656b24a4e671bfb3
+a012f6d166cd1d98098544bcddfbdfa956ce60011694b640b012da3a0a22ac8a054a9e205aa9fae4df764ad60c65a6f2
+b8225afd6e4d45520678e243d97bf48f87c2b8d2cbc24b43f94bf6e7f60b7768d4c3b30d28a490e7c8a1c3a104ac8317
+8437fc2ab6d90716419f544a1d16c607173fae5bdc242d8224d7714c115cc54f2246d1062ecd77d5a9cd3ebed3a8adc9
+b113c6c63125930882c18f548c1baa69a26f9f3dcfbedf5be41aecd61adb896ff9622ce038f0ed27a5ac602b6020740e
+b893aee6291a3962fe17ea41322de7edbea6ebd51d2c564fe23ba8a4cf4b6270b7ac72c87f2cbca209be1ba607ecab75
+92e6a7494114cb4dcf2b86ba61f57f6db7e4d52895ba6c896433139eb2ec9c9604f3e9100c690e1949e32f5b7e29de93
+881a323e772a639553cbb401e2b6a255094412addcece2c99ec9e1346aea2f4e9eb247552435eab74799ee4c7a927b6b
+8d5d3ec378922311374fcb998fe5a42176448b629a6475abe494fa56abd5faa5835af37624c138beeba649f7803a4855
+b1a082ba449e93cc15fb4dc5114351437599fbd4d28eb6b4746d1bd242172518f94b2ca8b1f76c08d9f6ef260d9cfbb2
+8fd2b7728a3c61cd8e0c607cf40e935dc45d52d040ef1259f62e3eeb30bd3a6cd030fcf407fa0b21423b23a795a02b90
+9214aee5787f4666c3e2aff70949dd679d4203a2c3e7b6f88c548b80a3e52d7763f2bc2b7df714eef053f60eda4db331
+b15df25b62c6f4ac9edc414ecacfe8eec055bb07a1220e327bf35c5e452da7620df03416a449197bfc8d948445c5f734
+b41ff69731e7f4308fa18ad286d3ecd7be21afef3d32f5133a0bae877a347f8773c6e9d9b3b850d054236a6f186e6913
+8d9d13d1b7d9df41cf5d30dd62b9d1d2c4933d62b6cf8d1830bd1ae4dd5fa3de36bfa1fc4d57681ae13996f85ad2551e
+8011a7fd7534b248db40050edd9752c960ffd89b0300a91520759ad51da1698454affb4aa8907946605a02ca09a7f340
+9159054fbc10164fa19f68736c2a683d374681e6e9d5e56f7496aeebb0969b8eb1a91e377b3a2928879147a7fb60b3e2
+afd4980aa4661fe05bf9040f6551d980af562da69ec5072104d8ea34a8ebd28baa0b70e0fe3c11f631005693fb99213e
+a92879cac7940c6d363ab3d0ba7f7f24bad0b16142c78969a737c27ebb09a62071540bec1822ae6224d943d02804da50
+89338d27ba29343279dd83827ae17a53e7d634bc77bbd848f3b6a352fe92f6021dc1c81ea6693b3cbcb1f24188edc757
+a2490a856c273b6eb5242672f817e60a157a1dfdf25b1d32e0f4836a9c2371fae72c93b94d78267b3cb142b4f4d7148b
+8efcf5d06107554f896084e32e8dc95c49fc5da3f8c4be4ef6f2ed89914233eaacfea886040bfff14759ce28a1eeaf3b
+a3516280b169a6832e997a4a45daf46aeaec1d8953387f493cacc2835a5791d4dcb24a0c0ad5de79988d76f843d79994
+95eb7531a46bdc51acacf7fd9e7210bf6d5ca59b0efe58f79422394447adcca6f4ea991600e8558da8e19e029701c5d7
+b1fcb4177f16187c76b421c29f715f1551ff365bdce9fe17b74425f76dd90fb4ebe828ffff3d20f75ac620abeb9381a8
+886246027be4062258b232926cc82b6a51591138561ddd0173ec6e4b7ff750e15d9ba175f569c266148c653ac905d498
+952c089dd09dbe531f2fd4137c971622fc1d85a78ff07de634f63853f62110dbae3646564addef8f2a070f5a16396ef4
+812ed85f4559fb28732d17c8fd7c6b09a70da454a2318a0276949df0a5dd2714b14096656b7b5b6398f54c74eb9ca49a
+9340db62e43e43144e1afb1da748e81a1b00f7b0600e8eed117e92ffcf801b9d89b494ffb003b4ebd5bb4e0eb96c9374
+9287c0745b4bbe24b56784ac28bec43ed2abb6bb15bf11ba2b18b01801da7d162aef88e967d2f10fb9f52f6645d7702e
+9615bc232ba6053fe86c6328eead899bd62c4f975273f72595407fe36ea43e30eeac7524bc17dbe78b4692d42ae81c04
+a387899b521b1a89e860756bd0986b302f3c06271ece653425d6c697e0b330a3ed7789efe0e5a1b32e60257a12fa0147
+b4c99909fbb92b1f39e9b2fabe05abf58af834b6c15ab0f62304ccfc5047f187a3ce35388ef293d2857b777f9938bd55
+97dcb90d2dd9291366b557936931550d665cd05bb1b19a7a53a31c2a39d264789477a47ae14f6bdeb171e78941a9d9e2
+81417b4a3e61ab9b48e0ff1afa8b523bf63ef95a6d6980092408b61f4293fb202395b10a5d12dcc54961370c134d5b0d
+9135da893ef0a9d45a719207659cad4a0590218303d0e02016bcc5d14f54de5fb8de642efc7826b3b3212f714114600e
+a00d0f8e2ea06b13f5a75a6dbd1f2ba7ce3f3bb3e62cd3b53f8b6ab39431fd2ce156a1aa4a1988613d4a2b6d91550147
+a3f8f17dfdda07166a7e5503366dbef45ea6b6eaa1dbe02b8051dff58453f1ac24762c82f6db6de4370869f9b25d6d51
+847c2b79076f9284d9a866a72f74f62fd73cccbe2df18c0fe34a35416d4825d364e24f95f728bc0e6a5215b08b6f0d2a
+9816284cd6b8b35e1f5409d3a5899af5f4524a4826470fd164fcfe863994ee3aac77cbc16831f0866b9f0ae561903d61
+8ab1f9feaa8ba2e1691acbfbd5460a4bab531344ce4accbabdbe5ba8cedb5d5fc0967def4365d755ecb62d83b7ffa4bc
+b0cb477aee9bd113959ff7b7675f81ef251b76cccbb67cf68ba571fc08561736e32c18aae93fc8d1912e7eb2fc0ecca2
+8cc41304caf0357d13a25ecf66336bece67d5d319bc5a50328a96199d7ca4fad05dbd7b5edda58be73141bb06e269c8e
+a7b4d91a884abad5337925c34d7fd5f2aea5a09ff3c027cac98c646b5058f7fe2cbf47208930509e2a4eef1468f64c89
+97d942e97efe46594e8fc86828ad3ed1c9133a8067f9b11bc0f4ee3815affbc0c7c46a91c40f989d50f1d8df96982ada
+95a7d369f3ce7f7ad7ddf85bc994667ca25a0c2f11b9312d06654599410d5325ca3ea74f33f21b5aeedfb582a9e40c62
+b0a05b564a754b46fc7aa4f5289f02bd9f19708b5ecb9db5c36bb7505c8b56ec22b53fedefc1df289c0f636c97e8ec47
+ab6e2801ea8bc600f9159d05a3b39e8b0973fb9c2696b3f2685424757a6953a9f8ddf5e29c97399c4821b8d7fd9f1bc4
+a6fbbad2ad3ce8e4f9b939080e9e7049eba9f76b8ffb57f7cac2aa46793a064743239ce287e156d49cf4936517632290
+a606632b62194aec737403ce5a9b6316178c1d27baffdac83981baab63e75d51caa414ea92465ef37d6d687b4fd90141
+a5a99b7bf8f4c109af04c31af9b5f3148370319c8483796cbb5ef555ee1d4858b2c1acb82ab5e26180254399fd7a0625
+ab2b00f64355ad294436339636e7764403b821d4dd4fd74a6bbdc2aae450f14d7dbe8423336e793a393f4580f1b9e35b
+a6c98a6ad7f36f16633fc216c12ca34e596b292524753ca1067eb75ab52facd28ed3a7c55e0a0cf1d3c9115a2a0d6524
+84acda31e618eaf0424a37cb3c386585a3870b2c24020550a16134ad8802d427c918e2854c98e5def58a2363a8e1a314
+9911ec15af39af1a18003ae120da8d909ad4bd43ff03078091d54de71de70e19786b2aaebaa5d55d9b2877004da2c271
+8cb5a148f065e36b67a219bdb347a625a7a4be8f20dfb1cffbb38fd4d843c2b1b1886c1f015793bbcb02af04ed91b170
+815d9adf22a36533fd4a3efae3c4326213ba2aad48724ef958cdd6f0dd5059b519e12d91ed5d92f1418a07b62b108bfe
+ae5c244f309467ada13e2fcd8942886f563bd996a5c65aee73a364c2ecab49be3ba6bc8a387f3baad44776f4f1042eb8
+a47d93b35f57ad890239a6f2f69ef8760268adbe614d5877802db4b6cc75cc093baf101f75be0f7b4d71ad8724dbb9f7
+a0d089701b965df9fea938e337016ab20e0e567e736e6652955f1a93760b4a9f128be5a594e71df8e7db47c3f88c2fa7
+a9d9a7170a860e2860f785edbe18ad909ecfa489cd3a2abc580869c7eb8e9a2db93c1c473a5f1474ec0d51dfdedf95e1
+b665abdd084abd292548c336e3e6fa1c5ed1a53d2e61a10ad6a4c66487d8a9e101632ff468b012506135907f0896156e
+a10ccb363b26beb9622e1d91021d08a3bf02bec96a059ead01961ad51610992ef03558c5f77e074442836c9d2ff44e0a
+96d6476066264eb3090ba3544dbfec7c8a0d90985a1697985db0d04773f6d37d5899a9d4fb5a3207c320ca78c37492e6
+b4290ff9213e2ecd30d303b2b4ecc66c2614b8df246e70ece4e55bea9a1f5a0bae9df6dcbd8efdcf8c4b0f2f4cb44d48
+8ef10b2e53e6770a36b6403678ffb86f5d85e3e87bb1b3ce9f1f0cb0cf32f1fe991c565595389ad83d8c8d54a47dcc82
+91f950ef60014e3dd28f7661e6275ab6f085c803988b7d6dbb2cab25f10b0372e271267245761e1af97da6f48c230205
+97c626e7114396daa337ada4f08da5129464d8e8c68a407c8798949817337578733fbcabf454a22b57926485c28d9d62
+b596984b609a9858b1adefd15a546d4b8a417c8b54504efadffcc805caf8935b9c7f55d9e6b34592241195f513453572
+a3fdd36f3eefffe0cd2a9e6cbfc4eb9c3a499eec25230df8786b23f5eb71efddde062940ac23d5b2885081da48d3c1c1
+aa1822db9ee136d0a51910f0a59bf0d2af6819e4ec0b859b790e01bb08c1def87e9613b355525d4ab7d088b520a6a3dc
+a9089edfa96fdb7204a68c4ffcb7e0a875106886a0c589dbc57a6709e7822747affb07035b99d056baf11d0852720489
+85664ab9d32ab0cc2d2e61901b2682f88a7259c2da4ae6263b917ae8afc232614b4ee56539a868a24940eab74142198f
+b90e06a1a117659b52b364359e2265daaa8981954e9a9c37e3256cbabf133dd4900974a895dde6ec6b394fb36b5bc1c8
+b414aefaa4833283dce85add23d1cfd776567735f2ba9018cd791d652bab55bb0cc0cb38b88fe47e3b4b877e63edbd75
+ae579eae9c0b09c906cc2824eeebe5b4ea031547055c8ad635194f3e864c7a184dc21a3eca9c43c01d9a2f272cb2ce81
+a7b1d13997c283c13f770d5203cb09b5d3ca7d45324ec89c069928e1ed1a17c57510e0ebaaf54a21d27b0f9f057bccec
+b15d4555520565b76ec21d87e094ece2e04c7c4bbbf560264da37604f1a484ecc3ce8143b04759fe716411293876d0a6
+810bb0773c06caae8cc06ffc92303d51eadca1e1b0acd57ed23f5feda70378e180619f68b8db98e61d792568f49a8316
+87dee32807e2e5f2c884822b31098e5be2a4d950ae728e3281a39e661937c4b7e9fc025b50f437f01d69e5c33dd751a0
+b46810bd73d077a6b73757d22b5939c02a3632e81287073b00ebee30cdd402e89c318e0b03d01fa331193842f3a1ae53
+95a136a7bdca77f764d2c2d4795a8fc9e5b9097d73bb3956b7a45b42185a99c949db8ac5627ca263206cab9cbecbc31c
+967eee3c3afc138a482bd120050dcb9b45a9fe258e5e4b678b1d67b4691f4c5d89cd260210fb50f9cf2d3e2e2802968b
+b2d59a9ed0448b88f8eb26d8017a129ebaf27f11e0a031130266796e5f777bce93cf2c7e0fba8f8ccc997315db9aeb9a
+aec708d3093b12caf29efbd8afe3ace1de24496cee72270223aeaefe4f0ba3a7acea7f2f5f85c1f274aaf5188616133f
+8563ec52704c1c7ab515451a8f89f87201d30a12c95812ac95fde2af033e5019615a07f28b540a92781ed35786b5614b
+b1c8f819a4ceb17d35ab997c14f81ae2af9d4510caffc61d4a19e9129e0bf7264482a10f329054908f99909999b6f538
+8a65668637ba24358800076d8edc90979d6e614e6a683dff7859ce7d686014e6de85298f523ab060c9a9a4c4b8862cfd
+b4df02dd6f4d3908142654a42af60fef034379b1526c12be66afcfc4f1177991811646495aa85702f3461060732cce80
+8991bef253f0bb9b86e68e81f78116c51097004b0309e199025e45ac7ea55f8f6b2bdc58886899d275424ebd405ffac0
+a74f1048548fb41e57f679d632280fd2e4cc6ab88c81675c59fe143b74dc7ccf050db53dac5611ed6b45b6a0b1b7f3dc
+92011c668bff7ea995a71e4774e3fb5d521ee2552bdc33d9a65afd9677572c2a303a940751ffea470af898b01b9285ad
+881a0e6042771492633b46b6101f96a48a93aa3860533dc207cdc90783fbe52b4a9ade1eea9117cea004bae802cd3fbd
+b3e578bfd77a3a13368ecf8139b69f729cc720aab25853cc9e2f505c2e03e75cb779d685698af8cc4aba8d1c17f5ec29
+a025b6e8dbeb68e7ac4a595b34089fed0d24eb29a7be235048205e35a97634d6015ab24c21a017b5012c3175677fd0bb
+b751acd86ead936ed0f22d770872cdb5aeca3b1ec75a5a1e65748b665f8d1c859b5620d761d5f0a2a86331188e82b2a7
+a05faf0bdb81caada6c662ed2fd145eff5db5c423258d6609bfd4c467edf3ddba6480ab95ac9f4dbc932f4887b070c82
+8fd1faccaa7cf1d59be37bad69b7a99b7641cbfe930d778e0f712ae1fe9e78d53f37d7d5d3aafde48452eaeb65d980b8
+86042bc710953f0042940625d8b69ef57c615f9631fc49aae169ca595446e9d55e149c92994d4bce7b544877d7b6f22a
+b396047f716c5fa8ca9234c7026f1772d83f41be03410b4a32a376e5a038d252b8f36cb813bc3684f1b50326994c31cb
+a2eece2d76db005f5d95f5f480bb3353ec67a9c27896fe54a2cd5cc7f802507d8d518596601bb3d2798842b96fc03df2
+b738c1264d094f7b7edd27b0ddd8e29716c73bcf7b450ad7715fd21e1052998675873ccbec486fe45a8f72d9b006f239
+826c4c5fea1596e353f6c15d91a9bbacd9ea592aba4d22e735263062eac44f073e5defb794f8ae4afb7d4dbcd1ace959
+a8f1d170f63ae3b05ca9996347a1b3987136e7bafd02774698829986d48da3d421d269d31743bfd3e7917c5ace7ce729
+ae6871a8278f24d816657889ccdef509df0fb941fe6c5839cbfb704e81b942ea2a324fe0ac9881b385bc97410fd94b0f
+8aa6bb564b6a0354be89c4ac10309f941162fb3a546259c5d789d4608cc628f69ecf814b59bb8bce364162f7552e628e
+8ed85481cdc58fc540384213dd1b86f80af8908683d7d2c63ef5f8c4ac2e90f0e5f4e07b1b841eaecaab1f7e091423bf
+88741d9c9d875e2c1ee5b95bafa4d8a22d72a728260297d048e4f0cd1c5f1eaa94fc233be3fa15a69163f218d62ab17a
+8a99655974ad5c0f27b49d88a9c52a5375e16b9ac4f22b1e1bde53ce0a21589022c0ea926a4c2d7c432a53656ccffa37
+8e2628878858764824471fd613cf40d1bbb3fa84ed081a762da0d6d491d54688723273d87a587ed1d3067976ab74fe1b
+8f1a6162bd6cbd2353265bb348311073bcfca5a86f41cd0c63ab91b14aabbeffade5ae8a94f8e91faa386223fc2bf849
+aabe8cd92f0193d12b032a9bab4bf4f02ebc0b24d1ac09f8ca8906621d6c7d4bb436b2dd879a1a1cca2b44ebb5642995
+91cd27988ae8100d48ace10ac9cac4cf1cc8539bb492521a8a6489f8575a737f2a1d37fcdbe88dd651179145a59af920
+8baefbda554bc0a0b425f2e132c7de061fdd120ebd452ecff0d78cc5bc5b15401997231727a37e9bc4abf1a553a4cbd8
+971b12e25b989511477c04602f48f584485a0a0773b46643190263c0288c2434969bdddb1e55dc1f5b1b028c1c53eb32
+a0e47f42444a16e51323af6f519c0dd2271a85746882818d02373ba33c2e2f7bd6a1c321497377e4781f72427fa34224
+b52bc02de867d7b20cd247cbf496e03d940be2d7ca5755145e9a0168889db345fa9ab17c41635ab275a459fc9d02ff16
+b01db7077e9f01e675c62f5095400cdc68a059e1a5005027033ac535a0505f45f89faae4fb9831f7ff9cbad3b55db02d
+81ae065f1d55f4643a2ee120bc1245b9730455ad9e5402df8d6fcbb1bec71e40f1bfe7b8e67f96fff76d1478cd3973ca
+a1be3723920044be80f398279e2f8432aaed45a36cc4fc71c87f5dbfd52225379e94600793f40aedaac2391caa57d155
+b682f74fe46d4b647196b7c14804dc0b35e36cdff59671d7164ece874107964ff9f76c29b23c190796a9a3aa2df822fb
+b8152e458970ab53f6b5bf6101008c5c31d2f58993474eed6bccda074555f7ad2351810d78676b62612e7eba2d86247d
+9132a8fab2010360ca80adcc08b3a01658dc8ba8f60bbc45e1144c1219f69b985436c36c65cd7910a8aebd91ea1d3d38
+805cd373a0919de801b6bb7a6ebf55530037fa41a1993c159e90213c492165c42b5642dda5fe7283ac4e3ade6e63a155
+91f20d77fb7a8276174989faed41fa6da841d35b074c4a756c2b4730a7efb9b124ea6c7d5eb150a8b1126636cdb2ff0b
+8cda3ffbd0ab6846dbee6cb8c0360842837a65f83b6ba17085161a7371a4466172354e494a8614cf2f1f4726d0a7262b
+adc603e61dc36ee605dd7f2761ed568bf91b9dd3d40903eb7d77b11d10e4f762694fbbbcece72a7ec26976054139c768
+a6accdb3df5029f19273a39bc30cb622f87522ca5a63372dfe61d993dd783ca5e918218b5c519d25e535d8b8238339a2
+a188897269053f2494bd0de8cf098e41010fdd01f5a49d7ddd7b294ea748f1139e0d92fa7841dda9f8dc923ed6f02615
+b26ad5dde632259293d91109fad4f742ab74de91f68ed2416ff53c060d1ea4377a875b2ce960cb7962c37a5fd47e85c8
+82cfa86a17b27f375172d66b389df727734480a224b91585fb4782401d6c49d4dd347b8d1e8df6b9c0c1d2f8ae658de6
+82911748e1471bf5d7fe3ff111ac06dcaf5b8a43c76f6583ca491e0aa845b61cdd443613c5728863c163952d86bfd482
+b7b0d4ff87df02b5481183066f6ac0d1636718fbddc19889e92a71a168fbe338ffe780a792ec5642aaa4024d0964db69
+8ec21f08594ad38e9ac365e5246aa5c2c8e34ae66382ac483b47771c33390ccace4d906695b1ac0f1c9204c46576946b
+b9617d746596b26b84f2709a03b64fe77e9a10d0c85535d92d28dae9de3bbf6455a247f775dd9f67061792cb924e3925
+abb2ff3f16309fcfe0a3b1bc928ca5cf618706cad3645b029bd54e5305682754e6ca47e364ff21b1750f45041eeeb358
+867abcb8029b35a54552c57346024ae7eea38e9ae4bdbd68bb3c1de3935126880f237d9aa95d6644dba8ddce67e343e7
+86eb4283147a9e595d639f29a967310acbed9ff09d9043868fd18f0b735d8619eb4ee0250764f35a51e00b58543bcc66
+af1779d2115ca7021533bcf55a100b4d3ff4e45f8ce6a6d98df22881526a429d97818fa1867ede09918a438957a03534
+b10b36d0b69b0dbecb6f7efb6c612b0462c346079109970a26541a21aa2b5b81c1e121ed0d5c81af00ea8eb709a83dfd
+911f81ed75fed55f1fabc5f86f9f38490e006820e5380963a739ebc0f87a1dd3b7da8c69dff1e580c5ad2246bc08e2cc
+8379449499da9159cac2c09c61777955e61c63378d051bd28b59c78409ee5d09c43e7a6c246572bf34233a314511bbdf
+84b48ec8895049bd03dc3256bd0d63f6e9abb178221f7d47703b447c709fc5fda47b19a3439f30f10d2670194f390915
+ab3bb5afe824d8aa20f97ead4c40aaa93350f33d980b5783cf56c8552a4298c989b7b188d023711a2eb79631f3a8c317
+ababba2722186a3b2272feebaf2ff46c93883b7265a6a4fba039d5fc0e7fe81b7d4dc2cef7738406f156f693ba3a55eb
+ad50302a51eeebe63085d3c1705eee9142bf8717d07c5d87e0e4ef5a12207dd5432994c72b9493f9ceb558a20929c9f6
+8bcc3d83a6b8998e1a1066347c647ab122eac80c9c505d5cfbc370f466349671d8da4d500201226c15c1f62162efc62f
+aad6946b5d5df34ee6f7422fbefc6de33dcf4461868ed7ee7f47fe9b8eb2f7a89759c73b7a029d422b02afd0f550e722
+b0fe1d9a30759d83084b4c567b586e5a8f5a080bfa93b4a3feba59edaec33b6a2ebc98ccd82aa9d8cf0bd254d5f03baa
+b993c4c2b77fcfbdb213bfd5f8d655d1d41a52583de63b432e2732df2f9d88c4c6779f314848417c06a089fcb970c0f2
+842ea3aa645e5852695405b6ff2184e55bdfcf50be2319761e717b7b52d904ec47ad3abf986850c643003442e302ef30
+8093b0ef1f6c84a8253d086a6fda6be8376f925f416a9d1f44ea72489f60fbd8b53cee616cc5ece43e2a202653c0640d
+8c75f10b6aa848d84baa4120e75d3edb7f8471473851326cbd9ed7b29b22c5403028f49430bfe4320c3f4227827e667c
+b4fde4f20ab98f76f55afd533f1b09ee4ffbac9486399714514fd694fecd0ad1fdafe13b2b80721829c7a59e4c951a76
+843b2ed867cd8edc2eee84497dbd49f3dc481e7ece69310d06225325ef032a4e72907e16e7b6215ca775f88983d55e5c
+9881e5caa9706e4d7ba6ab81525090e29ecdf1808931f3f2b11ff9ff5cc97f83f3e14fcf18abf18159c3fcf4cbc27042
+b6c4acc868c05c955eb36a24652314be37004bfc14283600523729d466c56018c99a45a41ec0389449fcc3f8aa745638
+b6820864d07715dcf4a9ece336464aeef9ce381ca7dba25acd48f60af056a3405c22792cdc57c641e782896c0ea05b25
+a1bb482e35f71772486675cb4ee0fa5709b757083d18a29d4f4344e6ce901b2edb2889b7eac92c498b90c7d3844c450c
+8cd8d8d47de859d0c68bdbe1834a1c9a34e92636600fc592a08f96d66426c5f41f388138f42c9b8ad72c596f4bf85496
+801cc0631310656864b25d980c9e99a98fec2316414819afeaf182d3e7ff93b32a989e2ce63f5ea9301745080854188c
+8fcc6b2b656f7960d9ad48c091c1ea71b6f0f61553f7695049c770afd509ee58ca8e1dcb403aa2c5acfbbba58676bd44
+b997b9a6b994e3eb2de8723ec485d8181fd674de19ac9c2f50704785d9f5a28fe3ad194eb052b5ce122ab5e6e6968a70
+a909e7002b82b371952ca9d0832f531db15882180e97c12c56da649fd65334904fbbc3f097b6a954469221d181e718bf
+acfc712e1a61504814e37b3aad0d7a5cafce5901ffa43c13bc5f70507800ff03ed261367ccd09db7429cc5dbb892a7e6
+8d634a07b69ad87e41d941aca08550ae9cd72fe31f3075511d030c364fd6578a36f3f0f3785d19305a1e772486ca097a
+9746ce2d890248002c1bfb755e06f4f4570cefa7636e10319bf491c654b83608766e95fe9c77f1a6a630f5add77b71f8
+a9dfa56bf82297f709f1b4bdbe4bc194bf22c0424815bafa6c1a536f2d15f35bfdebe0867ff20781a49274075622861e
+a723af2702c6b473caa4a64142464f201bd1e2f765454fb0236082fe3ad77f22b4353e5981e6bc37e974c7ef797f875e
+a42a1a0c50befa6864fa35c25a17f5309684c53257376f8111fe96c84a5e09376fad9c8545e1946f360e16e1e4c941e3
+84231f6bc3038320dc13f3ac014977326dd13e5b2ba112c084d366b5255729b2abe665aca8a41d7aa6645412765887ca
+a64e21d651bed6dce8dcfcb4caa60791b9345cd7b6a100f5bb78f7423fba5ea0d0cb3668f3415c27af29ac35e5dab0ae
+b8eeb2128ea14d81fec5b1103d8511a3dfdab925212363c75c5cc01515fd94be8db2335bb84e221654380e58e9f2be67
+a92e9cb287981b33a5e697eb1e757bd44f45efdda1759122fb27dd4bd4ce3694f1b6b2082ce4e6e3919d9d7a0b7c8a12
+88f22b83fd9dad63e800b0bef709759f380c6dd9af7058100413e7b09c7517eba258d6367e0cb1a41b7762b86b2ef137
+8353d45a2096fb4bde82ca22381bd2ed93fb58b236b16e68bb37df3024672067c4378d7f04a4da4d116e7d57a2211f7d
+9076205bf231de091fcba7f5a4fe1d4a359f07236efa39f5715f206e5cb7eb3d9adb56af8181f63a9d3e965dc909556c
+93ab7f56e8d37b47d3a8cbd222f2dab4bdbf94a1152302752f0a731294f4dc214fdba17977f11aaff2eea9517fdd5789
+96d9883ee108c88342befc358325356dfe5d72c521d71e4b3a58d6773ea3d1a1de1a20572aa96ca0e8483eba62466504
+950e0d61ce4e76fe0cdc3d59c5bf23d8e1cfa9d6ee13b9fe41e6ddc0fd52081bb16bcdd973d319c20709ec517fe15626
+88809c1e272b552d46137165e5396917d107547b65059fa646b742489e8892acebeccbb3eb8f2d676e3836c985cb1756
+945f13ff081b74403a19dbb04173780f04766f7624ac6b77f46464df5f4f3b547c459f41fb1842164d8f1c126ad6be65
+abfbadc599bcab1c2b7cf1fc5aac7798d9f617d6afa0469ee23230c0d004fcd3de0ea645feddc74e676ecab1fcdcd8a2
+83ea1571b064d05e1b7f4527b20ada121024a4b2dd8f7d551945488ccfddd671ed2ed3895578afcb3cf958f9a2c75c29
+8fa75050bda001409f2bc0a275d8dc0fefaa47b3a0ae132758bd711eaed0851d6bf3e4b7f355377a93fb8eb02b3ac6f5
+b2fff49083bb30e2661e2d8978149e0d0588dc972222f46d5d120d01dc5c9978830c442827c8fa295f6b8e6d8c786198
+a352c2dbe4f18b311bf0690d77fbc9439a1b8088c806a9d89071b3ea04ff387325cdc04a091d2bde5fd087bcd0f4f482
+948ea89408826ded81549cce823dfd7605ffc2279ca7d0964b1ab3d5f35f4b174e81575291edeb9eaa4baad3610ba3a4
+998073b618140b04ec394ffe4af02df044d923a5cbc8f06f26c9eb4ece17abedd4f72e10c9738bd16863327c0f6ee20b
+b3bfdda0d6960af897ab508bd9312d9c166157f78b45157b46fd2e38ab2e430e8a19335d8a611366cf74642bda77bc78
+b8dae3e2ec5eb97ce3b5e9be719bb747e6e8f28dfb1a6b7bf5063822b502a5422cd586bacd87ef83c0af081ea4d30a57
+859713ddf0ae843ba690fd8177ce6c08e2fe5fc1c8893d829d39a199e04758719bd3046034926de40973a992ecbfeda2
+866f150d4b6a015b03ce8ad93a70644b55ca1818a0f50d24795698c62f3abe59d3b8abe4c11ffcbef20127d3b7afb970
+9145367ce9e2a5a6140db58cb097767b5a6e19eb36d1c03acadef612af95eba80048f2b02c6fb46eaf38c75288e3e4eb
+8c298aee778f4af13329975754e9b428e127680f26be139307d43268dc63892ac98284d78ced0ecd384301e26d5b63e2
+b4c2cc9256fc33ed09531abd7c3e34f8f24830a8a2cf2d684cdde46155f43ff2715c94e7dfc7377765ec0cdefb21cd2d
+b9193113b81bba4ebfe40e97be436515254bc67a94939220e5e69a197765bba40dac3369e5cde115d1bbb65e1c826038
+8474d72b7cb52768c484ff92d014d7733003b511c0c915649f65dfceced47ecd933ce876eae254cdf2f6357ea865580e
+808e9a59f947b2b39af51deab4c164878e02d95773dddf1123091e27de87cfffc07aecd7c9cf3e08c0b9f525bd87fff8
+a8e0049eec8eb70c12446596ba5c8a29823704be3753312c34cb271000b6c154b1022812dd02d1352cd263b655437d6d
+ab7894a75e40d888a4d0539582cfd6b458da009a5017e561c14d312335a75745ce134b57466fd30c250ca07e0529c8a4
+b30c5c0abfd35ded7a3da8f9c95e3e1c320857be1af317f6ff5e35101d3f31de3735ff8741f6460ae1e63cee543081fc
+b15557ec268b4eba9628ccec0a5f3c947e624b61edc876e2ad8c36ada061fda76f69c8afb95270b85f4672171678d078
+b7ec103d6695fa64107f66622148902019ff3acbff7b77ad80993bdf209b73990b0fef92dddc5fb66aed77cdb59af9d3
+b3d002f0a35808e3785d58d0074be620416ee9381bdbdc889805ec2acfd169e1ccb60045d87cae3e90d5da94cd58bf80
+a17c44ade6eca0942742edd237661ed406a129a968fdab28a58d19308d207a1e7853099a4a3c1c181695fcf265107a55
+91fe5c0d672fce368e229e735eef43868e31265502e2876e54aa44470a257d1c126ed73d6df860f42d8e1dd425d8987c
+8434fa331278fcdff2c8c07596a051847425fd7cf09af31bb235d208ef6e282cae173d6ffb73c0475307453d6133ae7e
+940188d6c20924edf1d9343ea85ef9e08d9d87d2a188f8b69514a22cae10aa2d3ea8e662d43d60b8b77183b3c6e8cb1e
+a89f57a730437fc511e1873830b300df7a417493a468afeed2f837f31641cba04924effe11be92d3bfabbad0bbb7d04c
+a561550cb347fc9178c875ebd8dbf5d14c0afbefa79f7b93b893a25ca8fcdeb0293de5a350ef63413aa70745cbce9a5e
+89fe7dcaa6a10cdbeee9d0d3bc8dfeacd47e1490a6c3b591f66d3a64ed668e6034381e0ea9f5f04fd2a5d9ad5044b8b4
+aac54b334514d41665b80b2cf18285391f47be820446e2272d69edce022f6d7689c8e137e2e9579d0846bf5440d768c8
+a231a04b942d471b32cdd12eac3eba00b8910fca0812c9470802246c479050d6c860f64bcdc6b6e39ed0e9609df9239c
+a6bf6eca52b5f3ffd89b79be6edc4f517fe9c9bc67051179157734689fd63649e321d1fabda916a9c4666b64ed60bb4c
+a7c4f791a1d77cfcdf34c3b73ec7a43aa1c8ec81c39ce81d12c51973ddb0bfacc79e1a128ce17afc5838982f66cede6a
+a1644b337c4398f00e9ebfed20d9b2c900ccb667be036abba0c4d372939f881df2bdb5d40b64354f65c8f2ad9ffcd656
+84f6e86481d3322de791ad01d8c1556e5480534e52970fa601b295a40270882476779301d78bc2ebc323323ad0b62253
+b32eb2beaaeab27e190c9d381b9f3446038391da552db5ded0f5b58d070694f07c737315a465175da29e2a236c539e9b
+857029d97cb9fcbb67e194d9aeadf5b25cf8184b3b704ff5da424fb4b39abdf3f7f317b3f79c762605bd9bdd5823e7aa
+883926170997ba84cf45691c117912f6be5c691abab77fd18fe114577e6dcba18f8c0a6641ef59affcba1b2c92e093cf
+945be3febcff77b4238500054a053c983add7a96ef43cd91921dad908c20d4ae08857fb93a5bb588e9b441aa9a536567
+b9efb8be322722302d1c06640f772596fc362586d8f2e49c41810f4bd2b59e8e9abf3d5369b2421e1ce6949c067f07be
+920ad6d5cacbdb46af424141391817da2fe3d463bab8db760026f98e50bb51aa4f3668520c133ccf9622d66eb8a60e86
+a1a9ca07d8d3a44fe372aceda194f15a2dc3d29267aedcfc3fdbadff0bab1c4397da1049bc0feb9097afdcf1cd1ab603
+935eb5fe97d580c10766bfc2fbff71d8584e00e1a321018540c25f6b04791b63a0d6992257fe110b0d17712f334c9b49
+9530bde6dc33e48e05d98b77844766afc0d5581922e382a2fc1c183adf998c8137df29e56b868c7892b2c1af56edeeac
+a8cd3698276c2bb8d39ebf7fb5fec139580755adbf81bf362e1cc19f4a8be750707bdf4e1fde3064873495cce5cf5171
+ac5a83c82004728b34677bc6b1fa507687992b5b78745e5820de08f3fd99e35c905608936ccab62ae39f0408334b3c6c
+927b0077386a5055b499cb5a597ec3c9934767343fd91214fbbb5487faa4339837eab52c75a627d7addc5cda5ee35108
+a8acc2ea4a548d9a2fc2738abcf75cc0efa189b92a99296c0635d53f2c0d7ee40ccc8ae410d2779f95ac6f2027c81d06
+a74c24b8c695920b12a86ed6da6ecff72f8e19fb06fdfee9cd1c1e8e5f1c202d26fbf2fbedc9a5deaeb2d986425477ce
+871251e8d69de5c3117f364bb95d876fb89974428bc167666088d5ff1b83328b675ac2efa2d0e215831e69ee254623fa
+946f7a6d3d6700f65088c817636ed3c1349e4f5122fbc22723d131d8ccd055931dec977cd0cb8dd888c6abc51a5f4194
+82f7c1dc3f133725570c7b64e31b0397fc3a82cb4966948803de210182b9716ccd19e59c0e0382c0c970d05c5e13509e
+8bc45b43102e0df4767156b1e8ec635cc07fd629793d289be1f2470297e8a084bc9af0d76566cc485a8ac898c0493fc5
+85000f8c8130abca642ae94b4feb3448390745decb1f443c34fd06575f1d0de35bbe649b46251df0a4bdc7a8bc133b2b
+ad1ef07d34c59afa37fd5147646c24c03622ae4884c163b80d45ebfb5fa994699ad9166ce1ef727c22be3c28e0838cbf
+8d1dd5500229f463f94c611bb2674640d20f2d34dd40b28c4d2a21d3e64ba7355fae55228f1c70095d1b288828a1950e
+834cf56a4f2c2eb04b89383213b84bc6ba554a4715c3c1547278e5501102f6ff2af27cce0f876a2aa2da57b5ac6f3b3f
+a468d06083d770bb4e484718d1c147b49770757b5b296fc6d6035ecb3c2f5c4155176f12ccbe6616184789350403f387
+8abe730d80ea895705bf67ac4f6b6a36fef7403702d8458a383d04e4859b4c8c7a75598721cc75793d29276afea27ccc
+a3890145fa43e6b5c7b8aa0a73a62c39d623c9a75d17c5a05bdddec08d114ab5b0a865c9edb2be6ef31c3dc9544119ea
+b2b7c1cd0aed6b776515a12a0f3a86353fa3d3a3b6027422bf7f2c21e6917dab543e189e860c8fd3aab65484b77efbe5
+95215b7d3d504ff83ae2bff789feb6b5919287d354d567141bae68a0f0d27b3e898edd8a9be5a51c04dd28ce9d4ab937
+a93a3da0e101797c690c38a5bf5bc14e10842e48a18c9888807b2233809ea8a34a76d20a8ece0b682d36c086853cee40
+849a7fee901a9279dcc36fe8f276ea6dfc37c30f75b679ddca2cae9c283de19c4df56790e6ae12c4bde33e837fcbc324
+b5c1587d84b0826e64438d8ee7c103119b164bede8d243a0256b5b798240259dd63281b81bfc613a4874a6732d05e143
+97600c536388c942e0a72ba3bc33b3af48045994a3ad0948fe0741391c1eb99693d072d1efdb644abcb08e10474b7885
+94c2120a5b4743496e7ab9bb2e474580ed27d7cf5b6fb132efcdd7bf934434d2be8d6f0af009c637b31727b3ad5d2280
+8a5ff1e7f552fa8b34b22a220eb1cb018c9c9430f0f14a634121923497cdb4a69fbb8b60eb33e5fdf9b0feb3e9f5afe6
+8b4c9032f25181e6fb9f60eb07e3d6cfa2b14ffdd6a0fc1b309b078f8290901e229a5a6ed96dda74e1a9a894224ff588
+a5e04e164ffc46da1dfe026ffdcd99332874a110cd168c44762c461a5560b5c098ec71673d509fc053f6d9064d4ba255
+97d21cf8327a81385fd3915c7e8efac7662f4b39a9785b4a936fe1b581d630678f42a3e9ea7e02bb4413da7ca9a6f35f
+806d8462bbf148eb4cff812cab11b3d819669ef5f0d76b228fa166b83727c92fdac98ff3afe946855685b050d9d4c6aa
+8a9899b0ddbcf4ba3f16bb006218022efca867a5b32e1de9c7efe1d7039c8e200a406bfd09ebb8921bf1997185e9266c
+8fad2d8629c546c5de443b36927b068cfa333c8c4c1328e1221a1f6af7be5363ab8981fee54307532f239eda7656e6f2
+930146a1f6c3decf40198955059f70c98de7c5bb1b25bdc97fc72de3a84db1b121430cf7a7456a692d8bbb6b325b6001
+82987887016fdb90f79f045c16629c5b2b17b1b4702cd89d06b70086e5922cd10c5763cba6f3d30a2c33bc84be36c6f5
+a6fd7e4834f7f29da41170c13d29acbba86c74d5924cd361588cdda26a3ea7f11ec34c31869537ff7ee0b57a24555e9c
+97b2474cbfb632148869a6b911c2ab91e4af9eff6c181566a1eb34a05d2ef3fa9da4fdf14e8fd8746a7c3123e20d572e
+99ea177bb7d98dce25d300b09bf6ce08a7061360c4ed9a54e30c1aa5a467be6225737b62ae921e91547b5b9d39b800d9
+b9dae836e37d51c9611e6522aa6aa8bccf2644f23113584c74c963d79af0a7ae533af823215fdcbbd8df62f00ec1505a
+b1a7165aa1ac480b4eb1f0b3d4284c69907d1b5056a343a2da84b3863c9a2ec4d757493f5daf9ef252a253bb3b2b6745
+a1322eec41b38b8bf3f4566bd12f9c230dd04d085e0526218489e986d59895d471bd8bb08351edf40021efab1d29b2d7
+96d559df46015e62d8876f4d8679f9a9867dff31eb151238cd75b3a10bbb2ab0f51c804a2f5adec1decbfa355042a6c6
+ab55e38cd273bffaa94400bf4913ce0ec1c1c848e8c53be1808d4ce5338ec92b4a4160b8faf0d1d8ee8b71ae751d0ae7
+b61c2987e2b402a52670abe305f8a9976efa9720ad0d7c5c1d0d6d9ec6f1569f51621b6edae84d9bb3fef32bae31a088
+b5234aa19fd9e714c7a9f3ea33d39a5c49f42e7a8edabd8f306083669df4898711d4b50b049dfb91815588ca60052673
+8e98a7b90baa4693c6a1e1c2e556d018c3408bbbb5dcf2c32d120f797fd8ed1373f1f112dbca114863801ec6efc1a5d0
+a7e1e77cbd6274f8c74b37a607cc20596bb7fc35ff1ab4358de15b07952aea397e409b30188c8516676cdd05d4919f3b
+a5f2336ed9338772b71e490b1b3916d33df8b013e4d38dd57185b7314ec9aedaa34eda2733c38e06e656a8cec74080ab
+b5de079ec867af3a3910fe47628c7d793c7d70b79e25a9a436e0a75405e2c58b740c1b86e1b073842d475e0b717d0bd9
+abcadb7a09173f1eda179ab7e3a5722f020402eaeafb9d604641645c21f1e009b758f2a6fd262f115d80e23f8baf7328
+8694ad59d4cc328b064884d147f66095605d9bf339d09e45652d68de765f2b09d45558d45daf9b4b36dcf881df8d4fb8
+a2cc7b2e812041f17b450b5fa7429cf62e2da06a7bb3c08a63d6f802ddf13e8b73d2056bcd6407476dd322fa35b9b065
+a97b0e7e22214f329fc57b6d7ba882ca563f863c06f1afcb60c0bbc81ef08ec866d39c81a80a7843889fc957d532cc0e
+a8a809392dbf35911df8566dc20e2373e2fb3272bd9eaf9f474588a9132f06b5a1433ba9f36a738c6cd3fee403188fca
+a3fb0038f83116eef1d6b023e2e17ba2795f7f90ed7c857d9f04337cb4e0c2e7d691bcea54aa72ac5e4383125b74b755
+a80ada835fede8d121162aabfc8c349f685775406693d599e3c288364097b02d96c10ddc20e72fd308fc882e5b70c064
+b6e6c4b24731a2895b7513ad97c0928efeeb0c645dac9fc8cbb0a6419221807073f6996f2b778e1dcdde63acc3a6b2cd
+880a2e8fc2eb57f44b08cf4db5cf1751bf9f4aa688708039007d2a198f4e7f0f808aa566b36b15b971e804835102400c
+8b3baeb4e1c1d7493bd885dde7873afdc235b58e45b515cf51ebcd02a9b81911c5ca182a9e340575585186c99e71d2bd
+a6248e1bef3c6c6ddc155dfe95631a3f00308fa77b1c1779935e76401e750f151b7377f9376c08e8273680e924382af1
+800133df4ea65de3935d98b0249e335a918c44167a34a16c0a4adaa4654f458c376eaa76ef088672d39aec4c7d951833
+8317a6e0667fb524f35672e070f047db29450b06348604319765e4db09f966ad995098cf38acd30346c7fef5dd62528a
+81fc2ef2ee0e6f21f406c51f02b9b7be8d99d30a054df918cf89c708d64c34d8b0dd060dff4383de858c0dbff25d71d3
+a28611f96138fe6974e3e1925b582cba76166259c32b39e95702fa0c4957ef2ca32d575b1c08cc8dbe96ddc0eb56a9f2
+86c6773f4e0261413d6d3944e0f7e498a6dae518120e3940d2f45054a912e706b3b615fd160e6143a7e54942406f9af5
+ae91e3db099d165b198d80b6d9af894203949d87cb980f4db97dd43ee55fbe1a45df156b72e3c3e9306975f9e5e62d77
+ad00ceaea52dcef616be9f9815548f8e9b800bc9c1a8832a4d8acca6c8779317d1951e5700e54db070a23db41266c934
+94426f78470aea2d82eded320b45bea09b7cbdf02a3d7c2af4ae4567a3493b352b36f43c3669237879910dcefcc82fe0
+8aad924eb1a30d2844654c9829d82c65fefe964d815572b6c9f902c6a826c247257a7d0d4967e2bae331d52fb3b7c0ed
+ac9489ec928e4f43f8d194b8f3ab83382b66b045f18efdfcb05c1d4e67af7b3745ffbb7f52cab4b8895550d10132e2a8
+af8f390c7cc40a08c0143b467634c10e8046ce40466006a4b4297c76a6c16309b50f41a4a022fc838738c4c72edfb34e
+923b0384e87a2ddfb7a2c47f628172e8dee76fe812c44a756c67cb20527d8e9029a561bd4ef446a013d4be7db7259f6b
+856316b53f09a90af770bafb5c9ea7deb921687fdfcf512840e96fb83df08820c42263c9ccf51465da33f1b03db04d09
+92e8823b523f90ab75ac6e30869dcb257d232b55a3e167769ab5b54cbb83be94cf5d84eed4b1653db17f3f1350ab5e53
+8d0d05fac92079a3df86a72fa399e606fec7e56f81d3443cdf0cd373b3330235b76890197ae61f24d17de39dd1aadd06
+8a801fc71b9b6988a829044060679a7cc3d40630fba81f72bcd15c0e5728867f4bfe938066e68cbb54b042a39600fde2
+b40a6a786ca1a21159b72990b4d3ae8729722cdace4e8124f8cbcc3fa96005563535d28e9d92cda02e91d979d27f8f97
+914f30250d79829919c8ed184c2e471c0d9835f2348e628164dbfe39a51dcdc3f8bf99c945b1f413e65fc5424014e5c2
+8ab8b347b7846fbc7ffe69c89ff67dafd522bec708b7ffea312b3a7eac47fb9d6006cb9038962a07dd89d4688ee6a18b
+8e755f8cde0750700252e41f6d16b825e7f02748a13744c004a52b19e52d58c42d1ac32cd5ed1d6ad14cee5174b4ddf4
+88d6192d72e1fefbbc9ab400e5b0018bd300839cf604cfc1034657f62fe8fcfc52acd86c207dad0fa6383361d338b2bc
+971fa2ab593578b341076d98c49c71dc7d9eb4ca706efe252441499037cc86fea49af681d8a4d324d302526b2a3e5c18
+b2deac648501d7e284a85c19f514f8744c48d2b5516c993c2111128a9fa042aed34dc371a0cc3f00e918531dbf16c0fb
+b63fab8600fa531d7f48f8d207298544d2e03d4da23cfb43d99b0612f1a20441526de63b7609f5969429e763147ee5e2
+a8f30d9b4ac3675d61199e8e624f88b9dc52658a2ba26a2bda5f9cd3780f0b1e32b56c825d9dbc3a059d6c61fd37e261
+8a6f8e963dccbf1db9c839c21a4e832c7a218b00fc31400346b5379fdb8394142bf8f8b981fca3f4d3c43d4e34dd3e31
+b4883e6a4213c799abb2a9b6998ebd4c89aeadfbabbe4c363b22beaff46939dfbe4dd20d113688a293a41daf5cd82c8d
+aedb55058fb467ee9556a3b601af86962f99fc06f7eaf837b4deda030b1899f565da07ddc7108e9f5e7024e11c723ed0
+a8185aafdbd22a2df2ea0f0cf67fc88c4c3f8e64040da08cfa9e8075b792406c20d3155d6ea6fdcbe9f5502c44125545
+b2b27ff20d24cff756e8edbd6f8686d202d687016c561e56dcffebc78f404ff544c4d3ae8802b91bed0487792d6dfd05
+b6fba06a70d8b1000555b8c6d791b1db3fb7f57a0f8b1fa8dd00b2ee14242877e1e836cef89be3f9e0565e61a6b4c275
+92b3dd6e18600ab856c276bc787429d42b8c02abf5243f7919625aa1f4e8cc3eca61cbe106b81d0e4909393a5efc021a
+a508e1a1d4375f5130c95a169fd1d4df51cecd84822dc28b18e464c2189d464e6dc6a5855e0cbb94500d041319749ef7
+84b3e9a6b5d1a7bc7df44ce760b5b686fba006945f6e1f3f67ea2c90dfa6ed70bc1f021828a0461fe158ece87deb1e30
+add83e686118fc5eb56d79199d33cf0c90fb2a5996c6f453fcd9b9eb3a273a466776adba1cccd6be62a4ea154480fe17
+a1fb58d9a323dcd7862ad4bc6359ab2bae35a608276a3053d40bb3abdaf3e8827027284d964e51ae7b61dbf299f2bea3
+ac901ece7cf087c782f75f1c61371f77ba061bb752ad680c9b1012768e5ebb6241b492bafd9e016e989cea1ff51aaf5c
+961b9ef616b7faa3befd807772893c7c66ab6990a9405cf4345ec29cf13d75dbb6da41ec87af5b5c4bddc8787b88b480
+b386f7ba0b94ced118691d883549d70ecd28d1c0d1b718cb82a92a246e61de4ba80b6a76d6039c261e342f9ac136941c
+b6415848092dd93da62b5a5307d356d968bd7c935d3626f40e9446573e5794f37a23ca072fe8af2a9355a4b04ad35e58
+843b3e3221bb08122a1e649e81759297d985c7f393c36cc3bc707a7aaf2f53b9cdd449e7a4384981c5976fb3955871d4
+94083ab99a73dc5cd463b5259a0f4e99847bf32ae03739a440f8f48e12f078602c76b3fe4e7ecd31d52a7aa31168c5ee
+b6f994b5482aabe833e388b24b9445c01e47fd6e354c3684094237189001290aa77a327181e7e7e756682a04b8b3c56a
+8366f418a3fb2dbc9ffb5b798adb968aab991fa689ec24a4c4bde6f046989b1815e1bce5e846f3554028e16799e17281
+b8e5680915eb37153daa9a3a977b47c88b4f30fd358901888a1056e07d2a7070d28a47acac7aa7856ede16bd0c93ff2a
+871cc7a122cd7b9ae2199801e6a0974ba8cea64e5866a5130ee0ec926adda24f91b3ff2785932cb55537030bb5ad811e
+9370ff1ba27d33080efb22836147f766c60f0a8ca250ac6b2a82bb464ffa543da056284b712dc3cac53dfd1680a4cf87
+8614d8029df5058f5a072716489f734131b228972ea9b2b952ab1150bc50b6637543aec1c35763f8dc578275f7c9df3d
+b8efd01dd0016a27a0e2df65b571d405be4dc8e0df5dc0d8354fb187b96589e95847ba0c2856613924125d21193753ca
+a86e524431247115ee497c07ca2a73387eb820d293e8bb74e1ef1ae7ffdb21a9dd8ef1a6e3f391e6f02ee0b51fae2a06
+9151e2dcc0b928573421ffbe43b1761b6ccefa4ecd58be7fbc8ea8e975e18d52c264f682104480d590e6f8c0b8b9f63d
+85ac8cb79fb8916f7eb5431b7e81606b38afba15895909873f85d9577c87ed2c1d0fd489fe058362f20ac05626681346
+a076dd75ed807bb7afcae8bb9821ed46758c1a8d00e7f3d3c91a18e6b95dff3958ed70441a1f4691ac3268d95e243614
+89d8dbe170b9804de3fff5b6512d04643ea0041c3f9bedd7432b171ced1577b0c0a7bb911852c6bafe154ba36cd30320
+809a63ba788e618a281804ef97a75df39c7115900078a6bdb203bd79d3df87e863c631e934dcee62e28a16cb8735acfd
+9727e6720f8b73b6ccad519d8ca1d4f90c2db33ab536f399e2c4ce269be15d99e22504ef153aa26c40d4cfbc450f25f6
+83e77918ba6e28ee01ba6b8dbdd84c53faf65446a90bcef46f262f341dace2e237b1ff8f8d566fdfefc6973deafde716
+b5a4d3fff76905bbb229d579b8433e76f2f070108230f20a30e4f974f12f29ed017aa66e9b298a4de0fd535a0e1a44dd
+876d3a0bb439e7da26539b98abd0f7e0b7e8035eafed08df623a77fdac30ac85ab4d58984396319a88e072dd7a5149a9
+98923e83be5b2877ac18415f9391ea792933db718b29b6970001682cc8434ae9fc640427c0a27f6d62af5f78f3901bcc
+805c675a34443a14c0098613d11b4c015264e038a8d1adf083844f2e3e3f2414689788423dd0ff77c02130331d511068
+8d8cd51d4146bfa48492e9d3f3e4b845d4ad1442ce6bbd95979f9778ffeb108c641c9ffc2ebbba532f922237e5849222
+839862454707a99eef931335e5c5ed80805ba06bab0337c5301fe9fb92fd59c9ff6620e66de7369352b079dc52bf2113
+b3cf3bd867f60b345a0b91314b34ce1c02e64dfbaabd70782614208d32fcb5d4448102bd54728fb05d1ed18a750e88e1
+8207a421d010e1c5854b8e41460c6a13035ee77f7add0df83c5c31bb00d7acdbb676478a7dfc738b9aef5c29d345ab63
+ad2b14f87281ad6e1d2b713e6e8303f1a45cefe097820d6a1bdf4652364e70d28ca92193e2bc3d0a1e69da5a51c90ff2
+98025be2d7e59ffd3f6c3c2b28b27ec42206968c0f96d09330598fe17a207baa6574aa22cc26555139766cc284224fe7
+8e80fe898b7fee849f7dc8e5eac668c76f1fe18d159c51eaf4ddd8d4d600c852dbf6c2abcb878c64f37db7fba3d56968
+871c0e2dd929ba4e157ed606741a6301aef759e10a3f919166faab23e599d3409b232240e3afe9c0e1622a11cd453c1a
+919f7e465b399e2819ec17aacc199421d267ff2979ea8dc8962542ddbae51e2bbdf6cac92f8a35e05e4d95a4a8315cd4
+a6e6667e6127ee4f0224a9a94be3c22831a1ab3b16f57462562b11473c425e7112b33bbbb6af860c81bd6e84bdbd3b86
+87eaa9e3515f2d94acf113d77dc085609d06cb038f5e8e90ed29bd04bd4814e95ed0d6db5a1d65572dfaf73ab2e50ba9
+90b30c66ebc16f767f3f0bc1d8bb17ca1951a616292297ca8dd06d54cc53e5fb5fd6321ce158c04cb4c91a04c01f7fbb
+b5fda3715566188630f96207c4253315a9cd166ef96651afa0ae1d6f0aa8856e7642e2f8ef3b1fb1eb2c14a7331f6592
+a54143f662a6946da901ddaa9e514a0e96bd6397020cf5d88084a1e1edc092b94facc150b1c029a508fb3995acee50b7
+8dfdb813296bd105d5813657c98337a24c8bea19bf0d119efca052c018ff5c88f31e05e110fa12f306ae4b0a8498f113
+8b7429599915ffec755060d9cfc2c445df9184ba6bf298bfff5b54c2ec8747a9b65bdc6c73746a94a54b0a62d93b6a28
+8a1d1108174d383465a57ab4b1a6811ab86dc007de4f342d37f4cd311650382e0352d3664ef09cf1626c0b74e2f21ace
+98cb860aee0b7251da2d114b2253daf977badf82027a018c956fd59c6c93b716bfe69a132a4778ee4b7168fbfe390ad2
+94d5a0d33a0aa590fe76c71e80b21246dd9bd8c2f5ecc647e47a423c2dddd743010484cf2fa363ea73bb217247429066
+a082b7a109fad08e2c01dd7322625c18f47497b32269ae4e529b1681aeeb3c4a813cc6088ebb4427b486320fbc4b7872
+86c23e2d3b23244c7763c123ad67a41a2dad8e4556cac23696906d1acf5f4cd7f661281b8ab2027d268405b08eee6771
+801522a5c211e49eb96294a9113022d86c84bb8741e44fa7328122836a39ba7e11e27d0d6773550b234531400ba1e7eb
+9683d154b18ed641867fe67b2dc70e8b8afba79f73fdeafdf9015d85aa0c74d270b290952683c3667c0202a83626687e
+994febc16f8d216a20774955523262966e955cf964950b4b2831a3483f818c20ee6f51cd24f499dda0d3191910a9fd35
+aaa8f12184525e89ce980468fd24e1a9af846246297546655763ecabf0b5b5047394543f1791ba1c70e21637cd815877
+9193a37d5692ff1bacb0265bd7825c479624d2adf33a419b0a71c8a744ca1b0c9828127831302ffea4fcceb1a53ccd54
+b9f3213d5d588ad73b86365cbcf0fabcec5c30cddad418281ff2408dc140e3f6a25afcb6bb569605191665706c675e35
+96aa280b2f0ae5c3ac51edaea4435ecff8ecf8f2536a3400d8c4c9b12c64d16418838dd7ffc1b815656109ca63261050
+8486373d67804e9832bddca04a0084d1976d324d85c22a52ce2bcf7518f014ad00e4795e61c71e0dcad1f23316288dcc
+b4f2e7f7e2ed7917e7c5036681e1ceff18b688c1abbd203c2bda0731ab56701a847cef4f753f68119110680913c2dd4c
+87dc2336d88edd81b94ef78e7bcb6d3876257c326d28b3f4484465d6c65faa6c17aa7a2f85c6b94ddece39f6736751aa
+b4b3502ebe175820f53da8e3fa28160579c4150d79d932923739aab545af537b3301d5b21f5138ab4100e737fb61a084
+88063af42d5845267d979df07be0735cbb42d9b57d3625eb5d0aa7e4ee90ca88fa52aed480a4d60eaf0ab8dbc4f444fe
+85cb81247c09e21de6deec42e668b72f513c7b105f60ed478b08b85fdc8a886a97bb7e39eca0cab09b294e4b1490b0c1
+9920fcfcf836faafd211fa1ca78302aa6feffcda98aadb6302300c250fe8621b60d9c214ea92087c44996ae0999eae78
+a1f91af5b378d61ea277e5dac81cb71d71a4ac35322aaf42b3a8aab1641fd51d8da1783bae0e8ccb66d73db8e1003478
+87507b427d381ce3906e372a12f4e61514ad7a102334826266df14542adcbc8bb7c8450a1fe110069d9dc2e9bf0687c7
+b7581b0cb549d71201583e0987e9e9bc6cd36585c96664f836e1b7326e5375ce8d0a450343fe0b106dcc581b77de88f9
+b26504a6a7a64c44d7f97d0402bf752740934ea4c6e101ec131666deaf574d55fd7f96c8807473722b6629dbda2ca3b5
+b90accb5c6b78322ef88d017fee2ae1cf87194f4b3f6f4ba6510c0adf4c11b20870043cdaf45372844f5e801464bb682
+a904dfa6e1f813b4aa0b242f3eaaf893da7ea854efe514487a237a01fe244721482476b81ed75ef1a951fc54802b29a1
+a00373aa8d98f4dedf9cec4d227b5fab00f3af2a7bb4c8b0dcedecb5a04244321d5f25a81d57ed0ddcf293c701d290f5
+91bedcb316698e73f43e9dbe0229772c856f34901fa4c1e018e96eb898e4ae02b19d900e87d01501099163be56db57ae
+b84dd6b9a61cfc0817da422380b0dcc5221deb600b4b6a6f6c5ad934110a3b66c59f7407ad68bf8642b2bcb5427e8050
+8507c172e499856675ba69fc1b0389a08e58f8e5658c9268172b926dabb4a67b7c836a44d865f736e8fcb14aa2809529
+86609a1d82d90a971786da9ad342035ae4865136e513559069b6dc8ba82ec0bd1ac695fe8afa5f61f85c2310194014ed
+94914f127a645594ed372855550ec0817663224208c127a08bff3d5c4f463b7939cf13a45dee68586b678ae453c6d60d
+80b55565972213814afd6ad9b1884a4d8143ae90c148ba730ca77b0937c2faabb23a6f985dd0bbbe05705fada4cb1a00
+930f5fe58dabae91c26c6fcbb61c3e336678dcc35d028e5c958d2ee7d50b80e1693c0693b82d719dfd9fbe2c03b52c10
+a45053c493da932896d95d5fb158869c1051e1bf99658b183c9cf4415fc8d4fa1b6a8752b8bb26e8b706a03a57fc05d2
+af7434b48d2ebe639c8082be09060422f662317bdc136d534b76ee3e3aba5ea8f234cd4936aa2b928f6eafdbe5165a6b
+a57a073bbbb3020a92497f0ce854666997a182f2b437e7b06c9888db8acb2fd2128e3959f45c391f0548a3de49e37e76
+a0ea8131b2d8cfb799e806d8cb92cb02d32de37869cf2ac3c82f7c5d9a963d562755b16d25c4b60f4ca214e323790a9c
+82f920aed42eb630281919b9c1fa4acc02b05ef34020cad3583a29375bdaee167a47ca3366ef065cd8e658301942dbfd
+8415ef32a93820618abb91329224bc46d478ee8749ef42e372ae4ea29b6c05a65d5ef515ffc7d720b2f41ccbc040f176
+a0fbbb0113daceaa05478163fa835b070be5898dd9bbfa9abc582409a7b671c0e41a5070de4cb6dd2072888b11825acf
+adfc99221d7f044b57ed40f4ef8a9e47e57265ef8eac654043cf5e777950af6fbdc2c2d5a5b916048fab1c19acd69dbb
+b3d8e85fccf623fb3848e4886d580469bd41ec0533975298bfbedc7a1a9b4e554714991ec4238d8ff976a83cab6383b7
+8b09702f3789ae1f7799ce58a0ffc2327b3ebf2b56cd870f2be66c0d6781cc1f34c2d721d0de63e0fe9db85bee842fbe
+a935864851b73676cb49f509a198caab467e5dfe4358e7088d2a76e9b8c13e5d20b01eb7c0cb9e51ee98c90cfc393c71
+b5035d76a5a8251bcb18f33968b077d43403c69492b809eaa3e202eef174a5649aee30f701ef0be050ba5026957093ab
+b1cedb563cfb09713009b2263975a56abb9932b8cdebf10f7836c5c34785149e9875ff590fe1414ad2d21da977b7ba26
+98a718c23d44b24ac295b328d91ab7a40b23ffbccaa90bc5888efbd32b6a95c530bf5e999ccbd4f1c85263104f336ce9
+8d9d2ee952d5b135eac2f06f0478faaac175f23cb3789144f3a490f2ed34c885ae4d8ad7ed48db85cc6c2bd70b38c6c2
+8155763582ff6c68d7071ba842b6543361cd5f65b7c70d5bb838da2dab2c02f3363e2324307e7d2149b12700d96bde38
+b18b277334ef7f24706b7d48fb764a487bc4e21fcbfb01627b7524e9a5d3253be99d84c417084fea769b550b3ecb4574
+b80db9d83cb1ae861a3f61197a1f14b6c5004a2b3d031fb207adda94d725f3e265535ed7b69b9c801f2e95e1d64c1901
+82cb673ac9c0c124fc546c59505fe4fdbc05a1fece0fa579f6a6df96f74bfa877ad82b6fa768cb678ff04ae4cec58d1e
+b2e190b785a4a882939489b86d0a06cb637b7be8b14204645bdd9d6c37626e8623e35e1e4eab5c8fdec0f8349ede8918
+a82237c64f15d306365be19085e1c725cd148702fb66658c7974b02051b685715fb9e35fd4a596ec24d532df4711f82d
+ad6f7e3992518ba04b510b705fa6b28e3733e0000a5480e8a3c30fe71394de2bfa43333c69e750bdc3e7092b9e0f7ffe
+8c0ee358f37c28f3b80cb9ad5487c342fab734886e31e30c667e616f3aba737a3a07bac4da552d8405ad8b00c03e09f0
+b7851e0b88486b0a858a218f4307e0c0c8c314fc69e2b90cce8ba86d3fdb796b572e50eb4e82f83f73c7f048484b45ac
+a7c35abc2e15723a9f395d16d2484b798d098be5414ddef083c8283b0c29823226fbc4727d9cccf96e33b27fc40e032a
+8ec5ff2ba7c3ca8a2d18df81d46e93a3bc94ceca88134ea75cc8ec2ec4b1ba3d0de49dcd4d385083c648a63483377fdd
+80ca7ee722c3253e7b534b42a8947e38741c542dee1d671b603a9a743f5ba2fa95f193ace46c01000ed20ea05ad0639b
+ac14edc2d803b28a169154364dac5360cf0926d911a615077a94858fb4cbbe31bae2f30a6a68b248cd8bed015e0f3b29
+a4bdb63e91fa72995316d03cd117347cbefd14eb1b19a0adea1c9d39f49d82ca1ceeb2a4184187e1dade109d10b83090
+ac8f528e9e8fafde00e66a75d4bb68c99029456ae9b3b7cc76ea4816e89aca2b8b7d094db214bad1e87dd4e84d1c1a5e
+8a8d090a01aff14383419735840fc5286e71a5feefb98c563b2d7ee593b518c3aef6654f10da8a77f40feb52e1d31fac
+ac4259562982b355fe5e57e1cef574a6a40a7144598c13a6bf07cdd8000bfda95b0b0b44f215e9dbc71be114a1857441
+b53741dc30b11fdc6c9778555c1f714fde60890c191a0effe419fe2b6100228d07cd0738d0dd73057cfc7e340c75f0c4
+80ff52fdfae53dd2410ea556ea6504696439919687d2dcce1e952d9d17b6e3699816ee623b0153bb0e0588e36b6f56b1
+a92b34d785a71d10e6796ad07df788c6878717cef4f1f0623898370725006d46fa00a0a22a3934fc5cf323be85fc7767
+ac1cc08cd1a8fd6c946bbe14662b18e89725933a79965c663b73ae3cf5f5ab87e794559ed579564884e430e108385e18
+88b8b2264d84106d38c321c3a4927b9b41cac172ae27f6292ea44cd9ce11d185d0061a59148e50474d4dad3c9e940476
+b7ac9f257b4f676d69899a181b45f40358dcaa70fa2dad38870d52838aad9001f3a3145f6550fa2826018952431e4cd4
+ade67b3d1602ab0af6a256f25a65b621dded7a0adca65c526ab34c5ca3088a549b7ccf76c586993cef0d2d38af541617
+8fcd8bdc44ab42a70c174682a1e8b929004834d4962a902de460eaf8649883c868cde1cd660d14d7d3ce589fe3aa83ab
+b914f6ec60f1767a12fa34a4b400ce102564dac4c1c42f1497c7bb824bfb9000c9e23ed7cadaa16ad79d5ac906070710
+abb1683b313612b583e87228384eddc3e2e7539e0aa26e825f5c27da222941b6a37ec47127cb0f11b6b8e0d02a6f66e9
+b01efb31962345a2fc71b7c370e7d3117bb1d1e1a9b6984ce11bd83c898dc127fec2e821669deca7c74d406e4678a736
+92439394c6c811d908b05c626f1afeda3a0f8c925747bedf66a4a5895ee76e7445a1982e99d8658117128df5866eb64e
+956bfdcb00837be56d44f159bab9bcc2292295ec1ca7424615e3b163b5d14f7143e214609c0b65ab74a0dbddbed4d782
+880b9a8dc9bf6499f1f71828e6c906e2ae59660c9aaa824a6f36116746406351b4e364b6fa26c45e9d90018555bc7dd4
+83f4a0dcf523d414e023075ce0dde10161d65c0abdba522c811f0e446980cbc21eb0bb42737136bce30fcaae3c673b6a
+abfc5593e02dff15161c4da67a806af3170bb2bbc65e3a0457b4bd994ecf5e001d02bdd417655c2b4433dec270a6273c
+99c6d8bab7d937a4cb5c272c4bc3856a3cb8295cd77ec9e2fcc6a50e0545999cac4c413c3ca8e5408afdb60388c82ae9
+b08f5d230713639ec98a7afcb2a25b9b2d1c48820447d28b6a3ef448aedc4b9a90b6c5ffc6613a70ff1766b51992074f
+99d4b54e35dd3f844088155f114ef93507372ed32a6898b9954d5a6d0743e55d8e7de20d67671454d26561ed5e4fb05c
+b7cad70deba1622c79f1ecfdb2612e380e9048fb6146760ba61cb62e98cef129d3944c5f442b15fc11c102fcc6e2adb4
+95feea870c86525ed214e3e0ecca9f66c5e0babf6da8473e5cc5e2f305c26939f6afda0207bf5855b6a6c928815577ea
+ad6e77ec226053ab331f3f871d7fb770ae78227a85096d263bb42915299147a7a7b57a4f8f929765cfb323267b94865d
+82339f53ab7344f8dad554fd0270c2aedb34f7b0c630f0a56ca9217c04f0e4a38781eec769354a44fa90f556b388ad01
+837d4672d73588f19b872d81b7993e5e0628139f5685d0520b1b766d40e71b9d83a8d2bd65a03987eef89b3d5c254683
+b3c27e19f579133f1ded8c066dbc3e4edaf449a1edcb1aaf215939d63a7f2b250b9b7afb62d4cd7cf37c28da81898a67
+91f669f9db8fbc6d7a5ee92cb67c2fc1ccef6dde622efa455dd7535b11f506f4e309a8878b859d6605a3917f6d7d67e8
+8332dc636222829a83501a8312904096c2984cc0c5dc077e067d8962bd87666226e3324a9e5057c1cbc3ba700a3b22f3
+97e81e20bf33baa4412d6b81c5fbd406dccbe70973bd73e956d8ce85c99d2199daee5fa6e99fc6d40071b352b5044865
+b716066fb9e470cca4546a401048c0e6c6408c8c9f4cd80aca6778d3f4121378e11cccf8a005845fcc8dea2e1b9f16df
+a7b340eb603da43f2aa542dfad1ef3d3357f583c46040f2dab234c8246d7c55d6885f9f7a14f319e22355ad498c22a04
+8281ea97a28ade9a0cdc73a077c72a92810b70912006611a00df8e7d2ee1036af73c0f062b367f3d4d75be4b9bf78aa4
+a481ffa0813a4f2110c6ac535fb446282dce73c182eb99baf786ad42b804ef12df078b2f534e3cd8210973880bba6a63
+b71a581ae08eda0437f9e9274c1f9431d6b357e4866e40d4c2470252f0888978497af823dbf464785479e5f35eb89aa8
+a07c9010308bcfb0c97a1059d5213980000841ca0565697d45aa46e82fb36494e4940aa435ede417856d24f73d374757
+8fc353fa8733947ba067ca2bf5e14a6c334e4ff30efdfa67829dc86f49424f4548e879b153e79dc75f1ec00afd6693c6
+a663faca50e1fe5d00f62abb0b7828d6b761fde9f5a54f27c0b726d8d53281f83ac165b3d3db87f970913350a7dd07f2
+970535269744905640d6ab238930dff375ea7efb2f391db324724166f0c436e7a3eab7ef6eb2e5d6724c58d588a4c592
+800f33f5936498e16fd0f58210a5a5c104074039db7d9d5d92dc62cc00d796ea0a3a22e5d368fe269cedcf30bf6149fd
+b4b921cc901a7775df7ae73e97cdd108d98c54534015a1469f0ca6b07989827e0d3f9bea2ec015fabe9d309054aef802
+93295c8a7e5c0bd9decd99ee2d704d814cb6bd0061404fe00984a8afc337e78af11965a8560288529c2a722e8b54b488
+af43d382ff7951bea94f4540a3a2dbb53ed527e966d0dcd117d5212f36112976e1fa00a47bb9870d3841cb01621c5d7e
+b4d106b21e4676556bedc6e7f5a7eb5c2ad0d5fe8004a1d968bc7806ba871e241d38892b1fa73e9648b23158802ab57b
+a96cbe38f86165288a365efa796b0e2076ae9fa94bb6377cb80c7d5db9d376e9c18164a8a3667dddb3f5b847f52fd319
+a0bde83e1f3e925561c481ceb58c7575027f9641e69f14242b886e7fbc532a2bc54aeeb94ca39bd7da3ac984bfe8cced
+8211c4a70d08fe052246d3ccda60c9e9677910a93d9262d572606d99e273c1ade353eeeadf5b1e3c1ac3c4b9019d5f61
+954ba6744e3f991580b6633e5d184550e44400f20f00149d899d97bc4b51b01d09bb4f82ad975cd55189320523fd60f6
+b7e3f17ae79c2faaf5f3cbe0dc528c6aab0035eb3f38954820556bdf7c3546585fb9814717302c5f45fde7170748ff63
+880446589f33ffe7ff5e105fa1c380d401d6c46e80526948fbf4edcb779753a594f3891461f52eeb3f5f2f6051c361b2
+a26c06cf79c412d49f39e0e27e37c82c4cf0c8648638ee66a97d22d822e064a9a7cbb0b1ede46806ea0430639769cb88
+a968341c5e4a3e6d2a2116222e3c58c2e558f5bb0a2877a27c69fdbd38dc3892f9ed7d7c114f557e52a351c73614fedb
+ae9b8bf4774ce3b84185be77723ec62b9a415e21cd60e86513c1500916c96d62519ee8cc061d81ac9db9709d6e191649
+83a30c1ebc046c9a1ba911ecf6f147644f58f54e32357dc395388e6bab66d71fb9b691754b11bf414d43816af8058828
+ab5b804fcfb68b6439f311d0420005b083a84da15a8415cc4013898806e67c47698a9d594263fd9be42bf48efdfbe2fd
+a41c18185f8111ddd551ecc8f6dcb87036cebb6eabbce7faba40c6c5c8af2ab59ef027c6fb2dc523eb0159335a1ab189
+b24cd94b7c6e161e651107769d863fe5a3d7a847b9c60c7c803846bd782cec0bd54e6278a318ed23b90cd7ad25933fa2
+a5ba23ead78d1678414d4e986b448e7a24b23a5c0f529ba604a51e4ee0f87baee450fd121b43a954be50bff6c0d7908a
+b89c17de4809e722527832b90b810d9691b437f19db9cb88ca5cdb67bbc6946ec1d454dc0990b66093ebeb6eeb6896a6
+914f436fe0ac7540129c3deb04d51bc61192ab5d0d16eda77ef70ecf8cab5f55a13492f54e8052f2f214186a113d8949
+8e0b3d1dd756a9008894028d0443083c21e99de69b8d8f4e7eb3ca7fc52ad540355d4a1081774a6d51a093110f4bc838
+a9c1730eb5c0a42deda9d9b39390661717479e29007f5f8499d0645b8b85bc0ff12cea2ac4328f6588a12126f56284ee
+a2318a42c99f7613ac78cb110656c6e470cac6903a5bfdc1bb182af21e0f0f409bd39324a13e2790f0facba04459d3c0
+a11ba34521434cb718f1b2015bbf451ba1a7c60e59b1620ea843835c7e75bb42b6ad29263cd3705f7f6f1e40a0ebdfe7
+90705112b625973e1cb35e30f9e15e3c752b2e972231b4caf53518f44b4a40b8a6bd15c4af2adbce5dc194169b860cba
+828035b0e70af8db1294379b4b70e56624e1138ef49f7be81d938e8b25aa5dcc03655e045a95a79e0143c23a77407004
+a7abb1836282917d1eb9886c79b6a36d720612e3b823d9420a4a705e8add6c6bfff2f682e6f992a6af10ae2f71ca8828
+81e97c7f980dbbe93df9efdd9c0a8172ba0f00378e9375c926b9e24758e8b827037ba67e06e994fa9d05942320353d71
+afa640b2a7fb997cffc5db74a91dece901be4a36415786190dfd17a77ac837a2fb2d73e973b8e60582e71824c57104cc
+ae860a6850068f2b0e1e5a03afbd08b667f44c4f06e431f1f83269e754f37e18a764b00e100dcdbd1c1d18af9d6304a5
+9443fd7e1263d5ab9baa8b1a3c893765da1dbed0bdf62ac9c886425ea9f05876df1920889b707a2cf248e7a029883588
+acb38feff88de8db3477ea9ae3b33e0c5715cfc91cc71926dce26f4f290dc4f437461a186cf1bdcfcd6d121e087bba33
+942882666a9f49ac24d9099facbf1e65484ee76cfdd2eacef25e0f30260654a7b5c0cb7dc37aa1601980877f945c51dc
+ab2c9035b2ee9c5e57d8de70b24329cfbd247324309eb30ac78c404ced268dbe2aaea8d417300c90d87924a48702b793
+80aedcea9c5a9911731ebb444500eb95b519e2d4650c1d465afc61f4997879d60750ae3fe049e54654a06eaa2db7d8c2
+a63e1ba5fac918c8bc0f4364b5fc8d26214deee825aa1bff111e03c0ed43baad47e8bae154ad580b851a0f66be85c88e
+aea7f5f8c387c21cf671246803cd5baac61cd6359848ad4fd685b1350ed6298a129ed74dace279fe7846001bd6577dfb
+906ad36bbec72813b368bd2b79c1c9624966dcbe94ca9dbacc297d0d8af86edbd80cd702ed04f0adebb913a6a7bc1a62
+a46201c20560ef2ded1ed3047fc196bfaef445c4a716890d9235f3a06d6993a8ab29e816eba54c6a2e2590dc8dd61216
+b37eb2c0d765b044ed2fa2923160a19e11509e764025e43a62b4ccbe38e534ab59e68c2cc92cc5aff9d97154b8210c50
+91f93b1404a4bfd3fc8ea019d76230637ceee315da0faf366c712c3ba19088cd3efa2dd30172dcdac11e636f8473a26d
+b6b905abc4a795bf95d055ea09c3f9d0a8a9ba0014e288492a3751d2aef60cd3b7846e1ca8366635a94988b2e197191f
+847529bf842d7623150a3bb91fc4ccbdc66010bf008179a32359f98bd007330bbfabfdc487f4b98691ad65680af67a8e
+b3d37a8098d02b5ee69ed060527f3d924c727016fd92b21d6a52fb1c1ca18c7eaf0caf8144e9e6bb5b6a039ca85cb1e8
+98cef893dbcec865cceae01138613de146d563f13853ae34bed5f142da716673c105ecbf4f2aa7d187bdee20702d8582
+97f60078d18928c4d7dee1ab244b2b7540928e20cf7ccbbf6684148611afdd9cce60dbf412c1fc544ab8c356fda8fe11
+872a6758004e6c87c3788c5c11bcc74db78f076efaeb75127f0baec28febd02528c65b227b7619fb8c29cc92d7c8e799
+8d72cf1191629440d7af8daf3b76b6b1bcdaa8d6ddcde52603dc8b092c2ac78d6e24bec32e1223eeda15dd17ba2c26d5
+89dcc8c10be08277a1e394de336bb1b135bcc5131dee5eece80973ef364a305235936a3b6dc40f2eeec2aaf227a86376
+972c4ee3b4b3b028ab683415bdfecb2454d326a19d274f499e48bb2cfd55165b928bdfa7f97c4fb6d27082cb88b73dd5
+ab5438a8af3acf2eb75bea0ae71d8aeae363d6644c54e3b020082c80809ef86faf5811808adc8240c7693515ed8bf199
+b594133dc9f71f72e448796316ff3ce2f8a03c21ef9c54e551d23723d5f197f7fb0bf1c33e9cb3f51188db7dca51bf49
+aee981b45d570a666d0d0b2c7aeaca3cc22d4873812b4424d1f91144142393fd64c49401dfb970c7d5ae91233676cacd
+8f978d21de1e264178f88cad7213463a5efd139c30dfce81a7eecb46942870a3c1971f6e6e6a50e0a8b20c379ac084e6
+9153701c8b82ab43fa4635cf677789c9c9911efcf23250bd393301c0be51f14fd0acc4e467ec9682acc89085b94641d7
+8681989a1be217d77cc8e012c95128557de70b362442e7f1e6162bd52ec6e4ebb0ab28f9ad3f67c1d35ff00216ceeb74
+8e85421256fc71a82d35de9645a6da9cbe4dabb9670758c4eafbcf42b26fb99866bb2b4c374601749738ad34e51dba6a
+976774296281bbe1e8dabaee7453613d0a615cc6abaeffd8e15ca4484b5a743e298522b2dfbdcaa697e1eea2b2bff736
+a585501faf955b6acfb328d801cfec5b59be8ff2fe46ef0bd73b86ba4c19c1dbfcc1df844d61a5acc64bb5e8a68f6cc5
+a776217e5073714b36bd2ff0621246a48799eb5ae3ca438d1efff6f9f9beb13779bc18ae5ddb77c838732e8925018118
+992d726bd4889f4e7565bcdc31c7b4a58ba44da5f361e3b46e0a67a6e4f00c25e3503c94e7b2bece737d7efd47ff9beb
+b277f124d5dd8dd669ef1f6840276c0bb0b60379ca3a0aaf00ca337c40f478d511b1a73e73df6c3b600e6bfaf37a8fa9
+b037e78617c235e6528e535bf13bf5e82c70588d1d0bd08de754d089bd47a4fdcfee79b5666b95698cd98c0e32164afb
+aefef9e398e0edb60615713d7c1334005b21844d3f1401903e09af2db20d7b342b8d80796fccab583c8607c533c9b735
+aad20eec7cf4f0b518007ec1df7dbf4935f6f9ecb36a11d148dbf9e5281aab43feebcc8ce9001374be40776c5ffde825
+a4ebd6018e004ac8b5d022cfbb7c5b3833456faff4f198a3d9dbbd077c8752087bda1ea060466fde4a5f31cb8a50a7b0
+a56ebb8ac9901915400234c1c6c8502905765a7224de56b084f9b0a3468a065e78b4daea27d9887b4f44a72fa61a15fa
+b0269890863c63203dd4da3a08a1bf06621cca212acb49799bfc48be7e41c951d807f85dd4171ed57c372914dbd2ffee
+ae11fc0f5fd5ba488104bfc07fed50799f51ceab4768afdab300325e9a913b1f257fea067d357e54950c8d08af5ecf59
+aefce65396c61e835ffa38857df426f64508de6e93f966cc46b54dcbc5e2bfd72df927b00489fc4460414569ce99e610
+a5a1fed75677dc956c000b9135c4b6138e0cff53770399ffbc3b12ff0c1677ace264aef2058aea535ee1a7195afb034d
+8071def0890d01f0d10dab3afb13125f0194e79608b9ff129572b5daffb49cde5bf6d9f24da3f84483612aaac3cb8eb1
+b5e5bb8c0be22349ea51e249cf2159189fb9aee615dd62c5f67cc9f43745676e703abfa6561df4f5f1d79b86c459b11c
+978dfc57cf0d3538ef336a25ca7a2cf373f84b71bc06d1c74907464e3e816d834087ee126bbbbd5090a09ed063f87a46
+a2ff4b59b3e7fef169835e67d47218eff5368aed3e6e2f1cacd29a5efe6c1c2e7e1839d87759bad8ad1871b39c481bf3
+96de49b44bcd2f5ac3d07d6f5270af081776d8631fefbaf9fec6771e13d40a4e5158767067297029bd38e8c6847971b6
+8f2f820e8e3645f2ab9a27b3c23b5f656b681264d08e298ec546c5aaf51119893e0dc8e04d6f64fef48d3cece89692f0
+8de2eeac7dd4b53119d02f0ec99f127cbd8f6a57120d94a9a554c04467fa74ecbdfebbb111d9f15cdc1be2be8c2396db
+b6616f68b00ea0fb78a25ecd51d3018b9ef13664a7da42663d1bfd6fe71fab615624af863f3b41e625b36a607bb42dc4
+abab5be2ab033afd6d110a340c658fb512bb53368886d8a5ea29e3c916a6b1bc46decb2cd0f508b5667f9dd88033ef7d
+8872d0cb09df44c2a75895d46588316a4c9c743080f7a03a384bf4d4be80d341f8dcf0e208383bf3587a3509f3324fe5
+a3f57fda2e8c06fa7ce9de223f5ff56d53ce9fbc48486d88d2845e7011dc038b6f2f270dcfd46ef5222ae9a1557070f8
+a82c4e46f0d1962cb48d6c3d8ed3976c4fd4c174d119470479d9770619a45e6e16e30693b2804a82b516ccdd400508c5
+b53188c6b2907abcfe47fab98f23ac602525e05a5ac6b4421c437025819c80529e9d2d63f8a3c10cb9dced196e572506
+951934cad4c2772aa0ffdfc4f12a55f490824e104f669e4dffc70d9c14239570c87eb998dbb2a6d423bdfe1ab50f4377
+a276bddb27d86e1e70ebb96103a239ae4848ad20c4c5b7de85f480c3f293c934ebe35792361d9767de4333ac6de11643
+b9c8eccc03d7270779a87dd7c52a42c7bd632b9bdf94274b1dc864bc7a59e13eb30870ab740066040aff0beeefe14d2a
+8e0908e4d15aaa582dc028e015c4b2bd97c82b8086737cdd1f2820641e65d88166d1fc763bc483f8fb4643339182473a
+810c6c46945ad5b4f699c51130bf204e47c62066fbe54fd099c3567ca79aa8aa8b04dc5321c09e03df4bb7c9b93857ad
+916d4b23adf202ccfaea7dd124d28573c73b39ebd74bf4dfe32a366f9dd48f4160b8cb0e687e7dca887c4b4f19570cb8
+b1b8fff52dbbd5b9bc6915ba20f3185fa8e23fe52c026a41cdedea5301dfcf6c79c4fe1058f3abf280a00c7b2cbb20a0
+95f9623510e12ddc6f4ae59d06448f496cc911c99a4d5f5c6ff7e434b807fcd4b35ec1ec976a40208ee1a505a892e38d
+ac7217596d42d40380fddef22e83db9e6d6b2d0d2e912f868d7fc07bacfb83e8e6f01af544e8f450d31db014fb094c9a
+b10855b8ff1a81ac32d81773ce8a6391169902290af0637038b58ab59fc84e3403d515ba7c99e26b7382c2e2d0edcedc
+89eebe9789a333f5db0aa9e8604798b15a934ff45e19699c2e7fdb46b6863ce02defcef9f6dbd0cb799ffe2b669428c8
+b9cc540b405c5ec78a2d8fc17ee4a08690e347cc1d860885205bc19cba09e62f25b94ffc2cab1f638c87caf217f7b6e3
+b16d06b120906f085cb183a96a2b635334afda4272ac650259f23059407fdcc8b83e91f2521223f79769ba45428c04bb
+83e0a2d9d9f6654d916a822ab1725d58a10efd64e889a17f44860db4d2c77ec1bdde7d0ec8deabc12f8ffa5af879d4e5
+98cef31d7ee167d9c4248e29402ea8d5546288d1b7ca54a5370e80a9ce371bc4aa3f5c7a24c2e4805d8c99af059b4156
+8fd55a0dc38b65c2b0b45c9127c14b9396db4898f14e1559e428a2951cb5076bff9e3f202a83236f15c1d2530539e5ad
+b3252594c3060118acb12eb91d002a74c068c0b8f9bd735a9ecb082f787c7e046dd6e40ddf4b3ba56bf89f223bb5d76b
+a88446262600f605fc4f067dca855ebc56990a9ea050c708961e486fe685707d9e9ca734068b92778a144c0f3c23b4bf
+97beed96ba821515996045a40f17ad46f8f4d927cd9a2c7ce134a60d19ec4a5819a19aab1bb0df886d9cafcff872bcea
+98ce98dc7908161ceefa0ac132b63c860ec2e53f7ba28e66c6c5e45c5945e459797c65668e58c0a5b8a26811f17c3f41
+b0419cef96d4d44fff0338132d53d2c03e7e9b4618dc2c6b9f4475368e21700fc08b844a2f140158fff81f56aef83b7e
+ae1eba4a4a715f6d077e90e9efb59852b7025adced47fd9f705c2745e6734f2fd2f2f86f07ce24695a06e24e63f00b03
+86db2fd15dd3cef1e504fb057136f0405758f6fcadc391e6f64b3080f92bfbd4537a0d8f59cd1a0e913b2b188093feb6
+b418cff26800f8793b083a879c8b1823285f7a3cac6fa34cf48ac5355f04f6ba74255eaf436739c4d26d0d80d2607129
+8eda3c25b5699569c03b85bc585acf25bc3f9539e9dc3e8707b34520ae5ac53920f45528f0870d93f84647cae36b6aeb
+a2622af11642fb6cd60cddcd4c242cf13045f4ce20539d11727e8942b4f9a7fd1ea2192e83596a35c096fec3658c0c2a
+80735f92d09dc0af19f593ea118bf52146143c1d2a7343f6e2ab95e00debfbd329d4e887f7421e4a361d815dc1a27973
+a7eff30a31db635e239c8632f7f84263c9a9d82511422f49077823aeb124e6ee3c995ceb846902fcd2cff0f5f219db51
+99129aedaac32b3ec18d689a2589e35fc9715fb3f1a72d28a09ad95e39a68ea939ec5721c501a9e35c60cecb3f4379df
+b9995d65636ce1e70967a8ffdf45e50eb264eb64f15ee887781455c5472459cbb309ab58b1645bd6e8f2bd29e69d81b0
+b8049f4c3ddc22405880bf55b5d5d94a6dbb071485f25a49a6457db0446663f8d4fabcf14106b9cabb1b3222d8786773
+b581027c7d9bf7b97f6eb085934b9caa43a46368cc6740139e33e4cb2c94683411710a52d5933a27c9d12a43e75163ae
+b5dfce672e670158c259f36fa549aaacb0699da2f13702c81f5a93afb00361f9ca22d02dcebeaceaee6813a3c9bf7aa5
+b8184f3eb809be1986530dffd7464d84750df02196274955769a0afa02b65e87686d915ecdc7e75a0a76be8b7ad8d064
+b7ab837f300f4aa2ebd2d770f7a36dedaaa68e1d601eb36a28fada4dc73dbd55e7f31c88ab2835aeb57ff113a14c5f32
+a72013c811ca674c3e909064777df1484190fffb0643b6b1435892f5dd0f1d09579189fe00c862bcd18d03309b958b72
+87fb528e03f1b6a000141f4a6ee24a9738d9d2efa795cc262203fec10d76adcd0f89968a46fdebac99af8d048300b8ee
+b2a1ca5d5d16c7addb73341ebed1f8e832250c2f8e03915a417064750d7deec3289e646c06a09c6a3ae40ea2817636a4
+a90cba4d0928da2a5d8c6935790e1a1f026073632a4c1460fe686d06c3f2933661c2b3c49bb0bbeef386f2bcc4d08485
+a5b684d544500be25136b0b5b95d9f363103a6d08cf49f4934d6c96d43720a79cdffe66698de0ffe5b02bb3c2e30286f
+b246952dcdc38a500e64ccf4f312bc7c690d33a3a951fde5f839f6eec77ac78147f1fcf26ff7b990e8868f5cefe1c4eb
+981ed33458e8ead67d4adeb884153bb0fee0ad98ebd9010ee706ea1da7975c290f82c492cf16fb42d1b739632e66e50e
+88bdec223786c894fbd8f964ab2c92c5ad7fa7ed2b97a6bf31423a6ad5bbb5a946ae3cebccce8cc97af9e788d03f547b
+ae852b074e5716e3190593e11fb17f1135d7a5d888986d2be53973fa14c1d4a9887381e648a10a4725291ff062c9d88b
+b87050f914c4f09e2dfef845ace5a06504b6fdb815f685921710c7e82a9fac11f864e3e6023ed5807256d6269271d051
+8cbd11617ab819680cfa68e70e205f3ffecf6e469d88dbdb1d9b0c9c7c38746dd6e64bd526306a8ab59cb7e66841a757
+a1c51cbc1a91618b1ede5cdd77fce26b04971081e5cbf83be20c22b9b30cc9197b9bfd5998fd9ade9b665c8218afe94c
+b5cdb2091d114847dc14a4c922bfe944021549df2d75cfc08ccacc2d740726e90e20a0bc2bb73303e9f0bbb5192fb982
+8e60327955c5de97f56838cdebd24c2ed4021d9e3d74ab9eefd4543a286c1be82a1e8455f8cfc0a17f03358c4648683b
+87f9c1c0987493c631279112fbc79c5f5d7dbf46544119492785f444d063fcb0da4f2d1129735ab77663a9000d9e18ee
+a970df3d50c4ef3d76d53dd2b887e9274fdedced7a83560eb1950fed2075879d9fe1d5af811f04ec92d557a0be0380f7
+95a69bf4092567f5b55a401329d5a08220ae65825f05d56043974fb7b7090372e941a85e2d197c46c9165031b3bd36fd
+8e62c98171e54ff549ccac5d6d381291d0861439dd24e584d356a862d22942e0ff17cdc0d1faab07e496374a547ee812
+ab62d0eed8422a3172269de0e325eae9294914fa67f1ed8e5d0609afa2991a26b1e1b9a04ccda8436d04ec085957b110
+a3292bc88e2a9dec7b55ae4c27a3a8ea46a7b2dfe3a817675eb3712f95264c08668703771b65afcdf6d305e396d5f005
+afbaf9cc19adf63a0716cb868a970a372d7a1e24a4c78718a114ced412a12fda6fdf42f701ca1492a8f8c1ef0466f7a3
+b41a5f064f9d900d1534a68c74796927e4018e23f949d86eb76dd5b26e5b686115d63d858a49b545924b3941bcec2341
+b4e1ef520119f9a238fc4988ab2f1266606f53079744b92c1039541aee78b67ac570d7839fc9b2331244d734ad4637ed
+b0ce754a33a506174d5feaff4e9a79295c743b2a122c8a1788c1427482585b398a750b7bd93cc53c38bd3e557caed172
+9842cd13ee9490d9ca7ddc83d1f7d79495afb7301d1f51f4b007dd2b2eaf15abbff18666126adc25df5ae26b98a80f41
+a976af142268d20a248c4b71304a878efec29b5022199cfc88bf82c081f55d06a89f178606d50bd3f8576f0c5c01a6ad
+985ac6f315ab1d2db1b4f2b107eb1652810e63e36b8c14e8852f072d2c8b14922f20d1374a57d75cec62db0d050a0c7c
+8c1be9e8317fdf847a8131ac14cedda922bbfbe15cf95537493c4e7eccc7f2f1a56ddd1a8832e6300734d6019d8b128b
+b55d129c88d252556fe688f84982becce253736ef3b1fb88328e41300ed0713465c8bd15918386844c725fe7a94e8364
+a96384d2d81cf6a79614c7fd6bb68fec6e74064435a1a79dd8b1533e9c7e578da5ecf03e979969d983da893f42adcd84
+8c2b3c06b7249ef5ecedeb4f2c65c0925cda8877bb4b672afb7a15bb5a7b5818748d6b022c6ab8fe9c5a1499e2037c69
+91c8b2b8b204897741124a37f85ddc45c3ef94ceb5dff681b13771e712f2ba5ac95cb1bd2d3e94a84625d384b51b099b
+8bf852945910e9a773120c5ad975f080c07c8fa37c2158e1138162a82983211da70f27e22876741d58c20a6c9dd770da
+b9e907d9176a0fcba87a2797651765c814df756bbd1d0a86a9b7b06d9d886d1908d4e74ab27d618129dcde81e7d969d1
+ac4d3b156db2570c349e21f07fd17df935872f9687842035b533c6e4773ad5752f4ba8f9ea4501953f6b8c4232a4562d
+ad91c4a7ea0a314d7d1ed7a69a74adf6ad810586c1bf907ae9878ee5f6528437c048c6ae785cc255707ea3e58a4b452b
+8013b76604bda0c429e37006b01750999414100d0ff59ff5ab7b233399adaacb34906ee65054abb94db80fc92ac6d2e8
+b26a2a660af34a4b9b8910463d0dd439a3dc563494f5ec280dd5eec0b14b0e9426a0422f3c75370201299d394c4d90ad
+8e1c7ea11dd513fb8527fa99b899444bf89a1188089d3bb65e3eb87025de9a48e8b4a3068a955fe752f2416de282ca20
+b6cbdbf2b143330db09841aa0e7d22d32772ee62006e7cee13d8c4ac911ff4a59a9dba3d84bc46ace1760353d847bbd3
+b8f5aa3ee213a44c41f63c11f685e754997cac37b27e91d07bcb69947344d94f3b86284b3b1655e168befc01c880d550
+89f93b37bda703494263b10768118ce998ac1f395d422c0ae840e47c6d649a3ec59b404c164a1ad5ed14ccc2408fc662
+97255607a1aaae89530a3bdbb7f2b7ba3fb9d5dc93509991021152dde08a638bb3152503cf0c896c9c19d61f8eea36d7
+909c7ecafb798e6aa45867976f59cdc9d219aca6fd0881f82f296a83a2a3cc5ed47f08794e6e3009f8847f16345f5f4b
+9560fbc2c531571eee5b7389855117644f156ddb00b23a7c2189205d4cc613ec83952b96e941cc1e725c2b574c46ee9c
+aaa69f68b6086bd369fd92355f3a0bc632c1b1b4284529c18a7cd4d71d827291bc997ce74bc92dcd6900419be68efb37
+af9ab7e6a27e61a99f37b89fc816974ff916b6a24ec3aa31d76579204bdd5ff01a2eea26e76188976c033db4af167db5
+b026dc8850af970d2ffd300dce6ae07db0ca2d21978e4f3a6797b6e3e81f1d9680465080a983c31d473a77ffb62acb5c
+8f82f92ca992ac352ed1e8fe31d24f8090ce6a7f02d6086720422b9bab20f3e3c38a5f63c7fdb193e30d63f08e53c900
+8b896a2ae84c66109c8501cf6070c4da65c43ca8ef9b6b06fc85b6cd92bf2e5397d492796c528c7b2cf29ba93341a87b
+961bf4c0b8068c8406a864595e156004d427138e06b390519cef53af8eb00c748bdfdd480521c6aa0d53a78e8f806217
+a6fa456250d20c6842dde55d3884eaecfe8a39f546cc5e4a77f57907192e849a956a33a81369b0f2633c55bd6608eb63
+b1d1d2f3e3e058ee97c9b6246cf073236438ed5e782bb21c68cd0d77b44f29745dc24d01edbce4437d93071b6fa6e0a4
+81a0bec80ecd1b1e72256ed5be7de8deb11046ead7a96e1d150573f4d896e642b4af095735343f6831bb6b7f4037cfca
+b48d8e15fa8e0b46937637de3c727157f8073eb8a9a04bf127e68977758385a791da2e9c69fedb89b334fc638ece78d3
+afdee0774369653bf371b8820e285e1b48b40745a44d22cf2098b630b8ac95796a74f79337cb97fc60b6d6b903a61321
+8fcd9ff2991902149db29cd4674d60387d4f65397891fbf91b7699a42f579f6b0afdaccec70e5e82d1abd81de859183a
+8af5c73367a8439b2e3e5f1b65e00ebef2eda640bfba2eae48582cdfb244e1b1cc540bc0ef72f9e24399affce1c3e222
+b58cad4da101363bb8d6e8cd0ec7c078f7719462856d7ea573e2bf95e00cc23020031901bd1f2112ffb90d847241e5a1
+a671f7fe2ad81e9e0d5e3260a9dd7808125dcebd970877b000bdaa3207ca45ae1e5458d5ab7bd69b2adfca8b6abd88d0
+a8411cde9eefe73fbceec3e5e3628b159ca4e4c19385ab50b8d7a482f4258f405c47051a89f11dbedb2b15e84d8bfcc9
+b5dd09d5ebb26e341b6df80e836c6de2305ce4941238e3e96da549857ec314b1658f8b03ef069633625b6e4bc13b531c
+81bc9bc924039fcca8892b40aa9fe8f5d6f305343f6054e36647d5f14cad3e4d754dd6ce9ded67ae65825adb4e16df31
+935ec74c2dba94b1c5ef2060c31bb5c1426965f68d9f4125cdd891f20495da9d5dca513f65bf3e8c599f1562e81a0c1b
+b9581e11f361097620130e753d134cce6d40ddc7c516388fe4c881fceadf738f314d241dc14d4f87be8ff0481e898c4b
+b7be50ea49e09d10cbcf21b6f717e0cdca582d57935d72d17e62cdd7bf2071e5d5c91ad7bea79476537e515f0d2fa5af
+ab467b7fd32a795411e991417be57af8b62ca199983efc1f744799136ae5339173111465e91083dbce60e77f9f2c0fc6
+b99afb338f747ae89e7cebf069612e22f9704f247d66548d305aacdfae395609a57d4d5405ff0f1eb1045dca4c3827ce
+99a5e52374e1c55f65e44951f68cc3d607157e60d52cd088125a81bc60f2009d1b894eff8e1efb175509aa4b57af7276
+87e3323cf6f11b595ed745a9475a6d99d11333043d512bb61d5f9d8c3f0cb6957aa8c3f041688f63ac13a51df29fa061
+96a5f9ed28056138439eedba186b754f5f7693c09422f42ef82a315b7413b418c4971112f4261e1b9793ec9066c3641c
+b9b5fd36d2d861d40b947c3c879a42fff24b9ee346163e544ce6c3301d0003cdb47218644fd5f1f7f0d6f19bf647ceed
+a8899296b58e5d56d7da438ea48bd76310364ffe666d698c86f20683343663d742a0b3f8c1255e33f1d424cbf61bf1e6
+ac4be82ca78df2a367f13c8bd1cb73a28015853f2745e025626c325a10b778cf4bd9942439e35015cb38504bc02993c8
+ae5d6b99ef56cebd5e25a9c002e9e80c1d3e8e5fb5dcefc8ea7b7798c7e09b02147da2ba14e42e2b6db2b2a6a738f598
+8c94abefc71d245b0bf04f34085da0a9b8d4d798ee7441596c5166ac353425175dfcab0f76bdabab8f0ef5a2b453255d
+960ab6939b1185806e9f985c9381206c7032ea8a7a99eae5a66f276ad5cf450e654a6f1e956a2a63f33d6f715064d051
+a4c7c7d0fce514db07bae5582f5e4f7a05d79f7605b33fe2a1ae980bc388b31c056438616bc8391ddc7dd5f98810c74e
+ad5df00f96ee6e9e1ee65b562d6311c38bc2a0a25aa9ee36f39766a2a03141e95285dd2850a598385f45b9935d63b78c
+b051de656e37ccdf3844a6e095d3b42ea9c5a545e0dc2a5234e2016570375bff6b55ee0dff04ece5713ba8e85629a7da
+ac01fad1ac299567a22da6949a011f429bd9775de956dcdc247d5c186ec577fbc12a482ebff3a4ab18a8e35f3e2218c2
+9654db9c6b5e58e0b68fc49718773d44129a0e77bfeee3fb56d27c282de6b75fe9c10f4f3b5d3374443a9fad45c400ce
+a556631390e6cecc2ebe390e605e6fd754f1961e4bbc063c31c08812e0993eff5b5b7449b9732bfd3a22c87f9c528743
+b41b7abb971e253dfec3aaec4443e875d73373c70c33e9ea19c1176f8cf1278c7716a76a4eeb641c142b2c6c1ace5db7
+8bf37cbe29245c5e217a48140d7f0374f46596f2e82c1144ceb41c9801211869b96d7f1d0f7345233abcfead0309cc3e
+a380a799b80f1309ba326f26ee46ba3081b12b5a1143f8289b2fa067aa3ba80c3690fcefded8534a80368799b71ee9c1
+93dce0a2aee4d67efec1b284142d890d1e0d7abdbbfac82f90dcbaea94eef829645675cf17050af7b2e504a46d1bd288
+b8e90f54bc57ff52b84fa3fc3c3047f379c5587ca18d9988c613a3bfe614fd5fc381106729bd62eda298faaf17b10210
+8d8e4f508c284c52a6f907ec39950235c9443c5c6046762911f4818b98293d7d60a2c3f94c5cf60ccfeaeb8f283d8ce1
+a513b66299ba5104ba633cd68121b9ec848e0c8c5252d04a0bdbab5e3bfe6ceac93ebb1ee6f0274920d84eae27df1520
+80e2db8b919dd2ca33e833270738b1f437ae312b1c53a73106b6d12672a395fc3b941292fbb019d40e31b8e96bcb85c5
+a4c28fba416985d47c947b0669cc22153ce887ec54535a18cf457622d03120b6aca71a45fd8704166f6f7a9ea2e9d608
+850b05b9c7e168a83b0e0e77d16181a52d78aa96f4026c4420824cbd44dea9f27f3336b1736bd545bfdf548eb3f4276c
+8efabbd63f3b9ae6111dceb1cffe45dd23f1500f87382816d4192161a77dd0776da2a4463d32da85b802ba7299fa726b
+9426e75c6f7fb77072773a2ee03e1e3f1d90878fdb5d8c294265262f5c1cdd74a7aca339b46af8a5c43823dac7e57edd
+a1c4d2ed335a3c92d867c5cb999b2b807dfb1d45e35b3960dfab19da43e2d1ca9a8748738380cefd137088d8b80d3006
+987a7e22092931f39f05f5a6b38f419750370a71157d4443510b61fe07ac5aa31cd7f88ea04121947b1c0d0419d2a25f
+ae73cbce7cda7cd90404302388d41b49ed7d7f505a9a406f0317fccb29e32a5be61a6eb0951657f2d93abbb497be62ad
+a1c7cb4056984c22a57ce76272428a50fd33f0f7a68c29c9438af05a87bec23d8de72062fb4829adafe597a278de0c01
+b72c81a9a747a83a650b58ee01015a8882789983b67ac4f2fbedbbf47dbe30f04f686877d8f118b4634289866aecf9da
+91ba1797d6913270ac1cb9c87d9d8440a651e294c45b2301ff8c40416e58126318f0f2d411b7d9c09c8e19f4da8ca0ef
+864107657717124339cb2ec06cdfa75fb9c4a7ad5155cbdd03d155a7f9e9026e237d7cf5f4cbf07239e7bfbd79900957
+87af853a334b8cdd10bf5f78753b27a0c9aac9f55db7570e2d9d42f13d0e2f8bfc4ca64b77b21e478f23385f17eb4f6d
+8658227bb8733d6c7608d66a748caba761f28da4d95e70506dcfdc18300a559b4a84d11a9a048e82b292eb1b5d88bbf9
+b078413570ead3243b9666c109a17678fe60dd1240caf01d1d344de09e346015cba7a40560b0d68b18df82a0a37ca529
+af6dd12875a891eea9d846aa660a207a527d08f5959976f6cb7585a98b1133f341f4ae29157f6ea8e0500fb6b49fb9c1
+abc0fb42239fa531cf09f7288fb00f1d1587f2a86503593d481bb19b1159a6a9d6f4794565fe923a545d45b058d3a74b
+b95966d42c59bb12029aef1da7fd50e9e8aa9ea287649ec3ba44247b185b485260af077e0d755f322ee4ecf8e2c8137b
+8b1a2350f9bb0d6de377c00f0897081bfbaac5d47cac852a22dd8a427fd2e3029a1708f452e958a07236c7f35ddeb565
+acaff21e9740b831fee42d80a9a80cffa6673e39f85b815b4f546f538dcd803320f90f4f25436796721c8a11f5a1b25e
+a0dd42f019eedba19f4345553965508aa9d2eb1499a363056d95e27f7083c2343e74a0e7dfb101567250148ee1bec1d7
+a08d1b1863e594bfcfa2e21ef4edee8535c8ee69490a4113787899ad8cf2f2ebbdea54de193ded85af82fde074ccd0fc
+960912b621ff08e27781a4f9b80ef1014a4064fa3c96f534b67e5a094a5c11d9cadb2b69cd2011cdddb463f2936c7ff5
+b3437f1e0872f6b9ec071a951f26120f27425789e00c1a8d3183879ed02e3b017406c051f32580b78b4d0f090474b42a
+a90e6d1b11ebd1f1dec54d7b3fb336b9a53c821f295a592e147d5fd453d66e63295a96ce827c4ad64c37d4bc0df2c7e7
+b357a785f3dc1f9bc1034da77033c0c64b29b78c7381ca59ef81e24ab14448d67dbf84756ea233b9e3539b5ed517d9c3
+9360adb42210abb9d7644bb95532e1f461464446e94cb5047bf8ed5513398414130630866b6980b6afec5401e608f6f5
+9145a7f8b2cf1bdd90b9a860051eacdb937189e8d68793e52bed202fa1e23a87db9c51a18f0bc050dfc3c600780099c3
+ae086e289e16608f02281bbde5a6fb2479e3151a2464b86ea737f8a43e15af4fe781312d0e5620a42a096cfbec885b0a
+92b57fb14a0c567a16567f83e72b03b8b564ff6d830a5776014167cea06205579dd10715071097710dbf50b660b9143b
+83e6a3f027163e635c2a1a397d2661a2d6c72c25082df129572082db29b1587c78dc3d2e5999112983a040ca46bc983c
+b1667d022c8099dac5af4ce3b4ed6f524819240275725c7580a2386f067fdc9b3a49b74195cc6f661212fb07ff133463
+aa2eb0c44df0a80047eec28a80440ed5f363e3d42908506bf8418bf04e9c17a5e9f550bec9c8ab8dc9979736ce325780
+a2c1d257de1a55e4c10879eadd49af8950b0cf25121e8d7de30049360470aeecfbef263739262bf1f97020c6b025f9cd
+af29d1afc9f76417e4396c54300773fd283f1bc2cb00308da5e6b1deac7a48cb117c0e8c87b03076c7a1b8414d25dc97
+a44d4f2186f5d728fdb224f10b496c9b57d96204325c452842423cbd29bbb2d07e98013a3880c7dfd63ede725d15953a
+a30c45d1cdc68a5d5ab65b57d60c8b386be836c5bfda7e2f0347229b7807f6a97b632bf54ba3711066bcbd5e0831e5bb
+a8c3c93d6a3526270ae47bc2628da82bbdb8b2c8e4d6a4cb5e9cf70b49999a963f3e856ff9db12cfd2575187bec668c7
+a03566f1a99f5b82e8243678d0bb033441cb8a2f160c0c66dcebd0b6922a56f895a69b94a9c65f4adc9ed73420fd30dd
+a4e3c839a6f4f4317e7bd06f25c5236e42fb0e54bb975f18f0240bdc214780049f0258dae24fba6301aad508ef9abf69
+b7e0349d89616156679d06d1626f45dbc9683ad73ed91f0d92f8f82cb0ea2ae8d3ba3a752e73a39da70569d41e84015e
+8c9ec5ff6be4b0d9337c5336b467c6d4f552af691bf083a23f1f9856e18b5a13852143dabf03869009febc443b2edbef
+a12ff782575aca7b48844f0402a311bcb3e19514dd4d2ba5b39694c66846b22dc9ba25ea39c3c1bc325eda3afa1f00b1
+b55bb586ebf5c9a3c83a04bae254e22547f37b9090151d96f5d8aa81be17bb38d2763a08cf0519a91878633ced6ce0f4
+b3957203932032fe180ba9cb5347c2c1865a3094d03f6611148af4094fa6a8eae522f2651780d9bc49b41f5c36054eab
+a0c865b498e30180c48fcab93342a50ca1cddd8759d6e0bb54e9f92e7b60c51c373f7ab1432aeb5e5c2d3ffcd79e8180
+9503ffb3529c3415c07247211c2a4f35d8ecef98ce9f921e67438ffd538caa54520fc6d248a081f46221a0f1165011bb
+906deaabf6e8dd0c24a4b22757b7681bf88268d9b4ff97f2844f9de825af511155d0bbc48dc4c03b87007be94f835d92
+96c2a7f48990ecffccbefe128a28cd5b26c664b8dc9bbae16d857f7efc1b7711c734ba7d1476945d09ace569297ea96b
+a37ea083b0a61f400b498ac5ba2360c22e40b688428ff4a02e3cc80206b61061bde037cd52d97eeca175394dc675e216
+89b15c3af439769829ca930fa83c47afe070f6e2d7a7df88e5a4f3a2c0630f9d143bb3cc43ebf9bbc1b91be03d35ffda
+8eca6996ba407886d3b9d2e4b1aae1983023dbb1c9ae47b6637458c73ffb7f422b0a893eb0b07fea2c5172ba335595b4
+81df4d7f576930b2865af5ee1525718a09b65d9a013feafd19cad335e4e425485531807078b9564c8db3bad95d23bb0f
+b6635aa3ca31c851a0283c0c6356235a5d8de9d1db9780e62087be32089c1c081bdc642f067224e88c14252efb960e3d
+a0120e81025ba07848ef24ca9a94699db5274a8c85eb9c2f3b41a81f630d09d100127154ddc3270525961613a41ed81e
+aaa8dd063f9f4f73f5a7c440671e1375ca8c224f8f869af736edcc435329487902249c68ef646fbf71c33a8bd1a04d9d
+a36bfb14bbf3956c317e01fe744bd9c6c6f526a3881f6800592501ca1d9caba7f81b3b54f53b2ee1b13aa6de42ba06ec
+819cd123fd793c0c9aba75aa96293268a4731c68c0a26a52561a695fc4acc409752de84ebd19494bae70849ce538138a
+ad4e50ce325477621b6eb4d453b087c3d7df6e3d019ab41239f2ad0615c6030aeaf85e0e020f3e6c89e46b8586b4a347
+a4327072fbcf33be1e57ee4bd5db4c079c5ec11694a25fa2fb30932f8a2a35a63183b24d3ded7f6c8a8d0ad111586dbf
+9454f17aa8fbdd2b15dfa6600ad305936a37b205eb554c915adc43aceb4dff6b0d1414e61584d5b15265f2ec0c85abea
+80eed3725282c83dde575620bc0d86e50412df5dac3b3556d1e3bd9e7ef6f56dab202f4dfe4ce542babd49c1fa7dea5a
+b90d1a07ff760daa23b7408b067c322f126023389beb7bf373f0c68b85ba0ea8a2c03e77e6d3339a01ed3ff8ba51f1f6
+92789ad894995ba07f36a0814fc3289810136f9dbc6c70c57ea80db464772d760b57d5b059d4ed458f256af7603fa2c3
+96a4ae1ca46d3b26029767e02fcf2f623d32c952712badf2a2af721226473f4875c40d5b14e66bf961a5a56aaced3aeb
+8c5073f4846df9a0e057f52fdefe01a9b8c9ace91ef5ac253e823e165ae698e733eb936ad9cb04d2c54cd8570f328c4e
+a9f36450b5ca66a20e52bc196620852a41f1f40262a2e12c278818b6071e6972c3cc6fdf83a9ccf586db6cc177173cae
+8f101df23aa7e353ac1034c38adab8f20b8753aacabd10d70acb41d0fd0b1f34277546b30f64d0a861f448f112e38acf
+b45b0779ef1ffbfa86d7e02e89bba0316c5ce60742b350296eff0d04246f1c8b1bf5bff68bc97792c85f1e5d4dcabacf
+b7e89d015f6c7122a2f35f1c48b43eb0076ac4269158d52e38bf2a11de11cf2928175f717ee5c1bf543ea38945658558
+ade2a57ebd7600929dcdacc290168443437bc288371ef40580df515012350f3453b09aad8ae9e64bbc3fe6a3456f2c31
+91c2f8de02bd8dfed1eeebc40a422d444e3459f9c33476b55de3e950d2c38d8463c4edf4d4f95347b0599a48cb2d47e5
+8f6e77d9ceec539e0407a8d75d4e855e376838c0f886b36615a9c7715bce56a8669586f6d7cef75812d84b8be91380bd
+87637da91b051ad92081e682e289bb904c51d95ee1a6ae2b8956982093a7bb4f8a66d91874265dc32229f9db5bd51ba0
+94691811eb74f2970a95e9a2d64435952145f1d0caa76040f9811c9ea1ed7327750d57d6e8dd63c6378f336421d11093
+884cff4ebea1bb48c0d651bcf0a710ebccab9062c96364aa64aa1275e9364a4c261e40a4b9f7e1e135572681a5a7a965
+93f21d4b6b53cdc1dd41cb1b80ff73c0f1620db41c35aeccc059128704e9d1d7da5fd3240e7d075a2503273e7525664c
+b9afe0a9b64dc43fa78f607cdcfe337ac952fccfde41c2e88abe3a8dbb36a51b3445d724908e552ba74bf67ea2cab56d
+910280ba145bcb6a99d89d1526f10632206d2ca9e1a8596e5d181dfa37e5f407e1264b9c71c39530caa59894c10b371b
+a5f583c9fbed59f99cf5e21b9a734de6d5685b9c33931325dd4b581bcf5aa4764c2a250924e7b6f7931dc5278bd17152
+a87267f2ad292572a1cfc89308c96aec0d12e5f0fc2b4135ff8df7cf83bb1e71d619906d415db5841bbbeb173868ca82
+899d7ff8d7f8d0daf62ec8d28adbfe4e7856582a23e62dee175e3bb9461f38bf8e4f73dffe10654a046573896f6de690
+a8f3601e6787e788d46a9d7592dd4bdd8ea8b5136e3c897d79ce560e9511f6236e67a85a35c59295428c1f9c019a0841
+b180a16448f085227a6f3e363b0dbcab285bf419d438a13be2cac1ac9f97973ff6b8aee38294f70a8d72bb4ff474577f
+869038341a2f68ba85f5b2de58d2d794584a3c00a76ad0dda5aec31d4e3ee433be20c197b40618f89f7c8f1692ea3cc9
+8366f825dabdf4f7714c5d089443d0de315198e23fb93c3ed063c4b8fca0727b05665c04beca145dc4c02f333e300c18
+93291da32b501cdfa3624b39f6e38ed982c75c1209cd85630cf83288204032c0a90f013f1dfb4dcedee7aaf0fd95566a
+96c95a1e73016fecc3483fc94dfaceea376ac700fd4804b24e9eda7135048e521daf96f8f63d5a1439950a64296d8124
+866429fba47fb691a4c39460031a7e614096abbca3073e9246babd23075e8e5f6051e424e47d860296ac8ac646f8a283
+b817f3d9985cf9f9657fa800ebd36a9622566697ce68f91c509d9ad7df8146532e24ad85c07f399908f87d1206c7642c
+8761c3755cf5440775fe00081f79dbf59829f8d400adf7448188b97f756ad35658295649294ac9626c2569ab21a5df86
+aad65ace72ef89783507c9feb5555275d70a421a95f306b7613c894bc24e978be809410b519e9314ac56fdae0c71d326
+8ed16ed07d0e989061db5087d50cebfcd6983fd54be5062e333bfb8f6f609bf1b7b840c91ffe4b66fd674eeae2dd1558
+af3919bbc0df42b1e2e8f62e931701f7c35cfefe3ac3f1985ddb70212476112e8a19d51c673da931777ffa28944306f2
+99a364d8819b5ea0f6d900167b60063f40f9afcf291ded7adaa2d0e46f344751cb312df1c2113bad8d84a028f680b41b
+8d970bad8f95ced0b0323f4b7b087efd0624ce21834b3c9ed435dc0a394cc2c7ce58f1741c1a64265c81654eeb6801ee
+a5f96a4d794f6f844b38f9b82ee15c2441cce293b6b2ba26b25643165236db05ffa918ebbe20aa89ed2a8ffc8df393fa
+8ca69e0006f6a72e5abcc32c3961aeeebb8c0a76d877fdd8a093467485c19662b75f2ad8c750acc9cc12c8fcbfbe9b0c
+b5378b855f6ed3eec19546cc21c947dd12e98783164d95a95d3cac36c89a840bcb9f7c99b191fa7730ec28d57e7326dc
+884e50d5e20bebca96dda539daeb0e15edaac7fc88bca254a7239f30aaec47a64f29b69fb2d90041b82f8ad8e3f13d3c
+abcce1f6149037ac8d27497831acb867cd5e05f637b7579736ba5c384b8145f127c56b82b1876881b782b94a84d32d04
+8747985d53fac369c4a23224d50bdc556c00f406e7ab3e38427aec317ae7c0feee5b48b9386c5764de883cf296ed1daa
+a153c77887f271316d5a7185fe0d2bb7359cad86ba80b03434bee8f21b3a5e52263d28cb9d3d2e6d5b7443196e03cf80
+a77b16b2b7b6e999144af6c919e0a74b9a6ff70de41a133f7f820befc1261bf261142717133dd4a99e168a5cca4791e5
+b89beb83489db9fb62fa32d1a8ecb66fe9ed41d318820d13c3e07e1c97802dfd7b05d34652a478a1deb3b17b4243a499
+a80200902da696d0d3974ab29676f0eb67d15166b173fd63b247a17cc49f56b6ffa28d9690841ed4865229248650601f
+8210103eccfd1f4be55e33991a831c50260bbabc1f311564fc1c52c3b2755d3e4a11ad69cd95e398dffdb9a0f5b77df0
+9958745d00d8f29d05d97875746d863007b1c05d3ae920794e6c65adb47ec208734fdaed1b49982c4f4cdd1d3043c369
+94a4f28dc7a9d2dd01ebc2f3ed11a5bb01a2095e7c772d2753c022d991da7b2e4c80c2170209bcc4771d68ef8cf007c0
+a6b5c5543ae3de57e074fac82221590a8d771e93e22fffc2029b44e8a1c2c8c9cb0362416de54d00fd5420e5b1375eb3
+875e801265871509c71dce38005ad6423fd027206e6ab4c58d2978ab4812d5720401c1310b56ce9ecd95241a17ce0e7a
+b6819bc6497ed57feb41bd82f56216b513085b6d1a560a958adcc06a6da304424ee34ab2580604b0e59f6b0091ffe6ad
+93bef0806f21f8bac88a5d6e2e6d1adda06f9daad5cc3c8de61162495d8fcc3889b767a3e2f3380f162166ce40a0ce80
+a1f699cd7446cdb1321a05f970bc70cc98593aaf0145a0d097e60e5897aa311b00d019e09cd533d0c0b7cc5c00a753e5
+89ae140ad75a83db2903a93a3711be90986d08dcfe962aec5ea4ee69656026dce77821993c1defc4464442bfe7d44734
+a4110c80ba92f545a1a7545cbeef997d6c0242fd4d771977192269d626b35c88c361df53bb36dfa8ea7e40da68e45f81
+906786f38eb7e98c431fa2464048ac3f1f1df8f908a25262978327224bc82168f564b2f3e6da77f49457ce49c1a72c2b
+b28d92b3228547f03a3f489e09070ad9a1e20a73e49f7ada96ce41c19cd6416ad809b3a3a01f141b3698e85c641d795d
+a25b9df9b377baafc8c735a772e0ed9ac007c0b6ebac2cc0f8f2e799e5e6038a616968c9896cea862e99b1750224ffe7
+8085eaabc79a2faf1ed0b9fdd017fba1e46c671c6d8ed78fb089494f792765b0617f790016d8f55697dd0f45d17de4b1
+a0e81b557af74efb95cf94054264d30396121312c643052070ab53eac8e75075f1fd0b384cdf1d96bd39cc98681b2d92
+b8e0ffc7548969ae28beaa9d8bd65872840a03150e2140dd799d9924249f92d962a0089171bf4b311520ab527198668f
+a6188827a500b99af6eb91094a0e464e394c8c0a6d80cfcc5d8be89e8810732a03ca75b2befd00d07d1dfbe7dbe89be5
+a4e5a47c656e74107e6007199b940d8381f706d5bb4226a0b2fb13eda725a556530b8d4876dc49c5f9631dc6bfcc4c9f
+90330a50442db9a9c459e06d42cf7a69e009332976c3950ae7d9981d99066fd2af22f22ac429850b998f1ec929c82bfd
+89dcc51fb717212b2dcbd0fa0da189e194b4ad5bf7f43ab2cc2c96f11c186d0872bd930aeaae01661ce2dd9f94eefce9
+adee914ece15575cc34ab485f2dbdf3979406ce7cd8cd82197f156f373beee6d80e5e3623d79a2fef14b0b4ed1678a51
+87e97e8866002364bbe9b49c5f2b5eb729c7018ec61dff7b8bcee1c1ea349e5e04a3f3781617d46d8fe0e62afe55d62b
+b6b7bd0bc652a0bf79aeeea1767f0f17dd543b9de582531bb3e14ba2bfe1b720a6c6b613cfc295372eab9202f5e2d340
+a6f9cd96d8e422d9897d50bf36288bf4c09d28cb0f5c4e13ef7f76cef6c75bb594d0ca954ff7339590cdece16414fdba
+b9bc319dc5e55630d1ee8cb48978a256b69c96aaabb5269bed8c5366add03a2c38da11cb03a44e150a5c7f34bb49bcd5
+868c36924f0056b3464bff8831543a280ced62be748d60f82ac860c32025c4589e9354984e1cedf24678374c959383a8
+a6244602362c09b382926dabae5793ca4fc50600193c69e645fe229a471f7cf9e58c4a59124d6d2dabaecf50f1e1fd1d
+b42df58ee9e20fce589837d5ed8a938eb83a00c6ffe2f6afc973f6ce26559b8d220976ea1fc18ffbafe739c92dda6618
+90c0b2ed8ed7cd6f6ff812c84ed297b3231f6e2106f2df6d5e4b4bbf5378231025582cf39f35dc9344d9fad3adf04685
+a968386bf1221425cee0d0b926689426fd77e8e8bca5ad3bd07298fbbeef4fc676e0cf7a4f29cf981c682a78a54a2d1e
+a3a46bb7db36e0294b509036a40875850ea5ce4e8853cc0a7d85e8455fc2bd7d5b593879408ef2f3b2b2bfa44aca2276
+af825963207f046b23534896086a3e56247d752982417047f850bf306d0cce285b537508747afc700dff6472fe3b5569
+8022af88981249b5da08ccc19e4ffbc35feb2cb5308b34064de4d5bfc8ff2b933363988c833ec70723e3b5107f8fbd67
+89687fe6e424c7f0d2751e5f7838e9a3fca4c0bca043806fe511442bbf41cb67d01165ecb662b1ece1b2adede5a9537e
+99c925763420fdac4149a02131831449c1df8be4867a6d2d09e6b14abb821d46bc1fc4fc9aacfa4e9de1a93f9b56fbcc
+b819ee6a0724de9c944ce2ca51ffd3f1d93c77ff25e39de8be2a612abe732dddbf2219e839686a4373609a560041291f
+b5eabf12513e91139025f1236c7ec235368eb8586522dce04d370acd3d854c1e6676d92014b60ea3e4e21e9d6f063f2a
+b82e94f1013db6cc682032c7760aca2a1082826d280801aad9c6564704362e61a61cb52c6f35f769bd8ca191e68e0b0a
+95dcb02a676b17f20b75632c7a9060f990e44b0c1fba84ec8e633554f875ebcf6e54caeb9816267e84a11808d68728af
+b0c7c401dcc019d2108eab7e87d6494e06399f6eb4fd95b8ff9ba4a56e549a3d3a4aff13771229f4c456283fc3cbc53c
+b1a8e3e500e3ed74bacf91a82b39f2b870963dec0b98b7d5ccefa3212fc9f3ef923101887572e14d08145aaafa8da5ba
+b2caf72c47870ce9f0524c4b3df6ab3eb3695765c010a27c0f3cda0ee1c1f5bee64e5392ef8b3f0f11e66bd8c9d4630d
+a8fb4864bce5f1c48d681eb37efe7d9ed1a83ed36bdc1f2627539b92c90e100d4dd64ab664e404b0eb7b645a8f95642e
+a1b6164a4f0467444fd56a1f4668c8d1f295f6e6f5191355dcfd004c34153317202823d72162b621f677c970a3f0bfd0
+b2cc59a2f6f3b7e18064720f93b28801fb684d98ee808ec5c04a5235dc40372aa0e0521410d8f736161470443bd97ed7
+b5d9a823649c09151b214406189d75d7f1ca150cc7431d79b7d60348b6d7405014a44bb7840e35f9c0a634b4c6785561
+af6b8229fe035cbd6a5da3a3aad93e7ca5ed233dea5fe4477dce46ed17bac9243ebf25a8439ac2896c41baa671c0fdfc
+b42d9023551d999d2be3ee51f6ca82c3b2d41fce51e1dab52095af6d4b59edcad70a1f9b1e71eddff894e3fe35a1f11c
+b868543c09fa9b9b990b276ddc5b68a2415965d3de71b9ac538c26a6333543a7c33d0b432f57756ac0077d0021878944
+846577a8c877461a58a94c5829f2ed9d7ed107fa63a48ee77a1ef1f1d1f940b2605fc742cb5ef849e3cbfc86942488fc
+967ca22cc8c21382b15d73b4dd4f6f0a0bdb2056c21e3c75eb3d9c13dd41336672ceca03065d8cd1062389afa4726974
+8e0b872d766c439f3f868f18ef0c173896eac883783dcc58917f76d5a2e8c291967a032d254450fa7f9a12fa7d7a4cf9
+a0236eb36a4ce3b7d649ff02de9279d364ecd5059932328230314ecdce3278c42cb836f547bb9da9de0fc96cda2fbc7c
+92eac5a5a88648e6d821d3bb51b280fc106f751d85a1742a6a1ceed071eaaa215a0a0238492ddbefbdcdf2e38e4149fc
+88e1036f9b20a2c4b3534175c93d59c1ade3fa6652a4c5c490f21f6c3340769c7f8147d53a92fbfd84c23d7c4295cdd2
+8b094165ad429a339f12696bc8967ca89ec47a4778f387e42e273a1863a38199dd795d120d198d3cbd93203604c6914c
+8f8013229eb6bc6a8f93c17d3b4a1b206c258f14091c6dc39cb1ec492d403cdf5f696070ef5a6c0ab9ed4ec141b08d73
+81c7ad27bd7a48b444b2be3d4b5d4845743d6ac4857b061e659d7ed48ebacdeac29cabd0cd163f3fe6c5cc28753148cc
+91c8a92749183e3e6f3499d3b0e9b080109d5e88ce8acb03b35f3d04591e13b4c489ae323a149def1edaaf62f93bbbe4
+a6a2d69f012d877460c33095924771065fdcdddc30670ea84576b72dd3f7769f90d1735f8914b6841c7d938a2046ff4d
+a8ad4b976a5e4477a97d48a3cfcce16b358fd3dc1ed1df301fad6d6f0e188782c518796faf1465e52312b47bd713e2d4
+afa2bab9363187473a85f7020106b176903bc3a3e3df1f4938feed5145b79b66db8aa608cdda554166ec47e60fb34b95
+af691bf473160cfb84ea517702f3c01daa6155f31393d807c897b39523448c5af09be581ad713c76aba194f90895cd9e
+b74f3cbc198c9e4b2c7316fffd57fc749e367b7d1cf81b3f5311d266c9a3ab9598075ffb9230dceee230d5f1bbe3f796
+8c28d21c49a15299f7ff3eff7568b8450e6404a168554b8965a291c03fdbbd3dae9ea6b9760869cb1f2e8c7206183195
+a496a0df4e79827cf3bec117b92b5b248dfe129d783841935363362aee4822399974e6c03a92797b3ecde80b207fd7c0
+b39fa07fc8f4be41588ff5560ed68a33c3020bceaf172fd11e0c1288ea885c6dcfb56a151e4773e57d864dce06fdbea0
+990cd050ab056ea447c114217219d9c0c7526803f63952e22ae60a3996608bfa3c6119a56befc597592761e3a90ef448
+b6f02dff3dc330daf82d1edbd4e6964d2e9c38481e74cde8d9d85a9e602ed22c4fe6c9b6f41ec76582f0a4e4414bf300
+84440e4a7146ec2f34e8099e85c09b8d7bf505a15638aa34cd2b42a20f1f335cbc9f0e4fdaf2e53fa0ebb2dcb00519e7
+af389aed116fe58580810fc474eb15518dcd9746f04a7efd2de44c9774824db79f8ce4c4fa108e7396e1fc016132a402
+b202985e01c62d0de1f6807fe600a3b81fd11f30f5aa033b1e7baf7a62f34fa5342d42ad6a6e309560e3e9ebc662920c
+8a07641140db9701c676b2c094c24cd663a5a34d3534fd4f5f1e38ca0c46772d141679730b5d0cd71d056c257d9a125c
+99dc01e76174370a741e8e9ef5654a3a7769a010da85de41dd315b674ba8786e6a697b74a79ea782a1fcf74a48e51775
+93fc897841609670a1eb88d4e4498c54e286e25238309fc95389b16e4edfb82b8ee8447a436893c7180827a996b9a0f7
+8e2dd561acc8954a53635c0108ff964774fe98d12b28a0c6ea8b5ec5ea3523a45b81ec642c1453e3b2a1c0e0749562be
+a95b0b7f9e53720f4b0394bb6ae8222aa5be00a2050f59ccb595d50e0dd9100e397af9ea77b0335be02d1713c361357c
+8e21dcb67da3eaff5b950f989939237e3735a31e346e1bec8e6ca11edff5223e33c1c6f2f79da975de2fd86dea286e1c
+ac02cadeba36143767bdb8cd4e1caf8cb287296b53955f33ed07f771a1fea521fd64b7e153c90d5e270c12ab959cfd24
+af95bca4016b2ddbca61c9c854cf999ed59ab4b5d619dd55460f20cde5ecc86081a2586a7eb37f15c20280dd06b65809
+b7d7c81261e8c6a8983442e1e801f5072bbada1eb2e49b8e90759dcad653c52c0afdff9cbec41bf21cfe832e49ef8db8
+97fe8c6d071dc80355bf2a74c15ecb16c59bc042eff323e999f4fdc39e1209803d32622c642ad25673c84761f0d357bf
+b37da716119c00a0955a7fee59b93185a6e325bc5cb2a7fb35681fca0688d0ad2d25a0e40dfdbec1a11deadb1cc69d47
+afb8091548179fd2a17d95ca47909d97866e4fe54099736e6414682ad083fce300e0a20dfe3a017c1ee4ee7d271bc470
+9306ba1f3f2f74964dfcbcf9b87bafa44b5e013853c46cb501e10409f3c2af7269aa17c8cab261fe82e52a188ce0d18a
+82430e3c25970411f40aa72ef1cda5b2b51bbc7e243a1b4951e92cb56a2f5b200a039f5554d0d1bb44330d89d1ef8840
+aabfccb8f3dfbd4012b9d196448e83f17bd1ddb8c857dbf98e80ffc60c1af3493ac5c70e3a2f1f26352b1ead143dee87
+832cd6dc83380d068c068d815ad0f4677de0ef602890835b8d32b73223490a6f753092d651968cb3d798cbf2a227960d
+80e3e7f0c46fe5d962322f3fb2535de40dc078db80e7ef57923d46b742a8e4d6dd35ef74234f2b1637a317364d57abbf
+9306bcc29d6f8a478ec085b144161850afa29d282cec756d0d3fcce6f4860f4a4b8c8a5952cce54ea893cf84abd6c4fb
+9234c03bebfe6b47aedc7c5452058ca6a8def3c368bdbc9019ef121ad44171d6b31d9bda9c82300b5b396187324684ec
+abc2ec6016ee252f5693558b694eeeddeabf4579b7e03d37504c26ecc29263e455ce8f0158fbfc54135600b72dc54315
+b46fe7b51df64cf46888a810365f891d43db5b34ac4d3505f0692603adef04b1d08eadb3e31d039817e7b89bf0789802
+988e0dd101bba7d7e4094cde99eeeb6d4411341e684fc06ae78d163d30c4b585375a868eda7ba1e5495ee7f0a7d509e1
+94d3033ee1926aef656b31192653d3da96d5c533ac2436d68fcbaebf827475778689ecf14fc53042a523e4652fb9d713
+993b598555bd2a35e9a03f99950d09f55a48ba63f9e0e65802ecb95602d045001f82f25c3bb60221adcb8ab4e2709ba1
+a0acd921ea7db9870716acb595c65a934a5a06a07c6e54cd26efc86c97eadaae1522a4a26c8f93b7b7cbc4746ecfc21d
+8dbd8f492764bee920e0224dbe39d650be6732b56976a5e1b636b2e7371c1509431175b66c6ca879ba8f915f9df8fa36
+a01b24c1e3aa044cd2598032950755763345534f95f6f71d50565d25cbbbdf9c42e35253e35b683f6c3156f5c998ca4d
+b895522dee1ec9c5289e6fec652093519cbbdca7a2936fd1df3ef956eb404f1a24272c9ae6ce58eceeceff36d76d34d5
+b91cea120e200858457a64a60aa876f167b1b88c1dacd9988700b9f0f0d1bd1dfdd8dab56c2e7197a174b7b8bb8422e0
+8406767e4f7cee2e12431b093ce82f633ffc76b451ac8414716fc74fbadff30c52a22869607d5de465d0f4df8a740343
+a2cf431d18b2fa526291c7027d59b18cbd73a9b48d68cfd6e4b745d27774941af809edba06c8534b1864045d6fc1bc20
+ab3fe23aa8c45ab2efb2ca0c593c8644d3f47f748c2f753626289b0b9c761add755e3b52521ef37fd609429b2f8770ff
+af4530dfc5b3f37888900d9fd08554bef4e47c4c09a8c82bb48c4b9c6c9089465f98762d81ba4272b6861121b65f3c5d
+80f61d086511b9b8b2033921336a68adde99cd25fac71d8f8fd0e476dd30cdfba49363784f0d0578c1f648f93ae23f8f
+82ca682cc254952330d1be8c0e53da24aa943ffe0209b00bbf046e1e4f9425886a01d6582e2853137a9c256316e6f737
+ad1d508d2ea2806c351d5bd1098c46ae7ef83f4e49e4e87f83fa2c63f715ec56109996284a541c2005693687b4813623
+9061817ee94bd2895064f4af04777b499a1fedd9688ed64bdba848202c3cf9286b699c92400ed456db926ee23a34f90a
+a8bda55cf6f3f9edb78b43a52b7fe76e5cc2cde21e08487ea597cc266e54700ddcea1a287ec6d8f16b738b67caa27152
+b605576e55d1fa4fd9d7fac2ce549dfe23fd6ade41fa859bf809baa3f1497d078cab06a257ccfd6cd59f67f17eb22f5f
+a92d22ff5b5ec6dbb1d57db1b740521e82b4bef84dec3e130cab63d0641c3a8fec1f6f86141fb1918dc0f3fcfcbd8cb6
+a0165df8dfd7b3cb58883768471cf485b886ece529d5bb78b26acf9ef6c44314cf9f34914233c93b10b1918533dcb8c7
+88b79c9c721c1936fdbe22d68459d1033fdc986d3e52f39341ab06cc85a3f230ecf0965ee8d2dd54496981fd08a02657
+939b77fcd53a523240bee730c2d7b8dae0b32bc3dbbd31428c7b5fdb4c3d34afe7f2a377b2918497574606bc06cac750
+abbf82d0156439761b36a913b661e3d452dfa57e443ddb61613f80e110acf52765139fe3d1dd59c9e7773b262140cb90
+aba28324844cd19b2d5d07a87e6f3180a3c02c7326bca846c1e7a7c131c7ddbefeabbd6787b4e1e910449f3cd1249ed6
+ab2f71af8596c10351f7ce9c3a9bec08a5c7837cee92a7400826284752c98531a0199e2a7f9ba7ccccc8fa0a2207aa43
+a71d5a4f8af3a16ec9c3c110ca2135c68103109d4384a299cb7ed09d96231c90b04ce34ce12de02a40924d84947f7f31
+b9dd79bf3286ea08c9b779910c84fdd02a33dbff7adc2d6612cd58e81aaff3f64ba021f875ea9e1201243ce353510350
+9838fce2f70e7c47dca7239883229c1573ea97d469f120e4af659b18bca31cb68d12220fbd6e4e9e952b28eb29c1e5ee
+8dd341e67e4c567a4ea95252854cfff8a7631c228ac852b33b2ea9211b2a6c606e4b0db28afec61a1a55e6b5f0a6604f
+ae9b02d60441859e3e6f3866a9bab8895f0cd6168f8e84dda7c9b1cd7917f1c454f10aff9a8de39909e36576bc0b4828
+89fba7834469a06cb0da39c39a288245e577fd956c241707c432c2590e18e956e8ea3f67e4bee5a5562377617af53334
+b7ab26d79ee65eb9612e54f41f75e22abd83db45010e1a94ce5026a24675bdf670e806c71f0964a33d6ed277d464732b
+8a25bae10ef86d7e91a7d686965d17fe16ed635d787d4d6ca337b10ea32082938f4354620a72b5aa43ae62c7a0e751b9
+b18fd9213bf3b2d7d191266c7bc1c31f683fc7da7dc5ddb4c600e1ebf5fa80a399af9e31b4ae747581a07ccb736b4b32
+9968346d8a867eb57f628e2ba00f69e9d6aa8e713377a69413323b1b9b26218f527c0e719dcc1027daf10c3392f59733
+831ee266686776eae4e3de1f2bc37761a5e1b918d4bf0bbeeb20b490902ae97722bcb1c98c485407491f248eecb841fd
+b0e949d7c50b852055f38f3542a974bbfe7a33409d67c557d70c1204f87265bd7478e1751251792435fa22097d1762e4
+8b0bee83715e20f2ef832347c926249b5b168e4ad87b2e5a9149ea4e07513e4790f60b1769ddd1816d7126a0f6fdbac3
+84edc35061dbe8f3de90c2f9ace94be5ab4170b66c42583a0643ff776256217bbc6fa31612e68bfb9ab678f8e8e49457
+afb4ca7a4781dd31a7d81ba8a739eb65c43f3374e76b4ffeb2c7048b055f837e6853b14ed2d3224a40dea35799f0e4a4
+9945fd5ecdda5ac952785310e87917126917fd4f504fc5565c236db9b96f9666934766f46a1989c1aa176e543c6e33af
+a6d4466b53c48d7facb9cc33ced1bec98897e545b10586857e896d35c850f2cdda65e19bb934a8c74f6def805b1df4f2
+81e3fe4330948c279d99a8a1a4e4e141a039b3ccb7287aaba6f9041c3a8a41db1a4763fe04a36bdadd3d3295becb9d41
+b6be2ef16b60a78b17991d27463e401eca731129843021e302830c2fd665726547240ec3a3240586b01a05ca8206dba1
+b9d7fe5671b220a3da83bfccdc16c0b6f5e9e5c87810db14f070dfee582fa190a360c62acff13cd877c818d705a8a872
+86867f22bf6b859e7f0ae7724a1174a65c4902cdcf74bdb22415875d72b67f49c62ea8bf9ed0d6883ab76512ebb951f1
+ab728a8167b9e82d608d4939a0712f82843f624d08d4013dfd3de41bc526e9d495cbfd40c443f67ac59dc4b5f30ff217
+a5c4d10a04452c1ad12c18ce8ed7eadea1f3cdb34fa5ce0cbd804f5dd92eae2551b771523e711e8037770cb66d1951e4
+8808f69b975f363bc08f8578729a6e68445138dada78d5818d33fb83a7af6cc6e7030f7b76286829861a4534e0b30248
+a280773d32e1ce3544d3ba5025896d21e358592504737de72ae76d164009fdad05c8a1e5e1f8658ca6374b347d47c29b
+ace91a3971be87b1ca8e737802918d86375088e74380c444751c65978afba2b017cbd8fdcd3f9a0c19c0782b0034a589
+b5445d816d65ea36c9bc6a3d5ec44ce6b76dcc18343d7084567dcf2603d2af93fa8469a1c493e19f1853c96f89621fce
+a238867fce5b09e8695240f936a3f3cb12a715511b7516de995543b2e15aed8860a12754ac8d1c5ca2364e4471a9c5ac
+9467528341f5b93b89c7f37c5dac8bafd0af620230a9f7de3e809f01cf73b8ddf70c38c5023a631a1978ac05ca35c318
+8e5f1c3c411f0939ce4b6a5ced42172fc5c3774f596a114e7c5c8ba433c4efd94ca84affc0bfa89a1c5ace5090276a43
+a6351818f7553d446cbe8d3a318841b0607d1f1890ebf9c6220a092bad3ece9ef8acad4d17935e437377af8f9309606e
+86630d0fb2bc104d8cf840b0e545c0c149c1a8e4dd6d460dd15a52a5935c8ea5c934ef099653d783894a6d1f68414a84
+b357b5d9cc645b645fbce2020db583cdb68772751d6d11d635f1e3ecf995a55bc374be7750b6e8bd4968a55600ca9806
+a9b659b8cacb73a81093eeec42dd7f4fc5d955f9fc543037f31bbcf456af6476f303aaf0ef960a2df88365c2704bb61a
+8b6ff5201c15cffe64bdeb818422fa10dc503ef2a6a4d686364afd0f35b6473e4463719173550d234639f6077e19542d
+98efe45bca5ac679cadc25ad0bdb1f8deffba13d2d7eb14c6149d5addfac06b82fbba6d24b323d615eeee1465b3cc30d
+8c2329c976d78f1d5e30ac34a3fab1f96436947d85f0dd190301a1868e5dcbe4ce60f48fdeffc3e6a05ee34a461d7dd9
+aec012ad25d99ce014101d7da512fe032673399526435f6e1faca4b63759e8f6694a46ad01672da9eaaa4634f61ce89b
+b8d52e530c942c3c7a67bbd0366f4cfdc6a1a075471878516b7a2258aa073eba50a113cf433879a0e15462e82087d17b
+b40c5ce16f94837c86e81d98e2130a9e1dd229da5aea52e79cb42217d3b5908a53d76782cbe3934fa8769db58b00dee8
+877300304eb69720f7cfb4f907b4a7e238920fda129a38516dffcbdaae2e46633d31080590d6df05756781224d532fe8
+973632dc791a5214516c3e59b2b48169470678b7dab66d513e35a0fd1df86b992e27ffe6050a5233af20b5d4998d283c
+a8ae0e723a8ea6e95d721337465a388b60b92b1d9b1deb0b9f59ea30842de356184fd55d9b8331d8a29ef473c1ac2315
+92ed6cca30f76135c4b7e7893c3460501e92592f7d2d6409c1e1d80074120243a5b9ec14d801991204f5ec4f94ff1daa
+a9f575b8518dacdbc5cae766389ab2ec01c876038414b7796f640f633367a5281cb49b48b5e80f6416a33b401c21309a
+b9793588283cfdd47cc4547cecfd987f9f8f92c2b408725f39c1d879199d695e87675fa7e5a190ab3bbc97683a0b9587
+8329a844dd67dfd48546791c4330af65501baf9524ecf8ed4fec9ea87067d0afbd33099052c1c2df819ca1afcf25dfc6
+b908eba1b40edc300b63ff6e20e87b17e6dfe975c37ca63c92e8866968070a2c07204264646bbc9318145fcb90c23555
+8123871ed78f46e9eff4fc7af9f490594fd7c20fb814e505481ac5c7bc7588c1706a79b14b85d29bd7b97d7c82b2ae79
+833ed8928f154fe0a88ae98e5d8c74f816e3ad679c1c4ac1322604093e85ed4b9b9c4361ac188f0da5443c72ee4bf3d4
+b9fcbb8a422bd8d996e713d176b7e63edcc6d73b3d1fe3f2c4b59da637a168accb5fb4d227b709f979742cc0af8c0ea8
+ad3759a6a6bac3047935443347e3c63819905f6c01f58f0ba76aab422d723cee10c769663be9554473e668bffde1d500
+a60c1909703211a93d7b5e8b8ec1cf4ca06ada653c27696a7dc9a2ff75cb712918888c6b61b8f792ce9b413aac09f48d
+91f05985ff17f9ae20498185f6558f9f38b67966876dcc6981af4d179cd055661adc63155f4afa6167ad61b7038ac49f
+95c5add9bab6b9792517772f9f8b21bf7cc325dfd13a43177b0bd982d0f620185d8596c2cba46a5e10aae597129870ce
+ac0b4b6e2b3e417166ad9b17de0b3ba775df6ad3a78ad13a1892c0992735ae54c06b1e6123b0c0bc90544441630c6a1b
+b0135c25f74ae776c241faa6c91a3f7ed6138d19a2100928b7ede64b79e177d92c5cf921dcce3c614e32de34975fa6ca
+b2215b560d5a36f045de7257098e9d75a40122919d4726990b4395eb2bf1ec789cd0c64c46b775f6a8be28f23958e17a
+870dc7f7a513728f2b428a3c08b15a6af88a288824e790f41b1190fbe02b59dce2914a1339f7203cdb7f2f9c98d8d721
+8e3895f03952cdab36f602418cd746bc0b6a07629eab0a20bbd8de6c993030c5287fc146fc45fe97a06c992e0a9ddf02
+a4cea15ebc0dfad9feb3d18168fd33768e8ac69e263263ceffcdfa35e8638711c2971697b7d5b2aaa0fd8c5440f3e164
+8cfaf5369781a59f4117283fd3f290b81816abd3124a9486ab1faf7018d36a73c1630efc4ad648ce462e541827d51975
+82b420eb25736126ef18d91e91ca2ecaea8983b8091df88343e8e54ca5ea7a3da6918c97695cc0cd5c2df95afb1e3cb7
+b3c13923a3d46d990aaa6a1eff3ad32f162ccc5186e16a549dc29ad4d63de6287cd05579452785cab32e2485636d568a
+ad8a43ad6195e08a36f755dd536842ec88a7d920bc302451c860444a3fdaf294e5b5dc5a122423474d322af5de8cd8a1
+ae40d1a90a77965366b5b5ce87d6fe86eb255cc3d127526930d128ef7763455adb82475ebfb7be31f9c512394f2a22fb
+9763bb9459fd4c0de2534767bd99f98b859030b6af5739a7081d889d6875f5c23f0154c30d00b7240baf6450b4459987
+94aace9e9318d79d3c7ab533baca31724bfec839b01187e326b1fdef846968b1b29882f2520a9e237dc41ada01bc3761
+b6084f9e0051be76244ead401e8d2758717e93c4cdac58443261b3603cfee0eaec7d758b2e4357650d2c1f5391edf798
+8c656a798fea470163e70869a13edd30d138bc148460d122a2275df8cb43f2b45a14e0d8a8a49eeb7c1afd02484b6ffe
+8ec317e63df2881f49401eb2f6a82e261b07474006fc293bbb54e0fb7437697b16ec1d6ea101fcd56543bf4d69374cf4
+b27d9b3b8c3cc59d08159c765d24fd4660bd0a54b2b7fa9fa00b47e6770e6e8d3ca353d305fd772c8171e20765c8a66c
+863ca045abc38ceee09c4a21a3dd18f1c0f70c0289437957aaa39ff764760bc422b748bef8ef133ee28d88c46e6be1c3
+b0de194caa68f5288dc365faf9e9ca3c69b0a8376cdb532cd6f1cc3478671a1e755d0e8afbde4e3a88440fd9cff4e8f6
+8a259f48cf5a45773522f3c5f283a6c01a0febdae09f873e009e4635c57fe5060b01243b2e5e1c9d2ff7490f2dd3b334
+8c4398e1e579778c88976ba12feaeac0c96fc97b4e26a133ae74fca1b9c315c1112ce3977d20fbe9ae5866ca6544fdcf
+b54b25aeebf1917bb4981b43f39491918773bacce37e994b74f877d4a636f1b3f4a2f164b858f95259f285ca0c294f24
+a9db33b15331e852da3693f6328bde30b8cdd79c9b9b63107cf78dedcf14da68446c462720b9ffa5a1bfdaa68f5d931e
+9966b6bea54405df1dc4edfde9f8c3ed7c0733d5a73bcd8b349035744d5eabbad0d19801a678d48cec84c0335346af33
+a3d0c32b5e3036c4a4b222c13f7db23924bc2b2f724bd908a38db3b8f9c95cf5034c4cda0c5083c0967d34061a216b57
+92ca6b883b2b20015fbb56cac4c4b5ef22e555a9b75f4f020822fba9167eebff8f9fe5c729c574cfa5ac27bae1a83fdd
+b72b58d6ddf54c2d37bdc1599ac966c54cb4926c8d2f70d1bd4cdc383c6eec5e4b87efc59466682f8db964d80a4b740a
+89ba63ee57a1e6f13d7c66150a8d6721329b385eed92be3ea784eed89c76a1ea88595725612b109a9e4aae41d3f6c972
+8727bb53bb62fb714e4e5de461c6cb298730641e38a0b49b3b3d4a29fa24167c7c6f4ff47f4f3b91e464a581a4181853
+816699bc7c3ed65747d34786b7fca4e35e79907f459f2df0918669adee54a70c03580c4e7d2e410ceb45c71fcadd44e5
+979688c14ce623dd17344e67373e5852bc1d3ea12d37f7b28095e5d578d8c9c646e4b97a3a69a97764ed0a88f62c99c7
+b4539a9eb6578ed3b8dd54cbf57419e99b69c0ae1ca3ae3b4a21f204813b2a78438d6c72f86c13dfa06a0b9244b98688
+a5d957181c30701fe6eabe3e65a53a33dc43df364c45f0c4d882ab88a069024bf04b71015f1c2fbf03f368e63bd82fe9
+b9ce9a54d9b17d4da41ba3135d077c546cf39dc83230506a4ee88cfe39e76f7e35664ff1b571e231054cf1b764b9267f
+ae6bf2eec8046137016ba94442a7a0aaed0924ec1558885135fd339d2996aeff31ac29f1de07e84f7b7391fc5355f429
+85c7c247766a4ca44278be81752f4170dcc069f76992b236b40e71e31e08f30de6a5ecaddc44debe4f94151cdd8d735f
+a19d41fcac394b750248e575c300b9a96dfc5b3dca07ad6e1d68dd3f8ab94d10aaf8edf500e3fc7774e7ee52935f73ea
+b3c959a22fddce5a2e199bc8724e825a6d9776455c033299b5cdc9a9d184be169d807829d5df5e747476d172b5701cca
+916aa7bc58f34bb8f32808858cecd3e90ea26c3ec1f80a40e863ba18fe9af6e67c0b2664a2274eca6d36ed72e59a9341
+864d945b7be551926f747406d72057c7a141110f5d269fb6657cf347cfad7178670dd294f6a98c19dc0943a68d7ed45f
+b3480f8a42ba0e8eb020c2e1c1284a8a9102fa68b43f6eaf28e031621b9f68bc399899e35a1a283fb52530c8574484a3
+a8cd1cb93974d1a6072ed51f356449ac19b04539517cde34bb7b2ba55949d213ee07d387ce7b5534175bd8a044556ff3
+8e81fcc5fa5579f2479011caaa393f47a4e12828e2e82072736d85ba1bf70ffef9fe3b2c22fd11ce8eaeccdfa2579758
+897f935b4542b9ccf8c0660c8fb1a570a8ba108fe8440e17e6c50e01affc2a8597b7f7cde5244c7026013b52c7331b5d
+b9a20f612c74821da05f48d8bcfa7a4a550979e35b49d52031be8bc9cf717fff21db0142b633465c5edafc42b7c73c84
+b88caeb2157d636fe26d3b221143443940427e8722596746bc337679e10ae6e5a9b33c456ac271f8b01db2f5d1b00a62
+b23bbd978725aae647ca2778e801235f605dde17897d4d56914b0d2241eb31f930028904a6555581ad5b2b74ec3c9587
+97a331ffcd02eda1d6e0e15deb110ad6106d3159ea641cfbf424d2e3065bf65c9b14f72a27ff3f576dc51eb068bfb22f
+a9317840cd8f437ea97d80a3f445a99eef463a5e2beba3c986da8fa67def4ae9a0e8d1a675a35e5616ee90986366bb70
+8c26dd7451b12c65351d5ede6a00ac7b9316f9e28be8c692d20709c3b4a5dbc76fb914667a2f1e9a654f8d2850b7dc3a
+8bf4aa18a988f82dfc54668bd4ad5161f276e31567c949b7857cec331c74c6b68849afe852892816c802736cf7c547c4
+836fd166bb9689520cefd6f23905e4c1260f97167b17534930923107fe934d4afb1216e4b89679a564433dc952a77b0c
+94d6a5a4a11f41887eb814acf9b5a031d013d614621642384504eb78e65b6a07c50326632af47b408d8ccf43faf8399a
+a213812713128750bbc5311dc317992bfb5124fa067072891f452880183d64d6fdfac8825552cb809178a3f3a641c9b5
+976d1290308868c5e41dd3766447b29ab8c3b72047a0b7de85d3ee5b1e13d522147a02572cc0d1ed8976d411faff5b9a
+82a4494a95738ebe56578e1e4c0e486eea66d5cc44141f478bfc5a6b3ebbae6f32063725284df81b438603aa564a2b6e
+8a6f4dee79baf71a4a40843437c16b2f304785f3e56b32d9ab2474666fce2c7749c776bd898a65f4a4d542a497cb6d6d
+a04a3484be07c2d60f1a90f9dd8d4170270a808cfdb863864377c2515dd71c152920b65fcd5f47004d27d14d7ee7eaf2
+a984f6633ce3d42c75083ef7732e5d0ea15d91e73cf893be3ebac5e56defb8db97088c5cb3acb661e26bbb354ad91ce8
+a5ab5b4b0dab86706d68c9ad921d4917215c4fbcadc8adacef7309c0c853bc3c2ea34b3868d8f03cda6f504793832594
+88f03e55eb028353b70352dbe91f298ade322951ca115972f1207744254fdd01ccf899aa40ca747da8812dda5bd5f985
+a4bab627f7de273f8085169cf05413bc368c5d9e5f58bf10995a8bbd95e511b1ce15d008405728ae8e8a83621efb56f1
+8ed518d0f225b90fe7f01b0fe4c451589390325044f0d18a8c47bf13e24eae8627feb0c9e9514397536f73f33f67a044
+97c73837e77d965f401b4e4f089ef4de7aed1126bef6be4e9002b2b68014b98997213e492f7aabfd2e47cd0917a11d6a
+a99e8a55ed0385bd279e11a80255b375f2d59bf8b0879bf2337ab5e3be450a2ec05d1bd8867a633e359a02cece4dc1e4
+82a74b5efaf3c217ee2bb56c9b8e76b3eedfc553c73177e59d982f503a5b0572b5cc0d1292820823307eec956c42b28d
+9800ad3e10e8a19d65d5963673c183bd536b65e14ec18dca45e881ff3bc74eac32bef2ef845515ac4fd6caf558a6926b
+a2933c78a67cb40489ffb8096c021ca017b99feda1f9c5d702227d7f0a2ff66a539d68a47ad90ffdfb5c31c774946f87
+947b29715258ca20da5b17a8e3d99665b7e599aa5bcdc5d2d7830a2e3cd78364d51a3d7c0d8bce48a1992b27d1ac4980
+86f2e2d3e160d3ff979ca70c456785b4b2437eb64e58adcb78c4aebc96b470f1b8b999a3ce8ce20e3d3f030d163cd138
+958f4435d35932a91eaad0dc476bfc2761a85f336ad2ca6fe0c6830fe54e8f417434616df9e6f07a9454a4403b00b64d
+8b1755af961e0f9f59651d56b538ea59af489e859a1c93726cee62649da0e304093d62db9a2c5854c8da1be61bde990b
+a5e11042f73f979c8649592f6cd01dafb319344e379a65aa9200d3b636abc569edf822c2bc12b3db5c30b9ee74f2c981
+92ac5584de1adcd38a2ebe361225f224e9b498344521be519faff77f87c1f22fe8e112f9df7cf960b16e358efca0db08
+81db84f05f75a218045d7d5fd4620648bd4a95cf468cbd69787011d615778ba7300b729163e7c8abd1a5b0ea66fffbf7
+ac2f522e9f030a7c576fbe19041f5db3913af58da75b87e8ad64b93bb34850a79b852804dc68ad5e7de66d90878544cb
+ade9763d1c7e9f68b5f817cdfeebf31bb3ec1391dad04576c55fbe4bb13cf0d45abced3d51b5512c73b2d0f403906340
+a0b431bdd9641595fe1eb8d96ba4fe86a447a31ccf36cd2f7d94c5c86a7d96bbc95b204fcfe7c69c1385997b1daea3b1
+b3b093bd8fbd84414609ec9a108507f97d7f77833b93b15439423d2a2928e40b192247c8471cdbc12891d83c765cc6e2
+8531a5ce8e0c44e887ebf4beac65352c8a9673c51b6a1edc439e08bda1354d359e1ab2e27b82636c6dc0daa3aade931a
+b22c2f3a77ae4813a75004dc2c9593cb2a51c430c559bc7d07d83e95592883b99fbd0f9ad24d2d80d86c871cfaad2721
+8b6dc7d5b8cb6bf36352fb19e42aa37647505436e1442eb1f228b0804916d569643102b2282ef66bc9a4442520521dee
+b29a811ab81dba820242a990dc774cd937cd299495cf721cd11971b9f1dd9441ac687dfff0e91656b9764963a56e4625
+805b280e31664008fdd874bc38e870db271027da70fc2246fa82c499742a9a8de1152275e0be61f307dc8f7a918e270c
+929f690538a500d238208930b55caa9c489bfd3476f6be2d385c36df3159dc3d8bdeb24a1ffd7b028ff4d881551e2888
+a92bbf103ad851a41e5230e1e37ec7802e08f4610c0db9706806afc4a247679b9525f9a534c70d970a1acb47fec9bcdb
+b9f2698a39d6d7aa8aca181fc5d95dec796ed6eec002557d4b63369bd90aa4438c27ab90da4f3ce81168cb42f7400070
+b08703bc97292c56833d8e61105f1431c334f98a7946850c6175f37f703ff790d9a1522c0003f08dd111eeb083235073
+9355141cfadf46f37afb73414c8803f9094b06952c9fccb24a1f8c18a13fa7b1197321b19cb832de3f83ebdf8deee53f
+b7c23f7cd8e212108906b7809df90db58d2c2f3a8e1f775274181bd81c74fd7c2f8d68bc7d4aef639ff4e19f86243f98
+92728e009fc3faa08e81c36c268b3ac18627da7618c96c97598b13242286645789c15c99518a07e658d92eb8d2b89c79
+8fbe36d4f2f08cd6245e8999728884c636a264451e4ed894d2116375f3d9eafcaa72ee59cf7923ed8ddacb53cc478761
+a6b2bffd6bf8f54231fabe46ab2c1d014ddaa797d08e5914f13988140bf804019fff3ad07ac2cb31283fc3e74e28d0fb
+886387540b5a7acc8b2bd107124bd17d6515697e09c85c4e932a6421965c872f014d11d1ddf321651e4b3564eed4f252
+8b81f3ebc962e9ecd13a11e919d86ce14dd89d373cffa158b807fc91555a4ec1d7164504fb67edd9599b10fac5e32aa5
+91e3213ded5f82e34389408e95d4f7fcd0f50ecbdef9726a289238e4159c6d3cd2f401479a1f785865e91ca213d2f8b3
+99154b88ca5462f62031300177e571708821348e1027cad4867eebe42a6fe92a58ee1dc21da9031002f1b051351b3785
+b5c2b7cfd87f2f65df07b39f8a26dccb16946fef6b89268b9300c8529d730a1469ba565a480d7c5ae9df8600ac50e90d
+87df32def37370bf8c4c3a22a670bf5605c78f240eccf8dba13bf19c8a3a9d0560f8899259c4e51c6b0fa64d7d1e4c76
+980a20e5cd352786bffeca1b8a31930d8898eff9f4a6b2570829248410bbe1c78105b6a61cce7e3ed1642e5e2af127e9
+b18b8dbb9eda5cf333ea29fad7734235ac9e7234b49fd04f178136b15d97595d5b415a92455a319ab594b81200cb17d5
+b713a71be9bd22ef6a2747d0bc8f4d008cdf6182e287c1e0274689e915a68150d6083268188c1f4a7fc76d21a219ec85
+b86ff129a981359972bb793a81fd422e0b37f89e76fea70da012fad160b9eb7b029ced81c7e34679f6897a45b4e8da4e
+a74a4cb9707156e21caa20b95a2a4b4eae8f773cf679e2073fca2cd3b1e502ef06de8a3c010833d525a7f8bb6bd24601
+b51f06da38a76c2728cd01f6073f402fc49cf4bc5c60113a2700b5bb0ca500e465e541c467013a2804bd7641604bd2d4
+9855dd73307d8671b6f9ebcf676de3ab7e37e7ac1544447c7ff34a213da46123b57ce23bb0f381da8fdefbcbe6c35645
+8fb382c63f4c935462d013a0d3e2321d72fb4781c10afe6e31ac51766832218a05addc6dbb1f644aa61b5da9bccfd5ae
+855dcff23e0ebbaa3562fd27c43957cfb35d492837aa71f27cfd1bf65a59a12d2beded9d09f3ddb4f801aca8cc34d2af
+b7e7b317f10cdd13bc879c2fb0bfcd137af23e0cb70917e48d53b2bcf8c157ed7e5f58cdb966383ece9d3a4c92012746
+80d2f84c39422afcb449aa68b34fa9d72e9de79a473c3ea5897f6f3576d2bb6fa2d49f0b44aebe5e68b11e85e066e028
+a35b083749f8a5551f0dcf529e845aee189cdcc6ba779f4e88765adc49cc4779cdc2290598908ccedd8dccfdce29d53f
+a30c412f4bbc2de80fe5c577b4f94442255cb3061a40649b0ee5357977503c6fe54821ecc8cc92d5056b6977c4695e70
+a2ed0d90ab612fa3526f7450a43d45a2d9e886f2e5888ccb8405adeb8ca3e41c6a94d18a54b3cb1eab5b8f3851841ebf
+8d4dd3f8f8a3d69bb217d338e757c814eb69e6a776f55cf51fa7c1b2f1ce5f8e9bce8353dd335e793d68eef676cf7c36
+880d1ca33d5d3bb47b788a7ec64b9130752610816facec99af53b6e58a7e414616e9c815b1bad870d426380085f6b5cd
+a287578293da4354f2c3c46d637aa77b91526f9618799dec4bc602305ffd8336d373786eb67eef01dbaab88f07f292c6
+a86d3fad257a64c84954a7530822346da0215ebf4ad9c583f35cdbe16a02fd70d58ab34c93681fbf55d6075db6425cbc
+a7bd884d343a6bde5f6c2512d81ba701fae7afa6389389e4776eacc0698a54c3ab1a0e1652c1a7a23d3a1d2a63cde8c6
+8e0653c8b7279d5c958ab1b53dd77b73fd30d9781630a870d0a75681d38cde4fb7c2183b9c5758596ac556578b43fef3
+b76a00c6f5093e7b28703df85bf968dffb70c455c91e75cc81189598df052244f7549d18e45dc70d98d3d86e0094ab2a
+b270f2ad3dbc8b43ee2603c4e641be76820f07a4757cfa96be2be9c310b7e39b574572103253594a51fa9243298cbd94
+977b8b86841ab8be7d1d50da7369e2bf71f24360aab8448d7748d59e010ce81bfe79530ee6f6644b987fc0d83df3ed15
+8e18bc59841b7d56f8d9eff8818eee06288cd6ca86200eee7b5e6b230070debaf254a2198b4cd7dfbda8a1d55a916c8f
+8e7a328ada969ed6289972b7f43eb5958d23688603ee6d118b6ccd8978378dce2d733ff64c30519b19007a78340fafa9
+98a0fea70a219292584c69546d6d242cebb2f1d84f69c5aa275a257a87de652e721078b983ed67410e3a5eb0cfbb2bdb
+a09fbecfd05772a9989008281a9585accba3850831485802f042413da533b1c7ee45a8cc679804340bd9142b2f9e0069
+99890a6b273a2787fcfdd8e8500134efd60df99410e8432664a3e5325e55e78942f4bb11024c90e4c3618a70729a277b
+a5f3eb1617a77f2d5c76bbd1bc3546ad1628be90fafa9a8b62c605d04e599ab2eb74b25afe0e68fd020daf4868dadcfb
+8b53517d93f42b833f7669c131dc67f14c3b0639c46d3b02bfdb24cc9e642133e0c665236a7ba851c100ca733d673341
+849fd288217bdb154213e79abe1a78672903e15429e37f6846019986e1cc8dd2b3ed28e4cb52dee1762a4dddb9ca95de
+954d839198c3dd2ea1ffddf98050e2c52ee81b89f38d967bd30c6863672e43bfc32e1030bb12f5aa424983bfa31dbf5b
+b52fe86414a98d0896d7a427d57739da35cac4ee24be565956d15a5c1cf5b4b95e5425dd2607fb9f6d6024549b59a4ec
+9586070415a6bf1e11304d2819330eda88e81a88b9347aa866692c163e1af772be9fb747d9281d7aabaf5c9934596934
+a5b78e5bea362df26a89df682df61287763ca1b87ab9618609c99e52e6ba047fba7ec828c0552ee26279aa8a48751334
+aabf36b9dd465ae03551dc82bed9cbf1d22a2236ded28964334f7ad474f317f4fb8515b853354bc06181fc9af82714a4
+910f0b2efc608cae8cdd39df7a5ef9e570592b31df2331baa7721708057188ae96e1b43e2f2f2c8cb360b961d687b60f
+a5c5b131205c21ca68d6103f8499279621da337a743e4a08547c3b4507d52d2d6e5014fa5d920b351a6f53a195687766
+a6898dac2d8748b8bae155a7d8c169e7eded73cace1e382c4dae8633f19463151399c5cf877f8ba344a698a98228864e
+92919d8be671b4f490efb49bae145f419c84a1e81d3ef78761fa326f67d749ff3530f5de04f984a018065f42e852e1e3
+81083de978e025f0b5995550fa17915d02489344cabf8a79248352d78dd6e893d28a5c5204a65a8873756a34ee3c0120
+a6de92ecef84d188cefe29a03b564b1e7bef2a6afd785b58897f7f97a958573a35aa0767bef12a49b352de30b4f0dc18
+985cb3475c7a9f582c11784cf61a1988240d74e49084a4c0f55f3f6068c4da0b08b136f8fa62e9001e0a265bf65fa3d4
+97e6d360b504991d51119a78c5b647f25d5fcc1298631209d82c2ca40ead0380835fe3cbf8b82148b0b01b8157e884e8
+b313df44b2c47126b58064599a0dd6ea49e5ace9ffa663de03ad30c1e95301cc68eed67d37ae6238469e45124c59bd39
+8a58f70545db2242cbdbb12492cc11ec4d2b2ab0ed8450d21ceb573558d7bda91ab03c98736e13d041bcab84fd8248b9
+9077880ac352a5ab0e5e15ac89b14d173cda0b41b6f7fa66bb357195f10cfcf491fad6bdb49d71cc20d99cc6c8e28d04
+a09b2930fb3b1a60af8c5214e8c3f6deecb3fd3d0a5662f3885948f48d1836b5ad3dc74affc54dbeb5b522b90a17dc4d
+9163bd2e5f58fb1d81007422b91147685542fb1c7e2c8421af284c7cbfdcd2d2b399a37123b58a2a349f27b31bfa47ab
+8a3d859f141457f9d63818634f81deb5c858ac48bfbf2e1da21f4f0dcd66b3e1d2d8fe99c4cad38206b1e15dad94934d
+86d3fec476b59782d0477ff333fa79922fb9fe3d6d6b6c5be9da9e88b006b46b2a0f8f86ba4159c5085e66e32fba67a3
+8041cd57335bcdddd37651de2c3e92edc600ac23041d0e383baf55651b1b0960b6a601491608307160f0d7d48ce395f9
+805c284059f8c03b2bf006b1af95ef726874c5548e93ea965b402931f42b189f9f674b6b52ff09df35320085172973c5
+8acf781a0b40cc56b1013cc1fc3bc43036545ce35591f3b905543c09cb1ac1a70a074202b6d5ce3680be913200c58879
+ae670c448996156c80d063f1dfb03d7770201a35c71cf8e70b38d52dcb5e2bf73d5286d63ba2f561525d62cd67d43125
+b0fcd0150fc0005ca438d6b0fdd6a70b121d35ecd74e62bc119bb0187cdf6bf674ce9fe01eeac5d46a68ff4d4210ad09
+b752c6850985ab13a057028887bc84674697c012e9da0265dd5ce1e48f0aeddce5e07e3e7cb68ae17a648cd1207eef19
+a6a5c71915a980fd0225847b45e2e9f3731c6b2a627cefb1e2c6a0cd7f1d0555dd32b6b601a7ae9cfc4b9d06a56a578a
+b7d96f59a988a7a810c25018f7f85cd6e81b335a84504ec76c97d7257f9cbfe88215ec89553f0dbf39507d990b3a7f84
+a7cea7b3ba43cf6ecc488c34511b17fc7b97150b2d265785c09c676ad3123b322db32e043c5961384ed6d90d20c63061
+809dc467b304e9bda732cd92b15c0f9b363cc707432788971508b8d60844911ed4edfca96d8cc20b9874f1e38a2d1685
+a5b6a089e022fe460d62c4c5228e1381902c9a796ad92c03211c855541a7fe27c5a39d9123b001b0b892ffdf0a1fa065
+95d67a21154a49bcdc79ed5f2773b651c81fba1ad82bd373239f09a67a50371a147310623fcbc1211ac57aa154e8b300
+a4a4f0ca8073407575dfd5d04ebf76f8bb467598824f2ce7fa74756803d9645d63c9eb3ed39aa202dabafa4ff0a0bf34
+8a77374f6e449d94a443f2d4593a0c3e4925527e0653e873dc20756396a9a4e5696fe44fc1b49e456711259deeb3f037
+82585a825011d6eefa85cd530685b103862aa0777510d22942d8f77a0a7f489f5d10e5b36ee38f66cc96dc57d13f5893
+98e24625c31d5d97c789eacb91c3d51cc6edb38cedcc474deee459f55de557c42e4d0754ca4ce472d0123638eeafb55b
+ad4351c76d96c35ee37362f2384ffb809bf6a47213863330aeac1ff9be2c6cc7275f0f974e46bfb716a89ce1bdbd0710
+afc8f5af4f9c38ae672d20e7bc3796aba23a41eb033619b4c0a06e07884e1e0c7a7326f069068dd22e69fa5f672efece
+983d5af05af31f9082f381378fca3526f88309bbe51d0cea5860813bb0fcf6b32a3be110336bd728952dcd6ff8a26361
+ad3b55b67b64b188447a1fb10d027bf7f86ce0a0fac966d709e8b6ccdbb7333964045f0c4719c45c36b7f3c9ff73944b
+b410fde230d8dd24b9f1bdbce8338b05110b130591913f23a34c5fd092cdd3f747c383f6967cdb529ade1a264a3ece39
+b3e4f0a046f93c332be07058db00c5182a498987759315bcc3a58d9334e09a59333031c3144b59d03596925703491cd6
+b77e58619c8c471531d9b2e5dce8f82bb8794223bc9459599a911440e64e0b5be1d37e289807733ddbc2858bded1c34c
+b450945bc3e290df96a196083a45aa929ee080bf45112e678eac0a939db2ba67334ef782c855b9b354caccd94b3babb4
+9794d81e968770a6e12add60b32ccbbe80cb2680b157d125461cc3db998691e836d98cb3b3cfff4f156b2800d426b955
+98d1284b4c035e93b4ea0431884d91d5a7855ac6c5b1ea2a994e653cf77f0ac1a771dc75899bd1485066da17e40ee341
+b1da89b14efc14d15b2bc967ffab85c41dc447b6a7922b619b5d5b06dcda725bc4530959b70355ee20eee7c1802601b9
+b8e50ae98515dbd9ccaf27192e58a5c34def86b1d0d181e63e64439107c30254267969f6069e0b863c254440c3480de3
+915f0c7dc95f630bf1114b02e7d9936b0911a69c932950ecb7f800cb1aa1a4e1f1b6bef6ff4a23301cfd904c39025863
+85392fe0edd316031c69d90b106b6685bed56a0d8d814db2cd5d77d07b18fadb632694a214a176ef60aa0f82ea14b00e
+ae4cdff23859b7570179586549165c728de4ca254a5da29668cfda259d43a387b3caea8537888d43f713d458da6bd4e8
+aa0b6a3e0555d64a5cd1201fdff7ba7ff3019e9ada1d86c90c626a710df3d97d2ed62d2b63e5632963e09cfbedf83732
+add726d97dcff922dfd748eb897e540a2b4b8bdbb4eac1feb74717bf086b1760a957f83586a57b5345bf4c73d791ab9e
+9721889b6fd55cf9a914e5aeefdfbfb94d379c6312001ba50ec4bb1dcd03f95fdb45041330da8871cf3dc3c6a6b5e330
+8eb9417573ec6af24a610da5260639efcdfc802a95aba8efa829dd70ff179dec061da9facac95b6af02cba6a8646f7bb
+a477ad7d2885e1f081556a98b3904cd75a4ac7a8c27fb0ccf15d117feca59f891a677fb4ff4fbf38203055a9436ebd1d
+95b3b2ff92e8a0bace130d165984966637a74280d0e056cebdefa6f825b1d55c9bc6e13cc8f263e657dba3dc7fa68627
+b096fc33c038b425a7a922a4274d01eb366a488fc969497a575587ada74b9452a607992aa2d8b9de66705fe20b4abb39
+a813ef1053ea6ae8a37f4da722f16b6ad0213b0ec7829998362292aef68c28357ee27a406b567a629592447db8ea6085
+84248425c3201ed389fa1b64b9e1d151b5a6f5fcb8f5e28ebd665db57156ecf9b2fa77bca857200df9f54383b7c5eae5
+86d0a3c7fa1e64111115469ed0373dc3dbd448e1098250e9e8c5c7e775fd1f267d49b4123c347af07a28e686d5f357fa
+8340b2ef4fc2afab3a3d51b6c0361cef4aec3d5e1d0f779f9fcb258711cb79ba4083508644e2bd182fb25b21523557c1
+b840749c259b5af5874750853b4de6f4d7a274e18fb77f774f5f454c82efc5979a431e28bc8e43bb831715c7fda96db4
+b168d333cf20b053c1b2a915c3485200a7590c3c3661507990390800fb95d3772ec6815d53aec5e2964eaec19833e787
+8f1bb538dd5005384f38f88cd2588228aeb0c6313aede14ccc12affa9715cdb938ed4573c391572f0a7ba6e33a1ace89
+ae4a8ec2eb938eec00e6608c087471128b14a773d75a99634671f6fed95f7b24b14f04b3271d1c32faff7f0f2d98547c
+a4ad66552924a6831b657f8b318f303225b2cf29b09790a48285b028bb1420c56dfa2ca0df2e823f694e8e3b27952a01
+8af4eed962eeff534234d7c34f1033c68e8cf798c99880a67eabf38b533570a3776399b883f8658265cd14277b060790
+ab2c6406132413cba89a951d919bbe123fe4f220364ec2282d8ee0c140ad8d48ded0df7ab56f8f18ec7526ea2f1cbbd4
+9154df8800e26020155b98f630e640be97a3ac41b182fcdbcf31a3e4f233810e34e224c97df8ef0f39ccca29a9921fb5
+8f306dfc5b8376a88a104cdf67eab54f93e478ca09036eb780050ba2e8112b400bcc09d49665ab37d21b5a2d8440b3c8
+b768260e94bbabaa527b2af8be423577cec3bf4aec3c569a4fb69e1fb997a2157c59f1169065d24a8aa3625d89d988fd
+af06139ca7d240f2495314d941890c078d504b2bc09d98a6156c373de29781e7581f33adfc738650cad0da3f6e07af88
+849a6e458ab2f4101167cbf75bf47ec1f9e481f556b1b9d297a6b4737584011d7881695bbf3ba31e3e4180696fff6407
+b107e7aff27aa19a4a92d1a65679bf40e85ac6f08d4e5f14859d97c170ceb431858fa4c46d00131527c605164b5f7bfd
+a00666055e18f34ce02e8b67b6f181327ec0a11547c0795bee61802aabef9a3a76ea138b905cebcff9c4c86391763e6c
+a65cd8dec5166949696dcccf031c300895c5fdd53709a1897c61d795dc22bae2f7717e7ae52a9950f9d00471ba6257e7
+8b49aeac3550ef28b5de37576a5d4e2e43bcce82de09f491984171251e26c27fd0a884daa6f3d30dda107dde4544b34f
+91666b88be09799c7de9a5d9a9d4c1bc1b6fbc44c664adb15a2eb27229be910226514c2ce22818fd38b850c89291a7fb
+85abf4084c735b20333b1c2145571b793f96188850bae161160b47dea7c48b0f588adcbe9cf80e05d17851cfe3400f1d
+aedaee73c52d71d7ac3854fa41199615ecf49cb0c35d8203f95175d1ddf565499a8e9cb8d31d89e7cd9cb75a9fb56f9d
+9413589f0746d3b81e2f88b280e354fbd63ac164369dec353e6259a2c4acc6bbcc10f2a851901f39f90da7e523d77848
+826121abbcefe3ad431c713a1a2cef336a0f06f69980a14d0a8adae5640e9aeebf4eb82be4621165ba32ce5e16de4880
+adbff68221279985891e9f3fdb7b1dc71db3e20213b7c8e1931e6f75c6f02e7a1f6f05ec0687885de55ac85440f372ae
+99ce8b064f874cf028e85281bbfa43145893f80a8b12813d047bedbf88699266652de6ae9e4ef9ce575e67065854fdb4
+a809a71a663b0a9719c0327d33215b63c6ebb12da3477da8534d7e8f79fb81e06adfdad79686e40efb2c75abde559a34
+b26c4cd057118f9b12c9b86e77d370b3fdbf2654a5d80a7763ae98c68cc2769a7cb293ea89b3a08250c2f699b8d76e22
+867c56da9a2ed672f47924cce82c9d7e801d6a1fd18cdfdbbe07c82091c70ba0ebc6008b0b9d505632a97aa23c45b8c2
+8cf14633888f2ba0b02fc8ca7536f39fa290678c7e0840c58c53a9d2fe10628be343a86acd74b2fc01b0c03af0996f59
+86696802e4f27928dd6b0287d0188f8067283496d154060383c5ee295a468df32a2e8e24648d93ba868120ac429b68cc
+b15439762d0f7b6c98e6946b3c0a7ea0521845fc68b47fe9c673194d81a6cb375c79b0122e81a027f21a7fa4cd6bbf56
+b1bc19c9a3756098c02bfe36429c0f0d8166a5c9274edc7f80ce65ae7d6c67864a457f19cfde6924d204b81f2a195fe6
+997f1cc78d707f29e3eea0952b5514b34c2cf0720f33a3244cc466df62b13031bea13df2296270eed42b3667c53d6c26
+94f599c9995caffc9b47543b822dd8f84f921fe2a31e82d5d0fc79dd93a4da0b87a0906b82fe7c2a8c23c7829c21dc2d
+a7fc8a6ed802660bcc07d3ca454c415da18d798719dc2688eeafeb8971910377ce909de68721fd97c4d9fe439f37a8d7
+ab16f93e6df2464018be01fe040fea08c67e0b032fe1950fa37c7593c8ecbca24dcf0fdb9e1209d5b0def622f3f6e92d
+aeaf19b49843e3fac538075dccbb29a63d55d12f8c4150185b1ae62de778c983632542eb495808ba629cd4cbd629e07e
+85614d537efaee823452d0427ea3a2f7d5a3c988b10cf7adef8715becaa519a9b5174b63e401946362176dc0d65667d4
+aa08d8365e78efc1919cbbe562be7b28c57eb05c36e8da89378cfcad9f21e134eed923559530aa3f62bec758b00c70ff
+b4c2760454170276885d66f03e9fc4e6a4254547b04fea3c233c11dfbf71ab05dd755b9697b442ec419aca000152f2a8
+b814059b189c0ed46f9dab604fca25d881a12fdfaf834a75cc2c0e1d8454ce0ed9f2a79b34bc5e27004903a48c6ace90
+847707b0aeb4fe91c12ea8570cf0d16caece8946951360433c8a375a69fa4c01136172ff2acab6d5164ff6d3b5340858
+a7a9304ecc5ff6fdaaba6e774556bcd7c5dfe8ee7580a677301dece55c6a8564e7c64b60fc4efe89ff73954f3c3f5b0f
+a1a86fc5648edd58cc7eb61cc30c62edb5314caca5551ffedf088fc9c1b92ec5b487f670c5bcd2127067e8fd5faff03c
+9086a31715283fd525034d59d4ba3465d6c30059b967b1eeb7d537f3bf8caf6879481ada2849167e997212f3300f8ff3
+99c11903cebf722e1cfd63a46b0ae93312439ff2f014b6653fc61927ba430c432b4955b30b7f078c340f5aad4ae24313
+934b7a8b7bcf0108ed31d35a645d73f661c064a6fc6a5d1ad417ccf1b8864623b0cfb54707f10baa86643afb5c5ec980
+89d5a69ae8cc18ad77995ae92d30236d5a5ef00cc63274e318d18abcf9d936453d18a8e6392b52d2d66b51c18d904d6f
+ad2448cea1948f0a4915ab054273bdae33a08c494203d11f46888f852d0abefa310b50367c80cacfb602cbc249b31a71
+807274fbe6f08c332a5d2e2ae12cfabccfb53511b8d83bdc875856cf15ab52c2d01cf706c9be428307ea62fbfd67f87a
+b2f4fee9f32c0ea7fae306605b62d983b130e4d423e2de286bf9f4343b79e5c4545214250cd1348402d8278140c61c00
+8a36f79ab3ee0063098a39382061ec3e1234e67087b9519d0b762aa9cad54a7e0bd5d24e2b0a57a690993e3182f3e83c
+86668e6743a7b6d1ee62e70e6031fc8639ecffed38afdb1afb41d64ec402a308fe0438a22387d9b0c130ed301c39acb4
+b816309d1730cb39b1ab00c5333c6962fd5f5d8b22f3c3ba987b1e0a0065334d206141dcf0e68eba717a4eea533aa6f0
+8754e190b8f751aaf9f8e7076d21bd31db8d9ebbee6b26517b190f624b3a892050312cee9d73cf3d7245446c6a376437
+87826589ac28f442c608faeaf3d63ff057af7724f9d412d1f2cce8c58fad0adde325aa496c6e4e8441775c02d8a74c2c
+af30e5e32fcb17226edc54030f1eff8af619c207cd9e42a2ded7f15cd29fe52f140901f0925ebe4e997b56f34d3f406a
+a62a4e5b6591d336744481a0797eb23ccd0f580d04cfacbb3e415ae3f273761042b8901b0312f93a6eafc42a50f81cc6
+968a9ccc95e8c124f4475c348a33ad2a52a42e191a93bab3d7f0d211df999aa081efa935391a8289cdc4a5a8f7433822
+93350cd99ab7d3e51756eb01c89172cb406c1debd3f0001d2fa8a01018be5609d73df671e1ff43e612ddbfe7076d9ecb
+8df26dbc565ea7e758ce4c2656b65c1f0396761c9360d7092d12c121d3bc1c293ed28d82f1057f4eb5375b15443e9258
+80a0dc22fb4a12b06cf05ce39f76537eb3db9691ca466ca89b2585237c03d13fe3fcd311ce2b3dbd1b7382044b803782
+818b79cab08e11dff3d55bb0f55333f6340c5b462609d43334c14fd878b0f310b77c542c74d3674a94c692de704e88a9
+ad1bda19b1bc3f6d757fe4d189ca82bdcd0a9c1ef509c43e3f49700f84be33bb9b8b8e70f7a09bc6bc00a78cad0cf9e0
+a22ab44c676ba2b3889341fb137dfa14cfc5491ce4c3c1fbe2cb7103fdf720ff2b77806a40109dea9a68d8f072e1c167
+8eba6af1659b6145676d3663b04ebe58c199a1c24837ac4969793f07ed97165d20bb0410421e561cb9283faafd9eb51c
+81b216cf08a29dfc3e16b2865e712e15f494b914cb24526a96799a3078f200a3fd403767119732ca4de07203b479ce8c
+a023ac601c8e0c22553068ce4a7b8361b0b37bef5705fa68a71c3cfa80510041cef3640bec2cdb4f317904521e99443e
+aaaab84c8aea75303fec31694114b3ee10fc1a67357cdd675ac9d0e33c3279e3117d389e9ab017882d517131b14e6088
+8bf9a44b3df3d7e0c776e7ea5eb76f16f1870960f32e7c5b63aee9b432a0adeebbd378c574ed60e15a3abadb409376f4
+a93faee621d930f336f4fd952954ffcbdb261c9dcc4e60cb848362223374010c555a73c0563e7933d1596b0526bf75cb
+88753d0e35e87f7572f2012a40bb757364af5cf6e5dc0dfd16d082e698d3fedfab3c671bd58edbf11cedca247e9fa55a
+b7de5f03681634991d2aa8a0ffdafd223b1a0d1ff70fbd9c00d03f228c6772d93c388c02045461d51326483af97bca37
+81f96d4fbef3cf00da423a1c48ab8acc222016c21f6be3df778342c1d1aa1a420faa8ce906bfcdf955be045efa4b447e
+8dc75ec37122afaf0aafdbea333291ebb735792b4d5934fd16bf28b536fa759dd851e1de448c3efac3d2b0097e0b349c
+9186f66655fc1c551d0233b761c6982a3b8539085ca9a2baebb826091e179026b90f7ba6a825f38c6a09b190a31bace1
+a1cf319c9ed31ffdb2108b684bc21cb495e77c853e6c502e03f2ea08e88a0c2b4e31958004d9879242df420b628acd8f
+b3d3e5a75c34640bb2fbc7b62f8aced8dcb4b9b165992717fdffdf765bfc81fb4e67f3e737e6f70f24d3c24812ec0ed2
+86ee6ce0480f73cc89ce7959b4af52351317cb6406cc368e889472ee5567e8a98560dc1f13b87442c9a8c5d6b31fc446
+9478256948d960e3148acec3487da232fc2ae6818ac2c6eba491adf130c55badfe83f9a519379fc5ed0b63366de86a02
+898a8130718ac6f98ef673fa8b725af6012ef28be3f2320359a5c2c40e479969e5926f1864624ebec10f27594b24f618
+906f45d4ec3f647d0c49deb95884629a04fa65cf91a075bcde67940634cdc98f76fea8717fc1e714ecebb337e9fd6998
+874c5a55bca05fe52a5d1743b8254b642431b720eaa74f73b0faacff2225f448ef94e12585b2d3bcf12c140ee3e81510
+96f76cf34b14263a30df2135131dea00074f2ee853677b94fc32e04cd9872424dd93b32c55026b89c18bdb4e58bfd19d
+b62e2ebd543f3e9a11b72f45275cadf77b1033713625c7374c4d2284d63acaeb64977fd2fdc90145066146c311a68737
+b1759d3b667af9f15da8d4e77440fba4193d0db159a0bf73df32215b2d292bfed7cbaf41c07c7a94ae1f04bab23cefb6
+88423607f005af97b5f8131bdb1fd6d7cdfc4c2da4a4a14bb818b3ecf50c2ae6d3b8cf55e23632354537f5c0dcb0f48a
+8ba63acf22ffc1576935467af19f555a0c27a4b56e5bf752163038f0010fbdbff8a2131124f4cf36a326dfc188740e77
+8b1996a0cdac9c6d896111671ac4dfa84a3a3738c43db6d6788f1a7b8ccd6df16a31606db00cf0107eedab28af05cd7c
+912a604a97457a6b46d48731fb44dbaca26e7cc70a4628dcf553b43a9efddc4e5fb040a1b89e31902888a7cbbf709333
+86eaf5b2fa873bb56b94eb7fc823527ae50364c1bce87e36fc13de149f1fc937af858a25cc477277dc6eddbf9efd5480
+a0169e6e915e7216b83b00b31eeda207a02c9db6825b5ea44134368eae5bd009b7c95005c621e0d258c33c59085cb66c
+8c8ac664946b5e69b4e34ffaa486b745ac8afc8ac702e4a4cc36c59f420a81b31ebf8b875b1f572dad8e4ef1f547a1af
+aa6fd75ca832fe60eda078fc81a1a529364cfa8a4b4fac071d89e33cdbafa7d88ff3df611720b48e6fcdca2e3eeea0da
+8d30857ada34991ce6faa82b4326bc353691ca32aa25511cf3d52cebefb262d6db8d93521020a2d11b3ea085287ad54d
+b78bd8ea8bd6a2fd5741228502b9777177039ac8f033071c82ae11fed7f0a51d8bc64fa9aee44df25eb4b3822d571144
+90904aeb1a99c4818ef21498a583848f4d1ee9253d70c10b03ed7d669b587f8712fd26d4409f00fafc3e26b5d72b4c5e
+87cc8ebf78ff2ad752843792e11aeddbfdc628e03e13e0db598e08b496313f463f481f3a17ec889a3acfd128fb89aa81
+b4fd122c4830f339fc019da6372286d3a0565ac04d4f5ac4f28b2c066ed507316e1b7beb7b552f60060825977a2db9c5
+86e709d48d03738ca97d6140f13effa03137570c43ef00469eb0310909f66061d9fb933fbcf30bf04f13839e36d45a4d
+b4a595cdd219aff5b8d0f80b679e58d9a7ab9cc389b47784484704e7d2c5249981b2b86be4c37ccb11b9afbcc8070214
+97c6bf26c8b28b982b7a56ff867b2f5785b37260b90e0ae680920f368478a3c88f4a47bc394c07bbe88fa1aa1776f255
+aa48418728684c9a10992d1851b69e54529dbc3548fe46721758ac6b33f82254d56738b351d146268fcc56a9b7f05df5
+962a282caf6f08a63aaaf7ed2146dd61d527144f3fdacf1beef36b34356df50302330598b8602f1447f6beb4439a1048
+b55d325499ce03c9b1c35e6aea30622841aff2a2c225276d677338579ce83177c0d64d78e7d11eac657a30648ef702c3
+8a91b9296e5633b3b9144f61e5436654cffaf04623a864ccbcdd21c8f981618a908e890f61c74df19ce5b6995bc358c2
+a7b6b32333377df24c0b0194393a1487a72a8783e06b1cd00ce6bc39337b34ff58ace57c8dee5b7f0ea2c9a54048a61f
+97db4494e4208c9f297b484cb8159e8f600c61a44e1d878b07d29f0406fd32a0c12ebccd42ee7ac4c0bf33ff54a582e8
+8697bc039265f7b6e73c133823dcac9041d18634c68fe16412b4af41286a4164dc86f7e71ab7a493223a84e185cb6f1b
+b18a66cf37f93ca0189201811e7de02ee029445132f0fd4209e5efbcef46ba6a28aaaee42b30cc7e97a25b08f4bbb43d
+8b69f189f3cfc34cc3968a07e13d1cab0f5c7e093027a9fac38504acdf12e2defced4261a686a2fc850336187e017957
+96afba402124d9ff7048200acf329ccb4e35dabcd609e62d04d25140729e110a674849037e4b8aedfc99c889b132cfab
+b75a809fa3b1c17139962bc22ddfce47d38d017d585a4e76ae1eb8f02849551ff7bdae178cb4546067bbab45b7041ddd
+89196f1fe0869f2fd18f5c01118853503d71c4073aed8bd9cfaf694ca4a9e87974a9ad6e37449bafd391a2045ef5cd2b
+ae52921b5d8eb5df7d4923aed1afb125cb98aa6606f8cbc2129cfee56ba3cdb7225a30d98ca9271cca67fe39c763d508
+99f1cfd27833fb64905f8678a532aa984329b2369ade3860025ad334131a9550214297bb2f7d3569eed7a9cc558a5922
+a77fabcb76e8c6ac2a5196666e0c75c7f6c73fd8a0a5fca32a454a9457870689c83f5821f90f28dfd91abc3bc62ee761
+92a4b97b7c14ec14c74e06363b0ab2e263d0d7d84125e2cfbf659bbee996a4d8561992e19789e507f4c24e5afbb91b2d
+a2387e7857600a93de57faa0484650289c7553b9ae5fb001d011f43e5bf31c010c9c8b5bb82e7000465b546236e79066
+8641b6f2dbe9f0b83e0a7ad8098b0836af158fa2ee6ff1bcdf3e2ac8b3d25d2e5a24d515e9d549feab4e82b49e468fa3
+937306770a47ab2d5d2eec4bd6d9b3a8ffbb8c8067504571609a7e7a85c665b34ad2662701b67858e01530907172768f
+b6b1b89f261e56b0cee15e2f5284c76789db26a6ca4762500745e260bda40b00b65add4826be6131775202c8c6c4247d
+b1caac20a1b2aeaf287d38d42987e2c381e74495d9e880eda3ff59821d5974d01c7e3c611f4773a13ff41bef0f2ad44c
+81ef049b849d7b0a732579299a86f1cfeb85f27ecee4280066dedf6024159fd47f311f1ebc46b58f63f71735a05480c9
+b3b6b657e64fc154eb33b6056b8279ef736839b56f2c8f8ca438cdaceeb5398b8d3625676cd393c196f664d7baa3a615
+a450678001e8db1ebd8fbd5c808c99945bb3549e834a346cdff316ef8d3b49b818cf9642e5b8097181cf40583ce901b0
+af3edcbfae3c8f368958cd11c95df4682ed10f894f770783e967fac1eed533ac427c1d4eee51f968ffdef080593ca262
+8348eee6ec1102884929736d6768477029961c3d6d09e9ebf84d2fbe55c0501165f274fc1c0549ab831388d431e051ef
+8d799492659dc44aa38262f8a4ae37b6ba6eb10dd20481f652a1c77ee9a4529efe042ea873c13bb2ba3ec4792b167c14
+b4d3962f574c3298ffb0958ac999367db8207dacf2ca9d563cc1efb42fc889e19b7f00db15ffa91d145ff05eed97c3bf
+a3a7c0e45dc8ae816d8765bbf097502b56651c0c11a03f476e362b64ddaee223128defbcec5629f4d7f1f9c3e4cb9f2f
+951036c2878582d84d90dff79ecaca673df4760fbf9e09e63d35facf3e3257be6e1bd504f3c3daf8ac1e91d306e80d6a
+8ae85094b13d349e60c8f303550cf4b01e96e24fa3a9f12d44c9822c004f1b3e9cbd772a2b4699e54023176074778993
+a7292b61d2667d74cf62a47aeb559499f19dfab2a9f41f16e7b8d6e77909457eb2aeefadd9d3d3f6db18a438ae53ea0d
+804310f5d2ce8bcf9095945f931eecff79f999ffdd24abb9e91d92f6e405decccffe4a8d9e731c4553de79baf7a5dd98
+a77d3af0fb79b6f5b6cb640d04f4e13a28f8aaad1f60e732b88f86de547b33117386636d1afc7bfb7bd1d4e527812365
+a431f239ffc68f6b1ea13bbd45675f0323cacb279e11a14f664acbb15d1673b99cf3603b335a100a0e297c305d743383
+a64f4c28cc36b86dca65359cfdb50ed3dcc06fdb22ad567c7e0f833c880e76a53c330720fc2b96235cb0638394bae41e
+b6fcd2c047de58003e9af3a416a2cdb143899441d82c691fa46d89045a12d3b087ee4603b401287a0f2629154bfc9bdc
+a06e3b863bd183d8f91dea6d0211913663b3924f1e3476cfe0f328ff7c388aeb8e5c97757bcb56992c104ce0ab6ff27c
+aea78204081cf5d24162686a824ff8e72fc0f88388525d646af7739265f60695b7d80b53cd1ddfd046bfcf59aa25f5cb
+a89f556d42541a655864adcc1d5d67459ab488143e1b4eb48c67af30a8e753541fbcb479558ac26e1fa498f74a59025e
+afc385b6b08c355a05fdc75e9360f4ffb384fcd74e8c9db34bbae9e0c67e0d1fa7efbff4160b387428ed58e129fcc027
+9428d05e17e5525fae515e1ba3f04742fad1a43baa2ee166d2f9431dabb46895b7345ad833d495c99939f0c57cbaf1c3
+b7a62d36ae55e681d48c911e1a433b568871c65a97916f939bfd638a054d6f1136a78c96640779ce1e3afcf90e3bb23f
+a45b6d24930d91fc610e57ee78c6dc7557cb2ad976cb92e2157769447cd7c9a6a040f1008be9eb5dda2a7b8c9e524774
+8b24eddad804790df3ed82db7c0ba05082c61a81763c44c98ad436dcc7e1e89a2800ff9c2deaf350f6222cf4278fdf9b
+895409dc0aba4d29ff322d2414b33c1458126c023a3d53b25b9038bb90372b7c20d3e9f6b791fcf8f76449fa0aafa758
+b22767ed218b575f397ad8306ec48fe07e8dc3a9f2f090fbaee411b6ba673a1258785d61adcba007d748cb019c458fd3
+ad4b9e4164010c4ba05a23f9a46957c8625fd4281a4e76f76ef7b4d6040d2228dbd2e6faf22b4a966ab42f32467a4655
+92340f1051f88c25a915d0504c1413146f37f709ab060e3859b14aff9be7f8c91352dcc3fc866910a84192d301029cc1
+b4e19bae926db3e1e295ba856984b32b796d86cbc81e81c6978e989f5331f27ce9004f90536a741ca996d19f998541c8
+91502e2a69aeac8e709553501311b4392dea3d5b6f14e7523bf780b8af246e1f2bdc4b29fc4ec3ceb725fafa31bf51e0
+b20607db1bdd6136130ba9683d581f5f45d8623ec4a2d35946723e0d8768654bdd9aeed55ba38303d8d1e312bc4f2442
+8fec23ac3b4cde8c18346dda1afb2b72d4af1a6c013dcea36cd8cbf7223626690ce933b920bd9137f673d0985b64d54f
+996bba551ae3b76c5aafadfadfcf80fcb554ff26e6a9e14e60440b3864239129734115d11a89ba79c19e452525cb5a39
+a632f25ec68f02f7758103caf613511a1fa2e529e0861f286b4e490e8fca6874af2c13e3aa6ca97c63f3c621c197ae24
+b332292c6213c7216bb78612457de615da878619024626383914f9c28f835f1289818514038c30eb2bc3566d2da470b4
+b5bd5ed7e990ed8abf7de268aa1ef7ccf5562cf9c92486c2472051c1b5506bc9e72594380e7bd00c91771ed4e9707851
+8781393278ffd5c522ec450220698328e60294ae1e35f60b25baa290a125cc47fbf7435eaf9b22ea819d431de0656f38
+80a308c1acc4363f9bc54e6831c5aebca2b2af47d699a17ae2fba24495984acd4a25c7c95b96aeae3027f0fef9549284
+94a55b36389e05b848c6d0e6426a400d1596195c2cfb4a972b6bf8abde2cf86a932b769a90b62a65d0aaf388e66d516f
+8d29a5db4ab3a1199946a79ebaee9de225284f0523637f90e4ac16fc609dd3dd5a71072c30e869fdf6f057b7806ec254
+99caa565547b13953b91f0468b78551784d947b5a3fe1b7278e4a45b294f074a93281e9ee084647d1b24c83b39a0cc90
+aeee1c88769e7bae12f163a056d19b0090c7fd866d451963bc855bda2736c41500bb97a8d72a1a077357419ca94bc3a5
+a94bd8b793a57b4fd79a84daf1f7fed5820bfeb44cfec0248f6aef130fb3219e1bbce68a6a55d332b124e1cc55224c51
+8528607774d780b31417bf85fa3e54a94e4ef6e8cc233ad2a1dc795c68c299abae209c46ba77c33ba74c6ae75ee004a1
+930f2c302a87d6bd159bd6b4db43212e7c806e17f572277ab14dd9715a435bd67b3624a9e72d9a2777f9b2080ef5cc36
+b50d97fd2fbe60105dd1dd44cd12d8ad62b8a3127329f969be917fbf10132f1c6c6fda8029deb990fa1ed26e8c220c39
+b685aea07aa1a45941f5eb2a593c0d97ecb5a803fd2977783488fb00fe6580c41ab83ab6cdd678704311c5542129c510
+8cec65b68f4b3b10d032d39ec4c448e6d76e7615560bb754a53c4c6929c2470a884e7d39d9f3e58a2a9f121ad4175a34
+96279388cc3e91dba49763ef50faa7550c3b4c277b2a0b0ae3541a2f990f9352748db75755a7b13efaffc9b8df40c74e
+a7599c33614456b1b02b57921cb76b01109811a82f230f9e7e82675d57757f06021ac3f514d557ed9f2dec025364284c
+869684197084f42dfd95350f8a54b0c7d940ceae2bbe49ec18fcfd178b6b0d21903447509e0ef356aa3d2aee83701bb3
+85e9ab73165878b93e0229e3384f048e9651ae29980f9c5e26492c45e180e09a3af9058fada434d1c398b43d99d13056
+a453a46ae96e6330c1b315d1b5f37d160731309d49d13d6c38c5d7f0b4f23ff1d18c985c471564afb54e4477c5d28d19
+a5999c704320d4468f94d647d83c9e8720c19782d2a03677143c7216dc434b3160d193389b0115dc638f6e2e12f2d441
+abc7a466cd848304616b2eca049c4b7509c5260c9236dc1432044ebe3e912afcc3a6ffe3e27d5d79d3ad4636ecda09a4
+89ca07faeef1118c6b840a2c328fd32a5709b31850057302a7e607891e11f3f9f62e4fafd420564ff10a35b9a44c0f06
+b0002f9d2a8aa850b9f22dd8d3b7881e8656cfc53e6c2ae6a913d88f6934e0062f30da2702dcebfbfafe36785203cefd
+b8527c70bc791c87f5fbc67e2856e45b7254c5a0b673d4a5d3e9b79fe0715b608a2f35d88a61eb1d8d7cb615fea650bc
+b9be558dbe778ba11fac7080789522fc004510f7b740c42023d850946933362a173267106aea046f338533e4cb29aea6
+b021f9e635e64d3c9b4ecc8075fb74cf0e5727ecbacad15f822c8608f0d981ad2c300fe6e47c6148a6b1a13cf920d85d
+ae59f2a83a1384ef0b5613e8843cc9a934f7126430df7cd7f5a8508e3d83aba83bf3d18be7380570b24ba0e00e05e0e8
+b403e4d0495a0137a710c43393798593bf131cb8d49beb0f3b3d344554dfc3355ebee14e884f543bb94bf9aae40aac59
+a73b722287df7558c503f89d113fe0c017765c73181eeaa9ebe6de5c8a15ffe76fdb85ab93051a6f565653046624216a
+a7d1a28fe1d36b17e37cf5eac7e27549ce9f6eddcb36203b58797d3372371f3b195cd3432db54aae4bf99768969f5b60
+a3447ece13c415c457b899d4a8b8ff388ba25bc920b5711f8687cc86e9c1b3f3af42c490ec6352fa8609b044e642e3f3
+b12f2ac1e033b6a627e7f7822317f629c896c8f8dd94ad91512855882dbb10b8e80a1e29c3e39138402f1f7e0de673bc
+a7c65988996741bf59888415fc2264495050cb13500b6597d9d0e034898121b605784f681962cfdc80b0af291c316e7e
+8c40cfc07dd7a4bcf514f2e87a1830c911e8168b0b8531a2838d2a14e790922b76c4642ae237b7547d8a3625decc7f0a
+b480d70b57434467a40d6dd066f51b9e637abd2f49dcfa6450460aeec2bc895347e21aa82baa1bec7589b6a5a694fa73
+a919a033c24e96af1eb0cb1ede3684e9a3bc338c7ef37b67cc9e9982586f74072cc540981e2d1a2524e99144bb21a64c
+921e0b350907e9993a596b80f827b2d40aad60e9c62f4b65a67d3fa4c0acfa924c93352dad6eb3e868264bb24904e3a9
+8d5419cea0bfebaa9c1509cd748c8af3869aedc3ae27fdbca3a0f08b3751a3b870e8dd3640f4abd4b46a2a1e745758bc
+8b25e6eb600de81fdd03584fb9db9a7bf4c154ef1482553d7bef880bdc5baa7b64abac6db96fcfc4408329adf8fa351b
+88cdb72bee7a6768b7c24d124dd5e8b29f0c866a0624e5a7c4759962ce1d71de7faa97f7baa56d5f51e35bca43862bee
+af1d59add7df3b3ba234b0b4f758349225b9cee65691c102294eb7e6fb683d7588fca33ed97eda361060253acfdc36af
+b19370b8fe123f1dd2ea6d5bc75e151b0d1514224f5824437166fce77ac41ac5ecc1e7c1e75b75e948acf04c420efea3
+a1ebfe84f1c012524cb475e68ae6c7cec79fb3372f1380321a0e306d15828613589567efe8bb5784360aed568e26db49
+a0f964e3cb594c359e2308defd3eaec476a638b6e1c216157009e11f7c7d0c33fb9e62c4243057cbca49ba315d4b508f
+9391e5087374e45f03d36f6919463c473938a653adf3880571850374ef0a0e521b25ef84b6012a19a02ec88f0ca3891c
+aeb86d4426d2836e6e10c3277583a37b6684ba35f4f30d2d073043f0a0148f763b99fc42c3935026b56c32e5cd0cecfe
+aa98c07dcfb1b0a708486d83763511c7004896856e851bd83d25a9551efc28f059c3fb8752ece0296964e8c13ec829b0
+a466fd8dc1aea7022a86e12a119b16de35412a1b461680f6a1cec408e9b9c1418a8e406fd4a5656c73488adddf17dfba
+8c9b0e18a033c27731fb3d22b7c83ba7a86fdc2234e8f2a19d7659aa67bad7a85ef25264e8eb81af529feb3fa9340ef3
+a371feccc2f1a1b96ad8a9a7d8db0c06fefb1f2800933134299027459b0eb8cd101b9a37c76c22dcbded01a74b13d465
+aeb34fc2758d8b68d17f15ab3c299344ed630f7351c498a5fe7986f7e14d62e74ac9a8f5d2de7c6289771210539383d2
+aff9e961d0acc71a077e3af52ced373bc694f9154302abc908710e500e908f33bdd10b3c41bb8fa8066758a18d64c667
+98bd5a8751e598896e9aec90649294934f81c36d2d0fb60070e9b96eb47d0988f71d9b68f4c475477eb4c996a9265c13
+b25a92c6260f389f6443a572960e0a52ab9c9250d8760ed148082584b2347ec7d103358c033266bec02374e69d0102fd
+b876968bedba7f4712f5e5eea605c1e5fc40bc5773c61f08c32e0c0f3ec575eed3e13e48809983153beccdbca2123edb
+8c4091ef8946c9b27490099d5c0b47c404b5a1113500592515deab1c3f2778bbe933b09c9824a3a7ccad2141f9b5dcc4
+ab85f95d318ce235929531e2e397d09b9906c58958fdff1209a514624a099d3b8c103a51b2fcfa0b17a8f008744b5d71
+9016714cbe49fac5e7b3e493574078c462e18f6363f413270c23da6327731f71e2dba5dbf1da6bbe0e29f57f0c33f869
+8c90df700c0e2d104ce7b76be7899209136498999f78195cd888aec6f069778d657e5032ad7db56381470dd1f519dcf9
+83dea8472e8418aa069a0837a5c44835aa1e00979a217f6295aa35548f509fbafc7db5b31b8767621e4f89957892e8f4
+80a1d673220144973ab70d977b94cd3d6b8fff7f82f23bd4b30ea393952951d2f07c24e6d411b2ec19f3bec13583d9fe
+804864b58f9747bb3ae54c588dff46eb6e16b6d98e0f711828e97d9f019297b743aa2202f823e3153ef5bc4b95da3501
+b08eaae2eca2c64001e1da7d0e345f96dbd3e09888f9ab86f178718ea5a04321a8b8633e72dea68cc05687042808e3b3
+b962f91819dc570c2cf131b89882fb2a44a999b94fd1ea8b83f400e9b66075a35c89f0fe0e8dbc3a597cdd1aa3135888
+a5f33e8f04a2d7aab44e832f8ab4640519aa4ef88b58e0a398e45347492b040043e494de4b355f07cb4bc728b67f1ac9
+8ed80bfb4cd15bb87175cff427c6a1bfc3e6292bc5c2d04dd42b497bc068baac5602d41366448ee7f37d85a5d8437750
+83441e746afadf64583571a9918ba5122ca987e76a6e37f98514b1a8a178380366d10ded5c70d4feb08be6fa6d4bc25a
+8807fb8adb2aaa6833960f435ace162c01a9cd0692a4cf038c89ef7405600868efe7bdb3e8a3db48901367ebafb0a1c0
+82c64b1f77fb78dec00cab089cb7a88ae16c72c94d0870bc92df11587feb62277eb941d2f7d3d2fb033d7bfee12013bb
+ab2f1e3f1fcde3b8b2c07135acf3a492ae7675d9bc971ba57e06c99fdfb39e1f68d1c826cd9bba872749cab375e44009
+b4a25f1f5a2aeabc29870ab9a815721f3cc031ab1a55417b457ca6504e5e96e4fd0d2d364ae17738726c8f40cae9c36b
+9519efa4774cb4de4ea834376d6213d946fe6882e2b36342f683762fe50d754765dc301569a836febb2c7c9dbcf44f64
+a75de0d0320e8cee962d6ed4b07db718615e75543fb25f0d28ec5e76f56d72b18d648ae42d7bd3da18f54ec1e4497a08
+a2a17aac11e732097b25c0b9f7b97d807dd78ecd33d88aea5ee0a46a42198d379a241e888ddba940b3307e9c560ec45e
+936ebfc2234d46282ec4de88958553759d766f682d6f9669d2b77a2cb0cf9cea9b1ac02014ac3f5cd47dc5d8af2da314
+b33def3135e7ad61a660ef1266d61216220c7e0bdd867b727ff3deea904072e33a195e4febe64ee1e263349fc9096cdc
+94337e4f14752676a703fab8544ea0ab7acea0ef924b85b05ffb84e4476f1087acc9a6d6250893a32b82f02651a179e2
+8f22942bbeca0118747a22d0aa13438e40bd6a383e310eafacbffa1490f5758504da4a11e6320e1c55b3daabc72c63f9
+86e3ed934fc613d0b3269cf368e32e67f4add59e4dc1ecb1f016fbdc6c53101c2435f95fc36625aa8c69c596acd9b0bc
+86f04807460e1d93f8eea2a284119d889659b5a6b124d41dfb2825b31685361e8163fc3a253a49cf878e316463c9ace8
+b043b2a99b94661ef8b270842fe4d3c51891ec23ba749d9c999982553ecade6f658242b373982c9a3669a886889e4f33
+8b6a33a68ba7b5932ce11b3f0e23c3da580510fa37668f2154c59c3bf788dd2276a2a8c66a6bba1a68084e8b9bbf378e
+b54581c88d4880fa4a0ec6d3c17b6f0ba339e8f7100242efd3b820ac942d75d1f898259d6f1e64a3870fc301d9dea2b5
+9449dc9bce23c7e3b41eb34789dc7765c2f7855f9670c1d145bbd1b2d1b47a9318862ef3738511b4f89cb16669c0af18
+926245ae9d4eb213ebcb88ab2d7e2a7d198557721051fef4cc966cd11be3490a3f83d4ff48f5fb60cbad9c5de4b98d1c
+8518dab07ab15887c68d0de9fe3c0c09ea6bfddb99c145b3f6ff84659e7799da93e97bdd17884b228772398caa8c2ed3
+9969575cbd7953b6308391e9ce2cf4da466b3e730c9cec0e88522258639be35fd31abdedd94b445d7075919482513103
+8b1f28002c19b17d6ac1a6f50afc3448f390b3209b1a76a9a024ceaa274de4588ce82a891a03e878ea08747ae5d98211
+a611963d1bc45b60ffe6756a743ab379e4022bb3fb263f5f305a615c92432199c7e1060a79aa42f7662fa89a0812a4d3
+a3c7706ab74e976464fc341e5a9f7284264c1610fbff02fc36b88e15d6859fbf40fd8c5e93c8237b97acaa0900a03764
+aa623fb8892dbbf4fc02004a44e07c21a422e5553e4b02fcca24dc1f416a54eed36f2f7376dc1e66218e850772676e99
+8133cccf10b1686bf53143bd3520515ec72e7295f6945c43bcef7304de597b767265a3a9f7b281fa353acbc3cf6997f1
+852e4aaf4da9dafc988d0da13a7f31fe8403f6bdab88dec363eb8cb8d3e64c48ff34102f6660642749d11d69b613f8de
+a616028c6cd54a6514fd9f7aa9ff13000eaaf39f582441f73a3ed8208a513b580eb7874b5cd0b1e9a542c40c5887bdef
+a48ec58bc3bd4b512c21d3d55618e9c51836efa97cad42bf79e748542804114714db23d79ad03e410e0989055c9bd46b
+ab480f3750420119ccfcf8d32c4a18ca580ce88bffe81433c1d6999c221c8aac482de5c0e41a5531806bd17897698d6c
+8522bf3b7157cd29e948afc8f479d6192364a11f85dd5c58d4ea0443aa6b655f55a80e6a3152fc02a8eea4c0815fcf19
+86c91a6021e738103031c1ece906ff43227eb23088e5ce1b6a1cd58664d4a80d7bbcb0d56c3b0e02cba1e1c2ca22e058
+8ee51a59ce6becf098256e19c9aae5ef0c2c9e66c587d9a32cb4ba1ee0b64c13e2e008908e35f43314316508956654ce
+b94766a0fb91c8de2338a68c4ab08ce5bcf62f6efa221067807dc647b595fe5a342d7122111540a1ca6ea7743b6ee772
+83f917b8f6aaeb9eb2eb742546e3f2dfc9cfe00cfec60051010113d55dba2421974098c157dc2601902d8f40bc84693b
+996e489890dad3c4dc35faf53d870bf1cd76f1dc24e0cc8a1f899bdb44e89dbfc77fb11f7b33c270a1394c909f7a27f5
+a89936283190b2d1ce8d166b36694afddb4c3df01bfb1fa7bae69c55d1acb4e68e5e29867ea33eee8031029b3c6409b1
+b08e5a5d6797ca252d12428b2086e528a6e5c3965d2e5ff2bf83bc71ae9c0346a4ceb3bb2f2e3f8a1685fc343f36997e
+a05bd12a7a6d52d234a1b3e9ddea7b18d6d41026a0d18251b1761f1cc863064dacf821707cfeef2dd1c02536f584ed94
+87c638feef9c88a9f89d10b56fe4bef6406c1d734cd1f01006e2f2b331196a49c7184c10786e855b3de8978927df42bb
+aa194f3e4d0fc1d3107f9564b13e6274bbbfc7b8c1e73ce6677cc66d9319dc34b5a0e790d6d44c614c11feb50530a252
+b2ab7be7ee9d72d1015e94d006020e758b73f200dde81e89e52cd33f25aced0cd84b8c300413d32565c253edbcd2fb1f
+8ec08b22265aaaf27a84a6cca5f0875a3ebc70fb36c4f5e59d60c55bdf2a4fe11ab7ba4b387f5d668e67682a0978fa46
+93643b9541db11b48e0c84caccc8da9ff7696717aa176ce6d863446ef8d887f3159b0ab6fe1f79fac883a371f6736e93
+8325654fd8388ac96935149165fa3238d0848151a04be57f2386c3304056013efb49febee0a871cfc2ee3c11bb029042
+a2c15cbe5d5167f55f2a454390b61d99601614037fd67fd198968531ca2f84f3c214b971ef300a20a114fabc6c67db0f
+b40ed63b0367174b5b4b08396afe2385b0f75ec2569fa3cf60f87e1b17fdee888dd66057be2cfb185e9f32df59b7a8eb
+a466d2c8052a115f121177979620385bb07148e202631979f4ffb01e7e0f6fbce28747df9bf70b2168653096aa704fbc
+99395136290cd020cfba0ca896642c245182e2020ca2299be8ebb2f62e2fc62fe0be593838f62681f6632fbdffd640c9
+8e4f081d9a724bb54fafb66297a32f84687493464550c09259cc6f8abf770d076a514ae1d6726cb29349e27ef69a74b8
+a8d5c941e7c03dba0232c763590e93e3d99fa519b0a65996d20dd20deed1d0192738f3b339edac68ad42016223733582
+877baee9ee979be8ce3bef02422e57799dcadc34fefd8bf2baaf945f267883f67211ac5c06246f7b49f1ea5c99550a63
+b6fcc2a73dbbba54760d244bc13e1564a3c61097e9b525b247cc8687ca08625a7330fc6b15e45a3ee508b4d34853d852
+adf720dde6e9b5c63e361d69a2ab46ed73e0deb82f8e30f27ca2b19c2d8fc43e18ac04b4fa029f553f8d7dd79457ecda
+8956c9038f3338f541bae9ef1f5bfad039d532dbbbe7814e3a3d5442d393ea6114aa666559d8a7e3a026c758a17c79d6
+8d6de7f95f30a5a4b3d441781c7f819a0265852ab78b8416227089b489787c8ae9dffbb0bf88acf1b4c4d6b8a29c1a53
+81d4efd71c9d08e9f6d7f7d7a2fa5089e80cc3f8dcc685686aabf3b4c8bd531b4aa07e328c0fde32b638f23eb78de588
+a30053b681ed8328b5d64587b0d38edef0e366a2762cf5068dae177e4f4084c4333f9a5fa5fede93db80f7a8fd5fbf57
+b340ddfaab2dcded58930e5dc2b72cbedd0e79ef652f34356fcf72054a87fc2373bd3aaf8a88af8d4633f73dfa7d9a28
+b9f3a7809be0bf834bd7affa2059d9371b848dd5e5fa93e83e90d9e078a2fd3aea64410a72457c32d33ff1ca11dc9300
+a9a8ce26a38dcf277ed66d75e111b07348101e93d03f446ea72bd903198122f8a08569f7125f6d4ecaeda8c093a00ec4
+81e78b705b44533e2e997f549f46723a5e6b88241d7a86ca20448ae3ab140e967347abaeb8700594a0cddf1e82285abe
+84724094dae5b7ece30cc01b5f2acc8787de57dc0c37a437c3e8e26fc03069b6e8562302a0f1c95de85937f07fe63d3e
+97a715861e5bb715a17a948d6b6a389b89744e8ccd3699fdea9ac3d890fad027b78d436f8012b0abeedd078a20ba91e1
+b710b2e7d87771416aa34ba2d93a044bb118f279fff62c1224c150ebc30f21abff212019f0f38c334daa5a96598ab900
+853034af5ad08c563ed096ab2d0590ea644d372cb400bfb03867092768d90b7432d35c5506378d001f986c59769d6d56
+b340ab52f751e9d516348faddb45f0115ba0619ec9db820f870007e3a4d305ba2bd0b2a58a7576296531fb78886b16f8
+b8ed8feff520009743ca3313899a118df025a61e6e03bd5fd27898a23beab472746ca3636c22ea3835e9526e17c06dc9
+87af435e3e4ef611d6da74c8d98e8d3f3de64ac8748105dc20287a7dc866f57d10a2b854f7e0e09235eee647dae1ab86
+84108b1f0f0ff73a179cb1be1b2ecb4268e7fd2fac3dfc7f6f99889c90a33b4310946909b9eef31b256b8d0e3ba56bf8
+a6b9fe966293e60bd384a1e4d472b0a72544aba41b31172ac8bfc3e19beaf51da54a66625d73a9ae22c7c4d1b0840a30
+92e82e92aa615e198ba3c83c039b0adcf4393b3fbf9721b2e47ab17a84bded2bc8bc2bfe257d2d76162a87e8bc7ce759
+b9286dd48800606b7ff9c3fe2abf5c49ef0a6b981711b5ba1f62952d6fc4a9999bfdf061c4664a019120f15e341925d0
+b5da5dbceaa7e82f30fa5fde88b03ea88e7003a50eeb53e3f3aeaa63aa586900525b42fe1b699451b5d915d1b83c3705
+b06072869fb8526d3077cc61a3c55d54a7a1197bbbcc875aeaf617d7d1eff3dd3ac243e2c76caf57dcdfe306edcab4d7
+b132db9ee3ed16e6d76db9e6e3dcdc2b142cd70b9582518bbdf5415b3bb476ad900d50004dc0ab6b87ba697c6314b4c9
+adca92336f3546ea50b034525fdf548a36049ca82d9d3cec10073e7cca186227cd662d4d66673e7214a6ed58cf75da6f
+81bbb3fa241f9514575fb3f6cba8e34301187681354c94e7976a4205c0bb238dab52b29a76a5f0e0d4cb1bc82f8857c7
+91008dda2bb7dfffd6746e3544ef540d9a1ac7ee9c68ca9984a1d81041a18fa9f35b8c4bdb44ef3a860c37481d5e9a14
+8224195cf18ca0d8f01521a0ea92c9c598c556746c825a4dda49ecbe324d570a96775eb81dde1d3a14aa3660d50e27a4
+8b355eeadef5fc7cececee71aec3ed30349df8f43f25da1d75d62ab00fc73702b405fab6d422053c2b0fbc7469ace9a3
+a4d657dbf2bb30c1e57e0b63960663bd86ce17204979a9ab82624943ea370119f040b58b067a05ff6d1867a22a58698a
+9379a367c918b2be61a9a42a495ec03f0168a4ec36f753dd37eac6e9f58a26c8510ae7b579a89afdee1d192edefb4bb3
+85b37bddc80754f0432573204a1a4b86a550bfe9689f6c710a61810aa94dedeb28763ece40f28fb3a6f3791ca4c86b8b
+b41c3269b96e190e40cc16e6c7cc8054cd0b7902a43c69b79d8ce471a417d3096b2271badfcdc59deb6271ad3e5a35b4
+941185020a227b7a995f59805c8900f7f6ecff1e7b948a8b714f85a54449a0d41e28db5e17874e018eab72ade20eede0
+8a0795ce082f74e4633acb1649b52b46ea2b4360860fef6ec107910e245b30466bfee8ce59a6854f866f55ec5cc7bbd1
+931fa63550530af5a7ee24964b8b4d0c66c2bd59108131f375c7de86bce59cf52890191ec8540666c895e832dc312360
+8fb86918190a3455014a5cbd15c7b490d68c10cb7b505e9233b3eacdf52e63299d49ded75fd74f8c2bcb3632a9c29d14
+92c896826c9d871a83c4609f9988cec0db6fc980c8b88a7baeea2856ec2a0a56c3d5a846a87d03393dea966b534aa8c4
+a9d4c780c94384f5a13cab61c734836f5729482cde62f2888648a44317b749135b511668834d49296ed47c0a3b9fa8b8
+b7c26da09c3998367063fad19340f53217e8545535d376815773e201ef49e9e1b6bf1423b0b6bb363586f5f05307fc89
+8c445b3655f1f554c2a7f6f7d035121939a8987837dcb1a1663586614dcf2cf47f73633950d8803e2781baaac52c12c8
+8764f924f41d8c5c91fcd77de26ee3bbb86d5a5bfbcc45188be453c8dbe4b875fbc5ef5b01ea3a26b889d7b45417f173
+8605a8186d5716dd5f955a7125619bc72ff385cdecb187a9a646a4bdf6595d67f00e777836261f3a69c19d2e2cae27d6
+a97dca2185e4fcd7583b1e695333d55f54edd751da436b8982de8c344b5f57e35ddb61ad4a611dcde08e287c78c757c9
+b11c576a049f93e0731652f1a1ade62b0124cb7b4e2b13f6505206c27ebf7998ebdb3d887bed01e43ce5c24714903aff
+a46dc516b8ab4aabe35f38af1236052564b01d66c558e7107175064a5226713e8550912867eafe4da133f56950df57c8
+a13e75bca5bd3b08030205cef4faa56a49e5d7da94bc41c708deb2f65343c1687aff26368915a490b89006185f18fda4
+8ef5135a6f1f635a4966aa540cb877dc98c6a88fe462be3226c1a270c82cad8e091aa49ad39862f012edb3c93d15fb4c
+99158ace79ceed67b6d8e884050c6fb7c7a1509e41f0d2b9069ce8dea392f17f88303d0942cf3c0af3ea52d3194123a3
+8805c76ada9dc7e57545a5e1a874e6105592601213e22c1601b0b157b622e51f004a1da754a8fccc8f2a2241c14e21a6
+ac3dfe87e17ccda6196f621008716a14be4b983d187265eabb8f5eba7268cf770a70ffa19d1c7e77fab0373eca7a4045
+ad78a31ad6f2c84f6e5348f33631d876daa3d5978f6d1a77db80aa219e12c9ea656e9c18e6316f899bbf6c2469cdee37
+8c8726f8f6fdc40516bb64b6c624a6eb4caa931e3a9ca8ce2c31c282ad59f0624ea290b804ba84e339e83422070df419
+9303d1906cf416a184e15f13cf7dbdca5fb296b078079782c9044b9cbfdf06b0c965305a8d88678b53f0a10220e56f4f
+99b9735a77cdc1c675988e613b3e8843e2b0469030a33f5c14383803a1b20e328d45d2fde6ff0d15f6bc2eb8da4f4d88
+892a18f4ceae3fe7cde8f32b84c6bd3d9ca867143a30fab4f939281cec12587929faf07225725bf33ddf154b90972214
+a100a35a2865bb465830ce2f68406d8a92bdeb21056bcba28c0ce8ce5ddfec6e293e926d764499e53facbbacd3f72994
+b797ab22a57520a0584edff499cd1aa1663d8b3f411faa542022c5f1a645a3f952f9164f61d200e4500673a8d95a938c
+b1a457d100def2e26b2b30617ee866264a3ea649bcd9edc7be132f5cad02f3209f5dccb02b95a462b5af9a71fb88a341
+84c1f6d4f29869a359cf89118b1a80224cb574393fb557d1c61730a1fb1884895c4cb07f23c52165975b89fe9d6f5a77
+b6d53e49025bcd1d7960ce46d4f64ff8f29e4239fde1b19e5167d506b086152da3bc3b86fec8ea531a20afe1c785fa59
+9635b053c03d1be0bdf81e9876c63e8541b793ddeeb2a8f3ab0e44fb78f81a9e61f8c68ce393c7c959b62b67f9724409
+a19ca9ac5a345c96a607f979a958d83eef4350ebc9cea0e0aa11469dc554fcc39d9b22f8a3c92de599ca08ff4152ec23
+8e7d45d35f6fb95799846fab51b0ff2415857bb54b049694c1ebf93f45167b8497c3341b656f194edd5804195a7c96bd
+87c05c7d5834394507ad3d363dd0ca5132a7763644e354c3b7a803fa594d951084d37942f59211660f10098cf49adcdd
+b276246af578557aad38190878111e804db0f29846185d7033c913a31e7657d035114448ddfed2f3d75c04c79ee01e79
+868bbcf14f96547192053823e4f85b50fb988da5c4cf73f5cbf23953252b665ef7aea4421c8baec90522f58f027a2b19
+ac2be3dcb8082b64a3745ce0d2b97cf341483713e1bcbb37369123d6723968d3bad1410467aac7fcd3b623bfb1d90d9b
+b1e5cf361e0857373814e8db7fc275ccc1dbac8559e8487cc892bf82d4c6be00d1b2ffe40289692a70072c5f80dbacf6
+98e16a5854635c72bce6e263bb57c071194df076e1ddd81e645884367b730d4d557ebb8c74b3c582e09046d2b9ad8078
+a0016bfaa348d44a3ef814b348f7d56fa83b78baeed4a7b58617b6f4772dfa990e912ebf91c2321307884be85dbf81fa
+85690a2c5cec392b6f98cd2d03e4204cc51868612543c7a3112066ebeefd4304c5c8b21da44534224398648b413634f8
+a3a1d00d0fdd8c8cfee153347d590ed78cce48eeeb7ad42032a95baa73cc458d46882d0e9707f3dd519b1844f236bcdb
+aaf2774fb26da59c115a28d86f0c6320368fc6d2c0bc2b7e4516cdfce3058cb423b0026b6c75030ddace9ccb7f058227
+af507cef7320bd003526fdf43c04af46beaaca5b6ddcad835ae14da60a2ce732b453d8164553e95f2b776df55ddb5efa
+b2656c07a8ba2a2248d0313a7795b99f5acc120648c08e3a77fff5cb9b861827c94d4f2f99a2f2dec1d1667ca3ab26af
+b426b97a51f0439f2da2d0d934693aaf52482bbb48893de12fbdbed1b2155e30791e7098baa18f93ecc45f8dea4f22aa
+a71a7e08426518ef7307c2a1be7aaacd843794601c0d49f4f0e474098ea0faff74fb5ae2bee416aab849afe04be434cb
+b6d510022dd3b9ca35e93ddd2ae77877967dd6966706f339b2197d2891bf523b5d55b7cdc80274368333f9249b62a7fb
+95d2f6cec1b4038f56c571ee0f5aa14fe5fe7b9a2efab89eab4c51a696d2ada549a42095245bea14d7f7ffc69ade417b
+89147eec9de685483d0a5e21b877cb550518a1bbcba0ee65e9519c294fb0c422a729bb0f5a8c8e3fe77070e1a89fcdb2
+a66e7116eb277ba900c06fa48baf274e2a6865977698a504dcc1d0c20f90a7030bb2a841fdbfaa5c8ef6d81aac4fced7
+815053a8483ce2a84a34f81909bc3eabefdce59140f0fda6da77ec005e5dcfdbc6f289d0f0513efbbeef0358daf94025
+b480d2b6320ebf29f3781f04dd88e835ad81d2c63b716f6f244fd2b113ba3781001a34189df586cd629e70c2baa0e5cb
+a74281bddc3a93503a695f0375121b3bdf98db4b2b053eb2cf0773647f6f69d1d98a61efcf82e2a823035ce803b82001
+b84fb99a6943447cad21bfe2b34dd8da43d349e53e85b73fba8a5fd0fe3f41e7dc629960b3325d08af1544e5dc66de28
+a8d11ccfb0dec31b39efeee74c58536f29abb02d06dfa11acb7134cac626a17ff4e204d1d138a472c63c629b6f8406c4
+b5017d42a2388d90bcf4d0b6e015c63612a0864b2b379e9cebcf2e869e5fd45d2713bc549ea472d77e82fa8750f364b7
+83c8e090de4ab6ed169a033aa4ab84f7f3e2b54186106790b30741e9d87d9a5d61bd6a285447e0d1a8e1865ee618a91d
+8db64f3a1680cf461f9afaed4e714709d37559071bcee52e13feb5627c1fa7c093fc8923ede3e70db07563d2d1eae69f
+b6d20dce2f50b78b094949e64edc2ce1b077a3258692ecc2cdaa01ec19add246d0832a319bb0d4153198e3a35091d86e
+a61e585ed55dedfad57352d2abbf8ab336a999a5abbaefeb5d0da9fb0d5bb791119e52034844ffeecca9655675d17228
+8ff58b27196f589ce0d3461e0c00d695da47a79809719b4bd4a229ea7bc9319469744f2254be4469092b1a27532439e8
+b5edaf7c3f9dad7a54908da0e7a153d69a6bdb99fde07fc42928a0dd38031e32dec81c864147066412a8ca240e7dfd0d
+ade064bb3f87431a32b361074a89dd280cc1160a57fb3cf21eea5066e886c7bfc3655fe39099a1913b8b53242b23b2ff
+9169621f97887db46384b43ca24b1447e23fcf5abf141e70fcd1834e9d691b9bfc6e8059d060bebdf9922608593bb972
+8727bb06fadf0633fb8137a54d6912cedda0bbeb0f93af97deef3490b1b47e58fdb37a972dbab1534a5172ff0c840114
+91991b98243bd7c138bcb60cf703a9d0828f6791eff5c2c1c5cc7e8edda258d3cf72680bff2c563c8e964f87450a3037
+a1bddb74f5892597ac687451b932449305d6deba20e97e10989bae311d532a7b72a3fab08dd832589e6a22c0fcb548dc
+afc52ed64208e4beb029d1428697fea6add02210f613551d1e5ba6011c5d13f66ce26b3dd2a39b30186c566b1af66c06
+929bb88a9e30862be5f45c002c11537780d151f9836edeadcaa4a617b0bf958046ce331e15bee646f9eeb4d9ff854661
+b3376241793ab9f1732997cdf515b9114f88bb2c25c0bd3f3b22e5b665e1ae94fa3f6a9f88de37b7792c3aafddc682a2
+88fef7680a7fb665043264c9733dcbd23e20628909278711aad2e54f2eb8fa3d07011f593069b6ba7ed312d9ddc3a950
+b031434d514d0878b7011ce2840e23e94a4386034dce422f37fde539aa35cedad1511f9eec39fc23c7396f43ec22cf92
+a4a32f1e58c4ccb2cb4ac6c2dd8acafa292810c77126844f33287c8d522bb8c32dd89ce8f7c1dc9a273165b0879a45ba
+82e5b11b9fad7c7d5e2a8abf03943aef271ffa43ed8127dfd85c7957b59d7cea56039116edd0b0b992262751c347f75f
+a650327144db1806cefedd1daec1de3164b77c02a0aa652371ca0401b50ec3b7a392ef6a80de6d4724892d71cf48eb07
+a88d8370d88379b52bcaaf596c32faba155db4857bbc7eccf89b5d67a97ae481e53e81de6c9461a6719d179f3ffbaf16
+aae8b3d1b1bb0d71f19e37867885a1fd550f7805fd1306881515d77e5f6a990e0bb40c685e350ed09eb4a55298f3a393
+ac024fdd79688628ee188a7a9d39cd1306883c260dbda9e79eaf2d2f57051b5379834dccfc641302cd12a8a24fa2224b
+90cda91b9e71b7bbc091b9e8e28d79f0fce42255e24a7a3bbf3348651405c46d3b6e2e33c5fb5e99fb4d0fbc326f77a7
+91325730bf7d71855ce0462a2fd0840f3753964b296f7901e1ad761f48fd133371fcb805c315c4d8cb2ffe34e98ab9cb
+b9e1a298ce9efdc004903b21e573c113c771b1bb5b25e2e88baac6dd7bded130016b2f09e50a4346c59adee607a71760
+a703a60c430e365bdf9023c923a04fd9db427ca0da2da8dad6b0f0d5d352524943839d859c15dca64b590ace6cb1ca89
+995a5ef468a38caf66d58880245064a7c0ab520ebf3c9e9f956110a9dd68658baae22ae274a48d59464c8d37d2f8b643
+889c6e4516ece0e0fdb8c99aa482f367f2cef0ae2ce0987b6b602f6c856b02fab27114a6f4b82050738bc98a48ef5837
+b432ce5f638aa48ba952b9c2e06ce822d531c9a24011d14650cac0722a4c5ad1bf22109a2f429cbdd22a567ce6f03094
+86fe41234d309118d1256a9ac79b7bf01da1fdfcfd579b655f31b7c4cdab6f687d46855d56bb11bedd4b0be17e892b2d
+905ec536f23dfdcc4f8128fc1c00daa877eb3caded7637dc911aff0e6279eab12f1748949e4bf015e4f8e30626d3177a
+b6b9f47cb82244d7b1102b37cb52f5c9336e4c05e4c90f5e448fa92444bef12d2fbcfc39af9e1fd05811f5f864f12047
+ab56e7c534ee1f921351dfed3f3eaa127869849b44540b39b0dc021b3dc4dc94027e4161f7f3ed40bf42a1d08315264e
+b9c62b4e679dbb3405733bbe0740450e72ccf39bf953142cce65fe014f132d5af5864ad96167027012c98dc8b8889e8f
+82b8036a3fb6f648c6fb0492334fb3dc8f57c32779d4eef78ac2becb0b93f046dd68c2fea3b5039c21ce8e1efefcc685
+8525738182748d6f901650cc328ae498cc3c712300441042441f66c683e06dd741b644e8e98732552e55839b66f86b82
+b625cca7bf4ce510f21e8197b223dc49e7ce245c5a5d1e901438eecf7160a0bd37d0196191b1d934779f4b6a387b6db4
+b63d753d728670f3b63d4c24acc4a3d4859e5f15ad775e502fc50d7ca42b0d2484a8649eaaef9eb22cef28a23e10d5e3
+8e951028c0b4c5a691a219a6dbf348ef66edef60796094d5f6abaff1ad5802b53a5abec9b8b3b3b98f8b5858672847ee
+b6b71004d898a3bddbcf7f730b8d5c0d8bba0f3b508155412446732ed9abbc1d03a90864f4689e6ab207aed495830e1b
+98f33a74e36c035d9476b198dbf3a75573856264d45313e5bdd89db291dceaf4084917a2242b0a30d3b1ba4ee3016c42
+912fdb4358fe617d7981bf9a9986dade7fe279a0445d7b14951ed77eb88c77c4aff4162467e40fdaa9dafe78da0ab4f1
+b17bdf7a896480ae70b3696cffefbca468b57493d5db59362dd85a3da296e1162356358080c8b0a7f3fde798a3ad1d15
+b47ebba84e62bf453ab223496a892fea2244ba6c37615c3db31c2ecc16a5f9519dd79aa710ec1220a2cebd254f7690f2
+b3361190434ab75e46a40e0ce21ccc251fd0139bce90664bd33d9eb6400317c3210509e4ffeef604c7b05b260544e19f
+966916b3966d7d33be49fa4eba925aa2f92adc2d0228d1144ef633dc5d67fd8231087c488b492688fa142a8cdb45ca70
+8ffb1491d4448af82b7cab5409ad26d99ef6ef08158c73a9ee9626c5a84d2fc6d852e2c786c94b47b5931c7194d5b82a
+a2d4a5bb458688b8f593f39cce2b27fc05f8ee3985f4c5be453706e8f174d5a6585c2070c0bdbb54aa1d8e79b5ab40e9
+ac180389d0432699bafff42a4c3da59bd32ab1bd1c4b4a4829580577fb3c5eaf8aed4dc61a93262f23ac44255e6c2b11
+87f8fe99acc93080e2a2ae51eba24f0b146c1355855a202dedb7deb8e1cb5c6ad8664ba0e93ded5ce253597fe015fdc1
+a554d88dcef521dbf5e4823bcc9145c8ea98c598cab56c85f101ca7be82297dd7f361d457966bc69584adda6d40ecab5
+86ee126cc839d869c7e91f0f8d919929f66c1f67675ae8c5eaf6bc35866580c49d45ec8edf0891b546ec2fe7bebbd304
+970d74575be6cabcd2e33a8dacf25b378ce750478bb44086e1821c97b6b27055b7f00cc8ca189954f0150de7381c80c6
+963badd0cac713d8a23dabb8ac7da5e9a83ca7d580ec81dbbe3e5d53c5c9370b86222ca685215eb282c8f67a977b4b66
+8d2735c85136625b3f8c4196a8f892e276845ca7c876648498143f1897637807a9a5162bb90773099a7b0cdfaa292263
+a1a8507bb8a300e1df882651b0155e46a0f58399375f4e5f993251663b5935a76a02e60999a4851fa082a89d5cec2e63
+b712dd139d791a95486d8fe48e35bb8bbddf890435dbf8dbb670699dcfb143fc582d4bdc8a6751f6bf58a13dd8c2871c
+8f108fcadbaa43dff904a23c89d809746a9f732be817c2c882ac3493624aa5e49af7dd9b46de7d9d01ae982bb78761cf
+80e270c6620756d3d127457fa2e51592604f85479a1004d63c184d7d2ffe2eea4ff75faa436f24bd1494f4eaf90543be
+81f039fce432a5d3bf9649ad0fc2d93de831f5b9c0d0e5fa92d35b5bf4a52c739d478289c2386efc964026134f91ac0a
+89401011d51b6106855487a37459351f18c39f08ce90b15e52a876cf36e969a9c9fa6cad94a55b844ad45fcf1807f705
+ad66c149ad105ce8b53d38c410d73a3cb3ec910a9f0ae798f3aa5207501c7ee39b85f10e91b4cd91e6b280f3912c492d
+b709445e56d02a558a1496bd2b9115d2635855b18984cfb908cbd54cd279d29ecab21cce704cd9ebcf34456dd1195d79
+851059069d9fef4eadf6ba508ca330ecb7436ccb91d09f5d0416874f9fbcdc56472d2adbaebc63a63f190b6abe7650d9
+a933c1b614e6d5a58c599b7189d06bfa3683995f449d636805c8307195d8e98b62ced873997898d6b1b01f6e6a52b743
+a692ba436613db22bc30c3f36a516971158d5489bf2c50c39d0627a74048a6d0b229606823f37a0832913425ddc30d06
+830999596d203b96329185c100bb7360189a50f7930286c36544d20e57b8418c71d8db331e4352a98f380c68a49b2005
+a56d7c262bb3d443fc0cacb2b61f24554ce35b8984fa3418bb4e271d5fe4f5378ef7b12c6cd02f537820040bcee95f98
+844a4e9a8c9eea0b6f929a80da9f4e4e273e999fbe182d3855b0a40577afaced6f8ea285595573e99e13b6a71b985c03
+b34df6205fc429c9b7cec189b2634d49a4877f22bb8060b9f7baf8c2eac4e1d476ed1f30fff1f4c019c65fce96abc554
+b3a97648b3b79cc513246d3d1722afdf7645e7216af233645fca6a2756686592635facec913d19acf99ee586436cb58f
+b9cac906123f2a4aa13d5d7eaac84e84eeb0a1b7919526de5198b5475fb815ce556f8451c953bb0bc910c93c6fb3fab7
+a5e441019d492897de73d31a44a0055fd04e8cac894d626d0457ffe9de5394d0bf851dc5941790cba388b403b86864ab
+8e3081cc7999d91d787e4c0937c9e22c959d2ba4be6fa04eb97471997ef150836a910ef28455f117dd54fa9ec655148d
+98eb793d88faa691ecac3a7c78b25eb3a833ccfd0275186a63b1b1517bd2b984d9908c84e55f044b31c2dc5e251d0414
+b38b5454c2debaf1a4e9e467c6205cfe26d52d1c1dde5356c089abfd6a90dbae89525442419f108c7c8e82e34ec3d5a8
+942545089077b9f27304d2d6ceb3d549e983f100417e88332bf05bebfe8d42b75a96171ab3bcd049acc859f3cc9ad1fc
+b9d444777403590be63076b5dbd9325ad58c1eb244dde2c9628234b62ba74f6b0e956642af2d08cc65f82a1b2e24bfbd
+aee8deefc7ac67882ed7ee6c01c08d7739b6642deb2614064c69ea38c5c65e06cf609bcaf7db74545199cfa6122f23eb
+b3e476268770abfe0cd64a4f878c58c027ff352569d8cf571bb067368e777eba6c003d344746fd006c8bbd474fc3360d
+858137d63f90f66b9ef2a38d7ebfdae1bb89e5bc1d9032c96d699ef276aa2d7461366c00de8c47de9231d9ec436572b6
+a3dc8fe541c9cdf89d83753347d8c573c49e8471dc07b5d41bc48ad1b10a3fdc218adaeb72bda0f362c8af8e1194df45
+ac75940ae476a6ff07cacf70a379096786d10a5a5244fa5c466bdd8af69b1f98e97a3a27877739dd4b223627e0ce6d55
+8c6809f893c5fd03ca80d845147a82d8d54bb7dc6a688733b1404dafc360c45d5ea742f98f6a70ac2decfcead05d876e
+b0818eee75f08ab207832c591aa783193aee5742147eebf75cf7f1eee6a6d8855b309db4f7ab51a16ab77bf619e14fef
+b339ac167debc92cc9132dce076bce281e7f1b9c88978d36e1b5b9bdeabc974af318ff142f746319681764bc4db191e3
+a51dc040c75a8a8bc3b0ecef47ca313ae13d9560c782ee014257ee728a09432c4486a3f87b5ebab690231735fceadf80
+802500a52dc271c52f893b620952604b79d25ad243489dca7cd679b22907fa85947c88dc04463268d25dcccc8a6c34fd
+97b136a881f500b07e5b0b79fccb84b93dd108074f92a1cd76e441239041ff389dbf03483fe76cf7c22a5f40b73b51f3
+9155dfb5d7f7915e50da7a715d1a5ac5b43d7093546d6d342ec8b69d47a86cfcb9dc11d8079f123854033b8d3e1ec928
+9423ac1e11f70b5d0cbbae48b7a5be8350387460631126ebda095b3b33a7ee2845776aa20ad60e2bfaf975722d43064d
+afa907dc76e03d10cfbcc226e50e3bcee56baa4acd8db2cef8e484ee7b7bc536e1765e764180663710c4396e22fb4dc0
+8b6fb4bc641fe2147d3394322418e2e8e091718e3b54dab8d0d6bba687bc300d73cf1b17f81e2812f0943a8bbc1de538
+a8bb533bf42f56edf112b03d34eb64f6dccd57251244f39daeb6531af650d0368f6e4a0f9171aaf4f5a5b4a17debeb56
+8d763490dbc9a9b73bd571833afce20654348cd553a69678ec89454c4cdac044ed3ef0458cabdb60ff35af5e63405961
+8d3ebac80c55b7ce726f4cdac41c7e2f6a5ff4ffcd5f1803c463ae524243f136dcd15f9bc74f8b271ce90a4776c94868
+ab63cd85311fb9889041e692bc9d5c1153b26a805b511721154d28f11dc8ab84733387fd20cfa30c566ab2f8e066af4c
+a506ba11063b14f25c26c92667dbd9eb67c8585d05d3980284aa19a09ae97599a1cf8d7cf45b70a32063f1fa3174d3bc
+b834434632307602d9e046de6f625af5de673996108911c6b05d6bd3e2aee17246b2d860f01dc2d6415fa61c73110e13
+8248b69f51196ce1e15fcdc25d487153896d1f74818a5617500cf0bedd5180028e6567533536919156860e34ba275f1e
+86a5ed8b6a1e9d8d17b69640220bb80c9065198c8f7610d4ee6a60d2d808508771a84d6bc679ee4db34f43f94315e0ff
+8fde55abc106b2afdac3b8796f83c8ce1b90405532fd586d349340c4d7a4f4c46e2a56fe2663fba770a8004dc7b9d523
+82489db9dccdd13293499194068bb4ee8fff51f74f1b504d203c5deb5216287a6d614a2e0a769d4c929bc103582c92b8
+82b2d71281cf886e80e09ff907c1f9213dc444c058e965f964bd17fd36dc0382da2449fdbc3aa7b6d07004d6722a5848
+b0729dd38dd64c441e81a94fac0c8b5b3588081e43a5b0298bb576b16a9713acbdf09b9bc2499c677064619cb3a172c8
+97c4bd5c97182e80f55e82648e387c4a3362c6088381e96b67cf0f04bcdac3dc670890904180a5388b97002c70481235
+98d99f80ae9c59c921c6ff71ef01c2ba283f531ec32666cca1fe7dfd9bbfb09f197e9112af1761068cba8d6319af5d74
+b0569d892ce82d87a3d809f4c86a88ce627ed420dd106ae49b88b8c470ddb081a3dbdbd92d7fc032a7082650e4197ed2
+8ff68d42ec2dc5b13ff5c7ef506c619c4bbb0f62fd4c08e320953e5cddded2aa34624c6c5768b546cc2f00add0dda58f
+8b53131206c80638dcff21d7f2dabdbc6faec545f19ab1f4f2bb858d6b01d87adf886072c3a744d58124b8a7a0c87573
+8b9c9aa127ddb950cad4fc21cd7c8eb802cef6db7290664b1773b9744836450e48af503009d4bb266ceac83d765b3b9c
+ac61e051add512e749588e2549ff55f3e6fee5378443cbf64c80cfd7b260cfa63f16fc3e242aa140ea243435be28179b
+9240700fdcde974f319a90ec4a9b92a0323424fe39e513c7412c621cb33072d193476118636bd2655867ed2816e03034
+b6b05975d0653079034f9792d5d8cf5743e1737e1b3860e431a1e159199efa5a55b2d3283f6d270c9ed3156a233e858c
+a2ea8fc31294943a3a6d02509cf8b75a7b5d94de917ced468fa64a6c24ead4edef11c34782eed848792b0570219fb77b
+ad0b54dc5dceb242c05a7f7c529289c8caed93ebe743f6609df653aedffbd7eaffceb53a18dfd109f28d14c80e1f7935
+81e4d4667900eb5a8434e2153503b2318f63708499534a8d58382931791eb0ad0522b41cecc7eb0e6ddf99002bd0127c
+a4c5c329fe159bdeeaecbaf479c60c8f43a58ce613e135e9e9eed4af6bf5b6116bdbfea31c82bf0ba87c3f651e1464f8
+b95eaf48a9128df7f970754af926f9865c2078cabb4da4918d8b45e95d72748750ffd12f1d8d3f76cac0936ad0097d16
+8567385d52e6f6dceeee52f6b690781f7c05c26f0d20912bacc38c23afe8f64925ba18f8b6464d4a0557670ed0cea232
+8f7483cacd15fb7e49b2f8deb7ab05e64bac18ac9dba475666649c2cdbc5d6df0d5e789fdaaaa997a3b524521f0470ae
+9252efa0698c0cb30dd431a72a0f5f2f14429f6ba50bb60f7039df45777557afe3ae732b9283b4a814d2146a8cd8b7b9
+a54da5287928a02cd5eedabe70cff80e56db252e2811842545beb14f25ab67788460a71ab8ee47cf0c1a5f8d01635256
+991a80279c622565a03929c94590f33cf0621a79b70a2168a41a4376bb3f0dd12a9ed9b16c0b6a4a59c50b5802449874
+924ff5d3a6f0ff4ee58c3674319971257543d2e19f0ce3fd0b0edb214faee920f8d6199ca794a173363a9fa06c96d7b4
+96b136b8df76ba24e4dcd68065c650fdc224fdfc9c1ab6410e008fa5b9580680c3c85801fa217917c620c86dcb5ce3eb
+95934e64af642e7d45ada1bbe8b9fe972877a674252005afc34ec2e857f755ea0d77e7759ddb24255f21252d6c739305
+ab14c6bdd6d1ccaf69e0dfc6c832751afb70f89e4800c6fafd22db2e7e5d6f2addab8b1267c8f3fb85cee51c761e69f0
+87e2edb8dec1253547cece2a7e6934b0299715e634d599316af0f076c61726c7f2aec83eaddcc9add1c397cbc9fed0ca
+91170baea88ba00fe00db375e8d948f58061f9e7b36a4573031b9996757afcc2c7e9c2d9642bc51402aa586569f0a398
+89d99b120e4565b0538b2ef4f8d8c05997cdbdf61840e068054e7f21677cdc1dc2f63adab1b6814225d14275c737b0e0
+880c2b79bff714665e9b3a0a647773a212ec5f0dea37ee6b29ed6850692055013e108a86affbe44d1abd0ae80a748950
+b564181f9ea65ca25b1ae7f25eee84b73f9db109ad1939e6b9351663ac0b083fc13e6518ad8eaafa3caba9ab959bf7c5
+93cd91391deaa726320574bb46706fd8e30ffc2308290c79abfe2d234d0f0f59ee4c38791e3bbd8c3f840a920489ebaf
+8e846d48e7b120b59c6556a0394d25f744dfda0cd58d4e70029837753a82afb63a015e79157fe8c810cc68bb481d19d6
+b36904e7dd71bada7c9b9172e4a6748287cfa0cb6960ccfb7202a36c57bc28d351e1f5371c2b449437cd266f2d22e7f7
+8947c11af34a42f314983ba9c673e62fcf44c6c1f733a697351e1b8422a75338a85bb19149fc130d01492ee18b3c9492
+905afc0103e34fa9787102fbb80967b8c917bd03abb02731fe49ba1acff1e96059227616cd21080563e92dd021117a84
+88c7acdc65e6373e4c8ac6a13d1bce1d534aeef2965a4d9f887b2e823c7ee7921db1397df5cb5e7f12030e310172d6e7
+b028c19082411efe8a46c8abfb9936c005e766e2ad3120be774172f16419e2b04ba3f31132ed2bc209e7214c2d7b2b61
+b6b3a561d583870193226391ebf51ef47185ab6efb3556ae59106b6f266776064e5cdb66f0c93748e60d557db64e8f84
+93732aa1473dc2e50610eab2c8152f2d96992fea840ac2d82c6e2c5760d8c1c05e8ecbd69e14d03713f43e77ced9d3bd
+9734c433ad41a8fd91e161de033a2a55189ae31e2af406d1fae443a182bf1977dddff93f6fe2ac7d9c4fb955c26ed59e
+a1f305d17c36c06c515d30fdfb560f899e80a2e2461d0bd947032e5ec764116c7ccbd528ea42a3b9351e3c9b45904431
+b517f46b582655e551f766930637e8dc2a762dd7a2c54fce429fdc4cd503e9fe4bfbf323f50860be2c18b3a17d528654
+b395b5c48b1cb0daa8c156188b390a78441c8f16ecc8650520f9f2914bd1d992b83849bb11ec17a47f9f2d40d138e3d1
+9147b715b62fd50e59bc96d210e10f1062c87a90263b5586746325deeea89e759464be55a09b0548766e13bc910c4d3f
+a7dfe5e7a39767d14d531d371b92fc4979d326ed0f966eeb7b4b4252d78117bf5295b3c17d1fd636dc2c0097cac901c2
+aa3f9fb858b30675e9e57170a1835717521eafe4bd0a0690b10020c7a753951576b4c7dc80cf9f042894fd5741b41b1a
+a1f11dec034733e862cdd4aefaf0252a9e8175b6d4c834b7a7d30ab884bb6ed6a1d92bb0e958f0082085cd80157a0e40
+a1751d7452b7c5596fb801466d8d07a70831e568b8ca66fdd75e5898739709795a5768726ebe13c469b1d51092d86a60
+80acf49051b7caa6efe78318792d05401f5246c5b3bef25170b2a49adfeec8048ad5a5e6d50cc498b23896176a9d9669
+94156df9959c678578ec6e12ac068f3a28d69a981443fc35161d14b1f0327b8424746d62869ea9377a86ca6fd2c95b5e
+95dd91b1e9b457de913a65f198dcdceb1fca75692853bd5ed44eda6343f32126e6aa2a309411e019dbdb9519c865b96d
+b2516bc36a726cf2dd5553e319c64fc508682c7446a2a5ae696e43f1a8c129ca9602f5a41bfbb57865a9dad1d56728d3
+90cd63b4f9216fb70635e4dcbc9a6c5874cabeabe4f9ea83bb923146d03366d9befa48b20a64f3a2cfdb0c3a84007ab2
+a55bfe9b33781501f10d5632e8f5330841eba2d0a64b0aaaa92db56f014b5e44dbeda3b1f5b2e4c17eb6a243977b2a82
+b9e84b3c617708971f5e174fb8718906f9bd353f8b0fec8fa03d1a6e4bec20430212396a5406595343cd15777c5a3f8b
+97deb79dd82185555442f91fb9a70cbd30a564751528fa0df0a681315b8a71bab5073716908ee0546d70dc41efa3b53c
+ac77c2fe555584b9cba7438a4e3904958f671c49536f185cf1f3b25c5a57ea65e15554de22def94c5c623e8c99e47a9a
+a27c62d39508552d79d2899bac6138783f308e3befab65a96a1ae4ab108b799628cf37db1ec72859a0ce1ac68f68b106
+a2aa287741f03e31f2c87fc37e228279b1acb886f32c6438b3e9807b8126da875fca7f194295c45531e939a13048a882
+84df8999c4c5ecc807819248957d68909d16ef64d94a820dd0d266cddb6775c9c7464f0b2385b7bdde8fc0f2169a4177
+8388e1a1babb941e03806b392fdc1bbe1a01438292ea1db4087b010de0805be78cfa56d20e9ef7c8b6be5a04bab1b1e0
+8cb6ec409cec27e7c4537ee2e5bcf82a33e7cd4761d19059e902b6068a9744e897a6010e2ab42ce72625cbc433892ec5
+b6e71cf74455b0f506e03eecc0976831ec9a56eb8fd0e39e5e12ae199180a4c6e5123174ddea6ce6cfd7a414cf0afc5f
+815dd267d9f67b4d229a798a499b70ea2a611f3bf2a9d3698d1105890a2b6462fcc7c6ebff0d5d709707ee4ffa981689
+b4e5b7fbab4d8a66d1b167a5acaa4d53949e1fbdb00107e62b727b4b4b2cc70e2685cd4a16266e8d13ab176f9be09c10
+8d1bae7566ff551f06baacd8c640d0d04accdd49fbfedda0841914aa1bceaf9f3f27344b80bdf5f9b93ada438a4e6d68
+adb054123e27afd4a691d2cd808a3232ab58f56fbd514935caf47b8193b4c64aaafed4d08a7a10ec4deb66be8c292e64
+8ab5255246e01478ba7dc6807c84850308a719f8f8433eb049d5b11cbc361c08930722e7e5878ad99fe1586b3d11cb1f
+90e862be1e3d0824106da33aec437a87dbd2599aeb58d46b4a39a5f651097d49943c3248a154e09e309eaa7abff3d500
+abf16f35e3b2b29a72cd96802c900fbc54100484299198b2d40cc6071945781cc9bb3eb43f6ebe433a14c1aeb172929c
+867a0f396374cca7303845d8a1e4bcebaa53cc0fc2e790dd58cdd0b5ff2b9a99e18ad4e57aa2b061826545935a5607b5
+a6b6a2e22932d7c9ba8f27b1e1de8559631a81effc77ed2cd7c45c48e49ea7d2f68c59d07a155757493ad82f733d93ee
+885e4c3904c545c0eecc9cd02e16d359ce69a78e3a355e7fbe6485762d4523f2604f2f663a4521152a8bdb6fd4a9d4be
+a668f417391b07a35c5d40ee5212cb7bdaffcf040a4f20a3d7e70e9d715bd908d4f8fca87a7dbf7b676e088ac8651ee8
+a70d67f3379e1ee0708c34c4c7a7f552267ff679460b9d8891549077c724becb99ff79b35bd80420a4290f293ed4133f
+a523cca782ced0d8a3f7e19707f9c64ff38495f739e035bcfb5483f202b209c07c50c764eb28d3bd8cf68ae093c46f19
+8ce98e5f96889ebada090449ae198208cae5c247cc5f6fe7800b4c2254b0e7f2475b632cbd5021a0871b466c5b943dc8
+a69cfdeb27ce1163ae6b6b4b5d46b49507c7e62789f2f90f7f5a0fdce79de988c755cc9afd8397b1c02976e03589f985
+acbffc94dc0445f7797a0d83e5107ad3ec8bf61620fa83e73a999ce4f9b6bbabb00245a619aa6f9b082a2711bad5ce8a
+b64162794503c86e478c23f060228105bab4f3f5d46582bd455a94526aa6d71f4c9630d8d63854c8c67aff3904681e0c
+b1288073c012a0b2b7e31708e874106031a8cc98b2c94ad0ef1d7b9df42f429f58caef5494f6d581baf12970cded2a17
+8d7ad217c3c1cb74cc301540a0e43be6d74d5a3c0383ab7c9dae57e25f8725781735b58301ebc014476171725299782a
+924a33c759249af270617767101385910494724a51fc63600836ca00d06f0ca86a4a0a85e5e87cc29e404ff8e04d036c
+a7b21ad39bcacc96cd857328a83e5d26cddd0a5bb2326da9a8f593927ae7b5927704acda9ee217176618c964d0452d54
+a5c3616c308bef98807a852e16f146859b0b1f31ea8a721941d90abcbe37eeacb4403c6568480b6d6e773bbb94a89307
+aefaa1033e47673ca2b68e4c945e6ed892e223146d4fd24219304c2667777c1b18a19488b73053cf7b0e6e09ba1278e3
+b308c690176bc43051f51839d3ae1636f6de5a57c626e8def464820ce2f96ca09ff26294a3dbc9b4573cfc42dd03bbb0
+8f7b1253ea9e257195ee92c54de41f2e7a310c90602a628ba3180e059e5bba79d6bb8110d1964c59daf4b65cd9735704
+a387f003f7731b81bace54c8501a3a2a25d8a910cbb28dd603ed16ce61ef1df34e233dc8579071856d7198a071efedf6
+955ad5523828c0fbe8ad6a77a191661ee9c8005b741b7b0439b76711b6992795758d76133399d266df5e494e4f86cd67
+a44441964f5cad7b54d0105f162ed3ec40d12870fe8c5c30bf16238440143b330ba986d6adb00c9626747e99449f765c
+a52df726de07cccbc77e81abf4f1712657c9261f65feee8815ef0e8a4ca61b8e470503801f1da8a23fe6d52f3306807c
+b5d239222c3d852f2c49997e76d97b70bcfe73d85e81258d9781f5f7de87f9c81648bcf58cfffd554e4685b2f860e6d8
+96f0193aecbeb1540678f1a3369401e916ee75d2a85f7124c555466a3def91a5d8b5f774e3156a163e1010690d457c5d
+886b9f4965120d942b076d053571837780232e139c3efcc6bd6c64eabddbed2d55c3a9a06001bd7a2ccebb36135edf4b
+897a1e4e9f4eaf755807bed984ef0bfea251740386a168061f4386819acaa337fa6d3f038b4cff9a11926e68f7888f90
+989d9706f8396ba422a34b55897b9e261ac1ba0c7a7a11a30562ebfab92473b9e9b604ea8baa6067137a4ded070fda10
+96376812651020f68c6a1f0aecd04591fdb628051f01daae179f7008ae33af5abb42e8f304662c9b6e2584e8b02ba6a6
+9344e6f3ce42ada6281d0fff654f408e61f0acce81e23ce47466bf1145a99cf60dfba9a22304efbb1f428c92357d644e
+b90c5463445156c8de69d8c35db656a76f3e195c325808396a829c11c06a7503f3c092816b3f23a263d56d3f2c075ff7
+b4dc6d948f4b67b513ce27fd12bc8efe43813c119d01b2da391d01c1cb0abb7d51350a5446e0a72a6f8bbbde2ee4b0c4
+84d208ab983941bde208fd71d58c7f9335e14db237cec42df453155a3a8dcb21dec8696a1334cfe5d035c192fc44e88f
+9577996c78372d2d6c9de27d497afb29c918bd894bfefad9059bd85cf2ab520ce1d517994724e1567f12e385c126f26a
+b778b9054776a2b8ee81be356050b977bc8aca0d0a202be91d56ba89d8a384bd29c5c652ea084709d4fb365b107962b9
+b7ea99f8c841678dc854527ad0c8ffc700b43b5b36b3d18303e51175b3901b144c53e22eea6ce7cd500f6879a80a8c21
+b466aa7d1a5ae3d9aea240c8114b3dc3af38f7d8f1e323800a6382de5766f19626d07cd6ca6eddfc4d71a43d2d49a07a
+8a72b1ee7993f16400396982b6a5198f0de08821431bc66489189d5b364b0e36daff5077b48aff1d55c9a88580cd1dc2
+a7c4dd6095f8cf61f42c5901ab67e9d1ad21a42d1eae9ca5e147a9396507c7a21747c2794f71ac66002840f4fa4e1dd0
+abe40e33cca787e7c521e2e97fb5f95cd4ca7ad6148a505afdc94e0c003e4903b1524164a1df2b2a1330fd800ac33b7d
+ab8e1930b1e592aa2379cff636e7fda9fd7f05b358f47d9cbadcfe35fbdee5bf06469fefc052f62159c10942ea2bc5af
+b28edfbfdcc27c3892d64e7e05a2aebb173808c020186c225590b03d91dacb866108370f2c14ac97a6d20d95a8e32f8a
+97d4841704bacb06bce2778104e4437c930fdd9320d85cac383d11ce9246525ad5167cbd63ef04a8ea39c8fbe3d88169
+b4b178a1c3ccd3344831936b784203919cffb611cd18def1a52ffa2a8e4286f9f9681bd48dff9b2abfe62da5fd619fa7
+afb01a4777a128b02fc22e282e0c4ab1d86246d8e0813a7e85c51907bce079766ae40c31d3c440d5f99c92e89d3a683e
+91cd070a607c20140c1f35b25057bfa20290b1435e99c5b33068c4e5755ff8f1aa2be61fba28dcfc131cf881aa1c39ec
+aaac82ccda92c6090970f60a56668c011ac20dcab26347ad40585a60b5a9b5a9af883307c55526d4eca1b110a079fd3d
+a7480de83b4cbb2eedece3d3b27b8d934e9183f448d56d5f49e0b63e24575014a94e09d406d7ca5afda08da9f4eafbc1
+8e568ae356775b06d963b440f75bad9b5977b7bcfb8fbd1dbb4daad5192521bd189674654d4ab86ded4a6be5fee27ef7
+a501a84cd0b4138383572fdd09242e3a748e593f55400fa7600698d4f916a2fc1feb96557a34f4ef0f13eee580fe9f54
+8be0f6b98d52b83e9deccf09d05fc4a7b4ae1cb11972f01baee4fabdb804cee2b0e9b44a1385238f755d2c1ce395cfa5
+afd01e3658ed9204d39fcdda2d79239b8c45dcf80fda8a680a8797b6be294e7e8bf56ce345896c3f08446e9a2a053a61
+851f0def025a50910bfb6c2fbe5ca62a31426747d9cf4634c8faa714a014fa22586c3eabde84e23ca77371ae25d720d9
+90a1aa7bbe7842cd361d0ab2e16203a56318885d2d32409370ffb64ef0ffd3c8c57658573a0714b04dd1595aabfc8f21
+af56f30bbd796de5cbf6f3d041c2f649d0f36e0a1335ba923eb1487e0b29d0ab307a1143e6cabb79674ddc01dd9a5cd9
+8429afa5476d0f3a4eed4104fdeafb79f80e94e709b59aa44b4caf0a94bf75fb3efadf76e96389179eafc389fe896efa
+91d8399bcc3b82f0044b9a697b2bc402285f6d2e7b76eec25ffecab769f3fbdd45d20897d28a8676f090edf847eb3c70
+a06f8d37404ae58c35732db58c4c6270e4311c691ecaa7d89b3e9b2bb1421ee3c3cde555d066340c0f2479faea1ae162
+8011fcbb711ba6511960245c69a73fa99167eeb4d238426bc31ce359a90a2339d5936042b281f3ff3eb976357db96885
+8dff2bc19830b4a58d2cc3c1598d060da34c8fde11635062dd4222c96dcbf2bef79b339c63fefdb1653153ef9af79c48
+84ae7869e2405e326bd167249f89c2e018817d3edf59f3db8adc25f64836ea4606c78158cb30020a54551283bcd9f39e
+b7be6cfbb7cbb7788fd60fbfcae3504d441b0af3b46317944e00a23079c605c08fd116311432be5b378ed8a11da219e7
+a3656ce4a79484e365b6b7f81a9dd72a09746da16175a61794bc5fcc0c3dd608751ea2cfcf7bb0c14421e0b05d94df75
+929d5603a936bedc69ede2d1277692012d0c820a23915ac6e776b832b9f4e0e6276fb3b257c7abbca32ea166d4482149
+82d47138de8b6ed4bdaf69526ace4f6fdc50fe5abee63f1c6d4447fe4948a84a63b7963c8a65858442856e282fabaf26
+8f8b2d05e77e9e4e2cc5229ea98c5c02ef9d9b6939ce6663d98d8e2dbed73af3d41628662c354972c1b48157f8d3c459
+9353ee31f477b51558f4ba5ca437d801f59d01ed995a8801552f8c578d1937997bd76c31aedab99fb5532789e72469b0
+941f777fc9115fe948f3a979e1ab87f133238935acdc19d33e1d86a1a64924eb9008e91bdff8d650f5e3ad06db931234
+8ee79ecb7d07e3a5fb80ec15c085898e97876448685891e09ebee9aacd5cd0147715dc60b6f75b601fbe83598f1a939b
+a96a50de4fa25367706c99abe9dba95ce1717483f50692bde7c8c3a6b427d02d59ef6e8bee82762fe774f5afa528f0d0
+a451ff58246340157fd94d028ce1ebe5ce49e5ed87d9b61884c8ad903ef9b697c4ab9e5acf66180a89a17749046c99fe
+b12739d77fb96e9e93065fe279307eafb11c795da2b9efba4cb239425faf687b9762235700d9f2cd5df9cd9fb2b36e3f
+a665e34895d02e68f1dee7ad8090558514720ff3e809cf46cc06d1e1274d219fd08781fd430367a3f09e2c591dfd7cf4
+a262410cb60409720ce68935e91c743aed5eccb4a0427449f32a4acca103f9d65413290ffe2cbc895e2e1cef96ba7c6e
+9597cf4d49db896796132aed4bdfbec71ebba08a617a611d1fece75bbfcce902e8ba228b662d0ec5fb927429f082eb38
+80a045d2bd30aff2267a5385be12c646b65b24a586c4f5cb1bdb81387e3ff8edd2358cc8e3c4c5c60cab88d4dce61d90
+80323f4a9fc78bc89aaa172f739bbd4f57f9321a7b8e9eddb74ee5c99d6c7b8dfe847f7103110f0a44d4e7c20ed29114
+943b749ab77112be7593bb2ac11094c66c94bb89d5ee2cc05316ad623a3997a38aec741ec93c24770adc670b6ad12e91
+a8e1b4935aad8a84112a99fd5a4d3786ccf1c985aca0b256c46d52a8801a132024391431cc2cfee760c25eb18289041e
+8abbe403bf13bad914a4d5bb0c8709f5b264a7a81ba0542850cb89c3c45bc294f62b22a36d7f829ca80830a3be5832aa
+9084defe85d170967c08d1f5e74ad1dd592c2b013b01b84b5fe3f2ceb260bde2e52ca22e4006b07f01e3dc7a36774e94
+a34cf1cfca622dda528589b5e5e36a4a68cee7e18cc621736e3e165b06a5df9a8e9f3ddc406838c1fe94ebdc44bfaa18
+8c5f5d7e98828d0a063d90d5f78bc493c46316fec3245d47ef8900241fffd5316e0d6d6f1653cb3b22bbf05286736c06
+ae7f2beef46b6645a6d0b3ca664c826be205ca6de35bd2809a4871f19368bd2c009ad7de0cb4c269c2934357e87c7f64
+abae2cd1ff7320d0803b6b5345ef9dd364fcc001d91fa456199dde24f474ff3d0ce94d460be9659caffe7ae0a6814217
+b86710fd69a6eeca8a813c7c1d643b487a32cadd70013a4aff4b7331ec08d1469fb17a06d06926e68f546e7f5238e1f5
+b42e9dd8d0f12f95a16112ef7ea60e6f4c76a39cb64e7f6bb4fde6ed1fc54fe8317e93160d736d97d87ff7af69ac2a41
+86e5561a7b621e68afda9d63945dc69bcd615cc099c84ac51ebf6350b25c9c07ab371ed5b160a86488e8213d143335fe
+831c730524214b8368bdc619e5c7e55a0731b6c5ddd035e9d7cd90577a472a429e779efb0ce47320c8d3b62997eec0de
+a3bcbb6c321b329ea2bb944f48ac984f8bb6cbcd38a5f80e8780257765756cd902d252a51804879104527bc7b251c1b5
+8b1a0ee0219a010653f816de88b05116269325c42811d717544468b3bf477953900394a71d56b6dea13e4e6ef9c9c5cf
+a5d06e2a43d965e47d400343c093d64bd5d4adcbe3928093c80439f815938b9e952bf59da7fb26f459a5439fe60fd49c
+b92df54cd0515bb9868a8dadb2a808d3e62fec12be3c708fa6c845c833c3321017e2f8d71f10b064fdde02b098e22962
+afd8fb1d8ced274650ecb6c370c5bbe8f09d263391af7c2f2290b5c99196ddeaeedc8b9b6173b6fa349872f58c83149e
+b359418883d3425b1bb896a9a9e2a3068c19abbb18ebaccadb85dee713b14bca5b83992cf239cfbb73adbe2f07c63f04
+b8cb045dcb0735b02d6e81d9aa9906ab2f19df2e2adb5bff0533022c03a9a530bb27fcd45173faac63a8d13bf0f41565
+b8b8ed443891d3ecd807d3f92d8c2afe714a423b97019cec3690c24002cd0444548ba6b454e1f9934f01a419206896b8
+a3c28de7e71c54dfba701b7e1053a1719032bf48d0e520bf8d513d155d588d08d14af3cf1e9ba3083f8e59dc947ef99b
+a94d1569107e659db2ca58864eb8feb03c83ca083c75a6d949805faaf7095a4f981cbd1f89a464aa46107a891ba758f7
+a9c98b0501a8c5102ec0daffddce83ab40bd097c4ccce66a8f8a61a3fc28564ce5dec37940092640b36a0ef6efbea4a2
+a473b784935b52ce73755894177ead52cd9f2a10521e9c034298fc0461aa6cfb03d499812189eddbce4b3cfb58774a3f
+8c7a7984739a3db7b28b7ef10f081e2cbec93e1da39738d082898fc73e83db206fb52cbec476c9809c7de61ff5871b71
+88b87148a573e576d0a8fa912858b7a9876001d8364bdaa7dd2759dd908555119f6f580c0d3a663ff5c2a2bcb05fef99
+b169b58fa10256b2753221aa33dc4f0f3308a294b98300528347ea4e89128a1a1da502990c9f2d266fcc10031b3c5a07
+85b1f0e49528ec8e51112771686b5b9f18e4cab091f6f97dc9a327221fde48be87f59cb46e6caac6e1af1a8c70135e66
+954021598c24f5889a642b9d20488a04e3c78c5b04bafcd0a01f377cf24b49f64b1d820ee8a73f8cc193e1de9a106a6f
+8954b280ae11638d6e9c27f826fe66c0ec584fccefda8665f75e0699ed640e8e74fb1945753f84baf606d2fcc804b1a4
+899303d3bfcf48d28aa49e915ddfe263117ab87384f611bf7d555ed141dd728a39b97eca74b6b623a20d44458f35a157
+8d792116aaba18c94069cbaf0da373c4e61662189e8bd0f24dd675531ee6f99d574f91844ace86e3d018c4603ff0e2c6
+876c457846f27161c796f2d063aac7f73c2197ce707872c828af81ffabe91a6f353c6e887464c921718425d046c0a722
+a0382a36d4f8007d444643bd5d85d0b6c3c892c7ef8158f51c878b13af6a5b7c8b098ac7a6e3241a6e13b4ae987addc9
+81d668e292ae20a5a39b55e6798255c39368d9b83ca46e986c343ff9cf4f3140e3f07115995b8fc2554dc0372e4acfdf
+85e58c950d8089ebd5d0a9d852c9e78d1e066c4cf1f1e64b4e76356745d3eddc13f1abf177dd32f0aede2f190053f8c9
+9420d1c470588085057549b7e6544aca2ca329ac9b232187d8ac894b7a878d6d3ea351357174089943b43a83f057ab8e
+b6ea12644c6ae73b8b9752f8eb8bf06312ca14d93fddeb5f79b92167ed78338964d620379387ffc9e12ac0e323f3500e
+82767d1ca19c7672d38216bf17a8ca0a52aed5dca77684da56419430f9129ed25b6c547fce50c834746cab666ddd43cc
+b1864c611fdb1b641708a5be8140ca0ac52d59d7c3fa3eaa10bd815f7f5e34413751f829f5fc0faa259064b73d43f4c8
+92f67f02d17a1ead3b01478687cf26b40fb32f055f3b34feff21de083852460e02afb834f61c37fb91100709891379ac
+b640a52bf00e4b29623c9b150635391b4dd42f0016e827daaad7aeff6e6a64fae4d67193664bc5bb368c72b138c76efe
+941c8aed9a85a005059b83d35f6a70dae2e2b5f645719b567de0da3bbf1d2b85704ac977970a7206bd98609182090160
+aa976af6c9809550721103fc8bb8359cc4313f672421a4ddd760bc4ddd86a036c1b4145049d9c8165335309fb608d6e4
+afb11dfe01bb6a9d2cc2c040e18152645b4aa972fa01b6cb4285312bcb11a317107e743efb53aeb4bb6f8a7fb7741f50
+95f8f780fae2878792aa3f60eab8954ecb107942bf07f0e2854173595eb2d4b914f4aa208f98a63b0ebcfbca46840123
+b1dbec7871209fea98676e68d7a02dd82179a74e389bb9dc0eaeb2ac2d446d26810146586b637869ddec4caac8281bcb
+931c9d571e50dfd2e1bee0c36f42085e4aa4e7d80a1c3bf99573d9d09ff710f6fa27f30712daba107d43d263b226d130
+b080bc730ed34724851d00be3bba84093a296d6320fe7671a83364ab1faf922189ffe997eca0e1ce4ac2c4435d7b7f10
+8dbbdb4f82398c891d16dbd4169716e078de5d677d3d550fd3853ff6ac8d15d278f17a2950333545bab823fad09a4922
+a71bb5b71699082cc45037805fcd95e410c29575d229a556a7c5f2969fb6f957f0c63861048c65d5b73fc4680a5c3c70
+b5bc06a742016a20c60d61cf55006cd7c2c7b8f367968f279815087b2bda7009c1773b9c91b8a4b78717b2bdf6a5e96e
+91aa31c68634a81c9784d0d6adf4dc85c981e122635d4e1f25604c8184da860b1292d65324d4bb9bd8a002572cc96bff
+85484fa47e235410e2ebc49f4dbbea9847ea064f6f6776dceb0d868280fe88bf6c5bb72e24c0ed3cb0a3f1d96ef8c9ce
+88ab35f32986f0bbd8502dc81506cb18638298e856934fa374480dc455463482ca780385537e7ea73c4c863107b74f7a
+b3022847a668b6d5d52d0af14d594c3e842afaab5416e3ffef21224bede0e1bbecb0799ddb7e095623a3a6f28b6d5f43
+8802d0e6e5203d0018d243301c57934ca85a002f91e5763b2f7372816c7b3ddf719c3b743f2530d9b7330f4f35d69d83
+85709fddeaaddead7a27d3f75e5ac568b0c9691c797f1505f5b33678158f5dff96ab98b921bfbc83368c6763420bf949
+a45ddf8ed1c273d61578bf6830fabd4927f82e3efe7732d64a1c82887b9693dcabdad1e7a65f09bde459fef89c0eef82
+970fb837063e059b1c2b4ec88011131e8cdc459daa1e704095bd327b7c94115c57cc1d9e8b4a29d6cc4f20895e309c61
+b789aabda019356bc5c5dcb015f8e7c5da25150988af0d44cfb11d8702da22fbb43f69c4af889dddc0647745d162d91e
+8ccd44696d8c52454c833b0b256ed0073527616ce49ef25a113cb9f16d41f39d27e3bf169ef0d3b2fe78f2a5910ec83a
+9846a3ae6a2c339b09f53b6cb1262114d1ce2fa3ea43d77b04816eea6451e8620f0030ba428eff80d72d8e907c8f9e3d
+80c18de89a31e2c8309353be974e42ca97dcebefc1a914e76b57609b9cb7c1c6298e2ee1bb35ab9d587f195010d24337
+a43ac7ac3798af0923ef5bcf2342550aef8551c198a31b0bc9015ecb24fd2633bdcffd84a2c84f9eb72b4e67084caed4
+8cc1551213a33114c8e6b3e00c68dd26b9cb3728376b498c95aeec60e7506a3346641ed5297fd4ead33c0e42b85079be
+afb54536b43e311eef9f584b8f1074866f6d33cfc75a3294aad5aea870cdbc3c97ab6e849ef719e2e1e4386a8a360fe2
+a2c5a2240256c64673372b63359b646dcadb108d785b4fb16a165f4b3b0ab3dc3dd5058582b25ed7b728d56d5aa45649
+b35e3e4407b63edf3eb567fdbe03eef00dadddcf41b799c80a9c9e26ddcf0c6b0b9dc4df0a0c5d54bf31ac8273740a32
+a3ce737baa7e1c1c69931a5b2fe1493a06fa0dcfc0b819ef8242b4fdae8d63bec8d15561d4fa24ef6d6c3a326d0abafa
+910a67b377fb17d3f9cd1f994db52eb5f35a4aa002bc1b7208b259b12c64c095e4dd65ffe54772f8e2773923a890bc97
+908c5ee131dea3f444a9ee2052c93a657d28f2f58e604bf08e51500a306decb2db964f68e87d5ac2f8207cc4e92adb09
+8f3de5e756409b575ac2786590fc85de506f0adb51450f5c24669bb3a688f080c1cc37cb8e7a3c8db8e25c49a4bd76cc
+aa62ceaef91fdf09d2ac2edbc07fcc651584a7e7d7d93e7bd4bb4c42105144c2da32326b3ae320b36a2df8aed07e5610
+959fc29ce63dcac2b4dbe8180577cecf9bfbb6db6505d76aada43ddfde5f48ec8f6fed14fac19389f6c9ed3555ef7882
+984cbe54156763d6ae078d6a8205cb6f9d63eee390dc5990f5d8e85b9a19fef563653d3dcc190c9b18c2232a916b1409
+923b448808d9ac04488e8345d3fbf9aa57cc3b3f375af138b674daa0e5a864faaeabed08f94010478543f3e1248c699c
+8c0823bf2706d9aa4c074673e9d221eb021de2baffe8b703e64e676b6801da73440b7793254fe4c8c48d2ff395e44bfd
+93c9cb050494824aba0d57320e2d1dfc95c988bec46dc8d73f7036be9ce0d7de02e56ad1ea3dd8fc129100800aa639bd
+9339fa01caba0f4837efca7a3d983fda1f6a479f63890db7f7beb837e3f6535b1f1d0788884dbeb73fa657410a4ad308
+953f213ec904d4540b356d53eb88f646a98581a6deeebdf99a6646cf612e5b07110839d46c57b76545f6879f12371b10
+99a4576f12de20fbecd3906e48dcc784cdbdf7fa0843c570c6f59f13cf3a559cc1f4882fc1d31015304090f83306280b
+b07fb8b73793a236e58b7181df5a0a2e8d50c1d3069c475c6e178e32d14b6e75c45af60a8b54823c23ffbb316bd4a98e
+98781507866499ce396730ee91a08e91d3be337690f7195750bd43a601a8f78e9475d5ebb43e347934429a4ff3db58b3
+972a5a21354beadf80d8a6e449cc4f072d6b747de293f075b8e0925c89660db9195a30188dfc8b73dba02467ae02913f
+827dd2e21ca88891b9b37e10f0d6b6304438cd6aaf9cb125ea7ed822078a233f3e1b49a8bc65f843e9551691b46cf91f
+ad3a4ebaccc157a7b880db6990a937e2d230875f509ce864fb0b7ba5febc7f4668191bf3aa55b85f3c17ce8b7d75b349
+976672c981d106fe1835188e202adf6ce77314f8d7c8f797aacf25f00d57f8cfea31b057f6afcb40b9f97df6ea387979
+8c77ba87e3e8fd5de85802a764b719d67f4edbdace75433af7fe966d3d18a94778c4414572b84f98bc6b5993a3225212
+84ca9b0435001c246143e50487a55349bf38300cde86219d29199e2e9137e262a1619ee7d6f6c44b9551319f1ea8526f
+ab06e3313800a7dbb970145c1e89b7849db8a1e3169560fe2c64956a1f9d1d3157d531713a8d7c2213356b22fd3014ed
+a0d04163ae987227aaba1ae82f74fd1b44387501fa47fa61b66728a0697155f48bb44b9eb5e87050a5bdb7605038db12
+8e76d3e50853ba5945610251dd18736b8541bf72bd643f6b561cab1c028dd044c820fcf79a5b45882e7dde0ba6db164d
+967ec8fdee2e6d61f0ca2cc255f4e72c41a9c1a62150318be0fa508b424487d9254ad135fbe8dcda55caa51b9901eda1
+ae25c496f872f7380d9c64fc9bee0dfdc0f05cc1d2d6ea7747e166cae7e67c17a72a24a9e351de15f52baad355625d7c
+b8a95f3bc67ad2a2d3cfbbf2de2003b7bc894b3f99f0364fd181eb11d154a7193b1df9b671a3a8eb8bbabafeee2d1a86
+b79996f818d94842175b06650a1e7819cb12c96b6ba37e61fa14b67684c2879e7d3884fa6bae06faba009329db2b0d1c
+856e1478ef99338f144757fe4be68d935f0069a05b0a6209be2fac9ebc5cc669c6a80825d3c74801a54ff8b1a3777da8
+8024798b150aa722dc599f288cdf455479763a9bf776da74d5f9cf76026500e5a0282d840e5ae5451a0e28d507b397a5
+97cb767ebfc0a6cfe25666089f85e5a3705c108096a38151baa22308276ebf7cb3c04079ecd130cb8cae1689508d4bcb
+874ff07def0f8d32f2ffce7cf31a43e8bc5e633b279acd7138ae938e46889e486c092ac34924aed9a4e1f93a91994211
+ab5b6bec8c81133b6edddcd048fbd526d59fc8a1f5acd7aa72d07852696faf5e8d305e85077450188cddd43d6c1aad27
+8402f5173327a95438797cee3b107407e8b277759c942bf1b1f975dc63ab89b8c43f0f4ce2a11de6e5727e9952b8923b
+a5179a16297f7a0913ba61d69879014b9adb5e41813ac33acb8973e2b43cbc17a2f9a7d98210b39471a47b534f0eea23
+8f7cf3928b51b0b1bce18a34da935e7e2558595e4ebc50cc1cb698f0bf3c1ea0050aadbcec33786118d791218e1734b1
+81552a8927942591572429892e5a1572c8bc4fa7901395a5a2de3ce9f1ead122e4e5ffef6cc8434b3b18af1aa62e45b3
+8999a1bf4f22fdc884f9310e7a3f5baa0d32c04e887c51a20736cff3216f3dac5bbede43632d29704536d7f275b0be9b
+85d9952816412a890a3e479025d1c0c8858337498ae28731ae23332c16a788cfe51fa9836bee73d03b253803096100a9
+b6a736447acaa6f4d83998973cd2bc3e12d34c6c076880e6765513c04087eeee5b5dfe9394c120a85bec8fbe127f1f54
+89302db4ea39662024c748ff5b22108c0f34850f0fda476051a89a3eba0e02a2294a4511666987d89f3b3bbcc334fdf3
+88ef018d32e6b379cea9ce35d1c12af698d8241c4c7468a5d558099f5101f04ac8e49d09b6bf031a811970faf02ed0ac
+b33afb11f73195a7132430dc3961252251aef42150e9aa63a8c7cae724f467543a4afec289bf27e10ccabcad2f7f812a
+b706315deef0529725fa6c4520e5d320a028b4607d47fa6c4c8ca3558afd68ed65dc072a354d263d20405bb13ca119f0
+8ba035d75939c1a3cfc72a9ad3aa4ade105880345eaad9286a182950368e688a182f6175357a2e62d977ff7ae08959cf
+b47ca04b80107eefd3a596be2e990f5f021cafc6b7fb64cbb78802f9bb7bd2cec4f37755c451bb1fc8786a076e90bad9
+b6fb1676fbdf6cf95add7173c264b820042511e34dbcafa76273ef5e4500ad1208b274855985f0eff5196e7200e5a8b5
+8c7493894853f4e9fef5a0143dc134f03eeeaa10c80c5a72afb12f10ca5207df1c7bcefba6728d61f3f89d3978902629
+97d14d9debd4228be04f2352e57d9c8138d4e40228c269100930e2a3f6eb6e66f2f99807be0c9857082ff8b9a089049e
+86e327360a19f6ddc8d0362cf92fa84677737064a94d9d0c1031bae92b85abed36193428199b0f66720be0d6edb0d28c
+ac79bf758fe91d47d1ddfba62bba87f5e64d93f82309d4d07b62d78ad6ae95908e1989299db99ec52c5ad8c8f3d7132f
+804712afd93328864a52a9f9ca1ae148de26fdec7d9f51d1bf8c0385959ddfb639ae0904c855180dd418ac21f9a8a7d0
+a789e15cf3c1e911fca7f6759a2c5d0a281c6ab744f29709b8d0623c1fc197ed9bf56b89fb0953baf261ffc4bd8d1552
+b738474bd1788f326c5145ca2a468d914ead6dbc338680f62ee21b1e5fed49fa501236d70dce5363a72147b0a8974c8c
+a34019db5e8d5cb680a78c1692978ce0f3f8b21c1615ff65f3d103ed5a1e32884680c90d1dc18f0edcd8a506b1003806
+b1b1f26ed57a7bf77257e2ab1bf314b22e47f8a4f4c5cd154beaafdc34b257e9b976b26c8d9f1508498b6e8c9e9fd2ff
+a5f645d7a75741f536e5218d4a38ac75f5f2d759e62bde2c9b628a4cac299b477a833bca98010b6c2a8f30b85f407250
+b3947ca7df831d68107713bbd52fa300411bc14362c37c2617780f5d621e211b8bcf5fb7099d903748420818d840234a
+ad16157ac24899485e7eae71eabf9e4262d01b8f8bde30d7c79fd00ffb4c347d765bf2b4a30c260c9fe2e5153a3e1c69
+b1bcde4588570576872430e704a64d7130f921667c13101c3fb771efc1e0bd72c4ad4b8e35cbb98d709062257f0ef59f
+ab45dce0e29201e79cb1da61cc4353840eb8b47db99319ff7802d2e18f00e3fa8d5e70aa6a797684b4a6741277ae033e
+b6977424f2f5b968a4eaa9dc1ac1018ca51e6158a6a4c189f0adc94ea1c2f30bb33c57960a5c972a1800cca2650e2f6e
+899f48fedeee4badd5b69632f78a244756458529f27c75d05e9c54cb29579abcbe4ff7567445ccef96274c8cf5b7d31e
+a8225095071acb2610d28d9ce2645280a84c702f5f5040df7a4134de1144fe1a1b07d3e28d4ff5e2517b4b2bbae674f9
+b48316873f8245854568a37ad9c5fe9d5e6d9ebd60c9cbbf9e6f63c512bd8568e3a736039422d21d383378c77d8f10b7
+8b40afa65e47ba365e723b9e24bd4a13335455e059346187356ff9abe99cf71eae383ee33bc184a9ec17b32d0800f158
+96c3b7ad1e31b8d4ac0e14358655e21e687beac6f6b7b48dd3750641315ac7088352976e9804b9c625a712f9d4fcfc4e
+914dcb36d621753286340077d16b36bdaa1414eac7a8e7ee84404a37f8fadda837bf4c5a932e8b0f3e8e673832e9b3f6
+b20a438985a4bdaea41b98e831537027f4bf19ea9c1ac5fd37546eef117cd3d41b9c1b125d2302ae3d41176ab5d9e9dd
+94a4cf3cc42d7055b55cf58959a7715232a273e66ec6f83fbcdb79d01769f7e6b1e328f6b0a910d1f8cf7a5ba4934779
+a62b07dc466c2f83dcac7fa98215ce5bece548164e32b4bb3aac055b3c0aa68ef5cad58bf7d392e3b1d54ea6f0d9f0d7
+9870784890da6cb0223daa367163cdd41ead23c300d246d62debe980fc3e7de0b42576309ae35da914474b8ed2c5acdf
+b0f28a74169391fbb179ffe8647f3e6228e75b409c49ba81d34ce780b12d408d2db5968e9664b9de6a7416d2f6d1c1cc
+857697b0222cce1458ff591e1add39f5632cb3aa2e589a64166738d8c00855e354c2ed44c4cee8dd707188790fffe6b1
+b3566bb224742d0871ec5d15ee890755d7e6727aa7e2f374abe965ef8380b49422897545e2cf8fd3f58bc81f05abf173
+88271995f9c647da82820b042e59011121ac723b4d0a2e461cfc1351d89cc10eb7d18830adf1c7b9fca55ed3e910aedf
+863a43548db29c9cf35f24c1d5f7aa984ba21bb924dd9e09210a1feadb1e0ddca98df47e970c230879faa5e7434b118b
+af5c71b27157a2391247622a5029ba11d17ab4329001b01b3236f38d67ddd6b8902aebb48ee9c963983c16f6d8c53d26
+97abbcd4fff0d1ee2ea777788cc146c1b32601fd93a5ff9908fdc2de225b954d8fc0c9874c258dcb90ecc7fd169823c3
+94129bc418ff5d00ba3a3389b62986fcda5714ad25d25091db12a66e138a35a9e38999c4cf38fe7cdb1340c099c467ab
+8a785f303473e763578a5bff75a069764e346224fa2dd8ee3105ca779cccd5939ed8c21f7369bab9947a4ca92d3b605e
+b37d1644a00401b213f29191a238f4c9c32ba550db2ab3b4c9d1f02021a8f6972ab0fc76d0bc5b9c6291d5edb9632658
+8e42a2c87d7feadf1a2dad9dc822b40029eeb8afb785ce574a340929c4c6ddfe4d750bd3a482e62bfef1bdfdc36f5bd9
+8837b0408f48c8b975ae777b0516c569dad0daf607da51f187bc2c67d3f67315340848fabf7ca78dfa46b05e3fe33005
+96d53e8e9b14e602dec666fcbff8ac2a7ca0474605b294365bab5f5228d8cf0a17a772cf2f37f7de3607f7ea6127d0e0
+b286888ab9afd161a714fcb1954f6046754c1e3e398cf639bc215327057ae68ed69113481da88627839b551cb9660be3
+ae5747c882d3ad685e481b0b42907f0934a717ef5b0bcf110fe3125d40628959b879186464f95bc4a69d90754034c141
+b1ca38e7b1f87e4c878d4b878afbca750fdc2509f625a06871da830c1f68a6cb20dde7d51ec73a78454ffdf54451ed47
+82225700e9b32f416618b074479302629114761fc721ff492d792d4d1a4d6fec887185aa81395703fc8d07a67fa4d87d
+a132ead3cac6087bc7bf5153f29ea858a115249d779419e5c52f4d1f2180f4631caf45ab7cf90129af68bf67665b8dd6
+afd4778ab2921b6c9c3d3e2d8ab7e33882f7fde3c8f66d6704f0859f3bec468178eb25a103b78ab092de5b694f2d2ff6
+aa0123ab3e8af146e974c9fc72dce94554cbab212336c8aebe618ea082c15ef02c6b47b6c575d262d1cc6b0cf2d11f47
+a5e35113393e82c0ff3a39afc99a60f90993d5e4995e5d21a9a395ae31074ed5e2244214d4dd877c3d89e52fac6c4252
+b2f476cd5d9df15e624713f22716ff01790f2fe16957b526677bdd3d203fa8af98ae58daaffca10f84a7c61e29ba1d79
+82d6d062828337677ae19ce13d27ef45ee55270a27e674946c7c1c762bf43af6391d77454dda4dc613b519f4cde43636
+8e86b1803d4ee07791269ec9175dc3d3b595197c089551e5bec3edc55c77532235e64848aba62e43936d3e9438635f5a
+845b7233e40eab725c241853013d1884d782457ec188ff7ea535926c36da0893882fea2c9609f96b6d85392471b71d2c
+a2090ef73e125c0809f2bddcdd7b74b4f4eae452d76afebdf47691d2afacd1db7c6a3032e9a4c4ca744bb496258b8ead
+98e759616bf468bb4feedbebaa8df381d01cb4b0009a5ca5fc980426e160698abd6fcd2095cf964eca6f8d92fe1bfc42
+8a29df48ccec0ecb8b3d904078897d996ecea1d2db6b40b79fe51bc5dad04358d7f7edb6543d7d1cf0c1f54544c3d85e
+9422e88414d88e5d84b17f9d2f1c50fb48e9c5b8de215dcd7c52bb26a6ea71cf92c90f3004c4fcb34040eacf5b60b06b
+a643123915445bf0e528d36dd7f2da9a3b993f93a7fc9f6148049fe14eb5a0063575d971ec955aeffbdce069d0bc2937
+81741f92a157bfe12aaabf0d81121e5a8c7df2dae86f5fdba826167c4558103363c653a928babf4ad7e3e80634d26375
+904fe8e258be2500bc5566c3890a9372c9404935ba19396e8cd30289cf02bda13ff3d776bef56dd87ce57aba0a8539bf
+811997c1d70feed33ae3684eee512a46ea91400b39638d405a8bd6f1d0169706f48d1c04beb1c5afc5b10879390a1a0f
+a4fff30378dcf1f04eb97951b85abc0f5257b9e53b7bee814a5acf060919d73504db14d55edaf54e4030b4c1d7278c57
+ac84f2568084ee7a715b2387e3fa3b15e6940a27ea99b4fc9889c828179c55f29992b68d719323c2ede8ded3a4e16553
+8fa542c15bd29bcf72a34b3c56eac1e7d4e4f3b15b82672cd956d23a9b9863233816ffbcc6738a225c86d9dd13d1c3d8
+90d94517e7f1236e49ed6903db72c0de3098b42fbc76afae7abc1b09a903cf92cb1bb6a6ec8c29331e05b8946c2e9e2b
+916c0d6b1fb7c74c0001599211ca37812f30c309cb6cae529c876221c5e7187876d37268776451df2aa44f91a3a17a11
+b9ae0c4f0c00e8b07b489e015711346caedfc7cbbcb36acf3a2ffadf2a8f11118f93cb70181c27443d42634b2f2f6d90
+97a51eb35da8b67e82d55fed968ac9aa42cf2d1348ac146d534344c4c7535c29ce25dacf9901abcd7e8c43a83e34e25f
+b2f035822c552cfe3325da99f28aa31b847477a644402d43379947ee219fed751497cfffd3536c91f2474a94bf758203
+aa2fc0777c208a2efb2884dff33c459f2f6c9dd4cba360a65918c8604cb02fd493c8e5d26069953bba56039f8bb694ea
+84c63bbbea15e06775bd39f39995afc613586fcbaf32c9ada1410dfdeff09b8e7f3dd0c99b23c678ee72e44543ee6443
+8259332662ff222d4d2f817bb94033d458e650e5f6e2c31ca84c6f3a4b3d2e8d1f40593083337a17193cddd960ea86c7
+899fc292aafc17d01c06cac50a78edf1f11c8c3253f4b32116625537351a1e82ee3cac67725973e3563fdd73781985b1
+92d3b9aab29854556666588d94c3b49d159c9ba9046487583469ace7a6b8ffa61164839dee24d28dc2fd36b9387b6225
+b54f62077e1e42e18586a03b3d3fbe3fd680dda6988bee8aadc95dcde46c215167b261433d6cfaad8e2b3b6207662af8
+a6c021aa10019319f944f8a77455ad5b153a502dc9eabd9d306be3830a4fa2539e3cb380355953c3581f12348b919214
+8cdbc2c995699cc83768dd23383fe492a1bebcdfa55fc4b9d1113e510a6f4432ae55fd57db732eb56265dba6ad452c46
+aa474f1710bf6556538fe389694b4fb737713dbbc9c93d8a879dd3aee8e004c2441dd14b5f4cdd4a98e804d031ce00ca
+95448d62b1503e71d47ef4f5a01c60c938fc3cfd9280d7b6d3490ef331131130630425adcc53c9c96f262a80c3251e4e
+a4535757aedbf6d7b9bbea99f4bb7bdfd1c99d5d976bd8d4f8c69ee09c9902ea81884d8b6f4fc084e12702fcbb9e4b3d
+87796bbc38d5c2d9a56a65ca91a40530b57fc2a768e9e08a2081734bde163f39e069edc99e87a84b539606164993f30b
+8cb7647e60f023066c4835c956186b9e997a7425cc38465e95be568ab448b7303977c7ddaca73b78f6bc137f25e5e020
+90584dbd8f672a349682effe2f775f2bccb1911b06d20cd02f3a6e30311c6678e5082ab87ee47af72e0c064a43592bea
+8886147e87a552c74767faa64516438d6473ae275e72b4cdc174825696a4d7878297b1ecd0fe1a62fa4559ed232e9e26
+b739745959c324a62943a225140daa51faa8e41c8e20ebd68d6f000351101a89341641933dcb2ac5b3a45ebbbf7fb26c
+814f858b4c709694472eae1c82cfb7370191ad6d0cc5aad69084fb8e9d81e90ac2fae52b4051af25f1b806c273f61e0c
+a00426131acb84ee08684f2fc2a3ef01290e48e6b5f96bcb0459adb62f4190a4b2616eff2a2712991c48adc551ddaf64
+b37a1e92b72e3ba42b79dd997bbeb031a392e42606254965597ea4b8a2ca51f8c324619fc2b9f886e17b632ea3bee629
+90817db93eed264f49445d1d3a14ddc0d5ca93191b6baae278b4c48231a56b25725ba6f7ac0e9c7326755f0082b79587
+95b7f470ef1630dee768698a31398e8cb407df3b651a15493c38f6be6c7eb387148124a2cb1fe1237117617017c12203
+ac49be639391aa5dc08e8678cc690ff617e9a0ab40166285f90c2d889c87ac70c455a972e61cfc339db59be4394a0ad1
+a6f5a698508f8047edc45bd605ad4e88245de20013e7a4e51994e99fc60d81dc945504b24f23f7241f28059f4b5d6756
+a4d30a6db06153074871c6adb0ef4e562c1491c1f9841c110359dc41a3bc0bfcba3b49fa53c29b8258a814b8ba1ba328
+b25a500efa7d38f797395cbec660250f4a00d104459cdf7a15b541db3917e26bb7568526444d469d363040fd094680ab
+8444d11f8a0c686e2b22642ba1b28cc556ab7311686028e3fb4040fcce22959b7b6cf244b77c711ba86e350e17411823
+8ce90bfdfa93cbe58421be78e30e471b2c6e6beb1f9b3f85031cbe269305e18d25a2170819f2699346bdd735b6f5d664
+b73970a3dc993e28b71bc236b3391acbd85a8cc622b79e669109f9d3ad7ce7a01a8686e75d85408c54bb70ff9771ca80
+a64cebe05fd027069a18f152a18be155ed65b6b563696e395e045c8b2f0455fa75c2ff41c1247e596451b36ddf258460
+afec84a7a480b09cecdeafd025ee3ee02e3b3338b02d26cb3b7575ecb895057650f0955978d1d732ca2e6b391ed97728
+8caaf53038bfad6e0651e61e9a44a39027d456ff3ea46ee9d8e190698d5a66938d5c5723dd7bc75f0ddab660e178383f
+a91607e39108d2540b4b5c9d33d96328f56ce9574ac9d1d4a81ab5c938443c3d7014e19f77cd55ef7be0a408e44efa43
+a3f4c6629a3c0f34ea060a8b976096e6fd3a91c24d2b056e9b6b60088bb0c706e25dfb31079f42e0ec031aa840f46afa
+96b9c7d3f47ec35ab0270cc57841e9f3b3f5bce3d26faf6abf6cf657b6e949ce0bd1ccdcf9d490beebce722aea48caef
+abd2433b4003b7d861b35e99b51e2eedaea4831776e7c289beae2b561ad69a771233e3d6bc4a7f869d0744c5be61b5a9
+a989e5080d39d4031aea86c03b77abe069ea9b7fbc515c6a79c825eedd6a9bf6a0ced1891eed20edc605f9e25a691f74
+93ca5b311d28e4dfbf4de84a1e1530a9153599e0853c9abd3671a1ce04995e00f7d3092895461137fd78c72d24a99494
+8acebb0309595f4eeb990b7a1543f0633690b7469ce89884d5654a7bd2d2543f09232693a04e1e1b445e6e0041c8b242
+abe3858cea5a873a7576d641571965736d55d46f9040fec219803740dc2a5b43c72689e94c9b61d3c3c44dd3a821b694
+947cd395aef4faeca9b78b6cfcc8b2f8f361de884b29181266fd95b21ca6176e7944058e20cc77c7757fbca4fe445394
+8c2e50234c75d645f3c887693e2439ef42433eff328111b9c37aa3ad5a3b21678ee44ee2959a91610006b27a0f5363b2
+967253e02e34069ac676063aae9a493bc6d52b8bcbf1da6243bfeaa9fe05f8c840ada0a282df9c0180d05eb866402441
+a16a4c9a11686a5294d8329983c8a4aa0e6e5ad0003ab319b493842e8d072aaef45c3335d9a64bfde6bba120a48a72a3
+85187b866fbc72e5b42b91d76e7ec2647b93bedecb060b7475236d7d152d17f901c778b704f7c2c1d3d269341890c233
+83b192d925e3f4a1fafcf22cb48083b2f88632ba93c1d498539bbc4997f61f74a0a3b8d4947253a0daaca8999c407b87
+8338eb3e7f549988435f4f618f4ae1942c6756bdc28a80dba7ccc530bef161c0bbd20f77c8c4d63c94e60bc12f7cd387
+adc869c5acec5e58459eb804c2141e03e3582ce1fef7d40fc1dffa3ca0f923919e291a2ca4a60129e2a470cdb395be31
+9279068c28840f2c34e48e9a7e7e9406907ac14bdf4eec7b8c28ebcfe16a18fcb047015e4309f19e6fd73d6e6c454157
+98c4fb637a868f161f2f4222f93f3bdf13a61ec1f4e4c20435c150fca1bc0c01c790da91afb6227ed2a6aa540d70366c
+9209fc7b307f40294bd9cce166277a7ade9c64277c600b3ff09579fbfffa471a887061e9cb5fac97c423eada30a8a52c
+b1d63569d5d47d052f3a6e8b2c390bfac1e92098291a2adb209f20af875ebb2a8669533155b1d15b232690e26d399ab2
+a2c975c004e69e7b0f22636141d34adfb2dd1396c7355e95fcd0493e931eb7eb99b4df0f0f202945d7bf837809a29ed2
+818f48e65e337913c52e9256af134f4311be84dc332e3ac4cb5ef659b9c6e9cb34f04b0bcc0e2a3a574c9c3cc51d7368
+b92b63d0b363a368a348a4abb10661c38ced99a3132afa6cf002b81e6cac26f862c9d0a6886aede555d7bc453753cd37
+b4051275cef361cdebd254115275b0b86692d3802241cae5e2c75accee7df98d3165cd1de86226f382e736b12d9dbac3
+ad89d85749c23e045bcb95c3433eb8038139a51c8edaf06b5cb235549a2f9ad17589097ff8a350e934c8662a8879a3d4
+802010e6dbf4265cdb5b5362c0b197317f2435253237561a3a7bc6766f98b129ee06d370382998ae70080624fd65831e
+8ed6a5b601a5ee11e983035f3109075444b063aff693b3601f87c0d76d2ac253459de48d0fee32330c3785d38eab5cc2
+a6c8bee787c4b87137f70c2c54ad3ad0955269c7ea57ddabb1a215e613e250944cada7f241430c0ef09f8eee29fadaa7
+a3fc6a643e1ce110b08344f8913ea7f8c9e44bdf1a02978df8dcd3671d9b357397df9857fb11ba220521d1ce40064ee5
+94089626bd9c81247f45e25e573bd6bf727a0e1a7dcd630dd5e661f65d4b6f35bdc16b64da648dfda404b5eab39d9152
+88362a160a95f01026a2e52aee3521e8496340f96a35351892034198740d8b6159175c60b910a4ee05af488dfa578c8b
+b55a5b875f5594bf41949c212543517bb1ce34db3a896f93d0216813261aa95f73663c789ea0ceb2bf8815255bd328ca
+8f9acdca0158df5ecea4d574e0ef0c256ab271d9d3d3bb4100761f5062f0a1a5d2b8a23685097a1a2b2a08287a2e2c94
+b6d4e3bd49a17fe7d929b41fb223eaf93141453f7dc233eaa74424290014a63ca6a099174b687048d59cefd41fc720db
+ac0fa8aeca20a0b4189e96c57c85a2174338550855f9d0ff0c553e773a1a1c32fe3f8db7c8362bddf601e41380c9177a
+82f05710f08f12b206b2ad6a2d06161c884b2511ad90b43fbfcdf54933c2360b7c85dfa4f598b5bdce8809a803d483a0
+a2ca711642fd498cfeb897e4072d13e43b5cdb2480449975188fdfbd4b471070cad941af03a2dd8938d3c376366fd199
+90c27a1df934339bd0821cacaac41fa70496900044aadfccf6e5fe28ceaebae5cbc500fd6f2f88c5552b7fafea79d06e
+818651b7c7a6f691fc47a61ae4960bba7239007e14930f3a8cc9c95dcc0b03643047671f819e30d89c2d1891640fc13e
+a88f01062ded714e7f2f1523644222cd8e8cb8e535eda88738f4b4b19079f4f7be664abedcdb618ad1de3e74689042df
+8174282a183f3f393667352fdd60460d2199de16752c372a44465f8b71ca134c410d1d81f15afac839748447875f8643
+a358c3e53dd70e1a608f36a1fdbe225e28c13b5817dba890ed8e82adcb7ae86fa68ff6cbda7e02e8116c11587ae1ded1
+8aa0bc208a84d5a58b0206a8fe5ee3c8d224ccb86b11b7c9d924e16b2853a6c3623502dd60b94f8d720810e0079078b8
+8bca870eb6cc5f7b5f6b84f88b49d9a3994e61ca3f2ad963f28f925e58430887f5362ed4bdc2a2a38b5fb9e774a75cbb
+ab86840fe84b1eab81675eeee17f85a500dfcc95dc4872e57b39919ccc71b702585ab9ac66146d264d2bc8fa39338a72
+87c46966a4bbf2523dde607852a40b26cf3431d0bde9b2c609997c0f29c5932d28014026862abb7d4107b28ab8e2ba70
+a91666a8c846a9944ee7ab243ab535e4124ca8bbb756777609aad848527b354060c484acc19c333459c09012670f03f7
+b7145784894c6df87d2ce6a06cbaa713e46097b5f83db60e5449e62ed5bf382a7fc3136e5599226a2fe7951847527c4c
+951bdbaaa06ba8b427fc4ec6bb44e93e70692bcef6369fa06c7a6882227d27f09465f37f0a5868ce43ade188a5f37f8c
+b69662dd5dcc9ce7bf24be8a0e85e80c8e5af9b030e740796f91de548569bafa2fbcb19d98e13900c76cae3fb601a8ca
+9630a7eb15718a2324518f78f26a71e3c801a8e2eab3236be7623807321c128ccd79c74ab657ea8e115d6ff3078a6887
+a2f98c2084f8cd556cc1bab19398e98921ef56f6445f63444384efe5d7c895690c57d0d94cfd24e99f63f5e31859e34c
+8c3994d3cb76fc6ac22ba2049ea4547db92ef78f009d24f08695b282c95e395f2c1477bd52d3f569d64551aa5e259b5b
+b58571076faaaa547df9522b48c684b310500850339d79d2349dd8211bc2c8307d13cd5bb7571e0b5baaa013b502e410
+93e07feb14f691e66be756b37467f290da9a6677b8ff565964f010fc20ed9c58d8c712c4abaf012c787bbb22cd1473d9
+b4bc6159db1578111190b19aa678281eb2fcf7a82c7f699da7473720493e66e0ab54429da7af24315ed9f7399863c954
+93cfc98563f25b45c15a07780ae0a38c4ada52ffc1350233a3b45417c16cef92e7926354b761d0e0de55aea4c1314406
+820c37c923807790d77d2cec39f0eca63fa3ac6eaf0a1978522f0b1d293a5c46af3a0b4ca542cf39e796afc1fb3d7195
+b87fec722faec6a739355fd30a2757e5d184c07b5bbab8581b74eabc2da413faa6d11ccd65cc93f886c788239b1eefb7
+a183bac7f647a0c15b14089879a8aadb712f079bcf2078d3c65851137a00dd3ed7e47263c064feb19362f98180aa425b
+996233b2010c20e0246295735b6d5b3e932f2aeaf0b35aa3dee66b6296f39e2e7ee95a7e1a15838ff3389ecc8052e315
+85c943e09a6c77e15d49ef4fe57d89744fcdb705ca370cdf70b3d84aeeccbf2155868f6790333f88fe36e08042ce195d
+b88f82b35ae14a3e6fb972c47123236bb7db08b9f9f3828033fbf5a895b09b9b0de423f1caa04b3e8e754409b21f3a52
+a12c957409b6dd335964532ce3c045aabd280188b4d6ee809cef479e51dba030cbecc86b0ea8777cc8828c087006c5ec
+87227fb4299efa535240793cf0079e952e971a18ee62cd71a62d6a5db921da669c5d8eb1bbda318ed5f3b03b38798a73
+84b5c7585fb1c98d031a0bf6fa8ad5484c7766025af552cdd72e7ae59247deb845f8678862c44ebe640a7333cef8391b
+a94cdb0f42ae3afb4b1878f960669bd99008c7ddc24f2fed45ca521c60472e5587fa9bf97b315efee1f74619a4d9b762
+969a9bd21a6a90aa30fea44e397cc88118fd5abeb68839556194f9ab0076806aa320928a8ec94a47c4eade15498f5175
+b2fb215bbe7acc3baa04b0aa9be654afdc450faabe2702a0c9fa760c9e9389a58aa5e3a4c6af4f6f5c934640d90b59d0
+8be6a43071464e6c7dfb0e9a791a658214c1a95adc88f144d8349ecaa0e76b8ea5f88cfe95e82694bc170e49a43ec4cd
+b75d56cfa1f3b61428d24784d51dd65b78b977bbb52cd71401ac7d3c2643f3dc097d6e7668104af402cf7e7e6ddfbaaf
+811005c49d1be377ebd2fd3bea9771089a0f5675c55e9da5f31fe13cfc9d1ff8520f085918279ccbdb0363eda16f8056
+a487f7000c16429f2b7bd7e8bf4990bf26f666f8aeb11a99114d33e24f946cb0e3e025ec8c0b0721f9be101504c8a1ca
+99b72e711ba7b97083976b2db7b97346000a78bff9b20ed910eaad02f6c03b45fb3f0f1217b328c3e2d87b481eaab52b
+828429d387a0b83ac8e377b32db1c893a4555ca253b8e3159399cd053c5de726655a2ad39348c8e7ef11b37b0bca78e6
+835de10c73da7f0c07295a3306ffb18991334c86e5fa4c6df2d8091e8989f6454c8b43721b13696e1f665480a64284de
+a4ea48f0cc5915993c83309df99247dcd7df4c15c723d168759175010fbe8d84adab8393707cb338fb90a6a77b69745e
+9976bc842b06ffbc5afb309eef8964908802e9a5c733de4a8292d5d5773ecafb6daeecc63a8dc8847d76b77d4c3915ef
+aae89156b013e4adb4bd8e7b6007937f0ece09af077fd407798e4155dc09a129d44fe8f8b5f6cf6b3c84746181d7f4a3
+81891cf2d70a8c326c6870a8158edb79babf302b4f9d51229bbafdf038cee39b97f01694eb719df99a62478bbf909a85
+97bdcb526108ef3cc2205aac074ef3001d528f56b4889573e0f4a3a2504232adf23880f7fa2f57bb787ff30b89599da9
+9778949a95fc663c742e70596faf91ccaf8b5b93b78bc2d4993480722ffe10bab3c8df3ae50535d258b6e749a0abb86e
+88bffdb927dd88c1ba3eefe7da3fd6a42ae494bf282e094893e144330cf08e3f518f47aa1dd76d6f249cf83e6bb9d4a7
+b53effa345fe59917f4f1ae754e9f6b8fec9bd34cee85872b3fc47e52fee29c418b9406aa50c8d5a2e853d6f2056a49c
+a616775e7e77e846066fcea413f0023dd491d8176dc450b0941368680571cdd236f0f83883d268842fa61dcbf3e4864a
+8b5ae13dbbd07ad19bd2c7bdb48eb3c760244fe0caa73d28df3f0c31f5418f8b06862526f5a84bb16b2a92eb2c7ebc28
+a62294830750dbf43ea497155b185d611d75e767aafa8c2c30256f8a4875b6fdadaac429e8363848b39e964cab2aaabb
+94b6973fb87c2efef5efc0e7dd7ecff5ffbe76320fed8a20d730f9e3751efe9e5db39981f45477ddfe037e18cb971930
+b931b6f789947b5298c258c8f0b221ca927c447f190f0d8afe2f18ce9b90979eb3247e77e128a1d6c57d3bf5523e787c
+968259d9d001a08c0329bc19b2438b48dceb5942bc6ff9892d78fc36014f1b60a5ce7deecc7a808e41aeb4e26143aa41
+a52c1906f103e3fbee8c12fecd93f7b7d6f37eb733147bed841b32caabc880fd6e72884380a3cf93129d9800ee7877a7
+969dd12f0f6ef0b868e21539dcba5dc7327033eb546570f5bbf91b13f9c2ba6070da430538c40bc53a2ace4794514038
+a853a74380d78710c212bcfa92d3f9c433b8ccc6936356f3bdf923b8e420e1017bc530ce73bb8d04bf7a25b20594c753
+a84dfbbd3d9f409badc8ac2da5a0db98124df9d01bd71b1cf5b2b9c32866309304848a4bc1fcad1130bddfb9636c1b56
+a9599f55173e77dad54cfce6ddc77bc48588f36b79a98c156963a2f5397262ae07634a98ab9bfe1aa6357f78aaf89d89
+91e429b5ad0bafc09b5eefe600e179ef56f1ee045765ab3d5ecbd73eb201305a6de4382038b1350abc70bd1435151a0d
+8785056b83a726622c565985e815847b63745fb66b138d24c985d6f42d5762c61ccd5172d4a3237222c881e5f036b98d
+85869796ef180f500dae84f669b76a9b245e2ff4614a58d74820c22e439837b7d9866f480b72d88f44682be54c6dafb8
+a118baf9c17d85e22ac3315f5ba9aa4e230ca2a031906f99bc43fc750a0f96aaa5e6774d1cf16b492726a37db7b51327
+ac8e33f32c1cd14c6de14e75f83b8518bf1bf6f0a70e23ea0e5a29f096e2992f1259a121bbccc5252b9668c605240435
+97babe93e2016d29af74f776e167d82f1cf2242202bdcbaac4a1eba2b3fbd9e7ce57cdfbfe799a0f6a06a0e6838c4e99
+a70acd7e1f159adf7381d3f3ec2cc42b56232601f18ee62fb650e13a80954cd06d39a57217ebf4d8927e28c910671ae0
+b33ef5c10d0588df0b9d2d963912b294a2375a26bd25225f002cdc206a1cc058465c64180d348cccc899baf3d677033f
+93086926eb1be21ab929b0098767611bdf1a853b6b67045c14f00714f806f8655be37150be1da05c5d2e6d9c66057bf9
+8890aad532a6c9b818ddb9f1ea12d627010b4120fd4969bd239a9654a05116272d4cf783ff8256de337bc01f9b4154d5
+b878977630f647a5ed7c99f59ca5eb653cd647277b899b918e5f667eb17b6dc433b56c2f3a2a18a785a4b5a9ae95f372
+975582fadbc276c9afc4d8ef767a66684df5f56e898d2a8749cbc2763982c013e5fd0ad0ca7ebc67758124a609b59663
+ac45e154a651857f0464db38afb2fb25853e8bb1eb476df31908b13b4fc86491d4f831c0a15ed6bed0c873b3dcff55e3
+a778d373e361753964a7fe4e1d28702c62a919e5203b941b04b0e74cdd3b4e838cd9b6dac3c39dd523f3227f1b5e6766
+b1bab7994941f8de4235e2e188b302bba847c1618ebdec7fb782241e9eca8d32dd506d254d865e0319c66396535cc484
+8c4ae5b346325f1d1609328e41d20108c4388bbe021361a86a1f9681caf1e6fd64896d72641ba8c984e153537317420a
+8cd312c6a23e56657624d21f230a2c22d102badbfb2e38a8c067186abc5a459d0c78433ae7b54334591862c18864d7fd
+8739d71181c5a657c6fcfee1df71756c3b6b8c48e8d97460fb64eb891abfd23433ccd08574a677fff600ffa5519a2363
+ad3c8d1e9eaa6f9122fb14d323318bb0338c5f9f29c719715cbeb15a2738493930542769b596098a5f505359c0314381
+a6d78b78227f8c1203e502caab1213092f320e77a6e9729e1659cf81e981cf905170e99b56c4eed1326320acc6aa60fe
+8e5ba0e69e0f08a49ea4fa28ce0792f7ff6c032844ceef11be90b2215940d4b0f3e4acd5e4b189b189b0a0ef8045aa26
+b7b31957e7a85a640b851d4241c7b2f6af64f59ac221783b88c1b51cc4185f5ae6446a3c7137ee072c2eeb97c929d7ce
+b066bb41c5818d6008349dc6015ab780633cd961b5d947062e14618c1ee1abfe42139c86b77e7f5be0c275fc3f5b8909
+a6597158957e1a0af153183151fbc4c73bbf8156c77f7b409d0f97470b5e127beee6d9246bde770127d3e3ad400cddd4
+82a6de6344e5bd0c5ca95f3be1ccd42fc974403269874603944c08ae1cd3ca887e66fc51ed61da8b7af3cce02f152e6a
+89fd363aea11ddb2dc71288bb534a4a6e32feb5b9e4b88d132f4181f2579f8f8f39d19fcdb3d3d7ea118b9f4431520ba
+b70c945986c8227d239201857e12cc7cebc932c3bda8913c82b62c872b18f866313738788e11bddd630bb5953492fec4
+b4e3a1e8f82d988c85cbb58d9cec69bc63fadb4c1c9a09f36b5a61f1ee96baac1a9458bfd0f3250e1734ab3fc6c0a0d6
+8d01d1eff496e8bdad1e6fb4b60e4bef0ada39a378c8b57cce2c115e611e0c4fa54f9b599e4c34dac925bc06e940eceb
+90857123505746f7bff08e03b1a90f67051a71ba47b49e7bc63f1a8ec30e02a98aecf56465d3b4746aae166081099da8
+98b9d3b7fe1d5449bf6498c30036e3f60c8b90962fe04ede9ebf605d07497f617d99d51f0f0c0c14381377de765ecfd4
+891e7867e70582ade85730a21c19f6fc239760f76f8bbd8c6dafeddfaabd6fa4845f62d649b454fd3af8ae7028ee5f9c
+945136f71f290d8cc6bf282b554cdf8ff92200feb7901987a1348f2d2edd3bd7b7bff6f57ec25fa302a27121a1a959af
+b574d8379842467c5f3cdabc2da9a45e5a6083efd7298b077ccef2c4c3bab03abf1dc11507f4c896d745ffd41e4dd319
+946fea5c1b1d840c10a5a732c7dc23c2bc5eeeedba6956f85ad78fc1ee4a95b309c0d4a4919d1f7155814e3f36fe322e
+98befb2f7d0a860de662f28968fb6200cee5a33cd7a6c376405a9cc6f0718b90fcc5cd5b9142e84e95223a3dfbd10f29
+8c5f208ca23aeae44a056bc21e04b570c13bfd49b14681cc085d5b318e62e4c088f0bea9dde52376967649919b59829b
+b14478442f8e985618272d4c56d43a28e10112ea200b52fbb32b19a4d1eae965fd5ee1e9772416d52dc0e2db57d3ecd6
+aa308b19a57159ff702bceeb69a385f91339db7e683db991b1414bf3af9916d8e52dec4c492d7e8b5a5a011680defc1b
+a8ac18a1adeeaadc192e15b7e92b611c936ba9cc9aee01f03c2a236827ba527039c719f16149d7aa5fb297cd63878766
+aa09af54f9a5fab6a61552421c13ca62f99fae212a9606f8a5a050997271ab6dbc763390bb98d90b1af3bbe9e8d9513f
+96b8ce26b346a0d3fc99b6e463f0c619196cd85340b795fe1c1c0cd4f1b3a9f2bef5454e0bc7d51d75ce26f217460602
+a3efa46273c392704ba0718a44f306edfea03b1a6be0bc1e5c67c62c89671c650eb8ac9bacc35372ade6bed12321f1ff
+b484881108a43a1dbc16a6e7369a04286f896aaa1dae847b4019fa287c18e9d82c8ba4ad22cea2837bc220524a9a7a17
+827b63d83e15ef61d54dfc365ed8a4f9e200d526884ec4b1d35032227245410ad7e1b1dd3c1d0ad48ddc4720f0fb5e1c
+b513c3ddafb01b6189590b74d20348db74e400c106202dacd9ea9552ee2c642909a7a73ed7ab45a986eda3a0701be79d
+831f4030463c84cc6cced28dfce0b3e6b6ead01afa200ddffd807f31ddd4ab93a8699ccc9d26970407628d521118ba6c
+86312e006a800720329b82f6feb2934e2cc156958ba394278caa6766ee10800d2fb8907aa92346dcf6d389c4f66f5e1f
+ab6841da372a286fde1dbbc57cfe967cb4bebd6fe2ab9e317cb9f9eda04a4db0d5844ffa8db72eb9cc6bf311667ff6e5
+b8238dca3f2be29bfc4aa65a9f59bd4e2c17fae78114a69bba1170782b993afacee3755e768317a923fd32d860f6a74f
+923c1b60c052a3ed4736da7e84e52b0e9e154627cd90cae335dbdf05af109ceeaa016954d6e47fbfc40d9d5649c198d9
+96a69d18c838512d95d97735263a8cde752b2bc790b3827ce048e177a063dd11e2a69b86b3184873503a68170b2ec255
+aed7c3af469a93c22afb47a904bc70b7d88262ecdad48ea6a6c07eba7398410bf5a97a786beb11843cf40ddea9a37098
+a6b50f6369ae558dda3ceb8cc9d99382a1e62d0d9804b903086845479b9381fadf8d4595c2f342307c94d09e02e0ba2c
+89fd703d457580a76544bbaecf65f93d3335d7a22e93d14afbaa61e5236d9c8d8b005e403e9f5e7a103b0386971a5e65
+8e909a3638208c8f885820af8bca6ae839128ce0d902a2b7b6f9713d21da8c943a7984d9aeee7fb104df4cbd1092967d
+b41e2d7a1a0082eef43e886eab5e781bd961a83155d6a14d62756ab7144a208f4e4574d47d2ea094a7fb50d0ddd7a241
+acc6c63450d124014a1db846bf578c44e910436c83190fae428fc3125ff2065d4c6a1165aea799b46093a86126d4c483
+8dc63127435cf2f269a83024b562b3f4da18aee3399ed5255c295e6b80c357cd8f1887de94bcea29f84db3193570c417
+8c4cc72a98d42b9c5807322f596ac0b48b08b16ec956ea4a70c641a16a70895644e5b14aee85a4046673849249115abf
+992afaccf05d79a3147d2985970c1793459130ddfb18a9d31f3036c260790109c9ee6a19a812f5d55779c2facf87785c
+91394d3e84649cbfe018d9c709604f6aeed53e91cd57e2b29d0e84aca3c413f1e0135c6bcbc70784dc8985a30b9f3fb5
+a33fc126a8f9652c6905b1f522bee45848ce42d7f4c3a4cb3f6ce0e6e64c82de74e175c2ab6b5a867a8d42322d257ea8
+962d5fb816010a14140767c2486cd629f7793b304a96cb82ab85a867bd9a407bc8ed44131f87238c34a1e4ba41adb1f4
+b09048879ce26a34f56e1d4b2cbd6eb2a55d4ddcf3738c462329ba6726fc0a21b8c1bb55169cb8338b2debf20dc0927f
+a9f9ddcb86b7427e268973bc7f3239212716df394394fa535b9fa5225b6191d234a44a126766eb470ade18c469a2d166
+87cba6afb115c0b3a515b08cc842e7cc2c705880c82184174837c0a06e1687ef668609c2ca080840fff80282caec7390
+ada109548c449990dd8f1bd42c9cbf194a62625d165416ca469c334222446fad7a743b1f584ec3f20526c3c44d870696
+a69a0c58fdfac715311dbd37c4464f0475120362234f5366ffc65227e8178e037ae91efa5a52cda5fe28243f47390175
+98e726cf884c6f706fa25fe25be154afaecc0c3bcfe682a85afed225bb44ea07cd1767b4d9f2201358ef19770330f0bb
+988ad5bc57f0621e3ce1256720f1161e785371fd478c467c39e554e2de27df5ab8176508658aa90ed7179bc212ed0dac
+ad0ff6dbfb397da51fa4d9d959ba5819adbf1a1ee31f68fbd62ae07a9cbce0641588cb1008dcd0056c17d74e83c7114b
+94c703cd32b9f52c41b07aee3e3c19b8c2b4182da80487ed7991d568ea8827f0cdbd1e977d482dbc102c4de2058903c9
+906fc2a06cda5d82445e50bf475dc4ff2c17e64c982539c26545798f9e4dce0bd4daa8d55b027cc0a8e1b26c3e45cb08
+b09a51f22a9a24cde25f805cb18754e27d3d168e64db4ff13a202839a81c69dee8372b5872faa0d23fea283609cf4391
+93c908f514e97502d170310bc495d02948d99eca51e71f9a4779ebabae1431e1f7ba465af485546a9fc97c025877df50
+8337859db710ed7e276a47e90cb3912c829151cc2bd3dbbd4dd04acc90c9cb4870c44f4233b407db8240a93aaaf7302a
+b13b16ea0943e235f8cb064d6dfaba9bd8dac67e9b6275a4c3f54a1770b9c905d8855517415ef6489843848108dc85ff
+b28489f0de1a76839a898b8d2f302c95610f17e893a6e7f2e824fec773cde6f2b219038a3f1fa212bed98c97daa66d5d
+af13afb48d56caffa32f941ac5542ec2b7fc0d6dbc3b16e51bd2a8b633f0a041ba1e098d9a68c470da00e630f08f24bc
+81465afadc45ec24825cba7c9edbb36858bd2ca8f8b0b9d7240152b58a411b08503b530932e7b6ec3b0f8612869cb244
+b2e6b7438fb6f70b52b8726aa870f18191920bcb213a375817d100297b507908d79567d0c1780b3f25be807a8ddcb853
+aa7ed2b0b2bb2070b5f001578efb3d1085950c19f9d06584a2d31e1c235e6d6d1d7f081ca6fa2b0b0616b01b9a467005
+91a245f1aa8c8ffe03f7db1412e5466f0345196727eb8e6f98b80c01672e4260e90724a538d26b094e678a3d85f2dda6
+b9ecde963c8176d6a726b129f229d803d1a6259533e432eecd7404703c972ec7296ba35015acb1f4b5ab2653a3991902
+8cf535bff6e98f75d98c5d2a691a5d1aa645c7ea18d677d07d3a11a9cfa222a7b8edd048529d163120a5aca411161314
+ad2e51afe96dd0e942a7da5a37587ca1359fc17cf66ab70cf37ab70ea34f90054fa52503d6527e89e464f8058f5cde79
+97337d62f83ecbaa1f402c3964dabfaeb279b916ca08430a61fad6c31d60087c7e3a9decd541651a2b6e68fb2816bf45
+898b7581288bc7f97987138b7481d29e2cfd5255ebef133177d9060790a0973ba07de62cdf38568c336c237cb084b7c5
+ab53c0759663bd976de62f9f98fc82fa4f58c146b8a6a3053d4dad836c762063ad69a54d51b5499e9def86f8d4bd7ce5
+b35ba58109d44c14be159333b999c1e471fb61f5ed48f9d2a6bc689eb045864f3fe88a6ecae12315183703e2b1fc1ae3
+858a20e233f2860c24c5a3f4a820cac7544eb3ce91a2d8284f12013b13120121fea3c4f25427c3524a1e883aead429e6
+965be1a56adffa51f5d80761327cf69656e6c37577225b36a34afc2f8a959d8799ad0ecc3eff4470d49eb22ebf8f198b
+8e575ee39077bd865d70fca2d93473f51dbc99ef4f715f4a3b1d9eb21deb2afcd0873b4dc53035b77e05f52029f069e0
+a5c670a73da241f5888c5cb44c27eff2b8ad3f491e0b128e5f1d498aa6d76640c9e625f3c5399ad8e99b666e4b2a9759
+920e1524255b03cbe500edb230696c55b7774963535c063121c9e9987ab74d504f2f1cfa14ba7ca82a6f66745fb0b392
+8a0bb7cb267b8e1e0cddee208734632b28313b3ad89f9c2168f341be5390bea3f09eaa51f8923b87697799a53201dc26
+859ab9b3cd602e78dbee8d8d5c3a9eb4270f130ea4a1b417ca5612be753d20106cb2724097840ca8919a9a96e73f96b9
+a76126d9a997fb0e7e2b27ac682dda1c6b99067313371387084be1f6e7a9a59bfac395e91f089e14cecafd151674a446
+8aeb466c58e2829790975fa08dd31f18a51a63777070d2e24605adb1a77b5e0e5c5e0bcb483076d23a6fddee5f402f8d
+a8959f312f2ce0d7d974a4998bb709bb98ff6456413ef4ae9bcaa8d687b8b5ecad91414bce8f704aa44a83d8a0c86462
+b9545c8567827fb28d070624579702ab96af4f06fce515ad880893b97ad9a374c4c91d6288e2a584ef14b1ce4930a6bc
+ace41f9c2756ced611da16e21704a367b122ee1c2feb83145103203ace1a5cce0ebd3bf295caaeff05281672c92574cf
+93b90e75f56601191e3b568368bf1d24f97512cd42cac1da8b42f0019e07fa04cd5f835b7e9503fe4702632df27ddc19
+973c8feba289eb473448c32b141ab4a6f861222626b3f2fa265a431a54675dfe5eb479100a33c172ff935464d6e85f90
+a6b0798ce89512644490d65ce3d0441ad950f9a25f6fe2c9a766a58b9c8222fa6cba753f314cc7ad6b6e3da881c67abf
+a79c560dfa179075e0d1506adf5082318915c15048328b15ddca5748ebc6ed8b10fc5d7a50bfaf8942cf9ddc6912be0b
+8841b34df170519d07edffc4d33a0e70c518dcf53ea8d0a9f13563822312a65d16f99cf596bb95eb0daf85435d4bc0a9
+88527539258323edc2c296dc742cc26b9a4a984ca299a81705c702a425ebc7345a79b4df84b2d440a1e73a09fa18b5d4
+88026753926a068e1cbf49a9a0fa545846cc7ca9abc0778e44f5b7510c1b6b73e9a9b1aff754199379522b2a985c0881
+aa2c306ccf91f967b5cdcb50808771ede36acb9a6cd84fa15c6de4c873cc2d0a64e79778a2822a109b41f5205fccc30f
+9751fd8bc2a07ffe0566e5587e652d3d8d5250517278bcf8754e14717b8941c07c194f14fa757f9a2f3461ca6376bdee
+919746e5eaa18b734ef59c0de09ee8ec65e348efa659219d9eb6a3a77b8edd9449a6dab727e9860ca0d3837b161c0352
+a271c146794d6a65c6fb87797262c22b1d938ecb2624e03809233469296d33ac0de6909183c8efa438b5f3971c8c3eed
+82fbadd9049248914a15755dff692bf689eb2650fdc6e44e8f3ae003b8f15a0f2858c7a2a8dd137b3448420c5f434229
+b90992cad6df98d2fd1c75bf90978205280d993d439c44d6721cb95d52eb042e01b418e45c3c48ed667aad577f3fd1c1
+a0c3d1e8b80ed4a979a22d6a9647bd57f22ac8d73c37ec3d56d06dc178a5c9d5ad3ffd6dba9eb7844c1f40b8c89d3d33
+b513aaf2f0a07fff3543d8687426d07773677ca4d23554ca517e50bcb891164d1f5651944a2f6e0a634475f6d33bf0dc
+a0b179aa2ecf572ac4a3ed898aa34679be3cf3d8d9bc74e33609345cf1743e915124a59ffcff41bec012ed2a99447e6a
+8e991c5549126d64e0b515a03d266e19097eee38d08121d942973d568f8ae23a15b037337cead0686f7c944b9fda3e39
+93cab29e1bb116a39ce1a82897776da1bcac06ea131a7dd141a688ecd4089c5a0b8616d6721b1c6d92309ae0820a367a
+8d4e0159fd3534172b2481764cae7746b1a47e9b7b9465fcec0824ef234674fc567c16ca7116dc90ba9b2ac3eef28d60
+88cbd9ff6ca551a7efca30b5f59fedaca8f9efaacd4e9bdd17ef0dcfe4f3449b52c7d3066716f3e7fd478f264d10714e
+873c71b2feef5230c31f13d8425f8b0eb0171eacb9225f484a36da3cc796d62594fa4771af9ce1e7ba951f5377e5db76
+939eb99d7fefc9fd5b3dabaaa5b331365121374a4ced862b8cbe0cb3c574fb1f0cf4932106088a1d87522acc31ba7f77
+b283f1d54bcc72e31ef572498821ded40485f38d2ffc67f70bac68a100612b020a538b36001d94228a4dc97da8fdaf17
+b2e4c2be605c8ab3038b4e91bca7e77e127c5c3106913ec1341102e138bc8aa1d218c3d3c2ec1d36fb8e044b4bc211a5
+82e73cb5b2cfd78c17131e871e92026643bb56916ae64f009a009555903df878fa3a2019b82f7e71a3ef7eb503c792d1
+a6d828a5b7de0e7818975b65244f6efeefc712c29f2f17b27f3264e19856d869c350ab39750ba63d6d46afa3aeb369fd
+865b17027e9d5bdf2de0afa2f524f67b6defed87b14e0af5f4b6b1966c2de45550fd2b6b39b1be88ee9cb06e755f917d
+ac8b47f9b7e675b556445d103271e6bd3b39b94d15ee1f3108fd1b777d439c75437c78ec3b281f7104af6d0efbf0ecbd
+85c2f71ae18105fe499aa4da0a835de3e92ce05d0f28ccbcffdd2860898ae9909e1c05831ca4fed96545133bb3170302
+8bdb4a72b06562591ee44799bd7400ebe71f6737290420dd4ba2bffe0050d8ea4d586b7e329541a52611e945ff1b16b8
+aee4843c9ab02026ae723531112170bc7464f51460bd4ba5166fed54ecda0f53342cdf94f4354a5bc1b941e8ab085a80
+84de368006db07c89a7a43b7de54a63637ed72379a41d029430f6b4ebe404866896d2e84996998f7b2c20324143649f8
+a8375f69c01289cebbc97843f417d0146f68c6416981032bc1f42d3e09845d5131eb9b4d68fd0ba7f5b1223b83e51bab
+b1ae126dda1a88fee9265ed8e5bccb810014044d83c70e01e7f80059a685067f4204cd15809b230caf5dd77738a64e38
+8177544c7b1f77181735c660102da20fbf9a2ca4efa79b21c92f1cd2b912630aa6c830b7513980656bd275097be59d1b
+874fe8038905065ff3b77f1e53904854fa4fcbdc4c8959fd2df2e3967b3b84100c6f63fc44338c01fb26c042c454991a
+b19324d737364cabef3d2ee4785e8f19cae399afc06fedff8fdc120e0ce525b3755161183a1f5ad11ee758104081a49b
+8e7525bffe35c1f5c2db63ee911e7e0197951ebd25868660e6672a3e7d4fb309738268b36677921be3be2f323ca718cd
+846c51c7d22e7d43f6e2addb7fb25113c25ddaa51252a898fc1d7d5b510f772534c4f5d37ed3074d124cb259e2bf8110
+aafe2a16cbc901730178841c39803ed84d3a78f92f42f84a1c01be4aa3b63ed7ad9d054ceaa8a2d56eadddecb287e8b2
+8781c9810ffe3d93fbee3b576a15b8786c3efd6b5a96b75819b1f93daf413d4fd0f56d1ec277e8f5adcb784b17f08371
+ad66011f0e2927ee1924725bcf8a296069f74df78ec66ef6aa8792f68425e48e9d7f717d022f68a079501770ce192fce
+acd0ef46fafb06f336565d86e0b22f9e5500d2f73d047c827d6a207af40b706440afdaceb32e6571deaa1a79f5e6fe27
+8f65bb98baaae22e84a3ff375e7598b5c61ebec676fbb5a4f79c8463c427eaa96ebc51b1fb504840b7b0206ca6c2c72c
+a4078341325d7debf766e43679b8b68331dc13651455a73912afe062525d2ea909d8829ac08771d9b32f2eea28b64022
+88eb29841b022f2ec9029ecd1a137173cfb79addde1c7cd4be425e5806ea6ee295b11a0459a940ba79f789689a8fdb81
+b762b9923a40a1965847bc7d046723c3b8f0d63323303aa3b25e93b4af8e527f1afb3dafda831f50baaf79926d1b1e78
+a21551dffcdb069cb8f30b625c8404dfe5efec83227e3a1a67ef0c9c9b49c658bbb31240c3ff6f8c68e02f67974c732c
+b4735a6610c371754001425772aa5314b759c24da50b38a9390969c27e215ad9d463a76762323b7954756a8d5ee7936f
+81bd78e545938f8a3e53ecc2e88dc26bfbc30941cbfd009572d9b38f8eee47a85209a318cafe8cbe055eccd5e62d50e4
+82ea5495db9dd48da97723bcfce02788549c6006773eb9f4aa4f0f3ae13414430edfecb5cd095259179ec2014b6ee1d9
+8493147b8f0818c2d5e75acda498139f95fa6f904b47f87a8c07e258c60f39bb1faa1d29cf0834c8a1ef1d6015d37b42
+a491233ab353f9daad86e60fd48b6f70dce60dbe36775958d8e270725cbbda96578b17a0c4925ba1298e630c6b9ca9a3
+a8c148b9e1373afa54778b6d4f76cb12f40eb6e07404a7f27b271fbce0d18d621675f1dfcb30e3908d7df1d962de2e5f
+9826a45c29ee22cc26ae399be25cabd16180a291669fc822a44d14cfac81aa7ce85112d7f2c30effc7e83d131c9937cf
+a793c75e716aed4048a2893f11eeba78ec565ac250bdae16594d056f06f4aa7d2a156e1617fc26def4e39984fb28936d
+b6c454d822343cd1b1ef7161cd2ddc28145134d4e59e6d69634c010ad1bd44120aa8458eafc28f6103ece7e34b368e1f
+a3340a0edc3fa82fe4f31ca2d19d295aa09c74cda3bfc3534c66eb71bbb7903843bafa92f7120de4505c7ec819a89664
+a18e5218cd4349985f412ffc7741b5db21bb14c6e00431daba194771300e740f75fd46aef1876543967e8719bc6517de
+885ce63a88617bee05144bc67d08f1c7072d8c4e09b23b7359f020995aa8cc9654378d382de6340ddf0803717687eddf
+8d8a0b614be7df01a12e534bac102b1881905a9d084146b3d0cf2086dc7d400129e0de8e48fc966adf9d8ec8c1336429
+8baad19f604bad656398a4010b20ffb6ec6131681d120220dbf2cc5779de1ee146d0b773bdbdf4e8e30aa0f464f2b18b
+a39ae3d204491871c2e88d7772055b35af341ba66531ce3575f47c749eb8e380d63a7939d3408cd51356cca29c76d4b3
+813afd593876667ebf0fff2b8a8a5bfd0f42a4fe2e4a0b7c78b6183605706c97dfc40b627340e1d9527f618719d60e88
+a013e458d678fb302bcb6f002a52e3e0ace443009eecc9113ab5b78f4663acadb8ca9cd757a7cab1e850aa23f09ed698
+b6e14f351fc47b9e46a83984756812cfac795cac5ebbc6f00d673ee23209d0d91a6bd7d576c7d35ec3c7e7cafb758a46
+b94246a346966caf6fc1e0081a211f27b38f058dbb9dff915e3e65391dd36d66c51324667e3d7469a865c0cc064589ab
+a1bf4bcc7420bd17acba90ee67af96e73502777e1723255a73b1ae3e92fc77e80a287ce7c3d4088040e0edd64577c8c7
+8b6f5eb9b6bc7320349b19876864baa6cd8e07da4f70653d7369740184ad416c40b4395c04750f5d8b54b3b3ba68295f
+83250b957d920b1b738f4d0f44f9eefc01b5b0582128f5ddb5a282a11ee207ba1ea7867f00588f8b891bbde2e56b4c43
+8eab312cac9de78c9fece9d67a6b26d58c4e15d5e0668ca2cca2d9c51636eea5210a893f9321c2fb232e09f9d0b40fa6
+b4d1e5f284d50360dffd2a0d21c4b31d81f521158aa21bf333a525cc68e690ce8ce4f0eff8e71a0c2d5853e2fed18231
+b1f194c28bbe217a2c98ca8212fdca744f0806d60e51f9da81548155cfb97a39e2a98e753be8b2196c83f7db8caad2e9
+a7905cbb59722d9463c6317ae59adc10d5bcd6e9788f2a54f4ff4a4de03df3f830d6b8faebcda541d429a7e42d158c9b
+8a3b31d0d0b33e7011dafe25ba5c3b7629cdb5dd5b31385d786fd80888fb8409812b96d28fedf6a401a93310b045c620
+86e4990bf50b27bac76926dbc65a1ca34a759d005e56eca56fd0e00ce82635dffed6f3052740cac2f1f37204699bba9d
+8f0b6a0b66f1f5fa3d12af444963c6a45785a36dbd9e1a5f42830b5534ca8773a05fb618292e718cfe8a066b8fea7980
+b7f206827d715b33989de5c02f0886d3a457d0ae34931ddfdfe2dbab121b69ccb560a71fdafcc3ff204217611674f5d3
+a6e2ffb0c5f29043984c54f5fe6449ac4b7a86f2982c909606b88316ef1f0a54638d565f44d2fe8cf00279e0eee435a9
+8cdde76212e73f9430cac210b52507583e81aae0bea491f6cbe27e5e2c8fdda373ce8c7a5f16bcf8c6238b282d06639d
+8030955eecc9b8e2161d40f1f514d58024d25e07c6710916824ed8982b8bcf7ebebc5643f0260e1ef6150b6901dc2dbc
+8938fc90e836d7bdf1cfefb2716cc25aff34e7c4dcf66b349d1fc6681580de7f58665faac29494b30bfa0c743d6f33e3
+b182f9b4a5d838e9d534e41ecbf06330c56a8a64800eee561de1fc2dd9486565ae6099f40d0f1901066f45047641bd65
+81f98b85de7b6c581613f4a42e0cb0dd9e6336399b39d38a4751c2a9f195b65c9e5592fa1728b91d83cac0ebfec7d675
+94681572da95137ce41d913360cd567b570a87c9a439f2b67b90d623561b75bd3dd0486a90a63d49eaeb412cb97768da
+8e64922606ce05375556901b8c042d4f41a18fafeca24c1d56998e0bc9054bcee7ab079c3729a67d908d0d7967a85edb
+8e10e8952b24125321d0cd9ba922affc93908b3abdce47eed22fb2d44cd556842c31c36de6d4c28b4a1b5dd84e07df81
+b6d464020a51bbb53670c81d5f1474ef439e006851d5d5a3fcf74219614a2a9c983737f20b254d38a2fc7333b35fb3a6
+91801712ba264cc2eb65e8a3d5a032674a89f4c2dff95ef9d80d3a9285f3c2cc108e775dc326881484756814c2a03637
+986e5a00f13326735bfc6b41b086623101f01dd55f2a88bf995a3b81054da86bb2f97fcf647d58e90428e8e9555eb020
+b2875b4ebbab678fcafd270a0238a208b19803012fdb3c23f06c74bfd45929a9856b7a0f9881b75c7e97fa9d35e49d1a
+b3d1acb9c844d8d2232834a81862c59548cfa849e8e5408ee66b4c8b86ddac0fc231b2538a752eb6c1ceee92ca443d1f
+ad0b1b5d6bb50c43f5f3b692c5d3569d2117b01caa7f0ffff502d5ab727f7702a2d458b89d77d218d3f92351b4c2b92c
+95b1b99dc260ae6ac7c387bedd43fba793274b15768d93df13c88ff6cf637732cb6b1719467919b444c3b5166f4f0107
+a0c3c8b59016056742145e7f4ca6568d4393124efac6540645152bf71173dea3d0058bb11b3093228ca4729cdd5b3033
+9278afba60643257d9f21a4033df3b57743c3b43d66d96ccf413154a63db054fbc3a36f2ef378169f4f19987964c0bce
+b558754c97f9824a72644de1725127dd36e284fc07ce89006b990f09db77c48ad6728e5c1891a691460bd5416ad65faa
+833a02af76172f868a25e850d35f4d164889bab8381fa9c8d9880ab0564a3769ce3961cde72bc94ed73a1723daa35cef
+aca496f3e528a2e3eceee138291107ddddd68bb088b2e49ea76d0c4136c6924b3251d7661ff467a36dff29f07ed09102
+a9367961ae88a19038c446df3eadb280da005d120c16f48ffeabbe4cb8e5e2784902cfa1192876ab934bc90606baf2cf
+b43feb49373dc36cb46e050e3cea43e636a64289efa3af790dd3fe960446492b858f51b3be62c6b75b510d8e2b985573
+8cf24955965468125fba2c5a5799672845ea6ce97cd307b09236ef1a3cfe55c88958ffa311e8bc8335bf261a84275d93
+88ceac98b512e5bb915554af92318a5d07a494e0b8734c4415e192e7405d6b06d170fbbe254e3bf387759f6d4961c34c
+8a9044ddde945daf3e0cb3f897ca00d0d4e6a5f7c99aaa3929f0beb9a44d2ed23c191e37c57140ebf3ec759f50f84d57
+8b2a2c0fb51e7c5fa51e8c593bcf118696b8411bc93e35cfe5de6c5465c6e80bba64398d7c6b71badda616b918bcc7d0
+ad8bba2b7d5577f971a1a561b17a9d8f6b7c35fba55e3e421a0d8d77b520eccd52122f02afaf3899218b652980986a92
+a8d743b56896d44bec838e10ac1ba5a43f58c26655c71be0a5417d936260453a8e91752c87334676c5dd1dcdeef4fbd7
+b0b0540f8d2d1ebdcd74d6e4007324de8f8bdea0531880520d79773c0b8eda65ed49e672c5a294fca6b4560442085829
+96da830d1c1625d002008e9a364005b2ef16cf56f5aa4a758ee963388493cbf90aa75c25dd67d496af17212537ad44ab
+89e819577a95195056b872f8f790d001fde3253a23120e2c41b3ced7fe8e9bae0df74907b7d65ddf9bbd6d2efa18eba3
+90a139ffc7dc0992c023651517db4c195aa2f618dc3002f4a0a43013b6c6022d8d9844a49cfbaca543c9cf5d9b2210f3
+a2061f543b216fc9c801d885ed681f9253f67cac40528b23aa8a709f24e0992fa42a10f1bddc7f10af2c22209343ca26
+b5f53715b9146966f386f214477743e2fd2b771bcf90b192a5863c06d7225be34edb6bf71389085edf344e60afd88561
+9634ce27272f3c687035789fa4eaea2aaa71db5b5531b21b8e029645827b40561a5901b33afd80a3aeb5777aa89850f8
+9674736cdb4a823bf982d54876794e99c7672eaea7455be90e815abd03ac06ce1fd9e73bb987a515863c6cb4ae597835
+90379303e285b19fd7816a6d02c0b8f94e6291b56c196d76aa389cbf813dee7ebf64e45555ebe8a281daeecfd7aa5b00
+8a1f759f6cd6e5134f67b96e0edce7170e4be1b39afaa7af1c2de989116a6ec9d38a2c077c8e6e65ce0bdf729f20f1c7
+b416f9937a51a298548e91cbe8fff71585335c00e69602423adc9cd72d18821987b8fb5ede32fd8bd2166e2ba9aaa792
+a423073148046c81f840a481d57909f7ef621a51827e44706da9e1f0e27fccb8f88652097a9880ca64c41f6386aa9069
+a173305a5aa2a17349eca704fee25593f5c2fdc5cd8cb932a1bbc0ef34bf54ec2f867ca93d8e6aa33679cbb71fe11083
+87c6756d14d815ac8237ed4a75fb11206f615585ed527ad582841526371366ab19f602c7448a21722adbf2d987d89b81
+8a1a6f06d6375d2bfbdc7531e9177a45330458da2581f65ad129367c400cd77f548aa748bb470bc560c0b02ee5b802ab
+a24a05c30d0fcc8334f6974c30d13a5593bd3b388e2146ba006f232bcd6886edffaf7e48ed6126efd3e651997dcceb12
+b35c5f8a5842d97cbe19105305cae1f971da5662c52eb979975efa0753bb60a050206fc0babac5b5083799e9ce8a68e0
+939ca5532c922d00d08ec5914e6c58f8a1302a1214a1cbd5c844b334ddc84e694768edaf1a2af02289ad74970800198a
+911d6104a240f84e0f6502597405b47a7faf5e68717f6d389baca62bf82fbb7207ce8d0c584fd9d57d3afe1f957b7cc6
+88777ba7a4bdaecee78d42687cb4fd6dcf04402b43524e2ae67506d93acfdc29d9dae640c05d01c90caee1d04cf3d35a
+9226e684606f8169e38dc21a14911d0306b1c9ce5244500e4b108eb1a0c0783486acaafd2e0b3b60c413bb003448ff21
+b2f527adbb9feef9553bf508f192b5ca211d0e491925a2331bb294fcde7d8e0fd72b441e9f07c838640dd35fba03e1a7
+b474e6d6ce22ea272a93a3c078197f40c01b9121c6f3083a8e587c367200b8c97ad94e156883475603f0a66d0340fa52
+95c4d9896df11d2b5a8205a19d6331ea02a2de038aded8e6fea6d79bf5a6648d5d986bd29430e4cb5a6afde8b07a9a48
+a12bc53ba6b6f8350b400fde04518a741a1d755123a6ad1d435c7642492c7df28f7091f17b254e793561923de781eae8
+8a0578ac03070bc920a3b5a7a33d976b3133501309af5339b0cc70536965465b4f7288af70db3d5be16bc2a1e5c26a86
+a66e27284ce6114e48ab56d7f623dc37a6e79cc5f487cb2bdf0acee099cae744cf3a9de53b111492b5ef99b0deaae0a7
+832a338951022c80444ad8c6d0285e86db54254d2689defecac2ed87f5eb4d876373af6d76e3d613523e32c3966142f2
+81e83f01bac3ac3fb67e780b28de30b32247a774aaaae118db3d45c8e74d1d4f1defbf9c2a7ffdf176f5c1cf4ae4167e
+a1b214ba7265f692b4637352c6139bae8bcaf3e7db5806fad0014ded93048fa4a36ac9c9e0b7cca0a86cd45bbbba2fe1
+a7ab6f470a421e72fb703a9d153362056ce80c40264a3ee5698168130cab8e827df5ce3e6321ce9a669c87a2e5c67499
+aefafd219f2d062a378474c48d2650b51901b6bce00e4ba0b509395a6fb39699037577da353cbde187e65de87ad01575
+93db16a0a77d1b181f33ef10300112fd8db5b2eea26732bffa3b1fbebb792c6ecdf2899cf6f26b505dfb46deb81b217d
+a63b6d9d1cc2f31ac5f836133ae66bc9de3e07ced5026f5bc90116599461dbdc03cd7680c1bb43dade9218ebfe1bc1fc
+984b49ca86d38a486f6315f4f9e6ad521901a06f8862ce1fc095d9c66bb2164e334718c71d7472ed765367db5fede105
+ab49ae93955a38f45f756afc4248a37773ba8d0a19779253fca3b744854715b9c9b10c09a37d3426614ffd3a8ced7bcb
+b22166dd64c83fe16feecc09d4b1df2d967ce7f4ab526ae39799dd5a5a4a9ebb1d4a432c5efb90e0875a4eb6b079e2fd
+aabad619d887b69b9562066fba2179c69c684b8cc9318c9e39646f4a5381535c024ab277a0f0be46abc95283b337212a
+99f5d484db149e9f8dc9c6758647c4e3702d88986600a3226874d612bb4b5e92a76b1dfbdb0909b8f21afc773ec67c7b
+adc8bb04eb8c56dc4ce97c3fc1670da10db134cff2edc214ee3221079251b968e2dbc087c56c01c9260b49506958a6ac
+ad625ddf5cd211102543e0943a7770a9b45cf3550d12dbb484cb5522b70cb626f9ac795b07a305be3e6949d7ad475f66
+8f9f5b2b43624e89e8535dc73fc54b744f247572b2920679bdf6a3ef346e654ec40fe8f81a0f7c7ce7cd5b48f3975359
+b70b1642f28bad56bb24b342eeddf5c3782e0cf6e0d5007c252413bb44b32586da1e3b4d8b45a72c91e44e07334da68b
+81b0311e557c47ec22c5f5d1f757c6193cfffae357dd2460019247178b13733484dc8630fe2e13037a1a3d681c69066d
+951c9f1504b19acdac1c04aaf535d3cd3e39c431b2b5d9def9b374468e93d378ecc3f5aa02c91ddb93eea431b327ca4b
+a85e1f4c292723d18a49cc9323dc7af12bb5a8d0c95d71881ae235ce123c50018907f46bfc846dda1a01b14ec45dce14
+8a46c8b86bf9890df60de4c210cd7865892d0c11fdf2747620289d73bad597e6b482c208dc310c25955dae8392d8f278
+ab65408622c63b67842a80c4ed665258ab617ccd07871fa3f0fde2e5ddfeec49f01d7501790a60b3a05d7579b087b787
+8706913d42b557d9ea4d7b70697069281504b3c4e1172a2291e3b3e0a0305c8d0bff6b7721356d971d2fe58e32d4556f
+8d9b8f3c113ca1215dcd15d4c37913d023c8c5d04f617319af76bb7bab72fb756c5bd992db6b9e765cd7695c316360f3
+942d4d3351b2a9bfaab2500b27d24fc2d7237e791993a7d0335f36fe6456c5a1a8bd28dde9228fb139e95288d6de5bbb
+ab014e9cc7d3ca08f1d3d24473ddbd693331f4bf21ebdee0fc997aa2faadb43db6a1195644c459b52a969f3d98a85b8b
+8b679da80561955990c91da9093837953f4ff7fdc658b51639c462b578a2b31443421712c6b7742fddbe0ced48c21cb9
+a9132ac18b1bce93e815f6d2f8a0d2f433ae4d6fa04269eb0f5f25864a8009b01531c7c3ebe87f07454927a010ab6dbc
+8ab02c113149efc877967c92621a8ef618bf423017e78b9cd30cbb13c51200c6ce27c46be75e19ba843d64a3050d4467
+a881043298341efc28c60d850d90d90279fa6d8428953337ba57b74eefd858e362c6118a82ebb025c9c102c91b4aeafc
+92e4a587479c64b8df955c6bf1abf1d7979a978e45d96f05bc1b9648f10428d77890be9ee03bc1b1982f5ae7b926f0a3
+90c21a22826e2e9978dd7522f51353fb33224cb65603779de41db3ba41e01d664e131233bf873e28d6c71294b565c533
+88e8ccbdc54ff06380c2243203d3f8c8a75fcfe638d6e6a010c0b3a39d5cda31f8d2cc416ee5264267aad2b457c94e50
+a256198394b458f6468dc91c35f579da0ef02a55fd93e98b25e43b1bcb650ff889df4899236765c1a6b35cf49da940bb
+b5c7d9c03c36cbca068abc6778053727e77d9b58c5dc33b11629f1ade1c228b1c964f5a7d8dea16057e76662c4d79f18
+9588e133517f0d49622222b4de5c124b1aa4260971e43e4aa767fba8055540f2848954886b7f245583ea527fe2fd1de7
+b66025d75169bfc7ea366cd32419e24fbff829709e3e9587d7d59620b3a7b72034d3303106f965f5f7a71d66b7f314f8
+891357bbe44e60627b975c10c872a34b78d6b264380e351f3a86dbf99abf8e2dd8d20c52dd6073086e48e1ca782e2ac1
+8a066a3482526a92476bb8c3e5caf07575c725d72203d67ce98f654f5ee8b7f979187416fe3d7ae0128800b253d7209d
+80a9e3d8900046b71fcd5b7034d1e0f57d95d2756da8307a11aec0553e5715518a125a653d356f399409545256a1984c
+924a13fb2da7a899cebf2ac09c8c0a183491777100de1aa056a6c2bceffd5a63e255f16a9066e4ed89ef28096a1230bd
+866cfc8116d2e0216d8049d5ae2ef0e3fffd377028850716a4bc2cfe16c5a6be023334bd6ddafa0c77913dd4ff0a34ff
+95eb74bebbbc59d793e3fbae8e98c258451bf9bc5097df4edd832e9f1c30a1446a59e1f75a44832d0658d5ecc13dfc86
+972517b2d72ab53193db5d682db2de7790a418ce4952c29d64e1f9107d51a782f4084591b7c775648f103445b797e8e5
+a14ad2cb69da568f2f958ef4253d7a6daf574c6976f4f5d771ae7673853ca22eca81e20400092bac84453b6eedf5aea2
+ad95bfcec6c06cdc11d316b7ad33fe65555e985bb33b15c9f481a09caba1e5990601ed6a88038c0ae2e04b1607e2da48
+b7e3bf3a585af1029d83f12cf75acda894fc4441cd7b3d56efb6991ea91b07512bcd7d6d68738557a48f0446b2cb21af
+a57efb1e2d2e10e41f356768385375a21d9f78bdb34d618117581bf7a15024eba43570c3956ddb85a025d39476f831d2
+a66d3622b1cdd472a2a4491881de035c2eb4f1c94927902a3bb9f10739f900130907c6b002982e03785c43ac30b8109d
+a79f2417d32fd772e46f3bca61ac788af8fab174e1e1e48a84ac557f7e80a9cb4e2d7b467365ad18f9777f4cb5bb2b8f
+b952b976e3b6660326c0ed357ff25ee1291b74891f3eb7bcea39dec2ebb11e287d6e26ae0506425a20e5e445273cc63b
+8c23929e9740ab51d9b82c6b7840067e7163e6c7b9b9441e1bf867ca2e532926981c98641e6c798ef12d35108abc1dd6
+a519578772c9ed2d691a8c423d360e4bad76afa422f1a5218a7a08ed52c9a5935ce2ae4c0be182eac0712259a43f849d
+b1529dd189cbf3bcca50e97199bfb85b42f2b26edd95b35758d988d1d3740f5d0d2e249763874fdfadcefad9ea1b3d02
+aa3fed8d14a4f38df75b9eed7f187a31cbb7a748bd3225dacd8325a71dfb680729fcc91ad8cf0b67ce314e1fa8ba02c4
+b77c28abce17732a08e682491182f63fb55640e60384932f6a9c6d3d7886508c9e67a841cb93e59448d2d59fceec4620
+b7a24c58e3b85d60d654ed14d78993a9cc78c130442c8cca42921ade8ec94bbd0653c9fe5c69ad1fb2aa46ffba04da39
+b7d08f3ce97901261514a5dbae582848e75515c5f9f41f5e70ec17a8d0db3067ddb19aa1c86803bdbb757230b148bb21
+a5b8a6818be4d59079d88f72d7aa4957c48ff5898f3fd01def48ff6bc7aaf9840aa91f2f05617d340092dd9299115c2e
+8e548db6b871fb23ca1cb8538d44b77ad02f4cae4d33c8c43228b820abee1aa913ff9acf2483725b195b4e65e2e92063
+9509189e063812fa04f4e26f87b33a2289a05c229ed1038fde0dacecd87aa55ae0fdc678a1c86bf13b81f4b3a872426a
+b355f24a5dfb7a8f3ea717111a038487632bf00d67cc2cfa2ab61e1cace7bc7f5bc9e04b190aa6be0652627ee219bf76
+a9b335f235df51b92f40f44f19150e182a938b9abb3bdd8e8c447b2b128050d228e0115a268af4c1bc2ca49552b4e0a6
+b306d3e6cd7ab56f5f7572fe51175ac6b29b189220fe2d380b959d131a35804da5ce95adcfa51d799f18e27d8d5eee0c
+aa49cd2bd34c37ce1f05e192fa6837f964c068170ab97989e1cb22ea7e13c2400417a51282519e74d8fb6983ba89a549
+b1d4fff41d95613e30427ae2ae1d3df8c9d06389e1e0f404f8cd40199d6c4277b7a898d06f1579be107fc5744247c36f
+99d220454889f476931b0cba3570eb1a8eae30b4c3617513833a551aab0a2630125f72dafc64a766b1a322dd42dc385a
+8267ae38c9c8532c7d4ec4455279a5ed4f2e48746cb0f2619937157534b0e5466c5f4b99b7c342c095f71f3b77fd5882
+8bba0794cc4ca00eac50309a92878084a6a22e4c23206c68b8d7268f9e7f615da4b9d0f3e006d9dd84bc3dcf32261e27
+adc965bd7c7bb2a52cd3f4d2cd3fbd72a196876a678863c6a67a25b4a2330d1d3be603220de22c8c3f60c1411df57b7d
+a7d5f38a3c4ca0541d5ab101af9c27b04c5bfaa42a1715e882c5e7715e460c4666aac4b6272b9fc54514346fc49d0560
+af94b91ad9b0f01df1d41a459f16ffbe30710325617651cf1da000eec43876161957f079a27b70018ba34d1d5d68cf6f
+a0e2a492da4614f41741157d3a1d19a2370ecc8e178d813e22b902cf7454b8237f1ce3c16270eb6f3ead1f92797e36f2
+8dfcd39155d7b8073b0a1a9a617fa75218f569520d4817f3ead375850ea8a3e3dca64c44e83f54afc37173d927070601
+98302358e5b740b73e1a6c568b99affc6de3c7245ae96d9c712d377fd363d8b8f49dbb714aa8d39b5b947b6de341ece7
+a2fe0f9fad663cbbf4bb05f61edfc90716564d5ee5a9529ac3cb8f06f96329248cda85c43f24a2382a9056e9a53520ac
+ac50b0727ca2ba80692c0b7f564417916695ea3760ce9fd71593050912bb97366d29ae5ed05ce52984e52218854b8e3e
+86f56bea946a4516336a90328fb4b24cc7f82d8710d0d1e34c2e27b6af73c4f4a9d6a848dcc56a87d6259a99ac444557
+b33d0244948c430a58b210943e41aa3cfecc9a823dd3e160634ccc45ea2680987db2912ab2a173ab6cb9cc2b7e16f7d5
+8808f8c2c2377cf52e7314820d88234d7819a6108fe9e1c6a675dc47cd59f81f95594ba2f5fa10e3719580f53edda641
+ad34a814be6019931972a76b3300a4fc9ce763d6f4fa1ea131a67d575c00c827b9ae7260d88577b4b3689e90a845137e
+9370abc67ad0fedf30b929d1613e336c6e99e4bf83ce969e61e5d77061b48a1a493f28fe2eff436d4a979af700a83b5d
+b0db136c8f4ba2fb7148b1451b18f694769f5e53650d68342f15817b04734ef8ae59681a5754df617d755a687b6ee45e
+9149909d24382054a05fc0b057613d059721f132a19017a92198b30e48fbbc5f8f0b5f5db55347dbd9d190ca88f9a28e
+883d1d170fb0fa95b55b10b32ebed24b1232dbfb5c783148a63a765fda200e796aaec52747441704967914433a01a323
+8f55fd5ea11c4fac277112d72489ac1de28fe163a756b125f27acb78aa6651c70d1cd8c45e0daae417bf894149ed2d57
+8d08685f99aa8525b008b868f5486e24a08568a5afba9b729f7d26370fb1b162937db28b935d67e4d22f7fda69a3a6a4
+b1882e23d784ab48b2f9e58114c5920bc9d0c4c01d2d7fa5111561df0cf2d738e31a32963cfa58939af87e79428659da
+a3eba902d376063e48634c9436802cdc6b89d3a7c7cd03b26a3fccc7218dca85a3ed939eb53956d2e001805aa5c2d63c
+b97330c40d51a4b71f91f56292b628379ba735509a66c7df054112578b9df40d3aa32598bc64c03c78a3311a17997bd1
+b84f3d2af2aae2aefdfec9a0693f6bd71eaf4d477cd72d80f4919235a471607c5483b354c9d46628a76d6b6fe7c586af
+8a1c39bea7fa580de967d8ced7e3860a9031b07842d71f8c5941b8877cd55ba15ef7aec6116ba38ba290b887b4530685
+b120fccf939e7d7959c2c1e70d7a7aa3b84684dd1ca8e5cfa9d281fd06d23eb67a629b1a27052614c3ba639ff9c90dde
+827a8e0dc841af0e2c4a9ca36c84a0ea60099aecfa40294344f82878b6909f5581f7b34fa9510883113795bd09b5e4bb
+88c24cc54dac5a2982be5ac49684d99f95574bb8cc44afae4f6e18231ebea0f2ab65b49870840bd3e8f2c9247f62c7c0
+b91fc3f2cf743f4ed42e49007514d43dea1d7bab388a18de6f71367fb8f2e9b8e88ed9f7492b647e548396ef3e3d7765
+a175000c4765a57c57b219b21f8302cfd85aedbc3340fa1690119bbe7cd93dac4fd0ba676b1784ebac83efe3e78d4bf6
+881a373630ebc24dfe17e27b3f176de6651347ae741d55675675e9e6904ebf157e787d86eec42ecebfe4eb8f28de6fc7
+a47c8b155c8ce8e16f38deb345a051fe0c9b217cb7a266fce78d7694134247887789645a82c0ac24341f51da8ee6ef00
+adfa5bcc682d4449adcc436649b444dc61157154e24d68615b0ceab50eced1ab55e15b45562dd8e00785806e9ef2b7e7
+b7d2ecddf47e9fd25dcb283eb80e323300bf5c3ee3344abbc3a1f2a3296c631577a1fadfbf685abb336d5d7059d17166
+8833f6b388e46e1f8fef1086777466277cd418051ac0323e2cdac5902d7ae45eefef93ce90b088bbd618e0381c1ada78
+b6abf44c5aee5d0fbfdbcbf1e77354d5a2ccc239b894e1e06d7ffa76584683f707384319ab0e0d17afd93a854d7d26b2
+a8c61859a9553a83bac398c14c987b20c8dc27d63112115b8aad26bca275cf98913783c802ebe3b7c3d878c130407b34
+a5de7a519f8de4daad9137f2c2838544219834cd70457ef09467d869f4dc32098b7a8d4fa85e1eb283632f6d09971318
+98c33a315a66cd8ab9ca8a58c87e5ec588107a6416c4ea498d0b91bf7597f53a405e437ca0a9d9c6acea27ad0ddbf4cf
+b2909b1f8752f4eec25180a17163ab215fc20c4a931d4471d3be0ab64207a65c7e462fc0707791286a92ff2f2b7dcb0f
+8b96c2fec34cda02e98510a3ed80a980b0cbf4ec03e3c4260f84027cc7453acfedb5f708c401d26db137032c6cb4a31b
+aff645dd6ffe8b5076c83a823daca4149f0769bea3293b61330ebd97a17fe16758e4fbbcb5bea7449595c6e261127b34
+a45f8b3b7196449f9952cadc8d87a787a28b4ed89f8c7599e7db361cd0f0aac6bfa464024ded5c0ffc660e417594fd41
+85016b5f7ea9863557eccb0e742cfbf0b09630f0bad3de55aec92b95d4645055cac60d03602586b34f774bd356dd5554
+94fd89dff2fc6099e5ab90149458a4c794eb1857f1dd9a2c84b88099412477dccfc2996cca2abee68d23a05265dcf271
+945a52621ec19d26f7c8abb5d01e4f5630924b75a349ce74219377a137f4a0d386172da523edaa522d27902444023cd9
+afbd452dcc57f5db6b3fdd55368807320459c16559d944ee8ecd1af6acfe9d58c13f37961f78030883f8ad7dbfac66e7
+8ce96b3be871a1f33d559a6e55e4d86a0b92ec3954417f8d98676264596c3296296532097b9b20c83c341527a0c929b6
+ac6a4dcd58486d25a4db1751a60ca4d02b80c939b39ca165a37d9a0a52d8675b3753719f136a59ac400bde3efd036c8c
+ac87a37a14a5d48842d30432935929a0e9dce5642142a8c5b95e377ad1bf52120dc64697f0508b7c258af24a0ef484ae
+859f0ba02d496861455d9c39c269a1ae5bd224319918fdc3648311c93303c0e13301ae7f3f77eab4ae43f1184a912b64
+96d9b1d2d2fe70b8fcac136a65b62a4ded85aad9d350c19bb955750a0b24f93174e9cd00c0e0a1987793e1180dfdf66c
+a7f5135873a1c08c7c8d46adfed19d0ed0e33168d463ca74f75116168355318ad588ebcca1946d7669c5106bc9f5a8f1
+830b0587587b80df078ecfe0857a4b4cfc05b722c0f4f3e1217048ee18749e9940cd0200c1f7a0f60de832a5a44e9f1a
+b6625ed0199097acc9aae20611f02d2fb837e4695762cdeeb4dd722517ba5a344e5011f14d5076783f3c32bb5c4a027f
+a17be2e528c463aa4ce4bba2df5b005f88e363b87be7324239413ecd5bd68e350d290370e1080ab9911a0d54856536da
+834064460f0e5f38950cf5ec197818712f01950ee1f32b1987dcf7f4098d20e1d91fae6d48e8a054390693a2e572f888
+86217b9bd269408ac92b5cffda5716bb3bf8674b7e222668d72939a626f4ab64f30efddf85108c0764127cdbcbad7d69
+8d7cf47b0648be0bcbd3ad1062d90010e5ee84e397895ce98160d5a568d60a19582c985944ec27bb284459789ad8f6eb
+ac056e3ed3487427142b3a4e4f9db53f1a752e1994f178577c46dad71be5fad4d03d24ae7019804c41232705a4bffaa1
+94b83d67af6735e81b2e392e6af8ee4dbafb0071d84486389f36f222dfd015da718c621acdc4360630403762dffcbe3f
+8ad27bb51c6cb860c21954f5d09dfefcbe3a9a0bff3e24fd1f74850edcbcc76b5b389a616ea0c0796b239b0c22357a44
+af9990dc4c9f536385811528f207a8352b083a4abe6dc016eb5eece0ad74da65b2c6c475a78cd0ecce0b2b550e4412cc
+816dcb8ff8556540b54dcc1efbd2242dada0acc1e3d3da13ae581d905a9106bdfb8c138eee93992a23e7740593e8ad80
+b8fcf8e11e5924d3d38643b2a4bed4b54e69f816f40d4020e76655eba8ffee758c16cdc2d970d3c8c1163cf501044c03
+a50e0ef4ddfba6d969e7dd864a20cafc7fa6aa232fa7a806c3d53c3e029cf110828c5a9c354ea42aca5688896f27e6fb
+a560435900c48879ff3f89067daa8e512482f061c68474d951c608ebb5a69c7863a28fd1e216eb4b140e32124e50fc73
+b9202d152b7b708ee61c4fde6cf423b481854538d2580bc43462610f12141b89ce779c7398a35c27ea6ed0afa5332bb2
+a9b3f8be28f9546bc70f680dfb9b08c1eea6fc381cb6f3ebfbe33bcab48294347d4e64004c11dde5eb409ecb19941ad1
+8cb3086d265060f8e52a96fcecddfd261886002c1821a8f59a1ddde19a6bb1354b17cd19a9cbec19149dc219a4c394c5
+906e8dea406ba0f0ef43ff623f8521039a9455a2290cae4ca9bb6494ee0aa812528267d1349bd5d339113dc9d1616b28
+b9b5212b76d5824d66b8df7cdd5effcb05ccab5df6ce67558872c99d1e484ab8d21037bc0e22f5c4082b192972b80acc
+a1fe817596bbb5bed93a5dc4c03e14eab627484cdc7ab7e4fba569ad0aaa93b34c4fc8680c4f8180d8190113218d26fc
+82fe7a20fe93564cfaf7eade8d4d1394d1b4e36048cb8632bf366d3d8084ee52c74d65c4c69d9d24208f7916278aa592
+81f42f9a3b8007e5f02c26770947f884c715bce1e600f38f164a390f159e2e5b6f8522ef566bf36422b14340bb6d3556
+b53d3c89bf2a4b29bdd8f1bfc001c2533f86d869fbdb383fe9cd93ef0c49da0692361baa9f537094e1af662a3461f8af
+8fbeee613823ebfd514e991d81babc05176d5c115907ec36dbf83a69eaaacd622f1f36be2e47b984cd6ac66a6b35816d
+a9068ba463ac13d4dba25f9bbe3c93baa35828563f357c53a7009cf0c809a23502e023a32f651e29f14424c5daab2884
+87468aa4c942476b3ac3000e740c4dc72d320884357dd99eb25e81d7b52a859b9ebeb55f3070022bcea3855a9a198e9a
+a5f1219eb902234ffe8ba809df590080ce8329ee574eb346f6b4372892d66b0725f048465221655b70b3d4c2deba9fa0
+8d9663d4b48cb86201d343b20a8e7a6ec47a4bce0e85a905be31121a01fbef95d9f29d83530faf79dda163c6c76ec514
+9921ea9176744e15f64b20ac6e95ec132052eb853ef47e9334108778fee60d9d9b53fa0b8011c6a4aaae472eb11cc61f
+a04c2c5e2c5a7673652919aecbc5fe09a636fcae2d06003ca6775018112b606e50bd2d6ae6ec6131d2a9999837186bd0
+a00ddb29776d2747e3a6e68eb51a7cb00ca0066a9aac5a2da632f355db515b32e2c441fde870c9731a9dcc8d9834557b
+85afeeae8bfd92c51522320cded430c2fef57b1950f9f966f47ce6354e492e9c40f950a7ef6d5202fc79fc020f7a6260
+b047d214201744cf7e675af5fbd29579c3b26020c5e0a53e2ce078778b3d3a673f0fd87eae8af8f0fba3bf0f8341b63c
+b8aa5364d914020158d11fe82c2b77197ed2b1a12492435200204e20a9209d3c0b4fdb6fd3f0b1db71ee3b986400ff46
+a59a903fcafaa8b5876a3eb1d79a7db17c37457dca018e393324d8db3be7c2aa3ed2303eb3530d6fe1612fd75dd92e08
+b1929c1711ce44465daada15808099234c0c5c8f43b050b2792b6ef9b77825996a74abdcd84d6ef08d648e77cf804357
+85bdc33f8dda0d853074e0657688899befb6356c38f0ec2ac27c46c39fff06617edbb1c5cd220314335bd1b792f1e240
+862047e51f9119f5a0a607469496c0574b0087d566bc58cb5b61a9a841a3cb693b89837a7c927c542ca03d0106055438
+84ba54c002150e5989f59064b68989413abb5f289f3ccba215b923f86f76c19718be51d503ce3bcec68322a7c7d5446d
+adc9ea06c11bf3f0d704b321005020917e731e6706f18a5aeb1b56dab3de39a94fe8aca3c248a47565ca5ce82face9f8
+868324c4ef80bae55510316f3a8b13aa40e60c8a3d55f4994439d1dca6f5928c4cb202769d78c21597d8737e391536d2
+a6e3b57e9909b5fbea2114c352b34235a4d4147417e480580c291308b4b9cd696b36278480893667e8ba01fe3bce571f
+b92e1d6ba0a2a244ac5ae2e7b20e152591c1c466c9b4c658c72cc5985ded0392b04ec00e32291f1652d21dcb633919a6
+a3e2bb4dc07ffb1e8dc9055ab45bf22864980f64b612548ca7feac85ecdc426f773d6d48bb7e6c7a578025bfe99307e8
+af764cdb70d5afdbb49dddd519451218db4e97ef3ee622585880425c3d85a8df88613f4b51ad40a1f6635e45b2efa5f5
+a426230b8ed77eca3d1ef7f4735fcfe0e51ae37efea5b96ea3bf313c241bd703b91a592f035e98056315c9822ffe8c26
+96a3ae7f1b80690f97372d086d2d13ea2b40802bd053980f73cddfd37045364ebe38064a8cf3531e9bcbfed421040f20
+8cdfbf0663bde624b703d7e6c36c5753282487147e10e5a24fdec75836f7034e4c38f3fa3df373476af969a4f835cec9
+b7f7a549cdfcca30b78349b831ea5173bf5b91d56dbb999b2dbf6b85d8c22ca8a9a62b38e37dcad7ee5136a32edd5743
+82ca90321c43d616670a7d85447afaa9034459b796b51792c970fd5b8f124e47a13ef661291a4ea58a495e68aa36dd87
+a824a36e4e2db2bbc513d39e4e2a841fa81106437eeb4fca9ebd78050667d0b284b7217a35ee3eac67d8be58c0af317a
+9370dd0c0f9c7585761eb5f06e7899d75eac07e13c140c64d4c506b90495fb8ea914f222608c478708d4b47163dc9907
+88c07e19252e905faf129e3e877dff8dfe93e81b3903b150aa33a93a7eda2820a8471be935825d709dc662d06c9f99b7
+81e936c00425f7db8f0dd88b16c3c5208e8d95a5072e69524f3b5de45f4e2dd25f0aba8ef17016bd914bc8f5a42fcb6b
+b23227dceec18d6dda92a15b7dc8623d9928d545db93b3547fb068c99cacb3fcf3d7f88e4357801de8a652b919dd907a
+b23f1627219587773c17070bbb190e1280ab27c5d7e98b43adea0e1f5017790149b71f90c3691301bd514d20238c5e6c
+821b7bff6349c204ce50e00e296982536baff68031165ae4c639122195e7295ea0c82ce66fe32a1b762f6a311aec384c
+a26c15bf1ef4d5543c4a006e4ad2a450d44c93c62c0f0b035698530cbbf925f6705d375e1dc8b2c6fd9a2c69f4126b77
+b5c5bfff4697fe13a5177fd87a8e293fd1c6782cfb3d1f95c5ddcb13c309dd1ddbeb14cd359c9f3029b57ba52996c9a1
+87a0d37f04155bc22ade44f567dd8a81445facff15d643886cbe6534aa44505e331bb75c9ea2f27624154a5890aaa2cf
+ad85c0e6345e2333a0ff76b769592f2b24fd0661984498dec6fbd2d9b0cec5f139bd71331a28b13aa490baa7fe27b635
+a9e6298b90aa8d3f4385858e08f393b3bd61376ac3dc44a0907ccfb372813bbfab1388d544c1a4907aac38a87dab2abc
+b5cfc8bbe4cd3ac1a66b1c8138c5c68e643f7f4c310cbf1483f6e48d4f7e2d1cf24b2704fc687032eb03978f18239072
+9493895ce0c815b60b0ab3a989f63c6ba4c752976160f3e52290a724ddaac9075e07dfa913e113807e0e57725b1cd593
+b1e800c2aa32d34d34b24dcf890f6ccde7da60b98c4646a5471fea7cc6df8862b7a9c4c40f38d0554e33e2984fd564ae
+90a18f877f149a314767f5dc15c8726efe5d20a8e15ad4922c6042420a2cd82018be813debf02c6d69b96e8a27c0c5dc
+8fe35142442c103e7bca602445b87cb017c76befc83d66894d4f810e343b3a571f3fba14d94521340ee7c5ccb13338dc
+b43547cfaaae899fc6295f496f213916e5adf9b0d75805c32df0f969fbc1b4f8584759b2a06b81546b48004d72f2e8d9
+9410d55865098325c7b559eb4e84fef8a3ae890e1d6053b3f173ce22e60ec6563041ad8cedaa2dedbb59f3dd645dd1b1
+b127d9e4b8280e10434d53207a7191782464ae83b4463cd8a32026e5d8a7a8c5306ba43ed9b7ea637d65f64d6a08bcec
+87de8fe67524c7d107d7033d4107659206c347c47cbbdf85e3441b53c933417feedcfb049465c67f4c4156219a4f63ac
+a582f976e77b861731595ea8450c6b525e371c6548cbf7911f05560d4c7a4b62a425d5c785190628d1aa1f8f27c43b51
+a195e358742d924fe2a7f955eb21ced7b211cfcd5dc3e598e0d2713c3639b72f986aa586b7a22a75f8547bfb46cd52a4
+97c249b70ca2f9da728a256d18d600bb923005ebad3e1d541ebd580af3fe07123fdf87f4e8f98fdf9dc8ddd826ab7344
+8fc7891e2f540d8f20464a36056f227ac2ef3bcf2b6edd4cd2d9024a48fce19480fba36afc7f5c4bd7234787b8d17f31
+9047512fa27e2d8d901516b5714133c1845494b6f2aeb2a0570dd8533852f00a8d9a8ca64979310e83ac73fbeccc33ef
+a1be9cba454617af0dd38865ec29e7d0777d7c68968c856f90b5bd63a7cc4274fd8b179be54143bed972b921864424df
+b086ccc8a705999184f51e9b45c76975ca8b108b32a3955e122711fc1ee007d8417a85c9cef217f28d6c7799b60aae4a
+ab0938a72118ee2980b28dbea9f7100c6f54fa82d93fba8bfa81b6bc34f9d2033a987e5d6d3816fe0bad53cb88bb8c2b
+90fca0bddc14f70282f11998fb4c289fad5c0e78c8e8f9e7a811f20413459a05c9d107ae771e9da501854022d827f2b8
+84cc69b7200f63c2214375a7a0a5ccc14bc02ae45bb6f3b27f67ac538d01e628c66b40e5c40cee38bc8634f1a3c3cc6d
+8a07a1cc0a96e6c6da0d27a540e235c2ab6a95d087e624c90cdccd781a9bea6abc0456d896574950a9e21e7d87fdc582
+87f2084a2f2218d7f9eb7725617ea37db0a19fb0bcfd7c95501f62fec0bb6bde3950690420a40d93e26f426fc622c825
+8c9fc9b470dcf8e576af943edaad28c29f53ac7e24657618c21d910eeba6d7b16f16c418bdd5cea3d639c3919e93b7dc
+8f026883d9d8c7c2a5c04e4c7220ba7061a48392a8a7794a3e290a94967d14caf040a3da3513fd9b4e695376e706006b
+83bef852b9f387a2aed0d3537e77c895799c639310cac98e7b699e9f5d74b2b21cbca58ef910c6583e0b849d665ad379
+b08a03accdc64474490706edce9df7853b78b719ee731c195f70871b7586ed274778d99b84ec3cb8cc0b5e38c102bce0
+99fada688669b2ea8d9b7cd730b057292ec3fabd30cb733ea3f7cb76f756b244cfb26df03b9c087b6d9c58f5233dd1b1
+8eb0fc7ab6b4238f2317620191dbe835d4ebaad0882e22e8f0857053d25d6d9077754251202472d875303669dbb806ef
+8fac2cb38c3a1e361aae5313ebdc1c7e0b7d1a440482fbbe24389a7fcd381169fb325c79e430be170452326cd4931732
+92bacde1472436209032f0592973a5a40d505a9b2c9de648eed1ce392d0c18e23aed9114a9634ad3a7e6afc4ea80ff21
+a28b394018434be07323a2356fcfd6c70b3a4b1c6b6ea44da1da66c389a659235e0dc941019bc5053ca41f10d9b6db2e
+a6d23d7fe7ef475bfe6486ad4a99ea376c6a6db3e70a0a7af421ef6e6c4d6b9cff68d03a7239a56eac784769f63b2bf0
+a1232e6747573e19df98a088fdba57116745612cfdd4ff21f8df82a66c7d5df7e0a6c0cd73117121a516dfaabd0f5016
+8dc574376016b73f6730103cc45c952c5df5d047d0b4ab3da0303f66f43f7d147b5eba5300750e885c621e72b4a64b43
+a66e9eaec79c958e624655fc2adb7b89ff3da0393898e028bb07cbd6511ca8d9318e1d60dc11cf0265a498290e756ecb
+8e5299b661dc0e088527904d2c2fc0256613a1fc2b92bb92c633acf145edbeeb053e82b468a3877f6f14f0878fab57b6
+969943ce7b54f6e728724b26cfdf4df90faf9f9796bafb910ba66d96cf34062fee6ed9121abd193c9e322950c8eadbcb
+ad29ce021d7fc875d1e61ad3a99e112ff092ffd7900a608bad30517e50e2270e0f8dc7fb5cd42f1bb995c17d86268f48
+a55fd82520f4d35434066bf93a9601c96549cb4714d9ac05c32e16803daf8763e23c3125d2005eb229bf5d7e2a91ec3e
+a95eccc21af531c5e1a36ce88eda6b87732f5fa680e851bdeaef73421c1c87c8e66bc314b07ab472ecb67a08ec53cd4c
+8f48b5a0636bd89a1ee259223065449523984cf3bd9be78c9242276c848d2140bd94d1a6670e446b51b178ff694b5c7f
+8a58b340e30f0cbabcba1c565b68eae66405fa2242b43a7f7d3bdce279af42fcb4ef58c85fe89cc2dc56a41a51f058b9
+99103a659e26c9a4d19404db4220dcc5defbfacfdd969eb7d70b4fbf9b2c91c92112c0097e8f0c32ddcfc35741da21ee
+a088cc15a45094cffac52c38df427b7144d621cd1d12ae87d74c00a039d757e36fe3cc2fb35fda9b33b375553585497c
+a0f1d15bc388f6602c975b4b9cb23ab83fe31124acd946195b999620c3c20c6610157a891114a43e3af551d7b8c3e4be
+a571057592f3a9008bdf726254c364975705a71bce4e084a37915c5317f635528088a2f50afdbe7240c14d813e8e979e
+a31e425feee58f8372e2bd4c21c48c299850df34044f27db3e4df55fc5e7c042cd19be59500acb375fd3478379f06053
+94645ca6400f80d9a90f5b1c5b515816d6049ab04a552109c9c16b41366a7f3931d49338d944ee8eaf2ef5c77062c362
+a61fba865027b7ccb03a4ea966081325eb64db5a64c5d765d2893f6a19411d40dd957d8a0b34733aeb3f002a4e0279bf
+8199b89ea13ef8eb2f54d27bdcc781a5a7fe5bfef4ba4444bd651ac6021f4d90250b2f2cd8c63fa3ef237ac6eb1bab36
+b39e1e98d07c95a4fc19ab175147547e5a20e66c044f29e4855818db4a7d0e7e2c24192aa8c89fe378f8d8ab3e9f0e1b
+b807bb0069474e190b40bb2b34165351e73a392ffb0de83879ddb181989a22bccaebfdc90748f54de81c41ea244e7ebd
+8b058266df90032a1a9befc7abb759b64a23ab628edd051da8b81db4211c72fd63093dbd94796b0690ff2b0c0fe16cd9
+865decd95200fe45947a4249d2d8551ca5d7b3d7955adf10f94ada3e69d684e5c5b8939fee9a4457f22d21bbd3ce9670
+95fb5ce7af13976320b36422b5cd9dd46379d13110fce619969308ed6a250cf3eb84c73e8ba1d32edc01aa2f6e367707
+a1a176350aed82d5ac01a072ac7f3cc1535e20fb597ebc7e417921537f9bfc4cfc0d490d4df831f0f8ecedb6be970a15
+974ddd091c1aaab7ed356b65c244748a713e98b133c5606436e531c31b31f6ccdcad2037b12c68fb54af4b19bd1d82ab
+8ae9b7a8cd856087300ca90799ec3265b92f84da8ee9e98c6ede1be378dc040d0fe68b8ffc94b146f2521b9fe3d19e54
+ae17df60b83e4530af584991b545bf4b3cc1045416dc15250a6b75a9a04defae4c0f60b8bfbeb54c8a21fa84fee58e69
+aca1e75d4a05282b0cbe6256925c0f269a4a8323888bece4a48aa0b5e7bde7fbf1d3e4f5cc38fe6a38aaa091ccbba4f6
+ac19171d3ee2f2e5021418c37a0eb25c083de6a6396290ed35b4771abcd07fda745fd082e3c32c117bbab7d9fec2b67c
+ad8a35eebd3bb28e08b9ef64bf2d8b75ead69db29c96544d71686ccc0819ebc6823e49b3b879ce0e5ee3131153900632
+9479f12dab191269b020b70132996cb32059ac087e2a3f3e559d297494189e1d6849c340ace032946e12bd4923a3908e
+8885e680de6c158cd67d66c142b2b4ac42b96e97eab8e2dcb90c3b454dd214bc530fbab6b5d5746064b9813775b6d5a0
+a16d8d27d9b2fa04c7eb8436062a53ee0a4d679bb205d7d7cfc24e5f28e3752a9959847e9e31496bb0cb1c11caadc30d
+951b00c69dfd9fc80b17733b843c440c58095989bb8744fc9db63a4a6116f24d5f224a279478fba8cf57753261bde217
+8a693564994a1dd298f0b279e618b46bed349c53236fed9d8e05ad9383ce55fed02b8a361fb8c09ec5ffa8a271cee015
+a09fbd62995a33904b4a34ac55c80f6d4cbd39a902f5db1038d909f1a2d385c3f5eab04b157b5662558bf35ed29cabc4
+8662373988373409a4b31d45c5110afc32aa008bccbeab39d5b09a0e10370dd879684e722a8856b0da278e2bb91d67a2
+8980d3cb8a82b3a827ba65f44e50efed0a6f37d6c150d70e4dafb67b1db173b46ca29d487ef9db92d37ca8312d246008
+a279558faa11850aa4f0dd9ca8bddf69cb98bcd4edfbb0c19f22d1bff85d808e8f2cc026d95afd09fec2d15c116bcf73
+a3fadf9c3066c93aa6a31d2346ad0a1d012c12ca7a24630aee46a087eafe5fa518d20647856d44ac03576bb3a9f81a76
+8a8a19b09417e1b1607aeb54841fa69f58e094b46971c6a5cd0fbeb2aaa98c56599ac242272e6973ca0a9d2c09ff8d77
+858a636f510b494edc76e86b1718228f076b8a21306b02abd086dc2a96c7a034704d743ca5d89b17903fe7b2e43e6fe7
+b031b789e4073b82bb8c78f9d3fc2b901d75278733a4fa0a5aaf985a298269a735217e85eacc0dd554375d610a425359
+b8603ce7cff755f5e07eaeb4d74dff179cde405234bbd7b3f62fd903054aaa34a9b868b04617d7d407c2b8e377227f07
+aa41829c941acb3f9f0e2008e852fe855e153960cd3c85c4b8ab9f97ca91b7a5aa18f997cd023ba9e03a653f238a4f46
+a35639f920619dff592176aad2b4b071d5c960f149c3a75311b16841d1872f29aeeb7c155cc9bff41ea7ee56f799de78
+b252195aaa52e9a34936ccd1aeb40d28fc262cc4570d4f9685da8c591080e97438edf64d4d4d074491344bb5e86b6b23
+abe2e52d10620b503dd1aa584e005d857294565ad90dd89217a77fcce4bea7b0c72d54dca7a1c31b5a9042a9602557cb
+818085f2f1b525d9b2322c8785bf27a6759af9aeb231b0977cdcc7d7e77cab5de056e522dc791e72b8d9b93a9c41e833
+930f64d40ab26be006e91deb854c5b22bf6951308dc406b2c7c7791d5dcec470529957fbcfd6a3c9655d544d974de7ad
+92b28bdbea8c7588ad3a27992c19d73bd3a478b276f0e11c4e82ee2482e4e167cbcfddd17a1ac6bebdd862be65f54098
+afa6a85fb906f5ffe52b6e9715435dcdf9f7892a396d740d67560fc42248d23bef470989663a73190ac9da442cfe6a82
+82d3338e58fb316d66694ff4674a5d99bf0b13204dd251fdec95d48382f2d2ac60176a19e5ecbaab5e00af2a39a338b9
+b30cd35eb15b3910b8b8f91cf04c223d79d587a7ef713030f0ab93f446caeef52c60ada365f8d3d645b477e7fca61d94
+89554d2a9a11dd7e56f0b568f2a50c72d86362d95eab5d94a2386397012e18bef7c9e01a2d71fd325c0692e4d316dd16
+ad58326fea1c00e0f8aa92923661be4b3ecc79164d68e91c4d1366c9894b6d049a4f31c9bef6e5f21466ec014ba6b94a
+8915a16afb0e68a84fd12a9203f8f348954920126d88136ec027a81f541b67c421b84ebb3d6e8f085c38c2499c28ea61
+8e246e1acf655572863481367da007e94bc1bdc1f28aeaa1fb163dc05a51c3526a2bb9bda0a14fc6d658d85a9322e44d
+af83f9ad3c7c1504fcf60084e0948624fccfe3a9892dbcba8f166d0d67b475ce57ba008f286069da20a0da0cffe3b4ae
+aec86d2d803612e8d27a01e3382e0a876164baaf2f3b8c4e9455ea00bc2e525378018e6a41ed9686c6408148e852bec7
+871bdd8c84abeb1456ef73595360de6cf9f92ca9e6a8b6b816ec7497be60a9f509ef2c91332d17cb5fbd347bb0113d2d
+9503ce513df28b61d721fd5e8667272a28f210ef787bee58538f786acd16f04a412387c6f5e6313c43f426a70aab65b3
+b2cb0526e7e524ca9fe918e951c19460aca911d2b5ebf97c2bc74aeb69778a28316dec8916a4e3628b46bc51586c1bd9
+98f52ee1896b632dff5153e3d1fe389c6200b14cdda6b27e12d4a4182763b63e0f587386aed78c97a32114dc286b975b
+abbea974929c9ba70551231e3833d5cecc71c60988826771f792f190ca77c80efee7607dc1d6bf01a53796d8d9b73017
+a4cfea1d06cf840bd599b14c011b6b204b2cf6f57fc7d7f310052062a4fe8870f02504e6c837c2b556c925921e543556
+b957529d7e5d1fc45c5a822a6e0e480e46af2f5cc3801c31996b9b1acacfdd8d142265148b3e1453a0df0c5e6cffc5e6
+b7411aaebb1b6a6a75568f81d052e60fa7752a64c20dd7cd5457f999f0185807987de8fb72ed94ca9d1148c19ecbe1d6
+84be67a5ca80a1fd0f43cce4c00a465f167445e42232c2d2cad5e1097a62d3ad564041a55f0c76a340387503f15e0ac4
+98803688f8e7b445c7ad14277b9f5f12acfba4f9a4ba6df9e2b7dadb726f1bee5098fd15e0b5308b6686a38864f84912
+b085eaa421e566276bcd45d8b9fb71475c4530d63e90914eb2a33c17333d5628c1ec8a45691cbae82ccad97d4addcc94
+a08ff7dc59dadb183dd0b5d336b6174464604bb2b49315e0c42f34ea08a8bca9dc9207750638bb7ebb6387257411956a
+94d72607cd8a75b2fe2e9333959bb9d5b54d74ec36fb8c123c157b19a17f01f310b3311116b34bcfac305e9deabc79db
+85fa61a796226ce555f8195c792ff6f3d483f62dac41c17b7e8295bd49ae6039574896548728fad4ce966be84a62a6ca
+829ab1087ebb61db05c59e3c9d03e7010f8c546db117a6409bb813f6fa04061833771c8aa4c5e2981bd1ee551df0ea59
+97f5c5261db0b130bb8352fbcf65002327bd6d8a7d4fee2a9bc293173c8c54be37ae229c5488c1983bc1f7857c66188c
+8756439e5978ba19e2cef95dc55f706d53a05d1fa964c64d89b0e95470b5344b2f8d44680080626c37c77a00ff0e6b00
+915d33f90980089c33f403ba4fc5c689ea7f1656f5c4e1110db987c59eb981b6a46dd9fe82c8efe7d1e3504f1d2c4d2b
+ab5bbb84884ef036c9b00a84f7d5ffa2931854e2afa5a63121fe64d548531af4203495b977bfb9301bb1e4679d42665a
+9830b846a9041e4539eb858a179b4db6da89b507424e6d858ca4334d973ddae255bbfb04ae25c3276ccbe97c46f5816d
+8e35f4563b8a5c9a76cc1da87ab21cd894de393dd61bc977cf22d3de454de350836e032ccf7d6ea55e2e6b83c4424146
+b6338ced0f05806c625905cc51b7e772c5db3bac144e897339f67b6949f4d648d41b7d23bd3f299f4879507951ec031a
+b3afa470fc71b92f415b879a814feb0702b6adfa08e395cee4f7d8b0e3537288f16c83b28ad4e2db02c1fd6d39e6afad
+b4fcf7af3196bec84fe1f6e3bbebb8abadbcd46de02a37966d0ebe20972fd890803d570e4a201f2a89f479e09f19191d
+a21fe1f8f57691165d0c7d8436765562cc935288f24fe765351be335f906c6c4dd1d0714b134c51255b14511c957319e
+880a3a8f6b4ba410be06628a011e6bfd38d86919cf8014b4b4e1c930f8e3035749579389690f21bddc4d4699de8a4b1c
+907d93a7666d847a140367c0a0ff80a96d6a8295b07cc4ee52d3be987f431d8dcb95d3717dfd248a5643c5395ec2891a
+b8f38c78b8a2c487874c1a6a92d15cf0dcfd26319d4cf65c2f4fa9432203ba5ffefb02b7324022c34bfe0da369d96d65
+8bd4ebb6d720fe52d626a621670a06c8a304faefca3846df1f619f4d456e14f8bdc547fa7210b8639b89c6584ea5c5d3
+8ebdaa288a71a2d3188d6294ad0948a4f72c1eb6a2e921ec82cecda4d315a86e3e6233b5ffdc7219f34a99e9b4555317
+83320fb9dc62119655bb0055192471ae06b7641dd4af64670a4d9475155733555ad06a93ad2fae72e029049601780654
+80b3d022738318238dd32f122bd88cf2f734a61e315ece521e9e038f4a9bd7b54b5e67784f5949fbcc5fa911dd4b048a
+891a23b4bf5cb8558b4540b66fb6b9fa54e9d0b2c084f660c8bc77af5ddb97cb5d8042b538f61330d9fa8ccbee6c8a41
+8e5651d9c95aee23835bb1a06eea76efc9d5c881cf87ee847ee5149fdbf3d67dcd8ad0675dec8fca6cef25368348abaa
+86bf1d094bc4fc7c21b21cfc7adbc750db0b27c35bb160d306b26fefb2699cbbb1fe624df1b9e7f6f895f1b81a829361
+aebc3cb2623344315875029378c71ab7ed3cdc9d3d42d4b835b373c8420adefd177a44e532f3f06f74f0a40d53713e5a
+9527f659e93a740b4c50d0d3d9aaf1a85936f04866ffde1aed30ab2fa1c1d565b46bec5fdfa510fc3ea934137bbd46df
+8488673a4bc29c3ce9133cbf41c546fab4ff28c5d46048a21e710a8df4f2bd1c77d0ee242dfd962a30d646e5ebee8c01
+8cf29773c0e0fdb75bf6f52d7066e7d6e9a3ef056bbb70a98026464b32316189addb5766822f57df63bb68b78c85e1de
+810c6c1aa53f9c3fd0018651b1bf25215fe24687b568f21a121e0bebee576a75e5f0d08ac9c6c21085e52228b314c6f8
+b529a87fe47402aa9ddaceac63a060a6640418891f931036c6e4098a1b308821a6f1a244fd5c1c22a6ed5f72f6bcf825
+ace9284ce89b5c81049d329db2376a85feeacdd9f735cf00038adc51865bb78bd9bd5d060efd0b727c509ec19988f99b
+a2e7a949c951bddc99e68d80b3f3fc4ab960b682229fdd794f9eadc80bee91dfd5eda0052149d05c74fa33bb40d75ecb
+86bac22daefca9143e0b1d25534900b1f7711ade4437642043c4a8c65f0d963cd1f0f958c7391e5a663dd3c59ed9de60
+b7d2a6e2d44edcaad19498ab3368bfb87f9ab039cf2249d6e76091dc3db0c3bf45012779c02811cc818e95796e6ad9c3
+ab474f74e1ebb3dc696e7a6bfd8845ef15fb6411fa28426c486f7b0f789a6af3016ed5f7da2a36215729f5cca0b36b4d
+86616a1a9dcb50d1896f3eb937bde67f213558feb401aae9898e41cf1fe33b443170c7c2dbd1648c9e3cdd0c24289286
+a466169a2d95a5fadb6a69c7061cd2911c3eabc0b1a2488e216f8cdbd2c5bd87e80908b002b9efa51a67f02d7af2155b
+8368af8b7c0f55f3c4f7036fbefc9d6a0ee9ff61197cea8ce48546753bdbc0b61eab604b8fe2c1aa91ced7a879e5899c
+996c91779ff9767232ae603c5b1da5bbe0e303c4c2c72ad2d5944ee1297af3535f6bb3548fd1fe8a92cf4b281e1d83ab
+ad4a93d1ceecedd27389c658b38dd71cb13c729b27e490381d8c3ed4815b11ecbc37b1f82c0656e0ebf77e5bc35196b1
+a3538c7ea3dddfbae80d67caa9fc547938bf77114559f9fc5180d9d0ab837d7fb1b27bc37405686f212f2e98b0028e59
+8abc9fe135fbd48414f2ba28344d9f49ec2d5ce94fcb314ab8dc31c754f3ab7e6ab268184a67dafe8b1fb811a762c112
+99ace100d8db88a83f1727b7b48baa1cf45b971d08112e452f5003566815ccba0ac3f8b1df6504f55a392efac8e3e70a
+91ff50978ce629651f1501708908d75b490c18615e933191cd37613a83d4b605b0b48d024d27807637e662056d76276e
+8e4104331ff1a40cbee9f489a814cf5bbd6fe4eaa1cbe1e13625fc3e6697b27d933265e5ef8728cfa8fc4ba5b19a614d
+a442360d49bc9ce3e75eb40bf2ba05e9437fa594e8b8de34bbc822cc7b706dfa0dd10bd6bccb702d8556cd1320924821
+b6ed6cb0aa34d5793e929e0d9b9651e41da3457a0b20c1bfa93a8f65bbb65bc07c7507482d71c1c285f5f663ae60019e
+86d64df2dcd36d0c7348c77480c8af33dfd889bae7bb045888eecbd317cf3e4731b96ac18f410a99ed33a3f22d448f77
+b8dd25415275d5ef8260bf5195ddb9b15b78a8799e4d15cca7d6317a18eab7bcb8fc759be61360915a28a8fcb5d6ddfe
+a325a334c84dc1d9acc0a9315b399d4be93351c7049f474702ab58b4cccfd69aa50b8731ffd598ef0144ca96477c273a
+9012a2dfedda5147cb9ceac681fa9e75e2901eeb3c94d87465a44d11250de4bc66d1e00ff674f2da1d800b43f686df9e
+a1049d59da2a942d4d2aabfc0d972ebf3babef9c5d8fc5598ea23a048c2e58f7f17b4d860e437276bdae221d9e41e3b5
+8c9d9a8826c812943d74c4d4f0fd2f1c8087135c37bcd9647b722b59801b01775a644e38c24b43e8e70f83bccc4afa27
+b9cebd7bc7b041c18bd35b970f87e9b5183e4ace034e21117001fff8a05b2a7f9ab65cf6ab8b818b8192d1db5649312c
+826710d6432ef97625db25104fc8dc3225bea594a10cdd4473d5ab72be57b74928ff356d210032a61ca590bc68509880
+a18422ceb8c61af305277628e154d3a9c49f47e230a44c6216128d73db7c3ca9eca9f87e29cb2126f1c312f423c61463
+919d357886de9eaddcfc46cd43e2b3dda3f82e926a3aedf02ebda9159faa00736bd2cd7aa044c76ae238a3a95a5bef38
+a822d5a726f5c38e9d4a750ddec80bb965a6e5374a3d87757e2e48a18421f3142c3985450d1833f3ff4ca36e3b838c89
+86bfb86eece6f6ea8f51985e312171b9bc821e0c3ab4cace556da28dd7bf89cfd5be3fbdadcacc19f2371c6a11c564d5
+91b42643b297d8eb2c1bb3f16b57ab2964de99dd22bcfa07db1d0010715ebde94d11851df575f4f1ae602644e454fe0b
+a5e444ed3d5fb3c5afd2c9c24d676adbf396f5d1d47bd532edbc72c83845970582ec49ed026b3b982c9c1ea725192cfd
+8448387a14d84aac6afef682a27be67e5b05d31b59346748d2940072eec771adb53339f335daf4463f555da2d8543f18
+a5034b66a26bad0f753be56dec722fc98a072bcdaeab0bb9cf35a56a573d9424cfbadbbaa8ae30690f7c6c6495331fc8
+9317ac32da1772099f41564ddd8247e3532528b240db753a1fa6fb35cc039c6a4ac4546597bb2fb28721684bdfebdb88
+8b4b0001a6234335502c8b17c4de274b83b0610960b5c46b9075c6e41f357ef0d8c94e9b14bff8be7849435512626ce7
+b1aa903511fe4219acabf8761a8e4316cc4f8955ac8640c68a7b547cfc65365a8fe0843a4098f9f17a4c9beb75624393
+8384f4953395aba4939b24b0669853df78f2fcc01b2145c08d3fc333ee2a7d4adc12f2d81c37d0cc187ef45b5f69f59d
+92beb5a3c14637f84ee7a3c9b4d9b305b10af8963c087b86047e9fa959f41ff362d56eaccfe887bad1ccbedc488abe2e
+8c60e16dbdfed2d1c8cf3f1bb0b0f462489293892f9d2e0221b1691321a771b163fbb599daec4cbd917da75f5f662de7
+a8a6e3041a0c2a12c76f51139b221b03ccd1afaea3b72ba2c3533b797d5f67d8b90d3474b4f6f8e19a77894fb90842e4
+966aaf74560bd4d164ee46c7d393b2c628e307019ca4289dbfb6a9a991608ad80efc1ee6e9847a19382ff8f3004aac8e
+adeaec475d4bfb6075be90cc37d61d45ce14da77f8a9a508b9f829ddf2abf91683aa2fd0372d3025a660c94b0f612685
+b3392bd1ad0c202d4a95912e0e06d8c64d7e2a8818dba8f895abcd0f6932efa9a0bff8a2aac107046d3478782fe42d33
+ab38804443da16d32f11c0e364449ed351dd36b7c82b5c7ababcc33a930acefe09fdb5261da04f6dfab29421fb1cc017
+a34e0df9e953841bc44c09e16d69235a26ff390a6d128339ac97aaae5616865f86153d8d7466519dec6c52ad592dd3ad
+99581db106391e6816403b1e9d13747aa05bfbfa5b46696cdfdedd1627b60e1ddb92215d138e007770512e93bc6184f7
+ae60c3b1ae3594aa4e3f08eeba3951157921aa6511148c6d32003d42157654d4a3a39efb1bb317135620f09729d134d0
+adab0bc35ca3fefb14729259b16907a34e10ddb6d78a23f28596d3d9b244709651be7719537df33bcf003c0e43bb1a66
+a31b7b2f3411f986b3415870ae42f90bb678a9fc44c942f6613cc4f90f3dbffa4b5fb8bf3abfa4361dd8e396d9a3c5ab
+a69b188a8662eee48fc98201fde6f0d14f6b54db83ab79c2ec2f4b6be809773231704fae2cb281fed8b05107c63f2fda
+b79e1e7a9045af6537981f54dfeed0a1335606301b73eff001880798f01ae9c0fef6e427e171afbb1d0a78135ba912cc
+b1b883fbe379995b3741836a849516a0f21b18f42a34db2c8cba01f86711a2baa5d14910a110f1058e36431dec163cbf
+87bc463b90123cd9e177f2284d72a7f4a1d4151659e1e4e8900bc21986f641af2f9a3386aba56601e6fb64da630b84a1
+97a51bb7d717495f943db162837d3bf700ee0653da9a94b36153443584602156e168fde97d77407d0861641d8d373094
+8b02561709564d0721b5247775dc66c6c09cf68a8ea62fd7dd361905ebcd98bdbb2c554fa272de71c6d22b04d33e6902
+a914b9406e71c09deae875bbd628af3f54de5ccf811365cf229dfc69541d996689d05679eb02d42a0adda02be6e32d2d
+85dcc5f3f77f72cf0818bd04c037cef560f0b0eece3191e06fcbb54228d11f7afbb8d9f8675b404bb39ffd04a3b65bae
+b15bcb96a98bc6cc7b802dc29b79a903223b1712a10a22e776f45c530a4f767665dab1a3c6d1b52157f4b79055d5ac81
+965e353e665b3734042b61951e105c1800718eb3c46759952755321ff5c639327d045c58fe90befa896e96b826910298
+96776a5cd26b69f08a68af0201b2f739cdfb9553b466271063a6c8b8307f2a3f51294ea12c7e8118c0e6b884886e1bd9
+a369453bfbe7ef0b2445231704abba25527b073bf735a968758975fad789c74110a573bc7ec50001368209a0ff385500
+8e54dc4f2a557703b2d8bdb74ff107bbb239034ed363818197b2569c03572c14cff21273e94802159563d50205edd651
+a1c66a1a82c60dcbd139b8ef4de62be423e7641a6b94ce0d0468e60bb1b000d268755946a028d3961d8b4d3722016ad1
+b14b3c26dd9d17d6fd8eeefc7f706c177ebbee9b8d05f9b01174deb37649f77f97ef1a1abc0cd4ca7a13618a4036067d
+8fe8f9754c5ee102bf96ba6b6f29a14fbf83cfe3c5f81b5358ccd4db87fd8c5d88760172373bdfaba7eaac98ab1fa863
+a8c308c15242bd9c7b28e110715315a1f9818ebe03662027a6f1feac13a5dc9bb111d29444d13546d8e441e49960b0a6
+85d87035d74a1f4662f42a8c6d26782daceded0aecee9232b78139b1b50fb764e87cdc5d1ca9d6905735dd9c3dd00dbb
+986c31370f594d4c8a9096c091cb1484c1c0755804819a9462ad1b67937c6b378d97f1e4c27900405b21de2646be70ca
+832b4b427f3347b0073c24f54e17ac16d5a80d04261c1d464f89dce89f42750d69dc8a83ee0481e410f94cf1d108c0ab
+b13e54d91d5d414223caf43a7fad36930300594b8cb3ba97c0c873cfefedc165d05f05deec8d74a0412d5f0932813088
+89c931d595849c8e54f50d550ae4a5d71c4bc74af436965bc32adbfe829a48ab15c856a69070b4a4602e0113131ce4cf
+b03731793db466b74112a1b9dec3344fa952e81bfcc7fb2bef3cb20f566c3b2bf60c16a93f84f77f4c83d8f2a535a2d2
+92e8fc80d49001139363e3201c93db8326c41322db51937ab641ee7f1b2f7d03089e20eab19afd27abc23de039ab4b0f
+b27d95c90dfa91886aa91c9c8c85ce09fc875279028bef49abfeaf44437a0528ade620c8c2b3d712ab594e73c5c032f5
+a42e2598731a792975feb5b24bf00b1e7cba1620922f8c2319dd5878419ce6099663b448299c0623ce400875c48e12a1
+b062840f63b555a254e3bc36e9075d57c816ed2e9cb0e262f9de0f3692456d94eef702489e5b11c9746b949b5e84c06b
+886226745d906664c476615dd41deef6c338ee10380657fdb75cf9ef28b4d9f56e69c8d0ef01e9cb80eeb42f3e5773ba
+854a3649dd5b22def4f246eb0d1f1a206d3dfe42b5e44b5fa963a7c5b8bdaaf7f35b542b3e9cc53187e66a2315ed9f9e
+b5a48cef68a056955ef4c080c85e4044e9f8a562f2beac9fbb5e19f8d618718c86794338c6dae8f94b6f5e9f8e98404b
+8f8bea7304cab80d0009b417c198bfffd166eed6f6db19f28b7616e8b0733cf0a4d54d204361d7f8f179985c8c3a16ad
+8af81f10339e2f75f6b6fe22a641298bf90c8676260abeeef90bcd52f46ef013f5aa4bd9d0b5ec15be61b7c3e0f32350
+b0397c64034598c825f9ef653ff16f680325546695ee6e9c2957d3c87593161a063c5219304ce6a16b7db75f1a2c5f7f
+8d2e7677ab6fbe2b0f5ab6dc356190bb3ecd7fc468c698d512a6c69f22ea97b71fa961c88635897a5b539ea51b70b4a0
+b4e91a693cca1007fdaeb7e679c6837bb8eae0bf61aae447560ca6eb5ba918cbd9952b41769657978413106b359e169d
+a8331a907ba7d95a5e4090a7680d1bce3cd803db49fb84a48996e96514701de1602c4eeb4b5e0b1c2a106c4f678a72a7
+b54dd28a97a5f934a34c2817af91a41e57f88d7eb5fb584d3b6692f2d1c4b2a4e273c4de5fa33a0fd1fa02c9d7cd1fb1
+b8b780e0f6059ea27aec9f3693ac9adf0b93f75fe7fac5230deee1e7471df0bce9b5b2f260a6a0a346afa723860471b2
+980e9847ec83d61442a86cf8c7464b357694dbe67aa5de3a8c88ccd1a038256453101366dcdfe11a565065d78ce89807
+9350a17e397bdc3d2bfbb84ddc79a48bdc6ef5c3d8c1ea39251e762fddf9962b69cdd42c563d03f64615b72c9dab07bd
+a34d24b69089cb5ffc5f06eb2acfeba13c96a1096d1af9620aea28753baf3d0aad0bcb30037ef3a5ac36b178816e878d
+a7c8b9108fceb4e0377eed48af9846530114df986cbdd35f6d54026104fe6bfb3b58e57fa2b3a750225528f8dcb8bb9b
+b0f71f6a04cc7119db96033f89530853d58a445565de2efd269b1e3956397c35a49c328102325b780fa5d0cf5adc2a4a
+92be082f04722fdf3abca7ebfd162b7062939c3410ec204d5478dc8de2bae2b25e2654441d29fe2c350895512d333ab0
+95e7afbcac22dc2d04c5635d7a8c6293f6ce29bc6c932850d24ab5216b449251bdf7aaea838ef40e0e4eee1de8f63bfe
+ae0a877b488865f21194470677e12ea7e357c5d63f6bc454f608e33df9a3b20e9aaea5b6aa42e8999779b8b445831c39
+98df977479667e23b897b91f2db8f4cdee7ece7fc3ecf8a07d752efae090d8bd34d781353ec1394550d8a207bffe582c
+aaa0f1bfece62a63f3bc76862b8789e2593b4bb40b3c413956e9e5c4eec604e39d722cbe1db210396eca7c2293489099
+b362703d2b72909d06407d139531fc144e68ba94e55643cc3cbb9ed24145223aff460b1627b41eb9a3b709978aee5a58
+b020025128804bd642fdb1d2b70b07d181e5ba30a5ee16f6bd00d7e2d0c6af782e454cec107304823be61647e65221fd
+a409894c0030081a2c7f8fba27bd0ac53997a31b35a33498d78bbcfa0b7ec0a89b9efa99dc1b8770ba889060f39d56e2
+862f9eace3f54288749ca8402c22ddd7829f0454d17ff4891727c86eace899cbf72d302065f5f581169f00186c23b4dc
+91432f2a823c3ce95bdeb5854e8dc7faea5031fd65c82dc69e4adbc5ead2e5a5b58a9cd1428d3f526cf94a217f37d7de
+9543a9038fdecaffecc4d3023fd67f7976dcdbc7014e82edb4573479b1789b4c610c3964643e031f69ac7a3e3dfbe241
+b4f31d580987f47c550eabd2d276678a294a612ac26806a06634b8812a571391151d84c29b6b82218cd84dac85bdcc88
+8d922ae4eecb45ebc23eb1a8404aa1524b281d0f0ceda58ea93a0cfd4184efb894c047f0a46e2d007704f5506544907e
+98973979672d1d52e561cae7331b730a577c422258c22720edc344aae35ce071be1b017816d58bb29b9cf5c433fd64b4
+a46be974ea72c5e5bd16de591bf27087d97b9030fb4a74743bde5e480052a0de58bd962dbbf0e0fbb0559566c3d9780b
+b2b4464973322d865207949afa4dadbd888c9b0230737561c3b76a1953a85ea9439fbb1db9d0d42083c62419db512450
+ae811a9eac5f4ee6cb3a4dab456a3e5d95cb1ab303c19e76fc4b36ef6b4c83ec0b2803ab8680ad1663bdec0ea2f19aaf
+95a426f3d2ae6c6069f888010bb20c392bcbb65d0986125e0f0066d4206f4f443f70dcba8a789da042b57a36980e75be
+a9ec01a5777d10275153ba7441f2e27ba3d6f1a875f204469220ad999bb8a0372369278bf5a11640ac0709771b814a31
+adf1091e24bdf10d848f1a0920eabca0a2087220fa0c3f8e5b4c72ca0424ff3e0c77ad4c259c12c3cd1c0eb0cf32c67f
+b9a57eb8642729541088164b9974775934d7a4c56a3a3ff2a190d549b294fa87002810f31251170b0407c7e9695cfba2
+8625501e5c56948812b72b3495747412e03ede90096be089cb8040069e49cddfe697766ee72505bf715802fc77c08fa3
+8a745aeeddd1be100474d96aedc737208ef19a93a8ad72c10bdc0218073fde6209510048eb46e271553b04d8e6529f46
+8b8d9ac3b91ac0333094c85e81fe2b8cd5c2207073a33f66bb1939e8f1c84ef064a8b2ee984a9f450f0a6e54bb56ccc4
+8cace31444da99fa5dadc7c46f689fa427949d8c089af3d90c604fbdbe0dab052392fbad4b5aeab707e4caa9e739f366
+8750c8bd1f1abe5acfb29ecab0923008cb4455ae8a1db01bf3317df05e1e02f9df3c74e879d9c57b8f59877591939ab4
+8904a39ad86cb42c06692d4801b3718bb63a07a2dc5ef13de16f668b08968db34966457ff2e4cb770dc61a216f4abc5e
+967d1750b0db53e977bb9ba65aa820d7970f8c75d5355cf12a3f4c509dee7e9b6c0f7a828474b167c25b15d74f0e9cb3
+b37297bb6c2d9175e0a7654c5bc6d248f47f7183c3b10375f07e21e9f3e66f6581caebfcf468dc0f8c04132a2a0ede55
+803862e6fbca945cb6c0ba202257df5c7e1e1fadd78b842970206575f70c9757d4a54e9b1a0a269dd37c4f830a40d2d6
+a7a27f2fc7a1e6d276522177f0ae6630dcf5205d08c19319c315bacb165b687d125832d97ed689960885bb7cf42fdf36
+87fbc08506fdf980cdd534d4ecc4dcfbd381f3937dafa09db402e07a67e1cde579e680d3f77865b5669f35fc00901530
+8fab8bd57f76d187f1cc22e40b51736b1b0234e70813ca02559ded9c7835cb3dc71a24c8f679081510c32f330d6ca45b
+8fb917b7dd71e1728bbf32fcb55343890aa6fc890740f41f42e9620b5bc3ef8b1ec67d9c047e4a9de0863a5eec18e5f9
+b7429e758850bb7f69db000d49763df43d18af11460ee0f158b741dd6b7575527c5c8068cf54f7f78098f9ddb92a82db
+8bd3c73c1b6f88ed2696d53d2a0617f74bfada964d2eef2afb5e1cf00bfb646f552643c55d5453cc622c9ecfb23ad492
+8e025e91b30b0f328cd6b79df9603698f1715eb6209e64ef8705cdde5ee1c4ec737a61d9b8a4e72e83b2157c621e1590
+ac0b91bbb5ce5bbc8e8d6c0d9d4e51b3960169c608b6220a352aeb13072133aa9d934b4e69d7c5c39fde68d467fa8069
+88255d08bde3b967dfb1dd338dfbdec12a2079851aa796be070a1d70204048c34f2739b7461840136b03429a8b83b1f8
+97a83477e765f3f17eef0d3243ba9bbdcc50fc581f904e92a853a076adeba917279fc0e01aeca42de1aed8af9579bca1
+b0d9f1afb807e0e6f839632393edef25731ab2141cfa1cd965e986940a4916c8788733a39def0cf67afedc516dcc6ce4
+b563e9ed9ba2134011d7bea6314af5d71f63caa1bcbf878c26d7162dfc76343c38308955215252962fd0c9c87200f1f7
+838d4e97bd67822c22cda558f0d35f971a0ab7debd3da3f15c27f7d4b3301b2c17b60cdbca0da8e067f23fc97d136ae7
+a7bccea326cccbbc4773de402fdf2cbc21a028197be98cebf6e691a7679fc948e6bc4981a14fbf493a254eedc444dd7a
+8b2687732f7aebb153bd6030dfca0b6d257b8f2945eb8221ffd36ede50d463172cfc4bb17dc30bd21d8572aae2540d6f
+a4a3e87ec5984c3a755cb39fb04472583a0d2c771552b0701788f03b4618c87690a13a905420358701777e8b5ff2d190
+904c4dee5dfff129de3fb8cd0a6e0576c18ed3d77f49b8f0601997013cdd4ecadb86690389555ebe8a436d8084024f2f
+ad1d9c7a6236b22474fe8d45fde2e1f072101b5cb7018ac73c0541c0f9ebec4d5c4469e0570cc188cb5f5ba1d8958be1
+87fc8ca6f737cfdedee973f1586b94d971564a1fada0e4d65894222edcca6552764f1ca0b02782066f19f871ba5842d8
+851829a8b39eb6b91523548ad600bb876408cabed98d30958056367c686bdedbc876e1903b8af8ffa3d3618e3580e3db
+b99270859bfe7d8a4c1a22e2d88a644dfd2f100c54070ffd9c4e1044140fc0d21d62c61214a2b81a9cfadf944327ef8e
+b89a2ddc91c59dc2ed9b8d11e4838002e731b0bcc576e0e18106238cd3282264b14cebebd8a64f004521cbdc690c4182
+8be96bb11a025d265b7b3ff3151e9e227a8416e6118595ac29bf836ef751504eaa3a9cc05bbdcdeabde11f2dc3d20c3d
+87185ed410be571fb532e32d0ff4ef68e98ba2d3d5fbe92180cf1fe8ddfbcc89fd1e03694a9fde1a12ab905db89323d6
+97ef023f71850ddb282f244b3f39579eab69ce5bf3fe5dd2159329b7def4982cdbdb4e71476471acfea0f7ba5a7fd061
+9944324d804fd3978e7e137e6e65348d7473ea23c591136d55779b5a31f45f9e4d866d8a18c76a3a0e8cf2ee61cdd041
+b9930c9aff260105d4d15fb749aa33436f6fb52cf9d50e39dca19d9cc7938d752773f06756af86369e1f5fd5aa71d5ea
+a85ac6bc027ade2a9bbbab2b231241cbbe56e562fe621ea19208a8ea36e1baced89ec9ab8e2f83b602539e5c053f5764
+9917d40d37549caae646848e18ffcb49f5c6c4e396ebe7e74129a41b0cfe2726b4dad34d51f4bc706063e654da898824
+a25f8a4d8ab34724a732dacd2b316c80a6544d4b8c1f45115c4f55c3efae6129b83623ffb31da80e2601f70ca51ead16
+932b54b2bd26670936843a92346d231f2f3e3659542f4d4def73fb36ac0350733853130a5e5e9d8e386d34f817f5a91d
+871bf29d7263bce62a02690681d4e1c3c2f9c2751de4e35810ece13c9480eab93b80a00230ef0ffb858a829ee6bd96e2
+ab9643bb1c32dc2e8c05ef49bbde9937072af214c19c3932be137b7b75268edbcdd81d1370089be44462b8032bba3c57
+b67d510c460a2f14b7cebaf9a15642a14b2542c13ebb1d1690596447ddfce6a86327ffa377c28891f6bbd8febc2c17ca
+93a5ad5019a8e680bd053a524e0ffaf8cb18adfcdb22ccb6cbed67012316bcebed65294bcc0cf4f4e2915dbf19ff0948
+ac7a7fc1140b1197f2aa424b053e8ceaf48abf41819efaff87a2e63cd6e962c278942c2b97742ffbbedc5cd426a8df50
+af0115d9c2f887ff97ee15a1116ab06af1920f2f42700b75cc010d4c8038eea941c9bcc8e7cf4a41036813143ab3e8eb
+90c768d880b6ac17ed7ff9bcf76cbd5c1c4879247a757d8cc8b31c4c7bb0ec763d746e6e06e361afa8ee158e36ccaffc
+b3f10561432a97c95d02c1a6f317bb1ab5b98cc88cf5d56e1492ca84eb2ae1db92e9e31fa454de562e719b71442e69f0
+8d94729b5fb0afc196064991f9b3c8e04c0858199aa951f49421ab890079804179fe00707978f15637b8d16246794001
+968515d07a0f0eb52adf439d8f70ecd1f6655072abbeea45431dad26c8937f4aaeda552a22a420598d2136f576a966d9
+91f50e6f292e2bbbe226b221cedb9db36bcd459bfd74fd6356b0620766d96869266315e8503435af1719d8ff765467ea
+968b328d79e183ec560e8f0de113298755cb23a893a631406defdd26ecd52e4b6f28934ad2e219382837fbb8f87f4360
+94c126a9035059d2d817c4fb16cb13fe6047c356fc495aeb369acb1c45e89306554631f50d313707e82624b6107d2fa0
+90ee85deb494043a1cb280d687e3f55345085e576484308755df1bdb6f734e7dd25fd2489cea746be5d2c6384e7986e0
+92a4f64d98e7e633271bdafb1eb88474013b5ed2c65137c243729df0d79ccdc6b210118ed3587ad00d3f0f757400e47b
+af31031fcc867a53760216cc1f467901aeaa3b28438fb3ec90d6a1c8a46590062c40fac939bc3c7e7a7deff8f83c262f
+94306afe09f20d5de9ea26f37f5fc8df1e29b3a6963caa94df031efd428545493d53e0d8d7af12ee525e2e21cba23324
+ab6285371b981d5443ecea699af9da916f9320b3ed0a11c15503f3b10eada3ff5dc95d24a54f5aaab97d3312de5b985b
+8e9735364ae128f790dfcbedcfe0e11b991602dce0c90ab3cfd4aac74526c30a798fcb51a8ebcc5528d88c724e9c2b02
+89a3c12bcc68129b14fdc1d9b5db8d26d11c6c9467f5bff7c40abb8ec23b193746697421ea4400d5ebe53bb3fbfe59d9
+8368e44144947f9ecfa5d126f4a57bb1d3728fe3c5d3bf83310174d638a10cea02ae79fca91d5489ecc9fa679feab49c
+a0474ff532e1a6a3dc8f16ae27e77d6ab72b62535ba0d3ed09da5c692c6fd34424141cd68470922e1e147fb7f7479d5e
+b9ae0e47fa8d999135f78c733cdcad786b96087a340f86e4cc2bdf019b07fd4a76f9b4b041eb397f61bda20c31d27838
+a7262ca18a7179924d28161d64e6b6cec5da35b7eaf695642dbc127a7bf4a52bffad82b8d3fcd010b308dd72eb567f26
+a23ecfac8a3f978f9ca8810458973f528846de6bb92fa6422b9547d55d29d7db7d8bdc5181e9ee2257a458466f714449
+b04c32403400f82677d831314956acd3cb507520ff14d856cf8ec4fab37a4428a5d24ecfabfd2c6086e4ea6d26b005e5
+9669b2725cd5965305c6ea48331e693086f4c1c4ca7dec26bc6290e9a8e70f9f0bedca6e36985c39ea35b412abc7f4b5
+a6f68cecace45317a758658463c5fc1f005283d8c3d3de9364e7dea453007d8d4bc849a21205d61ef81019e0d25858fa
+8ee19ccc1c83b2c4d7c7b712bb370c129201bfb340c5b49d991207c995f870de2d0efaa88e05bc9eac567c4c36e20175
+8a530ece1992d1de92c4e845e71a1ab24e53a8a0679aa5bdeefc60fd890ca3cee2121f66c6f4b29c437440e7644e65d0
+924338d7f356da9b8477b3aeaad6f754a8d8f6a791d70c3ff23c2a6d4488efde9b9fc351319f3ea1f545dd11cd23ab76
+8eb76f86e057cfe9f655ba29bac89cc97db07f0487c86e7b41555b5549897bd3d042cd2ede35e312cbea357df622c6c2
+a2c0da965489d15ced574f5e27cd4781a1dce8fa4f17762a25fef1320096b9eddd92a007d58a194ef57def3aaf4e925b
+a3fc89753e8896d796859c9e5a00d184be7d37c4d5741ae8a60cae9a7a30c5d840325d6479701e1f61e37065fce81870
+8b2f90cdb3add567b94f4c7fc89a8a57a0f06877639c33df2697f7c39e52c1869aadc98a2f8b85a58fbb02bb1bc1a441
+aeb2c22d9186725ea40d3a4bf551482bddeef42c0ad33801e35361d3695769429449c2a13955cccab55778d3ff29b664
+80bce007abd8ebe2238d465a312c2d125d1a695184b93108d728075595c7716786f9188e90ae37fea89009d087e71b07
+86f5df2b83383c737bb6db4e435f496ebfd56b51300612c402bea9ac2f439ee7e98cbc2655d31646472ef983aa6ccbbe
+880e8a19af5ad76f14cdf94396b8dacf061e02eeaba02d4c29ddf0d07c6d2a737c987d69ea2eee52f0db5a4dec318932
+8b82368968f9b5bb175c95862ad403beee68d199a20d5dd618395daf11ff0c2e1fbf3a31c23d3e582556276b44e70b99
+94a062abbdc5ba740077fb9de722ad2ccf3f6ffc8b4a9dfbb0bf2ff789bd529e7b9d8da520d0342af91808fc00431638
+890b4ee1e9837a4c215616819dadbd3c6ed7586ad391498012a54d735c6df0b72c2dc3969d1b24cf6fe822f37f9c10e7
+a7dfcf43c9c22fd22f47db490e8f0b8f42597a5b4ae3e7bc4a9b12252b32f89412a2aed946eec19b133cee89b4a70322
+acbd9e85b9d9c3b068220f893d7b6368984f6cdb1cd06a784cc9571f0c632775ef890dbd51371e8701894cbf667d04f2
+a9b1f84f053ef6f41c59b1758836a82d53932cc4b8ee9c2cafe705150e1c717e3f5c15fc21a2532c071e9dd9bccb4dac
+b2c63345748a28d04680e3e451d1f7d430bc8ff2031b6bd4237a1f55dfadaec20d1854ac158cd6a1466dae525c1b9b06
+a23e7b2e5b8f3e3b0e350e1a461708be9c1434d49fe2e51473e2e360bb0be140a96f8ddac99e3b804557cc25d3e44776
+a4c4729a38f5f32f155ca4d1994b61802ee418b276486e2dcd681fec13316f3b6d4a8e76eb9f48e2df0339543b11326c
+93be67dbdec2655edfe40dcdcc0a7e761b7259a9d909ebb12fd7c9a5d4efa10de065d2eb049660ed01ede2f26388d43e
+932480849f97e32fb14d4a69af4073c377e949af7293951b3ca371a306d9e2096157f51c8e5036a44eb73c7c842c5aa9
+8b5e79ddafd675ff88d8f65176321a08183429d42d7fc1e7cc3cfccdef0dc5824ee40f279a05edbf4d50418a4cab2126
+962bd6fcf7c7f2a9c569d584658a735bd16440de2ffae236c68ccbf2ddc5e13836efb163690062537d52f7d8bbb24222
+af80793655c0b3ec3029673c50a7f212d297f9f80d7d1c7cb1409d292f3bd7dbb8b24581017d9f3964e3432f46e79ca1
+94c8cf3c737c102e9e91216752c82b17e4e42074e08ce44e701c2f8ac7c08902b911cabf38c4c5bd41400eeb1fc97acb
+8708ea7af8c86b2a1964edf64a9e9c56c7febffa742c3ff2e3088a61d3ccd63e135811212878ba7ad8a819e1859f4e95
+ab8e726d468417c168c892c10c7e2297e50c67e4283e5b48c3f3b014981ec482e211374f779faa0c1ead906f5dd4114d
+a93911e672aa3d8dd686280cf062f128bd8eefc058fbaea52cc0a9bb255fda84e65ea546f662fc75fee4c5b24bdc61fd
+8aae6d9289d8adf0f81e7990cc79cb704d0a975f03b9ec02be66089d62954fd9a8b005c5ba8179cede366d25ccf40869
+91e44ca55de8ad3ab42816504813cd9ed9c6d64abf6373e8891f909cb49c8a951ee823cd1f947058d542f0bf6290a11c
+a377f97e075b66e740b8476f085d50ce8ac21f206802384e2e072f6b9700a5f9cf0e6f2236307775c0e0d6ae8459d864
+953c08d9f2a9d6ccb22cab906efda69ec1c228aa5c2ab93822b6f71c007fa3bced68c6a70ac605c6145e4af770b60de0
+86d8dcf5a9ba81cf6a3149b2fff96e36639767e9de461bbd3ccc870634e8db331b98a888d7e8d3d70b6ed241d8ce54da
+88db73952866ec07c49b484c6b18de70d439e67d971c1b436684d489253cb96d793cc4d9a4362b51dffce837dbd03bf6
+970b7aa9070334b0649bea1f0b4e53fded64665f87e055e3527e0e567cb57a0e97d369aa16a005155cb69000073d7695
+928c8aaf72b3f51e38c866ab457f75cbd7131b676817a3c6d522fb8f876b01a9ab3a84238eaadaa0a095ccd6c1ac060b
+9561e78d16061b5361ba0be11387c3f6029415f83bcc8477b8729e88c55f4bfe74b59c1b24bec0eebd9779cdfcfbc96c
+aef133788d1e04ac64f573f3ffab473209dfdcaf2c675fddcff83724d17b91d6340830409b391a94405d6ade005cd01b
+b8ad4ab0a1ad6383e4cb12d479cde732f202687ebf886184507371ac277446b3bd1648c49c89343920e5d57fa6b255c3
+a8d00257e331f342b79b3d25b74d300b070326b358f690edbaad5e325293d8b55078605a43ecd9dfd27206013db4c286
+aa71abee2720052cce7a5a0c3968e64c2c540cc852dfe08b742fefe005dbfd10397f66386744c9bfbbaa40779c2ae190
+80c6680857b88afd3ae8801677720100f0fdcb9e49c82f74b8ca5a27aef34e6df03462cf9ef5f80169c72da15be567b2
+8c2f2865e132869fca5232ba5e6844ac0540a53a66971ad54ff91f186e011e5412450df9099fbe0b987be443867dfdb6
+89cf681e0506baaa528043a15ab3bae09b8817853e889f0b3de138992e52612fa3e50d54b3686cbca6428a7644f58208
+89ddf69b72b9ddf7d535f742bd3c942000061a5a54987f2ccc7a09e035be978cb32f653df9568526c5857a5df4321f59
+9908a3288b9a9972c3f3f0d5923d9840756b74f31ae0b24ef2188465efaa5247b1ed13b774991bbe4c065c7e71b487ea
+9454ea9a664390fb1ba79fbb5c0cc765d8ccd32a02d946a14353290fa2a1ba911605ff2e302c340e9ed6fbe8543ee6a9
+aa4f4d9ef843ca3ba334d73af634a0ee800b3393f8f7701cd152274f4296eb79d63869d452b5e83976eca246203d6f03
+8fce1e2e59dfc4fb46f3741d27772579fbf2f48acf1a38c49b0e5dae7d35f2624af3a46a48b89bd835b7d452ab0cec80
+810ec0e58504ed556e788e23067296a8e4b4ef31257d508f05e5245bfe6d2c2f658fca8c81538c6c9ea6ed05a8f249a9
+b6667bad0a7d49cd2dc60af85e373fdaac2af0d34fdee51a9fbc1fe8b77470c162a04da38228fe68b7d5247d43026734
+8982971d57bdf35e0f34e867fecbe0c140d94101484ef4ea01b796633beba184f980c3ced28b24ff42de1dc504dbc854
+86d8d1f3edef9e61058a58d966169a05f07fed0d93bd4f4a7cfca5a872b2aad0d1a78f8ec7784828e5813c8da577469c
+b491624c3d5e517c9019258db6284d7533778e44b1a0060dec5f655a7b79057141079115f5cb1d8d97a90af33cd7563e
+856e1cd4f9ab7cf323f5988bb5d272857d2fa90527f800362569a39defd93e37be2a60c11f498c482654f55560356f7c
+a08884d0e642c479fc8e5a9837d1babbe63f3165c02a57b19d0547fa1fdc18ee382ea82a86cfd3135dec8f2aff793f53
+b1a4de5ea703fa5ac8a70ec515bc65203a9415f6da109b67fa32843a39d7fa6232c9c13920d78c0f16e99fa5f6a27e83
+931a2ee3220ac7888157c426d1b33b8a56f8879fecf1461af4cd6c85f94e193bd6ae6f8dc3946fc689e42bee213f0027
+a844a78e65ea6f75bb55a5db1e78b88896caa1d54b624f218eeb302397dc98a084a2ff4b964acd0650667160928ceea4
+b9c214280a15b423654a36b11646c928fb42ed2a692aedc01441c67522760df29c6ae7bbcb9237938a823188ad4d83f4
+a19575f9bbdfccf970bb3754818e49c709d1bf0af015541182fc7203f7aab51cad31544072d52c0234a3b649d03d9a52
+8cd1127b7485ea7f349e2c89a4b78fab3e5fabe5a95ff0cee10a3f4fd48940e431ca5e526f6342f7da93e32e8eaa1448
+9906abc725e445092dd7dd0aef90f989e3c78aee96f3c0a67ccb62fb2a51363c71d783490fa5fdda0ff9ea69f5b9233b
+8996df92e014c226e5ac724075c19d19a9204b2e086ed5e75a9bfa1f8391c4c77fd5c0b85a29f28b302a4af29d38735e
+90225c9490b39d151a80a9f4d9a7f2595961c44779a54d5e195ec95096f77e30157c6c629cb1c36d995f6c3ee129ad20
+85925b1dfe3884ae3a0e993b67b6c49685deeab6cf0d9997309961b7f727cd6133797bf04d21ef7b620d1d6392450b64
+88a6c518e577a820d83f87e9d5f236f43d262756b1bae0fde72af241fcc192417ca9724428d17a3f9dd813712a772cac
+8f501fd5634fddd00a8411c0e9c6947bab0dded26339821bc3543a64c519d9575c3129f6619c6079d5e95237c11cfeac
+af2b42945d7c81bc422a1bcdeb80027a1a243f89c65c173294d6c92e4cb3cd650740cac17408e7ba1a34d37d865b9bc5
+abfa5e76f1112602ddf152aceaa9f588beda3aba1115d0823d6a6b074d28389fd4c8178e8a845262200b9af024a33a88
+9732a0e3efcef5ad4d43811bcaffaa1418c791d3fd6ca4489d6cbbb7c44b55156d218f0fe86f2ec96ac306fefab2e694
+8837a6c4e60839ffb0b59e94b37d81bf1ea392d44cc81717c1c9104468d31fb5fc3c35b1efd9991b5e7e9819c66a7221
+b6545fd0b455748ac3482e0ead3b0157563cea7bf6bdd5ae2af7afe1ade921e5ba80466885ba73a89657a735c92658a2
+b72fc49fd3be541bc26cb968ba4eb3078ce7c71fe0ac06340f7ac25c0befb86af03c4cf8f31c857f9e5d946401e86bb0
+929f424548e29c3b47fbbd59ec00d17b00ee1c4f6b966c1fa7e0f8528d52078278f2852da976b8931fe813b0c3b71ac9
+b37861ba981001aa6192cff06c13f041410aa60f965ea03dd48068b4295d61d2fa276c3f477f985f50189e33308c1876
+a73c7cdffd646cffb255d2519d8e08dd8d9a9eca0610211177e259230b8f8c7ec8727015853197a0f11eec8b59d4f2bc
+8da1260ce51220ad107c3127e871715bd738639cd90824d1c9f5b6181304f363b8bdbdb42c21e4e360cbdee496b573a9
+aac6bbc35bce8b54820ef8d7219a4092c49aa5d4fbb187968cb91ac04bc44fa119766f8c630a727ba184cad19278d9c8
+b964de0bd31847ada13dc3f6e1bdc679f421e262c03353e39f0ef1df720ba05e6d806dba15b6e10df559519ca125fc39
+a62e4336b61f85eaa415f57e21cebc7d54c68f6febab02de76bc04a69658ab1d2f7cf0104da79448e32e2b7c92b684c8
+897c6ca595bb2884b643ce8e69078431979d7e6e1b2dcc6effaf5a62fc906db6466f85020bf5930597adbd99e2ff90d3
+932956e0ba09f6499f1ed231732a444b0adf17080237d9345d06d4262fe8a5fb0f704c919513ed42473751069c57dafe
+a24b9cb4ea9c2203a95b0056bb95342c4fa0d91bcc25595fea0161e7d6f45595f7ea171e0ac1bbde13a6d8ca6ad10bf5
+a7714728bc3318f6ac005e350de94f59495ef3972b328c673c5e608fa9059be3277b48f03a5a9634c3d03397af7d089f
+b98732aec7a0a9a7998ba51e2b76e5232379482d0047f4876cd39918119776ae2683590f7fe5e44d12b3b3efdd916e8a
+87700c3fe20cad8fa3041976c87ee761941d323f2d64a9818f20fcdf0259f796a11e55cdee31446bd19307cbe8becf09
+a37cd03fd348694b2ea5cf081696d12dc4ae108da8d48695bf74c921b90612d18c1aa71b1071bbcc02829e05ba1363ab
+830e4e7ac24fb3f64294e5c64563ab5708ebf0e133540b35b985390d68c420a6d680d779fc87245bb1f5c58e59c5ff39
+b5922242a82565753dd2c1438008462d531f820af1b565756d4d27a30e3406ecc503b1e5b628012ea0329fd75561dd7b
+91068438d2bfbb0666824d3cc2be488f2eaf3a8a9f21805838f9f2d582ca6bcb103b2f0f313b57bc86f87704aad7c7d1
+a9a2133fe55e99114e526904f5fb3e2e141f31963562887a9fe6a262496dc405c756bf6dfdd6acb8853ef5a0a5146037
+8e48e79f9eb1f8757b4c4afc4e3d6da4d368bb25b4d54e3a1f34f3af13d8037b0d465b29894f68272b79cc60fa676071
+9378b90495b0e6468dce3102a97e9965a5d21fa4a6494d401888b8777bd58616b99d49177f2eb2796476ae84d20b67b7
+b0aea247d7d7c7767519b87dd66f56c306d9eec88b0db8060bb97370099892957e2c950fa2e05f24f8ad097889cab087
+89d0d48769ad81699d5b83f26ac49a29c3e835caee03469e93c11e5f4b8470eb02b52290bb2c37f06afb0746630803fb
+94de42d8554583b24317d9ea283dad5849e2f124f659d0afa11414898ffdc4347a9c4ebe783dded21679337b58b67f4d
+b76c3047eaecaf4a4e6fb6176c7f4a1d393fec3a360f4c711d6293a993aee39d5aea654fc6429c2e4d4955b12fea5c8e
+a307fcef0915e3e3a27b94ddb9561e5d210a091714b73afbc0b3fa5e8140e8c3818f4914903975e8f78d0492d7784c25
+95079c4a5008fb6ae0d653c00ad901a108df0b8c442a68492740eacd15048106b7c4cb5ee88bc6b1dc089987935bdba1
+b65a354aa8e92d6ca2e11f4ed3c1ed011852bab8f0e5b8157a10c26db2748be688512423c11d582b3dc1da57b9d6a826
+a32c2fc62c38eb19dea24b545d2537dfe596423f8ae530e562ba7eaac34139fb443d88f18f39d65d36a65ed1277973ef
+81b83b37927e9a6a7c34cfe587dc9cfbd560db3ac57a8a88161fe4ae9a7c66843d32f6f568c927e2ff8f21d8b4299475
+8b6993ef73c2021842060ec0424464412242aeb711da2c43d3985f9d15e4d936eb7a1b5098bfe892fcd3b6ba8bf42369
+965535b46a18f94a1203fafa4dee5963742511ab77e98e471e03376847850357d543dc6ef2dbb765cbc1f03f66ebbc14
+a9386ef496b4f96bd591847baf6dcf8520f7cb5aaf1713025ee894b40b10f243aef06c553376663488377fb8b1b0a022
+a6bae4486fc16ec1f12817f2d47871c8bb61f5f1a2db5f828c6e2c06bca64b1ff7cf4c059a10d6bc2f561fc3a12aa38d
+a2b6cda6a75fac16f324935cc1820bfdf013ae02c209802befecac0288d90263a7f84762dfb7c9aa1351415c03288714
+aac87216619a8c50b5d54432ed5681b1cbb2c7084f33e9a91889bfbb94fd18c8071b79ebdb403ad81fea495bc1e37dcc
+8bb3b3a7ceca82e4268ab52c00322d5d0822427e43c1d8b88b2f43c3dfae7100f6a29832d16454e093579cbaa1074062
+a2363b4506b1464391a194412a73d47d0cd4ea1ffa541cf8b936c97a46bfeaebd1fec409c6aa2109d277bfae0ea7f0fb
+b56911be2bbf1e564715191a526c2ae73bb6e85c45e3dc22bd9dd87cde620de93875c48b11e02ea66eebb68f533f353e
+81609eacf4b2e78a9d7f469e0882ad24c86ad98dd18f466d321aa32a762171cfc334dcc049962ef5e63248ef48244229
+866b26d3dbab7837edec84217c85653c6abaa617e0ba2657d67757fd1c7dfc0c7f83f6198fb85a49b402108d6fedeea6
+9771f5796d5d47d22100c7ff7d191795677d53796f4a1e1aada949b372ec12decb6c49e28f2662e729d44f0e09eac063
+a9fdfbfbe114c7f93806b988c50f8ae4e13a4d433f2e40c72b81d0ed7fe879db5e89216a0b0c8392a6d9d54f57760ecc
+965336222244229fac41336464c36dac8700d5289c0aba78016db76e436289a0797af8c96d52583618f8c6dbe7b3562d
+99719ac482b72d54fa515395847e9a65b733da84f7d10a0be82f34afc20159d64411aacca15041726251fd90ae06a9f4
+ab96b7ac88842ad0ab61f7550b7b4697d6a3b651cfa3c10ad404e7505c742e2c1364bbfd08ad0039ca3b81ffa9d6a6e5
+ae96088cf12f76140888582f6f6404b6f2666c048950166e37bbe46c1398fec343fcacd3e8f332f7afa222ca13fbdb87
+b5b5c1ad493b2e72ce8ba698351f596cb85841f7f7055e31325cadbb4fec3e8045b335643190d6b97c3049d10551764c
+85f066c7ffd2bfc4519f42f0778ce0e46195466768322a22673a073ebb66cd77c7b8b3a14157845cdb369d3f40911421
+99f4f10397cb7ff47a2d9d2f29021d1ca96f0da01f8afd76f72457cba6e6376f925fcee28ce77475b90c9466042ac414
+85116606b18f6e5404e9176570bf6d7a9d86116e5a29721a1b20d6b28a733886e2085a7563cbff45d1f11bf3d552ea12
+a17d81b236fb138ed820d335dde2640ac3a44cccb5f11fc6bea5fe3132c4a9247b874e75fba55bdf8093f0f56310a999
+8a16a5cfe10c5dbecb4fd9f4b0c370162071f88198e016111937199b87d006d1b24f3f412d853d7c6541e1c68076b70a
+8cb83fd2b1afbad7c454430fb9dbf6530230b782c7dfb01443c2c16563e833c5b230f4c4268dc37a55a681a5f0bef420
+b8851a8dd6a3a17619e7c84b18f29ac9680b456c03e8c8489376e6de9a22ea75d1730787ca5d269af44eeae47f87bc24
+a8f990c9290456e849ae4cc0c320580fcfd50263af8945d01b00baddf801aa0a7bef2ac119d4d1b4be6290615c781656
+b0fa1c28c8c67ff87427691047c362aa35de0be9b0121d83b116b23170ad2b712a0b5bdf6a57a25c59201ba165d5f0d6
+afcd2f5e66a277cef775b636abb598ee9d7e3bc1b48b521da787dc561cea8d7ad963f593c3ac6f23a66a27c15876b775
+92888863568ef01b40d51f467e8364cb1b09808238644bbee5ed118b392475e90c6a1e03a0ef826dff5ada8d10be716c
+a8ddad388f2dc94294371d0ebbce02016c463a65bcf3a5366419a7a910d3d24748fb5716ddd81cbab44a2362ee3c077e
+8b8ef4f818ca3de1683064ea7e968edc8d9fe2675b8bb2ae637a5784a20cd909d18eed45140189eb9f080c53c06376fd
+a52d9c49db4819cf6280c220a6cd306a5851b771de3032f28c7f8750c20e80cbfda57323a55a8c03085b41f4f236b5ba
+b01fbfa0f80ef574a1d6733899002a8672cc309e1014fec8e81ea1e96a7be9c247a570f825b7862e814e1f006a8227ac
+b07e163eb0f96a51d74aa8a7fab5d23e44e37b1b1027ae9c4155280d8d159f0cdeecd3258c098a7358c5bf2fcf1eb7e2
+80c4512a5bb5e8255488fed7b7e297988732473f0ccc1192cab716a88d035e23cc374a937fca7da87e18048ab026d9f7
+b3e343b13c1d4c98b7706edbf362eab12b1fa87510d5cf168e510844b24c8a9624f1e7e0babf455c6d425741c23e1ca6
+83e4b53953ef683c512756b3fea37756b3c562c88a15cddd902eeecf0de82d0345fb05feeba511e8a6de91aa1f722ef7
+922512dd5ce444df62fded2c53a73385570804e7305cde401116c06dff5ec7812b776b8cccdfdafe422f1ba53b2b56f5
+8d1f7feee880abfe9f09708ccf72f376013b2910886edcceb76018759b88b95cab9c0e8f176faf042729b405a10242f5
+abb7cd087d0cea2cdbb47cdf9be2c6a0c6ec113e1ad5fac083f66a027697d477ec69f46b9aff40c239ad9959b9854e11
+b10592443daa8708f8c882da795da07465efb9829305170bc3bdd781cb6651b503d3b21eca027486d413f1748f40f068
+b14dcb895ab22335373d2b736628c1ed0e815072fd3844867ae24638aec60f8591c6885869ad0bfe509fa3fa3101a5f0
+89631708996651bba6b2113626a2fe1ef0f2ea2f21857b2a1e5544ad31e8a53e755b6d611546ebbba4b2213acde65e72
+82e9436700fcc5b842ac2f0482de4248ec9d1f206db3dd36917c00c7749bda257fedaec513d8a9ef3765057bf5aff25e
+b1c2b26d93658451fb4e9cfcd77209dbfea909b2212c000fcc576ef29b808061c9f58827682cfa09e357c1722c3215b1
+8be32f59768777a785d8b257f941215f37db8912183aef4a39a856b88cc680ae7124789c58cb3c6c6f06a951dc96a1ce
+8cb60a3d0c9a1efb89f89f78e6f0e4bcf5eabeae6cb215e98cd7f9eb58699ed70dabed73a8b95daf32a5e4bf0d411d3f
+8ec7156d6b672e631ebd88467f40caa9ba5411ab727602f3146b468bc00ae54fe44b3228572670215a0dbd59feb66e2d
+97b7162101d740aedc894bd5f74b8cfa7ca7e7fe8363b05491c15e8cd54f21b0b09eb41f756b9089c379ea0ab189c468
+8524c9de6be47cb6808df761ed03c505932ba715e757dfb3c97b6deb462433d98953ee6cbc7a576b6837e68eb16d3188
+b024c8fc3fa4f602ab73448418548d9896200065a95e8a001f6c8d4cc3f53f18ec8b85524377fd93e2d2a18eb4c48b57
+b344dc93d3057465592460b7f35dc015f4f8025fbcb44a645dcc3dfb37044d5681d8abd81bd544272dc57cd50048f29a
+a7b270b94d9870f8afec3bf2ed58afb76f4ea576a2175502630d0d3f92f9152c1ab0c019f175f566eed29713dd97712d
+b86dd953c40d4f5574bc7489323d71e9798f7c6f2dff8d41f6295655c5a275179ffb4bb8d2408b88226c98583a7c26b1
+b73074289a5b08aa695de03ce2f5b106107c6cf2bee8061e3195056e799b0bd8b4172deff7f413ce8e477391ee6294cd
+98b801a58ac7e083da541ba058c64b00ba709d4d0ba1683e5d83dfb80a29272fc2a33a18f32351b103b227abd5123da1
+a7cf232c6ec6b9dfb32d729b9d4216688f6d2b6e68053ddfb293ebd5774218c69133baaccec7ba3da9b221af619c2ed1
+8cc1d33ffedcea05f3c593e5b63dbfebdf26d05a5719cbf642997be929336b92457fd9df0d6be6c063918ada8fa2d322
+8d273497dd9f822984f1d8dffd471cc703d03c342f022b2bb24492209a3889f010c4f7ec124f9fb9f884a1a11f84a414
+b62cd013944d8d9d72fbe54897a94e804c93eb84a24beb0880cd98fd5d48fccf5dedf5076abcb1b857adcc986b729cb1
+a1bc703a67ee709f7776b2871f2a88d8574c9e2910690c9242c162ad926ef2263d5260f5c19015ddd5ee1c8ad1a444ae
+87de434e8ab5b1d067188cb9c12ed936c26ddb0ee76c4c9cee9bd1ea916e411a354bfab2ce77ed8c8ab5d8c62038f933
+ab128e9de30bad31dc2eaad851da1e39741ea61bd203b48e5671e37f7b4e3db86687574d3cea1f561bbea84f68cd17c2
+b54576c9c4bc3b43270b83b89eb75cb7e89057c99e14021ca42237dce393dc6a8614c5af5c2f69160001b2ecbb407c9f
+93adf38f161ea886f41e4af8e42c69c53a51074db9ecd7b7e4e36c858426237167aa49b79737625c9f9826dfd22f39ed
+a6907c8dc4073d3d4d40df8302c1637c15f9197aad8511dc95c210f6a60b06f3aab2622b826d16596af27e42f2c9d5b2
+a8b0c4a3a5d3dd5b6a85802039f48fc80350f6f0be2e55bdf75e3197a22f6547ff4a7dce38ef3667006128141364625b
+8a5f4c17c729509309b2ac7e0dbadfbf0baabbcfb1fab02f91d055238faa3b66aae850ac9b8d7b7245f0a26bc5253c99
+8bfc5d594700287da2a85a78630c616af8e555cbd7864ea604ba38eb75742fabf6aca12ed99a2439e2e046d8f048a29d
+b0f91b7546613341cd95ea112e04b0963fbf7795f118c393fbdc37e37dc25244d10d987c13d6fa6eff3c4721fd0a328c
+a70b6fdc66ce4c2e7f1d830b7765b7f0640ceb7306cc85778488964cbcc336ac378b74b9c4ec27358f27378380b3dec1
+87387cd6b643721aac8e1a8533c27602d9632168d3a3532059163dc5e4613838bb4f07803e6852b23c58f7103d134f92
+888722a5a56f5b6b00daba53991ab6fccc32a029a7f1748f779b57732285e56e09ecdb7d4848abb3dbf3e167cf8033c7
+b7f5b9ffa8ba66f54cac387c197058eb9025cb3761550c78429db95f9e1e3b49c208ce86b6126c162a62939e1080895a
+a53f38c068233b584211157c66d9d2452c811bcd340d8cfafd32b070c326169306975e558745d63e1617f4b4528a2399
+b1c3e9b0f19993f973f038bc45be6a834b1cd3d56f112c857711c8e6c30303eeb0b205bd5dfe75e46b1f4d4bbb68fabb
+a81fc28620e640ccb57dedd40c79b73b0c51565dc61097527b2341bbaa3e1c9ccf20f9d8da1c16704e881b24df0b7335
+910a7f4960a0ec2aae66cbe2ac98f43646b017de84ef3d486c19b7809aa16813400bc2dccfc80e09c63422a9d4d88f56
+a463868e3a8c2d2a7c49850be2740e01c7892c83063d381f405282b4c521cb6e3317361abaa92042c38bb68695c10bb9
+991957100ea0f66cd4ebd23d9f6bc7aa62220f6ecb71ac947cbffc6f36f7891173670977bc58a6f57b9a1e8766100c2c
+961dcbd2e6cb94574a33fd48b5d87e0623411574666d5d37f4ff7dc587980e2644cf056e002746088c3c3b0ee7044510
+a27cdb374cdbff217370015d78c7f5c4674ec9948339475cc80a5805979a4c6a2614b6904f943374e96bb838549ea517
+a567bd4a59f9df9f5f30a70cd9f6cea7dc0e19b7fca37fef5846aeb1697dcf7925a4735367be0828f2ded5007f711f03
+823937a900e3b8705b657d40470357d91eeb339324f0fed58695ad72dda7c64f2a6b7bb7ae4a20cd1b2016cb9edbdd1a
+b07f2248802ba7dce15b2698a60a4896323d37ecae6666a71cdf85878094bbd4e9c0e4733bd8bc6e9c850e57727e1d86
+adfcdea69c5608f02630db045e5679f9f0768fbfa9c8e97bc9cf9cafe1f747d3813e7bb1adc6085cd57102afd71db133
+908153d3eb2eb2b93c15aa606531b08981bcfc8b76684c2483bf869f335f9d8773a9aa3986ee54d9392856daaf82b684
+8fbb2acf533e7d6e96e9b68e77f7a1df2ea6c652cd8862b946c93c084436d7349ef4a0c453197a9769e986322e9174b5
+b83cf4ddee6140c9df0a08a39bfda79c0d55516fd799c1c24b59397b87a33ea5a0885b2998dadc354cb6f65a4bd946a5
+957a52cb24f19106d80d4115a8a0843d047d157c4a8535775593c1dba9be24318dd434bf43a82aa7755897f895d2ed15
+ad93dbc2c055f9d7e42717391cfae64962a78bddbb9fd102a05cea520654d4a9cb6634234d3a188693c87c5b4c78959e
+8dc4b8e49de9b05c33d2a98973e223c01ed5745eeaada3a4c0e474cc22430644a53a60c3d6efb1212ca298c4331763f7
+948b0172df27db83e70fbfdc896ed82696876ac4c51842d270d9ce1e7f1fcc9487d781eab97f40074861401b809dd7a0
+ace190f75cc102a79412fceebc013bda8cf329798db4b4dba658e63228ca7f141bf0849d30139ffdededf98986f3066e
+8f968dd6d7e06008a1374743b965a6204c11a610ad92705e8dbe6df3c58baf36b47c5d9988e4a417c80ffd5e7725da7f
+b8ba0d5b36cc41f6839543d43166a08bf512f7b56040891ab80efefc774db28c833ecd444a703c75547fa1404fa1ec22
+a29944dd0e5c861eb37c744c429a0dce596cdb2e5b0b2d2438a259a0faaf3d261faee1434bd28ebb2e6adab59ff3951d
+85c70422fde0ac6e7a0574512eff2a19df8049757bf78b5a7d7870848626850f17e8b0a5661e5292f3df0f613886306e
+a5ff5c3ca2c70b88d15633f9c38d2e065bcfb0e447adca33301a0d4f05b761049c8f795444f11e39357fe6bc0d7f1880
+a2167cdb114d7707f1010e0be9cad488fe56cef65941c35a5878a100adbe522a8abdf7eab7bc689b8727fafb174032c2
+ad3f526ef9ed367b2a25c95453135510472581a758760d47eb9f9b57b04f8c061152e5a792584d6ca7124dfeb7e21703
+86443033ece13fd386485115765aa95673be72b0543fac2138e1488d22419591176423213ec06e5e4549a025eb6aafd8
+887e4ccd58603e6c9cc99bd2740bb1db2fc4127e8d3ec9cf41bcfa3589b0fe1931ed2a6140ae1199d323d2870882ef6b
+b701f7d7637662ea7024d31e94245a5f745c7ca889f4f7a8362537df82b0164eae83da5a107a21c0ca889926aa50de49
+ab6bc11d6049cc5945011d3973eb2dbd5a3d786b3824bc125786e734887254a6ed61fdc2a97ea34e6b37b13cd97eb781
+9901a1f44122bf5aec7cea28e9405c33567eb118752edc60f3cf6c80642370f86557cbd76478d6b0ea33be92a22c746f
+b9f453650996f14629642bef8fea66c90105c8523f3875d86694100f8022d4fff2915ac9f9b9efd6f425751b113d5623
+a5bf9385a1c94c09ec326c49b6b603f2de987b2878faf0263ed109410536543095c07320f762fb6fe56ee72a082daed6
+ab003c86dd62c801cb16b727fbd1037aeacbec0f76e8abda4c6d87066cf0a33dc1c61721f2134c3b78975efe013cddb7
+8dd8c580c288168f896fd7ffbcf5c8167a55d34f17b2c362d0ada0f33a08cc0568b37b01cf0cef1fd5e2c2e250fcdf7b
+acfe675aca83a774d3f526ad461f0deeebfc73a15ab3d37b224f8740ac2d9df238373e6cd1f03ca78a9daa0a796c96f0
+a45cf3242600fb9733dd5e0dda1994e8d37fc483885a34a76cc16bd245f6d9c8d15bef360ef59d0a2c3cd59114280b87
+b64097145d97cdc8b7a84edd1da7e84f8aa44c3c2a4823e6e8485fc3a44d94cde7d7ce8bfb3da5d583386461ccb42afe
+a10ec5859c274c0972ec39ac80e461c29995b35d03603dc97dc30ff826ef24c5e52d5dc9296319ffc672b9e1d57d7936
+9702ee805b70a1bfac7318e8470667ee20739e3db3030bbcb9a08568e96c9c8d2af2cbeb26837c43e04997457c623486
+acb3f5a663333d1b4d54dd76a23c6601fd4540e2b050ec2a7fbf0b850b6f592837155e6bee5ca942406643f98bb2ca83
+a577b96723f64d2671f1253fca72df86ef3247006c92cedcfb26eba4b4f4ba71bfffe1d5eb87b0192378d0303177fdba
+8c397ac56cb723df015d0ef202fe486d1acb42f8129d3e4b37125a7ff9e81aefb1e19f477d528be1e6b18e7bced27ba3
+a7a6e6994324a80ee0a85e8e8cf818f5f8d16d299f21b2fca8a9f65231982584afe921e76723701abea873275ce0c15f
+82c8ee7a39e49528efa60ce1cbcb3017904de6beaeb751c406b64a94aa73af72932e32b63c1d3fa22619498fc46de6bf
+a1d0193ac8bdd44ffcd37092a5dcf6e775824e5dee4c0aea5bd46f2e25b312fe58e1e6b9dccf9dd14f240d7ced4fe071
+82c48967f22b8aa1dc63dbda0f66ff2f40f3ca9a7b3e752e1a950dd7daadf9afd81ae1fe3d0e440259dccbc1520d4e22
+a69d43e6f962b728d223f6d474a923dd13c04eb8858f7fdd2df2c25dd4d13a0a69e71132f450613e8e2d9a65938f31f5
+a613b731fe0d23ebf376cb1f3707ab9b2d428d1ea3a95faca9988a1ff4fcbde0a077b38b5942590e594307acf88c9db8
+a7d2f249ec666f59dc51f9c31db6168f33a94b17ab95123d4b19aa00dbe9e1cdf340dc6f64bffc6dabb11912e10edbba
+8e64b8f99ada5f317c6e2fd64ac17c4d6e5314c82848efe1eb97a5a52e6bf08923360dcb44c05d3fa59a82119610a898
+865d9512ec4a18ab31e4062b2ea6c43ef32c7c58d89bb0afdad9fe57dadaddd2150f78a0e85086454812855bf09f31ef
+b2d23f01a0d182abcd6862ab6f4bf924ccaac399ec143fe2614908dddec102e2feb8555479bfb71ec3476cbdd71b1137
+b50d176e628e06258b518be78c6dcbc3c9b2b4a1ed4ba10ee822b3ebfeaedc4fa69c61c1985e1bb20ea9f3d6df7a27e5
+8174953f4023e31e39f1cc3bad674bf2f1605ec9fc053948bb60dbf2cabade885376f8c76f45b638c95fdb14f5bc562c
+92b95a12d1fb1ec489943b3a2a1c8e3c8c6a30d0767125b87fb491f9d4f8de0629afa39fb5c8a84078b08bcc26e88c4c
+93f4b80d76689d5936aff6cf195d579ff5328ccd0f04db42522a225f96b0bde2088706356675f185186548006940898e
+a5f7f4577943741def19df611c2ad3d459c386a5e3c765eaa5a0cb6c192873675cccbe62845418dbe47d7a9822e4038b
+b59bdb196d59928326572807b2ff2edfc93a28632542b270ed462567d32bc36cefc40300619aafe4cd1e91c38d6c9c30
+90df4b921e13ca1e63e8a5c9968ff64bbcc5b829e3421d74bf7f678aa1dccc1db9ed9dfe5aff05539bcc5379dd59e575
+837b0b6813249c456631b2f2fea9402a2303a454a114149bc35efb400813397366eabeb4477f2cfe037f722d78a5849a
+ab5b33ae561312d9791bcafc8faf6d65f2c4260f126f11ab5c20c7626d88f2c00177588ec62ca763a7ca44c6ed60eb0f
+b0ed2e48cf650a4267c3da1378b8164cf6b774200a5898155716f85f7abda093a60b802ce549811644e5f075d2b26067
+8d47a4e27f448773fa2d592f052bbdbdf30cbef152db6d8cbeb3d7b1a0dc0f2c820ed7572eacddcb51c19a8268426b33
+a56ccd0961bf238ccd197e5bbf430d7c637ff6e01590febab3529776403682ee32d0a776c3dbc6581f60002dac86c38a
+9163bbdbf468be88a391698ab1f40a919517beb6c780062d4bab3bf8fd42eed6546a8c743e249fd61c3c347ea60ee185
+8d59f46606f063e68198457917004ae50ebb99cccb07755825782ddb25b96c3cf8973a6c5092c9db71a4b8ed075876af
+8ebffeae4fef7a83d81f31a88589e05f885dd0c0b4360545b22a18369a3e6762f187ea6a173f25419e70031861936463
+96013c6b47119e017c8bf473b3d643d0bea1cc12d84d412c2b9f6f55f22543a6e15ff7e818e9799af43984ca2ec3bfb3
+af46ef7696d9908fb343a6754de37e31cbb41dc1a4ab8203d2a2483d1cb0dd3183e5015d8048ff146ec34a6c3f2eae21
+ae047ec4584a962a7ae9359292c98f4d8e0916dd98a414e2e15429ff30ffadb3e0296282f0f7e257495e8ec4bc0e5328
+a16de787896a056d31e3f174418aa3882c03c879a292246a43dafb81f8e0e05564f1cd3ecfa251cdb159f63777fc6346
+97d1c4a94182ada88aa3cac95520711802cd3889e3e057e99a72a69589fd222b241d35a54b04f42503756ec3c1a3d701
+86be4ebe8b92f5bfceba757e1e2eb649f9803c8cb10130b88b13caab6bc04dac4e26d538b7adef68413b047ab9031252
+95d4c0b08caa283ffa9e307f78db15470fca5b577189a33bcdf14c36d4ae3f571d004c5aa1e69172a4068e72b7dc25d3
+965b7053a1d14f9091de5df8bf033a07b9f8d39a6d66979ab5424bbfa32b803075afc2d74e71235a0f881bacb6704689
+a93e72836e2efc704f87065dac0463ddd4b063eab125d834df583d8833873f575a0179781b72aeb2a35533a34a395481
+a2997d7c377060d910654550316ea7374a0329fcf30e743d613e2ebaa15b1bc6c936c2529f5466ef0e60ff53aa2b709f
+af5259d4d08617d9be068d1b79a8209497972910938831a435487395512187691d0cb021bd57eff0f694f32efc1487ab
+a78b8318838b1049f308200782c4409fc6c97ca5bb6af28996eb191027c8935b7a43a41961ec046e6c8539376c1aa293
+a4a6a9ec652d1c95883d21d3767b13a7e1dee73be907dacad197cfee025755db3cc7a8fb9f40146912f8a3f4c2c49c14
+a8a8ab62334a3c67793fa0691a0d2e80ac1681ce64a02df93b78e4a2f6fbf3af9b160d9ca6b4e835d58ed60d8ce627d1
+980c32e492464a6f36ce12ed06541e3b2eb098934c0ebccdcc984cdbfee4a506d15afe1a30a84d642322c2987d9d51a6
+8ea8c1adfd73747db98705e9fe1aec441484d2e4862b84817cdf1262fcce91f56cd26073d4dd23b04f836e0962428593
+b0f20edb8552d2b08613cb574e9de1c4dce1eae55ba9ab05dd7f2ca3590a7496d63d55af88b3dff881e16d8bf9147037
+915af4e9a28b12ea126668db7de6ff0c2cc9935b138022fadbb1f385f327fdc927388c945b93d252cb51803c242f7e1f
+a553e08f67c61ecc5c8955f7251cfe18cde02e6170845e70db1761bc00f42a31cc10de26d4c904200166311f32a3e56a
+99f4b066a805512e16addb0bcb08d76f017213ca6aa6afb5c2fc621805c4e123bbe0aa85eb5a0f89d3112635905093e0
+9236c5b0f4d2e58033735d7bd5d53ccbe82c05aa290149286a16a318043ffedfdca9d2d07817601d4216fed50c1082f0
+90a4c7898c58c9af83f94095f6afd5ca65664f16c0af4c8121407cf0864fdeb09958500b2bd0b78950aa9051e3480928
+a589666688e6e7f8e4d99b84d21a1f9ebfe681fad346a237de20a11a2b210eb99c4d3e2f645b23a85c93bcccd51f63f8
+a010849ed4df0e3a8eb61f7fd114d05a8669bfa36cb95d089bb1964ea8f5fa26be0cd10fcd9b38b259722c5a14ba3a1f
+b21f974a10a2dfe9987370ef4b6af294cbe8f4bbe35ce9400d0538c5f71287498054d73606e26f93e2f19584aa18e285
+81fea77bad05c3bfa8d5d8409b189fd5c759613cd69ddb19b2d46673d4df944b2c7293989f79580d229d20959c74b18f
+ac962b0819a03d2a2fa42c492f54c3d293c6d5ead403c50f7a1ccc2faad58beeb0dfe888a928e505fea9e09807e13a23
+b78b913f2ad9622d20c175ed23f80f235b5336343b0353f82383fa6aab99aef77cb489df822bb168e56496c1854f623d
+8c06abf72913ffcb6b59bb8201c00034b447011880733aa6b563acc423e90bdae19f2a7a286943b55488fc863d09269c
+b34168972fcd90c78286bfc6078ce559e3c216d8d1885ecd5044bf9f23a4ad15bfc9830aabb4273472c43e2980048586
+88350e0ffe9b5576dd0afabc6d8445d25b2b9a0945c71e6b9a5587649ac5d95cbd722db5ea1e65d3fb8230c794fda5fc
+a3bec1fc362a33f38795158f1b869e9ee857a7f2e1acb92c6a7dcfffa64443a5b7f6dffb656452e7f855051ae849be3e
+a21f64c49334720883e1243a27575648f53637a644c308ff24f5c26bfe65cc690a5e46b8e432171f31c4229aff4db416
+85dcd8ebef8f7f44372912b4a3a0dfe66a56f16c3757a8ec01b71aa81eeda9f8e5082f92e3ae8cbf3c1eddf5e6ffed03
+af3c1a770f34f2acc504f38ffa7a18cc4b38f8f84f310cdf2d7346b18824ebc7c7663cc0e00b44cfb5494fe6081aff84
+a5dc7c5989fb5cea87c2d878d8436d858458171b667ab5200dc2cafd8af2d9c2bfe2515b0c002cdc9c3e61e4cfe4b444
+b136dcd4577ef3a3a8bc946cf2ec79d3fab301114ee2a692a6c219e252c9128db63fedebc6bd6695a8ae58e7d28501e8
+91d3a1ba625632d59dc963ed54c0310d0447df3e1d9151299722d10f8b26161bb73e0020d408b748fa6fd1db51adabd3
+b89f1a2497b04b3f1b018dc88b52133e1d7470f97f846965fbc934d34dbc8d38f2d8b07d218e62c609de33b61831cc9c
+92fec43fc5af23fda5dfab78234f5ea7813d8de34f8ec269c5fa35dd916b9143ff0033d35e7a284c0ef4f41047e98fe4
+8a0b89cd35ecf5b6db26c39705b416a4b950aafaf3b00a9d75f864955e9074aac03826ff9393456871107563eacc024a
+b04db63ebce71161fd42bb878e89155bc9e887329e164481077c6a1db092477370a362810d291444f5463437e0ec5906
+88ecd5275592f8b133928770e2273a0e0c23424d72b9e505130b0599ba28d1c11eceb2318a49dee054a8ba0971874357
+8eb0271197fb9f1eeedaadd8eb603b8753ada11abf04ce90950034f51f756ed6ec6a6182a47e1f3ae51e3a1f3ecdf467
+81cc996bc6b12ac56a1ae3add4483ae4f2e2284e9d304f5fa1723231d0e5b196813b6dbbc20b70f5d51fcbb65bf284bd
+8e1d94ecca2928c4c68fbc13199b6281f8782c75c119b763e0eb122f81c35f8fd079d1bd76b498393371a08dac95dd1d
+a92f98bc09f8a91fd165bb8d05e3b5ec50121d760b353d7e4ea23c0e04ff29614ad9028a4a16bdfe323f2af647e515ce
+82e8dc99a14da065200699e458150dc6d49ec0e098bbd91ab8f1fc1767e8732f53855499c8f24da7b9dd681100633be0
+a67b6cb4eeab4fe5f4ebdf5649b7d61bf5fbf7b6cd2d357fdf348ba32dbfa9d6830b1265ea76a1c666b266e30d119182
+a64e3af1d0e600bde18d7f53a4e8d89d296eab4bcd9cc3a9f476c5b8425e6e8082066948fbf40689f626e27e4830edfd
+8f66b59782cbccdb31cb1bb2d6385307633ba4db31c375c0a8424a497b2fdf309e7ec1c95490324b9a909bb43041998d
+b93f4817eb1d91ac78eb650c110f7c29df40df47ed1d5d3209c3abe5cf59a5e7aee3d1cd232bcce77e157b1a9daa2557
+864b6cd72029640fc041fd3efa71bb210edb40589a26981724b944192c3c2543352b4b757836a7b0b13bf830f22b8374
+9064a0ac94f2f133e287b796363f6d27e9646a8b531cd9ac0eb45b99fa73f327238161a43f7c4fc914036d69abd1473f
+a40e60d4aaf9f50f7bfebd0e714fcfeba64e0f7ccaa0f4829144a7efeaf15a7cda2d62d771a76f98a45cda9196b0522b
+93e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb8
+99aca9fb2f7760cecb892bf7262c176b334824f5727f680bba701a33e322cb6667531410dfc7c8e4321a3f0ea8af48cb1436638a2093123f046f0f504cc2a864825542873edbbc5d7ed17af125a4f2cf6433c6f4f61b81173726981dd989761d
+88e2e982982bf8231e747e9dfcd14c05bd02623d1332734d2af26246c6869fb56ee6c994843f593178a040495ba61f4a083b0e18110b1d9f5224783d8f9a895e8ee744e87929430e9ba96bd29251cbf61240b256d1525600f3d562894d93d659
+a2d33775e3d9e6af0d1b27d389e6c021a578e617a3d6627686db6288d4b3dffd7a847a00f7ef01828b7f42885b660e4204923402aca18fbae74ccd4e9c50dd8c2281b38dc09c022342ed1ac695d53f7081cb21f05fdfc0a3508c04759196fcd3
+af565445d2ad54c83a75c40e8895f5ad7219a8c728bce9d58d7a83716e095432993ebbd3f6911c66415a6f920d1a4d171478509b54a114308a020b33bf4487a7a8d0aa76ae4676a9b54e765a680f562d3a4fcb2e92c58b14b49b5b2917cc258f
+8aa99cfaf514cef4801599cadd780d222194ca1ad69a34779c2bcfda93e5dbeb931e13914421b5809a6c81f12cf7038b04a35257cc9e94c33761e68565b1274aa6a6f9d66477229747a66b308b138f92aa4326a3bf23df65a1fe33b3b289bfe1
+99ba36d8b4f56bde026099278548b1afc0a987cbd7c9baa51fc8e6cbb8237a17636f1a44a385cec69b05a5802059956a11fe793cabb939c38800f9c239ca2518e898ade1ec2513c9ee492071a35aabd78182392a09123d28dbc233313c9120c4
+a7dc40c36afccb30a2eaff250860b28b227c195cf05674704c567d77d6655c446ae835f8fc8667e71147ab02afcb2dad0babe60cbfa37d7c2cddc68d2dec54f28a4142f8353590a3902d5ddaa22066ab563dd1435dda83f276387b9767d69120
+939e6cc97a8b88572852a5b7f25e4838556307f60aeafb5d2b6961edbcafd4b48cb6ac980ffbacf4be963f324ba81e3d12de4f1459d8c746d0762c66ae1b166027f7fbe641d9c48f3c7d97b06d956b0be51dcc9aab65f3e99e1388e63bdd79f9
+b391e156541dfd4003d1697cdb7ec815b309807320574906b2e652ef0175828b356d215cd374b1b34d9f470b3fa0e643113e67b2273268f922f04f072cfb89008358185b25cd631f82911a3f20f90f75758ffb99bebb8076458ae1e9d1ae898c
+b9ac9c84934cc2a85c876eff65577e1dfce1935cd6392c877dd881a7d2f5c3e9344f28c04f90c62a6db4237ca00f9e0d00cb5f63e3f060fc7303916e19273b6fe455f331cabbe2fe5a22d584484f0d4176120fec9819fbb0a01e6d38695acfcd
+88209eb030c5d78734bf2c2a5c539653fd3c24b4c08e624f9ddc4a6550efbdc1054a56eb0c807595aad6de56fda326aa196d032a8b4b48d40140a2d77df3c7243eda6507936389a321a5811eb38e32ee433c788deeae1eb928b00940e2944bcc
+a8632ddc9cf7cbc1e8b74a05b7d4a89618c64afe30367ca0c9550ae7d320bf4e51c5a69e1501a1d8bee4240d13d7835501aa39fdc401a74f4d5734e268a7ce29a1fcfdb0a8bc64e0dd4a9e8578d6985bc2bc6a3764ce7a3703f6fb2e52557a2b
+a037ac67e8bb6f4193ac967e05d080a489f58ef8d3d30a89798246f3e4936121ee445b03e410a09e8ebc0db2e2477d110aad0ade99b0887f1eb016e750f42135866907f150bd6f4f99a8cb94281474166874808ebe03b118c5daab16dafdc38b
+a50d9143116bffa3b237da8e1805327e81e9cd25e658289bd727d5f9e0020172cc8690dcfe31a240e5cbc48353b88c4908baa1dd7320165556e0aa633f62fcbe7870222d345a3bbcdb7ab6c07f0fd86be559964afabf56f0a8cbc0b4b91d477e
+afa988ea6fa4f40c5ad07d2d580d29025ddf56d6ef1171a8b8de3464203f70b97d6f5ace72747345204b35150e06154d1477516a989ce8eea7871cc0d0de00a077c0fb23ad4837e409d0b885bf3f2dde11a30fa6273d662e68e09f461e52932f
+97fa1a943ed8b81574304a3d03f4f15907f6e6e0cd36a66bd2ad2c75afafc70a61d3ff69b77ebe4dae9ca0fcedef80081062705e60bbb6ea0f1f398c84d2f8e4a3ac142ac66426c21ad5e9994ebbcc406af474c4aec5e32fadcb21875af7c9f1
+b30a564614493886f14a5dd71c89457504f8c59a7ac01b665ed167e9a8f9ee5832198fd319ecd234196ee57031bdf3840bd5a923e203a1938bc795c704b5285389750e1fd10d7050061ba19db00a60a2c0384a7d661d7d48ebe6962272230859
+84c8dea942cfae71cb02e705ec496d967425793ce8812e7ee53c2f23713abeaff566a658cd1c73dfd18187d16253a6ee0a623e82cd18e31cd1a1875d19c078835dc9292e141686150a88065226ada264740143e87c03a0f6c4da8c187438ebf4
+8c3abae8aed60338f8c4ff80aab22f8a2ae56756a93566c906f490a97151d34a1c3318054e1c494c60cc53327ad86a2d02c6c76a406726ce4f88635bc32eff0db0b61762dc518b95fa8da82e87e4bf3de54f1d72180ef53ed7bc5413e6a9a510
+a328230c92a6b1cef6a444bcb64edb992f71e3d7b93f0b6b8b408ba7c908db746d92ddb2c7588bab438ef3bc61be1c2f0dfc86ba2ff514b42b35c80f89b2e780f813ea1dfb977fbded2cd9b553b747fa952e227ebd8f071163d421fc337f04c9
+b482cab423cd5f1c5df036070aade7aa016283d69619d664025c3feab866a0a5691d344b2ee2bedc5dedd1f9a73eae16003a3827c9e5bbe22ded32d848fba840ffad1141ad158f5c40bc8ae0d03781b9705d851a7f1391b096c576c0f4f2a6b0
+919ee1df27fabcb21237a1b7b98f53d41d849e1b6a8f9e28c3fae2841c6b5a250e4041c737e6725476e5cd715e34d3880f58d80f61efaabc261bdc703e8750f48a923e9bf8980931b9fd9e40014c66c54b3e7c98241d76d1aa47af43313a65a1
+ac94830145dbe9a8f7e6e0fc1f5fb454502d22abcafdc2dd96c6933c604461fa83b2b37385f4bc454875a02a6d4157841250956783515d11c7456e7f11b745f12856d89f5feedaf6a61a483a6c33a21cd2ba0c18eb41a1a2e7fc33bb53e4c570
+b209c699f1233735c5bb4bce848e4365fd76651ae2184d2279a90df0c2f69ffa2a24d84a9b9f274021072953c0d65e1a0202d490d6c37186af240114e445d87bff754b4824937e4f2c90a574061b1c4910fed88d90f698025a2a264e656cb8a4
+93320dc0576b0d069de63c40e5582b4486d9adf5e69e77e3ebaf3da26976fe42147a65051501bc8383f99e7ba75479c70a6726c2cd08bf98c7481f1f819712292d833a879f21a1221a9610bc748fb5e911055122fdb4055cdc84e8bfe0f4df9b
+a4380b240e998cdf668591f71a0c88ed143b0185a920787627ce65095f8223dc606fa5bce93377af100de92d663e675c0736d7f1973603a84a5c4162fb5e01c88c7493503ae1d7e9fbe8ece9b418397d68c21eeb88dae226e09875d372c646dd
+aab48517d69135a16b36b685adfe9b2544a709135a21ba3e75981a2cba4ec81d1fe28ac0f72fde0c0001c15300ed6a810f58d3117bdd58d0149751d6508cf8a1a1ff7b63dd02d2730a9d6fe96c77c502fe8ed46d50a181ec4bb35e37dfbd6af4
+8277265fe75ab89ce4ec65b33fb4084bec0a56d81faf2f7a9070d2ca3065678e03a790350eba56323a54e0285bc32fe8007d5259740fde226e16cbde8354eacd562294eb9b7f727ed72ffbdad86f467cf057c737b34b80a41deb92634ed866f5
+aa40a24cb2ebe606d969392c03020070f044c95088d80f57f771b837c048342d2cd3474600d7660441090ffb8d2ffb7f0eddd67eb378e3e1477a6ba0bc38096d5d2d3355bc8b60f605f57f0c1899da591457440352381d2b38c0aa9acc7fe419
+80815d10685808cb630820629bcd2fa9041c9b74433630c0b9c1b7f7e8edf1440b520217f76ec9a50c125cf4438aa66006a1928a9ed2321da7ea325c3d56b65462b72118ca2c99a0ea733aa11da9abbeda6cc71ffeed301ae70213a29e697dcd
+ac235d079f91b00b1fead7523da8f73a5409fa8970907af0c5d5e4c6a0996dccfcdb0d822d08c7fbc0c24799457d011d04312d20831825f23cf988141056a6814c8a1cac9efe37bdcbfa272aed24cd92810fea7c49b0d07683a5c53643872179
+b8aa59534d75fa5ac1c2c3f963bf73899aff5210059dbde8a8635561c6249e5143affee3bd2fd57575213b52d9a73d5702525867a7dcbb1d0a49b98c2925556fc5463ff0209742046a24ab29e74257d6419401093cc4371944d811cc300b6a67
+80bbfc5b816eea29a6d84e2217dee4d547306994d39e5592515e1b0807b67fe960d1d5addb0ff1a20c158bdb294c04bf093d28996121845a2c9268e2c9ac0f4067e889c6aaca62f8535d35b45036954bd069e3afa84f04721538c26003304c20
+a535c17d0e151d0e03d42dd58ba8c715bee3fabca2890e0e016071d34184b6b34e770d2be29c8ec76b69bcc471d50f4d043c2c240e9b93a81cff7ee2724e02018dfd9b534e40be641fdb4884abcd83b76f517557ffba508f1ba2f56313f4de94
+b237eb7465df0d325a3aa58269be2627e4978f9863f4f100ed4c303cb1f6549e606f2e3c9180824d8049191965c8dacd0a0c76cc56cb22cf1bcfdb39372c8aa29b4f7b34582b1719e6bd59c930d87d5ccd838743b585d6e229d5ed42337315c0
+805c335a2a9d2de30809cf30808ef836d88e9453c510716f01696f14c72dd60505eca8f128970edc8e63a9aa1f8792ac0dd50dcc84fbf4cc8b32349c682a6a27bc7551c7aa273a94c1606d07710188d93579afe3be1781bded15a34ed6047922
+b25dadf385ddd3c39bcb0a014d3d4f66127946b1aceae8809e3a03d66cc25e27142ca108316391f857fe82fdea4db2520cc73793b695eafbf3ade00ef7ec747b0457e49303f5e1a370f5263b436566fe24a0876e5fe088238c7be37a0718d65f
+b0f753081cabe2c8fce73aba82ff67dbc9842598b3e7fa3ce2a1f534536f8ac63c532fe66552ac6b7adb28c73ed4c8a4184849be7c1756a4681ce29ebf5e1c3aa806b667ee6bd68f6397aba3215dc1caec6742f21d681e32cd1160d6a3b1d7ee
+b798771eeb3d7a17c62ba5916cc034bba870da6b1ac14c2e1cae71af3ad4e0c0d1ff983f691e0e55289d5a33b131f2ec12430c9566dd71f4d8be9c79155357a5c30c5efcfd75bbe1bb6d5ada4d50604ea49ed838d3641f268ca6e25c9c4b6b72
+b52554c017388b099804abbe565346591a086d9979e10140ddaccc0a3680e506db775d7cbeafde67563adf0f09f5c2420caf19629f4e8f03e6fe02e9416ecd5269989e482b90004a083967d1141387eb74865bac6bd17e7a6d5f58225e52d4b7
+b520ff694520919023d44d53f98a7de2f78ff37b2d9193dcaa35556a6a0febf767781a4c961dce7c804bfdf81935f8f0082865253da52e79dfa1c5ff74d61495b2da76e167d46114709e877a7791a3a95e33a42f56b83f5f5afe271c67ae997c
+b721401983440797a03d5b99f2088a0b249aa911969c34dd6c615b0060325da555d2ad99d931170c0868b0488a2234a4114cc0013d5163b833f5c45c5eb536421c016cf85788390176bb2dc4c196d6be26bbbfceae048b82f0d8039222e71c94
+acd9d833ba0a8cbd8d1ba939a11ea0fa5607e1bc6e693ec318bdb097aedd042d76e695dcebebd142e2e4ac30b1905dff03ec36d9cc70577e4dbe5e9ed7c20c7afb13a7f0155f203c6b83b9f1ad3d20a0d4aef0fbbbcf466ffc1bcd482bc2f5e0
+8cc1795de015f2b0e72116f169f3b4624b7738ceebea354e0bd9051c27b86f647ea36cad57ea6884c1a8adf9b45cd83514fa687e68878bbd613d793aa10986d5a0411f081689229e0d72133b3667b9f3f1a02211d0e680564eb1ea43393e1f36
+aa9281c61113c343a108de1036570feefc72fb7a96ff11f73024de12b83f29631f5a8a5900e6f10b15227c6f7462881511271bf785ebdf95ce288100e5dab391f664f6ff76c72b65b34479a4f43e5e8eba292209d6654157286ad3242ac342db
+aaf16866275082e59d415db317aa874267d048ee405a553e852e6d175711d31a1fee99912345915bce121f43bc3e00d81338e5fcd3c8a1012fb4f172a9fe15622dd368b4d9d5cb60d189f423b071791fe26cea7676aca8df07965cacf80b0cd0
+accc80b3d8a6ffa648487a3d3c0ce1aeeb5401edf3cf2e385ea4a6d5fc110054fcce38f01f1da7141bbed30eb7a0a6810c82212bbb9da75d6033082dbcf6bc6a5791f85aa0f045a10da5de015edbf369b4d23b32b0c058962d2ee88e6911f994
+83f1089395a16077738cc7c9a6d6a3dc9033aac4abc508af5a1f007ca92e1a80b2e6f2dbda7fdcf0d5646de790a6201d0a9cfbcb6620a1426600e3a6a425ec004384f49fb9dcd166691a47177d45dcbcb761a11d46220b0aa09fc946131f7aa5
+9246bb586d43cb817c2e15ed609156e9f1cd284ba2f4797bbfa51c0341e1ba382eaac059aa9f63fb88d228a1a932839a171e7c7d00199dc7c4d6c5ea038a02cbc3cc5297c70401520e70ebbcffacd6a703f62896f3c788f94dde3c33ab0ecbdb
+a316cb7c74feb0563c56cc79015e2774fbeca458bf8e9fb07894f9d6bcd73f7fb9428e87c816e5629e4bf7f3ec567fbc091549471b75492dde08217cb334b716b4582b24384586e53388873a78a90ec01bd7c3bace9cfc52161467df16e27c33
+ade18c74bbe60d1d69f4a570f8e5fd8696c26cc9e02829040b6b14cb9c49a4b3263b5bd5e16ec0b29010b4be054c16ab09304e23442af7d7f5fcc60bc6c5634ab6e4aed7ef334b2785e4c7672d59a687278e42d310342db5e5975d716e6d1595
+b7728800bb2039acf228fa3d8028569c426cb85d28b2b5820bbef938d5ca8c4df981d3e01a309e26ca101e8295d0f6990c03b8c239798323575874a4ee5bfe46cfe99b9657189142aacd8f8d1f26cf4c0e73c6397c31ba8f18102b9ea315b638
+8fb14f2a9be193f54977ecd3021663108ea143627b9a9d9faff85d1a86b855f6c437eab435fad3304f245bd7732af07f1173494cdb802fb96e85d2db89e1643206e183f3b228ca8d3f586e71aa9308eaf0223100bf07942fc39e465016d1f775
+ac1e025e53d98fdb3380489dce82d9d4bd3a6c98f0a523b841cb09a6f26ddd4d22efd98776e78d10fd996995fd00e81e08d3c25dd14a54b25a9d483677a24bbb8d1cb41a443b2c71038e6893b1b30f70758424e0f2039a48060191389033ef55
+a4c017311b9e930868132527a9849072b91db04fd36c619ae39c98da9e2174e6201d3c2ff1246c06b1b6815bbf3ea4a1116564f55ee2fe4c4d655e2294c0ded842cba209c255ca3d7b7f82d162f97890dfdeed087aa2f87cbfc61d61815da39d
+89516315a3956b455843c2555248bd94dcb19993060fe75fdd51f7aa9c9147ab13997d8a98036a8f04bee5c91d78d2990907e35a52537a8ab3ed15f1a71afdcd38044a5b6e93f662b9d36c16933a881927cacae668c4c06ee6f004c9e3989bad
+a1e78a011e210400c68ca76045f7da74119bff3cbe382efd2bd2ac76567c52d68d75536a91999d084043e1ce2d07d02e0b69fb99924101d2543521747536fbc51b0454aa9a4cbbec101121f597863a5c0fee2ca5eab35dff9b9085bef8b2b0d0
+830fd8d083e39153ecab43cabb22e29d7b44a55fba467af4ddd3f069439d2972ef53c3518de788f96b3f4f64963987d0155ba27afc28643af3de8e476ff515a68285728167408f45d99e574680bda6bacdd4322e587e4aa99386e035c0e931ad
+b89584da22237e3061d991b1a55a5e55dc637b8b671130d304587729348138ef87885180310efe9f9f6d3580b9d7fdcf0649e8a79d2dec8c25a9f53df0fac5d517db999029cbfdd7c2cbd3e9a5503e5d267d3d8ad752335915c92b850b14bafb
+959b8030733799882c5e3735479924b013756e57b893f9792bab4043e2d362d77cf308166d782e3989caa771b8a0c0a01302cb7b5e8ca12e2d6cebd59d4cd173c9dc25f438bac597fab17b4ff44997a489c168e7204b7d7c21d0938f0a2e3b51
+a0a9e5503d9afe0027891dab890c687fd5f5fac5741418490c64d7c15f59533dd603a50163c79402afa61bd02de486761983c94501da17e6bbe78c497f2122210071602f578adc0ebe7a4679f87fe77e09c8c122de69105f13455fea25f08e6f
+9811487283ad620cd7c9b303ae2f348d0e6f5ee17b504baaa817ae207adb912a00d3cc36dbf48745eb899e6b6e22f09f0f9ba29d949ecd7350fbbfe87a8c7cdd5d0e687fc807751d07634aaf7c38baf3b24a0670c38fa6ccd7431436fc95525f
+8a13aa5071c526e560def7d8583393942f07d88c9d8d26c98738fd65f57af2e3326dbb1edff0f39fe98eda4a13ed4fd71844254b954690154c4804e1c4a53df9dc4643f4b7b09d0860070f6b2318d0d63d28fb56bf5b6ff456a18dfc72fdfbbe
+b9c90ff6bff5dd97d90aee27ea1c61c1afe64b054c258b097709561fe00710e9e616773fc4bdedcbf91fbd1a6cf139bf14d20db07297418694c12c6c9b801638eeb537cb3741584a686d69532e3b6c12d8a376837f712032421987f1e770c258
\ No newline at end of file
diff --git a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/precompiles/fp2_to_g2.csv b/evm/src/test/resources/org/hyperledger/besu/evm/precompile/fp2_to_g2.csv
similarity index 100%
rename from ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/precompiles/fp2_to_g2.csv
rename to evm/src/test/resources/org/hyperledger/besu/evm/precompile/fp2_to_g2.csv
diff --git a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/precompiles/fp_to_g1.csv b/evm/src/test/resources/org/hyperledger/besu/evm/precompile/fp_to_g1.csv
similarity index 100%
rename from ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/precompiles/fp_to_g1.csv
rename to evm/src/test/resources/org/hyperledger/besu/evm/precompile/fp_to_g1.csv
diff --git a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/precompiles/g1_add.csv b/evm/src/test/resources/org/hyperledger/besu/evm/precompile/g1_add.csv
similarity index 100%
rename from ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/precompiles/g1_add.csv
rename to evm/src/test/resources/org/hyperledger/besu/evm/precompile/g1_add.csv
diff --git a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/precompiles/g1_mul.csv b/evm/src/test/resources/org/hyperledger/besu/evm/precompile/g1_mul.csv
similarity index 100%
rename from ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/precompiles/g1_mul.csv
rename to evm/src/test/resources/org/hyperledger/besu/evm/precompile/g1_mul.csv
diff --git a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/precompiles/g1_multiexp.csv b/evm/src/test/resources/org/hyperledger/besu/evm/precompile/g1_multiexp.csv
similarity index 100%
rename from ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/precompiles/g1_multiexp.csv
rename to evm/src/test/resources/org/hyperledger/besu/evm/precompile/g1_multiexp.csv
diff --git a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/precompiles/g2_add.csv b/evm/src/test/resources/org/hyperledger/besu/evm/precompile/g2_add.csv
similarity index 100%
rename from ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/precompiles/g2_add.csv
rename to evm/src/test/resources/org/hyperledger/besu/evm/precompile/g2_add.csv
diff --git a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/precompiles/g2_mul.csv b/evm/src/test/resources/org/hyperledger/besu/evm/precompile/g2_mul.csv
similarity index 100%
rename from ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/precompiles/g2_mul.csv
rename to evm/src/test/resources/org/hyperledger/besu/evm/precompile/g2_mul.csv
diff --git a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/precompiles/g2_multiexp.csv b/evm/src/test/resources/org/hyperledger/besu/evm/precompile/g2_multiexp.csv
similarity index 100%
rename from ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/precompiles/g2_multiexp.csv
rename to evm/src/test/resources/org/hyperledger/besu/evm/precompile/g2_multiexp.csv
diff --git a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/precompiles/invalid_subgroup_for_pairing.csv b/evm/src/test/resources/org/hyperledger/besu/evm/precompile/invalid_subgroup_for_pairing.csv
similarity index 100%
rename from ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/precompiles/invalid_subgroup_for_pairing.csv
rename to evm/src/test/resources/org/hyperledger/besu/evm/precompile/invalid_subgroup_for_pairing.csv
diff --git a/ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/precompiles/pairing.csv b/evm/src/test/resources/org/hyperledger/besu/evm/precompile/pairing.csv
similarity index 100%
rename from ethereum/core/src/test/resources/org/hyperledger/besu/ethereum/mainnet/precompiles/pairing.csv
rename to evm/src/test/resources/org/hyperledger/besu/evm/precompile/pairing.csv
diff --git a/evm/src/test/resources/org/hyperledger/besu/evm/precompile/pointEvaluationPrecompile.json b/evm/src/test/resources/org/hyperledger/besu/evm/precompile/pointEvaluationPrecompile.json
new file mode 100644
index 00000000000..b3f920acd77
--- /dev/null
+++ b/evm/src/test/resources/org/hyperledger/besu/evm/precompile/pointEvaluationPrecompile.json
@@ -0,0 +1,170 @@
+{
+  "PrecompileReturnValue": "000000000000000000000000000000000000000000000000000000000000100073eda753299d7d483339d80809a1d80553bda402fffe5bfeffffffff00000001",
+  "TestCases": [
+    {
+      "Input": "01c357eb79e30f84b7f1b78e2dc064d5e889714a94a879218ffe6ffea8467682a645f2136c180538e24425f70b7607c87f7cb892193b242b86750f13de96c44febbab307c43d34e34553a2cb7115749fd5aef0958386e668419b3ef6f1eac524a97456b8097baed6e90ce381d2b21c970a3f9ad4f6c92b1bb26337f919bd639dd43bd470839153db09115e2862051f33a8cd9ff4ff4f98ba4ea89e80747cfdc694ac9969b841c8d558dc41bceb3c8f97c8c48c1409304ec70176c4e24fc7f6fa",
+      "FailureMode": "",
+      "Valid": true
+    },
+    {
+      "Input": "012801238108394529333e45adfaff59edde33727fa766ee99752921b472893611f5bc1101693a3a77098f71ec13c7ccaf4542a037b9397dd4ebe522e05d9d47629f4dddbcf4a5c28f5b09c9bee1895d3de14ea9312df7cf607d09517eb7863dabb6bcbe313530ce7779abdf633d5a3594a41fbad9a79f4a9b46b89c0cfe78f6a15948dec92c4404aedac8b5e7dd60598a963e56a55c2659c306beeb49ac79b7bd375fad150619b2fb5d835ee8f8305c3aac541ca6adad9be851b4f6dca5cd73",
+      "FailureMode": "",
+      "Valid": true
+    },
+    {
+      "Input": "0116f63b849a1a5704c55538e61f3576b09fe82fe038a39c96a3cd97986777a97ca4870f96b96f3c0ccef8ebccb186d1df0eccad55374fcf2262bc32e224763f5ac3abbe48a5c2f3731087f86bbf567910fe098f6183a2be6c1bd97ed2e1c562a4429aefed1de5145c9426c68b2fa5dc9ac0bd0c7d0420e0763824849abf47ff9be8942d481525d54dbf8d2508490e42a5e6166b8755b63c54b54802049c01c4a79b6c55b3cf3b7a22e9382cf4960f703b339622aa530e0961ef6747faf3ebf3",
+      "FailureMode": "",
+      "Valid": true
+    },
+    {
+      "Input": "01aebaf22aa7b4019a4917f97176f9c0e79513f1e297b4daef1158fbed94f8afe753520d2b0aa53ea1926266ad4f46d60fd855bb73b5642171d89242e4eb4e3735096476da0d660f9e2913bbe7d29301fa96a178d02349323fac041d6ac1070d934abbb7ff0028c06ce8d27accbf0312fd4bfd55e58e6d8920aaf9d7d51f1a59ac00b34e7eedf5464ddf69b3c6e3e8d1b577b30ec9d82eb5e56827c875fb33892e29b504198fa7a6b196ac7cd6d64838ca452d94adeb57f1ae4b5d894d26d616",
+      "FailureMode": "",
+      "Valid": true
+    },
+    {
+      "Input": "016ee58067bdbc41ad3978fb379e8fe3ab0bc4cda0f131ee9baf2db213cd4dc552031d0bc05ada403657cce08ded05db3fa1dfc891337a73bf4e6952e6b2272f02b04885539a8052bd8e104f6f894fca92355da265a04fc5a16b2fca2e016252a90cf079520942b69d207a57445406dc1f539f60467cf2bcd805814190ea87280103f02e68e50a314b25dea197c2543488e5992ffd5e03890ef5c362569a670b955cb11d923b176b152750e853190ee7dd6b56074f009580e191d79e3888bc26",
+      "FailureMode": "",
+      "Valid": true
+    },
+    {
+      "Input": "01bbbb1a74e35dd8cb8faec442693b1355f40ab9d0b44c47a9ec8ff197987929bdb2e70855ab0f43cb1b365b6e8bc5df6f6a69d6afb18fc50dc53f62e879002728aa2577ad9b59293956d5d76783b1e54c1777d3ebc2ac5dea349f10a66735399913a98b55d225411649847f9cf0c5afedf4f30623392cea17ed509864d8e0d87ecfa303e0f9c9c083456d9125a3a8d5b723e9a64edda406fc74ab8685039dd6039b6d2f8ed8d15887776860d7ea57a3767410a4eb46bba045f925b41e2fa299",
+      "FailureMode": "",
+      "Valid": true
+    },
+    {
+      "Input": "01792bd31013b362e1383652ea9c6d7d0f6c7880f4478eab785923d2a24417fe2862b206eafb444560e09fd54e2985e49f33f3e3cd2fa5175c3b1672ea40d91e808310a87ca1c24a2b2258c38e495d0df51d1cea6c11431679cc04a8468c9f5a86bdcd35acafb637235ccb8c908332cea2ca9e4efa5afc66c24f9f3ea0281ff3c588b147d90844248b36b79cbae7d016b6c46951710384a5fc425bfc89f804b9bfe0148805c54162a4ec091e5bf063db88577b12b9839def3fb15ab4b15e46e8",
+      "FailureMode": "",
+      "Valid": true
+    },
+    {
+      "Input": "0111c228100fd51f22a0be9e86211f971ab6c7a5dfe6988b5b45e159c77d937b93117d047f4c7a47f5a409502fc744e9cffc7cf1ebadba69aab1ec81ec07b2166770490221efc59c136280d4152adcfee9dbd2d17b6b727a4838373258054631b416564857a5239934c918dd7ce1585016082ca9bb79a0626d1ccb00afcd458910d69b36e69752791ff49736af318707855231b9ecc3cd8ed8f52eb31673482ad804ccaeeadb91fda7104f90b483d609fefa5b677efe9ceb772a4d80decbf404",
+      "FailureMode": "",
+      "Valid": true
+    },
+    {
+      "Input": "016d0d27b2a1b5266e1f6fe2f987bff57bd67157222831d9260f782dbf85e957fec04702149daf498a6973ca0f6504eeffc506ff092cd0bbf827c391eece8a0e004ddc8a839cd6c7d381795dd08e8ef23e97f59e7c34457f3aa802b5edbba35a94c3f402eb91cf43a4f502d486f22f0f04bd99c1a8180353d93e6c612ddb22c7838d3e03c471b4289bd2fd5060a615379172bbbf1f4606d3c777886412b18c5e551b098d9373cec1957dc333e9b83d0306941c61a7a0fdf031f243c4e2fc0919",
+      "FailureMode": "",
+      "Valid": true
+    },
+    {
+      "Input": "011459b168df56c35b2a1712329aabd7f904735dfb7e948b12869a4396d7cb9e69701200a9ede44b1f2edd44f002c4f22f8f900c28aae50d479e99a1f0956306740e0b40715e2d1d5b32c1960253f8a2b2c32db833279863237e1da14867b24b840eedd5e97ba21d82aaa67583b8f9b8936b1d0e11e69c77ab9f8381cf47f3013dc258944bf04fd91fe5663aa33b5397a05bcb8545682fbdc37663bbf01010c13164a422915a9c8961efe82825fb68302a3435ed2cf7e01bbac059a420277f05",
+      "FailureMode": "",
+      "Valid": true
+    },
+    {
+      "Input": "01dc43cf428476b6fde56262f081988eeeb5ae6e665a2fcbcd667f93b474ebc9d51fddfd3c3e1a4eb34e45bfd344414b6530bc234e003593dd910ddb45042a72c1f4fd101b80df1af58a2d77804c711e999d09a90f2e379ef18c752dd3866e34ac51bce1515c3df45ee85b5342c88291288a171f8799d31b1e77ff2d692f3f1f6880e2fd0262132fdaac0e4245958fafaaed1182c6af9f27f01e9e0c47dd3278496c3d3b4126c9f62a6fb81542d3223a480323fa09fb524ad4f70c83f46150f1",
+      "FailureMode": "",
+      "Valid": true
+    },
+    {
+      "Input": "0111c36a6aa83254e02e96995ac0ac766f5edadd8044fd0170d4e459df72267a40cfa7fbd18e4f504813af39b4e2005095f945316c7e4ae52b08e4ea47cb026a43dfedc72048fbe7a9107e8abcdca472f722cd3327c78a6a1dd475d556e1063f8a6775af1fb1d442d7fef688d3e34aa7055e131fa13be05528cde77479d33ffd2f21708b479d3e36fabff48ccaceec19acbd62bfac28c7f29f62e0e3b8587fb50abd49370c1e164f3555abbe9199aabacf170d7c39beafb36506ec73847a6729",
+      "FailureMode": "",
+      "Valid": true
+    },
+    {
+      "Input": "014adbe3d78e1a41777dc899baa9597dc97bcffa2bc6d8f79fe9de417078d8f8ab7e72f966df8452ddd718b49480c054c5c2cf3e8afc5f377a7ebafa4992db617d7ec99ffb7dac5dd4d5dc011447816b11b46094b584d5070fb620ef71edb114a8d63144a4ed21007c816a63e56701ad142dd4a26feaf9249040246b1b290450fac06edfc3f223e98aca2b7c758c459884b90ccabd00e842e492ffdea7495f3732dd2cfe142892400089b121bcac3dd21ab347d0f6dc092f23710354ea071438",
+      "FailureMode": "",
+      "Valid": true
+    },
+    {
+      "Input": "01cbb255a9e362102497d90841b3099aa812f281980b20c12951fdfdc30204c7162e3df7fb2fba54729c822e751e8059f58b594ca87a7589c8f4900a4c59b45904ec35e25ea7595f7e7352abbe50d6c1fa57c612b43cf77d17ab598ffa0f023f8a20f1cbae3472de159c30b66bcec852689326c449720ffeaa87d5b86629489ce1a5c660bb06c2a2539dcf1438d2c960a246002bcfe66adb8f9463c873b855ade410313c5128a8adfab5492da5e662cc556999ee653b697a449a21628c1585c7",
+      "FailureMode": "",
+      "Valid": true
+    },
+    {
+      "Input": "0103a676648fcc81830d61b0b07937aaf48690aeda04d5b02b5a251bd5ca5c4f81dd07f59080ef560761eca855bc3f5e2555e359c6f88adb166b671a4e208d51e6ecb876da33438c5cf8fe1463008e14d012cda7365474e61148e2eb76d3910a852f33ed26a17a7a6b9db96b03c110d5709251a5377d0e86d4349bce0610d01ae2d6c4e2a45aea1d20822988bcbca345b17fca68d1b4024f157d9b81f57ff2917d0101f8e02cc05ae8c6655102b4dd55d8461c6f971f5111f1f0b82338837cb5",
+      "FailureMode": "",
+      "Valid": true
+    },
+    {
+      "Input": "01e7ab7a7aaea9ee3e2fc8d17bde6badc12e2bf824bfe8db0eafc43dd0762bf1ec8cd2f225d124599c255623365aff62551e6d67e476a02d65e13d2a50e76549efae7b3b28a8d235894e618237f4abaffaa500fff7cb926e9309a7d4fe7eb53cab1484ed8e82a622d2647871e0e784fc676e55047dde4cf156b2036f937562dfff92102fd993352513fb75913935b47e89dc14149659b5d999abd29d2fc33f76b287b0140434c6c26c214fb0aa3f1ac27369ea89f4b2ab79aa03040720d32c67",
+      "FailureMode": "",
+      "Valid": true
+    },
+    {
+      "Input": "010b73d38034466a538f1acaf463f7575d3d3f4baa23dcf6d559700e8fb5fd82573c9df0ba215a5b31eabf9d16f8be6785e7f67402f5b57fb357143a52ae3e4144abb69b6b607cce5f1830f05ad98f8c184d39a1c76d860876fffb5852fc450fa372cb9c0a5b0c14406f59e4926acde14f737d69d4a926906fbabad357e743f2ecab5a7da7e5384dca593697eaeaf58aa1b8b02d82fac14d98121dae7e04d9f3e38a5fc4164e0d0dd6692ba0b55b8063d4aee0987a0f811396617f4045609a71",
+      "FailureMode": "",
+      "Valid": true
+    },
+    {
+      "Input": "013e3ff78fc9bb6c6564d205fe1064aa6e11eddef9f0e985d8f364005d03c22fc2eb67ee4f728f5dc6ae2918f7957e6cb5b080822073cbd101ceea4954751739e3e04001d6c2037a831ff7ad639fbdb277264edd75b50d025eb183120464f940a86e11eedc9683475153b147c8ce10ae29495aed6cf2e58c5c3385f1be4d2162696d0488a94b4a2a552eeb0502eae3cc80049aaaf808839090c40d57463ffb5b56228d88f2329b5811ac7f5931085fa7360876a58893cc049debf820bc7ab88b",
+      "FailureMode": "",
+      "Valid": true
+    },
+    {
+      "Input": "019f4cc64584a59f7d924fb921ede13a7a04c1d595bdd96ba66722baeb145e862d9b32ece4c2c45f5b739392d7333e71e5790a903ef1e0235044c159563cf0309ae1b4c885a4afeb472ccf74b3ec7d68044ab28890a647d76939d31097645025817785fe342e0354ee0845753542d0eaff5c0acb9a7c2206de60c930a57c81b6db2e2b414ba3ab2730f3364f7d35dfdfa4df917a3c7c9e3457871234e6bf9a35ad025f0e40ef2a2502a5024c7f0ce709cc27c3bd2399c9a1ec02238d38124c9e",
+      "FailureMode": "",
+      "Valid": true
+    },
+    {
+      "Input": "0128f689b5b1121319a69abacd871979a1075506bd04ac7f08399a1996626201984afde97913fa61f037fd0cb8d1fd751543949d5c6ff6759eba97695803c9284b3b9280d5b4d8f18181f4a0d199bd69e63463b75a2722835b23fe5145711a5997885c37b0edb98b1569af211135fa3b2ec29871005ef58bd429533bbabb70275840fec04fdd4fc327c730d0919fb0d08bd1b47fac65f7874afc7d394b5873c48c82a70e67c5c4dac616896fcec24df35f7e1ac5a6236927671d11aaa0a25c71",
+      "FailureMode": "",
+      "Valid": true
+    },
+    {
+      "Input": "",
+      "FailureMode": "incorrectPrecompileLength",
+      "Valid": false
+    },
+    {
+      "Input": "01c357eb79e30f84b7f1b78e2dc064d5e889714a94a879218ffe6ffea8467682a645f2136c180538e24425f70b7607c87f7cb892193b242b86750f13de96c44febbab307c43d34e34553a2cb7115749fd5aef0958386e668419b3ef6f1eac5",
+      "FailureMode": "incorrectPrecompileLength",
+      "Valid": false
+    },
+    {
+      "Input": "01c357eb79e30f84b7f1b78e2dc064d5e889714a94a879218ffe6ffea8467682a645f2136c180538e24425f70b7607c87f7cb892193b242b86750f13de96c44febbab307c43d34e34553a2cb7115749fd5aef0958386e668419b3ef6f1eac524a97456b8097baed6e90ce381d2b21c970a3f9ad4f6c92b1bb26337f919bd639dd43bd470839153db09115e2862051f33a8cd9ff4ff4f98ba4ea89e80747cfdc694ac9969b841c8d558dc41bceb3c8f97c8c48c1409304ec70176c4e24fc7f6fa01c357eb79e30f84b7f1b78e2dc064d5e889714a94a879218ffe6ffea8467682a645f2136c180538e24425f70b7607c87f7cb892193b242b86750f13de96c44febbab307c43d34e34553a2cb7115749fd5aef0958386e668419b3ef6f1eac524a97456b8097baed6e90ce381d2b21c970a3f9ad4f6c92b1bb26337f919bd639dd43bd470839153db09115e2862051f33a8cd9ff4ff4f98ba4ea89e80747cfdc694ac9969b841c8d558dc41bceb3c8f97c8c48c1409304ec70176c4e24fc7f6fa",
+      "FailureMode": "incorrectPrecompileLength",
+      "Valid": false
+    },
+    {
+      "Input": "01c357eb79e30f84b7f1b78e2dc064d5e889714a94a879218ffe6ffea8467682c3b23e313cacf2ce5e5e13219c5a54851bc51a0ef723a0e13805186b13f245a7ebbab307c43d34e34553a2cb7115749fd5aef0958386e668419b3ef6f1eac524a97456b8097baed6e90ce381d2b21c970a3f9ad4f6c92b1bb26337f919bd639dd43bd470839153db09115e2862051f33a8cd9ff4ff4f98ba4ea89e80747cfdc694ac9969b841c8d558dc41bceb3c8f97c8c48c1409304ec70176c4e24fc7f6fa",
+      "FailureMode": "nonCanonicalInputPoint",
+      "Valid": false
+    },
+    {
+      "Input": "01c357eb79e30f84b7f1b78e2dc064d5e889714a94a879218ffe6ffea8467682a645f2136c180538e24425f70b7607c87f7cb892193b242b86750f13de96c44f98b392451fdc18899c205e8b9f9286daf331b974cba0af44e3343dc307b3baeca97456b8097baed6e90ce381d2b21c970a3f9ad4f6c92b1bb26337f919bd639dd43bd470839153db09115e2862051f33a8cd9ff4ff4f98ba4ea89e80747cfdc694ac9969b841c8d558dc41bceb3c8f97c8c48c1409304ec70176c4e24fc7f6fa",
+      "FailureMode": "nonCanonicalOutputPoint",
+      "Valid": false
+    },
+    {
+      "Input": "01c357eb79e30f84b7f1b78e2dc064d5e889714a94a879218ffe6ffea8467682a645f2136c180538e24425f70b7607c87f7cb892193b242b86750f13de96c44febbab307c43d34e34553a2cb7115749fd5aef0958386e668419b3ef6f1eac524000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a8cd9ff4ff4f98ba4ea89e80747cfdc694ac9969b841c8d558dc41bceb3c8f97c8c48c1409304ec70176c4e24fc7f6fa",
+      "FailureMode": "cannotDeserialiseCommitment",
+      "Valid": false
+    },
+    {
+      "Input": "01c357eb79e30f84b7f1b78e2dc064d5e889714a94a879218ffe6ffea8467682a645f2136c180538e24425f70b7607c87f7cb892193b242b86750f13de96c44febbab307c43d34e34553a2cb7115749fd5aef0958386e668419b3ef6f1eac524ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa8cd9ff4ff4f98ba4ea89e80747cfdc694ac9969b841c8d558dc41bceb3c8f97c8c48c1409304ec70176c4e24fc7f6fa",
+      "FailureMode": "cannotDeserialiseCommitment",
+      "Valid": false
+    },
+    {
+      "Input": "01c357eb79e30f84b7f1b78e2dc064d5e889714a94a879218ffe6ffea8467682a645f2136c180538e24425f70b7607c87f7cb892193b242b86750f13de96c44febbab307c43d34e34553a2cb7115749fd5aef0958386e668419b3ef6f1eac524a97456b8097baed6e90ce381d2b21c970a3f9ad4f6c92b1bb26337f919bd639dd43bd470839153db09115e2862051f33000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "FailureMode": "cannotDeserialiseProof",
+      "Valid": false
+    },
+    {
+      "Input": "01c357eb79e30f84b7f1b78e2dc064d5e889714a94a879218ffe6ffea8467682a645f2136c180538e24425f70b7607c87f7cb892193b242b86750f13de96c44febbab307c43d34e34553a2cb7115749fd5aef0958386e668419b3ef6f1eac524a97456b8097baed6e90ce381d2b21c970a3f9ad4f6c92b1bb26337f919bd639dd43bd470839153db09115e2862051f33ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+      "FailureMode": "cannotDeserialiseProof",
+      "Valid": false
+    },
+    {
+      "Input": "01c357eb79e30f84b7f1b78e2dc064d5e889714a94a879218ffe6ffea84676820000000000000000000000000000000000000000000000000000000000000000ebbab307c43d34e34553a2cb7115749fd5aef0958386e668419b3ef6f1eac524a97456b8097baed6e90ce381d2b21c970a3f9ad4f6c92b1bb26337f919bd639dd43bd470839153db09115e2862051f33a8cd9ff4ff4f98ba4ea89e80747cfdc694ac9969b841c8d558dc41bceb3c8f97c8c48c1409304ec70176c4e24fc7f6fa",
+      "FailureMode": "invalidOpening",
+      "Valid": false
+    },
+    {
+      "Input": "01c357eb79e30f84b7f1b78e2dc064d5e889714a94a879218ffe6ffea8467682a645f2136c180538e24425f70b7607c87f7cb892193b242b86750f13de96c44f0000000000000000000000000000000000000000000000000000000000000000a97456b8097baed6e90ce381d2b21c970a3f9ad4f6c92b1bb26337f919bd639dd43bd470839153db09115e2862051f33a8cd9ff4ff4f98ba4ea89e80747cfdc694ac9969b841c8d558dc41bceb3c8f97c8c48c1409304ec70176c4e24fc7f6fa",
+      "FailureMode": "invalidOpening",
+      "Valid": false
+    },
+    {
+      "Input": "01c357eb79e30f84b7f1b78e2dc064d5e889714a94a879218ffe6ffea8467682a645f2136c180538e24425f70b7607c87f7cb892193b242b86750f13de96c44febbab307c43d34e34553a2cb7115749fd5aef0958386e668419b3ef6f1eac524c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a8cd9ff4ff4f98ba4ea89e80747cfdc694ac9969b841c8d558dc41bceb3c8f97c8c48c1409304ec70176c4e24fc7f6fa",
+      "FailureMode": "invalidOpening",
+      "Valid": false
+    },
+    {
+      "Input": "01c357eb79e30f84b7f1b78e2dc064d5e889714a94a879218ffe6ffea8467682a645f2136c180538e24425f70b7607c87f7cb892193b242b86750f13de96c44febbab307c43d34e34553a2cb7115749fd5aef0958386e668419b3ef6f1eac524a97456b8097baed6e90ce381d2b21c970a3f9ad4f6c92b1bb26337f919bd639dd43bd470839153db09115e2862051f33c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "FailureMode": "invalidOpening",
+      "Valid": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/evm/src/test/resources/org/hyperledger/besu/evm/precompile/trusted_setup_4096.txt b/evm/src/test/resources/org/hyperledger/besu/evm/precompile/trusted_setup_4096.txt
new file mode 100644
index 00000000000..c22cfff7515
--- /dev/null
+++ b/evm/src/test/resources/org/hyperledger/besu/evm/precompile/trusted_setup_4096.txt
@@ -0,0 +1,4163 @@
+4096
+65
+97f1d3a73197d7942695638c4fa9ac0fc3688c4f9774b905a14e3a3f171bac586c55e83ff97a1aeffb3af00adb22c6bb
+854262641262cb9e056a8512808ea6864d903dbcad713fd6da8dddfa5ce40d85612c912063ace060ed8c4bf005bab839
+86f708eee5ae0cf40be36993e760d9cb3b2371f22db3209947c5d21ea68e55186b30871c50bf11ef29e5248bf42d5678
+94f9c0bafb23cbbf34a93a64243e3e0f934b57593651f3464de7dc174468123d9698f1b9dfa22bb5b6eb96eae002f29f
+82b8775b874067bdd4479ac237f8d56036a742c17901354caaf38bf8c70e696650fbec76f0cd941ed8c658f44ea359ff
+a7ce299c79c7d7e4f1adecd754c5aff8a720728ab27f5737b7b399f72724407ac54965088596375b8c876665ed8e4ff1
+81ca4c808a76a6f217f8b0540ff400199295da69b2587b7be6aeb56447fa4fac08d154a27c4aa6082bc40660078d36e9
+a70bad5311c97f1f3fea5d3375da1a11ba948aca41609ea28666dd343e07af766834e1256dc685ac1dcd915073250864
+a91c2911a658ba79f56abe30716a3398387630e785b351b07344022a04b2f5c90de5573bd6e8048fe8878dde19336c5b
+a8c560283fce9813bcbaddfb78cff93efcbc39b33025cfad94ebd40942a9fa605d2a947dc3a1f03c2e454075892e96bf
+aa14f07fbd2c1ce7bd995e335c69b5f675ea573517c1834e787b30ab4fa10aecc62ecc5e617ac8a539af1aff114dc9ec
+87f03429aff126b7c5a918423da278e17b5f48a4cdd6d34dba77a75f4f99e26a417e65d6a8579bcb2eaaf1d4d8c64dce
+b1ac81ba91ede78315f712d524e9d821a152203f04141ba77f4e481ad5881473dff14a71788ce941f0905b429e7ee5b2
+8f5c2af611ddfa3edf7e442d00e56a24d615bac848c05070c908c741ba18b67eb2e82e6651c9b3c70fb8edbf051810c4
+aa4115b19221e4d17cc335d4f9b0aad22df566231f2286d550e97ff2875cbc419edfa189c4ecb24001123b95c6aaa2da
+b363ba913969df0debd4e2712ae6e9177ce82e169ce7e0ff1d7616ef8e352aff3efb40fffbf7bff1b21cb8a33e19b455
+b1013d778727d20466778cea47e1bf56a77168a8ce1b33bb1265f66438ab2bf4a7df4f4142b8681f2993ea9baf798d17
+83b7250ee17d8529207db97b73c1c4a92ac076951a577ce2fe3a2cd633b461c1820c139ab36a895a5962e143c6198386
+86d180bd2f0a4919764e6f4e846ec0d5ebe44060ec1e529ed15101d7e531bf1b8f9412916ea5aeb93b37b2d7c6bfb408
+827451462c79d74b504c01bda199481b3c70416f66a95b2216686ca4d48da48932b0d323d0cd630a1e86e8033e832e5f
+b789d217cb12c334fedff0ae01f85b96e968fb98761755d1ba3ee17934e8fbd83172225df7c0c6cb99432a30a0ef8c24
+b730e5412dfbd646b0d2fe084a1a32eb5596c3fe8a5bc0f430151804f9e67f05f70b522e9aef08082b0afdc652a1d213
+9987653bacd9bc1659b17f6964aec06ea63b787813d4601bee0479706aed5595ac82c87ed4f96f0cd30c19e1d9510a91
+9506a9ba38f1d26c35a17c7e2554e28eb347a19cef523846a2559fb80fb40306b2f85bdc2c9fb98c2267df21c1ee3589
+98dda58de74c0cdaef97b2826b4a9d53c9e9ea592dc0a755ccf5b3fbc1264979578563f5979aaa246e679918053c5f83
+b00aaa16841ab53883af481e2f925050f5f7bf7d8088bc696f55f30593bdbbaf434f5d2b46095ed097b6cdb96c8fbc3b
+b463d656480f89335d3a840a7b9398877003985388871b148ba708c60f9857c7585ef17c8b2ae67fbb191c04ad61e692
+80af54f3d0584126e23635276d650292baf7e3e12bb06468708107bcd80937d36575721ee7472c5f085ffa71dbf438ad
+94ccb8ade84e834685110c96908b42e10d2184208f434d7f98d96cc158e0c0c95135979600e5e9f465d5846b0bb3c787
+8e13674b00c633d7cceb4f6ecd61e4f99420d6cccf9db5e81f8c90f6c661bc76e10939b83b56c225fce8565f525d4fa4
+a46a15b2e671c1a1df2490768dec1093caf537e1a21fbc11ff8ba8b21b9f2be8d50257027d9357df20d9fbb1307d7249
+b8ed532d48b0533a3084d7a5eea7b401255c5825e9a1b80ed81fd530cd69e347d152b1ad8a899acff7d68e0103bbfbde
+ad6b7df980ebaa24177d830c4aa522d6179a9a489257f60ee6604cccc2cbe90fb1f72aa9d5bee0d3a88f73b179485f56
+a56855e9fcf62ceef3043991a93ec24f8f6b5667ef5fb7ad1771249ece68a73580ec3cf3e58a009ca4650c01241ad172
+ab2f25517d4b0b33d317eb78d091d3c3f98dc352b8a3e4650f7005f9327129e23d95f38eaeda5e9b51c50a31d20a4c20
+a2d4071385b8a421da86f39739eaadcdea5685466feb6ac083cba0ea4c71dbbdf655032097276d703f9a77a4ca6fab03
+a8681d7c258984f01e92e92c95738692b7bbd59c3a802adf4dda8d34add69590b080391c09e98e3b75c085c9f191e5e5
+97685643da6c07b5e5fe91393122813ba11c8ef3dbd43a03b3a22a7a1603201fd516c1929418eafb14039270694c239a
+a7bb3b85d6101e4fb0bcf540f52041cdb3e819d517465e342b832f0e91346a9a18bdb38845ea4d2b71ab87ef3bf59f96
+8afc90b7d35336fdcf8f81cd024e921e244520ecfcb5a3994f2bbd595366b68bfa792a8dceb11e1e889b11432c9dad6b
+94d9db7bd04f962d8d6caa3b7aa0f19acbd58a09d35ae187158d77e537d2fc65215f51f1afd62d4ba378e7d176a680f9
+ad62d7c01b14b6f97e6084ec9f9d084f106a7ff3d603032e6e34c027cdce4b0fe3c20ac7931f1209439a59c9fede4815
+a5b44a87bd0ada7498e011e495a2818a8694746c4e7dc9d24c0c1096f54be6439e08c1b11c10d7c4bf68fe392000e971
+828626c6609acc599f1bf216e9a4310fc3cb227e0d2e47bfe3360239427c8b0cc300cddf92456a5c36620596a6d37027
+8380f91baac6447dd39886455ec5d99b874ac114a3c6a6ded18fc4ef69c2208ec19732428d8329d200a69f31792b852e
+85a8389b522b0a686234450165514127006baaa3907f6eb29c976522591a542ffb681b3b88c4886814fd7ba3cc8110f7
+b8ae7949ddafad37c0bc4d48325a7cbcd3096fb92c04a027c650a03cc609c7eac250d6a7ba341616bc36f64f1b4c8be4
+8f9b9d2c2ab5c85abe946ed9986e0f304281b277d4d48c7760ea2331b55a9e9a1c4d53a6bdd83fa6294f421ca7431e29
+9464b906ea8bc994b31e03c5f2af2be0724a43293fd42cbd2263b2de75a2ec04832d1100ce62ac2c0708f05fb6bb3ce6
+93d923f6805e7cf972d8387b352d77215724a3e1f5489c4114fcf0b25fc2231963eda872387a1369a02b2e8b888d6427
+aba4af392884eb7283fc5611ddc1cebfecf9477462e951bdae650e311606e129b4424452a3a14717146f954a7fa1cfc3
+a8d0bab694d116e4f21fa19ff8fa4c6fe4061dbb54cbceda8235a7e05159737f87e008beccb90df0bac9c7d572281903
+85743e3ecbac7ae04a81a09c2961397aa4bd20401533cd24d5fc0693cbfbdd2b37bbee6dec2ae5d0a66250d1fcba6944
+80ae913447d7d3f6c54f9cb584aa1603308146daeb3024c8e06ede66ddc97821df09f9591453e9b617b828a02d54c719
+803c2a64bb1c68890b5f1909be3aa180830ee3ef316d3aac38bfd909e2b19d890525e18e8fc2f405ee70ac14f5569b3f
+964d2968724eb790f2f42263fcaaa1869c373b57b3eeee904f8b36f13169f07d5e29cb2b03c74d3a7adb772e91d5a59a
+98a72ce71a57262aa058643a5cd39af64cc9eee88bef7edb003143983f29d87c7f9658b1ec89712f79f6f79dc24a6a45
+91f3479c5d7c76acd2d51883961179efc975c714720187cc9c0aa7aeff71ca1b3e2db5b0a90fd3ff6abf880ebc49fe36
+84312757edd09f111420bfede10ed3c1fa39d1723ddb9bd4d0004c829f0c1eb060e9648fd75f2e5427a67a5b37945a9f
+95edd726cf4042a082d786262304c51d8d5e6a89b1b58e825a11febe5f861d5ce076bdcb2fc0a5dfa95eb2e5b0ffc32e
+96500da38f942871d78fcc46cda1e72944c7888b538b82e2a979f149e5061a20c7602860f82b76510d02efdf3a911f5a
+8ac62eda98bef8864df243696b53651a02a391b898535d2d76ac5a8e9322e0178a290c83f5afe72ffe80ad56183469e3
+8ab2d4427fb6d3da5cf6c59835bdb39fb0c2de82c213b5de77edae3304458ea505511bd98fda95bdbbb9058bd5e92c34
+ab67c4344a5080930029ca3b803883ad05ca004ddefb48d5164e71a1c6dd96b27aaec70f62b39bb126ce1a57bbff1453
+86c6bf91686bff714a873a78b0fe449db5317a5172a0a14eb3a96b2997b888d5d3f440de8baa32a6966fe44c3625b014
+81d4f1e9d9e550125290d993a4886d46aac8cb29dbbba1e608aefc3432569c5faf14d8b49fcb485d9b75b649ad6b2fa5
+8594140f253ced6fa98dd90ab4f38899916bcc6f1052572f182e46c00752f3053c390512338a0bc8f8c27a91916b855f
+911284d4fad4999bb37590206d582b9e62ffbb815f414fd829f5b2843e6f0e1a132cd64464c131d5a0f476469a37daa1
+8631a6a4987410982db9c0ba632023a5b613f553b6b8ffd3cfd501b2417523ba8cf06741c62f24b405554bd93e39e626
+906ac35d22794a10a7273fdbca499fd921799b1ce9414643779dce9e1ec37920a5aa2caceb4b70a0eaf56c6032ef1b43
+87374cdb8b7a1ce3c182b31eec465d435e35df782fe3a11f421462b48cf56c6fef2a9cb8ee4fe89672ba7804156d9e3a
+a1f825e0246eee506c8ce40f849a17f75e8a0d6fc3f68b6a4dd431173b4fe997d30dca53005829e4e2422a4077ce35c7
+875ad0379abd9873f6634692e33e9b36353e1a0d15b13d3215eb591244e1f236eb2f8f75274ca7f096179d1714fa68b7
+b87b4e1acc09c5701fd9d75375ab896f178c1b3648fb9a2e2c6e1478778156decc32cd390766f3e80b36beb1e3a6bdec
+836ca80949269eb52395776ac5ceb35b7df717a981c5cbbbb627f73c274aa8164e973a7b01012fa72a02404e878a9918
+a770b13a8f07f74e5a75842b18f2520f6d0be42c865a29dd81bfe485e69a83c40ad10ce229afce276ccc9cb46c54b912
+b4b919322bba2866baeed38bf0e2389d4fe6ab6166597e87dbfee75acac7c2f5ad3bef55293b56957c103d5825051bb5
+b6171f1bbeedb3ee1af368c9c9f327d1dc3e55aeaffbe15f14db8038cd72540b62fe65f44ad0b5486dcf4023f0e91af8
+8e42d0c1e8e8c2ccaf06edcc3c686aed56b8c987f9d68f20937fc088120a410cb92fb0ab45bba5db70b86876015a6b72
+937bcff1af9685fd0d1f6616acf91d97ac9fcb1eb96d49d1c880c9945c1fcf1414f63d59fb78348d08a8546f6e83e407
+a6eeb4873c0531fbcd407c2e702c68e4980fa77c9c032b9913b89031702cfa56f335fc413576c37ac4d523357a841203
+b3962b5eed69cfa27fb94edba74b6cedd7569352ea71861494dd579da96d9743655b6308e54f8a42ee6d7e805c1bc0f9
+8eea944dce7202b033ce734c9e88e82dd760c916e00b217cf1f00bf6ec5f20e21885d5fe95d6138871d167de4c46359e
+81e6c7b356e2703ee333a9dfeb2b54260636422b9bda118e0523a20ce83b30fefc2f019e8291a8db05d207f0fa7332fb
+83817f6164dc9e8e2506252511cb9871a8c9b595dde45f67e75ce3505f947b3fb3b804c18c054ad13b1518a98f59f008
+a9ab4dbe7699e7982cd750d7effe031f273fab6b2e024a0b4f8beccb5c280903bcd3f2400b9cac7e8c94e157b4658ab6
+84d2e3bc66fc6b59a1ee98b8981ebca0901d846c40d207e5bb5004ec9339d28956d16f054af52453f6a7ff3fc66c346b
+b24bf0f69c3e86f610b6d27885ac5f4556fbb14e8286681538ddbb0b4921aa0d5604fedef0daf4a514ae15268a640174
+a4be967f7f31995562669bf9587f5463bd1d9873fe9169687790e75961efa5ce2252fd21276d022f580de23527282838
+a3f3c4e673b302bdb91fa3cbdec88499752e6ffe37e2215d69b8a426f4da98c3a10e4c659e77c656172e4e8b1b1a41bb
+b704ffbb3434563bbbce69ca7e812a8bd30757b1e90630bf3261735f9ea221524b36f97dec324ffd209bef45bdf6f2b4
+959dde49f15c663a2de000195e182a11d8c396c1380f98322cbe5521b697bc3bec3223ca9e94ee2734c4ffdfb6a19e8c
+a469685143cd82b78d7b1854c350da63819d9d86670e9b35a72381d0362cf5c3f1d24e22ef2ea6a12176c9dad39fd51c
+adb97ef4463e5e13d91b75a3086d72a841a60be278e9651d9ac5f76c9537bac5eac33424a1ea00522b3357fcefea0738
+a4597b2ced7566576e71b4f105b5ee48aa4ffca93901e9b626f7059824f53be3e8f3560e6861285f3d97fe88054fee83
+a18d9b1b81564447f798ce5966bf10c823aedb14b143972eb4dbbba9312fc79f46635aa016cd20c53be90f170f06fb84
+ac4724069177d3c6ac1b72ea2a7d6bc5ac3d4b2a4dbad124152fbd170c9c1038cdcf255d162a25c14ae8df11a3849945
+892683f64179ba84f6a447c5c7489e3cdf02474d2837dd7bf3b82a4dd05a6461ce94fff28d65b9539cacaf47dddedbc1
+a68ad797bbc1b2909e216a0b3f39aa6c3e4dfc7a49f81a206b530ec0c6ba30f871e4a0053625aeb99448026ae2e0a6eb
+964ff8badf35b6b93be6d97209d87f4ac8847be1c2ac4bcafa1db5c3f604f61834c85b3dcf58af50d09bd03ff8d78f27
+b76dc9ec64b1fab7be269097a18a77144623d37bc656934fa1562817c922485e69b18ef40413ee309e100fde645fa7b2
+b2a812be6e69f284580ebdec5ae2cdffd587bc7eae10989e9d2f290498b1eaa934b148ec7783edec300be5d7a9b34af0
+85ffcabc623f8ffc58c5f640f857e27b7c105359315a3969f346e1366acb2af88f4acc025b299b9c324a8535c380a2c5
+8d0140f79fb8ef02d13b1d51c4ba1af5b5ffb19322f88912215d4198f9a592f7ec6800c8a3ca853a3b68f9bf0353a13a
+b3174deb53c1ebb6a1e16c915cac287573b70fe4e0036e8e971e8e807a77362ede632f6e3f29cb87a80a318213946ff1
+8c58d603f6420e3f55522ec2853065125af4e7773a909e28296552f7f8ec4691ada9211d834dca38e118f432b6cfe03b
+aa7ac268e155ff074bfc197844e21fc2a9f9aec9b50d9cda63f50d3c4fbbf9221e6fac3a6ba0f7e4cde71fecd493a15d
+a191337721bc9fd2d3ec2ca6f6f97ca2462ef5e207464bf9e746a650a67d69abb5f578a8238521cee3f704b275845e47
+93521abea8f38c103ebed3313a3af8f27f03c9a54681847f4201bf9f72f1f63064b18175986fca64f80b4380905e894c
+a1b9d063d6538885f9826b84944123d7d6027dd030aef29fd6229f4cf5d32404f7dd0e899a0c8f4b6bdf4649e8a8966f
+a15d5497f0fd2fd0b2c2e5df58a25a72a9d99df8215951ea58c15569d312c6f096f78034f6a8502f808e649f6cb9283a
+b3c275306852612362e1073d0f4da3ce598dc5fac3f3eefa22ccee35dd57a4caae347b43342cd1f6a6e068d3ea9fd30c
+94eb678e0700bf39caf428c65bbf2fbf7f601c39e382570a4df9186ff1dd5a958d78e051a5fd084e4f75536a14b7690b
+97b13995bbcb8e824bec28488994a830a9c1f34ae4c1a16d5528d57f09e4c8b5d81677ea9f979f0acb8cac629ee09c85
+817c99ad48bc05bd4fd29f952dbdc5ef56bb02f3442c18e3b91cb6d72ac2d2a5df901c099165ded1bee62c3ed13c41e8
+a884acf980f6470e11cff347692d8a7cb7860d4822112f7bfeb02efb05948ea98c837d5d98dd7a104aa36eb8f016a0f4
+95debd2ed23a23a16a393f59f666cfc864f63751238b73981faec4a85b4c04cfa11520c9e4cbe4e23fe80e86c260093a
+937b4691c59453bc6cf6468ed5b17dbb25496bfa3817798562cd5fd86ab5ee35745991afea2fe271ce0fbe5a990c41c7
+b4da98c879e6b475c540ff2c5501299f0e3e97b7b93beb45faef1253f7de96968898505e672cfc4a3ee7e20c1f72c256
+8ec9d806f344d0c675bb5ecd47c54defb5f059a5233dfb2d459632b9b22edd6c4b8c47fd7899ab13e35f37ede9b124f8
+aab4408410abb4d2cd98694f71b5452e6fab2690daa3066b3f9747e7dc40b57259d52e6fddeaeeca227b733d049b9694
+b85a12f39808961c331038159255140a61dedc56050345a2eb13b1f7d140ae07b353d68d22f2cf60925fe66e598213e9
+b61bc3bd68bffdbe9731f48fcd523491da04dab83add49fde390070513b9ad87a489010f1ccfe6f54e9a48edaf88b5f9
+8f50f6d8235824cf25031f09e4b139bd89c1090269dae95a5aa0dacaf5f9b59c329a5a3cdddf9efe6c77cd61f481dcbc
+91a543b85e18f34361d7df5ece8504d456627fbce65abff437007e9109359538a03996e35393a40f0586f962921eccaf
+b7557bc52931324dd4c58d0e63c89a8dbdd2d00d0baf79d81d7a062aedd2de9dd743ea30fb031b18c806ba03175d7e1d
+8e056b842a9af7aeb6c0d113a3acc8bfb5c6a8980fa81869747f75abef76b7fd20cb67694e70016e3de6e7821cde030b
+966c00fd6472bb13ffa531d8eedc145ffb7733114e0f4a6a9fddb34ab7601f6cfb056460f757636230b692453d8b31d6
+a25d85947c6939547fbee088e0131988053c5bb23aa2bd48ca764f4ef2b29235a817b8918d1de6865695977a95711e9d
+958567f217ce7a6d74861777801663d7175eeeca8ff62e240582fb603ac91dc402331034fb4855632352df2328fe0233
+85e53f3802a7d32dec2db84fad7f8c8fc856037cc0cd4ef9a8988e97ab580d4b929023f1fcde7633828b5e8bcdab08c7
+878d1fbbedee7f7ff72eaa3848d7f6bc3cd13b40149278b3afe5e3621e6d1f0386f8ede32971d3f33be189c927bef6f7
+b041e880e4ecb254f6f8d92635a1ef3be3d5d885c751f247bec2d8a016aada6a7fd2f7c599f458ee466886abe721bba9
+920747dac9f35ba0b2670f82c762a71ee9bfb9e490825fb7ed613bf2548ef4ea00bc01e9d2c952dd9c56f3586a3ffb49
+800005cefda1ddb860fd8974342fe315d227902dcb5f3736f8b9ad1fa2f8fbeff8c8ba0eb3f0c21a6706f288ef4bb13b
+91f2b822b728fc5d1f15b69a303985bab14c08df5e929decbfa5aa5689f3cd93ccfe19ab10499d31df9d38c84039e492
+957a909486abd85b1e627a4739c7d212cd03f2b62952045b704c415acdf2e6c0cc627af93f382836603f33d1a716ac7d
+9733ec7a30ed833cc1e7e0ada4badddb1cd1908bcbd3d4e4694576421c94090a9297aacd7f42d9d305b87d711828304a
+ac2785a0dadfd246fe12b63f759e9f021006cff4f06b2b5a9986f0b02a40f29513feb1c9044af6e27d1c5029b1e1db35
+948b22bddf55f4b4bc26892e83f70b882a0458582ed87fbbc81bbd037c946d833c19162327354240c42e05cfef55394b
+a49c5d81544028d56f4caf8699477bcda589c65f6754dd40a487ef88d93925008dc7fefa6d458619d51a54b3edb5e5c4
+ac57b8ca2d0623f5c4137cada67afd6935fb75fd82567f2c57cb22e89a0562d3c0716d5e903fc06694a8c2edbc9a6f1c
+ad52af6a0cf838bbca5a97aec5d87fee1aec4fcf5e802b8bbad1b110c31ed777de0b0ebf74384bae68289af20e351bb3
+b0c7c48d734e5a1b37674465eb07a629dbdf8f9080c44a578f3dd687261d9d1cc5cbdc084488c745c9114fd998bfefb2
+8a2b2ccd4c52d15bf7aa4a8847b8015bd53f58ee484589339b4510ef08a27db56178c15b4d79a9c6eba1ac0b641eaa61
+98f659a37bffd7a9b7759bb111412ea9e9eec483645511590f683064eaf15e1b101b5eac3b98f79ea38662b1956a06d2
+af6cda3fb2479b6f2d959f2d03e52b49afd12bdccd7a65a1bf6b91e345387924d5e355363f79bbe32a4624287cf4c1ac
+a24d325d8c2dbf9d2e346e3504154018937efb74246ee0658e68d148d9ad0f4bfe348ea9bdca77d4467ea1b3dc2fae5f
+81a729dad3798121027c29e9310d56e36a48c1c479cffe674cbf9131c562f541d7e6c52c2718025d3470b05b67cdd321
+95bd5cd6d9895c775e58cd4296ebefa51ab9e324418208c3c4d073be59410497a4d0daddba6c1e7373abc08e13d32b89
+809fa97a229b056def6b548902d8d90c873e496db6cb1b2d448709b9ae08d9b9762559666cd96b6bba396eebbab4ea4e
+8bcae63cc680494606e44037a3bf6dc7bae2e723e5ec3ac0451550b8ca7914ee1d4bed0f40adc3dfa45f8f80a36c11a5
+b3474711a0f933cf269e97e4e1e98762ddbbf49dd72e468f1e8a2f89514c1c35cb8db32d08dff50f93e50db43bed54f2
+9788a37c3d95310627deec58ba6d9e0324618469275276632a3fa7841fb127c8fefc1b7392064f2eecb508056bd346c7
+8d031fdb156023e185fe5fcac67b966baf9c098fddead4a6f1a3cef54d8e912d0de2d1e1d3f3f05da538eac4af5b6973
+a5efe72b86a714dbbae40fa69fbccf41042e0647d177cd60275700257aa583708130a64b2f9dcacde4fb636b5cbd5aac
+824092ea32eb7a8c619182d926f292cedce7ac3d3fc64f60d00fcd767649e1d6cffc20dd9c1d1c8ef6f64be315d1e2b3
+900ad22d3b63376b1ac80c7343a58df23c03c4e7d6e5740dc10d8cdee793be07fec09cfbdf29e1d1c6484d3077630d6a
+826815005550844ac5a6e831de0e25fadc49aff808cd601d70743d4873a341e3f0cd40d490422c87df3f3c40921fa723
+b39d189aea740c52b03660c0abc8e796cab72193ed44a4b1f59fd1ec0e283ef7d5e157ed23741eaf289cf968597c0900
+968ed61662d1e656e039900912ab61173b49d2e24aa6b7d3af07c3b04a2c89c4516540934aa543bb48ee14153780d10a
+a433b8b689007ecae7f1df15d442b0570664a2db6318de66c6e5fd68884615778d296bd260ab7d07469bfb5f6d8c94ca
+a69ed4a0f39920d1a62a01214daec143fb7596212e2439583df9ba508784ef4d2fe86334f0f9a6b7a3342ec0a72ef15f
+96f260d9cd88757e7c45201d57bd816f1cfd37587ba17a64997bf7716ca1c2cfe16a7119c36acf1754231f303058a9cf
+a51f2bb09d30028eeb0860e2de38094623e5b5514fd5d591a7d4a9731cd4b9c4c12c5dd6ef409e009dafb10d185d5346
+8abe821036140ccb3ff9063dcb5e8b8724cff1cf0784b8f44486c8380fc51715cf55b443cc20870f426c4874be93caeb
+acd73facb964d9012ad12405dc866beb52d8de3ef81fe966cfdb14d22a19bbd2e7ad3a29cf029617b9d6510ed323c6a2
+8f18f6883c8e4741cd6c52e0d3335dd71b5571446ee28e8c27cb0625f77a9f5bd0720d960e5e8970257907f503d58a9a
+b66457a91e7ddcf56c8ce4936a209c69ee53d71236b72ea386f7719c8b8c9b4ba4ea19039a8de17a0a869da427da42e7
+80b1de58bb3ac5f264e0273061f485e49413de604b5ade73ef81bc249f5e89ce97dbec7d99b088b5a2ff65c0bb93fa76
+8bdf276c88f80371ef0ef7e1224929681629aaebc8cba3c0db0b258be3c26cd17268f56369832f564b1679be33e98c69
+943cf6fc88678816da42e4f337c730eb2dd59f8d738ea638a799e8b77214ad7e74723056bae96b100f9a972155885d26
+91c8c1a8a61f47119005869c11edf0b69d0bcf40534b82e46aa96bb6107f940e582b6733f855144accb8dc21d79acc39
+96ba98bd291faa0904ca0398d6c50eb5bc2ab5a389c359ca42b8909f41f4fc37dcedc370ece777d5035074a597da503e
+b4598e6f889d319713a9896161a6c9bd8575ca30c21d3fdd37cff15dc0141ce28dc536f73957e6fc8f6185fc0adb731d
+af1ed593a0547c26ff729c159ef14bd0818f25e7c1c6c51ce8ce5425bd2526086eff9fa3341279daf82e480bfe431230
+8c02b9ad3aebf156c80fec9b012241f3794d736adfbe4a272faf505ab818cb121ad2ad7c2eb1716e252d0a2e7ee6b246
+8d2a8a31784c446eff4c2ed7b004009f08b86c87a4786a0b7be3df36ca9130a0ec42a58d09dfede1279a4a6d3d37b501
+a78b61be13005b1718a3aa3deba103ce71e1ff73163c76815f9cbcc101d993f119ca128a25c51a12fa52f46550c4b609
+b990d81d7aec9fc50d798eb8c38b40b162004f78730e9ed4a103faeea0995bb654893e557e5eee9b74046ddcaa70617b
+ad56d68777d0ed53d3331b0cfd44503b27435278416ac2268965d8ef711fdd819c16ef5499d8d7fddadd229c3d0d4bd6
+b5110140b9ee542ec03c945cd6180ab1af205537704fd408fc4490d799d87a3f3aa0f1f0ae9c8daa55c1757f7bb53cbd
+b7d8a4080c5eeb00be4540a00e65e744f4c7792b518c9fd2dbdd25abd0dd89e76563618cdb92e4cda0fe3ba4597508dd
+a880b33af98cc0bd1065767a2600145e6e326c3cee25602dd22d531c26c4b8543f846fadf679e26749c929310779d858
+941f124078990e03310cacd79e4a38667f4dac4dda4dfa3173a03c14aafbf538fdaa01b940fd5be770c1cde0a84bfefd
+b234e9d0f04da6efc5aa5c77bf71cb05001cd193178fdd546e4ec81875830113d3d4f1512e7405b16d0b3aead285999d
+b857bf6f62c4b19ca9441f700ea6676ffa3b0c7138299533ede59a9b9cf9b94295046e7eafcf1d4ecaf0341898ed6b15
+a2b0d74f17d3387566bb4f17dfef214cdc6b61dc50698fbbe298a7e2f4a82d20aefd719c5e82bbf4ba4fee0e2e35b4c6
+b5ffae433aafad3fd51ac137976e2c22661d8a286b221e0107baf19f5c8f2f6c7eac1e785f145bf7c16a497310fbf51d
+a69e9dfb14f8c6cda716166cb69f06879718656c9f46730d94f194e2888fec371a11c9701071bf8690e57996fa91d213
+a1f51ecd5c5d73155013dcf02b327cdbae9f9c2fbc62f73959050cd3a0bd66192213d1f4bb56a85cd21343722ff3f57c
+ab3e54b8f4829f1115694a4be7d16e8214c94387ae783263cfe145f965705d51943176191c706f6211c8be2699dc79a9
+8cd6a64c5d30149ca4dae4fb7e8974dce1200aba9be9c8cf9af5d43e40098746ecff7bcde7ff84a0072138dcd04c2771
+a52f6fe24305bcff685f2d047c9a8d9a1f70c2b416cfe55fc137c6b5b185029f3644890418873665712dba4886e3fc07
+b2e8e3d2ba2d64815bafb678dfc1180534186eca415bd8cd32b303bbac6cfb637b17200aa7cacb953e656ad19dd5c9b4
+b5412d1073b3b80bf0d18f791a6d02727cd9c40a86ab0f13ccfd847bf4e767b8b79aba3935194398da2c9cf17c6bfc8a
+8bbaee84aca9089585d5ff385dc2ee6e653d0fcb9088f98bc5fb1c6c83db026d9a73d77c33c6cae3268be90805d862fa
+9691343d1a8b7fcebefe2584b28ab5808764ed79d8f28168a65ca90b0094e7920fa43e56b960331209f4b8465cb8a5bd
+8ea475e12088d558f5cf6dea2da71837791093a622d5cbee608a95b4c8a61296255c1545d454562e371ea0e2cb2e0b1f
+951d6b404667ccca099d01328562790d1e8446231d7d22bc2b1c4c6b15785bf59f2099accc58817a06d24d59ff4e6a2f
+a5d012687f341eb9c783c1c2040388eb7ad662cfb2b84cd94d270bcc99116939aea80440d7ab726f9abcad22fcd90274
+818fb57b7a8cc59f06af054ce09dfef812f8f115eb2473d06c8f20fc50cf17423331aae1f843bcae57fe4e2926ad5aaa
+aad27bde8eaa2e7fb1a9a5ab531eb41f475afdc89b7f02085f7289f8f84d172fe516d0104560a40c89e97db7e5e836ee
+b8cd923efac1b09d9c6b1d97a0c1bce9fe4eba1d872eaa3c0df34dcff2e7ea2354f1b31b69c6b266944ec8cae2a16865
+af628e772d609224aa7cd3eddbbfe965fdae6a05cf6d14959c5c26c4806043afd5fef803091bec710c6854ec095ba18e
+b662e1d32704d96919f5dbefc3cc40e7d41d4124c5865b46408c2ee5c40926eed71fa3df71fa7ad349d476d9a525d7fc
+ae4c5512396f9c26381394ff8e22b1d6267e3d3a5d3fe48457450694520c5e173716572b68fc1dc352761991abd262b4
+86b530978a7e549e6ca014168fa4aeda9438bcd3a29f7edb1f4e9c712c16faa58b81b028c25a8e90b421b61a1766d7d7
+97b32f1371f76dac7a449295365780d1bd03f290a041b3d19db3f14bee6365a614ca356e7cbd6f966260420b451f6117
+8be97569ea08d0b6c4d46e9565ae14f79d1990f192a26ec935a865cedd6bb5f69f608b069f7d645877c5081fb4a68c54
+9733488f48de05f57f623752b80b37c91f6c9afc0f9b4df4cf400f3f82b137bdf06fee82190f2a4ad4aad20e964cc214
+a794f6dbf155666056529748a792be13011bee6ca10e0d55c82c3e84c5dfa1f370c8e8abf2971a75c73a4ddef3da3319
+95ff5d16c0d9bd679738257a1f7f309f257c20469f2fa41bcfadc671ad65acb249793defab591f515bb3d8072e2e05f3
+8d849150bf8dc3452839256ec4eb65cc9ef87aa0f90dfea4d1d486f16ee855d6c480a8fa4b6cf8d536e435f9fb7bf507
+b61c29121dca2bbc6024ad2f487bb57b926786ae60a9e7a721440787752432ba9c7e1df86ef0d74c2592d23f0e89326e
+819630a678e4a5e6adbde9b292f5c8f2b6e3f2ecc9bcec60ba0f8502e503f697b0ded4f0f7157b60ddc976ded66713aa
+b3525b071e26babf669ae2b98319b3516c083e797d74bd5b9b0e1f67792a2e8ab2c60921812690b5928de66290ff7b86
+a344c6670718b9824ae62b309813bd31984eefb5efee38052cd06812308edcc39fdee165f8164629267bc0e98fb50ba6
+81d78d54738817dadee7bf70a468a51728de0e9775f8779fea5d0d95e55b2004377b4e2db595d420f017af18a384d9aa
+848c97b9413ba6ede751ece925ba57b8f8ae27168c5d46347d39e0232a5eb42069a85f1ee2d30d8b94fde574642be5d1
+b020048c5a5a2d186df628550c6f61a204f16e6eb991283e975de520c4f916badc999b3b7e9402ccc39db5c0b510e2d4
+9298c1aec9664ab3fe328f532428e9b037efe8412ccfdd15e33c9c82dc3631e49f84e0d2d75dced85e3a4e0fd0f3f2dc
+8c4a78841f51e2f8b91defb0a3844933999f9884e2b324bd89a01e482756758b1b5a278289163409947c73106bf934f7
+b328a9db915c4bea1783218c7668e2bd7a8fa62e52d3a005a43590041d34ff388c0555b044ec5ff85368352a3643b7eb
+8a395d89469d374c1ec472c4d571ae670849549d05124907faae5a086519686683c1773d22d290ebdcfb8dab926d10b5
+aec52b8a883f4ff68fa5f418cc91c8e9d08ef324544356b0ac56a7f0980fab6b376b8f567e357ba96b408652b8e568ed
+af80f0c5d50ab23d8ad99c7fba504f2f02b7307b5ae5ff529142bead28d69c3d55f4e2226c44549548fdf761ce30cff2
+af73700803caf7b06f5453a620253731de33a458da01f5790106e9418fb59e7aecf6fc1d1b650e1c7b3456f7a55d4301
+8be3ee3caa86cbe21ce9998fe1c0de73ba6481125ef28e312002377676317b5ac4c27180086fb83794efbf86438ad27e
+a0439d051d06a7fbd5ab83f32f0f95364bc043d9d934ac64df7031223e731d7992206879d567e77f35badcb7623f03fc
+b99de1a16670fbbe3ec26ccd37399e2a23c96813c26428deda4f74dd3afdbd28cbe47e074379f6094b85176f8ab349fc
+8a943a039aa33f38d3887de4e77566d446e87225bb8333e3ea991466c15c6487077c6decb9cc10e5de6af03e6b81a10f
+80b109fb49ab810121fd411e4cb85773a1004af2d257e85ab5b4c99aad8d66e5803a8ca7b95587197e88abaaef0b8d42
+892148bd190b042fe9b7914b8aab073c0d19001158087077a5946690dd60d99a1ef372ac01e372a434d00b0568a75fd7
+a266dcc9ccbda054e396e1605eabde6cf79a028b697898090e9f34a4a4e0b771c121b8d470b14130a79cebc19f8d6e58
+b1ab30b97c76392712b173460c227247cac50597c036f674361c63c3638a4c03420fa5b7efdacd0496a9b83956cf5d06
+8a33c46084f669455ba089b369b9c8493a97c131f09c66f9347873504f35d6b94a09483b2775656ab32a12c7b9766ab1
+b77a7c1402edd9ae448b7a606ba2eed192a9bb8f852b647b6ed689b0a3ccb81a4632edbca4c113750f62643a0626e2a2
+8586e85e3bb07b07a39ecbd822d2adbfbf1fc66cf2377fbe6b1bc38369f86292c6cfdb5b405a0bc4d584c0600178321f
+80cfe5b1b032d5a28662d13772fe112e9b73c997f8ef0fc796576bb39e02189c3ec0228d192c981061dcccb9dd3c4f39
+873c085029b900d1fcbe93f8789d635e3a8fa558766701ba9fee76dcf05abb6cef518f2b56c4ca5e26f3847cf23bfd72
+ae8075937a23505f51a1a26f7f54e35caadff44ffc43465368daa9c330b553cb4548adbdb04e24c3977e35a08841c36a
+b1c7076afec527912f7648bedef633ea0e3b02e5fc3fc495779b93e8a9f64eb503f46a1372c8dcd8fc2572c198112da2
+b5233c4545bae360b07c4411776218a1d9040bad1e788e099f90149c58258ecdf01dbf246ddea48ac8fc2dcde6f34f20
+b62655a8376ce1ca225dba04cb29f1a95d09e1a20b58f0330c478c6acf931ae52268779d6cab87d9074a362b9e82b205
+9684e676088b409052773bb740bd3577bf0dc15d0392ea792393a158e643b165f8cbdd91cf355d5425682c77f2a91f34
+a892744cc0c428c97bc929913ada86c36f280f49bd1603e21bf6b6abf8ed195cb05b22e586f0c841ee02f234731985cd
+a62c089a73c6dcf3f7d957719c7d452962ee851d6ed8c4b57ade8a1e57156762c348fe5f20adf6d6ce47b4e98f93d60d
+91b29be6022d43937df9c597d19e23cbb83cb6f5b764e1f7db6cf60dd9b3e9c79f1f617c3101c60fe6c7af9b5719fd5d
+91d13fe99d7dd7b4744fa2fde41bb51f4edbefb2189ef3ca5d337ee84ca3f728e300aec19b96dee18aec090669c85400
+b17a5328808ca929b794dbf0bf3a3fc318f8df144a892ec0ac2163a0f7c3a4614d7ec433b66bc491c05a286fe986d986
+84a9e84bbecfc2aaf8bd623d79bd4240c630b81ecd55a50198de21758255207238179a345700e65d9bc6eec1a1a1985a
+8d428be451efbe630740449ab3677ce6f69d94d75c5a9d91d14b2493a838260d6418be3d4658fd15218eabe3adfe455d
+af11126224f6ff0e88a09dbc0de6db3c70e3db3f6e154deb448d044100f989ea41c6c0259a8ecefdcf531f892a957d82
+a51716b900a00277aa932bb03fb61eab3bd8e74edfad6153a06f85aece6f832af710f1477d883dd8e48931deca12bae9
+9542a82039c2d3c538f15da884f090622c5af556c16370d21bdd6544208cb17e0a30e511b0af4a618e8ef70d0c43af07
+af76f93250bd7bda2b5e30e6f88416ef6fc8ce0cb614515a1f8d81dec717077209493cb47b79e8b1a62e09e394038338
+8fa8d657f1d584b06d5bf41a52bc2c73853e4092290789df04eb8952c6eb236df601a1c6cc81de420a424d8e748dfc38
+a6e93e27421b9e32b170d240b4cf2710c97b49dabfc0ea25759c5f61937eb3da8d45a6400f8bcfbb42bc9a7ae9b66ef1
+81848c8d66d34d274b21dfc10bb36fb9497a1b152aad64a8f7c874e58d31d5dd5f39e30e6000b6d7b444e573da1e043f
+b85692a84154f87869d97cb5f16c81fb0559e097fc37473bb11dc9cbd311ab91a46b01aa9debcada590992c2473ef0fe
+b565371692ab0f0d899d8139d3eaacd213e7d23d6f5df6ac3409c961aca019ce861fb4ca8317f462be01e8c1dc7af154
+82ae2bda0228d36343f6153fbc41fc5c79fafbc03c99a7926c624dfa28ed0a1d215e11ab83cfd438fe5d85d7fee50363
+923f38a2f839e165fd197e1711ad52673deed9774e0590ff63ff9a9985f99612aabe003b9a98db2407c2878abc6d9b0a
+af8d5e1048de3b813308544705eeb0facbd604a0ed03e66c1d221be64cad35d71748d2a55d1ff3049e1e5053c7b1f712
+a90a4b3b9d3b7c87c34f85c7643fd67dc771caa940c9e2ea81294ce6c072eaed698368a0e8056d7b819ce3d73de4424e
+93a106e914d2c6892fee866602edfbf8d03dea1918d82d511e528b99c8423c260c0d103bfaf9992e0e24638b913af737
+864cb44b1adf5a59ce7baeda0ddec3a0ecedd42923205dfabf30dcdb216a7b760d8895dedab52ee09bb09e999486b521
+acb5f2bc1257c49c7df89837502e699bcb9652567c1716513f258f021755092954f2dc65b9766ffd9a10584bba424c7c
+86653b3a479bf6e10e781e316e61437af1abc988f59399bed8fb4ff128f5f6d53f50a293da58774acd42b8d342e52429
+926b7b90eb7d81fdad2a8a59e13b1573970e15c10515954b7c232c37955755b6758178314439ee6c3b0c881d4092c838
+ac05f011011a354f0e16fbbfb7e9dff03b3cf403dcc449eb5c71067128e314badf4d4dc5dca4b8616994ecdb15909c93
+8e063c6601e553f33abc64f9553db5a19ea794a1f254d5a5f7b8ff2db4ed9d180f68ec919a0f83142c5710813baef4a7
+b6e891dd4d44fd54120b7b8716292c27d4bc8744d96253a841433cf4b07895606db4a3cc5872c480616b863073bf77e1
+8dc623d7928234bfbb8cd0b4fce5c8d9a9db848ab0af967ba9c49daffdf719cf8b55e1dad0b7e421571b8770cdfe9df0
+b5b53f7d6b5d1af75e5a1720281feefb8c9039ef7f1e1969d83bed5a2f73cfbca91dbf4fb8179d9b0d3bd06d1207089b
+a5dbce9e6db637e053b4b4d3df07b724b50d11eacd3327ddfc5aa8f37b9a5bf628cc9b428328e16cacc552c1dba505c9
+acb82d6c9af9af0dd426a07b1aec81b388b61042bd601546cde248730ef85a09016bdc66dd014447fbb56fdcc23011a7
+a41692e96f1d775b3a9378b3634495a8350dcfa52b4b2b7773b39d36f7d349fd5ee9a2b3e72769ca98f2319319890216
+a0b4bd6a68ac5735539cbbdd78ee4faaef7d6488eb7a11e091d94e315cfcc49a90f204f636dd8033857378ddd67cc153
+ac3dab32427b0583159482f73f94236980d69f9f8f781b93f44aeb43dbeaa740c77898c38c57677b42c248b9bbb1d673
+a6cd1090b97826486f59a056ed90cde29f2ed821211391f2f16e66f1e8914398348cf6f0df6d3acaadab31f0382bb5bb
+abd1252b722aa56010e3bd4119f2a28a852e9ac1a8ce68c96b6da9d00fac0c9fa70e67cd4afd45e0a8042a810b8e0a91
+9194b629ca80b3bfefc0144553017343d0915aab59faa3d0e2bb3720dd3c8fe07804be6e582c6d57c764be96cd40f2c9
+b6bece03ae1c5935eb38b14f0f64d9d0b4410c02ac309e085a233c74bc3e67ce63edea56ea37f4532e8b864aecacadd0
+b753eb9184f5b30e77bcb5d3487323e0f1178f1ab3e15130953381272209a97c3e8084e810dcebf1ea7b22f0a90b9c77
+87dd4a76955bc98326823cffd653fb7b7eda5df1a971b72ec2a4d25fb3958b9d6092369539361069e7e4f1dc9343d929
+b0f1e8b25a2687d98cc037272473b4e3f33cc8d49a3c83a335d48b8a0d3ca5f84e8e2bde304ade6f7d50e5f3539d639b
+afce1c0205adad1ce52fcca71a99cd6df9da5b748209c2ed1013b5b7d484b937bfbb26db9e9f8e77c081e0a0384114b4
+b363d31209c075b94441d1a8ddcc6bcf9eaee78f8adbf0992d5c7e7d638a02d58e19203247443c35d700fc8ac8a1b7ef
+a0aac7dbb08a10f6cc2c6a4d37aea6bc3dc034d933f49de3dcc79bc0b7a011b1e27df7cb882d155287436b72092a1da7
+86dde01fb7090c80fb404afdc9ec64ac40909b64c4e16460a4c862c3a3f857ebfc0c3122250306c266cb1e9f9f245934
+8b3ebbbb0ccc466c72afb4c27ad99d2d4e98b5aee9c05bc283ea3332e5f67a3d9263b71d16b20db31ad4d8f48174b0d7
+8610c492ce130e76c06b7e0204617087ebd8f285cc3f007897c253a0e1af50f80a825ea7fa3167f882e146402fd342b7
+b17f04a257d3142005b8517dfb57d28661604eea9050ce39c60ba9a05d23897114c59c55af199ed186034e456e111cb2
+a04cd806847686ffe023db1721fffbc26160582c239d5bdef08f4730e2fbb64c341fbabf1fd831af6eb84a113ad7e2f7
+879018340deed1fc762e1b8f3a8b78a40539d6f917215621b725c0a3aa347eeff60765e5ad6f4a36bbea51ab77f88726
+b421e65891dd0c6641e8ddf479b065163897a418d723fc6dce19046501e01c616bd19c9d5fd6b395e65abe0ef956d53b
+89350af1d432a8c209b69f937d2aa20a24d5eb95c5b4cec097ca3dbbb3ea9efcde2a8c56c58f8d7901b96a627c45df9e
+a32d6b31cc9efbad4bcffd8b0ffa46b8fa97ddf3453ed151d7de1d03a02cf233f07415584893155d2d7e14b9534921d1
+8efad47caa32277eb04137c92def618e0715c1e77b5053b0cdd60fa03256fa1c9fba9aa86fdf1c04cda9c5450863d58f
+8dff9d309f7294ba750158e70474c978d1dd98739df654945f5f29fedc607caa06b2866c93a0c7b830ff9b26955833a6
+84bb00fbaa4358a2563abf96d2434e4a26acda87b189cd8d2aabde1323dc1eb2eefcdaba3b90e9ad1215ee469745b72e
+b75acb924159ecdcf49df587d5ac1b1b04291600a4f530fb7cb6231e7fd1029f8cfc957c891a59182518480c2947f472
+8d2c671ad0d442664a0cf267b39be742b1d3760935137e4c50195695bdb99254c4a4d5830634059d96dfb2b4e214b067
+ac27b31843caa8140e729a01e7d0229d7c221feccc89ffc173c11a419af3db0f8a47a41cac358e15ef41f679a3f0b96b
+b0b3e33c590bc00faeb83f4b160748fea4fad3e21dfa324bc14a138ee8c5e18743b6bb27cd0ad7c7c28c2b3e92040b0e
+b0d2882c5a0a21fe05b522f2e8a4f43a402bfc961874deec962a1e3d039e411d43bd3d95a26d930c2509aec8ed69e2e0
+aded1e47b3ea6ea7276736fbd1896297b9ead21dc634d68ee56c20fae3da90170f30ad0642be10929ecfe7de5ad8ce5e
+aefe525c0dd24d6c0a66b43ebc6403ac75bfc322d1a22f76340948cf3536d2ae87290ca80acd3e55d2df9aaf0fe6bfcf
+979d1510d3271ff1f06d9cefe30badaece436fae8de70b01ac843850f678aa5f48821dea48ce1c363fa35eec37283f3e
+b8e8d10692f1bad943052fc366291c134a0fc7ca4696feb216aed46eb32de7333a9ba4f553389e7e58c8fa96ba023f58
+913353bc585c0248a54d4705b5e29cc778f304472446eb4baaf30bafa30f2ad0643aaf21196a6c4d177b11eb4e2ad5b2
+b25a0e3b9f983c47b8faaae8549fa7d00d12d7145e1b232d1813ff94058ed603957a340beff25711075cefacde767661
+8515151729ce9a7984af3b94f74880a2402ff853b99f924d581fd3935d8ecfc80e2a1185918a5b1c4902106bd1561ff8
+88e4282ded5e2163874f6464236d5bdcc3c484a0fef8ed0da8d0177973e8175432b75afcde2a4d7d6aefeaed52fbeaa7
+81c31113f2a5ff37250f395d6722a43cebe2a267a0ee40ac06faccaffd7d6eb522103f0431a325aa46a54e606b14de84
+9302ade30ccd62a803b9610a397661298941a644b1ee9d293c63a6c3368fa3557dcf6bfd0c9b44c5c2a6be06d1baf663
+b4ff9f1f6a2a64c50b0a16980ca7cdcc297c6f93e11c580019de52f58381fd0f60a66d3e010fa7ab56bdd250e7b2df2b
+8e57eb61ed3c919dfa0f0cbca2cf559cbede5bbb1e89ae4849b380339cb1c567c98fc2c671211fff4df1a058d46a42bc
+b3d5b45b4096eb088523d16bda1c6aacda01473533314961e6a8de36ccfb35d4b717eeb1ee1bce47ad3b80e9e5084d4e
+b933ff4d3c5a77cd7cd32926266d4f05198178ce350f7215e512e71b07177ac1ff89ba183e424138e1fbf088ecf86c24
+8cf430a6e4eafd23bcb5ec8ca3d711bb56ae719c8621ecee964ef3bae7c53044f7ab3d5d0b911e09c7543e56c1e82e11
+8b3c34f5321c9ed48024196e1e941fb7a5975a045a5a9de88d7f200fc7ffaa0b3e500ab7b535e02bc5c35fbe420e2c3a
+b3c235b65fbdd5c4c2aa45271b9e51674f9a0383a8ac383b0de53125a67c87261540a95b8f81ffe67ecdbf3955b13814
+aaa93ce79ed6e7084fe906c9a1002435ed6829ee3d1380681b902d35dc9e5a23a214ae12dd4fb76691b0016f28d43651
+b4c9533e50ec58f75ea82e2aa7f735c4257bdc1ecd0da0b6521d1442fa61f19e4f73cc90972b47a762f5cd9af591d957
+ae0255dd70befe7eb979d41f9a7407040937e7a879daa64353c66d524d3d3cf1d5e854886a6c32c142f4673c56a4df1d
+805fc5ea840d1c2e6b35ce586309698530f056b41de7a403d9e7d81efc2d7068976e8e23bc0b9ee256f39b15bc4f7ecd
+a8de5055b6d2310b6ccb211a397077b211683b05c7e68e55ff05b546c5c81522e6097a3c3b4b4c21fe06667071beaa4c
+a4014d39b23c13efb4326956c5ee476b1d474663950c9e3e45aa1345037be862cfa14aa1d03bb388085bdb4ba9d70a59
+aebe9a9ba34d6cd3692a8bc0b0aff5648e16b36d6c123e636e9260386642e29d52ba71ef7778481c1b1cfeca7fe6acba
+b59706380c9271918ee16a04e84e91046caf99623a0120aeb37a7a98d4c954d3d880960086de6cb180c8b922ca1d7405
+8dc0713371808850f2137a89c33fd55ec2df6a028e22b2679e09f7084d5c471451187f6488fbd9b5100b84593540e5f3
+b492c55e470c35c7a7efa536f3e7c1e586b623c6669ba6eceeebaa1f81fe3b8b927c2e522fb12e603ae246d9566e4d23
+a5148eadcedab9ae08f5db6265326fa415aef46d0b24155910210338500be6d77bc9fa6f6e284a4c2552dac09167e450
+a0af7b66c8a1319ffbe7a0180795b442cffde153f9a871046d6bdef959378c3068813c516e280371825af06ef2320b15
+95479ffc4903f252fe58632e833d63d963469e89744d5c91315d38eca21b98f1ad6fb3ca77d620a6f97d9ca3aefa1f7e
+84861bdb5880f663a5d9b5e89b59a940611a233d82a9895a330464f7e9b7a6965c2420704f3adc61f876584d06771f03
+933c374f176381a3a63fa98d238d3b7d337aa745528e271168f5b550fb703664c3128097b927b5922b4ae8fad30d5e40
+a3ed2c5080c52ad1235fd93c9bbf128b48ba8abe364247104bbf298582930bf3faaa4f4b6103062a4696e68c44f79555
+94668bae91eccfa8ad459588f927bd1a169af834a76132b2f2d5cda26a91094cb94661e3c59f7547b290f827eb43125f
+b704404a487a7dce87ea8207dd5d813378a345375e8e2c07de349c1448a39af8672bb4436779b3485adc46df2212f409
+9347dacaf6dd678574a4f1a95df79369e3f5543c565b1580f907ecfd17b5d6e1ee3322d83601cbbc6d6ffe0bd2833a83
+92841abd813bd9934bfe945e428193e33ae6d4dd235a16edfecd6e4184abefb8a1f85015ee83caf9532dda380fd678b6
+95c14a1d3a1e1ea18f8a61f34b85ee8a794c95d3b4b0ce6ffc89013c9a80291a9a2487b00bb3de51ca2e4290fead7482
+962fb52a2134123ca31d91027fe9fb62dff4e0542c66b55899a163e50f6ff2c4c4b9c1f5b5b3d6c6dbda40e757c0bd3a
+8aa06ae95b0ff361dea2792e465436d810b86f803ba6121ff93fddd9ba60ce47e846eb2d248b28f2c47bccc9457c1ece
+81adde02ddc49b6cc89561716a839fdee2879c78d1ea0fc0418a6cd4a2a8189a2bc245bf2d1e535dde07e93b8a5e18c0
+a7a5713055455728d6d982a6650d1edf1a3b4612c9072ee8ee0bdaa3992963a6fe91ca242fe36f839595d09f6a47aaa5
+93900cefff6f918dfb12ccbb256adec89fb8da019324b811398eea03f6fd34f28a6eac2ce5580904cdb289879bd4b4d1
+820262cbf7864213e768b5a38f39d27dcfa7baa5abca557ab575b07c33917f7b0f06f0a6abd81222fe8a5a69d95d774f
+a33114d4cc3cc84258fdf252e754c8bb1feb6a130785d35a78b4b05d0f782424a5ce0f34be3c1a14e3bb1bc0246bf0b6
+b966ca0a11f0361e611ab2a8907f78a3d639980cae405d380f3a080125c734059acb08431a42ef3a60ae9331a07e6a5b
+9305d107311654ee727182a1683f322a78fc637bc214eae311f8778773e5bc52063bb0a902a5a962a4a26fa0cba3b06c
+b3dc808231c75e681aa2bc4358c41f01e371bfa5bd504e7bd2282e35e72a2889a51747cc008dd4d8b2a070c8e4c2d7a5
+8f05cc76848367abf2020461b6bcc1ecc412ae9f114d44715875f25f34d8cd26b84b01fd6c0640648676b8d2d5120814
+8798c23f0ca8a7b23152ce17086f31e2a80533067f15ab4a7b43c127a5d8af3297115a3cd7978ace811fcc38805abccb
+99a917f54253059a45103e15e92e1bbdb03e80584a85b658f231aa5947b29388f5b04588de1ed6de998741d360015313
+8b0ce3f6afb5aa83ff229ae1ee0f986ec4d31b113070c7ef3c1ca3613d74e3f23cc1cc81957bddc709a5c5bd85cc64f1
+9035b71e4cbdc7c410fc03a85543aed34a1c0a98e07ddc933e64886f1796416ff3a0f7754b5246ec93d617aad0f53d5d
+87478f69c45394f94c67b7196f60aca42823ad92ea86a427d705576fa6a9bead40b1a4106767b8a20411e757f8762b68
+b36901adf577f159b4263821a48fc5888e7bbd6c9f3857968a9cd02e1a1a788c08a566b7bd5bb6be294fa5ab92b4ff6f
+8a738b1392aecb35a5a1f12920522997c9016a0455354e41d2e1b81d8ec9b30a90f71492c7bc122505b2ecb0654545ec
+a5a422515f17f2bf4b9b6c4b5b94df27ce80826cc3ad2a8579eb6666c67a96355e60bf227b36e1f082d749ade7a38a92
+b6d0e36a98e0518b14728bfd79db76c408f58220111e8c4dbf5bcfbd7a85bc68022456196f07b9f40158037a3c3eb90b
+82ad91b812d08bfa815a93b47bd3656b493853bad52656450eb408fc915e430192ae123fb9daf4aeef4608800e818b74
+b8ae5b30118dda7b972464e14a96853147c4b362e9cde22130250447575c0d8d05053202db4c650467dc16330cb54b36
+835d913a3d15ff205497b98107eca77058beebe1aa35ffc20241bbc2a9b4d2019ba41fa3c9b43fe2265a1110b5c2fbe7
+a283d88acbddb50983356f2aed99c2f153b6a8f489b0597d8db08ff7e3b04392609e01aceb37fe985f59773327258195
+b6927dc3318931eac59c6e21def3ca79154beeaa4c57e11ec1f3362aeb33445366dae770e533aaf33c273eaa4f54275e
+a6033a62119e077b438e0170f27835597e21c1d6e4acbd53fec7df69bd1372148f90966732fc5c004857cdd44b8a03c2
+acc764a116e31d63f534b3e0e42a3f899d817d3ec32fb4504045bce7ba3a952ddc81a33d48c5b0499eacbef4268bd5ae
+af5d1f6a67dc6361e19f222a24163be388033a3fd0d33ad204f4411302668436f933c4a91c6472fd4262397417e3c588
+a2b1fe93eb481d4fec6fccbd64945a12cfeca85aa8b8bbadc4e4ecab2f3ef65616294dc168d6c955744b7c6acd712012
+acb6d3e123572ec20d0ecceaf4916401874f0298218b36a0ce089acef90329204611968c7397c2a518c0a78d02a9285e
+88e4457b1c9b56957b76a08e98c569fb588b081e0e420a0d859b70296f648a8d64ff35ca61a39d1b8ac3613ea5fdc2eb
+a7d1643b3bbef49b2f9fff326061cc27a7f65228e40929562de73e1c66a9d164d42bfcc3dae9103b2acf27606f18b031
+a66e3b97efb7ce4e81534453d3d41ecd4b5b6e9bb829b07b5afbf11fc6ea30382a0059c33c97afd906656ec19432830d
+ae9a17d0044abbf3e6aa2e388a986754d6b0fa35d115e410f69ad4aa114db1af5dd0389222b838cfd859d436aded1b5c
+a4a66a163365528b08333f15c6673ca48d7a9b6d17822f1e5390fecad122bcf7ec5656eed2f22fbc6ccb6dd96ee260f3
+b7dd42c938c2ec50c3b3fde92ff629a571e46f8ce128fde7c2d8f18796ba1b1d7eaf7337212f55cf5cfc540c7d2dbf31
+a36bcad22f3408b3bfd45d272f3387cdfbff57e014226dcd1db54bf3f8d1d896fc4fd16640b5d1484c9567ab9322a37d
+8c9831fd5f74ffac203aa6b6ce03acfde8a2fd939b79236a01931d28b424fd8f6b6e44522d28e086aa12f0b110e5688c
+b48bc95abd331d901610335299580ecec02a263d2b03bb0579cae3aa87ebf5e93dd110e7fa4306d31974099fe6e8f58b
+a15e27a87bcd8ba69ebfb6228c3c48e19d79b22978d3a63af553b3083ad13e48dca496896cec195e63b8a4e2c40cae7e
+96f3de6fa492dd2d653888311bc918ab832d6342dc7af9155bc7070004e89ca940b7672dce0a1b4976a7c3018f13e49b
+81a022bee3593997f556ea53e2ee484188cfba0be4b831ccc048ae4b5a6df9e3b4d57c436caae5cba92486abb71813b0
+b9d8e46df67e481c84d5520a9613aa92750c8e8a1e8f376b8ad7b71a3ebd95d2d191ce538e6f7fde3ac5943f70c670a9
+8f0b52365d944f59d2ed445b6ecc4f88c687fd281c1913912c8e6075c3a59667060b42f2c1589a5955e9f3791e23aa02
+ad07429bab813045fd909b928ba4eaf262b6ea40b353aa43157e1e683b2752c5bf19eea7ab6ebb8daa8ee91241fbe84f
+b90a99ec1f31c43060ef649e047bf24f2fa7fa9daf904136c6a5846d9479966b54090ded7093e481c52d872c6377eb65
+8cb05fab3ee23db24c9bac109db52895b200dd115209bfa41fde510b29d9871907d44f689fa0f5474d12314a711f6fa4
+b00d8f280ee21866b01ba3de3bf943a7d0825ed67db03d13a0b69f54a4ab389df1cb10909e831ec0af8f1675fa7dc399
+b383d14fdc47df80be46390420603e7f505052b1a44ebf595354726f2b487f7f18d4243709d347e1e584c28167a0e988
+aa951f60d1e069304222a8eb0338a94c8b3b4515d7cee833864b6c222ad76f6c48e0346c5603c35a3b52edb6f9381911
+b887070ecae2884109eed80ff9341f5fc514d59158f5dc755ea46ba396f6783b8a86ffd2fae4419cec2ed57f4dfd4327
+b1a6f1e4d25f4aade76714e52bc426beaa7592b975f07d0a6b372a3f94e7a3ab0e8829575bccc953195ba0c9bf46e68c
+aa64bc4e0d9502d294f0d3e6a1400dc38f28e87c85d3429ab3575c821e1229f1dc8e2c13f03080006bc897e8fc3555c8
+8f215476d94bc2af7d2e0eb68783292e314c9a4f812f3065cf064f427aae165990dc9665011af502f5713f3664317989
+a578c8991e9e29bf3ad7be44bce3817e1c4af3e4a8ba3d82643378da78538787f581b9caea7602b87619e5f8cfb337fc
+abe5453b650106cf65bf2b7faf8ff973b7b3be0e6f42983daaa5359dd4ca225edb7228bcca3d71bcb8d77241b320fa90
+b7ed1d027dfa91d0ca5d797295e359bdb1b0221b1f5eabd2ef76ea3bf456f9aa9788dd00ea24fe0add9e3d9b09ae2428
+96ba0f0c5ac0eae3f0031f8b7a87543ac369c22122681cade0ea33a6ca370cafd360ea6b80758476ab94cb07ad6820e6
+966f6191951b998202b8a63e3b10ece69616b989e9695cda84a450cb953acaf9c4f902200b7492eb66cb9ae0cdc8ecf0
+8d7bf21f76ca0e3b3758c293e66e977f83533d918dc445a09f4f38975ccf7220855627de6460d318290daa03a5f5c68f
+b10dcd91d6602852783bb76b0a286523a0942e8eaaca4e0ee5bc76cf19d33bc631f6d0fda1c1ca51bb3d5d5c7dd43728
+884d502d934e2b045357e981506900849e6eb051ca3ecf3079b485b348372496db97da384f8d2b5a52216b4d223c90ea
+b074162e5d33171477ed48f2f185b1c83e8fc2e7906681f96ed97da8ee86be7476d65e61648383c2766ad9853ead35b5
+90bd3d8b475da20c6e32324e30bab475f2059cd81fa67840a6c831026cf3d5806496a3a25192128da4b819c1b7cd6bd8
+8da4889258cd6ffdf1608af8325230f74abe6a2a511872c2dd10123b491cb09407fb979d80fb1185ebedf421ba22d0fc
+96fe1d9137c24fba18b1ac431ccffc01ef1792623bc334ec362751b7bac73c4d4f7e9bdc2d595ad4731c71808adea15e
+ac816ee0b9103f0bbdb50cc05f9c5c8f7ff2f14bb827541c51ae5d788f979c00fe4796b86eb9e3ba5d810925c1f34a17
+b231e98ecb3a534dfda5b40916fd4fda270e316399c9d514dd510f0602cbc29e51c5ed60107b73e3c9721f7ada779f91
+80115e104f22ff2653ba7c4e1cc417dc054663d488f861a9bbec4b9e907dedbb985e6e78f31dc16defa3aaf4f88dabe8
+a0dbc25dde933e6114f2ec22445f1e209836585997b14100f3f8b7e62f5fdc6aa2a85ba5ec39a5197c9d4dabc9a5c452
+8d2deffdeb1f0abed8ba62187f5e1cc06a1e2bc49b3e15f73c3d8e574dfba7efdfb762ab512cce53d7db790a7354c56b
+b73f4897e221927feedbbf209e3d5b9c08f52bb732dc0d710822576abb7ba5ef0e728d2d95c802a00eba925ce99d734a
+970761c7ee891b3ed08253d2c0d28478145d0776e2429c85b4734e5eb7a6416d197d0b1ad3392b37ce8d86fcaf9de7ec
+b4c9e2acb4c05236357be37609abc437612244bb4421d69486050e390d5ddb52887a1b3e1bfe968a90f1695d892ba8cd
+87caac2c93e192c34b5dabc36abe26a844a33bf63e9b01a668c90b70701360a0417ae3248173450c64034685d913f4f1
+a16ac64cd1a7ad46cde1c93024fdeff724afe228818b72bb66176c7daa090acf58e7fc0aabc582ad22486e46f0b96c5c
+936bdd6d67d666274c29765690f4ad9c4b9203e9bc9dd5af558a8d908dfe8d6d4346f6fbbfa69158cdaccb0058ed0193
+b39af8d43ce9d120497888fba0dc95ceeabdd3d84421c1a30fea226e03b78cadca0eee57db524f6ccf1f6235fadd1470
+847da75509ca07fde2277aac9e7622c5874256903a92f7a56382ad3f79d1b3b0cc0b06b2a6b2bd1749ed567e68816d31
+969407bab3f8106a49be63f17ddd603e185afc1c9fc0ca0e90ac415f53923e3c6a69fe488d33403521231c5008bc11e4
+82e25ef35abbd9b98c55a45e7a71791925639afd92780e64a154ad8a94e9807f2643854250f30bff1c5e8806632778f7
+8e6da5cb8cd80d6b8e2321ba3f034ece1813a7b6ee3afac73371a51434a3e66221188162cd9b9ec035326e7e04e74b25
+9868bc3e60478fd0ce37d35e0e4f7695f1ffb7cf2e05842b3a09e832af33c7ba48448935d425196fdaea9c3e8a5122e7
+ac7733adfeba1da388eee6540a127d0eadcbd23770f2deec39edc0bfb1002beacb9a8c7106baedb22e664f37771c1410
+912581c23e3ad0d7eb886cfc22633fc704e530b6b4977086f68f1d9f839bbca3bf0162acede87c853e8ad8137b5cf345
+a0315fee6285a33d4ec60f6c1557ebe4473e8990ade0feff7e008d3be1a709f5f486abe784398734d9ea1193929697e8
+a44a08d6fe0a22849a8f518ed9b30b78367de205c3301fc8159ea273076488299b35c362530436dbb7e21b6b9f36835c
+a591ea6ef83f2ec78a402a86ae5b82e330998e18ce66126a89046f169dee58634dfc531b1286277eed49f571df5202a8
+a60d86619b41f59b48c800a302775656266725b44ff8318014fb668f331bec82b3b543ca848a7d40b2718f29e5ce6cd1
+9420d0219d407583fff43c560964e1da06b105043187ea156771b1e4dfb5d5851d06fcfd819c7d8bb6568fa1bdacd916
+97ba0b6731c78eed331530be7cc374a7f4a7cb2144ac73b7c000ca36036f68754d4edccf73ce373dd6c6be55177d89d0
+b4e07b5c1376900fa2dfef8fd1a5a4b6152df7b805d5efc29057d1df2343f8bc841284ed23d2bab5cd1431fb95f71b60
+8017de31e62a24bed74460dbdde1717f3a9cc17e2e2ca9848d77c3b5c364e7e1d58ac0eabb3daa2b7336edcc8a418b01
+ab6e409231b778bbc1ab74c3062a376c5287c0cbd7d19d4ac1d5da1a8d0571864d0723944da72581783cd7b6b0d529a6
+b5f2fd4ef29a2ac847358abf2b3e7a3567b8653a4b9ed8da70809f2affc6ab44c65cd17f255db0cd8315e4801bb1a408
+91b61d5d047e9c672d7312f563b8da90d9c2c1c1268913656f061028748a351e116f524593b1be7117a46f168b3e829a
+b6c10b09ecfb92168906191756cb824694caa32c6f2f9b19c51658d44dc330dcd344e7b04333392a8a93c73346a3845b
+9431d01a121e6ffa15c32e724dadcebff65f806c11717b050c106c0c80e43e622130f41224533d13be4a8d14a66ae1e7
+a1248085c85855b4df6eb5a02df0dbd5de5a8a82656e1a5f61214885fcb75428647c8545a848960701d61c3002840647
+9867caba8f4be9483df9b48e2bfa024e79e6797adc2198f2b5115d7283931fe4cefc382323edfa1e850c3970bd1a2d53
+89e88c50c43d7e966e60d49b3afea792429563c93550b10584c91e4a827a3617971eb286c39205e2af4e7dfbc523fd8e
+8ed261502f95814410fb081e7348eb09f3a3df22cc3ca82a2f071abca0190e9f041e8714b811418caf7e1753cf284e9e
+87ac65370073b6bb85a945e138e4d0a5d71ed88739f72b9ba747d2a03b5d4877e8e526026348d2578c752bc4102055ed
+b07de38d07906dc2838be840c291f467d9b695c62175c5afa46d80f34674d061107d6fec6847ba5f17f2d8729f31f5f5
+899348bd385a7c3d38f9d740001c9a543dd8496b58807a6a73180c94f3aa5c15a56cbb85cd7124458e2ae44a454a8a58
+91b70c3543b8e21cbcc8a40cbe00cf2ee0372ba9ddc7f610b711a070110508159e6a52e8778b20f0194ca09b109881bb
+8ab84d75831ec1e708ec74eb6d6de2b13bf97e2d2262ece39e5ba5a4a3049c8303023e40fce5e87b237bb1dabfff5246
+914ac70dd91ccb6d7b83a5ed0a9250c66e77a815aca17416f1796fc0e1c26bee7acec5de11e65061a44d2d9c35f5d19a
+8867260f8024f533fcb75d9c3f2ab113d349504b40f650a2c92bb46aebae3a55de6a113cb6387bf00eeb2bd4719d87ea
+9976dd4e56b16fe11533dce2734e2903a3ec986dca6540bd9ca8b758a59a1e45b1e69c0b8f094d42cf7e015363ce37ff
+b48c840786653a0f3ed6b07f8f980284c5eb2dd22e9ecd5a0566754a1534300e129b39a8a6d4fc48bd403b351e714f05
+b1633aae7c5e5c51a82aa4e4bf9f92c0cd30cc1067b03364825ecc492fa43391ea075195f2f73b99a11dc49f670c0e89
+8769a592f503bf8ab03d767524d9ec2223c502ebf15b69eb4b3d53325ab366888afbb668bcb380230b5bd74b32d90a44
+87439671fda66bf5989fe1fa2aa32519ef908aa6ab3eb34eb5b7d908e9a7db2d679170cf3fa0e0a388a355b8c51d306c
+ae1ca219832c90554a91a7258ca5598f8bcaaa7059c574803b2688d8026df9083985c2f8f4ad3aa9b122efe64e0b2481
+94916e6dca309d9c7afb9aa4c0bc89a3de875a8537cae1fd32258b34782994e5be5c4987577d697ddc86b8d68dbbcbaa
+8c5361b85176adf77ab1949d34edd562d8c16979e33b59d09548ad372b8c913ef385166bae53c8fef814a529fceafaef
+b968172a6a831c6ae53e876dc4ef8686879cdadff0aef4147c4dc3ccbc173f89748b840a30ad393eaab69e422363bb86
+8fabda060f8bb2bfcd675803ff0a3f834e2356152f88bc79c23f58fbfa6b0c82850f281f7b8fd2a5e16230aeb4077320
+8e5c887c318335c5561e63fd3c3f64edc669c0b03b217e3ae40ea29245885442864dde15751d7c6ab177a91fdc1f7235
+b2f67f9d64650c6b51b88e7ee6d6a796b453131c93a7791cdb2d0a4922d3c913a4ac988bac5b4b9bfe61469886e1e7a4
+96b836824dc2a12ffecc6a053f7549b7faad9808e98bf20f3c9146fab05098df56fc2833a6002eb39c935fd8757d4716
+a4aa33fa77b62605f751bcad91333659e9345967845226371e5f38d5a7f72405d0e30777b485b730e6c62d8216790cba
+a041bf3467320df4bb7baee569cd685a65c9d0e431824b7de93ee47ab8b3ab20298d60746fea7fefb5bc82d3f7e25dd6
+a85842f11f490bda22e9f73409de0909a2e61efc6d8be0c3f561d881988b4d2e6924ffaf0a4c40843481892b272943cc
+94de0ecf58ef27228f5afb12496c53b075bb347f900b2df98f47ceda8675bc2941aec04d1c8ca0dec0233430f2759824
+b1795a70651be509c0955b07d58a1b8655a2e6c292b939b6c156f0c0983abd7e416cb0cf14afac6ceec85f2c46b83a28
+b6beb936ea1f1639ae59eaf53015dc1855ca0f798d9ed72607edbc6c119741e10af5354c29571af8befd83b8255a8f58
+9424188ceb15c1b470c4bb17c71a37af56c87625e7b7fa752099802673c3a5a99d16e7d6dd8f8b680e89b75cbe7920f9
+b9e22b5df8318bc0ff81003e8208ff3217ba1a84edf6a0b326b7180208d3a9144c6fa54c57ce6d6071ccb1a40eaf4509
+8e5fb55da49feb7a9152528ad6a6766af75cce249eadaaf4806c6d4162f65f3c7311bcf8da72b96f6636cc019546c05e
+a55f751de82aed5842f94d1ba1e29976c3d0146267b11eacaa4fc765da8d2acf617d3a65a2a74aa983130851f8c57d05
+9647758fc596b78fb52db58f2ec31cea186d9d4f68692f56e474961b277396af4a51781b0a358a6a6aa8138e46443a43
+9461f6dc72988b44c662865cdc01c0f970f078637859cbe6314fb17d2cfb3451b222cfb93a5c6eecafd1ddb36de075ef
+93b30bbf4fa0926cc5483ba9803c8b001aa80322addcc866bc514f2a10aa43bbd86008e4671ea26d8e0d2ffd4bb8f2f1
+b44020d0f062a001bd6dca2bc3ce61b17efc7a121a9035709f01a8c34708ed0c1c85cfe98c534189e0669eea719c88fb
+afabce43f35e0d3201b60226c72c30177c4c5d75bac654fd2b58b3ce9de7d83ef01be60514817f1e7bdb525c910b8bca
+a97bbab394253ebb02ba47ad391db3aec1b4d03e88ab3e7505730640558c11fbfce42d53b7f85787cb564208d3dc826f
+805a34cb0c8c7ade28c69dfdde46b7a283e539977602aab165316e973c62bc65396b6fe2c96750ba028c550de03100ea
+a0be38fdba281e0c248933ed73f1119f90e34d5b4435bb704a5fb7c20805e195518a2a424bb483f16500d74f440d4a53
+abbabc7db0a20030c6e687b89162e704720a010d7ac53b9766a9ccb7e02d4ea1926792f5263d715cb97d67f2010288c2
+b9e471a7a433a678090fe4324739dffe238ed7e9a867159e0b43fa80c9c0798cac6b58bc09a389223f94f22fec43e18b
+9818e9a42ebf415c6d970c87261645f876d709751c8629d1ffbcba4abc8e3a2a1db8c4c6a6324dbf433c43fff62803d1
+8290ed53eecdb61157cc458dd081b9e890bed5e4cfb643d11b549b2c65fe68fb981d4311473510781945b0ee763a84aa
+ae730a7c69866f22d8f9b0d8e17d7564c25763cc77a5eb718d5651b9c5198b2b9d3eed1c066f4985b2f6d7edb0a109d2
+88325e421a1be440175293efd498cd167dcd0914c8827ebf64ad86788f1fdeb3c16d3de7a681f958b0f49046c54fd804
+a8f592d6ba7fc3ab8ce8260f13f9c4886191530cb1d7505d0beae54d4c97d09712930b8f34ad74f1ac5ebedcea25dc8b
+81c0853b0310a96674a92a144a14c48fcee0d72a772451ed046c284f16fd6447f67389ff7841d752a025da172d62e73e
+b9f50526ce4bee12fc3fd8f3582f3829b90840f6eba06f37b53febc1d0987bbf58107d73fe4373d79e53827270bcd817
+a2ca28f619d4821f450b9431bdcdb129d4f35dbc2a4976e4d416dbd14e378d4d60a517457aa0343f7a5e60a7e246e22f
+b9576225cf7e13374d3975703b3850251d53ccafc6feeedd07be2b0bdea63b899139a1fb446dcf76f62f3c03beea0486
+a88df9f6e95df995345c6265af546158499fc0d89447d3b387e7708fa037f95ac9c4e20ed35b749b8d8a7471dedeea87
+a853ec333af8f35d51ddd6c4d45972b68fb36219e34278efa6cce02bf8193d72c6014ba6961f8448785b0a43a31a688d
+a1ead9282496e590bb43908dc64341595cd22b844624e02f2daf597f708ab0d336bcacb5862bce3ce23d1a9616fc6179
+b97398d8ebb52535a1ce3a10b2255d358142ff653def823ad9e9ce4ca5f372c6e7c9301588ae5d914b2b921a0fac7442
+8d0d292c7e9122b8d001b3a3323f9d37dca61de5a595f9402ab0e53e941c83f80237a853abe4aaf012a35cf59df48c68
+830535a5a8268d5ce4e7462fca4f809348908ae7ee117312244e0a9c30b09d91b6f798654d8064091078400346614e04
+a44a90d3d307ee3a3c3838ce43a873311789a9b9292c62a01622bb813a02f6defd21b0889cb6dda6d7225009cc6d2641
+a219afe00a9327f2c937afabdf5f10bca0687f48d8f7a2a046a52e6924af613f38cf82454df4f412f5991ba20b7db74e
+b448ed4b15ced4de098781793a6e850ea1547d514646fb8f1c137c86e14231ac4340b308bf07813fb813cd02e47c015e
+905fb68b8f5bc14834a06d61f3da686bee77b3b590a33c640c82f34e68ab993f8c4897df463973d6d9f0d53f9ac5cf5e
+991cb6857dd0b3ee6597aa2fb1f4ccc962cb038228615466964680795587240e6ccf7861ec220a53ede1e2e9752e1cb7
+b823dc0249ae72e2de91108cd4ae6d6af3e464f12a53a46ca583727c7351a67f2d12c911534e234ee187389fcbf1f621
+981ba6bda1816036e75a864f635629a141905a4805c706260e7a5e12b82dfa9de4f4058143065b10a1012adca6b7d083
+8bd8ec0e77a6867057e5393d82132474eba9fcc4bbe025544bab0ada4ebad3d296ceffa3788acfea0a44406e2ab637bc
+93eaca3a7f9a0dc809eb9f604905b0cab18750a9bfa42d98d99728a6de6e0f1e05b6e98bb3b0d9862a69eb57ee2e18f3
+90b077d7b7b1651ac0d723978b3e408191c2b8b08247fe2a7fd69afe0615dec09e43771cd845c2cd064b56295e53f634
+847e8f607332129e95eb1f3e00003b087e92ebf1ac9477304b0d54ea38419fe8581122d21bef8d034f788a9c92f4ec00
+b0301becb003dc7cd56ea7d830bf0fb4b85bdb33606d8d9ab2b70c6415ab5c8f4934bb7079ced16081b8f6d16b77c0c0
+9068fbbfcc95fff7ef79ab64063dd9bff0c40b4855eedb39bfced9250cc351b5b3b1bc6c2d038cb6d59a12a41b3db664
+84857e081fa1c6c08bf7b0bcfe7c6d74b57cbad1b67676e99686bcca0b17715ede19f826517dce3f84cfa014e11909b0
+98fbfd6a94ac3e4b53b811e4d275b865486a52884352ff514889313c7a15b07822f76d428533a0f8d3cb42f1e6f72356
+b4faa1b1245aa6339b5bb987f3423d187f6e7e5d4b4b341de87ebdea53b124932cd0e586470cf4a3b1060a126e4ce7e1
+973e88d073071c2cf5ed643d770a45f6be7b230896caf72a2cef10e56ff0a4e032d6ae1ff4c19bba2cc29f29ba70cc19
+8d40b3285879fb9ac0b6c9d92199afaf4716fe21edcd56b1a1fcb6ed298b5ec5b3b64222eb6f0cd1086d41872911068a
+b5e338a02076ad851778d590ada4af1c217d035c2505b891163689a554e5a957219410bbb435bbb38c8a1515146f8789
+b1d3e990d027a38fc8a38579e39e199d9984dc6d857bf51e2ed5fae061c8723fed3c74662405378c29342bc4f1fff7ca
+8679f10f866804b19dd0b14b24068c1d32908a52149d33ab03394990cc60c0f388eef02bc0db819f92f8197b1fc60c17
+aee5157db1cb7ca8013b0c19201ea1e7af32e4117896b3f8ec0ef0b2a4ded6a5e7c893281865cdae7deff4532a6a3fe0
+950315818b710d3903b679dd0de0619059bea7dac3bf4edc8fd4a6dba81b7aff9bca7cf1972940b789458f287609439b
+ade345a6171b8e8afce7a455cb98024d0d91dfa347632e1a5a40721868bfed1c1959300f1e1e39a551d99a4e1abb563a
+adde1719c13b3ec224bdb6b44dc2c5f2daad54e7ee736209653a0198a769180019d87fe6bdc37ec1b48f0212ea5a8927
+a3397eba3ed2ea491e8d0328333689f66b2bbed0e1892d7b14b2aa45460a12e4d592d78a5d0ac20bd6d34c88b8f1f7a3
+8613160aca85f0154e170b1b3f1052ba984f5c422c4c25e0771a53469c274130a31f875a0ba9650f77fabd910cb10467
+a91ae4d048c56d5b2383a9d8f6396837543b609d8b0be139ebd5fd31fe4a90071656442ca7f14136cb8205734d929b5b
+8e42732269c77887f105d1c326488025f9938cbade678bc6b39941311360408ea6baf274bbf5ffff996756cd2390bf1d
+b96e1ca66d51a186237fef402bc4e14f8f96a138db377b7e2c3243954b6f47ca75cf4fb5dd081aaee634b5e2efe2a065
+81d1c20d76ed054923c17b362b50205050f185137ea10559e35ee7e191bd89383b68179c0aa4531eb61abdc239ae6891
+a350b5778e26ee808466619f73900e09bd387849d072c0c014517d16adb4e3394673238c4f4e705d30b4ec2edfe5a695
+a13657433e39c0241d48075ae8ab1efe3680c96d078685c5dc0ac3c49d468db98f2094dd4204f44e8e90bf54059b5807
+a96255abe489be9d42ce6fa76ee90e4bb6a36421fb78068432cc935632ea5b5bb2ab70790ef79422f93d35d1034568b0
+b745d643480edb577b1f92ded38a522236fa1be2944ad8102ca64c3d55f6297b7e0aa1beb082261af1cc334f5a723614
+b235ccbf94e2bbd3c794bcaf84266141c0e04ecdcd7d2def83a7eeb86a2ff4dd3ddbd8245296b27344770f3d5d332f90
+935f3e4e9dceb4f58404ba1a489985001827e96bf6be227a8ac4e2eb8a950d4a446320ce3a245d09d2d74776c7033a3e
+99cb7f3d6256ee8918f40642f5cb788f0047a04c482146e70687c3298629bf082dd98d4a4c222fbfea3afa3d7d806f00
+ad6abd2fcc67af691e76792432b83b8cd9b0a9e5e73de21f89ab54081ea002ffd904d77ab8efb6906790987e29c53ff9
+b6de4c3a45ed7898abc037a47507f46f7327c057a911529d3a671286f98e79a421f4586a7ff3235f1892d0cbbd0e7bff
+9120311b071d38214e39f4b48ce6299ae9297c7b76ab364353d3816669cba56592fe4c7f1f93507bec7ddc1df471f0f1
+a6daf71681485d01ae7fd4bb81a326d3d2764bbed5d3be45efcbc04aed190163ce8f9d04a84bacf25ec151790f8fe917
+9534da45c2a497607f7440f61943f4c16878a18f0bbce00dd644de88383470705b489225f5be4428d1f988256b70c926
+b2d1b633b4832dab1a530a1d85415e7fa3e4a1fd383ddb898a79c7ad028f2dd8fbd56b83600cf481eb14a073cd65431a
+8c43dc994dfeb5f22df9560518df32deb1af43f254acb8e6f93eec3fb3ac80081b39610800d0822246e130e8c5f7a067
+a18174ffb85d13b7edde5822f22872ece12383d79fbbdb8c02bcc9f654cea904ed8c03b8709d70736dd4b308ecc1607c
+a54e4bb27d6d561261a3fc48705781399f337448c0afa68c074918d2c14ea7d51263199b01070b7161c3db8b9949717d
+a7457cba2c5b455584980ab6d0bb5253dbf2cafea4efe5bd769020b970dc35fba4109d002f5934610b8b4a158252ebdc
+877d4111f50f77463b60e07843b4521b2c44629a7deff20dbabd412206a4fe03f976de1a3897b9df7eed16217f03e2c2
+84d1ab99732fed1470f69fdb499dd3de795b055354e89d522c6a7df4d6a5375052c8befa4dc7615d29b3d92ce7df2f24
+93bd139c343d8b83403e04547072c3e546c67445220afd06c119f7119730288629439640302d0628e74fa596e305c0e0
+8157b5ab48d026684f6b51b802b4d8e7f85ef82583d1e8dfeca042b47a0e0f58e30cfdf4738e6d51394b260a4ca7e19f
+8f03d5c1720540c29a1dee44ef5c7f8b209094ba8376d8e5eb9b52537d9843912b68562eff742f0a7a07f5faf6abd1ba
+a15e4999a0028b8b083c2afbf4968a1f0397c26cda8dd7f6c134c6a860e740ac4bf1a1936849a4f2080e0cc9f8e44387
+8b71fb85363158c7afc3c41422e9a32ecb2d1f9d3c01fff00b77e0ec6a8661e95b552a7f05f4acebee751448ed750684
+b34125432d0704c0638090fc4566780d2d8038d803f96e19ff748325f8b5579cb8867e12491921feaf3c0df949f36aab
+968196e10bcdc6cba28331a229acd54b59edaa83cad0f8d14f39d787467bd5ea725a3dc3d50accc334e74c81fd762cff
+968abfa40af365986e68c47b4eb3562a72793fbd66a7d1b3804a5bac8137f0a3cbbf5cd306097cbf1a3b95c3414fb061
+85395fa84223dcc16b7e620a7ef6f902f7b29dce7760f57baafb37d985755e65623768b8bd745c8de7d00e2035aba7ab
+b57ad86ab3f5cb00ca0855088921865893b6e539edbbd504238df2f9b2fa7c7bdbf2d6eec6ba8e2a70a4c4fa3f459a97
+a2f203ed1f07cca3f8c0d35ccf7a63216ab98c9e71557e829dea45e2c723583bfbaa7a83d66521b08a0718c63973a6b2
+99a3522974525f4ed10623bae83dddace6f9495687cb9cf4ef52c8530b05672c2b226d3fc5058c56462ab3737a068baf
+a4a50d127ad06067f1eac2d61c0a1e813fceba2e5e895467b5e6045c9b7308d3678bed9212b98e44c19a1783e0f57bef
+a62d103ecc1d5e1d5cb98a0bbf9682ad65774d63f67f95bcbfb0cdb5e2437f2279043e4426d490f534961a2487782cce
+b12fdaa5ca77456e6e96eccf97a303ee2d73f547916ed67378835402136c2aa03e63912edf5a67785f7ac1636f6ddb51
+91315750043c4e08c7e4359b9cba25309eedc9c85672851f05a0651dd9b9329bef00a79cfe73ddc308d97cf548486b47
+947115aa6cb3c635bda7f3c5fc3dd0e4881500d74db4c0579e4b9039b75b131eb5db54174b1bb970064740551e6cd1c7
+aff091a9c7e86c80646cfffbf154ecbcfeb66877c5b773b6e8759649ada1094270e57970cbf2b0a4bcde9bbfa9689b1c
+81e3cb9116f81e583b7579f9af06931a5337fae0d57d9ef777003f32e0eb619b75b74137385f9e30dfe0e10c2120b02e
+81ab49647db2a5a6f47ec757d8427325fe721142377a287c547fbe04ea280acb32d71f3dedf7ec0f67b43ffc5d748342
+84b0e16d8478b798694503ac4a87ff31affe0ef6d2bad47abe0fcb3a2571fc8e4e9c966276a5f4968b2675827a115818
+9567b2edd65974393cf2181d235f877f5827a6d5ca16e77165ef35f6c66370f0c55a2dca5387c02ae73a66b81f01798c
+af19f841026271e284548b2cfe9fe7d6f9acdb4759ca76fc566de7a8d835408f86627185fe32e705f94e6a719e463cd3
+83883e1c9d215c90948d066d2210528552093a726f0a27b8342b611e4b8639f6d2a5f95bef8cfea4312c1f2203f34986
+a48019b2da37a232b7999f6b668e2758f82132e15ea93608bb2350d3188297c8ff8c791977f2a083ad9773570bb560db
+a1fcc29974eb065a350cdcb4283b2a813f02421b872eb3c15056ef96e2d5ffe2fba0e10ba19a4d271937cf08838e4106
+86f9ec59a1f5a5796e498247c0ef1457ea7ab098247f363329a336a1ee57afb31cc18d35e008a5263e7c401fad5719eb
+a903f95675c14cc618b02f7a0401ab67170b4a143925979791d76aacc90ad1faab828fe904f13d155425b2ffd79c008e
+8f652c4982220b8e9868a621a91eee85279b13b0c2974472fbba11775e6bb1d8d53309f500fbdacdd432170bc76c93a8
+a9b02cfa052b5808c1c9ee65ade446a6ce20174bd2e9d9c7388a1973b0290debbb6fe82697f09afee6ed01c9dd99b905
+8b4c700fdbcb13854c7b1d257a781fb7449a9e3236b962871f11b31b1f2e69ecfa6039e2d168ebdf2f142f93b91f5882
+a9ba2295980603515f80f0130993f1be434281fd4442ce7e68b2fee12b24e440bc0282df67707e460bc67a4706bdf8b8
+a382b85dd64b70296a2d16d1d15d6de80687dec9cc074445fac8de7bad616a95972ec399bda7c2cffa4247bd04413b76
+b6adb37da1c6cba5ddfaafa3718aa66fe2821b43923ec371cd4eb9e974ebf3d0e94dff1ffc1347cee5c9e19af7c76be9
+b5b531ea7f93c4756e5799118654ebc478a3ab57ea51125fd31c012053c759c8a52c8830b53208f74215e437d059eda6
+89c88a5ecee1931dc027d1553b5aa82dbc5fed2a4bed329809467f79f2712fa5529c0f80ce6891817927d0b66d356db6
+b4ad1964f73d3b7bc338909df2ab8889c4faad9b3b8a5959ea81f44c6c4bec95f0fb6e8fea1fb7e09789c690423e2b85
+b573bcbd8f484e350db04eb263187ae4e99ecd03494058e68221aad8d044db82957f4bf23f71a9634b2ef9612a78ecc8
+93c3dd86f7c3105fe482f62b0a56fe43338aef50f0d10f237ca774f834151273aa653e17bf919e54aeb35343ed790c0e
+9069c429e7c6507a755871b301b31c3b4233006c51bb66ea2c9051c6caa52e933ad81a8e879129e0c1b099a124bcb295
+a22203e5bb65593bd22cd5bc6e95a2f5c9a9aac1e14d948a7e0aebce4f009a56623026e0980bd194a633b42f15822ad5
+b1585de69b3014634da2ba76218321ff4ce8476b653ea985a7330290b1bb1445db3e1f3c510f9ae7c22940157e2df36f
+802a70ea7fa057a03d12538c3ad6b348a8e694bc6b483cd62c97af8809627a161223557f1d5196e23f13eddce15c814f
+afe8b0e94d8d9b44652602c5ad15bb0140456d90c95af4ba58cff528e2834e0036572af867488f27cb2d27d81cf02e30
+93bb332d924bcacc41b4b9bf726647d7cbb642847fee5ee7dbf3d2a0489d71802d959a3e905a80ab1f34097328632f00
+8caad1d29fe712bf09d505ccfc724574c8edaf5fc743953b2771cdae006ad9792a889e0c8136409b8f92e2cab5ba09f9
+8678be67412da4d43d74660df98744c54365cf10aa59e522c59afc3836d115380416cb1ae497ba4b50ad31a23ece8b92
+a48e64a5447ebeb5f6b0e0fea29fd5845b378e83f6b06b79b604081e5e723930a0d4c6025627382f6baba8d47425cd27
+b8914eefa2f5613dfe99f11212912dd53d678ed349fe871781074d5b6eed1fc7f2e5bbfad3356a685c52a3c8a26e7963
+836ba66155facd2a1839f603644aa5520cecaad130fcd5cf379139056d3e163bf35f172a4a1f015924b89137f83d366a
+835b70cc340b57a09b1fecac678be381ffa4c4951f6742322c2751cf1c748ffc2b9bee8f155c007d88ca69c12bd9db20
+8e98b4ae7c68941a48a70f703c3d5bc9a4cf6c20c61eb4c1338095920c4f23aa9eeb474a0430dc28d355b15dc6e83b22
+b24be8171a105f203c5bf2ab0797dca8ce61ee07307e1d82fd26fcc064bd8a8a5b6bcae8dd611f8ab650176e694da677
+b057bec8ca008dbfd4982ce4516a4925a61bd68e7a36b182575c6a4044c7a413ecd1dffa66ae3cfe2213763dd0f55a01
+8d270924c541120a18d587cee51711486f09a39444182800355c4193a76789614c6925e6a448f46c1891106f866f08db
+a0ebf85c44453153764bfc817364493166833b0f84b7a7c505a955cf3a7d4c1b4d2dd00145220d8a3207758a82dd8e4c
+a56fbc83a3f1034337ca0d5aa89a0a18f900c3654d171d47ee86b0720c6a965c09c9b06678e3f25b151b115d129ff7bb
+833618f5d13b7919206c8e9666997ef26c04a74844f57150e7268bea540e30b93eb785803535566765bdc899d4f10667
+987daa13c00dcacdfb1f0eb13c38ddf773e7e8e19af125604ede42c6d0907f9ed1e4b8b8c9118b14f9449026802a6200
+99b6e669cd7532b435d01b20dfed29211042beea6de58acd68b6eba26baa1687d80aadff901b5607a2553df047ac51d0
+82c81899cb76ae21838558a1946425c719cf68d07950b0f106b859048107c13e4e83b0f2762ac8590cdd044c3e731f6f
+8f1c5f634e38f47cc6967f2a80a449f5bf69585622c333d784263e3f6f027bccf8910da76435a84155a6fbe9a8adc4cc
+92d3b5515744115dd20742be1a72a455c6d481855f4366a0e960104665db4ecae8925182f32d4e1d9dd7fb9aa246726c
+ac86e14775cc4ef22cafa8ac3298bff27fbefa9b7004ccb16d2937128492a2c1319641062f609d27b9314aa225301d14
+a07e1ac19f4c374d68084415fa4a8068c0be540c8b9d81c0837347fe096547d8318bbd804b7642820e43c284af663258
+839266a2fe6dddc446d4b515eb538a27b5a3a5e1a8246f6df77c2de8267e172bb7522aa7985e0503c68db9cf93399b95
+8a381fa29e553fb57e3780f915a86048aa82a8a09059c80154df9490271aa6b99baf6bb217df43c8ea1265e85f07adfc
+8d8806db0093161d7f83aaa2cbf0bfb8cabf823cb54bec094f886da6461397f41d54c39f216d7ff4a8262d12aa8ebfc7
+90aff3f98394674791e194b57c3f4e6e019471df1a74dc47bed725d4c47399e91c88a955612be47e89002f451ebacb55
+8bce2d60f3e82042ba94cddd02543b46cebb8770e9b7833b4e79289d4c491df7f4da0ab69778cef92dd81e5a6f0eb71d
+8246fc9424b5d5ae0a3344acd7d6962fba6b68cde09332c262d7b3f379cac2c650d80cb5ed4baeea16a5557efb6878d9
+92ea8547fedbf440517522c687f1d652ae4637cd072147ef31338a40e11017bfdeac42a32808d33522a71136cc3bf26b
+84f6a64600184c54d3d5c320498282947b8a8166f09ccfdfd6d285cff374312da57087fec3838a49eac5b93315f03b80
+86dfa1485e343c861286c057109119ce8e20abc646a4411696a3bf4718ce03d37fe14b6ea1600d8a7b172fcca6d08ea1
+8dd3404facfe49c2f096d2e74641c474c9c54cd6121771061db3c1757cdb1cd6813d3ffd79e3b839b348d34b7b4f1ba4
+8870cf255b342ffbaa2dcff41910a37afb29ca6a721774953dec182d95b426a481eac7bc107c4c2ef3df9f70e04e0b88
+b0b843ccc630209b9ab35a69f3aad58c76b2cd3cbe94579b5757350460633217246b342fd098e365fb3ae88d5b7d13f0
+804fe307b2d477085f8d9800c8a11c2dbf6f662d684d6a0d2fd415cbe4a09255e47535a08796a805188e1bad779ce121
+93d91029bce430ecc5f41a460c02cefd3fdcb8c3e761ba26a020e108e06520cbe2eb0c04139aad0c0fe58ed34d8b2215
+830867ec984210b314e7f23dc5b10e6d9ca53789cc447e29ebca229f4c79c9120618a540a9d21e4ba2ed8a811d6c456b
+8d7a89ae9d7318d6578c1fa75b3babfa7c9df7099eefc2a9983ffa96627f4e7fc99dfde21b92fef5e0034dfaee35e97b
+8eb68f5875dac63cdbbeb5df2fad7c1426939ecb6e3b6a48f737bbac1179ed4cf5a1e6919529878169d6d8552fa5ad56
+861e26c9a31d21839735cca8a384b981f7346b026cab7d60fa95a7ad7a4a370cfb409812ca285090c3f1c3a95e5194b0
+a02ab98589d48b2240209f54b0be78edb56b614b1aa02095ab5a9cec6a04faf065eb7b81bfe45aead551b1f774c60161
+88124374273a2425bd5932a6b446986756379c7eb93d3ba0c5d7cbc3477e6267d9c67e5e956cf6df841bb263d1a8e224
+91a766128a4c718a45db571606867bfe6e1b1049f0ccf71a01138d5443014c9758000a8be4dae0caca56321e3f992e99
+8dbfc433e2477b9d86f221e9c49fb8db67c85438fd54b670ce44b68b62d4c0a9cd56c37a2127fb2adef22c07643fdd3d
+880cb650f01191db0dbfe63215d208f70f924380fa22baa0e5bcab60f61ece3c6d4cca0e4363291f6a10aca9649da69d
+8532214650619e201bd330865a3228e9ffaf1f64ddd33d206be5616c691b1965814f8bc507fc8a695c8291c2f8713dae
+90e81d5a9d8fc976a3bf6ee6d3022107d3a9441ff212305cbc7c35bc9163321cadb352632181ccdc1450f91f51872b00
+94d656836edd68384df1fe61239d40a36a0fadd59abead673e4a2ae58de5e2a6bcc4b980dd9b517e7212726b8ac94ee7
+afa70edfed2d81326f26f111982aafad55f510de95555a4d05d9916a600f3ca6c1e3f66d6b092c91c1fce6c407e022a8
+95cfbd616c2a59acde8152578737d3ed329aa82a950dcbb9378bebc3ec8beef9be2759a937381ed5aec1a46d486d1afc
+a0a1ae94bcd07ba44c30bf50cbe0ddca2fdb5db82ae73e53c2efe9446c2464fea8e5de31da4afb99c6405798f0f9a59c
+848e10f6c12a6adcf711ae3af8382178c46b90b9ff9970350f14b1a1b565a7efd91eb96871277b86040d26561acee099
+815e749e4a56c3b982b50ef5ed249c4defee558647a5c6062022c3ef42b5ebb219ba770f0de74869bea14a98eec02360
+a4d88794689a0f2e194988114ab96d28f77a29cfff606228ebe030a62eb4fba25cefd59d3d5f2fb66acaeda866f5c24c
+ad59a8541eb9641c3045d5cea6e3930b35886da4c96906f701ed3ef90cf74431df3c444174d9071a1657efc8cebdc739
+97ae83289d535707039e9df8ebc73262f881ee8e288f73b9f0d6fd209385d3e2b761fb87ca852e10cc4818384ee155de
+b47983e11702462a23e26c8d6407b01b67ad532bce3f1e0626fe3164886603bbc803c688729a64a69d119b15235389bd
+b447011409a07a2d9074e08502e882098799f3b649e947de44c79ecf86a63045a19985857ec500638a3baa2b228a79c7
+870f506356aa4f8df7d61449a7c7a8689705388b8b81dfe08fd79e8a734c998a7ba71f1f6e9df085b8aa5813a4ec4adc
+a07abf6abcacd7612338b455c1461ff484dccda7430d4e9c5f9b4e5c1cb65055f4be650e6d67179b2c62709cd52a9b07
+988b73c2a71f3b1d6b4734d231c089ad6cb07f7ea6f4b8fcfdd34aa33f09feab6cda91232c06b47e90ae9930ea46beeb
+886443bb8d7d6c7634f55da1c5695f1691750fbf9ad2d63621589f91a0205ed4adbd4b905c62effaab235e740a172040
+b66caf1ac38a8a66c43767e8597ddb66fbefd888989ca1ed56abb96ab9fb41937927a792ce422577c68286e53bb4856b
+a84be3b37007cc932429ba2b4064ab7fabbd0b77400bbeaff09f8c6b818b5cd127ff8497e131dd8bf4323e092c690219
+a99e9898b6f9b7b1b9ef6f28f60fe2ea71e961b64b262cceae41003f6aaa16fa3dc1c2ab63bf63534718ad812e882a35
+a1cea8f3f5605a5c60144fed53943d3f259e3e33545eb0dfeb211a9dad8d99cb3cd3b2cf5031b85778ef6520700eac4f
+8b979026924097a06b3827ad28f3efd7f0e5aaf7920ebe5347fabc61b000631f0ee973b61b7468fcc60ba6e4381ee478
+b5dd7393dcff33d6d337328167ceaa7a04a98e0acf1dcbaf454247e85793fcc9a7d280ab14693cf2cee01afdf44506d4
+8580c90d72c0c83c6c003dcc340553ea547eca5989780493c2551ea9f04225d77ea76acc1bde20fef1a0bb7ec01685c4
+8c77db66f09e76ebf7ac14fe2fadabd41291f7ec5971060580b317f6af0daabe099f9db2c3d09c4c6edfa41211da0c4a
+b6dec051200c25f150d3b9a7802f5b7c361b074528c79dccefa77d26ea2f67562a6d9fb8246369c6a60f832fec6b7636
+8620173e19eac12fdc7796df12bd3648c66f78fb83a8e6f6c9077c34027a3acd0884ef2e3455a3de0fbfd4ca130ed545
+b44e3ae4047f917fe1af378cacae2813f8774307c20d54c565b674de197fdf90e1a6da0733e948c3218353c613d23fbc
+b330af874ac5d749a4ce1a23f4fbfa67f71e8fd16f6da07c714218be431b2a30cc4ad2594994a7a35f5aa06bf87ea3ff
+a5be67aad05a965685aadfe03d66ea1136e6979cef00605e92912fe8f84be7351a6acf6b73c567a20ce6045a703cf557
+a1672ed63df30aabe34e8eb81209ff31f4e5eee620b58074d92d9cf2687e40217169df59be8af7374aa5a9107c5f51c1
+ac01de17b74e2dacfe3db539910b6c370de94e646b6f2dd2a828a381b04f2979f8a62bac473659fe7b6e126f15ed7aed
+b978099cd3aec49300ef9ce5561aa30da4d37cb5c697e0b5cbc3c42ccf2f96e53e948fc579cbd24605101176a353a962
+8c8c439d9da3627e9f74da784bab8191552b945bb5bf9abb673659c939a60903e11f37300dddcbc8a495adf5c038234c
+8b4570ac55ea349560a4e7043fa17f264dbaae15a2f3dbc5ef8a6579e1f9b5a440aeda94122982fe564f78b615de3e1f
+a76bbb163db2ba26f5dcae8267d1a890815a76196af10444d3a04c1debeaa3c7cd51102fd0bff8944710c743f5393745
+8d3ba2494b612f93b4ebab77e6f207b636e2d09a3e4a9666d4ddd5859fdbb9747a88eddb7749356b141a071584677ec5
+a8bfd973dee352ae653f7c7bc7df2b32d790653a3f1f2b239d71677992938cabe941fa609e915e607809b5fa954c9073
+aeb4c1ccee15753d4fbba545ec4ebb05c7428427f087fdc0852a18439b19b1669a3c744a0ae2e7f74c46905f520c3231
+8fffac3ff9de863257a836aff3cdb705fe7f4bf604c2cbe10180d81c0956f723b69438bb8a3aa094fc755e386234dbf9
+a583153b241d31223ebec9a95e11ebc4a657b14056b8ca052aebdd9866140dc4669bef4f02b5ffdf667ddc9a87e0bac4
+93177005082ccf2143f24c063d20068fda393948bfac34af57ca58cfbcd0bf9a0de46f8f41312e83a502b7ad69b8f2ce
+a79b0967599894340ef2408b48f42e6ba4f406e5ccaff13b46414ee38e5329ffc145f6c34d8e8acc6aba41c23e57e7f8
+809a356a76d54a05e5006f2cddf0decf73e5392b57ead32ab56bea9fe13c1ad090cd69a8e297fa6e017b39361906360f
+b051226cb44ab1bf94a9cc0e4f246751d68f32ffd12f1d077d3318de642f3997fbfb0f2ae1dd103264542c2bd0293e57
+8cac28256b1a82d0be373d884d00e9ff2e384d5afbeedda706f942b1d222694f126ad44f9453fc8a985cf69fe11ad70d
+a13b073290de7a2f01a65e429e1adb78cd37eb23c24d6fd5a1632cce2275496179e3c22e0b7f59fb51d526402c0f3f7a
+92dab68d1dbf07e5b058120422ae610806809ddecd2aeb9d11d8fcac738c72eca584b88ff52c95817b79b9e0369e3ba6
+b24267fbee28883cc8649c243b13905874e5d97a285b9c6abec749a53e106db0a6fd6fd8671d5b7c9a1851da75a4ac5a
+99cdf977dbfc10084b698c81cffb431a9eabb55b1323e1b15baed5984a1ed212ec5f6c58372f965fe18de0100292e26c
+b021c697c56989bc8c06636cd623c3672e8885598fd2014f5e560fa2f721f9487cfdbcf4adfa34c178ac84771fbb77a1
+8fd7e3ad3330d4eb1a0bd42801d95ce40a82b43c366abc823e25311aa1ed882446d60b6309e1a1e201e725326736257a
+b1b3c641ef4cbd5e9c69955217f53373cbd104916e04d012eb40a24d798e76bf05ed0a218862ce02619ef694c42be170
+a376d0296c0105789e9fe539a5d22bf62ee36a2de4c9aa0f5e57210ae49e2cfc5209fe0f467ed19dc95b9746595255e0
+8a0ec125a145e373929ae33efb978bdaf16041eba684ada612c244bc3e28c7027886e6308373a5ea53c9c3d8e868ce1b
+93fde45cbf04cc386507b03eeb93c885da12bfe519df9fbdac5ada735934ea6e1a6cce066d033be66163b078e96e2100
+80c1839ee1d2ddcae1fed77d5f8091ae3074409461e04153db801e05b44a7658c6ccadd33ad682e51e211dd9e3c80f72
+87112961553b4a243875ac8d46bb6e274325699ccbdc40d7d9b7f7e58d3fd164f86b0b1df5df5f980785cb3918dc9b33
+a011463964a319c1ea11c7c55c607bffe0116fc834b8a1d3684df33f77f6e51dbe16a891307c9f51d5b4d205c4530072
+b316c4be33abd10400a4925f9d20ba02ab1feb50af39b6f6120d6dbcf1bde0a8dff7e08c64bd1f5c43543b013e242483
+9555b696d428c4b74806a7d08b9ff17c8512a86cbb13040360ce248de241facc42c042d3779c28fe98dc3ca96a47b2fa
+819f54bcfc58a7b793d185d8ffe411bde6207b77cf22b0d5e1b3d9843e4638009c907fdec1966b485f95870da57f131a
+82c3f9623bfb8a8ff3573197497c175fcb314addafadd025528f805b7a63c87b0e54b48d46c0322110b0043f7f77153c
+abc023b35318fd97ec81933ce55799d8c36c3d55cf59b9efb302b276a76a37c517d5c690287f216ffc5d1fc082e116c3
+a6579226d602a7ceec06d402d38f217b836c8804e9da202bfaf1f3f4f15c24762ad6a2414ac022d8de68fb76ba8a725f
+b701d6d60387d4e2308a77cebd210e868eaec10d86532ea18c0c6393475b3976a3eddd79e469458bae4f496da7398fcc
+ab202a2acd4ff874cfc147ad1b02d4515ace254f8b828f619df2537698f4e1b2687e004c70a152d605a73ab1ae40fb3c
+a7e09ef6c86ec7475eb3ed69e57e0cbe86114ca5c0748069d00b6e3a1e2ed74e4366adfcb4d938023560fd91d0f64612
+a9fc42b05ceaff4312d5dacd78fd2394dfb8dc87d52efb0529595877727747827c1c7e3a3da81255356033fce1f97513
+b0150a1dadde09cd60ec3686256b4378f47dc6a55c092c60a3a3f0bbf586013dc37ed53ba7a91c72791c0d52e4c49c2e
+ac88e91b48f031df297c29fbb2cd0d2bcc767be5e0a7db87acc87fcc0f4300cce6deffc0b1cb6fc7e51c6ab13ec2ea24
+a8fb1542a956fdb1dcf90da2672d40c90a4aaa2f1232318b4112816bab660657eb97e3d0fee9f327793f6ba9bf8df2cd
+b78191d1ec4615b03b21d7730d48fd9643c78c31feea19866429073f4cbb0d1a67f7d7ed210ab62b760c679515b20acb
+967c20d53d46011f59ae675a26aaadbb7512d9f7fe87b7a20c3a84c76569d23920121063235e37cee2692bca3af69039
+9766abf0251cefbcfbf85ab1322f62267c22e6556b7fb909413a7819f635e3ac1670da6f5f72d3bb4b739e12eae5ccc6
+b0e9c5c327fba5347474366eed1ff60b986a41aabab00abe18a91dec69aa54197d3f5680603057f05d5efa0a48dbc92b
+ae2f5defdbd14e2c7eaf595b017b4a97edf521f561ca649b6bc2e66382478b5323aaf84f0b90f0147e20ad078d185248
+b841bb6e04d2409a419dff4bf97dd3d4f06f6fa4e5e23e4c85f23533b7f25fe3da9285ba033c6eae7e5e447e35329c0c
+85e26db850536cb6d3de259f662a88d23577fd56d1f99b3113ef1bb166456324d3f141a7ff63dbccc639cff68e7ae5a5
+8cc36d89424da80bcc2b9d9969bbd75bab038c0cf836f561080e14bb691e8e0c17306fd6d42522030d4640a01d5c0704
+817e72d50f68dfbdfc9d5611eef7c6b490ef1509559801fe1ff916050429a5f79c8d03c60d2bcb02e72310b3c4c9d068
+a15ed72881c49b545413102975fc69649fd5417f5b7ea9091f8209974024785496fa0682352c879953cd1e9edb3fbee7
+adafd20b962921334f4be2188f9ced4a5914389d0afcdbb485096d3848db85152e2881aed0fdfca11f9c8a9858a745eb
+8d8aaea706815f1ec45d9ee470698ff199c40b1ff2d75bb54afd4a29250b094335538dd41637eb862e822c4cf0e2bebf
+b8480d2a79cb6ada254435dd19d793598adda44f44a386ccb1a90d32cd13fe129a8d66d8babd67044de375ee59d8db51
+97c17d6594ccefd8f17944fb760fd32cc41a9b046f87893bb7ab2260090de291e8260ffc63e774a4b6b1dfe0e5107ef8
+b5b7e1d4d9683de7193120be850395762ac9a5669cded9226f5ca2a3de13eb13b2900af083645ec35345894de349433f
+9405d473872cc9f9b9c57bb9976d3ec6892ea429cbd1b12f22962b74d88448d4ccdfcc6d5c6ffa068d560d7bdc3208a1
+b99cca139a3733b365f4718beb4ff4a5fd6aada0173471156640d8be2cc69f2a70d959b57688f927bca2329c3b30477a
+94872ec872f19279fd26abfb132b4a7fd8c485fbdf04515c7b416fc564e61a7b0fc5da9f1a380d2b3db989f1832ac1b4
+92aba716538bd66e35a7bb877cd364c1b8dc3055a9cba2da23c7d9c0a010209ba8afab455da99747fb4bcc8fd3144cd8
+95ec4c205be3dd5df181220c96bba3f4e3b526fe5369035edfcf706c1eca43f29a4c95cfcf94cecfc974e01547e55125
+b48c719d7cbda1e79b3f7ee9c17c13bbac197bb015b344f79bc6785b28a1e9484e2349178178a2fe94c46132c54983c3
+908c495c355a0555544ec6f0b8e0dd0926ef2c5c640fcb89049e6178697625b85492722d42bb5c966aee2cee9981607e
+98ded9cdfa92bc8e3664ae90af87f88759503715f6eaccfc983e3ab53f7b3af6802999da93caa7eb3530402ec4d8901e
+993266bb366ba46d532973391af7204aab46a3189c83ce7cfd2713bc11e99066b1a5a012bead2fedb09274e7b362e8be
+88d462a3a17f84326b1e4177799d6e9c5f4ef57152cb83ffff4353a8382ac8be7d50381723aeca77d33d8f07fccf69f7
+80438d9eadea15c90008ccf4758d4e3fd5a7bd02809eed5b683f2c96a15d24524ffe75683b7167d42a47161c65d533a2
+b9e7dbbd3d3d0d86e347831cf99657fb269930087920637ac6cdf185d5eded3f09cf3eb27759ce3f4b46f41411e2fdce
+8f0215f23b4945470f74b99607c12c36eca41aaaf99747f522d8531244b668d6ab8c1096b9b5697208c3931e1fefaed4
+b2c8d8515ff16beae04c855b4365e450e0ebfb423acf5da2501fea76259f862bf29738a858a4093b98c2a444396249f6
+b27364a7258c30a59d1f13d358eb49dcef298a92bfa699b3b91817d2f324be8fff91c0b71cabf26747802a92582e7dea
+aee7d6f71fd674cdd8dd1f22195981e7160990c16647c871835d988e881a3d4c52345e74f7a54768fd97a65fdbd84567
+91356cb2024f7703ccd662f50baee33409c28ff13bb5eb92fa93f303913e9bf31bf83b0babff4b5e3649003ae95492e6
+b744e4754043d3ed85c3bf6ccda60e665568dd087548ac70670b90328509d0d5013cbdd07bf603949067e54d8094fc2a
+8146cbea5899401a80676850d0b43b02d376b4b8f02ed63a7d92532d13689e2c02846df79cffa0f33ff81c3bf492339a
+94bba8a1508c6296d3dd5d2e609d6d732ab2541849deea5436a4a9034e1e6f1c8d26f6b781fa34dcdae7cbf8899d006b
+80260b321d932e1179667de4916428c1b77ee1ea537a569dc64a12da5ddc85d09896939718ce08ea7e0fe8f8b115c408
+89d4640cbbca5d105dd67250f3bbfaa96d7ce19a89f8d6e188353f3a9b8737f2db1707c506f8ffe1d3144dd1da371920
+92f5962946ef7190fbb7bd3935427157ffc815a52ef44397ead3aaddddc82e5f85b1edcca1e9082a500960e19b492614
+8b89240c9b7257cbbfcd6e415fd035ce33bb46c773569d217c82ecee5dc2d66eedc9333e0b043616b0cbf21744909b60
+a3d23484916d2c0ad1b81fc7df70c97d711040799cab076223e0ee02a45a0fe9ab564faf7a225982468f3e62e32424d0
+b31751386bcd471b5858d001fee15d566215e34d2d62556c51ddc60a834d3f1acf18c415c23a36b581cdf4791f461ce1
+860a99003b841221dc5ea2bd7e226e5aad72db8a5959d5d4dae8a86114d30b9e8915b2314ef867e9c2a477d9424a2d94
+ac925b330cafddc7d95d115a9e62b2c135acd22b5e35a4aa789f4318f03aabef818805845f2532e9504bb19f69171809
+95d8180cae0815d33bf8854f4590be652f95f72fc29f0c519ca9bf3f490ba4a724b23d9054e08e3d31bd61d609a8f0dc
+994f223740ff95764fb88de1ad6dd90c9c58c0dfbf8482e1dd9bafc20c099a6772acf40569c54143f6697fab72772296
+971d93cb1e7aec5defa52815bf202b11de6a2ac9c5d4c0eb236cf2c4941460731e12b718f4a5b980ec6f4c54c3d17deb
+a341095fe5adb96dec2be367f09804ef4fe77d553102ddf7d643b7277992708e84be9a7748a97a56f065002a97dd7cbe
+843709280fba29d446779b1ac6e31bc3ec8ab8082e8b063ef8d2f3733ee77a4191b55772302964bf867fe1044dbfad65
+b7ccc71fd0d0c9642c32d292ae88ca369d1fb5cabb97b1745c621aee41da8f94bb580c1ab23664c1baee65e97b21f0b0
+a9b41f31be84f8ba061570633bd9e5f4d8af6fcc5276c25d9ab67b2b88c1f8c2a87eb19280cd4fe7b4c04da8b2d02d7e
+93eb14ce0632cd325429e1c23340da9655d3d7c2b42a4594bfd5a4e07815afc9eb1ac737228771492020f6528c0b7c61
+959aedea532471b9610150657b895c5f51ca950aaca910df137dbda2d17184173cf2638a2a0efea3f61d82b6ef8a7c3e
+8ebfb50bd48fbf9a6f782454ea900acf0c7143164de9b5b46c1cd072c69b76143ac4c99bd43139b5e55f847841fa6a1c
+851499b3a1eae6da530a47d3e8bc068e6e7144b744d5eca5394f96253df65094e5f3c34abfaf7c7d78c4d5a5d4863da4
+a8d68bf15b900cc47197739856557b43a5eb233b6c095f21a14a90ac8c36caaa1a54690c95840f0a4d2e2ffad0874a2d
+81a6ff8fb1dc4d4042089d4cfc10cf826e39083aa5983e53f4866f8f4c10cf06cd8608c4cb1b785f8d309bdb9b2dda63
+82f658bd1a95fac0b65d337efc95d856aa65541d49aa993b094d70e527e7d478970eeb3daa2904a1309d755e1d677691
+b46ba4f3d8f287eb92390e5d930df4f1a40abe500c9aebf62e2eeeb2e5ecfe5296b09fa22d6c9cfdae28d431fd10a00a
+b5b38508befa4623166f6213cfd160782fae5b7c3c7ec279b42a83d43a7adcfaa6c5b34cedbf98bba357fa663eec896c
+89b8a0fb37a0c45eb1f234ae9c7be65c8a708f08d431728572169b33f8288b1e17b7d4b18de9fb76afc37ae609290623
+a7d1f5779c043900f3ddf29b6b7ae4301699c0ee9e70314fcd3bb2643f912fb1225a0164f45c47419ab762420bf8e5ad
+89d2a69fc014068aa6d0b79784b8953f3519f563b5c9f774f4b148334d822aa645b662d5efe7dc6f9cccc2f67268c3fa
+a698d3f0b1b6b72b72358d5fd5e49e928cfde69bfda10e163b9b43bb9604362b32af1909d28da5e0364abcf5e96cc226
+91c12dc25c48aee56484172de8c6aba0d9f5eae8db848a7b53d76001c292d115ec57d816c2cf10bb9e901b2707dcb71d
+b0740219e084d56db4829daa30b2812115b2e95ae85ee96a140b7c4012860e8017e19b482e981547e50e25bd4ba76716
+8c84d4fa255e2de7cd23b0bbd110687edc47ed7fa87bd42658fbaf3831c6d68cde3ef403ed6c585f8654d0cd32074bad
+a530d3272aa1740a73e15cb9b31c5e2e54c404db72274b0840c19b164642389acdab4514b9b2bf9688ce51392d8b6793
+a601f52bf7b3226fcab93c67dccd95c1d6673270671c4a099b867bd5578d5711fe9acc9b935b867ca780ba4a394279ef
+8a238082dc8ae33314fe1257e7bec69e905c194ded6f894267bce97443166fb443628490755e1d453545f389b5beaa2f
+88a9737f3e9ded874681fb6cc8abe0f6e1ce18a05ab599b2f855f73e6fe5bf804de5c5dddeb11057aeca6613bba72c8c
+8a5cf70293eb99ad3c34992c47299646c8702d1035b75e4784cbec67b28cd4c88eb8c721f4cb8982d3c6a42d1b9f7fae
+8a62228b84fa7463a6a8392a7af767b661382175633c5e00b36979d816a53b388f31afedfc47a5d8cbcb645e8d5928b7
+92836b5a41900a1c1ceec83cf4f15c6177dc20f95eed23a203810116ede2a072a8d6c96532ef32c93ee21acfb14448b9
+b4e538d7bf40c263dd1ede65c81883dd31f9237a0fc8d134a2b480a1a681dd89cd2edb19e63070ee69e96cd12069ce3f
+913eceddd4c9939cf82c7e9ca5ac300cd79dc5a72b8458cd69e9f8929168eb19e5f21eac12a3b09eb8d3998e28e3801f
+81f4a3e7195661b174aa2059796dd88d3206bedeb7d7cfbb7e61aee335a01ac50bb8edeb258a68949492d4ac6215d95f
+913a393eba8eb88d1076effa8d2a30258d83635ccb346f1bfe099fb5fcc69d0457ce5a79363a618f9e8b43f53728433b
+b11d721b08be428254665bd64a8864d78c5112e252feccca113631b2818fb729129fcff1e739178507ece41b807ffafd
+92603fb7d50d11b59fe376720aa57412b866fcd5da90195a5a401e6222201b30c29f8797dcc1b41ee2cbc6349bd5ee1d
+a466c5d41cd4a8d1f47a650ca67b529ad3873ba3fd3a36db27f7a5869b74b42381788bb1a1c100ed184118839b9879e5
+85c50607a86d4f76826220286784fa9b6ccbaadccb661fb3489fd35a3a8917d6999ac891190f2297afac3c37abba2967
+966320c2762b266cf7eac7aae39221599df4fd608036f6101cb8c68192fcbfd5f61c7f93172aa2be0934486fdf4816f6
+ab69525f1c77b6706592cdd5b98f840184b49efc6fc2687d6dad3b014f6a12c4d5cbcb5120d8869246da010823534d8b
+aa2c9df15c06b58d7b9bdf617df8bcda83ccaaf6ddeb8074db931f7f03dc06a7914e322777e297226ee51dc8268e80af
+97035b62f8db4df6e787cc2c940f2298c7d26c2127c7a76e4660d132a14f43c8bac8dd4e261605611b2e9c08929f2bac
+8ace33e696953806f594427f137e84ea6b22ca9b48c3bdf3830b3e951e5a463d4a7067c68d2033eff452295a741fa1cb
+b621fe49b12580bc8ec68fa39d5133875da23524a5ebc793c35040fa3436350d0f3e4bb4e53eaa23d312a7847e2eb2d6
+ab7d6ccc0de9c7ddea145e83fb423a535cf26d470af3326d1d6a9a579592b32ededb078bae4613028557877a9fe71642
+97528eef76389dd77d33ee7daebbb290814911beb725ef1326c3160b9003c3043be09bf3f84e4818bc2a7960ce1acef5
+a408eaf5c675b50dc1c655f83b9595dabed68e74e6d2eca5a4948252667413cfffb46358400df5d35f92657811ae56e2
+b36537726b26b474e184dce0ad868a66f0944b4105ff6d35a2cae0f3a520fd14a66630388aeba178d400b5fe104e521b
+b2b88518d10bdcb111c82a261076367e34718f1d0a1a06b421891b4eca1e3c1f904b66e65dc914ff1ea5991f6a638a02
+aa3172531879a5c8f594ce96277b2c8c8d4a2d0f4bbe567ae40d5b36fa6108e00f0b1dc94b81f36c9eb6d1e9ee1896ca
+a53975587f10667a9474ae2756faefe43e7f81bf9e051049de175a8ec085530fdee3d5e3db15d4be874ecacf49f31691
+a1abdc58bff4fad0f6562338daeacdac8e37f9f3212aa252b17389bd9c54db58706129a63bd0695d299d043b5ef0e2d3
+b8588fa1090597fe0f6275e5779da11a4d128c52fb8954e475c4940f1a3e10fc23ce1f61e9aabe8a75e82824f718a94c
+8a1981c536747d4cc06315c794f1536db7ab3c9dfa024a0df854b948d93bee72083b6c9c4c4a7ce999c98b904813a659
+95b2b1ed525d629eed454bd6bd059b01869423c3463a56689a7c39cffbd3453c962426a1126ed631b25ae8cd7538302c
+8032c60f083477693f533c2d8ae391d62ea754b8eb41ce9cd59bc469b980dd959a8ac840ccac54b404a9d08a6f9e4b98
+a72ccc14eeed758d3d43c51d68341fd7e98880c3687e122238d77dac8d987c8edb3067bb63baf13a0e57fe02334545c7
+aac3eb536a5061a8ec788ce131582dea691957ce8b9c6af5ab7224bdf0fd15c77bc6bc63ad037bd83e0ae52fda738361
+97dfa193800e57e6b19d1b7fbab40da6dd1463f043eeec34b316ba6bee21b6bb633ec0c4fe107c9dab6e06e07e0acdce
+966ee3cf2f54777968fbc34f08c8de121ae7c1d6b2cdf1f1f9c675828d22ccb909bfdffa2e3f2ce51b0cc85bb29f8504
+a9df6dfd12f8c43c28b929280355cb23ab0ddd2cc2e4fe76603a2e5dc2ef5d1aca2edf89b304a27345cbb1f24a86cad6
+abbceef80c744e5a1194313f7b84b5dee1c9861cd4bd3d0d12c433e5f2e8c6ef6f10b860abf3b788aa04896f708426bf
+b1dffdd81711e9782c992c4b14583ad9d6c39ef88974682a72e717e21923da6892490d7efd121423fdc638467e62e064
+817f30dd799c422da33e13ac2bada8cce3930233ddad495f714a1c789b7aa8f41ff6e688bbffc5f2e8dfc72e5243b645
+96760a79e4414ff1d19fee65b6e65b2dd6665323981ce8b4ee93d0a9c410b018ac086c08fcbc7a71720e1e3a676f2b3f
+95445cabb75909262975a5b06381af2bff5c4c6cf51cc84adbc0b7f2a985117f35c014e33672cd5216a9737d3f37e067
+a279c905fd9d49482d213f5eb98256d020c2b90bebac45004d6f152ee4ddcfc72a7e6b188ce3b6c93ebb9ba9b8be587f
+8591e8379a78af8860e6a0e002be5b25aa4b93c5e556f5ae2e40400f828dfa19d93a4910823e230a51e2c1ea5464d437
+a6fde17d41fd9f03605ab6ddfc992e36535a23b2c39608d30cd6d72588f1ec6afb9db193e88eb609e104e73ddde779a7
+93e2cb6352a5eec063151e5c9a822f6fd475a072dfde2464af4afaf6a730a6af1fd74c424c09727328a7f23505b91407
+a7b1e4f703386fdd16f5fc9b59ef1dd682bfe5a23bd42b3c4b1385bff894e758ab09674dd6d0ded5b32a0a0526aa6d98
+aa7f01c450e619c4bb42d6cb1a90a94dfe132a641728a642997b71e2c3b02d09a7695b544712b2e14416e7de0252fb11
+ae840b870a938668d0d4404b76f5d4d252d8ae1e3619661df0890ccbab900e3d8dbd5dc9f96013413e3f1e30dc541db3
+ab7552930ab07b0f5d50edea3a2e5ea3ac1a05cc985246ca066fc3350bc58949dfb99d4f6a6408d1bba64d3de47a3c2b
+8053634d4c730b5e90d68c2830a73e93f1c9e522ae0e00a04e2ba15a1b7b4fffb8b25516ceea61719f886c7763d46219
+880c39ca4cafa622bc767d3127d62143434d0a1d7de8dce1a2f94cdcaa023a7096641a46e6b97e1b1ce9c233c873a519
+ab9d46e46cb2f382ee7d21b6da01578b786b7998e0fc2b5d5a4e1a0d93aaab997b5c481c2d9a741865d6460ceef57a5b
+857a5957adc3a888cf93f144aa809c70a211932742a258978af5e657f4f57fcb6d9e39dbe8d3128fac6c592dd5bc4ddb
+8c98656861fb8c8a03d491db45077f1d136a759177842ecf6c1ca36923088237e928558433d5b631590f395db56f96c1
+abddacadd7d536e91d36609fd0047f5db113be0f4d84abc7631ffc5c00df919c085c049c013a05131150b0043d51f892
+a8b14af12cfdd0e11c8487334efbfdd22c8b4fe6bf350333d42ac8c704efe54f50a4bb51d9d802e5185ce72e4b21aa58
+a8badc2bb3cad0143db1bb3cc81751f9974ff3f0e2ee35921d04985409def84ac2803a657571699eba34767b773666e5
+a6739a05d270efdab18462e8536f43dad577158e1c1655fa130da97e469adce9bb7cda6f9ac26f4a9ba3f9b22329b066
+842ed6efb4395603e7fef0bf92326c0c63992da4ce7912f850c4960f7a19e0b2ecc720d9510f15ba6f73a2c5ada8ea71
+8502ede859944047898d533e1923ef90e1b5c17d985c9fb4c6aa39d50636de4c5a4df278f2f62cfd3ad08bba4c5ca6cb
+8c738573226dd5617b3ca1dec8780000a77f3fa8de241cac99b0d9b1b6c90cbb8aa2009668005f2c5c7abb09c0ab3f99
+b101335c403d769313bd05c755a9196769465f7068fd6f9e00937f3cc843d48f013f5931f999bb5c0082d4315134f5d5
+925ace190259b321981fcf8bcf52c6852b206099f25c0f278439ef6edc4320d6f926cd6fccf1b4cd224bc52e5c681612
+95f5855ad1bf14224e51f7d5e0d229683c0d38fa324b1abe9d595685d3497955e30289618c4775f6083bbf923ff3a37d
+a3d3c7100962c8b60c40b830af834ddc48858e7eba5ebe2874ebf74e505c25cf52e661b49d7619f2f2a039e1df02f5c8
+af7e66c1d5dca63e6be117b210c616efd533e77199d67d8f694e4278841963e0a46e4e44f0416e69bce6a7156e1872ca
+ab796760166d1e1fceb20f9bf19b1b7cfcd327650cc7cc35c161ddbb3cd4846e9a971b541f303cf62fdc0124688fbd41
+b920211c5b440b3567942dedf62a65ffbcad1e3516f58d14d8f8dbe86f45c4b9745fbce43f5219b7052b27a3a04df12b
+ab6d5d25b9fc46b0824df1628993e44535febd7c62185b6795550388185035ae12bab60fa34848f465fb4f4a8add3544
+a6539b67dfd6f3976cb6b304f4d152532b3f08c02bb97730c03c746da0f7b38ba65536faa43953d46e5e7687a86c356e
+95bb225586b1c82d894ababea7e5dfa8468bc0e10a2ef34e5f736fd1611114cddaf1a5c58bc9d664b667adef68b5c25c
+a16eefa4e6161a8e7bac63cffb2dd5cefcae57144e63b3fded581abf7ce32016a654aaa582fc25bfa51c83f352e09372
+8b742428f6af81261a47a0df061e480ef9176694d361ecb57967bea67e11cd44df686e38e35b7d4a6ee02ebd520aa1c0
+a2a4f2307f646384a0238a711c2dcf7000b4747b8df1d46c5da962fdb106c5339790b48682e8ec2532b8d319ccafae5f
+81910c1d72f6731d27d3a4059ccb0316faf51fa58e0fb3d1287b798ea8f9b00bbbde31fac03f93c7e9a1cdbc9502d5df
+b846b933c2acd71e9f9845f1013cea14d35cd4b8f7a371b9be9bec9d4b3c37a2d0da315ba766c3a126f8e2893f10af4b
+8ffad59284b41b75064c277ab01c5b4b3a4f3c4b355bf9128160b1a55ed6b0d91366f7804006b4e6991525d3435d5235
+82ff36a72533fd5d6745d0c3a346fce4f62b6aca0b8eccd11399b482f91cdf6a5a4135c627043008cb137ef4ccd935d0
+a11c27f6eefe54cf32fd86333d9ccb59477a655bb0c35dcd028eea58d4cc40ef9a26cf3432fad4e9d058a27b419b8f04
+96642ce0eea3c2c0fd155a75bec3b5cd573d41e8081632c56528464cd69a1141be3180c457213128bcd37f5fae47f7f2
+8349a9e390e05150bbab2351b77a3674f1af000b6eb6752927ef838b6f0a1200e6fd7201dad8565e3caf3802f204246c
+b8ae7fea6275ea61935d3047d8156e8fbc4a95c9fefd1c36439b2111b9ebeb7ccc306e0f8c875fa772f7b433cff848aa
+b366f056e23905bae10ef7ce1728b317b83f504d128f5bd34701ecb0d25ec08491969625e23d5a2fcf0048af610664df
+a3d88d506ba46b73bf07729aafe9698e788fd688647a6b4145761275257d262cc450c7889b8a40d698455baca55e3da4
+891ebaac7a7a408aee4ba61605f44f9ca5a6d5e046eebfd8f5108b6dc4479482806dd01686045b4c7760051f22bce468
+a6ddb74e3e3725e6f2d9025532ee3f357ee35289e1cb38dcd5b2ea8ebc0bb697416fb3aa73e1eba632d593d40fdb030c
+a7dc097f440ebd31ec1a005648468c702bb77073ac8cfa32b050e90a9e1cf388f138abdd18f07951c752f7e19f706af1
+a200f25299f9a0542c196adc2e00289f453411066b88b125d3f0e6b17e98efe9da8096312a2f1841e01837da90a65440
+97cd3a9d4185d77d4c7bd4ee80928def7b660d8b949b0face798c62a7cadce1000997af29504d28ccf9070fc3016dc56
+b9ebaba1a15eecae6b1998ae6d08233d05610dc0933b16922076b2dc4418cbeb4e5cbe099bbded3139d8a47f2b2eae10
+86f5fe8fb36b419fe6fece1c5c4b9d64468b4aa0154bb5dca466a243b6fb1227c3b8bdaf7ce5c2d4fd05c061979f87df
+8050e011011e7918ebc25825d9863c91046fc3756703bdedf936dec2815cbd10c2403ce6f4a0b4f576cdfa1347efdb85
+ac22132a482d2950be9442167be214ed9d24519073bf5ef1c8e3e6f4a77065da198a851950330fe4d62b2a1272835015
+819e2e8e3ac43b6ae4885899346f3b558bd7658ef7d380070588154694957596695a925a001a9fec7cf3655326c50c2c
+b00f40c084d2eafa36811e0d822ffef874a0d4bebd4817690408a737624be05c920a08307cfa0c1195505c5e7a5fd878
+8355768c09515a593c8fc8289baa3b6cf7fc10d302abc93f72090ad99a70a1ef1107eccf839be722132259500a565d68
+8bf0615d2cd11b03546ab7a0c90c0c938776aca8a8b989a709c367f0f5eea7b0a7cdd78f96050cdd5d0a123d01b99c53
+827c2cce458464fdc716a2198fc67b3cf2ed7802a1f53f7a2793b2314789998b13ea61343c723da8863cb63def6a285c
+b609cfe6acfccd632759700bbb0a06fc7903a6c0c5875c2c3bd85c65bfae7b29b03e77092f29d565a6a89b85012396fc
+b73ddbc330e872363bed36578b245b666d42923393a1341816769ce0af24b700c19ea0f579e4f9aff1c3ff369e63da8b
+976d658085e5978807e13b150c7aa539b44ab8855a386bb58a52d9ec9b5e21ddaf89a18b043394d6cf47bd589d04b240
+a213897312aa28cbb2c572e643d3aed003c84bc2ca571dc5fbea8a0b642313be94db0047e293078d975fbc6800751a87
+b54f2914f6a7508b6686280d3cc955730458ff035978be29645fba161ed54ef3d4086f956e68d2a48c49afe904edff5a
+af99e470055062390904673e18d04427c16afeb7b9f13ad83bc2599e9a92314bd91d6f1f81b55419a4d668bd889ec8c5
+946ff0cff4030b73a1342a9173fe697ab20cc5e43ea6158573f2def601e12a174da431f8170bd31ceed4be48c90b4f6b
+abc51f8bb5f74cee819ee383cbab739026c453bb55336fdf423af2c2ac6712ba90006d62dd72d8cc1b2ff6cac900c8b6
+b43623a56c5fd1bf28bc356fb4a875d72dd4cbb00c9c863646a3376937088f9932a4a0aa26afe2ad69840b06242ec76c
+b0f371952f99eabf7ed368a142ee07d06bf2b7ec1ff852fd948b8c53eaa52300753fb9ff6765201e35873b5167583f3a
+b3906488172c09e148c571ef0712f88bc9f1ecae0db95380f61901660fc1aa090d0740378d5b9b76883507bed100093c
+945373b5e6ffce11d39a722df7b24eb929b14a967d211be3b969f48fe1ad3dd4280317d1ca772a69b033f3bf26c02c4f
+b2ad3490389fe5bfdd5ac7eb5bd61facff8d57a8f9969f4938ea56f4a85eaa2c1179a2e5b4f87d9e6409925c75b61828
+a4d61547e405319cbc20cad16a2bfd9e6d093a064522c332dd22134ab05e893bc84786b21b4c71a6265bbd06da2ef4b1
+86749c26715d22b185e1b25dd34818e96aad319d7add22a98486ef9f9808b5e4b938c6320d391dc4e0fb5d57bd41778c
+acc554d5b866693a453a9ec46d422c8b410458fe8397384b927a62bf5f2b1fb9706c8c21af9845050fea8a91786e3577
+8eb7e763d297cd93a7a54dbe4654c39c0ebfd73fcc34d3f1338de0c347676f445d32f270664fcb7b33347bd377c9f867
+a1b469e3f9dabd36b13149c83aa5b7b5987eb0ecc1ce6b68c72acb39ed503a11ab4451e658576a92df4aa51d1bc709f6
+b1ef105cd0259486be8f265a73ea089d5b7fab7bd7547932134539963467fb917b2206aa72446e2fed5a8185b04d345d
+b3e211c1a14925f6de451271728a3c1e555ebebecd4bae29bf666927868039d4ec99d9f9aa98d835da7845a5c863dfaf
+a416632a50500f29b6bb471bf00b37558975ac91e5c5b5004b67e130be1acc954a8ebaee7efcaf6883187ee9173d1ccb
+8c655a85f66b5f28ab8760c94b6cf01cdc36fedd19a09c261e432fa7eda7928c3c88355384e689f1d2715d419fd8d898
+b1fa9f82c9866d4f296755bef5b7c39fadd09374f38ef9954aa57b1431a1ea4cc17a9750da844fa1f5848f0ab7ca295c
+b45cdf1a9eaaf85c0b07bfe239da618ee649ce90b417d90b08eb518b1fd88c0d25cd29fa7a0d8058d6616627a3dda306
+a2be1552d3c4142755e0371a9543032ee82ad669d7edd24c4e2941bde3b78c5c6df427228fc45812a55943b3663cdbda
+a28feb053e86dd9e2f9ccbb7c38467e2425fd580ba0f63190036fb47d01eb198ba8590b5cf68d1c0f47638e9dbdaec74
+ae06b849e080efcdba86fa03a0c9dacb38a15ba911aaec624d15787c3e11ada6909b1e33a2e3de928a23818d833eade4
+b4888445d86bcf4d1f6a9c2d253f277596795084c3d45a4591b307b7ae4ba177d6ce871c2cacdcf9457f9c132f244722
+87a568aa2f5471214f63932b0d48e589898e82a1f4c1055a9e73120763430537c233e9a3cb6cc178df53768e4c58c993
+81e0ec97cdf91ae66d065234492a1119198c396e2db204b7edf192c88eb4238e0a45bf7e245f3714bd864244cba0ebed
+a954a3785588d4bb3cfd7cb27df45c82e6958051f916594d76cdb35bb07e4f88e2831a5cda35fe1f3c99f32a275f0668
+a9c9f4d54339d414342e87b03679baf29c219d28b6548f01891cf94d0313a64d3384658d82373d6e838d886235ac446d
+8ef46cb24432b419b4cc803e60b3ef5872db8ea614dc37643e4592fbb2891cdff61f6b2a10653d9e99e6c7359ca4c590
+b23eeb458c05ffa5d58be21cd0699974694dc61a9a928fb1eb509954a3dfe7d8a71620a2d4046a448de0fb213be7e97d
+ad631be8e17285f6310fb72ba913c564fc66d14460c4e8c4b0c68c572a5c2a45b088ef60eaa9d317403bacf534d57a23
+b7130f5607f236374f5e023fd43cc6dee38286ca47d504c9e75c6504957ac2bb9134fd59d8bb1010d545c56ad9c71c4b
+b83cb511757d80781e26b5e9b3e0597c4cf9a976a3fb60c84efeab2b6793e46282612da45b1bb8b45af4b7f39877feb2
+a0c5f8b0027ee11cd5f86515698f689ad514cfa890ac4ead5502b5ede9d7d7ad12285f5806c9c85ab58f89bd9f188938
+aa8e8f9335c6e34bca3472b5f412ce93ab1ed5f9e51c3affdf986a5badd2ba3ca1ee69eae53ba8144927f082371b4cf3
+b2a4f775a10cd9caa776123771f08e928ecdb22dcb91efc440c69e37c6b467acfa6112c2776d4a530bfd6df3b04fd50d
+a0c553d5d2a9b0525f71a5a0a539d579d937275df9220a0c3c322d6c0ac7fbd2fc55335a1a283e687856e2b30398e4b6
+8ab800ab4c810e8f6a9d42d2dae9be89841bc7328bab06b88bbe1256f720ca99c056fbe4e1378d7cf805586ae18dcc55
+b9a8766f4f4bf796e2517a8a7a05bafaa6d3ec601a85c466d33b8a7e0498fa1dd4e2a9e42161fe2362c81d4c8ee1fbf3
+8cb7d054162e9f41245b0914e7dcf6108ec11456b39b473ecf6c40e56b172fe5be4e7b0753a3685667436796a977b977
+9131d0395897f5591ad56b62ef83a3ed9e7b3951080b33ea606a15742f78a283f924373e813b877f32762dd69884658e
+8d784d7f0884cce988305d314896dc6dac2d2934cf5d650904e1397f9b9dca397eb7f3accad60ab5e34cb2e494bb640b
+8819629608ca1535bfc156c1e17f8fce5821d81e6661bca75a1754a5919d0404e31e65bd509387383a4111535e949f5a
+820a6f46e251a1e6d92784aee18fb0d265d7e2f0a5b7e0b15180273eabdefb34f1d575e1d8e93dfc2be1114d10abf31c
+8d10d0e0557beb8db344c2d8bcada724e720823fc37ee7c51b322c3269559ae932bb2ea07e50d7ada88ede788839dc8f
+911a333e2f7578a0ff6533284176cf235036047a11534acb649a0043a326723662bccddaf1970b7c37b5146977277b88
+a4be2104cc5d6fce4a46de5de8d210559a6b743b6347b8d9990315bb56cbf80695ff936afadfdcc415d88b23ce6863ce
+87ec5877ea8f1123371c49263dd9fedfbde41846a23e12073ef80f7afddf5a0ddab298cc02e861a90188ef1282139ecf
+a3f1dae70745b8284b1353aa6902ebe3cf5580e24e02490d42b2f509ffec7e8e777fdce4f1a92d83bbb23cbaeaddac57
+8ed5a0733b42482d88da7c24e85a841ece65f6066dec060bb267a8d1f1ec165ad5f7964c2908d3fbdc2999c580eb8990
+b124a1db23f4875e0caff1c7f4b9a411564b93a9ec3ad8143bc7a70b8305d380b934c194de8201f7e3699e905a1f0115
+8af58886d4ac5578a29c2e309a68f19a62edef5285d0757c42f0ec2550c633c0e991c4cd7a60df4523cdde40c3909345
+a63fbdbde883f54667c6cacb356db1fb976bad147b790064ff25ae72be53bb6f4d74b22ca803996e0d95d216caa3fa81
+b99fc9012ad938b36246a4471d29f0a2b37b2a3be6fbfae7ec9fdccbfd14d48fdbede0d88ef3b6cc273f2488f4cab55f
+acb6cd4e1672eabf530d38f50ae651db8bc4025c2557c59ac4f1a278b4741f1e2cda978e5d1337f9e5aae77c95ccb872
+8f8f6964534e4a9294c61c76206674d836d4d56970e9c14ad6835adc6b0d256402742d8a4879764569d9082ea6a750cb
+969607ac6ca9bbef4fbc2fac22b12714a31f5d6103dfb998c3b6f2776283ebc7346e81a22da168af40752f28ff60d97b
+b633f60cf6eb8ed588c545c04972ff156cee767edf31720c9715be3cda8c8de0290b623b22cb8fadb1690bf3665a7be6
+8235bc2e818e4d259bf2c9fcc9646ccf83b7e238044e26be417d1d0dd5283d7b38c86e8c88a5447645be191516e2993c
+b503052246ea840a4083bb4a8978029af3e242e831518bcca015f2c2df504e98a48c9002b6b9fbb97e861a0a3c5b4b5c
+a145ac57d7c028c3cbd2a2bfea25caa35a9b5d69cb491b13eaadc2b0d927a590decb7c4995541f8f29089a2cbde6429a
+80b4c0938058fa5d03c948777f13c70f46fc025d4d6c2f2051915b476eb0c0bef902374d784df57ac368c01e1fd51c00
+92eb253e3b1770b36c4b2869a944caeed7b5c8a5b8356b25dcd4102df79fab8dd2c9d01e3253070f1206d149c43f64e2
+b7979ad6187f7921e725787b0a99050f4c98762c63fa64a467f7f110932f6d07556453a95e3a2c0162bf1c9c41424c90
+8808ae4c7cb38202c8c8bca0321e827580155197a700fa54b6a15b0f14b001327d4c9a0923168bb5afdd1b45d6a78367
+b16a4ceee9de5f49a99430e18aefc192f3c1ffdc4b41392069f690893bccdca760e6dadf4127539a763e4f60aef37dde
+8ac113da7ca59ca97d6bf7d6e03f1e9570867bed27230515475f965ce9ce0b424c85810e18a584ae5a3d5c2c80c6d4a0
+847ae1b0ef5cb11be37320f3ab5e30f59d7910ba3d7cbf8265c74df25f4b8f56f1ac96cf49fd166c3b6985d1e8091e6f
+aaa9b04f50ed6778e2481842cda30c7dbc7d462b40c7602a438ca9f2c1599e83fe6423f30d7789fd240d2e3166836f5d
+8c18492569faa8cfa1c2a05a0edeea3f63d003e38d9ce23c4a5b31cde993a4ec88c9db83011ae15b578e0d0f6b72ddb8
+838b400217af9241755032c21a3ac4610f77f3ad76abc43f0c59a59f9bd52f2251e46fcf1552b6ee0220f4f2902e54e5
+8675f8de084c6c05644deeed1ff45090096c72c0db6bb2ceaf1c0d070bd10ff1e83b2dcd89b6f99bf132d3e131ef6d0f
+89611bc63c83d56131bc2a8653278b234b4635aa7a05033d71a8377a5d188ffed7506a50a5c37a33d199a42b9e55fea4
+90c290c17f1687a87023fadf74b1e10ad0c0414cf08629b2a313347f0f6913bbe511e5d18d1c3264b47f65dee7887d4a
+a590bcb6391506035466dea82617f11dd9417c9f379d32b4c3bbf723840e1a3124d2327deb28849aacac278470d7ae20
+97c55f459ebdf94ade7bc3bb18b329bbe2bccea345f0b4dc38cfff2839749b8f9365e8a1cf31722649c165e265344c35
+8159d02fd03c1d0b3c928658b3df1a27a57699ed8a573e0c3a179e97f50b6c1a6467b7055e42f9f9c6c858459eed517f
+84d4f009c052f3bf76b2b972b3d8f7a4b2d78605a566478670c33016aab06828a1737a36d3c9173583e7bed0aee84fcc
+b99d7558944ac2d61f5a800c24ee47fca719e69f7284956be94596623cf434a214c042aa46d54019de3556540ea53236
+8d1efbad46f69b80efc5776d8afe95dc0a8182d57318b9f2d6fb5b7d5c48e7181e6bd61a8446a553c58f7899ea7a7c78
+84a9cf6a9d64cee7e7d8f0b678d3606c9080ab3ecf62fe0d6f994a681de68b30534ded61db1445a257b2c5427e97b36c
+b6a5d2c55a23841a4263b10cdf784be6fdfe1b25350a4af510ca294949716711363ca19f9c44ab1c347aa3fcd60f0573
+b1b5b6dbe6945db539fe7e2de07d222c88d7b91753118593ad9890c55c4c3d83b4194f886ea7f66ccbb348f5a23a2a22
+a8a58169edd3e58f87fe8529f5cf7da7679807467ec707ab96faedf75085185a78f2ef912d9180a5e820adfad32ae4ae
+874c1f416f866756ae3e93360342848afdea0048a575f977fb1f8a57325e50da122d3e9f423e308f0acb1b28fd47a6eb
+95cbe8b47ec42a5c72ef7b1f91e3de0b1f648ae8069416c48d5529c9cffb104ba4dcbe87cc06e4e798a1b23bf1595f9a
+a1b6e9c5d63ab1262559727872d1140b74a4f01c12366ed2d401c64007faf7917ec591b631c6bb4dd44b39aa43c7f965
+89e6f4a05679c95d45b54e760056378a5eeacc72624eec8b5f19aecf8ef0d8acfb2d807d3b88c6b1206827203f219905
+b7f7b30cdea6377d5f16d200b987e3b4a6f28387faa701dc579cf7b3c6887d74ca43609c5bc36414a6dfd0317ec75448
+83474b58135f3e2c5e8355e31ae44a77721db71cb2919c3f3403f44903622d4116e812ea9ee9ca073938dee780f4aa22
+a3e4cbbec770630c5e2f3b67059a55b1217435bb70ba5b5010244e241ad6a3e6b8d9261d8a0765c4b42bf795fa4e96d4
+87d3ebf0fc03ad67299f3b9cf9c9ff0890b1d0d2d1a0ca2a62147444922d207663329e49898d79bd8e09ee48a1560fa5
+a1d33282cb17c7a4c5cfeab4dee8875d324aca8d0513567c4e5eae180d1e8ac98b2ef16b31afa7c3f2ec25cf3e8bbd11
+b10b6cfe3ba563b41ae0d66813105948416ce0848ba3b34b8e96547e8842086b632a52904e56eb61d93e0cbdd402d305
+84c4feb35c8d3583ca17245e6f7e73cb488aed515c2ef671b09a04d8eebe6b7579e5b1fc8634fcd4c3bf8100d2cb98de
+918d8fa2f52a9b3957ba412c24cc579dbd1f0b0834b909a6ac0da5dc602ceec17046f61b3d4a2658f724757ca8041fb9
+87296e4775fb887bb00dd3265f202f31a8fdeae5c6ad8ec63508476cc57d330827d0d241c68091bb724a2ba921694a7a
+a8908019d96c506b314c84b22c475157daa36016a9b94feecc4571e869918e4e5a9e39fb7c9ae0f73f9f868bdc50e2af
+abedfabf75a93e7521eb339ce2e22e0e887f94ea28d3adfa42d1e0523686c6cbee4c96b2bbab3b8393feda1099b24d4b
+a464d6bb17386cb431520cdbb3818beb3951b0255d72f58c300fd780aea1fe4dbce5532f5321e80e16db2f9b9bfe8a1b
+8cb8fe0df930e1e19446ff0183c7034e35e33442da346df8a802160120a5f4d8abac236763114a650dcb1a1d38bafb37
+975c47ea6412bfa97db9cf12c2b4c07ebbda436716aaa7253b2343138b36de6c897386833849f539bad7659d9319abce
+8cf94457a5a708cc91bca9615e599b0c0afa92a7f2d9c83704e05a3dba56a90c4eedebb6d2d25b3080786e16c27194c6
+950d02a5e41c8f704184c7c59715fdf3b48d86b53b04dff7c21738c7c38c9f4f75349ac1e70ca18a0744b01fb8b13504
+9458faad893db4458b330ee283d6a90f68346332c99cbe8e121c890bfca908f0c91168072aa221c3c078d7fd5e4b44d9
+b0262948c113fa2a122dc6208250b62ff35b12d3aa1e5735e95198424cf16a4829e9211c9edad83989c537572c5b41ad
+abed7125de7dc52b0b42cd34fb350d4c6c45016319ab776b52289bc8c2b341a15d48165c0eb09511a1a5a5ed7ff39e4e
+b4c352b4a127afb5b0833d210dc2c216bea666e7c5a940a3372988c0b02dfd236e4ac7c124664bcbf353132d6f061f3f
+a334c5919909dadca50f3124de06400df660082b527f1f32b386b9216d021d38685f1839bafbaa7950eea6c1cb14bf53
+a52f4534e9de29f91039af3fce055f2f6726fd9b10595a43ae41f7b466cc4ea6314487081e867ff4b5e35cd622fb428a
+a68c6ba9673896bf49ed145935773fa50d95ec0103f97a6f1ed698d93b4dd78111325f797e47fe153fb3852f4590ee89
+a5c456d516a557aaca80441705cda63d081181199097e83b22e9cf7b9947a8bb78cc476642f04a5ca3b13032319591eb
+8a359a3dacc7b45da2b826dc27700178553f6a52e9705451f24c6d6026a0c597328acaa10b3b5a883b6353eee4eca594
+807217b435d73c1374bca84d2d3e069db756176220a01607b81438a70f69232b82099c676fff361dd909271be8d5d555
+965d0f46eb0804f19dd700d8721349287335c70e992efdfe89058ec424b87acccb3fbb18d84b727ff5ccb6f6783e9065
+aeb5f2a0bff1e6115bc2fa73093019f8c679efec91d03398e24651be187265f7ca80369a1dfa61e8701385dc0ce9a0a8
+85732f872228dd5d691f1507ba00cc94e054baa59a764565401e9e9b3287d2d0cd0f2af290b28b5e3c80da9cf23ded63
+8e9a315c5b40e7cdb866b8a7e6ec01eeb27a52a76a88d5956ac3e66fd9ade3ec954acce816227b57fea6ae9244f1303c
+80436457879607efd008f959cfd7507fbe22e417c701f59b5a36e878a04e51e87eb38c48c0992333656b24a4e671bfb3
+a012f6d166cd1d98098544bcddfbdfa956ce60011694b640b012da3a0a22ac8a054a9e205aa9fae4df764ad60c65a6f2
+b8225afd6e4d45520678e243d97bf48f87c2b8d2cbc24b43f94bf6e7f60b7768d4c3b30d28a490e7c8a1c3a104ac8317
+8437fc2ab6d90716419f544a1d16c607173fae5bdc242d8224d7714c115cc54f2246d1062ecd77d5a9cd3ebed3a8adc9
+b113c6c63125930882c18f548c1baa69a26f9f3dcfbedf5be41aecd61adb896ff9622ce038f0ed27a5ac602b6020740e
+b893aee6291a3962fe17ea41322de7edbea6ebd51d2c564fe23ba8a4cf4b6270b7ac72c87f2cbca209be1ba607ecab75
+92e6a7494114cb4dcf2b86ba61f57f6db7e4d52895ba6c896433139eb2ec9c9604f3e9100c690e1949e32f5b7e29de93
+881a323e772a639553cbb401e2b6a255094412addcece2c99ec9e1346aea2f4e9eb247552435eab74799ee4c7a927b6b
+8d5d3ec378922311374fcb998fe5a42176448b629a6475abe494fa56abd5faa5835af37624c138beeba649f7803a4855
+b1a082ba449e93cc15fb4dc5114351437599fbd4d28eb6b4746d1bd242172518f94b2ca8b1f76c08d9f6ef260d9cfbb2
+8fd2b7728a3c61cd8e0c607cf40e935dc45d52d040ef1259f62e3eeb30bd3a6cd030fcf407fa0b21423b23a795a02b90
+9214aee5787f4666c3e2aff70949dd679d4203a2c3e7b6f88c548b80a3e52d7763f2bc2b7df714eef053f60eda4db331
+b15df25b62c6f4ac9edc414ecacfe8eec055bb07a1220e327bf35c5e452da7620df03416a449197bfc8d948445c5f734
+b41ff69731e7f4308fa18ad286d3ecd7be21afef3d32f5133a0bae877a347f8773c6e9d9b3b850d054236a6f186e6913
+8d9d13d1b7d9df41cf5d30dd62b9d1d2c4933d62b6cf8d1830bd1ae4dd5fa3de36bfa1fc4d57681ae13996f85ad2551e
+8011a7fd7534b248db40050edd9752c960ffd89b0300a91520759ad51da1698454affb4aa8907946605a02ca09a7f340
+9159054fbc10164fa19f68736c2a683d374681e6e9d5e56f7496aeebb0969b8eb1a91e377b3a2928879147a7fb60b3e2
+afd4980aa4661fe05bf9040f6551d980af562da69ec5072104d8ea34a8ebd28baa0b70e0fe3c11f631005693fb99213e
+a92879cac7940c6d363ab3d0ba7f7f24bad0b16142c78969a737c27ebb09a62071540bec1822ae6224d943d02804da50
+89338d27ba29343279dd83827ae17a53e7d634bc77bbd848f3b6a352fe92f6021dc1c81ea6693b3cbcb1f24188edc757
+a2490a856c273b6eb5242672f817e60a157a1dfdf25b1d32e0f4836a9c2371fae72c93b94d78267b3cb142b4f4d7148b
+8efcf5d06107554f896084e32e8dc95c49fc5da3f8c4be4ef6f2ed89914233eaacfea886040bfff14759ce28a1eeaf3b
+a3516280b169a6832e997a4a45daf46aeaec1d8953387f493cacc2835a5791d4dcb24a0c0ad5de79988d76f843d79994
+95eb7531a46bdc51acacf7fd9e7210bf6d5ca59b0efe58f79422394447adcca6f4ea991600e8558da8e19e029701c5d7
+b1fcb4177f16187c76b421c29f715f1551ff365bdce9fe17b74425f76dd90fb4ebe828ffff3d20f75ac620abeb9381a8
+886246027be4062258b232926cc82b6a51591138561ddd0173ec6e4b7ff750e15d9ba175f569c266148c653ac905d498
+952c089dd09dbe531f2fd4137c971622fc1d85a78ff07de634f63853f62110dbae3646564addef8f2a070f5a16396ef4
+812ed85f4559fb28732d17c8fd7c6b09a70da454a2318a0276949df0a5dd2714b14096656b7b5b6398f54c74eb9ca49a
+9340db62e43e43144e1afb1da748e81a1b00f7b0600e8eed117e92ffcf801b9d89b494ffb003b4ebd5bb4e0eb96c9374
+9287c0745b4bbe24b56784ac28bec43ed2abb6bb15bf11ba2b18b01801da7d162aef88e967d2f10fb9f52f6645d7702e
+9615bc232ba6053fe86c6328eead899bd62c4f975273f72595407fe36ea43e30eeac7524bc17dbe78b4692d42ae81c04
+a387899b521b1a89e860756bd0986b302f3c06271ece653425d6c697e0b330a3ed7789efe0e5a1b32e60257a12fa0147
+b4c99909fbb92b1f39e9b2fabe05abf58af834b6c15ab0f62304ccfc5047f187a3ce35388ef293d2857b777f9938bd55
+97dcb90d2dd9291366b557936931550d665cd05bb1b19a7a53a31c2a39d264789477a47ae14f6bdeb171e78941a9d9e2
+81417b4a3e61ab9b48e0ff1afa8b523bf63ef95a6d6980092408b61f4293fb202395b10a5d12dcc54961370c134d5b0d
+9135da893ef0a9d45a719207659cad4a0590218303d0e02016bcc5d14f54de5fb8de642efc7826b3b3212f714114600e
+a00d0f8e2ea06b13f5a75a6dbd1f2ba7ce3f3bb3e62cd3b53f8b6ab39431fd2ce156a1aa4a1988613d4a2b6d91550147
+a3f8f17dfdda07166a7e5503366dbef45ea6b6eaa1dbe02b8051dff58453f1ac24762c82f6db6de4370869f9b25d6d51
+847c2b79076f9284d9a866a72f74f62fd73cccbe2df18c0fe34a35416d4825d364e24f95f728bc0e6a5215b08b6f0d2a
+9816284cd6b8b35e1f5409d3a5899af5f4524a4826470fd164fcfe863994ee3aac77cbc16831f0866b9f0ae561903d61
+8ab1f9feaa8ba2e1691acbfbd5460a4bab531344ce4accbabdbe5ba8cedb5d5fc0967def4365d755ecb62d83b7ffa4bc
+b0cb477aee9bd113959ff7b7675f81ef251b76cccbb67cf68ba571fc08561736e32c18aae93fc8d1912e7eb2fc0ecca2
+8cc41304caf0357d13a25ecf66336bece67d5d319bc5a50328a96199d7ca4fad05dbd7b5edda58be73141bb06e269c8e
+a7b4d91a884abad5337925c34d7fd5f2aea5a09ff3c027cac98c646b5058f7fe2cbf47208930509e2a4eef1468f64c89
+97d942e97efe46594e8fc86828ad3ed1c9133a8067f9b11bc0f4ee3815affbc0c7c46a91c40f989d50f1d8df96982ada
+95a7d369f3ce7f7ad7ddf85bc994667ca25a0c2f11b9312d06654599410d5325ca3ea74f33f21b5aeedfb582a9e40c62
+b0a05b564a754b46fc7aa4f5289f02bd9f19708b5ecb9db5c36bb7505c8b56ec22b53fedefc1df289c0f636c97e8ec47
+ab6e2801ea8bc600f9159d05a3b39e8b0973fb9c2696b3f2685424757a6953a9f8ddf5e29c97399c4821b8d7fd9f1bc4
+a6fbbad2ad3ce8e4f9b939080e9e7049eba9f76b8ffb57f7cac2aa46793a064743239ce287e156d49cf4936517632290
+a606632b62194aec737403ce5a9b6316178c1d27baffdac83981baab63e75d51caa414ea92465ef37d6d687b4fd90141
+a5a99b7bf8f4c109af04c31af9b5f3148370319c8483796cbb5ef555ee1d4858b2c1acb82ab5e26180254399fd7a0625
+ab2b00f64355ad294436339636e7764403b821d4dd4fd74a6bbdc2aae450f14d7dbe8423336e793a393f4580f1b9e35b
+a6c98a6ad7f36f16633fc216c12ca34e596b292524753ca1067eb75ab52facd28ed3a7c55e0a0cf1d3c9115a2a0d6524
+84acda31e618eaf0424a37cb3c386585a3870b2c24020550a16134ad8802d427c918e2854c98e5def58a2363a8e1a314
+9911ec15af39af1a18003ae120da8d909ad4bd43ff03078091d54de71de70e19786b2aaebaa5d55d9b2877004da2c271
+8cb5a148f065e36b67a219bdb347a625a7a4be8f20dfb1cffbb38fd4d843c2b1b1886c1f015793bbcb02af04ed91b170
+815d9adf22a36533fd4a3efae3c4326213ba2aad48724ef958cdd6f0dd5059b519e12d91ed5d92f1418a07b62b108bfe
+ae5c244f309467ada13e2fcd8942886f563bd996a5c65aee73a364c2ecab49be3ba6bc8a387f3baad44776f4f1042eb8
+a47d93b35f57ad890239a6f2f69ef8760268adbe614d5877802db4b6cc75cc093baf101f75be0f7b4d71ad8724dbb9f7
+a0d089701b965df9fea938e337016ab20e0e567e736e6652955f1a93760b4a9f128be5a594e71df8e7db47c3f88c2fa7
+a9d9a7170a860e2860f785edbe18ad909ecfa489cd3a2abc580869c7eb8e9a2db93c1c473a5f1474ec0d51dfdedf95e1
+b665abdd084abd292548c336e3e6fa1c5ed1a53d2e61a10ad6a4c66487d8a9e101632ff468b012506135907f0896156e
+a10ccb363b26beb9622e1d91021d08a3bf02bec96a059ead01961ad51610992ef03558c5f77e074442836c9d2ff44e0a
+96d6476066264eb3090ba3544dbfec7c8a0d90985a1697985db0d04773f6d37d5899a9d4fb5a3207c320ca78c37492e6
+b4290ff9213e2ecd30d303b2b4ecc66c2614b8df246e70ece4e55bea9a1f5a0bae9df6dcbd8efdcf8c4b0f2f4cb44d48
+8ef10b2e53e6770a36b6403678ffb86f5d85e3e87bb1b3ce9f1f0cb0cf32f1fe991c565595389ad83d8c8d54a47dcc82
+91f950ef60014e3dd28f7661e6275ab6f085c803988b7d6dbb2cab25f10b0372e271267245761e1af97da6f48c230205
+97c626e7114396daa337ada4f08da5129464d8e8c68a407c8798949817337578733fbcabf454a22b57926485c28d9d62
+b596984b609a9858b1adefd15a546d4b8a417c8b54504efadffcc805caf8935b9c7f55d9e6b34592241195f513453572
+a3fdd36f3eefffe0cd2a9e6cbfc4eb9c3a499eec25230df8786b23f5eb71efddde062940ac23d5b2885081da48d3c1c1
+aa1822db9ee136d0a51910f0a59bf0d2af6819e4ec0b859b790e01bb08c1def87e9613b355525d4ab7d088b520a6a3dc
+a9089edfa96fdb7204a68c4ffcb7e0a875106886a0c589dbc57a6709e7822747affb07035b99d056baf11d0852720489
+85664ab9d32ab0cc2d2e61901b2682f88a7259c2da4ae6263b917ae8afc232614b4ee56539a868a24940eab74142198f
+b90e06a1a117659b52b364359e2265daaa8981954e9a9c37e3256cbabf133dd4900974a895dde6ec6b394fb36b5bc1c8
+b414aefaa4833283dce85add23d1cfd776567735f2ba9018cd791d652bab55bb0cc0cb38b88fe47e3b4b877e63edbd75
+ae579eae9c0b09c906cc2824eeebe5b4ea031547055c8ad635194f3e864c7a184dc21a3eca9c43c01d9a2f272cb2ce81
+a7b1d13997c283c13f770d5203cb09b5d3ca7d45324ec89c069928e1ed1a17c57510e0ebaaf54a21d27b0f9f057bccec
+b15d4555520565b76ec21d87e094ece2e04c7c4bbbf560264da37604f1a484ecc3ce8143b04759fe716411293876d0a6
+810bb0773c06caae8cc06ffc92303d51eadca1e1b0acd57ed23f5feda70378e180619f68b8db98e61d792568f49a8316
+87dee32807e2e5f2c884822b31098e5be2a4d950ae728e3281a39e661937c4b7e9fc025b50f437f01d69e5c33dd751a0
+b46810bd73d077a6b73757d22b5939c02a3632e81287073b00ebee30cdd402e89c318e0b03d01fa331193842f3a1ae53
+95a136a7bdca77f764d2c2d4795a8fc9e5b9097d73bb3956b7a45b42185a99c949db8ac5627ca263206cab9cbecbc31c
+967eee3c3afc138a482bd120050dcb9b45a9fe258e5e4b678b1d67b4691f4c5d89cd260210fb50f9cf2d3e2e2802968b
+b2d59a9ed0448b88f8eb26d8017a129ebaf27f11e0a031130266796e5f777bce93cf2c7e0fba8f8ccc997315db9aeb9a
+aec708d3093b12caf29efbd8afe3ace1de24496cee72270223aeaefe4f0ba3a7acea7f2f5f85c1f274aaf5188616133f
+8563ec52704c1c7ab515451a8f89f87201d30a12c95812ac95fde2af033e5019615a07f28b540a92781ed35786b5614b
+b1c8f819a4ceb17d35ab997c14f81ae2af9d4510caffc61d4a19e9129e0bf7264482a10f329054908f99909999b6f538
+8a65668637ba24358800076d8edc90979d6e614e6a683dff7859ce7d686014e6de85298f523ab060c9a9a4c4b8862cfd
+b4df02dd6f4d3908142654a42af60fef034379b1526c12be66afcfc4f1177991811646495aa85702f3461060732cce80
+8991bef253f0bb9b86e68e81f78116c51097004b0309e199025e45ac7ea55f8f6b2bdc58886899d275424ebd405ffac0
+a74f1048548fb41e57f679d632280fd2e4cc6ab88c81675c59fe143b74dc7ccf050db53dac5611ed6b45b6a0b1b7f3dc
+92011c668bff7ea995a71e4774e3fb5d521ee2552bdc33d9a65afd9677572c2a303a940751ffea470af898b01b9285ad
+881a0e6042771492633b46b6101f96a48a93aa3860533dc207cdc90783fbe52b4a9ade1eea9117cea004bae802cd3fbd
+b3e578bfd77a3a13368ecf8139b69f729cc720aab25853cc9e2f505c2e03e75cb779d685698af8cc4aba8d1c17f5ec29
+a025b6e8dbeb68e7ac4a595b34089fed0d24eb29a7be235048205e35a97634d6015ab24c21a017b5012c3175677fd0bb
+b751acd86ead936ed0f22d770872cdb5aeca3b1ec75a5a1e65748b665f8d1c859b5620d761d5f0a2a86331188e82b2a7
+a05faf0bdb81caada6c662ed2fd145eff5db5c423258d6609bfd4c467edf3ddba6480ab95ac9f4dbc932f4887b070c82
+8fd1faccaa7cf1d59be37bad69b7a99b7641cbfe930d778e0f712ae1fe9e78d53f37d7d5d3aafde48452eaeb65d980b8
+86042bc710953f0042940625d8b69ef57c615f9631fc49aae169ca595446e9d55e149c92994d4bce7b544877d7b6f22a
+b396047f716c5fa8ca9234c7026f1772d83f41be03410b4a32a376e5a038d252b8f36cb813bc3684f1b50326994c31cb
+a2eece2d76db005f5d95f5f480bb3353ec67a9c27896fe54a2cd5cc7f802507d8d518596601bb3d2798842b96fc03df2
+b738c1264d094f7b7edd27b0ddd8e29716c73bcf7b450ad7715fd21e1052998675873ccbec486fe45a8f72d9b006f239
+826c4c5fea1596e353f6c15d91a9bbacd9ea592aba4d22e735263062eac44f073e5defb794f8ae4afb7d4dbcd1ace959
+a8f1d170f63ae3b05ca9996347a1b3987136e7bafd02774698829986d48da3d421d269d31743bfd3e7917c5ace7ce729
+ae6871a8278f24d816657889ccdef509df0fb941fe6c5839cbfb704e81b942ea2a324fe0ac9881b385bc97410fd94b0f
+8aa6bb564b6a0354be89c4ac10309f941162fb3a546259c5d789d4608cc628f69ecf814b59bb8bce364162f7552e628e
+8ed85481cdc58fc540384213dd1b86f80af8908683d7d2c63ef5f8c4ac2e90f0e5f4e07b1b841eaecaab1f7e091423bf
+88741d9c9d875e2c1ee5b95bafa4d8a22d72a728260297d048e4f0cd1c5f1eaa94fc233be3fa15a69163f218d62ab17a
+8a99655974ad5c0f27b49d88a9c52a5375e16b9ac4f22b1e1bde53ce0a21589022c0ea926a4c2d7c432a53656ccffa37
+8e2628878858764824471fd613cf40d1bbb3fa84ed081a762da0d6d491d54688723273d87a587ed1d3067976ab74fe1b
+8f1a6162bd6cbd2353265bb348311073bcfca5a86f41cd0c63ab91b14aabbeffade5ae8a94f8e91faa386223fc2bf849
+aabe8cd92f0193d12b032a9bab4bf4f02ebc0b24d1ac09f8ca8906621d6c7d4bb436b2dd879a1a1cca2b44ebb5642995
+91cd27988ae8100d48ace10ac9cac4cf1cc8539bb492521a8a6489f8575a737f2a1d37fcdbe88dd651179145a59af920
+8baefbda554bc0a0b425f2e132c7de061fdd120ebd452ecff0d78cc5bc5b15401997231727a37e9bc4abf1a553a4cbd8
+971b12e25b989511477c04602f48f584485a0a0773b46643190263c0288c2434969bdddb1e55dc1f5b1b028c1c53eb32
+a0e47f42444a16e51323af6f519c0dd2271a85746882818d02373ba33c2e2f7bd6a1c321497377e4781f72427fa34224
+b52bc02de867d7b20cd247cbf496e03d940be2d7ca5755145e9a0168889db345fa9ab17c41635ab275a459fc9d02ff16
+b01db7077e9f01e675c62f5095400cdc68a059e1a5005027033ac535a0505f45f89faae4fb9831f7ff9cbad3b55db02d
+81ae065f1d55f4643a2ee120bc1245b9730455ad9e5402df8d6fcbb1bec71e40f1bfe7b8e67f96fff76d1478cd3973ca
+a1be3723920044be80f398279e2f8432aaed45a36cc4fc71c87f5dbfd52225379e94600793f40aedaac2391caa57d155
+b682f74fe46d4b647196b7c14804dc0b35e36cdff59671d7164ece874107964ff9f76c29b23c190796a9a3aa2df822fb
+b8152e458970ab53f6b5bf6101008c5c31d2f58993474eed6bccda074555f7ad2351810d78676b62612e7eba2d86247d
+9132a8fab2010360ca80adcc08b3a01658dc8ba8f60bbc45e1144c1219f69b985436c36c65cd7910a8aebd91ea1d3d38
+805cd373a0919de801b6bb7a6ebf55530037fa41a1993c159e90213c492165c42b5642dda5fe7283ac4e3ade6e63a155
+91f20d77fb7a8276174989faed41fa6da841d35b074c4a756c2b4730a7efb9b124ea6c7d5eb150a8b1126636cdb2ff0b
+8cda3ffbd0ab6846dbee6cb8c0360842837a65f83b6ba17085161a7371a4466172354e494a8614cf2f1f4726d0a7262b
+adc603e61dc36ee605dd7f2761ed568bf91b9dd3d40903eb7d77b11d10e4f762694fbbbcece72a7ec26976054139c768
+a6accdb3df5029f19273a39bc30cb622f87522ca5a63372dfe61d993dd783ca5e918218b5c519d25e535d8b8238339a2
+a188897269053f2494bd0de8cf098e41010fdd01f5a49d7ddd7b294ea748f1139e0d92fa7841dda9f8dc923ed6f02615
+b26ad5dde632259293d91109fad4f742ab74de91f68ed2416ff53c060d1ea4377a875b2ce960cb7962c37a5fd47e85c8
+82cfa86a17b27f375172d66b389df727734480a224b91585fb4782401d6c49d4dd347b8d1e8df6b9c0c1d2f8ae658de6
+82911748e1471bf5d7fe3ff111ac06dcaf5b8a43c76f6583ca491e0aa845b61cdd443613c5728863c163952d86bfd482
+b7b0d4ff87df02b5481183066f6ac0d1636718fbddc19889e92a71a168fbe338ffe780a792ec5642aaa4024d0964db69
+8ec21f08594ad38e9ac365e5246aa5c2c8e34ae66382ac483b47771c33390ccace4d906695b1ac0f1c9204c46576946b
+b9617d746596b26b84f2709a03b64fe77e9a10d0c85535d92d28dae9de3bbf6455a247f775dd9f67061792cb924e3925
+abb2ff3f16309fcfe0a3b1bc928ca5cf618706cad3645b029bd54e5305682754e6ca47e364ff21b1750f45041eeeb358
+867abcb8029b35a54552c57346024ae7eea38e9ae4bdbd68bb3c1de3935126880f237d9aa95d6644dba8ddce67e343e7
+86eb4283147a9e595d639f29a967310acbed9ff09d9043868fd18f0b735d8619eb4ee0250764f35a51e00b58543bcc66
+af1779d2115ca7021533bcf55a100b4d3ff4e45f8ce6a6d98df22881526a429d97818fa1867ede09918a438957a03534
+b10b36d0b69b0dbecb6f7efb6c612b0462c346079109970a26541a21aa2b5b81c1e121ed0d5c81af00ea8eb709a83dfd
+911f81ed75fed55f1fabc5f86f9f38490e006820e5380963a739ebc0f87a1dd3b7da8c69dff1e580c5ad2246bc08e2cc
+8379449499da9159cac2c09c61777955e61c63378d051bd28b59c78409ee5d09c43e7a6c246572bf34233a314511bbdf
+84b48ec8895049bd03dc3256bd0d63f6e9abb178221f7d47703b447c709fc5fda47b19a3439f30f10d2670194f390915
+ab3bb5afe824d8aa20f97ead4c40aaa93350f33d980b5783cf56c8552a4298c989b7b188d023711a2eb79631f3a8c317
+ababba2722186a3b2272feebaf2ff46c93883b7265a6a4fba039d5fc0e7fe81b7d4dc2cef7738406f156f693ba3a55eb
+ad50302a51eeebe63085d3c1705eee9142bf8717d07c5d87e0e4ef5a12207dd5432994c72b9493f9ceb558a20929c9f6
+8bcc3d83a6b8998e1a1066347c647ab122eac80c9c505d5cfbc370f466349671d8da4d500201226c15c1f62162efc62f
+aad6946b5d5df34ee6f7422fbefc6de33dcf4461868ed7ee7f47fe9b8eb2f7a89759c73b7a029d422b02afd0f550e722
+b0fe1d9a30759d83084b4c567b586e5a8f5a080bfa93b4a3feba59edaec33b6a2ebc98ccd82aa9d8cf0bd254d5f03baa
+b993c4c2b77fcfbdb213bfd5f8d655d1d41a52583de63b432e2732df2f9d88c4c6779f314848417c06a089fcb970c0f2
+842ea3aa645e5852695405b6ff2184e55bdfcf50be2319761e717b7b52d904ec47ad3abf986850c643003442e302ef30
+8093b0ef1f6c84a8253d086a6fda6be8376f925f416a9d1f44ea72489f60fbd8b53cee616cc5ece43e2a202653c0640d
+8c75f10b6aa848d84baa4120e75d3edb7f8471473851326cbd9ed7b29b22c5403028f49430bfe4320c3f4227827e667c
+b4fde4f20ab98f76f55afd533f1b09ee4ffbac9486399714514fd694fecd0ad1fdafe13b2b80721829c7a59e4c951a76
+843b2ed867cd8edc2eee84497dbd49f3dc481e7ece69310d06225325ef032a4e72907e16e7b6215ca775f88983d55e5c
+9881e5caa9706e4d7ba6ab81525090e29ecdf1808931f3f2b11ff9ff5cc97f83f3e14fcf18abf18159c3fcf4cbc27042
+b6c4acc868c05c955eb36a24652314be37004bfc14283600523729d466c56018c99a45a41ec0389449fcc3f8aa745638
+b6820864d07715dcf4a9ece336464aeef9ce381ca7dba25acd48f60af056a3405c22792cdc57c641e782896c0ea05b25
+a1bb482e35f71772486675cb4ee0fa5709b757083d18a29d4f4344e6ce901b2edb2889b7eac92c498b90c7d3844c450c
+8cd8d8d47de859d0c68bdbe1834a1c9a34e92636600fc592a08f96d66426c5f41f388138f42c9b8ad72c596f4bf85496
+801cc0631310656864b25d980c9e99a98fec2316414819afeaf182d3e7ff93b32a989e2ce63f5ea9301745080854188c
+8fcc6b2b656f7960d9ad48c091c1ea71b6f0f61553f7695049c770afd509ee58ca8e1dcb403aa2c5acfbbba58676bd44
+b997b9a6b994e3eb2de8723ec485d8181fd674de19ac9c2f50704785d9f5a28fe3ad194eb052b5ce122ab5e6e6968a70
+a909e7002b82b371952ca9d0832f531db15882180e97c12c56da649fd65334904fbbc3f097b6a954469221d181e718bf
+acfc712e1a61504814e37b3aad0d7a5cafce5901ffa43c13bc5f70507800ff03ed261367ccd09db7429cc5dbb892a7e6
+8d634a07b69ad87e41d941aca08550ae9cd72fe31f3075511d030c364fd6578a36f3f0f3785d19305a1e772486ca097a
+9746ce2d890248002c1bfb755e06f4f4570cefa7636e10319bf491c654b83608766e95fe9c77f1a6a630f5add77b71f8
+a9dfa56bf82297f709f1b4bdbe4bc194bf22c0424815bafa6c1a536f2d15f35bfdebe0867ff20781a49274075622861e
+a723af2702c6b473caa4a64142464f201bd1e2f765454fb0236082fe3ad77f22b4353e5981e6bc37e974c7ef797f875e
+a42a1a0c50befa6864fa35c25a17f5309684c53257376f8111fe96c84a5e09376fad9c8545e1946f360e16e1e4c941e3
+84231f6bc3038320dc13f3ac014977326dd13e5b2ba112c084d366b5255729b2abe665aca8a41d7aa6645412765887ca
+a64e21d651bed6dce8dcfcb4caa60791b9345cd7b6a100f5bb78f7423fba5ea0d0cb3668f3415c27af29ac35e5dab0ae
+b8eeb2128ea14d81fec5b1103d8511a3dfdab925212363c75c5cc01515fd94be8db2335bb84e221654380e58e9f2be67
+a92e9cb287981b33a5e697eb1e757bd44f45efdda1759122fb27dd4bd4ce3694f1b6b2082ce4e6e3919d9d7a0b7c8a12
+88f22b83fd9dad63e800b0bef709759f380c6dd9af7058100413e7b09c7517eba258d6367e0cb1a41b7762b86b2ef137
+8353d45a2096fb4bde82ca22381bd2ed93fb58b236b16e68bb37df3024672067c4378d7f04a4da4d116e7d57a2211f7d
+9076205bf231de091fcba7f5a4fe1d4a359f07236efa39f5715f206e5cb7eb3d9adb56af8181f63a9d3e965dc909556c
+93ab7f56e8d37b47d3a8cbd222f2dab4bdbf94a1152302752f0a731294f4dc214fdba17977f11aaff2eea9517fdd5789
+96d9883ee108c88342befc358325356dfe5d72c521d71e4b3a58d6773ea3d1a1de1a20572aa96ca0e8483eba62466504
+950e0d61ce4e76fe0cdc3d59c5bf23d8e1cfa9d6ee13b9fe41e6ddc0fd52081bb16bcdd973d319c20709ec517fe15626
+88809c1e272b552d46137165e5396917d107547b65059fa646b742489e8892acebeccbb3eb8f2d676e3836c985cb1756
+945f13ff081b74403a19dbb04173780f04766f7624ac6b77f46464df5f4f3b547c459f41fb1842164d8f1c126ad6be65
+abfbadc599bcab1c2b7cf1fc5aac7798d9f617d6afa0469ee23230c0d004fcd3de0ea645feddc74e676ecab1fcdcd8a2
+83ea1571b064d05e1b7f4527b20ada121024a4b2dd8f7d551945488ccfddd671ed2ed3895578afcb3cf958f9a2c75c29
+8fa75050bda001409f2bc0a275d8dc0fefaa47b3a0ae132758bd711eaed0851d6bf3e4b7f355377a93fb8eb02b3ac6f5
+b2fff49083bb30e2661e2d8978149e0d0588dc972222f46d5d120d01dc5c9978830c442827c8fa295f6b8e6d8c786198
+a352c2dbe4f18b311bf0690d77fbc9439a1b8088c806a9d89071b3ea04ff387325cdc04a091d2bde5fd087bcd0f4f482
+948ea89408826ded81549cce823dfd7605ffc2279ca7d0964b1ab3d5f35f4b174e81575291edeb9eaa4baad3610ba3a4
+998073b618140b04ec394ffe4af02df044d923a5cbc8f06f26c9eb4ece17abedd4f72e10c9738bd16863327c0f6ee20b
+b3bfdda0d6960af897ab508bd9312d9c166157f78b45157b46fd2e38ab2e430e8a19335d8a611366cf74642bda77bc78
+b8dae3e2ec5eb97ce3b5e9be719bb747e6e8f28dfb1a6b7bf5063822b502a5422cd586bacd87ef83c0af081ea4d30a57
+859713ddf0ae843ba690fd8177ce6c08e2fe5fc1c8893d829d39a199e04758719bd3046034926de40973a992ecbfeda2
+866f150d4b6a015b03ce8ad93a70644b55ca1818a0f50d24795698c62f3abe59d3b8abe4c11ffcbef20127d3b7afb970
+9145367ce9e2a5a6140db58cb097767b5a6e19eb36d1c03acadef612af95eba80048f2b02c6fb46eaf38c75288e3e4eb
+8c298aee778f4af13329975754e9b428e127680f26be139307d43268dc63892ac98284d78ced0ecd384301e26d5b63e2
+b4c2cc9256fc33ed09531abd7c3e34f8f24830a8a2cf2d684cdde46155f43ff2715c94e7dfc7377765ec0cdefb21cd2d
+b9193113b81bba4ebfe40e97be436515254bc67a94939220e5e69a197765bba40dac3369e5cde115d1bbb65e1c826038
+8474d72b7cb52768c484ff92d014d7733003b511c0c915649f65dfceced47ecd933ce876eae254cdf2f6357ea865580e
+808e9a59f947b2b39af51deab4c164878e02d95773dddf1123091e27de87cfffc07aecd7c9cf3e08c0b9f525bd87fff8
+a8e0049eec8eb70c12446596ba5c8a29823704be3753312c34cb271000b6c154b1022812dd02d1352cd263b655437d6d
+ab7894a75e40d888a4d0539582cfd6b458da009a5017e561c14d312335a75745ce134b57466fd30c250ca07e0529c8a4
+b30c5c0abfd35ded7a3da8f9c95e3e1c320857be1af317f6ff5e35101d3f31de3735ff8741f6460ae1e63cee543081fc
+b15557ec268b4eba9628ccec0a5f3c947e624b61edc876e2ad8c36ada061fda76f69c8afb95270b85f4672171678d078
+b7ec103d6695fa64107f66622148902019ff3acbff7b77ad80993bdf209b73990b0fef92dddc5fb66aed77cdb59af9d3
+b3d002f0a35808e3785d58d0074be620416ee9381bdbdc889805ec2acfd169e1ccb60045d87cae3e90d5da94cd58bf80
+a17c44ade6eca0942742edd237661ed406a129a968fdab28a58d19308d207a1e7853099a4a3c1c181695fcf265107a55
+91fe5c0d672fce368e229e735eef43868e31265502e2876e54aa44470a257d1c126ed73d6df860f42d8e1dd425d8987c
+8434fa331278fcdff2c8c07596a051847425fd7cf09af31bb235d208ef6e282cae173d6ffb73c0475307453d6133ae7e
+940188d6c20924edf1d9343ea85ef9e08d9d87d2a188f8b69514a22cae10aa2d3ea8e662d43d60b8b77183b3c6e8cb1e
+a89f57a730437fc511e1873830b300df7a417493a468afeed2f837f31641cba04924effe11be92d3bfabbad0bbb7d04c
+a561550cb347fc9178c875ebd8dbf5d14c0afbefa79f7b93b893a25ca8fcdeb0293de5a350ef63413aa70745cbce9a5e
+89fe7dcaa6a10cdbeee9d0d3bc8dfeacd47e1490a6c3b591f66d3a64ed668e6034381e0ea9f5f04fd2a5d9ad5044b8b4
+aac54b334514d41665b80b2cf18285391f47be820446e2272d69edce022f6d7689c8e137e2e9579d0846bf5440d768c8
+a231a04b942d471b32cdd12eac3eba00b8910fca0812c9470802246c479050d6c860f64bcdc6b6e39ed0e9609df9239c
+a6bf6eca52b5f3ffd89b79be6edc4f517fe9c9bc67051179157734689fd63649e321d1fabda916a9c4666b64ed60bb4c
+a7c4f791a1d77cfcdf34c3b73ec7a43aa1c8ec81c39ce81d12c51973ddb0bfacc79e1a128ce17afc5838982f66cede6a
+a1644b337c4398f00e9ebfed20d9b2c900ccb667be036abba0c4d372939f881df2bdb5d40b64354f65c8f2ad9ffcd656
+84f6e86481d3322de791ad01d8c1556e5480534e52970fa601b295a40270882476779301d78bc2ebc323323ad0b62253
+b32eb2beaaeab27e190c9d381b9f3446038391da552db5ded0f5b58d070694f07c737315a465175da29e2a236c539e9b
+857029d97cb9fcbb67e194d9aeadf5b25cf8184b3b704ff5da424fb4b39abdf3f7f317b3f79c762605bd9bdd5823e7aa
+883926170997ba84cf45691c117912f6be5c691abab77fd18fe114577e6dcba18f8c0a6641ef59affcba1b2c92e093cf
+945be3febcff77b4238500054a053c983add7a96ef43cd91921dad908c20d4ae08857fb93a5bb588e9b441aa9a536567
+b9efb8be322722302d1c06640f772596fc362586d8f2e49c41810f4bd2b59e8e9abf3d5369b2421e1ce6949c067f07be
+920ad6d5cacbdb46af424141391817da2fe3d463bab8db760026f98e50bb51aa4f3668520c133ccf9622d66eb8a60e86
+a1a9ca07d8d3a44fe372aceda194f15a2dc3d29267aedcfc3fdbadff0bab1c4397da1049bc0feb9097afdcf1cd1ab603
+935eb5fe97d580c10766bfc2fbff71d8584e00e1a321018540c25f6b04791b63a0d6992257fe110b0d17712f334c9b49
+9530bde6dc33e48e05d98b77844766afc0d5581922e382a2fc1c183adf998c8137df29e56b868c7892b2c1af56edeeac
+a8cd3698276c2bb8d39ebf7fb5fec139580755adbf81bf362e1cc19f4a8be750707bdf4e1fde3064873495cce5cf5171
+ac5a83c82004728b34677bc6b1fa507687992b5b78745e5820de08f3fd99e35c905608936ccab62ae39f0408334b3c6c
+927b0077386a5055b499cb5a597ec3c9934767343fd91214fbbb5487faa4339837eab52c75a627d7addc5cda5ee35108
+a8acc2ea4a548d9a2fc2738abcf75cc0efa189b92a99296c0635d53f2c0d7ee40ccc8ae410d2779f95ac6f2027c81d06
+a74c24b8c695920b12a86ed6da6ecff72f8e19fb06fdfee9cd1c1e8e5f1c202d26fbf2fbedc9a5deaeb2d986425477ce
+871251e8d69de5c3117f364bb95d876fb89974428bc167666088d5ff1b83328b675ac2efa2d0e215831e69ee254623fa
+946f7a6d3d6700f65088c817636ed3c1349e4f5122fbc22723d131d8ccd055931dec977cd0cb8dd888c6abc51a5f4194
+82f7c1dc3f133725570c7b64e31b0397fc3a82cb4966948803de210182b9716ccd19e59c0e0382c0c970d05c5e13509e
+8bc45b43102e0df4767156b1e8ec635cc07fd629793d289be1f2470297e8a084bc9af0d76566cc485a8ac898c0493fc5
+85000f8c8130abca642ae94b4feb3448390745decb1f443c34fd06575f1d0de35bbe649b46251df0a4bdc7a8bc133b2b
+ad1ef07d34c59afa37fd5147646c24c03622ae4884c163b80d45ebfb5fa994699ad9166ce1ef727c22be3c28e0838cbf
+8d1dd5500229f463f94c611bb2674640d20f2d34dd40b28c4d2a21d3e64ba7355fae55228f1c70095d1b288828a1950e
+834cf56a4f2c2eb04b89383213b84bc6ba554a4715c3c1547278e5501102f6ff2af27cce0f876a2aa2da57b5ac6f3b3f
+a468d06083d770bb4e484718d1c147b49770757b5b296fc6d6035ecb3c2f5c4155176f12ccbe6616184789350403f387
+8abe730d80ea895705bf67ac4f6b6a36fef7403702d8458a383d04e4859b4c8c7a75598721cc75793d29276afea27ccc
+a3890145fa43e6b5c7b8aa0a73a62c39d623c9a75d17c5a05bdddec08d114ab5b0a865c9edb2be6ef31c3dc9544119ea
+b2b7c1cd0aed6b776515a12a0f3a86353fa3d3a3b6027422bf7f2c21e6917dab543e189e860c8fd3aab65484b77efbe5
+95215b7d3d504ff83ae2bff789feb6b5919287d354d567141bae68a0f0d27b3e898edd8a9be5a51c04dd28ce9d4ab937
+a93a3da0e101797c690c38a5bf5bc14e10842e48a18c9888807b2233809ea8a34a76d20a8ece0b682d36c086853cee40
+849a7fee901a9279dcc36fe8f276ea6dfc37c30f75b679ddca2cae9c283de19c4df56790e6ae12c4bde33e837fcbc324
+b5c1587d84b0826e64438d8ee7c103119b164bede8d243a0256b5b798240259dd63281b81bfc613a4874a6732d05e143
+97600c536388c942e0a72ba3bc33b3af48045994a3ad0948fe0741391c1eb99693d072d1efdb644abcb08e10474b7885
+94c2120a5b4743496e7ab9bb2e474580ed27d7cf5b6fb132efcdd7bf934434d2be8d6f0af009c637b31727b3ad5d2280
+8a5ff1e7f552fa8b34b22a220eb1cb018c9c9430f0f14a634121923497cdb4a69fbb8b60eb33e5fdf9b0feb3e9f5afe6
+8b4c9032f25181e6fb9f60eb07e3d6cfa2b14ffdd6a0fc1b309b078f8290901e229a5a6ed96dda74e1a9a894224ff588
+a5e04e164ffc46da1dfe026ffdcd99332874a110cd168c44762c461a5560b5c098ec71673d509fc053f6d9064d4ba255
+97d21cf8327a81385fd3915c7e8efac7662f4b39a9785b4a936fe1b581d630678f42a3e9ea7e02bb4413da7ca9a6f35f
+806d8462bbf148eb4cff812cab11b3d819669ef5f0d76b228fa166b83727c92fdac98ff3afe946855685b050d9d4c6aa
+8a9899b0ddbcf4ba3f16bb006218022efca867a5b32e1de9c7efe1d7039c8e200a406bfd09ebb8921bf1997185e9266c
+8fad2d8629c546c5de443b36927b068cfa333c8c4c1328e1221a1f6af7be5363ab8981fee54307532f239eda7656e6f2
+930146a1f6c3decf40198955059f70c98de7c5bb1b25bdc97fc72de3a84db1b121430cf7a7456a692d8bbb6b325b6001
+82987887016fdb90f79f045c16629c5b2b17b1b4702cd89d06b70086e5922cd10c5763cba6f3d30a2c33bc84be36c6f5
+a6fd7e4834f7f29da41170c13d29acbba86c74d5924cd361588cdda26a3ea7f11ec34c31869537ff7ee0b57a24555e9c
+97b2474cbfb632148869a6b911c2ab91e4af9eff6c181566a1eb34a05d2ef3fa9da4fdf14e8fd8746a7c3123e20d572e
+99ea177bb7d98dce25d300b09bf6ce08a7061360c4ed9a54e30c1aa5a467be6225737b62ae921e91547b5b9d39b800d9
+b9dae836e37d51c9611e6522aa6aa8bccf2644f23113584c74c963d79af0a7ae533af823215fdcbbd8df62f00ec1505a
+b1a7165aa1ac480b4eb1f0b3d4284c69907d1b5056a343a2da84b3863c9a2ec4d757493f5daf9ef252a253bb3b2b6745
+a1322eec41b38b8bf3f4566bd12f9c230dd04d085e0526218489e986d59895d471bd8bb08351edf40021efab1d29b2d7
+96d559df46015e62d8876f4d8679f9a9867dff31eb151238cd75b3a10bbb2ab0f51c804a2f5adec1decbfa355042a6c6
+ab55e38cd273bffaa94400bf4913ce0ec1c1c848e8c53be1808d4ce5338ec92b4a4160b8faf0d1d8ee8b71ae751d0ae7
+b61c2987e2b402a52670abe305f8a9976efa9720ad0d7c5c1d0d6d9ec6f1569f51621b6edae84d9bb3fef32bae31a088
+b5234aa19fd9e714c7a9f3ea33d39a5c49f42e7a8edabd8f306083669df4898711d4b50b049dfb91815588ca60052673
+8e98a7b90baa4693c6a1e1c2e556d018c3408bbbb5dcf2c32d120f797fd8ed1373f1f112dbca114863801ec6efc1a5d0
+a7e1e77cbd6274f8c74b37a607cc20596bb7fc35ff1ab4358de15b07952aea397e409b30188c8516676cdd05d4919f3b
+a5f2336ed9338772b71e490b1b3916d33df8b013e4d38dd57185b7314ec9aedaa34eda2733c38e06e656a8cec74080ab
+b5de079ec867af3a3910fe47628c7d793c7d70b79e25a9a436e0a75405e2c58b740c1b86e1b073842d475e0b717d0bd9
+abcadb7a09173f1eda179ab7e3a5722f020402eaeafb9d604641645c21f1e009b758f2a6fd262f115d80e23f8baf7328
+8694ad59d4cc328b064884d147f66095605d9bf339d09e45652d68de765f2b09d45558d45daf9b4b36dcf881df8d4fb8
+a2cc7b2e812041f17b450b5fa7429cf62e2da06a7bb3c08a63d6f802ddf13e8b73d2056bcd6407476dd322fa35b9b065
+a97b0e7e22214f329fc57b6d7ba882ca563f863c06f1afcb60c0bbc81ef08ec866d39c81a80a7843889fc957d532cc0e
+a8a809392dbf35911df8566dc20e2373e2fb3272bd9eaf9f474588a9132f06b5a1433ba9f36a738c6cd3fee403188fca
+a3fb0038f83116eef1d6b023e2e17ba2795f7f90ed7c857d9f04337cb4e0c2e7d691bcea54aa72ac5e4383125b74b755
+a80ada835fede8d121162aabfc8c349f685775406693d599e3c288364097b02d96c10ddc20e72fd308fc882e5b70c064
+b6e6c4b24731a2895b7513ad97c0928efeeb0c645dac9fc8cbb0a6419221807073f6996f2b778e1dcdde63acc3a6b2cd
+880a2e8fc2eb57f44b08cf4db5cf1751bf9f4aa688708039007d2a198f4e7f0f808aa566b36b15b971e804835102400c
+8b3baeb4e1c1d7493bd885dde7873afdc235b58e45b515cf51ebcd02a9b81911c5ca182a9e340575585186c99e71d2bd
+a6248e1bef3c6c6ddc155dfe95631a3f00308fa77b1c1779935e76401e750f151b7377f9376c08e8273680e924382af1
+800133df4ea65de3935d98b0249e335a918c44167a34a16c0a4adaa4654f458c376eaa76ef088672d39aec4c7d951833
+8317a6e0667fb524f35672e070f047db29450b06348604319765e4db09f966ad995098cf38acd30346c7fef5dd62528a
+81fc2ef2ee0e6f21f406c51f02b9b7be8d99d30a054df918cf89c708d64c34d8b0dd060dff4383de858c0dbff25d71d3
+a28611f96138fe6974e3e1925b582cba76166259c32b39e95702fa0c4957ef2ca32d575b1c08cc8dbe96ddc0eb56a9f2
+86c6773f4e0261413d6d3944e0f7e498a6dae518120e3940d2f45054a912e706b3b615fd160e6143a7e54942406f9af5
+ae91e3db099d165b198d80b6d9af894203949d87cb980f4db97dd43ee55fbe1a45df156b72e3c3e9306975f9e5e62d77
+ad00ceaea52dcef616be9f9815548f8e9b800bc9c1a8832a4d8acca6c8779317d1951e5700e54db070a23db41266c934
+94426f78470aea2d82eded320b45bea09b7cbdf02a3d7c2af4ae4567a3493b352b36f43c3669237879910dcefcc82fe0
+8aad924eb1a30d2844654c9829d82c65fefe964d815572b6c9f902c6a826c247257a7d0d4967e2bae331d52fb3b7c0ed
+ac9489ec928e4f43f8d194b8f3ab83382b66b045f18efdfcb05c1d4e67af7b3745ffbb7f52cab4b8895550d10132e2a8
+af8f390c7cc40a08c0143b467634c10e8046ce40466006a4b4297c76a6c16309b50f41a4a022fc838738c4c72edfb34e
+923b0384e87a2ddfb7a2c47f628172e8dee76fe812c44a756c67cb20527d8e9029a561bd4ef446a013d4be7db7259f6b
+856316b53f09a90af770bafb5c9ea7deb921687fdfcf512840e96fb83df08820c42263c9ccf51465da33f1b03db04d09
+92e8823b523f90ab75ac6e30869dcb257d232b55a3e167769ab5b54cbb83be94cf5d84eed4b1653db17f3f1350ab5e53
+8d0d05fac92079a3df86a72fa399e606fec7e56f81d3443cdf0cd373b3330235b76890197ae61f24d17de39dd1aadd06
+8a801fc71b9b6988a829044060679a7cc3d40630fba81f72bcd15c0e5728867f4bfe938066e68cbb54b042a39600fde2
+b40a6a786ca1a21159b72990b4d3ae8729722cdace4e8124f8cbcc3fa96005563535d28e9d92cda02e91d979d27f8f97
+914f30250d79829919c8ed184c2e471c0d9835f2348e628164dbfe39a51dcdc3f8bf99c945b1f413e65fc5424014e5c2
+8ab8b347b7846fbc7ffe69c89ff67dafd522bec708b7ffea312b3a7eac47fb9d6006cb9038962a07dd89d4688ee6a18b
+8e755f8cde0750700252e41f6d16b825e7f02748a13744c004a52b19e52d58c42d1ac32cd5ed1d6ad14cee5174b4ddf4
+88d6192d72e1fefbbc9ab400e5b0018bd300839cf604cfc1034657f62fe8fcfc52acd86c207dad0fa6383361d338b2bc
+971fa2ab593578b341076d98c49c71dc7d9eb4ca706efe252441499037cc86fea49af681d8a4d324d302526b2a3e5c18
+b2deac648501d7e284a85c19f514f8744c48d2b5516c993c2111128a9fa042aed34dc371a0cc3f00e918531dbf16c0fb
+b63fab8600fa531d7f48f8d207298544d2e03d4da23cfb43d99b0612f1a20441526de63b7609f5969429e763147ee5e2
+a8f30d9b4ac3675d61199e8e624f88b9dc52658a2ba26a2bda5f9cd3780f0b1e32b56c825d9dbc3a059d6c61fd37e261
+8a6f8e963dccbf1db9c839c21a4e832c7a218b00fc31400346b5379fdb8394142bf8f8b981fca3f4d3c43d4e34dd3e31
+b4883e6a4213c799abb2a9b6998ebd4c89aeadfbabbe4c363b22beaff46939dfbe4dd20d113688a293a41daf5cd82c8d
+aedb55058fb467ee9556a3b601af86962f99fc06f7eaf837b4deda030b1899f565da07ddc7108e9f5e7024e11c723ed0
+a8185aafdbd22a2df2ea0f0cf67fc88c4c3f8e64040da08cfa9e8075b792406c20d3155d6ea6fdcbe9f5502c44125545
+b2b27ff20d24cff756e8edbd6f8686d202d687016c561e56dcffebc78f404ff544c4d3ae8802b91bed0487792d6dfd05
+b6fba06a70d8b1000555b8c6d791b1db3fb7f57a0f8b1fa8dd00b2ee14242877e1e836cef89be3f9e0565e61a6b4c275
+92b3dd6e18600ab856c276bc787429d42b8c02abf5243f7919625aa1f4e8cc3eca61cbe106b81d0e4909393a5efc021a
+a508e1a1d4375f5130c95a169fd1d4df51cecd84822dc28b18e464c2189d464e6dc6a5855e0cbb94500d041319749ef7
+84b3e9a6b5d1a7bc7df44ce760b5b686fba006945f6e1f3f67ea2c90dfa6ed70bc1f021828a0461fe158ece87deb1e30
+add83e686118fc5eb56d79199d33cf0c90fb2a5996c6f453fcd9b9eb3a273a466776adba1cccd6be62a4ea154480fe17
+a1fb58d9a323dcd7862ad4bc6359ab2bae35a608276a3053d40bb3abdaf3e8827027284d964e51ae7b61dbf299f2bea3
+ac901ece7cf087c782f75f1c61371f77ba061bb752ad680c9b1012768e5ebb6241b492bafd9e016e989cea1ff51aaf5c
+961b9ef616b7faa3befd807772893c7c66ab6990a9405cf4345ec29cf13d75dbb6da41ec87af5b5c4bddc8787b88b480
+b386f7ba0b94ced118691d883549d70ecd28d1c0d1b718cb82a92a246e61de4ba80b6a76d6039c261e342f9ac136941c
+b6415848092dd93da62b5a5307d356d968bd7c935d3626f40e9446573e5794f37a23ca072fe8af2a9355a4b04ad35e58
+843b3e3221bb08122a1e649e81759297d985c7f393c36cc3bc707a7aaf2f53b9cdd449e7a4384981c5976fb3955871d4
+94083ab99a73dc5cd463b5259a0f4e99847bf32ae03739a440f8f48e12f078602c76b3fe4e7ecd31d52a7aa31168c5ee
+b6f994b5482aabe833e388b24b9445c01e47fd6e354c3684094237189001290aa77a327181e7e7e756682a04b8b3c56a
+8366f418a3fb2dbc9ffb5b798adb968aab991fa689ec24a4c4bde6f046989b1815e1bce5e846f3554028e16799e17281
+b8e5680915eb37153daa9a3a977b47c88b4f30fd358901888a1056e07d2a7070d28a47acac7aa7856ede16bd0c93ff2a
+871cc7a122cd7b9ae2199801e6a0974ba8cea64e5866a5130ee0ec926adda24f91b3ff2785932cb55537030bb5ad811e
+9370ff1ba27d33080efb22836147f766c60f0a8ca250ac6b2a82bb464ffa543da056284b712dc3cac53dfd1680a4cf87
+8614d8029df5058f5a072716489f734131b228972ea9b2b952ab1150bc50b6637543aec1c35763f8dc578275f7c9df3d
+b8efd01dd0016a27a0e2df65b571d405be4dc8e0df5dc0d8354fb187b96589e95847ba0c2856613924125d21193753ca
+a86e524431247115ee497c07ca2a73387eb820d293e8bb74e1ef1ae7ffdb21a9dd8ef1a6e3f391e6f02ee0b51fae2a06
+9151e2dcc0b928573421ffbe43b1761b6ccefa4ecd58be7fbc8ea8e975e18d52c264f682104480d590e6f8c0b8b9f63d
+85ac8cb79fb8916f7eb5431b7e81606b38afba15895909873f85d9577c87ed2c1d0fd489fe058362f20ac05626681346
+a076dd75ed807bb7afcae8bb9821ed46758c1a8d00e7f3d3c91a18e6b95dff3958ed70441a1f4691ac3268d95e243614
+89d8dbe170b9804de3fff5b6512d04643ea0041c3f9bedd7432b171ced1577b0c0a7bb911852c6bafe154ba36cd30320
+809a63ba788e618a281804ef97a75df39c7115900078a6bdb203bd79d3df87e863c631e934dcee62e28a16cb8735acfd
+9727e6720f8b73b6ccad519d8ca1d4f90c2db33ab536f399e2c4ce269be15d99e22504ef153aa26c40d4cfbc450f25f6
+83e77918ba6e28ee01ba6b8dbdd84c53faf65446a90bcef46f262f341dace2e237b1ff8f8d566fdfefc6973deafde716
+b5a4d3fff76905bbb229d579b8433e76f2f070108230f20a30e4f974f12f29ed017aa66e9b298a4de0fd535a0e1a44dd
+876d3a0bb439e7da26539b98abd0f7e0b7e8035eafed08df623a77fdac30ac85ab4d58984396319a88e072dd7a5149a9
+98923e83be5b2877ac18415f9391ea792933db718b29b6970001682cc8434ae9fc640427c0a27f6d62af5f78f3901bcc
+805c675a34443a14c0098613d11b4c015264e038a8d1adf083844f2e3e3f2414689788423dd0ff77c02130331d511068
+8d8cd51d4146bfa48492e9d3f3e4b845d4ad1442ce6bbd95979f9778ffeb108c641c9ffc2ebbba532f922237e5849222
+839862454707a99eef931335e5c5ed80805ba06bab0337c5301fe9fb92fd59c9ff6620e66de7369352b079dc52bf2113
+b3cf3bd867f60b345a0b91314b34ce1c02e64dfbaabd70782614208d32fcb5d4448102bd54728fb05d1ed18a750e88e1
+8207a421d010e1c5854b8e41460c6a13035ee77f7add0df83c5c31bb00d7acdbb676478a7dfc738b9aef5c29d345ab63
+ad2b14f87281ad6e1d2b713e6e8303f1a45cefe097820d6a1bdf4652364e70d28ca92193e2bc3d0a1e69da5a51c90ff2
+98025be2d7e59ffd3f6c3c2b28b27ec42206968c0f96d09330598fe17a207baa6574aa22cc26555139766cc284224fe7
+8e80fe898b7fee849f7dc8e5eac668c76f1fe18d159c51eaf4ddd8d4d600c852dbf6c2abcb878c64f37db7fba3d56968
+871c0e2dd929ba4e157ed606741a6301aef759e10a3f919166faab23e599d3409b232240e3afe9c0e1622a11cd453c1a
+919f7e465b399e2819ec17aacc199421d267ff2979ea8dc8962542ddbae51e2bbdf6cac92f8a35e05e4d95a4a8315cd4
+a6e6667e6127ee4f0224a9a94be3c22831a1ab3b16f57462562b11473c425e7112b33bbbb6af860c81bd6e84bdbd3b86
+87eaa9e3515f2d94acf113d77dc085609d06cb038f5e8e90ed29bd04bd4814e95ed0d6db5a1d65572dfaf73ab2e50ba9
+90b30c66ebc16f767f3f0bc1d8bb17ca1951a616292297ca8dd06d54cc53e5fb5fd6321ce158c04cb4c91a04c01f7fbb
+b5fda3715566188630f96207c4253315a9cd166ef96651afa0ae1d6f0aa8856e7642e2f8ef3b1fb1eb2c14a7331f6592
+a54143f662a6946da901ddaa9e514a0e96bd6397020cf5d88084a1e1edc092b94facc150b1c029a508fb3995acee50b7
+8dfdb813296bd105d5813657c98337a24c8bea19bf0d119efca052c018ff5c88f31e05e110fa12f306ae4b0a8498f113
+8b7429599915ffec755060d9cfc2c445df9184ba6bf298bfff5b54c2ec8747a9b65bdc6c73746a94a54b0a62d93b6a28
+8a1d1108174d383465a57ab4b1a6811ab86dc007de4f342d37f4cd311650382e0352d3664ef09cf1626c0b74e2f21ace
+98cb860aee0b7251da2d114b2253daf977badf82027a018c956fd59c6c93b716bfe69a132a4778ee4b7168fbfe390ad2
+94d5a0d33a0aa590fe76c71e80b21246dd9bd8c2f5ecc647e47a423c2dddd743010484cf2fa363ea73bb217247429066
+a082b7a109fad08e2c01dd7322625c18f47497b32269ae4e529b1681aeeb3c4a813cc6088ebb4427b486320fbc4b7872
+86c23e2d3b23244c7763c123ad67a41a2dad8e4556cac23696906d1acf5f4cd7f661281b8ab2027d268405b08eee6771
+801522a5c211e49eb96294a9113022d86c84bb8741e44fa7328122836a39ba7e11e27d0d6773550b234531400ba1e7eb
+9683d154b18ed641867fe67b2dc70e8b8afba79f73fdeafdf9015d85aa0c74d270b290952683c3667c0202a83626687e
+994febc16f8d216a20774955523262966e955cf964950b4b2831a3483f818c20ee6f51cd24f499dda0d3191910a9fd35
+aaa8f12184525e89ce980468fd24e1a9af846246297546655763ecabf0b5b5047394543f1791ba1c70e21637cd815877
+9193a37d5692ff1bacb0265bd7825c479624d2adf33a419b0a71c8a744ca1b0c9828127831302ffea4fcceb1a53ccd54
+b9f3213d5d588ad73b86365cbcf0fabcec5c30cddad418281ff2408dc140e3f6a25afcb6bb569605191665706c675e35
+96aa280b2f0ae5c3ac51edaea4435ecff8ecf8f2536a3400d8c4c9b12c64d16418838dd7ffc1b815656109ca63261050
+8486373d67804e9832bddca04a0084d1976d324d85c22a52ce2bcf7518f014ad00e4795e61c71e0dcad1f23316288dcc
+b4f2e7f7e2ed7917e7c5036681e1ceff18b688c1abbd203c2bda0731ab56701a847cef4f753f68119110680913c2dd4c
+87dc2336d88edd81b94ef78e7bcb6d3876257c326d28b3f4484465d6c65faa6c17aa7a2f85c6b94ddece39f6736751aa
+b4b3502ebe175820f53da8e3fa28160579c4150d79d932923739aab545af537b3301d5b21f5138ab4100e737fb61a084
+88063af42d5845267d979df07be0735cbb42d9b57d3625eb5d0aa7e4ee90ca88fa52aed480a4d60eaf0ab8dbc4f444fe
+85cb81247c09e21de6deec42e668b72f513c7b105f60ed478b08b85fdc8a886a97bb7e39eca0cab09b294e4b1490b0c1
+9920fcfcf836faafd211fa1ca78302aa6feffcda98aadb6302300c250fe8621b60d9c214ea92087c44996ae0999eae78
+a1f91af5b378d61ea277e5dac81cb71d71a4ac35322aaf42b3a8aab1641fd51d8da1783bae0e8ccb66d73db8e1003478
+87507b427d381ce3906e372a12f4e61514ad7a102334826266df14542adcbc8bb7c8450a1fe110069d9dc2e9bf0687c7
+b7581b0cb549d71201583e0987e9e9bc6cd36585c96664f836e1b7326e5375ce8d0a450343fe0b106dcc581b77de88f9
+b26504a6a7a64c44d7f97d0402bf752740934ea4c6e101ec131666deaf574d55fd7f96c8807473722b6629dbda2ca3b5
+b90accb5c6b78322ef88d017fee2ae1cf87194f4b3f6f4ba6510c0adf4c11b20870043cdaf45372844f5e801464bb682
+a904dfa6e1f813b4aa0b242f3eaaf893da7ea854efe514487a237a01fe244721482476b81ed75ef1a951fc54802b29a1
+a00373aa8d98f4dedf9cec4d227b5fab00f3af2a7bb4c8b0dcedecb5a04244321d5f25a81d57ed0ddcf293c701d290f5
+91bedcb316698e73f43e9dbe0229772c856f34901fa4c1e018e96eb898e4ae02b19d900e87d01501099163be56db57ae
+b84dd6b9a61cfc0817da422380b0dcc5221deb600b4b6a6f6c5ad934110a3b66c59f7407ad68bf8642b2bcb5427e8050
+8507c172e499856675ba69fc1b0389a08e58f8e5658c9268172b926dabb4a67b7c836a44d865f736e8fcb14aa2809529
+86609a1d82d90a971786da9ad342035ae4865136e513559069b6dc8ba82ec0bd1ac695fe8afa5f61f85c2310194014ed
+94914f127a645594ed372855550ec0817663224208c127a08bff3d5c4f463b7939cf13a45dee68586b678ae453c6d60d
+80b55565972213814afd6ad9b1884a4d8143ae90c148ba730ca77b0937c2faabb23a6f985dd0bbbe05705fada4cb1a00
+930f5fe58dabae91c26c6fcbb61c3e336678dcc35d028e5c958d2ee7d50b80e1693c0693b82d719dfd9fbe2c03b52c10
+a45053c493da932896d95d5fb158869c1051e1bf99658b183c9cf4415fc8d4fa1b6a8752b8bb26e8b706a03a57fc05d2
+af7434b48d2ebe639c8082be09060422f662317bdc136d534b76ee3e3aba5ea8f234cd4936aa2b928f6eafdbe5165a6b
+a57a073bbbb3020a92497f0ce854666997a182f2b437e7b06c9888db8acb2fd2128e3959f45c391f0548a3de49e37e76
+a0ea8131b2d8cfb799e806d8cb92cb02d32de37869cf2ac3c82f7c5d9a963d562755b16d25c4b60f4ca214e323790a9c
+82f920aed42eb630281919b9c1fa4acc02b05ef34020cad3583a29375bdaee167a47ca3366ef065cd8e658301942dbfd
+8415ef32a93820618abb91329224bc46d478ee8749ef42e372ae4ea29b6c05a65d5ef515ffc7d720b2f41ccbc040f176
+a0fbbb0113daceaa05478163fa835b070be5898dd9bbfa9abc582409a7b671c0e41a5070de4cb6dd2072888b11825acf
+adfc99221d7f044b57ed40f4ef8a9e47e57265ef8eac654043cf5e777950af6fbdc2c2d5a5b916048fab1c19acd69dbb
+b3d8e85fccf623fb3848e4886d580469bd41ec0533975298bfbedc7a1a9b4e554714991ec4238d8ff976a83cab6383b7
+8b09702f3789ae1f7799ce58a0ffc2327b3ebf2b56cd870f2be66c0d6781cc1f34c2d721d0de63e0fe9db85bee842fbe
+a935864851b73676cb49f509a198caab467e5dfe4358e7088d2a76e9b8c13e5d20b01eb7c0cb9e51ee98c90cfc393c71
+b5035d76a5a8251bcb18f33968b077d43403c69492b809eaa3e202eef174a5649aee30f701ef0be050ba5026957093ab
+b1cedb563cfb09713009b2263975a56abb9932b8cdebf10f7836c5c34785149e9875ff590fe1414ad2d21da977b7ba26
+98a718c23d44b24ac295b328d91ab7a40b23ffbccaa90bc5888efbd32b6a95c530bf5e999ccbd4f1c85263104f336ce9
+8d9d2ee952d5b135eac2f06f0478faaac175f23cb3789144f3a490f2ed34c885ae4d8ad7ed48db85cc6c2bd70b38c6c2
+8155763582ff6c68d7071ba842b6543361cd5f65b7c70d5bb838da2dab2c02f3363e2324307e7d2149b12700d96bde38
+b18b277334ef7f24706b7d48fb764a487bc4e21fcbfb01627b7524e9a5d3253be99d84c417084fea769b550b3ecb4574
+b80db9d83cb1ae861a3f61197a1f14b6c5004a2b3d031fb207adda94d725f3e265535ed7b69b9c801f2e95e1d64c1901
+82cb673ac9c0c124fc546c59505fe4fdbc05a1fece0fa579f6a6df96f74bfa877ad82b6fa768cb678ff04ae4cec58d1e
+b2e190b785a4a882939489b86d0a06cb637b7be8b14204645bdd9d6c37626e8623e35e1e4eab5c8fdec0f8349ede8918
+a82237c64f15d306365be19085e1c725cd148702fb66658c7974b02051b685715fb9e35fd4a596ec24d532df4711f82d
+ad6f7e3992518ba04b510b705fa6b28e3733e0000a5480e8a3c30fe71394de2bfa43333c69e750bdc3e7092b9e0f7ffe
+8c0ee358f37c28f3b80cb9ad5487c342fab734886e31e30c667e616f3aba737a3a07bac4da552d8405ad8b00c03e09f0
+b7851e0b88486b0a858a218f4307e0c0c8c314fc69e2b90cce8ba86d3fdb796b572e50eb4e82f83f73c7f048484b45ac
+a7c35abc2e15723a9f395d16d2484b798d098be5414ddef083c8283b0c29823226fbc4727d9cccf96e33b27fc40e032a
+8ec5ff2ba7c3ca8a2d18df81d46e93a3bc94ceca88134ea75cc8ec2ec4b1ba3d0de49dcd4d385083c648a63483377fdd
+80ca7ee722c3253e7b534b42a8947e38741c542dee1d671b603a9a743f5ba2fa95f193ace46c01000ed20ea05ad0639b
+ac14edc2d803b28a169154364dac5360cf0926d911a615077a94858fb4cbbe31bae2f30a6a68b248cd8bed015e0f3b29
+a4bdb63e91fa72995316d03cd117347cbefd14eb1b19a0adea1c9d39f49d82ca1ceeb2a4184187e1dade109d10b83090
+ac8f528e9e8fafde00e66a75d4bb68c99029456ae9b3b7cc76ea4816e89aca2b8b7d094db214bad1e87dd4e84d1c1a5e
+8a8d090a01aff14383419735840fc5286e71a5feefb98c563b2d7ee593b518c3aef6654f10da8a77f40feb52e1d31fac
+ac4259562982b355fe5e57e1cef574a6a40a7144598c13a6bf07cdd8000bfda95b0b0b44f215e9dbc71be114a1857441
+b53741dc30b11fdc6c9778555c1f714fde60890c191a0effe419fe2b6100228d07cd0738d0dd73057cfc7e340c75f0c4
+80ff52fdfae53dd2410ea556ea6504696439919687d2dcce1e952d9d17b6e3699816ee623b0153bb0e0588e36b6f56b1
+a92b34d785a71d10e6796ad07df788c6878717cef4f1f0623898370725006d46fa00a0a22a3934fc5cf323be85fc7767
+ac1cc08cd1a8fd6c946bbe14662b18e89725933a79965c663b73ae3cf5f5ab87e794559ed579564884e430e108385e18
+88b8b2264d84106d38c321c3a4927b9b41cac172ae27f6292ea44cd9ce11d185d0061a59148e50474d4dad3c9e940476
+b7ac9f257b4f676d69899a181b45f40358dcaa70fa2dad38870d52838aad9001f3a3145f6550fa2826018952431e4cd4
+ade67b3d1602ab0af6a256f25a65b621dded7a0adca65c526ab34c5ca3088a549b7ccf76c586993cef0d2d38af541617
+8fcd8bdc44ab42a70c174682a1e8b929004834d4962a902de460eaf8649883c868cde1cd660d14d7d3ce589fe3aa83ab
+b914f6ec60f1767a12fa34a4b400ce102564dac4c1c42f1497c7bb824bfb9000c9e23ed7cadaa16ad79d5ac906070710
+abb1683b313612b583e87228384eddc3e2e7539e0aa26e825f5c27da222941b6a37ec47127cb0f11b6b8e0d02a6f66e9
+b01efb31962345a2fc71b7c370e7d3117bb1d1e1a9b6984ce11bd83c898dc127fec2e821669deca7c74d406e4678a736
+92439394c6c811d908b05c626f1afeda3a0f8c925747bedf66a4a5895ee76e7445a1982e99d8658117128df5866eb64e
+956bfdcb00837be56d44f159bab9bcc2292295ec1ca7424615e3b163b5d14f7143e214609c0b65ab74a0dbddbed4d782
+880b9a8dc9bf6499f1f71828e6c906e2ae59660c9aaa824a6f36116746406351b4e364b6fa26c45e9d90018555bc7dd4
+83f4a0dcf523d414e023075ce0dde10161d65c0abdba522c811f0e446980cbc21eb0bb42737136bce30fcaae3c673b6a
+abfc5593e02dff15161c4da67a806af3170bb2bbc65e3a0457b4bd994ecf5e001d02bdd417655c2b4433dec270a6273c
+99c6d8bab7d937a4cb5c272c4bc3856a3cb8295cd77ec9e2fcc6a50e0545999cac4c413c3ca8e5408afdb60388c82ae9
+b08f5d230713639ec98a7afcb2a25b9b2d1c48820447d28b6a3ef448aedc4b9a90b6c5ffc6613a70ff1766b51992074f
+99d4b54e35dd3f844088155f114ef93507372ed32a6898b9954d5a6d0743e55d8e7de20d67671454d26561ed5e4fb05c
+b7cad70deba1622c79f1ecfdb2612e380e9048fb6146760ba61cb62e98cef129d3944c5f442b15fc11c102fcc6e2adb4
+95feea870c86525ed214e3e0ecca9f66c5e0babf6da8473e5cc5e2f305c26939f6afda0207bf5855b6a6c928815577ea
+ad6e77ec226053ab331f3f871d7fb770ae78227a85096d263bb42915299147a7a7b57a4f8f929765cfb323267b94865d
+82339f53ab7344f8dad554fd0270c2aedb34f7b0c630f0a56ca9217c04f0e4a38781eec769354a44fa90f556b388ad01
+837d4672d73588f19b872d81b7993e5e0628139f5685d0520b1b766d40e71b9d83a8d2bd65a03987eef89b3d5c254683
+b3c27e19f579133f1ded8c066dbc3e4edaf449a1edcb1aaf215939d63a7f2b250b9b7afb62d4cd7cf37c28da81898a67
+91f669f9db8fbc6d7a5ee92cb67c2fc1ccef6dde622efa455dd7535b11f506f4e309a8878b859d6605a3917f6d7d67e8
+8332dc636222829a83501a8312904096c2984cc0c5dc077e067d8962bd87666226e3324a9e5057c1cbc3ba700a3b22f3
+97e81e20bf33baa4412d6b81c5fbd406dccbe70973bd73e956d8ce85c99d2199daee5fa6e99fc6d40071b352b5044865
+b716066fb9e470cca4546a401048c0e6c6408c8c9f4cd80aca6778d3f4121378e11cccf8a005845fcc8dea2e1b9f16df
+a7b340eb603da43f2aa542dfad1ef3d3357f583c46040f2dab234c8246d7c55d6885f9f7a14f319e22355ad498c22a04
+8281ea97a28ade9a0cdc73a077c72a92810b70912006611a00df8e7d2ee1036af73c0f062b367f3d4d75be4b9bf78aa4
+a481ffa0813a4f2110c6ac535fb446282dce73c182eb99baf786ad42b804ef12df078b2f534e3cd8210973880bba6a63
+b71a581ae08eda0437f9e9274c1f9431d6b357e4866e40d4c2470252f0888978497af823dbf464785479e5f35eb89aa8
+a07c9010308bcfb0c97a1059d5213980000841ca0565697d45aa46e82fb36494e4940aa435ede417856d24f73d374757
+8fc353fa8733947ba067ca2bf5e14a6c334e4ff30efdfa67829dc86f49424f4548e879b153e79dc75f1ec00afd6693c6
+a663faca50e1fe5d00f62abb0b7828d6b761fde9f5a54f27c0b726d8d53281f83ac165b3d3db87f970913350a7dd07f2
+970535269744905640d6ab238930dff375ea7efb2f391db324724166f0c436e7a3eab7ef6eb2e5d6724c58d588a4c592
+800f33f5936498e16fd0f58210a5a5c104074039db7d9d5d92dc62cc00d796ea0a3a22e5d368fe269cedcf30bf6149fd
+b4b921cc901a7775df7ae73e97cdd108d98c54534015a1469f0ca6b07989827e0d3f9bea2ec015fabe9d309054aef802
+93295c8a7e5c0bd9decd99ee2d704d814cb6bd0061404fe00984a8afc337e78af11965a8560288529c2a722e8b54b488
+af43d382ff7951bea94f4540a3a2dbb53ed527e966d0dcd117d5212f36112976e1fa00a47bb9870d3841cb01621c5d7e
+b4d106b21e4676556bedc6e7f5a7eb5c2ad0d5fe8004a1d968bc7806ba871e241d38892b1fa73e9648b23158802ab57b
+a96cbe38f86165288a365efa796b0e2076ae9fa94bb6377cb80c7d5db9d376e9c18164a8a3667dddb3f5b847f52fd319
+a0bde83e1f3e925561c481ceb58c7575027f9641e69f14242b886e7fbc532a2bc54aeeb94ca39bd7da3ac984bfe8cced
+8211c4a70d08fe052246d3ccda60c9e9677910a93d9262d572606d99e273c1ade353eeeadf5b1e3c1ac3c4b9019d5f61
+954ba6744e3f991580b6633e5d184550e44400f20f00149d899d97bc4b51b01d09bb4f82ad975cd55189320523fd60f6
+b7e3f17ae79c2faaf5f3cbe0dc528c6aab0035eb3f38954820556bdf7c3546585fb9814717302c5f45fde7170748ff63
+880446589f33ffe7ff5e105fa1c380d401d6c46e80526948fbf4edcb779753a594f3891461f52eeb3f5f2f6051c361b2
+a26c06cf79c412d49f39e0e27e37c82c4cf0c8648638ee66a97d22d822e064a9a7cbb0b1ede46806ea0430639769cb88
+a968341c5e4a3e6d2a2116222e3c58c2e558f5bb0a2877a27c69fdbd38dc3892f9ed7d7c114f557e52a351c73614fedb
+ae9b8bf4774ce3b84185be77723ec62b9a415e21cd60e86513c1500916c96d62519ee8cc061d81ac9db9709d6e191649
+83a30c1ebc046c9a1ba911ecf6f147644f58f54e32357dc395388e6bab66d71fb9b691754b11bf414d43816af8058828
+ab5b804fcfb68b6439f311d0420005b083a84da15a8415cc4013898806e67c47698a9d594263fd9be42bf48efdfbe2fd
+a41c18185f8111ddd551ecc8f6dcb87036cebb6eabbce7faba40c6c5c8af2ab59ef027c6fb2dc523eb0159335a1ab189
+b24cd94b7c6e161e651107769d863fe5a3d7a847b9c60c7c803846bd782cec0bd54e6278a318ed23b90cd7ad25933fa2
+a5ba23ead78d1678414d4e986b448e7a24b23a5c0f529ba604a51e4ee0f87baee450fd121b43a954be50bff6c0d7908a
+b89c17de4809e722527832b90b810d9691b437f19db9cb88ca5cdb67bbc6946ec1d454dc0990b66093ebeb6eeb6896a6
+914f436fe0ac7540129c3deb04d51bc61192ab5d0d16eda77ef70ecf8cab5f55a13492f54e8052f2f214186a113d8949
+8e0b3d1dd756a9008894028d0443083c21e99de69b8d8f4e7eb3ca7fc52ad540355d4a1081774a6d51a093110f4bc838
+a9c1730eb5c0a42deda9d9b39390661717479e29007f5f8499d0645b8b85bc0ff12cea2ac4328f6588a12126f56284ee
+a2318a42c99f7613ac78cb110656c6e470cac6903a5bfdc1bb182af21e0f0f409bd39324a13e2790f0facba04459d3c0
+a11ba34521434cb718f1b2015bbf451ba1a7c60e59b1620ea843835c7e75bb42b6ad29263cd3705f7f6f1e40a0ebdfe7
+90705112b625973e1cb35e30f9e15e3c752b2e972231b4caf53518f44b4a40b8a6bd15c4af2adbce5dc194169b860cba
+828035b0e70af8db1294379b4b70e56624e1138ef49f7be81d938e8b25aa5dcc03655e045a95a79e0143c23a77407004
+a7abb1836282917d1eb9886c79b6a36d720612e3b823d9420a4a705e8add6c6bfff2f682e6f992a6af10ae2f71ca8828
+81e97c7f980dbbe93df9efdd9c0a8172ba0f00378e9375c926b9e24758e8b827037ba67e06e994fa9d05942320353d71
+afa640b2a7fb997cffc5db74a91dece901be4a36415786190dfd17a77ac837a2fb2d73e973b8e60582e71824c57104cc
+ae860a6850068f2b0e1e5a03afbd08b667f44c4f06e431f1f83269e754f37e18a764b00e100dcdbd1c1d18af9d6304a5
+9443fd7e1263d5ab9baa8b1a3c893765da1dbed0bdf62ac9c886425ea9f05876df1920889b707a2cf248e7a029883588
+acb38feff88de8db3477ea9ae3b33e0c5715cfc91cc71926dce26f4f290dc4f437461a186cf1bdcfcd6d121e087bba33
+942882666a9f49ac24d9099facbf1e65484ee76cfdd2eacef25e0f30260654a7b5c0cb7dc37aa1601980877f945c51dc
+ab2c9035b2ee9c5e57d8de70b24329cfbd247324309eb30ac78c404ced268dbe2aaea8d417300c90d87924a48702b793
+80aedcea9c5a9911731ebb444500eb95b519e2d4650c1d465afc61f4997879d60750ae3fe049e54654a06eaa2db7d8c2
+a63e1ba5fac918c8bc0f4364b5fc8d26214deee825aa1bff111e03c0ed43baad47e8bae154ad580b851a0f66be85c88e
+aea7f5f8c387c21cf671246803cd5baac61cd6359848ad4fd685b1350ed6298a129ed74dace279fe7846001bd6577dfb
+906ad36bbec72813b368bd2b79c1c9624966dcbe94ca9dbacc297d0d8af86edbd80cd702ed04f0adebb913a6a7bc1a62
+a46201c20560ef2ded1ed3047fc196bfaef445c4a716890d9235f3a06d6993a8ab29e816eba54c6a2e2590dc8dd61216
+b37eb2c0d765b044ed2fa2923160a19e11509e764025e43a62b4ccbe38e534ab59e68c2cc92cc5aff9d97154b8210c50
+91f93b1404a4bfd3fc8ea019d76230637ceee315da0faf366c712c3ba19088cd3efa2dd30172dcdac11e636f8473a26d
+b6b905abc4a795bf95d055ea09c3f9d0a8a9ba0014e288492a3751d2aef60cd3b7846e1ca8366635a94988b2e197191f
+847529bf842d7623150a3bb91fc4ccbdc66010bf008179a32359f98bd007330bbfabfdc487f4b98691ad65680af67a8e
+b3d37a8098d02b5ee69ed060527f3d924c727016fd92b21d6a52fb1c1ca18c7eaf0caf8144e9e6bb5b6a039ca85cb1e8
+98cef893dbcec865cceae01138613de146d563f13853ae34bed5f142da716673c105ecbf4f2aa7d187bdee20702d8582
+97f60078d18928c4d7dee1ab244b2b7540928e20cf7ccbbf6684148611afdd9cce60dbf412c1fc544ab8c356fda8fe11
+872a6758004e6c87c3788c5c11bcc74db78f076efaeb75127f0baec28febd02528c65b227b7619fb8c29cc92d7c8e799
+8d72cf1191629440d7af8daf3b76b6b1bcdaa8d6ddcde52603dc8b092c2ac78d6e24bec32e1223eeda15dd17ba2c26d5
+89dcc8c10be08277a1e394de336bb1b135bcc5131dee5eece80973ef364a305235936a3b6dc40f2eeec2aaf227a86376
+972c4ee3b4b3b028ab683415bdfecb2454d326a19d274f499e48bb2cfd55165b928bdfa7f97c4fb6d27082cb88b73dd5
+ab5438a8af3acf2eb75bea0ae71d8aeae363d6644c54e3b020082c80809ef86faf5811808adc8240c7693515ed8bf199
+b594133dc9f71f72e448796316ff3ce2f8a03c21ef9c54e551d23723d5f197f7fb0bf1c33e9cb3f51188db7dca51bf49
+aee981b45d570a666d0d0b2c7aeaca3cc22d4873812b4424d1f91144142393fd64c49401dfb970c7d5ae91233676cacd
+8f978d21de1e264178f88cad7213463a5efd139c30dfce81a7eecb46942870a3c1971f6e6e6a50e0a8b20c379ac084e6
+9153701c8b82ab43fa4635cf677789c9c9911efcf23250bd393301c0be51f14fd0acc4e467ec9682acc89085b94641d7
+8681989a1be217d77cc8e012c95128557de70b362442e7f1e6162bd52ec6e4ebb0ab28f9ad3f67c1d35ff00216ceeb74
+8e85421256fc71a82d35de9645a6da9cbe4dabb9670758c4eafbcf42b26fb99866bb2b4c374601749738ad34e51dba6a
+976774296281bbe1e8dabaee7453613d0a615cc6abaeffd8e15ca4484b5a743e298522b2dfbdcaa697e1eea2b2bff736
+a585501faf955b6acfb328d801cfec5b59be8ff2fe46ef0bd73b86ba4c19c1dbfcc1df844d61a5acc64bb5e8a68f6cc5
+a776217e5073714b36bd2ff0621246a48799eb5ae3ca438d1efff6f9f9beb13779bc18ae5ddb77c838732e8925018118
+992d726bd4889f4e7565bcdc31c7b4a58ba44da5f361e3b46e0a67a6e4f00c25e3503c94e7b2bece737d7efd47ff9beb
+b277f124d5dd8dd669ef1f6840276c0bb0b60379ca3a0aaf00ca337c40f478d511b1a73e73df6c3b600e6bfaf37a8fa9
+b037e78617c235e6528e535bf13bf5e82c70588d1d0bd08de754d089bd47a4fdcfee79b5666b95698cd98c0e32164afb
+aefef9e398e0edb60615713d7c1334005b21844d3f1401903e09af2db20d7b342b8d80796fccab583c8607c533c9b735
+aad20eec7cf4f0b518007ec1df7dbf4935f6f9ecb36a11d148dbf9e5281aab43feebcc8ce9001374be40776c5ffde825
+a4ebd6018e004ac8b5d022cfbb7c5b3833456faff4f198a3d9dbbd077c8752087bda1ea060466fde4a5f31cb8a50a7b0
+a56ebb8ac9901915400234c1c6c8502905765a7224de56b084f9b0a3468a065e78b4daea27d9887b4f44a72fa61a15fa
+b0269890863c63203dd4da3a08a1bf06621cca212acb49799bfc48be7e41c951d807f85dd4171ed57c372914dbd2ffee
+ae11fc0f5fd5ba488104bfc07fed50799f51ceab4768afdab300325e9a913b1f257fea067d357e54950c8d08af5ecf59
+aefce65396c61e835ffa38857df426f64508de6e93f966cc46b54dcbc5e2bfd72df927b00489fc4460414569ce99e610
+a5a1fed75677dc956c000b9135c4b6138e0cff53770399ffbc3b12ff0c1677ace264aef2058aea535ee1a7195afb034d
+8071def0890d01f0d10dab3afb13125f0194e79608b9ff129572b5daffb49cde5bf6d9f24da3f84483612aaac3cb8eb1
+b5e5bb8c0be22349ea51e249cf2159189fb9aee615dd62c5f67cc9f43745676e703abfa6561df4f5f1d79b86c459b11c
+978dfc57cf0d3538ef336a25ca7a2cf373f84b71bc06d1c74907464e3e816d834087ee126bbbbd5090a09ed063f87a46
+a2ff4b59b3e7fef169835e67d47218eff5368aed3e6e2f1cacd29a5efe6c1c2e7e1839d87759bad8ad1871b39c481bf3
+96de49b44bcd2f5ac3d07d6f5270af081776d8631fefbaf9fec6771e13d40a4e5158767067297029bd38e8c6847971b6
+8f2f820e8e3645f2ab9a27b3c23b5f656b681264d08e298ec546c5aaf51119893e0dc8e04d6f64fef48d3cece89692f0
+8de2eeac7dd4b53119d02f0ec99f127cbd8f6a57120d94a9a554c04467fa74ecbdfebbb111d9f15cdc1be2be8c2396db
+b6616f68b00ea0fb78a25ecd51d3018b9ef13664a7da42663d1bfd6fe71fab615624af863f3b41e625b36a607bb42dc4
+abab5be2ab033afd6d110a340c658fb512bb53368886d8a5ea29e3c916a6b1bc46decb2cd0f508b5667f9dd88033ef7d
+8872d0cb09df44c2a75895d46588316a4c9c743080f7a03a384bf4d4be80d341f8dcf0e208383bf3587a3509f3324fe5
+a3f57fda2e8c06fa7ce9de223f5ff56d53ce9fbc48486d88d2845e7011dc038b6f2f270dcfd46ef5222ae9a1557070f8
+a82c4e46f0d1962cb48d6c3d8ed3976c4fd4c174d119470479d9770619a45e6e16e30693b2804a82b516ccdd400508c5
+b53188c6b2907abcfe47fab98f23ac602525e05a5ac6b4421c437025819c80529e9d2d63f8a3c10cb9dced196e572506
+951934cad4c2772aa0ffdfc4f12a55f490824e104f669e4dffc70d9c14239570c87eb998dbb2a6d423bdfe1ab50f4377
+a276bddb27d86e1e70ebb96103a239ae4848ad20c4c5b7de85f480c3f293c934ebe35792361d9767de4333ac6de11643
+b9c8eccc03d7270779a87dd7c52a42c7bd632b9bdf94274b1dc864bc7a59e13eb30870ab740066040aff0beeefe14d2a
+8e0908e4d15aaa582dc028e015c4b2bd97c82b8086737cdd1f2820641e65d88166d1fc763bc483f8fb4643339182473a
+810c6c46945ad5b4f699c51130bf204e47c62066fbe54fd099c3567ca79aa8aa8b04dc5321c09e03df4bb7c9b93857ad
+916d4b23adf202ccfaea7dd124d28573c73b39ebd74bf4dfe32a366f9dd48f4160b8cb0e687e7dca887c4b4f19570cb8
+b1b8fff52dbbd5b9bc6915ba20f3185fa8e23fe52c026a41cdedea5301dfcf6c79c4fe1058f3abf280a00c7b2cbb20a0
+95f9623510e12ddc6f4ae59d06448f496cc911c99a4d5f5c6ff7e434b807fcd4b35ec1ec976a40208ee1a505a892e38d
+ac7217596d42d40380fddef22e83db9e6d6b2d0d2e912f868d7fc07bacfb83e8e6f01af544e8f450d31db014fb094c9a
+b10855b8ff1a81ac32d81773ce8a6391169902290af0637038b58ab59fc84e3403d515ba7c99e26b7382c2e2d0edcedc
+89eebe9789a333f5db0aa9e8604798b15a934ff45e19699c2e7fdb46b6863ce02defcef9f6dbd0cb799ffe2b669428c8
+b9cc540b405c5ec78a2d8fc17ee4a08690e347cc1d860885205bc19cba09e62f25b94ffc2cab1f638c87caf217f7b6e3
+b16d06b120906f085cb183a96a2b635334afda4272ac650259f23059407fdcc8b83e91f2521223f79769ba45428c04bb
+83e0a2d9d9f6654d916a822ab1725d58a10efd64e889a17f44860db4d2c77ec1bdde7d0ec8deabc12f8ffa5af879d4e5
+98cef31d7ee167d9c4248e29402ea8d5546288d1b7ca54a5370e80a9ce371bc4aa3f5c7a24c2e4805d8c99af059b4156
+8fd55a0dc38b65c2b0b45c9127c14b9396db4898f14e1559e428a2951cb5076bff9e3f202a83236f15c1d2530539e5ad
+b3252594c3060118acb12eb91d002a74c068c0b8f9bd735a9ecb082f787c7e046dd6e40ddf4b3ba56bf89f223bb5d76b
+a88446262600f605fc4f067dca855ebc56990a9ea050c708961e486fe685707d9e9ca734068b92778a144c0f3c23b4bf
+97beed96ba821515996045a40f17ad46f8f4d927cd9a2c7ce134a60d19ec4a5819a19aab1bb0df886d9cafcff872bcea
+98ce98dc7908161ceefa0ac132b63c860ec2e53f7ba28e66c6c5e45c5945e459797c65668e58c0a5b8a26811f17c3f41
+b0419cef96d4d44fff0338132d53d2c03e7e9b4618dc2c6b9f4475368e21700fc08b844a2f140158fff81f56aef83b7e
+ae1eba4a4a715f6d077e90e9efb59852b7025adced47fd9f705c2745e6734f2fd2f2f86f07ce24695a06e24e63f00b03
+86db2fd15dd3cef1e504fb057136f0405758f6fcadc391e6f64b3080f92bfbd4537a0d8f59cd1a0e913b2b188093feb6
+b418cff26800f8793b083a879c8b1823285f7a3cac6fa34cf48ac5355f04f6ba74255eaf436739c4d26d0d80d2607129
+8eda3c25b5699569c03b85bc585acf25bc3f9539e9dc3e8707b34520ae5ac53920f45528f0870d93f84647cae36b6aeb
+a2622af11642fb6cd60cddcd4c242cf13045f4ce20539d11727e8942b4f9a7fd1ea2192e83596a35c096fec3658c0c2a
+80735f92d09dc0af19f593ea118bf52146143c1d2a7343f6e2ab95e00debfbd329d4e887f7421e4a361d815dc1a27973
+a7eff30a31db635e239c8632f7f84263c9a9d82511422f49077823aeb124e6ee3c995ceb846902fcd2cff0f5f219db51
+99129aedaac32b3ec18d689a2589e35fc9715fb3f1a72d28a09ad95e39a68ea939ec5721c501a9e35c60cecb3f4379df
+b9995d65636ce1e70967a8ffdf45e50eb264eb64f15ee887781455c5472459cbb309ab58b1645bd6e8f2bd29e69d81b0
+b8049f4c3ddc22405880bf55b5d5d94a6dbb071485f25a49a6457db0446663f8d4fabcf14106b9cabb1b3222d8786773
+b581027c7d9bf7b97f6eb085934b9caa43a46368cc6740139e33e4cb2c94683411710a52d5933a27c9d12a43e75163ae
+b5dfce672e670158c259f36fa549aaacb0699da2f13702c81f5a93afb00361f9ca22d02dcebeaceaee6813a3c9bf7aa5
+b8184f3eb809be1986530dffd7464d84750df02196274955769a0afa02b65e87686d915ecdc7e75a0a76be8b7ad8d064
+b7ab837f300f4aa2ebd2d770f7a36dedaaa68e1d601eb36a28fada4dc73dbd55e7f31c88ab2835aeb57ff113a14c5f32
+a72013c811ca674c3e909064777df1484190fffb0643b6b1435892f5dd0f1d09579189fe00c862bcd18d03309b958b72
+87fb528e03f1b6a000141f4a6ee24a9738d9d2efa795cc262203fec10d76adcd0f89968a46fdebac99af8d048300b8ee
+b2a1ca5d5d16c7addb73341ebed1f8e832250c2f8e03915a417064750d7deec3289e646c06a09c6a3ae40ea2817636a4
+a90cba4d0928da2a5d8c6935790e1a1f026073632a4c1460fe686d06c3f2933661c2b3c49bb0bbeef386f2bcc4d08485
+a5b684d544500be25136b0b5b95d9f363103a6d08cf49f4934d6c96d43720a79cdffe66698de0ffe5b02bb3c2e30286f
+b246952dcdc38a500e64ccf4f312bc7c690d33a3a951fde5f839f6eec77ac78147f1fcf26ff7b990e8868f5cefe1c4eb
+981ed33458e8ead67d4adeb884153bb0fee0ad98ebd9010ee706ea1da7975c290f82c492cf16fb42d1b739632e66e50e
+88bdec223786c894fbd8f964ab2c92c5ad7fa7ed2b97a6bf31423a6ad5bbb5a946ae3cebccce8cc97af9e788d03f547b
+ae852b074e5716e3190593e11fb17f1135d7a5d888986d2be53973fa14c1d4a9887381e648a10a4725291ff062c9d88b
+b87050f914c4f09e2dfef845ace5a06504b6fdb815f685921710c7e82a9fac11f864e3e6023ed5807256d6269271d051
+8cbd11617ab819680cfa68e70e205f3ffecf6e469d88dbdb1d9b0c9c7c38746dd6e64bd526306a8ab59cb7e66841a757
+a1c51cbc1a91618b1ede5cdd77fce26b04971081e5cbf83be20c22b9b30cc9197b9bfd5998fd9ade9b665c8218afe94c
+b5cdb2091d114847dc14a4c922bfe944021549df2d75cfc08ccacc2d740726e90e20a0bc2bb73303e9f0bbb5192fb982
+8e60327955c5de97f56838cdebd24c2ed4021d9e3d74ab9eefd4543a286c1be82a1e8455f8cfc0a17f03358c4648683b
+87f9c1c0987493c631279112fbc79c5f5d7dbf46544119492785f444d063fcb0da4f2d1129735ab77663a9000d9e18ee
+a970df3d50c4ef3d76d53dd2b887e9274fdedced7a83560eb1950fed2075879d9fe1d5af811f04ec92d557a0be0380f7
+95a69bf4092567f5b55a401329d5a08220ae65825f05d56043974fb7b7090372e941a85e2d197c46c9165031b3bd36fd
+8e62c98171e54ff549ccac5d6d381291d0861439dd24e584d356a862d22942e0ff17cdc0d1faab07e496374a547ee812
+ab62d0eed8422a3172269de0e325eae9294914fa67f1ed8e5d0609afa2991a26b1e1b9a04ccda8436d04ec085957b110
+a3292bc88e2a9dec7b55ae4c27a3a8ea46a7b2dfe3a817675eb3712f95264c08668703771b65afcdf6d305e396d5f005
+afbaf9cc19adf63a0716cb868a970a372d7a1e24a4c78718a114ced412a12fda6fdf42f701ca1492a8f8c1ef0466f7a3
+b41a5f064f9d900d1534a68c74796927e4018e23f949d86eb76dd5b26e5b686115d63d858a49b545924b3941bcec2341
+b4e1ef520119f9a238fc4988ab2f1266606f53079744b92c1039541aee78b67ac570d7839fc9b2331244d734ad4637ed
+b0ce754a33a506174d5feaff4e9a79295c743b2a122c8a1788c1427482585b398a750b7bd93cc53c38bd3e557caed172
+9842cd13ee9490d9ca7ddc83d1f7d79495afb7301d1f51f4b007dd2b2eaf15abbff18666126adc25df5ae26b98a80f41
+a976af142268d20a248c4b71304a878efec29b5022199cfc88bf82c081f55d06a89f178606d50bd3f8576f0c5c01a6ad
+985ac6f315ab1d2db1b4f2b107eb1652810e63e36b8c14e8852f072d2c8b14922f20d1374a57d75cec62db0d050a0c7c
+8c1be9e8317fdf847a8131ac14cedda922bbfbe15cf95537493c4e7eccc7f2f1a56ddd1a8832e6300734d6019d8b128b
+b55d129c88d252556fe688f84982becce253736ef3b1fb88328e41300ed0713465c8bd15918386844c725fe7a94e8364
+a96384d2d81cf6a79614c7fd6bb68fec6e74064435a1a79dd8b1533e9c7e578da5ecf03e979969d983da893f42adcd84
+8c2b3c06b7249ef5ecedeb4f2c65c0925cda8877bb4b672afb7a15bb5a7b5818748d6b022c6ab8fe9c5a1499e2037c69
+91c8b2b8b204897741124a37f85ddc45c3ef94ceb5dff681b13771e712f2ba5ac95cb1bd2d3e94a84625d384b51b099b
+8bf852945910e9a773120c5ad975f080c07c8fa37c2158e1138162a82983211da70f27e22876741d58c20a6c9dd770da
+b9e907d9176a0fcba87a2797651765c814df756bbd1d0a86a9b7b06d9d886d1908d4e74ab27d618129dcde81e7d969d1
+ac4d3b156db2570c349e21f07fd17df935872f9687842035b533c6e4773ad5752f4ba8f9ea4501953f6b8c4232a4562d
+ad91c4a7ea0a314d7d1ed7a69a74adf6ad810586c1bf907ae9878ee5f6528437c048c6ae785cc255707ea3e58a4b452b
+8013b76604bda0c429e37006b01750999414100d0ff59ff5ab7b233399adaacb34906ee65054abb94db80fc92ac6d2e8
+b26a2a660af34a4b9b8910463d0dd439a3dc563494f5ec280dd5eec0b14b0e9426a0422f3c75370201299d394c4d90ad
+8e1c7ea11dd513fb8527fa99b899444bf89a1188089d3bb65e3eb87025de9a48e8b4a3068a955fe752f2416de282ca20
+b6cbdbf2b143330db09841aa0e7d22d32772ee62006e7cee13d8c4ac911ff4a59a9dba3d84bc46ace1760353d847bbd3
+b8f5aa3ee213a44c41f63c11f685e754997cac37b27e91d07bcb69947344d94f3b86284b3b1655e168befc01c880d550
+89f93b37bda703494263b10768118ce998ac1f395d422c0ae840e47c6d649a3ec59b404c164a1ad5ed14ccc2408fc662
+97255607a1aaae89530a3bdbb7f2b7ba3fb9d5dc93509991021152dde08a638bb3152503cf0c896c9c19d61f8eea36d7
+909c7ecafb798e6aa45867976f59cdc9d219aca6fd0881f82f296a83a2a3cc5ed47f08794e6e3009f8847f16345f5f4b
+9560fbc2c531571eee5b7389855117644f156ddb00b23a7c2189205d4cc613ec83952b96e941cc1e725c2b574c46ee9c
+aaa69f68b6086bd369fd92355f3a0bc632c1b1b4284529c18a7cd4d71d827291bc997ce74bc92dcd6900419be68efb37
+af9ab7e6a27e61a99f37b89fc816974ff916b6a24ec3aa31d76579204bdd5ff01a2eea26e76188976c033db4af167db5
+b026dc8850af970d2ffd300dce6ae07db0ca2d21978e4f3a6797b6e3e81f1d9680465080a983c31d473a77ffb62acb5c
+8f82f92ca992ac352ed1e8fe31d24f8090ce6a7f02d6086720422b9bab20f3e3c38a5f63c7fdb193e30d63f08e53c900
+8b896a2ae84c66109c8501cf6070c4da65c43ca8ef9b6b06fc85b6cd92bf2e5397d492796c528c7b2cf29ba93341a87b
+961bf4c0b8068c8406a864595e156004d427138e06b390519cef53af8eb00c748bdfdd480521c6aa0d53a78e8f806217
+a6fa456250d20c6842dde55d3884eaecfe8a39f546cc5e4a77f57907192e849a956a33a81369b0f2633c55bd6608eb63
+b1d1d2f3e3e058ee97c9b6246cf073236438ed5e782bb21c68cd0d77b44f29745dc24d01edbce4437d93071b6fa6e0a4
+81a0bec80ecd1b1e72256ed5be7de8deb11046ead7a96e1d150573f4d896e642b4af095735343f6831bb6b7f4037cfca
+b48d8e15fa8e0b46937637de3c727157f8073eb8a9a04bf127e68977758385a791da2e9c69fedb89b334fc638ece78d3
+afdee0774369653bf371b8820e285e1b48b40745a44d22cf2098b630b8ac95796a74f79337cb97fc60b6d6b903a61321
+8fcd9ff2991902149db29cd4674d60387d4f65397891fbf91b7699a42f579f6b0afdaccec70e5e82d1abd81de859183a
+8af5c73367a8439b2e3e5f1b65e00ebef2eda640bfba2eae48582cdfb244e1b1cc540bc0ef72f9e24399affce1c3e222
+b58cad4da101363bb8d6e8cd0ec7c078f7719462856d7ea573e2bf95e00cc23020031901bd1f2112ffb90d847241e5a1
+a671f7fe2ad81e9e0d5e3260a9dd7808125dcebd970877b000bdaa3207ca45ae1e5458d5ab7bd69b2adfca8b6abd88d0
+a8411cde9eefe73fbceec3e5e3628b159ca4e4c19385ab50b8d7a482f4258f405c47051a89f11dbedb2b15e84d8bfcc9
+b5dd09d5ebb26e341b6df80e836c6de2305ce4941238e3e96da549857ec314b1658f8b03ef069633625b6e4bc13b531c
+81bc9bc924039fcca8892b40aa9fe8f5d6f305343f6054e36647d5f14cad3e4d754dd6ce9ded67ae65825adb4e16df31
+935ec74c2dba94b1c5ef2060c31bb5c1426965f68d9f4125cdd891f20495da9d5dca513f65bf3e8c599f1562e81a0c1b
+b9581e11f361097620130e753d134cce6d40ddc7c516388fe4c881fceadf738f314d241dc14d4f87be8ff0481e898c4b
+b7be50ea49e09d10cbcf21b6f717e0cdca582d57935d72d17e62cdd7bf2071e5d5c91ad7bea79476537e515f0d2fa5af
+ab467b7fd32a795411e991417be57af8b62ca199983efc1f744799136ae5339173111465e91083dbce60e77f9f2c0fc6
+b99afb338f747ae89e7cebf069612e22f9704f247d66548d305aacdfae395609a57d4d5405ff0f1eb1045dca4c3827ce
+99a5e52374e1c55f65e44951f68cc3d607157e60d52cd088125a81bc60f2009d1b894eff8e1efb175509aa4b57af7276
+87e3323cf6f11b595ed745a9475a6d99d11333043d512bb61d5f9d8c3f0cb6957aa8c3f041688f63ac13a51df29fa061
+96a5f9ed28056138439eedba186b754f5f7693c09422f42ef82a315b7413b418c4971112f4261e1b9793ec9066c3641c
+b9b5fd36d2d861d40b947c3c879a42fff24b9ee346163e544ce6c3301d0003cdb47218644fd5f1f7f0d6f19bf647ceed
+a8899296b58e5d56d7da438ea48bd76310364ffe666d698c86f20683343663d742a0b3f8c1255e33f1d424cbf61bf1e6
+ac4be82ca78df2a367f13c8bd1cb73a28015853f2745e025626c325a10b778cf4bd9942439e35015cb38504bc02993c8
+ae5d6b99ef56cebd5e25a9c002e9e80c1d3e8e5fb5dcefc8ea7b7798c7e09b02147da2ba14e42e2b6db2b2a6a738f598
+8c94abefc71d245b0bf04f34085da0a9b8d4d798ee7441596c5166ac353425175dfcab0f76bdabab8f0ef5a2b453255d
+960ab6939b1185806e9f985c9381206c7032ea8a7a99eae5a66f276ad5cf450e654a6f1e956a2a63f33d6f715064d051
+a4c7c7d0fce514db07bae5582f5e4f7a05d79f7605b33fe2a1ae980bc388b31c056438616bc8391ddc7dd5f98810c74e
+ad5df00f96ee6e9e1ee65b562d6311c38bc2a0a25aa9ee36f39766a2a03141e95285dd2850a598385f45b9935d63b78c
+b051de656e37ccdf3844a6e095d3b42ea9c5a545e0dc2a5234e2016570375bff6b55ee0dff04ece5713ba8e85629a7da
+ac01fad1ac299567a22da6949a011f429bd9775de956dcdc247d5c186ec577fbc12a482ebff3a4ab18a8e35f3e2218c2
+9654db9c6b5e58e0b68fc49718773d44129a0e77bfeee3fb56d27c282de6b75fe9c10f4f3b5d3374443a9fad45c400ce
+a556631390e6cecc2ebe390e605e6fd754f1961e4bbc063c31c08812e0993eff5b5b7449b9732bfd3a22c87f9c528743
+b41b7abb971e253dfec3aaec4443e875d73373c70c33e9ea19c1176f8cf1278c7716a76a4eeb641c142b2c6c1ace5db7
+8bf37cbe29245c5e217a48140d7f0374f46596f2e82c1144ceb41c9801211869b96d7f1d0f7345233abcfead0309cc3e
+a380a799b80f1309ba326f26ee46ba3081b12b5a1143f8289b2fa067aa3ba80c3690fcefded8534a80368799b71ee9c1
+93dce0a2aee4d67efec1b284142d890d1e0d7abdbbfac82f90dcbaea94eef829645675cf17050af7b2e504a46d1bd288
+b8e90f54bc57ff52b84fa3fc3c3047f379c5587ca18d9988c613a3bfe614fd5fc381106729bd62eda298faaf17b10210
+8d8e4f508c284c52a6f907ec39950235c9443c5c6046762911f4818b98293d7d60a2c3f94c5cf60ccfeaeb8f283d8ce1
+a513b66299ba5104ba633cd68121b9ec848e0c8c5252d04a0bdbab5e3bfe6ceac93ebb1ee6f0274920d84eae27df1520
+80e2db8b919dd2ca33e833270738b1f437ae312b1c53a73106b6d12672a395fc3b941292fbb019d40e31b8e96bcb85c5
+a4c28fba416985d47c947b0669cc22153ce887ec54535a18cf457622d03120b6aca71a45fd8704166f6f7a9ea2e9d608
+850b05b9c7e168a83b0e0e77d16181a52d78aa96f4026c4420824cbd44dea9f27f3336b1736bd545bfdf548eb3f4276c
+8efabbd63f3b9ae6111dceb1cffe45dd23f1500f87382816d4192161a77dd0776da2a4463d32da85b802ba7299fa726b
+9426e75c6f7fb77072773a2ee03e1e3f1d90878fdb5d8c294265262f5c1cdd74a7aca339b46af8a5c43823dac7e57edd
+a1c4d2ed335a3c92d867c5cb999b2b807dfb1d45e35b3960dfab19da43e2d1ca9a8748738380cefd137088d8b80d3006
+987a7e22092931f39f05f5a6b38f419750370a71157d4443510b61fe07ac5aa31cd7f88ea04121947b1c0d0419d2a25f
+ae73cbce7cda7cd90404302388d41b49ed7d7f505a9a406f0317fccb29e32a5be61a6eb0951657f2d93abbb497be62ad
+a1c7cb4056984c22a57ce76272428a50fd33f0f7a68c29c9438af05a87bec23d8de72062fb4829adafe597a278de0c01
+b72c81a9a747a83a650b58ee01015a8882789983b67ac4f2fbedbbf47dbe30f04f686877d8f118b4634289866aecf9da
+91ba1797d6913270ac1cb9c87d9d8440a651e294c45b2301ff8c40416e58126318f0f2d411b7d9c09c8e19f4da8ca0ef
+864107657717124339cb2ec06cdfa75fb9c4a7ad5155cbdd03d155a7f9e9026e237d7cf5f4cbf07239e7bfbd79900957
+87af853a334b8cdd10bf5f78753b27a0c9aac9f55db7570e2d9d42f13d0e2f8bfc4ca64b77b21e478f23385f17eb4f6d
+8658227bb8733d6c7608d66a748caba761f28da4d95e70506dcfdc18300a559b4a84d11a9a048e82b292eb1b5d88bbf9
+b078413570ead3243b9666c109a17678fe60dd1240caf01d1d344de09e346015cba7a40560b0d68b18df82a0a37ca529
+af6dd12875a891eea9d846aa660a207a527d08f5959976f6cb7585a98b1133f341f4ae29157f6ea8e0500fb6b49fb9c1
+abc0fb42239fa531cf09f7288fb00f1d1587f2a86503593d481bb19b1159a6a9d6f4794565fe923a545d45b058d3a74b
+b95966d42c59bb12029aef1da7fd50e9e8aa9ea287649ec3ba44247b185b485260af077e0d755f322ee4ecf8e2c8137b
+8b1a2350f9bb0d6de377c00f0897081bfbaac5d47cac852a22dd8a427fd2e3029a1708f452e958a07236c7f35ddeb565
+acaff21e9740b831fee42d80a9a80cffa6673e39f85b815b4f546f538dcd803320f90f4f25436796721c8a11f5a1b25e
+a0dd42f019eedba19f4345553965508aa9d2eb1499a363056d95e27f7083c2343e74a0e7dfb101567250148ee1bec1d7
+a08d1b1863e594bfcfa2e21ef4edee8535c8ee69490a4113787899ad8cf2f2ebbdea54de193ded85af82fde074ccd0fc
+960912b621ff08e27781a4f9b80ef1014a4064fa3c96f534b67e5a094a5c11d9cadb2b69cd2011cdddb463f2936c7ff5
+b3437f1e0872f6b9ec071a951f26120f27425789e00c1a8d3183879ed02e3b017406c051f32580b78b4d0f090474b42a
+a90e6d1b11ebd1f1dec54d7b3fb336b9a53c821f295a592e147d5fd453d66e63295a96ce827c4ad64c37d4bc0df2c7e7
+b357a785f3dc1f9bc1034da77033c0c64b29b78c7381ca59ef81e24ab14448d67dbf84756ea233b9e3539b5ed517d9c3
+9360adb42210abb9d7644bb95532e1f461464446e94cb5047bf8ed5513398414130630866b6980b6afec5401e608f6f5
+9145a7f8b2cf1bdd90b9a860051eacdb937189e8d68793e52bed202fa1e23a87db9c51a18f0bc050dfc3c600780099c3
+ae086e289e16608f02281bbde5a6fb2479e3151a2464b86ea737f8a43e15af4fe781312d0e5620a42a096cfbec885b0a
+92b57fb14a0c567a16567f83e72b03b8b564ff6d830a5776014167cea06205579dd10715071097710dbf50b660b9143b
+83e6a3f027163e635c2a1a397d2661a2d6c72c25082df129572082db29b1587c78dc3d2e5999112983a040ca46bc983c
+b1667d022c8099dac5af4ce3b4ed6f524819240275725c7580a2386f067fdc9b3a49b74195cc6f661212fb07ff133463
+aa2eb0c44df0a80047eec28a80440ed5f363e3d42908506bf8418bf04e9c17a5e9f550bec9c8ab8dc9979736ce325780
+a2c1d257de1a55e4c10879eadd49af8950b0cf25121e8d7de30049360470aeecfbef263739262bf1f97020c6b025f9cd
+af29d1afc9f76417e4396c54300773fd283f1bc2cb00308da5e6b1deac7a48cb117c0e8c87b03076c7a1b8414d25dc97
+a44d4f2186f5d728fdb224f10b496c9b57d96204325c452842423cbd29bbb2d07e98013a3880c7dfd63ede725d15953a
+a30c45d1cdc68a5d5ab65b57d60c8b386be836c5bfda7e2f0347229b7807f6a97b632bf54ba3711066bcbd5e0831e5bb
+a8c3c93d6a3526270ae47bc2628da82bbdb8b2c8e4d6a4cb5e9cf70b49999a963f3e856ff9db12cfd2575187bec668c7
+a03566f1a99f5b82e8243678d0bb033441cb8a2f160c0c66dcebd0b6922a56f895a69b94a9c65f4adc9ed73420fd30dd
+a4e3c839a6f4f4317e7bd06f25c5236e42fb0e54bb975f18f0240bdc214780049f0258dae24fba6301aad508ef9abf69
+b7e0349d89616156679d06d1626f45dbc9683ad73ed91f0d92f8f82cb0ea2ae8d3ba3a752e73a39da70569d41e84015e
+8c9ec5ff6be4b0d9337c5336b467c6d4f552af691bf083a23f1f9856e18b5a13852143dabf03869009febc443b2edbef
+a12ff782575aca7b48844f0402a311bcb3e19514dd4d2ba5b39694c66846b22dc9ba25ea39c3c1bc325eda3afa1f00b1
+b55bb586ebf5c9a3c83a04bae254e22547f37b9090151d96f5d8aa81be17bb38d2763a08cf0519a91878633ced6ce0f4
+b3957203932032fe180ba9cb5347c2c1865a3094d03f6611148af4094fa6a8eae522f2651780d9bc49b41f5c36054eab
+a0c865b498e30180c48fcab93342a50ca1cddd8759d6e0bb54e9f92e7b60c51c373f7ab1432aeb5e5c2d3ffcd79e8180
+9503ffb3529c3415c07247211c2a4f35d8ecef98ce9f921e67438ffd538caa54520fc6d248a081f46221a0f1165011bb
+906deaabf6e8dd0c24a4b22757b7681bf88268d9b4ff97f2844f9de825af511155d0bbc48dc4c03b87007be94f835d92
+96c2a7f48990ecffccbefe128a28cd5b26c664b8dc9bbae16d857f7efc1b7711c734ba7d1476945d09ace569297ea96b
+a37ea083b0a61f400b498ac5ba2360c22e40b688428ff4a02e3cc80206b61061bde037cd52d97eeca175394dc675e216
+89b15c3af439769829ca930fa83c47afe070f6e2d7a7df88e5a4f3a2c0630f9d143bb3cc43ebf9bbc1b91be03d35ffda
+8eca6996ba407886d3b9d2e4b1aae1983023dbb1c9ae47b6637458c73ffb7f422b0a893eb0b07fea2c5172ba335595b4
+81df4d7f576930b2865af5ee1525718a09b65d9a013feafd19cad335e4e425485531807078b9564c8db3bad95d23bb0f
+b6635aa3ca31c851a0283c0c6356235a5d8de9d1db9780e62087be32089c1c081bdc642f067224e88c14252efb960e3d
+a0120e81025ba07848ef24ca9a94699db5274a8c85eb9c2f3b41a81f630d09d100127154ddc3270525961613a41ed81e
+aaa8dd063f9f4f73f5a7c440671e1375ca8c224f8f869af736edcc435329487902249c68ef646fbf71c33a8bd1a04d9d
+a36bfb14bbf3956c317e01fe744bd9c6c6f526a3881f6800592501ca1d9caba7f81b3b54f53b2ee1b13aa6de42ba06ec
+819cd123fd793c0c9aba75aa96293268a4731c68c0a26a52561a695fc4acc409752de84ebd19494bae70849ce538138a
+ad4e50ce325477621b6eb4d453b087c3d7df6e3d019ab41239f2ad0615c6030aeaf85e0e020f3e6c89e46b8586b4a347
+a4327072fbcf33be1e57ee4bd5db4c079c5ec11694a25fa2fb30932f8a2a35a63183b24d3ded7f6c8a8d0ad111586dbf
+9454f17aa8fbdd2b15dfa6600ad305936a37b205eb554c915adc43aceb4dff6b0d1414e61584d5b15265f2ec0c85abea
+80eed3725282c83dde575620bc0d86e50412df5dac3b3556d1e3bd9e7ef6f56dab202f4dfe4ce542babd49c1fa7dea5a
+b90d1a07ff760daa23b7408b067c322f126023389beb7bf373f0c68b85ba0ea8a2c03e77e6d3339a01ed3ff8ba51f1f6
+92789ad894995ba07f36a0814fc3289810136f9dbc6c70c57ea80db464772d760b57d5b059d4ed458f256af7603fa2c3
+96a4ae1ca46d3b26029767e02fcf2f623d32c952712badf2a2af721226473f4875c40d5b14e66bf961a5a56aaced3aeb
+8c5073f4846df9a0e057f52fdefe01a9b8c9ace91ef5ac253e823e165ae698e733eb936ad9cb04d2c54cd8570f328c4e
+a9f36450b5ca66a20e52bc196620852a41f1f40262a2e12c278818b6071e6972c3cc6fdf83a9ccf586db6cc177173cae
+8f101df23aa7e353ac1034c38adab8f20b8753aacabd10d70acb41d0fd0b1f34277546b30f64d0a861f448f112e38acf
+b45b0779ef1ffbfa86d7e02e89bba0316c5ce60742b350296eff0d04246f1c8b1bf5bff68bc97792c85f1e5d4dcabacf
+b7e89d015f6c7122a2f35f1c48b43eb0076ac4269158d52e38bf2a11de11cf2928175f717ee5c1bf543ea38945658558
+ade2a57ebd7600929dcdacc290168443437bc288371ef40580df515012350f3453b09aad8ae9e64bbc3fe6a3456f2c31
+91c2f8de02bd8dfed1eeebc40a422d444e3459f9c33476b55de3e950d2c38d8463c4edf4d4f95347b0599a48cb2d47e5
+8f6e77d9ceec539e0407a8d75d4e855e376838c0f886b36615a9c7715bce56a8669586f6d7cef75812d84b8be91380bd
+87637da91b051ad92081e682e289bb904c51d95ee1a6ae2b8956982093a7bb4f8a66d91874265dc32229f9db5bd51ba0
+94691811eb74f2970a95e9a2d64435952145f1d0caa76040f9811c9ea1ed7327750d57d6e8dd63c6378f336421d11093
+884cff4ebea1bb48c0d651bcf0a710ebccab9062c96364aa64aa1275e9364a4c261e40a4b9f7e1e135572681a5a7a965
+93f21d4b6b53cdc1dd41cb1b80ff73c0f1620db41c35aeccc059128704e9d1d7da5fd3240e7d075a2503273e7525664c
+b9afe0a9b64dc43fa78f607cdcfe337ac952fccfde41c2e88abe3a8dbb36a51b3445d724908e552ba74bf67ea2cab56d
+910280ba145bcb6a99d89d1526f10632206d2ca9e1a8596e5d181dfa37e5f407e1264b9c71c39530caa59894c10b371b
+a5f583c9fbed59f99cf5e21b9a734de6d5685b9c33931325dd4b581bcf5aa4764c2a250924e7b6f7931dc5278bd17152
+a87267f2ad292572a1cfc89308c96aec0d12e5f0fc2b4135ff8df7cf83bb1e71d619906d415db5841bbbeb173868ca82
+899d7ff8d7f8d0daf62ec8d28adbfe4e7856582a23e62dee175e3bb9461f38bf8e4f73dffe10654a046573896f6de690
+a8f3601e6787e788d46a9d7592dd4bdd8ea8b5136e3c897d79ce560e9511f6236e67a85a35c59295428c1f9c019a0841
+b180a16448f085227a6f3e363b0dbcab285bf419d438a13be2cac1ac9f97973ff6b8aee38294f70a8d72bb4ff474577f
+869038341a2f68ba85f5b2de58d2d794584a3c00a76ad0dda5aec31d4e3ee433be20c197b40618f89f7c8f1692ea3cc9
+8366f825dabdf4f7714c5d089443d0de315198e23fb93c3ed063c4b8fca0727b05665c04beca145dc4c02f333e300c18
+93291da32b501cdfa3624b39f6e38ed982c75c1209cd85630cf83288204032c0a90f013f1dfb4dcedee7aaf0fd95566a
+96c95a1e73016fecc3483fc94dfaceea376ac700fd4804b24e9eda7135048e521daf96f8f63d5a1439950a64296d8124
+866429fba47fb691a4c39460031a7e614096abbca3073e9246babd23075e8e5f6051e424e47d860296ac8ac646f8a283
+b817f3d9985cf9f9657fa800ebd36a9622566697ce68f91c509d9ad7df8146532e24ad85c07f399908f87d1206c7642c
+8761c3755cf5440775fe00081f79dbf59829f8d400adf7448188b97f756ad35658295649294ac9626c2569ab21a5df86
+aad65ace72ef89783507c9feb5555275d70a421a95f306b7613c894bc24e978be809410b519e9314ac56fdae0c71d326
+8ed16ed07d0e989061db5087d50cebfcd6983fd54be5062e333bfb8f6f609bf1b7b840c91ffe4b66fd674eeae2dd1558
+af3919bbc0df42b1e2e8f62e931701f7c35cfefe3ac3f1985ddb70212476112e8a19d51c673da931777ffa28944306f2
+99a364d8819b5ea0f6d900167b60063f40f9afcf291ded7adaa2d0e46f344751cb312df1c2113bad8d84a028f680b41b
+8d970bad8f95ced0b0323f4b7b087efd0624ce21834b3c9ed435dc0a394cc2c7ce58f1741c1a64265c81654eeb6801ee
+a5f96a4d794f6f844b38f9b82ee15c2441cce293b6b2ba26b25643165236db05ffa918ebbe20aa89ed2a8ffc8df393fa
+8ca69e0006f6a72e5abcc32c3961aeeebb8c0a76d877fdd8a093467485c19662b75f2ad8c750acc9cc12c8fcbfbe9b0c
+b5378b855f6ed3eec19546cc21c947dd12e98783164d95a95d3cac36c89a840bcb9f7c99b191fa7730ec28d57e7326dc
+884e50d5e20bebca96dda539daeb0e15edaac7fc88bca254a7239f30aaec47a64f29b69fb2d90041b82f8ad8e3f13d3c
+abcce1f6149037ac8d27497831acb867cd5e05f637b7579736ba5c384b8145f127c56b82b1876881b782b94a84d32d04
+8747985d53fac369c4a23224d50bdc556c00f406e7ab3e38427aec317ae7c0feee5b48b9386c5764de883cf296ed1daa
+a153c77887f271316d5a7185fe0d2bb7359cad86ba80b03434bee8f21b3a5e52263d28cb9d3d2e6d5b7443196e03cf80
+a77b16b2b7b6e999144af6c919e0a74b9a6ff70de41a133f7f820befc1261bf261142717133dd4a99e168a5cca4791e5
+b89beb83489db9fb62fa32d1a8ecb66fe9ed41d318820d13c3e07e1c97802dfd7b05d34652a478a1deb3b17b4243a499
+a80200902da696d0d3974ab29676f0eb67d15166b173fd63b247a17cc49f56b6ffa28d9690841ed4865229248650601f
+8210103eccfd1f4be55e33991a831c50260bbabc1f311564fc1c52c3b2755d3e4a11ad69cd95e398dffdb9a0f5b77df0
+9958745d00d8f29d05d97875746d863007b1c05d3ae920794e6c65adb47ec208734fdaed1b49982c4f4cdd1d3043c369
+94a4f28dc7a9d2dd01ebc2f3ed11a5bb01a2095e7c772d2753c022d991da7b2e4c80c2170209bcc4771d68ef8cf007c0
+a6b5c5543ae3de57e074fac82221590a8d771e93e22fffc2029b44e8a1c2c8c9cb0362416de54d00fd5420e5b1375eb3
+875e801265871509c71dce38005ad6423fd027206e6ab4c58d2978ab4812d5720401c1310b56ce9ecd95241a17ce0e7a
+b6819bc6497ed57feb41bd82f56216b513085b6d1a560a958adcc06a6da304424ee34ab2580604b0e59f6b0091ffe6ad
+93bef0806f21f8bac88a5d6e2e6d1adda06f9daad5cc3c8de61162495d8fcc3889b767a3e2f3380f162166ce40a0ce80
+a1f699cd7446cdb1321a05f970bc70cc98593aaf0145a0d097e60e5897aa311b00d019e09cd533d0c0b7cc5c00a753e5
+89ae140ad75a83db2903a93a3711be90986d08dcfe962aec5ea4ee69656026dce77821993c1defc4464442bfe7d44734
+a4110c80ba92f545a1a7545cbeef997d6c0242fd4d771977192269d626b35c88c361df53bb36dfa8ea7e40da68e45f81
+906786f38eb7e98c431fa2464048ac3f1f1df8f908a25262978327224bc82168f564b2f3e6da77f49457ce49c1a72c2b
+b28d92b3228547f03a3f489e09070ad9a1e20a73e49f7ada96ce41c19cd6416ad809b3a3a01f141b3698e85c641d795d
+a25b9df9b377baafc8c735a772e0ed9ac007c0b6ebac2cc0f8f2e799e5e6038a616968c9896cea862e99b1750224ffe7
+8085eaabc79a2faf1ed0b9fdd017fba1e46c671c6d8ed78fb089494f792765b0617f790016d8f55697dd0f45d17de4b1
+a0e81b557af74efb95cf94054264d30396121312c643052070ab53eac8e75075f1fd0b384cdf1d96bd39cc98681b2d92
+b8e0ffc7548969ae28beaa9d8bd65872840a03150e2140dd799d9924249f92d962a0089171bf4b311520ab527198668f
+a6188827a500b99af6eb91094a0e464e394c8c0a6d80cfcc5d8be89e8810732a03ca75b2befd00d07d1dfbe7dbe89be5
+a4e5a47c656e74107e6007199b940d8381f706d5bb4226a0b2fb13eda725a556530b8d4876dc49c5f9631dc6bfcc4c9f
+90330a50442db9a9c459e06d42cf7a69e009332976c3950ae7d9981d99066fd2af22f22ac429850b998f1ec929c82bfd
+89dcc51fb717212b2dcbd0fa0da189e194b4ad5bf7f43ab2cc2c96f11c186d0872bd930aeaae01661ce2dd9f94eefce9
+adee914ece15575cc34ab485f2dbdf3979406ce7cd8cd82197f156f373beee6d80e5e3623d79a2fef14b0b4ed1678a51
+87e97e8866002364bbe9b49c5f2b5eb729c7018ec61dff7b8bcee1c1ea349e5e04a3f3781617d46d8fe0e62afe55d62b
+b6b7bd0bc652a0bf79aeeea1767f0f17dd543b9de582531bb3e14ba2bfe1b720a6c6b613cfc295372eab9202f5e2d340
+a6f9cd96d8e422d9897d50bf36288bf4c09d28cb0f5c4e13ef7f76cef6c75bb594d0ca954ff7339590cdece16414fdba
+b9bc319dc5e55630d1ee8cb48978a256b69c96aaabb5269bed8c5366add03a2c38da11cb03a44e150a5c7f34bb49bcd5
+868c36924f0056b3464bff8831543a280ced62be748d60f82ac860c32025c4589e9354984e1cedf24678374c959383a8
+a6244602362c09b382926dabae5793ca4fc50600193c69e645fe229a471f7cf9e58c4a59124d6d2dabaecf50f1e1fd1d
+b42df58ee9e20fce589837d5ed8a938eb83a00c6ffe2f6afc973f6ce26559b8d220976ea1fc18ffbafe739c92dda6618
+90c0b2ed8ed7cd6f6ff812c84ed297b3231f6e2106f2df6d5e4b4bbf5378231025582cf39f35dc9344d9fad3adf04685
+a968386bf1221425cee0d0b926689426fd77e8e8bca5ad3bd07298fbbeef4fc676e0cf7a4f29cf981c682a78a54a2d1e
+a3a46bb7db36e0294b509036a40875850ea5ce4e8853cc0a7d85e8455fc2bd7d5b593879408ef2f3b2b2bfa44aca2276
+af825963207f046b23534896086a3e56247d752982417047f850bf306d0cce285b537508747afc700dff6472fe3b5569
+8022af88981249b5da08ccc19e4ffbc35feb2cb5308b34064de4d5bfc8ff2b933363988c833ec70723e3b5107f8fbd67
+89687fe6e424c7f0d2751e5f7838e9a3fca4c0bca043806fe511442bbf41cb67d01165ecb662b1ece1b2adede5a9537e
+99c925763420fdac4149a02131831449c1df8be4867a6d2d09e6b14abb821d46bc1fc4fc9aacfa4e9de1a93f9b56fbcc
+b819ee6a0724de9c944ce2ca51ffd3f1d93c77ff25e39de8be2a612abe732dddbf2219e839686a4373609a560041291f
+b5eabf12513e91139025f1236c7ec235368eb8586522dce04d370acd3d854c1e6676d92014b60ea3e4e21e9d6f063f2a
+b82e94f1013db6cc682032c7760aca2a1082826d280801aad9c6564704362e61a61cb52c6f35f769bd8ca191e68e0b0a
+95dcb02a676b17f20b75632c7a9060f990e44b0c1fba84ec8e633554f875ebcf6e54caeb9816267e84a11808d68728af
+b0c7c401dcc019d2108eab7e87d6494e06399f6eb4fd95b8ff9ba4a56e549a3d3a4aff13771229f4c456283fc3cbc53c
+b1a8e3e500e3ed74bacf91a82b39f2b870963dec0b98b7d5ccefa3212fc9f3ef923101887572e14d08145aaafa8da5ba
+b2caf72c47870ce9f0524c4b3df6ab3eb3695765c010a27c0f3cda0ee1c1f5bee64e5392ef8b3f0f11e66bd8c9d4630d
+a8fb4864bce5f1c48d681eb37efe7d9ed1a83ed36bdc1f2627539b92c90e100d4dd64ab664e404b0eb7b645a8f95642e
+a1b6164a4f0467444fd56a1f4668c8d1f295f6e6f5191355dcfd004c34153317202823d72162b621f677c970a3f0bfd0
+b2cc59a2f6f3b7e18064720f93b28801fb684d98ee808ec5c04a5235dc40372aa0e0521410d8f736161470443bd97ed7
+b5d9a823649c09151b214406189d75d7f1ca150cc7431d79b7d60348b6d7405014a44bb7840e35f9c0a634b4c6785561
+af6b8229fe035cbd6a5da3a3aad93e7ca5ed233dea5fe4477dce46ed17bac9243ebf25a8439ac2896c41baa671c0fdfc
+b42d9023551d999d2be3ee51f6ca82c3b2d41fce51e1dab52095af6d4b59edcad70a1f9b1e71eddff894e3fe35a1f11c
+b868543c09fa9b9b990b276ddc5b68a2415965d3de71b9ac538c26a6333543a7c33d0b432f57756ac0077d0021878944
+846577a8c877461a58a94c5829f2ed9d7ed107fa63a48ee77a1ef1f1d1f940b2605fc742cb5ef849e3cbfc86942488fc
+967ca22cc8c21382b15d73b4dd4f6f0a0bdb2056c21e3c75eb3d9c13dd41336672ceca03065d8cd1062389afa4726974
+8e0b872d766c439f3f868f18ef0c173896eac883783dcc58917f76d5a2e8c291967a032d254450fa7f9a12fa7d7a4cf9
+a0236eb36a4ce3b7d649ff02de9279d364ecd5059932328230314ecdce3278c42cb836f547bb9da9de0fc96cda2fbc7c
+92eac5a5a88648e6d821d3bb51b280fc106f751d85a1742a6a1ceed071eaaa215a0a0238492ddbefbdcdf2e38e4149fc
+88e1036f9b20a2c4b3534175c93d59c1ade3fa6652a4c5c490f21f6c3340769c7f8147d53a92fbfd84c23d7c4295cdd2
+8b094165ad429a339f12696bc8967ca89ec47a4778f387e42e273a1863a38199dd795d120d198d3cbd93203604c6914c
+8f8013229eb6bc6a8f93c17d3b4a1b206c258f14091c6dc39cb1ec492d403cdf5f696070ef5a6c0ab9ed4ec141b08d73
+81c7ad27bd7a48b444b2be3d4b5d4845743d6ac4857b061e659d7ed48ebacdeac29cabd0cd163f3fe6c5cc28753148cc
+91c8a92749183e3e6f3499d3b0e9b080109d5e88ce8acb03b35f3d04591e13b4c489ae323a149def1edaaf62f93bbbe4
+a6a2d69f012d877460c33095924771065fdcdddc30670ea84576b72dd3f7769f90d1735f8914b6841c7d938a2046ff4d
+a8ad4b976a5e4477a97d48a3cfcce16b358fd3dc1ed1df301fad6d6f0e188782c518796faf1465e52312b47bd713e2d4
+afa2bab9363187473a85f7020106b176903bc3a3e3df1f4938feed5145b79b66db8aa608cdda554166ec47e60fb34b95
+af691bf473160cfb84ea517702f3c01daa6155f31393d807c897b39523448c5af09be581ad713c76aba194f90895cd9e
+b74f3cbc198c9e4b2c7316fffd57fc749e367b7d1cf81b3f5311d266c9a3ab9598075ffb9230dceee230d5f1bbe3f796
+8c28d21c49a15299f7ff3eff7568b8450e6404a168554b8965a291c03fdbbd3dae9ea6b9760869cb1f2e8c7206183195
+a496a0df4e79827cf3bec117b92b5b248dfe129d783841935363362aee4822399974e6c03a92797b3ecde80b207fd7c0
+b39fa07fc8f4be41588ff5560ed68a33c3020bceaf172fd11e0c1288ea885c6dcfb56a151e4773e57d864dce06fdbea0
+990cd050ab056ea447c114217219d9c0c7526803f63952e22ae60a3996608bfa3c6119a56befc597592761e3a90ef448
+b6f02dff3dc330daf82d1edbd4e6964d2e9c38481e74cde8d9d85a9e602ed22c4fe6c9b6f41ec76582f0a4e4414bf300
+84440e4a7146ec2f34e8099e85c09b8d7bf505a15638aa34cd2b42a20f1f335cbc9f0e4fdaf2e53fa0ebb2dcb00519e7
+af389aed116fe58580810fc474eb15518dcd9746f04a7efd2de44c9774824db79f8ce4c4fa108e7396e1fc016132a402
+b202985e01c62d0de1f6807fe600a3b81fd11f30f5aa033b1e7baf7a62f34fa5342d42ad6a6e309560e3e9ebc662920c
+8a07641140db9701c676b2c094c24cd663a5a34d3534fd4f5f1e38ca0c46772d141679730b5d0cd71d056c257d9a125c
+99dc01e76174370a741e8e9ef5654a3a7769a010da85de41dd315b674ba8786e6a697b74a79ea782a1fcf74a48e51775
+93fc897841609670a1eb88d4e4498c54e286e25238309fc95389b16e4edfb82b8ee8447a436893c7180827a996b9a0f7
+8e2dd561acc8954a53635c0108ff964774fe98d12b28a0c6ea8b5ec5ea3523a45b81ec642c1453e3b2a1c0e0749562be
+a95b0b7f9e53720f4b0394bb6ae8222aa5be00a2050f59ccb595d50e0dd9100e397af9ea77b0335be02d1713c361357c
+8e21dcb67da3eaff5b950f989939237e3735a31e346e1bec8e6ca11edff5223e33c1c6f2f79da975de2fd86dea286e1c
+ac02cadeba36143767bdb8cd4e1caf8cb287296b53955f33ed07f771a1fea521fd64b7e153c90d5e270c12ab959cfd24
+af95bca4016b2ddbca61c9c854cf999ed59ab4b5d619dd55460f20cde5ecc86081a2586a7eb37f15c20280dd06b65809
+b7d7c81261e8c6a8983442e1e801f5072bbada1eb2e49b8e90759dcad653c52c0afdff9cbec41bf21cfe832e49ef8db8
+97fe8c6d071dc80355bf2a74c15ecb16c59bc042eff323e999f4fdc39e1209803d32622c642ad25673c84761f0d357bf
+b37da716119c00a0955a7fee59b93185a6e325bc5cb2a7fb35681fca0688d0ad2d25a0e40dfdbec1a11deadb1cc69d47
+afb8091548179fd2a17d95ca47909d97866e4fe54099736e6414682ad083fce300e0a20dfe3a017c1ee4ee7d271bc470
+9306ba1f3f2f74964dfcbcf9b87bafa44b5e013853c46cb501e10409f3c2af7269aa17c8cab261fe82e52a188ce0d18a
+82430e3c25970411f40aa72ef1cda5b2b51bbc7e243a1b4951e92cb56a2f5b200a039f5554d0d1bb44330d89d1ef8840
+aabfccb8f3dfbd4012b9d196448e83f17bd1ddb8c857dbf98e80ffc60c1af3493ac5c70e3a2f1f26352b1ead143dee87
+832cd6dc83380d068c068d815ad0f4677de0ef602890835b8d32b73223490a6f753092d651968cb3d798cbf2a227960d
+80e3e7f0c46fe5d962322f3fb2535de40dc078db80e7ef57923d46b742a8e4d6dd35ef74234f2b1637a317364d57abbf
+9306bcc29d6f8a478ec085b144161850afa29d282cec756d0d3fcce6f4860f4a4b8c8a5952cce54ea893cf84abd6c4fb
+9234c03bebfe6b47aedc7c5452058ca6a8def3c368bdbc9019ef121ad44171d6b31d9bda9c82300b5b396187324684ec
+abc2ec6016ee252f5693558b694eeeddeabf4579b7e03d37504c26ecc29263e455ce8f0158fbfc54135600b72dc54315
+b46fe7b51df64cf46888a810365f891d43db5b34ac4d3505f0692603adef04b1d08eadb3e31d039817e7b89bf0789802
+988e0dd101bba7d7e4094cde99eeeb6d4411341e684fc06ae78d163d30c4b585375a868eda7ba1e5495ee7f0a7d509e1
+94d3033ee1926aef656b31192653d3da96d5c533ac2436d68fcbaebf827475778689ecf14fc53042a523e4652fb9d713
+993b598555bd2a35e9a03f99950d09f55a48ba63f9e0e65802ecb95602d045001f82f25c3bb60221adcb8ab4e2709ba1
+a0acd921ea7db9870716acb595c65a934a5a06a07c6e54cd26efc86c97eadaae1522a4a26c8f93b7b7cbc4746ecfc21d
+8dbd8f492764bee920e0224dbe39d650be6732b56976a5e1b636b2e7371c1509431175b66c6ca879ba8f915f9df8fa36
+a01b24c1e3aa044cd2598032950755763345534f95f6f71d50565d25cbbbdf9c42e35253e35b683f6c3156f5c998ca4d
+b895522dee1ec9c5289e6fec652093519cbbdca7a2936fd1df3ef956eb404f1a24272c9ae6ce58eceeceff36d76d34d5
+b91cea120e200858457a64a60aa876f167b1b88c1dacd9988700b9f0f0d1bd1dfdd8dab56c2e7197a174b7b8bb8422e0
+8406767e4f7cee2e12431b093ce82f633ffc76b451ac8414716fc74fbadff30c52a22869607d5de465d0f4df8a740343
+a2cf431d18b2fa526291c7027d59b18cbd73a9b48d68cfd6e4b745d27774941af809edba06c8534b1864045d6fc1bc20
+ab3fe23aa8c45ab2efb2ca0c593c8644d3f47f748c2f753626289b0b9c761add755e3b52521ef37fd609429b2f8770ff
+af4530dfc5b3f37888900d9fd08554bef4e47c4c09a8c82bb48c4b9c6c9089465f98762d81ba4272b6861121b65f3c5d
+80f61d086511b9b8b2033921336a68adde99cd25fac71d8f8fd0e476dd30cdfba49363784f0d0578c1f648f93ae23f8f
+82ca682cc254952330d1be8c0e53da24aa943ffe0209b00bbf046e1e4f9425886a01d6582e2853137a9c256316e6f737
+ad1d508d2ea2806c351d5bd1098c46ae7ef83f4e49e4e87f83fa2c63f715ec56109996284a541c2005693687b4813623
+9061817ee94bd2895064f4af04777b499a1fedd9688ed64bdba848202c3cf9286b699c92400ed456db926ee23a34f90a
+a8bda55cf6f3f9edb78b43a52b7fe76e5cc2cde21e08487ea597cc266e54700ddcea1a287ec6d8f16b738b67caa27152
+b605576e55d1fa4fd9d7fac2ce549dfe23fd6ade41fa859bf809baa3f1497d078cab06a257ccfd6cd59f67f17eb22f5f
+a92d22ff5b5ec6dbb1d57db1b740521e82b4bef84dec3e130cab63d0641c3a8fec1f6f86141fb1918dc0f3fcfcbd8cb6
+a0165df8dfd7b3cb58883768471cf485b886ece529d5bb78b26acf9ef6c44314cf9f34914233c93b10b1918533dcb8c7
+88b79c9c721c1936fdbe22d68459d1033fdc986d3e52f39341ab06cc85a3f230ecf0965ee8d2dd54496981fd08a02657
+939b77fcd53a523240bee730c2d7b8dae0b32bc3dbbd31428c7b5fdb4c3d34afe7f2a377b2918497574606bc06cac750
+abbf82d0156439761b36a913b661e3d452dfa57e443ddb61613f80e110acf52765139fe3d1dd59c9e7773b262140cb90
+aba28324844cd19b2d5d07a87e6f3180a3c02c7326bca846c1e7a7c131c7ddbefeabbd6787b4e1e910449f3cd1249ed6
+ab2f71af8596c10351f7ce9c3a9bec08a5c7837cee92a7400826284752c98531a0199e2a7f9ba7ccccc8fa0a2207aa43
+a71d5a4f8af3a16ec9c3c110ca2135c68103109d4384a299cb7ed09d96231c90b04ce34ce12de02a40924d84947f7f31
+b9dd79bf3286ea08c9b779910c84fdd02a33dbff7adc2d6612cd58e81aaff3f64ba021f875ea9e1201243ce353510350
+9838fce2f70e7c47dca7239883229c1573ea97d469f120e4af659b18bca31cb68d12220fbd6e4e9e952b28eb29c1e5ee
+8dd341e67e4c567a4ea95252854cfff8a7631c228ac852b33b2ea9211b2a6c606e4b0db28afec61a1a55e6b5f0a6604f
+ae9b02d60441859e3e6f3866a9bab8895f0cd6168f8e84dda7c9b1cd7917f1c454f10aff9a8de39909e36576bc0b4828
+89fba7834469a06cb0da39c39a288245e577fd956c241707c432c2590e18e956e8ea3f67e4bee5a5562377617af53334
+b7ab26d79ee65eb9612e54f41f75e22abd83db45010e1a94ce5026a24675bdf670e806c71f0964a33d6ed277d464732b
+8a25bae10ef86d7e91a7d686965d17fe16ed635d787d4d6ca337b10ea32082938f4354620a72b5aa43ae62c7a0e751b9
+b18fd9213bf3b2d7d191266c7bc1c31f683fc7da7dc5ddb4c600e1ebf5fa80a399af9e31b4ae747581a07ccb736b4b32
+9968346d8a867eb57f628e2ba00f69e9d6aa8e713377a69413323b1b9b26218f527c0e719dcc1027daf10c3392f59733
+831ee266686776eae4e3de1f2bc37761a5e1b918d4bf0bbeeb20b490902ae97722bcb1c98c485407491f248eecb841fd
+b0e949d7c50b852055f38f3542a974bbfe7a33409d67c557d70c1204f87265bd7478e1751251792435fa22097d1762e4
+8b0bee83715e20f2ef832347c926249b5b168e4ad87b2e5a9149ea4e07513e4790f60b1769ddd1816d7126a0f6fdbac3
+84edc35061dbe8f3de90c2f9ace94be5ab4170b66c42583a0643ff776256217bbc6fa31612e68bfb9ab678f8e8e49457
+afb4ca7a4781dd31a7d81ba8a739eb65c43f3374e76b4ffeb2c7048b055f837e6853b14ed2d3224a40dea35799f0e4a4
+9945fd5ecdda5ac952785310e87917126917fd4f504fc5565c236db9b96f9666934766f46a1989c1aa176e543c6e33af
+a6d4466b53c48d7facb9cc33ced1bec98897e545b10586857e896d35c850f2cdda65e19bb934a8c74f6def805b1df4f2
+81e3fe4330948c279d99a8a1a4e4e141a039b3ccb7287aaba6f9041c3a8a41db1a4763fe04a36bdadd3d3295becb9d41
+b6be2ef16b60a78b17991d27463e401eca731129843021e302830c2fd665726547240ec3a3240586b01a05ca8206dba1
+b9d7fe5671b220a3da83bfccdc16c0b6f5e9e5c87810db14f070dfee582fa190a360c62acff13cd877c818d705a8a872
+86867f22bf6b859e7f0ae7724a1174a65c4902cdcf74bdb22415875d72b67f49c62ea8bf9ed0d6883ab76512ebb951f1
+ab728a8167b9e82d608d4939a0712f82843f624d08d4013dfd3de41bc526e9d495cbfd40c443f67ac59dc4b5f30ff217
+a5c4d10a04452c1ad12c18ce8ed7eadea1f3cdb34fa5ce0cbd804f5dd92eae2551b771523e711e8037770cb66d1951e4
+8808f69b975f363bc08f8578729a6e68445138dada78d5818d33fb83a7af6cc6e7030f7b76286829861a4534e0b30248
+a280773d32e1ce3544d3ba5025896d21e358592504737de72ae76d164009fdad05c8a1e5e1f8658ca6374b347d47c29b
+ace91a3971be87b1ca8e737802918d86375088e74380c444751c65978afba2b017cbd8fdcd3f9a0c19c0782b0034a589
+b5445d816d65ea36c9bc6a3d5ec44ce6b76dcc18343d7084567dcf2603d2af93fa8469a1c493e19f1853c96f89621fce
+a238867fce5b09e8695240f936a3f3cb12a715511b7516de995543b2e15aed8860a12754ac8d1c5ca2364e4471a9c5ac
+9467528341f5b93b89c7f37c5dac8bafd0af620230a9f7de3e809f01cf73b8ddf70c38c5023a631a1978ac05ca35c318
+8e5f1c3c411f0939ce4b6a5ced42172fc5c3774f596a114e7c5c8ba433c4efd94ca84affc0bfa89a1c5ace5090276a43
+a6351818f7553d446cbe8d3a318841b0607d1f1890ebf9c6220a092bad3ece9ef8acad4d17935e437377af8f9309606e
+86630d0fb2bc104d8cf840b0e545c0c149c1a8e4dd6d460dd15a52a5935c8ea5c934ef099653d783894a6d1f68414a84
+b357b5d9cc645b645fbce2020db583cdb68772751d6d11d635f1e3ecf995a55bc374be7750b6e8bd4968a55600ca9806
+a9b659b8cacb73a81093eeec42dd7f4fc5d955f9fc543037f31bbcf456af6476f303aaf0ef960a2df88365c2704bb61a
+8b6ff5201c15cffe64bdeb818422fa10dc503ef2a6a4d686364afd0f35b6473e4463719173550d234639f6077e19542d
+98efe45bca5ac679cadc25ad0bdb1f8deffba13d2d7eb14c6149d5addfac06b82fbba6d24b323d615eeee1465b3cc30d
+8c2329c976d78f1d5e30ac34a3fab1f96436947d85f0dd190301a1868e5dcbe4ce60f48fdeffc3e6a05ee34a461d7dd9
+aec012ad25d99ce014101d7da512fe032673399526435f6e1faca4b63759e8f6694a46ad01672da9eaaa4634f61ce89b
+b8d52e530c942c3c7a67bbd0366f4cfdc6a1a075471878516b7a2258aa073eba50a113cf433879a0e15462e82087d17b
+b40c5ce16f94837c86e81d98e2130a9e1dd229da5aea52e79cb42217d3b5908a53d76782cbe3934fa8769db58b00dee8
+877300304eb69720f7cfb4f907b4a7e238920fda129a38516dffcbdaae2e46633d31080590d6df05756781224d532fe8
+973632dc791a5214516c3e59b2b48169470678b7dab66d513e35a0fd1df86b992e27ffe6050a5233af20b5d4998d283c
+a8ae0e723a8ea6e95d721337465a388b60b92b1d9b1deb0b9f59ea30842de356184fd55d9b8331d8a29ef473c1ac2315
+92ed6cca30f76135c4b7e7893c3460501e92592f7d2d6409c1e1d80074120243a5b9ec14d801991204f5ec4f94ff1daa
+a9f575b8518dacdbc5cae766389ab2ec01c876038414b7796f640f633367a5281cb49b48b5e80f6416a33b401c21309a
+b9793588283cfdd47cc4547cecfd987f9f8f92c2b408725f39c1d879199d695e87675fa7e5a190ab3bbc97683a0b9587
+8329a844dd67dfd48546791c4330af65501baf9524ecf8ed4fec9ea87067d0afbd33099052c1c2df819ca1afcf25dfc6
+b908eba1b40edc300b63ff6e20e87b17e6dfe975c37ca63c92e8866968070a2c07204264646bbc9318145fcb90c23555
+8123871ed78f46e9eff4fc7af9f490594fd7c20fb814e505481ac5c7bc7588c1706a79b14b85d29bd7b97d7c82b2ae79
+833ed8928f154fe0a88ae98e5d8c74f816e3ad679c1c4ac1322604093e85ed4b9b9c4361ac188f0da5443c72ee4bf3d4
+b9fcbb8a422bd8d996e713d176b7e63edcc6d73b3d1fe3f2c4b59da637a168accb5fb4d227b709f979742cc0af8c0ea8
+ad3759a6a6bac3047935443347e3c63819905f6c01f58f0ba76aab422d723cee10c769663be9554473e668bffde1d500
+a60c1909703211a93d7b5e8b8ec1cf4ca06ada653c27696a7dc9a2ff75cb712918888c6b61b8f792ce9b413aac09f48d
+91f05985ff17f9ae20498185f6558f9f38b67966876dcc6981af4d179cd055661adc63155f4afa6167ad61b7038ac49f
+95c5add9bab6b9792517772f9f8b21bf7cc325dfd13a43177b0bd982d0f620185d8596c2cba46a5e10aae597129870ce
+ac0b4b6e2b3e417166ad9b17de0b3ba775df6ad3a78ad13a1892c0992735ae54c06b1e6123b0c0bc90544441630c6a1b
+b0135c25f74ae776c241faa6c91a3f7ed6138d19a2100928b7ede64b79e177d92c5cf921dcce3c614e32de34975fa6ca
+b2215b560d5a36f045de7257098e9d75a40122919d4726990b4395eb2bf1ec789cd0c64c46b775f6a8be28f23958e17a
+870dc7f7a513728f2b428a3c08b15a6af88a288824e790f41b1190fbe02b59dce2914a1339f7203cdb7f2f9c98d8d721
+8e3895f03952cdab36f602418cd746bc0b6a07629eab0a20bbd8de6c993030c5287fc146fc45fe97a06c992e0a9ddf02
+a4cea15ebc0dfad9feb3d18168fd33768e8ac69e263263ceffcdfa35e8638711c2971697b7d5b2aaa0fd8c5440f3e164
+8cfaf5369781a59f4117283fd3f290b81816abd3124a9486ab1faf7018d36a73c1630efc4ad648ce462e541827d51975
+82b420eb25736126ef18d91e91ca2ecaea8983b8091df88343e8e54ca5ea7a3da6918c97695cc0cd5c2df95afb1e3cb7
+b3c13923a3d46d990aaa6a1eff3ad32f162ccc5186e16a549dc29ad4d63de6287cd05579452785cab32e2485636d568a
+ad8a43ad6195e08a36f755dd536842ec88a7d920bc302451c860444a3fdaf294e5b5dc5a122423474d322af5de8cd8a1
+ae40d1a90a77965366b5b5ce87d6fe86eb255cc3d127526930d128ef7763455adb82475ebfb7be31f9c512394f2a22fb
+9763bb9459fd4c0de2534767bd99f98b859030b6af5739a7081d889d6875f5c23f0154c30d00b7240baf6450b4459987
+94aace9e9318d79d3c7ab533baca31724bfec839b01187e326b1fdef846968b1b29882f2520a9e237dc41ada01bc3761
+b6084f9e0051be76244ead401e8d2758717e93c4cdac58443261b3603cfee0eaec7d758b2e4357650d2c1f5391edf798
+8c656a798fea470163e70869a13edd30d138bc148460d122a2275df8cb43f2b45a14e0d8a8a49eeb7c1afd02484b6ffe
+8ec317e63df2881f49401eb2f6a82e261b07474006fc293bbb54e0fb7437697b16ec1d6ea101fcd56543bf4d69374cf4
+b27d9b3b8c3cc59d08159c765d24fd4660bd0a54b2b7fa9fa00b47e6770e6e8d3ca353d305fd772c8171e20765c8a66c
+863ca045abc38ceee09c4a21a3dd18f1c0f70c0289437957aaa39ff764760bc422b748bef8ef133ee28d88c46e6be1c3
+b0de194caa68f5288dc365faf9e9ca3c69b0a8376cdb532cd6f1cc3478671a1e755d0e8afbde4e3a88440fd9cff4e8f6
+8a259f48cf5a45773522f3c5f283a6c01a0febdae09f873e009e4635c57fe5060b01243b2e5e1c9d2ff7490f2dd3b334
+8c4398e1e579778c88976ba12feaeac0c96fc97b4e26a133ae74fca1b9c315c1112ce3977d20fbe9ae5866ca6544fdcf
+b54b25aeebf1917bb4981b43f39491918773bacce37e994b74f877d4a636f1b3f4a2f164b858f95259f285ca0c294f24
+a9db33b15331e852da3693f6328bde30b8cdd79c9b9b63107cf78dedcf14da68446c462720b9ffa5a1bfdaa68f5d931e
+9966b6bea54405df1dc4edfde9f8c3ed7c0733d5a73bcd8b349035744d5eabbad0d19801a678d48cec84c0335346af33
+a3d0c32b5e3036c4a4b222c13f7db23924bc2b2f724bd908a38db3b8f9c95cf5034c4cda0c5083c0967d34061a216b57
+92ca6b883b2b20015fbb56cac4c4b5ef22e555a9b75f4f020822fba9167eebff8f9fe5c729c574cfa5ac27bae1a83fdd
+b72b58d6ddf54c2d37bdc1599ac966c54cb4926c8d2f70d1bd4cdc383c6eec5e4b87efc59466682f8db964d80a4b740a
+89ba63ee57a1e6f13d7c66150a8d6721329b385eed92be3ea784eed89c76a1ea88595725612b109a9e4aae41d3f6c972
+8727bb53bb62fb714e4e5de461c6cb298730641e38a0b49b3b3d4a29fa24167c7c6f4ff47f4f3b91e464a581a4181853
+816699bc7c3ed65747d34786b7fca4e35e79907f459f2df0918669adee54a70c03580c4e7d2e410ceb45c71fcadd44e5
+979688c14ce623dd17344e67373e5852bc1d3ea12d37f7b28095e5d578d8c9c646e4b97a3a69a97764ed0a88f62c99c7
+b4539a9eb6578ed3b8dd54cbf57419e99b69c0ae1ca3ae3b4a21f204813b2a78438d6c72f86c13dfa06a0b9244b98688
+a5d957181c30701fe6eabe3e65a53a33dc43df364c45f0c4d882ab88a069024bf04b71015f1c2fbf03f368e63bd82fe9
+b9ce9a54d9b17d4da41ba3135d077c546cf39dc83230506a4ee88cfe39e76f7e35664ff1b571e231054cf1b764b9267f
+ae6bf2eec8046137016ba94442a7a0aaed0924ec1558885135fd339d2996aeff31ac29f1de07e84f7b7391fc5355f429
+85c7c247766a4ca44278be81752f4170dcc069f76992b236b40e71e31e08f30de6a5ecaddc44debe4f94151cdd8d735f
+a19d41fcac394b750248e575c300b9a96dfc5b3dca07ad6e1d68dd3f8ab94d10aaf8edf500e3fc7774e7ee52935f73ea
+b3c959a22fddce5a2e199bc8724e825a6d9776455c033299b5cdc9a9d184be169d807829d5df5e747476d172b5701cca
+916aa7bc58f34bb8f32808858cecd3e90ea26c3ec1f80a40e863ba18fe9af6e67c0b2664a2274eca6d36ed72e59a9341
+864d945b7be551926f747406d72057c7a141110f5d269fb6657cf347cfad7178670dd294f6a98c19dc0943a68d7ed45f
+b3480f8a42ba0e8eb020c2e1c1284a8a9102fa68b43f6eaf28e031621b9f68bc399899e35a1a283fb52530c8574484a3
+a8cd1cb93974d1a6072ed51f356449ac19b04539517cde34bb7b2ba55949d213ee07d387ce7b5534175bd8a044556ff3
+8e81fcc5fa5579f2479011caaa393f47a4e12828e2e82072736d85ba1bf70ffef9fe3b2c22fd11ce8eaeccdfa2579758
+897f935b4542b9ccf8c0660c8fb1a570a8ba108fe8440e17e6c50e01affc2a8597b7f7cde5244c7026013b52c7331b5d
+b9a20f612c74821da05f48d8bcfa7a4a550979e35b49d52031be8bc9cf717fff21db0142b633465c5edafc42b7c73c84
+b88caeb2157d636fe26d3b221143443940427e8722596746bc337679e10ae6e5a9b33c456ac271f8b01db2f5d1b00a62
+b23bbd978725aae647ca2778e801235f605dde17897d4d56914b0d2241eb31f930028904a6555581ad5b2b74ec3c9587
+97a331ffcd02eda1d6e0e15deb110ad6106d3159ea641cfbf424d2e3065bf65c9b14f72a27ff3f576dc51eb068bfb22f
+a9317840cd8f437ea97d80a3f445a99eef463a5e2beba3c986da8fa67def4ae9a0e8d1a675a35e5616ee90986366bb70
+8c26dd7451b12c65351d5ede6a00ac7b9316f9e28be8c692d20709c3b4a5dbc76fb914667a2f1e9a654f8d2850b7dc3a
+8bf4aa18a988f82dfc54668bd4ad5161f276e31567c949b7857cec331c74c6b68849afe852892816c802736cf7c547c4
+836fd166bb9689520cefd6f23905e4c1260f97167b17534930923107fe934d4afb1216e4b89679a564433dc952a77b0c
+94d6a5a4a11f41887eb814acf9b5a031d013d614621642384504eb78e65b6a07c50326632af47b408d8ccf43faf8399a
+a213812713128750bbc5311dc317992bfb5124fa067072891f452880183d64d6fdfac8825552cb809178a3f3a641c9b5
+976d1290308868c5e41dd3766447b29ab8c3b72047a0b7de85d3ee5b1e13d522147a02572cc0d1ed8976d411faff5b9a
+82a4494a95738ebe56578e1e4c0e486eea66d5cc44141f478bfc5a6b3ebbae6f32063725284df81b438603aa564a2b6e
+8a6f4dee79baf71a4a40843437c16b2f304785f3e56b32d9ab2474666fce2c7749c776bd898a65f4a4d542a497cb6d6d
+a04a3484be07c2d60f1a90f9dd8d4170270a808cfdb863864377c2515dd71c152920b65fcd5f47004d27d14d7ee7eaf2
+a984f6633ce3d42c75083ef7732e5d0ea15d91e73cf893be3ebac5e56defb8db97088c5cb3acb661e26bbb354ad91ce8
+a5ab5b4b0dab86706d68c9ad921d4917215c4fbcadc8adacef7309c0c853bc3c2ea34b3868d8f03cda6f504793832594
+88f03e55eb028353b70352dbe91f298ade322951ca115972f1207744254fdd01ccf899aa40ca747da8812dda5bd5f985
+a4bab627f7de273f8085169cf05413bc368c5d9e5f58bf10995a8bbd95e511b1ce15d008405728ae8e8a83621efb56f1
+8ed518d0f225b90fe7f01b0fe4c451589390325044f0d18a8c47bf13e24eae8627feb0c9e9514397536f73f33f67a044
+97c73837e77d965f401b4e4f089ef4de7aed1126bef6be4e9002b2b68014b98997213e492f7aabfd2e47cd0917a11d6a
+a99e8a55ed0385bd279e11a80255b375f2d59bf8b0879bf2337ab5e3be450a2ec05d1bd8867a633e359a02cece4dc1e4
+82a74b5efaf3c217ee2bb56c9b8e76b3eedfc553c73177e59d982f503a5b0572b5cc0d1292820823307eec956c42b28d
+9800ad3e10e8a19d65d5963673c183bd536b65e14ec18dca45e881ff3bc74eac32bef2ef845515ac4fd6caf558a6926b
+a2933c78a67cb40489ffb8096c021ca017b99feda1f9c5d702227d7f0a2ff66a539d68a47ad90ffdfb5c31c774946f87
+947b29715258ca20da5b17a8e3d99665b7e599aa5bcdc5d2d7830a2e3cd78364d51a3d7c0d8bce48a1992b27d1ac4980
+86f2e2d3e160d3ff979ca70c456785b4b2437eb64e58adcb78c4aebc96b470f1b8b999a3ce8ce20e3d3f030d163cd138
+958f4435d35932a91eaad0dc476bfc2761a85f336ad2ca6fe0c6830fe54e8f417434616df9e6f07a9454a4403b00b64d
+8b1755af961e0f9f59651d56b538ea59af489e859a1c93726cee62649da0e304093d62db9a2c5854c8da1be61bde990b
+a5e11042f73f979c8649592f6cd01dafb319344e379a65aa9200d3b636abc569edf822c2bc12b3db5c30b9ee74f2c981
+92ac5584de1adcd38a2ebe361225f224e9b498344521be519faff77f87c1f22fe8e112f9df7cf960b16e358efca0db08
+81db84f05f75a218045d7d5fd4620648bd4a95cf468cbd69787011d615778ba7300b729163e7c8abd1a5b0ea66fffbf7
+ac2f522e9f030a7c576fbe19041f5db3913af58da75b87e8ad64b93bb34850a79b852804dc68ad5e7de66d90878544cb
+ade9763d1c7e9f68b5f817cdfeebf31bb3ec1391dad04576c55fbe4bb13cf0d45abced3d51b5512c73b2d0f403906340
+a0b431bdd9641595fe1eb8d96ba4fe86a447a31ccf36cd2f7d94c5c86a7d96bbc95b204fcfe7c69c1385997b1daea3b1
+b3b093bd8fbd84414609ec9a108507f97d7f77833b93b15439423d2a2928e40b192247c8471cdbc12891d83c765cc6e2
+8531a5ce8e0c44e887ebf4beac65352c8a9673c51b6a1edc439e08bda1354d359e1ab2e27b82636c6dc0daa3aade931a
+b22c2f3a77ae4813a75004dc2c9593cb2a51c430c559bc7d07d83e95592883b99fbd0f9ad24d2d80d86c871cfaad2721
+8b6dc7d5b8cb6bf36352fb19e42aa37647505436e1442eb1f228b0804916d569643102b2282ef66bc9a4442520521dee
+b29a811ab81dba820242a990dc774cd937cd299495cf721cd11971b9f1dd9441ac687dfff0e91656b9764963a56e4625
+805b280e31664008fdd874bc38e870db271027da70fc2246fa82c499742a9a8de1152275e0be61f307dc8f7a918e270c
+929f690538a500d238208930b55caa9c489bfd3476f6be2d385c36df3159dc3d8bdeb24a1ffd7b028ff4d881551e2888
+a92bbf103ad851a41e5230e1e37ec7802e08f4610c0db9706806afc4a247679b9525f9a534c70d970a1acb47fec9bcdb
+b9f2698a39d6d7aa8aca181fc5d95dec796ed6eec002557d4b63369bd90aa4438c27ab90da4f3ce81168cb42f7400070
+b08703bc97292c56833d8e61105f1431c334f98a7946850c6175f37f703ff790d9a1522c0003f08dd111eeb083235073
+9355141cfadf46f37afb73414c8803f9094b06952c9fccb24a1f8c18a13fa7b1197321b19cb832de3f83ebdf8deee53f
+b7c23f7cd8e212108906b7809df90db58d2c2f3a8e1f775274181bd81c74fd7c2f8d68bc7d4aef639ff4e19f86243f98
+92728e009fc3faa08e81c36c268b3ac18627da7618c96c97598b13242286645789c15c99518a07e658d92eb8d2b89c79
+8fbe36d4f2f08cd6245e8999728884c636a264451e4ed894d2116375f3d9eafcaa72ee59cf7923ed8ddacb53cc478761
+a6b2bffd6bf8f54231fabe46ab2c1d014ddaa797d08e5914f13988140bf804019fff3ad07ac2cb31283fc3e74e28d0fb
+886387540b5a7acc8b2bd107124bd17d6515697e09c85c4e932a6421965c872f014d11d1ddf321651e4b3564eed4f252
+8b81f3ebc962e9ecd13a11e919d86ce14dd89d373cffa158b807fc91555a4ec1d7164504fb67edd9599b10fac5e32aa5
+91e3213ded5f82e34389408e95d4f7fcd0f50ecbdef9726a289238e4159c6d3cd2f401479a1f785865e91ca213d2f8b3
+99154b88ca5462f62031300177e571708821348e1027cad4867eebe42a6fe92a58ee1dc21da9031002f1b051351b3785
+b5c2b7cfd87f2f65df07b39f8a26dccb16946fef6b89268b9300c8529d730a1469ba565a480d7c5ae9df8600ac50e90d
+87df32def37370bf8c4c3a22a670bf5605c78f240eccf8dba13bf19c8a3a9d0560f8899259c4e51c6b0fa64d7d1e4c76
+980a20e5cd352786bffeca1b8a31930d8898eff9f4a6b2570829248410bbe1c78105b6a61cce7e3ed1642e5e2af127e9
+b18b8dbb9eda5cf333ea29fad7734235ac9e7234b49fd04f178136b15d97595d5b415a92455a319ab594b81200cb17d5
+b713a71be9bd22ef6a2747d0bc8f4d008cdf6182e287c1e0274689e915a68150d6083268188c1f4a7fc76d21a219ec85
+b86ff129a981359972bb793a81fd422e0b37f89e76fea70da012fad160b9eb7b029ced81c7e34679f6897a45b4e8da4e
+a74a4cb9707156e21caa20b95a2a4b4eae8f773cf679e2073fca2cd3b1e502ef06de8a3c010833d525a7f8bb6bd24601
+b51f06da38a76c2728cd01f6073f402fc49cf4bc5c60113a2700b5bb0ca500e465e541c467013a2804bd7641604bd2d4
+9855dd73307d8671b6f9ebcf676de3ab7e37e7ac1544447c7ff34a213da46123b57ce23bb0f381da8fdefbcbe6c35645
+8fb382c63f4c935462d013a0d3e2321d72fb4781c10afe6e31ac51766832218a05addc6dbb1f644aa61b5da9bccfd5ae
+855dcff23e0ebbaa3562fd27c43957cfb35d492837aa71f27cfd1bf65a59a12d2beded9d09f3ddb4f801aca8cc34d2af
+b7e7b317f10cdd13bc879c2fb0bfcd137af23e0cb70917e48d53b2bcf8c157ed7e5f58cdb966383ece9d3a4c92012746
+80d2f84c39422afcb449aa68b34fa9d72e9de79a473c3ea5897f6f3576d2bb6fa2d49f0b44aebe5e68b11e85e066e028
+a35b083749f8a5551f0dcf529e845aee189cdcc6ba779f4e88765adc49cc4779cdc2290598908ccedd8dccfdce29d53f
+a30c412f4bbc2de80fe5c577b4f94442255cb3061a40649b0ee5357977503c6fe54821ecc8cc92d5056b6977c4695e70
+a2ed0d90ab612fa3526f7450a43d45a2d9e886f2e5888ccb8405adeb8ca3e41c6a94d18a54b3cb1eab5b8f3851841ebf
+8d4dd3f8f8a3d69bb217d338e757c814eb69e6a776f55cf51fa7c1b2f1ce5f8e9bce8353dd335e793d68eef676cf7c36
+880d1ca33d5d3bb47b788a7ec64b9130752610816facec99af53b6e58a7e414616e9c815b1bad870d426380085f6b5cd
+a287578293da4354f2c3c46d637aa77b91526f9618799dec4bc602305ffd8336d373786eb67eef01dbaab88f07f292c6
+a86d3fad257a64c84954a7530822346da0215ebf4ad9c583f35cdbe16a02fd70d58ab34c93681fbf55d6075db6425cbc
+a7bd884d343a6bde5f6c2512d81ba701fae7afa6389389e4776eacc0698a54c3ab1a0e1652c1a7a23d3a1d2a63cde8c6
+8e0653c8b7279d5c958ab1b53dd77b73fd30d9781630a870d0a75681d38cde4fb7c2183b9c5758596ac556578b43fef3
+b76a00c6f5093e7b28703df85bf968dffb70c455c91e75cc81189598df052244f7549d18e45dc70d98d3d86e0094ab2a
+b270f2ad3dbc8b43ee2603c4e641be76820f07a4757cfa96be2be9c310b7e39b574572103253594a51fa9243298cbd94
+977b8b86841ab8be7d1d50da7369e2bf71f24360aab8448d7748d59e010ce81bfe79530ee6f6644b987fc0d83df3ed15
+8e18bc59841b7d56f8d9eff8818eee06288cd6ca86200eee7b5e6b230070debaf254a2198b4cd7dfbda8a1d55a916c8f
+8e7a328ada969ed6289972b7f43eb5958d23688603ee6d118b6ccd8978378dce2d733ff64c30519b19007a78340fafa9
+98a0fea70a219292584c69546d6d242cebb2f1d84f69c5aa275a257a87de652e721078b983ed67410e3a5eb0cfbb2bdb
+a09fbecfd05772a9989008281a9585accba3850831485802f042413da533b1c7ee45a8cc679804340bd9142b2f9e0069
+99890a6b273a2787fcfdd8e8500134efd60df99410e8432664a3e5325e55e78942f4bb11024c90e4c3618a70729a277b
+a5f3eb1617a77f2d5c76bbd1bc3546ad1628be90fafa9a8b62c605d04e599ab2eb74b25afe0e68fd020daf4868dadcfb
+8b53517d93f42b833f7669c131dc67f14c3b0639c46d3b02bfdb24cc9e642133e0c665236a7ba851c100ca733d673341
+849fd288217bdb154213e79abe1a78672903e15429e37f6846019986e1cc8dd2b3ed28e4cb52dee1762a4dddb9ca95de
+954d839198c3dd2ea1ffddf98050e2c52ee81b89f38d967bd30c6863672e43bfc32e1030bb12f5aa424983bfa31dbf5b
+b52fe86414a98d0896d7a427d57739da35cac4ee24be565956d15a5c1cf5b4b95e5425dd2607fb9f6d6024549b59a4ec
+9586070415a6bf1e11304d2819330eda88e81a88b9347aa866692c163e1af772be9fb747d9281d7aabaf5c9934596934
+a5b78e5bea362df26a89df682df61287763ca1b87ab9618609c99e52e6ba047fba7ec828c0552ee26279aa8a48751334
+aabf36b9dd465ae03551dc82bed9cbf1d22a2236ded28964334f7ad474f317f4fb8515b853354bc06181fc9af82714a4
+910f0b2efc608cae8cdd39df7a5ef9e570592b31df2331baa7721708057188ae96e1b43e2f2f2c8cb360b961d687b60f
+a5c5b131205c21ca68d6103f8499279621da337a743e4a08547c3b4507d52d2d6e5014fa5d920b351a6f53a195687766
+a6898dac2d8748b8bae155a7d8c169e7eded73cace1e382c4dae8633f19463151399c5cf877f8ba344a698a98228864e
+92919d8be671b4f490efb49bae145f419c84a1e81d3ef78761fa326f67d749ff3530f5de04f984a018065f42e852e1e3
+81083de978e025f0b5995550fa17915d02489344cabf8a79248352d78dd6e893d28a5c5204a65a8873756a34ee3c0120
+a6de92ecef84d188cefe29a03b564b1e7bef2a6afd785b58897f7f97a958573a35aa0767bef12a49b352de30b4f0dc18
+985cb3475c7a9f582c11784cf61a1988240d74e49084a4c0f55f3f6068c4da0b08b136f8fa62e9001e0a265bf65fa3d4
+97e6d360b504991d51119a78c5b647f25d5fcc1298631209d82c2ca40ead0380835fe3cbf8b82148b0b01b8157e884e8
+b313df44b2c47126b58064599a0dd6ea49e5ace9ffa663de03ad30c1e95301cc68eed67d37ae6238469e45124c59bd39
+8a58f70545db2242cbdbb12492cc11ec4d2b2ab0ed8450d21ceb573558d7bda91ab03c98736e13d041bcab84fd8248b9
+9077880ac352a5ab0e5e15ac89b14d173cda0b41b6f7fa66bb357195f10cfcf491fad6bdb49d71cc20d99cc6c8e28d04
+a09b2930fb3b1a60af8c5214e8c3f6deecb3fd3d0a5662f3885948f48d1836b5ad3dc74affc54dbeb5b522b90a17dc4d
+9163bd2e5f58fb1d81007422b91147685542fb1c7e2c8421af284c7cbfdcd2d2b399a37123b58a2a349f27b31bfa47ab
+8a3d859f141457f9d63818634f81deb5c858ac48bfbf2e1da21f4f0dcd66b3e1d2d8fe99c4cad38206b1e15dad94934d
+86d3fec476b59782d0477ff333fa79922fb9fe3d6d6b6c5be9da9e88b006b46b2a0f8f86ba4159c5085e66e32fba67a3
+8041cd57335bcdddd37651de2c3e92edc600ac23041d0e383baf55651b1b0960b6a601491608307160f0d7d48ce395f9
+805c284059f8c03b2bf006b1af95ef726874c5548e93ea965b402931f42b189f9f674b6b52ff09df35320085172973c5
+8acf781a0b40cc56b1013cc1fc3bc43036545ce35591f3b905543c09cb1ac1a70a074202b6d5ce3680be913200c58879
+ae670c448996156c80d063f1dfb03d7770201a35c71cf8e70b38d52dcb5e2bf73d5286d63ba2f561525d62cd67d43125
+b0fcd0150fc0005ca438d6b0fdd6a70b121d35ecd74e62bc119bb0187cdf6bf674ce9fe01eeac5d46a68ff4d4210ad09
+b752c6850985ab13a057028887bc84674697c012e9da0265dd5ce1e48f0aeddce5e07e3e7cb68ae17a648cd1207eef19
+a6a5c71915a980fd0225847b45e2e9f3731c6b2a627cefb1e2c6a0cd7f1d0555dd32b6b601a7ae9cfc4b9d06a56a578a
+b7d96f59a988a7a810c25018f7f85cd6e81b335a84504ec76c97d7257f9cbfe88215ec89553f0dbf39507d990b3a7f84
+a7cea7b3ba43cf6ecc488c34511b17fc7b97150b2d265785c09c676ad3123b322db32e043c5961384ed6d90d20c63061
+809dc467b304e9bda732cd92b15c0f9b363cc707432788971508b8d60844911ed4edfca96d8cc20b9874f1e38a2d1685
+a5b6a089e022fe460d62c4c5228e1381902c9a796ad92c03211c855541a7fe27c5a39d9123b001b0b892ffdf0a1fa065
+95d67a21154a49bcdc79ed5f2773b651c81fba1ad82bd373239f09a67a50371a147310623fcbc1211ac57aa154e8b300
+a4a4f0ca8073407575dfd5d04ebf76f8bb467598824f2ce7fa74756803d9645d63c9eb3ed39aa202dabafa4ff0a0bf34
+8a77374f6e449d94a443f2d4593a0c3e4925527e0653e873dc20756396a9a4e5696fe44fc1b49e456711259deeb3f037
+82585a825011d6eefa85cd530685b103862aa0777510d22942d8f77a0a7f489f5d10e5b36ee38f66cc96dc57d13f5893
+98e24625c31d5d97c789eacb91c3d51cc6edb38cedcc474deee459f55de557c42e4d0754ca4ce472d0123638eeafb55b
+ad4351c76d96c35ee37362f2384ffb809bf6a47213863330aeac1ff9be2c6cc7275f0f974e46bfb716a89ce1bdbd0710
+afc8f5af4f9c38ae672d20e7bc3796aba23a41eb033619b4c0a06e07884e1e0c7a7326f069068dd22e69fa5f672efece
+983d5af05af31f9082f381378fca3526f88309bbe51d0cea5860813bb0fcf6b32a3be110336bd728952dcd6ff8a26361
+ad3b55b67b64b188447a1fb10d027bf7f86ce0a0fac966d709e8b6ccdbb7333964045f0c4719c45c36b7f3c9ff73944b
+b410fde230d8dd24b9f1bdbce8338b05110b130591913f23a34c5fd092cdd3f747c383f6967cdb529ade1a264a3ece39
+b3e4f0a046f93c332be07058db00c5182a498987759315bcc3a58d9334e09a59333031c3144b59d03596925703491cd6
+b77e58619c8c471531d9b2e5dce8f82bb8794223bc9459599a911440e64e0b5be1d37e289807733ddbc2858bded1c34c
+b450945bc3e290df96a196083a45aa929ee080bf45112e678eac0a939db2ba67334ef782c855b9b354caccd94b3babb4
+9794d81e968770a6e12add60b32ccbbe80cb2680b157d125461cc3db998691e836d98cb3b3cfff4f156b2800d426b955
+98d1284b4c035e93b4ea0431884d91d5a7855ac6c5b1ea2a994e653cf77f0ac1a771dc75899bd1485066da17e40ee341
+b1da89b14efc14d15b2bc967ffab85c41dc447b6a7922b619b5d5b06dcda725bc4530959b70355ee20eee7c1802601b9
+b8e50ae98515dbd9ccaf27192e58a5c34def86b1d0d181e63e64439107c30254267969f6069e0b863c254440c3480de3
+915f0c7dc95f630bf1114b02e7d9936b0911a69c932950ecb7f800cb1aa1a4e1f1b6bef6ff4a23301cfd904c39025863
+85392fe0edd316031c69d90b106b6685bed56a0d8d814db2cd5d77d07b18fadb632694a214a176ef60aa0f82ea14b00e
+ae4cdff23859b7570179586549165c728de4ca254a5da29668cfda259d43a387b3caea8537888d43f713d458da6bd4e8
+aa0b6a3e0555d64a5cd1201fdff7ba7ff3019e9ada1d86c90c626a710df3d97d2ed62d2b63e5632963e09cfbedf83732
+add726d97dcff922dfd748eb897e540a2b4b8bdbb4eac1feb74717bf086b1760a957f83586a57b5345bf4c73d791ab9e
+9721889b6fd55cf9a914e5aeefdfbfb94d379c6312001ba50ec4bb1dcd03f95fdb45041330da8871cf3dc3c6a6b5e330
+8eb9417573ec6af24a610da5260639efcdfc802a95aba8efa829dd70ff179dec061da9facac95b6af02cba6a8646f7bb
+a477ad7d2885e1f081556a98b3904cd75a4ac7a8c27fb0ccf15d117feca59f891a677fb4ff4fbf38203055a9436ebd1d
+95b3b2ff92e8a0bace130d165984966637a74280d0e056cebdefa6f825b1d55c9bc6e13cc8f263e657dba3dc7fa68627
+b096fc33c038b425a7a922a4274d01eb366a488fc969497a575587ada74b9452a607992aa2d8b9de66705fe20b4abb39
+a813ef1053ea6ae8a37f4da722f16b6ad0213b0ec7829998362292aef68c28357ee27a406b567a629592447db8ea6085
+84248425c3201ed389fa1b64b9e1d151b5a6f5fcb8f5e28ebd665db57156ecf9b2fa77bca857200df9f54383b7c5eae5
+86d0a3c7fa1e64111115469ed0373dc3dbd448e1098250e9e8c5c7e775fd1f267d49b4123c347af07a28e686d5f357fa
+8340b2ef4fc2afab3a3d51b6c0361cef4aec3d5e1d0f779f9fcb258711cb79ba4083508644e2bd182fb25b21523557c1
+b840749c259b5af5874750853b4de6f4d7a274e18fb77f774f5f454c82efc5979a431e28bc8e43bb831715c7fda96db4
+b168d333cf20b053c1b2a915c3485200a7590c3c3661507990390800fb95d3772ec6815d53aec5e2964eaec19833e787
+8f1bb538dd5005384f38f88cd2588228aeb0c6313aede14ccc12affa9715cdb938ed4573c391572f0a7ba6e33a1ace89
+ae4a8ec2eb938eec00e6608c087471128b14a773d75a99634671f6fed95f7b24b14f04b3271d1c32faff7f0f2d98547c
+a4ad66552924a6831b657f8b318f303225b2cf29b09790a48285b028bb1420c56dfa2ca0df2e823f694e8e3b27952a01
+8af4eed962eeff534234d7c34f1033c68e8cf798c99880a67eabf38b533570a3776399b883f8658265cd14277b060790
+ab2c6406132413cba89a951d919bbe123fe4f220364ec2282d8ee0c140ad8d48ded0df7ab56f8f18ec7526ea2f1cbbd4
+9154df8800e26020155b98f630e640be97a3ac41b182fcdbcf31a3e4f233810e34e224c97df8ef0f39ccca29a9921fb5
+8f306dfc5b8376a88a104cdf67eab54f93e478ca09036eb780050ba2e8112b400bcc09d49665ab37d21b5a2d8440b3c8
+b768260e94bbabaa527b2af8be423577cec3bf4aec3c569a4fb69e1fb997a2157c59f1169065d24a8aa3625d89d988fd
+af06139ca7d240f2495314d941890c078d504b2bc09d98a6156c373de29781e7581f33adfc738650cad0da3f6e07af88
+849a6e458ab2f4101167cbf75bf47ec1f9e481f556b1b9d297a6b4737584011d7881695bbf3ba31e3e4180696fff6407
+b107e7aff27aa19a4a92d1a65679bf40e85ac6f08d4e5f14859d97c170ceb431858fa4c46d00131527c605164b5f7bfd
+a00666055e18f34ce02e8b67b6f181327ec0a11547c0795bee61802aabef9a3a76ea138b905cebcff9c4c86391763e6c
+a65cd8dec5166949696dcccf031c300895c5fdd53709a1897c61d795dc22bae2f7717e7ae52a9950f9d00471ba6257e7
+8b49aeac3550ef28b5de37576a5d4e2e43bcce82de09f491984171251e26c27fd0a884daa6f3d30dda107dde4544b34f
+91666b88be09799c7de9a5d9a9d4c1bc1b6fbc44c664adb15a2eb27229be910226514c2ce22818fd38b850c89291a7fb
+85abf4084c735b20333b1c2145571b793f96188850bae161160b47dea7c48b0f588adcbe9cf80e05d17851cfe3400f1d
+aedaee73c52d71d7ac3854fa41199615ecf49cb0c35d8203f95175d1ddf565499a8e9cb8d31d89e7cd9cb75a9fb56f9d
+9413589f0746d3b81e2f88b280e354fbd63ac164369dec353e6259a2c4acc6bbcc10f2a851901f39f90da7e523d77848
+826121abbcefe3ad431c713a1a2cef336a0f06f69980a14d0a8adae5640e9aeebf4eb82be4621165ba32ce5e16de4880
+adbff68221279985891e9f3fdb7b1dc71db3e20213b7c8e1931e6f75c6f02e7a1f6f05ec0687885de55ac85440f372ae
+99ce8b064f874cf028e85281bbfa43145893f80a8b12813d047bedbf88699266652de6ae9e4ef9ce575e67065854fdb4
+a809a71a663b0a9719c0327d33215b63c6ebb12da3477da8534d7e8f79fb81e06adfdad79686e40efb2c75abde559a34
+b26c4cd057118f9b12c9b86e77d370b3fdbf2654a5d80a7763ae98c68cc2769a7cb293ea89b3a08250c2f699b8d76e22
+867c56da9a2ed672f47924cce82c9d7e801d6a1fd18cdfdbbe07c82091c70ba0ebc6008b0b9d505632a97aa23c45b8c2
+8cf14633888f2ba0b02fc8ca7536f39fa290678c7e0840c58c53a9d2fe10628be343a86acd74b2fc01b0c03af0996f59
+86696802e4f27928dd6b0287d0188f8067283496d154060383c5ee295a468df32a2e8e24648d93ba868120ac429b68cc
+b15439762d0f7b6c98e6946b3c0a7ea0521845fc68b47fe9c673194d81a6cb375c79b0122e81a027f21a7fa4cd6bbf56
+b1bc19c9a3756098c02bfe36429c0f0d8166a5c9274edc7f80ce65ae7d6c67864a457f19cfde6924d204b81f2a195fe6
+997f1cc78d707f29e3eea0952b5514b34c2cf0720f33a3244cc466df62b13031bea13df2296270eed42b3667c53d6c26
+94f599c9995caffc9b47543b822dd8f84f921fe2a31e82d5d0fc79dd93a4da0b87a0906b82fe7c2a8c23c7829c21dc2d
+a7fc8a6ed802660bcc07d3ca454c415da18d798719dc2688eeafeb8971910377ce909de68721fd97c4d9fe439f37a8d7
+ab16f93e6df2464018be01fe040fea08c67e0b032fe1950fa37c7593c8ecbca24dcf0fdb9e1209d5b0def622f3f6e92d
+aeaf19b49843e3fac538075dccbb29a63d55d12f8c4150185b1ae62de778c983632542eb495808ba629cd4cbd629e07e
+85614d537efaee823452d0427ea3a2f7d5a3c988b10cf7adef8715becaa519a9b5174b63e401946362176dc0d65667d4
+aa08d8365e78efc1919cbbe562be7b28c57eb05c36e8da89378cfcad9f21e134eed923559530aa3f62bec758b00c70ff
+b4c2760454170276885d66f03e9fc4e6a4254547b04fea3c233c11dfbf71ab05dd755b9697b442ec419aca000152f2a8
+b814059b189c0ed46f9dab604fca25d881a12fdfaf834a75cc2c0e1d8454ce0ed9f2a79b34bc5e27004903a48c6ace90
+847707b0aeb4fe91c12ea8570cf0d16caece8946951360433c8a375a69fa4c01136172ff2acab6d5164ff6d3b5340858
+a7a9304ecc5ff6fdaaba6e774556bcd7c5dfe8ee7580a677301dece55c6a8564e7c64b60fc4efe89ff73954f3c3f5b0f
+a1a86fc5648edd58cc7eb61cc30c62edb5314caca5551ffedf088fc9c1b92ec5b487f670c5bcd2127067e8fd5faff03c
+9086a31715283fd525034d59d4ba3465d6c30059b967b1eeb7d537f3bf8caf6879481ada2849167e997212f3300f8ff3
+99c11903cebf722e1cfd63a46b0ae93312439ff2f014b6653fc61927ba430c432b4955b30b7f078c340f5aad4ae24313
+934b7a8b7bcf0108ed31d35a645d73f661c064a6fc6a5d1ad417ccf1b8864623b0cfb54707f10baa86643afb5c5ec980
+89d5a69ae8cc18ad77995ae92d30236d5a5ef00cc63274e318d18abcf9d936453d18a8e6392b52d2d66b51c18d904d6f
+ad2448cea1948f0a4915ab054273bdae33a08c494203d11f46888f852d0abefa310b50367c80cacfb602cbc249b31a71
+807274fbe6f08c332a5d2e2ae12cfabccfb53511b8d83bdc875856cf15ab52c2d01cf706c9be428307ea62fbfd67f87a
+b2f4fee9f32c0ea7fae306605b62d983b130e4d423e2de286bf9f4343b79e5c4545214250cd1348402d8278140c61c00
+8a36f79ab3ee0063098a39382061ec3e1234e67087b9519d0b762aa9cad54a7e0bd5d24e2b0a57a690993e3182f3e83c
+86668e6743a7b6d1ee62e70e6031fc8639ecffed38afdb1afb41d64ec402a308fe0438a22387d9b0c130ed301c39acb4
+b816309d1730cb39b1ab00c5333c6962fd5f5d8b22f3c3ba987b1e0a0065334d206141dcf0e68eba717a4eea533aa6f0
+8754e190b8f751aaf9f8e7076d21bd31db8d9ebbee6b26517b190f624b3a892050312cee9d73cf3d7245446c6a376437
+87826589ac28f442c608faeaf3d63ff057af7724f9d412d1f2cce8c58fad0adde325aa496c6e4e8441775c02d8a74c2c
+af30e5e32fcb17226edc54030f1eff8af619c207cd9e42a2ded7f15cd29fe52f140901f0925ebe4e997b56f34d3f406a
+a62a4e5b6591d336744481a0797eb23ccd0f580d04cfacbb3e415ae3f273761042b8901b0312f93a6eafc42a50f81cc6
+968a9ccc95e8c124f4475c348a33ad2a52a42e191a93bab3d7f0d211df999aa081efa935391a8289cdc4a5a8f7433822
+93350cd99ab7d3e51756eb01c89172cb406c1debd3f0001d2fa8a01018be5609d73df671e1ff43e612ddbfe7076d9ecb
+8df26dbc565ea7e758ce4c2656b65c1f0396761c9360d7092d12c121d3bc1c293ed28d82f1057f4eb5375b15443e9258
+80a0dc22fb4a12b06cf05ce39f76537eb3db9691ca466ca89b2585237c03d13fe3fcd311ce2b3dbd1b7382044b803782
+818b79cab08e11dff3d55bb0f55333f6340c5b462609d43334c14fd878b0f310b77c542c74d3674a94c692de704e88a9
+ad1bda19b1bc3f6d757fe4d189ca82bdcd0a9c1ef509c43e3f49700f84be33bb9b8b8e70f7a09bc6bc00a78cad0cf9e0
+a22ab44c676ba2b3889341fb137dfa14cfc5491ce4c3c1fbe2cb7103fdf720ff2b77806a40109dea9a68d8f072e1c167
+8eba6af1659b6145676d3663b04ebe58c199a1c24837ac4969793f07ed97165d20bb0410421e561cb9283faafd9eb51c
+81b216cf08a29dfc3e16b2865e712e15f494b914cb24526a96799a3078f200a3fd403767119732ca4de07203b479ce8c
+a023ac601c8e0c22553068ce4a7b8361b0b37bef5705fa68a71c3cfa80510041cef3640bec2cdb4f317904521e99443e
+aaaab84c8aea75303fec31694114b3ee10fc1a67357cdd675ac9d0e33c3279e3117d389e9ab017882d517131b14e6088
+8bf9a44b3df3d7e0c776e7ea5eb76f16f1870960f32e7c5b63aee9b432a0adeebbd378c574ed60e15a3abadb409376f4
+a93faee621d930f336f4fd952954ffcbdb261c9dcc4e60cb848362223374010c555a73c0563e7933d1596b0526bf75cb
+88753d0e35e87f7572f2012a40bb757364af5cf6e5dc0dfd16d082e698d3fedfab3c671bd58edbf11cedca247e9fa55a
+b7de5f03681634991d2aa8a0ffdafd223b1a0d1ff70fbd9c00d03f228c6772d93c388c02045461d51326483af97bca37
+81f96d4fbef3cf00da423a1c48ab8acc222016c21f6be3df778342c1d1aa1a420faa8ce906bfcdf955be045efa4b447e
+8dc75ec37122afaf0aafdbea333291ebb735792b4d5934fd16bf28b536fa759dd851e1de448c3efac3d2b0097e0b349c
+9186f66655fc1c551d0233b761c6982a3b8539085ca9a2baebb826091e179026b90f7ba6a825f38c6a09b190a31bace1
+a1cf319c9ed31ffdb2108b684bc21cb495e77c853e6c502e03f2ea08e88a0c2b4e31958004d9879242df420b628acd8f
+b3d3e5a75c34640bb2fbc7b62f8aced8dcb4b9b165992717fdffdf765bfc81fb4e67f3e737e6f70f24d3c24812ec0ed2
+86ee6ce0480f73cc89ce7959b4af52351317cb6406cc368e889472ee5567e8a98560dc1f13b87442c9a8c5d6b31fc446
+9478256948d960e3148acec3487da232fc2ae6818ac2c6eba491adf130c55badfe83f9a519379fc5ed0b63366de86a02
+898a8130718ac6f98ef673fa8b725af6012ef28be3f2320359a5c2c40e479969e5926f1864624ebec10f27594b24f618
+906f45d4ec3f647d0c49deb95884629a04fa65cf91a075bcde67940634cdc98f76fea8717fc1e714ecebb337e9fd6998
+874c5a55bca05fe52a5d1743b8254b642431b720eaa74f73b0faacff2225f448ef94e12585b2d3bcf12c140ee3e81510
+96f76cf34b14263a30df2135131dea00074f2ee853677b94fc32e04cd9872424dd93b32c55026b89c18bdb4e58bfd19d
+b62e2ebd543f3e9a11b72f45275cadf77b1033713625c7374c4d2284d63acaeb64977fd2fdc90145066146c311a68737
+b1759d3b667af9f15da8d4e77440fba4193d0db159a0bf73df32215b2d292bfed7cbaf41c07c7a94ae1f04bab23cefb6
+88423607f005af97b5f8131bdb1fd6d7cdfc4c2da4a4a14bb818b3ecf50c2ae6d3b8cf55e23632354537f5c0dcb0f48a
+8ba63acf22ffc1576935467af19f555a0c27a4b56e5bf752163038f0010fbdbff8a2131124f4cf36a326dfc188740e77
+8b1996a0cdac9c6d896111671ac4dfa84a3a3738c43db6d6788f1a7b8ccd6df16a31606db00cf0107eedab28af05cd7c
+912a604a97457a6b46d48731fb44dbaca26e7cc70a4628dcf553b43a9efddc4e5fb040a1b89e31902888a7cbbf709333
+86eaf5b2fa873bb56b94eb7fc823527ae50364c1bce87e36fc13de149f1fc937af858a25cc477277dc6eddbf9efd5480
+a0169e6e915e7216b83b00b31eeda207a02c9db6825b5ea44134368eae5bd009b7c95005c621e0d258c33c59085cb66c
+8c8ac664946b5e69b4e34ffaa486b745ac8afc8ac702e4a4cc36c59f420a81b31ebf8b875b1f572dad8e4ef1f547a1af
+aa6fd75ca832fe60eda078fc81a1a529364cfa8a4b4fac071d89e33cdbafa7d88ff3df611720b48e6fcdca2e3eeea0da
+8d30857ada34991ce6faa82b4326bc353691ca32aa25511cf3d52cebefb262d6db8d93521020a2d11b3ea085287ad54d
+b78bd8ea8bd6a2fd5741228502b9777177039ac8f033071c82ae11fed7f0a51d8bc64fa9aee44df25eb4b3822d571144
+90904aeb1a99c4818ef21498a583848f4d1ee9253d70c10b03ed7d669b587f8712fd26d4409f00fafc3e26b5d72b4c5e
+87cc8ebf78ff2ad752843792e11aeddbfdc628e03e13e0db598e08b496313f463f481f3a17ec889a3acfd128fb89aa81
+b4fd122c4830f339fc019da6372286d3a0565ac04d4f5ac4f28b2c066ed507316e1b7beb7b552f60060825977a2db9c5
+86e709d48d03738ca97d6140f13effa03137570c43ef00469eb0310909f66061d9fb933fbcf30bf04f13839e36d45a4d
+b4a595cdd219aff5b8d0f80b679e58d9a7ab9cc389b47784484704e7d2c5249981b2b86be4c37ccb11b9afbcc8070214
+97c6bf26c8b28b982b7a56ff867b2f5785b37260b90e0ae680920f368478a3c88f4a47bc394c07bbe88fa1aa1776f255
+aa48418728684c9a10992d1851b69e54529dbc3548fe46721758ac6b33f82254d56738b351d146268fcc56a9b7f05df5
+962a282caf6f08a63aaaf7ed2146dd61d527144f3fdacf1beef36b34356df50302330598b8602f1447f6beb4439a1048
+b55d325499ce03c9b1c35e6aea30622841aff2a2c225276d677338579ce83177c0d64d78e7d11eac657a30648ef702c3
+8a91b9296e5633b3b9144f61e5436654cffaf04623a864ccbcdd21c8f981618a908e890f61c74df19ce5b6995bc358c2
+a7b6b32333377df24c0b0194393a1487a72a8783e06b1cd00ce6bc39337b34ff58ace57c8dee5b7f0ea2c9a54048a61f
+97db4494e4208c9f297b484cb8159e8f600c61a44e1d878b07d29f0406fd32a0c12ebccd42ee7ac4c0bf33ff54a582e8
+8697bc039265f7b6e73c133823dcac9041d18634c68fe16412b4af41286a4164dc86f7e71ab7a493223a84e185cb6f1b
+b18a66cf37f93ca0189201811e7de02ee029445132f0fd4209e5efbcef46ba6a28aaaee42b30cc7e97a25b08f4bbb43d
+8b69f189f3cfc34cc3968a07e13d1cab0f5c7e093027a9fac38504acdf12e2defced4261a686a2fc850336187e017957
+96afba402124d9ff7048200acf329ccb4e35dabcd609e62d04d25140729e110a674849037e4b8aedfc99c889b132cfab
+b75a809fa3b1c17139962bc22ddfce47d38d017d585a4e76ae1eb8f02849551ff7bdae178cb4546067bbab45b7041ddd
+89196f1fe0869f2fd18f5c01118853503d71c4073aed8bd9cfaf694ca4a9e87974a9ad6e37449bafd391a2045ef5cd2b
+ae52921b5d8eb5df7d4923aed1afb125cb98aa6606f8cbc2129cfee56ba3cdb7225a30d98ca9271cca67fe39c763d508
+99f1cfd27833fb64905f8678a532aa984329b2369ade3860025ad334131a9550214297bb2f7d3569eed7a9cc558a5922
+a77fabcb76e8c6ac2a5196666e0c75c7f6c73fd8a0a5fca32a454a9457870689c83f5821f90f28dfd91abc3bc62ee761
+92a4b97b7c14ec14c74e06363b0ab2e263d0d7d84125e2cfbf659bbee996a4d8561992e19789e507f4c24e5afbb91b2d
+a2387e7857600a93de57faa0484650289c7553b9ae5fb001d011f43e5bf31c010c9c8b5bb82e7000465b546236e79066
+8641b6f2dbe9f0b83e0a7ad8098b0836af158fa2ee6ff1bcdf3e2ac8b3d25d2e5a24d515e9d549feab4e82b49e468fa3
+937306770a47ab2d5d2eec4bd6d9b3a8ffbb8c8067504571609a7e7a85c665b34ad2662701b67858e01530907172768f
+b6b1b89f261e56b0cee15e2f5284c76789db26a6ca4762500745e260bda40b00b65add4826be6131775202c8c6c4247d
+b1caac20a1b2aeaf287d38d42987e2c381e74495d9e880eda3ff59821d5974d01c7e3c611f4773a13ff41bef0f2ad44c
+81ef049b849d7b0a732579299a86f1cfeb85f27ecee4280066dedf6024159fd47f311f1ebc46b58f63f71735a05480c9
+b3b6b657e64fc154eb33b6056b8279ef736839b56f2c8f8ca438cdaceeb5398b8d3625676cd393c196f664d7baa3a615
+a450678001e8db1ebd8fbd5c808c99945bb3549e834a346cdff316ef8d3b49b818cf9642e5b8097181cf40583ce901b0
+af3edcbfae3c8f368958cd11c95df4682ed10f894f770783e967fac1eed533ac427c1d4eee51f968ffdef080593ca262
+8348eee6ec1102884929736d6768477029961c3d6d09e9ebf84d2fbe55c0501165f274fc1c0549ab831388d431e051ef
+8d799492659dc44aa38262f8a4ae37b6ba6eb10dd20481f652a1c77ee9a4529efe042ea873c13bb2ba3ec4792b167c14
+b4d3962f574c3298ffb0958ac999367db8207dacf2ca9d563cc1efb42fc889e19b7f00db15ffa91d145ff05eed97c3bf
+a3a7c0e45dc8ae816d8765bbf097502b56651c0c11a03f476e362b64ddaee223128defbcec5629f4d7f1f9c3e4cb9f2f
+951036c2878582d84d90dff79ecaca673df4760fbf9e09e63d35facf3e3257be6e1bd504f3c3daf8ac1e91d306e80d6a
+8ae85094b13d349e60c8f303550cf4b01e96e24fa3a9f12d44c9822c004f1b3e9cbd772a2b4699e54023176074778993
+a7292b61d2667d74cf62a47aeb559499f19dfab2a9f41f16e7b8d6e77909457eb2aeefadd9d3d3f6db18a438ae53ea0d
+804310f5d2ce8bcf9095945f931eecff79f999ffdd24abb9e91d92f6e405decccffe4a8d9e731c4553de79baf7a5dd98
+a77d3af0fb79b6f5b6cb640d04f4e13a28f8aaad1f60e732b88f86de547b33117386636d1afc7bfb7bd1d4e527812365
+a431f239ffc68f6b1ea13bbd45675f0323cacb279e11a14f664acbb15d1673b99cf3603b335a100a0e297c305d743383
+a64f4c28cc36b86dca65359cfdb50ed3dcc06fdb22ad567c7e0f833c880e76a53c330720fc2b96235cb0638394bae41e
+b6fcd2c047de58003e9af3a416a2cdb143899441d82c691fa46d89045a12d3b087ee4603b401287a0f2629154bfc9bdc
+a06e3b863bd183d8f91dea6d0211913663b3924f1e3476cfe0f328ff7c388aeb8e5c97757bcb56992c104ce0ab6ff27c
+aea78204081cf5d24162686a824ff8e72fc0f88388525d646af7739265f60695b7d80b53cd1ddfd046bfcf59aa25f5cb
+a89f556d42541a655864adcc1d5d67459ab488143e1b4eb48c67af30a8e753541fbcb479558ac26e1fa498f74a59025e
+afc385b6b08c355a05fdc75e9360f4ffb384fcd74e8c9db34bbae9e0c67e0d1fa7efbff4160b387428ed58e129fcc027
+9428d05e17e5525fae515e1ba3f04742fad1a43baa2ee166d2f9431dabb46895b7345ad833d495c99939f0c57cbaf1c3
+b7a62d36ae55e681d48c911e1a433b568871c65a97916f939bfd638a054d6f1136a78c96640779ce1e3afcf90e3bb23f
+a45b6d24930d91fc610e57ee78c6dc7557cb2ad976cb92e2157769447cd7c9a6a040f1008be9eb5dda2a7b8c9e524774
+8b24eddad804790df3ed82db7c0ba05082c61a81763c44c98ad436dcc7e1e89a2800ff9c2deaf350f6222cf4278fdf9b
+895409dc0aba4d29ff322d2414b33c1458126c023a3d53b25b9038bb90372b7c20d3e9f6b791fcf8f76449fa0aafa758
+b22767ed218b575f397ad8306ec48fe07e8dc3a9f2f090fbaee411b6ba673a1258785d61adcba007d748cb019c458fd3
+ad4b9e4164010c4ba05a23f9a46957c8625fd4281a4e76f76ef7b4d6040d2228dbd2e6faf22b4a966ab42f32467a4655
+92340f1051f88c25a915d0504c1413146f37f709ab060e3859b14aff9be7f8c91352dcc3fc866910a84192d301029cc1
+b4e19bae926db3e1e295ba856984b32b796d86cbc81e81c6978e989f5331f27ce9004f90536a741ca996d19f998541c8
+91502e2a69aeac8e709553501311b4392dea3d5b6f14e7523bf780b8af246e1f2bdc4b29fc4ec3ceb725fafa31bf51e0
+b20607db1bdd6136130ba9683d581f5f45d8623ec4a2d35946723e0d8768654bdd9aeed55ba38303d8d1e312bc4f2442
+8fec23ac3b4cde8c18346dda1afb2b72d4af1a6c013dcea36cd8cbf7223626690ce933b920bd9137f673d0985b64d54f
+996bba551ae3b76c5aafadfadfcf80fcb554ff26e6a9e14e60440b3864239129734115d11a89ba79c19e452525cb5a39
+a632f25ec68f02f7758103caf613511a1fa2e529e0861f286b4e490e8fca6874af2c13e3aa6ca97c63f3c621c197ae24
+b332292c6213c7216bb78612457de615da878619024626383914f9c28f835f1289818514038c30eb2bc3566d2da470b4
+b5bd5ed7e990ed8abf7de268aa1ef7ccf5562cf9c92486c2472051c1b5506bc9e72594380e7bd00c91771ed4e9707851
+8781393278ffd5c522ec450220698328e60294ae1e35f60b25baa290a125cc47fbf7435eaf9b22ea819d431de0656f38
+80a308c1acc4363f9bc54e6831c5aebca2b2af47d699a17ae2fba24495984acd4a25c7c95b96aeae3027f0fef9549284
+94a55b36389e05b848c6d0e6426a400d1596195c2cfb4a972b6bf8abde2cf86a932b769a90b62a65d0aaf388e66d516f
+8d29a5db4ab3a1199946a79ebaee9de225284f0523637f90e4ac16fc609dd3dd5a71072c30e869fdf6f057b7806ec254
+99caa565547b13953b91f0468b78551784d947b5a3fe1b7278e4a45b294f074a93281e9ee084647d1b24c83b39a0cc90
+aeee1c88769e7bae12f163a056d19b0090c7fd866d451963bc855bda2736c41500bb97a8d72a1a077357419ca94bc3a5
+a94bd8b793a57b4fd79a84daf1f7fed5820bfeb44cfec0248f6aef130fb3219e1bbce68a6a55d332b124e1cc55224c51
+8528607774d780b31417bf85fa3e54a94e4ef6e8cc233ad2a1dc795c68c299abae209c46ba77c33ba74c6ae75ee004a1
+930f2c302a87d6bd159bd6b4db43212e7c806e17f572277ab14dd9715a435bd67b3624a9e72d9a2777f9b2080ef5cc36
+b50d97fd2fbe60105dd1dd44cd12d8ad62b8a3127329f969be917fbf10132f1c6c6fda8029deb990fa1ed26e8c220c39
+b685aea07aa1a45941f5eb2a593c0d97ecb5a803fd2977783488fb00fe6580c41ab83ab6cdd678704311c5542129c510
+8cec65b68f4b3b10d032d39ec4c448e6d76e7615560bb754a53c4c6929c2470a884e7d39d9f3e58a2a9f121ad4175a34
+96279388cc3e91dba49763ef50faa7550c3b4c277b2a0b0ae3541a2f990f9352748db75755a7b13efaffc9b8df40c74e
+a7599c33614456b1b02b57921cb76b01109811a82f230f9e7e82675d57757f06021ac3f514d557ed9f2dec025364284c
+869684197084f42dfd95350f8a54b0c7d940ceae2bbe49ec18fcfd178b6b0d21903447509e0ef356aa3d2aee83701bb3
+85e9ab73165878b93e0229e3384f048e9651ae29980f9c5e26492c45e180e09a3af9058fada434d1c398b43d99d13056
+a453a46ae96e6330c1b315d1b5f37d160731309d49d13d6c38c5d7f0b4f23ff1d18c985c471564afb54e4477c5d28d19
+a5999c704320d4468f94d647d83c9e8720c19782d2a03677143c7216dc434b3160d193389b0115dc638f6e2e12f2d441
+abc7a466cd848304616b2eca049c4b7509c5260c9236dc1432044ebe3e912afcc3a6ffe3e27d5d79d3ad4636ecda09a4
+89ca07faeef1118c6b840a2c328fd32a5709b31850057302a7e607891e11f3f9f62e4fafd420564ff10a35b9a44c0f06
+b0002f9d2a8aa850b9f22dd8d3b7881e8656cfc53e6c2ae6a913d88f6934e0062f30da2702dcebfbfafe36785203cefd
+b8527c70bc791c87f5fbc67e2856e45b7254c5a0b673d4a5d3e9b79fe0715b608a2f35d88a61eb1d8d7cb615fea650bc
+b9be558dbe778ba11fac7080789522fc004510f7b740c42023d850946933362a173267106aea046f338533e4cb29aea6
+b021f9e635e64d3c9b4ecc8075fb74cf0e5727ecbacad15f822c8608f0d981ad2c300fe6e47c6148a6b1a13cf920d85d
+ae59f2a83a1384ef0b5613e8843cc9a934f7126430df7cd7f5a8508e3d83aba83bf3d18be7380570b24ba0e00e05e0e8
+b403e4d0495a0137a710c43393798593bf131cb8d49beb0f3b3d344554dfc3355ebee14e884f543bb94bf9aae40aac59
+a73b722287df7558c503f89d113fe0c017765c73181eeaa9ebe6de5c8a15ffe76fdb85ab93051a6f565653046624216a
+a7d1a28fe1d36b17e37cf5eac7e27549ce9f6eddcb36203b58797d3372371f3b195cd3432db54aae4bf99768969f5b60
+a3447ece13c415c457b899d4a8b8ff388ba25bc920b5711f8687cc86e9c1b3f3af42c490ec6352fa8609b044e642e3f3
+b12f2ac1e033b6a627e7f7822317f629c896c8f8dd94ad91512855882dbb10b8e80a1e29c3e39138402f1f7e0de673bc
+a7c65988996741bf59888415fc2264495050cb13500b6597d9d0e034898121b605784f681962cfdc80b0af291c316e7e
+8c40cfc07dd7a4bcf514f2e87a1830c911e8168b0b8531a2838d2a14e790922b76c4642ae237b7547d8a3625decc7f0a
+b480d70b57434467a40d6dd066f51b9e637abd2f49dcfa6450460aeec2bc895347e21aa82baa1bec7589b6a5a694fa73
+a919a033c24e96af1eb0cb1ede3684e9a3bc338c7ef37b67cc9e9982586f74072cc540981e2d1a2524e99144bb21a64c
+921e0b350907e9993a596b80f827b2d40aad60e9c62f4b65a67d3fa4c0acfa924c93352dad6eb3e868264bb24904e3a9
+8d5419cea0bfebaa9c1509cd748c8af3869aedc3ae27fdbca3a0f08b3751a3b870e8dd3640f4abd4b46a2a1e745758bc
+8b25e6eb600de81fdd03584fb9db9a7bf4c154ef1482553d7bef880bdc5baa7b64abac6db96fcfc4408329adf8fa351b
+88cdb72bee7a6768b7c24d124dd5e8b29f0c866a0624e5a7c4759962ce1d71de7faa97f7baa56d5f51e35bca43862bee
+af1d59add7df3b3ba234b0b4f758349225b9cee65691c102294eb7e6fb683d7588fca33ed97eda361060253acfdc36af
+b19370b8fe123f1dd2ea6d5bc75e151b0d1514224f5824437166fce77ac41ac5ecc1e7c1e75b75e948acf04c420efea3
+a1ebfe84f1c012524cb475e68ae6c7cec79fb3372f1380321a0e306d15828613589567efe8bb5784360aed568e26db49
+a0f964e3cb594c359e2308defd3eaec476a638b6e1c216157009e11f7c7d0c33fb9e62c4243057cbca49ba315d4b508f
+9391e5087374e45f03d36f6919463c473938a653adf3880571850374ef0a0e521b25ef84b6012a19a02ec88f0ca3891c
+aeb86d4426d2836e6e10c3277583a37b6684ba35f4f30d2d073043f0a0148f763b99fc42c3935026b56c32e5cd0cecfe
+aa98c07dcfb1b0a708486d83763511c7004896856e851bd83d25a9551efc28f059c3fb8752ece0296964e8c13ec829b0
+a466fd8dc1aea7022a86e12a119b16de35412a1b461680f6a1cec408e9b9c1418a8e406fd4a5656c73488adddf17dfba
+8c9b0e18a033c27731fb3d22b7c83ba7a86fdc2234e8f2a19d7659aa67bad7a85ef25264e8eb81af529feb3fa9340ef3
+a371feccc2f1a1b96ad8a9a7d8db0c06fefb1f2800933134299027459b0eb8cd101b9a37c76c22dcbded01a74b13d465
+aeb34fc2758d8b68d17f15ab3c299344ed630f7351c498a5fe7986f7e14d62e74ac9a8f5d2de7c6289771210539383d2
+aff9e961d0acc71a077e3af52ced373bc694f9154302abc908710e500e908f33bdd10b3c41bb8fa8066758a18d64c667
+98bd5a8751e598896e9aec90649294934f81c36d2d0fb60070e9b96eb47d0988f71d9b68f4c475477eb4c996a9265c13
+b25a92c6260f389f6443a572960e0a52ab9c9250d8760ed148082584b2347ec7d103358c033266bec02374e69d0102fd
+b876968bedba7f4712f5e5eea605c1e5fc40bc5773c61f08c32e0c0f3ec575eed3e13e48809983153beccdbca2123edb
+8c4091ef8946c9b27490099d5c0b47c404b5a1113500592515deab1c3f2778bbe933b09c9824a3a7ccad2141f9b5dcc4
+ab85f95d318ce235929531e2e397d09b9906c58958fdff1209a514624a099d3b8c103a51b2fcfa0b17a8f008744b5d71
+9016714cbe49fac5e7b3e493574078c462e18f6363f413270c23da6327731f71e2dba5dbf1da6bbe0e29f57f0c33f869
+8c90df700c0e2d104ce7b76be7899209136498999f78195cd888aec6f069778d657e5032ad7db56381470dd1f519dcf9
+83dea8472e8418aa069a0837a5c44835aa1e00979a217f6295aa35548f509fbafc7db5b31b8767621e4f89957892e8f4
+80a1d673220144973ab70d977b94cd3d6b8fff7f82f23bd4b30ea393952951d2f07c24e6d411b2ec19f3bec13583d9fe
+804864b58f9747bb3ae54c588dff46eb6e16b6d98e0f711828e97d9f019297b743aa2202f823e3153ef5bc4b95da3501
+b08eaae2eca2c64001e1da7d0e345f96dbd3e09888f9ab86f178718ea5a04321a8b8633e72dea68cc05687042808e3b3
+b962f91819dc570c2cf131b89882fb2a44a999b94fd1ea8b83f400e9b66075a35c89f0fe0e8dbc3a597cdd1aa3135888
+a5f33e8f04a2d7aab44e832f8ab4640519aa4ef88b58e0a398e45347492b040043e494de4b355f07cb4bc728b67f1ac9
+8ed80bfb4cd15bb87175cff427c6a1bfc3e6292bc5c2d04dd42b497bc068baac5602d41366448ee7f37d85a5d8437750
+83441e746afadf64583571a9918ba5122ca987e76a6e37f98514b1a8a178380366d10ded5c70d4feb08be6fa6d4bc25a
+8807fb8adb2aaa6833960f435ace162c01a9cd0692a4cf038c89ef7405600868efe7bdb3e8a3db48901367ebafb0a1c0
+82c64b1f77fb78dec00cab089cb7a88ae16c72c94d0870bc92df11587feb62277eb941d2f7d3d2fb033d7bfee12013bb
+ab2f1e3f1fcde3b8b2c07135acf3a492ae7675d9bc971ba57e06c99fdfb39e1f68d1c826cd9bba872749cab375e44009
+b4a25f1f5a2aeabc29870ab9a815721f3cc031ab1a55417b457ca6504e5e96e4fd0d2d364ae17738726c8f40cae9c36b
+9519efa4774cb4de4ea834376d6213d946fe6882e2b36342f683762fe50d754765dc301569a836febb2c7c9dbcf44f64
+a75de0d0320e8cee962d6ed4b07db718615e75543fb25f0d28ec5e76f56d72b18d648ae42d7bd3da18f54ec1e4497a08
+a2a17aac11e732097b25c0b9f7b97d807dd78ecd33d88aea5ee0a46a42198d379a241e888ddba940b3307e9c560ec45e
+936ebfc2234d46282ec4de88958553759d766f682d6f9669d2b77a2cb0cf9cea9b1ac02014ac3f5cd47dc5d8af2da314
+b33def3135e7ad61a660ef1266d61216220c7e0bdd867b727ff3deea904072e33a195e4febe64ee1e263349fc9096cdc
+94337e4f14752676a703fab8544ea0ab7acea0ef924b85b05ffb84e4476f1087acc9a6d6250893a32b82f02651a179e2
+8f22942bbeca0118747a22d0aa13438e40bd6a383e310eafacbffa1490f5758504da4a11e6320e1c55b3daabc72c63f9
+86e3ed934fc613d0b3269cf368e32e67f4add59e4dc1ecb1f016fbdc6c53101c2435f95fc36625aa8c69c596acd9b0bc
+86f04807460e1d93f8eea2a284119d889659b5a6b124d41dfb2825b31685361e8163fc3a253a49cf878e316463c9ace8
+b043b2a99b94661ef8b270842fe4d3c51891ec23ba749d9c999982553ecade6f658242b373982c9a3669a886889e4f33
+8b6a33a68ba7b5932ce11b3f0e23c3da580510fa37668f2154c59c3bf788dd2276a2a8c66a6bba1a68084e8b9bbf378e
+b54581c88d4880fa4a0ec6d3c17b6f0ba339e8f7100242efd3b820ac942d75d1f898259d6f1e64a3870fc301d9dea2b5
+9449dc9bce23c7e3b41eb34789dc7765c2f7855f9670c1d145bbd1b2d1b47a9318862ef3738511b4f89cb16669c0af18
+926245ae9d4eb213ebcb88ab2d7e2a7d198557721051fef4cc966cd11be3490a3f83d4ff48f5fb60cbad9c5de4b98d1c
+8518dab07ab15887c68d0de9fe3c0c09ea6bfddb99c145b3f6ff84659e7799da93e97bdd17884b228772398caa8c2ed3
+9969575cbd7953b6308391e9ce2cf4da466b3e730c9cec0e88522258639be35fd31abdedd94b445d7075919482513103
+8b1f28002c19b17d6ac1a6f50afc3448f390b3209b1a76a9a024ceaa274de4588ce82a891a03e878ea08747ae5d98211
+a611963d1bc45b60ffe6756a743ab379e4022bb3fb263f5f305a615c92432199c7e1060a79aa42f7662fa89a0812a4d3
+a3c7706ab74e976464fc341e5a9f7284264c1610fbff02fc36b88e15d6859fbf40fd8c5e93c8237b97acaa0900a03764
+aa623fb8892dbbf4fc02004a44e07c21a422e5553e4b02fcca24dc1f416a54eed36f2f7376dc1e66218e850772676e99
+8133cccf10b1686bf53143bd3520515ec72e7295f6945c43bcef7304de597b767265a3a9f7b281fa353acbc3cf6997f1
+852e4aaf4da9dafc988d0da13a7f31fe8403f6bdab88dec363eb8cb8d3e64c48ff34102f6660642749d11d69b613f8de
+a616028c6cd54a6514fd9f7aa9ff13000eaaf39f582441f73a3ed8208a513b580eb7874b5cd0b1e9a542c40c5887bdef
+a48ec58bc3bd4b512c21d3d55618e9c51836efa97cad42bf79e748542804114714db23d79ad03e410e0989055c9bd46b
+ab480f3750420119ccfcf8d32c4a18ca580ce88bffe81433c1d6999c221c8aac482de5c0e41a5531806bd17897698d6c
+8522bf3b7157cd29e948afc8f479d6192364a11f85dd5c58d4ea0443aa6b655f55a80e6a3152fc02a8eea4c0815fcf19
+86c91a6021e738103031c1ece906ff43227eb23088e5ce1b6a1cd58664d4a80d7bbcb0d56c3b0e02cba1e1c2ca22e058
+8ee51a59ce6becf098256e19c9aae5ef0c2c9e66c587d9a32cb4ba1ee0b64c13e2e008908e35f43314316508956654ce
+b94766a0fb91c8de2338a68c4ab08ce5bcf62f6efa221067807dc647b595fe5a342d7122111540a1ca6ea7743b6ee772
+83f917b8f6aaeb9eb2eb742546e3f2dfc9cfe00cfec60051010113d55dba2421974098c157dc2601902d8f40bc84693b
+996e489890dad3c4dc35faf53d870bf1cd76f1dc24e0cc8a1f899bdb44e89dbfc77fb11f7b33c270a1394c909f7a27f5
+a89936283190b2d1ce8d166b36694afddb4c3df01bfb1fa7bae69c55d1acb4e68e5e29867ea33eee8031029b3c6409b1
+b08e5a5d6797ca252d12428b2086e528a6e5c3965d2e5ff2bf83bc71ae9c0346a4ceb3bb2f2e3f8a1685fc343f36997e
+a05bd12a7a6d52d234a1b3e9ddea7b18d6d41026a0d18251b1761f1cc863064dacf821707cfeef2dd1c02536f584ed94
+87c638feef9c88a9f89d10b56fe4bef6406c1d734cd1f01006e2f2b331196a49c7184c10786e855b3de8978927df42bb
+aa194f3e4d0fc1d3107f9564b13e6274bbbfc7b8c1e73ce6677cc66d9319dc34b5a0e790d6d44c614c11feb50530a252
+b2ab7be7ee9d72d1015e94d006020e758b73f200dde81e89e52cd33f25aced0cd84b8c300413d32565c253edbcd2fb1f
+8ec08b22265aaaf27a84a6cca5f0875a3ebc70fb36c4f5e59d60c55bdf2a4fe11ab7ba4b387f5d668e67682a0978fa46
+93643b9541db11b48e0c84caccc8da9ff7696717aa176ce6d863446ef8d887f3159b0ab6fe1f79fac883a371f6736e93
+8325654fd8388ac96935149165fa3238d0848151a04be57f2386c3304056013efb49febee0a871cfc2ee3c11bb029042
+a2c15cbe5d5167f55f2a454390b61d99601614037fd67fd198968531ca2f84f3c214b971ef300a20a114fabc6c67db0f
+b40ed63b0367174b5b4b08396afe2385b0f75ec2569fa3cf60f87e1b17fdee888dd66057be2cfb185e9f32df59b7a8eb
+a466d2c8052a115f121177979620385bb07148e202631979f4ffb01e7e0f6fbce28747df9bf70b2168653096aa704fbc
+99395136290cd020cfba0ca896642c245182e2020ca2299be8ebb2f62e2fc62fe0be593838f62681f6632fbdffd640c9
+8e4f081d9a724bb54fafb66297a32f84687493464550c09259cc6f8abf770d076a514ae1d6726cb29349e27ef69a74b8
+a8d5c941e7c03dba0232c763590e93e3d99fa519b0a65996d20dd20deed1d0192738f3b339edac68ad42016223733582
+877baee9ee979be8ce3bef02422e57799dcadc34fefd8bf2baaf945f267883f67211ac5c06246f7b49f1ea5c99550a63
+b6fcc2a73dbbba54760d244bc13e1564a3c61097e9b525b247cc8687ca08625a7330fc6b15e45a3ee508b4d34853d852
+adf720dde6e9b5c63e361d69a2ab46ed73e0deb82f8e30f27ca2b19c2d8fc43e18ac04b4fa029f553f8d7dd79457ecda
+8956c9038f3338f541bae9ef1f5bfad039d532dbbbe7814e3a3d5442d393ea6114aa666559d8a7e3a026c758a17c79d6
+8d6de7f95f30a5a4b3d441781c7f819a0265852ab78b8416227089b489787c8ae9dffbb0bf88acf1b4c4d6b8a29c1a53
+81d4efd71c9d08e9f6d7f7d7a2fa5089e80cc3f8dcc685686aabf3b4c8bd531b4aa07e328c0fde32b638f23eb78de588
+a30053b681ed8328b5d64587b0d38edef0e366a2762cf5068dae177e4f4084c4333f9a5fa5fede93db80f7a8fd5fbf57
+b340ddfaab2dcded58930e5dc2b72cbedd0e79ef652f34356fcf72054a87fc2373bd3aaf8a88af8d4633f73dfa7d9a28
+b9f3a7809be0bf834bd7affa2059d9371b848dd5e5fa93e83e90d9e078a2fd3aea64410a72457c32d33ff1ca11dc9300
+a9a8ce26a38dcf277ed66d75e111b07348101e93d03f446ea72bd903198122f8a08569f7125f6d4ecaeda8c093a00ec4
+81e78b705b44533e2e997f549f46723a5e6b88241d7a86ca20448ae3ab140e967347abaeb8700594a0cddf1e82285abe
+84724094dae5b7ece30cc01b5f2acc8787de57dc0c37a437c3e8e26fc03069b6e8562302a0f1c95de85937f07fe63d3e
+97a715861e5bb715a17a948d6b6a389b89744e8ccd3699fdea9ac3d890fad027b78d436f8012b0abeedd078a20ba91e1
+b710b2e7d87771416aa34ba2d93a044bb118f279fff62c1224c150ebc30f21abff212019f0f38c334daa5a96598ab900
+853034af5ad08c563ed096ab2d0590ea644d372cb400bfb03867092768d90b7432d35c5506378d001f986c59769d6d56
+b340ab52f751e9d516348faddb45f0115ba0619ec9db820f870007e3a4d305ba2bd0b2a58a7576296531fb78886b16f8
+b8ed8feff520009743ca3313899a118df025a61e6e03bd5fd27898a23beab472746ca3636c22ea3835e9526e17c06dc9
+87af435e3e4ef611d6da74c8d98e8d3f3de64ac8748105dc20287a7dc866f57d10a2b854f7e0e09235eee647dae1ab86
+84108b1f0f0ff73a179cb1be1b2ecb4268e7fd2fac3dfc7f6f99889c90a33b4310946909b9eef31b256b8d0e3ba56bf8
+a6b9fe966293e60bd384a1e4d472b0a72544aba41b31172ac8bfc3e19beaf51da54a66625d73a9ae22c7c4d1b0840a30
+92e82e92aa615e198ba3c83c039b0adcf4393b3fbf9721b2e47ab17a84bded2bc8bc2bfe257d2d76162a87e8bc7ce759
+b9286dd48800606b7ff9c3fe2abf5c49ef0a6b981711b5ba1f62952d6fc4a9999bfdf061c4664a019120f15e341925d0
+b5da5dbceaa7e82f30fa5fde88b03ea88e7003a50eeb53e3f3aeaa63aa586900525b42fe1b699451b5d915d1b83c3705
+b06072869fb8526d3077cc61a3c55d54a7a1197bbbcc875aeaf617d7d1eff3dd3ac243e2c76caf57dcdfe306edcab4d7
+b132db9ee3ed16e6d76db9e6e3dcdc2b142cd70b9582518bbdf5415b3bb476ad900d50004dc0ab6b87ba697c6314b4c9
+adca92336f3546ea50b034525fdf548a36049ca82d9d3cec10073e7cca186227cd662d4d66673e7214a6ed58cf75da6f
+81bbb3fa241f9514575fb3f6cba8e34301187681354c94e7976a4205c0bb238dab52b29a76a5f0e0d4cb1bc82f8857c7
+91008dda2bb7dfffd6746e3544ef540d9a1ac7ee9c68ca9984a1d81041a18fa9f35b8c4bdb44ef3a860c37481d5e9a14
+8224195cf18ca0d8f01521a0ea92c9c598c556746c825a4dda49ecbe324d570a96775eb81dde1d3a14aa3660d50e27a4
+8b355eeadef5fc7cececee71aec3ed30349df8f43f25da1d75d62ab00fc73702b405fab6d422053c2b0fbc7469ace9a3
+a4d657dbf2bb30c1e57e0b63960663bd86ce17204979a9ab82624943ea370119f040b58b067a05ff6d1867a22a58698a
+9379a367c918b2be61a9a42a495ec03f0168a4ec36f753dd37eac6e9f58a26c8510ae7b579a89afdee1d192edefb4bb3
+85b37bddc80754f0432573204a1a4b86a550bfe9689f6c710a61810aa94dedeb28763ece40f28fb3a6f3791ca4c86b8b
+b41c3269b96e190e40cc16e6c7cc8054cd0b7902a43c69b79d8ce471a417d3096b2271badfcdc59deb6271ad3e5a35b4
+941185020a227b7a995f59805c8900f7f6ecff1e7b948a8b714f85a54449a0d41e28db5e17874e018eab72ade20eede0
+8a0795ce082f74e4633acb1649b52b46ea2b4360860fef6ec107910e245b30466bfee8ce59a6854f866f55ec5cc7bbd1
+931fa63550530af5a7ee24964b8b4d0c66c2bd59108131f375c7de86bce59cf52890191ec8540666c895e832dc312360
+8fb86918190a3455014a5cbd15c7b490d68c10cb7b505e9233b3eacdf52e63299d49ded75fd74f8c2bcb3632a9c29d14
+92c896826c9d871a83c4609f9988cec0db6fc980c8b88a7baeea2856ec2a0a56c3d5a846a87d03393dea966b534aa8c4
+a9d4c780c94384f5a13cab61c734836f5729482cde62f2888648a44317b749135b511668834d49296ed47c0a3b9fa8b8
+b7c26da09c3998367063fad19340f53217e8545535d376815773e201ef49e9e1b6bf1423b0b6bb363586f5f05307fc89
+8c445b3655f1f554c2a7f6f7d035121939a8987837dcb1a1663586614dcf2cf47f73633950d8803e2781baaac52c12c8
+8764f924f41d8c5c91fcd77de26ee3bbb86d5a5bfbcc45188be453c8dbe4b875fbc5ef5b01ea3a26b889d7b45417f173
+8605a8186d5716dd5f955a7125619bc72ff385cdecb187a9a646a4bdf6595d67f00e777836261f3a69c19d2e2cae27d6
+a97dca2185e4fcd7583b1e695333d55f54edd751da436b8982de8c344b5f57e35ddb61ad4a611dcde08e287c78c757c9
+b11c576a049f93e0731652f1a1ade62b0124cb7b4e2b13f6505206c27ebf7998ebdb3d887bed01e43ce5c24714903aff
+a46dc516b8ab4aabe35f38af1236052564b01d66c558e7107175064a5226713e8550912867eafe4da133f56950df57c8
+a13e75bca5bd3b08030205cef4faa56a49e5d7da94bc41c708deb2f65343c1687aff26368915a490b89006185f18fda4
+8ef5135a6f1f635a4966aa540cb877dc98c6a88fe462be3226c1a270c82cad8e091aa49ad39862f012edb3c93d15fb4c
+99158ace79ceed67b6d8e884050c6fb7c7a1509e41f0d2b9069ce8dea392f17f88303d0942cf3c0af3ea52d3194123a3
+8805c76ada9dc7e57545a5e1a874e6105592601213e22c1601b0b157b622e51f004a1da754a8fccc8f2a2241c14e21a6
+ac3dfe87e17ccda6196f621008716a14be4b983d187265eabb8f5eba7268cf770a70ffa19d1c7e77fab0373eca7a4045
+ad78a31ad6f2c84f6e5348f33631d876daa3d5978f6d1a77db80aa219e12c9ea656e9c18e6316f899bbf6c2469cdee37
+8c8726f8f6fdc40516bb64b6c624a6eb4caa931e3a9ca8ce2c31c282ad59f0624ea290b804ba84e339e83422070df419
+9303d1906cf416a184e15f13cf7dbdca5fb296b078079782c9044b9cbfdf06b0c965305a8d88678b53f0a10220e56f4f
+99b9735a77cdc1c675988e613b3e8843e2b0469030a33f5c14383803a1b20e328d45d2fde6ff0d15f6bc2eb8da4f4d88
+892a18f4ceae3fe7cde8f32b84c6bd3d9ca867143a30fab4f939281cec12587929faf07225725bf33ddf154b90972214
+a100a35a2865bb465830ce2f68406d8a92bdeb21056bcba28c0ce8ce5ddfec6e293e926d764499e53facbbacd3f72994
+b797ab22a57520a0584edff499cd1aa1663d8b3f411faa542022c5f1a645a3f952f9164f61d200e4500673a8d95a938c
+b1a457d100def2e26b2b30617ee866264a3ea649bcd9edc7be132f5cad02f3209f5dccb02b95a462b5af9a71fb88a341
+84c1f6d4f29869a359cf89118b1a80224cb574393fb557d1c61730a1fb1884895c4cb07f23c52165975b89fe9d6f5a77
+b6d53e49025bcd1d7960ce46d4f64ff8f29e4239fde1b19e5167d506b086152da3bc3b86fec8ea531a20afe1c785fa59
+9635b053c03d1be0bdf81e9876c63e8541b793ddeeb2a8f3ab0e44fb78f81a9e61f8c68ce393c7c959b62b67f9724409
+a19ca9ac5a345c96a607f979a958d83eef4350ebc9cea0e0aa11469dc554fcc39d9b22f8a3c92de599ca08ff4152ec23
+8e7d45d35f6fb95799846fab51b0ff2415857bb54b049694c1ebf93f45167b8497c3341b656f194edd5804195a7c96bd
+87c05c7d5834394507ad3d363dd0ca5132a7763644e354c3b7a803fa594d951084d37942f59211660f10098cf49adcdd
+b276246af578557aad38190878111e804db0f29846185d7033c913a31e7657d035114448ddfed2f3d75c04c79ee01e79
+868bbcf14f96547192053823e4f85b50fb988da5c4cf73f5cbf23953252b665ef7aea4421c8baec90522f58f027a2b19
+ac2be3dcb8082b64a3745ce0d2b97cf341483713e1bcbb37369123d6723968d3bad1410467aac7fcd3b623bfb1d90d9b
+b1e5cf361e0857373814e8db7fc275ccc1dbac8559e8487cc892bf82d4c6be00d1b2ffe40289692a70072c5f80dbacf6
+98e16a5854635c72bce6e263bb57c071194df076e1ddd81e645884367b730d4d557ebb8c74b3c582e09046d2b9ad8078
+a0016bfaa348d44a3ef814b348f7d56fa83b78baeed4a7b58617b6f4772dfa990e912ebf91c2321307884be85dbf81fa
+85690a2c5cec392b6f98cd2d03e4204cc51868612543c7a3112066ebeefd4304c5c8b21da44534224398648b413634f8
+a3a1d00d0fdd8c8cfee153347d590ed78cce48eeeb7ad42032a95baa73cc458d46882d0e9707f3dd519b1844f236bcdb
+aaf2774fb26da59c115a28d86f0c6320368fc6d2c0bc2b7e4516cdfce3058cb423b0026b6c75030ddace9ccb7f058227
+af507cef7320bd003526fdf43c04af46beaaca5b6ddcad835ae14da60a2ce732b453d8164553e95f2b776df55ddb5efa
+b2656c07a8ba2a2248d0313a7795b99f5acc120648c08e3a77fff5cb9b861827c94d4f2f99a2f2dec1d1667ca3ab26af
+b426b97a51f0439f2da2d0d934693aaf52482bbb48893de12fbdbed1b2155e30791e7098baa18f93ecc45f8dea4f22aa
+a71a7e08426518ef7307c2a1be7aaacd843794601c0d49f4f0e474098ea0faff74fb5ae2bee416aab849afe04be434cb
+b6d510022dd3b9ca35e93ddd2ae77877967dd6966706f339b2197d2891bf523b5d55b7cdc80274368333f9249b62a7fb
+95d2f6cec1b4038f56c571ee0f5aa14fe5fe7b9a2efab89eab4c51a696d2ada549a42095245bea14d7f7ffc69ade417b
+89147eec9de685483d0a5e21b877cb550518a1bbcba0ee65e9519c294fb0c422a729bb0f5a8c8e3fe77070e1a89fcdb2
+a66e7116eb277ba900c06fa48baf274e2a6865977698a504dcc1d0c20f90a7030bb2a841fdbfaa5c8ef6d81aac4fced7
+815053a8483ce2a84a34f81909bc3eabefdce59140f0fda6da77ec005e5dcfdbc6f289d0f0513efbbeef0358daf94025
+b480d2b6320ebf29f3781f04dd88e835ad81d2c63b716f6f244fd2b113ba3781001a34189df586cd629e70c2baa0e5cb
+a74281bddc3a93503a695f0375121b3bdf98db4b2b053eb2cf0773647f6f69d1d98a61efcf82e2a823035ce803b82001
+b84fb99a6943447cad21bfe2b34dd8da43d349e53e85b73fba8a5fd0fe3f41e7dc629960b3325d08af1544e5dc66de28
+a8d11ccfb0dec31b39efeee74c58536f29abb02d06dfa11acb7134cac626a17ff4e204d1d138a472c63c629b6f8406c4
+b5017d42a2388d90bcf4d0b6e015c63612a0864b2b379e9cebcf2e869e5fd45d2713bc549ea472d77e82fa8750f364b7
+83c8e090de4ab6ed169a033aa4ab84f7f3e2b54186106790b30741e9d87d9a5d61bd6a285447e0d1a8e1865ee618a91d
+8db64f3a1680cf461f9afaed4e714709d37559071bcee52e13feb5627c1fa7c093fc8923ede3e70db07563d2d1eae69f
+b6d20dce2f50b78b094949e64edc2ce1b077a3258692ecc2cdaa01ec19add246d0832a319bb0d4153198e3a35091d86e
+a61e585ed55dedfad57352d2abbf8ab336a999a5abbaefeb5d0da9fb0d5bb791119e52034844ffeecca9655675d17228
+8ff58b27196f589ce0d3461e0c00d695da47a79809719b4bd4a229ea7bc9319469744f2254be4469092b1a27532439e8
+b5edaf7c3f9dad7a54908da0e7a153d69a6bdb99fde07fc42928a0dd38031e32dec81c864147066412a8ca240e7dfd0d
+ade064bb3f87431a32b361074a89dd280cc1160a57fb3cf21eea5066e886c7bfc3655fe39099a1913b8b53242b23b2ff
+9169621f97887db46384b43ca24b1447e23fcf5abf141e70fcd1834e9d691b9bfc6e8059d060bebdf9922608593bb972
+8727bb06fadf0633fb8137a54d6912cedda0bbeb0f93af97deef3490b1b47e58fdb37a972dbab1534a5172ff0c840114
+91991b98243bd7c138bcb60cf703a9d0828f6791eff5c2c1c5cc7e8edda258d3cf72680bff2c563c8e964f87450a3037
+a1bddb74f5892597ac687451b932449305d6deba20e97e10989bae311d532a7b72a3fab08dd832589e6a22c0fcb548dc
+afc52ed64208e4beb029d1428697fea6add02210f613551d1e5ba6011c5d13f66ce26b3dd2a39b30186c566b1af66c06
+929bb88a9e30862be5f45c002c11537780d151f9836edeadcaa4a617b0bf958046ce331e15bee646f9eeb4d9ff854661
+b3376241793ab9f1732997cdf515b9114f88bb2c25c0bd3f3b22e5b665e1ae94fa3f6a9f88de37b7792c3aafddc682a2
+88fef7680a7fb665043264c9733dcbd23e20628909278711aad2e54f2eb8fa3d07011f593069b6ba7ed312d9ddc3a950
+b031434d514d0878b7011ce2840e23e94a4386034dce422f37fde539aa35cedad1511f9eec39fc23c7396f43ec22cf92
+a4a32f1e58c4ccb2cb4ac6c2dd8acafa292810c77126844f33287c8d522bb8c32dd89ce8f7c1dc9a273165b0879a45ba
+82e5b11b9fad7c7d5e2a8abf03943aef271ffa43ed8127dfd85c7957b59d7cea56039116edd0b0b992262751c347f75f
+a650327144db1806cefedd1daec1de3164b77c02a0aa652371ca0401b50ec3b7a392ef6a80de6d4724892d71cf48eb07
+a88d8370d88379b52bcaaf596c32faba155db4857bbc7eccf89b5d67a97ae481e53e81de6c9461a6719d179f3ffbaf16
+aae8b3d1b1bb0d71f19e37867885a1fd550f7805fd1306881515d77e5f6a990e0bb40c685e350ed09eb4a55298f3a393
+ac024fdd79688628ee188a7a9d39cd1306883c260dbda9e79eaf2d2f57051b5379834dccfc641302cd12a8a24fa2224b
+90cda91b9e71b7bbc091b9e8e28d79f0fce42255e24a7a3bbf3348651405c46d3b6e2e33c5fb5e99fb4d0fbc326f77a7
+91325730bf7d71855ce0462a2fd0840f3753964b296f7901e1ad761f48fd133371fcb805c315c4d8cb2ffe34e98ab9cb
+b9e1a298ce9efdc004903b21e573c113c771b1bb5b25e2e88baac6dd7bded130016b2f09e50a4346c59adee607a71760
+a703a60c430e365bdf9023c923a04fd9db427ca0da2da8dad6b0f0d5d352524943839d859c15dca64b590ace6cb1ca89
+995a5ef468a38caf66d58880245064a7c0ab520ebf3c9e9f956110a9dd68658baae22ae274a48d59464c8d37d2f8b643
+889c6e4516ece0e0fdb8c99aa482f367f2cef0ae2ce0987b6b602f6c856b02fab27114a6f4b82050738bc98a48ef5837
+b432ce5f638aa48ba952b9c2e06ce822d531c9a24011d14650cac0722a4c5ad1bf22109a2f429cbdd22a567ce6f03094
+86fe41234d309118d1256a9ac79b7bf01da1fdfcfd579b655f31b7c4cdab6f687d46855d56bb11bedd4b0be17e892b2d
+905ec536f23dfdcc4f8128fc1c00daa877eb3caded7637dc911aff0e6279eab12f1748949e4bf015e4f8e30626d3177a
+b6b9f47cb82244d7b1102b37cb52f5c9336e4c05e4c90f5e448fa92444bef12d2fbcfc39af9e1fd05811f5f864f12047
+ab56e7c534ee1f921351dfed3f3eaa127869849b44540b39b0dc021b3dc4dc94027e4161f7f3ed40bf42a1d08315264e
+b9c62b4e679dbb3405733bbe0740450e72ccf39bf953142cce65fe014f132d5af5864ad96167027012c98dc8b8889e8f
+82b8036a3fb6f648c6fb0492334fb3dc8f57c32779d4eef78ac2becb0b93f046dd68c2fea3b5039c21ce8e1efefcc685
+8525738182748d6f901650cc328ae498cc3c712300441042441f66c683e06dd741b644e8e98732552e55839b66f86b82
+b625cca7bf4ce510f21e8197b223dc49e7ce245c5a5d1e901438eecf7160a0bd37d0196191b1d934779f4b6a387b6db4
+b63d753d728670f3b63d4c24acc4a3d4859e5f15ad775e502fc50d7ca42b0d2484a8649eaaef9eb22cef28a23e10d5e3
+8e951028c0b4c5a691a219a6dbf348ef66edef60796094d5f6abaff1ad5802b53a5abec9b8b3b3b98f8b5858672847ee
+b6b71004d898a3bddbcf7f730b8d5c0d8bba0f3b508155412446732ed9abbc1d03a90864f4689e6ab207aed495830e1b
+98f33a74e36c035d9476b198dbf3a75573856264d45313e5bdd89db291dceaf4084917a2242b0a30d3b1ba4ee3016c42
+912fdb4358fe617d7981bf9a9986dade7fe279a0445d7b14951ed77eb88c77c4aff4162467e40fdaa9dafe78da0ab4f1
+b17bdf7a896480ae70b3696cffefbca468b57493d5db59362dd85a3da296e1162356358080c8b0a7f3fde798a3ad1d15
+b47ebba84e62bf453ab223496a892fea2244ba6c37615c3db31c2ecc16a5f9519dd79aa710ec1220a2cebd254f7690f2
+b3361190434ab75e46a40e0ce21ccc251fd0139bce90664bd33d9eb6400317c3210509e4ffeef604c7b05b260544e19f
+966916b3966d7d33be49fa4eba925aa2f92adc2d0228d1144ef633dc5d67fd8231087c488b492688fa142a8cdb45ca70
+8ffb1491d4448af82b7cab5409ad26d99ef6ef08158c73a9ee9626c5a84d2fc6d852e2c786c94b47b5931c7194d5b82a
+a2d4a5bb458688b8f593f39cce2b27fc05f8ee3985f4c5be453706e8f174d5a6585c2070c0bdbb54aa1d8e79b5ab40e9
+ac180389d0432699bafff42a4c3da59bd32ab1bd1c4b4a4829580577fb3c5eaf8aed4dc61a93262f23ac44255e6c2b11
+87f8fe99acc93080e2a2ae51eba24f0b146c1355855a202dedb7deb8e1cb5c6ad8664ba0e93ded5ce253597fe015fdc1
+a554d88dcef521dbf5e4823bcc9145c8ea98c598cab56c85f101ca7be82297dd7f361d457966bc69584adda6d40ecab5
+86ee126cc839d869c7e91f0f8d919929f66c1f67675ae8c5eaf6bc35866580c49d45ec8edf0891b546ec2fe7bebbd304
+970d74575be6cabcd2e33a8dacf25b378ce750478bb44086e1821c97b6b27055b7f00cc8ca189954f0150de7381c80c6
+963badd0cac713d8a23dabb8ac7da5e9a83ca7d580ec81dbbe3e5d53c5c9370b86222ca685215eb282c8f67a977b4b66
+8d2735c85136625b3f8c4196a8f892e276845ca7c876648498143f1897637807a9a5162bb90773099a7b0cdfaa292263
+a1a8507bb8a300e1df882651b0155e46a0f58399375f4e5f993251663b5935a76a02e60999a4851fa082a89d5cec2e63
+b712dd139d791a95486d8fe48e35bb8bbddf890435dbf8dbb670699dcfb143fc582d4bdc8a6751f6bf58a13dd8c2871c
+8f108fcadbaa43dff904a23c89d809746a9f732be817c2c882ac3493624aa5e49af7dd9b46de7d9d01ae982bb78761cf
+80e270c6620756d3d127457fa2e51592604f85479a1004d63c184d7d2ffe2eea4ff75faa436f24bd1494f4eaf90543be
+81f039fce432a5d3bf9649ad0fc2d93de831f5b9c0d0e5fa92d35b5bf4a52c739d478289c2386efc964026134f91ac0a
+89401011d51b6106855487a37459351f18c39f08ce90b15e52a876cf36e969a9c9fa6cad94a55b844ad45fcf1807f705
+ad66c149ad105ce8b53d38c410d73a3cb3ec910a9f0ae798f3aa5207501c7ee39b85f10e91b4cd91e6b280f3912c492d
+b709445e56d02a558a1496bd2b9115d2635855b18984cfb908cbd54cd279d29ecab21cce704cd9ebcf34456dd1195d79
+851059069d9fef4eadf6ba508ca330ecb7436ccb91d09f5d0416874f9fbcdc56472d2adbaebc63a63f190b6abe7650d9
+a933c1b614e6d5a58c599b7189d06bfa3683995f449d636805c8307195d8e98b62ced873997898d6b1b01f6e6a52b743
+a692ba436613db22bc30c3f36a516971158d5489bf2c50c39d0627a74048a6d0b229606823f37a0832913425ddc30d06
+830999596d203b96329185c100bb7360189a50f7930286c36544d20e57b8418c71d8db331e4352a98f380c68a49b2005
+a56d7c262bb3d443fc0cacb2b61f24554ce35b8984fa3418bb4e271d5fe4f5378ef7b12c6cd02f537820040bcee95f98
+844a4e9a8c9eea0b6f929a80da9f4e4e273e999fbe182d3855b0a40577afaced6f8ea285595573e99e13b6a71b985c03
+b34df6205fc429c9b7cec189b2634d49a4877f22bb8060b9f7baf8c2eac4e1d476ed1f30fff1f4c019c65fce96abc554
+b3a97648b3b79cc513246d3d1722afdf7645e7216af233645fca6a2756686592635facec913d19acf99ee586436cb58f
+b9cac906123f2a4aa13d5d7eaac84e84eeb0a1b7919526de5198b5475fb815ce556f8451c953bb0bc910c93c6fb3fab7
+a5e441019d492897de73d31a44a0055fd04e8cac894d626d0457ffe9de5394d0bf851dc5941790cba388b403b86864ab
+8e3081cc7999d91d787e4c0937c9e22c959d2ba4be6fa04eb97471997ef150836a910ef28455f117dd54fa9ec655148d
+98eb793d88faa691ecac3a7c78b25eb3a833ccfd0275186a63b1b1517bd2b984d9908c84e55f044b31c2dc5e251d0414
+b38b5454c2debaf1a4e9e467c6205cfe26d52d1c1dde5356c089abfd6a90dbae89525442419f108c7c8e82e34ec3d5a8
+942545089077b9f27304d2d6ceb3d549e983f100417e88332bf05bebfe8d42b75a96171ab3bcd049acc859f3cc9ad1fc
+b9d444777403590be63076b5dbd9325ad58c1eb244dde2c9628234b62ba74f6b0e956642af2d08cc65f82a1b2e24bfbd
+aee8deefc7ac67882ed7ee6c01c08d7739b6642deb2614064c69ea38c5c65e06cf609bcaf7db74545199cfa6122f23eb
+b3e476268770abfe0cd64a4f878c58c027ff352569d8cf571bb067368e777eba6c003d344746fd006c8bbd474fc3360d
+858137d63f90f66b9ef2a38d7ebfdae1bb89e5bc1d9032c96d699ef276aa2d7461366c00de8c47de9231d9ec436572b6
+a3dc8fe541c9cdf89d83753347d8c573c49e8471dc07b5d41bc48ad1b10a3fdc218adaeb72bda0f362c8af8e1194df45
+ac75940ae476a6ff07cacf70a379096786d10a5a5244fa5c466bdd8af69b1f98e97a3a27877739dd4b223627e0ce6d55
+8c6809f893c5fd03ca80d845147a82d8d54bb7dc6a688733b1404dafc360c45d5ea742f98f6a70ac2decfcead05d876e
+b0818eee75f08ab207832c591aa783193aee5742147eebf75cf7f1eee6a6d8855b309db4f7ab51a16ab77bf619e14fef
+b339ac167debc92cc9132dce076bce281e7f1b9c88978d36e1b5b9bdeabc974af318ff142f746319681764bc4db191e3
+a51dc040c75a8a8bc3b0ecef47ca313ae13d9560c782ee014257ee728a09432c4486a3f87b5ebab690231735fceadf80
+802500a52dc271c52f893b620952604b79d25ad243489dca7cd679b22907fa85947c88dc04463268d25dcccc8a6c34fd
+97b136a881f500b07e5b0b79fccb84b93dd108074f92a1cd76e441239041ff389dbf03483fe76cf7c22a5f40b73b51f3
+9155dfb5d7f7915e50da7a715d1a5ac5b43d7093546d6d342ec8b69d47a86cfcb9dc11d8079f123854033b8d3e1ec928
+9423ac1e11f70b5d0cbbae48b7a5be8350387460631126ebda095b3b33a7ee2845776aa20ad60e2bfaf975722d43064d
+afa907dc76e03d10cfbcc226e50e3bcee56baa4acd8db2cef8e484ee7b7bc536e1765e764180663710c4396e22fb4dc0
+8b6fb4bc641fe2147d3394322418e2e8e091718e3b54dab8d0d6bba687bc300d73cf1b17f81e2812f0943a8bbc1de538
+a8bb533bf42f56edf112b03d34eb64f6dccd57251244f39daeb6531af650d0368f6e4a0f9171aaf4f5a5b4a17debeb56
+8d763490dbc9a9b73bd571833afce20654348cd553a69678ec89454c4cdac044ed3ef0458cabdb60ff35af5e63405961
+8d3ebac80c55b7ce726f4cdac41c7e2f6a5ff4ffcd5f1803c463ae524243f136dcd15f9bc74f8b271ce90a4776c94868
+ab63cd85311fb9889041e692bc9d5c1153b26a805b511721154d28f11dc8ab84733387fd20cfa30c566ab2f8e066af4c
+a506ba11063b14f25c26c92667dbd9eb67c8585d05d3980284aa19a09ae97599a1cf8d7cf45b70a32063f1fa3174d3bc
+b834434632307602d9e046de6f625af5de673996108911c6b05d6bd3e2aee17246b2d860f01dc2d6415fa61c73110e13
+8248b69f51196ce1e15fcdc25d487153896d1f74818a5617500cf0bedd5180028e6567533536919156860e34ba275f1e
+86a5ed8b6a1e9d8d17b69640220bb80c9065198c8f7610d4ee6a60d2d808508771a84d6bc679ee4db34f43f94315e0ff
+8fde55abc106b2afdac3b8796f83c8ce1b90405532fd586d349340c4d7a4f4c46e2a56fe2663fba770a8004dc7b9d523
+82489db9dccdd13293499194068bb4ee8fff51f74f1b504d203c5deb5216287a6d614a2e0a769d4c929bc103582c92b8
+82b2d71281cf886e80e09ff907c1f9213dc444c058e965f964bd17fd36dc0382da2449fdbc3aa7b6d07004d6722a5848
+b0729dd38dd64c441e81a94fac0c8b5b3588081e43a5b0298bb576b16a9713acbdf09b9bc2499c677064619cb3a172c8
+97c4bd5c97182e80f55e82648e387c4a3362c6088381e96b67cf0f04bcdac3dc670890904180a5388b97002c70481235
+98d99f80ae9c59c921c6ff71ef01c2ba283f531ec32666cca1fe7dfd9bbfb09f197e9112af1761068cba8d6319af5d74
+b0569d892ce82d87a3d809f4c86a88ce627ed420dd106ae49b88b8c470ddb081a3dbdbd92d7fc032a7082650e4197ed2
+8ff68d42ec2dc5b13ff5c7ef506c619c4bbb0f62fd4c08e320953e5cddded2aa34624c6c5768b546cc2f00add0dda58f
+8b53131206c80638dcff21d7f2dabdbc6faec545f19ab1f4f2bb858d6b01d87adf886072c3a744d58124b8a7a0c87573
+8b9c9aa127ddb950cad4fc21cd7c8eb802cef6db7290664b1773b9744836450e48af503009d4bb266ceac83d765b3b9c
+ac61e051add512e749588e2549ff55f3e6fee5378443cbf64c80cfd7b260cfa63f16fc3e242aa140ea243435be28179b
+9240700fdcde974f319a90ec4a9b92a0323424fe39e513c7412c621cb33072d193476118636bd2655867ed2816e03034
+b6b05975d0653079034f9792d5d8cf5743e1737e1b3860e431a1e159199efa5a55b2d3283f6d270c9ed3156a233e858c
+a2ea8fc31294943a3a6d02509cf8b75a7b5d94de917ced468fa64a6c24ead4edef11c34782eed848792b0570219fb77b
+ad0b54dc5dceb242c05a7f7c529289c8caed93ebe743f6609df653aedffbd7eaffceb53a18dfd109f28d14c80e1f7935
+81e4d4667900eb5a8434e2153503b2318f63708499534a8d58382931791eb0ad0522b41cecc7eb0e6ddf99002bd0127c
+a4c5c329fe159bdeeaecbaf479c60c8f43a58ce613e135e9e9eed4af6bf5b6116bdbfea31c82bf0ba87c3f651e1464f8
+b95eaf48a9128df7f970754af926f9865c2078cabb4da4918d8b45e95d72748750ffd12f1d8d3f76cac0936ad0097d16
+8567385d52e6f6dceeee52f6b690781f7c05c26f0d20912bacc38c23afe8f64925ba18f8b6464d4a0557670ed0cea232
+8f7483cacd15fb7e49b2f8deb7ab05e64bac18ac9dba475666649c2cdbc5d6df0d5e789fdaaaa997a3b524521f0470ae
+9252efa0698c0cb30dd431a72a0f5f2f14429f6ba50bb60f7039df45777557afe3ae732b9283b4a814d2146a8cd8b7b9
+a54da5287928a02cd5eedabe70cff80e56db252e2811842545beb14f25ab67788460a71ab8ee47cf0c1a5f8d01635256
+991a80279c622565a03929c94590f33cf0621a79b70a2168a41a4376bb3f0dd12a9ed9b16c0b6a4a59c50b5802449874
+924ff5d3a6f0ff4ee58c3674319971257543d2e19f0ce3fd0b0edb214faee920f8d6199ca794a173363a9fa06c96d7b4
+96b136b8df76ba24e4dcd68065c650fdc224fdfc9c1ab6410e008fa5b9580680c3c85801fa217917c620c86dcb5ce3eb
+95934e64af642e7d45ada1bbe8b9fe972877a674252005afc34ec2e857f755ea0d77e7759ddb24255f21252d6c739305
+ab14c6bdd6d1ccaf69e0dfc6c832751afb70f89e4800c6fafd22db2e7e5d6f2addab8b1267c8f3fb85cee51c761e69f0
+87e2edb8dec1253547cece2a7e6934b0299715e634d599316af0f076c61726c7f2aec83eaddcc9add1c397cbc9fed0ca
+91170baea88ba00fe00db375e8d948f58061f9e7b36a4573031b9996757afcc2c7e9c2d9642bc51402aa586569f0a398
+89d99b120e4565b0538b2ef4f8d8c05997cdbdf61840e068054e7f21677cdc1dc2f63adab1b6814225d14275c737b0e0
+880c2b79bff714665e9b3a0a647773a212ec5f0dea37ee6b29ed6850692055013e108a86affbe44d1abd0ae80a748950
+b564181f9ea65ca25b1ae7f25eee84b73f9db109ad1939e6b9351663ac0b083fc13e6518ad8eaafa3caba9ab959bf7c5
+93cd91391deaa726320574bb46706fd8e30ffc2308290c79abfe2d234d0f0f59ee4c38791e3bbd8c3f840a920489ebaf
+8e846d48e7b120b59c6556a0394d25f744dfda0cd58d4e70029837753a82afb63a015e79157fe8c810cc68bb481d19d6
+b36904e7dd71bada7c9b9172e4a6748287cfa0cb6960ccfb7202a36c57bc28d351e1f5371c2b449437cd266f2d22e7f7
+8947c11af34a42f314983ba9c673e62fcf44c6c1f733a697351e1b8422a75338a85bb19149fc130d01492ee18b3c9492
+905afc0103e34fa9787102fbb80967b8c917bd03abb02731fe49ba1acff1e96059227616cd21080563e92dd021117a84
+88c7acdc65e6373e4c8ac6a13d1bce1d534aeef2965a4d9f887b2e823c7ee7921db1397df5cb5e7f12030e310172d6e7
+b028c19082411efe8a46c8abfb9936c005e766e2ad3120be774172f16419e2b04ba3f31132ed2bc209e7214c2d7b2b61
+b6b3a561d583870193226391ebf51ef47185ab6efb3556ae59106b6f266776064e5cdb66f0c93748e60d557db64e8f84
+93732aa1473dc2e50610eab2c8152f2d96992fea840ac2d82c6e2c5760d8c1c05e8ecbd69e14d03713f43e77ced9d3bd
+9734c433ad41a8fd91e161de033a2a55189ae31e2af406d1fae443a182bf1977dddff93f6fe2ac7d9c4fb955c26ed59e
+a1f305d17c36c06c515d30fdfb560f899e80a2e2461d0bd947032e5ec764116c7ccbd528ea42a3b9351e3c9b45904431
+b517f46b582655e551f766930637e8dc2a762dd7a2c54fce429fdc4cd503e9fe4bfbf323f50860be2c18b3a17d528654
+b395b5c48b1cb0daa8c156188b390a78441c8f16ecc8650520f9f2914bd1d992b83849bb11ec17a47f9f2d40d138e3d1
+9147b715b62fd50e59bc96d210e10f1062c87a90263b5586746325deeea89e759464be55a09b0548766e13bc910c4d3f
+a7dfe5e7a39767d14d531d371b92fc4979d326ed0f966eeb7b4b4252d78117bf5295b3c17d1fd636dc2c0097cac901c2
+aa3f9fb858b30675e9e57170a1835717521eafe4bd0a0690b10020c7a753951576b4c7dc80cf9f042894fd5741b41b1a
+a1f11dec034733e862cdd4aefaf0252a9e8175b6d4c834b7a7d30ab884bb6ed6a1d92bb0e958f0082085cd80157a0e40
+a1751d7452b7c5596fb801466d8d07a70831e568b8ca66fdd75e5898739709795a5768726ebe13c469b1d51092d86a60
+80acf49051b7caa6efe78318792d05401f5246c5b3bef25170b2a49adfeec8048ad5a5e6d50cc498b23896176a9d9669
+94156df9959c678578ec6e12ac068f3a28d69a981443fc35161d14b1f0327b8424746d62869ea9377a86ca6fd2c95b5e
+95dd91b1e9b457de913a65f198dcdceb1fca75692853bd5ed44eda6343f32126e6aa2a309411e019dbdb9519c865b96d
+b2516bc36a726cf2dd5553e319c64fc508682c7446a2a5ae696e43f1a8c129ca9602f5a41bfbb57865a9dad1d56728d3
+90cd63b4f9216fb70635e4dcbc9a6c5874cabeabe4f9ea83bb923146d03366d9befa48b20a64f3a2cfdb0c3a84007ab2
+a55bfe9b33781501f10d5632e8f5330841eba2d0a64b0aaaa92db56f014b5e44dbeda3b1f5b2e4c17eb6a243977b2a82
+b9e84b3c617708971f5e174fb8718906f9bd353f8b0fec8fa03d1a6e4bec20430212396a5406595343cd15777c5a3f8b
+97deb79dd82185555442f91fb9a70cbd30a564751528fa0df0a681315b8a71bab5073716908ee0546d70dc41efa3b53c
+ac77c2fe555584b9cba7438a4e3904958f671c49536f185cf1f3b25c5a57ea65e15554de22def94c5c623e8c99e47a9a
+a27c62d39508552d79d2899bac6138783f308e3befab65a96a1ae4ab108b799628cf37db1ec72859a0ce1ac68f68b106
+a2aa287741f03e31f2c87fc37e228279b1acb886f32c6438b3e9807b8126da875fca7f194295c45531e939a13048a882
+84df8999c4c5ecc807819248957d68909d16ef64d94a820dd0d266cddb6775c9c7464f0b2385b7bdde8fc0f2169a4177
+8388e1a1babb941e03806b392fdc1bbe1a01438292ea1db4087b010de0805be78cfa56d20e9ef7c8b6be5a04bab1b1e0
+8cb6ec409cec27e7c4537ee2e5bcf82a33e7cd4761d19059e902b6068a9744e897a6010e2ab42ce72625cbc433892ec5
+b6e71cf74455b0f506e03eecc0976831ec9a56eb8fd0e39e5e12ae199180a4c6e5123174ddea6ce6cfd7a414cf0afc5f
+815dd267d9f67b4d229a798a499b70ea2a611f3bf2a9d3698d1105890a2b6462fcc7c6ebff0d5d709707ee4ffa981689
+b4e5b7fbab4d8a66d1b167a5acaa4d53949e1fbdb00107e62b727b4b4b2cc70e2685cd4a16266e8d13ab176f9be09c10
+8d1bae7566ff551f06baacd8c640d0d04accdd49fbfedda0841914aa1bceaf9f3f27344b80bdf5f9b93ada438a4e6d68
+adb054123e27afd4a691d2cd808a3232ab58f56fbd514935caf47b8193b4c64aaafed4d08a7a10ec4deb66be8c292e64
+8ab5255246e01478ba7dc6807c84850308a719f8f8433eb049d5b11cbc361c08930722e7e5878ad99fe1586b3d11cb1f
+90e862be1e3d0824106da33aec437a87dbd2599aeb58d46b4a39a5f651097d49943c3248a154e09e309eaa7abff3d500
+abf16f35e3b2b29a72cd96802c900fbc54100484299198b2d40cc6071945781cc9bb3eb43f6ebe433a14c1aeb172929c
+867a0f396374cca7303845d8a1e4bcebaa53cc0fc2e790dd58cdd0b5ff2b9a99e18ad4e57aa2b061826545935a5607b5
+a6b6a2e22932d7c9ba8f27b1e1de8559631a81effc77ed2cd7c45c48e49ea7d2f68c59d07a155757493ad82f733d93ee
+885e4c3904c545c0eecc9cd02e16d359ce69a78e3a355e7fbe6485762d4523f2604f2f663a4521152a8bdb6fd4a9d4be
+a668f417391b07a35c5d40ee5212cb7bdaffcf040a4f20a3d7e70e9d715bd908d4f8fca87a7dbf7b676e088ac8651ee8
+a70d67f3379e1ee0708c34c4c7a7f552267ff679460b9d8891549077c724becb99ff79b35bd80420a4290f293ed4133f
+a523cca782ced0d8a3f7e19707f9c64ff38495f739e035bcfb5483f202b209c07c50c764eb28d3bd8cf68ae093c46f19
+8ce98e5f96889ebada090449ae198208cae5c247cc5f6fe7800b4c2254b0e7f2475b632cbd5021a0871b466c5b943dc8
+a69cfdeb27ce1163ae6b6b4b5d46b49507c7e62789f2f90f7f5a0fdce79de988c755cc9afd8397b1c02976e03589f985
+acbffc94dc0445f7797a0d83e5107ad3ec8bf61620fa83e73a999ce4f9b6bbabb00245a619aa6f9b082a2711bad5ce8a
+b64162794503c86e478c23f060228105bab4f3f5d46582bd455a94526aa6d71f4c9630d8d63854c8c67aff3904681e0c
+b1288073c012a0b2b7e31708e874106031a8cc98b2c94ad0ef1d7b9df42f429f58caef5494f6d581baf12970cded2a17
+8d7ad217c3c1cb74cc301540a0e43be6d74d5a3c0383ab7c9dae57e25f8725781735b58301ebc014476171725299782a
+924a33c759249af270617767101385910494724a51fc63600836ca00d06f0ca86a4a0a85e5e87cc29e404ff8e04d036c
+a7b21ad39bcacc96cd857328a83e5d26cddd0a5bb2326da9a8f593927ae7b5927704acda9ee217176618c964d0452d54
+a5c3616c308bef98807a852e16f146859b0b1f31ea8a721941d90abcbe37eeacb4403c6568480b6d6e773bbb94a89307
+aefaa1033e47673ca2b68e4c945e6ed892e223146d4fd24219304c2667777c1b18a19488b73053cf7b0e6e09ba1278e3
+b308c690176bc43051f51839d3ae1636f6de5a57c626e8def464820ce2f96ca09ff26294a3dbc9b4573cfc42dd03bbb0
+8f7b1253ea9e257195ee92c54de41f2e7a310c90602a628ba3180e059e5bba79d6bb8110d1964c59daf4b65cd9735704
+a387f003f7731b81bace54c8501a3a2a25d8a910cbb28dd603ed16ce61ef1df34e233dc8579071856d7198a071efedf6
+955ad5523828c0fbe8ad6a77a191661ee9c8005b741b7b0439b76711b6992795758d76133399d266df5e494e4f86cd67
+a44441964f5cad7b54d0105f162ed3ec40d12870fe8c5c30bf16238440143b330ba986d6adb00c9626747e99449f765c
+a52df726de07cccbc77e81abf4f1712657c9261f65feee8815ef0e8a4ca61b8e470503801f1da8a23fe6d52f3306807c
+b5d239222c3d852f2c49997e76d97b70bcfe73d85e81258d9781f5f7de87f9c81648bcf58cfffd554e4685b2f860e6d8
+96f0193aecbeb1540678f1a3369401e916ee75d2a85f7124c555466a3def91a5d8b5f774e3156a163e1010690d457c5d
+886b9f4965120d942b076d053571837780232e139c3efcc6bd6c64eabddbed2d55c3a9a06001bd7a2ccebb36135edf4b
+897a1e4e9f4eaf755807bed984ef0bfea251740386a168061f4386819acaa337fa6d3f038b4cff9a11926e68f7888f90
+989d9706f8396ba422a34b55897b9e261ac1ba0c7a7a11a30562ebfab92473b9e9b604ea8baa6067137a4ded070fda10
+96376812651020f68c6a1f0aecd04591fdb628051f01daae179f7008ae33af5abb42e8f304662c9b6e2584e8b02ba6a6
+9344e6f3ce42ada6281d0fff654f408e61f0acce81e23ce47466bf1145a99cf60dfba9a22304efbb1f428c92357d644e
+b90c5463445156c8de69d8c35db656a76f3e195c325808396a829c11c06a7503f3c092816b3f23a263d56d3f2c075ff7
+b4dc6d948f4b67b513ce27fd12bc8efe43813c119d01b2da391d01c1cb0abb7d51350a5446e0a72a6f8bbbde2ee4b0c4
+84d208ab983941bde208fd71d58c7f9335e14db237cec42df453155a3a8dcb21dec8696a1334cfe5d035c192fc44e88f
+9577996c78372d2d6c9de27d497afb29c918bd894bfefad9059bd85cf2ab520ce1d517994724e1567f12e385c126f26a
+b778b9054776a2b8ee81be356050b977bc8aca0d0a202be91d56ba89d8a384bd29c5c652ea084709d4fb365b107962b9
+b7ea99f8c841678dc854527ad0c8ffc700b43b5b36b3d18303e51175b3901b144c53e22eea6ce7cd500f6879a80a8c21
+b466aa7d1a5ae3d9aea240c8114b3dc3af38f7d8f1e323800a6382de5766f19626d07cd6ca6eddfc4d71a43d2d49a07a
+8a72b1ee7993f16400396982b6a5198f0de08821431bc66489189d5b364b0e36daff5077b48aff1d55c9a88580cd1dc2
+a7c4dd6095f8cf61f42c5901ab67e9d1ad21a42d1eae9ca5e147a9396507c7a21747c2794f71ac66002840f4fa4e1dd0
+abe40e33cca787e7c521e2e97fb5f95cd4ca7ad6148a505afdc94e0c003e4903b1524164a1df2b2a1330fd800ac33b7d
+ab8e1930b1e592aa2379cff636e7fda9fd7f05b358f47d9cbadcfe35fbdee5bf06469fefc052f62159c10942ea2bc5af
+b28edfbfdcc27c3892d64e7e05a2aebb173808c020186c225590b03d91dacb866108370f2c14ac97a6d20d95a8e32f8a
+97d4841704bacb06bce2778104e4437c930fdd9320d85cac383d11ce9246525ad5167cbd63ef04a8ea39c8fbe3d88169
+b4b178a1c3ccd3344831936b784203919cffb611cd18def1a52ffa2a8e4286f9f9681bd48dff9b2abfe62da5fd619fa7
+afb01a4777a128b02fc22e282e0c4ab1d86246d8e0813a7e85c51907bce079766ae40c31d3c440d5f99c92e89d3a683e
+91cd070a607c20140c1f35b25057bfa20290b1435e99c5b33068c4e5755ff8f1aa2be61fba28dcfc131cf881aa1c39ec
+aaac82ccda92c6090970f60a56668c011ac20dcab26347ad40585a60b5a9b5a9af883307c55526d4eca1b110a079fd3d
+a7480de83b4cbb2eedece3d3b27b8d934e9183f448d56d5f49e0b63e24575014a94e09d406d7ca5afda08da9f4eafbc1
+8e568ae356775b06d963b440f75bad9b5977b7bcfb8fbd1dbb4daad5192521bd189674654d4ab86ded4a6be5fee27ef7
+a501a84cd0b4138383572fdd09242e3a748e593f55400fa7600698d4f916a2fc1feb96557a34f4ef0f13eee580fe9f54
+8be0f6b98d52b83e9deccf09d05fc4a7b4ae1cb11972f01baee4fabdb804cee2b0e9b44a1385238f755d2c1ce395cfa5
+afd01e3658ed9204d39fcdda2d79239b8c45dcf80fda8a680a8797b6be294e7e8bf56ce345896c3f08446e9a2a053a61
+851f0def025a50910bfb6c2fbe5ca62a31426747d9cf4634c8faa714a014fa22586c3eabde84e23ca77371ae25d720d9
+90a1aa7bbe7842cd361d0ab2e16203a56318885d2d32409370ffb64ef0ffd3c8c57658573a0714b04dd1595aabfc8f21
+af56f30bbd796de5cbf6f3d041c2f649d0f36e0a1335ba923eb1487e0b29d0ab307a1143e6cabb79674ddc01dd9a5cd9
+8429afa5476d0f3a4eed4104fdeafb79f80e94e709b59aa44b4caf0a94bf75fb3efadf76e96389179eafc389fe896efa
+91d8399bcc3b82f0044b9a697b2bc402285f6d2e7b76eec25ffecab769f3fbdd45d20897d28a8676f090edf847eb3c70
+a06f8d37404ae58c35732db58c4c6270e4311c691ecaa7d89b3e9b2bb1421ee3c3cde555d066340c0f2479faea1ae162
+8011fcbb711ba6511960245c69a73fa99167eeb4d238426bc31ce359a90a2339d5936042b281f3ff3eb976357db96885
+8dff2bc19830b4a58d2cc3c1598d060da34c8fde11635062dd4222c96dcbf2bef79b339c63fefdb1653153ef9af79c48
+84ae7869e2405e326bd167249f89c2e018817d3edf59f3db8adc25f64836ea4606c78158cb30020a54551283bcd9f39e
+b7be6cfbb7cbb7788fd60fbfcae3504d441b0af3b46317944e00a23079c605c08fd116311432be5b378ed8a11da219e7
+a3656ce4a79484e365b6b7f81a9dd72a09746da16175a61794bc5fcc0c3dd608751ea2cfcf7bb0c14421e0b05d94df75
+929d5603a936bedc69ede2d1277692012d0c820a23915ac6e776b832b9f4e0e6276fb3b257c7abbca32ea166d4482149
+82d47138de8b6ed4bdaf69526ace4f6fdc50fe5abee63f1c6d4447fe4948a84a63b7963c8a65858442856e282fabaf26
+8f8b2d05e77e9e4e2cc5229ea98c5c02ef9d9b6939ce6663d98d8e2dbed73af3d41628662c354972c1b48157f8d3c459
+9353ee31f477b51558f4ba5ca437d801f59d01ed995a8801552f8c578d1937997bd76c31aedab99fb5532789e72469b0
+941f777fc9115fe948f3a979e1ab87f133238935acdc19d33e1d86a1a64924eb9008e91bdff8d650f5e3ad06db931234
+8ee79ecb7d07e3a5fb80ec15c085898e97876448685891e09ebee9aacd5cd0147715dc60b6f75b601fbe83598f1a939b
+a96a50de4fa25367706c99abe9dba95ce1717483f50692bde7c8c3a6b427d02d59ef6e8bee82762fe774f5afa528f0d0
+a451ff58246340157fd94d028ce1ebe5ce49e5ed87d9b61884c8ad903ef9b697c4ab9e5acf66180a89a17749046c99fe
+b12739d77fb96e9e93065fe279307eafb11c795da2b9efba4cb239425faf687b9762235700d9f2cd5df9cd9fb2b36e3f
+a665e34895d02e68f1dee7ad8090558514720ff3e809cf46cc06d1e1274d219fd08781fd430367a3f09e2c591dfd7cf4
+a262410cb60409720ce68935e91c743aed5eccb4a0427449f32a4acca103f9d65413290ffe2cbc895e2e1cef96ba7c6e
+9597cf4d49db896796132aed4bdfbec71ebba08a617a611d1fece75bbfcce902e8ba228b662d0ec5fb927429f082eb38
+80a045d2bd30aff2267a5385be12c646b65b24a586c4f5cb1bdb81387e3ff8edd2358cc8e3c4c5c60cab88d4dce61d90
+80323f4a9fc78bc89aaa172f739bbd4f57f9321a7b8e9eddb74ee5c99d6c7b8dfe847f7103110f0a44d4e7c20ed29114
+943b749ab77112be7593bb2ac11094c66c94bb89d5ee2cc05316ad623a3997a38aec741ec93c24770adc670b6ad12e91
+a8e1b4935aad8a84112a99fd5a4d3786ccf1c985aca0b256c46d52a8801a132024391431cc2cfee760c25eb18289041e
+8abbe403bf13bad914a4d5bb0c8709f5b264a7a81ba0542850cb89c3c45bc294f62b22a36d7f829ca80830a3be5832aa
+9084defe85d170967c08d1f5e74ad1dd592c2b013b01b84b5fe3f2ceb260bde2e52ca22e4006b07f01e3dc7a36774e94
+a34cf1cfca622dda528589b5e5e36a4a68cee7e18cc621736e3e165b06a5df9a8e9f3ddc406838c1fe94ebdc44bfaa18
+8c5f5d7e98828d0a063d90d5f78bc493c46316fec3245d47ef8900241fffd5316e0d6d6f1653cb3b22bbf05286736c06
+ae7f2beef46b6645a6d0b3ca664c826be205ca6de35bd2809a4871f19368bd2c009ad7de0cb4c269c2934357e87c7f64
+abae2cd1ff7320d0803b6b5345ef9dd364fcc001d91fa456199dde24f474ff3d0ce94d460be9659caffe7ae0a6814217
+b86710fd69a6eeca8a813c7c1d643b487a32cadd70013a4aff4b7331ec08d1469fb17a06d06926e68f546e7f5238e1f5
+b42e9dd8d0f12f95a16112ef7ea60e6f4c76a39cb64e7f6bb4fde6ed1fc54fe8317e93160d736d97d87ff7af69ac2a41
+86e5561a7b621e68afda9d63945dc69bcd615cc099c84ac51ebf6350b25c9c07ab371ed5b160a86488e8213d143335fe
+831c730524214b8368bdc619e5c7e55a0731b6c5ddd035e9d7cd90577a472a429e779efb0ce47320c8d3b62997eec0de
+a3bcbb6c321b329ea2bb944f48ac984f8bb6cbcd38a5f80e8780257765756cd902d252a51804879104527bc7b251c1b5
+8b1a0ee0219a010653f816de88b05116269325c42811d717544468b3bf477953900394a71d56b6dea13e4e6ef9c9c5cf
+a5d06e2a43d965e47d400343c093d64bd5d4adcbe3928093c80439f815938b9e952bf59da7fb26f459a5439fe60fd49c
+b92df54cd0515bb9868a8dadb2a808d3e62fec12be3c708fa6c845c833c3321017e2f8d71f10b064fdde02b098e22962
+afd8fb1d8ced274650ecb6c370c5bbe8f09d263391af7c2f2290b5c99196ddeaeedc8b9b6173b6fa349872f58c83149e
+b359418883d3425b1bb896a9a9e2a3068c19abbb18ebaccadb85dee713b14bca5b83992cf239cfbb73adbe2f07c63f04
+b8cb045dcb0735b02d6e81d9aa9906ab2f19df2e2adb5bff0533022c03a9a530bb27fcd45173faac63a8d13bf0f41565
+b8b8ed443891d3ecd807d3f92d8c2afe714a423b97019cec3690c24002cd0444548ba6b454e1f9934f01a419206896b8
+a3c28de7e71c54dfba701b7e1053a1719032bf48d0e520bf8d513d155d588d08d14af3cf1e9ba3083f8e59dc947ef99b
+a94d1569107e659db2ca58864eb8feb03c83ca083c75a6d949805faaf7095a4f981cbd1f89a464aa46107a891ba758f7
+a9c98b0501a8c5102ec0daffddce83ab40bd097c4ccce66a8f8a61a3fc28564ce5dec37940092640b36a0ef6efbea4a2
+a473b784935b52ce73755894177ead52cd9f2a10521e9c034298fc0461aa6cfb03d499812189eddbce4b3cfb58774a3f
+8c7a7984739a3db7b28b7ef10f081e2cbec93e1da39738d082898fc73e83db206fb52cbec476c9809c7de61ff5871b71
+88b87148a573e576d0a8fa912858b7a9876001d8364bdaa7dd2759dd908555119f6f580c0d3a663ff5c2a2bcb05fef99
+b169b58fa10256b2753221aa33dc4f0f3308a294b98300528347ea4e89128a1a1da502990c9f2d266fcc10031b3c5a07
+85b1f0e49528ec8e51112771686b5b9f18e4cab091f6f97dc9a327221fde48be87f59cb46e6caac6e1af1a8c70135e66
+954021598c24f5889a642b9d20488a04e3c78c5b04bafcd0a01f377cf24b49f64b1d820ee8a73f8cc193e1de9a106a6f
+8954b280ae11638d6e9c27f826fe66c0ec584fccefda8665f75e0699ed640e8e74fb1945753f84baf606d2fcc804b1a4
+899303d3bfcf48d28aa49e915ddfe263117ab87384f611bf7d555ed141dd728a39b97eca74b6b623a20d44458f35a157
+8d792116aaba18c94069cbaf0da373c4e61662189e8bd0f24dd675531ee6f99d574f91844ace86e3d018c4603ff0e2c6
+876c457846f27161c796f2d063aac7f73c2197ce707872c828af81ffabe91a6f353c6e887464c921718425d046c0a722
+a0382a36d4f8007d444643bd5d85d0b6c3c892c7ef8158f51c878b13af6a5b7c8b098ac7a6e3241a6e13b4ae987addc9
+81d668e292ae20a5a39b55e6798255c39368d9b83ca46e986c343ff9cf4f3140e3f07115995b8fc2554dc0372e4acfdf
+85e58c950d8089ebd5d0a9d852c9e78d1e066c4cf1f1e64b4e76356745d3eddc13f1abf177dd32f0aede2f190053f8c9
+9420d1c470588085057549b7e6544aca2ca329ac9b232187d8ac894b7a878d6d3ea351357174089943b43a83f057ab8e
+b6ea12644c6ae73b8b9752f8eb8bf06312ca14d93fddeb5f79b92167ed78338964d620379387ffc9e12ac0e323f3500e
+82767d1ca19c7672d38216bf17a8ca0a52aed5dca77684da56419430f9129ed25b6c547fce50c834746cab666ddd43cc
+b1864c611fdb1b641708a5be8140ca0ac52d59d7c3fa3eaa10bd815f7f5e34413751f829f5fc0faa259064b73d43f4c8
+92f67f02d17a1ead3b01478687cf26b40fb32f055f3b34feff21de083852460e02afb834f61c37fb91100709891379ac
+b640a52bf00e4b29623c9b150635391b4dd42f0016e827daaad7aeff6e6a64fae4d67193664bc5bb368c72b138c76efe
+941c8aed9a85a005059b83d35f6a70dae2e2b5f645719b567de0da3bbf1d2b85704ac977970a7206bd98609182090160
+aa976af6c9809550721103fc8bb8359cc4313f672421a4ddd760bc4ddd86a036c1b4145049d9c8165335309fb608d6e4
+afb11dfe01bb6a9d2cc2c040e18152645b4aa972fa01b6cb4285312bcb11a317107e743efb53aeb4bb6f8a7fb7741f50
+95f8f780fae2878792aa3f60eab8954ecb107942bf07f0e2854173595eb2d4b914f4aa208f98a63b0ebcfbca46840123
+b1dbec7871209fea98676e68d7a02dd82179a74e389bb9dc0eaeb2ac2d446d26810146586b637869ddec4caac8281bcb
+931c9d571e50dfd2e1bee0c36f42085e4aa4e7d80a1c3bf99573d9d09ff710f6fa27f30712daba107d43d263b226d130
+b080bc730ed34724851d00be3bba84093a296d6320fe7671a83364ab1faf922189ffe997eca0e1ce4ac2c4435d7b7f10
+8dbbdb4f82398c891d16dbd4169716e078de5d677d3d550fd3853ff6ac8d15d278f17a2950333545bab823fad09a4922
+a71bb5b71699082cc45037805fcd95e410c29575d229a556a7c5f2969fb6f957f0c63861048c65d5b73fc4680a5c3c70
+b5bc06a742016a20c60d61cf55006cd7c2c7b8f367968f279815087b2bda7009c1773b9c91b8a4b78717b2bdf6a5e96e
+91aa31c68634a81c9784d0d6adf4dc85c981e122635d4e1f25604c8184da860b1292d65324d4bb9bd8a002572cc96bff
+85484fa47e235410e2ebc49f4dbbea9847ea064f6f6776dceb0d868280fe88bf6c5bb72e24c0ed3cb0a3f1d96ef8c9ce
+88ab35f32986f0bbd8502dc81506cb18638298e856934fa374480dc455463482ca780385537e7ea73c4c863107b74f7a
+b3022847a668b6d5d52d0af14d594c3e842afaab5416e3ffef21224bede0e1bbecb0799ddb7e095623a3a6f28b6d5f43
+8802d0e6e5203d0018d243301c57934ca85a002f91e5763b2f7372816c7b3ddf719c3b743f2530d9b7330f4f35d69d83
+85709fddeaaddead7a27d3f75e5ac568b0c9691c797f1505f5b33678158f5dff96ab98b921bfbc83368c6763420bf949
+a45ddf8ed1c273d61578bf6830fabd4927f82e3efe7732d64a1c82887b9693dcabdad1e7a65f09bde459fef89c0eef82
+970fb837063e059b1c2b4ec88011131e8cdc459daa1e704095bd327b7c94115c57cc1d9e8b4a29d6cc4f20895e309c61
+b789aabda019356bc5c5dcb015f8e7c5da25150988af0d44cfb11d8702da22fbb43f69c4af889dddc0647745d162d91e
+8ccd44696d8c52454c833b0b256ed0073527616ce49ef25a113cb9f16d41f39d27e3bf169ef0d3b2fe78f2a5910ec83a
+9846a3ae6a2c339b09f53b6cb1262114d1ce2fa3ea43d77b04816eea6451e8620f0030ba428eff80d72d8e907c8f9e3d
+80c18de89a31e2c8309353be974e42ca97dcebefc1a914e76b57609b9cb7c1c6298e2ee1bb35ab9d587f195010d24337
+a43ac7ac3798af0923ef5bcf2342550aef8551c198a31b0bc9015ecb24fd2633bdcffd84a2c84f9eb72b4e67084caed4
+8cc1551213a33114c8e6b3e00c68dd26b9cb3728376b498c95aeec60e7506a3346641ed5297fd4ead33c0e42b85079be
+afb54536b43e311eef9f584b8f1074866f6d33cfc75a3294aad5aea870cdbc3c97ab6e849ef719e2e1e4386a8a360fe2
+a2c5a2240256c64673372b63359b646dcadb108d785b4fb16a165f4b3b0ab3dc3dd5058582b25ed7b728d56d5aa45649
+b35e3e4407b63edf3eb567fdbe03eef00dadddcf41b799c80a9c9e26ddcf0c6b0b9dc4df0a0c5d54bf31ac8273740a32
+a3ce737baa7e1c1c69931a5b2fe1493a06fa0dcfc0b819ef8242b4fdae8d63bec8d15561d4fa24ef6d6c3a326d0abafa
+910a67b377fb17d3f9cd1f994db52eb5f35a4aa002bc1b7208b259b12c64c095e4dd65ffe54772f8e2773923a890bc97
+908c5ee131dea3f444a9ee2052c93a657d28f2f58e604bf08e51500a306decb2db964f68e87d5ac2f8207cc4e92adb09
+8f3de5e756409b575ac2786590fc85de506f0adb51450f5c24669bb3a688f080c1cc37cb8e7a3c8db8e25c49a4bd76cc
+aa62ceaef91fdf09d2ac2edbc07fcc651584a7e7d7d93e7bd4bb4c42105144c2da32326b3ae320b36a2df8aed07e5610
+959fc29ce63dcac2b4dbe8180577cecf9bfbb6db6505d76aada43ddfde5f48ec8f6fed14fac19389f6c9ed3555ef7882
+984cbe54156763d6ae078d6a8205cb6f9d63eee390dc5990f5d8e85b9a19fef563653d3dcc190c9b18c2232a916b1409
+923b448808d9ac04488e8345d3fbf9aa57cc3b3f375af138b674daa0e5a864faaeabed08f94010478543f3e1248c699c
+8c0823bf2706d9aa4c074673e9d221eb021de2baffe8b703e64e676b6801da73440b7793254fe4c8c48d2ff395e44bfd
+93c9cb050494824aba0d57320e2d1dfc95c988bec46dc8d73f7036be9ce0d7de02e56ad1ea3dd8fc129100800aa639bd
+9339fa01caba0f4837efca7a3d983fda1f6a479f63890db7f7beb837e3f6535b1f1d0788884dbeb73fa657410a4ad308
+953f213ec904d4540b356d53eb88f646a98581a6deeebdf99a6646cf612e5b07110839d46c57b76545f6879f12371b10
+99a4576f12de20fbecd3906e48dcc784cdbdf7fa0843c570c6f59f13cf3a559cc1f4882fc1d31015304090f83306280b
+b07fb8b73793a236e58b7181df5a0a2e8d50c1d3069c475c6e178e32d14b6e75c45af60a8b54823c23ffbb316bd4a98e
+98781507866499ce396730ee91a08e91d3be337690f7195750bd43a601a8f78e9475d5ebb43e347934429a4ff3db58b3
+972a5a21354beadf80d8a6e449cc4f072d6b747de293f075b8e0925c89660db9195a30188dfc8b73dba02467ae02913f
+827dd2e21ca88891b9b37e10f0d6b6304438cd6aaf9cb125ea7ed822078a233f3e1b49a8bc65f843e9551691b46cf91f
+ad3a4ebaccc157a7b880db6990a937e2d230875f509ce864fb0b7ba5febc7f4668191bf3aa55b85f3c17ce8b7d75b349
+976672c981d106fe1835188e202adf6ce77314f8d7c8f797aacf25f00d57f8cfea31b057f6afcb40b9f97df6ea387979
+8c77ba87e3e8fd5de85802a764b719d67f4edbdace75433af7fe966d3d18a94778c4414572b84f98bc6b5993a3225212
+84ca9b0435001c246143e50487a55349bf38300cde86219d29199e2e9137e262a1619ee7d6f6c44b9551319f1ea8526f
+ab06e3313800a7dbb970145c1e89b7849db8a1e3169560fe2c64956a1f9d1d3157d531713a8d7c2213356b22fd3014ed
+a0d04163ae987227aaba1ae82f74fd1b44387501fa47fa61b66728a0697155f48bb44b9eb5e87050a5bdb7605038db12
+8e76d3e50853ba5945610251dd18736b8541bf72bd643f6b561cab1c028dd044c820fcf79a5b45882e7dde0ba6db164d
+967ec8fdee2e6d61f0ca2cc255f4e72c41a9c1a62150318be0fa508b424487d9254ad135fbe8dcda55caa51b9901eda1
+ae25c496f872f7380d9c64fc9bee0dfdc0f05cc1d2d6ea7747e166cae7e67c17a72a24a9e351de15f52baad355625d7c
+b8a95f3bc67ad2a2d3cfbbf2de2003b7bc894b3f99f0364fd181eb11d154a7193b1df9b671a3a8eb8bbabafeee2d1a86
+b79996f818d94842175b06650a1e7819cb12c96b6ba37e61fa14b67684c2879e7d3884fa6bae06faba009329db2b0d1c
+856e1478ef99338f144757fe4be68d935f0069a05b0a6209be2fac9ebc5cc669c6a80825d3c74801a54ff8b1a3777da8
+8024798b150aa722dc599f288cdf455479763a9bf776da74d5f9cf76026500e5a0282d840e5ae5451a0e28d507b397a5
+97cb767ebfc0a6cfe25666089f85e5a3705c108096a38151baa22308276ebf7cb3c04079ecd130cb8cae1689508d4bcb
+874ff07def0f8d32f2ffce7cf31a43e8bc5e633b279acd7138ae938e46889e486c092ac34924aed9a4e1f93a91994211
+ab5b6bec8c81133b6edddcd048fbd526d59fc8a1f5acd7aa72d07852696faf5e8d305e85077450188cddd43d6c1aad27
+8402f5173327a95438797cee3b107407e8b277759c942bf1b1f975dc63ab89b8c43f0f4ce2a11de6e5727e9952b8923b
+a5179a16297f7a0913ba61d69879014b9adb5e41813ac33acb8973e2b43cbc17a2f9a7d98210b39471a47b534f0eea23
+8f7cf3928b51b0b1bce18a34da935e7e2558595e4ebc50cc1cb698f0bf3c1ea0050aadbcec33786118d791218e1734b1
+81552a8927942591572429892e5a1572c8bc4fa7901395a5a2de3ce9f1ead122e4e5ffef6cc8434b3b18af1aa62e45b3
+8999a1bf4f22fdc884f9310e7a3f5baa0d32c04e887c51a20736cff3216f3dac5bbede43632d29704536d7f275b0be9b
+85d9952816412a890a3e479025d1c0c8858337498ae28731ae23332c16a788cfe51fa9836bee73d03b253803096100a9
+b6a736447acaa6f4d83998973cd2bc3e12d34c6c076880e6765513c04087eeee5b5dfe9394c120a85bec8fbe127f1f54
+89302db4ea39662024c748ff5b22108c0f34850f0fda476051a89a3eba0e02a2294a4511666987d89f3b3bbcc334fdf3
+88ef018d32e6b379cea9ce35d1c12af698d8241c4c7468a5d558099f5101f04ac8e49d09b6bf031a811970faf02ed0ac
+b33afb11f73195a7132430dc3961252251aef42150e9aa63a8c7cae724f467543a4afec289bf27e10ccabcad2f7f812a
+b706315deef0529725fa6c4520e5d320a028b4607d47fa6c4c8ca3558afd68ed65dc072a354d263d20405bb13ca119f0
+8ba035d75939c1a3cfc72a9ad3aa4ade105880345eaad9286a182950368e688a182f6175357a2e62d977ff7ae08959cf
+b47ca04b80107eefd3a596be2e990f5f021cafc6b7fb64cbb78802f9bb7bd2cec4f37755c451bb1fc8786a076e90bad9
+b6fb1676fbdf6cf95add7173c264b820042511e34dbcafa76273ef5e4500ad1208b274855985f0eff5196e7200e5a8b5
+8c7493894853f4e9fef5a0143dc134f03eeeaa10c80c5a72afb12f10ca5207df1c7bcefba6728d61f3f89d3978902629
+97d14d9debd4228be04f2352e57d9c8138d4e40228c269100930e2a3f6eb6e66f2f99807be0c9857082ff8b9a089049e
+86e327360a19f6ddc8d0362cf92fa84677737064a94d9d0c1031bae92b85abed36193428199b0f66720be0d6edb0d28c
+ac79bf758fe91d47d1ddfba62bba87f5e64d93f82309d4d07b62d78ad6ae95908e1989299db99ec52c5ad8c8f3d7132f
+804712afd93328864a52a9f9ca1ae148de26fdec7d9f51d1bf8c0385959ddfb639ae0904c855180dd418ac21f9a8a7d0
+a789e15cf3c1e911fca7f6759a2c5d0a281c6ab744f29709b8d0623c1fc197ed9bf56b89fb0953baf261ffc4bd8d1552
+b738474bd1788f326c5145ca2a468d914ead6dbc338680f62ee21b1e5fed49fa501236d70dce5363a72147b0a8974c8c
+a34019db5e8d5cb680a78c1692978ce0f3f8b21c1615ff65f3d103ed5a1e32884680c90d1dc18f0edcd8a506b1003806
+b1b1f26ed57a7bf77257e2ab1bf314b22e47f8a4f4c5cd154beaafdc34b257e9b976b26c8d9f1508498b6e8c9e9fd2ff
+a5f645d7a75741f536e5218d4a38ac75f5f2d759e62bde2c9b628a4cac299b477a833bca98010b6c2a8f30b85f407250
+b3947ca7df831d68107713bbd52fa300411bc14362c37c2617780f5d621e211b8bcf5fb7099d903748420818d840234a
+ad16157ac24899485e7eae71eabf9e4262d01b8f8bde30d7c79fd00ffb4c347d765bf2b4a30c260c9fe2e5153a3e1c69
+b1bcde4588570576872430e704a64d7130f921667c13101c3fb771efc1e0bd72c4ad4b8e35cbb98d709062257f0ef59f
+ab45dce0e29201e79cb1da61cc4353840eb8b47db99319ff7802d2e18f00e3fa8d5e70aa6a797684b4a6741277ae033e
+b6977424f2f5b968a4eaa9dc1ac1018ca51e6158a6a4c189f0adc94ea1c2f30bb33c57960a5c972a1800cca2650e2f6e
+899f48fedeee4badd5b69632f78a244756458529f27c75d05e9c54cb29579abcbe4ff7567445ccef96274c8cf5b7d31e
+a8225095071acb2610d28d9ce2645280a84c702f5f5040df7a4134de1144fe1a1b07d3e28d4ff5e2517b4b2bbae674f9
+b48316873f8245854568a37ad9c5fe9d5e6d9ebd60c9cbbf9e6f63c512bd8568e3a736039422d21d383378c77d8f10b7
+8b40afa65e47ba365e723b9e24bd4a13335455e059346187356ff9abe99cf71eae383ee33bc184a9ec17b32d0800f158
+96c3b7ad1e31b8d4ac0e14358655e21e687beac6f6b7b48dd3750641315ac7088352976e9804b9c625a712f9d4fcfc4e
+914dcb36d621753286340077d16b36bdaa1414eac7a8e7ee84404a37f8fadda837bf4c5a932e8b0f3e8e673832e9b3f6
+b20a438985a4bdaea41b98e831537027f4bf19ea9c1ac5fd37546eef117cd3d41b9c1b125d2302ae3d41176ab5d9e9dd
+94a4cf3cc42d7055b55cf58959a7715232a273e66ec6f83fbcdb79d01769f7e6b1e328f6b0a910d1f8cf7a5ba4934779
+a62b07dc466c2f83dcac7fa98215ce5bece548164e32b4bb3aac055b3c0aa68ef5cad58bf7d392e3b1d54ea6f0d9f0d7
+9870784890da6cb0223daa367163cdd41ead23c300d246d62debe980fc3e7de0b42576309ae35da914474b8ed2c5acdf
+b0f28a74169391fbb179ffe8647f3e6228e75b409c49ba81d34ce780b12d408d2db5968e9664b9de6a7416d2f6d1c1cc
+857697b0222cce1458ff591e1add39f5632cb3aa2e589a64166738d8c00855e354c2ed44c4cee8dd707188790fffe6b1
+b3566bb224742d0871ec5d15ee890755d7e6727aa7e2f374abe965ef8380b49422897545e2cf8fd3f58bc81f05abf173
+88271995f9c647da82820b042e59011121ac723b4d0a2e461cfc1351d89cc10eb7d18830adf1c7b9fca55ed3e910aedf
+863a43548db29c9cf35f24c1d5f7aa984ba21bb924dd9e09210a1feadb1e0ddca98df47e970c230879faa5e7434b118b
+af5c71b27157a2391247622a5029ba11d17ab4329001b01b3236f38d67ddd6b8902aebb48ee9c963983c16f6d8c53d26
+97abbcd4fff0d1ee2ea777788cc146c1b32601fd93a5ff9908fdc2de225b954d8fc0c9874c258dcb90ecc7fd169823c3
+94129bc418ff5d00ba3a3389b62986fcda5714ad25d25091db12a66e138a35a9e38999c4cf38fe7cdb1340c099c467ab
+8a785f303473e763578a5bff75a069764e346224fa2dd8ee3105ca779cccd5939ed8c21f7369bab9947a4ca92d3b605e
+b37d1644a00401b213f29191a238f4c9c32ba550db2ab3b4c9d1f02021a8f6972ab0fc76d0bc5b9c6291d5edb9632658
+8e42a2c87d7feadf1a2dad9dc822b40029eeb8afb785ce574a340929c4c6ddfe4d750bd3a482e62bfef1bdfdc36f5bd9
+8837b0408f48c8b975ae777b0516c569dad0daf607da51f187bc2c67d3f67315340848fabf7ca78dfa46b05e3fe33005
+96d53e8e9b14e602dec666fcbff8ac2a7ca0474605b294365bab5f5228d8cf0a17a772cf2f37f7de3607f7ea6127d0e0
+b286888ab9afd161a714fcb1954f6046754c1e3e398cf639bc215327057ae68ed69113481da88627839b551cb9660be3
+ae5747c882d3ad685e481b0b42907f0934a717ef5b0bcf110fe3125d40628959b879186464f95bc4a69d90754034c141
+b1ca38e7b1f87e4c878d4b878afbca750fdc2509f625a06871da830c1f68a6cb20dde7d51ec73a78454ffdf54451ed47
+82225700e9b32f416618b074479302629114761fc721ff492d792d4d1a4d6fec887185aa81395703fc8d07a67fa4d87d
+a132ead3cac6087bc7bf5153f29ea858a115249d779419e5c52f4d1f2180f4631caf45ab7cf90129af68bf67665b8dd6
+afd4778ab2921b6c9c3d3e2d8ab7e33882f7fde3c8f66d6704f0859f3bec468178eb25a103b78ab092de5b694f2d2ff6
+aa0123ab3e8af146e974c9fc72dce94554cbab212336c8aebe618ea082c15ef02c6b47b6c575d262d1cc6b0cf2d11f47
+a5e35113393e82c0ff3a39afc99a60f90993d5e4995e5d21a9a395ae31074ed5e2244214d4dd877c3d89e52fac6c4252
+b2f476cd5d9df15e624713f22716ff01790f2fe16957b526677bdd3d203fa8af98ae58daaffca10f84a7c61e29ba1d79
+82d6d062828337677ae19ce13d27ef45ee55270a27e674946c7c1c762bf43af6391d77454dda4dc613b519f4cde43636
+8e86b1803d4ee07791269ec9175dc3d3b595197c089551e5bec3edc55c77532235e64848aba62e43936d3e9438635f5a
+845b7233e40eab725c241853013d1884d782457ec188ff7ea535926c36da0893882fea2c9609f96b6d85392471b71d2c
+a2090ef73e125c0809f2bddcdd7b74b4f4eae452d76afebdf47691d2afacd1db7c6a3032e9a4c4ca744bb496258b8ead
+98e759616bf468bb4feedbebaa8df381d01cb4b0009a5ca5fc980426e160698abd6fcd2095cf964eca6f8d92fe1bfc42
+8a29df48ccec0ecb8b3d904078897d996ecea1d2db6b40b79fe51bc5dad04358d7f7edb6543d7d1cf0c1f54544c3d85e
+9422e88414d88e5d84b17f9d2f1c50fb48e9c5b8de215dcd7c52bb26a6ea71cf92c90f3004c4fcb34040eacf5b60b06b
+a643123915445bf0e528d36dd7f2da9a3b993f93a7fc9f6148049fe14eb5a0063575d971ec955aeffbdce069d0bc2937
+81741f92a157bfe12aaabf0d81121e5a8c7df2dae86f5fdba826167c4558103363c653a928babf4ad7e3e80634d26375
+904fe8e258be2500bc5566c3890a9372c9404935ba19396e8cd30289cf02bda13ff3d776bef56dd87ce57aba0a8539bf
+811997c1d70feed33ae3684eee512a46ea91400b39638d405a8bd6f1d0169706f48d1c04beb1c5afc5b10879390a1a0f
+a4fff30378dcf1f04eb97951b85abc0f5257b9e53b7bee814a5acf060919d73504db14d55edaf54e4030b4c1d7278c57
+ac84f2568084ee7a715b2387e3fa3b15e6940a27ea99b4fc9889c828179c55f29992b68d719323c2ede8ded3a4e16553
+8fa542c15bd29bcf72a34b3c56eac1e7d4e4f3b15b82672cd956d23a9b9863233816ffbcc6738a225c86d9dd13d1c3d8
+90d94517e7f1236e49ed6903db72c0de3098b42fbc76afae7abc1b09a903cf92cb1bb6a6ec8c29331e05b8946c2e9e2b
+916c0d6b1fb7c74c0001599211ca37812f30c309cb6cae529c876221c5e7187876d37268776451df2aa44f91a3a17a11
+b9ae0c4f0c00e8b07b489e015711346caedfc7cbbcb36acf3a2ffadf2a8f11118f93cb70181c27443d42634b2f2f6d90
+97a51eb35da8b67e82d55fed968ac9aa42cf2d1348ac146d534344c4c7535c29ce25dacf9901abcd7e8c43a83e34e25f
+b2f035822c552cfe3325da99f28aa31b847477a644402d43379947ee219fed751497cfffd3536c91f2474a94bf758203
+aa2fc0777c208a2efb2884dff33c459f2f6c9dd4cba360a65918c8604cb02fd493c8e5d26069953bba56039f8bb694ea
+84c63bbbea15e06775bd39f39995afc613586fcbaf32c9ada1410dfdeff09b8e7f3dd0c99b23c678ee72e44543ee6443
+8259332662ff222d4d2f817bb94033d458e650e5f6e2c31ca84c6f3a4b3d2e8d1f40593083337a17193cddd960ea86c7
+899fc292aafc17d01c06cac50a78edf1f11c8c3253f4b32116625537351a1e82ee3cac67725973e3563fdd73781985b1
+92d3b9aab29854556666588d94c3b49d159c9ba9046487583469ace7a6b8ffa61164839dee24d28dc2fd36b9387b6225
+b54f62077e1e42e18586a03b3d3fbe3fd680dda6988bee8aadc95dcde46c215167b261433d6cfaad8e2b3b6207662af8
+a6c021aa10019319f944f8a77455ad5b153a502dc9eabd9d306be3830a4fa2539e3cb380355953c3581f12348b919214
+8cdbc2c995699cc83768dd23383fe492a1bebcdfa55fc4b9d1113e510a6f4432ae55fd57db732eb56265dba6ad452c46
+aa474f1710bf6556538fe389694b4fb737713dbbc9c93d8a879dd3aee8e004c2441dd14b5f4cdd4a98e804d031ce00ca
+95448d62b1503e71d47ef4f5a01c60c938fc3cfd9280d7b6d3490ef331131130630425adcc53c9c96f262a80c3251e4e
+a4535757aedbf6d7b9bbea99f4bb7bdfd1c99d5d976bd8d4f8c69ee09c9902ea81884d8b6f4fc084e12702fcbb9e4b3d
+87796bbc38d5c2d9a56a65ca91a40530b57fc2a768e9e08a2081734bde163f39e069edc99e87a84b539606164993f30b
+8cb7647e60f023066c4835c956186b9e997a7425cc38465e95be568ab448b7303977c7ddaca73b78f6bc137f25e5e020
+90584dbd8f672a349682effe2f775f2bccb1911b06d20cd02f3a6e30311c6678e5082ab87ee47af72e0c064a43592bea
+8886147e87a552c74767faa64516438d6473ae275e72b4cdc174825696a4d7878297b1ecd0fe1a62fa4559ed232e9e26
+b739745959c324a62943a225140daa51faa8e41c8e20ebd68d6f000351101a89341641933dcb2ac5b3a45ebbbf7fb26c
+814f858b4c709694472eae1c82cfb7370191ad6d0cc5aad69084fb8e9d81e90ac2fae52b4051af25f1b806c273f61e0c
+a00426131acb84ee08684f2fc2a3ef01290e48e6b5f96bcb0459adb62f4190a4b2616eff2a2712991c48adc551ddaf64
+b37a1e92b72e3ba42b79dd997bbeb031a392e42606254965597ea4b8a2ca51f8c324619fc2b9f886e17b632ea3bee629
+90817db93eed264f49445d1d3a14ddc0d5ca93191b6baae278b4c48231a56b25725ba6f7ac0e9c7326755f0082b79587
+95b7f470ef1630dee768698a31398e8cb407df3b651a15493c38f6be6c7eb387148124a2cb1fe1237117617017c12203
+ac49be639391aa5dc08e8678cc690ff617e9a0ab40166285f90c2d889c87ac70c455a972e61cfc339db59be4394a0ad1
+a6f5a698508f8047edc45bd605ad4e88245de20013e7a4e51994e99fc60d81dc945504b24f23f7241f28059f4b5d6756
+a4d30a6db06153074871c6adb0ef4e562c1491c1f9841c110359dc41a3bc0bfcba3b49fa53c29b8258a814b8ba1ba328
+b25a500efa7d38f797395cbec660250f4a00d104459cdf7a15b541db3917e26bb7568526444d469d363040fd094680ab
+8444d11f8a0c686e2b22642ba1b28cc556ab7311686028e3fb4040fcce22959b7b6cf244b77c711ba86e350e17411823
+8ce90bfdfa93cbe58421be78e30e471b2c6e6beb1f9b3f85031cbe269305e18d25a2170819f2699346bdd735b6f5d664
+b73970a3dc993e28b71bc236b3391acbd85a8cc622b79e669109f9d3ad7ce7a01a8686e75d85408c54bb70ff9771ca80
+a64cebe05fd027069a18f152a18be155ed65b6b563696e395e045c8b2f0455fa75c2ff41c1247e596451b36ddf258460
+afec84a7a480b09cecdeafd025ee3ee02e3b3338b02d26cb3b7575ecb895057650f0955978d1d732ca2e6b391ed97728
+8caaf53038bfad6e0651e61e9a44a39027d456ff3ea46ee9d8e190698d5a66938d5c5723dd7bc75f0ddab660e178383f
+a91607e39108d2540b4b5c9d33d96328f56ce9574ac9d1d4a81ab5c938443c3d7014e19f77cd55ef7be0a408e44efa43
+a3f4c6629a3c0f34ea060a8b976096e6fd3a91c24d2b056e9b6b60088bb0c706e25dfb31079f42e0ec031aa840f46afa
+96b9c7d3f47ec35ab0270cc57841e9f3b3f5bce3d26faf6abf6cf657b6e949ce0bd1ccdcf9d490beebce722aea48caef
+abd2433b4003b7d861b35e99b51e2eedaea4831776e7c289beae2b561ad69a771233e3d6bc4a7f869d0744c5be61b5a9
+a989e5080d39d4031aea86c03b77abe069ea9b7fbc515c6a79c825eedd6a9bf6a0ced1891eed20edc605f9e25a691f74
+93ca5b311d28e4dfbf4de84a1e1530a9153599e0853c9abd3671a1ce04995e00f7d3092895461137fd78c72d24a99494
+8acebb0309595f4eeb990b7a1543f0633690b7469ce89884d5654a7bd2d2543f09232693a04e1e1b445e6e0041c8b242
+abe3858cea5a873a7576d641571965736d55d46f9040fec219803740dc2a5b43c72689e94c9b61d3c3c44dd3a821b694
+947cd395aef4faeca9b78b6cfcc8b2f8f361de884b29181266fd95b21ca6176e7944058e20cc77c7757fbca4fe445394
+8c2e50234c75d645f3c887693e2439ef42433eff328111b9c37aa3ad5a3b21678ee44ee2959a91610006b27a0f5363b2
+967253e02e34069ac676063aae9a493bc6d52b8bcbf1da6243bfeaa9fe05f8c840ada0a282df9c0180d05eb866402441
+a16a4c9a11686a5294d8329983c8a4aa0e6e5ad0003ab319b493842e8d072aaef45c3335d9a64bfde6bba120a48a72a3
+85187b866fbc72e5b42b91d76e7ec2647b93bedecb060b7475236d7d152d17f901c778b704f7c2c1d3d269341890c233
+83b192d925e3f4a1fafcf22cb48083b2f88632ba93c1d498539bbc4997f61f74a0a3b8d4947253a0daaca8999c407b87
+8338eb3e7f549988435f4f618f4ae1942c6756bdc28a80dba7ccc530bef161c0bbd20f77c8c4d63c94e60bc12f7cd387
+adc869c5acec5e58459eb804c2141e03e3582ce1fef7d40fc1dffa3ca0f923919e291a2ca4a60129e2a470cdb395be31
+9279068c28840f2c34e48e9a7e7e9406907ac14bdf4eec7b8c28ebcfe16a18fcb047015e4309f19e6fd73d6e6c454157
+98c4fb637a868f161f2f4222f93f3bdf13a61ec1f4e4c20435c150fca1bc0c01c790da91afb6227ed2a6aa540d70366c
+9209fc7b307f40294bd9cce166277a7ade9c64277c600b3ff09579fbfffa471a887061e9cb5fac97c423eada30a8a52c
+b1d63569d5d47d052f3a6e8b2c390bfac1e92098291a2adb209f20af875ebb2a8669533155b1d15b232690e26d399ab2
+a2c975c004e69e7b0f22636141d34adfb2dd1396c7355e95fcd0493e931eb7eb99b4df0f0f202945d7bf837809a29ed2
+818f48e65e337913c52e9256af134f4311be84dc332e3ac4cb5ef659b9c6e9cb34f04b0bcc0e2a3a574c9c3cc51d7368
+b92b63d0b363a368a348a4abb10661c38ced99a3132afa6cf002b81e6cac26f862c9d0a6886aede555d7bc453753cd37
+b4051275cef361cdebd254115275b0b86692d3802241cae5e2c75accee7df98d3165cd1de86226f382e736b12d9dbac3
+ad89d85749c23e045bcb95c3433eb8038139a51c8edaf06b5cb235549a2f9ad17589097ff8a350e934c8662a8879a3d4
+802010e6dbf4265cdb5b5362c0b197317f2435253237561a3a7bc6766f98b129ee06d370382998ae70080624fd65831e
+8ed6a5b601a5ee11e983035f3109075444b063aff693b3601f87c0d76d2ac253459de48d0fee32330c3785d38eab5cc2
+a6c8bee787c4b87137f70c2c54ad3ad0955269c7ea57ddabb1a215e613e250944cada7f241430c0ef09f8eee29fadaa7
+a3fc6a643e1ce110b08344f8913ea7f8c9e44bdf1a02978df8dcd3671d9b357397df9857fb11ba220521d1ce40064ee5
+94089626bd9c81247f45e25e573bd6bf727a0e1a7dcd630dd5e661f65d4b6f35bdc16b64da648dfda404b5eab39d9152
+88362a160a95f01026a2e52aee3521e8496340f96a35351892034198740d8b6159175c60b910a4ee05af488dfa578c8b
+b55a5b875f5594bf41949c212543517bb1ce34db3a896f93d0216813261aa95f73663c789ea0ceb2bf8815255bd328ca
+8f9acdca0158df5ecea4d574e0ef0c256ab271d9d3d3bb4100761f5062f0a1a5d2b8a23685097a1a2b2a08287a2e2c94
+b6d4e3bd49a17fe7d929b41fb223eaf93141453f7dc233eaa74424290014a63ca6a099174b687048d59cefd41fc720db
+ac0fa8aeca20a0b4189e96c57c85a2174338550855f9d0ff0c553e773a1a1c32fe3f8db7c8362bddf601e41380c9177a
+82f05710f08f12b206b2ad6a2d06161c884b2511ad90b43fbfcdf54933c2360b7c85dfa4f598b5bdce8809a803d483a0
+a2ca711642fd498cfeb897e4072d13e43b5cdb2480449975188fdfbd4b471070cad941af03a2dd8938d3c376366fd199
+90c27a1df934339bd0821cacaac41fa70496900044aadfccf6e5fe28ceaebae5cbc500fd6f2f88c5552b7fafea79d06e
+818651b7c7a6f691fc47a61ae4960bba7239007e14930f3a8cc9c95dcc0b03643047671f819e30d89c2d1891640fc13e
+a88f01062ded714e7f2f1523644222cd8e8cb8e535eda88738f4b4b19079f4f7be664abedcdb618ad1de3e74689042df
+8174282a183f3f393667352fdd60460d2199de16752c372a44465f8b71ca134c410d1d81f15afac839748447875f8643
+a358c3e53dd70e1a608f36a1fdbe225e28c13b5817dba890ed8e82adcb7ae86fa68ff6cbda7e02e8116c11587ae1ded1
+8aa0bc208a84d5a58b0206a8fe5ee3c8d224ccb86b11b7c9d924e16b2853a6c3623502dd60b94f8d720810e0079078b8
+8bca870eb6cc5f7b5f6b84f88b49d9a3994e61ca3f2ad963f28f925e58430887f5362ed4bdc2a2a38b5fb9e774a75cbb
+ab86840fe84b1eab81675eeee17f85a500dfcc95dc4872e57b39919ccc71b702585ab9ac66146d264d2bc8fa39338a72
+87c46966a4bbf2523dde607852a40b26cf3431d0bde9b2c609997c0f29c5932d28014026862abb7d4107b28ab8e2ba70
+a91666a8c846a9944ee7ab243ab535e4124ca8bbb756777609aad848527b354060c484acc19c333459c09012670f03f7
+b7145784894c6df87d2ce6a06cbaa713e46097b5f83db60e5449e62ed5bf382a7fc3136e5599226a2fe7951847527c4c
+951bdbaaa06ba8b427fc4ec6bb44e93e70692bcef6369fa06c7a6882227d27f09465f37f0a5868ce43ade188a5f37f8c
+b69662dd5dcc9ce7bf24be8a0e85e80c8e5af9b030e740796f91de548569bafa2fbcb19d98e13900c76cae3fb601a8ca
+9630a7eb15718a2324518f78f26a71e3c801a8e2eab3236be7623807321c128ccd79c74ab657ea8e115d6ff3078a6887
+a2f98c2084f8cd556cc1bab19398e98921ef56f6445f63444384efe5d7c895690c57d0d94cfd24e99f63f5e31859e34c
+8c3994d3cb76fc6ac22ba2049ea4547db92ef78f009d24f08695b282c95e395f2c1477bd52d3f569d64551aa5e259b5b
+b58571076faaaa547df9522b48c684b310500850339d79d2349dd8211bc2c8307d13cd5bb7571e0b5baaa013b502e410
+93e07feb14f691e66be756b37467f290da9a6677b8ff565964f010fc20ed9c58d8c712c4abaf012c787bbb22cd1473d9
+b4bc6159db1578111190b19aa678281eb2fcf7a82c7f699da7473720493e66e0ab54429da7af24315ed9f7399863c954
+93cfc98563f25b45c15a07780ae0a38c4ada52ffc1350233a3b45417c16cef92e7926354b761d0e0de55aea4c1314406
+820c37c923807790d77d2cec39f0eca63fa3ac6eaf0a1978522f0b1d293a5c46af3a0b4ca542cf39e796afc1fb3d7195
+b87fec722faec6a739355fd30a2757e5d184c07b5bbab8581b74eabc2da413faa6d11ccd65cc93f886c788239b1eefb7
+a183bac7f647a0c15b14089879a8aadb712f079bcf2078d3c65851137a00dd3ed7e47263c064feb19362f98180aa425b
+996233b2010c20e0246295735b6d5b3e932f2aeaf0b35aa3dee66b6296f39e2e7ee95a7e1a15838ff3389ecc8052e315
+85c943e09a6c77e15d49ef4fe57d89744fcdb705ca370cdf70b3d84aeeccbf2155868f6790333f88fe36e08042ce195d
+b88f82b35ae14a3e6fb972c47123236bb7db08b9f9f3828033fbf5a895b09b9b0de423f1caa04b3e8e754409b21f3a52
+a12c957409b6dd335964532ce3c045aabd280188b4d6ee809cef479e51dba030cbecc86b0ea8777cc8828c087006c5ec
+87227fb4299efa535240793cf0079e952e971a18ee62cd71a62d6a5db921da669c5d8eb1bbda318ed5f3b03b38798a73
+84b5c7585fb1c98d031a0bf6fa8ad5484c7766025af552cdd72e7ae59247deb845f8678862c44ebe640a7333cef8391b
+a94cdb0f42ae3afb4b1878f960669bd99008c7ddc24f2fed45ca521c60472e5587fa9bf97b315efee1f74619a4d9b762
+969a9bd21a6a90aa30fea44e397cc88118fd5abeb68839556194f9ab0076806aa320928a8ec94a47c4eade15498f5175
+b2fb215bbe7acc3baa04b0aa9be654afdc450faabe2702a0c9fa760c9e9389a58aa5e3a4c6af4f6f5c934640d90b59d0
+8be6a43071464e6c7dfb0e9a791a658214c1a95adc88f144d8349ecaa0e76b8ea5f88cfe95e82694bc170e49a43ec4cd
+b75d56cfa1f3b61428d24784d51dd65b78b977bbb52cd71401ac7d3c2643f3dc097d6e7668104af402cf7e7e6ddfbaaf
+811005c49d1be377ebd2fd3bea9771089a0f5675c55e9da5f31fe13cfc9d1ff8520f085918279ccbdb0363eda16f8056
+a487f7000c16429f2b7bd7e8bf4990bf26f666f8aeb11a99114d33e24f946cb0e3e025ec8c0b0721f9be101504c8a1ca
+99b72e711ba7b97083976b2db7b97346000a78bff9b20ed910eaad02f6c03b45fb3f0f1217b328c3e2d87b481eaab52b
+828429d387a0b83ac8e377b32db1c893a4555ca253b8e3159399cd053c5de726655a2ad39348c8e7ef11b37b0bca78e6
+835de10c73da7f0c07295a3306ffb18991334c86e5fa4c6df2d8091e8989f6454c8b43721b13696e1f665480a64284de
+a4ea48f0cc5915993c83309df99247dcd7df4c15c723d168759175010fbe8d84adab8393707cb338fb90a6a77b69745e
+9976bc842b06ffbc5afb309eef8964908802e9a5c733de4a8292d5d5773ecafb6daeecc63a8dc8847d76b77d4c3915ef
+aae89156b013e4adb4bd8e7b6007937f0ece09af077fd407798e4155dc09a129d44fe8f8b5f6cf6b3c84746181d7f4a3
+81891cf2d70a8c326c6870a8158edb79babf302b4f9d51229bbafdf038cee39b97f01694eb719df99a62478bbf909a85
+97bdcb526108ef3cc2205aac074ef3001d528f56b4889573e0f4a3a2504232adf23880f7fa2f57bb787ff30b89599da9
+9778949a95fc663c742e70596faf91ccaf8b5b93b78bc2d4993480722ffe10bab3c8df3ae50535d258b6e749a0abb86e
+88bffdb927dd88c1ba3eefe7da3fd6a42ae494bf282e094893e144330cf08e3f518f47aa1dd76d6f249cf83e6bb9d4a7
+b53effa345fe59917f4f1ae754e9f6b8fec9bd34cee85872b3fc47e52fee29c418b9406aa50c8d5a2e853d6f2056a49c
+a616775e7e77e846066fcea413f0023dd491d8176dc450b0941368680571cdd236f0f83883d268842fa61dcbf3e4864a
+8b5ae13dbbd07ad19bd2c7bdb48eb3c760244fe0caa73d28df3f0c31f5418f8b06862526f5a84bb16b2a92eb2c7ebc28
+a62294830750dbf43ea497155b185d611d75e767aafa8c2c30256f8a4875b6fdadaac429e8363848b39e964cab2aaabb
+94b6973fb87c2efef5efc0e7dd7ecff5ffbe76320fed8a20d730f9e3751efe9e5db39981f45477ddfe037e18cb971930
+b931b6f789947b5298c258c8f0b221ca927c447f190f0d8afe2f18ce9b90979eb3247e77e128a1d6c57d3bf5523e787c
+968259d9d001a08c0329bc19b2438b48dceb5942bc6ff9892d78fc36014f1b60a5ce7deecc7a808e41aeb4e26143aa41
+a52c1906f103e3fbee8c12fecd93f7b7d6f37eb733147bed841b32caabc880fd6e72884380a3cf93129d9800ee7877a7
+969dd12f0f6ef0b868e21539dcba5dc7327033eb546570f5bbf91b13f9c2ba6070da430538c40bc53a2ace4794514038
+a853a74380d78710c212bcfa92d3f9c433b8ccc6936356f3bdf923b8e420e1017bc530ce73bb8d04bf7a25b20594c753
+a84dfbbd3d9f409badc8ac2da5a0db98124df9d01bd71b1cf5b2b9c32866309304848a4bc1fcad1130bddfb9636c1b56
+a9599f55173e77dad54cfce6ddc77bc48588f36b79a98c156963a2f5397262ae07634a98ab9bfe1aa6357f78aaf89d89
+91e429b5ad0bafc09b5eefe600e179ef56f1ee045765ab3d5ecbd73eb201305a6de4382038b1350abc70bd1435151a0d
+8785056b83a726622c565985e815847b63745fb66b138d24c985d6f42d5762c61ccd5172d4a3237222c881e5f036b98d
+85869796ef180f500dae84f669b76a9b245e2ff4614a58d74820c22e439837b7d9866f480b72d88f44682be54c6dafb8
+a118baf9c17d85e22ac3315f5ba9aa4e230ca2a031906f99bc43fc750a0f96aaa5e6774d1cf16b492726a37db7b51327
+ac8e33f32c1cd14c6de14e75f83b8518bf1bf6f0a70e23ea0e5a29f096e2992f1259a121bbccc5252b9668c605240435
+97babe93e2016d29af74f776e167d82f1cf2242202bdcbaac4a1eba2b3fbd9e7ce57cdfbfe799a0f6a06a0e6838c4e99
+a70acd7e1f159adf7381d3f3ec2cc42b56232601f18ee62fb650e13a80954cd06d39a57217ebf4d8927e28c910671ae0
+b33ef5c10d0588df0b9d2d963912b294a2375a26bd25225f002cdc206a1cc058465c64180d348cccc899baf3d677033f
+93086926eb1be21ab929b0098767611bdf1a853b6b67045c14f00714f806f8655be37150be1da05c5d2e6d9c66057bf9
+8890aad532a6c9b818ddb9f1ea12d627010b4120fd4969bd239a9654a05116272d4cf783ff8256de337bc01f9b4154d5
+b878977630f647a5ed7c99f59ca5eb653cd647277b899b918e5f667eb17b6dc433b56c2f3a2a18a785a4b5a9ae95f372
+975582fadbc276c9afc4d8ef767a66684df5f56e898d2a8749cbc2763982c013e5fd0ad0ca7ebc67758124a609b59663
+ac45e154a651857f0464db38afb2fb25853e8bb1eb476df31908b13b4fc86491d4f831c0a15ed6bed0c873b3dcff55e3
+a778d373e361753964a7fe4e1d28702c62a919e5203b941b04b0e74cdd3b4e838cd9b6dac3c39dd523f3227f1b5e6766
+b1bab7994941f8de4235e2e188b302bba847c1618ebdec7fb782241e9eca8d32dd506d254d865e0319c66396535cc484
+8c4ae5b346325f1d1609328e41d20108c4388bbe021361a86a1f9681caf1e6fd64896d72641ba8c984e153537317420a
+8cd312c6a23e56657624d21f230a2c22d102badbfb2e38a8c067186abc5a459d0c78433ae7b54334591862c18864d7fd
+8739d71181c5a657c6fcfee1df71756c3b6b8c48e8d97460fb64eb891abfd23433ccd08574a677fff600ffa5519a2363
+ad3c8d1e9eaa6f9122fb14d323318bb0338c5f9f29c719715cbeb15a2738493930542769b596098a5f505359c0314381
+a6d78b78227f8c1203e502caab1213092f320e77a6e9729e1659cf81e981cf905170e99b56c4eed1326320acc6aa60fe
+8e5ba0e69e0f08a49ea4fa28ce0792f7ff6c032844ceef11be90b2215940d4b0f3e4acd5e4b189b189b0a0ef8045aa26
+b7b31957e7a85a640b851d4241c7b2f6af64f59ac221783b88c1b51cc4185f5ae6446a3c7137ee072c2eeb97c929d7ce
+b066bb41c5818d6008349dc6015ab780633cd961b5d947062e14618c1ee1abfe42139c86b77e7f5be0c275fc3f5b8909
+a6597158957e1a0af153183151fbc4c73bbf8156c77f7b409d0f97470b5e127beee6d9246bde770127d3e3ad400cddd4
+82a6de6344e5bd0c5ca95f3be1ccd42fc974403269874603944c08ae1cd3ca887e66fc51ed61da8b7af3cce02f152e6a
+89fd363aea11ddb2dc71288bb534a4a6e32feb5b9e4b88d132f4181f2579f8f8f39d19fcdb3d3d7ea118b9f4431520ba
+b70c945986c8227d239201857e12cc7cebc932c3bda8913c82b62c872b18f866313738788e11bddd630bb5953492fec4
+b4e3a1e8f82d988c85cbb58d9cec69bc63fadb4c1c9a09f36b5a61f1ee96baac1a9458bfd0f3250e1734ab3fc6c0a0d6
+8d01d1eff496e8bdad1e6fb4b60e4bef0ada39a378c8b57cce2c115e611e0c4fa54f9b599e4c34dac925bc06e940eceb
+90857123505746f7bff08e03b1a90f67051a71ba47b49e7bc63f1a8ec30e02a98aecf56465d3b4746aae166081099da8
+98b9d3b7fe1d5449bf6498c30036e3f60c8b90962fe04ede9ebf605d07497f617d99d51f0f0c0c14381377de765ecfd4
+891e7867e70582ade85730a21c19f6fc239760f76f8bbd8c6dafeddfaabd6fa4845f62d649b454fd3af8ae7028ee5f9c
+945136f71f290d8cc6bf282b554cdf8ff92200feb7901987a1348f2d2edd3bd7b7bff6f57ec25fa302a27121a1a959af
+b574d8379842467c5f3cdabc2da9a45e5a6083efd7298b077ccef2c4c3bab03abf1dc11507f4c896d745ffd41e4dd319
+946fea5c1b1d840c10a5a732c7dc23c2bc5eeeedba6956f85ad78fc1ee4a95b309c0d4a4919d1f7155814e3f36fe322e
+98befb2f7d0a860de662f28968fb6200cee5a33cd7a6c376405a9cc6f0718b90fcc5cd5b9142e84e95223a3dfbd10f29
+8c5f208ca23aeae44a056bc21e04b570c13bfd49b14681cc085d5b318e62e4c088f0bea9dde52376967649919b59829b
+b14478442f8e985618272d4c56d43a28e10112ea200b52fbb32b19a4d1eae965fd5ee1e9772416d52dc0e2db57d3ecd6
+aa308b19a57159ff702bceeb69a385f91339db7e683db991b1414bf3af9916d8e52dec4c492d7e8b5a5a011680defc1b
+a8ac18a1adeeaadc192e15b7e92b611c936ba9cc9aee01f03c2a236827ba527039c719f16149d7aa5fb297cd63878766
+aa09af54f9a5fab6a61552421c13ca62f99fae212a9606f8a5a050997271ab6dbc763390bb98d90b1af3bbe9e8d9513f
+96b8ce26b346a0d3fc99b6e463f0c619196cd85340b795fe1c1c0cd4f1b3a9f2bef5454e0bc7d51d75ce26f217460602
+a3efa46273c392704ba0718a44f306edfea03b1a6be0bc1e5c67c62c89671c650eb8ac9bacc35372ade6bed12321f1ff
+b484881108a43a1dbc16a6e7369a04286f896aaa1dae847b4019fa287c18e9d82c8ba4ad22cea2837bc220524a9a7a17
+827b63d83e15ef61d54dfc365ed8a4f9e200d526884ec4b1d35032227245410ad7e1b1dd3c1d0ad48ddc4720f0fb5e1c
+b513c3ddafb01b6189590b74d20348db74e400c106202dacd9ea9552ee2c642909a7a73ed7ab45a986eda3a0701be79d
+831f4030463c84cc6cced28dfce0b3e6b6ead01afa200ddffd807f31ddd4ab93a8699ccc9d26970407628d521118ba6c
+86312e006a800720329b82f6feb2934e2cc156958ba394278caa6766ee10800d2fb8907aa92346dcf6d389c4f66f5e1f
+ab6841da372a286fde1dbbc57cfe967cb4bebd6fe2ab9e317cb9f9eda04a4db0d5844ffa8db72eb9cc6bf311667ff6e5
+b8238dca3f2be29bfc4aa65a9f59bd4e2c17fae78114a69bba1170782b993afacee3755e768317a923fd32d860f6a74f
+923c1b60c052a3ed4736da7e84e52b0e9e154627cd90cae335dbdf05af109ceeaa016954d6e47fbfc40d9d5649c198d9
+96a69d18c838512d95d97735263a8cde752b2bc790b3827ce048e177a063dd11e2a69b86b3184873503a68170b2ec255
+aed7c3af469a93c22afb47a904bc70b7d88262ecdad48ea6a6c07eba7398410bf5a97a786beb11843cf40ddea9a37098
+a6b50f6369ae558dda3ceb8cc9d99382a1e62d0d9804b903086845479b9381fadf8d4595c2f342307c94d09e02e0ba2c
+89fd703d457580a76544bbaecf65f93d3335d7a22e93d14afbaa61e5236d9c8d8b005e403e9f5e7a103b0386971a5e65
+8e909a3638208c8f885820af8bca6ae839128ce0d902a2b7b6f9713d21da8c943a7984d9aeee7fb104df4cbd1092967d
+b41e2d7a1a0082eef43e886eab5e781bd961a83155d6a14d62756ab7144a208f4e4574d47d2ea094a7fb50d0ddd7a241
+acc6c63450d124014a1db846bf578c44e910436c83190fae428fc3125ff2065d4c6a1165aea799b46093a86126d4c483
+8dc63127435cf2f269a83024b562b3f4da18aee3399ed5255c295e6b80c357cd8f1887de94bcea29f84db3193570c417
+8c4cc72a98d42b9c5807322f596ac0b48b08b16ec956ea4a70c641a16a70895644e5b14aee85a4046673849249115abf
+992afaccf05d79a3147d2985970c1793459130ddfb18a9d31f3036c260790109c9ee6a19a812f5d55779c2facf87785c
+91394d3e84649cbfe018d9c709604f6aeed53e91cd57e2b29d0e84aca3c413f1e0135c6bcbc70784dc8985a30b9f3fb5
+a33fc126a8f9652c6905b1f522bee45848ce42d7f4c3a4cb3f6ce0e6e64c82de74e175c2ab6b5a867a8d42322d257ea8
+962d5fb816010a14140767c2486cd629f7793b304a96cb82ab85a867bd9a407bc8ed44131f87238c34a1e4ba41adb1f4
+b09048879ce26a34f56e1d4b2cbd6eb2a55d4ddcf3738c462329ba6726fc0a21b8c1bb55169cb8338b2debf20dc0927f
+a9f9ddcb86b7427e268973bc7f3239212716df394394fa535b9fa5225b6191d234a44a126766eb470ade18c469a2d166
+87cba6afb115c0b3a515b08cc842e7cc2c705880c82184174837c0a06e1687ef668609c2ca080840fff80282caec7390
+ada109548c449990dd8f1bd42c9cbf194a62625d165416ca469c334222446fad7a743b1f584ec3f20526c3c44d870696
+a69a0c58fdfac715311dbd37c4464f0475120362234f5366ffc65227e8178e037ae91efa5a52cda5fe28243f47390175
+98e726cf884c6f706fa25fe25be154afaecc0c3bcfe682a85afed225bb44ea07cd1767b4d9f2201358ef19770330f0bb
+988ad5bc57f0621e3ce1256720f1161e785371fd478c467c39e554e2de27df5ab8176508658aa90ed7179bc212ed0dac
+ad0ff6dbfb397da51fa4d9d959ba5819adbf1a1ee31f68fbd62ae07a9cbce0641588cb1008dcd0056c17d74e83c7114b
+94c703cd32b9f52c41b07aee3e3c19b8c2b4182da80487ed7991d568ea8827f0cdbd1e977d482dbc102c4de2058903c9
+906fc2a06cda5d82445e50bf475dc4ff2c17e64c982539c26545798f9e4dce0bd4daa8d55b027cc0a8e1b26c3e45cb08
+b09a51f22a9a24cde25f805cb18754e27d3d168e64db4ff13a202839a81c69dee8372b5872faa0d23fea283609cf4391
+93c908f514e97502d170310bc495d02948d99eca51e71f9a4779ebabae1431e1f7ba465af485546a9fc97c025877df50
+8337859db710ed7e276a47e90cb3912c829151cc2bd3dbbd4dd04acc90c9cb4870c44f4233b407db8240a93aaaf7302a
+b13b16ea0943e235f8cb064d6dfaba9bd8dac67e9b6275a4c3f54a1770b9c905d8855517415ef6489843848108dc85ff
+b28489f0de1a76839a898b8d2f302c95610f17e893a6e7f2e824fec773cde6f2b219038a3f1fa212bed98c97daa66d5d
+af13afb48d56caffa32f941ac5542ec2b7fc0d6dbc3b16e51bd2a8b633f0a041ba1e098d9a68c470da00e630f08f24bc
+81465afadc45ec24825cba7c9edbb36858bd2ca8f8b0b9d7240152b58a411b08503b530932e7b6ec3b0f8612869cb244
+b2e6b7438fb6f70b52b8726aa870f18191920bcb213a375817d100297b507908d79567d0c1780b3f25be807a8ddcb853
+aa7ed2b0b2bb2070b5f001578efb3d1085950c19f9d06584a2d31e1c235e6d6d1d7f081ca6fa2b0b0616b01b9a467005
+91a245f1aa8c8ffe03f7db1412e5466f0345196727eb8e6f98b80c01672e4260e90724a538d26b094e678a3d85f2dda6
+b9ecde963c8176d6a726b129f229d803d1a6259533e432eecd7404703c972ec7296ba35015acb1f4b5ab2653a3991902
+8cf535bff6e98f75d98c5d2a691a5d1aa645c7ea18d677d07d3a11a9cfa222a7b8edd048529d163120a5aca411161314
+ad2e51afe96dd0e942a7da5a37587ca1359fc17cf66ab70cf37ab70ea34f90054fa52503d6527e89e464f8058f5cde79
+97337d62f83ecbaa1f402c3964dabfaeb279b916ca08430a61fad6c31d60087c7e3a9decd541651a2b6e68fb2816bf45
+898b7581288bc7f97987138b7481d29e2cfd5255ebef133177d9060790a0973ba07de62cdf38568c336c237cb084b7c5
+ab53c0759663bd976de62f9f98fc82fa4f58c146b8a6a3053d4dad836c762063ad69a54d51b5499e9def86f8d4bd7ce5
+b35ba58109d44c14be159333b999c1e471fb61f5ed48f9d2a6bc689eb045864f3fe88a6ecae12315183703e2b1fc1ae3
+858a20e233f2860c24c5a3f4a820cac7544eb3ce91a2d8284f12013b13120121fea3c4f25427c3524a1e883aead429e6
+965be1a56adffa51f5d80761327cf69656e6c37577225b36a34afc2f8a959d8799ad0ecc3eff4470d49eb22ebf8f198b
+8e575ee39077bd865d70fca2d93473f51dbc99ef4f715f4a3b1d9eb21deb2afcd0873b4dc53035b77e05f52029f069e0
+a5c670a73da241f5888c5cb44c27eff2b8ad3f491e0b128e5f1d498aa6d76640c9e625f3c5399ad8e99b666e4b2a9759
+920e1524255b03cbe500edb230696c55b7774963535c063121c9e9987ab74d504f2f1cfa14ba7ca82a6f66745fb0b392
+8a0bb7cb267b8e1e0cddee208734632b28313b3ad89f9c2168f341be5390bea3f09eaa51f8923b87697799a53201dc26
+859ab9b3cd602e78dbee8d8d5c3a9eb4270f130ea4a1b417ca5612be753d20106cb2724097840ca8919a9a96e73f96b9
+a76126d9a997fb0e7e2b27ac682dda1c6b99067313371387084be1f6e7a9a59bfac395e91f089e14cecafd151674a446
+8aeb466c58e2829790975fa08dd31f18a51a63777070d2e24605adb1a77b5e0e5c5e0bcb483076d23a6fddee5f402f8d
+a8959f312f2ce0d7d974a4998bb709bb98ff6456413ef4ae9bcaa8d687b8b5ecad91414bce8f704aa44a83d8a0c86462
+b9545c8567827fb28d070624579702ab96af4f06fce515ad880893b97ad9a374c4c91d6288e2a584ef14b1ce4930a6bc
+ace41f9c2756ced611da16e21704a367b122ee1c2feb83145103203ace1a5cce0ebd3bf295caaeff05281672c92574cf
+93b90e75f56601191e3b568368bf1d24f97512cd42cac1da8b42f0019e07fa04cd5f835b7e9503fe4702632df27ddc19
+973c8feba289eb473448c32b141ab4a6f861222626b3f2fa265a431a54675dfe5eb479100a33c172ff935464d6e85f90
+a6b0798ce89512644490d65ce3d0441ad950f9a25f6fe2c9a766a58b9c8222fa6cba753f314cc7ad6b6e3da881c67abf
+a79c560dfa179075e0d1506adf5082318915c15048328b15ddca5748ebc6ed8b10fc5d7a50bfaf8942cf9ddc6912be0b
+8841b34df170519d07edffc4d33a0e70c518dcf53ea8d0a9f13563822312a65d16f99cf596bb95eb0daf85435d4bc0a9
+88527539258323edc2c296dc742cc26b9a4a984ca299a81705c702a425ebc7345a79b4df84b2d440a1e73a09fa18b5d4
+88026753926a068e1cbf49a9a0fa545846cc7ca9abc0778e44f5b7510c1b6b73e9a9b1aff754199379522b2a985c0881
+aa2c306ccf91f967b5cdcb50808771ede36acb9a6cd84fa15c6de4c873cc2d0a64e79778a2822a109b41f5205fccc30f
+9751fd8bc2a07ffe0566e5587e652d3d8d5250517278bcf8754e14717b8941c07c194f14fa757f9a2f3461ca6376bdee
+919746e5eaa18b734ef59c0de09ee8ec65e348efa659219d9eb6a3a77b8edd9449a6dab727e9860ca0d3837b161c0352
+a271c146794d6a65c6fb87797262c22b1d938ecb2624e03809233469296d33ac0de6909183c8efa438b5f3971c8c3eed
+82fbadd9049248914a15755dff692bf689eb2650fdc6e44e8f3ae003b8f15a0f2858c7a2a8dd137b3448420c5f434229
+b90992cad6df98d2fd1c75bf90978205280d993d439c44d6721cb95d52eb042e01b418e45c3c48ed667aad577f3fd1c1
+a0c3d1e8b80ed4a979a22d6a9647bd57f22ac8d73c37ec3d56d06dc178a5c9d5ad3ffd6dba9eb7844c1f40b8c89d3d33
+b513aaf2f0a07fff3543d8687426d07773677ca4d23554ca517e50bcb891164d1f5651944a2f6e0a634475f6d33bf0dc
+a0b179aa2ecf572ac4a3ed898aa34679be3cf3d8d9bc74e33609345cf1743e915124a59ffcff41bec012ed2a99447e6a
+8e991c5549126d64e0b515a03d266e19097eee38d08121d942973d568f8ae23a15b037337cead0686f7c944b9fda3e39
+93cab29e1bb116a39ce1a82897776da1bcac06ea131a7dd141a688ecd4089c5a0b8616d6721b1c6d92309ae0820a367a
+8d4e0159fd3534172b2481764cae7746b1a47e9b7b9465fcec0824ef234674fc567c16ca7116dc90ba9b2ac3eef28d60
+88cbd9ff6ca551a7efca30b5f59fedaca8f9efaacd4e9bdd17ef0dcfe4f3449b52c7d3066716f3e7fd478f264d10714e
+873c71b2feef5230c31f13d8425f8b0eb0171eacb9225f484a36da3cc796d62594fa4771af9ce1e7ba951f5377e5db76
+939eb99d7fefc9fd5b3dabaaa5b331365121374a4ced862b8cbe0cb3c574fb1f0cf4932106088a1d87522acc31ba7f77
+b283f1d54bcc72e31ef572498821ded40485f38d2ffc67f70bac68a100612b020a538b36001d94228a4dc97da8fdaf17
+b2e4c2be605c8ab3038b4e91bca7e77e127c5c3106913ec1341102e138bc8aa1d218c3d3c2ec1d36fb8e044b4bc211a5
+82e73cb5b2cfd78c17131e871e92026643bb56916ae64f009a009555903df878fa3a2019b82f7e71a3ef7eb503c792d1
+a6d828a5b7de0e7818975b65244f6efeefc712c29f2f17b27f3264e19856d869c350ab39750ba63d6d46afa3aeb369fd
+865b17027e9d5bdf2de0afa2f524f67b6defed87b14e0af5f4b6b1966c2de45550fd2b6b39b1be88ee9cb06e755f917d
+ac8b47f9b7e675b556445d103271e6bd3b39b94d15ee1f3108fd1b777d439c75437c78ec3b281f7104af6d0efbf0ecbd
+85c2f71ae18105fe499aa4da0a835de3e92ce05d0f28ccbcffdd2860898ae9909e1c05831ca4fed96545133bb3170302
+8bdb4a72b06562591ee44799bd7400ebe71f6737290420dd4ba2bffe0050d8ea4d586b7e329541a52611e945ff1b16b8
+aee4843c9ab02026ae723531112170bc7464f51460bd4ba5166fed54ecda0f53342cdf94f4354a5bc1b941e8ab085a80
+84de368006db07c89a7a43b7de54a63637ed72379a41d029430f6b4ebe404866896d2e84996998f7b2c20324143649f8
+a8375f69c01289cebbc97843f417d0146f68c6416981032bc1f42d3e09845d5131eb9b4d68fd0ba7f5b1223b83e51bab
+b1ae126dda1a88fee9265ed8e5bccb810014044d83c70e01e7f80059a685067f4204cd15809b230caf5dd77738a64e38
+8177544c7b1f77181735c660102da20fbf9a2ca4efa79b21c92f1cd2b912630aa6c830b7513980656bd275097be59d1b
+874fe8038905065ff3b77f1e53904854fa4fcbdc4c8959fd2df2e3967b3b84100c6f63fc44338c01fb26c042c454991a
+b19324d737364cabef3d2ee4785e8f19cae399afc06fedff8fdc120e0ce525b3755161183a1f5ad11ee758104081a49b
+8e7525bffe35c1f5c2db63ee911e7e0197951ebd25868660e6672a3e7d4fb309738268b36677921be3be2f323ca718cd
+846c51c7d22e7d43f6e2addb7fb25113c25ddaa51252a898fc1d7d5b510f772534c4f5d37ed3074d124cb259e2bf8110
+aafe2a16cbc901730178841c39803ed84d3a78f92f42f84a1c01be4aa3b63ed7ad9d054ceaa8a2d56eadddecb287e8b2
+8781c9810ffe3d93fbee3b576a15b8786c3efd6b5a96b75819b1f93daf413d4fd0f56d1ec277e8f5adcb784b17f08371
+ad66011f0e2927ee1924725bcf8a296069f74df78ec66ef6aa8792f68425e48e9d7f717d022f68a079501770ce192fce
+acd0ef46fafb06f336565d86e0b22f9e5500d2f73d047c827d6a207af40b706440afdaceb32e6571deaa1a79f5e6fe27
+8f65bb98baaae22e84a3ff375e7598b5c61ebec676fbb5a4f79c8463c427eaa96ebc51b1fb504840b7b0206ca6c2c72c
+a4078341325d7debf766e43679b8b68331dc13651455a73912afe062525d2ea909d8829ac08771d9b32f2eea28b64022
+88eb29841b022f2ec9029ecd1a137173cfb79addde1c7cd4be425e5806ea6ee295b11a0459a940ba79f789689a8fdb81
+b762b9923a40a1965847bc7d046723c3b8f0d63323303aa3b25e93b4af8e527f1afb3dafda831f50baaf79926d1b1e78
+a21551dffcdb069cb8f30b625c8404dfe5efec83227e3a1a67ef0c9c9b49c658bbb31240c3ff6f8c68e02f67974c732c
+b4735a6610c371754001425772aa5314b759c24da50b38a9390969c27e215ad9d463a76762323b7954756a8d5ee7936f
+81bd78e545938f8a3e53ecc2e88dc26bfbc30941cbfd009572d9b38f8eee47a85209a318cafe8cbe055eccd5e62d50e4
+82ea5495db9dd48da97723bcfce02788549c6006773eb9f4aa4f0f3ae13414430edfecb5cd095259179ec2014b6ee1d9
+8493147b8f0818c2d5e75acda498139f95fa6f904b47f87a8c07e258c60f39bb1faa1d29cf0834c8a1ef1d6015d37b42
+a491233ab353f9daad86e60fd48b6f70dce60dbe36775958d8e270725cbbda96578b17a0c4925ba1298e630c6b9ca9a3
+a8c148b9e1373afa54778b6d4f76cb12f40eb6e07404a7f27b271fbce0d18d621675f1dfcb30e3908d7df1d962de2e5f
+9826a45c29ee22cc26ae399be25cabd16180a291669fc822a44d14cfac81aa7ce85112d7f2c30effc7e83d131c9937cf
+a793c75e716aed4048a2893f11eeba78ec565ac250bdae16594d056f06f4aa7d2a156e1617fc26def4e39984fb28936d
+b6c454d822343cd1b1ef7161cd2ddc28145134d4e59e6d69634c010ad1bd44120aa8458eafc28f6103ece7e34b368e1f
+a3340a0edc3fa82fe4f31ca2d19d295aa09c74cda3bfc3534c66eb71bbb7903843bafa92f7120de4505c7ec819a89664
+a18e5218cd4349985f412ffc7741b5db21bb14c6e00431daba194771300e740f75fd46aef1876543967e8719bc6517de
+885ce63a88617bee05144bc67d08f1c7072d8c4e09b23b7359f020995aa8cc9654378d382de6340ddf0803717687eddf
+8d8a0b614be7df01a12e534bac102b1881905a9d084146b3d0cf2086dc7d400129e0de8e48fc966adf9d8ec8c1336429
+8baad19f604bad656398a4010b20ffb6ec6131681d120220dbf2cc5779de1ee146d0b773bdbdf4e8e30aa0f464f2b18b
+a39ae3d204491871c2e88d7772055b35af341ba66531ce3575f47c749eb8e380d63a7939d3408cd51356cca29c76d4b3
+813afd593876667ebf0fff2b8a8a5bfd0f42a4fe2e4a0b7c78b6183605706c97dfc40b627340e1d9527f618719d60e88
+a013e458d678fb302bcb6f002a52e3e0ace443009eecc9113ab5b78f4663acadb8ca9cd757a7cab1e850aa23f09ed698
+b6e14f351fc47b9e46a83984756812cfac795cac5ebbc6f00d673ee23209d0d91a6bd7d576c7d35ec3c7e7cafb758a46
+b94246a346966caf6fc1e0081a211f27b38f058dbb9dff915e3e65391dd36d66c51324667e3d7469a865c0cc064589ab
+a1bf4bcc7420bd17acba90ee67af96e73502777e1723255a73b1ae3e92fc77e80a287ce7c3d4088040e0edd64577c8c7
+8b6f5eb9b6bc7320349b19876864baa6cd8e07da4f70653d7369740184ad416c40b4395c04750f5d8b54b3b3ba68295f
+83250b957d920b1b738f4d0f44f9eefc01b5b0582128f5ddb5a282a11ee207ba1ea7867f00588f8b891bbde2e56b4c43
+8eab312cac9de78c9fece9d67a6b26d58c4e15d5e0668ca2cca2d9c51636eea5210a893f9321c2fb232e09f9d0b40fa6
+b4d1e5f284d50360dffd2a0d21c4b31d81f521158aa21bf333a525cc68e690ce8ce4f0eff8e71a0c2d5853e2fed18231
+b1f194c28bbe217a2c98ca8212fdca744f0806d60e51f9da81548155cfb97a39e2a98e753be8b2196c83f7db8caad2e9
+a7905cbb59722d9463c6317ae59adc10d5bcd6e9788f2a54f4ff4a4de03df3f830d6b8faebcda541d429a7e42d158c9b
+8a3b31d0d0b33e7011dafe25ba5c3b7629cdb5dd5b31385d786fd80888fb8409812b96d28fedf6a401a93310b045c620
+86e4990bf50b27bac76926dbc65a1ca34a759d005e56eca56fd0e00ce82635dffed6f3052740cac2f1f37204699bba9d
+8f0b6a0b66f1f5fa3d12af444963c6a45785a36dbd9e1a5f42830b5534ca8773a05fb618292e718cfe8a066b8fea7980
+b7f206827d715b33989de5c02f0886d3a457d0ae34931ddfdfe2dbab121b69ccb560a71fdafcc3ff204217611674f5d3
+a6e2ffb0c5f29043984c54f5fe6449ac4b7a86f2982c909606b88316ef1f0a54638d565f44d2fe8cf00279e0eee435a9
+8cdde76212e73f9430cac210b52507583e81aae0bea491f6cbe27e5e2c8fdda373ce8c7a5f16bcf8c6238b282d06639d
+8030955eecc9b8e2161d40f1f514d58024d25e07c6710916824ed8982b8bcf7ebebc5643f0260e1ef6150b6901dc2dbc
+8938fc90e836d7bdf1cfefb2716cc25aff34e7c4dcf66b349d1fc6681580de7f58665faac29494b30bfa0c743d6f33e3
+b182f9b4a5d838e9d534e41ecbf06330c56a8a64800eee561de1fc2dd9486565ae6099f40d0f1901066f45047641bd65
+81f98b85de7b6c581613f4a42e0cb0dd9e6336399b39d38a4751c2a9f195b65c9e5592fa1728b91d83cac0ebfec7d675
+94681572da95137ce41d913360cd567b570a87c9a439f2b67b90d623561b75bd3dd0486a90a63d49eaeb412cb97768da
+8e64922606ce05375556901b8c042d4f41a18fafeca24c1d56998e0bc9054bcee7ab079c3729a67d908d0d7967a85edb
+8e10e8952b24125321d0cd9ba922affc93908b3abdce47eed22fb2d44cd556842c31c36de6d4c28b4a1b5dd84e07df81
+b6d464020a51bbb53670c81d5f1474ef439e006851d5d5a3fcf74219614a2a9c983737f20b254d38a2fc7333b35fb3a6
+91801712ba264cc2eb65e8a3d5a032674a89f4c2dff95ef9d80d3a9285f3c2cc108e775dc326881484756814c2a03637
+986e5a00f13326735bfc6b41b086623101f01dd55f2a88bf995a3b81054da86bb2f97fcf647d58e90428e8e9555eb020
+b2875b4ebbab678fcafd270a0238a208b19803012fdb3c23f06c74bfd45929a9856b7a0f9881b75c7e97fa9d35e49d1a
+b3d1acb9c844d8d2232834a81862c59548cfa849e8e5408ee66b4c8b86ddac0fc231b2538a752eb6c1ceee92ca443d1f
+ad0b1b5d6bb50c43f5f3b692c5d3569d2117b01caa7f0ffff502d5ab727f7702a2d458b89d77d218d3f92351b4c2b92c
+95b1b99dc260ae6ac7c387bedd43fba793274b15768d93df13c88ff6cf637732cb6b1719467919b444c3b5166f4f0107
+a0c3c8b59016056742145e7f4ca6568d4393124efac6540645152bf71173dea3d0058bb11b3093228ca4729cdd5b3033
+9278afba60643257d9f21a4033df3b57743c3b43d66d96ccf413154a63db054fbc3a36f2ef378169f4f19987964c0bce
+b558754c97f9824a72644de1725127dd36e284fc07ce89006b990f09db77c48ad6728e5c1891a691460bd5416ad65faa
+833a02af76172f868a25e850d35f4d164889bab8381fa9c8d9880ab0564a3769ce3961cde72bc94ed73a1723daa35cef
+aca496f3e528a2e3eceee138291107ddddd68bb088b2e49ea76d0c4136c6924b3251d7661ff467a36dff29f07ed09102
+a9367961ae88a19038c446df3eadb280da005d120c16f48ffeabbe4cb8e5e2784902cfa1192876ab934bc90606baf2cf
+b43feb49373dc36cb46e050e3cea43e636a64289efa3af790dd3fe960446492b858f51b3be62c6b75b510d8e2b985573
+8cf24955965468125fba2c5a5799672845ea6ce97cd307b09236ef1a3cfe55c88958ffa311e8bc8335bf261a84275d93
+88ceac98b512e5bb915554af92318a5d07a494e0b8734c4415e192e7405d6b06d170fbbe254e3bf387759f6d4961c34c
+8a9044ddde945daf3e0cb3f897ca00d0d4e6a5f7c99aaa3929f0beb9a44d2ed23c191e37c57140ebf3ec759f50f84d57
+8b2a2c0fb51e7c5fa51e8c593bcf118696b8411bc93e35cfe5de6c5465c6e80bba64398d7c6b71badda616b918bcc7d0
+ad8bba2b7d5577f971a1a561b17a9d8f6b7c35fba55e3e421a0d8d77b520eccd52122f02afaf3899218b652980986a92
+a8d743b56896d44bec838e10ac1ba5a43f58c26655c71be0a5417d936260453a8e91752c87334676c5dd1dcdeef4fbd7
+b0b0540f8d2d1ebdcd74d6e4007324de8f8bdea0531880520d79773c0b8eda65ed49e672c5a294fca6b4560442085829
+96da830d1c1625d002008e9a364005b2ef16cf56f5aa4a758ee963388493cbf90aa75c25dd67d496af17212537ad44ab
+89e819577a95195056b872f8f790d001fde3253a23120e2c41b3ced7fe8e9bae0df74907b7d65ddf9bbd6d2efa18eba3
+90a139ffc7dc0992c023651517db4c195aa2f618dc3002f4a0a43013b6c6022d8d9844a49cfbaca543c9cf5d9b2210f3
+a2061f543b216fc9c801d885ed681f9253f67cac40528b23aa8a709f24e0992fa42a10f1bddc7f10af2c22209343ca26
+b5f53715b9146966f386f214477743e2fd2b771bcf90b192a5863c06d7225be34edb6bf71389085edf344e60afd88561
+9634ce27272f3c687035789fa4eaea2aaa71db5b5531b21b8e029645827b40561a5901b33afd80a3aeb5777aa89850f8
+9674736cdb4a823bf982d54876794e99c7672eaea7455be90e815abd03ac06ce1fd9e73bb987a515863c6cb4ae597835
+90379303e285b19fd7816a6d02c0b8f94e6291b56c196d76aa389cbf813dee7ebf64e45555ebe8a281daeecfd7aa5b00
+8a1f759f6cd6e5134f67b96e0edce7170e4be1b39afaa7af1c2de989116a6ec9d38a2c077c8e6e65ce0bdf729f20f1c7
+b416f9937a51a298548e91cbe8fff71585335c00e69602423adc9cd72d18821987b8fb5ede32fd8bd2166e2ba9aaa792
+a423073148046c81f840a481d57909f7ef621a51827e44706da9e1f0e27fccb8f88652097a9880ca64c41f6386aa9069
+a173305a5aa2a17349eca704fee25593f5c2fdc5cd8cb932a1bbc0ef34bf54ec2f867ca93d8e6aa33679cbb71fe11083
+87c6756d14d815ac8237ed4a75fb11206f615585ed527ad582841526371366ab19f602c7448a21722adbf2d987d89b81
+8a1a6f06d6375d2bfbdc7531e9177a45330458da2581f65ad129367c400cd77f548aa748bb470bc560c0b02ee5b802ab
+a24a05c30d0fcc8334f6974c30d13a5593bd3b388e2146ba006f232bcd6886edffaf7e48ed6126efd3e651997dcceb12
+b35c5f8a5842d97cbe19105305cae1f971da5662c52eb979975efa0753bb60a050206fc0babac5b5083799e9ce8a68e0
+939ca5532c922d00d08ec5914e6c58f8a1302a1214a1cbd5c844b334ddc84e694768edaf1a2af02289ad74970800198a
+911d6104a240f84e0f6502597405b47a7faf5e68717f6d389baca62bf82fbb7207ce8d0c584fd9d57d3afe1f957b7cc6
+88777ba7a4bdaecee78d42687cb4fd6dcf04402b43524e2ae67506d93acfdc29d9dae640c05d01c90caee1d04cf3d35a
+9226e684606f8169e38dc21a14911d0306b1c9ce5244500e4b108eb1a0c0783486acaafd2e0b3b60c413bb003448ff21
+b2f527adbb9feef9553bf508f192b5ca211d0e491925a2331bb294fcde7d8e0fd72b441e9f07c838640dd35fba03e1a7
+b474e6d6ce22ea272a93a3c078197f40c01b9121c6f3083a8e587c367200b8c97ad94e156883475603f0a66d0340fa52
+95c4d9896df11d2b5a8205a19d6331ea02a2de038aded8e6fea6d79bf5a6648d5d986bd29430e4cb5a6afde8b07a9a48
+a12bc53ba6b6f8350b400fde04518a741a1d755123a6ad1d435c7642492c7df28f7091f17b254e793561923de781eae8
+8a0578ac03070bc920a3b5a7a33d976b3133501309af5339b0cc70536965465b4f7288af70db3d5be16bc2a1e5c26a86
+a66e27284ce6114e48ab56d7f623dc37a6e79cc5f487cb2bdf0acee099cae744cf3a9de53b111492b5ef99b0deaae0a7
+832a338951022c80444ad8c6d0285e86db54254d2689defecac2ed87f5eb4d876373af6d76e3d613523e32c3966142f2
+81e83f01bac3ac3fb67e780b28de30b32247a774aaaae118db3d45c8e74d1d4f1defbf9c2a7ffdf176f5c1cf4ae4167e
+a1b214ba7265f692b4637352c6139bae8bcaf3e7db5806fad0014ded93048fa4a36ac9c9e0b7cca0a86cd45bbbba2fe1
+a7ab6f470a421e72fb703a9d153362056ce80c40264a3ee5698168130cab8e827df5ce3e6321ce9a669c87a2e5c67499
+aefafd219f2d062a378474c48d2650b51901b6bce00e4ba0b509395a6fb39699037577da353cbde187e65de87ad01575
+93db16a0a77d1b181f33ef10300112fd8db5b2eea26732bffa3b1fbebb792c6ecdf2899cf6f26b505dfb46deb81b217d
+a63b6d9d1cc2f31ac5f836133ae66bc9de3e07ced5026f5bc90116599461dbdc03cd7680c1bb43dade9218ebfe1bc1fc
+984b49ca86d38a486f6315f4f9e6ad521901a06f8862ce1fc095d9c66bb2164e334718c71d7472ed765367db5fede105
+ab49ae93955a38f45f756afc4248a37773ba8d0a19779253fca3b744854715b9c9b10c09a37d3426614ffd3a8ced7bcb
+b22166dd64c83fe16feecc09d4b1df2d967ce7f4ab526ae39799dd5a5a4a9ebb1d4a432c5efb90e0875a4eb6b079e2fd
+aabad619d887b69b9562066fba2179c69c684b8cc9318c9e39646f4a5381535c024ab277a0f0be46abc95283b337212a
+99f5d484db149e9f8dc9c6758647c4e3702d88986600a3226874d612bb4b5e92a76b1dfbdb0909b8f21afc773ec67c7b
+adc8bb04eb8c56dc4ce97c3fc1670da10db134cff2edc214ee3221079251b968e2dbc087c56c01c9260b49506958a6ac
+ad625ddf5cd211102543e0943a7770a9b45cf3550d12dbb484cb5522b70cb626f9ac795b07a305be3e6949d7ad475f66
+8f9f5b2b43624e89e8535dc73fc54b744f247572b2920679bdf6a3ef346e654ec40fe8f81a0f7c7ce7cd5b48f3975359
+b70b1642f28bad56bb24b342eeddf5c3782e0cf6e0d5007c252413bb44b32586da1e3b4d8b45a72c91e44e07334da68b
+81b0311e557c47ec22c5f5d1f757c6193cfffae357dd2460019247178b13733484dc8630fe2e13037a1a3d681c69066d
+951c9f1504b19acdac1c04aaf535d3cd3e39c431b2b5d9def9b374468e93d378ecc3f5aa02c91ddb93eea431b327ca4b
+a85e1f4c292723d18a49cc9323dc7af12bb5a8d0c95d71881ae235ce123c50018907f46bfc846dda1a01b14ec45dce14
+8a46c8b86bf9890df60de4c210cd7865892d0c11fdf2747620289d73bad597e6b482c208dc310c25955dae8392d8f278
+ab65408622c63b67842a80c4ed665258ab617ccd07871fa3f0fde2e5ddfeec49f01d7501790a60b3a05d7579b087b787
+8706913d42b557d9ea4d7b70697069281504b3c4e1172a2291e3b3e0a0305c8d0bff6b7721356d971d2fe58e32d4556f
+8d9b8f3c113ca1215dcd15d4c37913d023c8c5d04f617319af76bb7bab72fb756c5bd992db6b9e765cd7695c316360f3
+942d4d3351b2a9bfaab2500b27d24fc2d7237e791993a7d0335f36fe6456c5a1a8bd28dde9228fb139e95288d6de5bbb
+ab014e9cc7d3ca08f1d3d24473ddbd693331f4bf21ebdee0fc997aa2faadb43db6a1195644c459b52a969f3d98a85b8b
+8b679da80561955990c91da9093837953f4ff7fdc658b51639c462b578a2b31443421712c6b7742fddbe0ced48c21cb9
+a9132ac18b1bce93e815f6d2f8a0d2f433ae4d6fa04269eb0f5f25864a8009b01531c7c3ebe87f07454927a010ab6dbc
+8ab02c113149efc877967c92621a8ef618bf423017e78b9cd30cbb13c51200c6ce27c46be75e19ba843d64a3050d4467
+a881043298341efc28c60d850d90d90279fa6d8428953337ba57b74eefd858e362c6118a82ebb025c9c102c91b4aeafc
+92e4a587479c64b8df955c6bf1abf1d7979a978e45d96f05bc1b9648f10428d77890be9ee03bc1b1982f5ae7b926f0a3
+90c21a22826e2e9978dd7522f51353fb33224cb65603779de41db3ba41e01d664e131233bf873e28d6c71294b565c533
+88e8ccbdc54ff06380c2243203d3f8c8a75fcfe638d6e6a010c0b3a39d5cda31f8d2cc416ee5264267aad2b457c94e50
+a256198394b458f6468dc91c35f579da0ef02a55fd93e98b25e43b1bcb650ff889df4899236765c1a6b35cf49da940bb
+b5c7d9c03c36cbca068abc6778053727e77d9b58c5dc33b11629f1ade1c228b1c964f5a7d8dea16057e76662c4d79f18
+9588e133517f0d49622222b4de5c124b1aa4260971e43e4aa767fba8055540f2848954886b7f245583ea527fe2fd1de7
+b66025d75169bfc7ea366cd32419e24fbff829709e3e9587d7d59620b3a7b72034d3303106f965f5f7a71d66b7f314f8
+891357bbe44e60627b975c10c872a34b78d6b264380e351f3a86dbf99abf8e2dd8d20c52dd6073086e48e1ca782e2ac1
+8a066a3482526a92476bb8c3e5caf07575c725d72203d67ce98f654f5ee8b7f979187416fe3d7ae0128800b253d7209d
+80a9e3d8900046b71fcd5b7034d1e0f57d95d2756da8307a11aec0553e5715518a125a653d356f399409545256a1984c
+924a13fb2da7a899cebf2ac09c8c0a183491777100de1aa056a6c2bceffd5a63e255f16a9066e4ed89ef28096a1230bd
+866cfc8116d2e0216d8049d5ae2ef0e3fffd377028850716a4bc2cfe16c5a6be023334bd6ddafa0c77913dd4ff0a34ff
+95eb74bebbbc59d793e3fbae8e98c258451bf9bc5097df4edd832e9f1c30a1446a59e1f75a44832d0658d5ecc13dfc86
+972517b2d72ab53193db5d682db2de7790a418ce4952c29d64e1f9107d51a782f4084591b7c775648f103445b797e8e5
+a14ad2cb69da568f2f958ef4253d7a6daf574c6976f4f5d771ae7673853ca22eca81e20400092bac84453b6eedf5aea2
+ad95bfcec6c06cdc11d316b7ad33fe65555e985bb33b15c9f481a09caba1e5990601ed6a88038c0ae2e04b1607e2da48
+b7e3bf3a585af1029d83f12cf75acda894fc4441cd7b3d56efb6991ea91b07512bcd7d6d68738557a48f0446b2cb21af
+a57efb1e2d2e10e41f356768385375a21d9f78bdb34d618117581bf7a15024eba43570c3956ddb85a025d39476f831d2
+a66d3622b1cdd472a2a4491881de035c2eb4f1c94927902a3bb9f10739f900130907c6b002982e03785c43ac30b8109d
+a79f2417d32fd772e46f3bca61ac788af8fab174e1e1e48a84ac557f7e80a9cb4e2d7b467365ad18f9777f4cb5bb2b8f
+b952b976e3b6660326c0ed357ff25ee1291b74891f3eb7bcea39dec2ebb11e287d6e26ae0506425a20e5e445273cc63b
+8c23929e9740ab51d9b82c6b7840067e7163e6c7b9b9441e1bf867ca2e532926981c98641e6c798ef12d35108abc1dd6
+a519578772c9ed2d691a8c423d360e4bad76afa422f1a5218a7a08ed52c9a5935ce2ae4c0be182eac0712259a43f849d
+b1529dd189cbf3bcca50e97199bfb85b42f2b26edd95b35758d988d1d3740f5d0d2e249763874fdfadcefad9ea1b3d02
+aa3fed8d14a4f38df75b9eed7f187a31cbb7a748bd3225dacd8325a71dfb680729fcc91ad8cf0b67ce314e1fa8ba02c4
+b77c28abce17732a08e682491182f63fb55640e60384932f6a9c6d3d7886508c9e67a841cb93e59448d2d59fceec4620
+b7a24c58e3b85d60d654ed14d78993a9cc78c130442c8cca42921ade8ec94bbd0653c9fe5c69ad1fb2aa46ffba04da39
+b7d08f3ce97901261514a5dbae582848e75515c5f9f41f5e70ec17a8d0db3067ddb19aa1c86803bdbb757230b148bb21
+a5b8a6818be4d59079d88f72d7aa4957c48ff5898f3fd01def48ff6bc7aaf9840aa91f2f05617d340092dd9299115c2e
+8e548db6b871fb23ca1cb8538d44b77ad02f4cae4d33c8c43228b820abee1aa913ff9acf2483725b195b4e65e2e92063
+9509189e063812fa04f4e26f87b33a2289a05c229ed1038fde0dacecd87aa55ae0fdc678a1c86bf13b81f4b3a872426a
+b355f24a5dfb7a8f3ea717111a038487632bf00d67cc2cfa2ab61e1cace7bc7f5bc9e04b190aa6be0652627ee219bf76
+a9b335f235df51b92f40f44f19150e182a938b9abb3bdd8e8c447b2b128050d228e0115a268af4c1bc2ca49552b4e0a6
+b306d3e6cd7ab56f5f7572fe51175ac6b29b189220fe2d380b959d131a35804da5ce95adcfa51d799f18e27d8d5eee0c
+aa49cd2bd34c37ce1f05e192fa6837f964c068170ab97989e1cb22ea7e13c2400417a51282519e74d8fb6983ba89a549
+b1d4fff41d95613e30427ae2ae1d3df8c9d06389e1e0f404f8cd40199d6c4277b7a898d06f1579be107fc5744247c36f
+99d220454889f476931b0cba3570eb1a8eae30b4c3617513833a551aab0a2630125f72dafc64a766b1a322dd42dc385a
+8267ae38c9c8532c7d4ec4455279a5ed4f2e48746cb0f2619937157534b0e5466c5f4b99b7c342c095f71f3b77fd5882
+8bba0794cc4ca00eac50309a92878084a6a22e4c23206c68b8d7268f9e7f615da4b9d0f3e006d9dd84bc3dcf32261e27
+adc965bd7c7bb2a52cd3f4d2cd3fbd72a196876a678863c6a67a25b4a2330d1d3be603220de22c8c3f60c1411df57b7d
+a7d5f38a3c4ca0541d5ab101af9c27b04c5bfaa42a1715e882c5e7715e460c4666aac4b6272b9fc54514346fc49d0560
+af94b91ad9b0f01df1d41a459f16ffbe30710325617651cf1da000eec43876161957f079a27b70018ba34d1d5d68cf6f
+a0e2a492da4614f41741157d3a1d19a2370ecc8e178d813e22b902cf7454b8237f1ce3c16270eb6f3ead1f92797e36f2
+8dfcd39155d7b8073b0a1a9a617fa75218f569520d4817f3ead375850ea8a3e3dca64c44e83f54afc37173d927070601
+98302358e5b740b73e1a6c568b99affc6de3c7245ae96d9c712d377fd363d8b8f49dbb714aa8d39b5b947b6de341ece7
+a2fe0f9fad663cbbf4bb05f61edfc90716564d5ee5a9529ac3cb8f06f96329248cda85c43f24a2382a9056e9a53520ac
+ac50b0727ca2ba80692c0b7f564417916695ea3760ce9fd71593050912bb97366d29ae5ed05ce52984e52218854b8e3e
+86f56bea946a4516336a90328fb4b24cc7f82d8710d0d1e34c2e27b6af73c4f4a9d6a848dcc56a87d6259a99ac444557
+b33d0244948c430a58b210943e41aa3cfecc9a823dd3e160634ccc45ea2680987db2912ab2a173ab6cb9cc2b7e16f7d5
+8808f8c2c2377cf52e7314820d88234d7819a6108fe9e1c6a675dc47cd59f81f95594ba2f5fa10e3719580f53edda641
+ad34a814be6019931972a76b3300a4fc9ce763d6f4fa1ea131a67d575c00c827b9ae7260d88577b4b3689e90a845137e
+9370abc67ad0fedf30b929d1613e336c6e99e4bf83ce969e61e5d77061b48a1a493f28fe2eff436d4a979af700a83b5d
+b0db136c8f4ba2fb7148b1451b18f694769f5e53650d68342f15817b04734ef8ae59681a5754df617d755a687b6ee45e
+9149909d24382054a05fc0b057613d059721f132a19017a92198b30e48fbbc5f8f0b5f5db55347dbd9d190ca88f9a28e
+883d1d170fb0fa95b55b10b32ebed24b1232dbfb5c783148a63a765fda200e796aaec52747441704967914433a01a323
+8f55fd5ea11c4fac277112d72489ac1de28fe163a756b125f27acb78aa6651c70d1cd8c45e0daae417bf894149ed2d57
+8d08685f99aa8525b008b868f5486e24a08568a5afba9b729f7d26370fb1b162937db28b935d67e4d22f7fda69a3a6a4
+b1882e23d784ab48b2f9e58114c5920bc9d0c4c01d2d7fa5111561df0cf2d738e31a32963cfa58939af87e79428659da
+a3eba902d376063e48634c9436802cdc6b89d3a7c7cd03b26a3fccc7218dca85a3ed939eb53956d2e001805aa5c2d63c
+b97330c40d51a4b71f91f56292b628379ba735509a66c7df054112578b9df40d3aa32598bc64c03c78a3311a17997bd1
+b84f3d2af2aae2aefdfec9a0693f6bd71eaf4d477cd72d80f4919235a471607c5483b354c9d46628a76d6b6fe7c586af
+8a1c39bea7fa580de967d8ced7e3860a9031b07842d71f8c5941b8877cd55ba15ef7aec6116ba38ba290b887b4530685
+b120fccf939e7d7959c2c1e70d7a7aa3b84684dd1ca8e5cfa9d281fd06d23eb67a629b1a27052614c3ba639ff9c90dde
+827a8e0dc841af0e2c4a9ca36c84a0ea60099aecfa40294344f82878b6909f5581f7b34fa9510883113795bd09b5e4bb
+88c24cc54dac5a2982be5ac49684d99f95574bb8cc44afae4f6e18231ebea0f2ab65b49870840bd3e8f2c9247f62c7c0
+b91fc3f2cf743f4ed42e49007514d43dea1d7bab388a18de6f71367fb8f2e9b8e88ed9f7492b647e548396ef3e3d7765
+a175000c4765a57c57b219b21f8302cfd85aedbc3340fa1690119bbe7cd93dac4fd0ba676b1784ebac83efe3e78d4bf6
+881a373630ebc24dfe17e27b3f176de6651347ae741d55675675e9e6904ebf157e787d86eec42ecebfe4eb8f28de6fc7
+a47c8b155c8ce8e16f38deb345a051fe0c9b217cb7a266fce78d7694134247887789645a82c0ac24341f51da8ee6ef00
+adfa5bcc682d4449adcc436649b444dc61157154e24d68615b0ceab50eced1ab55e15b45562dd8e00785806e9ef2b7e7
+b7d2ecddf47e9fd25dcb283eb80e323300bf5c3ee3344abbc3a1f2a3296c631577a1fadfbf685abb336d5d7059d17166
+8833f6b388e46e1f8fef1086777466277cd418051ac0323e2cdac5902d7ae45eefef93ce90b088bbd618e0381c1ada78
+b6abf44c5aee5d0fbfdbcbf1e77354d5a2ccc239b894e1e06d7ffa76584683f707384319ab0e0d17afd93a854d7d26b2
+a8c61859a9553a83bac398c14c987b20c8dc27d63112115b8aad26bca275cf98913783c802ebe3b7c3d878c130407b34
+a5de7a519f8de4daad9137f2c2838544219834cd70457ef09467d869f4dc32098b7a8d4fa85e1eb283632f6d09971318
+98c33a315a66cd8ab9ca8a58c87e5ec588107a6416c4ea498d0b91bf7597f53a405e437ca0a9d9c6acea27ad0ddbf4cf
+b2909b1f8752f4eec25180a17163ab215fc20c4a931d4471d3be0ab64207a65c7e462fc0707791286a92ff2f2b7dcb0f
+8b96c2fec34cda02e98510a3ed80a980b0cbf4ec03e3c4260f84027cc7453acfedb5f708c401d26db137032c6cb4a31b
+aff645dd6ffe8b5076c83a823daca4149f0769bea3293b61330ebd97a17fe16758e4fbbcb5bea7449595c6e261127b34
+a45f8b3b7196449f9952cadc8d87a787a28b4ed89f8c7599e7db361cd0f0aac6bfa464024ded5c0ffc660e417594fd41
+85016b5f7ea9863557eccb0e742cfbf0b09630f0bad3de55aec92b95d4645055cac60d03602586b34f774bd356dd5554
+94fd89dff2fc6099e5ab90149458a4c794eb1857f1dd9a2c84b88099412477dccfc2996cca2abee68d23a05265dcf271
+945a52621ec19d26f7c8abb5d01e4f5630924b75a349ce74219377a137f4a0d386172da523edaa522d27902444023cd9
+afbd452dcc57f5db6b3fdd55368807320459c16559d944ee8ecd1af6acfe9d58c13f37961f78030883f8ad7dbfac66e7
+8ce96b3be871a1f33d559a6e55e4d86a0b92ec3954417f8d98676264596c3296296532097b9b20c83c341527a0c929b6
+ac6a4dcd58486d25a4db1751a60ca4d02b80c939b39ca165a37d9a0a52d8675b3753719f136a59ac400bde3efd036c8c
+ac87a37a14a5d48842d30432935929a0e9dce5642142a8c5b95e377ad1bf52120dc64697f0508b7c258af24a0ef484ae
+859f0ba02d496861455d9c39c269a1ae5bd224319918fdc3648311c93303c0e13301ae7f3f77eab4ae43f1184a912b64
+96d9b1d2d2fe70b8fcac136a65b62a4ded85aad9d350c19bb955750a0b24f93174e9cd00c0e0a1987793e1180dfdf66c
+a7f5135873a1c08c7c8d46adfed19d0ed0e33168d463ca74f75116168355318ad588ebcca1946d7669c5106bc9f5a8f1
+830b0587587b80df078ecfe0857a4b4cfc05b722c0f4f3e1217048ee18749e9940cd0200c1f7a0f60de832a5a44e9f1a
+b6625ed0199097acc9aae20611f02d2fb837e4695762cdeeb4dd722517ba5a344e5011f14d5076783f3c32bb5c4a027f
+a17be2e528c463aa4ce4bba2df5b005f88e363b87be7324239413ecd5bd68e350d290370e1080ab9911a0d54856536da
+834064460f0e5f38950cf5ec197818712f01950ee1f32b1987dcf7f4098d20e1d91fae6d48e8a054390693a2e572f888
+86217b9bd269408ac92b5cffda5716bb3bf8674b7e222668d72939a626f4ab64f30efddf85108c0764127cdbcbad7d69
+8d7cf47b0648be0bcbd3ad1062d90010e5ee84e397895ce98160d5a568d60a19582c985944ec27bb284459789ad8f6eb
+ac056e3ed3487427142b3a4e4f9db53f1a752e1994f178577c46dad71be5fad4d03d24ae7019804c41232705a4bffaa1
+94b83d67af6735e81b2e392e6af8ee4dbafb0071d84486389f36f222dfd015da718c621acdc4360630403762dffcbe3f
+8ad27bb51c6cb860c21954f5d09dfefcbe3a9a0bff3e24fd1f74850edcbcc76b5b389a616ea0c0796b239b0c22357a44
+af9990dc4c9f536385811528f207a8352b083a4abe6dc016eb5eece0ad74da65b2c6c475a78cd0ecce0b2b550e4412cc
+816dcb8ff8556540b54dcc1efbd2242dada0acc1e3d3da13ae581d905a9106bdfb8c138eee93992a23e7740593e8ad80
+b8fcf8e11e5924d3d38643b2a4bed4b54e69f816f40d4020e76655eba8ffee758c16cdc2d970d3c8c1163cf501044c03
+a50e0ef4ddfba6d969e7dd864a20cafc7fa6aa232fa7a806c3d53c3e029cf110828c5a9c354ea42aca5688896f27e6fb
+a560435900c48879ff3f89067daa8e512482f061c68474d951c608ebb5a69c7863a28fd1e216eb4b140e32124e50fc73
+b9202d152b7b708ee61c4fde6cf423b481854538d2580bc43462610f12141b89ce779c7398a35c27ea6ed0afa5332bb2
+a9b3f8be28f9546bc70f680dfb9b08c1eea6fc381cb6f3ebfbe33bcab48294347d4e64004c11dde5eb409ecb19941ad1
+8cb3086d265060f8e52a96fcecddfd261886002c1821a8f59a1ddde19a6bb1354b17cd19a9cbec19149dc219a4c394c5
+906e8dea406ba0f0ef43ff623f8521039a9455a2290cae4ca9bb6494ee0aa812528267d1349bd5d339113dc9d1616b28
+b9b5212b76d5824d66b8df7cdd5effcb05ccab5df6ce67558872c99d1e484ab8d21037bc0e22f5c4082b192972b80acc
+a1fe817596bbb5bed93a5dc4c03e14eab627484cdc7ab7e4fba569ad0aaa93b34c4fc8680c4f8180d8190113218d26fc
+82fe7a20fe93564cfaf7eade8d4d1394d1b4e36048cb8632bf366d3d8084ee52c74d65c4c69d9d24208f7916278aa592
+81f42f9a3b8007e5f02c26770947f884c715bce1e600f38f164a390f159e2e5b6f8522ef566bf36422b14340bb6d3556
+b53d3c89bf2a4b29bdd8f1bfc001c2533f86d869fbdb383fe9cd93ef0c49da0692361baa9f537094e1af662a3461f8af
+8fbeee613823ebfd514e991d81babc05176d5c115907ec36dbf83a69eaaacd622f1f36be2e47b984cd6ac66a6b35816d
+a9068ba463ac13d4dba25f9bbe3c93baa35828563f357c53a7009cf0c809a23502e023a32f651e29f14424c5daab2884
+87468aa4c942476b3ac3000e740c4dc72d320884357dd99eb25e81d7b52a859b9ebeb55f3070022bcea3855a9a198e9a
+a5f1219eb902234ffe8ba809df590080ce8329ee574eb346f6b4372892d66b0725f048465221655b70b3d4c2deba9fa0
+8d9663d4b48cb86201d343b20a8e7a6ec47a4bce0e85a905be31121a01fbef95d9f29d83530faf79dda163c6c76ec514
+9921ea9176744e15f64b20ac6e95ec132052eb853ef47e9334108778fee60d9d9b53fa0b8011c6a4aaae472eb11cc61f
+a04c2c5e2c5a7673652919aecbc5fe09a636fcae2d06003ca6775018112b606e50bd2d6ae6ec6131d2a9999837186bd0
+a00ddb29776d2747e3a6e68eb51a7cb00ca0066a9aac5a2da632f355db515b32e2c441fde870c9731a9dcc8d9834557b
+85afeeae8bfd92c51522320cded430c2fef57b1950f9f966f47ce6354e492e9c40f950a7ef6d5202fc79fc020f7a6260
+b047d214201744cf7e675af5fbd29579c3b26020c5e0a53e2ce078778b3d3a673f0fd87eae8af8f0fba3bf0f8341b63c
+b8aa5364d914020158d11fe82c2b77197ed2b1a12492435200204e20a9209d3c0b4fdb6fd3f0b1db71ee3b986400ff46
+a59a903fcafaa8b5876a3eb1d79a7db17c37457dca018e393324d8db3be7c2aa3ed2303eb3530d6fe1612fd75dd92e08
+b1929c1711ce44465daada15808099234c0c5c8f43b050b2792b6ef9b77825996a74abdcd84d6ef08d648e77cf804357
+85bdc33f8dda0d853074e0657688899befb6356c38f0ec2ac27c46c39fff06617edbb1c5cd220314335bd1b792f1e240
+862047e51f9119f5a0a607469496c0574b0087d566bc58cb5b61a9a841a3cb693b89837a7c927c542ca03d0106055438
+84ba54c002150e5989f59064b68989413abb5f289f3ccba215b923f86f76c19718be51d503ce3bcec68322a7c7d5446d
+adc9ea06c11bf3f0d704b321005020917e731e6706f18a5aeb1b56dab3de39a94fe8aca3c248a47565ca5ce82face9f8
+868324c4ef80bae55510316f3a8b13aa40e60c8a3d55f4994439d1dca6f5928c4cb202769d78c21597d8737e391536d2
+a6e3b57e9909b5fbea2114c352b34235a4d4147417e480580c291308b4b9cd696b36278480893667e8ba01fe3bce571f
+b92e1d6ba0a2a244ac5ae2e7b20e152591c1c466c9b4c658c72cc5985ded0392b04ec00e32291f1652d21dcb633919a6
+a3e2bb4dc07ffb1e8dc9055ab45bf22864980f64b612548ca7feac85ecdc426f773d6d48bb7e6c7a578025bfe99307e8
+af764cdb70d5afdbb49dddd519451218db4e97ef3ee622585880425c3d85a8df88613f4b51ad40a1f6635e45b2efa5f5
+a426230b8ed77eca3d1ef7f4735fcfe0e51ae37efea5b96ea3bf313c241bd703b91a592f035e98056315c9822ffe8c26
+96a3ae7f1b80690f97372d086d2d13ea2b40802bd053980f73cddfd37045364ebe38064a8cf3531e9bcbfed421040f20
+8cdfbf0663bde624b703d7e6c36c5753282487147e10e5a24fdec75836f7034e4c38f3fa3df373476af969a4f835cec9
+b7f7a549cdfcca30b78349b831ea5173bf5b91d56dbb999b2dbf6b85d8c22ca8a9a62b38e37dcad7ee5136a32edd5743
+82ca90321c43d616670a7d85447afaa9034459b796b51792c970fd5b8f124e47a13ef661291a4ea58a495e68aa36dd87
+a824a36e4e2db2bbc513d39e4e2a841fa81106437eeb4fca9ebd78050667d0b284b7217a35ee3eac67d8be58c0af317a
+9370dd0c0f9c7585761eb5f06e7899d75eac07e13c140c64d4c506b90495fb8ea914f222608c478708d4b47163dc9907
+88c07e19252e905faf129e3e877dff8dfe93e81b3903b150aa33a93a7eda2820a8471be935825d709dc662d06c9f99b7
+81e936c00425f7db8f0dd88b16c3c5208e8d95a5072e69524f3b5de45f4e2dd25f0aba8ef17016bd914bc8f5a42fcb6b
+b23227dceec18d6dda92a15b7dc8623d9928d545db93b3547fb068c99cacb3fcf3d7f88e4357801de8a652b919dd907a
+b23f1627219587773c17070bbb190e1280ab27c5d7e98b43adea0e1f5017790149b71f90c3691301bd514d20238c5e6c
+821b7bff6349c204ce50e00e296982536baff68031165ae4c639122195e7295ea0c82ce66fe32a1b762f6a311aec384c
+a26c15bf1ef4d5543c4a006e4ad2a450d44c93c62c0f0b035698530cbbf925f6705d375e1dc8b2c6fd9a2c69f4126b77
+b5c5bfff4697fe13a5177fd87a8e293fd1c6782cfb3d1f95c5ddcb13c309dd1ddbeb14cd359c9f3029b57ba52996c9a1
+87a0d37f04155bc22ade44f567dd8a81445facff15d643886cbe6534aa44505e331bb75c9ea2f27624154a5890aaa2cf
+ad85c0e6345e2333a0ff76b769592f2b24fd0661984498dec6fbd2d9b0cec5f139bd71331a28b13aa490baa7fe27b635
+a9e6298b90aa8d3f4385858e08f393b3bd61376ac3dc44a0907ccfb372813bbfab1388d544c1a4907aac38a87dab2abc
+b5cfc8bbe4cd3ac1a66b1c8138c5c68e643f7f4c310cbf1483f6e48d4f7e2d1cf24b2704fc687032eb03978f18239072
+9493895ce0c815b60b0ab3a989f63c6ba4c752976160f3e52290a724ddaac9075e07dfa913e113807e0e57725b1cd593
+b1e800c2aa32d34d34b24dcf890f6ccde7da60b98c4646a5471fea7cc6df8862b7a9c4c40f38d0554e33e2984fd564ae
+90a18f877f149a314767f5dc15c8726efe5d20a8e15ad4922c6042420a2cd82018be813debf02c6d69b96e8a27c0c5dc
+8fe35142442c103e7bca602445b87cb017c76befc83d66894d4f810e343b3a571f3fba14d94521340ee7c5ccb13338dc
+b43547cfaaae899fc6295f496f213916e5adf9b0d75805c32df0f969fbc1b4f8584759b2a06b81546b48004d72f2e8d9
+9410d55865098325c7b559eb4e84fef8a3ae890e1d6053b3f173ce22e60ec6563041ad8cedaa2dedbb59f3dd645dd1b1
+b127d9e4b8280e10434d53207a7191782464ae83b4463cd8a32026e5d8a7a8c5306ba43ed9b7ea637d65f64d6a08bcec
+87de8fe67524c7d107d7033d4107659206c347c47cbbdf85e3441b53c933417feedcfb049465c67f4c4156219a4f63ac
+a582f976e77b861731595ea8450c6b525e371c6548cbf7911f05560d4c7a4b62a425d5c785190628d1aa1f8f27c43b51
+a195e358742d924fe2a7f955eb21ced7b211cfcd5dc3e598e0d2713c3639b72f986aa586b7a22a75f8547bfb46cd52a4
+97c249b70ca2f9da728a256d18d600bb923005ebad3e1d541ebd580af3fe07123fdf87f4e8f98fdf9dc8ddd826ab7344
+8fc7891e2f540d8f20464a36056f227ac2ef3bcf2b6edd4cd2d9024a48fce19480fba36afc7f5c4bd7234787b8d17f31
+9047512fa27e2d8d901516b5714133c1845494b6f2aeb2a0570dd8533852f00a8d9a8ca64979310e83ac73fbeccc33ef
+a1be9cba454617af0dd38865ec29e7d0777d7c68968c856f90b5bd63a7cc4274fd8b179be54143bed972b921864424df
+b086ccc8a705999184f51e9b45c76975ca8b108b32a3955e122711fc1ee007d8417a85c9cef217f28d6c7799b60aae4a
+ab0938a72118ee2980b28dbea9f7100c6f54fa82d93fba8bfa81b6bc34f9d2033a987e5d6d3816fe0bad53cb88bb8c2b
+90fca0bddc14f70282f11998fb4c289fad5c0e78c8e8f9e7a811f20413459a05c9d107ae771e9da501854022d827f2b8
+84cc69b7200f63c2214375a7a0a5ccc14bc02ae45bb6f3b27f67ac538d01e628c66b40e5c40cee38bc8634f1a3c3cc6d
+8a07a1cc0a96e6c6da0d27a540e235c2ab6a95d087e624c90cdccd781a9bea6abc0456d896574950a9e21e7d87fdc582
+87f2084a2f2218d7f9eb7725617ea37db0a19fb0bcfd7c95501f62fec0bb6bde3950690420a40d93e26f426fc622c825
+8c9fc9b470dcf8e576af943edaad28c29f53ac7e24657618c21d910eeba6d7b16f16c418bdd5cea3d639c3919e93b7dc
+8f026883d9d8c7c2a5c04e4c7220ba7061a48392a8a7794a3e290a94967d14caf040a3da3513fd9b4e695376e706006b
+83bef852b9f387a2aed0d3537e77c895799c639310cac98e7b699e9f5d74b2b21cbca58ef910c6583e0b849d665ad379
+b08a03accdc64474490706edce9df7853b78b719ee731c195f70871b7586ed274778d99b84ec3cb8cc0b5e38c102bce0
+99fada688669b2ea8d9b7cd730b057292ec3fabd30cb733ea3f7cb76f756b244cfb26df03b9c087b6d9c58f5233dd1b1
+8eb0fc7ab6b4238f2317620191dbe835d4ebaad0882e22e8f0857053d25d6d9077754251202472d875303669dbb806ef
+8fac2cb38c3a1e361aae5313ebdc1c7e0b7d1a440482fbbe24389a7fcd381169fb325c79e430be170452326cd4931732
+92bacde1472436209032f0592973a5a40d505a9b2c9de648eed1ce392d0c18e23aed9114a9634ad3a7e6afc4ea80ff21
+a28b394018434be07323a2356fcfd6c70b3a4b1c6b6ea44da1da66c389a659235e0dc941019bc5053ca41f10d9b6db2e
+a6d23d7fe7ef475bfe6486ad4a99ea376c6a6db3e70a0a7af421ef6e6c4d6b9cff68d03a7239a56eac784769f63b2bf0
+a1232e6747573e19df98a088fdba57116745612cfdd4ff21f8df82a66c7d5df7e0a6c0cd73117121a516dfaabd0f5016
+8dc574376016b73f6730103cc45c952c5df5d047d0b4ab3da0303f66f43f7d147b5eba5300750e885c621e72b4a64b43
+a66e9eaec79c958e624655fc2adb7b89ff3da0393898e028bb07cbd6511ca8d9318e1d60dc11cf0265a498290e756ecb
+8e5299b661dc0e088527904d2c2fc0256613a1fc2b92bb92c633acf145edbeeb053e82b468a3877f6f14f0878fab57b6
+969943ce7b54f6e728724b26cfdf4df90faf9f9796bafb910ba66d96cf34062fee6ed9121abd193c9e322950c8eadbcb
+ad29ce021d7fc875d1e61ad3a99e112ff092ffd7900a608bad30517e50e2270e0f8dc7fb5cd42f1bb995c17d86268f48
+a55fd82520f4d35434066bf93a9601c96549cb4714d9ac05c32e16803daf8763e23c3125d2005eb229bf5d7e2a91ec3e
+a95eccc21af531c5e1a36ce88eda6b87732f5fa680e851bdeaef73421c1c87c8e66bc314b07ab472ecb67a08ec53cd4c
+8f48b5a0636bd89a1ee259223065449523984cf3bd9be78c9242276c848d2140bd94d1a6670e446b51b178ff694b5c7f
+8a58b340e30f0cbabcba1c565b68eae66405fa2242b43a7f7d3bdce279af42fcb4ef58c85fe89cc2dc56a41a51f058b9
+99103a659e26c9a4d19404db4220dcc5defbfacfdd969eb7d70b4fbf9b2c91c92112c0097e8f0c32ddcfc35741da21ee
+a088cc15a45094cffac52c38df427b7144d621cd1d12ae87d74c00a039d757e36fe3cc2fb35fda9b33b375553585497c
+a0f1d15bc388f6602c975b4b9cb23ab83fe31124acd946195b999620c3c20c6610157a891114a43e3af551d7b8c3e4be
+a571057592f3a9008bdf726254c364975705a71bce4e084a37915c5317f635528088a2f50afdbe7240c14d813e8e979e
+a31e425feee58f8372e2bd4c21c48c299850df34044f27db3e4df55fc5e7c042cd19be59500acb375fd3478379f06053
+94645ca6400f80d9a90f5b1c5b515816d6049ab04a552109c9c16b41366a7f3931d49338d944ee8eaf2ef5c77062c362
+a61fba865027b7ccb03a4ea966081325eb64db5a64c5d765d2893f6a19411d40dd957d8a0b34733aeb3f002a4e0279bf
+8199b89ea13ef8eb2f54d27bdcc781a5a7fe5bfef4ba4444bd651ac6021f4d90250b2f2cd8c63fa3ef237ac6eb1bab36
+b39e1e98d07c95a4fc19ab175147547e5a20e66c044f29e4855818db4a7d0e7e2c24192aa8c89fe378f8d8ab3e9f0e1b
+b807bb0069474e190b40bb2b34165351e73a392ffb0de83879ddb181989a22bccaebfdc90748f54de81c41ea244e7ebd
+8b058266df90032a1a9befc7abb759b64a23ab628edd051da8b81db4211c72fd63093dbd94796b0690ff2b0c0fe16cd9
+865decd95200fe45947a4249d2d8551ca5d7b3d7955adf10f94ada3e69d684e5c5b8939fee9a4457f22d21bbd3ce9670
+95fb5ce7af13976320b36422b5cd9dd46379d13110fce619969308ed6a250cf3eb84c73e8ba1d32edc01aa2f6e367707
+a1a176350aed82d5ac01a072ac7f3cc1535e20fb597ebc7e417921537f9bfc4cfc0d490d4df831f0f8ecedb6be970a15
+974ddd091c1aaab7ed356b65c244748a713e98b133c5606436e531c31b31f6ccdcad2037b12c68fb54af4b19bd1d82ab
+8ae9b7a8cd856087300ca90799ec3265b92f84da8ee9e98c6ede1be378dc040d0fe68b8ffc94b146f2521b9fe3d19e54
+ae17df60b83e4530af584991b545bf4b3cc1045416dc15250a6b75a9a04defae4c0f60b8bfbeb54c8a21fa84fee58e69
+aca1e75d4a05282b0cbe6256925c0f269a4a8323888bece4a48aa0b5e7bde7fbf1d3e4f5cc38fe6a38aaa091ccbba4f6
+ac19171d3ee2f2e5021418c37a0eb25c083de6a6396290ed35b4771abcd07fda745fd082e3c32c117bbab7d9fec2b67c
+ad8a35eebd3bb28e08b9ef64bf2d8b75ead69db29c96544d71686ccc0819ebc6823e49b3b879ce0e5ee3131153900632
+9479f12dab191269b020b70132996cb32059ac087e2a3f3e559d297494189e1d6849c340ace032946e12bd4923a3908e
+8885e680de6c158cd67d66c142b2b4ac42b96e97eab8e2dcb90c3b454dd214bc530fbab6b5d5746064b9813775b6d5a0
+a16d8d27d9b2fa04c7eb8436062a53ee0a4d679bb205d7d7cfc24e5f28e3752a9959847e9e31496bb0cb1c11caadc30d
+951b00c69dfd9fc80b17733b843c440c58095989bb8744fc9db63a4a6116f24d5f224a279478fba8cf57753261bde217
+8a693564994a1dd298f0b279e618b46bed349c53236fed9d8e05ad9383ce55fed02b8a361fb8c09ec5ffa8a271cee015
+a09fbd62995a33904b4a34ac55c80f6d4cbd39a902f5db1038d909f1a2d385c3f5eab04b157b5662558bf35ed29cabc4
+8662373988373409a4b31d45c5110afc32aa008bccbeab39d5b09a0e10370dd879684e722a8856b0da278e2bb91d67a2
+8980d3cb8a82b3a827ba65f44e50efed0a6f37d6c150d70e4dafb67b1db173b46ca29d487ef9db92d37ca8312d246008
+a279558faa11850aa4f0dd9ca8bddf69cb98bcd4edfbb0c19f22d1bff85d808e8f2cc026d95afd09fec2d15c116bcf73
+a3fadf9c3066c93aa6a31d2346ad0a1d012c12ca7a24630aee46a087eafe5fa518d20647856d44ac03576bb3a9f81a76
+8a8a19b09417e1b1607aeb54841fa69f58e094b46971c6a5cd0fbeb2aaa98c56599ac242272e6973ca0a9d2c09ff8d77
+858a636f510b494edc76e86b1718228f076b8a21306b02abd086dc2a96c7a034704d743ca5d89b17903fe7b2e43e6fe7
+b031b789e4073b82bb8c78f9d3fc2b901d75278733a4fa0a5aaf985a298269a735217e85eacc0dd554375d610a425359
+b8603ce7cff755f5e07eaeb4d74dff179cde405234bbd7b3f62fd903054aaa34a9b868b04617d7d407c2b8e377227f07
+aa41829c941acb3f9f0e2008e852fe855e153960cd3c85c4b8ab9f97ca91b7a5aa18f997cd023ba9e03a653f238a4f46
+a35639f920619dff592176aad2b4b071d5c960f149c3a75311b16841d1872f29aeeb7c155cc9bff41ea7ee56f799de78
+b252195aaa52e9a34936ccd1aeb40d28fc262cc4570d4f9685da8c591080e97438edf64d4d4d074491344bb5e86b6b23
+abe2e52d10620b503dd1aa584e005d857294565ad90dd89217a77fcce4bea7b0c72d54dca7a1c31b5a9042a9602557cb
+818085f2f1b525d9b2322c8785bf27a6759af9aeb231b0977cdcc7d7e77cab5de056e522dc791e72b8d9b93a9c41e833
+930f64d40ab26be006e91deb854c5b22bf6951308dc406b2c7c7791d5dcec470529957fbcfd6a3c9655d544d974de7ad
+92b28bdbea8c7588ad3a27992c19d73bd3a478b276f0e11c4e82ee2482e4e167cbcfddd17a1ac6bebdd862be65f54098
+afa6a85fb906f5ffe52b6e9715435dcdf9f7892a396d740d67560fc42248d23bef470989663a73190ac9da442cfe6a82
+82d3338e58fb316d66694ff4674a5d99bf0b13204dd251fdec95d48382f2d2ac60176a19e5ecbaab5e00af2a39a338b9
+b30cd35eb15b3910b8b8f91cf04c223d79d587a7ef713030f0ab93f446caeef52c60ada365f8d3d645b477e7fca61d94
+89554d2a9a11dd7e56f0b568f2a50c72d86362d95eab5d94a2386397012e18bef7c9e01a2d71fd325c0692e4d316dd16
+ad58326fea1c00e0f8aa92923661be4b3ecc79164d68e91c4d1366c9894b6d049a4f31c9bef6e5f21466ec014ba6b94a
+8915a16afb0e68a84fd12a9203f8f348954920126d88136ec027a81f541b67c421b84ebb3d6e8f085c38c2499c28ea61
+8e246e1acf655572863481367da007e94bc1bdc1f28aeaa1fb163dc05a51c3526a2bb9bda0a14fc6d658d85a9322e44d
+af83f9ad3c7c1504fcf60084e0948624fccfe3a9892dbcba8f166d0d67b475ce57ba008f286069da20a0da0cffe3b4ae
+aec86d2d803612e8d27a01e3382e0a876164baaf2f3b8c4e9455ea00bc2e525378018e6a41ed9686c6408148e852bec7
+871bdd8c84abeb1456ef73595360de6cf9f92ca9e6a8b6b816ec7497be60a9f509ef2c91332d17cb5fbd347bb0113d2d
+9503ce513df28b61d721fd5e8667272a28f210ef787bee58538f786acd16f04a412387c6f5e6313c43f426a70aab65b3
+b2cb0526e7e524ca9fe918e951c19460aca911d2b5ebf97c2bc74aeb69778a28316dec8916a4e3628b46bc51586c1bd9
+98f52ee1896b632dff5153e3d1fe389c6200b14cdda6b27e12d4a4182763b63e0f587386aed78c97a32114dc286b975b
+abbea974929c9ba70551231e3833d5cecc71c60988826771f792f190ca77c80efee7607dc1d6bf01a53796d8d9b73017
+a4cfea1d06cf840bd599b14c011b6b204b2cf6f57fc7d7f310052062a4fe8870f02504e6c837c2b556c925921e543556
+b957529d7e5d1fc45c5a822a6e0e480e46af2f5cc3801c31996b9b1acacfdd8d142265148b3e1453a0df0c5e6cffc5e6
+b7411aaebb1b6a6a75568f81d052e60fa7752a64c20dd7cd5457f999f0185807987de8fb72ed94ca9d1148c19ecbe1d6
+84be67a5ca80a1fd0f43cce4c00a465f167445e42232c2d2cad5e1097a62d3ad564041a55f0c76a340387503f15e0ac4
+98803688f8e7b445c7ad14277b9f5f12acfba4f9a4ba6df9e2b7dadb726f1bee5098fd15e0b5308b6686a38864f84912
+b085eaa421e566276bcd45d8b9fb71475c4530d63e90914eb2a33c17333d5628c1ec8a45691cbae82ccad97d4addcc94
+a08ff7dc59dadb183dd0b5d336b6174464604bb2b49315e0c42f34ea08a8bca9dc9207750638bb7ebb6387257411956a
+94d72607cd8a75b2fe2e9333959bb9d5b54d74ec36fb8c123c157b19a17f01f310b3311116b34bcfac305e9deabc79db
+85fa61a796226ce555f8195c792ff6f3d483f62dac41c17b7e8295bd49ae6039574896548728fad4ce966be84a62a6ca
+829ab1087ebb61db05c59e3c9d03e7010f8c546db117a6409bb813f6fa04061833771c8aa4c5e2981bd1ee551df0ea59
+97f5c5261db0b130bb8352fbcf65002327bd6d8a7d4fee2a9bc293173c8c54be37ae229c5488c1983bc1f7857c66188c
+8756439e5978ba19e2cef95dc55f706d53a05d1fa964c64d89b0e95470b5344b2f8d44680080626c37c77a00ff0e6b00
+915d33f90980089c33f403ba4fc5c689ea7f1656f5c4e1110db987c59eb981b6a46dd9fe82c8efe7d1e3504f1d2c4d2b
+ab5bbb84884ef036c9b00a84f7d5ffa2931854e2afa5a63121fe64d548531af4203495b977bfb9301bb1e4679d42665a
+9830b846a9041e4539eb858a179b4db6da89b507424e6d858ca4334d973ddae255bbfb04ae25c3276ccbe97c46f5816d
+8e35f4563b8a5c9a76cc1da87ab21cd894de393dd61bc977cf22d3de454de350836e032ccf7d6ea55e2e6b83c4424146
+b6338ced0f05806c625905cc51b7e772c5db3bac144e897339f67b6949f4d648d41b7d23bd3f299f4879507951ec031a
+b3afa470fc71b92f415b879a814feb0702b6adfa08e395cee4f7d8b0e3537288f16c83b28ad4e2db02c1fd6d39e6afad
+b4fcf7af3196bec84fe1f6e3bbebb8abadbcd46de02a37966d0ebe20972fd890803d570e4a201f2a89f479e09f19191d
+a21fe1f8f57691165d0c7d8436765562cc935288f24fe765351be335f906c6c4dd1d0714b134c51255b14511c957319e
+880a3a8f6b4ba410be06628a011e6bfd38d86919cf8014b4b4e1c930f8e3035749579389690f21bddc4d4699de8a4b1c
+907d93a7666d847a140367c0a0ff80a96d6a8295b07cc4ee52d3be987f431d8dcb95d3717dfd248a5643c5395ec2891a
+b8f38c78b8a2c487874c1a6a92d15cf0dcfd26319d4cf65c2f4fa9432203ba5ffefb02b7324022c34bfe0da369d96d65
+8bd4ebb6d720fe52d626a621670a06c8a304faefca3846df1f619f4d456e14f8bdc547fa7210b8639b89c6584ea5c5d3
+8ebdaa288a71a2d3188d6294ad0948a4f72c1eb6a2e921ec82cecda4d315a86e3e6233b5ffdc7219f34a99e9b4555317
+83320fb9dc62119655bb0055192471ae06b7641dd4af64670a4d9475155733555ad06a93ad2fae72e029049601780654
+80b3d022738318238dd32f122bd88cf2f734a61e315ece521e9e038f4a9bd7b54b5e67784f5949fbcc5fa911dd4b048a
+891a23b4bf5cb8558b4540b66fb6b9fa54e9d0b2c084f660c8bc77af5ddb97cb5d8042b538f61330d9fa8ccbee6c8a41
+8e5651d9c95aee23835bb1a06eea76efc9d5c881cf87ee847ee5149fdbf3d67dcd8ad0675dec8fca6cef25368348abaa
+86bf1d094bc4fc7c21b21cfc7adbc750db0b27c35bb160d306b26fefb2699cbbb1fe624df1b9e7f6f895f1b81a829361
+aebc3cb2623344315875029378c71ab7ed3cdc9d3d42d4b835b373c8420adefd177a44e532f3f06f74f0a40d53713e5a
+9527f659e93a740b4c50d0d3d9aaf1a85936f04866ffde1aed30ab2fa1c1d565b46bec5fdfa510fc3ea934137bbd46df
+8488673a4bc29c3ce9133cbf41c546fab4ff28c5d46048a21e710a8df4f2bd1c77d0ee242dfd962a30d646e5ebee8c01
+8cf29773c0e0fdb75bf6f52d7066e7d6e9a3ef056bbb70a98026464b32316189addb5766822f57df63bb68b78c85e1de
+810c6c1aa53f9c3fd0018651b1bf25215fe24687b568f21a121e0bebee576a75e5f0d08ac9c6c21085e52228b314c6f8
+b529a87fe47402aa9ddaceac63a060a6640418891f931036c6e4098a1b308821a6f1a244fd5c1c22a6ed5f72f6bcf825
+ace9284ce89b5c81049d329db2376a85feeacdd9f735cf00038adc51865bb78bd9bd5d060efd0b727c509ec19988f99b
+a2e7a949c951bddc99e68d80b3f3fc4ab960b682229fdd794f9eadc80bee91dfd5eda0052149d05c74fa33bb40d75ecb
+86bac22daefca9143e0b1d25534900b1f7711ade4437642043c4a8c65f0d963cd1f0f958c7391e5a663dd3c59ed9de60
+b7d2a6e2d44edcaad19498ab3368bfb87f9ab039cf2249d6e76091dc3db0c3bf45012779c02811cc818e95796e6ad9c3
+ab474f74e1ebb3dc696e7a6bfd8845ef15fb6411fa28426c486f7b0f789a6af3016ed5f7da2a36215729f5cca0b36b4d
+86616a1a9dcb50d1896f3eb937bde67f213558feb401aae9898e41cf1fe33b443170c7c2dbd1648c9e3cdd0c24289286
+a466169a2d95a5fadb6a69c7061cd2911c3eabc0b1a2488e216f8cdbd2c5bd87e80908b002b9efa51a67f02d7af2155b
+8368af8b7c0f55f3c4f7036fbefc9d6a0ee9ff61197cea8ce48546753bdbc0b61eab604b8fe2c1aa91ced7a879e5899c
+996c91779ff9767232ae603c5b1da5bbe0e303c4c2c72ad2d5944ee1297af3535f6bb3548fd1fe8a92cf4b281e1d83ab
+ad4a93d1ceecedd27389c658b38dd71cb13c729b27e490381d8c3ed4815b11ecbc37b1f82c0656e0ebf77e5bc35196b1
+a3538c7ea3dddfbae80d67caa9fc547938bf77114559f9fc5180d9d0ab837d7fb1b27bc37405686f212f2e98b0028e59
+8abc9fe135fbd48414f2ba28344d9f49ec2d5ce94fcb314ab8dc31c754f3ab7e6ab268184a67dafe8b1fb811a762c112
+99ace100d8db88a83f1727b7b48baa1cf45b971d08112e452f5003566815ccba0ac3f8b1df6504f55a392efac8e3e70a
+91ff50978ce629651f1501708908d75b490c18615e933191cd37613a83d4b605b0b48d024d27807637e662056d76276e
+8e4104331ff1a40cbee9f489a814cf5bbd6fe4eaa1cbe1e13625fc3e6697b27d933265e5ef8728cfa8fc4ba5b19a614d
+a442360d49bc9ce3e75eb40bf2ba05e9437fa594e8b8de34bbc822cc7b706dfa0dd10bd6bccb702d8556cd1320924821
+b6ed6cb0aa34d5793e929e0d9b9651e41da3457a0b20c1bfa93a8f65bbb65bc07c7507482d71c1c285f5f663ae60019e
+86d64df2dcd36d0c7348c77480c8af33dfd889bae7bb045888eecbd317cf3e4731b96ac18f410a99ed33a3f22d448f77
+b8dd25415275d5ef8260bf5195ddb9b15b78a8799e4d15cca7d6317a18eab7bcb8fc759be61360915a28a8fcb5d6ddfe
+a325a334c84dc1d9acc0a9315b399d4be93351c7049f474702ab58b4cccfd69aa50b8731ffd598ef0144ca96477c273a
+9012a2dfedda5147cb9ceac681fa9e75e2901eeb3c94d87465a44d11250de4bc66d1e00ff674f2da1d800b43f686df9e
+a1049d59da2a942d4d2aabfc0d972ebf3babef9c5d8fc5598ea23a048c2e58f7f17b4d860e437276bdae221d9e41e3b5
+8c9d9a8826c812943d74c4d4f0fd2f1c8087135c37bcd9647b722b59801b01775a644e38c24b43e8e70f83bccc4afa27
+b9cebd7bc7b041c18bd35b970f87e9b5183e4ace034e21117001fff8a05b2a7f9ab65cf6ab8b818b8192d1db5649312c
+826710d6432ef97625db25104fc8dc3225bea594a10cdd4473d5ab72be57b74928ff356d210032a61ca590bc68509880
+a18422ceb8c61af305277628e154d3a9c49f47e230a44c6216128d73db7c3ca9eca9f87e29cb2126f1c312f423c61463
+919d357886de9eaddcfc46cd43e2b3dda3f82e926a3aedf02ebda9159faa00736bd2cd7aa044c76ae238a3a95a5bef38
+a822d5a726f5c38e9d4a750ddec80bb965a6e5374a3d87757e2e48a18421f3142c3985450d1833f3ff4ca36e3b838c89
+86bfb86eece6f6ea8f51985e312171b9bc821e0c3ab4cace556da28dd7bf89cfd5be3fbdadcacc19f2371c6a11c564d5
+91b42643b297d8eb2c1bb3f16b57ab2964de99dd22bcfa07db1d0010715ebde94d11851df575f4f1ae602644e454fe0b
+a5e444ed3d5fb3c5afd2c9c24d676adbf396f5d1d47bd532edbc72c83845970582ec49ed026b3b982c9c1ea725192cfd
+8448387a14d84aac6afef682a27be67e5b05d31b59346748d2940072eec771adb53339f335daf4463f555da2d8543f18
+a5034b66a26bad0f753be56dec722fc98a072bcdaeab0bb9cf35a56a573d9424cfbadbbaa8ae30690f7c6c6495331fc8
+9317ac32da1772099f41564ddd8247e3532528b240db753a1fa6fb35cc039c6a4ac4546597bb2fb28721684bdfebdb88
+8b4b0001a6234335502c8b17c4de274b83b0610960b5c46b9075c6e41f357ef0d8c94e9b14bff8be7849435512626ce7
+b1aa903511fe4219acabf8761a8e4316cc4f8955ac8640c68a7b547cfc65365a8fe0843a4098f9f17a4c9beb75624393
+8384f4953395aba4939b24b0669853df78f2fcc01b2145c08d3fc333ee2a7d4adc12f2d81c37d0cc187ef45b5f69f59d
+92beb5a3c14637f84ee7a3c9b4d9b305b10af8963c087b86047e9fa959f41ff362d56eaccfe887bad1ccbedc488abe2e
+8c60e16dbdfed2d1c8cf3f1bb0b0f462489293892f9d2e0221b1691321a771b163fbb599daec4cbd917da75f5f662de7
+a8a6e3041a0c2a12c76f51139b221b03ccd1afaea3b72ba2c3533b797d5f67d8b90d3474b4f6f8e19a77894fb90842e4
+966aaf74560bd4d164ee46c7d393b2c628e307019ca4289dbfb6a9a991608ad80efc1ee6e9847a19382ff8f3004aac8e
+adeaec475d4bfb6075be90cc37d61d45ce14da77f8a9a508b9f829ddf2abf91683aa2fd0372d3025a660c94b0f612685
+b3392bd1ad0c202d4a95912e0e06d8c64d7e2a8818dba8f895abcd0f6932efa9a0bff8a2aac107046d3478782fe42d33
+ab38804443da16d32f11c0e364449ed351dd36b7c82b5c7ababcc33a930acefe09fdb5261da04f6dfab29421fb1cc017
+a34e0df9e953841bc44c09e16d69235a26ff390a6d128339ac97aaae5616865f86153d8d7466519dec6c52ad592dd3ad
+99581db106391e6816403b1e9d13747aa05bfbfa5b46696cdfdedd1627b60e1ddb92215d138e007770512e93bc6184f7
+ae60c3b1ae3594aa4e3f08eeba3951157921aa6511148c6d32003d42157654d4a3a39efb1bb317135620f09729d134d0
+adab0bc35ca3fefb14729259b16907a34e10ddb6d78a23f28596d3d9b244709651be7719537df33bcf003c0e43bb1a66
+a31b7b2f3411f986b3415870ae42f90bb678a9fc44c942f6613cc4f90f3dbffa4b5fb8bf3abfa4361dd8e396d9a3c5ab
+a69b188a8662eee48fc98201fde6f0d14f6b54db83ab79c2ec2f4b6be809773231704fae2cb281fed8b05107c63f2fda
+b79e1e7a9045af6537981f54dfeed0a1335606301b73eff001880798f01ae9c0fef6e427e171afbb1d0a78135ba912cc
+b1b883fbe379995b3741836a849516a0f21b18f42a34db2c8cba01f86711a2baa5d14910a110f1058e36431dec163cbf
+87bc463b90123cd9e177f2284d72a7f4a1d4151659e1e4e8900bc21986f641af2f9a3386aba56601e6fb64da630b84a1
+97a51bb7d717495f943db162837d3bf700ee0653da9a94b36153443584602156e168fde97d77407d0861641d8d373094
+8b02561709564d0721b5247775dc66c6c09cf68a8ea62fd7dd361905ebcd98bdbb2c554fa272de71c6d22b04d33e6902
+a914b9406e71c09deae875bbd628af3f54de5ccf811365cf229dfc69541d996689d05679eb02d42a0adda02be6e32d2d
+85dcc5f3f77f72cf0818bd04c037cef560f0b0eece3191e06fcbb54228d11f7afbb8d9f8675b404bb39ffd04a3b65bae
+b15bcb96a98bc6cc7b802dc29b79a903223b1712a10a22e776f45c530a4f767665dab1a3c6d1b52157f4b79055d5ac81
+965e353e665b3734042b61951e105c1800718eb3c46759952755321ff5c639327d045c58fe90befa896e96b826910298
+96776a5cd26b69f08a68af0201b2f739cdfb9553b466271063a6c8b8307f2a3f51294ea12c7e8118c0e6b884886e1bd9
+a369453bfbe7ef0b2445231704abba25527b073bf735a968758975fad789c74110a573bc7ec50001368209a0ff385500
+8e54dc4f2a557703b2d8bdb74ff107bbb239034ed363818197b2569c03572c14cff21273e94802159563d50205edd651
+a1c66a1a82c60dcbd139b8ef4de62be423e7641a6b94ce0d0468e60bb1b000d268755946a028d3961d8b4d3722016ad1
+b14b3c26dd9d17d6fd8eeefc7f706c177ebbee9b8d05f9b01174deb37649f77f97ef1a1abc0cd4ca7a13618a4036067d
+8fe8f9754c5ee102bf96ba6b6f29a14fbf83cfe3c5f81b5358ccd4db87fd8c5d88760172373bdfaba7eaac98ab1fa863
+a8c308c15242bd9c7b28e110715315a1f9818ebe03662027a6f1feac13a5dc9bb111d29444d13546d8e441e49960b0a6
+85d87035d74a1f4662f42a8c6d26782daceded0aecee9232b78139b1b50fb764e87cdc5d1ca9d6905735dd9c3dd00dbb
+986c31370f594d4c8a9096c091cb1484c1c0755804819a9462ad1b67937c6b378d97f1e4c27900405b21de2646be70ca
+832b4b427f3347b0073c24f54e17ac16d5a80d04261c1d464f89dce89f42750d69dc8a83ee0481e410f94cf1d108c0ab
+b13e54d91d5d414223caf43a7fad36930300594b8cb3ba97c0c873cfefedc165d05f05deec8d74a0412d5f0932813088
+89c931d595849c8e54f50d550ae4a5d71c4bc74af436965bc32adbfe829a48ab15c856a69070b4a4602e0113131ce4cf
+b03731793db466b74112a1b9dec3344fa952e81bfcc7fb2bef3cb20f566c3b2bf60c16a93f84f77f4c83d8f2a535a2d2
+92e8fc80d49001139363e3201c93db8326c41322db51937ab641ee7f1b2f7d03089e20eab19afd27abc23de039ab4b0f
+b27d95c90dfa91886aa91c9c8c85ce09fc875279028bef49abfeaf44437a0528ade620c8c2b3d712ab594e73c5c032f5
+a42e2598731a792975feb5b24bf00b1e7cba1620922f8c2319dd5878419ce6099663b448299c0623ce400875c48e12a1
+b062840f63b555a254e3bc36e9075d57c816ed2e9cb0e262f9de0f3692456d94eef702489e5b11c9746b949b5e84c06b
+886226745d906664c476615dd41deef6c338ee10380657fdb75cf9ef28b4d9f56e69c8d0ef01e9cb80eeb42f3e5773ba
+854a3649dd5b22def4f246eb0d1f1a206d3dfe42b5e44b5fa963a7c5b8bdaaf7f35b542b3e9cc53187e66a2315ed9f9e
+b5a48cef68a056955ef4c080c85e4044e9f8a562f2beac9fbb5e19f8d618718c86794338c6dae8f94b6f5e9f8e98404b
+8f8bea7304cab80d0009b417c198bfffd166eed6f6db19f28b7616e8b0733cf0a4d54d204361d7f8f179985c8c3a16ad
+8af81f10339e2f75f6b6fe22a641298bf90c8676260abeeef90bcd52f46ef013f5aa4bd9d0b5ec15be61b7c3e0f32350
+b0397c64034598c825f9ef653ff16f680325546695ee6e9c2957d3c87593161a063c5219304ce6a16b7db75f1a2c5f7f
+8d2e7677ab6fbe2b0f5ab6dc356190bb3ecd7fc468c698d512a6c69f22ea97b71fa961c88635897a5b539ea51b70b4a0
+b4e91a693cca1007fdaeb7e679c6837bb8eae0bf61aae447560ca6eb5ba918cbd9952b41769657978413106b359e169d
+a8331a907ba7d95a5e4090a7680d1bce3cd803db49fb84a48996e96514701de1602c4eeb4b5e0b1c2a106c4f678a72a7
+b54dd28a97a5f934a34c2817af91a41e57f88d7eb5fb584d3b6692f2d1c4b2a4e273c4de5fa33a0fd1fa02c9d7cd1fb1
+b8b780e0f6059ea27aec9f3693ac9adf0b93f75fe7fac5230deee1e7471df0bce9b5b2f260a6a0a346afa723860471b2
+980e9847ec83d61442a86cf8c7464b357694dbe67aa5de3a8c88ccd1a038256453101366dcdfe11a565065d78ce89807
+9350a17e397bdc3d2bfbb84ddc79a48bdc6ef5c3d8c1ea39251e762fddf9962b69cdd42c563d03f64615b72c9dab07bd
+a34d24b69089cb5ffc5f06eb2acfeba13c96a1096d1af9620aea28753baf3d0aad0bcb30037ef3a5ac36b178816e878d
+a7c8b9108fceb4e0377eed48af9846530114df986cbdd35f6d54026104fe6bfb3b58e57fa2b3a750225528f8dcb8bb9b
+b0f71f6a04cc7119db96033f89530853d58a445565de2efd269b1e3956397c35a49c328102325b780fa5d0cf5adc2a4a
+92be082f04722fdf3abca7ebfd162b7062939c3410ec204d5478dc8de2bae2b25e2654441d29fe2c350895512d333ab0
+95e7afbcac22dc2d04c5635d7a8c6293f6ce29bc6c932850d24ab5216b449251bdf7aaea838ef40e0e4eee1de8f63bfe
+ae0a877b488865f21194470677e12ea7e357c5d63f6bc454f608e33df9a3b20e9aaea5b6aa42e8999779b8b445831c39
+98df977479667e23b897b91f2db8f4cdee7ece7fc3ecf8a07d752efae090d8bd34d781353ec1394550d8a207bffe582c
+aaa0f1bfece62a63f3bc76862b8789e2593b4bb40b3c413956e9e5c4eec604e39d722cbe1db210396eca7c2293489099
+b362703d2b72909d06407d139531fc144e68ba94e55643cc3cbb9ed24145223aff460b1627b41eb9a3b709978aee5a58
+b020025128804bd642fdb1d2b70b07d181e5ba30a5ee16f6bd00d7e2d0c6af782e454cec107304823be61647e65221fd
+a409894c0030081a2c7f8fba27bd0ac53997a31b35a33498d78bbcfa0b7ec0a89b9efa99dc1b8770ba889060f39d56e2
+862f9eace3f54288749ca8402c22ddd7829f0454d17ff4891727c86eace899cbf72d302065f5f581169f00186c23b4dc
+91432f2a823c3ce95bdeb5854e8dc7faea5031fd65c82dc69e4adbc5ead2e5a5b58a9cd1428d3f526cf94a217f37d7de
+9543a9038fdecaffecc4d3023fd67f7976dcdbc7014e82edb4573479b1789b4c610c3964643e031f69ac7a3e3dfbe241
+b4f31d580987f47c550eabd2d276678a294a612ac26806a06634b8812a571391151d84c29b6b82218cd84dac85bdcc88
+8d922ae4eecb45ebc23eb1a8404aa1524b281d0f0ceda58ea93a0cfd4184efb894c047f0a46e2d007704f5506544907e
+98973979672d1d52e561cae7331b730a577c422258c22720edc344aae35ce071be1b017816d58bb29b9cf5c433fd64b4
+a46be974ea72c5e5bd16de591bf27087d97b9030fb4a74743bde5e480052a0de58bd962dbbf0e0fbb0559566c3d9780b
+b2b4464973322d865207949afa4dadbd888c9b0230737561c3b76a1953a85ea9439fbb1db9d0d42083c62419db512450
+ae811a9eac5f4ee6cb3a4dab456a3e5d95cb1ab303c19e76fc4b36ef6b4c83ec0b2803ab8680ad1663bdec0ea2f19aaf
+95a426f3d2ae6c6069f888010bb20c392bcbb65d0986125e0f0066d4206f4f443f70dcba8a789da042b57a36980e75be
+a9ec01a5777d10275153ba7441f2e27ba3d6f1a875f204469220ad999bb8a0372369278bf5a11640ac0709771b814a31
+adf1091e24bdf10d848f1a0920eabca0a2087220fa0c3f8e5b4c72ca0424ff3e0c77ad4c259c12c3cd1c0eb0cf32c67f
+b9a57eb8642729541088164b9974775934d7a4c56a3a3ff2a190d549b294fa87002810f31251170b0407c7e9695cfba2
+8625501e5c56948812b72b3495747412e03ede90096be089cb8040069e49cddfe697766ee72505bf715802fc77c08fa3
+8a745aeeddd1be100474d96aedc737208ef19a93a8ad72c10bdc0218073fde6209510048eb46e271553b04d8e6529f46
+8b8d9ac3b91ac0333094c85e81fe2b8cd5c2207073a33f66bb1939e8f1c84ef064a8b2ee984a9f450f0a6e54bb56ccc4
+8cace31444da99fa5dadc7c46f689fa427949d8c089af3d90c604fbdbe0dab052392fbad4b5aeab707e4caa9e739f366
+8750c8bd1f1abe5acfb29ecab0923008cb4455ae8a1db01bf3317df05e1e02f9df3c74e879d9c57b8f59877591939ab4
+8904a39ad86cb42c06692d4801b3718bb63a07a2dc5ef13de16f668b08968db34966457ff2e4cb770dc61a216f4abc5e
+967d1750b0db53e977bb9ba65aa820d7970f8c75d5355cf12a3f4c509dee7e9b6c0f7a828474b167c25b15d74f0e9cb3
+b37297bb6c2d9175e0a7654c5bc6d248f47f7183c3b10375f07e21e9f3e66f6581caebfcf468dc0f8c04132a2a0ede55
+803862e6fbca945cb6c0ba202257df5c7e1e1fadd78b842970206575f70c9757d4a54e9b1a0a269dd37c4f830a40d2d6
+a7a27f2fc7a1e6d276522177f0ae6630dcf5205d08c19319c315bacb165b687d125832d97ed689960885bb7cf42fdf36
+87fbc08506fdf980cdd534d4ecc4dcfbd381f3937dafa09db402e07a67e1cde579e680d3f77865b5669f35fc00901530
+8fab8bd57f76d187f1cc22e40b51736b1b0234e70813ca02559ded9c7835cb3dc71a24c8f679081510c32f330d6ca45b
+8fb917b7dd71e1728bbf32fcb55343890aa6fc890740f41f42e9620b5bc3ef8b1ec67d9c047e4a9de0863a5eec18e5f9
+b7429e758850bb7f69db000d49763df43d18af11460ee0f158b741dd6b7575527c5c8068cf54f7f78098f9ddb92a82db
+8bd3c73c1b6f88ed2696d53d2a0617f74bfada964d2eef2afb5e1cf00bfb646f552643c55d5453cc622c9ecfb23ad492
+8e025e91b30b0f328cd6b79df9603698f1715eb6209e64ef8705cdde5ee1c4ec737a61d9b8a4e72e83b2157c621e1590
+ac0b91bbb5ce5bbc8e8d6c0d9d4e51b3960169c608b6220a352aeb13072133aa9d934b4e69d7c5c39fde68d467fa8069
+88255d08bde3b967dfb1dd338dfbdec12a2079851aa796be070a1d70204048c34f2739b7461840136b03429a8b83b1f8
+97a83477e765f3f17eef0d3243ba9bbdcc50fc581f904e92a853a076adeba917279fc0e01aeca42de1aed8af9579bca1
+b0d9f1afb807e0e6f839632393edef25731ab2141cfa1cd965e986940a4916c8788733a39def0cf67afedc516dcc6ce4
+b563e9ed9ba2134011d7bea6314af5d71f63caa1bcbf878c26d7162dfc76343c38308955215252962fd0c9c87200f1f7
+838d4e97bd67822c22cda558f0d35f971a0ab7debd3da3f15c27f7d4b3301b2c17b60cdbca0da8e067f23fc97d136ae7
+a7bccea326cccbbc4773de402fdf2cbc21a028197be98cebf6e691a7679fc948e6bc4981a14fbf493a254eedc444dd7a
+8b2687732f7aebb153bd6030dfca0b6d257b8f2945eb8221ffd36ede50d463172cfc4bb17dc30bd21d8572aae2540d6f
+a4a3e87ec5984c3a755cb39fb04472583a0d2c771552b0701788f03b4618c87690a13a905420358701777e8b5ff2d190
+904c4dee5dfff129de3fb8cd0a6e0576c18ed3d77f49b8f0601997013cdd4ecadb86690389555ebe8a436d8084024f2f
+ad1d9c7a6236b22474fe8d45fde2e1f072101b5cb7018ac73c0541c0f9ebec4d5c4469e0570cc188cb5f5ba1d8958be1
+87fc8ca6f737cfdedee973f1586b94d971564a1fada0e4d65894222edcca6552764f1ca0b02782066f19f871ba5842d8
+851829a8b39eb6b91523548ad600bb876408cabed98d30958056367c686bdedbc876e1903b8af8ffa3d3618e3580e3db
+b99270859bfe7d8a4c1a22e2d88a644dfd2f100c54070ffd9c4e1044140fc0d21d62c61214a2b81a9cfadf944327ef8e
+b89a2ddc91c59dc2ed9b8d11e4838002e731b0bcc576e0e18106238cd3282264b14cebebd8a64f004521cbdc690c4182
+8be96bb11a025d265b7b3ff3151e9e227a8416e6118595ac29bf836ef751504eaa3a9cc05bbdcdeabde11f2dc3d20c3d
+87185ed410be571fb532e32d0ff4ef68e98ba2d3d5fbe92180cf1fe8ddfbcc89fd1e03694a9fde1a12ab905db89323d6
+97ef023f71850ddb282f244b3f39579eab69ce5bf3fe5dd2159329b7def4982cdbdb4e71476471acfea0f7ba5a7fd061
+9944324d804fd3978e7e137e6e65348d7473ea23c591136d55779b5a31f45f9e4d866d8a18c76a3a0e8cf2ee61cdd041
+b9930c9aff260105d4d15fb749aa33436f6fb52cf9d50e39dca19d9cc7938d752773f06756af86369e1f5fd5aa71d5ea
+a85ac6bc027ade2a9bbbab2b231241cbbe56e562fe621ea19208a8ea36e1baced89ec9ab8e2f83b602539e5c053f5764
+9917d40d37549caae646848e18ffcb49f5c6c4e396ebe7e74129a41b0cfe2726b4dad34d51f4bc706063e654da898824
+a25f8a4d8ab34724a732dacd2b316c80a6544d4b8c1f45115c4f55c3efae6129b83623ffb31da80e2601f70ca51ead16
+932b54b2bd26670936843a92346d231f2f3e3659542f4d4def73fb36ac0350733853130a5e5e9d8e386d34f817f5a91d
+871bf29d7263bce62a02690681d4e1c3c2f9c2751de4e35810ece13c9480eab93b80a00230ef0ffb858a829ee6bd96e2
+ab9643bb1c32dc2e8c05ef49bbde9937072af214c19c3932be137b7b75268edbcdd81d1370089be44462b8032bba3c57
+b67d510c460a2f14b7cebaf9a15642a14b2542c13ebb1d1690596447ddfce6a86327ffa377c28891f6bbd8febc2c17ca
+93a5ad5019a8e680bd053a524e0ffaf8cb18adfcdb22ccb6cbed67012316bcebed65294bcc0cf4f4e2915dbf19ff0948
+ac7a7fc1140b1197f2aa424b053e8ceaf48abf41819efaff87a2e63cd6e962c278942c2b97742ffbbedc5cd426a8df50
+af0115d9c2f887ff97ee15a1116ab06af1920f2f42700b75cc010d4c8038eea941c9bcc8e7cf4a41036813143ab3e8eb
+90c768d880b6ac17ed7ff9bcf76cbd5c1c4879247a757d8cc8b31c4c7bb0ec763d746e6e06e361afa8ee158e36ccaffc
+b3f10561432a97c95d02c1a6f317bb1ab5b98cc88cf5d56e1492ca84eb2ae1db92e9e31fa454de562e719b71442e69f0
+8d94729b5fb0afc196064991f9b3c8e04c0858199aa951f49421ab890079804179fe00707978f15637b8d16246794001
+968515d07a0f0eb52adf439d8f70ecd1f6655072abbeea45431dad26c8937f4aaeda552a22a420598d2136f576a966d9
+91f50e6f292e2bbbe226b221cedb9db36bcd459bfd74fd6356b0620766d96869266315e8503435af1719d8ff765467ea
+968b328d79e183ec560e8f0de113298755cb23a893a631406defdd26ecd52e4b6f28934ad2e219382837fbb8f87f4360
+94c126a9035059d2d817c4fb16cb13fe6047c356fc495aeb369acb1c45e89306554631f50d313707e82624b6107d2fa0
+90ee85deb494043a1cb280d687e3f55345085e576484308755df1bdb6f734e7dd25fd2489cea746be5d2c6384e7986e0
+92a4f64d98e7e633271bdafb1eb88474013b5ed2c65137c243729df0d79ccdc6b210118ed3587ad00d3f0f757400e47b
+af31031fcc867a53760216cc1f467901aeaa3b28438fb3ec90d6a1c8a46590062c40fac939bc3c7e7a7deff8f83c262f
+94306afe09f20d5de9ea26f37f5fc8df1e29b3a6963caa94df031efd428545493d53e0d8d7af12ee525e2e21cba23324
+ab6285371b981d5443ecea699af9da916f9320b3ed0a11c15503f3b10eada3ff5dc95d24a54f5aaab97d3312de5b985b
+8e9735364ae128f790dfcbedcfe0e11b991602dce0c90ab3cfd4aac74526c30a798fcb51a8ebcc5528d88c724e9c2b02
+89a3c12bcc68129b14fdc1d9b5db8d26d11c6c9467f5bff7c40abb8ec23b193746697421ea4400d5ebe53bb3fbfe59d9
+8368e44144947f9ecfa5d126f4a57bb1d3728fe3c5d3bf83310174d638a10cea02ae79fca91d5489ecc9fa679feab49c
+a0474ff532e1a6a3dc8f16ae27e77d6ab72b62535ba0d3ed09da5c692c6fd34424141cd68470922e1e147fb7f7479d5e
+b9ae0e47fa8d999135f78c733cdcad786b96087a340f86e4cc2bdf019b07fd4a76f9b4b041eb397f61bda20c31d27838
+a7262ca18a7179924d28161d64e6b6cec5da35b7eaf695642dbc127a7bf4a52bffad82b8d3fcd010b308dd72eb567f26
+a23ecfac8a3f978f9ca8810458973f528846de6bb92fa6422b9547d55d29d7db7d8bdc5181e9ee2257a458466f714449
+b04c32403400f82677d831314956acd3cb507520ff14d856cf8ec4fab37a4428a5d24ecfabfd2c6086e4ea6d26b005e5
+9669b2725cd5965305c6ea48331e693086f4c1c4ca7dec26bc6290e9a8e70f9f0bedca6e36985c39ea35b412abc7f4b5
+a6f68cecace45317a758658463c5fc1f005283d8c3d3de9364e7dea453007d8d4bc849a21205d61ef81019e0d25858fa
+8ee19ccc1c83b2c4d7c7b712bb370c129201bfb340c5b49d991207c995f870de2d0efaa88e05bc9eac567c4c36e20175
+8a530ece1992d1de92c4e845e71a1ab24e53a8a0679aa5bdeefc60fd890ca3cee2121f66c6f4b29c437440e7644e65d0
+924338d7f356da9b8477b3aeaad6f754a8d8f6a791d70c3ff23c2a6d4488efde9b9fc351319f3ea1f545dd11cd23ab76
+8eb76f86e057cfe9f655ba29bac89cc97db07f0487c86e7b41555b5549897bd3d042cd2ede35e312cbea357df622c6c2
+a2c0da965489d15ced574f5e27cd4781a1dce8fa4f17762a25fef1320096b9eddd92a007d58a194ef57def3aaf4e925b
+a3fc89753e8896d796859c9e5a00d184be7d37c4d5741ae8a60cae9a7a30c5d840325d6479701e1f61e37065fce81870
+8b2f90cdb3add567b94f4c7fc89a8a57a0f06877639c33df2697f7c39e52c1869aadc98a2f8b85a58fbb02bb1bc1a441
+aeb2c22d9186725ea40d3a4bf551482bddeef42c0ad33801e35361d3695769429449c2a13955cccab55778d3ff29b664
+80bce007abd8ebe2238d465a312c2d125d1a695184b93108d728075595c7716786f9188e90ae37fea89009d087e71b07
+86f5df2b83383c737bb6db4e435f496ebfd56b51300612c402bea9ac2f439ee7e98cbc2655d31646472ef983aa6ccbbe
+880e8a19af5ad76f14cdf94396b8dacf061e02eeaba02d4c29ddf0d07c6d2a737c987d69ea2eee52f0db5a4dec318932
+8b82368968f9b5bb175c95862ad403beee68d199a20d5dd618395daf11ff0c2e1fbf3a31c23d3e582556276b44e70b99
+94a062abbdc5ba740077fb9de722ad2ccf3f6ffc8b4a9dfbb0bf2ff789bd529e7b9d8da520d0342af91808fc00431638
+890b4ee1e9837a4c215616819dadbd3c6ed7586ad391498012a54d735c6df0b72c2dc3969d1b24cf6fe822f37f9c10e7
+a7dfcf43c9c22fd22f47db490e8f0b8f42597a5b4ae3e7bc4a9b12252b32f89412a2aed946eec19b133cee89b4a70322
+acbd9e85b9d9c3b068220f893d7b6368984f6cdb1cd06a784cc9571f0c632775ef890dbd51371e8701894cbf667d04f2
+a9b1f84f053ef6f41c59b1758836a82d53932cc4b8ee9c2cafe705150e1c717e3f5c15fc21a2532c071e9dd9bccb4dac
+b2c63345748a28d04680e3e451d1f7d430bc8ff2031b6bd4237a1f55dfadaec20d1854ac158cd6a1466dae525c1b9b06
+a23e7b2e5b8f3e3b0e350e1a461708be9c1434d49fe2e51473e2e360bb0be140a96f8ddac99e3b804557cc25d3e44776
+a4c4729a38f5f32f155ca4d1994b61802ee418b276486e2dcd681fec13316f3b6d4a8e76eb9f48e2df0339543b11326c
+93be67dbdec2655edfe40dcdcc0a7e761b7259a9d909ebb12fd7c9a5d4efa10de065d2eb049660ed01ede2f26388d43e
+932480849f97e32fb14d4a69af4073c377e949af7293951b3ca371a306d9e2096157f51c8e5036a44eb73c7c842c5aa9
+8b5e79ddafd675ff88d8f65176321a08183429d42d7fc1e7cc3cfccdef0dc5824ee40f279a05edbf4d50418a4cab2126
+962bd6fcf7c7f2a9c569d584658a735bd16440de2ffae236c68ccbf2ddc5e13836efb163690062537d52f7d8bbb24222
+af80793655c0b3ec3029673c50a7f212d297f9f80d7d1c7cb1409d292f3bd7dbb8b24581017d9f3964e3432f46e79ca1
+94c8cf3c737c102e9e91216752c82b17e4e42074e08ce44e701c2f8ac7c08902b911cabf38c4c5bd41400eeb1fc97acb
+8708ea7af8c86b2a1964edf64a9e9c56c7febffa742c3ff2e3088a61d3ccd63e135811212878ba7ad8a819e1859f4e95
+ab8e726d468417c168c892c10c7e2297e50c67e4283e5b48c3f3b014981ec482e211374f779faa0c1ead906f5dd4114d
+a93911e672aa3d8dd686280cf062f128bd8eefc058fbaea52cc0a9bb255fda84e65ea546f662fc75fee4c5b24bdc61fd
+8aae6d9289d8adf0f81e7990cc79cb704d0a975f03b9ec02be66089d62954fd9a8b005c5ba8179cede366d25ccf40869
+91e44ca55de8ad3ab42816504813cd9ed9c6d64abf6373e8891f909cb49c8a951ee823cd1f947058d542f0bf6290a11c
+a377f97e075b66e740b8476f085d50ce8ac21f206802384e2e072f6b9700a5f9cf0e6f2236307775c0e0d6ae8459d864
+953c08d9f2a9d6ccb22cab906efda69ec1c228aa5c2ab93822b6f71c007fa3bced68c6a70ac605c6145e4af770b60de0
+86d8dcf5a9ba81cf6a3149b2fff96e36639767e9de461bbd3ccc870634e8db331b98a888d7e8d3d70b6ed241d8ce54da
+88db73952866ec07c49b484c6b18de70d439e67d971c1b436684d489253cb96d793cc4d9a4362b51dffce837dbd03bf6
+970b7aa9070334b0649bea1f0b4e53fded64665f87e055e3527e0e567cb57a0e97d369aa16a005155cb69000073d7695
+928c8aaf72b3f51e38c866ab457f75cbd7131b676817a3c6d522fb8f876b01a9ab3a84238eaadaa0a095ccd6c1ac060b
+9561e78d16061b5361ba0be11387c3f6029415f83bcc8477b8729e88c55f4bfe74b59c1b24bec0eebd9779cdfcfbc96c
+aef133788d1e04ac64f573f3ffab473209dfdcaf2c675fddcff83724d17b91d6340830409b391a94405d6ade005cd01b
+b8ad4ab0a1ad6383e4cb12d479cde732f202687ebf886184507371ac277446b3bd1648c49c89343920e5d57fa6b255c3
+a8d00257e331f342b79b3d25b74d300b070326b358f690edbaad5e325293d8b55078605a43ecd9dfd27206013db4c286
+aa71abee2720052cce7a5a0c3968e64c2c540cc852dfe08b742fefe005dbfd10397f66386744c9bfbbaa40779c2ae190
+80c6680857b88afd3ae8801677720100f0fdcb9e49c82f74b8ca5a27aef34e6df03462cf9ef5f80169c72da15be567b2
+8c2f2865e132869fca5232ba5e6844ac0540a53a66971ad54ff91f186e011e5412450df9099fbe0b987be443867dfdb6
+89cf681e0506baaa528043a15ab3bae09b8817853e889f0b3de138992e52612fa3e50d54b3686cbca6428a7644f58208
+89ddf69b72b9ddf7d535f742bd3c942000061a5a54987f2ccc7a09e035be978cb32f653df9568526c5857a5df4321f59
+9908a3288b9a9972c3f3f0d5923d9840756b74f31ae0b24ef2188465efaa5247b1ed13b774991bbe4c065c7e71b487ea
+9454ea9a664390fb1ba79fbb5c0cc765d8ccd32a02d946a14353290fa2a1ba911605ff2e302c340e9ed6fbe8543ee6a9
+aa4f4d9ef843ca3ba334d73af634a0ee800b3393f8f7701cd152274f4296eb79d63869d452b5e83976eca246203d6f03
+8fce1e2e59dfc4fb46f3741d27772579fbf2f48acf1a38c49b0e5dae7d35f2624af3a46a48b89bd835b7d452ab0cec80
+810ec0e58504ed556e788e23067296a8e4b4ef31257d508f05e5245bfe6d2c2f658fca8c81538c6c9ea6ed05a8f249a9
+b6667bad0a7d49cd2dc60af85e373fdaac2af0d34fdee51a9fbc1fe8b77470c162a04da38228fe68b7d5247d43026734
+8982971d57bdf35e0f34e867fecbe0c140d94101484ef4ea01b796633beba184f980c3ced28b24ff42de1dc504dbc854
+86d8d1f3edef9e61058a58d966169a05f07fed0d93bd4f4a7cfca5a872b2aad0d1a78f8ec7784828e5813c8da577469c
+b491624c3d5e517c9019258db6284d7533778e44b1a0060dec5f655a7b79057141079115f5cb1d8d97a90af33cd7563e
+856e1cd4f9ab7cf323f5988bb5d272857d2fa90527f800362569a39defd93e37be2a60c11f498c482654f55560356f7c
+a08884d0e642c479fc8e5a9837d1babbe63f3165c02a57b19d0547fa1fdc18ee382ea82a86cfd3135dec8f2aff793f53
+b1a4de5ea703fa5ac8a70ec515bc65203a9415f6da109b67fa32843a39d7fa6232c9c13920d78c0f16e99fa5f6a27e83
+931a2ee3220ac7888157c426d1b33b8a56f8879fecf1461af4cd6c85f94e193bd6ae6f8dc3946fc689e42bee213f0027
+a844a78e65ea6f75bb55a5db1e78b88896caa1d54b624f218eeb302397dc98a084a2ff4b964acd0650667160928ceea4
+b9c214280a15b423654a36b11646c928fb42ed2a692aedc01441c67522760df29c6ae7bbcb9237938a823188ad4d83f4
+a19575f9bbdfccf970bb3754818e49c709d1bf0af015541182fc7203f7aab51cad31544072d52c0234a3b649d03d9a52
+8cd1127b7485ea7f349e2c89a4b78fab3e5fabe5a95ff0cee10a3f4fd48940e431ca5e526f6342f7da93e32e8eaa1448
+9906abc725e445092dd7dd0aef90f989e3c78aee96f3c0a67ccb62fb2a51363c71d783490fa5fdda0ff9ea69f5b9233b
+8996df92e014c226e5ac724075c19d19a9204b2e086ed5e75a9bfa1f8391c4c77fd5c0b85a29f28b302a4af29d38735e
+90225c9490b39d151a80a9f4d9a7f2595961c44779a54d5e195ec95096f77e30157c6c629cb1c36d995f6c3ee129ad20
+85925b1dfe3884ae3a0e993b67b6c49685deeab6cf0d9997309961b7f727cd6133797bf04d21ef7b620d1d6392450b64
+88a6c518e577a820d83f87e9d5f236f43d262756b1bae0fde72af241fcc192417ca9724428d17a3f9dd813712a772cac
+8f501fd5634fddd00a8411c0e9c6947bab0dded26339821bc3543a64c519d9575c3129f6619c6079d5e95237c11cfeac
+af2b42945d7c81bc422a1bcdeb80027a1a243f89c65c173294d6c92e4cb3cd650740cac17408e7ba1a34d37d865b9bc5
+abfa5e76f1112602ddf152aceaa9f588beda3aba1115d0823d6a6b074d28389fd4c8178e8a845262200b9af024a33a88
+9732a0e3efcef5ad4d43811bcaffaa1418c791d3fd6ca4489d6cbbb7c44b55156d218f0fe86f2ec96ac306fefab2e694
+8837a6c4e60839ffb0b59e94b37d81bf1ea392d44cc81717c1c9104468d31fb5fc3c35b1efd9991b5e7e9819c66a7221
+b6545fd0b455748ac3482e0ead3b0157563cea7bf6bdd5ae2af7afe1ade921e5ba80466885ba73a89657a735c92658a2
+b72fc49fd3be541bc26cb968ba4eb3078ce7c71fe0ac06340f7ac25c0befb86af03c4cf8f31c857f9e5d946401e86bb0
+929f424548e29c3b47fbbd59ec00d17b00ee1c4f6b966c1fa7e0f8528d52078278f2852da976b8931fe813b0c3b71ac9
+b37861ba981001aa6192cff06c13f041410aa60f965ea03dd48068b4295d61d2fa276c3f477f985f50189e33308c1876
+a73c7cdffd646cffb255d2519d8e08dd8d9a9eca0610211177e259230b8f8c7ec8727015853197a0f11eec8b59d4f2bc
+8da1260ce51220ad107c3127e871715bd738639cd90824d1c9f5b6181304f363b8bdbdb42c21e4e360cbdee496b573a9
+aac6bbc35bce8b54820ef8d7219a4092c49aa5d4fbb187968cb91ac04bc44fa119766f8c630a727ba184cad19278d9c8
+b964de0bd31847ada13dc3f6e1bdc679f421e262c03353e39f0ef1df720ba05e6d806dba15b6e10df559519ca125fc39
+a62e4336b61f85eaa415f57e21cebc7d54c68f6febab02de76bc04a69658ab1d2f7cf0104da79448e32e2b7c92b684c8
+897c6ca595bb2884b643ce8e69078431979d7e6e1b2dcc6effaf5a62fc906db6466f85020bf5930597adbd99e2ff90d3
+932956e0ba09f6499f1ed231732a444b0adf17080237d9345d06d4262fe8a5fb0f704c919513ed42473751069c57dafe
+a24b9cb4ea9c2203a95b0056bb95342c4fa0d91bcc25595fea0161e7d6f45595f7ea171e0ac1bbde13a6d8ca6ad10bf5
+a7714728bc3318f6ac005e350de94f59495ef3972b328c673c5e608fa9059be3277b48f03a5a9634c3d03397af7d089f
+b98732aec7a0a9a7998ba51e2b76e5232379482d0047f4876cd39918119776ae2683590f7fe5e44d12b3b3efdd916e8a
+87700c3fe20cad8fa3041976c87ee761941d323f2d64a9818f20fcdf0259f796a11e55cdee31446bd19307cbe8becf09
+a37cd03fd348694b2ea5cf081696d12dc4ae108da8d48695bf74c921b90612d18c1aa71b1071bbcc02829e05ba1363ab
+830e4e7ac24fb3f64294e5c64563ab5708ebf0e133540b35b985390d68c420a6d680d779fc87245bb1f5c58e59c5ff39
+b5922242a82565753dd2c1438008462d531f820af1b565756d4d27a30e3406ecc503b1e5b628012ea0329fd75561dd7b
+91068438d2bfbb0666824d3cc2be488f2eaf3a8a9f21805838f9f2d582ca6bcb103b2f0f313b57bc86f87704aad7c7d1
+a9a2133fe55e99114e526904f5fb3e2e141f31963562887a9fe6a262496dc405c756bf6dfdd6acb8853ef5a0a5146037
+8e48e79f9eb1f8757b4c4afc4e3d6da4d368bb25b4d54e3a1f34f3af13d8037b0d465b29894f68272b79cc60fa676071
+9378b90495b0e6468dce3102a97e9965a5d21fa4a6494d401888b8777bd58616b99d49177f2eb2796476ae84d20b67b7
+b0aea247d7d7c7767519b87dd66f56c306d9eec88b0db8060bb97370099892957e2c950fa2e05f24f8ad097889cab087
+89d0d48769ad81699d5b83f26ac49a29c3e835caee03469e93c11e5f4b8470eb02b52290bb2c37f06afb0746630803fb
+94de42d8554583b24317d9ea283dad5849e2f124f659d0afa11414898ffdc4347a9c4ebe783dded21679337b58b67f4d
+b76c3047eaecaf4a4e6fb6176c7f4a1d393fec3a360f4c711d6293a993aee39d5aea654fc6429c2e4d4955b12fea5c8e
+a307fcef0915e3e3a27b94ddb9561e5d210a091714b73afbc0b3fa5e8140e8c3818f4914903975e8f78d0492d7784c25
+95079c4a5008fb6ae0d653c00ad901a108df0b8c442a68492740eacd15048106b7c4cb5ee88bc6b1dc089987935bdba1
+b65a354aa8e92d6ca2e11f4ed3c1ed011852bab8f0e5b8157a10c26db2748be688512423c11d582b3dc1da57b9d6a826
+a32c2fc62c38eb19dea24b545d2537dfe596423f8ae530e562ba7eaac34139fb443d88f18f39d65d36a65ed1277973ef
+81b83b37927e9a6a7c34cfe587dc9cfbd560db3ac57a8a88161fe4ae9a7c66843d32f6f568c927e2ff8f21d8b4299475
+8b6993ef73c2021842060ec0424464412242aeb711da2c43d3985f9d15e4d936eb7a1b5098bfe892fcd3b6ba8bf42369
+965535b46a18f94a1203fafa4dee5963742511ab77e98e471e03376847850357d543dc6ef2dbb765cbc1f03f66ebbc14
+a9386ef496b4f96bd591847baf6dcf8520f7cb5aaf1713025ee894b40b10f243aef06c553376663488377fb8b1b0a022
+a6bae4486fc16ec1f12817f2d47871c8bb61f5f1a2db5f828c6e2c06bca64b1ff7cf4c059a10d6bc2f561fc3a12aa38d
+a2b6cda6a75fac16f324935cc1820bfdf013ae02c209802befecac0288d90263a7f84762dfb7c9aa1351415c03288714
+aac87216619a8c50b5d54432ed5681b1cbb2c7084f33e9a91889bfbb94fd18c8071b79ebdb403ad81fea495bc1e37dcc
+8bb3b3a7ceca82e4268ab52c00322d5d0822427e43c1d8b88b2f43c3dfae7100f6a29832d16454e093579cbaa1074062
+a2363b4506b1464391a194412a73d47d0cd4ea1ffa541cf8b936c97a46bfeaebd1fec409c6aa2109d277bfae0ea7f0fb
+b56911be2bbf1e564715191a526c2ae73bb6e85c45e3dc22bd9dd87cde620de93875c48b11e02ea66eebb68f533f353e
+81609eacf4b2e78a9d7f469e0882ad24c86ad98dd18f466d321aa32a762171cfc334dcc049962ef5e63248ef48244229
+866b26d3dbab7837edec84217c85653c6abaa617e0ba2657d67757fd1c7dfc0c7f83f6198fb85a49b402108d6fedeea6
+9771f5796d5d47d22100c7ff7d191795677d53796f4a1e1aada949b372ec12decb6c49e28f2662e729d44f0e09eac063
+a9fdfbfbe114c7f93806b988c50f8ae4e13a4d433f2e40c72b81d0ed7fe879db5e89216a0b0c8392a6d9d54f57760ecc
+965336222244229fac41336464c36dac8700d5289c0aba78016db76e436289a0797af8c96d52583618f8c6dbe7b3562d
+99719ac482b72d54fa515395847e9a65b733da84f7d10a0be82f34afc20159d64411aacca15041726251fd90ae06a9f4
+ab96b7ac88842ad0ab61f7550b7b4697d6a3b651cfa3c10ad404e7505c742e2c1364bbfd08ad0039ca3b81ffa9d6a6e5
+ae96088cf12f76140888582f6f6404b6f2666c048950166e37bbe46c1398fec343fcacd3e8f332f7afa222ca13fbdb87
+b5b5c1ad493b2e72ce8ba698351f596cb85841f7f7055e31325cadbb4fec3e8045b335643190d6b97c3049d10551764c
+85f066c7ffd2bfc4519f42f0778ce0e46195466768322a22673a073ebb66cd77c7b8b3a14157845cdb369d3f40911421
+99f4f10397cb7ff47a2d9d2f29021d1ca96f0da01f8afd76f72457cba6e6376f925fcee28ce77475b90c9466042ac414
+85116606b18f6e5404e9176570bf6d7a9d86116e5a29721a1b20d6b28a733886e2085a7563cbff45d1f11bf3d552ea12
+a17d81b236fb138ed820d335dde2640ac3a44cccb5f11fc6bea5fe3132c4a9247b874e75fba55bdf8093f0f56310a999
+8a16a5cfe10c5dbecb4fd9f4b0c370162071f88198e016111937199b87d006d1b24f3f412d853d7c6541e1c68076b70a
+8cb83fd2b1afbad7c454430fb9dbf6530230b782c7dfb01443c2c16563e833c5b230f4c4268dc37a55a681a5f0bef420
+b8851a8dd6a3a17619e7c84b18f29ac9680b456c03e8c8489376e6de9a22ea75d1730787ca5d269af44eeae47f87bc24
+a8f990c9290456e849ae4cc0c320580fcfd50263af8945d01b00baddf801aa0a7bef2ac119d4d1b4be6290615c781656
+b0fa1c28c8c67ff87427691047c362aa35de0be9b0121d83b116b23170ad2b712a0b5bdf6a57a25c59201ba165d5f0d6
+afcd2f5e66a277cef775b636abb598ee9d7e3bc1b48b521da787dc561cea8d7ad963f593c3ac6f23a66a27c15876b775
+92888863568ef01b40d51f467e8364cb1b09808238644bbee5ed118b392475e90c6a1e03a0ef826dff5ada8d10be716c
+a8ddad388f2dc94294371d0ebbce02016c463a65bcf3a5366419a7a910d3d24748fb5716ddd81cbab44a2362ee3c077e
+8b8ef4f818ca3de1683064ea7e968edc8d9fe2675b8bb2ae637a5784a20cd909d18eed45140189eb9f080c53c06376fd
+a52d9c49db4819cf6280c220a6cd306a5851b771de3032f28c7f8750c20e80cbfda57323a55a8c03085b41f4f236b5ba
+b01fbfa0f80ef574a1d6733899002a8672cc309e1014fec8e81ea1e96a7be9c247a570f825b7862e814e1f006a8227ac
+b07e163eb0f96a51d74aa8a7fab5d23e44e37b1b1027ae9c4155280d8d159f0cdeecd3258c098a7358c5bf2fcf1eb7e2
+80c4512a5bb5e8255488fed7b7e297988732473f0ccc1192cab716a88d035e23cc374a937fca7da87e18048ab026d9f7
+b3e343b13c1d4c98b7706edbf362eab12b1fa87510d5cf168e510844b24c8a9624f1e7e0babf455c6d425741c23e1ca6
+83e4b53953ef683c512756b3fea37756b3c562c88a15cddd902eeecf0de82d0345fb05feeba511e8a6de91aa1f722ef7
+922512dd5ce444df62fded2c53a73385570804e7305cde401116c06dff5ec7812b776b8cccdfdafe422f1ba53b2b56f5
+8d1f7feee880abfe9f09708ccf72f376013b2910886edcceb76018759b88b95cab9c0e8f176faf042729b405a10242f5
+abb7cd087d0cea2cdbb47cdf9be2c6a0c6ec113e1ad5fac083f66a027697d477ec69f46b9aff40c239ad9959b9854e11
+b10592443daa8708f8c882da795da07465efb9829305170bc3bdd781cb6651b503d3b21eca027486d413f1748f40f068
+b14dcb895ab22335373d2b736628c1ed0e815072fd3844867ae24638aec60f8591c6885869ad0bfe509fa3fa3101a5f0
+89631708996651bba6b2113626a2fe1ef0f2ea2f21857b2a1e5544ad31e8a53e755b6d611546ebbba4b2213acde65e72
+82e9436700fcc5b842ac2f0482de4248ec9d1f206db3dd36917c00c7749bda257fedaec513d8a9ef3765057bf5aff25e
+b1c2b26d93658451fb4e9cfcd77209dbfea909b2212c000fcc576ef29b808061c9f58827682cfa09e357c1722c3215b1
+8be32f59768777a785d8b257f941215f37db8912183aef4a39a856b88cc680ae7124789c58cb3c6c6f06a951dc96a1ce
+8cb60a3d0c9a1efb89f89f78e6f0e4bcf5eabeae6cb215e98cd7f9eb58699ed70dabed73a8b95daf32a5e4bf0d411d3f
+8ec7156d6b672e631ebd88467f40caa9ba5411ab727602f3146b468bc00ae54fe44b3228572670215a0dbd59feb66e2d
+97b7162101d740aedc894bd5f74b8cfa7ca7e7fe8363b05491c15e8cd54f21b0b09eb41f756b9089c379ea0ab189c468
+8524c9de6be47cb6808df761ed03c505932ba715e757dfb3c97b6deb462433d98953ee6cbc7a576b6837e68eb16d3188
+b024c8fc3fa4f602ab73448418548d9896200065a95e8a001f6c8d4cc3f53f18ec8b85524377fd93e2d2a18eb4c48b57
+b344dc93d3057465592460b7f35dc015f4f8025fbcb44a645dcc3dfb37044d5681d8abd81bd544272dc57cd50048f29a
+a7b270b94d9870f8afec3bf2ed58afb76f4ea576a2175502630d0d3f92f9152c1ab0c019f175f566eed29713dd97712d
+b86dd953c40d4f5574bc7489323d71e9798f7c6f2dff8d41f6295655c5a275179ffb4bb8d2408b88226c98583a7c26b1
+b73074289a5b08aa695de03ce2f5b106107c6cf2bee8061e3195056e799b0bd8b4172deff7f413ce8e477391ee6294cd
+98b801a58ac7e083da541ba058c64b00ba709d4d0ba1683e5d83dfb80a29272fc2a33a18f32351b103b227abd5123da1
+a7cf232c6ec6b9dfb32d729b9d4216688f6d2b6e68053ddfb293ebd5774218c69133baaccec7ba3da9b221af619c2ed1
+8cc1d33ffedcea05f3c593e5b63dbfebdf26d05a5719cbf642997be929336b92457fd9df0d6be6c063918ada8fa2d322
+8d273497dd9f822984f1d8dffd471cc703d03c342f022b2bb24492209a3889f010c4f7ec124f9fb9f884a1a11f84a414
+b62cd013944d8d9d72fbe54897a94e804c93eb84a24beb0880cd98fd5d48fccf5dedf5076abcb1b857adcc986b729cb1
+a1bc703a67ee709f7776b2871f2a88d8574c9e2910690c9242c162ad926ef2263d5260f5c19015ddd5ee1c8ad1a444ae
+87de434e8ab5b1d067188cb9c12ed936c26ddb0ee76c4c9cee9bd1ea916e411a354bfab2ce77ed8c8ab5d8c62038f933
+ab128e9de30bad31dc2eaad851da1e39741ea61bd203b48e5671e37f7b4e3db86687574d3cea1f561bbea84f68cd17c2
+b54576c9c4bc3b43270b83b89eb75cb7e89057c99e14021ca42237dce393dc6a8614c5af5c2f69160001b2ecbb407c9f
+93adf38f161ea886f41e4af8e42c69c53a51074db9ecd7b7e4e36c858426237167aa49b79737625c9f9826dfd22f39ed
+a6907c8dc4073d3d4d40df8302c1637c15f9197aad8511dc95c210f6a60b06f3aab2622b826d16596af27e42f2c9d5b2
+a8b0c4a3a5d3dd5b6a85802039f48fc80350f6f0be2e55bdf75e3197a22f6547ff4a7dce38ef3667006128141364625b
+8a5f4c17c729509309b2ac7e0dbadfbf0baabbcfb1fab02f91d055238faa3b66aae850ac9b8d7b7245f0a26bc5253c99
+8bfc5d594700287da2a85a78630c616af8e555cbd7864ea604ba38eb75742fabf6aca12ed99a2439e2e046d8f048a29d
+b0f91b7546613341cd95ea112e04b0963fbf7795f118c393fbdc37e37dc25244d10d987c13d6fa6eff3c4721fd0a328c
+a70b6fdc66ce4c2e7f1d830b7765b7f0640ceb7306cc85778488964cbcc336ac378b74b9c4ec27358f27378380b3dec1
+87387cd6b643721aac8e1a8533c27602d9632168d3a3532059163dc5e4613838bb4f07803e6852b23c58f7103d134f92
+888722a5a56f5b6b00daba53991ab6fccc32a029a7f1748f779b57732285e56e09ecdb7d4848abb3dbf3e167cf8033c7
+b7f5b9ffa8ba66f54cac387c197058eb9025cb3761550c78429db95f9e1e3b49c208ce86b6126c162a62939e1080895a
+a53f38c068233b584211157c66d9d2452c811bcd340d8cfafd32b070c326169306975e558745d63e1617f4b4528a2399
+b1c3e9b0f19993f973f038bc45be6a834b1cd3d56f112c857711c8e6c30303eeb0b205bd5dfe75e46b1f4d4bbb68fabb
+a81fc28620e640ccb57dedd40c79b73b0c51565dc61097527b2341bbaa3e1c9ccf20f9d8da1c16704e881b24df0b7335
+910a7f4960a0ec2aae66cbe2ac98f43646b017de84ef3d486c19b7809aa16813400bc2dccfc80e09c63422a9d4d88f56
+a463868e3a8c2d2a7c49850be2740e01c7892c83063d381f405282b4c521cb6e3317361abaa92042c38bb68695c10bb9
+991957100ea0f66cd4ebd23d9f6bc7aa62220f6ecb71ac947cbffc6f36f7891173670977bc58a6f57b9a1e8766100c2c
+961dcbd2e6cb94574a33fd48b5d87e0623411574666d5d37f4ff7dc587980e2644cf056e002746088c3c3b0ee7044510
+a27cdb374cdbff217370015d78c7f5c4674ec9948339475cc80a5805979a4c6a2614b6904f943374e96bb838549ea517
+a567bd4a59f9df9f5f30a70cd9f6cea7dc0e19b7fca37fef5846aeb1697dcf7925a4735367be0828f2ded5007f711f03
+823937a900e3b8705b657d40470357d91eeb339324f0fed58695ad72dda7c64f2a6b7bb7ae4a20cd1b2016cb9edbdd1a
+b07f2248802ba7dce15b2698a60a4896323d37ecae6666a71cdf85878094bbd4e9c0e4733bd8bc6e9c850e57727e1d86
+adfcdea69c5608f02630db045e5679f9f0768fbfa9c8e97bc9cf9cafe1f747d3813e7bb1adc6085cd57102afd71db133
+908153d3eb2eb2b93c15aa606531b08981bcfc8b76684c2483bf869f335f9d8773a9aa3986ee54d9392856daaf82b684
+8fbb2acf533e7d6e96e9b68e77f7a1df2ea6c652cd8862b946c93c084436d7349ef4a0c453197a9769e986322e9174b5
+b83cf4ddee6140c9df0a08a39bfda79c0d55516fd799c1c24b59397b87a33ea5a0885b2998dadc354cb6f65a4bd946a5
+957a52cb24f19106d80d4115a8a0843d047d157c4a8535775593c1dba9be24318dd434bf43a82aa7755897f895d2ed15
+ad93dbc2c055f9d7e42717391cfae64962a78bddbb9fd102a05cea520654d4a9cb6634234d3a188693c87c5b4c78959e
+8dc4b8e49de9b05c33d2a98973e223c01ed5745eeaada3a4c0e474cc22430644a53a60c3d6efb1212ca298c4331763f7
+948b0172df27db83e70fbfdc896ed82696876ac4c51842d270d9ce1e7f1fcc9487d781eab97f40074861401b809dd7a0
+ace190f75cc102a79412fceebc013bda8cf329798db4b4dba658e63228ca7f141bf0849d30139ffdededf98986f3066e
+8f968dd6d7e06008a1374743b965a6204c11a610ad92705e8dbe6df3c58baf36b47c5d9988e4a417c80ffd5e7725da7f
+b8ba0d5b36cc41f6839543d43166a08bf512f7b56040891ab80efefc774db28c833ecd444a703c75547fa1404fa1ec22
+a29944dd0e5c861eb37c744c429a0dce596cdb2e5b0b2d2438a259a0faaf3d261faee1434bd28ebb2e6adab59ff3951d
+85c70422fde0ac6e7a0574512eff2a19df8049757bf78b5a7d7870848626850f17e8b0a5661e5292f3df0f613886306e
+a5ff5c3ca2c70b88d15633f9c38d2e065bcfb0e447adca33301a0d4f05b761049c8f795444f11e39357fe6bc0d7f1880
+a2167cdb114d7707f1010e0be9cad488fe56cef65941c35a5878a100adbe522a8abdf7eab7bc689b8727fafb174032c2
+ad3f526ef9ed367b2a25c95453135510472581a758760d47eb9f9b57b04f8c061152e5a792584d6ca7124dfeb7e21703
+86443033ece13fd386485115765aa95673be72b0543fac2138e1488d22419591176423213ec06e5e4549a025eb6aafd8
+887e4ccd58603e6c9cc99bd2740bb1db2fc4127e8d3ec9cf41bcfa3589b0fe1931ed2a6140ae1199d323d2870882ef6b
+b701f7d7637662ea7024d31e94245a5f745c7ca889f4f7a8362537df82b0164eae83da5a107a21c0ca889926aa50de49
+ab6bc11d6049cc5945011d3973eb2dbd5a3d786b3824bc125786e734887254a6ed61fdc2a97ea34e6b37b13cd97eb781
+9901a1f44122bf5aec7cea28e9405c33567eb118752edc60f3cf6c80642370f86557cbd76478d6b0ea33be92a22c746f
+b9f453650996f14629642bef8fea66c90105c8523f3875d86694100f8022d4fff2915ac9f9b9efd6f425751b113d5623
+a5bf9385a1c94c09ec326c49b6b603f2de987b2878faf0263ed109410536543095c07320f762fb6fe56ee72a082daed6
+ab003c86dd62c801cb16b727fbd1037aeacbec0f76e8abda4c6d87066cf0a33dc1c61721f2134c3b78975efe013cddb7
+8dd8c580c288168f896fd7ffbcf5c8167a55d34f17b2c362d0ada0f33a08cc0568b37b01cf0cef1fd5e2c2e250fcdf7b
+acfe675aca83a774d3f526ad461f0deeebfc73a15ab3d37b224f8740ac2d9df238373e6cd1f03ca78a9daa0a796c96f0
+a45cf3242600fb9733dd5e0dda1994e8d37fc483885a34a76cc16bd245f6d9c8d15bef360ef59d0a2c3cd59114280b87
+b64097145d97cdc8b7a84edd1da7e84f8aa44c3c2a4823e6e8485fc3a44d94cde7d7ce8bfb3da5d583386461ccb42afe
+a10ec5859c274c0972ec39ac80e461c29995b35d03603dc97dc30ff826ef24c5e52d5dc9296319ffc672b9e1d57d7936
+9702ee805b70a1bfac7318e8470667ee20739e3db3030bbcb9a08568e96c9c8d2af2cbeb26837c43e04997457c623486
+acb3f5a663333d1b4d54dd76a23c6601fd4540e2b050ec2a7fbf0b850b6f592837155e6bee5ca942406643f98bb2ca83
+a577b96723f64d2671f1253fca72df86ef3247006c92cedcfb26eba4b4f4ba71bfffe1d5eb87b0192378d0303177fdba
+8c397ac56cb723df015d0ef202fe486d1acb42f8129d3e4b37125a7ff9e81aefb1e19f477d528be1e6b18e7bced27ba3
+a7a6e6994324a80ee0a85e8e8cf818f5f8d16d299f21b2fca8a9f65231982584afe921e76723701abea873275ce0c15f
+82c8ee7a39e49528efa60ce1cbcb3017904de6beaeb751c406b64a94aa73af72932e32b63c1d3fa22619498fc46de6bf
+a1d0193ac8bdd44ffcd37092a5dcf6e775824e5dee4c0aea5bd46f2e25b312fe58e1e6b9dccf9dd14f240d7ced4fe071
+82c48967f22b8aa1dc63dbda0f66ff2f40f3ca9a7b3e752e1a950dd7daadf9afd81ae1fe3d0e440259dccbc1520d4e22
+a69d43e6f962b728d223f6d474a923dd13c04eb8858f7fdd2df2c25dd4d13a0a69e71132f450613e8e2d9a65938f31f5
+a613b731fe0d23ebf376cb1f3707ab9b2d428d1ea3a95faca9988a1ff4fcbde0a077b38b5942590e594307acf88c9db8
+a7d2f249ec666f59dc51f9c31db6168f33a94b17ab95123d4b19aa00dbe9e1cdf340dc6f64bffc6dabb11912e10edbba
+8e64b8f99ada5f317c6e2fd64ac17c4d6e5314c82848efe1eb97a5a52e6bf08923360dcb44c05d3fa59a82119610a898
+865d9512ec4a18ab31e4062b2ea6c43ef32c7c58d89bb0afdad9fe57dadaddd2150f78a0e85086454812855bf09f31ef
+b2d23f01a0d182abcd6862ab6f4bf924ccaac399ec143fe2614908dddec102e2feb8555479bfb71ec3476cbdd71b1137
+b50d176e628e06258b518be78c6dcbc3c9b2b4a1ed4ba10ee822b3ebfeaedc4fa69c61c1985e1bb20ea9f3d6df7a27e5
+8174953f4023e31e39f1cc3bad674bf2f1605ec9fc053948bb60dbf2cabade885376f8c76f45b638c95fdb14f5bc562c
+92b95a12d1fb1ec489943b3a2a1c8e3c8c6a30d0767125b87fb491f9d4f8de0629afa39fb5c8a84078b08bcc26e88c4c
+93f4b80d76689d5936aff6cf195d579ff5328ccd0f04db42522a225f96b0bde2088706356675f185186548006940898e
+a5f7f4577943741def19df611c2ad3d459c386a5e3c765eaa5a0cb6c192873675cccbe62845418dbe47d7a9822e4038b
+b59bdb196d59928326572807b2ff2edfc93a28632542b270ed462567d32bc36cefc40300619aafe4cd1e91c38d6c9c30
+90df4b921e13ca1e63e8a5c9968ff64bbcc5b829e3421d74bf7f678aa1dccc1db9ed9dfe5aff05539bcc5379dd59e575
+837b0b6813249c456631b2f2fea9402a2303a454a114149bc35efb400813397366eabeb4477f2cfe037f722d78a5849a
+ab5b33ae561312d9791bcafc8faf6d65f2c4260f126f11ab5c20c7626d88f2c00177588ec62ca763a7ca44c6ed60eb0f
+b0ed2e48cf650a4267c3da1378b8164cf6b774200a5898155716f85f7abda093a60b802ce549811644e5f075d2b26067
+8d47a4e27f448773fa2d592f052bbdbdf30cbef152db6d8cbeb3d7b1a0dc0f2c820ed7572eacddcb51c19a8268426b33
+a56ccd0961bf238ccd197e5bbf430d7c637ff6e01590febab3529776403682ee32d0a776c3dbc6581f60002dac86c38a
+9163bbdbf468be88a391698ab1f40a919517beb6c780062d4bab3bf8fd42eed6546a8c743e249fd61c3c347ea60ee185
+8d59f46606f063e68198457917004ae50ebb99cccb07755825782ddb25b96c3cf8973a6c5092c9db71a4b8ed075876af
+8ebffeae4fef7a83d81f31a88589e05f885dd0c0b4360545b22a18369a3e6762f187ea6a173f25419e70031861936463
+96013c6b47119e017c8bf473b3d643d0bea1cc12d84d412c2b9f6f55f22543a6e15ff7e818e9799af43984ca2ec3bfb3
+af46ef7696d9908fb343a6754de37e31cbb41dc1a4ab8203d2a2483d1cb0dd3183e5015d8048ff146ec34a6c3f2eae21
+ae047ec4584a962a7ae9359292c98f4d8e0916dd98a414e2e15429ff30ffadb3e0296282f0f7e257495e8ec4bc0e5328
+a16de787896a056d31e3f174418aa3882c03c879a292246a43dafb81f8e0e05564f1cd3ecfa251cdb159f63777fc6346
+97d1c4a94182ada88aa3cac95520711802cd3889e3e057e99a72a69589fd222b241d35a54b04f42503756ec3c1a3d701
+86be4ebe8b92f5bfceba757e1e2eb649f9803c8cb10130b88b13caab6bc04dac4e26d538b7adef68413b047ab9031252
+95d4c0b08caa283ffa9e307f78db15470fca5b577189a33bcdf14c36d4ae3f571d004c5aa1e69172a4068e72b7dc25d3
+965b7053a1d14f9091de5df8bf033a07b9f8d39a6d66979ab5424bbfa32b803075afc2d74e71235a0f881bacb6704689
+a93e72836e2efc704f87065dac0463ddd4b063eab125d834df583d8833873f575a0179781b72aeb2a35533a34a395481
+a2997d7c377060d910654550316ea7374a0329fcf30e743d613e2ebaa15b1bc6c936c2529f5466ef0e60ff53aa2b709f
+af5259d4d08617d9be068d1b79a8209497972910938831a435487395512187691d0cb021bd57eff0f694f32efc1487ab
+a78b8318838b1049f308200782c4409fc6c97ca5bb6af28996eb191027c8935b7a43a41961ec046e6c8539376c1aa293
+a4a6a9ec652d1c95883d21d3767b13a7e1dee73be907dacad197cfee025755db3cc7a8fb9f40146912f8a3f4c2c49c14
+a8a8ab62334a3c67793fa0691a0d2e80ac1681ce64a02df93b78e4a2f6fbf3af9b160d9ca6b4e835d58ed60d8ce627d1
+980c32e492464a6f36ce12ed06541e3b2eb098934c0ebccdcc984cdbfee4a506d15afe1a30a84d642322c2987d9d51a6
+8ea8c1adfd73747db98705e9fe1aec441484d2e4862b84817cdf1262fcce91f56cd26073d4dd23b04f836e0962428593
+b0f20edb8552d2b08613cb574e9de1c4dce1eae55ba9ab05dd7f2ca3590a7496d63d55af88b3dff881e16d8bf9147037
+915af4e9a28b12ea126668db7de6ff0c2cc9935b138022fadbb1f385f327fdc927388c945b93d252cb51803c242f7e1f
+a553e08f67c61ecc5c8955f7251cfe18cde02e6170845e70db1761bc00f42a31cc10de26d4c904200166311f32a3e56a
+99f4b066a805512e16addb0bcb08d76f017213ca6aa6afb5c2fc621805c4e123bbe0aa85eb5a0f89d3112635905093e0
+9236c5b0f4d2e58033735d7bd5d53ccbe82c05aa290149286a16a318043ffedfdca9d2d07817601d4216fed50c1082f0
+90a4c7898c58c9af83f94095f6afd5ca65664f16c0af4c8121407cf0864fdeb09958500b2bd0b78950aa9051e3480928
+a589666688e6e7f8e4d99b84d21a1f9ebfe681fad346a237de20a11a2b210eb99c4d3e2f645b23a85c93bcccd51f63f8
+a010849ed4df0e3a8eb61f7fd114d05a8669bfa36cb95d089bb1964ea8f5fa26be0cd10fcd9b38b259722c5a14ba3a1f
+b21f974a10a2dfe9987370ef4b6af294cbe8f4bbe35ce9400d0538c5f71287498054d73606e26f93e2f19584aa18e285
+81fea77bad05c3bfa8d5d8409b189fd5c759613cd69ddb19b2d46673d4df944b2c7293989f79580d229d20959c74b18f
+ac962b0819a03d2a2fa42c492f54c3d293c6d5ead403c50f7a1ccc2faad58beeb0dfe888a928e505fea9e09807e13a23
+b78b913f2ad9622d20c175ed23f80f235b5336343b0353f82383fa6aab99aef77cb489df822bb168e56496c1854f623d
+8c06abf72913ffcb6b59bb8201c00034b447011880733aa6b563acc423e90bdae19f2a7a286943b55488fc863d09269c
+b34168972fcd90c78286bfc6078ce559e3c216d8d1885ecd5044bf9f23a4ad15bfc9830aabb4273472c43e2980048586
+88350e0ffe9b5576dd0afabc6d8445d25b2b9a0945c71e6b9a5587649ac5d95cbd722db5ea1e65d3fb8230c794fda5fc
+a3bec1fc362a33f38795158f1b869e9ee857a7f2e1acb92c6a7dcfffa64443a5b7f6dffb656452e7f855051ae849be3e
+a21f64c49334720883e1243a27575648f53637a644c308ff24f5c26bfe65cc690a5e46b8e432171f31c4229aff4db416
+85dcd8ebef8f7f44372912b4a3a0dfe66a56f16c3757a8ec01b71aa81eeda9f8e5082f92e3ae8cbf3c1eddf5e6ffed03
+af3c1a770f34f2acc504f38ffa7a18cc4b38f8f84f310cdf2d7346b18824ebc7c7663cc0e00b44cfb5494fe6081aff84
+a5dc7c5989fb5cea87c2d878d8436d858458171b667ab5200dc2cafd8af2d9c2bfe2515b0c002cdc9c3e61e4cfe4b444
+b136dcd4577ef3a3a8bc946cf2ec79d3fab301114ee2a692a6c219e252c9128db63fedebc6bd6695a8ae58e7d28501e8
+91d3a1ba625632d59dc963ed54c0310d0447df3e1d9151299722d10f8b26161bb73e0020d408b748fa6fd1db51adabd3
+b89f1a2497b04b3f1b018dc88b52133e1d7470f97f846965fbc934d34dbc8d38f2d8b07d218e62c609de33b61831cc9c
+92fec43fc5af23fda5dfab78234f5ea7813d8de34f8ec269c5fa35dd916b9143ff0033d35e7a284c0ef4f41047e98fe4
+8a0b89cd35ecf5b6db26c39705b416a4b950aafaf3b00a9d75f864955e9074aac03826ff9393456871107563eacc024a
+b04db63ebce71161fd42bb878e89155bc9e887329e164481077c6a1db092477370a362810d291444f5463437e0ec5906
+88ecd5275592f8b133928770e2273a0e0c23424d72b9e505130b0599ba28d1c11eceb2318a49dee054a8ba0971874357
+8eb0271197fb9f1eeedaadd8eb603b8753ada11abf04ce90950034f51f756ed6ec6a6182a47e1f3ae51e3a1f3ecdf467
+81cc996bc6b12ac56a1ae3add4483ae4f2e2284e9d304f5fa1723231d0e5b196813b6dbbc20b70f5d51fcbb65bf284bd
+8e1d94ecca2928c4c68fbc13199b6281f8782c75c119b763e0eb122f81c35f8fd079d1bd76b498393371a08dac95dd1d
+a92f98bc09f8a91fd165bb8d05e3b5ec50121d760b353d7e4ea23c0e04ff29614ad9028a4a16bdfe323f2af647e515ce
+82e8dc99a14da065200699e458150dc6d49ec0e098bbd91ab8f1fc1767e8732f53855499c8f24da7b9dd681100633be0
+a67b6cb4eeab4fe5f4ebdf5649b7d61bf5fbf7b6cd2d357fdf348ba32dbfa9d6830b1265ea76a1c666b266e30d119182
+a64e3af1d0e600bde18d7f53a4e8d89d296eab4bcd9cc3a9f476c5b8425e6e8082066948fbf40689f626e27e4830edfd
+8f66b59782cbccdb31cb1bb2d6385307633ba4db31c375c0a8424a497b2fdf309e7ec1c95490324b9a909bb43041998d
+b93f4817eb1d91ac78eb650c110f7c29df40df47ed1d5d3209c3abe5cf59a5e7aee3d1cd232bcce77e157b1a9daa2557
+864b6cd72029640fc041fd3efa71bb210edb40589a26981724b944192c3c2543352b4b757836a7b0b13bf830f22b8374
+9064a0ac94f2f133e287b796363f6d27e9646a8b531cd9ac0eb45b99fa73f327238161a43f7c4fc914036d69abd1473f
+a40e60d4aaf9f50f7bfebd0e714fcfeba64e0f7ccaa0f4829144a7efeaf15a7cda2d62d771a76f98a45cda9196b0522b
+93e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb8
+99aca9fb2f7760cecb892bf7262c176b334824f5727f680bba701a33e322cb6667531410dfc7c8e4321a3f0ea8af48cb1436638a2093123f046f0f504cc2a864825542873edbbc5d7ed17af125a4f2cf6433c6f4f61b81173726981dd989761d
+88e2e982982bf8231e747e9dfcd14c05bd02623d1332734d2af26246c6869fb56ee6c994843f593178a040495ba61f4a083b0e18110b1d9f5224783d8f9a895e8ee744e87929430e9ba96bd29251cbf61240b256d1525600f3d562894d93d659
+a2d33775e3d9e6af0d1b27d389e6c021a578e617a3d6627686db6288d4b3dffd7a847a00f7ef01828b7f42885b660e4204923402aca18fbae74ccd4e9c50dd8c2281b38dc09c022342ed1ac695d53f7081cb21f05fdfc0a3508c04759196fcd3
+af565445d2ad54c83a75c40e8895f5ad7219a8c728bce9d58d7a83716e095432993ebbd3f6911c66415a6f920d1a4d171478509b54a114308a020b33bf4487a7a8d0aa76ae4676a9b54e765a680f562d3a4fcb2e92c58b14b49b5b2917cc258f
+8aa99cfaf514cef4801599cadd780d222194ca1ad69a34779c2bcfda93e5dbeb931e13914421b5809a6c81f12cf7038b04a35257cc9e94c33761e68565b1274aa6a6f9d66477229747a66b308b138f92aa4326a3bf23df65a1fe33b3b289bfe1
+99ba36d8b4f56bde026099278548b1afc0a987cbd7c9baa51fc8e6cbb8237a17636f1a44a385cec69b05a5802059956a11fe793cabb939c38800f9c239ca2518e898ade1ec2513c9ee492071a35aabd78182392a09123d28dbc233313c9120c4
+a7dc40c36afccb30a2eaff250860b28b227c195cf05674704c567d77d6655c446ae835f8fc8667e71147ab02afcb2dad0babe60cbfa37d7c2cddc68d2dec54f28a4142f8353590a3902d5ddaa22066ab563dd1435dda83f276387b9767d69120
+939e6cc97a8b88572852a5b7f25e4838556307f60aeafb5d2b6961edbcafd4b48cb6ac980ffbacf4be963f324ba81e3d12de4f1459d8c746d0762c66ae1b166027f7fbe641d9c48f3c7d97b06d956b0be51dcc9aab65f3e99e1388e63bdd79f9
+b391e156541dfd4003d1697cdb7ec815b309807320574906b2e652ef0175828b356d215cd374b1b34d9f470b3fa0e643113e67b2273268f922f04f072cfb89008358185b25cd631f82911a3f20f90f75758ffb99bebb8076458ae1e9d1ae898c
+b9ac9c84934cc2a85c876eff65577e1dfce1935cd6392c877dd881a7d2f5c3e9344f28c04f90c62a6db4237ca00f9e0d00cb5f63e3f060fc7303916e19273b6fe455f331cabbe2fe5a22d584484f0d4176120fec9819fbb0a01e6d38695acfcd
+88209eb030c5d78734bf2c2a5c539653fd3c24b4c08e624f9ddc4a6550efbdc1054a56eb0c807595aad6de56fda326aa196d032a8b4b48d40140a2d77df3c7243eda6507936389a321a5811eb38e32ee433c788deeae1eb928b00940e2944bcc
+a8632ddc9cf7cbc1e8b74a05b7d4a89618c64afe30367ca0c9550ae7d320bf4e51c5a69e1501a1d8bee4240d13d7835501aa39fdc401a74f4d5734e268a7ce29a1fcfdb0a8bc64e0dd4a9e8578d6985bc2bc6a3764ce7a3703f6fb2e52557a2b
+a037ac67e8bb6f4193ac967e05d080a489f58ef8d3d30a89798246f3e4936121ee445b03e410a09e8ebc0db2e2477d110aad0ade99b0887f1eb016e750f42135866907f150bd6f4f99a8cb94281474166874808ebe03b118c5daab16dafdc38b
+a50d9143116bffa3b237da8e1805327e81e9cd25e658289bd727d5f9e0020172cc8690dcfe31a240e5cbc48353b88c4908baa1dd7320165556e0aa633f62fcbe7870222d345a3bbcdb7ab6c07f0fd86be559964afabf56f0a8cbc0b4b91d477e
+afa988ea6fa4f40c5ad07d2d580d29025ddf56d6ef1171a8b8de3464203f70b97d6f5ace72747345204b35150e06154d1477516a989ce8eea7871cc0d0de00a077c0fb23ad4837e409d0b885bf3f2dde11a30fa6273d662e68e09f461e52932f
+97fa1a943ed8b81574304a3d03f4f15907f6e6e0cd36a66bd2ad2c75afafc70a61d3ff69b77ebe4dae9ca0fcedef80081062705e60bbb6ea0f1f398c84d2f8e4a3ac142ac66426c21ad5e9994ebbcc406af474c4aec5e32fadcb21875af7c9f1
+b30a564614493886f14a5dd71c89457504f8c59a7ac01b665ed167e9a8f9ee5832198fd319ecd234196ee57031bdf3840bd5a923e203a1938bc795c704b5285389750e1fd10d7050061ba19db00a60a2c0384a7d661d7d48ebe6962272230859
+84c8dea942cfae71cb02e705ec496d967425793ce8812e7ee53c2f23713abeaff566a658cd1c73dfd18187d16253a6ee0a623e82cd18e31cd1a1875d19c078835dc9292e141686150a88065226ada264740143e87c03a0f6c4da8c187438ebf4
+8c3abae8aed60338f8c4ff80aab22f8a2ae56756a93566c906f490a97151d34a1c3318054e1c494c60cc53327ad86a2d02c6c76a406726ce4f88635bc32eff0db0b61762dc518b95fa8da82e87e4bf3de54f1d72180ef53ed7bc5413e6a9a510
+a328230c92a6b1cef6a444bcb64edb992f71e3d7b93f0b6b8b408ba7c908db746d92ddb2c7588bab438ef3bc61be1c2f0dfc86ba2ff514b42b35c80f89b2e780f813ea1dfb977fbded2cd9b553b747fa952e227ebd8f071163d421fc337f04c9
+b482cab423cd5f1c5df036070aade7aa016283d69619d664025c3feab866a0a5691d344b2ee2bedc5dedd1f9a73eae16003a3827c9e5bbe22ded32d848fba840ffad1141ad158f5c40bc8ae0d03781b9705d851a7f1391b096c576c0f4f2a6b0
+919ee1df27fabcb21237a1b7b98f53d41d849e1b6a8f9e28c3fae2841c6b5a250e4041c737e6725476e5cd715e34d3880f58d80f61efaabc261bdc703e8750f48a923e9bf8980931b9fd9e40014c66c54b3e7c98241d76d1aa47af43313a65a1
+ac94830145dbe9a8f7e6e0fc1f5fb454502d22abcafdc2dd96c6933c604461fa83b2b37385f4bc454875a02a6d4157841250956783515d11c7456e7f11b745f12856d89f5feedaf6a61a483a6c33a21cd2ba0c18eb41a1a2e7fc33bb53e4c570
+b209c699f1233735c5bb4bce848e4365fd76651ae2184d2279a90df0c2f69ffa2a24d84a9b9f274021072953c0d65e1a0202d490d6c37186af240114e445d87bff754b4824937e4f2c90a574061b1c4910fed88d90f698025a2a264e656cb8a4
+93320dc0576b0d069de63c40e5582b4486d9adf5e69e77e3ebaf3da26976fe42147a65051501bc8383f99e7ba75479c70a6726c2cd08bf98c7481f1f819712292d833a879f21a1221a9610bc748fb5e911055122fdb4055cdc84e8bfe0f4df9b
+a4380b240e998cdf668591f71a0c88ed143b0185a920787627ce65095f8223dc606fa5bce93377af100de92d663e675c0736d7f1973603a84a5c4162fb5e01c88c7493503ae1d7e9fbe8ece9b418397d68c21eeb88dae226e09875d372c646dd
+aab48517d69135a16b36b685adfe9b2544a709135a21ba3e75981a2cba4ec81d1fe28ac0f72fde0c0001c15300ed6a810f58d3117bdd58d0149751d6508cf8a1a1ff7b63dd02d2730a9d6fe96c77c502fe8ed46d50a181ec4bb35e37dfbd6af4
+8277265fe75ab89ce4ec65b33fb4084bec0a56d81faf2f7a9070d2ca3065678e03a790350eba56323a54e0285bc32fe8007d5259740fde226e16cbde8354eacd562294eb9b7f727ed72ffbdad86f467cf057c737b34b80a41deb92634ed866f5
+aa40a24cb2ebe606d969392c03020070f044c95088d80f57f771b837c048342d2cd3474600d7660441090ffb8d2ffb7f0eddd67eb378e3e1477a6ba0bc38096d5d2d3355bc8b60f605f57f0c1899da591457440352381d2b38c0aa9acc7fe419
+80815d10685808cb630820629bcd2fa9041c9b74433630c0b9c1b7f7e8edf1440b520217f76ec9a50c125cf4438aa66006a1928a9ed2321da7ea325c3d56b65462b72118ca2c99a0ea733aa11da9abbeda6cc71ffeed301ae70213a29e697dcd
+ac235d079f91b00b1fead7523da8f73a5409fa8970907af0c5d5e4c6a0996dccfcdb0d822d08c7fbc0c24799457d011d04312d20831825f23cf988141056a6814c8a1cac9efe37bdcbfa272aed24cd92810fea7c49b0d07683a5c53643872179
+b8aa59534d75fa5ac1c2c3f963bf73899aff5210059dbde8a8635561c6249e5143affee3bd2fd57575213b52d9a73d5702525867a7dcbb1d0a49b98c2925556fc5463ff0209742046a24ab29e74257d6419401093cc4371944d811cc300b6a67
+80bbfc5b816eea29a6d84e2217dee4d547306994d39e5592515e1b0807b67fe960d1d5addb0ff1a20c158bdb294c04bf093d28996121845a2c9268e2c9ac0f4067e889c6aaca62f8535d35b45036954bd069e3afa84f04721538c26003304c20
+a535c17d0e151d0e03d42dd58ba8c715bee3fabca2890e0e016071d34184b6b34e770d2be29c8ec76b69bcc471d50f4d043c2c240e9b93a81cff7ee2724e02018dfd9b534e40be641fdb4884abcd83b76f517557ffba508f1ba2f56313f4de94
+b237eb7465df0d325a3aa58269be2627e4978f9863f4f100ed4c303cb1f6549e606f2e3c9180824d8049191965c8dacd0a0c76cc56cb22cf1bcfdb39372c8aa29b4f7b34582b1719e6bd59c930d87d5ccd838743b585d6e229d5ed42337315c0
+805c335a2a9d2de30809cf30808ef836d88e9453c510716f01696f14c72dd60505eca8f128970edc8e63a9aa1f8792ac0dd50dcc84fbf4cc8b32349c682a6a27bc7551c7aa273a94c1606d07710188d93579afe3be1781bded15a34ed6047922
+b25dadf385ddd3c39bcb0a014d3d4f66127946b1aceae8809e3a03d66cc25e27142ca108316391f857fe82fdea4db2520cc73793b695eafbf3ade00ef7ec747b0457e49303f5e1a370f5263b436566fe24a0876e5fe088238c7be37a0718d65f
+b0f753081cabe2c8fce73aba82ff67dbc9842598b3e7fa3ce2a1f534536f8ac63c532fe66552ac6b7adb28c73ed4c8a4184849be7c1756a4681ce29ebf5e1c3aa806b667ee6bd68f6397aba3215dc1caec6742f21d681e32cd1160d6a3b1d7ee
+b798771eeb3d7a17c62ba5916cc034bba870da6b1ac14c2e1cae71af3ad4e0c0d1ff983f691e0e55289d5a33b131f2ec12430c9566dd71f4d8be9c79155357a5c30c5efcfd75bbe1bb6d5ada4d50604ea49ed838d3641f268ca6e25c9c4b6b72
+b52554c017388b099804abbe565346591a086d9979e10140ddaccc0a3680e506db775d7cbeafde67563adf0f09f5c2420caf19629f4e8f03e6fe02e9416ecd5269989e482b90004a083967d1141387eb74865bac6bd17e7a6d5f58225e52d4b7
+b520ff694520919023d44d53f98a7de2f78ff37b2d9193dcaa35556a6a0febf767781a4c961dce7c804bfdf81935f8f0082865253da52e79dfa1c5ff74d61495b2da76e167d46114709e877a7791a3a95e33a42f56b83f5f5afe271c67ae997c
+b721401983440797a03d5b99f2088a0b249aa911969c34dd6c615b0060325da555d2ad99d931170c0868b0488a2234a4114cc0013d5163b833f5c45c5eb536421c016cf85788390176bb2dc4c196d6be26bbbfceae048b82f0d8039222e71c94
+acd9d833ba0a8cbd8d1ba939a11ea0fa5607e1bc6e693ec318bdb097aedd042d76e695dcebebd142e2e4ac30b1905dff03ec36d9cc70577e4dbe5e9ed7c20c7afb13a7f0155f203c6b83b9f1ad3d20a0d4aef0fbbbcf466ffc1bcd482bc2f5e0
+8cc1795de015f2b0e72116f169f3b4624b7738ceebea354e0bd9051c27b86f647ea36cad57ea6884c1a8adf9b45cd83514fa687e68878bbd613d793aa10986d5a0411f081689229e0d72133b3667b9f3f1a02211d0e680564eb1ea43393e1f36
+aa9281c61113c343a108de1036570feefc72fb7a96ff11f73024de12b83f29631f5a8a5900e6f10b15227c6f7462881511271bf785ebdf95ce288100e5dab391f664f6ff76c72b65b34479a4f43e5e8eba292209d6654157286ad3242ac342db
+aaf16866275082e59d415db317aa874267d048ee405a553e852e6d175711d31a1fee99912345915bce121f43bc3e00d81338e5fcd3c8a1012fb4f172a9fe15622dd368b4d9d5cb60d189f423b071791fe26cea7676aca8df07965cacf80b0cd0
+accc80b3d8a6ffa648487a3d3c0ce1aeeb5401edf3cf2e385ea4a6d5fc110054fcce38f01f1da7141bbed30eb7a0a6810c82212bbb9da75d6033082dbcf6bc6a5791f85aa0f045a10da5de015edbf369b4d23b32b0c058962d2ee88e6911f994
+83f1089395a16077738cc7c9a6d6a3dc9033aac4abc508af5a1f007ca92e1a80b2e6f2dbda7fdcf0d5646de790a6201d0a9cfbcb6620a1426600e3a6a425ec004384f49fb9dcd166691a47177d45dcbcb761a11d46220b0aa09fc946131f7aa5
+9246bb586d43cb817c2e15ed609156e9f1cd284ba2f4797bbfa51c0341e1ba382eaac059aa9f63fb88d228a1a932839a171e7c7d00199dc7c4d6c5ea038a02cbc3cc5297c70401520e70ebbcffacd6a703f62896f3c788f94dde3c33ab0ecbdb
+a316cb7c74feb0563c56cc79015e2774fbeca458bf8e9fb07894f9d6bcd73f7fb9428e87c816e5629e4bf7f3ec567fbc091549471b75492dde08217cb334b716b4582b24384586e53388873a78a90ec01bd7c3bace9cfc52161467df16e27c33
+ade18c74bbe60d1d69f4a570f8e5fd8696c26cc9e02829040b6b14cb9c49a4b3263b5bd5e16ec0b29010b4be054c16ab09304e23442af7d7f5fcc60bc6c5634ab6e4aed7ef334b2785e4c7672d59a687278e42d310342db5e5975d716e6d1595
+b7728800bb2039acf228fa3d8028569c426cb85d28b2b5820bbef938d5ca8c4df981d3e01a309e26ca101e8295d0f6990c03b8c239798323575874a4ee5bfe46cfe99b9657189142aacd8f8d1f26cf4c0e73c6397c31ba8f18102b9ea315b638
+8fb14f2a9be193f54977ecd3021663108ea143627b9a9d9faff85d1a86b855f6c437eab435fad3304f245bd7732af07f1173494cdb802fb96e85d2db89e1643206e183f3b228ca8d3f586e71aa9308eaf0223100bf07942fc39e465016d1f775
+ac1e025e53d98fdb3380489dce82d9d4bd3a6c98f0a523b841cb09a6f26ddd4d22efd98776e78d10fd996995fd00e81e08d3c25dd14a54b25a9d483677a24bbb8d1cb41a443b2c71038e6893b1b30f70758424e0f2039a48060191389033ef55
+a4c017311b9e930868132527a9849072b91db04fd36c619ae39c98da9e2174e6201d3c2ff1246c06b1b6815bbf3ea4a1116564f55ee2fe4c4d655e2294c0ded842cba209c255ca3d7b7f82d162f97890dfdeed087aa2f87cbfc61d61815da39d
+89516315a3956b455843c2555248bd94dcb19993060fe75fdd51f7aa9c9147ab13997d8a98036a8f04bee5c91d78d2990907e35a52537a8ab3ed15f1a71afdcd38044a5b6e93f662b9d36c16933a881927cacae668c4c06ee6f004c9e3989bad
+a1e78a011e210400c68ca76045f7da74119bff3cbe382efd2bd2ac76567c52d68d75536a91999d084043e1ce2d07d02e0b69fb99924101d2543521747536fbc51b0454aa9a4cbbec101121f597863a5c0fee2ca5eab35dff9b9085bef8b2b0d0
+830fd8d083e39153ecab43cabb22e29d7b44a55fba467af4ddd3f069439d2972ef53c3518de788f96b3f4f64963987d0155ba27afc28643af3de8e476ff515a68285728167408f45d99e574680bda6bacdd4322e587e4aa99386e035c0e931ad
+b89584da22237e3061d991b1a55a5e55dc637b8b671130d304587729348138ef87885180310efe9f9f6d3580b9d7fdcf0649e8a79d2dec8c25a9f53df0fac5d517db999029cbfdd7c2cbd3e9a5503e5d267d3d8ad752335915c92b850b14bafb
+959b8030733799882c5e3735479924b013756e57b893f9792bab4043e2d362d77cf308166d782e3989caa771b8a0c0a01302cb7b5e8ca12e2d6cebd59d4cd173c9dc25f438bac597fab17b4ff44997a489c168e7204b7d7c21d0938f0a2e3b51
+a0a9e5503d9afe0027891dab890c687fd5f5fac5741418490c64d7c15f59533dd603a50163c79402afa61bd02de486761983c94501da17e6bbe78c497f2122210071602f578adc0ebe7a4679f87fe77e09c8c122de69105f13455fea25f08e6f
+9811487283ad620cd7c9b303ae2f348d0e6f5ee17b504baaa817ae207adb912a00d3cc36dbf48745eb899e6b6e22f09f0f9ba29d949ecd7350fbbfe87a8c7cdd5d0e687fc807751d07634aaf7c38baf3b24a0670c38fa6ccd7431436fc95525f
+8a13aa5071c526e560def7d8583393942f07d88c9d8d26c98738fd65f57af2e3326dbb1edff0f39fe98eda4a13ed4fd71844254b954690154c4804e1c4a53df9dc4643f4b7b09d0860070f6b2318d0d63d28fb56bf5b6ff456a18dfc72fdfbbe
+b9c90ff6bff5dd97d90aee27ea1c61c1afe64b054c258b097709561fe00710e9e616773fc4bdedcbf91fbd1a6cf139bf14d20db07297418694c12c6c9b801638eeb537cb3741584a686d69532e3b6c12d8a376837f712032421987f1e770c258
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 382e3a21794..4d06c3c3ce4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1,16 @@
-version=20.10.3-pq
+version=23.4.5-SNAPSHOT
+
+org.gradle.welcome=never
+# Set exports/opens flags required by Google Java Format and ErrorProne plugins. (JEP-396)
+org.gradle.jvmargs=-Xmx4g \
+--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
+--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
+--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \
+--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED \
+--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
+--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \
+--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
+--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
+--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \
+--add-opens jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
diff --git a/gradle/check-licenses.gradle b/gradle/check-licenses.gradle
index 25c25f33834..3939c191166 100644
--- a/gradle/check-licenses.gradle
+++ b/gradle/check-licenses.gradle
@@ -30,22 +30,23 @@
  * The lists of the license we accept.
  */
 ext.acceptedLicenses = [
-    'BSD License',
-    'BSD 3-Clause',
-    'Eclipse Public License - v 1.0',
-    'Eclipse Public License - v 2.0',
-    'Eclipse Public License 1.0',
-    'MIT License',
-    'Apache License, Version 2.0',
-    'Bouncy Castle Licence',
-    'Public Domain',
-    'Mozilla Public License 1.0',
-    'Mozilla Public License Version 1.1',
-    'Mozilla Public License Version 2.0',
-    'CC0 1.0 Universal License',
-    'Common Development and Distribution License 1.0',
-    'Unicode/ICU License',
-    'Public Domain (CC0) License 1.0'
+  'Apache License, Version 2.0',
+  'BSD 3-Clause',
+  'BSD License',
+  'Bouncy Castle Licence',
+  'CC0 1.0 Universal License',
+  'Common Development and Distribution License 1.0',
+  'Eclipse Public License 1.0',
+  'Eclipse Public License - v 2.0',
+  'MIT License',
+  'Mozilla Public License 1.0',
+  'Mozilla Public License Version 1.1',
+  'Mozilla Public License Version 2.0',
+  'Oracle Free Use Terms and Conditions (FUTC)',
+  'Public Domain (CC0) License 1.0',
+  'Public Domain',
+  'Unicode/ICU License',
+  'New BSD License'
 ]*.toLowerCase()
 
 /**
@@ -53,81 +54,145 @@ ext.acceptedLicenses = [
  * This plugin generates a list of dependencies.
  */
 downloadLicenses {
-  includeProjectDependencies = true
+  includeProjectDependencies = false
   reportByDependency = false
   reportByLicenseType = true
-  dependencyConfiguration = 'testCompile'
+  dependencyConfiguration = 'runtimeClasspath'
+  excludeDependencies = [
+    // only used for static analysis, not actually shipped
+    'com.google.code.findbugs:jFormatString:3.0.0',
+    'com.google.errorprone:javac:.*',
+    'org.checkerframework:dataflow-shaded:.*',
+    'org.checkerframework:dataflow-errorprone:.*',
+  ]
 
-  ext.epl1 = license('Eclipse Public License 1.0', 'https://www.eclipse.org/legal/epl-v10.html')
   ext.apache = license('Apache License, Version 2.0', 'http://opensource.org/licenses/Apache-2.0')
-  ext.mit = license('MIT License', 'http://www.opensource.org/licenses/mit-license.php')
   ext.bsd = license('BSD License', 'http://www.opensource.org/licenses/bsd-license.php')
   ext.bsd3Clause = license('BSD 3-Clause', 'http://opensource.org/licenses/BSD-3-Clause')
+  ext.cc0 = license('Public Domain (CC0) License 1.0', 'https://creativecommons.org/publicdomain/zero/1.0')
   ext.cddl = license('Common Development and Distribution License 1.0', 'http://opensource.org/licenses/CDDL-1.0')
-  ext.cc0 =  license('Public Domain (CC0) License 1.0', 'https://creativecommons.org/publicdomain/zero/1.0')
+  ext.epl1 = license('Eclipse Public License 1.0', 'https://www.eclipse.org/legal/epl-v10.html')
+  ext.epl2 = license('Eclipse Public License - v 2.0', 'https://www.eclipse.org/legal/epl-v20.html')
+  ext.mit = license('MIT License', 'http://www.opensource.org/licenses/mit-license.php')
   aliases = [
-      (epl1) : [
-          'Eclipse Public License - v 1.0',
-          'Eclipse Public License 1.0',
-      ],
-      (apache)    : [
-          'The Apache Software License, Version 2.0',
-          'The Apache Software License, version 2.0',
-          'The Apache License, Version 2.0',
-          'Apache 2',
-          'Apache 2.0',
-          'Apache License 2.0',
-      ],
-      (mit)       : [
-          'MIT',
-          'The MIT License',
-      ],
-      (bsd)       : [
-          'BSD',
-          'The BSD License',
-      ],
-      (bsd3Clause): [
-          'BSD 3-Clause',
-          'BSD 3-Clause "New" or "Revised" License (BSD-3-Clause)',
-          '3-Clause BSD License',
-          license('BSD 3-clause', 'http://opensource.org/licenses/BSD-3-Clause'),
-          license('BSD 3-Clause', 'http://www.scala-lang.org/license.html')
-      ],
-      (cddl): [
-          'CDDL 1.0',
-      ],
-      (cc0): [
-          'CC0'
-      ]
+    (apache) : [
+      'Apache 2',
+      'Apache 2.0',
+      'Apache License 2.0',
+      'Apache Software License - Version 2.0',
+      'Apache Software License 2.0',
+      'Apache v2',
+      'Apache-2.0',
+      'The Apache License, Version 2.0',
+      'The Apache Software License, Version 2.0',
+      'The Apache Software License, version 2.0',
+      license('', 'http://www.apache.org/licenses/LICENSE-2.0.txt')
+    ],
+    (bsd) : [
+      'BSD',
+      'BSD-2-Clause',
+      'BSD licence',
+      'The BSD License',
+    ],
+    (bsd3Clause) : [
+      '3-Clause BSD License',
+      'BSD 3-Clause "New" or "Revised" License (BSD-3-Clause)',
+      'BSD 3-Clause',
+      'BSD Licence 3',
+      'BSD License 3',
+      'BSD-3-Clause',
+      'Eclipse Distribution License - v 1.0',
+      'Eclipse Distribution License (New BSD License)',
+      'EDL 1.0',
+      'New BSD License',
+      'The BSD 3-Clause License',
+      license('', 'http://asm.ow2.org/license.html'),
+      license('BSD 3-Clause', 'http://www.scala-lang.org/license.html'),
+      license('BSD 3-clause', 'http://opensource.org/licenses/BSD-3-Clause'),
+    ],
+    (cc0) : [
+      'CC0'
+    ],
+    (cddl) : [
+      'CDDL 1.0',
+      'CDDL 1.1',
+      'Common Development and Distribution License (CDDL) v1.0',
+      'CDDL + GPLv2 with classpath exception',
+    ],
+    (epl1) : [
+      'Eclipse Public License - Version 1.0',
+      'Eclipse Public License - v 1.0',
+      'Eclipse Public License 1.0 ',
+    ],
+    (epl2) : [
+      'Eclipse Public License - v 2.0',
+      'Eclipse Public License version 2.0',
+      'Eclipse Public License v2.0'
+    ],
+    (mit) : [
+      'MIT',
+      'The MIT License',
+      'The MIT License (MIT)',
+      'SPDX-License-Identifier: MIT',
+    ],
   ]
-
   licenses = [
-      (group('besu'))             : apache,
-      (group('besu.ethereum.api')): apache,
-      (group('besu.consensus'))   : apache,
-      (group('besu.ethereum'))    : apache,
-      (group('besu.metrics'))     : apache,
-      (group('besu.plugins'))     : apache,
-      (group('besu.services'))    : apache,
-
-      // JNA is dual licensed under Apache v2.0 or LGPL 2 licenses
-      // Explicitly declare that we are using the Apache v2.0 license
-      (group('net.java.dev.jna'))      : apache,
-
-      // RocksDB is dual licensed under Apache v2.0 or GPL 2 licenses
-      // Explicitly declare that we are using the Apache v2.0 license
-      (group('org.rocksdb'))      : apache,
-
-      // Logback is dual licensed under EPL v1.0 or LGPL v2.1
-      // Explicitly declare that we are using the EPL v1.0 license
-      (group('ch.qos.logback'))   : epl1,
+    (group('besu')) : apache,
+    (group('besu.ethereum.api')) : apache,
+    (group('besu.consensus')) : apache,
+    (group('besu.ethereum')) : apache,
+    (group('besu.metrics')) : apache,
+    (group('besu.plugins')) : apache,
+    (group('besu.services')) : apache,
+
+    // JNA is dual licensed under Apache v2.0 or LGPL 2 licenses
+    // Explicitly declare that we are using the Apache v2.0 license
+    (group('net.java.dev.jna')) : apache,
+
+    // RocksDB is dual licensed under Apache v2.0 or GPL 2 licenses
+    // Explicitly declare that we are using the Apache v2.0 license
+    (group('org.rocksdb')) : apache,
+
+    // Logback is dual licensed under EPL v1.0 or LGPL v2.1
+    // Explicitly declare that we are using the EPL v1.0 license
+    (group('ch.qos.logback')) : epl1,
+
+    // JavaMail, JAXB, Glassfish and Java Servlet are dual licensed under CDDL 1.1 or GPL 2 w/ Classpath Exception
+    // Explicitly declare that we are using the CDDL 1.1 license
+    (group('com.sun.mail')) : cddl,
+    (group('javax.servlet')) : cddl,
+    (group('javax.xml.bind')) : cddl,
+    (group('org.glassfish')) : cddl,
+
+    // javax.persistence is dual licensed under EPL 1.0 and EDL 1.0.
+    // Explicitly declare that we are using the EPL 1.0 license
+    (group('javax.persistence')) : epl1,
+
+    // jnr-posix is released under a tri EPL v2.0/GPL/LGPL license
+    'com.github.jnr:jnr-posix:3.1.15' : epl2,
+
+    // io.netty:netty-tcnative-boringssl-static license markings are not machine readable.
+    // io.netty:netty-tcnative-classes license markings are not machine readable.
+    // Explicitly state Apache 2 License for license scanning.
+    'io.netty:netty-tcnative-boringssl-static:2.0.46.Final' : apache,
+    'io.netty:netty-tcnative-classes:2.0.46.Final' : apache,
+
+    // ANTLR license markings are not all machine readable.
+    // Explicitly state BSD License for license scanning.
+    'org.antlr:antlr-runtime:3.5.2': bsd,
+    'org.antlr:ST4:4.3.1': bsd,
   ]
 }
 
+task lazyDownloadLicenses() {
+  if (gradle.startParameter.taskNames.contains('clean') || !file("$rootProject.buildDir/reports/license/license-dependency.xml").exists()) {
+    dependsOn ':downloadLicenses'
+  }
+}
 
 task checkLicenses {
-  description "Verify that all dependencies use white-listed licenses."
-  dependsOn ':downloadLicenses'
+  description "Verify that all dependencies use accepted licenses."
+  dependsOn ':lazyDownloadLicenses'
 
   def bads = ""
   doLast {
@@ -136,17 +201,16 @@ task checkLicenses {
       if (!acceptedLicenses.contains((license.@name).toLowerCase())) {
         def depStrings = []
         license.dependency.each { depStrings << it.text() }
-        bads = bads + depStrings + " =>  ${license.@name} \n"
+        bads = bads + depStrings + " => ${license.@name} \n"
       }
     }
     if (bads != "") {
       throw new GradleException("Some 3rd parties are using licenses not in our accepted licenses list:\n" +
-          bads +
-          "If it's a license acceptable for us, add it in the file check-licenses.gradle\n"+
-          "Be careful, some 3rd parties may accept multiple licenses.\n" +
-          "In this case, select the one you want to use by changing downloadLicenses.licenses\n"
+        bads +
+        "If it's a license acceptable for us, add it in the file check-licenses.gradle\n" +
+        "Be careful, some 3rd parties may accept multiple licenses.\n" +
+        "In this case, select the one you want to use by changing downloadLicenses.licenses\n"
       )
     }
   }
 }
-check.dependsOn checkLicenses
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
new file mode 100644
index 00000000000..5d84c51d99d
--- /dev/null
+++ b/gradle/verification-metadata.xml
@@ -0,0 +1,5649 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<verification-metadata xmlns="https://schema.gradle.org/dependency-verification" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://schema.gradle.org/dependency-verification https://schema.gradle.org/dependency-verification/dependency-verification-1.1.xsd">
+   <configuration>
+      <verify-metadata>true</verify-metadata>
+      <verify-signatures>false</verify-signatures>
+      <trusted-artifacts>
+         <trust file=".*-javadoc[.]jar" regex="true"/>
+         <trust file=".*-sources[.]jar" regex="true"/>
+      </trusted-artifacts>
+   </configuration>
+   <components>
+      <component group="com.diffplug.durian" name="durian-collect" version="1.2.0">
+         <artifact name="durian-collect-1.2.0.jar">
+            <sha256 value="b194c0b88021cc116c21c1dc76f49c2c1fe175af5bcb74c8ba67b9dbbf9a48cc" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="durian-collect-1.2.0.pom">
+            <sha256 value="8bb762086a0a4fd2a6473bbf905c744763afa1d59a5630f73bb04b7872c09ff3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.diffplug.durian" name="durian-core" version="1.2.0">
+         <artifact name="durian-core-1.2.0.jar">
+            <sha256 value="17ed0aacb3a3c16323332168bbdead8694f32800b2b47d69d4a4c49b114d5dae" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="durian-core-1.2.0.pom">
+            <sha256 value="870320e90755371b01796fe81ba525fd1dee8b70346f554551eedd4289f0b662" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.diffplug.durian" name="durian-io" version="1.2.0">
+         <artifact name="durian-io-1.2.0.jar">
+            <sha256 value="095fd1dc77888c073f0be39a018156ee526722798b09de9e285ef2135e16eac4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="durian-io-1.2.0.pom">
+            <sha256 value="350919424324e2750a3ddc2fa1bce6a90ac8ce2925698a60a9b4d1d6e4922ffe" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.diffplug.spotless" name="com.diffplug.spotless.gradle.plugin" version="6.12.0">
+         <artifact name="com.diffplug.spotless.gradle.plugin-6.12.0.pom">
+            <sha256 value="05166d4bbee1d14f23bba04bc11ed11829af8652bc25b7b8ba1061246b0f1a94" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.diffplug.spotless" name="spotless-eclipse-base" version="3.5.2">
+         <artifact name="spotless-eclipse-base-3.5.2.jar">
+            <sha256 value="e381d6996a3d7f41c02d79bd0b1dff077aaec40b55fa15971c1bb45ab16f5a20" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="spotless-eclipse-base-3.5.2.module">
+            <sha256 value="cecc8f1158dff5549bfed1cc567b6e531f1479d402dbb9c9c38f069bb3953596" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="spotless-eclipse-base-3.5.2.pom">
+            <sha256 value="5f6fbcc23bb9fba18cda3eb29ff46b52d9fdac533d9d6421db34bad9c8a0a175" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.diffplug.spotless" name="spotless-eclipse-groovy" version="4.3.0">
+         <artifact name="spotless-eclipse-groovy-4.3.0.jar">
+            <sha256 value="3e622bade09d161bad863fc1962c4ac2a02f51cd741a1baa321288eef7b437a2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="spotless-eclipse-groovy-4.3.0.module">
+            <sha256 value="2c219c68a14132ac0f9994ba74bebef019f490349d4c0820c1e5f6639fb93805" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="spotless-eclipse-groovy-4.3.0.pom">
+            <sha256 value="64328c38bad9ee7d61ed54bf35dc7090b644c15cfa4fe5046f6424da7061b339" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.diffplug.spotless" name="spotless-lib" version="2.31.0">
+         <artifact name="spotless-lib-2.31.0.jar">
+            <sha256 value="679e2952bcc8cdafe5dccac6c3dfbe5b9c7e8aaa4bf930ed5cd7063ec7979ffb" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="spotless-lib-2.31.0.module">
+            <sha256 value="5e1d6c4df21aa76ab146cb818526a646ed5595f9b34999b819f35890e524652c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.diffplug.spotless" name="spotless-lib-extra" version="2.31.0">
+         <artifact name="spotless-lib-extra-2.31.0.jar">
+            <sha256 value="9b4ce98aa4f5dbc75850fe6d9a79e878d318be718f997e5ea4052c885621baab" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="spotless-lib-extra-2.31.0.module">
+            <sha256 value="b5f3ee1635ae44bb2c575b7d11bfca78aece019e4b9b74419300aa792dc5b58c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.diffplug.spotless" name="spotless-plugin-gradle" version="6.12.0">
+         <artifact name="spotless-plugin-gradle-6.12.0.jar">
+            <sha256 value="54293b86170b821115772090bb90aeb466cda6bf9e08b06bacbd3bb94a714e1f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="spotless-plugin-gradle-6.12.0.module">
+            <sha256 value="14831f1ebf9c7d8e1ba344d55276f87371e0fcac4c08000c618688c3190129f8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml" name="oss-parent" version="38">
+         <artifact name="oss-parent-38.pom">
+            <sha256 value="c83f8f45dfdca8d0b6b3661c60b3f84780f671b12e06f91ad5d1c1a1d1f966e8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml" name="oss-parent" version="41">
+         <artifact name="oss-parent-41.pom">
+            <sha256 value="af650fa4dd400bc5769320bcef08ed93813f349cabe8213d469acafbbd945d8a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml" name="oss-parent" version="43">
+         <artifact name="oss-parent-43.pom">
+            <sha256 value="e5585cc1c37079b2e3817a8997945736f158831844d59d0e4d3a45b27611f926" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml" name="oss-parent" version="48">
+         <artifact name="oss-parent-48.pom">
+            <sha256 value="11bba22d8631816e09b623a200747453d6491a66eac8f5c089c73da2b749014f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-base" version="2.11.0">
+         <artifact name="jackson-base-2.11.0.pom">
+            <sha256 value="a4306f903647322bbba0054937b89a0c6424756a7fa029c85f2cbd756fde80ca" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-base" version="2.12.6">
+         <artifact name="jackson-base-2.12.6.pom">
+            <sha256 value="71999f597522e5f50eb41474ee2cbe2b9991651922ee8a090e00b8742de8c9a6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-base" version="2.13.1">
+         <artifact name="jackson-base-2.13.1.pom">
+            <sha256 value="1ef88d9f41d0cb8ea074fb2171939eb94db2ebe17f055bdd147f8ae051bb9c95" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-base" version="2.13.2">
+         <artifact name="jackson-base-2.13.2.pom">
+            <sha256 value="32cfe9eb0c630db42822e567d9a36463edae3a6a4950b95d33b0ed31a68f19a6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-base" version="2.13.3">
+         <artifact name="jackson-base-2.13.3.pom">
+            <sha256 value="72d67291876c63e1896bc7d8ff799033d3a4b9029020110488af9c97315ed939" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-base" version="2.14.0">
+         <artifact name="jackson-base-2.14.0.pom">
+            <sha256 value="b59af26e8868d4038e511614bd76bbb7403635739519602f10e7da0931582b0f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-base" version="2.14.2">
+         <artifact name="jackson-base-2.14.2.pom">
+            <sha256 value="3ae245b9df95127321f1f905f703bd32774fe557158a9d3a9e507d82b2bc4ed4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-bom" version="2.11.0">
+         <artifact name="jackson-bom-2.11.0.pom">
+            <sha256 value="5c90fb02e96e8bab2f32eb9492dd350968e294558431ac5a9a10afa6726133cb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-bom" version="2.12.6">
+         <artifact name="jackson-bom-2.12.6.pom">
+            <sha256 value="1361078ed8ae83eaa7e860d164389249ff3742ccdfef25ca33248dfd62e55342" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-bom" version="2.13.1">
+         <artifact name="jackson-bom-2.13.1.pom">
+            <sha256 value="5a539c2596d5b7fcf0aba0a08214ce0fa6937b3ed1534fc1a70a9487a394bcb5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-bom" version="2.13.2">
+         <artifact name="jackson-bom-2.13.2.pom">
+            <sha256 value="05e57b016bdc58d739b2536e23816800936947d5155c2d03fa8e43dfed63b6be" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-bom" version="2.13.3">
+         <artifact name="jackson-bom-2.13.3.pom">
+            <sha256 value="df675b83b6caba7602fb47d75d4bb513c2af4c0a6155d7e397c0ec0f34112c75" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-bom" version="2.13.4.20221013">
+         <artifact name="jackson-bom-2.13.4.20221013.pom">
+            <sha256 value="cb63f8ff98c7ccbe531e3764be2c91d275b8fcfe2972cd67aa7f0a781a239a36" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-bom" version="2.14.0">
+         <artifact name="jackson-bom-2.14.0.pom">
+            <sha256 value="49f0f8e087882f4eccc3112b601b7dd512994723a4943a37a10ecb80732266ca" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-bom" version="2.14.1">
+         <artifact name="jackson-bom-2.14.1.pom">
+            <sha256 value="78fdf99e5050fc485f4117dab8cccbfb6fa6c68385eb5f38a09b655371d4a6cc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-bom" version="2.14.2">
+         <artifact name="jackson-bom-2.14.2.pom">
+            <sha256 value="9aa209bb32391cbf5f1bd3e7fa11901676169acd190d9896b5c1e877c999febc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-parent" version="2.11">
+         <artifact name="jackson-parent-2.11.pom">
+            <sha256 value="c1b0a13d8cfe63b40b0fae8458b99463169ed0c60f7fc963ef3f05257150cbe8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-parent" version="2.12">
+         <artifact name="jackson-parent-2.12.pom">
+            <sha256 value="62aa1c1679ade09f173dbf1b6c32d35c55e75800238fd5e48f13aa4337c0875b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-parent" version="2.13">
+         <artifact name="jackson-parent-2.13.pom">
+            <sha256 value="2bba89978172af1effcb4d143d09921a3f3082ca4dcf122b1ded98bf55b2ad57" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson" name="jackson-parent" version="2.14">
+         <artifact name="jackson-parent-2.14.pom">
+            <sha256 value="0906add855ae39f92357d63f485889b08fca4c43a5fe433522d75344e0757b19" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.12.6">
+         <artifact name="jackson-annotations-2.12.6.jar">
+            <sha256 value="ddf46e401a7d9ea3b481c263fa192285d13c50982a5882b22f806639b9645ee4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-annotations-2.12.6.module">
+            <sha256 value="62a9c61b68eaa88f43bd00083724c36d23f10d422bf1aaabf514e6757968e799" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.13.2">
+         <artifact name="jackson-annotations-2.13.2.jar">
+            <sha256 value="7d3df5aafa2dc61ad1dbad30f411548c0184ed92d94628c63168721f08237cd4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-annotations-2.13.2.module">
+            <sha256 value="c2fd4366b1647233c99c70c17a2e90c89bf1ea60843749cca99d794525df9cd2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.13.3">
+         <artifact name="jackson-annotations-2.13.3.jar">
+            <sha256 value="5326a6fbcde7cf8817f36c254101cd45f6acea4258518cd3c80ee5b89f4e4b9b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-annotations-2.13.3.module">
+            <sha256 value="9cff35722597acaae21f8fe630317aced55855f92d3ba21bac4b3f90892ea00c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.13.4">
+         <artifact name="jackson-annotations-2.13.4.module">
+            <sha256 value="649d6a2770182c6361ed8e2d6ea546e5f7123ef7a62fe7fad135d43184156d8f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.14.2">
+         <artifact name="jackson-annotations-2.14.2.jar">
+            <sha256 value="2c6869d505cf60dc066734b7d50339f975bd3adc635e26a78abb71acb4473c0d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-annotations-2.14.2.module">
+            <sha256 value="b014a64cc1844949f824d34671293541fab723223ac8b83222b5772113bdec17" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-annotations-2.14.2.pom">
+            <sha256 value="84ae0341837d7696a61043d809e43260a5eb077232d1dcaa464c8da549cd9ea0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-core" version="2.12.6">
+         <artifact name="jackson-core-2.12.6.jar">
+            <sha256 value="0026cff293bdba389fbbbc67a20fdd5f73e091554ab46671efa654c25c807ee6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-core-2.12.6.module">
+            <sha256 value="b2137369d65001ac31b1ac423b6299ac9f84a93a4d68053d5c00597cd7b3c935" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-core" version="2.13.2">
+         <artifact name="jackson-core-2.13.2.jar">
+            <sha256 value="9bfa278ad05179fb68087851caf607652702ca25424bec8358a3716e751405c8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-core-2.13.2.module">
+            <sha256 value="4bdce8fae6ce8be002b68ba522ff7d17a45abd8d2ffe1ece6500270b1bfaa4d0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-core" version="2.13.3">
+         <artifact name="jackson-core-2.13.3.jar">
+            <sha256 value="ab119a8ea3cc69472ebc0e870b849bfbbe536ad57d613dc38453ccd592ca6a3d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-core-2.13.3.module">
+            <sha256 value="eca2ac4d1d67ae89f43e6390fcbcbf1633fd8c3a1a4968d93214ebe5825f61e3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-core" version="2.14.0">
+         <artifact name="jackson-core-2.14.0.jar">
+            <sha256 value="ab4793e5df4fbfae445ca55e9e1439311c80fa8b34fc13162c1260902b4dbea0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-core-2.14.0.module">
+            <sha256 value="e1724ae6ca921ecd06195fa80d180a6ad724069a97e54f3d13b25e9f08dba3c3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-core-2.14.0.pom">
+            <sha256 value="28b5e0f47c7e86db77066382f27d465f40e7e25a894289664056a814c8553905" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-core" version="2.14.2">
+         <artifact name="jackson-core-2.14.2.jar">
+            <sha256 value="b5d37a77c88277b97e3593c8740925216c06df8e4172bbde058528df04ad3e7a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-core-2.14.2.module">
+            <sha256 value="92739e3bcbe09b2649e187eb7ed25ac252b587707cd922ab95badcde8aea12dc" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-core-2.14.2.pom">
+            <sha256 value="f44cc63d612f03b1dbfc82892dcdb32fdb75bf16049fd8595561e7c7a33bc451" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.12.6.1">
+         <artifact name="jackson-databind-2.12.6.1.jar">
+            <sha256 value="eb60e494ba8c23e653da4db8e29af0342927fc7e1c60501bf99e93145738c696" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-databind-2.12.6.1.module">
+            <sha256 value="d6f7277389fff4613630c7c02642e93577e7248e5ff2c043932ce75f0253fb94" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.13.1">
+         <artifact name="jackson-databind-2.13.1.module">
+            <sha256 value="936c3bf1e307cc36e715c06b871698ebbc6258a67e270ab4587364cba23dbe27" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.13.2.2">
+         <artifact name="jackson-databind-2.13.2.2.jar">
+            <sha256 value="efb86b148712a838b94b3cfc95769785a116b3461f709b4cc510055a58b804b2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-databind-2.13.2.2.module">
+            <sha256 value="64eccb5e2ae32fa1e98449b229cc5c69c5b82ac6a044e50c259d84fda9aa42e8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.13.3">
+         <artifact name="jackson-databind-2.13.3.jar">
+            <sha256 value="6444bf08d8cd4629740afc3db1276938f494728deb663ce585c4e91f6b45eb84" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-databind-2.13.3.module">
+            <sha256 value="422d6822037d1a58b918dcebbb475082f07ca7cca7e4b582873c64c6cde4b887" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.core" name="jackson-databind" version="2.14.2">
+         <artifact name="jackson-databind-2.14.2.jar">
+            <sha256 value="501d3abce4d18dcc381058ec593c5b94477906bba6efbac14dae40a642f77424" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-databind-2.14.2.module">
+            <sha256 value="6130ca9b95707ccd4f80f6258569990a7ce40039aa353c4635c900d36beec705" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-databind-2.14.2.pom">
+            <sha256 value="22808ebb4b75d8c4037d9cee1208adc65bc782a9885732234a31b7b574c5d90c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.dataformat" name="jackson-dataformat-yaml" version="2.14.2">
+         <artifact name="jackson-dataformat-yaml-2.14.2.jar">
+            <sha256 value="5c3a0a71d0339529c80ae771497b20fdc0fa7cb67c772f99af5935927560006a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-dataformat-yaml-2.14.2.module">
+            <sha256 value="b3266f32ee9753725812fe59ec629610e2698ba443ff80de9df653fef84c7e79" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-dataformat-yaml-2.14.2.pom">
+            <sha256 value="4dbf4b503cfb2b42bb376930f39f444269ba6b9e3595f813d853a1b423eb984b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.dataformat" name="jackson-dataformats-text" version="2.14.2">
+         <artifact name="jackson-dataformats-text-2.14.2.pom">
+            <sha256 value="53ffbb4c50e7702c0c9c28a16dfded0b7b6bee960bd5d2b008c3ac89fc37ccf0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.datatype" name="jackson-datatype-jdk8" version="2.11.0">
+         <artifact name="jackson-datatype-jdk8-2.11.0.pom">
+            <sha256 value="873fdf685cb31ee03b419972f3c4ad5ddb03c3186d5b7c6405792699af9d305d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.datatype" name="jackson-datatype-jdk8" version="2.14.2">
+         <artifact name="jackson-datatype-jdk8-2.14.2.jar">
+            <sha256 value="aa55d3d545e02d959a6e8c83927acc55c9937d717d4d3fd962d27ec7b431b8c4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-datatype-jdk8-2.14.2.module">
+            <sha256 value="d7704d01aed2d2a3c2f3bf05b68c5c3a217ef85133e44a11ed7ea87473c3d445" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jackson-datatype-jdk8-2.14.2.pom">
+            <sha256 value="f0e68e3a6f6caddb5f00dd527056e5cb2a4280696291a8504b1e3ebc08cc4ede" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.module" name="jackson-modules-java8" version="2.11.0">
+         <artifact name="jackson-modules-java8-2.11.0.pom">
+            <sha256 value="655560c215618ebbd6ec9d2d31347539d03b1d0d268174d456a394ff3d7f4a98" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.fasterxml.jackson.module" name="jackson-modules-java8" version="2.14.2">
+         <artifact name="jackson-modules-java8-2.14.2.pom">
+            <sha256 value="36ea7dadcb10c7153ef65a75e169b1b7f937ded09a18450e0f10fe202df2adcd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.ben-manes" name="gradle-versions-plugin" version="0.42.0">
+         <artifact name="gradle-versions-plugin-0.42.0.jar">
+            <sha256 value="961151777479ec6a0a3de1426154cd2e89a346b45a51488fc8a620f47e3af9f0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="gradle-versions-plugin-0.42.0.module">
+            <sha256 value="cd194cc51c48ba7218ebc3b1f41fce51dde1f8ee6666817ab31fa01e7e51b255" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.ben-manes.caffeine" name="caffeine" version="3.1.5">
+         <artifact name="caffeine-3.1.5.jar">
+            <sha256 value="02c34fd2ba78b1956ef6e5de9ac915aee9bfa498589966fa87255fbadb653499" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="caffeine-3.1.5.module">
+            <sha256 value="873f7f03027b1ac94d55f84894790451a7ed55574219301bb795aab496c1ce1a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="caffeine-3.1.5.pom">
+            <sha256 value="a2983b2212090f5256b1e944cdad09f8f4e8f94cef17545ecab9063ea593c34b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.ben-manes.versions" name="com.github.ben-manes.versions.gradle.plugin" version="0.42.0">
+         <artifact name="com.github.ben-manes.versions.gradle.plugin-0.42.0.pom">
+            <sha256 value="a4c4795a89c5e9c9731b613b81c56b6b58e87f76fdbf7004163d9b908021f97d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.docker-java" name="docker-java-api" version="3.2.13">
+         <artifact name="docker-java-api-3.2.13.jar">
+            <sha256 value="f810d8c76637991990d17282be226feb7c8d74056147dc79f0d9d2a6e201aecc" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="docker-java-api-3.2.13.pom">
+            <sha256 value="14a22bbd795ab967df301da552e5337f2e1180e4597ea4db33646421da3779f2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.docker-java" name="docker-java-parent" version="3.2.13">
+         <artifact name="docker-java-parent-3.2.13.pom">
+            <sha256 value="280aa0d1cadf63f3ea003bd4df0cd68c5d373efcb038ba27fad49f8bf60af763" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.docker-java" name="docker-java-transport" version="3.2.13">
+         <artifact name="docker-java-transport-3.2.13.jar">
+            <sha256 value="778c35c0557cd3ba4f1c9f64fb942f77ca7e390c5daae4471854150f4ee8d87d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="docker-java-transport-3.2.13.pom">
+            <sha256 value="5c347b49fd1312ff8fad3ecc6847b45331ba7d422e20d50e343e3d57adf5ee5b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.docker-java" name="docker-java-transport-zerodep" version="3.2.13">
+         <artifact name="docker-java-transport-zerodep-3.2.13.jar">
+            <sha256 value="3f76f8eb0332607c145d69f27ad8aa6941b5448e745823641d3867ba3746f0f7" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="docker-java-transport-zerodep-3.2.13.pom">
+            <sha256 value="fa262421232e746c3d71fae7d1357f3fe965f26658a8a5c1e552299846e8ebfc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.hierynomus.license" name="com.github.hierynomus.license.gradle.plugin" version="0.16.1-fix">
+         <artifact name="com.github.hierynomus.license.gradle.plugin-0.16.1-fix.pom">
+            <sha256 value="30db6103deb9f0021049e48f57fb948fc906839d1b6fc371fc3c9882c35c9673" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.jknack" name="handlebars" version="4.3.1">
+         <artifact name="handlebars-4.3.1.jar">
+            <sha256 value="5424fd12e911cf15befd16341b46e0e1bc681aa61e3cb1c070c57e68dccd5bbd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="handlebars-4.3.1.pom">
+            <sha256 value="fc3029f24624e98bd60b5a4699210f3f560a394893429cd06ccad844e8f8d415" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.jknack" name="handlebars-helpers" version="4.3.1">
+         <artifact name="handlebars-helpers-4.3.1.jar">
+            <sha256 value="56f0ad4defb444b038a708a8e0d003692df1b912b91219736a764de88ff7867c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="handlebars-helpers-4.3.1.pom">
+            <sha256 value="018bfda653dbf6c4191b7b05fe4efed8a3d8d70e3de70a7bed1b188a6de26cd2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.jknack" name="handlebars.java" version="4.3.1">
+         <artifact name="handlebars.java-4.3.1.pom">
+            <sha256 value="5040a40d8153473bde79d9c4d4efb87120a1690fae585b58280707d437420999" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.jnr" name="jffi" version="1.2.16">
+         <artifact name="jffi-1.2.16.pom">
+            <sha256 value="0034625f5b9b52efe358f7ee78084b23278efee15677d950b51632e6baf3356d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.jnr" name="jffi" version="1.2.17">
+         <artifact name="jffi-1.2.17-native.jar">
+            <sha256 value="4eb582bc99d96c8df92fc6f0f608fd123d278223982555ba16219bf8be9f75a9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jffi-1.2.17.jar">
+            <sha256 value="b7ceffe12613e637435b43c76e87ba631eb56d7e060d999c7f781e18dc0c2963" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jffi-1.2.17.pom">
+            <sha256 value="1ab06a6de419150682954064a188e8ecfbfcf3219013adf20de127f00c0a2a78" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.jnr" name="jffi" version="1.3.9">
+         <artifact name="jffi-1.3.9-native.jar">
+            <sha256 value="bddfe460d528c68a71d0d4c9d30122f28f6f182f9ebb4be8f65e7090c4ca881c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jffi-1.3.9.jar">
+            <sha256 value="d73c0f00a5ce9dbf3cb5e5bb2691a326ca3882205ec9a06ceb9006537127e661" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jffi-1.3.9.pom">
+            <sha256 value="cc4aa6c329a4457a8185dbc4da21f5ec062e2225aec79c20083b20d751127a1c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.jnr" name="jnr-a64asm" version="1.0.0">
+         <artifact name="jnr-a64asm-1.0.0.jar">
+            <sha256 value="53ae5ea7fa5c284e8279aa348e7b9de4548b0cae10bfd058fa217c791875e4cf" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jnr-a64asm-1.0.0.pom">
+            <sha256 value="9dd9c299ca3ec9287db2ec26571a5cc611dc21a1a4f5d2ef1255a924face47a8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.jnr" name="jnr-constants" version="0.10.3">
+         <artifact name="jnr-constants-0.10.3.jar">
+            <sha256 value="a617b0d8463d3ea36435bd1611113dedb3749157afd2269908ab306c992aefed" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jnr-constants-0.10.3.pom">
+            <sha256 value="e6cfebe4ae44de96a1ec8ee3ff3eb1134ed493b0a15b29a8663e39b6fdaba7a2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.jnr" name="jnr-enxio" version="0.32.13">
+         <artifact name="jnr-enxio-0.32.13.jar">
+            <sha256 value="d3c0136eb0176092210d5c870dbe30f1d92b43d73ee9b1e4a861e28c6460527c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jnr-enxio-0.32.13.pom">
+            <sha256 value="a5caef6df94a2580542dd42c673374d38450d96fbcd8e77c98e6a85f8967fd39" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.jnr" name="jnr-ffi" version="2.1.9">
+         <artifact name="jnr-ffi-2.1.9.jar">
+            <sha256 value="8de65c1b4ea0bb78f92d5406b3176c4b4ebf7c7efa7062ca204c6b9644caa37e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jnr-ffi-2.1.9.pom">
+            <sha256 value="6d10081f730242fb36a0a61d9b6dec015e56c866cf90e5c33e655743539e16a5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.jnr" name="jnr-ffi" version="2.2.11">
+         <artifact name="jnr-ffi-2.2.11.jar">
+            <sha256 value="a9c0bde792514d92e89f19de0412c5e26ee72db5989140242b2902a43b7ac7f5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jnr-ffi-2.2.11.pom">
+            <sha256 value="8be242591cacccb6cae9da700f4373ddad00760e8da679697a98128bb42a5f7b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.jnr" name="jnr-posix" version="3.1.15">
+         <artifact name="jnr-posix-3.1.15.jar">
+            <sha256 value="c38ecfccd24e5f21f17a62e45d5bd454842c5db17ed42b01b868f9206d0e99e7" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jnr-posix-3.1.15.pom">
+            <sha256 value="aa3c236e5fbc6ec365e4c811ecea4dbca7591851cec7c7a1df6b324c4eb082a3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.jnr" name="jnr-unixsocket" version="0.38.17">
+         <artifact name="jnr-unixsocket-0.38.17.jar">
+            <sha256 value="98f62c719b3481457f25fd25e2502ace7a90d45f75a2554ebcfcb6be0b161a17" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jnr-unixsocket-0.38.17.pom">
+            <sha256 value="de848159e1524644e9f1c574af7f46b751e6e530f35a27eeb4c853e91ea1c2e1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.jnr" name="jnr-x86asm" version="1.0.2">
+         <artifact name="jnr-x86asm-1.0.2.jar">
+            <sha256 value="39f3675b910e6e9b93825f8284bec9f4ad3044cd20a6f7c8ff9e2f8695ebf21e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jnr-x86asm-1.0.2.pom">
+            <sha256 value="ea862ce3bd96ccb8ca36b8e9e7baef2da3fbbfbdc256baeaa8c8a873911074e7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.kevinstern" name="software-and-algorithms" version="1.0">
+         <artifact name="software-and-algorithms-1.0.jar">
+            <sha256 value="61ab82439cef37343b14f53154c461619375373a56b9338e895709fb54e0864c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="software-and-algorithms-1.0.pom">
+            <sha256 value="ed971f009354e68c09414c964fbe1a2c85c2c8bbd460122b7497a7b8c5d4f388" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.node-gradle" name="gradle-node-plugin" version="3.3.0">
+         <artifact name="gradle-node-plugin-3.3.0.jar">
+            <sha256 value="3e2223601f3401798b849960f203906defd23c4c8f0d844031091e580008f1fd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="gradle-node-plugin-3.3.0.pom">
+            <sha256 value="b0642ce69c2b945e143fffd74b4cd3ce53b520c8cd535bbe53dcdc488873c00d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.oshi" name="oshi-core" version="6.4.1">
+         <artifact name="oshi-core-6.4.1.jar">
+            <sha256 value="e69f9e648ea1cfb3226f93715c4e630b07c643870408fc00c481b2e826b8ae41" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="oshi-core-6.4.1.pom">
+            <sha256 value="9ac86589beeaf6ca51600fd1808ed5dac6cec1c606b6ccfbf140099baaf9b124" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.oshi" name="oshi-parent" version="6.4.1">
+         <artifact name="oshi-parent-6.4.1.pom">
+            <sha256 value="69fd73e15e99be10f3c4eec3c36ca44e560d164a48369548a501d8bcf67d8dd2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.spotbugs" name="spotbugs-annotations" version="4.0.2">
+         <artifact name="spotbugs-annotations-4.0.2.jar">
+            <sha256 value="3ef6c9f822b601aa151e10e123b49e5604243a4a99bcc47e4e1f9eea9781dc63" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="spotbugs-annotations-4.0.2.module">
+            <sha256 value="0ab4a6040abd5a0feeffb1a5fd9a66b9502bcd5d1200af58a0ab22fb1e39a191" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="spotbugs-annotations-4.0.2.pom">
+            <sha256 value="478008591371610698f4cd887fb4b347ddbf4164f527d6e4681d6c8b6527c1e2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.tomakehurst" name="wiremock-jre8" version="2.35.0">
+         <artifact name="wiremock-jre8-2.35.0.jar">
+            <sha256 value="053aa8a3885747c0df285e14ce07c499c6fb9b2d77f03a54c3d8cc1a06ed918a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="wiremock-jre8-2.35.0.module">
+            <sha256 value="af16a51f97c85ca5bb6b835699a22f616e37ea7b034db46ec4f183d152d53a85" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="wiremock-jre8-2.35.0.pom">
+            <sha256 value="bbf22254c74ca63d6c5e59a0880157c09e012aa55ae7481f5d825021337d5c1d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.tomakehurst" name="wiremock-jre8-standalone" version="2.35.0">
+         <artifact name="wiremock-jre8-standalone-2.35.0.jar">
+            <sha256 value="ae156ae2812e3cfa470c47ed073100ef4ec77927372a4e203f0e3bd531f3eb57" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="wiremock-jre8-standalone-2.35.0.pom">
+            <sha256 value="5ec58051b9829824b3fe634c35d0407c22231d8d9ba3676b5e1203f8e2940db2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.github.zafarkhaja" name="java-semver" version="0.9.0">
+         <artifact name="java-semver-0.9.0.jar">
+            <sha256 value="2218c73b40f9af98b570d084420c1b4a81332297bd7fc27ddd552e903be8e93c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="java-semver-0.9.0.pom">
+            <sha256 value="74da05b3ca50a8158101b7e12fbfbf902e011340f14bf31c1776cb51f96147f3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.android" name="annotations" version="4.1.1.4">
+         <artifact name="annotations-4.1.1.4.jar">
+            <sha256 value="ba734e1e84c09d615af6a09d33034b4f0442f8772dec120efb376d86a565ae15" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="annotations-4.1.1.4.pom">
+            <sha256 value="e4bb54753c36a27a0e5d70154a5034fedd8feac4282295034bfd483d6c7aae78" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.api.grpc" name="proto-google-common-protos" version="2.9.0">
+         <artifact name="proto-google-common-protos-2.9.0.jar">
+            <sha256 value="0d830380ec66bd7e25eee63aa0a5a08578e46ad187fb72d99b44d9ba22827f91" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="proto-google-common-protos-2.9.0.pom">
+            <sha256 value="31f945a2486a85900e538937c19ecb5871379a540e066c1b30b1604a4ed35fdb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.auth" name="google-auth-library-credentials" version="1.4.0">
+         <artifact name="google-auth-library-credentials-1.4.0.jar">
+            <sha256 value="6ad4416d9360a1df3a660c43493e9605416ddd4de953ffbb14dd582a591b09a1" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="google-auth-library-credentials-1.4.0.pom">
+            <sha256 value="9ca13d93f4accbfa1834de09e0f08cd72d516d934810ab047f460a6840dd7285" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.auth" name="google-auth-library-oauth2-http" version="1.4.0">
+         <artifact name="google-auth-library-oauth2-http-1.4.0.jar">
+            <sha256 value="bbf99bba3394c699c48b2e67257dfa96b84c6ee54c348bd426c94207b84254ba" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="google-auth-library-oauth2-http-1.4.0.pom">
+            <sha256 value="5eb286ff2275c8899aa64e8ae7fff051185a32e50e4749ba5a5e6b3986f92539" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.auth" name="google-auth-library-parent" version="1.4.0">
+         <artifact name="google-auth-library-parent-1.4.0.pom">
+            <sha256 value="7e6d969176707212fe173c51398006db706997417bf50bf4110d824122906730" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.auto" name="auto-common" version="1.2">
+         <artifact name="auto-common-1.2.jar">
+            <sha256 value="326d674b411ea67505273f9ade5311c15bca50644b5211a6c309c9aee590a20a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="auto-common-1.2.pom">
+            <sha256 value="745607710fa927e4316f3ac0d67e440a2c222b1d94812f2ff96cacb3804e13de" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.auto" name="auto-common" version="1.2.1">
+         <artifact name="auto-common-1.2.1.jar">
+            <sha256 value="f43f29fe2a6ebaf04b2598cdeec32a4e346d49a9404e990f5fc19c19f3a28d0e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="auto-common-1.2.1.pom">
+            <sha256 value="13b4b50062949f8b1343927c581536d3bb051b8afea509aa6f902f4de28bc1b2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.auto.service" name="auto-service" version="1.0.1">
+         <artifact name="auto-service-1.0.1.jar">
+            <sha256 value="88d469a5392dc2a292dfa20432591a584c29fae417cfd88b72620f35ec795acf" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="auto-service-1.0.1.pom">
+            <sha256 value="f2a34aae11bbf436d1a9bbdaf1dc4112214204657939c3108176ef62d0ccb91b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.auto.service" name="auto-service-aggregator" version="1.0.1">
+         <artifact name="auto-service-aggregator-1.0.1.pom">
+            <sha256 value="0481460db59903362b26fabd3bdcd5ec200750f9391bbb6502fe3c7dc2df3e4c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.auto.service" name="auto-service-annotations" version="1.0.1">
+         <artifact name="auto-service-annotations-1.0.1.jar">
+            <sha256 value="c7bec54b7b5588b5967e870341091c5691181d954cf2039f1bf0a6eeb837473b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="auto-service-annotations-1.0.1.pom">
+            <sha256 value="e9bbf1b3d66ca18004a6a07a20dbfa10ca2ce8367348f741de2fe8fefce68cc2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.auto.value" name="auto-value" version="1.7.4">
+         <artifact name="auto-value-1.7.4.jar">
+            <sha256 value="8320edb037b62d45bc05ae4e1e21941255ef489e950519ef14d636d66870da64" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="auto-value-1.7.4.pom">
+            <sha256 value="70a2b5ff99a965e826bd150fb3fc3e230e7b83f22594c48251f2eb93d25cd47e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.auto.value" name="auto-value-annotations" version="1.9">
+         <artifact name="auto-value-annotations-1.9.jar">
+            <sha256 value="fa5469f4c44ee598a2d8f033ab0a9dcbc6498a0c5e0c998dfa0c2adf51358044" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="auto-value-annotations-1.9.pom">
+            <sha256 value="9220a3dabe75c79334f061b0e40df833448666bac28a8b823bc1e8fd52f8c98a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.auto.value" name="auto-value-parent" version="1.7.4">
+         <artifact name="auto-value-parent-1.7.4.pom">
+            <sha256 value="618b2cbfb399e4512b322a77b5b4f6a8cc81f30f377a6d6c52dec82a3c331aa3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.auto.value" name="auto-value-parent" version="1.9">
+         <artifact name="auto-value-parent-1.9.pom">
+            <sha256 value="2e3d9dff639601cab881d7e170806bcbd8e031f7ebff259cbb45be57b4cbd787" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.code.findbugs" name="jsr305" version="1.3.9">
+         <artifact name="jsr305-1.3.9.pom">
+            <sha256 value="feab9191311c3d7aeef2b66d6064afc80d3d1d52d980fb07ae43c78c987ba93a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.code.findbugs" name="jsr305" version="3.0.2">
+         <artifact name="jsr305-3.0.2.jar">
+            <sha256 value="766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jsr305-3.0.2.pom">
+            <sha256 value="19889dbdf1b254b2601a5ee645b8147a974644882297684c798afe5d63d78dfe" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.code.gson" name="gson" version="2.10.1">
+         <artifact name="gson-2.10.1.jar">
+            <sha256 value="4241c14a7727c34feea6507ec801318a3d4a90f070e4525681079fb94ee4c593" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="gson-2.10.1.pom">
+            <sha256 value="d2b115634f5c085db4b9c9ffc2658e89e231fdbfbe2242121a1cd95d4d948dd7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.code.gson" name="gson" version="2.9.0">
+         <artifact name="gson-2.9.0.jar">
+            <sha256 value="c96d60551331a196dac54b745aa642cd078ef89b6f267146b705f2c2cbef052d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="gson-2.9.0.pom">
+            <sha256 value="7190d0b07f278e9f4c603f44e543940f81cf1a2559f851c6f298c9bb2be2978c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.code.gson" name="gson-parent" version="2.10.1">
+         <artifact name="gson-parent-2.10.1.pom">
+            <sha256 value="4248e0882426c615182385d6086c3ef3262e769957189e29306280b85482b833" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.code.gson" name="gson-parent" version="2.9.0">
+         <artifact name="gson-parent-2.9.0.pom">
+            <sha256 value="af781c9a5766ffea311a0df0536576a64decc661aa110c4de5c73ac8bf434424" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.dagger" name="dagger" version="2.45">
+         <artifact name="dagger-2.45.jar">
+            <sha256 value="f011cae7d2c0fb7ea17c34e05bc10e768b1081a5892ad019cf1fdb0e125c49c1" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="dagger-2.45.pom">
+            <sha256 value="5a705c35764a15835cf5066482a27fad4d9612419140eeb4a256a0347b58d165" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.dagger" name="dagger-compiler" version="2.45">
+         <artifact name="dagger-compiler-2.45.jar">
+            <sha256 value="5617dfb994537dba5b41f3744a6dd13ec3cd99789c065e0d5c6fa9f21cf7ca25" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="dagger-compiler-2.45.pom">
+            <sha256 value="3f1b75096cdd18c579e965b072d44c318011d41212315ae2485b070603f9b45f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.dagger" name="dagger-producers" version="2.45">
+         <artifact name="dagger-producers-2.45.jar">
+            <sha256 value="a05abb4c3ccf6bb0f056bdcb5ef973898ecf172952ab5948a824aeea6c86ecaa" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="dagger-producers-2.45.pom">
+            <sha256 value="4a2077cea6b06e2c915d34a04d7cb337e328c25425c23dfb3af38f6c3284c9b9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.dagger" name="dagger-spi" version="2.45">
+         <artifact name="dagger-spi-2.45.jar">
+            <sha256 value="7cd6f0b09d88e64a9c97bc80e544ab8ac8fdee9301754413585a74cf64222b27" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="dagger-spi-2.45.pom">
+            <sha256 value="9536a8730b792073c0f80a6e4ca5a229d3ba0069e85745f38b5bb195c478b073" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.devtools.ksp" name="symbol-processing-api" version="1.7.0-1.0.6">
+         <artifact name="symbol-processing-api-1.7.0-1.0.6.jar">
+            <sha256 value="adc29417be5ca9ff42118105fea4e36d9ef44987abfc41432309371a60198941" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="symbol-processing-api-1.7.0-1.0.6.module">
+            <sha256 value="13ba6554b7cedba01f52527e2a7fc6ef459e89729196785e86239c312adf2f8d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="symbol-processing-api-1.7.0-1.0.6.pom">
+            <sha256 value="c3bb7cae4cb3bf313fcd5dfb8f635b147920452b71a14c58b44c3526ab9acc05" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.errorprone" name="error_prone_annotation" version="2.18.0">
+         <artifact name="error_prone_annotation-2.18.0.jar">
+            <sha256 value="6e5c594971265b03d39b8fb40a5d92f073ae1d98e47d37a3a3f2702e4e31f267" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="error_prone_annotation-2.18.0.pom">
+            <sha256 value="53a3d53b014e33fd773bba6ae510343bcc1d11dabcaf1ae16c77f327b192c026" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.errorprone" name="error_prone_annotations" version="2.11.0">
+         <artifact name="error_prone_annotations-2.11.0.jar">
+            <sha256 value="721cb91842b46fa056847d104d5225c8b8e1e8b62263b993051e1e5a0137b7ec" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="error_prone_annotations-2.11.0.pom">
+            <sha256 value="0261ca01f2d2e9ac2ae2ece75d42c56323b385fb294b6bc943f62ef4e92ddf08" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.errorprone" name="error_prone_annotations" version="2.14.0">
+         <artifact name="error_prone_annotations-2.14.0.pom">
+            <sha256 value="9dfffc8c883991086f424b94e383dd777cb27e52e9709b2e8ef45e480d30886d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.errorprone" name="error_prone_annotations" version="2.15.0">
+         <artifact name="error_prone_annotations-2.15.0.jar">
+            <sha256 value="067047714349e7789a5bdbfad9d1c0af9f3a1eb28c55a0ee3f68e682f905c4eb" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="error_prone_annotations-2.15.0.pom">
+            <sha256 value="7bae617e32681ebbb289c203c905f646c2a0397598af786d961a54aaa3d2b1e6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.errorprone" name="error_prone_annotations" version="2.18.0">
+         <artifact name="error_prone_annotations-2.18.0.jar">
+            <sha256 value="9e6814cb71816988a4fd1b07a993a8f21bb7058d522c162b1de849e19bea54ae" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="error_prone_annotations-2.18.0.pom">
+            <sha256 value="920135797dcca5917b5a5c017642a58d340a4cd1bcd12f56f892a5663bd7bddc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.errorprone" name="error_prone_annotations" version="2.3.4">
+         <artifact name="error_prone_annotations-2.3.4.jar">
+            <sha256 value="baf7d6ea97ce606c53e11b6854ba5f2ce7ef5c24dddf0afa18d1260bd25b002c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="error_prone_annotations-2.3.4.pom">
+            <sha256 value="1326738a4b4f7ccacf607b866a11fb85193ef60f6a59461187ce7265f9be5bed" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.errorprone" name="error_prone_check_api" version="2.18.0">
+         <artifact name="error_prone_check_api-2.18.0.jar">
+            <sha256 value="6c34578691c4fae9bced50b2a3fe8b4e0420469fb0770655a3ea41ed2a9e40a4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="error_prone_check_api-2.18.0.pom">
+            <sha256 value="9dbd1a761a6bc137a842ea79c40a6a2276619c09f69b0553415a3436022dae18" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.errorprone" name="error_prone_core" version="2.18.0">
+         <artifact name="error_prone_core-2.18.0.jar">
+            <sha256 value="eabbecefbb40c8ab7c2f17b5ef1715a8065f6b9718d4a02cf91850e65bfcc241" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="error_prone_core-2.18.0.pom">
+            <sha256 value="d6c9b956d12e9134ed7e01e82b715c5fd2d6318c3cf803519edef27f6486b9c7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.errorprone" name="error_prone_parent" version="2.11.0">
+         <artifact name="error_prone_parent-2.11.0.pom">
+            <sha256 value="8283f0cb44c624a79d330b6fd80b8b8a715a68b3685c9a951c3de837d4540551" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.errorprone" name="error_prone_parent" version="2.14.0">
+         <artifact name="error_prone_parent-2.14.0.pom">
+            <sha256 value="396c895f7a584583e8420be167091a217533a426c1eca508af1d22aa03a4b2b6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.errorprone" name="error_prone_parent" version="2.15.0">
+         <artifact name="error_prone_parent-2.15.0.pom">
+            <sha256 value="11dcacd17aaac69a99405273badfdaa5f9661d60d179b8a44f503958baa55f88" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.errorprone" name="error_prone_parent" version="2.18.0">
+         <artifact name="error_prone_parent-2.18.0.pom">
+            <sha256 value="47f22e99c7bf466391def16f8377985e5d3ba6f5bbcf65853644805513e15fad" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.errorprone" name="error_prone_parent" version="2.3.4">
+         <artifact name="error_prone_parent-2.3.4.pom">
+            <sha256 value="40495b437a60d2398f0fdfc054b89d9c394a82347a274a0721c2e950a4302186" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.errorprone" name="error_prone_test_helpers" version="2.18.0">
+         <artifact name="error_prone_test_helpers-2.18.0.jar">
+            <sha256 value="595b2921ec2e826e4ce62e84cdcdbb185ee0fa829ab734cf01fedca205601806" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="error_prone_test_helpers-2.18.0.pom">
+            <sha256 value="f93a6e237446bac057532fac9039b60530716fe34cd8bfa9abe9d675a729dcd4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.errorprone" name="error_prone_type_annotations" version="2.18.0">
+         <artifact name="error_prone_type_annotations-2.18.0.jar">
+            <sha256 value="d2ab73bc6807277f7463391504313e47bc3465ab1916339c8e82be633a9ab375" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="error_prone_type_annotations-2.18.0.pom">
+            <sha256 value="758a84e0278c1f48414025020114c5610af999b1863fbf7add2df8122639a2ad" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.errorprone" name="javac-shaded" version="9-dev-r4023-3">
+         <artifact name="javac-shaded-9-dev-r4023-3.jar">
+            <sha256 value="65bfccf60986c47fbc17c9ebab0be626afc41741e0a6ec7109e0768817a36f30" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="javac-shaded-9-dev-r4023-3.pom">
+            <sha256 value="7459fd63c1e73770ca44d37a7a685b731a946eb7cd701ccb284dcb0ce6de3f88" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.googlejavaformat" name="google-java-format" version="1.13.0">
+         <artifact name="google-java-format-1.13.0.jar">
+            <sha256 value="770ae53bd2f0b750bdbbda6e2c685d54378a71d276a64418333ccdde00d021ee" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="google-java-format-1.13.0.pom">
+            <sha256 value="579837ea4d8978c9f4cd3848b5606c41c9b2f7948261a578d5c83742673e3840" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.googlejavaformat" name="google-java-format" version="1.15.0">
+         <artifact name="google-java-format-1.15.0.jar">
+            <sha256 value="4f546cfe159547ac3b9547daa9649e728f6abc254979c975f1cb9971793692c3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="google-java-format-1.15.0.pom">
+            <sha256 value="814ea16bda3ed3a59280570a44379063fe4667b388c4c804ba761b8709f148d2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.googlejavaformat" name="google-java-format" version="1.5">
+         <artifact name="google-java-format-1.5.jar">
+            <sha256 value="aa19ad7850fb85178aa22f2fddb163b84d6ce4d0035872f30d4408195ca1144e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="google-java-format-1.5.pom">
+            <sha256 value="994510ba3b16fb02e5ca17e8fd6158e2702fe95a1359c80be547b86b76a7aad5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.googlejavaformat" name="google-java-format-parent" version="1.13.0">
+         <artifact name="google-java-format-parent-1.13.0.pom">
+            <sha256 value="378572a6c4a264f9452fbcff5799d80bdb33a39b36127f539ca6c5707f8d4946" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.googlejavaformat" name="google-java-format-parent" version="1.15.0">
+         <artifact name="google-java-format-parent-1.15.0.pom">
+            <sha256 value="b8805de089f0fb72e64871985ac789d7f1c8e4e28ed1b89d702909aa389420ff" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.googlejavaformat" name="google-java-format-parent" version="1.5">
+         <artifact name="google-java-format-parent-1.5.pom">
+            <sha256 value="13aaf29158343f8b9c7dd7d3f58610290b05ad29ea69c7b9504869e47fbf6319" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.guava" name="failureaccess" version="1.0.1">
+         <artifact name="failureaccess-1.0.1.jar">
+            <sha256 value="a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="failureaccess-1.0.1.pom">
+            <sha256 value="e96042ce78fecba0da2be964522947c87b40a291b5fd3cd672a434924103c4b9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.guava" name="guava" version="30.0-jre">
+         <artifact name="guava-30.0-jre.jar">
+            <sha256 value="56b292df9ec29d102820c1fd7dd581cd749d5c416c7b3aeac008dbda3b984cc2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="guava-30.0-jre.pom">
+            <sha256 value="3f881774161282f6730d2b8e74a8e1ac753b8a734781a526f880b1b8bdb89451" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.guava" name="guava" version="31.1-jre">
+         <artifact name="guava-31.1-jre.jar">
+            <sha256 value="a42edc9cab792e39fe39bb94f3fca655ed157ff87a8af78e1d6ba5b07c4a00ab" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="guava-31.1-jre.pom">
+            <sha256 value="9193d07bf4f660108d7358e58b27d21b44e34e80d6734e98e21916376f270de2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.guava" name="guava-parent" version="26.0-android">
+         <artifact name="guava-parent-26.0-android.pom">
+            <sha256 value="f8698ab46ca996ce889c1afc8ca4f25eb8ac6b034dc898d4583742360016cc04" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.guava" name="guava-parent" version="30.0-jre">
+         <artifact name="guava-parent-30.0-jre.pom">
+            <sha256 value="65736c957cdf13b356206fe61392b5ea48760ffb5174504f190dcc3b644e399c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.guava" name="guava-parent" version="31.1-jre">
+         <artifact name="guava-parent-31.1-jre.pom">
+            <sha256 value="4439626783b44ad25ef05ff07621dd4bb796cc4eb4f2966a4a461fea4130e0fc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.guava" name="listenablefuture" version="9999.0-empty-to-avoid-conflict-with-guava">
+         <artifact name="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar">
+            <sha256 value="b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.pom">
+            <sha256 value="18d4b1db26153d4e55079ce1f76bb1fe05cdb862ef9954a88cbcc4ff38b8679b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.http-client" name="google-http-client" version="1.41.0">
+         <artifact name="google-http-client-1.41.0.jar">
+            <sha256 value="4a42d2c383373bf61c798f1882745989b9836bb032a8a4019890ecb6cd903ef3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="google-http-client-1.41.0.pom">
+            <sha256 value="6f966a016e253473ac1358a56b303b801d3ef95fbcff056bdf01ad4ddf1a22cd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.http-client" name="google-http-client-bom" version="1.41.0">
+         <artifact name="google-http-client-bom-1.41.0.pom">
+            <sha256 value="54a8946ecbaf6d35743c0ac748a496bf3de03a5065dbf2bf940c2d6a8708d81a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.http-client" name="google-http-client-gson" version="1.41.0">
+         <artifact name="google-http-client-gson-1.41.0.jar">
+            <sha256 value="18766d1bbeb6d363763ef725bc82ed3c8c45f88eadbf149965e6e8c8d9b70d9f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="google-http-client-gson-1.41.0.pom">
+            <sha256 value="f98049595793679b46d7e2d04fcb68c73046b2a4b3fe1c2bba492b114e6936f5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.http-client" name="google-http-client-parent" version="1.41.0">
+         <artifact name="google-http-client-parent-1.41.0.pom">
+            <sha256 value="a7658d2e370299f2ea5f3dcfb75fedfcc9b9fa7251c387ecce95e9d32df48b71" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.j2objc" name="j2objc-annotations" version="1.3">
+         <artifact name="j2objc-annotations-1.3.jar">
+            <sha256 value="21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="j2objc-annotations-1.3.pom">
+            <sha256 value="5faca824ba115bee458730337dfdb2fcea46ba2fd774d4304edbf30fa6a3f055" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.jimfs" name="jimfs" version="1.2">
+         <artifact name="jimfs-1.2.jar">
+            <sha256 value="de16d5c8489729a8512f1a02fbd81f58f89249b72066987da4cc5c87ecb9f72d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jimfs-1.2.pom">
+            <sha256 value="c4a23fb6320252ff397dafa70ce30479f1da8e6158f3b63052c49fac4669916f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.jimfs" name="jimfs-parent" version="1.2">
+         <artifact name="jimfs-parent-1.2.pom">
+            <sha256 value="e47b362a84b65daf3196b5a205634af5608ba9e56086ff4af183daa29258571b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.protobuf" name="protobuf-bom" version="3.19.2">
+         <artifact name="protobuf-bom-3.19.2.pom">
+            <sha256 value="a84ad31e071ac64d9792cceef1bb3ea60bc2caa9eb94f3018737bc32ec8fffe2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.protobuf" name="protobuf-bom" version="3.19.4">
+         <artifact name="protobuf-bom-3.19.4.pom">
+            <sha256 value="6e8029cc0474fc17a01cfe9e21167a0a33cb95807de893447d367d9e4298c4db" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.protobuf" name="protobuf-bom" version="3.21.7">
+         <artifact name="protobuf-bom-3.21.7.pom">
+            <sha256 value="c046ff7f40a6ef9c67650bdec349c3814a5ce880a7b7c788fa4faff13431a9d8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.protobuf" name="protobuf-bom" version="3.22.0">
+         <artifact name="protobuf-bom-3.22.0.pom">
+            <sha256 value="c19eba1f4897afe5d5926d68e19f2c2986752e459cfa9c5925e57290d9217add" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.protobuf" name="protobuf-java" version="3.19.2">
+         <artifact name="protobuf-java-3.19.2.jar">
+            <sha256 value="3446cbfa13795228bc6549b91a409f27cdf6913d1c8f03e0f99572988623a04b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="protobuf-java-3.19.2.pom">
+            <sha256 value="0a6ea5df57d87e3042950525204310ba27581cf351d246a7eff2d21b7b4e1641" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.protobuf" name="protobuf-java" version="3.19.4">
+         <artifact name="protobuf-java-3.19.4.pom">
+            <sha256 value="77c8d851cc762882af58530d23fb4a618260c12df02b4703e6f4e3ddcc8b923e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.protobuf" name="protobuf-java" version="3.21.7">
+         <artifact name="protobuf-java-3.21.7.jar">
+            <sha256 value="a204ec68748a7b26351ae37a311e8de468f248d1916d5f8dbe812c1289d0a0ff" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="protobuf-java-3.21.7.pom">
+            <sha256 value="3f9d5e6ef0176063d4ff567f5d085c8955fe431ca64ef0e14c9c7f94f03310f8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.protobuf" name="protobuf-java" version="3.22.0">
+         <artifact name="protobuf-java-3.22.0.jar">
+            <sha256 value="d3f7fad5fda34e11b7d975abf26331d0f955853f01d6d9b6dcdc7cd2d32251b6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="protobuf-java-3.22.0.pom">
+            <sha256 value="7ef79a4915167d42f785c1b16b60e48af15df3dd017289fa1e10e494e9eee3e3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.protobuf" name="protobuf-java-util" version="3.21.7">
+         <artifact name="protobuf-java-util-3.21.7.jar">
+            <sha256 value="9b98a2a4eb9ebc6103b14ab81badb82e32c8fe1d751aa4055830424974b7e142" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="protobuf-java-util-3.21.7.pom">
+            <sha256 value="9eb3215eb179ca80b5888b34e0e37400f133fc608b1cbb559cff384eeae5882b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.protobuf" name="protobuf-parent" version="3.19.2">
+         <artifact name="protobuf-parent-3.19.2.pom">
+            <sha256 value="25395819097bcac83a43eac8bc2a76681c85869ac9799111204d650d7df0c086" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.protobuf" name="protobuf-parent" version="3.19.4">
+         <artifact name="protobuf-parent-3.19.4.pom">
+            <sha256 value="835819ca9989ff1de6e5406edbf21f88124bb64e37d3a15f12ba8dbdc7a118c3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.protobuf" name="protobuf-parent" version="3.21.7">
+         <artifact name="protobuf-parent-3.21.7.pom">
+            <sha256 value="a4d3ca8d6215e08fd05b5f9d5eb2a44a249849016a418628ffe8c07162066dfd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.protobuf" name="protobuf-parent" version="3.22.0">
+         <artifact name="protobuf-parent-3.22.0.pom">
+            <sha256 value="1b0229a3bbfef37b025d0d8d7ab369393e7128dabb809023681d1ecccf789020" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.re2j" name="re2j" version="1.6">
+         <artifact name="re2j-1.6.jar">
+            <sha256 value="c8b5c3472d4db594a865b2e47f835d07fb8b1415eeba559dccfb0a6945f033cd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="re2j-1.6.pom">
+            <sha256 value="0cbec23bc82fb900eb5eb62c5fc2cb5e239b78a0eb765ebb08e6f05fa615803a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.testing.compile" name="compile-testing" version="0.19">
+         <artifact name="compile-testing-0.19.jar">
+            <sha256 value="ffe9e7ac95165ff350fc12b100c51334cd78d205b86c7147340a117296e2a9cd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="compile-testing-0.19.pom">
+            <sha256 value="b623c8cec51ba45119af69fc526264312be070f7f16d9d943e61f1a9fbe00588" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.truth" name="truth" version="1.1.3">
+         <artifact name="truth-1.1.3.jar">
+            <sha256 value="fc0b67782289a2aabfddfdf99eff1dcd5edc890d49143fcd489214b107b8f4f3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="truth-1.1.3.pom">
+            <sha256 value="3788951d82568b9a1ff7ab145274b8e6062b156e003704bcf6b9a6cc5c5f660b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.google.truth" name="truth-parent" version="1.1.3">
+         <artifact name="truth-parent-1.1.3.pom">
+            <sha256 value="9ac211b0ae371355dc70d5a6a528654fe72c95b6f328052fb5dced45f9afe7f5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.googlecode.concurrent-trees" name="concurrent-trees" version="2.6.1">
+         <artifact name="concurrent-trees-2.6.1.jar">
+            <sha256 value="04e3724984e2a5cbf55606cfa372a5bd3d3c5d2a21533a7004e3cde539761fa5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="concurrent-trees-2.6.1.pom">
+            <sha256 value="43c2b9b142e7055d1f2a5827f10944925d22747d9756b3250c07aab47538a971" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.googlecode.javaewah" name="JavaEWAH" version="1.1.13">
+         <artifact name="JavaEWAH-1.1.13.jar">
+            <sha256 value="4c0fda2b1d317750d7ea324e36c70b2bc48310c0aaae67b98df0915d696d7111" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="JavaEWAH-1.1.13.pom">
+            <sha256 value="9725b1fe9c6810d977750bb84415ea1082c4b488d4a839f9704bb4f5e8fc17f4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.graphql-java" name="graphql-java" version="20.1">
+         <artifact name="graphql-java-20.1.jar">
+            <sha256 value="d1d4aafdf38dbebf851cc434c2c582e2d1055f839a8635160dbf8da1f4c5745a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="graphql-java-20.1.pom">
+            <sha256 value="e044726e78ed17b16fe96cd4c1bf30570ced73b151b351838ef6d801101a859b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.graphql-java" name="java-dataloader" version="3.2.0">
+         <artifact name="java-dataloader-3.2.0.jar">
+            <sha256 value="b9c7d32aef05a2e33dc07c5ce45b713c405b61c6264cb0ed48aac003add3eaa4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="java-dataloader-3.2.0.module">
+            <sha256 value="d243577c2161ffb2b21f2ebdbe3b425d211655e2daaa0e8309a735ed8c9f9a27" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="java-dataloader-3.2.0.pom">
+            <sha256 value="de5edc8f5114c453a06e8281ef7e53bc3d397e2692d507cfc306fb3b460a0d7b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.hierynomus.gradle.plugins" name="license-gradle-plugin" version="0.16.1-fix">
+         <artifact name="license-gradle-plugin-0.16.1-fix.jar">
+            <sha256 value="6611c2acc163ba13038ca8e0a9b2a05fb5e7245481986eb23f0acc47dc63aeea" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="license-gradle-plugin-0.16.1-fix.module">
+            <sha256 value="0adba5badbb5bcf6d75bf75731881c8c0f0da00cd4d0d95cde12afb6705c42e9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.ibm.icu" name="icu4j" version="69.1">
+         <artifact name="icu4j-69.1.jar">
+            <sha256 value="98286f3d538bc7bde87d70bf2cac3acc9ed7b7fe941db5e94a8c3fa13516f963" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="icu4j-69.1.pom">
+            <sha256 value="f0450f5cb0f9ebd5f5ad8f39f4dcb728af881af017d31fe0f274b9a31fd8ab9f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.ibm.icu" name="icu4j" version="71.1">
+         <artifact name="icu4j-71.1.jar">
+            <sha256 value="91c4f8ebf0ceb489547098fe9d5c09a65eb419caea6ed714867f5280800bcf1a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="icu4j-71.1.pom">
+            <sha256 value="6dea8e31017faaa38c1eb51b53bcb4016af418be264193cae1ac54c414bc5166" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.jayway.jsonpath" name="json-path" version="2.7.0">
+         <artifact name="json-path-2.7.0.jar">
+            <sha256 value="de82f0e4602eea0187df36779ae8cfc1653b6d920125674af4d365d0bca59508" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="json-path-2.7.0.pom">
+            <sha256 value="1796a405190407b2eace042586694a9b2ff0d97b82009d35e95c9e2150cdd0c7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.jfrog.artifactory" name="com.jfrog.artifactory.gradle.plugin" version="4.28.3">
+         <artifact name="com.jfrog.artifactory.gradle.plugin-4.28.3.pom">
+            <sha256 value="bcd63b59f93dede1f39b5ec86d2a22d452980e7cf16c1e78ad644ddfef1b6292" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.mycila" name="license-maven-plugin" version="3.0">
+         <artifact name="license-maven-plugin-3.0.jar">
+            <sha256 value="525fe8f3ae8523d05eeda736645c41e9c330f025782b5b3de6ef0baacf2d78cc" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="license-maven-plugin-3.0.pom">
+            <sha256 value="9262708dc90872d72bbe67cb15521353a7de264809ce1eb32df95fbea476fc83" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.mycila" name="license-maven-plugin-parent" version="3.0">
+         <artifact name="license-maven-plugin-parent-3.0.pom">
+            <sha256 value="0d1f173ceb9df2129267667c10c891e5e5d7266d82e3a85070668db56db0cbfa" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.mycila" name="mycila-pom" version="3">
+         <artifact name="mycila-pom-3.pom">
+            <sha256 value="40277a3b25653ee6433c46852da70e9736c198d94bcaf6d2c34708a873a31b26" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.mycila" name="mycila-xmltool" version="4.4.ga">
+         <artifact name="mycila-xmltool-4.4.ga.jar">
+            <sha256 value="75d7b2be9381a65f6fac32f310822112f805566e9f8a97a45d8f13cf55049ce0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="mycila-xmltool-4.4.ga.pom">
+            <sha256 value="c0c69e7bbae8aaebd440e1678ce9f5028b43d3b4e81cd436e98f813a4bc322b2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.mycila.xmltool" name="xmltool" version="3.3">
+         <artifact name="xmltool-3.3.jar">
+            <sha256 value="870f9396789e2f48a7b8fb28dfc070c2f8e74b2007274ce23e69b658110fd294" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="xmltool-3.3.pom">
+            <sha256 value="eb83f616945c8c7dfb4d80e6f909e7286f523bb11077802bcd216bd70e9c717a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.splunk.logging" name="splunk-library-javalogging" version="1.11.5">
+         <artifact name="splunk-library-javalogging-1.11.5.jar">
+            <sha256 value="068fd55259ad3146648a9b85ffd58be993fd085f217afd7c8671fb3972929ff4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="splunk-library-javalogging-1.11.5.pom">
+            <sha256 value="7711e493512d4e290d088e8acb774de7208acb04a6386eb0ca8599148c1db12c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.squareup" name="javapoet" version="1.13.0">
+         <artifact name="javapoet-1.13.0.jar">
+            <sha256 value="4c7517e848a71b36d069d12bb3bf46a70fd4cda3105d822b0ed2e19c00b69291" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="javapoet-1.13.0.pom">
+            <sha256 value="54a34fa8502a46bc90efdb49262600591fa80bf9a34f5a4c798311aec16ca977" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.squareup" name="javapoet" version="1.7.0">
+         <artifact name="javapoet-1.7.0.jar">
+            <sha256 value="2f671d5f056f04922feff78dd60c34979fc9863b16ad706551a9b68842c1a3d0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="javapoet-1.7.0.pom">
+            <sha256 value="fc70895101061120468396fe3552f12a426bd236e70927398f279a85fa5611f4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.squareup" name="kotlinpoet" version="1.11.0">
+         <artifact name="kotlinpoet-1.11.0.jar">
+            <sha256 value="2887ada1ca03dd83baa2758640d87e840d1907564db0ef88d2289c868a980492" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlinpoet-1.11.0.module">
+            <sha256 value="2d6ad09e7cacb9da63c6fdf333e3432b39942d5586336f02eb06f5b5450f34a0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlinpoet-1.11.0.pom">
+            <sha256 value="c30fae8d289e8a666b93fba205f25ac951493841ae146c0e35c35dcf6c4f892c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.squareup" name="kotlinpoet" version="1.5.0">
+         <artifact name="kotlinpoet-1.5.0.jar">
+            <sha256 value="40a3f43038a1a3bf9ae1a2979d77e441d82ee644a28d14a626dff342276997bc" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlinpoet-1.5.0.pom">
+            <sha256 value="6b9a5236226f9ea1f5a133f47759c002c5d54b286516b05df5b8895f8e46500e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.squareup.okhttp3" name="logging-interceptor" version="4.10.0">
+         <artifact name="logging-interceptor-4.10.0.jar">
+            <sha256 value="273ba218636c34f7a091c059d159600543e03ea8beef2c5fc56525b47396160e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="logging-interceptor-4.10.0.module">
+            <sha256 value="fccb0caed4c59ca5e31247adcf3f99bbd15e5a7f0d23c99ee146de31dd018522" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="logging-interceptor-4.10.0.pom">
+            <sha256 value="b7fbf79dfa483050c4ca0653761a21d00d58581915507a3d9d519cb66260bfdf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.squareup.okhttp3" name="logging-interceptor" version="4.9.0">
+         <artifact name="logging-interceptor-4.9.0.jar">
+            <sha256 value="b5848794b6a9cb74b87dac847e05e2de232be35c2a682e1704f65d57b1042fb6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="logging-interceptor-4.9.0.module">
+            <sha256 value="08eb764266c1afb71510c8fa51303c192fe2980adc03d95cf270a5e3e3188779" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="logging-interceptor-4.9.0.pom">
+            <sha256 value="706cbc7f47fe80ffc5e82bdd1f0f0538f4dad95127bb9ca9b4bea25e55237a7e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.squareup.okhttp3" name="okhttp" version="4.10.0">
+         <artifact name="okhttp-4.10.0.jar">
+            <sha256 value="7580f14fa1691206e37081ad3f92063b1603b328da0bb316f2fef02e0562e7ec" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="okhttp-4.10.0.module">
+            <sha256 value="6c3070820b591f5ec8c2948497b5a6b742f492b715bcacf4b75115b3a8ffab15" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="okhttp-4.10.0.pom">
+            <sha256 value="c7f920b287c838e1d81e2a63f8677bb2fa99137058a2b11e6535afde9c81a0e5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.squareup.okhttp3" name="okhttp" version="4.9.0">
+         <artifact name="okhttp-4.9.0.jar">
+            <sha256 value="dbc2bb04ecb002b9f4046263ccad996f4a3d3c59a0cc98837e300a6700571f7c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="okhttp-4.9.0.module">
+            <sha256 value="189d5d7fd53ed4b04f90e0c36f854e5fab18230b26337adf504ca1976bd01f49" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.squareup.okio" name="okio" version="2.8.0">
+         <artifact name="okio-2.8.0.module">
+            <sha256 value="17baab7270389a5fa63ab12811864d0a00f381611bc4eb042fa1bd5918ed0965" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="okio-jvm-2.8.0.jar">
+            <sha256 value="4496b06e73982fcdd8a5393f46e5df2ce2fa4465df5895454cac68a32f09bbc8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.squareup.okio" name="okio" version="3.0.0">
+         <artifact name="okio-3.0.0.module">
+            <sha256 value="6f9e3a797831e75c5b562d946c075183f9b2be846791e9f88bde45491daed987" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="okio-3.0.0.pom">
+            <sha256 value="960ad535235ec61f5546db813d0195c13af85230a12eabe999751e8a550d154f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.squareup.okio" name="okio-jvm" version="3.0.0">
+         <artifact name="okio-jvm-3.0.0.jar">
+            <sha256 value="be64a0cc1f28ea9cd5c970dd7e7557af72c808d738c495b397bf897c9921e907" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="okio-jvm-3.0.0.module">
+            <sha256 value="17f48d41775bd84dea78e9dfed8dfbcc66af80567a5c9ec9d9608785ec820cde" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="okio-jvm-3.0.0.pom">
+            <sha256 value="b0cb73444c6379583b2a53a2648c48de420eb1f49156675374d8a6756ef3a2fa" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.thoughtworks.xstream" name="xstream" version="1.4.17">
+         <artifact name="xstream-1.4.17.pom">
+            <sha256 value="d067077a129a5b4aafb702c2445f8a0694ebd2d2845e7e4c85dd6134f0e2383a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.thoughtworks.xstream" name="xstream" version="1.4.19">
+         <artifact name="xstream-1.4.19.jar">
+            <sha256 value="c9ac93527942189ae89fc9120676358f11ea8f713c635a9f2c70063fe6716634" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="xstream-1.4.19.pom">
+            <sha256 value="ee874d2140ca4e8c774e88df656eecbc9653f5b8cb9806a9ab8505c269b7b37e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.thoughtworks.xstream" name="xstream-parent" version="1.4.17">
+         <artifact name="xstream-parent-1.4.17.pom">
+            <sha256 value="9df6477031b6d04c14ae9168e84839f93c82714559361ce5155f95e4125e62b1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="com.thoughtworks.xstream" name="xstream-parent" version="1.4.19">
+         <artifact name="xstream-parent-1.4.19.pom">
+            <sha256 value="0d4812c4e311109b6e3a4e6066f821d74919813976e4fea9e427cf362f2f0583" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="commons-codec" name="commons-codec" version="1.13">
+         <artifact name="commons-codec-1.13.jar">
+            <sha256 value="61f7a3079e92b9fdd605238d0295af5fd11ac411a0a0af48deace1f6c5ffa072" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="commons-codec-1.13.pom">
+            <sha256 value="c2e2a902d38230cf3031d0b434d5de2614fa0ff26d384b6d282aab56c7d3fc69" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="commons-codec" name="commons-codec" version="1.15">
+         <artifact name="commons-codec-1.15.jar">
+            <sha256 value="b3e9f6d63a790109bf0d056611fbed1cf69055826defeb9894a71369d246ed63" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="commons-codec-1.15.pom">
+            <sha256 value="c86ee198a35a3715487860f419cbf642e7e4d9e8714777947dbe6a4e3a20ab58" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="commons-fileupload" name="commons-fileupload" version="1.4">
+         <artifact name="commons-fileupload-1.4.jar">
+            <sha256 value="a4ec02336f49253ea50405698b79232b8c5cbf02cb60df3a674d77a749a1def7" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="commons-fileupload-1.4.pom">
+            <sha256 value="88517c5a1f8d62aaf4b8b3e2312615b9c2795db86e695bf372e362674cf3f600" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="commons-io" name="commons-io" version="2.11.0">
+         <artifact name="commons-io-2.11.0.jar">
+            <sha256 value="961b2f6d87dbacc5d54abf45ab7a6e2495f89b75598962d8c723cea9bc210908" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="commons-io-2.11.0.pom">
+            <sha256 value="2e016fd7e3244b5f2c20acad834d93aa4790486ee1e4564641361a3e831eef59" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="commons-io" name="commons-io" version="2.8.0">
+         <artifact name="commons-io-2.8.0.jar">
+            <sha256 value="02f291e5d1243dc143496e3cbbb40a1ced47aa58f2d633d3e38780cd068d5074" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="commons-io-2.8.0.pom">
+            <sha256 value="d7c8641a37d6e76f36fb9e81fc1420e26a09d63fa32f00f74764de067ca8347d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="commons-logging" name="commons-logging" version="1.1.1">
+         <artifact name="commons-logging-1.1.1.pom">
+            <sha256 value="d0f2e16d054e8bb97add9ca26525eb2346f692809fcd2a28787da8ceb3c35ee8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="commons-logging" name="commons-logging" version="1.2">
+         <artifact name="commons-logging-1.2.jar">
+            <sha256 value="daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="commons-logging-1.2.pom">
+            <sha256 value="c91ab5aa570d86f6fd07cc158ec6bc2c50080402972ee9179fe24100739fbb20" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="commons-net" name="commons-net" version="3.9.0">
+         <artifact name="commons-net-3.9.0.jar">
+            <sha256 value="e3c1566f821b84489308cd933f57e8c00dd8714dc96b898bef844386510d3461" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="commons-net-3.9.0.pom">
+            <sha256 value="931b55cc96381620ea4ca19e563390b04ace42a2db577a3fcaab5c10364e615c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="de.codeshelf.consoleui" name="consoleui" version="0.0.13">
+         <artifact name="consoleui-0.0.13.jar">
+            <sha256 value="2bdef2d190623ba87b191124a05ceb869e01fa63a0a7ef539c54c3941adafc44" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="consoleui-0.0.13.module">
+            <sha256 value="309c0981eab6c6b9d0d29684c96a2addcfedbaa5de90b265ffa54e6e876c3ae4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="consoleui-0.0.13.pom">
+            <sha256 value="e2cf2d103b285a12cf15a3b6626c9d74cb5cb973e40e938f92a5dae948e82dda" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="dnsjava" name="dnsjava" version="3.5.2">
+         <artifact name="dnsjava-3.5.2.jar">
+            <sha256 value="c7790a69fbacd6e57fd5be53c6af0478bc958700c74a37ec2753909db5785d2b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="dnsjava-3.5.2.pom">
+            <sha256 value="83dec7f0b94d067dbc5c63e416f559087eb13da51f2d5d92c439e88d25d5fdb4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="ethereum" name="execution-spec-tests" version="0.2.3">
+         <artifact name="execution-spec-tests-0.2.3-fixtures.tar.gz">
+            <sha256 value="3dcf5c33adddec2655f85ea2912da294fc0ea210cb1dd032b5278d78a5a0d805" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="info.picocli" name="picocli" version="3.0.0">
+         <artifact name="picocli-3.0.0.jar">
+            <sha256 value="22dbbe287dd0ab9d4d519ac9f2dd909537b6daf279ac5962a3bad8c9dae61032" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="picocli-3.0.0.pom">
+            <sha256 value="5301d0ee67ba5fe7fd54f6bb7aeb3a30d6c814f58674e53e2f79480a225c9ff3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="info.picocli" name="picocli" version="4.7.1">
+         <artifact name="picocli-4.7.1.jar">
+            <sha256 value="0e7191fbe324fb9df8d2d207c07b666b8dc25bbbe26f53a4c52e2fece624a976" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="picocli-4.7.1.pom">
+            <sha256 value="fa9be694577603e2d4cb55f452372d3f6c0f93e5f38ee5cd7fb628b3793ca9bc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="info.picocli" name="picocli-codegen" version="4.7.1">
+         <artifact name="picocli-codegen-4.7.1.jar">
+            <sha256 value="b83d56acc5deaa4db8bd10a38fe91b4c8356ab95dc760af3ba420b0263da912e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="picocli-codegen-4.7.1.pom">
+            <sha256 value="0bd663364f1b8fd9e9da41318d86b903fcaf970edbd7e2b6f539eb7eab4c2809" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.fabric8" name="kubernetes-client-bom" version="5.12.2">
+         <artifact name="kubernetes-client-bom-5.12.2.pom">
+            <sha256 value="eaa03c16956568d54a6ba437d49d40cbf0dd8e93977f984318242576b650bc3b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.github.java-diff-utils" name="java-diff-utils" version="4.0">
+         <artifact name="java-diff-utils-4.0.jar">
+            <sha256 value="810232374e76a954949f0e2185cd7d9515addb918cf3da3481f77e07c356b49a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="java-diff-utils-4.0.pom">
+            <sha256 value="ba37671caef8922d0cf9e0edf38dfbfbc6bcced8916c3d575b3758a7ec288347" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.github.x-stream" name="mxparser" version="1.2.1">
+         <artifact name="mxparser-1.2.1.pom">
+            <sha256 value="540fc2a671f8d9b8d7d9ecb5ffd48291c597917678c9ac7782ccf877067ffa97" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.github.x-stream" name="mxparser" version="1.2.2">
+         <artifact name="mxparser-1.2.2.jar">
+            <sha256 value="aeeee23a3303d811bca8790ea7f25b534314861c03cff36dafdcc2180969eb97" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="mxparser-1.2.2.pom">
+            <sha256 value="235022424e12f33181f62ada19cc4428019b697657c3c392ce357160a422faa8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.grpc" name="grpc-all" version="1.53.0">
+         <artifact name="grpc-all-1.53.0.jar">
+            <sha256 value="89e267a2fa6b92bf70d37a05eca6328350d002ea7d6b0e8d22b981892a900e49" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="grpc-all-1.53.0.pom">
+            <sha256 value="8c296dcff48dd6ff8ece23b2b423bb2d34302b46d2823e24a547e351c974ebac" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.grpc" name="grpc-alts" version="1.53.0">
+         <artifact name="grpc-alts-1.53.0.jar">
+            <sha256 value="d9eff09dbfc5aa7052ef41d393137fc46de335e922b8925f5303ef3e151a3318" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="grpc-alts-1.53.0.pom">
+            <sha256 value="760e1075b59d0213fb4634f003cb4331dd566b63dbec75204427bb0c5cae4504" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.grpc" name="grpc-api" version="1.53.0">
+         <artifact name="grpc-api-1.53.0.jar">
+            <sha256 value="a86967728b17b4edf3c02dbd5011b2e7e323c0b7dd1de899925ca06543467625" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="grpc-api-1.53.0.pom">
+            <sha256 value="b83bf0bf7a7d19def9289e4415f1b1c0bb51d44e16a0ac955877915d6ea693aa" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.grpc" name="grpc-auth" version="1.53.0">
+         <artifact name="grpc-auth-1.53.0.jar">
+            <sha256 value="9a9b8c40301a2c7c5427917306c05b86e1dab85a484d76bff934c369917d2015" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="grpc-auth-1.53.0.pom">
+            <sha256 value="721334ecdb5db68532722ecbf1550c3dfe05d16a325071be09be3e8c615dca07" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.grpc" name="grpc-context" version="1.53.0">
+         <artifact name="grpc-context-1.53.0.jar">
+            <sha256 value="2a6431b5e7bca085b5abd844e30f1270e070c1a179d06b2ea3f83d5f60cc251a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="grpc-context-1.53.0.pom">
+            <sha256 value="12e2ad8fc93d7ec127c4d0bef76b8f609f5cd667c5fa1e0746aa311d83a49502" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.grpc" name="grpc-core" version="1.53.0">
+         <artifact name="grpc-core-1.53.0.jar">
+            <sha256 value="0077b9ff9a3b1a6ba3fad2e559c821e8f5176981068a6923647c7486b598aa03" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="grpc-core-1.53.0.pom">
+            <sha256 value="496c0f426a171c14b1f259d774e0cfa451b3f16d35aec0dd250c28e437a3d5e6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.grpc" name="grpc-grpclb" version="1.53.0">
+         <artifact name="grpc-grpclb-1.53.0.jar">
+            <sha256 value="e30ddfa4e71b624b69c586b6f2a9a8a96313c468e251ba61911743005b9b8e0b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="grpc-grpclb-1.53.0.pom">
+            <sha256 value="8c5312b6d38299314a5d976598804d61c3c39cb01a93946274d16065d58e29dc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.grpc" name="grpc-netty" version="1.53.0">
+         <artifact name="grpc-netty-1.53.0.jar">
+            <sha256 value="582c5bc57d5e3aa6169dee2618561ec63779a2cdbd5e076de9a0998cd5357c4b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="grpc-netty-1.53.0.pom">
+            <sha256 value="141217f2d9c2c94c30637d5d873cfeeaa6d336c220c3d085359f190aacb1e0bf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.grpc" name="grpc-netty-shaded" version="1.53.0">
+         <artifact name="grpc-netty-shaded-1.53.0.jar">
+            <sha256 value="516f3879970d5526af4651d220d2b776f370ecdeb0bd9f6badbe4be88692fea2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="grpc-netty-shaded-1.53.0.pom">
+            <sha256 value="30af650ed4448b3b08454f8c81dea8319055bd88dc8c1ff520fad3fbca4c0662" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.grpc" name="grpc-okhttp" version="1.53.0">
+         <artifact name="grpc-okhttp-1.53.0.jar">
+            <sha256 value="3578d84f3e7e791ab837a9ed2639396c44aa55f27170977c486e6e908a7f7dce" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="grpc-okhttp-1.53.0.pom">
+            <sha256 value="83cfb3e77601b1ffe12102052f9abfc6372c13dfb2e4cbf9118aadad8a374cb9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.grpc" name="grpc-protobuf" version="1.53.0">
+         <artifact name="grpc-protobuf-1.53.0.jar">
+            <sha256 value="eb3c2107f6a6397d9c09179e814e2c6ebc5ff901d67bbf76588e8ef5bb51ca05" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="grpc-protobuf-1.53.0.pom">
+            <sha256 value="de7d9f114c48a55419cb6eec1acf9cdc653460c6907a3c724a2921afb230dfd3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.grpc" name="grpc-protobuf-lite" version="1.53.0">
+         <artifact name="grpc-protobuf-lite-1.53.0.jar">
+            <sha256 value="0e0b234188894ae282f770f85f717f3a2376b5afb5f80c00d664de22fa6cdaa8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="grpc-protobuf-lite-1.53.0.pom">
+            <sha256 value="7abf2fc2a65c5003839f4592077c1273250e966a6f3397fae6221f354de1dea1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.grpc" name="grpc-rls" version="1.53.0">
+         <artifact name="grpc-rls-1.53.0.jar">
+            <sha256 value="d30435485c3a8b741202f8b9aeb1151345f57a041770d4555fcd7b7171a54307" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="grpc-rls-1.53.0.pom">
+            <sha256 value="d9330ace9f54fe4757b0da87e803d3102a97f97a1c266a075276ebe8592aeaff" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.grpc" name="grpc-services" version="1.53.0">
+         <artifact name="grpc-services-1.53.0.jar">
+            <sha256 value="651fd21c9064df117a0896b859821fd26207e5c80dd3361ea8b167492fefb66a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="grpc-services-1.53.0.pom">
+            <sha256 value="1fa4fabb0dff3f5fb92c21f1441ddef0cba9b3ea87db383587cb1b847ed46953" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.grpc" name="grpc-servlet" version="1.53.0">
+         <artifact name="grpc-servlet-1.53.0.jar">
+            <sha256 value="c8b77f741e890af39d214c5bde0fc6d7a352919e40829c149ddeab44bf75e9a9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="grpc-servlet-1.53.0.pom">
+            <sha256 value="d53f9470d0e14268010b3877d737b5823e827a40b9d549ef3ed99460fb240191" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.grpc" name="grpc-servlet-jakarta" version="1.53.0">
+         <artifact name="grpc-servlet-jakarta-1.53.0.jar">
+            <sha256 value="a05b37cfd72e413e38358ce41a638ccee546e82dda50c9a6d815b2973e9faed6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="grpc-servlet-jakarta-1.53.0.pom">
+            <sha256 value="8dc5182a07f1447cafabd8cb13414cd1d35c00ef002dfeaed40da4ca3d5d3a05" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.grpc" name="grpc-stub" version="1.53.0">
+         <artifact name="grpc-stub-1.53.0.jar">
+            <sha256 value="f69f8819dd26266e0d8ef62a0f1473894fbdbab9ea459f977037dbc3bc9cf6e4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="grpc-stub-1.53.0.pom">
+            <sha256 value="44f745f1945150e9a120218f4d0cdb29bfbe0093d0637225906d7702a6818c10" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.grpc" name="grpc-testing" version="1.53.0">
+         <artifact name="grpc-testing-1.53.0.jar">
+            <sha256 value="0a640d2e70e3c34ad282f0df3ece1a053b2134426995c97d835b87c20ab6e237" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="grpc-testing-1.53.0.pom">
+            <sha256 value="84929272df5b753788a503bbc5553d25a026dbcea72ab509a928a6a06ae3e8b8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.grpc" name="grpc-xds" version="1.53.0">
+         <artifact name="grpc-xds-1.53.0.jar">
+            <sha256 value="bc00bccaf1f390a8410162176b461f395df003ebfb559e9fe6e111a1580e6ac8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="grpc-xds-1.53.0.pom">
+            <sha256 value="a73e184d96de50f84c24a8263040b72f96f27b144dd3903a6971e47b8e92906f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.gsonfire" name="gson-fire" version="1.8.5">
+         <artifact name="gson-fire-1.8.5.jar">
+            <sha256 value="b542cc6976461524ea2afc097e6b714edade1eb50b3a65ca53644fff981cae12" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="gson-fire-1.8.5.pom">
+            <sha256 value="a158f0b8bf494bd3e563f6021e6133c4622cddb2a34f97e7f5b9b19cd9d8ef24" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.kubernetes" name="client-java" version="18.0.0">
+         <artifact name="client-java-18.0.0.jar">
+            <sha256 value="ae1c88aa67b593ed3ad4cfa8b680eda8b2560c0c110c1b7e7a47dbb3ad10c28c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="client-java-18.0.0.pom">
+            <sha256 value="1016f6298b4c2980d9d117e15a8bac0844dc373e65d1381f6dd6a7df8dd02a45" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.kubernetes" name="client-java-api" version="18.0.0">
+         <artifact name="client-java-api-18.0.0.jar">
+            <sha256 value="5214ee0049b667f8be84951c8647234b632ff0f8f33b832515e93fb0a40ec385" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="client-java-api-18.0.0.pom">
+            <sha256 value="77a8c696a41308eabc5956de6113d1df6f0549d8d7ee8a9bb27ddbeee61b367d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.kubernetes" name="client-java-parent" version="18.0.0">
+         <artifact name="client-java-parent-18.0.0.pom">
+            <sha256 value="0790cc4876b28eac18ed3fb6264c802c9277a823c3e4813f2d62cf6beb8c84e6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.kubernetes" name="client-java-proto" version="18.0.0">
+         <artifact name="client-java-proto-18.0.0.jar">
+            <sha256 value="446dafbee65985eeca3f3648884957f5cbd4c003d9ee2c88dfc0d37c7e5dbacd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="client-java-proto-18.0.0.pom">
+            <sha256 value="51a1ac5a5d4f94869b82910cb572950d9db783e40334282ca9c128d6425ca428" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-all" version="4.1.90.Final">
+         <artifact name="netty-all-4.1.90.Final.jar">
+            <sha256 value="a3bf4c00eb67bac78d2cbd8ceb8fcf60899e6253dd84b54b2babc4c43f395b85" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-all-4.1.90.Final.pom">
+            <sha256 value="b0a0ce93b7cc7f944e1c23413182c4f0da135dea7d4f9baa5d289cb3d558ea75" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-bom" version="4.1.85.Final">
+         <artifact name="netty-bom-4.1.85.Final.pom">
+            <sha256 value="0d197efa125fc4d1574b9e29252bfd242cd0777fb7911129a082dc28e43c45aa" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-bom" version="4.1.86.Final">
+         <artifact name="netty-bom-4.1.86.Final.pom">
+            <sha256 value="12716c1fe64cf5bdaa7044d37d13aae3a88821b91d4798420c46a74769178afd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-buffer" version="4.1.85.Final">
+         <artifact name="netty-buffer-4.1.85.Final.pom">
+            <sha256 value="7e0a3b5b3568d58a4cd8747113e30d2215c6a53428b035881a345b4f0e74a21d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-buffer" version="4.1.90.Final">
+         <artifact name="netty-buffer-4.1.90.Final.jar">
+            <sha256 value="2c6ff117eea297afd1989864bfd5e5ab122bbd0ef1aee641b6c86005db4496fe" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-buffer-4.1.90.Final.pom">
+            <sha256 value="1b626d6076bed57de339f5eb2ed03709a603f984b1903a2aae04c7483218ad2e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-codec" version="4.1.85.Final">
+         <artifact name="netty-codec-4.1.85.Final.jar">
+            <sha256 value="625e47e43fe60f12475215fcfa6dd5468e01c8b4b07d9a831b8a9d1d519fb9a2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-codec-4.1.85.Final.pom">
+            <sha256 value="97ef211ea878c78c7cc68f0a27fd20544e6157d6254e5d2b9431f73486c072c7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-codec" version="4.1.90.Final">
+         <artifact name="netty-codec-4.1.90.Final.jar">
+            <sha256 value="8963bae9fcc264859f2e8bf87c271bfdd6b1ff3a6b76391c6c1e43779788dc9f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-codec-4.1.90.Final.pom">
+            <sha256 value="5d66dc6aa057d9c27eee49bd928e1393d6d2e37f5d0f00ccb69605b931ef6c56" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-codec-dns" version="4.1.85.Final">
+         <artifact name="netty-codec-dns-4.1.85.Final.jar">
+            <sha256 value="b6c9deb92d544b60e52bd5eb7946d7b105cf2afbdd3f8f8d09a9928db4310bec" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-codec-dns-4.1.85.Final.pom">
+            <sha256 value="1ba617ced8a90e113126ce28f594ad6fb6675e1c008202364d2253def19d72d4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-codec-dns" version="4.1.90.Final">
+         <artifact name="netty-codec-dns-4.1.90.Final.jar">
+            <sha256 value="eb2020e37c89b5f2bab9fa4893a87fd65e33d62e3a4814020deef68ad4dfb1c4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-codec-dns-4.1.90.Final.pom">
+            <sha256 value="f1d0fa09339db90f493a65145cd1611291860e610e93224800ba39ad59d53b58" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-codec-haproxy" version="4.1.90.Final">
+         <artifact name="netty-codec-haproxy-4.1.90.Final.jar">
+            <sha256 value="7f0b6985f7b9de4b7b212c4adfb11557aa72a18cc8c4a0f6740ca36daa69d4f0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-codec-haproxy-4.1.90.Final.pom">
+            <sha256 value="39b126e39130f94d4110f799d5958fcd4f71fb663e61596fe66e0655c1c6caac" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-codec-http" version="4.1.85.Final">
+         <artifact name="netty-codec-http-4.1.85.Final.jar">
+            <sha256 value="86941f4cdfa8f3365909fe86480202ccfc836d999917567755d5602e4eaaac24" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-codec-http-4.1.85.Final.pom">
+            <sha256 value="797a0be399425bc94663cdb83396f44362db8facdbeac21fefe12763c59ebe43" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-codec-http" version="4.1.90.Final">
+         <artifact name="netty-codec-http-4.1.90.Final.jar">
+            <sha256 value="e13867d1b87fcb07fbd60183ecfb61f1a3638472fea9002c5d578ff1b947ca22" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-codec-http-4.1.90.Final.pom">
+            <sha256 value="c748478a4674cfc5775c3ec0e6c1cb2f82a3e19f292c458bbe3fd0c17a82057e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-codec-http2" version="4.1.79.Final">
+         <artifact name="netty-codec-http2-4.1.79.Final.pom">
+            <sha256 value="f1f40fb340c8c2219b240081f30a066eea5edfab2cbd949f65655a2d64c5983e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-codec-http2" version="4.1.85.Final">
+         <artifact name="netty-codec-http2-4.1.85.Final.jar">
+            <sha256 value="9fbd3f943d4ae30947a9cee0c36e36605c951ea64010028ffc97e055499880e9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-codec-http2-4.1.85.Final.pom">
+            <sha256 value="b592d70946a3d2afecf87d1c6d140904cf33f0af15048a3d7808ed7cc42954e4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-codec-http2" version="4.1.90.Final">
+         <artifact name="netty-codec-http2-4.1.90.Final.jar">
+            <sha256 value="98034fc474cc2b78b4d5e7e15fb89034bed28342cbee4a04cfc79406535f0e9a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-codec-http2-4.1.90.Final.pom">
+            <sha256 value="631315de3deda421741116056aa0a01630c49bcafde54d0bf79c51c5fa9392a5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-codec-memcache" version="4.1.90.Final">
+         <artifact name="netty-codec-memcache-4.1.90.Final.jar">
+            <sha256 value="d10c082ae0dbd8f0be4ef9e57e8e7eda0abee63781724356bf95900f8d58c774" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-codec-memcache-4.1.90.Final.pom">
+            <sha256 value="f3f7f66b7c42026fadeffbaf3f318aed750b4ff2c8ee84167e14c36b53a06b07" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-codec-mqtt" version="4.1.90.Final">
+         <artifact name="netty-codec-mqtt-4.1.90.Final.jar">
+            <sha256 value="7801d7456d50868f560bea4b2f8694f7a63be3118ea1691fc91b692731aacafd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-codec-mqtt-4.1.90.Final.pom">
+            <sha256 value="9514040de49e6501aa3fd7e3f94926272fe0df0f17c1c13757d8022e8f104a04" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-codec-redis" version="4.1.90.Final">
+         <artifact name="netty-codec-redis-4.1.90.Final.jar">
+            <sha256 value="df5aac3a73c69cf133ddde0a28633f1dfe40975d3a16ab03325ed392f4be2b3e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-codec-redis-4.1.90.Final.pom">
+            <sha256 value="d63fafd811786f71328e9a55c4ef3f0c068d258b7172ee1c90f33e552e6a5403" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-codec-smtp" version="4.1.90.Final">
+         <artifact name="netty-codec-smtp-4.1.90.Final.jar">
+            <sha256 value="93f8ad3466f84ccb3570c62b168ba3f1b2a9ee10686528bfeb13d2c83be6db57" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-codec-smtp-4.1.90.Final.pom">
+            <sha256 value="38d42b2479e7c8ef00056ffe06b56212423589f7134ef23ba5b7d682e073bbc7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-codec-socks" version="4.1.85.Final">
+         <artifact name="netty-codec-socks-4.1.85.Final.jar">
+            <sha256 value="6c7419a93e0270759a05e6a0f26ed82d4b7b179132e149fb6e13d524fa935081" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-codec-socks-4.1.85.Final.pom">
+            <sha256 value="c8d91bbd38d23497fd9f01b193c093e263e0909c7756b5574ba215c7da6f856a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-codec-socks" version="4.1.90.Final">
+         <artifact name="netty-codec-socks-4.1.90.Final.jar">
+            <sha256 value="2bf6055ddc53e5e3f09e69348422e2f48ca1c8566baf82f90a945896aaaed82d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-codec-socks-4.1.90.Final.pom">
+            <sha256 value="9cf94d8be2ffcb8208304bf078e8a7433186265293dfb84dc86ab9fce8c07c4c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-codec-stomp" version="4.1.90.Final">
+         <artifact name="netty-codec-stomp-4.1.90.Final.jar">
+            <sha256 value="eecf92159abfb688f9c37b2e35a1c71d93f883c259b754d608518d6bb38a869e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-codec-stomp-4.1.90.Final.pom">
+            <sha256 value="aa9da0082e7920977a0d5c5954be2e4f6649338b2c17a6658b7c4cfb00ef774d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-codec-xml" version="4.1.90.Final">
+         <artifact name="netty-codec-xml-4.1.90.Final.jar">
+            <sha256 value="5a1cd2913f9efeb86d6dd322b94c47368796a52215cefd65183a01c86b1ba9aa" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-codec-xml-4.1.90.Final.pom">
+            <sha256 value="160559f24261de878564ad2feb21511d48381312b611d30140f3e884374605ff" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-common" version="4.1.85.Final">
+         <artifact name="netty-common-4.1.85.Final.pom">
+            <sha256 value="700be9c28e466d36eb345af4bc096e13683748fc62fa58f550346b987473c55b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-common" version="4.1.90.Final">
+         <artifact name="netty-common-4.1.90.Final.jar">
+            <sha256 value="c6d6adbb364a9d8732a7b855566561848ccf11464ba774913d8e146c8774f90e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-common-4.1.90.Final.pom">
+            <sha256 value="7bafd07684f4b7ac22e646d4552173d5039facb21c96336e612e69e837556a62" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-handler" version="4.1.85.Final">
+         <artifact name="netty-handler-4.1.85.Final.jar">
+            <sha256 value="c45ff524850527bb7b837f7f25743aa5109e5b20b549c09a01800d665625fb99" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-handler-4.1.85.Final.pom">
+            <sha256 value="db0b184d1386d9a22e52fc8e3728f789c6b6afb7f0413bb6f1168f08ab979e48" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-handler" version="4.1.90.Final">
+         <artifact name="netty-handler-4.1.90.Final.jar">
+            <sha256 value="3ddc2a7753d2813f1c6d045c058448a66dcdbc4dc319d9c7e479017bff77d601" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-handler-4.1.90.Final.pom">
+            <sha256 value="c2d57ffa64541118e883b6abcc7bdeb85bc69e9370b04e84a8d61a0cf260ac68" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-handler-proxy" version="4.1.79.Final">
+         <artifact name="netty-handler-proxy-4.1.79.Final.pom">
+            <sha256 value="a2d46c9f23136a0a2504f17191948a433893e669d5e483fe7d14aaa0af1c3654" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-handler-proxy" version="4.1.85.Final">
+         <artifact name="netty-handler-proxy-4.1.85.Final.jar">
+            <sha256 value="3869c89ae49e3ad13e823eab1c6d1d0ae6eb50046c52ba67cd50a9749531660a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-handler-proxy-4.1.85.Final.pom">
+            <sha256 value="f5a35bae44463abf16b2e42d968fc831311c359d0a6307c0009f84567d184c8e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-handler-proxy" version="4.1.90.Final">
+         <artifact name="netty-handler-proxy-4.1.90.Final.jar">
+            <sha256 value="fc50d622a8731129a17eb807c41d5546e767486303e56fb44210171caccbac7d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-handler-proxy-4.1.90.Final.pom">
+            <sha256 value="bf6ae726b9c9a4bb4dd57b3ae0027f9f1b4cd1510a45f7614fc200907a8c214c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-handler-ssl-ocsp" version="4.1.90.Final">
+         <artifact name="netty-handler-ssl-ocsp-4.1.90.Final.jar">
+            <sha256 value="54ed6c1d2dcd84b5424b3509880767975d8378dfbd7a126856c33168bcf15756" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-handler-ssl-ocsp-4.1.90.Final.pom">
+            <sha256 value="dca2dbfc0c02cf2c7f0effe58ce8ef2b0df34b80bbd322166a5697cb7bb05663" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-parent" version="4.1.79.Final">
+         <artifact name="netty-parent-4.1.79.Final.pom">
+            <sha256 value="fd3283e75882dca94015596c83cffa5a4145da74967eb78edb69ae50c01cc953" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-parent" version="4.1.85.Final">
+         <artifact name="netty-parent-4.1.85.Final.pom">
+            <sha256 value="2718eb3fa76ecddce9f92da69dd1c44f607733cd92d47460118687e61ec47209" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-parent" version="4.1.90.Final">
+         <artifact name="netty-parent-4.1.90.Final.pom">
+            <sha256 value="a1d95bbad9cf4282123943517147562e149f72993344bf087c800332051658d2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-resolver" version="4.1.85.Final">
+         <artifact name="netty-resolver-4.1.85.Final.pom">
+            <sha256 value="128ff29264742604117999c2c783a5efb2af21665d37fa1b50aaaf456abafa38" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-resolver" version="4.1.90.Final">
+         <artifact name="netty-resolver-4.1.90.Final.jar">
+            <sha256 value="e0aecc6e150a6f4f1e44dd8961f96a5b973397f6bc90007a2edab0e00331bc37" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-resolver-4.1.90.Final.pom">
+            <sha256 value="514235e5225576cc2f879d7f31a0764df340c20514dffd1efa74050e01cc871f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-resolver-dns" version="4.1.85.Final">
+         <artifact name="netty-resolver-dns-4.1.85.Final.jar">
+            <sha256 value="bc14fdc9c639000f8d553bd3d7fe9e7248ee9318d2a4ab620e2862f550fd7fed" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-resolver-dns-4.1.85.Final.pom">
+            <sha256 value="45b5fa5f4962fe1502850846a74caba628bb326efd394646989877c764e02f63" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-resolver-dns" version="4.1.90.Final">
+         <artifact name="netty-resolver-dns-4.1.90.Final.jar">
+            <sha256 value="451feb1ab8b005b92f017938982237cb98781f2eb0632d21813f4d82ad8e9dfd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-resolver-dns-4.1.90.Final.pom">
+            <sha256 value="f1a13622eefc85c4ae94bb55d4a3e1b7165c64e4b0ce5cd30795df8471a553e7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-resolver-dns-classes-macos" version="4.1.90.Final">
+         <artifact name="netty-resolver-dns-classes-macos-4.1.90.Final.jar">
+            <sha256 value="fa329eec1e104634d0be1d21b4ba69657a8aef9429607b3df16ba142dbfb7e16" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-resolver-dns-classes-macos-4.1.90.Final.pom">
+            <sha256 value="64e318a80764059b79e0c05dc3bb7a6b68a164798c205d5ba85e63874783f844" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-resolver-dns-native-macos" version="4.1.90.Final">
+         <artifact name="netty-resolver-dns-native-macos-4.1.90.Final-osx-aarch_64.jar">
+            <sha256 value="f189011b01f4b1ecd4e03bf332d52a0ac24a98eaa1f9ff7c9422ddab67ff1d26" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-resolver-dns-native-macos-4.1.90.Final-osx-x86_64.jar">
+            <sha256 value="39299918d6b34385d34857960c04284477fb00a5ac4f7e1e0267d45a90a8c61a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-resolver-dns-native-macos-4.1.90.Final.pom">
+            <sha256 value="a60f3b4488b6de3f50edd8b89a02fd18cf57e40cded27bb4a3b22ad096b22d6a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-tcnative-boringssl-static" version="2.0.59.Final">
+         <artifact name="netty-tcnative-boringssl-static-2.0.59.Final.jar">
+            <sha256 value="ce6ce70f1ba55928fda2efdf16422d90d7905b3105f4eba2129bffe8e3bfe809" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-tcnative-boringssl-static-2.0.59.Final.pom">
+            <sha256 value="ac94f0c7a05fa199b949a52d0c6612e58550e213665a361dc89e45ad19517b8b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-tcnative-classes" version="2.0.59.Final">
+         <artifact name="netty-tcnative-classes-2.0.59.Final.jar">
+            <sha256 value="9531ac13a0c54d24932f39a3abd11e16057a0ef5aa0712ea77be1b94eb86b445" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-tcnative-classes-2.0.59.Final.pom">
+            <sha256 value="04b946b7ae103b3fa2154c652f9dbc939f0ac0c22209dd0be5e8a5fce20381c3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-tcnative-parent" version="2.0.59.Final">
+         <artifact name="netty-tcnative-parent-2.0.59.Final.pom">
+            <sha256 value="576a96ab16a311523d4a8b00bea2223f46fb74151929bfa7a4fdeb84122ba06f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-transport" version="4.1.85.Final">
+         <artifact name="netty-transport-4.1.85.Final.pom">
+            <sha256 value="1a15a04b08b8bd60424f8577fc5302c65ef82cb8ba3d558ea2951191fe971207" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-transport" version="4.1.90.Final">
+         <artifact name="netty-transport-4.1.90.Final.jar">
+            <sha256 value="252239c58c97f3e977205ac8eaa0caaa4d027848d308540dab02eb4e94727a78" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-transport-4.1.90.Final.pom">
+            <sha256 value="bb0a2a259eb168aa668b87b28b70ded7db5e06239247830ff5b3472b2922bacb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-transport-classes-epoll" version="4.1.90.Final">
+         <artifact name="netty-transport-classes-epoll-4.1.90.Final.jar">
+            <sha256 value="43a8572ef3061cfb9dbbc7178dc3405b3fbc8562e6768aa92d9222d284bf35f7" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-transport-classes-epoll-4.1.90.Final.pom">
+            <sha256 value="42bc169f377f318281e5d544e26e7f2e556367221ef4fe96eed88a62b5f6ded7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-transport-classes-kqueue" version="4.1.90.Final">
+         <artifact name="netty-transport-classes-kqueue-4.1.90.Final.jar">
+            <sha256 value="c52f681e928e3d913efa272737a5e35f0a09596030dd76d4bbfd9999bb04ca4b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-transport-classes-kqueue-4.1.90.Final.pom">
+            <sha256 value="e72f789826feab414c1d7f26709b378a31e0cbac4e21d60434918c822d4876b9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-transport-native-epoll" version="4.1.90.Final">
+         <artifact name="netty-transport-native-epoll-4.1.90.Final-linux-aarch_64.jar">
+            <sha256 value="069161a6b7a792ee1804ac54ea921d8a45d7aef46dbdc5986d9197b0747577e3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-transport-native-epoll-4.1.90.Final-linux-x86_64.jar">
+            <sha256 value="438484aad1c53bccfb456c4f40ea2126d82b87b20179e920fa4fadf6df1e8d7f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-transport-native-epoll-4.1.90.Final.jar">
+            <sha256 value="0b5c5428b285bc8de6e44942ced6a5f60fc12f602966566390e427ba6ce00334" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-transport-native-epoll-4.1.90.Final.pom">
+            <sha256 value="8e868ea0b3ec102db963aa04e4a95f6ff6deb043df13b48d9634e0f52df8fb95" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-transport-native-kqueue" version="4.1.90.Final">
+         <artifact name="netty-transport-native-kqueue-4.1.90.Final-osx-aarch_64.jar">
+            <sha256 value="a0e196855f14e8ca0e8e93d009df6ed2601f7336d16d681ffa30a595fbb54954" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-transport-native-kqueue-4.1.90.Final-osx-x86_64.jar">
+            <sha256 value="a4242ff46decb4771cd4850b8e2737a8dabc588f898fc0099e5eb26647ae430b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-transport-native-kqueue-4.1.90.Final.jar">
+            <sha256 value="dd939a046ebe8815cbe65fd9ed555188c507d1b9a9d26e89e3b0157f9d94915b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-transport-native-kqueue-4.1.90.Final.pom">
+            <sha256 value="70ba57eee613235d9d97fdd7b95de3a82e101724a6be60cd4b711a7916221c57" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-transport-native-unix-common" version="4.1.90.Final">
+         <artifact name="netty-transport-native-unix-common-4.1.90.Final.jar">
+            <sha256 value="b5c2b82e8d4d46c5ad1015fd2bbb76513c5f88b558d6cc80d99e8a46ec14cca3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-transport-native-unix-common-4.1.90.Final.pom">
+            <sha256 value="4e024e135f828c9918189f46ecd754c2de4fb1dd334bdbc2db524e59525967b0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-transport-rxtx" version="4.1.90.Final">
+         <artifact name="netty-transport-rxtx-4.1.90.Final.jar">
+            <sha256 value="d37482e7a47d085d6e11b26238a0a87bc684dc3ec9ad7bef664ff38b5e3ff510" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-transport-rxtx-4.1.90.Final.pom">
+            <sha256 value="18cca9c08087c0d7d69383bf880b8173ca1403140e2f1fe9650bab51e6f9b567" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-transport-sctp" version="4.1.90.Final">
+         <artifact name="netty-transport-sctp-4.1.90.Final.jar">
+            <sha256 value="08586e9f081a2f0266c88d019d009db98b6ce6e567b6265818235a960fa0c0cf" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-transport-sctp-4.1.90.Final.pom">
+            <sha256 value="d0de096ebdca675d37d41e013fa068e4122ee334d0d1983749ab889fd6f7e0c9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.netty" name="netty-transport-udt" version="4.1.90.Final">
+         <artifact name="netty-transport-udt-4.1.90.Final.jar">
+            <sha256 value="e89bcc076ac73eed0e86f6dfbb367baefb790ee66084435b0a9849587ad56bd1" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="netty-transport-udt-4.1.90.Final.pom">
+            <sha256 value="eafe9b40e2e4892aa5ef57d650bf7c913f04cf113e3eb6fb3304d890e3f0024a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opencensus" name="opencensus-api" version="0.28.0">
+         <artifact name="opencensus-api-0.28.0.jar">
+            <sha256 value="0c1723f3f6d3061323845ce8b88b35fdda500812e0a75b8eb5fcc4ad8c871a95" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opencensus-api-0.28.0.pom">
+            <sha256 value="804178ff123a6017f565b49cb2ac2f19bb49284c20536d05751457ba00f254c1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opencensus" name="opencensus-contrib-http-util" version="0.28.0">
+         <artifact name="opencensus-contrib-http-util-0.28.0.jar">
+            <sha256 value="49c3db2a29f1fdb2f73928cbea969bd1d40fab7cc5bb6273022babd96f7a789b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opencensus-contrib-http-util-0.28.0.pom">
+            <sha256 value="2c0a40962d125376a97d6e552c766cda2e5a32f9349d470d5e2c007ec8937056" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opencensus" name="opencensus-proto" version="0.2.0">
+         <artifact name="opencensus-proto-0.2.0.jar">
+            <sha256 value="0c192d451e9dd74e98721b27d02f0e2b6bca44b51563b5dabf2e211f7a3ebf13" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opencensus-proto-0.2.0.pom">
+            <sha256 value="b7087907920fc8a81534686b2f1a2b331127af97f015abbdb3786a51f3fa1e52" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentelemetry" name="opentelemetry-api" version="1.24.0">
+         <artifact name="opentelemetry-api-1.24.0.jar">
+            <sha256 value="f5ce6139cbc2c0d0597289b7b47eb4f15c158f2612237e7c4b363f0acf2f1285" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-api-1.24.0.module">
+            <sha256 value="730f5e8245ceed1734504c7e77b64f278bcfca4ed52e4708a737110b4548c6d2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-api-1.24.0.pom">
+            <sha256 value="0206c397c81e115e880bf1577147dd616bb37f1affaa7d0805ee5eeac73e0b03" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentelemetry" name="opentelemetry-api-events" version="1.24.0-alpha">
+         <artifact name="opentelemetry-api-events-1.24.0-alpha.jar">
+            <sha256 value="a72b79dc88c4d8a64d7128a863b51942b243ca3d3be1126ec3bb56c0a7f0286d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-api-events-1.24.0-alpha.module">
+            <sha256 value="a9a0bb41ffb43c9867070dc314f9f50ac9e43e92a641029292b452089556bf8e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-api-events-1.24.0-alpha.pom">
+            <sha256 value="dd058b5f91b1994854c7fd3fbeffcf6106dc0879df4fc17e71e8a8946aa17027" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentelemetry" name="opentelemetry-api-logs" version="1.24.0-alpha">
+         <artifact name="opentelemetry-api-logs-1.24.0-alpha.jar">
+            <sha256 value="1adf6036ae00ff5bc1db16d6b799c0f8a8814a0ecc97dc25d4fadf367d2a59cb" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-api-logs-1.24.0-alpha.module">
+            <sha256 value="af69dda62eedd3ab37fc28744e72b6267e2484993b2062521612a7d34882f010" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-api-logs-1.24.0-alpha.pom">
+            <sha256 value="6b4bfc0199862afc2e47135d6b65caf4f3a8a3133ad9cfdb0dc3fcbcebb95474" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentelemetry" name="opentelemetry-context" version="1.24.0">
+         <artifact name="opentelemetry-context-1.24.0.jar">
+            <sha256 value="25d020f9a7bc085029484b38495a530368c06fb965e52772f19c14ed244b5db1" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-context-1.24.0.module">
+            <sha256 value="b1dcdedca03707267cc34fe8b70ef5f8943116fd033c4ae22875136afa196e5d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-context-1.24.0.pom">
+            <sha256 value="4c0ea3675bf7fe3846864a2ff8cfcd8455eca6dd008b72544c6433600cbc910c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentelemetry" name="opentelemetry-exporter-common" version="1.24.0">
+         <artifact name="opentelemetry-exporter-common-1.24.0.jar">
+            <sha256 value="831e0b6eafd914b59dc428b957f10a648d04697dc94b3c876ba9da72012171c7" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-exporter-common-1.24.0.module">
+            <sha256 value="3de9fa6d9367b7af22e82854bf46279f0a9af68341cb0729726f92f5de4df26c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-exporter-common-1.24.0.pom">
+            <sha256 value="c4e303335636bff64394431b4dcfbe6073ee5fbf7555642f70f196a6a61f604b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentelemetry" name="opentelemetry-exporter-otlp" version="1.24.0">
+         <artifact name="opentelemetry-exporter-otlp-1.24.0.jar">
+            <sha256 value="2cc6768d94c0120e70a313d57f9d28141266692b2d185f11b8e187defcebf2a5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-exporter-otlp-1.24.0.module">
+            <sha256 value="dd1841c5986580652649082f9fa5217cac381dd2f09def28f6da3a5d3d24889e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-exporter-otlp-1.24.0.pom">
+            <sha256 value="c2abb9ace7f4b37f3cde9732bfab23a8a4445ddc48a6a4383fb3e7c3dd60addb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentelemetry" name="opentelemetry-exporter-otlp-common" version="1.24.0">
+         <artifact name="opentelemetry-exporter-otlp-common-1.24.0.jar">
+            <sha256 value="c028b3311478b91f95d1d77fd37de6fc098023bf94acc43e94a35c20e0624f02" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-exporter-otlp-common-1.24.0.module">
+            <sha256 value="221721912320ccb82af25d16f5e2e64f5d0627d478ef5de534c232b4d54fe0ed" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-exporter-otlp-common-1.24.0.pom">
+            <sha256 value="e835c77cca7dfe104ed830687dfc4be29f5ee055a8d79769005867ed35d4fd17" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentelemetry" name="opentelemetry-extension-trace-propagators" version="1.24.0">
+         <artifact name="opentelemetry-extension-trace-propagators-1.24.0.jar">
+            <sha256 value="f0739e636aefc387e0244980030a3f329e5db317b38acb4e223bd3570ab5ced7" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-extension-trace-propagators-1.24.0.module">
+            <sha256 value="28b3e1e32ee2176ceb18a59496b4660c9d1588161506dff3363e7d2f297a7fd2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-extension-trace-propagators-1.24.0.pom">
+            <sha256 value="cbcee23193627a9733cdd59750a9ff921334e4b5fa0f489a3ab9c44fa0ea6dac" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentelemetry" name="opentelemetry-sdk" version="1.24.0">
+         <artifact name="opentelemetry-sdk-1.24.0.jar">
+            <sha256 value="638b807dcbb32dbc47b46f5bf9256164fdd3296aa6a678895fae213fcc1d5236" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-sdk-1.24.0.module">
+            <sha256 value="bb90eb81fa4df9aaf1f3490efe64390b14f2a374b13bd2040830f74f57646564" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-sdk-1.24.0.pom">
+            <sha256 value="71aa77a5dbaa098bab1a69ab67f22eec6df5bb4f0dc670c8c2a950432c6bcc03" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentelemetry" name="opentelemetry-sdk-common" version="1.24.0">
+         <artifact name="opentelemetry-sdk-common-1.24.0.jar">
+            <sha256 value="4241f3070db865b9b39843d9489cab9c89859464700a3172c1d16319f4678061" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-sdk-common-1.24.0.module">
+            <sha256 value="bd81047832102c9b5771e17f635e6718e0cadfe9d5b49917ada5cd2bf2285c46" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-sdk-common-1.24.0.pom">
+            <sha256 value="4eb3cea039e2f9f1185370b0608466a7a568cacab1d2593bede94c79f26a8772" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentelemetry" name="opentelemetry-sdk-extension-autoconfigure" version="1.24.0-alpha">
+         <artifact name="opentelemetry-sdk-extension-autoconfigure-1.24.0-alpha.jar">
+            <sha256 value="55f544828cb2bf2ef1fc6557a198ed310159ff5cde1682891a868cb00d81812d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-sdk-extension-autoconfigure-1.24.0-alpha.module">
+            <sha256 value="5a7ed9a621f7e9bab5279a3005aba496f6767c941004561301e8498e25238443" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-sdk-extension-autoconfigure-1.24.0-alpha.pom">
+            <sha256 value="d2cc1fe4e3071ead10aec02d9ed89c512444118e57742ccfe8e2b5a2f8a3440b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentelemetry" name="opentelemetry-sdk-extension-autoconfigure-spi" version="1.24.0">
+         <artifact name="opentelemetry-sdk-extension-autoconfigure-spi-1.24.0.jar">
+            <sha256 value="51775a0f0fa297198d7a0b48dabf121246ecbb1e306dafb32e6a2e96d35f667b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-sdk-extension-autoconfigure-spi-1.24.0.module">
+            <sha256 value="dc0b5a57b3accfb5cc3298afb89626e8b5922b539d71c741e9953dac85463a85" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-sdk-extension-autoconfigure-spi-1.24.0.pom">
+            <sha256 value="a81f378b83a6a033e4cffe01f709f558784562e818559b3f3ddb108b15c77d4e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentelemetry" name="opentelemetry-sdk-logs" version="1.24.0-alpha">
+         <artifact name="opentelemetry-sdk-logs-1.24.0-alpha.jar">
+            <sha256 value="9176e6a815e375281c7470af83da94e13c420cd014b4260741a9ae1859013582" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-sdk-logs-1.24.0-alpha.module">
+            <sha256 value="9447ab685fe8d286fcc6fa96b44d1c6a6d1b9289dec4b67374197abca42e7fce" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-sdk-logs-1.24.0-alpha.pom">
+            <sha256 value="028e2a6dae9c54407d55429695f0904081aeac508180473b32b976bc4d8a88ac" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentelemetry" name="opentelemetry-sdk-metrics" version="1.24.0">
+         <artifact name="opentelemetry-sdk-metrics-1.24.0.jar">
+            <sha256 value="fe1d79f8005ee86373faad0357fd616a9adf313deb5934eddf2cad19c91e6b57" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-sdk-metrics-1.24.0.module">
+            <sha256 value="f5fbee426cb7b19241720fbf835bc52d95baf2008c2f9289c48237d9c5ca27a7" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-sdk-metrics-1.24.0.pom">
+            <sha256 value="38261712e20e5688eb684eceea0eff5afb6f9ad4a157ce19feb0a611fcda1c0c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentelemetry" name="opentelemetry-sdk-trace" version="1.24.0">
+         <artifact name="opentelemetry-sdk-trace-1.24.0.jar">
+            <sha256 value="899264a4a0f7e9d52a4b89c3954a7fb012ce4b1b7ee6ac005e4f54e358c39ddf" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-sdk-trace-1.24.0.module">
+            <sha256 value="a83f6309318196d9e728bd80bcab863b6b479e51b844440d2ca918d66bae8b44" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-sdk-trace-1.24.0.pom">
+            <sha256 value="b13e94b0867b30c5adc7006f0a44cea1e8d91114ff8cec6af6d49cb83ab36b73" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentelemetry" name="opentelemetry-semconv" version="1.24.0-alpha">
+         <artifact name="opentelemetry-semconv-1.24.0-alpha.jar">
+            <sha256 value="c54d950f6bc84990df8388e912d63678744c0dd57c40b13a28f9579853157aa3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-semconv-1.24.0-alpha.module">
+            <sha256 value="a0319662bad51cff113b4aa411ccbb5ae05b0ddeddfaef59e9d7c778853be9c1" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-semconv-1.24.0-alpha.pom">
+            <sha256 value="3db89611dab677538982b5ffacc70142ea22bec304ddf6d548f5b696269c22a4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentelemetry.instrumentation" name="opentelemetry-instrumentation-api" version="1.24.0">
+         <artifact name="opentelemetry-instrumentation-api-1.24.0.jar">
+            <sha256 value="1b60021970458e584c7f44e39c85ca4dafeafb496862f7b09a106450f8b27101" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-instrumentation-api-1.24.0.module">
+            <sha256 value="ab4c4d28564a9d217782dbf30111dd00882c929076d1befdcb77466455ceba2e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-instrumentation-api-1.24.0.pom">
+            <sha256 value="88300d39991072750ca64e9acc9bd6bce326f25c284da132a11ec0e6d8ef7da9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentelemetry.instrumentation" name="opentelemetry-instrumentation-api-semconv" version="1.24.0-alpha">
+         <artifact name="opentelemetry-instrumentation-api-semconv-1.24.0-alpha.jar">
+            <sha256 value="a043f0085fb170a9d541abd8b0dc0d62393915d31af8a3944a65a3a313393477" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-instrumentation-api-semconv-1.24.0-alpha.module">
+            <sha256 value="101fee856766be659b49b6301c9d4b8cf7c899c406986e3bd1a9fb0ecb88a2a6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-instrumentation-api-semconv-1.24.0-alpha.pom">
+            <sha256 value="78c11d17e155f560ea47dbfae3de8a4756ee4729668c72b429cd0723fc38ff49" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentelemetry.instrumentation" name="opentelemetry-okhttp-3.0" version="1.24.0-alpha">
+         <artifact name="opentelemetry-okhttp-3.0-1.24.0-alpha.jar">
+            <sha256 value="5a17d733cb02568d90f477aef9bed4bb634d212a698b87e4d2f19a26370ff50b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-okhttp-3.0-1.24.0-alpha.module">
+            <sha256 value="6e2f0ee79254e486714e0f1a1926744ac180d5ebe979845eb8ca80005962fe0a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-okhttp-3.0-1.24.0-alpha.pom">
+            <sha256 value="86fb385a22d3105704f5986c38f0f24ebb112f4a08d3ba7ebd77dc68b8e25503" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentelemetry.proto" name="opentelemetry-proto" version="0.19.0-alpha">
+         <artifact name="opentelemetry-proto-0.19.0-alpha.jar">
+            <sha256 value="3666ce35098ae1624d9d9606665386e6e30c3e647d700ee67480bbfd5533e41f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-proto-0.19.0-alpha.module">
+            <sha256 value="f13583a112d0e4572b77ba31897a3a4dbc993c1bd6a5483c75f8f71a64dd5eca" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentelemetry-proto-0.19.0-alpha.pom">
+            <sha256 value="b606169a01474de2815d543cc0681885687056b39cbbd308641936b3fde27536" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentracing" name="opentracing-api" version="0.33.0">
+         <artifact name="opentracing-api-0.33.0.jar">
+            <sha256 value="4534541b8e9f41a17bcdf1d09affe45b98c13574db6e529a93a58264b9472c7c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentracing-api-0.33.0.pom">
+            <sha256 value="3783e2333ef4ec6c2442204ced5897232eab1185bfe59633629afbf2aa551931" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentracing" name="opentracing-noop" version="0.33.0">
+         <artifact name="opentracing-noop-0.33.0.jar">
+            <sha256 value="8529f91e10047b2b94cb21b50086a3d3913fa4da43594eddbd9ecf5917efe040" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentracing-noop-0.33.0.pom">
+            <sha256 value="1e76b824f918e858cf2e1f81a89fe8c1287a9df463467c789254aeeced8e8295" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentracing" name="opentracing-util" version="0.33.0">
+         <artifact name="opentracing-util-0.33.0.jar">
+            <sha256 value="22c5dfbb9b0e2f08f7371bf3d68372c7604c804d3129499b43f37a8877c4379e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentracing-util-0.33.0.pom">
+            <sha256 value="34b427ffd1c4a16843f15349e597d17645fb25ee7b465292ec7077adb0c66b31" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentracing" name="parent" version="0.33.0">
+         <artifact name="parent-0.33.0.pom">
+            <sha256 value="2d08dff405159ef344e195b027977f4369e0931af33ff1fbd696dd5efaba6bb7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentracing.contrib" name="opentracing-concurrent" version="0.4.0">
+         <artifact name="opentracing-concurrent-0.4.0.jar">
+            <sha256 value="261bfc94feecd0f0e7f1443fa9040409ed9a1f7fbe122f34fee0c11ac295cdc5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentracing-concurrent-0.4.0.pom">
+            <sha256 value="ef790f7cfe23da0b92aaa121847851fc3eea64535381f4965c68e71f3a7bb1c6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentracing.contrib" name="opentracing-okhttp-parent" version="3.0.0">
+         <artifact name="opentracing-okhttp-parent-3.0.0.pom">
+            <sha256 value="abfd7b351cbf03dd7b8b9fde4bb76dcfdddb3a60c4534e7d516f943d20f231e9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.opentracing.contrib" name="opentracing-okhttp3" version="3.0.0">
+         <artifact name="opentracing-okhttp3-3.0.0.jar">
+            <sha256 value="17006f0e7f6c360c6ac125ca4d22c1069a444202c602b352d542c4adef9462d6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentracing-okhttp3-3.0.0.pom">
+            <sha256 value="3a7b2fb2d6c972ba08d45779136e2a11033ab647cbdb3aca8a483a477093e8b4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.perfmark" name="perfmark-api" version="0.25.0">
+         <artifact name="perfmark-api-0.25.0.jar">
+            <sha256 value="2044542933fcdf40ad18441bec37646d150c491871157f288847e29cb81de4cb" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="perfmark-api-0.25.0.module">
+            <sha256 value="22961ff0b626a66d1e5eada3e9fae8d2ad345147625de5ada73bcb3a86b59f0d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="perfmark-api-0.25.0.pom">
+            <sha256 value="1a4a2b828cd0b90041626bdec2293fdc6a98901661e30b5fe3585b9fc94b08ea" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.pkts" name="pkts-buffers" version="3.0.10">
+         <artifact name="pkts-buffers-3.0.10.jar">
+            <sha256 value="e60f26c4f39ef61dd7010619c50702f1f6d581342c53737b0cf0ecfd6a89d703" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="pkts-buffers-3.0.10.pom">
+            <sha256 value="6d9685852ea6e74c3ce4b425aef96e9e435682c8ba8d89f5b1b4ef9b14fc6c8b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.pkts" name="pkts-core" version="3.0.10">
+         <artifact name="pkts-core-3.0.10.jar">
+            <sha256 value="4543debd3c96b4a3cce8a27c0f47501361107a8573605ae618c492570842682d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="pkts-core-3.0.10.pom">
+            <sha256 value="e20fe11631b67c1a38f32d32492bc67ae4f4514f530737d5599204f5d2277d7f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.pkts" name="pkts-parent" version="3.0.10">
+         <artifact name="pkts-parent-3.0.10.pom">
+            <sha256 value="42067396968c5056e60ce65fef4f0714679a11564a5180a291d8ac72813ffb97" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.projectreactor" name="reactor-core" version="3.4.14">
+         <artifact name="reactor-core-3.4.14.jar">
+            <sha256 value="5c82576a5f6142f084331e8b7526bf6cc9415ff013fbdb1b6810955fa2cd62ad" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="reactor-core-3.4.14.module">
+            <sha256 value="bf5311e3e98ce36900612e5b089aeaa28038c7312bf28ecce056f7535a407c0a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="reactor-core-3.4.14.pom">
+            <sha256 value="b79c88f7b8c8a0a8412e914310e61e5ee114b92a4fd440e23572c3ea55d1e0d7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.prometheus" name="parent" version="0.15.0">
+         <artifact name="parent-0.15.0.pom">
+            <sha256 value="e8e10f63abf4796a9db6654f92146473e75da7e2ad443066b812f85e88cfc6e7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.prometheus" name="parent" version="0.16.0">
+         <artifact name="parent-0.16.0.pom">
+            <sha256 value="722b55119097b04d711479dfb60dd54b27b5920a1aeb7702027c44a215ffc596" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.prometheus" name="parent" version="0.9.0">
+         <artifact name="parent-0.9.0.pom">
+            <sha256 value="d0a11b469235119373cc8653639b5c0ef151cef7ef24156bdb40e86d06cae6a5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.prometheus" name="simpleclient" version="0.9.0">
+         <artifact name="simpleclient-0.9.0.jar">
+            <sha256 value="72d6dc49c023a4b3345d8a8a82d947ea24d07b1ad60cf57fee85a6f77b149a19" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="simpleclient-0.9.0.pom">
+            <sha256 value="af483cf712b579150db4840c099ffb2b8fc2f5e227897511523e707bab484e5c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.prometheus" name="simpleclient_common" version="0.9.0">
+         <artifact name="simpleclient_common-0.9.0.jar">
+            <sha256 value="97d404dca184d2a07817ccae2ef1df9fb34b84526c44cf2367ef0ba8031759c0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="simpleclient_common-0.9.0.pom">
+            <sha256 value="09995ffae8df4a170fc991b7c30518afb4235d7bbdf7dc2757d73978509b2a90" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.prometheus" name="simpleclient_guava" version="0.16.0">
+         <artifact name="simpleclient_guava-0.16.0.jar">
+            <sha256 value="49959fe20423803b8958fe35ce6cdcc47e58e2251b191ad53eb7ef6fc46c4ae1" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="simpleclient_guava-0.16.0.pom">
+            <sha256 value="1d42aa72798870f20e997ae6c4d14ec3b26b3ef715602b2a8f32404e3657bdb1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.prometheus" name="simpleclient_hotspot" version="0.9.0">
+         <artifact name="simpleclient_hotspot-0.9.0.jar">
+            <sha256 value="927fc7069f9a8ebd1a8420c3bb1675a957bd359b95e50664aa96e387d4b0a256" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="simpleclient_hotspot-0.9.0.pom">
+            <sha256 value="349ffe987a81e6ed51d917cc12440821f026c716768641ba8866c383906facde" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.prometheus" name="simpleclient_httpserver" version="0.15.0">
+         <artifact name="simpleclient_httpserver-0.15.0.jar">
+            <sha256 value="a1a16e1f804e3382ed8b400220ecb2913c96412d937e618f54a7088e6eb432b6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="simpleclient_httpserver-0.15.0.pom">
+            <sha256 value="0af7ff19c8dedb71418b6da24731d732f261b41da41a670c243ac31862d5fb6b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.prometheus" name="simpleclient_pushgateway" version="0.9.0">
+         <artifact name="simpleclient_pushgateway-0.9.0.jar">
+            <sha256 value="1daadee769a2be810df4e29ea24c688ae0f3ad64dd9ccb1f7e74941a73f21aa4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="simpleclient_pushgateway-0.9.0.pom">
+            <sha256 value="d79f02c4b9be5ea002f118c81989012cfe38136880df02ea796b440f14924262" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.reactivex.rxjava2" name="rxjava" version="2.2.2">
+         <artifact name="rxjava-2.2.2.jar">
+            <sha256 value="6e9ef979524bfa23de907a057fd73818ed54438678f36d6d2dd874c8dd5fb4d0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="rxjava-2.2.2.pom">
+            <sha256 value="ef7d2558db4d9f8d0c67ccc9e3fbaaf68abd0e2ca6f76ae8016818de7fb7f645" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.reactivex.rxjava2" name="rxjava" version="2.2.21">
+         <artifact name="rxjava-2.2.21.jar">
+            <sha256 value="59df6541a840018f0f4c899aae4f4c1f4383f4c16feb5268615fbe384d28501c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="rxjava-2.2.21.pom">
+            <sha256 value="b25bece50483de9a3e1dfd25011c2d85330216ef8a81b86f6abebdbdf9b0f127" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.spring.dependency-management" name="io.spring.dependency-management.gradle.plugin" version="1.0.11.RELEASE">
+         <artifact name="io.spring.dependency-management.gradle.plugin-1.0.11.RELEASE.pom">
+            <sha256 value="247ee0093844d4e4ab2d8ac12e543debc4c25bf6caa2140877f92fda30e1c45e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.spring.gradle" name="dependency-management-plugin" version="1.0.11.RELEASE">
+         <artifact name="dependency-management-plugin-1.0.11.RELEASE.jar">
+            <sha256 value="39ab7c3aa351b700dc8a61c4aa66dc34239f0b7ed62adc66c7ce9e4072d6ac88" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="dependency-management-plugin-1.0.11.RELEASE.pom">
+            <sha256 value="ffa5b3a237c6c1e84f7d87d0732706f804fe02bd9078e501031063b53e176227" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.swagger" name="swagger-annotations" version="1.6.9">
+         <artifact name="swagger-annotations-1.6.9.jar">
+            <sha256 value="7ef85974e5d82fcabd0dabd2c455cd80378b36d774de017ceac842a3a4fa64f8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="swagger-annotations-1.6.9.pom">
+            <sha256 value="e81b490775b50bab270fbb0b6fbc0aa1d6b4c074ba185bb052b8ec3131483e69" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.swagger" name="swagger-project" version="1.6.9">
+         <artifact name="swagger-project-1.6.9.pom">
+            <sha256 value="6d2ab119502ad06f80a5ff0d741cf0b213c56170b51761fc5911aecd8f512441" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.vertx" name="vertx-auth" version="4.3.5">
+         <artifact name="vertx-auth-4.3.5.pom">
+            <sha256 value="610c389160ae7a31cde5f60f105f87c300753a36908ef6fca8c859f6ea52fd95" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.vertx" name="vertx-auth-common" version="4.3.5">
+         <artifact name="vertx-auth-common-4.3.5.jar">
+            <sha256 value="19083bb0ac408d948909dce75f038c8d14efcad8fa8d867e38a7e52b28dc5a47" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="vertx-auth-common-4.3.5.pom">
+            <sha256 value="562146ddf6f313cc6d7b0718c59f7dfb565a69fd55339c385b5b5307a76eece4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.vertx" name="vertx-auth-jwt" version="4.3.5">
+         <artifact name="vertx-auth-jwt-4.3.5.jar">
+            <sha256 value="4da7480a767a57a8380f398612665123b31804883986eed881e52d2cedc287e9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="vertx-auth-jwt-4.3.5.pom">
+            <sha256 value="2ff709ba4137da8d167b35be6992b6f3b9313df0cd45f8efb1c3edf6bc675841" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.vertx" name="vertx-bridge-common" version="4.3.5">
+         <artifact name="vertx-bridge-common-4.3.5.jar">
+            <sha256 value="73c66b4cca66a04b02426e4e0b882e6757f20393dff79c125960aaf12259c6dd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="vertx-bridge-common-4.3.5.pom">
+            <sha256 value="68f5a556370335fadb0fadd42ba6afa949463671c6ebc28ea37a627f78888de3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.vertx" name="vertx-codegen" version="4.3.5">
+         <artifact name="vertx-codegen-4.3.5.jar">
+            <sha256 value="3c1ff2b84abdef41970e0aebde147e97a1365f64ad798697a7fe4303f226558e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="vertx-codegen-4.3.5.pom">
+            <sha256 value="d3ef9821ec755ea0dfb6a10de85d4fd371c5dad1366fc9635c695d553a801fd9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.vertx" name="vertx-core" version="4.3.5">
+         <artifact name="vertx-core-4.3.5.jar">
+            <sha256 value="390811dc0f2e83409a74263bb69995d8020ac44cf11ed412a80d39daf25a1ca6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="vertx-core-4.3.5.pom">
+            <sha256 value="a2e244064fa2ca8fe679b355edb63f5e3064d4b48f3d7572f75c70c9513faa4c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.vertx" name="vertx-dependencies" version="4.1.2">
+         <artifact name="vertx-dependencies-4.1.2.pom">
+            <sha256 value="e91f82c75cc3a8ec04505773bf71886f18b676f17b3f3e5b03356e6c26be5b25" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.vertx" name="vertx-dependencies" version="4.3.5">
+         <artifact name="vertx-dependencies-4.3.5.pom">
+            <sha256 value="c2f2df4e57060796d577b379e3f1f79d58959eba7269b583b40205bbc2ce04a4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.vertx" name="vertx-ext" version="38">
+         <artifact name="vertx-ext-38.pom">
+            <sha256 value="9e00c39a0f0d832fde9f383c1e3ec7eb27d2bec15aa4c57d6bb1c639ab76a94c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.vertx" name="vertx-ext-parent" version="38">
+         <artifact name="vertx-ext-parent-38.pom">
+            <sha256 value="9ede6271ed5ee6c9987a808ca3cffddb732151f17ab71e5ee79674e74335317c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.vertx" name="vertx-junit5" version="4.3.5">
+         <artifact name="vertx-junit5-4.3.5.jar">
+            <sha256 value="33a486e4170a739b910fba06589e9cf9a58131cfefbd504d6b84e519e9fae74e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="vertx-junit5-4.3.5.pom">
+            <sha256 value="7867a732c775e269f3aea45f9e596e0f42ee2fcb341b9ea4c28fa231cc39a451" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.vertx" name="vertx-lang-kotlin" version="4.1.2">
+         <artifact name="vertx-lang-kotlin-4.1.2.jar">
+            <sha256 value="b5e163fb7c2816853637ef47d11650a6f6d089816d7c701e63ab3e4646afc457" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="vertx-lang-kotlin-4.1.2.pom">
+            <sha256 value="81fc9aa43e007a28855d1375cdf451e40fa977cfe6a7b97ffe990287f268281d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.vertx" name="vertx-lang-kotlin-coroutines" version="4.1.2">
+         <artifact name="vertx-lang-kotlin-coroutines-4.1.2.jar">
+            <sha256 value="dfa191f72162774554f00a3a50d606e8872f5be3b41da9502a6fe51b922e3997" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="vertx-lang-kotlin-coroutines-4.1.2.pom">
+            <sha256 value="208902b75918bebadf3e5e9581ab8aab872a4345a19b502c4f8d675fc8b45645" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.vertx" name="vertx-lang-kotlin-parent" version="4.1.2">
+         <artifact name="vertx-lang-kotlin-parent-4.1.2.pom">
+            <sha256 value="992cf9dcc1564ab3c5bcac0b72608d99436b91098184af3df5d70d6e79bc4ff7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.vertx" name="vertx-parent" version="19">
+         <artifact name="vertx-parent-19.pom">
+            <sha256 value="219614cfbb9c31b6287672d3f615575eaa86c4cc26e402cfc87c8a753c16693e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.vertx" name="vertx-unit" version="4.3.5">
+         <artifact name="vertx-unit-4.3.5.jar">
+            <sha256 value="6a9ec116aff00d7cb18147a14203142f38b7620cc8fff2e38acdb9d2bf1205d8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="vertx-unit-4.3.5.pom">
+            <sha256 value="80a15976f7ec95e9f45461fdb428236a63793ca4a35d293ddb2bbbd484d7942a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.vertx" name="vertx-uri-template" version="4.3.5">
+         <artifact name="vertx-uri-template-4.3.5.jar">
+            <sha256 value="4d7723d08b3daabcd6b2457e7e05eddda6e64733daff20d2584e809d6baacba5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="vertx-uri-template-4.3.5.pom">
+            <sha256 value="aaf15b4f80e9c4a4333249cc0fb01f64e9db00294f293cbe1f132f91beb57ae1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.vertx" name="vertx-web" version="4.3.5">
+         <artifact name="vertx-web-4.3.5.jar">
+            <sha256 value="c5e60861d56159e916e593d8c195b67cdaac30f1e0d10d24f8e2a44eecd1a513" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="vertx-web-4.3.5.pom">
+            <sha256 value="d03c37c8b09655d4a6e1afe713eed9c6f041ebcd57351d2672abe363f27d23a0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.vertx" name="vertx-web-client" version="4.3.5">
+         <artifact name="vertx-web-client-4.3.5.jar">
+            <sha256 value="6c74f742cc6598f9be0fe37f04aca530ccef4295778ed76fb9941ba71d677453" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="vertx-web-client-4.3.5.pom">
+            <sha256 value="3b5462fc3ea182a47d4cfef5fcc71ba33ef8eb8a24a1535671dbcfe043beed75" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.vertx" name="vertx-web-common" version="4.3.5">
+         <artifact name="vertx-web-common-4.3.5.jar">
+            <sha256 value="588f2ade1d107d3f879c5aa8aedb61807308ff9d233552d93709af4b3272bcb8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="vertx-web-common-4.3.5.pom">
+            <sha256 value="a12f0cfcabf0bfd3bc6d970fac21361b771f89e9fca2220fc35b9804a21f8fd7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="io.vertx" name="vertx-web-parent" version="4.3.5">
+         <artifact name="vertx-web-parent-4.3.5.pom">
+            <sha256 value="f9832c71419065cdc85763267749f36b190588134acfc8d8a17b7a60d7ce19ff" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="jakarta.platform" name="jakarta.jakartaee-bom" version="9.0.0">
+         <artifact name="jakarta.jakartaee-bom-9.0.0.pom">
+            <sha256 value="91903d0dd876dec67f8b923f1332ba72bf295b06bd397d18f3af19307ce1a2ce" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="jakarta.platform" name="jakartaee-api-parent" version="9.0.0">
+         <artifact name="jakartaee-api-parent-9.0.0.pom">
+            <sha256 value="f65dcf14b6e1d9148e198a390fafe155faca093253dde900307f3e0ea82cad3b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="javax.annotation" name="javax.annotation-api" version="1.3.2">
+         <artifact name="javax.annotation-api-1.3.2.jar">
+            <sha256 value="e04ba5195bcd555dc95650f7cc614d151e4bcd52d29a10b8aa2197f3ab89ab9b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="javax.annotation-api-1.3.2.pom">
+            <sha256 value="46a4a251ca406e78e4853d7a2bae83282844a4992851439ee9a1f23716f06b97" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="javax.inject" name="javax.inject" version="1">
+         <artifact name="javax.inject-1.jar">
+            <sha256 value="91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="javax.inject-1.pom">
+            <sha256 value="943e12b100627804638fa285805a0ab788a680266531e650921ebfe4621a8bfa" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="javax.persistence" name="javax.persistence-api" version="2.2">
+         <artifact name="javax.persistence-api-2.2.jar">
+            <sha256 value="5578b71b37999a5eaed3fea0d14aa61c60c6ec6328256f2b63472f336318baf4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="javax.persistence-api-2.2.pom">
+            <sha256 value="9e0636486d1f2356a7f345b4df9bb95e5842f0ab26bd7615b07b7be99b3c870a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="javax.servlet" name="javax.servlet-api" version="3.1.0">
+         <artifact name="javax.servlet-api-3.1.0.jar">
+            <sha256 value="af456b2dd41c4e82cf54f3e743bc678973d9fe35bd4d3071fa05c7e5333b8482" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="javax.servlet-api-3.1.0.pom">
+            <sha256 value="b31109e22ea3f2df1ad7955432e718a35def50ae6c19698034afa8a0cf9e9069" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="javax.xml.bind" name="jaxb-api" version="2.3.0">
+         <artifact name="jaxb-api-2.3.0.jar">
+            <sha256 value="883007989d373d19f352ba9792b25dec21dc7d0e205a710a93a3815101bb3d03" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jaxb-api-2.3.0.pom">
+            <sha256 value="466f6e7b9901e952ae1ad24f0e9494a5680961f04e42239b5ae64e8dcaf6297a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="javax.xml.bind" name="jaxb-api-parent" version="2.3.0">
+         <artifact name="jaxb-api-parent-2.3.0.pom">
+            <sha256 value="76b7aac6413269d0bddb47b8b8e37bb3145789c9a9a42df80927aeb5aeeffb72" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="jline" name="jline" version="2.14.6">
+         <artifact name="jline-2.14.6.jar">
+            <sha256 value="97d1acaac82409be42e622d7a54d3ae9d08517e8aefdea3d2ba9791150c2f02d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jline-2.14.6.pom">
+            <sha256 value="1df7b6f08dfb81a268d6b93b659a6a9e389c5d8c32bdf0754238ba6483a4e982" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="junit" name="junit" version="4.12">
+         <artifact name="junit-4.12.jar">
+            <sha256 value="59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-4.12.pom">
+            <sha256 value="90f163f78e3ffb6f1c7ad97de9e7eba4eea25807141b85d6d12be67ca25449c4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="junit" name="junit" version="4.13.2">
+         <artifact name="junit-4.13.2.jar">
+            <sha256 value="8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-4.13.2.pom">
+            <sha256 value="569b6977ee4603c965c1c46c3058fa6e969291b0160eb6964dd092cd89eadd94" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="me.champeau.jmh" name="jmh-gradle-plugin" version="0.7.0">
+         <artifact name="jmh-gradle-plugin-0.7.0.jar">
+            <sha256 value="a4cb2052aee8271973f53e02bc94f60ddd4eb20f2eb04bd82008c6eb036d3e50" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jmh-gradle-plugin-0.7.0.module">
+            <sha256 value="becf0cfd30e5a0195687c339185168553884cc2bafcd4a16b0fd7c15ffb3c56a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="me.champeau.jmh" name="me.champeau.jmh.gradle.plugin" version="0.7.0">
+         <artifact name="me.champeau.jmh.gradle.plugin-0.7.0.pom">
+            <sha256 value="818e873701053111c82904f452569b0de72b736959531e7d72024e3c7a15b429" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.bytebuddy" name="byte-buddy" version="1.12.19">
+         <artifact name="byte-buddy-1.12.19.jar">
+            <sha256 value="030704139e46f32c38d27060edee9e0676b0a0fff8a8be53461515154ba8a7be" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="byte-buddy-1.12.19.pom">
+            <sha256 value="435fb8664aa9b7e120c8dd6c707d4eafa642fa262dff6d5e3f71dc25c69e89eb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.bytebuddy" name="byte-buddy" version="1.12.21">
+         <artifact name="byte-buddy-1.12.21.jar">
+            <sha256 value="f6f45c2237a7f132c16745ad2a52c4cdde58028b11ee80b09f0d422f4930d685" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="byte-buddy-1.12.21.pom">
+            <sha256 value="95eb42c89fd04f62187dd33b9cdf04d2df1b876b375c16ad32c0a5a1cc1a070b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.bytebuddy" name="byte-buddy-agent" version="1.12.19">
+         <artifact name="byte-buddy-agent-1.12.19.jar">
+            <sha256 value="3a70240de7cdcde04e7c504c2327d7035b9c25ae0206881e3bf4e6798a273ed8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="byte-buddy-agent-1.12.19.pom">
+            <sha256 value="b5a2cff643681de1687fc40acd251feefdfca23e673e049fb3c3692b53526d4b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.bytebuddy" name="byte-buddy-parent" version="1.12.19">
+         <artifact name="byte-buddy-parent-1.12.19.pom">
+            <sha256 value="72ab6fef409e812921f4728b3c4b6ef4fa53bc25fabb0488fc2cae367368b54d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.bytebuddy" name="byte-buddy-parent" version="1.12.21">
+         <artifact name="byte-buddy-parent-1.12.21.pom">
+            <sha256 value="ff66d886607137e2095f20c90ee093f3c80329164eff091a0688bdce37e3e6b2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.java" name="jvnet-parent" version="3">
+         <artifact name="jvnet-parent-3.pom">
+            <sha256 value="30f5789efa39ddbf96095aada3fc1260c4561faf2f714686717cb2dc5049475a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.java" name="jvnet-parent" version="5">
+         <artifact name="jvnet-parent-5.pom">
+            <sha256 value="1af699f8d9ddab67f9a0d202fbd7915eb0362a5a6dfd5ffc54cafa3465c9cb0a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.java.dev.jna" name="jna" version="5.13.0">
+         <artifact name="jna-5.13.0.jar">
+            <sha256 value="66d4f819a062a51a1d5627bffc23fac55d1677f0e0a1feba144aabdd670a64bb" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jna-5.13.0.pom">
+            <sha256 value="f515c2578178f45247ecca7a9e1db109531b1c42f2424e253ceeb0f6b8d42374" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.java.dev.jna" name="jna-platform" version="5.13.0">
+         <artifact name="jna-platform-5.13.0.jar">
+            <sha256 value="474d7b88f6e97009b6ec1d98c3024dd95c23187c65dabfbc35331bcac3d173dd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jna-platform-5.13.0.pom">
+            <sha256 value="63b20c8af057c98196f8789e1a21a6dddf02aa8f385e6b04b4b4f9f0df257066" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.javacrumbs.json-unit" name="json-unit-core" version="2.36.0">
+         <artifact name="json-unit-core-2.36.0.jar">
+            <sha256 value="6b58fcfc6dad948e98330ce598352b3a39c49ddc8f6d9f5a0983e92fc8758705" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="json-unit-core-2.36.0.pom">
+            <sha256 value="9366ff617a6cb0b416dec389435dfeab9008b208f6948bd2563f2e0204397533" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.javacrumbs.json-unit" name="json-unit-parent" version="2.36.0">
+         <artifact name="json-unit-parent-2.36.0.pom">
+            <sha256 value="c5903be1b21c11d9132045f0c5b40a42a11d5f48ae6f4f8e46d2c4c5e56c727c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.jcip" name="jcip-annotations" version="1.0">
+         <artifact name="jcip-annotations-1.0.jar">
+            <sha256 value="be5805392060c71474bf6c9a67a099471274d30b83eef84bfc4e0889a4f1dcc0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jcip-annotations-1.0.pom">
+            <sha256 value="5c19e6848cc550a95664fb082304bc5f9fcf7b672faf03af1635f0e93c268177" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.ltgt.errorprone" name="net.ltgt.errorprone.gradle.plugin" version="2.0.2">
+         <artifact name="net.ltgt.errorprone.gradle.plugin-2.0.2.pom">
+            <sha256 value="52a9883a1dafb857acc4ead8a901fb12c13cefecd48ba96425af30e3751445ac" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.ltgt.gradle" name="gradle-errorprone-plugin" version="2.0.2">
+         <artifact name="gradle-errorprone-plugin-2.0.2.jar">
+            <sha256 value="a8b70340609fb632f7851d9ead8b3651c98da55ed3399eff3b689fb51fc2cf56" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="gradle-errorprone-plugin-2.0.2.pom">
+            <sha256 value="1e83a495d12a0a408ba25a4f8ed5364f6cf690ee652fc846306cc4417546ae21" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.ltgt.gradle.incap" name="incap" version="0.2">
+         <artifact name="incap-0.2.jar">
+            <sha256 value="b625b9806b0f1e4bc7a2e3457119488de3cd57ea20feedd513db070a573a4ffd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="incap-0.2.pom">
+            <sha256 value="1a4a08a1e88d32052cd82dc2f740b34d3048e2c0e6a7c2bfe2309ed00771f73a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.minidev" name="accessors-smart" version="2.4.7">
+         <artifact name="accessors-smart-2.4.7.jar">
+            <sha256 value="ef5103429f101f7e3ff62f3a182342720439eaea43d2eed3119bba770bb202a9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="accessors-smart-2.4.7.pom">
+            <sha256 value="58dbf2d3b1944f4adb492bd05d258cd0e556eabff9a14dea9d4101a34e0582e0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.minidev" name="accessors-smart" version="2.4.8">
+         <artifact name="accessors-smart-2.4.8.jar">
+            <sha256 value="7dd705aa1ac0e030f8ee2624e8e77239ae1eef6ccc2621c0b8c189866ee1c42c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="accessors-smart-2.4.8.pom">
+            <sha256 value="d5fa010d51e66fc8fa991168f9f9359d024136f701d63d8f6c1199be7c0dce64" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.minidev" name="json-smart" version="2.4.7">
+         <artifact name="json-smart-2.4.7.jar">
+            <sha256 value="28c17ed16ac22e6845743fd1e84321edf5d7735fc216e44ee269d106bf3d8146" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="json-smart-2.4.7.pom">
+            <sha256 value="e9015c732768297251c41ef8c0c9c3d471ac95097688098a954c75f1e2303eb2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.minidev" name="json-smart" version="2.4.8">
+         <artifact name="json-smart-2.4.8.jar">
+            <sha256 value="174a9ad578b56644e62b3965d8bf94ac3a76e707c6343b8abac9d3671438b4b2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="json-smart-2.4.8.pom">
+            <sha256 value="7c97c22579a81d3e8458896c0e061aba7d836dd97329860e34ace4965b4061ad" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="net.sf.jopt-simple" name="jopt-simple" version="5.0.4">
+         <artifact name="jopt-simple-5.0.4.jar">
+            <sha256 value="df26cc58f235f477db07f753ba5a3ab243ebe5789d9f89ecf68dd62ea9a66c28" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jopt-simple-5.0.4.pom">
+            <sha256 value="6a67763b76afcd9c80b95e5c5e24782d18cc1b0e3d9b454ad3f8754c76b76815" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.abego.treelayout" name="org.abego.treelayout.core" version="1.0.3">
+         <artifact name="org.abego.treelayout.core-1.0.3.jar">
+            <sha256 value="fa5e31395c39c2e7d46aca0f81f72060931607b2fa41bd36038eb2cb6fb93326" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.abego.treelayout.core-1.0.3.pom">
+            <sha256 value="a3b2b223794370355e792433af012fc993667c0331be2bacad84dbc09ace4a0c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.antlr" name="ST4" version="4.3.3">
+         <artifact name="ST4-4.3.3.jar">
+            <sha256 value="64503dd855b48edfe0e597494acfb4a481f26a8e254608ad7506d991674f5bce" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ST4-4.3.3.pom">
+            <sha256 value="0f428965c2642d6b3412d83f82b94f85a8fbd32834f0fd9e9534a64597cb82f9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.antlr" name="ST4" version="4.3.4">
+         <artifact name="ST4-4.3.4.jar">
+            <sha256 value="f927ac384c46d749f8b5ec68972a53aed21e00313509299616edb73bfa15ff33" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ST4-4.3.4.pom">
+            <sha256 value="9e7c1f3e489919440e8c13089e5963729d5b7f80f70233bfbae309c649abca3e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.antlr" name="antlr-master" version="3.5.3">
+         <artifact name="antlr-master-3.5.3.pom">
+            <sha256 value="ea9e37250f5c4c2e76b6538be97b57f3349bda585edf53f3ca97e207b385b895" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.antlr" name="antlr-runtime" version="3.5.3">
+         <artifact name="antlr-runtime-3.5.3.jar">
+            <sha256 value="68bf9f5a33dfcb34033495c587e6236bef4e37aa6612919f5b1e843b90669fb9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="antlr-runtime-3.5.3.pom">
+            <sha256 value="13298e0e0aafaf414ff7d4406427cab6ec4fbfa36427f6d7103c432f32c07d25" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.antlr" name="antlr4" version="4.10.1">
+         <artifact name="antlr4-4.10.1.jar">
+            <sha256 value="6bef3dad65a1bd55533981d7ef694d27dcfb4e7a70f560dd026c8895b35a7468" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="antlr4-4.10.1.pom">
+            <sha256 value="28489b75abbbfe413acbaf77b2564ef1ffd7b949fb06af0530fcd02b204319e3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.antlr" name="antlr4" version="4.11.0">
+         <artifact name="antlr4-4.11.0.jar">
+            <sha256 value="33ec099fa7ff8dd617a40e81522b39ac92c95aed4b0a4dbcbc8782903150f844" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="antlr4-4.11.0.pom">
+            <sha256 value="dc6ac6baeadd576ef8f8b0c8ae9cd5b83982d7488be76a57d9edaa151ed9de6d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.antlr" name="antlr4-master" version="4.10.1">
+         <artifact name="antlr4-master-4.10.1.pom">
+            <sha256 value="77ed2165c379d27e18a03929e1adfb414d5d52ef042984901a5e7232073f50d3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.antlr" name="antlr4-master" version="4.11.0">
+         <artifact name="antlr4-master-4.11.0.pom">
+            <sha256 value="f081f97a88602f59f0f820a62332807e2ad01c1cf4fe82678669635b4cfc969e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.antlr" name="antlr4-runtime" version="4.10.1">
+         <artifact name="antlr4-runtime-4.10.1.jar">
+            <sha256 value="da66be0c98acfb29bc708300d05f1a3269c40f9984a4cb9251cf2ba1898d1334" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="antlr4-runtime-4.10.1.pom">
+            <sha256 value="29ce054c9d2f0c5c80602ac38d110890949c80097de847bf42f57085837118a7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.antlr" name="antlr4-runtime" version="4.11.0">
+         <artifact name="antlr4-runtime-4.11.0.jar">
+            <sha256 value="ac29f09f9ad3b5fa8427659a291729888d52af256f659903ab5c5955e0099e77" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="antlr4-runtime-4.11.0.pom">
+            <sha256 value="5c834b3641429ee0f9bfab04ce918db5ab0ec9eb2407baeb3c08b42b670dbaad" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="10">
+         <artifact name="apache-10.pom">
+            <sha256 value="802feece72852dafcbd0a425a60367c72c5cb9b6ea5aae59481128569189daf9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="13">
+         <artifact name="apache-13.pom">
+            <sha256 value="ff513db0361fd41237bef4784968bc15aae478d4ec0a9496f811072ccaf3841d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="19">
+         <artifact name="apache-19.pom">
+            <sha256 value="91f7a33096ea69bac2cbaf6d01feb934cac002c48d8c8cfa9c240b40f1ec21df" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="21">
+         <artifact name="apache-21.pom">
+            <sha256 value="af10c108da014f17cafac7b52b2b4b5a3a1c18265fa2af97a325d9143537b380" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="23">
+         <artifact name="apache-23.pom">
+            <sha256 value="bc10624e0623f36577fac5639ca2936d3240ed152fb6d8d533ab4d270543491c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="27">
+         <artifact name="apache-27.pom">
+            <sha256 value="b2b0fc69e22a650c3892f1c366d77076f29575c6738df4c7a70a44844484cdf9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="29">
+         <artifact name="apache-29.pom">
+            <sha256 value="3e49037174820bbd0df63420a977255886398954c2a06291fa61f727ac35b377" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="4">
+         <artifact name="apache-4.pom">
+            <sha256 value="9e9323a26ba8eb2394efef0c96d31b70df570808630dc147cab1e73541cc5194" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="7">
+         <artifact name="apache-7.pom">
+            <sha256 value="1397ce1db433adc9f223dbf07496d133681448751f4ae29e58f68e78fb4b6c25" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache" name="apache" version="9">
+         <artifact name="apache-9.pom">
+            <sha256 value="4946e60a547c8eda69f3bc23c5b6f0dadcf8469ea49b1d1da7de34aecfcf18dd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-collections4" version="4.4">
+         <artifact name="commons-collections4-4.4.jar">
+            <sha256 value="1df8b9430b5c8ed143d7815e403e33ef5371b2400aadbe9bda0883762e0846d1" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="commons-collections4-4.4.pom">
+            <sha256 value="271bd673839af46e73aff957e2918d4bf96f5ac4f6c6cf4d5be93fd1f1271c4d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-compress" version="1.21">
+         <artifact name="commons-compress-1.21.jar">
+            <sha256 value="6aecfd5459728a595601cfa07258d131972ffc39b492eb48bdd596577a2f244a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="commons-compress-1.21.pom">
+            <sha256 value="675bb023c9beedde3232949979b9742a5fea946280a55a1b462d4ca7801088cd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-compress" version="1.23.0">
+         <artifact name="commons-compress-1.23.0.jar">
+            <sha256 value="c267f17160e9ef662b4d78b7f29dca7c82b15c5cff2cb6a9865ef4ab3dd5b787" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="commons-compress-1.23.0.pom">
+            <sha256 value="59dc121406ba9e8b5b512bcef4571351fed1f902b939cf527d893b7f729454c9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-lang3" version="3.0">
+         <artifact name="commons-lang3-3.0.jar">
+            <sha256 value="980ef14cb0468c7080f88a72fab73f9c89c029217f3c8c535b0672570e32cc08" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="commons-lang3-3.0.pom">
+            <sha256 value="5c8a4dd5b436d003908cdfa81a8057f890304f9dde890e6292ab6ef9dc98b0bf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-lang3" version="3.12.0">
+         <artifact name="commons-lang3-3.12.0.jar">
+            <sha256 value="d919d904486c037f8d193412da0c92e22a9fa24230b9d67a57855c5c31c7e94e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="commons-lang3-3.12.0.pom">
+            <sha256 value="82d31f1dcc4583effd744e979165b16da64bf86bca623fc5d1b03ed94f45c85a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-lang3" version="3.8.1">
+         <artifact name="commons-lang3-3.8.1.pom">
+            <sha256 value="ec8e09f75411685205bd0d9d7872cc3622e67c76df44a0a227b278bea04458d5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-math3" version="3.2">
+         <artifact name="commons-math3-3.2.jar">
+            <sha256 value="6268a9a0ea3e769fc493a21446664c0ef668e48c93d126791f6f3f757978fee2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="commons-math3-3.2.pom">
+            <sha256 value="2cd0db7bce370c1404025cc013c11f8fd49f3f3c340a6d2dcf99d363d7948a69" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="21">
+         <artifact name="commons-parent-21.pom">
+            <sha256 value="24385e1e2ea85b0646bc8e483eb68773a0c48049b6f0684c9f091d7af68ef1e9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="28">
+         <artifact name="commons-parent-28.pom">
+            <sha256 value="14733a68e8b120b69de60cd96d222146dcf32f03c1c6cc6a750b1269bafe86c7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="33">
+         <artifact name="commons-parent-33.pom">
+            <sha256 value="53d0011352e2e5106f379dafccdac7754ec6f0f78243c0305e4969f5acddf8fb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="34">
+         <artifact name="commons-parent-34.pom">
+            <sha256 value="3a2e69d06d641d1f3b293126dc9e2e4ea6563bf8c36c87e0ab6fa4292d04b79c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="47">
+         <artifact name="commons-parent-47.pom">
+            <sha256 value="8a8ecb570553bf9f1ffae211a8d4ca9ee630c17afe59293368fba7bd9b42fcb7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="48">
+         <artifact name="commons-parent-48.pom">
+            <sha256 value="1e1f7de9370a7b7901f128f1dacd1422be74e3f47f9558b0f79e04c0637ca0b4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="5">
+         <artifact name="commons-parent-5.pom">
+            <sha256 value="8bd632c00bdf80a7de36c22b60f12452c147d8eca2f00d79d66699ebe7daa02a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="52">
+         <artifact name="commons-parent-52.pom">
+            <sha256 value="75dbe8f34e98e4c3ff42daae4a2f9eb4cbcd3b5f1047d54460ace906dbb4502e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="54">
+         <artifact name="commons-parent-54.pom">
+            <sha256 value="000d8187952b223702fde296df799563f35de82ce72adb4e7bf157342378fbe3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-parent" version="56">
+         <artifact name="commons-parent-56.pom">
+            <sha256 value="560c7051ddc768e1372e4087970764e4c013903c5dc6eb52c29877370dae2694" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-pool2" version="2.2">
+         <artifact name="commons-pool2-2.2.jar">
+            <sha256 value="8780b3bbb31a8797e74e9f3022f043ddadc2aee8be63d94f8082a6a16546c41b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="commons-pool2-2.2.pom">
+            <sha256 value="48f965e8242dbf01786d0a92d0ad63e20a201d4a536e0321d03b10d2e0c98153" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.commons" name="commons-text" version="1.10.0">
+         <artifact name="commons-text-1.10.0.jar">
+            <sha256 value="770cd903fa7b604d1f7ef7ba17f84108667294b2b478be8ed1af3bffb4ae0018" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="commons-text-1.10.0.pom">
+            <sha256 value="388dd52348ba1842aa38aeb897c91d270b14661eb875a20fd98031535ab27567" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.httpcomponents" name="httpclient" version="4.5.13">
+         <artifact name="httpclient-4.5.13.jar">
+            <sha256 value="6fe9026a566c6a5001608cf3fc32196641f6c1e5e1986d1037ccdbd5f31ef743" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="httpclient-4.5.13.pom">
+            <sha256 value="78eb9ada74929fcd63d07adc4f49236841a45cc29d5f817bf45801f513fd7e6c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.httpcomponents" name="httpcomponents-client" version="4.5.13">
+         <artifact name="httpcomponents-client-4.5.13.pom">
+            <sha256 value="9cba594c08db7271d0c20e9845d622bb39e69583910b45e7d5df82f6058d4dd9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.httpcomponents" name="httpcomponents-core" version="4.4.13">
+         <artifact name="httpcomponents-core-4.4.13.pom">
+            <sha256 value="c554e7008e4517c7ef54e005cc8b74f4c87a54a0ea2c6f57be5d0569df51936b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.httpcomponents" name="httpcomponents-core" version="4.4.15">
+         <artifact name="httpcomponents-core-4.4.15.pom">
+            <sha256 value="60d43727a6174804c8ae17f93e9cc632e47f3c4110a4c54b9fafc8cd9a8ca509" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.httpcomponents" name="httpcomponents-core" version="4.4.5">
+         <artifact name="httpcomponents-core-4.4.5.pom">
+            <sha256 value="18d9243541c80848d5378bad89fccc5e1bf5c0465b2481d948b0c06851091cdc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.httpcomponents" name="httpcomponents-parent" version="11">
+         <artifact name="httpcomponents-parent-11.pom">
+            <sha256 value="a901f87b115c55070c7ee43efff63e20e7b02d30af2443ae292bf1f4e532d3aa" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.httpcomponents" name="httpcomponents-parent" version="12">
+         <artifact name="httpcomponents-parent-12.pom">
+            <sha256 value="4209f09593212987c29d6801917309dd5e6f71b53b2b1d0e0f0efb984ad11fa1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.httpcomponents" name="httpcore" version="4.4.13">
+         <artifact name="httpcore-4.4.13.jar">
+            <sha256 value="e06e89d40943245fcfa39ec537cdbfce3762aecde8f9c597780d2b00c2b43424" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="httpcore-4.4.13.pom">
+            <sha256 value="8f812d9fa7b72a3d4aa7f825278932a5df344b42a6d8398905879431a1bf9a97" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.httpcomponents" name="httpcore" version="4.4.15">
+         <artifact name="httpcore-4.4.15.jar">
+            <sha256 value="3cbaed088c499a10f96dde58f39dc0e7985171abd88138ca1655a872011bb142" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="httpcore-4.4.15.pom">
+            <sha256 value="29acfeaa8a88bb620fc34371a30b3d40328dc5a79cc74902cf446c0943c1be6b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.httpcomponents" name="httpcore" version="4.4.5">
+         <artifact name="httpcore-4.4.5.pom">
+            <sha256 value="147fa18df753534e50054d018a360f789902af1e5c24322a3f0b200d0684fed2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.httpcomponents" name="project" version="7">
+         <artifact name="project-7.pom">
+            <sha256 value="3d6eba428555a558de046b5d76eacc1f5a54b4f5f20b84d636ed7aff18aa48c3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.httpcomponents.client5" name="httpclient5" version="5.1.3">
+         <artifact name="httpclient5-5.1.3.jar">
+            <sha256 value="28c759254f4e35319e078bb6ffea75676608dc12cb243b24fb3c8732522977fe" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="httpclient5-5.1.3.pom">
+            <sha256 value="1988ab3d1bdae0f51f22c83dc97b88fa07561adb6244679d8b8f7146cdd13aaf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.httpcomponents.client5" name="httpclient5-parent" version="5.1.3">
+         <artifact name="httpclient5-parent-5.1.3.pom">
+            <sha256 value="a27b1413aece92a3aa4774915f7589e0c6179d728d2ac6a295d758ee4fa24cc5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.httpcomponents.core5" name="httpcore5" version="5.1.3">
+         <artifact name="httpcore5-5.1.3.jar">
+            <sha256 value="f2bf2f2c7772169c9e30699719667ad30f9b46c4e9d7841907deb2d12d9923fe" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="httpcore5-5.1.3.pom">
+            <sha256 value="7fc2b8045809f3f27ac9d4d9e99b9d34621b6371cf93c7313ecd84a5af0e9bae" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.httpcomponents.core5" name="httpcore5-h2" version="5.1.3">
+         <artifact name="httpcore5-h2-5.1.3.jar">
+            <sha256 value="d0e78ba15aa8ebe77982b660ac4b09a95d6e035dbdbea762577dc1c8e2935807" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="httpcore5-h2-5.1.3.pom">
+            <sha256 value="2bc0317a148edc9aefea3ec1535394efced3d137d62f7ff5656d0b03f94c0786" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.httpcomponents.core5" name="httpcore5-parent" version="5.1.3">
+         <artifact name="httpcore5-parent-5.1.3.pom">
+            <sha256 value="a67538865ae0f3744b21e91ca47d461054737c552d1ff29da714c860c992d5bb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.ivy" name="ivy" version="2.2.0">
+         <artifact name="ivy-2.2.0.jar">
+            <sha256 value="9d0a56026680999986ca33d53d12d6f28f7bff5e3c9e6e0c6633a3677ca00f18" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ivy-2.2.0.pom">
+            <sha256 value="834a2ff931728e423e261909b3d5249ea4c92781fbbae82146a80f144e907041" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.logging" name="logging-parent" version="7">
+         <artifact name="logging-parent-7.pom">
+            <sha256 value="e58911dc9fc6b173a10e5aa9edb93c7994ad06602705dd067edcfc6e1e9e172b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.logging.log4j" name="log4j" version="2.20.0">
+         <artifact name="log4j-2.20.0.pom">
+            <sha256 value="9a37b4a8f67e8d41bc2473717a3021633d6a3c3f310579db9ad0be3f24659c69" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.logging.log4j" name="log4j-api" version="2.20.0">
+         <artifact name="log4j-api-2.20.0.jar">
+            <sha256 value="2f43eea679ea66f14ca0f13fec2a8600ac124f5a5231dcb4df8393eddcb97550" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="log4j-api-2.20.0.pom">
+            <sha256 value="cd45832a3d6cd2194435c0d63ca015f194968f2fbea4f291553bf7afb84e1637" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.logging.log4j" name="log4j-bom" version="2.20.0">
+         <artifact name="log4j-bom-2.20.0.pom">
+            <sha256 value="f8bb692e95a6b7bda601e87100958e83d0061b7f123250b68128943a195e9da1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.logging.log4j" name="log4j-core" version="2.20.0">
+         <artifact name="log4j-core-2.20.0.jar">
+            <sha256 value="6137df848cdaed9f4d5076f75513c6c85da80b953f4e7acca38098b770763f55" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="log4j-core-2.20.0.pom">
+            <sha256 value="de71ac100551f4a077aecad077bd153e71df7aa69c3042d76516cc5cce0871ee" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.logging.log4j" name="log4j-jul" version="2.20.0">
+         <artifact name="log4j-jul-2.20.0.jar">
+            <sha256 value="c9b33dffb40bd00d4889ea4700f79d87a2e4d9f92911a3a008ae18c0bb3fb167" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="log4j-jul-2.20.0.pom">
+            <sha256 value="d6665964717795bbba970a4db0923a5ccada5b71d4355443a46bdbcb98216e64" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.logging.log4j" name="log4j-slf4j2-impl" version="2.20.0">
+         <artifact name="log4j-slf4j2-impl-2.20.0.jar">
+            <sha256 value="b8dd3e4ea9cffa18db5f301cd8c539158662e691efd4701aa87b4d09961bd8b0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="log4j-slf4j2-impl-2.20.0.pom">
+            <sha256 value="b70c7601ec6d248ca508ea233728c862a062da583476821674072fabb38b914e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.maven" name="maven" version="3.0.4">
+         <artifact name="maven-3.0.4.pom">
+            <sha256 value="4d223e01a6569d6655c1f4fce84969d45142cdbabdb118ea08c5c8c33ec632f6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.maven" name="maven-parent" version="21">
+         <artifact name="maven-parent-21.pom">
+            <sha256 value="fc45af8911ea307d1b57564eef1f78b69801e9c11a5619e7eb58d5d00ae9db8e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.maven" name="maven-settings" version="3.0.4">
+         <artifact name="maven-settings-3.0.4.jar">
+            <sha256 value="3e3df17f5df5e4ce1e7b7f2011c57d61d328e65678542ade2048f0d0fa295f09" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="maven-settings-3.0.4.pom">
+            <sha256 value="beedffd7c7e49ad35ef945c3413f1819f04e43ea294a31804714c8cbb0f372b3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.maven" name="maven-settings-builder" version="3.0.4">
+         <artifact name="maven-settings-builder-3.0.4.jar">
+            <sha256 value="a38a54ec1e69a30ddfc14434e0aec2764fc268668abcc0e132d86692a5dce3e4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="maven-settings-builder-3.0.4.pom">
+            <sha256 value="3e0b3f60267b6070a741b15db5b40fbd824c61db12a1f4f166ed658b9f62ece0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.tuweni" name="tuweni-bytes" version="2.3.1">
+         <artifact name="tuweni-bytes-2.3.1.jar">
+            <sha256 value="2249d635c819cd620a10d5991ef409f95fa5d8c83200658fc7d52699ebea4984" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-bytes-2.3.1.pom">
+            <sha256 value="e2975b0fbc9c65a5a6c92231e28504ea9cdafffe28c2b7390e9beffca34e92d4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.tuweni" name="tuweni-concurrent" version="2.3.1">
+         <artifact name="tuweni-concurrent-2.3.1.jar">
+            <sha256 value="52353a750d57c01278b729f991d10066cf05dfd2e888ed05cff6985bf1844800" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-concurrent-2.3.1.pom">
+            <sha256 value="e6752089e0b90ddd5bb84a66056fd555fd56204e71058b9c769165fb715f9e54" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.tuweni" name="tuweni-concurrent-coroutines" version="2.3.1">
+         <artifact name="tuweni-concurrent-coroutines-2.3.1.jar">
+            <sha256 value="d55c9636e904602fd6a6a0b48cc7d9340322cd9b3847161916e0039c37ada539" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-concurrent-coroutines-2.3.1.pom">
+            <sha256 value="21d6155320b73dc224dcd0b4938a1d0b5004231ba0077397d202f1c3d3ec86e3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.tuweni" name="tuweni-config" version="2.3.1">
+         <artifact name="tuweni-config-2.3.1.jar">
+            <sha256 value="caa7b817d23a34fae7969871f6c7849bdce551f3bc50553214f73bacf0754c9c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-config-2.3.1.pom">
+            <sha256 value="c2fbdf1b04520659806df0abc75aa17f00e678b2d445c6e5180cd4a4f0107c93" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.tuweni" name="tuweni-crypto" version="2.3.1">
+         <artifact name="tuweni-crypto-2.3.1.jar">
+            <sha256 value="f87561527c3b20f4714f5d5a9ba12b3e8e20261ab9cf26e6205b841063e3668b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-crypto-2.3.1.pom">
+            <sha256 value="7fec6eb1502236d20c9345524d2e8af49d78a65721adca5f8058c9a4a105f249" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.tuweni" name="tuweni-devp2p" version="2.3.1">
+         <artifact name="tuweni-devp2p-2.3.1.jar">
+            <sha256 value="11633231550fa927ef9c70712efed4df778ff2714872a72de24adc62a5f19a5d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-devp2p-2.3.1.pom">
+            <sha256 value="d4e400c38d4a4c707ce4f949d96472a8b1d0e4bacca4154f270e8e14c0142b5e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.tuweni" name="tuweni-dns-discovery" version="2.3.1">
+         <artifact name="tuweni-dns-discovery-2.3.1.jar">
+            <sha256 value="ff1d6fe21703e05b824222fcfa7d3656504cb3063973501ee2a2009ee1b6525d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-dns-discovery-2.3.1.pom">
+            <sha256 value="83dd61c27c3597b979daa4e2ec7ad0a1fae68f61d88c202844751007b8ef582a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.tuweni" name="tuweni-io" version="2.3.1">
+         <artifact name="tuweni-io-2.3.1.jar">
+            <sha256 value="08ad1ab991f5679ad0b8e8c8af5c1c27856095111424df08a1a5511b617ab5be" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-io-2.3.1.pom">
+            <sha256 value="fd2c3594e94454be04698f6efc6ace5f1fef95395f64a0266dca8f906c81b79c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.tuweni" name="tuweni-kademlia" version="2.3.1">
+         <artifact name="tuweni-kademlia-2.3.1.jar">
+            <sha256 value="4765ae4747c15ec914db762725c8dbc778a5f526ee9cd2c14bf0a10d2b576f1e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-kademlia-2.3.1.pom">
+            <sha256 value="1add1bbe9376f2f6e16bdd423adcfa1c5a62366a1b9c876a266b69481b93d03a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.tuweni" name="tuweni-kv" version="2.3.1">
+         <artifact name="tuweni-kv-2.3.1.jar">
+            <sha256 value="8ae475283d4b63af5093cc6971b5490ae38aa2eb92d51f55cd7f8128f3c0c23c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-kv-2.3.1.pom">
+            <sha256 value="d2f31090baeb47c229062c961f5f87d2fa5e5af29880d5ee51247eba3ce336ca" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.tuweni" name="tuweni-merkle-trie" version="2.3.1">
+         <artifact name="tuweni-merkle-trie-2.3.1.jar">
+            <sha256 value="82012a4ab1c8319a34a6fbba661d43cc8e40169046bfd39e5a3e1d4aa1afe617" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-merkle-trie-2.3.1.pom">
+            <sha256 value="45fd6492f9e67e0b2bc5671e319d8082e61bce413c4df516294ccb1557b44e3b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.tuweni" name="tuweni-net" version="2.3.1">
+         <artifact name="tuweni-net-2.3.1.jar">
+            <sha256 value="9ed481930df7f2418035a8f54bdadd8b3899a43a9152d0afb93cc070e7356b58" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-net-2.3.1.pom">
+            <sha256 value="a21ff5ba443fb723f71b9618e912522377ac4f97d73c49fb0f7ef3f4cd43e900" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.tuweni" name="tuweni-rlp" version="2.3.1">
+         <artifact name="tuweni-rlp-2.3.1.jar">
+            <sha256 value="062f004dbd7e4281ee21d1c197f4602a9d809b13dd12781468815d3860862b73" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-rlp-2.3.1.pom">
+            <sha256 value="8aac3e380a5bb4c6c0a103bfdef1bb82996110bd99e1040f215bbfe66a58a0e3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.tuweni" name="tuweni-toml" version="2.3.1">
+         <artifact name="tuweni-toml-2.3.1.jar">
+            <sha256 value="f7e1a0d783bb00f2f653890c5f289fa65d7436c821c723ac43d6d1f019be4ec6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-toml-2.3.1.pom">
+            <sha256 value="55f158e98a6ee4e38e7b674aa84bf573b4753262d871b2f27cd8f02f736581c6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apache.tuweni" name="tuweni-units" version="2.3.1">
+         <artifact name="tuweni-units-2.3.1.jar">
+            <sha256 value="59703a35883555ec944149aca53c81c26b2b9200520ffde059d57326d2ec7ca4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuweni-units-2.3.1.pom">
+            <sha256 value="51b353af00ee41095bacae9719c39e7c5e5b37ab5c4e405eebfe8c7056db7077" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apiguardian" name="apiguardian-api" version="1.1.0">
+         <artifact name="apiguardian-api-1.1.0.jar">
+            <sha256 value="a9aae9ff8ae3e17a2a18f79175e82b16267c246fbbd3ca9dfbbb290b08dcfdd4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="apiguardian-api-1.1.0.pom">
+            <sha256 value="a945b9cb5cd9b77b2c711844e659c43ec070ef59d9f509fa9f4c1861b4862711" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.apiguardian" name="apiguardian-api" version="1.1.2">
+         <artifact name="apiguardian-api-1.1.2.jar">
+            <sha256 value="b509448ac506d607319f182537f0b35d71007582ec741832a1f111e5b5b70b38" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="apiguardian-api-1.1.2.module">
+            <sha256 value="e08028131375b357d1d28734e9a4fb4216da84b240641cb3ef7e7c7d628223fc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.assertj" name="assertj-build" version="3.24.2">
+         <artifact name="assertj-build-3.24.2.pom">
+            <sha256 value="d7fc8c4aa800583b26c467eb0faede0af5e7ca790c4be4d4d235431583d26ead" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.assertj" name="assertj-core" version="3.24.2">
+         <artifact name="assertj-core-3.24.2.jar">
+            <sha256 value="df3d0b348f1fe806bdddcb10fa4ae63c6679e9888d4bc7055f09848517976aa3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="assertj-core-3.24.2.pom">
+            <sha256 value="7fb9b1a2374eb50ed2b9b59845c69273111ea1839a4298f9400a80e2b2c5c80e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.assertj" name="assertj-parent" version="3.24.2">
+         <artifact name="assertj-parent-3.24.2.pom">
+            <sha256 value="0c50044eb5bde9e84423bca13aff5d5f43d3752ab3c63f73bdae69fc4ab1a0ac" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.awaitility" name="awaitility" version="4.2.0">
+         <artifact name="awaitility-4.2.0.jar">
+            <sha256 value="2d23b79211fdd19036f6940cc783543779320aaf86f38d6e385a2ff26da41272" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="awaitility-4.2.0.pom">
+            <sha256 value="3bd38c68fcb694f6fee29bb5042c96bf6d3d46a37d132294f87c62bd6b38213a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.awaitility" name="awaitility-parent" version="4.2.0">
+         <artifact name="awaitility-parent-4.2.0.pom">
+            <sha256 value="2dab1720fa45e23da08f7a8a3b1c3c4dba36a0cff130900b88e658971275cb45" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.bitbucket.b_c" name="jose4j" version="0.9.3">
+         <artifact name="jose4j-0.9.3.jar">
+            <sha256 value="6265ad3e28a8b02ac3a9f98b9efced79671df8e0a556e9851ad65ffbea51a12a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jose4j-0.9.3.pom">
+            <sha256 value="b579ab836863ad48e578bae9961e1b004bd140afc43e7c3335646b7fb3daf9da" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.bouncycastle" name="bcpkix-jdk15on" version="1.70">
+         <artifact name="bcpkix-jdk15on-1.70.jar">
+            <sha256 value="e5b9cb821df57f70b0593358e89c0e8d7266515da9d088af6c646f63d433c07c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="bcpkix-jdk15on-1.70.pom">
+            <sha256 value="6ea5502b7eebec7018271bb8a82cb819bf4c1f2b6543549c5cfd84d6a13996bf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.bouncycastle" name="bcpkix-jdk18on" version="1.72">
+         <artifact name="bcpkix-jdk18on-1.72.jar">
+            <sha256 value="56a054cb170d41fb1f8ba0b29568806258b7ffefdc5e98b77ef96d4740f3d6bc" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="bcpkix-jdk18on-1.72.pom">
+            <sha256 value="285b8be595870f61d75e7881b0fb4edc2d1aa37d0a79c4fc8ff2dccf1d9c69fd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.bouncycastle" name="bcprov-jdk15on" version="1.68">
+         <artifact name="bcprov-jdk15on-1.68.jar">
+            <sha256 value="f732a46c8de7e2232f2007c682a21d1f4cc8a8a0149b6b7bd6aa1afdc65a0f8d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="bcprov-jdk15on-1.68.pom">
+            <sha256 value="d907decd685f9cd971e71bdf6ce597cf3a95b7c8ff6a3482351bfd8abc17cfe0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.bouncycastle" name="bcprov-jdk15on" version="1.70">
+         <artifact name="bcprov-jdk15on-1.70.jar">
+            <sha256 value="8f3c20e3e2d565d26f33e8d4857a37d0d7f8ac39b62a7026496fcab1bdac30d4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="bcprov-jdk15on-1.70.pom">
+            <sha256 value="6df4b5b76d9062017664ad0ca285e57154ae803607cb89c970b39cc0e016abb0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.bouncycastle" name="bcprov-jdk18on" version="1.72">
+         <artifact name="bcprov-jdk18on-1.72.jar">
+            <sha256 value="39287f2208a753db419f5ca529d6c80f094614aa74d790331126b3c9c6b85fda" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="bcprov-jdk18on-1.72.pom">
+            <sha256 value="e3bb6d9e1346cfc230e0900f177e60a12b6dbe212a92e1cd2cfb1e48d4c04839" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.bouncycastle" name="bcutil-jdk15on" version="1.70">
+         <artifact name="bcutil-jdk15on-1.70.jar">
+            <sha256 value="52dc5551b0257666526c5095424567fed7dc7b00d2b1ba7bd52298411112b1d0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="bcutil-jdk15on-1.70.pom">
+            <sha256 value="9ebae71c25e0c9f2cd756003c01f1ad0fc398ca06fbcda0d175e71cac5840aad" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.bouncycastle" name="bcutil-jdk18on" version="1.72">
+         <artifact name="bcutil-jdk18on-1.72.jar">
+            <sha256 value="45377fdb6560a971eea725f507d91fd6b8fbd0797d61bfc86f2cb653c58186a4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="bcutil-jdk18on-1.72.pom">
+            <sha256 value="570104ccac0dfa29e46fb6402f7e6a721702c255def43be301c6acb18c25e76d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.checkerframework" name="checker-compat-qual" version="2.5.5">
+         <artifact name="checker-compat-qual-2.5.5.jar">
+            <sha256 value="11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="checker-compat-qual-2.5.5.pom">
+            <sha256 value="42f21ebd9183be049ee5afc822b345403a5da764037875734a039b0d6e0353be" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.checkerframework" name="checker-qual" version="3.12.0">
+         <artifact name="checker-qual-3.12.0.jar">
+            <sha256 value="ff10785ac2a357ec5de9c293cb982a2cbb605c0309ea4cc1cb9b9bc6dbe7f3cb" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="checker-qual-3.12.0.module">
+            <sha256 value="d047949c1b81091c2c3913771fac2f32a2fa549ba3d5d548cc8c0b6dfa493777" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="checker-qual-3.12.0.pom">
+            <sha256 value="775b7ae36e62820b3b86dc1aa39af37c0ac4b85ff48f7fe485a922a2790f46b9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.checkerframework" name="checker-qual" version="3.13.0">
+         <artifact name="checker-qual-3.13.0.module">
+            <sha256 value="19c5c98bf51711bcdbbd6f34d58fe552bfc60f5ca7888baa74eca1b1f7c4c6dc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.checkerframework" name="checker-qual" version="3.32.0">
+         <artifact name="checker-qual-3.32.0.jar">
+            <sha256 value="b66e025da0a6bf85f0b7f5fdadca832a32771f85a12cac1401a3c0cd8fd73ccd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="checker-qual-3.32.0.module">
+            <sha256 value="ccdecdaa1aaeeb783951f6a7c18dc19395c2e2a5e7f77450d707b8d62e87de4f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="checker-qual-3.32.0.pom">
+            <sha256 value="795a88652a6edefa1c30fdbab280129e4183b1acf994ac74be43f3eb8aa77dcf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.checkerframework" name="checker-qual" version="3.5.0">
+         <artifact name="checker-qual-3.5.0.jar">
+            <sha256 value="729990b3f18a95606fc2573836b6958bcdb44cb52bfbd1b7aa9c339cff35a5a4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="checker-qual-3.5.0.pom">
+            <sha256 value="2836b3b8a78edb31a1803592e60fc767b21f2d190764631ba6efa0837bb35721" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.checkerframework" name="dataflow-errorprone" version="3.27.0">
+         <artifact name="dataflow-errorprone-3.27.0.jar">
+            <sha256 value="fd40ebe6d514e56f8d8fac1b1a2afb1654b2053b571ddce1098b910f0bb395bd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="dataflow-errorprone-3.27.0.pom">
+            <sha256 value="a7dcf5c48370d0157b5272744d8cb7b0e13198b87b9c9210f31b980f178d9505" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.codehaus.groovy" name="groovy" version="3.0.10">
+         <artifact name="groovy-3.0.10.jar">
+            <sha256 value="dffefada8294865be5035515c0320fb679443d285f4a5f8adadcf00c1130e84c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="groovy-3.0.10.pom">
+            <sha256 value="4982adf4a6c6c50567b0be3cf494825e6c2a27d8b3871d9e18822a74272b79aa" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.codehaus.groovy" name="groovy-bom" version="3.0.14">
+         <artifact name="groovy-bom-3.0.14.pom">
+            <sha256 value="24e0e9b738de7118de9e73560ffd06034bb5cf07ca13a7e03459e88ba9d1ae27" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.codehaus.groovy" name="groovy-xml" version="3.0.10">
+         <artifact name="groovy-xml-3.0.10.jar">
+            <sha256 value="bc2ad5113596a3a9bb650da6471f1b891505421782174a7fe60d790edb629e85" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="groovy-xml-3.0.10.pom">
+            <sha256 value="6707f93b58cee01c4173fbae84d2e1d830ca41cd342d90606cd5b718a9ff7d29" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.codehaus.mojo" name="animal-sniffer-annotations" version="1.21">
+         <artifact name="animal-sniffer-annotations-1.21.jar">
+            <sha256 value="2f25841c937e24959a57b630e2c4b8525b3d0f536f2e511c9b2bed30b1651d54" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="animal-sniffer-annotations-1.21.pom">
+            <sha256 value="cdeadc0096afb308ed6846a33b83afa6ebf2be1bab0e667217635fe71f0324af" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.codehaus.mojo" name="animal-sniffer-parent" version="1.21">
+         <artifact name="animal-sniffer-parent-1.21.pom">
+            <sha256 value="426357a74b8ebaa1889222d81507430b1816ca3ae3f5cab7e1845010e80c51fc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.codehaus.mojo" name="mojo-parent" version="65">
+         <artifact name="mojo-parent-65.pom">
+            <sha256 value="c89fb440a597b83eecca108ac598519493688eb033e8542e51a2b0428da8a676" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.codehaus.plexus" name="plexus" version="2.0.6">
+         <artifact name="plexus-2.0.6.pom">
+            <sha256 value="bea12e747708d25e73410ca1c731ebdfa102e8bdb6ec7d81bd4522583b234bcc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.codehaus.plexus" name="plexus" version="2.0.7">
+         <artifact name="plexus-2.0.7.pom">
+            <sha256 value="2b59062030ab0a15c5d0977ba22421706368926488739a65f25793e715cc8a74" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.codehaus.plexus" name="plexus-component-annotations" version="1.5.5">
+         <artifact name="plexus-component-annotations-1.5.5.jar">
+            <sha256 value="4df7a6a7be64b35bbccf60b5c115697f9ea3421d22674ae67135dde375fcca1f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="plexus-component-annotations-1.5.5.pom">
+            <sha256 value="815f3ec316b8c5fa701385fdf4009bfb51e07d780e8f6a6e2afe720c52d7e292" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.codehaus.plexus" name="plexus-components" version="1.1.18">
+         <artifact name="plexus-components-1.1.18.pom">
+            <sha256 value="ef5dbc7fa918b6dbba71d27e5b3d7a00df624bcfa2549a7297f36fe275f634d7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.codehaus.plexus" name="plexus-containers" version="1.5.5">
+         <artifact name="plexus-containers-1.5.5.pom">
+            <sha256 value="1bc264824ec876b0ca6f4f5838175c541c638cbc43326a268b9aee7d4778b5ef" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.codehaus.plexus" name="plexus-interpolation" version="1.14">
+         <artifact name="plexus-interpolation-1.14.jar">
+            <sha256 value="7fc63378d3e84663619b9bedace9f9fe78b276c2be3c62ca2245449294c84176" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="plexus-interpolation-1.14.pom">
+            <sha256 value="d08155c497df37b2c3d9b5b0dfdb02ec0525b2070b5be3739fffde942fcac9af" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.codehaus.plexus" name="plexus-utils" version="2.0.5">
+         <artifact name="plexus-utils-2.0.5.pom">
+            <sha256 value="35bc7d1213616236571072b2c56da18f7a57658de8b4a4100645b7054a2b273b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.codehaus.plexus" name="plexus-utils" version="2.0.6">
+         <artifact name="plexus-utils-2.0.6.jar">
+            <sha256 value="8b909f4ca9788647942f883d4e559bcc642123f7c6bcd3846983a2e465469c33" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="plexus-utils-2.0.6.pom">
+            <sha256 value="fddad4fa62c82310aec43525e519cd59f27d04c7569fe21b1b03ca210887810c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.connid" name="connid" version="1.3.2">
+         <artifact name="connid-1.3.2.pom">
+            <sha256 value="a9d00ba9710f73ca156f8897f27607e639f34f2bb7f7a220068667e20f502bc5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.connid" name="framework" version="1.3.2">
+         <artifact name="framework-1.3.2.jar">
+            <sha256 value="ce95f065078c1b2920ed8718a02520b8c15b90f9a7df7439b375c08de4bb7945" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="framework-1.3.2.pom">
+            <sha256 value="7af1d8f42df3cc0bade80afad1a20169a768a6aed8779054c0f6b5eb7c4e5b79" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.connid" name="framework-internal" version="1.3.2">
+         <artifact name="framework-internal-1.3.2.jar">
+            <sha256 value="81c2aa60dc06c8f9c4e36a07c9c1b11bc93c90364118b6e5162487c34d2690f6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="framework-internal-1.3.2.pom">
+            <sha256 value="da5e9de6bb7737d4b1693ade58708a7984aa3808f957febcf4e77339f2998057" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.conscrypt" name="conscrypt-openjdk-uber" version="2.5.2">
+         <artifact name="conscrypt-openjdk-uber-2.5.2.jar">
+            <sha256 value="eaf537d98e033d0f0451cd1b8cc74e02d7b55ec882da63c88060d806ba89c348" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="conscrypt-openjdk-uber-2.5.2.pom">
+            <sha256 value="b5fd548732f932545d777890eb995222bfe866232351be908137e39c3c672d8b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.ee4j" name="project" version="1.0.6">
+         <artifact name="project-1.0.6.pom">
+            <sha256 value="4e7d8329d8da7dcf30779d824241be145f27108932f5a5a24eb907677bc8d72d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-alpn-client" version="9.4.49.v20220914">
+         <artifact name="jetty-alpn-client-9.4.49.v20220914.jar">
+            <sha256 value="91801d8b3745f1787620bc63df8b35b9afc5fe911df0cf969330311cce009905" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jetty-alpn-client-9.4.49.v20220914.pom">
+            <sha256 value="0c4e3e80205c36c86920e899e095dacebb330d112231a5abe649783226a9d4a3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-alpn-java-client" version="9.4.49.v20220914">
+         <artifact name="jetty-alpn-java-client-9.4.49.v20220914.jar">
+            <sha256 value="72199d65fb91a11514257c33d6e783c3271a35421d5c874e627eb8795a39b9dd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jetty-alpn-java-client-9.4.49.v20220914.pom">
+            <sha256 value="efa744a4d0f01d6dfbf8236f08dd7ac1130394ff5e41bcbef2b99ec6c9b731df" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-alpn-java-server" version="9.4.49.v20220914">
+         <artifact name="jetty-alpn-java-server-9.4.49.v20220914.jar">
+            <sha256 value="37a744d2a26b24dafdc7d36771d067a3da0fb704b063050efac8c737c24305b5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jetty-alpn-java-server-9.4.49.v20220914.pom">
+            <sha256 value="0577682dbf18a9912aeb55fd3fac1dd64d6007ba8d42fa2b469c1ba8dbf78acc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-alpn-openjdk8-client" version="9.4.49.v20220914">
+         <artifact name="jetty-alpn-openjdk8-client-9.4.49.v20220914.jar">
+            <sha256 value="c8093869381849c67d8306a92342d9b04c310204a5d5ef8dbebb4f1876ad25ad" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jetty-alpn-openjdk8-client-9.4.49.v20220914.pom">
+            <sha256 value="09fbca23b76a6ac9898a7535be0f8070e0ef6dac2de993ea6f5548eb582791bf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-alpn-openjdk8-server" version="9.4.49.v20220914">
+         <artifact name="jetty-alpn-openjdk8-server-9.4.49.v20220914.jar">
+            <sha256 value="a29ce5aae13f1aab74e53ad3d5b2783ce8bbb210b3dace433dddd9f27be98be2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jetty-alpn-openjdk8-server-9.4.49.v20220914.pom">
+            <sha256 value="fd85139129eb9c661bf141587773a90de7ff69bea04197becc9bd64183a744ba" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-alpn-parent" version="9.4.49.v20220914">
+         <artifact name="jetty-alpn-parent-9.4.49.v20220914.pom">
+            <sha256 value="a4f943ba3a4c3ab225f6a21cedbfb9da46cf092b4793f872d23e523998c46c94" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-alpn-server" version="9.4.49.v20220914">
+         <artifact name="jetty-alpn-server-9.4.49.v20220914.jar">
+            <sha256 value="30d030db6a35a1878fbd82e61e50fe7543af5bda73a88b579b39088c3e0ac246" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jetty-alpn-server-9.4.49.v20220914.pom">
+            <sha256 value="ce9559c7970799900eb77ce63a77a83b3438e307216cdca4e3034e3860e777f5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-bom" version="9.4.49.v20220914">
+         <artifact name="jetty-bom-9.4.49.v20220914.pom">
+            <sha256 value="cf74a8d21de13eb446cdf75c86990152f96009eea26ed06041ec451e6d32418b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-bom" version="9.4.50.v20221201">
+         <artifact name="jetty-bom-9.4.50.v20221201.pom">
+            <sha256 value="4cde6e533d601eaf8b65acee956b7706c18192f2755d023d7e8d19bb7d5b3943" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-client" version="9.4.49.v20220914">
+         <artifact name="jetty-client-9.4.49.v20220914.jar">
+            <sha256 value="94c613c1c9cb0177aefee6f0a50785e788294a3c2a11c544717542de465b97f5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jetty-client-9.4.49.v20220914.pom">
+            <sha256 value="8979487b9697a3c784ccc2d943bd234d3cda6f068c47183a9ea83d58558e7031" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-continuation" version="9.4.49.v20220914">
+         <artifact name="jetty-continuation-9.4.49.v20220914.jar">
+            <sha256 value="d13b4df40102ffab8bc52834061e53ffed4e2678fa8cf30ed82153ebdda7b1e4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jetty-continuation-9.4.49.v20220914.pom">
+            <sha256 value="234ed5cd8f5f7150e39d1fd8221678a87d4aa41bd1a12d42499eac0b1a566256" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-http" version="9.4.49.v20220914">
+         <artifact name="jetty-http-9.4.49.v20220914.jar">
+            <sha256 value="c39bfec2941a45396bd67da1aea53ea587c97ca31fdcee0d8ea4351b9f043704" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jetty-http-9.4.49.v20220914.pom">
+            <sha256 value="0f4929afeabcfbc87a8879eb8a2f1fd164a2cba17221d802bcd7589cf2eee429" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-io" version="9.4.49.v20220914">
+         <artifact name="jetty-io-9.4.49.v20220914.jar">
+            <sha256 value="9ee7fcec407cb4b16b252596d9b9a23b4ee9cd4cf65921ae95872684af083bb3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jetty-io-9.4.49.v20220914.pom">
+            <sha256 value="f80ea7c7c4fef6c5cd9797bada6221f83ce37d83f4e97c47383eb1789667471c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-project" version="9.4.49.v20220914">
+         <artifact name="jetty-project-9.4.49.v20220914.pom">
+            <sha256 value="1826850557018c25bafc37c774ba1f38032c9683eea83c42a7da4d9656514fe3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-proxy" version="9.4.49.v20220914">
+         <artifact name="jetty-proxy-9.4.49.v20220914.jar">
+            <sha256 value="fb046e0a2e72c679348f05ba2c14c226d79f35e75131360154394250747f812f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jetty-proxy-9.4.49.v20220914.pom">
+            <sha256 value="f01c7251d9c3b7413eb7e873aeed6c741d8b6d3e1b6dc08dd984037aaf2b168e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-security" version="9.4.49.v20220914">
+         <artifact name="jetty-security-9.4.49.v20220914.jar">
+            <sha256 value="5dd804fc4cf166b8106b06cb427b649f99cf36a48dbb0b19a88d76a9fb5c4e06" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jetty-security-9.4.49.v20220914.pom">
+            <sha256 value="fc88abcfb6f24d813131e7cd78ed23d8b1c0f6f630105f62a2ccface7e62f2fc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-server" version="9.4.49.v20220914">
+         <artifact name="jetty-server-9.4.49.v20220914.jar">
+            <sha256 value="06ae86baded124f81935a0701ed6af7b9e7ce33ee8ef58a87b779bb0a6b23dc4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jetty-server-9.4.49.v20220914.pom">
+            <sha256 value="6745bd595dfbd1226b3e377a717f655b05fc274391c4072f96176dc9d4c0caea" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-servlet" version="9.4.49.v20220914">
+         <artifact name="jetty-servlet-9.4.49.v20220914.jar">
+            <sha256 value="8bf6a78836715859789e9183f779ece85f769206c75e606c09cb1f03f0623334" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jetty-servlet-9.4.49.v20220914.pom">
+            <sha256 value="f968cbe0cf7bdb931bbfe31251439bc433b5483346a8e2424ea79cd645561300" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-servlets" version="9.4.49.v20220914">
+         <artifact name="jetty-servlets-9.4.49.v20220914.jar">
+            <sha256 value="71e5b4aebd45943254c54ff67c2a2297473e6b480c268640176671507cfe7ff5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jetty-servlets-9.4.49.v20220914.pom">
+            <sha256 value="d54ec2afa6e631c0ef05cd5430c8cb5701768f91a29173c4e04358761456f83a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-util" version="9.4.49.v20220914">
+         <artifact name="jetty-util-9.4.49.v20220914.jar">
+            <sha256 value="679313e158f334135e0e80ac200fd6dea605cde73fd7bf255aaaf47773d2f801" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jetty-util-9.4.49.v20220914.pom">
+            <sha256 value="429dfdc3bc7e4dfa394d87de603e007e89f9b790ce9e7ddc838cc2203f10e21c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-util-ajax" version="9.4.49.v20220914">
+         <artifact name="jetty-util-ajax-9.4.49.v20220914.jar">
+            <sha256 value="9a61fd75a52936aa6c6737e411ca81ada5203cd3d1371f3815644614b5ce7247" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jetty-util-ajax-9.4.49.v20220914.pom">
+            <sha256 value="adf6254824d907e670de5979129b30223226ace17a011607ce998dadf8f255dd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-webapp" version="9.4.49.v20220914">
+         <artifact name="jetty-webapp-9.4.49.v20220914.jar">
+            <sha256 value="33148b2a8e6eb3d426dd2b980e6deb67690b3978ad17759542488556b01cf401" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jetty-webapp-9.4.49.v20220914.pom">
+            <sha256 value="4638ed08d8b7275d67bffa28e0f22f394ee6fb6b5a39a3d122e1b92194fe13f3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty" name="jetty-xml" version="9.4.49.v20220914">
+         <artifact name="jetty-xml-9.4.49.v20220914.jar">
+            <sha256 value="0047f7b8569bff65523c3023d1ac2e483faccb003dcf9e307763bc2d21aef85b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jetty-xml-9.4.49.v20220914.pom">
+            <sha256 value="a8edf27af6c841d1f4ccb334fa02505528cba7fe7f857743a490a408e7cc6e1d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty.http2" name="http2-common" version="9.4.49.v20220914">
+         <artifact name="http2-common-9.4.49.v20220914.jar">
+            <sha256 value="bed48e7fbca8631c2dacd289f4aa533f2eaf238fe1ebf68fdc74ded3feba32e2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="http2-common-9.4.49.v20220914.pom">
+            <sha256 value="73378e42efe45361334301f378b7466fad2d85f0a9d322ea93d1835a1795092d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty.http2" name="http2-hpack" version="9.4.49.v20220914">
+         <artifact name="http2-hpack-9.4.49.v20220914.jar">
+            <sha256 value="65eac0637599051567ed31c8d613d8945709d96736389b2d37888cb7a85080ae" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="http2-hpack-9.4.49.v20220914.pom">
+            <sha256 value="e866f60502c089e1a14b4e20f4ccced17dc56d955243b173f79887a89611056c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty.http2" name="http2-parent" version="9.4.49.v20220914">
+         <artifact name="http2-parent-9.4.49.v20220914.pom">
+            <sha256 value="804e916e4db52f47fb0eec18c371968fa8a20460323f4b093fb0c40ecdf0b71f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jetty.http2" name="http2-server" version="9.4.49.v20220914">
+         <artifact name="http2-server-9.4.49.v20220914.jar">
+            <sha256 value="97f3f90b1be44eea3cd3039714dadcd9991b23322e85a4f6927d2035efbca6e2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="http2-server-9.4.49.v20220914.pom">
+            <sha256 value="701fcee4b23361961accf68c295dbe10f8001a35df5e86d2db9055d37701bbba" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jgit" name="org.eclipse.jgit" version="4.4.1.201607150455-r">
+         <artifact name="org.eclipse.jgit-4.4.1.201607150455-r.jar">
+            <sha256 value="0b2447b324e86351e35e08e091436194a846d469d79e97644398533c73d01fe0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.eclipse.jgit-4.4.1.201607150455-r.pom">
+            <sha256 value="4827808fa43ffb834de75d8ea734f422654f945c31b4cffe3fbc5d5a37a95089" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jgit" name="org.eclipse.jgit" version="5.13.1.202206130422-r">
+         <artifact name="org.eclipse.jgit-5.13.1.202206130422-r.jar">
+            <sha256 value="d679365a6c8e55c1496701099f5e5765433f68dcb659759416ba5b222eb5055c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.eclipse.jgit-5.13.1.202206130422-r.pom">
+            <sha256 value="3cc4bebf9c936578eae2b6d24fb2a912d89993a54fd0e2fbc1c8abc049878515" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jgit" name="org.eclipse.jgit-parent" version="4.4.1.201607150455-r">
+         <artifact name="org.eclipse.jgit-parent-4.4.1.201607150455-r.pom">
+            <sha256 value="a774a480555c512a6aa38ee3ff4d059954d478bbe1e9007dcd115dcf809a18a3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.jgit" name="org.eclipse.jgit-parent" version="5.13.1.202206130422-r">
+         <artifact name="org.eclipse.jgit-parent-5.13.1.202206130422-r.pom">
+            <sha256 value="de65fc76ed8f44a57785ee164918dc3d4f55ee3fea6a47bc7cb1baa19ef1bc83" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.platform" name="org.eclipse.core.commands" version="3.10.100">
+         <artifact name="org.eclipse.core.commands-3.10.100.jar">
+            <sha256 value="177c605efd78681e28765b869a2ff5284a79b02d133007a6169a64317cee8633" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.eclipse.core.commands-3.10.100.pom">
+            <sha256 value="fdc9be4a7c474bccc78aae5bb55c396fede6e2e20308514dfe8ebe34def9738d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.platform" name="org.eclipse.core.contenttype" version="3.8.0">
+         <artifact name="org.eclipse.core.contenttype-3.8.0.jar">
+            <sha256 value="f90fa8dd89b9da7d5e817281f963b46ad1414d33376354e541464434f0b23c90" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.eclipse.core.contenttype-3.8.0.pom">
+            <sha256 value="7d18f6e62ef5014ba73c54159266f7c883c0d3fc3fe29e83c4734a5bf61e2fad" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.platform" name="org.eclipse.core.expressions" version="3.8.200">
+         <artifact name="org.eclipse.core.expressions-3.8.200.pom">
+            <sha256 value="44621052059986bb56ad3d9a054d9f7f0e9b7e21d702ffb7c110b200044a88e6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.platform" name="org.eclipse.core.expressions" version="3.9.0">
+         <artifact name="org.eclipse.core.expressions-3.9.0.pom">
+            <sha256 value="5dbad4676c7ffa80cf71f63e1b045d05d5e0c912a597d3cef1c28e9e2bf3bb16" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.platform" name="org.eclipse.core.filesystem" version="1.9.100">
+         <artifact name="org.eclipse.core.filesystem-1.9.100.jar">
+            <sha256 value="36e802c4d9a2c864e7d6b22b8d06f59927d113475ea04b3fd9bf6312d5a97ff6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.eclipse.core.filesystem-1.9.100.pom">
+            <sha256 value="853f7f87cb90b9f1a2aa9ff08f2c0c7cc5f0e596a69acc0363928f49ab8e00e9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.platform" name="org.eclipse.core.jobs" version="3.12.0">
+         <artifact name="org.eclipse.core.jobs-3.12.0.jar">
+            <sha256 value="98cc919c93c5a1c45e15afc82c64fc2b91a6b4c243bed6925ccdd4e3db3a96e9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.eclipse.core.jobs-3.12.0.pom">
+            <sha256 value="1c20a263c32c9deb417be5a86252835bb4a4710d8456f6d2df03268077996f24" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.platform" name="org.eclipse.core.resources" version="3.15.100">
+         <artifact name="org.eclipse.core.resources-3.15.100.jar">
+            <sha256 value="428cc4ac13e6d4992f9806d67ee2a80e35005ae3ccd08f1788ed1693a05d35fa" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.eclipse.core.resources-3.15.100.pom">
+            <sha256 value="c69ad8b12a32599c4d62eec81ba381121d91887eedbe5fa711e85521385e552b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.platform" name="org.eclipse.core.runtime" version="3.23.0">
+         <artifact name="org.eclipse.core.runtime-3.23.0.jar">
+            <sha256 value="c81c0fd5c3cb632c93586c80f31461749f43104e3499f53e0cf33525bd606ce3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.eclipse.core.runtime-3.23.0.pom">
+            <sha256 value="95a55de2d382127364b9d37685bf5ab8988ad13558a86d433e09211eb6763ecc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.platform" name="org.eclipse.equinox.app" version="1.6.0">
+         <artifact name="org.eclipse.equinox.app-1.6.0.jar">
+            <sha256 value="745332dac397b823a7e3e3348447339f8fdb1973ceea4851612978ccf80bcc8c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.eclipse.equinox.app-1.6.0.pom">
+            <sha256 value="780a0917c3ce9d38366dc58cf1d0d1f3abbffe144e9dc2acfef14cde9cf548dc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.platform" name="org.eclipse.equinox.common" version="3.15.0">
+         <artifact name="org.eclipse.equinox.common-3.15.0.jar">
+            <sha256 value="044a3d106f514072b1d0dd48638c1f8ffe93300a05d6943766992449ed9e0b3a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.eclipse.equinox.common-3.15.0.pom">
+            <sha256 value="63187cfee99194c4114a6191b441999fa3c25a1aabf25939c5e43fa052f05c77" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.platform" name="org.eclipse.equinox.preferences" version="3.9.0">
+         <artifact name="org.eclipse.equinox.preferences-3.9.0.jar">
+            <sha256 value="02da6934a2e02d23b9016ec4eb5234733eeafd1f938acc23368b0d30c3567ae9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.eclipse.equinox.preferences-3.9.0.pom">
+            <sha256 value="1aefbab2c3dbfbd8e8443b479f0fbb4aee6b3f958c79fe9e64a0ef8fd4fce1d4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.platform" name="org.eclipse.equinox.registry" version="3.11.0">
+         <artifact name="org.eclipse.equinox.registry-3.11.0.jar">
+            <sha256 value="20a89fd326063e7ebe29308fa347a23b377924280038bc4233436d9117a8ba7b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.eclipse.equinox.registry-3.11.0.pom">
+            <sha256 value="43dfc7297893f6ff18d538a89ff5fe215b34a334d837a13b85783f71b67918cd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.platform" name="org.eclipse.jface" version="3.23.0">
+         <artifact name="org.eclipse.jface-3.23.0.jar">
+            <sha256 value="14150fd90a0b095ee45051c94764e8f9908f58578398055e40adcb33a4242798" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.eclipse.jface-3.23.0.pom">
+            <sha256 value="3f63c7e33a1e80688e86372a1e1188332affcde86eba6e6d35a2229027884bd7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.platform" name="org.eclipse.jface.text" version="3.18.100">
+         <artifact name="org.eclipse.jface.text-3.18.100.jar">
+            <sha256 value="bac1aea8eb813eaca2da9212c1079b577611f5010d6f93cd509ae346356bee29" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.eclipse.jface.text-3.18.100.pom">
+            <sha256 value="90f3cf0c03ecdf234f6336faea41637b2399dea53313d61eeebdfc3764b3ade9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.platform" name="org.eclipse.osgi" version="3.17.0">
+         <artifact name="org.eclipse.osgi-3.17.0.jar">
+            <sha256 value="b9b5cf6bb057b94be55f3510bdd831cdbaef16f2d1cab6b3770b72452811e538" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.eclipse.osgi-3.17.0.pom">
+            <sha256 value="7890e52381b9d0f0e52922e412769a4717403476d0bfc4efd4cbdf8f5e01a0a6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.platform" name="org.eclipse.swt" version="3.123.0">
+         <artifact name="org.eclipse.swt-3.123.0.pom">
+            <sha256 value="cc7ff79bb281489f7aaac2403e55cf2ea9db05c276c1b5b62797202fc0305281" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.platform" name="org.eclipse.swt" version="3.124.0">
+         <artifact name="org.eclipse.swt-3.124.0.pom">
+            <sha256 value="87edfca927216638d1ebb3168cee8821e7e81d4a459325765040d8308d09ba38" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.eclipse.platform" name="org.eclipse.text" version="3.12.0">
+         <artifact name="org.eclipse.text-3.12.0.jar">
+            <sha256 value="457c1f8af07e870acce65130a2d9aa1e0fd95c92a7667bbd2db5bf7f9f19dd31" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.eclipse.text-3.12.0.pom">
+            <sha256 value="078bfebc31947a52dd7f8a1abfdcb61221b5971ded76dee61189c3bc749b3bec" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.fusesource" name="fusesource-pom" version="1.12">
+         <artifact name="fusesource-pom-1.12.pom">
+            <sha256 value="c40d960daadcef7b01c1b1c6657afbac4fffb5e53168f8fcb0b28b84e6fdcca1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.fusesource.jansi" name="jansi" version="2.4.0">
+         <artifact name="jansi-2.4.0.jar">
+            <sha256 value="6cd91991323dd7b2fb28ca93d7ac12af5a86a2f53279e2b35827b30313fd0b9f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jansi-2.4.0.pom">
+            <sha256 value="ac40a9f2d0c1ee631fc3b08ef8e2f0bd14ba22011ca76ff1bcf65fb569eadf35" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.glassfish" name="javax.json" version="1.0.4">
+         <artifact name="javax.json-1.0.4.jar">
+            <sha256 value="0e1dec40a1ede965941251eda968aeee052cc4f50378bc316cc48e8159bdbeb4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="javax.json-1.0.4.pom">
+            <sha256 value="6baf8383ffa98b66ea96cd5bfc1ec7f2d79463bb98ac98052964b121c2212d54" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.glassfish" name="javax.json" version="1.1.4">
+         <artifact name="javax.json-1.1.4.jar">
+            <sha256 value="17fdeb7e22375a7fb40bb0551306f6dcf2b5743078668adcdf6c642c9a9ec955" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="javax.json-1.1.4.pom">
+            <sha256 value="50d2a59155284109a708675b52ebb4598500e43693967cff1401cb26b97f8853" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.glassfish" name="json" version="1.0.4">
+         <artifact name="json-1.0.4.pom">
+            <sha256 value="6d7c68423115f921718d944f859924b4c685217ec03a49f70455a8b2caa972e6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.glassfish" name="json" version="1.1.4">
+         <artifact name="json-1.1.4.pom">
+            <sha256 value="da3f53be1d45ef3af667fdfa26f54c3ebc0e196b8c4dfb646491dbe3e31cb20b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.graalvm.buildtools" name="graalvm-reachability-metadata" version="0.9.17">
+         <artifact name="graalvm-reachability-metadata-0.9.17.jar">
+            <sha256 value="c0ad7687e316e2c8f0cffdba7103bc81e2d9ccfdc85142e0c7734ca818c87ad6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="graalvm-reachability-metadata-0.9.17.module">
+            <sha256 value="b2521200691da2bd1e360a9eb41181a07954a429f25bf8ef0697a681619ab3cb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.graalvm.buildtools" name="junit-platform-native" version="0.9.17">
+         <artifact name="junit-platform-native-0.9.17.jar">
+            <sha256 value="55d184ad610167043258f4d46b804daf6a07f27f732cec6a9e35e6bc82338b3e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-native-0.9.17.module">
+            <sha256 value="28a34d72595732a742c84d3f241e24458f38f11a51a3c490d8cb07957fe007d3" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-native-0.9.17.pom">
+            <sha256 value="10fe2963ef641900a2ab5cf33e44a5cac51908d62459a4e74966aa9a7729a190" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.graalvm.buildtools" name="native-gradle-plugin" version="0.9.17">
+         <artifact name="native-gradle-plugin-0.9.17.jar">
+            <sha256 value="9d01c387e7d401d63aabec07791cb2dd70d850f09849bc971d573cb3d040df9a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="native-gradle-plugin-0.9.17.module">
+            <sha256 value="dada488507f866daa79fb412192f06f7fc898c88fad9a8fda3ac437b0ef84313" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.graalvm.buildtools" name="utils" version="0.9.17">
+         <artifact name="utils-0.9.17.jar">
+            <sha256 value="9c1e47c72b5029df12fd790925c06ee1b29340a2a34079a80a4e41ed140bff1d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="utils-0.9.17.module">
+            <sha256 value="efba7a0c9fa77e28eff4d8b7c67cc8d40a673d08971f1c641bf887e03812e099" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.graalvm.buildtools.native" name="org.graalvm.buildtools.native.gradle.plugin" version="0.9.17">
+         <artifact name="org.graalvm.buildtools.native.gradle.plugin-0.9.17.pom">
+            <sha256 value="d3e1f08563a3d799c2d0f70842530431a5cce5cac13d5cf5a49637d0e3182401" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.hamcrest" name="hamcrest" version="2.1">
+         <artifact name="hamcrest-2.1.jar">
+            <sha256 value="ba93b2e3a562322ba432f0a1b53addcc55cb188253319a020ed77f824e692050" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="hamcrest-2.1.pom">
+            <sha256 value="787fddc7ac064b5a22406380e20d560769f0a089bbecff228e19edc96cf6c927" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.hamcrest" name="hamcrest" version="2.2">
+         <artifact name="hamcrest-2.2.jar">
+            <sha256 value="5e62846a89f05cd78cd9c1a553f340d002458380c320455dd1f8fc5497a8a1c1" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="hamcrest-2.2.pom">
+            <sha256 value="b36137376c4b3fcf76dc337e2a1bc5b691a2ac1aa966ab5d26209a93812fa57d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.hamcrest" name="hamcrest-core" version="1.3">
+         <artifact name="hamcrest-core-1.3.jar">
+            <sha256 value="66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="hamcrest-core-1.3.pom">
+            <sha256 value="fde386a7905173a1b103de6ab820727584b50d0e32282e2797787c20a64ffa93" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.hamcrest" name="hamcrest-core" version="2.2">
+         <artifact name="hamcrest-core-2.2.jar">
+            <sha256 value="094f5d92b4b7d9c8a2bf53cc69d356243ae89c3499457bcb4b92f7ed3bf95879" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="hamcrest-core-2.2.pom">
+            <sha256 value="f7fde2fff5101a5fc3a39e28810b911c2da202ddc2bd50765f89e7c6ff8ce7dd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.hamcrest" name="hamcrest-library" version="2.2">
+         <artifact name="hamcrest-library-2.2.jar">
+            <sha256 value="3851523a201a0d4825c25a61a6edc50712825a39bd3d03391b98c48ca3cb396c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="hamcrest-library-2.2.pom">
+            <sha256 value="f58ad835d2426431259d86e4fe3a4f5161e671d916c5cbecf35738bcde82fcff" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.hamcrest" name="hamcrest-parent" version="1.3">
+         <artifact name="hamcrest-parent-1.3.pom">
+            <sha256 value="6d535f94efb663bdb682c9f27a50335394688009642ba7a9677504bc1be4129b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.hyperledger.besu" name="arithmetic" version="0.7.1">
+         <artifact name="arithmetic-0.7.1.jar">
+            <sha256 value="38d5039419b5fc7c74da78be86cac2e11ce35bbfa9cd047f18da65b84ae2c2b4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="arithmetic-0.7.1.module">
+            <sha256 value="d508c4971ddaacdb75b7bec400fb292bbc2cec934ddad17106965dade7fffe4d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="arithmetic-0.7.1.pom">
+            <sha256 value="125ed16e300f225a36c5b64c5d24b6d01d7dd607a16ba906aac563d9f1584183" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.hyperledger.besu" name="blake2bf" version="0.7.1">
+         <artifact name="blake2bf-0.7.1.jar">
+            <sha256 value="e06429773d69d6fe5006ef7d7c45f11c2df56dc69f00a15e29519f17cc53754e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="blake2bf-0.7.1.module">
+            <sha256 value="001b26fa58ac344c50e343866a76d0e26b36580de16043cc89c8c40fb22f5d7b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="blake2bf-0.7.1.pom">
+            <sha256 value="58d501993a559e26cfab9151abcd52636386bd26029c84541c7f5f52e063f580" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.hyperledger.besu" name="bls12-381" version="0.7.1">
+         <artifact name="bls12-381-0.7.1.jar">
+            <sha256 value="bf116b267489302805cf0b89f07cde139f1ab41089336cf0779dd269463b2acb" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="bls12-381-0.7.1.module">
+            <sha256 value="2d5677e9d4c9894c6fea7826c2a3ce50cf13d37a6874b03d4198587576aeed02" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="bls12-381-0.7.1.pom">
+            <sha256 value="eb939df4f6ad29183c8f216e193a8aa83690b3e6314ed9f5627c9f9e8b9dd762" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.hyperledger.besu" name="ipa-multipoint" version="0.7.1">
+         <artifact name="ipa-multipoint-0.7.1.jar">
+            <sha256 value="6f0231fd8163f934ac38569bebd5fa963e7d84a3629a82049134a259075410f8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ipa-multipoint-0.7.1.module">
+            <sha256 value="13030f65ec95bf8d1414ab2fd962193f65aebaabe7f3c035d2460615c6c585e7" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="ipa-multipoint-0.7.1.pom">
+            <sha256 value="736c81314a55fa16e856885c8357ff6cbee003b529142b6dd8aa6c4555332146" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.hyperledger.besu" name="secp256k1" version="0.7.1">
+         <artifact name="secp256k1-0.7.1.jar">
+            <sha256 value="80e5650d89099976c7932b4dfdfba0e09ecdd1650cdf0d27f45b9ade8e5ee71f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="secp256k1-0.7.1.module">
+            <sha256 value="bdb425e3cee659f63eedbe1828d7cb4957a4f7ae2feca2364724fb5cb2dea8a1" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="secp256k1-0.7.1.pom">
+            <sha256 value="f1685ec3024a025df9a87c36936fc607915f2178586aa8e5cea2f572920836c1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.hyperledger.besu" name="secp256r1" version="0.7.1">
+         <artifact name="secp256r1-0.7.1.jar">
+            <sha256 value="520f2d2b8d97ab070af317a740fb5be3c052b04c177e96779e46b0a8502aa35a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="secp256r1-0.7.1.module">
+            <sha256 value="bb5179249597b5f685bcac1937af2d8f747797aff4d0bfe871513994aa66fc09" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="secp256r1-0.7.1.pom">
+            <sha256 value="b1bd15999f2f6d8a9ed8ac269d625b463055e7c60f6c6dbe5456d950a63c0a2a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.immutables" name="immutables" version="2.9.3">
+         <artifact name="immutables-2.9.3.pom">
+            <sha256 value="441e62f4a12c47176dea82e9a3fc4ea431f02d522f4430a64057398f830c5e43" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.immutables" name="value" version="2.9.3">
+         <artifact name="value-2.9.3.jar">
+            <sha256 value="d16b7cc04f50217b495c44a783424d68dbe7cb1bc8f71bff230d55f48b997585" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="value-2.9.3.pom">
+            <sha256 value="c0b7e4254da8c7a5b800523515b4dbd8ec2a577ccbae0c30b5093d22050bc93a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.immutables" name="value-annotations" version="2.9.3">
+         <artifact name="value-annotations-2.9.3.jar">
+            <sha256 value="1ee9d5d479913d5a478ebbe9765ea17562470a0b7f6f953aef013d071c123e67" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="value-annotations-2.9.3.pom">
+            <sha256 value="79d0f0b1b98fe9a9114a05d3d0f1f796186930f010f3cd567f677d1d48c2b4eb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.infinispan" name="infinispan-bom" version="11.0.15.Final">
+         <artifact name="infinispan-bom-11.0.15.Final.pom">
+            <sha256 value="07386ee62c8464618770d209f8c060da8e51f56e76314d1b29caec9c302130e9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.infinispan" name="infinispan-build-configuration-parent" version="11.0.15.Final">
+         <artifact name="infinispan-build-configuration-parent-11.0.15.Final.pom">
+            <sha256 value="b2f82dd670e70f378a780efea1053f0e660a825dbbfe8c6ca8ca996dfde3aaa0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jacoco" name="org.jacoco.agent" version="0.8.8">
+         <artifact name="org.jacoco.agent-0.8.8.jar">
+            <sha256 value="072ecbd496896623899a696fff12c01c1615f737616d2792e6d0e10cdf8a610d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.jacoco.agent-0.8.8.pom">
+            <sha256 value="7dd13c80aff315032983357c650a887d6fdb4c8a8870b207bb4802c49809e7b4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jacoco" name="org.jacoco.ant" version="0.8.8">
+         <artifact name="org.jacoco.ant-0.8.8.jar">
+            <sha256 value="02e33bd2c48dc0be67c2fea84d43beececfd400da6797c58153253d4c30aca15" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.jacoco.ant-0.8.8.pom">
+            <sha256 value="fafff75819609030f4626509313c0861428c2c26c8d36e9a8938334a04478909" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jacoco" name="org.jacoco.build" version="0.8.8">
+         <artifact name="org.jacoco.build-0.8.8.pom">
+            <sha256 value="f4ce0b1285fd24fc6c772f42857298315904dde8fd5677267a0fad5ff9ce2aef" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jacoco" name="org.jacoco.core" version="0.8.8">
+         <artifact name="org.jacoco.core-0.8.8.jar">
+            <sha256 value="474c782f809d88924713dfdbf0acb79d330f904be576484803463d0465611643" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.jacoco.core-0.8.8.pom">
+            <sha256 value="f5fab5a48df823b83c0ea35026032368cc9b81800efb257cc7a5928298fee225" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jacoco" name="org.jacoco.report" version="0.8.8">
+         <artifact name="org.jacoco.report-0.8.8.jar">
+            <sha256 value="2c129110f3e3fcaa1f8179578ea3894586199cb0826be5c7790278084c9622a9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.jacoco.report-0.8.8.pom">
+            <sha256 value="5213af2916bb2690be871917d82a0f9c2ba1e88b796a59343fc03df8ae138716" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.java-websocket" name="Java-WebSocket" version="1.5.2">
+         <artifact name="Java-WebSocket-1.5.2.jar">
+            <sha256 value="ff869d198a8dc5d00967392e187aeda93b833b7cdd3bccefb3d7fb5834098b85" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="Java-WebSocket-1.5.2.pom">
+            <sha256 value="77b2834ee3c23dfbb8eb5be7f657d73fc144674bb40dfa846fd5254a23429443" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.java-websocket" name="Java-WebSocket" version="1.5.3">
+         <artifact name="Java-WebSocket-1.5.3.jar">
+            <sha256 value="4d6fc21dc9b657e76dcd74969079d18f30e7796a563f34c9a61e659a485e7a3f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="Java-WebSocket-1.5.3.pom">
+            <sha256 value="5f9fb7847c152637784e6d29a18a44ce9494f301aaaa547bca205afed4499bc6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jboss" name="jboss-parent" version="36">
+         <artifact name="jboss-parent-36.pom">
+            <sha256 value="000dd616298aebd21a9d5731874df083d7298424b91e037b73cbdd07ebc83e0e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains" name="annotations" version="13.0">
+         <artifact name="annotations-13.0.jar">
+            <sha256 value="ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="annotations-13.0.pom">
+            <sha256 value="965aeb2bedff369819bdde1bf7a0b3b89b8247dd69c88b86375d76163bb8c397" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains" name="annotations" version="17.0.0">
+         <artifact name="annotations-17.0.0.jar">
+            <sha256 value="195fb0da046d55bb042e91543484cf1da68b02bb7afbfe031f229e45ac84b3f2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="annotations-17.0.0.pom">
+            <sha256 value="8390ee0b4dff7f568b1336e061f694e77d761a505169aed8964e75482c990eed" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.3.61">
+         <artifact name="kotlin-reflect-1.3.61.jar">
+            <sha256 value="143e715c10ff6d65eb5a7695be7b696c6e013702dff103d23ba54760bf93867b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-reflect-1.3.61.pom">
+            <sha256 value="b2b8add63c5ce9b67571ed469f7c37fd043ee2420206255e96a146018d8e2fa0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.6.10">
+         <artifact name="kotlin-reflect-1.6.10.jar">
+            <sha256 value="3277ac102ae17aad10a55abec75ff5696c8d109790396434b496e75087854203" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-reflect-1.6.10.pom">
+            <sha256 value="57905524274a00ae028aaccc27283f6bc5925a934a046c1cc5d06c8ee4d6d5a9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.4.10">
+         <artifact name="kotlin-stdlib-1.4.10.jar">
+            <sha256 value="01ecb09782c042b931c1839acf21a188340b295d05400afd6e3415d4475b8daa" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-1.4.10.pom">
+            <sha256 value="a4b9cfbb4bbda523af1e24d52c775fb9c0f7cb568e48b065d45aeb56e63c2762" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.8.10">
+         <artifact name="kotlin-stdlib-1.8.10.jar">
+            <sha256 value="17e1076131cd07c958a942ff8a087cf865b1ef3de58463e1e5dd6fd7515406b0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-1.8.10.pom">
+            <sha256 value="a96c3b89c54fd44ecc2e4087e5d585d0ade4986b42d4e73525800f9b09285e58" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.3.60">
+         <artifact name="kotlin-stdlib-common-1.3.60.pom">
+            <sha256 value="2533905a10c67afd0db1d1dc0837a3c6f1e0d64cb76e087f7dccbaadae3314da" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.4.0">
+         <artifact name="kotlin-stdlib-common-1.4.0.pom">
+            <sha256 value="98e59a445a3248f58811ce6782485de53fa77fc6f5adb3eb766a78b1231abd0a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.4.10">
+         <artifact name="kotlin-stdlib-common-1.4.10.jar">
+            <sha256 value="4681f2d436a68c7523595d84ed5758e1382f9da0f67c91e6a848690d711274fe" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-common-1.4.10.pom">
+            <sha256 value="63480e72a7d4de742b49a6ff90e45f544ca37f3fe11af8b4839f9cd747515d00" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.8.10">
+         <artifact name="kotlin-stdlib-common-1.8.10.jar">
+            <sha256 value="385031de4c6dd9e990d6a44455d79583572a490a3464d7fe7f10a5ecca3225a8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-common-1.8.10.pom">
+            <sha256 value="d27692dbe233904a119530fef1426178060d524bc745ff36cecc8b37cf140746" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.4.10">
+         <artifact name="kotlin-stdlib-jdk7-1.4.10.jar">
+            <sha256 value="f9566380c08722c780ce33ceee23e98ddf765ca98fabd3e2fabae7975c8d232b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-jdk7-1.4.10.pom">
+            <sha256 value="78f2fe1d48e99c64958930ccdc43fce5939460ecdfc65f302823a021d63c520d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.5.31">
+         <artifact name="kotlin-stdlib-jdk7-1.5.31.jar">
+            <sha256 value="a25bf47353ce899d843cbddee516d621a73473e7fba97f8d0301e7b4aed7c15f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-jdk7-1.5.31.pom">
+            <sha256 value="23138489ee293a68197068877745f700bfa11af989187bed3c3074cd8c079778" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.6.10">
+         <artifact name="kotlin-stdlib-jdk7-1.6.10.jar">
+            <sha256 value="2aedcdc6b69b33bdf5cc235bcea88e7cf6601146bb6bcdffdb312bbacd7be261" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-jdk7-1.6.10.pom">
+            <sha256 value="612211ff930f5b52c724ff763417d5aa281dd7e0325c3b35c8d18120a6a8df4d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.7.0">
+         <artifact name="kotlin-stdlib-jdk7-1.7.0.jar">
+            <sha256 value="07e91be9b2ca20672d2bdb7e181b766e73453a2da13492b5ddaee8fa47aea239" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-jdk7-1.7.0.pom">
+            <sha256 value="ae23a4c6a2bdfc0cd5a7bbae87d998a11e0356be49fefa0a9af6c3ff6da2a02b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.3.61">
+         <artifact name="kotlin-stdlib-jdk8-1.3.61.pom">
+            <sha256 value="e30187e5720ca640b8e68686f20dd0250dcef0193d56e5569c3c4a61277312b6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.4.10">
+         <artifact name="kotlin-stdlib-jdk8-1.4.10.jar">
+            <sha256 value="39b7a9442d7a3865e0f4a732c56c1d5da0e11ffb3bb82a461d32deb0c0ca7673" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-jdk8-1.4.10.pom">
+            <sha256 value="c2f4d70082dbbfcea68fdfa74289cef32df9e4b5ddf359f006036dff1c5b06d6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.5.31">
+         <artifact name="kotlin-stdlib-jdk8-1.5.31.jar">
+            <sha256 value="b548f7767aacf029d2417e47440742bd6d3ebede19b60386e23554ce5c4c5fdc" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-jdk8-1.5.31.pom">
+            <sha256 value="45110aab0074792b815807b02b2daf18d2b37e8747ac0692aad7a0d02da893df" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.6.10">
+         <artifact name="kotlin-stdlib-jdk8-1.6.10.jar">
+            <sha256 value="1456d82d039ea30d8485b032901f52bbf07e7cdbe8bb1f8708ad32a8574c41ce" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-jdk8-1.6.10.pom">
+            <sha256 value="43a649fa737bfb35fa4af4e6de33e2f08a5d19104d7582ea40dbcd2b63790acc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.7.0">
+         <artifact name="kotlin-stdlib-jdk8-1.7.0.jar">
+            <sha256 value="cf058e11db1dfc9944680c8c61b95ac689aaaa8a3eb30bced028100f038f030b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlin-stdlib-jdk8-1.7.0.pom">
+            <sha256 value="97e1b53abe45f138b587953f5043e399c380f555a6233d55795e7aee03d0a731" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-bom" version="1.6.0">
+         <artifact name="kotlinx-coroutines-bom-1.6.0.pom">
+            <sha256 value="da2327250eabf2adeb5ba4d015a437f34475102d15ba3d7448da71dfcfd196de" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core" version="1.6.0">
+         <artifact name="kotlinx-coroutines-core-1.6.0.module">
+            <sha256 value="512cfab68f00d7363461b5dd02637dd19048b364a89e1960f99784c705a27a7c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlinx-coroutines-core-1.6.0.pom">
+            <sha256 value="225504eb87207013296dfd69e21acc60f56240546e6ea8d4252783bdcfb324d9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-jvm" version="1.6.0">
+         <artifact name="kotlinx-coroutines-core-jvm-1.6.0.jar">
+            <sha256 value="acc8c74b1fb88121c51221bfa7b6f5e920201bc20183ebf74165dcf5d45a8003" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlinx-coroutines-core-jvm-1.6.0.module">
+            <sha256 value="2cdc60217b955ce213fca1f14ee960b85dbd30f8a6966361237410d38a602ef1" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlinx-coroutines-core-jvm-1.6.0.pom">
+            <sha256 value="d11fdf1c07d83682dc6f73a16a6fa010c2de5f45d7049cf2bf6ff09ceeda3001" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-jdk8" version="1.6.0">
+         <artifact name="kotlinx-coroutines-jdk8-1.6.0.jar">
+            <sha256 value="cf93f59cafabea454b0bb03c4c3ea055f6ea17f7ff06770a765eca94dd5de867" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlinx-coroutines-jdk8-1.6.0.module">
+            <sha256 value="aa42b90c2f8460f0551adcef22d6efe8be77b9666074490b7d15edd77661ebb0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlinx-coroutines-jdk8-1.6.0.pom">
+            <sha256 value="0b2070e123c7cdc262b506ce2ad7e7d09d7bea6dab4acbfd58d27e7131684b00" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-metadata-jvm" version="0.5.0">
+         <artifact name="kotlinx-metadata-jvm-0.5.0.jar">
+            <sha256 value="ca063a96639b08b9eaa0de4d65e899480740a6efbe28ab9a8681a2ced03055a4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlinx-metadata-jvm-0.5.0.pom">
+            <sha256 value="52d84bd1dbff23b674806670de4e757985b2c54f41cadca48846e667d1d44ffd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlinx" name="kotlinx-serialization-runtime" version="0.14.0">
+         <artifact name="kotlinx-serialization-runtime-0.14.0.jar">
+            <sha256 value="682cbf020fcd0d3a047d9fe9e21c681f02daf0aa3a587f36ac26d4c435d28bee" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="kotlinx-serialization-runtime-0.14.0.pom">
+            <sha256 value="a019e7b0fcab25c4cfb296034af1b0b93e16aef0d406a3e0eb43abc75e2e17ce" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jfrog.buildinfo" name="build-info-api" version="2.36.3">
+         <artifact name="build-info-api-2.36.3.jar">
+            <sha256 value="3e2e65e17365be9944ac5b45d9998dab1fc40e2da87d6348f88651fc54a4298b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="build-info-api-2.36.3.pom">
+            <sha256 value="5fc308ffc59fd7e75c6e64336490baacaca8693564abad83df39b4a2e9d293f7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jfrog.buildinfo" name="build-info-client" version="2.36.3">
+         <artifact name="build-info-client-2.36.3.jar">
+            <sha256 value="9918446e25c9cdf1b980f3d83a631a7dcc355a4aff9205f614d589767802488a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="build-info-client-2.36.3.pom">
+            <sha256 value="88e9eec8ecc0aed33afe90129b4c3235d736d93a965c7ff5e6165f0ec6eef1cf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jfrog.buildinfo" name="build-info-extractor" version="2.36.3">
+         <artifact name="build-info-extractor-2.36.3.jar">
+            <sha256 value="ea5b6fdb4e010d20c16d0d434a1df11aee58e516c6e80ada81036fac10cd7f84" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="build-info-extractor-2.36.3.pom">
+            <sha256 value="bd1aaa9376077d376a97c66aeaed72bfdf45e3d27f724263324391d142992cc4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jfrog.buildinfo" name="build-info-extractor-gradle" version="4.28.3">
+         <artifact name="build-info-extractor-gradle-4.28.3.jar">
+            <sha256 value="6dd4efde02d55e1a219898cb2d64f5daf3452ff66e067e94e9713ff53dbc393a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="build-info-extractor-gradle-4.28.3.pom">
+            <sha256 value="478d24416a158f120dd0b0349ccb86fee0ad9959bd4d08de9486758d52458069" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jfrog.filespecs" name="file-specs-java" version="1.1.1">
+         <artifact name="file-specs-java-1.1.1.jar">
+            <sha256 value="3b27ec2939994c27a2efa601c6ac41aaa0626c6f06e09140095baee752a4916f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="file-specs-java-1.1.1.module">
+            <sha256 value="8236c4195721d9a2ce620c03efda7f0c596716d287f6436e256e0ed15a62a2c3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit" name="junit-bom" version="5.7.1">
+         <artifact name="junit-bom-5.7.1.module">
+            <sha256 value="9854e3894d64b2485207e0046bca07b3d42d169e782f4fa8c9ce229a78faee04" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-bom-5.7.1.pom">
+            <sha256 value="0b9b14a3d62106fafe8c68a717b87b87ad18685899451b753c04fa41b6857784" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit" name="junit-bom" version="5.7.2">
+         <artifact name="junit-bom-5.7.2.module">
+            <sha256 value="f3bceb1c59dd4f6993f4304dffa580172b8df65a76cd36fa4fd92c0578d28ad8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-bom-5.7.2.pom">
+            <sha256 value="cd14aaa869991f82021c585d570d31ff342bcba58bb44233b70193771b96487b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit" name="junit-bom" version="5.8.1">
+         <artifact name="junit-bom-5.8.1.module">
+            <sha256 value="6b82cba52a134b13c1982f0cf9622c6d485371d40b989246f3124e3b0a5b1854" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-bom-5.8.1.pom">
+            <sha256 value="ef7dc47f8e4a16864f4779728e87ed78539819e4fb892768a9da6b8ef903f863" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit" name="junit-bom" version="5.8.2">
+         <artifact name="junit-bom-5.8.2.module">
+            <sha256 value="40cfad993fa70ecdf2af74d0c56da1484ee220964be8f932cfe632be9a2733fa" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-bom-5.8.2.pom">
+            <sha256 value="836069ca9e8ee3c56e48376222da291263f137bd3fd16d84fdd47efcc3f286e2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit" name="junit-bom" version="5.9.0">
+         <artifact name="junit-bom-5.9.0.module">
+            <sha256 value="a054eaf5016b58bbcde86660444a7c0dd3e2caf84d2a1ad5fc4cb525979c19b9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-bom-5.9.0.pom">
+            <sha256 value="d83e87f1676cde44191eec5cda690492392f26923b1e498148ca739dfed75295" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit" name="junit-bom" version="5.9.1">
+         <artifact name="junit-bom-5.9.1.module">
+            <sha256 value="9026c1656690fa145ad75ece83674211aa12ad8930a91b107c2f5cdece2f1b1c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-bom-5.9.1.pom">
+            <sha256 value="b163c1cfc8fc1fd58b457a00d586c04c46e986d75904e9ca54c03a97d65b496c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit" name="junit-bom" version="5.9.2">
+         <artifact name="junit-bom-5.9.2.module">
+            <sha256 value="ab137ba5a8e32c9b066bf9126a1c76dd5614b724ba5c0b02549772b5e9f4cf1f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-bom-5.9.2.pom">
+            <sha256 value="2ed07d65845131f5336a86476c9a4056b59d0b58b9815ab3679bb0f36f35f705" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.jupiter" name="junit-jupiter" version="5.8.2">
+         <artifact name="junit-jupiter-5.8.2.jar">
+            <sha256 value="4f5c1cc6432244cd16e36aa0e02b74bce34a81ff95a13d63d50951ec4ce3f4bd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-jupiter-5.8.2.module">
+            <sha256 value="d9df47b3c7431883ab1f1f1d820c2980ebcbd753edc4c82b99bf5ec2c533ad2e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-jupiter-5.8.2.pom">
+            <sha256 value="43f56273e7acf33e0f5b5d1079c7ffa424531f01e2794a9d6473adfd10a45d2e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.jupiter" name="junit-jupiter-api" version="5.5.2">
+         <artifact name="junit-jupiter-api-5.5.2.jar">
+            <sha256 value="249a2fdbd3931987c0298d00ca08ed248496e0fc11e0463c08c4f82e0cc79b1c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-jupiter-api-5.5.2.pom">
+            <sha256 value="76a15d80d8587a1a5a3a5b142d2ceb37304fbd91198ba425486e57f76d088860" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.jupiter" name="junit-jupiter-api" version="5.8.2">
+         <artifact name="junit-jupiter-api-5.8.2.jar">
+            <sha256 value="1808ee87e0f718cd6e25f3b75afc17956ac8a3edc48c7e9bab9f19f9a79e3801" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-jupiter-api-5.8.2.module">
+            <sha256 value="7e9af4dfff6267acddd157d9e11ba0d5dc91b332fa74bc4c65939e4517a1b770" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-jupiter-api-5.8.2.pom">
+            <sha256 value="c9bde3622795b30a773531e85c5832f8dc8aa77ecdd313eee235c983cbfd0277" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.5.2">
+         <artifact name="junit-jupiter-engine-5.5.2.jar">
+            <sha256 value="6d777da9876e2ef7a0336e8f098f8d74a5a64f810aa3a4a2f5f3b766ce97837b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-jupiter-engine-5.5.2.pom">
+            <sha256 value="032fef4e2563084d397eae481a388010f443401af6252bfd377d76307f6f8bfe" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.8.2">
+         <artifact name="junit-jupiter-engine-5.8.2.jar">
+            <sha256 value="753b7726cdd158bb34cedb94c161e2291896f47832a1e9eda53d970020a8184e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-jupiter-engine-5.8.2.module">
+            <sha256 value="a56204c716c2379970ca8e3fe2a72e3a030cd9027328d3ce1457dd10c0150e7e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-jupiter-engine-5.8.2.pom">
+            <sha256 value="0a4b7dd94baf9c5fbb65a2e9173d085228bd0024213648025ad067024f1c66bb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.jupiter" name="junit-jupiter-params" version="5.8.2">
+         <artifact name="junit-jupiter-params-5.8.2.jar">
+            <sha256 value="d1c22d6fe5483568c08c8913f34abd2303490c3480ce6c18a2ea31c65e44102a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-jupiter-params-5.8.2.module">
+            <sha256 value="5023e4e3ec156ec6bd3cf655f3070cfc5a3e8aad5d51b4bbe025a792e9498d73" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-jupiter-params-5.8.2.pom">
+            <sha256 value="b469e01017017d85bc025225302052fa45cf2b59f9415842473946b4fa49c7c6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-commons" version="1.5.2">
+         <artifact name="junit-platform-commons-1.5.2.jar">
+            <sha256 value="fc44afdfc0f20c85e71a66e7943281aef3bc1e0fd62d2d69a36cb6901e682c10" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-commons-1.5.2.pom">
+            <sha256 value="3bd0d4ded632a8af8ca587fb6764019de771b1d6bcb89acd562435a1009faada" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-commons" version="1.8.2">
+         <artifact name="junit-platform-commons-1.8.2.jar">
+            <sha256 value="d2e015fca7130e79af2f4608dc54415e4b10b592d77333decb4b1a274c185050" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-commons-1.8.2.module">
+            <sha256 value="342847d3046fea435595692db4f05d5f039e0e1d1e204f4d5755902557082626" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-commons-1.8.2.pom">
+            <sha256 value="ce852e34c6a184aa6c80ee8df0471713a7408134134f08e3c1c3dd87c6b59ab7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-commons" version="1.9.2">
+         <artifact name="junit-platform-commons-1.9.2.jar">
+            <sha256 value="624a3d745ef1d28e955a6a67af8edba0fdfc5c9bad680a73f67a70bb950a683d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-commons-1.9.2.module">
+            <sha256 value="6ba4c84613e5b89e668ee6a89971f0d90d0e1b81721b8b5fe0c80058f0ceb9ee" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-commons-1.9.2.pom">
+            <sha256 value="24023f20c235a69609fb2f95a60738557fcf9413f3ae92a92e1329547d6145c9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-console" version="1.8.1">
+         <artifact name="junit-platform-console-1.8.1.module">
+            <sha256 value="356d84afbf5c4b17dbccd3ea1bef527f9b43d598de67e15c4949d2b07e6b90cf" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-console" version="1.8.2">
+         <artifact name="junit-platform-console-1.8.2.module">
+            <sha256 value="21a7d83969f81b7ba5f8dd6f0d2f4ca6b8e7d632172c4a05154e7b7f219345ee" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-console-1.8.2.pom">
+            <sha256 value="2cd604c0e09b3ee6e14bed368f65e9b3a7d1e9fb3b15e40c420df8288563e6bd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-console" version="1.9.2">
+         <artifact name="junit-platform-console-1.9.2.jar">
+            <sha256 value="11eb599f761643186fb0112df0c9d962146eab256f7d5a3d5581b2a32dc720f0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-console-1.9.2.module">
+            <sha256 value="c0c9280709d247697e3aa7ca51b5e274f9e59f731fe3845a12f413601a55a3f5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-console-1.9.2.pom">
+            <sha256 value="3739feafb6c2dc183b49ef9698fb7650e5c693e016af85f254b15a832d88c732" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-engine" version="1.5.2">
+         <artifact name="junit-platform-engine-1.5.2.jar">
+            <sha256 value="ff20ba4ad8c00ef17baef9c55512f9c02d9a68740f7f1ac01a9a6aa0239931f8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-engine-1.5.2.pom">
+            <sha256 value="2d4b95555c21e085ebc1ddbdf42d79eb1d55640dc193b1b7e6100240fd2f189f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-engine" version="1.8.2">
+         <artifact name="junit-platform-engine-1.8.2.jar">
+            <sha256 value="0b7d000f8c3e8e5f7d6b819649936e7b9938314e87c8f983805218ea57567e59" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-engine-1.8.2.module">
+            <sha256 value="eba77b36efdf75a67f46438333825f9e448f550d521e7249d950358580ee636b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-engine-1.8.2.pom">
+            <sha256 value="0168643266060ed928ef5a81823003ecfae79a9a8c0bbfd76f4201c6c9d771c5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-engine" version="1.9.2">
+         <artifact name="junit-platform-engine-1.9.2.jar">
+            <sha256 value="25f23dc535a091e9dc80c008faf29dcb92be902e6911f77a736fbaf019908367" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-engine-1.9.2.module">
+            <sha256 value="1de85141af9f58153e24575069a1375fbbedd7af5d844cbe3287965349cba1f7" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-engine-1.9.2.pom">
+            <sha256 value="2df9420a6b24e5f4f314235e01cd9c3b8f646285db2f6e82d86ee06ef7af4e24" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-launcher" version="1.5.2">
+         <artifact name="junit-platform-launcher-1.5.2.jar">
+            <sha256 value="c1f6473ddd343550b42e94072aff9417ff38398f8b6bafe27b785aebcdaa660b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-launcher-1.5.2.pom">
+            <sha256 value="25a42980af3a24685376633e511a928f8e83de736fbc6fd46eac2238d10a3631" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-launcher" version="1.8.1">
+         <artifact name="junit-platform-launcher-1.8.1.module">
+            <sha256 value="6108932af9febe85e8ab758dc02af1d3a931a972100dad460b10961cbe361763" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-launcher" version="1.8.2">
+         <artifact name="junit-platform-launcher-1.8.2.module">
+            <sha256 value="e17400ec7be7608c1f888d721b43001e9736c150d40f98c8a0bcda9563d8caeb" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-launcher-1.8.2.pom">
+            <sha256 value="b5f6a771a6aeb73c89a6e77f56d729f4ba8eb5afdd0f10f44db44d6aadb95095" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-launcher" version="1.9.2">
+         <artifact name="junit-platform-launcher-1.9.2.jar">
+            <sha256 value="eef139eb09c98e9cdd358b6ce4c6cdd59b30c6a88096e369c33ba96e67edf0e4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-launcher-1.9.2.module">
+            <sha256 value="b77d18a92fc5f0454292799b6aa5948225207f2549b3ce7f1151ccf5e6b68686" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-launcher-1.9.2.pom">
+            <sha256 value="ce9148998a8ef1de67e5a8f44079c03e1752eab52a23a1f76e07a8147f2c198e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-reporting" version="1.8.1">
+         <artifact name="junit-platform-reporting-1.8.1.module">
+            <sha256 value="54676f691f3b36d9f9bfda9a2358d20e32ccdd7a04a767edaf12e618592c8dcb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-reporting" version="1.8.2">
+         <artifact name="junit-platform-reporting-1.8.2.module">
+            <sha256 value="1814892307713bd93168a7824b74ea2b9f05cd5aa4d823c9c7cb15d6518a209f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-reporting-1.8.2.pom">
+            <sha256 value="f8db7120d4c698d4fc06ca07376007ff179670973bba25d7a1007876fed4f025" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-reporting" version="1.9.2">
+         <artifact name="junit-platform-reporting-1.9.2.jar">
+            <sha256 value="d6788db1c941c1247e07d8104f57c3f06175cadfd43060a792493fe9195671db" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-reporting-1.9.2.module">
+            <sha256 value="8cf90e7ae96f087e2e315c626253c18377c654bccce73c99c1dc43805a5c88ec" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-reporting-1.9.2.pom">
+            <sha256 value="e77c33e7ffbda399fcfc19b6c2f20d7c0df9f549261ca2bb25c86323b94cd7ca" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-runner" version="1.9.2">
+         <artifact name="junit-platform-runner-1.9.2.jar">
+            <sha256 value="86333993a1c4b6a9f33e66e20124dccf6d6723eb8a7f7542ad3ab03f63a0f7e5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-runner-1.9.2.module">
+            <sha256 value="ae4f6d606da577632f6103463b6256e61ef48ba13e3c11a81d150798fe05f2a7" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-runner-1.9.2.pom">
+            <sha256 value="94408484f54f7afb7d932b5b56d6e4cab5602e6de1d5799f32f960f344cfd990" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-suite-api" version="1.9.2">
+         <artifact name="junit-platform-suite-api-1.9.2.jar">
+            <sha256 value="25858bb298a002a2ad45a89786b7662b2f87e724e7a6142ad15d3737ffd89ef5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-suite-api-1.9.2.module">
+            <sha256 value="4a1090acb606067875f554d407d0bdb89f14e067201e843228a73b7779654cf5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-suite-api-1.9.2.pom">
+            <sha256 value="4949e85dd195491da87ed90a597560f34b8cd636c744c28e8de37cd2f20b703d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-suite-commons" version="1.9.2">
+         <artifact name="junit-platform-suite-commons-1.9.2.jar">
+            <sha256 value="3f941564d283bf9716b7ddac7836defe288d90b030c730dedaa38f7c7fb032a5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-suite-commons-1.9.2.module">
+            <sha256 value="c152fa1dfc00388f87b93b277c2ba7828ccaa8716ab2ae55cd2af3ea66722568" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-suite-commons-1.9.2.pom">
+            <sha256 value="e3174f386a6184762e9ece4e4c9c2d06626f7147a391e64ba8ccadf40ed148e9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.vintage" name="junit-vintage-engine" version="5.5.2">
+         <artifact name="junit-vintage-engine-5.5.2.jar">
+            <sha256 value="350c19f11a1112c0f0cae7701f7e2cbbd2247d42460da096fa515a25b4a9754d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-vintage-engine-5.5.2.pom">
+            <sha256 value="7aac894933943af601fcde32e34a9825732e204d09d48b2b3b5cb086dc736b8d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.vintage" name="junit-vintage-engine" version="5.9.2">
+         <artifact name="junit-vintage-engine-5.9.2.jar">
+            <sha256 value="41e16dd32c8f462bbc032b2b79f23944191b32ec398d05858badb5dabffd0612" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-vintage-engine-5.9.2.module">
+            <sha256 value="8cccfddd645d0ce77216678984eb6a12bb9725093449580e7a92314c8c63d2a4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-vintage-engine-5.9.2.pom">
+            <sha256 value="9f44e26b3c44412657363879f18b1c641417ea7ac29bae8ee727e2f20db0f429" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jupnp" name="jupnp" version="2.7.0">
+         <artifact name="jupnp-2.7.0.pom">
+            <sha256 value="d5faaa5a0ef8eee0606781c36e65d2e5ce97af2b4d87d06c84b01b6e17992f9b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jupnp" name="org.jupnp" version="2.7.0">
+         <artifact name="org.jupnp-2.7.0.jar">
+            <sha256 value="811aab123e8e2cf5ccbc1223be3c34eb072c78fca87cff983eaa561489d33438" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.jupnp-2.7.0.pom">
+            <sha256 value="a1cff7e6c0dd52838f9728cf6a479df30425784d321e7787ff6a23cd847ebb64" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jupnp" name="org.jupnp.support" version="2.7.0">
+         <artifact name="org.jupnp.support-2.7.0.jar">
+            <sha256 value="525d98301f4662da206b5fcced90951225824464327990a0f1e7a7f7c95cbc8d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="org.jupnp.support-2.7.0.pom">
+            <sha256 value="8f3cef51d094ea0f2354d998b0ddff84657c4bb9607210421366f3f3a45e6359" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.jupnp.pom" name="bundles" version="2.7.0">
+         <artifact name="bundles-2.7.0.pom">
+            <sha256 value="f4df34da3a4367a6ead4327213a67f17fba1b394b4e2411ba1131d1e284261a5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.mockito" name="mockito-bom" version="4.11.0">
+         <artifact name="mockito-bom-4.11.0.pom">
+            <sha256 value="d8531a746c988f7f68ed5f188cdea945006aea993ec5df9e524e0d27d61491da" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.mockito" name="mockito-core" version="4.11.0">
+         <artifact name="mockito-core-4.11.0.jar">
+            <sha256 value="4b909690cab288c761eb94c0bf0e814496cf3921d8affac84cd87774530351e5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="mockito-core-4.11.0.pom">
+            <sha256 value="2bc2e3c8c8b313fdac231f23822225b07831dc899d067072f49d5f8ae37e739a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.mockito" name="mockito-junit-jupiter" version="4.11.0">
+         <artifact name="mockito-junit-jupiter-4.11.0.jar">
+            <sha256 value="f4b3694f60fccc7b520d8aea9b6c827d8e9949b652cad09fce10b546bf3ac537" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="mockito-junit-jupiter-4.11.0.pom">
+            <sha256 value="b724ad13e3e450cb022672fe5ca6f1d38d5d7485246a3ff3d278edf9321e3417" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.objenesis" name="objenesis" version="3.3">
+         <artifact name="objenesis-3.3.jar">
+            <sha256 value="02dfd0b0439a5591e35b708ed2f5474eb0948f53abf74637e959b8e4ef69bfeb" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="objenesis-3.3.pom">
+            <sha256 value="ba0c40da2669a048b6e24ef7066a471f0fbcbfcc509e6a3e856ca4ddfa614ad3" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.objenesis" name="objenesis-parent" version="3.3">
+         <artifact name="objenesis-parent-3.3.pom">
+            <sha256 value="305c384aa2f1e1c7fe53a96da41c3ec35243b97d428d24a8f779818cc10be4ff" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.openjdk.jmh" name="jmh-core" version="1.36">
+         <artifact name="jmh-core-1.36.jar">
+            <sha256 value="f90974e37d0da8886b5c05e6e3e7e20556900d747c5a41c1023b47c3301ea73c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jmh-core-1.36.pom">
+            <sha256 value="981234265ac041f166b17c5adc6b1d459e894cabffeaf6b09c0074f0f40382e4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.openjdk.jmh" name="jmh-generator-annprocess" version="1.36">
+         <artifact name="jmh-generator-annprocess-1.36.jar">
+            <sha256 value="c2a88cf8be1eb0870732a7b2e669972efc7f33a145998f568096137f16b20d79" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jmh-generator-annprocess-1.36.pom">
+            <sha256 value="33a3c5d42ec2fb81a1a65101a30bd65a988c672b8fd28b7eb1d9b10810aa2191" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.openjdk.jmh" name="jmh-generator-asm" version="1.36">
+         <artifact name="jmh-generator-asm-1.36.jar">
+            <sha256 value="7460b11b823dee74b3e19617d35d5911b01245303d6e31c30f83417cfc2f54b5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jmh-generator-asm-1.36.pom">
+            <sha256 value="57bbbe878394f8b3fc1b80c41161dd488b42c0d7b3d70a5e474f4271b1ea3a49" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.openjdk.jmh" name="jmh-generator-bytecode" version="1.36">
+         <artifact name="jmh-generator-bytecode-1.36.jar">
+            <sha256 value="3376542f8950bcd706c516ce0620d1df822309e7092b8f9338917283181d585d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jmh-generator-bytecode-1.36.pom">
+            <sha256 value="5110011d25fb9466b2f009bff7d7ec0a62e8a7abaf06899bfb6b6305b04e2944" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.openjdk.jmh" name="jmh-generator-reflection" version="1.36">
+         <artifact name="jmh-generator-reflection-1.36.jar">
+            <sha256 value="a9c72760e12c199e2a2c28f1a126ebf0cc5b51c0b58d46472596fc32f7f92534" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jmh-generator-reflection-1.36.pom">
+            <sha256 value="9ac088332ca9d14713089939e73cda1e7ff443c7c8c77bac885b08a3b7875146" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.openjdk.jmh" name="jmh-parent" version="1.36">
+         <artifact name="jmh-parent-1.36.pom">
+            <sha256 value="3b63ce6e8fefacb320376e05e9fbb3bae86a889239008759189a0b0d5ca5c5d6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.openjdk.jol" name="jol-core" version="0.17">
+         <artifact name="jol-core-0.17.jar">
+            <sha256 value="bd73d9ad265d8478ccde06130200877f3a4f0a6e2d44e7fb8cbb2e6f4104cbdc" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jol-core-0.17.pom">
+            <sha256 value="1abac2bcdd59c65bde95aa254bfc7da2e030080a6ace0a9deeb1a396bd38ecfe" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.openjdk.jol" name="jol-parent" version="0.17">
+         <artifact name="jol-parent-0.17.pom">
+            <sha256 value="e13ef86564da581de9383f9d4d1bf8c132b7c8689713308fc9f3c3e5e2e786c0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.opentest4j" name="opentest4j" version="1.2.0">
+         <artifact name="opentest4j-1.2.0.jar">
+            <sha256 value="58812de60898d976fb81ef3b62da05c6604c18fd4a249f5044282479fc286af2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="opentest4j-1.2.0.pom">
+            <sha256 value="a96e671816c1ff8803bdec74c9241f025bdfb277da5d2b4ee02266405936f994" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2" name="ow2" version="1.3">
+         <artifact name="ow2-1.3.pom">
+            <sha256 value="51215c67d2c068d8b7d2f6f80f51372a098075deccc448d4bdd7b987ba8328fb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2" name="ow2" version="1.5">
+         <artifact name="ow2-1.5.pom">
+            <sha256 value="0f8a1b116e760b8fe6389c51b84e4b07a70fc11082d4f936e453b583dd50b43b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2" name="ow2" version="1.5.1">
+         <artifact name="ow2-1.5.1.pom">
+            <sha256 value="321ddbb7ee6fe4f53dea6b4cd6db74154d6bfa42391c1f763b361b9f485acf05" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm" version="5.0.3">
+         <artifact name="asm-5.0.3.jar">
+            <sha256 value="71c4f78e437b8fdcd9cc0dfd2abea8c089eb677005a6a5cff320206cc52b46cc" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="asm-5.0.3.pom">
+            <sha256 value="7d34653ffe62be7714d2f1969660a17df9ec1b19d8250c4f03db1123c82ba6a0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm" version="9.0">
+         <artifact name="asm-9.0.jar">
+            <sha256 value="0df97574914aee92fd349d0cb4e00f3345d45b2c239e0bb50f0a90ead47888e0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="asm-9.0.module">
+            <sha256 value="8af81096ed3affa39a4729fc900a55b663894911d67c4d4bef0ea424393dd3f9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm" version="9.1">
+         <artifact name="asm-9.1.jar">
+            <sha256 value="cda4de455fab48ff0bcb7c48b4639447d4de859a7afc30a094a986f0936beba2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="asm-9.1.pom">
+            <sha256 value="c683a90dd68f2b1788cbdfc4647ea9405ef5925b371c199f8fd39d44d3cede8d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm" version="9.2">
+         <artifact name="asm-9.2.jar">
+            <sha256 value="b9d4fe4d71938df38839f0eca42aaaa64cf8b313d678da036f0cb3ca199b47f5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="asm-9.2.pom">
+            <sha256 value="dfb12a1b224bf01be1fd604020466f894241bcb645dcce395edd8cd6f8a50df4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm" version="9.4">
+         <artifact name="asm-9.4.jar">
+            <sha256 value="39d0e2b3dc45af65a09b097945750a94a126e052e124f93468443a1d0e15f381" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="asm-9.4.pom">
+            <sha256 value="483751e48fb2d1f43c61ad3ab00ffa466edc0333d8fc2fdb5a26e95d32982394" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm-analysis" version="5.0.3">
+         <artifact name="asm-analysis-5.0.3.jar">
+            <sha256 value="e8fa2a63462c96557dcd36c25525e1264b77366ff851cf0b94eb7592b290849d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="asm-analysis-5.0.3.pom">
+            <sha256 value="9ffc02a1bc3d846293ad9f889db9f42d0920e953acc4c4825726ff031405a7d0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm-analysis" version="9.2">
+         <artifact name="asm-analysis-9.2.jar">
+            <sha256 value="878fbe521731c072d14d2d65b983b1beae6ad06fda0007b6a8bae81f73f433c4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="asm-analysis-9.2.pom">
+            <sha256 value="773cc1a2bfc14c6c4a979c51a075c0234a0bf694fc3abe4facf454f37a145f1b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm-commons" version="5.0.3">
+         <artifact name="asm-commons-5.0.3.jar">
+            <sha256 value="18c1e092230233c9d29e46f21943d769bdb48130cc279e4b0e663f423948c2da" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="asm-commons-5.0.3.pom">
+            <sha256 value="e87ea4823ecf2dd856901da359270be904236be59c27e2781eb8d78c97e45b2a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm-commons" version="9.2">
+         <artifact name="asm-commons-9.2.jar">
+            <sha256 value="be4ce53138a238bb522cd781cf91f3ba5ce2f6ca93ec62d46a162a127225e0a6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="asm-commons-9.2.pom">
+            <sha256 value="02824e839f2a2f0e72959fdd30b4897240f05afc43de42d7ba0b18437601c070" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm-parent" version="5.0.3">
+         <artifact name="asm-parent-5.0.3.pom">
+            <sha256 value="c2edabf4128a534df4b8b4b0b9b562e94f242ba95ac24dc61485432b8a188e32" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm-tree" version="5.0.3">
+         <artifact name="asm-tree-5.0.3.jar">
+            <sha256 value="347a7a9400f9964e87c91d3980e48eebdc8d024bc3b36f7f22189c662853a51c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="asm-tree-5.0.3.pom">
+            <sha256 value="65819ca7c5a218ff49f8ebe72f3b39219c81f137d017acc1aec15b1054cf5236" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm-tree" version="9.2">
+         <artifact name="asm-tree-9.2.jar">
+            <sha256 value="aabf9bd23091a4ebfc109c1f3ee7cf3e4b89f6ba2d3f51c5243f16b3cffae011" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="asm-tree-9.2.pom">
+            <sha256 value="f61f3ebea5520ddf19f452b03c426c7231bdd8a81d7ac28765cb5271225ac378" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm-util" version="5.0.3">
+         <artifact name="asm-util-5.0.3.jar">
+            <sha256 value="2768edbfa2681b5077f08151de586a6d66b916703cda3ab297e58b41ae8f2362" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="asm-util-5.0.3.pom">
+            <sha256 value="5ae20e8fdf549b9cede090834725f6454a2cac6f51901307eb4526177e4e3755" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.ow2.asm" name="asm-util" version="9.2">
+         <artifact name="asm-util-9.2.jar">
+            <sha256 value="ff5b3cd331ae8a9a804768280da98f50f424fef23dd3c788bb320e08c94ee598" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="asm-util-9.2.pom">
+            <sha256 value="ddd06913f147d70ae68e7a6e4356a55b33f14dde6162dbff2bd0e289581f1ad2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.owasp.encoder" name="encoder" version="1.2.3">
+         <artifact name="encoder-1.2.3.jar">
+            <sha256 value="b09e2cd5c36a7127e091df9be628278b1166b40bc08b9de8196ccddb0cccd67f" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="encoder-1.2.3.pom">
+            <sha256 value="b963a3a2a7414fcd17e2826f60017023d2937e50793104db96d6a749d6a2f424" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.owasp.encoder" name="encoder-parent" version="1.2.3">
+         <artifact name="encoder-parent-1.2.3.pom">
+            <sha256 value="732f62378e11feb11121d37dcb284ddf835938d617a13c34851ca2098e4d7866" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.pcollections" name="pcollections" version="3.1.4">
+         <artifact name="pcollections-3.1.4.jar">
+            <sha256 value="34f579ba075c8da2c8a0fedd0f04e21eac2fb6c660d90d0fabb573e8b4dc6918" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="pcollections-3.1.4.pom">
+            <sha256 value="ba641a6c82bed22adad822263bdeb49d2d7f884d4d420da15c03c424c6a38c1f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.reactivestreams" name="reactive-streams" version="1.0.2">
+         <artifact name="reactive-streams-1.0.2.jar">
+            <sha256 value="cc09ab0b140e0d0496c2165d4b32ce24f4d6446c0a26c5dc77b06bdf99ee8fae" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="reactive-streams-1.0.2.pom">
+            <sha256 value="5b626a99e5734ba8d0c0c8c3fc6258afa0624f4ce61ae1192247d03c57463ded" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.reactivestreams" name="reactive-streams" version="1.0.3">
+         <artifact name="reactive-streams-1.0.3.jar">
+            <sha256 value="1dee0481072d19c929b623e155e14d2f6085dc011529a0a0dbefc84cf571d865" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="reactive-streams-1.0.3.pom">
+            <sha256 value="cced467175f4257833f6cb07510ff97b3c75a06e1a58d882a39d79853d51c602" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.rnorth.duct-tape" name="duct-tape" version="1.0.8">
+         <artifact name="duct-tape-1.0.8.jar">
+            <sha256 value="31cef12ddec979d1f86d7cf708c41a17da523d05c685fd6642e9d0b2addb7240" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="duct-tape-1.0.8.pom">
+            <sha256 value="2636f66debe6e12437632f23a67b9bc961b03633009e52527a3bbc871f4069b4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.rocksdb" name="rocksdbjni" version="8.0.0">
+         <artifact name="rocksdbjni-8.0.0.jar">
+            <sha256 value="b78db609447110063f7c0036d236e05b8107513660d2750df43abbb3dbb43c5e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="rocksdbjni-8.0.0.pom">
+            <sha256 value="ccbef06f66ed35a25563355eb25b825357372fa119b3337dabca62e5d2e796e8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.slf4j" name="slf4j-api" version="1.7.30">
+         <artifact name="slf4j-api-1.7.30.jar">
+            <sha256 value="cdba07964d1bb40a0761485c6b1e8c2f8fd9eb1d19c53928ac0d7f9510105c57" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="slf4j-api-1.7.30.pom">
+            <sha256 value="7e0747751e9b67e19dcb5206f04ea22cc03d250c422426402eadd03513f2c314" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.slf4j" name="slf4j-api" version="2.0.7">
+         <artifact name="slf4j-api-2.0.7.jar">
+            <sha256 value="5d6298b93a1905c32cda6478808ac14c2d4a47e91535e53c41f7feeb85d946f4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="slf4j-api-2.0.7.pom">
+            <sha256 value="2d403ccf0e0a02d5c1a8667b0e2a33c8dfc6038ab287b9671dd681c205267981" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.slf4j" name="slf4j-nop" version="2.0.7">
+         <artifact name="slf4j-nop-2.0.7.jar">
+            <sha256 value="5411a0d44e2725182271230b9fb4c2c4062c1b5fa7df2d83e00c0302733db173" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="slf4j-nop-2.0.7.pom">
+            <sha256 value="d159f486dcc6860cbb54ec8c40b4539a173aad8fc65d35f1fb006e2152b1f4f0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.slf4j" name="slf4j-parent" version="1.7.30">
+         <artifact name="slf4j-parent-1.7.30.pom">
+            <sha256 value="11647956e48a0c5bfb3ac33f6da7e83f341002b6857efd335a505b687be34b75" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.slf4j" name="slf4j-parent" version="2.0.7">
+         <artifact name="slf4j-parent-2.0.7.pom">
+            <sha256 value="c182bb36cd3af1c93c1603cdfefe7889157db30ba8b584f4a44535fcd22e45e7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.sonarqube" name="org.sonarqube.gradle.plugin" version="3.4.0.2513">
+         <artifact name="org.sonarqube.gradle.plugin-3.4.0.2513.pom">
+            <sha256 value="df74d25d61fd80da10275ce10677358baccd4f05075e8f93edda9ca31afc2546" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.sonarsource.parent" name="parent" version="59.0.29">
+         <artifact name="parent-59.0.29.pom">
+            <sha256 value="7d2dc7aec9f250ede1c8cdc4cdb563b2ed6c49e209b70024f9f62822d876952a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.sonarsource.scanner.api" name="sonar-scanner-api" version="2.16.2.588">
+         <artifact name="sonar-scanner-api-2.16.2.588.jar">
+            <sha256 value="4df4526499760242c2d5d76ee8bc38326b4549c344e034e12bc392d2b8a618ac" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="sonar-scanner-api-2.16.2.588.pom">
+            <sha256 value="d8c866f087da23f3fa729522cb32864d54d366dd6ce6b400abd657af5bba9010" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.sonarsource.scanner.api" name="sonar-scanner-api-parent" version="2.16.2.588">
+         <artifact name="sonar-scanner-api-parent-2.16.2.588.pom">
+            <sha256 value="c532bb8678ecd5c5e45da5d00211eb67541e9a5ea465b67ba91307b0390b137a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.sonarsource.scanner.gradle" name="sonarqube-gradle-plugin" version="3.4.0.2513">
+         <artifact name="sonarqube-gradle-plugin-3.4.0.2513.jar">
+            <sha256 value="7574088c0b2c260c0cd07952cee88d1931490e79d3253849170b9a0538cdf910" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="sonarqube-gradle-plugin-3.4.0.2513.pom">
+            <sha256 value="9673b20fe9f96d83c3cac425b396b703a99113eb8765d2682ad716aa1e42b668" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.sonatype.forge" name="forge-parent" version="4">
+         <artifact name="forge-parent-4.pom">
+            <sha256 value="1838d132479005b4b7459b798e9d9915515090c288082fdcd86db0b10983a24c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.sonatype.oss" name="oss-parent" version="5">
+         <artifact name="oss-parent-5.pom">
+            <sha256 value="1678d4120a585d8a630131aeec4c524d928398583b7eab616ee7d5a87f520d3d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.sonatype.oss" name="oss-parent" version="7">
+         <artifact name="oss-parent-7.pom">
+            <sha256 value="b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.sonatype.oss" name="oss-parent" version="9">
+         <artifact name="oss-parent-9.pom">
+            <sha256 value="fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.sonatype.plexus" name="plexus-cipher" version="1.4">
+         <artifact name="plexus-cipher-1.4.jar">
+            <sha256 value="5a15fdba22669e0fdd06e10dcce6320879e1f7398fbc910cd0677b50672a78c4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="plexus-cipher-1.4.pom">
+            <sha256 value="a63a2e23988cca7fac6c93886d6f0506fd26d88d7e8cc0cb89b9c6e0d6c994ad" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.sonatype.plexus" name="plexus-sec-dispatcher" version="1.3">
+         <artifact name="plexus-sec-dispatcher-1.3.jar">
+            <sha256 value="3b0559bb8432f28937efe6ca193ef54a8506d0075d73fd7406b9b116c6a11063" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="plexus-sec-dispatcher-1.3.pom">
+            <sha256 value="d5e650c50ef6958c028ed024b59af04cf3d38e1453a77d542b6b484bc0f4ca0b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.sonatype.spice" name="spice-parent" version="12">
+         <artifact name="spice-parent-12.pom">
+            <sha256 value="21a19b26dbe5c38ddb5114cf4eadbf5ccb411bc6b128fdd5949b1ccb12f3683e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.springframework" name="spring-asm" version="3.1.3.RELEASE">
+         <artifact name="spring-asm-3.1.3.RELEASE.jar">
+            <sha256 value="cdaf1d07040e751133a24f997aca7d98eacbfe67e1b2875dce8ca73825278130" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="spring-asm-3.1.3.RELEASE.pom">
+            <sha256 value="7fb6fbb987440c48c673db15b08770a9c2d6c92052044219979cf48f466f7123" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.springframework" name="spring-core" version="3.1.3.RELEASE">
+         <artifact name="spring-core-3.1.3.RELEASE.jar">
+            <sha256 value="014a7b21db680fd8867e026b18c3bf89d304dec5b21090a8b6a7b3cb5cfc77d2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="spring-core-3.1.3.RELEASE.pom">
+            <sha256 value="f31a8b6f59b6a0180e38c9c129ba0607bae7a0d4a10b95375770c814ab4cc753" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.springframework" name="spring-framework-bom" version="5.3.24">
+         <artifact name="spring-framework-bom-5.3.24.module">
+            <sha256 value="1996e1f617cb03fa76ea11850fe2a1e20b0e30a1046ba6d5db3bdbbf44113fce" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="spring-framework-bom-5.3.24.pom">
+            <sha256 value="535213566bbbefe2636a0d4e8dd1a73ade612e2430c8ffd310dcc2a3b3b9ba41" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.springframework" name="spring-parent" version="3.1.3.RELEASE">
+         <artifact name="spring-parent-3.1.3.RELEASE.pom">
+            <sha256 value="64e9110118f82a142759a316d09d3d8d8d717d5d95079d7f6b388ee479fa782f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.springframework.security" name="spring-security-crypto" version="6.0.2">
+         <artifact name="spring-security-crypto-6.0.2.jar">
+            <sha256 value="bb46fa8bb8227cc55edfd7144be425ee4b701f174b114029cc61e7019130df00" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="spring-security-crypto-6.0.2.module">
+            <sha256 value="b1ce5d73f3b776b9a1c745d3202622ec628ebce9bd0243f661373b38c50f09ef" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="spring-security-crypto-6.0.2.pom">
+            <sha256 value="7d157dab2ca03554f87ea9db24a6e32db857e8a270cb88aefc2bde1831c5da1e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.testcontainers" name="testcontainers" version="1.17.6">
+         <artifact name="testcontainers-1.17.6.jar">
+            <sha256 value="59f107d35fad7c138f08bc0e9dd37b86ff027d0ae65f1f2d6102e05158edde0c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="testcontainers-1.17.6.pom">
+            <sha256 value="458365da5620f9a2d156d85d760e03cebf17209409e56e0854310654eca8bbc1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.testcontainers" name="testcontainers-bom" version="1.16.1">
+         <artifact name="testcontainers-bom-1.16.1.pom">
+            <sha256 value="5061ba84c98536e5a6b4ce280fbcecb00e335f3b04c5d484629162fcb4624778" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.web3j" name="abi" version="4.9.2">
+         <artifact name="abi-4.9.2.jar">
+            <sha256 value="ae898527b508d0c0065dd7e1231d182b52b2aeb72e80333bd1f2acfa17866b2c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="abi-4.9.2.pom">
+            <sha256 value="01d2cef69ec3d3be16a8984e956a041a29962b6b356fe1fd2f62fdf2a90bf73f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.web3j" name="abi" version="4.9.7">
+         <artifact name="abi-4.9.7.jar">
+            <sha256 value="c4ed8029ad8f0ca2b6515d9a61ea3204077c92825b1e5d3ccee5828b7b6b8cf1" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="abi-4.9.7.pom">
+            <sha256 value="cf61279235350866b7a7f9b7b1b3c895c16ce66c0c853fdd2241ad5ae11d629b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.web3j" name="besu" version="4.9.7">
+         <artifact name="besu-4.9.7.jar">
+            <sha256 value="4c131392825a2882ac4adcbbbb7aae00c949816a300be36dda19bee5c33f5918" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="besu-4.9.7.pom">
+            <sha256 value="7f2afe031460da2840e120baf59cfeabcd50609d81db0434083f71370e0911e6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.web3j" name="codegen" version="4.9.2">
+         <artifact name="codegen-4.9.2.jar">
+            <sha256 value="e891241049e1dabe3de20da074047a29cd021445236e429ad3260b20b277cb08" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="codegen-4.9.2.pom">
+            <sha256 value="536d3e3d74868d637b1f385e25ff9114c3abe4bcb530f9cb12777837eaece307" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.web3j" name="core" version="4.9.2">
+         <artifact name="core-4.9.2.jar">
+            <sha256 value="0458afd84d8f7a274d1c66cc806bed0785d1f5adcd61d2ecc902ed2d3a66863d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="core-4.9.2.pom">
+            <sha256 value="8dfe1087641827dc3c8c292b3080e4d4ba319c64e914a43b6e4cf2b24ed908a9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.web3j" name="core" version="4.9.4">
+         <artifact name="core-4.9.4.jar">
+            <sha256 value="2040ef9cc5d6eec32a994d16e8dbeb2befab52905664a9b0c24e083fd540a45d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="core-4.9.4.pom">
+            <sha256 value="f14d85d2468a68755b8083cbbd858a23d527ce43e3efc11409539242bcfaf326" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.web3j" name="core" version="4.9.7">
+         <artifact name="core-4.9.7.jar">
+            <sha256 value="24c6174c7e7f7cfc37043682897f064b0228552a22b4662a6805a16d4c0ffb9d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="core-4.9.7.pom">
+            <sha256 value="ffbff8cc71d5838e932b7a9e3573a77754afa63f77bc2c48a345cb6b1f3e3a67" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.web3j" name="crypto" version="4.9.2">
+         <artifact name="crypto-4.9.2.jar">
+            <sha256 value="7a3dc66afeb59f1ae8f7aaa360c796cd51ea5d1f176f37644a08ec65cc6fc411" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="crypto-4.9.2.pom">
+            <sha256 value="2a6c86144f5d2746009ffc1ab58eef436f68562880e431867f2c28625d145313" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.web3j" name="crypto" version="4.9.7">
+         <artifact name="crypto-4.9.7.jar">
+            <sha256 value="cce5555509829f800eed790e1f3dd6caf9fab13d99e7e78c4bed04bef3291510" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="crypto-4.9.7.pom">
+            <sha256 value="15ba3e75d3734d7f54417dfd06ae01b834f747915452f8fc5e3aa5a12fd5f2b8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.web3j" name="eea" version="4.9.7">
+         <artifact name="eea-4.9.7.jar">
+            <sha256 value="0688369bb736ca769f40f8f84abcb2a2011d74d9d1772f9759bfabde14ecc0e4" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="eea-4.9.7.pom">
+            <sha256 value="7da10b9f72466ef04fb00d4d54b352bc5aa5a38481c0ad9c320cf46384e62370" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.web3j" name="org.web3j.gradle.plugin" version="4.9.2">
+         <artifact name="org.web3j.gradle.plugin-4.9.2.pom">
+            <sha256 value="b0a5e3f48b2aaa14607306de15823ca222c25b12d528a39fe2b81ba8cd400da1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.web3j" name="rlp" version="4.9.2">
+         <artifact name="rlp-4.9.2.jar">
+            <sha256 value="79ec9d5b824a32a25841ac65767c93e5758cb84676d8113ac8e9e679d4dd8403" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="rlp-4.9.2.pom">
+            <sha256 value="83905241b86e5e7b5f761c5b36b48d1bc43208ab47f2db543bc6a1f1389ba632" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.web3j" name="rlp" version="4.9.7">
+         <artifact name="rlp-4.9.7.jar">
+            <sha256 value="1853dde72328a261abbf75c597cec7b5cae53513362d5e4a59efc9acd14844ef" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="rlp-4.9.7.pom">
+            <sha256 value="cbcbc61605a3e66ee2a4e594e73564a8fca02b1c7ce666e2e70887fa646286dc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.web3j" name="tuples" version="4.9.2">
+         <artifact name="tuples-4.9.2.jar">
+            <sha256 value="566f47a06d6aefc1c5c1cdb5d61f86ebaacc5ec0000d46040e75562d297dcf0e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuples-4.9.2.pom">
+            <sha256 value="73b633df0caa5d221b848dffaa0c94a5f9b8c57d9180876f643703cf906d82ef" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.web3j" name="tuples" version="4.9.4">
+         <artifact name="tuples-4.9.4.jar">
+            <sha256 value="043d6ac63a4511e799a4ff394b5ebe69d05a67fd1bdfcd5cc0a1ac105bd335e6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuples-4.9.4.pom">
+            <sha256 value="7de1244aa8ff4957c8214c9485ed731eef283753212d2378611b02dac9a50a23" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.web3j" name="tuples" version="4.9.7">
+         <artifact name="tuples-4.9.7.jar">
+            <sha256 value="e6b97c115f69d1ff5738fd73cfc281f1aee608871157040a77c643deef24e919" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tuples-4.9.7.pom">
+            <sha256 value="08c821aba0fd70f0d9a782388a4bace560ef847cdffbd7fbf7e5ea1f0e03e162" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.web3j" name="utils" version="4.9.2">
+         <artifact name="utils-4.9.2.jar">
+            <sha256 value="2892befe4c2116985e1229c893166a2638824154060951b956db5e3d7453f6c9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="utils-4.9.2.pom">
+            <sha256 value="05228513afa72b8f60cff78d6ce3bf74802d70bc8196d78c8baa452b0e0857ad" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.web3j" name="utils" version="4.9.7">
+         <artifact name="utils-4.9.7.jar">
+            <sha256 value="1feaaa053589df3e0d41a10f2aa110c1610f756115566800566e0ba4b53209eb" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="utils-4.9.7.pom">
+            <sha256 value="bd9967ccd9237ba2ba11ce52f7aee9c942654f1890f6dd93f8950deb53fd61a6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.web3j" name="web3j-gradle-plugin" version="4.9.2">
+         <artifact name="web3j-gradle-plugin-4.9.2.jar">
+            <sha256 value="3331088ab478f32fcacde09c25eead72bbb1dc6e167b03b1410dd4dce2d22e3b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="web3j-gradle-plugin-4.9.2.pom">
+            <sha256 value="069b5ae1729935e2e604f9cc15bd1a731467b7dd38e5b52da4561790816c5bef" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.web3j" name="web3j-sokt" version="0.2.2">
+         <artifact name="web3j-sokt-0.2.2.jar">
+            <sha256 value="df78cb2cabcb5861872f841832d14a2cf815b54ddc3a565aecf0bad64f19df49" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="web3j-sokt-0.2.2.pom">
+            <sha256 value="14607f1452f863c5c47d377af54508ea97f7d31fe316f5f7500a502dd75395f6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.web3j.solidity" name="org.web3j.solidity.gradle.plugin" version="0.3.5">
+         <artifact name="org.web3j.solidity.gradle.plugin-0.3.5.pom">
+            <sha256 value="a045d95f10f40424a1ec0020c85f9f90f73badae8172ce00b14677fa2a6acd90" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.web3j.solidity" name="solidity-gradle-plugin" version="0.3.5">
+         <artifact name="solidity-gradle-plugin-0.3.5.jar">
+            <sha256 value="fbab643761c1c44832823307cffd99b1bd11d6a2427af0a0d8fa2de0e8a94b59" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="solidity-gradle-plugin-0.3.5.pom">
+            <sha256 value="2e6ee0b7bb7d770e50371faae75aa0ae88fcef09bc3ecf7fbd8ee5b5d17fe788" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.xerial.snappy" name="snappy-java" version="1.1.9.1">
+         <artifact name="snappy-java-1.1.9.1.jar">
+            <sha256 value="b696bc9105d1e869de3e5b2bb165bd0a482bf08415917e25d29c7461e5b1496e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="snappy-java-1.1.9.1.pom">
+            <sha256 value="f19d658a98e1a48b6453525992dd9bf3a3bac8bb03c18b7a1cd03a1219462f64" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.xmlunit" name="xmlunit-core" version="2.9.0">
+         <artifact name="xmlunit-core-2.9.0.jar">
+            <sha256 value="1688057e76e3084cd682eae4075a3d9ad9a3ec6e34b36146cca80445dbe58c2c" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="xmlunit-core-2.9.0.pom">
+            <sha256 value="4047d3a0b2b96b6ac93a8a714a80212c1b720baa9173dc5a189bd991eeacc80e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.xmlunit" name="xmlunit-legacy" version="2.9.0">
+         <artifact name="xmlunit-legacy-2.9.0.jar">
+            <sha256 value="9fbd3d7b23fcbfdceee09124463efdc8463551a50d88efe1047e15b2f1e4a793" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="xmlunit-legacy-2.9.0.pom">
+            <sha256 value="9785a899fe0ac7fa4aae47830136ae5daa36eddcbc8b0699c702dd0a385911ee" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.xmlunit" name="xmlunit-parent" version="2.9.0">
+         <artifact name="xmlunit-parent-2.9.0.pom">
+            <sha256 value="63fac6ee766e7713e1e1fa458c1049e1d00862babe2623d21414222b139a80ec" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.xmlunit" name="xmlunit-placeholders" version="2.9.0">
+         <artifact name="xmlunit-placeholders-2.9.0.jar">
+            <sha256 value="dace7674a798c91c4e79b98b2672f5f6165253bd362029ad7c44dcd642268983" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="xmlunit-placeholders-2.9.0.pom">
+            <sha256 value="1f3cfbe0926009fc2607e4794a4236b116658e8918b92b028f6f262706e73204" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.yaml" name="snakeyaml" version="2.0">
+         <artifact name="snakeyaml-2.0.jar">
+            <sha256 value="880c9d896e4b74a06c549c15ca496450165d6909fa15d7e662bee8f6a66d7afa" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="snakeyaml-2.0.pom">
+            <sha256 value="43c761f92b549c8b08fb992080253e49f0a983e544ef0663c1f4f9d68eb52616" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="tech.pegasys" name="jc-kzg-4844" version="0.4.0">
+         <artifact name="jc-kzg-4844-0.4.0.jar">
+            <sha256 value="1d13a463802f39614c26ba7e7fd31023e9498ddbc7adbf41a525316c135a84c5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jc-kzg-4844-0.4.0.module">
+            <sha256 value="169ae39487b50f7e54c2745143bdb78e402c168c93e8390e59b4c641636133c0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="jc-kzg-4844-0.4.0.pom">
+            <sha256 value="1fde825ebaf0147c421c490be110c8eac48bc4069046b0fece185522a9ab0f1d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="tech.pegasys.discovery" name="discovery" version="22.2.0">
+         <artifact name="discovery-22.2.0.jar">
+            <sha256 value="0da2a8b2928aef595e9a637fa3d6595cecf744a2c63e05b815130ed658f80005" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="discovery-22.2.0.module">
+            <sha256 value="2cdd76c6963cf8cb60bf795f539844c7cfadec68706a16379cd748d7eca2fb36" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="discovery-22.2.0.pom">
+            <sha256 value="3756fb29b2d64540b1fc1bf319916cc30bd7757f7ae2729d4c71bd06890ed527" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="xmlpull" name="xmlpull" version="1.1.3.1">
+         <artifact name="xmlpull-1.1.3.1.jar">
+            <sha256 value="34e08ee62116071cbb69c0ed70d15a7a5b208d62798c59f2120bb8929324cb63" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="xmlpull-1.1.3.1.pom">
+            <sha256 value="8f10ffd8df0d3e9819c8cc8402709c6b248bc53a954ef6e45470d9ae3a5735fb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+   </components>
+</verification-metadata>
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
index ccd74f69726..46ebb9c992b 100644
--- a/gradle/versions.gradle
+++ b/gradle/versions.gradle
@@ -15,138 +15,228 @@
 
 dependencyManagement {
   dependencies {
-    dependency 'com.fasterxml.jackson.core:jackson-databind:2.11.0'
-    dependency 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.0'
 
-    dependency 'com.github.tomakehurst:wiremock-jre8:2.26.3'
-    dependency 'com.github.tomakehurst:wiremock-jre8-standalone:2.26.3'
+    dependencySet(group: 'org.antlr', version: '4.10.1') {
+      entry 'antlr4'
+      entry 'antlr4-runtime'
+    }
 
-    dependency 'com.google.auto.service:auto-service:1.0-rc7'
+    dependencySet(group:'com.fasterxml.jackson.core', version:'2.14.2') {
+      entry 'jackson-databind'
+      entry 'jackson-datatype'
+      entry 'jackson-datatype-jdk8'
+    }
 
-    dependency 'com.google.dagger:dagger:2.28'
-    dependency 'com.google.dagger:dagger-compiler:2.28'
+    dependency 'com.github.ben-manes.caffeine:caffeine:3.1.5'
 
-    dependency 'com.google.errorprone:error_prone_annotation:2.4.0'
-    dependency 'com.google.errorprone:error_prone_check_api:2.4.0'
-    dependency 'com.google.errorprone:error_prone_core:2.4.0'
-    dependency 'com.google.errorprone:error_prone_test_helpers:2.4.0'
+    dependencySet(group: 'com.github.tomakehurst', version: '2.35.0') {
+      entry'wiremock-jre8-standalone'
+      entry'wiremock-jre8'
+    }
 
-    dependency 'com.google.guava:guava:29.0-jre'
+    dependency 'com.google.auto.service:auto-service:1.0.1'
 
-    dependency 'com.graphql-java:graphql-java:15.0'
+    dependencySet(group: 'com.google.dagger', version: '2.45') {
+      entry'dagger-compiler'
+      entry'dagger'
+    }
 
-    dependency 'com.splunk.logging:splunk-library-javalogging:1.8.0'
+    dependencySet(group: 'com.google.errorprone', version: '2.18.0') {
+      entry 'error_prone_annotation'
+      entry 'error_prone_check_api'
+      entry 'error_prone_core'
+      entry 'error_prone_test_helpers'
+    }
 
-    dependency 'com.squareup.okhttp3:okhttp:4.7.2'
+    dependency 'com.google.guava:guava:31.1-jre'
 
-    dependency 'commons-codec:commons-codec:1.13'
+    dependency 'com.graphql-java:graphql-java:20.1'
 
-    dependency 'commons-io:commons-io:2.7'
+    dependency 'com.splunk.logging:splunk-library-javalogging:1.11.5'
 
-    dependency 'dnsjava:dnsjava:3.0.2'
+    dependency 'com.squareup.okhttp3:okhttp:4.10.0'
 
-    dependency 'info.picocli:picocli:4.5.0'
+    dependency 'commons-codec:commons-codec:1.15'
 
-    dependency 'io.grpc:grpc-netty:1.33.0'
+    dependency 'commons-io:commons-io:2.11.0'
 
-    dependency 'io.kubernetes:client-java:5.0.0'
+    dependency 'dnsjava:dnsjava:3.5.2'
 
-    dependency 'io.pkts:pkts-core:3.0.7'
+    dependencySet(group: 'info.picocli', version: '4.7.1') {
+      entry 'picocli'
+      entry 'picocli-codegen'
+    }
 
-    dependency group: 'io.opentelemetry.instrumentation.auto', name: 'opentelemetry-javaagent', version: '0.8.0', classifier: 'all'
+    dependencySet(group: 'io.grpc', version: '1.53.0') {
+      entry 'grpc-all'
+      entry 'grpc-core'
+      entry 'grpc-netty'
+      entry 'grpc-stub'
+    }
 
-    dependency 'io.opentelemetry:opentelemetry-api:0.9.1'
-    dependency 'io.opentelemetry:opentelemetry-sdk:0.9.1'
-    dependency 'io.opentelemetry:opentelemetry-exporters-otlp:0.9.1'
-    dependency 'io.opentelemetry:opentelemetry-extension-runtime-metrics:0.9.1'
+    dependency 'io.kubernetes:client-java:18.0.0'
+
+    dependency 'io.netty:netty-all:4.1.90.Final'
+    dependency 'io.netty:netty-tcnative-boringssl-static:2.0.59.Final'
+    dependency group: 'io.netty', name: 'netty-transport-native-epoll', version:'4.1.90.Final', classifier: 'linux-x86_64'
+    dependency group: 'io.netty', name: 'netty-transport-native-kqueue', version:'4.1.90.Final', classifier: 'osx-x86_64'
+    dependency 'io.netty:netty-transport-native-unix-common:4.1.90.Final'
+
+    dependency 'io.opentelemetry:opentelemetry-api:1.24.0'
+    dependency 'io.opentelemetry:opentelemetry-exporter-otlp:1.24.0'
+    dependency 'io.opentelemetry:opentelemetry-extension-trace-propagators:1.24.0'
+    dependency 'io.opentelemetry.proto:opentelemetry-proto:0.19.0-alpha'
+    dependency 'io.opentelemetry:opentelemetry-sdk-metrics:1.24.0'
+    dependency 'io.opentelemetry:opentelemetry-sdk-trace:1.24.0'
+    dependency 'io.opentelemetry:opentelemetry-sdk:1.24.0'
+    dependency 'io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.24.0-alpha'
+    dependency 'io.opentelemetry:opentelemetry-semconv:1.24.0-alpha'
+    dependency 'io.opentelemetry.instrumentation:opentelemetry-okhttp-3.0:1.24.0-alpha'
+
+    dependency 'io.opentracing.contrib:opentracing-okhttp3:3.0.0'
+    dependency 'io.opentracing:opentracing-api:0.33.0'
+    dependency 'io.opentracing:opentracing-util:0.33.0'
+
+    dependency 'io.pkts:pkts-core:3.0.10'
 
     dependency 'io.prometheus:simpleclient:0.9.0'
     dependency 'io.prometheus:simpleclient_common:0.9.0'
     dependency 'io.prometheus:simpleclient_hotspot:0.9.0'
     dependency 'io.prometheus:simpleclient_pushgateway:0.9.0'
+    dependency 'io.prometheus:simpleclient_guava:0.16.0'
+
+    dependency 'io.reactivex.rxjava2:rxjava:2.2.21'
+
+    dependencySet(group: 'io.vertx', version: '4.3.5') {
+      entry 'vertx-auth-jwt'
+      entry 'vertx-codegen'
+      entry 'vertx-core'
+      entry 'vertx-junit5'
+      entry 'vertx-unit'
+      entry 'vertx-web'
+      entry 'vertx-web-client'
+      entry 'vertx-auth-jwt'
+    }
+
+    dependency 'junit:junit:4.13.2'
 
-    dependency 'io.reactivex.rxjava2:rxjava:2.2.19'
+    dependency 'net.java.dev.jna:jna:5.13.0'
 
-    dependency 'io.vertx:vertx-auth-jwt:3.9.1'
-    dependency 'io.vertx:vertx-codegen:3.9.1'
-    dependency 'io.vertx:vertx-core:3.9.1'
-    dependency 'io.vertx:vertx-unit:3.9.1'
-    dependency 'io.vertx:vertx-web:3.9.1'
+    dependency 'org.apache.commons:commons-compress:1.23.0'
+    dependency 'org.apache.commons:commons-lang3:3.12.0'
+    dependency 'org.apache.commons:commons-text:1.10.0'
 
-    dependency 'junit:junit:4.13'
+    dependencySet(group: 'org.apache.logging.log4j', version: '2.20.0') {
+      entry 'log4j-api'
+      entry 'log4j-core'
+      entry 'log4j-jul'
+      entry 'log4j-slf4j2-impl'
+    }
 
-    dependency 'net.consensys:orion:1.6.0'
+    dependencySet(group: 'org.apache.tuweni', version: '2.3.1') {
+      entry 'tuweni-bytes'
+      entry 'tuweni-config'
+      entry 'tuweni-concurrent'
+      entry 'tuweni-crypto'
+      entry 'tuweni-devp2p'
+      entry 'tuweni-dns-discovery'
+      entry 'tuweni-io'
+      entry 'tuweni-net'
+      entry 'tuweni-rlp'
+      entry 'tuweni-toml'
+      entry 'tuweni-units'
+    }
 
-    dependency 'net.java.dev.jna:jna:5.5.0'
+    // commons-net is a transitive dependency of tuweni.
+    // Tuweni 2.3.1 has commons-net:3.8.0 which we force here to 3.9.0
+    // Once tuweni is updated, can remove this line
+    dependency 'commons-net:commons-net:3.9.0'
 
-    dependency 'org.apache.commons:commons-compress:1.20'
-    dependency 'org.apache.commons:commons-text:1.8'
+    dependency 'org.assertj:assertj-core:3.24.2'
 
-    dependency 'org.apache.logging.log4j:log4j-api:2.13.3'
-    dependency 'org.apache.logging.log4j:log4j-core:2.13.3'
-    dependency 'org.apache.logging.log4j:log4j-jul:2.13.3'
-    dependency 'org.apache.logging.log4j:log4j-slf4j-impl:2.13.3'
-    dependency 'org.fusesource.jansi:jansi:1.8'
+    dependency 'org.awaitility:awaitility:4.2.0'
 
-    dependencySet(group: 'org.apache.tuweni', version: '1.3.0') {
-      entry 'bytes'
-      entry 'config'
-      entry 'crypto'
-      entry 'devp2p'
-      entry 'dns-discovery'
-      entry 'io'
-      entry 'net'
-      entry 'rlp'
-      entry 'toml'
-      entry 'units'
+    dependencySet(group: 'org.bouncycastle', version: '1.70') {
+      entry'bcpkix-jdk15on'
+      entry'bcprov-jdk15on'
     }
 
-    dependency 'org.assertj:assertj-core:3.16.1'
+    dependency 'org.fusesource.jansi:jansi:2.4.0'
+    dependency 'org.openjdk.jol:jol-core:0.17'
+    dependency 'tech.pegasys:jc-kzg-4844:0.4.0'
+
+    dependencySet(group: 'org.hyperledger.besu', version: '0.7.1') {
+      entry 'arithmetic'
+      entry 'ipa-multipoint'
+      entry 'bls12-381'
+      entry 'secp256k1'
+      entry 'secp256r1'
+      entry 'blake2bf'
+    }
 
-    dependency 'org.awaitility:awaitility:4.0.3'
+    dependencySet(group: 'org.immutables', version: '2.9.3') {
+      entry 'value-annotations'
+      entry 'value'
+    }
 
-    dependency 'org.bouncycastle:bcpkix-jdk15on:1.65'
-    dependency 'org.bouncycastle:bcprov-jdk15on:1.65.01'
+    dependency 'org.java-websocket:Java-WebSocket:1.5.3'
 
-    dependency 'org.hyperledger.besu:bls12-381:0.3.0'
-    dependency 'org.hyperledger.besu:secp256k1:0.3.0'
+    dependency 'org.jetbrains.kotlin:kotlin-stdlib:1.8.10'
 
-    dependency 'org.java-websocket:Java-WebSocket:1.5.1'
+    dependencySet(group: 'org.junit.jupiter', version: '5.8.2') {
+      entry 'junit-jupiter'
+      entry 'junit-jupiter-api'
+      entry 'junit-jupiter-engine'
+      entry 'junit-jupiter-params'
+    }
 
-    dependency 'org.jetbrains.kotlin:kotlin-stdlib:1.3.20'
+    dependency 'org.junit.platform:junit-platform-runner:1.9.2'
 
-    dependency 'org.jupnp:org.jupnp.support:2.5.2'
-    dependency 'org.jupnp:org.jupnp:2.5.2'
+    dependency 'org.junit.vintage:junit-vintage-engine:5.9.2'
 
-    dependency 'org.mockito:mockito-core:3.3.3'
+    dependencySet(group: 'org.jupnp', version:'2.7.0') {
+      entry 'org.jupnp.support'
+      entry 'org.jupnp'
+    }
 
-    dependency 'org.openjdk.jmh:jmh-core:1.23'
-    dependency 'org.openjdk.jmh:jmh-generator-annprocess:1.23'
+    dependencySet(group: 'org.mockito', version:'4.11.0') {
+      entry 'mockito-core'
+      entry 'mockito-junit-jupiter'
+    }
+
+    dependencySet(group: 'org.openjdk.jmh', version:'1.36') {
+      entry 'jmh-core'
+      entry 'jmh-generator-annprocess'
+    }
 
-    dependency 'org.rocksdb:rocksdbjni:6.8.1'
+    dependency 'org.owasp.encoder:encoder:1.2.3'
 
-    dependency 'org.slf4j:slf4j-log4j12:1.7.26'
+    dependency 'org.rocksdb:rocksdbjni:8.0.0'
 
-    dependency 'org.springframework.security:spring-security-crypto:5.2.3.RELEASE'
+    dependencySet(group: 'org.slf4j', version:'2.0.7') {
+      entry 'slf4j-api'
+      entry 'slf4j-nop'
+    }
 
+    dependency 'org.springframework.security:spring-security-crypto:6.0.2'
     dependency  'org.openquantumsafe:liboqs-java:1.1-SNAPSHOT'
 
-    dependency 'org.web3j:abi:4.5.15'
-    dependency 'org.web3j:besu:4.5.15'
-    dependency 'org.web3j:core:4.5.15'
-    dependency 'org.web3j:crypto:4.5.15'
+    dependency 'org.testcontainers:testcontainers:1.17.6'
 
-    dependency 'org.xerial.snappy:snappy-java:1.1.7.5'
+    dependency 'org.web3j:quorum:4.9.5'
+    dependencySet(group: 'org.web3j', version: '4.9.7') {
+      entry 'abi'
+      entry 'besu'
+      entry 'core'
+      entry 'crypto'
+    }
 
-    dependency 'org.yaml:snakeyaml:1.26'
+    dependency 'org.xerial.snappy:snappy-java:1.1.9.1'
 
-    dependency "org.immutables:value:2.8.8"
-    dependency "org.immutables:value-annotations:2.8.8"
+    dependency 'org.yaml:snakeyaml:2.0'
 
-    dependency 'tech.pegasys.ethsigner.internal:core:0.4.0'
-    dependency 'tech.pegasys.ethsigner.internal:file-based:0.4.0'
-    dependency 'tech.pegasys.ethsigner.internal:signing-api:0.4.0'
+    dependency 'tech.pegasys.discovery:discovery:22.2.0'
 
-    dependency 'tech.pegasys.discovery:discovery:0.4.1'
+    dependency 'com.github.oshi:oshi-core:6.4.1'
   }
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index cc4fdc293d0..7454180f2ae 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 622ab64a3cb..070cb702f09 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 2fe81a7d95e..aef870434d9 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,78 +17,113 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS='"-Xmx1024m" "-Xms256m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -105,79 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 24467a141f7..ac1b06f9382 100755
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/metrics/core/build.gradle b/metrics/core/build.gradle
index 6be781d625d..295cdada976 100644
--- a/metrics/core/build.gradle
+++ b/metrics/core/build.gradle
@@ -36,13 +36,23 @@ publishing {
 
 dependencies {
   implementation project(':plugin-api')
+  api 'org.slf4j:slf4j-api'
 
   implementation 'com.google.guava:guava'
+  implementation 'com.google.dagger:dagger'
+  implementation 'info.picocli:picocli'
   implementation 'io.grpc:grpc-netty'
+  implementation 'io.grpc:grpc-core'
+  implementation 'io.netty:netty-tcnative-boringssl-static'
+  implementation 'io.netty:netty-transport-native-epoll'
+  implementation 'io.netty:netty-all'
   implementation 'io.opentelemetry:opentelemetry-api'
   implementation 'io.opentelemetry:opentelemetry-sdk'
-  implementation 'io.opentelemetry:opentelemetry-extension-runtime-metrics'
-  implementation 'io.opentelemetry:opentelemetry-exporters-otlp'
+  implementation 'io.opentelemetry:opentelemetry-semconv'
+  implementation 'io.opentelemetry:opentelemetry-sdk-trace'
+  implementation 'io.opentelemetry:opentelemetry-sdk-metrics'
+  implementation 'io.opentelemetry:opentelemetry-exporter-otlp'
+  implementation 'io.opentelemetry:opentelemetry-sdk-extension-autoconfigure'
 
   implementation 'io.prometheus:simpleclient'
   implementation 'io.prometheus:simpleclient_common'
@@ -50,19 +60,19 @@ dependencies {
   implementation 'io.prometheus:simpleclient_pushgateway'
   implementation 'io.vertx:vertx-core'
   implementation 'io.vertx:vertx-web'
-  implementation 'org.apache.logging.log4j:log4j-api'
-
-  runtimeOnly 'org.apache.logging.log4j:log4j-core'
 
   // test dependencies.
   testImplementation project(':util')
 
   testImplementation 'com.squareup.okhttp3:okhttp'
-  testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.mockito:mockito-core'
+  testImplementation 'org.mockito:mockito-junit-jupiter'
 
   testSupportImplementation 'org.mockito:mockito-core'
+
+  annotationProcessor 'com.google.dagger:dagger-compiler'
 }
 
 
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/BesuMetricCategory.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/BesuMetricCategory.java
index 85f8629ecce..27be3ff9321 100644
--- a/metrics/core/src/main/java/org/hyperledger/besu/metrics/BesuMetricCategory.java
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/BesuMetricCategory.java
@@ -22,23 +22,41 @@
 
 import com.google.common.collect.ImmutableSet;
 
+/** The enum Besu metric category. */
 public enum BesuMetricCategory implements MetricCategory {
+  /** Blockchain besu metric category. */
   BLOCKCHAIN("blockchain"),
+  /** Ethereum besu metric category. */
   ETHEREUM("ethereum", false),
+  /** Executors besu metric category. */
   EXECUTORS("executors"),
+  /** Network besu metric category. */
   NETWORK("network"),
+  /** Peers besu metric category. */
   PEERS("peers"),
+  /** Permissioning besu metric category. */
   PERMISSIONING("permissioning"),
+  /** Kvstore rocksdb besu metric category. */
   KVSTORE_ROCKSDB("rocksdb"),
+  /** Kvstore private rocksdb besu metric category. */
   KVSTORE_PRIVATE_ROCKSDB("private_rocksdb"),
+  /** Kvstore rocksdb stats besu metric category. */
   KVSTORE_ROCKSDB_STATS("rocksdb", false),
+  /** Kvstore private rocksdb stats besu metric category. */
   KVSTORE_PRIVATE_ROCKSDB_STATS("private_rocksdb", false),
+  /** Pruner besu metric category. */
   PRUNER("pruner"),
+  /** Rpc besu metric category. */
   RPC("rpc"),
+  /** Synchronizer besu metric category. */
   SYNCHRONIZER("synchronizer"),
-  TRANSACTION_POOL("transaction_pool");
+  /** Transaction pool besu metric category. */
+  TRANSACTION_POOL("transaction_pool"),
+  /** Stratum besu metric category. */
+  STRATUM("stratum");
 
   private static final Optional<String> BESU_PREFIX = Optional.of("besu_");
+  /** The constant DEFAULT_METRIC_CATEGORIES. */
   public static final Set<MetricCategory> DEFAULT_METRIC_CATEGORIES;
 
   static {
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/MetricCategoryRegistryImpl.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/MetricCategoryRegistryImpl.java
index 821c64c03d2..14699e7ff32 100644
--- a/metrics/core/src/main/java/org/hyperledger/besu/metrics/MetricCategoryRegistryImpl.java
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/MetricCategoryRegistryImpl.java
@@ -20,10 +20,16 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/** The Metric category registry implementation. */
 public class MetricCategoryRegistryImpl implements MetricCategoryRegistry {
 
   private final List<MetricCategory> metricCategories = new ArrayList<>();
 
+  /**
+   * Gets metric categories.
+   *
+   * @return the metric categories
+   */
   public List<MetricCategory> getMetricCategories() {
     return metricCategories;
   }
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/MetricsConfigurationModule.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/MetricsConfigurationModule.java
new file mode 100644
index 00000000000..8c44e869623
--- /dev/null
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/MetricsConfigurationModule.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.metrics;
+
+import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+/** Dagger module for providing the {@link MetricsConfiguration} instance. */
+@Module
+public class MetricsConfigurationModule {
+  @Provides
+  @Singleton
+  MetricsConfiguration provideMetricsConfiguration() {
+    return MetricsConfiguration.builder().build();
+  }
+}
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/MetricsProtocol.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/MetricsProtocol.java
index 17af8f6b295..74b5dec12f5 100644
--- a/metrics/core/src/main/java/org/hyperledger/besu/metrics/MetricsProtocol.java
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/MetricsProtocol.java
@@ -16,10 +16,19 @@
 
 /** Enumeration of metrics protocols supported by Besu. */
 public enum MetricsProtocol {
+  /** Prometheus metrics protocol. */
   PROMETHEUS,
+  /** Open telemetry metrics protocol. */
   OPENTELEMETRY,
+  /** None metrics protocol. */
   NONE;
 
+  /**
+   * Create Metrics Protocol from String representation.
+   *
+   * @param str the string representation of message protocol
+   * @return the metrics protocol
+   */
   public static MetricsProtocol fromString(final String str) {
     for (final MetricsProtocol mode : MetricsProtocol.values()) {
       if (mode.name().equalsIgnoreCase(str)) {
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/MetricsService.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/MetricsService.java
index 57bdaf94c60..747ed9cc762 100644
--- a/metrics/core/src/main/java/org/hyperledger/besu/metrics/MetricsService.java
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/MetricsService.java
@@ -14,8 +14,7 @@
  */
 package org.hyperledger.besu.metrics;
 
-import org.hyperledger.besu.metrics.opentelemetry.MetricsOtelGrpcPushService;
-import org.hyperledger.besu.metrics.opentelemetry.OpenTelemetrySystem;
+import org.hyperledger.besu.metrics.opentelemetry.MetricsOtelPushService;
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
 import org.hyperledger.besu.metrics.prometheus.MetricsHttpService;
 import org.hyperledger.besu.metrics.prometheus.MetricsPushGatewayService;
@@ -25,6 +24,7 @@
 import java.util.concurrent.CompletableFuture;
 
 import io.vertx.core.Vertx;
+import org.slf4j.LoggerFactory;
 
 /**
  * Service responsible for exposing metrics to the outside, either through a port and network
@@ -32,10 +32,20 @@
  */
 public interface MetricsService {
 
+  /**
+   * Create Metrics Service.
+   *
+   * @param vertx the vertx
+   * @param configuration the configuration
+   * @param metricsSystem the metrics system
+   * @return the optional Metrics Service
+   */
   static Optional<MetricsService> create(
       final Vertx vertx,
       final MetricsConfiguration configuration,
       final MetricsSystem metricsSystem) {
+    LoggerFactory.getLogger(MetricsService.class)
+        .trace("Creating metrics service {}", configuration.getProtocol());
     if (configuration.getProtocol() == MetricsProtocol.PROMETHEUS) {
       if (configuration.isEnabled()) {
         return Optional.of(new MetricsHttpService(vertx, configuration, metricsSystem));
@@ -46,8 +56,7 @@ static Optional<MetricsService> create(
       }
     } else if (configuration.getProtocol() == MetricsProtocol.OPENTELEMETRY) {
       if (configuration.isEnabled()) {
-        return Optional.of(
-            new MetricsOtelGrpcPushService(configuration, (OpenTelemetrySystem) metricsSystem));
+        return Optional.of(new MetricsOtelPushService());
       } else {
         return Optional.empty();
       }
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/MetricsSystemFactory.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/MetricsSystemFactory.java
index b80b6179734..d1ba6bffb23 100644
--- a/metrics/core/src/main/java/org/hyperledger/besu/metrics/MetricsSystemFactory.java
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/MetricsSystemFactory.java
@@ -22,11 +22,27 @@
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
 import org.hyperledger.besu.metrics.prometheus.PrometheusMetricsSystem;
 
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.OpenTelemetry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /** Creates a new metric system based on configuration. */
 public class MetricsSystemFactory {
 
+  private static final Logger LOG = LoggerFactory.getLogger(MetricsSystemFactory.class);
+  private static final AtomicBoolean globalOpenTelemetryDisabled = new AtomicBoolean(false);
+
   private MetricsSystemFactory() {}
 
+  private static void disableGlobalOpenTelemetry() {
+    if (!globalOpenTelemetryDisabled.compareAndExchange(false, true)) {
+      GlobalOpenTelemetry.set(OpenTelemetry.noop());
+    }
+  }
+
   /**
    * Creates and starts a new metric system to observe the behavior of the client
    *
@@ -34,7 +50,9 @@ private MetricsSystemFactory() {}
    * @return a new metric system
    */
   public static ObservableMetricsSystem create(final MetricsConfiguration metricsConfiguration) {
+    LOG.trace("Creating a metric system with {}", metricsConfiguration.getProtocol());
     if (!metricsConfiguration.isEnabled() && !metricsConfiguration.isPushEnabled()) {
+      disableGlobalOpenTelemetry();
       return new NoOpMetricsSystem();
     }
     if (PROMETHEUS.equals(metricsConfiguration.getProtocol())) {
@@ -42,13 +60,15 @@ public static ObservableMetricsSystem create(final MetricsConfiguration metricsC
           new PrometheusMetricsSystem(
               metricsConfiguration.getMetricCategories(), metricsConfiguration.isTimersEnabled());
       metricsSystem.init();
+      disableGlobalOpenTelemetry();
       return metricsSystem;
     } else if (OPENTELEMETRY.equals(metricsConfiguration.getProtocol())) {
       final OpenTelemetrySystem metricsSystem =
           new OpenTelemetrySystem(
               metricsConfiguration.getMetricCategories(),
               metricsConfiguration.isTimersEnabled(),
-              metricsConfiguration.getPrometheusJob());
+              metricsConfiguration.getPrometheusJob(),
+              true);
       metricsSystem.initDefaults();
       return metricsSystem;
     } else {
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/MetricsSystemModule.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/MetricsSystemModule.java
new file mode 100644
index 00000000000..05dec0fb1f2
--- /dev/null
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/MetricsSystemModule.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.metrics;
+
+import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * Dagger module for providing the {@link MetricsSystem} and {@link ObservableMetricsSystem}
+ * instances.
+ */
+@Module
+public class MetricsSystemModule {
+
+  @Provides
+  @Singleton
+  MetricsSystem provideMetricsSystem(final MetricsConfiguration metricsConfig) {
+    return MetricsSystemFactory.create(metricsConfig);
+  }
+
+  @Provides
+  @Singleton
+  ObservableMetricsSystem provideObservableMetricsSystem(final MetricsConfiguration metricsConfig) {
+    return MetricsSystemFactory.create(metricsConfig);
+  }
+}
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/ObservableMetricsSystem.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/ObservableMetricsSystem.java
index 757263923c5..8090d28fc1d 100644
--- a/metrics/core/src/main/java/org/hyperledger/besu/metrics/ObservableMetricsSystem.java
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/ObservableMetricsSystem.java
@@ -20,10 +20,22 @@
 import java.util.Set;
 import java.util.stream.Stream;
 
+/** The interface Observable metrics system. */
 public interface ObservableMetricsSystem extends MetricsSystem {
 
+  /**
+   * Stream observations.
+   *
+   * @param category the category
+   * @return the stream
+   */
   Stream<Observation> streamObservations(MetricCategory category);
 
+  /**
+   * Stream observations.
+   *
+   * @return the stream
+   */
   Stream<Observation> streamObservations();
 
   /**
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/Observation.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/Observation.java
index fdfdcb5c40c..81ca8b5a75f 100644
--- a/metrics/core/src/main/java/org/hyperledger/besu/metrics/Observation.java
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/Observation.java
@@ -21,12 +21,21 @@
 
 import com.google.common.base.MoreObjects;
 
+/** The Observation. */
 public class Observation {
   private final MetricCategory category;
   private final String metricName;
   private final List<String> labels;
   private final Object value;
 
+  /**
+   * Instantiates a new Observation.
+   *
+   * @param category the category
+   * @param metricName the metric name
+   * @param value the value
+   * @param labels the labels
+   */
   public Observation(
       final MetricCategory category,
       final String metricName,
@@ -38,18 +47,38 @@ public Observation(
     this.labels = labels;
   }
 
+  /**
+   * Gets category.
+   *
+   * @return the category
+   */
   public MetricCategory getCategory() {
     return category;
   }
 
+  /**
+   * Gets metric name.
+   *
+   * @return the metric name
+   */
   public String getMetricName() {
     return metricName;
   }
 
+  /**
+   * Gets labels.
+   *
+   * @return the labels
+   */
   public List<String> getLabels() {
     return labels;
   }
 
+  /**
+   * Gets value.
+   *
+   * @return the value
+   */
   public Object getValue() {
     return value;
   }
@@ -63,7 +92,7 @@ public boolean equals(final Object o) {
       return false;
     }
     final Observation that = (Observation) o;
-    return category == that.category
+    return Objects.equals(category, that.category)
         && Objects.equals(metricName, that.metricName)
         && Objects.equals(labels, that.labels)
         && Objects.equals(value, that.value);
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/RunnableCounter.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/RunnableCounter.java
index 65fb6acb4d0..a942bcf3826 100644
--- a/metrics/core/src/main/java/org/hyperledger/besu/metrics/RunnableCounter.java
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/RunnableCounter.java
@@ -21,11 +21,22 @@
 /** Counter that triggers a specific task each time a step is hit. */
 public class RunnableCounter implements Counter {
 
-  private final Counter backedCounter;
-  private final Runnable task;
-  private final int step;
-  private final AtomicLong stepCounter;
+  /** The Backed counter. */
+  protected final Counter backedCounter;
+  /** The Task. */
+  protected final Runnable task;
+  /** The Step. */
+  protected final int step;
+  /** The Step counter. */
+  protected final AtomicLong stepCounter;
 
+  /**
+   * Instantiates a new Runnable counter.
+   *
+   * @param backedCounter the backed counter
+   * @param task the task
+   * @param step the step
+   */
   public RunnableCounter(final Counter backedCounter, final Runnable task, final int step) {
     this.backedCounter = backedCounter;
     this.task = task;
@@ -56,6 +67,11 @@ public void inc(final long amount) {
     }
   }
 
+  /**
+   * Get Step Counter.
+   *
+   * @return the long
+   */
   public long get() {
     return stepCounter.get();
   }
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/RunnableTimedCounter.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/RunnableTimedCounter.java
new file mode 100644
index 00000000000..8b5ea7d2c90
--- /dev/null
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/RunnableTimedCounter.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.metrics;
+
+import org.hyperledger.besu.plugin.services.metrics.Counter;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
+/** Counter that triggers a specific task if the specified interval has elapsed. */
+public class RunnableTimedCounter implements Counter {
+
+  private final Counter backedCounter;
+  private final Runnable task;
+  private final long intervalMillis;
+  private final AtomicLong stepCounter;
+  private volatile long nextExecutionAtMillis;
+
+  /**
+   * Instantiates a new Runnable timed counter.
+   *
+   * @param backedCounter the backed counter
+   * @param task the task
+   * @param interval the interval
+   * @param unit the unit
+   */
+  public RunnableTimedCounter(
+      final Counter backedCounter, final Runnable task, final long interval, final TimeUnit unit) {
+    this.backedCounter = backedCounter;
+    this.task = task;
+    this.stepCounter = new AtomicLong(0);
+    this.intervalMillis = unit.toMillis(interval);
+    this.nextExecutionAtMillis = System.currentTimeMillis() + intervalMillis;
+  }
+
+  /**
+   * Increments the stepCounter by 1
+   *
+   * <p>{@link #inc(long) inc} method
+   */
+  @Override
+  public void inc() {
+    this.inc(1);
+  }
+
+  /**
+   * Increments the stepCounter by amount. Triggers the runnable if interval has elapsed
+   *
+   * @param amount the value to add to the stepCounter.
+   */
+  @Override
+  public void inc(final long amount) {
+    backedCounter.inc(amount);
+    stepCounter.addAndGet(amount);
+    final long now = System.currentTimeMillis();
+    if (nextExecutionAtMillis < now) {
+      task.run();
+      nextExecutionAtMillis = now + intervalMillis;
+    }
+  }
+
+  /**
+   * Get Step Counter.
+   *
+   * @return the long
+   */
+  public long get() {
+    return stepCounter.get();
+  }
+}
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/StandardMetricCategory.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/StandardMetricCategory.java
index 0faf7f5aa14..876ca81adbd 100644
--- a/metrics/core/src/main/java/org/hyperledger/besu/metrics/StandardMetricCategory.java
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/StandardMetricCategory.java
@@ -18,8 +18,11 @@
 
 import java.util.Optional;
 
+/** The enum Standard metric category. */
 public enum StandardMetricCategory implements MetricCategory {
+  /** Jvm standard metric category. */
   JVM("jvm"),
+  /** Process standard metric category. */
   PROCESS("process");
 
   private final String name;
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/noop/NoOpMetricsSystem.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/noop/NoOpMetricsSystem.java
index c037fc744ce..54ccc70d33e 100644
--- a/metrics/core/src/main/java/org/hyperledger/besu/metrics/noop/NoOpMetricsSystem.java
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/noop/NoOpMetricsSystem.java
@@ -17,31 +17,53 @@
 import org.hyperledger.besu.metrics.ObservableMetricsSystem;
 import org.hyperledger.besu.metrics.Observation;
 import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.plugin.services.metrics.LabelledGauge;
 import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
 import org.hyperledger.besu.plugin.services.metrics.MetricCategory;
 import org.hyperledger.besu.plugin.services.metrics.OperationTimer;
 
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 import java.util.Set;
 import java.util.function.DoubleSupplier;
 import java.util.stream.Stream;
 
 import com.google.common.base.Preconditions;
 
+/** The NoOp metrics system. */
 public class NoOpMetricsSystem implements ObservableMetricsSystem {
 
+  /** The constant NO_OP_COUNTER. */
   public static final Counter NO_OP_COUNTER = new NoOpCounter();
+  /** The constant NO_OP_GAUGE. */
+  public static final LabelledGauge NO_OP_GAUGE = new NoOpValueCollector();
+
   private static final OperationTimer.TimingContext NO_OP_TIMING_CONTEXT = () -> 0;
+  /** The constant NO_OP_OPERATION_TIMER. */
   public static final OperationTimer NO_OP_OPERATION_TIMER = () -> NO_OP_TIMING_CONTEXT;
 
+  /** The constant NO_OP_LABELLED_1_COUNTER. */
   public static final LabelledMetric<Counter> NO_OP_LABELLED_1_COUNTER =
       new LabelCountingNoOpMetric<>(1, NO_OP_COUNTER);
+  /** The constant NO_OP_LABELLED_2_COUNTER. */
   public static final LabelledMetric<Counter> NO_OP_LABELLED_2_COUNTER =
       new LabelCountingNoOpMetric<>(2, NO_OP_COUNTER);
+  /** The constant NO_OP_LABELLED_3_COUNTER. */
   public static final LabelledMetric<Counter> NO_OP_LABELLED_3_COUNTER =
       new LabelCountingNoOpMetric<>(3, NO_OP_COUNTER);
+  /** The constant NO_OP_LABELLED_1_OPERATION_TIMER. */
   public static final LabelledMetric<OperationTimer> NO_OP_LABELLED_1_OPERATION_TIMER =
       new LabelCountingNoOpMetric<>(1, NO_OP_OPERATION_TIMER);
+  /** The constant NO_OP_LABELLED_1_GAUGE. */
+  public static final LabelledGauge NO_OP_LABELLED_1_GAUGE =
+      new LabelledGaugeNoOpMetric(1, NO_OP_GAUGE);
+  /** The constant NO_OP_LABELLED_2_GAUGE. */
+  public static final LabelledGauge NO_OP_LABELLED_2_GAUGE =
+      new LabelledGaugeNoOpMetric(2, NO_OP_GAUGE);
+  /** The constant NO_OP_LABELLED_3_GAUGE. */
+  public static final LabelledGauge NO_OP_LABELLED_3_GAUGE =
+      new LabelledGaugeNoOpMetric(3, NO_OP_GAUGE);
 
   @Override
   public LabelledMetric<Counter> createLabelledCounter(
@@ -52,6 +74,12 @@ public LabelledMetric<Counter> createLabelledCounter(
     return getCounterLabelledMetric(labelNames.length);
   }
 
+  /**
+   * Gets counter labelled metric.
+   *
+   * @param labelCount the label count
+   * @return the counter labelled metric
+   */
   public static LabelledMetric<Counter> getCounterLabelledMetric(final int labelCount) {
     switch (labelCount) {
       case 1:
@@ -74,6 +102,12 @@ public LabelledMetric<OperationTimer> createLabelledTimer(
     return getOperationTimerLabelledMetric(labelNames.length);
   }
 
+  /**
+   * Gets operation timer labelled metric.
+   *
+   * @param labelCount the label count
+   * @return the operation timer labelled metric
+   */
   public static LabelledMetric<OperationTimer> getOperationTimerLabelledMetric(
       final int labelCount) {
     if (labelCount == 1) {
@@ -90,6 +124,34 @@ public void createGauge(
       final String help,
       final DoubleSupplier valueSupplier) {}
 
+  @Override
+  public LabelledGauge createLabelledGauge(
+      final MetricCategory category,
+      final String name,
+      final String help,
+      final String... labelNames) {
+    return getLabelledGauge(labelNames.length);
+  }
+
+  /**
+   * Gets labelled gauge.
+   *
+   * @param labelCount the label count
+   * @return the labelled gauge
+   */
+  public static LabelledGauge getLabelledGauge(final int labelCount) {
+    switch (labelCount) {
+      case 1:
+        return NO_OP_LABELLED_1_GAUGE;
+      case 2:
+        return NO_OP_LABELLED_2_GAUGE;
+      case 3:
+        return NO_OP_LABELLED_3_GAUGE;
+      default:
+        return new LabelledGaugeNoOpMetric(labelCount, NO_OP_GAUGE);
+    }
+  }
+
   @Override
   public Stream<Observation> streamObservations(final MetricCategory category) {
     return Stream.empty();
@@ -105,11 +167,24 @@ public Set<MetricCategory> getEnabledCategories() {
     return Collections.emptySet();
   }
 
+  /**
+   * The Label counting NoOp metric.
+   *
+   * @param <T> the type parameter
+   */
   public static class LabelCountingNoOpMetric<T> implements LabelledMetric<T> {
 
+    /** The Label count. */
     final int labelCount;
+    /** The Fake metric. */
     final T fakeMetric;
 
+    /**
+     * Instantiates a new Label counting NoOp metric.
+     *
+     * @param labelCount the label count
+     * @param fakeMetric the fake metric
+     */
     LabelCountingNoOpMetric(final int labelCount, final T fakeMetric) {
       this.labelCount = labelCount;
       this.fakeMetric = fakeMetric;
@@ -123,4 +198,38 @@ public T labels(final String... labels) {
       return fakeMetric;
     }
   }
+
+  /** The Labelled gauge NoOp metric. */
+  public static class LabelledGaugeNoOpMetric implements LabelledGauge {
+    /** The Label count. */
+    final int labelCount;
+    /** The Label values cache. */
+    final List<String> labelValuesCache = new ArrayList<>();
+
+    /**
+     * Instantiates a new Labelled gauge NoOp metric.
+     *
+     * @param labelCount the label count
+     * @param fakeMetric the fake metric
+     */
+    public LabelledGaugeNoOpMetric(final int labelCount, final LabelledGauge fakeMetric) {
+      this.labelCount = labelCount;
+      this.fakeMetric = fakeMetric;
+    }
+
+    /** The Fake metric. */
+    final LabelledGauge fakeMetric;
+
+    @Override
+    public void labels(final DoubleSupplier valueSupplier, final String... labelValues) {
+      final String labelValuesString = String.join(",", labelValues);
+      Preconditions.checkArgument(
+          !labelValuesCache.contains(labelValuesString),
+          "Received label values that were already in use " + labelValuesString);
+      Preconditions.checkArgument(
+          labelValues.length == labelCount,
+          "The count of labels used must match the count of labels expected.");
+      Preconditions.checkNotNull(valueSupplier, "No valueSupplier specified");
+    }
+  }
 }
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/noop/NoOpValueCollector.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/noop/NoOpValueCollector.java
new file mode 100644
index 00000000000..42884a92ff6
--- /dev/null
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/noop/NoOpValueCollector.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.metrics.noop;
+
+import org.hyperledger.besu.plugin.services.metrics.LabelledGauge;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.DoubleSupplier;
+
+/** The NoOp value collector. */
+public class NoOpValueCollector implements LabelledGauge {
+  private final List<String> labelValuesCreated = new ArrayList<>();
+
+  @Override
+  public synchronized void labels(final DoubleSupplier valueSupplier, final String... labelValues) {
+    final String labelValuesString = String.join(",", labelValues);
+    if (labelValuesCreated.contains(labelValuesString)) {
+      throw new IllegalArgumentException(
+          String.format("A gauge has already been created for label values %s", labelValuesString));
+    }
+    labelValuesCreated.add(labelValuesString);
+  }
+}
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/DebugMetricReader.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/DebugMetricReader.java
new file mode 100644
index 00000000000..ea81e91aff9
--- /dev/null
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/DebugMetricReader.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright Besu Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.metrics.opentelemetry;
+
+import java.util.Collection;
+
+import io.opentelemetry.sdk.common.CompletableResultCode;
+import io.opentelemetry.sdk.metrics.InstrumentType;
+import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
+import io.opentelemetry.sdk.metrics.data.MetricData;
+import io.opentelemetry.sdk.metrics.export.CollectionRegistration;
+import io.opentelemetry.sdk.metrics.export.MetricReader;
+import io.opentelemetry.sdk.metrics.internal.export.MetricProducer;
+import org.jetbrains.annotations.NotNull;
+
+class DebugMetricReader implements MetricReader {
+  private CollectionRegistration registration;
+
+  public DebugMetricReader() {}
+
+  public Collection<MetricData> getAllMetrics() {
+    return MetricProducer.asMetricProducer(this.registration).collectAllMetrics();
+  }
+
+  @Override
+  public void register(final @NotNull CollectionRegistration registration) {
+    this.registration = registration;
+  }
+
+  @Override
+  public CompletableResultCode forceFlush() {
+    return CompletableResultCode.ofSuccess();
+  }
+
+  @Override
+  public CompletableResultCode shutdown() {
+    return CompletableResultCode.ofSuccess();
+  }
+
+  @Override
+  public AggregationTemporality getAggregationTemporality(
+      final @NotNull InstrumentType instrumentType) {
+    return AggregationTemporality.CUMULATIVE;
+  }
+}
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/MetricsOtelGrpcPushService.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/MetricsOtelGrpcPushService.java
deleted file mode 100644
index 337d83388e4..00000000000
--- a/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/MetricsOtelGrpcPushService.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-package org.hyperledger.besu.metrics.opentelemetry;
-
-import org.hyperledger.besu.metrics.MetricsService;
-import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
-
-import java.util.Collections;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-
-import io.opentelemetry.exporters.otlp.OtlpGrpcMetricExporter;
-import io.opentelemetry.sdk.metrics.export.IntervalMetricReader;
-
-public class MetricsOtelGrpcPushService implements MetricsService {
-
-  private final MetricsConfiguration configuration;
-  private final OpenTelemetrySystem metricsSystem;
-  private IntervalMetricReader periodicReader;
-
-  public MetricsOtelGrpcPushService(
-      final MetricsConfiguration configuration, final OpenTelemetrySystem metricsSystem) {
-    this.configuration = configuration;
-    this.metricsSystem = metricsSystem;
-  }
-
-  @Override
-  public CompletableFuture<?> start() {
-    OtlpGrpcMetricExporter exporter = OtlpGrpcMetricExporter.getDefault();
-    IntervalMetricReader.Builder builder =
-        IntervalMetricReader.builder()
-            .setExportIntervalMillis(configuration.getPushInterval() * 1000L)
-            .readEnvironmentVariables()
-            .readSystemProperties()
-            .setMetricProducers(
-                Collections.singleton(metricsSystem.getMeterSdkProvider().getMetricProducer()))
-            .setMetricExporter(exporter);
-    this.periodicReader = builder.build();
-    return CompletableFuture.completedFuture(null);
-  }
-
-  @Override
-  public CompletableFuture<?> stop() {
-    if (periodicReader != null) {
-      periodicReader.shutdown();
-    }
-    return CompletableFuture.completedFuture(null);
-  }
-
-  @Override
-  public Optional<Integer> getPort() {
-    return Optional.empty();
-  }
-}
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/MetricsOtelPushService.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/MetricsOtelPushService.java
new file mode 100644
index 00000000000..3a8fbf3a622
--- /dev/null
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/MetricsOtelPushService.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright Hyperledger Besu Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.metrics.opentelemetry;
+
+import org.hyperledger.besu.metrics.MetricsService;
+
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Metrics open telemetry push service. */
+public class MetricsOtelPushService implements MetricsService {
+
+  private static final Logger LOG = LoggerFactory.getLogger(MetricsOtelPushService.class);
+
+  /** Instantiates a new Metrics open telemetry push service. */
+  public MetricsOtelPushService() {}
+
+  @Override
+  public CompletableFuture<?> start() {
+    LOG.info("Starting OpenTelemetry push service");
+
+    return CompletableFuture.completedFuture(null);
+  }
+
+  @Override
+  public CompletableFuture<?> stop() {
+    return CompletableFuture.completedFuture(null);
+  }
+
+  @Override
+  public Optional<Integer> getPort() {
+    return Optional.empty();
+  }
+}
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetryCounter.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetryCounter.java
index 73a718357d4..d3c2889288c 100644
--- a/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetryCounter.java
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetryCounter.java
@@ -17,17 +17,22 @@
 import org.hyperledger.besu.plugin.services.metrics.Counter;
 import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import io.opentelemetry.common.Labels;
-import io.opentelemetry.metrics.LongCounter;
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.common.AttributesBuilder;
+import io.opentelemetry.api.metrics.LongCounter;
 
+/** The Open telemetry counter. */
 public class OpenTelemetryCounter implements LabelledMetric<Counter> {
 
   private final LongCounter counter;
   private final String[] labelNames;
 
+  /**
+   * Instantiates a new Open telemetry counter.
+   *
+   * @param counter the counter
+   * @param labelNames the label names
+   */
   public OpenTelemetryCounter(final LongCounter counter, final String... labelNames) {
     this.counter = counter;
     this.labelNames = labelNames;
@@ -35,31 +40,31 @@ public OpenTelemetryCounter(final LongCounter counter, final String... labelName
 
   @Override
   public Counter labels(final String... labelValues) {
-    List<String> labelKeysAndValues = new ArrayList<>();
+    final AttributesBuilder builder = Attributes.builder();
     for (int i = 0; i < labelNames.length; i++) {
-      labelKeysAndValues.add(labelNames[i]);
-      labelKeysAndValues.add(labelValues[i]);
+      builder.put(labelNames[i], labelValues[i]);
     }
-    final Labels labels = Labels.of(labelKeysAndValues.toArray(new String[] {}));
-    LongCounter.BoundLongCounter boundLongCounter = counter.bind(labels);
-    return new OpenTelemetryCounter.UnlabelledCounter(boundLongCounter);
+    final Attributes labels = builder.build();
+    return new BoundLongCounter(counter, labels);
   }
 
-  private static class UnlabelledCounter implements Counter {
-    private final LongCounter.BoundLongCounter counter;
+  private static class BoundLongCounter implements Counter {
+    private final LongCounter counter;
+    private final Attributes labels;
 
-    private UnlabelledCounter(final LongCounter.BoundLongCounter counter) {
+    private BoundLongCounter(final LongCounter counter, final Attributes labels) {
       this.counter = counter;
+      this.labels = labels;
     }
 
     @Override
     public void inc() {
-      counter.add(1);
+      counter.add(1, labels);
     }
 
     @Override
     public void inc(final long amount) {
-      counter.add(amount);
+      counter.add(amount, labels);
     }
   }
 }
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetryGauge.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetryGauge.java
new file mode 100644
index 00000000000..6aea56586a8
--- /dev/null
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetryGauge.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.metrics.opentelemetry;
+
+import org.hyperledger.besu.plugin.services.metrics.LabelledGauge;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.DoubleSupplier;
+
+import com.google.common.base.Preconditions;
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.common.AttributesBuilder;
+import io.opentelemetry.api.metrics.Meter;
+import io.opentelemetry.api.metrics.ObservableDoubleMeasurement;
+
+/** The Open telemetry gauge. */
+public class OpenTelemetryGauge implements LabelledGauge {
+  private final List<String> labelNames;
+  private final Map<Attributes, DoubleSupplier> observationsMap = new ConcurrentHashMap<>();
+
+  /**
+   * Instantiates a new Open telemetry gauge.
+   *
+   * @param metricName the metric name
+   * @param help the help
+   * @param meter the meter
+   * @param labelNames the label names
+   */
+  public OpenTelemetryGauge(
+      final String metricName,
+      final String help,
+      final Meter meter,
+      final List<String> labelNames) {
+    this.labelNames = labelNames;
+
+    meter.gaugeBuilder(metricName).setDescription(help).buildWithCallback(this::updater);
+  }
+
+  @Override
+  public void labels(final DoubleSupplier valueSupplier, final String... labelValues) {
+    Preconditions.checkArgument(
+        labelValues.length == labelNames.size(),
+        "label values and label names need the same number of elements");
+    final Attributes labels = getLabels(labelValues);
+    if (observationsMap.putIfAbsent(labels, valueSupplier) != null) {
+      throw new IllegalStateException(
+          "Already registered a gauge with labels " + Arrays.toString(labelValues));
+    }
+  }
+
+  private Attributes getLabels(final String... labelValues) {
+    final AttributesBuilder labelsBuilder = Attributes.builder();
+    for (int i = 0; i < labelNames.size(); i++) {
+      labelsBuilder.put(labelNames.get(i), labelValues[i]);
+    }
+    return labelsBuilder.build();
+  }
+
+  private void updater(final ObservableDoubleMeasurement measurement) {
+    observationsMap.forEach(
+        (labels, valueSupplier) -> measurement.record(valueSupplier.getAsDouble(), labels));
+  }
+}
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetrySystem.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetrySystem.java
index 4f1c9fd06f0..2c43eb8668e 100644
--- a/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetrySystem.java
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetrySystem.java
@@ -20,6 +20,7 @@
 import org.hyperledger.besu.metrics.StandardMetricCategory;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.plugin.services.metrics.LabelledGauge;
 import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
 import org.hyperledger.besu.plugin.services.metrics.MetricCategory;
 import org.hyperledger.besu.plugin.services.metrics.OperationTimer;
@@ -30,31 +31,45 @@
 import java.lang.management.MemoryPoolMXBean;
 import java.lang.management.MemoryUsage;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 import java.util.function.DoubleSupplier;
 import java.util.stream.Stream;
 
 import com.google.common.collect.ImmutableSet;
-import io.opentelemetry.common.Attributes;
-import io.opentelemetry.common.Labels;
-import io.opentelemetry.metrics.DoubleValueObserver;
-import io.opentelemetry.metrics.DoubleValueRecorder;
-import io.opentelemetry.metrics.LongCounter;
-import io.opentelemetry.metrics.LongSumObserver;
-import io.opentelemetry.metrics.LongUpDownSumObserver;
-import io.opentelemetry.metrics.Meter;
-import io.opentelemetry.sdk.metrics.MeterSdkProvider;
+import io.opentelemetry.api.common.AttributeKey;
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.metrics.LongCounter;
+import io.opentelemetry.api.metrics.Meter;
+import io.opentelemetry.api.trace.TracerProvider;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
+import io.opentelemetry.sdk.common.CompletableResultCode;
+import io.opentelemetry.sdk.metrics.SdkMeterProvider;
+import io.opentelemetry.sdk.metrics.data.DoublePointData;
+import io.opentelemetry.sdk.metrics.data.HistogramPointData;
+import io.opentelemetry.sdk.metrics.data.LongPointData;
 import io.opentelemetry.sdk.metrics.data.MetricData;
+import io.opentelemetry.sdk.metrics.data.MetricDataType;
+import io.opentelemetry.sdk.metrics.data.PointData;
+import io.opentelemetry.sdk.metrics.data.SummaryPointData;
 import io.opentelemetry.sdk.resources.Resource;
-import io.opentelemetry.sdk.resources.ResourceAttributes;
+import io.opentelemetry.sdk.trace.SdkTracerProvider;
+import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Metrics system relying on the native OpenTelemetry format. */
 public class OpenTelemetrySystem implements ObservableMetricsSystem {
+
+  private static final Logger LOG = LoggerFactory.getLogger(OpenTelemetrySystem.class);
+
   private static final String TYPE_LABEL_KEY = "type";
   private static final String AREA_LABEL_KEY = "area";
   private static final String POOL_LABEL_KEY = "pool";
@@ -69,26 +84,43 @@ public class OpenTelemetrySystem implements ObservableMetricsSystem {
   private final Map<String, LabelledMetric<Counter>> cachedCounters = new ConcurrentHashMap<>();
   private final Map<String, LabelledMetric<OperationTimer>> cachedTimers =
       new ConcurrentHashMap<>();
-  private final MeterSdkProvider meterSdkProvider;
+  private final SdkMeterProvider sdkMeterProvider;
+  private final DebugMetricReader debugMetricReader;
+  private final SdkTracerProvider sdkTracerProvider;
 
+  /**
+   * Instantiates a new Open telemetry system.
+   *
+   * @param enabledCategories the enabled categories
+   * @param timersEnabled the timers enabled
+   * @param jobName the job name
+   * @param setAsGlobal the set as global
+   */
   public OpenTelemetrySystem(
       final Set<MetricCategory> enabledCategories,
       final boolean timersEnabled,
-      final String jobName) {
+      final String jobName,
+      final boolean setAsGlobal) {
+    LOG.info("Starting OpenTelemetry metrics system");
     this.enabledCategories = ImmutableSet.copyOf(enabledCategories);
     this.timersEnabled = timersEnabled;
+    this.debugMetricReader = new DebugMetricReader();
     Resource resource =
         Resource.getDefault()
             .merge(
                 Resource.create(
-                    Attributes.newBuilder()
-                        .setAttribute(ResourceAttributes.SERVICE_NAME, jobName)
-                        .build()));
-    this.meterSdkProvider = MeterSdkProvider.builder().setResource(resource).build();
-  }
-
-  MeterSdkProvider getMeterSdkProvider() {
-    return meterSdkProvider;
+                    Attributes.builder().put(ResourceAttributes.SERVICE_NAME, jobName).build()));
+    AutoConfiguredOpenTelemetrySdk autoSdk =
+        AutoConfiguredOpenTelemetrySdk.builder()
+            .addMeterProviderCustomizer(
+                (provider, config) ->
+                    provider.setResource(resource).registerMetricReader(debugMetricReader))
+            .addTracerProviderCustomizer((provider, config) -> provider.setResource(resource))
+            .setResultAsGlobal(setAsGlobal)
+            .build();
+    OpenTelemetrySdk sdk = autoSdk.getOpenTelemetrySdk();
+    this.sdkMeterProvider = sdk.getSdkMeterProvider();
+    this.sdkTracerProvider = sdk.getSdkTracerProvider();
   }
 
   @Override
@@ -98,17 +130,45 @@ public Stream<Observation> streamObservations(final MetricCategory category) {
 
   @Override
   public Stream<Observation> streamObservations() {
-    Collection<MetricData> metricsList = meterSdkProvider.getMetricProducer().collectAllMetrics();
-    return metricsList.stream().map(this::convertToObservations).flatMap(stream -> stream);
+    Collection<MetricData> metricsList = this.debugMetricReader.getAllMetrics();
+    return metricsList.stream().flatMap(this::convertToObservations);
   }
 
   private Stream<Observation> convertToObservations(final MetricData metricData) {
     List<Observation> observations = new ArrayList<>();
     MetricCategory category =
-        categoryNameToMetricCategory(metricData.getInstrumentationLibraryInfo().getName());
-    for (MetricData.Point point : metricData.getPoints()) {
+        categoryNameToMetricCategory(metricData.getInstrumentationScopeInfo().getName());
+    if (category == null) {
+      return Stream.empty();
+    }
+    Collection<?> points;
+    switch (metricData.getType()) {
+      case DOUBLE_GAUGE:
+        points = metricData.getDoubleGaugeData().getPoints();
+        break;
+      case DOUBLE_SUM:
+        points = metricData.getDoubleSumData().getPoints();
+        break;
+      case SUMMARY:
+        points = metricData.getData().getPoints();
+        break;
+      case LONG_SUM:
+        points = metricData.getLongSumData().getPoints();
+        break;
+      case HISTOGRAM:
+        points = metricData.getData().getPoints();
+        break;
+      case LONG_GAUGE:
+        points = metricData.getLongGaugeData().getPoints();
+        break;
+      default:
+        throw new UnsupportedOperationException("Unsupported type " + metricData.getType().name());
+    }
+
+    for (Object ptObj : points) {
+      PointData point = (PointData) ptObj;
       List<String> labels = new ArrayList<>();
-      point.getLabels().forEach((k, v) -> labels.add(v));
+      point.getAttributes().forEach((k, v) -> labels.add(v.toString()));
       observations.add(
           new Observation(
               category, metricData.getName(), extractValue(metricData.getType(), point), labels));
@@ -127,19 +187,20 @@ private MetricCategory categoryNameToMetricCategory(final String name) {
         return category;
       }
     }
-    throw new IllegalArgumentException("Invalid metric category: " + name);
+    return null;
   }
 
-  private Object extractValue(final MetricData.Type type, final MetricData.Point point) {
+  private Object extractValue(final MetricDataType type, final PointData point) {
     switch (type) {
-      case NON_MONOTONIC_LONG:
-      case MONOTONIC_LONG:
-        return ((MetricData.LongPoint) point).getValue();
-      case NON_MONOTONIC_DOUBLE:
-      case MONOTONIC_DOUBLE:
-        return ((MetricData.DoublePoint) point).getValue();
+      case LONG_GAUGE:
+      case LONG_SUM:
+        return ((LongPointData) point).getValue();
+      case DOUBLE_GAUGE:
+        return ((DoublePointData) point).getValue();
       case SUMMARY:
-        return ((MetricData.SummaryPoint) point).getPercentileValues();
+        return ((SummaryPointData) point).getValues();
+      case HISTOGRAM:
+        return ((HistogramPointData) point).getCounts();
       default:
         throw new UnsupportedOperationException("Unsupported type " + type);
     }
@@ -151,13 +212,14 @@ public LabelledMetric<Counter> createLabelledCounter(
       final String name,
       final String help,
       final String... labelNames) {
+    LOG.trace("Creating a counter {}", name);
     return cachedCounters.computeIfAbsent(
         name,
         (k) -> {
           if (isCategoryEnabled(category)) {
-            final Meter meter = meterSdkProvider.get(category.getName());
+            final Meter meter = sdkMeterProvider.get(category.getName());
 
-            final LongCounter counter = meter.longCounterBuilder(name).setDescription(help).build();
+            final LongCounter counter = meter.counterBuilder(name).setDescription(help).build();
             return new OpenTelemetryCounter(counter, labelNames);
           } else {
             return NoOpMetricsSystem.getCounterLabelledMetric(labelNames.length);
@@ -171,15 +233,13 @@ public LabelledMetric<OperationTimer> createLabelledTimer(
       final String name,
       final String help,
       final String... labelNames) {
+    LOG.trace("Creating a timer {}", name);
     return cachedTimers.computeIfAbsent(
         name,
         (k) -> {
           if (timersEnabled && isCategoryEnabled(category)) {
-            final Meter meter = meterSdkProvider.get(category.getName());
-
-            final DoubleValueRecorder recorder =
-                meter.doubleValueRecorderBuilder(name).setDescription(help).build();
-            return new OpenTelemetryTimer(recorder, labelNames);
+            final Meter meter = sdkMeterProvider.get(category.getName());
+            return new OpenTelemetryTimer(name, help, meter, labelNames);
           } else {
             return NoOpMetricsSystem.getOperationTimerLabelledMetric(labelNames.length);
           }
@@ -192,12 +252,28 @@ public void createGauge(
       final String name,
       final String help,
       final DoubleSupplier valueSupplier) {
+    LOG.trace("Creating a gauge {}", name);
+    if (isCategoryEnabled(category)) {
+      final Meter meter = sdkMeterProvider.get(category.getName());
+      meter
+          .gaugeBuilder(name)
+          .setDescription(help)
+          .buildWithCallback(res -> res.record(valueSupplier.getAsDouble(), Attributes.empty()));
+    }
+  }
+
+  @Override
+  public LabelledGauge createLabelledGauge(
+      final MetricCategory category,
+      final String name,
+      final String help,
+      final String... labelNames) {
+    LOG.trace("Creating a labelled gauge {}", name);
     if (isCategoryEnabled(category)) {
-      final Meter meter = meterSdkProvider.get(category.getName());
-      DoubleValueObserver observer =
-          meter.doubleValueObserverBuilder(name).setDescription(help).build();
-      observer.setCallback(result -> result.observe(valueSupplier.getAsDouble(), Labels.empty()));
+      return new OpenTelemetryGauge(
+          name, help, sdkMeterProvider.get(category.getName()), List.of(labelNames));
     }
+    return NoOpMetricsSystem.getLabelledGauge(labelNames.length);
   }
 
   @Override
@@ -205,6 +281,7 @@ public Set<MetricCategory> getEnabledCategories() {
     return enabledCategories;
   }
 
+  /** Init defaults. */
   public void initDefaults() {
     if (isCategoryEnabled(StandardMetricCategory.JVM)) {
       collectGC();
@@ -216,75 +293,87 @@ private void collectGC() {
         ManagementFactory.getGarbageCollectorMXBeans();
     final MemoryMXBean memoryBean = ManagementFactory.getMemoryMXBean();
     final List<MemoryPoolMXBean> poolBeans = ManagementFactory.getMemoryPoolMXBeans();
-    final Meter meter = meterSdkProvider.get(StandardMetricCategory.JVM.getName());
-    final LongSumObserver gcMetric =
-        meter
-            .longSumObserverBuilder("jvm.gc.collection")
-            .setDescription("Time spent in a given JVM garbage collector in milliseconds.")
-            .setUnit("ms")
-            .build();
-    final List<Labels> labelSets = new ArrayList<>(garbageCollectors.size());
+    final Meter meter = sdkMeterProvider.get(StandardMetricCategory.JVM.getName());
+    final List<Attributes> labelSets = new ArrayList<>(garbageCollectors.size());
     for (final GarbageCollectorMXBean gc : garbageCollectors) {
-      labelSets.add(Labels.of("gc", gc.getName()));
+      labelSets.add(Attributes.of(AttributeKey.stringKey("gc"), gc.getName()));
     }
-
-    gcMetric.setCallback(
-        resultLongObserver -> {
-          for (int i = 0; i < garbageCollectors.size(); i++) {
-            resultLongObserver.observe(
-                garbageCollectors.get(i).getCollectionTime(), labelSets.get(i));
-          }
-        });
-
-    final LongUpDownSumObserver areaMetric =
-        meter
-            .longUpDownSumObserverBuilder("jvm.memory.area")
-            .setDescription("Bytes of a given JVM memory area.")
-            .setUnit("By")
-            .build();
-    final Labels usedHeap = Labels.of(TYPE_LABEL_KEY, USED, AREA_LABEL_KEY, HEAP);
-    final Labels usedNonHeap = Labels.of(TYPE_LABEL_KEY, USED, AREA_LABEL_KEY, NON_HEAP);
-    final Labels committedHeap = Labels.of(TYPE_LABEL_KEY, COMMITTED, AREA_LABEL_KEY, HEAP);
-    final Labels committedNonHeap = Labels.of(TYPE_LABEL_KEY, COMMITTED, AREA_LABEL_KEY, NON_HEAP);
+    meter
+        .gaugeBuilder("jvm.gc.collection")
+        .setDescription("Time spent in a given JVM garbage collector in milliseconds.")
+        .setUnit("ms")
+        .buildWithCallback(
+            resultLongObserver -> {
+              for (int i = 0; i < garbageCollectors.size(); i++) {
+                resultLongObserver.record(
+                    (double) garbageCollectors.get(i).getCollectionTime(), labelSets.get(i));
+              }
+            });
+    final AttributeKey<String> typeKey = AttributeKey.stringKey(TYPE_LABEL_KEY);
+    final AttributeKey<String> areaKey = AttributeKey.stringKey(AREA_LABEL_KEY);
+    final Attributes usedHeap = Attributes.of(typeKey, USED, areaKey, HEAP);
+    final Attributes usedNonHeap = Attributes.of(typeKey, USED, areaKey, NON_HEAP);
+    final Attributes committedHeap = Attributes.of(typeKey, COMMITTED, areaKey, HEAP);
+    final Attributes committedNonHeap = Attributes.of(typeKey, COMMITTED, areaKey, NON_HEAP);
     // TODO: Decide if max is needed or not. May be derived with some approximation from max(used).
-    final Labels maxHeap = Labels.of(TYPE_LABEL_KEY, MAX, AREA_LABEL_KEY, HEAP);
-    final Labels maxNonHeap = Labels.of(TYPE_LABEL_KEY, MAX, AREA_LABEL_KEY, NON_HEAP);
-    areaMetric.setCallback(
-        resultLongObserver -> {
-          MemoryUsage heapUsage = memoryBean.getHeapMemoryUsage();
-          MemoryUsage nonHeapUsage = memoryBean.getNonHeapMemoryUsage();
-          resultLongObserver.observe(heapUsage.getUsed(), usedHeap);
-          resultLongObserver.observe(nonHeapUsage.getUsed(), usedNonHeap);
-          resultLongObserver.observe(heapUsage.getUsed(), committedHeap);
-          resultLongObserver.observe(nonHeapUsage.getUsed(), committedNonHeap);
-          resultLongObserver.observe(heapUsage.getUsed(), maxHeap);
-          resultLongObserver.observe(nonHeapUsage.getUsed(), maxNonHeap);
-        });
-
-    final LongUpDownSumObserver poolMetric =
-        meter
-            .longUpDownSumObserverBuilder("jvm.memory.pool")
-            .setDescription("Bytes of a given JVM memory pool.")
-            .setUnit("By")
-            .build();
-    final List<Labels> usedLabelSets = new ArrayList<>(poolBeans.size());
-    final List<Labels> committedLabelSets = new ArrayList<>(poolBeans.size());
-    final List<Labels> maxLabelSets = new ArrayList<>(poolBeans.size());
+    final Attributes maxHeap = Attributes.of(typeKey, MAX, areaKey, HEAP);
+    final Attributes maxNonHeap = Attributes.of(typeKey, MAX, areaKey, NON_HEAP);
+    meter
+        .upDownCounterBuilder("jvm.memory.area")
+        .setDescription("Bytes of a given JVM memory area.")
+        .setUnit("By")
+        .buildWithCallback(
+            resultLongObserver -> {
+              MemoryUsage heapUsage = memoryBean.getHeapMemoryUsage();
+              MemoryUsage nonHeapUsage = memoryBean.getNonHeapMemoryUsage();
+              resultLongObserver.record(heapUsage.getUsed(), usedHeap);
+              resultLongObserver.record(nonHeapUsage.getUsed(), usedNonHeap);
+              resultLongObserver.record(heapUsage.getUsed(), committedHeap);
+              resultLongObserver.record(nonHeapUsage.getUsed(), committedNonHeap);
+              resultLongObserver.record(heapUsage.getUsed(), maxHeap);
+              resultLongObserver.record(nonHeapUsage.getUsed(), maxNonHeap);
+            });
+    final List<Attributes> usedLabelSets = new ArrayList<>(poolBeans.size());
+    final List<Attributes> committedLabelSets = new ArrayList<>(poolBeans.size());
+    final List<Attributes> maxLabelSets = new ArrayList<>(poolBeans.size());
+    final AttributeKey<String> poolKey = AttributeKey.stringKey(POOL_LABEL_KEY);
     for (final MemoryPoolMXBean pool : poolBeans) {
-      usedLabelSets.add(Labels.of(TYPE_LABEL_KEY, USED, POOL_LABEL_KEY, pool.getName()));
-      committedLabelSets.add(Labels.of(TYPE_LABEL_KEY, COMMITTED, POOL_LABEL_KEY, pool.getName()));
-      maxLabelSets.add(Labels.of(TYPE_LABEL_KEY, MAX, POOL_LABEL_KEY, pool.getName()));
+      usedLabelSets.add(Attributes.of(typeKey, USED, poolKey, pool.getName()));
+      committedLabelSets.add(Attributes.of(typeKey, COMMITTED, poolKey, pool.getName()));
+      maxLabelSets.add(Attributes.of(typeKey, MAX, poolKey, pool.getName()));
     }
-    poolMetric.setCallback(
-        resultLongObserver -> {
-          for (int i = 0; i < poolBeans.size(); i++) {
-            MemoryUsage poolUsage = poolBeans.get(i).getUsage();
-            resultLongObserver.observe(poolUsage.getUsed(), usedLabelSets.get(i));
-            resultLongObserver.observe(poolUsage.getCommitted(), committedLabelSets.get(i));
-            // TODO: Decide if max is needed or not. May be derived with some approximation from
-            //  max(used).
-            resultLongObserver.observe(poolUsage.getMax(), maxLabelSets.get(i));
-          }
-        });
+
+    meter
+        .upDownCounterBuilder("jvm.memory.pool")
+        .setDescription("Bytes of a given JVM memory pool.")
+        .setUnit("By")
+        .buildWithCallback(
+            resultLongObserver -> {
+              for (int i = 0; i < poolBeans.size(); i++) {
+                MemoryUsage poolUsage = poolBeans.get(i).getUsage();
+                resultLongObserver.record(poolUsage.getUsed(), usedLabelSets.get(i));
+                resultLongObserver.record(poolUsage.getCommitted(), committedLabelSets.get(i));
+                // TODO: Decide if max is needed or not. May be derived with some approximation from
+                //  max(used).
+                resultLongObserver.record(poolUsage.getMax(), maxLabelSets.get(i));
+              }
+            });
+  }
+
+  /** Shuts down the OpenTelemetry exporters, blocking until they have completed orderly. */
+  public void shutdown() {
+    final CompletableResultCode result =
+        CompletableResultCode.ofAll(
+            Arrays.asList(this.sdkMeterProvider.shutdown(), this.sdkTracerProvider.shutdown()));
+    result.join(5000, TimeUnit.SECONDS);
+  }
+
+  /**
+   * Gets tracer provider.
+   *
+   * @return the tracer provider
+   */
+  public TracerProvider getTracerProvider() {
+    return sdkTracerProvider;
   }
 }
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetryTimer.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetryTimer.java
index 359ad82b7c2..05090f5e808 100644
--- a/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetryTimer.java
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetryTimer.java
@@ -17,35 +17,50 @@
 import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
 import org.hyperledger.besu.plugin.services.metrics.OperationTimer;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import io.opentelemetry.common.Labels;
-import io.opentelemetry.metrics.DoubleValueRecorder;
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.common.AttributesBuilder;
+import io.opentelemetry.api.metrics.Meter;
 
+/** The Open telemetry timer. */
 public class OpenTelemetryTimer implements LabelledMetric<OperationTimer> {
 
-  private final DoubleValueRecorder recorder;
+  private final String help;
+  private final Meter meter;
+  private final String metricName;
   private final String[] labelNames;
 
-  public OpenTelemetryTimer(final DoubleValueRecorder recorder, final String... labelNames) {
-    this.recorder = recorder;
+  /**
+   * Instantiates a new Open telemetry timer.
+   *
+   * @param metricName the metric name
+   * @param help the help
+   * @param meter the meter
+   * @param labelNames the label names
+   */
+  public OpenTelemetryTimer(
+      final String metricName, final String help, final Meter meter, final String... labelNames) {
+    this.metricName = metricName;
+    this.help = help;
+    this.meter = meter;
     this.labelNames = labelNames;
   }
 
   @Override
   public OperationTimer labels(final String... labelValues) {
-    List<String> labelKeysAndValues = new ArrayList<>();
+    AttributesBuilder builder = Attributes.builder();
     for (int i = 0; i < labelNames.length; i++) {
-      labelKeysAndValues.add(labelNames[i]);
-      labelKeysAndValues.add(labelValues[i]);
+      builder.put(labelNames[i], labelValues[i]);
     }
-    final Labels labels = Labels.of(labelKeysAndValues.toArray(new String[] {}));
+    final Attributes labels = builder.build();
+
     return () -> {
       final long startTime = System.nanoTime();
       return () -> {
         long elapsed = System.nanoTime() - startTime;
-        recorder.record(elapsed, labels);
+        meter
+            .gaugeBuilder(metricName)
+            .setDescription(help)
+            .buildWithCallback((measurement) -> measurement.record((double) elapsed, labels));
         return elapsed / 1e9;
       };
     };
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/CurrentValueCollector.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/CurrentValueCollector.java
index 30b2606e746..fdcc32bafdf 100644
--- a/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/CurrentValueCollector.java
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/CurrentValueCollector.java
@@ -28,18 +28,31 @@ class CurrentValueCollector extends Collector {
   private final String metricName;
   private final String help;
   private final DoubleSupplier valueSupplier;
+  private final List<String> labelNames;
+  private final List<String> labelValues;
 
   public CurrentValueCollector(
       final String metricName, final String help, final DoubleSupplier valueSupplier) {
+    this(metricName, help, emptyList(), emptyList(), valueSupplier);
+  }
+
+  public CurrentValueCollector(
+      final String metricName,
+      final String help,
+      final List<String> labelNames,
+      final List<String> labelValues,
+      final DoubleSupplier valueSupplier) {
     this.metricName = metricName;
     this.help = help;
     this.valueSupplier = valueSupplier;
+    this.labelNames = labelNames;
+    this.labelValues = labelValues;
   }
 
   @Override
   public List<MetricFamilySamples> collect() {
     final Sample sample =
-        new Sample(metricName, emptyList(), emptyList(), valueSupplier.getAsDouble());
+        new Sample(metricName, labelNames, labelValues, valueSupplier.getAsDouble());
     return singletonList(
         new MetricFamilySamples(metricName, Type.GAUGE, help, singletonList(sample)));
   }
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsConfiguration.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsConfiguration.java
index 0b863f9d0ea..6a2424df50a 100644
--- a/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsConfiguration.java
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -28,13 +28,20 @@
 
 import com.google.common.base.MoreObjects;
 
+/** The Metrics configuration. */
 public class MetricsConfiguration {
   private static final String DEFAULT_METRICS_HOST = "127.0.0.1";
+  /** The constant DEFAULT_METRICS_PORT. */
   public static final int DEFAULT_METRICS_PORT = 9545;
+
   private static final MetricsProtocol DEFAULT_METRICS_PROTOCOL = MetricsProtocol.PROMETHEUS;
   private static final String DEFAULT_METRICS_PUSH_HOST = "127.0.0.1";
+  /** The constant DEFAULT_METRICS_PUSH_PORT. */
   public static final int DEFAULT_METRICS_PUSH_PORT = 9001;
-  public static final Boolean DEFAULT_TIMERS_ENABLED = true;
+  /** The constant DEFAULT_METRICS_TIMERS_ENABLED. */
+  public static final Boolean DEFAULT_METRICS_TIMERS_ENABLED = true;
+  /** The constant DEFAULT_METRICS_IDLE_TIMEOUT_SECONDS. */
+  public static final int DEFAULT_METRICS_IDLE_TIMEOUT_SECONDS = 60;
 
   private final boolean enabled;
   private final MetricsProtocol protocol;
@@ -49,7 +56,13 @@ public class MetricsConfiguration {
   private final String prometheusJob;
   private final List<String> hostsAllowlist;
   private final boolean timersEnabled;
+  private final int idleTimeout;
 
+  /**
+   * Builder.
+   *
+   * @return the builder
+   */
   public static Builder builder() {
     return new Builder();
   }
@@ -66,7 +79,8 @@ private MetricsConfiguration(
       final int pushInterval,
       final String prometheusJob,
       final List<String> hostsAllowlist,
-      final boolean timersEnabled) {
+      final boolean timersEnabled,
+      final int idleTimeout) {
     this.enabled = enabled;
     this.port = port;
     this.protocol = protocol;
@@ -79,70 +93,155 @@ private MetricsConfiguration(
     this.prometheusJob = prometheusJob;
     this.hostsAllowlist = hostsAllowlist;
     this.timersEnabled = timersEnabled;
+    this.idleTimeout = idleTimeout;
   }
 
+  /**
+   * Is enabled.
+   *
+   * @return the boolean
+   */
   public boolean isEnabled() {
     return enabled;
   }
 
+  /**
+   * Gets protocol.
+   *
+   * @return the protocol
+   */
   public MetricsProtocol getProtocol() {
     return protocol;
   }
 
+  /**
+   * Gets host.
+   *
+   * @return the host
+   */
   public String getHost() {
     return host;
   }
 
+  /**
+   * Gets port.
+   *
+   * @return the port
+   */
   public int getPort() {
     return port;
   }
 
+  /**
+   * Gets actual port.
+   *
+   * @return the actual port
+   */
   public int getActualPort() {
     return actualPort;
   }
 
+  /**
+   * Sets actual port.
+   *
+   * @param actualPort the actual port
+   */
   void setActualPort(final int actualPort) {
     this.actualPort = actualPort;
   }
 
+  /**
+   * Gets metric categories.
+   *
+   * @return the metric categories
+   */
   public Set<MetricCategory> getMetricCategories() {
     return metricCategories;
   }
 
+  /**
+   * Gets push port.
+   *
+   * @return the push port
+   */
   public int getPushPort() {
     return pushPort;
   }
 
+  /**
+   * Gets push host.
+   *
+   * @return the push host
+   */
   public String getPushHost() {
     return pushHost;
   }
 
+  /**
+   * Is push enabled boolean.
+   *
+   * @return the boolean
+   */
   public boolean isPushEnabled() {
     return pushEnabled;
   }
 
+  /**
+   * Gets push interval.
+   *
+   * @return the push interval
+   */
   public int getPushInterval() {
     return pushInterval;
   }
 
+  /**
+   * Gets prometheus job.
+   *
+   * @return the prometheus job
+   */
   public String getPrometheusJob() {
     return prometheusJob;
   }
 
+  /**
+   * Gets hosts whitelist.
+   *
+   * @return the hosts whitelist
+   */
   // use getHostsAllowlist instead
   @Deprecated
   Collection<String> getHostsWhitelist() {
     return Collections.unmodifiableCollection(this.hostsAllowlist);
   }
 
+  /**
+   * Gets hosts allowlist.
+   *
+   * @return the hosts allowlist
+   */
   Collection<String> getHostsAllowlist() {
     return Collections.unmodifiableCollection(this.hostsAllowlist);
   }
 
+  /**
+   * Is timers enabled.
+   *
+   * @return the boolean
+   */
   public boolean isTimersEnabled() {
     return timersEnabled;
   }
 
+  /**
+   * Gets idle timeout.
+   *
+   * @return the idle timeout
+   */
+  public int getIdleTimeout() {
+    return idleTimeout;
+  }
+
   @Override
   public String toString() {
     return MoreObjects.toStringHelper(this)
@@ -157,6 +256,8 @@ public String toString() {
         .add("pushInterval", pushInterval)
         .add("prometheusJob", prometheusJob)
         .add("hostsAllowlist", hostsAllowlist)
+        .add("timersEnabled", timersEnabled)
+        .add("idleTimeout", idleTimeout)
         .toString();
   }
 
@@ -179,7 +280,9 @@ public boolean equals(final Object o) {
         && Objects.equals(metricCategories, that.metricCategories)
         && Objects.equals(pushHost, that.pushHost)
         && Objects.equals(prometheusJob, that.prometheusJob)
-        && Objects.equals(hostsAllowlist, that.hostsAllowlist);
+        && Objects.equals(hostsAllowlist, that.hostsAllowlist)
+        && timersEnabled == that.timersEnabled
+        && idleTimeout == that.idleTimeout;
   }
 
   @Override
@@ -195,9 +298,12 @@ public int hashCode() {
         pushHost,
         pushInterval,
         prometheusJob,
-        hostsAllowlist);
+        hostsAllowlist,
+        timersEnabled,
+        idleTimeout);
   }
 
+  /** The type Builder. */
   public static class Builder {
     private boolean enabled = false;
     private MetricsProtocol protocol = DEFAULT_METRICS_PROTOCOL;
@@ -210,60 +316,127 @@ public static class Builder {
     private int pushInterval = 15;
     private String prometheusJob = "besu-client";
     private List<String> hostsAllowlist = Arrays.asList("localhost", "127.0.0.1");
-    private boolean timersEnabled = DEFAULT_TIMERS_ENABLED;
+    private boolean timersEnabled = DEFAULT_METRICS_TIMERS_ENABLED;
+    private int idleTimeout = DEFAULT_METRICS_IDLE_TIMEOUT_SECONDS;
 
     private Builder() {}
 
+    /**
+     * Enabled.
+     *
+     * @param enabled the enabled
+     * @return the builder
+     */
     public Builder enabled(final boolean enabled) {
       this.enabled = enabled;
       return this;
     }
 
+    /**
+     * Protocol.
+     *
+     * @param protocol the protocol
+     * @return the builder
+     */
     public Builder protocol(final MetricsProtocol protocol) {
       this.protocol = protocol;
       return this;
     }
 
+    /**
+     * Port.
+     *
+     * @param port the port
+     * @return the builder
+     */
     public Builder port(final int port) {
       this.port = port;
       return this;
     }
 
+    /**
+     * Host.
+     *
+     * @param host the host
+     * @return the builder
+     */
     public Builder host(final String host) {
       this.host = host;
       return this;
     }
 
+    /**
+     * Metric categories.
+     *
+     * @param metricCategories the metric categories
+     * @return the builder
+     */
     public Builder metricCategories(final Set<MetricCategory> metricCategories) {
       this.metricCategories = metricCategories;
       return this;
     }
 
+    /**
+     * Push enabled.
+     *
+     * @param pushEnabled the push enabled
+     * @return the builder
+     */
     public Builder pushEnabled(final boolean pushEnabled) {
       this.pushEnabled = pushEnabled;
       return this;
     }
 
+    /**
+     * Push port.
+     *
+     * @param pushPort the push port
+     * @return the builder
+     */
     public Builder pushPort(final int pushPort) {
       this.pushPort = pushPort;
       return this;
     }
 
+    /**
+     * Push host.
+     *
+     * @param pushHost the push host
+     * @return the builder
+     */
     public Builder pushHost(final String pushHost) {
       this.pushHost = pushHost;
       return this;
     }
 
+    /**
+     * Push interval.
+     *
+     * @param pushInterval the push interval
+     * @return the builder
+     */
     public Builder pushInterval(final int pushInterval) {
       this.pushInterval = pushInterval;
       return this;
     }
 
+    /**
+     * Prometheus job.
+     *
+     * @param prometheusJob the prometheus job
+     * @return the builder
+     */
     public Builder prometheusJob(final String prometheusJob) {
       this.prometheusJob = prometheusJob;
       return this;
     }
 
+    /**
+     * Hosts whitelist.
+     *
+     * @param hostsAllowlist the hosts allowlist
+     * @return the builder
+     */
     // use hostsAllowlist instead
     @Deprecated
     public Builder hostsWhitelist(final List<String> hostsAllowlist) {
@@ -271,16 +444,44 @@ public Builder hostsWhitelist(final List<String> hostsAllowlist) {
       return this;
     }
 
+    /**
+     * Hosts allowlist.
+     *
+     * @param hostsAllowlist the hosts allowlist
+     * @return the builder
+     */
     public Builder hostsAllowlist(final List<String> hostsAllowlist) {
       this.hostsAllowlist = hostsAllowlist;
       return this;
     }
 
+    /**
+     * Timers enabled.
+     *
+     * @param timersEnabled the timers enabled
+     * @return the builder
+     */
     public Builder timersEnabled(final boolean timersEnabled) {
       this.timersEnabled = timersEnabled;
       return this;
     }
 
+    /**
+     * Idle timeout.
+     *
+     * @param idleTimeout the idle timeout
+     * @return the builder
+     */
+    public Builder idleTimeout(final int idleTimeout) {
+      this.idleTimeout = idleTimeout;
+      return this;
+    }
+
+    /**
+     * Build metrics configuration.
+     *
+     * @return the metrics configuration
+     */
     public MetricsConfiguration build() {
       return new MetricsConfiguration(
           enabled,
@@ -294,7 +495,8 @@ public MetricsConfiguration build() {
           pushInterval,
           prometheusJob,
           hostsAllowlist,
-          timersEnabled);
+          timersEnabled,
+          idleTimeout);
     }
   }
 }
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsHttpService.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsHttpService.java
index dadd3739098..2c2023c190a 100644
--- a/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsHttpService.java
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsHttpService.java
@@ -43,11 +43,12 @@
 import io.vertx.core.http.HttpServerResponse;
 import io.vertx.ext.web.Router;
 import io.vertx.ext.web.RoutingContext;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Metrics http service. */
 public class MetricsHttpService implements MetricsService {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(MetricsHttpService.class);
 
   private static final InetSocketAddress EMPTY_SOCKET_ADDRESS = new InetSocketAddress("0.0.0.0", 0);
 
@@ -57,6 +58,13 @@ public class MetricsHttpService implements MetricsService {
 
   private HttpServer httpServer;
 
+  /**
+   * Instantiates a new Metrics http service.
+   *
+   * @param vertx the vertx
+   * @param configuration the configuration
+   * @param metricsSystem the metrics system
+   */
   public MetricsHttpService(
       final Vertx vertx,
       final MetricsConfiguration configuration,
@@ -81,7 +89,12 @@ public CompletableFuture<?> start() {
     // Create the HTTP server and a router object.
     httpServer =
         vertx.createHttpServer(
-            new HttpServerOptions().setHost(config.getHost()).setPort(config.getPort()));
+            new HttpServerOptions()
+                .setHost(config.getHost())
+                .setPort(config.getPort())
+                .setIdleTimeout(config.getIdleTimeout())
+                .setHandle100ContinueAutomatically(true)
+                .setCompressionSupported(true));
 
     final Router router = Router.router(vertx);
 
@@ -104,9 +117,7 @@ public CompletableFuture<?> start() {
                 final int actualPort = httpServer.actualPort();
                 config.setActualPort(actualPort);
                 LOG.info(
-                    "Metrics service started and listening on {}:{}",
-                    actualPort,
-                    httpServer.actualPort());
+                    "Metrics service started and listening on {}:{}", config.getHost(), actualPort);
                 return;
               }
               httpServer = null;
@@ -230,6 +241,11 @@ private void metricsRequest(final RoutingContext routingContext) {
         });
   }
 
+  /**
+   * Socket address inet socket address.
+   *
+   * @return the inet socket address
+   */
   InetSocketAddress socketAddress() {
     if (httpServer == null) {
       return EMPTY_SOCKET_ADDRESS;
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsPushGatewayService.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsPushGatewayService.java
index 871deaebb95..fa9cf53e809 100644
--- a/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsPushGatewayService.java
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/MetricsPushGatewayService.java
@@ -27,17 +27,24 @@
 import java.util.concurrent.TimeUnit;
 
 import io.prometheus.client.exporter.PushGateway;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Metrics push gateway service. */
 public class MetricsPushGatewayService implements MetricsService {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(MetricsPushGatewayService.class);
 
   private PushGateway pushGateway;
   private ScheduledExecutorService scheduledExecutorService;
   private final MetricsConfiguration config;
   private final MetricsSystem metricsSystem;
 
+  /**
+   * Instantiates a new Metrics push gateway service.
+   *
+   * @param configuration the configuration
+   * @param metricsSystem the metrics system
+   */
   public MetricsPushGatewayService(
       final MetricsConfiguration configuration, final MetricsSystem metricsSystem) {
     this.metricsSystem = metricsSystem;
@@ -86,13 +93,13 @@ public CompletableFuture<?> stop() {
       try {
         pushGateway.delete(config.getPrometheusJob());
       } catch (final Exception e) {
-        LOG.error("Could not clean up results on the  Prometheus Push Gateway.", e);
+        LOG.error("Could not clean up results on the Prometheus Push Gateway.", e);
         // Do not complete exceptionally, the gateway may be down and failures
         // here cause the shutdown to loop.  Failure is acceptable.
       }
       resultFuture.complete(null);
     } catch (final InterruptedException e) {
-      LOG.error(e);
+      LOG.error("Unable to shutdown push metrics service gracefully", e);
       resultFuture.completeExceptionally(e);
     }
     return resultFuture;
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusCounter.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusCounter.java
index 41c51cd6601..85b3750b778 100644
--- a/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusCounter.java
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusCounter.java
@@ -44,7 +44,7 @@ public void inc() {
 
     @Override
     public void inc(final long amount) {
-      counter.inc(amount);
+      counter.inc((double) amount);
     }
   }
 }
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusGauge.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusGauge.java
new file mode 100644
index 00000000000..83000dfac32
--- /dev/null
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusGauge.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.metrics.prometheus;
+
+import org.hyperledger.besu.plugin.services.metrics.LabelledGauge;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.DoubleSupplier;
+
+import io.prometheus.client.Collector;
+
+/** The Prometheus gauge. */
+public class PrometheusGauge extends Collector implements LabelledGauge {
+  private final String metricName;
+  private final String help;
+  private final List<String> labelNames;
+  private final Map<List<String>, DoubleSupplier> observationsMap = new ConcurrentHashMap<>();
+
+  /**
+   * Instantiates a new Prometheus gauge.
+   *
+   * @param metricName the metric name
+   * @param help the help
+   * @param labelNames the label names
+   */
+  public PrometheusGauge(
+      final String metricName, final String help, final List<String> labelNames) {
+    this.metricName = metricName;
+    this.help = help;
+    this.labelNames = labelNames;
+  }
+
+  @Override
+  public synchronized void labels(final DoubleSupplier valueSupplier, final String... labelValues) {
+    if (labelValues.length != labelNames.size()) {
+      throw new IllegalArgumentException(
+          "Label values and label names must be the same cardinality");
+    }
+    if (observationsMap.putIfAbsent(List.of(labelValues), valueSupplier) != null) {
+      final String labelValuesString = String.join(",", labelValues);
+      throw new IllegalArgumentException(
+          String.format("A gauge has already been created for label values %s", labelValuesString));
+    }
+  }
+
+  @Override
+  public List<MetricFamilySamples> collect() {
+    final List<MetricFamilySamples.Sample> samples = new ArrayList<>();
+    observationsMap.forEach(
+        (labels, valueSupplier) ->
+            samples.add(
+                new MetricFamilySamples.Sample(
+                    metricName, labelNames, labels, valueSupplier.getAsDouble())));
+    return List.of(new MetricFamilySamples(metricName, Type.GAUGE, help, samples));
+  }
+}
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusMetricsSystem.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusMetricsSystem.java
index b4be6eba0b2..fa07670521a 100644
--- a/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusMetricsSystem.java
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/prometheus/PrometheusMetricsSystem.java
@@ -18,6 +18,7 @@
 import org.hyperledger.besu.metrics.Observation;
 import org.hyperledger.besu.metrics.StandardMetricCategory;
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.services.metrics.LabelledGauge;
 import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
 import org.hyperledger.besu.plugin.services.metrics.MetricCategory;
 import org.hyperledger.besu.plugin.services.metrics.OperationTimer;
@@ -31,6 +32,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.DoubleSupplier;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import com.google.common.collect.ImmutableSet;
@@ -47,6 +49,7 @@
 import io.prometheus.client.hotspot.StandardExports;
 import io.prometheus.client.hotspot.ThreadExports;
 
+/** The Prometheus metrics system. */
 public class PrometheusMetricsSystem implements ObservableMetricsSystem {
 
   private final Map<MetricCategory, Collection<Collector>> collectors = new ConcurrentHashMap<>();
@@ -59,12 +62,19 @@ public class PrometheusMetricsSystem implements ObservableMetricsSystem {
   private final Set<MetricCategory> enabledCategories;
   private final boolean timersEnabled;
 
+  /**
+   * Instantiates a new Prometheus metrics system.
+   *
+   * @param enabledCategories the enabled categories
+   * @param timersEnabled the timers enabled
+   */
   public PrometheusMetricsSystem(
       final Set<MetricCategory> enabledCategories, final boolean timersEnabled) {
     this.enabledCategories = ImmutableSet.copyOf(enabledCategories);
     this.timersEnabled = timersEnabled;
   }
 
+  /** Init. */
   public void init() {
     addCollector(StandardMetricCategory.PROCESS, StandardExports::new);
     addCollector(StandardMetricCategory.JVM, MemoryPoolsExports::new);
@@ -141,6 +151,27 @@ public void createGauge(
     }
   }
 
+  @Override
+  public LabelledGauge createLabelledGauge(
+      final MetricCategory category,
+      final String name,
+      final String help,
+      final String... labelNames) {
+    final String metricName = convertToPrometheusName(category, name);
+    if (isCategoryEnabled(category)) {
+      final PrometheusGauge gauge = new PrometheusGauge(metricName, help, List.of(labelNames));
+      addCollectorUnchecked(category, gauge);
+      return gauge;
+    }
+    return NoOpMetricsSystem.getLabelledGauge(labelNames.length);
+  }
+
+  /**
+   * Add collector.
+   *
+   * @param category the category
+   * @param metricSupplier the metric supplier
+   */
   public void addCollector(
       final MetricCategory category, final Supplier<Collector> metricSupplier) {
     if (isCategoryEnabled(category)) {
@@ -149,10 +180,28 @@ public void addCollector(
   }
 
   private void addCollectorUnchecked(final MetricCategory category, final Collector metric) {
-    metric.register(registry);
-    collectors
-        .computeIfAbsent(category, key -> Collections.newSetFromMap(new ConcurrentHashMap<>()))
-        .add(metric);
+    final Collection<Collector> metrics =
+        this.collectors.computeIfAbsent(
+            category, key -> Collections.newSetFromMap(new ConcurrentHashMap<>()));
+
+    final List<String> newSamples =
+        metric.collect().stream()
+            .map(metricFamilySamples -> metricFamilySamples.name)
+            .collect(Collectors.toList());
+
+    metrics.stream()
+        .filter(
+            collector ->
+                collector.collect().stream()
+                    .anyMatch(metricFamilySamples -> newSamples.contains(metricFamilySamples.name)))
+        .findFirst()
+        .ifPresent(
+            collector -> {
+              metrics.remove(collector);
+              registry.unregister(collector);
+            });
+
+    metrics.add(metric.register(registry));
   }
 
   @Override
@@ -220,6 +269,13 @@ private Observation convertSummarySampleNamesToLabels(
         labelValues);
   }
 
+  /**
+   * Convert to prometheus name.
+   *
+   * @param category the category
+   * @param name the name
+   * @return the name as string
+   */
   public String convertToPrometheusName(final MetricCategory category, final String name) {
     return prometheusPrefix(category) + name;
   }
@@ -233,6 +289,11 @@ private String prometheusPrefix(final MetricCategory category) {
     return category.getApplicationPrefix().orElse("") + category.getName() + "_";
   }
 
+  /**
+   * Gets registry.
+   *
+   * @return the registry
+   */
   CollectorRegistry getRegistry() {
     return registry;
   }
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/vertx/VertxMetricsAdapter.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/vertx/VertxMetricsAdapter.java
index 45936ca62af..d32f8433d5b 100644
--- a/metrics/core/src/main/java/org/hyperledger/besu/metrics/vertx/VertxMetricsAdapter.java
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/vertx/VertxMetricsAdapter.java
@@ -19,10 +19,16 @@
 import io.vertx.core.spi.metrics.PoolMetrics;
 import io.vertx.core.spi.metrics.VertxMetrics;
 
+/** The Vertx metrics adapter. */
 public class VertxMetricsAdapter implements VertxMetrics {
 
   private final MetricsSystem metricsSystem;
 
+  /**
+   * Instantiates a new Vertx metrics adapter.
+   *
+   * @param metricsSystem the metrics system
+   */
   public VertxMetricsAdapter(final MetricsSystem metricsSystem) {
     this.metricsSystem = metricsSystem;
   }
diff --git a/metrics/core/src/main/java/org/hyperledger/besu/metrics/vertx/VertxMetricsAdapterFactory.java b/metrics/core/src/main/java/org/hyperledger/besu/metrics/vertx/VertxMetricsAdapterFactory.java
index effb33a744e..ca1f73550e8 100644
--- a/metrics/core/src/main/java/org/hyperledger/besu/metrics/vertx/VertxMetricsAdapterFactory.java
+++ b/metrics/core/src/main/java/org/hyperledger/besu/metrics/vertx/VertxMetricsAdapterFactory.java
@@ -20,10 +20,16 @@
 import io.vertx.core.spi.VertxMetricsFactory;
 import io.vertx.core.spi.metrics.VertxMetrics;
 
+/** The Vertx metrics adapter factory. */
 public class VertxMetricsAdapterFactory implements VertxMetricsFactory {
 
   private final MetricsSystem metricsSystem;
 
+  /**
+   * Instantiates a new Vertx metrics adapter factory.
+   *
+   * @param metricsSystem the metrics system
+   */
   public VertxMetricsAdapterFactory(final MetricsSystem metricsSystem) {
     this.metricsSystem = metricsSystem;
   }
diff --git a/metrics/core/src/test-support/java/org/hyperledger/besu/metrics/StubMetricsSystem.java b/metrics/core/src/test-support/java/org/hyperledger/besu/metrics/StubMetricsSystem.java
index 492ebd3dd8a..9e4b9d1ef96 100644
--- a/metrics/core/src/test-support/java/org/hyperledger/besu/metrics/StubMetricsSystem.java
+++ b/metrics/core/src/test-support/java/org/hyperledger/besu/metrics/StubMetricsSystem.java
@@ -18,6 +18,7 @@
 
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.plugin.services.metrics.LabelledGauge;
 import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
 import org.hyperledger.besu.plugin.services.metrics.MetricCategory;
 import org.hyperledger.besu.plugin.services.metrics.OperationTimer;
@@ -44,6 +45,15 @@ public LabelledMetric<Counter> createLabelledCounter(
     return counters.computeIfAbsent(name, key -> new StubLabelledCounter());
   }
 
+  @Override
+  public LabelledGauge createLabelledGauge(
+      final MetricCategory category,
+      final String name,
+      final String help,
+      final String... labelNames) {
+    return NoOpMetricsSystem.getLabelledGauge(labelNames.length);
+  }
+
   public long getCounterValue(final String name, final String... labels) {
     final StubLabelledCounter labelledCounter = counters.get(name);
     if (labelledCounter == null) {
diff --git a/metrics/core/src/test/java/org/hyperledger/besu/metrics/RunnableTimedCounterTest.java b/metrics/core/src/test/java/org/hyperledger/besu/metrics/RunnableTimedCounterTest.java
new file mode 100644
index 00000000000..a6b79eca32c
--- /dev/null
+++ b/metrics/core/src/test/java/org/hyperledger/besu/metrics/RunnableTimedCounterTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.metrics;
+
+import static org.assertj.core.api.Assertions.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import org.hyperledger.besu.plugin.services.metrics.Counter;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
+public class RunnableTimedCounterTest {
+
+  @Mock Counter backedCounter;
+
+  @Test
+  public void shouldNotRunTaskIfIntervalNotElapsed() {
+
+    RunnableTimedCounter rtc =
+        new RunnableTimedCounter(
+            backedCounter, () -> fail("Must not be called"), 1L, TimeUnit.MINUTES);
+
+    rtc.inc();
+    verify(backedCounter).inc(1L);
+  }
+
+  @Test
+  public void shouldRunTaskIfIntervalElapsed() throws InterruptedException {
+
+    Runnable task = mock(Runnable.class);
+
+    RunnableTimedCounter rtc =
+        new RunnableTimedCounter(backedCounter, task, 1L, TimeUnit.MICROSECONDS);
+
+    Thread.sleep(1L);
+
+    rtc.inc();
+
+    verify(backedCounter).inc(1L);
+    verify(task).run();
+  }
+}
diff --git a/metrics/core/src/test/java/org/hyperledger/besu/metrics/noop/NoOpMetricsSystemTest.java b/metrics/core/src/test/java/org/hyperledger/besu/metrics/noop/NoOpMetricsSystemTest.java
index 807bc495706..c68080f5216 100644
--- a/metrics/core/src/test/java/org/hyperledger/besu/metrics/noop/NoOpMetricsSystemTest.java
+++ b/metrics/core/src/test/java/org/hyperledger/besu/metrics/noop/NoOpMetricsSystemTest.java
@@ -23,7 +23,7 @@
 import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
 import org.hyperledger.besu.plugin.services.metrics.OperationTimer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class NoOpMetricsSystemTest {
 
diff --git a/metrics/core/src/test/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetryMetricsSystemTest.java b/metrics/core/src/test/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetryMetricsSystemTest.java
index b3a91723895..f1bff33e555 100644
--- a/metrics/core/src/test/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetryMetricsSystemTest.java
+++ b/metrics/core/src/test/java/org/hyperledger/besu/metrics/opentelemetry/OpenTelemetryMetricsSystemTest.java
@@ -31,17 +31,21 @@
 import org.hyperledger.besu.metrics.prometheus.MetricsConfiguration;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.plugin.services.metrics.LabelledGauge;
 import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
 import org.hyperledger.besu.plugin.services.metrics.OperationTimer;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import com.google.common.collect.ImmutableSet;
-import io.opentelemetry.sdk.metrics.data.MetricData;
-import org.junit.Test;
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class OpenTelemetryMetricsSystemTest {
 
@@ -50,11 +54,38 @@ public class OpenTelemetryMetricsSystemTest {
           .thenComparing(Observation::getMetricName)
           .thenComparing((o1, o2) -> o1.getLabels().equals(o2.getLabels()) ? 0 : 1);
 
-  private final ObservableMetricsSystem metricsSystem =
-      new OpenTelemetrySystem(DEFAULT_METRIC_CATEGORIES, true, "job");
+  @BeforeEach
+  public void resetGlobalOpenTelemetry() {
+    GlobalOpenTelemetry.resetForTest();
+  }
+
+  private OpenTelemetrySystem metricsSystem = null;
+
+  private List<Observation> getObservation(final ObservableMetricsSystem metricsSystem)
+      throws InterruptedException {
+    for (int i = 0; i < 20; i++) {
+      Stream<Observation> observations = metricsSystem.streamObservations();
+      List<Observation> result = observations.collect(Collectors.toList());
+      if (!result.isEmpty()) {
+        return result;
+      }
+      Thread.sleep(100);
+    }
+    return null;
+  }
+
+  @BeforeEach
+  public void setUp() {
+    metricsSystem = new OpenTelemetrySystem(DEFAULT_METRIC_CATEGORIES, true, "job", false);
+  }
+
+  @AfterEach
+  public void tearDown() {
+    metricsSystem.shutdown();
+  }
 
   @Test
-  public void shouldCreateObservationFromCounter() {
+  public void shouldCreateObservationFromCounter() throws InterruptedException {
     final Counter counter = metricsSystem.createCounter(PEERS, "connected", "Some help string");
 
     counter.inc();
@@ -62,12 +93,12 @@ public void shouldCreateObservationFromCounter() {
         .containsExactly(new Observation(PEERS, "connected", 1L, emptyList()));
 
     counter.inc();
-    assertThat(metricsSystem.streamObservations())
+    assertThat(getObservation(metricsSystem))
         .containsExactly(new Observation(PEERS, "connected", 2L, emptyList()));
   }
 
   @Test
-  public void shouldHandleDuplicateCounterCreation() {
+  public void shouldHandleDuplicateCounterCreation() throws InterruptedException {
     final LabelledMetric<Counter> counter1 =
         metricsSystem.createLabelledCounter(PEERS, "connected", "Some help string");
     final LabelledMetric<Counter> counter2 =
@@ -79,7 +110,7 @@ public void shouldHandleDuplicateCounterCreation() {
         .containsExactly(new Observation(PEERS, "connected", 1L, emptyList()));
 
     counter2.labels().inc();
-    assertThat(metricsSystem.streamObservations())
+    assertThat(getObservation(metricsSystem))
         .containsExactly(new Observation(PEERS, "connected", 2L, emptyList()));
   }
 
@@ -99,7 +130,7 @@ public void shouldCreateSeparateObservationsForEachCounterLabelValue() {
   }
 
   @Test
-  public void shouldIncrementCounterBySpecifiedAmount() {
+  public void shouldIncrementCounterBySpecifiedAmount() throws InterruptedException {
     final Counter counter = metricsSystem.createCounter(PEERS, "connected", "Some help string");
 
     counter.inc(5);
@@ -107,7 +138,7 @@ public void shouldIncrementCounterBySpecifiedAmount() {
         .containsExactly(new Observation(PEERS, "connected", 5L, emptyList()));
 
     counter.inc(6);
-    assertThat(metricsSystem.streamObservations())
+    assertThat(getObservation(metricsSystem))
         .containsExactly(new Observation(PEERS, "connected", 11L, emptyList()));
   }
 
@@ -153,15 +184,21 @@ public void shouldCreateObservationsFromTimerWithLabels() {
 
   @Test
   public void shouldNotCreateObservationsFromTimerWhenTimersDisabled() {
-    final ObservableMetricsSystem metricsSystem =
-        new OpenTelemetrySystem(DEFAULT_METRIC_CATEGORIES, false, "job");
-    final LabelledMetric<OperationTimer> timer =
-        metricsSystem.createLabelledTimer(RPC, "request", "Some help", "methodName");
-
-    //noinspection EmptyTryBlock
-    try (final OperationTimer.TimingContext ignored = timer.labels("method").startTimer()) {}
-
-    assertThat(metricsSystem.streamObservations()).isEmpty();
+    OpenTelemetrySystem metricsSystem = null;
+    try {
+      metricsSystem = new OpenTelemetrySystem(DEFAULT_METRIC_CATEGORIES, false, "job", false);
+      final LabelledMetric<OperationTimer> timer =
+          metricsSystem.createLabelledTimer(RPC, "request", "Some help", "methodName");
+
+      //noinspection EmptyTryBlock
+      try (final OperationTimer.TimingContext ignored = timer.labels("method").startTimer()) {}
+
+      assertThat(metricsSystem.streamObservations()).isEmpty();
+    } finally {
+      if (metricsSystem != null) {
+        metricsSystem.shutdown();
+      }
+    }
   }
 
   @Test
@@ -172,44 +209,81 @@ public void shouldCreateObservationFromGauge() {
             .enabled(true)
             .protocol(OPENTELEMETRY)
             .build();
-    final ObservableMetricsSystem localMetricSystem =
-        MetricsSystemFactory.create(metricsConfiguration);
-    localMetricSystem.createGauge(RPC, "myValue", "Help", () -> 7d);
-    List<MetricData.ValueAtPercentile> values = new ArrayList<>();
-    values.add(MetricData.ValueAtPercentile.create(0, 7d));
-    values.add(MetricData.ValueAtPercentile.create(100, 7d));
+    OpenTelemetrySystem localMetricSystem = null;
+    try {
+      localMetricSystem =
+          new OpenTelemetrySystem(
+              metricsConfiguration.getMetricCategories(),
+              metricsConfiguration.isTimersEnabled(),
+              metricsConfiguration.getPrometheusJob(),
+              false);
+      localMetricSystem.initDefaults();
+      localMetricSystem.createGauge(RPC, "myValue", "Help", () -> 7.0);
+
+      assertThat(localMetricSystem.streamObservations())
+          .containsExactlyInAnyOrder(new Observation(RPC, "myValue", 7.0, emptyList()));
+    } finally {
+      if (localMetricSystem != null) {
+        localMetricSystem.shutdown();
+      }
+    }
+  }
+
+  @Test
+  public void shouldCreateLabelledGauge() {
+    LabelledGauge labelledGauge =
+        metricsSystem.createLabelledGauge(RPC, "gaugeName", "help", "a", "b");
+    labelledGauge.labels(() -> 1.0, "a1", "b1");
+    labelledGauge.labels(() -> 11.0, "a2", "b2");
+    labelledGauge.labels(() -> 21.0, "a3", "b3");
 
-    assertThat(localMetricSystem.streamObservations())
-        .containsExactlyInAnyOrder(new Observation(RPC, "myValue", values, emptyList()));
+    assertThat(metricsSystem.streamObservations())
+        .containsExactlyInAnyOrder(
+            new Observation(RPC, "gaugeName", 1.0, List.of("a1", "b1")),
+            new Observation(RPC, "gaugeName", 11.0, List.of("a2", "b2")),
+            new Observation(RPC, "gaugeName", 21.0, List.of("a3", "b3")));
   }
 
   @Test
-  public void shouldOnlyObserveEnabledMetrics() {
+  public void shouldOnlyObserveEnabledMetrics() throws InterruptedException {
     final MetricsConfiguration metricsConfiguration =
         MetricsConfiguration.builder()
             .metricCategories(ImmutableSet.of(BesuMetricCategory.RPC))
             .enabled(true)
             .protocol(OPENTELEMETRY)
             .build();
-    final ObservableMetricsSystem localMetricSystem =
-        MetricsSystemFactory.create(metricsConfiguration);
-
-    // do a category we are not watching
-    final LabelledMetric<Counter> counterN =
-        localMetricSystem.createLabelledCounter(NETWORK, "ABC", "Not that kind of network", "show");
-    assertThat(counterN).isSameAs(NoOpMetricsSystem.NO_OP_LABELLED_1_COUNTER);
-
-    counterN.labels("show").inc();
-    assertThat(localMetricSystem.streamObservations()).isEmpty();
-
-    // do a category we are watching
-    final LabelledMetric<Counter> counterR =
-        localMetricSystem.createLabelledCounter(RPC, "name", "Not useful", "method");
-    assertThat(counterR).isNotSameAs(NoOpMetricsSystem.NO_OP_LABELLED_1_COUNTER);
-
-    counterR.labels("op").inc();
-    assertThat(localMetricSystem.streamObservations())
-        .containsExactly(new Observation(RPC, "name", (long) 1, singletonList("op")));
+    OpenTelemetrySystem localMetricSystem = null;
+    try {
+      localMetricSystem =
+          new OpenTelemetrySystem(
+              metricsConfiguration.getMetricCategories(),
+              metricsConfiguration.isTimersEnabled(),
+              metricsConfiguration.getPrometheusJob(),
+              false);
+      localMetricSystem.initDefaults();
+
+      // do a category we are not watching
+      final LabelledMetric<Counter> counterN =
+          localMetricSystem.createLabelledCounter(
+              NETWORK, "ABC", "Not that kind of network", "show");
+      assertThat(counterN).isSameAs(NoOpMetricsSystem.NO_OP_LABELLED_1_COUNTER);
+
+      counterN.labels("show").inc();
+      assertThat(localMetricSystem.streamObservations()).isEmpty();
+
+      // do a category we are watching
+      final LabelledMetric<Counter> counterR =
+          localMetricSystem.createLabelledCounter(RPC, "name", "Not useful", "method");
+      assertThat(counterR).isNotSameAs(NoOpMetricsSystem.NO_OP_LABELLED_1_COUNTER);
+
+      counterR.labels("op").inc();
+      assertThat(getObservation(localMetricSystem))
+          .containsExactly(new Observation(RPC, "name", (long) 1, singletonList("op")));
+    } finally {
+      if (localMetricSystem != null) {
+        localMetricSystem.shutdown();
+      }
+    }
   }
 
   @Test
@@ -233,21 +307,15 @@ public void returnsPrometheusMetricsWhenEnabled() {
             .pushEnabled(false)
             .protocol(OPENTELEMETRY)
             .build();
-    final MetricsSystem localMetricSystem = MetricsSystemFactory.create(metricsConfiguration);
-
-    assertThat(localMetricSystem).isInstanceOf(OpenTelemetrySystem.class);
-  }
-
-  @Test
-  public void returnsNoOpMetricsWhenPushEnabled() {
-    final MetricsConfiguration metricsConfiguration =
-        MetricsConfiguration.builder()
-            .enabled(false)
-            .pushEnabled(true)
-            .protocol(OPENTELEMETRY)
-            .build();
-    final MetricsSystem localMetricSystem = MetricsSystemFactory.create(metricsConfiguration);
-
-    assertThat(localMetricSystem).isInstanceOf(OpenTelemetrySystem.class);
+    OpenTelemetrySystem localMetricSystem = null;
+    try {
+      localMetricSystem = (OpenTelemetrySystem) MetricsSystemFactory.create(metricsConfiguration);
+
+      assertThat(localMetricSystem).isInstanceOf(OpenTelemetrySystem.class);
+    } finally {
+      if (localMetricSystem != null) {
+        localMetricSystem.shutdown();
+      }
+    }
   }
 }
diff --git a/metrics/core/src/test/java/org/hyperledger/besu/metrics/prometheus/MetricsHttpServiceTest.java b/metrics/core/src/test/java/org/hyperledger/besu/metrics/prometheus/MetricsHttpServiceTest.java
index 0d1ab758b18..064dabfe331 100644
--- a/metrics/core/src/test/java/org/hyperledger/besu/metrics/prometheus/MetricsHttpServiceTest.java
+++ b/metrics/core/src/test/java/org/hyperledger/besu/metrics/prometheus/MetricsHttpServiceTest.java
@@ -23,28 +23,25 @@
 import java.net.InetSocketAddress;
 import java.util.Properties;
 
+import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.prometheus.client.exporter.common.TextFormat;
 import io.vertx.core.Vertx;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class MetricsHttpServiceTest {
 
-  @ClassRule public static final TemporaryFolder folder = new TemporaryFolder();
-
   private static final Vertx vertx = Vertx.vertx();
 
   private static MetricsHttpService service;
   private static OkHttpClient client;
   private static String baseUrl;
 
-  @BeforeClass
+  @BeforeAll
   public static void initServerAndClient() {
     service = createMetricsHttpService();
     service.start().join();
@@ -55,10 +52,12 @@ public static void initServerAndClient() {
   }
 
   private static MetricsHttpService createMetricsHttpService(final MetricsConfiguration config) {
+    GlobalOpenTelemetry.resetForTest();
     return new MetricsHttpService(vertx, config, MetricsSystemFactory.create(config));
   }
 
   private static MetricsHttpService createMetricsHttpService() {
+    GlobalOpenTelemetry.resetForTest();
     final MetricsConfiguration metricsConfiguration = createMetricsConfig();
     return new MetricsHttpService(
         vertx, metricsConfiguration, MetricsSystemFactory.create(metricsConfiguration));
@@ -73,7 +72,7 @@ private static MetricsConfiguration.Builder createMetricsConfigBuilder() {
   }
 
   /** Tears down the HTTP server. */
-  @AfterClass
+  @AfterAll
   public static void shutdownServer() {
     service.stop().join();
     vertx.close();
diff --git a/metrics/core/src/test/java/org/hyperledger/besu/metrics/prometheus/PrometheusMetricsSystemTest.java b/metrics/core/src/test/java/org/hyperledger/besu/metrics/prometheus/PrometheusMetricsSystemTest.java
index 59dea6114f5..7c62f1f0b6c 100644
--- a/metrics/core/src/test/java/org/hyperledger/besu/metrics/prometheus/PrometheusMetricsSystemTest.java
+++ b/metrics/core/src/test/java/org/hyperledger/besu/metrics/prometheus/PrometheusMetricsSystemTest.java
@@ -32,14 +32,18 @@
 import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.plugin.services.metrics.LabelledGauge;
 import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
 import org.hyperledger.besu.plugin.services.metrics.OperationTimer;
 
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.List;
 
 import com.google.common.collect.ImmutableSet;
-import org.junit.Test;
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class PrometheusMetricsSystemTest {
 
@@ -48,6 +52,11 @@ public class PrometheusMetricsSystemTest {
           .thenComparing(Observation::getMetricName)
           .thenComparing((o1, o2) -> o1.getLabels().equals(o2.getLabels()) ? 0 : 1);
 
+  @BeforeEach
+  public void resetGlobalOpenTelemetry() {
+    GlobalOpenTelemetry.resetForTest();
+  }
+
   private final ObservableMetricsSystem metricsSystem =
       new PrometheusMetricsSystem(DEFAULT_METRIC_CATEGORIES, true);
 
@@ -57,11 +66,11 @@ public void shouldCreateObservationFromCounter() {
 
     counter.inc();
     assertThat(metricsSystem.streamObservations())
-        .containsExactly(new Observation(PEERS, "connected", 1d, emptyList()));
+        .containsExactly(new Observation(PEERS, "connected", 1.0, emptyList()));
 
     counter.inc();
     assertThat(metricsSystem.streamObservations())
-        .containsExactly(new Observation(PEERS, "connected", 2d, emptyList()));
+        .containsExactly(new Observation(PEERS, "connected", 2.0, emptyList()));
   }
 
   @Test
@@ -74,11 +83,11 @@ public void shouldHandleDuplicateCounterCreation() {
 
     counter1.labels().inc();
     assertThat(metricsSystem.streamObservations())
-        .containsExactly(new Observation(PEERS, "connected", 1d, emptyList()));
+        .containsExactly(new Observation(PEERS, "connected", 1.0, emptyList()));
 
     counter2.labels().inc();
     assertThat(metricsSystem.streamObservations())
-        .containsExactly(new Observation(PEERS, "connected", 2d, emptyList()));
+        .containsExactly(new Observation(PEERS, "connected", 2.0, emptyList()));
   }
 
   @Test
@@ -92,8 +101,35 @@ public void shouldCreateSeparateObservationsForEachCounterLabelValue() {
 
     assertThat(metricsSystem.streamObservations())
         .containsExactlyInAnyOrder(
-            new Observation(PEERS, "connected", 2d, singletonList("value1")),
-            new Observation(PEERS, "connected", 1d, singletonList("value2")));
+            new Observation(PEERS, "connected", 2.0, singletonList("value1")),
+            new Observation(PEERS, "connected", 1.0, singletonList("value2")));
+  }
+
+  @Test
+  public void shouldCreateSeparateObservationsForEachLabelledGaugeValue() {
+    final LabelledGauge gauge =
+        metricsSystem.createLabelledGauge(PEERS, "test", "test help", "a", "b", "c");
+    final double value1 = 1.0;
+    final double value2 = 11.0;
+
+    gauge.labels(() -> value1, "a1", "b1", "c1");
+    gauge.labels(() -> value2, "a2", "b2", "c2");
+
+    assertThat(metricsSystem.streamObservations())
+        .containsExactlyInAnyOrder(
+            new Observation(PEERS, "test", 1.0, List.of("a1", "b1", "c1")),
+            new Observation(PEERS, "test", 11.0, List.of("a2", "b2", "c2")));
+  }
+
+  @Test
+  public void shouldNotUseSameLabelsTwiceOnSameGauge() {
+    final LabelledGauge gauge =
+        metricsSystem.createLabelledGauge(PEERS, "test", "test help", "a", "b", "c");
+    final double value1 = 1.0;
+
+    gauge.labels(() -> value1, "a1", "b1", "c1");
+    assertThatThrownBy(() -> gauge.labels(() -> value1, "a1", "b1", "c1"))
+        .isInstanceOf(IllegalArgumentException.class);
   }
 
   @Test
@@ -102,11 +138,11 @@ public void shouldIncrementCounterBySpecifiedAmount() {
 
     counter.inc(5);
     assertThat(metricsSystem.streamObservations())
-        .containsExactly(new Observation(PEERS, "connected", 5d, emptyList()));
+        .containsExactly(new Observation(PEERS, "connected", 5.0, emptyList()));
 
     counter.inc(6);
     assertThat(metricsSystem.streamObservations())
-        .containsExactly(new Observation(PEERS, "connected", 11d, emptyList()));
+        .containsExactly(new Observation(PEERS, "connected", 11.0, emptyList()));
   }
 
   @Test
@@ -174,20 +210,20 @@ public void shouldNotCreateObservationsFromTimerWhenTimersDisabled() {
 
   @Test
   public void shouldCreateObservationFromGauge() {
-    metricsSystem.createGauge(JVM, "myValue", "Help", () -> 7d);
+    metricsSystem.createGauge(JVM, "myValue", "Help", () -> 7.0);
 
     assertThat(metricsSystem.streamObservations())
-        .containsExactlyInAnyOrder(new Observation(JVM, "myValue", 7d, emptyList()));
+        .containsExactlyInAnyOrder(new Observation(JVM, "myValue", 7.0, emptyList()));
   }
 
   @Test
-  public void shouldNotAllowDuplicateGaugeCreation() {
-    // Gauges have a reference to the source of their data so creating it twice will still only
-    // pull data from the first instance, possibly leaking memory and likely returning the wrong
-    // results.
-    metricsSystem.createGauge(JVM, "myValue", "Help", () -> 7d);
-    assertThatThrownBy(() -> metricsSystem.createGauge(JVM, "myValue", "Help", () -> 7d))
-        .isInstanceOf(IllegalArgumentException.class);
+  public void shouldAllowDuplicateGaugeCreation() {
+    // When we are pushing the same gauge, the first one will be unregistered and the new one will
+    // be used
+    metricsSystem.createGauge(JVM, "myValue", "Help", () -> 7.0);
+    metricsSystem.createGauge(JVM, "myValue", "Help", () -> 7.0);
+    assertThat(metricsSystem.streamObservations())
+        .containsExactlyInAnyOrder(new Observation(JVM, "myValue", 7.0, emptyList()));
   }
 
   @Test
diff --git a/metrics/rocksdb/build.gradle b/metrics/rocksdb/build.gradle
index 91a274de620..292909565d6 100644
--- a/metrics/rocksdb/build.gradle
+++ b/metrics/rocksdb/build.gradle
@@ -34,11 +34,12 @@ publishing {
 }
 
 dependencies {
+  api 'org.slf4j:slf4j-api'
+
   implementation project(':metrics:core')
   implementation project(':plugin-api')
 
   implementation 'com.google.guava:guava'
   implementation 'io.prometheus:simpleclient'
-  implementation 'org.apache.logging.log4j:log4j-api'
   implementation 'org.rocksdb:rocksdbjni'
 }
diff --git a/metrics/rocksdb/src/main/java/org/hyperledger/besu/metrics/rocksdb/RocksDBStats.java b/metrics/rocksdb/src/main/java/org/hyperledger/besu/metrics/rocksdb/RocksDBStats.java
index f92accba868..01e7aca7a36 100644
--- a/metrics/rocksdb/src/main/java/org/hyperledger/besu/metrics/rocksdb/RocksDBStats.java
+++ b/metrics/rocksdb/src/main/java/org/hyperledger/besu/metrics/rocksdb/RocksDBStats.java
@@ -29,13 +29,19 @@
 import org.rocksdb.Statistics;
 import org.rocksdb.TickerType;
 
+/** The Rocks db stats. */
 public class RocksDBStats {
 
+  /** The Labels. */
   static final List<String> LABELS = Collections.singletonList("quantile");
+  /** The Label 50. */
   static final List<String> LABEL_50 = Collections.singletonList("0.5");
+  /** The Label 95. */
   static final List<String> LABEL_95 = Collections.singletonList("0.95");
+  /** The Label 99. */
   static final List<String> LABEL_99 = Collections.singletonList("0.99");
 
+  /** The constant TICKERS. */
   // Tickers - RocksDB equivalent of counters
   static final TickerType[] TICKERS = {
     TickerType.BLOCK_CACHE_ADD,
@@ -45,12 +51,10 @@ public class RocksDBStats {
     TickerType.BLOCK_CACHE_INDEX_HIT,
     TickerType.BLOCK_CACHE_INDEX_ADD,
     TickerType.BLOCK_CACHE_INDEX_BYTES_INSERT,
-    TickerType.BLOCK_CACHE_INDEX_BYTES_EVICT,
     TickerType.BLOCK_CACHE_FILTER_MISS,
     TickerType.BLOCK_CACHE_FILTER_HIT,
     TickerType.BLOCK_CACHE_FILTER_ADD,
     TickerType.BLOCK_CACHE_FILTER_BYTES_INSERT,
-    TickerType.BLOCK_CACHE_FILTER_BYTES_EVICT,
     TickerType.BLOCK_CACHE_DATA_MISS,
     TickerType.BLOCK_CACHE_DATA_HIT,
     TickerType.BLOCK_CACHE_DATA_ADD,
@@ -84,7 +88,6 @@ public class RocksDBStats {
     TickerType.NUMBER_DB_NEXT_FOUND,
     TickerType.NUMBER_DB_PREV_FOUND,
     TickerType.ITER_BYTES_READ,
-    TickerType.NO_FILE_CLOSES,
     TickerType.NO_FILE_OPENS,
     TickerType.NO_FILE_ERRORS,
     // TickerType.STALL_L0_SLOWDOWN_MICROS,
@@ -92,26 +95,18 @@ public class RocksDBStats {
     // TickerType.STALL_L0_NUM_FILES_MICROS,
     TickerType.STALL_MICROS,
     TickerType.DB_MUTEX_WAIT_MICROS,
-    TickerType.RATE_LIMIT_DELAY_MILLIS,
-    TickerType.NO_ITERATORS,
     TickerType.NUMBER_MULTIGET_BYTES_READ,
     TickerType.NUMBER_MULTIGET_KEYS_READ,
     TickerType.NUMBER_MULTIGET_CALLS,
-    TickerType.NUMBER_FILTERED_DELETES,
     TickerType.NUMBER_MERGE_FAILURES,
     TickerType.BLOOM_FILTER_PREFIX_CHECKED,
     TickerType.BLOOM_FILTER_PREFIX_USEFUL,
     TickerType.NUMBER_OF_RESEEKS_IN_ITERATION,
     TickerType.GET_UPDATES_SINCE_CALLS,
-    TickerType.BLOCK_CACHE_COMPRESSED_MISS,
-    TickerType.BLOCK_CACHE_COMPRESSED_HIT,
-    TickerType.BLOCK_CACHE_COMPRESSED_ADD,
-    TickerType.BLOCK_CACHE_COMPRESSED_ADD_FAILURES,
     TickerType.WAL_FILE_SYNCED,
     TickerType.WAL_FILE_BYTES,
     TickerType.WRITE_DONE_BY_SELF,
     TickerType.WRITE_DONE_BY_OTHER,
-    TickerType.WRITE_TIMEDOUT,
     TickerType.WRITE_WITH_WAL,
     TickerType.COMPACT_READ_BYTES,
     TickerType.COMPACT_WRITE_BYTES,
@@ -134,6 +129,7 @@ public class RocksDBStats {
     TickerType.NUMBER_MULTIGET_KEYS_FOUND,
   };
 
+  /** The constant HISTOGRAMS. */
   // Histograms - treated as prometheus summaries
   static final HistogramType[] HISTOGRAMS = {
     HistogramType.DB_GET,
@@ -149,11 +145,6 @@ public class RocksDBStats {
     HistogramType.READ_BLOCK_COMPACTION_MICROS,
     HistogramType.READ_BLOCK_GET_MICROS,
     HistogramType.WRITE_RAW_BLOCK_MICROS,
-    HistogramType.STALL_L0_SLOWDOWN_COUNT,
-    HistogramType.STALL_MEMTABLE_COMPACTION_COUNT,
-    HistogramType.STALL_L0_NUM_FILES_COUNT,
-    HistogramType.HARD_RATE_LIMIT_DELAY_COUNT,
-    HistogramType.SOFT_RATE_LIMIT_DELAY_COUNT,
     HistogramType.NUM_FILES_IN_SINGLE_COMPACTION,
     HistogramType.DB_SEEK,
     HistogramType.WRITE_STALL,
@@ -169,6 +160,13 @@ public class RocksDBStats {
     HistogramType.READ_NUM_MERGE_OPERANDS,
   };
 
+  /**
+   * Register rocks db metrics.
+   *
+   * @param stats the stats
+   * @param metricsSystem the metrics system
+   * @param category the category
+   */
   public static void registerRocksDBMetrics(
       final Statistics stats,
       final PrometheusMetricsSystem metricsSystem,
diff --git a/nat/build.gradle b/nat/build.gradle
index a5967c6374d..311183b0015 100644
--- a/nat/build.gradle
+++ b/nat/build.gradle
@@ -28,15 +28,14 @@ jar {
 }
 
 dependencies {
+  api 'org.slf4j:slf4j-api'
+
   implementation 'com.google.guava:guava'
   implementation 'com.squareup.okhttp3:okhttp'
-  implementation 'org.apache.logging.log4j:log4j-api'
   implementation 'org.jupnp:org.jupnp'
   implementation 'org.jupnp:org.jupnp.support'
   implementation 'io.kubernetes:client-java'
 
-  runtimeOnly 'org.apache.logging.log4j:log4j-core'
-
   // test dependencies.
   testImplementation project(path: ':ethereum:core', configuration: 'testArtifacts')
   testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
@@ -44,5 +43,8 @@ dependencies {
 
   testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.mockito:mockito-core'
+
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 }
diff --git a/nat/src/main/java/org/hyperledger/besu/nat/NatMethod.java b/nat/src/main/java/org/hyperledger/besu/nat/NatMethod.java
index de22cc27089..bbd1c02c40c 100644
--- a/nat/src/main/java/org/hyperledger/besu/nat/NatMethod.java
+++ b/nat/src/main/java/org/hyperledger/besu/nat/NatMethod.java
@@ -14,13 +14,27 @@
  */
 package org.hyperledger.besu.nat;
 
+/** The enum Nat method. */
 public enum NatMethod {
+  /** Upnp nat method. */
   UPNP,
+  /** Upnpp 2 ponly nat method. */
+  UPNPP2PONLY,
+  /** Docker nat method. */
   DOCKER,
+  /** Kubernetes nat method. */
   KUBERNETES,
+  /** Auto nat method. */
   AUTO,
+  /** None nat method. */
   NONE;
 
+  /**
+   * Map NatMethod from string value.
+   *
+   * @param str the Nat Method in String format
+   * @return instance of mapped NatMethod
+   */
   public static NatMethod fromString(final String str) {
     for (final NatMethod mode : NatMethod.values()) {
       if (mode.name().equalsIgnoreCase(str)) {
diff --git a/nat/src/main/java/org/hyperledger/besu/nat/NatService.java b/nat/src/main/java/org/hyperledger/besu/nat/NatService.java
index 8f4554a14b7..0d219f2ddbc 100644
--- a/nat/src/main/java/org/hyperledger/besu/nat/NatService.java
+++ b/nat/src/main/java/org/hyperledger/besu/nat/NatService.java
@@ -25,13 +25,13 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Utility class to help interacting with various {@link NatManager}. */
 public class NatService {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(NatService.class);
 
   private static final boolean DEFAULT_FALLBACK_STATUS = true;
 
@@ -39,12 +39,23 @@ public class NatService {
   private Optional<NatManager> currentNatManager;
   private final boolean fallbackEnabled;
 
+  /**
+   * Instantiates a new Nat service.
+   *
+   * @param natManager the nat manager
+   * @param fallbackEnabled the fallback enabled
+   */
   public NatService(final Optional<NatManager> natManager, final boolean fallbackEnabled) {
     this.currentNatMethod = retrieveNatMethod(natManager);
     this.currentNatManager = natManager;
     this.fallbackEnabled = fallbackEnabled;
   }
 
+  /**
+   * Instantiates a new Nat service.
+   *
+   * @param natManager the nat manager
+   */
   public NatService(final Optional<NatManager> natManager) {
     this(natManager, DEFAULT_FALLBACK_STATUS);
   }
@@ -95,10 +106,12 @@ public void start() {
       try {
         getNatManager().orElseThrow().start();
       } catch (Exception e) {
-        LOG.debug(
+        LOG.warn(
             "Nat manager failed to configure itself automatically due to the following reason : {}. {}",
-            e.getMessage(),
-            (fallbackEnabled) ? "NONE mode will be used" : "");
+            e,
+            (fallbackEnabled)
+                ? "NONE mode will be used as a fallback (set --Xnat-method-fallback-enabled=false to disable)"
+                : "");
         if (fallbackEnabled) {
           disableNatManager();
         } else {
@@ -158,6 +171,7 @@ public String queryExternalIPAddress(final String fallbackValue) {
    *
    * @param fallbackValue the advertised IP address fallback value
    * @return The local IP address wrapped in a {@link Optional}.
+   * @throws RuntimeException the runtime exception
    */
   public String queryLocalIPAddress(final String fallbackValue) throws RuntimeException {
     if (isNatEnvironment()) {
diff --git a/nat/src/main/java/org/hyperledger/besu/nat/core/AbstractNatManager.java b/nat/src/main/java/org/hyperledger/besu/nat/core/AbstractNatManager.java
index 3be667cb219..2eb38a63aa6 100644
--- a/nat/src/main/java/org/hyperledger/besu/nat/core/AbstractNatManager.java
+++ b/nat/src/main/java/org/hyperledger/besu/nat/core/AbstractNatManager.java
@@ -33,24 +33,43 @@
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Abstract Nat manager. */
 public abstract class AbstractNatManager implements NatManager {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractNatManager.class);
 
+  /** The Nat method. */
   protected final NatMethod natMethod;
 
+  /** The Started. */
   protected final AtomicBoolean started = new AtomicBoolean();
 
+  /**
+   * Instantiates a new Abstract nat manager.
+   *
+   * @param natMethod the nat method
+   */
   protected AbstractNatManager(final NatMethod natMethod) {
     this.natMethod = natMethod;
   }
 
+  /**
+   * Do start.
+   *
+   * @throws NatInitializationException the nat initialization exception
+   */
   protected abstract void doStart() throws NatInitializationException;
 
+  /** Do stop. */
   protected abstract void doStop();
 
+  /**
+   * Retrieve external ip address completable future.
+   *
+   * @return the completable future
+   */
   protected abstract CompletableFuture<String> retrieveExternalIPAddress();
 
   @Override
diff --git a/nat/src/main/java/org/hyperledger/besu/nat/core/IpDetector.java b/nat/src/main/java/org/hyperledger/besu/nat/core/IpDetector.java
index f61f2106732..55e5861d2ec 100644
--- a/nat/src/main/java/org/hyperledger/besu/nat/core/IpDetector.java
+++ b/nat/src/main/java/org/hyperledger/besu/nat/core/IpDetector.java
@@ -17,7 +17,14 @@
 
 import java.util.Optional;
 
+/** The interface Ip detector. */
 public interface IpDetector {
 
+  /**
+   * Detect advertised ip.
+   *
+   * @return the optional Ip in String
+   * @throws Exception in case of error while detecting advertised Ip
+   */
   Optional<String> detectAdvertisedIp() throws Exception;
 }
diff --git a/nat/src/main/java/org/hyperledger/besu/nat/core/NatManager.java b/nat/src/main/java/org/hyperledger/besu/nat/core/NatManager.java
index 631fa306cf4..d509a544597 100644
--- a/nat/src/main/java/org/hyperledger/besu/nat/core/NatManager.java
+++ b/nat/src/main/java/org/hyperledger/besu/nat/core/NatManager.java
@@ -29,6 +29,7 @@
  */
 public interface NatManager {
 
+  /** The constant TIMEOUT_SECONDS. */
   int TIMEOUT_SECONDS = 60;
 
   /**
diff --git a/nat/src/main/java/org/hyperledger/besu/nat/core/NatMethodDetector.java b/nat/src/main/java/org/hyperledger/besu/nat/core/NatMethodDetector.java
index d39d648d3e0..08cee0dd5b3 100644
--- a/nat/src/main/java/org/hyperledger/besu/nat/core/NatMethodDetector.java
+++ b/nat/src/main/java/org/hyperledger/besu/nat/core/NatMethodDetector.java
@@ -19,8 +19,14 @@
 
 import java.util.Optional;
 
+/** The interface Nat method detector. */
 @FunctionalInterface
 public interface NatMethodDetector {
 
+  /**
+   * Detect NatMethod.
+   *
+   * @return the optional NatMethod
+   */
   Optional<NatMethod> detect();
 }
diff --git a/nat/src/main/java/org/hyperledger/besu/nat/core/domain/NatPortMapping.java b/nat/src/main/java/org/hyperledger/besu/nat/core/domain/NatPortMapping.java
index 8f55d3cb252..3b1ea6a14e2 100644
--- a/nat/src/main/java/org/hyperledger/besu/nat/core/domain/NatPortMapping.java
+++ b/nat/src/main/java/org/hyperledger/besu/nat/core/domain/NatPortMapping.java
@@ -25,6 +25,16 @@ public class NatPortMapping {
   private final int externalPort;
   private final int internalPort;
 
+  /**
+   * Instantiates a new Nat port mapping.
+   *
+   * @param natServiceType the nat service type
+   * @param protocol the protocol
+   * @param internalHost the internal host
+   * @param remoteHost the remote host
+   * @param externalPort the external port
+   * @param internalPort the internal port
+   */
   public NatPortMapping(
       final NatServiceType natServiceType,
       final NetworkProtocol protocol,
@@ -40,26 +50,56 @@ public NatPortMapping(
     this.internalPort = internalPort;
   }
 
+  /**
+   * Gets nat service type.
+   *
+   * @return the nat service type
+   */
   public NatServiceType getNatServiceType() {
     return natServiceType;
   }
 
+  /**
+   * Gets protocol.
+   *
+   * @return the protocol
+   */
   public NetworkProtocol getProtocol() {
     return protocol;
   }
 
+  /**
+   * Gets internal host.
+   *
+   * @return the internal host
+   */
   public String getInternalHost() {
     return internalHost;
   }
 
+  /**
+   * Gets remote host.
+   *
+   * @return the remote host
+   */
   public String getRemoteHost() {
     return remoteHost;
   }
 
+  /**
+   * Gets external port.
+   *
+   * @return the external port
+   */
   public int getExternalPort() {
     return externalPort;
   }
 
+  /**
+   * Gets internal port.
+   *
+   * @return the internal port
+   */
   public int getInternalPort() {
     return internalPort;
   }
diff --git a/nat/src/main/java/org/hyperledger/besu/nat/core/domain/NatServiceType.java b/nat/src/main/java/org/hyperledger/besu/nat/core/domain/NatServiceType.java
index b93b073f5d2..2702254cadd 100644
--- a/nat/src/main/java/org/hyperledger/besu/nat/core/domain/NatServiceType.java
+++ b/nat/src/main/java/org/hyperledger/besu/nat/core/domain/NatServiceType.java
@@ -17,7 +17,7 @@
 
 /**
  * This enum describes the types of services that could be impacted by the {@link
- * org.hyperledger.besu.nat.NatMethod} used by the Besu node.
+ * org.hyperledger.besu.nat.NatMethod}* used by the Besu node.
  *
  * <ul>
  *   <li><b>JSON_RPC:</b> Ethereum JSON-RPC HTTP service.
@@ -26,8 +26,11 @@
  * </ul>
  */
 public enum NatServiceType {
+  /** Json rpc nat service type. */
   JSON_RPC("json-rpc"),
+  /** Rlpx nat service type. */
   RLPX("rlpx"),
+  /** Discovery nat service type. */
   DISCOVERY("discovery");
 
   private final String value;
@@ -53,6 +56,11 @@ public static NatServiceType fromString(final String natServiceTypeName) {
         String.format("Invalid NAT service type provided: %s", natServiceTypeName));
   }
 
+  /**
+   * Gets value.
+   *
+   * @return the value
+   */
   public String getValue() {
     return value;
   }
diff --git a/nat/src/main/java/org/hyperledger/besu/nat/core/domain/NetworkProtocol.java b/nat/src/main/java/org/hyperledger/besu/nat/core/domain/NetworkProtocol.java
index 6e4ebadbdd0..a8ab4939bab 100644
--- a/nat/src/main/java/org/hyperledger/besu/nat/core/domain/NetworkProtocol.java
+++ b/nat/src/main/java/org/hyperledger/besu/nat/core/domain/NetworkProtocol.java
@@ -24,6 +24,8 @@
  * </ul>
  */
 public enum NetworkProtocol {
+  /** Tcp network protocol. */
   TCP,
+  /** Udp network protocol. */
   UDP
 }
diff --git a/nat/src/main/java/org/hyperledger/besu/nat/core/exception/NatInitializationException.java b/nat/src/main/java/org/hyperledger/besu/nat/core/exception/NatInitializationException.java
index 5c7c7e8ec7c..635d3817f21 100644
--- a/nat/src/main/java/org/hyperledger/besu/nat/core/exception/NatInitializationException.java
+++ b/nat/src/main/java/org/hyperledger/besu/nat/core/exception/NatInitializationException.java
@@ -14,12 +14,24 @@
  */
 package org.hyperledger.besu.nat.core.exception;
 
+/** The Nat initialization exception. */
 public class NatInitializationException extends Exception {
 
+  /**
+   * Instantiates a new Nat initialization exception.
+   *
+   * @param message the message
+   */
   public NatInitializationException(final String message) {
     super(message);
   }
 
+  /**
+   * Instantiates a new Nat initialization exception.
+   *
+   * @param message the message
+   * @param cause the cause
+   */
   public NatInitializationException(final String message, final Throwable cause) {
     super(message, cause);
   }
diff --git a/nat/src/main/java/org/hyperledger/besu/nat/docker/DockerDetector.java b/nat/src/main/java/org/hyperledger/besu/nat/docker/DockerDetector.java
index b8ff5ab5f66..5504def9c8d 100644
--- a/nat/src/main/java/org/hyperledger/besu/nat/docker/DockerDetector.java
+++ b/nat/src/main/java/org/hyperledger/besu/nat/docker/DockerDetector.java
@@ -24,6 +24,7 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
+/** The Docker detector. */
 public class DockerDetector implements NatMethodDetector {
 
   @Override
diff --git a/nat/src/main/java/org/hyperledger/besu/nat/docker/DockerNatManager.java b/nat/src/main/java/org/hyperledger/besu/nat/docker/DockerNatManager.java
index fb26690b529..da2fd0e1a7d 100644
--- a/nat/src/main/java/org/hyperledger/besu/nat/docker/DockerNatManager.java
+++ b/nat/src/main/java/org/hyperledger/besu/nat/docker/DockerNatManager.java
@@ -29,15 +29,15 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class describes the behaviour of the Docker NAT manager. Docker Nat manager add support for
  * Docker’s NAT implementation when Besu is being run from a Docker container
  */
 public class DockerNatManager extends AbstractNatManager {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(DockerNatManager.class);
 
   private static final String PORT_MAPPING_TAG = "HOST_PORT_";
 
@@ -49,10 +49,25 @@ public class DockerNatManager extends AbstractNatManager {
   private String internalAdvertisedHost;
   private final List<NatPortMapping> forwardedPorts = new ArrayList<>();
 
+  /**
+   * Instantiates a new Docker nat manager.
+   *
+   * @param advertisedHost the advertised host
+   * @param p2pPort the p 2 p port
+   * @param rpcHttpPort the rpc http port
+   */
   public DockerNatManager(final String advertisedHost, final int p2pPort, final int rpcHttpPort) {
     this(new HostBasedIpDetector(), advertisedHost, p2pPort, rpcHttpPort);
   }
 
+  /**
+   * Instantiates a new Docker nat manager.
+   *
+   * @param ipDetector the ip detector
+   * @param advertisedHost the advertised host
+   * @param p2pPort the p 2 p port
+   * @param rpcHttpPort the rpc http port
+   */
   public DockerNatManager(
       final IpDetector ipDetector,
       final String advertisedHost,
diff --git a/nat/src/main/java/org/hyperledger/besu/nat/docker/HostBasedIpDetector.java b/nat/src/main/java/org/hyperledger/besu/nat/docker/HostBasedIpDetector.java
index 5162c00584d..34922624c7b 100644
--- a/nat/src/main/java/org/hyperledger/besu/nat/docker/HostBasedIpDetector.java
+++ b/nat/src/main/java/org/hyperledger/besu/nat/docker/HostBasedIpDetector.java
@@ -21,6 +21,7 @@
 import java.net.UnknownHostException;
 import java.util.Optional;
 
+/** The Host based Ip detector. */
 public class HostBasedIpDetector implements IpDetector {
 
   private static final String HOSTNAME = "HOST_IP";
diff --git a/nat/src/main/java/org/hyperledger/besu/nat/kubernetes/KubernetesDetector.java b/nat/src/main/java/org/hyperledger/besu/nat/kubernetes/KubernetesDetector.java
index 823e066042e..4176216869c 100644
--- a/nat/src/main/java/org/hyperledger/besu/nat/kubernetes/KubernetesDetector.java
+++ b/nat/src/main/java/org/hyperledger/besu/nat/kubernetes/KubernetesDetector.java
@@ -23,6 +23,7 @@
 import java.nio.file.Paths;
 import java.util.Optional;
 
+/** The Kubernetes detector. */
 public class KubernetesDetector implements NatMethodDetector {
 
   // When a Pod runs on a Node, the kubelet adds a set of environment variables for each active
diff --git a/nat/src/main/java/org/hyperledger/besu/nat/kubernetes/KubernetesNatManager.java b/nat/src/main/java/org/hyperledger/besu/nat/kubernetes/KubernetesNatManager.java
index 260b90a857c..e60b7788642 100644
--- a/nat/src/main/java/org/hyperledger/besu/nat/kubernetes/KubernetesNatManager.java
+++ b/nat/src/main/java/org/hyperledger/besu/nat/kubernetes/KubernetesNatManager.java
@@ -32,29 +32,35 @@
 import java.util.concurrent.TimeUnit;
 
 import com.google.common.annotations.VisibleForTesting;
-import io.kubernetes.client.ApiClient;
-import io.kubernetes.client.Configuration;
-import io.kubernetes.client.apis.CoreV1Api;
-import io.kubernetes.client.models.V1Service;
+import io.kubernetes.client.openapi.ApiClient;
+import io.kubernetes.client.openapi.Configuration;
+import io.kubernetes.client.openapi.apis.CoreV1Api;
+import io.kubernetes.client.openapi.models.V1Service;
 import io.kubernetes.client.util.ClientBuilder;
 import io.kubernetes.client.util.KubeConfig;
 import io.kubernetes.client.util.authenticators.GCPAuthenticator;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class describes the behaviour of the Kubernetes NAT manager. Kubernetes Nat manager add
  * support for Kubernetes’s NAT implementation when Besu is being run from a Kubernetes cluster
  */
 public class KubernetesNatManager extends AbstractNatManager {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(KubernetesNatManager.class);
 
+  /** The constant DEFAULT_BESU_SERVICE_NAME_FILTER. */
   public static final String DEFAULT_BESU_SERVICE_NAME_FILTER = "besu";
 
   private String internalAdvertisedHost;
   private final String besuServiceNameFilter;
   private final List<NatPortMapping> forwardedPorts = new ArrayList<>();
 
+  /**
+   * Instantiates a new Kubernetes nat manager.
+   *
+   * @param besuServiceNameFilter the besu service name filter
+   */
   public KubernetesNatManager(final String besuServiceNameFilter) {
     super(NatMethod.KUBERNETES);
     this.besuServiceNameFilter = besuServiceNameFilter;
@@ -77,8 +83,11 @@ protected void doStart() throws NatInitializationException {
       final CoreV1Api api = new CoreV1Api();
       // invokes the CoreV1Api client
       final V1Service service =
-          api.listServiceForAllNamespaces(null, null, null, null, null, null, null, null, null)
-              .getItems().stream()
+          api
+              .listServiceForAllNamespaces(
+                  null, null, null, null, null, null, null, null, null, null)
+              .getItems()
+              .stream()
               .filter(
                   v1Service -> v1Service.getMetadata().getName().contains(besuServiceNameFilter))
               .findFirst()
@@ -89,6 +98,12 @@ protected void doStart() throws NatInitializationException {
     }
   }
 
+  /**
+   * Update using besu service. Visible for testing.
+   *
+   * @param service the service
+   * @throws RuntimeException the runtime exception
+   */
   @VisibleForTesting
   void updateUsingBesuService(final V1Service service) throws RuntimeException {
     try {
diff --git a/nat/src/main/java/org/hyperledger/besu/nat/kubernetes/service/KubernetesServiceType.java b/nat/src/main/java/org/hyperledger/besu/nat/kubernetes/service/KubernetesServiceType.java
index c8464e9d65f..706540138ae 100644
--- a/nat/src/main/java/org/hyperledger/besu/nat/kubernetes/service/KubernetesServiceType.java
+++ b/nat/src/main/java/org/hyperledger/besu/nat/kubernetes/service/KubernetesServiceType.java
@@ -14,17 +14,28 @@
  */
 package org.hyperledger.besu.nat.kubernetes.service;
 
+/** The enum Kubernetes service type. */
 public enum KubernetesServiceType {
+  /** Cluster ip kubernetes service type. */
   CLUSTER_IP("ClusterIP"),
+  /** Load balancer kubernetes service type. */
   LOAD_BALANCER("LoadBalancer"),
+  /** Unknown kubernetes service type. */
   UNKNOWN("");
 
+  /** The Name. */
   String name;
 
   KubernetesServiceType(final String name) {
     this.name = name;
   }
 
+  /**
+   * Map KubernetesServiceType from String value.
+   *
+   * @param name the name
+   * @return the kubernetes service type
+   */
   public static KubernetesServiceType fromName(final String name) {
     for (KubernetesServiceType value : values()) {
       if (value.name.equals(name)) {
diff --git a/nat/src/main/java/org/hyperledger/besu/nat/kubernetes/service/LoadBalancerBasedDetector.java b/nat/src/main/java/org/hyperledger/besu/nat/kubernetes/service/LoadBalancerBasedDetector.java
index 8807bd7e970..7194ab5b6fe 100644
--- a/nat/src/main/java/org/hyperledger/besu/nat/kubernetes/service/LoadBalancerBasedDetector.java
+++ b/nat/src/main/java/org/hyperledger/besu/nat/kubernetes/service/LoadBalancerBasedDetector.java
@@ -20,13 +20,19 @@
 import java.net.InetAddress;
 import java.util.Optional;
 
-import io.kubernetes.client.models.V1LoadBalancerIngress;
-import io.kubernetes.client.models.V1Service;
+import io.kubernetes.client.openapi.models.V1LoadBalancerIngress;
+import io.kubernetes.client.openapi.models.V1Service;
 
+/** The Load balancer based detector. */
 public class LoadBalancerBasedDetector implements IpDetector {
 
   private final V1Service v1Service;
 
+  /**
+   * Instantiates a new Load balancer based detector.
+   *
+   * @param v1Service the v 1 service
+   */
   public LoadBalancerBasedDetector(final V1Service v1Service) {
     this.v1Service = v1Service;
   }
diff --git a/nat/src/main/java/org/hyperledger/besu/nat/upnp/BesuUpnpServiceConfiguration.java b/nat/src/main/java/org/hyperledger/besu/nat/upnp/BesuUpnpServiceConfiguration.java
index b8dceeca93f..dd099a78d9f 100644
--- a/nat/src/main/java/org/hyperledger/besu/nat/upnp/BesuUpnpServiceConfiguration.java
+++ b/nat/src/main/java/org/hyperledger/besu/nat/upnp/BesuUpnpServiceConfiguration.java
@@ -20,8 +20,6 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.jupnp.DefaultUpnpServiceConfiguration;
 import org.jupnp.UpnpServiceConfiguration;
 import org.jupnp.binding.xml.DeviceDescriptorBinder;
@@ -50,9 +48,11 @@
 import org.jupnp.transport.spi.SOAPActionProcessor;
 import org.jupnp.transport.spi.StreamClient;
 import org.jupnp.transport.spi.StreamServer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class BesuUpnpServiceConfiguration implements UpnpServiceConfiguration {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(BesuUpnpServiceConfiguration.class);
 
   private final ThreadPoolExecutor executorService;
   private final DeviceDescriptorBinder deviceDescriptorBinderUDA10;
@@ -229,6 +229,11 @@ public Executor getRegistryListenerExecutor() {
     return executorService;
   }
 
+  @Override
+  public Executor getRemoteListenerExecutor() {
+    return executorService;
+  }
+
   @Override
   public void shutdown() {
     executorService.shutdown();
diff --git a/nat/src/main/java/org/hyperledger/besu/nat/upnp/OkHttpStreamClient.java b/nat/src/main/java/org/hyperledger/besu/nat/upnp/OkHttpStreamClient.java
index 5a62ce002ab..7b5c9a97065 100644
--- a/nat/src/main/java/org/hyperledger/besu/nat/upnp/OkHttpStreamClient.java
+++ b/nat/src/main/java/org/hyperledger/besu/nat/upnp/OkHttpStreamClient.java
@@ -32,11 +32,17 @@
 import org.jupnp.transport.impl.jetty.StreamClientConfigurationImpl;
 import org.jupnp.transport.spi.AbstractStreamClient;
 
+/** The OkHttp stream client. */
 public class OkHttpStreamClient extends AbstractStreamClient<StreamClientConfigurationImpl, Call> {
 
   private final StreamClientConfigurationImpl config;
   private final OkHttpClient client;
 
+  /**
+   * Instantiates a new OkHttp stream client.
+   *
+   * @param config the config
+   */
   OkHttpStreamClient(final StreamClientConfigurationImpl config) {
     this.config = config;
     client = new OkHttpClient();
@@ -50,9 +56,9 @@ protected Call createRequest(final StreamRequestMessage requestMessage) {
     if (method == UpnpRequest.Method.POST || method == UpnpRequest.Method.NOTIFY) {
       final MediaType mediaType = MediaType.get(requestMessage.getContentTypeHeader().getString());
       if (requestMessage.getBodyType() == UpnpMessage.BodyType.STRING) {
-        body = RequestBody.create(mediaType, requestMessage.getBodyString());
+        body = RequestBody.create(requestMessage.getBodyString(), mediaType);
       } else {
-        body = RequestBody.create(mediaType, requestMessage.getBodyBytes());
+        body = RequestBody.create(requestMessage.getBodyBytes(), mediaType);
       }
     } else {
       body = null;
diff --git a/nat/src/main/java/org/hyperledger/besu/nat/upnp/UpnpNatManager.java b/nat/src/main/java/org/hyperledger/besu/nat/upnp/UpnpNatManager.java
index 750843f99b7..22cc1ce13f1 100644
--- a/nat/src/main/java/org/hyperledger/besu/nat/upnp/UpnpNatManager.java
+++ b/nat/src/main/java/org/hyperledger/besu/nat/upnp/UpnpNatManager.java
@@ -34,8 +34,6 @@
 import java.util.concurrent.TimeUnit;
 
 import com.google.common.annotations.VisibleForTesting;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.jupnp.UpnpService;
 import org.jupnp.UpnpServiceImpl;
 import org.jupnp.model.action.ActionInvocation;
@@ -51,13 +49,15 @@
 import org.jupnp.support.igd.callback.PortMappingAdd;
 import org.jupnp.support.igd.callback.PortMappingDelete;
 import org.jupnp.support.model.PortMapping;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Manages underlying UPnP library "jupnp" and provides abstractions for asynchronously interacting
  * with the NAT environment through UPnP.
  */
 public class UpnpNatManager extends AbstractNatManager {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(UpnpNatManager.class);
 
   static final String SERVICE_TYPE_WAN_IP_CONNECTION = "WANIPConnection";
 
diff --git a/nat/src/test/java/org/hyperledger/besu/nat/NatServiceTest.java b/nat/src/test/java/org/hyperledger/besu/nat/NatServiceTest.java
index 0fa8690965c..2209c25e3f5 100644
--- a/nat/src/test/java/org/hyperledger/besu/nat/NatServiceTest.java
+++ b/nat/src/test/java/org/hyperledger/besu/nat/NatServiceTest.java
@@ -115,6 +115,24 @@ public void assertQueryExternalIpWorksProperlyWithUpNp() {
     assertThat(resultIp).isEqualTo(externalIp);
   }
 
+  @Test
+  public void assertQueryExternalIpWorksProperlyWithUpNpP2pOnly() {
+    final String fallbackExternalIp = "127.0.0.1";
+    final String externalIp = "127.0.0.3";
+    final NatManager natManager = mock(NatManager.class);
+    when(natManager.queryExternalIPAddress())
+        .thenReturn(CompletableFuture.completedFuture(externalIp));
+    when(natManager.getNatMethod()).thenReturn(NatMethod.UPNPP2PONLY);
+
+    final NatService natService = new NatService(Optional.of(natManager), true);
+
+    final String resultIp = natService.queryExternalIPAddress(fallbackExternalIp);
+
+    verify(natManager).queryExternalIPAddress();
+
+    assertThat(resultIp).isEqualTo(externalIp);
+  }
+
   @Test
   public void assertThatQueryExternalIpWorksProperlyWithoutNat() {
 
diff --git a/nat/src/test/java/org/hyperledger/besu/nat/docker/DockerNatManagerTest.java b/nat/src/test/java/org/hyperledger/besu/nat/docker/DockerNatManagerTest.java
index b4e111f9e6e..84c8548c7f6 100644
--- a/nat/src/test/java/org/hyperledger/besu/nat/docker/DockerNatManagerTest.java
+++ b/nat/src/test/java/org/hyperledger/besu/nat/docker/DockerNatManagerTest.java
@@ -32,8 +32,11 @@
 import org.assertj.core.api.Assertions;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public final class DockerNatManagerTest {
 
   private final String advertisedHost = "99.45.69.12";
@@ -97,7 +100,7 @@ public void assertThatMappingForDiscoveryWorks() throws UnknownHostException {
             p2pPort,
             p2pPort);
 
-    assertThat(mapping).isEqualToComparingFieldByField(expectedMapping);
+    assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping);
   }
 
   @Test
@@ -116,7 +119,7 @@ public void assertThatMappingForJsonRpcWorks() throws UnknownHostException {
             rpcHttpPort,
             rpcHttpPort);
 
-    assertThat(mapping).isEqualToComparingFieldByField(expectedMapping);
+    assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping);
   }
 
   @Test
@@ -135,6 +138,6 @@ public void assertThatMappingForRlpxWorks() throws UnknownHostException {
             p2pPort,
             p2pPort);
 
-    assertThat(mapping).isEqualToComparingFieldByField(expectedMapping);
+    assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping);
   }
 }
diff --git a/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesClusterIpNatManagerTest.java b/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesClusterIpNatManagerTest.java
index aaac57741dc..2164c172d14 100644
--- a/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesClusterIpNatManagerTest.java
+++ b/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesClusterIpNatManagerTest.java
@@ -29,10 +29,10 @@
 import java.util.concurrent.ExecutionException;
 
 import io.kubernetes.client.custom.IntOrString;
-import io.kubernetes.client.models.V1ObjectMeta;
-import io.kubernetes.client.models.V1Service;
-import io.kubernetes.client.models.V1ServicePort;
-import io.kubernetes.client.models.V1ServiceSpec;
+import io.kubernetes.client.openapi.models.V1ObjectMeta;
+import io.kubernetes.client.openapi.models.V1Service;
+import io.kubernetes.client.openapi.models.V1ServicePort;
+import io.kubernetes.client.openapi.models.V1ServiceSpec;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -114,7 +114,7 @@ public void assertThatMappingForDiscoveryWorks() throws UnknownHostException {
             p2pPort,
             p2pPort);
 
-    assertThat(mapping).isEqualToComparingFieldByField(expectedMapping);
+    assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping);
   }
 
   @Test
@@ -133,7 +133,7 @@ public void assertThatMappingForJsonRpcWorks() throws UnknownHostException {
             rpcHttpPort,
             rpcHttpPort);
 
-    assertThat(mapping).isEqualToComparingFieldByField(expectedMapping);
+    assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping);
   }
 
   @Test
@@ -152,6 +152,6 @@ public void assertThatMappingForRlpxWorks() throws UnknownHostException {
             p2pPort,
             p2pPort);
 
-    assertThat(mapping).isEqualToComparingFieldByField(expectedMapping);
+    assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping);
   }
 }
diff --git a/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesLoadManagerNatManagerTest.java b/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesLoadManagerNatManagerTest.java
index c2ddbfaceed..931d13ffbc5 100644
--- a/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesLoadManagerNatManagerTest.java
+++ b/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesLoadManagerNatManagerTest.java
@@ -29,13 +29,13 @@
 import java.util.concurrent.ExecutionException;
 
 import io.kubernetes.client.custom.IntOrString;
-import io.kubernetes.client.models.V1LoadBalancerIngressBuilder;
-import io.kubernetes.client.models.V1LoadBalancerStatusBuilder;
-import io.kubernetes.client.models.V1ObjectMeta;
-import io.kubernetes.client.models.V1Service;
-import io.kubernetes.client.models.V1ServicePort;
-import io.kubernetes.client.models.V1ServiceSpec;
-import io.kubernetes.client.models.V1ServiceStatus;
+import io.kubernetes.client.openapi.models.V1LoadBalancerIngress;
+import io.kubernetes.client.openapi.models.V1LoadBalancerStatus;
+import io.kubernetes.client.openapi.models.V1ObjectMeta;
+import io.kubernetes.client.openapi.models.V1Service;
+import io.kubernetes.client.openapi.models.V1ServicePort;
+import io.kubernetes.client.openapi.models.V1ServiceSpec;
+import io.kubernetes.client.openapi.models.V1ServiceStatus;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -59,10 +59,8 @@ public void initialize() throws IOException {
     final V1ServiceStatus v1ServiceStatus =
         new V1ServiceStatus()
             .loadBalancer(
-                new V1LoadBalancerStatusBuilder()
-                    .addToIngress(
-                        new V1LoadBalancerIngressBuilder().withIp(detectedAdvertisedHost).build())
-                    .build());
+                new V1LoadBalancerStatus()
+                    .addIngressItem(new V1LoadBalancerIngress().ip(detectedAdvertisedHost)));
     when(v1Service.getStatus()).thenReturn(v1ServiceStatus);
     when(v1Service.getSpec())
         .thenReturn(
@@ -123,7 +121,7 @@ public void assertThatMappingForDiscoveryWorks() throws UnknownHostException {
             p2pPort,
             p2pPort);
 
-    assertThat(mapping).isEqualToComparingFieldByField(expectedMapping);
+    assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping);
   }
 
   @Test
@@ -142,7 +140,7 @@ public void assertThatMappingForJsonRpcWorks() throws UnknownHostException {
             rpcHttpPort,
             rpcHttpPort);
 
-    assertThat(mapping).isEqualToComparingFieldByField(expectedMapping);
+    assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping);
   }
 
   @Test
@@ -161,6 +159,6 @@ public void assertThatMappingForRlpxWorks() throws UnknownHostException {
             p2pPort,
             p2pPort);
 
-    assertThat(mapping).isEqualToComparingFieldByField(expectedMapping);
+    assertThat(mapping).usingRecursiveComparison().isEqualTo(expectedMapping);
   }
 }
diff --git a/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesUnknownNatManagerTest.java b/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesUnknownNatManagerTest.java
index 47345baa707..fb180fde815 100644
--- a/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesUnknownNatManagerTest.java
+++ b/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesUnknownNatManagerTest.java
@@ -14,12 +14,13 @@
  */
 package org.hyperledger.besu.nat.kubernetes;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.hyperledger.besu.nat.kubernetes.KubernetesNatManager.DEFAULT_BESU_SERVICE_NAME_FILTER;
 import static org.mockito.Mockito.when;
 
-import io.kubernetes.client.models.V1ObjectMeta;
-import io.kubernetes.client.models.V1Service;
-import io.kubernetes.client.models.V1ServiceSpec;
+import io.kubernetes.client.openapi.models.V1ObjectMeta;
+import io.kubernetes.client.openapi.models.V1Service;
+import io.kubernetes.client.openapi.models.V1ServiceSpec;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -47,8 +48,9 @@ public void initialize() {
     }
   }
 
-  @Test(expected = RuntimeException.class)
+  @Test
   public void assertThatNatExceptionIsThrownWithUnknownServiceType() {
-    natManager.updateUsingBesuService(v1Service);
+    assertThatThrownBy(() -> natManager.updateUsingBesuService(v1Service))
+        .isInstanceOf(RuntimeException.class);
   }
 }
diff --git a/pki/build.gradle b/pki/build.gradle
new file mode 100644
index 00000000000..a3edd47ce74
--- /dev/null
+++ b/pki/build.gradle
@@ -0,0 +1,51 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+apply plugin: 'java-library'
+
+jar {
+  archiveBaseName = 'besu-pki'
+  manifest {
+    attributes(
+      'Specification-Title': archiveBaseName,
+      'Specification-Version': project.version,
+      'Implementation-Title': archiveBaseName,
+      'Implementation-Version': calculateVersion()
+      )
+  }
+}
+
+dependencies {
+  api 'org.slf4j:slf4j-api'
+
+  implementation 'com.google.guava:guava'
+  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'org.bouncycastle:bcpkix-jdk15on'
+
+  testImplementation 'junit:junit'
+  testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
+  testImplementation 'org.mockito:mockito-core'
+
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
+}
+
+configurations { testArtifacts }
+task testJar(type: Jar) {
+  archiveBaseName = "${project.name}-test"
+  from sourceSets.test.output
+}
+
+artifacts { testArtifacts testJar }
diff --git a/pki/src/main/java/org/hyperledger/besu/pki/PkiException.java b/pki/src/main/java/org/hyperledger/besu/pki/PkiException.java
new file mode 100644
index 00000000000..096684bbc48
--- /dev/null
+++ b/pki/src/main/java/org/hyperledger/besu/pki/PkiException.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.pki;
+
+/** The Pki exception. */
+public class PkiException extends RuntimeException {
+
+  private static final long serialVersionUID = 1L;
+
+  /** Instantiates a new Pki exception. */
+  public PkiException() {
+    super();
+  }
+
+  /**
+   * Instantiates a new Pki exception.
+   *
+   * @param message the message
+   */
+  public PkiException(final String message) {
+    super(message);
+  }
+
+  /**
+   * Instantiates a new Pki exception.
+   *
+   * @param message the message
+   * @param t the Throwable cause
+   */
+  public PkiException(final String message, final Throwable t) {
+    super(message, t);
+  }
+
+  /**
+   * Instantiates a new Pki exception.
+   *
+   * @param t the Throwable cause
+   */
+  public PkiException(final Throwable t) {
+    super(t);
+  }
+}
diff --git a/pki/src/main/java/org/hyperledger/besu/pki/cms/CmsCreator.java b/pki/src/main/java/org/hyperledger/besu/pki/cms/CmsCreator.java
new file mode 100644
index 00000000000..57bc78908e3
--- /dev/null
+++ b/pki/src/main/java/org/hyperledger/besu/pki/cms/CmsCreator.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.pki.cms;
+
+import org.hyperledger.besu.pki.keystore.KeyStoreWrapper;
+
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.Security;
+import java.security.cert.X509Certificate;
+import java.security.interfaces.ECPublicKey;
+import java.security.spec.EllipticCurve;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.tuweni.bytes.Bytes;
+import org.bouncycastle.cert.jcajce.JcaCertStore;
+import org.bouncycastle.cms.CMSProcessableByteArray;
+import org.bouncycastle.cms.CMSSignedData;
+import org.bouncycastle.cms.CMSSignedDataGenerator;
+import org.bouncycastle.cms.CMSTypedData;
+import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.operator.ContentSigner;
+import org.bouncycastle.operator.DigestCalculatorProvider;
+import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
+import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
+import org.bouncycastle.util.Store;
+
+/** The Cms creator. */
+public class CmsCreator {
+
+  static {
+    if (Security.getProvider(BouncyCastleProvider.PROVIDER_NAME) == null) {
+      Security.addProvider(new BouncyCastleProvider());
+    }
+  }
+
+  private final String certificateAlias;
+  private final KeyStoreWrapper keyStore;
+
+  /**
+   * Instantiates a new Cms creator.
+   *
+   * @param keyStore the key store
+   * @param certificateAlias the certificate alias
+   */
+  public CmsCreator(final KeyStoreWrapper keyStore, final String certificateAlias) {
+    this.keyStore = keyStore;
+    this.certificateAlias = certificateAlias;
+  }
+
+  /**
+   * Creates a CMS message with the content parameter, signed with the certificate with alias
+   * defined in the {@code CmsCreator} constructor. The certificate chain is also included so the
+   * recipient has the information needed to build a trusted certificate path when validating this
+   * message.
+   *
+   * @param contentToSign the content that will be signed and added to the message
+   * @return the CMS message bytes
+   */
+  @SuppressWarnings("rawtypes")
+  public Bytes create(final Bytes contentToSign) {
+    try {
+      // Certificates that will be sent
+      final List<X509Certificate> x509Certificates =
+          Stream.of(keyStore.getCertificateChain(certificateAlias))
+              .map(X509Certificate.class::cast)
+              .collect(Collectors.toList());
+      final Store certs = new JcaCertStore(x509Certificates);
+
+      // Private key of the certificate that will sign the message
+      final PrivateKey privateKey = keyStore.getPrivateKey(certificateAlias);
+
+      final ContentSigner contentSigner =
+          new JcaContentSignerBuilder(
+                  getPreferredSignatureAlgorithm(keyStore.getPublicKey(certificateAlias)))
+              .build(privateKey);
+
+      final CMSSignedDataGenerator cmsGenerator = new CMSSignedDataGenerator();
+
+      // Additional intermediate certificates for path building
+      cmsGenerator.addCertificates(certs);
+
+      final DigestCalculatorProvider digestCalculatorProvider =
+          new JcaDigestCalculatorProviderBuilder().setProvider("BC").build();
+      // The first certificate in the list (leaf certificate is the signer)
+      cmsGenerator.addSignerInfoGenerator(
+          new JcaSignerInfoGeneratorBuilder(digestCalculatorProvider)
+              .build(contentSigner, x509Certificates.get(0)));
+
+      // Add signed content
+      final CMSTypedData cmsData = new CMSProcessableByteArray(contentToSign.toArray());
+      final CMSSignedData cmsSignedData = cmsGenerator.generate(cmsData, false);
+
+      return Bytes.wrap(cmsSignedData.getEncoded());
+    } catch (final Exception e) {
+      throw new RuntimeException("Error creating CMS data", e);
+    }
+  }
+
+  /**
+   * Gets preferred signature algorithm for EC or RSA keys
+   *
+   * @param pub the public key
+   * @return the preferred signature algorithm
+   */
+  @VisibleForTesting
+  public static String getPreferredSignatureAlgorithm(final PublicKey pub) {
+    switch (pub.getAlgorithm()) {
+      case "EC" -> {
+        final EllipticCurve curve = ((ECPublicKey) pub).getParams().getCurve();
+        return switch (curve.getField().getFieldSize()) {
+          case 224, 256 -> "SHA256withECDSA";
+          case 384 -> "SHA384withECDSA";
+          case 521 -> "SHA512withECDSA";
+          default -> throw new IllegalArgumentException("Elliptic curve not supported: " + curve);
+        };
+      }
+      case "RSA" -> {
+        return "SHA256WithRSAEncryption";
+      }
+      default -> throw new UnsupportedOperationException(
+          "Private key algorithm not supported: " + pub.getAlgorithm());
+    }
+  }
+}
diff --git a/pki/src/main/java/org/hyperledger/besu/pki/cms/CmsValidator.java b/pki/src/main/java/org/hyperledger/besu/pki/cms/CmsValidator.java
new file mode 100644
index 00000000000..c32c11d01a3
--- /dev/null
+++ b/pki/src/main/java/org/hyperledger/besu/pki/cms/CmsValidator.java
@@ -0,0 +1,203 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.pki.cms;
+
+import org.hyperledger.besu.pki.keystore.KeyStoreWrapper;
+
+import java.security.Security;
+import java.security.cert.CertPathBuilder;
+import java.security.cert.CertPathBuilderException;
+import java.security.cert.CertStore;
+import java.security.cert.CollectionCertStoreParameters;
+import java.security.cert.PKIXBuilderParameters;
+import java.security.cert.PKIXRevocationChecker;
+import java.security.cert.PKIXRevocationChecker.Option;
+import java.security.cert.X509CertSelector;
+import java.security.cert.X509Certificate;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.bouncycastle.cert.X509CertificateHolder;
+import org.bouncycastle.cert.jcajce.JcaCertStoreBuilder;
+import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
+import org.bouncycastle.cms.CMSException;
+import org.bouncycastle.cms.CMSProcessableByteArray;
+import org.bouncycastle.cms.CMSSignedData;
+import org.bouncycastle.cms.SignerInformation;
+import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.util.Store;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Cms validator. */
+public class CmsValidator {
+
+  static {
+    if (Security.getProvider(BouncyCastleProvider.PROVIDER_NAME) == null) {
+      Security.addProvider(new BouncyCastleProvider());
+    }
+  }
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(CmsValidator.class);
+
+  private final KeyStoreWrapper truststore;
+
+  /**
+   * Instantiates a new Cms validator.
+   *
+   * @param truststore the truststore
+   */
+  public CmsValidator(final KeyStoreWrapper truststore) {
+    this.truststore = truststore;
+  }
+
+  /**
+   * Verifies that a CMS message signed content matched the expected content, and that the message
+   * signer is from a certificate that is trusted (has permission to propose a block)
+   *
+   * @param cms the CMS message bytes
+   * @param expectedContent the expected signed content in the CMS message
+   * @return true, if the signed content matched the expected content and the signer's certificate
+   *     is trusted, otherwise returns false.
+   */
+  public boolean validate(final Bytes cms, final Bytes expectedContent) {
+    if (cms == null || cms.isEmpty()) {
+      return false;
+    }
+
+    try {
+      LOGGER.trace("Validating CMS message");
+
+      final CMSSignedData cmsSignedData =
+          new CMSSignedData(new CMSProcessableByteArray(expectedContent.toArray()), cms.toArray());
+      final X509Certificate signerCertificate = getSignerCertificate(cmsSignedData);
+
+      // Validate msg signature and content
+      if (!isSignatureValid(signerCertificate, cmsSignedData)) {
+        return false;
+      }
+
+      // Validate certificate trust
+      if (!isCertificateTrusted(signerCertificate, cmsSignedData)) {
+        return false;
+      }
+
+      return true;
+    } catch (final Exception e) {
+      throw new RuntimeException("Error validating CMS data", e);
+    }
+  }
+
+  @SuppressWarnings("unchecked")
+  private X509Certificate getSignerCertificate(final CMSSignedData cmsSignedData) {
+    try {
+      final Store<X509CertificateHolder> certificateStore = cmsSignedData.getCertificates();
+
+      // We don't expect more than one signer on the CMS data
+      if (cmsSignedData.getSignerInfos().size() != 1) {
+        throw new RuntimeException("Only one signer is expected on the CMS message");
+      }
+      final SignerInformation signerInformation =
+          cmsSignedData.getSignerInfos().getSigners().stream().findFirst().get();
+
+      // Find signer's certificate from CMS data
+      final Collection<X509CertificateHolder> signerCertificates =
+          certificateStore.getMatches(signerInformation.getSID());
+      final X509CertificateHolder certificateHolder = signerCertificates.stream().findFirst().get();
+
+      return new JcaX509CertificateConverter().getCertificate(certificateHolder);
+    } catch (final Exception e) {
+      throw new RuntimeException("Error retrieving signer certificate from CMS data", e);
+    }
+  }
+
+  private boolean isSignatureValid(
+      final X509Certificate signerCertificate, final CMSSignedData cmsSignedData) {
+    LOGGER.trace("Validating CMS signature");
+    try {
+      return cmsSignedData.verifySignatures(
+          sid -> new JcaSimpleSignerInfoVerifierBuilder().build(signerCertificate));
+    } catch (final CMSException e) {
+      return false;
+    }
+  }
+
+  private boolean isCertificateTrusted(
+      final X509Certificate signerCertificate, final CMSSignedData cmsSignedData) {
+    LOGGER.trace("Starting CMS certificate validation");
+
+    try {
+      final CertPathBuilder cpb = CertPathBuilder.getInstance("PKIX");
+
+      // Define CMS signer certificate as the starting point of the path (leaf certificate)
+      final X509CertSelector targetConstraints = new X509CertSelector();
+      targetConstraints.setCertificate(signerCertificate);
+
+      // Set parameters for the certificate path building algorithm
+      final PKIXBuilderParameters params =
+          new PKIXBuilderParameters(truststore.getKeyStore(), targetConstraints);
+
+      // Adding CertStore with CRLs (if present, otherwise disabling revocation check)
+      createCRLCertStore(truststore)
+          .ifPresentOrElse(
+              CRLs -> {
+                params.addCertStore(CRLs);
+                PKIXRevocationChecker rc = (PKIXRevocationChecker) cpb.getRevocationChecker();
+                rc.setOptions(EnumSet.of(Option.PREFER_CRLS));
+                params.addCertPathChecker(rc);
+              },
+              () -> {
+                LOGGER.warn("No CRL CertStore provided. CRL validation will be disabled.");
+                params.setRevocationEnabled(false);
+              });
+
+      // Read certificates sent on the CMS message and adding it to the path building algorithm
+      final CertStore cmsCertificates =
+          new JcaCertStoreBuilder().addCertificates(cmsSignedData.getCertificates()).build();
+      params.addCertStore(cmsCertificates);
+
+      // Validate certificate path
+      try {
+        cpb.build(params);
+        return true;
+      } catch (final CertPathBuilderException cpbe) {
+        LOGGER.warn("Untrusted certificate chain", cpbe);
+        LOGGER.trace("Reason for failed validation", cpbe.getCause());
+        return false;
+      }
+
+    } catch (final Exception e) {
+      LOGGER.error("Error validating certificate chain");
+      throw new RuntimeException("Error validating certificate chain", e);
+    }
+  }
+
+  private Optional<CertStore> createCRLCertStore(final KeyStoreWrapper truststore) {
+    if (truststore.getCRLs() != null) {
+      try {
+        return Optional.of(
+            CertStore.getInstance(
+                "Collection", new CollectionCertStoreParameters(truststore.getCRLs())));
+      } catch (final Exception e) {
+        throw new RuntimeException("Error loading CRLs from Truststore", e);
+      }
+    } else {
+      return Optional.empty();
+    }
+  }
+}
diff --git a/pki/src/main/java/org/hyperledger/besu/pki/config/PkiKeyStoreConfiguration.java b/pki/src/main/java/org/hyperledger/besu/pki/config/PkiKeyStoreConfiguration.java
new file mode 100644
index 00000000000..57e330558cc
--- /dev/null
+++ b/pki/src/main/java/org/hyperledger/besu/pki/config/PkiKeyStoreConfiguration.java
@@ -0,0 +1,302 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.pki.config;
+
+import static java.util.Objects.requireNonNull;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import com.google.common.annotations.VisibleForTesting;
+
+/** The Pki key store configuration. */
+public class PkiKeyStoreConfiguration {
+
+  /** The constant DEFAULT_KEYSTORE_TYPE. */
+  public static String DEFAULT_KEYSTORE_TYPE = "PKCS12";
+  /** The constant DEFAULT_CERTIFICATE_ALIAS. */
+  public static String DEFAULT_CERTIFICATE_ALIAS = "validator";
+
+  private final String keyStoreType;
+  private final Path keyStorePath;
+  private final Path keyStorePasswordPath;
+  private final String certificateAlias;
+  private final String trustStoreType;
+  private final Path trustStorePath;
+  private final Path trustStorePasswordPath;
+  private final Optional<Path> crlFilePath;
+
+  /**
+   * Instantiates a new Pki key store configuration.
+   *
+   * @param keyStoreType the key store type
+   * @param keyStorePath the key store path
+   * @param keyStorePasswordPath the key store password path
+   * @param certificateAlias the certificate alias
+   * @param trustStoreType the trust store type
+   * @param trustStorePath the trust store path
+   * @param trustStorePasswordPath the trust store password path
+   * @param crlFilePath the crl file path
+   */
+  public PkiKeyStoreConfiguration(
+      final String keyStoreType,
+      final Path keyStorePath,
+      final Path keyStorePasswordPath,
+      final String certificateAlias,
+      final String trustStoreType,
+      final Path trustStorePath,
+      final Path trustStorePasswordPath,
+      final Optional<Path> crlFilePath) {
+    this.keyStoreType = keyStoreType;
+    this.keyStorePath = keyStorePath;
+    this.keyStorePasswordPath = keyStorePasswordPath;
+    this.certificateAlias = certificateAlias;
+    this.trustStoreType = trustStoreType;
+    this.trustStorePath = trustStorePath;
+    this.trustStorePasswordPath = trustStorePasswordPath;
+    this.crlFilePath = crlFilePath;
+  }
+
+  /**
+   * Gets key store type.
+   *
+   * @return the key store type
+   */
+  public String getKeyStoreType() {
+    return keyStoreType;
+  }
+
+  /**
+   * Gets key store path.
+   *
+   * @return the key store path
+   */
+  public Path getKeyStorePath() {
+    return keyStorePath;
+  }
+
+  /**
+   * Gets key store password path.
+   *
+   * @return the key store password path
+   */
+  @VisibleForTesting
+  public Path getKeyStorePasswordPath() {
+    return keyStorePasswordPath;
+  }
+
+  /**
+   * Gets key store password.
+   *
+   * @return the key store password
+   */
+  public String getKeyStorePassword() {
+    return readPasswordFromFile(keyStorePasswordPath);
+  }
+
+  /**
+   * Gets certificate alias.
+   *
+   * @return the certificate alias
+   */
+  public String getCertificateAlias() {
+    return certificateAlias;
+  }
+
+  /**
+   * Gets trust store type.
+   *
+   * @return the trust store type
+   */
+  public String getTrustStoreType() {
+    return trustStoreType;
+  }
+
+  /**
+   * Gets trust store path.
+   *
+   * @return the trust store path
+   */
+  public Path getTrustStorePath() {
+    return trustStorePath;
+  }
+
+  /**
+   * Gets trust store password path.
+   *
+   * @return the trust store password path
+   */
+  @VisibleForTesting
+  public Path getTrustStorePasswordPath() {
+    return trustStorePasswordPath;
+  }
+
+  /**
+   * Gets trust store password.
+   *
+   * @return the trust store password
+   */
+  public String getTrustStorePassword() {
+    return readPasswordFromFile(trustStorePasswordPath);
+  }
+
+  /**
+   * Gets CRL file path.
+   *
+   * @return the crl file path
+   */
+  public Optional<Path> getCrlFilePath() {
+    return crlFilePath;
+  }
+
+  /** The Builder. */
+  public static final class Builder {
+
+    private String keyStoreType = DEFAULT_KEYSTORE_TYPE;
+    private Path keyStorePath;
+    private Path keyStorePasswordPath;
+    private String certificateAlias = DEFAULT_CERTIFICATE_ALIAS;
+    private String trustStoreType = DEFAULT_KEYSTORE_TYPE;
+    private Path trustStorePath;
+    private Path trustStorePasswordPath;
+    private Path crlFilePath;
+
+    /** Instantiates a new Builder. */
+    public Builder() {}
+
+    /**
+     * With key store type.
+     *
+     * @param keyStoreType the key store type
+     * @return the builder
+     */
+    public Builder withKeyStoreType(final String keyStoreType) {
+      this.keyStoreType = keyStoreType;
+      return this;
+    }
+
+    /**
+     * With key store path.
+     *
+     * @param keyStorePath the key store path
+     * @return the builder
+     */
+    public Builder withKeyStorePath(final Path keyStorePath) {
+      this.keyStorePath = keyStorePath;
+      return this;
+    }
+
+    /**
+     * With key store password path.
+     *
+     * @param keyStorePasswordPath the key store password path
+     * @return the builder
+     */
+    public Builder withKeyStorePasswordPath(final Path keyStorePasswordPath) {
+      this.keyStorePasswordPath = keyStorePasswordPath;
+      return this;
+    }
+
+    /**
+     * With certificate alias.
+     *
+     * @param certificateAlias the certificate alias
+     * @return the builder
+     */
+    public Builder withCertificateAlias(final String certificateAlias) {
+      this.certificateAlias = certificateAlias;
+      return this;
+    }
+
+    /**
+     * With trust store type.
+     *
+     * @param trustStoreType the trust store type
+     * @return the builder
+     */
+    public Builder withTrustStoreType(final String trustStoreType) {
+      this.trustStoreType = trustStoreType;
+      return this;
+    }
+
+    /**
+     * With trust store path.
+     *
+     * @param trustStorePath the trust store path
+     * @return the builder
+     */
+    public Builder withTrustStorePath(final Path trustStorePath) {
+      this.trustStorePath = trustStorePath;
+      return this;
+    }
+
+    /**
+     * With trust store password path.
+     *
+     * @param trustStorePasswordPath the trust store password path
+     * @return the builder
+     */
+    public Builder withTrustStorePasswordPath(final Path trustStorePasswordPath) {
+      this.trustStorePasswordPath = trustStorePasswordPath;
+      return this;
+    }
+
+    /**
+     * With crl file path.
+     *
+     * @param filePath the file path
+     * @return the builder
+     */
+    public Builder withCrlFilePath(final Path filePath) {
+      this.crlFilePath = filePath;
+      return this;
+    }
+
+    /**
+     * Build pki key store configuration.
+     *
+     * @return the pki key store configuration
+     */
+    public PkiKeyStoreConfiguration build() {
+      requireNonNull(keyStoreType, "Key Store Type must not be null");
+      requireNonNull(keyStorePasswordPath, "Key Store password file must not be null");
+
+      return new PkiKeyStoreConfiguration(
+          keyStoreType,
+          keyStorePath,
+          keyStorePasswordPath,
+          certificateAlias,
+          trustStoreType,
+          trustStorePath,
+          trustStorePasswordPath,
+          Optional.ofNullable(crlFilePath));
+    }
+  }
+
+  private String readPasswordFromFile(final Path passwordFile) {
+    try (final Stream<String> fileStream = Files.lines(passwordFile)) {
+      return fileStream.findFirst().orElseThrow(() -> errorReadingFileException(passwordFile));
+    } catch (final IOException e) {
+      throw errorReadingFileException(passwordFile);
+    }
+  }
+
+  private RuntimeException errorReadingFileException(final Path path) {
+    return new RuntimeException(String.format("Unable to read keystore password from %s", path));
+  }
+}
diff --git a/pki/src/main/java/org/hyperledger/besu/pki/crl/CRLUtil.java b/pki/src/main/java/org/hyperledger/besu/pki/crl/CRLUtil.java
new file mode 100644
index 00000000000..a298736b4ad
--- /dev/null
+++ b/pki/src/main/java/org/hyperledger/besu/pki/crl/CRLUtil.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.pki.crl;
+
+import org.hyperledger.besu.pki.PkiException;
+
+import java.io.FileInputStream;
+import java.nio.file.Paths;
+import java.security.cert.CertStore;
+import java.security.cert.CertificateFactory;
+import java.security.cert.CollectionCertStoreParameters;
+import java.security.cert.X509CRL;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/** The CRL util. */
+public class CRLUtil {
+
+  /**
+   * Load CRLs cert store.
+   *
+   * @param path the path
+   * @return the cert store
+   */
+  public static CertStore loadCRLs(final String path) {
+    try {
+      final List<X509CRL> crls =
+          CertificateFactory.getInstance("X509")
+              .generateCRLs(new FileInputStream(Paths.get(path).toFile()))
+              .stream()
+              .map(X509CRL.class::cast)
+              .collect(Collectors.toList());
+
+      return CertStore.getInstance("Collection", new CollectionCertStoreParameters(crls));
+    } catch (Exception e) {
+      throw new PkiException("Error loading CRL file " + path, e);
+    }
+  }
+}
diff --git a/pki/src/main/java/org/hyperledger/besu/pki/keystore/AbstractKeyStoreWrapper.java b/pki/src/main/java/org/hyperledger/besu/pki/keystore/AbstractKeyStoreWrapper.java
new file mode 100644
index 00000000000..54cc1631016
--- /dev/null
+++ b/pki/src/main/java/org/hyperledger/besu/pki/keystore/AbstractKeyStoreWrapper.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.pki.keystore;
+
+import org.hyperledger.besu.pki.PkiException;
+
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509CRL;
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+/** The Abstract key store wrapper. */
+public abstract class AbstractKeyStoreWrapper implements KeyStoreWrapper {
+
+  private static final String X_509 = "X.509";
+
+  private final Collection<X509CRL> crls;
+
+  /**
+   * Instantiates a new Abstract key store wrapper.
+   *
+   * @param crlLocation the crl location
+   */
+  protected AbstractKeyStoreWrapper(final Path crlLocation) {
+    super();
+    if (null == crlLocation) {
+      this.crls = null;
+    } else {
+      try (InputStream stream = new FileInputStream(crlLocation.toFile())) {
+        this.crls =
+            CertificateFactory.getInstance(X_509).generateCRLs(stream).stream()
+                .map(X509CRL.class::cast)
+                .collect(Collectors.toList());
+      } catch (final Exception e) {
+        throw new PkiException("Failed to initialize software truststore", e);
+      }
+    }
+  }
+
+  /**
+   * Instantiates a new Abstract key store wrapper.
+   *
+   * @param crls the collection of X509CRL instances
+   */
+  protected AbstractKeyStoreWrapper(final Collection<X509CRL> crls) {
+    this.crls = crls;
+  }
+
+  @Override
+  public Collection<X509CRL> getCRLs() {
+    return crls;
+  }
+}
diff --git a/pki/src/main/java/org/hyperledger/besu/pki/keystore/HardwareKeyStoreWrapper.java b/pki/src/main/java/org/hyperledger/besu/pki/keystore/HardwareKeyStoreWrapper.java
new file mode 100644
index 00000000000..74217f272b2
--- /dev/null
+++ b/pki/src/main/java/org/hyperledger/besu/pki/keystore/HardwareKeyStoreWrapper.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.pki.keystore;
+
+import org.hyperledger.besu.pki.PkiException;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.security.KeyStore;
+import java.security.PrivateKey;
+import java.security.Provider;
+import java.security.PublicKey;
+import java.security.Security;
+import java.security.cert.Certificate;
+import java.security.cert.X509CRL;
+import java.util.Collection;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.stream.Stream;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Creates an instance of this class which is backed by a PKCS#11 keystore, such as a software
+ * (emulated) HSM or a physical/cloud HSM (see <a href=
+ * "https://docs.oracle.com/en/java/javase/11/security/pkcs11-reference-guide1.html">here</a>
+ */
+public class HardwareKeyStoreWrapper extends AbstractKeyStoreWrapper {
+
+  private static final Logger LOG = LoggerFactory.getLogger(HardwareKeyStoreWrapper.class);
+
+  private static final String pkcs11Provider = "SunPKCS11";
+
+  private final KeyStore keystore;
+  private final transient char[] keystorePassword;
+
+  private final java.security.Provider provider;
+
+  /**
+   * Instantiates a new Hardware key store wrapper.
+   *
+   * @param keystorePassword the keystore password
+   * @param provider the provider
+   * @param crlLocation the crl location
+   */
+  public HardwareKeyStoreWrapper(
+      final String keystorePassword, final Provider provider, final Path crlLocation) {
+    super(crlLocation);
+    try {
+      if (provider == null) {
+        throw new IllegalArgumentException("Provider is null");
+      }
+      this.keystorePassword = keystorePassword.toCharArray();
+
+      this.provider = provider;
+      if (Security.getProvider(provider.getName()) == null) {
+        Security.addProvider(provider);
+      }
+
+      keystore = KeyStore.getInstance(KeyStoreWrapper.KEYSTORE_TYPE_PKCS11, provider);
+      keystore.load(null, this.keystorePassword);
+
+    } catch (final Exception e) {
+      throw new PkiException("Failed to initialize HSM keystore", e);
+    }
+  }
+
+  /**
+   * Instantiates a new Hardware key store wrapper.
+   *
+   * @param keystorePassword the keystore password
+   * @param config the config
+   * @param crlLocation the CRL location
+   */
+  public HardwareKeyStoreWrapper(
+      final String keystorePassword, final Path config, final Path crlLocation) {
+    super(crlLocation);
+    try {
+      if (keystorePassword == null) {
+        throw new IllegalArgumentException("Keystore password is null");
+      }
+      final Properties properties = new Properties();
+      final File configFile = config.toFile();
+      try (InputStream ins = new FileInputStream(configFile)) {
+        properties.load(ins);
+      }
+      final String name = properties.getProperty("name");
+      this.keystorePassword = keystorePassword.toCharArray();
+      final Optional<Provider> existingProvider =
+          Stream.of(Security.getProviders())
+              .filter(p -> p.getName().equals(String.format("%s-%s", pkcs11Provider, name)))
+              .findAny();
+      if (existingProvider.isPresent()) {
+        provider = existingProvider.get();
+      } else {
+        provider = getPkcs11Provider(configFile.getAbsolutePath());
+        Security.addProvider(provider);
+      }
+
+      keystore = KeyStore.getInstance(KeyStoreWrapper.KEYSTORE_TYPE_PKCS11, provider);
+      keystore.load(null, this.keystorePassword);
+
+    } catch (final Exception e) {
+      throw new PkiException("Failed to initialize HSM keystore", e);
+    }
+  }
+
+  /**
+   * Instantiates a new Hardware key store wrapper.
+   *
+   * @param crls the collection of X509CRL crls
+   * @param keystore the keystore
+   * @param password the password
+   */
+  @VisibleForTesting
+  HardwareKeyStoreWrapper(
+      final Collection<X509CRL> crls, final KeyStore keystore, final String password) {
+    super(crls);
+    this.keystore = keystore;
+    this.keystorePassword = password.toCharArray();
+    this.provider = null;
+  }
+
+  @Override
+  public PrivateKey getPrivateKey(final String keyAlias) {
+    try {
+      LOG.debug("Retrieving private key for alias: {}", keyAlias);
+      return (PrivateKey) keystore.getKey(keyAlias, this.keystorePassword);
+    } catch (final Exception e) {
+      throw new PkiException("Failed to get key: " + keyAlias, e);
+    }
+  }
+
+  @Override
+  public PublicKey getPublicKey(final String keyAlias) {
+    try {
+      LOG.debug("Retrieving public key for alias: {}", keyAlias);
+      final Certificate certificate = keystore.getCertificate(keyAlias);
+      return (certificate != null) ? certificate.getPublicKey() : null;
+    } catch (final Exception e) {
+      throw new PkiException("Failed to get key: " + keyAlias, e);
+    }
+  }
+
+  @Override
+  public Certificate getCertificate(final String certificateAlias) {
+    try {
+      LOG.debug("Retrieving certificate for alias: {}", certificateAlias);
+      return keystore.getCertificate(certificateAlias);
+    } catch (final Exception e) {
+      throw new PkiException("Failed to get certificate: " + certificateAlias, e);
+    }
+  }
+
+  @Override
+  public Certificate[] getCertificateChain(final String certificateAlias) {
+    try {
+      LOG.debug("Retrieving certificate chain for alias: {}", certificateAlias);
+      return keystore.getCertificateChain(certificateAlias);
+    } catch (final Exception e) {
+      throw new PkiException("Failed to certificate chain for alias: " + certificateAlias, e);
+    }
+  }
+
+  @Override
+  public KeyStore getKeyStore() {
+    return keystore;
+  }
+
+  @Override
+  public KeyStore getTrustStore() {
+    return keystore;
+  }
+
+  private Provider getPkcs11Provider(final String config) {
+    final Provider provider = Security.getProvider(pkcs11Provider);
+    if (null == provider) {
+      throw new IllegalArgumentException("Unable to load PKCS11 provider configuration.");
+    } else {
+      return provider.configure(config);
+    }
+  }
+
+  /**
+   * Gets PKCS11 provider.
+   *
+   * @param config the config
+   * @return the PKCS11 provider
+   */
+  @VisibleForTesting
+  public Provider getPkcs11ProviderForConfig(final String config) {
+    return getPkcs11Provider(config);
+  }
+}
diff --git a/pki/src/main/java/org/hyperledger/besu/pki/keystore/KeyStoreWrapper.java b/pki/src/main/java/org/hyperledger/besu/pki/keystore/KeyStoreWrapper.java
new file mode 100644
index 00000000000..36e2390e1b4
--- /dev/null
+++ b/pki/src/main/java/org/hyperledger/besu/pki/keystore/KeyStoreWrapper.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.pki.keystore;
+
+import java.security.KeyStore;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.cert.Certificate;
+import java.security.cert.X509CRL;
+import java.util.Collection;
+
+/** The interface Key store wrapper. */
+public interface KeyStoreWrapper {
+
+  /** The constant KEYSTORE_TYPE_JKS. */
+  String KEYSTORE_TYPE_JKS = "JKS";
+  /** The constant KEYSTORE_TYPE_PKCS11. */
+  String KEYSTORE_TYPE_PKCS11 = "PKCS11";
+  /** The constant KEYSTORE_TYPE_PKCS12. */
+  String KEYSTORE_TYPE_PKCS12 = "PKCS12";
+
+  /**
+   * Gets key store.
+   *
+   * @return the key store
+   */
+  KeyStore getKeyStore();
+
+  /**
+   * Gets trust store.
+   *
+   * @return the trust store
+   */
+  KeyStore getTrustStore();
+
+  /**
+   * Gets private key.
+   *
+   * @param keyAlias the key alias
+   * @return the private key
+   */
+  PrivateKey getPrivateKey(String keyAlias);
+
+  /**
+   * Gets public key.
+   *
+   * @param keyAlias the key alias
+   * @return the public key
+   */
+  PublicKey getPublicKey(String keyAlias);
+
+  /**
+   * Gets certificate.
+   *
+   * @param certificateAlias the certificate alias
+   * @return the certificate
+   */
+  Certificate getCertificate(String certificateAlias);
+
+  /**
+   * Get certificate chain array.
+   *
+   * @param certificateAlias the certificate alias
+   * @return the certificate [ ]
+   */
+  Certificate[] getCertificateChain(String certificateAlias);
+
+  /**
+   * Gets CRLs.
+   *
+   * @return the CRLs
+   */
+  Collection<X509CRL> getCRLs();
+}
diff --git a/pki/src/main/java/org/hyperledger/besu/pki/keystore/SoftwareKeyStoreWrapper.java b/pki/src/main/java/org/hyperledger/besu/pki/keystore/SoftwareKeyStoreWrapper.java
new file mode 100644
index 00000000000..d3d892dfc43
--- /dev/null
+++ b/pki/src/main/java/org/hyperledger/besu/pki/keystore/SoftwareKeyStoreWrapper.java
@@ -0,0 +1,269 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.pki.keystore;
+
+import org.hyperledger.besu.pki.PkiException;
+
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.security.GeneralSecurityException;
+import java.security.Key;
+import java.security.KeyStore;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.cert.Certificate;
+import java.security.cert.X509CRL;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Software key store wrapper. */
+public class SoftwareKeyStoreWrapper extends AbstractKeyStoreWrapper {
+
+  private static final Logger LOG = LoggerFactory.getLogger(SoftwareKeyStoreWrapper.class);
+
+  private final KeyStore keystore;
+  private final transient char[] keystorePassword;
+  private KeyStore truststore;
+  private transient char[] truststorePassword;
+
+  private final Map<String, PrivateKey> cachedPrivateKeys = new HashMap<>();
+  private final Map<String, PublicKey> cachedPublicKeys = new HashMap<>();
+  private final Map<String, Certificate> cachedCertificates = new HashMap<>();
+
+  /**
+   * Instantiates a new Software key store wrapper.
+   *
+   * @param keystoreType the keystore type
+   * @param keystoreLocation the keystore location
+   * @param keystorePassword the keystore password
+   * @param crlLocation the crl location
+   */
+  public SoftwareKeyStoreWrapper(
+      final String keystoreType,
+      final Path keystoreLocation,
+      final String keystorePassword,
+      final Path crlLocation) {
+    this(keystoreType, keystoreLocation, keystorePassword, null, null, null, crlLocation);
+  }
+
+  /**
+   * Instantiates a new Software key store wrapper.
+   *
+   * @param keystoreType the keystore type
+   * @param keystoreLocation the keystore location
+   * @param keystorePassword the keystore password
+   * @param truststoreType the truststore type
+   * @param truststoreLocation the truststore location
+   * @param truststorePassword the truststore password
+   * @param crlLocation the crl location
+   */
+  public SoftwareKeyStoreWrapper(
+      final String keystoreType,
+      final Path keystoreLocation,
+      final String keystorePassword,
+      final String truststoreType,
+      final Path truststoreLocation,
+      final String truststorePassword,
+      final Path crlLocation) {
+    super(crlLocation);
+
+    if (keystorePassword == null) {
+      throw new IllegalArgumentException("Keystore password is null");
+    }
+    this.keystorePassword = keystorePassword.toCharArray();
+    try (InputStream stream = new FileInputStream(keystoreLocation.toFile())) {
+      keystore = KeyStore.getInstance(keystoreType);
+      keystore.load(stream, this.keystorePassword);
+
+    } catch (final Exception e) {
+      throw new PkiException("Failed to initialize software keystore: " + keystoreLocation, e);
+    }
+
+    if (truststoreType != null && truststoreLocation != null) {
+      this.truststorePassword =
+          (truststorePassword != null) ? truststorePassword.toCharArray() : null;
+      try (InputStream stream = new FileInputStream(truststoreLocation.toFile())) {
+        truststore = KeyStore.getInstance(truststoreType);
+        truststore.load(stream, this.truststorePassword);
+
+      } catch (final Exception e) {
+        throw new PkiException(
+            "Failed to initialize software truststore: " + truststoreLocation, e);
+      }
+    }
+  }
+
+  /**
+   * Instantiates a new Software key store wrapper.
+   *
+   * @param keystore the keystore
+   * @param keystorePassword the keystore password
+   * @param truststore the truststore
+   * @param truststorePassword the truststore password
+   */
+  @VisibleForTesting
+  public SoftwareKeyStoreWrapper(
+      final KeyStore keystore,
+      final String keystorePassword,
+      final KeyStore truststore,
+      final String truststorePassword) {
+    super((Path) null);
+    this.keystore = keystore;
+    this.keystorePassword = keystorePassword.toCharArray();
+    this.truststore = truststore;
+    this.truststorePassword = truststorePassword.toCharArray();
+  }
+
+  /**
+   * Instantiates a new Software key store wrapper.
+   *
+   * @param crls the collection of X509CRL crls
+   * @param keystore the keystore
+   * @param keystorePassword the keystore password
+   */
+  @VisibleForTesting
+  public SoftwareKeyStoreWrapper(
+      final Collection<X509CRL> crls, final KeyStore keystore, final String keystorePassword) {
+    super(crls);
+    this.keystore = keystore;
+    this.keystorePassword = keystorePassword.toCharArray();
+    this.truststore = null;
+    this.truststorePassword = null;
+  }
+
+  @Override
+  public PrivateKey getPrivateKey(final String keyAlias) {
+    LOG.debug("Retrieving private key for alias: {}", keyAlias);
+    return (PrivateKey) getKey(keyAlias, PrivateKey.class, cachedPrivateKeys);
+  }
+
+  @Override
+  public PublicKey getPublicKey(final String keyAlias) {
+    LOG.debug("Retrieving public key for alias: {}", keyAlias);
+    return (PublicKey) getKey(keyAlias, PublicKey.class, cachedPublicKeys);
+  }
+
+  @Override
+  public Certificate getCertificate(final String certificateAlias) {
+    try {
+      LOG.debug("Retrieving certificate for alias: {}", certificateAlias);
+      Certificate certificate = cachedCertificates.get(certificateAlias);
+      if (certificate == null) {
+        LOG.debug("Certificate alias: {} not cached", certificateAlias);
+
+        certificate = keystore.getCertificate(certificateAlias);
+        if (certificate == null && truststore != null) {
+          certificate = truststore.getCertificate(certificateAlias);
+        }
+        if (certificate != null) {
+          LOG.debug("Certificate alias: {} found in keystore/truststore", certificateAlias);
+          cachedCertificates.put(certificateAlias, certificate);
+          cachedPublicKeys.put(certificateAlias, certificate.getPublicKey());
+          return certificate;
+        } else {
+          LOG.warn("Certificate alias: {} not found in keystore/truststore", certificateAlias);
+        }
+      }
+      return certificate;
+
+    } catch (final Exception e) {
+      throw new PkiException("Failed to get certificate: " + certificateAlias, e);
+    }
+  }
+
+  @Override
+  public Certificate[] getCertificateChain(final String certificateAlias) {
+    try {
+      LOG.debug("Retrieving certificate chain for alias: {}", certificateAlias);
+
+      Certificate[] certificateChain = keystore.getCertificateChain(certificateAlias);
+      if (certificateChain == null && truststore != null) {
+        certificateChain = truststore.getCertificateChain(certificateAlias);
+      }
+      return certificateChain;
+    } catch (final Exception e) {
+      throw new PkiException(
+          "Failed to retrieve certificate chain for alias: " + certificateAlias, e);
+    }
+  }
+
+  private Key getKey(
+      final String keyAlias,
+      final Class<? extends Key> keyTypeClass,
+      final Map<String, ? extends Key> keyCache) {
+    Key cachedKey = keyCache.get(keyAlias);
+    if (cachedKey == null) {
+      LOG.debug("Key alias: {} not cached", keyAlias);
+      try {
+        cachedKey = loadAndCacheKey(this.keystore, this.keystorePassword, keyAlias, keyTypeClass);
+        if (cachedKey == null) {
+          cachedKey =
+              loadAndCacheKey(this.truststore, this.truststorePassword, keyAlias, keyTypeClass);
+        }
+      } catch (final Exception e) {
+        throw new PkiException("Failed to get key: " + keyAlias, e);
+      }
+    }
+    return cachedKey;
+  }
+
+  @Override
+  public KeyStore getKeyStore() {
+    return keystore;
+  }
+
+  @Override
+  public KeyStore getTrustStore() {
+    return truststore;
+  }
+
+  private Key loadAndCacheKey(
+      final KeyStore keystore,
+      final char[] keystorePassword,
+      final String keyAlias,
+      final Class<? extends Key> keyTypeClass)
+      throws GeneralSecurityException {
+    if (keystore != null && keystore.containsAlias(keyAlias)) {
+
+      final Key key = keystore.getKey(keyAlias, keystorePassword);
+      if (key != null) {
+        LOG.debug("Key alias: {} found in keystore/truststore", keyAlias);
+        if (key instanceof PrivateKey && PrivateKey.class.isAssignableFrom(keyTypeClass)) {
+          cachedPrivateKeys.put(keyAlias, (PrivateKey) key);
+          return key;
+        } else if (key instanceof PublicKey && PublicKey.class.isAssignableFrom(keyTypeClass)) {
+          cachedPublicKeys.put(keyAlias, (PublicKey) key);
+          return key;
+        }
+      }
+
+      if (PublicKey.class.isAssignableFrom(keyTypeClass)) {
+        final Certificate certificate = getCertificate(keyAlias);
+        if (certificate != null) {
+          return certificate.getPublicKey();
+        }
+      }
+    }
+
+    LOG.warn("Key alias: {} not found in keystore/truststore", keyAlias);
+    return null;
+  }
+}
diff --git a/pki/src/test/java/org/hyperledger/besu/pki/cms/CmsCreationAndValidationTest.java b/pki/src/test/java/org/hyperledger/besu/pki/cms/CmsCreationAndValidationTest.java
new file mode 100644
index 00000000000..ceb30e1e00f
--- /dev/null
+++ b/pki/src/test/java/org/hyperledger/besu/pki/cms/CmsCreationAndValidationTest.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.pki.cms;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.hyperledger.besu.pki.util.TestCertificateUtils.Algorithm.EC;
+import static org.hyperledger.besu.pki.util.TestCertificateUtils.Algorithm.RSA;
+
+import org.hyperledger.besu.pki.util.TestCertificateUtils.Algorithm;
+
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.cert.X509Certificate;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
+import org.bouncycastle.cms.CMSProcessableByteArray;
+import org.bouncycastle.cms.CMSSignedData;
+import org.bouncycastle.cms.CMSSignedDataGenerator;
+import org.bouncycastle.cms.CMSTypedData;
+import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder;
+import org.bouncycastle.operator.ContentSigner;
+import org.bouncycastle.operator.DigestCalculatorProvider;
+import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
+import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+
+public class CmsCreationAndValidationTest {
+
+  private static final CmsTestKeystores rsaTestKeystores = new CmsTestKeystores(RSA);
+  private static final CmsTestKeystores ecTestKeystores = new CmsTestKeystores(EC);
+
+  private CmsTestKeystores getCmsTestKeystores(final Algorithm algorithm) {
+    return switch (algorithm) {
+      case RSA -> rsaTestKeystores;
+      case EC -> ecTestKeystores;
+    };
+  }
+
+  @ParameterizedTest
+  @EnumSource(value = Algorithm.class)
+  public void cmsValidationWithEmptyCmsMessage(final Algorithm algorithm) {
+    final Bytes data = Bytes.random(32);
+
+    assertThat(getCmsTestKeystores(algorithm).getCmsValidator().validate(Bytes.EMPTY, data))
+        .isFalse();
+  }
+
+  @ParameterizedTest
+  @EnumSource(value = Algorithm.class)
+  public void cmsValidationWithTrustedSelfSignedCertificate(final Algorithm algorithm) {
+    final CmsCreator cmsCreator =
+        new CmsCreator(getCmsTestKeystores(algorithm).getKeystoreWrapper(), "trusted_selfsigned");
+    final Bytes data = Bytes.random(32);
+
+    final Bytes cms = cmsCreator.create(data);
+
+    assertThat(getCmsTestKeystores(algorithm).getCmsValidator().validate(cms, data)).isTrue();
+  }
+
+  @ParameterizedTest
+  @EnumSource(value = Algorithm.class)
+  public void cmsValidationWithUntrustedSelfSignedCertificate(final Algorithm algorithm) {
+    final CmsCreator cmsCreator =
+        new CmsCreator(getCmsTestKeystores(algorithm).getKeystoreWrapper(), "untrusted_selfsigned");
+    final Bytes data = Bytes.random(32);
+
+    final Bytes cms = cmsCreator.create(data);
+
+    assertThat(getCmsTestKeystores(algorithm).getCmsValidator().validate(cms, data)).isFalse();
+  }
+
+  @ParameterizedTest
+  @EnumSource(value = Algorithm.class)
+  public void cmsValidationWithTrustedChain(final Algorithm algorithm) {
+    final CmsCreator cmsCreator =
+        new CmsCreator(getCmsTestKeystores(algorithm).getKeystoreWrapper(), "trusted");
+    final Bytes data = Bytes.random(32);
+
+    final Bytes cms = cmsCreator.create(data);
+
+    assertThat(getCmsTestKeystores(algorithm).getCmsValidator().validate(cms, data)).isTrue();
+  }
+
+  @ParameterizedTest
+  @EnumSource(value = Algorithm.class)
+  public void cmsValidationWithUntrustedChain(final Algorithm algorithm) {
+    final CmsCreator cmsCreator =
+        new CmsCreator(getCmsTestKeystores(algorithm).getKeystoreWrapper(), "untrusted");
+    final Bytes data = Bytes.random(32);
+
+    final Bytes cms = cmsCreator.create(data);
+
+    assertThat(getCmsTestKeystores(algorithm).getCmsValidator().validate(cms, data)).isFalse();
+  }
+
+  @ParameterizedTest
+  @EnumSource(value = Algorithm.class)
+  public void cmsValidationWithExpiredCertificate(final Algorithm algorithm) {
+    final CmsCreator cmsCreator =
+        new CmsCreator(getCmsTestKeystores(algorithm).getKeystoreWrapper(), "expired");
+    final Bytes data = Bytes.random(32);
+
+    final Bytes cms = cmsCreator.create(data);
+
+    assertThat(getCmsTestKeystores(algorithm).getCmsValidator().validate(cms, data)).isFalse();
+  }
+
+  @ParameterizedTest
+  @EnumSource(value = Algorithm.class)
+  public void cmsValidationWithRevokedCertificate(final Algorithm algorithm) {
+    final CmsCreator cmsCreator =
+        new CmsCreator(getCmsTestKeystores(algorithm).getKeystoreWrapper(), "revoked");
+    final Bytes data = Bytes.random(32);
+
+    final Bytes cms = cmsCreator.create(data);
+
+    assertThat(getCmsTestKeystores(algorithm).getCmsValidator().validate(cms, data)).isFalse();
+  }
+
+  @ParameterizedTest
+  @EnumSource(value = Algorithm.class)
+  public void cmsValidationWithoutCRLConfigDisablesCRLCheck(final Algorithm algorithm) {
+    final CmsCreator cmsCreator =
+        new CmsCreator(getCmsTestKeystores(algorithm).getKeystoreWrapper(), "revoked");
+    final Bytes data = Bytes.random(32);
+
+    final Bytes cms = cmsCreator.create(data);
+
+    CmsValidator cmsValidator = getCmsTestKeystores(algorithm).getCmsValidatorWithoutCrl();
+
+    // Because we don't have a CRL CertStore, revocation is not checked
+    assertThat(cmsValidator.validate(cms, data)).isTrue();
+  }
+
+  @ParameterizedTest
+  @EnumSource(value = Algorithm.class)
+  public void cmsValidationWithWrongSignedData(final Algorithm algorithm) {
+    final CmsCreator cmsCreator =
+        new CmsCreator(getCmsTestKeystores(algorithm).getKeystoreWrapper(), "trusted");
+    final Bytes otherData = Bytes.random(32);
+    final Bytes cms = cmsCreator.create(otherData);
+
+    final Bytes expectedData = Bytes.random(32);
+    assertThat(getCmsTestKeystores(algorithm).getCmsValidator().validate(cms, expectedData))
+        .isFalse();
+  }
+
+  @ParameterizedTest
+  @EnumSource(value = Algorithm.class)
+  public void cmsValidationWithInvalidSignature(final Algorithm algorithm) throws Exception {
+    // Create a CMS message signed with a certificate, but create SignerInfo using another
+    // certificate to trigger the signature verification to fail.
+
+    final PrivateKey privateKey =
+        getCmsTestKeystores(algorithm).getKeystoreWrapper().getPrivateKey("trusted");
+    final PublicKey publicKey =
+        getCmsTestKeystores(algorithm).getKeystoreWrapper().getPublicKey("trusted");
+    final X509Certificate signerCertificate =
+        (X509Certificate)
+            getCmsTestKeystores(algorithm).getKeystoreWrapper().getCertificate("trusted");
+    final X509Certificate otherCertificate =
+        (X509Certificate)
+            getCmsTestKeystores(algorithm)
+                .getKeystoreWrapper()
+                .getCertificate("trusted_selfsigned");
+
+    final ContentSigner contentSigner =
+        new JcaContentSignerBuilder(CmsCreator.getPreferredSignatureAlgorithm(publicKey))
+            .build(privateKey);
+
+    final CMSSignedDataGenerator cmsGenerator = new CMSSignedDataGenerator();
+    cmsGenerator.addCertificate(new JcaX509CertificateHolder(signerCertificate));
+    cmsGenerator.addCertificate(new JcaX509CertificateHolder(otherCertificate));
+
+    final DigestCalculatorProvider digestCalculatorProvider =
+        new JcaDigestCalculatorProviderBuilder().setProvider("BC").build();
+    cmsGenerator.addSignerInfoGenerator(
+        new JcaSignerInfoGeneratorBuilder(digestCalculatorProvider)
+            .build(contentSigner, otherCertificate));
+
+    final Bytes expectedData = Bytes.random(32);
+    final CMSTypedData cmsData = new CMSProcessableByteArray(expectedData.toArray());
+    final CMSSignedData cmsSignedData = cmsGenerator.generate(cmsData, true);
+    final Bytes cmsBytes = Bytes.wrap(cmsSignedData.getEncoded());
+
+    assertThat(getCmsTestKeystores(algorithm).getCmsValidator().validate(cmsBytes, expectedData))
+        .isFalse();
+  }
+}
diff --git a/pki/src/test/java/org/hyperledger/besu/pki/cms/CmsTestKeystores.java b/pki/src/test/java/org/hyperledger/besu/pki/cms/CmsTestKeystores.java
new file mode 100644
index 00000000000..3a2d4c04f8f
--- /dev/null
+++ b/pki/src/test/java/org/hyperledger/besu/pki/cms/CmsTestKeystores.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.pki.cms;
+
+import static org.hyperledger.besu.pki.util.TestCertificateUtils.createCRL;
+import static org.hyperledger.besu.pki.util.TestCertificateUtils.createKeyPair;
+import static org.hyperledger.besu.pki.util.TestCertificateUtils.createSelfSignedCertificate;
+import static org.hyperledger.besu.pki.util.TestCertificateUtils.issueCertificate;
+
+import org.hyperledger.besu.pki.keystore.KeyStoreWrapper;
+import org.hyperledger.besu.pki.keystore.SoftwareKeyStoreWrapper;
+import org.hyperledger.besu.pki.util.TestCertificateUtils.Algorithm;
+
+import java.security.KeyPair;
+import java.security.KeyStore;
+import java.security.cert.Certificate;
+import java.security.cert.X509CRL;
+import java.security.cert.X509Certificate;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+public class CmsTestKeystores {
+  private KeyStore keystore;
+  private KeyStore truststore;
+  private List<X509CRL> CRLs;
+
+  private KeyStoreWrapper keystoreWrapper;
+  private KeyStoreWrapper truststoreWrapper;
+  private KeyStoreWrapper truststoreWrapperWithoutCrl;
+  private CmsValidator cmsValidator;
+  private CmsValidator cmsValidatorWithoutCrl;
+
+  public CmsTestKeystores(final Algorithm algorithm) {
+    try {
+      init(algorithm);
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public void init(final Algorithm algorithm) throws Exception {
+    final Instant notBefore = Instant.now().minus(1, ChronoUnit.DAYS);
+    final Instant notAfter = Instant.now().plus(1, ChronoUnit.DAYS);
+
+    /*
+     Create self-signed certificate
+    */
+    final KeyPair selfsignedKeyPair = createKeyPair(algorithm);
+    final X509Certificate selfsignedCertificate =
+        createSelfSignedCertificate("selfsigned", notBefore, notAfter, selfsignedKeyPair);
+
+    /*
+      Create trusted chain (ca -> interca -> partneraca -> partneravalidator)
+    */
+    final KeyPair caKeyPair = createKeyPair(algorithm);
+    final X509Certificate caCertificate =
+        createSelfSignedCertificate("ca", notBefore, notAfter, caKeyPair);
+
+    final KeyPair interCAKeyPair = createKeyPair(algorithm);
+    final X509Certificate interCACertificate =
+        issueCertificate(
+            caCertificate, caKeyPair, "interca", notBefore, notAfter, interCAKeyPair, true);
+
+    final KeyPair partnerACAPair = createKeyPair(algorithm);
+    final X509Certificate partnerACACertificate =
+        issueCertificate(
+            interCACertificate,
+            interCAKeyPair,
+            "partneraca",
+            notBefore,
+            notAfter,
+            partnerACAPair,
+            true);
+
+    final KeyPair parterAValidatorKeyPair = createKeyPair(algorithm);
+    final X509Certificate partnerAValidatorCertificate =
+        issueCertificate(
+            partnerACACertificate,
+            partnerACAPair,
+            "partneravalidator",
+            notBefore,
+            notAfter,
+            parterAValidatorKeyPair,
+            false);
+
+    /*
+     Create expired certificate
+    */
+    final KeyPair expiredKeyPair = createKeyPair(algorithm);
+    final X509Certificate expiredCertificate =
+        issueCertificate(
+            caCertificate,
+            caKeyPair,
+            "expired",
+            notBefore,
+            notBefore.plus(1, ChronoUnit.SECONDS),
+            expiredKeyPair,
+            true);
+
+    /*
+     Create revoked and revoked certificates
+    */
+    final KeyPair revokedKeyPair = createKeyPair(algorithm);
+    final X509Certificate revokedCertificate =
+        issueCertificate(
+            caCertificate, caKeyPair, "revoked", notBefore, notAfter, revokedKeyPair, true);
+
+    /*
+     Create untrusted chain (untrusted_selfsigned -> unstrusted_partner)
+    */
+    final KeyPair untrustedSelfSignedKeyPair = createKeyPair(algorithm);
+    final X509Certificate untrustedSelfsignedCertificate =
+        createSelfSignedCertificate(
+            "untrusted_selfsigned", notBefore, notAfter, untrustedSelfSignedKeyPair);
+
+    final KeyPair untrustedIntermediateKeyPair = createKeyPair(algorithm);
+    final X509Certificate untrustedIntermediateCertificate =
+        issueCertificate(
+            untrustedSelfsignedCertificate,
+            untrustedSelfSignedKeyPair,
+            "unstrusted_partner",
+            notBefore,
+            notAfter,
+            untrustedIntermediateKeyPair,
+            true);
+
+    /*
+     Create truststore wrapper with 3 trusted certificates: 'ca', 'interca' and 'selfsigned'
+    */
+    truststore = KeyStore.getInstance("PKCS12");
+    truststore.load(null, null);
+
+    truststore.setCertificateEntry("ca", caCertificate);
+    truststore.setCertificateEntry("interca", interCACertificate);
+    truststore.setCertificateEntry("selfsigned", selfsignedCertificate);
+
+    /*
+     Create keystore with certificates used in tests
+    */
+    keystore = KeyStore.getInstance("PKCS12");
+    keystore.load(null, null);
+
+    keystore.setKeyEntry(
+        "trusted_selfsigned",
+        selfsignedKeyPair.getPrivate(),
+        "".toCharArray(),
+        new Certificate[] {selfsignedCertificate});
+    keystore.setKeyEntry(
+        "untrusted_selfsigned",
+        untrustedSelfSignedKeyPair.getPrivate(),
+        "".toCharArray(),
+        new Certificate[] {untrustedSelfsignedCertificate});
+    keystore.setKeyEntry(
+        "expired",
+        expiredKeyPair.getPrivate(),
+        "".toCharArray(),
+        new Certificate[] {expiredCertificate});
+    keystore.setKeyEntry(
+        "revoked",
+        revokedKeyPair.getPrivate(),
+        "".toCharArray(),
+        new Certificate[] {revokedCertificate});
+    keystore.setKeyEntry(
+        "trusted",
+        parterAValidatorKeyPair.getPrivate(),
+        "".toCharArray(),
+        new Certificate[] {partnerAValidatorCertificate, partnerACACertificate});
+    keystore.setKeyEntry(
+        "untrusted",
+        untrustedIntermediateKeyPair.getPrivate(),
+        "".toCharArray(),
+        new Certificate[] {untrustedIntermediateCertificate, untrustedSelfsignedCertificate});
+
+    /*
+     Create CRLs for all CA certificates (mostly empty, only ca has one revoked certificate)
+    */
+    final X509CRL caCRL = createCRL(caCertificate, caKeyPair, Set.of(revokedCertificate));
+    final X509CRL intercaCRL =
+        createCRL(interCACertificate, interCAKeyPair, Collections.emptyList());
+    final X509CRL partnerACACRL =
+        createCRL(partnerACACertificate, partnerACAPair, Collections.emptyList());
+    final X509CRL selfsignedCRL =
+        createCRL(selfsignedCertificate, selfsignedKeyPair, Collections.emptyList());
+    CRLs = List.of(caCRL, intercaCRL, partnerACACRL, selfsignedCRL);
+
+    keystoreWrapper = new SoftwareKeyStoreWrapper(null, keystore, "");
+
+    truststoreWrapper = new SoftwareKeyStoreWrapper(CRLs, truststore, "");
+
+    truststoreWrapperWithoutCrl = new SoftwareKeyStoreWrapper(null, truststore, "");
+
+    cmsValidator = new CmsValidator(truststoreWrapper);
+
+    cmsValidatorWithoutCrl = new CmsValidator(truststoreWrapperWithoutCrl);
+  }
+
+  public KeyStore getKeystore() {
+    return keystore;
+  }
+
+  public KeyStore getTruststore() {
+    return truststore;
+  }
+
+  public List<X509CRL> getCRLs() {
+    return CRLs;
+  }
+
+  public KeyStoreWrapper getKeystoreWrapper() {
+    return keystoreWrapper;
+  }
+
+  public KeyStoreWrapper getTruststoreWrapper() {
+    return truststoreWrapper;
+  }
+
+  public CmsValidator getCmsValidator() {
+    return cmsValidator;
+  }
+
+  public KeyStoreWrapper getTruststoreWrapperWithoutCrl() {
+    return truststoreWrapperWithoutCrl;
+  }
+
+  public CmsValidator getCmsValidatorWithoutCrl() {
+    return cmsValidatorWithoutCrl;
+  }
+}
diff --git a/pki/src/test/java/org/hyperledger/besu/pki/keystore/BaseKeyStoreFileWrapperTest.java b/pki/src/test/java/org/hyperledger/besu/pki/keystore/BaseKeyStoreFileWrapperTest.java
new file mode 100644
index 00000000000..254e8bf23c7
--- /dev/null
+++ b/pki/src/test/java/org/hyperledger/besu/pki/keystore/BaseKeyStoreFileWrapperTest.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.pki.keystore;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.nio.file.Path;
+import java.security.cert.Certificate;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public abstract class BaseKeyStoreFileWrapperTest {
+  protected static final String KEYSTORE_VALID_KEY_ALIAS = "partner1client1";
+  protected static final String KEYSTORE_INVALID_KEY_ALIAS = "partner1clientinvalid";
+  protected static final String TRUSTSTORE_VALID_CERTIFICATE_ALIAS = "interca";
+  protected static final String TRUSTSTORE_INVALID_CERTIFICATE_ALIAS = "interca-invalid";
+
+  @Parameterized.Parameter public String keyStoreWrapperDescription;
+
+  @Parameterized.Parameter(1)
+  public boolean keystoreWrapperConfiguredWithTruststore;
+
+  @Parameterized.Parameter(2)
+  public KeyStoreWrapper keyStoreWrapper;
+
+  protected static Path toPath(final String path) throws Exception {
+    return null == path
+        ? null
+        : Path.of(BaseKeyStoreFileWrapperTest.class.getResource(path).toURI());
+  }
+
+  @Test
+  public void getPublicKey_WithValidAlias_ReturnsExpectedValue() {
+    assertThat(keyStoreWrapper.getPublicKey(KEYSTORE_VALID_KEY_ALIAS))
+        .as("Public key is not null")
+        .isNotNull();
+  }
+
+  @Test
+  public void getPublicKey_WithInvalidAlias_ReturnsExpectedValue() {
+    assertThat(keyStoreWrapper.getPublicKey(KEYSTORE_INVALID_KEY_ALIAS))
+        .as("Public key is null")
+        .isNull();
+  }
+
+  @Test
+  public void getPrivateKey_WithValidAlias_ReturnsExpectedValue() {
+    assertThat(keyStoreWrapper.getPrivateKey(KEYSTORE_VALID_KEY_ALIAS))
+        .as("Private key is not null")
+        .isNotNull();
+  }
+
+  @Test
+  public void getPrivateKey_WithInvalidAlias_ReturnsExpectedValue() {
+    assertThat(keyStoreWrapper.getPrivateKey(KEYSTORE_INVALID_KEY_ALIAS))
+        .as("Private key is null")
+        .isNull();
+  }
+
+  @Test
+  public void getCertificate_WithValidAlias_ReturnsExpectedValue() {
+    assertThat(keyStoreWrapper.getCertificate(KEYSTORE_VALID_KEY_ALIAS))
+        .as("Certificate is not null")
+        .isNotNull();
+  }
+
+  @Test
+  public void getCertificate_WithInvalidAlias_ReturnsExpectedValue() {
+    assertThat(keyStoreWrapper.getCertificate(KEYSTORE_INVALID_KEY_ALIAS))
+        .as("Certificate is null")
+        .isNull();
+  }
+
+  @Test
+  public void getCertificateChain_WithValidAlias_ReturnsExpectedValue() {
+    assertThat(keyStoreWrapper.getCertificateChain(KEYSTORE_VALID_KEY_ALIAS))
+        .as("Certificate chain is not null")
+        .isNotNull();
+  }
+
+  @Test
+  public void getCertificateChain_WithInvalidAlias_ReturnsExpectedValue() {
+    assertThat(keyStoreWrapper.getCertificateChain(KEYSTORE_INVALID_KEY_ALIAS))
+        .as("Certificate is null")
+        .isNull();
+  }
+
+  @Test
+  public void getCertificate_FromTruststore_WithValidAlias_ReturnsExpectedValue() {
+    final Certificate certificate =
+        keyStoreWrapper.getCertificate(TRUSTSTORE_VALID_CERTIFICATE_ALIAS);
+    if (keystoreWrapperConfiguredWithTruststore) {
+      assertThat(certificate).as("Certificate is not null").isNotNull();
+    } else {
+      assertThat(certificate).as("Certificate is null").isNull();
+    }
+  }
+
+  @Test
+  public void getCertificate_FromTruststore_WithInvalidAlias_ReturnsExpectedValue() {
+    assertThat(keyStoreWrapper.getPrivateKey(TRUSTSTORE_INVALID_CERTIFICATE_ALIAS))
+        .as("Certificate is null")
+        .isNull();
+  }
+
+  @Test
+  public void getCRLS_Check() {
+    assertThat(keyStoreWrapper.getCRLs()).as("CRLs is not null").isNotNull();
+    assertThat(keyStoreWrapper.getCRLs().size()).as("CRLs size matches").isEqualTo(2);
+  }
+}
diff --git a/pki/src/test/java/org/hyperledger/besu/pki/keystore/CryptoTestUtil.java b/pki/src/test/java/org/hyperledger/besu/pki/keystore/CryptoTestUtil.java
new file mode 100644
index 00000000000..4176cac0faa
--- /dev/null
+++ b/pki/src/test/java/org/hyperledger/besu/pki/keystore/CryptoTestUtil.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.pki.keystore;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CryptoTestUtil {
+
+  private static final Logger LOG = LoggerFactory.getLogger(CryptoTestUtil.class);
+
+  private CryptoTestUtil() {}
+
+  public static boolean isNSSLibInstalled() {
+    try {
+      final String nssLibPath = getNSSLibPath();
+      return nssLibPath != null && !nssLibPath.trim().isEmpty();
+    } catch (final Exception e) {
+      LOG.info("NSS library does not seem to be installed!", e);
+    }
+    return false;
+  }
+
+  public static String getNSSLibPath() throws IOException, InterruptedException {
+    String nssLibPath = "";
+    final String centOS_nssPathCmd =
+        "whereis libnssdbm3 | grep -o \"\\/.*libnssdbm3\\.[0-9a-z]* \" | sed 's/\\/libnssdbm3.*//g'";
+    final String debian_nssPathCmd =
+        "whereis libnss3 | grep  -o \".*libnss3.[0-9a-z]\" | sed 's/lib.* \\(\\/.*\\)\\/lib.*/\\1/'";
+    final String macOS_nssPathCmd = "dirname `which certutil` | sed 's/bin/lib/g'";
+
+    nssLibPath = executeSystemCmd(centOS_nssPathCmd).orElse(nssLibPath);
+    LOG.info("centOS_nssPathCmd: {}", nssLibPath);
+    if ("".equals(nssLibPath)) {
+      nssLibPath = executeSystemCmd(debian_nssPathCmd).orElse(nssLibPath);
+      LOG.info("debian_nssPathCmd: {}", nssLibPath);
+    }
+    if ("".equals(nssLibPath)) {
+      nssLibPath = executeSystemCmd(macOS_nssPathCmd).orElse(nssLibPath);
+      LOG.info("macOS_nssPathCmd: {}", nssLibPath);
+    }
+    LOG.info("Detected NSS library path: {}", nssLibPath);
+    return nssLibPath;
+  }
+
+  public static Optional<String> executeSystemCmd(final String cmd)
+      throws IOException, InterruptedException {
+    final Process p = Runtime.getRuntime().exec(new String[] {"/bin/sh", "-c", cmd});
+    try {
+      if (p.waitFor() == 0) {
+        final java.util.Scanner s =
+            new java.util.Scanner(p.getInputStream(), StandardCharsets.UTF_8.name())
+                .useDelimiter("\\A");
+        if (s.hasNext()) {
+          return Optional.of(s.next().replace("\r", "").replace("\n", ""));
+        }
+      }
+    } finally {
+      if (p != null) {
+        p.destroy();
+      }
+    }
+    return Optional.empty();
+  }
+}
diff --git a/pki/src/test/java/org/hyperledger/besu/pki/keystore/HardwareKeyStoreFileWrapperTest.java b/pki/src/test/java/org/hyperledger/besu/pki/keystore/HardwareKeyStoreFileWrapperTest.java
new file mode 100644
index 00000000000..99208e01c5b
--- /dev/null
+++ b/pki/src/test/java/org/hyperledger/besu/pki/keystore/HardwareKeyStoreFileWrapperTest.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.pki.keystore;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
+
+import org.hyperledger.besu.pki.PkiException;
+
+import java.nio.file.Path;
+import java.security.Provider;
+import java.security.Security;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.jupiter.api.condition.OS;
+import org.junit.runners.Parameterized;
+
+public class HardwareKeyStoreFileWrapperTest extends BaseKeyStoreFileWrapperTest {
+
+  private static final String config = "/keystore/partner1client1/nss.cfg";
+  private static final String crl = "/keystore/partner1client1/crl.pem";
+  private static final String configName = "NSScrypto-partner1client1";
+  private static final String validKeystorePassword = "test123";
+
+  @Parameterized.Parameters(name = "{index}: {0}")
+  public static Collection<Object[]> data() {
+    return Arrays.asList(
+        new Object[][] {
+          {
+            "HardwareKeyStoreWrapper[PKCS11 keystore/truststore]",
+            true,
+            CryptoTestUtil.isNSSLibInstalled() ? getHardwareKeyStoreWrapper(configName) : null
+          }
+        });
+  }
+
+  private static KeyStoreWrapper getHardwareKeyStoreWrapper(final String cfgName) {
+    try {
+      final Path path = toPath(config);
+      final Path crlPath = toPath(crl);
+      final Optional<Provider> existingProvider =
+          Stream.of(Security.getProviders())
+              .filter(p -> p.getName().equals("SunPKCS11" + cfgName))
+              .findAny();
+      return existingProvider
+          .map(provider -> new HardwareKeyStoreWrapper(validKeystorePassword, provider, crlPath))
+          .orElseGet(() -> new HardwareKeyStoreWrapper(validKeystorePassword, path, crlPath));
+    } catch (final Exception e) {
+      if (OS.MAC.isCurrentOs()) {
+        // nss3 is difficult to setup on mac correctly, don't let it break unit tests for dev
+        // machines.
+        Assume.assumeNoException("Failed to initialize hardware keystore", e);
+      }
+      // Not a mac, probably a production build. Full failure.
+      throw new PkiException("Failed to initialize hardware keystore", e);
+    }
+  }
+
+  @Before
+  public void beforeMethod() {
+    Assume.assumeTrue(
+        "Test ignored due to NSS library not being installed/detected.",
+        CryptoTestUtil.isNSSLibInstalled());
+  }
+
+  @Test
+  public void getPkcs11Provider() throws Exception {
+    final HardwareKeyStoreWrapper sut =
+        (HardwareKeyStoreWrapper) getHardwareKeyStoreWrapper(configName);
+    assertThatThrownBy(() -> sut.getPkcs11ProviderForConfig("no-library"))
+        .isInstanceOf(IllegalArgumentException.class);
+  }
+
+  @Test
+  public void init_keystorePassword_config() throws Exception {
+    new HardwareKeyStoreWrapper(validKeystorePassword, toPath(config), toPath(crl));
+  }
+
+  @Test
+  public void init_keystorePassword_config_invalid() throws Exception {
+    final String config = "invalid";
+    assertThatThrownBy(
+            () -> new HardwareKeyStoreWrapper(validKeystorePassword, toPath(config), toPath(crl)))
+        .isInstanceOf(NullPointerException.class);
+  }
+
+  @Test
+  public void init_keystorePassword_config_missing_pw() throws Exception {
+    assertThatThrownBy(() -> new HardwareKeyStoreWrapper(null, toPath(config), toPath(crl)))
+        .isInstanceOf(PkiException.class);
+  }
+
+  @Test
+  public void init_keystorePassword_provider_missing_pw() throws Exception {
+    final Provider p = null;
+    assertThatThrownBy(() -> new HardwareKeyStoreWrapper(validKeystorePassword, p, toPath(crl)))
+        .isInstanceOf(PkiException.class);
+  }
+}
diff --git a/pki/src/test/java/org/hyperledger/besu/pki/keystore/HardwareKeyStoreWrapperTest.java b/pki/src/test/java/org/hyperledger/besu/pki/keystore/HardwareKeyStoreWrapperTest.java
new file mode 100644
index 00000000000..bbbe68f8232
--- /dev/null
+++ b/pki/src/test/java/org/hyperledger/besu/pki/keystore/HardwareKeyStoreWrapperTest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.pki.keystore;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+import java.security.KeyStore;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.cert.Certificate;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class HardwareKeyStoreWrapperTest {
+
+  private static final String KEY_ALIAS = "keyalias";
+  private static final String CERTIFICATE_ALIAS = "certalias";
+  private static final char[] PASSWORD = "password".toCharArray();
+
+  @Mock private KeyStore keyStore;
+  @Mock private PrivateKey privateKey;
+  @Mock private PublicKey publicKey;
+  @Mock private Certificate certificate;
+
+  private HardwareKeyStoreWrapper keyStoreWrapper;
+
+  @Before
+  public void before() {
+    keyStoreWrapper = new HardwareKeyStoreWrapper(null, keyStore, new String(PASSWORD));
+  }
+
+  @Test
+  public void getPrivateKey() throws Exception {
+    when(keyStore.getKey(KEY_ALIAS, PASSWORD)).thenReturn(privateKey);
+
+    assertThat(keyStoreWrapper.getPrivateKey(KEY_ALIAS)).isNotNull();
+  }
+
+  @Test
+  public void getPublicKey() throws Exception {
+    // Get public key from certificate
+    when(keyStore.getCertificate(KEY_ALIAS)).thenReturn(certificate);
+    when(certificate.getPublicKey()).thenReturn(publicKey);
+
+    assertThat(keyStoreWrapper.getPublicKey(KEY_ALIAS)).isNotNull();
+  }
+
+  @Test
+  public void getCertificate() throws Exception {
+    when(keyStore.getCertificate(CERTIFICATE_ALIAS)).thenReturn(certificate);
+
+    assertThat(keyStoreWrapper.getCertificate(CERTIFICATE_ALIAS)).isNotNull();
+  }
+
+  @Test
+  public void getCertificateChain() throws Exception {
+    when(keyStore.getCertificateChain(CERTIFICATE_ALIAS))
+        .thenReturn(new Certificate[] {certificate});
+
+    assertThat(keyStoreWrapper.getCertificateChain(CERTIFICATE_ALIAS)).hasSize(1);
+  }
+}
diff --git a/pki/src/test/java/org/hyperledger/besu/pki/keystore/SoftwareKeyStoreFileWrapperTest.java b/pki/src/test/java/org/hyperledger/besu/pki/keystore/SoftwareKeyStoreFileWrapperTest.java
new file mode 100644
index 00000000000..a194d8ec690
--- /dev/null
+++ b/pki/src/test/java/org/hyperledger/besu/pki/keystore/SoftwareKeyStoreFileWrapperTest.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.pki.keystore;
+
+import org.hyperledger.besu.pki.PkiException;
+
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.runners.Parameterized;
+
+public class SoftwareKeyStoreFileWrapperTest extends BaseKeyStoreFileWrapperTest {
+
+  private static final String p12KeyStore = "/keystore/partner1client1/keys.p12";
+  private static final String jksKeyStore = "/keystore/partner1client1/keystore.jks";
+  private static final String trustStore = "/keystore/partner1client1/truststore.jks";
+  private static final String crl = "/keystore/partner1client1/crl.pem";
+  private static final String validKeystorePassword = "test123";
+
+  @Parameterized.Parameters(name = "{index}: {0}")
+  public static Collection<Object[]> data() {
+    return Arrays.asList(
+        new Object[][] {
+          {
+            "SoftwareKeyStoreWrapper[PKCS12 keystore only]",
+            false,
+            getPKCS12SoftwareKeyStoreWrapper()
+          },
+          {
+            "SoftwareKeyStoreWrapper[JKS keystore only]",
+            false,
+            getJKSSoftwareKeyStoreWrapper(false)
+          },
+          {
+            "SoftwareKeyStoreWrapper[JKS keystore/truststore]",
+            true,
+            getJKSSoftwareKeyStoreWrapper(true)
+          }
+        });
+  }
+
+  private static KeyStoreWrapper getPKCS12SoftwareKeyStoreWrapper() {
+    try {
+      return new SoftwareKeyStoreWrapper(
+          KeyStoreWrapper.KEYSTORE_TYPE_PKCS12,
+          toPath(p12KeyStore),
+          validKeystorePassword,
+          toPath(crl));
+    } catch (final Exception e) {
+      throw new PkiException("Failed to initialize software keystore", e);
+    }
+  }
+
+  private static KeyStoreWrapper getJKSSoftwareKeyStoreWrapper(final boolean setupTruststore) {
+    try {
+      final Path keystoreLocation = toPath(jksKeyStore);
+      if (setupTruststore) {
+        final Path truststoreLocation = toPath(trustStore);
+        // password shouldn't be needed for retrieving certificate from truststore
+        return new SoftwareKeyStoreWrapper(
+            KeyStoreWrapper.KEYSTORE_TYPE_JKS,
+            keystoreLocation,
+            validKeystorePassword,
+            KeyStoreWrapper.KEYSTORE_TYPE_JKS,
+            truststoreLocation,
+            null,
+            toPath(crl));
+      }
+      return new SoftwareKeyStoreWrapper(
+          KeyStoreWrapper.KEYSTORE_TYPE_JKS, keystoreLocation, validKeystorePassword, toPath(crl));
+    } catch (final Exception e) {
+      throw new PkiException("Failed to initialize software keystore", e);
+    }
+  }
+}
diff --git a/pki/src/test/java/org/hyperledger/besu/pki/keystore/SoftwareKeyStoreWrapperTest.java b/pki/src/test/java/org/hyperledger/besu/pki/keystore/SoftwareKeyStoreWrapperTest.java
new file mode 100644
index 00000000000..e198084ac44
--- /dev/null
+++ b/pki/src/test/java/org/hyperledger/besu/pki/keystore/SoftwareKeyStoreWrapperTest.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.pki.keystore;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.pki.keystore.KeyStoreWrapper.KEYSTORE_TYPE_PKCS12;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.nio.file.Path;
+import java.security.KeyStore;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.cert.Certificate;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class SoftwareKeyStoreWrapperTest {
+
+  private static final String KEY_ALIAS = "keyalias";
+  private static final String CERTIFICATE_ALIAS = "certalias";
+  private static final char[] PASSWORD = "password".toCharArray();
+
+  private SoftwareKeyStoreWrapper keyStoreWrapper;
+
+  @Mock private KeyStore keyStore;
+  @Mock private KeyStore trustStore;
+  @Mock private PrivateKey privateKey;
+  @Mock private PublicKey publicKey;
+  @Mock private Certificate certificate;
+
+  @Before
+  public void before() {
+    keyStoreWrapper = new SoftwareKeyStoreWrapper(keyStore, new String(PASSWORD), null, "");
+  }
+
+  @Test
+  public void getPrivateKey() throws Exception {
+    when(keyStore.containsAlias(KEY_ALIAS)).thenReturn(true);
+    when(keyStore.getKey(KEY_ALIAS, PASSWORD)).thenReturn(privateKey);
+
+    assertThat(keyStoreWrapper.getPrivateKey(KEY_ALIAS)).isNotNull();
+  }
+
+  @Test
+  public void getPrivateKeyCaching() throws Exception {
+    when(keyStore.containsAlias(KEY_ALIAS)).thenReturn(true);
+    when(keyStore.getKey(KEY_ALIAS, PASSWORD)).thenReturn(privateKey);
+
+    keyStoreWrapper.getPrivateKey(KEY_ALIAS);
+    keyStoreWrapper.getPrivateKey(KEY_ALIAS);
+
+    verify(keyStore, times(1)).getKey(eq(KEY_ALIAS), eq(PASSWORD));
+  }
+
+  @Test
+  public void getPrivateKeyFallbackToTrustStore() throws Exception {
+    keyStoreWrapper =
+        new SoftwareKeyStoreWrapper(
+            keyStore, new String(PASSWORD), trustStore, new String(PASSWORD));
+
+    when(keyStore.containsAlias(KEY_ALIAS)).thenReturn(false);
+    when(trustStore.containsAlias(KEY_ALIAS)).thenReturn(true);
+    when(trustStore.getKey(KEY_ALIAS, PASSWORD)).thenReturn(privateKey);
+
+    assertThat(keyStoreWrapper.getPrivateKey(KEY_ALIAS)).isNotNull();
+
+    verify(trustStore).getKey(eq(KEY_ALIAS), eq(PASSWORD));
+  }
+
+  @Test
+  public void getPublicKey() throws Exception {
+    when(keyStore.containsAlias(KEY_ALIAS)).thenReturn(true);
+    when(keyStore.getKey(KEY_ALIAS, PASSWORD)).thenReturn(publicKey);
+
+    assertThat(keyStoreWrapper.getPublicKey(KEY_ALIAS)).isNotNull();
+  }
+
+  @Test
+  public void getPublicKeyCaching() throws Exception {
+    when(keyStore.containsAlias(KEY_ALIAS)).thenReturn(true);
+    when(keyStore.getKey(KEY_ALIAS, PASSWORD)).thenReturn(publicKey);
+
+    keyStoreWrapper.getPublicKey(KEY_ALIAS);
+    keyStoreWrapper.getPublicKey(KEY_ALIAS);
+
+    verify(keyStore, times(1)).getKey(eq(KEY_ALIAS), eq(PASSWORD));
+  }
+
+  @Test
+  public void getPublicKeyFallbackToTrustStore() throws Exception {
+    keyStoreWrapper =
+        new SoftwareKeyStoreWrapper(
+            keyStore, new String(PASSWORD), trustStore, new String(PASSWORD));
+
+    when(keyStore.containsAlias(KEY_ALIAS)).thenReturn(false);
+    when(trustStore.containsAlias(KEY_ALIAS)).thenReturn(true);
+    when(trustStore.getKey(KEY_ALIAS, PASSWORD)).thenReturn(publicKey);
+
+    assertThat(keyStoreWrapper.getPublicKey(KEY_ALIAS)).isNotNull();
+
+    verify(trustStore).getKey(eq(KEY_ALIAS), eq(PASSWORD));
+  }
+
+  @Test
+  public void getCertificate() throws Exception {
+    when(keyStore.getCertificate(CERTIFICATE_ALIAS)).thenReturn(certificate);
+
+    assertThat(keyStoreWrapper.getCertificate(CERTIFICATE_ALIAS)).isNotNull();
+  }
+
+  @Test
+  public void getCertificateCaching() throws Exception {
+    when(keyStore.getCertificate(CERTIFICATE_ALIAS)).thenReturn(certificate);
+
+    keyStoreWrapper.getCertificate(CERTIFICATE_ALIAS);
+    keyStoreWrapper.getCertificate(CERTIFICATE_ALIAS);
+
+    verify(keyStore, times(1)).getCertificate(eq(CERTIFICATE_ALIAS));
+  }
+
+  @Test
+  public void getCertificateFallbackToTrustStore() throws Exception {
+    keyStoreWrapper =
+        new SoftwareKeyStoreWrapper(
+            keyStore, new String(PASSWORD), trustStore, new String(PASSWORD));
+
+    when(keyStore.getCertificate(CERTIFICATE_ALIAS)).thenReturn(null);
+    when(trustStore.getCertificate(CERTIFICATE_ALIAS)).thenReturn(certificate);
+
+    assertThat(keyStoreWrapper.getCertificate(CERTIFICATE_ALIAS)).isNotNull();
+
+    verify(trustStore).getCertificate(eq(CERTIFICATE_ALIAS));
+  }
+
+  @Test
+  public void getCertificateChain() throws Exception {
+    when(keyStore.getCertificateChain(CERTIFICATE_ALIAS))
+        .thenReturn(new Certificate[] {certificate});
+
+    assertThat(keyStoreWrapper.getCertificateChain(CERTIFICATE_ALIAS)).hasSize(1);
+  }
+
+  @Test
+  public void getCertificateChainFallbackToTrustStore() throws Exception {
+    keyStoreWrapper =
+        new SoftwareKeyStoreWrapper(
+            keyStore, new String(PASSWORD), trustStore, new String(PASSWORD));
+
+    when(keyStore.getCertificateChain(CERTIFICATE_ALIAS)).thenReturn(null);
+    when(trustStore.getCertificateChain(CERTIFICATE_ALIAS))
+        .thenReturn(new Certificate[] {certificate});
+
+    assertThat(keyStoreWrapper.getCertificateChain(CERTIFICATE_ALIAS)).hasSize(1);
+
+    verify(trustStore).getCertificateChain(eq(CERTIFICATE_ALIAS));
+  }
+
+  @Test
+  public void loadKeyStoreFromFile() {
+    SoftwareKeyStoreWrapper loadedKeyStore =
+        new SoftwareKeyStoreWrapper(
+            KEYSTORE_TYPE_PKCS12,
+            Path.of("src/test/resources/keystore/keystore"),
+            "validator",
+            KEYSTORE_TYPE_PKCS12,
+            Path.of("src/test/resources/keystore/keystore"),
+            "validator",
+            null);
+
+    assertThat(loadedKeyStore.getPublicKey("validator")).isNotNull();
+    assertThat(loadedKeyStore.getPrivateKey("validator")).isNotNull();
+    assertThat(loadedKeyStore.getCertificate("validator")).isNotNull();
+    // CA -> INTERCA -> PARTNERACA -> VALIDATOR
+    assertThat(loadedKeyStore.getCertificateChain("validator")).hasSize(4);
+  }
+}
diff --git a/pki/src/test/java/org/hyperledger/besu/pki/util/TestCertificateUtils.java b/pki/src/test/java/org/hyperledger/besu/pki/util/TestCertificateUtils.java
new file mode 100644
index 00000000000..190e90213c9
--- /dev/null
+++ b/pki/src/test/java/org/hyperledger/besu/pki/util/TestCertificateUtils.java
@@ -0,0 +1,218 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.pki.util;
+
+import org.hyperledger.besu.pki.cms.CmsCreator;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.Security;
+import java.security.cert.CRLException;
+import java.security.cert.CRLReason;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.X509CRL;
+import java.security.cert.X509Certificate;
+import java.security.spec.ECGenParameterSpec;
+import java.sql.Date;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.Collection;
+import java.util.Random;
+
+import org.bouncycastle.asn1.x500.X500Name;
+import org.bouncycastle.asn1.x509.BasicConstraints;
+import org.bouncycastle.asn1.x509.Extension;
+import org.bouncycastle.cert.X509CRLHolder;
+import org.bouncycastle.cert.X509CertificateHolder;
+import org.bouncycastle.cert.X509v2CRLBuilder;
+import org.bouncycastle.cert.X509v3CertificateBuilder;
+import org.bouncycastle.cert.jcajce.JcaX509CRLConverter;
+import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
+import org.bouncycastle.cert.jcajce.JcaX509ExtensionUtils;
+import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
+import org.bouncycastle.jce.X509KeyUsage;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.operator.ContentSigner;
+import org.bouncycastle.operator.OperatorCreationException;
+import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
+
+/*
+ This class provides utility method for creating certificates used on tests.
+
+ Based on https://stackoverflow.com/a/18648284/5021783
+*/
+public class TestCertificateUtils {
+
+  static {
+    if (Security.getProvider(BouncyCastleProvider.PROVIDER_NAME) == null) {
+      Security.addProvider(new BouncyCastleProvider());
+    }
+  }
+
+  public enum Algorithm {
+    RSA,
+    EC
+  }
+
+  public static KeyPair createKeyPair(final Algorithm algorithm) {
+    try {
+      @SuppressWarnings("InsecureCryptoUsage")
+      final KeyPairGenerator kpg = KeyPairGenerator.getInstance(algorithm.name());
+      if (algorithm == Algorithm.EC) {
+        kpg.initialize(new ECGenParameterSpec("secp256r1"));
+      }
+      return kpg.generateKeyPair();
+    } catch (NoSuchAlgorithmException e) {
+      throw new RuntimeException("Error creating KeyPair", e);
+    } catch (InvalidAlgorithmParameterException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public static X509Certificate createSelfSignedCertificate(
+      final String name, final Instant notBefore, final Instant notAfter, final KeyPair keyPair) {
+    try {
+      final String signatureAlgorithm =
+          CmsCreator.getPreferredSignatureAlgorithm(keyPair.getPublic());
+      final ContentSigner signer =
+          new JcaContentSignerBuilder(signatureAlgorithm).build(keyPair.getPrivate());
+
+      final X509v3CertificateBuilder certificateBuilder =
+          new JcaX509v3CertificateBuilder(
+                  new X500Name("CN=" + name),
+                  new BigInteger(32, new Random()),
+                  Date.from(notBefore),
+                  Date.from(notAfter),
+                  new X500Name("CN=" + name),
+                  keyPair.getPublic())
+              .addExtension(
+                  Extension.authorityKeyIdentifier,
+                  false,
+                  new JcaX509ExtensionUtils().createAuthorityKeyIdentifier(keyPair.getPublic()))
+              .addExtension(
+                  Extension.subjectKeyIdentifier,
+                  false,
+                  new JcaX509ExtensionUtils().createSubjectKeyIdentifier(keyPair.getPublic()))
+              .addExtension(
+                  Extension.basicConstraints,
+                  false,
+                  new BasicConstraints(true)) // true if it is allowed to sign other certs
+              .addExtension(
+                  Extension.keyUsage,
+                  true,
+                  new X509KeyUsage(X509KeyUsage.keyCertSign | X509KeyUsage.cRLSign));
+
+      final X509CertificateHolder certHolder = certificateBuilder.build(signer);
+
+      return new JcaX509CertificateConverter()
+          .setProvider(BouncyCastleProvider.PROVIDER_NAME)
+          .getCertificate(certHolder);
+
+    } catch (final Exception e) {
+      throw new RuntimeException("Error creating CA certificate", e);
+    }
+  }
+
+  public static X509Certificate issueCertificate(
+      final X509Certificate issuer,
+      final KeyPair issuerKeyPair,
+      final String subject,
+      final Instant notBefore,
+      final Instant notAfter,
+      final KeyPair keyPair,
+      final boolean isCa) {
+
+    try {
+      final String signatureAlgorithm =
+          CmsCreator.getPreferredSignatureAlgorithm(keyPair.getPublic());
+      final ContentSigner signer =
+          new JcaContentSignerBuilder(signatureAlgorithm).build(issuerKeyPair.getPrivate());
+
+      final X509v3CertificateBuilder certificateBuilder =
+          new JcaX509v3CertificateBuilder(
+                  issuer,
+                  new BigInteger(32, new Random()),
+                  Date.from(notBefore),
+                  Date.from(notAfter),
+                  new X500Name("CN=" + subject),
+                  keyPair.getPublic())
+              .addExtension(
+                  Extension.authorityKeyIdentifier,
+                  false,
+                  new JcaX509ExtensionUtils()
+                      .createAuthorityKeyIdentifier(issuerKeyPair.getPublic()))
+              .addExtension(
+                  Extension.basicConstraints,
+                  false,
+                  new BasicConstraints(isCa)) // true if it is allowed to sign other certs
+              .addExtension(
+                  Extension.keyUsage,
+                  true,
+                  new X509KeyUsage(
+                      X509KeyUsage.digitalSignature
+                          | X509KeyUsage.nonRepudiation
+                          | X509KeyUsage.keyEncipherment
+                          | X509KeyUsage.dataEncipherment
+                          | X509KeyUsage.cRLSign
+                          | X509KeyUsage.keyCertSign));
+
+      final X509CertificateHolder certHolder = certificateBuilder.build(signer);
+
+      return new JcaX509CertificateConverter()
+          .setProvider(BouncyCastleProvider.PROVIDER_NAME)
+          .getCertificate(certHolder);
+    } catch (final Exception e) {
+      throw new RuntimeException("Error creating certificate", e);
+    }
+  }
+
+  public static X509CRL createCRL(
+      final X509Certificate issuer,
+      final KeyPair issuerKeyPair,
+      final Collection<X509Certificate> revokedCertificates) {
+    try {
+      final X509CertificateHolder x509CertificateHolder =
+          new X509CertificateHolder(issuer.getEncoded());
+
+      final X509v2CRLBuilder crlBuilder =
+          new X509v2CRLBuilder(x509CertificateHolder.getSubject(), Date.from(Instant.now()));
+
+      revokedCertificates.forEach(
+          c ->
+              crlBuilder.addCRLEntry(
+                  c.getSerialNumber(), Date.from(Instant.now()), CRLReason.UNSPECIFIED.ordinal()));
+
+      crlBuilder.setNextUpdate(Date.from(Instant.now().plus(1, ChronoUnit.DAYS)));
+      final String signatureAlgorithm =
+          CmsCreator.getPreferredSignatureAlgorithm(issuerKeyPair.getPublic());
+      final ContentSigner signer =
+          new JcaContentSignerBuilder(signatureAlgorithm).build(issuerKeyPair.getPrivate());
+      final X509CRLHolder crlHolder = crlBuilder.build(signer);
+      return new JcaX509CRLConverter()
+          .setProvider(BouncyCastleProvider.PROVIDER_NAME)
+          .getCRL(crlHolder);
+    } catch (OperatorCreationException
+        | CRLException
+        | CertificateEncodingException
+        | IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}
diff --git a/pki/src/test/resources/keystore/invalidpartner1client1/crl.pem b/pki/src/test/resources/keystore/invalidpartner1client1/crl.pem
new file mode 100644
index 00000000000..659388f6525
--- /dev/null
+++ b/pki/src/test/resources/keystore/invalidpartner1client1/crl.pem
@@ -0,0 +1,27 @@
+-----BEGIN X509 CRL-----
+MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNV
+BAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJBgNVBAoMAk1DMQ0wCwYDVQQLDARyb290
+MRMwEQYDVQQDDApwYXJ0bmVyMWNhMSYwJAYJKoZIhvcNAQkBFhdwYXJ0bmVyMWNh
+QHBhcnRuZXIxLmNvbRcNMjEwNjA3MTcwNjAwWhcNMjIwNjA3MTcwNjAwWjAnMCUC
+FGltgEkvXupxY562dERH8+uKOf89Fw0yMTA2MDcxNzA2MDBaoA4wDDAKBgNVHRQE
+AwIBADANBgkqhkiG9w0BAQsFAAOCAQEABF/7Kq+byYi/bRoftL8xqgSGcaLVuCOF
+BZVZXDKjyYfISwBqbvPSqtIvnFO1ewicgD7dNIZwWcQ9Kx7OOz4BA6Pe8YPtiBfp
+HZMabT8BS2eLePvViGumY7PTo3oIk3yXylOtzMDo59WQhCH/0vp5xjzJC+VFex/W
+p/an5ii1y3Q1FpEZNer6jpU0xJEJ2mCaGT/zuj6Mg1awWqmmYce3BahZeCNj8Wyx
+GIy8bGUjOdJyp99rAF9euCZ45pAjI12sg9lhPIVkp3Wnoy3La4Yj219Elc3MbJvF
+8GEFEmZ0Lm5Ze/EG5VyLB+wRpggeSJTc20i/eGWdaWg8AEukCgMdCg==
+-----END X509 CRL-----
+-----BEGIN X509 CRL-----
+MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD
+VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v
+dDETMBEGA1UEAwwKcGFydG5lcjJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcjJj
+YUBwYXJ0bmVyMi5jb20XDTIxMDYwNzE3MDYwMFoXDTIyMDYwNzE3MDYwMFowTjAl
+AhRpbYBJL17qcWOetnRER/Prijn/PRcNMjEwNjA3MTcwNjAwWjAlAhR+2Aa1zeVQ
+jbXFGnXFu53h4vZEahcNMjEwNjA3MTcwNjAwWqAOMAwwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAFXQOMk+6FDP8bm9TGK079IHojhooipo+9x3I1y/kUhH
+XY7xuyTXOvzv14//xenDuryIjSAC8pyqbls+DcUXkmGZ/nIWugtMykGLNgqqo/Oe
+pfoUSXRJP7CtvfHa4ejfr3q1t5MXfM3nqBQumu65slWjDFtE6mZF4ANcsIlsNQ10
+GTkDIdDHgUWxmZlBzTkoofvYspixuUptpJfl5eei9SDA+T1uADKnjARkxVv8xeYi
+QwTp6jVYq6YKc9z0l1UMadnFQz8osk7QNypWnsrD0+iBB1if8ikJwy+8BWayTkgQ
+tWLFT4n/c1m/wYzSclvZUUOxkkkE4Q9fZ3ReCADC+bQ=
+-----END X509 CRL-----
diff --git a/pki/src/test/resources/keystore/invalidpartner1client1/keys.p12 b/pki/src/test/resources/keystore/invalidpartner1client1/keys.p12
new file mode 100644
index 00000000000..54531db7bbc
Binary files /dev/null and b/pki/src/test/resources/keystore/invalidpartner1client1/keys.p12 differ
diff --git a/pki/src/test/resources/keystore/invalidpartner1client1/keystore.jks b/pki/src/test/resources/keystore/invalidpartner1client1/keystore.jks
new file mode 100644
index 00000000000..cb767da47c6
Binary files /dev/null and b/pki/src/test/resources/keystore/invalidpartner1client1/keystore.jks differ
diff --git a/pki/src/test/resources/keystore/invalidpartner1client1/nss.cfg b/pki/src/test/resources/keystore/invalidpartner1client1/nss.cfg
new file mode 100644
index 00000000000..08aba6591b4
--- /dev/null
+++ b/pki/src/test/resources/keystore/invalidpartner1client1/nss.cfg
@@ -0,0 +1,6 @@
+
+name = NSScrypto-invalidpartner1client1
+nssSecmodDirectory = ./src/test/resources/keystore/invalidpartner1client1/nssdb
+nssDbMode = readOnly
+nssModule = keystore
+    
diff --git a/pki/src/test/resources/keystore/invalidpartner1client1/nssdb/cert8.db b/pki/src/test/resources/keystore/invalidpartner1client1/nssdb/cert8.db
new file mode 100644
index 00000000000..b4acd9ef596
Binary files /dev/null and b/pki/src/test/resources/keystore/invalidpartner1client1/nssdb/cert8.db differ
diff --git a/pki/src/test/resources/keystore/invalidpartner1client1/nssdb/key3.db b/pki/src/test/resources/keystore/invalidpartner1client1/nssdb/key3.db
new file mode 100644
index 00000000000..6ee017228cf
Binary files /dev/null and b/pki/src/test/resources/keystore/invalidpartner1client1/nssdb/key3.db differ
diff --git a/pki/src/test/resources/keystore/invalidpartner1client1/nssdb/secmod.db b/pki/src/test/resources/keystore/invalidpartner1client1/nssdb/secmod.db
new file mode 100644
index 00000000000..60fc82d1e02
Binary files /dev/null and b/pki/src/test/resources/keystore/invalidpartner1client1/nssdb/secmod.db differ
diff --git a/pki/src/test/resources/keystore/invalidpartner1client1/nsspin.txt b/pki/src/test/resources/keystore/invalidpartner1client1/nsspin.txt
new file mode 100644
index 00000000000..5271a526801
--- /dev/null
+++ b/pki/src/test/resources/keystore/invalidpartner1client1/nsspin.txt
@@ -0,0 +1 @@
+test123
diff --git a/pki/src/test/resources/keystore/invalidpartner1client1/ssl-ca.pem b/pki/src/test/resources/keystore/invalidpartner1client1/ssl-ca.pem
new file mode 100644
index 00000000000..c496eebb661
--- /dev/null
+++ b/pki/src/test/resources/keystore/invalidpartner1client1/ssl-ca.pem
@@ -0,0 +1,72 @@
+-----BEGIN CERTIFICATE-----
+MIIEFDCCAvygAwIBAgIUaZCzBtI9osbhHtrNGSQLldSCSHkwDQYJKoZIhvcNAQEL
+BQAwgYYxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw
+CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEXMBUGA1UEAwwOaW52YWxpZGludGVy
+Y2ExJzAlBgkqhkiG9w0BCQEWGGludmFsaWRpbnRlcmNhQGFkbWluLmNvbTAgFw0y
+MTA2MDcxNzA1NTJaGA8yMTIxMDUxNDE3MDU1MlowgZYxCzAJBgNVBAYTAlVTMQsw
+CQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwE
+cm9vdDEaMBgGA1UEAwwRaW52YWxpZHBhcnRuZXIxY2ExNDAyBgkqhkiG9w0BCQEW
+JWludmFsaWRwYXJ0bmVyMWNhQGludmFsaWRwYXJ0bmVyMS5jb20wggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEMKBBPhzkvg+icZoRsN8CW2tlB4RZXo3C
+apaQu2oJdEIqyKMRx86Uk7mRsW4rNWSbOjQwfCVsvhkUdriqBD+DfkzE03KKmhmL
+hs2aC+ICb31aGyEvfWYFmKckY4zO8ptObaddWUZt27aie5vOzutB9n+oBmZMezd1
+xc4dwOO+MzC92Ay3DIxw52SzGiywPGn3gfNWZ5NGvWM1poV4SwTi/eJXF/lwU9aY
+Hl/+XOQ5/PJrIiQKGbBaywoOwYUU3FReosgCFVwDadnsj4ma++TKi/U7GQTcA01B
+1F42sZx1vmLJC68jAyDJylAEtUZxiGs8LQ/S8B1zXBvdfiYW7RQfAgMBAAGjZjBk
+MB0GA1UdDgQWBBQswNKqcoGkBJOL6/iCkqmNYsyypzAfBgNVHSMEGDAWgBRZVeo2
+o+J44Ie43gS6L4tG3S0CaTASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQE
+AwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAUu60om2Fcx7h5C+bVmmBUhMDbnkWO9pa
+lmEhmeuRrrmvSj/Ny6vmAmy9XOpox2PWMO5AndCIChLX697M4HskxIXCYhZzhjHE
+x85WtmRjZAxdBA7vhgA6KIz58BJ6PmmJ3nYwc9dpyMthuMH74FcjfgsBL/1UalLI
+26WtNMqEr+qK/drrlKpGHb1TjB3eWC1OPAwusgkw4uQBzKGHUZKxsVlaQ8jNkLdq
+t31kMk770wXPh57N1tMn+gF21kACbkk0L4os+5AknYXWUS1A546I1TiEKmbKktPa
+SdZIUT2AdIpZl4XMR5DZXBhMw8i/XyNfU6mW4b7TRt+QHU8l8ao47Q==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIECDCCAvCgAwIBAgIUK5+/p9u9ZYQuD9obuRHeJx0msBgwDQYJKoZIhvcNAQEL
+BQAwgYoxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw
+CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEcMBoGA1UEAwwTcm9vdGludmFsaWRj
+YS5hZG1pbjEmMCQGCSqGSIb3DQEJARYXcm9vdGludmFsaWRjYUBhZG1pbi5jb20w
+IBcNMjEwNjA3MTcwNTUyWhgPMjEyMTA1MTQxNzA1NTJaMIGGMQswCQYDVQQGEwJV
+UzELMAkGA1UECAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTALBgNV
+BAsMBHJvb3QxFzAVBgNVBAMMDmludmFsaWRpbnRlcmNhMScwJQYJKoZIhvcNAQkB
+FhhpbnZhbGlkaW50ZXJjYUBhZG1pbi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDNNU2p6MImjkrboq5MG7x422jISEYA9Zi/AMruUlQIXYwNUClc
+yhalIPaToNRDBZ1mxj1uhdS/bxbAGxfO7EDQAcTGzIMhlkC+i/zLTSXTsoHjmgrt
+5ZNQsc2Ok/a4aMpDUxZIx480Gm1GWEn5wrZpKJPdPnwwOg8tcjT4FCxI3CsMYQqb
+UOR3iJn9IRyqTc1M/LCt5rYsd3slXVMnEOU5iu4UHJaNzKLlfsnB2LsdVqGqKA2e
+nc6xdui+iJh81dqX/0RVUmyz4lDvhw8qfE58WAo4iIcpjBDcS8GPwt7WBF5KR120
+HWF3HErVOsra/eVPK3iZU5vvWuU+zQ8pAm5DAgMBAAGjZjBkMB0GA1UdDgQWBBRZ
+Veo2o+J44Ie43gS6L4tG3S0CaTAfBgNVHSMEGDAWgBS5ftf0c7cpwPnkG0MaBaV5
+jXxrdzASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG
+9w0BAQsFAAOCAQEAjnY1t9Pt8DxhExpqnLBLkhGeg+upWQutTsvW+JMowPw+rX3H
+m7mRKDkGl98Ol9m/6Iwx4kjgNz/bFx9flgJTYKvLE+yK/Jg4cizMjE4s9CzBA9ic
+R20L0MrRS3w8ae6IXXDZaaZvwmUqxYOCChr1mXslP59EXPPeTbQa2asTAz5sYAFV
+btPAjNa0T3KGcSbKyfZj3kAmNBFXrpyS0FcEQCt/u3USx1zGF1YuPGte0VBxtYw1
+S/6DAeff+3rA9FAXXoG4qu+ZKu2kYydyJJPborTtJ3A/ATJmcJL2KW6ADHRK7rn1
+NLj25w6mQoSRhoOLWHe+oWNF5nMO1SmMzfwlEQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID+TCCAuGgAwIBAgIUMcRYNxIDRzqdAgyjxeKuyrSVsscwDQYJKoZIhvcNAQEL
+BQAwgYoxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw
+CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEcMBoGA1UEAwwTcm9vdGludmFsaWRj
+YS5hZG1pbjEmMCQGCSqGSIb3DQEJARYXcm9vdGludmFsaWRjYUBhZG1pbi5jb20w
+IBcNMjEwNjA3MTcwNTUyWhgPMjEyMTA1MTQxNzA1NTJaMIGKMQswCQYDVQQGEwJV
+UzELMAkGA1UECAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTALBgNV
+BAsMBHJvb3QxHDAaBgNVBAMME3Jvb3RpbnZhbGlkY2EuYWRtaW4xJjAkBgkqhkiG
+9w0BCQEWF3Jvb3RpbnZhbGlkY2FAYWRtaW4uY29tMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAzmtt2EEdHNucUr8lZt8owINf9dSmCcpt663rnj833TO1
+mCdKdmZvQYzgvdfVCLqonj5CaHts4GCyh3PeHxU+zqjEWxPbZCSkITKOtn3AblTJ
+n4yFGpV6eIuGRFSL6TAaSPOyt59ZIFfSn5HDpVtET2/1hKRjjEnWhKy1pIG2J/mp
+BaXO7QJtJyTbYdXm2AXorQChbX8T5J965wl4k/xLGrHtRcvaDeZsy9TdtYLseC78
+bLFVwi7gAu3S9R6u9AuoVEn3rSZXaF+wSkH0GTX8rP049wQ9pQCS/zwjcQtcg+uT
+2gbgRtMo+se1FV1YFylx0xIUWCh91uX1EAPhmw0IBQIDAQABo1MwUTAdBgNVHQ4E
+FgQUuX7X9HO3KcD55BtDGgWleY18a3cwHwYDVR0jBBgwFoAUuX7X9HO3KcD55BtD
+GgWleY18a3cwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAj/rZ
+ga+ClC89q4a89U/OhX7hR8xOTPfpDLBGI8TpU2iXR57SZd4LvSNW1MTOJh/aTC/z
+wA+MvhP3RK03kzW2pE3aauglT0bwx+mZ24oaQFGR1GLPhgq5BMina6Fr9C3NJggf
+WtAoKNe+JoYUZkoLeBEnOcYEBZ1JYq7WBmctEY7sJgz456Coa0Ja+yXrPUPDbkKO
+oTCeIwt9Fusk9T8y78+Ugx9eQuQGbwKF7evwQg0ZsuOWPvn0Y1qG0obph95tPp0s
+HfNIDbTyjVga/gy3Et81E+AMrl7lKl5XZW0DZHSi41Y0KC5GhBBohrTIBoruIIkI
++hYCoquh8+xoYv32jg==
+-----END CERTIFICATE-----
diff --git a/pki/src/test/resources/keystore/invalidpartner1client1/ssl.pem b/pki/src/test/resources/keystore/invalidpartner1client1/ssl.pem
new file mode 100644
index 00000000000..c85a003aa99
--- /dev/null
+++ b/pki/src/test/resources/keystore/invalidpartner1client1/ssl.pem
@@ -0,0 +1,129 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCfr4vk1jKqglCu
+6yGwIkqNFY/khpYA4UzHMueQ3ChFNTuQo+NhKz6B4akmL7fAFvYyeXdAAceNsBJ+
+eTDDB/DdLUqMPwYI1DUvG/8aDds7j+bRTX1ozLKML96qdL+JfGMAuT8jz37L66iW
+DXYAS7dDHXOaNJ7HzUddngLMutjJ2NKi4jGhRHOeGxi22PLEL+yguZha3wyGMIks
+2Gqz2rMqkuqLqAyEPX8GHWmNVXy0e/ruhp6VRa4vNyzWiMjs5Z6LR1/JQVzjlT5R
+1MB1QYSp5u8tv6N+ySaH1kK/DiNi/TIAWnGGjaVkfW9iWANYodEuH/9yAzbFLT7e
+vt92CRHVAgMBAAECggEBAJUZS/23IkeitcMdOK9E1Wc2Isy1/YmE1DOKjDzt04wL
+UDqVS9GGly6ejVliZKeuyOIIGBhjkPfy1tHQRn9UAsoBaAHbNr83pRD/iwnAtlq+
+2j3DpL0do/jRGY7+w3iT87zROuss6q9sslSo7O0JxWudLDtntnnIakI3L1YJgDG2
+D92AVgwrDj+cePdns8CEOVjhW9qURxFz7dpC8AWS9mBmhcjCz2lAORjlpcR0TGEQ
++FN6KNVrsAi4ixURaetW1Jnj+N5v/rrmfDwGQq3rr5LL26rBao9ScteWJRUTlDqX
+AkexjIrFeDKvlH6+rvwAq17dbTVvPmUjrmNd70AxgAECgYEA0hesj1BpELmxqowY
+IIGKuIxVYAqBuZoU+rgiXPIjBvGX6iwvovUeGuDgeXPcb9bkmVvAfQM40JJyRVBm
+Ww5tVX0+omrSrksOxf/+1g11Dybpnv4ZSa2cE30qQMxiyStADJHD+EyTZoRg3BUc
+E7m77ml2/8EtrQ5lIG8aBDvrfdUCgYEAwpQtnshmzj9vQF2webxFCnUA5judEwpi
+T8bwlJlPAB0l0K70lFkju3W8H52qHIoy+FR6kyoC76q5G4s8gVx5sPilOf7Gph29
+w3IfSKsk3BC2xKl8saKZvMBmve02EtZVCf5JAoeD9KzfVOPculPljcKmEetI68qn
+PPaaozVtRAECgYEAqzkoJdT/C+aLadergjKRgD6/BfsKJt3w4zVWrDGbYnlbujow
+yLrEwlssF0/aBDw7KtGgW0JY94OjJeKUyPlFGjts5Kny8qGxdKViZ8mn8aVhGXc1
+3NplLW0BFrZ8fD+Hf7b85ExkhVS2LCf4LgtdorzJgz9JnpTwzjI+Hd1H29ECgYEA
+p3UDNg3efE4XntuCz6H6AR/lID/Z1NMw/NuHnTu7w6tSKiEIGMwGdoTC3KrCBkHh
+z9pUi2aylDTnjg7siaBekrHK8PiVWc1qzVPgHJg95q7zvJjo2a/Ig6tKQNZvnRKc
+qTcQ+n5KUD6fDd30zt75RmFory9A2LzV5R+OwjtuyAECgYBZrqUVGu61Rod3zFvz
+y/SAirOMEgNDNfxGKSyuUwllrX/9H9jmmcM198Sx/bGXPX80H6f8Ov0Od46MhpXR
+rnhHDQ6N/8OPzeZ5C7ri/ku1RS11Q7Z+a9kn5VS3gjFZpHCu2GIa6Tzn3Ag+czV1
+3QpC2/6ydTgrrDAhNBwcZ5xY/g==
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIFAzCCA+ugAwIBAgIUBxLi0l/lss+0yOGpKQjfW+GTHI4wDQYJKoZIhvcNAQEL
+BQAwgZYxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw
+CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEaMBgGA1UEAwwRaW52YWxpZHBhcnRu
+ZXIxY2ExNDAyBgkqhkiG9w0BCQEWJWludmFsaWRwYXJ0bmVyMWNhQGludmFsaWRw
+YXJ0bmVyMS5jb20wIBcNMjEwNjA3MTcwNTUyWhgPMjEyMTA1MTQxNzA1NTJaMIGg
+MQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UE
+CgwCTUMxDTALBgNVBAsMBHJvb3QxHzAdBgNVBAMMFmludmFsaWRwYXJ0bmVyMWNs
+aWVudDExOTA3BgkqhkiG9w0BCQEWKmludmFsaWRwYXJ0bmVyMWNsaWVudDFAaW52
+YWxpZHBhcnRuZXIxLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AJ+vi+TWMqqCUK7rIbAiSo0Vj+SGlgDhTMcy55DcKEU1O5Cj42ErPoHhqSYvt8AW
+9jJ5d0ABx42wEn55MMMH8N0tSow/BgjUNS8b/xoN2zuP5tFNfWjMsowv3qp0v4l8
+YwC5PyPPfsvrqJYNdgBLt0Mdc5o0nsfNR12eAsy62MnY0qLiMaFEc54bGLbY8sQv
+7KC5mFrfDIYwiSzYarPasyqS6ouoDIQ9fwYdaY1VfLR7+u6GnpVFri83LNaIyOzl
+notHX8lBXOOVPlHUwHVBhKnm7y2/o37JJofWQr8OI2L9MgBacYaNpWR9b2JYA1ih
+0S4f/3IDNsUtPt6+33YJEdUCAwEAAaOCATkwggE1MBEGCWCGSAGG+EIBAQQEAwIG
+wDAdBgNVHQ4EFgQUEUDbVrBFiwidyWrMY6rUqIi06bIwCQYDVR0TBAIwADAOBgNV
+HQ8BAf8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMIHGBgNV
+HSMEgb4wgbuAFCzA0qpygaQEk4vr+IKSqY1izLKnoYGMpIGJMIGGMQswCQYDVQQG
+EwJVUzELMAkGA1UECAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTAL
+BgNVBAsMBHJvb3QxFzAVBgNVBAMMDmludmFsaWRpbnRlcmNhMScwJQYJKoZIhvcN
+AQkBFhhpbnZhbGlkaW50ZXJjYUBhZG1pbi5jb22CFGmQswbSPaLG4R7azRkkC5XU
+gkh5MA0GCSqGSIb3DQEBCwUAA4IBAQB5fiodcOYjxuCLjI+1AAsQP+mApMO5DJn3
+tJh8ARt7TK1TzWBTaOQNe+MP4vUHKYu2pXDv07csgBM9F5WEXPbADTHOVd16h+5Q
+OVK8JsfXaq26mg/+zp6UiK2JVHE+MCyVOfDhbpbu2WPXdzeOiPuQsBwzsolPWoMI
+/dvIhKuHtUZ9wGSIurulCYPSqvUDOoHkFnIdsDMq3ISP5y6kCLCDDAqpwYb6PrfF
+R0lJvbORWZ67LcHAvJgdmN1u93FG3yTh9xCl4fhCfNtsbVsQpXaYyTKhdBLaS9in
+pyrOIxZJ9yiWk4iMv4/Ehm5BgR6CAJPHo3dvx46veSkVsztYQQDe
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEFDCCAvygAwIBAgIUaZCzBtI9osbhHtrNGSQLldSCSHkwDQYJKoZIhvcNAQEL
+BQAwgYYxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw
+CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEXMBUGA1UEAwwOaW52YWxpZGludGVy
+Y2ExJzAlBgkqhkiG9w0BCQEWGGludmFsaWRpbnRlcmNhQGFkbWluLmNvbTAgFw0y
+MTA2MDcxNzA1NTJaGA8yMTIxMDUxNDE3MDU1MlowgZYxCzAJBgNVBAYTAlVTMQsw
+CQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwE
+cm9vdDEaMBgGA1UEAwwRaW52YWxpZHBhcnRuZXIxY2ExNDAyBgkqhkiG9w0BCQEW
+JWludmFsaWRwYXJ0bmVyMWNhQGludmFsaWRwYXJ0bmVyMS5jb20wggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEMKBBPhzkvg+icZoRsN8CW2tlB4RZXo3C
+apaQu2oJdEIqyKMRx86Uk7mRsW4rNWSbOjQwfCVsvhkUdriqBD+DfkzE03KKmhmL
+hs2aC+ICb31aGyEvfWYFmKckY4zO8ptObaddWUZt27aie5vOzutB9n+oBmZMezd1
+xc4dwOO+MzC92Ay3DIxw52SzGiywPGn3gfNWZ5NGvWM1poV4SwTi/eJXF/lwU9aY
+Hl/+XOQ5/PJrIiQKGbBaywoOwYUU3FReosgCFVwDadnsj4ma++TKi/U7GQTcA01B
+1F42sZx1vmLJC68jAyDJylAEtUZxiGs8LQ/S8B1zXBvdfiYW7RQfAgMBAAGjZjBk
+MB0GA1UdDgQWBBQswNKqcoGkBJOL6/iCkqmNYsyypzAfBgNVHSMEGDAWgBRZVeo2
+o+J44Ie43gS6L4tG3S0CaTASBgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQE
+AwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAUu60om2Fcx7h5C+bVmmBUhMDbnkWO9pa
+lmEhmeuRrrmvSj/Ny6vmAmy9XOpox2PWMO5AndCIChLX697M4HskxIXCYhZzhjHE
+x85WtmRjZAxdBA7vhgA6KIz58BJ6PmmJ3nYwc9dpyMthuMH74FcjfgsBL/1UalLI
+26WtNMqEr+qK/drrlKpGHb1TjB3eWC1OPAwusgkw4uQBzKGHUZKxsVlaQ8jNkLdq
+t31kMk770wXPh57N1tMn+gF21kACbkk0L4os+5AknYXWUS1A546I1TiEKmbKktPa
+SdZIUT2AdIpZl4XMR5DZXBhMw8i/XyNfU6mW4b7TRt+QHU8l8ao47Q==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIECDCCAvCgAwIBAgIUK5+/p9u9ZYQuD9obuRHeJx0msBgwDQYJKoZIhvcNAQEL
+BQAwgYoxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw
+CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEcMBoGA1UEAwwTcm9vdGludmFsaWRj
+YS5hZG1pbjEmMCQGCSqGSIb3DQEJARYXcm9vdGludmFsaWRjYUBhZG1pbi5jb20w
+IBcNMjEwNjA3MTcwNTUyWhgPMjEyMTA1MTQxNzA1NTJaMIGGMQswCQYDVQQGEwJV
+UzELMAkGA1UECAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTALBgNV
+BAsMBHJvb3QxFzAVBgNVBAMMDmludmFsaWRpbnRlcmNhMScwJQYJKoZIhvcNAQkB
+FhhpbnZhbGlkaW50ZXJjYUBhZG1pbi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDNNU2p6MImjkrboq5MG7x422jISEYA9Zi/AMruUlQIXYwNUClc
+yhalIPaToNRDBZ1mxj1uhdS/bxbAGxfO7EDQAcTGzIMhlkC+i/zLTSXTsoHjmgrt
+5ZNQsc2Ok/a4aMpDUxZIx480Gm1GWEn5wrZpKJPdPnwwOg8tcjT4FCxI3CsMYQqb
+UOR3iJn9IRyqTc1M/LCt5rYsd3slXVMnEOU5iu4UHJaNzKLlfsnB2LsdVqGqKA2e
+nc6xdui+iJh81dqX/0RVUmyz4lDvhw8qfE58WAo4iIcpjBDcS8GPwt7WBF5KR120
+HWF3HErVOsra/eVPK3iZU5vvWuU+zQ8pAm5DAgMBAAGjZjBkMB0GA1UdDgQWBBRZ
+Veo2o+J44Ie43gS6L4tG3S0CaTAfBgNVHSMEGDAWgBS5ftf0c7cpwPnkG0MaBaV5
+jXxrdzASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG
+9w0BAQsFAAOCAQEAjnY1t9Pt8DxhExpqnLBLkhGeg+upWQutTsvW+JMowPw+rX3H
+m7mRKDkGl98Ol9m/6Iwx4kjgNz/bFx9flgJTYKvLE+yK/Jg4cizMjE4s9CzBA9ic
+R20L0MrRS3w8ae6IXXDZaaZvwmUqxYOCChr1mXslP59EXPPeTbQa2asTAz5sYAFV
+btPAjNa0T3KGcSbKyfZj3kAmNBFXrpyS0FcEQCt/u3USx1zGF1YuPGte0VBxtYw1
+S/6DAeff+3rA9FAXXoG4qu+ZKu2kYydyJJPborTtJ3A/ATJmcJL2KW6ADHRK7rn1
+NLj25w6mQoSRhoOLWHe+oWNF5nMO1SmMzfwlEQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID+TCCAuGgAwIBAgIUMcRYNxIDRzqdAgyjxeKuyrSVsscwDQYJKoZIhvcNAQEL
+BQAwgYoxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw
+CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEcMBoGA1UEAwwTcm9vdGludmFsaWRj
+YS5hZG1pbjEmMCQGCSqGSIb3DQEJARYXcm9vdGludmFsaWRjYUBhZG1pbi5jb20w
+IBcNMjEwNjA3MTcwNTUyWhgPMjEyMTA1MTQxNzA1NTJaMIGKMQswCQYDVQQGEwJV
+UzELMAkGA1UECAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTALBgNV
+BAsMBHJvb3QxHDAaBgNVBAMME3Jvb3RpbnZhbGlkY2EuYWRtaW4xJjAkBgkqhkiG
+9w0BCQEWF3Jvb3RpbnZhbGlkY2FAYWRtaW4uY29tMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAzmtt2EEdHNucUr8lZt8owINf9dSmCcpt663rnj833TO1
+mCdKdmZvQYzgvdfVCLqonj5CaHts4GCyh3PeHxU+zqjEWxPbZCSkITKOtn3AblTJ
+n4yFGpV6eIuGRFSL6TAaSPOyt59ZIFfSn5HDpVtET2/1hKRjjEnWhKy1pIG2J/mp
+BaXO7QJtJyTbYdXm2AXorQChbX8T5J965wl4k/xLGrHtRcvaDeZsy9TdtYLseC78
+bLFVwi7gAu3S9R6u9AuoVEn3rSZXaF+wSkH0GTX8rP049wQ9pQCS/zwjcQtcg+uT
+2gbgRtMo+se1FV1YFylx0xIUWCh91uX1EAPhmw0IBQIDAQABo1MwUTAdBgNVHQ4E
+FgQUuX7X9HO3KcD55BtDGgWleY18a3cwHwYDVR0jBBgwFoAUuX7X9HO3KcD55BtD
+GgWleY18a3cwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAj/rZ
+ga+ClC89q4a89U/OhX7hR8xOTPfpDLBGI8TpU2iXR57SZd4LvSNW1MTOJh/aTC/z
+wA+MvhP3RK03kzW2pE3aauglT0bwx+mZ24oaQFGR1GLPhgq5BMina6Fr9C3NJggf
+WtAoKNe+JoYUZkoLeBEnOcYEBZ1JYq7WBmctEY7sJgz456Coa0Ja+yXrPUPDbkKO
+oTCeIwt9Fusk9T8y78+Ugx9eQuQGbwKF7evwQg0ZsuOWPvn0Y1qG0obph95tPp0s
+HfNIDbTyjVga/gy3Et81E+AMrl7lKl5XZW0DZHSi41Y0KC5GhBBohrTIBoruIIkI
++hYCoquh8+xoYv32jg==
+-----END CERTIFICATE-----
diff --git a/pki/src/test/resources/keystore/invalidpartner1client1/truststore.jks b/pki/src/test/resources/keystore/invalidpartner1client1/truststore.jks
new file mode 100644
index 00000000000..fcc98c5e95e
Binary files /dev/null and b/pki/src/test/resources/keystore/invalidpartner1client1/truststore.jks differ
diff --git a/pki/src/test/resources/keystore/keystore b/pki/src/test/resources/keystore/keystore
new file mode 100644
index 00000000000..5ca6e77851f
Binary files /dev/null and b/pki/src/test/resources/keystore/keystore differ
diff --git a/pki/src/test/resources/keystore/partner1client1/crl.pem b/pki/src/test/resources/keystore/partner1client1/crl.pem
new file mode 100644
index 00000000000..659388f6525
--- /dev/null
+++ b/pki/src/test/resources/keystore/partner1client1/crl.pem
@@ -0,0 +1,27 @@
+-----BEGIN X509 CRL-----
+MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNV
+BAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJBgNVBAoMAk1DMQ0wCwYDVQQLDARyb290
+MRMwEQYDVQQDDApwYXJ0bmVyMWNhMSYwJAYJKoZIhvcNAQkBFhdwYXJ0bmVyMWNh
+QHBhcnRuZXIxLmNvbRcNMjEwNjA3MTcwNjAwWhcNMjIwNjA3MTcwNjAwWjAnMCUC
+FGltgEkvXupxY562dERH8+uKOf89Fw0yMTA2MDcxNzA2MDBaoA4wDDAKBgNVHRQE
+AwIBADANBgkqhkiG9w0BAQsFAAOCAQEABF/7Kq+byYi/bRoftL8xqgSGcaLVuCOF
+BZVZXDKjyYfISwBqbvPSqtIvnFO1ewicgD7dNIZwWcQ9Kx7OOz4BA6Pe8YPtiBfp
+HZMabT8BS2eLePvViGumY7PTo3oIk3yXylOtzMDo59WQhCH/0vp5xjzJC+VFex/W
+p/an5ii1y3Q1FpEZNer6jpU0xJEJ2mCaGT/zuj6Mg1awWqmmYce3BahZeCNj8Wyx
+GIy8bGUjOdJyp99rAF9euCZ45pAjI12sg9lhPIVkp3Wnoy3La4Yj219Elc3MbJvF
+8GEFEmZ0Lm5Ze/EG5VyLB+wRpggeSJTc20i/eGWdaWg8AEukCgMdCg==
+-----END X509 CRL-----
+-----BEGIN X509 CRL-----
+MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD
+VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v
+dDETMBEGA1UEAwwKcGFydG5lcjJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcjJj
+YUBwYXJ0bmVyMi5jb20XDTIxMDYwNzE3MDYwMFoXDTIyMDYwNzE3MDYwMFowTjAl
+AhRpbYBJL17qcWOetnRER/Prijn/PRcNMjEwNjA3MTcwNjAwWjAlAhR+2Aa1zeVQ
+jbXFGnXFu53h4vZEahcNMjEwNjA3MTcwNjAwWqAOMAwwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAFXQOMk+6FDP8bm9TGK079IHojhooipo+9x3I1y/kUhH
+XY7xuyTXOvzv14//xenDuryIjSAC8pyqbls+DcUXkmGZ/nIWugtMykGLNgqqo/Oe
+pfoUSXRJP7CtvfHa4ejfr3q1t5MXfM3nqBQumu65slWjDFtE6mZF4ANcsIlsNQ10
+GTkDIdDHgUWxmZlBzTkoofvYspixuUptpJfl5eei9SDA+T1uADKnjARkxVv8xeYi
+QwTp6jVYq6YKc9z0l1UMadnFQz8osk7QNypWnsrD0+iBB1if8ikJwy+8BWayTkgQ
+tWLFT4n/c1m/wYzSclvZUUOxkkkE4Q9fZ3ReCADC+bQ=
+-----END X509 CRL-----
diff --git a/pki/src/test/resources/keystore/partner1client1/keys.p12 b/pki/src/test/resources/keystore/partner1client1/keys.p12
new file mode 100644
index 00000000000..fb3d451add6
Binary files /dev/null and b/pki/src/test/resources/keystore/partner1client1/keys.p12 differ
diff --git a/pki/src/test/resources/keystore/partner1client1/keystore.jks b/pki/src/test/resources/keystore/partner1client1/keystore.jks
new file mode 100644
index 00000000000..a51a778eff9
Binary files /dev/null and b/pki/src/test/resources/keystore/partner1client1/keystore.jks differ
diff --git a/pki/src/test/resources/keystore/partner1client1/nss.cfg b/pki/src/test/resources/keystore/partner1client1/nss.cfg
new file mode 100644
index 00000000000..6cd0f7eb876
--- /dev/null
+++ b/pki/src/test/resources/keystore/partner1client1/nss.cfg
@@ -0,0 +1,6 @@
+
+name = NSScrypto-partner1client1
+nssSecmodDirectory = ./src/test/resources/keystore/partner1client1/nssdb
+nssDbMode = readOnly
+nssModule = keystore
+    
diff --git a/pki/src/test/resources/keystore/partner1client1/nssdb/cert8.db b/pki/src/test/resources/keystore/partner1client1/nssdb/cert8.db
new file mode 100644
index 00000000000..095bc36dd81
Binary files /dev/null and b/pki/src/test/resources/keystore/partner1client1/nssdb/cert8.db differ
diff --git a/pki/src/test/resources/keystore/partner1client1/nssdb/key3.db b/pki/src/test/resources/keystore/partner1client1/nssdb/key3.db
new file mode 100644
index 00000000000..cd4773dc310
Binary files /dev/null and b/pki/src/test/resources/keystore/partner1client1/nssdb/key3.db differ
diff --git a/pki/src/test/resources/keystore/partner1client1/nssdb/secmod.db b/pki/src/test/resources/keystore/partner1client1/nssdb/secmod.db
new file mode 100644
index 00000000000..0f6316142fb
Binary files /dev/null and b/pki/src/test/resources/keystore/partner1client1/nssdb/secmod.db differ
diff --git a/pki/src/test/resources/keystore/partner1client1/nsspin.txt b/pki/src/test/resources/keystore/partner1client1/nsspin.txt
new file mode 100644
index 00000000000..5271a526801
--- /dev/null
+++ b/pki/src/test/resources/keystore/partner1client1/nsspin.txt
@@ -0,0 +1 @@
+test123
diff --git a/pki/src/test/resources/keystore/partner1client1/ssl-ca.pem b/pki/src/test/resources/keystore/partner1client1/ssl-ca.pem
new file mode 100644
index 00000000000..4f1e5f5d880
--- /dev/null
+++ b/pki/src/test/resources/keystore/partner1client1/ssl-ca.pem
@@ -0,0 +1,70 @@
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIUNniG6StciHezbAqX+uNMciPW7jowDQYJKoZIhvcNAQEL
+BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
+KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA2MDcxNzA1NDdaGA8y
+MTIxMDUxNDE3MDU0N1owgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
+A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
+cGFydG5lcjFjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcjFjYUBwYXJ0bmVyMS5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDR8KbDV1MbtC1Siuo2
+pbOU6eMRaNyDdlhcz48FY+mKGsUEAePceFJTvh1w9gXwt/A26CO02BVdTPYowudf
+Qkl9v+qSRIKXgKz1fkNUW4xYKl7KsgABi/zpgY/bM3CarBcBan9VKWapgx680Aj2
+bv99ODNqZTH9Iwdq2IrHNBplLp2TmFao7oKz+LeMV6ZrdfY1THf1AuprD86Ccxfa
+9YAyuMI4t7BKqmIqMuDKSSykXuEDY/CCDWw8o/0rg6baoM4bKzipv/4oqaegM3MB
+8vt979rx4PGH69+/JSMt7wL3SQbkQtMNODZyGM/HW+TsPAFYfHPsURVRezFpOB7G
+OoTdAgMBAAGjZjBkMB0GA1UdDgQWBBSB8CJNxPXuu/mEDmD1+rPhI/qN5DAfBgNV
+HSMEGDAWgBT8BlnPk8BS8+JHlIEoCp3sO8jDDjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAKb5S3NTSxSJrI5Mk
+EKoULvy7vKh+W/o5wDKm8ILwJHn76HFyq3Nl0zYdoshROnLG8gL69rMWZgTg+Fsl
+teX8pNvLEQV7Asx5Yvn2oFBQqRevwGsg2z48et5SIq5pDYeThwUMbdrGuhkEkizW
+ecBUN8j7auRLSpx5ornl9zFx5bvsVb4Dy/rIMVnPiw3VniOAOplGIJOm/TiPxTR0
+qyzdHljsRbM0uyw81QkeskuJWCpmKTFZxfV1Jww3ScKApNY8WFW+iuarWBvRTq7l
+3AxXcE11ms92rnZw3vFvrIfM6WlE7Idb0rlRK69e73j40eBtJN5i6L7IPJ7Uht+N
+mLfQvw==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID6jCCAtKgAwIBAgIUTwPfI+2FxYq0V6uukemLf67qANowDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTcwNTQ3
+WhgPMjEyMTA1MTQxNzA1NDdaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
+AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxuUWq2F6MFQLeFVBB800pjiJv
+pqrpMb8lv5aEOX87slRRkIVe0M/6mSlNvJSSclGindIhsWxaYD4Kend+o+ODhMqT
+Jl7zvVTTluGg8SK22kyJ8DTWHnhnFhpoKVLc5qjgvglOf0h7S9F/tL5AkpGoBq7t
+PkbOJPxKR7bvn34Iux3HgS1uzwZqHSYBcNHuYB6PSgyQJiNLIrA/019YqqUI5R+W
+V/Nb/kkrnsUS+hU6ntAtewus0irO+4fJzBlpN+bvbEBdVHeVmIYhF6ILxtCGWX5l
+lOlDrYNXiff0ksKtEvyUV/NFOASixEBMQ88Un7NGHR8y1NW3fCGiVkOhvaprAgMB
+AAGjZjBkMB0GA1UdDgQWBBT8BlnPk8BS8+JHlIEoCp3sO8jDDjAfBgNVHSMEGDAW
+gBTj0UDC6u67VvpJ2NmXE7vz77nHHTASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAZYQg0VUOQ1DGoU0y0TsTzAZ4
+IEy5xavV7Nma9AJI0ZVFpqGEBjTXjxi7r/co1EREN3bi7QnZfJhU4SGVZ0T7wq+p
+/S3x16DEPEufa3JmP+brBPOOP/5EJX5+2BXMUWuDcY7MAokaAIAudjmVk32FoZgy
+54FkZ+YRillU++7k0ie8EEYE8pN2ABIqNCdHxGEhwEc0wVwB6bBONmcEssYmipUh
+DQH6+sfKBcd+sUMGG3qd79sE7BF9w8bAHhKcBm5eTdEks9jh6H1o0PgBvFP8fFzF
+q89KGuLw7T0n/Khkmrv5cifwmTpg42Ivorv8qk02aeiOAGiMyFFJ38BQtH64LQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2zCCAsOgAwIBAgIURc832yfuirkVrhWhC4O1uBfTZXAwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTcwNTQ3
+WhgPMjEyMTA1MTQxNzA1NDdaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
+AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzKd0JrZR3N0A3C7Gp7sT
+zLurt0pVjAIBh3N+5NsyY7eAHJWA7wRR+JpG4q6MxmYVWsk4MjsnWB0ViCCm+fTY
+a9tFms6lmsjM4fJgIs8/DP+zBEOien7sD3kfddmI4ClODynNv3ODbJKyhzKQEOZ8
+sdf61yWYuFzayEfNoon6BlqroPv9B0eAsgOFDndPo6vbqAFlrYAyVXx+7hmH7Hv6
+8RWDaSr0uI62uhvAQeK4a+p9aTSwLcHRh1/7NezW9rzI0/7yzP3w/RS7tevDuacU
+XMr3sH5xEUahGF72qYUVejUlP48fPLrdGK76QZk0M8K2EOyvuNq66P+UMialx+83
+NwIDAQABo1MwUTAdBgNVHQ4EFgQU49FAwuruu1b6SdjZlxO78++5xx0wHwYDVR0j
+BBgwFoAU49FAwuruu1b6SdjZlxO78++5xx0wDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEADfrsmYBaeV4/MTRVazsey/o0ZhBoLJ+3RFYC6+M2lYB1
+yT92tbAT3787aHTw/SdFvA11oT+lMDEmBWowzZ1bp/J7tqlqMcmwL4QyhZjp0gmK
+eqDXy2Jui/fOTRzWQ1ka7mR6OTWxxVoIjKVvJ/AysqGCTFMXZXrMthtCuQDG+b85
+B3ALz6/j0ZFqgKzftCIuY0UnBtDEuKkAa0QkDMHLvcMAw7V/etpQPypCXqmwnc2e
+vvL6cSvakEVE7rErhIeeL+1m2TBSWNrPVIvggLMv655meqkhGQn9uYyiGw6i/2V/
+ngBAs4gYDvk20Cyg0kxQONmzreAdFzArud+k7FofZw==
+-----END CERTIFICATE-----
diff --git a/pki/src/test/resources/keystore/partner1client1/ssl.pem b/pki/src/test/resources/keystore/partner1client1/ssl.pem
new file mode 100644
index 00000000000..f5e1186de19
--- /dev/null
+++ b/pki/src/test/resources/keystore/partner1client1/ssl.pem
@@ -0,0 +1,126 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC8YRSLAPea6rIG
+tgDxF+q4KVlm5zV5VWyvKf6KjECZC6fHekQkP1sFYhG6+wq+nDT8hf+Em8JYa/oV
+WMi4QDHZkzryJC2rEyukq1Pi9ELBhGfbLw356zP4zCK+/RtiR06B/UOPkQ8/Itz+
+fTbuU7LrgIA6AT8rDG5kTOuKBvcNWDx02QEeAguZVXSVOG1A6Un8NsL/pFi9tsUU
+qW9jgTA389wHunggAKa+KDPg5HXsqZfG/sioJv3iZw42zvmBaSaQJ+ZtQeVx2zu+
+OUMWhke5nmr+6ohLqG0R8GwKhW6AxlErKvFZXEKhLTobUAWOExL6ImtqgvYUc8wT
+gvN92pfPAgMBAAECggEBAJ0HN76fcccbOIdLlAFk9G3LWhDjTrnzsYNaOCp5uydY
+heVMUBz/Cvqzwx/gQBaf07NkZ5i81gYrC+5bcgXUzTkW95389mySsGC1yFl5T2RM
+4N3enYHkxA/y6kvWZMtJsXG+EmFMhC8W+qzQ58dG0fBpz3mKrINP+310eSs3nxzp
+MGnAHaawB8KVTIfqsFbVbT+DMShU8KkZSe8HAwEZF0vsD0Epq/IftH3H+gucH8Ny
+5O3/hfvU4CBn0RxJyH239YDyPaf+TeZfJwI361k5se/aDwicj2azFo60uObsV8FT
+DhYxPFB39LT0kKgeo14SrW6USyhv6PEZs/x6dTKyw8ECgYEA3drXVsEwOuVrg8DD
+H8/pfsKS6EXB9Enxs5jzeS2nWR6qjjEo9+Ks4dZTRstlkCe+WSMgeeX9snDCJodJ
+cG/5XDpg5GlrcapRz79zJ7SKcaiaH/EKs7pmcUR+3BanGYB2AWYjwil9yLTv7FB9
+o08Xx6dEbm/doQlOoTNrmZUcKH8CgYEA2V9JnkJmqVZAyYISRniESZNxHElVd98B
+jR546VeGS41faEyiXZd6vrjubbMkxylsNBxri774g04ki+T3fNSXNDBr1TcOf4do
+XoVhrVk03p2xTt/4tDV5XfefIam11POEVs/H9R5cUeF5aylOP5Wi3tNveSDeqhwW
+RSKfOHuRaLECgYAc46Bi5ak4IiPL9k/yVoqbPQ8QO/UzsGVO873Qq8c87adb+L7S
++Kt2hQg3EclZ6jL5PH/AH9jXYaOGjNtdTtdz0Q5I8AlTtdANc2q1YuccQc5AFo1E
+NiOc4ER8uF5uDbJQIFLLt8dvWVBcv2Z825HHJ9rbXqnHjIS2rRF34FjYVQKBgGUz
+p+K2p3VPYvpuRHPqyCw5KQAyZEha2y4IceKxjSS/vRuiEjXgwJTrJJaOQSE4d9gL
+I0b8slbvmrRG9bJ4h60Unh+2clmNgVoAX2mFjsfWQyalv/SmsMq+7qeNi8qJVaPV
+ORM1/2VfxFfP805HLHzxk4SheQlZ6kRlyhtR7HEBAoGAMPaMPm0PaPesN6dpwgKD
+HHm4BgniKafmikjkieuVQgtu/Rl/1Eq+haGHIDMQtRn9fD88y1lETEw4o2vXUDjI
+vBFkGE+Mf/Vjg6V1THAGd9XseLgAK2PCvfEDsCYAiyEEVY0hPfmgQwNZxxCt94fE
+fjI21dc+cX9CHXTHyzORnWE=
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIEyDCCA7CgAwIBAgIUaW2ASS9e6nFjnrZ0REfz64o5/zwwDQYJKoZIhvcNAQEL
+BQAwgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw
+CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwKcGFydG5lcjFjYTEm
+MCQGCSqGSIb3DQEJARYXcGFydG5lcjFjYUBwYXJ0bmVyMS5jb20wIBcNMjEwNjA3
+MTcwNTQ3WhgPMjEyMTA1MTQxNzA1NDdaMIGLMQswCQYDVQQGEwJVUzELMAkGA1UE
+CAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTALBgNVBAsMBHJvb3Qx
+GDAWBgNVBAMMD3BhcnRuZXIxY2xpZW50MTErMCkGCSqGSIb3DQEJARYccGFydG5l
+cjFjbGllbnQxQHBhcnRuZXIxLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALxhFIsA95rqsga2APEX6rgpWWbnNXlVbK8p/oqMQJkLp8d6RCQ/WwVi
+Ebr7Cr6cNPyF/4Sbwlhr+hVYyLhAMdmTOvIkLasTK6SrU+L0QsGEZ9svDfnrM/jM
+Ir79G2JHToH9Q4+RDz8i3P59Nu5TsuuAgDoBPysMbmRM64oG9w1YPHTZAR4CC5lV
+dJU4bUDpSfw2wv+kWL22xRSpb2OBMDfz3Ae6eCAApr4oM+Dkdeypl8b+yKgm/eJn
+DjbO+YFpJpAn5m1B5XHbO745QxaGR7meav7qiEuobRHwbAqFboDGUSsq8VlcQqEt
+OhtQBY4TEvoia2qC9hRzzBOC833al88CAwEAAaOCASgwggEkMBEGCWCGSAGG+EIB
+AQQEAwIGwDAdBgNVHQ4EFgQUteJ5GVlEpzaoonh4YXoc+1103lowCQYDVR0TBAIw
+ADAOBgNVHQ8BAf8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MIG1BgNVHSMEga0wgaqAFIHwIk3E9e67+YQOYPX6s+Ej+o3koXykejB4MQswCQYD
+VQQGEwJVUzELMAkGA1UECAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMx
+DTALBgNVBAsMBHJvb3QxEDAOBgNVBAMMB2ludGVyY2ExIDAeBgkqhkiG9w0BCQEW
+EWludGVyY2FAYWRtaW4uY29tghQ2eIbpK1yId7NsCpf640xyI9buOjANBgkqhkiG
+9w0BAQsFAAOCAQEABiqi7zOT55MIm5rbCGwe00LvAghbkfUitDEEotRjvF8E/fvA
+rwnbqgBDbetYtI+88ml3NhdU2B3qZA8Z/KXnjJA+vmNmpdRVYGnl8BdKjqTUl+QV
+d1vm0IbOID33gOKhaxba+Tbq7WYnzCMltqOzqtjgCUmJamacGR5sDYvz057vWEM/
+19Gw1agAAY+sb1Vx7BwM6A81iKP7rf1z0jKZTVMc8bW1IOZJxqDsMosnuSAyQwMK
+4Bwt6CEbWjknRZ/jTioM0C2HFpWXz51SyNwP583s60OVqf7/NYb1LC3lWrpWL7yf
+rsHBob8jsrkCRHbRHIjXjio3l29ObL5AfQm3Ig==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIUNniG6StciHezbAqX+uNMciPW7jowDQYJKoZIhvcNAQEL
+BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
+KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA2MDcxNzA1NDdaGA8y
+MTIxMDUxNDE3MDU0N1owgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
+A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
+cGFydG5lcjFjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcjFjYUBwYXJ0bmVyMS5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDR8KbDV1MbtC1Siuo2
+pbOU6eMRaNyDdlhcz48FY+mKGsUEAePceFJTvh1w9gXwt/A26CO02BVdTPYowudf
+Qkl9v+qSRIKXgKz1fkNUW4xYKl7KsgABi/zpgY/bM3CarBcBan9VKWapgx680Aj2
+bv99ODNqZTH9Iwdq2IrHNBplLp2TmFao7oKz+LeMV6ZrdfY1THf1AuprD86Ccxfa
+9YAyuMI4t7BKqmIqMuDKSSykXuEDY/CCDWw8o/0rg6baoM4bKzipv/4oqaegM3MB
+8vt979rx4PGH69+/JSMt7wL3SQbkQtMNODZyGM/HW+TsPAFYfHPsURVRezFpOB7G
+OoTdAgMBAAGjZjBkMB0GA1UdDgQWBBSB8CJNxPXuu/mEDmD1+rPhI/qN5DAfBgNV
+HSMEGDAWgBT8BlnPk8BS8+JHlIEoCp3sO8jDDjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAKb5S3NTSxSJrI5Mk
+EKoULvy7vKh+W/o5wDKm8ILwJHn76HFyq3Nl0zYdoshROnLG8gL69rMWZgTg+Fsl
+teX8pNvLEQV7Asx5Yvn2oFBQqRevwGsg2z48et5SIq5pDYeThwUMbdrGuhkEkizW
+ecBUN8j7auRLSpx5ornl9zFx5bvsVb4Dy/rIMVnPiw3VniOAOplGIJOm/TiPxTR0
+qyzdHljsRbM0uyw81QkeskuJWCpmKTFZxfV1Jww3ScKApNY8WFW+iuarWBvRTq7l
+3AxXcE11ms92rnZw3vFvrIfM6WlE7Idb0rlRK69e73j40eBtJN5i6L7IPJ7Uht+N
+mLfQvw==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID6jCCAtKgAwIBAgIUTwPfI+2FxYq0V6uukemLf67qANowDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTcwNTQ3
+WhgPMjEyMTA1MTQxNzA1NDdaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
+AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxuUWq2F6MFQLeFVBB800pjiJv
+pqrpMb8lv5aEOX87slRRkIVe0M/6mSlNvJSSclGindIhsWxaYD4Kend+o+ODhMqT
+Jl7zvVTTluGg8SK22kyJ8DTWHnhnFhpoKVLc5qjgvglOf0h7S9F/tL5AkpGoBq7t
+PkbOJPxKR7bvn34Iux3HgS1uzwZqHSYBcNHuYB6PSgyQJiNLIrA/019YqqUI5R+W
+V/Nb/kkrnsUS+hU6ntAtewus0irO+4fJzBlpN+bvbEBdVHeVmIYhF6ILxtCGWX5l
+lOlDrYNXiff0ksKtEvyUV/NFOASixEBMQ88Un7NGHR8y1NW3fCGiVkOhvaprAgMB
+AAGjZjBkMB0GA1UdDgQWBBT8BlnPk8BS8+JHlIEoCp3sO8jDDjAfBgNVHSMEGDAW
+gBTj0UDC6u67VvpJ2NmXE7vz77nHHTASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAZYQg0VUOQ1DGoU0y0TsTzAZ4
+IEy5xavV7Nma9AJI0ZVFpqGEBjTXjxi7r/co1EREN3bi7QnZfJhU4SGVZ0T7wq+p
+/S3x16DEPEufa3JmP+brBPOOP/5EJX5+2BXMUWuDcY7MAokaAIAudjmVk32FoZgy
+54FkZ+YRillU++7k0ie8EEYE8pN2ABIqNCdHxGEhwEc0wVwB6bBONmcEssYmipUh
+DQH6+sfKBcd+sUMGG3qd79sE7BF9w8bAHhKcBm5eTdEks9jh6H1o0PgBvFP8fFzF
+q89KGuLw7T0n/Khkmrv5cifwmTpg42Ivorv8qk02aeiOAGiMyFFJ38BQtH64LQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2zCCAsOgAwIBAgIURc832yfuirkVrhWhC4O1uBfTZXAwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTcwNTQ3
+WhgPMjEyMTA1MTQxNzA1NDdaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
+AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzKd0JrZR3N0A3C7Gp7sT
+zLurt0pVjAIBh3N+5NsyY7eAHJWA7wRR+JpG4q6MxmYVWsk4MjsnWB0ViCCm+fTY
+a9tFms6lmsjM4fJgIs8/DP+zBEOien7sD3kfddmI4ClODynNv3ODbJKyhzKQEOZ8
+sdf61yWYuFzayEfNoon6BlqroPv9B0eAsgOFDndPo6vbqAFlrYAyVXx+7hmH7Hv6
+8RWDaSr0uI62uhvAQeK4a+p9aTSwLcHRh1/7NezW9rzI0/7yzP3w/RS7tevDuacU
+XMr3sH5xEUahGF72qYUVejUlP48fPLrdGK76QZk0M8K2EOyvuNq66P+UMialx+83
+NwIDAQABo1MwUTAdBgNVHQ4EFgQU49FAwuruu1b6SdjZlxO78++5xx0wHwYDVR0j
+BBgwFoAU49FAwuruu1b6SdjZlxO78++5xx0wDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEADfrsmYBaeV4/MTRVazsey/o0ZhBoLJ+3RFYC6+M2lYB1
+yT92tbAT3787aHTw/SdFvA11oT+lMDEmBWowzZ1bp/J7tqlqMcmwL4QyhZjp0gmK
+eqDXy2Jui/fOTRzWQ1ka7mR6OTWxxVoIjKVvJ/AysqGCTFMXZXrMthtCuQDG+b85
+B3ALz6/j0ZFqgKzftCIuY0UnBtDEuKkAa0QkDMHLvcMAw7V/etpQPypCXqmwnc2e
+vvL6cSvakEVE7rErhIeeL+1m2TBSWNrPVIvggLMv655meqkhGQn9uYyiGw6i/2V/
+ngBAs4gYDvk20Cyg0kxQONmzreAdFzArud+k7FofZw==
+-----END CERTIFICATE-----
diff --git a/pki/src/test/resources/keystore/partner1client1/truststore.jks b/pki/src/test/resources/keystore/partner1client1/truststore.jks
new file mode 100644
index 00000000000..fcfd0460219
Binary files /dev/null and b/pki/src/test/resources/keystore/partner1client1/truststore.jks differ
diff --git a/pki/src/test/resources/keystore/partner2client1/crl.pem b/pki/src/test/resources/keystore/partner2client1/crl.pem
new file mode 100644
index 00000000000..659388f6525
--- /dev/null
+++ b/pki/src/test/resources/keystore/partner2client1/crl.pem
@@ -0,0 +1,27 @@
+-----BEGIN X509 CRL-----
+MIICBDCB7QIBATANBgkqhkiG9w0BAQsFADCBgTELMAkGA1UEBhMCVVMxCzAJBgNV
+BAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJBgNVBAoMAk1DMQ0wCwYDVQQLDARyb290
+MRMwEQYDVQQDDApwYXJ0bmVyMWNhMSYwJAYJKoZIhvcNAQkBFhdwYXJ0bmVyMWNh
+QHBhcnRuZXIxLmNvbRcNMjEwNjA3MTcwNjAwWhcNMjIwNjA3MTcwNjAwWjAnMCUC
+FGltgEkvXupxY562dERH8+uKOf89Fw0yMTA2MDcxNzA2MDBaoA4wDDAKBgNVHRQE
+AwIBADANBgkqhkiG9w0BAQsFAAOCAQEABF/7Kq+byYi/bRoftL8xqgSGcaLVuCOF
+BZVZXDKjyYfISwBqbvPSqtIvnFO1ewicgD7dNIZwWcQ9Kx7OOz4BA6Pe8YPtiBfp
+HZMabT8BS2eLePvViGumY7PTo3oIk3yXylOtzMDo59WQhCH/0vp5xjzJC+VFex/W
+p/an5ii1y3Q1FpEZNer6jpU0xJEJ2mCaGT/zuj6Mg1awWqmmYce3BahZeCNj8Wyx
+GIy8bGUjOdJyp99rAF9euCZ45pAjI12sg9lhPIVkp3Wnoy3La4Yj219Elc3MbJvF
+8GEFEmZ0Lm5Ze/EG5VyLB+wRpggeSJTc20i/eGWdaWg8AEukCgMdCg==
+-----END X509 CRL-----
+-----BEGIN X509 CRL-----
+MIICLDCCARQCAQEwDQYJKoZIhvcNAQELBQAwgYExCzAJBgNVBAYTAlVTMQswCQYD
+VQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9v
+dDETMBEGA1UEAwwKcGFydG5lcjJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcjJj
+YUBwYXJ0bmVyMi5jb20XDTIxMDYwNzE3MDYwMFoXDTIyMDYwNzE3MDYwMFowTjAl
+AhRpbYBJL17qcWOetnRER/Prijn/PRcNMjEwNjA3MTcwNjAwWjAlAhR+2Aa1zeVQ
+jbXFGnXFu53h4vZEahcNMjEwNjA3MTcwNjAwWqAOMAwwCgYDVR0UBAMCAQEwDQYJ
+KoZIhvcNAQELBQADggEBAFXQOMk+6FDP8bm9TGK079IHojhooipo+9x3I1y/kUhH
+XY7xuyTXOvzv14//xenDuryIjSAC8pyqbls+DcUXkmGZ/nIWugtMykGLNgqqo/Oe
+pfoUSXRJP7CtvfHa4ejfr3q1t5MXfM3nqBQumu65slWjDFtE6mZF4ANcsIlsNQ10
+GTkDIdDHgUWxmZlBzTkoofvYspixuUptpJfl5eei9SDA+T1uADKnjARkxVv8xeYi
+QwTp6jVYq6YKc9z0l1UMadnFQz8osk7QNypWnsrD0+iBB1if8ikJwy+8BWayTkgQ
+tWLFT4n/c1m/wYzSclvZUUOxkkkE4Q9fZ3ReCADC+bQ=
+-----END X509 CRL-----
diff --git a/pki/src/test/resources/keystore/partner2client1/keys.p12 b/pki/src/test/resources/keystore/partner2client1/keys.p12
new file mode 100644
index 00000000000..163a7070cf8
Binary files /dev/null and b/pki/src/test/resources/keystore/partner2client1/keys.p12 differ
diff --git a/pki/src/test/resources/keystore/partner2client1/keystore.jks b/pki/src/test/resources/keystore/partner2client1/keystore.jks
new file mode 100644
index 00000000000..c701737c333
Binary files /dev/null and b/pki/src/test/resources/keystore/partner2client1/keystore.jks differ
diff --git a/pki/src/test/resources/keystore/partner2client1/nss.cfg b/pki/src/test/resources/keystore/partner2client1/nss.cfg
new file mode 100644
index 00000000000..dc682032616
--- /dev/null
+++ b/pki/src/test/resources/keystore/partner2client1/nss.cfg
@@ -0,0 +1,6 @@
+
+name = NSScrypto-partner2client1
+nssSecmodDirectory = ./src/test/resources/keystore/partner2client1/nssdb
+nssDbMode = readOnly
+nssModule = keystore
+    
diff --git a/pki/src/test/resources/keystore/partner2client1/nssdb/cert8.db b/pki/src/test/resources/keystore/partner2client1/nssdb/cert8.db
new file mode 100644
index 00000000000..58da2474c9d
Binary files /dev/null and b/pki/src/test/resources/keystore/partner2client1/nssdb/cert8.db differ
diff --git a/pki/src/test/resources/keystore/partner2client1/nssdb/key3.db b/pki/src/test/resources/keystore/partner2client1/nssdb/key3.db
new file mode 100644
index 00000000000..2c9559d34e9
Binary files /dev/null and b/pki/src/test/resources/keystore/partner2client1/nssdb/key3.db differ
diff --git a/pki/src/test/resources/keystore/partner2client1/nssdb/secmod.db b/pki/src/test/resources/keystore/partner2client1/nssdb/secmod.db
new file mode 100644
index 00000000000..f1e3080f2ef
Binary files /dev/null and b/pki/src/test/resources/keystore/partner2client1/nssdb/secmod.db differ
diff --git a/pki/src/test/resources/keystore/partner2client1/nsspin.txt b/pki/src/test/resources/keystore/partner2client1/nsspin.txt
new file mode 100644
index 00000000000..5271a526801
--- /dev/null
+++ b/pki/src/test/resources/keystore/partner2client1/nsspin.txt
@@ -0,0 +1 @@
+test123
diff --git a/pki/src/test/resources/keystore/partner2client1/ssl-ca.pem b/pki/src/test/resources/keystore/partner2client1/ssl-ca.pem
new file mode 100644
index 00000000000..3df5f10dc16
--- /dev/null
+++ b/pki/src/test/resources/keystore/partner2client1/ssl-ca.pem
@@ -0,0 +1,70 @@
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIUNniG6StciHezbAqX+uNMciPW7jswDQYJKoZIhvcNAQEL
+BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
+KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA2MDcxNzA1NDlaGA8y
+MTIxMDUxNDE3MDU0OVowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
+A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
+cGFydG5lcjJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcjJjYUBwYXJ0bmVyMi5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLvHvIuFFYmNYEA6P2
+/RB3LBDpxbnjl7SU4KCWcfBxQ1guw3aG/HzjenKt3m6UmmESFSh0k4/a/s9m4z/M
+ubVqrm0ll2HvyodetFL40jLgSCIbP3taCIhLptaOCB2P6keYEfjGdb5YTNMgCqYk
+NYA+dgXtw1VMJvI7aRpmVOIPtQx/nqncigYzxykGlTbeusSPAGp7CAmxTZSJUFLI
+ig0ReaKSopiQE2j/ljJXFK26sMlkq3Lw41E4fPju+PBeubeb6eT8fzhn0IaCgTeO
+cZgKzVUv3MsrrKfDHXUhGAspKBGDkqkrogZ6UYcvyCLfnRM0vVGc1L7oaFnMMZ1m
+NYRpAgMBAAGjZjBkMB0GA1UdDgQWBBSsXIVGVfgo124o7djQsYtrkYPWYzAfBgNV
+HSMEGDAWgBT8BlnPk8BS8+JHlIEoCp3sO8jDDjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEABSHI1SgQ1FBWmPRZ
+nXDspyvbvPsjk/p6erUVGGuDyy/F2rJldz7musNCL5ijAmlQfYPNMNoLU1BR+fAl
+WSYfdjL1mMygXtj/KlaNqM5hQMUfyYa4Yk1ODaScl+wfIsSmzTSl/j4fMf58GYpr
+9rssVveQrFAipeWhxgGqQNJooAbqmZKE4tePhKzrsH+B2hDEUnFptkasnQEkQQEZ
+rSzJlU72U8p3Gwq9t9rKYoBLSr0yoBbh4fdFcPsuN/mZS6TNEu1Uc4ui9eWheGTM
+RCNGehiXAczfIhf9WfMfyNhp5/pZc2nTeV/LsSjuCFXUdoL5rAESPcHBc56vXtcV
+1ywC0A==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID6jCCAtKgAwIBAgIUTwPfI+2FxYq0V6uukemLf67qANowDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTcwNTQ3
+WhgPMjEyMTA1MTQxNzA1NDdaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
+AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxuUWq2F6MFQLeFVBB800pjiJv
+pqrpMb8lv5aEOX87slRRkIVe0M/6mSlNvJSSclGindIhsWxaYD4Kend+o+ODhMqT
+Jl7zvVTTluGg8SK22kyJ8DTWHnhnFhpoKVLc5qjgvglOf0h7S9F/tL5AkpGoBq7t
+PkbOJPxKR7bvn34Iux3HgS1uzwZqHSYBcNHuYB6PSgyQJiNLIrA/019YqqUI5R+W
+V/Nb/kkrnsUS+hU6ntAtewus0irO+4fJzBlpN+bvbEBdVHeVmIYhF6ILxtCGWX5l
+lOlDrYNXiff0ksKtEvyUV/NFOASixEBMQ88Un7NGHR8y1NW3fCGiVkOhvaprAgMB
+AAGjZjBkMB0GA1UdDgQWBBT8BlnPk8BS8+JHlIEoCp3sO8jDDjAfBgNVHSMEGDAW
+gBTj0UDC6u67VvpJ2NmXE7vz77nHHTASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAZYQg0VUOQ1DGoU0y0TsTzAZ4
+IEy5xavV7Nma9AJI0ZVFpqGEBjTXjxi7r/co1EREN3bi7QnZfJhU4SGVZ0T7wq+p
+/S3x16DEPEufa3JmP+brBPOOP/5EJX5+2BXMUWuDcY7MAokaAIAudjmVk32FoZgy
+54FkZ+YRillU++7k0ie8EEYE8pN2ABIqNCdHxGEhwEc0wVwB6bBONmcEssYmipUh
+DQH6+sfKBcd+sUMGG3qd79sE7BF9w8bAHhKcBm5eTdEks9jh6H1o0PgBvFP8fFzF
+q89KGuLw7T0n/Khkmrv5cifwmTpg42Ivorv8qk02aeiOAGiMyFFJ38BQtH64LQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2zCCAsOgAwIBAgIURc832yfuirkVrhWhC4O1uBfTZXAwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTcwNTQ3
+WhgPMjEyMTA1MTQxNzA1NDdaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
+AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzKd0JrZR3N0A3C7Gp7sT
+zLurt0pVjAIBh3N+5NsyY7eAHJWA7wRR+JpG4q6MxmYVWsk4MjsnWB0ViCCm+fTY
+a9tFms6lmsjM4fJgIs8/DP+zBEOien7sD3kfddmI4ClODynNv3ODbJKyhzKQEOZ8
+sdf61yWYuFzayEfNoon6BlqroPv9B0eAsgOFDndPo6vbqAFlrYAyVXx+7hmH7Hv6
+8RWDaSr0uI62uhvAQeK4a+p9aTSwLcHRh1/7NezW9rzI0/7yzP3w/RS7tevDuacU
+XMr3sH5xEUahGF72qYUVejUlP48fPLrdGK76QZk0M8K2EOyvuNq66P+UMialx+83
+NwIDAQABo1MwUTAdBgNVHQ4EFgQU49FAwuruu1b6SdjZlxO78++5xx0wHwYDVR0j
+BBgwFoAU49FAwuruu1b6SdjZlxO78++5xx0wDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEADfrsmYBaeV4/MTRVazsey/o0ZhBoLJ+3RFYC6+M2lYB1
+yT92tbAT3787aHTw/SdFvA11oT+lMDEmBWowzZ1bp/J7tqlqMcmwL4QyhZjp0gmK
+eqDXy2Jui/fOTRzWQ1ka7mR6OTWxxVoIjKVvJ/AysqGCTFMXZXrMthtCuQDG+b85
+B3ALz6/j0ZFqgKzftCIuY0UnBtDEuKkAa0QkDMHLvcMAw7V/etpQPypCXqmwnc2e
+vvL6cSvakEVE7rErhIeeL+1m2TBSWNrPVIvggLMv655meqkhGQn9uYyiGw6i/2V/
+ngBAs4gYDvk20Cyg0kxQONmzreAdFzArud+k7FofZw==
+-----END CERTIFICATE-----
diff --git a/pki/src/test/resources/keystore/partner2client1/ssl.pem b/pki/src/test/resources/keystore/partner2client1/ssl.pem
new file mode 100644
index 00000000000..2b907374355
--- /dev/null
+++ b/pki/src/test/resources/keystore/partner2client1/ssl.pem
@@ -0,0 +1,126 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDGcHX9nWsO3oQy
+9HlcTQAA9RxCpVqi5MmBG2HuTipppBdXphGyhQggpD1rL5I26vdq1FIuPBlFI1pg
+Hd/hw7FOr5HuQ12GZpmmPW5KIbEzeY0MVJNXOw+iUuoaQNHLQSKtV5ZOmIJURIWE
+0tjicDOewW/yR9MMStOQladn7WICwwfpgLQeX9EkZqko4iOK9K6ZKUeyRf9kI/86
+2M7/DAi0pxvaBGcW0F9XmBlqQu7Ma6q0fyR1qf2q3OZL3mSWuNV8S4hYyPqgKAce
+s5w7zzRSNaeGX644RWU1XY8ze6Zik61aRLI2clHrI8wta8HDCdV1GvHvPj1Y7kqB
+xDg0yBqpAgMBAAECggEBAJ2ipshSLcKBFylXNbUR4efgzpNOwaJW9o+eDfx9kYmb
+9YMGBFb5AMzVS4kDIDaKDwOJKMNbsINQozFpafjxOL+WDunkD759cJ8ze5JeE2Md
+suNRqD4KR9Ad56P1S/MXihGDW36R/i4sxJgP2oR+tzLs3R3s2oWQR2I6z+JqG4qu
+tf4gDP6UIrJOirkn7TQD1VQi+8HMWx1BSER6yR86tKKTnwIlgVh0mowWXKXsB5aS
+Y38Kfu+OG8FWAkCaVjFZdvg6xQcjI8MEmRqumPPf3OETrE/D6u4+qvpy1D7b8nsf
+utYgv1mKYqkU0wvdDt6WTrPn/0fteLw6yMaoPmhim1ECgYEA9eFj889HojPzF7fx
+67yWICah9vqd9OPYIPOtQ5rrgnTkiSxk1QyAG6i2Jl15sr8lGuVcVhTyXk/M75Ct
+4gWanwbUI6khDKOM3kVN1nx/kvYFrzSuWkswB55OBEbDY/qhGu73ERNaIJdJVrY+
+p5wn1sbT5I1fqAuKwpj2A5B++x0CgYEAzps6ZujBOq896QoiR4MmLEI6rzqprIsL
+LHCWnGtwn4SJhPwSUD3yDbyjA5rpodjWatLtX/MV7hWlWARj/ERSOLZlU2rCPNwO
+gRgGnpGcSZYhVs7WSa675OEhjmhdUmqcl88pO+14+WLN9Bj8ECqkxyD+srUe5zxo
+IisJYBK/e/0CgYADI+bH5VzP2IQBSIshbJ4qOPQWmGrOBt7qxNHwrBjX6LBGhDeh
+dPBp6gSxhr4YJ1LM/iLowom55KEEaj+eRF4OK+MntXBDng8dg5sT4zEp6lR2QWD8
+rDsnzcDHUzQJodjO5EBpimq7QdNg9SDluRvVJWLtZ1TSa5tREu0JbJ4CjQKBgADK
+kWexfoP2BdutoUH625uRyV3AcMPraGiMKdeBhdXmkQxEVuGdyx6IWWt7HWf0R6Xz
+FtumN7BIvvBeW++sZ1A2Sp8OKp5HDXsrF2NmFV4myAvoEOQJWkjfH9zGw4y8QctH
+DNZg63SxDy7fJZ/+OdFVbARNM0gZcCCpX4jRqZAVAoGBALz0ELUMj1s42+G6UAZ3
+toBHOBI7o/4R7hRoim21dmpmyz1XJrL17wIZO4vvftNxYI4n/0U0QMFopaakMrCi
+E0/I9sU9R/4MyOK0VCPtkeuxznp3xkX8zoNeewK+9EGiEZFcOpsbyRSmwjLCyTKU
+G8HIMfRI71A7qj+5Me3q62K2
+-----END PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIEyDCCA7CgAwIBAgIUftgGtc3lUI21xRp1xbud4eL2RGkwDQYJKoZIhvcNAQEL
+BQAwgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoGA1UEBwwDU0ZPMQsw
+CQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwKcGFydG5lcjJjYTEm
+MCQGCSqGSIb3DQEJARYXcGFydG5lcjJjYUBwYXJ0bmVyMi5jb20wIBcNMjEwNjA3
+MTcwNTQ5WhgPMjEyMTA1MTQxNzA1NDlaMIGLMQswCQYDVQQGEwJVUzELMAkGA1UE
+CAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMxDTALBgNVBAsMBHJvb3Qx
+GDAWBgNVBAMMD3BhcnRuZXIyY2xpZW50MTErMCkGCSqGSIb3DQEJARYccGFydG5l
+cjJjbGllbnQxQHBhcnRuZXIyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAMZwdf2daw7ehDL0eVxNAAD1HEKlWqLkyYEbYe5OKmmkF1emEbKFCCCk
+PWsvkjbq92rUUi48GUUjWmAd3+HDsU6vke5DXYZmmaY9bkohsTN5jQxUk1c7D6JS
+6hpA0ctBIq1Xlk6YglREhYTS2OJwM57Bb/JH0wxK05CVp2ftYgLDB+mAtB5f0SRm
+qSjiI4r0rpkpR7JF/2Qj/zrYzv8MCLSnG9oEZxbQX1eYGWpC7sxrqrR/JHWp/arc
+5kveZJa41XxLiFjI+qAoBx6znDvPNFI1p4ZfrjhFZTVdjzN7pmKTrVpEsjZyUesj
+zC1rwcMJ1XUa8e8+PVjuSoHEODTIGqkCAwEAAaOCASgwggEkMBEGCWCGSAGG+EIB
+AQQEAwIGwDAdBgNVHQ4EFgQUojh+oPjTK6xgPMtbz+XEy4tl7iwwCQYDVR0TBAIw
+ADAOBgNVHQ8BAf8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MIG1BgNVHSMEga0wgaqAFKxchUZV+CjXbijt2NCxi2uRg9ZjoXykejB4MQswCQYD
+VQQGEwJVUzELMAkGA1UECAwCQ0ExDDAKBgNVBAcMA1NGTzELMAkGA1UECgwCTUMx
+DTALBgNVBAsMBHJvb3QxEDAOBgNVBAMMB2ludGVyY2ExIDAeBgkqhkiG9w0BCQEW
+EWludGVyY2FAYWRtaW4uY29tghQ2eIbpK1yId7NsCpf640xyI9buOzANBgkqhkiG
+9w0BAQsFAAOCAQEAbhEisOmfG5/Ks7MHu9cl17R9ISIFbMVv4wBiztLt2tWv5o5P
+ul9DG2s9tBuOzs3xB4v2aZg7H2kPnUPDaTe7z5Ulc5+IyHDGSdsBzBqONH3sElue
+HyZo1cOXU6nBIineYGYc0Bs9QnLRA0dmaYWZyjqB5S5GCs9Z5mk/JWzA1d110uio
+RzStTpbSFlYvBpLTPShLREfFp56SMHDEaHBIoVERzfULvQwZLDsIAyqE/W+WE0FF
+Lxhz3jxvztoOE6Sr5cmOp7nuwo3ALlWOjFCHOZRs/1qDDnIgXFnPKsZohtvVK2TG
+a+/zW8wRyAAo4FgBTfqICXpOtK+Yg479Aj2GbQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIUNniG6StciHezbAqX+uNMciPW7jswDQYJKoZIhvcNAQEL
+BQAweDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRAwDgYDVQQDDAdpbnRlcmNhMSAwHgYJ
+KoZIhvcNAQkBFhFpbnRlcmNhQGFkbWluLmNvbTAgFw0yMTA2MDcxNzA1NDlaGA8y
+MTIxMDUxNDE3MDU0OVowgYExCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEMMAoG
+A1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDETMBEGA1UEAwwK
+cGFydG5lcjJjYTEmMCQGCSqGSIb3DQEJARYXcGFydG5lcjJjYUBwYXJ0bmVyMi5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLvHvIuFFYmNYEA6P2
+/RB3LBDpxbnjl7SU4KCWcfBxQ1guw3aG/HzjenKt3m6UmmESFSh0k4/a/s9m4z/M
+ubVqrm0ll2HvyodetFL40jLgSCIbP3taCIhLptaOCB2P6keYEfjGdb5YTNMgCqYk
+NYA+dgXtw1VMJvI7aRpmVOIPtQx/nqncigYzxykGlTbeusSPAGp7CAmxTZSJUFLI
+ig0ReaKSopiQE2j/ljJXFK26sMlkq3Lw41E4fPju+PBeubeb6eT8fzhn0IaCgTeO
+cZgKzVUv3MsrrKfDHXUhGAspKBGDkqkrogZ6UYcvyCLfnRM0vVGc1L7oaFnMMZ1m
+NYRpAgMBAAGjZjBkMB0GA1UdDgQWBBSsXIVGVfgo124o7djQsYtrkYPWYzAfBgNV
+HSMEGDAWgBT8BlnPk8BS8+JHlIEoCp3sO8jDDjASBgNVHRMBAf8ECDAGAQH/AgEA
+MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEABSHI1SgQ1FBWmPRZ
+nXDspyvbvPsjk/p6erUVGGuDyy/F2rJldz7musNCL5ijAmlQfYPNMNoLU1BR+fAl
+WSYfdjL1mMygXtj/KlaNqM5hQMUfyYa4Yk1ODaScl+wfIsSmzTSl/j4fMf58GYpr
+9rssVveQrFAipeWhxgGqQNJooAbqmZKE4tePhKzrsH+B2hDEUnFptkasnQEkQQEZ
+rSzJlU72U8p3Gwq9t9rKYoBLSr0yoBbh4fdFcPsuN/mZS6TNEu1Uc4ui9eWheGTM
+RCNGehiXAczfIhf9WfMfyNhp5/pZc2nTeV/LsSjuCFXUdoL5rAESPcHBc56vXtcV
+1ywC0A==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID6jCCAtKgAwIBAgIUTwPfI+2FxYq0V6uukemLf67qANowDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTcwNTQ3
+WhgPMjEyMTA1MTQxNzA1NDdaMHgxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEQMA4GA1UE
+AwwHaW50ZXJjYTEgMB4GCSqGSIb3DQEJARYRaW50ZXJjYUBhZG1pbi5jb20wggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxuUWq2F6MFQLeFVBB800pjiJv
+pqrpMb8lv5aEOX87slRRkIVe0M/6mSlNvJSSclGindIhsWxaYD4Kend+o+ODhMqT
+Jl7zvVTTluGg8SK22kyJ8DTWHnhnFhpoKVLc5qjgvglOf0h7S9F/tL5AkpGoBq7t
+PkbOJPxKR7bvn34Iux3HgS1uzwZqHSYBcNHuYB6PSgyQJiNLIrA/019YqqUI5R+W
+V/Nb/kkrnsUS+hU6ntAtewus0irO+4fJzBlpN+bvbEBdVHeVmIYhF6ILxtCGWX5l
+lOlDrYNXiff0ksKtEvyUV/NFOASixEBMQ88Un7NGHR8y1NW3fCGiVkOhvaprAgMB
+AAGjZjBkMB0GA1UdDgQWBBT8BlnPk8BS8+JHlIEoCp3sO8jDDjAfBgNVHSMEGDAW
+gBTj0UDC6u67VvpJ2NmXE7vz77nHHTASBgNVHRMBAf8ECDAGAQH/AgEBMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEAZYQg0VUOQ1DGoU0y0TsTzAZ4
+IEy5xavV7Nma9AJI0ZVFpqGEBjTXjxi7r/co1EREN3bi7QnZfJhU4SGVZ0T7wq+p
+/S3x16DEPEufa3JmP+brBPOOP/5EJX5+2BXMUWuDcY7MAokaAIAudjmVk32FoZgy
+54FkZ+YRillU++7k0ie8EEYE8pN2ABIqNCdHxGEhwEc0wVwB6bBONmcEssYmipUh
+DQH6+sfKBcd+sUMGG3qd79sE7BF9w8bAHhKcBm5eTdEks9jh6H1o0PgBvFP8fFzF
+q89KGuLw7T0n/Khkmrv5cifwmTpg42Ivorv8qk02aeiOAGiMyFFJ38BQtH64LQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID2zCCAsOgAwIBAgIURc832yfuirkVrhWhC4O1uBfTZXAwDQYJKoZIhvcNAQEL
+BQAwfDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQwwCgYDVQQHDANTRk8xCzAJ
+BgNVBAoMAk1DMQ0wCwYDVQQLDARyb290MRUwEwYDVQQDDAxyb290Y2EuYWRtaW4x
+HzAdBgkqhkiG9w0BCQEWEHJvb3RjYUBhZG1pbi5jb20wIBcNMjEwNjA3MTcwNTQ3
+WhgPMjEyMTA1MTQxNzA1NDdaMHwxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEM
+MAoGA1UEBwwDU0ZPMQswCQYDVQQKDAJNQzENMAsGA1UECwwEcm9vdDEVMBMGA1UE
+AwwMcm9vdGNhLmFkbWluMR8wHQYJKoZIhvcNAQkBFhByb290Y2FAYWRtaW4uY29t
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzKd0JrZR3N0A3C7Gp7sT
+zLurt0pVjAIBh3N+5NsyY7eAHJWA7wRR+JpG4q6MxmYVWsk4MjsnWB0ViCCm+fTY
+a9tFms6lmsjM4fJgIs8/DP+zBEOien7sD3kfddmI4ClODynNv3ODbJKyhzKQEOZ8
+sdf61yWYuFzayEfNoon6BlqroPv9B0eAsgOFDndPo6vbqAFlrYAyVXx+7hmH7Hv6
+8RWDaSr0uI62uhvAQeK4a+p9aTSwLcHRh1/7NezW9rzI0/7yzP3w/RS7tevDuacU
+XMr3sH5xEUahGF72qYUVejUlP48fPLrdGK76QZk0M8K2EOyvuNq66P+UMialx+83
+NwIDAQABo1MwUTAdBgNVHQ4EFgQU49FAwuruu1b6SdjZlxO78++5xx0wHwYDVR0j
+BBgwFoAU49FAwuruu1b6SdjZlxO78++5xx0wDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEADfrsmYBaeV4/MTRVazsey/o0ZhBoLJ+3RFYC6+M2lYB1
+yT92tbAT3787aHTw/SdFvA11oT+lMDEmBWowzZ1bp/J7tqlqMcmwL4QyhZjp0gmK
+eqDXy2Jui/fOTRzWQ1ka7mR6OTWxxVoIjKVvJ/AysqGCTFMXZXrMthtCuQDG+b85
+B3ALz6/j0ZFqgKzftCIuY0UnBtDEuKkAa0QkDMHLvcMAw7V/etpQPypCXqmwnc2e
+vvL6cSvakEVE7rErhIeeL+1m2TBSWNrPVIvggLMv655meqkhGQn9uYyiGw6i/2V/
+ngBAs4gYDvk20Cyg0kxQONmzreAdFzArud+k7FofZw==
+-----END CERTIFICATE-----
diff --git a/pki/src/test/resources/keystore/partner2client1/truststore.jks b/pki/src/test/resources/keystore/partner2client1/truststore.jks
new file mode 100644
index 00000000000..f2a54903b30
Binary files /dev/null and b/pki/src/test/resources/keystore/partner2client1/truststore.jks differ
diff --git a/pki/src/test/resources/keystore/truststore b/pki/src/test/resources/keystore/truststore
new file mode 100644
index 00000000000..5a9fc09310e
Binary files /dev/null and b/pki/src/test/resources/keystore/truststore differ
diff --git a/pki/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/pki/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 00000000000..ca6ee9cea8e
--- /dev/null
+++ b/pki/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline
\ No newline at end of file
diff --git a/plugin-api/build.gradle b/plugin-api/build.gradle
index 9572b31cc03..f804c4a33cf 100644
--- a/plugin-api/build.gradle
+++ b/plugin-api/build.gradle
@@ -21,14 +21,19 @@ jar {
       'Specification-Title': archiveBaseName,
       'Specification-Version': project.version,
       'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Automatic-Module-Name': 'org.hyperledger.besu.plugin.api'
       )
   }
 }
 
 dependencies {
-  api 'org.apache.tuweni:bytes'
-  api 'org.apache.tuweni:units'
+  api project(':datatypes')
+  api 'org.apache.commons:commons-lang3'
+  api 'org.apache.tuweni:tuweni-bytes'
+  api 'org.apache.tuweni:tuweni-units'
+  implementation 'com.google.guava:guava'
+  implementation project(':evm')
 }
 
 configurations { testArtifacts }
@@ -64,7 +69,7 @@ Calculated : ${currentHash}
 tasks.register('checkAPIChanges', FileStateChecker) {
   description = "Checks that the API for the Plugin-API project does not change without deliberate thought"
   files = sourceSets.main.allJava.files
-  knownHash = 'G/PgybKXAfEHvlXoGj1MDpIUmS5vN1NK5/nKni4PjTE='
+  knownHash = 'T7W0Yg01Qs77rIZ+qgDe4p/wUxXG2PrRDj71EZSMpYY='
 }
 check.dependsOn('checkAPIChanges')
 
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/BesuContext.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/BesuContext.java
index 472c84107a5..71b3612e51e 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/BesuContext.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/BesuContext.java
@@ -14,11 +14,22 @@
  */
 package org.hyperledger.besu.plugin;
 
+import org.hyperledger.besu.plugin.services.BesuService;
+
 import java.util.Optional;
 
 /** Allows plugins to access Besu services. */
 public interface BesuContext {
 
+  /**
+   * Add service.
+   *
+   * @param <T> the type parameter
+   * @param serviceType the service type
+   * @param service the service
+   */
+  <T extends BesuService> void addService(final Class<T> serviceType, final T service);
+
   /**
    * Get the requested service, if it is available. There are a number of reasons that a service may
    * not be available:
@@ -40,5 +51,5 @@ public interface BesuContext {
    * @return an optional containing the instance of the requested service, or empty if the service
    *     is unavailable
    */
-  <T> Optional<T> getService(Class<T> serviceType);
+  <T extends BesuService> Optional<T> getService(Class<T> serviceType);
 }
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/BesuPlugin.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/BesuPlugin.java
index e56318e4d06..5a54808a6c1 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/BesuPlugin.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/BesuPlugin.java
@@ -51,14 +51,20 @@ default Optional<String> getName() {
   void register(BesuContext context);
 
   /**
-   * Called once Besu has loaded configuration and is starting up. The plugin should begin
-   * operation, including registering any event listener with Besu services and starting any
-   * background threads the plugin requires.
+   * Called once when besu has loaded configuration but before external services have been started
+   * e.g. metrics and http
+   */
+  default void beforeExternalServices() {}
+
+  /**
+   * Called once Besu has loaded configuration and has started external services but before the main
+   * loop is up. The plugin should begin operation, including registering any event listener with
+   * Besu services and starting any background threads the plugin requires.
    */
   void start();
 
   /**
-   * Called when the plugin is being reloaded. This method will be called trough a dedicated JSON
+   * Called when the plugin is being reloaded. This method will be called through a dedicated JSON
    * RPC endpoint. If not overridden this method does nothing for convenience. The plugin should
    * only implement this method if it supports dynamic reloading.
    *
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/AddedBlockContext.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/AddedBlockContext.java
index ae56e58efe3..a5a354e5942 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/AddedBlockContext.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/AddedBlockContext.java
@@ -16,23 +16,8 @@
 
 import java.util.List;
 
-/** The minimum set of data for a AddedBlockContext. */
-public interface AddedBlockContext {
-
-  /**
-   * A {@link BlockHeader} object.
-   *
-   * @return A {@link BlockHeader}
-   */
-  BlockHeader getBlockHeader();
-
-  /**
-   * A {@link BlockHeader} object.
-   *
-   * @return A {@link BlockHeader}
-   */
-  BlockBody getBlockBody();
-
+/** The minimum set of data for an AddedBlockContext. */
+public interface AddedBlockContext extends BlockContext {
   /**
    * A list of transaction receipts for the added block.
    *
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Address.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Address.java
deleted file mode 100644
index 175c56d9667..00000000000
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Address.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.plugin.data;
-
-import org.apache.tuweni.bytes.Bytes;
-
-/** An interface for {@link Bytes} that also represents an Ethereum account address. */
-public interface Address extends Bytes {}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/BlockBody.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/BlockBody.java
index ecd08ade198..5ffdbd161fc 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/BlockBody.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/BlockBody.java
@@ -16,7 +16,10 @@
 
 package org.hyperledger.besu.plugin.data;
 
+import org.hyperledger.besu.plugin.Unstable;
+
 import java.util.List;
+import java.util.Optional;
 
 /**
  * The parts of a Block not in the {@link BlockHeader}, information corresponding to the comprised
@@ -30,12 +33,27 @@ public interface BlockBody {
    *
    * @return The list of transactions of the block.
    */
-  public List<? extends Transaction> getTransactions();
+  List<? extends Transaction> getTransactions();
 
   /**
    * Returns the list of ommers of the block.
    *
    * @return The list of ommers of the block.
    */
-  public List<? extends BlockHeader> getOmmers();
+  List<? extends BlockHeader> getOmmers();
+
+  /**
+   * Returns the list of withdrawals of the block.
+   *
+   * @return The list of withdrawals of the block.
+   */
+  Optional<? extends List<? extends Withdrawal>> getWithdrawals();
+
+  /**
+   * Returns the list of deposits of the block.
+   *
+   * @return The list of deposits of the block.
+   */
+  @Unstable
+  Optional<? extends List<? extends Deposit>> getDeposits();
 }
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/BlockContext.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/BlockContext.java
new file mode 100644
index 00000000000..caacc741f4d
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/BlockContext.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.data;
+
+/** The minimum set of data for a BlockContext. */
+public interface BlockContext {
+
+  /**
+   * A {@link BlockHeader} object.
+   *
+   * @return A {@link BlockHeader}
+   */
+  BlockHeader getBlockHeader();
+
+  /**
+   * A {@link BlockBody} object.
+   *
+   * @return A {@link BlockBody}
+   */
+  BlockBody getBlockBody();
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/BlockHeader.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/BlockHeader.java
index 12a4a51d8cf..4105bfd89c8 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/BlockHeader.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/BlockHeader.java
@@ -14,11 +14,15 @@
  */
 package org.hyperledger.besu.plugin.data;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Quantity;
 import org.hyperledger.besu.plugin.Unstable;
 
 import java.util.Optional;
 
 import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.bytes.Bytes32;
 
 /**
  * The minimum set of data for a BlockHeader, as defined in the <a href=
@@ -53,18 +57,18 @@ public interface BlockHeader {
 
   /**
    * The Keccak 256-bit hash of the root node of the state trie, after all transactions are executed
-   * and finalisations applied.
+   * and finalizations applied.
    *
    * @return The Keccak 256-bit hash of the root node of the state trie, after all transactions are
-   *     executed and finalisations applied.
+   *     executed and finalizations applied.
    */
   Hash getStateRoot();
 
   /**
-   * The Keccak 256-bit hash of theroot node of the trie structure populated with each transaction
+   * The Keccak 256-bit hash of the root node of the trie structure populated with each transaction
    * in the transactions list portion of the block.
    *
-   * @return The Keccak 256-bit hash of theroot node of the trie structure populated with each
+   * @return The Keccak 256-bit hash of the root node of the trie structure populated with each
    *     transaction in the transactions list portion of the block.
    */
   Hash getTransactionsRoot();
@@ -162,10 +166,46 @@ public interface BlockHeader {
   /**
    * The BASEFEE of this header.
    *
-   * @return TheBASEFEE of this header.
+   * @return The BASEFEE of this header.
    */
   @Unstable
-  default Optional<Long> getBaseFee() {
+  default Optional<? extends Quantity> getBaseFee() {
     return Optional.empty();
   }
+
+  /**
+   * Optional 32 bytes of prevRandao data.
+   *
+   * @return Optional prevRandao bytes from this header.
+   */
+  default Optional<Bytes32> getPrevRandao() {
+    return Optional.empty();
+  }
+
+  /**
+   * The Keccak 256-bit hash of the root node of the trie structure populated with each withdrawal
+   * in the withdrawals list portion of the block.
+   *
+   * @return The Keccak 256-bit hash of the root node of the trie structure populated with each
+   *     withdrawal in the withdrawal list portion of the block.
+   */
+  Optional<? extends Hash> getWithdrawalsRoot();
+
+  /**
+   * The Keccak 256-bit hash of the root node of the trie structure populated with each deposit in
+   * the deposits list portion of the block.
+   *
+   * @return The Keccak 256-bit hash of the root node of the trie structure populated with each
+   *     deposit in the deposit list portion of the block.
+   */
+  @Unstable
+  Optional<? extends Hash> getDepositsRoot();
+
+  /**
+   * The excess_data_gas of this header.
+   *
+   * @return The excess_data_gas of this header.
+   */
+  @Unstable
+  Optional<? extends Quantity> getExcessDataGas();
 }
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Deposit.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Deposit.java
new file mode 100644
index 00000000000..2fe82effe72
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Deposit.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.data;
+
+import org.hyperledger.besu.datatypes.BLSSignature;
+import org.hyperledger.besu.datatypes.PublicKey;
+import org.hyperledger.besu.datatypes.Quantity;
+import org.hyperledger.besu.plugin.Unstable;
+
+import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.units.bigints.UInt64;
+
+/**
+ * A deposit is a system-level operation to support validator deposits that are pushed from the EVM
+ * to beacon chain.
+ */
+@Unstable
+public interface Deposit {
+
+  /**
+   * Public key of the address that sends the deposit
+   *
+   * @return public key of sender
+   */
+  PublicKey getPublicKey();
+
+  /**
+   * Withdrawal credential that contains info that will be used for verifying the destination of
+   * valid withdrawals
+   *
+   * @return withdrawal credential
+   */
+  Bytes32 getWithdrawalCredentials();
+
+  /**
+   * Amount of ether to be sent to the deposit contract
+   *
+   * @return deposit ether amount
+   */
+  Quantity getAmount();
+
+  /**
+   * Signature that will be used together with the public key to verify the validity of this Deposit
+   *
+   * @return signature
+   */
+  BLSSignature getSignature();
+
+  /**
+   * A monotonically increasing index, starting from 0 that increments by 1 per deposit to uniquely
+   * identify each deposit
+   *
+   * @return deposit index
+   */
+  UInt64 getIndex();
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/EnodeURL.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/EnodeURL.java
new file mode 100644
index 00000000000..c828a8bac12
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/EnodeURL.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.data;
+
+import java.net.InetAddress;
+import java.net.URI;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The interface Enode url. */
+public interface EnodeURL {
+  /**
+   * Enode to uri without discovery port.
+   *
+   * @return the uri
+   */
+  URI toURIWithoutDiscoveryPort();
+
+  /**
+   * Gets node id.
+   *
+   * @return the node id
+   */
+  Bytes getNodeId();
+
+  /**
+   * Gets ip.
+   *
+   * @return the ip
+   */
+  InetAddress getIp();
+
+  /**
+   * Gets listening port.
+   *
+   * @return the listening port
+   */
+  Optional<Integer> getListeningPort();
+
+  /**
+   * Gets listening port or zero.
+   *
+   * @return the listening port or zero
+   */
+  int getListeningPortOrZero();
+
+  /**
+   * Enode To URI.
+   *
+   * @return the uri
+   */
+  URI toURI();
+
+  /**
+   * Gets discovery port.
+   *
+   * @return the discovery port
+   */
+  Optional<Integer> getDiscoveryPort();
+
+  /**
+   * Is listening.
+   *
+   * @return the boolean
+   */
+  boolean isListening();
+
+  /**
+   * Is running discovery.
+   *
+   * @return the boolean
+   */
+  boolean isRunningDiscovery();
+
+  /**
+   * Gets ip as string.
+   *
+   * @return the ip as string
+   */
+  String getIpAsString();
+
+  /**
+   * Gets discovery port or zero.
+   *
+   * @return the discovery port or zero
+   */
+  int getDiscoveryPortOrZero();
+
+  /**
+   * Gets the host.
+   *
+   * @return the host
+   */
+  String getHost();
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Hash.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Hash.java
deleted file mode 100644
index a29b5dc221b..00000000000
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Hash.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.plugin.data;
-
-import org.apache.tuweni.bytes.Bytes32;
-
-/**
- * A marker interface indicating that this {@link Bytes32} represents a hash of some sort. The
- * particular algorithm depends on the source, it may be ripemd, keccak, or some other algorithm.
- */
-public interface Hash extends Bytes32 {}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Log.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Log.java
index 5233143d4cc..0d4c4c6b6d5 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Log.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Log.java
@@ -14,6 +14,8 @@
  */
 package org.hyperledger.besu.plugin.data;
 
+import org.hyperledger.besu.datatypes.Address;
+
 import java.util.List;
 
 import org.apache.tuweni.bytes.Bytes;
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/LogWithMetadata.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/LogWithMetadata.java
index 0ef7fe253ff..08a4f8627c0 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/LogWithMetadata.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/LogWithMetadata.java
@@ -14,6 +14,9 @@
  */
 package org.hyperledger.besu.plugin.data;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+
 import java.util.List;
 
 import org.apache.tuweni.bytes.Bytes;
@@ -43,15 +46,45 @@ public interface LogWithMetadata {
    */
   Bytes getData();
 
+  /**
+   * Gets log index.
+   *
+   * @return the log index
+   */
   int getLogIndex();
 
+  /**
+   * Gets block number.
+   *
+   * @return the block number
+   */
   long getBlockNumber();
 
+  /**
+   * Gets block hash.
+   *
+   * @return the block hash
+   */
   Hash getBlockHash();
 
+  /**
+   * Gets transaction hash.
+   *
+   * @return the transaction hash
+   */
   Hash getTransactionHash();
 
+  /**
+   * Gets transaction index.
+   *
+   * @return the transaction index
+   */
   int getTransactionIndex();
 
+  /**
+   * Is removed.
+   *
+   * @return the boolean
+   */
   boolean isRemoved();
 }
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/PrivacyGenesis.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/PrivacyGenesis.java
new file mode 100644
index 00000000000..7ce6616721e
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/PrivacyGenesis.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.data;
+
+import java.util.List;
+
+/** An interface to return the private state genesis. */
+public interface PrivacyGenesis {
+  /**
+   * A list of pre-compiled wallets with associated information.
+   *
+   * @return The list of addresses, possibly empty. Should never be null.
+   */
+  List<PrivacyGenesisAccount> getAccounts();
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/PrivacyGenesisAccount.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/PrivacyGenesisAccount.java
new file mode 100644
index 00000000000..3026d3801d1
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/PrivacyGenesisAccount.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.data;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Quantity;
+
+import java.util.Map;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** The interface Privacy genesis account. */
+public interface PrivacyGenesisAccount {
+  /**
+   * The address of the initial genesis allocation/pre-compile
+   *
+   * @return Ethereum account address
+   */
+  Address getAddress();
+
+  /**
+   * Any storage that the address requires
+   *
+   * @return account storage
+   */
+  Map<UInt256, UInt256> getStorage();
+
+  /**
+   * The initial nonce assigned to the account.
+   *
+   * @return the nonce
+   */
+  Long getNonce();
+
+  /**
+   * The initial balance assigned to the account.
+   *
+   * @return the balance
+   */
+  Quantity getBalance();
+
+  /**
+   * The initial code for the account.
+   *
+   * <p>Note! this must be the contract code and not the code to deploy the contract.
+   *
+   * @return the wallet code. Can be null or 0x
+   */
+  Bytes getCode();
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/PrivateTransaction.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/PrivateTransaction.java
new file mode 100644
index 00000000000..4ab171ecae9
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/PrivateTransaction.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.data;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Quantity;
+
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The interface Private transaction. */
+public interface PrivateTransaction {
+  /**
+   * A scalar value equal to the number of transactions sent by the sender.
+   *
+   * @return the number of transactions sent by the sender.
+   */
+  long getNonce();
+
+  /**
+   * A scalar value equal to the number of Wei to be paid per unit of gas for all computation costs
+   * incurred as a result of the execution of this transaction.
+   *
+   * @return the quantity of Wei per gas unit paid.
+   */
+  Quantity getGasPrice();
+
+  /**
+   * A scalar value equal to the maximum amount of gas that should be used in executing this
+   * transaction. This is paid up-front, before any computation is done and may not be increased
+   * later.
+   *
+   * @return the maximum amount of gas that should be used in executing this transaction.
+   */
+  long getGasLimit();
+
+  /**
+   * The 160-bit address of the message call’s recipient. For a contract creation transaction this
+   * address will not be present.
+   *
+   * @return address of the recipient
+   */
+  Optional<? extends Address> getTo();
+
+  /**
+   * A scalar value equal to the number of Wei to be transferred to the message call’s recipient or,
+   * in the case of contract creation, as an endowment to the newly created account
+   *
+   * @return value equal to the number of Wei to be transferred
+   */
+  Quantity getValue();
+
+  /**
+   * Value corresponding to the 'V' component of the signature of the transaction.
+   *
+   * @return the 'V' component of the signature
+   */
+  BigInteger getV();
+
+  /**
+   * Value corresponding to the 'R' component of the signature of the transaction.
+   *
+   * @return the 'R' component of the signature
+   */
+  BigInteger getR();
+
+  /**
+   * Value corresponding to the 'S' component of the signature of the transaction.
+   *
+   * @return the 'S' component of the signature
+   */
+  BigInteger getS();
+
+  /**
+   * The 160-bit address of the account sending the transaction, extracted from the v, r, s
+   * parameters.
+   *
+   * @return The address of the account that sent this transaction.
+   */
+  Address getSender();
+
+  /**
+   * The chainId, computed from the 'V' portion of the signature. Used for replay protection. If
+   * replay protection is not enabled this value will not be present.
+   *
+   * @return The chainId for transaction.
+   */
+  Optional<BigInteger> getChainId();
+
+  /**
+   * The data payload of this private transaction. e.g compiled smart contract code or encoded
+   * method data.
+   *
+   * @return the transaction payload
+   */
+  Bytes getPayload();
+
+  /**
+   * The public key of the sender of this private transaction.
+   *
+   * @return public key of the sender
+   */
+  Bytes getPrivateFrom();
+
+  /**
+   * The public key of the recipients of this private transaction.
+   *
+   * <p>Only present if no privacy group {@link #getPrivacyGroupId} is present.
+   *
+   * @return public keys of the recipients
+   */
+  Optional<List<Bytes>> getPrivateFor();
+
+  /**
+   * The identifier for the group of participants.
+   *
+   * <p>Only present if no private for {@link #getPrivateFor} is present.
+   *
+   * @return public keys of the recipients
+   */
+  Optional<Bytes> getPrivacyGroupId();
+
+  /**
+   * The type of privacy restriction. If restricted, the private transaction is only distributed to
+   * members. If unrestricted, the transaction is distributed to everyone but only decipherable by
+   * members.
+   *
+   * @return privacy restriction unrestricted/restricted
+   */
+  Restriction getRestriction();
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/PropagatedBlockContext.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/PropagatedBlockContext.java
index a14b29260d8..3387ca2fe76 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/PropagatedBlockContext.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/PropagatedBlockContext.java
@@ -17,22 +17,7 @@
 import org.apache.tuweni.units.bigints.UInt256;
 
 /** The minimum set of data for a PropagatedBlockContext. */
-public interface PropagatedBlockContext {
-
-  /**
-   * A {@link BlockHeader} object.
-   *
-   * @return A {@link BlockHeader}
-   */
-  BlockHeader getBlockHeader();
-
-  /**
-   * A {@link BlockHeader} object.
-   *
-   * @return A {@link BlockHeader}
-   */
-  BlockBody getBlockBody();
-
+public interface PropagatedBlockContext extends BlockContext {
   /**
    * A scalar value corresponding to the total difficulty.
    *
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/Restriction.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Restriction.java
similarity index 81%
rename from ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/Restriction.java
rename to plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Restriction.java
index 48507a813d0..fbe01a0b689 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/Restriction.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Restriction.java
@@ -12,15 +12,19 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.ethereum.privacy;
+package org.hyperledger.besu.plugin.data;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import org.apache.tuweni.bytes.Bytes;
 
+/** The enum Restriction. */
 public enum Restriction {
+  /** Restricted restriction. */
   RESTRICTED(Bytes.wrap("restricted".getBytes(UTF_8))),
+  /** Unrestricted restriction. */
   UNRESTRICTED(Bytes.wrap("unrestricted".getBytes(UTF_8))),
+  /** Unsupported restriction. */
   UNSUPPORTED(Bytes.EMPTY);
 
   private final Bytes bytes;
@@ -29,6 +33,11 @@ public enum Restriction {
     this.bytes = bytes;
   }
 
+  /**
+   * Gets bytes.
+   *
+   * @return the bytes
+   */
   public Bytes getBytes() {
     return bytes;
   }
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Signature.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Signature.java
new file mode 100644
index 00000000000..034581c6114
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Signature.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.data;
+
+import org.hyperledger.besu.plugin.Unstable;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** An interface for {@link Bytes} that also represents a signature */
+@Unstable
+public interface Signature extends Bytes {}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/SyncStatus.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/SyncStatus.java
index 2e9cb47c766..bfb4ae0e7cd 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/SyncStatus.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/SyncStatus.java
@@ -18,6 +18,7 @@
 
 import java.util.Optional;
 
+/** The interface Sync status. */
 public interface SyncStatus {
 
   /**
@@ -50,7 +51,7 @@ public interface SyncStatus {
   @Unstable
   default Optional<Long> getPulledStates() {
     return Optional.empty();
-  };
+  }
 
   /**
    * KnownStates is the number of states the node knows of so far, or empty if this is not known or
@@ -61,5 +62,5 @@ default Optional<Long> getPulledStates() {
   @Unstable
   default Optional<Long> getKnownStates() {
     return Optional.empty();
-  };
+  }
 }
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Transaction.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Transaction.java
index bd1cf286f2d..3d7c9f367e0 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Transaction.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Transaction.java
@@ -14,6 +14,9 @@
  */
 package org.hyperledger.besu.plugin.data;
 
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.Quantity;
 import org.hyperledger.besu.plugin.Unstable;
 
 import java.math.BigInteger;
@@ -53,16 +56,16 @@ public interface Transaction {
    *
    * @return the quantity of Wei per gas unit paid.
    */
-  Quantity getGasPrice();
+  Optional<? extends Quantity> getGasPrice();
 
   /**
    * A scalar value equal to the number of Wei to be paid on top of base fee, as specified in
    * EIP-1559.
    *
-   * @return the quantity of Wei for gas premium.
+   * @return the quantity of Wei for max fee per gas
    */
   @Unstable
-  default Optional<Quantity> getGasPremium() {
+  default Optional<? extends Quantity> getMaxPriorityFeePerGas() {
     return Optional.empty();
   }
 
@@ -72,7 +75,18 @@ default Optional<Quantity> getGasPremium() {
    * @return the quantity of Wei for fee cap.
    */
   @Unstable
-  default Optional<Quantity> getFeeCap() {
+  default Optional<? extends Quantity> getMaxFeePerGas() {
+    return Optional.empty();
+  }
+
+  /**
+   * A scalar value equal to the max number of Wei to be paid for data gas, as specified in
+   * EIP-4844.
+   *
+   * @return the quantity of Wei for fee per data gas.
+   */
+  @Unstable
+  default Optional<? extends Quantity> getMaxFeePerDataGas() {
     return Optional.empty();
   }
 
@@ -95,7 +109,7 @@ default Optional<Quantity> getFeeCap() {
 
   /**
    * A scalar value equal to the number of Wei to be transferred to the message call’s recipient or,
-   * in the case of contract creation, as an endowment to the newly created account
+   * in the case of contract creation, as an endowment to the newly created account.
    *
    * @return value equal to the number of Wei to be transferred
    */
@@ -109,16 +123,16 @@ default Optional<Quantity> getFeeCap() {
   BigInteger getV();
 
   /**
-   * Value corresponding to the 'V' component of the signature of the transaction.
+   * Value corresponding to the 'R' component of the signature of the transaction.
    *
-   * @return the 'V' component of the signature
+   * @return the 'R' component of the signature
    */
   BigInteger getR();
 
   /**
-   * Value corresponding to the 'V' component of the signature of the transaction.
+   * Value corresponding to the 'S' component of the signature of the transaction.
    *
-   * @return the 'V' component of the signature
+   * @return the 'S' component of the signature
    */
   BigInteger getS();
 
@@ -132,7 +146,7 @@ default Optional<Quantity> getFeeCap() {
 
   /**
    * The chainId, computed from the 'V' portion of the signature. Used for replay protection. If
-   * replay protection is not enabled this value will not be present.
+   * replay protection is not enabled, this value will not be present.
    *
    * @return The chainId for transaction.
    */
@@ -150,7 +164,7 @@ default Optional<Quantity> getFeeCap() {
   Optional<Bytes> getInit();
 
   /**
-   * An unlimited size byte array specifying theinput data of the message call.
+   * An unlimited size byte array specifying the input data of the message call.
    *
    * <p>Only present if this is a message call transaction, which is only true if {@link #getTo} is
    * present.
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/TransactionReceipt.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/TransactionReceipt.java
index 2931cac332b..c1894525b91 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/TransactionReceipt.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/TransactionReceipt.java
@@ -19,7 +19,7 @@
 
 import org.apache.tuweni.bytes.Bytes;
 
-/** A transaction receipt, containing information pertaining a transaction execution. */
+/** A transaction receipt, containing information pertaining to a transaction execution. */
 public interface TransactionReceipt {
   /**
    * Returns the total amount of gas consumed in the block after the transaction has been processed.
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/TransactionSelectionResult.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/TransactionSelectionResult.java
new file mode 100644
index 00000000000..73e31176f81
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/TransactionSelectionResult.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.plugin.data;
+
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ * Represent the result of the selection process of a candidate transaction, during the block
+ * creation phase.
+ */
+public class TransactionSelectionResult {
+
+  private enum Status {
+    SELECTED,
+    BLOCK_FULL(true, false),
+    BLOCK_OCCUPANCY_ABOVE_THRESHOLD(true, false),
+    INVALID_TRANSIENT(false, false),
+    INVALID(false, true);
+
+    private final boolean stop;
+    private final boolean discard;
+
+    Status() {
+      this.stop = false;
+      this.discard = false;
+    }
+
+    Status(final boolean stop, final boolean discard) {
+      this.stop = stop;
+      this.discard = discard;
+    }
+
+    @Override
+    public String toString() {
+      return name() + " (stop=" + stop + ", discard=" + discard + ")";
+    }
+  }
+
+  /** The transaction has been selected to be included in the new block */
+  public static final TransactionSelectionResult SELECTED =
+      new TransactionSelectionResult(Status.SELECTED);
+  /** The transaction has not been selected since the block is full. */
+  public static final TransactionSelectionResult BLOCK_FULL =
+      new TransactionSelectionResult(Status.BLOCK_FULL);
+  /**
+   * The transaction has not been selected since too large and the occupancy of the block is enough
+   * to stop the selection.
+   */
+  public static final TransactionSelectionResult BLOCK_OCCUPANCY_ABOVE_THRESHOLD =
+      new TransactionSelectionResult(Status.BLOCK_OCCUPANCY_ABOVE_THRESHOLD);
+  /**
+   * The transaction has not been selected since its gas limit is greater than the block remaining
+   * gas, but the selection should continue.
+   */
+  public static final TransactionSelectionResult TX_TOO_LARGE_FOR_REMAINING_GAS =
+      TransactionSelectionResult.invalidTransient("TX_TOO_LARGE_FOR_REMAINING_GAS");
+  /**
+   * The transaction has not been selected since its current price is below the configured min
+   * price, but the selection should continue.
+   */
+  public static final TransactionSelectionResult CURRENT_TX_PRICE_BELOW_MIN =
+      TransactionSelectionResult.invalidTransient("CURRENT_TX_PRICE_BELOW_MIN");
+  /**
+   * The transaction has not been selected since its data price is below the current network data
+   * price, but the selection should continue.
+   */
+  public static final TransactionSelectionResult DATA_PRICE_BELOW_CURRENT_MIN =
+      TransactionSelectionResult.invalidTransient("DATA_PRICE_BELOW_CURRENT_MIN");
+
+  private final Status status;
+  private final Optional<String> maybeInvalidReason;
+
+  private TransactionSelectionResult(final Status status) {
+    this(status, null);
+  }
+
+  private TransactionSelectionResult(final Status status, final String invalidReason) {
+    this.status = status;
+    this.maybeInvalidReason = Optional.ofNullable(invalidReason);
+  }
+
+  /**
+   * Return a selection result that identify the candidate transaction as temporarily invalid, this
+   * means that the transaction could become valid at a later time.
+   *
+   * @param invalidReason the reason why transaction is invalid
+   * @return the selection result
+   */
+  public static TransactionSelectionResult invalidTransient(final String invalidReason) {
+    return new TransactionSelectionResult(Status.INVALID_TRANSIENT, invalidReason);
+  }
+
+  /**
+   * Return a selection result that identify the candidate transaction as permanently invalid, this
+   * means that it could be removed safely from the transaction pool.
+   *
+   * @param invalidReason the reason why transaction is invalid
+   * @return the selection result
+   */
+  public static TransactionSelectionResult invalid(final String invalidReason) {
+    return new TransactionSelectionResult(Status.INVALID, invalidReason);
+  }
+
+  /**
+   * Is the block creation done and the selection process should stop?
+   *
+   * @return true if the selection process should stop, false otherwise
+   */
+  public boolean stop() {
+    return status.stop;
+  }
+
+  /**
+   * Should the candidate transaction removed from the transaction pool?
+   *
+   * @return true if the candidate transaction should be removed from transaction pool, false
+   *     otherwise
+   */
+  public boolean discard() {
+    return status.discard;
+  }
+
+  /**
+   * Is the candidate transaction selected for block inclusion?
+   *
+   * @return true if the candidate transaction is included in the new block, false otherwise
+   */
+  public boolean selected() {
+    return Status.SELECTED.equals(status);
+  }
+
+  @Override
+  public String toString() {
+    return status.name() + maybeInvalidReason.map(ir -> "(" + ir + ")").orElse("");
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    final TransactionSelectionResult that = (TransactionSelectionResult) o;
+    return status == that.status && Objects.equals(maybeInvalidReason, that.maybeInvalidReason);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(status, maybeInvalidReason);
+  }
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/TransactionType.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/TransactionType.java
index b5c428c5fb7..10b8a2a4cc0 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/TransactionType.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/TransactionType.java
@@ -14,9 +14,26 @@
  */
 package org.hyperledger.besu.plugin.data;
 
+import java.util.Arrays;
+import java.util.EnumSet;
+import java.util.Set;
+
+/** The enum Transaction type. */
 public enum TransactionType {
-  FRONTIER(0xf8 /* doesn't end up being used as we don't serialize legacy txs with their type */),
-  EIP1559(0x3 /* placeholder value until we know what the real type byte will be */);
+  /** The Frontier. */
+  FRONTIER(0xf8 /* this is serialized as 0x0 in TransactionCompleteResult */),
+  /** Access list transaction type. */
+  ACCESS_LIST(0x01),
+  /** Eip1559 transaction type. */
+  EIP1559(0x02),
+  /** Blob transaction type. */
+  BLOB(0x03);
+
+  private static final Set<TransactionType> ACCESS_LIST_SUPPORTED_TRANSACTION_TYPES =
+      Set.of(ACCESS_LIST, EIP1559, BLOB);
+
+  private static final EnumSet<TransactionType> LEGACY_FEE_MARKET_TRANSACTION_TYPES =
+      EnumSet.of(TransactionType.FRONTIER, TransactionType.ACCESS_LIST);
 
   private final int typeValue;
 
@@ -24,20 +41,77 @@ public enum TransactionType {
     this.typeValue = typeValue;
   }
 
-  public int getSerializedType() {
-    return this.typeValue;
+  /**
+   * Gets serialized type.
+   *
+   * @return the serialized type
+   */
+  public byte getSerializedType() {
+    return (byte) this.typeValue;
   }
 
+  /**
+   * Compare to serialized type.
+   *
+   * @param b the byte value
+   * @return the int result of comparison
+   */
+  public int compareTo(final Byte b) {
+    return Byte.valueOf(getSerializedType()).compareTo(b);
+  }
+
+  /**
+   * Convert TransactionType from int serialized type value.
+   *
+   * @param serializedTypeValue the serialized type value
+   * @return the transaction type
+   */
   public static TransactionType of(final int serializedTypeValue) {
-    if (serializedTypeValue >= 0xc0 && serializedTypeValue <= 0xfe) {
-      return FRONTIER;
-    }
-    for (TransactionType transactionType : TransactionType.values()) {
-      if (transactionType.typeValue == serializedTypeValue) {
-        return transactionType;
-      }
-    }
-    throw new IllegalArgumentException(
-        String.format("Unsupported transaction type %x", serializedTypeValue));
+    return Arrays.stream(
+            new TransactionType[] {
+              TransactionType.FRONTIER, TransactionType.ACCESS_LIST, TransactionType.EIP1559
+            })
+        .filter(transactionType -> transactionType.typeValue == serializedTypeValue)
+        .findFirst()
+        .orElseThrow(
+            () ->
+                new IllegalArgumentException(
+                    String.format("Unsupported transaction type %x", serializedTypeValue)));
+  }
+
+  /**
+   * Does transaction type support access list.
+   *
+   * @return the boolean
+   */
+  public boolean supportsAccessList() {
+    return ACCESS_LIST_SUPPORTED_TRANSACTION_TYPES.contains(this);
+  }
+
+  /**
+   * Does transaction type support EIP-1559 fee market.
+   *
+   * @return the boolean
+   */
+  public boolean supports1559FeeMarket() {
+    return !LEGACY_FEE_MARKET_TRANSACTION_TYPES.contains(this);
+  }
+
+  /**
+   * Does transaction type require chain id.
+   *
+   * @return the boolean
+   */
+  public boolean requiresChainId() {
+    return !this.equals(FRONTIER);
+  }
+
+  /**
+   * Does transaction type support data blobs.
+   *
+   * @return the boolean
+   */
+  public boolean supportsBlob() {
+    return this.equals(BLOB);
   }
 }
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/UnsignedPrivateMarkerTransaction.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/UnsignedPrivateMarkerTransaction.java
new file mode 100644
index 00000000000..6528eed7e06
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/UnsignedPrivateMarkerTransaction.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.data;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Quantity;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** The interface Unsigned private marker transaction. */
+public interface UnsignedPrivateMarkerTransaction {
+
+  /**
+   * Gets type.
+   *
+   * @return the type
+   */
+  TransactionType getType();
+
+  /**
+   * Gets nonce.
+   *
+   * @return the nonce
+   */
+  long getNonce();
+
+  /**
+   * Gets gas price.
+   *
+   * @return the gas price
+   */
+  Optional<? extends Quantity> getGasPrice();
+
+  /**
+   * Gets gas limit.
+   *
+   * @return the gas limit
+   */
+  long getGasLimit();
+
+  /**
+   * Gets to address.
+   *
+   * @return the to address
+   */
+  Optional<? extends Address> getTo();
+
+  /**
+   * Gets value.
+   *
+   * @return the value
+   */
+  Quantity getValue();
+
+  /**
+   * Gets payload.
+   *
+   * @return the payload
+   */
+  Bytes getPayload();
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Withdrawal.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Withdrawal.java
new file mode 100644
index 00000000000..ab4594eb308
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/data/Withdrawal.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.data;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Quantity;
+
+import org.apache.tuweni.units.bigints.UInt64;
+
+/**
+ * A withdrawal is a system-level operation to support validator withdrawals that are pushed from
+ * the beacon chain to EVM.
+ */
+public interface Withdrawal {
+
+  /**
+   * A monotonically increasing index, starting from 0 that increments by 1 per withdrawal to
+   * uniquely identify each withdrawal
+   *
+   * @return withdrawal index
+   */
+  UInt64 getIndex();
+
+  /**
+   * Validator index of the validator on the consensus layer the withdrawal corresponds to
+   *
+   * @return validator index
+   */
+  UInt64 getValidatorIndex();
+
+  /**
+   * Recipient for the ether to be withdrawn to
+   *
+   * @return recipient address
+   */
+  Address getAddress();
+
+  /**
+   * Amount of ether to be withdrawn and credited to the recipient address
+   *
+   * @return withdrawn ether amount
+   */
+  Quantity getAmount();
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/BesuConfiguration.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/BesuConfiguration.java
index 05ef88dfecf..9f830162ecb 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/BesuConfiguration.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/BesuConfiguration.java
@@ -19,7 +19,7 @@
 import java.nio.file.Path;
 
 /** Generally useful configuration provided by Besu. */
-public interface BesuConfiguration {
+public interface BesuConfiguration extends BesuService {
 
   /**
    * Location of the working directory of the storage in the file system running the client.
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/BesuEvents.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/BesuEvents.java
index eabe0c3d364..e484d947561 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/BesuEvents.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/BesuEvents.java
@@ -14,8 +14,8 @@
  */
 package org.hyperledger.besu.plugin.services;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.plugin.data.AddedBlockContext;
-import org.hyperledger.besu.plugin.data.Address;
 import org.hyperledger.besu.plugin.data.LogWithMetadata;
 import org.hyperledger.besu.plugin.data.PropagatedBlockContext;
 import org.hyperledger.besu.plugin.data.SyncStatus;
@@ -44,7 +44,7 @@
  *   <li><b>SynchronizerStatus </b> - Fired when the status of the synchronizer changes.
  * </ul>
  */
-public interface BesuEvents {
+public interface BesuEvents extends BesuService {
 
   /**
    * Add a listener watching new blocks propagated.
@@ -236,4 +236,27 @@ interface LogListener {
      */
     void onLogEmitted(LogWithMetadata logWithMetadata);
   }
+
+  /** The interface TTD reached listener. */
+  interface TTDReachedListener {
+
+    /**
+     * Emitted when Total Terminal Difficulty is reached on a chain and dependent merge
+     * functionality should trigger.
+     *
+     * @param reached is true when we reached TTD, can be potentially false in case we reorg under
+     *     TTD
+     */
+    void onTTDReached(boolean reached);
+  }
+
+  /** The interface Initial sync completion listener. */
+  interface InitialSyncCompletionListener {
+
+    /** Emitted when initial sync finishes */
+    void onInitialSyncCompleted();
+
+    /** Emitted when initial sync restarts */
+    void onInitialSyncRestart();
+  }
 }
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/BesuService.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/BesuService.java
new file mode 100644
index 00000000000..19b48d0a45b
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/BesuService.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.plugin.services;
+
+import org.hyperledger.besu.plugin.BesuContext;
+
+/**
+ * All services that can be resolved via {@link BesuContext#getService(Class)} must implement {@link
+ * BesuService}
+ */
+public interface BesuService {}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/BlockchainService.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/BlockchainService.java
new file mode 100644
index 00000000000..e9356ae76ef
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/BlockchainService.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services;
+
+import org.hyperledger.besu.plugin.Unstable;
+import org.hyperledger.besu.plugin.data.BlockContext;
+
+import java.util.Optional;
+
+/** A service that plugins can use to query blocks by number */
+@Unstable
+public interface BlockchainService extends BesuService {
+  /**
+   * Gets block by number
+   *
+   * @param number the block number
+   * @return the BlockContext
+   */
+  Optional<BlockContext> getBlockByNumber(final long number);
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/MetricsSystem.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/MetricsSystem.java
index 96579a33390..a72eb182b08 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/MetricsSystem.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/MetricsSystem.java
@@ -15,6 +15,7 @@
 package org.hyperledger.besu.plugin.services;
 
 import org.hyperledger.besu.plugin.services.metrics.Counter;
+import org.hyperledger.besu.plugin.services.metrics.LabelledGauge;
 import org.hyperledger.besu.plugin.services.metrics.LabelledMetric;
 import org.hyperledger.besu.plugin.services.metrics.MetricCategory;
 import org.hyperledger.besu.plugin.services.metrics.OperationTimer;
@@ -24,7 +25,7 @@
 import java.util.function.LongSupplier;
 
 /** An interface for creating various Metrics components. */
-public interface MetricsSystem {
+public interface MetricsSystem extends BesuService {
 
   /**
    * Creates a Counter.
@@ -51,6 +52,18 @@ default Counter createCounter(
   LabelledMetric<Counter> createLabelledCounter(
       MetricCategory category, String name, String help, String... labelNames);
 
+  /**
+   * Creates a Gauge with assigned labels.
+   *
+   * @param category The {@link MetricCategory} this gauge is assigned to.
+   * @param name A name for this metric.
+   * @param help A human readable description of the metric.
+   * @param labelNames An array of labels to assign to the Gauge.
+   * @return The created LabelledGauge instance.
+   */
+  LabelledGauge createLabelledGauge(
+      MetricCategory category, String name, String help, String... labelNames);
+
   /**
    * Creates a Timer.
    *
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/PermissioningService.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/PermissioningService.java
new file mode 100644
index 00000000000..a9fd6785050
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/PermissioningService.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services;
+
+import org.hyperledger.besu.plugin.services.permissioning.NodeConnectionPermissioningProvider;
+import org.hyperledger.besu.plugin.services.permissioning.NodeMessagePermissioningProvider;
+
+/**
+ * This service allows plugins to decide who you should connect to and what you should send them.
+ *
+ * <p>Currently, there are two hooks available: connection permissioning and message permissioning.
+ *
+ * <ul>
+ *   <li><b>Connection permissioning</b> - checks if inbound and outbound connections to peers are
+ *       permitted. {@link NodeConnectionPermissioningProvider}
+ *   <li><b>Message permissioning</b> - checks if a devp2p message can be sent to a peer. {@link
+ *       NodeMessagePermissioningProvider}
+ * </ul>
+ */
+public interface PermissioningService extends BesuService {
+
+  /**
+   * Registers a callback to allow the interception of a peer connection request
+   *
+   * @param provider The provider to register
+   */
+  void registerNodePermissioningProvider(NodeConnectionPermissioningProvider provider);
+
+  /**
+   * Registers a callback to allow the interception of a devp2p message sending request
+   *
+   * @param provider The provider to register
+   */
+  void registerNodeMessagePermissioningProvider(NodeMessagePermissioningProvider provider);
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/PicoCLIOptions.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/PicoCLIOptions.java
index b589665b396..ad9e9e1372c 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/PicoCLIOptions.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/PicoCLIOptions.java
@@ -25,7 +25,7 @@
  * href="https://github.com/hyperledger/besu/blob/master/CLI-STYLE-GUIDE.md">CLI-STYLE-GUIDE.md</a>
  * conventions.
  */
-public interface PicoCLIOptions {
+public interface PicoCLIOptions extends BesuService {
 
   /**
    * During the registration callback plugins can register CLI options that should be added to
diff --git a/besu/src/main/java/org/hyperledger/besu/services/PluginVersionsProvider.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/PluginVersionsProvider.java
similarity index 81%
rename from besu/src/main/java/org/hyperledger/besu/services/PluginVersionsProvider.java
rename to plugin-api/src/main/java/org/hyperledger/besu/plugin/services/PluginVersionsProvider.java
index a2a5fa75187..26604a6488f 100644
--- a/besu/src/main/java/org/hyperledger/besu/services/PluginVersionsProvider.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/PluginVersionsProvider.java
@@ -12,10 +12,17 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-package org.hyperledger.besu.services;
+
+package org.hyperledger.besu.plugin.services;
 
 import java.util.Collection;
 
+/** The interface Plugin versions provider. */
 public interface PluginVersionsProvider {
+  /**
+   * Gets plugin versions.
+   *
+   * @return the plugin versions
+   */
   Collection<String> getPluginVersions();
 }
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/PrivacyPluginService.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/PrivacyPluginService.java
new file mode 100644
index 00000000000..7652e3ade9a
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/PrivacyPluginService.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services;
+
+import org.hyperledger.besu.plugin.services.privacy.PrivacyGroupAuthProvider;
+import org.hyperledger.besu.plugin.services.privacy.PrivacyGroupGenesisProvider;
+import org.hyperledger.besu.plugin.services.privacy.PrivacyPluginPayloadProvider;
+import org.hyperledger.besu.plugin.services.privacy.PrivateMarkerTransactionFactory;
+
+/**
+ * A service that plugins can use to define how private transactions should be handled. <br>
+ * <br>
+ * You must register a {@link PrivacyPluginPayloadProvider} when using this plugin and can
+ * optionally register a {@link PrivateMarkerTransactionFactory} and a {@link
+ * PrivacyGroupGenesisProvider}*
+ */
+public interface PrivacyPluginService extends BesuService {
+
+  /**
+   * Register a provider to use when handling privacy marker transactions.
+   *
+   * @param privacyPluginPayloadProvider the provider to use for the privacy marker payload
+   */
+  void setPayloadProvider(PrivacyPluginPayloadProvider privacyPluginPayloadProvider);
+
+  /**
+   * Gets payload provider.
+   *
+   * @return the payload provider
+   */
+  PrivacyPluginPayloadProvider getPayloadProvider();
+
+  /**
+   * Register a factory to specify your own method for signing and serializing privacy marker
+   * transactions.
+   *
+   * @param privateMarkerTransactionFactory the factory to use to build the privacy marker
+   *     transaction
+   */
+  void setPrivateMarkerTransactionFactory(
+      PrivateMarkerTransactionFactory privateMarkerTransactionFactory);
+
+  /**
+   * Gets private marker transaction factory.
+   *
+   * @return the private marker transaction factory
+   */
+  PrivateMarkerTransactionFactory getPrivateMarkerTransactionFactory();
+
+  /**
+   * Register a provider to use when auth requests for a multi-tenant environment. If you are not
+   * using a multi-tenant environment you always return true.
+   *
+   * @param privacyGroupAuthProvider the provider to use to determine authz
+   */
+  void setPrivacyGroupAuthProvider(PrivacyGroupAuthProvider privacyGroupAuthProvider);
+
+  /**
+   * Gets privacy group auth provider.
+   *
+   * @return the privacy group auth provider
+   */
+  PrivacyGroupAuthProvider getPrivacyGroupAuthProvider();
+
+  /**
+   * Register a provider for initialising private state genesis
+   *
+   * @param privacyGroupAuthProvider the provider for the initial private state
+   */
+  void setPrivacyGroupGenesisProvider(PrivacyGroupGenesisProvider privacyGroupAuthProvider);
+
+  /**
+   * Gets privacy group genesis provider.
+   *
+   * @return the privacy group genesis provider
+   */
+  PrivacyGroupGenesisProvider getPrivacyGroupGenesisProvider();
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/RpcEndpointService.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/RpcEndpointService.java
new file mode 100644
index 00000000000..73f43a1017a
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/RpcEndpointService.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services;
+
+import org.hyperledger.besu.plugin.services.rpc.PluginRpcRequest;
+
+import java.util.function.Function;
+
+/**
+ * This service allows you to add functions exposed via RPC endpoints.
+ *
+ * <p>This service will be available during the registration callback and must be used during the
+ * registration callback. RPC endpoints are configured prior to the start callback and all endpoints
+ * connected. No endpoint will actually be called prior to the start callback so initialization
+ * unrelated to the callback registration can also be done at that time.
+ */
+public interface RpcEndpointService extends BesuService {
+
+  /**
+   * Register a function as an RPC endpoint exposed via JSON-RPC.
+   *
+   * <p>The mechanism is a Java function that takes a list of Strings and returns any Java object,
+   * registered in a specific namespace with a function name.
+   *
+   * <p>The resulting endpoint is the {@code namespace} and the {@code functionName} concatenated
+   * with an underscore to create the JSON-RPC method name.
+   *
+   * <p>The function takes a {@link PluginRpcRequest} which contains a list of the inputs expressed
+   * entirely as strings. Javascript numbers are converted to strings via their toString method, and
+   * complex input objects are not supported.
+   *
+   * <p>The output is a Java object, primitive, or array that will be inspected via <a
+   * href="https://github.com/FasterXML/jackson-databind">Jackson databind</a>. In general if
+   * JavaBeans naming patterns are followed those names will be reflected in the returned JSON
+   * object. If the method throws an exception the return is an error with an INTERNAL_ERROR
+   * treatment.
+   *
+   * @param namespace The namespace of the method, must be alphanumeric.
+   * @param functionName The name of the function, must be alphanumeric.
+   * @param function The function itself.
+   * @param <T> specified type of return object
+   */
+  <T> void registerRPCEndpoint(
+      String namespace, String functionName, Function<PluginRpcRequest, T> function);
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/SecurityModuleService.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/SecurityModuleService.java
index 19ece30248c..790e791f314 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/SecurityModuleService.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/SecurityModuleService.java
@@ -25,7 +25,7 @@
  * operations that defer to specific provider (e.g. BouncyCastle).
  */
 @Unstable
-public interface SecurityModuleService {
+public interface SecurityModuleService extends BesuService {
 
   /**
    * Registers a provider of security modules.
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/StorageService.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/StorageService.java
index 07d26d7a24d..0d7d24573e1 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/StorageService.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/StorageService.java
@@ -23,7 +23,7 @@
 
 /** This service allows plugins to register as an available storage engine. */
 @Unstable
-public interface StorageService {
+public interface StorageService extends BesuService {
 
   /**
    * Registers a factory as available for creating key-value storage instances.
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/TraceService.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/TraceService.java
new file mode 100644
index 00000000000..d3b776043d0
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/TraceService.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services;
+
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.evm.tracing.OperationTracer;
+import org.hyperledger.besu.plugin.Unstable;
+
+/** The Trace service interface */
+@Unstable
+public interface TraceService extends BesuService {
+  /**
+   * Traces a block
+   *
+   * @param blockNumber the block number
+   * @param tracer the tracer (OperationTracer)
+   */
+  void traceBlock(long blockNumber, OperationTracer tracer);
+
+  /**
+   * Traces a block by hash
+   *
+   * @param hash the block hash
+   * @param tracer the tracer (OperationTracer)
+   */
+  void traceBlock(Hash hash, OperationTracer tracer);
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/TransactionSelectionService.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/TransactionSelectionService.java
new file mode 100644
index 00000000000..1a46e71f306
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/TransactionSelectionService.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.plugin.services;
+
+import org.hyperledger.besu.plugin.Unstable;
+import org.hyperledger.besu.plugin.services.txselection.TransactionSelectorFactory;
+
+import java.util.Optional;
+
+/** Transaction selection service interface */
+@Unstable
+public interface TransactionSelectionService extends BesuService {
+
+  /**
+   * Returns the (Optional) transaction selector factory
+   *
+   * @return the transaction selector factory
+   */
+  Optional<TransactionSelectorFactory> get();
+
+  /**
+   * Registers the transaction selector factory with the service
+   *
+   * @param transactionSelectorFactory transaction selector factory to be used
+   */
+  void registerTransactionSelectorFactory(TransactionSelectorFactory transactionSelectorFactory);
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/TrieLogService.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/TrieLogService.java
new file mode 100644
index 00000000000..f3180c6db14
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/TrieLogService.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.plugin.services;
+
+import org.hyperledger.besu.plugin.services.trielogs.TrieLogEvent;
+import org.hyperledger.besu.plugin.services.trielogs.TrieLogFactory;
+import org.hyperledger.besu.plugin.services.trielogs.TrieLogProvider;
+
+import java.util.List;
+
+/**
+ * A service interface for registering observers for trie log events.
+ *
+ * <p>Implementations must be thread-safe.
+ */
+public interface TrieLogService extends BesuService {
+
+  /**
+   * Provides list of observers to configure for trie log events.
+   *
+   * @return the list of observers to configure
+   */
+  List<TrieLogEvent.TrieLogObserver> getObservers();
+
+  /**
+   * Provide a TrieLogFactory implementation to use for serializing and deserializing TrieLogs.
+   *
+   * @return the TrieLogFactory implementation
+   */
+  TrieLogFactory getTrieLogFactory();
+
+  /**
+   * Configure a TrieLogProvider implementation to use for retrieving stored TrieLogs.
+   *
+   * @param provider the TrieLogProvider implementation
+   */
+  void configureTrieLogProvider(TrieLogProvider provider);
+
+  /**
+   * Retrieve the configured TrieLogProvider implementation.
+   *
+   * @return the TrieLogProvider implementation
+   */
+  TrieLogProvider getTrieLogProvider();
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/exception/PluginRpcEndpointException.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/exception/PluginRpcEndpointException.java
new file mode 100644
index 00000000000..9a38b891eb0
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/exception/PluginRpcEndpointException.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services.exception;
+
+/** Base exception class for problems encountered in the RpcEndpointService. */
+public class PluginRpcEndpointException extends RuntimeException {
+  /**
+   * Constructs a new PluginRpcEndpointException exception with the specified message.
+   *
+   * @param message the detail message (which is saved for later retrieval by the {@link
+   *     #getMessage()} method).
+   */
+  public PluginRpcEndpointException(final String message) {
+    super(message);
+  }
+
+  /**
+   * Constructs a new PluginRpcEndpointException exception with the specified message.
+   *
+   * @param message the detail message (which is saved for later retrieval by the {@link
+   *     #getMessage()} method).
+   * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method).
+   *     (A {@code null} value is permitted, and indicates that the cause is nonexistent or
+   *     unknown.)
+   */
+  public PluginRpcEndpointException(final String message, final Throwable cause) {
+    super(message, cause);
+  }
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/LabelledGauge.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/LabelledGauge.java
new file mode 100644
index 00000000000..724e31c58de
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/LabelledGauge.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services.metrics;
+
+import java.util.function.DoubleSupplier;
+
+/** The interface Labelled gauge. */
+public interface LabelledGauge {
+  /**
+   * Labels.
+   *
+   * @param valueSupplier the value supplier
+   * @param labelValues the label values
+   */
+  void labels(final DoubleSupplier valueSupplier, final String... labelValues);
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/MetricCategoryRegistry.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/MetricCategoryRegistry.java
index 19e83f3b200..d6e460aa2f6 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/MetricCategoryRegistry.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/MetricCategoryRegistry.java
@@ -14,13 +14,15 @@
  */
 package org.hyperledger.besu.plugin.services.metrics;
 
+import org.hyperledger.besu.plugin.services.BesuService;
+
 /**
  * Allow registration of {@link MetricCategory} instances so they are recognised by the metrics
  * system and can be enabled.
  *
  * <p>Categories must be registered during plugin initialisation.
  */
-public interface MetricCategoryRegistry {
+public interface MetricCategoryRegistry extends BesuService {
 
   /**
    * Registers a {@link MetricCategory}.
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/PoAMetricsService.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/PoAMetricsService.java
index 2e19254a058..390d42455bf 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/PoAMetricsService.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/metrics/PoAMetricsService.java
@@ -14,8 +14,9 @@
  */
 package org.hyperledger.besu.plugin.services.metrics;
 
-import org.hyperledger.besu.plugin.data.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.plugin.data.BlockHeader;
+import org.hyperledger.besu.plugin.services.BesuService;
 
 import java.util.Collection;
 
@@ -26,7 +27,7 @@
  *     org.hyperledger.besu.plugin.services.query.PoaQueryService}
  */
 @Deprecated
-public interface PoAMetricsService {
+public interface PoAMetricsService extends BesuService {
 
   /**
    * Retrieves the validators who have signed the latest block from the canonical chain.
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/permissioning/NodeConnectionPermissioningProvider.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/permissioning/NodeConnectionPermissioningProvider.java
new file mode 100644
index 00000000000..f9852fa9c69
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/permissioning/NodeConnectionPermissioningProvider.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services.permissioning;
+
+import org.hyperledger.besu.plugin.data.EnodeURL;
+
+/**
+ * Allows you to register a provider that will decide if a peer connection is permitted. <br>
+ * <br>
+ * A simple implementation can look like:
+ *
+ * <pre>{@code
+ * context
+ *    .getService(PermissioningService.class)
+ *    .get()
+ *    .registerNodePermissioningProvider((sourceEnode, destinationEnode) -> {
+ *        // Your logic here
+ *        return true;
+ *     });
+ * }</pre>
+ */
+@FunctionalInterface
+public interface NodeConnectionPermissioningProvider {
+  /**
+   * Can be used to intercept the initial connection to a peer. Note that once a connection is
+   * established it's bidirectional.
+   *
+   * @param sourceEnode the originator's enode
+   * @param destinationEnode the enode you are attempting to connect to
+   * @return if the connection is permitted
+   */
+  boolean isConnectionPermitted(final EnodeURL sourceEnode, final EnodeURL destinationEnode);
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/permissioning/NodeMessagePermissioningProvider.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/permissioning/NodeMessagePermissioningProvider.java
new file mode 100644
index 00000000000..dc6d8071fe1
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/permissioning/NodeMessagePermissioningProvider.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.plugin.services.permissioning;
+
+import org.hyperledger.besu.plugin.data.EnodeURL;
+
+/**
+ * Allows you to register a provider that will decide if a devp2p message is permitted. <br>
+ * <br>
+ * A simple implementation can look like:
+ *
+ * <pre>{@code
+ * context
+ *    .getService(PermissioningService.class)
+ *    .get()
+ *    .registerNodeMessagePermissioningProvider((destinationEnode, code) -> {
+ *        // Your logic here
+ *        return true;
+ *    });
+ * }</pre>
+ */
+@FunctionalInterface
+public interface NodeMessagePermissioningProvider {
+  /**
+   * Can be used to intercept messages before they are sent from besu. <br>
+   * <br>
+   * <b>Note: this will be called on every message!</b>
+   *
+   * @param destinationEnode the enode you are about to send to
+   * @param code devp2p code for the message
+   * @return if we can send the message to the peer
+   */
+  boolean isMessagePermitted(final EnodeURL destinationEnode, final int code);
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/privacy/PrivacyGroupAuthProvider.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/privacy/PrivacyGroupAuthProvider.java
new file mode 100644
index 00000000000..5e07f484808
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/privacy/PrivacyGroupAuthProvider.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services.privacy;
+
+import java.util.Optional;
+
+/**
+ * When in a multi-tenant environment you need to decided if an authz user can access a privacyGroup
+ */
+@FunctionalInterface
+public interface PrivacyGroupAuthProvider {
+  /**
+   * Should this privacyUserId be able to access this privacyGroupId at this blockNumber
+   *
+   * @param privacyGroupId the privacyGroupId
+   * @param privacyUserId the authz privacyUserId when in a multi-tenant environment
+   * @param blockNumber the block height it's happening at
+   * @return if the can access that privacyUserId
+   */
+  boolean canAccess(String privacyGroupId, String privacyUserId, Optional<Long> blockNumber);
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/privacy/PrivacyGroupGenesisProvider.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/privacy/PrivacyGroupGenesisProvider.java
new file mode 100644
index 00000000000..0f26e9b596c
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/privacy/PrivacyGroupGenesisProvider.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services.privacy;
+
+import org.hyperledger.besu.plugin.data.PrivacyGenesis;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** A way to initiate private state with a genesis */
+@FunctionalInterface
+public interface PrivacyGroupGenesisProvider {
+  /**
+   * Allows you to specify a custom private genesis to apply when initialising a privacy group
+   *
+   * @param privacyGroupId the privacyGroupId
+   * @param blockNumber the block height
+   * @return the privacy genesis to apply
+   */
+  PrivacyGenesis getPrivacyGenesis(Bytes privacyGroupId, long blockNumber);
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/privacy/PrivacyPluginPayloadProvider.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/privacy/PrivacyPluginPayloadProvider.java
new file mode 100644
index 00000000000..551ae3cd2f2
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/privacy/PrivacyPluginPayloadProvider.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services.privacy;
+
+import org.hyperledger.besu.plugin.data.PrivateTransaction;
+import org.hyperledger.besu.plugin.data.Transaction;
+
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/**
+ * Allows you to register a provider that will dictate how the payload of a privacy marker
+ * transaction is handled.
+ */
+public interface PrivacyPluginPayloadProvider {
+
+  /**
+   * Given a private transaction what information should be stored on chain in the payload of the
+   * privacy marker transaction? At it's simplest you could just serialize the privateTransaction
+   * using RLP. This method is called when the user has submitted a private transaction using
+   * `eea_sendRawTransaction`. If you do not know how to serialize the PrivateTransaction you should
+   * throw an exception so that an error is returned to the user.
+   *
+   * @param privateTransaction the initial private transaction
+   * @param privacyUserId the user id - only used in multi-tenant environments.
+   * @return the raw bytes of what should be stored in {@link Transaction#getPayload()}
+   */
+  Bytes generateMarkerPayload(PrivateTransaction privateTransaction, String privacyUserId);
+
+  /**
+   * When processing privacy marker transactions besu needs to know how to process them. The plugin
+   * must perform the deserialization steps required. If the node shouldn't have access to that
+   * transaction return Optional.empty().<br>
+   * <br>
+   * Note! Any exceptions thrown in this method with cause besu to crash and stop processing blocks
+   *
+   * @param transaction the privacy marker transaction
+   * @return The PrivateTransaction to apply to private world state.
+   */
+  Optional<PrivateTransaction> getPrivateTransactionFromPayload(Transaction transaction);
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/privacy/PrivateMarkerTransactionFactory.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/privacy/PrivateMarkerTransactionFactory.java
new file mode 100644
index 00000000000..cbb3a039f2c
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/privacy/PrivateMarkerTransactionFactory.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services.privacy;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.plugin.data.PrivateTransaction;
+import org.hyperledger.besu.plugin.data.UnsignedPrivateMarkerTransaction;
+
+import org.apache.tuweni.bytes.Bytes;
+
+/** Implement an instance of this for signing and serializing privacy marker transactions. */
+public interface PrivateMarkerTransactionFactory {
+
+  /**
+   * We need this from the plugin so that we can provide the correct nonce in {@link
+   * #create(UnsignedPrivateMarkerTransaction, PrivateTransaction, String)}
+   *
+   * @param privateTransaction the transaction about to be submitted to the transaction pool
+   * @param privacyUserId the authz privacyUserId when in a multi-tenant environment
+   * @return sender address
+   */
+  Address getSender(PrivateTransaction privateTransaction, String privacyUserId);
+
+  /**
+   * You need to return a raw signed transaction. This will be submitted directly into the
+   * transaction pool. You can use the information provided in {@link
+   * UnsignedPrivateMarkerTransaction} to sign and serialize the transaction or forge your own.
+   *
+   * @param unsignedPrivateMarkerTransaction the unsigned privacy marker transaction
+   * @param privateTransaction the original private transaction
+   * @param privacyUserId the authz privacyUserId when in a multi-tenant environment
+   * @return signed raw transaction
+   */
+  Bytes create(
+      UnsignedPrivateMarkerTransaction unsignedPrivateMarkerTransaction,
+      PrivateTransaction privateTransaction,
+      String privacyUserId);
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/query/BftQueryService.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/query/BftQueryService.java
new file mode 100644
index 00000000000..ce5aa9eaecb
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/query/BftQueryService.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services.query;
+
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.plugin.data.BlockHeader;
+
+import java.util.Collection;
+
+/** Allows for the BFT specific aspects of the block chain to be queried. */
+public interface BftQueryService extends PoaQueryService {
+
+  /**
+   * Extracts the round number from the supplied header and returns it to the caller.
+   *
+   * @param header the block header from which the round number is to be extracted
+   * @return The number of failed rounds executed prior to adding the block to the chain.
+   */
+  int getRoundNumberFrom(final BlockHeader header);
+
+  /**
+   * Extracts the collection of signers from the supplied block header and returns them to the
+   * caller.
+   *
+   * @param header the block header from which a list of signers is to be extracted
+   * @return The addresses of
+   */
+  Collection<Address> getSignersFrom(final BlockHeader header);
+
+  /**
+   * Returns the literal name of the BFT consensus mechanism is use (eg ibft or qbft), which forms
+   * the prefix for all BFT metrics.
+   *
+   * @return The name of the consensus mechanism being used by Besu
+   */
+  String getConsensusMechanismName();
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/query/IbftQueryService.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/query/IbftQueryService.java
index e8f5f0e8e39..be249ea5b87 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/query/IbftQueryService.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/query/IbftQueryService.java
@@ -14,12 +14,18 @@
  */
 package org.hyperledger.besu.plugin.services.query;
 
-import org.hyperledger.besu.plugin.data.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.plugin.data.BlockHeader;
 
 import java.util.Collection;
 
-/** Allows for the IBFT 2.0 specific aspects of the block chain to be queried. */
+/**
+ * Allows for the IBFT 2.0 specific aspects of the block chain to be queried.
+ *
+ * @deprecated This interface has been replaced by {@link
+ *     org.hyperledger.besu.plugin.services.query.BftQueryService}
+ */
+@Deprecated
 public interface IbftQueryService extends PoaQueryService {
 
   /**
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/query/PoaQueryService.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/query/PoaQueryService.java
index 8a790b98921..be958894ded 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/query/PoaQueryService.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/query/PoaQueryService.java
@@ -14,13 +14,14 @@
  */
 package org.hyperledger.besu.plugin.services.query;
 
-import org.hyperledger.besu.plugin.data.Address;
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.plugin.data.BlockHeader;
+import org.hyperledger.besu.plugin.services.BesuService;
 
 import java.util.Collection;
 
 /** Provides methods to query the status of a Proof of Authority (PoA) network. */
-public interface PoaQueryService {
+public interface PoaQueryService extends BesuService {
 
   /**
    * Retrieves the validators specified in the latest block from the canonical chain.
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/rpc/PluginRpcRequest.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/rpc/PluginRpcRequest.java
new file mode 100644
index 00000000000..c360f35edc1
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/rpc/PluginRpcRequest.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services.rpc;
+
+/** The interface Plugin rpc request. */
+public interface PluginRpcRequest {
+  /**
+   * Get params.
+   *
+   * @return the object [ ]
+   */
+  Object[] getParams();
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/securitymodule/SecurityModuleException.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/securitymodule/SecurityModuleException.java
index d52822c187d..fc219a18081 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/securitymodule/SecurityModuleException.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/securitymodule/SecurityModuleException.java
@@ -16,20 +16,45 @@
 
 /** SecurityModuleException can be thrown by operations of SecurityModule */
 public class SecurityModuleException extends RuntimeException {
+  /** Instantiates a new Security module exception. */
   public SecurityModuleException() {}
 
+  /**
+   * Instantiates a new Security module exception.
+   *
+   * @param message the message
+   */
   public SecurityModuleException(final String message) {
     super(message);
   }
 
+  /**
+   * Instantiates a new Security module exception.
+   *
+   * @param message the message
+   * @param cause the cause
+   */
   public SecurityModuleException(final String message, final Throwable cause) {
     super(message, cause);
   }
 
+  /**
+   * Instantiates a new Security module exception.
+   *
+   * @param cause the cause
+   */
   public SecurityModuleException(final Throwable cause) {
     super(cause);
   }
 
+  /**
+   * Instantiates a new Security module exception.
+   *
+   * @param message the message
+   * @param cause the cause
+   * @param enableSuppression the enable suppression
+   * @param writableStackTrace the writable stack trace
+   */
   public SecurityModuleException(
       final String message,
       final Throwable cause,
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/securitymodule/data/Signature.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/securitymodule/data/Signature.java
index 4aa67bc9c82..970795f10a2 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/securitymodule/data/Signature.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/securitymodule/data/Signature.java
@@ -21,7 +21,17 @@
 /** Represents R and S component of a Signature obtained through sign function */
 @Unstable
 public interface Signature {
+  /**
+   * Gets R.
+   *
+   * @return the R
+   */
   BigInteger getR();
 
+  /**
+   * Gets S.
+   *
+   * @return the S
+   */
   BigInteger getS();
 }
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/KeyValueStorage.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/KeyValueStorage.java
index bf6cfa2b5c1..6ccdb3b0a24 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/KeyValueStorage.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/KeyValueStorage.java
@@ -23,6 +23,8 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
+import org.apache.commons.lang3.tuple.Pair;
+
 /**
  * Responsible for storing values against keys.
  *
@@ -61,6 +63,25 @@ public interface KeyValueStorage extends Closeable {
    */
   Optional<byte[]> get(byte[] key) throws StorageException;
 
+  /**
+   * Returns a stream of all keys and values.
+   *
+   * @return A stream of all keys and values in storage.
+   * @throws StorageException problem encountered during the retrieval attempt.
+   */
+  Stream<Pair<byte[], byte[]>> stream() throws StorageException;
+
+  /**
+   * Returns a stream of key-value pairs starting from the specified key. This method is used to
+   * retrieve a stream of data from the storage, starting from the given key. If no data is
+   * available from the specified key onwards, an empty stream is returned.
+   *
+   * @param startKey The key from which the stream should start.
+   * @return A stream of key-value pairs starting from the specified key.
+   * @throws StorageException If an error occurs while accessing the storage.
+   */
+  Stream<Pair<byte[], byte[]>> streamFromKey(final byte[] startKey);
+
   /**
    * Returns a stream of all keys.
    *
@@ -74,9 +95,9 @@ public interface KeyValueStorage extends Closeable {
    * the underlying storage. Do nothing otherwise.
    *
    * @param key The key to delete.
-   * @throws StorageException any problem encountered during the deletion attempt.
    * @return false if the lock on the underlying storage could not be instantly acquired, true
    *     otherwise
+   * @throws StorageException any problem encountered during the deletion attempt.
    */
   boolean tryDelete(byte[] key) throws StorageException;
 
@@ -89,6 +110,14 @@ public interface KeyValueStorage extends Closeable {
    */
   Set<byte[]> getAllKeysThat(Predicate<byte[]> returnCondition);
 
+  /**
+   * Gets all values from keys that matches the predicate.
+   *
+   * @param returnCondition the return condition
+   * @return the all values from keys that
+   */
+  Set<byte[]> getAllValuesFromKeysThat(final Predicate<byte[]> returnCondition);
+
   /**
    * Begins a fresh transaction, for sequencing operations for later atomic execution.
    *
@@ -96,4 +125,11 @@ public interface KeyValueStorage extends Closeable {
    * @throws StorageException problem encountered when starting a new transaction.
    */
   KeyValueStorageTransaction startTransaction() throws StorageException;
+
+  /**
+   * Return Whether the underlying storage is closed.
+   *
+   * @return boolean indicating whether the storage is closed.
+   */
+  boolean isClosed();
 }
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/KeyValueStorageFactory.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/KeyValueStorageFactory.java
index 85a30e6c2a1..53f6c0688aa 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/KeyValueStorageFactory.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/KeyValueStorageFactory.java
@@ -64,4 +64,14 @@ KeyValueStorage create(
    *     <code>false</code> when keys of different segments can collide with each other.
    */
   boolean isSegmentIsolationSupported();
+
+  /**
+   * Whether storage supports repeatable reads AKA snapshots.
+   *
+   * @return <code>true</code> when the created storage supports snapshots <code>false</code> when
+   *     it does not.
+   */
+  default boolean isSnapshotIsolationSupported() {
+    return false;
+  }
 }
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/PrivacyKeyValueStorageFactory.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/PrivacyKeyValueStorageFactory.java
index dc2194e3e50..b8d35a1ad7b 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/PrivacyKeyValueStorageFactory.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/PrivacyKeyValueStorageFactory.java
@@ -16,6 +16,7 @@
 
 import org.hyperledger.besu.plugin.Unstable;
 
+/** The interface Privacy key value storage factory. */
 @Unstable
 public interface PrivacyKeyValueStorageFactory extends KeyValueStorageFactory {
   /**
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/SegmentIdentifier.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/SegmentIdentifier.java
index 9daf97fdeb9..c535966876f 100644
--- a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/SegmentIdentifier.java
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/SegmentIdentifier.java
@@ -47,4 +47,13 @@ public interface SegmentIdentifier {
   default boolean includeInDatabaseVersion(final int version) {
     return true;
   }
+
+  /**
+   * Define if this segment contains data that is never updated, but only added and optionally
+   * deleted. Example is append only data like the blockchain. This information can be used by the
+   * underlying implementation to apply specific optimization for this use case.
+   *
+   * @return true if the segment contains only static data
+   */
+  boolean containsStaticData();
 }
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/SnappableKeyValueStorage.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/SnappableKeyValueStorage.java
new file mode 100644
index 00000000000..8ef5f95cdda
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/SnappableKeyValueStorage.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.plugin.services.storage;
+
+/** The interface Snappable key value storage. */
+public interface SnappableKeyValueStorage extends KeyValueStorage {
+
+  /**
+   * Take snapshot.
+   *
+   * @return the snapped key value storage
+   */
+  SnappedKeyValueStorage takeSnapshot();
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/SnappedKeyValueStorage.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/SnappedKeyValueStorage.java
new file mode 100644
index 00000000000..032563e9258
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/storage/SnappedKeyValueStorage.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.plugin.services.storage;
+
+/** The interface Snapped key value storage. */
+public interface SnappedKeyValueStorage extends KeyValueStorage {
+
+  /**
+   * Gets snapshot transaction.
+   *
+   * @return the snapshot transaction
+   */
+  KeyValueStorageTransaction getSnapshotTransaction();
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/trielogs/TrieLog.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/trielogs/TrieLog.java
new file mode 100644
index 00000000000..1a763ade96e
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/trielogs/TrieLog.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services.trielogs;
+
+import org.hyperledger.besu.datatypes.AccountValue;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.Hash;
+import org.hyperledger.besu.datatypes.StorageSlotKey;
+
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/**
+ * An interface for interacting with TrieLog objects, which represent changes to accounts, code, and
+ * storage in a blockchain state trie.
+ */
+public interface TrieLog {
+
+  /**
+   * Gets the block hash associated with this TrieLog.
+   *
+   * @return the block hash
+   */
+  Hash getBlockHash();
+
+  /**
+   * Gets the block number associated with this TrieLog, if available.
+   *
+   * @return an Optional containing the block number if available, otherwise an empty Optional
+   */
+  Optional<Long> getBlockNumber();
+
+  /** Freezes the TrieLog to prevent further modifications. */
+  void freeze();
+
+  /**
+   * Gets a map of addresses to their account value changes.
+   *
+   * @param <U> the type of LogTuple representing the account value changes
+   * @return a map of addresses to their account value changes
+   */
+  <U extends LogTuple<AccountValue>> Map<Address, U> getAccountChanges();
+
+  /**
+   * Gets a map of addresses to their code changes.
+   *
+   * @param <U> the type of LogTuple representing the code changes
+   * @return a map of addresses to their code changes
+   */
+  <U extends LogTuple<Bytes>> Map<Address, U> getCodeChanges();
+
+  /**
+   * Gets a map of addresses to their storage changes.
+   *
+   * @param <U> the type of LogTuple representing the storage changes
+   * @return a map of addresses to their storage changes
+   */
+  <U extends LogTuple<UInt256>> Map<Address, Map<StorageSlotKey, U>> getStorageChanges();
+
+  /**
+   * Gets the storage changes for a specific address.
+   *
+   * @param address the address to get the storage changes for
+   * @param <U> the type of LogTuple representing the storage changes
+   * @return a map of storage slot keys to their changes
+   */
+  <U extends LogTuple<UInt256>> Map<StorageSlotKey, U> getStorageChanges(final Address address);
+
+  /**
+   * Gets the prior code for a specific address, if available.
+   *
+   * @param address the address to get the prior code for
+   * @return an Optional containing the prior code if available, otherwise an empty Optional
+   */
+  Optional<Bytes> getPriorCode(final Address address);
+
+  /**
+   * Gets the code for a specific address, if available.
+   *
+   * @param address the address to get the code for
+   * @return an Optional containing the code if available, otherwise an empty Optional
+   */
+  Optional<Bytes> getCode(final Address address);
+
+  /**
+   * Gets the prior storage value for a specific address and storage slot key, if available.
+   *
+   * @param address the address to get the prior storage value for
+   * @param storageSlotKey the storage slot key to get the prior storage value for
+   * @return an Optional containing the prior storage value if available, otherwise an empty
+   *     Optional
+   */
+  Optional<UInt256> getPriorStorageByStorageSlotKey(
+      final Address address, final StorageSlotKey storageSlotKey);
+
+  /**
+   * Gets the storage value for a specific address and storage slot key, if available.
+   *
+   * @param address the address to get the storage value for
+   * @param storageSlotKey the storage slot key to get the storage value for
+   * @return an Optional containing the storage value if available, otherwise an empty Optional
+   */
+  Optional<UInt256> getStorageByStorageSlotKey(
+      final Address address, final StorageSlotKey storageSlotKey);
+
+  /**
+   * Gets the prior account value for a specific address, if available.
+   *
+   * @param address the address to get the prior account value for
+   * @return an Optional containing the prior account value if available, otherwise an empty
+   *     Optional
+   */
+  Optional<? extends AccountValue> getPriorAccount(final Address address);
+  /**
+   * Gets the account value for a specific address, if available.
+   *
+   * @param address the address to get the account value for
+   * @return an Optional containing the account value if available, otherwise an empty Optional
+   */
+  Optional<? extends AccountValue> getAccount(final Address address);
+
+  /**
+   * An interface representing a tuple of prior and updated values for a specific type T in a log.
+   * The interface also provides methods to check if the values are unchanged or cleared.
+   *
+   * @param <T> the type of values stored in the log tuple
+   */
+  public interface LogTuple<T> {
+
+    /**
+     * Gets the prior value of the tuple.
+     *
+     * @return the prior value of type T
+     */
+    T getPrior();
+
+    /**
+     * Gets the updated value of the tuple.
+     *
+     * @return the updated value of type T
+     */
+    T getUpdated();
+
+    /**
+     * Checks if the prior and updated values are equal.
+     *
+     * @return true if the prior and updated values are equal, false otherwise
+     */
+    default boolean isUnchanged() {
+      return Objects.equals(getUpdated(), getPrior());
+    }
+
+    /**
+     * Checks if the updated value represents a cleared state.
+     *
+     * @return true if the updated value is cleared, false otherwise
+     */
+    boolean isCleared();
+  }
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/trielogs/TrieLogAccumulator.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/trielogs/TrieLogAccumulator.java
new file mode 100644
index 00000000000..6984ca48a1e
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/trielogs/TrieLogAccumulator.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services.trielogs;
+
+import org.hyperledger.besu.datatypes.AccountValue;
+import org.hyperledger.besu.datatypes.Address;
+import org.hyperledger.besu.datatypes.StorageSlotKey;
+
+import java.util.Map;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.apache.tuweni.units.bigints.UInt256;
+
+/** Accumulator interface tor provding trie updates for creating TrieLogs. */
+public interface TrieLogAccumulator {
+
+  /**
+   * Returns the state trie accounts which have been updated.
+   *
+   * @return the accounts to update
+   */
+  Map<Address, ? extends TrieLog.LogTuple<? extends AccountValue>> getAccountsToUpdate();
+
+  /**
+   * Returns code which has been updated.
+   *
+   * @return the code to update
+   */
+  Map<Address, ? extends TrieLog.LogTuple<Bytes>> getCodeToUpdate();
+
+  /**
+   * Returns storage which has been updated.
+   *
+   * @return the storage to update
+   */
+  Map<Address, ? extends Map<StorageSlotKey, ? extends TrieLog.LogTuple<UInt256>>>
+      getStorageToUpdate();
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/trielogs/TrieLogEvent.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/trielogs/TrieLogEvent.java
new file mode 100644
index 00000000000..dc5e60761d9
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/trielogs/TrieLogEvent.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services.trielogs;
+
+/** A TrieLog event. */
+public interface TrieLogEvent {
+  /** The type of the event. */
+  enum Type {
+    /** TrieLog added event type */
+    ADDED
+  }
+
+  /**
+   * The type of the event.
+   *
+   * @return the type of the event
+   */
+  TrieLogEvent.Type getType();
+
+  /**
+   * The TrieLog layer.
+   *
+   * @return the TrieLog layer
+   */
+  TrieLog layer();
+
+  /** Observer interface for TrieLog events. */
+  interface TrieLogObserver {
+
+    /**
+     * Called when a TrieLog is added.
+     *
+     * @param event the TrieLog event
+     */
+    void onTrieLogAdded(TrieLogEvent event);
+  }
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/trielogs/TrieLogFactory.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/trielogs/TrieLogFactory.java
new file mode 100644
index 00000000000..143bb880950
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/trielogs/TrieLogFactory.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services.trielogs;
+
+import org.hyperledger.besu.plugin.data.BlockHeader;
+
+/** Interface for serializing and deserializing {@link TrieLog} objects. */
+public interface TrieLogFactory {
+
+  /**
+   * Creates a new TrieLog object.
+   *
+   * @param accumulator the accumulator
+   * @param blockHeader the block header
+   * @return a new TrieLog object
+   */
+  TrieLog create(TrieLogAccumulator accumulator, BlockHeader blockHeader);
+
+  /**
+   * Deserializes a TrieLog object.
+   *
+   * @param bytes the serialized TrieLog
+   * @return the deserialized TrieLog
+   */
+  TrieLog deserialize(final byte[] bytes);
+
+  /**
+   * Serializes a TrieLog object.
+   *
+   * @param layer the TrieLog
+   * @return the serialized TrieLog
+   */
+  byte[] serialize(final TrieLog layer);
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/trielogs/TrieLogProvider.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/trielogs/TrieLogProvider.java
new file mode 100644
index 00000000000..5df4f73c453
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/trielogs/TrieLogProvider.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright contributors to Hyperledger Besu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services.trielogs;
+
+import org.hyperledger.besu.datatypes.Hash;
+
+import java.util.List;
+import java.util.Optional;
+
+/** Trielog provider interface for a given block hash. */
+public interface TrieLogProvider {
+  /**
+   * Returns the TrieLog layer for the given block hash.
+   *
+   * @param blockHash the block hash
+   * @return the TrieLog layer for the given block hash
+   * @param <T> the type of the TrieLog
+   */
+  <T extends TrieLog.LogTuple<?>> Optional<TrieLog> getTrieLogLayer(final Hash blockHash);
+
+  /**
+   * Returns the TrieLog layer for the given block number.
+   *
+   * @param blockNumber the block hash
+   * @return the TrieLog layer for the given block hash
+   * @param <T> the type of the TrieLog
+   */
+  <T extends TrieLog.LogTuple<?>> Optional<TrieLog> getTrieLogLayer(final long blockNumber);
+
+  /**
+   * Returns the TrieLog layers for the given block number range.
+   *
+   * @param fromBlockNumber the from block number
+   * @param toBlockNumber the to block number
+   * @return the TrieLog layers for the given block number range
+   * @param <T> the type of the TrieLog
+   */
+  <T extends TrieLog.LogTuple<?>> List<TrieLogRangeTuple> getTrieLogsByRange(
+      long fromBlockNumber, long toBlockNumber);
+
+  /**
+   * Block and TrieLog layer composition, used for returning a range of TrieLog layers.
+   *
+   * @param blockHash the block hash
+   * @param blockNumber the block number
+   * @param trieLog the associated TrieLog layer
+   */
+  record TrieLogRangeTuple(Hash blockHash, long blockNumber, TrieLog trieLog) {}
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/txselection/TransactionSelector.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/txselection/TransactionSelector.java
new file mode 100644
index 00000000000..e48684640c0
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/txselection/TransactionSelector.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.plugin.services.txselection;
+
+import org.hyperledger.besu.plugin.Unstable;
+import org.hyperledger.besu.plugin.data.Log;
+import org.hyperledger.besu.plugin.data.Transaction;
+import org.hyperledger.besu.plugin.data.TransactionSelectionResult;
+
+import java.util.List;
+
+/** Interface for the transaction selector */
+@Unstable
+public interface TransactionSelector {
+
+  /**
+   * Method called to decide whether a transaction is added to a block. The method can also indicate
+   * that no further transactions can be added to the block.
+   *
+   * @param transaction candidate transaction
+   * @param success true, if the transaction executed successfully
+   * @param logs the logs created by this transaction
+   * @param cumulativeGasUsed gas used by this and all previous transaction in the block
+   * @return TransactionSelectionResult that indicates whether to include the transaction
+   */
+  TransactionSelectionResult selectTransaction(
+      final Transaction transaction,
+      final boolean success,
+      final List<Log> logs,
+      final long cumulativeGasUsed);
+}
diff --git a/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/txselection/TransactionSelectorFactory.java b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/txselection/TransactionSelectorFactory.java
new file mode 100644
index 00000000000..1d4234acc9e
--- /dev/null
+++ b/plugin-api/src/main/java/org/hyperledger/besu/plugin/services/txselection/TransactionSelectorFactory.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.plugin.services.txselection;
+
+import org.hyperledger.besu.plugin.Unstable;
+
+/** Interface for a factory that creates transaction selectors */
+@Unstable
+public interface TransactionSelectorFactory {
+
+  /**
+   * Create a transaction selector
+   *
+   * @return the transaction selector
+   */
+  TransactionSelector create();
+}
diff --git a/plugins/rocksdb/build.gradle b/plugins/rocksdb/build.gradle
index 1968b6682ec..fa4b0e9f0e0 100644
--- a/plugins/rocksdb/build.gradle
+++ b/plugins/rocksdb/build.gradle
@@ -33,24 +33,29 @@ publishing {
 
 dependencies {
   api project(':plugin-api')
+  api 'org.slf4j:slf4j-api'
 
   implementation project(':metrics:core')
   implementation project(':metrics:rocksdb')
   implementation project(':services:kvstore')
+  implementation project(':util')
 
   implementation 'com.fasterxml.jackson.core:jackson-databind'
   implementation 'com.google.guava:guava'
   implementation 'info.picocli:picocli'
+  implementation 'io.opentelemetry:opentelemetry-api'
   implementation 'io.prometheus:simpleclient'
-  implementation 'org.apache.logging.log4j:log4j-api'
-  implementation 'org.apache.tuweni:bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
   implementation 'org.rocksdb:rocksdbjni'
-
-  runtimeOnly 'org.apache.logging.log4j:log4j-core'
+  implementation project(path: ':ethereum:core')
 
   testImplementation project(':testutil')
 
   testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.mockito:mockito-core'
+  testImplementation 'org.mockito:mockito-junit-jupiter'
+
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 }
diff --git a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValuePrivacyStorageFactory.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValuePrivacyStorageFactory.java
index b368e508305..ee20b85e968 100644
--- a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValuePrivacyStorageFactory.java
+++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValuePrivacyStorageFactory.java
@@ -27,15 +27,16 @@
 import java.nio.file.Path;
 import java.util.Set;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Takes a public storage factory and enables creating independently versioned privacy storage
  * objects which have the same features as the supported public storage factory
  */
 public class RocksDBKeyValuePrivacyStorageFactory implements PrivacyKeyValueStorageFactory {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG =
+      LoggerFactory.getLogger(RocksDBKeyValuePrivacyStorageFactory.class);
   private static final int DEFAULT_VERSION = 1;
   private static final Set<Integer> SUPPORTED_VERSIONS = Set.of(0, 1);
 
@@ -43,6 +44,11 @@ public class RocksDBKeyValuePrivacyStorageFactory implements PrivacyKeyValueStor
   private final RocksDBKeyValueStorageFactory publicFactory;
   private Integer databaseVersion;
 
+  /**
+   * Instantiates a new RocksDb key value privacy storage factory.
+   *
+   * @param publicFactory the public factory
+   */
   public RocksDBKeyValuePrivacyStorageFactory(final RocksDBKeyValueStorageFactory publicFactory) {
     this.publicFactory = publicFactory;
   }
@@ -62,8 +68,7 @@ public KeyValueStorage create(
       try {
         databaseVersion = readDatabaseVersion(commonConfiguration);
       } catch (final IOException e) {
-        LOG.error("Failed to retrieve the RocksDB database meta version: {}", e.getMessage());
-        throw new StorageException(e.getMessage(), e);
+        throw new StorageException("Failed to retrieve the RocksDB database meta version", e);
       }
     }
 
diff --git a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValueStorageFactory.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValueStorageFactory.java
index c4e9abf69e1..81aa1a37087 100644
--- a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValueStorageFactory.java
+++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValueStorageFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -16,6 +16,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
 import org.hyperledger.besu.plugin.services.BesuConfiguration;
 import org.hyperledger.besu.plugin.services.MetricsSystem;
 import org.hyperledger.besu.plugin.services.exception.StorageException;
@@ -26,25 +27,28 @@
 import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBConfiguration;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBConfigurationBuilder;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.segmented.OptimisticRocksDBColumnarKeyValueStorage;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.segmented.RocksDBColumnarKeyValueStorage;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.segmented.TransactionDBRocksDBColumnarKeyValueStorage;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.unsegmented.RocksDBKeyValueStorage;
-import org.hyperledger.besu.services.kvstore.SegmentedKeyValueStorage;
 import org.hyperledger.besu.services.kvstore.SegmentedKeyValueStorageAdapter;
+import org.hyperledger.besu.services.kvstore.SnappableSegmentedKeyValueStorageAdapter;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import com.google.common.base.Supplier;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Rocks db key value storage factory. */
 public class RocksDBKeyValueStorageFactory implements KeyValueStorageFactory {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(RocksDBKeyValueStorageFactory.class);
   private static final int DEFAULT_VERSION = 1;
   private static final Set<Integer> SUPPORTED_VERSIONS = Set.of(0, 1, 2);
   private static final String NAME = "rocksdb";
@@ -53,31 +57,87 @@ public class RocksDBKeyValueStorageFactory implements KeyValueStorageFactory {
   private final int defaultVersion;
   private Integer databaseVersion;
   private Boolean isSegmentIsolationSupported;
-  private SegmentedKeyValueStorage<?> segmentedStorage;
+  private RocksDBColumnarKeyValueStorage segmentedStorage;
   private KeyValueStorage unsegmentedStorage;
   private RocksDBConfiguration rocksDBConfiguration;
 
   private final Supplier<RocksDBFactoryConfiguration> configuration;
   private final List<SegmentIdentifier> segments;
+  private final List<SegmentIdentifier> ignorableSegments;
 
-  RocksDBKeyValueStorageFactory(
+  /**
+   * Instantiates a new RocksDb key value storage factory.
+   *
+   * @param configuration the configuration
+   * @param segments the segments
+   * @param ignorableSegments the ignorable segments
+   * @param defaultVersion the default version
+   * @param rocksDBMetricsFactory the rocks db metrics factory
+   */
+  public RocksDBKeyValueStorageFactory(
       final Supplier<RocksDBFactoryConfiguration> configuration,
       final List<SegmentIdentifier> segments,
+      final List<SegmentIdentifier> ignorableSegments,
       final int defaultVersion,
       final RocksDBMetricsFactory rocksDBMetricsFactory) {
     this.configuration = configuration;
     this.segments = segments;
+    this.ignorableSegments = ignorableSegments;
     this.defaultVersion = defaultVersion;
     this.rocksDBMetricsFactory = rocksDBMetricsFactory;
   }
 
+  /**
+   * Instantiates a new RocksDb key value storage factory.
+   *
+   * @param configuration the configuration
+   * @param segments the segments
+   * @param defaultVersion the default version
+   * @param rocksDBMetricsFactory the rocks db metrics factory
+   */
+  public RocksDBKeyValueStorageFactory(
+      final Supplier<RocksDBFactoryConfiguration> configuration,
+      final List<SegmentIdentifier> segments,
+      final int defaultVersion,
+      final RocksDBMetricsFactory rocksDBMetricsFactory) {
+    this(configuration, segments, List.of(), defaultVersion, rocksDBMetricsFactory);
+  }
+
+  /**
+   * Instantiates a new Rocks db key value storage factory.
+   *
+   * @param configuration the configuration
+   * @param segments the segments
+   * @param ignorableSegments the ignorable segments
+   * @param rocksDBMetricsFactory the rocks db metrics factory
+   */
+  public RocksDBKeyValueStorageFactory(
+      final Supplier<RocksDBFactoryConfiguration> configuration,
+      final List<SegmentIdentifier> segments,
+      final List<SegmentIdentifier> ignorableSegments,
+      final RocksDBMetricsFactory rocksDBMetricsFactory) {
+    this(configuration, segments, ignorableSegments, DEFAULT_VERSION, rocksDBMetricsFactory);
+  }
+
+  /**
+   * Instantiates a new Rocks db key value storage factory.
+   *
+   * @param configuration the configuration
+   * @param segments the segments
+   * @param rocksDBMetricsFactory the rocks db metrics factory
+   */
   public RocksDBKeyValueStorageFactory(
       final Supplier<RocksDBFactoryConfiguration> configuration,
       final List<SegmentIdentifier> segments,
       final RocksDBMetricsFactory rocksDBMetricsFactory) {
-    this(configuration, segments, DEFAULT_VERSION, rocksDBMetricsFactory);
+    this(configuration, segments, List.of(), DEFAULT_VERSION, rocksDBMetricsFactory);
   }
 
+  /**
+   * Gets default version.
+   *
+   * @return the default version
+   */
   int getDefaultVersion() {
     return defaultVersion;
   }
@@ -93,50 +153,80 @@ public KeyValueStorage create(
       final BesuConfiguration commonConfiguration,
       final MetricsSystem metricsSystem)
       throws StorageException {
-
+    final boolean isForestStorageFormat =
+        DataStorageFormat.FOREST.getDatabaseVersion() == commonConfiguration.getDatabaseVersion();
     if (requiresInit()) {
       init(commonConfiguration);
     }
 
     // It's probably a good idea for the creation logic to be entirely dependent on the database
     // version. Introducing intermediate booleans that represent database properties and dispatching
-    // creation logic based on them is error prone.
+    // creation logic based on them is error-prone.
     switch (databaseVersion) {
-      case 0:
-        {
-          segmentedStorage = null;
-          if (unsegmentedStorage == null) {
-            unsegmentedStorage =
-                new RocksDBKeyValueStorage(
-                    rocksDBConfiguration, metricsSystem, rocksDBMetricsFactory);
-          }
-          return unsegmentedStorage;
+      case 0 -> {
+        segmentedStorage = null;
+        if (unsegmentedStorage == null) {
+          unsegmentedStorage =
+              new RocksDBKeyValueStorage(
+                  rocksDBConfiguration, metricsSystem, rocksDBMetricsFactory);
         }
-      case 1:
-      case 2:
-        {
-          unsegmentedStorage = null;
-          if (segmentedStorage == null) {
-            final List<SegmentIdentifier> segmentsForVersion =
-                segments.stream()
-                    .filter(segmentId -> segmentId.includeInDatabaseVersion(databaseVersion))
-                    .collect(Collectors.toList());
+        return unsegmentedStorage;
+      }
+      case 1, 2 -> {
+        unsegmentedStorage = null;
+        if (segmentedStorage == null) {
+          final List<SegmentIdentifier> segmentsForVersion =
+              segments.stream()
+                  .filter(segmentId -> segmentId.includeInDatabaseVersion(databaseVersion))
+                  .collect(Collectors.toList());
+          if (isForestStorageFormat) {
+            LOG.debug("FOREST mode detected, using TransactionDB.");
+            segmentedStorage =
+                new TransactionDBRocksDBColumnarKeyValueStorage(
+                    rocksDBConfiguration,
+                    segmentsForVersion,
+                    ignorableSegments,
+                    metricsSystem,
+                    rocksDBMetricsFactory);
+          } else {
+            LOG.debug("Using OptimisticTransactionDB.");
             segmentedStorage =
-                new RocksDBColumnarKeyValueStorage(
-                    rocksDBConfiguration, segmentsForVersion, metricsSystem, rocksDBMetricsFactory);
+                new OptimisticRocksDBColumnarKeyValueStorage(
+                    rocksDBConfiguration,
+                    segmentsForVersion,
+                    ignorableSegments,
+                    metricsSystem,
+                    rocksDBMetricsFactory);
           }
-          return new SegmentedKeyValueStorageAdapter<>(segment, segmentedStorage);
         }
-      default:
-        {
-          throw new IllegalStateException(
-              String.format(
-                  "Developer error: A supported database version (%d) was detected but there is no associated creation logic.",
-                  databaseVersion));
+
+        final RocksDbSegmentIdentifier rocksSegment =
+            segmentedStorage.getSegmentIdentifierByName(segment);
+
+        if (isForestStorageFormat) {
+          return new SegmentedKeyValueStorageAdapter<>(segment, segmentedStorage);
+        } else {
+          return new SnappableSegmentedKeyValueStorageAdapter<>(
+              segment,
+              segmentedStorage,
+              () ->
+                  ((OptimisticRocksDBColumnarKeyValueStorage) segmentedStorage)
+                      .takeSnapshot(rocksSegment));
         }
+      }
+      default -> throw new IllegalStateException(
+          String.format(
+              "Developer error: A supported database version (%d) was detected but there is no associated creation logic.",
+              databaseVersion));
     }
   }
 
+  /**
+   * Storage path.
+   *
+   * @param commonConfiguration the common configuration
+   * @return the path
+   */
   protected Path storagePath(final BesuConfiguration commonConfiguration) {
     return commonConfiguration.getStoragePath();
   }
@@ -145,8 +235,11 @@ private void init(final BesuConfiguration commonConfiguration) {
     try {
       databaseVersion = readDatabaseVersion(commonConfiguration);
     } catch (final IOException e) {
-      LOG.error("Failed to retrieve the RocksDB database meta version: {}", e.getMessage());
-      throw new StorageException(e.getMessage(), e);
+      final String message =
+          "Failed to retrieve the RocksDB database meta version: "
+              + e.getMessage()
+              + " could not be found. You may not have the appropriate permission to access the item.";
+      throw new StorageException(message, e);
     }
     isSegmentIsolationSupported = databaseVersion >= 1;
     rocksDBConfiguration =
@@ -162,14 +255,20 @@ private boolean requiresInit() {
   private int readDatabaseVersion(final BesuConfiguration commonConfiguration) throws IOException {
     final Path dataDir = commonConfiguration.getDataPath();
     final boolean databaseExists = commonConfiguration.getStoragePath().toFile().exists();
+    final boolean dataDirExists = dataDir.toFile().exists();
     final int databaseVersion;
     if (databaseExists) {
       databaseVersion = DatabaseMetadata.lookUpFrom(dataDir).getVersion();
-      LOG.info("Existing database detected at {}. Version {}", dataDir, databaseVersion);
+      LOG.info(
+          "Existing database detected at {}. Version {}. Compacting database...",
+          dataDir,
+          databaseVersion);
     } else {
       databaseVersion = commonConfiguration.getDatabaseVersion();
       LOG.info("No existing database detected at {}. Using version {}", dataDir, databaseVersion);
-      Files.createDirectories(dataDir);
+      if (!dataDirExists) {
+        Files.createDirectories(dataDir);
+      }
       new DatabaseMetadata(databaseVersion).writeToDirectory(dataDir);
     }
 
@@ -198,4 +297,9 @@ public boolean isSegmentIsolationSupported() {
         isSegmentIsolationSupported,
         "Whether segment isolation is supported will be determined during creation. Call a creation method first");
   }
+
+  @Override
+  public boolean isSnapshotIsolationSupported() {
+    return true;
+  }
 }
diff --git a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBMetrics.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBMetrics.java
index 9d18e507a23..16d62b22ccb 100644
--- a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBMetrics.java
+++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBMetrics.java
@@ -17,6 +17,7 @@
 import org.hyperledger.besu.plugin.services.metrics.Counter;
 import org.hyperledger.besu.plugin.services.metrics.OperationTimer;
 
+/** The Rocks db metrics. */
 public class RocksDBMetrics {
 
   private final OperationTimer readLatency;
@@ -25,6 +26,15 @@ public class RocksDBMetrics {
   private final OperationTimer commitLatency;
   private final Counter rollbackCount;
 
+  /**
+   * Instantiates a new RocksDb metrics.
+   *
+   * @param readLatency the read latency
+   * @param removeLatency the remove latency
+   * @param writeLatency the write latency
+   * @param commitLatency the commit latency
+   * @param rollbackCount the rollback count
+   */
   public RocksDBMetrics(
       final OperationTimer readLatency,
       final OperationTimer removeLatency,
@@ -38,22 +48,47 @@ public RocksDBMetrics(
     this.rollbackCount = rollbackCount;
   }
 
+  /**
+   * Gets read latency.
+   *
+   * @return the read latency
+   */
   public OperationTimer getReadLatency() {
     return readLatency;
   }
 
+  /**
+   * Gets remove latency.
+   *
+   * @return the remove latency
+   */
   public OperationTimer getRemoveLatency() {
     return removeLatency;
   }
 
+  /**
+   * Gets write latency.
+   *
+   * @return the write latency
+   */
   public OperationTimer getWriteLatency() {
     return writeLatency;
   }
 
+  /**
+   * Gets commit latency.
+   *
+   * @return the commit latency
+   */
   public OperationTimer getCommitLatency() {
     return commitLatency;
   }
 
+  /**
+   * Gets rollback count.
+   *
+   * @return the rollback count
+   */
   public Counter getRollbackCount() {
     return rollbackCount;
   }
diff --git a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBMetricsFactory.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBMetricsFactory.java
index 00762318e87..bf781d300a7 100644
--- a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBMetricsFactory.java
+++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBMetricsFactory.java
@@ -23,38 +23,56 @@
 import org.hyperledger.besu.plugin.services.metrics.OperationTimer;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBConfiguration;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.rocksdb.RocksDB;
 import org.rocksdb.RocksDBException;
 import org.rocksdb.Statistics;
-import org.rocksdb.TransactionDB;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Rocks db metrics factory. */
 public class RocksDBMetricsFactory {
 
+  /** The constant PUBLIC_ROCKS_DB_METRICS. */
   public static final RocksDBMetricsFactory PUBLIC_ROCKS_DB_METRICS =
       new RocksDBMetricsFactory(
           BesuMetricCategory.KVSTORE_ROCKSDB, BesuMetricCategory.KVSTORE_ROCKSDB_STATS);
 
+  /** The constant PRIVATE_ROCKS_DB_METRICS. */
   public static final RocksDBMetricsFactory PRIVATE_ROCKS_DB_METRICS =
       new RocksDBMetricsFactory(
           BesuMetricCategory.KVSTORE_PRIVATE_ROCKSDB,
           BesuMetricCategory.KVSTORE_PRIVATE_ROCKSDB_STATS);
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(RocksDBMetricsFactory.class);
 
   private final MetricCategory rocksDbMetricCategory;
   private final MetricCategory statsDbMetricCategory;
 
+  /**
+   * Instantiates a new RocksDb metrics factory.
+   *
+   * @param rocksDbMetricCategory the rocks db metric category
+   * @param statsDbMetricCategory the stats db metric category
+   */
   public RocksDBMetricsFactory(
       final MetricCategory rocksDbMetricCategory, final MetricCategory statsDbMetricCategory) {
     this.rocksDbMetricCategory = rocksDbMetricCategory;
     this.statsDbMetricCategory = statsDbMetricCategory;
   }
 
+  /**
+   * Create RocksDb metrics.
+   *
+   * @param metricsSystem the metrics system
+   * @param rocksDbConfiguration the rocks db configuration
+   * @param db the db
+   * @param stats the stats
+   * @return the rocks db metrics
+   */
   public RocksDBMetrics create(
       final MetricsSystem metricsSystem,
       final RocksDBConfiguration rocksDbConfiguration,
-      final TransactionDB db,
+      final RocksDB db,
       final Statistics stats) {
     final OperationTimer readLatency =
         metricsSystem
diff --git a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBPlugin.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBPlugin.java
index e99c09ecd5c..9e11bd634b8 100644
--- a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBPlugin.java
+++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBPlugin.java
@@ -23,28 +23,41 @@
 import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The RocksDb plugin. */
 public class RocksDBPlugin implements BesuPlugin {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(RocksDBPlugin.class);
   private static final String NAME = "rocksdb";
 
   private final RocksDBCLIOptions options;
+  private final List<SegmentIdentifier> ignorableSegments = new ArrayList<>();
   private BesuContext context;
   private RocksDBKeyValueStorageFactory factory;
   private RocksDBKeyValuePrivacyStorageFactory privacyFactory;
 
+  /** Instantiates a newRocksDb plugin. */
   public RocksDBPlugin() {
     this.options = RocksDBCLIOptions.create();
   }
 
+  /**
+   * Add ignorable segment identifier.
+   *
+   * @param ignorable the ignorable
+   */
+  public void addIgnorableSegmentIdentifier(final SegmentIdentifier ignorable) {
+    ignorableSegments.add(ignorable);
+  }
+
   @Override
   public void register(final BesuContext context) {
     LOG.debug("Registering plugin");
@@ -54,7 +67,7 @@ public void register(final BesuContext context) {
 
     if (cmdlineOptions.isEmpty()) {
       throw new IllegalStateException(
-          "Expecting a PicoCLIO options to register CLI options with, but none found.");
+          "Expecting a PicoCLI options to register CLI options with, but none found.");
     }
 
     cmdlineOptions.get().addPicoCLIOptions(NAME, options);
@@ -95,6 +108,15 @@ public void stop() {
     }
   }
 
+  /**
+   * Is high spec enabled.
+   *
+   * @return the boolean
+   */
+  public boolean isHighSpecEnabled() {
+    return options.isHighSpec();
+  }
+
   private void createAndRegister(final StorageService service) {
     final List<SegmentIdentifier> segments = service.getAllSegmentIdentifiers();
 
@@ -102,7 +124,10 @@ private void createAndRegister(final StorageService service) {
         Suppliers.memoize(options::toDomainObject);
     factory =
         new RocksDBKeyValueStorageFactory(
-            configuration, segments, RocksDBMetricsFactory.PUBLIC_ROCKS_DB_METRICS);
+            configuration,
+            segments,
+            ignorableSegments,
+            RocksDBMetricsFactory.PUBLIC_ROCKS_DB_METRICS);
     privacyFactory = new RocksDBKeyValuePrivacyStorageFactory(factory);
 
     service.registerKeyValueStorage(factory);
diff --git a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDbIterator.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDbIterator.java
new file mode 100644
index 00000000000..9a5f9c4a184
--- /dev/null
+++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDbIterator.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.plugin.services.storage.rocksdb;
+
+import static com.google.common.base.Preconditions.checkState;
+
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.rocksdb.RocksDBException;
+import org.rocksdb.RocksIterator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Rocks db iterator. */
+public class RocksDbIterator implements Iterator<Pair<byte[], byte[]>>, AutoCloseable {
+  private static final Logger LOG = LoggerFactory.getLogger(RocksDbIterator.class);
+
+  private final RocksIterator rocksIterator;
+  private final AtomicBoolean closed = new AtomicBoolean(false);
+
+  private RocksDbIterator(final RocksIterator rocksIterator) {
+    this.rocksIterator = rocksIterator;
+  }
+
+  /**
+   * Create RocksDb iterator.
+   *
+   * @param rocksIterator the rocks iterator
+   * @return the rocks db iterator
+   */
+  public static RocksDbIterator create(final RocksIterator rocksIterator) {
+    return new RocksDbIterator(rocksIterator);
+  }
+
+  @Override
+  public boolean hasNext() {
+    assertOpen();
+    return rocksIterator.isValid();
+  }
+
+  @Override
+  public Pair<byte[], byte[]> next() {
+    assertOpen();
+    try {
+      rocksIterator.status();
+    } catch (final RocksDBException e) {
+      LOG.error(
+          String.format("%s encountered a problem while iterating.", getClass().getSimpleName()),
+          e);
+    }
+    if (!hasNext()) {
+      throw new NoSuchElementException();
+    }
+    final byte[] key = rocksIterator.key();
+    final byte[] value = rocksIterator.value();
+    rocksIterator.next();
+    return Pair.of(key, value);
+  }
+
+  /**
+   * Next key.
+   *
+   * @return the byte [ ]
+   */
+  public byte[] nextKey() {
+    assertOpen();
+    try {
+      rocksIterator.status();
+    } catch (final RocksDBException e) {
+      LOG.error(
+          String.format("%s encountered a problem while iterating.", getClass().getSimpleName()),
+          e);
+    }
+    if (!hasNext()) {
+      throw new NoSuchElementException();
+    }
+    final byte[] key = rocksIterator.key();
+    rocksIterator.next();
+    return key;
+  }
+
+  /**
+   * To stream.
+   *
+   * @return the stream
+   */
+  public Stream<Pair<byte[], byte[]>> toStream() {
+    assertOpen();
+    final Spliterator<Pair<byte[], byte[]>> spliterator =
+        Spliterators.spliteratorUnknownSize(
+            this,
+            Spliterator.IMMUTABLE
+                | Spliterator.DISTINCT
+                | Spliterator.NONNULL
+                | Spliterator.ORDERED
+                | Spliterator.SORTED);
+
+    return StreamSupport.stream(spliterator, false).onClose(this::close);
+  }
+
+  /**
+   * To stream keys.
+   *
+   * @return the stream
+   */
+  public Stream<byte[]> toStreamKeys() {
+    assertOpen();
+    final Spliterator<byte[]> spliterator =
+        Spliterators.spliteratorUnknownSize(
+            new Iterator<>() {
+              @Override
+              public boolean hasNext() {
+                return RocksDbIterator.this.hasNext();
+              }
+
+              @Override
+              public byte[] next() {
+                return RocksDbIterator.this.nextKey();
+              }
+            },
+            Spliterator.IMMUTABLE
+                | Spliterator.DISTINCT
+                | Spliterator.NONNULL
+                | Spliterator.ORDERED
+                | Spliterator.SORTED);
+
+    return StreamSupport.stream(spliterator, false).onClose(this::close);
+  }
+
+  private void assertOpen() {
+    checkState(
+        !closed.get(),
+        String.format("Attempt to read from a closed %s", getClass().getSimpleName()));
+  }
+
+  @Override
+  public void close() {
+    if (closed.compareAndSet(false, true)) {
+      rocksIterator.close();
+    }
+  }
+}
diff --git a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDbKeyIterator.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDbKeyIterator.java
deleted file mode 100644
index 98064a6819c..00000000000
--- a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDbKeyIterator.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.hyperledger.besu.plugin.services.storage.rocksdb;
-
-import static com.google.common.base.Preconditions.checkState;
-
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.rocksdb.RocksDBException;
-import org.rocksdb.RocksIterator;
-
-public class RocksDbKeyIterator implements Iterator<byte[]>, AutoCloseable {
-  private static final Logger LOG = LogManager.getLogger();
-
-  private final RocksIterator rocksIterator;
-  private final AtomicBoolean closed = new AtomicBoolean(false);
-
-  private RocksDbKeyIterator(final RocksIterator rocksIterator) {
-    this.rocksIterator = rocksIterator;
-  }
-
-  public static RocksDbKeyIterator create(final RocksIterator rocksIterator) {
-    return new RocksDbKeyIterator(rocksIterator);
-  }
-
-  @Override
-  public boolean hasNext() {
-    assertOpen();
-    return rocksIterator.isValid();
-  }
-
-  @Override
-  public byte[] next() {
-    assertOpen();
-    try {
-      rocksIterator.status();
-    } catch (final RocksDBException e) {
-      LOG.error(
-          String.format("%s encountered a problem while iterating.", getClass().getSimpleName()),
-          e);
-    }
-    if (!hasNext()) {
-      throw new NoSuchElementException();
-    }
-    final byte[] key = rocksIterator.key();
-    rocksIterator.next();
-    return key;
-  }
-
-  public Stream<byte[]> toStream() {
-    assertOpen();
-    final Spliterator<byte[]> spliterator =
-        Spliterators.spliteratorUnknownSize(
-            this,
-            Spliterator.IMMUTABLE
-                | Spliterator.DISTINCT
-                | Spliterator.NONNULL
-                | Spliterator.ORDERED
-                | Spliterator.SORTED);
-
-    return StreamSupport.stream(spliterator, false).onClose(this::close);
-  }
-
-  private void assertOpen() {
-    checkState(
-        !closed.get(),
-        String.format("Attempt to read from a closed %s", getClass().getSimpleName()));
-  }
-
-  @Override
-  public void close() {
-    if (closed.compareAndSet(false, true)) {
-      rocksIterator.close();
-    }
-  }
-}
diff --git a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDbSegmentIdentifier.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDbSegmentIdentifier.java
new file mode 100644
index 00000000000..76d130395d9
--- /dev/null
+++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDbSegmentIdentifier.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services.storage.rocksdb;
+
+import org.hyperledger.besu.plugin.services.exception.StorageException;
+
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.rocksdb.ColumnFamilyDescriptor;
+import org.rocksdb.ColumnFamilyHandle;
+import org.rocksdb.RocksDB;
+import org.rocksdb.RocksDBException;
+
+/** The RocksDb segment identifier. */
+public class RocksDbSegmentIdentifier {
+
+  private final RocksDB db;
+  private final AtomicReference<ColumnFamilyHandle> reference;
+
+  /**
+   * Instantiates a new RocksDb segment identifier.
+   *
+   * @param db the db
+   * @param columnFamilyHandle the column family handle
+   */
+  public RocksDbSegmentIdentifier(final RocksDB db, final ColumnFamilyHandle columnFamilyHandle) {
+    this.db = db;
+    this.reference = new AtomicReference<>(columnFamilyHandle);
+  }
+
+  /** Reset. */
+  public void reset() {
+    reference.getAndUpdate(
+        oldHandle -> {
+          try {
+            ColumnFamilyDescriptor descriptor =
+                new ColumnFamilyDescriptor(
+                    oldHandle.getName(), oldHandle.getDescriptor().getOptions());
+            db.dropColumnFamily(oldHandle);
+            ColumnFamilyHandle newHandle = db.createColumnFamily(descriptor);
+            oldHandle.close();
+            return newHandle;
+          } catch (final RocksDBException e) {
+            throw new StorageException(e);
+          }
+        });
+  }
+
+  /**
+   * Get column family handle.
+   *
+   * @return the column family handle
+   */
+  public ColumnFamilyHandle get() {
+    return reference.get();
+  }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    RocksDbSegmentIdentifier that = (RocksDbSegmentIdentifier) o;
+    return Objects.equals(reference.get(), that.reference.get());
+  }
+
+  @Override
+  public int hashCode() {
+    return reference.get().hashCode();
+  }
+}
diff --git a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDbUtil.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDbUtil.java
index 168fa13a2c8..82637305a72 100644
--- a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDbUtil.java
+++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDbUtil.java
@@ -16,15 +16,17 @@
 
 import org.hyperledger.besu.util.InvalidConfigurationException;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.rocksdb.RocksDB;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The RocksDb util. */
 public class RocksDbUtil {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(RocksDbUtil.class);
 
   private RocksDbUtil() {}
 
+  /** Load native library. */
   public static void loadNativeLibrary() {
     try {
       RocksDB.loadLibrary();
diff --git a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/DatabaseMetadata.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/DatabaseMetadata.java
index 63214c7cbbf..49b54315b32 100644
--- a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/DatabaseMetadata.java
+++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/DatabaseMetadata.java
@@ -27,11 +27,12 @@
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Database metadata. */
 public class DatabaseMetadata {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(DatabaseMetadata.class);
 
   private static final String METADATA_FILENAME = "DATABASE_METADATA.json";
   private static final ObjectMapper MAPPER = new ObjectMapper();
@@ -39,44 +40,94 @@ public class DatabaseMetadata {
 
   private Optional<Integer> privacyVersion;
 
+  /**
+   * Instantiates a new Database metadata.
+   *
+   * @param version the version
+   */
   @JsonCreator
   public DatabaseMetadata(@JsonProperty("version") final int version) {
     this(version, Optional.empty());
   }
 
+  /**
+   * Instantiates a new Database metadata.
+   *
+   * @param version the version
+   * @param privacyVersion the privacy version
+   */
   public DatabaseMetadata(final int version, final Optional<Integer> privacyVersion) {
     this.version = version;
     this.privacyVersion = privacyVersion;
   }
 
+  /**
+   * Instantiates a new Database metadata.
+   *
+   * @param version the version
+   * @param privacyVersion the privacy version
+   */
   public DatabaseMetadata(final int version, final int privacyVersion) {
     this(version, Optional.of(privacyVersion));
   }
 
+  /**
+   * Gets version.
+   *
+   * @return the version
+   */
   public int getVersion() {
     return version;
   }
 
+  /**
+   * Sets privacy version.
+   *
+   * @param privacyVersion the privacy version
+   */
   @JsonSetter("privacyVersion")
   public void setPrivacyVersion(final int privacyVersion) {
     this.privacyVersion = Optional.of(privacyVersion);
   }
 
+  /**
+   * Gets privacy version.
+   *
+   * @return the privacy version
+   */
   @JsonInclude(JsonInclude.Include.NON_NULL)
   @JsonGetter("privacyVersion")
   public Integer getPrivacyVersion() {
     return privacyVersion.orElse(null);
   }
 
+  /**
+   * Maybe privacy version.
+   *
+   * @return the optional
+   */
   public Optional<Integer> maybePrivacyVersion() {
     return privacyVersion;
   }
 
+  /**
+   * Look up database metadata.
+   *
+   * @param dataDir the data dir
+   * @return the database metadata
+   * @throws IOException the io exception
+   */
   public static DatabaseMetadata lookUpFrom(final Path dataDir) throws IOException {
     LOG.info("Lookup database metadata file in data directory: {}", dataDir.toString());
     return resolveDatabaseMetadata(getDefaultMetadataFile(dataDir));
   }
 
+  /**
+   * Write to directory.
+   *
+   * @param dataDir the data dir
+   * @throws IOException the io exception
+   */
   public void writeToDirectory(final Path dataDir) throws IOException {
     try {
       final DatabaseMetadata currentMetadata =
diff --git a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBCLIOptions.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBCLIOptions.java
index 68c37ca473f..df7dcc4b5f6 100644
--- a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBCLIOptions.java
+++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBCLIOptions.java
@@ -17,20 +17,30 @@
 import com.google.common.base.MoreObjects;
 import picocli.CommandLine;
 
+/** The RocksDb cli options. */
 public class RocksDBCLIOptions {
 
+  /** The constant DEFAULT_MAX_OPEN_FILES. */
   public static final int DEFAULT_MAX_OPEN_FILES = 1024;
-  public static final long DEFAULT_CACHE_CAPACITY = 8388608;
-  public static final int DEFAULT_MAX_BACKGROUND_COMPACTIONS = 4;
+  /** The constant DEFAULT_CACHE_CAPACITY. */
+  public static final long DEFAULT_CACHE_CAPACITY = 134217728;
+
+  /** The constant DEFAULT_BACKGROUND_THREAD_COUNT. */
   public static final int DEFAULT_BACKGROUND_THREAD_COUNT = 4;
+  /** The constant DEFAULT_IS_HIGH_SPEC. */
+  public static final boolean DEFAULT_IS_HIGH_SPEC = false;
 
-  private static final String MAX_OPEN_FILES_FLAG = "--Xplugin-rocksdb-max-open-files";
-  private static final String CACHE_CAPACITY_FLAG = "--Xplugin-rocksdb-cache-capacity";
-  private static final String MAX_BACKGROUND_COMPACTIONS_FLAG =
-      "--Xplugin-rocksdb-max-background-compactions";
-  private static final String BACKGROUND_THREAD_COUNT_FLAG =
+  /** The constant MAX_OPEN_FILES_FLAG. */
+  public static final String MAX_OPEN_FILES_FLAG = "--Xplugin-rocksdb-max-open-files";
+  /** The constant CACHE_CAPACITY_FLAG. */
+  public static final String CACHE_CAPACITY_FLAG = "--Xplugin-rocksdb-cache-capacity";
+  /** The constant BACKGROUND_THREAD_COUNT_FLAG. */
+  public static final String BACKGROUND_THREAD_COUNT_FLAG =
       "--Xplugin-rocksdb-background-thread-count";
+  /** The constant IS_HIGH_SPEC. */
+  public static final String IS_HIGH_SPEC = "--Xplugin-rocksdb-high-spec-enabled";
 
+  /** The Max open files. */
   @CommandLine.Option(
       names = {MAX_OPEN_FILES_FLAG},
       hidden = true,
@@ -39,22 +49,16 @@ public class RocksDBCLIOptions {
       description = "Max number of files RocksDB will open (default: ${DEFAULT-VALUE})")
   int maxOpenFiles;
 
+  /** The Cache capacity. */
   @CommandLine.Option(
       names = {CACHE_CAPACITY_FLAG},
       hidden = true,
-      defaultValue = "8388608",
+      defaultValue = "134217728",
       paramLabel = "<LONG>",
       description = "Cache capacity of RocksDB (default: ${DEFAULT-VALUE})")
   long cacheCapacity;
 
-  @CommandLine.Option(
-      names = {MAX_BACKGROUND_COMPACTIONS_FLAG},
-      hidden = true,
-      defaultValue = "4",
-      paramLabel = "<INTEGER>",
-      description = "Maximum number of RocksDB background compactions (default: ${DEFAULT-VALUE})")
-  int maxBackgroundCompactions;
-
+  /** The Background thread count. */
   @CommandLine.Option(
       names = {BACKGROUND_THREAD_COUNT_FLAG},
       hidden = true,
@@ -63,24 +67,58 @@ public class RocksDBCLIOptions {
       description = "Number of RocksDB background threads (default: ${DEFAULT-VALUE})")
   int backgroundThreadCount;
 
+  /** The Is high spec. */
+  @CommandLine.Option(
+      names = {IS_HIGH_SPEC},
+      hidden = true,
+      paramLabel = "<BOOLEAN>",
+      description =
+          "Use this flag to boost Besu performance if you have a 16 GiB RAM hardware or more (default: ${DEFAULT-VALUE})")
+  boolean isHighSpec;
+
   private RocksDBCLIOptions() {}
 
+  /**
+   * Create RocksDb cli options.
+   *
+   * @return the RocksDb cli options
+   */
   public static RocksDBCLIOptions create() {
     return new RocksDBCLIOptions();
   }
 
+  /**
+   * RocksDb cli options from config.
+   *
+   * @param config the config
+   * @return the RocksDb cli options
+   */
   public static RocksDBCLIOptions fromConfig(final RocksDBConfiguration config) {
     final RocksDBCLIOptions options = create();
     options.maxOpenFiles = config.getMaxOpenFiles();
     options.cacheCapacity = config.getCacheCapacity();
-    options.maxBackgroundCompactions = config.getMaxBackgroundCompactions();
     options.backgroundThreadCount = config.getBackgroundThreadCount();
+    options.isHighSpec = config.isHighSpec();
     return options;
   }
 
+  /**
+   * To domain object rocks db factory configuration.
+   *
+   * @return the rocks db factory configuration
+   */
   public RocksDBFactoryConfiguration toDomainObject() {
     return new RocksDBFactoryConfiguration(
-        maxOpenFiles, maxBackgroundCompactions, backgroundThreadCount, cacheCapacity);
+        maxOpenFiles, backgroundThreadCount, cacheCapacity, isHighSpec);
+  }
+
+  /**
+   * Is high spec.
+   *
+   * @return the boolean
+   */
+  public boolean isHighSpec() {
+    return isHighSpec;
   }
 
   @Override
@@ -88,8 +126,8 @@ public String toString() {
     return MoreObjects.toStringHelper(this)
         .add("maxOpenFiles", maxOpenFiles)
         .add("cacheCapacity", cacheCapacity)
-        .add("maxBackgroundCompactions", maxBackgroundCompactions)
         .add("backgroundThreadCount", backgroundThreadCount)
+        .add("isHighSpec", isHighSpec)
         .toString();
   }
 }
diff --git a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBConfiguration.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBConfiguration.java
index 3eff9745637..d921658f612 100644
--- a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBConfiguration.java
+++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBConfiguration.java
@@ -16,51 +16,92 @@
 
 import java.nio.file.Path;
 
+/** The Rocks db configuration. */
 public class RocksDBConfiguration {
 
   private final Path databaseDir;
   private final int maxOpenFiles;
   private final String label;
-  private final int maxBackgroundCompactions;
   private final int backgroundThreadCount;
   private final long cacheCapacity;
+  private final boolean isHighSpec;
 
+  /**
+   * Instantiates a new RocksDb configuration.
+   *
+   * @param databaseDir the database dir
+   * @param maxOpenFiles the max open files
+   * @param backgroundThreadCount the background thread count
+   * @param cacheCapacity the cache capacity
+   * @param label the label
+   * @param isHighSpec the is high spec
+   */
   public RocksDBConfiguration(
       final Path databaseDir,
       final int maxOpenFiles,
-      final int maxBackgroundCompactions,
       final int backgroundThreadCount,
       final long cacheCapacity,
-      final String label) {
-    this.maxBackgroundCompactions = maxBackgroundCompactions;
+      final String label,
+      final boolean isHighSpec) {
     this.backgroundThreadCount = backgroundThreadCount;
     this.databaseDir = databaseDir;
     this.maxOpenFiles = maxOpenFiles;
     this.cacheCapacity = cacheCapacity;
     this.label = label;
+    this.isHighSpec = isHighSpec;
   }
 
+  /**
+   * Gets database dir.
+   *
+   * @return the database dir
+   */
   public Path getDatabaseDir() {
     return databaseDir;
   }
 
+  /**
+   * Gets max open files.
+   *
+   * @return the max open files
+   */
   public int getMaxOpenFiles() {
     return maxOpenFiles;
   }
 
-  public int getMaxBackgroundCompactions() {
-    return maxBackgroundCompactions;
-  }
-
+  /**
+   * Gets background thread count.
+   *
+   * @return the background thread count
+   */
   public int getBackgroundThreadCount() {
     return backgroundThreadCount;
   }
 
+  /**
+   * Gets cache capacity.
+   *
+   * @return the cache capacity
+   */
   public long getCacheCapacity() {
     return cacheCapacity;
   }
 
+  /**
+   * Gets label.
+   *
+   * @return the label
+   */
   public String getLabel() {
     return label;
   }
+
+  /**
+   * Is high spec.
+   *
+   * @return the boolean
+   */
+  public boolean isHighSpec() {
+    return isHighSpec;
+  }
 }
diff --git a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBConfigurationBuilder.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBConfigurationBuilder.java
index 96e53a6634b..4ca88a5e1d0 100644
--- a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBConfigurationBuilder.java
+++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBConfigurationBuilder.java
@@ -16,65 +16,108 @@
 
 import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_BACKGROUND_THREAD_COUNT;
 import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_CACHE_CAPACITY;
-import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_BACKGROUND_COMPACTIONS;
+import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_IS_HIGH_SPEC;
 import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_OPEN_FILES;
 
 import java.nio.file.Path;
 
+/** The RocksDb configuration builder. */
 public class RocksDBConfigurationBuilder {
 
   private Path databaseDir;
   private String label = "blockchain";
   private int maxOpenFiles = DEFAULT_MAX_OPEN_FILES;
   private long cacheCapacity = DEFAULT_CACHE_CAPACITY;
-  private int maxBackgroundCompactions = DEFAULT_MAX_BACKGROUND_COMPACTIONS;
   private int backgroundThreadCount = DEFAULT_BACKGROUND_THREAD_COUNT;
+  private boolean isHighSpec = DEFAULT_IS_HIGH_SPEC;
 
+  /**
+   * Database dir.
+   *
+   * @param databaseDir the database dir
+   * @return the rocks db configuration builder
+   */
   public RocksDBConfigurationBuilder databaseDir(final Path databaseDir) {
     this.databaseDir = databaseDir;
     return this;
   }
 
+  /**
+   * Max open files.
+   *
+   * @param maxOpenFiles the max open files
+   * @return the rocks db configuration builder
+   */
   public RocksDBConfigurationBuilder maxOpenFiles(final int maxOpenFiles) {
     this.maxOpenFiles = maxOpenFiles;
     return this;
   }
 
+  /**
+   * Label.
+   *
+   * @param label the label
+   * @return the rocks db configuration builder
+   */
   public RocksDBConfigurationBuilder label(final String label) {
     this.label = label;
     return this;
   }
 
+  /**
+   * Cache capacity.
+   *
+   * @param cacheCapacity the cache capacity
+   * @return the rocks db configuration builder
+   */
   public RocksDBConfigurationBuilder cacheCapacity(final long cacheCapacity) {
     this.cacheCapacity = cacheCapacity;
     return this;
   }
 
-  public RocksDBConfigurationBuilder maxBackgroundCompactions(final int maxBackgroundCompactions) {
-    this.maxBackgroundCompactions = maxBackgroundCompactions;
+  /**
+   * Background thread count.
+   *
+   * @param backgroundThreadCount the background thread count
+   * @return the rocks db configuration builder
+   */
+  public RocksDBConfigurationBuilder backgroundThreadCount(final int backgroundThreadCount) {
+    this.backgroundThreadCount = backgroundThreadCount;
     return this;
   }
 
-  public RocksDBConfigurationBuilder backgroundThreadCount(final int backgroundThreadCount) {
-    this.backgroundThreadCount = backgroundThreadCount;
+  /**
+   * Is high spec.
+   *
+   * @param isHighSpec the is high spec
+   * @return the rocks db configuration builder
+   */
+  public RocksDBConfigurationBuilder isHighSpec(final boolean isHighSpec) {
+    this.isHighSpec = isHighSpec;
     return this;
   }
 
+  /**
+   * From.
+   *
+   * @param configuration the configuration
+   * @return the rocks db configuration builder
+   */
   public static RocksDBConfigurationBuilder from(final RocksDBFactoryConfiguration configuration) {
     return new RocksDBConfigurationBuilder()
         .backgroundThreadCount(configuration.getBackgroundThreadCount())
         .cacheCapacity(configuration.getCacheCapacity())
-        .maxBackgroundCompactions(configuration.getMaxBackgroundCompactions())
-        .maxOpenFiles(configuration.getMaxOpenFiles());
+        .maxOpenFiles(configuration.getMaxOpenFiles())
+        .isHighSpec(configuration.isHighSpec());
   }
 
+  /**
+   * Build rocks db configuration.
+   *
+   * @return the rocks db configuration
+   */
   public RocksDBConfiguration build() {
     return new RocksDBConfiguration(
-        databaseDir,
-        maxOpenFiles,
-        maxBackgroundCompactions,
-        backgroundThreadCount,
-        cacheCapacity,
-        label);
+        databaseDir, maxOpenFiles, backgroundThreadCount, cacheCapacity, label, isHighSpec);
   }
 }
diff --git a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBFactoryConfiguration.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBFactoryConfiguration.java
index e95e43482f9..69714112111 100644
--- a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBFactoryConfiguration.java
+++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/configuration/RocksDBFactoryConfiguration.java
@@ -14,37 +14,66 @@
  */
 package org.hyperledger.besu.plugin.services.storage.rocksdb.configuration;
 
+/** The RocksDb factory configuration. */
 public class RocksDBFactoryConfiguration {
 
   private final int maxOpenFiles;
-  private final int maxBackgroundCompactions;
   private final int backgroundThreadCount;
   private final long cacheCapacity;
+  private final boolean isHighSpec;
 
+  /**
+   * Instantiates a new RocksDb factory configuration.
+   *
+   * @param maxOpenFiles the max open files
+   * @param backgroundThreadCount the background thread count
+   * @param cacheCapacity the cache capacity
+   * @param isHighSpec the is high spec
+   */
   public RocksDBFactoryConfiguration(
       final int maxOpenFiles,
-      final int maxBackgroundCompactions,
       final int backgroundThreadCount,
-      final long cacheCapacity) {
-    this.maxBackgroundCompactions = maxBackgroundCompactions;
+      final long cacheCapacity,
+      final boolean isHighSpec) {
     this.backgroundThreadCount = backgroundThreadCount;
     this.maxOpenFiles = maxOpenFiles;
     this.cacheCapacity = cacheCapacity;
+    this.isHighSpec = isHighSpec;
   }
 
+  /**
+   * Gets max open files.
+   *
+   * @return the max open files
+   */
   public int getMaxOpenFiles() {
     return maxOpenFiles;
   }
 
-  public int getMaxBackgroundCompactions() {
-    return maxBackgroundCompactions;
-  }
-
+  /**
+   * Gets background thread count.
+   *
+   * @return the background thread count
+   */
   public int getBackgroundThreadCount() {
     return backgroundThreadCount;
   }
 
+  /**
+   * Gets cache capacity.
+   *
+   * @return the cache capacity
+   */
   public long getCacheCapacity() {
     return cacheCapacity;
   }
+
+  /**
+   * Is high spec.
+   *
+   * @return the boolean
+   */
+  public boolean isHighSpec() {
+    return isHighSpec;
+  }
 }
diff --git a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/OptimisticRocksDBColumnarKeyValueStorage.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/OptimisticRocksDBColumnarKeyValueStorage.java
new file mode 100644
index 00000000000..5fc8b3c1790
--- /dev/null
+++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/OptimisticRocksDBColumnarKeyValueStorage.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services.storage.rocksdb.segmented;
+
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.plugin.services.exception.StorageException;
+import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBMetricsFactory;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDbSegmentIdentifier;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBConfiguration;
+import org.hyperledger.besu.services.kvstore.SegmentedKeyValueStorageTransactionTransitionValidatorDecorator;
+
+import java.util.List;
+
+import org.rocksdb.OptimisticTransactionDB;
+import org.rocksdb.RocksDB;
+import org.rocksdb.RocksDBException;
+import org.rocksdb.WriteOptions;
+
+/** Optimistic RocksDB Columnar key value storage */
+public class OptimisticRocksDBColumnarKeyValueStorage extends RocksDBColumnarKeyValueStorage {
+  private final OptimisticTransactionDB db;
+
+  /**
+   * Instantiates a new Rocks db columnar key value optimistic storage.
+   *
+   * @param configuration the configuration
+   * @param segments the segments
+   * @param ignorableSegments the ignorable segments
+   * @param metricsSystem the metrics system
+   * @param rocksDBMetricsFactory the rocks db metrics factory
+   * @throws StorageException the storage exception
+   */
+  public OptimisticRocksDBColumnarKeyValueStorage(
+      final RocksDBConfiguration configuration,
+      final List<SegmentIdentifier> segments,
+      final List<SegmentIdentifier> ignorableSegments,
+      final MetricsSystem metricsSystem,
+      final RocksDBMetricsFactory rocksDBMetricsFactory)
+      throws StorageException {
+    super(configuration, segments, ignorableSegments, metricsSystem, rocksDBMetricsFactory);
+    try {
+
+      db =
+          OptimisticTransactionDB.open(
+              options, configuration.getDatabaseDir().toString(), columnDescriptors, columnHandles);
+      initMetrics();
+      initColumnHandler();
+
+    } catch (final RocksDBException e) {
+      throw new StorageException(e);
+    }
+  }
+
+  @Override
+  RocksDB getDB() {
+    return db;
+  }
+
+  /**
+   * Start a transaction
+   *
+   * @return the new transaction started
+   * @throws StorageException the storage exception
+   */
+  @Override
+  public Transaction<RocksDbSegmentIdentifier> startTransaction() throws StorageException {
+    throwIfClosed();
+    final WriteOptions writeOptions = new WriteOptions();
+    writeOptions.setIgnoreMissingColumnFamilies(true);
+    return new SegmentedKeyValueStorageTransactionTransitionValidatorDecorator<>(
+        new RocksDbTransaction(db.beginTransaction(writeOptions), writeOptions), this.closed::get);
+  }
+
+  /**
+   * Take snapshot RocksDb columnar key value snapshot.
+   *
+   * @param segment the segment
+   * @return the RocksDb columnar key value snapshot
+   * @throws StorageException the storage exception
+   */
+  public RocksDBColumnarKeyValueSnapshot takeSnapshot(final RocksDbSegmentIdentifier segment)
+      throws StorageException {
+    throwIfClosed();
+    return new RocksDBColumnarKeyValueSnapshot(db, segment, metrics);
+  }
+}
diff --git a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBColumnarKeyValueSnapshot.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBColumnarKeyValueSnapshot.java
new file mode 100644
index 00000000000..f3ce7103e0c
--- /dev/null
+++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBColumnarKeyValueSnapshot.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.plugin.services.storage.rocksdb.segmented;
+
+import static java.util.stream.Collectors.toUnmodifiableSet;
+
+import org.hyperledger.besu.plugin.services.exception.StorageException;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
+import org.hyperledger.besu.plugin.services.storage.SnappedKeyValueStorage;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBMetrics;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDbSegmentIdentifier;
+
+import java.io.IOException;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.tuweni.bytes.Bytes;
+import org.rocksdb.OptimisticTransactionDB;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The RocksDb columnar key value snapshot. */
+public class RocksDBColumnarKeyValueSnapshot implements SnappedKeyValueStorage {
+
+  private static final Logger LOG = LoggerFactory.getLogger(RocksDBColumnarKeyValueSnapshot.class);
+
+  /** The Db. */
+  final OptimisticTransactionDB db;
+
+  /** The Snap tx. */
+  final RocksDBSnapshotTransaction snapTx;
+
+  private final AtomicBoolean closed = new AtomicBoolean(false);
+
+  /**
+   * Instantiates a new RocksDb columnar key value snapshot.
+   *
+   * @param db the db
+   * @param segment the segment
+   * @param metrics the metrics
+   */
+  RocksDBColumnarKeyValueSnapshot(
+      final OptimisticTransactionDB db,
+      final RocksDbSegmentIdentifier segment,
+      final RocksDBMetrics metrics) {
+    this.db = db;
+    this.snapTx = new RocksDBSnapshotTransaction(db, segment.get(), metrics);
+  }
+
+  @Override
+  public Optional<byte[]> get(final byte[] key) throws StorageException {
+    throwIfClosed();
+    return snapTx.get(key);
+  }
+
+  @Override
+  public Stream<Pair<byte[], byte[]>> stream() {
+    throwIfClosed();
+    return snapTx.stream();
+  }
+
+  @Override
+  public Stream<Pair<byte[], byte[]>> streamFromKey(final byte[] startKey) {
+    return stream().filter(e -> Bytes.wrap(startKey).compareTo(Bytes.wrap(e.getKey())) <= 0);
+  }
+
+  @Override
+  public Stream<byte[]> streamKeys() {
+    throwIfClosed();
+    return snapTx.streamKeys();
+  }
+
+  @Override
+  public boolean tryDelete(final byte[] key) throws StorageException {
+    throwIfClosed();
+    snapTx.remove(key);
+    return true;
+  }
+
+  @Override
+  public Set<byte[]> getAllKeysThat(final Predicate<byte[]> returnCondition) {
+    return streamKeys().filter(returnCondition).collect(toUnmodifiableSet());
+  }
+
+  @Override
+  public Set<byte[]> getAllValuesFromKeysThat(final Predicate<byte[]> returnCondition) {
+    return stream()
+        .filter(pair -> returnCondition.test(pair.getKey()))
+        .map(Pair::getValue)
+        .collect(toUnmodifiableSet());
+  }
+
+  @Override
+  public KeyValueStorageTransaction startTransaction() throws StorageException {
+    // The use of a transaction on a transaction based key value store is dubious
+    // at best.  return our snapshot transaction instead.
+    return snapTx;
+  }
+
+  @Override
+  public boolean isClosed() {
+    return closed.get();
+  }
+
+  @Override
+  public void clear() {
+    throw new UnsupportedOperationException(
+        "RocksDBColumnarKeyValueSnapshot does not support clear");
+  }
+
+  @Override
+  public boolean containsKey(final byte[] key) throws StorageException {
+    throwIfClosed();
+    return snapTx.get(key).isPresent();
+  }
+
+  @Override
+  public void close() throws IOException {
+    if (closed.compareAndSet(false, true)) {
+      snapTx.close();
+    }
+  }
+
+  private void throwIfClosed() {
+    if (closed.get()) {
+      LOG.error("Attempting to use a closed RocksDBKeyValueStorage");
+      throw new IllegalStateException("Storage has been closed");
+    }
+  }
+
+  @Override
+  public KeyValueStorageTransaction getSnapshotTransaction() {
+    return snapTx;
+  }
+}
diff --git a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBColumnarKeyValueStorage.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBColumnarKeyValueStorage.java
index 93cf2de4a4a..7c3297aa8f6 100644
--- a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBColumnarKeyValueStorage.java
+++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBColumnarKeyValueStorage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors..
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -23,14 +23,15 @@
 import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBMetrics;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBMetricsFactory;
-import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDbKeyIterator;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDbIterator;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDbSegmentIdentifier;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDbUtil;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBConfiguration;
 import org.hyperledger.besu.services.kvstore.SegmentedKeyValueStorage;
-import org.hyperledger.besu.services.kvstore.SegmentedKeyValueStorageTransactionTransitionValidatorDecorator;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -41,143 +42,246 @@
 import java.util.stream.Stream;
 
 import com.google.common.collect.ImmutableMap;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.tuweni.bytes.Bytes;
 import org.rocksdb.BlockBasedTableConfig;
+import org.rocksdb.BloomFilter;
 import org.rocksdb.ColumnFamilyDescriptor;
 import org.rocksdb.ColumnFamilyHandle;
 import org.rocksdb.ColumnFamilyOptions;
+import org.rocksdb.CompressionType;
 import org.rocksdb.DBOptions;
 import org.rocksdb.Env;
 import org.rocksdb.LRUCache;
+import org.rocksdb.Options;
+import org.rocksdb.ReadOptions;
+import org.rocksdb.RocksDB;
 import org.rocksdb.RocksDBException;
 import org.rocksdb.RocksIterator;
 import org.rocksdb.Statistics;
 import org.rocksdb.Status;
-import org.rocksdb.TransactionDB;
 import org.rocksdb.TransactionDBOptions;
 import org.rocksdb.WriteOptions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class RocksDBColumnarKeyValueStorage
-    implements SegmentedKeyValueStorage<ColumnFamilyHandle> {
+/** The RocksDb columnar key value storage. */
+public abstract class RocksDBColumnarKeyValueStorage
+    implements SegmentedKeyValueStorage<RocksDbSegmentIdentifier> {
+
+  private static final Logger LOG = LoggerFactory.getLogger(RocksDBColumnarKeyValueStorage.class);
+  static final String DEFAULT_COLUMN = "default";
+  private static final String NO_SPACE_LEFT_ON_DEVICE = "No space left on device";
+  private static final int ROCKSDB_FORMAT_VERSION = 5;
+  private static final long ROCKSDB_BLOCK_SIZE = 32768;
+  /** RocksDb blockcache size when using the high spec option */
+  protected static final long ROCKSDB_BLOCKCACHE_SIZE_HIGH_SPEC = 1_073_741_824L;
+  /** RocksDb memtable size when using the high spec option */
+  protected static final long ROCKSDB_MEMTABLE_SIZE_HIGH_SPEC = 1_073_741_824L;
+  /** RocksDb number of log files to keep on disk */
+  private static final long NUMBER_OF_LOG_FILES_TO_KEEP = 7;
+  /** RocksDb Time to roll a log file (1 day = 3600 * 24 seconds) */
+  private static final long TIME_TO_ROLL_LOG_FILE = 86_400L;
 
   static {
     RocksDbUtil.loadNativeLibrary();
   }
 
-  private static final Logger LOG = LogManager.getLogger();
-  private static final String DEFAULT_COLUMN = "default";
-  private static final String NO_SPACE_LEFT_ON_DEVICE = "No space left on device";
-
-  private final DBOptions options;
-  private final TransactionDBOptions txOptions;
-  private final TransactionDB db;
-  private final AtomicBoolean closed = new AtomicBoolean(false);
-  private final Map<String, ColumnFamilyHandle> columnHandlesByName;
-  private final RocksDBMetrics metrics;
-  private final WriteOptions tryDeleteOptions = new WriteOptions().setNoSlowdown(true);
-
+  /** atomic boolean to track if the storage is closed */
+  protected final AtomicBoolean closed = new AtomicBoolean(false);
+
+  private final WriteOptions tryDeleteOptions =
+      new WriteOptions().setNoSlowdown(true).setIgnoreMissingColumnFamilies(true);
+  private final ReadOptions readOptions = new ReadOptions().setVerifyChecksums(false);
+  private final MetricsSystem metricsSystem;
+  private final RocksDBMetricsFactory rocksDBMetricsFactory;
+  private final RocksDBConfiguration configuration;
+  private Map<Bytes, String> segmentsById;
+  /** RocksDB DB options */
+  protected DBOptions options;
+
+  /** RocksDb transactionDB options */
+  protected TransactionDBOptions txOptions;
+  /** RocksDb statistics */
+  protected final Statistics stats = new Statistics();
+
+  /** RocksDB metrics */
+  protected RocksDBMetrics metrics;
+
+  /** Map of the columns handles by name */
+  protected Map<String, RocksDbSegmentIdentifier> columnHandlesByName;
+  /** Column descriptors */
+  protected List<ColumnFamilyDescriptor> columnDescriptors;
+  /** Column handles */
+  protected List<ColumnFamilyHandle> columnHandles;
+
+  /** Trimmed segments */
+  protected List<SegmentIdentifier> trimmedSegments;
+
+  /**
+   * Instantiates a new Rocks db columnar key value storage.
+   *
+   * @param configuration the configuration
+   * @param segments the segments
+   * @param ignorableSegments the ignorable segments
+   * @param metricsSystem the metrics system
+   * @param rocksDBMetricsFactory the rocks db metrics factory
+   * @throws StorageException the storage exception
+   */
   public RocksDBColumnarKeyValueStorage(
       final RocksDBConfiguration configuration,
       final List<SegmentIdentifier> segments,
+      final List<SegmentIdentifier> ignorableSegments,
       final MetricsSystem metricsSystem,
       final RocksDBMetricsFactory rocksDBMetricsFactory)
       throws StorageException {
 
-    try (final ColumnFamilyOptions columnFamilyOptions = new ColumnFamilyOptions()) {
-      final List<ColumnFamilyDescriptor> columnDescriptors =
-          segments.stream()
-              .map(segment -> new ColumnFamilyDescriptor(segment.getId()))
-              .collect(Collectors.toList());
+    this.configuration = configuration;
+    this.metricsSystem = metricsSystem;
+    this.rocksDBMetricsFactory = rocksDBMetricsFactory;
+
+    try {
+      final ColumnFamilyOptions columnFamilyOptions = new ColumnFamilyOptions();
+      trimmedSegments = new ArrayList<>(segments);
+      final List<byte[]> existingColumnFamilies =
+          RocksDB.listColumnFamilies(new Options(), configuration.getDatabaseDir().toString());
+      // Only ignore if not existed currently
+      ignorableSegments.stream()
+          .filter(
+              ignorableSegment ->
+                  existingColumnFamilies.stream()
+                      .noneMatch(existed -> Arrays.equals(existed, ignorableSegment.getId())))
+          .forEach(trimmedSegments::remove);
+      columnDescriptors =
+          trimmedSegments.stream().map(this::createColumnDescriptor).collect(Collectors.toList());
       columnDescriptors.add(
           new ColumnFamilyDescriptor(
               DEFAULT_COLUMN.getBytes(StandardCharsets.UTF_8),
-              columnFamilyOptions.setTableFormatConfig(
-                  createBlockBasedTableConfig(configuration))));
-
-      final Statistics stats = new Statistics();
-      options =
-          new DBOptions()
-              .setCreateIfMissing(true)
-              .setMaxOpenFiles(configuration.getMaxOpenFiles())
-              .setMaxBackgroundCompactions(configuration.getMaxBackgroundCompactions())
-              .setStatistics(stats)
-              .setCreateMissingColumnFamilies(true)
-              .setEnv(
-                  Env.getDefault().setBackgroundThreads(configuration.getBackgroundThreadCount()));
+              columnFamilyOptions
+                  .setTtl(0)
+                  .setCompressionType(CompressionType.LZ4_COMPRESSION)
+                  .setTableFormatConfig(createBlockBasedTableConfig(configuration))));
+
+      setGlobalOptions(configuration, stats);
 
       txOptions = new TransactionDBOptions();
-      final List<ColumnFamilyHandle> columnHandles = new ArrayList<>(columnDescriptors.size());
-      db =
-          TransactionDB.open(
-              options,
-              txOptions,
-              configuration.getDatabaseDir().toString(),
-              columnDescriptors,
-              columnHandles);
-      metrics = rocksDBMetricsFactory.create(metricsSystem, configuration, db, stats);
-      final Map<Bytes, String> segmentsById =
-          segments.stream()
-              .collect(
-                  Collectors.toMap(
-                      segment -> Bytes.wrap(segment.getId()), SegmentIdentifier::getName));
-
-      final ImmutableMap.Builder<String, ColumnFamilyHandle> builder = ImmutableMap.builder();
-
-      for (ColumnFamilyHandle columnHandle : columnHandles) {
-        final String segmentName =
-            requireNonNullElse(
-                segmentsById.get(Bytes.wrap(columnHandle.getName())), DEFAULT_COLUMN);
-        builder.put(segmentName, columnHandle);
-      }
-      columnHandlesByName = builder.build();
-    } catch (final RocksDBException e) {
+      columnHandles = new ArrayList<>(columnDescriptors.size());
+    } catch (RocksDBException e) {
       throw new StorageException(e);
     }
   }
 
-  private BlockBasedTableConfig createBlockBasedTableConfig(final RocksDBConfiguration config) {
-    final LRUCache cache = new LRUCache(config.getCacheCapacity());
-    return new BlockBasedTableConfig().setBlockCache(cache);
+  private ColumnFamilyDescriptor createColumnDescriptor(final SegmentIdentifier segment) {
+    final var options =
+        new ColumnFamilyOptions()
+            .setTtl(0)
+            .setCompressionType(CompressionType.LZ4_COMPRESSION)
+            .setTableFormatConfig(createBlockBasedTableConfig(configuration));
+
+    if (segment.containsStaticData()) {
+      options
+          .setEnableBlobFiles(true)
+          .setEnableBlobGarbageCollection(false)
+          .setMinBlobSize(100)
+          .setBlobCompressionType(CompressionType.LZ4_COMPRESSION);
+    }
+
+    return new ColumnFamilyDescriptor(segment.getId(), options);
+  }
+
+  private void setGlobalOptions(final RocksDBConfiguration configuration, final Statistics stats) {
+    options = new DBOptions();
+    options
+        .setCreateIfMissing(true)
+        .setMaxOpenFiles(configuration.getMaxOpenFiles())
+        .setStatistics(stats)
+        .setCreateMissingColumnFamilies(true)
+        .setLogFileTimeToRoll(TIME_TO_ROLL_LOG_FILE)
+        .setKeepLogFileNum(NUMBER_OF_LOG_FILES_TO_KEEP)
+        .setEnv(Env.getDefault().setBackgroundThreads(configuration.getBackgroundThreadCount()));
+
+    if (configuration.isHighSpec()) {
+      options.setDbWriteBufferSize(ROCKSDB_MEMTABLE_SIZE_HIGH_SPEC);
+    }
+  }
+
+  void initMetrics() {
+    metrics = rocksDBMetricsFactory.create(metricsSystem, configuration, getDB(), stats);
+  }
+
+  void initColumnHandler() throws RocksDBException {
+
+    segmentsById =
+        trimmedSegments.stream()
+            .collect(
+                Collectors.toMap(
+                    segment -> Bytes.wrap(segment.getId()), SegmentIdentifier::getName));
+    final ImmutableMap.Builder<String, RocksDbSegmentIdentifier> builder = ImmutableMap.builder();
+
+    for (ColumnFamilyHandle columnHandle : columnHandles) {
+      final String segmentName =
+          requireNonNullElse(segmentsById.get(Bytes.wrap(columnHandle.getName())), DEFAULT_COLUMN);
+      builder.put(segmentName, new RocksDbSegmentIdentifier(getDB(), columnHandle));
+    }
+    columnHandlesByName = builder.build();
+  }
+
+  BlockBasedTableConfig createBlockBasedTableConfig(final RocksDBConfiguration config) {
+    final LRUCache cache =
+        new LRUCache(
+            config.isHighSpec() ? ROCKSDB_BLOCKCACHE_SIZE_HIGH_SPEC : config.getCacheCapacity());
+    return new BlockBasedTableConfig()
+        .setFormatVersion(ROCKSDB_FORMAT_VERSION)
+        .setBlockCache(cache)
+        .setFilterPolicy(new BloomFilter(10, false))
+        .setPartitionFilters(true)
+        .setCacheIndexAndFilterBlocks(false)
+        .setBlockSize(ROCKSDB_BLOCK_SIZE);
   }
 
   @Override
-  public ColumnFamilyHandle getSegmentIdentifierByName(final SegmentIdentifier segment) {
+  public RocksDbSegmentIdentifier getSegmentIdentifierByName(final SegmentIdentifier segment) {
     return columnHandlesByName.get(segment.getName());
   }
 
   @Override
-  public Optional<byte[]> get(final ColumnFamilyHandle segment, final byte[] key)
+  public Optional<byte[]> get(final RocksDbSegmentIdentifier segment, final byte[] key)
       throws StorageException {
     throwIfClosed();
 
     try (final OperationTimer.TimingContext ignored = metrics.getReadLatency().startTimer()) {
-      return Optional.ofNullable(db.get(segment, key));
+      return Optional.ofNullable(getDB().get(segment.get(), readOptions, key));
     } catch (final RocksDBException e) {
       throw new StorageException(e);
     }
   }
 
   @Override
-  public Transaction<ColumnFamilyHandle> startTransaction() throws StorageException {
-    throwIfClosed();
-    final WriteOptions writeOptions = new WriteOptions();
-    return new SegmentedKeyValueStorageTransactionTransitionValidatorDecorator<>(
-        new RocksDbTransaction(db.beginTransaction(writeOptions), writeOptions));
+  public Stream<Pair<byte[], byte[]>> stream(final RocksDbSegmentIdentifier segmentHandle) {
+    final RocksIterator rocksIterator = getDB().newIterator(segmentHandle.get());
+    rocksIterator.seekToFirst();
+    return RocksDbIterator.create(rocksIterator).toStream();
   }
 
   @Override
-  public Stream<byte[]> streamKeys(final ColumnFamilyHandle segmentHandle) {
-    final RocksIterator rocksIterator = db.newIterator(segmentHandle);
+  public Stream<Pair<byte[], byte[]>> streamFromKey(
+      final RocksDbSegmentIdentifier segmentHandle, final byte[] startKey) {
+    final RocksIterator rocksIterator = getDB().newIterator(segmentHandle.get());
+    rocksIterator.seek(startKey);
+    return RocksDbIterator.create(rocksIterator).toStream();
+  }
+
+  @Override
+  public Stream<byte[]> streamKeys(final RocksDbSegmentIdentifier segmentHandle) {
+    final RocksIterator rocksIterator = getDB().newIterator(segmentHandle.get());
     rocksIterator.seekToFirst();
-    return RocksDbKeyIterator.create(rocksIterator).toStream();
+    return RocksDbIterator.create(rocksIterator).toStreamKeys();
   }
 
   @Override
-  public boolean tryDelete(final ColumnFamilyHandle segmentHandle, final byte[] key) {
+  public boolean tryDelete(final RocksDbSegmentIdentifier segmentHandle, final byte[] key) {
     try {
-      db.delete(segmentHandle, tryDeleteOptions, key);
+      getDB().delete(segmentHandle.get(), tryDeleteOptions, key);
       return true;
     } catch (RocksDBException e) {
       if (e.getStatus().getCode() == Status.Code.Incomplete) {
@@ -190,26 +294,29 @@ public boolean tryDelete(final ColumnFamilyHandle segmentHandle, final byte[] ke
 
   @Override
   public Set<byte[]> getAllKeysThat(
-      final ColumnFamilyHandle segmentHandle, final Predicate<byte[]> returnCondition) {
-    return streamKeys(segmentHandle).filter(returnCondition).collect(toUnmodifiableSet());
+      final RocksDbSegmentIdentifier segmentHandle, final Predicate<byte[]> returnCondition) {
+    return stream(segmentHandle)
+        .filter(pair -> returnCondition.test(pair.getKey()))
+        .map(Pair::getKey)
+        .collect(toUnmodifiableSet());
   }
 
   @Override
-  public void clear(final ColumnFamilyHandle segmentHandle) {
-    try (final RocksIterator rocksIterator = db.newIterator(segmentHandle)) {
-      rocksIterator.seekToFirst();
-      if (rocksIterator.isValid()) {
-        final byte[] firstKey = rocksIterator.key();
-        rocksIterator.seekToLast();
-        if (rocksIterator.isValid()) {
-          final byte[] lastKey = rocksIterator.key();
-          db.deleteRange(segmentHandle, firstKey, lastKey);
-          db.delete(segmentHandle, lastKey);
-        }
-      }
-    } catch (final RocksDBException e) {
-      throw new StorageException(e);
-    }
+  public Set<byte[]> getAllValuesFromKeysThat(
+      final RocksDbSegmentIdentifier segmentHandle, final Predicate<byte[]> returnCondition) {
+    return stream(segmentHandle)
+        .filter(pair -> returnCondition.test(pair.getKey()))
+        .map(Pair::getValue)
+        .collect(toUnmodifiableSet());
+  }
+
+  @Override
+  public void clear(final RocksDbSegmentIdentifier segmentHandle) {
+
+    columnHandlesByName.values().stream()
+        .filter(e -> e.equals(segmentHandle))
+        .findAny()
+        .ifPresent(RocksDbSegmentIdentifier::reset);
   }
 
   @Override
@@ -218,32 +325,45 @@ public void close() {
       txOptions.close();
       options.close();
       tryDeleteOptions.close();
-      columnHandlesByName.values().forEach(ColumnFamilyHandle::close);
-      db.close();
+      columnHandlesByName.values().stream()
+          .map(RocksDbSegmentIdentifier::get)
+          .forEach(ColumnFamilyHandle::close);
+      getDB().close();
     }
   }
 
-  private void throwIfClosed() {
+  @Override
+  public boolean isClosed() {
+    return closed.get();
+  }
+
+  void throwIfClosed() {
     if (closed.get()) {
       LOG.error("Attempting to use a closed RocksDbKeyValueStorage");
       throw new IllegalStateException("Storage has been closed");
     }
   }
 
-  private class RocksDbTransaction implements Transaction<ColumnFamilyHandle> {
+  class RocksDbTransaction implements Transaction<RocksDbSegmentIdentifier> {
 
     private final org.rocksdb.Transaction innerTx;
     private final WriteOptions options;
 
+    /**
+     * Instantiates a new RocksDb transaction.
+     *
+     * @param innerTx the inner tx
+     * @param options the write options
+     */
     RocksDbTransaction(final org.rocksdb.Transaction innerTx, final WriteOptions options) {
       this.innerTx = innerTx;
       this.options = options;
     }
 
     @Override
-    public void put(final ColumnFamilyHandle segment, final byte[] key, final byte[] value) {
+    public void put(final RocksDbSegmentIdentifier segment, final byte[] key, final byte[] value) {
       try (final OperationTimer.TimingContext ignored = metrics.getWriteLatency().startTimer()) {
-        innerTx.put(segment, key, value);
+        innerTx.put(segment.get(), key, value);
       } catch (final RocksDBException e) {
         if (e.getMessage().contains(NO_SPACE_LEFT_ON_DEVICE)) {
           LOG.error(e.getMessage());
@@ -254,9 +374,9 @@ public void put(final ColumnFamilyHandle segment, final byte[] key, final byte[]
     }
 
     @Override
-    public void remove(final ColumnFamilyHandle segment, final byte[] key) {
+    public void remove(final RocksDbSegmentIdentifier segment, final byte[] key) {
       try (final OperationTimer.TimingContext ignored = metrics.getRemoveLatency().startTimer()) {
-        innerTx.delete(segment, key);
+        innerTx.delete(segment.get(), key);
       } catch (final RocksDBException e) {
         if (e.getMessage().contains(NO_SPACE_LEFT_ON_DEVICE)) {
           LOG.error(e.getMessage());
@@ -267,7 +387,7 @@ public void remove(final ColumnFamilyHandle segment, final byte[] key) {
     }
 
     @Override
-    public void commit() throws StorageException {
+    public synchronized void commit() throws StorageException {
       try (final OperationTimer.TimingContext ignored = metrics.getCommitLatency().startTimer()) {
         innerTx.commit();
       } catch (final RocksDBException e) {
@@ -302,4 +422,6 @@ private void close() {
       options.close();
     }
   }
+
+  abstract RocksDB getDB();
 }
diff --git a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBSnapshot.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBSnapshot.java
new file mode 100644
index 00000000000..7fc2d048cf8
--- /dev/null
+++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBSnapshot.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.plugin.services.storage.rocksdb.segmented;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.rocksdb.OptimisticTransactionDB;
+import org.rocksdb.Snapshot;
+
+/**
+ * Wraps and reference counts a Snapshot object from an OptimisticTransactionDB such that it can be
+ * used as the basis of multiple RocksDBSnapshotTransaction's, and released once it is no longer in
+ * use.
+ */
+class RocksDBSnapshot {
+
+  private final OptimisticTransactionDB db;
+  private final Snapshot dbSnapshot;
+  private final AtomicInteger usages = new AtomicInteger(0);
+
+  RocksDBSnapshot(final OptimisticTransactionDB db) {
+    this.db = db;
+    this.dbSnapshot = db.getSnapshot();
+  }
+
+  synchronized Snapshot markAndUseSnapshot() {
+    usages.incrementAndGet();
+    return dbSnapshot;
+  }
+
+  synchronized void unMarkSnapshot() {
+    if (usages.decrementAndGet() < 1) {
+      db.releaseSnapshot(dbSnapshot);
+      dbSnapshot.close();
+    }
+  }
+}
diff --git a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBSnapshotTransaction.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBSnapshotTransaction.java
new file mode 100644
index 00000000000..dbe460b3ffb
--- /dev/null
+++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBSnapshotTransaction.java
@@ -0,0 +1,219 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.plugin.services.storage.rocksdb.segmented;
+
+import org.hyperledger.besu.plugin.services.exception.StorageException;
+import org.hyperledger.besu.plugin.services.metrics.OperationTimer;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBMetrics;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDbIterator;
+
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Stream;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.rocksdb.ColumnFamilyHandle;
+import org.rocksdb.OptimisticTransactionDB;
+import org.rocksdb.ReadOptions;
+import org.rocksdb.RocksDBException;
+import org.rocksdb.RocksIterator;
+import org.rocksdb.Transaction;
+import org.rocksdb.WriteOptions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Rocks db snapshot transaction. */
+public class RocksDBSnapshotTransaction implements KeyValueStorageTransaction, AutoCloseable {
+  private static final Logger LOG = LoggerFactory.getLogger(RocksDBSnapshotTransaction.class);
+  private static final String NO_SPACE_LEFT_ON_DEVICE = "No space left on device";
+  private final RocksDBMetrics metrics;
+  private final OptimisticTransactionDB db;
+  private final ColumnFamilyHandle columnFamilyHandle;
+  private final Transaction snapTx;
+  private final RocksDBSnapshot snapshot;
+  private final WriteOptions writeOptions;
+  private final ReadOptions readOptions;
+  private final AtomicBoolean isClosed = new AtomicBoolean(false);
+
+  /**
+   * Instantiates a new RocksDb snapshot transaction.
+   *
+   * @param db the db
+   * @param columnFamilyHandle the column family handle
+   * @param metrics the metrics
+   */
+  RocksDBSnapshotTransaction(
+      final OptimisticTransactionDB db,
+      final ColumnFamilyHandle columnFamilyHandle,
+      final RocksDBMetrics metrics) {
+    this.metrics = metrics;
+    this.db = db;
+    this.columnFamilyHandle = columnFamilyHandle;
+    this.snapshot = new RocksDBSnapshot(db);
+    this.writeOptions = new WriteOptions();
+    this.snapTx = db.beginTransaction(writeOptions);
+    this.readOptions =
+        new ReadOptions().setVerifyChecksums(false).setSnapshot(snapshot.markAndUseSnapshot());
+  }
+
+  private RocksDBSnapshotTransaction(
+      final OptimisticTransactionDB db,
+      final ColumnFamilyHandle columnFamilyHandle,
+      final RocksDBMetrics metrics,
+      final RocksDBSnapshot snapshot,
+      final Transaction snapTx,
+      final ReadOptions readOptions) {
+    this.metrics = metrics;
+    this.db = db;
+    this.columnFamilyHandle = columnFamilyHandle;
+    this.snapshot = snapshot;
+    this.writeOptions = new WriteOptions();
+    this.readOptions = readOptions;
+    this.snapTx = snapTx;
+  }
+
+  /**
+   * Get data against given key.
+   *
+   * @param key the key
+   * @return the optional data
+   */
+  public Optional<byte[]> get(final byte[] key) {
+    throwIfClosed();
+
+    try (final OperationTimer.TimingContext ignored = metrics.getReadLatency().startTimer()) {
+      return Optional.ofNullable(snapTx.get(columnFamilyHandle, readOptions, key));
+    } catch (final RocksDBException e) {
+      throw new StorageException(e);
+    }
+  }
+
+  @Override
+  public void put(final byte[] key, final byte[] value) {
+    throwIfClosed();
+
+    try (final OperationTimer.TimingContext ignored = metrics.getWriteLatency().startTimer()) {
+      snapTx.put(columnFamilyHandle, key, value);
+    } catch (final RocksDBException e) {
+      if (e.getMessage().contains(NO_SPACE_LEFT_ON_DEVICE)) {
+        LOG.error(e.getMessage());
+        System.exit(0);
+      }
+      throw new StorageException(e);
+    }
+  }
+
+  @Override
+  public void remove(final byte[] key) {
+    throwIfClosed();
+
+    try (final OperationTimer.TimingContext ignored = metrics.getRemoveLatency().startTimer()) {
+      snapTx.delete(columnFamilyHandle, key);
+    } catch (final RocksDBException e) {
+      if (e.getMessage().contains(NO_SPACE_LEFT_ON_DEVICE)) {
+        LOG.error(e.getMessage());
+        System.exit(0);
+      }
+      throw new StorageException(e);
+    }
+  }
+
+  /**
+   * Stream.
+   *
+   * @return the stream
+   */
+  public Stream<Pair<byte[], byte[]>> stream() {
+    throwIfClosed();
+
+    final RocksIterator rocksIterator = db.newIterator(columnFamilyHandle, readOptions);
+    rocksIterator.seekToFirst();
+    return RocksDbIterator.create(rocksIterator).toStream();
+  }
+
+  /**
+   * Stream keys.
+   *
+   * @return the stream
+   */
+  public Stream<byte[]> streamKeys() {
+    throwIfClosed();
+
+    final RocksIterator rocksIterator = db.newIterator(columnFamilyHandle, readOptions);
+    rocksIterator.seekToFirst();
+    return RocksDbIterator.create(rocksIterator).toStreamKeys();
+  }
+
+  @Override
+  public void commit() throws StorageException {
+    // no-op
+  }
+
+  @Override
+  public void rollback() {
+    throwIfClosed();
+
+    try {
+      snapTx.rollback();
+      metrics.getRollbackCount().inc();
+    } catch (final RocksDBException e) {
+      if (e.getMessage().contains(NO_SPACE_LEFT_ON_DEVICE)) {
+        LOG.error(e.getMessage());
+        System.exit(0);
+      }
+      throw new StorageException(e);
+    } finally {
+      close();
+    }
+  }
+
+  /**
+   * Copy.
+   *
+   * @return the rocks db snapshot transaction
+   */
+  public RocksDBSnapshotTransaction copy() {
+    throwIfClosed();
+    try {
+      var copyReadOptions = new ReadOptions().setSnapshot(snapshot.markAndUseSnapshot());
+      var copySnapTx = db.beginTransaction(writeOptions);
+      copySnapTx.rebuildFromWriteBatch(snapTx.getWriteBatch().getWriteBatch());
+      return new RocksDBSnapshotTransaction(
+          db, columnFamilyHandle, metrics, snapshot, copySnapTx, copyReadOptions);
+    } catch (Exception ex) {
+      LOG.error("Failed to copy snapshot transaction", ex);
+      snapshot.unMarkSnapshot();
+      throw new StorageException(ex);
+    }
+  }
+
+  @Override
+  public void close() {
+    snapTx.close();
+    writeOptions.close();
+    readOptions.close();
+    snapshot.unMarkSnapshot();
+    isClosed.set(true);
+  }
+
+  private void throwIfClosed() {
+    if (isClosed.get()) {
+      LOG.error("Attempting to use a closed RocksDBSnapshotTransaction");
+      throw new StorageException("Storage has already been closed");
+    }
+  }
+}
diff --git a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/TransactionDBRocksDBColumnarKeyValueStorage.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/TransactionDBRocksDBColumnarKeyValueStorage.java
new file mode 100644
index 00000000000..b6433ad19e7
--- /dev/null
+++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/TransactionDBRocksDBColumnarKeyValueStorage.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services.storage.rocksdb.segmented;
+
+import org.hyperledger.besu.plugin.services.MetricsSystem;
+import org.hyperledger.besu.plugin.services.exception.StorageException;
+import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBMetricsFactory;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDbSegmentIdentifier;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBConfiguration;
+import org.hyperledger.besu.services.kvstore.SegmentedKeyValueStorageTransactionTransitionValidatorDecorator;
+
+import java.util.List;
+
+import org.rocksdb.RocksDB;
+import org.rocksdb.RocksDBException;
+import org.rocksdb.TransactionDB;
+import org.rocksdb.WriteOptions;
+
+/** TransactionDB RocksDB Columnar key value storage */
+public class TransactionDBRocksDBColumnarKeyValueStorage extends RocksDBColumnarKeyValueStorage {
+
+  private final TransactionDB db;
+
+  /**
+   * The constructor of TransactionDBRocksDBColumnarKeyValueStorage
+   *
+   * @param configuration the RocksDB configuration
+   * @param segments the segments
+   * @param ignorableSegments the ignorable segments
+   * @param metricsSystem the metrics system
+   * @param rocksDBMetricsFactory the rocksdb metrics factory
+   * @throws StorageException the storage exception
+   */
+  public TransactionDBRocksDBColumnarKeyValueStorage(
+      final RocksDBConfiguration configuration,
+      final List<SegmentIdentifier> segments,
+      final List<SegmentIdentifier> ignorableSegments,
+      final MetricsSystem metricsSystem,
+      final RocksDBMetricsFactory rocksDBMetricsFactory)
+      throws StorageException {
+    super(configuration, segments, ignorableSegments, metricsSystem, rocksDBMetricsFactory);
+    try {
+
+      db =
+          TransactionDB.open(
+              options,
+              txOptions,
+              configuration.getDatabaseDir().toString(),
+              columnDescriptors,
+              columnHandles);
+      initMetrics();
+      initColumnHandler();
+
+    } catch (final RocksDBException e) {
+      throw new StorageException(e);
+    }
+  }
+
+  @Override
+  RocksDB getDB() {
+    return db;
+  }
+
+  /**
+   * Start a transaction
+   *
+   * @return the new transaction started
+   * @throws StorageException the storage exception
+   */
+  @Override
+  public Transaction<RocksDbSegmentIdentifier> startTransaction() throws StorageException {
+    throwIfClosed();
+    final WriteOptions writeOptions = new WriteOptions();
+    writeOptions.setIgnoreMissingColumnFamilies(true);
+    return new SegmentedKeyValueStorageTransactionTransitionValidatorDecorator<>(
+        new RocksDbTransaction(db.beginTransaction(writeOptions), writeOptions), this.closed::get);
+  }
+}
diff --git a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/unsegmented/RocksDBKeyValueStorage.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/unsegmented/RocksDBKeyValueStorage.java
index 66c7fe26701..6f32bd89c19 100644
--- a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/unsegmented/RocksDBKeyValueStorage.java
+++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/unsegmented/RocksDBKeyValueStorage.java
@@ -23,7 +23,7 @@
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBMetrics;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBMetricsFactory;
-import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDbKeyIterator;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDbIterator;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDbUtil;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBConfiguration;
 import org.hyperledger.besu.services.kvstore.KeyValueStorageTransactionTransitionValidatorDecorator;
@@ -34,34 +34,45 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.tuweni.bytes.Bytes;
 import org.rocksdb.BlockBasedTableConfig;
 import org.rocksdb.LRUCache;
+import org.rocksdb.OptimisticTransactionDB;
 import org.rocksdb.Options;
+import org.rocksdb.ReadOptions;
 import org.rocksdb.RocksDBException;
 import org.rocksdb.RocksIterator;
 import org.rocksdb.Statistics;
 import org.rocksdb.Status;
-import org.rocksdb.TransactionDB;
-import org.rocksdb.TransactionDBOptions;
 import org.rocksdb.WriteOptions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Rocks db key value storage. */
 public class RocksDBKeyValueStorage implements KeyValueStorage {
 
   static {
     RocksDbUtil.loadNativeLibrary();
   }
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(RocksDBKeyValueStorage.class);
 
   private final Options options;
-  private final TransactionDBOptions txOptions;
-  private final TransactionDB db;
+  private final OptimisticTransactionDB db;
   private final AtomicBoolean closed = new AtomicBoolean(false);
   private final RocksDBMetrics rocksDBMetrics;
-  private final WriteOptions tryDeleteOptions = new WriteOptions().setNoSlowdown(true);
-
+  private final WriteOptions tryDeleteOptions =
+      new WriteOptions().setNoSlowdown(true).setIgnoreMissingColumnFamilies(true);
+  private final ReadOptions readOptions = new ReadOptions().setVerifyChecksums(false);
+
+  /**
+   * Instantiates a new Rocks db key value storage.
+   *
+   * @param configuration the configuration
+   * @param metricsSystem the metrics system
+   * @param rocksDBMetricsFactory the rocks db metrics factory
+   */
   public RocksDBKeyValueStorage(
       final RocksDBConfiguration configuration,
       final MetricsSystem metricsSystem,
@@ -74,12 +85,10 @@ public RocksDBKeyValueStorage(
               .setCreateIfMissing(true)
               .setMaxOpenFiles(configuration.getMaxOpenFiles())
               .setTableFormatConfig(createBlockBasedTableConfig(configuration))
-              .setMaxBackgroundCompactions(configuration.getMaxBackgroundCompactions())
               .setStatistics(stats);
       options.getEnv().setBackgroundThreads(configuration.getBackgroundThreadCount());
 
-      txOptions = new TransactionDBOptions();
-      db = TransactionDB.open(options, txOptions, configuration.getDatabaseDir().toString());
+      db = OptimisticTransactionDB.open(options, configuration.getDatabaseDir().toString());
       rocksDBMetrics = rocksDBMetricsFactory.create(metricsSystem, configuration, db, stats);
     } catch (final RocksDBException e) {
       throw new StorageException(e);
@@ -88,6 +97,8 @@ public RocksDBKeyValueStorage(
 
   @Override
   public void clear() throws StorageException {
+    throwIfClosed();
+
     try (final RocksIterator rocksIterator = db.newIterator()) {
       rocksIterator.seekToFirst();
       if (rocksIterator.isValid()) {
@@ -115,7 +126,7 @@ public Optional<byte[]> get(final byte[] key) throws StorageException {
 
     try (final OperationTimer.TimingContext ignored =
         rocksDBMetrics.getReadLatency().startTimer()) {
-      return Optional.ofNullable(db.get(key));
+      return Optional.ofNullable(db.get(readOptions, key));
     } catch (final RocksDBException e) {
       throw new StorageException(e);
     }
@@ -123,18 +134,46 @@ public Optional<byte[]> get(final byte[] key) throws StorageException {
 
   @Override
   public Set<byte[]> getAllKeysThat(final Predicate<byte[]> returnCondition) {
-    return streamKeys().filter(returnCondition).collect(toUnmodifiableSet());
+    return stream()
+        .filter(pair -> returnCondition.test(pair.getKey()))
+        .map(Pair::getKey)
+        .collect(toUnmodifiableSet());
+  }
+
+  @Override
+  public Stream<Pair<byte[], byte[]>> stream() {
+    throwIfClosed();
+
+    final RocksIterator rocksIterator = db.newIterator();
+    rocksIterator.seekToFirst();
+    return RocksDbIterator.create(rocksIterator).toStream();
+  }
+
+  @Override
+  public Stream<Pair<byte[], byte[]>> streamFromKey(final byte[] startKey) {
+    return stream().filter(e -> Bytes.wrap(startKey).compareTo(Bytes.wrap(e.getKey())) <= 0);
   }
 
   @Override
   public Stream<byte[]> streamKeys() {
+    throwIfClosed();
+
     final RocksIterator rocksIterator = db.newIterator();
     rocksIterator.seekToFirst();
-    return RocksDbKeyIterator.create(rocksIterator).toStream();
+    return RocksDbIterator.create(rocksIterator).toStreamKeys();
+  }
+
+  @Override
+  public Set<byte[]> getAllValuesFromKeysThat(final Predicate<byte[]> returnCondition) {
+    return stream()
+        .filter(pair -> returnCondition.test(pair.getKey()))
+        .map(Pair::getValue)
+        .collect(toUnmodifiableSet());
   }
 
   @Override
   public boolean tryDelete(final byte[] key) {
+    throwIfClosed();
     try {
       db.delete(tryDeleteOptions, key);
       return true;
@@ -151,15 +190,20 @@ public boolean tryDelete(final byte[] key) {
   public KeyValueStorageTransaction startTransaction() throws StorageException {
     throwIfClosed();
     final WriteOptions options = new WriteOptions();
+    options.setIgnoreMissingColumnFamilies(true);
     return new KeyValueStorageTransactionTransitionValidatorDecorator(
         new RocksDBTransaction(db.beginTransaction(options), options, rocksDBMetrics));
   }
 
+  @Override
+  public boolean isClosed() {
+    return closed.get();
+  }
+
   @Override
   public void close() {
     if (closed.compareAndSet(false, true)) {
       tryDeleteOptions.close();
-      txOptions.close();
       options.close();
       db.close();
     }
diff --git a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/unsegmented/RocksDBTransaction.java b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/unsegmented/RocksDBTransaction.java
index 7fac1abc6d9..ffd5a1596f6 100644
--- a/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/unsegmented/RocksDBTransaction.java
+++ b/plugins/rocksdb/src/main/java/org/hyperledger/besu/plugin/services/storage/rocksdb/unsegmented/RocksDBTransaction.java
@@ -19,20 +19,28 @@
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBMetrics;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.rocksdb.RocksDBException;
 import org.rocksdb.Transaction;
 import org.rocksdb.WriteOptions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The RocksDb transaction. */
 public class RocksDBTransaction implements KeyValueStorageTransaction {
-  private static final Logger logger = LogManager.getLogger();
+  private static final Logger logger = LoggerFactory.getLogger(RocksDBTransaction.class);
   private static final String NO_SPACE_LEFT_ON_DEVICE = "No space left on device";
 
   private final RocksDBMetrics metrics;
   private final Transaction innerTx;
   private final WriteOptions options;
 
+  /**
+   * Instantiates a new RocksDb transaction.
+   *
+   * @param innerTx the inner tx
+   * @param options the options
+   * @param metrics the metrics
+   */
   RocksDBTransaction(
       final Transaction innerTx, final WriteOptions options, final RocksDBMetrics metrics) {
     this.innerTx = innerTx;
diff --git a/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBCLIOptionsTest.java b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBCLIOptionsTest.java
index d9a256328d9..d93d6f8e7d9 100644
--- a/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBCLIOptionsTest.java
+++ b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBCLIOptionsTest.java
@@ -15,10 +15,13 @@
 package org.hyperledger.besu.plugin.services.storage.rocksdb;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.CACHE_CAPACITY_FLAG;
 import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_BACKGROUND_THREAD_COUNT;
 import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_CACHE_CAPACITY;
-import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_BACKGROUND_COMPACTIONS;
+import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_IS_HIGH_SPEC;
 import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.DEFAULT_MAX_OPEN_FILES;
+import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.IS_HIGH_SPEC;
+import static org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions.MAX_OPEN_FILES_FLAG;
 
 import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBCLIOptions;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBFactoryConfiguration;
@@ -28,26 +31,18 @@
 
 public class RocksDBCLIOptionsTest {
 
-  private static final String MAX_OPEN_FILES_FLAG = "--Xplugin-rocksdb-max-open-files";
-  private static final String CACHE_CAPACITY_FLAG = "--Xplugin-rocksdb-cache-capacity";
-  private static final String MAX_BACKGROUND_COMPACTIONS_FLAG =
-      "--Xplugin-rocksdb-max-background-compactions";
-  private static final String BACKGROUND_THREAD_COUNT_FLAG =
-      "--Xplugin-rocksdb-background-thread-count";
-
   @Test
   public void defaultValues() {
     final RocksDBCLIOptions options = RocksDBCLIOptions.create();
 
-    new CommandLine(options).parse();
+    new CommandLine(options).parseArgs();
 
     final RocksDBFactoryConfiguration configuration = options.toDomainObject();
     assertThat(configuration).isNotNull();
     assertThat(configuration.getBackgroundThreadCount()).isEqualTo(DEFAULT_BACKGROUND_THREAD_COUNT);
     assertThat(configuration.getCacheCapacity()).isEqualTo(DEFAULT_CACHE_CAPACITY);
-    assertThat(configuration.getMaxBackgroundCompactions())
-        .isEqualTo(DEFAULT_MAX_BACKGROUND_COMPACTIONS);
     assertThat(configuration.getMaxOpenFiles()).isEqualTo(DEFAULT_MAX_OPEN_FILES);
+    assertThat(configuration.isHighSpec()).isEqualTo(DEFAULT_IS_HIGH_SPEC);
   }
 
   @Test
@@ -56,15 +51,15 @@ public void customBackgroundThreadCount() {
     final int expectedBackgroundThreadCount = 99;
 
     new CommandLine(options)
-        .parse(BACKGROUND_THREAD_COUNT_FLAG, "" + expectedBackgroundThreadCount);
+        .parseArgs(
+            RocksDBCLIOptions.BACKGROUND_THREAD_COUNT_FLAG, "" + expectedBackgroundThreadCount);
 
     final RocksDBFactoryConfiguration configuration = options.toDomainObject();
     assertThat(configuration).isNotNull();
     assertThat(configuration.getBackgroundThreadCount()).isEqualTo(expectedBackgroundThreadCount);
     assertThat(configuration.getCacheCapacity()).isEqualTo(DEFAULT_CACHE_CAPACITY);
-    assertThat(configuration.getMaxBackgroundCompactions())
-        .isEqualTo(DEFAULT_MAX_BACKGROUND_COMPACTIONS);
     assertThat(configuration.getMaxOpenFiles()).isEqualTo(DEFAULT_MAX_OPEN_FILES);
+    assertThat(configuration.isHighSpec()).isEqualTo(DEFAULT_IS_HIGH_SPEC);
   }
 
   @Test
@@ -72,47 +67,41 @@ public void customCacheCapacity() {
     final RocksDBCLIOptions options = RocksDBCLIOptions.create();
     final long expectedCacheCapacity = 400050006000L;
 
-    new CommandLine(options).parse(CACHE_CAPACITY_FLAG, "" + expectedCacheCapacity);
+    new CommandLine(options).parseArgs(CACHE_CAPACITY_FLAG, "" + expectedCacheCapacity);
 
     final RocksDBFactoryConfiguration configuration = options.toDomainObject();
     assertThat(configuration).isNotNull();
     assertThat(configuration.getBackgroundThreadCount()).isEqualTo(DEFAULT_BACKGROUND_THREAD_COUNT);
     assertThat(configuration.getCacheCapacity()).isEqualTo(expectedCacheCapacity);
-    assertThat(configuration.getMaxBackgroundCompactions())
-        .isEqualTo(DEFAULT_MAX_BACKGROUND_COMPACTIONS);
     assertThat(configuration.getMaxOpenFiles()).isEqualTo(DEFAULT_MAX_OPEN_FILES);
+    assertThat(configuration.isHighSpec()).isEqualTo(DEFAULT_IS_HIGH_SPEC);
   }
 
   @Test
-  public void customMaxBackgroundCompactions() {
+  public void customMaxOpenFiles() {
     final RocksDBCLIOptions options = RocksDBCLIOptions.create();
-    final int expectedMaxBackgroundCompactions = 223344;
+    final int expectedMaxOpenFiles = 65;
 
-    new CommandLine(options)
-        .parse(MAX_BACKGROUND_COMPACTIONS_FLAG, "" + expectedMaxBackgroundCompactions);
+    new CommandLine(options).parseArgs(MAX_OPEN_FILES_FLAG, "" + expectedMaxOpenFiles);
 
     final RocksDBFactoryConfiguration configuration = options.toDomainObject();
     assertThat(configuration).isNotNull();
     assertThat(configuration.getBackgroundThreadCount()).isEqualTo(DEFAULT_BACKGROUND_THREAD_COUNT);
     assertThat(configuration.getCacheCapacity()).isEqualTo(DEFAULT_CACHE_CAPACITY);
-    assertThat(configuration.getMaxBackgroundCompactions())
-        .isEqualTo(expectedMaxBackgroundCompactions);
-    assertThat(configuration.getMaxOpenFiles()).isEqualTo(DEFAULT_MAX_OPEN_FILES);
+    assertThat(configuration.getMaxOpenFiles()).isEqualTo(expectedMaxOpenFiles);
+    assertThat(configuration.isHighSpec()).isEqualTo(DEFAULT_IS_HIGH_SPEC);
   }
 
   @Test
-  public void customMaxOpenFiles() {
+  public void customIsHighSpec() {
     final RocksDBCLIOptions options = RocksDBCLIOptions.create();
-    final int expectedMaxOpenFiles = 65;
 
-    new CommandLine(options).parse(MAX_OPEN_FILES_FLAG, "" + expectedMaxOpenFiles);
+    new CommandLine(options).parseArgs(IS_HIGH_SPEC);
 
     final RocksDBFactoryConfiguration configuration = options.toDomainObject();
     assertThat(configuration).isNotNull();
     assertThat(configuration.getBackgroundThreadCount()).isEqualTo(DEFAULT_BACKGROUND_THREAD_COUNT);
     assertThat(configuration.getCacheCapacity()).isEqualTo(DEFAULT_CACHE_CAPACITY);
-    assertThat(configuration.getMaxBackgroundCompactions())
-        .isEqualTo(DEFAULT_MAX_BACKGROUND_COMPACTIONS);
-    assertThat(configuration.getMaxOpenFiles()).isEqualTo(expectedMaxOpenFiles);
+    assertThat(configuration.isHighSpec()).isEqualTo(Boolean.TRUE);
   }
 }
diff --git a/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValuePrivacyStorageFactoryTest.java b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValuePrivacyStorageFactoryTest.java
index d786f9322b4..7106b1ad4f4 100644
--- a/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValuePrivacyStorageFactoryTest.java
+++ b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValuePrivacyStorageFactoryTest.java
@@ -67,17 +67,11 @@ public void shouldDetectVersion0DatabaseIfNoMetadataFileFound() throws Exception
     // Side effect is creation of the Metadata version file
     storageFactory.create(segment, commonConfiguration, metricsSystem);
 
-    assertThat(DatabaseMetadata.lookUpFrom(commonConfiguration.getDataPath()).maybePrivacyVersion())
-        .isNotEmpty();
+    assertThat(DatabaseMetadata.lookUpFrom(tempDataDir).maybePrivacyVersion()).isNotEmpty();
 
-    assertThat(DatabaseMetadata.lookUpFrom(commonConfiguration.getDataPath()).getVersion())
-        .isEqualTo(0);
+    assertThat(DatabaseMetadata.lookUpFrom(tempDataDir).getVersion()).isEqualTo(0);
 
-    assertThat(
-            DatabaseMetadata.lookUpFrom(commonConfiguration.getDataPath())
-                .maybePrivacyVersion()
-                .get())
-        .isEqualTo(0);
+    assertThat(DatabaseMetadata.lookUpFrom(tempDataDir).maybePrivacyVersion().get()).isEqualTo(0);
   }
 
   @Test
@@ -98,16 +92,11 @@ public void shouldCreateCorrectMetadataFileForLatestVersion() throws Exception {
     // Side effect is creation of the Metadata version file
     storageFactory.create(segment, commonConfiguration, metricsSystem);
 
-    assertThat(DatabaseMetadata.lookUpFrom(commonConfiguration.getDataPath()).maybePrivacyVersion())
-        .isNotEmpty();
+    assertThat(DatabaseMetadata.lookUpFrom(tempDataDir).maybePrivacyVersion()).isNotEmpty();
 
-    assertThat(DatabaseMetadata.lookUpFrom(commonConfiguration.getDataPath()).getVersion())
-        .isEqualTo(DEFAULT_VERSION);
+    assertThat(DatabaseMetadata.lookUpFrom(tempDataDir).getVersion()).isEqualTo(DEFAULT_VERSION);
 
-    assertThat(
-            DatabaseMetadata.lookUpFrom(commonConfiguration.getDataPath())
-                .maybePrivacyVersion()
-                .get())
+    assertThat(DatabaseMetadata.lookUpFrom(tempDataDir).maybePrivacyVersion().get())
         .isEqualTo(DEFAULT_PRIVACY_VERSION);
   }
 
@@ -125,24 +114,18 @@ public void shouldUpdateCorrectMetadataFileForLatestVersion() throws Exception {
 
     storageFactory.create(segment, commonConfiguration, metricsSystem);
 
-    assertThat(DatabaseMetadata.lookUpFrom(commonConfiguration.getDataPath()).maybePrivacyVersion())
-        .isEmpty();
+    assertThat(DatabaseMetadata.lookUpFrom(tempDataDir).maybePrivacyVersion()).isEmpty();
 
-    assertThat(DatabaseMetadata.lookUpFrom(commonConfiguration.getDataPath()).getVersion())
-        .isEqualTo(DEFAULT_VERSION);
+    assertThat(DatabaseMetadata.lookUpFrom(tempDataDir).getVersion()).isEqualTo(DEFAULT_VERSION);
 
     final RocksDBKeyValuePrivacyStorageFactory privacyStorageFactory =
         new RocksDBKeyValuePrivacyStorageFactory(storageFactory);
 
     privacyStorageFactory.create(segment, commonConfiguration, metricsSystem);
 
-    assertThat(DatabaseMetadata.lookUpFrom(commonConfiguration.getDataPath()).maybePrivacyVersion())
-        .isNotEmpty();
+    assertThat(DatabaseMetadata.lookUpFrom(tempDataDir).maybePrivacyVersion()).isNotEmpty();
 
-    assertThat(
-            DatabaseMetadata.lookUpFrom(commonConfiguration.getDataPath())
-                .maybePrivacyVersion()
-                .get())
+    assertThat(DatabaseMetadata.lookUpFrom(tempDataDir).maybePrivacyVersion().get())
         .isEqualTo(DEFAULT_PRIVACY_VERSION);
   }
 }
diff --git a/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValueStorageFactoryTest.java b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValueStorageFactoryTest.java
index 156ac51161a..000b5079c04 100644
--- a/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValueStorageFactoryTest.java
+++ b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBKeyValueStorageFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -67,8 +67,7 @@ public void shouldCreateCorrectMetadataFileForLatestVersion() throws Exception {
     // Side effect is creation of the Metadata version file
     storageFactory.create(segment, commonConfiguration, metricsSystem);
 
-    assertThat(DatabaseMetadata.lookUpFrom(commonConfiguration.getDataPath()).getVersion())
-        .isEqualTo(DEFAULT_VERSION);
+    assertThat(DatabaseMetadata.lookUpFrom(tempDataDir).getVersion()).isEqualTo(DEFAULT_VERSION);
   }
 
   @Test
@@ -200,4 +199,27 @@ public void shouldThrowExceptionWhenMetaDataFileIsCorrupted() throws Exception {
                     .create(segment, commonConfiguration, metricsSystem))
         .isInstanceOf(IllegalStateException.class);
   }
+
+  @Test
+  public void shouldCreateDBCorrectlyIfSymlink() throws Exception {
+    final Path tempRealDataDir =
+        Files.createDirectories(temporaryFolder.newFolder().toPath().resolve("real-data-dir"));
+    final Path tempSymLinkDataDir =
+        Files.createSymbolicLink(
+            temporaryFolder.newFolder().toPath().resolve("symlink-data-dir"), tempRealDataDir);
+    final Path tempDatabaseDir = temporaryFolder.newFolder().toPath().resolve("db");
+    when(commonConfiguration.getStoragePath()).thenReturn(tempDatabaseDir);
+    when(commonConfiguration.getDataPath()).thenReturn(tempSymLinkDataDir);
+    when(commonConfiguration.getDatabaseVersion()).thenReturn(DEFAULT_VERSION);
+
+    final RocksDBKeyValueStorageFactory storageFactory =
+        new RocksDBKeyValueStorageFactory(
+            () -> rocksDbConfiguration, segments, RocksDBMetricsFactory.PUBLIC_ROCKS_DB_METRICS);
+
+    // Ensure that having created everything via a symlink data dir the DB meta-data has been
+    // created correctly
+    storageFactory.create(segment, commonConfiguration, metricsSystem);
+    assertThat(DatabaseMetadata.lookUpFrom(tempRealDataDir).getVersion())
+        .isEqualTo(DEFAULT_VERSION);
+  }
 }
diff --git a/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBMetricsTest.java b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBMetricsTest.java
index ddcf58e4c22..960f11c5a17 100644
--- a/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBMetricsTest.java
+++ b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/RocksDBMetricsTest.java
@@ -39,8 +39,8 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.rocksdb.OptimisticTransactionDB;
 import org.rocksdb.Statistics;
-import org.rocksdb.TransactionDB;
 
 @RunWith(MockitoJUnitRunner.class)
 public class RocksDBMetricsTest {
@@ -49,7 +49,7 @@ public class RocksDBMetricsTest {
   @Mock private LabelledMetric<OperationTimer> labelledMetricOperationTimerMock;
   @Mock private LabelledMetric<Counter> labelledMetricCounterMock;
   @Mock private OperationTimer operationTimerMock;
-  @Mock private TransactionDB db;
+  @Mock private OptimisticTransactionDB db;
   @Mock private Statistics stats;
 
   @Rule public final TemporaryFolder folder = new TemporaryFolder();
diff --git a/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/OptimisticTransactionDBRocksDBColumnarKeyValueStorageTest.java b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/OptimisticTransactionDBRocksDBColumnarKeyValueStorageTest.java
new file mode 100644
index 00000000000..2c9fc86df13
--- /dev/null
+++ b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/OptimisticTransactionDBRocksDBColumnarKeyValueStorageTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services.storage.rocksdb.segmented;
+
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBMetricsFactory;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDbSegmentIdentifier;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBConfigurationBuilder;
+import org.hyperledger.besu.services.kvstore.SegmentedKeyValueStorage;
+
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.tuweni.bytes.Bytes;
+
+public class OptimisticTransactionDBRocksDBColumnarKeyValueStorageTest
+    extends RocksDBColumnarKeyValueStorageTest {
+
+  @Override
+  protected SegmentedKeyValueStorage<RocksDbSegmentIdentifier> createSegmentedStore()
+      throws Exception {
+    return new OptimisticRocksDBColumnarKeyValueStorage(
+        new RocksDBConfigurationBuilder()
+            .databaseDir(folder.resolve(Bytes.random(9).toString()))
+            .build(),
+        Arrays.asList(TestSegment.FOO, TestSegment.BAR),
+        List.of(),
+        new NoOpMetricsSystem(),
+        RocksDBMetricsFactory.PUBLIC_ROCKS_DB_METRICS);
+  }
+
+  @Override
+  protected SegmentedKeyValueStorage<RocksDbSegmentIdentifier> createSegmentedStore(
+      final Path path,
+      final List<SegmentIdentifier> segments,
+      final List<SegmentIdentifier> ignorableSegments) {
+    return new OptimisticRocksDBColumnarKeyValueStorage(
+        new RocksDBConfigurationBuilder().databaseDir(path).build(),
+        segments,
+        ignorableSegments,
+        new NoOpMetricsSystem(),
+        RocksDBMetricsFactory.PUBLIC_ROCKS_DB_METRICS);
+  }
+}
diff --git a/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBColumnarKeyValueStorageTest.java b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBColumnarKeyValueStorageTest.java
new file mode 100644
index 00000000000..98eaf034960
--- /dev/null
+++ b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBColumnarKeyValueStorageTest.java
@@ -0,0 +1,309 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services.storage.rocksdb.segmented;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+
+import org.hyperledger.besu.kvstore.AbstractKeyValueStorageTest;
+import org.hyperledger.besu.plugin.services.exception.StorageException;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
+import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDbSegmentIdentifier;
+import org.hyperledger.besu.services.kvstore.SegmentedKeyValueStorage;
+import org.hyperledger.besu.services.kvstore.SegmentedKeyValueStorage.Transaction;
+import org.hyperledger.besu.services.kvstore.SnappableSegmentedKeyValueStorageAdapter;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+
+import org.apache.commons.lang3.tuple.Pair;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+public abstract class RocksDBColumnarKeyValueStorageTest extends AbstractKeyValueStorageTest {
+
+  @TempDir public Path folder;
+
+  @Test
+  public void assertClear() throws Exception {
+    final byte[] key = bytesFromHexString("0001");
+    final byte[] val1 = bytesFromHexString("0FFF");
+    final byte[] val2 = bytesFromHexString("1337");
+    final SegmentedKeyValueStorage<RocksDbSegmentIdentifier> store = createSegmentedStore();
+    RocksDbSegmentIdentifier segment = store.getSegmentIdentifierByName(TestSegment.FOO);
+    KeyValueStorage duplicateSegmentRef =
+        new SnappableSegmentedKeyValueStorageAdapter<>(TestSegment.FOO, store);
+
+    final Consumer<byte[]> insert =
+        value -> {
+          final Transaction<RocksDbSegmentIdentifier> tx = store.startTransaction();
+          tx.put(segment, key, value);
+          tx.commit();
+        };
+
+    // insert val:
+    insert.accept(val1);
+    assertThat(store.get(segment, key).orElse(null)).isEqualTo(val1);
+    assertThat(duplicateSegmentRef.get(key).orElse(null)).isEqualTo(val1);
+
+    // clear and assert empty:
+    store.clear(segment);
+    assertThat(store.get(segment, key)).isEmpty();
+    assertThat(duplicateSegmentRef.get(key)).isEmpty();
+
+    // insert into empty:
+    insert.accept(val2);
+    assertThat(store.get(segment, key).orElse(null)).isEqualTo(val2);
+    assertThat(duplicateSegmentRef.get(key).orElse(null)).isEqualTo(val2);
+
+    store.close();
+  }
+
+  @Test
+  public void twoSegmentsAreIndependent() throws Exception {
+    final SegmentedKeyValueStorage<RocksDbSegmentIdentifier> store = createSegmentedStore();
+
+    final Transaction<RocksDbSegmentIdentifier> tx = store.startTransaction();
+    tx.put(
+        store.getSegmentIdentifierByName(TestSegment.BAR),
+        bytesFromHexString("0001"),
+        bytesFromHexString("0FFF"));
+    tx.commit();
+
+    final Optional<byte[]> result =
+        store.get(store.getSegmentIdentifierByName(TestSegment.FOO), bytesFromHexString("0001"));
+
+    assertThat(result).isEmpty();
+
+    store.close();
+  }
+
+  @Test
+  public void canRemoveThroughSegmentIteration() throws Exception {
+    // we're looping this in order to catch intermittent failures when rocksdb objects are not close
+    // properly
+    for (int i = 0; i < 50; i++) {
+      final SegmentedKeyValueStorage<RocksDbSegmentIdentifier> store = createSegmentedStore();
+      final RocksDbSegmentIdentifier fooSegment = store.getSegmentIdentifierByName(TestSegment.FOO);
+      final RocksDbSegmentIdentifier barSegment = store.getSegmentIdentifierByName(TestSegment.BAR);
+
+      final Transaction<RocksDbSegmentIdentifier> tx = store.startTransaction();
+      tx.put(fooSegment, bytesOf(1), bytesOf(1));
+      tx.put(fooSegment, bytesOf(2), bytesOf(2));
+      tx.put(fooSegment, bytesOf(3), bytesOf(3));
+      tx.put(barSegment, bytesOf(4), bytesOf(4));
+      tx.put(barSegment, bytesOf(5), bytesOf(5));
+      tx.put(barSegment, bytesOf(6), bytesOf(6));
+      tx.commit();
+
+      store.stream(fooSegment)
+          .map(Pair::getKey)
+          .forEach(
+              key -> {
+                if (!Arrays.equals(key, bytesOf(3))) store.tryDelete(fooSegment, key);
+              });
+      store.stream(barSegment)
+          .map(Pair::getKey)
+          .forEach(
+              key -> {
+                if (!Arrays.equals(key, bytesOf(4))) store.tryDelete(barSegment, key);
+              });
+
+      for (final RocksDbSegmentIdentifier segment : Set.of(fooSegment, barSegment)) {
+        assertThat(store.stream(segment).count()).isEqualTo(1);
+      }
+
+      assertThat(store.get(fooSegment, bytesOf(1))).isEmpty();
+      assertThat(store.get(fooSegment, bytesOf(2))).isEmpty();
+      assertThat(store.get(fooSegment, bytesOf(3))).contains(bytesOf(3));
+
+      assertThat(store.get(barSegment, bytesOf(4))).contains(bytesOf(4));
+      assertThat(store.get(barSegment, bytesOf(5))).isEmpty();
+      assertThat(store.get(barSegment, bytesOf(6))).isEmpty();
+
+      store.close();
+    }
+  }
+
+  @Test
+  public void canGetThroughSegmentIteration() throws Exception {
+    final SegmentedKeyValueStorage<RocksDbSegmentIdentifier> store = createSegmentedStore();
+    final RocksDbSegmentIdentifier fooSegment = store.getSegmentIdentifierByName(TestSegment.FOO);
+    final RocksDbSegmentIdentifier barSegment = store.getSegmentIdentifierByName(TestSegment.BAR);
+
+    final Transaction<RocksDbSegmentIdentifier> tx = store.startTransaction();
+    tx.put(fooSegment, bytesOf(1), bytesOf(1));
+    tx.put(fooSegment, bytesOf(2), bytesOf(2));
+    tx.put(fooSegment, bytesOf(3), bytesOf(3));
+    tx.put(barSegment, bytesOf(4), bytesOf(4));
+    tx.put(barSegment, bytesOf(5), bytesOf(5));
+    tx.put(barSegment, bytesOf(6), bytesOf(6));
+    tx.commit();
+
+    final Set<byte[]> gotFromFoo =
+        store.getAllKeysThat(fooSegment, x -> Arrays.equals(x, bytesOf(3)));
+    final Set<byte[]> gotFromBar =
+        store.getAllKeysThat(
+            barSegment, x -> Arrays.equals(x, bytesOf(4)) || Arrays.equals(x, bytesOf(5)));
+    final Set<byte[]> gotEmpty =
+        store.getAllKeysThat(fooSegment, x -> Arrays.equals(x, bytesOf(0)));
+
+    assertThat(gotFromFoo.size()).isEqualTo(1);
+    assertThat(gotFromBar.size()).isEqualTo(2);
+    assertThat(gotEmpty).isEmpty();
+
+    assertThat(gotFromFoo).containsExactlyInAnyOrder(bytesOf(3));
+    assertThat(gotFromBar).containsExactlyInAnyOrder(bytesOf(4), bytesOf(5));
+
+    store.close();
+  }
+
+  @Test
+  public void dbShouldIgnoreExperimentalSegmentsIfNotExisted(@TempDir final Path testPath)
+      throws Exception {
+    // Create new db should ignore experimental column family
+    SegmentedKeyValueStorage<RocksDbSegmentIdentifier> store =
+        createSegmentedStore(
+            testPath,
+            Arrays.asList(TestSegment.FOO, TestSegment.BAR, TestSegment.EXPERIMENTAL),
+            List.of(TestSegment.EXPERIMENTAL));
+    store.close();
+
+    // new db will be backward compatible with db without knowledge of experimental column family
+    store =
+        createSegmentedStore(testPath, Arrays.asList(TestSegment.FOO, TestSegment.BAR), List.of());
+    store.close();
+  }
+
+  @Test
+  public void dbShouldNotIgnoreExperimentalSegmentsIfExisted(@TempDir final Path testPath)
+      throws Exception {
+    // Create new db with experimental column family
+    SegmentedKeyValueStorage<RocksDbSegmentIdentifier> store =
+        createSegmentedStore(
+            testPath,
+            Arrays.asList(TestSegment.FOO, TestSegment.BAR, TestSegment.EXPERIMENTAL),
+            List.of());
+    store.close();
+
+    // new db will not be backward compatible with db without knowledge of experimental column
+    // family
+    try {
+      createSegmentedStore(testPath, Arrays.asList(TestSegment.FOO, TestSegment.BAR), List.of());
+      fail("DB without knowledge of experimental column family should fail");
+    } catch (StorageException e) {
+      assertThat(e.getMessage()).contains("Column families not opened");
+    }
+
+    // Even if the column family is marked as ignored, as long as it exists, it will not be ignored
+    // and the db opens normally
+    store =
+        createSegmentedStore(
+            testPath,
+            Arrays.asList(TestSegment.FOO, TestSegment.BAR, TestSegment.EXPERIMENTAL),
+            List.of(TestSegment.EXPERIMENTAL));
+    store.close();
+  }
+
+  @Test
+  public void dbWillBeBackwardIncompatibleAfterExperimentalSegmentsAreAdded(
+      @TempDir final Path testPath) throws Exception {
+    // Create new db should ignore experimental column family
+    SegmentedKeyValueStorage<RocksDbSegmentIdentifier> store =
+        createSegmentedStore(
+            testPath,
+            Arrays.asList(TestSegment.FOO, TestSegment.BAR, TestSegment.EXPERIMENTAL),
+            List.of(TestSegment.EXPERIMENTAL));
+    store.close();
+
+    // new db will be backward compatible with db without knowledge of experimental column family
+    store =
+        createSegmentedStore(testPath, Arrays.asList(TestSegment.FOO, TestSegment.BAR), List.of());
+    store.close();
+
+    // Create new db without ignoring experimental colum family will add column to db
+    store =
+        createSegmentedStore(
+            testPath,
+            Arrays.asList(TestSegment.FOO, TestSegment.BAR, TestSegment.EXPERIMENTAL),
+            List.of());
+    store.close();
+
+    // Now, the db will be backward incompatible with db without knowledge of experimental column
+    // family
+    try {
+      createSegmentedStore(testPath, Arrays.asList(TestSegment.FOO, TestSegment.BAR), List.of());
+      fail("DB without knowledge of experimental column family should fail");
+    } catch (StorageException e) {
+      assertThat(e.getMessage()).contains("Column families not opened");
+    }
+  }
+
+  public enum TestSegment implements SegmentIdentifier {
+    FOO(new byte[] {1}),
+    BAR(new byte[] {2}),
+    EXPERIMENTAL(new byte[] {3}),
+
+    STATIC_DATA(new byte[] {4}, true);
+
+    private final byte[] id;
+    private final String nameAsUtf8;
+    private final boolean containsStaticData;
+
+    TestSegment(final byte[] id) {
+      this(id, false);
+    }
+
+    TestSegment(final byte[] id, final boolean containsStaticData) {
+      this.id = id;
+      this.nameAsUtf8 = new String(id, StandardCharsets.UTF_8);
+      this.containsStaticData = containsStaticData;
+    }
+
+    @Override
+    public String getName() {
+      return nameAsUtf8;
+    }
+
+    @Override
+    public byte[] getId() {
+      return id;
+    }
+
+    @Override
+    public boolean containsStaticData() {
+      return containsStaticData;
+    }
+  }
+
+  protected abstract SegmentedKeyValueStorage<RocksDbSegmentIdentifier> createSegmentedStore()
+      throws Exception;
+
+  protected abstract SegmentedKeyValueStorage<RocksDbSegmentIdentifier> createSegmentedStore(
+      final Path path,
+      final List<SegmentIdentifier> segments,
+      final List<SegmentIdentifier> ignorableSegments);
+
+  @Override
+  protected KeyValueStorage createStore() throws Exception {
+    return new SnappableSegmentedKeyValueStorageAdapter<>(TestSegment.FOO, createSegmentedStore());
+  }
+}
diff --git a/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBKeyValueStorageTest.java b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBKeyValueStorageTest.java
index 85d175f33fc..78968873ecf 100644
--- a/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBKeyValueStorageTest.java
+++ b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/RocksDBKeyValueStorageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright ConsenSys AG.
+ * Copyright Hyperledger Besu Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -35,24 +35,24 @@
 import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBConfigurationBuilder;
 import org.hyperledger.besu.plugin.services.storage.rocksdb.unsegmented.RocksDBKeyValueStorage;
 
+import java.nio.file.Path;
 import java.util.function.LongSupplier;
 
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.io.TempDir;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class RocksDBKeyValueStorageTest extends AbstractKeyValueStorageTest {
 
   @Mock private ObservableMetricsSystem metricsSystemMock;
   @Mock private LabelledMetric<OperationTimer> labelledMetricOperationTimerMock;
   @Mock private LabelledMetric<Counter> labelledMetricCounterMock;
   @Mock private OperationTimer operationTimerMock;
-  @Rule public final TemporaryFolder folder = new TemporaryFolder();
+  @TempDir static Path folder;
 
   @Override
   protected KeyValueStorage createStore() throws Exception {
@@ -131,6 +131,6 @@ public void createStoreMustCreateMetrics() throws Exception {
   }
 
   private RocksDBConfiguration config() throws Exception {
-    return new RocksDBConfigurationBuilder().databaseDir(folder.newFolder().toPath()).build();
+    return new RocksDBConfigurationBuilder().databaseDir(getTempSubFolder(folder)).build();
   }
 }
diff --git a/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/TransactionDBRocksDBColumnarKeyValueStorageTest.java b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/TransactionDBRocksDBColumnarKeyValueStorageTest.java
new file mode 100644
index 00000000000..d7d4e12da7d
--- /dev/null
+++ b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/segmented/TransactionDBRocksDBColumnarKeyValueStorageTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.plugin.services.storage.rocksdb.segmented;
+
+import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
+import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBMetricsFactory;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDbSegmentIdentifier;
+import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBConfigurationBuilder;
+import org.hyperledger.besu.services.kvstore.SegmentedKeyValueStorage;
+
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+
+public class TransactionDBRocksDBColumnarKeyValueStorageTest
+    extends RocksDBColumnarKeyValueStorageTest {
+
+  @Override
+  protected SegmentedKeyValueStorage<RocksDbSegmentIdentifier> createSegmentedStore()
+      throws Exception {
+    return new TransactionDBRocksDBColumnarKeyValueStorage(
+        new RocksDBConfigurationBuilder().databaseDir(getTempSubFolder(folder)).build(),
+        Arrays.asList(TestSegment.FOO, TestSegment.BAR),
+        List.of(),
+        new NoOpMetricsSystem(),
+        RocksDBMetricsFactory.PUBLIC_ROCKS_DB_METRICS);
+  }
+
+  @Override
+  protected SegmentedKeyValueStorage<RocksDbSegmentIdentifier> createSegmentedStore(
+      final Path path,
+      final List<SegmentIdentifier> segments,
+      final List<SegmentIdentifier> ignorableSegments) {
+    return new TransactionDBRocksDBColumnarKeyValueStorage(
+        new RocksDBConfigurationBuilder().databaseDir(path).build(),
+        segments,
+        ignorableSegments,
+        new NoOpMetricsSystem(),
+        RocksDBMetricsFactory.PUBLIC_ROCKS_DB_METRICS);
+  }
+}
diff --git a/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/unsegmented/RocksDBColumnarKeyValueStorageTest.java b/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/unsegmented/RocksDBColumnarKeyValueStorageTest.java
deleted file mode 100644
index 662f150dafe..00000000000
--- a/plugins/rocksdb/src/test/java/org/hyperledger/besu/plugin/services/storage/rocksdb/unsegmented/RocksDBColumnarKeyValueStorageTest.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.plugin.services.storage.rocksdb.unsegmented;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.hyperledger.besu.kvstore.AbstractKeyValueStorageTest;
-import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
-import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
-import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier;
-import org.hyperledger.besu.plugin.services.storage.rocksdb.RocksDBMetricsFactory;
-import org.hyperledger.besu.plugin.services.storage.rocksdb.configuration.RocksDBConfigurationBuilder;
-import org.hyperledger.besu.plugin.services.storage.rocksdb.segmented.RocksDBColumnarKeyValueStorage;
-import org.hyperledger.besu.services.kvstore.SegmentedKeyValueStorage;
-import org.hyperledger.besu.services.kvstore.SegmentedKeyValueStorage.Transaction;
-import org.hyperledger.besu.services.kvstore.SegmentedKeyValueStorageAdapter;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Optional;
-import java.util.Set;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.rocksdb.ColumnFamilyHandle;
-
-public class RocksDBColumnarKeyValueStorageTest extends AbstractKeyValueStorageTest {
-
-  @Rule public final TemporaryFolder folder = new TemporaryFolder();
-
-  @Test
-  public void twoSegmentsAreIndependent() throws Exception {
-    final SegmentedKeyValueStorage<ColumnFamilyHandle> store = createSegmentedStore();
-
-    final Transaction<ColumnFamilyHandle> tx = store.startTransaction();
-    tx.put(
-        store.getSegmentIdentifierByName(TestSegment.BAR),
-        bytesFromHexString("0001"),
-        bytesFromHexString("0FFF"));
-    tx.commit();
-
-    final Optional<byte[]> result =
-        store.get(store.getSegmentIdentifierByName(TestSegment.FOO), bytesFromHexString("0001"));
-
-    assertThat(result).isEmpty();
-
-    store.close();
-  }
-
-  @Test
-  public void canRemoveThroughSegmentIteration() throws Exception {
-    // we're looping this in order to catch intermittent failures when rocksdb objects are not close
-    // properly
-    for (int i = 0; i < 50; i++) {
-      final SegmentedKeyValueStorage<ColumnFamilyHandle> store = createSegmentedStore();
-      final ColumnFamilyHandle fooSegment = store.getSegmentIdentifierByName(TestSegment.FOO);
-      final ColumnFamilyHandle barSegment = store.getSegmentIdentifierByName(TestSegment.BAR);
-
-      final Transaction<ColumnFamilyHandle> tx = store.startTransaction();
-      tx.put(fooSegment, bytesOf(1), bytesOf(1));
-      tx.put(fooSegment, bytesOf(2), bytesOf(2));
-      tx.put(fooSegment, bytesOf(3), bytesOf(3));
-      tx.put(barSegment, bytesOf(4), bytesOf(4));
-      tx.put(barSegment, bytesOf(5), bytesOf(5));
-      tx.put(barSegment, bytesOf(6), bytesOf(6));
-      tx.commit();
-
-      store
-          .streamKeys(fooSegment)
-          .forEach(
-              key -> {
-                if (!Arrays.equals(key, bytesOf(3))) store.tryDelete(fooSegment, key);
-              });
-      store
-          .streamKeys(barSegment)
-          .forEach(
-              key -> {
-                if (!Arrays.equals(key, bytesOf(4))) store.tryDelete(barSegment, key);
-              });
-
-      for (final ColumnFamilyHandle segment : Set.of(fooSegment, barSegment)) {
-        assertThat(store.streamKeys(segment).count()).isEqualTo(1);
-      }
-
-      assertThat(store.get(fooSegment, bytesOf(1))).isEmpty();
-      assertThat(store.get(fooSegment, bytesOf(2))).isEmpty();
-      assertThat(store.get(fooSegment, bytesOf(3))).contains(bytesOf(3));
-
-      assertThat(store.get(barSegment, bytesOf(4))).contains(bytesOf(4));
-      assertThat(store.get(barSegment, bytesOf(5))).isEmpty();
-      assertThat(store.get(barSegment, bytesOf(6))).isEmpty();
-
-      store.close();
-    }
-  }
-
-  @Test
-  public void canGetThroughSegmentIteration() throws Exception {
-    final SegmentedKeyValueStorage<ColumnFamilyHandle> store = createSegmentedStore();
-    final ColumnFamilyHandle fooSegment = store.getSegmentIdentifierByName(TestSegment.FOO);
-    final ColumnFamilyHandle barSegment = store.getSegmentIdentifierByName(TestSegment.BAR);
-
-    final Transaction<ColumnFamilyHandle> tx = store.startTransaction();
-    tx.put(fooSegment, bytesOf(1), bytesOf(1));
-    tx.put(fooSegment, bytesOf(2), bytesOf(2));
-    tx.put(fooSegment, bytesOf(3), bytesOf(3));
-    tx.put(barSegment, bytesOf(4), bytesOf(4));
-    tx.put(barSegment, bytesOf(5), bytesOf(5));
-    tx.put(barSegment, bytesOf(6), bytesOf(6));
-    tx.commit();
-
-    final Set<byte[]> gotFromFoo =
-        store.getAllKeysThat(fooSegment, x -> Arrays.equals(x, bytesOf(3)));
-    final Set<byte[]> gotFromBar =
-        store.getAllKeysThat(
-            barSegment, x -> Arrays.equals(x, bytesOf(4)) || Arrays.equals(x, bytesOf(5)));
-    final Set<byte[]> gotEmpty =
-        store.getAllKeysThat(fooSegment, x -> Arrays.equals(x, bytesOf(0)));
-
-    assertThat(gotFromFoo.size()).isEqualTo(1);
-    assertThat(gotFromBar.size()).isEqualTo(2);
-    assertThat(gotEmpty).isEmpty();
-
-    assertThat(gotFromFoo).containsExactlyInAnyOrder(bytesOf(3));
-    assertThat(gotFromBar).containsExactlyInAnyOrder(bytesOf(4), bytesOf(5));
-
-    store.close();
-  }
-
-  public enum TestSegment implements SegmentIdentifier {
-    FOO(new byte[] {1}),
-    BAR(new byte[] {2});
-
-    private final byte[] id;
-    private final String nameAsUtf8;
-
-    TestSegment(final byte[] id) {
-      this.id = id;
-      this.nameAsUtf8 = new String(id, StandardCharsets.UTF_8);
-    }
-
-    @Override
-    public String getName() {
-      return nameAsUtf8;
-    }
-
-    @Override
-    public byte[] getId() {
-      return id;
-    }
-  }
-
-  private SegmentedKeyValueStorage<ColumnFamilyHandle> createSegmentedStore() throws Exception {
-    return new RocksDBColumnarKeyValueStorage(
-        new RocksDBConfigurationBuilder().databaseDir(folder.newFolder().toPath()).build(),
-        Arrays.asList(TestSegment.FOO, TestSegment.BAR),
-        new NoOpMetricsSystem(),
-        RocksDBMetricsFactory.PUBLIC_ROCKS_DB_METRICS);
-  }
-
-  @Override
-  protected KeyValueStorage createStore() throws Exception {
-    return new SegmentedKeyValueStorageAdapter<>(TestSegment.FOO, createSegmentedStore());
-  }
-}
diff --git a/privacy-contracts/build.gradle b/privacy-contracts/build.gradle
index 1fcf55e51ca..65401fd753b 100644
--- a/privacy-contracts/build.gradle
+++ b/privacy-contracts/build.gradle
@@ -15,10 +15,9 @@
 
 jar { enabled = true }
 dependencies {
-  implementation 'net.consensys:orion'
-  implementation 'org.apache.tuweni:bytes'
-  implementation 'org.apache.tuweni:io'
-  implementation 'org.apache.tuweni:toml'
+  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-io'
+  implementation 'org.apache.tuweni:tuweni-toml'
   implementation 'org.web3j:abi'
   implementation 'org.web3j:besu'
 }
diff --git a/privacy-contracts/src/main/java/org/hyperledger/besu/privacy/contracts/generated/DefaultFlexiblePrivacyGroupManagementContract.java b/privacy-contracts/src/main/java/org/hyperledger/besu/privacy/contracts/generated/DefaultFlexiblePrivacyGroupManagementContract.java
new file mode 100644
index 00000000000..f7e349cb555
--- /dev/null
+++ b/privacy-contracts/src/main/java/org/hyperledger/besu/privacy/contracts/generated/DefaultFlexiblePrivacyGroupManagementContract.java
@@ -0,0 +1,350 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.privacy.contracts.generated;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Callable;
+
+import io.reactivex.Flowable;
+import io.reactivex.functions.Function;
+import org.web3j.abi.EventEncoder;
+import org.web3j.abi.TypeReference;
+import org.web3j.abi.datatypes.Bool;
+import org.web3j.abi.datatypes.DynamicArray;
+import org.web3j.abi.datatypes.DynamicBytes;
+import org.web3j.abi.datatypes.Event;
+import org.web3j.abi.datatypes.Type;
+import org.web3j.abi.datatypes.Utf8String;
+import org.web3j.abi.datatypes.generated.Bytes32;
+import org.web3j.crypto.Credentials;
+import org.web3j.protocol.Web3j;
+import org.web3j.protocol.core.DefaultBlockParameter;
+import org.web3j.protocol.core.RemoteCall;
+import org.web3j.protocol.core.RemoteFunctionCall;
+import org.web3j.protocol.core.methods.request.EthFilter;
+import org.web3j.protocol.core.methods.response.BaseEventResponse;
+import org.web3j.protocol.core.methods.response.Log;
+import org.web3j.protocol.core.methods.response.TransactionReceipt;
+import org.web3j.tx.Contract;
+import org.web3j.tx.TransactionManager;
+import org.web3j.tx.gas.ContractGasProvider;
+
+/**
+ * Auto generated code.
+ *
+ * <p><strong>Do not modify!</strong>
+ *
+ * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
+ * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the <a
+ * href="https://github.com/web3j/web3j/tree/master/codegen">codegen module</a> to update.
+ *
+ * <p>Generated with web3j version 1.4.1.
+ */
+@SuppressWarnings("rawtypes")
+public class DefaultFlexiblePrivacyGroupManagementContract extends Contract {
+  public static final String BINARY =
+      "608060405234801561001057600080fd5b50611666806100206000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c8063965a25ef1161005b578063965a25ef146101175780639738968c14610147578063a69df4b514610165578063f83d08ba1461016f57610088565b80630d8e6e2c1461008d5780631f52a8ee146100ab5780635aa68ac0146100db57806378b90337146100f9575b600080fd5b610095610179565b6040516100a29190610c58565b60405180910390f35b6100c560048036038101906100c09190610ce2565b610183565b6040516100d29190610d4a565b60405180910390f35b6100e361024b565b6040516100f09190610ec0565b60405180910390f35b610101610324565b60405161010e9190610d4a565b60405180910390f35b610131600480360381019061012c9190610f38565b61033a565b60405161013e9190610d4a565b60405180910390f35b61014f6104b4565b60405161015c9190610d4a565b60405180910390f35b61016d61050b565b005b6101776105d0565b005b6000600154905090565b60008060149054906101000a900460ff1661019d57600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff161461022b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161022290610fe2565b60405180910390fd5b60006102378484610693565b90506102416107e6565b8091505092915050565b60606002805480602002602001604051908101604052809291908181526020016000905b8282101561031b57838290600052602060002001805461028e90611031565b80601f01602080910402602001604051908101604052809291908181526020018280546102ba90611031565b80156103075780601f106102dc57610100808354040283529160200191610307565b820191906000526020600020905b8154815290600101906020018083116102ea57829003601f168201915b50505050508152602001906001019061026f565b50505050905090565b60008060149054906101000a900460ff16905090565b60008060149054906101000a900460ff161561035557600080fd5b600073ffffffffffffffffffffffffffffffffffffffff1660008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614156103eb57326000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff1614610479576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161047090610fe2565b60405180910390fd5b60006104858484610827565b90506001600060146101000a81548160ff0219169083151502179055506104aa6107e6565b8091505092915050565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff1614905090565b600060149054906101000a900460ff161561052557600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff16146105b3576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016105aa90610fe2565b60405180910390fd5b6001600060146101000a81548160ff021916908315150217905550565b600060149054906101000a900460ff166105e957600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff1614610677576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161066e90610fe2565b60405180910390fd5b60008060146101000a81548160ff021916908315150217905550565b600080600384846040516106a89291906110a2565b90815260200160405180910390205490506000811180156106ce57506002805490508111155b156107da57600280549050811461077a576000600260016002805490506106f591906110f4565b8154811061070657610705611128565b5b90600052602060002001905080600260018461072291906110f4565b8154811061073357610732611128565b5b9060005260206000200190805461074990611031565b610754929190610acf565b508160038260405161076691906111eb565b908152602001604051809103902081905550505b600280548061078c5761078b611202565b5b6001900381819060005260206000200160006107a89190610b5c565b90556000600385856040516107be9291906110a2565b90815260200160405180910390208190555060019150506107e0565b60009150505b92915050565b6001436107f391906110f4565b40416002604051602001610809939291906113bc565b60405160208183030381529060405280519060200120600181905550565b6000806001905060005b848490508110156109f05761086985858381811061085257610851611128565b5b90506020028101906108649190611409565b6109fb565b156108df577f1673b13ca99fc5f5d54f8ebc163339b3c03f5f661cec3f5dfe506fdbd2602de660008686848181106108a4576108a3611128565b5b90506020028101906108b69190611409565b6040516108c5939291906114f6565b60405180910390a18180156108d8575060005b91506109dd565b600061090e8686848181106108f7576108f6611128565b5b90506020028101906109099190611409565b610a29565b9050600081610952576040518060400160405280601b81526020017f4163636f756e7420697320616c72656164792061204d656d626572000000000081525061096c565b604051806060016040528060218152602001611610602191395b90507f1673b13ca99fc5f5d54f8ebc163339b3c03f5f661cec3f5dfe506fdbd2602de6828888868181106109a3576109a2611128565b5b90506020028101906109b59190611409565b846040516109c6949392919061157f565b60405180910390a18380156109d85750815b935050505b80806109e8906115c6565b915050610831565b508091505092915050565b60008060038484604051610a109291906110a2565b9081526020016040518091039020541415905092915050565b60008060038484604051610a3e9291906110a2565b9081526020016040518091039020541415610ac4576002838390918060018154018082558091505060019003906000526020600020016000909192909192909192909192509190610a90929190610b9c565b5060028054905060038484604051610aa99291906110a2565b90815260200160405180910390208190555060019050610ac9565b600090505b92915050565b828054610adb90611031565b90600052602060002090601f016020900481019282610afd5760008555610b4b565b82601f10610b0e5780548555610b4b565b82800160010185558215610b4b57600052602060002091601f016020900482015b82811115610b4a578254825591600101919060010190610b2f565b5b509050610b589190610c22565b5090565b508054610b6890611031565b6000825580601f10610b7a5750610b99565b601f016020900490600052602060002090810190610b989190610c22565b5b50565b828054610ba890611031565b90600052602060002090601f016020900481019282610bca5760008555610c11565b82601f10610be357803560ff1916838001178555610c11565b82800160010185558215610c11579182015b82811115610c10578235825591602001919060010190610bf5565b5b509050610c1e9190610c22565b5090565b5b80821115610c3b576000816000905550600101610c23565b5090565b6000819050919050565b610c5281610c3f565b82525050565b6000602082019050610c6d6000830184610c49565b92915050565b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b60008083601f840112610ca257610ca1610c7d565b5b8235905067ffffffffffffffff811115610cbf57610cbe610c82565b5b602083019150836001820283011115610cdb57610cda610c87565b5b9250929050565b60008060208385031215610cf957610cf8610c73565b5b600083013567ffffffffffffffff811115610d1757610d16610c78565b5b610d2385828601610c8c565b92509250509250929050565b60008115159050919050565b610d4481610d2f565b82525050565b6000602082019050610d5f6000830184610d3b565b92915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b600081519050919050565b600082825260208201905092915050565b60005b83811015610dcb578082015181840152602081019050610db0565b83811115610dda576000848401525b50505050565b6000601f19601f8301169050919050565b6000610dfc82610d91565b610e068185610d9c565b9350610e16818560208601610dad565b610e1f81610de0565b840191505092915050565b6000610e368383610df1565b905092915050565b6000602082019050919050565b6000610e5682610d65565b610e608185610d70565b935083602082028501610e7285610d81565b8060005b85811015610eae5784840389528151610e8f8582610e2a565b9450610e9a83610e3e565b925060208a01995050600181019050610e76565b50829750879550505050505092915050565b60006020820190508181036000830152610eda8184610e4b565b905092915050565b60008083601f840112610ef857610ef7610c7d565b5b8235905067ffffffffffffffff811115610f1557610f14610c82565b5b602083019150836020820283011115610f3157610f30610c87565b5b9250929050565b60008060208385031215610f4f57610f4e610c73565b5b600083013567ffffffffffffffff811115610f6d57610f6c610c78565b5b610f7985828601610ee2565b92509250509250929050565b600082825260208201905092915050565b7f4f726967696e206e6f7420746865206f776e65722e0000000000000000000000600082015250565b6000610fcc601583610f85565b9150610fd782610f96565b602082019050919050565b60006020820190508181036000830152610ffb81610fbf565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168061104957607f821691505b6020821081141561105d5761105c611002565b5b50919050565b600081905092915050565b82818337600083830152505050565b60006110898385611063565b935061109683858461106e565b82840190509392505050565b60006110af82848661107d565b91508190509392505050565b6000819050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60006110ff826110bb565b915061110a836110bb565b92508282101561111d5761111c6110c5565b5b828203905092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60008190508160005260206000209050919050565b6000815461117981611031565b6111838186611063565b9450600182166000811461119e57600181146111af576111e2565b60ff198316865281860193506111e2565b6111b885611157565b60005b838110156111da578154818901526001820191506020810190506111bb565b838801955050505b50505092915050565b60006111f7828461116c565b915081905092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061125c82611231565b9050919050565b61126c81611251565b82525050565b600081549050919050565b60008190508160005260206000209050919050565b60008190508160005260206000209050919050565b600081546112b481611031565b6112be8186610d9c565b945060018216600081146112d957600181146112eb5761131e565b60ff198316865260208601935061131e565b6112f485611292565b60005b83811015611316578154818901526001820191506020810190506112f7565b808801955050505b50505092915050565b600061133383836112a7565b905092915050565b6000600182019050919050565b600061135382611272565b61135d8185610d70565b93508360208202850161136f8561127d565b8060005b858110156113aa5784840389528161138b8582611327565b94506113968361133b565b925060208a01995050600181019050611373565b50829750879550505050505092915050565b60006060820190506113d16000830186610c49565b6113de6020830185611263565b81810360408301526113f08184611348565b9050949350505050565b600080fd5b600080fd5b600080fd5b60008083356001602003843603038112611426576114256113fa565b5b80840192508235915067ffffffffffffffff821115611448576114476113ff565b5b60208301925060018202360383131561146457611463611404565b5b509250929050565b600082825260208201905092915050565b6000611489838561146c565b935061149683858461106e565b61149f83610de0565b840190509392505050565b7f4163636f756e7420697320616c72656164792061204d656d6265720000000000600082015250565b60006114e0601b83610f85565b91506114eb826114aa565b602082019050919050565b600060608201905061150b6000830186610d3b565b818103602083015261151e81848661147d565b90508181036040830152611531816114d3565b9050949350505050565b600081519050919050565b60006115518261153b565b61155b8185610f85565b935061156b818560208601610dad565b61157481610de0565b840191505092915050565b60006060820190506115946000830187610d3b565b81810360208301526115a781858761147d565b905081810360408301526115bb8184611546565b905095945050505050565b60006115d1826110bb565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff821415611604576116036110c5565b5b60018201905091905056fe4d656d626572206163636f756e74206164646564207375636365737366756c6c79a2646970667358221220d3a7456a07fdf8421729e71e971f6d0cb06adecd41665ab8a87c08377118ad1664736f6c634300080c0033";
+
+  public static final String FUNC_ADDPARTICIPANTS = "addParticipants";
+
+  public static final String FUNC_CANEXECUTE = "canExecute";
+
+  public static final String FUNC_CANUPGRADE = "canUpgrade";
+
+  public static final String FUNC_GETPARTICIPANTS = "getParticipants";
+
+  public static final String FUNC_GETVERSION = "getVersion";
+
+  public static final String FUNC_LOCK = "lock";
+
+  public static final String FUNC_REMOVEPARTICIPANT = "removeParticipant";
+
+  public static final String FUNC_UNLOCK = "unlock";
+
+  public static final Event PARTICIPANTADDED_EVENT =
+      new Event(
+          "ParticipantAdded",
+          Arrays.<TypeReference<?>>asList(
+              new TypeReference<Bool>() {},
+              new TypeReference<DynamicBytes>() {},
+              new TypeReference<Utf8String>() {}));
+  ;
+
+  @Deprecated
+  protected DefaultFlexiblePrivacyGroupManagementContract(
+      String contractAddress,
+      Web3j web3j,
+      Credentials credentials,
+      BigInteger gasPrice,
+      BigInteger gasLimit) {
+    super(BINARY, contractAddress, web3j, credentials, gasPrice, gasLimit);
+  }
+
+  protected DefaultFlexiblePrivacyGroupManagementContract(
+      String contractAddress,
+      Web3j web3j,
+      Credentials credentials,
+      ContractGasProvider contractGasProvider) {
+    super(BINARY, contractAddress, web3j, credentials, contractGasProvider);
+  }
+
+  @Deprecated
+  protected DefaultFlexiblePrivacyGroupManagementContract(
+      String contractAddress,
+      Web3j web3j,
+      TransactionManager transactionManager,
+      BigInteger gasPrice,
+      BigInteger gasLimit) {
+    super(BINARY, contractAddress, web3j, transactionManager, gasPrice, gasLimit);
+  }
+
+  protected DefaultFlexiblePrivacyGroupManagementContract(
+      String contractAddress,
+      Web3j web3j,
+      TransactionManager transactionManager,
+      ContractGasProvider contractGasProvider) {
+    super(BINARY, contractAddress, web3j, transactionManager, contractGasProvider);
+  }
+
+  public List<ParticipantAddedEventResponse> getParticipantAddedEvents(
+      TransactionReceipt transactionReceipt) {
+    List<Contract.EventValuesWithLog> valueList =
+        extractEventParametersWithLog(PARTICIPANTADDED_EVENT, transactionReceipt);
+    ArrayList<ParticipantAddedEventResponse> responses =
+        new ArrayList<ParticipantAddedEventResponse>(valueList.size());
+    for (Contract.EventValuesWithLog eventValues : valueList) {
+      ParticipantAddedEventResponse typedResponse = new ParticipantAddedEventResponse();
+      typedResponse.log = eventValues.getLog();
+      typedResponse.success = (Boolean) eventValues.getNonIndexedValues().get(0).getValue();
+      typedResponse.publicEnclaveKey = (byte[]) eventValues.getNonIndexedValues().get(1).getValue();
+      typedResponse.message = (String) eventValues.getNonIndexedValues().get(2).getValue();
+      responses.add(typedResponse);
+    }
+    return responses;
+  }
+
+  public Flowable<ParticipantAddedEventResponse> participantAddedEventFlowable(EthFilter filter) {
+    return web3j
+        .ethLogFlowable(filter)
+        .map(
+            new Function<Log, ParticipantAddedEventResponse>() {
+              @Override
+              public ParticipantAddedEventResponse apply(Log log) {
+                Contract.EventValuesWithLog eventValues =
+                    extractEventParametersWithLog(PARTICIPANTADDED_EVENT, log);
+                ParticipantAddedEventResponse typedResponse = new ParticipantAddedEventResponse();
+                typedResponse.log = log;
+                typedResponse.success =
+                    (Boolean) eventValues.getNonIndexedValues().get(0).getValue();
+                typedResponse.publicEnclaveKey =
+                    (byte[]) eventValues.getNonIndexedValues().get(1).getValue();
+                typedResponse.message =
+                    (String) eventValues.getNonIndexedValues().get(2).getValue();
+                return typedResponse;
+              }
+            });
+  }
+
+  public Flowable<ParticipantAddedEventResponse> participantAddedEventFlowable(
+      DefaultBlockParameter startBlock, DefaultBlockParameter endBlock) {
+    EthFilter filter = new EthFilter(startBlock, endBlock, getContractAddress());
+    filter.addSingleTopic(EventEncoder.encode(PARTICIPANTADDED_EVENT));
+    return participantAddedEventFlowable(filter);
+  }
+
+  public RemoteFunctionCall<TransactionReceipt> addParticipants(List<byte[]> _publicEnclaveKeys) {
+    final org.web3j.abi.datatypes.Function function =
+        new org.web3j.abi.datatypes.Function(
+            FUNC_ADDPARTICIPANTS,
+            Arrays.<Type>asList(
+                new org.web3j.abi.datatypes.DynamicArray<org.web3j.abi.datatypes.DynamicBytes>(
+                    org.web3j.abi.datatypes.DynamicBytes.class,
+                    org.web3j.abi.Utils.typeMap(
+                        _publicEnclaveKeys, org.web3j.abi.datatypes.DynamicBytes.class))),
+            Collections.<TypeReference<?>>emptyList());
+    return executeRemoteCallTransaction(function);
+  }
+
+  public RemoteFunctionCall<Boolean> canExecute() {
+    final org.web3j.abi.datatypes.Function function =
+        new org.web3j.abi.datatypes.Function(
+            FUNC_CANEXECUTE,
+            Arrays.<Type>asList(),
+            Arrays.<TypeReference<?>>asList(new TypeReference<Bool>() {}));
+    return executeRemoteCallSingleValueReturn(function, Boolean.class);
+  }
+
+  public RemoteFunctionCall<Boolean> canUpgrade() {
+    final org.web3j.abi.datatypes.Function function =
+        new org.web3j.abi.datatypes.Function(
+            FUNC_CANUPGRADE,
+            Arrays.<Type>asList(),
+            Arrays.<TypeReference<?>>asList(new TypeReference<Bool>() {}));
+    return executeRemoteCallSingleValueReturn(function, Boolean.class);
+  }
+
+  public RemoteFunctionCall<List> getParticipants() {
+    final org.web3j.abi.datatypes.Function function =
+        new org.web3j.abi.datatypes.Function(
+            FUNC_GETPARTICIPANTS,
+            Arrays.<Type>asList(),
+            Arrays.<TypeReference<?>>asList(new TypeReference<DynamicArray<DynamicBytes>>() {}));
+    return new RemoteFunctionCall<List>(
+        function,
+        new Callable<List>() {
+          @Override
+          @SuppressWarnings("unchecked")
+          public List call() throws Exception {
+            List<Type> result = (List<Type>) executeCallSingleValueReturn(function, List.class);
+            return convertToNative(result);
+          }
+        });
+  }
+
+  public RemoteFunctionCall<byte[]> getVersion() {
+    final org.web3j.abi.datatypes.Function function =
+        new org.web3j.abi.datatypes.Function(
+            FUNC_GETVERSION,
+            Arrays.<Type>asList(),
+            Arrays.<TypeReference<?>>asList(new TypeReference<Bytes32>() {}));
+    return executeRemoteCallSingleValueReturn(function, byte[].class);
+  }
+
+  public RemoteFunctionCall<TransactionReceipt> lock() {
+    final org.web3j.abi.datatypes.Function function =
+        new org.web3j.abi.datatypes.Function(
+            FUNC_LOCK, Arrays.<Type>asList(), Collections.<TypeReference<?>>emptyList());
+    return executeRemoteCallTransaction(function);
+  }
+
+  public RemoteFunctionCall<TransactionReceipt> removeParticipant(byte[] _participant) {
+    final org.web3j.abi.datatypes.Function function =
+        new org.web3j.abi.datatypes.Function(
+            FUNC_REMOVEPARTICIPANT,
+            Arrays.<Type>asList(new org.web3j.abi.datatypes.DynamicBytes(_participant)),
+            Collections.<TypeReference<?>>emptyList());
+    return executeRemoteCallTransaction(function);
+  }
+
+  public RemoteFunctionCall<TransactionReceipt> unlock() {
+    final org.web3j.abi.datatypes.Function function =
+        new org.web3j.abi.datatypes.Function(
+            FUNC_UNLOCK, Arrays.<Type>asList(), Collections.<TypeReference<?>>emptyList());
+    return executeRemoteCallTransaction(function);
+  }
+
+  @Deprecated
+  public static DefaultFlexiblePrivacyGroupManagementContract load(
+      String contractAddress,
+      Web3j web3j,
+      Credentials credentials,
+      BigInteger gasPrice,
+      BigInteger gasLimit) {
+    return new DefaultFlexiblePrivacyGroupManagementContract(
+        contractAddress, web3j, credentials, gasPrice, gasLimit);
+  }
+
+  @Deprecated
+  public static DefaultFlexiblePrivacyGroupManagementContract load(
+      String contractAddress,
+      Web3j web3j,
+      TransactionManager transactionManager,
+      BigInteger gasPrice,
+      BigInteger gasLimit) {
+    return new DefaultFlexiblePrivacyGroupManagementContract(
+        contractAddress, web3j, transactionManager, gasPrice, gasLimit);
+  }
+
+  public static DefaultFlexiblePrivacyGroupManagementContract load(
+      String contractAddress,
+      Web3j web3j,
+      Credentials credentials,
+      ContractGasProvider contractGasProvider) {
+    return new DefaultFlexiblePrivacyGroupManagementContract(
+        contractAddress, web3j, credentials, contractGasProvider);
+  }
+
+  public static DefaultFlexiblePrivacyGroupManagementContract load(
+      String contractAddress,
+      Web3j web3j,
+      TransactionManager transactionManager,
+      ContractGasProvider contractGasProvider) {
+    return new DefaultFlexiblePrivacyGroupManagementContract(
+        contractAddress, web3j, transactionManager, contractGasProvider);
+  }
+
+  public static RemoteCall<DefaultFlexiblePrivacyGroupManagementContract> deploy(
+      Web3j web3j, Credentials credentials, ContractGasProvider contractGasProvider) {
+    return deployRemoteCall(
+        DefaultFlexiblePrivacyGroupManagementContract.class,
+        web3j,
+        credentials,
+        contractGasProvider,
+        BINARY,
+        "");
+  }
+
+  @Deprecated
+  public static RemoteCall<DefaultFlexiblePrivacyGroupManagementContract> deploy(
+      Web3j web3j, Credentials credentials, BigInteger gasPrice, BigInteger gasLimit) {
+    return deployRemoteCall(
+        DefaultFlexiblePrivacyGroupManagementContract.class,
+        web3j,
+        credentials,
+        gasPrice,
+        gasLimit,
+        BINARY,
+        "");
+  }
+
+  public static RemoteCall<DefaultFlexiblePrivacyGroupManagementContract> deploy(
+      Web3j web3j, TransactionManager transactionManager, ContractGasProvider contractGasProvider) {
+    return deployRemoteCall(
+        DefaultFlexiblePrivacyGroupManagementContract.class,
+        web3j,
+        transactionManager,
+        contractGasProvider,
+        BINARY,
+        "");
+  }
+
+  @Deprecated
+  public static RemoteCall<DefaultFlexiblePrivacyGroupManagementContract> deploy(
+      Web3j web3j,
+      TransactionManager transactionManager,
+      BigInteger gasPrice,
+      BigInteger gasLimit) {
+    return deployRemoteCall(
+        DefaultFlexiblePrivacyGroupManagementContract.class,
+        web3j,
+        transactionManager,
+        gasPrice,
+        gasLimit,
+        BINARY,
+        "");
+  }
+
+  public static class ParticipantAddedEventResponse extends BaseEventResponse {
+    public Boolean success;
+
+    public byte[] publicEnclaveKey;
+
+    public String message;
+  }
+}
diff --git a/privacy-contracts/src/main/java/org/hyperledger/besu/privacy/contracts/generated/DefaultOnChainPrivacyGroupManagementContract.java b/privacy-contracts/src/main/java/org/hyperledger/besu/privacy/contracts/generated/DefaultOnChainPrivacyGroupManagementContract.java
deleted file mode 100644
index d65d98f2e19..00000000000
--- a/privacy-contracts/src/main/java/org/hyperledger/besu/privacy/contracts/generated/DefaultOnChainPrivacyGroupManagementContract.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.privacy.contracts.generated;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.Callable;
-
-import io.reactivex.Flowable;
-import io.reactivex.functions.Function;
-import org.web3j.abi.EventEncoder;
-import org.web3j.abi.TypeReference;
-import org.web3j.abi.datatypes.Bool;
-import org.web3j.abi.datatypes.DynamicArray;
-import org.web3j.abi.datatypes.Event;
-import org.web3j.abi.datatypes.Type;
-import org.web3j.abi.datatypes.Utf8String;
-import org.web3j.abi.datatypes.generated.Bytes32;
-import org.web3j.crypto.Credentials;
-import org.web3j.protocol.Web3j;
-import org.web3j.protocol.core.DefaultBlockParameter;
-import org.web3j.protocol.core.RemoteCall;
-import org.web3j.protocol.core.RemoteFunctionCall;
-import org.web3j.protocol.core.methods.request.EthFilter;
-import org.web3j.protocol.core.methods.response.BaseEventResponse;
-import org.web3j.protocol.core.methods.response.Log;
-import org.web3j.protocol.core.methods.response.TransactionReceipt;
-import org.web3j.tx.Contract;
-import org.web3j.tx.TransactionManager;
-import org.web3j.tx.gas.ContractGasProvider;
-
-/**
- * Auto generated code.
- *
- * <p><strong>Do not modify!</strong>
- *
- * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
- * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the <a
- * href="https://github.com/web3j/web3j/tree/master/codegen">codegen module</a> to update.
- *
- * <p>Generated with web3j version 4.5.16.
- */
-@SuppressWarnings("rawtypes")
-public class DefaultOnChainPrivacyGroupManagementContract extends Contract {
-  public static final String BINARY =
-      "608060405234801561001057600080fd5b50610c6e806100206000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c8063a69df4b51161005b578063a69df4b51461014a578063b4926e2514610154578063f83d08ba14610222578063fd0177971461022c57610088565b80630d8e6e2c1461008d5780635aa68ac0146100ab57806378b903371461010a5780639738968c1461012a575b600080fd5b610095610270565b6040518082815260200191505060405180910390f35b6100b361027a565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b838110156100f65780820151818401526020810190506100db565b505050509050019250505060405180910390f35b6101126102d2565b60405180821515815260200191505060405180910390f35b6101326102e8565b60405180821515815260200191505060405180910390f35b61015261033f565b005b61020a6004803603602081101561016a57600080fd5b810190808035906020019064010000000081111561018757600080fd5b82018360208201111561019957600080fd5b803590602001918460208302840111640100000000831117156101bb57600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600081840152601f19601f820116905080830192505050505050509192919290505050610437565b60405180821515815260200191505060405180910390f35b61022a6105e3565b005b6102586004803603602081101561024257600080fd5b81019080803590602001909291905050506106d9565b60405180821515815260200191505060405180910390f35b6000600154905090565b606060028054806020026020016040519081016040528092919081815260200182805480156102c857602002820191906000526020600020905b8154815260200190600101908083116102b4575b5050505050905090565b60008060149054906101000a900460ff16905090565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff1614905090565b600060149054906101000a900460ff161561035957600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff161461041a576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260158152602001807f4f726967696e206e6f7420746865206f776e65722e000000000000000000000081525060200191505060405180910390fd5b6001600060146101000a81548160ff021916908315150217905550565b60008060149054906101000a900460ff161561045257600080fd5b600073ffffffffffffffffffffffffffffffffffffffff1660008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614156104e857326000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff16146105a9576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260158152602001807f4f726967696e206e6f7420746865206f776e65722e000000000000000000000081525060200191505060405180910390fd5b60006105b4836107d3565b90506001600060146101000a81548160ff0219169083151502179055506105d9610a0c565b5080915050919050565b600060149054906101000a900460ff166105fc57600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff16146106bd576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260158152602001807f4f726967696e206e6f7420746865206f776e65722e000000000000000000000081525060200191505060405180910390fd5b60008060146101000a81548160ff021916908315150217905550565b60008060149054906101000a900460ff166106f357600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff16146107b4576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260158152602001807f4f726967696e206e6f7420746865206f776e65722e000000000000000000000081525060200191505060405180910390fd5b60006107bf83610a96565b90506107c9610a0c565b5080915050919050565b6000806001905060005b8351811015610a02576108028482815181106107f557fe5b6020026020010151610b81565b156108a7577fcc7365305ae5f16c463d1383713d699f43c5548bbda5537ee61373ceb9aaf213600085838151811061083657fe5b6020026020010151604051808315158152602001828152602001806020018281038252601b8152602001807f4163636f756e7420697320616c72656164792061204d656d6265720000000000815250602001935050505060405180910390a18180156108a0575060005b91506109f5565b60006108c58583815181106108b857fe5b6020026020010151610ba1565b9050606081610909576040518060400160405280601b81526020017f4163636f756e7420697320616c72656164792061204d656d6265720000000000815250610923565b604051806060016040528060218152602001610c18602191395b90507fcc7365305ae5f16c463d1383713d699f43c5548bbda5537ee61373ceb9aaf2138287858151811061095357fe5b60200260200101518360405180841515815260200183815260200180602001828103825283818151815260200191508051906020019080838360005b838110156109aa57808201518184015260208101905061098f565b50505050905090810190601f1680156109d75780820380516001836020036101000a031916815260200191505b5094505050505060405180910390a18380156109f05750815b935050505b80806001019150506107dd565b5080915050919050565b60006001430340416002604051602001808481526020018373ffffffffffffffffffffffffffffffffffffffff1660601b81526014018280548015610a7057602002820191906000526020600020905b815481526020019060010190808311610a5c575b505093505050506040516020818303038152906040528051906020012060018190555090565b60008060036000848152602001908152602001600020549050600081118015610ac457506002805490508111155b15610b76576002805490508114610b32576000600260016002805490500381548110610aec57fe5b906000526020600020015490508060026001840381548110610b0a57fe5b9060005260206000200181905550816003600083815260200190815260200160002081905550505b6002805480610b3d57fe5b60019003818190600052602060002001600090559055600060036000858152602001908152602001600020819055506001915050610b7c565b60009150505b919050565b600080600360008481526020019081526020016000205414159050919050565b60008060036000848152602001908152602001600020541415610c0d576002829080600181540180825580915050600190039060005260206000200160009091909190915055600280549050600360008481526020019081526020016000208190555060019050610c12565b600090505b91905056fe4d656d626572206163636f756e74206164646564207375636365737366756c6c79a2646970667358221220aaa2dd79ed65e1a55d25832a79d0bd9f47b1b0bae7b719d96723f776987a93b264736f6c634300060c0033";
-
-  public static final String FUNC_ADDPARTICIPANTS = "addParticipants";
-
-  public static final String FUNC_CANEXECUTE = "canExecute";
-
-  public static final String FUNC_CANUPGRADE = "canUpgrade";
-
-  public static final String FUNC_GETPARTICIPANTS = "getParticipants";
-
-  public static final String FUNC_GETVERSION = "getVersion";
-
-  public static final String FUNC_LOCK = "lock";
-
-  public static final String FUNC_REMOVEPARTICIPANT = "removeParticipant";
-
-  public static final String FUNC_UNLOCK = "unlock";
-
-  public static final Event PARTICIPANTADDED_EVENT =
-      new Event(
-          "ParticipantAdded",
-          Arrays.<TypeReference<?>>asList(
-              new TypeReference<Bool>() {},
-              new TypeReference<Bytes32>() {},
-              new TypeReference<Utf8String>() {}));;
-
-  @Deprecated
-  protected DefaultOnChainPrivacyGroupManagementContract(
-      String contractAddress,
-      Web3j web3j,
-      Credentials credentials,
-      BigInteger gasPrice,
-      BigInteger gasLimit) {
-    super(BINARY, contractAddress, web3j, credentials, gasPrice, gasLimit);
-  }
-
-  protected DefaultOnChainPrivacyGroupManagementContract(
-      String contractAddress,
-      Web3j web3j,
-      Credentials credentials,
-      ContractGasProvider contractGasProvider) {
-    super(BINARY, contractAddress, web3j, credentials, contractGasProvider);
-  }
-
-  @Deprecated
-  protected DefaultOnChainPrivacyGroupManagementContract(
-      String contractAddress,
-      Web3j web3j,
-      TransactionManager transactionManager,
-      BigInteger gasPrice,
-      BigInteger gasLimit) {
-    super(BINARY, contractAddress, web3j, transactionManager, gasPrice, gasLimit);
-  }
-
-  protected DefaultOnChainPrivacyGroupManagementContract(
-      String contractAddress,
-      Web3j web3j,
-      TransactionManager transactionManager,
-      ContractGasProvider contractGasProvider) {
-    super(BINARY, contractAddress, web3j, transactionManager, contractGasProvider);
-  }
-
-  public List<ParticipantAddedEventResponse> getParticipantAddedEvents(
-      TransactionReceipt transactionReceipt) {
-    List<Contract.EventValuesWithLog> valueList =
-        extractEventParametersWithLog(PARTICIPANTADDED_EVENT, transactionReceipt);
-    ArrayList<ParticipantAddedEventResponse> responses =
-        new ArrayList<ParticipantAddedEventResponse>(valueList.size());
-    for (Contract.EventValuesWithLog eventValues : valueList) {
-      ParticipantAddedEventResponse typedResponse = new ParticipantAddedEventResponse();
-      typedResponse.log = eventValues.getLog();
-      typedResponse.success = (Boolean) eventValues.getNonIndexedValues().get(0).getValue();
-      typedResponse.publicEnclaveKey = (byte[]) eventValues.getNonIndexedValues().get(1).getValue();
-      typedResponse.message = (String) eventValues.getNonIndexedValues().get(2).getValue();
-      responses.add(typedResponse);
-    }
-    return responses;
-  }
-
-  public Flowable<ParticipantAddedEventResponse> participantAddedEventFlowable(EthFilter filter) {
-    return web3j
-        .ethLogFlowable(filter)
-        .map(
-            new Function<Log, ParticipantAddedEventResponse>() {
-              @Override
-              public ParticipantAddedEventResponse apply(Log log) {
-                Contract.EventValuesWithLog eventValues =
-                    extractEventParametersWithLog(PARTICIPANTADDED_EVENT, log);
-                ParticipantAddedEventResponse typedResponse = new ParticipantAddedEventResponse();
-                typedResponse.log = log;
-                typedResponse.success =
-                    (Boolean) eventValues.getNonIndexedValues().get(0).getValue();
-                typedResponse.publicEnclaveKey =
-                    (byte[]) eventValues.getNonIndexedValues().get(1).getValue();
-                typedResponse.message =
-                    (String) eventValues.getNonIndexedValues().get(2).getValue();
-                return typedResponse;
-              }
-            });
-  }
-
-  public Flowable<ParticipantAddedEventResponse> participantAddedEventFlowable(
-      DefaultBlockParameter startBlock, DefaultBlockParameter endBlock) {
-    EthFilter filter = new EthFilter(startBlock, endBlock, getContractAddress());
-    filter.addSingleTopic(EventEncoder.encode(PARTICIPANTADDED_EVENT));
-    return participantAddedEventFlowable(filter);
-  }
-
-  public RemoteFunctionCall<TransactionReceipt> addParticipants(List<byte[]> _publicEnclaveKeys) {
-    final org.web3j.abi.datatypes.Function function =
-        new org.web3j.abi.datatypes.Function(
-            FUNC_ADDPARTICIPANTS,
-            Arrays.<Type>asList(
-                new org.web3j.abi.datatypes.DynamicArray<org.web3j.abi.datatypes.generated.Bytes32>(
-                    org.web3j.abi.datatypes.generated.Bytes32.class,
-                    org.web3j.abi.Utils.typeMap(
-                        _publicEnclaveKeys, org.web3j.abi.datatypes.generated.Bytes32.class))),
-            Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  public RemoteFunctionCall<Boolean> canExecute() {
-    final org.web3j.abi.datatypes.Function function =
-        new org.web3j.abi.datatypes.Function(
-            FUNC_CANEXECUTE,
-            Arrays.<Type>asList(),
-            Arrays.<TypeReference<?>>asList(new TypeReference<Bool>() {}));
-    return executeRemoteCallSingleValueReturn(function, Boolean.class);
-  }
-
-  public RemoteFunctionCall<TransactionReceipt> canUpgrade() {
-    final org.web3j.abi.datatypes.Function function =
-        new org.web3j.abi.datatypes.Function(
-            FUNC_CANUPGRADE, Arrays.<Type>asList(), Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  public RemoteFunctionCall<List> getParticipants() {
-    final org.web3j.abi.datatypes.Function function =
-        new org.web3j.abi.datatypes.Function(
-            FUNC_GETPARTICIPANTS,
-            Arrays.<Type>asList(),
-            Arrays.<TypeReference<?>>asList(new TypeReference<DynamicArray<Bytes32>>() {}));
-    return new RemoteFunctionCall<List>(
-        function,
-        new Callable<List>() {
-          @Override
-          @SuppressWarnings("unchecked")
-          public List call() throws Exception {
-            List<Type> result = (List<Type>) executeCallSingleValueReturn(function, List.class);
-            return convertToNative(result);
-          }
-        });
-  }
-
-  public RemoteFunctionCall<byte[]> getVersion() {
-    final org.web3j.abi.datatypes.Function function =
-        new org.web3j.abi.datatypes.Function(
-            FUNC_GETVERSION,
-            Arrays.<Type>asList(),
-            Arrays.<TypeReference<?>>asList(new TypeReference<Bytes32>() {}));
-    return executeRemoteCallSingleValueReturn(function, byte[].class);
-  }
-
-  public RemoteFunctionCall<TransactionReceipt> lock() {
-    final org.web3j.abi.datatypes.Function function =
-        new org.web3j.abi.datatypes.Function(
-            FUNC_LOCK, Arrays.<Type>asList(), Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  public RemoteFunctionCall<TransactionReceipt> removeParticipant(byte[] _participant) {
-    final org.web3j.abi.datatypes.Function function =
-        new org.web3j.abi.datatypes.Function(
-            FUNC_REMOVEPARTICIPANT,
-            Arrays.<Type>asList(new org.web3j.abi.datatypes.generated.Bytes32(_participant)),
-            Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  public RemoteFunctionCall<TransactionReceipt> unlock() {
-    final org.web3j.abi.datatypes.Function function =
-        new org.web3j.abi.datatypes.Function(
-            FUNC_UNLOCK, Arrays.<Type>asList(), Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  @Deprecated
-  public static DefaultOnChainPrivacyGroupManagementContract load(
-      String contractAddress,
-      Web3j web3j,
-      Credentials credentials,
-      BigInteger gasPrice,
-      BigInteger gasLimit) {
-    return new DefaultOnChainPrivacyGroupManagementContract(
-        contractAddress, web3j, credentials, gasPrice, gasLimit);
-  }
-
-  @Deprecated
-  public static DefaultOnChainPrivacyGroupManagementContract load(
-      String contractAddress,
-      Web3j web3j,
-      TransactionManager transactionManager,
-      BigInteger gasPrice,
-      BigInteger gasLimit) {
-    return new DefaultOnChainPrivacyGroupManagementContract(
-        contractAddress, web3j, transactionManager, gasPrice, gasLimit);
-  }
-
-  public static DefaultOnChainPrivacyGroupManagementContract load(
-      String contractAddress,
-      Web3j web3j,
-      Credentials credentials,
-      ContractGasProvider contractGasProvider) {
-    return new DefaultOnChainPrivacyGroupManagementContract(
-        contractAddress, web3j, credentials, contractGasProvider);
-  }
-
-  public static DefaultOnChainPrivacyGroupManagementContract load(
-      String contractAddress,
-      Web3j web3j,
-      TransactionManager transactionManager,
-      ContractGasProvider contractGasProvider) {
-    return new DefaultOnChainPrivacyGroupManagementContract(
-        contractAddress, web3j, transactionManager, contractGasProvider);
-  }
-
-  public static RemoteCall<DefaultOnChainPrivacyGroupManagementContract> deploy(
-      Web3j web3j, Credentials credentials, ContractGasProvider contractGasProvider) {
-    return deployRemoteCall(
-        DefaultOnChainPrivacyGroupManagementContract.class,
-        web3j,
-        credentials,
-        contractGasProvider,
-        BINARY,
-        "");
-  }
-
-  @Deprecated
-  public static RemoteCall<DefaultOnChainPrivacyGroupManagementContract> deploy(
-      Web3j web3j, Credentials credentials, BigInteger gasPrice, BigInteger gasLimit) {
-    return deployRemoteCall(
-        DefaultOnChainPrivacyGroupManagementContract.class,
-        web3j,
-        credentials,
-        gasPrice,
-        gasLimit,
-        BINARY,
-        "");
-  }
-
-  public static RemoteCall<DefaultOnChainPrivacyGroupManagementContract> deploy(
-      Web3j web3j, TransactionManager transactionManager, ContractGasProvider contractGasProvider) {
-    return deployRemoteCall(
-        DefaultOnChainPrivacyGroupManagementContract.class,
-        web3j,
-        transactionManager,
-        contractGasProvider,
-        BINARY,
-        "");
-  }
-
-  @Deprecated
-  public static RemoteCall<DefaultOnChainPrivacyGroupManagementContract> deploy(
-      Web3j web3j,
-      TransactionManager transactionManager,
-      BigInteger gasPrice,
-      BigInteger gasLimit) {
-    return deployRemoteCall(
-        DefaultOnChainPrivacyGroupManagementContract.class,
-        web3j,
-        transactionManager,
-        gasPrice,
-        gasLimit,
-        BINARY,
-        "");
-  }
-
-  public static class ParticipantAddedEventResponse extends BaseEventResponse {
-    public Boolean success;
-
-    public byte[] publicEnclaveKey;
-
-    public String message;
-  }
-}
diff --git a/privacy-contracts/src/main/java/org/hyperledger/besu/privacy/contracts/generated/FlexiblePrivacyGroupManagementInterface.java b/privacy-contracts/src/main/java/org/hyperledger/besu/privacy/contracts/generated/FlexiblePrivacyGroupManagementInterface.java
new file mode 100644
index 00000000000..dff393c2a16
--- /dev/null
+++ b/privacy-contracts/src/main/java/org/hyperledger/besu/privacy/contracts/generated/FlexiblePrivacyGroupManagementInterface.java
@@ -0,0 +1,273 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.privacy.contracts.generated;
+
+import java.math.BigInteger;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Callable;
+
+import org.web3j.abi.TypeReference;
+import org.web3j.abi.datatypes.Bool;
+import org.web3j.abi.datatypes.DynamicArray;
+import org.web3j.abi.datatypes.DynamicBytes;
+import org.web3j.abi.datatypes.Function;
+import org.web3j.abi.datatypes.Type;
+import org.web3j.abi.datatypes.generated.Bytes32;
+import org.web3j.crypto.Credentials;
+import org.web3j.protocol.Web3j;
+import org.web3j.protocol.core.RemoteCall;
+import org.web3j.protocol.core.RemoteFunctionCall;
+import org.web3j.protocol.core.methods.response.TransactionReceipt;
+import org.web3j.tx.Contract;
+import org.web3j.tx.TransactionManager;
+import org.web3j.tx.gas.ContractGasProvider;
+
+/**
+ * Auto generated code.
+ *
+ * <p><strong>Do not modify!</strong>
+ *
+ * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
+ * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the <a
+ * href="https://github.com/web3j/web3j/tree/master/codegen">codegen module</a> to update.
+ *
+ * <p>Generated with web3j version 1.4.1.
+ */
+@SuppressWarnings("rawtypes")
+public class FlexiblePrivacyGroupManagementInterface extends Contract {
+  public static final String BINARY = "";
+
+  public static final String FUNC_ADDPARTICIPANTS = "addParticipants";
+
+  public static final String FUNC_CANEXECUTE = "canExecute";
+
+  public static final String FUNC_CANUPGRADE = "canUpgrade";
+
+  public static final String FUNC_GETPARTICIPANTS = "getParticipants";
+
+  public static final String FUNC_GETVERSION = "getVersion";
+
+  public static final String FUNC_LOCK = "lock";
+
+  public static final String FUNC_REMOVEPARTICIPANT = "removeParticipant";
+
+  public static final String FUNC_UNLOCK = "unlock";
+
+  @Deprecated
+  protected FlexiblePrivacyGroupManagementInterface(
+      String contractAddress,
+      Web3j web3j,
+      Credentials credentials,
+      BigInteger gasPrice,
+      BigInteger gasLimit) {
+    super(BINARY, contractAddress, web3j, credentials, gasPrice, gasLimit);
+  }
+
+  protected FlexiblePrivacyGroupManagementInterface(
+      String contractAddress,
+      Web3j web3j,
+      Credentials credentials,
+      ContractGasProvider contractGasProvider) {
+    super(BINARY, contractAddress, web3j, credentials, contractGasProvider);
+  }
+
+  @Deprecated
+  protected FlexiblePrivacyGroupManagementInterface(
+      String contractAddress,
+      Web3j web3j,
+      TransactionManager transactionManager,
+      BigInteger gasPrice,
+      BigInteger gasLimit) {
+    super(BINARY, contractAddress, web3j, transactionManager, gasPrice, gasLimit);
+  }
+
+  protected FlexiblePrivacyGroupManagementInterface(
+      String contractAddress,
+      Web3j web3j,
+      TransactionManager transactionManager,
+      ContractGasProvider contractGasProvider) {
+    super(BINARY, contractAddress, web3j, transactionManager, contractGasProvider);
+  }
+
+  public RemoteFunctionCall<TransactionReceipt> addParticipants(List<byte[]> publicEnclaveKeys) {
+    final Function function =
+        new Function(
+            FUNC_ADDPARTICIPANTS,
+            Arrays.<Type>asList(
+                new org.web3j.abi.datatypes.DynamicArray<org.web3j.abi.datatypes.DynamicBytes>(
+                    org.web3j.abi.datatypes.DynamicBytes.class,
+                    org.web3j.abi.Utils.typeMap(
+                        publicEnclaveKeys, org.web3j.abi.datatypes.DynamicBytes.class))),
+            Collections.<TypeReference<?>>emptyList());
+    return executeRemoteCallTransaction(function);
+  }
+
+  public RemoteFunctionCall<Boolean> canExecute() {
+    final Function function =
+        new Function(
+            FUNC_CANEXECUTE,
+            Arrays.<Type>asList(),
+            Arrays.<TypeReference<?>>asList(new TypeReference<Bool>() {}));
+    return executeRemoteCallSingleValueReturn(function, Boolean.class);
+  }
+
+  public RemoteFunctionCall<TransactionReceipt> canUpgrade() {
+    final Function function =
+        new Function(
+            FUNC_CANUPGRADE, Arrays.<Type>asList(), Collections.<TypeReference<?>>emptyList());
+    return executeRemoteCallTransaction(function);
+  }
+
+  public RemoteFunctionCall<List> getParticipants() {
+    final Function function =
+        new Function(
+            FUNC_GETPARTICIPANTS,
+            Arrays.<Type>asList(),
+            Arrays.<TypeReference<?>>asList(new TypeReference<DynamicArray<DynamicBytes>>() {}));
+    return new RemoteFunctionCall<List>(
+        function,
+        new Callable<List>() {
+          @Override
+          @SuppressWarnings("unchecked")
+          public List call() throws Exception {
+            List<Type> result = (List<Type>) executeCallSingleValueReturn(function, List.class);
+            return convertToNative(result);
+          }
+        });
+  }
+
+  public RemoteFunctionCall<byte[]> getVersion() {
+    final Function function =
+        new Function(
+            FUNC_GETVERSION,
+            Arrays.<Type>asList(),
+            Arrays.<TypeReference<?>>asList(new TypeReference<Bytes32>() {}));
+    return executeRemoteCallSingleValueReturn(function, byte[].class);
+  }
+
+  public RemoteFunctionCall<TransactionReceipt> lock() {
+    final Function function =
+        new Function(FUNC_LOCK, Arrays.<Type>asList(), Collections.<TypeReference<?>>emptyList());
+    return executeRemoteCallTransaction(function);
+  }
+
+  public RemoteFunctionCall<TransactionReceipt> removeParticipant(byte[] participant) {
+    final Function function =
+        new Function(
+            FUNC_REMOVEPARTICIPANT,
+            Arrays.<Type>asList(new org.web3j.abi.datatypes.DynamicBytes(participant)),
+            Collections.<TypeReference<?>>emptyList());
+    return executeRemoteCallTransaction(function);
+  }
+
+  public RemoteFunctionCall<TransactionReceipt> unlock() {
+    final Function function =
+        new Function(FUNC_UNLOCK, Arrays.<Type>asList(), Collections.<TypeReference<?>>emptyList());
+    return executeRemoteCallTransaction(function);
+  }
+
+  @Deprecated
+  public static FlexiblePrivacyGroupManagementInterface load(
+      String contractAddress,
+      Web3j web3j,
+      Credentials credentials,
+      BigInteger gasPrice,
+      BigInteger gasLimit) {
+    return new FlexiblePrivacyGroupManagementInterface(
+        contractAddress, web3j, credentials, gasPrice, gasLimit);
+  }
+
+  @Deprecated
+  public static FlexiblePrivacyGroupManagementInterface load(
+      String contractAddress,
+      Web3j web3j,
+      TransactionManager transactionManager,
+      BigInteger gasPrice,
+      BigInteger gasLimit) {
+    return new FlexiblePrivacyGroupManagementInterface(
+        contractAddress, web3j, transactionManager, gasPrice, gasLimit);
+  }
+
+  public static FlexiblePrivacyGroupManagementInterface load(
+      String contractAddress,
+      Web3j web3j,
+      Credentials credentials,
+      ContractGasProvider contractGasProvider) {
+    return new FlexiblePrivacyGroupManagementInterface(
+        contractAddress, web3j, credentials, contractGasProvider);
+  }
+
+  public static FlexiblePrivacyGroupManagementInterface load(
+      String contractAddress,
+      Web3j web3j,
+      TransactionManager transactionManager,
+      ContractGasProvider contractGasProvider) {
+    return new FlexiblePrivacyGroupManagementInterface(
+        contractAddress, web3j, transactionManager, contractGasProvider);
+  }
+
+  public static RemoteCall<FlexiblePrivacyGroupManagementInterface> deploy(
+      Web3j web3j, Credentials credentials, ContractGasProvider contractGasProvider) {
+    return deployRemoteCall(
+        FlexiblePrivacyGroupManagementInterface.class,
+        web3j,
+        credentials,
+        contractGasProvider,
+        BINARY,
+        "");
+  }
+
+  @Deprecated
+  public static RemoteCall<FlexiblePrivacyGroupManagementInterface> deploy(
+      Web3j web3j, Credentials credentials, BigInteger gasPrice, BigInteger gasLimit) {
+    return deployRemoteCall(
+        FlexiblePrivacyGroupManagementInterface.class,
+        web3j,
+        credentials,
+        gasPrice,
+        gasLimit,
+        BINARY,
+        "");
+  }
+
+  public static RemoteCall<FlexiblePrivacyGroupManagementInterface> deploy(
+      Web3j web3j, TransactionManager transactionManager, ContractGasProvider contractGasProvider) {
+    return deployRemoteCall(
+        FlexiblePrivacyGroupManagementInterface.class,
+        web3j,
+        transactionManager,
+        contractGasProvider,
+        BINARY,
+        "");
+  }
+
+  @Deprecated
+  public static RemoteCall<FlexiblePrivacyGroupManagementInterface> deploy(
+      Web3j web3j,
+      TransactionManager transactionManager,
+      BigInteger gasPrice,
+      BigInteger gasLimit) {
+    return deployRemoteCall(
+        FlexiblePrivacyGroupManagementInterface.class,
+        web3j,
+        transactionManager,
+        gasPrice,
+        gasLimit,
+        BINARY,
+        "");
+  }
+}
diff --git a/privacy-contracts/src/main/java/org/hyperledger/besu/privacy/contracts/generated/FlexiblePrivacyGroupManagementProxy.java b/privacy-contracts/src/main/java/org/hyperledger/besu/privacy/contracts/generated/FlexiblePrivacyGroupManagementProxy.java
new file mode 100644
index 00000000000..4b94feb919d
--- /dev/null
+++ b/privacy-contracts/src/main/java/org/hyperledger/besu/privacy/contracts/generated/FlexiblePrivacyGroupManagementProxy.java
@@ -0,0 +1,383 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.privacy.contracts.generated;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Callable;
+
+import io.reactivex.Flowable;
+import io.reactivex.functions.Function;
+import org.web3j.abi.EventEncoder;
+import org.web3j.abi.FunctionEncoder;
+import org.web3j.abi.TypeReference;
+import org.web3j.abi.datatypes.Address;
+import org.web3j.abi.datatypes.Bool;
+import org.web3j.abi.datatypes.DynamicArray;
+import org.web3j.abi.datatypes.DynamicBytes;
+import org.web3j.abi.datatypes.Event;
+import org.web3j.abi.datatypes.Type;
+import org.web3j.abi.datatypes.generated.Bytes32;
+import org.web3j.crypto.Credentials;
+import org.web3j.protocol.Web3j;
+import org.web3j.protocol.core.DefaultBlockParameter;
+import org.web3j.protocol.core.RemoteCall;
+import org.web3j.protocol.core.RemoteFunctionCall;
+import org.web3j.protocol.core.methods.request.EthFilter;
+import org.web3j.protocol.core.methods.response.BaseEventResponse;
+import org.web3j.protocol.core.methods.response.Log;
+import org.web3j.protocol.core.methods.response.TransactionReceipt;
+import org.web3j.tx.Contract;
+import org.web3j.tx.TransactionManager;
+import org.web3j.tx.gas.ContractGasProvider;
+
+/**
+ * Auto generated code.
+ *
+ * <p><strong>Do not modify!</strong>
+ *
+ * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
+ * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the <a
+ * href="https://github.com/web3j/web3j/tree/master/codegen">codegen module</a> to update.
+ *
+ * <p>Generated with web3j version 1.4.1.
+ */
+@SuppressWarnings("rawtypes")
+public class FlexiblePrivacyGroupManagementProxy extends Contract {
+  public static final String BINARY =
+      "60806040523480156200001157600080fd5b506040516200166d3803806200166d8339818101604052810190620000379190620000e8565b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550506200011a565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620000b08262000083565b9050919050565b620000c281620000a3565b8114620000ce57600080fd5b50565b600081519050620000e281620000b7565b92915050565b6000602082840312156200010157620001006200007e565b5b60006200011184828501620000d1565b91505092915050565b611543806200012a6000396000f3fe608060405234801561001057600080fd5b506004361061009e5760003560e01c806378b903371161006657806378b9033714610149578063965a25ef146101675780639738968c14610197578063a69df4b5146101b5578063f83d08ba146101bf5761009e565b80630d8e6e2c146100a35780631f52a8ee146100c15780633659cfe6146100f15780635aa68ac01461010d5780635c60da1b1461012b575b600080fd5b6100ab6101c9565b6040516100b89190610a86565b60405180910390f35b6100db60048036038101906100d69190610b1a565b610264565b6040516100e89190610b82565b60405180910390f35b61010b60048036038101906101069190610bfb565b610357565b005b61011561066d565b6040516101229190610d83565b60405180910390f35b61013361070f565b6040516101409190610db4565b60405180910390f35b610151610733565b60405161015e9190610b82565b60405180910390f35b610181600480360381019061017c9190610e25565b6107ce565b60405161018e9190610b82565b60405180910390f35b61019f61087b565b6040516101ac9190610b82565b60405180910390f35b6101bd610918565b005b6101c76109a1565b005b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff16630d8e6e2c6040518163ffffffff1660e01b8152600401602060405180830381865afa15801561023a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061025e9190610e9e565b91505090565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905060008173ffffffffffffffffffffffffffffffffffffffff16631f52a8ee86866040518363ffffffff1660e01b81526004016102c7929190610f18565b6020604051808303816000875af11580156102e6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061030a9190610f68565b9050801561034c577f52213552a930e6de0c0d7df74ece31dac1306b2c7e200ceded7a4442853189b58585604051610343929190610f18565b60405180910390a15b809250505092915050565b3073ffffffffffffffffffffffffffffffffffffffff166378b903376040518163ffffffff1660e01b8152600401602060405180830381865afa1580156103a2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c69190610f68565b610405576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016103fc90610ff2565b60405180910390fd5b8073ffffffffffffffffffffffffffffffffffffffff1660008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161415610494576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161048b906110aa565b60405180910390fd5b3073ffffffffffffffffffffffffffffffffffffffff16639738968c6040518163ffffffff1660e01b81526004016020604051808303816000875af11580156104e1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105059190610f68565b610544576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161053b9061113c565b60405180910390fd5b60003073ffffffffffffffffffffffffffffffffffffffff16635aa68ac06040518163ffffffff1660e01b8152600401600060405180830381865afa158015610591573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f820116820180604052508101906105ba919061135e565b90506105c582610a2a565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663965a25ef836040518263ffffffff1660e01b81526004016106249190610d83565b6020604051808303816000875af1158015610643573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106679190610f68565b50505050565b606060008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff16635aa68ac06040518163ffffffff1660e01b8152600401600060405180830381865afa1580156106e0573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f82011682018060405250810190610709919061135e565b91505090565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff166378b903376040518163ffffffff1660e01b8152600401602060405180830381865afa1580156107a4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107c89190610f68565b91505090565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663965a25ef85856040518363ffffffff1660e01b815260040161082f9291906114e9565b6020604051808303816000875af115801561084e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108729190610f68565b91505092915050565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff16639738968c6040518163ffffffff1660e01b81526004016020604051808303816000875af11580156108ee573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109129190610f68565b91505090565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663a69df4b56040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561098657600080fd5b505af115801561099a573d6000803e3d6000fd5b5050505050565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663f83d08ba6040518163ffffffff1660e01b8152600401600060405180830381600087803b158015610a0f57600080fd5b505af1158015610a23573d6000803e3d6000fd5b5050505050565b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b6000819050919050565b610a8081610a6d565b82525050565b6000602082019050610a9b6000830184610a77565b92915050565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b600080fd5b60008083601f840112610ada57610ad9610ab5565b5b8235905067ffffffffffffffff811115610af757610af6610aba565b5b602083019150836001820283011115610b1357610b12610abf565b5b9250929050565b60008060208385031215610b3157610b30610aab565b5b600083013567ffffffffffffffff811115610b4f57610b4e610ab0565b5b610b5b85828601610ac4565b92509250509250929050565b60008115159050919050565b610b7c81610b67565b82525050565b6000602082019050610b976000830184610b73565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610bc882610b9d565b9050919050565b610bd881610bbd565b8114610be357600080fd5b50565b600081359050610bf581610bcf565b92915050565b600060208284031215610c1157610c10610aab565b5b6000610c1f84828501610be6565b91505092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b600081519050919050565b600082825260208201905092915050565b60005b83811015610c8e578082015181840152602081019050610c73565b83811115610c9d576000848401525b50505050565b6000601f19601f8301169050919050565b6000610cbf82610c54565b610cc98185610c5f565b9350610cd9818560208601610c70565b610ce281610ca3565b840191505092915050565b6000610cf98383610cb4565b905092915050565b6000602082019050919050565b6000610d1982610c28565b610d238185610c33565b935083602082028501610d3585610c44565b8060005b85811015610d715784840389528151610d528582610ced565b9450610d5d83610d01565b925060208a01995050600181019050610d39565b50829750879550505050505092915050565b60006020820190508181036000830152610d9d8184610d0e565b905092915050565b610dae81610bbd565b82525050565b6000602082019050610dc96000830184610da5565b92915050565b60008083601f840112610de557610de4610ab5565b5b8235905067ffffffffffffffff811115610e0257610e01610aba565b5b602083019150836020820283011115610e1e57610e1d610abf565b5b9250929050565b60008060208385031215610e3c57610e3b610aab565b5b600083013567ffffffffffffffff811115610e5a57610e59610ab0565b5b610e6685828601610dcf565b92509250509250929050565b610e7b81610a6d565b8114610e8657600080fd5b50565b600081519050610e9881610e72565b92915050565b600060208284031215610eb457610eb3610aab565b5b6000610ec284828501610e89565b91505092915050565b600082825260208201905092915050565b82818337600083830152505050565b6000610ef78385610ecb565b9350610f04838584610edc565b610f0d83610ca3565b840190509392505050565b60006020820190508181036000830152610f33818486610eeb565b90509392505050565b610f4581610b67565b8114610f5057600080fd5b50565b600081519050610f6281610f3c565b92915050565b600060208284031215610f7e57610f7d610aab565b5b6000610f8c84828501610f53565b91505092915050565b600082825260208201905092915050565b7f54686520636f6e7472616374206973206c6f636b65642e000000000000000000600082015250565b6000610fdc601783610f95565b9150610fe782610fa6565b602082019050919050565b6000602082019050818103600083015261100b81610fcf565b9050919050565b7f54686520636f6e747261637420746f207570677261646520746f20686173207460008201527f6f20626520646966666572656e742066726f6d207468652063757272656e742060208201527f6d616e6167656d656e7420636f6e74726163742e000000000000000000000000604082015250565b6000611094605483610f95565b915061109f82611012565b606082019050919050565b600060208201905081810360008301526110c381611087565b9050919050565b7f4e6f7420616c6c6f77656420746f207570677261646520746865206d616e616760008201527f656d656e7420636f6e74726163742e0000000000000000000000000000000000602082015250565b6000611126602f83610f95565b9150611131826110ca565b604082019050919050565b6000602082019050818103600083015261115581611119565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61119482610ca3565b810181811067ffffffffffffffff821117156111b3576111b261115c565b5b80604052505050565b60006111c6610aa1565b90506111d2828261118b565b919050565b600067ffffffffffffffff8211156111f2576111f161115c565b5b602082029050602081019050919050565b600080fd5b600067ffffffffffffffff8211156112235761122261115c565b5b61122c82610ca3565b9050602081019050919050565b600061124c61124784611208565b6111bc565b90508281526020810184848401111561126857611267611203565b5b611273848285610c70565b509392505050565b600082601f8301126112905761128f610ab5565b5b81516112a0848260208601611239565b91505092915050565b60006112bc6112b7846111d7565b6111bc565b905080838252602082019050602084028301858111156112df576112de610abf565b5b835b8181101561132657805167ffffffffffffffff81111561130457611303610ab5565b5b808601611311898261127b565b855260208501945050506020810190506112e1565b5050509392505050565b600082601f83011261134557611344610ab5565b5b81516113558482602086016112a9565b91505092915050565b60006020828403121561137457611373610aab565b5b600082015167ffffffffffffffff81111561139257611391610ab0565b5b61139e84828501611330565b91505092915050565b6000819050919050565b60006113bd8385610c5f565b93506113ca838584610edc565b6113d383610ca3565b840190509392505050565b60006113eb8484846113b1565b90509392505050565b600080fd5b600080fd5b600080fd5b600080833560016020038436030381126114205761141f6113fe565b5b83810192508235915060208301925067ffffffffffffffff821115611448576114476113f4565b5b60018202360384131561145e5761145d6113f9565b5b509250929050565b6000602082019050919050565b600061147f8385610c33565b935083602084028501611491846113a7565b8060005b878110156114d75784840389526114ac8284611403565b6114b78682846113de565b95506114c284611466565b935060208b019a505050600181019050611495565b50829750879450505050509392505050565b60006020820190508181036000830152611504818486611473565b9050939250505056fea2646970667358221220d7eefee8f20c9de5911bbd7081429d08304b75cc59dda600e9adae257a50bdf664736f6c634300080c0033";
+
+  public static final String FUNC_ADDPARTICIPANTS = "addParticipants";
+
+  public static final String FUNC_CANEXECUTE = "canExecute";
+
+  public static final String FUNC_CANUPGRADE = "canUpgrade";
+
+  public static final String FUNC_GETPARTICIPANTS = "getParticipants";
+
+  public static final String FUNC_GETVERSION = "getVersion";
+
+  public static final String FUNC_IMPLEMENTATION = "implementation";
+
+  public static final String FUNC_LOCK = "lock";
+
+  public static final String FUNC_REMOVEPARTICIPANT = "removeParticipant";
+
+  public static final String FUNC_UNLOCK = "unlock";
+
+  public static final String FUNC_UPGRADETO = "upgradeTo";
+
+  public static final Event PARTICIPANTREMOVED_EVENT =
+      new Event(
+          "ParticipantRemoved",
+          Arrays.<TypeReference<?>>asList(new TypeReference<DynamicBytes>() {}));
+  ;
+
+  @Deprecated
+  protected FlexiblePrivacyGroupManagementProxy(
+      String contractAddress,
+      Web3j web3j,
+      Credentials credentials,
+      BigInteger gasPrice,
+      BigInteger gasLimit) {
+    super(BINARY, contractAddress, web3j, credentials, gasPrice, gasLimit);
+  }
+
+  protected FlexiblePrivacyGroupManagementProxy(
+      String contractAddress,
+      Web3j web3j,
+      Credentials credentials,
+      ContractGasProvider contractGasProvider) {
+    super(BINARY, contractAddress, web3j, credentials, contractGasProvider);
+  }
+
+  @Deprecated
+  protected FlexiblePrivacyGroupManagementProxy(
+      String contractAddress,
+      Web3j web3j,
+      TransactionManager transactionManager,
+      BigInteger gasPrice,
+      BigInteger gasLimit) {
+    super(BINARY, contractAddress, web3j, transactionManager, gasPrice, gasLimit);
+  }
+
+  protected FlexiblePrivacyGroupManagementProxy(
+      String contractAddress,
+      Web3j web3j,
+      TransactionManager transactionManager,
+      ContractGasProvider contractGasProvider) {
+    super(BINARY, contractAddress, web3j, transactionManager, contractGasProvider);
+  }
+
+  public List<ParticipantRemovedEventResponse> getParticipantRemovedEvents(
+      TransactionReceipt transactionReceipt) {
+    List<Contract.EventValuesWithLog> valueList =
+        extractEventParametersWithLog(PARTICIPANTREMOVED_EVENT, transactionReceipt);
+    ArrayList<ParticipantRemovedEventResponse> responses =
+        new ArrayList<ParticipantRemovedEventResponse>(valueList.size());
+    for (Contract.EventValuesWithLog eventValues : valueList) {
+      ParticipantRemovedEventResponse typedResponse = new ParticipantRemovedEventResponse();
+      typedResponse.log = eventValues.getLog();
+      typedResponse.publicEnclaveKey = (byte[]) eventValues.getNonIndexedValues().get(0).getValue();
+      responses.add(typedResponse);
+    }
+    return responses;
+  }
+
+  public Flowable<ParticipantRemovedEventResponse> participantRemovedEventFlowable(
+      EthFilter filter) {
+    return web3j
+        .ethLogFlowable(filter)
+        .map(
+            new Function<Log, ParticipantRemovedEventResponse>() {
+              @Override
+              public ParticipantRemovedEventResponse apply(Log log) {
+                Contract.EventValuesWithLog eventValues =
+                    extractEventParametersWithLog(PARTICIPANTREMOVED_EVENT, log);
+                ParticipantRemovedEventResponse typedResponse =
+                    new ParticipantRemovedEventResponse();
+                typedResponse.log = log;
+                typedResponse.publicEnclaveKey =
+                    (byte[]) eventValues.getNonIndexedValues().get(0).getValue();
+                return typedResponse;
+              }
+            });
+  }
+
+  public Flowable<ParticipantRemovedEventResponse> participantRemovedEventFlowable(
+      DefaultBlockParameter startBlock, DefaultBlockParameter endBlock) {
+    EthFilter filter = new EthFilter(startBlock, endBlock, getContractAddress());
+    filter.addSingleTopic(EventEncoder.encode(PARTICIPANTREMOVED_EVENT));
+    return participantRemovedEventFlowable(filter);
+  }
+
+  public RemoteFunctionCall<TransactionReceipt> addParticipants(List<byte[]> _publicEnclaveKeys) {
+    final org.web3j.abi.datatypes.Function function =
+        new org.web3j.abi.datatypes.Function(
+            FUNC_ADDPARTICIPANTS,
+            Arrays.<Type>asList(
+                new org.web3j.abi.datatypes.DynamicArray<org.web3j.abi.datatypes.DynamicBytes>(
+                    org.web3j.abi.datatypes.DynamicBytes.class,
+                    org.web3j.abi.Utils.typeMap(
+                        _publicEnclaveKeys, org.web3j.abi.datatypes.DynamicBytes.class))),
+            Collections.<TypeReference<?>>emptyList());
+    return executeRemoteCallTransaction(function);
+  }
+
+  public RemoteFunctionCall<Boolean> canExecute() {
+    final org.web3j.abi.datatypes.Function function =
+        new org.web3j.abi.datatypes.Function(
+            FUNC_CANEXECUTE,
+            Arrays.<Type>asList(),
+            Arrays.<TypeReference<?>>asList(new TypeReference<Bool>() {}));
+    return executeRemoteCallSingleValueReturn(function, Boolean.class);
+  }
+
+  public RemoteFunctionCall<TransactionReceipt> canUpgrade() {
+    final org.web3j.abi.datatypes.Function function =
+        new org.web3j.abi.datatypes.Function(
+            FUNC_CANUPGRADE, Arrays.<Type>asList(), Collections.<TypeReference<?>>emptyList());
+    return executeRemoteCallTransaction(function);
+  }
+
+  public RemoteFunctionCall<List> getParticipants() {
+    final org.web3j.abi.datatypes.Function function =
+        new org.web3j.abi.datatypes.Function(
+            FUNC_GETPARTICIPANTS,
+            Arrays.<Type>asList(),
+            Arrays.<TypeReference<?>>asList(new TypeReference<DynamicArray<DynamicBytes>>() {}));
+    return new RemoteFunctionCall<List>(
+        function,
+        new Callable<List>() {
+          @Override
+          @SuppressWarnings("unchecked")
+          public List call() throws Exception {
+            List<Type> result = (List<Type>) executeCallSingleValueReturn(function, List.class);
+            return convertToNative(result);
+          }
+        });
+  }
+
+  public RemoteFunctionCall<byte[]> getVersion() {
+    final org.web3j.abi.datatypes.Function function =
+        new org.web3j.abi.datatypes.Function(
+            FUNC_GETVERSION,
+            Arrays.<Type>asList(),
+            Arrays.<TypeReference<?>>asList(new TypeReference<Bytes32>() {}));
+    return executeRemoteCallSingleValueReturn(function, byte[].class);
+  }
+
+  public RemoteFunctionCall<String> implementation() {
+    final org.web3j.abi.datatypes.Function function =
+        new org.web3j.abi.datatypes.Function(
+            FUNC_IMPLEMENTATION,
+            Arrays.<Type>asList(),
+            Arrays.<TypeReference<?>>asList(new TypeReference<Address>() {}));
+    return executeRemoteCallSingleValueReturn(function, String.class);
+  }
+
+  public RemoteFunctionCall<TransactionReceipt> lock() {
+    final org.web3j.abi.datatypes.Function function =
+        new org.web3j.abi.datatypes.Function(
+            FUNC_LOCK, Arrays.<Type>asList(), Collections.<TypeReference<?>>emptyList());
+    return executeRemoteCallTransaction(function);
+  }
+
+  public RemoteFunctionCall<TransactionReceipt> removeParticipant(byte[] _participant) {
+    final org.web3j.abi.datatypes.Function function =
+        new org.web3j.abi.datatypes.Function(
+            FUNC_REMOVEPARTICIPANT,
+            Arrays.<Type>asList(new org.web3j.abi.datatypes.DynamicBytes(_participant)),
+            Collections.<TypeReference<?>>emptyList());
+    return executeRemoteCallTransaction(function);
+  }
+
+  public RemoteFunctionCall<TransactionReceipt> unlock() {
+    final org.web3j.abi.datatypes.Function function =
+        new org.web3j.abi.datatypes.Function(
+            FUNC_UNLOCK, Arrays.<Type>asList(), Collections.<TypeReference<?>>emptyList());
+    return executeRemoteCallTransaction(function);
+  }
+
+  public RemoteFunctionCall<TransactionReceipt> upgradeTo(String _newImplementation) {
+    final org.web3j.abi.datatypes.Function function =
+        new org.web3j.abi.datatypes.Function(
+            FUNC_UPGRADETO,
+            Arrays.<Type>asList(new org.web3j.abi.datatypes.Address(160, _newImplementation)),
+            Collections.<TypeReference<?>>emptyList());
+    return executeRemoteCallTransaction(function);
+  }
+
+  @Deprecated
+  public static FlexiblePrivacyGroupManagementProxy load(
+      String contractAddress,
+      Web3j web3j,
+      Credentials credentials,
+      BigInteger gasPrice,
+      BigInteger gasLimit) {
+    return new FlexiblePrivacyGroupManagementProxy(
+        contractAddress, web3j, credentials, gasPrice, gasLimit);
+  }
+
+  @Deprecated
+  public static FlexiblePrivacyGroupManagementProxy load(
+      String contractAddress,
+      Web3j web3j,
+      TransactionManager transactionManager,
+      BigInteger gasPrice,
+      BigInteger gasLimit) {
+    return new FlexiblePrivacyGroupManagementProxy(
+        contractAddress, web3j, transactionManager, gasPrice, gasLimit);
+  }
+
+  public static FlexiblePrivacyGroupManagementProxy load(
+      String contractAddress,
+      Web3j web3j,
+      Credentials credentials,
+      ContractGasProvider contractGasProvider) {
+    return new FlexiblePrivacyGroupManagementProxy(
+        contractAddress, web3j, credentials, contractGasProvider);
+  }
+
+  public static FlexiblePrivacyGroupManagementProxy load(
+      String contractAddress,
+      Web3j web3j,
+      TransactionManager transactionManager,
+      ContractGasProvider contractGasProvider) {
+    return new FlexiblePrivacyGroupManagementProxy(
+        contractAddress, web3j, transactionManager, contractGasProvider);
+  }
+
+  public static RemoteCall<FlexiblePrivacyGroupManagementProxy> deploy(
+      Web3j web3j,
+      Credentials credentials,
+      ContractGasProvider contractGasProvider,
+      String _implementation) {
+    String encodedConstructor =
+        FunctionEncoder.encodeConstructor(
+            Arrays.<Type>asList(new org.web3j.abi.datatypes.Address(160, _implementation)));
+    return deployRemoteCall(
+        FlexiblePrivacyGroupManagementProxy.class,
+        web3j,
+        credentials,
+        contractGasProvider,
+        BINARY,
+        encodedConstructor);
+  }
+
+  public static RemoteCall<FlexiblePrivacyGroupManagementProxy> deploy(
+      Web3j web3j,
+      TransactionManager transactionManager,
+      ContractGasProvider contractGasProvider,
+      String _implementation) {
+    String encodedConstructor =
+        FunctionEncoder.encodeConstructor(
+            Arrays.<Type>asList(new org.web3j.abi.datatypes.Address(160, _implementation)));
+    return deployRemoteCall(
+        FlexiblePrivacyGroupManagementProxy.class,
+        web3j,
+        transactionManager,
+        contractGasProvider,
+        BINARY,
+        encodedConstructor);
+  }
+
+  @Deprecated
+  public static RemoteCall<FlexiblePrivacyGroupManagementProxy> deploy(
+      Web3j web3j,
+      Credentials credentials,
+      BigInteger gasPrice,
+      BigInteger gasLimit,
+      String _implementation) {
+    String encodedConstructor =
+        FunctionEncoder.encodeConstructor(
+            Arrays.<Type>asList(new org.web3j.abi.datatypes.Address(160, _implementation)));
+    return deployRemoteCall(
+        FlexiblePrivacyGroupManagementProxy.class,
+        web3j,
+        credentials,
+        gasPrice,
+        gasLimit,
+        BINARY,
+        encodedConstructor);
+  }
+
+  @Deprecated
+  public static RemoteCall<FlexiblePrivacyGroupManagementProxy> deploy(
+      Web3j web3j,
+      TransactionManager transactionManager,
+      BigInteger gasPrice,
+      BigInteger gasLimit,
+      String _implementation) {
+    String encodedConstructor =
+        FunctionEncoder.encodeConstructor(
+            Arrays.<Type>asList(new org.web3j.abi.datatypes.Address(160, _implementation)));
+    return deployRemoteCall(
+        FlexiblePrivacyGroupManagementProxy.class,
+        web3j,
+        transactionManager,
+        gasPrice,
+        gasLimit,
+        BINARY,
+        encodedConstructor);
+  }
+
+  public static class ParticipantRemovedEventResponse extends BaseEventResponse {
+    public byte[] publicEnclaveKey;
+  }
+}
diff --git a/privacy-contracts/src/main/java/org/hyperledger/besu/privacy/contracts/generated/OnChainPrivacyGroupManagementInterface.java b/privacy-contracts/src/main/java/org/hyperledger/besu/privacy/contracts/generated/OnChainPrivacyGroupManagementInterface.java
deleted file mode 100644
index a6df39c4e80..00000000000
--- a/privacy-contracts/src/main/java/org/hyperledger/besu/privacy/contracts/generated/OnChainPrivacyGroupManagementInterface.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.privacy.contracts.generated;
-
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.Callable;
-
-import org.web3j.abi.TypeReference;
-import org.web3j.abi.datatypes.Bool;
-import org.web3j.abi.datatypes.DynamicArray;
-import org.web3j.abi.datatypes.Function;
-import org.web3j.abi.datatypes.Type;
-import org.web3j.abi.datatypes.generated.Bytes32;
-import org.web3j.crypto.Credentials;
-import org.web3j.protocol.Web3j;
-import org.web3j.protocol.core.RemoteCall;
-import org.web3j.protocol.core.RemoteFunctionCall;
-import org.web3j.protocol.core.methods.response.TransactionReceipt;
-import org.web3j.tx.Contract;
-import org.web3j.tx.TransactionManager;
-import org.web3j.tx.gas.ContractGasProvider;
-
-/**
- * Auto generated code.
- *
- * <p><strong>Do not modify!</strong>
- *
- * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
- * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the <a
- * href="https://github.com/web3j/web3j/tree/master/codegen">codegen module</a> to update.
- *
- * <p>Generated with web3j version 4.5.16.
- */
-@SuppressWarnings("rawtypes")
-public class OnChainPrivacyGroupManagementInterface extends Contract {
-  public static final String BINARY = "";
-
-  public static final String FUNC_ADDPARTICIPANTS = "addParticipants";
-
-  public static final String FUNC_CANEXECUTE = "canExecute";
-
-  public static final String FUNC_CANUPGRADE = "canUpgrade";
-
-  public static final String FUNC_GETPARTICIPANTS = "getParticipants";
-
-  public static final String FUNC_GETVERSION = "getVersion";
-
-  public static final String FUNC_LOCK = "lock";
-
-  public static final String FUNC_REMOVEPARTICIPANT = "removeParticipant";
-
-  public static final String FUNC_UNLOCK = "unlock";
-
-  @Deprecated
-  protected OnChainPrivacyGroupManagementInterface(
-      String contractAddress,
-      Web3j web3j,
-      Credentials credentials,
-      BigInteger gasPrice,
-      BigInteger gasLimit) {
-    super(BINARY, contractAddress, web3j, credentials, gasPrice, gasLimit);
-  }
-
-  protected OnChainPrivacyGroupManagementInterface(
-      String contractAddress,
-      Web3j web3j,
-      Credentials credentials,
-      ContractGasProvider contractGasProvider) {
-    super(BINARY, contractAddress, web3j, credentials, contractGasProvider);
-  }
-
-  @Deprecated
-  protected OnChainPrivacyGroupManagementInterface(
-      String contractAddress,
-      Web3j web3j,
-      TransactionManager transactionManager,
-      BigInteger gasPrice,
-      BigInteger gasLimit) {
-    super(BINARY, contractAddress, web3j, transactionManager, gasPrice, gasLimit);
-  }
-
-  protected OnChainPrivacyGroupManagementInterface(
-      String contractAddress,
-      Web3j web3j,
-      TransactionManager transactionManager,
-      ContractGasProvider contractGasProvider) {
-    super(BINARY, contractAddress, web3j, transactionManager, contractGasProvider);
-  }
-
-  public RemoteFunctionCall<TransactionReceipt> addParticipants(List<byte[]> publicEnclaveKeys) {
-    final Function function =
-        new Function(
-            FUNC_ADDPARTICIPANTS,
-            Arrays.<Type>asList(
-                new org.web3j.abi.datatypes.DynamicArray<org.web3j.abi.datatypes.generated.Bytes32>(
-                    org.web3j.abi.datatypes.generated.Bytes32.class,
-                    org.web3j.abi.Utils.typeMap(
-                        publicEnclaveKeys, org.web3j.abi.datatypes.generated.Bytes32.class))),
-            Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  public RemoteFunctionCall<Boolean> canExecute() {
-    final Function function =
-        new Function(
-            FUNC_CANEXECUTE,
-            Arrays.<Type>asList(),
-            Arrays.<TypeReference<?>>asList(new TypeReference<Bool>() {}));
-    return executeRemoteCallSingleValueReturn(function, Boolean.class);
-  }
-
-  public RemoteFunctionCall<TransactionReceipt> canUpgrade() {
-    final Function function =
-        new Function(
-            FUNC_CANUPGRADE, Arrays.<Type>asList(), Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  public RemoteFunctionCall<List> getParticipants() {
-    final Function function =
-        new Function(
-            FUNC_GETPARTICIPANTS,
-            Arrays.<Type>asList(),
-            Arrays.<TypeReference<?>>asList(new TypeReference<DynamicArray<Bytes32>>() {}));
-    return new RemoteFunctionCall<List>(
-        function,
-        new Callable<List>() {
-          @Override
-          @SuppressWarnings("unchecked")
-          public List call() throws Exception {
-            List<Type> result = (List<Type>) executeCallSingleValueReturn(function, List.class);
-            return convertToNative(result);
-          }
-        });
-  }
-
-  public RemoteFunctionCall<byte[]> getVersion() {
-    final Function function =
-        new Function(
-            FUNC_GETVERSION,
-            Arrays.<Type>asList(),
-            Arrays.<TypeReference<?>>asList(new TypeReference<Bytes32>() {}));
-    return executeRemoteCallSingleValueReturn(function, byte[].class);
-  }
-
-  public RemoteFunctionCall<TransactionReceipt> lock() {
-    final Function function =
-        new Function(FUNC_LOCK, Arrays.<Type>asList(), Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  public RemoteFunctionCall<TransactionReceipt> removeParticipant(byte[] participant) {
-    final Function function =
-        new Function(
-            FUNC_REMOVEPARTICIPANT,
-            Arrays.<Type>asList(new org.web3j.abi.datatypes.generated.Bytes32(participant)),
-            Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  public RemoteFunctionCall<TransactionReceipt> unlock() {
-    final Function function =
-        new Function(FUNC_UNLOCK, Arrays.<Type>asList(), Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  @Deprecated
-  public static OnChainPrivacyGroupManagementInterface load(
-      String contractAddress,
-      Web3j web3j,
-      Credentials credentials,
-      BigInteger gasPrice,
-      BigInteger gasLimit) {
-    return new OnChainPrivacyGroupManagementInterface(
-        contractAddress, web3j, credentials, gasPrice, gasLimit);
-  }
-
-  @Deprecated
-  public static OnChainPrivacyGroupManagementInterface load(
-      String contractAddress,
-      Web3j web3j,
-      TransactionManager transactionManager,
-      BigInteger gasPrice,
-      BigInteger gasLimit) {
-    return new OnChainPrivacyGroupManagementInterface(
-        contractAddress, web3j, transactionManager, gasPrice, gasLimit);
-  }
-
-  public static OnChainPrivacyGroupManagementInterface load(
-      String contractAddress,
-      Web3j web3j,
-      Credentials credentials,
-      ContractGasProvider contractGasProvider) {
-    return new OnChainPrivacyGroupManagementInterface(
-        contractAddress, web3j, credentials, contractGasProvider);
-  }
-
-  public static OnChainPrivacyGroupManagementInterface load(
-      String contractAddress,
-      Web3j web3j,
-      TransactionManager transactionManager,
-      ContractGasProvider contractGasProvider) {
-    return new OnChainPrivacyGroupManagementInterface(
-        contractAddress, web3j, transactionManager, contractGasProvider);
-  }
-
-  public static RemoteCall<OnChainPrivacyGroupManagementInterface> deploy(
-      Web3j web3j, Credentials credentials, ContractGasProvider contractGasProvider) {
-    return deployRemoteCall(
-        OnChainPrivacyGroupManagementInterface.class,
-        web3j,
-        credentials,
-        contractGasProvider,
-        BINARY,
-        "");
-  }
-
-  @Deprecated
-  public static RemoteCall<OnChainPrivacyGroupManagementInterface> deploy(
-      Web3j web3j, Credentials credentials, BigInteger gasPrice, BigInteger gasLimit) {
-    return deployRemoteCall(
-        OnChainPrivacyGroupManagementInterface.class,
-        web3j,
-        credentials,
-        gasPrice,
-        gasLimit,
-        BINARY,
-        "");
-  }
-
-  public static RemoteCall<OnChainPrivacyGroupManagementInterface> deploy(
-      Web3j web3j, TransactionManager transactionManager, ContractGasProvider contractGasProvider) {
-    return deployRemoteCall(
-        OnChainPrivacyGroupManagementInterface.class,
-        web3j,
-        transactionManager,
-        contractGasProvider,
-        BINARY,
-        "");
-  }
-
-  @Deprecated
-  public static RemoteCall<OnChainPrivacyGroupManagementInterface> deploy(
-      Web3j web3j,
-      TransactionManager transactionManager,
-      BigInteger gasPrice,
-      BigInteger gasLimit) {
-    return deployRemoteCall(
-        OnChainPrivacyGroupManagementInterface.class,
-        web3j,
-        transactionManager,
-        gasPrice,
-        gasLimit,
-        BINARY,
-        "");
-  }
-}
diff --git a/privacy-contracts/src/main/java/org/hyperledger/besu/privacy/contracts/generated/OnChainPrivacyGroupManagementProxy.java b/privacy-contracts/src/main/java/org/hyperledger/besu/privacy/contracts/generated/OnChainPrivacyGroupManagementProxy.java
deleted file mode 100644
index 711c2170615..00000000000
--- a/privacy-contracts/src/main/java/org/hyperledger/besu/privacy/contracts/generated/OnChainPrivacyGroupManagementProxy.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.privacy.contracts.generated;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.Callable;
-
-import io.reactivex.Flowable;
-import io.reactivex.functions.Function;
-import org.web3j.abi.EventEncoder;
-import org.web3j.abi.FunctionEncoder;
-import org.web3j.abi.TypeReference;
-import org.web3j.abi.datatypes.Address;
-import org.web3j.abi.datatypes.Bool;
-import org.web3j.abi.datatypes.DynamicArray;
-import org.web3j.abi.datatypes.Event;
-import org.web3j.abi.datatypes.Type;
-import org.web3j.abi.datatypes.generated.Bytes32;
-import org.web3j.crypto.Credentials;
-import org.web3j.protocol.Web3j;
-import org.web3j.protocol.core.DefaultBlockParameter;
-import org.web3j.protocol.core.RemoteCall;
-import org.web3j.protocol.core.RemoteFunctionCall;
-import org.web3j.protocol.core.methods.request.EthFilter;
-import org.web3j.protocol.core.methods.response.BaseEventResponse;
-import org.web3j.protocol.core.methods.response.Log;
-import org.web3j.protocol.core.methods.response.TransactionReceipt;
-import org.web3j.tx.Contract;
-import org.web3j.tx.TransactionManager;
-import org.web3j.tx.gas.ContractGasProvider;
-
-/**
- * Auto generated code.
- *
- * <p><strong>Do not modify!</strong>
- *
- * <p>Please use the <a href="https://docs.web3j.io/command_line.html">web3j command line tools</a>,
- * or the org.web3j.codegen.SolidityFunctionWrapperGenerator in the <a
- * href="https://github.com/web3j/web3j/tree/master/codegen">codegen module</a> to update.
- *
- * <p>Generated with web3j version 4.5.16.
- */
-@SuppressWarnings("rawtypes")
-public class OnChainPrivacyGroupManagementProxy extends Contract {
-  public static final String BINARY =
-      "608060405234801561001057600080fd5b50604051610fa6380380610fa68339818101604052602081101561003357600080fd5b8101908080519060200190929190505050806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050610f12806100946000396000f3fe608060405234801561001057600080fd5b506004361061009e5760003560e01c80639738968c116100665780639738968c146101b8578063a69df4b5146101d8578063b4926e25146101e2578063f83d08ba146102b0578063fd017797146102ba5761009e565b80630d8e6e2c146100a35780633659cfe6146100c15780635aa68ac0146101055780635c60da1b1461016457806378b9033714610198575b600080fd5b6100ab6102fe565b6040518082815260200191505060405180910390f35b610103600480360360208110156100d757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506103ab565b005b61010d61083e565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b83811015610150578082015181840152602081019050610135565b505050509050019250505060405180910390f35b61016c610987565b604051808273ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6101a06109ab565b60405180821515815260200191505060405180910390f35b6101c0610a58565b60405180821515815260200191505060405180910390f35b6101e0610b07565b005b610298600480360360208110156101f857600080fd5b810190808035906020019064010000000081111561021557600080fd5b82018360208201111561022757600080fd5b8035906020019184602083028401116401000000008311171561024957600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600081840152601f19601f820116905080830192505050505050509192919290505050610b90565b60405180821515815260200191505060405180910390f35b6102b8610c8d565b005b6102e6600480360360208110156102d057600080fd5b8101908080359060200190929190505050610d16565b60405180821515815260200191505060405180910390f35b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff16630d8e6e2c6040518163ffffffff1660e01b815260040160206040518083038186803b15801561036a57600080fd5b505afa15801561037e573d6000803e3d6000fd5b505050506040513d602081101561039457600080fd5b810190808051906020019092919050505091505090565b3073ffffffffffffffffffffffffffffffffffffffff166378b903376040518163ffffffff1660e01b815260040160206040518083038186803b1580156103f157600080fd5b505afa158015610405573d6000803e3d6000fd5b505050506040513d602081101561041b57600080fd5b810190808051906020019092919050505061049e576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260178152602001807f54686520636f6e7472616374206973206c6f636b65642e00000000000000000081525060200191505060405180910390fd5b8073ffffffffffffffffffffffffffffffffffffffff1660008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff161415610543576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526054815260200180610e5a6054913960600191505060405180910390fd5b3073ffffffffffffffffffffffffffffffffffffffff16639738968c6040518163ffffffff1660e01b8152600401602060405180830381600087803b15801561058b57600080fd5b505af115801561059f573d6000803e3d6000fd5b505050506040513d60208110156105b557600080fd5b810190808051906020019092919050505061061b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602f815260200180610eae602f913960400191505060405180910390fd5b60603073ffffffffffffffffffffffffffffffffffffffff16635aa68ac06040518163ffffffff1660e01b815260040160006040518083038186803b15801561066357600080fd5b505afa158015610677573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f8201168201806040525060208110156106a157600080fd5b81019080805160405193929190846401000000008211156106c157600080fd5b838201915060208201858111156106d757600080fd5b82518660208202830111640100000000821117156106f457600080fd5b8083526020830192505050908051906020019060200280838360005b8381101561072b578082015181840152602081019050610710565b50505050905001604052505050905061074382610e16565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663b4926e25836040518263ffffffff1660e01b81526004018080602001828103825283818151815260200191508051906020019060200280838360005b838110156107d85780820151818401526020810190506107bd565b5050505090500192505050602060405180830381600087803b1580156107fd57600080fd5b505af1158015610811573d6000803e3d6000fd5b505050506040513d602081101561082757600080fd5b810190808051906020019092919050505050505050565b606060008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff16635aa68ac06040518163ffffffff1660e01b815260040160006040518083038186803b1580156108ac57600080fd5b505afa1580156108c0573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f8201168201806040525060208110156108ea57600080fd5b810190808051604051939291908464010000000082111561090a57600080fd5b8382019150602082018581111561092057600080fd5b825186602082028301116401000000008211171561093d57600080fd5b8083526020830192505050908051906020019060200280838360005b83811015610974578082015181840152602081019050610959565b5050505090500160405250505091505090565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff166378b903376040518163ffffffff1660e01b815260040160206040518083038186803b158015610a1757600080fd5b505afa158015610a2b573d6000803e3d6000fd5b505050506040513d6020811015610a4157600080fd5b810190808051906020019092919050505091505090565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff16639738968c6040518163ffffffff1660e01b8152600401602060405180830381600087803b158015610ac657600080fd5b505af1158015610ada573d6000803e3d6000fd5b505050506040513d6020811015610af057600080fd5b810190808051906020019092919050505091505090565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663a69df4b56040518163ffffffff1660e01b8152600401600060405180830381600087803b158015610b7557600080fd5b505af1158015610b89573d6000803e3d6000fd5b5050505050565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663b4926e25846040518263ffffffff1660e01b81526004018080602001828103825283818151815260200191508051906020019060200280838360005b83811015610c25578082015181840152602081019050610c0a565b5050505090500192505050602060405180830381600087803b158015610c4a57600080fd5b505af1158015610c5e573d6000803e3d6000fd5b505050506040513d6020811015610c7457600080fd5b8101908080519060200190929190505050915050919050565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663f83d08ba6040518163ffffffff1660e01b8152600401600060405180830381600087803b158015610cfb57600080fd5b505af1158015610d0f573d6000803e3d6000fd5b5050505050565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905060008173ffffffffffffffffffffffffffffffffffffffff1663fd017797856040518263ffffffff1660e01b815260040180828152602001915050602060405180830381600087803b158015610d9157600080fd5b505af1158015610da5573d6000803e3d6000fd5b505050506040513d6020811015610dbb57600080fd5b810190808051906020019092919050505090508015610e0c577fef2df0cc0f44b5a36a7de9951ef49ba4d861649244ff89bcf7ffaa1ac7291e89846040518082815260200191505060405180910390a15b8092505050919050565b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505056fe54686520636f6e747261637420746f207570677261646520746f2068617320746f20626520646966666572656e742066726f6d207468652063757272656e74206d616e6167656d656e7420636f6e74726163742e4e6f7420616c6c6f77656420746f207570677261646520746865206d616e6167656d656e7420636f6e74726163742ea26469706673582212207d77b2288fb78b354ca3a252d7513de3d808fcaa42e73f475b95f412c24a314f64736f6c634300060c0033";
-
-  public static final String FUNC_ADDPARTICIPANTS = "addParticipants";
-
-  public static final String FUNC_CANEXECUTE = "canExecute";
-
-  public static final String FUNC_CANUPGRADE = "canUpgrade";
-
-  public static final String FUNC_GETPARTICIPANTS = "getParticipants";
-
-  public static final String FUNC_GETVERSION = "getVersion";
-
-  public static final String FUNC_IMPLEMENTATION = "implementation";
-
-  public static final String FUNC_LOCK = "lock";
-
-  public static final String FUNC_REMOVEPARTICIPANT = "removeParticipant";
-
-  public static final String FUNC_UNLOCK = "unlock";
-
-  public static final String FUNC_UPGRADETO = "upgradeTo";
-
-  public static final Event PARTICIPANTREMOVED_EVENT =
-      new Event(
-          "ParticipantRemoved", Arrays.<TypeReference<?>>asList(new TypeReference<Bytes32>() {}));;
-
-  @Deprecated
-  protected OnChainPrivacyGroupManagementProxy(
-      String contractAddress,
-      Web3j web3j,
-      Credentials credentials,
-      BigInteger gasPrice,
-      BigInteger gasLimit) {
-    super(BINARY, contractAddress, web3j, credentials, gasPrice, gasLimit);
-  }
-
-  protected OnChainPrivacyGroupManagementProxy(
-      String contractAddress,
-      Web3j web3j,
-      Credentials credentials,
-      ContractGasProvider contractGasProvider) {
-    super(BINARY, contractAddress, web3j, credentials, contractGasProvider);
-  }
-
-  @Deprecated
-  protected OnChainPrivacyGroupManagementProxy(
-      String contractAddress,
-      Web3j web3j,
-      TransactionManager transactionManager,
-      BigInteger gasPrice,
-      BigInteger gasLimit) {
-    super(BINARY, contractAddress, web3j, transactionManager, gasPrice, gasLimit);
-  }
-
-  protected OnChainPrivacyGroupManagementProxy(
-      String contractAddress,
-      Web3j web3j,
-      TransactionManager transactionManager,
-      ContractGasProvider contractGasProvider) {
-    super(BINARY, contractAddress, web3j, transactionManager, contractGasProvider);
-  }
-
-  public List<ParticipantRemovedEventResponse> getParticipantRemovedEvents(
-      TransactionReceipt transactionReceipt) {
-    List<Contract.EventValuesWithLog> valueList =
-        extractEventParametersWithLog(PARTICIPANTREMOVED_EVENT, transactionReceipt);
-    ArrayList<ParticipantRemovedEventResponse> responses =
-        new ArrayList<ParticipantRemovedEventResponse>(valueList.size());
-    for (Contract.EventValuesWithLog eventValues : valueList) {
-      ParticipantRemovedEventResponse typedResponse = new ParticipantRemovedEventResponse();
-      typedResponse.log = eventValues.getLog();
-      typedResponse.publicEnclaveKey = (byte[]) eventValues.getNonIndexedValues().get(0).getValue();
-      responses.add(typedResponse);
-    }
-    return responses;
-  }
-
-  public Flowable<ParticipantRemovedEventResponse> participantRemovedEventFlowable(
-      EthFilter filter) {
-    return web3j
-        .ethLogFlowable(filter)
-        .map(
-            new Function<Log, ParticipantRemovedEventResponse>() {
-              @Override
-              public ParticipantRemovedEventResponse apply(Log log) {
-                Contract.EventValuesWithLog eventValues =
-                    extractEventParametersWithLog(PARTICIPANTREMOVED_EVENT, log);
-                ParticipantRemovedEventResponse typedResponse =
-                    new ParticipantRemovedEventResponse();
-                typedResponse.log = log;
-                typedResponse.publicEnclaveKey =
-                    (byte[]) eventValues.getNonIndexedValues().get(0).getValue();
-                return typedResponse;
-              }
-            });
-  }
-
-  public Flowable<ParticipantRemovedEventResponse> participantRemovedEventFlowable(
-      DefaultBlockParameter startBlock, DefaultBlockParameter endBlock) {
-    EthFilter filter = new EthFilter(startBlock, endBlock, getContractAddress());
-    filter.addSingleTopic(EventEncoder.encode(PARTICIPANTREMOVED_EVENT));
-    return participantRemovedEventFlowable(filter);
-  }
-
-  public RemoteFunctionCall<TransactionReceipt> addParticipants(List<byte[]> _publicEnclaveKeys) {
-    final org.web3j.abi.datatypes.Function function =
-        new org.web3j.abi.datatypes.Function(
-            FUNC_ADDPARTICIPANTS,
-            Arrays.<Type>asList(
-                new org.web3j.abi.datatypes.DynamicArray<org.web3j.abi.datatypes.generated.Bytes32>(
-                    org.web3j.abi.datatypes.generated.Bytes32.class,
-                    org.web3j.abi.Utils.typeMap(
-                        _publicEnclaveKeys, org.web3j.abi.datatypes.generated.Bytes32.class))),
-            Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  public RemoteFunctionCall<Boolean> canExecute() {
-    final org.web3j.abi.datatypes.Function function =
-        new org.web3j.abi.datatypes.Function(
-            FUNC_CANEXECUTE,
-            Arrays.<Type>asList(),
-            Arrays.<TypeReference<?>>asList(new TypeReference<Bool>() {}));
-    return executeRemoteCallSingleValueReturn(function, Boolean.class);
-  }
-
-  public RemoteFunctionCall<TransactionReceipt> canUpgrade() {
-    final org.web3j.abi.datatypes.Function function =
-        new org.web3j.abi.datatypes.Function(
-            FUNC_CANUPGRADE, Arrays.<Type>asList(), Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  public RemoteFunctionCall<List> getParticipants() {
-    final org.web3j.abi.datatypes.Function function =
-        new org.web3j.abi.datatypes.Function(
-            FUNC_GETPARTICIPANTS,
-            Arrays.<Type>asList(),
-            Arrays.<TypeReference<?>>asList(new TypeReference<DynamicArray<Bytes32>>() {}));
-    return new RemoteFunctionCall<List>(
-        function,
-        new Callable<List>() {
-          @Override
-          @SuppressWarnings("unchecked")
-          public List call() throws Exception {
-            List<Type> result = (List<Type>) executeCallSingleValueReturn(function, List.class);
-            return convertToNative(result);
-          }
-        });
-  }
-
-  public RemoteFunctionCall<byte[]> getVersion() {
-    final org.web3j.abi.datatypes.Function function =
-        new org.web3j.abi.datatypes.Function(
-            FUNC_GETVERSION,
-            Arrays.<Type>asList(),
-            Arrays.<TypeReference<?>>asList(new TypeReference<Bytes32>() {}));
-    return executeRemoteCallSingleValueReturn(function, byte[].class);
-  }
-
-  public RemoteFunctionCall<String> implementation() {
-    final org.web3j.abi.datatypes.Function function =
-        new org.web3j.abi.datatypes.Function(
-            FUNC_IMPLEMENTATION,
-            Arrays.<Type>asList(),
-            Arrays.<TypeReference<?>>asList(new TypeReference<Address>() {}));
-    return executeRemoteCallSingleValueReturn(function, String.class);
-  }
-
-  public RemoteFunctionCall<TransactionReceipt> lock() {
-    final org.web3j.abi.datatypes.Function function =
-        new org.web3j.abi.datatypes.Function(
-            FUNC_LOCK, Arrays.<Type>asList(), Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  public RemoteFunctionCall<TransactionReceipt> removeParticipant(byte[] _participant) {
-    final org.web3j.abi.datatypes.Function function =
-        new org.web3j.abi.datatypes.Function(
-            FUNC_REMOVEPARTICIPANT,
-            Arrays.<Type>asList(new org.web3j.abi.datatypes.generated.Bytes32(_participant)),
-            Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  public RemoteFunctionCall<TransactionReceipt> unlock() {
-    final org.web3j.abi.datatypes.Function function =
-        new org.web3j.abi.datatypes.Function(
-            FUNC_UNLOCK, Arrays.<Type>asList(), Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  public RemoteFunctionCall<TransactionReceipt> upgradeTo(String _newImplementation) {
-    final org.web3j.abi.datatypes.Function function =
-        new org.web3j.abi.datatypes.Function(
-            FUNC_UPGRADETO,
-            Arrays.<Type>asList(new org.web3j.abi.datatypes.Address(160, _newImplementation)),
-            Collections.<TypeReference<?>>emptyList());
-    return executeRemoteCallTransaction(function);
-  }
-
-  @Deprecated
-  public static OnChainPrivacyGroupManagementProxy load(
-      String contractAddress,
-      Web3j web3j,
-      Credentials credentials,
-      BigInteger gasPrice,
-      BigInteger gasLimit) {
-    return new OnChainPrivacyGroupManagementProxy(
-        contractAddress, web3j, credentials, gasPrice, gasLimit);
-  }
-
-  @Deprecated
-  public static OnChainPrivacyGroupManagementProxy load(
-      String contractAddress,
-      Web3j web3j,
-      TransactionManager transactionManager,
-      BigInteger gasPrice,
-      BigInteger gasLimit) {
-    return new OnChainPrivacyGroupManagementProxy(
-        contractAddress, web3j, transactionManager, gasPrice, gasLimit);
-  }
-
-  public static OnChainPrivacyGroupManagementProxy load(
-      String contractAddress,
-      Web3j web3j,
-      Credentials credentials,
-      ContractGasProvider contractGasProvider) {
-    return new OnChainPrivacyGroupManagementProxy(
-        contractAddress, web3j, credentials, contractGasProvider);
-  }
-
-  public static OnChainPrivacyGroupManagementProxy load(
-      String contractAddress,
-      Web3j web3j,
-      TransactionManager transactionManager,
-      ContractGasProvider contractGasProvider) {
-    return new OnChainPrivacyGroupManagementProxy(
-        contractAddress, web3j, transactionManager, contractGasProvider);
-  }
-
-  public static RemoteCall<OnChainPrivacyGroupManagementProxy> deploy(
-      Web3j web3j,
-      Credentials credentials,
-      ContractGasProvider contractGasProvider,
-      String _implementation) {
-    String encodedConstructor =
-        FunctionEncoder.encodeConstructor(
-            Arrays.<Type>asList(new org.web3j.abi.datatypes.Address(160, _implementation)));
-    return deployRemoteCall(
-        OnChainPrivacyGroupManagementProxy.class,
-        web3j,
-        credentials,
-        contractGasProvider,
-        BINARY,
-        encodedConstructor);
-  }
-
-  public static RemoteCall<OnChainPrivacyGroupManagementProxy> deploy(
-      Web3j web3j,
-      TransactionManager transactionManager,
-      ContractGasProvider contractGasProvider,
-      String _implementation) {
-    String encodedConstructor =
-        FunctionEncoder.encodeConstructor(
-            Arrays.<Type>asList(new org.web3j.abi.datatypes.Address(160, _implementation)));
-    return deployRemoteCall(
-        OnChainPrivacyGroupManagementProxy.class,
-        web3j,
-        transactionManager,
-        contractGasProvider,
-        BINARY,
-        encodedConstructor);
-  }
-
-  @Deprecated
-  public static RemoteCall<OnChainPrivacyGroupManagementProxy> deploy(
-      Web3j web3j,
-      Credentials credentials,
-      BigInteger gasPrice,
-      BigInteger gasLimit,
-      String _implementation) {
-    String encodedConstructor =
-        FunctionEncoder.encodeConstructor(
-            Arrays.<Type>asList(new org.web3j.abi.datatypes.Address(160, _implementation)));
-    return deployRemoteCall(
-        OnChainPrivacyGroupManagementProxy.class,
-        web3j,
-        credentials,
-        gasPrice,
-        gasLimit,
-        BINARY,
-        encodedConstructor);
-  }
-
-  @Deprecated
-  public static RemoteCall<OnChainPrivacyGroupManagementProxy> deploy(
-      Web3j web3j,
-      TransactionManager transactionManager,
-      BigInteger gasPrice,
-      BigInteger gasLimit,
-      String _implementation) {
-    String encodedConstructor =
-        FunctionEncoder.encodeConstructor(
-            Arrays.<Type>asList(new org.web3j.abi.datatypes.Address(160, _implementation)));
-    return deployRemoteCall(
-        OnChainPrivacyGroupManagementProxy.class,
-        web3j,
-        transactionManager,
-        gasPrice,
-        gasLimit,
-        BINARY,
-        encodedConstructor);
-  }
-
-  public static class ParticipantRemovedEventResponse extends BaseEventResponse {
-    public byte[] publicEnclaveKey;
-  }
-}
diff --git a/privacy-contracts/src/main/solidity/DefaultFlexiblePrivacyGroupManagementContract.sol b/privacy-contracts/src/main/solidity/DefaultFlexiblePrivacyGroupManagementContract.sol
new file mode 100644
index 00000000000..a667a04c35f
--- /dev/null
+++ b/privacy-contracts/src/main/solidity/DefaultFlexiblePrivacyGroupManagementContract.sol
@@ -0,0 +1,132 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+pragma solidity >=0.7.0 <0.9.0;
+pragma experimental ABIEncoderV2;
+import "./FlexiblePrivacyGroupManagementInterface.sol";
+
+contract DefaultFlexiblePrivacyGroupManagementContract is FlexiblePrivacyGroupManagementInterface {
+
+    address private _owner;
+    bool private _canExecute;
+    bytes32 private _version;
+    bytes[] private distributionList;
+    mapping(bytes => uint256) private distributionIndexOf;
+
+    function getVersion() external view override returns (bytes32) {
+        return _version;
+    }
+
+    function canExecute() external view override returns (bool) {
+        return _canExecute;
+    }
+
+    function lock() public override {
+        require(_canExecute);
+        require(tx.origin == _owner, "Origin not the owner.");
+        _canExecute = false;
+    }
+
+    function unlock() public override {
+        require(!_canExecute);
+        require(tx.origin == _owner, "Origin not the owner.");
+        _canExecute = true;
+    }
+
+    function addParticipants(bytes[] calldata _publicEnclaveKeys) public override returns (bool) {
+        require(!_canExecute);
+        if (_owner == address(0x0)) {
+            // The account creating this group is set to be the owner
+            _owner = tx.origin;
+        }
+        require(tx.origin == _owner, "Origin not the owner.");
+        bool result = addAll(_publicEnclaveKeys);
+        _canExecute = true;
+        updateVersion();
+        return result;
+    }
+
+    function removeParticipant(bytes calldata _participant) public override returns (bool) {
+        require(_canExecute);
+        require(tx.origin == _owner, "Origin not the owner.");
+        bool result = removeInternal(_participant);
+        updateVersion();
+        return result;
+    }
+
+    function getParticipants() public view override returns (bytes[] memory) {
+        return distributionList;
+    }
+
+    function canUpgrade() external view override returns (bool) {
+        return tx.origin == _owner;
+    }
+
+
+    //internal functions
+    function addAll(bytes[] calldata _publicEnclaveKeys) internal returns (bool) {
+        bool allAdded = true;
+        for (uint i = 0; i < _publicEnclaveKeys.length; i++) {
+            if (isMember(_publicEnclaveKeys[i])) {
+                emit ParticipantAdded(false, _publicEnclaveKeys[i], "Account is already a Member");
+                allAdded = allAdded && false;
+            } else {
+                bool result = addParticipant(_publicEnclaveKeys[i]);
+                string memory message = result ? "Member account added successfully" : "Account is already a Member";
+                emit ParticipantAdded(result, _publicEnclaveKeys[i], message);
+                allAdded = allAdded && result;
+            }
+        }
+        return allAdded;
+    }
+
+    function isMember(bytes calldata _publicEnclaveKey) internal view returns (bool) {
+        return distributionIndexOf[_publicEnclaveKey] != 0;
+    }
+
+    function addParticipant(bytes calldata _publicEnclaveKey) internal returns (bool) {
+        if (distributionIndexOf[_publicEnclaveKey] == 0) {
+            distributionList.push(_publicEnclaveKey);
+            distributionIndexOf[_publicEnclaveKey] = distributionList.length;
+            return true;
+        }
+        return false;
+    }
+
+    function removeInternal(bytes calldata _participant) internal returns (bool) {
+        uint256 index = distributionIndexOf[_participant];
+        if (index > 0 && index <= distributionList.length) {
+            //move last address into index being vacated (unless we are dealing with last index)
+            if (index != distributionList.length) {
+                bytes storage lastPublicKey = distributionList[distributionList.length - 1];
+                distributionList[index - 1] = lastPublicKey;
+                distributionIndexOf[lastPublicKey] = index;
+            }
+            distributionList.pop();
+            distributionIndexOf[_participant] = 0;
+            return true;
+        }
+        return false;
+    }
+
+    function updateVersion() internal {
+        _version = keccak256(abi.encode(blockhash(block.number-1), block.coinbase, distributionList));
+    }
+
+    event ParticipantAdded(
+        bool success,
+        bytes publicEnclaveKey,
+        string message
+    );
+}
diff --git a/privacy-contracts/src/main/solidity/DefaultOnChainPrivacyGroupManagementContract.sol b/privacy-contracts/src/main/solidity/DefaultOnChainPrivacyGroupManagementContract.sol
deleted file mode 100644
index 4e9af8406e1..00000000000
--- a/privacy-contracts/src/main/solidity/DefaultOnChainPrivacyGroupManagementContract.sol
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-pragma solidity ^0.6.0;
-import "./OnChainPrivacyGroupManagementInterface.sol";
-
-contract DefaultOnChainPrivacyGroupManagementContract is OnChainPrivacyGroupManagementInterface {
-
-    address private _owner;
-    bool private _canExecute;
-    bytes32 private _version;
-    bytes32[] private distributionList;
-    mapping(bytes32 => uint256) private distributionIndexOf;
-
-    function getVersion() external view override returns (bytes32) {
-        return _version;
-    }
-
-    function canExecute() external view override returns (bool) {
-        return _canExecute;
-    }
-
-    function lock() public override {
-        require(_canExecute);
-        require(tx.origin == _owner, "Origin not the owner.");
-        _canExecute = false;
-    }
-
-    function unlock() public override {
-        require(!_canExecute);
-        require(tx.origin == _owner, "Origin not the owner.");
-        _canExecute = true;
-    }
-
-    function addParticipants(bytes32[] memory _publicEnclaveKeys) public override returns (bool) {
-        require(!_canExecute);
-        if (_owner == address(0x0)) {
-        // The account creating this group is set to be the owner
-            _owner = tx.origin;
-        }
-        require(tx.origin == _owner, "Origin not the owner.");
-        bool result = addAll(_publicEnclaveKeys);
-        _canExecute = true;
-        updateVersion();
-        return result;
-    }
-
-    function removeParticipant(bytes32 _participant) public override returns (bool) {
-        require(_canExecute);
-        require(tx.origin == _owner, "Origin not the owner.");
-        bool result = removeInternal(_participant);
-        updateVersion();
-        return result;
-    }
-
-    function getParticipants() public view override returns (bytes32[] memory) {
-        return distributionList;
-    }
-
-    function canUpgrade() external override returns (bool) {
-        return tx.origin == _owner;
-    }
-
-
-    //internal functions
-    function addAll(bytes32[] memory _publicEnclaveKeys) internal returns (bool) {
-        bool allAdded = true;
-        for (uint i = 0; i < _publicEnclaveKeys.length; i++) {
-            if (isMember(_publicEnclaveKeys[i])) {
-                emit ParticipantAdded(false, _publicEnclaveKeys[i], "Account is already a Member");
-                allAdded = allAdded && false;
-            } else {
-                bool result = addParticipant(_publicEnclaveKeys[i]);
-                string memory message = result ? "Member account added successfully" : "Account is already a Member";
-                emit ParticipantAdded(result, _publicEnclaveKeys[i], message);
-                allAdded = allAdded && result;
-            }
-        }
-        return allAdded;
-    }
-
-    function isMember(bytes32 _publicEnclaveKey) internal view returns (bool) {
-        return distributionIndexOf[_publicEnclaveKey] != 0;
-    }
-
-    function addParticipant(bytes32 _publicEnclaveKey) internal returns (bool) {
-        if (distributionIndexOf[_publicEnclaveKey] == 0) {
-            distributionList.push(_publicEnclaveKey);
-            distributionIndexOf[_publicEnclaveKey] = distributionList.length;
-            return true;
-        }
-        return false;
-    }
-
-    function removeInternal(bytes32 _participant) internal returns (bool) {
-        uint256 index = distributionIndexOf[_participant];
-        if (index > 0 && index <= distributionList.length) {
-            //move last address into index being vacated (unless we are dealing with last index)
-            if (index != distributionList.length) {
-                bytes32 lastPublicKey = distributionList[distributionList.length - 1];
-                distributionList[index - 1] = lastPublicKey;
-                distributionIndexOf[lastPublicKey] = index;
-            }
-            distributionList.pop();
-            distributionIndexOf[_participant] = 0;
-            return true;
-        }
-        return false;
-    }
-
-    function updateVersion() internal returns (int) {
-        _version = keccak256(abi.encodePacked(blockhash(block.number-1), block.coinbase, distributionList));
-    }
-
-    event ParticipantAdded(
-        bool success,
-        bytes32 publicEnclaveKey,
-        string message
-    );
-}
\ No newline at end of file
diff --git a/privacy-contracts/src/main/solidity/FlexiblePrivacyGroupManagementInterface.sol b/privacy-contracts/src/main/solidity/FlexiblePrivacyGroupManagementInterface.sol
new file mode 100644
index 00000000000..0b3131bef9f
--- /dev/null
+++ b/privacy-contracts/src/main/solidity/FlexiblePrivacyGroupManagementInterface.sol
@@ -0,0 +1,35 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+pragma solidity >=0.7.0 <0.9.0;
+pragma experimental ABIEncoderV2;
+
+interface FlexiblePrivacyGroupManagementInterface {
+
+    function addParticipants(bytes[] calldata publicEnclaveKeys) external returns (bool);
+
+    function removeParticipant(bytes calldata participant) external returns (bool);
+
+    function getParticipants() external view returns (bytes[] memory);
+
+    function lock() external;
+
+    function unlock() external;
+
+    function canExecute() external view returns (bool);
+
+    function getVersion() external view returns (bytes32);
+
+    function canUpgrade() external returns (bool);
+}
diff --git a/privacy-contracts/src/main/solidity/FlexiblePrivacyGroupManagementProxy.sol b/privacy-contracts/src/main/solidity/FlexiblePrivacyGroupManagementProxy.sol
new file mode 100644
index 00000000000..b059b618966
--- /dev/null
+++ b/privacy-contracts/src/main/solidity/FlexiblePrivacyGroupManagementProxy.sol
@@ -0,0 +1,89 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+pragma solidity >=0.7.0 <0.9.0;
+pragma experimental ABIEncoderV2;
+import "./FlexiblePrivacyGroupManagementInterface.sol";
+
+contract FlexiblePrivacyGroupManagementProxy is FlexiblePrivacyGroupManagementInterface {
+
+    address public implementation;
+
+    constructor(address _implementation) {
+        implementation = _implementation;
+    }
+
+    function _setImplementation(address _newImp) internal {
+        implementation = _newImp;
+    }
+
+    function addParticipants(bytes[] calldata _publicEnclaveKeys) public override returns (bool) {
+        FlexiblePrivacyGroupManagementInterface privacyInterface = FlexiblePrivacyGroupManagementInterface(implementation);
+        return privacyInterface.addParticipants(_publicEnclaveKeys);
+    }
+
+    function getParticipants() view public override returns (bytes[] memory) {
+        FlexiblePrivacyGroupManagementInterface privacyInterface = FlexiblePrivacyGroupManagementInterface(implementation);
+        return privacyInterface.getParticipants();
+    }
+
+    function removeParticipant(bytes calldata _participant) public override returns (bool) {
+        FlexiblePrivacyGroupManagementInterface privacyInterface = FlexiblePrivacyGroupManagementInterface(implementation);
+        bool result = privacyInterface.removeParticipant(_participant);
+        if (result) {
+            emit ParticipantRemoved(_participant);
+        }
+        return result;
+    }
+
+    function lock() public override {
+        FlexiblePrivacyGroupManagementInterface privacyInterface = FlexiblePrivacyGroupManagementInterface(implementation);
+        return privacyInterface.lock();
+    }
+
+    function unlock() public override {
+        FlexiblePrivacyGroupManagementInterface privacyInterface = FlexiblePrivacyGroupManagementInterface(implementation);
+        return privacyInterface.unlock();
+    }
+
+    function canExecute() public view override returns (bool) {
+        FlexiblePrivacyGroupManagementInterface privacyInterface = FlexiblePrivacyGroupManagementInterface(implementation);
+        return privacyInterface.canExecute();
+    }
+
+    function getVersion() public view override returns (bytes32) {
+        FlexiblePrivacyGroupManagementInterface privacyInterface = FlexiblePrivacyGroupManagementInterface(implementation);
+        return privacyInterface.getVersion();
+    }
+
+    function canUpgrade() external override returns (bool) {
+        FlexiblePrivacyGroupManagementInterface privacyInterface = FlexiblePrivacyGroupManagementInterface(implementation);
+        return privacyInterface.canUpgrade();
+    }
+
+    function upgradeTo(address _newImplementation) external {
+        require(this.canExecute(), "The contract is locked.");
+        require(implementation != _newImplementation, "The contract to upgrade to has to be different from the current management contract.");
+        require(this.canUpgrade(), "Not allowed to upgrade the management contract.");
+        bytes[] memory participants = this.getParticipants();
+        _setImplementation(_newImplementation);
+        FlexiblePrivacyGroupManagementInterface privacyInterface = FlexiblePrivacyGroupManagementInterface(implementation);
+        privacyInterface.addParticipants(participants);
+    }
+
+    event ParticipantRemoved(
+        bytes publicEnclaveKey
+    );
+
+}
diff --git a/privacy-contracts/src/main/solidity/OnChainPrivacyGroupManagementInterface.sol b/privacy-contracts/src/main/solidity/OnChainPrivacyGroupManagementInterface.sol
deleted file mode 100644
index 6e6cc3f0965..00000000000
--- a/privacy-contracts/src/main/solidity/OnChainPrivacyGroupManagementInterface.sol
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-pragma solidity ^0.6.0;
-interface OnChainPrivacyGroupManagementInterface {
-
-    function addParticipants(bytes32[] calldata publicEnclaveKeys) external returns (bool);
-
-    function removeParticipant(bytes32 participant) external returns (bool);
-
-    function getParticipants() external view returns (bytes32[] memory);
-
-    function lock() external;
-
-    function unlock() external;
-
-    function canExecute() external view returns (bool);
-
-    function getVersion() external view returns (bytes32);
-
-    function canUpgrade() external returns (bool);
-}
\ No newline at end of file
diff --git a/privacy-contracts/src/main/solidity/OnChainPrivacyGroupManagementProxy.sol b/privacy-contracts/src/main/solidity/OnChainPrivacyGroupManagementProxy.sol
deleted file mode 100644
index 8c74a4414d8..00000000000
--- a/privacy-contracts/src/main/solidity/OnChainPrivacyGroupManagementProxy.sol
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-pragma solidity ^0.6.0;
-import "./OnChainPrivacyGroupManagementInterface.sol";
-
-contract OnChainPrivacyGroupManagementProxy is OnChainPrivacyGroupManagementInterface {
-
-    address public implementation;
-
-    constructor(address _implementation) public {
-        implementation = _implementation;
-    }
-
-    function _setImplementation(address _newImp) internal {
-        implementation = _newImp;
-    }
-
-    function addParticipants(bytes32[] memory _publicEnclaveKeys) public override returns (bool) {
-        OnChainPrivacyGroupManagementInterface privacyInterface = OnChainPrivacyGroupManagementInterface(implementation);
-        return privacyInterface.addParticipants(_publicEnclaveKeys);
-    }
-
-    function getParticipants() view public override returns (bytes32[] memory) {
-        OnChainPrivacyGroupManagementInterface privacyInterface = OnChainPrivacyGroupManagementInterface(implementation);
-        return privacyInterface.getParticipants();
-    }
-
-    function removeParticipant(bytes32 _participant) public override returns (bool) {
-        OnChainPrivacyGroupManagementInterface privacyInterface = OnChainPrivacyGroupManagementInterface(implementation);
-        bool result = privacyInterface.removeParticipant(_participant);
-        if (result) {
-            emit ParticipantRemoved(_participant);
-        }
-    return result;
-    }
-
-    function lock() public override {
-        OnChainPrivacyGroupManagementInterface privacyInterface = OnChainPrivacyGroupManagementInterface(implementation);
-        return privacyInterface.lock();
-    }
-
-    function unlock() public override {
-        OnChainPrivacyGroupManagementInterface privacyInterface = OnChainPrivacyGroupManagementInterface(implementation);
-        return privacyInterface.unlock();
-    }
-
-    function canExecute() public view override returns (bool) {
-        OnChainPrivacyGroupManagementInterface privacyInterface = OnChainPrivacyGroupManagementInterface(implementation);
-        return privacyInterface.canExecute();
-    }
-
-    function getVersion() public view override returns (bytes32) {
-        OnChainPrivacyGroupManagementInterface privacyInterface = OnChainPrivacyGroupManagementInterface(implementation);
-        return privacyInterface.getVersion();
-    }
-
-    function canUpgrade() external override returns (bool) {
-        OnChainPrivacyGroupManagementInterface privacyInterface = OnChainPrivacyGroupManagementInterface(implementation);
-        return privacyInterface.canUpgrade();
-    }
-
-    function upgradeTo(address _newImplementation) external {
-        require(this.canExecute(), "The contract is locked.");
-        require(implementation != _newImplementation, "The contract to upgrade to has to be different from the current management contract.");
-        require(this.canUpgrade(), "Not allowed to upgrade the management contract.");
-        bytes32[] memory participants = this.getParticipants();
-        _setImplementation(_newImplementation);
-        OnChainPrivacyGroupManagementInterface privacyInterface = OnChainPrivacyGroupManagementInterface(implementation);
-        privacyInterface.addParticipants(participants);
-    }
-
-    event ParticipantRemoved(
-        bytes32 publicEnclaveKey
-    );
-
-
-}
diff --git a/privacy-contracts/src/main/solidity/generateWrappers.sh b/privacy-contracts/src/main/solidity/generateWrappers.sh
index fe97ee3f816..068d7a1e3ac 100755
--- a/privacy-contracts/src/main/solidity/generateWrappers.sh
+++ b/privacy-contracts/src/main/solidity/generateWrappers.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
 targets="
-OnChainPrivacyGroupManagementInterface
-DefaultOnChainPrivacyGroupManagementContract
-OnChainPrivacyGroupManagementProxy
+FlexiblePrivacyGroupManagementInterface
+DefaultFlexiblePrivacyGroupManagementContract
+FlexiblePrivacyGroupManagementProxy
 "
 
 for target in ${targets}; do
@@ -16,11 +16,11 @@ done
 
 for target in ${targets}; do
 
-    web3j solidity generate \
+    web3j generate solidity \
         -b build/${target}.bin \
         -a build/${target}.abi \
         -o ../java \
         -p org.hyperledger.besu.privacy.contracts.generated
 
     solc --bin-runtime --overwrite -o . ./${target}.sol
-done
\ No newline at end of file
+done
diff --git a/services/kvstore/build.gradle b/services/kvstore/build.gradle
index 1a865bf3ccb..0415f6702b8 100644
--- a/services/kvstore/build.gradle
+++ b/services/kvstore/build.gradle
@@ -29,22 +29,10 @@ jar {
 
 dependencies {
   api project(':plugin-api')
-  api project(':util')
-
-  implementation project(':metrics:core')
-  implementation project(':metrics:rocksdb')
-
+  api 'org.slf4j:slf4j-api'
   implementation 'com.google.guava:guava'
-  implementation 'io.prometheus:simpleclient'
-  implementation 'org.apache.logging.log4j:log4j-api'
-  implementation 'org.apache.tuweni:bytes'
-  implementation 'org.rocksdb:rocksdbjni'
-
-  runtimeOnly 'org.apache.logging.log4j:log4j-core'
 
   testImplementation project(':testutil')
-
-  testImplementation 'junit:junit'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.assertj:assertj-core'
-  testImplementation 'org.mockito:mockito-core'
 }
diff --git a/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/InMemoryKeyValueStorage.java b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/InMemoryKeyValueStorage.java
index 8610b930b3e..643839ed8db 100644
--- a/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/InMemoryKeyValueStorage.java
+++ b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/InMemoryKeyValueStorage.java
@@ -19,6 +19,8 @@
 import org.hyperledger.besu.plugin.services.exception.StorageException;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
+import org.hyperledger.besu.plugin.services.storage.SnappableKeyValueStorage;
+import org.hyperledger.besu.plugin.services.storage.SnappedKeyValueStorage;
 
 import java.io.PrintStream;
 import java.util.HashMap;
@@ -33,18 +35,30 @@
 import java.util.stream.Stream;
 
 import com.google.common.collect.ImmutableSet;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.tuweni.bytes.Bytes;
 
-public class InMemoryKeyValueStorage implements KeyValueStorage {
+/** The In memory key value storage. */
+public class InMemoryKeyValueStorage
+    implements SnappedKeyValueStorage, SnappableKeyValueStorage, KeyValueStorage {
 
-  private final Map<Bytes, byte[]> hashValueStore;
-  private final ReadWriteLock rwLock = new ReentrantReadWriteLock();
+  /** protected access for the backing hash map. */
+  protected final Map<Bytes, Optional<byte[]>> hashValueStore;
 
+  /** protected access to the rw lock. */
+  protected final ReadWriteLock rwLock = new ReentrantReadWriteLock();
+
+  /** Instantiates a new In memory key value storage. */
   public InMemoryKeyValueStorage() {
     this(new HashMap<>());
   }
 
-  protected InMemoryKeyValueStorage(final Map<Bytes, byte[]> hashValueStore) {
+  /**
+   * Instantiates a new In memory key value storage.
+   *
+   * @param hashValueStore the hash value store
+   */
+  protected InMemoryKeyValueStorage(final Map<Bytes, Optional<byte[]>> hashValueStore) {
     this.hashValueStore = hashValueStore;
   }
 
@@ -69,7 +83,7 @@ public Optional<byte[]> get(final byte[] key) throws StorageException {
     final Lock lock = rwLock.readLock();
     lock.lock();
     try {
-      return Optional.ofNullable(hashValueStore.get(Bytes.wrap(key)));
+      return hashValueStore.getOrDefault(Bytes.wrap(key), Optional.empty());
     } finally {
       lock.unlock();
     }
@@ -77,7 +91,38 @@ public Optional<byte[]> get(final byte[] key) throws StorageException {
 
   @Override
   public Set<byte[]> getAllKeysThat(final Predicate<byte[]> returnCondition) {
-    return streamKeys().filter(returnCondition).collect(toUnmodifiableSet());
+    return stream()
+        .filter(pair -> returnCondition.test(pair.getKey()))
+        .map(Pair::getKey)
+        .collect(toUnmodifiableSet());
+  }
+
+  @Override
+  public Set<byte[]> getAllValuesFromKeysThat(final Predicate<byte[]> returnCondition) {
+    return stream()
+        .filter(pair -> returnCondition.test(pair.getKey()))
+        .map(Pair::getValue)
+        .collect(toUnmodifiableSet());
+  }
+
+  @Override
+  public Stream<Pair<byte[], byte[]>> stream() {
+    final Lock lock = rwLock.readLock();
+    lock.lock();
+    try {
+      return ImmutableSet.copyOf(hashValueStore.entrySet()).stream()
+          .filter(bytesEntry -> bytesEntry.getValue().isPresent())
+          .map(
+              bytesEntry ->
+                  Pair.of(bytesEntry.getKey().toArrayUnsafe(), bytesEntry.getValue().get()));
+    } finally {
+      lock.unlock();
+    }
+  }
+
+  @Override
+  public Stream<Pair<byte[], byte[]>> streamFromKey(final byte[] startKey) {
+    return stream().filter(e -> Bytes.wrap(startKey).compareTo(Bytes.wrap(e.getKey())) <= 0);
   }
 
   @Override
@@ -85,7 +130,8 @@ public Stream<byte[]> streamKeys() {
     final Lock lock = rwLock.readLock();
     lock.lock();
     try {
-      return ImmutableSet.copyOf(hashValueStore.keySet()).stream().map(Bytes::toArrayUnsafe);
+      return ImmutableSet.copyOf(hashValueStore.entrySet()).stream()
+          .map(bytesEntry -> bytesEntry.getKey().toArrayUnsafe());
     } finally {
       lock.unlock();
     }
@@ -113,18 +159,41 @@ public KeyValueStorageTransaction startTransaction() {
     return new KeyValueStorageTransactionTransitionValidatorDecorator(new InMemoryTransaction());
   }
 
+  @Override
+  public boolean isClosed() {
+    return false;
+  }
+
+  /**
+   * Key set.
+   *
+   * @return the set of keys
+   */
   public Set<Bytes> keySet() {
     return Set.copyOf(hashValueStore.keySet());
   }
 
-  private class InMemoryTransaction implements KeyValueStorageTransaction {
+  @Override
+  public SnappedKeyValueStorage takeSnapshot() {
+    return new InMemoryKeyValueStorage(new HashMap<>(hashValueStore));
+  }
+
+  @Override
+  public KeyValueStorageTransaction getSnapshotTransaction() {
+    return startTransaction();
+  }
+
+  /** In memory transaction. */
+  public class InMemoryTransaction implements KeyValueStorageTransaction {
 
-    private Map<Bytes, byte[]> updatedValues = new HashMap<>();
-    private Set<Bytes> removedKeys = new HashSet<>();
+    /** protected access to updatedValues map for the transaction. */
+    protected Map<Bytes, Optional<byte[]>> updatedValues = new HashMap<>();
+    /** protected access to deletedValues set for the transaction. */
+    protected Set<Bytes> removedKeys = new HashSet<>();
 
     @Override
     public void put(final byte[] key, final byte[] value) {
-      updatedValues.put(Bytes.wrap(key), value);
+      updatedValues.put(Bytes.wrap(key), Optional.of(value));
       removedKeys.remove(Bytes.wrap(key));
     }
 
@@ -155,12 +224,23 @@ public void rollback() {
     }
   }
 
+  /**
+   * Dump.
+   *
+   * @param ps the PrintStream where to report the dump
+   */
   public void dump(final PrintStream ps) {
     final Lock lock = rwLock.readLock();
     lock.lock();
     try {
-      hashValueStore.forEach(
-          (k, v) -> ps.printf("  %s : %s%n", k.toHexString(), Bytes.wrap(v).toHexString()));
+      ImmutableSet.copyOf(hashValueStore.entrySet()).stream()
+          .filter(bytesEntry -> bytesEntry.getValue().isPresent())
+          .forEach(
+              entry ->
+                  ps.printf(
+                      "  %s : %s%n",
+                      entry.getKey().toHexString(),
+                      Bytes.wrap(entry.getValue().get()).toHexString()));
     } finally {
       lock.unlock();
     }
diff --git a/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/InMemoryStoragePlugin.java b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/InMemoryStoragePlugin.java
index 6d23db335a1..b516f5d5c90 100644
--- a/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/InMemoryStoragePlugin.java
+++ b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/InMemoryStoragePlugin.java
@@ -27,12 +27,13 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The In memory storage plugin. */
 public class InMemoryStoragePlugin implements BesuPlugin {
 
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(InMemoryStoragePlugin.class);
   private BesuContext context;
   private MemoryKeyValueStorageFactory factory;
   private MemoryKeyValueStorageFactory privacyFactory;
@@ -87,11 +88,17 @@ private void createFactoriesAndRegisterWithStorageService() {
             () -> LOG.error("Failed to register KeyValueFactory due to missing StorageService."));
   }
 
+  /** The Memory key value storage factory. */
   public static class MemoryKeyValueStorageFactory implements KeyValueStorageFactory {
 
     private final String name;
     private final Map<SegmentIdentifier, InMemoryKeyValueStorage> storageMap = new HashMap<>();
 
+    /**
+     * Instantiates a new Memory key value storage factory.
+     *
+     * @param name the name
+     */
     public MemoryKeyValueStorageFactory(final String name) {
       this.name = name;
     }
diff --git a/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/KeyValueStorageTransactionTransitionValidatorDecorator.java b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/KeyValueStorageTransactionTransitionValidatorDecorator.java
index 549638788f9..cd488737ae3 100644
--- a/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/KeyValueStorageTransactionTransitionValidatorDecorator.java
+++ b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/KeyValueStorageTransactionTransitionValidatorDecorator.java
@@ -19,12 +19,18 @@
 import org.hyperledger.besu.plugin.services.exception.StorageException;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
 
+/** The Key value storage transaction transition validator decorator. */
 public class KeyValueStorageTransactionTransitionValidatorDecorator
     implements KeyValueStorageTransaction {
 
   private final KeyValueStorageTransaction transaction;
   private boolean active = true;
 
+  /**
+   * Instantiates a new Key value storage transaction transition validator decorator.
+   *
+   * @param toDecorate the to decorate
+   */
   public KeyValueStorageTransactionTransitionValidatorDecorator(
       final KeyValueStorageTransaction toDecorate) {
     this.transaction = toDecorate;
diff --git a/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/LayeredKeyValueStorage.java b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/LayeredKeyValueStorage.java
new file mode 100644
index 00000000000..db0b23a3f0a
--- /dev/null
+++ b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/LayeredKeyValueStorage.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+package org.hyperledger.besu.services.kvstore;
+
+import org.hyperledger.besu.plugin.services.exception.StorageException;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
+import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
+import org.hyperledger.besu.plugin.services.storage.SnappedKeyValueStorage;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.Lock;
+import java.util.stream.Stream;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Streams;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** Key value storage which stores in memory all updates to a parent worldstate storage. */
+public class LayeredKeyValueStorage extends InMemoryKeyValueStorage
+    implements SnappedKeyValueStorage {
+
+  private static final Logger LOG = LoggerFactory.getLogger(LayeredKeyValueStorage.class);
+
+  private final KeyValueStorage parent;
+
+  /**
+   * Instantiates a new Layered key value storage.
+   *
+   * @param parent the parent key value storage for this layered storage.
+   */
+  public LayeredKeyValueStorage(final KeyValueStorage parent) {
+    this(new ConcurrentHashMap<>(), parent);
+  }
+
+  /**
+   * Constructor which takes an explicit backing map for the layered key value storage.
+   *
+   * @param map the backing map
+   * @param parent the parent key value storage for this layered storage.
+   */
+  public LayeredKeyValueStorage(
+      final Map<Bytes, Optional<byte[]>> map, final KeyValueStorage parent) {
+    super(map);
+    this.parent = parent;
+  }
+
+  @Override
+  public boolean containsKey(final byte[] key) throws StorageException {
+    return get(key).isPresent();
+  }
+
+  @Override
+  public Optional<byte[]> get(final byte[] key) throws StorageException {
+    throwIfClosed();
+
+    final Lock lock = rwLock.readLock();
+    lock.lock();
+    try {
+      Bytes wrapKey = Bytes.wrap(key);
+      final Optional<byte[]> foundKey = hashValueStore.get(wrapKey);
+      if (foundKey == null) {
+        return parent.get(key);
+      } else {
+        return foundKey;
+      }
+    } finally {
+      lock.unlock();
+    }
+  }
+
+  @Override
+  public Stream<Pair<byte[], byte[]>> stream() {
+    throwIfClosed();
+
+    final Lock lock = rwLock.readLock();
+    lock.lock();
+    try {
+      // immutable copy of our in memory store to use for streaming and filtering:
+      Map<Bytes, Optional<byte[]>> ourLayerState = ImmutableMap.copyOf(hashValueStore);
+
+      return Streams.concat(
+          ourLayerState.entrySet().stream()
+              .filter(entry -> entry.getValue().isPresent())
+              .map(
+                  bytesEntry ->
+                      Pair.of(bytesEntry.getKey().toArrayUnsafe(), bytesEntry.getValue().get()))
+          // since we are layered, concat a parent stream filtered by our map entries:
+          ,
+          parent.stream().filter(e -> !ourLayerState.containsKey(Bytes.of(e.getLeft()))));
+    } finally {
+      lock.unlock();
+    }
+  }
+
+  @Override
+  public Stream<Pair<byte[], byte[]>> streamFromKey(final byte[] startKey) {
+    return stream().filter(e -> Bytes.wrap(startKey).compareTo(Bytes.wrap(e.getKey())) <= 0);
+  }
+
+  @Override
+  public Stream<byte[]> streamKeys() {
+    throwIfClosed();
+
+    final Lock lock = rwLock.readLock();
+    lock.lock();
+    try {
+      // immutable copy of our in memory store to use for streaming and filtering:
+      Map<Bytes, Optional<byte[]>> ourLayerState = ImmutableMap.copyOf(hashValueStore);
+
+      return Streams.concat(
+          ourLayerState.entrySet().stream()
+              .filter(entry -> entry.getValue().isPresent())
+              .map(bytesEntry -> bytesEntry.getKey().toArrayUnsafe())
+          // since we are layered, concat a parent stream filtered by our map entries:
+          ,
+          parent.streamKeys().filter(e -> !ourLayerState.containsKey(Bytes.of(e))));
+
+    } finally {
+      lock.unlock();
+    }
+  }
+
+  @Override
+  public boolean tryDelete(final byte[] key) {
+    hashValueStore.put(Bytes.wrap(key), Optional.empty());
+    return true;
+  }
+
+  @Override
+  public KeyValueStorageTransaction startTransaction() {
+    throwIfClosed();
+
+    return new KeyValueStorageTransactionTransitionValidatorDecorator(
+        new InMemoryTransaction() {
+          @Override
+          public void commit() throws StorageException {
+
+            final Lock lock = rwLock.writeLock();
+            lock.lock();
+            try {
+              hashValueStore.putAll(updatedValues);
+              removedKeys.forEach(key -> hashValueStore.put(key, Optional.empty()));
+              // put empty and not removed to not ask parent in case of deletion
+              updatedValues = null;
+              removedKeys = null;
+            } finally {
+              lock.unlock();
+            }
+          }
+        });
+  }
+
+  @Override
+  public boolean isClosed() {
+    return parent.isClosed();
+  }
+
+  @Override
+  public SnappedKeyValueStorage clone() {
+    return new LayeredKeyValueStorage(hashValueStore, parent);
+  }
+
+  private void throwIfClosed() {
+    if (parent.isClosed()) {
+      LOG.error("Attempting to use a closed RocksDBKeyValueStorage");
+      throw new StorageException("Storage has been closed");
+    }
+  }
+}
diff --git a/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/LimitedInMemoryKeyValueStorage.java b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/LimitedInMemoryKeyValueStorage.java
index 63dce40a48c..c521d80bd8f 100644
--- a/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/LimitedInMemoryKeyValueStorage.java
+++ b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/LimitedInMemoryKeyValueStorage.java
@@ -34,6 +34,7 @@
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.ImmutableSet;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.tuweni.bytes.Bytes;
 
 /**
@@ -45,6 +46,11 @@ public class LimitedInMemoryKeyValueStorage implements KeyValueStorage {
   private final Cache<Bytes, byte[]> storage;
   private final ReadWriteLock rwLock = new ReentrantReadWriteLock();
 
+  /**
+   * Instantiates a new Limited in memory key value storage.
+   *
+   * @param maxSize the max size
+   */
   public LimitedInMemoryKeyValueStorage(final long maxSize) {
     storage = CacheBuilder.newBuilder().maximumSize(maxSize).build();
   }
@@ -81,7 +87,35 @@ public Optional<byte[]> get(final byte[] key) {
 
   @Override
   public Set<byte[]> getAllKeysThat(final Predicate<byte[]> returnCondition) {
-    return streamKeys().filter(returnCondition).collect(toUnmodifiableSet());
+    return stream()
+        .filter(pair -> returnCondition.test(pair.getKey()))
+        .map(Pair::getKey)
+        .collect(toUnmodifiableSet());
+  }
+
+  @Override
+  public Set<byte[]> getAllValuesFromKeysThat(final Predicate<byte[]> returnCondition) {
+    return stream()
+        .filter(pair -> returnCondition.test(pair.getKey()))
+        .map(Pair::getValue)
+        .collect(toUnmodifiableSet());
+  }
+
+  @Override
+  public Stream<Pair<byte[], byte[]>> stream() {
+    final Lock lock = rwLock.readLock();
+    lock.lock();
+    try {
+      return ImmutableSet.copyOf(storage.asMap().entrySet()).stream()
+          .map(bytesEntry -> Pair.of(bytesEntry.getKey().toArrayUnsafe(), bytesEntry.getValue()));
+    } finally {
+      lock.unlock();
+    }
+  }
+
+  @Override
+  public Stream<Pair<byte[], byte[]>> streamFromKey(final byte[] startKey) {
+    return stream().filter(e -> Bytes.wrap(startKey).compareTo(Bytes.wrap(e.getKey())) <= 0);
   }
 
   @Override
@@ -89,7 +123,8 @@ public Stream<byte[]> streamKeys() {
     final Lock lock = rwLock.readLock();
     lock.lock();
     try {
-      return ImmutableSet.copyOf(storage.asMap().keySet()).stream().map(Bytes::toArrayUnsafe);
+      return ImmutableSet.copyOf(storage.asMap().entrySet()).stream()
+          .map(bytesEntry -> bytesEntry.getKey().toArrayUnsafe());
     } finally {
       lock.unlock();
     }
@@ -114,6 +149,11 @@ public KeyValueStorageTransaction startTransaction() throws StorageException {
     return new KeyValueStorageTransactionTransitionValidatorDecorator(new MemoryTransaction());
   }
 
+  @Override
+  public boolean isClosed() {
+    return false;
+  }
+
   private class MemoryTransaction implements KeyValueStorageTransaction {
 
     private Map<Bytes, byte[]> updatedValues = new HashMap<>();
diff --git a/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SegmentedKeyValueStorage.java b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SegmentedKeyValueStorage.java
index 7c75f9e9c79..7d28d3495ca 100644
--- a/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SegmentedKeyValueStorage.java
+++ b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SegmentedKeyValueStorage.java
@@ -23,13 +23,21 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
+import org.apache.commons.lang3.tuple.Pair;
+
 /**
- * Service provided by besu to facilitate persistent data storage.
+ * Service provided by Besu to facilitate persistent data storage.
  *
  * @param <S> the segment identifier type
  */
 public interface SegmentedKeyValueStorage<S> extends Closeable {
 
+  /**
+   * Gets segment identifier by name.
+   *
+   * @param segment the segment
+   * @return the segment identifier by name
+   */
   S getSegmentIdentifierByName(SegmentIdentifier segment);
 
   /**
@@ -38,9 +46,18 @@ public interface SegmentedKeyValueStorage<S> extends Closeable {
    * @param segment the segment
    * @param key Index into persistent data repository.
    * @return The value persisted at the key index.
+   * @throws StorageException the storage exception
    */
   Optional<byte[]> get(S segment, byte[] key) throws StorageException;
 
+  /**
+   * Contains key.
+   *
+   * @param segment the segment
+   * @param key the key
+   * @return the boolean
+   * @throws StorageException the storage exception
+   */
   default boolean containsKey(final S segment, final byte[] key) throws StorageException {
     return get(segment, key).isPresent();
   }
@@ -49,6 +66,7 @@ default boolean containsKey(final S segment, final byte[] key) throws StorageExc
    * Begins a transaction. Returns a transaction object that can be updated and committed.
    *
    * @return An object representing the transaction.
+   * @throws StorageException the storage exception
    */
   Transaction<S> startTransaction() throws StorageException;
 
@@ -58,6 +76,25 @@ default boolean containsKey(final S segment, final byte[] key) throws StorageExc
    * @param segmentHandle The segment handle whose keys we want to stream.
    * @return A stream of all keys in the specified segment.
    */
+  Stream<Pair<byte[], byte[]>> stream(final S segmentHandle);
+
+  /**
+   * Returns a stream of key-value pairs starting from the specified key. This method is used to
+   * retrieve a stream of data from the storage, starting from the given key. If no data is
+   * available from the specified key onwards, an empty stream is returned.
+   *
+   * @param segmentHandle The segment handle whose keys we want to stream.
+   * @param startKey The key from which the stream should start.
+   * @return A stream of key-value pairs starting from the specified key.
+   */
+  Stream<Pair<byte[], byte[]>> streamFromKey(final S segmentHandle, final byte[] startKey);
+
+  /**
+   * Stream keys.
+   *
+   * @param segmentHandle the segment handle
+   * @return the stream
+   */
   Stream<byte[]> streamKeys(final S segmentHandle);
 
   /**
@@ -66,16 +103,44 @@ default boolean containsKey(final S segment, final byte[] key) throws StorageExc
    *
    * @param segmentHandle The segment handle whose keys we want to stream.
    * @param key The key to delete.
-   * @throws StorageException any problem encountered during the deletion attempt.
    * @return false if the lock on the underlying storage could not be instantly acquired, true
    *     otherwise
+   * @throws StorageException any problem encountered during the deletion attempt.
    */
   boolean tryDelete(S segmentHandle, byte[] key) throws StorageException;
 
+  /**
+   * Gets all keys that matches condition.
+   *
+   * @param segmentHandle the segment handle
+   * @param returnCondition the return condition
+   * @return set of result
+   */
   Set<byte[]> getAllKeysThat(S segmentHandle, Predicate<byte[]> returnCondition);
 
+  /**
+   * Gets all values from keys that matches condition.
+   *
+   * @param segmentHandle the segment handle
+   * @param returnCondition the return condition
+   * @return the set of result
+   */
+  Set<byte[]> getAllValuesFromKeysThat(final S segmentHandle, Predicate<byte[]> returnCondition);
+
+  /**
+   * Clear.
+   *
+   * @param segmentHandle the segment handle
+   */
   void clear(S segmentHandle);
 
+  /**
+   * Whether the underlying storage is closed.
+   *
+   * @return boolean indicating whether the underlying storage is closed.
+   */
+  boolean isClosed();
+
   /**
    * Represents a set of changes to be committed atomically. A single transaction is not
    * thread-safe, but multiple transactions can execute concurrently.
@@ -105,6 +170,8 @@ interface Transaction<S> {
      * Atomically commit the set of changes contained in this transaction to the underlying
      * key-value storage from which this transaction was started. After committing, the transaction
      * is no longer usable and will throw exceptions if modifications are attempted.
+     *
+     * @throws StorageException the storage exception
      */
     void commit() throws StorageException;
 
diff --git a/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SegmentedKeyValueStorageAdapter.java b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SegmentedKeyValueStorageAdapter.java
index e0b71a513c6..311d287a2f1 100644
--- a/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SegmentedKeyValueStorageAdapter.java
+++ b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SegmentedKeyValueStorageAdapter.java
@@ -25,43 +25,83 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
+import org.apache.commons.lang3.tuple.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * The type Segmented key value storage adapter.
+ *
+ * @param <S> the type parameter
+ */
 public class SegmentedKeyValueStorageAdapter<S> implements KeyValueStorage {
+
+  private static final Logger LOG = LoggerFactory.getLogger(SegmentedKeyValueStorageAdapter.class);
   private final S segmentHandle;
   private final SegmentedKeyValueStorage<S> storage;
 
+  /**
+   * Instantiates a new Segmented key value storage adapter.
+   *
+   * @param segment the segment
+   * @param storage the storage
+   */
   public SegmentedKeyValueStorageAdapter(
       final SegmentIdentifier segment, final SegmentedKeyValueStorage<S> storage) {
-    this.segmentHandle = storage.getSegmentIdentifierByName(segment);
+    segmentHandle = storage.getSegmentIdentifierByName(segment);
     this.storage = storage;
   }
 
   @Override
   public void clear() {
+    throwIfClosed();
     storage.clear(segmentHandle);
   }
 
   @Override
   public boolean containsKey(final byte[] key) throws StorageException {
+    throwIfClosed();
     return storage.containsKey(segmentHandle, key);
   }
 
   @Override
   public Optional<byte[]> get(final byte[] key) throws StorageException {
+    throwIfClosed();
     return storage.get(segmentHandle, key);
   }
 
   @Override
   public Set<byte[]> getAllKeysThat(final Predicate<byte[]> returnCondition) {
+    throwIfClosed();
     return storage.getAllKeysThat(segmentHandle, returnCondition);
   }
 
+  @Override
+  public Set<byte[]> getAllValuesFromKeysThat(final Predicate<byte[]> returnCondition) {
+    throwIfClosed();
+    return storage.getAllValuesFromKeysThat(segmentHandle, returnCondition);
+  }
+
+  @Override
+  public Stream<Pair<byte[], byte[]>> stream() {
+    throwIfClosed();
+    return storage.stream(segmentHandle);
+  }
+
+  @Override
+  public Stream<Pair<byte[], byte[]>> streamFromKey(final byte[] startKey) throws StorageException {
+    return storage.streamFromKey(segmentHandle, startKey);
+  }
+
   @Override
   public Stream<byte[]> streamKeys() {
+    throwIfClosed();
     return storage.streamKeys(segmentHandle);
   }
 
   @Override
   public boolean tryDelete(final byte[] key) {
+    throwIfClosed();
     return storage.tryDelete(segmentHandle, key);
   }
 
@@ -77,23 +117,39 @@ public KeyValueStorageTransaction startTransaction() throws StorageException {
 
       @Override
       public void put(final byte[] key, final byte[] value) {
+        throwIfClosed();
         transaction.put(segmentHandle, key, value);
       }
 
       @Override
       public void remove(final byte[] key) {
+        throwIfClosed();
         transaction.remove(segmentHandle, key);
       }
 
       @Override
       public void commit() throws StorageException {
+        throwIfClosed();
         transaction.commit();
       }
 
       @Override
       public void rollback() {
+        throwIfClosed();
         transaction.rollback();
       }
     };
   }
+
+  @Override
+  public boolean isClosed() {
+    return storage.isClosed();
+  }
+
+  private void throwIfClosed() {
+    if (storage.isClosed()) {
+      LOG.error("Attempting to use a closed Storage instance.");
+      throw new StorageException("Storage has been closed");
+    }
+  }
 }
diff --git a/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SegmentedKeyValueStorageTransactionTransitionValidatorDecorator.java b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SegmentedKeyValueStorageTransactionTransitionValidatorDecorator.java
index 297b1abd8a4..53cacb13e1b 100644
--- a/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SegmentedKeyValueStorageTransactionTransitionValidatorDecorator.java
+++ b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SegmentedKeyValueStorageTransactionTransitionValidatorDecorator.java
@@ -19,32 +19,50 @@
 import org.hyperledger.besu.plugin.services.exception.StorageException;
 import org.hyperledger.besu.services.kvstore.SegmentedKeyValueStorage.Transaction;
 
+import java.util.function.Supplier;
+
+/**
+ * The Segmented key value storage transaction transition validator decorator.
+ *
+ * @param <S> the type parameter
+ */
 public class SegmentedKeyValueStorageTransactionTransitionValidatorDecorator<S>
     implements Transaction<S> {
 
   private final Transaction<S> transaction;
+  private final Supplier<Boolean> isClosed;
   private boolean active = true;
 
+  /**
+   * Instantiates a new Segmented key value storage transaction transition validator decorator.
+   *
+   * @param toDecorate the to decorate
+   * @param isClosed supplier that returns true if the storage is closed
+   */
   public SegmentedKeyValueStorageTransactionTransitionValidatorDecorator(
-      final Transaction<S> toDecorate) {
+      final Transaction<S> toDecorate, final Supplier<Boolean> isClosed) {
     this.transaction = toDecorate;
+    this.isClosed = isClosed;
   }
 
   @Override
   public final void put(final S segment, final byte[] key, final byte[] value) {
     checkState(active, "Cannot invoke put() on a completed transaction.");
+    checkState(!isClosed.get(), "Cannot invoke put() on a closed storage.");
     transaction.put(segment, key, value);
   }
 
   @Override
   public final void remove(final S segment, final byte[] key) {
     checkState(active, "Cannot invoke remove() on a completed transaction.");
+    checkState(!isClosed.get(), "Cannot invoke remove() on a closed storage.");
     transaction.remove(segment, key);
   }
 
   @Override
   public final void commit() throws StorageException {
     checkState(active, "Cannot commit a completed transaction.");
+    checkState(!isClosed.get(), "Cannot invoke commit() on a closed storage.");
     active = false;
     transaction.commit();
   }
@@ -52,6 +70,7 @@ public final void commit() throws StorageException {
   @Override
   public final void rollback() {
     checkState(active, "Cannot rollback a completed transaction.");
+    checkState(!isClosed.get(), "Cannot invoke rollback() on a closed storage.");
     active = false;
     transaction.rollback();
   }
diff --git a/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SnappableSegmentedKeyValueStorageAdapter.java b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SnappableSegmentedKeyValueStorageAdapter.java
new file mode 100644
index 00000000000..941cea0ebfe
--- /dev/null
+++ b/services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SnappableSegmentedKeyValueStorageAdapter.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.services.kvstore;
+
+import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier;
+import org.hyperledger.besu.plugin.services.storage.SnappableKeyValueStorage;
+import org.hyperledger.besu.plugin.services.storage.SnappedKeyValueStorage;
+
+import java.util.function.Supplier;
+
+/**
+ * The type Segmented key value storage adapter.
+ *
+ * @param <S> the type parameter
+ */
+public class SnappableSegmentedKeyValueStorageAdapter<S> extends SegmentedKeyValueStorageAdapter<S>
+    implements SnappableKeyValueStorage {
+  private final Supplier<SnappedKeyValueStorage> snapshotSupplier;
+
+  /**
+   * Instantiates a new Segmented key value storage adapter.
+   *
+   * @param segment the segment
+   * @param storage the storage
+   */
+  public SnappableSegmentedKeyValueStorageAdapter(
+      final SegmentIdentifier segment, final SegmentedKeyValueStorage<S> storage) {
+    this(
+        segment,
+        storage,
+        () -> {
+          throw new UnsupportedOperationException("Snapshot not supported");
+        });
+  }
+
+  /**
+   * Instantiates a new Segmented key value storage adapter.
+   *
+   * @param segment the segment
+   * @param storage the storage
+   * @param snapshotSupplier the snapshot supplier
+   */
+  public SnappableSegmentedKeyValueStorageAdapter(
+      final SegmentIdentifier segment,
+      final SegmentedKeyValueStorage<S> storage,
+      final Supplier<SnappedKeyValueStorage> snapshotSupplier) {
+    super(segment, storage);
+    this.snapshotSupplier = snapshotSupplier;
+  }
+
+  @Override
+  public SnappedKeyValueStorage takeSnapshot() {
+    return snapshotSupplier.get();
+  }
+}
diff --git a/services/kvstore/src/main/resources/log4j2.xml b/services/kvstore/src/main/resources/log4j2.xml
deleted file mode 100644
index 5ee96740d7c..00000000000
--- a/services/kvstore/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN" monitorInterval="30">
-  <Properties>
-    <Property name="root.log.level">INFO</Property>
-  </Properties>
-  <Appenders>
-    <Console name="Console" target="SYSTEM_OUT">
-      <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSSZZZ} [%t] %-5level %c{1.} %msg%n" />
-    </Console>
-  </Appenders>
-  <Loggers>
-    <Root level="${sys:root.log.level}">
-      <AppenderRef ref="Console" />
-    </Root>
-  </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/services/kvstore/src/test/java/org/hyperledger/besu/services/kvstore/LimitedInMemoryKeyValueStorageTest.java b/services/kvstore/src/test/java/org/hyperledger/besu/services/kvstore/LimitedInMemoryKeyValueStorageTest.java
index a416c865425..affcec07151 100644
--- a/services/kvstore/src/test/java/org/hyperledger/besu/services/kvstore/LimitedInMemoryKeyValueStorageTest.java
+++ b/services/kvstore/src/test/java/org/hyperledger/besu/services/kvstore/LimitedInMemoryKeyValueStorageTest.java
@@ -20,7 +20,7 @@
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class LimitedInMemoryKeyValueStorageTest extends AbstractKeyValueStorageTest {
 
diff --git a/services/pipeline/build.gradle b/services/pipeline/build.gradle
index 1dc2cd1ba0a..b86edbf344b 100644
--- a/services/pipeline/build.gradle
+++ b/services/pipeline/build.gradle
@@ -29,17 +29,17 @@ jar {
 
 dependencies {
   api project(':util')
+  api 'org.slf4j:slf4j-api'
 
   implementation project(':metrics:core')
   implementation project(':plugin-api')
 
+  implementation 'io.opentelemetry:opentelemetry-api'
   implementation 'com.google.guava:guava'
-  implementation 'org.apache.logging.log4j:log4j-api'
 
-  runtimeOnly 'org.apache.logging.log4j:log4j-core'
-
-  testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.awaitility:awaitility'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.mockito:mockito-core'
+  testImplementation 'org.mockito:mockito-junit-jupiter'
 }
diff --git a/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/AsyncOperationProcessor.java b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/AsyncOperationProcessor.java
index 4bdeb645d6a..bcccb94d070 100644
--- a/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/AsyncOperationProcessor.java
+++ b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/AsyncOperationProcessor.java
@@ -25,11 +25,11 @@
 import java.util.concurrent.TimeoutException;
 import java.util.function.Function;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class AsyncOperationProcessor<I, O> implements Processor<I, O> {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(AsyncOperationProcessor.class);
   private final Function<I, CompletableFuture<O>> processor;
   private final List<CompletableFuture<O>> inProgress;
   private CompletableFuture<?> nextOutputAvailableFuture = completedFuture(null);
diff --git a/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/BatchingReadPipe.java b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/BatchingReadPipe.java
index 0f2808efd2d..d6e74c559f7 100644
--- a/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/BatchingReadPipe.java
+++ b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/BatchingReadPipe.java
@@ -19,18 +19,49 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.function.Function;
 
+/**
+ * The Batching read pipe.
+ *
+ * @param <T> the type parameter
+ */
 public class BatchingReadPipe<T> implements ReadPipe<List<T>> {
 
   private final ReadPipe<T> input;
   private final int maximumBatchSize;
   private final Counter batchCounter;
+  private final Function<List<T>, Integer> stopBatchCondition;
 
+  /**
+   * Instantiates a new Batching read pipe.
+   *
+   * @param input the input
+   * @param maximumBatchSize the maximum batch size
+   * @param batchCounter the batch counter
+   */
   public BatchingReadPipe(
       final ReadPipe<T> input, final int maximumBatchSize, final Counter batchCounter) {
+    this(input, maximumBatchSize, batchCounter, ts -> maximumBatchSize - ts.size());
+  }
+
+  /**
+   * Instantiates a new Batching read pipe.
+   *
+   * @param input the input
+   * @param maximumBatchSize the maximum batch size
+   * @param batchCounter the batch counter
+   * @param batchEndCondition the batch end condition
+   */
+  public BatchingReadPipe(
+      final ReadPipe<T> input,
+      final int maximumBatchSize,
+      final Counter batchCounter,
+      final Function<List<T>, Integer> batchEndCondition) {
     this.input = input;
     this.maximumBatchSize = maximumBatchSize;
     this.batchCounter = batchCounter;
+    this.stopBatchCondition = batchEndCondition;
   }
 
   @Override
@@ -53,7 +84,15 @@ public List<T> get() {
     }
     final List<T> batch = new ArrayList<>();
     batch.add(firstItem);
-    input.drainTo(batch, maximumBatchSize - 1);
+    Integer remainingData = stopBatchCondition.apply(batch);
+    while (remainingData > 0
+        && (batch.size() + remainingData) <= maximumBatchSize
+        && input.hasMore()) {
+      if (input.drainTo(batch, remainingData) == 0) {
+        break;
+      }
+      remainingData = stopBatchCondition.apply(batch);
+    }
     batchCounter.inc();
     return batch;
   }
@@ -61,7 +100,15 @@ public List<T> get() {
   @Override
   public List<T> poll() {
     final List<T> batch = new ArrayList<>();
-    input.drainTo(batch, maximumBatchSize);
+    Integer remainingData = stopBatchCondition.apply(batch);
+    while (remainingData > 0
+        && (batch.size() + remainingData) <= maximumBatchSize
+        && input.hasMore()) {
+      if (input.drainTo(batch, remainingData) == 0) {
+        break;
+      }
+      remainingData = stopBatchCondition.apply(batch);
+    }
     if (batch.isEmpty()) {
       // Poll has to return null if the pipe is empty
       return null;
@@ -71,10 +118,12 @@ public List<T> poll() {
   }
 
   @Override
-  public void drainTo(final Collection<List<T>> output, final int maxElements) {
+  public int drainTo(final Collection<List<T>> output, final int maxElements) {
     final List<T> nextBatch = poll();
     if (nextBatch != null) {
       output.add(nextBatch);
+      return nextBatch.size();
     }
+    return 0;
   }
 }
diff --git a/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Pipe.java b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Pipe.java
index e3615c931bb..3697e0e3ba2 100644
--- a/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Pipe.java
+++ b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Pipe.java
@@ -22,8 +22,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Forms the connection between two pipeline stages. A pipe is essentially a blocking queue with the
@@ -31,13 +31,13 @@
  * the pipeline aborted.
  *
  * <p>In most cases a Pipe is used through one of two narrower interfaces it supports {@link
- * ReadPipe} and {@link WritePipe}. These are designed to expose only the operations relevant to
+ * ReadPipe}* and {@link WritePipe}. These are designed to expose only the operations relevant to
  * objects either reading from or publishing to the pipe respectively.
  *
  * @param <T> the type of item that flows through the pipe.
  */
 public class Pipe<T> implements ReadPipe<T>, WritePipe<T> {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(Pipe.class);
   private final BlockingQueue<T> queue;
   private final Counter inputCounter;
   private final Counter outputCounter;
@@ -45,6 +45,14 @@ public class Pipe<T> implements ReadPipe<T>, WritePipe<T> {
   private final AtomicBoolean closed = new AtomicBoolean();
   private final AtomicBoolean aborted = new AtomicBoolean();
 
+  /**
+   * Instantiates a new Pipe.
+   *
+   * @param capacity the capacity
+   * @param inputCounter the input counter
+   * @param outputCounter the output counter
+   * @param abortedItemCounter the aborted item counter
+   */
   public Pipe(
       final int capacity,
       final Counter inputCounter,
@@ -117,9 +125,10 @@ public T poll() {
   }
 
   @Override
-  public void drainTo(final Collection<T> output, final int maxElements) {
+  public int drainTo(final Collection<T> output, final int maxElements) {
     final int count = queue.drainTo(output, maxElements);
     outputCounter.inc(count);
+    return count;
   }
 
   @Override
diff --git a/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Pipeline.java b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Pipeline.java
index c3059309984..f2cc53059b4 100644
--- a/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Pipeline.java
+++ b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Pipeline.java
@@ -27,16 +27,28 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Stream;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.api.trace.StatusCode;
+import io.opentelemetry.api.trace.Tracer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/**
+ * The Pipeline.
+ *
+ * @param <I> the type parameter
+ */
 public class Pipeline<I> {
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(Pipeline.class);
   private final Pipe<I> inputPipe;
   private final Collection<Stage> stages;
   private final Collection<Pipe<?>> pipes;
   private final CompleterStage<?> completerStage;
   private final AtomicBoolean started = new AtomicBoolean(false);
+  private final Tracer tracer =
+      GlobalOpenTelemetry.getTracer("org.hyperledger.besu.services.pipeline", "1.0.0");
 
   /**
    * Flags that the pipeline is being completed so that when we abort we can close the streams
@@ -47,14 +59,30 @@ public class Pipeline<I> {
   private final AtomicBoolean completing = new AtomicBoolean(false);
 
   private final CompletableFuture<Void> overallFuture = new CompletableFuture<>();
+  private final String name;
+  private final boolean tracingEnabled;
   private volatile List<Future<?>> futures;
 
+  /**
+   * Instantiates a new Pipeline.
+   *
+   * @param inputPipe the input pipe
+   * @param name the name
+   * @param tracingEnabled the tracing enabled
+   * @param stages the stages
+   * @param pipes the pipes
+   * @param completerStage the completer stage
+   */
   Pipeline(
       final Pipe<I> inputPipe,
+      final String name,
+      final boolean tracingEnabled,
       final Collection<Stage> stages,
       final Collection<Pipe<?>> pipes,
       final CompleterStage<?> completerStage) {
     this.inputPipe = inputPipe;
+    this.tracingEnabled = tracingEnabled;
+    this.name = name;
     this.stages = stages;
     this.pipes = pipes;
     this.completerStage = completerStage;
@@ -123,12 +151,24 @@ public void abort() {
   private Future<?> runWithErrorHandling(final ExecutorService executorService, final Stage task) {
     return executorService.submit(
         () -> {
+          Span taskSpan = null;
+          if (tracingEnabled) {
+            taskSpan =
+                tracer
+                    .spanBuilder(task.getName())
+                    .setAttribute("pipeline", name)
+                    .setSpanKind(SpanKind.INTERNAL)
+                    .startSpan();
+          }
           final Thread thread = Thread.currentThread();
           final String originalName = thread.getName();
           try {
             thread.setName(originalName + " (" + task.getName() + ")");
             task.run();
           } catch (final Throwable t) {
+            if (tracingEnabled) {
+              taskSpan.setStatus(StatusCode.ERROR);
+            }
             LOG.debug("Unhandled exception in pipeline. Aborting.", t);
             try {
               abort(t);
@@ -139,6 +179,9 @@ private Future<?> runWithErrorHandling(final ExecutorService executorService, fi
               LOG.error("Failed to abort pipeline after error", t2);
             }
           } finally {
+            if (tracingEnabled) {
+              taskSpan.end();
+            }
             thread.setName(originalName);
           }
         });
diff --git a/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/PipelineBuilder.java b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/PipelineBuilder.java
index 0bff48c36b4..3bc6656e700 100644
--- a/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/PipelineBuilder.java
+++ b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/PipelineBuilder.java
@@ -51,7 +51,22 @@ public class PipelineBuilder<I, T> {
   private final ReadPipe<T> pipeEnd;
   private final int bufferSize;
   private final LabelledMetric<Counter> outputCounter;
+  private final boolean tracingEnabled;
+  private final String pipelineName;
 
+  /**
+   * Instantiates a new Pipeline builder.
+   *
+   * @param inputPipe the input pipe
+   * @param stages the stages
+   * @param pipes the pipes
+   * @param lastStageName the last stage name
+   * @param pipeEnd the pipe end
+   * @param bufferSize the buffer size
+   * @param outputCounter the output counter
+   * @param tracingEnabled the tracing enabled
+   * @param pipelineName the pipeline name
+   */
   public PipelineBuilder(
       final Pipe<I> inputPipe,
       final Collection<Stage> stages,
@@ -59,7 +74,9 @@ public PipelineBuilder(
       final String lastStageName,
       final ReadPipe<T> pipeEnd,
       final int bufferSize,
-      final LabelledMetric<Counter> outputCounter) {
+      final LabelledMetric<Counter> outputCounter,
+      final boolean tracingEnabled,
+      final String pipelineName) {
     checkArgument(!pipes.isEmpty(), "Must have at least one pipe in a pipeline");
     this.lastStageName = lastStageName;
     this.outputCounter = outputCounter;
@@ -68,6 +85,8 @@ public PipelineBuilder(
     this.pipes = pipes;
     this.pipeEnd = pipeEnd;
     this.bufferSize = bufferSize;
+    this.tracingEnabled = tracingEnabled;
+    this.pipelineName = pipelineName;
   }
 
   /**
@@ -75,50 +94,76 @@ public PipelineBuilder(
    * <i>source</i> returns <code>false</code> from {@link Iterator#hasNext()} and the last item has
    * been reached the end of the pipeline.
    *
+   * @param <T> the type of items input into the pipeline.
    * @param sourceName the name of this stage. Used as the label for the output count metric.
    * @param source the source to pull items from for processing.
    * @param bufferSize the number of items to be buffered between each stage in the pipeline.
    * @param itemCounter the counter to increment for each output of a stage. Must accept two labels,
    *     the stage name and action (output or drained).
-   * @param <T> the type of items input into the pipeline.
+   * @param tracingEnabled whether this pipeline should be traced
+   * @param pipelineName the name of the pipeline for tracing purposes
    * @return a {@link PipelineBuilder} ready to extend the pipeline with additional stages.
    */
   public static <T> PipelineBuilder<T, T> createPipelineFrom(
       final String sourceName,
       final Iterator<T> source,
       final int bufferSize,
-      final LabelledMetric<Counter> itemCounter) {
+      final LabelledMetric<Counter> itemCounter,
+      final boolean tracingEnabled,
+      final String pipelineName) {
     final Pipe<T> pipe = createPipe(bufferSize, sourceName, itemCounter);
     final IteratorSourceStage<T> sourceStage = new IteratorSourceStage<>(sourceName, source, pipe);
     return new PipelineBuilder<>(
-        pipe, singleton(sourceStage), singleton(pipe), sourceName, pipe, bufferSize, itemCounter);
+        pipe,
+        singleton(sourceStage),
+        singleton(pipe),
+        sourceName,
+        pipe,
+        bufferSize,
+        itemCounter,
+        tracingEnabled,
+        pipelineName);
   }
 
   /**
    * Create a new pipeline that processes inputs added to <i>pipe</i>. The pipeline completes when
    * <i>pipe</i> is closed and the last item has been reached the end of the pipeline.
    *
+   * @param <T> the type of items input into the pipeline.
    * @param sourceName the name of this stage. Used as the label for the output count metric.
    * @param bufferSize the number of items to be buffered between each stage in the pipeline.
    * @param outputCounter the counter to increment for each output of a stage. Must have a single
    *     label which will be filled with the stage name.
-   * @param <T> the type of items input into the pipeline.
+   * @param tracingEnabled whether this pipeline should be traced
+   * @param pipelineName the name of the pipeline for tracing purposes
    * @return a {@link PipelineBuilder} ready to extend the pipeline with additional stages.
    */
   public static <T> PipelineBuilder<T, T> createPipeline(
-      final String sourceName, final int bufferSize, final LabelledMetric<Counter> outputCounter) {
+      final String sourceName,
+      final int bufferSize,
+      final LabelledMetric<Counter> outputCounter,
+      final boolean tracingEnabled,
+      final String pipelineName) {
     final Pipe<T> pipe = createPipe(bufferSize, sourceName, outputCounter);
     return new PipelineBuilder<>(
-        pipe, emptyList(), singleton(pipe), sourceName, pipe, bufferSize, outputCounter);
+        pipe,
+        emptyList(),
+        singleton(pipe),
+        sourceName,
+        pipe,
+        bufferSize,
+        outputCounter,
+        tracingEnabled,
+        pipelineName);
   }
 
   /**
    * Adds a 1-to-1 processing stage to the pipeline. A single thread processes each item in the
    * pipeline with <i>processor</i> outputting its return value to the next stage.
    *
+   * @param <O> the output type for this processing step.
    * @param stageName the name of this stage. Used as the label for the output count metric.
    * @param processor the processing to apply to each item.
-   * @param <O> the output type for this processing step.
    * @return a {@link PipelineBuilder} ready to extend the pipeline with additional stages.
    */
   public <O> PipelineBuilder<I, O> thenProcess(
@@ -133,10 +178,10 @@ public <O> PipelineBuilder<I, O> thenProcess(
    *
    * <p>Note: The order of items is not preserved.
    *
+   * @param <O> the output type for this processing step.
    * @param stageName the name of this stage. Used as the label for the output count metric.
    * @param processor the processing to apply to each item.
    * @param numberOfThreads the number of threads to use for processing.
-   * @param <O> the output type for this processing step.
    * @return a {@link PipelineBuilder} ready to extend the pipeline with additional stages.
    */
   public <O> PipelineBuilder<I, O> thenProcessInParallel(
@@ -156,10 +201,10 @@ public <O> PipelineBuilder<I, O> thenProcessInParallel(
    *
    * <p>Note: The order of items is not preserved.
    *
+   * @param <O> the output type for this processing step.
    * @param stageName the name of this stage. Used as the label for the output count metric.
    * @param processor the processing to apply to each item.
    * @param maxConcurrency the maximum number of items being processed concurrently.
-   * @param <O> the output type for this processing step.
    * @return a {@link PipelineBuilder} ready to extend the pipeline with additional stages.
    */
   public <O> PipelineBuilder<I, O> thenProcessAsync(
@@ -180,10 +225,10 @@ public <O> PipelineBuilder<I, O> thenProcessAsync(
    *
    * <p>Note: While processing may occur concurrently, order is preserved when results are output.
    *
+   * @param <O> the output type for this processing step.
    * @param stageName the name of this stage. Used as the label for the output count metric.
    * @param processor the processing to apply to each item.
    * @param maxConcurrency the maximum number of items being processed concurrently.
-   * @param <O> the output type for this processing step.
    * @return a {@link PipelineBuilder} ready to extend the pipeline with additional stages.
    */
   public <O> PipelineBuilder<I, O> thenProcessAsyncOrdered(
@@ -216,7 +261,39 @@ public PipelineBuilder<I, List<T>> inBatches(final int maximumBatchSize) {
             maximumBatchSize,
             outputCounter.labels(lastStageName + "_outputPipe", "batches")),
         (int) Math.ceil(((double) bufferSize) / maximumBatchSize),
-        outputCounter);
+        outputCounter,
+        tracingEnabled,
+        pipelineName);
+  }
+
+  /**
+   * Batches items into groups of at most <i>maximumBatchSize</i>. Batches are created eagerly to
+   * minimize delay so may not be full.
+   *
+   * <p>Order of items is preserved.
+   *
+   * <p>The output buffer size is reduced to <code>bufferSize / maximumBatchSize + 1</code>.
+   *
+   * @param maximumBatchSize the maximum number of items to include in a batch.
+   * @param stopBatchCondition the condition before ending the batch
+   * @return a {@link PipelineBuilder} ready to extend the pipeline with additional stages.
+   */
+  public PipelineBuilder<I, List<T>> inBatches(
+      final int maximumBatchSize, final Function<List<T>, Integer> stopBatchCondition) {
+    return new PipelineBuilder<>(
+        inputPipe,
+        stages,
+        pipes,
+        lastStageName,
+        new BatchingReadPipe<>(
+            pipeEnd,
+            maximumBatchSize,
+            outputCounter.labels(lastStageName + "_outputPipe", "batches"),
+            stopBatchCondition),
+        (int) Math.ceil(((double) bufferSize) / maximumBatchSize),
+        outputCounter,
+        tracingEnabled,
+        pipelineName);
   }
 
   /**
@@ -228,10 +305,10 @@ public PipelineBuilder<I, List<T>> inBatches(final int maximumBatchSize) {
    *
    * <pre>thenFlatMap(List::stream, newBufferSize)</pre>
    *
+   * @param <O> the type of items to be output from this stage.
    * @param stageName the name of this stage. Used as the label for the output count metric.
    * @param mapper the function to process each item with.
    * @param newBufferSize the output buffer size to use from this stage onwards.
-   * @param <O> the type of items to be output from this stage.
    * @return a {@link PipelineBuilder} ready to extend the pipeline with additional stages.
    */
   public <O> PipelineBuilder<I, O> thenFlatMap(
@@ -249,11 +326,11 @@ public <O> PipelineBuilder<I, O> thenFlatMap(
    *
    * <pre>thenFlatMap(List::stream, newBufferSize)</pre>
    *
+   * @param <O> the type of items to be output from this stage.
    * @param stageName the name of this stage. Used as the label for the output count metric.
    * @param mapper the function to process each item with.
    * @param numberOfThreads the number of threads to use for processing.
    * @param newBufferSize the output buffer size to use from this stage onwards.
-   * @param <O> the type of items to be output from this stage.
    * @return a {@link PipelineBuilder} ready to extend the pipeline with additional stages.
    */
   public <O> PipelineBuilder<I, O> thenFlatMapInParallel(
@@ -274,7 +351,12 @@ public <O> PipelineBuilder<I, O> thenFlatMapInParallel(
    */
   public Pipeline<I> andFinishWith(final String stageName, final Consumer<T> completer) {
     return new Pipeline<>(
-        inputPipe, stages, pipes, new CompleterStage<>(stageName, pipeEnd, completer));
+        inputPipe,
+        pipelineName,
+        tracingEnabled,
+        stages,
+        pipes,
+        new CompleterStage<>(stageName, pipeEnd, completer));
   }
 
   private <O> PipelineBuilder<I, O> thenProcessInParallel(
@@ -297,7 +379,9 @@ private <O> PipelineBuilder<I, O> thenProcessInParallel(
         stageName,
         newPipeEnd,
         newBufferSize,
-        outputCounter);
+        outputCounter,
+        tracingEnabled,
+        pipelineName);
   }
 
   private <O> PipelineBuilder<I, O> addStage(
@@ -317,7 +401,9 @@ private <O> PipelineBuilder<I, O> addStage(
         processStage.getName(),
         outputPipe,
         newBufferSize,
-        outputCounter);
+        outputCounter,
+        tracingEnabled,
+        pipelineName);
   }
 
   private <X> List<X> concat(final Collection<X> existing, final X newItem) {
diff --git a/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/ReadPipe.java b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/ReadPipe.java
index 8d174d34a51..0e453decf82 100644
--- a/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/ReadPipe.java
+++ b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/ReadPipe.java
@@ -61,6 +61,7 @@ public interface ReadPipe<T> {
    *
    * @param output the collection to transfer elements into
    * @param maxElements the maximum number of elements to transfer
+   * @return the number of elements drained in the pipe
    */
-  void drainTo(Collection<T> output, int maxElements);
+  int drainTo(Collection<T> output, int maxElements);
 }
diff --git a/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Stage.java b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Stage.java
index ac1e5e6a544..f699e904b10 100644
--- a/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Stage.java
+++ b/services/pipeline/src/main/java/org/hyperledger/besu/services/pipeline/Stage.java
@@ -14,6 +14,12 @@
  */
 package org.hyperledger.besu.services.pipeline;
 
+/** The interface Stage. */
 public interface Stage extends Runnable {
+  /**
+   * Gets name.
+   *
+   * @return the name
+   */
   String getName();
 }
diff --git a/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/AsyncOperationProcessorTest.java b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/AsyncOperationProcessorTest.java
index 5f9e8d6b81a..1b9f8202435 100644
--- a/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/AsyncOperationProcessorTest.java
+++ b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/AsyncOperationProcessorTest.java
@@ -20,13 +20,13 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AsyncOperationProcessorTest {
 
@@ -90,7 +90,7 @@ public void shouldOutputRemainingInProgressTasksWhenFinalizing() {
     processor.processNextInput(readPipe, writePipe);
     processor.processNextInput(readPipe, writePipe);
     verify(readPipe, times(2)).get();
-    verifyZeroInteractions(writePipe);
+    verifyNoInteractions(writePipe);
 
     task1.complete("a");
     task2.complete("b");
@@ -160,7 +160,7 @@ public void shouldPreserveOrderWhenRequested() {
 
     processor.processNextInput(readPipe, writePipe);
     verify(readPipe, times(3)).get();
-    verifyZeroInteractions(writePipe);
+    verifyNoInteractions(writePipe);
 
     task1.complete("a");
 
diff --git a/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/BatchingReadPipeTest.java b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/BatchingReadPipeTest.java
index ea2723580a4..fb90128fbb3 100644
--- a/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/BatchingReadPipeTest.java
+++ b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/BatchingReadPipeTest.java
@@ -20,14 +20,14 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
 import org.hyperledger.besu.plugin.services.metrics.Counter;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BatchingReadPipeTest {
 
@@ -114,7 +114,7 @@ public void shouldCountBatchesReturnedFromGet() {
   @Test
   public void shouldCountBatchesReturnedFromPoll() {
     assertThat(batchingPipe.poll()).isNull();
-    verifyZeroInteractions(batchCounter);
+    verifyNoInteractions(batchCounter);
 
     source.put("a");
     batchingPipe.poll();
@@ -126,7 +126,7 @@ public void shouldCountBatchesReturnedFromPoll() {
   public void shouldCountBatchesReturnedFromDrainTo() {
     final List<List<String>> output = new ArrayList<>();
     batchingPipe.drainTo(output, 3);
-    verifyZeroInteractions(batchCounter);
+    verifyNoInteractions(batchCounter);
 
     source.put("a");
     batchingPipe.drainTo(output, 3);
diff --git a/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/CompleterStageTest.java b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/CompleterStageTest.java
index 90c1b3c1e8e..ef3e29afebe 100644
--- a/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/CompleterStageTest.java
+++ b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/CompleterStageTest.java
@@ -20,7 +20,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CompleterStageTest {
 
diff --git a/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/FlatMapProcessorTest.java b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/FlatMapProcessorTest.java
index 1dc1355d78e..1012d3b0123 100644
--- a/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/FlatMapProcessorTest.java
+++ b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/FlatMapProcessorTest.java
@@ -18,13 +18,13 @@
 import static org.hyperledger.besu.metrics.noop.NoOpMetricsSystem.NO_OP_COUNTER;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import java.util.function.Function;
 import java.util.stream.Stream;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class FlatMapProcessorTest {
 
@@ -54,6 +54,6 @@ public void shouldOutputItemsFromReturnedStreamIndividually() {
   public void shouldSkipProcessingWhenInputIsClosed() {
     input.close();
     stage.processNextInput(input, output);
-    verifyZeroInteractions(mapper);
+    verifyNoInteractions(mapper);
   }
 }
diff --git a/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/IteratorSourceStageTest.java b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/IteratorSourceStageTest.java
index 6c7f077dcb3..02052615b75 100644
--- a/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/IteratorSourceStageTest.java
+++ b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/IteratorSourceStageTest.java
@@ -18,7 +18,7 @@
 import static org.hyperledger.besu.metrics.noop.NoOpMetricsSystem.NO_OP_COUNTER;
 
 import com.google.common.collect.Iterators;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class IteratorSourceStageTest {
 
diff --git a/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/MapProcessorTest.java b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/MapProcessorTest.java
index 33695ab08ec..0d7a913c3e3 100644
--- a/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/MapProcessorTest.java
+++ b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/MapProcessorTest.java
@@ -18,12 +18,12 @@
 import static org.hyperledger.besu.metrics.noop.NoOpMetricsSystem.NO_OP_COUNTER;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import java.util.function.Function;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class MapProcessorTest {
 
@@ -51,6 +51,6 @@ public void shouldApplyFunctionToItems() {
   public void shouldSkipProcessingWhenInputIsClosed() {
     input.close();
     stage.processNextInput(input, output);
-    verifyZeroInteractions(processor);
+    verifyNoInteractions(processor);
   }
 }
diff --git a/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/PipeTest.java b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/PipeTest.java
index 7ce16dfbef3..c838bc887a3 100644
--- a/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/PipeTest.java
+++ b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/PipeTest.java
@@ -24,7 +24,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PipeTest {
   private final Counter inputCounter = mock(Counter.class);
diff --git a/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/PipelineBuilderTest.java b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/PipelineBuilderTest.java
index 839bccb9b04..1ec64ab65fc 100644
--- a/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/PipelineBuilderTest.java
+++ b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/PipelineBuilderTest.java
@@ -51,8 +51,8 @@
 import java.util.stream.Stream;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 public class PipelineBuilderTest {
 
@@ -66,7 +66,7 @@ public class PipelineBuilderTest {
 
   private final ExecutorService executorService = Executors.newCachedThreadPool(THREAD_FACTORY);
 
-  @After
+  @AfterEach
   public void afterClass() throws Exception {
     executorService.shutdownNow();
     if (!executorService.awaitTermination(10, SECONDS)) {
@@ -78,7 +78,8 @@ public void afterClass() throws Exception {
   public void shouldPipeTasksFromSupplierToCompleter() throws Exception {
     final List<Integer> output = new ArrayList<>();
     final Pipeline<Integer> pipeline =
-        PipelineBuilder.createPipelineFrom("input", tasks, 10, NO_OP_LABELLED_2_COUNTER)
+        PipelineBuilder.createPipelineFrom(
+                "input", tasks, 10, NO_OP_LABELLED_2_COUNTER, false, "test")
             .andFinishWith("end", output::add);
     final CompletableFuture<?> result = pipeline.start(executorService);
     result.get(10, SECONDS);
@@ -89,7 +90,8 @@ public void shouldPipeTasksFromSupplierToCompleter() throws Exception {
   public void shouldPassInputThroughIntermediateStage() throws Exception {
     final List<String> output = new ArrayList<>();
     final Pipeline<Integer> pipeline =
-        PipelineBuilder.createPipelineFrom("input", tasks, 10, NO_OP_LABELLED_2_COUNTER)
+        PipelineBuilder.createPipelineFrom(
+                "input", tasks, 10, NO_OP_LABELLED_2_COUNTER, false, "test")
             .thenProcess("toString", Object::toString)
             .andFinishWith("end", output::add);
 
@@ -104,7 +106,8 @@ public void shouldPassInputThroughIntermediateStage() throws Exception {
   public void shouldCombineIntoBatches() throws Exception {
     final BlockingQueue<List<Integer>> output = new ArrayBlockingQueue<>(10);
     final Pipeline<Integer> pipeline =
-        PipelineBuilder.<Integer>createPipeline("source", 20, NO_OP_LABELLED_2_COUNTER)
+        PipelineBuilder.<Integer>createPipeline(
+                "source", 20, NO_OP_LABELLED_2_COUNTER, false, "test")
             .inBatches(6)
             .andFinishWith("end", output::offer);
 
@@ -135,7 +138,8 @@ public void shouldCombineIntoBatches() throws Exception {
   public void shouldProcessAsync() throws Exception {
     final List<String> output = new ArrayList<>();
     final Pipeline<Integer> pipeline =
-        PipelineBuilder.createPipelineFrom("input", tasks, 10, NO_OP_LABELLED_2_COUNTER)
+        PipelineBuilder.createPipelineFrom(
+                "input", tasks, 10, NO_OP_LABELLED_2_COUNTER, false, "test")
             .thenProcessAsync("toString", value -> completedFuture(Integer.toString(value)), 3)
             .andFinishWith("end", output::add);
     final CompletableFuture<?> result = pipeline.start(executorService);
@@ -150,7 +154,8 @@ public void shouldProcessAsyncOrdered() throws Exception {
     final Map<Integer, CompletableFuture<String>> futures = new ConcurrentHashMap<>();
     final List<String> output = new CopyOnWriteArrayList<>();
     final Pipeline<Integer> pipeline =
-        PipelineBuilder.createPipelineFrom("input", tasks, 15, NO_OP_LABELLED_2_COUNTER)
+        PipelineBuilder.createPipelineFrom(
+                "input", tasks, 15, NO_OP_LABELLED_2_COUNTER, false, "test")
             .thenProcessAsyncOrdered(
                 "toString",
                 value -> {
@@ -198,7 +203,12 @@ public void shouldLimitInFlightProcessesWhenProcessingAsync() throws Exception {
     final List<CompletableFuture<String>> futures = new CopyOnWriteArrayList<>();
     final Pipeline<Integer> pipeline =
         PipelineBuilder.createPipelineFrom(
-                "input", asList(1, 2, 3, 4, 5, 6, 7).iterator(), 10, NO_OP_LABELLED_2_COUNTER)
+                "input",
+                asList(1, 2, 3, 4, 5, 6, 7).iterator(),
+                10,
+                NO_OP_LABELLED_2_COUNTER,
+                false,
+                "test")
             .thenProcessAsync(
                 "createFuture",
                 value -> {
@@ -235,7 +245,8 @@ public void shouldLimitInFlightProcessesWhenProcessingAsync() throws Exception {
   public void shouldFlatMapItems() throws Exception {
     final List<Integer> output = new ArrayList<>();
     final Pipeline<Integer> pipeline =
-        PipelineBuilder.createPipelineFrom("input", tasks, 10, NO_OP_LABELLED_2_COUNTER)
+        PipelineBuilder.createPipelineFrom(
+                "input", tasks, 10, NO_OP_LABELLED_2_COUNTER, false, "test")
             .thenFlatMap("flatMap", input -> Stream.of(input, input * 2), 20)
             .andFinishWith("end", output::add);
 
@@ -252,7 +263,8 @@ public void shouldProcessInParallel() throws Exception {
     final List<String> output = synchronizedList(new ArrayList<>());
     final CountDownLatch latch = new CountDownLatch(1);
     final Pipeline<Integer> pipeline =
-        PipelineBuilder.createPipelineFrom("input", tasks, 10, NO_OP_LABELLED_2_COUNTER)
+        PipelineBuilder.createPipelineFrom(
+                "input", tasks, 10, NO_OP_LABELLED_2_COUNTER, false, "test")
             .thenProcessInParallel(
                 "stageName",
                 value -> {
@@ -287,7 +299,8 @@ public void shouldFlatMapInParallel() throws Exception {
     final List<String> output = synchronizedList(new ArrayList<>());
     final CountDownLatch latch = new CountDownLatch(1);
     final Pipeline<Integer> pipeline =
-        PipelineBuilder.createPipelineFrom("input", tasks, 10, NO_OP_LABELLED_2_COUNTER)
+        PipelineBuilder.createPipelineFrom(
+                "input", tasks, 10, NO_OP_LABELLED_2_COUNTER, false, "test")
             .thenFlatMapInParallel(
                 "stageName",
                 value -> {
@@ -327,7 +340,8 @@ public void shouldAbortPipeline() throws Exception {
     final List<Integer> output = synchronizedList(new ArrayList<>());
     final CountDownLatch startedProcessingValueSix = new CountDownLatch(1);
     final Pipeline<Integer> pipeline =
-        PipelineBuilder.createPipelineFrom("input", tasks, 10, NO_OP_LABELLED_2_COUNTER)
+        PipelineBuilder.createPipelineFrom(
+                "input", tasks, 10, NO_OP_LABELLED_2_COUNTER, false, "test")
             .thenProcess(
                 "stageName",
                 value -> {
@@ -363,7 +377,8 @@ public void shouldAbortPipelineWhenFutureIsCancelled() throws Exception {
     final List<Integer> output = synchronizedList(new ArrayList<>());
     final CountDownLatch startedProcessingValueSix = new CountDownLatch(1);
     final Pipeline<Integer> pipeline =
-        PipelineBuilder.createPipelineFrom("input", tasks, 10, NO_OP_LABELLED_2_COUNTER)
+        PipelineBuilder.createPipelineFrom(
+                "input", tasks, 10, NO_OP_LABELLED_2_COUNTER, false, "test")
             .thenProcess(
                 "stageName",
                 value -> {
@@ -396,7 +411,8 @@ public void shouldAbortPipelineWhenFutureIsCancelled() throws Exception {
   public void shouldAbortPipelineWhenProcessorThrowsException() {
     final RuntimeException expectedError = new RuntimeException("Oops");
     final Pipeline<Integer> pipeline =
-        PipelineBuilder.createPipelineFrom("input", tasks, 10, NO_OP_LABELLED_2_COUNTER)
+        PipelineBuilder.createPipelineFrom(
+                "input", tasks, 10, NO_OP_LABELLED_2_COUNTER, false, "test")
             .thenProcess(
                 "stageName",
                 (Function<Integer, Integer>)
@@ -421,7 +437,7 @@ public void shouldTrackTaskCountMetrics() throws Exception {
         labels ->
             counters.computeIfAbsent(labels[0] + "-" + labels[1], label -> new SimpleCounter());
     final Pipeline<Integer> pipeline =
-        PipelineBuilder.createPipelineFrom("input", tasks, 10, labelledCounter)
+        PipelineBuilder.createPipelineFrom("input", tasks, 10, labelledCounter, false, "test")
             .thenProcess("map", Function.identity())
             .thenProcessInParallel("parallel", Function.identity(), 3)
             .thenProcessAsync("async", CompletableFuture::completedFuture, 3)
diff --git a/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/ProcessingStageTest.java b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/ProcessingStageTest.java
index ad02ca03c74..efbe16da668 100644
--- a/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/ProcessingStageTest.java
+++ b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/ProcessingStageTest.java
@@ -16,7 +16,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hyperledger.besu.metrics.noop.NoOpMetricsSystem.NO_OP_COUNTER;
-import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -24,13 +24,13 @@
 
 import java.util.Locale;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class ProcessingStageTest {
 
   private final Pipe<String> inputPipe =
@@ -40,10 +40,11 @@ public class ProcessingStageTest {
   @Mock private Processor<String, String> singleStep;
   private ProcessingStage<String, String> stage;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     stage = new ProcessingStage<>("name", inputPipe, outputPipe, singleStep);
-    doAnswer(
+    lenient()
+        .doAnswer(
             invocation -> {
               outputPipe.put(inputPipe.get().toLowerCase(Locale.UK));
               return 1;
diff --git a/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/SharedWritePipeTest.java b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/SharedWritePipeTest.java
index 1f6f414493a..5d99c1c0376 100644
--- a/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/SharedWritePipeTest.java
+++ b/services/pipeline/src/test/java/org/hyperledger/besu/services/pipeline/SharedWritePipeTest.java
@@ -16,9 +16,9 @@
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SharedWritePipeTest {
 
@@ -33,7 +33,7 @@ public class SharedWritePipeTest {
   public void shouldOnlyCloseDelegatePipeWhenCloseCalledSpecifiedNumberOfTimes() {
     for (int i = 0; i < CLOSES_REQUIRED - 1; i++) {
       pipe.close();
-      verifyZeroInteractions(delegate);
+      verifyNoInteractions(delegate);
     }
 
     pipe.close();
diff --git a/services/pipeline/src/test/resources/log4j2.xml b/services/pipeline/src/test/resources/log4j2.xml
deleted file mode 100644
index ecb2fdc6b8a..00000000000
--- a/services/pipeline/src/test/resources/log4j2.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN">
-    <Properties>
-        <Property name="root.log.level">INFO</Property>
-    </Properties>
-
-    <Appenders>
-        <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSSZZZ} | %t | %-5level | %c{1} | %msg%n" />    </Console>
-    </Appenders>
-    <Loggers>
-        <Root level="${sys:root.log.level}">
-            <AppenderRef ref="Console" />
-        </Root>
-    </Loggers>
-</Configuration>
diff --git a/services/tasks/build.gradle b/services/tasks/build.gradle
index 57c9ab0d7e9..66784412dc8 100644
--- a/services/tasks/build.gradle
+++ b/services/tasks/build.gradle
@@ -30,6 +30,7 @@ jar {
 dependencies {
   api project(':plugin-api')
   api project(':util')
+  api 'org.slf4j:slf4j-api'
 
   compileOnly 'org.openjdk.jmh:jmh-generator-annprocess'
 
@@ -37,11 +38,8 @@ dependencies {
 
   implementation 'com.google.guava:guava'
   implementation 'io.vertx:vertx-core'
-  implementation 'org.apache.logging.log4j:log4j-api'
-  implementation 'org.apache.tuweni:bytes'
+  implementation 'org.apache.tuweni:tuweni-bytes'
 
-  runtimeOnly 'org.apache.logging.log4j:log4j-core'
-
-  testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
 }
diff --git a/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/CachingTaskCollection.java b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/CachingTaskCollection.java
index 64833873e36..586ab62a2ae 100644
--- a/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/CachingTaskCollection.java
+++ b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/CachingTaskCollection.java
@@ -20,9 +20,16 @@
 import java.util.Queue;
 import java.util.Set;
 
+/**
+ * The Caching task collection.
+ *
+ * @param <T> the type parameter
+ */
 public class CachingTaskCollection<T> implements TaskCollection<T> {
 
+  /** The constant DEFAULT_CACHE_SIZE. */
   public static final int DEFAULT_CACHE_SIZE = 1_000_000;
+
   private final int maxCacheSize;
 
   // The underlying collection
@@ -36,11 +43,22 @@ public class CachingTaskCollection<T> implements TaskCollection<T> {
 
   private boolean closed = false;
 
+  /**
+   * Instantiates a new Caching task collection.
+   *
+   * @param collection the collection
+   * @param maxCacheSize the max cache size
+   */
   public CachingTaskCollection(final TaskCollection<T> collection, final int maxCacheSize) {
     this.wrappedCollection = collection;
     this.maxCacheSize = maxCacheSize;
   }
 
+  /**
+   * Instantiates a new Caching task collection.
+   *
+   * @param collection the collection
+   */
   public CachingTaskCollection(final TaskCollection<T> collection) {
     this(collection, DEFAULT_CACHE_SIZE);
   }
@@ -83,6 +101,11 @@ public synchronized long size() {
     return wrappedCollection.size() + cache.size();
   }
 
+  /**
+   * Cache size.
+   *
+   * @return the cache size
+   */
   public synchronized int cacheSize() {
     return outstandingTasks.size() + cache.size();
   }
@@ -92,7 +115,9 @@ public synchronized boolean isEmpty() {
     return size() == 0;
   }
 
-  /** @return True if all tasks have been removed and processed. */
+  /**
+   * @return True if all tasks have been removed and processed.
+   */
   @Override
   public synchronized boolean allTasksCompleted() {
     return cacheSize() == 0 && wrappedCollection.allTasksCompleted();
diff --git a/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/FlatFileTaskCollection.java b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/FlatFileTaskCollection.java
deleted file mode 100644
index 4b644606d8e..00000000000
--- a/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/FlatFileTaskCollection.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.services.tasks;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.FileChannel;
-import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Function;
-
-import com.google.common.annotations.VisibleForTesting;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-
-public class FlatFileTaskCollection<T> implements TaskCollection<T> {
-  private static final Logger LOG = LogManager.getLogger();
-  private static final long DEFAULT_FILE_ROLL_SIZE_BYTES = 1024 * 1024 * 10; // 10Mb
-  static final String FILENAME_PREFIX = "tasks";
-  private final Set<FlatFileTask<T>> outstandingTasks = new HashSet<>();
-
-  private final Path storageDirectory;
-  private final Function<T, Bytes> serializer;
-  private final Function<Bytes, T> deserializer;
-  private final long rollWhenFileSizeExceedsBytes;
-
-  private final ByteBuffer lengthBuffer = ByteBuffer.allocate(Integer.BYTES);
-
-  private FileChannel readFileChannel;
-  private FileChannel writeFileChannel;
-
-  private long size = 0;
-  private int readFileNumber = 0;
-  private int writeFileNumber = 0;
-
-  public FlatFileTaskCollection(
-      final Path storageDirectory,
-      final Function<T, Bytes> serializer,
-      final Function<Bytes, T> deserializer) {
-    this(storageDirectory, serializer, deserializer, DEFAULT_FILE_ROLL_SIZE_BYTES);
-  }
-
-  FlatFileTaskCollection(
-      final Path storageDirectory,
-      final Function<T, Bytes> serializer,
-      final Function<Bytes, T> deserializer,
-      final long rollWhenFileSizeExceedsBytes) {
-    this.storageDirectory = storageDirectory;
-    this.serializer = serializer;
-    this.deserializer = deserializer;
-    this.rollWhenFileSizeExceedsBytes = rollWhenFileSizeExceedsBytes;
-    writeFileChannel = openWriteFileChannel(writeFileNumber);
-    readFileChannel = openReadFileChannel(readFileNumber);
-  }
-
-  private FileChannel openReadFileChannel(final int fileNumber) {
-    try {
-      return FileChannel.open(
-          pathForFileNumber(fileNumber),
-          StandardOpenOption.DELETE_ON_CLOSE,
-          StandardOpenOption.READ);
-    } catch (final IOException e) {
-      throw new StorageException(e);
-    }
-  }
-
-  private FileChannel openWriteFileChannel(final int fileNumber) {
-    try {
-      return FileChannel.open(
-          pathForFileNumber(fileNumber),
-          StandardOpenOption.TRUNCATE_EXISTING,
-          StandardOpenOption.WRITE,
-          StandardOpenOption.CREATE);
-    } catch (final IOException e) {
-      throw new StorageException(e);
-    }
-  }
-
-  @Override
-  public synchronized void add(final T taskData) {
-    final Bytes data = serializer.apply(taskData);
-    try {
-      writeTaskData(data);
-      size++;
-      if (writeFileChannel.size() > rollWhenFileSizeExceedsBytes) {
-        LOG.debug("Writing reached end of file {}", writeFileNumber);
-        writeFileChannel.close();
-        writeFileNumber++;
-        writeFileChannel = openWriteFileChannel(writeFileNumber);
-      }
-    } catch (final IOException e) {
-      throw new StorageException(e);
-    }
-  }
-
-  @Override
-  public synchronized Task<T> remove() {
-    if (isEmpty()) {
-      return null;
-    }
-    try {
-      final ByteBuffer dataBuffer = readNextTaskData();
-      final T data = deserializer.apply(Bytes.wrapByteBuffer(dataBuffer));
-      final FlatFileTask<T> task = new FlatFileTask<>(this, data);
-      outstandingTasks.add(task);
-      size--;
-      return task;
-    } catch (final IOException e) {
-      throw new StorageException(e);
-    }
-  }
-
-  private ByteBuffer readNextTaskData() throws IOException {
-    final int dataLength = readDataLength();
-    final ByteBuffer dataBuffer = ByteBuffer.allocate(dataLength);
-    readBytes(dataBuffer, dataLength);
-    return dataBuffer;
-  }
-
-  private void writeTaskData(final Bytes data) throws IOException {
-    final long offset = writeFileChannel.size();
-    writeDataLength(data.size(), offset);
-    writeFileChannel.write(ByteBuffer.wrap(data.toArrayUnsafe()), offset + Integer.BYTES);
-  }
-
-  private int readDataLength() throws IOException {
-    lengthBuffer.position(0);
-    lengthBuffer.limit(Integer.BYTES);
-    readBytes(lengthBuffer, Integer.BYTES);
-    return lengthBuffer.getInt(0);
-  }
-
-  private void writeDataLength(final int size, final long offset) throws IOException {
-    lengthBuffer.position(0);
-    lengthBuffer.putInt(size);
-    lengthBuffer.flip();
-    writeFileChannel.write(lengthBuffer, offset);
-  }
-
-  private void readBytes(final ByteBuffer buffer, final int expectedLength) throws IOException {
-    int readBytes = readFileChannel.read(buffer);
-
-    if (readBytes == -1 && writeFileNumber > readFileNumber) {
-      LOG.debug("Reading reached end of file {}", readFileNumber);
-      readFileChannel.close();
-      readFileNumber++;
-      readFileChannel = openReadFileChannel(readFileNumber);
-
-      readBytes = readFileChannel.read(buffer);
-    }
-    if (readBytes != expectedLength) {
-      throw new IllegalStateException(
-          "Task queue corrupted. Expected to read "
-              + expectedLength
-              + " bytes but only got "
-              + readBytes);
-    }
-  }
-
-  @Override
-  public synchronized long size() {
-    return size;
-  }
-
-  @Override
-  public synchronized boolean isEmpty() {
-    return size() == 0;
-  }
-
-  @VisibleForTesting
-  int getReadFileNumber() {
-    return readFileNumber;
-  }
-
-  @VisibleForTesting
-  int getWriteFileNumber() {
-    return writeFileNumber;
-  }
-
-  @Override
-  public synchronized void clear() {
-    outstandingTasks.clear();
-    try {
-      readFileChannel.close();
-      writeFileChannel.close();
-      for (int i = readFileNumber; i <= writeFileNumber; i++) {
-        final File file = pathForFileNumber(i).toFile();
-        if (!file.delete() && file.exists()) {
-          LOG.error("Failed to delete tasks file {}", file.getAbsolutePath());
-        }
-      }
-      readFileNumber = 0;
-      writeFileNumber = 0;
-      writeFileChannel = openWriteFileChannel(writeFileNumber);
-      readFileChannel = openReadFileChannel(readFileNumber);
-      size = 0;
-    } catch (final IOException e) {
-      throw new StorageException(e);
-    }
-  }
-
-  @Override
-  public synchronized boolean allTasksCompleted() {
-    return isEmpty() && outstandingTasks.isEmpty();
-  }
-
-  @Override
-  public synchronized void close() {
-    try {
-      readFileChannel.close();
-      writeFileChannel.close();
-    } catch (final IOException e) {
-      throw new StorageException(e);
-    }
-  }
-
-  private Path pathForFileNumber(final int fileNumber) {
-    return storageDirectory.resolve(FILENAME_PREFIX + fileNumber);
-  }
-
-  private synchronized boolean markTaskCompleted(final FlatFileTask<T> task) {
-    return outstandingTasks.remove(task);
-  }
-
-  private synchronized void handleFailedTask(final FlatFileTask<T> task) {
-    if (markTaskCompleted(task)) {
-      add(task.getData());
-    }
-  }
-
-  public static class StorageException extends RuntimeException {
-    StorageException(final Throwable t) {
-      super(t);
-    }
-  }
-
-  private static class FlatFileTask<T> implements Task<T> {
-    private final AtomicBoolean completed = new AtomicBoolean(false);
-    private final FlatFileTaskCollection<T> parentQueue;
-    private final T data;
-
-    private FlatFileTask(final FlatFileTaskCollection<T> parentQueue, final T data) {
-      this.parentQueue = parentQueue;
-      this.data = data;
-    }
-
-    @Override
-    public T getData() {
-      return data;
-    }
-
-    @Override
-    public void markCompleted() {
-      if (completed.compareAndSet(false, true)) {
-        parentQueue.markTaskCompleted(this);
-      }
-    }
-
-    @Override
-    public void markFailed() {
-      if (completed.compareAndSet(false, true)) {
-        parentQueue.handleFailedTask(this);
-      }
-    }
-  }
-}
diff --git a/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/InMemoryTaskQueue.java b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/InMemoryTaskQueue.java
index f5db4c17356..0d743cac24e 100644
--- a/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/InMemoryTaskQueue.java
+++ b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/InMemoryTaskQueue.java
@@ -15,11 +15,18 @@
 package org.hyperledger.besu.services.tasks;
 
 import java.util.ArrayDeque;
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Queue;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+/**
+ * The InMemory task queue.
+ *
+ * @param <T> the type parameter
+ */
 public class InMemoryTaskQueue<T> implements TaskCollection<T> {
   private final Queue<T> internalQueue = new ArrayDeque<>();
   private final Set<InMemoryTask<T>> unfinishedOutstandingTasks = new HashSet<>();
@@ -63,6 +70,11 @@ public synchronized void clear() {
     internalQueue.clear();
   }
 
+  /** Clear internal queue. */
+  public void clearInternalQueue() {
+    internalQueue.clear();
+  }
+
   @Override
   public synchronized boolean allTasksCompleted() {
     assertNotClosed();
@@ -81,6 +93,15 @@ private void assertNotClosed() {
     }
   }
 
+  /**
+   * Return task queue as list.
+   *
+   * @return the list
+   */
+  public synchronized List<T> asList() {
+    return new ArrayList<>(internalQueue);
+  }
+
   private synchronized void handleFailedTask(final InMemoryTask<T> task) {
     if (markTaskCompleted(task)) {
       add(task.getData());
@@ -96,6 +117,12 @@ private static class InMemoryTask<T> implements Task<T> {
     private final InMemoryTaskQueue<T> queue;
     private final AtomicBoolean completed = new AtomicBoolean(false);
 
+    /**
+     * Instantiates a new InMemory task.
+     *
+     * @param queue the queue
+     * @param data the data
+     */
     public InMemoryTask(final InMemoryTaskQueue<T> queue, final T data) {
       this.queue = queue;
       this.data = data;
diff --git a/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/InMemoryTasksPriorityQueues.java b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/InMemoryTasksPriorityQueues.java
new file mode 100644
index 00000000000..026288ba8ac
--- /dev/null
+++ b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/InMemoryTasksPriorityQueues.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.services.tasks;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.PriorityQueue;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+import javax.annotation.Nonnull;
+
+/**
+ * The InMemory tasks priority queues.
+ *
+ * @param <T> the type parameter
+ */
+public class InMemoryTasksPriorityQueues<T extends TasksPriorityProvider>
+    implements TaskCollection<T> {
+  private final List<PriorityQueue<T>> internalQueues = new ArrayList<>(16);
+  private final Set<InMemoryTask<T>> unfinishedOutstandingTasks = new HashSet<>();
+  private final AtomicBoolean closed = new AtomicBoolean(false);
+
+  /** Instantiates a new InMemory tasks priority queues. */
+  public InMemoryTasksPriorityQueues() {
+    clearInternalQueues();
+  }
+
+  /** Clear internal queues. */
+  public synchronized void clearInternalQueues() {
+    internalQueues.clear();
+    for (int i = 0; i < 16; i++) {
+      internalQueues.add(newEmptyQueue());
+    }
+  }
+
+  @Nonnull
+  private PriorityQueue<T> newEmptyQueue() {
+    return new PriorityQueue<>(Comparator.comparingLong(TasksPriorityProvider::getPriority));
+  }
+
+  @Override
+  public synchronized void add(final T taskData) {
+    assertNotClosed();
+    var dequeue = findQueue(taskData.getDepth());
+    dequeue.add(taskData);
+  }
+
+  private PriorityQueue<T> findQueue(final int priority) {
+    while (priority + 1 > internalQueues.size()) {
+      internalQueues.add(newEmptyQueue());
+    }
+    return internalQueues.get(priority);
+  }
+
+  @Override
+  public synchronized Task<T> remove() {
+    assertNotClosed();
+    final Queue<T> lastNonEmptyQueue = findLastNonEmptyQueue();
+    if (lastNonEmptyQueue.isEmpty()) {
+      return null;
+    }
+    T data = lastNonEmptyQueue.remove();
+    InMemoryTask<T> task = new InMemoryTask<>(this, data);
+    unfinishedOutstandingTasks.add(task);
+    return task;
+  }
+
+  private Queue<T> findLastNonEmptyQueue() {
+    for (int i = internalQueues.size() - 1; i > 0; i--) {
+      final Queue<T> queue = internalQueues.get(i);
+      if (!queue.isEmpty()) {
+        return queue;
+      }
+    }
+    return internalQueues.get(0);
+  }
+
+  @Override
+  public synchronized long size() {
+    return internalQueues.stream().mapToInt(Queue::size).sum();
+  }
+
+  @Override
+  public synchronized boolean isEmpty() {
+    return findLastNonEmptyQueue().isEmpty();
+  }
+
+  @Override
+  public synchronized void clear() {
+    assertNotClosed();
+
+    unfinishedOutstandingTasks.clear();
+    clearInternalQueues();
+  }
+
+  @Override
+  public synchronized boolean allTasksCompleted() {
+    return isEmpty() && unfinishedOutstandingTasks.isEmpty();
+  }
+
+  @Override
+  public synchronized void close() {
+    if (closed.compareAndSet(false, true)) {
+      internalQueues.clear();
+      unfinishedOutstandingTasks.clear();
+    }
+  }
+
+  private void assertNotClosed() {
+    if (closed.get()) {
+      throw new IllegalStateException("Attempt to access closed " + getClass().getSimpleName());
+    }
+  }
+
+  private synchronized void handleFailedTask(final InMemoryTask<T> task) {
+    if (markTaskCompleted(task)) {
+      add(task.getData());
+    }
+  }
+
+  private synchronized boolean markTaskCompleted(final InMemoryTask<T> task) {
+    return unfinishedOutstandingTasks.remove(task);
+  }
+
+  /**
+   * Check if queue Contains the task .
+   *
+   * @param request the request
+   * @return the boolean
+   */
+  public synchronized boolean contains(final T request) {
+    final PriorityQueue<T> queue = findQueue(request.getDepth());
+    return queue.contains(request)
+        || unfinishedOutstandingTasks.stream()
+            .map(InMemoryTask::getData)
+            .anyMatch(data -> data.equals(request));
+  }
+
+  private static class InMemoryTask<T extends TasksPriorityProvider> implements Task<T> {
+    private final T data;
+    private final InMemoryTasksPriorityQueues<T> queue;
+    private final AtomicBoolean completed = new AtomicBoolean(false);
+
+    /**
+     * Instantiates a new InMemory task.
+     *
+     * @param queue the queue
+     * @param data the data
+     */
+    public InMemoryTask(final InMemoryTasksPriorityQueues<T> queue, final T data) {
+      this.queue = queue;
+      this.data = data;
+    }
+
+    @Override
+    public T getData() {
+      return data;
+    }
+
+    @Override
+    public void markCompleted() {
+      if (completed.compareAndSet(false, true)) {
+        queue.markTaskCompleted(this);
+      }
+    }
+
+    @Override
+    public void markFailed() {
+      if (completed.compareAndSet(false, true)) {
+        queue.handleFailedTask(this);
+      }
+    }
+  }
+}
diff --git a/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/Task.java b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/Task.java
index 8d6e44e7aea..3fdf435b4f0 100644
--- a/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/Task.java
+++ b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/Task.java
@@ -14,7 +14,17 @@
  */
 package org.hyperledger.besu.services.tasks;
 
+/**
+ * The interface Task.
+ *
+ * @param <T> the type parameter
+ */
 public interface Task<T> {
+  /**
+   * Gets data.
+   *
+   * @return the data
+   */
   T getData();
 
   /** Mark this task as completed. */
diff --git a/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/TaskCollection.java b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/TaskCollection.java
index 5e73c99a484..0eaf7a92589 100644
--- a/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/TaskCollection.java
+++ b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/TaskCollection.java
@@ -16,6 +16,11 @@
 
 import java.io.Closeable;
 
+/**
+ * The interface Task collection.
+ *
+ * @param <T> the type parameter
+ */
 public interface TaskCollection<T> extends Closeable {
   /**
    * Add some data that needs to be processed.
@@ -26,7 +31,7 @@ public interface TaskCollection<T> extends Closeable {
 
   /**
    * Get a task for processing. This task will be tracked as a pending task until either {@code
-   * Task.markCompleted} or {@code Task.requeue} is called.
+   * Task.markCompleted}* or {@code Task.requeue} is called.
    *
    * @return The task to be processed.
    */
diff --git a/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/TasksPriorityProvider.java b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/TasksPriorityProvider.java
new file mode 100644
index 00000000000..95153058a93
--- /dev/null
+++ b/services/tasks/src/main/java/org/hyperledger/besu/services/tasks/TasksPriorityProvider.java
@@ -0,0 +1,35 @@
+/*
+ *
+ *  * Copyright Hyperledger Besu Contributors.
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ *  * the License. You may obtain a copy of the License at
+ *  *
+ *  * http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ *  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ *  * specific language governing permissions and limitations under the License.
+ *  *
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package org.hyperledger.besu.services.tasks;
+
+/** The interface Tasks priority provider. */
+public interface TasksPriorityProvider {
+  /**
+   * Gets priority.
+   *
+   * @return the priority
+   */
+  long getPriority();
+
+  /**
+   * Gets depth.
+   *
+   * @return the depth
+   */
+  int getDepth();
+}
diff --git a/services/tasks/src/main/resources/log4j2.xml b/services/tasks/src/main/resources/log4j2.xml
deleted file mode 100644
index 5ee96740d7c..00000000000
--- a/services/tasks/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN" monitorInterval="30">
-  <Properties>
-    <Property name="root.log.level">INFO</Property>
-  </Properties>
-  <Appenders>
-    <Console name="Console" target="SYSTEM_OUT">
-      <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSSZZZ} [%t] %-5level %c{1.} %msg%n" />
-    </Console>
-  </Appenders>
-  <Loggers>
-    <Root level="${sys:root.log.level}">
-      <AppenderRef ref="Console" />
-    </Root>
-  </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/services/tasks/src/test/java/org/hyperledger/besu/services/tasks/AbstractTaskQueueTest.java b/services/tasks/src/test/java/org/hyperledger/besu/services/tasks/AbstractTaskQueueTest.java
index ec7f02d802e..d4c6e30fc62 100644
--- a/services/tasks/src/test/java/org/hyperledger/besu/services/tasks/AbstractTaskQueueTest.java
+++ b/services/tasks/src/test/java/org/hyperledger/besu/services/tasks/AbstractTaskQueueTest.java
@@ -23,7 +23,7 @@
 import java.util.function.Function;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 abstract class AbstractTaskQueueTest<T extends TaskCollection<Bytes>> {
 
diff --git a/services/tasks/src/test/java/org/hyperledger/besu/services/tasks/CachingTaskCollectionTest.java b/services/tasks/src/test/java/org/hyperledger/besu/services/tasks/CachingTaskCollectionTest.java
index 12fe88acc73..c88e994cebb 100644
--- a/services/tasks/src/test/java/org/hyperledger/besu/services/tasks/CachingTaskCollectionTest.java
+++ b/services/tasks/src/test/java/org/hyperledger/besu/services/tasks/CachingTaskCollectionTest.java
@@ -23,13 +23,13 @@
 import java.util.stream.Collectors;
 
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class CachingTaskCollectionTest {
   private TaskCollection<Bytes> wrappedTaskCollection;
 
-  @Before
+  @BeforeEach
   public void setup() {
     wrappedTaskCollection = new InMemoryTaskQueue<>();
   }
diff --git a/services/tasks/src/test/java/org/hyperledger/besu/services/tasks/FlatFileTaskCollectionTest.java b/services/tasks/src/test/java/org/hyperledger/besu/services/tasks/FlatFileTaskCollectionTest.java
deleted file mode 100644
index 0f9479065cf..00000000000
--- a/services/tasks/src/test/java/org/hyperledger/besu/services/tasks/FlatFileTaskCollectionTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.besu.services.tasks;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Function;
-
-import org.apache.tuweni.bytes.Bytes;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
-public class FlatFileTaskCollectionTest
-    extends AbstractTaskQueueTest<FlatFileTaskCollection<Bytes>> {
-
-  private static final int ROLL_SIZE = 10;
-  @Rule public final TemporaryFolder folder = new TemporaryFolder();
-
-  @Override
-  protected FlatFileTaskCollection<Bytes> createQueue() throws IOException {
-    final Path dataDir = folder.newFolder().toPath();
-    return createQueue(dataDir);
-  }
-
-  private FlatFileTaskCollection<Bytes> createQueue(final Path dataDir) {
-    return new FlatFileTaskCollection<>(
-        dataDir, Function.identity(), Function.identity(), ROLL_SIZE);
-  }
-
-  @Test
-  public void shouldRollFilesWhenSizeExceeded() throws Exception {
-    final Path dataDir = folder.newFolder().toPath();
-    try (final FlatFileTaskCollection<Bytes> queue = createQueue(dataDir)) {
-      final List<Bytes> tasks = new ArrayList<>();
-
-      addItem(queue, tasks, 0);
-      assertThat(queue.getWriteFileNumber()).isEqualTo(0);
-      int tasksInFirstFile = 1;
-      while (queue.getWriteFileNumber() == 0) {
-        addItem(queue, tasks, tasksInFirstFile);
-        tasksInFirstFile++;
-      }
-
-      assertThat(queue.getWriteFileNumber()).isGreaterThan(0);
-      assertThat(queue.getReadFileNumber()).isEqualTo(0);
-
-      // Add extra items to be sure we have at least one in a later file
-      addItem(queue, tasks, 123);
-      addItem(queue, tasks, 124);
-
-      final List<Bytes> removedTasks = new ArrayList<>();
-      // Read through all the items in the first file.
-      for (int i = 0; i < tasksInFirstFile; i++) {
-        removedTasks.add(queue.remove().getData());
-      }
-
-      // read one more to make sure we are reading from the next file
-      removedTasks.add(queue.remove().getData());
-      assertThat(queue.getReadFileNumber()).isEqualTo(1);
-
-      // Check that all tasks were read correctly.
-      removedTasks.add(queue.remove().getData());
-      assertThat(queue.isEmpty()).isTrue();
-      assertThat(removedTasks).isEqualTo(tasks);
-    }
-  }
-
-  private void addItem(
-      final FlatFileTaskCollection<Bytes> queue, final List<Bytes> tasks, final int value) {
-    tasks.add(Bytes.of(value));
-    queue.add(Bytes.of(value));
-  }
-}
diff --git a/services/tasks/src/test/java/org/hyperledger/besu/services/tasks/InMemoryTasksPriorityQueuesTest.java b/services/tasks/src/test/java/org/hyperledger/besu/services/tasks/InMemoryTasksPriorityQueuesTest.java
new file mode 100644
index 00000000000..4817160d308
--- /dev/null
+++ b/services/tasks/src/test/java/org/hyperledger/besu/services/tasks/InMemoryTasksPriorityQueuesTest.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.services.tasks;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import org.junit.jupiter.api.Test;
+
+public class InMemoryTasksPriorityQueuesTest {
+
+  @Test
+  public void shouldBePossibleToAddElementsAndRetrieveThemInPriorityOrder() {
+    InMemoryTasksPriorityQueues<Item> queue = new InMemoryTasksPriorityQueues<>();
+
+    queue.add(item(1, 1));
+    queue.add(item(2, 30));
+    queue.add(item(2, 10));
+    queue.add(item(5, 1));
+    queue.add(item(99, Integer.MAX_VALUE));
+    queue.add(item(1, 20));
+
+    List<Item> items = new ArrayList<>();
+    while (!queue.isEmpty()) {
+      items.add(queue.remove().getData());
+    }
+
+    assertThat(items)
+        .containsExactly(
+            item(99, Integer.MAX_VALUE),
+            item(5, 1),
+            item(2, 10),
+            item(2, 30),
+            item(1, 1),
+            item(1, 20));
+  }
+
+  @Test
+  public void shouldNotInsertItemsToClosedQueue() {
+    InMemoryTasksPriorityQueues<Item> queue = new InMemoryTasksPriorityQueues<>();
+
+    queue.add(item(1, 1));
+
+    queue.close();
+
+    final Item item = item(2, 2);
+    assertThatThrownBy(() -> queue.add(item)).isInstanceOf(IllegalStateException.class);
+  }
+
+  @Test
+  public void shouldContainTaskUntilFinished() {
+    InMemoryTasksPriorityQueues<Item> queue = new InMemoryTasksPriorityQueues<>();
+    queue.add(item(1, 1));
+
+    final Item item = item(2, 3);
+    queue.add(item);
+
+    assertThat(queue.contains(item)).isTrue();
+
+    final Task<Item> removed = queue.remove();
+    assertThat(removed.getData()).isEqualTo(item);
+
+    assertThat(queue.contains(item)).isTrue();
+
+    removed.markCompleted();
+
+    assertThat(queue.contains(item)).isFalse();
+  }
+
+  @Test
+  public void shouldPutFailedItemBackIntoQueue() {
+    InMemoryTasksPriorityQueues<Item> queue = new InMemoryTasksPriorityQueues<>();
+    queue.add(item(1, 1));
+
+    final Item item = item(2, 3);
+    queue.add(item);
+
+    assertThat(queue.contains(item)).isTrue();
+
+    Task<Item> removed = queue.remove();
+    assertThat(removed.getData()).isEqualTo(item);
+
+    assertThat(queue.contains(item)).isTrue();
+
+    removed.markFailed();
+
+    assertThat(queue.contains(item)).isTrue();
+
+    removed = queue.remove();
+    assertThat(removed.getData()).isEqualTo(item);
+  }
+
+  @Test
+  public void shouldNotPutFailedItemBackIntoIfItWasCompletedAlreadyQueue() {
+    InMemoryTasksPriorityQueues<Item> queue = new InMemoryTasksPriorityQueues<>();
+    queue.add(item(1, 1));
+
+    final Item item = item(2, 3);
+    queue.add(item);
+
+    assertThat(queue.contains(item)).isTrue();
+
+    Task<Item> removed = queue.remove();
+    assertThat(removed.getData()).isEqualTo(item);
+
+    assertThat(queue.contains(item)).isTrue();
+
+    removed.markCompleted();
+    assertThat(queue.contains(item)).isFalse();
+
+    removed.markFailed();
+    assertThat(queue.contains(item)).isFalse();
+
+    removed = queue.remove();
+    assertThat(removed.getData()).isNotEqualTo(item);
+  }
+
+  private Item item(final int depth, final int priority) {
+    return new Item(depth, priority);
+  }
+
+  static class Item implements TasksPriorityProvider {
+    private final int depth;
+    private final long priority;
+
+    public Item(final int depth, final long priority) {
+      this.depth = depth;
+      this.priority = priority;
+    }
+
+    @Override
+    public long getPriority() {
+      return priority;
+    }
+
+    @Override
+    public int getDepth() {
+      return depth;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+      if (this == o) return true;
+      if (o == null || getClass() != o.getClass()) return false;
+      final Item item = (Item) o;
+      return depth == item.depth && priority == item.priority;
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(depth, priority);
+    }
+
+    @Override
+    public String toString() {
+      return "Item{" + "depth=" + depth + ", priority=" + priority + '}';
+    }
+  }
+}
diff --git a/settings.gradle b/settings.gradle
index e7ef062bd9d..4d954498edd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,7 +13,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+
+pluginManagement {
+  repositories {
+    /*
+     *  Temporary repository to host the improved version of the
+     *  com.github.hierynomus.license plugin. Can be removed when an
+     *  official version with the fix is release upstream
+     */
+    maven {
+      url = uri('https://raw.githubusercontent.com/ConsenSys/license-gradle-plugin-fix-artifacts/main/')
+      content {
+        includeGroup('com.github.hierynomus.license')
+        includeGroup('com.hierynomus.gradle.plugins')
+      }
+    }
+    gradlePluginPortal()
+  }
+}
+
 rootProject.name='besu'
+include 'acceptance-tests:test-plugins'
 include 'acceptance-tests:dsl'
 include 'acceptance-tests:tests'
 include 'besu'
@@ -21,9 +41,14 @@ include 'config'
 include 'consensus:clique'
 include 'consensus:common'
 include 'consensus:ibft'
-include 'consensus:ibftlegacy'
-include 'crypto'
+include 'consensus:merge'
+include 'consensus:qbft'
+include 'datatypes'
+include 'crypto:algorithms'
+include 'crypto:services'
+include 'datatypes'
 include 'enclave'
+include 'evm'
 include 'errorprone-checks'
 include 'ethereum:api'
 include 'ethereum:blockcreation'
@@ -39,9 +64,12 @@ include 'ethereum:rlp'
 include 'ethereum:stratum'
 include 'ethereum:ethstats'
 include 'ethereum:trie'
+include 'ethereum:verkletrie'
+include 'evm'
 include 'metrics:core'
 include 'metrics:rocksdb'
 include 'nat'
+include 'pki'
 include 'plugin-api'
 include 'plugins:rocksdb'
 include 'privacy-contracts'
diff --git a/testutil/build.gradle b/testutil/build.gradle
index 7e9fdee282d..f235bb054f0 100644
--- a/testutil/build.gradle
+++ b/testutil/build.gradle
@@ -32,14 +32,17 @@ dependencies {
   implementation project(':util')
 
   implementation 'com.fasterxml.jackson.core:jackson-databind'
+  implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8'
   implementation 'com.google.guava:guava'
   implementation 'com.squareup.okhttp3:okhttp'
-  implementation 'junit:junit'
-  implementation 'net.consensys:orion'
-  implementation 'org.apache.tuweni:bytes'
-  implementation 'org.apache.tuweni:io'
-  implementation 'org.apache.tuweni:toml'
+  implementation 'io.vertx:vertx-core'
+  implementation 'org.junit.jupiter:junit-jupiter'
+  implementation 'org.apache.tuweni:tuweni-bytes'
+  implementation 'org.apache.tuweni:tuweni-io'
+  implementation 'org.apache.tuweni:tuweni-toml'
   implementation 'org.assertj:assertj-core'
   implementation 'org.mockito:mockito-core'
   implementation 'org.web3j:core'
+
+  implementation 'org.testcontainers:testcontainers'
 }
diff --git a/testutil/src/main/java/org/hyperledger/besu/kvstore/AbstractKeyValueStorageTest.java b/testutil/src/main/java/org/hyperledger/besu/kvstore/AbstractKeyValueStorageTest.java
index c2668156e79..60a66336765 100644
--- a/testutil/src/main/java/org/hyperledger/besu/kvstore/AbstractKeyValueStorageTest.java
+++ b/testutil/src/main/java/org/hyperledger/besu/kvstore/AbstractKeyValueStorageTest.java
@@ -21,6 +21,7 @@
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
 import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
 
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -30,15 +31,29 @@
 import java.util.function.Function;
 import java.util.stream.Stream;
 
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.tuweni.bytes.Bytes;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
-@Ignore
+/** The Abstract key value storage test. */
+@Disabled
 public abstract class AbstractKeyValueStorageTest {
 
+  /**
+   * Create store key value storage.
+   *
+   * @return the key value storage
+   * @throws Exception the exception
+   */
   protected abstract KeyValueStorage createStore() throws Exception;
 
+  /**
+   * Two stores are independent.
+   *
+   * @throws Exception the exception
+   */
   @Test
   public void twoStoresAreIndependent() throws Exception {
     final KeyValueStorage store1 = createStore();
@@ -55,6 +70,11 @@ public void twoStoresAreIndependent() throws Exception {
     assertThat(result).isEmpty();
   }
 
+  /**
+   * Put.
+   *
+   * @throws Exception the exception
+   */
   @Test
   public void put() throws Exception {
     final KeyValueStorage store = createStore();
@@ -73,6 +93,11 @@ public void put() throws Exception {
     assertThat(store.get(key)).contains(secondValue);
   }
 
+  /**
+   * Stream keys.
+   *
+   * @throws Exception the exception
+   */
   @Test
   public void streamKeys() throws Exception {
     final KeyValueStorage store = createStore();
@@ -83,10 +108,15 @@ public void streamKeys() throws Exception {
             .collect(toUnmodifiableList());
     keys.forEach(key -> tx.put(key, bytesFromHexString("0ABC")));
     tx.commit();
-    assertThat(store.streamKeys().collect(toUnmodifiableSet()))
+    assertThat(store.stream().map(Pair::getKey).collect(toUnmodifiableSet()))
         .containsExactlyInAnyOrder(keys.toArray(new byte[][] {}));
   }
 
+  /**
+   * Gets all keys that.
+   *
+   * @throws Exception the exception
+   */
   @Test
   public void getAllKeysThat() throws Exception {
     final KeyValueStorage store = createStore();
@@ -103,6 +133,11 @@ public void getAllKeysThat() throws Exception {
             bytesFromHexString("10"), bytesFromHexString("11"), bytesFromHexString("12"));
   }
 
+  /**
+   * Contains key.
+   *
+   * @throws Exception the exception
+   */
   @Test
   public void containsKey() throws Exception {
     final KeyValueStorage store = createStore();
@@ -118,6 +153,11 @@ public void containsKey() throws Exception {
     assertThat(store.containsKey(key)).isTrue();
   }
 
+  /**
+   * Remove existing.
+   *
+   * @throws Exception the exception
+   */
   @Test
   public void removeExisting() throws Exception {
     final KeyValueStorage store = createStore();
@@ -134,6 +174,11 @@ public void removeExisting() throws Exception {
     assertThat(store.get(key)).isEmpty();
   }
 
+  /**
+   * Remove existing same transaction.
+   *
+   * @throws Exception the exception
+   */
   @Test
   public void removeExistingSameTransaction() throws Exception {
     final KeyValueStorage store = createStore();
@@ -147,6 +192,11 @@ public void removeExistingSameTransaction() throws Exception {
     assertThat(store.get(key)).isEmpty();
   }
 
+  /**
+   * Remove non existent.
+   *
+   * @throws Exception the exception
+   */
   @Test
   public void removeNonExistent() throws Exception {
     final KeyValueStorage store = createStore();
@@ -158,6 +208,11 @@ public void removeNonExistent() throws Exception {
     assertThat(store.get(key)).isEmpty();
   }
 
+  /**
+   * Concurrent update.
+   *
+   * @throws Exception the exception
+   */
   @Test
   public void concurrentUpdate() throws Exception {
     final int keyCount = 1000;
@@ -196,6 +251,11 @@ public void concurrentUpdate() throws Exception {
     store.close();
   }
 
+  /**
+   * Transaction commit.
+   *
+   * @throws Exception the exception
+   */
   @Test
   public void transactionCommit() throws Exception {
     final KeyValueStorage store = createStore();
@@ -228,6 +288,11 @@ public void transactionCommit() throws Exception {
     assertThat(store.get(bytesOf(4))).contains(bytesOf(8));
   }
 
+  /**
+   * Transaction rollback.
+   *
+   * @throws Exception the exception
+   */
   @Test
   public void transactionRollback() throws Exception {
     final KeyValueStorage store = createStore();
@@ -260,6 +325,11 @@ public void transactionRollback() throws Exception {
     assertThat(store.get(bytesOf(4))).isEmpty();
   }
 
+  /**
+   * Transaction commit empty.
+   *
+   * @throws Exception the exception
+   */
   @Test
   public void transactionCommitEmpty() throws Exception {
     final KeyValueStorage store = createStore();
@@ -267,6 +337,11 @@ public void transactionCommitEmpty() throws Exception {
     tx.commit();
   }
 
+  /**
+   * Transaction rollback empty.
+   *
+   * @throws Exception the exception
+   */
   @Test
   public void transactionRollbackEmpty() throws Exception {
     final KeyValueStorage store = createStore();
@@ -274,70 +349,147 @@ public void transactionRollbackEmpty() throws Exception {
     tx.rollback();
   }
 
-  @Test(expected = IllegalStateException.class)
+  /**
+   * Transaction put after commit.
+   *
+   * @throws Exception the exception
+   */
+  @Test
   public void transactionPutAfterCommit() throws Exception {
-    final KeyValueStorage store = createStore();
-    final KeyValueStorageTransaction tx = store.startTransaction();
-    tx.commit();
-    tx.put(bytesOf(1), bytesOf(1));
+    Assertions.assertThatThrownBy(
+            () -> {
+              final KeyValueStorage store = createStore();
+              final KeyValueStorageTransaction tx = store.startTransaction();
+              tx.commit();
+              tx.put(bytesOf(1), bytesOf(1));
+            })
+        .isInstanceOf(IllegalStateException.class);
   }
 
-  @Test(expected = IllegalStateException.class)
+  /**
+   * Transaction remove after commit.
+   *
+   * @throws Exception the exception
+   */
+  @Test
   public void transactionRemoveAfterCommit() throws Exception {
-    final KeyValueStorage store = createStore();
-    final KeyValueStorageTransaction tx = store.startTransaction();
-    tx.commit();
-    tx.remove(bytesOf(1));
+    Assertions.assertThatThrownBy(
+            () -> {
+              final KeyValueStorage store = createStore();
+              final KeyValueStorageTransaction tx = store.startTransaction();
+              tx.commit();
+              tx.remove(bytesOf(1));
+            })
+        .isInstanceOf(IllegalStateException.class);
   }
 
-  @Test(expected = IllegalStateException.class)
+  /**
+   * Transaction put after rollback.
+   *
+   * @throws Exception the exception
+   */
+  @Test
   public void transactionPutAfterRollback() throws Exception {
-    final KeyValueStorage store = createStore();
-    final KeyValueStorageTransaction tx = store.startTransaction();
-    tx.rollback();
-    tx.put(bytesOf(1), bytesOf(1));
+    Assertions.assertThatThrownBy(
+            () -> {
+              final KeyValueStorage store = createStore();
+              final KeyValueStorageTransaction tx = store.startTransaction();
+              tx.rollback();
+              tx.put(bytesOf(1), bytesOf(1));
+            })
+        .isInstanceOf(IllegalStateException.class);
   }
 
-  @Test(expected = IllegalStateException.class)
+  /**
+   * Transaction remove after rollback.
+   *
+   * @throws Exception the exception
+   */
+  @Test
   public void transactionRemoveAfterRollback() throws Exception {
-    final KeyValueStorage store = createStore();
-    final KeyValueStorageTransaction tx = store.startTransaction();
-    tx.rollback();
-    tx.remove(bytesOf(1));
+    Assertions.assertThatThrownBy(
+            () -> {
+              final KeyValueStorage store = createStore();
+              final KeyValueStorageTransaction tx = store.startTransaction();
+              tx.rollback();
+              tx.remove(bytesOf(1));
+            })
+        .isInstanceOf(IllegalStateException.class);
   }
 
-  @Test(expected = IllegalStateException.class)
+  /**
+   * Transaction commit after rollback.
+   *
+   * @throws Exception the exception
+   */
+  @Test
   public void transactionCommitAfterRollback() throws Exception {
-    final KeyValueStorage store = createStore();
-    final KeyValueStorageTransaction tx = store.startTransaction();
-    tx.rollback();
-    tx.commit();
+    Assertions.assertThatThrownBy(
+            () -> {
+              final KeyValueStorage store = createStore();
+              final KeyValueStorageTransaction tx = store.startTransaction();
+              tx.rollback();
+              tx.commit();
+            })
+        .isInstanceOf(IllegalStateException.class);
   }
 
-  @Test(expected = IllegalStateException.class)
+  /**
+   * Transaction commit twice.
+   *
+   * @throws Exception the exception
+   */
+  @Test
   public void transactionCommitTwice() throws Exception {
-    final KeyValueStorage store = createStore();
-    final KeyValueStorageTransaction tx = store.startTransaction();
-    tx.commit();
-    tx.commit();
+    Assertions.assertThatThrownBy(
+            () -> {
+              final KeyValueStorage store = createStore();
+              final KeyValueStorageTransaction tx = store.startTransaction();
+              tx.commit();
+              tx.commit();
+            })
+        .isInstanceOf(IllegalStateException.class);
   }
 
-  @Test(expected = IllegalStateException.class)
+  /**
+   * Transaction rollback after commit.
+   *
+   * @throws Exception the exception
+   */
+  @Test
   public void transactionRollbackAfterCommit() throws Exception {
-    final KeyValueStorage store = createStore();
-    final KeyValueStorageTransaction tx = store.startTransaction();
-    tx.commit();
-    tx.rollback();
+    Assertions.assertThatThrownBy(
+            () -> {
+              final KeyValueStorage store = createStore();
+              final KeyValueStorageTransaction tx = store.startTransaction();
+              tx.commit();
+              tx.rollback();
+            })
+        .isInstanceOf(IllegalStateException.class);
   }
 
-  @Test(expected = IllegalStateException.class)
+  /**
+   * Transaction rollback twice.
+   *
+   * @throws Exception the exception
+   */
+  @Test
   public void transactionRollbackTwice() throws Exception {
-    final KeyValueStorage store = createStore();
-    final KeyValueStorageTransaction tx = store.startTransaction();
-    tx.rollback();
-    tx.rollback();
+    Assertions.assertThatThrownBy(
+            () -> {
+              final KeyValueStorage store = createStore();
+              final KeyValueStorageTransaction tx = store.startTransaction();
+              tx.rollback();
+              tx.rollback();
+            })
+        .isInstanceOf(IllegalStateException.class);
   }
 
+  /**
+   * Two transactions.
+   *
+   * @throws Exception the exception
+   */
   @Test
   public void twoTransactions() throws Exception {
     final KeyValueStorage store = createStore();
@@ -355,6 +507,11 @@ public void twoTransactions() throws Exception {
     assertThat(store.get(bytesOf(2))).contains(bytesOf(2));
   }
 
+  /**
+   * Transaction isolation.
+   *
+   * @throws Exception the exception
+   */
   @Test
   public void transactionIsolation() throws Exception {
     final int keyCount = 1000;
@@ -402,6 +559,12 @@ public void transactionIsolation() throws Exception {
     store.close();
   }
 
+  /**
+   * Bytes from hex string byte [ ].
+   *
+   * @param hex the hex
+   * @return the byte [ ]
+   */
   /*
    * Used to mimic the wrapping with Bytes performed in Besu
    */
@@ -409,7 +572,24 @@ protected byte[] bytesFromHexString(final String hex) {
     return Bytes.fromHexString(hex).toArrayUnsafe();
   }
 
+  /**
+   * Bytes of byte [ ].
+   *
+   * @param bytes the bytes
+   * @return the byte [ ]
+   */
   protected byte[] bytesOf(final int... bytes) {
     return Bytes.of(bytes).toArrayUnsafe();
   }
+
+  /**
+   * Create a sub folder from the given path, that will not conflict with other folders.
+   *
+   * @param folder the folder in which to create the sub folder
+   * @return the path representing the sub folder
+   * @throws Exception if the folder cannot be created
+   */
+  protected Path getTempSubFolder(final Path folder) throws Exception {
+    return java.nio.file.Files.createTempDirectory(folder, null);
+  }
 }
diff --git a/testutil/src/main/java/org/hyperledger/besu/testutil/BlockTestUtil.java b/testutil/src/main/java/org/hyperledger/besu/testutil/BlockTestUtil.java
index d75b728717a..d2909a84f3b 100644
--- a/testutil/src/main/java/org/hyperledger/besu/testutil/BlockTestUtil.java
+++ b/testutil/src/main/java/org/hyperledger/besu/testutil/BlockTestUtil.java
@@ -29,10 +29,19 @@
 import com.google.common.base.Suppliers;
 import com.google.common.io.Resources;
 
+/** The Block test util. */
 public final class BlockTestUtil {
 
+  private BlockTestUtil() {
+    throw new RuntimeException("Utility Class");
+  }
+
   private static final Supplier<ChainResources> testChainSupplier =
       Suppliers.memoize(BlockTestUtil::supplyTestChainResources);
+  private static final Supplier<ChainResources> hiveTestChainSupplier =
+      Suppliers.memoize(BlockTestUtil::supplyHiveTestChainResources);
+  private static final Supplier<ChainResources> testChainLondonSupplier =
+      Suppliers.memoize(BlockTestUtil::supplyTestChainLondonResources);
   private static final Supplier<ChainResources> mainnetChainSupplier =
       Suppliers.memoize(BlockTestUtil::supplyMainnetChainResources);
   private static final Supplier<ChainResources> badPowChainSupplier =
@@ -41,19 +50,77 @@ public final class BlockTestUtil {
       Suppliers.memoize(BlockTestUtil::supplyOutdatedForkResources);
   private static final Supplier<ChainResources> forkUpgradedSupplier =
       Suppliers.memoize(BlockTestUtil::supplyUpgradedForkResources);
+  private static final Supplier<ChainResources> testRpcCompactChainSupplier =
+      Suppliers.memoize(BlockTestUtil::supplyTestRpcCompactResources);
 
+  /**
+   * Gets test blockchain url.
+   *
+   * @return the test blockchain url
+   */
   public static URL getTestBlockchainUrl() {
     return getTestChainResources().getBlocksURL();
   }
 
+  /**
+   * Gets test london blockchain url.
+   *
+   * @return the test london blockchain url
+   */
+  public static URL getTestLondonBlockchainUrl() {
+    return getTestChainLondonResources().getBlocksURL();
+  }
+
+  /**
+   * Gets test genesis url.
+   *
+   * @return the test genesis url
+   */
   public static URL getTestGenesisUrl() {
     return getTestChainResources().getGenesisURL();
   }
 
+  /**
+   * Gets test london genesis url.
+   *
+   * @return the test london genesis url
+   */
+  public static URL getTestLondonGenesisUrl() {
+    return getTestChainLondonResources().getGenesisURL();
+  }
+
+  /**
+   * Gets test chain resources.
+   *
+   * @return the test chain resources
+   */
   public static ChainResources getTestChainResources() {
     return testChainSupplier.get();
   }
 
+  /**
+   * Gets test chain resources for hive tests.
+   *
+   * @return the test chain resources
+   */
+  public static ChainResources getHiveTestChainResources() {
+    return hiveTestChainSupplier.get();
+  }
+
+  /**
+   * Gets test chain london resources.
+   *
+   * @return the test chain london resources
+   */
+  public static ChainResources getTestChainLondonResources() {
+    return testChainLondonSupplier.get();
+  }
+
+  /**
+   * Gets mainnet resources.
+   *
+   * @return the mainnet resources
+   */
   public static ChainResources getMainnetResources() {
     return mainnetChainSupplier.get();
   }
@@ -62,13 +129,31 @@ private static ChainResources getBadPowResources() {
     return badPowChainSupplier.get();
   }
 
+  /**
+   * Gets outdated fork resources.
+   *
+   * @return the outdated fork resources
+   */
   public static ChainResources getOutdatedForkResources() {
     return forkOutdatedSupplier.get();
   }
 
+  /**
+   * Gets upgraded fork resources.
+   *
+   * @return the upgraded fork resources
+   */
   public static ChainResources getUpgradedForkResources() {
     return forkUpgradedSupplier.get();
   }
+  /**
+   * Gets Eth Ref Test resources.
+   *
+   * @return the Eth Ref Test resources.
+   */
+  public static ChainResources getEthRefTestResources() {
+    return testRpcCompactChainSupplier.get();
+  }
 
   private static ChainResources supplyTestChainResources() {
     final URL genesisURL =
@@ -78,6 +163,29 @@ private static ChainResources supplyTestChainResources() {
     return new ChainResources(genesisURL, blocksURL);
   }
 
+  private static ChainResources supplyHiveTestChainResources() {
+    final URL genesisURL =
+        ensureFileUrl(BlockTestUtil.class.getClassLoader().getResource("hive/testGenesis.json"));
+    final URL blocksURL =
+        ensureFileUrl(
+            BlockTestUtil.class.getClassLoader().getResource("hive/testBlockchain.blocks"));
+    return new ChainResources(genesisURL, blocksURL);
+  }
+
+  private static ChainResources supplyTestChainLondonResources() {
+    final URL genesisURL =
+        ensureFileUrl(
+            BlockTestUtil.class
+                .getClassLoader()
+                .getResource("fork-london-data/testLondonGenesis.json"));
+    final URL blocksURL =
+        ensureFileUrl(
+            BlockTestUtil.class
+                .getClassLoader()
+                .getResource("fork-london-data/testLondonBlockchain.blocks"));
+    return new ChainResources(genesisURL, blocksURL);
+  }
+
   private static ChainResources supplyMainnetChainResources() {
     final URL genesisURL =
         ensureFileUrl(
@@ -125,6 +233,20 @@ private static ChainResources supplyUpgradedForkResources() {
     return new ChainResources(genesisURL, blocksURL);
   }
 
+  private static ChainResources supplyTestRpcCompactResources() {
+    final URL genesisURL =
+        ensureFileUrl(
+            BlockTestUtil.class
+                .getClassLoader()
+                .getResource("test-eth-ref-rpc-compact/genesis.json"));
+    final URL blocksURL =
+        ensureFileUrl(
+            BlockTestUtil.class
+                .getClassLoader()
+                .getResource("test-eth-ref-rpc-compact/chain.blocks"));
+    return new ChainResources(genesisURL, blocksURL);
+  }
+
   /** Take a resource URL and if needed copy it to a temp file and return that URL. */
   private static URL ensureFileUrl(final URL resource) {
     Preconditions.checkNotNull(resource);
@@ -177,19 +299,36 @@ public static void writeBadPowBlocks(final Path target) {
     }
   }
 
+  /** The Chain resources. */
   public static class ChainResources {
     private final URL genesisURL;
     private final URL blocksURL;
 
+    /**
+     * Instantiates a new Chain resources.
+     *
+     * @param genesisURL the genesis url
+     * @param blocksURL the blocks url
+     */
     public ChainResources(final URL genesisURL, final URL blocksURL) {
       this.genesisURL = genesisURL;
       this.blocksURL = blocksURL;
     }
 
+    /**
+     * Gets genesis url.
+     *
+     * @return the genesis url
+     */
     public URL getGenesisURL() {
       return genesisURL;
     }
 
+    /**
+     * Gets blocks url.
+     *
+     * @return the blocks url
+     */
     public URL getBlocksURL() {
       return blocksURL;
     }
diff --git a/testutil/src/main/java/org/hyperledger/besu/testutil/JsonTestParameters.java b/testutil/src/main/java/org/hyperledger/besu/testutil/JsonTestParameters.java
index 42a2dc7893f..f4fc7c49a36 100644
--- a/testutil/src/main/java/org/hyperledger/besu/testutil/JsonTestParameters.java
+++ b/testutil/src/main/java/org/hyperledger/besu/testutil/JsonTestParameters.java
@@ -39,15 +39,24 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 
 /**
  * Utility class for generating JUnit test parameters from json files. Each set of test parameters
  * will contain a String name followed by an object representing a deserialized json test case.
+ *
+ * @param <S> the type parameter
+ * @param <T> the type parameter
  */
 public class JsonTestParameters<S, T> {
 
   private static final String TEST_PATTERN_STR = System.getProperty("test.ethereum.include");
 
+  /**
+   * The Collector.
+   *
+   * @param <S> the type parameter
+   */
   public static class Collector<S> {
 
     @Nullable private final Predicate<String> includes;
@@ -63,8 +72,18 @@ private Collector(@Nullable final Predicate<String> includes, final Predicate<St
     // memory when we run a single test, but it's not the case we're trying to optimize.
     private final List<Object[]> testParameters = new ArrayList<>(256);
 
-    public void add(final String name, final S value, final boolean runTest) {
-      testParameters.add(new Object[] {name, value, runTest && includes(name)});
+    /**
+     * Add.
+     *
+     * @param name the name
+     * @param fullPath the full path of the test
+     * @param value the value
+     * @param runTest the run test
+     */
+    public void add(
+        final String name, final String fullPath, final S value, final boolean runTest) {
+      testParameters.add(
+          new Object[] {name, value, runTest && includes(name) && includes(fullPath)});
     }
 
     private boolean includes(final String name) {
@@ -82,12 +101,27 @@ private Collection<Object[]> getParameters() {
     }
   }
 
+  /**
+   * The interface Generator.
+   *
+   * @param <S> the type parameter
+   * @param <T> the type parameter
+   */
   @FunctionalInterface
   public interface Generator<S, T> {
-    void generate(String name, S mappedType, Collector<T> collector);
+    /**
+     * Generate.
+     *
+     * @param name the name
+     * @param fullPath the full path of the test
+     * @param mappedType the mapped type
+     * @param collector the collector
+     */
+    void generate(String name, String fullPath, S mappedType, Collector<T> collector);
   }
 
-  private static final ObjectMapper objectMapper = new ObjectMapper();
+  private static final ObjectMapper objectMapper =
+      new ObjectMapper().registerModule(new Jdk8Module());
 
   // The type to which the json file is directly mapped
   private final Class<S> jsonFileMappedType;
@@ -113,16 +147,39 @@ private JsonTestParameters(final Class<S> jsonFileMappedType, final Class<T> tes
     }
   }
 
+  /**
+   * Create json test parameters.
+   *
+   * @param <T> the type parameter
+   * @param testCaseSpec the test case spec
+   * @return the json test parameters
+   */
   public static <T> JsonTestParameters<T, T> create(final Class<T> testCaseSpec) {
     return new JsonTestParameters<>(testCaseSpec, testCaseSpec)
-        .generator((name, testCase, collector) -> collector.add(name, testCase, true));
+        .generator(
+            (name, fullPath, testCase, collector) -> collector.add(name, fullPath, testCase, true));
   }
 
+  /**
+   * Create json test parameters.
+   *
+   * @param <S> the type parameter
+   * @param <T> the type parameter
+   * @param jsonFileMappedType the json file mapped type
+   * @param testCaseSpec the test case spec
+   * @return the json test parameters
+   */
   public static <S, T> JsonTestParameters<S, T> create(
       final Class<S> jsonFileMappedType, final Class<T> testCaseSpec) {
     return new JsonTestParameters<>(jsonFileMappedType, testCaseSpec);
   }
 
+  /**
+   * Exclude files json test parameters.
+   *
+   * @param filenames the filenames
+   * @return the json test parameters
+   */
   @SuppressWarnings("unused")
   public JsonTestParameters<S, T> excludeFiles(final String... filenames) {
     fileExcludes.addAll(Arrays.asList(filenames));
@@ -141,24 +198,39 @@ private void includeTests(final String... patterns) {
     addPatterns(patterns, testIncludes);
   }
 
+  /**
+   * Ignore json test parameters.
+   *
+   * @param patterns the patterns
+   * @return the json test parameters
+   */
   public JsonTestParameters<S, T> ignore(final String... patterns) {
     addPatterns(patterns, testIgnores);
     return this;
   }
 
+  /** Ignore all. */
   public void ignoreAll() {
     testIgnores.add(t -> true);
   }
 
+  /**
+   * Generator json test parameters.
+   *
+   * @param generator the generator
+   * @return the json test parameters
+   */
   public JsonTestParameters<S, T> generator(final Generator<S, T> generator) {
     this.generator = generator;
     return this;
   }
 
-  public Collection<Object[]> generate(final String path) {
-    return generate(new String[] {path});
-  }
-
+  /**
+   * Generate collection.
+   *
+   * @param paths the paths
+   * @return the collection
+   */
   public Collection<Object[]> generate(final String... paths) {
     return generate(getFilteredFiles(paths));
   }
@@ -176,7 +248,7 @@ private Collection<Object[]> generate(final Collection<File> filteredFiles) {
       for (final Map.Entry<String, S> entry : testCase.testCaseSpecs.entrySet()) {
         final String testName = entry.getKey();
         final S mappedType = entry.getValue();
-        generator.generate(testName, mappedType, collector);
+        generator.generate(testName, file.getPath(), mappedType, collector);
       }
     }
     return collector.getParameters();
@@ -231,6 +303,7 @@ private JsonTestCaseReader<S> parseFile(final File file) {
 
   private static class JsonTestCaseReader<T> {
 
+    /** The Test case specs. */
     final Map<String, T> testCaseSpecs;
 
     /**
diff --git a/testutil/src/main/java/org/hyperledger/besu/testutil/MockExecutorService.java b/testutil/src/main/java/org/hyperledger/besu/testutil/MockExecutorService.java
index d734d1ad10f..a84d9b57879 100644
--- a/testutil/src/main/java/org/hyperledger/besu/testutil/MockExecutorService.java
+++ b/testutil/src/main/java/org/hyperledger/besu/testutil/MockExecutorService.java
@@ -29,30 +29,52 @@
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 
+/** The Mock executor service. */
 public class MockExecutorService implements ExecutorService {
 
   private boolean autoRun = true;
 
   private final List<ExecutorTask<?>> tasks = new ArrayList<>();
 
+  /**
+   * Gets futures.
+   *
+   * @return the futures
+   */
   // Test utility for inspecting executor's futures
   public List<Future<?>> getFutures() {
     return tasks.stream().map(ExecutorTask::getFuture).collect(Collectors.toList());
   }
 
+  /**
+   * Sets auto run.
+   *
+   * @param shouldAutoRunTasks the should auto run tasks
+   */
   public void setAutoRun(final boolean shouldAutoRunTasks) {
     this.autoRun = shouldAutoRunTasks;
   }
 
+  /** Run pending futures. */
   public void runPendingFutures() {
     final List<ExecutorTask<?>> currentTasks = new ArrayList<>(tasks);
     currentTasks.forEach(ExecutorTask::run);
   }
 
+  /**
+   * Gets pending futures count.
+   *
+   * @return the pending futures count
+   */
   public long getPendingFuturesCount() {
     return tasks.stream().filter(ExecutorTask::isPending).count();
   }
 
+  /**
+   * Run pending futures in separate threads.
+   *
+   * @param executorService the executor service
+   */
   public void runPendingFuturesInSeparateThreads(final ExecutorService executorService) {
     final List<ExecutorTask<?>> currentTasks = new ArrayList<>(tasks);
     currentTasks.forEach(task -> executorService.execute(task::run));
@@ -152,6 +174,7 @@ private ExecutorTask(final Callable<T> taskRunner) {
       this.taskRunner = taskRunner;
     }
 
+    /** Run. */
     public void run() {
       if (!isPending) {
         return;
@@ -166,10 +189,20 @@ public void run() {
       }
     }
 
+    /**
+     * Gets future.
+     *
+     * @return the future
+     */
     public CompletableFuture<T> getFuture() {
       return future;
     }
 
+    /**
+     * Is pending.
+     *
+     * @return the boolean
+     */
     public boolean isPending() {
       return isPending;
     }
diff --git a/testutil/src/main/java/org/hyperledger/besu/testutil/TestClock.java b/testutil/src/main/java/org/hyperledger/besu/testutil/TestClock.java
index 806d9274ec6..b538fedc31a 100644
--- a/testutil/src/main/java/org/hyperledger/besu/testutil/TestClock.java
+++ b/testutil/src/main/java/org/hyperledger/besu/testutil/TestClock.java
@@ -20,13 +20,31 @@
 import java.time.ZoneOffset;
 import java.time.temporal.TemporalUnit;
 
+/** The Test clock. */
 public class TestClock extends Clock {
+  /**
+   * Fixed clock.
+   *
+   * @return the clock
+   */
   public static Clock fixed() {
     return Clock.fixed(Instant.ofEpochSecond(10_000_000), ZoneId.systemDefault());
   }
 
   private Instant now = Instant.ofEpochSecond(24982948294L);
 
+  /** Instantiates a new Test clock. */
+  public TestClock() {}
+
+  /**
+   * Instantiates a new Test clock.
+   *
+   * @param now the now
+   */
+  public TestClock(final Instant now) {
+    this.now = now;
+  }
+
   @Override
   public ZoneId getZone() {
     return ZoneOffset.UTC;
@@ -42,10 +60,21 @@ public Instant instant() {
     return now;
   }
 
+  /**
+   * Step millis.
+   *
+   * @param millis the millis
+   */
   public void stepMillis(final long millis) {
     now = now.plusMillis(millis);
   }
 
+  /**
+   * Step.
+   *
+   * @param a the amount to add
+   * @param unit the temporal unit
+   */
   public void step(final long a, final TemporalUnit unit) {
     now = now.plus(a, unit);
   }
diff --git a/testutil/src/main/java/org/hyperledger/enclave/testutil/EnclaveConfiguration.java b/testutil/src/main/java/org/hyperledger/enclave/testutil/EnclaveConfiguration.java
new file mode 100644
index 00000000000..4ec56129a94
--- /dev/null
+++ b/testutil/src/main/java/org/hyperledger/enclave/testutil/EnclaveConfiguration.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.enclave.testutil;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+/** The Enclave configuration. */
+public class EnclaveConfiguration {
+
+  private final Path[] publicKeys;
+  private final Path[] privateKeys;
+  private final EnclaveEncryptorType enclaveEncryptorType;
+  private final Path tempDir;
+  private final List<String> otherNodes = new ArrayList<>();
+  private final boolean clearKnownNodes;
+  private final String storage;
+  private final String name;
+
+  /**
+   * Instantiates a new Enclave configuration.
+   *
+   * @param name the name
+   * @param publicKeys the public keys
+   * @param privateKeys the private keys
+   * @param enclaveEncryptorType the enclave encryptor type
+   * @param tempDir the temp dir
+   * @param otherNodes the other nodes
+   * @param clearKnownNodes the clear known nodes
+   * @param storage the storage
+   */
+  public EnclaveConfiguration(
+      final String name,
+      final Path[] publicKeys,
+      final Path[] privateKeys,
+      final EnclaveEncryptorType enclaveEncryptorType,
+      final Path tempDir,
+      final List<String> otherNodes,
+      final boolean clearKnownNodes,
+      final String storage) {
+
+    this.publicKeys = publicKeys;
+    this.privateKeys = privateKeys;
+    this.enclaveEncryptorType = enclaveEncryptorType;
+    this.tempDir = tempDir;
+    this.otherNodes.addAll(otherNodes);
+    this.clearKnownNodes = clearKnownNodes;
+    this.storage = storage;
+    this.name = name;
+  }
+
+  /**
+   * Get public keys.
+   *
+   * @return the path [ ]
+   */
+  public Path[] getPublicKeys() {
+    return publicKeys;
+  }
+
+  /**
+   * Get private keys.
+   *
+   * @return the path [ ]
+   */
+  public Path[] getPrivateKeys() {
+    return privateKeys;
+  }
+
+  /**
+   * Gets temp dir.
+   *
+   * @return the temp dir
+   */
+  public Path getTempDir() {
+    return tempDir;
+  }
+
+  /**
+   * Gets other nodes.
+   *
+   * @return the other nodes
+   */
+  public List<String> getOtherNodes() {
+    return otherNodes;
+  }
+
+  /**
+   * Add other node.
+   *
+   * @param otherNode the other node
+   */
+  public void addOtherNode(final String otherNode) {
+    otherNodes.add(otherNode);
+  }
+
+  /**
+   * Is clear known nodes boolean.
+   *
+   * @return the boolean
+   */
+  public boolean isClearKnownNodes() {
+    return clearKnownNodes;
+  }
+
+  /**
+   * Gets storage.
+   *
+   * @return the storage
+   */
+  public String getStorage() {
+    return storage;
+  }
+
+  /**
+   * Gets name.
+   *
+   * @return the name
+   */
+  public String getName() {
+    return name;
+  }
+
+  /**
+   * Gets enclave encryptor type.
+   *
+   * @return the enclave encryptor type
+   */
+  public EnclaveEncryptorType getEnclaveEncryptorType() {
+    return enclaveEncryptorType;
+  }
+}
diff --git a/testutil/src/main/java/org/hyperledger/enclave/testutil/EnclaveEncryptorType.java b/testutil/src/main/java/org/hyperledger/enclave/testutil/EnclaveEncryptorType.java
new file mode 100644
index 00000000000..c63d202b6de
--- /dev/null
+++ b/testutil/src/main/java/org/hyperledger/enclave/testutil/EnclaveEncryptorType.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.enclave.testutil;
+
+/** The enum Enclave encryptor type. */
+public enum EnclaveEncryptorType {
+  /** Nacl enclave encryptor type. */
+  NACL,
+  /** Ec enclave encryptor type. */
+  EC,
+  /** Noop enclave encryptor type. */
+  NOOP;
+
+  /**
+   * To tessera encryptor config json string.
+   *
+   * @return the string
+   */
+  public String toTesseraEncryptorConfigJSON() {
+    switch (this) {
+      case NACL:
+        return "    \"encryptor\":{\n"
+            + "        \"type\":\"NACL\",\n"
+            + "        \"properties\":{\n"
+            + "        }\n"
+            + "    },\n";
+      case EC:
+        return "    \"encryptor\":{\n"
+            + "        \"type\":\"EC\",\n"
+            + "        \"properties\":{\n"
+            + "            \"symmetricCipher\": \"AES/GCM/NoPadding\",\n"
+            + "            \"ellipticCurve\": \"secp256r1\",\n"
+            + "            \"nonceLength\": \"24\",\n"
+            + "            \"sharedKeyLength\": \"32\"\n"
+            + "        }\n"
+            + "    },\n";
+      default:
+        return "";
+    }
+  }
+}
diff --git a/testutil/src/main/java/org/hyperledger/enclave/testutil/EnclaveKeyConfiguration.java b/testutil/src/main/java/org/hyperledger/enclave/testutil/EnclaveKeyConfiguration.java
new file mode 100644
index 00000000000..433b77ba03f
--- /dev/null
+++ b/testutil/src/main/java/org/hyperledger/enclave/testutil/EnclaveKeyConfiguration.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.enclave.testutil;
+
+/** The Enclave key configuration. */
+public class EnclaveKeyConfiguration {
+  private final String[] pubKeyPaths;
+  private final String[] privKeyPaths;
+  private EnclaveEncryptorType enclaveEncryptorType;
+
+  /**
+   * Instantiates a new Enclave key configuration.
+   *
+   * @param pubKeyPath the pub key path
+   * @param privKeyPath the priv key path
+   */
+  public EnclaveKeyConfiguration(final String pubKeyPath, final String privKeyPath) {
+    this.pubKeyPaths = new String[] {pubKeyPath};
+    this.privKeyPaths = new String[] {privKeyPath};
+  }
+
+  /**
+   * Instantiates a new Enclave key configuration.
+   *
+   * @param pubKeyPaths the pub key paths
+   * @param privKeyPaths the priv key paths
+   * @param enclaveEncryptorType the enclave encryptor type
+   */
+  public EnclaveKeyConfiguration(
+      final String[] pubKeyPaths,
+      final String[] privKeyPaths,
+      final EnclaveEncryptorType enclaveEncryptorType) {
+    this.pubKeyPaths = pubKeyPaths;
+    this.privKeyPaths = privKeyPaths;
+    this.enclaveEncryptorType = enclaveEncryptorType;
+  }
+
+  /**
+   * Get pub key paths.
+   *
+   * @return the string [ ]
+   */
+  public String[] getPubKeyPaths() {
+    return pubKeyPaths;
+  }
+
+  /**
+   * Get private key paths.
+   *
+   * @return the string [ ]
+   */
+  public String[] getPrivKeyPaths() {
+    return privKeyPaths;
+  }
+
+  /**
+   * Gets enclave encryptor type.
+   *
+   * @return the enclave encryptor type
+   */
+  public EnclaveEncryptorType getEnclaveEncryptorType() {
+    return enclaveEncryptorType;
+  }
+}
diff --git a/testutil/src/main/java/org/hyperledger/enclave/testutil/EnclaveKeyUtils.java b/testutil/src/main/java/org/hyperledger/enclave/testutil/EnclaveKeyUtils.java
new file mode 100644
index 00000000000..39b75abba10
--- /dev/null
+++ b/testutil/src/main/java/org/hyperledger/enclave/testutil/EnclaveKeyUtils.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.enclave.testutil;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.util.Base64;
+
+import org.apache.tuweni.bytes.Bytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** The Enclave key utils. */
+public class EnclaveKeyUtils {
+  private static final Logger LOG = LoggerFactory.getLogger(EnclaveKeyUtils.class);
+
+  /**
+   * Utility method to load the enclave public key. Possible input values are the names of the *.pub
+   * files in the resources folder.
+   *
+   * @param keyFileName the name of the file containing the enclave public key
+   * @return the enclave public key stored in that file
+   * @throws IOException throws if key not found
+   */
+  public static String loadKey(final String keyFileName) throws IOException {
+    InputStream is = EnclaveKeyUtils.class.getResourceAsStream("/" + keyFileName);
+    InputStreamReader streamReader = new InputStreamReader(is, StandardCharsets.UTF_8);
+    try (BufferedReader reader = new BufferedReader(streamReader)) {
+      return reader.readLine();
+    }
+  }
+
+  /**
+   * Generate key pair.
+   *
+   * @return the key pair
+   * @throws NoSuchAlgorithmException the no such algorithm exception
+   */
+  public static KeyPair generateKeys() throws NoSuchAlgorithmException {
+    final KeyPair keyPair = KeyPairGenerator.getInstance("Ed25519").generateKeyPair();
+    final PublicKey pubKey = keyPair.getPublic();
+    final PrivateKey privKey = keyPair.getPrivate();
+
+    LOG.debug("pubkey      : " + pubKey);
+    LOG.debug("pubkey bytes: " + Bytes.wrap(pubKey.getEncoded()).toHexString());
+    LOG.debug("pubkey b64  : " + Base64.getEncoder().encodeToString(pubKey.getEncoded()));
+
+    LOG.debug("privkey      : " + privKey);
+    LOG.debug("privkey bytes: " + Bytes.wrap(privKey.getEncoded()).toHexString());
+    LOG.debug("privkey b64  : " + Base64.getEncoder().encodeToString(privKey.getEncoded()));
+
+    return keyPair;
+  }
+}
diff --git a/testutil/src/main/java/org/hyperledger/enclave/testutil/EnclaveTestHarness.java b/testutil/src/main/java/org/hyperledger/enclave/testutil/EnclaveTestHarness.java
new file mode 100644
index 00000000000..e40156c50e4
--- /dev/null
+++ b/testutil/src/main/java/org/hyperledger/enclave/testutil/EnclaveTestHarness.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.enclave.testutil;
+
+import java.net.URI;
+import java.nio.file.Path;
+import java.util.List;
+
+/** The interface Enclave test harness. */
+public interface EnclaveTestHarness {
+
+  /** Start. */
+  void start();
+
+  /** Stop. */
+  void stop();
+
+  /** Close. */
+  void close();
+
+  /**
+   * Gets public key paths.
+   *
+   * @return the public key paths
+   */
+  List<Path> getPublicKeyPaths();
+
+  /**
+   * Gets default public key.
+   *
+   * @return the default public key
+   */
+  String getDefaultPublicKey();
+
+  /**
+   * Gets public keys.
+   *
+   * @return the public keys
+   */
+  List<String> getPublicKeys();
+
+  /**
+   * Client url uri.
+   *
+   * @return the uri
+   */
+  URI clientUrl();
+
+  /**
+   * Node url uri.
+   *
+   * @return the uri
+   */
+  URI nodeUrl();
+
+  /**
+   * Add other node.
+   *
+   * @param otherNode the other node
+   */
+  void addOtherNode(final URI otherNode);
+
+  /**
+   * Gets enclave type.
+   *
+   * @return the enclave type
+   */
+  EnclaveType getEnclaveType();
+}
diff --git a/testutil/src/main/java/org/hyperledger/enclave/testutil/EnclaveType.java b/testutil/src/main/java/org/hyperledger/enclave/testutil/EnclaveType.java
new file mode 100644
index 00000000000..fbea4776d5b
--- /dev/null
+++ b/testutil/src/main/java/org/hyperledger/enclave/testutil/EnclaveType.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.enclave.testutil;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/** The enum Enclave type. */
+public enum EnclaveType {
+  /** Orion enclave type. */
+  ORION,
+  /** Tessera enclave type. */
+  TESSERA,
+  /** Noop enclave type. */
+  NOOP;
+
+  /**
+   * Values for tests list.
+   *
+   * @return the list
+   */
+  public static List<EnclaveType> valuesForTests() {
+    return Arrays.stream(values())
+        .filter(enclaveType -> enclaveType != NOOP)
+        .filter(enclaveType -> enclaveType != ORION)
+        .collect(Collectors.toList());
+  }
+}
diff --git a/testutil/src/main/java/org/hyperledger/enclave/testutil/NoopEnclaveTestHarness.java b/testutil/src/main/java/org/hyperledger/enclave/testutil/NoopEnclaveTestHarness.java
new file mode 100644
index 00000000000..caa909441dc
--- /dev/null
+++ b/testutil/src/main/java/org/hyperledger/enclave/testutil/NoopEnclaveTestHarness.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.enclave.testutil;
+
+import static com.google.common.io.Files.readLines;
+
+import java.io.IOException;
+import java.net.URI;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.google.common.base.Charsets;
+import org.apache.tuweni.io.file.Files;
+
+/** The Noop enclave test harness. */
+public class NoopEnclaveTestHarness implements EnclaveTestHarness {
+
+  private final Path tempDir;
+  private final EnclaveKeyConfiguration keyConfig;
+
+  /**
+   * Instantiates a new Noop enclave test harness.
+   *
+   * @param tempDir the temp dir
+   * @param keyConfig the key config
+   */
+  public NoopEnclaveTestHarness(final Path tempDir, final EnclaveKeyConfiguration keyConfig) {
+    this.tempDir = tempDir;
+    this.keyConfig = keyConfig;
+
+    try {
+      copyKeys(keyConfig.getPrivKeyPaths());
+      copyKeys(keyConfig.getPubKeyPaths());
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private void copyKeys(final String[] keys) throws IOException {
+    for (final String resource : keys) {
+      Files.copyResource(resource, tempDir.resolve(resource));
+    }
+  }
+
+  @Override
+  public void start() {}
+
+  @Override
+  public void stop() {}
+
+  @Override
+  public void close() {}
+
+  @Override
+  public List<Path> getPublicKeyPaths() {
+    return Arrays.stream(keyConfig.getPubKeyPaths())
+        .map(tempDir::resolve)
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  public String getDefaultPublicKey() {
+    return getPublicKeys().get(0);
+  }
+
+  @Override
+  public List<String> getPublicKeys() {
+    return Arrays.stream(keyConfig.getPubKeyPaths())
+        .map(
+            x -> {
+              try {
+                return readLines(Path.of(tempDir.toString(), x).toFile(), Charsets.UTF_8).get(0);
+              } catch (IOException e) {
+                return e.getMessage();
+              }
+            })
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  public URI clientUrl() {
+    return URI.create("http://noop:8080");
+  }
+
+  @Override
+  public URI nodeUrl() {
+    return URI.create("http://noop:8080");
+  }
+
+  @Override
+  public void addOtherNode(final URI otherNode) {}
+
+  @Override
+  public EnclaveType getEnclaveType() {
+    return EnclaveType.NOOP;
+  }
+}
diff --git a/testutil/src/main/java/org/hyperledger/enclave/testutil/TesseraTestHarness.java b/testutil/src/main/java/org/hyperledger/enclave/testutil/TesseraTestHarness.java
new file mode 100644
index 00000000000..b7e19126453
--- /dev/null
+++ b/testutil/src/main/java/org/hyperledger/enclave/testutil/TesseraTestHarness.java
@@ -0,0 +1,289 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.enclave.testutil;
+
+import static com.google.common.io.Files.readLines;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import com.google.common.base.Charsets;
+import io.vertx.core.json.JsonArray;
+import org.assertj.core.util.Files;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.Network;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.MountableFile;
+
+/** The Tessera test harness. */
+public class TesseraTestHarness implements EnclaveTestHarness {
+  private static final Logger LOG = LoggerFactory.getLogger(TesseraTestHarness.class);
+
+  private final EnclaveConfiguration enclaveConfiguration;
+
+  private boolean isRunning;
+  private URI nodeURI;
+  private URI q2TUri;
+  private URI thirdPartyUri;
+
+  /** The constant TESSERA_VERSION. */
+  public static final String TESSERA_VERSION = "22.10.0";
+
+  private final int thirdPartyPort = 9081;
+  private final int q2TPort = 9082;
+  /** The constant p2pPort. */
+  public static final int p2pPort = 9001;
+
+  private final String containerKeyDir = "/tmp/keys/";
+
+  @SuppressWarnings("rawtypes")
+  private GenericContainer tesseraContainer;
+
+  private final Optional<Network> containerNetwork;
+  private final String containerName;
+
+  /**
+   * Instantiates a new Tessera test harness.
+   *
+   * @param enclaveConfiguration the enclave configuration
+   * @param containerNetwork the container network
+   */
+  protected TesseraTestHarness(
+      final EnclaveConfiguration enclaveConfiguration, final Optional<Network> containerNetwork) {
+    this.enclaveConfiguration = enclaveConfiguration;
+    this.containerNetwork = containerNetwork;
+    this.containerName = enclaveConfiguration.getName();
+    Runtime.getRuntime().addShutdownHook(new Thread(this::stop));
+  }
+
+  @Override
+  public void start() {
+    if (!isRunning) {
+      final File tempFolder = Files.newTemporaryFolder();
+      LOG.info("Temporary directory: " + tempFolder.getAbsolutePath());
+      final String configFile = createConfigFile(enclaveConfiguration.getName());
+
+      tesseraContainer = buildTesseraContainer(configFile);
+      containerNetwork.ifPresent(network -> addNetwork(tesseraContainer, containerName, network));
+      tesseraContainer.start();
+      isRunning = true;
+
+      try {
+        final String host = "http://" + tesseraContainer.getHost();
+        nodeURI = new URI(host + ":" + tesseraContainer.getMappedPort(p2pPort));
+        LOG.info("Tessera node URI: {}", nodeURI);
+        q2TUri = new URI(host + ':' + tesseraContainer.getMappedPort(q2TPort));
+        LOG.info("Tessera client URI: {}", q2TUri);
+        thirdPartyUri = new URI(host + ':' + tesseraContainer.getMappedPort(thirdPartyPort));
+        LOG.info("Tessera thirdParty URI: {}", thirdPartyUri);
+      } catch (final URISyntaxException e) {
+        throw new RuntimeException(e);
+      }
+    }
+  }
+
+  @Override
+  public void stop() {
+    if (isRunning) {
+      tesseraContainer.stop();
+      isRunning = false;
+    }
+  }
+
+  @Override
+  public void close() {
+    stop();
+  }
+
+  @Override
+  public List<Path> getPublicKeyPaths() {
+    return Arrays.asList(enclaveConfiguration.getPublicKeys());
+  }
+
+  @Override
+  public String getDefaultPublicKey() {
+    return readFile(enclaveConfiguration.getPublicKeys()[0]);
+  }
+
+  @Override
+  public List<String> getPublicKeys() {
+    return Arrays.stream(enclaveConfiguration.getPublicKeys())
+        .map(TesseraTestHarness::readFile)
+        .collect(Collectors.toList());
+  }
+
+  private static String readFile(final Path path) {
+    try {
+      return readLines(path.toFile(), Charsets.UTF_8).get(0);
+    } catch (final IOException e) {
+      e.printStackTrace();
+      return "";
+    }
+  }
+
+  @Override
+  public URI clientUrl() {
+    return q2TUri;
+  }
+
+  @Override
+  public URI nodeUrl() {
+    return nodeURI;
+  }
+
+  @Override
+  public void addOtherNode(final URI otherNode) {
+    enclaveConfiguration.addOtherNode(otherNode.toString());
+  }
+
+  @Override
+  public EnclaveType getEnclaveType() {
+    return EnclaveType.TESSERA;
+  }
+
+  private String createConfigFile(final String nodeName) {
+    // create a config file
+
+    // @formatter:off
+    String confString =
+        "{\n"
+            + "    \"mode\" : \"orion\",\n"
+            + enclaveConfiguration.getEnclaveEncryptorType().toTesseraEncryptorConfigJSON()
+            + "    \"useWhiteList\": false,\n"
+            + "    \"jdbc\": {\n"
+            + "        \"username\": \"sa\",\n"
+            + "        \"password\": \"\",\n"
+            + "        \"url\": \"jdbc:h2:/tmp/db;MODE=Oracle;TRACE_LEVEL_SYSTEM_OUT=0\",\n"
+            + "        \"autoCreateTables\": true\n"
+            + "    },\n"
+            + "    \"serverConfigs\":[\n"
+            + "        {\n"
+            + "            \"app\":\"ThirdParty\",\n"
+            + "            \"enabled\": true,\n"
+            + "            \"serverAddress\": \"http://"
+            + nodeName
+            + ":"
+            + thirdPartyPort
+            + "\",\n"
+            + "            \"cors\" : {\n"
+            + "                \"allowedMethods\" : [\"GET\", \"OPTIONS\"],\n"
+            + "                \"allowedOrigins\" : [\"*\"]\n"
+            + "            },\n"
+            + "            \"communicationType\" : \"REST\"\n"
+            + "        },\n"
+            + "        {\n"
+            + "            \"app\":\"Q2T\",\n"
+            + "            \"enabled\": true,\n"
+            + "            \"serverAddress\":\"http://"
+            + nodeName
+            + ":"
+            + q2TPort
+            + "\",\n"
+            + "            \"communicationType\" : \"REST\"\n"
+            + "        },\n"
+            + "        {\n"
+            + "            \"app\":\"P2P\",\n"
+            + "            \"enabled\": true,\n"
+            + "            \"serverAddress\":\"http://"
+            + nodeName
+            + ":"
+            + p2pPort
+            + "\",\n"
+            + "            \"communicationType\" : \"REST\"\n"
+            + "        }\n"
+            + "    ],\n"
+            + "    \"keys\": {\n"
+            + "        \"passwords\": [],\n"
+            + "        \"keyData\": "
+            + buildKeyConfig()
+            + "\n"
+            + "    },\n"
+            + "    \"alwaysSendTo\": []";
+
+    if (enclaveConfiguration.getOtherNodes().size() != 0) {
+      confString +=
+          ",\n"
+              + "    \"peer\": [\n"
+              + "        {\n"
+              + "            \"url\": \""
+              + enclaveConfiguration.getOtherNodes().get(0)
+              + "\"\n"
+              + "        }\n"
+              + "    ]";
+    } else {
+      confString += ",\n" + "    \"peer\": []";
+    }
+
+    confString += "\n}";
+
+    final File configFile = Files.newTemporaryFile();
+    try {
+      final FileWriter fw = new FileWriter(configFile, StandardCharsets.UTF_8);
+      fw.write(confString);
+      fw.close();
+    } catch (final IOException e) {
+      throw new RuntimeException(e);
+    }
+
+    return configFile.getAbsolutePath();
+  }
+
+  private String buildKeyConfig() {
+    final JsonArray keyArray = new JsonArray();
+    final List<Path> pubKeysPaths = Arrays.asList(enclaveConfiguration.getPublicKeys());
+    final List<Path> privKeyPaths = Arrays.asList(enclaveConfiguration.getPrivateKeys());
+
+    for (int count = 0; count < pubKeysPaths.size(); count++) {
+      final HashMap<String, String> stringStringHashMap = new HashMap<>();
+      stringStringHashMap.put(
+          "publicKeyPath", containerKeyDir + pubKeysPaths.get(count).getFileName());
+      stringStringHashMap.put(
+          "privateKeyPath", containerKeyDir + privKeyPaths.get(count).getFileName());
+      keyArray.add(stringStringHashMap);
+    }
+
+    return keyArray.toString();
+  }
+
+  @SuppressWarnings("rawtypes")
+  private GenericContainer buildTesseraContainer(final String configFilePath) {
+    final String containerConfigFilePath = "/tmp/config.json";
+    final String keyDir = enclaveConfiguration.getTempDir().toString();
+    return new GenericContainer<>("quorumengineering/tessera:" + TESSERA_VERSION)
+        .withCopyFileToContainer(MountableFile.forHostPath(configFilePath), containerConfigFilePath)
+        .withFileSystemBind(keyDir, containerKeyDir)
+        .withCommand("--configfile " + containerConfigFilePath)
+        .withExposedPorts(p2pPort, q2TPort, thirdPartyPort)
+        .waitingFor(Wait.forHttp("/upcheck").withMethod("GET").forStatusCode(200));
+  }
+
+  @SuppressWarnings("rawtypes")
+  private void addNetwork(
+      final GenericContainer container, final String containerName, final Network network) {
+    container.withNetwork(network).withNetworkAliases(containerName);
+  }
+}
diff --git a/testutil/src/main/java/org/hyperledger/enclave/testutil/TesseraTestHarnessFactory.java b/testutil/src/main/java/org/hyperledger/enclave/testutil/TesseraTestHarnessFactory.java
new file mode 100644
index 00000000000..cf02a160288
--- /dev/null
+++ b/testutil/src/main/java/org/hyperledger/enclave/testutil/TesseraTestHarnessFactory.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.enclave.testutil;
+
+import static org.apache.tuweni.io.file.Files.copyResource;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import javax.annotation.Nonnull;
+
+import org.testcontainers.containers.Network;
+
+/** The Tessera test harness factory. */
+public class TesseraTestHarnessFactory {
+  private static final String storage = "memory";
+
+  /**
+   * Create tessera test harness.
+   *
+   * @param name the name
+   * @param tempDir the temp dir
+   * @param enclaveConfig the enclave config
+   * @param containerNetwork the container network
+   * @return the tessera test harness
+   */
+  public static TesseraTestHarness create(
+      final String name,
+      final Path tempDir,
+      final EnclaveKeyConfiguration enclaveConfig,
+      final Optional<Network> containerNetwork) {
+    return create(
+        name,
+        tempDir,
+        enclaveConfig.getPubKeyPaths(),
+        enclaveConfig.getPrivKeyPaths(),
+        enclaveConfig.getEnclaveEncryptorType(),
+        Collections.emptyList(),
+        containerNetwork);
+  }
+
+  /**
+   * Create tessera test harness.
+   *
+   * @param name the name
+   * @param tempDir the temp dir
+   * @param pubKeyPaths the pub key paths
+   * @param privKeyPaths the priv key paths
+   * @param enclaveEncryptorType the enclave encryptor type
+   * @param othernodes the othernodes
+   * @param containerNetwork the container network
+   * @return the tessera test harness
+   */
+  public static TesseraTestHarness create(
+      final String name,
+      final Path tempDir,
+      final String[] pubKeyPaths,
+      final String[] privKeyPaths,
+      final EnclaveEncryptorType enclaveEncryptorType,
+      final List<String> othernodes,
+      final Optional<Network> containerNetwork) {
+    final Path[] pubKeys = stringArrayToPathArray(tempDir, pubKeyPaths);
+    final Path[] privKeys = stringArrayToPathArray(tempDir, privKeyPaths);
+
+    return create(
+        name, tempDir, pubKeys, privKeys, enclaveEncryptorType, othernodes, containerNetwork);
+  }
+
+  /**
+   * Create tessera test harness.
+   *
+   * @param name the name
+   * @param tempDir the temp dir
+   * @param key1pubs the key 1 pubs
+   * @param key1keys the key 1 keys
+   * @param enclaveEncryptorType the enclave encryptor type
+   * @param othernodes the othernodes
+   * @param containerNetwork the container network
+   * @return the tessera test harness
+   */
+  public static TesseraTestHarness create(
+      final String name,
+      final Path tempDir,
+      final Path[] key1pubs,
+      final Path[] key1keys,
+      final EnclaveEncryptorType enclaveEncryptorType,
+      final List<String> othernodes,
+      final Optional<Network> containerNetwork) {
+    return new TesseraTestHarness(
+        new EnclaveConfiguration(
+            name, key1pubs, key1keys, enclaveEncryptorType, tempDir, othernodes, false, storage),
+        containerNetwork);
+  }
+
+  @Nonnull
+  private static Path[] stringArrayToPathArray(final Path tempDir, final String[] privKeyPaths) {
+    return Arrays.stream(privKeyPaths)
+        .map(
+            (pk) -> {
+              try {
+                return copyResource(pk, tempDir.resolve(pk));
+              } catch (final IOException e) {
+                throw new RuntimeException(e);
+              }
+            })
+        .toArray(Path[]::new);
+  }
+}
diff --git a/testutil/src/main/java/org/hyperledger/orion/testutil/OrionConfiguration.java b/testutil/src/main/java/org/hyperledger/orion/testutil/OrionConfiguration.java
deleted file mode 100644
index 86edb0900b3..00000000000
--- a/testutil/src/main/java/org/hyperledger/orion/testutil/OrionConfiguration.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.orion.testutil;
-
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-
-public class OrionConfiguration {
-
-  private final Path[] publicKeys;
-  private final Path[] privateKeys;
-  private final Path tempDir;
-  private final List<String> otherNodes = new ArrayList<>();
-  private final boolean clearKnownNodes;
-  private final String storage;
-
-  public OrionConfiguration(
-      final Path[] publicKeys,
-      final Path[] privateKeys,
-      final Path tempDir,
-      final List<String> otherNodes,
-      final boolean clearKnownNodes,
-      final String storage) {
-
-    this.publicKeys = publicKeys;
-    this.privateKeys = privateKeys;
-    this.tempDir = tempDir;
-    this.otherNodes.addAll(otherNodes);
-    this.clearKnownNodes = clearKnownNodes;
-    this.storage = storage;
-  }
-
-  public Path[] getPublicKeys() {
-    return publicKeys;
-  }
-
-  public Path[] getPrivateKeys() {
-    return privateKeys;
-  }
-
-  public Path getTempDir() {
-    return tempDir;
-  }
-
-  public List<String> getOtherNodes() {
-    return otherNodes;
-  }
-
-  public void addOtherNode(final String otherNode) {
-    otherNodes.add(otherNode);
-  }
-
-  public boolean isClearKnownNodes() {
-    return clearKnownNodes;
-  }
-
-  public String getStorage() {
-    return storage;
-  }
-}
diff --git a/testutil/src/main/java/org/hyperledger/orion/testutil/OrionKeyConfiguration.java b/testutil/src/main/java/org/hyperledger/orion/testutil/OrionKeyConfiguration.java
deleted file mode 100644
index 9b12756f081..00000000000
--- a/testutil/src/main/java/org/hyperledger/orion/testutil/OrionKeyConfiguration.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.orion.testutil;
-
-public class OrionKeyConfiguration {
-  private final String[] pubKeyPaths;
-  private final String[] privKeyPaths;
-
-  public OrionKeyConfiguration(final String pubKeyPath, final String privKeyPath) {
-    this.pubKeyPaths = new String[] {pubKeyPath};
-    this.privKeyPaths = new String[] {privKeyPath};
-  }
-
-  public OrionKeyConfiguration(final String[] pubKeyPaths, final String[] privKeyPaths) {
-    this.pubKeyPaths = pubKeyPaths;
-    this.privKeyPaths = privKeyPaths;
-  }
-
-  public String[] getPubKeyPaths() {
-    return pubKeyPaths;
-  }
-
-  public String[] getPrivKeyPaths() {
-    return privKeyPaths;
-  }
-}
diff --git a/testutil/src/main/java/org/hyperledger/orion/testutil/OrionKeyUtils.java b/testutil/src/main/java/org/hyperledger/orion/testutil/OrionKeyUtils.java
deleted file mode 100644
index ab010ec31e6..00000000000
--- a/testutil/src/main/java/org/hyperledger/orion/testutil/OrionKeyUtils.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.orion.testutil;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.util.Base64;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.tuweni.bytes.Bytes;
-
-public class OrionKeyUtils {
-  private static final Logger LOG = LogManager.getLogger();
-
-  /**
-   * Utility method to load the enclave public key. Possible input values are the names of the *.pub
-   * files in the resources folder.
-   *
-   * @param keyFileName the name of the file containing the enclave public key
-   * @return the enclave public key stored in that file
-   * @throws IOException throws if key not found
-   */
-  public static String loadKey(final String keyFileName) throws IOException {
-    InputStream is = OrionKeyUtils.class.getResourceAsStream("/" + keyFileName);
-    InputStreamReader streamReader = new InputStreamReader(is, StandardCharsets.UTF_8);
-    try (BufferedReader reader = new BufferedReader(streamReader)) {
-      return reader.readLine();
-    }
-  }
-
-  public static KeyPair generateKeys() throws NoSuchAlgorithmException {
-    final KeyPair keyPair = KeyPairGenerator.getInstance("Ed25519").generateKeyPair();
-    final PublicKey pubKey = keyPair.getPublic();
-    final PrivateKey privKey = keyPair.getPrivate();
-
-    LOG.debug("pubkey      : " + pubKey);
-    LOG.debug("pubkey bytes: " + Bytes.wrap(pubKey.getEncoded()).toHexString());
-    LOG.debug("pubkey b64  : " + Base64.getEncoder().encodeToString(pubKey.getEncoded()));
-
-    LOG.debug("privkey      : " + privKey);
-    LOG.debug("privkey bytes: " + Bytes.wrap(privKey.getEncoded()).toHexString());
-    LOG.debug("privkey b64  : " + Base64.getEncoder().encodeToString(privKey.getEncoded()));
-
-    return keyPair;
-  }
-}
diff --git a/testutil/src/main/java/org/hyperledger/orion/testutil/OrionTestHarness.java b/testutil/src/main/java/org/hyperledger/orion/testutil/OrionTestHarness.java
deleted file mode 100644
index 27e45f61815..00000000000
--- a/testutil/src/main/java/org/hyperledger/orion/testutil/OrionTestHarness.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.orion.testutil;
-
-import static com.google.common.io.Files.readLines;
-
-import java.io.IOException;
-import java.net.URI;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import com.google.common.base.Charsets;
-import com.google.common.io.MoreFiles;
-import com.google.common.io.RecursiveDeleteOption;
-import net.consensys.orion.cmd.Orion;
-import net.consensys.orion.config.Config;
-import okhttp3.HttpUrl;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-public class OrionTestHarness {
-  private static final Logger LOG = LogManager.getLogger();
-
-  private final Orion orion;
-  private final OrionConfiguration orionConfiguration;
-
-  private Config config;
-
-  private boolean isRunning;
-
-  protected static final String HOST = "127.0.0.1";
-
-  protected OrionTestHarness(final OrionConfiguration orionConfiguration) {
-    this.orionConfiguration = orionConfiguration;
-    this.orion = new Orion();
-  }
-
-  public Orion getOrion() {
-    return orion;
-  }
-
-  public void start() {
-    if (!isRunning) {
-      config = buildConfig();
-      orion.run(config, orionConfiguration.isClearKnownNodes());
-      isRunning = true;
-      LOG.info("Orion node port: {}", orion.nodePort());
-      LOG.info("Orion client port: {}", orion.clientPort());
-    }
-  }
-
-  public void stop() {
-    if (isRunning) {
-      orion.stop();
-      isRunning = false;
-    }
-  }
-
-  public void close() {
-    stop();
-    try {
-      MoreFiles.deleteRecursively(config.workDir(), RecursiveDeleteOption.ALLOW_INSECURE);
-    } catch (final IOException e) {
-      LOG.info("Failed to clean up temporary file: {}", config.workDir(), e);
-    }
-  }
-
-  public Config getConfig() {
-    return config;
-  }
-
-  public String getDefaultPublicKey() {
-    return config.publicKeys().stream().map(OrionTestHarness::readFile).findFirst().orElseThrow();
-  }
-
-  public List<String> getPublicKeys() {
-    return config.publicKeys().stream()
-        .map(OrionTestHarness::readFile)
-        .collect(Collectors.toList());
-  }
-
-  private static String readFile(final Path path) {
-    try {
-      return readLines(path.toFile(), Charsets.UTF_8).get(0);
-    } catch (final IOException e) {
-      e.printStackTrace();
-      return "";
-    }
-  }
-
-  public URI clientUrl() {
-    final HttpUrl httpUrl =
-        new HttpUrl.Builder().scheme("http").host(HOST).port(orion.clientPort()).build();
-
-    return URI.create(httpUrl.toString());
-  }
-
-  public URI nodeUrl() {
-    final HttpUrl httpUrl =
-        new HttpUrl.Builder().scheme("http").host(HOST).port(orion.nodePort()).build();
-
-    return URI.create(httpUrl.toString());
-  }
-
-  public void addOtherNode(final URI otherNode) {
-    orionConfiguration.addOtherNode(otherNode.toString());
-  }
-
-  private Config buildConfig() {
-    // @formatter:off
-    String confString =
-        "tls=\"off\"\n"
-            + "tlsservertrust=\"tofu\"\n"
-            + "tlsclienttrust=\"tofu\"\n"
-            + "nodeport=0\n"
-            + "nodenetworkinterface = \""
-            + HOST
-            + "\"\n"
-            + "clientport=0\n"
-            + "clientnetworkinterface = \""
-            + HOST
-            + "\"\n"
-            + "storage = \""
-            + orionConfiguration.getStorage()
-            + "\"\n"
-            + "publickeys = ["
-            + joinPathsAsTomlListEntry(orionConfiguration.getPublicKeys())
-            + "]\n"
-            + "privatekeys = ["
-            + joinPathsAsTomlListEntry(orionConfiguration.getPrivateKeys())
-            + "]\n"
-            + "workdir= \""
-            + orionConfiguration.getTempDir().toString()
-            + "\"\n";
-
-    if (orionConfiguration.getOtherNodes().size() != 0) {
-      confString +=
-          "othernodes = [" + joinStringsAsTomlListEntry(orionConfiguration.getOtherNodes()) + "]\n";
-    }
-
-    // @formatter:on
-    return Config.load(confString);
-  }
-
-  private static String joinPathsAsTomlListEntry(final Path... paths) {
-    return joinStringsAsTomlListEntry(
-        Arrays.stream(paths).map(p -> p.toAbsolutePath().toString()).collect(Collectors.toList()));
-  }
-
-  private static String joinStringsAsTomlListEntry(final List<String> strings) {
-    final StringBuilder builder = new StringBuilder();
-    boolean first = true;
-    for (final String string : strings) {
-      if (!first) {
-        builder.append(",");
-      }
-      first = false;
-      builder.append("\"").append(string).append("\"");
-    }
-    return builder.toString();
-  }
-}
diff --git a/testutil/src/main/java/org/hyperledger/orion/testutil/OrionTestHarnessFactory.java b/testutil/src/main/java/org/hyperledger/orion/testutil/OrionTestHarnessFactory.java
deleted file mode 100644
index a0571ee919e..00000000000
--- a/testutil/src/main/java/org/hyperledger/orion/testutil/OrionTestHarnessFactory.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright ConsenSys AG.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-package org.hyperledger.orion.testutil;
-
-import static org.apache.tuweni.io.file.Files.copyResource;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-public class OrionTestHarnessFactory {
-  private static final String storage = "memory";
-
-  public static OrionTestHarness create(
-      final Path tempDir, final OrionKeyConfiguration orionConfig) {
-    return create(
-        tempDir,
-        orionConfig.getPubKeyPaths(),
-        orionConfig.getPrivKeyPaths(),
-        Collections.emptyList());
-  }
-
-  public static OrionTestHarness create(
-      final Path tempDir,
-      final String[] pubKeyPaths,
-      final String[] privKeyPaths,
-      final List<String> othernodes) {
-    final Path[] pubKeys =
-        Arrays.stream(pubKeyPaths)
-            .map(
-                (pk) -> {
-                  try {
-                    return copyResource(pk, tempDir.resolve(pk));
-                  } catch (final IOException e) {
-                    throw new RuntimeException(e);
-                  }
-                })
-            .toArray(Path[]::new);
-    final Path[] privKeys =
-        Arrays.stream(privKeyPaths)
-            .map(
-                (pk) -> {
-                  try {
-                    return copyResource(pk, tempDir.resolve(pk));
-                  } catch (final IOException e) {
-                    throw new RuntimeException(e);
-                  }
-                })
-            .toArray(Path[]::new);
-
-    return create(tempDir, pubKeys, privKeys, othernodes);
-  }
-
-  public static OrionTestHarness create(
-      final Path tempDir,
-      final Path[] key1pubs,
-      final Path[] key1keys,
-      final List<String> othernodes) {
-    return new OrionTestHarness(
-        new OrionConfiguration(key1pubs, key1keys, tempDir, othernodes, false, storage));
-  }
-}
diff --git a/testutil/src/main/resources/enclave_ec_key_0.key b/testutil/src/main/resources/enclave_ec_key_0.key
new file mode 100644
index 00000000000..65bfc50034b
--- /dev/null
+++ b/testutil/src/main/resources/enclave_ec_key_0.key
@@ -0,0 +1 @@
+{"data":{"bytes":"MEECAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQcEJzAlAgEBBCA3i4I2sXNvZ/oP+faqfqFVKhc3lIthuqa5nczOMMmjVg=="},"type":"unlocked"}
\ No newline at end of file
diff --git a/testutil/src/main/resources/enclave_ec_key_0.pub b/testutil/src/main/resources/enclave_ec_key_0.pub
new file mode 100644
index 00000000000..aeb0cc0c4af
--- /dev/null
+++ b/testutil/src/main/resources/enclave_ec_key_0.pub
@@ -0,0 +1 @@
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAES8nC4qT/KdoAoTSF3qs/47DUsDihyVbWiRjZAiyvqp9eSDkqV1RzlM+58oOwnpFRwvWNZM+AxMVxT+MvxdsqMA==
\ No newline at end of file
diff --git a/testutil/src/main/resources/enclave_ec_key_1.key b/testutil/src/main/resources/enclave_ec_key_1.key
new file mode 100644
index 00000000000..56cc7cc0d8c
--- /dev/null
+++ b/testutil/src/main/resources/enclave_ec_key_1.key
@@ -0,0 +1 @@
+{"data":{"bytes":"MEECAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQcEJzAlAgEBBCA/80gy3GG2gCdmCk3Xp4hcO06c3OomIf+aH3oZGVSYfQ=="},"type":"unlocked"}
\ No newline at end of file
diff --git a/testutil/src/main/resources/enclave_ec_key_1.pub b/testutil/src/main/resources/enclave_ec_key_1.pub
new file mode 100644
index 00000000000..3c565ec7de5
--- /dev/null
+++ b/testutil/src/main/resources/enclave_ec_key_1.pub
@@ -0,0 +1 @@
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEXIgZqRA25V+3nN+Do6b5r0jiUunub6ubjPhqwHpPxP44uUYh9RKCQNRnsqCJ9PjeTnC8R3ieJk7HWAlycU1bug==
\ No newline at end of file
diff --git a/testutil/src/main/resources/enclave_ec_key_2.key b/testutil/src/main/resources/enclave_ec_key_2.key
new file mode 100644
index 00000000000..a6f675e7e7f
--- /dev/null
+++ b/testutil/src/main/resources/enclave_ec_key_2.key
@@ -0,0 +1 @@
+{"data":{"bytes":"MEECAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQcEJzAlAgEBBCC64DUSx9FrS2wHVOa1CWMStiq1jo2u7Oef0hzpgOK+8w=="},"type":"unlocked"}
\ No newline at end of file
diff --git a/testutil/src/main/resources/enclave_ec_key_2.pub b/testutil/src/main/resources/enclave_ec_key_2.pub
new file mode 100644
index 00000000000..5700cbd07e7
--- /dev/null
+++ b/testutil/src/main/resources/enclave_ec_key_2.pub
@@ -0,0 +1 @@
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEFl85WnNPyzSEX+evc774xoqUQdjSnQMTE1uIyMOve+iVwjs6dUEUwz5teiKuUUf63a/qYe4n6SGnQ7HnmtDViQ==
\ No newline at end of file
diff --git a/testutil/src/main/resources/orion_key_0.key b/testutil/src/main/resources/enclave_key_0.key
similarity index 100%
rename from testutil/src/main/resources/orion_key_0.key
rename to testutil/src/main/resources/enclave_key_0.key
diff --git a/testutil/src/main/resources/orion_key_0.pub b/testutil/src/main/resources/enclave_key_0.pub
similarity index 100%
rename from testutil/src/main/resources/orion_key_0.pub
rename to testutil/src/main/resources/enclave_key_0.pub
diff --git a/testutil/src/main/resources/orion_key_1.key b/testutil/src/main/resources/enclave_key_1.key
similarity index 100%
rename from testutil/src/main/resources/orion_key_1.key
rename to testutil/src/main/resources/enclave_key_1.key
diff --git a/testutil/src/main/resources/orion_key_1.pub b/testutil/src/main/resources/enclave_key_1.pub
similarity index 100%
rename from testutil/src/main/resources/orion_key_1.pub
rename to testutil/src/main/resources/enclave_key_1.pub
diff --git a/testutil/src/main/resources/orion_key_2.key b/testutil/src/main/resources/enclave_key_2.key
similarity index 100%
rename from testutil/src/main/resources/orion_key_2.key
rename to testutil/src/main/resources/enclave_key_2.key
diff --git a/testutil/src/main/resources/orion_key_2.pub b/testutil/src/main/resources/enclave_key_2.pub
similarity index 100%
rename from testutil/src/main/resources/orion_key_2.pub
rename to testutil/src/main/resources/enclave_key_2.pub
diff --git a/testutil/src/main/resources/fork-chain-data/genesis-outdated.json b/testutil/src/main/resources/fork-chain-data/genesis-outdated.json
index 4648bb5f36d..ac2a6363af5 100644
--- a/testutil/src/main/resources/fork-chain-data/genesis-outdated.json
+++ b/testutil/src/main/resources/fork-chain-data/genesis-outdated.json
@@ -1,11 +1,6 @@
 {
   "config": {
     "chainId": 2018,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
     "byzantiumBlock": 0,
     "constantinopleBlock": 5,
     "contractSizeLimit": 2147483647,
diff --git a/testutil/src/main/resources/fork-chain-data/genesis-upgraded.json b/testutil/src/main/resources/fork-chain-data/genesis-upgraded.json
index 14dd549a702..62bdf3742da 100644
--- a/testutil/src/main/resources/fork-chain-data/genesis-upgraded.json
+++ b/testutil/src/main/resources/fork-chain-data/genesis-upgraded.json
@@ -1,14 +1,9 @@
 {
   "config": {
     "chainId": 2018,
-    "homesteadBlock": 0,
-    "daoForkBlock": 0,
-    "eip150Block": 0,
-    "eip155Block": 0,
-    "eip158Block": 0,
     "byzantiumBlock": 0,
     "constantinopleBlock": 5,
-    "constantinopleFixBlock": 7,
+    "petersburgBlock": 7,
     "contractSizeLimit": 2147483647,
     "ethash": {
       "fixeddifficulty": 100
diff --git a/testutil/src/main/resources/fork-london-data/testLondonBlockchain.blocks b/testutil/src/main/resources/fork-london-data/testLondonBlockchain.blocks
new file mode 100644
index 00000000000..9d77f2277fe
Binary files /dev/null and b/testutil/src/main/resources/fork-london-data/testLondonBlockchain.blocks differ
diff --git a/testutil/src/main/resources/fork-london-data/testLondonGenesis.json b/testutil/src/main/resources/fork-london-data/testLondonGenesis.json
new file mode 100644
index 00000000000..5d95fdb5093
--- /dev/null
+++ b/testutil/src/main/resources/fork-london-data/testLondonGenesis.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "londonBlock":3,
+        "ethash": {
+            "fixeddifficulty": 15
+        },
+        "chainID": 1982,
+        "networkID": 1982
+    },
+    "nonce": "0x0000000000000042",
+    "gasLimit": "0x100000000",
+    "difficulty": "0xf",
+    "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "coinbase": "0x0000000000000000000000000000000000000000",
+    "alloc": {
+        "fe3b557e8fb62b89f4916b721be55ceb828dbd73": {
+            "balance" : "90000000000000000000000"
+        },
+        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+            "balance" : "90000000000000000000000"
+        }
+    }
+}
diff --git a/testutil/src/main/resources/hive/testBlockchain.blocks b/testutil/src/main/resources/hive/testBlockchain.blocks
new file mode 100644
index 00000000000..480efc87d9f
Binary files /dev/null and b/testutil/src/main/resources/hive/testBlockchain.blocks differ
diff --git a/testutil/src/main/resources/hive/testGenesis.json b/testutil/src/main/resources/hive/testGenesis.json
new file mode 100644
index 00000000000..248f0933ddd
--- /dev/null
+++ b/testutil/src/main/resources/hive/testGenesis.json
@@ -0,0 +1,22 @@
+{
+    "config": {
+        "chainId": 1,
+        "ethash": {
+        },
+        "londonBlock": 33,
+        "shanghaiTime": 1444660030
+    },
+    "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "coinbase"   : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+    "difficulty" : "0x020000",
+    "gasLimit"   : "0x2fefd8",
+    "timestamp"  : "0x54c98c81",
+    "extraData"  : "0x42",
+    "mixHash"    : "0x2c85bcbce56429100b2108254bb56906257582aeafcbd682bc9af67a9f5aee46",
+    "nonce"      : "0x78cc16f7b4f65485",
+    "alloc"      : {
+        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+            "balance" : "0x09184e72a000"
+        }
+    }
+}
\ No newline at end of file
diff --git a/testutil/src/main/resources/log4j2.xml b/testutil/src/main/resources/log4j2.xml
index 8bc25bfd5be..85a454f1c9b 100644
--- a/testutil/src/main/resources/log4j2.xml
+++ b/testutil/src/main/resources/log4j2.xml
@@ -2,11 +2,18 @@
 <Configuration status="WARN">
   <Properties>
     <Property name="root.log.level">INFO</Property>
+    <Property name="console.pattern">%d{yyyy-MM-dd HH:mm:ss.SSSZZZ} | %t | %-5level | %c{1} | %msg</Property>
+    <Property name="console.msgdata.maxlen">1000</Property>
   </Properties>
 
   <Appenders>
     <Console name="Console" target="SYSTEM_OUT">
-      <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSSZZZ} | %t | %-5level | %c{1} | %msg%n" />    </Console>
+      <PatternLayout alwaysWriteExceptions="false">
+        <MarkerPatternSelector defaultPattern="${console.pattern}%n">
+          <PatternMatch key="P2PMSG" pattern="${console.pattern} rawData=%maxLen{%X{rawData}}{${console.msgdata.maxlen}} decodedData=%maxLen{%X{decodedData}}{${console.msgdata.maxlen}}%n"/>
+        </MarkerPatternSelector>
+      </PatternLayout>
+    </Console>
   </Appenders>
   <Loggers>
     <Root level="${sys:root.log.level}">
diff --git a/testutil/src/main/resources/mainnet-data/mainnet.json b/testutil/src/main/resources/mainnet-data/mainnet.json
index 925b6e575cd..39f1b085210 100644
--- a/testutil/src/main/resources/mainnet-data/mainnet.json
+++ b/testutil/src/main/resources/mainnet-data/mainnet.json
@@ -3,14 +3,11 @@
     "chainId": 1,
     "homesteadBlock": 1150000,
     "daoForkBlock": 1920000,
-    "daoForkSupport": true,
     "eip150Block": 2463000,
-    "eip150Hash": "0x2086799aeebeae135c246c65021c82b4e15a2c451340993aacfd2751886514f0",
-    "eip155Block": 2675000,
     "eip158Block": 2675000,
     "byzantiumBlock": 4370000,
     "constantinopleBlock": 7280000,
-    "constantinopleFixBlock": 7280000,
+    "petersburgBlock": 7280000,
     "ethash": {
 
     }
diff --git a/testutil/src/main/resources/test-eth-ref-rpc-compact/chain.blocks b/testutil/src/main/resources/test-eth-ref-rpc-compact/chain.blocks
new file mode 100644
index 00000000000..9a9088e259f
Binary files /dev/null and b/testutil/src/main/resources/test-eth-ref-rpc-compact/chain.blocks differ
diff --git a/testutil/src/main/resources/test-eth-ref-rpc-compact/genesis.json b/testutil/src/main/resources/test-eth-ref-rpc-compact/genesis.json
new file mode 100644
index 00000000000..77c226bd4e8
--- /dev/null
+++ b/testutil/src/main/resources/test-eth-ref-rpc-compact/genesis.json
@@ -0,0 +1,58 @@
+{
+    "config": {
+      "chainId": 1337,
+      "homesteadBlock": 0,
+      "eip150Block": 0,
+      "eip150Hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+      "eip155Block": 0,
+      "eip158Block": 0,
+      "byzantiumBlock": 0,
+      "constantinopleBlock": 0,
+      "petersburgBlock": 0,
+      "istanbulBlock": 0,
+      "muirGlacierBlock": 0,
+      "berlinBlock": 0,
+      "londonBlock": 0,
+      "arrowGlacierBlock": 0,
+      "grayGlacierBlock": 0,
+      "ethash": {}
+    },
+    "nonce": "0x0",
+    "timestamp": "0x0",
+    "extraData": "0x",
+    "gasLimit": "0x4c4b40",
+    "difficulty": "0x1",
+    "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "coinbase": "0x0000000000000000000000000000000000000000",
+    "alloc": {
+      "658bdf435d810c91414ec09147daa6db62406379": {
+        "balance": "0x487a9a304539440000"
+      },
+      "aa00000000000000000000000000000000000000": {
+        "code": "0x6042",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "0x0100000000000000000000000000000000000000000000000000000000000000": "0x0100000000000000000000000000000000000000000000000000000000000000",
+          "0x0200000000000000000000000000000000000000000000000000000000000000": "0x0200000000000000000000000000000000000000000000000000000000000000",
+          "0x0300000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000303"
+        },
+        "balance": "0x1",
+        "nonce": "0x1"
+      },
+      "bb00000000000000000000000000000000000000": {
+        "code": "0x600154600354",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "0x0100000000000000000000000000000000000000000000000000000000000000": "0x0100000000000000000000000000000000000000000000000000000000000000",
+          "0x0200000000000000000000000000000000000000000000000000000000000000": "0x0200000000000000000000000000000000000000000000000000000000000000",
+          "0x0300000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000000303"
+        },
+        "balance": "0x2",
+        "nonce": "0x1"
+      }
+    },
+    "number": "0x0",
+    "gasUsed": "0x0",
+    "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "baseFeePerGas": "0x3b9aca00"
+  }
\ No newline at end of file
diff --git a/util/build.gradle b/util/build.gradle
index c4ca741fefb..9136a20b7e6 100644
--- a/util/build.gradle
+++ b/util/build.gradle
@@ -22,25 +22,26 @@ jar {
       'Specification-Title': archiveBaseName,
       'Specification-Version': project.version,
       'Implementation-Title': archiveBaseName,
-      'Implementation-Version': calculateVersion()
+      'Implementation-Version': calculateVersion(),
+      'Automatic-Module-Name': 'org.hyperledger.besu.internal.util'
       )
   }
 }
 
 dependencies {
-  api 'org.apache.logging.log4j:log4j-api'
-
-  implementation project(':plugin-api')
+  api 'org.slf4j:slf4j-api'
 
   implementation 'com.google.guava:guava'
-  implementation 'io.vertx:vertx-core'
-  implementation 'org.apache.tuweni:bytes'
-  implementation 'org.apache.tuweni:units'
+  implementation 'net.java.dev.jna:jna'
+  implementation 'org.apache.commons:commons-lang3'
+  implementation 'org.apache.logging.log4j:log4j-core'
+  implementation 'org.apache.logging.log4j:log4j-slf4j2-impl'
   implementation 'org.xerial.snappy:snappy-java'
 
-  runtimeOnly 'org.apache.logging.log4j:log4j-core'
-
-  testImplementation 'junit:junit'
+  testImplementation 'org.mockito:mockito-junit-jupiter'
   testImplementation 'org.assertj:assertj-core'
+  testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.mockito:mockito-core'
+
+  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 }
diff --git a/util/src/main/java/org/hyperledger/besu/util/EndianUtils.java b/util/src/main/java/org/hyperledger/besu/util/EndianUtils.java
index baa1cdb512d..025eeea7ab2 100644
--- a/util/src/main/java/org/hyperledger/besu/util/EndianUtils.java
+++ b/util/src/main/java/org/hyperledger/besu/util/EndianUtils.java
@@ -14,9 +14,17 @@
  */
 package org.hyperledger.besu.util;
 
+/** The Endian utils. */
 public class EndianUtils {
   // next two methods adopted from:
   // https://github.com/bcgit/bc-java/blob/master/core/src/main/java/org/bouncycastle/util/Pack.java
+
+  /**
+   * Long to big endian.
+   *
+   * @param n the n
+   * @return the byte [ ]
+   */
   public static byte[] longToBigEndian(final long n) {
     final byte[] bs = new byte[8];
     intToBigEndian((int) (n >>> 32), bs, 0);
@@ -24,6 +32,13 @@ public static byte[] longToBigEndian(final long n) {
     return bs;
   }
 
+  /**
+   * Int to big endian.
+   *
+   * @param n the n
+   * @param bs the bs
+   * @param off the off
+   */
   @SuppressWarnings("MethodInputParametersMustBeFinal")
   public static void intToBigEndian(final int n, final byte[] bs, int off) {
     bs[off] = (byte) (n >>> 24);
diff --git a/util/src/main/java/org/hyperledger/besu/util/ExceptionUtils.java b/util/src/main/java/org/hyperledger/besu/util/ExceptionUtils.java
index 66d149178e2..4232fe1a376 100644
--- a/util/src/main/java/org/hyperledger/besu/util/ExceptionUtils.java
+++ b/util/src/main/java/org/hyperledger/besu/util/ExceptionUtils.java
@@ -16,6 +16,7 @@
 
 import com.google.common.base.Throwables;
 
+/** The Exception utils. */
 public class ExceptionUtils {
 
   private ExceptionUtils() {}
diff --git a/util/src/main/java/org/hyperledger/besu/util/FutureUtils.java b/util/src/main/java/org/hyperledger/besu/util/FutureUtils.java
index a0c128b866c..c75d97ee311 100644
--- a/util/src/main/java/org/hyperledger/besu/util/FutureUtils.java
+++ b/util/src/main/java/org/hyperledger/besu/util/FutureUtils.java
@@ -22,6 +22,7 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
+/** The Future utils. */
 public class FutureUtils {
 
   /**
@@ -31,9 +32,9 @@ public class FutureUtils {
    *
    * <p>This is the exceptional equivalent to {@link CompletionStage#thenCompose(Function)}
    *
+   * @param <T> the type of the CompletionStage's result
    * @param future the future to handle results or exceptions from
    * @param errorHandler the function returning a new CompletionStage
-   * @param <T> the type of the CompletionStage's result
    * @return the CompletionStage
    */
   public static <T> CompletableFuture<T> exceptionallyCompose(
@@ -60,9 +61,9 @@ public static <T> CompletableFuture<T> exceptionallyCompose(
    * successfully with the same value. When <code>from</code> completes exceptionally, <code>to
    * </code> will be completed exceptionally with the same exception.
    *
+   * @param <T> the type of the success value
    * @param from the CompletionStage to take results and exceptions from
    * @param to the CompletableFuture to propagate results and exceptions to
-   * @param <T> the type of the success value
    */
   public static <T> void propagateResult(
       final CompletionStage<T> from, final CompletableFuture<T> to) {
@@ -87,9 +88,9 @@ public static <T> void propagateResult(
    * <p>If the Supplier throws an exception, the target CompletableFuture will be completed
    * exceptionally with the thrown exception.
    *
+   * @param <T> the type of the success value
    * @param from the Supplier to get the CompletableFuture to take results and exceptions from
    * @param to the CompletableFuture to propagate results and exceptions to
-   * @param <T> the type of the success value
    */
   public static <T> void propagateResult(
       final Supplier<CompletableFuture<T>> from, final CompletableFuture<T> to) {
@@ -104,8 +105,9 @@ public static <T> void propagateResult(
    * Propagates cancellation, and only cancellation, from one future to another.
    *
    * <p>When <code>from</code> is completed with a {@link
-   * java.util.concurrent.CancellationException} {@link java.util.concurrent.Future#cancel(boolean)}
-   * will be called on <code>to</code>, allowing interruption if the future is currently running.
+   * java.util.concurrent.CancellationException}* {@link
+   * java.util.concurrent.Future#cancel(boolean)} will be called on <code>to</code>, allowing
+   * interruption if the future is currently running.
    *
    * @param from the CompletableFuture to take cancellation from
    * @param to the CompletableFuture to propagate cancellation to
diff --git a/util/src/main/java/org/hyperledger/besu/util/IllegalPortException.java b/util/src/main/java/org/hyperledger/besu/util/IllegalPortException.java
index 378eb000f31..c8d965a4ac7 100644
--- a/util/src/main/java/org/hyperledger/besu/util/IllegalPortException.java
+++ b/util/src/main/java/org/hyperledger/besu/util/IllegalPortException.java
@@ -14,7 +14,13 @@
  */
 package org.hyperledger.besu.util;
 
+/** The Illegal port exception. */
 public class IllegalPortException extends IllegalArgumentException {
+  /**
+   * Instantiates a new Illegal port exception.
+   *
+   * @param message the message
+   */
   IllegalPortException(final String message) {
     super(message);
   }
diff --git a/util/src/main/java/org/hyperledger/besu/util/InvalidConfigurationException.java b/util/src/main/java/org/hyperledger/besu/util/InvalidConfigurationException.java
index dd516133422..247abfcd20d 100644
--- a/util/src/main/java/org/hyperledger/besu/util/InvalidConfigurationException.java
+++ b/util/src/main/java/org/hyperledger/besu/util/InvalidConfigurationException.java
@@ -14,7 +14,13 @@
  */
 package org.hyperledger.besu.util;
 
+/** The Invalid configuration exception. */
 public class InvalidConfigurationException extends IllegalArgumentException {
+  /**
+   * Instantiates a new Invalid configuration exception.
+   *
+   * @param message the message
+   */
   public InvalidConfigurationException(final String message) {
     super(message);
   }
diff --git a/util/src/main/java/org/hyperledger/besu/util/LimitedSet.java b/util/src/main/java/org/hyperledger/besu/util/LimitedSet.java
index d7c3252ae11..c514a2a53b1 100644
--- a/util/src/main/java/org/hyperledger/besu/util/LimitedSet.java
+++ b/util/src/main/java/org/hyperledger/besu/util/LimitedSet.java
@@ -21,8 +21,11 @@
 
 /** Helper that creates a thread-safe set with a maximum capacity. */
 public final class LimitedSet {
+  /** The enum Mode. */
   public enum Mode {
+    /** Drop least recently accessed mode. */
     DROP_LEAST_RECENTLY_ACCESSED,
+    /** Drop oldest element mode. */
     DROP_OLDEST_ELEMENT
   }
 
@@ -31,10 +34,10 @@ private LimitedSet() {}
   /**
    * Creates a limited set of a initial size, maximum size, and eviction mode.
    *
+   * @param <T> The type of object held in the set.
    * @param initialCapacity The initial size to allocate for the set.
    * @param maxSize The maximum number of elements to keep in the set.
    * @param mode A mode that determines which element is evicted when the set exceeds its max size.
-   * @param <T> The type of object held in the set.
    * @return A thread-safe set that will evict elements when the max size is exceeded.
    */
   public static final <T> Set<T> create(
diff --git a/util/src/main/java/org/hyperledger/besu/util/Log4j2ConfiguratorUtil.java b/util/src/main/java/org/hyperledger/besu/util/Log4j2ConfiguratorUtil.java
new file mode 100644
index 00000000000..d47294fc16a
--- /dev/null
+++ b/util/src/main/java/org/hyperledger/besu/util/Log4j2ConfiguratorUtil.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.util;
+
+import static java.util.Objects.requireNonNull;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.LoggerConfig;
+import org.apache.logging.log4j.util.Strings;
+import org.apache.logging.slf4j.Log4jLoggerFactory;
+import org.slf4j.LoggerFactory;
+
+/** The Log4j2 configurator util. */
+class Log4j2ConfiguratorUtil {
+
+  private Log4j2ConfiguratorUtil() {}
+
+  /**
+   * Sets all levels.
+   *
+   * @param parentLogger the parent logger
+   * @param level the level
+   */
+  static void setAllLevels(final String parentLogger, final String level) {
+    // 1) get logger config
+    // 2) if exact match, use it, if not, create it.
+    // 3) set level on logger config
+    // 4) update child logger configs with level
+    // 5) update loggers
+    Level log4JLevel = Level.toLevel(level, null);
+    requireNonNull(log4JLevel);
+    final LoggerContext loggerContext = getLoggerContext();
+    final Configuration config = loggerContext.getConfiguration();
+    boolean set = setLevel(parentLogger, log4JLevel, config);
+    for (final Map.Entry<String, LoggerConfig> entry : config.getLoggers().entrySet()) {
+      if (entry.getKey().startsWith(parentLogger)) {
+        set |= setLevel(entry.getValue(), log4JLevel);
+      }
+    }
+    if (set) {
+      loggerContext.updateLoggers();
+    }
+  }
+
+  /**
+   * Sets Debug level to specified logger.
+   *
+   * @param loggerName the logger name
+   */
+  static void setLevelDebug(final String loggerName) {
+    setLevel(loggerName, "DEBUG");
+  }
+
+  /**
+   * Sets level to specified logger.
+   *
+   * @param loggerName the logger name
+   * @param level the level
+   */
+  static void setLevel(final String loggerName, final String level) {
+    Level log4jLevel = Level.toLevel(level, null);
+    requireNonNull(log4jLevel);
+    final LoggerContext loggerContext = getLoggerContext();
+    if (Strings.isEmpty(loggerName)) {
+      setRootLevel(loggerContext, log4jLevel);
+    } else if (setLevel(loggerName, log4jLevel, loggerContext.getConfiguration())) {
+      loggerContext.updateLoggers();
+    }
+  }
+
+  private static boolean setLevel(
+      final String loggerName, final Level level, final Configuration config) {
+    boolean set;
+    LoggerConfig loggerConfig = config.getLoggerConfig(loggerName);
+    if (!loggerName.equals(loggerConfig.getName())) {
+      loggerConfig = new LoggerConfig(loggerName, level, true);
+      config.addLogger(loggerName, loggerConfig);
+      loggerConfig.setLevel(level);
+      set = true;
+    } else {
+      set = setLevel(loggerConfig, level);
+    }
+    return set;
+  }
+
+  private static boolean setLevel(final LoggerConfig loggerConfig, final Level level) {
+    final boolean set = !loggerConfig.getLevel().equals(level);
+    if (set) {
+      loggerConfig.setLevel(level);
+    }
+    return set;
+  }
+
+  private static void setRootLevel(final LoggerContext loggerContext, final Level level) {
+    final LoggerConfig loggerConfig = loggerContext.getConfiguration().getRootLogger();
+    if (!loggerConfig.getLevel().equals(level)) {
+      loggerConfig.setLevel(level);
+      loggerContext.updateLoggers();
+    }
+  }
+
+  /** Reconfigure. */
+  static void reconfigure() {
+    getLoggerContext().reconfigure();
+  }
+
+  private static LoggerContext getLoggerContext() {
+    final Set<org.apache.logging.log4j.spi.LoggerContext> loggerContexts =
+        ((Log4jLoggerFactory) LoggerFactory.getILoggerFactory()).getLoggerContexts();
+    return (LoggerContext) loggerContexts.iterator().next();
+  }
+
+  /** Shutdown. */
+  static void shutdown() {
+    getLoggerContext().terminate();
+  }
+}
diff --git a/util/src/main/java/org/hyperledger/besu/util/LogConfigurator.java b/util/src/main/java/org/hyperledger/besu/util/LogConfigurator.java
new file mode 100644
index 00000000000..b0ca0bcd46b
--- /dev/null
+++ b/util/src/main/java/org/hyperledger/besu/util/LogConfigurator.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.util;
+
+import java.util.NoSuchElementException;
+
+/** The library independent logger configurator util. */
+@SuppressWarnings("CatchAndPrintStackTrace")
+public interface LogConfigurator {
+
+  /**
+   * Sets level to specified logger.
+   *
+   * @param parentLogger the logger name
+   * @param level the level
+   */
+  static void setLevel(final String parentLogger, final String level) {
+    try {
+      Log4j2ConfiguratorUtil.setAllLevels(parentLogger, level);
+    } catch (NoClassDefFoundError | ClassCastException | NoSuchElementException e) {
+      // This is expected when Log4j support is not in the classpath, so ignore
+    }
+  }
+
+  /** Reconfigure. */
+  static void reconfigure() {
+    try {
+      Log4j2ConfiguratorUtil.reconfigure();
+    } catch (NoClassDefFoundError | ClassCastException | NoSuchElementException e) {
+      // This is expected when Log4j support is not in the classpath, so ignore
+    }
+  }
+
+  /** Shutdown. */
+  static void shutdown() {
+    try {
+      Log4j2ConfiguratorUtil.shutdown();
+    } catch (NoClassDefFoundError | ClassCastException | NoSuchElementException e) {
+      // This is expected when Log4j support is not in the classpath, so ignore
+    }
+  }
+}
diff --git a/util/src/main/java/org/hyperledger/besu/util/NetworkUtility.java b/util/src/main/java/org/hyperledger/besu/util/NetworkUtility.java
index 22d57a71f5f..d0c2c347cd8 100644
--- a/util/src/main/java/org/hyperledger/besu/util/NetworkUtility.java
+++ b/util/src/main/java/org/hyperledger/besu/util/NetworkUtility.java
@@ -14,20 +14,30 @@
  */
 package org.hyperledger.besu.util;
 
+import java.io.IOException;
+import java.net.DatagramSocket;
 import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.NetworkInterface;
+import java.net.ServerSocket;
 import java.net.SocketException;
 import java.net.UnknownHostException;
 import java.util.function.Supplier;
 
 import com.google.common.base.Suppliers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+/** The Network utility. */
 public class NetworkUtility {
+  /** The constant INADDR_ANY. */
   public static final String INADDR_ANY = "0.0.0.0";
+  /** The constant INADDR6_ANY. */
   public static final String INADDR6_ANY = "0:0:0:0:0:0:0:0";
 
+  private static final Logger LOG = LoggerFactory.getLogger(NetworkUtility.class);
+
   private NetworkUtility() {}
 
   private static final Supplier<Boolean> ipv6Available =
@@ -68,6 +78,13 @@ public static boolean isValidPort(final int port) {
     return port > 0 && port < 65536;
   }
 
+  /**
+   * Url for socket address.
+   *
+   * @param scheme the scheme
+   * @param address the address
+   * @return the url
+   */
   public static String urlForSocketAddress(final String scheme, final InetSocketAddress address) {
     String hostName = address.getHostName();
     if (isUnspecifiedAddress(hostName)) {
@@ -79,6 +96,14 @@ public static String urlForSocketAddress(final String scheme, final InetSocketAd
     return scheme + "://" + hostName + ":" + address.getPort();
   }
 
+  /**
+   * Is network interface available.
+   *
+   * @param ipAddress the ip address
+   * @return the boolean
+   * @throws SocketException the socket exception
+   * @throws UnknownHostException the unknown host exception
+   */
   public static boolean isNetworkInterfaceAvailable(final String ipAddress)
       throws SocketException, UnknownHostException {
     if (isUnspecifiedAddress(ipAddress)) {
@@ -87,10 +112,22 @@ public static boolean isNetworkInterfaceAvailable(final String ipAddress)
     return NetworkInterface.getByInetAddress(InetAddress.getByName(ipAddress)) != null;
   }
 
+  /**
+   * Is unspecified address.
+   *
+   * @param ipAddress the ip address
+   * @return the boolean
+   */
   public static boolean isUnspecifiedAddress(final String ipAddress) {
     return INADDR_ANY.equals(ipAddress) || INADDR6_ANY.equals(ipAddress);
   }
 
+  /**
+   * Check port.
+   *
+   * @param port the port
+   * @param portTypeName the port type name
+   */
   public static void checkPort(final int port, final String portTypeName) {
     if (!isValidPort(port)) {
       throw new IllegalPortException(
@@ -98,4 +135,42 @@ public static void checkPort(final int port, final String portTypeName) {
               "%s port requires a value between 1 and 65535. Got %d.", portTypeName, port));
     }
   }
+
+  /**
+   * Is port available for tcp.
+   *
+   * @param port the port
+   * @return the boolean
+   */
+  public static boolean isPortAvailableForTcp(final int port) {
+    try (final ServerSocket serverSocket = new ServerSocket()) {
+      serverSocket.setReuseAddress(true);
+      serverSocket.bind(new InetSocketAddress(port));
+      return true;
+    } catch (IOException ex) {
+      LOG.trace(String.format("Failed to open port %d for TCP", port), ex);
+    }
+    return false;
+  }
+
+  private static boolean isPortAvailableForUdp(final int port) {
+    try (final DatagramSocket datagramSocket = new DatagramSocket(null)) {
+      datagramSocket.setReuseAddress(true);
+      datagramSocket.bind(new InetSocketAddress(port));
+      return true;
+    } catch (IOException ex) {
+      LOG.trace(String.format("failed to open port %d for UDP", port), ex);
+    }
+    return false;
+  }
+
+  /**
+   * Is port available.
+   *
+   * @param port the port
+   * @return the boolean
+   */
+  public static boolean isPortAvailable(final int port) {
+    return isPortAvailableForTcp(port) && isPortAvailableForUdp(port);
+  }
 }
diff --git a/util/src/main/java/org/hyperledger/besu/util/Preconditions.java b/util/src/main/java/org/hyperledger/besu/util/Preconditions.java
index f1aaebb0654..73bd3663463 100644
--- a/util/src/main/java/org/hyperledger/besu/util/Preconditions.java
+++ b/util/src/main/java/org/hyperledger/besu/util/Preconditions.java
@@ -18,9 +18,18 @@
 
 import com.google.errorprone.annotations.FormatMethod;
 
+/** The Preconditions. */
 public class Preconditions {
   private Preconditions() {}
 
+  /**
+   * Check guard.
+   *
+   * @param condition the condition
+   * @param exceptionGenerator the exception generator
+   * @param template the template
+   * @param variables the variables
+   */
   @FormatMethod
   public static void checkGuard(
       final boolean condition,
diff --git a/util/src/main/java/org/hyperledger/besu/util/Subscribers.java b/util/src/main/java/org/hyperledger/besu/util/Subscribers.java
index 1877afc3f4b..6704ed95773 100644
--- a/util/src/main/java/org/hyperledger/besu/util/Subscribers.java
+++ b/util/src/main/java/org/hyperledger/besu/util/Subscribers.java
@@ -20,8 +20,8 @@
 import java.util.function.Consumer;
 
 import com.google.common.collect.ImmutableSet;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Tracks subscribers that should be notified when some event occurred. This class is safe to use
@@ -37,15 +37,15 @@
  * subscribers.unsubscribe(this::onSomeEvent);</code>
  * </pre>
  *
- * <p>Since the two separate <code>this:onSomeEvent</code> are not equal, the subscriber wouldn't be
- * removed. This bug is avoided by assigning each subscriber a unique ID and using that to
+ * <p>Since the two separate <code>this::onSomeEvent</code> are not equal, the subscriber wouldn't
+ * be removed. This bug is avoided by assigning each subscriber a unique ID and using that to
  * unsubscribe.
  *
  * @param <T> the type of subscribers
  */
 public class Subscribers<T> {
   private static final Subscribers<?> NONE = new EmptySubscribers<>();
-  private static final Logger LOG = LogManager.getLogger();
+  private static final Logger LOG = LoggerFactory.getLogger(Subscribers.class);
 
   private final AtomicLong subscriberId = new AtomicLong();
   private final Map<Long, T> subscribers = new ConcurrentHashMap<>();
@@ -56,15 +56,34 @@ private Subscribers(final boolean suppressCallbackExceptions) {
     this.suppressCallbackExceptions = suppressCallbackExceptions;
   }
 
+  /**
+   * None subscribers.
+   *
+   * @param <T> the type parameter
+   * @return the subscribers
+   */
   @SuppressWarnings("unchecked")
   public static <T> Subscribers<T> none() {
     return (Subscribers<T>) NONE;
   }
 
+  /**
+   * Create subscribers.
+   *
+   * @param <T> the type parameter
+   * @return the subscribers
+   */
   public static <T> Subscribers<T> create() {
     return new Subscribers<T>(false);
   }
 
+  /**
+   * Create subscribers.
+   *
+   * @param <T> the type parameter
+   * @param catchCallbackExceptions the catch callback exceptions
+   * @return the subscribers
+   */
   public static <T> Subscribers<T> create(final boolean catchCallbackExceptions) {
     return new Subscribers<T>(catchCallbackExceptions);
   }
@@ -86,7 +105,7 @@ public long subscribe(final T subscriber) {
    *
    * @param subscriberId the ID of the subscriber to remove
    * @return <code>true</code> if a subscriber with that ID was found and removed, otherwise <code>
-   *     false</code>
+   *          false</code>
    */
   public boolean unsubscribe(final long subscriberId) {
     return subscribers.remove(subscriberId) != null;
@@ -110,9 +129,9 @@ public void forEach(final Consumer<T> action) {
             subscriber -> {
               try {
                 action.accept(subscriber);
-              } catch (Exception e) {
+              } catch (final Exception e) {
                 if (suppressCallbackExceptions) {
-                  LOG.error("Error in callback: ", e);
+                  LOG.debug("Error in callback: {}", e);
                 } else {
                   throw e;
                 }
diff --git a/util/src/main/java/org/hyperledger/besu/util/io/RollingFileReader.java b/util/src/main/java/org/hyperledger/besu/util/io/RollingFileReader.java
index ec56a45dd04..c7cf98edda3 100644
--- a/util/src/main/java/org/hyperledger/besu/util/io/RollingFileReader.java
+++ b/util/src/main/java/org/hyperledger/besu/util/io/RollingFileReader.java
@@ -25,6 +25,7 @@
 
 import org.xerial.snappy.Snappy;
 
+/** The Rolling file reader. */
 public class RollingFileReader implements Closeable {
   private final BiFunction<Integer, Boolean, Path> filenameGenerator;
   private final boolean compressed;
@@ -34,6 +35,13 @@ public class RollingFileReader implements Closeable {
   private final RandomAccessFile index;
   private boolean done = false;
 
+  /**
+   * Instantiates a new Rolling file reader.
+   *
+   * @param filenameGenerator the filename generator
+   * @param compressed the compressed
+   * @throws IOException the io exception
+   */
   public RollingFileReader(
       final BiFunction<Integer, Boolean, Path> filenameGenerator, final boolean compressed)
       throws IOException {
@@ -46,6 +54,12 @@ public RollingFileReader(
     currentPosition = index.readUnsignedShort();
   }
 
+  /**
+   * Read bytes.
+   *
+   * @return the byte [ ]
+   * @throws IOException the io exception
+   */
   public byte[] readBytes() throws IOException {
     byte[] raw;
     try {
@@ -75,6 +89,12 @@ public byte[] readBytes() throws IOException {
     return compressed ? Snappy.uncompress(raw) : raw;
   }
 
+  /**
+   * Seek.
+   *
+   * @param position the position
+   * @throws IOException the io exception
+   */
   public void seek(final long position) throws IOException {
     index.seek(position * 6);
     final int oldFile = fileNumber;
@@ -92,6 +112,11 @@ public void close() throws IOException {
     index.close();
   }
 
+  /**
+   * Is done.
+   *
+   * @return the boolean
+   */
   public boolean isDone() {
     return done;
   }
diff --git a/util/src/main/java/org/hyperledger/besu/util/io/RollingFileWriter.java b/util/src/main/java/org/hyperledger/besu/util/io/RollingFileWriter.java
index aaa03e61069..93e7e1d6f0c 100644
--- a/util/src/main/java/org/hyperledger/besu/util/io/RollingFileWriter.java
+++ b/util/src/main/java/org/hyperledger/besu/util/io/RollingFileWriter.java
@@ -27,6 +27,7 @@
 
 import org.xerial.snappy.Snappy;
 
+/** The Rolling file writer. */
 public class RollingFileWriter implements Closeable {
   private static final long MAX_FILE_SIZE = 1 << 30; // 1 GiB max file size
 
@@ -37,6 +38,13 @@ public class RollingFileWriter implements Closeable {
   private FileOutputStream out;
   private final DataOutputStream index;
 
+  /**
+   * Instantiates a new Rolling file writer.
+   *
+   * @param filenameGenerator the filename generator
+   * @param compressed the compressed
+   * @throws FileNotFoundException the file not found exception
+   */
   public RollingFileWriter(
       final BiFunction<Integer, Boolean, Path> filenameGenerator, final boolean compressed)
       throws FileNotFoundException {
@@ -55,10 +63,22 @@ public RollingFileWriter(
     index = new DataOutputStream(new FileOutputStream(dataFileToIndex(firstOutputFile).toFile()));
   }
 
+  /**
+   * Data file to index path.
+   *
+   * @param dataName the data name
+   * @return the path
+   */
   public static Path dataFileToIndex(final Path dataName) {
     return Path.of(dataName.toString().replaceAll("(.*)[-.]\\d\\d\\d\\d\\.(.)dat", "$1.$2idx"));
   }
 
+  /**
+   * Write bytes.
+   *
+   * @param bytes the bytes
+   * @throws IOException the io exception
+   */
   public void writeBytes(final byte[] bytes) throws IOException {
     final byte[] finalBytes;
     if (compressed) {
diff --git a/util/src/main/java/org/hyperledger/besu/util/log/FramedLogMessage.java b/util/src/main/java/org/hyperledger/besu/util/log/FramedLogMessage.java
new file mode 100644
index 00000000000..f68c3ed7fe0
--- /dev/null
+++ b/util/src/main/java/org/hyperledger/besu/util/log/FramedLogMessage.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.util.log;
+
+import java.util.List;
+
+import com.google.common.base.Splitter;
+import org.apache.commons.lang3.StringUtils;
+
+/** The Framed log message. */
+public class FramedLogMessage {
+  private static final int MAX_LINE_LENGTH = 100;
+
+  private FramedLogMessage() {}
+
+  /**
+   * Generate log lines as String.
+   *
+   * @param logLines the log lines
+   * @return the string
+   */
+  public static String generate(final List<String> logLines) {
+    final StringBuilder builder = new StringBuilder("\n");
+    appendHeader(builder);
+
+    logLines.forEach(
+        logLine ->
+            Splitter.fixedLength(76)
+                .split(logLine)
+                .forEach(
+                    splitLogLine ->
+                        builder.append(
+                            String.format(
+                                "# %s #\n",
+                                StringUtils.rightPad(splitLogLine, MAX_LINE_LENGTH - 4)))));
+
+    appendFooter(builder);
+
+    return builder.toString();
+  }
+
+  /**
+   * Generate logs as centered string.
+   *
+   * @param logLines the log lines
+   * @return the string
+   */
+  public static String generateCentered(final List<String> logLines) {
+    final StringBuilder builder = new StringBuilder("\n");
+    appendHeader(builder);
+
+    logLines.forEach(
+        logLine ->
+            builder.append(
+                String.format("#%s#\n", StringUtils.center(logLine, MAX_LINE_LENGTH - 2))));
+
+    appendFooter(builder);
+
+    return builder.toString();
+  }
+
+  private static void appendHeader(final StringBuilder builder) {
+    builder.append("#".repeat(MAX_LINE_LENGTH) + "\n").append(emptyLine());
+  }
+
+  private static void appendFooter(final StringBuilder builder) {
+    builder.append(emptyLine()).append("#".repeat(MAX_LINE_LENGTH));
+  }
+
+  private static String emptyLine() {
+    return String.format("#%s#\n", StringUtils.center("", MAX_LINE_LENGTH - 2));
+  }
+}
diff --git a/util/src/main/java/org/hyperledger/besu/util/number/ByteUnits.java b/util/src/main/java/org/hyperledger/besu/util/number/ByteUnits.java
new file mode 100644
index 00000000000..461c5543634
--- /dev/null
+++ b/util/src/main/java/org/hyperledger/besu/util/number/ByteUnits.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.util.number;
+
+/** The Byte units. */
+public class ByteUnits {
+  /** The constant MEGABYTE. */
+  public static final int MEGABYTE = 1 << 20;
+
+  private ByteUnits() {}
+}
diff --git a/util/src/main/java/org/hyperledger/besu/util/number/Fraction.java b/util/src/main/java/org/hyperledger/besu/util/number/Fraction.java
index 8adbbd28f07..030b32ca70a 100644
--- a/util/src/main/java/org/hyperledger/besu/util/number/Fraction.java
+++ b/util/src/main/java/org/hyperledger/besu/util/number/Fraction.java
@@ -19,6 +19,7 @@
 
 import java.util.Objects;
 
+/** The Fraction. */
 public class Fraction {
 
   private final float value;
@@ -27,14 +28,31 @@ private Fraction(final float value) {
     this.value = value;
   }
 
+  /**
+   * From percentage to fraction.
+   *
+   * @param percentage the percentage
+   * @return the fraction
+   */
   public static Fraction fromPercentage(final int percentage) {
     return fromFloat((float) percentage / 100.0f);
   }
 
+  /**
+   * From percentage to fraction.
+   *
+   * @param percentage the percentage
+   * @return the fraction
+   */
   public static Fraction fromPercentage(final Percentage percentage) {
     return fromFloat(percentage.getValueAsFloat() / 100.0f);
   }
 
+  /**
+   * To percentage.
+   *
+   * @return the percentage
+   */
   public Percentage toPercentage() {
     return Percentage.fromInt((int) (value * 100.0f));
   }
@@ -52,11 +70,22 @@ public static Fraction fromString(final String str) {
     return fromFloat(parseFloat(str));
   }
 
+  /**
+   * From float to fraction.
+   *
+   * @param val the val
+   * @return the fraction
+   */
   public static Fraction fromFloat(final float val) {
     checkArgument(val > 0.0f && val <= 1.0f);
     return new Fraction(val);
   }
 
+  /**
+   * Gets value.
+   *
+   * @return the value
+   */
   public float getValue() {
     return value;
   }
diff --git a/util/src/main/java/org/hyperledger/besu/util/number/Percentage.java b/util/src/main/java/org/hyperledger/besu/util/number/Percentage.java
index a0565668d88..17c58a7f375 100644
--- a/util/src/main/java/org/hyperledger/besu/util/number/Percentage.java
+++ b/util/src/main/java/org/hyperledger/besu/util/number/Percentage.java
@@ -19,6 +19,7 @@
 
 import java.util.Objects;
 
+/** The Percentage utility. */
 public class Percentage {
 
   private final int value;
@@ -40,15 +41,31 @@ public static Percentage fromString(final String str) {
     return fromInt(parseInt(str));
   }
 
+  /**
+   * Instantiate percentage.
+   *
+   * @param val the val
+   * @return the percentage
+   */
   public static Percentage fromInt(final int val) {
     checkArgument(val >= 0 && val <= 100);
     return new Percentage(val);
   }
 
+  /**
+   * Gets value.
+   *
+   * @return the value
+   */
   public int getValue() {
     return value;
   }
 
+  /**
+   * Gets value as float.
+   *
+   * @return the value as float
+   */
   public float getValueAsFloat() {
     return value;
   }
diff --git a/util/src/main/java/org/hyperledger/besu/util/number/PositiveNumber.java b/util/src/main/java/org/hyperledger/besu/util/number/PositiveNumber.java
index 8d381fc1c25..590cd67b380 100644
--- a/util/src/main/java/org/hyperledger/besu/util/number/PositiveNumber.java
+++ b/util/src/main/java/org/hyperledger/besu/util/number/PositiveNumber.java
@@ -19,6 +19,7 @@
 
 import java.util.Objects;
 
+/** The Positive number. */
 public class PositiveNumber {
 
   private final int value;
@@ -42,11 +43,22 @@ public static PositiveNumber fromString(final String str) {
     return positiveNumber;
   }
 
+  /**
+   * Instantiate positive number from int.
+   *
+   * @param val the val
+   * @return the positive number
+   */
   public static PositiveNumber fromInt(final int val) {
     checkArgument(val > 0);
     return new PositiveNumber(val);
   }
 
+  /**
+   * Gets value.
+   *
+   * @return the value
+   */
   public int getValue() {
     return value;
   }
diff --git a/util/src/main/java/org/hyperledger/besu/util/platform/PlatformDetector.java b/util/src/main/java/org/hyperledger/besu/util/platform/PlatformDetector.java
index bcaae99ced5..1367c721062 100644
--- a/util/src/main/java/org/hyperledger/besu/util/platform/PlatformDetector.java
+++ b/util/src/main/java/org/hyperledger/besu/util/platform/PlatformDetector.java
@@ -14,7 +14,19 @@
  */
 package org.hyperledger.besu.util.platform;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
 import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.sun.jna.Library;
+import com.sun.jna.Native;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.ptr.PointerByReference;
 
 /**
  * Detects OS and VMs.
@@ -28,7 +40,14 @@ public class PlatformDetector {
   private static String _osType;
   private static String _vm;
   private static String _arch;
+  private static String _glibc;
+  private static String _jemalloc;
 
+  /**
+   * Gets OS type.
+   *
+   * @return the OS type
+   */
   public static String getOSType() {
     if (_osType == null) {
       detect();
@@ -36,6 +55,11 @@ public static String getOSType() {
     return _osType;
   }
 
+  /**
+   * Gets OS.
+   *
+   * @return the OS
+   */
   public static String getOS() {
     if (_os == null) {
       detect();
@@ -43,6 +67,11 @@ public static String getOS() {
     return _os;
   }
 
+  /**
+   * Gets Arch.
+   *
+   * @return the Arch
+   */
   public static String getArch() {
     if (_arch == null) {
       detect();
@@ -50,6 +79,11 @@ public static String getArch() {
     return _arch;
   }
 
+  /**
+   * Gets VM.
+   *
+   * @return the VM
+   */
   public static String getVM() {
     if (_vm == null) {
       detect();
@@ -57,6 +91,33 @@ public static String getVM() {
     return _vm;
   }
 
+  /**
+   * Gets Glibc version.
+   *
+   * @return the Glibc version
+   */
+  public static String getGlibc() {
+    if (_glibc == null) {
+      detectGlibc();
+    }
+
+    return _glibc;
+  }
+
+  /**
+   * Gets jemalloc version.
+   *
+   * @throws UnsatisfiedLinkError if the library cannot be found or dependent libraries are missing.
+   * @return the jemalloc version
+   */
+  public static String getJemalloc() {
+    if (_jemalloc == null) {
+      detectJemalloc();
+    }
+
+    return _jemalloc;
+  }
+
   private static final String UNKNOWN = "unknown";
 
   private static void detect() {
@@ -168,6 +229,13 @@ private static String normalizeArch(final String osArch) {
     return UNKNOWN;
   }
 
+  /**
+   * Normalize VM version string.
+   *
+   * @param javaVendor the java vendor
+   * @param javaVmName the java vm name
+   * @return the string
+   */
   static String normalizeVM(final String javaVendor, final String javaVmName) {
     if (javaVmName.contains("graalvm") || javaVendor.contains("graalvm")) {
       return "graalvm";
@@ -202,6 +270,12 @@ static String normalizeVM(final String javaVendor, final String javaVmName) {
     return "-" + javaVendor + "-" + javaVmName;
   }
 
+  /**
+   * Normalize java version string.
+   *
+   * @param javaVersion the java version
+   * @return the string
+   */
   static String normalizeJavaVersion(final String javaVersion) {
     // These are already normalized.
     return System.getProperty(javaVersion);
@@ -213,4 +287,62 @@ private static String normalize(final String value) {
     }
     return System.getProperty(value).toLowerCase(Locale.US).replaceAll("[^a-z0-9]+", "");
   }
+
+  private static void detectGlibc() {
+    final ProcessBuilder processBuilder =
+        new ProcessBuilder("/bin/bash").command("/usr/bin/ldd", "--version");
+    processBuilder.redirectErrorStream(true);
+
+    final StringBuilder rawGlibcVersionBuilder;
+    try {
+      final Process process = processBuilder.start();
+      rawGlibcVersionBuilder = readGlibcVersionStream(process.getInputStream());
+    } catch (IOException e) {
+      return;
+    }
+
+    _glibc = normalizeGLibcVersion(rawGlibcVersionBuilder.toString());
+  }
+
+  private static StringBuilder readGlibcVersionStream(final InputStream iStream)
+      throws IOException {
+    final StringBuilder builder = new StringBuilder();
+    String line;
+
+    try (BufferedReader bufferedReader =
+        new BufferedReader(new InputStreamReader(iStream, Charset.defaultCharset()))) {
+      while ((line = bufferedReader.readLine()) != null) {
+        builder.append(line);
+        builder.append(System.getProperty("line.separator"));
+      }
+    }
+
+    return builder;
+  }
+
+  private static String normalizeGLibcVersion(final String rawGlibcVersion) {
+    final Pattern pattern = Pattern.compile("[-+]?[0-9]*\\.?[0-9]+");
+    final Matcher matcher = pattern.matcher(rawGlibcVersion);
+
+    return matcher.find() ? matcher.group() : null;
+  }
+
+  private static void detectJemalloc() {
+    interface JemallocLib extends Library {
+      int mallctl(
+          String property,
+          PointerByReference value,
+          IntByReference len,
+          String newValue,
+          int newLen);
+    }
+
+    final JemallocLib jemallocLib = Native.load("jemalloc", JemallocLib.class);
+
+    PointerByReference pVersion = new PointerByReference();
+    IntByReference pSize = new IntByReference(Native.POINTER_SIZE);
+    jemallocLib.mallctl("version", pVersion, pSize, null, 0);
+
+    _jemalloc = pVersion.getValue().getString(0);
+  }
 }
diff --git a/util/src/test/java/org/hyperledger/besu/util/ExceptionUtilsTest.java b/util/src/test/java/org/hyperledger/besu/util/ExceptionUtilsTest.java
index 072ad9bccf0..721dd42a3ab 100644
--- a/util/src/test/java/org/hyperledger/besu/util/ExceptionUtilsTest.java
+++ b/util/src/test/java/org/hyperledger/besu/util/ExceptionUtilsTest.java
@@ -18,7 +18,7 @@
 
 import java.util.concurrent.CompletionException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ExceptionUtilsTest {
 
diff --git a/util/src/test/java/org/hyperledger/besu/util/FutureUtilsTest.java b/util/src/test/java/org/hyperledger/besu/util/FutureUtilsTest.java
index 4e8b7c6af93..17b2076770d 100644
--- a/util/src/test/java/org/hyperledger/besu/util/FutureUtilsTest.java
+++ b/util/src/test/java/org/hyperledger/besu/util/FutureUtilsTest.java
@@ -21,7 +21,7 @@
 import static org.hyperledger.besu.util.FutureUtils.propagateResult;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 import java.util.concurrent.CompletableFuture;
@@ -29,7 +29,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.function.Function;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class FutureUtilsTest {
 
@@ -120,7 +120,7 @@ public void shouldComposeExceptionallyWhenErrorOccurs() {
 
     final CompletableFuture<String> result = exceptionallyCompose(input, errorHandler);
 
-    verifyZeroInteractions(errorHandler);
+    verifyNoInteractions(errorHandler);
     assertThat(result).isNotDone();
 
     // Completing input should trigger our error handler but not complete the result yet.
@@ -142,7 +142,7 @@ public void shouldComposeExceptionallyWhenErrorOccursAndComposedFutureFails() {
 
     final CompletableFuture<String> result = exceptionallyCompose(input, errorHandler);
 
-    verifyZeroInteractions(errorHandler);
+    verifyNoInteractions(errorHandler);
     assertThat(result).isNotDone();
 
     // Completing input should trigger our error handler but not complete the result yet.
@@ -163,7 +163,7 @@ public void shouldComposeExceptionallyWhenErrorOccursAndErrorHandlerThrowsExcept
 
     final CompletableFuture<String> result = exceptionallyCompose(input, errorHandler);
 
-    verifyZeroInteractions(errorHandler);
+    verifyNoInteractions(errorHandler);
     assertThat(result).isNotDone();
 
     // Completing input should trigger our error handler but not complete the result yet.
@@ -182,11 +182,11 @@ public void shouldNotCallErrorHandlerWhenFutureCompletesSuccessfully() {
 
     final CompletableFuture<String> result = exceptionallyCompose(input, errorHandler);
 
-    verifyZeroInteractions(errorHandler);
+    verifyNoInteractions(errorHandler);
     assertThat(result).isNotDone();
 
     input.complete("Done");
-    verifyZeroInteractions(errorHandler);
+    verifyNoInteractions(errorHandler);
     assertThat(result).isCompletedWithValue("Done");
   }
 
diff --git a/util/src/test/java/org/hyperledger/besu/util/LimitedSetTest.java b/util/src/test/java/org/hyperledger/besu/util/LimitedSetTest.java
index 804deffb52d..1b84a681db5 100644
--- a/util/src/test/java/org/hyperledger/besu/util/LimitedSetTest.java
+++ b/util/src/test/java/org/hyperledger/besu/util/LimitedSetTest.java
@@ -20,7 +20,7 @@
 
 import java.util.Set;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class LimitedSetTest {
 
diff --git a/util/src/test/java/org/hyperledger/besu/util/NetworkUtilityTest.java b/util/src/test/java/org/hyperledger/besu/util/NetworkUtilityTest.java
index 95068aeee3d..74ea89fc7a8 100644
--- a/util/src/test/java/org/hyperledger/besu/util/NetworkUtilityTest.java
+++ b/util/src/test/java/org/hyperledger/besu/util/NetworkUtilityTest.java
@@ -16,9 +16,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.net.ServerSocket;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class NetworkUtilityTest {
 
@@ -31,4 +33,11 @@ public void urlForSocketAddressHandlesIPv6() {
     final InetSocketAddress ipv6 = new InetSocketAddress("1:2:3:4:5:6:7:8", 80);
     assertThat(NetworkUtility.urlForSocketAddress("http", ipv6)).contains("[1:2:3:4:5:6:7:8]");
   }
+
+  @Test
+  public void assertPortIsNotAvailable() throws IOException {
+    final ServerSocket serverSocket = new ServerSocket(8541);
+    assertThat(!NetworkUtility.isPortAvailable(8541)).isEqualTo(true);
+    serverSocket.close();
+  }
 }
diff --git a/util/src/test/java/org/hyperledger/besu/util/SubscribersTest.java b/util/src/test/java/org/hyperledger/besu/util/SubscribersTest.java
index 0ba25890b65..c5c4da34897 100644
--- a/util/src/test/java/org/hyperledger/besu/util/SubscribersTest.java
+++ b/util/src/test/java/org/hyperledger/besu/util/SubscribersTest.java
@@ -21,7 +21,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoInteractions;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SubscribersTest {
   private final Runnable subscriber1 = mock(Runnable.class);
diff --git a/util/src/test/java/org/hyperledger/besu/util/number/FractionTest.java b/util/src/test/java/org/hyperledger/besu/util/number/FractionTest.java
index a6e05f59540..551bbc374e7 100644
--- a/util/src/test/java/org/hyperledger/besu/util/number/FractionTest.java
+++ b/util/src/test/java/org/hyperledger/besu/util/number/FractionTest.java
@@ -17,7 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class FractionTest {
 
diff --git a/util/src/test/java/org/hyperledger/besu/util/number/PercentageTest.java b/util/src/test/java/org/hyperledger/besu/util/number/PercentageTest.java
index 6a6e3db5d18..143305d7ea2 100644
--- a/util/src/test/java/org/hyperledger/besu/util/number/PercentageTest.java
+++ b/util/src/test/java/org/hyperledger/besu/util/number/PercentageTest.java
@@ -17,7 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowable;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PercentageTest {
 
diff --git a/util/src/test/java/org/hyperledger/besu/util/number/PositiveNumberTest.java b/util/src/test/java/org/hyperledger/besu/util/number/PositiveNumberTest.java
new file mode 100644
index 00000000000..5e51e79e801
--- /dev/null
+++ b/util/src/test/java/org/hyperledger/besu/util/number/PositiveNumberTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.util.number;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.junit.jupiter.api.Test;
+
+public class PositiveNumberTest {
+
+  @Test
+  public void shouldBuildPositiveNumberFromString() {
+    final String positiveNumberString = "1";
+    final int positiveNumberInt = 1;
+    PositiveNumber positiveNumber = PositiveNumber.fromString(positiveNumberString);
+    assertThat(positiveNumber).isNotNull();
+    assertThat(positiveNumber.getValue()).isEqualTo(positiveNumberInt);
+  }
+
+  @Test
+  public void shouldThrowOnDecimalValueFromString() {
+    assertThatThrownBy(() -> PositiveNumber.fromString("1.1"))
+        .isInstanceOf(IllegalArgumentException.class);
+  }
+
+  @Test
+  public void shouldThrowOnNonPositiveValueFromString() {
+    assertThatThrownBy(() -> PositiveNumber.fromString("0"))
+        .isInstanceOf(IllegalArgumentException.class);
+  }
+
+  @Test
+  public void shouldThrowOnNegativeValueFromString() {
+    assertThatThrownBy(() -> PositiveNumber.fromString("-1"))
+        .isInstanceOf(IllegalArgumentException.class);
+  }
+
+  @Test
+  public void shouldThrowOnEmptyValueFromString() {
+    assertThatThrownBy(() -> PositiveNumber.fromString(""))
+        .isInstanceOf(IllegalArgumentException.class);
+  }
+
+  @Test
+  public void shouldThrowOnNullValueFromString() {
+    assertThatThrownBy(() -> PositiveNumber.fromString(null))
+        .isInstanceOf(IllegalArgumentException.class);
+  }
+}